From ef93e9a9059cd072bae28b49ba5cc33d9611f178 Mon Sep 17 00:00:00 2001
From: Derek Murray <derek.murray@gmail.com>
Date: Wed, 29 Mar 2017 09:29:33 -0700
Subject: [PATCH 0001/1563] Internal changes (#8808)

Change: 151077399
---
 tensorflow/contrib/BUILD                      |  2 +-
 tensorflow/contrib/cmake/tf_core_ops.cmake    | 11 ++++++
 tensorflow/contrib/cmake/tf_python.cmake      | 20 +++++++++-
 tensorflow/contrib/cudnn_rnn/BUILD            | 22 ++++++++++-
 tensorflow/contrib/factorization/BUILD        |  9 ++++-
 tensorflow/contrib/ffmpeg/BUILD               |  1 +
 tensorflow/contrib/ffmpeg/ffmpeg_ops.py       | 38 ++----------------
 tensorflow/contrib/framework/BUILD            | 27 ++++++++++++-
 tensorflow/contrib/image/BUILD                | 28 ++++++++++++-
 .../contrib/image/python/ops/image_ops.py     |  5 ++-
 tensorflow/contrib/input_pipeline/BUILD       |  9 ++++-
 .../python/ops/input_pipeline_ops.py          |  3 +-
 tensorflow/contrib/layers/BUILD               | 11 +++++-
 .../layers/python/ops/bucketization_op.py     |  3 +-
 .../python/ops/sparse_feature_cross_op.py     |  7 ++--
 tensorflow/contrib/memory_stats/BUILD         | 21 +++++++++-
 tensorflow/contrib/rnn/BUILD                  | 24 +++++++++++-
 tensorflow/contrib/rnn/python/ops/gru_ops.py  |  5 ++-
 tensorflow/contrib/rnn/python/ops/lstm_ops.py | 11 +++---
 tensorflow/contrib/tensor_forest/BUILD        | 32 ++++++++++++++-
 tensorflow/contrib/tensor_forest/hybrid/BUILD | 39 ++++++++++++++++++-
 .../k_feature_routing_function_op_test.py     |  5 +--
 .../kernel_tests/routing_function_op_test.py  |  9 ++---
 .../hybrid/python/layers/decisions_to_data.py | 23 +++++------
 .../hybrid/python/ops/training_ops.py         | 13 ++++---
 tensorflow/tensorflow.bzl                     | 12 ++++++
 26 files changed, 292 insertions(+), 98 deletions(-)

diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index ff4af9aa6b..2519d0b0dc 100644
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -77,7 +77,7 @@ cc_library(
         "//tensorflow/contrib/input_pipeline:input_pipeline_ops_kernels",
         "//tensorflow/contrib/layers:bucketization_op_kernel",
         "//tensorflow/contrib/layers:sparse_feature_cross_op_kernel",
-        "//tensorflow/contrib/tensor_forest:all_ops",
+        "//tensorflow/contrib/tensor_forest:tensor_forest_kernels",
     ],
 )
 
diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index 73686d0dd3..4e30005629 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -45,12 +45,23 @@ function(GENERATE_CONTRIB_OP_LIBRARY op_lib_name cc_srcs)
     add_dependencies(tf_contrib_${op_lib_name}_ops tf_core_framework)
 endfunction()
 
+file(GLOB_RECURSE tensor_forest_hybrid_srcs
+     "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/hybrid/core/ops/*.cc"
+)
+
 GENERATE_CONTRIB_OP_LIBRARY(cudnn_rnn "${tensorflow_source_dir}/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(factorization_clustering "${tensorflow_source_dir}/tensorflow/contrib/factorization/ops/clustering_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(factorization_factorization "${tensorflow_source_dir}/tensorflow/contrib/factorization/ops/factorization_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(framework_variable "${tensorflow_source_dir}/tensorflow/contrib/framework/ops/variable_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(input_pipeline "${tensorflow_source_dir}/tensorflow/contrib/input_pipeline/ops/input_pipeline_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(image "${tensorflow_source_dir}/tensorflow/contrib/image/ops/image_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(layers_bucketization "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/bucketization_op.cc")
+GENERATE_CONTRIB_OP_LIBRARY(layers_sparse_feature_cross "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/sparse_feature_cross_op.cc")
 GENERATE_CONTRIB_OP_LIBRARY(memory_stats "${tensorflow_source_dir}/tensorflow/contrib/memory_stats/ops/memory_stats_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(rnn_gru "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/gru_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(rnn_lstm "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/lstm_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(tensor_forest "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/ops/tensor_forest_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(tensor_forest_hybrid "${tensor_forest_hybrid_srcs}")
 GENERATE_CONTRIB_OP_LIBRARY(bigquery_reader "${tensorflow_source_dir}/tensorflow/contrib/cloud/ops/bigquery_reader_ops.cc")
 
 ########################################################
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 5d5cbc21ea..0605ffb375 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -278,9 +278,11 @@ add_python_module("tensorflow/contrib/grid_rnn/python/kernel_tests")
 add_python_module("tensorflow/contrib/grid_rnn/python/ops")
 add_python_module("tensorflow/contrib/hooks")
 add_python_module("tensorflow/contrib/image")
+add_python_module("tensorflow/contrib/image/ops")
 add_python_module("tensorflow/contrib/image/python")
 add_python_module("tensorflow/contrib/image/python/ops")
 add_python_module("tensorflow/contrib/input_pipeline")
+add_python_module("tensorflow/contrib/input_pipeline/ops")
 add_python_module("tensorflow/contrib/input_pipeline/python")
 add_python_module("tensorflow/contrib/input_pipeline/python/ops")
 add_python_module("tensorflow/contrib/integrate")
@@ -455,6 +457,7 @@ add_python_module("tensorflow/contrib/tensor_forest/data")
 add_python_module("tensorflow/contrib/tensor_forest/hybrid")
 add_python_module("tensorflow/contrib/tensor_forest/hybrid/core")
 add_python_module("tensorflow/contrib/tensor_forest/hybrid/core/ops")
+add_python_module("tensorflow/contrib/tensor_forest/hybrid/ops")
 add_python_module("tensorflow/contrib/tensor_forest/hybrid/python")
 add_python_module("tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests")
 add_python_module("tensorflow/contrib/tensor_forest/hybrid/python/layers")
@@ -586,11 +589,24 @@ GENERATE_PYTHON_OP_LIB("contrib_factorization_factorization_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/factorization/python/ops/gen_factorization_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_framework_variable_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/framework/python/ops/gen_variable_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_input_pipeline_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/input_pipeline/ops/gen_input_pipeline_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_image_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/image/ops/gen_image_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_layers_bucketization_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/layers/ops/gen_bucketization_op.py)
+GENERATE_PYTHON_OP_LIB("contrib_layers_sparse_feature_cross_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/layers/ops/gen_sparse_feature_cross_op.py)
 GENERATE_PYTHON_OP_LIB("contrib_memory_stats_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/memory_stats/ops/gen_memory_stats_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_rnn_gru_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/rnn/ops/gen_gru_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_rnn_lstm_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/rnn/ops/gen_lstm_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_tensor_forest_ops"
-	  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/tensor_forest/python/ops/gen_tensor_forest_ops.py)
-
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/tensor_forest/python/ops/gen_tensor_forest_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_tensor_forest_hybrid_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/tensor_forest/hybrid/ops/gen_training_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_bigquery_reader_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/cloud/python/ops/gen_bigquery_reader_ops.py)
 
diff --git a/tensorflow/contrib/cudnn_rnn/BUILD b/tensorflow/contrib/cudnn_rnn/BUILD
index 6bebf22b3a..9ebf94315b 100644
--- a/tensorflow/contrib/cudnn_rnn/BUILD
+++ b/tensorflow/contrib/cudnn_rnn/BUILD
@@ -13,7 +13,9 @@ exports_files(["LICENSE"])
 load("//tensorflow:tensorflow.bzl", "tf_custom_op_library")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_libs")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
+load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
 tf_custom_op_library(
     name = "python/ops/_cudnn_rnn_ops.so",
@@ -26,6 +28,18 @@ tf_custom_op_library(
     ],
 )
 
+tf_kernel_library(
+    name = "cudnn_rnn_kernels",
+    srcs = ["kernels/cudnn_rnn_ops.cc"],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core/kernels:bounds_check_lib",
+        "//third_party/eigen3",
+    ],
+)
+
 tf_gen_op_libs(
     op_lib_names = ["cudnn_rnn_ops"],
     deps = [
@@ -38,15 +52,19 @@ tf_gen_op_wrapper_py(
     deps = [":cudnn_rnn_ops_op_lib"],
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "cudnn_rnn_py",
     srcs = [
         "__init__.py",
         "python/ops/cudnn_rnn_ops.py",
     ],
-    data = [
+    dso = [
         ":python/ops/_cudnn_rnn_ops.so",
     ],
+    kernels = [
+        ":cudnn_rnn_kernels",
+        ":cudnn_rnn_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index b329bb9595..338e67e953 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -13,8 +13,9 @@ load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_libs")
 load("//tensorflow:tensorflow.bzl", "tf_py_test")
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
-py_library(
+tf_custom_op_py_library(
     name = "factorization_py",
     srcs = [
         "__init__.py",
@@ -23,10 +24,14 @@ py_library(
         "python/ops/gmm.py",
         "python/ops/gmm_ops.py",
     ],
-    data = [
+    dso = [
         ":python/ops/_clustering_ops.so",
         ":python/ops/_factorization_ops.so",
     ],
+    kernels = [
+        ":all_ops",
+        "//tensorflow/contrib/factorization/kernels:all_kernels",
+    ],
     srcs_version = "PY2AND3",
     deps = [
         ":gen_clustering_ops",
diff --git a/tensorflow/contrib/ffmpeg/BUILD b/tensorflow/contrib/ffmpeg/BUILD
index 95d8b74b00..ce49cca978 100644
--- a/tensorflow/contrib/ffmpeg/BUILD
+++ b/tensorflow/contrib/ffmpeg/BUILD
@@ -121,6 +121,7 @@ py_library(
     deps = [
         ":decode_audio_op_py",
         ":encode_audio_op_py",
+        "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
diff --git a/tensorflow/contrib/ffmpeg/ffmpeg_ops.py b/tensorflow/contrib/ffmpeg/ffmpeg_ops.py
index d9159c505f..5f608cdb82 100644
--- a/tensorflow/contrib/ffmpeg/ffmpeg_ops.py
+++ b/tensorflow/contrib/ffmpeg/ffmpeg_ops.py
@@ -18,15 +18,14 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import os
-
 from tensorflow.contrib.ffmpeg.ops import gen_decode_audio_op_py
 from tensorflow.contrib.ffmpeg.ops import gen_encode_audio_op_py
-from tensorflow.python.framework import errors
-from tensorflow.python.framework import load_library
+from tensorflow.contrib.util import loader
 from tensorflow.python.framework import ops
 from tensorflow.python.platform import resource_loader
-from tensorflow.python.platform import tf_logging as logging
+
+_ffmpeg_so = loader.load_op_library(
+    resource_loader.get_path_to_datafile('ffmpeg.so'))
 
 
 def decode_audio(contents, file_format=None, samples_per_second=None,
@@ -83,32 +82,3 @@ def encode_audio(audio, file_format=None, samples_per_second=None):
 
 
 ops.NotDifferentiable('EncodeAudio')
-
-
-def _load_library(name, op_list=None):
-  """Loads a .so file containing the specified operators.
-
-  Args:
-    name: The name of the .so file to load.
-    op_list: A list of names of operators that the library should have. If None
-        then the .so file's contents will not be verified.
-
-  Raises:
-    NameError if one of the required ops is missing.
-  """
-  try:
-    filename = resource_loader.get_path_to_datafile(name)
-    library = load_library.load_op_library(filename)
-    for expected_op in (op_list or []):
-      for lib_op in library.OP_LIST.op:
-        if lib_op.name == expected_op:
-          break
-      else:
-        raise NameError('Could not find operator %s in dynamic library %s' %
-                        (expected_op, name))
-  except errors.NotFoundError:
-    logging.warning('%s file could not be loaded.', name)
-
-
-if os.name != 'nt':
-  _load_library('ffmpeg.so', ['DecodeAudio', 'EncodeAudio'])
diff --git a/tensorflow/contrib/framework/BUILD b/tensorflow/contrib/framework/BUILD
index 34371a2f94..2f5c95cd5b 100644
--- a/tensorflow/contrib/framework/BUILD
+++ b/tensorflow/contrib/framework/BUILD
@@ -11,12 +11,14 @@ package(default_visibility = [
 ])
 
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 load("//tensorflow:tensorflow.bzl", "py_test")
 load("//tensorflow:tensorflow.bzl", "tf_custom_op_library")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_libs")
+load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
 
-py_library(
+tf_custom_op_py_library(
     name = "framework_py",
     srcs = [
         "__init__.py",
@@ -30,9 +32,13 @@ py_library(
         "python/ops/prettyprint_ops.py",
         "python/ops/variables.py",
     ],
-    data = [
+    dso = [
         ":python/ops/_variable_ops.so",
     ],
+    kernels = [
+        ":variable_kernels",
+        ":variable_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     deps = [
         ":gen_variable_ops",
@@ -58,6 +64,23 @@ py_library(
     ],
 )
 
+tf_kernel_library(
+    name = "variable_kernels",
+    srcs = [
+        "kernels/zero_initializer_op.cc",
+        "kernels/zero_initializer_op.h",
+    ],
+    gpu_srcs = [
+        "kernels/zero_initializer_op_gpu.cu.cc",
+        "kernels/zero_initializer_op.h",
+    ],
+    deps = [
+        "//tensorflow/core:framework",
+        "//third_party/eigen3",
+    ],
+    alwayslink = 1,
+)
+
 tf_custom_op_library(
     name = "python/ops/_variable_ops.so",
     srcs = [
diff --git a/tensorflow/contrib/image/BUILD b/tensorflow/contrib/image/BUILD
index 6ee0074004..c31ac7b324 100644
--- a/tensorflow/contrib/image/BUILD
+++ b/tensorflow/contrib/image/BUILD
@@ -12,8 +12,10 @@ load(
     "tf_custom_op_library",
     "tf_gen_op_libs",
     "tf_gen_op_wrapper_py",
+    "tf_kernel_library",
 )
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
 tf_custom_op_library(
     name = "python/ops/_image_ops.so",
@@ -28,6 +30,24 @@ tf_custom_op_library(
     ],
 )
 
+tf_kernel_library(
+    name = "image_ops_kernels",
+    srcs = [
+        "kernels/image_ops.cc",
+        "kernels/image_ops.h",
+    ],
+    gpu_srcs = [
+        "kernels/image_ops_gpu.cu.cc",
+        "kernels/image_ops.h",
+    ],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//third_party/eigen3",
+    ],
+    alwayslink = 1,
+)
+
 tf_gen_op_libs(
     op_lib_names = ["image_ops"],
 )
@@ -37,13 +57,17 @@ tf_gen_op_wrapper_py(
     deps = [":image_ops_op_lib"],
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "image_py",
     srcs = [
         "__init__.py",
         "python/ops/image_ops.py",
     ],
-    data = [":python/ops/_image_ops.so"],
+    dso = [":python/ops/_image_ops.so"],
+    kernels = [
+        ":image_ops_kernels",
+        ":image_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     deps = [
         ":image_ops",
diff --git a/tensorflow/contrib/image/python/ops/image_ops.py b/tensorflow/contrib/image/python/ops/image_ops.py
index 28b8cc1c6a..889f361b19 100644
--- a/tensorflow/contrib/image/python/ops/image_ops.py
+++ b/tensorflow/contrib/image/python/ops/image_ops.py
@@ -17,6 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.contrib.image.ops import gen_image_ops
 from tensorflow.contrib.util import loader
 from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import constant_op
@@ -26,7 +27,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import resource_loader
 
-_image_ops = loader.load_op_library(
+_image_ops_so = loader.load_op_library(
     resource_loader.get_path_to_datafile("_image_ops.so"))
 
 _IMAGE_DTYPES = set(
@@ -162,7 +163,7 @@ def transform(images, transforms):
   else:
     raise TypeError("Transforms should have rank 1 or 2.")
   # pylint: disable=protected-access
-  output = _image_ops.image_projective_transform(images, transforms)
+  output = gen_image_ops.image_projective_transform(images, transforms)
   if len(image_or_images.get_shape()) == 2:
     return output[0, :, :, 0]
   elif len(image_or_images.get_shape()) == 3:
diff --git a/tensorflow/contrib/input_pipeline/BUILD b/tensorflow/contrib/input_pipeline/BUILD
index f3db94c213..9aa5763efc 100644
--- a/tensorflow/contrib/input_pipeline/BUILD
+++ b/tensorflow/contrib/input_pipeline/BUILD
@@ -21,6 +21,7 @@ load(
     "//tensorflow/core:platform/default/build_config.bzl",
     "tf_kernel_tests_linkstatic",
 )
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
 tf_custom_op_library(
     # TODO(sibyl-Mooth6ku,ptucker): Understand why 'python/ops/_' is needed and fix it.
@@ -51,10 +52,14 @@ tf_kernel_library(
     alwayslink = 1,
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "input_pipeline_py",
     srcs = glob(["python/ops/*.py"]) + ["__init__.py"],
-    data = [":python/ops/_input_pipeline_ops.so"],
+    dso = [":python/ops/_input_pipeline_ops.so"],
+    kernels = [
+        ":input_pipeline_ops_kernels",
+        ":input_pipeline_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     deps = [
         ":input_pipeline_ops",
diff --git a/tensorflow/contrib/input_pipeline/python/ops/input_pipeline_ops.py b/tensorflow/contrib/input_pipeline/python/ops/input_pipeline_ops.py
index 101e400e63..be22b5c579 100644
--- a/tensorflow/contrib/input_pipeline/python/ops/input_pipeline_ops.py
+++ b/tensorflow/contrib/input_pipeline/python/ops/input_pipeline_ops.py
@@ -19,6 +19,7 @@ from __future__ import print_function
 
 import random
 
+from tensorflow.contrib.input_pipeline.ops import gen_input_pipeline_ops
 from tensorflow.contrib.util import loader
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -42,7 +43,7 @@ def obtain_next(string_list_tensor, counter):
     An op that produces the element at counter + 1 in the list, round
     robin style.
   """
-  return _input_pipeline_ops.obtain_next(string_list_tensor, counter)
+  return gen_input_pipeline_ops.obtain_next(string_list_tensor, counter)
 
 
 def _maybe_randomize_list(string_list, shuffle):
diff --git a/tensorflow/contrib/layers/BUILD b/tensorflow/contrib/layers/BUILD
index e8e8101b21..f5eb723e2d 100644
--- a/tensorflow/contrib/layers/BUILD
+++ b/tensorflow/contrib/layers/BUILD
@@ -11,6 +11,7 @@ package(default_visibility = [
 ])
 
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 load("//tensorflow:tensorflow.bzl", "py_test")
 load("//tensorflow:tensorflow.bzl", "tf_custom_op_library")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_libs")
@@ -75,7 +76,7 @@ tf_kernel_library(
     alwayslink = 1,
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "layers_py",
     srcs = [
         "__init__.py",
@@ -95,10 +96,16 @@ py_library(
         "python/ops/sparse_feature_cross_op.py",
         "python/ops/sparse_ops.py",
     ],
-    data = [
+    dso = [
         ":python/ops/_bucketization_op.so",
         ":python/ops/_sparse_feature_cross_op.so",
     ],
+    kernels = [
+        ":bucketization_op_kernel",
+        ":sparse_feature_cross_op_kernel",
+        ":bucketization_op_op_lib",
+        ":sparse_feature_cross_op_op_lib",
+    ],
     srcs_version = "PY2AND3",
     deps = [
         ":bucketization_op",
diff --git a/tensorflow/contrib/layers/python/ops/bucketization_op.py b/tensorflow/contrib/layers/python/ops/bucketization_op.py
index 6d232da4ad..b941a9b822 100644
--- a/tensorflow/contrib/layers/python/ops/bucketization_op.py
+++ b/tensorflow/contrib/layers/python/ops/bucketization_op.py
@@ -17,6 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.contrib.layers.ops import gen_bucketization_op
 from tensorflow.contrib.util import loader
 from tensorflow.python.framework import ops
 from tensorflow.python.platform import resource_loader
@@ -45,7 +46,7 @@ def bucketize(input_tensor, boundaries, name=None):
   if not isinstance(boundaries, list):
     raise TypeError("boundaries must be a list")
 
-  return _bucketization_op.bucketize(input_tensor, boundaries, name=name)
+  return gen_bucketization_op.bucketize(input_tensor, boundaries, name=name)
 
 
 ops.NotDifferentiable("Bucketize")
diff --git a/tensorflow/contrib/layers/python/ops/sparse_feature_cross_op.py b/tensorflow/contrib/layers/python/ops/sparse_feature_cross_op.py
index 688315fd12..91684dc61e 100644
--- a/tensorflow/contrib/layers/python/ops/sparse_feature_cross_op.py
+++ b/tensorflow/contrib/layers/python/ops/sparse_feature_cross_op.py
@@ -17,10 +17,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-
 from tensorflow.contrib.framework import deprecated_arg_values
+from tensorflow.contrib.layers.ops import gen_sparse_feature_cross_op
 from tensorflow.contrib.util import loader
-from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
@@ -96,7 +95,7 @@ def sparse_feature_cross(inputs, hashed_output=False, num_buckets=0,
 
   if hash_key:
     indices_out, values_out, shape_out = (
-        _sparse_feature_cross_op.sparse_feature_cross_v2(
+        gen_sparse_feature_cross_op.sparse_feature_cross_v2(
             indices,
             values,
             shapes,
@@ -109,7 +108,7 @@ def sparse_feature_cross(inputs, hashed_output=False, num_buckets=0,
             name=name))
   else:
     indices_out, values_out, shape_out = (
-        _sparse_feature_cross_op.sparse_feature_cross(
+        gen_sparse_feature_cross_op.sparse_feature_cross(
             indices,
             values,
             shapes,
diff --git a/tensorflow/contrib/memory_stats/BUILD b/tensorflow/contrib/memory_stats/BUILD
index bbb78383fa..8b9d30dcfd 100644
--- a/tensorflow/contrib/memory_stats/BUILD
+++ b/tensorflow/contrib/memory_stats/BUILD
@@ -10,7 +10,9 @@ package(default_visibility = ["//tensorflow:__subpackages__"])
 load("//tensorflow:tensorflow.bzl", "tf_custom_op_library")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_libs")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
+load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
 tf_custom_op_library(
     name = "python/ops/_memory_stats_ops.so",
@@ -20,6 +22,17 @@ tf_custom_op_library(
     ],
 )
 
+tf_kernel_library(
+    name = "memory_stats_kernels",
+    srcs = [
+        "kernels/memory_stats_ops.cc",
+    ],
+    deps = [
+        "//tensorflow/core:framework",
+    ],
+    alwayslink = 1,
+)
+
 tf_gen_op_libs(
     op_lib_names = ["memory_stats_ops"],
     deps = [
@@ -32,15 +45,19 @@ tf_gen_op_wrapper_py(
     deps = [":memory_stats_ops_op_lib"],
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "memory_stats_py",
     srcs = [
         "__init__.py",
         "python/ops/memory_stats_ops.py",
     ],
-    data = [
+    dso = [
         ":python/ops/_memory_stats_ops.so",
     ],
+    kernels = [
+        ":memory_stats_kernels",
+        ":memory_stats_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
diff --git a/tensorflow/contrib/rnn/BUILD b/tensorflow/contrib/rnn/BUILD
index 4041c2981b..89665af2a9 100644
--- a/tensorflow/contrib/rnn/BUILD
+++ b/tensorflow/contrib/rnn/BUILD
@@ -9,6 +9,7 @@ exports_files(["LICENSE"])
 package(default_visibility = ["//visibility:public"])
 
 load("//tensorflow:tensorflow.bzl", "cuda_py_tests")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 load(
     "//tensorflow:tensorflow.bzl",
     "tf_custom_op_library",
@@ -16,22 +17,31 @@ load(
     "tf_py_test",
     "tf_gen_op_libs",
     "tf_kernel_library",
+    "tf_gen_op_wrapper_py",
 )
 load(
     "//tensorflow/core:platform/default/build_config.bzl",
     "tf_kernel_tests_linkstatic",
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "rnn_py",
     srcs = ["__init__.py"] + glob(["python/ops/*.py"]),
-    data = [
+    dso = [
         ":python/ops/_gru_ops.so",
         ":python/ops/_lstm_ops.so",
     ],
+    kernels = [
+        ":gru_ops_kernels",
+        ":lstm_ops_kernels",
+        ":gru_ops_op_lib",
+        ":lstm_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
+        ":gru_ops",
+        ":lstm_ops",
         "//tensorflow/contrib/compiler:compiler_py",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/contrib/util:util_py",
@@ -196,6 +206,11 @@ tf_custom_op_library(
     ],
 )
 
+tf_gen_op_wrapper_py(
+    name = "lstm_ops",
+    deps = [":lstm_ops_op_lib"],
+)
+
 tf_custom_op_library(
     name = "python/ops/_gru_ops.so",
     srcs = [
@@ -215,6 +230,11 @@ tf_custom_op_library(
     ],
 )
 
+tf_gen_op_wrapper_py(
+    name = "gru_ops",
+    deps = [":gru_ops_op_lib"],
+)
+
 cuda_py_tests(
     name = "gru_ops_test",
     size = "small",
diff --git a/tensorflow/contrib/rnn/python/ops/gru_ops.py b/tensorflow/contrib/rnn/python/ops/gru_ops.py
index 8b531dab66..071a570e2d 100644
--- a/tensorflow/contrib/rnn/python/ops/gru_ops.py
+++ b/tensorflow/contrib/rnn/python/ops/gru_ops.py
@@ -17,6 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.contrib.rnn.ops import gen_gru_ops
 from tensorflow.contrib.rnn.python.ops import core_rnn_cell
 from tensorflow.contrib.util import loader
 from tensorflow.python.framework import ops
@@ -79,7 +80,7 @@ def _GRUBlockCellGrad(op, *grad):
   r, u, c, _ = op.outputs
   _, _, _, d_h = grad
 
-  d_x, d_h_prev, d_c_bar, d_r_bar_u_bar = _gru_ops_so.gru_block_cell_grad(
+  d_x, d_h_prev, d_c_bar, d_r_bar_u_bar = gen_gru_ops.gru_block_cell_grad(
       x, h_prev, w_ru, w_c, b_ru, b_c, r, u, c, d_h)
 
   x_h_prev = array_ops.concat([x, h_prev], 1)
@@ -171,7 +172,7 @@ class GRUBlockCell(core_rnn_cell.RNNCell):
           "b_c", [self._cell_size],
           initializer=init_ops.constant_initializer(0.0))
 
-      _gru_block_cell = _gru_ops_so.gru_block_cell  # pylint: disable=invalid-name
+      _gru_block_cell = gen_gru_ops.gru_block_cell  # pylint: disable=invalid-name
       _, _, _, new_h = _gru_block_cell(
           x=x, h_prev=h_prev, w_ru=w_ru, w_c=w_c, b_ru=b_ru, b_c=b_c)
 
diff --git a/tensorflow/contrib/rnn/python/ops/lstm_ops.py b/tensorflow/contrib/rnn/python/ops/lstm_ops.py
index 318b552f4a..1884629b0c 100644
--- a/tensorflow/contrib/rnn/python/ops/lstm_ops.py
+++ b/tensorflow/contrib/rnn/python/ops/lstm_ops.py
@@ -19,6 +19,7 @@ from __future__ import print_function
 
 import abc
 
+from tensorflow.contrib.rnn.ops import gen_lstm_ops
 from tensorflow.contrib.rnn.python.ops import core_rnn_cell
 from tensorflow.contrib.rnn.python.ops import fused_rnn_cell
 from tensorflow.contrib.util import loader
@@ -119,7 +120,7 @@ def _lstm_block_cell(x,
     wcf = wci
 
   # pylint: disable=protected-access
-  return _lstm_ops_so.lstm_block_cell(
+  return gen_lstm_ops.lstm_block_cell(
       x=x,
       cs_prev=cs_prev,
       h_prev=h_prev,
@@ -204,7 +205,7 @@ def _block_lstm(seq_len_max,
     wcf = wci
 
   # pylint: disable=protected-access
-  i, cs, f, o, ci, co, h = _lstm_ops_so.block_lstm(
+  i, cs, f, o, ci, co, h = gen_lstm_ops.block_lstm(
       seq_len_max=seq_len_max,
       x=array_ops.stack(x),
       cs_prev=cs_prev,
@@ -247,7 +248,7 @@ def _LSTMBlockCellGrad(op, *grad):
     raise ValueError("cell_size from `cs_prev` should not be None.")
 
   (cs_prev_grad, dicfo, wci_grad, wcf_grad,
-   wco_grad) = _lstm_ops_so.lstm_block_cell_grad(
+   wco_grad) = gen_lstm_ops.lstm_block_cell_grad(
        x,
        cs_prev,
        h_prev,
@@ -299,7 +300,7 @@ def _BlockLSTMGrad(op, *grad):
   h_grad = grad[6]
 
   (x_grad, cs_prev_grad, h_prev_grad, w_grad, wci_grad, wco_grad, wcf_grad,
-   b_grad) = _lstm_ops_so.block_lstm_grad(
+   b_grad) = gen_lstm_ops.block_lstm_grad(
        seq_len_max,
        x,
        cs_prev,
@@ -642,7 +643,7 @@ class LSTMBlockFusedCell(LSTMBlockWrapper):
     else:
       max_seq_len = math_ops.to_int64(math_ops.reduce_max(sequence_length))
 
-    _, cs, _, _, _, _, h = _lstm_ops_so.block_lstm(
+    _, cs, _, _, _, _, h = gen_lstm_ops.block_lstm(
         seq_len_max=max_seq_len,
         x=inputs,
         cs_prev=initial_cell_state,
diff --git a/tensorflow/contrib/tensor_forest/BUILD b/tensorflow/contrib/tensor_forest/BUILD
index 0102d341d0..b8e8dbe127 100644
--- a/tensorflow/contrib/tensor_forest/BUILD
+++ b/tensorflow/contrib/tensor_forest/BUILD
@@ -11,6 +11,8 @@ load("//tensorflow:tensorflow.bzl", "py_test")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_libs")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
 load("//tensorflow:tensorflow.bzl", "tf_custom_op_library")
+load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
 filegroup(
     name = "all_files",
@@ -127,10 +129,36 @@ py_library(
     ],
 )
 
-py_library(
+tf_kernel_library(
+    name = "tensor_forest_kernels",
+    srcs = [
+        "kernels/best_splits_op.cc",
+        "kernels/count_extremely_random_stats_op.cc",
+        "kernels/finished_nodes_op.cc",
+        "kernels/grow_tree_op.cc",
+        "kernels/reinterpret_string_to_float_op.cc",
+        "kernels/sample_inputs_op.cc",
+        "kernels/scatter_add_ndim_op.cc",
+        "kernels/tree_predictions_op.cc",
+        "kernels/update_fertile_slots_op.cc",
+    ],
+    deps = [
+        ":tree_utils",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core/kernels:bounds_check",
+    ],
+)
+
+tf_custom_op_py_library(
     name = "tensor_forest_ops_py",
     srcs = ["python/ops/tensor_forest_ops.py"],
-    data = ["python/ops/_tensor_forest_ops.so"],
+    dso = ["python/ops/_tensor_forest_ops.so"],
+    kernels = [
+        ":tensor_forest_kernels",
+        ":tensor_forest_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     deps = [
         ":constants",
diff --git a/tensorflow/contrib/tensor_forest/hybrid/BUILD b/tensorflow/contrib/tensor_forest/hybrid/BUILD
index 7291e439d4..41a815bdec 100644
--- a/tensorflow/contrib/tensor_forest/hybrid/BUILD
+++ b/tensorflow/contrib/tensor_forest/hybrid/BUILD
@@ -10,6 +10,8 @@ package(default_visibility = [
 
 load("//tensorflow:tensorflow.bzl", "py_test")
 load("//tensorflow:tensorflow.bzl", "tf_custom_op_library")
+load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
 filegroup(
     name = "all_files",
@@ -42,6 +44,33 @@ filegroup(
     ),
 )
 
+cc_library(
+    name = "all_kernels",
+    srcs = [
+        "core/ops/hard_routing_function_op.cc",
+        "core/ops/k_feature_gradient_op.cc",
+        "core/ops/k_feature_routing_function_op.cc",
+        "core/ops/routing_function_op.cc",
+        "core/ops/routing_gradient_op.cc",
+        "core/ops/stochastic_hard_routing_function_op.cc",
+        "core/ops/stochastic_hard_routing_gradient_op.cc",
+        "core/ops/unpack_path_op.cc",
+    ],
+    deps = [
+        ":utils",
+        "//tensorflow/contrib/tensor_forest:tree_utils",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+    alwayslink = 1,
+)
+
+tf_gen_op_wrapper_py(
+    name = "training_ops",
+    deps = [":all_kernels"],
+)
+
 tf_custom_op_library(
     name = "python/ops/_training_ops.so",
     srcs = [
@@ -73,17 +102,21 @@ cc_library(
     ],
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "ops_lib",
     srcs = [
         "__init__.py",
         "python/ops/training_ops.py",
     ],
-    data = [
+    dso = [
         "python/ops/_training_ops.so",
     ],
+    kernels = [
+        ":all_kernels",
+    ],
     srcs_version = "PY2AND3",
     deps = [
+        ":training_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -170,6 +203,7 @@ py_test(
     tags = ["manual"],
     deps = [
         ":ops_lib",
+        ":training_ops",
         "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
@@ -184,6 +218,7 @@ py_test(
     tags = ["manual"],
     deps = [
         ":ops_lib",
+        ":training_ops",
         "//tensorflow:tensorflow_py",
         "//tensorflow/contrib/tensor_forest:tensor_forest_py",
         "//tensorflow/python:framework_test_lib",
diff --git a/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/k_feature_routing_function_op_test.py b/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/k_feature_routing_function_op_test.py
index f2cf20fa46..980f53253d 100644
--- a/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/k_feature_routing_function_op_test.py
+++ b/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/k_feature_routing_function_op_test.py
@@ -17,8 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow  # pylint: disable=unused-import
-
+from tensorflow.contrib.tensor_forest.hybrid.ops import gen_training_ops
 from tensorflow.contrib.tensor_forest.hybrid.python.ops import training_ops
 from tensorflow.contrib.tensor_forest.python import tensor_forest
 
@@ -60,7 +59,7 @@ class KFeatureRoutingFunctionTest(test_util.TensorFlowTestCase):
 
   def testRoutingFunction(self):
     with self.test_session():
-      route_tensor = self.ops.k_feature_routing_function(
+      route_tensor = gen_training_ops.k_feature_routing_function(
           self.input_data,
           self.tree_weights,
           self.tree_thresholds,
diff --git a/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/routing_function_op_test.py b/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/routing_function_op_test.py
index 699599f4dc..a27fd49d32 100644
--- a/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/routing_function_op_test.py
+++ b/tensorflow/contrib/tensor_forest/hybrid/python/kernel_tests/routing_function_op_test.py
@@ -17,8 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow  # pylint: disable=unused-import
-
+from tensorflow.contrib.tensor_forest.hybrid.ops import gen_training_ops
 from tensorflow.contrib.tensor_forest.hybrid.python.ops import training_ops
 
 from tensorflow.python.framework import test_util
@@ -38,10 +37,8 @@ class RoutingFunctionTest(test_util.TensorFlowTestCase):
 
   def testRoutingFunction(self):
     with self.test_session():
-      route_tensor = self.ops.routing_function(self.input_data,
-                                               self.tree_weights,
-                                               self.tree_thresholds,
-                                               max_nodes=3)
+      route_tensor = gen_training_ops.routing_function(
+          self.input_data, self.tree_weights, self.tree_thresholds, max_nodes=3)
 
       route_tensor_shape = route_tensor.get_shape()
       self.assertEquals(len(route_tensor_shape), 2)
diff --git a/tensorflow/contrib/tensor_forest/hybrid/python/layers/decisions_to_data.py b/tensorflow/contrib/tensor_forest/hybrid/python/layers/decisions_to_data.py
index e670c27bc4..b57b143475 100644
--- a/tensorflow/contrib/tensor_forest/hybrid/python/layers/decisions_to_data.py
+++ b/tensorflow/contrib/tensor_forest/hybrid/python/layers/decisions_to_data.py
@@ -22,6 +22,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.contrib.tensor_forest.hybrid.ops import gen_training_ops
 from tensorflow.contrib.tensor_forest.hybrid.python import hybrid_layer
 from tensorflow.contrib.tensor_forest.hybrid.python.ops import training_ops
 from tensorflow.python.framework import ops
@@ -53,11 +54,11 @@ class DecisionsToDataLayer(hybrid_layer.HybridLayer):
     super(DecisionsToDataLayer, self).__init__(
         params, layer_num, device_assigner, *args, **kwargs)
 
-    self.training_ops = training_ops.Load()
+    self._training_ops = training_ops.Load()
 
   def inference_graph(self, data):
     with ops.device(self.device_assigner):
-      routing_probabilities = self.training_ops.routing_function(
+      routing_probabilities = gen_training_ops.routing_function(
           data,
           self.tree_parameters,
           self.tree_thresholds,
@@ -94,12 +95,12 @@ class KFeatureDecisionsToDataLayer(hybrid_layer.HybridLayer):
     super(KFeatureDecisionsToDataLayer, self).__init__(
         params, layer_num, device_assigner, *args, **kwargs)
 
-    self.training_ops = training_ops.Load()
+    self._training_ops = training_ops.Load()
 
   # pylint: disable=unused-argument
   def inference_graph(self, data):
     with ops.device(self.device_assigner):
-      routing_probabilities = self.training_ops.k_feature_routing_function(
+      routing_probabilities = gen_training_ops.k_feature_routing_function(
           data,
           self.tree_parameters,
           self.tree_thresholds,
@@ -139,7 +140,7 @@ class HardDecisionsToDataLayer(DecisionsToDataLayer):
 
   def inference_graph(self, data):
     with ops.device(self.device_assigner):
-      path_probability, path = self.training_ops.hard_routing_function(
+      path_probability, path = gen_training_ops.hard_routing_function(
           data,
           self.tree_parameters,
           self.tree_thresholds,
@@ -147,7 +148,7 @@ class HardDecisionsToDataLayer(DecisionsToDataLayer):
           tree_depth=self.params.hybrid_tree_depth)
 
       output = array_ops.slice(
-          self.training_ops.unpack_path(path, path_probability),
+          gen_training_ops.unpack_path(path, path_probability),
           [0, self.params.num_nodes - self.params.num_leaves - 1],
           [-1, self.params.num_leaves])
 
@@ -175,7 +176,7 @@ class StochasticHardDecisionsToDataLayer(HardDecisionsToDataLayer):
   def soft_inference_graph(self, data):
     with ops.device(self.device_assigner):
       path_probability, path = (
-          self.training_ops.stochastic_hard_routing_function(
+          gen_training_ops.stochastic_hard_routing_function(
               data,
               self.tree_parameters,
               self.tree_thresholds,
@@ -183,7 +184,7 @@ class StochasticHardDecisionsToDataLayer(HardDecisionsToDataLayer):
               random_seed=self.params.base_random_seed))
 
       output = array_ops.slice(
-          self.training_ops.unpack_path(path, path_probability),
+          gen_training_ops.unpack_path(path, path_probability),
           [0, self.params.num_nodes - self.params.num_leaves - 1],
           [-1, self.params.num_leaves])
 
@@ -191,7 +192,7 @@ class StochasticHardDecisionsToDataLayer(HardDecisionsToDataLayer):
 
   def inference_graph(self, data):
     with ops.device(self.device_assigner):
-      path_probability, path = self.training_ops.hard_routing_function(
+      path_probability, path = gen_training_ops.hard_routing_function(
           data,
           self.tree_parameters,
           self.tree_thresholds,
@@ -199,7 +200,7 @@ class StochasticHardDecisionsToDataLayer(HardDecisionsToDataLayer):
           tree_depth=self.params.hybrid_tree_depth)
 
       output = array_ops.slice(
-          self.training_ops.unpack_path(path, path_probability),
+          gen_training_ops.unpack_path(path, path_probability),
           [0, self.params.num_nodes - self.params.num_leaves - 1],
           [-1, self.params.num_leaves])
 
@@ -226,7 +227,7 @@ class StochasticSoftDecisionsToDataLayer(StochasticHardDecisionsToDataLayer):
 
   def inference_graph(self, data):
     with ops.device(self.device_assigner):
-      routes = self.training_ops.routing_function(
+      routes = gen_training_ops.routing_function(
           data,
           self.tree_parameters,
           self.tree_thresholds,
diff --git a/tensorflow/contrib/tensor_forest/hybrid/python/ops/training_ops.py b/tensorflow/contrib/tensor_forest/hybrid/python/ops/training_ops.py
index 940420416c..7f403ec825 100644
--- a/tensorflow/contrib/tensor_forest/hybrid/python/ops/training_ops.py
+++ b/tensorflow/contrib/tensor_forest/hybrid/python/ops/training_ops.py
@@ -19,7 +19,8 @@ from __future__ import print_function
 
 import threading
 
-from tensorflow.python.framework import load_library
+from tensorflow.contrib.tensor_forest.hybrid.ops import gen_training_ops
+from tensorflow.contrib.util import loader
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -52,7 +53,7 @@ def _RoutingFunctionGradient(op, grad):
   Returns:
     Gradients with respect to the input of the RoutingFunction op.
   """
-  routing_gradient = _training_ops.routing_gradient
+  routing_gradient = gen_training_ops.routing_gradient
 
   input_data_tensor = op.inputs[0]
   tree_weights_tensor = op.inputs[1]
@@ -129,8 +130,8 @@ def _StochasticHardRoutingFunctionGradient(op, routing_grad, unused_path_grad):
   Returns:
     Gradients with respect to the input of the RoutingFunction op.
   """
-  gradient_op = _training_ops.stochastic_hard_routing_gradient
-  unpack_path_op = _training_ops.unpack_path
+  gradient_op = gen_training_ops.stochastic_hard_routing_gradient
+  unpack_path_op = gen_training_ops.unpack_path
 
   input_data_tensor = op.inputs[0]
   tree_weights_tensor = op.inputs[1]
@@ -208,7 +209,7 @@ def _KFeatureRoutingFunctionGradient(op, grad):
   Returns:
     Gradients with respect to the input of the RoutingFunction op.
   """
-  gradient_op = _training_ops.k_feature_gradient
+  gradient_op = gen_training_ops.k_feature_gradient
 
   input_data_tensor = op.inputs[0]
   tree_weights_tensor = op.inputs[1]
@@ -287,7 +288,7 @@ def Load():
     if not _training_ops:
       ops_path = resource_loader.get_path_to_datafile(TRAINING_OPS_FILE)
       logging.info('data path: %s', ops_path)
-      _training_ops = load_library.load_op_library(ops_path)
+      _training_ops = loader.load_op_library(ops_path)
 
       assert _training_ops, 'Could not load _training_ops.so'
   return _training_ops
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 39573e1859..9965aea651 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -771,6 +771,18 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
                    }),
   )
 
+def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
+                            srcs_version="PY2AND3", visibility=None, deps=[]):
+  kernels = kernels  # unused argument
+  native.py_library(
+      name=name,
+      data=dso,
+      srcs=srcs,
+      srcs_version=srcs_version,
+      visibility=visibility,
+      deps=deps,
+  )
+
 def tf_extension_linkopts():
   return []  # No extension link opts
 
-- 
GitLab


From a11ec64233c9ac67901f2a47133f9a7f9e0ef774 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 27 Mar 2017 15:56:56 -0800
Subject: [PATCH 0002/1563] Internal change. Change: 151391358

---
 tensorflow/tools/docs/generate_lib.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/docs/generate_lib.py b/tensorflow/tools/docs/generate_lib.py
index 3e750ed059..b173f869dd 100644
--- a/tensorflow/tools/docs/generate_lib.py
+++ b/tensorflow/tools/docs/generate_lib.py
@@ -149,14 +149,15 @@ def write_docs(output_dir, parser_config, duplicate_of, index, yaml_toc):
         f.write('  - title: ' + module + '\n'
                 '    section:\n' +
                 '    - title: Overview\n' +
-                '      path: /TARGET_DOC_ROOT/' + symbol_to_file[module] + '\n')
+                '      path: /TARGET_DOC_ROOT/VERSION/' +
+                symbol_to_file[module] + '\n')
 
         symbols_in_module = module_children.get(module, [])
         symbols_in_module.sort(key=lambda a: a.upper())
 
         for full_name in symbols_in_module:
           f.write('    - title: ' + full_name[len(module)+1:] + '\n'
-                  '      path: /TARGET_DOC_ROOT/' +
+                  '      path: /TARGET_DOC_ROOT/VERSION/' +
                   symbol_to_file[full_name] + '\n')
 
   # Write a global index containing all full names with links.
-- 
GitLab


From c617074d0988ff4301f2ed613f791238e2676876 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 28 Mar 2017 11:00:20 -0800
Subject: [PATCH 0003/1563] Fixes correctness of ProximalAdagrad and
 ProximalGradientDescent under normal training with L1/L2.

Also fixes issue where optimizers write to the same memory location multiple times, causing inconsistencies during distributed training.
Change: 151479203
---
 tensorflow/core/kernels/training_ops.cc       | 87 +++++++++----------
 .../python/training/proximal_adagrad_test.py  |  6 +-
 .../proximal_gradient_descent_test.py         |  4 +-
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index 2159350443..c7a5ea3a9c 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -92,15 +92,14 @@ struct ApplyProximalGradientDescent<CPUDevice, T> {
     // compute v = w - lr * grad.
     prox_var.device(d) -= grad * lr();
     if (l1() > 0) {
-      var.device(d) = prox_var.abs() - var.constant(lr() * l1());
       // compute sign(v) * max(|v| - lr * l1, 0)
-      var.device(d) = prox_var.sign() * var.cwiseMax(T(0.0));
+      var.device(d) =
+          prox_var.sign() *
+          (prox_var.abs() - var.constant(lr() * l1())).cwiseMax(T(0.0)) /
+          (var.constant(1.0) + var.constant(l2() * lr()));
     } else {
-      var.device(d) = prox_var;
-    }
-    if (l2() > 0) {
-      // compute v / (1.0 + l2 * lr)
-      var.device(d) = var / (var.constant(1.0) + var.constant(l2() * lr()));
+      var.device(d) =
+          prox_var / (var.constant(1.0) + var.constant(l2() * lr()));
     }
   }
 };
@@ -169,15 +168,14 @@ struct ApplyProximalAdagrad<CPUDevice, T> {
     // compute v = w - lr * grad.
     prox_var.device(d) -= grad * learning_rate;
     if (l1() > 0) {
-      var.device(d) = prox_var.abs() - learning_rate * prox_var.constant(l1());
       // compute sign(v) * max(|v| - lr * l1, 0)
-      var.device(d) = prox_var.sign() * var.cwiseMax(T(0.0));
+      var.device(d) = prox_var.sign() *
+                      (prox_var.abs() - learning_rate * prox_var.constant(l1()))
+                          .cwiseMax(T(0.0)) /
+                      (var.constant(1.0) + var.constant(l2()) * learning_rate);
     } else {
-      var.device(d) = prox_var;
-    }
-    if (l2() > 0) {
       var.device(d) =
-          var / (var.constant(1.0) + var.constant(l2()) * learning_rate);
+          prox_var / (var.constant(1.0) + var.constant(l2()) * learning_rate);
     }
   }
 };
@@ -205,14 +203,17 @@ struct ApplyFtrl<CPUDevice, T> {
     if (lr_power() == static_cast<T>(-0.5)) {
       auto y = new_accum.sqrt() / new_accum.constant(lr()) +
                linear.constant(static_cast<T>(2) * l2());
-      var.device(d) = x / y;
+      auto pre_shrink = x / y;
+      var.device(d) = (linear.abs() > linear.constant(l1()))
+                          .select(pre_shrink, var.constant(static_cast<T>(0)));
+
     } else {
       auto y = new_accum.pow(-lr_power()) / new_accum.constant(lr()) +
                linear.constant(static_cast<T>(2) * l2());
-      var.device(d) = x / y;
+      auto pre_shrink = x / y;
+      var.device(d) = (linear.abs() > linear.constant(l1()))
+                          .select(pre_shrink, var.constant(static_cast<T>(0)));
     }
-    var.device(d) = (linear.abs() > linear.constant(l1()))
-                        .select(var, var.constant(static_cast<T>(0)));
     accum.device(d) += grad.square();
   }
 };
@@ -889,14 +890,14 @@ class SparseApplyProximalGradientDescentOp : public OpKernel {
           // v = w - g * learning_rate.
           prox_v -= g * learning_rate;
           if (l1_scalar > 0) {
-            v = prox_v.abs() - learning_rate * prox_v.constant(l1_scalar);
             // compute sign(v) * max(|v|, 0)
-            v = prox_v.sign() * v.cwiseMax(static_cast<T>(0.0));
+            v = prox_v.sign() *
+                (prox_v.abs() - learning_rate * prox_v.constant(l1_scalar))
+                    .cwiseMax(static_cast<T>(0.0)) /
+                (v.constant(1.0) + v.constant(l2_scalar) * learning_rate);
           } else {
-            v = prox_v;
-          }
-          if (l2_scalar > 0) {
-            v /= (v.constant(1.0) + v.constant(l2_scalar) * learning_rate);
+            v = prox_v /
+                (v.constant(1.0) + v.constant(l2_scalar) * learning_rate);
           }
         }
       } else {
@@ -919,14 +920,13 @@ class SparseApplyProximalGradientDescentOp : public OpKernel {
           auto prox_v = var_flat(index);
           prox_v -= learning_rate * g;
           if (l1_scalar > 0) {
-            var_flat(index) = std::abs(prox_v) - learning_rate * l1_scalar;
             var_flat(index) =
-                sgn(prox_v) * std::max(var_flat(index), static_cast<T>(0.0));
+                sgn(prox_v) *
+                std::max(std::abs(prox_v) - learning_rate * l1_scalar,
+                         static_cast<T>(0.0)) /
+                (1.0 + l2_scalar * learning_rate);
           } else {
-            var_flat(index) = prox_v;
-          }
-          if (l2_scalar > 0) {
-            var_flat(index) /= (1.0 + l2_scalar * learning_rate);
+            var_flat(index) = prox_v / (1.0 + l2_scalar * learning_rate);
           }
         }
       }
@@ -1381,14 +1381,14 @@ class SparseApplyProximalAdagradOp : public OpKernel {
           // v = w - g * learning_rate.
           prox_v -= g * learning_rate;
           if (l1_scalar > 0) {
-            v = prox_v.abs() - learning_rate * prox_v.constant(l1_scalar);
             // compute sign(v) * max(|v|, 0)
-            v = prox_v.sign() * v.cwiseMax(static_cast<T>(0.0));
+            v = prox_v.sign() *
+                (prox_v.abs() - learning_rate * prox_v.constant(l1_scalar))
+                    .cwiseMax(static_cast<T>(0.0)) /
+                (v.constant(1.0) + v.constant(l2_scalar) * learning_rate);
           } else {
-            v = prox_v;
-          }
-          if (l2_scalar > 0) {
-            v /= (v.constant(1.0) + v.constant(l2_scalar) * learning_rate);
+            v = prox_v /
+                (v.constant(1.0) + v.constant(l2_scalar) * learning_rate);
           }
         }
       } else {
@@ -1414,14 +1414,13 @@ class SparseApplyProximalAdagradOp : public OpKernel {
           auto prox_v = var_flat(index);
           prox_v -= learning_rate * g;
           if (l1_scalar > 0) {
-            var_flat(index) = std::abs(prox_v) - learning_rate * l1_scalar;
             var_flat(index) =
-                sgn(prox_v) * std::max(var_flat(index), static_cast<T>(0.0));
+                sgn(prox_v) *
+                std::max(std::abs(prox_v) - learning_rate * l1_scalar,
+                         static_cast<T>(0.0)) /
+                (1.0 + l2_scalar * learning_rate);
           } else {
-            var_flat(index) = prox_v;
-          }
-          if (l2_scalar > 0) {
-            var_flat(index) /= (1.0 + l2_scalar * learning_rate);
+            var_flat(index) = prox_v / (1.0 + l2_scalar * learning_rate);
           }
         }
       }
@@ -1672,10 +1671,10 @@ class SparseApplyAdagradDAOp : public OpKernel {
           ga += g;
           da += g.square();
           if (l1_scalar > 0) {
-            v = (ga.abs() / ga.constant(global_step_scalar)) -
-                ga.constant(l1_scalar);
             v = ga.constant(-1.0) * ga.sign() *
-                v.cwiseMax(static_cast<T>(0.0)) /
+                ((ga.abs() / ga.constant(global_step_scalar)) -
+                 ga.constant(l1_scalar))
+                    .cwiseMax(static_cast<T>(0.0)) /
                 (v.constant(l2_scalar) + da.sqrt() / v.constant(gs_lr));
           } else {
             v = ga.constant(-1.0) * (ga / ga.constant(global_step_scalar)) /
diff --git a/tensorflow/python/training/proximal_adagrad_test.py b/tensorflow/python/training/proximal_adagrad_test.py
index 28e28687f4..1da7f75531 100644
--- a/tensorflow/python/training/proximal_adagrad_test.py
+++ b/tensorflow/python/training/proximal_adagrad_test.py
@@ -132,7 +132,7 @@ class ProximalAdagradOptimizerTest(test.TestCase):
       for _ in range(10):
         update.run()
       v0_val, v1_val = sess.run([var0, var1])
-      self.assertAllClose(np.array([0.662907, 0.767398]), v0_val)
+      self.assertAllClose(np.array([-6.663634, -9.190331]), v0_val)
       self.assertAllClose(np.array([2.959304, 1.029232]), v1_val)
 
   def testProximalAdagradWithL1_L2(self):
@@ -159,8 +159,8 @@ class ProximalAdagradOptimizerTest(test.TestCase):
         update.run()
 
       v0_val, v1_val = sess.run([var0, var1])
-      self.assertAllClose(np.array([0.043069, 0.080461]), v0_val)
-      self.assertAllClose(np.array([0.004069, 0.008578]), v1_val)
+      self.assertAllClose(np.array([-0.0495, -0.0995]), v0_val)
+      self.assertAllClose(np.array([-0.0045, -0.0095]), v1_val)
 
   def applyOptimizer(self, opt, steps=5, is_sparse=False):
     if is_sparse:
diff --git a/tensorflow/python/training/proximal_gradient_descent_test.py b/tensorflow/python/training/proximal_gradient_descent_test.py
index 9c5ea67015..4e4812fe60 100644
--- a/tensorflow/python/training/proximal_gradient_descent_test.py
+++ b/tensorflow/python/training/proximal_gradient_descent_test.py
@@ -131,8 +131,8 @@ class ProximalGradientDescentOptimizerTest(test.TestCase):
         update.run()
 
       v0_val, v1_val = sess.run([var0, var1])
-      self.assertAllClose(np.array([0.037125, 0.074625]), v0_val)
-      self.assertAllClose(np.array([0.003375, 0.007125]), v1_val)
+      self.assertAllClose(np.array([-0.0495, -0.0995]), v0_val)
+      self.assertAllClose(np.array([-0.0045, -0.0095]), v1_val)
 
   def applyOptimizer(self, opt, steps=5, is_sparse=False):
     if is_sparse:
-- 
GitLab


From f169e819cb1a29be4898347022de6529d3c9c844 Mon Sep 17 00:00:00 2001
From: Alexey Surkov <surkov@google.com>
Date: Tue, 28 Mar 2017 15:43:55 -0800
Subject: [PATCH 0004/1563] Support for domain buckets, e.g
 gs://bucketname.domain-example.com/... Change: 151516660

---
 .../core/platform/cloud/gcs_file_system.cc    |  2 +-
 .../platform/cloud/gcs_file_system_test.cc    | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tensorflow/core/platform/cloud/gcs_file_system.cc b/tensorflow/core/platform/cloud/gcs_file_system.cc
index c8bae1a02a..5ee3099673 100644
--- a/tensorflow/core/platform/cloud/gcs_file_system.cc
+++ b/tensorflow/core/platform/cloud/gcs_file_system.cc
@@ -273,7 +273,7 @@ class GcsRandomAccessFile : public RandomAccessFile {
     std::unique_ptr<HttpRequest> request(http_request_factory_->Create());
     TF_RETURN_IF_ERROR(request->Init());
     TF_RETURN_IF_ERROR(
-        request->SetUri(strings::StrCat("https://", bucket_, ".", kStorageHost,
+        request->SetUri(strings::StrCat("https://", kStorageHost, "/", bucket_,
                                         "/", request->EscapeString(object_))));
     TF_RETURN_IF_ERROR(request->AddAuthBearerHeader(auth_token));
     TF_RETURN_IF_ERROR(request->SetRange(
diff --git a/tensorflow/core/platform/cloud/gcs_file_system_test.cc b/tensorflow/core/platform/cloud/gcs_file_system_test.cc
index a7d1e60d9e..fc79f3be11 100644
--- a/tensorflow/core/platform/cloud/gcs_file_system_test.cc
+++ b/tensorflow/core/platform/cloud/gcs_file_system_test.cc
@@ -33,12 +33,12 @@ class FakeAuthProvider : public AuthProvider {
 TEST(GcsFileSystemTest, NewRandomAccessFile_NoReadAhead) {
   std::vector<HttpRequest*> requests(
       {new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 0-5\n",
            "012345"),
        new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 6-11\n",
            "6789")});
@@ -67,12 +67,12 @@ TEST(GcsFileSystemTest, NewRandomAccessFile_NoReadAhead) {
 TEST(GcsFileSystemTest, NewRandomAccessFile_NoReadAhead_differentN) {
   std::vector<HttpRequest*> requests(
       {new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 0-2\n",
            "012"),
        new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 3-12\n",
            "3456789")});
@@ -104,32 +104,32 @@ TEST(GcsFileSystemTest, NewRandomAccessFile_NoReadAhead_differentN) {
 TEST(GcsFileSystemTest, NewRandomAccessFile_WithReadAhead) {
   std::vector<HttpRequest*> requests(
       {new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 0-8\n",
            "012345678"),
        new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 6-14\n",
            "6789abcde"),
        new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 6-20\n",
            "6789abcd"),
        new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 7-21\n",
            "789abcdef"),
        new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 20-34\n",
            ""),
        new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/random_access.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/random_access.txt\n"
            "Auth Token: fake_token\n"
            "Range: 0-14\n",
            "01234567")});
@@ -446,7 +446,7 @@ TEST(GcsFileSystemTest, NewWritableFile_NoObjectName) {
 TEST(GcsFileSystemTest, NewAppendableFile) {
   std::vector<HttpRequest*> requests(
       {new FakeHttpRequest(
-           "Uri: https://bucket.storage.googleapis.com/path%2Fappendable.txt\n"
+           "Uri: https://storage.googleapis.com/bucket/path%2Fappendable.txt\n"
            "Auth Token: fake_token\n"
            "Range: 0-1048575\n",
            "content1,"),
@@ -496,7 +496,7 @@ TEST(GcsFileSystemTest, NewReadOnlyMemoryRegionFromFile) {
            strings::StrCat("{\"size\": \"", content.size(),
                            "\", \"updated\": \"2016-04-29T23:15:24.896Z\"}")),
        new FakeHttpRequest(
-           strings::StrCat("Uri: https://bucket.storage.googleapis.com/"
+           strings::StrCat("Uri: https://storage.googleapis.com/bucket/"
                            "path%2Frandom_access.txt\n"
                            "Auth Token: fake_token\n"
                            "Range: 0-",
-- 
GitLab


From e58377ec41d6e6b48cbfa75ceb70f9212068ecb4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 30 Mar 2017 08:47:21 -0800
Subject: [PATCH 0005/1563] Initial release of installation guides for Java, C,
 and Go. Updated leftnav_files to provide pointers to new installation guides.
 Updated landing page (index.md) to distinguish between OS installs and
 language installs. Change: 151712658

---
 tensorflow/docs_src/install/index.md        |  17 +-
 tensorflow/docs_src/install/install_c.md    | 115 ++++++++++
 tensorflow/docs_src/install/install_go.md   | 139 ++++++++++++
 tensorflow/docs_src/install/install_java.md | 236 ++++++++++++++++++++
 tensorflow/docs_src/install/leftnav_files   |   5 +
 5 files changed, 509 insertions(+), 3 deletions(-)
 create mode 100644 tensorflow/docs_src/install/install_c.md
 create mode 100644 tensorflow/docs_src/install/install_go.md
 create mode 100644 tensorflow/docs_src/install/install_java.md

diff --git a/tensorflow/docs_src/install/index.md b/tensorflow/docs_src/install/index.md
index 2532af4561..05a1af320f 100644
--- a/tensorflow/docs_src/install/index.md
+++ b/tensorflow/docs_src/install/index.md
@@ -1,13 +1,24 @@
 # Installing TensorFlow
 
-We provide installation instructions for the following platforms:
+The following guides explain how to install a version of TensorFlow
+that enables you to write applications in Python:
 
   * @{$install_linux$Installing TensorFlow on Ubuntu}
   * @{$install_mac$Installing TensorFlow on Mac OS X}
   * @{$install_windows$Installing TensorFlow on Windows}
   * @{$install_sources$Installing TensorFlow from Sources}
 
-The following guide explains how to migrate your older TensorFlow
-applications to Version 1.0:
+Many aspects of the Python TensorFlow API changed from version 0.n to 1.0.
+The following guide explains how to migrate older TensorFlow applications
+to Version 1.0:
 
   * @{$migration$Transitioning to TensorFlow 1.0}
+
+The following guides explain how to install TensorFlow libraries for use in
+other programming languages. These APIs are aimed at deploying TensorFlow
+models in applications and are not as extensive as the Python APIs.
+
+  * @{$install_java$Installing TensorFlow for Java}
+  * @{$install_c$Installing TensorFlow for C}
+  * @{$install_go$Installing TensorFlow for Go}
+
diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
new file mode 100644
index 0000000000..c1c7b66546
--- /dev/null
+++ b/tensorflow/docs_src/install/install_c.md
@@ -0,0 +1,115 @@
+# Installing TensorFlow for C
+
+TensorFlow provides a C API defined in
+[`c_api.h`](https://github.com/tensorflow/tensorflow/tree/master/c/c_api.h),
+which is suitable for
+[building bindings for other languages](https://www.tensorflow.org/extend/language_bindings).
+The API leans towards simplicity and uniformity rather than convenience.
+
+
+## Supported Platforms
+
+You may install TensorFlow for C on the following operating systems:
+
+  * Linux
+  * Mac OS X
+
+
+## Installation
+
+Take the following steps to install the TensorFlow for C library and
+enable TensorFlow for C:
+
+  1. Decide whether you will run TensorFlow for C on CPU(s) only or
+     with the help of GPU(s). To help you decide, read the section
+     entitled "Determine which TensorFlow to install" in one of the
+     following guides:
+
+       * @{$install_linux#determine_which_tensorflow_to_install$Installing TensorFlow on Linux}
+       * @{$install_mac#determine_which_tensorflow_to_install$Installing TensorFlow on Mac OS}
+
+  2. Download and extract the TensorFlow C library into `/usr/local/lib` by
+     invoking the following shell commands:
+
+         TF_TYPE="cpu" # Change to "gpu" for GPU support
+         OS="linux" # Change to "darwin" for Mac OS
+         TARGET_DIRECTORY="/usr/local"
+         curl -L \
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           sudo tar -C $TARGET_DIRECTORY -xz
+
+     The `tar` command extracts the TensorFlow C library into the `lib`
+     subdirectory of `TARGET_DIRECTORY`. For example, specifying `/usr/local`
+     as `TARGET_DIRECTORY` causes `tar` to extract the TensorFlow C library
+     into `/usr/local/lib`.
+
+     If you'd prefer to extract the library into a different directory,
+     adjust `TARGET_DIRECTORY` accordingly.
+
+  3. In Step 2, if you specified a system directory (for example, `/usr/local`)
+     as the `TARGET_DIRECTORY`, then run `ldconfig` to configure the linker.
+     For example:
+
+     <pre><b>sudo ldconfig</b></pre>
+
+     If you assigned a `TARGET_DIRECTORY` other than a system
+     directory (for example, `~/mydir`), then you must append the extraction
+     directory (for example, `~/mydir/lib`) to two environment variables.
+     For example:
+
+     <pre> <b>export LIBRARY_PATH=$LIBRARY_PATH:~/mydir/lib</b> # For both Linux and Mac OS X
+     <b>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:~/mydir/lib</b> # For Linux only
+     <b>export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:~/mydir/lib</b> # For Mac OS X only</pre>
+
+
+
+## Validate your installation
+
+After installing TensorFlow for C, enter the following code into a file named
+`hello_tf.c`:
+
+```c
+#include <stdio.h>
+#include <tensorflow/c/c_api.h>
+
+int main() {
+  printf(“Hello from TensorFlow C library version %s\n”, TF_Version());
+  return 0;
+}
+```
+
+### Build and Run
+
+Build `hello_tf.c` by invoking the following command:
+
+
+<pre><b>gcc hello_tf.c</b></pre>
+
+
+Running the resulting executable should output the following message:
+
+
+<pre><b>a.out</b>
+Hello from TensorFlow C library version <i>number</i></pre>
+
+
+### Troubleshooting
+
+If building the program fails, the most likely culprit is that `gcc` cannot
+find the TensorFlow C library.  One way to fix this problem is to specify
+the `-I` and `-L` options to `gcc`.  For example, if the `TARGET_LIBRARY`
+was `/usr/local`, you would invoke `gcc` as follows:
+
+<pre><b>gcc -I/usr/local/include -L/usr/local/lib hello_tf.c -ltensorflow</b></pre>
+
+If executing `a.out` fails, ask yourself the following questions:
+
+  * Did the program build without error?
+  * Have you assigned the correct directory to the environment variables
+    noted in Step 3 of [Installation](#installation)?
+  * Did you export those environment variables?
+
+If you are still seeing build or execution error messages, search (or post to)
+[StackOverflow](www.stackoverflow.com/questions/tagged/tensorflow) for
+possible solutions.
+
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
new file mode 100644
index 0000000000..c9abaf2aca
--- /dev/null
+++ b/tensorflow/docs_src/install/install_go.md
@@ -0,0 +1,139 @@
+# Installing TensorFlow for Go
+
+TensorFlow provides APIs for use in Go programs. These APIs are particularly
+well-suited to loading models created in Python and executing them within
+a Go application. This guide explains how to install and set up the
+[TensorFlow Go package](https://godoc.org/github.com/tensorflow/tensorflow/tensorflow/go).
+
+**WARNING:** The TensorFlow Go API is *not* covered by the TensorFlow
+[API stability guarantees](https://www.tensorflow.org/programmers_guide/version_semantics).
+
+
+## Supported Platforms
+
+You may install TensorFlow for Go on the following operating systems:
+
+  * Linux
+  * Mac OS X
+
+
+## Installation
+
+TensorFlow for Go depends on the TensorFlow C library. Take the following
+steps to install this library and enable TensorFlow for Go:
+
+  1. Decide whether you will run TensorFlow for Go on CPU(s) only or with
+     the help of GPU(s). To help you decide, read the section entitled
+     "Determine which TensorFlow to install" in one of the following guides:
+
+     * @{$install_linux#determine_which_tensorflow_to_install$Installing TensorFlow on Linux}
+     * @{$install_mac#determine_which_tensorflow_to_install$Installing TensorFlow on Mac OS}
+
+  2. Download and extract the TensorFlow C library into `/usr/local/lib` by
+     invoking the following shell commands:
+
+         TF_TYPE="cpu" # Change to "gpu" for GPU support
+         TARGET_DIRECTORY='/usr/local'
+         curl -L \
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0.tar.gz" |
+         sudo tar -C $TARGET_DIRECTORY -xz
+
+     The `tar` command extracts the TensorFlow C library into the `lib`
+     subdirectory of `TARGET_DIRECTORY`. For example, specifying `/usr/local`
+     as `TARGET_DIRECTORY` causes `tar` to extract the TensorFlow C library
+     into `/usr/local/lib`.
+
+     If you'd prefer to extract the library into a different directory,
+     adjust `TARGET_DIRECTORY` accordingly.
+
+  3. In Step 2, if you specified a system directory (for example, `/usr/local`)
+     as the `TARGET_DIRECTORY`, then run `ldconfig` to configure the linker.
+     For example:
+
+     <pre><b>sudo ldconfig</b></pre>
+
+     If you assigned a `TARGET_DIRECTORY` other than a system
+     directory (for example, `~/mydir`), then you must append the extraction
+     directory (for example, `~/mydir/lib`) to two environment variables
+     as follows:
+
+     <pre> <b>export LIBRARY_PATH=$LIBRARY_PATH:~/mydir/lib</b> # For both Linux and Mac OS X
+     <b>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:~/mydir/lib</b> # For Linux only
+     <b>export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:~/mydir/lib</b> # For Mac OS X only</pre>
+
+  4. Now that the TensorFlow C library is installed, invoke `go get` as follows
+     to download the appropriate packages and their dependencies:
+
+     <pre><b>go get github.com/tensorflow/tensorflow/tensorflow/go</b></pre>
+
+  5. Invoke `go test` as follows to validate the TensorFlow for Go
+     installation:
+
+     <pre><b>go test github.com/tensorflow/tensorflow/tensorflow/go</b></pre>
+
+If `go get` or `go test` generate error messages, search (or post to)
+[StackOverflow](http://www.stackoverflow.com/questions/tagged/tensorflow)
+for possible solutions.
+
+
+## Hello World
+
+After installing TensorFlow for Go, enter the following code into a
+file named `hello_tf.go`:
+
+```go
+package main
+
+import (
+	tf "github.com/tensorflow/tensorflow/tensorflow/go"
+	"github.com/tensorflow/tensorflow/tensorflow/go/op"
+	"fmt"
+)
+
+func main() {
+	// Construct a graph with an operation that produces a string constant.
+	s := op.NewScope()
+	c := op.Const(s, "Hello from TensorFlow version " + tf.Version())
+	graph, err := s.Finalize()
+	if err != nil {
+		panic(err)
+	}
+
+	// Execute the graph in a session.
+	sess, err := tf.NewSession(graph, nil)
+	if err != nil {
+		panic(err)
+	}
+	output, err := sess.Run(nil, []tf.Output{c}, nil)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(output[0].Value())
+}
+```
+
+For a more advanced example of TensorFlow in Go, look at the
+[example in the API documentation](https://godoc.org/github.com/tensorflow/tensorflow/tensorflow/go#ex-package),
+which uses a pre-trained TensorFlow model to label contents of an image.
+
+
+### Running
+
+Run `hello_tf.go` by invoking the following command:
+
+<pre><b>go run hello_tf.go</b>
+Hello from TensorFlow version <i>number</i></pre>
+
+The program might also generate multiple warning messages of the
+following form, which you can ignore:
+
+<pre>W tensorflow/core/platform/cpu_feature_guard.cc:45] The TensorFlow library
+wasn't compiled to use *Type* instructions, but these are available on your
+machine and could speed up CPU computations.</pre>
+
+
+## Building from source code
+
+TensorFlow is open-source. You may build TensorFlow for Go from the
+TensorFlow source code by following the instructions in a
+[separate document](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/go/README.md).
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
new file mode 100644
index 0000000000..56c4b8d2c5
--- /dev/null
+++ b/tensorflow/docs_src/install/install_java.md
@@ -0,0 +1,236 @@
+# Installing TensorFlow for Java
+
+TensorFlow provides APIs for use in Java programs. These APIs are particularly
+well-suited to loading models created in Python and executing them within a
+Java application. This guide explains how to install
+[TensorFlow for Java](https://www.tensorflow.org/api_docs/java/reference/org/tensorflow/package-summary)
+and use it in a Java application.
+
+**WARNING:** The TensorFlow Java API is *not* covered by the TensorFlow
+[API stability guarantees](https://www.tensorflow.org/programmers_guide/version_semantics).
+
+
+## Supported Platforms
+
+TensorFlow for Java is supported on the following operating systems:
+
+  * Linux
+  * Mac OS X
+  * Windows
+  * Android
+
+The installation instructions for Android are in a separate
+[Android TensorFlow Support page](https://www.tensorflow.org/code/tensorflow/contrib/android).
+After installation, please see this
+[complete example](https://www.tensorflow.org/code/tensorflow/examples/android)
+of TensorFlow on Android.
+
+## Using TensorFlow with a Maven project
+
+If your project uses [Apache Maven](https://maven.apache.org), then add the
+following to the project's `pom.xml` to use the TensorFlow Java APIs:
+
+```xml
+<dependency>
+  <groupId>org.tensorflow</groupId>
+  <artifactId>tensorflow</artifactId>
+  <version>1.1.0</version>
+</dependency>
+```
+
+That's all.
+
+### Example
+
+As an example, these steps will create a Maven project that uses TensorFlow:
+
+  1. Create the project's `pom.xml`:
+
+
+         <project>
+             <modelVersion>4.0.0</modelVersion>
+             <groupId>org.myorg</groupId>
+             <artifactId>label-image</artifactId>
+             <version>1.0-SNAPSHOT</version>
+             <properties>
+               <exec.mainClass>HelloTF</exec.mainClass>
+               <!-- The sample code requires at least JDK 1.7. -->
+               <!-- The maven compiler plugin defaults to a lower version -->
+               <maven.compiler.source>1.7</maven.compiler.source>
+               <maven.compiler.target>1.7</maven.compiler.target>
+             </properties>
+             <dependencies>
+               <dependency>
+                 <groupId>org.tensorflow</groupId>
+                 <artifactId>tensorflow</artifactId>
+                 <version>1.1.0</version>
+               </dependency>
+             </dependencies>
+         </project>
+
+
+  2. Create the source file (`src/main/java/HelloTF.java`):
+
+
+        import org.tensorflow.Graph;
+        import org.tensorflow.Session;
+        import org.tensorflow.Tensor;
+        import org.tensorflow.TensorFlow;
+
+        public class HelloTF {
+          public static void main(String[] args) throws Exception {
+            try (Graph g = new Graph()) {
+              final String value = "Hello from " + TensorFlow.version();
+     
+              // Construct the computation graph with a single operation, a constant
+              // named "MyConst" with a value "value".
+              try (Tensor t = Tensor.create(value.getBytes("UTF-8"))) {
+                // The Java API doesn't yet include convenience functions for adding operations.
+                g.opBuilder("Const", "MyConst").setAttr("dtype", t.dataType()).setAttr("value", t).build();
+              }
+     
+              // Execute the "MyConst" operation in a Session.
+              try (Session s = new Session(g);
+                   Tensor output = s.runner().fetch("MyConst").run().get(0)) {
+                System.out.println(new String(output.bytesValue(), "UTF-8"));
+              }
+            }
+          }
+        }
+
+
+  3. Compile and execute:
+
+     <pre> # Use -q to hide logging from the mvn tool
+     <b>mvn -q compile exec:java</b></pre>
+
+
+The preceeding command should output <tt>Hello from <i>version</i></tt>. If it
+does, you've succesfully set up TensorFlow for Java and are ready to use it in
+Maven projects. If not, check
+[Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow)
+for possible solutions.  You can skip reading the rest of this document.
+
+## Using TensorFlow with JDK
+
+This section describes how to use TensorFlow using the `java` and `javac`
+commands from a JDK installation. If your project uses Apache Maven, then
+refer to the simpler instructions above instead.
+
+### Install on Linux or Mac OS
+
+Take the following steps to install TensorFlow for Java on Linux or Mac OS:
+
+  1. Download
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     which is the TensorFlow Java Archive (JAR).
+
+  2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
+     the help of GPU(s). To help you decide, read the section entitled
+     "Determine which TensorFlow to install" in one of the following guides:
+
+     * @{$install_linux#determine_which_tensorflow_to_install$Installing TensorFlow on Linux}
+     * @{$install_mac#determine_which_tensorflow_to_install$Installing TensorFlow on Mac OS}
+
+  3. Download and extract the appropriate Java Native Interface (JNI)
+     file for your operating system and processor support by running the
+     following shell commands:
+
+
+         TF_TYPE="cpu" # Default processor is CPU. If you want GPU, set to "gpu"
+         OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+         mkdir -p ./jni
+         curl -L \
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           tar -xz -C ./jni
+
+### Install on Windows
+
+Take the following steps to install TensorFlow for Java on Windows:
+
+  1. Download
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     which is the TensorFlow Java Archive (JAR).
+  2. Download the following Java Native Interface (JNI) file appropriate for
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip).
+  3. Extract this .zip file.
+
+
+
+### Validate the installation
+
+After installing TensorFlow for Java, validate your installation by entering
+the following code into a file named `HelloTF.java`:
+
+```java
+import org.tensorflow.Graph;
+import org.tensorflow.Session;
+import org.tensorflow.Tensor;
+import org.tensorflow.TensorFlow;
+
+public class HelloTF {
+  public static void main(String[] args) throws Exception {
+    try (Graph g = new Graph()) {
+      final String value = "Hello from " + TensorFlow.version();
+
+      // Construct the computation graph with a single operation, a constant
+      // named "MyConst" with a value "value".
+      try (Tensor t = Tensor.create(value.getBytes("UTF-8"))) {
+        // The Java API doesn't yet include convenience functions for adding operations.
+        g.opBuilder("Const", "MyConst").setAttr("dtype", t.dataType()).setAttr("value", t).build();
+      }
+
+      // Execute the "MyConst" operation in a Session.
+      try (Session s = new Session(g);
+           Tensor output = s.runner().fetch("MyConst").run().get(0)) {
+        System.out.println(new String(output.bytesValue(), "UTF-8"));
+      }
+    }
+  }
+}
+```
+
+And use the instructions below to compile and run `HelloTF.java`.
+
+
+### Compiling
+
+When compiling a Java program that uses TensorFlow, the downloaded `.jar`
+must be part of your `classpath`. For example, you can include the
+downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
+as follows:
+
+<pre><b>javac -cp libtensorflow-1.1.0.jar HelloTF.java</b></pre>
+
+
+### Running
+
+To execute a Java program that depends on TensorFlow, ensure that the following
+two files are available to the JVM:
+
+  * the downloaded `.jar` file
+  * the extracted JNI library
+
+For example, the following command line executes the `HelloTF` program:
+
+<pre><b>java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+
+If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
+installed TensorFlow for Java and are ready to use the API.  If the program
+outputs something else, check
+[Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow)
+for possible solutions.
+
+
+### Advanced Example
+
+For a more sophisticated example, see
+[LabelImage.java](https://www.tensorflow.org/code/tensorflow/java/src/main/java/org/tensorflow/examples/LabelImage.java),
+which recognizes objects in an image.
+
+
+## Building from source code
+
+TensorFlow is open-source. You may build TensorFlow for Java from the
+TensorFlow source code by following the instructions in a
+[separate document](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/java/README.md).
diff --git a/tensorflow/docs_src/install/leftnav_files b/tensorflow/docs_src/install/leftnav_files
index d7b26bcd01..bc30d37bd0 100644
--- a/tensorflow/docs_src/install/leftnav_files
+++ b/tensorflow/docs_src/install/leftnav_files
@@ -2,4 +2,9 @@ install_linux.md
 install_mac.md
 install_windows.md
 install_sources.md
+>>>
 migration.md
+>>>
+install_java.md
+install_go.md
+install_c.md
-- 
GitLab


From 43e39f8e80d2e7578cc59c8a8b311ef211c23944 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 30 Mar 2017 14:48:02 -0800
Subject: [PATCH 0006/1563] Updating the Writing Tensorflow Documentation doc
 to reflect changes in TF1.0 and onward. Change: 151761382

---
 .../docs_src/community/documentation.md       | 674 ++++++++++++------
 1 file changed, 459 insertions(+), 215 deletions(-)
 mode change 100755 => 100644 tensorflow/docs_src/community/documentation.md

diff --git a/tensorflow/docs_src/community/documentation.md b/tensorflow/docs_src/community/documentation.md
old mode 100755
new mode 100644
index f8a63240a0..be18d3e8be
--- a/tensorflow/docs_src/community/documentation.md
+++ b/tensorflow/docs_src/community/documentation.md
@@ -1,55 +1,311 @@
 # Writing TensorFlow Documentation
 
-TensorFlow's documentation is maintained in
-[Markdown](https://daringfireball.net/projects/markdown/), and resides in the
-`g3doc/` directory. The *Introduction*, *Overview*, *Tutorials*, and *How-Tos*
-sections are manually edited.
+We welcome contributions to the Tensorflow documentation from the community.
+This document explains how you can contribute to that documentation. In
+particular, this document explains the following:
 
-Anything in the `g3doc/api_docs` directory is generated from comments in the
-code, and should not be edited directly. The script `tools/docs/gen_docs.sh`
-generates the API documentation. If called without arguments, it rebuilds the
-Python API documentation only (i.e., documentation for Ops, whether defined in
-Python or C++). If `-a` is passed, it also rebuilds the documentation for the
-C++ API. It must be called from the `tools/docs` directory, and if called with
-`-a`, requires `doxygen` to be installed.
+- Where the documentation is located.
+- How to make conformant edits.
+- How to build and test your documentation changes before you submit them.
 
-## Python API Documentation
+You can view Tensorflow documentation on tensorflow.org, and you can view and
+edit the raw files on Github.
+
+## A Note on Versions
+
+tensorflow.org, at root, shows documentation for the latest stable binary.  This
+is the documentation you should be reading if you are using `pip` to install
+TensorFlow.
+
+However, most developers will contribute documentation into the master Github
+branch, which is published, occasionally,
+at [tensorflow.org/versions/master](https://tensorflow.org/versions/master).
+
+If you want documentation changes to appear at root, you will need to also
+contribute that change to the current stable binary branch (and/or
+[cherrypick](https://www.google.com/url?sa=D&q=http%3A%2F%2Fstackoverflow.com%2Fquestions%2F9339429%2Fwhat-does-cherry-picking-a-commit-with-git-mean)).
+
+## Reference vs. non-reference documentation
+
+The following reference documentation is automatically generated from comments
+in the code:
+
+- C++ API reference docs
+- Java API reference docs
+- Python API reference docs
+
+To modify the reference documentation, you edit the appropriate code comments.
+
+Non-reference documentation (for example, the TensorFlow installation guides) is
+authored by humans. This documentation is located in the `tensorflow/docs_src`
+directory.  Each subdirectory of `docs_src` contains a set of related Tensorflow
+documentation. For example, the TensorFlow installation guides are all in the
+`docs_src/install` directory.
+
+The C++ documentation is generated from XML files generated via doxygen;
+however, those tools are not available in open source at this time.
+
+## Markdown
+
+Editable TensorFlow documentation is written in Markdown. With a few exceptions,
+TensorFlow uses
+the [standard Markdown rules](https://daringfireball.net/projects/markdown/).
+
+This section explains the primary differences between standard Markdown rules
+and the Markdown rules that editable TensorFlow documentation uses.
+
+### Math in Markdown
+
+You may use MathJax within TensorFlow when editing Markdown files, but note the
+following:
+
+- MathJax renders properly on [tensorflow.org](https://www.tensorflow.org)
+- MathJax does not render properly on [github](https://github.com/tensorflow/tensorflow).
+
+When writing MathJax, you can use <code>&#36;&#36;</code> and `\\(` and `\\)` to
+surround your math.  <code>&#36;&#36;</code> guards will cause line breaks, so
+within text, use `\\(` `\\)` instead.
+
+### Links in Markdown
+
+Links fall into a few categories:
+
+- Links to a different part of the same file
+- Links to a URL outside of tensorflow.org
+- Links from a Markdown file (or code comments) to another file within tensorflow.org
+
+For the first two link categories, you may use standard Markdown links, but put
+the link entirely on one line, rather than splitting it across lines. For
+example:
+
+- `[text](link)    # Good link`
+- `[text]\n(link)  # Bad link`
+- `[text](\nlink)  # Bad link`
+
+For the final link category (links to another file within tensorflow.org),
+please use a special link parameterization mechanism. This mechanism enables
+authors to move and reorganize files without breaking links.
+
+The parameterization scheme is as follows.  Use:
+
+<!-- Note: the use of &#64; is a hack so we don't translate these as symbols -->
+- <code>&#64;{tf.symbol}</code> to make a link to the reference page for a
+  Python symbol.  Note that class members don't get their own page, but the
+  syntax still works, since <code>&#64;{tf.MyClass.method}</code> links to the
+  proper part of the tf.MyClass page.
+
+- <code>&#64;{tensorflow::symbol}</code> to make a link to the reference page
+  for a C++ symbol.
+
+- <code>&#64;{$doc_page}</code> to make a link to another (not an API reference)
+    doc page. To link to
+
+    - `red/green/blue/index.md` use <code>&#64;{$blue}</code> or
+      <code>&#64;{$green/blue}</code>,
+
+    - `foo/bar/baz.md` use <code>&#64;{$baz}</code> or
+      <code>&#64;{$bar/baz}</code>.
+
+    The shorter one is preferred, so we can move pages around without breaking
+    these references. The main exception is that the Python API guides should
+    probably be referred to using <code>&#64;{$python/<guide-name>}</code> to
+    avoid ambiguity.
+
+- <code>&#64;{$doc_page#anchor-tag$link-text}</code> to link to an anchor in
+    that doc and use different link text (by default, the link text is the title
+    of the target page).
+
+    To override the link text only, omit  the `#anchor-tag`.
+
+To link to source code, use a link starting with:
+`https://www.tensorflow.org/code/`, followed by
+the file name starting at the github root. For instance, a link to the file you
+are currently reading should be written as
+`https://www.tensorflow.org/code/tensorflow/docs_src/community/documentation.md`.
+
+This URL naming scheme ensures
+that [tensorflow.org](https://www.tensorflow.org/) can forward the link to the
+branch of the code corresponding to the version of the documentation you're
+viewing. Do not include url parameters in the source code URL.
+
+## Generating docs and previewing links
+
+Before building the documentation, you must first set up your environment by
+doing the following:
+
+1. If pip isn't installed on your machine, install it now by issuing the
+following command:
+
+        $ sudo easy_install pip
+
+2. Use pip to install codegen, mock, and pandas by issuing the following
+   command (Note: If you are using
+   a [virtualenv](https://virtualenv.pypa.io/en/stable/) to manage your
+   dependencies, you may not want to use sudo for these installations):
+
+        $ sudo pip install codegen mock pandas
+
+3. If bazel is not installed on your machine, install it now. If you are on
+   Linux, install bazel by issuing the following command:
+
+        $ sudo apt-get install bazel  # Linux
+
+    If you are on Mac OS, find bazel installation instructions on
+    [this page](https://bazel.build/versions/master/docs/install.html#mac-os-x).
+
+4. Change directory to the top-level `tensorflow` directory of the TensorFlow
+   source code.
+
+5. Run the `configure` script and answer its prompts appropriately for your
+   system.
+
+        $ ./configure
+
+Then, change to the `tensorflow` directory which contains `docs_src` (`cd
+tensorflow`).  Run the following command to compile TensorFlow and generate the
+documentation in the `/tmp/tfdocs` dir:
+
+    bazel run tools/docs:generate -- \
+              --src_dir=`pwd`/tensorflow/docs_src/ \
+              --output_dir=/tmp/tfdocs/
+
+Note: You must set `src_dir` and `output_dir` to absolute file paths.
+
+## Generating Python API Documentation
 
 Ops, classes, and utility functions are defined in Python modules, such as
-`image_ops.py`. The module docstring is inserted at the beginning of the
-Markdown file generated for the Python file. Thus, `image_ops.md` starts with
-the module docstring in `image_ops.py`. `python/framework/gen_docs_combined.py`
-contains the list of all _libraries_ for which Markdown files are created. If
-you are adding a new library (generating a separate section in the API
-documentation), you have to add it to the list of libraries in
-`gen_docs_combined.py`. For the C++ api, only a single library file exists, its
-Markdown is a string in `gen_cc_md.py`, from which `api_docs/cc/index.md` is
-created. The rest of the C++ documentation is generated from XML files generated
-by doxygen.
-
-In the module docstring of a file registered as a library, you can insert
-generated docs for Ops, classes, and functions by calling them out with the
-syntax `@@<python-name>` (at the beginning of an otherwise empty line). The
-called-out op, function, or class does not have to be defined in the same file.
-
-This allows you to control the order in which the Ops, classes, and functions
-are documented. Group them in a logical order, with interspersed high level
+`image_ops.py`. Python modules contain a module docstring. For example:
+
+```python
+"""Image processing and decoding ops."""
+```
+
+The documentation generator places this module docstring at the beginning of the
+Markdown file generated for the module, in this
+case, [tf.image](https://www.tensorflow.org/api_docs/python/tf/image).
+
+It used to be a requirement to list every member of a module inside the module
+file at the beginning, putting a `@@` before each member. The `@@member_name`
+syntax is deprecated and no longer generates any docs. But depending on how a
+module is [sealed](#sealing_modules) it may still be necessary to mark the
+elements of the module’s contents as public. The called-out op, function, or
+class does not have to be defined in the same file. The next few sections of
+this document discuss sealing and how to add elements to the public
 documentation.
 
-Every public op, class or function must be called out with a `@@` entry in some
-library. If you don't, you will get `doc_gen_test` failures.
+The new documentation system automatically documents public symbols, except for
+the following:
+
+- Private symbols whose names start with an underscore.
+- Symbols originally defined in `object` or protobuf’s `Message`.
+- Some class members, such as `__base__`, `__class__`, which are dynamically
+  created but generally have no useful documentation.
+
+Only top level modules (currently just `tf` and `tfdbg`) need to be manually
+added to the generate script.
+
+### Sealing Modules
+
+Because the doc generator walks all visible symbols, and descends into anything
+it finds, it will document any accidentally exposed symbols. If a module only
+exposes symbols that are meant to be part of the public API, we call it
+**sealed**. Because of Python’s loose import and visibility conventions, naively
+written Python code will inadvertently expose a lot of modules which are
+implementation details. Improperly sealed modules may expose other unsealed
+modules, which will typically lead the doc generator to fail. **This failure is
+the intended behavior.** It ensures that our API is well defined, and allows us
+to change implementation details (including which modules are imported where)
+without fear of accidentally breaking users.
 
-Docs for Ops are automatically extracted from Python wrappers or C++ Ops
-registrations, Python wrappers have priority.
+If a module is accidentally imported, it typically breaks the doc generator
+(`generate_test`). This is a clear sign you need to seal your modules. However,
+even if the doc generator succeeds, unwanted symbols may show up in the
+docs. Check the generated docs to make sure that all symbols that are documented
+are expected. If there are symbols that shouldn’t be there, you have the
+following options for dealing with them: 
 
-* Python wrappers are in `python/ops/*.py`.
-* C++ Ops registrations are in `core/ops/*.cc`.
+- Private symbols and imports
+- The `remove_undocumented` filter
+- A traversal blacklist.
 
-Docs for Classes and Utility Functions are extracted from their docstrings.
+We'll discuss these options in detail below.
+
+#### Private Symbols and Imports
+
+The easiest way to conform to the API sealing expectations is to make non-public
+symbols private (by prepending an underscore _). The doc generator respects
+private symbols. This also applies to modules. If the only problem is that there
+is a small number of imported modules that show up in the docs (or break the
+generator), you can simply rename them on import, e.g.: `import sys as _sys`.
+
+Because Python considers all files to be modules, this applies to files as
+well. If you have a directory containing the following two files/modules:
+
+    module/__init__.py
+    module/private_impl.py
+
+Then, after `module` is imported, it will be possible to access
+`module.private_impl`. Renaming `private_impl.py` to `_private_impl.py` solves
+the problem. If renaming modules is awkward, read on.
+
+#### Use the `remove_undocumented` filter
+
+Another way to seal a module is to split your implementation from the API. To do
+so, consider using `remove_undocumented`, which takes a list of allowed symbols,
+and deletes everything else from the module. For example, the following snippet
+demonstrates how to put `remove_undocumented` in the `__init__.py` file for a
+module:
+
+__init__.py:
+
+    # Use * imports only if __all__ defined in some_file
+    from tensorflow.some_module.some_file import *
+
+    # Otherwise import symbols directly
+    from tensorflow.some_module.some_other_file import some_symbol
+
+    from tensorflow.platform.all_util import remove_undocumented
+
+    _allowed_symbols = [‘some_symbol’, ‘some_other_symbol’]
+
+    remove_undocumented(__name__, allowed_exception_list=_allowed_symbols)
+
+The `@@member_name` syntax is deprecated, but it still exists in some places in
+the documentation as an indicator to `remove_undocumented` that those symbols
+are public. All `@@`s will eventually be removed. If you see them, however,
+please do not randomly delete them as they are still in use by some of our
+systems.
+
+#### Traversal Blacklist
+
+If all else fails, you may add entries to the traversal blacklist in
+`generate_lib.py.` **Almost all entries in this list are an abuse of its
+purpose; avoid adding to it if you can!**
+
+The traversal blacklist maps qualified module names (without the leading `tf.`)
+to local names that are not to be descended into. For instance, the following
+entry will exclude `some_module` from traversal.
+
+    { ...
+      ‘contrib.my_module’: [‘some_module’]
+      ...
+    }
+
+That means that the doc generator will show that `some_module` exists, but it
+will not enumerate its content.
+
+This blacklist was originally intended to make sure that system modules (mock,
+flags, ...) included for platform abstraction can be documented without
+documenting their interior. Its use beyond this purpose is a shortcut that may
+be acceptable for contrib, but not for core tensorflow.
 
 ## Op Documentation Style Guide
 
-Ideally, you should provide the following information, in order of presentation:
+Long, descriptive module-level documentation for modules should go in the API
+Guides in `docs_src/api_guides/python`.
+
+For classes and ops, ideally, you should provide the following information, in
+order of presentation:
 
 * A short sentence that describes what the op does.
 * A short description of what happens when you pass arguments to the op.
@@ -58,27 +314,29 @@ Ideally, you should provide the following information, in order of presentation:
 * Descriptions of inputs, outputs, and Attrs or other parameters of the op
   constructor.
 
-Each of these is described in more detail
-[below](#description-of-the-docstring-sections).
+Each of these is described in more
+detail [below](#description-of-the-docstring-sections).
 
-Write your text in Markdown (.md) format. A basic syntax reference is
-[here](https://daringfireball.net/projects/markdown/). You are allowed to use
-[MathJax](https://www.mathjax.org) notation for equations. Those will be
-rendered properly on [tensorflow.org](https://www.tensorflow.org), but don't
-show up on [github](https://github.com/tensorflow/tensorflow).
+Write your text in Markdown format. A basic syntax reference
+is [here](https://daringfireball.net/projects/markdown/). You are allowed to
+use [MathJax](https://www.mathjax.org) notation for equations (see above for
+restrictions).
 
 ### Writing About Code
 
 Put backticks around these things when they're used in text:
 
-- Argument names (e.g. `input`, `x`, `tensor`)
-- Returned tensor names (e.g. `output`, `idx`, `out`)
-- Data types (e.g. `int32`, `float`, `uint8`)
-- Other op names referenced in text (e.g. `list_diff()`, `shuffle()`)
-- Class names (e.g. `Tensor` when you actually mean a `Tensor` object; don't
-  capitalize or use backticks if you're just explaining what an op does to a
-  tensor, or a graph, or an operation in general)
-- File names (e.g. `image_ops.py`, or `/path-to-your-data/xml/example-name`)
+* Argument names (for example, `input`, `x`, `tensor`)
+* Returned tensor names (for example, `output`, `idx`, `out`)
+* Data types (for example, `int32`, `float`, `uint8`)
+* Other op names referenced in text (for example, `list_diff()`, `shuffle()`)
+* Class names (for example, `Tensor` when you actually mean a `Tensor` object;
+  don't capitalize or use backticks if you're just explaining what an op does to
+  a tensor, or a graph, or an operation in general)
+* File names (for example, `image_ops.py`, or
+  `/path-to-your-data/xml/example-name`)
+* Math expressions or conditions (for example, `-1-input.dims() <= dim <=
+  input.dims()`)
 
 Put three backticks around sample code and pseudocode examples. And use `==>`
 instead of a single equal sign when you want to show what an op returns. For
@@ -89,33 +347,32 @@ example:
     (tf.expand_dims(input, 0)) ==> [1, 2, 3, 5]
     ```
 
-If you're providing a Python code sample, add the python style label to ensure proper syntax highlighting:
+If you're providing a Python code sample, add the python style label to ensure
+proper syntax highlighting:
 
-```markdown
- ```python
- # some Python code
- ```
-```
+    ```python
+    # some Python code
+    ```
 
-Put single backticks around math expressions or conditions. For example:
+Two notes about backticks for code samples in Markdown:
 
-```markdown
-This operation requires that `-1-input.dims() <= dim <= input.dims()`.
-```
+1. You can use backticks for pretty printing languages other than Python, if
+   necessary. A full list of languages is available
+   [here](https://github.com/google/code-prettify#how-do-i-specify-the-language-of-my-code).
+2. Markdown also allows you to indent four spaces to specify a code sample.
+   However, do NOT indent four spaces and use backticks simultaneously. Use one
+   or the other.
 
 ### Tensor Dimensions
 
 When you're talking about a tensor in general, don't capitalize the word tensor.
 When you're talking about the specific object that's provided to an op as an
 argument or returned by an op, then you should capitalize the word Tensor and
-add backticks around it because you're talking about a `Tensor` object that gets
-passed.
+add backticks around it because you're talking about a `Tensor` object.
 
 Don't use the word `Tensors` to describe multiple Tensor objects unless you
 really are talking about a `Tensors` object. Better to say "a list of `Tensor`
-objects.", or, maybe, "`Tensor`s".
-
-When you're talking about the size of a tensor, use these guidelines:
+objects."
 
 Use the term "dimension" to refer to the size of a tensor. If you need to be
 specific about the size, use these conventions:
@@ -127,81 +384,58 @@ specific about the size, use these conventions:
   the word "rank" only if it makes sense, but try to use "dimension" instead.
   Never use the word "order" to describe the size of a tensor.
 
-Use the word "shape" to describe in detail the dimensions of a tensor, and show
-the shape in square brackets with backticks. For example:
-
-```markdown
-If `input` is a 3-D tensor with shape `[3, 4, 3]`, this operation will return
-a 3-D tensor with shape `[6, 8, 6]`.
-```
-
-### Links
-
-To link to something else in the `g3docs` tree, use a relative path, like
-`@{tf.parse_example}`
-Do not use absolute paths for internal links, as this will break the website
-generator.
-
-To link to source code, use a link starting with:
-`https://www.tensorflow.org/code/`, followed by
-the file name starting at the github root. For instance, a link to this file
-should be written as
-`https://www.tensorflow.org/code/tensorflow/g3doc/how_tos/documentation/index.md`.
-This ensures that [tensorflow.org](https://www.tensorflow.org/) can forward the link to the
-branch of the code corresponding to the version of the documentation you're
-viewing. Do not include url parameters in the URL.
+Use the word "shape" to detail the dimensions of a tensor, and show the shape in
+square brackets with backticks. For example:
 
+    If `input` is a 3-D tensor with shape `[3, 4, 3]`, this operation
+    returns a 3-D tensor with shape `[6, 8, 6]`.
 
 ### Ops defined in C++
 
-All Ops defined in C++ must be documented as part of the `REGISTER_OP`
-declaration. The docstring in the C++ file is processed to automatically add
-some information for the input types, output types, and Attr types and default
-values.
+All Ops defined in C++ (and accessible from other languages) must be documented
+with a `REGISTER_OP` declaration. The docstring in the C++ file is processed to
+automatically add some information for the input types, output types, and Attr
+types and default values.
 
 For example:
 
-```c++
-REGISTER_OP("PngDecode")
-    .Input("contents: string")
-    .Attr("channels: int = 0")
-    .Output("image: uint8")
-    .Doc(R"doc(
-Decodes the contents of a PNG file into a uint8 tensor.
-
-contents: PNG file contents.
-channels: Number of color channels, or 0 to autodetect based on the input.
-  Must be 0 for autodetect, 1 for grayscale, 3 for RGB, or 4 for RGBA.
-  If the input has a different number of channels, it will be transformed
-  accordingly.
-image:= A 3-D uint8 tensor of shape `[height, width, channels]`.
-  If `channels` is 0, the last dimension is determined
-  from the png contents.
-)doc");
-```
+    ```c++
+    REGISTER_OP("PngDecode")
+      .Input("contents: string")
+      .Attr("channels: int = 0")
+      .Output("image: uint8")
+      .Doc(R"doc(
+    Decodes the contents of a PNG file into a uint8 tensor.
+
+    contents: PNG file contents.
+    channels: Number of color channels, or 0 to autodetect based on the input.
+      Must be 0 for autodetect, 1 for grayscale, 3 for RGB, or 4 for RGBA.
+      If the input has a different number of channels, it will be transformed
+      accordingly.
+    image:= A 3-D uint8 tensor of shape `[height, width, channels]`.
+      If `channels` is 0, the last dimension is determined
+      from the png contents.
+    )doc");
+    ```
 
 Results in this piece of Markdown:
 
-```markdown
-### tf.image.png_decode(contents, channels=None, name=None) {#png_decode}
-
-Decodes the contents of a PNG file into a uint8 tensor.
+    ### tf.image.png_decode(contents, channels=None, name=None) {#png_decode}
 
-#### Args:
+    Decodes the contents of a PNG file into a uint8 tensor.
 
-*  <b>contents</b>: A string Tensor. PNG file contents.
-*  <b>channels</b>: An optional int. Defaults to 0.
-    Number of color channels, or 0 to autodetect based on the input.
-    Must be 0 for autodetect, 1 for grayscale, 3 for RGB, or 4 for RGBA.  If the
-    input has a different number of channels, it will be transformed accordingly.
-*  <b>name</b>: A name for the operation (optional).
+    #### Args:
 
-#### Returns:
+    *  <b>contents</b>: A string Tensor. PNG file contents.
+    *  <b>channels</b>: An optional int. Defaults to 0.
+       Number of color channels, or 0 to autodetect based on the input.
+       Must be 0 for autodetect, 1 for grayscale, 3 for RGB, or 4 for RGBA.  If the
+       input has a different number of channels, it will be transformed accordingly.
+    *  <b>name</b>: A name for the operation (optional).
 
-  A 3-D uint8 tensor of shape `[height, width, channels]`.
-  If `channels` is 0, the last dimension is determined
-  from the png contents.
-```
+    #### Returns:
+    A 3-D uint8 tensor of shape `[height, width, channels]`.  If `channels` is
+    0, the last dimension is determined from the png contents.
 
 Much of the argument description is added automatically. In particular, the doc
 generator automatically adds the name and type of all inputs, attrs, and
@@ -218,12 +452,13 @@ your text carefully.
 
 ### Ops defined in Python
 
-If your op is defined in a `python/ops/*.py` file, then you need to provide
-text for all of the arguments and output (returned) tensors.
+If your op is defined in a `python/ops/*.py` file, then you need to provide text
+for all of the arguments and output (returned) tensors. The doc generator does
+not auto-generate any text for ops that are defined in Python, so what you write
+is what you get.
 
 You should conform to the usual Python docstring conventions, except that you
-should use Markdown in the docstring. The doc generator does not auto-generate
-any text for ops that are defined in Python, so what you write is what you get.
+should use Markdown in the docstring.
 
 Here's a simple example:
 
@@ -240,7 +475,6 @@ def foo(x, y, name="bar"):
   # y is [2, 2]
   tf.foo(x, y) ==> [3, 3]
   ```
-
   Args:
     x: A `Tensor` of type `int32`.
     y: A `Tensor` of type `int32`.
@@ -252,90 +486,96 @@ def foo(x, y, name="bar"):
   Raises:
     ValueError: If `x` or `y` are not of type `int32`.
   """
-
-  ...
 ```
 
 ## Description of the Docstring Sections
 
-Here is more detail and examples for each of the elements of the docstrings.
+This section details each of the elements in docstrings.
 
-### Short sentence that describes what the op does.
+### Short sentence describing what the op does
 
 Examples:
 
-```markdown
+```
 Concatenates tensors.
 ```
 
-```markdown
+```
 Flips an image horizontally from left to right.
 ```
 
-```markdown
+```
 Computes the Levenshtein distance between two sequences.
 ```
 
-```markdown
+```
 Saves a list of tensors to a file.
 ```
 
-```markdown
+```
 Extracts a slice from a tensor.
 ```
 
-### Short description of what happens when you pass arguments to the op.
+### Short description of what happens when you pass arguments to the op
 
 Examples:
 
-```markdown
-Given a tensor input of numerical type, this operation returns a tensor of
-the same type and size with values reversed along dimension `seq_dim`. A
-vector `seq_lengths` determines which elements are reversed for each index
-within dimension 0 (usually the batch dimension).
-```
+    Given a tensor input of numerical type, this operation returns a tensor of
+    the same type and size with values reversed along dimension `seq_dim`. A
+    vector `seq_lengths` determines which elements are reversed for each index
+    within dimension 0 (usually the batch dimension).
 
-```markdown
-This operation returns a tensor of type `dtype` and dimensions `shape`, with
-all elements set to zero.
-```
 
-### Example showing how the op works.
+    This operation returns a tensor of type `dtype` and dimensions `shape`, with
+    all elements set to zero.
+
+### Example demonstrating the op
+
+Good code samples are short and easy to understand, typically containing a brief
+snippet of code to clarify what the example is demonstrating. When an op
+manipulates the shape of a Tensor it is often useful to include an example of
+the before and after, as well.
 
 The `squeeze()` op has a nice pseudocode example:
 
-    shape(input) => `[1, 2, 1, 3, 1, 1]`
-    shape(squeeze(input)) =>  `[2, 3]`
+    # 't' is a tensor of shape [1, 2, 1, 3, 1, 1]
+    shape(squeeze(t)) ==> [2, 3]
 
 The `tile()` op provides a good example in descriptive text:
 
-    For example, tiling `[a, b, c, d]` by 2 produces
-    `[[a, b, c, d], [a, b, c, d]]`.
+    For example, tiling `[a, b, c, d]` by `[2]` produces `[a b c d a b c d]`.
 
 It is often helpful to show code samples in Python. Never put them in the C++
-Ops file, and avoid putting them in the Python Ops doc. Put them in the module
-or class docstring where the Ops constructors are called out.
+Ops file, and avoid putting them in the Python Ops doc. We recommend, if
+possible, putting code samples in the
+[API guides](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/docs_src/api_guides).
+Otherwise, add them to the module or class docstring where the Ops constructors
+are called out.
 
-Here's an example from the module docsting in `image_ops.py`:
+Here's an example from the module docstring in `api_guides/python/math_ops.md`:
 
-    TensorFlow can convert between images in RGB or HSV. The conversion
-    functions work only on `float` images, so you need to convert images in
-    other formats using @{tf.image.convert_image_dtype}.
+    ## Segmentation
 
-    Example:
+    TensorFlow provides several operations that you can use to perform common
+    math computations on tensor segments.
+    ...
+    In particular, a segmentation of a matrix tensor is a mapping of rows to
+    segments.
+
+    For example:
 
     ```python
-    # Decode an image and convert it to HSV.
-    rgb_image = tf.image.decode_png(...,  channels=3)
-    rgb_image_float = tf.image.convert_image_dtype(rgb_image, tf.float32)
-    hsv_image = tf.image.rgb_to_hsv(rgb_image)
+    c = tf.constant([[1,2,3,4], [-1,-2,-3,-4], [5,6,7,8]])
+    tf.segment_sum(c, tf.constant([0, 0, 1]))
+      ==>  [[0 0 0 0]
+            [5 6 7 8]]
     ```
 
-### Requirements, caveats, important notes.
+### Requirements, caveats, important notes
 
 Examples:
 
-```markdown
+```
 This operation requires that: `-1-input.dims() <= dim <= input.dims()`
 ```
 
@@ -347,82 +587,86 @@ be fed using the `feed_dict` optional argument to `Session.run()`,
 
 ### Descriptions of arguments and output (returned) tensors.
 
-Keep the descriptions brief and to the point. You should not have to explain
-how the operation works in the argument sections.
+Keep the descriptions brief and to the point. You should not have to explain how
+the operation works in the argument sections.
 
 Mention if the Op has strong constraints on the dimensions of the input or
 output tensors. Remember that for C++ Ops, the type of the tensor is
-automatically added as either as "A ..type.. Tensor" or "A Tensor with type
-in {...list of types...}". In such cases, if the Op has a constraint on the
+automatically added as either as "A ..type.. Tensor" or "A Tensor with type in
+{...list of types...}". In such cases, if the Op has a constraint on the
 dimensions either add text such as "Must be 4-D" or start the description with
-`=` (to prevent the tensor type to be added) and write something like
-"A 4-D float tensor".
+`=` (to prevent the tensor type to be added) and write something like "A 4-D
+float tensor".
 
 For example, here are two ways to document an image argument of a C++ op (note
 the "=" sign):
 
-```markdown
+```
 image: Must be 4-D. The image to resize.
 ```
 
-```markdown
+```
 image:= A 4-D `float` tensor. The image to resize.
 ```
 
 In the documentation, these will be rendered to markdown as
 
-```markdown
+```
 image: A `float` Tensor. Must be 4-D. The image to resize.
 ```
 
-```markdown
+```
 image: A 4-D `float` Tensor. The image to resize.
 ```
 
 ### Optional arguments descriptions ("attrs")
 
-The doc generator always describe attrs type and default value, if any.
-You cannot override that with an equal sign because the description is very
-different in the C++ and Python generated docs.
+The doc generator always describes the type for each attr and their default
+value, if any. You cannot override that with an equal sign because the
+description is very different in the C++ and Python generated docs.
 
 Phrase any additional attr description so that it flows well after the type
-and default value.
+and default value. The type and defaults are displayed first, and additional
+descriptions follow afterwards. Therefore, complete sentences are best.
 
-Here's an example from `image_ops.py`:
+Here's an example from `image_ops.cc`:
 
-```c++
-REGISTER_OP("PngDecode")
-    .Input("contents: string")
-    .Attr("channels: int = 0")
-    .Output("image: uint8")
-    .Doc(R"doc(
-Decode a PNG-encoded image to a uint8 tensor.
+    REGISTER_OP("DecodePng")
+        .Input("contents: string")
+        .Attr("channels: int = 0")
+        .Attr("dtype: {uint8, uint16} = DT_UINT8")
+        .Output("image: dtype")
+        .SetShapeFn(DecodeImageShapeFn)
+        .Doc(R"doc(
+    Decode a PNG-encoded image to a uint8 or uint16 tensor.
 
-The attr `channels` indicates the desired number of color channels for the
-decoded image.
-
-Accepted values are:
-
-*   0: Use the number of channels in the PNG-encoded image.
-*   1: output a grayscale image.
+    The attr `channels` indicates the desired number of color channels for the
+    decoded image.
 
-...
+    Accepted values are:
 
-contents: 0-D. The PNG-encoded image.
-channels: Number of color channels for the decoded image.
-image: 3-D with shape `[height, width, channels]`.
-)doc");
-```
+    *   0: Use the number of channels in the PNG-encoded image.
+    *   1: output a grayscale image.
+    *   3: output an RGB image.
+    *   4: output an RGBA image.
 
-This generates the following "Args" section:
-
-```markdown
-  contents: A string Tensor. 0-D. The PNG-encoded image.
-  channels: An optional `int`. Defaults to 0. Number of color channels for the
-    decoded image.
-  name: A name for the operation (optional).
-```
+    If needed, the PNG-encoded image is transformed to match the requested
+    number of color channels.
 
+    contents: 0-D.  The PNG-encoded image.
+    channels: Number of color channels for the decoded image.
+    image: 3-D with shape `[height, width, channels]`.
+    )doc");
 
+This generates the following Args section in
+`api_docs/python/tf/image/decode_png.md`:
 
+    #### Args:
 
+    * <b>`contents`</b>: A `Tensor` of type `string`. 0-D.  The PNG-encoded
+      image.
+    * <b>`channels`</b>: An optional `int`. Defaults to `0`. Number of color
+      channels for the decoded image.
+    * <b>`dtype`</b>: An optional `tf.DType` from: `tf.uint8,
+      tf.uint16`. Defaults to `tf.uint 8`.
+    * <b>`name`</b>: A name for the operation (optional).
-- 
GitLab


From badffcd162d2ed6a43914267704f476a33f3f0e6 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Fri, 24 Mar 2017 12:10:01 -0800
Subject: [PATCH 0007/1563] Java: Maven: Fix some boo boos with the Windows
 installation.

- The resource path should not use the platform's file separator.
- Restore the commands to download and extract the Windows native libraries.
- Unrelated tweaks the README
Change: 151161421
---
 tensorflow/java/maven/README.md               | 124 ++++++++++++++++++
 tensorflow/java/maven/run_inside_container.sh | 119 +++++++++++++++++
 .../java/org/tensorflow/NativeLibrary.java    |  14 +-
 3 files changed, 245 insertions(+), 12 deletions(-)
 create mode 100644 tensorflow/java/maven/README.md
 create mode 100644 tensorflow/java/maven/run_inside_container.sh

diff --git a/tensorflow/java/maven/README.md b/tensorflow/java/maven/README.md
new file mode 100644
index 0000000000..2eb29a200b
--- /dev/null
+++ b/tensorflow/java/maven/README.md
@@ -0,0 +1,124 @@
+# TensorFlow for Java using Maven
+
+The [TensorFlow Java
+API](https://www.tensorflow.org/api_docs/java/reference/org/tensorflow/package-summary)
+is available through artifacts uploaded to [Maven
+Central](https://oss.sonatype.org/content/repositories/snapshots/org/tensorflow/).
+This document describes the process of updating the release artifacts. It does
+_not_ describe how to use the artifacts, for which the reader is referred to the
+[TensorFlow for Java installation instructions](https://www.tensorflow.org/code/tensorflow/java/README.md).
+
+## Background
+
+TensorFlow source (which is primarily in C++) is built using
+[bazel](https://bazel.build) and not [maven](https://maven.apache.org/).  The
+Java API wraps over this native code and thus depends on platform (OS,
+architecture) specific native code.
+
+Hence, the process for building and uploading release artifacts is not a single
+`mvn deploy` command.
+
+## Artifact Structure
+
+There are four artifacts and thus `pom.xml`s involved in this release:
+
+1.  `tensorflow`: The single dependency for projects requiring TensorFlow for
+    Java. This convenience package depends on the two below, and is the one that
+    should typically be used in other programs.
+
+2.  `libtensorflow`: Java-only code for the [TensorFlow Java API](https://www.tensorflow.org/api_docs/java/reference/org/tensorflow/package-summary).
+    The `.jar` itself has no native code, but requires the native code be either
+    already installed on the system or made available through
+    `libtensorflow_jni`.
+
+3.  `libtensorflow_jni`: The native libraries required by `libtensorflow`.
+    Native code for all supported platforms is packaged into a single `.jar`.
+
+4.  [`parentpom`](https://maven.apache.org/pom/index.html): Common settings
+    shared between the above three.
+
+## Updating the release
+
+The TensorFlow artifacts at Maven Central are created from files built as part
+of the TensorFlow release process (which uses `bazel`). The author's lack of
+familiarity with Maven best practices combined with the use of a different build
+system means that this process is possibly not ideal, but it's what we've got.
+Suggestions are welcome.
+
+In order to isolate the environment used for building, all release processes are
+conducted in a [Docker](https://www.docker.com) container.
+
+### Pre-requisites
+
+-   `docker`
+-   An account at [oss.sonatype.org](https://oss.sonatype.org/), that has
+    permissions to update artifacts in the `org.tensorflow` group. If your
+    account does not have permissions, then you'll need to ask someone who does
+    to [file a ticket](https://issues.sonatype.org/) to add to the permissions
+    ([sample ticket](https://issues.sonatype.org/browse/MVNCENTRAL-1637)).
+-   A GPG signing key, required [to sign the release artifacts](http://central.sonatype.org/pages/apache-maven.html#gpg-signed-components).
+
+### Deploying to Maven Central
+
+1.  Create a file with your OSSRH credentials (or perhaps you use `mvn` and have
+    it in `~/.m2/settings.xml`):
+
+    ```sh
+    SONATYPE_USERNAME="your_sonatype.org_username_here"
+    SONATYPE_PASSWORD="your_sonatype.org_password_here"
+    GPG_PASSPHRASE="your_gpg_passphrase_here"
+    cat >/tmp/settings.xml <<EOF
+<settings>
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+  <profiles>
+    <profile>
+      <id>ossrh</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <gpg.executable>gpg2</gpg.executable>
+        <gpg.passphrase>${GPG_PASSPHRASE}</gpg.passphrase>
+      </properties>
+    </profile>
+  </profiles>
+</settings>
+EOF
+    ```
+
+2.  Run the `release.sh` script.
+
+3.  If the script above succeeds then the artifacts would have been uploaded to
+    the private staging repository. After verifying the release, visit
+    https://oss.sonatype.org/#stagingRepositories, find the `org.tensorflow`
+    release and click on either `Release` to finalize the release, or `Drop` to
+    abort. Some things of note:
+
+    - For details, look at the [Sonatype guide](http://central.sonatype.org/pages/releasing-the-deployment.html).
+    - Syncing with [Maven Central](http://repo1.maven.org/maven2/org/tensorflow/)
+      can take 10 minutes to 2 hours (as per the [OSSRH
+      guide](http://central.sonatype.org/pages/ossrh-guide.html#releasing-to-central)).
+
+4.  Upon successful release, commit changes to all the `pom.xml` files
+    (which should have the updated version number).
+
+### Snapshots
+
+If the `TF_VERSION` provided to the `release.sh` script ends in `-SNAPSHOT`,
+then instead of using official release files, the nightly build artifacts from
+https://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow/ and
+https://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow-windows/ will
+be used to upload to the Maven Central snapshots repository.
+
+
+## References
+
+-   [Sonatype guide](http://central.sonatype.org/pages/ossrh-guide.html) for
+    hosting releases.
+-   [Ticket that created the `org/tensorflow` configuration](https://issues.sonatype.org/browse/OSSRH-28072) on OSSRH.
diff --git a/tensorflow/java/maven/run_inside_container.sh b/tensorflow/java/maven/run_inside_container.sh
new file mode 100644
index 0000000000..684cfe1868
--- /dev/null
+++ b/tensorflow/java/maven/run_inside_container.sh
@@ -0,0 +1,119 @@
+#!/usr/bin/env bash
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+#
+# This script is intended to be run inside a docker container to provide a
+# hermetic process. See release.sh for the expected invocation.
+
+
+RELEASE_URL_PREFIX="https://storage.googleapis.com/tensorflow/libtensorflow"
+IS_SNAPSHOT="false"
+if [[ "${TF_VERSION}" == *"-SNAPSHOT" ]]; then
+  IS_SNAPSHOT="true"
+fi
+
+set -ex
+
+clean() {
+  # Clean up any existing artifacts
+  # (though if run inside a clean docker container, there won't be any dirty
+  # artifacts lying around)
+  mvn -q clean
+  rm -rf libtensorflow_jni/src libtensorflow_jni/target libtensorflow/src libtensorflow/target
+}
+
+update_version_in_pom() {
+  mvn versions:set -DnewVersion="${TF_VERSION}"
+}
+
+download_libtensorflow() {
+  if [[ "${IS_SNAPSHOT}" == "true" ]]; then
+    URL="http://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow/TYPE=cpu-slave/lastSuccessfulBuild/artifact/lib_package/libtensorflow-src.jar"
+  else
+    URL="${RELEASE_URL_PREFIX}/libtensorflow-src-${TF_VERSION}.jar"
+  fi
+  curl -L "${URL}" -o /tmp/src.jar
+  cd "${DIR}/libtensorflow"
+  jar -xvf /tmp/src.jar
+  rm -rf META-INF
+  cd "${DIR}"
+}
+
+download_libtensorflow_jni() {
+  NATIVE_DIR="${DIR}/libtensorflow_jni/src/main/resources/org/tensorflow/native"
+  mkdir -p "${NATIVE_DIR}"
+  cd "${NATIVE_DIR}"
+
+  mkdir linux-x86_64
+  mkdir windows-x86_64
+  mkdir darwin-x86_64
+
+  if [[ "${IS_SNAPSHOT}" == "true" ]]; then
+    # Nightly builds from http://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow/
+    # and http://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow-windows/
+    curl -L "http://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow/TYPE=cpu-slave/lastSuccessfulBuild/artifact/lib_package/libtensorflow_jni-cpu-linux-x86_64.tar.gz" | tar -xvz -C linux-x86_64
+    curl -L "http://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow/TYPE=mac-slave/lastSuccessfulBuild/artifact/lib_package/libtensorflow_jni-cpu-darwin-x86_64.tar.gz" | tar -xvz -C darwin-x86_64
+    curl -L "http://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow-windows/lastSuccessfulBuild/artifact/lib_package/libtensorflow_jni-cpu-windows-x86_64.zip" -o /tmp/windows.zip
+  else
+    curl -L "${RELEASE_URL_PREFIX}/libtensorflow_jni-cpu-linux-x86_64-${TF_VERSION}.tar.gz" | tar -xvz -C linux-x86_64
+    curl -L "${RELEASE_URL_PREFIX}/libtensorflow_jni-cpu-darwin-x86_64-${TF_VERSION}.tar.gz" | tar -xvz -C darwin-x86_64
+    curl -L "${RELEASE_URL_PREFIX}/libtensorflow_jni-cpu-windows-x86_64-${TF_VERSION}.zip" -o /tmp/windows.zip
+  fi
+
+  unzip /tmp/windows.zip -d windows-x86_64
+  rm -f /tmp/windows.zip
+  # Updated timestamps seem to be required to get Maven to pick up the file.
+  touch linux-x86_64/*
+  touch darwin-x86_64/*
+  touch windows-x86_64/*
+  cd "${DIR}"
+}
+
+if [ -z "${TF_VERSION}" ]
+then
+  echo "Must set the TF_VERSION environment variable"
+  exit 1
+fi
+
+DIR="$(realpath $(dirname $0))"
+cd "${DIR}"
+
+# The meat of the script.
+# Comment lines out appropriately if debugging/tinkering with the release
+# process.
+# gnupg2 is required for signing
+apt-get -qq update && apt-get -qqq install -y gnupg2
+clean
+update_version_in_pom
+download_libtensorflow
+download_libtensorflow_jni
+# Build the release artifacts
+mvn verify
+# If successfully built, try to deploy.
+# If successfully deployed, clean.
+# If deployment fails, debug with
+#   ./release.sh ${TF_VERSION} ${SETTINGS_XML} bash
+# To get a shell to poke around the maven artifacts with.
+mvn deploy && clean
+
+set +ex
+if [[ "${IS_SNAPSHOT}" == "false" ]]; then
+  echo "Uploaded to the staging repository"
+  echo "After validating the release: "
+  echo "1. Login to https://oss.sonatype.org/#stagingRepositories"
+  echo "2. Find the 'org.tensorflow' staging release and click either 'Release' to release or 'Drop' to abort"
+else
+  echo "Uploaded to the snapshot repository"
+fi
diff --git a/tensorflow/java/src/main/java/org/tensorflow/NativeLibrary.java b/tensorflow/java/src/main/java/org/tensorflow/NativeLibrary.java
index 61665a591c..80a67c3491 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/NativeLibrary.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/NativeLibrary.java
@@ -138,18 +138,8 @@ final class NativeLibrary {
   }
 
   private static String makeResourceName() {
-    // Using string addition instead of more modern functions like
-    // java.nio.file.Paths.get() to make this method usable on Android,
-    // where as of March 2017, the java.nio.files package was not available.
-    final String separator = System.getProperty("file.separator");
-    return "org"
-        + separator
-        + "tensorflow"
-        + separator
-        + "native"
-        + separator
-        + String.format("%s-%s", os(), architecture())
-        + separator
+    return "org/tensorflow/native/"
+        + String.format("%s-%s/", os(), architecture())
         + System.mapLibraryName(LIBNAME);
   }
 
-- 
GitLab


From 6187242334f85934f3c025b5b27f42dc4364a94e Mon Sep 17 00:00:00 2001
From: Damien Martin-Guillerez <damienmg@users.noreply.github.com>
Date: Wed, 22 Mar 2017 21:02:08 -0400
Subject: [PATCH 0008/1563] Add the corresponding --action_env to .bazelrc from
 ./configure (#8637)

This will make the fetch phase reproducible so the refetch does
not happens unless people re-run configure (the environment variable
are stored in the .bazelrc file).

Fixes #8619.
---
 configure | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index a1c1ce1ec0..bcf424471f 100755
--- a/configure
+++ b/configure
@@ -38,12 +38,7 @@ function is_windows() {
   fi
 }
 
-function bazel_clean_and_fetch() {
-  # bazel clean --expunge currently doesn't work on Windows
-  # TODO(pcloudy): Re-enable it after bazel clean --expunge is fixed.
-  if ! is_windows; then
-    bazel clean --expunge
-  fi
+function bazel_fetch() {
   if [ -z "$TF_BAZEL_TARGETS" ]; then
     bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
   else
@@ -284,11 +279,17 @@ while [ "$TF_NEED_CUDA" == "" ]; do
   esac
 done
 
+sed_hyphen_i -e "/--action_env TF_NEED_CUDA/d" .bazelrc
+sed_hyphen_i -e "/--action_env CUD/d" .bazelrc
+sed_hyphen_i -e "/--action_env GCC_HOST/d" .bazelrc
+sed_hyphen_i -e "/--action_env TF_CUD/d" .bazelrc
+echo "build --action_env TF_NEED_CUDA=$TF_NEED_CUDA" >>.bazelrc
+
 export TF_NEED_CUDA
 export TF_NEED_OPENCL
 if [[ "$TF_NEED_CUDA" == "0" ]] && [[ "$TF_NEED_OPENCL" == "0" ]]; then
   echo "Configuration finished"
-  bazel_clean_and_fetch
+  bazel_fetch
   exit
 fi
 
@@ -307,6 +308,7 @@ while ! is_windows && true; do
   fi
   if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
     export GCC_HOST_COMPILER_PATH
+    echo "build --action_env GCC_HOST_COMPILER_PATH=$GCC_HOST_COMPILER_PATH" >>.bazelrc
     break
   fi
   echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
@@ -357,7 +359,9 @@ while true; do
 
   if [ -e "${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH}" ]; then
     export CUDA_TOOLKIT_PATH
+    echo "build --action_env CUDA_TOOLKIT_PATH=$CUDA_TOOLKIT_PATH" >>.bazelrc
     export TF_CUDA_VERSION
+    echo "build --action_env TF_CUDA_VERSION=$TF_CUDA_VERSION" >>.bazelrc
     break
   fi
   echo "Invalid path to CUDA $TF_CUDA_VERSION toolkit. ${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH} cannot be found"
@@ -409,7 +413,9 @@ while true; do
 
   if [ -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_ALT_PATH}" -o -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_PATH}" ]; then
     export TF_CUDNN_VERSION
+    echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc
     export CUDNN_INSTALL_PATH
+    echo "build --action_env CUDNN_INSTALL_PATH=$CUDNN_INSTALL_PATH" >>.bazelrc
     break
   fi
 
@@ -422,7 +428,9 @@ while true; do
     CUDNN_PATH_FROM_LDCONFIG="$($LDCONFIG_BIN -p | sed -n 's/.*libcudnn.so .* => \(.*\)/\1/p')"
     if [ -e "${CUDNN_PATH_FROM_LDCONFIG}${TF_CUDNN_EXT}" ]; then
       export TF_CUDNN_VERSION
+      echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc
       export CUDNN_INSTALL_PATH="$(dirname ${CUDNN_PATH_FROM_LDCONFIG})"
+      echo "build --action_env CUDNN_INSTALL_PATH=$CUDNN_INSTALL_PATH" >>.bazelrc
       break
     fi
   fi
@@ -474,6 +482,7 @@ EOF
     fi
   else
     export TF_CUDA_COMPUTE_CAPABILITIES
+    echo "build --action_env TF_CUDA_COMPUTE_CAPABILITIES=$TF_CUDA_COMPUTE_CAPABILITIES" >>.bazelrc
     break
   fi
   TF_CUDA_COMPUTE_CAPABILITIES=""
@@ -577,6 +586,6 @@ done
 # end of if "$TF_NEED_OPENCL" == "1"
 fi
 
-bazel_clean_and_fetch
+bazel_fetch
 
 echo "Configuration finished"
-- 
GitLab


From 43f2d2089a3019f1cd71241911804fefab4233fd Mon Sep 17 00:00:00 2001
From: Yi Liu <liu.yi.pei@gmail.com>
Date: Tue, 28 Mar 2017 20:56:21 -0700
Subject: [PATCH 0009/1563] force grep to not use color (#8784)

---
 third_party/gpus/cuda_configure.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index 01e070f2be..06e54d7c4f 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -267,7 +267,7 @@ def _find_cuda_define(repository_ctx, cudnn_header_dir, define):
   cudnn_h_path = repository_ctx.path("%s/cudnn.h" % cudnn_header_dir)
   if not cudnn_h_path.exists:
     auto_configure_fail("Cannot find cudnn.h at %s" % str(cudnn_h_path))
-  result = repository_ctx.execute(["grep", "-E", define, str(cudnn_h_path)])
+  result = repository_ctx.execute(["grep", "--color=never", "-E", define, str(cudnn_h_path)])
   if result.stderr:
     auto_configure_fail("Error reading %s: %s" %
                         (result.stderr, str(cudnn_h_path)))
-- 
GitLab


From c87e1ae3eb46bf26cf390531bce6780f461514c8 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Thu, 30 Mar 2017 23:43:59 -0700
Subject: [PATCH 0010/1563] Revert "Add the corresponding --action_env to
 .bazelrc from ./configure (#8637)"

This reverts commit fba05c300bf6840e76787680ed7fd1239cdb9ad0.
---
 configure | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index bcf424471f..081db20d75 100755
--- a/configure
+++ b/configure
@@ -38,7 +38,7 @@ function is_windows() {
   fi
 }
 
-function bazel_fetch() {
+function bazel_clean_and_fetch() {
   if [ -z "$TF_BAZEL_TARGETS" ]; then
     bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
   else
@@ -279,17 +279,11 @@ while [ "$TF_NEED_CUDA" == "" ]; do
   esac
 done
 
-sed_hyphen_i -e "/--action_env TF_NEED_CUDA/d" .bazelrc
-sed_hyphen_i -e "/--action_env CUD/d" .bazelrc
-sed_hyphen_i -e "/--action_env GCC_HOST/d" .bazelrc
-sed_hyphen_i -e "/--action_env TF_CUD/d" .bazelrc
-echo "build --action_env TF_NEED_CUDA=$TF_NEED_CUDA" >>.bazelrc
-
 export TF_NEED_CUDA
 export TF_NEED_OPENCL
 if [[ "$TF_NEED_CUDA" == "0" ]] && [[ "$TF_NEED_OPENCL" == "0" ]]; then
   echo "Configuration finished"
-  bazel_fetch
+  bazel_clean_and_fetch
   exit
 fi
 
@@ -308,7 +302,6 @@ while ! is_windows && true; do
   fi
   if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
     export GCC_HOST_COMPILER_PATH
-    echo "build --action_env GCC_HOST_COMPILER_PATH=$GCC_HOST_COMPILER_PATH" >>.bazelrc
     break
   fi
   echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
@@ -359,9 +352,7 @@ while true; do
 
   if [ -e "${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH}" ]; then
     export CUDA_TOOLKIT_PATH
-    echo "build --action_env CUDA_TOOLKIT_PATH=$CUDA_TOOLKIT_PATH" >>.bazelrc
     export TF_CUDA_VERSION
-    echo "build --action_env TF_CUDA_VERSION=$TF_CUDA_VERSION" >>.bazelrc
     break
   fi
   echo "Invalid path to CUDA $TF_CUDA_VERSION toolkit. ${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH} cannot be found"
@@ -413,9 +404,7 @@ while true; do
 
   if [ -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_ALT_PATH}" -o -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_PATH}" ]; then
     export TF_CUDNN_VERSION
-    echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc
     export CUDNN_INSTALL_PATH
-    echo "build --action_env CUDNN_INSTALL_PATH=$CUDNN_INSTALL_PATH" >>.bazelrc
     break
   fi
 
@@ -428,9 +417,7 @@ while true; do
     CUDNN_PATH_FROM_LDCONFIG="$($LDCONFIG_BIN -p | sed -n 's/.*libcudnn.so .* => \(.*\)/\1/p')"
     if [ -e "${CUDNN_PATH_FROM_LDCONFIG}${TF_CUDNN_EXT}" ]; then
       export TF_CUDNN_VERSION
-      echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc
       export CUDNN_INSTALL_PATH="$(dirname ${CUDNN_PATH_FROM_LDCONFIG})"
-      echo "build --action_env CUDNN_INSTALL_PATH=$CUDNN_INSTALL_PATH" >>.bazelrc
       break
     fi
   fi
@@ -482,7 +469,6 @@ EOF
     fi
   else
     export TF_CUDA_COMPUTE_CAPABILITIES
-    echo "build --action_env TF_CUDA_COMPUTE_CAPABILITIES=$TF_CUDA_COMPUTE_CAPABILITIES" >>.bazelrc
     break
   fi
   TF_CUDA_COMPUTE_CAPABILITIES=""
@@ -586,6 +572,6 @@ done
 # end of if "$TF_NEED_OPENCL" == "1"
 fi
 
-bazel_fetch
+bazel_clean_and_fetch
 
 echo "Configuration finished"
-- 
GitLab


From af0d00cd846485e0dd04c6f29e31068ac8147144 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Thu, 30 Mar 2017 21:58:02 -0800
Subject: [PATCH 0011/1563] Rollback of adjust contract change: Breaks
 backwards compatibility, and is inconsistent with other adjust_ops. Change:
 151792071

---
 tensorflow/python/ops/image_ops_impl.py |  1 -
 tensorflow/python/ops/image_ops_test.py | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/tensorflow/python/ops/image_ops_impl.py b/tensorflow/python/ops/image_ops_impl.py
index 0a2d4e4792..6391dccc53 100644
--- a/tensorflow/python/ops/image_ops_impl.py
+++ b/tensorflow/python/ops/image_ops_impl.py
@@ -907,7 +907,6 @@ def adjust_brightness(image, delta):
     adjusted = math_ops.add(flt_image,
                             math_ops.cast(delta, dtypes.float32),
                             name=name)
-    adjusted = clip_ops.clip_by_value(adjusted, 0.0, 1.0)
 
     return convert_image_dtype(adjusted, orig_dtype, saturate=True)
 
diff --git a/tensorflow/python/ops/image_ops_test.py b/tensorflow/python/ops/image_ops_test.py
index 799f7e4935..01500ed133 100644
--- a/tensorflow/python/ops/image_ops_test.py
+++ b/tensorflow/python/ops/image_ops_test.py
@@ -1005,24 +1005,14 @@ class AdjustBrightnessTest(test_util.TensorFlowTestCase):
 
   def testPositiveDeltaFloat(self):
     x_shape = [2, 2, 3]
-    x_data = [0, 5, 13, 54, 135, 226, 37, 8, 245, 90, 255, 1]
+    x_data = [0, 5, 13, 54, 135, 226, 37, 8, 234, 90, 255, 1]
     x_np = np.array(x_data, dtype=np.float32).reshape(x_shape) / 255.
 
-    y_data = [10, 15, 23, 64, 145, 236, 47, 18, 255, 100, 255, 11]
+    y_data = [10, 15, 23, 64, 145, 236, 47, 18, 244, 100, 265, 11]
     y_np = np.array(y_data, dtype=np.float32).reshape(x_shape) / 255.
 
     self._testBrightness(x_np, y_np, delta=10. / 255.)
 
-  def testNegativeDeltaFloat(self):
-    x_shape = [2, 2, 3]
-    x_data = [0, 5, 13, 10, 135, 226, 37, 8, 245, 90, 255, 1]
-    x_np = np.array(x_data, dtype=np.float32).reshape(x_shape) / 255.
-
-    y_data = [0, 0, 3, 0, 125, 216, 27, 0, 235, 80, 245, 0]
-    y_np = np.array(y_data, dtype=np.float32).reshape(x_shape) / 255.
-
-    self._testBrightness(x_np, y_np, delta=-10. / 255.)
-
   def testNegativeDelta(self):
     x_shape = [2, 2, 3]
     x_data = [0, 5, 13, 54, 135, 226, 37, 8, 234, 90, 255, 1]
-- 
GitLab


From a68d64495ae90eada08d028d7577343429f2555a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 00:02:39 -0800
Subject: [PATCH 0012/1563] Add more test cases for DivideTwoScalarsS32.
 Change: 151798655

---
 .../xla/tests/scalar_computations_test.cc     | 53 +++++++++++++++++--
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/tensorflow/compiler/xla/tests/scalar_computations_test.cc b/tensorflow/compiler/xla/tests/scalar_computations_test.cc
index 134eb91a1f..d5cb98f304 100644
--- a/tensorflow/compiler/xla/tests/scalar_computations_test.cc
+++ b/tensorflow/compiler/xla/tests/scalar_computations_test.cc
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
@@ -245,12 +246,54 @@ XLA_TEST_F(ScalarComputationsTest, RemTwoScalarsF32) {
   ComputeAndCompareR0<float>(&builder, 2.5f, {}, error_spec_);
 }
 
-XLA_TEST_F(ScalarComputationsTest, DivideTwoScalarsS32) {
-  ComputationBuilder builder(client_, TestName());
-  builder.Div(builder.ConstantR0<int32>(-5), builder.ConstantR0<int32>(2));
+struct DivS32Params {
+  int32 dividend;
+  int32 divisor;
+  int32 result;
+};
 
-  ComputeAndCompareR0<int32>(&builder, -2, {});
-}
+void PrintTo(const DivS32Params& p, std::ostream* os) {
+  *os << "{" << p.dividend << ", " << p.divisor << ", " << p.result << "}";
+}
+
+class DivS32Test : public ClientLibraryTestBase,
+                   public ::testing::WithParamInterface<DivS32Params> {};
+
+XLA_TEST_P(DivS32Test, DivideTwoScalarsS32) {
+  DivS32Params p = GetParam();
+  ComputationBuilder builder(client_, TestName());
+  builder.Div(builder.ConstantR0<int32>(p.dividend),
+              builder.ConstantR0<int32>(p.divisor));
+
+  ComputeAndCompareR0<int32>(&builder, p.result, {});
+}
+
+INSTANTIATE_TEST_CASE_P(DivS32Test_Instantiation, DivS32Test,
+                        ::testing::Values(
+                            // Positive divisors.
+                            DivS32Params{5, 2, 2},     //
+                            DivS32Params{-5, 2, -2},   //
+                            DivS32Params{17, 3, 5},    //
+                            DivS32Params{-17, 3, -5},  //
+                            // Negative divisors.
+                            DivS32Params{5, -2, -2},   //
+                            DivS32Params{-5, -2, 2},   //
+                            DivS32Params{17, -3, -5},  //
+                            DivS32Params{-17, -3, 5},  //
+                            // Large positive divisors.
+                            DivS32Params{INT32_MIN, INT32_MAX, -1},       //
+                            DivS32Params{INT32_MIN + 1, INT32_MAX, -1},   //
+                            DivS32Params{INT32_MIN + 2, INT32_MAX, 0},    //
+                            DivS32Params{INT32_MIN, 0x40000000, -2},      //
+                            DivS32Params{INT32_MIN + 1, 0x40000000, -1},  //
+                            // Large negative divisors.
+                            DivS32Params{INT32_MIN, INT32_MIN, 1},       //
+                            DivS32Params{INT32_MIN, INT32_MIN + 1, 1},   //
+                            DivS32Params{INT32_MIN + 1, INT32_MIN, 0},   //
+                            DivS32Params{INT32_MAX, INT32_MIN, 0},       //
+                            DivS32Params{INT32_MAX, INT32_MIN + 1, -1},  //
+                            DivS32Params{INT32_MIN, -0x40000000, 2},     //
+                            DivS32Params{INT32_MIN + 1, -0x40000000, 1}));
 
 TEST_F(ScalarComputationsTest, RemainderTwoScalarsNegativeResultS32) {
   ComputationBuilder builder(client_, TestName());
-- 
GitLab


From e4a8dc831dbf2894c79659d50aea73999c1ff173 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 02:30:28 -0800
Subject: [PATCH 0013/1563] Allow variable reuse in function. Change: 151807504

---
 tensorflow/python/framework/function.py      |  7 +++
 tensorflow/python/framework/function_test.py | 52 ++++++++++++++++++++
 tensorflow/python/ops/variable_scope.py      |  5 +-
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/framework/function.py b/tensorflow/python/framework/function.py
index 3c663c3a9b..8b156db6dc 100644
--- a/tensorflow/python/framework/function.py
+++ b/tensorflow/python/framework/function.py
@@ -299,6 +299,7 @@ class _FuncGraph(ops.Graph):
              shape=None,
              dtype=None,
              initializer=None,
+             reuse=None,
              trainable=True,
              collections=None,  # pylint: disable=redefined-outer-name
              use_resource=None,
@@ -319,6 +320,7 @@ class _FuncGraph(ops.Graph):
           shape=shape,
           dtype=dtype,
           initializer=initializer,
+          reuse=reuse,
           trainable=trainable,
           collections=collections,
           use_resource=use_resource)
@@ -886,6 +888,11 @@ class Defun(object):
   default graph. Because the addition of the function into the graph
   is deferred, the decorator can be used anywhere in the program.
 
+  Any variables created inside of the function are hoisted into the outer graph.
+  Note that the variables are created in the variable scope that was active
+  during the first call to the function. Subsequent function calls will refer to
+  the same set of variables.
+
   Definitions of functions are frozen in a graph as soon as the graph is used to
   create a session. Therefore, nodes using the function must be created in the
   graph before the corresponding session is created.
diff --git a/tensorflow/python/framework/function_test.py b/tensorflow/python/framework/function_test.py
index 96bf7bde29..51a9215ac4 100644
--- a/tensorflow/python/framework/function_test.py
+++ b/tensorflow/python/framework/function_test.py
@@ -722,6 +722,58 @@ class FunctionTest(test.TestCase):
       y = Bar(array_ops.zeros([1, 2, 3]))
       self.assertAllEqual(y.get_shape().as_list(), [1, 1, 2, 3])
 
+  def testVariableReuse(self):
+    def LinearWithReuse(input_tensor, reuse=None):
+      size = input_tensor.shape.dims[1]
+      with variable_scope.variable_scope("linear", reuse=reuse):
+        w = variable_scope.get_variable("w", shape=[size, size],
+                                        dtype=input_tensor.dtype)
+      return math_ops.matmul(input_tensor, w)
+
+    @function.Defun(dtypes.float32)
+    def Foo(inputs):
+      inputs = array_ops.reshape(inputs, [32, 100])
+      hidden = LinearWithReuse(inputs)
+      return LinearWithReuse(hidden, reuse=True)
+
+    input_op = array_ops.placeholder(shape=[32, 100], dtype=dtypes.float32)
+    output_op = Foo(input_op)
+
+    global_vars = variables.global_variables()
+    self.assertEqual(len(global_vars), 1)
+    self.assertEqual(global_vars[0].name, "linear/w:0")
+
+    with session.Session() as sess:
+      sess.run(variables.global_variables_initializer())
+      output_val = sess.run(output_op,
+                            feed_dict={input_op: np.random.rand(32, 100)})
+      self.assertEqual(output_val.shape, (32, 100))
+
+  def testFunctionCallInDifferentVariableScopes(self):
+    @function.Defun(dtypes.float32)
+    def Foo(inputs):
+      var = variable_scope.get_variable("var", shape=[10], dtype=dtypes.float32,
+                                        initializer=init_ops.ones_initializer())
+      return inputs + var
+
+    input_op = array_ops.placeholder(shape=[10], dtype=dtypes.float32)
+    with variable_scope.variable_scope("vs1"):
+      out1_op = Foo(input_op)
+
+    with variable_scope.variable_scope("vs2"):
+      out2_op = Foo(input_op)
+
+    global_vars = variables.global_variables()
+    self.assertEqual(len(global_vars), 1)
+    self.assertEqual(global_vars[0].name, "vs1/var:0")
+
+    with session.Session() as sess:
+      sess.run(variables.global_variables_initializer())
+      out1, out2 = sess.run([out1_op, out2_op],
+                            feed_dict={input_op: np.linspace(1, 10, 10)})
+      self.assertAllEqual(out1, np.linspace(2, 11, 10))
+      self.assertAllEqual(out2, np.linspace(2, 11, 10))
+
 
 class FunctionsFromProtos(test.TestCase):
 
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index 2f97abdc79..19c5d3c3ea 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -904,6 +904,7 @@ class VariableScope(object):
                    dtype=None,
                    initializer=None,
                    regularizer=None,
+                   reuse=None,
                    trainable=True,
                    collections=None,
                    caching_device=None,
@@ -920,6 +921,8 @@ class VariableScope(object):
       partitioner = self._partitioner
     if custom_getter is None:
       custom_getter = self._custom_getter
+    if reuse is None:
+      reuse = self._reuse
 
     full_name = self.name + "/" + name if self.name else name
     # Variable names only depend on variable_scope (full_name here),
@@ -942,7 +945,7 @@ class VariableScope(object):
 
       return var_store.get_variable(
           full_name, shape=shape, dtype=dtype, initializer=initializer,
-          regularizer=regularizer, reuse=self.reuse, trainable=trainable,
+          regularizer=regularizer, reuse=reuse, trainable=trainable,
           collections=collections, caching_device=caching_device,
           partitioner=partitioner, validate_shape=validate_shape,
           use_resource=use_resource, custom_getter=custom_getter)
-- 
GitLab


From 78ead4e427eb97b814b32748575f4ad97d690595 Mon Sep 17 00:00:00 2001
From: Malcolm Reynolds <mareynolds@google.com>
Date: Fri, 31 Mar 2017 03:07:38 -0800
Subject: [PATCH 0014/1563] Only change ._variables_created in template after
 inner function succeeds. Change: 151809410

---
 .../python/kernel_tests/template_test.py      | 24 ++++++++++++++++++-
 tensorflow/python/ops/template.py             | 15 +++++++-----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/kernel_tests/template_test.py b/tensorflow/python/kernel_tests/template_test.py
index be2d6a566a..54e8098e4e 100644
--- a/tensorflow/python/kernel_tests/template_test.py
+++ b/tensorflow/python/kernel_tests/template_test.py
@@ -306,7 +306,7 @@ class TemplateTest(test.TestCase):
     self.assertEqual(custom_getter_count[0], 2)
 
     # Test that custom getter is called when the variable scope is created
-    # during construction
+  # during construction
     custom_getter_count[0] = 0
     tmpl2 = template.make_template(
         "s2",
@@ -319,6 +319,28 @@ class TemplateTest(test.TestCase):
     tmpl2()
     self.assertEqual(custom_getter_count[0], 2)
 
+  def test_fails_gracefully(self):
+    for create_scope_now in [True, False]:
+      def module_function_with_one_arg(inputs):
+        w = variable_scope.get_variable(
+            "w", shape=[1], initializer=init_ops.zeros_initializer())
+        return inputs * w
+
+      templatized_function = template.make_template(
+          "f1", module_function_with_one_arg,
+          create_scope_now_=create_scope_now)
+      data = array_ops.zeros(1)
+      try:
+        # Try to connect with a kwarg which is unsupported.
+        templatized_function(data, is_training=True)
+      except TypeError:
+        pass
+
+      # The failed __call__ hasn't modified the inner state.
+      self.assertFalse(templatized_function._variables_created)
+      templatized_function(data)
+      self.assertTrue(templatized_function._variables_created)
+
   def test_name_scopes_for_variable_scopes(self):
     # Test that name scopes are not unnecessarily uniquified (but are
     # still uniquified when necessary).
diff --git a/tensorflow/python/ops/template.py b/tensorflow/python/ops/template.py
index 80dd74521b..48be9e2cda 100644
--- a/tensorflow/python/ops/template.py
+++ b/tensorflow/python/ops/template.py
@@ -261,20 +261,23 @@ class Template(object):
           return self._call_func(args, kwargs, check_for_new_variables=True)
       else:
         # This is the first visit to __call__, but the scope has already been
-        # created in the constructor. Set _variables_created so that subsequent
-        # calls take the if branch above.
-        self._variables_created = True
+        # created in the constructor. Set _variables_created after the inner
+        # function is successfully called so that subsequent calls take the if
+        # branch above.
         with variable_scope.variable_scope(self._variable_scope):
-          return self._call_func(args, kwargs, check_for_new_variables=False)
+          result = self._call_func(args, kwargs, check_for_new_variables=False)
+          self._variables_created = True
+          return result
     else:
       # The scope was not created at construction time, so create it here.
       # Subsequent calls should reuse variables.
-      self._variables_created = True
       with variable_scope.variable_scope(
           self._unique_name, self._name,
           custom_getter=self._custom_getter) as vs:
         self._variable_scope = vs
-        return self._call_func(args, kwargs, check_for_new_variables=False)
+        result = self._call_func(args, kwargs, check_for_new_variables=False)
+        self._variables_created = True
+        return result
 
   @property
   def variable_scope(self):
-- 
GitLab


From 52267c1aceb1b8935f79022040d13b02fb986a8f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 03:28:09 -0800
Subject: [PATCH 0015/1563] Add more test cases for scalar s32 remainder.
 Change: 151810398

---
 .../xla/tests/scalar_computations_test.cc     | 94 +++++++++----------
 1 file changed, 42 insertions(+), 52 deletions(-)

diff --git a/tensorflow/compiler/xla/tests/scalar_computations_test.cc b/tensorflow/compiler/xla/tests/scalar_computations_test.cc
index d5cb98f304..0005c0c9e2 100644
--- a/tensorflow/compiler/xla/tests/scalar_computations_test.cc
+++ b/tensorflow/compiler/xla/tests/scalar_computations_test.cc
@@ -249,11 +249,13 @@ XLA_TEST_F(ScalarComputationsTest, RemTwoScalarsF32) {
 struct DivS32Params {
   int32 dividend;
   int32 divisor;
-  int32 result;
+  int32 quotient;
+  int32 remainder;
 };
 
 void PrintTo(const DivS32Params& p, std::ostream* os) {
-  *os << "{" << p.dividend << ", " << p.divisor << ", " << p.result << "}";
+  *os << "{" << p.dividend << ", " << p.divisor << ", " << p.quotient << ", "
+      << p.remainder << "}";
 }
 
 class DivS32Test : public ClientLibraryTestBase,
@@ -265,60 +267,48 @@ XLA_TEST_P(DivS32Test, DivideTwoScalarsS32) {
   builder.Div(builder.ConstantR0<int32>(p.dividend),
               builder.ConstantR0<int32>(p.divisor));
 
-  ComputeAndCompareR0<int32>(&builder, p.result, {});
+  ComputeAndCompareR0<int32>(&builder, p.quotient, {});
 }
 
-INSTANTIATE_TEST_CASE_P(DivS32Test_Instantiation, DivS32Test,
-                        ::testing::Values(
-                            // Positive divisors.
-                            DivS32Params{5, 2, 2},     //
-                            DivS32Params{-5, 2, -2},   //
-                            DivS32Params{17, 3, 5},    //
-                            DivS32Params{-17, 3, -5},  //
-                            // Negative divisors.
-                            DivS32Params{5, -2, -2},   //
-                            DivS32Params{-5, -2, 2},   //
-                            DivS32Params{17, -3, -5},  //
-                            DivS32Params{-17, -3, 5},  //
-                            // Large positive divisors.
-                            DivS32Params{INT32_MIN, INT32_MAX, -1},       //
-                            DivS32Params{INT32_MIN + 1, INT32_MAX, -1},   //
-                            DivS32Params{INT32_MIN + 2, INT32_MAX, 0},    //
-                            DivS32Params{INT32_MIN, 0x40000000, -2},      //
-                            DivS32Params{INT32_MIN + 1, 0x40000000, -1},  //
-                            // Large negative divisors.
-                            DivS32Params{INT32_MIN, INT32_MIN, 1},       //
-                            DivS32Params{INT32_MIN, INT32_MIN + 1, 1},   //
-                            DivS32Params{INT32_MIN + 1, INT32_MIN, 0},   //
-                            DivS32Params{INT32_MAX, INT32_MIN, 0},       //
-                            DivS32Params{INT32_MAX, INT32_MIN + 1, -1},  //
-                            DivS32Params{INT32_MIN, -0x40000000, 2},     //
-                            DivS32Params{INT32_MIN + 1, -0x40000000, 1}));
-
-TEST_F(ScalarComputationsTest, RemainderTwoScalarsNegativeResultS32) {
-  ComputationBuilder builder(client_, TestName());
-  builder.Rem(builder.ConstantR0<int32>(-5), builder.ConstantR0<int32>(2));
-
-  ComputeAndCompareR0<int32>(&builder, -1, {});
-}
-
-TEST_F(ScalarComputationsTest, RemainderTwoScalarsIntMinS32) {
-  ComputationBuilder builder(client_, TestName());
-  builder.Rem(builder.ConstantR0<int32>(INT_MIN),
-              builder.ConstantR0<int32>(7919));
-
-  ComputeAndCompareR0<int32>(&builder, -1309, {});
-}
-
-TEST_F(ScalarComputationsTest, RemainderTwoScalarsIntMinVsIntMaxS32) {
+XLA_TEST_P(DivS32Test, RemainderTwoScalarsS32) {
+  DivS32Params p = GetParam();
   ComputationBuilder builder(client_, TestName());
-  builder.Rem(builder.ConstantR0<int32>(INT_MIN),
-              builder.ConstantR0<int32>(INT_MAX));
-
-  ComputeAndCompareR0<int32>(&builder, -1, {});
-}
+  builder.Rem(builder.ConstantR0<int32>(p.dividend),
+              builder.ConstantR0<int32>(p.divisor));
 
-TEST_F(ScalarComputationsTest, RemainderTwoScalarsPositiveResultS32) {
+  ComputeAndCompareR0<int32>(&builder, p.remainder, {});
+}
+
+INSTANTIATE_TEST_CASE_P(
+    DivS32Test_Instantiation, DivS32Test,
+    ::testing::Values(
+        // Positive divisors.
+        DivS32Params{5, 2, 2, 1},      //
+        DivS32Params{-5, 2, -2, -1},   //
+        DivS32Params{17, 3, 5, 2},     //
+        DivS32Params{-17, 3, -5, -2},  //
+        // Negative divisors.
+        DivS32Params{5, -2, -2, 1},    //
+        DivS32Params{-5, -2, 2, -1},   //
+        DivS32Params{17, -3, -5, 2},   //
+        DivS32Params{-17, -3, 5, -2},  //
+        // Large positive divisors.
+        DivS32Params{INT32_MIN, 7919, -271181, -1309},             //
+        DivS32Params{INT32_MIN, INT32_MAX, -1, -1},                //
+        DivS32Params{INT32_MIN + 1, INT32_MAX, -1, 0},             //
+        DivS32Params{INT32_MIN + 2, INT32_MAX, 0, INT32_MIN + 2},  //
+        DivS32Params{INT32_MIN, 0x40000000, -2, 0},                //
+        DivS32Params{INT32_MIN + 1, 0x40000000, -1, -0x3fffffff},  //
+        // Large negative divisors.
+        DivS32Params{INT32_MIN, INT32_MIN, 1, 0},                  //
+        DivS32Params{INT32_MIN, INT32_MIN + 1, 1, -1},             //
+        DivS32Params{INT32_MIN + 1, INT32_MIN, 0, INT32_MIN + 1},  //
+        DivS32Params{INT32_MAX, INT32_MIN, 0, INT32_MAX},          //
+        DivS32Params{INT32_MAX, INT32_MIN + 1, -1, 0},             //
+        DivS32Params{INT32_MIN, -0x40000000, 2, 0},                //
+        DivS32Params{INT32_MIN + 1, -0x40000000, 1, -0x3fffffff}));
+
+TEST_F(ScalarComputationsTest, RemainderTwoScalarsNonConstDividendS32) {
   ComputationBuilder builder(client_, TestName());
   auto x = builder.Parameter(0, ShapeUtil::MakeShape(S32, {}), "x");
   builder.Rem(x, builder.ConstantR0<int32>(80000));
-- 
GitLab


From 7b410ebea68bb26b3166a357cf7c1e8946a1b35b Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 30 Mar 2017 20:27:38 -0800
Subject: [PATCH 0016/1563] tfdbg: fix a bug in graph validation related to
 tf.while_loops

CL/147488620 fixed a bug where the debugger would hang at Enter and NextIteration nodes under certain conditions. But it introduced another bug where the debug dumps from Enter and NextIteration may get generated later than downstream nodes in the tf.while_loop body, causing "causility violation" during debug_data.DebugDumpDir's validation process under certain conditions (e.g., backpropagation on a dynamic_rnn). This CL fixes that by excluding Enter and NextIteration nodes from the validation process.

Fixes: #8337
Change: 151787432
---
 tensorflow/python/debug/BUILD                 |  2 +
 tensorflow/python/debug/lib/debug_data.py     |  4 ++
 .../python/debug/lib/session_debug_testlib.py | 58 +++++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 952c4adbfa..56dd7ceba5 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -485,7 +485,9 @@ py_library(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:rnn",
         "//tensorflow/python:state_ops",
+        "//tensorflow/python:tensor_array_grad",
         "//tensorflow/python:training",
         "//tensorflow/python:variables",
         "//third_party/py/numpy",
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index 9d0b360cde..96772aed8f 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -934,8 +934,12 @@ class DebugDumpDir(object):
       for inp in inputs:
         inp_node = get_node_name(inp)
         inp_output_slot = get_output_slot(inp)
+        # Inputs from Enter and NextIteration nodes are not validated because
+        # DebugNodeInserter::InsertNodes() in the debugger core skips creating
+        # control edges from debug ops watching these types of nodes.
         if (inp_node in self._debug_watches and
             inp_output_slot in self._debug_watches[inp_node] and
+            self._node_op_types.get(inp) not in ("Enter", "NextIteration") and
             (inp_node, inp_output_slot) not in pending_inputs[node]):
           pending_inputs[node].append((inp_node, inp_output_slot))
 
diff --git a/tensorflow/python/debug/lib/session_debug_testlib.py b/tensorflow/python/debug/lib/session_debug_testlib.py
index 42a7e6d0a3..511ddb1673 100644
--- a/tensorflow/python/debug/lib/session_debug_testlib.py
+++ b/tensorflow/python/debug/lib/session_debug_testlib.py
@@ -43,13 +43,36 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import rnn
+from tensorflow.python.ops import rnn_cell_impl
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
+import tensorflow.python.ops.tensor_array_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import googletest
 from tensorflow.python.platform import test
 from tensorflow.python.training import gradient_descent
 
 
+class _RNNCellForTest(rnn_cell_impl._RNNCell):  # pylint: disable=protected-access
+  """RNN cell for testing."""
+
+  def __init__(self, input_output_size, state_size):
+    self._input_output_size = input_output_size
+    self._state_size = state_size
+    self._w = variables.Variable(1.0, dtype=dtypes.float32, name="w")
+
+  @property
+  def output_size(self):
+    return self._input_output_size
+
+  @property
+  def state_size(self):
+    return self._state_size
+
+  def __call__(self, input_, state, scope=None):
+    return (math_ops.multiply(self._w, input_), state)
+
+
 class SessionDebugTestBase(test_util.TensorFlowTestCase):
   """Base class for unit tests of tfdbg running with tf.Session."""
 
@@ -436,6 +459,41 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
           [[12], [14], [16]],
           dump.get_tensors("while/NextIteration", 0, "DebugIdentity"))
 
+  def testDebugTrainingDynamicRNNWorks(self):
+    with session.Session() as sess:
+      input_size = 3
+      state_size = 2
+      time_steps = 4
+      batch_size = 2
+
+      input_values = np.random.randn(time_steps, batch_size, input_size)
+      sequence_length = np.random.randint(0, time_steps, size=batch_size)
+      concat_inputs = array_ops.placeholder(
+          dtypes.float32, shape=(time_steps, batch_size, input_size))
+
+      outputs_dynamic, _ = rnn.dynamic_rnn(
+          _RNNCellForTest(input_size, state_size),
+          inputs=concat_inputs,
+          sequence_length=sequence_length,
+          time_major=True,
+          dtype=dtypes.float32)
+      toy_loss = math_ops.reduce_sum(outputs_dynamic * outputs_dynamic)
+      train_op = gradient_descent.GradientDescentOptimizer(
+          learning_rate=0.1).minimize(toy_loss, name="train_op")
+
+      sess.run(variables.global_variables_initializer())
+
+      run_options = config_pb2.RunOptions(output_partition_graphs=True)
+      debug_utils.watch_graph(run_options,
+                              sess.graph,
+                              debug_urls=self._debug_urls())
+      run_metadata = config_pb2.RunMetadata()
+      sess.run(train_op, feed_dict={concat_inputs: input_values},
+               options=run_options, run_metadata=run_metadata)
+
+      debug_data.DebugDumpDir(
+          self._dump_root, partition_graphs=run_metadata.partition_graphs)
+
   def testDebugCondWatchingWholeGraphWorks(self):
     with session.Session() as sess:
       x = variables.Variable(10.0, name="x")
-- 
GitLab


From 35e9035b8c76306cc85ed4871660ffb78d484a3a Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Fri, 31 Mar 2017 06:51:27 -0800
Subject: [PATCH 0017/1563] TESTFIX:  LinearOperatorFullMatrix placeholder test
 was not using a placeholder. Change: 151822825

---
 .../python/kernel_tests/linear_operator_full_matrix_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
index 93cbb48e1b..d4a9e97ce7 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
@@ -45,7 +45,7 @@ class SquareLinearOperatorFullMatrixTest(
       # values are random and we want the same value used for both mat and
       # feed_dict.
       matrix = matrix.eval()
-      operator = linalg.LinearOperatorFullMatrix(matrix)
+      operator = linalg.LinearOperatorFullMatrix(matrix_ph)
       feed_dict = {matrix_ph: matrix}
     else:
       operator = linalg.LinearOperatorFullMatrix(matrix)
@@ -105,7 +105,7 @@ class SquareLinearOperatorFullMatrixSymmetricPositiveDefiniteTest(
       # feed_dict.
       matrix = matrix.eval()
       operator = linalg.LinearOperatorFullMatrix(
-          matrix, is_self_adjoint=True, is_positive_definite=True)
+          matrix_ph, is_self_adjoint=True, is_positive_definite=True)
       feed_dict = {matrix_ph: matrix}
     else:
       operator = linalg.LinearOperatorFullMatrix(
@@ -144,7 +144,7 @@ class NonSquareLinearOperatorFullMatrixTest(
       # values are random and we want the same value used for both mat and
       # feed_dict.
       matrix = matrix.eval()
-      operator = linalg.LinearOperatorFullMatrix(matrix)
+      operator = linalg.LinearOperatorFullMatrix(matrix_ph)
       feed_dict = {matrix_ph: matrix}
     else:
       operator = linalg.LinearOperatorFullMatrix(matrix)
-- 
GitLab


From 7ce8fb4ef2e1bf25db1c1667e71d78cfc42e802d Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Fri, 31 Mar 2017 08:04:13 -0800
Subject: [PATCH 0018/1563] [tf learn estimators] Bugfix to rnn_common
 following rollback of RNNCell instance argument support. Change: 151829043

---
 .../contrib/learn/python/learn/estimators/rnn_common.py       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py b/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py
index f20dc78834..6bb2b8b2aa 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py
@@ -66,8 +66,8 @@ def _get_single_cell(cell_type, num_units):
     ValueError: `cell_type` is an invalid `RNNCell` name.
     TypeError: `cell_type` is not a string or a subclass of `RNNCell`.
   """
-  cell_type = _CELL_TYPES.get(cell_type)
-  if cell_type is None and not issubclass(cell_type, contrib_rnn.RNNCell):
+  cell_type = _CELL_TYPES.get(cell_type, cell_type)
+  if not cell_type or not issubclass(cell_type, contrib_rnn.RNNCell):
     raise ValueError('The supported cell types are {}; got {}'.format(
         list(_CELL_TYPES.keys()), cell_type))
   return cell_type(num_units=num_units)
-- 
GitLab


From 9731b5eb6e8522cf1664c125983b4b1e97b316c4 Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Fri, 31 Mar 2017 08:20:26 -0800
Subject: [PATCH 0019/1563] Add a SliceProcessor specialized for const inputs,
 used if a constant folding pass is applied before LayoutOptimizer. Change:
 151830580

---
 .../grappler/optimizers/layout_optimizer.cc   | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/layout_optimizer.cc b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
index b0988b8a89..791944a1b3 100644
--- a/tensorflow/core/grappler/optimizers/layout_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
@@ -615,11 +615,9 @@ class ReluGradProcessor : public AgnosticNodeProcessor {
   }
 };
 
-// This is the older, less optimized gather-based SliceProcessor. We keep it as
-// a test case for constant propagation optimization.
-class SliceProcessorGatherBased : public AgnosticNodeProcessor {
+class SliceProcessor : public AgnosticNodeProcessor {
  public:
-  SliceProcessorGatherBased(GraphDef* graph, NodeDef* node, NodeMap* node_map)
+  SliceProcessor(GraphDef* graph, NodeDef* node, NodeMap* node_map)
       : AgnosticNodeProcessor(graph, node, node_map) {}
 
  protected:
@@ -663,9 +661,30 @@ class SliceProcessorGatherBased : public AgnosticNodeProcessor {
   }
 };
 
-class SliceProcessor : public AgnosticNodeProcessor {
+// Specialized SliceProcessor, used if the second and third input are const
+// nodes, which could be the case if a constant folding pass is applied
+// before this optimization.
+class SliceProcessorConst : public AgnosticNodeProcessor {
  public:
-  SliceProcessor(GraphDef* graph, NodeDef* node, NodeMap* node_map)
+  SliceProcessorConst(GraphDef* graph, NodeDef* node, NodeMap* node_map)
+      : AgnosticNodeProcessor(graph, node, node_map) {}
+
+ protected:
+  Status CustomizedProcessing() override {
+    // Skip the first input, which is the data to be sliced.
+    for (int i = 1; i < node_->input_size(); i++) {
+      auto shape_node = node_map_->GetNode(node_->input(i));
+      TF_RETURN_IF_ERROR(UpdateAttrValue(shape_node));
+    }
+    return Status::OK();
+  }
+};
+
+// Specialized SliceProcessor, used if the second input is ConcatOffset. An
+// example use case is in the gradient computation of Concat for InceptionV3.
+class SliceProcessorConcatOffset : public AgnosticNodeProcessor {
+ public:
+  SliceProcessorConcatOffset(GraphDef* graph, NodeDef* node, NodeMap* node_map)
       : AgnosticNodeProcessor(graph, node, node_map) {}
 
  protected:
@@ -938,14 +957,17 @@ class DataLayoutOptimizer {
             node_processor.reset(
                 new ReluGradProcessor(graph_, node, &node_map_));
           } else if (node->op().compare("Slice") == 0) {
-            auto maybe_concatoffset_node =
-                node_map_.GetNode(NodeName(node->input(1)));
-            if (maybe_concatoffset_node->op() == "ConcatOffset") {
+            auto input1 = node_map_.GetNode(NodeName(node->input(1)));
+            auto input2 = node_map_.GetNode(NodeName(node->input(2)));
+            if (input1->op() == "ConcatOffset") {
               node_processor.reset(
-                  new SliceProcessor(graph_, node, &node_map_));
+                  new SliceProcessorConcatOffset(graph_, node, &node_map_));
+            } else if (input1->op() == "Const" && input2->op() == "Const") {
+              node_processor.reset(
+                  new SliceProcessorConst(graph_, node, &node_map_));
             } else {
               node_processor.reset(
-                  new SliceProcessorGatherBased(graph_, node, &node_map_));
+                  new SliceProcessor(graph_, node, &node_map_));
             }
 
           } else if (node->op().compare("Squeeze") == 0) {
-- 
GitLab


From 50be7aa7d72ded57c11c705e9de80da2bdc2220b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 08:35:08 -0800
Subject: [PATCH 0020/1563] Migrate trees, models, testutils, and resources
 libraries to boosted_trees. Change: 151832033

---
 tensorflow/BUILD                              |   1 +
 tensorflow/contrib/boosted_trees/lib/BUILD    |  87 ++++
 .../lib/models/multiple_additive_trees.cc     | 140 +++++++
 .../lib/models/multiple_additive_trees.h      |  50 +++
 .../models/multiple_additive_trees_test.cc    | 381 ++++++++++++++++++
 .../lib/testutil/batch_features_testutil.cc   |  88 ++++
 .../lib/testutil/batch_features_testutil.h    |  45 +++
 .../lib/testutil/random_tree_gen.cc           | 211 ++++++++++
 .../lib/testutil/random_tree_gen.h            |  75 ++++
 .../lib/testutil/random_tree_gen_main.cc      |  64 +++
 .../boosted_trees/lib/trees/decision_tree.cc  | 170 ++++++++
 .../boosted_trees/lib/trees/decision_tree.h   |  49 +++
 .../lib/trees/decision_tree_test.cc           | 326 +++++++++++++++
 tensorflow/contrib/boosted_trees/proto/BUILD  |   9 +
 .../boosted_trees/proto/quantiles.proto       |  32 ++
 .../contrib/boosted_trees/resources/BUILD     |  53 +++
 .../decision_tree_ensemble_resource.h         |  76 ++++
 .../resources/quantile_stream_resource.h      | 104 +++++
 .../resources/stamped_resource.h              |  42 ++
 19 files changed, 2003 insertions(+)
 create mode 100644 tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.cc
 create mode 100644 tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.h
 create mode 100644 tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees_test.cc
 create mode 100644 tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.cc
 create mode 100644 tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.h
 create mode 100644 tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc
 create mode 100644 tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h
 create mode 100644 tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
 create mode 100644 tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc
 create mode 100644 tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h
 create mode 100644 tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc
 create mode 100644 tensorflow/contrib/boosted_trees/proto/quantiles.proto
 create mode 100644 tensorflow/contrib/boosted_trees/resources/BUILD
 create mode 100644 tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h
 create mode 100644 tensorflow/contrib/boosted_trees/resources/quantile_stream_resource.h
 create mode 100644 tensorflow/contrib/boosted_trees/resources/stamped_resource.h

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 38a8c72667..f07ef0cabf 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -194,6 +194,7 @@ filegroup(
         "//tensorflow/contrib/boosted_trees:all_files",
         "//tensorflow/contrib/boosted_trees/lib:all_files",
         "//tensorflow/contrib/boosted_trees/proto:all_files",
+        "//tensorflow/contrib/boosted_trees/resources:all_files",
         "//tensorflow/contrib/cloud:all_files",
         "//tensorflow/contrib/cloud/kernels:all_files",
         "//tensorflow/contrib/compiler:all_files",
diff --git a/tensorflow/contrib/boosted_trees/lib/BUILD b/tensorflow/contrib/boosted_trees/lib/BUILD
index 714bd324c2..011c02d720 100644
--- a/tensorflow/contrib/boosted_trees/lib/BUILD
+++ b/tensorflow/contrib/boosted_trees/lib/BUILD
@@ -160,3 +160,90 @@ cc_test(
         "//tensorflow/core:test_main",
     ],
 )
+
+cc_library(
+    name = "models",
+    srcs = ["models/multiple_additive_trees.cc"],
+    hdrs = ["models/multiple_additive_trees.h"],
+    deps = [
+        ":trees",
+        ":utils",
+        "//tensorflow/contrib/boosted_trees/proto:tree_config_proto_cc",
+        "//tensorflow/core:framework_headers_lib",
+    ],
+)
+
+cc_test(
+    name = "multiple_additive_trees_test",
+    size = "small",
+    srcs = ["models/multiple_additive_trees_test.cc"],
+    deps = [
+        ":batch_features_testutil",
+        ":models",
+        ":random_tree_gen",
+        "//tensorflow/contrib/boosted_trees/resources:decision_tree_ensemble_resource",
+        "//tensorflow/core:framework_headers_lib",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:tensor_testutil",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+cc_library(
+    name = "trees",
+    srcs = ["trees/decision_tree.cc"],
+    hdrs = ["trees/decision_tree.h"],
+    deps = [
+        ":utils",
+        "//tensorflow/contrib/boosted_trees/proto:tree_config_proto_cc",
+        "//tensorflow/core:framework_headers_lib",
+    ],
+)
+
+cc_test(
+    name = "trees_test",
+    size = "small",
+    srcs = ["trees/decision_tree_test.cc"],
+    deps = [
+        ":trees",
+        ":utils",
+        "//tensorflow/core:tensor_testutil",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+cc_library(
+    name = "batch_features_testutil",
+    testonly = 1,
+    srcs = ["testutil/batch_features_testutil.cc"],
+    hdrs = ["testutil/batch_features_testutil.h"],
+    deps = [
+        ":utils",
+        "//tensorflow/core:framework_headers_lib",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:test",
+        "//tensorflow/core:testlib",
+    ],
+)
+
+cc_library(
+    name = "random_tree_gen",
+    srcs = ["testutil/random_tree_gen.cc"],
+    hdrs = ["testutil/random_tree_gen.h"],
+    deps = [
+        "//tensorflow/contrib/boosted_trees/proto:tree_config_proto_cc",
+        "//tensorflow/core:lib",
+    ],
+)
+
+cc_binary(
+    name = "random_tree_gen_main",
+    srcs = ["testutil/random_tree_gen_main.cc"],
+    deps = [
+        ":random_tree_gen",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:lib",
+    ],
+)
diff --git a/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.cc b/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.cc
new file mode 100644
index 0000000000..16bffd9bec
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.cc
@@ -0,0 +1,140 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#include "tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.h"
+#include "tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h"
+#include "tensorflow/contrib/boosted_trees/lib/utils/batch_features.h"
+#include "tensorflow/contrib/boosted_trees/lib/utils/parallel_for.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace models {
+
+namespace {
+void CalculateTreesToKeep(
+    const boosted_trees::trees::DecisionTreeEnsembleConfig& config,
+    const std::vector<int32>& trees_to_drop, const int32 num_trees,
+    const bool only_finalized, std::vector<int32>* trees_to_keep) {
+  trees_to_keep->reserve(num_trees - trees_to_drop.size());
+
+  int32 index = 0;
+  // This assumes that trees_to_drop is a sorted list of tree ids.
+  for (int32 tree = 0; tree < num_trees; ++tree) {
+    if ((!trees_to_drop.empty() && index < trees_to_drop.size() &&
+         trees_to_drop[index] == tree) ||
+        (only_finalized && config.tree_metadata_size() > 0 &&
+         !config.tree_metadata(tree).is_finalized())) {
+      ++index;
+      continue;
+    }
+    trees_to_keep->push_back(tree);
+  }
+}
+
+void UpdatePredictions(
+    const int32 index_1, const int32 index_2, const float value,
+    tensorflow::TTypes<float>::Matrix* output_predictions,
+    tensorflow::TTypes<float>::Matrix* additional_output_predictions) {
+  (*output_predictions)(index_1, index_2) += value;
+
+  if (additional_output_predictions != nullptr) {
+    (*additional_output_predictions)(index_1, index_2) += value;
+  }
+}
+
+void UpdatePredictionsBasedOnTree(
+    const boosted_trees::trees::DecisionTreeEnsembleConfig& config,
+    const int32 tree_idx, const boosted_trees::utils::Example& example,
+    tensorflow::TTypes<float>::Matrix* output_predictions,
+    tensorflow::TTypes<float>::Matrix* additional_output_predictions) {
+  const boosted_trees::trees::DecisionTreeConfig& tree = config.trees(tree_idx);
+  const float tree_weight = config.tree_weights(tree_idx);
+  const int leaf_idx = trees::DecisionTree::Traverse(tree, 0, example);
+  QCHECK(leaf_idx >= 0) << "Invalid tree: " << tree.DebugString();
+  const auto& leaf_node = tree.nodes(leaf_idx);
+  QCHECK(leaf_node.has_leaf())
+      << "Invalid leaf node: " << leaf_node.DebugString();
+  if (leaf_node.leaf().has_sparse_vector()) {
+    const auto& leaf = leaf_node.leaf().sparse_vector();
+    QCHECK_EQ(leaf.index_size(), leaf.value_size());
+    for (size_t class_idx = 0; class_idx < leaf.index_size(); ++class_idx) {
+      const float value = tree_weight * leaf.value(class_idx);
+
+      UpdatePredictions(example.example_idx, leaf.index(class_idx), value,
+                        output_predictions, additional_output_predictions);
+    }
+  } else {
+    QCHECK(leaf_node.leaf().has_vector()) << "Unknown leaf type";
+    const auto& leaf = leaf_node.leaf().vector();
+    for (size_t i = 0; i < leaf.value_size(); ++i) {
+      const float value = tree_weight * leaf.value(i);
+      UpdatePredictions(example.example_idx, i, value, output_predictions,
+                        additional_output_predictions);
+    }
+  }
+}
+
+}  // namespace
+
+void MultipleAdditiveTrees::Predict(
+    const boosted_trees::trees::DecisionTreeEnsembleConfig& config,
+    const bool only_finalized_trees, const std::vector<int32>& trees_to_drop,
+    const boosted_trees::utils::BatchFeatures& features,
+    tensorflow::thread::ThreadPool* worker_threads,
+    tensorflow::TTypes<float>::Matrix output_predictions,
+    tensorflow::TTypes<float>::Matrix no_dropout_predictions) {
+  // Zero out predictions as the model is additive.
+  output_predictions.setZero();
+  no_dropout_predictions.setZero();
+
+  // Get batch size.
+  const int64 batch_size = features.batch_size();
+  if (batch_size <= 0) {
+    return;
+  }
+
+  // Prepare the list of trees to keep.
+  std::vector<int32> trees_to_keep;
+  CalculateTreesToKeep(config, trees_to_drop, config.trees_size(),
+                       only_finalized_trees, &trees_to_keep);
+
+  // Lambda for doing a block of work.
+  auto update_predictions = [&config, &features, &trees_to_keep, &trees_to_drop,
+                             &output_predictions,
+                             &no_dropout_predictions](int64 start, int64 end) {
+    auto examples_iterable = features.examples_iterable(start, end);
+    for (const auto& example : examples_iterable) {
+      for (const int32 tree_idx : trees_to_keep) {
+        UpdatePredictionsBasedOnTree(config, tree_idx, example,
+                                     &output_predictions,
+                                     &no_dropout_predictions);
+      }
+
+      // Now do predictions for dropped trees
+      for (const int32 tree_idx : trees_to_drop) {
+        UpdatePredictionsBasedOnTree(config, tree_idx, example,
+                                     &no_dropout_predictions, nullptr);
+      }
+    }
+  };
+
+  // TODO(salehay): parallelize this for low latency in serving path where
+  // batch size tends to be small but ensemble size tends to be large.
+  boosted_trees::utils::ParallelFor(batch_size, worker_threads->NumThreads(),
+                                    worker_threads, update_predictions);
+}
+
+}  // namespace models
+}  // namespace boosted_trees
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.h b/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.h
new file mode 100644
index 0000000000..fedade2026
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.h
@@ -0,0 +1,50 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_MODELS_MULTIPLE_ADDITIVE_TREES_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_MODELS_MULTIPLE_ADDITIVE_TREES_H_
+
+#include <vector>
+
+#include "tensorflow/contrib/boosted_trees/lib/utils/batch_features.h"
+#include "tensorflow/contrib/boosted_trees/proto/tree_config.pb.h"  // NOLINT
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace models {
+
+// Multiple additive trees prediction model.
+// This class does not hold state and is thread safe.
+class MultipleAdditiveTrees {
+ public:
+  // Predict runs tree ensemble on the given batch and updates
+  // output predictions accordingly. The method also returns predictions that
+  // we would get if no dropout was applied.
+  static void Predict(
+      const boosted_trees::trees::DecisionTreeEnsembleConfig& config,
+      const bool only_finalized_trees, const std::vector<int32>& trees_to_drop,
+      const boosted_trees::utils::BatchFeatures& features,
+      thread::ThreadPool* const thread_pool,
+      TTypes<float>::Matrix output_predictions,
+      TTypes<float>::Matrix no_dropout_predictions);
+};
+
+}  // namespace models
+}  // namespace boosted_trees
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_MODELS_MULTIPLE_ADDITIVE_TREES_H_
diff --git a/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees_test.cc b/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees_test.cc
new file mode 100644
index 0000000000..5f0924b48f
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees_test.cc
@@ -0,0 +1,381 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#include "tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.h"
+
+#include "tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.h"
+#include "tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h"
+#include "tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/random/philox_random.h"
+#include "tensorflow/core/lib/random/simple_philox.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/test_benchmark.h"
+
+namespace tensorflow {
+using boosted_trees::trees::DecisionTreeEnsembleConfig;
+using test::AsTensor;
+
+namespace boosted_trees {
+namespace models {
+namespace {
+
+const int32 kNumThreadsMultiThreaded = 6;
+const int32 kNumThreadsSingleThreaded = 1;
+
+class MultipleAdditiveTreesTest : public ::testing::Test {
+ protected:
+  MultipleAdditiveTreesTest() : batch_features_(2) {
+    // Create a batch of two examples having one dense feature each.
+    // The shape of the dense matrix is therefore 2x1 as in one row per example
+    // and one column per feature per example.
+    auto dense_matrix = test::AsTensor<float>({7.0f, -2.0f}, {2, 1});
+    TF_EXPECT_OK(
+        batch_features_.Initialize({dense_matrix}, {}, {}, {}, {}, {}, {}));
+  }
+
+  boosted_trees::utils::BatchFeatures batch_features_;
+};
+
+TEST_F(MultipleAdditiveTreesTest, Empty) {
+  // Create empty tree ensemble.
+  DecisionTreeEnsembleConfig tree_ensemble_config;
+  auto output_tensor = AsTensor<float>({9.0f, 23.0f}, {2, 1});
+  auto output_matrix = output_tensor.matrix<float>();
+  auto no_dropout_output_matrix = output_tensor.matrix<float>();
+
+  // Predict for both instances.
+  tensorflow::thread::ThreadPool threads(tensorflow::Env::Default(), "test",
+                                         kNumThreadsSingleThreaded);
+  MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                 false,  // include non-finalized trees
+                                 {}, batch_features_, &threads, output_matrix,
+                                 no_dropout_output_matrix);
+  EXPECT_EQ(0, output_matrix(0, 0));
+  EXPECT_EQ(0, output_matrix(1, 0));
+
+  // There was no dropout
+  for (int i = 0; i < 2; ++i) {
+    EXPECT_EQ(output_matrix(i, 0), no_dropout_output_matrix(i, 0));
+  }
+}
+
+TEST_F(MultipleAdditiveTreesTest, SingleClass) {
+  // Add one bias and one stump to ensemble for a single class.
+  DecisionTreeEnsembleConfig tree_ensemble_config;
+  auto* tree1 = tree_ensemble_config.add_trees();
+  auto* bias_leaf = tree1->add_nodes()->mutable_leaf()->mutable_sparse_vector();
+  bias_leaf->add_index(0);
+  bias_leaf->add_value(-0.4f);
+  auto* tree2 = tree_ensemble_config.add_trees();
+  auto* dense_split = tree2->add_nodes()->mutable_dense_float_binary_split();
+  dense_split->set_feature_column(0);
+  dense_split->set_threshold(5.0f);
+  dense_split->set_left_id(1);
+  dense_split->set_right_id(2);
+  auto* leaf1 = tree2->add_nodes()->mutable_leaf()->mutable_sparse_vector();
+  leaf1->add_index(0);
+  leaf1->add_value(0.9f);
+  auto* leaf2 = tree2->add_nodes()->mutable_leaf()->mutable_sparse_vector();
+  leaf2->add_index(0);
+  leaf2->add_value(0.2f);
+
+  tree_ensemble_config.add_tree_weights(1.0);
+  tree_ensemble_config.add_tree_weights(1.0);
+
+  auto output_tensor = AsTensor<float>({0.0f, 0.0f}, {2, 1});
+  auto output_matrix = output_tensor.matrix<float>();
+
+  auto no_dropout_output_tensor = AsTensor<float>({0.0f, 0.0f}, {2, 1});
+  auto no_dropout_output_matrix = no_dropout_output_tensor.matrix<float>();
+
+  tensorflow::thread::ThreadPool threads(tensorflow::Env::Default(), "test",
+                                         kNumThreadsSingleThreaded);
+
+  // Normal case.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {}, batch_features_, &threads, output_matrix,
+                                   no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(-0.2f, output_matrix(0, 0));  // -0.4 (bias) + 0.2 (leaf 2).
+    EXPECT_FLOAT_EQ(0.5f, output_matrix(1, 0));   // -0.4 (bias) + 0.9 (leaf 1).
+
+    // No dropout predictions are the same.
+    for (int i = 0; i < 2; ++i) {
+      EXPECT_EQ(output_matrix(i, 0), no_dropout_output_matrix(i, 0));
+    }
+  }
+  // Weighted case
+  {
+    DecisionTreeEnsembleConfig weighted = tree_ensemble_config;
+    weighted.set_tree_weights(0, 6.0);
+    weighted.set_tree_weights(1, 3.2);
+    MultipleAdditiveTrees::Predict(weighted,
+                                   false,  // include non-finalized trees
+                                   {}, batch_features_, &threads, output_matrix,
+                                   no_dropout_output_matrix);
+    // -0.4 (bias) + 0.2 (leaf 2).
+    EXPECT_FLOAT_EQ(-0.4f * 6 + 0.2 * 3.2, output_matrix(0, 0));
+    // -0.4 (bias) + 0.9 (leaf 1).
+    EXPECT_FLOAT_EQ(-0.4f * 6 + 0.9 * 3.2, output_matrix(1, 0));
+
+    // No dropout predictions are the same.
+    for (int i = 0; i < 2; ++i) {
+      EXPECT_EQ(output_matrix(i, 0), no_dropout_output_matrix(i, 0));
+    }
+  }
+  // Drop first tree.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {0}, batch_features_, &threads,
+                                   output_matrix, no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(0.2f, output_matrix(0, 0));  // 0.2 (leaf 2).
+    EXPECT_FLOAT_EQ(0.9f, output_matrix(1, 0));  // 0.9 (leaf 1).
+
+    // No dropout predictions
+    EXPECT_FLOAT_EQ(
+        -0.2f, no_dropout_output_matrix(0, 0));  // -0.4 (bias) + 0.2 (leaf 2).
+    EXPECT_FLOAT_EQ(
+        0.5f, no_dropout_output_matrix(1, 0));  // -0.4 (bias) + 0.9 (leaf 1).
+  }
+  // Drop second tree.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {1}, batch_features_, &threads,
+                                   output_matrix, no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(-0.4f, output_matrix(0, 0));  // -0.4 (bias).
+    EXPECT_FLOAT_EQ(-0.4f, output_matrix(1, 0));  // -0.4 (bias).
+
+    // No dropout predictions
+    EXPECT_FLOAT_EQ(
+        -0.2f, no_dropout_output_matrix(0, 0));  // -0.4 (bias) + 0.2 (leaf 2).
+    EXPECT_FLOAT_EQ(
+        0.5f, no_dropout_output_matrix(1, 0));  // -0.4 (bias) + 0.9 (leaf 1).
+  }
+  // Drop all trees.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {0, 1}, batch_features_, &threads,
+                                   output_matrix, no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(0.0, output_matrix(0, 0));
+    EXPECT_FLOAT_EQ(0.0, output_matrix(1, 0));
+
+    // No dropout predictions
+    EXPECT_FLOAT_EQ(
+        -0.2f, no_dropout_output_matrix(0, 0));  // -0.4 (bias) + 0.2 (leaf 2).
+    EXPECT_FLOAT_EQ(
+        0.5f, no_dropout_output_matrix(1, 0));  // -0.4 (bias) + 0.9 (leaf 1).
+  }
+}
+
+TEST_F(MultipleAdditiveTreesTest, MultiClass) {
+  // Add one bias and one stump to ensemble for two classes.
+  DecisionTreeEnsembleConfig tree_ensemble_config;
+  auto* tree1 = tree_ensemble_config.add_trees();
+  auto* bias_leaf = tree1->add_nodes()->mutable_leaf()->mutable_sparse_vector();
+  bias_leaf->add_index(0);
+  bias_leaf->add_value(-0.4f);
+  bias_leaf->add_index(1);
+  bias_leaf->add_value(-0.7f);
+  auto* tree2 = tree_ensemble_config.add_trees();
+  auto* dense_split = tree2->add_nodes()->mutable_dense_float_binary_split();
+  dense_split->set_feature_column(0);
+  dense_split->set_threshold(5.0f);
+  dense_split->set_left_id(1);
+  dense_split->set_right_id(2);
+  auto* leaf1 = tree2->add_nodes()->mutable_leaf()->mutable_sparse_vector();
+  leaf1->add_index(0);
+  leaf1->add_value(0.9f);
+  auto* leaf2 = tree2->add_nodes()->mutable_leaf()->mutable_sparse_vector();
+  leaf2->add_index(1);
+  leaf2->add_value(0.2f);
+
+  tree_ensemble_config.add_tree_weights(1.0);
+  tree_ensemble_config.add_tree_weights(1.0);
+
+  // Predict for both instances.
+  tensorflow::thread::ThreadPool threads(tensorflow::Env::Default(), "test",
+                                         kNumThreadsSingleThreaded);
+  auto output_tensor = AsTensor<float>({0.0f, 0.0f, 0.0f, 0.0f}, {2, 2});
+  auto output_matrix = output_tensor.matrix<float>();
+
+  auto no_dropout_output_tensor =
+      AsTensor<float>({0.0f, 0.0f, 0.0f, 0.0f}, {2, 2});
+  auto no_dropout_output_matrix = no_dropout_output_tensor.matrix<float>();
+
+  // Normal case.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {}, batch_features_, &threads, output_matrix,
+                                   no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(-0.4f, output_matrix(0, 0));  // -0.4 (bias)
+    EXPECT_FLOAT_EQ(-0.5f, output_matrix(0, 1));  // -0.7 (bias) + 0.2 (leaf 2)
+    EXPECT_FLOAT_EQ(0.5f, output_matrix(1, 0));   // -0.4 (bias) + 0.9 (leaf 1)
+    EXPECT_FLOAT_EQ(-0.7f, output_matrix(1, 1));  // -0.7 (bias)
+
+    // No dropout predictions are the same.
+    for (int i = 0; i < 2; ++i) {
+      for (int j = 0; j < 2; ++j) {
+        EXPECT_EQ(output_matrix(i, j), no_dropout_output_matrix(i, j));
+      }
+    }
+  }
+  // Weighted case.
+  {
+    DecisionTreeEnsembleConfig weighted = tree_ensemble_config;
+    weighted.set_tree_weights(0, 6.0);
+    weighted.set_tree_weights(1, 3.2);
+    MultipleAdditiveTrees::Predict(weighted,
+                                   false,  // include non-finalized trees
+                                   {}, batch_features_, &threads, output_matrix,
+                                   no_dropout_output_matrix);
+    // bias
+    EXPECT_FLOAT_EQ(-0.4f * 6, output_matrix(0, 0));
+    // bias + leaf 2
+    EXPECT_FLOAT_EQ(-0.7f * 6 + 0.2f * 3.2, output_matrix(0, 1));
+    // bias + leaf 2
+    EXPECT_FLOAT_EQ(-0.4f * 6 + 0.9f * 3.2f, output_matrix(1, 0));
+    // bias
+    EXPECT_FLOAT_EQ(-0.7f * 6, output_matrix(1, 1));
+  }
+  // Dropout first tree.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {0}, batch_features_, &threads,
+                                   output_matrix, no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(0.0, output_matrix(0, 0));
+    EXPECT_FLOAT_EQ(0.2f, output_matrix(0, 1));  // 0.2 (leaf 2)
+    EXPECT_FLOAT_EQ(0.9f, output_matrix(1, 0));  // 0.9 (leaf 2)
+    EXPECT_FLOAT_EQ(0.0f, output_matrix(1, 1));
+
+    // No dropout predictions
+    EXPECT_FLOAT_EQ(-0.4f, no_dropout_output_matrix(0, 0));  // -0.4 (bias)
+    EXPECT_FLOAT_EQ(
+        -0.5f, no_dropout_output_matrix(0, 1));  // -0.7 (bias) + 0.2 (leaf 2)
+    EXPECT_FLOAT_EQ(
+        0.5f, no_dropout_output_matrix(1, 0));  // -0.4 (bias) + 0.9 (leaf 2)
+    EXPECT_FLOAT_EQ(-0.7f, no_dropout_output_matrix(1, 1));  // -0.7 (bias)
+  }
+  // Dropout second tree.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {1}, batch_features_, &threads,
+                                   output_matrix, no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(-0.4f, output_matrix(0, 0));  // -0.4 (bias)
+    EXPECT_FLOAT_EQ(-0.7f, output_matrix(0, 1));  // -0.7 (bias)
+    EXPECT_FLOAT_EQ(-0.4f, output_matrix(1, 0));  // -0.4 (bias)
+    EXPECT_FLOAT_EQ(-0.7f, output_matrix(1, 1));  // -0.7 (bias)
+
+    // No dropout predictions
+    EXPECT_FLOAT_EQ(-0.4f, no_dropout_output_matrix(0, 0));  // -0.4 (bias)
+    EXPECT_FLOAT_EQ(
+        -0.5f, no_dropout_output_matrix(0, 1));  // -0.7 (bias) + 0.2 (leaf 2)
+    EXPECT_FLOAT_EQ(
+        0.5f, no_dropout_output_matrix(1, 0));  // -0.4 (bias) + 0.9 (leaf 2)
+    EXPECT_FLOAT_EQ(-0.7f, no_dropout_output_matrix(1, 1));  // -0.7 (bias)
+  }
+  // Drop both trees.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {0, 1}, batch_features_, &threads,
+                                   output_matrix, no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(0.0f, output_matrix(0, 0));
+    EXPECT_FLOAT_EQ(0.0f, output_matrix(0, 1));
+    EXPECT_FLOAT_EQ(0.0f, output_matrix(1, 0));
+    EXPECT_FLOAT_EQ(0.0f, output_matrix(1, 1));
+
+    // No dropout predictions
+    EXPECT_FLOAT_EQ(-0.4f, no_dropout_output_matrix(0, 0));  // -0.4 (bias)
+    EXPECT_FLOAT_EQ(
+        -0.5f, no_dropout_output_matrix(0, 1));  // -0.7 (bias) + 0.2 (leaf 2)
+    EXPECT_FLOAT_EQ(
+        0.5f, no_dropout_output_matrix(1, 0));  // -0.4 (bias) + 0.9 (leaf 2)
+    EXPECT_FLOAT_EQ(-0.7f, no_dropout_output_matrix(1, 1));  // -0.7 (bias)
+  }
+}
+
+TEST_F(MultipleAdditiveTreesTest, DenseLeaves) {
+  DecisionTreeEnsembleConfig tree_ensemble_config;
+  auto* tree1 = tree_ensemble_config.add_trees();
+  auto* bias_leaf = tree1->add_nodes()->mutable_leaf()->mutable_vector();
+  bias_leaf->add_value(-0.4f);
+  bias_leaf->add_value(-0.7f);
+  bias_leaf->add_value(3.0f);
+  auto* tree2 = tree_ensemble_config.add_trees();
+  auto* dense_split = tree2->add_nodes()->mutable_dense_float_binary_split();
+  dense_split->set_feature_column(0);
+  dense_split->set_threshold(5.0f);
+  dense_split->set_left_id(1);
+  dense_split->set_right_id(2);
+  auto* leaf1 = tree2->add_nodes()->mutable_leaf()->mutable_vector();
+  leaf1->add_value(0.9f);
+  leaf1->add_value(0.8f);
+  leaf1->add_value(0.7f);
+  auto* leaf2 = tree2->add_nodes()->mutable_leaf()->mutable_vector();
+  leaf2->add_value(0.2f);
+  leaf2->add_value(0.3f);
+  leaf2->add_value(0.4f);
+
+  tree_ensemble_config.add_tree_weights(1.0);
+  tree_ensemble_config.add_tree_weights(1.0);
+
+  // Predict for both instances.
+  tensorflow::thread::ThreadPool threads(tensorflow::Env::Default(), "test",
+                                         kNumThreadsSingleThreaded);
+  auto output_tensor =
+      AsTensor<float>({0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, {2, 3});
+  auto output_matrix = output_tensor.matrix<float>();
+
+  auto no_dropout_output_tensor =
+      AsTensor<float>({0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, {2, 3});
+  auto no_dropout_output_matrix = no_dropout_output_tensor.matrix<float>();
+
+  // Normal case.
+  {
+    MultipleAdditiveTrees::Predict(tree_ensemble_config,
+                                   false,  // include non-finalized trees
+                                   {}, batch_features_, &threads, output_matrix,
+                                   no_dropout_output_matrix);
+    EXPECT_FLOAT_EQ(-0.2f, output_matrix(0, 0));  // -0.4 (tree1) + 0.2 (leaf 2)
+    EXPECT_FLOAT_EQ(-0.4f, output_matrix(0, 1));  // -0.7 (tree1) + 0.3 (leaf 2)
+    EXPECT_FLOAT_EQ(3.4f, output_matrix(0, 2));   // 3.0 -(tree1) + 0.4 (leaf 2)
+    EXPECT_FLOAT_EQ(0.5f, output_matrix(1, 0));   // -0.4 (tree1) + 0.9 (leaf 1)
+    EXPECT_FLOAT_EQ(0.1f, output_matrix(1, 1));   // -0.7 (tree1) + 0.8 (leaf 1)
+    EXPECT_FLOAT_EQ(3.7f, output_matrix(1, 2));   // 3.0 (tree1) + 0.7 (leaf 1)
+
+    // No dropout predictions are the same.
+    for (int i = 0; i < 2; ++i) {
+      for (int j = 0; j < 3; ++j) {
+        EXPECT_EQ(output_matrix(i, j), no_dropout_output_matrix(i, j));
+      }
+    }
+  }
+}
+
+}  // namespace
+}  // namespace models
+}  // namespace boosted_trees
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.cc b/tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.cc
new file mode 100644
index 0000000000..39c2fbe9c9
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.cc
@@ -0,0 +1,88 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#include "tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.h"
+
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace testutil {
+
+using tensorflow::Tensor;
+
+void RandomlyInitializeBatchFeatures(
+    tensorflow::random::SimplePhilox* rng, uint32 num_dense_float_features,
+    uint32 num_sparse_float_features, double sparsity_lo, double sparsity_hi,
+    boosted_trees::utils::BatchFeatures* batch_features) {
+  const int64 batch_size = static_cast<int64>(batch_features->batch_size());
+
+  // Populate dense features.
+  std::vector<tensorflow::Tensor> dense_float_features_list;
+  for (int i = 0; i < num_dense_float_features; ++i) {
+    std::vector<float> values;
+    for (int64 j = 0; j < batch_size; ++j) {
+      values.push_back(rng->RandFloat());
+    }
+    auto dense_tensor = Tensor(tensorflow::DT_FLOAT, {batch_size, 1});
+    tensorflow::test::FillValues<float>(&dense_tensor, values);
+    dense_float_features_list.push_back(dense_tensor);
+  }
+
+  // Populate sparse features.
+  std::vector<tensorflow::Tensor> sparse_float_feature_indices_list;
+  std::vector<tensorflow::Tensor> sparse_float_feature_values_list;
+  std::vector<tensorflow::Tensor> sparse_float_feature_shapes_list;
+  for (int i = 0; i < num_sparse_float_features; ++i) {
+    std::set<uint64> indices;
+    const double sparsity =
+        sparsity_lo + rng->RandDouble() * (sparsity_hi - sparsity_lo);
+    const double density = 1 - sparsity;
+    for (int64 k = 0; k < static_cast<int64>(density * batch_size) + 1; ++k) {
+      indices.insert(rng->Uniform64(batch_size));
+    }
+    const int64 sparse_values_size = indices.size();
+    std::vector<int64> indices_vector;
+    for (auto idx : indices) {
+      indices_vector.push_back(idx);
+      indices_vector.push_back(0);
+    }
+    auto indices_tensor = Tensor(tensorflow::DT_INT64, {sparse_values_size, 2});
+    tensorflow::test::FillValues<int64>(&indices_tensor, indices_vector);
+    sparse_float_feature_indices_list.push_back(indices_tensor);
+
+    std::vector<float> values;
+    for (int64 j = 0; j < sparse_values_size; ++j) {
+      values.push_back(rng->RandFloat());
+    }
+    auto values_tensor = Tensor(tensorflow::DT_FLOAT, {sparse_values_size});
+    tensorflow::test::FillValues<float>(&values_tensor, values);
+    sparse_float_feature_values_list.push_back(values_tensor);
+
+    auto shape_tensor = Tensor(tensorflow::DT_INT64, {2});
+    tensorflow::test::FillValues<int64>(&shape_tensor, {batch_size, 1});
+    sparse_float_feature_shapes_list.push_back(shape_tensor);
+  }
+
+  // TODO(salehay): Add categorical feature generation support.
+  TF_EXPECT_OK(batch_features->Initialize(
+      dense_float_features_list, sparse_float_feature_indices_list,
+      sparse_float_feature_values_list, sparse_float_feature_shapes_list, {},
+      {}, {}));
+}
+
+}  // namespace testutil
+}  // namespace boosted_trees
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.h b/tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.h
new file mode 100644
index 0000000000..d95878ec87
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/batch_features_testutil.h
@@ -0,0 +1,45 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TESTUTIL_BATCH_FEATURES_TESTUTIL_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TESTUTIL_BATCH_FEATURES_TESTUTIL_H_
+
+#include "tensorflow/contrib/boosted_trees/lib/utils/batch_features.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/simple_philox.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace testutil {
+
+// This method calls Initialize on the given 'batch_features', which will be
+// populated with randomly generated feature values when the call returns.
+// 'tensors' returns a vector of all tensors used in the initialization,
+// because they must outlive 'batch_features'.
+//
+// All float features will be either missing or uniformly randomly chosen
+// from [0, 1). For sparse (float) features, a sparsity is uniformly randomly
+// chosen from ['sparsity_lo', 'sparsity_hi') per feature, and each instance
+// will have a probability of sparsity of missing that feature, in other words,
+// sparsity = 1 - density.
+void RandomlyInitializeBatchFeatures(
+    tensorflow::random::SimplePhilox* rng, uint32 num_dense_float_features,
+    uint32 num_sparse_float_features, double sparsity_lo, double sparsity_hi,
+    boosted_trees::utils::BatchFeatures* batch_features);
+
+}  // namespace testutil
+}  // namespace boosted_trees
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TESTUTIL_BATCH_FEATURES_TESTUTIL_H_
diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc
new file mode 100644
index 0000000000..24259ff603
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc
@@ -0,0 +1,211 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#include "tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h"
+
+#include "tensorflow/core/lib/random/philox_random.h"
+#include "tensorflow/core/lib/random/simple_philox.h"
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace testutil {
+
+using tensorflow::boosted_trees::trees::DecisionTreeConfig;
+using tensorflow::boosted_trees::trees::TreeNode;
+using boosted_trees::trees::DenseFloatBinarySplit;
+
+namespace {
+
+// Append the given nodes to tree with transfer of pointer ownership.
+// nodes will not be usable upon return.
+void AppendNodes(DecisionTreeConfig* tree,
+                 proto2::RepeatedPtrField<TreeNode>* nodes) {
+  std::reverse(nodes->pointer_begin(), nodes->pointer_end());
+  while (!nodes->empty()) {
+    tree->mutable_nodes()->AddAllocated(nodes->ReleaseLast());
+  }
+}
+
+DenseFloatBinarySplit* GetSplit(TreeNode* node) {
+  switch (node->node_case()) {
+    case TreeNode::kSparseFloatBinarySplitDefaultLeft:
+      return node->mutable_sparse_float_binary_split_default_left()
+          ->mutable_split();
+    case TreeNode::kSparseFloatBinarySplitDefaultRight:
+      return node->mutable_sparse_float_binary_split_default_right()
+          ->mutable_split();
+    case TreeNode::kDenseFloatBinarySplit:
+      return node->mutable_dense_float_binary_split();
+    default:
+      LOG(FATAL) << "Unknown node type encountered.";
+  }
+  return nullptr;
+}
+
+}  // namespace
+
+RandomTreeGen::RandomTreeGen(tensorflow::random::SimplePhilox* rng,
+                             int dense_feature_size, int sparse_feature_size)
+    : rng_(rng),
+      dense_feature_size_(dense_feature_size),
+      sparse_feature_size_(sparse_feature_size) {}
+
+namespace {
+void AddWeightAndMetadata(
+    boosted_trees::trees::DecisionTreeEnsembleConfig* ret) {
+  // Assign the weight of the tree to 1 and say that this weight was updated
+  // only once.
+  ret->add_tree_weights(1.0);
+  auto* meta = ret->add_tree_metadata();
+  meta->set_num_tree_weight_updates(1);
+}
+
+}  //  namespace
+
+boosted_trees::trees::DecisionTreeEnsembleConfig
+RandomTreeGen::GenerateEnsemble(int depth, int tree_count) {
+  boosted_trees::trees::DecisionTreeEnsembleConfig ret;
+  *(ret.add_trees()) = Generate(depth);
+  AddWeightAndMetadata(&ret);
+  for (int i = 1; i < tree_count; ++i) {
+    *(ret.add_trees()) = Generate(ret.trees(0));
+    AddWeightAndMetadata(&ret);
+  }
+  return ret;
+}
+
+DecisionTreeConfig RandomTreeGen::Generate(const DecisionTreeConfig& tree) {
+  DecisionTreeConfig ret = tree;
+  for (auto& node : *ret.mutable_nodes()) {
+    if (node.node_case() == TreeNode::kLeaf) {
+      node.mutable_leaf()->mutable_sparse_vector()->set_value(
+          0, rng_->RandFloat());
+      continue;
+    }
+    // Original node is a split. Re-generate it's type but retain the split node
+    // indices.
+    DenseFloatBinarySplit* split = GetSplit(&node);
+    const int left_id = split->left_id();
+    const int right_id = split->right_id();
+    GenerateSplit(&node, left_id, right_id);
+  }
+  return ret;
+}
+
+DecisionTreeConfig RandomTreeGen::Generate(int depth) {
+  DecisionTreeConfig ret;
+  // Add root,
+  TreeNode* node = ret.add_nodes();
+  GenerateSplit(node, 1, 2);
+  if (depth == 1) {
+    // Add left and right leaves.
+    TreeNode* left = ret.add_nodes();
+    left->mutable_leaf()->mutable_sparse_vector()->add_index(0);
+    left->mutable_leaf()->mutable_sparse_vector()->add_value(rng_->RandFloat());
+    TreeNode* right = ret.add_nodes();
+    right->mutable_leaf()->mutable_sparse_vector()->add_index(0);
+    right->mutable_leaf()->mutable_sparse_vector()->add_value(
+        rng_->RandFloat());
+    return ret;
+  } else {
+    DecisionTreeConfig left_branch = Generate(depth - 1);
+    DecisionTreeConfig right_branch = Generate(depth - 1);
+    Combine(&ret, &left_branch, &right_branch);
+    return ret;
+  }
+}
+
+void RandomTreeGen::Combine(DecisionTreeConfig* root,
+                            DecisionTreeConfig* left_branch,
+                            DecisionTreeConfig* right_branch) {
+  const int left_branch_size = left_branch->nodes_size();
+  CHECK_EQ(1, root->nodes_size());
+  // left_branch starts its index at 1. right_branch starts its index at
+  // (left_branch_size + 1).
+  auto* root_node = root->mutable_nodes(0);
+  DenseFloatBinarySplit* root_split = GetSplit(root_node);
+  root_split->set_left_id(1);
+  root_split->set_right_id(left_branch_size + 1);
+  // Shift left/right branch's indices internally so that everything is
+  // consistent.
+  ShiftNodeIndex(left_branch, 1);
+  ShiftNodeIndex(right_branch, left_branch_size + 1);
+
+  // Complexity O(branch node size). No proto copying though.
+  AppendNodes(root, left_branch->mutable_nodes());
+  AppendNodes(root, right_branch->mutable_nodes());
+}
+
+void RandomTreeGen::ShiftNodeIndex(DecisionTreeConfig* tree, int shift) {
+  for (TreeNode& node : *(tree->mutable_nodes())) {
+    DenseFloatBinarySplit* split = nullptr;
+    switch (node.node_case()) {
+      case TreeNode::kLeaf:
+        break;
+      case TreeNode::kSparseFloatBinarySplitDefaultLeft:
+        split = node.mutable_sparse_float_binary_split_default_left()
+                    ->mutable_split();
+        break;
+      case TreeNode::kSparseFloatBinarySplitDefaultRight:
+        split = node.mutable_sparse_float_binary_split_default_right()
+                    ->mutable_split();
+        break;
+      case TreeNode::kDenseFloatBinarySplit:
+        split = node.mutable_dense_float_binary_split();
+        break;
+      default:
+        LOG(FATAL) << "Unknown node type encountered.";
+    }
+    if (split) {
+      split->set_left_id(shift + split->left_id());
+      split->set_right_id(shift + split->right_id());
+    }
+  }
+}
+
+void RandomTreeGen::GenerateSplit(TreeNode* node, int left_id, int right_id) {
+  const double denseSplitProb =
+      sparse_feature_size_ == 0
+          ? 1.0
+          : static_cast<double>(dense_feature_size_) /
+                (dense_feature_size_ + sparse_feature_size_);
+  // Generate the tree such that it has equal probability of going left and
+  // right when the feature is missing.
+  static constexpr float kLeftProb = 0.5;
+
+  DenseFloatBinarySplit* split;
+  int feature_size;
+  if (rng_->RandFloat() < denseSplitProb) {
+    feature_size = dense_feature_size_;
+    split = node->mutable_dense_float_binary_split();
+  } else {
+    feature_size = sparse_feature_size_;
+    if (rng_->RandFloat() < kLeftProb) {
+      split = node->mutable_sparse_float_binary_split_default_left()
+                  ->mutable_split();
+    } else {
+      split = node->mutable_sparse_float_binary_split_default_right()
+                  ->mutable_split();
+    }
+  }
+  split->set_threshold(rng_->RandFloat());
+  split->set_feature_column(rng_->Uniform(feature_size));
+  split->set_left_id(left_id);
+  split->set_right_id(right_id);
+}
+
+}  // namespace testutil
+}  // namespace boosted_trees
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h
new file mode 100644
index 0000000000..dc584bbd3c
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h
@@ -0,0 +1,75 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TESTUTIL_RANDOM_TREE_GEN_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TESTUTIL_RANDOM_TREE_GEN_H_
+
+#include <memory>
+
+#include "tensorflow/contrib/boosted_trees/proto/tree_config.pb.h"  // NOLINT
+#include "tensorflow/core/lib/random/simple_philox.h"
+#include "tensorflow/core/platform/macros.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace testutil {
+
+// Randomly generate a balanced tree, for performance benchmarking purposes,
+// that assume all features are sparse float features, for now.
+class RandomTreeGen {
+ public:
+  RandomTreeGen(tensorflow::random::SimplePhilox* rng, int dense_feature_size,
+                int sparse_feature_size);
+
+  // Required: depth must be >= 1.
+  // If one wants to generate multiple trees with the same depth, see also the
+  // overload below.
+  boosted_trees::trees::DecisionTreeConfig Generate(int depth);
+
+  // Randomly generate a new tree with the same depth (and tree structure)
+  // as the given tree. This is faster.
+  boosted_trees::trees::DecisionTreeConfig Generate(
+      const boosted_trees::trees::DecisionTreeConfig& tree);
+
+  // Requried: depth >= 1; tree_count >= 1.
+  boosted_trees::trees::DecisionTreeEnsembleConfig GenerateEnsemble(
+      int dept, int tree_count);
+
+ private:
+  tensorflow::random::SimplePhilox* rng_;
+  const int dense_feature_size_;
+  const int sparse_feature_size_;
+
+  // Put together a deeper tree by combining two trees.
+  void Combine(boosted_trees::trees::DecisionTreeConfig* root,
+               boosted_trees::trees::DecisionTreeConfig* left_branch,
+               boosted_trees::trees::DecisionTreeConfig* right_branch);
+
+  // For each node in the provided tree, shift its referenced left/right index
+  // by shift.
+  void ShiftNodeIndex(boosted_trees::trees::DecisionTreeConfig* tree,
+                      int shift);
+
+  // Generate a sparse split in the node.
+  void GenerateSplit(boosted_trees::trees::TreeNode* node, int left_id,
+                     int right_id);
+
+  TF_DISALLOW_COPY_AND_ASSIGN(RandomTreeGen);
+};
+
+}  // namespace testutil
+}  // namespace boosted_trees
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TESTUTIL_RANDOM_TREE_GEN_H_
diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
new file mode 100644
index 0000000000..7d905d4082
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
@@ -0,0 +1,64 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+// Randomly generate a tree ensemble and write to file.
+
+#include "tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/random/philox_random.h"
+#include "tensorflow/core/lib/random/simple_philox.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/util/command_line_flags.h"
+
+using tensorflow::Flag;
+using tensorflow::Flags;
+
+int main(int argc, char* argv[]) {
+  int32 dense_feature_size = 100;
+  int32 sparse_feature_size = 100;
+  int32 depth = 8;
+  int32 tree_count = 10;
+  string filename = "/tmp/trees.pb";
+  std::vector<Flag> flag_list = {
+      Flag("dense_feature_size", &dense_feature_size, "dense feature size"),
+      Flag("sparse_feature_size", &sparse_feature_size, "sparse_feature_size"),
+      Flag("depth", &depth, "tree depth"),
+      Flag("tree_count", &tree_count, "tree count"),
+      Flag("filename", &filename, "Output filename."),
+  };
+  string usage = Flags::Usage(argv[0], flag_list);
+  const bool parse_result = Flags::Parse(&argc, argv, flag_list);
+  // We need to call this to set up global state for TensorFlow.
+  tensorflow::port::InitMain(usage.c_str(), &argc, &argv);
+  if (!parse_result) {
+    LOG(ERROR) << "\n" << usage;
+    return -1;
+  }
+
+  tensorflow::random::PhiloxRandom philox(1);
+  tensorflow::random::SimplePhilox rng(&philox);
+  tensorflow::boosted_trees::testutil::RandomTreeGen tree_gen(
+      &rng, dense_feature_size, sparse_feature_size);
+  const auto& trees = tree_gen.GenerateEnsemble(depth, tree_count);
+  tensorflow::Status status =
+      tensorflow::WriteBinaryProto(tensorflow::Env::Default(), filename, trees);
+  if (!status.ok()) {
+    LOG(WARNING) << "Failed to write: " << filename << " : " << status;
+  } else {
+    LOG(INFO) << "Tree ensemble written to: " << filename;
+  }
+  return 0;
+}
diff --git a/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc
new file mode 100644
index 0000000000..318d8a5296
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc
@@ -0,0 +1,170 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#include "tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h"
+#include "tensorflow/core/platform/macros.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace trees {
+
+constexpr int kInvalidLeaf = -1;
+int DecisionTree::Traverse(const DecisionTreeConfig& config,
+                           const int32 sub_root_id,
+                           const utils::Example& example) {
+  if (TF_PREDICT_FALSE(config.nodes_size() <= sub_root_id)) {
+    return kInvalidLeaf;
+  }
+
+  // Traverse tree starting at the provided sub-root.
+  int32 node_id = sub_root_id;
+  while (true) {
+    const auto& current_node = config.nodes(node_id);
+    switch (current_node.node_case()) {
+      case TreeNode::kLeaf: {
+        return node_id;
+      }
+      case TreeNode::kDenseFloatBinarySplit: {
+        const auto& split = current_node.dense_float_binary_split();
+        node_id = example.dense_float_features[split.feature_column()] <=
+                          split.threshold()
+                      ? split.left_id()
+                      : split.right_id();
+        break;
+      }
+      case TreeNode::kSparseFloatBinarySplitDefaultLeft: {
+        const auto& split =
+            current_node.sparse_float_binary_split_default_left().split();
+        auto sparse_feature =
+            example.sparse_float_features[split.feature_column()];
+        node_id = !sparse_feature.has_value() ||
+                          sparse_feature.get_value() <= split.threshold()
+                      ? split.left_id()
+                      : split.right_id();
+        break;
+      }
+      case TreeNode::kSparseFloatBinarySplitDefaultRight: {
+        const auto& split =
+            current_node.sparse_float_binary_split_default_right().split();
+        auto sparse_feature =
+            example.sparse_float_features[split.feature_column()];
+        node_id = sparse_feature.has_value() &&
+                          sparse_feature.get_value() <= split.threshold()
+                      ? split.left_id()
+                      : split.right_id();
+        break;
+      }
+      case TreeNode::kCategoricalIdBinarySplit: {
+        const auto& split = current_node.categorical_id_binary_split();
+        node_id = example.sparse_int_features[split.feature_column()].count(
+                      split.feature_id()) > 0
+                      ? split.left_id()
+                      : split.right_id();
+        break;
+      }
+      case TreeNode::NODE_NOT_SET: {
+        QCHECK(false) << "Invalid node in tree: " << current_node.DebugString();
+        break;
+      }
+    }
+    DCHECK_NE(node_id, 0) << "Malformed tree, cycles found to root:"
+                          << current_node.DebugString();
+  }
+}
+
+void DecisionTree::LinkChildren(const std::vector<int32>& children,
+                                TreeNode* parent_node) {
+  // Decide how to link children depending on the parent node's type.
+  auto children_it = children.begin();
+  switch (parent_node->node_case()) {
+    case TreeNode::kLeaf: {
+      // Essentially no-op.
+      QCHECK(children.empty()) << "A leaf node cannot have children.";
+      break;
+    }
+    case TreeNode::kDenseFloatBinarySplit: {
+      QCHECK(children.size() == 2)
+          << "A binary split node must have exactly two children.";
+      auto* split = parent_node->mutable_dense_float_binary_split();
+      split->set_left_id(*children_it);
+      split->set_right_id(*++children_it);
+      break;
+    }
+    case TreeNode::kSparseFloatBinarySplitDefaultLeft: {
+      QCHECK(children.size() == 2)
+          << "A binary split node must have exactly two children.";
+      auto* split =
+          parent_node->mutable_sparse_float_binary_split_default_left()
+              ->mutable_split();
+      split->set_left_id(*children_it);
+      split->set_right_id(*++children_it);
+      break;
+    }
+    case TreeNode::kSparseFloatBinarySplitDefaultRight: {
+      QCHECK(children.size() == 2)
+          << "A binary split node must have exactly two children.";
+      auto* split =
+          parent_node->mutable_sparse_float_binary_split_default_right()
+              ->mutable_split();
+      split->set_left_id(*children_it);
+      split->set_right_id(*++children_it);
+      break;
+    }
+    case TreeNode::kCategoricalIdBinarySplit: {
+      QCHECK(children.size() == 2)
+          << "A binary split node must have exactly two children.";
+      auto* split = parent_node->mutable_categorical_id_binary_split();
+      split->set_left_id(*children_it);
+      split->set_right_id(*++children_it);
+      break;
+    }
+    case TreeNode::NODE_NOT_SET: {
+      QCHECK(false) << "A non-set node cannot have children.";
+      break;
+    }
+  }
+}
+
+std::vector<int32> DecisionTree::GetChildren(const TreeNode& node) {
+  // A node's children depend on its type.
+  switch (node.node_case()) {
+    case TreeNode::kLeaf: {
+      return {};
+    }
+    case TreeNode::kDenseFloatBinarySplit: {
+      const auto& split = node.dense_float_binary_split();
+      return {split.left_id(), split.right_id()};
+    }
+    case TreeNode::kSparseFloatBinarySplitDefaultLeft: {
+      const auto& split = node.sparse_float_binary_split_default_left().split();
+      return {split.left_id(), split.right_id()};
+    }
+    case TreeNode::kSparseFloatBinarySplitDefaultRight: {
+      const auto& split =
+          node.sparse_float_binary_split_default_right().split();
+      return {split.left_id(), split.right_id()};
+    }
+    case TreeNode::kCategoricalIdBinarySplit: {
+      const auto& split = node.categorical_id_binary_split();
+      return {split.left_id(), split.right_id()};
+    }
+    case TreeNode::NODE_NOT_SET: {
+      return {};
+    }
+  }
+}
+
+}  // namespace trees
+}  // namespace boosted_trees
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h
new file mode 100644
index 0000000000..604ff02744
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h
@@ -0,0 +1,49 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TREES_DECISION_TREE_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TREES_DECISION_TREE_H_
+
+#include "tensorflow/contrib/boosted_trees/lib/utils/example.h"
+#include "tensorflow/contrib/boosted_trees/proto/tree_config.pb.h"  // NOLINT
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace trees {
+
+// Decision tree class to encapsulate tree traversal and mutation logic.
+// This class does not hold state and is thread safe.
+class DecisionTree {
+ public:
+  // Traverse given an instance, a sub-root and its set of features
+  // and return the leaf index or -1 if the tree is empty or
+  // the sub-root is invalid.
+  static int Traverse(const DecisionTreeConfig& config, int32 sub_root_id,
+                      const utils::Example& example);
+
+  // Links the specified children to the parent, the children must
+  // already be added to the decision tree config so this method
+  // just ensures nodes are re-linked.
+  static void LinkChildren(const std::vector<int32>& children,
+                           TreeNode* parent_node);
+
+  // Retrieves node children indices if any.
+  static std::vector<int32> GetChildren(const TreeNode& node);
+};
+
+}  // namespace trees
+}  // namespace boosted_trees
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_LIB_TREES_DECISION_TREE_H_
diff --git a/tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc
new file mode 100644
index 0000000000..0f082d7fd5
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc
@@ -0,0 +1,326 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#include "tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h"
+#include "tensorflow/contrib/boosted_trees/lib/utils/batch_features.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace trees {
+namespace {
+
+class DecisionTreeTest : public ::testing::Test {
+ protected:
+  DecisionTreeTest() : batch_features_(2) {
+    // Create a batch of two examples having one dense float, two sparse float
+    // and one sparse int features.
+    // The first example is missing the second sparse feature column and the
+    // second example is missing the first sparse feature column.
+    // This looks like the following:
+    // Instance | DenseF1 | SparseF1 | SparseF2 | SparseI1 |
+    // 0        |   7     |   -3     |          |    3     |
+    // 1        |  -2     |          |   4      |          |
+    auto dense_float_matrix = test::AsTensor<float>({7.0f, -2.0f}, {2, 1});
+    auto sparse_float_indices1 = test::AsTensor<int64>({0, 0}, {1, 2});
+    auto sparse_float_values1 = test::AsTensor<float>({-3.0f});
+    auto sparse_float_shape1 = test::AsTensor<int64>({2, 1});
+    auto sparse_float_indices2 = test::AsTensor<int64>({1, 0}, {1, 2});
+    auto sparse_float_values2 = test::AsTensor<float>({4.0f});
+    auto sparse_float_shape2 = test::AsTensor<int64>({2, 1});
+    auto sparse_int_indices1 = test::AsTensor<int64>({0, 0}, {1, 2});
+    auto sparse_int_values1 = test::AsTensor<int64>({3});
+    auto sparse_int_shape1 = test::AsTensor<int64>({2, 1});
+    TF_EXPECT_OK(batch_features_.Initialize(
+        {dense_float_matrix}, {sparse_float_indices1, sparse_float_indices2},
+        {sparse_float_values1, sparse_float_values2},
+        {sparse_float_shape1, sparse_float_shape2}, {sparse_int_indices1},
+        {sparse_int_values1}, {sparse_int_shape1}));
+  }
+
+  template <typename SplitType>
+  void TestLinkChildrenBinary(TreeNode* node, SplitType* split) {
+    // Verify children were linked.
+    DecisionTree::LinkChildren({3, 8}, node);
+    EXPECT_EQ(3, split->left_id());
+    EXPECT_EQ(8, split->right_id());
+
+    // Invalid cases.
+    EXPECT_DEATH(DecisionTree::LinkChildren({}, node),
+                 "A binary split node must have exactly two children.");
+    EXPECT_DEATH(DecisionTree::LinkChildren({3}, node),
+                 "A binary split node must have exactly two children.");
+    EXPECT_DEATH(DecisionTree::LinkChildren({1, 2, 3}, node),
+                 "A binary split node must have exactly two children.");
+  }
+
+  void TestGetChildren(const TreeNode& node,
+                       const std::vector<uint32>& expected_children) {
+    // Verify children were linked.
+    auto children = DecisionTree::GetChildren(node);
+    EXPECT_EQ(children.size(), expected_children.size());
+    for (size_t idx = 0; idx < children.size(); ++idx) {
+      EXPECT_EQ(children[idx], expected_children[idx]);
+    }
+  }
+
+  utils::BatchFeatures batch_features_;
+};
+
+TEST_F(DecisionTreeTest, TraverseEmpty) {
+  DecisionTreeConfig tree_config;
+  auto example = (*batch_features_.examples_iterable(0, 1).begin());
+  EXPECT_EQ(-1, DecisionTree::Traverse(tree_config, 0, example));
+}
+
+TEST_F(DecisionTreeTest, TraverseBias) {
+  DecisionTreeConfig tree_config;
+  tree_config.add_nodes()->mutable_leaf();
+  auto example = (*batch_features_.examples_iterable(0, 1).begin());
+  EXPECT_EQ(0, DecisionTree::Traverse(tree_config, 0, example));
+}
+
+TEST_F(DecisionTreeTest, TraverseInvalidSubRoot) {
+  DecisionTreeConfig tree_config;
+  tree_config.add_nodes()->mutable_leaf();
+  auto example = (*batch_features_.examples_iterable(0, 1).begin());
+  EXPECT_EQ(-1, DecisionTree::Traverse(tree_config, 10, example));
+}
+
+TEST_F(DecisionTreeTest, TraverseDenseBinarySplit) {
+  DecisionTreeConfig tree_config;
+  auto* split_node =
+      tree_config.add_nodes()->mutable_dense_float_binary_split();
+  split_node->set_feature_column(0);
+  split_node->set_threshold(0.0f);
+  split_node->set_left_id(1);
+  split_node->set_right_id(2);
+  tree_config.add_nodes()->mutable_leaf();
+  tree_config.add_nodes()->mutable_leaf();
+  auto example_iterable = batch_features_.examples_iterable(0, 2);
+
+  // Expect right child to be picked as !(7 <= 0);
+  auto example_it = example_iterable.begin();
+  EXPECT_EQ(2, DecisionTree::Traverse(tree_config, 0, *example_it));
+
+  // Expect left child to be picked as (-2 <= 0);
+  EXPECT_EQ(1, DecisionTree::Traverse(tree_config, 0, *++example_it));
+}
+
+TEST_F(DecisionTreeTest, TraverseSparseBinarySplit) {
+  // Test first sparse feature which is missing for the second example.
+  DecisionTreeConfig tree_config1;
+  auto* split_node1 = tree_config1.add_nodes()
+                          ->mutable_sparse_float_binary_split_default_left()
+                          ->mutable_split();
+  split_node1->set_feature_column(0);
+  split_node1->set_threshold(-20.0f);
+  split_node1->set_left_id(1);
+  split_node1->set_right_id(2);
+  tree_config1.add_nodes()->mutable_leaf();
+  tree_config1.add_nodes()->mutable_leaf();
+  auto example_iterable = batch_features_.examples_iterable(0, 2);
+
+  // Expect right child to be picked as !(-3 <= -20).
+  auto example_it = example_iterable.begin();
+  EXPECT_EQ(2, DecisionTree::Traverse(tree_config1, 0, *example_it));
+
+  // Expect left child to be picked as default direction.
+  EXPECT_EQ(1, DecisionTree::Traverse(tree_config1, 0, *++example_it));
+
+  // Test second sparse feature which is missing for the first example.
+  DecisionTreeConfig tree_config2;
+  auto* split_node2 = tree_config2.add_nodes()
+                          ->mutable_sparse_float_binary_split_default_right()
+                          ->mutable_split();
+  split_node2->set_feature_column(1);
+  split_node2->set_threshold(4.0f);
+  split_node2->set_left_id(1);
+  split_node2->set_right_id(2);
+  tree_config2.add_nodes()->mutable_leaf();
+  tree_config2.add_nodes()->mutable_leaf();
+
+  // Expect right child to be picked as default direction.
+  example_it = example_iterable.begin();
+  EXPECT_EQ(2, DecisionTree::Traverse(tree_config2, 0, *example_it));
+
+  // Expect left child to be picked as (4 <= 4).
+  EXPECT_EQ(1, DecisionTree::Traverse(tree_config2, 0, *++example_it));
+}
+
+TEST_F(DecisionTreeTest, TraverseCategoricalIdBinarySplit) {
+  DecisionTreeConfig tree_config;
+  auto* split_node =
+      tree_config.add_nodes()->mutable_categorical_id_binary_split();
+  split_node->set_feature_column(0);
+  split_node->set_feature_id(3);
+  split_node->set_left_id(1);
+  split_node->set_right_id(2);
+  tree_config.add_nodes()->mutable_leaf();
+  tree_config.add_nodes()->mutable_leaf();
+  auto example_iterable = batch_features_.examples_iterable(0, 2);
+
+  // Expect left child to be picked as 3 == 3;
+  auto example_it = example_iterable.begin();
+  EXPECT_EQ(1, DecisionTree::Traverse(tree_config, 0, *example_it));
+
+  // Expect right child to be picked as the feature is missing;
+  EXPECT_EQ(2, DecisionTree::Traverse(tree_config, 0, *++example_it));
+}
+
+TEST_F(DecisionTreeTest, TraverseHybridSplits) {
+  DecisionTreeConfig tree_config;
+  auto* split_node1 =
+      tree_config.add_nodes()->mutable_dense_float_binary_split();
+  split_node1->set_feature_column(0);
+  split_node1->set_threshold(9.0f);
+  split_node1->set_left_id(1);   // sparse split.
+  split_node1->set_right_id(2);  // leaf
+  auto* split_node2 = tree_config.add_nodes()
+                          ->mutable_sparse_float_binary_split_default_left()
+                          ->mutable_split();
+  tree_config.add_nodes()->mutable_leaf();
+  split_node2->set_feature_column(0);
+  split_node2->set_threshold(-20.0f);
+  split_node2->set_left_id(3);
+  split_node2->set_right_id(4);
+  auto* split_node3 =
+      tree_config.add_nodes()->mutable_categorical_id_binary_split();
+  split_node3->set_feature_column(0);
+  split_node3->set_feature_id(2);
+  split_node3->set_left_id(5);
+  split_node3->set_right_id(6);
+  tree_config.add_nodes()->mutable_leaf();
+  tree_config.add_nodes()->mutable_leaf();
+  tree_config.add_nodes()->mutable_leaf();
+  auto example_iterable = batch_features_.examples_iterable(0, 2);
+
+  // Expect will go left through the first dense split as (7.0f <= 9.0f),
+  // then will go right through the sparse split as !(-3 <= -20).
+  auto example_it = example_iterable.begin();
+  EXPECT_EQ(4, DecisionTree::Traverse(tree_config, 0, *example_it));
+
+  // Expect will go left through the first dense split as (-2.0f <= 9.0f),
+  // then will go left the default direction as the sparse feature is missing,
+  // then will go right as 2 != 3 on the categorical split.
+  EXPECT_EQ(6, DecisionTree::Traverse(tree_config, 0, *++example_it));
+}
+
+TEST_F(DecisionTreeTest, LinkChildrenLeaf) {
+  // Create leaf node.
+  TreeNode node;
+  node.mutable_leaf();
+
+  // No-op.
+  DecisionTree::LinkChildren({}, &node);
+
+  // Invalid case.
+  EXPECT_DEATH(DecisionTree::LinkChildren({1}, &node),
+               "A leaf node cannot have children.");
+}
+
+TEST_F(DecisionTreeTest, LinkChildrenDenseFloatBinarySplit) {
+  TreeNode node;
+  auto* split = node.mutable_dense_float_binary_split();
+  split->set_left_id(-1);
+  split->set_right_id(-1);
+  TestLinkChildrenBinary(&node, split);
+}
+
+TEST_F(DecisionTreeTest, LinkChildrenSparseFloatBinarySplitDefaultLeft) {
+  TreeNode node;
+  auto* split =
+      node.mutable_sparse_float_binary_split_default_left()->mutable_split();
+  split->set_left_id(-1);
+  split->set_right_id(-1);
+  TestLinkChildrenBinary(&node, split);
+}
+
+TEST_F(DecisionTreeTest, LinkChildrenSparseFloatBinarySplitDefaultRight) {
+  TreeNode node;
+  auto* split =
+      node.mutable_sparse_float_binary_split_default_right()->mutable_split();
+  split->set_left_id(-1);
+  split->set_right_id(-1);
+  TestLinkChildrenBinary(&node, split);
+}
+
+TEST_F(DecisionTreeTest, LinkChildrenCategoricalSingleIdBinarySplit) {
+  TreeNode node;
+  auto* split = node.mutable_categorical_id_binary_split();
+  split->set_left_id(-1);
+  split->set_right_id(-1);
+  TestLinkChildrenBinary(&node, split);
+}
+
+TEST_F(DecisionTreeTest, LinkChildrenNodeNotSet) {
+  // Create unset node.
+  TreeNode node;
+
+  // Invalid case.
+  EXPECT_DEATH(DecisionTree::LinkChildren({1}, &node),
+               "A non-set node cannot have children.");
+}
+
+TEST_F(DecisionTreeTest, GetChildrenLeaf) {
+  TreeNode node;
+  node.mutable_leaf();
+  TestGetChildren(node, {});
+}
+
+TEST_F(DecisionTreeTest, GetChildrenDenseFloatBinarySplit) {
+  TreeNode node;
+  auto* split = node.mutable_dense_float_binary_split();
+  split->set_left_id(23);
+  split->set_right_id(24);
+  TestGetChildren(node, {23, 24});
+}
+
+TEST_F(DecisionTreeTest, GetChildrenSparseFloatBinarySplitDefaultLeft) {
+  TreeNode node;
+  auto* split =
+      node.mutable_sparse_float_binary_split_default_left()->mutable_split();
+  split->set_left_id(12);
+  split->set_right_id(13);
+  TestGetChildren(node, {12, 13});
+}
+
+TEST_F(DecisionTreeTest, GetChildrenSparseFloatBinarySplitDefaultRight) {
+  TreeNode node;
+  auto* split =
+      node.mutable_sparse_float_binary_split_default_right()->mutable_split();
+  split->set_left_id(1);
+  split->set_right_id(2);
+  TestGetChildren(node, {1, 2});
+}
+
+TEST_F(DecisionTreeTest, GetChildrenCategoricalSingleIdBinarySplit) {
+  TreeNode node;
+  auto* split = node.mutable_categorical_id_binary_split();
+  split->set_left_id(7);
+  split->set_right_id(8);
+  TestGetChildren(node, {7, 8});
+}
+
+TEST_F(DecisionTreeTest, GetChildrenNodeNotSet) {
+  TreeNode node;
+  TestGetChildren(node, {});
+}
+
+}  // namespace
+}  // namespace trees
+}  // namespace boosted_trees
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/boosted_trees/proto/BUILD b/tensorflow/contrib/boosted_trees/proto/BUILD
index 3b6b0339d2..c99d8849bd 100644
--- a/tensorflow/contrib/boosted_trees/proto/BUILD
+++ b/tensorflow/contrib/boosted_trees/proto/BUILD
@@ -24,6 +24,15 @@ tf_proto_library(
     visibility = ["//visibility:public"],
 )
 
+tf_proto_library(
+    name = "quantiles_proto",
+    srcs = [
+        "quantiles.proto",
+    ],
+    cc_api_version = 2,
+    visibility = ["//visibility:public"],
+)
+
 tf_proto_library(
     name = "tree_config_proto",
     srcs = ["tree_config.proto"],
diff --git a/tensorflow/contrib/boosted_trees/proto/quantiles.proto b/tensorflow/contrib/boosted_trees/proto/quantiles.proto
new file mode 100644
index 0000000000..7f872d2aa7
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/proto/quantiles.proto
@@ -0,0 +1,32 @@
+syntax = "proto3";
+
+option cc_enable_arenas = true;
+
+package boosted_trees;
+
+message QuantileConfig {
+  // Maximum eps error when computing quantile summaries.
+  double eps = 1;
+  // Number of quantiles to generate.
+  int64 num_quantiles = 2;
+}
+
+message QuantileEntry {
+  // Value for the entry.
+  float value = 1;
+  // Weight for the entry.
+  float weight = 2;
+  // We need the minimum and maximum rank possible for this entry.
+  // Rank is 0.0 for the absolute minimum and sum of the weights for the maximum
+  // value in the input.
+  float min_rank = 3;
+  float max_rank = 4;
+}
+
+message QuantileSummaryState {
+  repeated QuantileEntry entries = 1;
+}
+
+message QuantileStreamState {
+  repeated QuantileSummaryState summaries = 1;
+}
diff --git a/tensorflow/contrib/boosted_trees/resources/BUILD b/tensorflow/contrib/boosted_trees/resources/BUILD
new file mode 100644
index 0000000000..5dfdf8f489
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/resources/BUILD
@@ -0,0 +1,53 @@
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+package(
+    default_visibility = [
+        "//tensorflow/contrib/boosted_trees:__subpackages__",
+        "//tensorflow/contrib/boosted_trees:friends",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+cc_library(
+    name = "stamped_resource",
+    hdrs = ["stamped_resource.h"],
+    deps = [
+        "//tensorflow/core:framework_headers_lib",
+        "//third_party/eigen3",
+    ],
+)
+
+cc_library(
+    name = "quantile_stream_resource",
+    hdrs = ["quantile_stream_resource.h"],
+    deps = [
+        ":stamped_resource",
+        "//tensorflow/contrib/boosted_trees/lib:weighted_quantiles",
+        "//tensorflow/contrib/boosted_trees/proto:quantiles_proto_cc",
+        "//tensorflow/core:framework_headers_lib",
+        "//third_party/eigen3",
+    ],
+)
+
+cc_library(
+    name = "decision_tree_ensemble_resource",
+    hdrs = ["decision_tree_ensemble_resource.h"],
+    deps = [
+        ":stamped_resource",
+        "//tensorflow/contrib/boosted_trees/lib:trees",
+        "//tensorflow/core:framework_headers_lib",
+    ],
+    alwayslink = 1,
+)
diff --git a/tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h b/tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h
new file mode 100644
index 0000000000..90e641f4bd
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h
@@ -0,0 +1,76 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_DECISION_TREE_ENSEMBLE_RESOURCE_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_DECISION_TREE_ENSEMBLE_RESOURCE_H_
+
+#include "tensorflow/contrib/boosted_trees/lib/trees/decision_tree.h"
+#include "tensorflow/contrib/boosted_trees/resources/stamped_resource.h"
+#include "tensorflow/core/framework/resource_mgr.h"
+#include "tensorflow/core/platform/mutex.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+namespace models {
+
+// Keep a tree ensemble in memory for efficient evaluation and mutation.
+class DecisionTreeEnsembleResource : public StampedResource {
+ public:
+  // Constructor.
+  explicit DecisionTreeEnsembleResource()
+      : decision_tree_ensemble_(
+            proto2::Arena::CreateMessage<
+                boosted_trees::trees::DecisionTreeEnsembleConfig>(&arena_)) {}
+
+  string DebugString() override {
+    return strings::StrCat("GTFlowDecisionTreeEnsemble[size=",
+                           decision_tree_ensemble_->trees_size(), "]");
+  }
+
+  const boosted_trees::trees::DecisionTreeEnsembleConfig&
+  decision_tree_ensemble() const {
+    return *decision_tree_ensemble_;
+  }
+
+  boosted_trees::trees::DecisionTreeEnsembleConfig*
+  mutable_decision_tree_ensemble() {
+    return decision_tree_ensemble_;
+  }
+
+  // Resets the resource and frees the protos in arena.
+  // Caller needs to hold the mutex lock while calling this.
+  void Reset() {
+    // Reset stamp.
+    set_stamp(-1);
+
+    // Clear tree ensemle.
+    arena_.Reset();
+    CHECK_EQ(0, arena_.SpaceAllocated());
+    decision_tree_ensemble_ = proto2::Arena::CreateMessage<
+        boosted_trees::trees::DecisionTreeEnsembleConfig>(&arena_);
+  }
+
+  mutex* get_mutex() { return &mu_; }
+
+ private:
+  proto2::Arena arena_;
+  mutex mu_;
+  boosted_trees::trees::DecisionTreeEnsembleConfig* decision_tree_ensemble_;
+};
+
+}  // namespace models
+}  // namespace boosted_trees
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_DECISION_TREE_ENSEMBLE_RESOURCE_H_
diff --git a/tensorflow/contrib/boosted_trees/resources/quantile_stream_resource.h b/tensorflow/contrib/boosted_trees/resources/quantile_stream_resource.h
new file mode 100644
index 0000000000..fb29f79e57
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/resources/quantile_stream_resource.h
@@ -0,0 +1,104 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_QUANTILE_STREAM_RESOURCE_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_QUANTILE_STREAM_RESOURCE_H_
+
+#include "tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h"
+#include "tensorflow/contrib/boosted_trees/proto/quantiles.pb.h"  // NOLINT
+#include "tensorflow/contrib/boosted_trees/resources/stamped_resource.h"
+#include "tensorflow/core/framework/resource_mgr.h"
+#include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/platform/mutex.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+
+using QuantileStream =
+    boosted_trees::quantiles::WeightedQuantilesStream<float, float>;
+
+// Resource for accumulating summaries for multiple columns.
+class QuantileStreamResource : public StampedResource {
+ public:
+  QuantileStreamResource(const float epsilon, const int32 num_quantiles,
+                         const int64 max_elements, int64 stamp_token)
+      : stream_(epsilon, max_elements),
+        are_buckets_ready_(false),
+        epsilon_(epsilon),
+        num_quantiles_(num_quantiles),
+        max_elements_(max_elements) {
+    set_stamp(stamp_token);
+  }
+
+  string DebugString() override { return "QuantileStreamResource"; }
+
+  tensorflow::mutex* mutex() { return &mu_; }
+
+  QuantileStream* stream(int64 stamp) {
+    CHECK(is_stamp_valid(stamp));
+    return &stream_;
+  }
+
+  const std::vector<float>& boundaries(int64 stamp) {
+    CHECK(is_stamp_valid(stamp));
+    return boundaries_;
+  }
+
+  void set_boundaries(int64 stamp, const std::vector<float>& boundaries) {
+    CHECK(is_stamp_valid(stamp));
+    are_buckets_ready_ = true;
+    boundaries_ = boundaries;
+  }
+
+  float epsilon() const { return epsilon_; }
+  int32 num_quantiles() const { return num_quantiles_; }
+
+  void Reset(int64 stamp) {
+    set_stamp(stamp);
+    stream_ = QuantileStream(epsilon_, max_elements_);
+  }
+
+  bool are_buckets_ready() const { return are_buckets_ready_; }
+  void set_buckets_ready(bool are_buckets_ready) {
+    are_buckets_ready_ = are_buckets_ready;
+  }
+
+ private:
+  ~QuantileStreamResource() override {}
+
+  // Mutex for the whole resource.
+  tensorflow::mutex mu_;
+
+  // Quantile stream.
+  QuantileStream stream_;
+
+  // Stores the boundaries from the previous iteration. Empty during the first
+  // iteration.
+  std::vector<float> boundaries_;
+
+  // Whether boundaries are created. Initially boundaries are empty until
+  // set_boundaries are called.
+  bool are_buckets_ready_;
+
+  const float epsilon_;
+  const int32 num_quantiles_;
+  // An upper-bound for the number of elements.
+  int64 max_elements_;
+  TF_DISALLOW_COPY_AND_ASSIGN(QuantileStreamResource);
+};
+
+}  // namespace boosted_trees
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_QUANTILE_STREAM_RESOURCE_H_
diff --git a/tensorflow/contrib/boosted_trees/resources/stamped_resource.h b/tensorflow/contrib/boosted_trees/resources/stamped_resource.h
new file mode 100644
index 0000000000..aabeeb9851
--- /dev/null
+++ b/tensorflow/contrib/boosted_trees/resources/stamped_resource.h
@@ -0,0 +1,42 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =============================================================================
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_STAMPED_RESOURCE_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_STAMPED_RESOURCE_H_
+
+#include "tensorflow/core/framework/resource_mgr.h"
+#include "tensorflow/core/platform/mutex.h"
+
+namespace tensorflow {
+namespace boosted_trees {
+
+// A StampedResource is a resource that has a stamp token associated with it.
+// Before reading from or applying updates to the resource, the stamp should
+// be checked to verify that the update is not stale.
+class StampedResource : public ResourceBase {
+ public:
+  StampedResource() : stamp_(-1) {}
+
+  bool is_stamp_valid(int64 stamp) const { return stamp_ == stamp; }
+
+  int64 stamp() const { return stamp_; }
+  void set_stamp(int64 stamp) { stamp_ = stamp; }
+
+ private:
+  int64 stamp_;
+};
+
+}  // namespace boosted_trees
+}  // namespace tensorflow
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_BOOSTED_TREES_RESOURCES_STAMPED_RESOURCE_H_
-- 
GitLab


From 800ac8a53f1051d7944f3e0708f42f3d77a2d51b Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Fri, 31 Mar 2017 09:57:44 -0700
Subject: [PATCH 0021/1563] Updating the r1.1.0-rc0 references to r1.1.0-rc1.

---
 README.md                             | 12 ++++++------
 tensorflow/core/public/version.h      |  2 +-
 tensorflow/tools/pip_package/setup.py |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 12b7454992..3ad10c9158 100644
--- a/README.md
+++ b/README.md
@@ -33,12 +33,12 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index f7278c3502..14e45c37d9 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -20,7 +20,7 @@ limitations under the License.
 
 #define TF_MAJOR_VERSION 1
 #define TF_MINOR_VERSION 1
-#define TF_PATCH_VERSION 0-rc0
+#define TF_PATCH_VERSION 0-rc1
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 6baaf2f99b..41b781ddef 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc0'
+_VERSION = '1.1.0-rc1'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
-- 
GitLab


From bbd2047cf3a715a1431889ad8f558576a5382876 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 09:11:32 -0800
Subject: [PATCH 0022/1563] [XLA:HLO] Minor fix for Clamp shape inference, and
 add some tests.

Previously Clamp(f32[5], f32[], f32[9]) returned success, but it now returns a
failure.  Noticed while debugging a different problem.
Change: 151835981
---
 .../compiler/xla/service/shape_inference.cc   | 56 +++++++----
 .../compiler/xla/service/shape_inference.h    |  4 +
 .../xla/service/shape_inference_test.cc       | 93 +++++++++++++++++++
 3 files changed, 133 insertions(+), 20 deletions(-)

diff --git a/tensorflow/compiler/xla/service/shape_inference.cc b/tensorflow/compiler/xla/service/shape_inference.cc
index c05cf8c37d..9472086e2b 100644
--- a/tensorflow/compiler/xla/service/shape_inference.cc
+++ b/tensorflow/compiler/xla/service/shape_inference.cc
@@ -633,26 +633,7 @@ ShapeInference::InferDegenerateDimensionBroadcastShape(
   TF_DCHECK_OK(ShapeUtil::ValidateShape(ehs));
   switch (operation) {
     case TRIOP_CLAMP:
-      TF_RETURN_IF_ERROR(
-          ExpectNotTupleOrOpaque(lhs, "lhs of ternary operation"));
-      TF_RETURN_IF_ERROR(
-          ExpectNotTupleOrOpaque(rhs, "rhs of ternary operation"));
-      TF_RETURN_IF_ERROR(
-          ExpectNotTupleOrOpaque(ehs, "ehs of ternary operation"));
-      if (((ShapeUtil::Compatible(lhs, rhs) || ShapeUtil::Rank(lhs) == 0) &&
-           (ShapeUtil::Compatible(rhs, ehs) || ShapeUtil::Rank(ehs) == 0))) {
-        return rhs;
-      }
-      if (ShapeUtil::Rank(rhs) == 0) {
-        if (ShapeUtil::Compatible(lhs, ehs)) {
-          return lhs;
-        }
-        return ShapeUtil::Rank(ehs) == 0 ? lhs : ehs;
-      }
-      return Unimplemented("not yet implemented: %s, %s <clamp> %s",
-                           lhs.ShortDebugString().c_str(),
-                           ehs.ShortDebugString().c_str(),
-                           rhs.ShortDebugString().c_str());
+      return InferClampShape(lhs, rhs, ehs);
     case TRIOP_SELECT:
       return InferSelectShape(lhs, rhs, ehs);
     case TRIOP_UPDATE:
@@ -1332,6 +1313,41 @@ ShapeInference::InferDegenerateDimensionBroadcastShape(
   return ShapeUtil::PermuteDimensions(InversePermutation(dimensions), operand);
 }
 
+// TODO(b/36794510): Make broadcast semantics more consistent, by supporting
+// "degenerate" cases, as with binary elementwise ops.
+/* static */ StatusOr<Shape> ShapeInference::InferClampShape(
+    const Shape& min, const Shape& operand, const Shape& max) {
+  TF_RETURN_IF_ERROR(ExpectNotTupleOrOpaque(min, "clamp min"));
+  TF_RETURN_IF_ERROR(ExpectNotTupleOrOpaque(operand, "clamp operand"));
+  TF_RETURN_IF_ERROR(ExpectNotTupleOrOpaque(max, "clamp max"));
+  if (!ShapeUtil::SameElementType(min, operand) ||
+      !ShapeUtil::SameElementType(max, operand)) {
+    return InvalidArgument("clamp op with different operand types: %s, %s, %s",
+                           ShapeUtil::HumanString(min).c_str(),
+                           ShapeUtil::HumanString(operand).c_str(),
+                           ShapeUtil::HumanString(max).c_str());
+  }
+  if (((ShapeUtil::Compatible(min, operand) || ShapeUtil::IsScalar(min)) &&
+       (ShapeUtil::Compatible(max, operand) || ShapeUtil::IsScalar(max)))) {
+    return operand;
+  }
+  if (ShapeUtil::IsScalar(operand)) {
+    if (ShapeUtil::Compatible(min, max)) {
+      return min;
+    } else if (ShapeUtil::IsScalar(min)) {
+      return max;
+    } else if (ShapeUtil::IsScalar(max)) {
+      return min;
+    }
+  }
+  return Unimplemented(
+      "not yet implemented: %s, %s <clamp> %s", min.ShortDebugString().c_str(),
+      max.ShortDebugString().c_str(), operand.ShortDebugString().c_str());
+}
+
+// TODO(b/36794510): Make broadcast semantics more consistent, by supporting
+// "degenerate" cases, as with binary elementwise ops, as well as scalar
+// broadcast from all operands, not just the predicate.
 /* static */ StatusOr<Shape> ShapeInference::InferSelectShape(
     const Shape& pred, const Shape& on_true, const Shape& on_false) {
   if (!ShapeUtil::Compatible(on_true, on_false)) {
diff --git a/tensorflow/compiler/xla/service/shape_inference.h b/tensorflow/compiler/xla/service/shape_inference.h
index ced2f4d001..c2223423e9 100644
--- a/tensorflow/compiler/xla/service/shape_inference.h
+++ b/tensorflow/compiler/xla/service/shape_inference.h
@@ -190,6 +190,10 @@ class ShapeInference {
       BinaryOperation operation, const Shape& lhs, const Shape& rhs,
       tensorflow::gtl::ArraySlice<int64> broadcast_dimensions);
 
+  // Helper for inferring the shape of Clamp ops.
+  static StatusOr<Shape> InferClampShape(const Shape& min, const Shape& operand,
+                                         const Shape& max);
+
   // Helper for inferring the shape of Select ops.
   static StatusOr<Shape> InferSelectShape(const Shape& pred,
                                           const Shape& on_true,
diff --git a/tensorflow/compiler/xla/service/shape_inference_test.cc b/tensorflow/compiler/xla/service/shape_inference_test.cc
index 5a1ae6b002..6f968ded56 100644
--- a/tensorflow/compiler/xla/service/shape_inference_test.cc
+++ b/tensorflow/compiler/xla/service/shape_inference_test.cc
@@ -157,6 +157,99 @@ TEST_F(ShapeInferenceTest, SelectBadShapes) {
       testing::ContainsRegex("pred operand must have PRED element type"));
 }
 
+TEST_F(ShapeInferenceTest, ClampAllMatrix) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, matrix_64_48_, matrix_64_48_,
+      matrix_64_48_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(matrix_64_48_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampAllScalar) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, f32_, f32_, f32_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(f32_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampMinScalar) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, f32_, matrix_64_48_, matrix_64_48_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(matrix_64_48_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampMaxScalar) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, matrix_64_48_, matrix_64_48_, f32_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(matrix_64_48_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampOperandScalar) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, matrix_64_48_, f32_, matrix_64_48_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(matrix_64_48_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampMinMatrix) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, matrix_64_48_, f32_, f32_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(matrix_64_48_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampMaxMatrix) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, f32_, f32_, matrix_64_48_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(matrix_64_48_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampOperandMatrix) {
+  auto inferred_status = ShapeInference::InferTernaryOpShape(
+      TernaryOperation::TRIOP_CLAMP, f32_, matrix_64_48_, f32_);
+  ASSERT_IS_OK(inferred_status.status());
+  ASSERT_TRUE(ShapeUtil::Equal(matrix_64_48_, inferred_status.ValueOrDie()));
+}
+
+TEST_F(ShapeInferenceTest, ClampBadShapes) {
+  // Type mismatch
+  ASSERT_FALSE(ShapeInference::InferTernaryOpShape(
+                   TernaryOperation::TRIOP_CLAMP, s32_, f32_, f32_)
+                   .ok());
+  ASSERT_FALSE(ShapeInference::InferTernaryOpShape(
+                   TernaryOperation::TRIOP_CLAMP, f32_, s32_, f32_)
+                   .ok());
+  ASSERT_FALSE(ShapeInference::InferTernaryOpShape(
+                   TernaryOperation::TRIOP_CLAMP, f32_, f32_, s32_)
+                   .ok());
+  // Dimension mismatch
+  ASSERT_FALSE(
+      ShapeInference::InferTernaryOpShape(TernaryOperation::TRIOP_CLAMP,
+                                          vector_64_, vector_32_, vector_32_)
+          .ok());
+  ASSERT_FALSE(
+      ShapeInference::InferTernaryOpShape(TernaryOperation::TRIOP_CLAMP,
+                                          vector_32_, vector_64_, vector_32_)
+          .ok());
+  ASSERT_FALSE(
+      ShapeInference::InferTernaryOpShape(TernaryOperation::TRIOP_CLAMP,
+                                          vector_32_, vector_32_, vector_64_)
+          .ok());
+  // Dimension mismatch, where one operand is a scalar
+  ASSERT_FALSE(ShapeInference::InferTernaryOpShape(
+                   TernaryOperation::TRIOP_CLAMP, vector_64_, vector_32_, f32_)
+                   .ok());
+  ASSERT_FALSE(ShapeInference::InferTernaryOpShape(
+                   TernaryOperation::TRIOP_CLAMP, vector_64_, f32_, vector_32_)
+                   .ok());
+  ASSERT_FALSE(ShapeInference::InferTernaryOpShape(
+                   TernaryOperation::TRIOP_CLAMP, f32_, vector_64_, vector_32_)
+                   .ok());
+}
+
 TEST_F(ShapeInferenceTest, VariadicOpTuplify) {
   StatusOr<Shape> result = ShapeInference::InferVariadicOpShape(
       VariadicOperation::VAROP_TUPLE, {&s32_, &f32_});
-- 
GitLab


From 47cd4cd100800482b57d1b7755dfdcbc04969ffe Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 31 Mar 2017 09:16:25 -0800
Subject: [PATCH 0023/1563] Use a simpler threshold in MultiplyWithoutOverflow

We only need to worry about overflowing uint64, not int64.
Change: 151836590
---
 tensorflow/core/util/overflow.h       | 5 ++---
 tensorflow/core/util/overflow_test.cc | 8 ++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/util/overflow.h b/tensorflow/core/util/overflow.h
index 13b1f305aa..04be68a111 100644
--- a/tensorflow/core/util/overflow.h
+++ b/tensorflow/core/util/overflow.h
@@ -31,9 +31,8 @@ inline int64 MultiplyWithoutOverflow(const int64 x, const int64 y) {
   const uint64 uy = y;
   const uint64 uxy = ux * uy;
 
-  // Check for overflow, using a cheap check if both inputs are small
-  static const uint64 kSqrtInt64Max = 3037000500;  // ceil(sqrt(2**63 - 1))
-  if (TF_PREDICT_FALSE(ux >= kSqrtInt64Max || uy >= kSqrtInt64Max)) {
+  // Check if we overflow uint64, using a cheap check if both inputs are small
+  if (TF_PREDICT_FALSE((ux | uy) >> 32 != 0)) {
     // Ensure nonnegativity.  Note that negative numbers will appear "large"
     // to the unsigned comparisons above.
     CHECK(x >= 0 && y >= 0);
diff --git a/tensorflow/core/util/overflow_test.cc b/tensorflow/core/util/overflow_test.cc
index 627f77164e..f93ba885e6 100644
--- a/tensorflow/core/util/overflow_test.cc
+++ b/tensorflow/core/util/overflow_test.cc
@@ -30,8 +30,12 @@ TEST(OverflowTest, Nonnegative) {
     interesting.push_back(bit + 1);
     interesting.push_back(bit - 1);
   }
-  auto mid = static_cast<int64>(std::pow(2, 63.0 / 2));
-  for (int i = -5; i < 5; i++) interesting.push_back(mid + i);
+  for (const int64 mid : {static_cast<int64>(1) << 32,
+                          static_cast<int64>(std::pow(2, 63.0 / 2))}) {
+    for (int i = -5; i < 5; i++) {
+      interesting.push_back(mid + i);
+    }
+  }
 
   // Check all pairs
   for (auto x : interesting) {
-- 
GitLab


From 93e822ea4f16ec33110ef4d2bb24d2f9aa2e9eaa Mon Sep 17 00:00:00 2001
From: Zakaria Haque <zakaria@google.com>
Date: Fri, 31 Mar 2017 09:29:14 -0800
Subject: [PATCH 0024/1563] Fixes a bug where heads/pre-canned estimators were
 not exporting proper classes tensor. Servo expects classes to be a string
 tensor of the same shape as scores and containing the labels for
 corresponding scores. While creating output alternatives, if classes tensor
 does not match these conditions, we create a new tensor with these
 properties. Change: 151838225

---
 .../learn/python/learn/estimators/head.py     | 95 ++++++++++++++-----
 .../python/learn/estimators/head_test.py      | 60 ++++++++++--
 2 files changed, 125 insertions(+), 30 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 028a13ca20..65f5b49b0e 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -42,6 +42,7 @@ from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import sparse_ops
+from tensorflow.python.ops import string_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.summary import summary
@@ -816,7 +817,8 @@ class _BinaryLogisticHead(_SingleHead):
           loss_fn=self._loss_fn,
           logits_to_predictions_fn=self._logits_to_predictions,
           metrics_fn=self._metrics,
-          create_output_alternatives_fn=self._create_output_alternatives,
+          create_output_alternatives_fn=_classification_output_alternatives(
+              self.head_name, self._problem_type),
           labels=labels,
           train_op_fn=train_op_fn,
           logits=logits,
@@ -1009,7 +1011,8 @@ class _MultiClassHead(_SingleHead):
           loss_fn=self._wrapped_loss_fn,
           logits_to_predictions_fn=self._logits_to_predictions,
           metrics_fn=self._metrics,
-          create_output_alternatives_fn=self._create_output_alternatives,
+          create_output_alternatives_fn=_classification_output_alternatives(
+              self.head_name, self._problem_type, self._label_keys),
           labels=labels,
           train_op_fn=train_op_fn,
           logits=logits,
@@ -1113,25 +1116,6 @@ class _MultiClassHead(_SingleHead):
 
     return metrics
 
-  def _create_output_alternatives(self, predictions):
-    """See superclass."""
-    probabilities = predictions[prediction_key.PredictionKey.PROBABILITIES]
-    batch_size = array_ops.shape(probabilities)[0]
-    if self._label_keys:
-      classes = array_ops.tile(
-          input=array_ops.expand_dims(input=self._label_keys, axis=0),
-          multiples=[batch_size, 1])
-    else:
-      classes = array_ops.tile(
-          input=array_ops.expand_dims(
-              input=math_ops.range(self.logits_dimension), axis=0),
-          multiples=[batch_size, 1])
-    predictions_for_serving = {
-        prediction_key.PredictionKey.CLASSES: classes,
-        prediction_key.PredictionKey.PROBABILITIES: probabilities,
-    }
-    return {self._head_name: (self._problem_type, predictions_for_serving)}
-
 
 def _to_labels_tensor(labels, label_name):
   """Returns label as a tensor.
@@ -1226,6 +1210,7 @@ class _BinarySvmHead(_SingleHead):
           loss_fn=self._loss_fn,
           logits_to_predictions_fn=self._logits_to_predictions,
           metrics_fn=self._metrics,
+          # TODO(zakaria): Handle labels for export.
           create_output_alternatives_fn=self._create_output_alternatives,
           labels=labels,
           train_op_fn=train_op_fn,
@@ -1325,7 +1310,8 @@ class _MultiLabelHead(_SingleHead):
           loss_fn=self._loss_fn,
           logits_to_predictions_fn=self._logits_to_predictions,
           metrics_fn=self._metrics,
-          create_output_alternatives_fn=self._create_output_alternatives,
+          create_output_alternatives_fn=_classification_output_alternatives(
+              self.head_name, self._problem_type),
           labels=labels,
           train_op_fn=train_op_fn,
           logits=logits,
@@ -1901,6 +1887,71 @@ def _streaming_recall_at_threshold(predictions, labels, weights, threshold):
   return array_ops.squeeze(precision_tensor), array_ops.squeeze(update_op)
 
 
+def _classification_output_alternatives(head_name, problem_type,
+                                        label_keys=None):
+  """Creates a func to generate output alternatives for classification.
+
+  Servo expects classes to be a string tensor, and have the same dimensions
+  as the probabilities tensor. It should contain the labels of the corresponding
+  entries in probabilities. This function creates a new classes tensor that
+  satisfies these conditions and can be exported.
+
+  Args:
+    head_name: Name of the head.
+    problem_type: `ProblemType`
+    label_keys: Optional label keys
+
+  Returns:
+    A function to generate output alternatives.
+  """
+  def _create_output_alternatives(predictions):
+    """Creates output alternative for the Head.
+
+    Args:
+      predictions: a dict of {tensor_name: Tensor}, where 'tensor_name' is a
+        symbolic name for an output Tensor possibly but not necessarily taken
+        from `PredictionKey`, and 'Tensor' is the corresponding output Tensor
+        itself.
+
+    Returns:
+      `dict` of {submodel_name: (problem_type, {tensor_name: Tensor})}, where
+      'submodel_name' is a submodel identifier that should be consistent across
+      the pipeline (here likely taken from the head_name),
+      'problem_type' is a `ProblemType`,
+      'tensor_name' is a symbolic name for an output Tensor possibly but not
+       necessarily taken from `PredictionKey`, and
+      'Tensor' is the corresponding output Tensor itself.
+
+    Raises:
+      ValueError: if predictions does not have PredictionKey.PROBABILITIES key.
+    """
+    probabilities = predictions.get(prediction_key.PredictionKey.PROBABILITIES)
+    if probabilities is None:
+      raise ValueError("%s missing in predictions" %
+                       prediction_key.PredictionKey.PROBABILITIES)
+
+    with ops.name_scope(None, "_classification_output_alternatives",
+                        (probabilities,)):
+      batch_size = array_ops.shape(probabilities)[0]
+      if label_keys:
+        classes = array_ops.tile(
+            input=array_ops.expand_dims(input=label_keys, axis=0),
+            multiples=[batch_size, 1],
+            name="classes_tensor")
+      else:
+        n = array_ops.shape(probabilities)[1]
+        classes = array_ops.tile(
+            input=array_ops.expand_dims(input=math_ops.range(n), axis=0),
+            multiples=[batch_size, 1])
+        classes = string_ops.as_string(classes, name="classes_tensor")
+
+    exported_predictions = {
+        prediction_key.PredictionKey.PROBABILITIES: probabilities,
+        prediction_key.PredictionKey.CLASSES: classes}
+    return {head_name: (problem_type, exported_predictions)}
+
+  return _create_output_alternatives
+
 # Aliases
 # TODO(zakaria): Remove these aliases, See b/34751732
 _regression_head = regression_head
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index ecc1d9ff9e..a5f3b4b270 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -417,7 +417,7 @@ class MultiLabelHeadTest(test.TestCase):
             {}, model_fn.ModeKeys.TRAIN, self._labels, head_lib.no_op_train_fn,
             logits_input=((0., 0.),), logits=self._logits)
 
-  def testMultiLabelEvalMode(self):
+  def testMultiLabelEval(self):
     n_classes = 3
     head = head_lib.multi_label_head(
         n_classes=n_classes, metric_class_ids=range(n_classes))
@@ -433,7 +433,7 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
 
-  def testMultiClassEvalModeWithLargeLogits(self):
+  def testMultiClassEvalWithLargeLogits(self):
     n_classes = 3
     head = head_lib.multi_label_head(
         n_classes=n_classes, metric_class_ids=range(n_classes))
@@ -472,6 +472,36 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss,
                       expected_eval_metrics, model_fn_ops)
 
+  def testMultiLabelInfer(self):
+    n_classes = 3
+    head = head_lib.multi_label_head(n_classes=n_classes, head_name="head_name")
+    with ops.Graph().as_default(), session.Session():
+      model_fn_ops = head.create_model_fn_ops(
+          {}, model_fn.ModeKeys.INFER, self._labels, head_lib.no_op_train_fn,
+          logits=((1., 0., 0.), (0., 0., 1)))
+      self.assertIsNone(model_fn_ops.train_op)
+      _assert_no_variables(self)
+      with session.Session():
+        self.assertListEqual(
+            [1, 0, 0], model_fn_ops.predictions["classes"].eval().tolist()[0])
+        self.assertItemsEqual(
+            ["head_name"], six.iterkeys(model_fn_ops.output_alternatives))
+        self.assertEqual(
+            constants.ProblemType.CLASSIFICATION,
+            model_fn_ops.output_alternatives["head_name"][0])
+
+        predictions_for_serving = (
+            model_fn_ops.output_alternatives["head_name"][1])
+        self.assertIn("classes", six.iterkeys(predictions_for_serving))
+        self.assertAllEqual(
+            [[b"0", b"1", b"2"], [b"0", b"1", b"2"]],
+            predictions_for_serving["classes"].eval())
+        self.assertIn("probabilities", six.iterkeys(predictions_for_serving))
+        self.assertAllClose(
+            [[0.731059, 0.5, 0.5],
+             [0.5, 0.5, 0.731059,]],
+            predictions_for_serving["probabilities"].eval())
+
   def testMultiLabelWithLabelName(self):
     n_classes = 3
     label_name = "my_label"
@@ -691,7 +721,7 @@ class BinaryClassificationHeadTest(test.TestCase):
             {}, model_fn.ModeKeys.TRAIN, self._labels, head_lib.no_op_train_fn,
             logits_input=((0., 0.), (0., 0.)), logits=self._logits)
 
-  def testBinaryClassificationEvalMode(self):
+  def testBinaryClassificationEval(self):
     n_classes = 2
     head = head_lib.multi_class_head(n_classes=n_classes)
     with ops.Graph().as_default(), session.Session():
@@ -708,18 +738,32 @@ class BinaryClassificationHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
 
-  def testBinaryClassificationInferMode(self):
+  def testBinaryClassificationInfer(self):
     n_classes = 2
-    head = head_lib.multi_class_head(n_classes=n_classes)
+    head = head_lib.multi_class_head(n_classes=n_classes, head_name="head_name")
     with ops.Graph().as_default(), session.Session():
       # logloss: z:label, x:logit
       # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
       model_fn_ops = head.create_model_fn_ops(
           {}, model_fn.ModeKeys.INFER, self._labels, head_lib.no_op_train_fn,
           logits=self._logits)
-      self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
+      with session.Session():
+        self.assertListEqual(
+            [1, 1], list(model_fn_ops.predictions["classes"].eval()))
+        self.assertItemsEqual(
+            ["head_name"], six.iterkeys(model_fn_ops.output_alternatives))
+        self.assertEqual(
+            constants.ProblemType.LOGISTIC_REGRESSION,
+            model_fn_ops.output_alternatives["head_name"][0])
+        predictions_for_serving = (
+            model_fn_ops.output_alternatives["head_name"][1])
+        self.assertIn("classes", six.iterkeys(predictions_for_serving))
+        predicted_classes = predictions_for_serving["classes"].eval().tolist()
+        self.assertListEqual(
+            [b"0", b"1"], predicted_classes[0])
+        self.assertIn("probabilities", six.iterkeys(predictions_for_serving))
 
   def testBinaryClassificationInferMode_withWightColumn(self):
     n_classes = 2
@@ -1006,7 +1050,7 @@ class MultiClassHeadTest(test.TestCase):
                             "multi_class_head/centered_bias/bias_1",
                             "multi_class_head/centered_bias/bias_2"])
 
-  def testMultiClassEvalMode(self):
+  def testMultiClassEval(self):
     n_classes = 3
     head = head_lib.multi_class_head(
         n_classes=n_classes, metric_class_ids=range(n_classes))
@@ -1131,7 +1175,7 @@ class MultiClassHeadTest(test.TestCase):
             model_fn_ops.output_alternatives["head_name"][1])
         self.assertIn("classes", six.iterkeys(predictions_for_serving))
         self.assertAllEqual(
-            [[0, 1, 2], [0, 1, 2]],
+            [[b"0", b"1", b"2"], [b"0", b"1", b"2"]],
             predictions_for_serving["classes"].eval())
         self.assertIn("probabilities", six.iterkeys(predictions_for_serving))
         self.assertAllClose(
-- 
GitLab


From 0fe523ac05f1f49145f4b243953a7aad331ea4dc Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 31 Mar 2017 09:31:36 -0800
Subject: [PATCH 0025/1563] tfdbg doc: fix code blocks under numbered bullets
 Change: 151838508

---
 tensorflow/docs_src/programmers_guide/debugger.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/programmers_guide/debugger.md b/tensorflow/docs_src/programmers_guide/debugger.md
index 7ecddc548f..6f442e6e0c 100644
--- a/tensorflow/docs_src/programmers_guide/debugger.md
+++ b/tensorflow/docs_src/programmers_guide/debugger.md
@@ -418,8 +418,9 @@ that the graph contains, this kind of disk space issue can happen.
 There are three possible workarounds or solutions:
 
 1. The constructors of `LocalCLIDebugWrapperSession` and `LocalCLIDebugHook`
-   provide a keyword argument, `dump_root`, with which you can specify the path 
+   provide a keyword argument, `dump_root`, with which you can specify the path
    to which **tfdbg** dumps the debug data. For example:
+
    ``` python
    # For LocalCLIDebugWrapperSession
    sess = tf_debug.LocalCLIDebugWrapperSession(dump_root="/with/lots/of/space")
@@ -432,6 +433,7 @@ There are three possible workarounds or solutions:
 2. Reduce the batch size used during the runs.
 3. Use the filtering options of **tfdbg**'s `run` command to watch only specific
    nodes in the graph. For example:
+
    ```
    tfdbg> run --node_name_filter .*hidden.*
    tfdbg> run --op_type_filter Variable.*
-- 
GitLab


From 997ffb515f33911bde527465ab886a93a3cf9e67 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 09:42:41 -0800
Subject: [PATCH 0026/1563] Add default saver option to CheckpointSaverHook and
 improve docstrings. Change: 151839983

---
 .../training/basic_session_run_hooks.py       | 126 +++++++++---------
 .../training/basic_session_run_hooks_test.py  |  92 +++++++++++++
 .../python/training/monitored_session.py      |   7 +-
 tensorflow/python/training/saver.py           |  27 ++++
 4 files changed, 182 insertions(+), 70 deletions(-)

diff --git a/tensorflow/python/training/basic_session_run_hooks.py b/tensorflow/python/training/basic_session_run_hooks.py
index f13b87dfed..6fd20ce801 100644
--- a/tensorflow/python/training/basic_session_run_hooks.py
+++ b/tensorflow/python/training/basic_session_run_hooks.py
@@ -40,6 +40,7 @@ from tensorflow.core.util.event_pb2 import SessionLog
 from tensorflow.python.framework import meta_graph
 from tensorflow.python.framework import ops
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.training import saver as saver_lib
 from tensorflow.python.training import session_run_hook
 from tensorflow.python.training import training_util
 from tensorflow.python.training.session_run_hook import SessionRunArgs
@@ -124,7 +125,7 @@ class LoggingTensorHook(session_run_hook.SessionRunHook):
 
   def __init__(self, tensors, every_n_iter=None, every_n_secs=None,
                formatter=None):
-    """Initializes a LoggingHook monitor.
+    """Initializes a `LoggingTensorHook`.
 
     Args:
       tensors: `dict` that maps string-valued tags to tensors/tensor names,
@@ -189,10 +190,10 @@ class LoggingTensorHook(session_run_hook.SessionRunHook):
 
 
 class StopAtStepHook(session_run_hook.SessionRunHook):
-  """Monitor to request stop at a specified step."""
+  """Hook that requests stop at a specified step."""
 
   def __init__(self, num_steps=None, last_step=None):
-    """Create a StopAtStep Hook.
+    """Initializes a `StopAtStepHook`.
 
     This hook requests stop after either a number of steps have been
     executed or a last step has been reached. Only one of the two options can be
@@ -234,51 +235,48 @@ class StopAtStepHook(session_run_hook.SessionRunHook):
 
 
 class CheckpointSaverListener(object):
-  """An interface for event hooks that depend on a checkpoint.
-
-  CheckpointSaverListeners are similar to SessionRunHooks, and can be useful to
-  track training, report progress, and more.  The distinction is that
-  CheckpointSaverListeners run only in steps when CheckpointSaverHook is
-  triggered, and provide callbacks to run before or after the checkpoint is
-  generated.  This is in contrast to SessionRunHooks, which may run in steps
-  when no checkpoint is written, and which have no guaranteed execution order
-  in any case.  CheckpointSaverListeners use the observer pattern and notify at
-  the following points:
-   - when a session starts being used
+  """Interface for listeners that take action before or after checkpoint save.
+
+  `CheckpointSaverListener` triggers only in steps when `CheckpointSaverHook` is
+  triggered, and provides callbacks at the following points:
+   - before using the session
    - before each call to `Saver.save()`
    - after each call to `Saver.save()`
-   - when the session closed
-
-  Custom CheckpointSaverListeners look like this:
-    class ExampleCheckpointSaverListerner(CheckpointSaverListener):
-      def begin(self):
-        # You can add ops to the graph here.
-        print('Starting the session.')
-        self.your_tensor = ...
-
-      def before_save(self, session, global_step_value):
-        print('About to write a checkpoint')
-
-      def after_save(self, session, global_step_value):
-        print('Done writing checkpoint.')
-
-      def end(self, session, global_step_value):
-        print('Done with the session.')
-
-  A CheckpointSaverListener may simply take some action after every checkpoint.
-  It is also possible for the listener to use its own schedule to act less
-  frequently, based on wall clock time or on global_step_value.  In this case,
-  implementors must be careful about what happens at end().  When end is called,
-  The CheckpointSaverHook will have already triggered after_save() in the same
-  global_step, but the listener may or may not have actually acted on it.
-  The listener may want to be sure to act at end() if there is a fresh
-  checkpoint available, but should not act twice if after_save() already handled
-  it.  In this case, end() should have logic to detect the situation and do the
-  right thing, similar to what CheckpointSaverHook.end() does using
-  self._timer.last_triggered_step().
-
-  To use such listeners, in your `model_fn` return a `CheckpointSaverHook` as
-  part of `training_chief_hooks`.
+   - at the end of session
+
+  To use a listener, implement a class and pass the listener to a
+  `CheckpointSaverHook`, as in this example:
+
+  ```python
+  class ExampleCheckpointSaverListerner(CheckpointSaverListener):
+    def begin(self):
+      # You can add ops to the graph here.
+      print('Starting the session.')
+      self.your_tensor = ...
+
+    def before_save(self, session, global_step_value):
+      print('About to write a checkpoint')
+
+    def after_save(self, session, global_step_value):
+      print('Done writing checkpoint.')
+
+    def end(self, session, global_step_value):
+      print('Done with the session.')
+
+  ...
+  listener = ExampleCheckpointSaverListerner()
+  saver_hook = tf.train.CheckpointSaverHook(
+      checkpoint_dir, listeners=[listener])
+  with tf.train.MonitoredTrainingSession(chief_only_hooks=[saver_hook]):
+    ...
+  ```
+
+  A `CheckpointSaverListener` may simply take some action after every
+  checkpoint save. It is also possible for the listener to use its own schedule
+  to act less frequently, e.g. based on global_step_value. In this case,
+  implementors should implement the `end()` method to handle actions related to
+  the last checkpoint save. But the listener should not act twice if
+  `after_save()` already handled this last checkpoint save.
   """
 
   def begin(self):
@@ -305,7 +303,7 @@ class CheckpointSaverHook(session_run_hook.SessionRunHook):
                checkpoint_basename="model.ckpt",
                scaffold=None,
                listeners=None):
-    """Initialize CheckpointSaverHook monitor.
+    """Initializes a `CheckpointSaverHook`.
 
     Args:
       checkpoint_dir: `str`, base directory for the checkpoint files.
@@ -315,18 +313,18 @@ class CheckpointSaverHook(session_run_hook.SessionRunHook):
       checkpoint_basename: `str`, base name for the checkpoint files.
       scaffold: `Scaffold`, use to get saver object.
       listeners: List of `CheckpointSaverListener` subclass instances.
-        Used for callbacks that run immediately after the corresponding
-        CheckpointSaverHook callbacks, only in steps where the
-        CheckpointSaverHook was triggered.
+        Used for callbacks that run immediately before or after this hook saves
+        the checkpoint.
 
     Raises:
       ValueError: One of `save_steps` or `save_secs` should be set.
       ValueError: Exactly one of saver or scaffold should be set.
     """
     logging.info("Create CheckpointSaverHook.")
-    if ((saver is None and scaffold is None) or
-        (saver is not None and scaffold is not None)):
-      raise ValueError("Exactly one of saver or scaffold must be provided.")
+    if saver is not None and scaffold is not None:
+      raise ValueError("You cannot provide both saver and scaffold.")
+    if saver is None and scaffold is None:
+      saver = saver_lib._get_saver_or_default()  # pylint: disable=protected-access
     self._saver = saver
     self._checkpoint_dir = checkpoint_dir
     self._save_path = os.path.join(checkpoint_dir, checkpoint_basename)
@@ -401,7 +399,7 @@ class CheckpointSaverHook(session_run_hook.SessionRunHook):
 
 
 class StepCounterHook(session_run_hook.SessionRunHook):
-  """Steps per second monitor."""
+  """Hook that counts steps per second."""
 
   def __init__(self,
                every_n_steps=100,
@@ -453,14 +451,13 @@ class NanLossDuringTrainingError(RuntimeError):
 
 
 class NanTensorHook(session_run_hook.SessionRunHook):
-  """NaN Loss monitor.
+  """Monitors the loss tensor and stops training if loss is NaN.
 
-  Monitors loss and stops training if loss is NaN.
   Can either fail with exception or just stop training.
   """
 
   def __init__(self, loss_tensor, fail_on_nan_loss=True):
-    """Initializes NanLoss monitor.
+    """Initializes a `NanTensorHook`.
 
     Args:
       loss_tensor: `Tensor`, the loss tensor.
@@ -494,7 +491,7 @@ class SummarySaverHook(session_run_hook.SessionRunHook):
                summary_writer=None,
                scaffold=None,
                summary_op=None):
-    """Initializes a `SummarySaver` monitor.
+    """Initializes a `SummarySaverHook`.
 
     Args:
       save_steps: `int`, save summaries every N steps. Exactly one of
@@ -590,7 +587,7 @@ class SummarySaverHook(session_run_hook.SessionRunHook):
 
 
 class GlobalStepWaiterHook(session_run_hook.SessionRunHook):
-  """Delay execution until global step reaches to wait_until_step.
+  """Delays execution until global step reaches `wait_until_step`.
 
   This hook delays execution until global step reaches to `wait_until_step`. It
   is used to gradually start workers in distributed settings. One example usage
@@ -599,7 +596,7 @@ class GlobalStepWaiterHook(session_run_hook.SessionRunHook):
   """
 
   def __init__(self, wait_until_step):
-    """Create a _GlobalStepWaiterHook.
+    """Initializes a `GlobalStepWaiterHook`.
 
     Args:
       wait_until_step: an `int` shows until which global step should we wait.
@@ -637,10 +634,10 @@ class GlobalStepWaiterHook(session_run_hook.SessionRunHook):
 
 
 class FinalOpsHook(session_run_hook.SessionRunHook):
-  """A run hook which evaluates `Tensors` at the end of a session."""
+  """A hook which evaluates `Tensors` at the end of a session."""
 
   def __init__(self, final_ops, final_ops_feed_dict=None):
-    """Constructs the FinalOpHook with ops to run at the end of the session.
+    """Initializes `FinalOpHook` with ops to run at the end of the session.
 
     Args:
       final_ops: A single `Tensor`, a list of `Tensors` or a dictionary of
@@ -666,10 +663,11 @@ class FeedFnHook(session_run_hook.SessionRunHook):
   """Runs `feed_fn` and sets the `feed_dict` accordingly."""
 
   def __init__(self, feed_fn):
-    """Constructs the FeedFnHook with given `feed_fn`.
+    """Initializes a `FeedFnHook`.
 
     Args:
-      feed_fn: function, no arguments and returns `dict` to feed.
+      feed_fn: function that takes no arguments and returns `dict` of `Tensor`
+        to feed.
     """
     self.feed_fn = feed_fn
 
diff --git a/tensorflow/python/training/basic_session_run_hooks_test.py b/tensorflow/python/training/basic_session_run_hooks_test.py
index c2636d46f5..ecb61d447b 100644
--- a/tensorflow/python/training/basic_session_run_hooks_test.py
+++ b/tensorflow/python/training/basic_session_run_hooks_test.py
@@ -346,6 +346,98 @@ class CheckpointSaverHookTest(test.TestCase):
           'end': 1
       }, listener.get_counts())
 
+  def test_listener_with_monitored_session(self):
+    with ops.Graph().as_default():
+      scaffold = monitored_session.Scaffold()
+      global_step = variables.get_or_create_global_step()
+      train_op = state_ops.assign_add(global_step, 1)
+      listener = MockCheckpointSaverListener()
+      hook = basic_session_run_hooks.CheckpointSaverHook(
+          self.model_dir,
+          save_steps=1,
+          scaffold=scaffold,
+          listeners=[listener])
+      with monitored_session.SingularMonitoredSession(
+          hooks=[hook],
+          scaffold=scaffold,
+          checkpoint_dir=self.model_dir) as sess:
+        sess.run(train_op)
+        sess.run(train_op)
+        global_step_val = sess.run(global_step)
+      listener_counts = listener.get_counts()
+    self.assertEqual(2, global_step_val)
+    self.assertEqual({
+        'begin': 1,
+        'before_save': 2,
+        'after_save': 2,
+        'end': 1
+    }, listener_counts)
+
+  def test_listener_with_default_saver(self):
+    with ops.Graph().as_default():
+      global_step = variables.get_or_create_global_step()
+      train_op = state_ops.assign_add(global_step, 1)
+      listener = MockCheckpointSaverListener()
+      hook = basic_session_run_hooks.CheckpointSaverHook(
+          self.model_dir,
+          save_steps=1,
+          listeners=[listener])
+      with monitored_session.SingularMonitoredSession(
+          hooks=[hook],
+          checkpoint_dir=self.model_dir) as sess:
+        sess.run(train_op)
+        sess.run(train_op)
+        global_step_val = sess.run(global_step)
+      listener_counts = listener.get_counts()
+    self.assertEqual(2, global_step_val)
+    self.assertEqual({
+        'begin': 1,
+        'before_save': 2,
+        'after_save': 2,
+        'end': 1
+    }, listener_counts)
+
+    with ops.Graph().as_default():
+      global_step = variables.get_or_create_global_step()
+      with monitored_session.SingularMonitoredSession(
+          checkpoint_dir=self.model_dir) as sess2:
+        global_step_saved_val = sess2.run(global_step)
+    self.assertEqual(2, global_step_saved_val)
+
+  def test_two_listeners_with_default_saver(self):
+    with ops.Graph().as_default():
+      global_step = variables.get_or_create_global_step()
+      train_op = state_ops.assign_add(global_step, 1)
+      listener1 = MockCheckpointSaverListener()
+      listener2 = MockCheckpointSaverListener()
+      hook = basic_session_run_hooks.CheckpointSaverHook(
+          self.model_dir,
+          save_steps=1,
+          listeners=[listener1, listener2])
+      with monitored_session.SingularMonitoredSession(
+          hooks=[hook],
+          checkpoint_dir=self.model_dir) as sess:
+        sess.run(train_op)
+        sess.run(train_op)
+        global_step_val = sess.run(global_step)
+      listener1_counts = listener1.get_counts()
+      listener2_counts = listener2.get_counts()
+    self.assertEqual(2, global_step_val)
+    self.assertEqual({
+        'begin': 1,
+        'before_save': 2,
+        'after_save': 2,
+        'end': 1
+    }, listener1_counts)
+    self.assertEqual(listener1_counts, listener2_counts)
+
+    with ops.Graph().as_default():
+      global_step = variables.get_or_create_global_step()
+      with monitored_session.SingularMonitoredSession(
+          checkpoint_dir=self.model_dir) as sess2:
+        global_step_saved_val = sess2.run(global_step)
+    self.assertEqual(2, global_step_saved_val)
+
   @test.mock.patch('time.time')
   def test_save_secs_saves_periodically(self, mock_time):
     # Let's have a realistic start time
diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index ae76a1ab58..cf8692eda1 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -22,7 +22,6 @@ from __future__ import print_function
 import abc
 
 from tensorflow.core.protobuf import config_pb2
-from tensorflow.core.protobuf import saver_pb2
 from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -180,11 +179,7 @@ class Scaffold(object):
                                                  summary.merge_all)
     # pylint: disable=g-long-lambda
     if self._saver is None:
-      self._saver = Scaffold.get_or_default(
-          'saver',
-          ops.GraphKeys.SAVERS,
-          lambda: training_saver.Saver(sharded=True, allow_empty=True,
-                                       write_version=saver_pb2.SaverDef.V2))
+      self._saver = training_saver._get_saver_or_default()  # pylint: disable=protected-access
     # pylint: enable=g-long-lambda
     self._saver.build()
 
diff --git a/tensorflow/python/training/saver.py b/tensorflow/python/training/saver.py
index ae5fc54d85..43b6174246 100644
--- a/tensorflow/python/training/saver.py
+++ b/tensorflow/python/training/saver.py
@@ -712,6 +712,33 @@ class BaseSaverBuilder(object):
         version=self._write_version)
 
 
+def _get_saver_or_default():
+  """Returns the saver from SAVERS collection, or creates a default one.
+
+  This method is used by other members of the training module, such as
+  `Scaffold`, or `CheckpointSaverHook`.
+
+  Returns:
+    `Saver`.
+
+  Raises:
+    RuntimeError: If the SAVERS collection already has more than one items.
+  """
+  collection_key = ops.GraphKeys.SAVERS
+  savers = ops.get_collection(collection_key)
+  if savers:
+    if len(savers) > 1:
+      raise RuntimeError(
+          "More than one item in collection {}. "
+          "Please indicate which one to use by passing it to the constructor.".
+          format(collection_key))
+    return savers[0]
+  saver = Saver(sharded=True, allow_empty=True)
+  if saver is not None:
+    ops.add_to_collection(collection_key, saver)
+  return saver
+
+
 def _GetCheckpointFilename(save_dir, latest_filename):
   """Returns a filename for storing the CheckpointState.
 
-- 
GitLab


From ac933c956a01187b626a4095ea00822364cfb6c2 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 31 Mar 2017 10:05:39 -0800
Subject: [PATCH 0027/1563] Fix issue in installing latest nightly tensorflow
 pip wheel in ubuntu:16.04-based gcs_test Dockerfile Change: 151843345

---
 tensorflow/tools/gcs_test/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/gcs_test/Dockerfile b/tensorflow/tools/gcs_test/Dockerfile
index 1df0069272..581bded65d 100644
--- a/tensorflow/tools/gcs_test/Dockerfile
+++ b/tensorflow/tools/gcs_test/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:16.04
 MAINTAINER Shanqing Cai <cais@google.com>
 
 RUN apt-get update
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get install -y \
     curl \
     libcurl4-openssl-dev \
     python \
-- 
GitLab


From bf02d3cfefdf92dc2929a6e257bc31800bf02a60 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 10:51:11 -0800
Subject: [PATCH 0028/1563] Add an optional activation function to the
 OutputProjectionWrapper and InputProjectionWrapper. Change: 151849737

---
 .../contrib/rnn/python/ops/core_rnn_cell_impl.py     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index f44302638e..d828a337f3 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -466,12 +466,13 @@ class OutputProjectionWrapper(RNNCell):
   if needed or directly feed into a softmax.
   """
 
-  def __init__(self, cell, output_size, reuse=None):
+  def __init__(self, cell, output_size, activation=None, reuse=None):
     """Create a cell with output projection.
 
     Args:
       cell: an RNNCell, a projection to output_size is added to it.
       output_size: integer, the size of the output after projection.
+      activation: (optional) an optional activation function.
       reuse: (optional) Python boolean describing whether to reuse variables
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
@@ -487,6 +488,7 @@ class OutputProjectionWrapper(RNNCell):
     self._cell = cell
     self._output_size = output_size
     self._reuse = reuse
+    self._activation = activation
 
   @property
   def state_size(self):
@@ -507,6 +509,8 @@ class OutputProjectionWrapper(RNNCell):
     with _checked_scope(self, scope or "output_projection_wrapper",
                         reuse=self._reuse):
       projected = _linear(output, self._output_size, True)
+      if self._activation:
+        projected = self._activation(projected)
     return projected, res_state
 
 
@@ -518,12 +522,13 @@ class InputProjectionWrapper(RNNCell):
   do the projection on this batch-concatenated sequence, then split it.
   """
 
-  def __init__(self, cell, num_proj, input_size=None):
+  def __init__(self, cell, num_proj, activation=None, input_size=None):
     """Create a cell with input projection.
 
     Args:
       cell: an RNNCell, a projection of inputs is added before it.
       num_proj: Python integer.  The dimension to project to.
+      activation: (optional) an optional activation function.
       input_size: Deprecated and unused.
 
     Raises:
@@ -535,6 +540,7 @@ class InputProjectionWrapper(RNNCell):
       raise TypeError("The parameter cell is not RNNCell.")
     self._cell = cell
     self._num_proj = num_proj
+    self._activation = activation
 
   @property
   def state_size(self):
@@ -553,6 +559,8 @@ class InputProjectionWrapper(RNNCell):
     # Default scope: "InputProjectionWrapper"
     with vs.variable_scope(scope or "input_projection_wrapper"):
       projected = _linear(inputs, self._num_proj, True)
+      if self._activation:
+        projected = self._activation(projected)
     return self._cell(projected, state)
 
 
-- 
GitLab


From 89ed6b49af088fae6c2185f145ca1e2748642a49 Mon Sep 17 00:00:00 2001
From: Zakaria Haque <zakaria@google.com>
Date: Fri, 31 Mar 2017 10:54:28 -0800
Subject: [PATCH 0029/1563] Adds area under precision recall curve for binary
 and multiclass heads. Change: 151850197

---
 .../contrib/learn/python/learn/estimators/head.py   | 13 +++++++++++--
 .../learn/python/learn/estimators/head_test.py      |  7 ++++++-
 .../learn/python/learn/estimators/metric_key.py     |  2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 65f5b49b0e..14f7666b3d 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -887,6 +887,8 @@ class _BinaryLogisticHead(_SingleHead):
           _indicator_labels_streaming_mean(labels, weights))
       metrics[_summary_key(self.head_name, mkey.AUC)] = (
           _streaming_auc(logistic, labels, weights))
+      metrics[_summary_key(self.head_name, mkey.AUC_PR)] = (
+          _streaming_auc(logistic, labels, weights, curve="PR"))
 
       for threshold in self._thresholds:
         metrics[_summary_key(
@@ -1360,6 +1362,8 @@ class _MultiLabelHead(_SingleHead):
           metrics_lib.streaming_accuracy(classes, labels, weights))
       metrics[_summary_key(self.head_name, mkey.AUC)] = _streaming_auc(
           probabilities, labels, weights)
+      metrics[_summary_key(self.head_name, mkey.AUC_PR)] = _streaming_auc(
+          probabilities, labels, weights, curve="PR")
 
       for class_id in self._metric_class_ids:
         # TODO(ptucker): Add per-class accuracy, precision, recall.
@@ -1377,6 +1381,9 @@ class _MultiLabelHead(_SingleHead):
                 _predictions_streaming_mean(logits, weights, class_id))
         metrics[_summary_key(self.head_name, mkey.CLASS_AUC % class_id)] = (
             _streaming_auc(probabilities, labels, weights, class_id))
+        metrics[_summary_key(self.head_name, mkey.CLASS_AUC_PR % class_id)] = (
+            _streaming_auc(probabilities, labels, weights, class_id,
+                           curve="PR"))
 
     return metrics
 
@@ -1843,7 +1850,8 @@ def _class_labels_streaming_mean(labels, weights, class_id):
       weights=weights)
 
 
-def _streaming_auc(predictions, labels, weights=None, class_id=None):
+def _streaming_auc(predictions, labels, weights=None, class_id=None,
+                   curve="ROC"):
   predictions = ops.convert_to_tensor(predictions)
   labels = ops.convert_to_tensor(labels)
   if class_id is not None:
@@ -1852,7 +1860,8 @@ def _streaming_auc(predictions, labels, weights=None, class_id=None):
   return metrics_lib.streaming_auc(
       predictions,
       math_ops.cast(labels, dtypes.bool),
-      weights=_float_weights_or_none(weights))
+      weights=_float_weights_or_none(weights),
+      curve=curve)
 
 
 def _assert_class_id(class_id, num_classes=None):
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index a5f3b4b270..9b8cba1526 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -297,11 +297,15 @@ class MultiLabelHeadTest(test.TestCase):
   def _expected_eval_metrics(self, expected_loss):
     return {
         "accuracy": 1. / 3,
-        "auc": 1. / 4,
         "loss": expected_loss,
+        "auc": 1. / 4,
         "auc/class0": 1.,
         "auc/class1": 1.,
         "auc/class2": 0.,
+        "auc_precision_recall": 0.166667,
+        "auc_precision_recall/class0": 0,
+        "auc_precision_recall/class1": 0.,
+        "auc_precision_recall/class2": 1.,
         "labels/actual_label_mean/class0": self._labels[0][0],
         "labels/actual_label_mean/class1": self._labels[0][1],
         "labels/actual_label_mean/class2": self._labels[0][2],
@@ -651,6 +655,7 @@ class BinaryClassificationHeadTest(test.TestCase):
         "accuracy/baseline_label_mean": label_mean,
         "accuracy/threshold_0.500000_mean": 1. / 2,
         "auc": 1. / 2,
+        "auc_precision_recall": 0.749999,
         "labels/actual_label_mean": label_mean,
         "labels/prediction_mean": .731059,  # softmax
         "loss": expected_loss,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/metric_key.py b/tensorflow/contrib/learn/python/learn/estimators/metric_key.py
index 10ac888eca..99388f116b 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/metric_key.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/metric_key.py
@@ -22,7 +22,9 @@ class MetricKey(object):
   """Metric key strings."""
   LOSS = "loss"
   AUC = "auc"
+  AUC_PR = "auc_precision_recall"
   CLASS_AUC = "auc/class%d"
+  CLASS_AUC_PR = "auc_precision_recall/class%d"
   PREDICTION_MEAN = "labels/prediction_mean"
   CLASS_PREDICTION_MEAN = "labels/prediction_mean/class%d"
   CLASS_LOGITS_MEAN = "labels/logits_mean/class%d"
-- 
GitLab


From a05668a832980531e621586473204312c87b5b6e Mon Sep 17 00:00:00 2001
From: Vinu Rajashekhar <vinuraja@google.com>
Date: Fri, 31 Mar 2017 11:25:32 -0800
Subject: [PATCH 0030/1563] Makes GraphRunner a class to explicitly control
 it's lifetime. Change: 151853846

---
 .../core/common_runtime/constant_folding.cc   | 13 ++++++++--
 .../core/common_runtime/graph_runner.cc       | 26 ++++++++++---------
 tensorflow/core/common_runtime/graph_runner.h | 19 +++++++++++---
 .../core/common_runtime/graph_runner_test.cc  | 14 +++++-----
 .../core/common_runtime/shape_refiner.cc      | 16 ++++++++----
 .../core/common_runtime/shape_refiner.h       |  7 +++++
 6 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/tensorflow/core/common_runtime/constant_folding.cc b/tensorflow/core/common_runtime/constant_folding.cc
index 5db49aa498..8c4085425a 100644
--- a/tensorflow/core/common_runtime/constant_folding.cc
+++ b/tensorflow/core/common_runtime/constant_folding.cc
@@ -34,6 +34,7 @@ limitations under the License.
 #include "tensorflow/core/graph/node_builder.h"
 #include "tensorflow/core/graph/subgraph.h"
 #include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/lib/gtl/cleanup.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/public/session_options.h"
 
@@ -304,10 +305,18 @@ Status DoConstantFoldingWithStatus(const ConstantFoldingOptions& opts,
     tensors_to_replace.push_back({n.second, n.first.second});
   }
 
+  auto graph_runner = std::unique_ptr<GraphRunner>(new GraphRunner(env));
   // Evaluate the constant foldable nodes.
   std::vector<Tensor> outputs;
-  Status s = GraphRunner::Run(constant_graph.get(), function_library, env,
-                              {} /* inputs*/, tensors_to_fetch_names, &outputs);
+  auto delete_tensors = gtl::MakeCleanup([&graph_runner, &outputs] {
+    // Output tensors need to be cleared before the GraphRunner is deleted.
+    outputs.clear();
+    graph_runner.reset(nullptr);
+  });
+
+  Status s =
+      graph_runner->Run(constant_graph.get(), function_library, {} /* inputs*/,
+                        tensors_to_fetch_names, &outputs);
   if (!s.ok()) {
     VLOG(1) << "Could not fetch constants: " << s;
     *was_mutated = false;
diff --git a/tensorflow/core/common_runtime/graph_runner.cc b/tensorflow/core/common_runtime/graph_runner.cc
index c93ff1cdde..d4dc8f0057 100644
--- a/tensorflow/core/common_runtime/graph_runner.cc
+++ b/tensorflow/core/common_runtime/graph_runner.cc
@@ -15,7 +15,6 @@ limitations under the License.
 
 #include "tensorflow/core/common_runtime/graph_runner.h"
 
-#include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/common_runtime/executor.h"
 #include "tensorflow/core/common_runtime/function.h"
 #include "tensorflow/core/common_runtime/memory_types.h"
@@ -95,22 +94,24 @@ class SimpleRendezvous : public Rendezvous {
 
 }  // namespace
 
-// static
+GraphRunner::GraphRunner(Env* env) : cpu_device_(GetCPUDevice(env)) {}
+
+GraphRunner::~GraphRunner() {}
+
 Status GraphRunner::Run(Graph* graph, FunctionLibraryRuntime* function_library,
-                        Env* env, const NamedTensorList& inputs,
+                        const NamedTensorList& inputs,
                         const std::vector<string>& output_names,
                         std::vector<Tensor>* outputs) {
+  if (cpu_device_ == nullptr) {
+    return errors::NotFound("Cannot find a device for GraphRunner.");
+  }
+
   // TODO(vrv): Instead of copying the entire graph, consider modifying
   // the existing graph, and then removing those removed edges.
   // prior to returning.
   std::unique_ptr<Graph> graph_to_run(new Graph(graph->op_registry()));
   CopyGraph(*graph, graph_to_run.get());
 
-  std::unique_ptr<Device> device = GetCPUDevice(env);
-  if (!device) {
-    return errors::NotFound("Cannot find a device for GraphRunner.");
-  }
-
   SimpleRendezvous* rendez = new SimpleRendezvous;
   core::ScopedUnref rendez_unref(rendez);
 
@@ -130,7 +131,7 @@ Status GraphRunner::Run(Graph* graph, FunctionLibraryRuntime* function_library,
   // Call RewriteGraphForExecution
   TF_RETURN_IF_ERROR(subgraph::RewriteGraphForExecution(
       graph_to_run.get(), input_names, output_names, {} /* target nodes */,
-      device->attributes()));
+      cpu_device_->attributes()));
 
   // Create the local executor and the Rendezvous for fetching back the
   // constants.
@@ -143,10 +144,11 @@ Status GraphRunner::Run(Graph* graph, FunctionLibraryRuntime* function_library,
   Graph* g = graph_to_run.release();
 
   LocalExecutorParams params;
-  params.device = device.get();
+  // The ownership of the output tensors are bound to this device's lifetime.
+  params.device = cpu_device_.get();
   params.function_library = function_library;
-  params.create_kernel = [&device, g](const NodeDef& ndef, OpKernel** kernel) {
-    return CreateNonCachedKernel(device.get(), nullptr, ndef,
+  params.create_kernel = [this, g](const NodeDef& ndef, OpKernel** kernel) {
+    return CreateNonCachedKernel(cpu_device_.get(), nullptr, ndef,
                                  g->versions().producer(), kernel);
   };
   params.delete_kernel = [](OpKernel* kernel) { delete kernel; };
diff --git a/tensorflow/core/common_runtime/graph_runner.h b/tensorflow/core/common_runtime/graph_runner.h
index e078c7ffc8..24e8b04c46 100644
--- a/tensorflow/core/common_runtime/graph_runner.h
+++ b/tensorflow/core/common_runtime/graph_runner.h
@@ -20,6 +20,7 @@ limitations under the License.
 #include <string>
 #include <vector>
 
+#include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/framework/function.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/graph/graph.h"
@@ -44,16 +45,26 @@ namespace tensorflow {
 // to be particularly lightweight, fast, or efficient.
 class GraphRunner {
  public:
+  // REQUIRES: `env` is not nullptr.
+  GraphRunner(Env* env);
+  ~GraphRunner();
+
   // Function semantics for `inputs`, `output_names` and `outputs`
   // matches those from Session::Run().
   //
+  // NOTE: The output tensors share lifetime with the GraphRunner, and could
+  // be destroyed once the GraphRunner is destroyed.
+  //
   // REQUIRES: `graph`, `env`, and `outputs` are not nullptr.
   // `function_library` may be nullptr.
   typedef std::vector<std::pair<string, Tensor>> NamedTensorList;
-  static Status Run(Graph* graph, FunctionLibraryRuntime* function_library,
-                    Env* env, const NamedTensorList& inputs,
-                    const std::vector<string>& output_names,
-                    std::vector<Tensor>* outputs);
+  Status Run(Graph* graph, FunctionLibraryRuntime* function_library,
+             const NamedTensorList& inputs,
+             const std::vector<string>& output_names,
+             std::vector<Tensor>* outputs);
+
+ private:
+  std::unique_ptr<Device> cpu_device_;
 };
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/common_runtime/graph_runner_test.cc b/tensorflow/core/common_runtime/graph_runner_test.cc
index 5918ba9a22..ccb44af0ec 100644
--- a/tensorflow/core/common_runtime/graph_runner_test.cc
+++ b/tensorflow/core/common_runtime/graph_runner_test.cc
@@ -46,9 +46,9 @@ using test::internal::ExpectEqual;
 TEST(GraphRunnerTest, SingleConst) {
   Scope root = Scope::NewRootScope();
   auto c = ops::Const(root, 42.0f);
+  GraphRunner graph_runner(Env::Default());
   std::vector<Tensor> outputs;
-  Status s = GraphRunner::Run(root.graph(), nullptr, Env::Default(), {},
-                              {c.name()}, &outputs);
+  Status s = graph_runner.Run(root.graph(), nullptr, {}, {c.name()}, &outputs);
   TF_ASSERT_OK(s);
   ExpectEqual(42.0f, outputs[0].scalar<float>()());
 }
@@ -57,9 +57,10 @@ TEST(GraphRunnerTest, MultiFetchConst) {
   Scope root = Scope::NewRootScope();
   auto c = ops::Const(root, 42.0f);
   auto pi = ops::Const(root, 3.14f);
+  GraphRunner graph_runner(Env::Default());
   std::vector<Tensor> outputs;
-  Status s = GraphRunner::Run(root.graph(), nullptr, Env::Default(), {},
-                              {c.name(), pi.name()}, &outputs);
+  Status s = graph_runner.Run(root.graph(), nullptr, {}, {c.name(), pi.name()},
+                              &outputs);
   TF_ASSERT_OK(s);
   ExpectEqual(42.0f, outputs[0].scalar<float>()());
   ExpectEqual(3.14f, outputs[1].scalar<float>()());
@@ -78,9 +79,10 @@ TEST(GraphRunnerTest, FeedAndFetch) {
   std::vector<std::pair<string, Tensor>> inputs = {{"p1:0", p1_data},
                                                    {"p2:0", p2_data}};
 
+  GraphRunner graph_runner(Env::Default());
   std::vector<Tensor> outputs;
-  Status s = GraphRunner::Run(root.graph(), nullptr, Env::Default(), inputs,
-                              {"add:0"}, &outputs);
+  Status s =
+      graph_runner.Run(root.graph(), nullptr, inputs, {"add:0"}, &outputs);
   TF_ASSERT_OK(s);
   ExpectEqual(3.0f, outputs[0].scalar<float>()());
 }
diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index 2f65abde0a..f58faefa9f 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -19,7 +19,6 @@ limitations under the License.
 #include <unordered_set>
 #include <vector>
 
-#include "tensorflow/core/common_runtime/graph_runner.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/stl_util.h"
@@ -33,7 +32,15 @@ using shape_inference::ShapeHandle;
 
 ShapeRefiner::ShapeRefiner(int graph_def_version,
                            const OpRegistryInterface* ops)
-    : graph_def_version_(graph_def_version), ops_registry_(ops) {}
+    : graph_def_version_(graph_def_version),
+      ops_registry_(ops),
+      graph_runner_(Env::Default()) {}
+
+ShapeRefiner::~ShapeRefiner() {
+  // The lifetime of the tensors are bound to the GraphRunner, so the tensors
+  // should be deleted before it.
+  const_tensor_map_.clear();
+}
 
 Status ShapeRefiner::AddNode(const Node* node) {
   // For each 'input' of this node, fetch the corresponding shape
@@ -223,9 +230,8 @@ Status ShapeRefiner::EvaluateConstantTensorForEdge(const Node* node,
   std::vector<Tensor> outputs;
   // NOTE; we should pass in a function library runtime if we want
   // to support constant-expression evaluation on functions.
-  Status s = GraphRunner::Run(&subgraph, nullptr /* function_library */,
-                              Env::Default(), const_inputs,
-                              {output_tensor_name}, &outputs);
+  Status s = graph_runner_.Run(&subgraph, nullptr /* function_library */,
+                               const_inputs, {output_tensor_name}, &outputs);
 
   // If all kernels in the constant graph are not registered
   // in the process, GraphRunner::Run may fail, in which case
diff --git a/tensorflow/core/common_runtime/shape_refiner.h b/tensorflow/core/common_runtime/shape_refiner.h
index b8d69fc05b..bbde0924c7 100644
--- a/tensorflow/core/common_runtime/shape_refiner.h
+++ b/tensorflow/core/common_runtime/shape_refiner.h
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <vector>
 
+#include "tensorflow/core/common_runtime/graph_runner.h"
 #include "tensorflow/core/framework/shape_inference.h"
 #include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/status.h"
@@ -32,6 +33,7 @@ namespace tensorflow {
 class ShapeRefiner {
  public:
   ShapeRefiner(int graph_def_version, const OpRegistryInterface* ops);
+  ~ShapeRefiner();
 
   // Performs validation of 'node' and runs 'node's shape function,
   // storing its shape outputs.
@@ -101,6 +103,10 @@ class ShapeRefiner {
   const int graph_def_version_;
   const OpRegistryInterface* const ops_registry_;
 
+  // The lifetime of the tensors are bound to the runner, so it should be the
+  // deleted after the tensors.
+  GraphRunner graph_runner_;
+
   // Stores a map from a node to its InferenceContext.
   //
   // Owns values.
@@ -118,6 +124,7 @@ class ShapeRefiner {
   // Only tensors less than 1KiB are currently stored in the cache.
   static constexpr int64 kMaxTensorSize = 1024;
   std::unordered_map<string, Tensor> const_tensor_map_;
+
   TF_DISALLOW_COPY_AND_ASSIGN(ShapeRefiner);
 };
 
-- 
GitLab


From 08a3e36c97a644377c07d39d6c707d1abfb2c394 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 11:26:42 -0800
Subject: [PATCH 0031/1563] Add nccl to tf.contrib. Compile nccl on windows,
 now that bazel 0.4.5 is used. Change: 151853954

---
 tensorflow/contrib/BUILD                      |  7 ++----
 tensorflow/contrib/__init__.py                |  1 +
 .../contrib/cmake/tf_core_kernels.cmake       |  3 +++
 tensorflow/contrib/cmake/tf_core_ops.cmake    |  1 +
 tensorflow/contrib/cmake/tf_python.cmake      |  7 ++++++
 tensorflow/contrib/nccl/__init__.py           | 22 ++++++++++++++-----
 .../ci_build/windows/libtensorflow_cpu.sh     | 11 +---------
 7 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index 595d899738..a726471d0f 100644
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -7,8 +7,6 @@ exports_files(["LICENSE"])
 
 package(default_visibility = ["//tensorflow:__subpackages__"])
 
-load("//tensorflow:tensorflow.bzl", "if_not_windows")
-
 py_library(
     name = "contrib_py",
     srcs = glob(["**/*.py"]),
@@ -46,6 +44,7 @@ py_library(
         "//tensorflow/contrib/losses:losses_py",
         "//tensorflow/contrib/memory_stats:memory_stats_py",
         "//tensorflow/contrib/metrics:metrics_py",
+        "//tensorflow/contrib/nccl:nccl_py",
         "//tensorflow/contrib/ndlstm",
         "//tensorflow/contrib/nn:nn_py",
         "//tensorflow/contrib/opt:opt_py",
@@ -65,9 +64,7 @@ py_library(
         "//tensorflow/contrib/tfprof",
         "//tensorflow/contrib/training:training_py",
         "//tensorflow/contrib/util:util_py",
-    ] + if_not_windows([
-        "//tensorflow/contrib/nccl:nccl_py",
-    ]),
+    ],
 )
 
 cc_library(
diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py
index d4ddd1cf6a..9b703cf090 100644
--- a/tensorflow/contrib/__init__.py
+++ b/tensorflow/contrib/__init__.py
@@ -45,6 +45,7 @@ from tensorflow.contrib import lookup
 from tensorflow.contrib import losses
 from tensorflow.contrib import memory_stats
 from tensorflow.contrib import metrics
+from tensorflow.contrib import nccl
 from tensorflow.contrib import nn
 from tensorflow.contrib import opt
 from tensorflow.contrib import quantization
diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index 33384eed48..0663ba1637 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -37,6 +37,9 @@ if(tensorflow_BUILD_CONTRIB_KERNELS)
       "${tensorflow_source_dir}/tensorflow/contrib/layers/kernels/sparse_feature_cross_kernel.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/bucketization_op.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/sparse_feature_cross_op.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_manager.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_ops.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/ops/nccl_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/blas_gemm.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/gru_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/lstm_ops.cc"
diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index 4e30005629..126ef6c00c 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -58,6 +58,7 @@ GENERATE_CONTRIB_OP_LIBRARY(image "${tensorflow_source_dir}/tensorflow/contrib/i
 GENERATE_CONTRIB_OP_LIBRARY(layers_bucketization "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/bucketization_op.cc")
 GENERATE_CONTRIB_OP_LIBRARY(layers_sparse_feature_cross "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/sparse_feature_cross_op.cc")
 GENERATE_CONTRIB_OP_LIBRARY(memory_stats "${tensorflow_source_dir}/tensorflow/contrib/memory_stats/ops/memory_stats_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(nccl "${tensorflow_source_dir}/tensorflow/contrib/nccl/ops/nccl_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(rnn_gru "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/gru_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(rnn_lstm "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/lstm_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(tensor_forest "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/ops/tensor_forest_ops.cc")
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 02038da7f8..37bdcec086 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -405,6 +405,11 @@ add_python_module("tensorflow/contrib/ndlstm/python")
 add_python_module("tensorflow/contrib/nn")
 add_python_module("tensorflow/contrib/nn/python")
 add_python_module("tensorflow/contrib/nn/python/ops")
+add_python_module("tensorflow/contrib/nccl")
+add_python_module("tensorflow/contrib/nccl/kernels")
+add_python_module("tensorflow/contrib/nccl/ops")
+add_python_module("tensorflow/contrib/nccl/python")
+add_python_module("tensorflow/contrib/nccl/python/ops")
 add_python_module("tensorflow/contrib/opt")
 add_python_module("tensorflow/contrib/opt/python")
 add_python_module("tensorflow/contrib/opt/python/training")
@@ -599,6 +604,8 @@ GENERATE_PYTHON_OP_LIB("contrib_layers_sparse_feature_cross_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/layers/ops/gen_sparse_feature_cross_op.py)
 GENERATE_PYTHON_OP_LIB("contrib_memory_stats_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/memory_stats/ops/gen_memory_stats_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_nccl_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/nccl/ops/gen_nccl_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_rnn_gru_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/rnn/ops/gen_gru_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_rnn_lstm_ops"
diff --git a/tensorflow/contrib/nccl/__init__.py b/tensorflow/contrib/nccl/__init__.py
index 0275ed6079..d851c522c0 100644
--- a/tensorflow/contrib/nccl/__init__.py
+++ b/tensorflow/contrib/nccl/__init__.py
@@ -12,13 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Ops for nccl AllReduce."""
+"""Functions for using NVIDIA nccl collective ops.
+
+@@all_max
+@@all_min
+@@all_prod
+@@all_sum
+@@broadcast
+
+"""
 
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-# go/tf-wildcard-import
-# pylint: disable=wildcard-import
-from tensorflow.contrib.nccl.python.ops.nccl_ops import *
-# pylint: enable=wildcard-import
+from tensorflow.contrib.nccl.python.ops.nccl_ops import all_max
+from tensorflow.contrib.nccl.python.ops.nccl_ops import all_min
+from tensorflow.contrib.nccl.python.ops.nccl_ops import all_prod
+from tensorflow.contrib.nccl.python.ops.nccl_ops import all_sum
+from tensorflow.contrib.nccl.python.ops.nccl_ops import broadcast
+
+from tensorflow.python.util.all_util import remove_undocumented
+remove_undocumented(__name__)
diff --git a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
index b428bebc6f..a08a3c2874 100755
--- a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
+++ b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
@@ -31,15 +31,6 @@ if [ ! -e "WORKSPACE" ]; then
   exit 1
 fi
 
-#### BEGIN HACKS TO BE RESOLVED WITH NEWER BAZEL VERSIONS ####
-# Disable nccl.
-# This can be removed once we switch to a bazel release that includes
-# https://github.com/bazelbuild/bazel/commit/8e0991cb19eadfcb651cd6987255d5f7c0a58e0a
-# (the fix for https://github.com/bazelbuild/bazel/issues/2494).
-# Most likley bazel 0.4.5 will contain that.
-sed -i -e "s/\"@nccl_archive/#\"@nccl_archive/"  ./tensorflow/contrib/nccl/BUILD
-sed -i -e "s/\"@nccl_archive/#\"@nccl_archive/"  ./tensorflow/tools/pip_package/BUILD
-
 # Enable JNI support for Windows in Bazel.
 # This can be removed once
 # https://github.com/bazelbuild/bazel/pull/2599
@@ -66,7 +57,7 @@ bazel build -c opt ${BUILD_OPTS} \
   tensorflow/tools/lib_package:jnilicenses_generate
 
 # Revert the hacks above
-git checkout ./tensorflow/contrib/nccl/BUILD ./tensorflow/tools/pip_package/BUILD
+git checkout ./tensorflow/tools/pip_package/BUILD
 git checkout ./tensorflow/java/src/main/native/BUILD
 rm -f ./tensorflow/java/src/main/native/windows_jni_md.h
 
-- 
GitLab


From 7b735b0a333a029e23feb0fbfe1197a8f670f68e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 11:40:47 -0800
Subject: [PATCH 0032/1563] Adding bazel clean prior to running tests in
 run_pip.sh Change: 151855524

---
 tensorflow/tools/ci_build/builds/run_pip_tests.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/tools/ci_build/builds/run_pip_tests.sh b/tensorflow/tools/ci_build/builds/run_pip_tests.sh
index 10bed0b786..553e9652a2 100755
--- a/tensorflow/tools/ci_build/builds/run_pip_tests.sh
+++ b/tensorflow/tools/ci_build/builds/run_pip_tests.sh
@@ -86,6 +86,9 @@ BAZEL_TEST_TARGETS="//${PIP_TEST_PREFIX}/tensorflow/contrib/... \
   //${PIP_TEST_PREFIX}/tensorflow/python/... \
   //${PIP_TEST_PREFIX}/tensorflow/tensorboard/..."
 
+# Clean the bazel cache
+bazel clean
+
 # Run configure again, we might be using a different python path, due to
 # virtualenv.
 export TF_NEED_GCP=0
-- 
GitLab


From 12f399830eeaa40d2623d08dfa4ff8c1f3499f80 Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Fri, 31 Mar 2017 12:20:53 -0700
Subject: [PATCH 0033/1563] Add bazel clean back info the configure script for
 1.1 release.

---
 configure | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure b/configure
index 081db20d75..470f3ba9d9 100755
--- a/configure
+++ b/configure
@@ -39,6 +39,10 @@ function is_windows() {
 }
 
 function bazel_clean_and_fetch() {
+  if ! is_windows; then
+    bazel clean --expunge
+  fi
+
   if [ -z "$TF_BAZEL_TARGETS" ]; then
     bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
   else
-- 
GitLab


From d922630aaf1f603af552cb468fd7fef9cec44d64 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 12:05:11 -0800
Subject: [PATCH 0034/1563] Fix inequalities in Estimator.train(). Change:
 151858259

---
 tensorflow/python/estimator/estimator.py      |  6 +++---
 tensorflow/python/estimator/estimator_test.py | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 85f8b24c9f..9891ae4eaf 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -198,10 +198,10 @@ class Estimator(object):
     if (steps is not None) and (max_steps is not None):
       raise ValueError('Can not provide both steps and max_steps.')
     if steps is not None and steps <= 0:
-      raise ValueError('Must specify steps >= 0, given: {}'.format(steps))
+      raise ValueError('Must specify steps > 0, given: {}'.format(steps))
     if max_steps is not None and max_steps <= 0:
       raise ValueError(
-          'Must specify max_steps >= 0, given: {}'.format(max_steps))
+          'Must specify max_steps > 0, given: {}'.format(max_steps))
 
     if max_steps is not None:
       start_step = _load_global_step_from_checkpoint_dir(self._model_dir)
@@ -256,7 +256,7 @@ class Estimator(object):
     hooks = _check_hooks_type(hooks)
     if steps is not None:
       if steps <= 0:
-        raise ValueError('Must specify steps >= 0, given: {}'.format(steps))
+        raise ValueError('Must specify steps > 0, given: {}'.format(steps))
       hooks.append(evaluation._StopAfterNEvalsHook(  # pylint: disable=protected-access
           num_evals=steps))
 
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 2c9636f797..398ff20b6b 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -239,25 +239,25 @@ class EstimatorTrainTest(test.TestCase):
   def test_steps0_raises_error(self):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
-    with self.assertRaisesRegexp(ValueError, 'Must specify steps >= 0'):
+    with self.assertRaisesRegexp(ValueError, 'Must specify steps > 0'):
       est.train(dummy_input_fn, steps=0)
 
   def test_steps_negative_raises_error(self):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
-    with self.assertRaisesRegexp(ValueError, 'Must specify steps >= 0'):
+    with self.assertRaisesRegexp(ValueError, 'Must specify steps > 0'):
       est.train(dummy_input_fn, steps=-1)
 
   def test_max_steps0_raises_error(self):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
-    with self.assertRaisesRegexp(ValueError, 'Must specify max_steps >= 0'):
+    with self.assertRaisesRegexp(ValueError, 'Must specify max_steps > 0'):
       est.train(dummy_input_fn, max_steps=0)
 
   def test_max_steps_negative_raises_error(self):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
-    with self.assertRaisesRegexp(ValueError, 'Must specify max_steps >= 0'):
+    with self.assertRaisesRegexp(ValueError, 'Must specify max_steps > 0'):
       est.train(dummy_input_fn, max_steps=-1)
 
   def test_scaffold_is_used(self):
@@ -475,14 +475,14 @@ class EstimatorEvaluateTest(test.TestCase):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
     est.train(dummy_input_fn, steps=5)
-    with self.assertRaisesRegexp(ValueError, 'Must specify steps >= 0'):
+    with self.assertRaisesRegexp(ValueError, 'Must specify steps > 0'):
       est.evaluate(dummy_input_fn, steps=0)
 
   def test_steps_negative_raises_error(self):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
     est.train(dummy_input_fn, steps=5)
-    with self.assertRaisesRegexp(ValueError, 'Must specify steps >= 0'):
+    with self.assertRaisesRegexp(ValueError, 'Must specify steps > 0'):
       est.evaluate(dummy_input_fn, steps=-1)
 
   def test_global_step_metric_raises_error(self):
-- 
GitLab


From 8eae27dc1d27f6d03cec1245650bb284167dd0f6 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Fri, 31 Mar 2017 12:26:16 -0800
Subject: [PATCH 0035/1563] Remove old doc generator. Change: 151860614

---
 tensorflow/python/BUILD                       |   33 -
 tensorflow/python/framework/docs.py           |  647 -----
 .../python/framework/gen_docs_combined.py     |  332 ---
 tensorflow/tools/docs/BUILD                   |   39 -
 tensorflow/tools/docs/gen_cc_md.py            |  314 ---
 tensorflow/tools/docs/gen_docs.sh             |   50 -
 tensorflow/tools/docs/gen_docs_test.sh        |   41 -
 tensorflow/tools/docs/tf-doxy_for_md-config   | 2280 -----------------
 8 files changed, 3736 deletions(-)
 delete mode 100644 tensorflow/python/framework/docs.py
 delete mode 100644 tensorflow/python/framework/gen_docs_combined.py
 delete mode 100644 tensorflow/tools/docs/gen_cc_md.py
 delete mode 100755 tensorflow/tools/docs/gen_docs.sh
 delete mode 100755 tensorflow/tools/docs/gen_docs_test.sh
 delete mode 100644 tensorflow/tools/docs/tf-doxy_for_md-config

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 9db763ce78..4f7d259045 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -3307,39 +3307,6 @@ py_test(
     ],
 )
 
-py_library(
-    name = "docs",
-    srcs = ["framework/docs.py"],
-    srcs_version = "PY2AND3",
-)
-
-py_library(
-    name = "gen_docs_combined_lib",
-    srcs = ["framework/gen_docs_combined.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":docs",
-        "//tensorflow:tensorflow_py",
-        "//tensorflow/contrib/ffmpeg:ffmpeg_ops_py",
-        "//tensorflow/python/debug:debug_py",
-    ],
-)
-
-py_binary(
-    name = "gen_docs_combined",
-    srcs = ["framework/gen_docs_combined.py"],
-    main = "framework/gen_docs_combined.py",
-    srcs_version = "PY2AND3",
-    deps = [
-        ":client",
-        ":docs",
-        ":framework",
-        ":framework_for_generated_wrappers",
-        "//tensorflow:tensorflow_py",
-        "//tensorflow/python/debug:debug_py",
-    ],
-)
-
 # -----------------------------------------------------------------------------
 # Quantization
 
diff --git a/tensorflow/python/framework/docs.py b/tensorflow/python/framework/docs.py
deleted file mode 100644
index 4ae0046117..0000000000
--- a/tensorflow/python/framework/docs.py
+++ /dev/null
@@ -1,647 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-"""Updates generated docs from Python doc comments.
-
-Updates the documentation files.
-"""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import functools
-import inspect
-import os
-import re
-
-
-_arg_re = re.compile(" *([*]{0,2}[a-zA-Z][a-zA-Z0-9_]*):")
-_section_re = re.compile("([A-Z][a-zA-Z ]*):$")
-_always_drop_symbol_re = re.compile("_[_a-zA-Z0-9]")
-_anchor_re = re.compile(r"^[\w.]+$")
-_member_mark = "@@"
-_indiv_dir = "functions_and_classes"
-_num_subdirs = 10
-_subdir_prefix = "shard"
-
-
-class Document(object):
-  """Base class for an automatically generated document."""
-
-  def write_markdown_to_file(self, f):
-    """Writes a Markdown-formatted version of this document to file `f`.
-
-    Args:
-      f: The output file.
-    """
-    raise NotImplementedError("Document.WriteToFile")
-
-
-class Index(Document):
-  """An automatically generated index for a collection of documents."""
-
-  def __init__(self, module_to_name, members, filename_to_library_map,
-               path_prefix):
-    """Creates a new Index.
-
-    Args:
-      module_to_name: Dictionary mapping modules to short names.
-      members: Dictionary mapping member name to (fullname, member).
-      filename_to_library_map: A list of (filename, Library) pairs. The order
-        corresponds to the order in which the libraries appear in the index.
-      path_prefix: Prefix to add to links in the index.
-    """
-    self._module_to_name = module_to_name
-    self._members = members
-    self._filename_to_library_map = filename_to_library_map
-    self._path_prefix = path_prefix
-
-  def write_markdown_to_file(self, f):
-    """Writes this index to file `f`.
-
-    The output is formatted as an unordered list. Each list element
-    contains the title of the library, followed by a list of symbols
-    in that library hyperlinked to the corresponding anchor in that
-    library.
-
-    Args:
-      f: The output file.
-    """
-    print("<!-- This file is machine generated: DO NOT EDIT! -->", file=f)
-    print("", file=f)
-    print("# TensorFlow Python reference documentation", file=f)
-    print("", file=f)
-    fullname_f = lambda name: self._members[name][0]
-    anchor_f = lambda name: get_anchor(self._module_to_name, fullname_f(name))
-
-    for filename, library in self._filename_to_library_map:
-      sorted_names = sorted(library.mentioned, key=lambda x: (str.lower(x), x))
-      member_names = [n for n in sorted_names if n in self._members]
-      # TODO(wicke): This is a hack that should be removed as soon as the
-      # website code allows it.
-      full_filename = self._path_prefix + filename
-      links = ["[`%s`](%s#%s)" % (name, full_filename, anchor_f(name))
-               for name in member_names]
-      if links:
-        print("* **[%s](%s)**:" % (library.title, full_filename), file=f)
-        for link in links:
-          print("  * %s" % link, file=f)
-        print("", file=f)
-
-
-def collect_members(module_to_name, exclude=()):
-  """Collect all symbols from a list of modules.
-
-  Args:
-    module_to_name: Dictionary mapping modules to short names.
-    exclude: Set of fully qualified names to exclude.
-
-  Returns:
-    Dictionary mapping name to (fullname, member) pairs.
-
-  Raises:
-    RuntimeError: if we can not resolve a name collision.
-  """
-  members = {}
-  for module, module_name in module_to_name.items():
-    all_names = getattr(module, "__all__", None)
-    for name, member in inspect.getmembers(module):
-      if ((inspect.isfunction(member)
-           or inspect.isclass(member)
-           or isinstance(member, functools.partial))
-          and not _always_drop_symbol_re.match(name) and
-          (all_names is None or name in all_names)):
-        fullname = "%s.%s" % (module_name, name)
-        if fullname in exclude:
-          continue
-        if name in members:
-          other_fullname, other_member = members[name]
-          if member is not other_member:
-            raise RuntimeError("Short name collision between %s and %s" %
-                               (fullname, other_fullname))
-          if len(fullname) == len(other_fullname):
-            raise RuntimeError("Can't decide whether to use %s or %s for %s: "
-                               "both full names have length %d" %
-                               (fullname, other_fullname, name, len(fullname)))
-          if len(fullname) > len(other_fullname):
-            continue  # Use the shorter full name
-        members[name] = fullname, member
-  return members
-
-
-def get_anchor(module_to_name, fullname):
-  """Turn a full member name into an anchor.
-
-  Args:
-    module_to_name: Dictionary mapping modules to short names.
-    fullname: Fully qualified name of symbol.
-
-  Returns:
-    HTML anchor string.  The longest module name prefix of fullname is
-    removed to make the anchor.
-
-  Raises:
-    ValueError: If fullname uses characters invalid in an anchor.
-  """
-  if not _anchor_re.match(fullname):
-    raise ValueError("'%s' is not a valid anchor" % fullname)
-  anchor = fullname
-  for module_name in module_to_name.values():
-    if fullname.startswith(module_name + "."):
-      rest = fullname[len(module_name)+1:]
-      # Use this prefix iff it is longer than any found before
-      if len(anchor) > len(rest):
-        anchor = rest
-  return anchor
-
-
-def _stable_hash(s):
-  """A simple string hash that won't change from run to run."""
-  ret = 0
-  for c in s:
-    ret = ret * 97 + ord(c)
-  return ret
-
-
-class Library(Document):
-  """An automatically generated document for a set of functions and classes."""
-
-  def __init__(self,
-               title,
-               module,
-               module_to_name,
-               members,
-               documented,
-               exclude_symbols=(),
-               prefix=None):
-    """Creates a new Library.
-
-    Args:
-      title: A human-readable title for the library.
-      module: Module to pull high level docstring from (for table of contents,
-        list of Ops to document, etc.).
-      module_to_name: Dictionary mapping modules to short names.
-      members: Dictionary mapping member name to (fullname, member).
-      documented: Set of documented names to update.
-      exclude_symbols: A list of specific symbols to exclude.
-      prefix: A string to include at the beginning of the page.
-    """
-    self._title = title
-    self._module = module
-    self._module_to_name = module_to_name
-    self._members = dict(members)  # Copy since we mutate it below
-    self._exclude_symbols = frozenset(exclude_symbols)
-    documented.update(exclude_symbols)
-    self._documented = documented
-    self._mentioned = set()
-    self._prefix = prefix or ""
-
-  @property
-  def title(self):
-    """The human-readable title for this library."""
-    return self._title
-
-  @property
-  def mentioned(self):
-    """Set of names mentioned in this library."""
-    return self._mentioned
-
-  @property
-  def exclude_symbols(self):
-    """Set of excluded symbols."""
-    return self._exclude_symbols
-
-  def _should_include_member(self, name):
-    """Returns True if this member should be included in the document."""
-    # __x__ should be documented always
-    name_is_operator = name.startswith("__") and name.endswith("__")
-    name_is_private = name.startswith("_") and not name_is_operator
-    name_is_excluded = name in self._exclude_symbols
-    return not (name_is_private or name_is_excluded)
-
-  def get_imported_modules(self, module):
-    """Returns the list of modules imported from `module`."""
-    for name, member in inspect.getmembers(module):
-      if inspect.ismodule(member):
-        yield name, member
-
-  def get_class_members(self, cls_name, cls):
-    """Returns the list of class members to document in `cls`.
-
-    This function filters the class member to ONLY return those
-    defined by the class.  It drops the inherited ones.
-
-    Args:
-      cls_name: Qualified name of `cls`.
-      cls: An inspect object of type 'class'.
-
-    Yields:
-      name, member tuples.
-    """
-    for name, member in inspect.getmembers(cls):
-      # Only show methods and properties presently.  In Python 3,
-      # methods register as isfunction.
-      is_method = (inspect.ismethod(member) or inspect.isfunction(member)
-                   or isinstance(member, functools.partial))
-      if not (is_method or isinstance(member, property)):
-        continue
-      if self._should_include_member(name):
-        yield name, ("%s.%s" % (cls_name, name), member)
-
-  def shard_dir(self, name):
-    """Returns the path of the doc subdirectory for member `name`.
-
-    When generating individual files for each function and class, we shard
-    the files across several directories to avoid hitting the limit for
-    files per directory. This function determines the subdirectory for
-    a member based on a stable hash of its name.
-
-    Args:
-      name: string. The name of a function or class.
-
-    Returns:
-      The path to a subdirectory of the api docs directory.
-    """
-    index = _stable_hash(name) % _num_subdirs
-    return os.path.join(self.functions_and_classes_dir,
-                        _subdir_prefix + str(index))
-
-  def set_functions_and_classes_dir(self, dirname):
-    """Sets the name of the directory for function and class markdown files.
-
-    Args:
-      dirname: string. The name of the directory in which to store function
-        and class markdown files.
-    """
-    self.functions_and_classes_dir = dirname
-
-  def _generate_signature_for_function(self, func):
-    """Given a function, returns a string representing its args."""
-    args_list = []
-    if isinstance(func, functools.partial):
-      argspec = inspect.getargspec(func.func)
-      # Remove the args from the original function that have been used up.
-      first_default_arg = (
-          len(argspec.args or []) - len(argspec.defaults or []))
-      partial_args = len(func.args)
-      if argspec.args:
-        argspec_args = list(argspec.args[partial_args:])
-      else:
-        argspec_args = []
-      if argspec.defaults:
-        argspec_defaults = list(argspec.defaults[
-            max(0, partial_args-first_default_arg):])
-      else:
-        argspec_defaults = []
-      first_default_arg = max(0, first_default_arg - partial_args)
-      for kwarg in func.keywords:
-        if kwarg in argspec_args:
-          i = argspec_args.index(kwarg)
-          argspec_args.pop(i)
-          if i >= first_default_arg:
-            argspec_defaults.pop(i-first_default_arg)
-          else:
-            first_default_arg -= 1
-      argspec_varargs = None
-      argspec_keywords = None
-
-    else:
-      argspec = inspect.getargspec(func)
-      argspec_args = argspec.args
-      argspec_defaults = argspec.defaults
-      argspec_varargs = argspec.varargs
-      argspec_keywords = argspec.keywords
-
-    first_arg_with_default = (
-        len(argspec_args or []) - len(argspec_defaults or []))
-    for arg in argspec_args[:first_arg_with_default]:
-      if arg == "self":
-        # Python documentation typically skips `self` when printing method
-        # signatures.
-        continue
-      args_list.append(arg)
-
-    # TODO(mrry): This is a workaround for documenting signature of
-    # functions that have the @contextlib.contextmanager decorator.
-    # TODO(aselle): This workaround is brittle on TestCase.__call__
-    #  so we need to wrap this in a try/catch
-    # We should do something better.
-    if argspec_varargs == "args" and argspec_keywords == "kwds":
-      try:
-        original_func = func.__closure__[0].cell_contents
-        return self._generate_signature_for_function(original_func)
-      except TypeError:
-        pass
-
-    if argspec_defaults:
-      for arg, default in zip(
-          argspec_args[first_arg_with_default:], argspec_defaults):
-        if callable(default):
-          if hasattr(default, "__name__"):
-            args_list.append("%s=%s" % (arg, default.__name__))
-          else:
-            # A callable may be a class instance.
-            # TODO(fchollet): handle case with non-default constructor
-            # arguments (currently not present in the TF codebase).
-            args_list.append("%s=%s()" % (arg, default.__class__.__name__))
-        else:
-          args_list.append("%s=%r" % (arg, default))
-    if argspec_varargs:
-      args_list.append("*" + argspec_varargs)
-    if argspec_keywords:
-      args_list.append("**" + argspec_keywords)
-    return "(" + ", ".join(args_list) + ")"
-
-  def _remove_docstring_indent(self, docstring):
-    """Remove indenting.
-
-    We follow Python's convention and remove the minimum indent of the lines
-    after the first, see:
-    https://www.python.org/dev/peps/pep-0257/#handling-docstring-indentation
-    preserving relative indentation.
-
-    Args:
-      docstring: A docstring.
-
-    Returns:
-      A list of strings, one per line, with the minimum indent stripped.
-    """
-    docstring = docstring or ""
-    lines = docstring.strip().split("\n")
-
-    min_indent = len(docstring)
-    for l in lines[1:]:
-      l = l.rstrip()
-      if l:
-        i = 0
-        while i < len(l) and l[i] == " ":
-          i += 1
-        if i < min_indent: min_indent = i
-    for i in range(1, len(lines)):
-      l = lines[i].rstrip()
-      if len(l) >= min_indent:
-        l = l[min_indent:]
-      lines[i] = l
-    return lines
-
-  def _print_formatted_docstring(self, docstring, f):
-    """Formats the given `docstring` as Markdown and prints it to `f`."""
-    lines = self._remove_docstring_indent(docstring)
-
-    # Output the lines, identifying "Args" and other section blocks.
-    i = 0
-
-    def _at_start_of_section():
-      """Returns the header if lines[i] is at start of a docstring section."""
-      l = lines[i]
-      match = _section_re.match(l)
-      if match and i + 1 < len(
-          lines) and lines[i + 1].startswith(" "):
-        return match.group(1)
-      else:
-        return None
-
-    while i < len(lines):
-      l = lines[i]
-
-      section_header = _at_start_of_section()
-      if section_header:
-        if i == 0 or lines[i-1]:
-          print("", file=f)
-        # Use at least H4 to keep these out of the TOC.
-        print("##### " + section_header + ":", file=f)
-        print("", file=f)
-        i += 1
-        outputting_list = False
-        while i < len(lines):
-          l = lines[i]
-          # A new section header terminates the section.
-          if _at_start_of_section():
-            break
-          match = _arg_re.match(l)
-          if match:
-            if not outputting_list:
-              # We need to start a list. In Markdown, a blank line needs to
-              # precede a list.
-              print("", file=f)
-              outputting_list = True
-            suffix = l[len(match.group()):].lstrip()
-            print("*  <b>`" + match.group(1) + "`</b>: " + suffix, file=f)
-          else:
-            # For lines that don't start with _arg_re, continue the list if it
-            # has enough indentation.
-            outputting_list &= l.startswith("   ")
-            print(l, file=f)
-          i += 1
-      else:
-        print(l, file=f)
-        i += 1
-
-  def _print_function(self, f, prefix, fullname, func):
-    """Prints the given function to `f`."""
-    heading = prefix + " `" + fullname
-    if not isinstance(func, property):
-      heading += self._generate_signature_for_function(func)
-    heading += "` {#%s}" % get_anchor(self._module_to_name, fullname)
-    print(heading, file=f)
-    print("", file=f)
-    self._print_formatted_docstring(inspect.getdoc(func), f)
-    print("", file=f)
-
-  def _write_member_markdown_to_file(self, f, prefix, name, member):
-    """Print `member` to `f`."""
-    if (inspect.isfunction(member) or inspect.ismethod(member)
-        or (isinstance(member, functools.partial)
-            and inspect.isfunction(member.func))
-        or isinstance(member, property)):
-      print("- - -", file=f)
-      print("", file=f)
-      self._print_function(f, prefix, name, member)
-      print("", file=f)
-
-      # Write an individual file for each function.
-      if inspect.isfunction(member):
-        indivf = open(
-            os.path.join(self.shard_dir(name), name + ".md"), "w+")
-        self._print_function(indivf, prefix, name, member)
-    elif (inspect.isclass(member)
-          or (isinstance(member, functools.partial)
-              and inspect.isclass(member.func))):
-      print("- - -", file=f)
-      print("", file=f)
-      print("%s `class %s` {#%s}" % (prefix, name,
-                                     get_anchor(self._module_to_name, name)),
-            file=f)
-      print("", file=f)
-      self._write_class_markdown_to_file(f, name, member)
-      print("", file=f)
-
-      # Write an individual file for each class.
-      indivf = open(
-          os.path.join(self.shard_dir(name), name + ".md"), "w+")
-      self._write_class_markdown_to_file(indivf, name, member)
-    else:
-      raise RuntimeError("Member %s has unknown type %s" % (name, type(member)))
-
-  def _write_docstring_markdown_to_file(self, f, prefix, docstring, members,
-                                        imports):
-    for l in self._remove_docstring_indent(docstring):
-      if l.startswith(_member_mark):
-        name = l[len(_member_mark):].strip(" \t")
-        if name in members:
-          self._documented.add(name)
-          self._mentioned.add(name)
-          self._write_member_markdown_to_file(f, prefix, *members[name])
-          del members[name]
-        elif name in imports:
-          self._write_module_markdown_to_file(f, imports[name])
-        else:
-          raise ValueError("%s: unknown member `%s`, markdown=`%s`." % (
-              self._title, name, l))
-      else:
-        print(l, file=f)
-
-  def _write_class_markdown_to_file(self, f, name, cls):
-    """Write the class doc to `f`.
-
-    Args:
-      f: File to write to.
-      name: name to use.
-      cls: class object.
-    """
-    # Build the list of class methods to document.
-    methods = dict(self.get_class_members(name, cls))
-    # Used later to check if any methods were called out in the class
-    # docstring.
-    num_methods = len(methods)
-    try:
-      self._write_docstring_markdown_to_file(f, "####", inspect.getdoc(cls),
-                                             methods, {})
-    except ValueError as e:
-      raise ValueError(str(e) + " in class `%s`" % cls.__name__)
-
-    # If some methods were not described, describe them now if they are
-    # defined by the class itself (not inherited).  If NO methods were
-    # described, describe all methods.
-    #
-    # TODO(touts): when all methods have been categorized make it an error
-    # if some methods are not categorized.
-    any_method_called_out = (len(methods) != num_methods)
-    if any_method_called_out:
-      other_methods = {n: m for n, m in methods.items() if n in cls.__dict__}
-      if other_methods:
-        print("\n#### Other Methods", file=f)
-    else:
-      other_methods = methods
-    for name in sorted(other_methods):
-      self._write_member_markdown_to_file(f, "####", *other_methods[name])
-
-  def _write_module_markdown_to_file(self, f, module):
-    imports = dict(self.get_imported_modules(module))
-    self._write_docstring_markdown_to_file(f, "###", inspect.getdoc(module),
-                                           self._members, imports)
-
-  def write_markdown_to_file(self, f):
-    """Prints this library to file `f`.
-
-    Args:
-      f: File to write to.
-
-    Returns:
-      Dictionary of documented members.
-    """
-    print("<!-- This file is machine generated: DO NOT EDIT! -->", file=f)
-    print("", file=f)
-    # TODO(touts): Do not insert these.  Let the doc writer put them in
-    # the module docstring explicitly.
-    print("#", self._title, file=f)
-    if self._prefix:
-      print(self._prefix, file=f)
-    print("[TOC]", file=f)
-    print("", file=f)
-    if self._module is not None:
-      self._write_module_markdown_to_file(f, self._module)
-
-  def write_other_members(self, f, catch_all=False):
-    """Writes the leftover members to `f`.
-
-    Args:
-      f: File to write to.
-      catch_all: If true, document all missing symbols from any module.
-        Otherwise, document missing symbols from just this module.
-    """
-    if catch_all:
-      names = self._members.items()
-    else:
-      names = inspect.getmembers(self._module)
-      all_names = getattr(self._module, "__all__", None)
-      if all_names is not None:
-        names = [(n, m) for n, m in names if n in all_names]
-    leftovers = []
-    for name, _ in names:
-      if name in self._members and name not in self._documented:
-        leftovers.append(name)
-    if leftovers:
-      print("%s: undocumented members: %d" % (self._title, len(leftovers)))
-      print("\n## Other Functions and Classes", file=f)
-      for name in sorted(leftovers):
-        print("  %s" % name)
-        self._documented.add(name)
-        self._mentioned.add(name)
-        self._write_member_markdown_to_file(f, "###", *self._members[name])
-
-  def assert_no_leftovers(self):
-    """Generate an error if there are leftover members."""
-    leftovers = []
-    for name in self._members:
-      if name in self._members and name not in self._documented:
-        leftovers.append(name)
-    if leftovers:
-      raise RuntimeError("%s: undocumented members: %s" %
-                         (self._title, ", ".join(leftovers)))
-
-
-def write_libraries(output_dir, libraries):
-  """Write a list of libraries to disk.
-
-  Args:
-    output_dir: Output directory.
-    libraries: List of (filename, library) pairs.
-  """
-  files = [open(os.path.join(output_dir, k), "w") for k, _ in libraries]
-
-  # Set the directory in which to save individual class and function md files,
-  # creating it if it doesn't exist. Create subdirectories to avoid hitting
-  # the limit for number of files in a directory.
-  indiv_dir = os.path.join(output_dir, _indiv_dir)
-  if not os.path.exists(indiv_dir):
-    os.makedirs(indiv_dir)
-
-  for i in range(0, _num_subdirs):
-    subdir = os.path.join(indiv_dir, _subdir_prefix + str(i))
-    if not os.path.exists(subdir):
-      os.makedirs(subdir)
-
-  # Document mentioned symbols for all libraries
-  for f, (_, v) in zip(files, libraries):
-    v.set_functions_and_classes_dir(indiv_dir)
-    v.write_markdown_to_file(f)
-  # Document symbols that no library mentioned.  We do this after writing
-  # out all libraries so that earlier libraries know what later libraries
-  # documented.
-  for f, (_, v) in zip(files, libraries):
-    v.write_other_members(f)
-    f.close()
diff --git a/tensorflow/python/framework/gen_docs_combined.py b/tensorflow/python/framework/gen_docs_combined.py
deleted file mode 100644
index 65379dda20..0000000000
--- a/tensorflow/python/framework/gen_docs_combined.py
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-"""Updates generated docs from Python doc comments."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import argparse
-import collections
-import os.path
-import sys
-
-import tensorflow as tf
-
-from tensorflow.contrib import ffmpeg
-from tensorflow.python import debug as tf_debug
-from tensorflow.python.client import client_lib
-from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import docs
-from tensorflow.python.framework import framework_lib
-
-FLAGS = None
-
-
-PREFIX_TEXT = """
-Note: Functions taking `Tensor` arguments can also take anything accepted by
-@{tf.convert_to_tensor}.
-"""
-
-
-def module_names():
-  return [
-      "tf",
-      "tf.errors",
-      "tf.image",
-      "tf.nn",
-      "tf.train",
-      "tf.python_io",
-      "tf.saved_model",
-      "tf.summary",
-      "tf.test",
-      "tf.contrib.bayesflow.entropy",
-      "tf.contrib.bayesflow.monte_carlo",
-      "tf.contrib.bayesflow.stochastic_graph",
-      "tf.contrib.bayesflow.stochastic_tensor",
-      "tf.contrib.bayesflow.variational_inference",
-      "tf.contrib.copy_graph",
-      "tf.contrib.crf",
-      "tf.contrib.distributions",
-      "tf.contrib.distributions.bijector",
-      "tf.contrib.ffmpeg",
-      "tf.contrib.framework",
-      "tf.contrib.graph_editor",
-      "tf.contrib.integrate",
-      "tf.contrib.layers",
-      "tf.contrib.learn",
-      "tf.contrib.learn.monitors",
-      "tf.contrib.legacy_seq2seq",
-      "tf.contrib.linalg",
-      "tf.contrib.losses",
-      "tf.contrib.metrics",
-      "tf.contrib.opt",
-      "tf.contrib.rnn",
-      "tf.contrib.solvers",
-      "tf.contrib.training",
-      "tf.contrib.util",
-      "tf_debug",
-  ]
-
-
-def find_module(base_module, name):
-  if name == "tf":
-    return base_module
-  # Special case for ffmpeg is needed since it's not linked in by default due
-  # to size concerns.
-  elif name == "tf.contrib.ffmpeg":
-    return ffmpeg
-  elif name == "tf_debug":
-    return tf_debug
-  elif name.startswith("tf."):
-    subname = name[3:]
-    subnames = subname.split(".")
-    parent_module = base_module
-    for s in subnames:
-      if not hasattr(parent_module, s):
-        raise ValueError(
-            "Module not found: {}. Submodule {} not found in parent module {}."
-            " Possible candidates are {}".format(
-                name, s, parent_module.__name__, dir(parent_module)))
-      parent_module = getattr(parent_module, s)
-    return parent_module
-  else:
-    raise ValueError(
-        "Invalid module name: {}. Module names must start with 'tf.'".format(
-            name))
-
-
-def get_module_to_name(names):
-  return collections.OrderedDict([(find_module(tf, x), x) for x in names])
-
-
-def all_libraries(module_to_name, members, documented):
-  """Make a list of the individual files that we want to create.
-
-  Args:
-    module_to_name: Dictionary mapping modules to short names.
-    members: Dictionary mapping member name to (fullname, member).
-    documented: Set of documented names to update.
-
-  Returns:
-    List of (filename, docs.Library) pairs.
-  """
-  def library(name, title, module=None, **args):
-    if module is None:
-      module = sys.modules["tensorflow.python.ops." + name]
-    return (name + ".md", docs.Library(title=title,
-                                       module_to_name=module_to_name,
-                                       members=members,
-                                       documented=documented,
-                                       module=module,
-                                       **args))
-  return collections.OrderedDict([
-      # Splits of module 'tf'.
-      library("framework", "Building Graphs", framework_lib),
-      library("check_ops", "Asserts and boolean checks."),
-      library("constant_op", "Constants, Sequences, and Random Values",
-              constant_op, prefix=PREFIX_TEXT),
-      library("state_ops",
-              "Variables",
-              exclude_symbols=["create_partitioned_variables"],
-              prefix=PREFIX_TEXT),
-      library("array_ops",
-              "Tensor Transformations",
-              exclude_symbols=["list_diff"],
-              prefix=PREFIX_TEXT),
-      library("math_ops",
-              "Math",
-              exclude_symbols=["sparse_matmul", "arg_min", "arg_max",
-                               "lin_space", "sparse_segment_mean_grad"],
-              prefix=PREFIX_TEXT),
-      library("string_ops", "Strings",
-              prefix=PREFIX_TEXT),
-      library("histogram_ops", "Histograms"),
-      library("control_flow_ops", "Control Flow", prefix=PREFIX_TEXT),
-      library("functional_ops", "Higher Order Functions", prefix=PREFIX_TEXT),
-      library("tensor_array_ops", "TensorArray Operations", prefix=PREFIX_TEXT),
-      library("session_ops", "Tensor Handle Operations", prefix=PREFIX_TEXT),
-      library("image", "Images", tf.image, exclude_symbols=["ResizeMethod"],
-              prefix=PREFIX_TEXT),
-      library("sparse_ops",
-              "Sparse Tensors",
-              exclude_symbols=["serialize_sparse", "serialize_many_sparse",
-                               "deserialize_many_sparse"],
-              prefix=PREFIX_TEXT),
-      library("io_ops",
-              "Inputs and Readers",
-              exclude_symbols=["LookupTableBase", "HashTable",
-                               "initialize_all_tables",
-                               "tables_initializer",
-                               "parse_single_sequence_example",
-                               "string_to_hash_bucket"],
-              prefix=PREFIX_TEXT),
-      library("python_io", "Data IO (Python functions)", tf.python_io),
-      library("nn",
-              "Neural Network",
-              tf.nn,
-              exclude_symbols=["conv2d_backprop_input",
-                               "conv2d_backprop_filter", "avg_pool_grad",
-                               "max_pool_grad", "max_pool_grad_with_argmax",
-                               "batch_norm_with_global_normalization_grad",
-                               "lrn_grad", "relu6_grad", "softplus_grad",
-                               "softsign_grad", "xw_plus_b", "relu_layer",
-                               "lrn", "batch_norm_with_global_normalization",
-                               "batch_norm_with_global_normalization_grad",
-                               "all_candidate_sampler", "seq2seq"],
-              prefix=PREFIX_TEXT),
-      library("client", "Running Graphs", client_lib),
-      library("train",
-              "Training",
-              tf.train,
-              exclude_symbols=["Feature", "Features", "BytesList", "FloatList",
-                               "Int64List", "Example", "InferenceExample",
-                               "FeatureList", "FeatureLists", "RankingExample",
-                               "SequenceExample"]),
-      library("script_ops",
-              "Wraps python functions",
-              prefix=PREFIX_TEXT),
-      library("summary", "Summary Operations", tf.summary),
-      library("test", "Testing", tf.test),
-      library("contrib.bayesflow.entropy",
-              "BayesFlow Entropy (contrib)",
-              tf.contrib.bayesflow.entropy),
-      library("contrib.bayesflow.monte_carlo",
-              "BayesFlow Monte Carlo (contrib)",
-              tf.contrib.bayesflow.monte_carlo),
-      library("contrib.bayesflow.stochastic_graph",
-              "BayesFlow Stochastic Graph (contrib)",
-              tf.contrib.bayesflow.stochastic_graph),
-      library("contrib.bayesflow.stochastic_tensor",
-              "BayesFlow Stochastic Tensors (contrib)",
-              tf.contrib.bayesflow.stochastic_tensor),
-      library("contrib.bayesflow.variational_inference",
-              "BayesFlow Variational Inference (contrib)",
-              tf.contrib.bayesflow.variational_inference),
-      library("contrib.crf", "CRF (contrib)", tf.contrib.crf),
-      library("contrib.distributions", "Statistical Distributions (contrib)",
-              tf.contrib.distributions),
-      library("contrib.distributions.bijector",
-              "Random variable transformations (contrib)",
-              tf.contrib.distributions.bijector),
-      library("contrib.ffmpeg", "FFmpeg (contrib)", ffmpeg),
-      library("contrib.framework", "Framework (contrib)", tf.contrib.framework),
-      library("contrib.graph_editor", "Graph Editor (contrib)",
-              tf.contrib.graph_editor),
-      library("contrib.integrate", "Integrate (contrib)", tf.contrib.integrate),
-      library("contrib.layers", "Layers (contrib)", tf.contrib.layers),
-      library("contrib.learn", "Learn (contrib)", tf.contrib.learn),
-      library("contrib.learn.monitors", "Monitors (contrib)",
-              tf.contrib.learn.monitors),
-      library("contrib.legacy_seq2seq", "Sequence to Sequence (contrib)",
-              tf.contrib.legacy_seq2seq),
-      library("contrib.linalg", "Linear Algebra (contrib)",
-              tf.contrib.linalg),
-      library("contrib.losses", "Losses (contrib)", tf.contrib.losses),
-      library("contrib.opt", "Optimization (contrib)", tf.contrib.opt),
-      library("contrib.rnn", "RNN and Cells (contrib)", tf.contrib.rnn),
-      library("contrib.metrics", "Metrics (contrib)", tf.contrib.metrics),
-      library("contrib.training", "Training (contrib)", tf.contrib.training),
-      library("contrib.util", "Utilities (contrib)", tf.contrib.util),
-      library("contrib.copy_graph", "Copying Graph Elements (contrib)",
-              tf.contrib.copy_graph),
-      library("tf_debug", "TensorFlow Debugger", tf_debug),
-  ])
-
-_hidden_symbols = ["Event", "LogMessage", "Summary", "SessionLog", "xrange",
-                   "HistogramProto", "ConfigProto", "NodeDef", "GraphDef",
-                   "GPUOptions", "GraphOptions", "RunOptions", "RunMetadata",
-                   "SessionInterface", "BaseSession", "NameAttrList",
-                   "AttrValue", "OptimizerOptions",
-                   "CollectionDef", "MetaGraphDef", "QueueRunnerDef",
-                   "SaverDef", "VariableDef", "TestCase", "GrpcServer",
-                   "ClusterDef", "JobDef", "ServerDef", "TensorInfo"]
-
-# TODO(skleinfeld, deannarubin) Address shortname
-# conflict between tf.contrib.learn.NanLossDuringTrainingError and
-# tf.contrib.learn.monitors.NanLossDuringTrainingError, arising due
-# to imports in learn/python/learn/__init__.py
-# TODO(wicke): Remove contrib.layers.relu* after shortnames are
-# disabled.  These conflict with tf.nn.relu*
-EXCLUDE = frozenset(["tf.contrib.learn.monitors.NanLossDuringTrainingError",
-                     "tf.contrib.layers.dropout",
-                     "tf.contrib.layers.bias_add",
-                     "tf.contrib.layers.conv2d",
-                     "tf.contrib.layers.conv2d_transpose",
-                     "tf.contrib.layers.separable_conv2d",
-                     "tf.contrib.layers.softmax",
-                     "tf.contrib.layers.relu", "tf.contrib.layers.relu6",
-                     "tf.contrib.framework.assert_global_step",
-                     "tf.contrib.framework.get_global_step",
-                     "tf.contrib.learn.NanLossDuringTrainingError",
-                     "tf.contrib.layers.stack",
-                     "tf.contrib.layers.ProblemType",
-                     "tf.confusion_matrix"])
-
-
-def main(unused_argv):
-  if not FLAGS.out_dir:
-    tf.logging.error("out_dir not specified")
-    return -1
-
-  # Document libraries
-  documented = set()
-  module_to_name = get_module_to_name(module_names())
-  members = docs.collect_members(module_to_name, exclude=EXCLUDE)
-  libraries = all_libraries(module_to_name, members, documented).items()
-
-  # Define catch_all library before calling write_libraries to avoid complaining
-  # about generically hidden symbols.
-  catch_all = docs.Library(title="Catch All", module=None,
-                           exclude_symbols=_hidden_symbols,
-                           module_to_name=module_to_name, members=members,
-                           documented=documented)
-
-  # Write docs to files
-  docs.write_libraries(FLAGS.out_dir, libraries)
-
-  # Make it easy to search for hidden symbols
-  if FLAGS.print_hidden_regex:
-    hidden = set(_hidden_symbols)
-    for _, lib in libraries:
-      hidden.update(lib.exclude_symbols)
-    print(r"hidden symbols regex = r'\b(%s)\b'" % "|".join(sorted(hidden)))
-
-  # Verify that all symbols are mentioned in some library doc.
-  catch_all.assert_no_leftovers()
-
-  # Generate index
-  with open(os.path.join(FLAGS.out_dir, "index.md"), "w") as f:
-    docs.Index(module_to_name, members, libraries,
-               "../../api_docs/python/").write_markdown_to_file(f)
-
-
-if __name__ == "__main__":
-  parser = argparse.ArgumentParser()
-  parser.register("type", "bool", lambda v: v.lower() == "true")
-  parser.add_argument(
-      "--out_dir",
-      type=str,
-      default=None,
-      help="Directory to which docs should be written.")
-  parser.add_argument(
-      "--print_hidden_regex",
-      type="bool",
-      nargs="?",
-      const=True,
-      default=False,
-      help="Dump a regular expression matching any hidden symbol")
-  FLAGS, unparsed = parser.parse_known_args()
-  tf.app.run(main=main, argv=[sys.argv[0]] + unparsed)
diff --git a/tensorflow/tools/docs/BUILD b/tensorflow/tools/docs/BUILD
index ed2626efab..b425e93aa1 100644
--- a/tensorflow/tools/docs/BUILD
+++ b/tensorflow/tools/docs/BUILD
@@ -11,13 +11,6 @@ package(
 
 load("//tensorflow:tensorflow.bzl", "py_test")
 
-py_binary(
-    name = "gen_cc_md",
-    srcs = ["gen_cc_md.py"],
-    srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
-)
-
 py_library(
     name = "doc_generator_visitor",
     srcs = [
@@ -134,38 +127,6 @@ py_test(
     ],
 )
 
-filegroup(
-    name = "doxy_config",
-    srcs = ["tf-doxy_for_md-config"],
-)
-
-sh_binary(
-    name = "gen_docs",
-    srcs = ["gen_docs.sh"],
-    data = [
-        ":doxy_config",
-        ":gen_cc_md",
-        "//tensorflow/python:gen_docs_combined",
-    ],
-)
-
-sh_test(
-    name = "gen_docs_test",
-    size = "small",
-    srcs = [
-        "gen_docs_test.sh",
-    ],
-    data = [
-        ":gen_docs",
-        "//tensorflow/core:all_files",
-        "//tensorflow/python:all_files",
-    ],
-    tags = [
-        "manual",
-        "notap",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/tools/docs/gen_cc_md.py b/tensorflow/tools/docs/gen_cc_md.py
deleted file mode 100644
index 931df3230b..0000000000
--- a/tensorflow/tools/docs/gen_cc_md.py
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Convert Doxygen .xml files to MarkDown (.md files)."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import argparse
-import os
-import re
-
-from BeautifulSoup import BeautifulStoneSoup
-import tensorflow as tf
-
-ANCHOR_RE = re.compile(r'\W+')
-
-PAGE_TEMPLATE = '''# `{0} {1}`
-
-{2}
-
-###Member Details
-
-{3}'''
-
-INDEX_TEMPLATE = '''# TensorFlow C++ Session API reference documentation
-
-TensorFlow's public C++ API includes only the API for executing graphs, as of
-version 0.5. To control the execution of a graph from C++:
-
-1. Build the computation graph using the [Python API](../python/).
-1. Use [`tf.train.write_graph()`](../python/train.md#write_graph) to
-write the graph to a file.
-1. Load the graph using the C++ Session API. For example:
-
-  ```c++
-  // Reads a model graph definition from disk, and creates a session object you
-  // can use to run it.
-  Status LoadGraph(string graph_file_name, Session** session) {
-    GraphDef graph_def;
-    TF_RETURN_IF_ERROR(
-        ReadBinaryProto(Env::Default(), graph_file_name, &graph_def));
-    TF_RETURN_IF_ERROR(NewSession(SessionOptions(), session));
-    TF_RETURN_IF_ERROR((*session)->Create(graph_def));
-    return Status::OK();
-  }
-```
-
-1. Run the graph with a call to `session->Run()`
-
-## Env
-
-@@Env
-@@RandomAccessFile
-@@WritableFile
-@@EnvWrapper
-
-## Session
-
-@@Session
-@@SessionOptions
-
-## Status
-
-@@Status
-@@Status::State
-
-## Tensor
-
-@@Tensor
-@@TensorShape
-@@TensorShapeDim
-@@TensorShapeUtils
-@@PartialTensorShape
-@@PartialTensorShapeUtils
-
-## Thread
-
-@@Thread
-@@ThreadOptions
-'''
-
-FLAGS = None
-
-
-def member_definition(member_elt):
-  def_text = ''
-
-  def_elt = member_elt.find('definition')
-  if def_elt:
-    def_text = def_elt.text
-
-  return def_text
-
-
-def member_sig(member_elt):
-  def_text = member_definition(member_elt)
-
-  argstring_text = ''
-  argstring = member_elt.find('argsstring')
-  if argstring:
-    argstring_text = argstring.text
-
-  sig = def_text + argstring_text
-  return sig
-
-
-def anchorize(name):
-  return ANCHOR_RE.sub('_', name)
-
-
-def element_text(member_elt, elt_name):
-  """Extract all `para` text from (`elt_name` in) `member_elt`."""
-  text = []
-  if elt_name:
-    elt = member_elt.find(elt_name)
-  else:
-    elt = member_elt
-
-  if elt:
-    paras = elt.findAll('para')
-    for p in paras:
-      text.append(p.getText(separator=u' ').strip())
-  return '\n\n'.join(text)
-
-
-def full_member_entry(member_elt):
-  """Generate the description of `member_elt` for "Member Details"."""
-  anchor = '{#' + anchorize(member_definition(member_elt)) + '}'
-  full_entry = '#### `%s` %s' % (member_sig(member_elt), anchor)
-
-  complete_descr = element_text(member_elt, 'briefdescription') + '\n\n'
-  complete_descr += element_text(member_elt, 'detaileddescription')
-
-  if complete_descr:
-    full_entry += '\n\n' + complete_descr
-
-  return full_entry
-
-
-def brief_member_entry(member_elt):
-  """Generate the description of `member_elt` for the "Member Summary"."""
-  brief_item = ''
-  brief_descr = element_text(member_elt, 'briefdescription')
-  if brief_descr:
-    brief_item = '\n  * ' + brief_descr
-  sig = member_sig(member_elt)
-  memdef = member_definition(member_elt)
-  linkified_sig = '[`{0}`](#{1})'.format(sig, anchorize(memdef))
-
-  return '* ' + linkified_sig + brief_item
-
-
-def all_briefs(members):
-  briefs = [brief_member_entry(member_elt) for member_elt in members]
-  return '\n'.join(briefs)
-
-
-def all_fulls(members):
-  fulls = [full_member_entry(member_elt) for member_elt in members]
-  return '\n\n'.join(fulls)
-
-
-def page_overview(class_elt):
-  """Returns the contents of the .md file for `class_elt`."""
-  overview_brief = ''
-  overview_details = ''
-
-  briefs = class_elt.findAll('briefdescription', recursive=False)
-  if briefs:
-    overview_brief = element_text(briefs[0], None)
-
-  details = class_elt.findAll('detaileddescription', recursive=False)
-  if details:
-    overview_details = element_text(details[0], None)
-
-  return overview_brief + '\n\n' + overview_details
-
-
-def page_with_name(pages, name):
-  def match(n):
-    for i in xrange(len(pages)):
-      if pages[i].get_name() == n:
-        return i
-    return None
-  return match(name) or match('tensorflow::' + name)
-
-
-def get_all_indexed_pages():
-  all_pages = set()
-  lines = INDEX_TEMPLATE.split('\n')
-  for i in range(len(lines)):
-    if lines[i].startswith('@@'):
-      name = lines[i][2:]
-      all_pages.add(name)
-  return all_pages
-
-
-def index_page(pages):
-  """Create the index page linking to `pages` using INDEX_TEMPLATE."""
-  pages = pages[:]
-  lines = INDEX_TEMPLATE.split('\n')
-  all_md_files = []
-  for i in range(len(lines)):
-    if lines[i].startswith('@@'):
-      name = lines[i][2:]
-      page_index = page_with_name(pages, name)
-      if page_index is None:
-        raise ValueError('Missing page with name: ' + name)
-      lines[i] = '* [{0}]({1})'.format(
-          pages[page_index].get_name(), pages[page_index].get_md_filename())
-      all_md_files.append(pages[page_index].get_md_filename())
-      pages.pop(page_index)
-
-  return '\n'.join(lines)
-
-
-def page_in_name_list(page, names):
-  for name in names:
-    if page.get_name() == name or page.get_name() == 'tensorflow::' + name:
-      return True
-  return False
-
-
-class Page(object):
-  """Holds the MarkDown converted contents of a .xml page."""
-
-  def __init__(self, xml_path, deftype):
-    self.type = deftype
-    xml_file = open(xml_path)
-    xml = xml_file.read()
-    xml = xml.replace('<computeroutput>', '`').replace('</computeroutput>', '`')
-    # TODO(josh11b): Should not use HTML entities inside ```...```.
-    soup = BeautifulStoneSoup(
-        xml, convertEntities=BeautifulStoneSoup.HTML_ENTITIES)
-    self.name = soup.find('compoundname').text
-    print('Making page with name ' + self.name + ' (from ' + xml_path + ')')
-    members = soup('memberdef', prot='public')
-    fulls = all_fulls(members)
-    self.overview = page_overview(soup.find('compounddef'))
-    self.page_text = PAGE_TEMPLATE.format(
-        self.type, self.name, self.overview, fulls)
-
-  def get_text(self):
-    return self.page_text
-
-  def get_name(self):
-    return self.name
-
-  def get_short_name(self):
-    parse = self.get_name().split('::')
-    return parse[len(parse)-1]
-
-  def get_type(self):
-    return self.type
-
-  def get_md_filename(self):
-    capitalized_type = self.get_type()[0].upper() + self.get_type()[1:]
-    return capitalized_type + anchorize(self.get_short_name()) + '.md'
-
-
-def main(unused_argv):
-  print('Converting in ' + FLAGS.src_dir)
-  pages = []
-  all_pages = get_all_indexed_pages()
-  xml_files = os.listdir(FLAGS.src_dir)
-  for fname in xml_files:
-    if len(fname) < 6: continue
-    newpage = None
-    if fname[0:5] == 'class':
-      newpage = Page(os.path.join(FLAGS.src_dir, fname), 'class')
-    elif fname[0:6] == 'struct':
-      newpage = Page(os.path.join(FLAGS.src_dir, fname), 'struct')
-    if newpage is not None and page_in_name_list(newpage, all_pages):
-      pages.append(newpage)
-      md_filename = newpage.get_md_filename()
-      print('Writing ' + md_filename)
-      md_file = open(os.path.join(FLAGS.out_dir, md_filename), 'w')
-      print(newpage.get_text(), file=md_file)
-
-  index_text = index_page(pages)
-  index_md_file = open(os.path.join(FLAGS.out_dir, 'index.md'), 'w')
-  print(index_text, file=index_md_file)
-  return 0
-
-if __name__ == '__main__':
-  parser = argparse.ArgumentParser()
-  parser.add_argument(
-      '--src_dir',
-      type=str,
-      default=None,
-      help='Directory containing the doxygen output.'
-  )
-  parser.add_argument(
-      '--out_dir',
-      type=str,
-      default=None,
-      help='Directory to which docs should be written.'
-  )
-  FLAGS = parser.parse_args()
-
-  tf.app.run()
diff --git a/tensorflow/tools/docs/gen_docs.sh b/tensorflow/tools/docs/gen_docs.sh
deleted file mode 100755
index 4f529270ab..0000000000
--- a/tensorflow/tools/docs/gen_docs.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-# This script needs to be run from the tensorflow/tools/docs directory
-# Pass -a to also rebuild C++ docs. This requires doxygen.
-
-set -e
-
-DOC_DIR="g3doc/api_docs"
-DOXYGEN_BIN=${DOXYGEN:-doxygen}
-DOXYGEN_CONFIG="tools/docs/tf-doxy_for_md-config"
-# The TMP_DIR is set inside DOXYGEN_CONFIG and cannot be changed independently
-TMP_DIR=/tmp/tensorflow-docs/xml
-
-if [ ! -f gen_docs.sh ]; then
-  echo "This script must be run from inside the tensorflow/tools/docs directory."
-  exit 1
-fi
-
-# go to the tensorflow/ directory
-pushd ../..
-BASE=$(pwd)
-
-# Make Python docs
-bazel run -- //tensorflow/python:gen_docs_combined \
-    --out_dir=$BASE/$DOC_DIR/python
-
-# Check if we should build c++ docs (if -a is given)
-if [ x$1 == x-a ]; then
-  mkdir -p $TMP_DIR
-  $DOXYGEN_BIN "$BASE/$DOXYGEN_CONFIG"
-  bazel run -- //tensorflow/tools/docs:gen_cc_md \
-      --out_dir=$BASE/$DOC_DIR/cc \
-      --src_dir=$TMP_DIR
-fi
-
-popd
diff --git a/tensorflow/tools/docs/gen_docs_test.sh b/tensorflow/tools/docs/gen_docs_test.sh
deleted file mode 100755
index c8c1955aa0..0000000000
--- a/tensorflow/tools/docs/gen_docs_test.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-set -eux
-
-if [ -d $TEST_SRCDIR/org_tensorflow ]; then
-  TFDIR=$TEST_SRCDIR/org_tensorflow/tensorflow
-else
-  # Support 0.2.1- runfiles.
-  TFDIR=$TEST_SRCDIR/tensorflow
-fi
-DOXYGEN=doxygen
-DOXYGEN_CONFIG="tf-doxy_for_md-config"
-TMP_DIR=/tmp/tensorflow-docs
-mkdir -p $TMP_DIR/python
-mkdir -p $TMP_DIR/xml
-mkdir -p $TMP_DIR/cc
-
-pushd $TFDIR
-python/gen_docs_combined --out_dir=$TMP_DIR/python
-
-# TODO(wicke): this does not work well inside the build/test jail
-#$DOXYGEN "tools/docs/$DOXYGEN_CONFIG"
-#tools/docs/gen_cc_md \
-#    --out_dir=$TMP_DIR/cc \
-#    --src_dir=$TMP_DIR/xml
-popd
-echo "PASS"
diff --git a/tensorflow/tools/docs/tf-doxy_for_md-config b/tensorflow/tools/docs/tf-doxy_for_md-config
deleted file mode 100644
index b7fd6e9507..0000000000
--- a/tensorflow/tools/docs/tf-doxy_for_md-config
+++ /dev/null
@@ -1,2280 +0,0 @@
-# Doxyfile 1.8.5
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "TensorFlow"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 0.0.0
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = /tmp/tensorflow-docs/
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
-# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
-# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# Turkish, Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = core/framework core/lib/core core/platform core/public
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = NO
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavours of web server based searching depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools. See
-# the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = YES
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
-# all uppercase name, and do not end with a semicolon. Such function macros are
-# typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have an unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
-- 
GitLab


From 844efb949f3eafb84b336e67464f23ae60051652 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 31 Mar 2017 12:46:38 -0800
Subject: [PATCH 0036/1563] Remove obsolete dimension restriction on
 tf.transpose

ZF removed the restriction under the hood, but didn't remove the check.

Github issue for similar tf.tile / binary operator support: #8873.
Change: 151863009
---
 tensorflow/core/kernels/transpose_op.cc             | 7 +------
 tensorflow/python/kernel_tests/transpose_op_test.py | 3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/tensorflow/core/kernels/transpose_op.cc b/tensorflow/core/kernels/transpose_op.cc
index fb2ceb4a4a..bab8e1ee12 100644
--- a/tensorflow/core/kernels/transpose_op.cc
+++ b/tensorflow/core/kernels/transpose_op.cc
@@ -89,7 +89,7 @@ REGISTER_KERNEL_BUILDER(Name("InvertPermutation")
                             .HostMemory("x")
                             .HostMemory("y"),
                         InvertPermutationOp);
-#endif // TENSORFLOW_USE_SYCL
+#endif  // TENSORFLOW_USE_SYCL
 
 // output = TransposeOp(T<any> input, T<int32> perm) takes a tensor
 // of type T and rank N, and a permutation of 0, 1, ..., N-1. It
@@ -115,11 +115,6 @@ void TransposeOp::Compute(OpKernelContext* ctx) {
                                       perm.shape().DebugString()));
   auto Vperm = perm.vec<int32>();
   const int dims = input.dims();
-  static const int kMinDims = 0;
-  static const int kMaxDims = 10;
-  OP_REQUIRES(ctx, kMinDims <= dims && dims <= kMaxDims,
-              errors::Unimplemented("Transposing a tensor of rank ", dims,
-                                    " is not implemented."));
   OP_REQUIRES(ctx, dims == Vperm.size(),
               errors::InvalidArgument(
                   "transpose expects a vector of size ", input.dims(),
diff --git a/tensorflow/python/kernel_tests/transpose_op_test.py b/tensorflow/python/kernel_tests/transpose_op_test.py
index 939a86c0b5..7b112a6a17 100644
--- a/tensorflow/python/kernel_tests/transpose_op_test.py
+++ b/tensorflow/python/kernel_tests/transpose_op_test.py
@@ -358,9 +358,6 @@ class TransposeTest(test.TestCase):
     with self.assertRaises(ValueError):
       array_ops.transpose(
           np.arange(0., 30).reshape([2, 3, 5]), [[0, 1], [2, 3]])
-    self._testError(
-        np.arange(0., 2**11).reshape([2] * 11), np.arange(11),
-        "not implemented")
     with self.assertRaises(ValueError):
       array_ops.transpose(np.arange(0., 30).reshape([2, 3, 5]), [0, 1, 3])
     self._testError(
-- 
GitLab


From ad078f8cd8fc4486e15786e43d4659329fa708b7 Mon Sep 17 00:00:00 2001
From: Adam Roberts <adarob@google.com>
Date: Fri, 31 Mar 2017 12:51:48 -0800
Subject: [PATCH 0037/1563] Fix condition for skipping sampling by treating
 sample_ids as a boolean array instead of a list of indices. Change: 151863667

---
 tensorflow/contrib/seq2seq/python/ops/helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/helper.py b/tensorflow/contrib/seq2seq/python/ops/helper.py
index 258e74b819..7a24261b64 100644
--- a/tensorflow/contrib/seq2seq/python/ops/helper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/helper.py
@@ -431,7 +431,7 @@ class ScheduledOutputTrainingHelper(TrainingHelper):
                                        shape=base_shape))
 
       all_finished = math_ops.reduce_all(finished)
-      no_samples = math_ops.equal(array_ops.shape(sample_ids)[0], 0)
+      no_samples = math_ops.logical_not(math_ops.reduce_any(sample_ids))
       next_inputs = control_flow_ops.cond(
           math_ops.logical_or(all_finished, no_samples),
           lambda: base_next_inputs, maybe_sample)
-- 
GitLab


From afe9e404e973a00f713a6f2d59fe1774c98f772b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 12:59:52 -0800
Subject: [PATCH 0038/1563] [XLA] Don't crash when analyzing ops with no layout
 contained in a fused op. Change: 151864663

---
 .../compiler/xla/service/hlo_cost_analysis.cc |  4 ++-
 .../xla/service/hlo_cost_analysis_test.cc     | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis.cc b/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
index 8fe1897e75..5fc7d6b22e 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
@@ -357,7 +357,9 @@ Status HloCostAnalysis::HandleRng(HloInstruction* random,
 Status HloCostAnalysis::HandleFusion(HloInstruction* fusion) {
   // Compute the cost of the fused expression.
   HloInstruction* fused_expression_root = fusion->fused_expression_root();
-  HloCostAnalysis visitor(shape_size_);
+  // Don't compute sizes inside of fused ops. We don't use the size here and the
+  // operations inside might not have a layout.
+  HloCostAnalysis visitor([](const Shape&) { return 0; });
   TF_RETURN_IF_ERROR(fused_expression_root->Accept(&visitor));
 
   // Attribute the cost of the fused expression to the fusion node.
diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc b/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc
index 9f1c91d41c..22e782da27 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc
@@ -375,6 +375,33 @@ TEST_F(FusionCostAnalysis, LoopFusion) {
   EXPECT_EQ(fusion_analysis.transcendental_count(), 4);
 }
 
+TEST_F(FusionCostAnalysis, NoLayout) {
+  Shape shape_with_layout = ShapeUtil::MakeShape(F32, {2, 3, 4, 5});
+  // Instructions within a fused op may have no layout.
+  Shape shape_without_layout = shape_with_layout;
+  shape_without_layout.clear_layout();
+
+  auto c1 = HloInstruction::CreateConstant(
+      LiteralUtil::CreateR4FromArray4D(Array4D<float>(2, 3, 4, 5)));
+  auto c2 =
+      HloInstruction::CreateConstant(LiteralUtil::CreateR1<float>({1, 2, 3}));
+
+  auto broadcast =
+      HloInstruction::CreateBroadcast(shape_without_layout, c2.get(), {1});
+  auto add = HloInstruction::CreateBinary(shape_with_layout, HloOpcode::kAdd,
+                                          c1.get(), broadcast.get());
+
+  auto fusion = HloInstruction::CreateFusion(
+      shape_with_layout, HloInstruction::FusionKind::kLoop, add.get());
+  fusion->FuseInstruction(broadcast.get());
+
+  HloCostAnalysis fusion_analysis(ShapeSize);
+  ASSERT_IS_OK(fusion->Accept(&fusion_analysis));
+
+  EXPECT_EQ(fusion_analysis.flop_count(), 120);
+  EXPECT_EQ(fusion_analysis.transcendental_count(), 0);
+}
+
 TEST_F(HloCostAnalysisTest, TupleCost) {
   HloCostAnalysis analysis(ShapeSize);
   {
-- 
GitLab


From 4b119643e47455d0cd4fc27c1bd356a3e5445773 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 13:09:34 -0800
Subject: [PATCH 0039/1563] Reshape input tensors to match output_rank for
 `_input_from_feature_columns`. Change: 151865814

---
 tensorflow/contrib/layers/BUILD               |  3 +
 .../python/layers/feature_column_ops.py       | 64 ++++++++++++++++++-
 .../python/layers/feature_column_ops_test.py  | 29 +++++++++
 3 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/layers/BUILD b/tensorflow/contrib/layers/BUILD
index f5eb723e2d..fc33e4b49e 100644
--- a/tensorflow/contrib/layers/BUILD
+++ b/tensorflow/contrib/layers/BUILD
@@ -118,6 +118,7 @@ tf_custom_op_py_library(
         "//tensorflow/python:array_ops",
         "//tensorflow/python:check_ops",
         "//tensorflow/python:clip_ops",
+        "//tensorflow/python:common_shapes",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework",
@@ -131,9 +132,11 @@ tf_custom_op_py_library(
         "//tensorflow/python:platform",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:sparse_ops",
+        "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:standard_ops",
         "//tensorflow/python:string_ops",
         "//tensorflow/python:summary",
+        "//tensorflow/python:tensor_util",
         "//tensorflow/python:training",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops.py b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
index 7f1bfc9605..2662d0ae3e 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
@@ -18,6 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import functools
+
 from tensorflow.contrib.framework.python.framework import checkpoint_utils
 from tensorflow.contrib.framework.python.framework import experimental
 from tensorflow.contrib.framework.python.ops import variables as contrib_variables
@@ -36,6 +38,7 @@ from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import nest
 
 
 def _embeddings_from_arguments(column,
@@ -136,6 +139,58 @@ def _embeddings_from_arguments(column,
       max_norm=args.max_norm)
 
 
+def _maybe_reshape_input_tensor(tensor, column_name, output_rank):
+  """Reshape the input tensor by the following rule.
+
+  1. If `output_rank > input_rank + 1`, raise a `ValueError`.
+  2. If `output_rank == input_rank + 1`, expand the tensor by one dimension.
+  3. If `output_rank == input_rank`, do nothing.
+  4. If `output_rank < input_rank`, flatten the inner dimensions of the tensor.
+
+  Args:
+    tensor: A Tensor or SparseTensor to be reshaped.
+    column_name: A string name of the feature column for the tensor.
+    output_rank: the desired rank of the tensor.
+  Returns:
+    A reshaped Tensor or SparseTensor.
+  Raises:
+    ValueError: if `output_rank > input_rank + 1` for the input tensor.
+  """
+  input_rank = tensor.get_shape().ndims
+
+  if input_rank is None and isinstance(tensor, sparse_tensor_py.SparseTensor):
+    # Try to get the rank of a sparse tensor by its dense_shape's shape.
+    input_rank = tensor.dense_shape.get_shape().as_list()[0]
+
+  if input_rank is None:
+    raise ValueError('Error while processing column {}. Rank of input Tensor '
+                     'can not be None.'.format(column_name))
+
+  if output_rank > input_rank + 1:
+    raise ValueError('Error while processing column {}. Rank of input Tensor '
+                     '({}) should be the same as output_rank ({}). For '
+                     'example, sequence data should typically be 3 '
+                     'dimensional (rank 3) while non-sequence data is '
+                     'typically 2 dimensional (rank 2).'.format(
+                         column_name, input_rank, output_rank))
+  elif output_rank == input_rank + 1:
+    # Expand the tensor's shape by 1 dimension.
+    if isinstance(tensor, sparse_tensor_py.SparseTensor):
+      output_shape = array_ops.concat([tensor.dense_shape, [1]], 0)
+      return sparse_ops.sparse_reshape(tensor, output_shape)
+    else:
+      reshaped = array_ops.expand_dims(tensor, -1)
+      # Try to calculate the new shape.
+      static_shape = tensor.get_shape()
+      if static_shape is not None and static_shape.dims is not None:
+        reshaped.set_shape(static_shape.as_list() + [1])
+      return reshaped
+  elif output_rank < input_rank:
+    return layers._inner_flatten(tensor, output_rank)  # pylint: disable=protected-access
+  else:
+    return tensor
+
+
 def _input_from_feature_columns(columns_to_tensors,
                                 feature_columns,
                                 weight_collections,
@@ -160,6 +215,12 @@ def _input_from_feature_columns(columns_to_tensors,
                                          default_name=column.name,
                                          values=columns_to_tensors.values()):
         transformed_tensor = transformer.transform(column)
+        if output_rank == 3:
+          transformed_tensor = nest.map_structure(
+              functools.partial(
+                  _maybe_reshape_input_tensor,
+                  column_name=column.name,
+                  output_rank=output_rank), transformed_tensor)
         try:
           # pylint: disable=protected-access
           arguments = column._deep_embedding_lookup_arguments(
@@ -548,7 +609,8 @@ def weighted_sum_from_feature_columns(columns_to_tensors,
             default_name=column.name,
             values=columns_to_tensors.values()):
           tensor = column._to_dense_tensor(transformed_tensor)
-          tensor = fc._reshape_real_valued_tensor(tensor, 2, column.name)
+          tensor = _maybe_reshape_input_tensor(
+              tensor, column.name, output_rank=2)
           variable = [
               contrib_variables.model_variable(
                   name='weight',
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index 35daef9cc6..01c54f77d6 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -1350,6 +1350,35 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
 
     self.assertAllEqual(expected_input_shape, model_input.shape)
 
+  def testEmbeddingColumnWithAutoReshape(self):
+    hash_buckets = 10
+    embedding_dimension = 5
+    ids_tensor = sparse_tensor.SparseTensor(
+        values=["c", "b",
+                "a", "c", "b",
+                "b"],
+        indices=[[0, 0], [0, 1],
+                 [1, 0], [1, 1], [1, 2],
+                 [3, 2]],
+        dense_shape=[4, 3])
+
+    expected_input_shape = np.array([4, 3, embedding_dimension])
+
+    hashed_ids_column = feature_column.sparse_column_with_hash_bucket(
+        "ids", hash_buckets)
+    embedded_column = feature_column.embedding_column(hashed_ids_column,
+                                                      embedding_dimension)
+    columns_to_tensors = {"ids": ids_tensor}
+    model_input_tensor = feature_column_ops.sequence_input_from_feature_columns(
+        columns_to_tensors, [embedded_column])
+
+    with self.test_session() as sess:
+      variables_lib.global_variables_initializer().run()
+      data_flow_ops.tables_initializer().run()
+      model_input = sess.run(model_input_tensor)
+
+    self.assertAllEqual(expected_input_shape, model_input.shape)
+
   def testEmbeddingColumnGradient(self):
     hash_buckets = 1000
     embedding_dimension = 3
-- 
GitLab


From 499166454f0c7dd6c724c364f6dc5d99357514b1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 13:24:24 -0800
Subject: [PATCH 0040/1563] Make GridLSTM and BidirectionalGridLSTM use dynamic
 batch size. Change: 151867685

---
 tensorflow/contrib/rnn/python/ops/rnn_cell.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index 2cd1814213..a83e954053 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -571,7 +571,7 @@ class GridLSTMCell(core_rnn_cell.RNNCell):
       ValueError: if an input_size was specified and the provided inputs have
         a different dimension.
     """
-    batch_size = int(inputs.get_shape()[0])
+    batch_size = inputs.shape[0].value or array_ops.shape(inputs)[0]
     freq_inputs = self._make_tf_features(inputs)
     with _checked_scope(self, scope or "grid_lstm_cell",
                         initializer=self._initializer, reuse=self._reuse):
@@ -994,7 +994,7 @@ class BidirectionalGridLSTMCell(GridLSTMCell):
       ValueError: if an input_size was specified and the provided inputs have
         a different dimension.
     """
-    batch_size = int(inputs.get_shape()[0])
+    batch_size = inputs.shape[0].value or array_ops.shape(inputs)[0]
     fwd_inputs = self._make_tf_features(inputs)
     if self._backward_slice_offset:
       bwd_inputs = self._make_tf_features(inputs, self._backward_slice_offset)
-- 
GitLab


From 697da92cbefeabfd8101a3bed03449d4dbcca9e1 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Fri, 31 Mar 2017 13:28:59 -0800
Subject: [PATCH 0041/1563] Add a public `clone()` method to
 AttentionCellWrapper.

This makes it easier to create a zero_state and insert, say, the encoder's state
directly into it, using public methods.
Change: 151868236
---
 .../kernel_tests/attention_wrapper_test.py    |  7 +++++++
 .../seq2seq/python/ops/attention_wrapper.py   | 21 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index 9c3015ff25..606215b656 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -56,6 +56,13 @@ class AttentionWrapperTest(test.TestCase):
     return super(AttentionWrapperTest, self).assertAllClose(
         *args, **kwargs)
 
+  def testAttentionWrapperState(self):
+    num_fields = len(wrapper.AttentionWrapperState._fields)  # pylint: disable=protected-access
+    state = wrapper.AttentionWrapperState(*([None] * num_fields))
+    new_state = state.clone(time=1)
+    self.assertEqual(state.time, None)
+    self.assertEqual(new_state.time, 1)
+
   def _testWithAttention(self,
                          create_attention_mechanism,
                          expected_final_output,
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 76b80522d6..b55e1ff848 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -368,7 +368,26 @@ class AttentionWrapperState(
     - `attention_history`: (if enabled) a `TensorArray` containing attention
        matrices from all time steps.  Call `stack()` to convert to a `Tensor`.
   """
-  pass
+
+  def clone(self, **kwargs):
+    """Clone this object, overriding components provided by kwargs.
+
+    Example:
+
+    ```python
+    initial_state = attention_wrapper.zero_state(dtype=..., batch_size=...)
+    initial_state = initial_state.clone(cell_state=encoder_state)
+    ```
+
+    Args:
+      **kwargs: Any properties of the state object to replace in the returned
+        `AttentionWrapperState`.
+
+    Returns:
+      A new `AttentionWrapperState` whose properties are the same as
+      this one, except any overriden properties as provided in `kwargs`.
+    """
+    return super(AttentionWrapperState, self)._replace(**kwargs)
 
 
 def hardmax(logits, name=None):
-- 
GitLab


From fe416cc557caf77ee66728f2ddf08130b4d14f3c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 14:30:41 -0800
Subject: [PATCH 0042/1563] Fix links in docs. Change: 151876042

---
 tensorflow/docs_src/api_guides/python/client.md | 2 +-
 tensorflow/docs_src/deploy/distributed.md       | 2 +-
 tensorflow/docs_src/extend/architecture.md      | 2 +-
 tensorflow/docs_src/get_started/mnist/pros.md   | 8 ++++----
 tensorflow/docs_src/install/install_linux.md    | 2 +-
 tensorflow/docs_src/install/install_mac.md      | 2 +-
 tensorflow/docs_src/install/install_sources.md  | 2 +-
 tensorflow/docs_src/install/install_windows.md  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tensorflow/docs_src/api_guides/python/client.md b/tensorflow/docs_src/api_guides/python/client.md
index f5bb256d87..97c1986360 100644
--- a/tensorflow/docs_src/api_guides/python/client.md
+++ b/tensorflow/docs_src/api_guides/python/client.md
@@ -3,7 +3,7 @@
 
 This library contains classes for launching graphs and executing operations.
 
-The @{$get_started} guide has
+The @{$get_started/get_started} guide has
 examples of how a graph is launched in a @{tf.Session}.
 
 ## Session management
diff --git a/tensorflow/docs_src/deploy/distributed.md b/tensorflow/docs_src/deploy/distributed.md
index bcc5b92db8..cdfb4672fa 100644
--- a/tensorflow/docs_src/deploy/distributed.md
+++ b/tensorflow/docs_src/deploy/distributed.md
@@ -2,7 +2,7 @@
 
 This document shows how to create a cluster of TensorFlow servers, and how to
 distribute a computation graph across that cluster. We assume that you are
-familiar with the @{$get_started$basic concepts} of
+familiar with the @{$get_started/get_started$basic concepts} of
 writing TensorFlow programs.
 
 ## Hello distributed TensorFlow!
diff --git a/tensorflow/docs_src/extend/architecture.md b/tensorflow/docs_src/extend/architecture.md
index 085f74c056..42721eb488 100644
--- a/tensorflow/docs_src/extend/architecture.md
+++ b/tensorflow/docs_src/extend/architecture.md
@@ -7,7 +7,7 @@ learning models and system-level optimizations.
 This document describes the system architecture that makes possible this
 combination of scale and flexibility. It assumes that you have basic familiarity
 with TensorFlow programming concepts such as the computation graph, operations,
-and sessions. See @{$get_started$Getting Started}
+and sessions. See @{$get_started/get_started$Getting Started}
 for an introduction to these topics. Some familiarity
 with @{$distributed$distributed TensorFlow}
 will also be helpful.
diff --git a/tensorflow/docs_src/get_started/mnist/pros.md b/tensorflow/docs_src/get_started/mnist/pros.md
index 6f0ba492d3..5dbb00c0b5 100644
--- a/tensorflow/docs_src/get_started/mnist/pros.md
+++ b/tensorflow/docs_src/get_started/mnist/pros.md
@@ -65,12 +65,12 @@ programs is to first create a graph and then launch it in a session.
 Here we instead use the convenient `InteractiveSession` class, which makes
 TensorFlow more flexible about how you structure your code.  It allows you to
 interleave operations which build a
-@{$get_started#the_computational_graph$computation graph}
+@{$get_started/get_started#the_computational_graph$computation graph}
 with ones that run the graph.  This is particularly convenient when working in
 interactive contexts like IPython.  If you are not using an
 `InteractiveSession`, then you should build the entire computation graph before
 starting a session and
-@{$get_started#the_computational_graph$launching the graph}.
+@{$get_started/get_started#the_computational_graph$launching the graph}.
 
 ```python
 import tensorflow as tf
@@ -95,8 +95,8 @@ similar to that used in Theano or Torch.
 
 The role of the Python code is therefore to build this external computation
 graph, and to dictate which parts of the computation graph should be run. See
-the @{$get_started#the_computational_graph$Computation Graph}
-section of @{$get_started} for more detail.
+the @{$get_started/get_started#the_computational_graph$Computation Graph}
+section of @{$get_started/get_started} for more detail.
 
 ## Build a Softmax Regression Model
 
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index 80331e7ea8..4a537135b6 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -507,7 +507,7 @@ TensorFlow programs:
 
 <pre>Hello, TensorFlow!</pre>
 
-If you are new to TensorFlow, see @{$get_started$Getting Started with TensorFlow}.
+If you are new to TensorFlow, see @{$get_started/get_started$Getting Started with TensorFlow}.
 
 If the system outputs an error message instead of a greeting, see [Common
 installation problems](#common_installation_problems).
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index 592036d1eb..68ad3ceba9 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -449,7 +449,7 @@ writing TensorFlow programs:
 <pre>Hello, TensorFlow!</pre>
 
 If you are new to TensorFlow, see
-@{$get_started$Getting Started with TensorFlow}.
+@{$get_started/get_started$Getting Started with TensorFlow}.
 
 If the system outputs an error message instead of a greeting, see
 [Common installation problems](#common_installation_problems).
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 3597a68b83..25e428f574 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -353,7 +353,7 @@ TensorFlow programs:
 
 <pre>Hello, TensorFlow!</pre>
 
-If you are new to TensorFlow, see @{$get_started$Getting Started with
+If you are new to TensorFlow, see @{$get_started/get_started$Getting Started with
 TensorFlow}.
 
 If the system outputs an error message instead of a greeting, see [Common
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 3e5451ff4d..a171f1ac4d 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -145,7 +145,7 @@ TensorFlow programs:
 
 <pre>Hello, TensorFlow!</pre>
 
-If you are new to TensorFlow, see @{$get_started$Getting Started with
+If you are new to TensorFlow, see @{$get_started/get_started$Getting Started with
 TensorFlow}.
 
 If the system outputs an error message instead of a greeting, see [Common
-- 
GitLab


From 945a84bb041bab77318e7c9236305190dea759b5 Mon Sep 17 00:00:00 2001
From: Sukriti Ramesh <sukritiramesh@google.com>
Date: Fri, 31 Mar 2017 14:32:21 -0800
Subject: [PATCH 0043/1563] Add link to SignatureDef documentation for
 TensorFlow Serving from SavedModel. Change: 151876185

---
 tensorflow/python/saved_model/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/saved_model/README.md b/tensorflow/python/saved_model/README.md
index 9fd795adb5..8422fb6404 100644
--- a/tensorflow/python/saved_model/README.md
+++ b/tensorflow/python/saved_model/README.md
@@ -22,6 +22,8 @@ The following is a summary of the features in SavedModel:
       and outputs. This is called a `Signature`.
     * SavedModel uses [SignatureDefs](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/protobuf/meta_graph.proto)
       to allow generic support for signatures that may need to be saved with the graphs.
+    * For commonly used SignatureDefs in the context of TensorFlow Serving,
+      please see documentation [here](https://github.com/tensorflow/serving/blob/master/tensorflow_serving/g3doc/signature_defs.md).
 * Support for `Assets`.
     * For cases where ops depend on external files for initialization, such as
       vocabularies, SavedModel supports this via `assets`.
-- 
GitLab


From 5c8c0782ea6ab7c6cf65b72e03da726271e90268 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@nestlabs.com>
Date: Fri, 31 Mar 2017 16:07:10 -0700
Subject: [PATCH 0044/1563] Updating the authors in RELEASE.md and updating new
 bug fixes.

---
 RELEASE.md | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 156cc2e3af..1dfc23a48c 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -68,38 +68,16 @@
 * Multiple tfdbg bug fixes:
   * Fixed Windows compatibility issues.
   * Command history now persists across runs.
+* Bug fix in graph validation related to `tf.while_loops`.
+* Java Maven fixes for bugs with Windows installation.
+* Rollback of adjust contract change.
+* Initial release of installation guides for Java, C, and Go.
 
 ## Thanks to our Contributors
 
 This release contains contributions from many people at Google, as well as:
 
-A. Besir Kurtulmus, Adal Chiriliuc, @akash, Alec-Desouza, Alex Rothberg, Alex
-Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton
-Loss, @Aravind, @Arie, Ashutosh Das, AuréLien Geron, Bairen Yi, @bakunyo, Ben
-Visser, Brady Zhou, Calpa Liu, Changming Sun, Chi Zeng, Chih Cheng Liang,
-Christopher Berner, Clark Zinzow, @Conchylicultor, Courtial Florian, Dan Ellis,
-Dan J, Dan Jarvis, Daniel Ylitalo, Darren Garvey, David Norman, David Truong,
-@DavidNorman, Dimitar Pavlov, Dmitry Persiyanov, @Eddie, @elirex, Erfan
-Noury, Eron Wright, Evgeny Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher
-Coder, Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang,
-@guilherme, @guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo
-Gao, Igor ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason
-Morton, Jay Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi,
-@jiqiu, Joan Thibault, John C F, Jojy G Varghese, Jon Malmaud, Julian Berman,
-Julian Niedermeier, Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle
-Bostelmann, @Lezcano, Li Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh,
-Marek Kolodziej, Mark Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael
-Gharbi, MichaëL Defferrard, Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal,
-Nayana Thorat, @nghiattran, Nicholas Connor, Nikolaas Steenbergen, Niraj Patel,
-Niranjan Hasabnis, @Panmari, Pavel Bulanov, Philip Pries Henningsen, Philipp
-Jund, @polonez, Prayag Verma, Rahul Kavi, Raphael Gontijo Lopes, @rasbt, Raven
-Iqqe, Reid Pryzant, Richard Shin, Rizwan Asif, Russell Kaplan, Ryo Asakura,
-RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay, Sean Papay, @seaotterman,
-@selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano Probst, @taknevski,
-@tbonza, @teldridge11, Yuan (Terry) Tang, Tim Anglade, Tomas Reimers, Tomer Gafner,
-Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad
-Firoiu, @wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yuan (Terry) Tang,
-@Yufeng, Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
+A. Besir Kurtulmus, Adal Chiriliuc, @akash, Alec-Desouza, Alex Rothberg, Alex Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton Loss, @Aravind, @Arie, Ashutosh Das, AuréLien Geron, Bairen Yi, @bakunyo, Ben Visser, Brady Zhou, Calpa Liu, Changming Sun, Chi Zeng, Chih Cheng Liang, Christopher Berner, Clark Zinzow, @Conchylicultor, Damien Martin-Guillerez, Dan Ellis, Dan J, Dan Jarvis, Daniel Mané, Daniel Ylitalo, Darren Garvey, David Norman, David Truong, @DavidNorman, Dimitar Pavlov, Dmitry Persiyanov, @drpngx, @Eddie, @elirex, Erfan Noury, Eron Wright, Evgeny Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher Coder, Florian Courtial, Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang, @guilherme, @guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo Gao, Igor ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason Morton, Jay Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi, @jiqiu, Joan Thibault, John C F, Jojy George Varghese, Jon Malmaud, Julian Berman, Julian Niedermeier, Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle Bostelmann, @Lezcano, Li Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh, Marek Kolodziej, Mark Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael Gharbi, MichaëL Defferrard, Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal, Nayana Thorat, @nghiattran, Nicholas Connor, Nikolaas Steenbergen, Niraj Patel, Niranjan Hasabnis, @Panmari, Pavel Bulanov, Philip Pries Henningsen, Philipp Jund, @polonez, Prayag Verma, Rahul Kavi, Raphael Gontijo Lopes, @rasbt, Raven Iqqe, Reid Pryzant, Richard Shin, Rizwan Asif, Russell Kaplan, Ryo Asakura, RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay, Sean Papay, @seaotterman, @selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano Probst, @taknevski, @tbonza, @teldridge11, @terrytangyuan, Tim Anglade, Tomas Reimers, Tomer Gafner, Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad Firoiu, @wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yi Liu, Yuan (Terry) Tang, @Yufeng, Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
 
 We are also grateful to all who filed issues or helped resolve them, asked and
 answered questions, and were part of inspiring discussions.
-- 
GitLab


From 17878b9c3efca641894446e163478ae6ab4f954c Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Fri, 31 Mar 2017 14:41:01 -0800
Subject: [PATCH 0045/1563] [TF:XLA] Add a VLOG() to log the operators
 registered by the XlaOpRegistry. Change: 151877152

---
 tensorflow/compiler/tf2xla/xla_op_registry.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/compiler/tf2xla/xla_op_registry.cc b/tensorflow/compiler/tf2xla/xla_op_registry.cc
index 5b895bfdf6..13fdfc3b0c 100644
--- a/tensorflow/compiler/tf2xla/xla_op_registry.cc
+++ b/tensorflow/compiler/tf2xla/xla_op_registry.cc
@@ -167,6 +167,8 @@ void XlaOpRegistry::RegisterCompilationKernels() {
           !backend.second.op_filter(kdef.get())) {
         continue;
       }
+      VLOG(2) << "XLA op registration: device: " << backend.first
+              << " op: " << op.first;
       registry.kernel_registrars_.emplace_back(
           new kernel_factory::OpKernelRegistrar(
               new KernelDef(*kdef), "XlaJitOp", op.second->factory));
-- 
GitLab


From b71c3149e458fc67be00e9316a098a851e635c41 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Fri, 31 Mar 2017 16:29:18 -0700
Subject: [PATCH 0046/1563] Implementing Yifei and Gunan's suggestions.

---
 RELEASE.md | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 1dfc23a48c..b6720b84e5 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -15,6 +15,7 @@
   * Ability to inspect Python source file against TF ops and tensors (command `print_source` / `ps`)
   * New navigation bar in Curses-based UI
   * NodeStepper (command `invoke_stepper`) now uses intermediate tensor dumps. It also uses `TensorHandles` as direct feeds during successive `cont` calls for improved performance and reduced memory consumption.
+* Initial release of installation guides for Java, C, and Go.
 
 ## Deprecations
 
@@ -70,14 +71,37 @@
   * Command history now persists across runs.
 * Bug fix in graph validation related to `tf.while_loops`.
 * Java Maven fixes for bugs with Windows installation.
-* Rollback of adjust contract change.
-* Initial release of installation guides for Java, C, and Go.
 
 ## Thanks to our Contributors
 
 This release contains contributions from many people at Google, as well as:
 
-A. Besir Kurtulmus, Adal Chiriliuc, @akash, Alec-Desouza, Alex Rothberg, Alex Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton Loss, @Aravind, @Arie, Ashutosh Das, AuréLien Geron, Bairen Yi, @bakunyo, Ben Visser, Brady Zhou, Calpa Liu, Changming Sun, Chi Zeng, Chih Cheng Liang, Christopher Berner, Clark Zinzow, @Conchylicultor, Damien Martin-Guillerez, Dan Ellis, Dan J, Dan Jarvis, Daniel Mané, Daniel Ylitalo, Darren Garvey, David Norman, David Truong, @DavidNorman, Dimitar Pavlov, Dmitry Persiyanov, @drpngx, @Eddie, @elirex, Erfan Noury, Eron Wright, Evgeny Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher Coder, Florian Courtial, Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang, @guilherme, @guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo Gao, Igor ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason Morton, Jay Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi, @jiqiu, Joan Thibault, John C F, Jojy George Varghese, Jon Malmaud, Julian Berman, Julian Niedermeier, Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle Bostelmann, @Lezcano, Li Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh, Marek Kolodziej, Mark Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael Gharbi, MichaëL Defferrard, Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal, Nayana Thorat, @nghiattran, Nicholas Connor, Nikolaas Steenbergen, Niraj Patel, Niranjan Hasabnis, @Panmari, Pavel Bulanov, Philip Pries Henningsen, Philipp Jund, @polonez, Prayag Verma, Rahul Kavi, Raphael Gontijo Lopes, @rasbt, Raven Iqqe, Reid Pryzant, Richard Shin, Rizwan Asif, Russell Kaplan, Ryo Asakura, RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay, Sean Papay, @seaotterman, @selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano Probst, @taknevski, @tbonza, @teldridge11, @terrytangyuan, Tim Anglade, Tomas Reimers, Tomer Gafner, Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad Firoiu, @wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yi Liu, Yuan (Terry) Tang, @Yufeng, Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
+A. Besir Kurtulmus, Adal Chiriliuc, @akash, Alec-Desouza, Alex Rothberg, Alex
+Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton 
+Loss, @Aravind, @Arie, Ashutosh Das, AuréLien Geron, Bairen Yi, @bakunyo, Ben
+Visser, Brady Zhou, Calpa Liu, Changming Sun, Chih Cheng Liang, Christopher
+Berner, Clark Zinzow, @Conchylicultor, Dan Ellis, Dan J, Dan Jarvis, Daniel
+Ylitalo, Darren Garvey, David Norman, David Truong, @DavidNorman, Dimitar
+Pavlov, Dmitry Persiyanov, @Eddie, @elirex, Erfan Noury, Eron Wright, Evgeny
+Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher Coder, Florian Courtial,
+Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang, @guilherme,
+@guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo Gao, Igor
+ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason Morton, Jay
+Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi, @jiqiu, Joan Thibault,
+John C F, Jojy George Varghese, Jon Malmaud, Julian Berman, Julian Niedermeier,
+Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle Bostelmann, @Lezcano, Li
+Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh, Marek Kolodziej, Mark
+Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael Gharbi, MichaëL Defferrard,
+Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal, Nayana Thorat, @nghiattran,
+Nicholas Connor, Nikolaas Steenbergen, Niraj Patel, Niranjan Hasabnis, @Panmari,
+Pavel Bulanov, Philip Pries Henningsen, Philipp Jund, @polonez, Prayag Verma, Rahul
+Kavi, Raphael Gontijo Lopes, @rasbt, Raven Iqqe, Reid Pryzant, Richard Shin, Rizwan
+Asif, Russell Kaplan, Ryo Asakura, RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay,
+Sean Papay, @seaotterman, @selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano
+Probst, @taknevski, @tbonza, @teldridge11, Tim Anglade, Tomas Reimers, Tomer Gafner,
+Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad Firoiu,
+@wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yi Liu, Yuan (Terry) Tang, @Yufeng,
+Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
 
 We are also grateful to all who filed issues or helped resolve them, asked and
 answered questions, and were part of inspiring discussions.
-- 
GitLab


From e5f156eb77e72f0bc879631d4758865fcdbeb842 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Fri, 31 Mar 2017 16:50:26 -0700
Subject: [PATCH 0047/1563] Increasing indent for one bug fix.

---
 RELEASE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE.md b/RELEASE.md
index b6720b84e5..ebb5c28451 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -69,7 +69,7 @@
 * Multiple tfdbg bug fixes:
   * Fixed Windows compatibility issues.
   * Command history now persists across runs.
-* Bug fix in graph validation related to `tf.while_loops`.
+  * Bug fix in graph validation related to `tf.while_loops`.
 * Java Maven fixes for bugs with Windows installation.
 
 ## Thanks to our Contributors
-- 
GitLab


From 9a92e63e9d10489bcf184f8203026d5cc71f3742 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 16:01:54 -0800
Subject: [PATCH 0048/1563] Fix typo. Change: 151885257

---
 tensorflow/docs_src/install/install_java.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 56c4b8d2c5..111b046689 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -105,7 +105,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
      <b>mvn -q compile exec:java</b></pre>
 
 
-The preceeding command should output <tt>Hello from <i>version</i></tt>. If it
+The preceding command should output <tt>Hello from <i>version</i></tt>. If it
 does, you've succesfully set up TensorFlow for Java and are ready to use it in
 Maven projects. If not, check
 [Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow)
-- 
GitLab


From 6f6e590d0465cbd3d3606d81ce7f5a5ba1bfb481 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 16:23:51 -0800
Subject: [PATCH 0049/1563] Refactor factorization_ops_test in
 contrib/factorization. Change: 151887259

---
 tensorflow/contrib/factorization/BUILD        |  15 ++
 .../python/ops/factorization_ops_test.py      | 196 ++++--------------
 .../ops/factorization_ops_test_utils.py       | 131 ++++++++++++
 3 files changed, 192 insertions(+), 150 deletions(-)
 create mode 100644 tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py

diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index aa26c6060f..c3fdc47242 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -161,12 +161,27 @@ tf_py_test(
     ],
 )
 
+tf_py_test(
+    name = "factorization_ops_test_utils",
+    srcs = [
+        "python/ops/factorization_ops_test_utils.py",
+    ],
+    additional_deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:embedding_ops",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:sparse_ops",
+    ],
+)
+
 tf_py_test(
     name = "factorization_ops_test",
     srcs = ["python/ops/factorization_ops_test.py"],
     additional_deps = [
         ":factorization_py",
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
+        ":factorization_ops_test_utils",
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
diff --git a/tensorflow/contrib/factorization/python/ops/factorization_ops_test.py b/tensorflow/contrib/factorization/python/ops/factorization_ops_test.py
index 40b8550ac8..bcee881854 100644
--- a/tensorflow/contrib/factorization/python/ops/factorization_ops_test.py
+++ b/tensorflow/contrib/factorization/python/ops/factorization_ops_test.py
@@ -18,160 +18,56 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import random
-
 import numpy as np
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.contrib.factorization.python.ops import factorization_ops
-from tensorflow.python.framework import constant_op
+from tensorflow.contrib.factorization.python.ops import factorization_ops_test_utils
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
-from tensorflow.python.ops import sparse_ops
 from tensorflow.python.platform import test
 
-INPUT_MATRIX = np.array(
-    [[0.1, 0.0, 0.2, 0.0, 0.4, 0.5, 0.0],
-     [0.0, 1.1, 0.0, 1.3, 1.4, 0.0, 1.6],
-     [2.0, 0.0, 0.0, 2.3, 0.0, 2.5, 0.0],
-     [3.0, 0.0, 3.2, 3.3, 0.0, 3.5, 0.0],
-     [0.0, 4.1, 0.0, 0.0, 4.4, 0.0, 4.6]]).astype(np.float32)
-
-
-def np_matrix_to_tf_sparse(np_matrix,
-                           row_slices=None,
-                           col_slices=None,
-                           transpose=False,
-                           shuffle=False):
-  """Simple util to slice non-zero np matrix elements as tf.SparseTensor."""
-  indices = np.nonzero(np_matrix)
-
-  # Only allow slices of whole rows or whole columns.
-  assert not (row_slices is not None and col_slices is not None)
-
-  if row_slices is not None:
-    selected_ind = np.concatenate(
-        [np.where(indices[0] == r)[0] for r in row_slices], 0)
-    indices = (indices[0][selected_ind], indices[1][selected_ind])
-
-  if col_slices is not None:
-    selected_ind = np.concatenate(
-        [np.where(indices[1] == c)[0] for c in col_slices], 0)
-    indices = (indices[0][selected_ind], indices[1][selected_ind])
-
-  if shuffle:
-    shuffled_ind = [x for x in range(len(indices[0]))]
-    random.shuffle(shuffled_ind)
-    indices = (indices[0][shuffled_ind], indices[1][shuffled_ind])
-
-  ind = (np.concatenate((np.expand_dims(indices[1], 1),
-                         np.expand_dims(indices[0], 1)), 1).astype(np.int64) if
-         transpose else np.concatenate((np.expand_dims(indices[0], 1),
-                                        np.expand_dims(indices[1], 1)),
-                                       1).astype(np.int64))
-  val = np_matrix[indices].astype(np.float32)
-  shape = (np.array([max(indices[1]) + 1, max(indices[0]) + 1]).astype(np.int64)
-           if transpose else np.array(
-               [max(indices[0]) + 1, max(indices[1]) + 1]).astype(np.int64))
-  return sparse_tensor.SparseTensor(ind, val, shape)
-
-
-def sparse_input():
-  return np_matrix_to_tf_sparse(INPUT_MATRIX)
-
-
-def count_rows(sp_input):
-  return math_ops.cast(
-      array_ops.shape(array_ops.unique(sp_input.indices[:, 0])[0])[0],
-      dtypes.float32)
-
-
-def count_cols(sp_input):
-  return math_ops.cast(
-      array_ops.shape(array_ops.unique(sp_input.indices[:, 1])[0])[0],
-      dtypes.float32)
-
-
-def calculate_loss(input_mat, row_factors, col_factors, regularization=None,
-                   w0=1., row_weights=None, col_weights=None):
-  """Calculates the loss of a given factorization.
-
-  Using a non distributed method, different than the one implemented in the
-  WALS model. The weight of an observed entry (i, j) (i.e. such that
-  input_mat[i, j] is non zero) is (w0 + row_weights[i]col_weights[j]).
-
-  Args:
-    input_mat: The input matrix, a SparseTensor of rank 2.
-    row_factors: The row factors, a dense Tensor of rank 2.
-    col_factors: The col factors, a dense Tensor of rank 2.
-    regularization: the regularization coefficient, a scalar.
-    w0: the weight of unobserved entries. A scalar.
-    row_weights: A dense tensor of rank 1.
-    col_weights: A dense tensor of rank 1.
-
-  Returns:
-    The total loss.
-  """
-  wr = (array_ops.expand_dims(row_weights, 1) if row_weights is not None
-        else constant_op.constant(1.))
-  wc = (array_ops.expand_dims(col_weights, 0) if col_weights is not None
-        else constant_op.constant(1.))
-  reg = (regularization if regularization is not None
-         else constant_op.constant(0.))
-
-  row_indices, col_indices = array_ops.split(input_mat.indices,
-                                             axis=1,
-                                             num_or_size_splits=2)
-  gathered_row_factors = array_ops.gather(row_factors, row_indices)
-  gathered_col_factors = array_ops.gather(col_factors, col_indices)
-  sp_approx_vals = array_ops.squeeze(math_ops.matmul(
-      gathered_row_factors, gathered_col_factors, adjoint_b=True))
-  sp_approx = sparse_tensor.SparseTensor(
-      indices=input_mat.indices,
-      values=sp_approx_vals,
-      dense_shape=input_mat.dense_shape)
-
-  sp_approx_sq = math_ops.square(sp_approx)
-  row_norm = math_ops.reduce_sum(math_ops.square(row_factors))
-  col_norm = math_ops.reduce_sum(math_ops.square(col_factors))
-  row_col_norm = math_ops.reduce_sum(math_ops.square(math_ops.matmul(
-      row_factors, col_factors, transpose_b=True)))
-
-  resid = sparse_ops.sparse_add(input_mat, sp_approx * (-1))
-  resid_sq = math_ops.square(resid)
-  loss = w0 * (
-      sparse_ops.sparse_reduce_sum(resid_sq) -
-      sparse_ops.sparse_reduce_sum(sp_approx_sq)
-      )
-  loss += (sparse_ops.sparse_reduce_sum(wr * (resid_sq * wc)) +
-           w0 * row_col_norm + reg * (row_norm + col_norm))
-  return loss.eval()
-
-
-def calculate_loss_from_wals_model(wals_model, sp_inputs):
-  current_rows = embedding_ops.embedding_lookup(
-      wals_model.row_factors, math_ops.range(wals_model._input_rows),
-      partition_strategy="div")
-  current_cols = embedding_ops.embedding_lookup(
-      wals_model.col_factors, math_ops.range(wals_model._input_cols),
-      partition_strategy="div")
-  row_wts = embedding_ops.embedding_lookup(
-      wals_model._row_weights, math_ops.range(wals_model._input_rows),
-      partition_strategy="div")
-  col_wts = embedding_ops.embedding_lookup(
-      wals_model._col_weights, math_ops.range(wals_model._input_cols),
-      partition_strategy="div")
-  return calculate_loss(
-      sp_inputs, current_rows, current_cols, wals_model._regularization,
-      wals_model._unobserved_weight, row_wts, col_wts)
+
+INPUT_MATRIX = factorization_ops_test_utils.INPUT_MATRIX
+np_matrix_to_tf_sparse = factorization_ops_test_utils.np_matrix_to_tf_sparse
 
 
 class WalsModelTest(test.TestCase):
 
+  def sparse_input(self):
+    return np_matrix_to_tf_sparse(INPUT_MATRIX)
+
+  def count_rows(self, sp_input):
+    return math_ops.cast(
+        array_ops.shape(array_ops.unique(sp_input.indices[:, 0])[0])[0],
+        dtypes.float32)
+
+  def count_cols(self, sp_input):
+    return math_ops.cast(
+        array_ops.shape(array_ops.unique(sp_input.indices[:, 1])[0])[0],
+        dtypes.float32)
+
+  def calculate_loss_from_wals_model(self, wals_model, sp_inputs):
+    current_rows = embedding_ops.embedding_lookup(
+        wals_model.row_factors, math_ops.range(wals_model._input_rows),
+        partition_strategy="div")
+    current_cols = embedding_ops.embedding_lookup(
+        wals_model.col_factors, math_ops.range(wals_model._input_cols),
+        partition_strategy="div")
+    row_wts = embedding_ops.embedding_lookup(
+        wals_model._row_weights, math_ops.range(wals_model._input_rows),
+        partition_strategy="div")
+    col_wts = embedding_ops.embedding_lookup(
+        wals_model._col_weights, math_ops.range(wals_model._input_cols),
+        partition_strategy="div")
+    return factorization_ops_test_utils.calculate_loss(
+        sp_inputs, current_rows, current_cols, wals_model._regularization,
+        wals_model._unobserved_weight, row_wts, col_wts)
+
   def setUp(self):
     self.col_init = [
         # shard 0
@@ -208,7 +104,7 @@ class WalsModelTest(test.TestCase):
                               use_factors_weights_cache,
                               compute_loss=False):
     with ops.Graph().as_default(), self.test_session() as sess:
-      self._wals_inputs = sparse_input()
+      self._wals_inputs = self.sparse_input()
       sp_feeder = array_ops.sparse_placeholder(dtypes.float32)
       num_rows = 5
       num_cols = 7
@@ -282,10 +178,10 @@ class WalsModelTest(test.TestCase):
       if compute_loss:
         # Test loss computation after the row update
         loss = sum(
-            sess.run(factor_loss * count_rows(inp) / num_rows,
+            sess.run(factor_loss * self.count_rows(inp) / num_rows,
                      feed_dict={sp_feeder: inp})
             for inp in input_scattered_rows)
-        true_loss = calculate_loss_from_wals_model(
+        true_loss = self.calculate_loss_from_wals_model(
             wals_model, self._wals_inputs)
         self.assertNear(
             loss, true_loss, err=.001,
@@ -355,10 +251,10 @@ class WalsModelTest(test.TestCase):
       if compute_loss:
         # Test loss computation after the column update.
         loss = sum(
-            sess.run(factor_loss * count_cols(inp) / num_cols,
+            sess.run(factor_loss * self.count_cols(inp) / num_cols,
                      feed_dict={sp_feeder: inp})
             for inp in input_scattered_cols_non_duplicate)
-        true_loss = calculate_loss_from_wals_model(
+        true_loss = self.calculate_loss_from_wals_model(
             wals_model, self._wals_inputs)
         self.assertNear(
             loss, true_loss, err=.001,
@@ -368,7 +264,7 @@ class WalsModelTest(test.TestCase):
   def _run_test_process_input_transposed(self, use_factors_weights_cache,
                                          compute_loss=False):
     with ops.Graph().as_default(), self.test_session() as sess:
-      self._wals_inputs = sparse_input()
+      self._wals_inputs = self.sparse_input()
       sp_feeder = array_ops.sparse_placeholder(dtypes.float32)
       num_rows = 5
       num_cols = 7
@@ -448,10 +344,10 @@ class WalsModelTest(test.TestCase):
       if compute_loss:
         # Test loss computation after the row update
         loss = sum(
-            sess.run(factor_loss * count_cols(inp) / num_rows,
+            sess.run(factor_loss * self.count_cols(inp) / num_rows,
                      feed_dict={sp_feeder: inp})
             for inp in input_scattered_rows_non_duplicate)
-        true_loss = calculate_loss_from_wals_model(
+        true_loss = self.calculate_loss_from_wals_model(
             wals_model, self._wals_inputs)
         self.assertNear(
             loss, true_loss, err=.001,
@@ -516,10 +412,10 @@ class WalsModelTest(test.TestCase):
       if compute_loss:
         # Test loss computation after the col update
         loss = sum(
-            sess.run(factor_loss * count_rows(inp) / num_cols,
+            sess.run(factor_loss * self.count_rows(inp) / num_cols,
                      feed_dict={sp_feeder: inp})
             for inp in input_scattered_cols_non_duplicate)
-        true_loss = calculate_loss_from_wals_model(
+        true_loss = self.calculate_loss_from_wals_model(
             wals_model, self._wals_inputs)
         self.assertNear(
             loss, true_loss, err=.001,
@@ -534,7 +430,7 @@ class WalsModelTest(test.TestCase):
   # Here we test that those two give identical results.
   def _run_test_als(self, use_factors_weights_cache):
     with ops.Graph().as_default(), self.test_session():
-      self._wals_inputs = sparse_input()
+      self._wals_inputs = self.sparse_input()
       col_init = np.random.rand(7, 3)
       als_model = factorization_ops.WALSModel(
           5,
@@ -613,7 +509,7 @@ class WalsModelTest(test.TestCase):
 
   def _run_test_als_transposed(self, use_factors_weights_cache):
     with ops.Graph().as_default(), self.test_session():
-      self._wals_inputs = sparse_input()
+      self._wals_inputs = self.sparse_input()
       col_init = np.random.rand(7, 3)
       als_model = factorization_ops.WALSModel(
           5,
diff --git a/tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py b/tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py
new file mode 100644
index 0000000000..6957211973
--- /dev/null
+++ b/tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py
@@ -0,0 +1,131 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Test utils for factorization_ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import random
+
+import numpy as np
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import sparse_ops
+
+
+INPUT_MATRIX = np.array(
+    [[0.1, 0.0, 0.2, 0.0, 0.4, 0.5, 0.0],
+     [0.0, 1.1, 0.0, 1.3, 1.4, 0.0, 1.6],
+     [2.0, 0.0, 0.0, 2.3, 0.0, 2.5, 0.0],
+     [3.0, 0.0, 3.2, 3.3, 0.0, 3.5, 0.0],
+     [0.0, 4.1, 0.0, 0.0, 4.4, 0.0, 4.6]]).astype(np.float32)
+
+
+def np_matrix_to_tf_sparse(np_matrix,
+                           row_slices=None,
+                           col_slices=None,
+                           transpose=False,
+                           shuffle=False):
+  """Simple util to slice non-zero np matrix elements as tf.SparseTensor."""
+  indices = np.nonzero(np_matrix)
+
+  # Only allow slices of whole rows or whole columns.
+  assert not (row_slices is not None and col_slices is not None)
+
+  if row_slices is not None:
+    selected_ind = np.concatenate(
+        [np.where(indices[0] == r)[0] for r in row_slices], 0)
+    indices = (indices[0][selected_ind], indices[1][selected_ind])
+
+  if col_slices is not None:
+    selected_ind = np.concatenate(
+        [np.where(indices[1] == c)[0] for c in col_slices], 0)
+    indices = (indices[0][selected_ind], indices[1][selected_ind])
+
+  if shuffle:
+    shuffled_ind = [x for x in range(len(indices[0]))]
+    random.shuffle(shuffled_ind)
+    indices = (indices[0][shuffled_ind], indices[1][shuffled_ind])
+
+  ind = (np.concatenate((np.expand_dims(indices[1], 1),
+                         np.expand_dims(indices[0], 1)), 1).astype(np.int64) if
+         transpose else np.concatenate((np.expand_dims(indices[0], 1),
+                                        np.expand_dims(indices[1], 1)),
+                                       1).astype(np.int64))
+  val = np_matrix[indices].astype(np.float32)
+  shape = (np.array([max(indices[1]) + 1, max(indices[0]) + 1]).astype(np.int64)
+           if transpose else np.array(
+               [max(indices[0]) + 1, max(indices[1]) + 1]).astype(np.int64))
+  return sparse_tensor.SparseTensor(ind, val, shape)
+
+
+def calculate_loss(input_mat, row_factors, col_factors, regularization=None,
+                   w0=1., row_weights=None, col_weights=None):
+  """Calculates the loss of a given factorization.
+
+  Using a non distributed method, different than the one implemented in the
+  WALS model. The weight of an observed entry (i, j) (i.e. such that
+  input_mat[i, j] is non zero) is (w0 + row_weights[i]col_weights[j]).
+
+  Args:
+    input_mat: The input matrix, a SparseTensor of rank 2.
+    row_factors: The row factors, a dense Tensor of rank 2.
+    col_factors: The col factors, a dense Tensor of rank 2.
+    regularization: the regularization coefficient, a scalar.
+    w0: the weight of unobserved entries. A scalar.
+    row_weights: A dense tensor of rank 1.
+    col_weights: A dense tensor of rank 1.
+
+  Returns:
+    The total loss.
+  """
+  wr = (array_ops.expand_dims(row_weights, 1) if row_weights is not None
+        else constant_op.constant(1.))
+  wc = (array_ops.expand_dims(col_weights, 0) if col_weights is not None
+        else constant_op.constant(1.))
+  reg = (regularization if regularization is not None
+         else constant_op.constant(0.))
+
+  row_indices, col_indices = array_ops.split(input_mat.indices,
+                                             axis=1,
+                                             num_or_size_splits=2)
+  gathered_row_factors = array_ops.gather(row_factors, row_indices)
+  gathered_col_factors = array_ops.gather(col_factors, col_indices)
+  sp_approx_vals = array_ops.squeeze(math_ops.matmul(
+      gathered_row_factors, gathered_col_factors, adjoint_b=True))
+  sp_approx = sparse_tensor.SparseTensor(
+      indices=input_mat.indices,
+      values=sp_approx_vals,
+      dense_shape=input_mat.dense_shape)
+
+  sp_approx_sq = math_ops.square(sp_approx)
+  row_norm = math_ops.reduce_sum(math_ops.square(row_factors))
+  col_norm = math_ops.reduce_sum(math_ops.square(col_factors))
+  row_col_norm = math_ops.reduce_sum(math_ops.square(math_ops.matmul(
+      row_factors, col_factors, transpose_b=True)))
+
+  resid = sparse_ops.sparse_add(input_mat, sp_approx * (-1))
+  resid_sq = math_ops.square(resid)
+  loss = w0 * (
+      sparse_ops.sparse_reduce_sum(resid_sq) -
+      sparse_ops.sparse_reduce_sum(sp_approx_sq)
+      )
+  loss += (sparse_ops.sparse_reduce_sum(wr * (resid_sq * wc)) +
+           w0 * row_col_norm + reg * (row_norm + col_norm))
+  return loss.eval()
-- 
GitLab


From 4b7e06d12d48e9f9b71de4b067b70381a125ecc1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 31 Mar 2017 17:03:57 -0800
Subject: [PATCH 0050/1563] Add an option to color graph explorer nodes by XLA
 cluster.

The XLA Cluster coloring option is only enabled if the graph contains at least 1 node with an XLA cluster specified. Added tooltips to clarify this. The tooltips appear when a user hovers over some of the radio buttons.

Updated screen diff tests, some of which are not related to this change, but are worth updating.
Change: 151889939
---
 .../tf_graph/tf-graph-controls.html           | 76 +++++++++++++++++--
 .../components/tf_graph/tf-graph.html         |  9 ++-
 .../components/tf_graph_common/lib/graph.ts   | 34 ++++++++-
 .../tf_graph_common/lib/hierarchy.ts          | 19 ++++-
 .../components/tf_graph_common/lib/render.ts  | 32 +++++++-
 .../tf_graph_common/lib/scene/node.ts         |  6 +-
 6 files changed, 158 insertions(+), 18 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html
index dce0708d0c..f2a1b5658f 100644
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html
+++ b/tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html
@@ -145,7 +145,7 @@ svg.icon {
 .title small {
   font-weight: normal;
 }
-.deviceList {
+.deviceList, .xlaClusterList {
   max-height: 200px;
   overflow-y: auto;
 }
@@ -235,6 +235,12 @@ table.control-holder {
 table.tf-graph-controls td.input-element-table-data {
   padding: 0 0 0 20px;
 }
+
+/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
+/*  tooltips do not appear. */
+#color-by-radio-group paper-radio-button {
+  pointer-events: auto !important;
+}
 </style>
 <svg width="0" height="0">
   <defs>
@@ -317,13 +323,39 @@ table.tf-graph-controls td.input-element-table-data {
   </table>
   <div class="control-holder">
     <div class="title">Color</div>
-    <paper-radio-group selected="{{colorBy}}">
+    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
       <paper-radio-button name="structure">Structure</paper-radio-button>
+
       <paper-radio-button name="device">Device</paper-radio-button>
-      <template is="dom-if" if="[[_statsNotNull(stats)]]">
-        <paper-radio-button name="compute_time">Compute time</paper-radio-button>
-        <paper-radio-button name="memory">Memory</paper-radio-button>
-      </template>
+
+      <paper-radio-button id="xla-cluster-radio-button"
+                          name="xla_cluster"
+                          disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
+        XLA Cluster
+      </paper-radio-button>
+      <paper-tooltip for="xla-cluster-radio-button" position="right">
+        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
+      </paper-tooltip>
+
+      <paper-radio-button id="compute-time-radio-button"
+                          name="compute_time"
+                          disabled="[[!stats]]">
+        Compute time
+      </paper-radio-button>
+      <paper-tooltip for="compute-time-radio-button" position="right">
+        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
+
+      <paper-radio-button id="memory-radio-button"
+                          name="memory"
+                          disabled="[[!stats]]">
+        Memory
+      </paper-radio-button>
+      <paper-tooltip for="memory-radio-button" position="right">
+        Coloring by memory is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
     </paper-radio-group>
   </div>
   <div>
@@ -410,6 +442,32 @@ table.tf-graph-controls td.input-element-table-data {
         </div>
       </div>
     </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
+      <div class="color-text">
+        <div class="xlaClusterList">
+          <table>
+          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
+            <tr>
+              <td style$="[[_getBackgroundColor(item.color)]]">
+                <div class="colorBox"></div>
+              </td>
+              <td>
+                <div>[[item.xla_cluster]]</div>
+              </td>
+            </tr>
+          </template>
+          </table>
+        </div>
+        <br/>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                 xlink:href="#grey-rect" x="0" y="0"/>
+          </svg>
+          <span class="color-legend-value">unknown XLA cluster</span>
+        </div>
+      </div>
+    </template>
     <template is="dom-if" if="[[_statsNotNull(stats)]]">
       <div class="color-legend-row">
         <svg>
@@ -620,8 +678,10 @@ Polymer({
     this.renderHierarchy.traceInputs = event.target.active;
     tf.graph.scene.node.traceInputs(this.renderHierarchy);
   },
-  _statsNotNull: function(stats) {
-    return stats != null;
+  _xlaClustersProvided: function(renderHierarchy) {
+    return renderHierarchy &&
+        renderHierarchy.hierarchy &&
+        renderHierarchy.hierarchy.xlaClusters.length > 0;
   },
   _statsChanged: function(stats) {
     if (stats == null) {
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph.html b/tensorflow/tensorboard/components/tf_graph/tf-graph.html
index 8792f475c4..efbf065a40 100644
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph.html
+++ b/tensorflow/tensorboard/components/tf_graph/tf-graph.html
@@ -172,7 +172,14 @@ Polymer({
             device: deviceName,
             color: renderGraph.deviceColorMap(deviceName)
           };
-        })
+        }),
+        xla_cluster: _.map(renderGraph.xlaClusterColorMap.domain(),
+            function(xlaClusterName) {
+          return {
+            xla_cluster: xlaClusterName,
+            color: renderGraph.xlaClusterColorMap(xlaClusterName)
+          };
+        }),
       });
       this._setRenderHierarchy(renderGraph);
       this.async(function() {
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/graph.ts b/tensorflow/tensorboard/components/tf_graph_common/lib/graph.ts
index 13d5d2fc60..12a92e3955 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/lib/graph.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/lib/graph.ts
@@ -42,6 +42,9 @@ export enum SeriesGroupingType {GROUP, UNGROUP};
 /** Attribute key reserved for the shapes of the output tensors. */
 const OUTPUT_SHAPES_KEY = '_output_shapes';
 
+/** Attribute key reserved for the XLA cluster that an op runs on. */
+const _XLA_CLUSTER_KEY = '_XlaCluster';
+
 /**
  * A BaseEdge is the label object (in the graphlib sense) for an edge in the
  * original, full graph produced after parsing. Subsequent graphs, like those
@@ -133,6 +136,7 @@ export type TensorShape = number[];
 
 export interface OpNode extends Node {
   op: string;
+  // The device on which the op ran. Null if it is unknown.
   device: string;
   attr: {key: string, value: any}[];
   inputs: NormalizedInput[];
@@ -154,6 +158,8 @@ export interface OpNode extends Node {
    *       of the middle dimension is unknown (encoded as -1).
    */
   outputShapes: TensorShape[];
+  // The XLA Cluster on which the op ran. Null if it is unknown.
+  xlaCluster: string;
 }
 
 export interface BridgeNode extends Node {
@@ -349,6 +355,7 @@ export class OpNodeImpl implements OpNode {
   owningSeries: string;
   outputShapes: TensorShape[];
   nodeAttributes: {[key: string]: any;};
+  xlaCluster: string;
 
   /**
    * Constructs a new Op node.
@@ -366,6 +373,7 @@ export class OpNodeImpl implements OpNode {
     // control dependency.
     this.inputs = normalizeInputs(rawNode.input);
     this.outputShapes = extractOutputShapes(rawNode.attr);
+    this.xlaCluster = extractXlaCluster(rawNode.attr);
     // additional properties
     this.type = NodeType.OP;
     this.isGroupNode = false;
@@ -799,7 +807,9 @@ class SeriesNodeImpl implements SeriesNode {
  * Extracts the shapes of the output tensors from the attr property in the
  * node proto.
  */
-function extractOutputShapes(attr: {key: string, value: any}[]): TensorShape[] {
+// tslint:disable-next-line:no-any
+function extractOutputShapes(attr: Array<{key: string, value: any}>):
+    TensorShape[] {
   let result = null;
   // We don't know anything about the output tensors.
   if (!attr) {
@@ -843,6 +853,28 @@ function extractOutputShapes(attr: {key: string, value: any}[]): TensorShape[] {
   return null;
 }
 
+/**
+ * Extracts the XLA Cluster that an op runs on from the attrs of the OpNode.
+ * @param attr The attr property.
+ * @return A string that is the name of the cluster. Or null if it could not be
+ *     determined.
+ */
+// tslint:disable-next-line:no-any
+function extractXlaCluster(attr: Array<{key: string, value: any}>): string|
+    null {
+  if (!attr) {
+    return null;
+  }
+
+  // Find the attribute for XLA cluster if there is one.
+  for (let i = 0; i < attr.length; i++) {
+    if (attr[i].key === _XLA_CLUSTER_KEY) {
+      return attr[i].value['s'] || null;
+    }
+  }
+  return null;
+}
+
 /**
  * Normalizes the inputs and extracts associated metadata:
  * 1) Inputs can contain a colon followed by a number at the end
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/hierarchy.ts b/tensorflow/tensorboard/components/tf_graph_common/lib/hierarchy.ts
index 52c809dff7..6b90c7bb0f 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/lib/hierarchy.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/lib/hierarchy.ts
@@ -30,6 +30,8 @@ export interface Hierarchy {
   templates: {[templateId: string]: string[]};
   /** List of all device names */
   devices: string[];
+  /** List of all XLA cluster names */
+  xlaClusters: string[];
   /** True if at least one tensor in the graph has shape information */
   hasShapeInfo: boolean;
   /** The maximum size across all meta edges. Used for scaling thickness. */
@@ -52,6 +54,7 @@ class HierarchyImpl implements Hierarchy {
   templates: {[templateId: string]: string[]};
   private index: {[nodeName: string]: GroupNode|OpNode};
   devices: string[];
+  xlaClusters: string[];
   hasShapeInfo = false;
   maxMetaEdgeSize = 1;
   orderings: { [nodeName: string]: { [childName: string]: number } };
@@ -395,14 +398,22 @@ export function build(graph: tf.graph.SlimGraph, params: HierarchyParams,
       .runAsyncTask(
           'Adding nodes', 20,
           () => {
-            // Get all the possible device names.
+            // Get all the possible device and XLA cluster names.
             let deviceNames = {};
+            let xlaClusterNames = {};
             _.each(graph.nodes, (node, nodeName) => {
-              if (node.device != null) {
+              if (node.device) {
                 deviceNames[node.device] = true;
               }
+
+              if (node.xlaCluster) {
+                xlaClusterNames[node.xlaCluster] = true;
+              }
             });
+
             h.devices = _.keys(deviceNames);
+            h.xlaClusters = _.keys(xlaClusterNames);
+
             addNodes(h, graph);
           },
           tracker)
@@ -426,7 +437,9 @@ export function build(graph: tf.graph.SlimGraph, params: HierarchyParams,
               h.templates = template.detect(h, params.verifyTemplate);
             }, tracker);
       })
-      .then(() => { return h; });
+      .then(() => {
+        return h;
+      });
 };
 
 export function joinAndAggregateStats(
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/render.ts b/tensorflow/tensorboard/components/tf_graph_common/lib/render.ts
index ae5d1a7c57..1c20b40027 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/lib/render.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/lib/render.ts
@@ -45,7 +45,7 @@ export let MetanodeColors = {
    * Standard hue values for node color palette.
    */
   HUES: [220, 100, 180, 40, 20, 340, 260, 300, 140, 60],
-  STRUCTURE_PALETTE: function(id: number, lightened?: boolean) {
+  STRUCTURE_PALETTE(id: number, lightened?: boolean) {
     // The code below is a flexible way to computationally create a set
     // of colors that go well together.
     let hues = MetanodeColors.HUES;
@@ -56,8 +56,12 @@ export let MetanodeColors = {
     let light = lightened ? 95 : 80;
     return d3.hsl(hue, .01 * sat, .01 * light).toString();
   },
-  DEVICE_PALETTE: function(index: number):
-      string { return MetanodeColors.STRUCTURE_PALETTE(index);},
+  DEVICE_PALETTE(index: number): string {
+    return MetanodeColors.STRUCTURE_PALETTE(index);
+  },
+  XLA_CLUSTER_PALETTE(index: number): string {
+    return MetanodeColors.STRUCTURE_PALETTE(index);
+  },
   UNKNOWN: '#eee',
   GRADIENT_OUTLINE: '#888'
 };
@@ -159,6 +163,7 @@ export class RenderGraphInfo {
   private index: {[nodeName: string]: RenderNodeInfo};
   private renderedOpNames: string[];
   private deviceColorMap: d3.scale.Ordinal<string, string>;
+  private xlaClusterColorMap: d3.scale.Ordinal<string, string>;
   private memoryUsageScale: d3.scale.Linear<string, string>;
   private computeTimeScale: d3.scale.Linear<string, string>;
   /** Scale for the thickness of edges when there is no shape information. */
@@ -196,6 +201,13 @@ export class RenderGraphInfo {
         .range(_.map(d3.range(this.hierarchy.devices.length),
                      MetanodeColors.DEVICE_PALETTE));
 
+    this.xlaClusterColorMap =
+        d3.scale.ordinal<string>()
+            .domain(this.hierarchy.xlaClusters)
+            .range(_.map(
+                d3.range(this.hierarchy.xlaClusters.length),
+                MetanodeColors.XLA_CLUSTER_PALETTE));
+
     let topLevelGraph = this.hierarchy.root.metagraph;
     // Find the maximum and minimum memory usage.
     let memoryExtent = d3.extent(topLevelGraph.nodes(),
@@ -277,6 +289,13 @@ export class RenderGraphInfo {
         this.computeTimeScale(node.stats.totalMicros);
     }
 
+    if (!node.isGroupNode) {
+      let clusterName = (node as OpNode).xlaCluster;
+      if (clusterName) {
+        renderInfo.xlaClusterColor = this.xlaClusterColorMap(clusterName);
+      }
+    }
+
     // We only fade nodes when we're displaying stats.
     renderInfo.isFadedOut = this.displayingStats &&
         !tf.graph.util.hasDisplayableNodeStats(node.stats);
@@ -1031,7 +1050,12 @@ export class RenderNodeInfo {
    * its children. If this node is an op node, this list will have only one
    * color with proportion 1.0.
    */
-  deviceColors: {color: string, proportion: number}[];
+  deviceColors: Array<{color: string, proportion: number}>;
+
+  /**
+   * Color according to the XLA cluster of this node.
+   */
+  xlaClusterColor: string;
 
   /**
    * Color according to the memory usage of this node.
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/node.ts b/tensorflow/tensorboard/components/tf_graph_common/lib/scene/node.ts
index bbfee96e44..e319424310 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/node.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/lib/scene/node.ts
@@ -591,7 +591,8 @@ function position(nodeGroup, d: render.RenderNodeInfo) {
 };
 
 /** Enum specifying the options to color nodes by */
-export enum ColorBy { STRUCTURE, DEVICE, COMPUTE_TIME, MEMORY };
+export enum ColorBy {STRUCTURE, DEVICE, XLA_CLUSTER, COMPUTE_TIME, MEMORY}
+;
 
 /**
  * Returns the fill color for the node given its state and the 'color by'
@@ -648,6 +649,9 @@ export function getFillForNode(templateIndex, colorBy,
         });
       }
       return isExpanded ? colorParams.EXPANDED_COLOR : `url(#${escapedId})`;
+    case ColorBy.XLA_CLUSTER:
+      return isExpanded ? colorParams.EXPANDED_COLOR :
+                          renderInfo.xlaClusterColor || colorParams.UNKNOWN;
     case ColorBy.COMPUTE_TIME:
       return isExpanded ?
         colorParams.EXPANDED_COLOR : renderInfo.computeTimeColor ||
-- 
GitLab


From 5522057de40710a3f56208438fb7b9e1023159eb Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Tue, 28 Mar 2017 14:26:27 -0800
Subject: [PATCH 0051/1563] Disable gradients_test testWarnings for python
 versions 3.6 or above. Change: 151507105

---
 tensorflow/python/ops/gradients_test.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/ops/gradients_test.py b/tensorflow/python/ops/gradients_test.py
index 4f9196daa4..dd28f4e64e 100644
--- a/tensorflow/python/ops/gradients_test.py
+++ b/tensorflow/python/ops/gradients_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import sys
 import warnings
 
 import numpy as np
@@ -559,13 +560,16 @@ class IndexedSlicesToTensorTest(test_util.TensorFlowTestCase):
       self.assertAllClose(np_val, c_dense.eval())
 
   def testWarnings(self):
-    # Smaller than the threshold: no warning.
-    c_sparse = ops.IndexedSlices(
-        array_ops.placeholder(dtypes.float32),
-        array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
-    with warnings.catch_warnings(record=True) as w:
-      math_ops.multiply(c_sparse, 1.0)
-    self.assertEqual(0, len(w))
+    # TODO(gunan) Reenable after this issue is fixed:
+    # https://github.com/google/protobuf/issues/2812
+    if sys.version_info < (3, 6):
+      # Smaller than the threshold: no warning.
+      c_sparse = ops.IndexedSlices(
+          array_ops.placeholder(dtypes.float32),
+          array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
+      with warnings.catch_warnings(record=True) as w:
+        math_ops.multiply(c_sparse, 1.0)
+      self.assertEqual(0, len(w))
 
     # Greater than or equal to the threshold: warning.
     c_sparse = ops.IndexedSlices(
-- 
GitLab


From 512c21c06600b16d1acd9c1cf3c4faeb8e3a88e1 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 31 Mar 2017 17:28:17 -0800
Subject: [PATCH 0052/1563] Don't prune nodes that are driven by control
 dependencies to avoid potentially increasing the number of control edges Keep
 pruned nodes in the graph in case someone wants to fetch their value Change:
 151891305

---
 .../grappler/optimizers/graph_rewriter.cc     | 10 ++++
 .../core/grappler/optimizers/graph_rewriter.h |  4 ++
 .../core/grappler/optimizers/model_pruner.cc  | 17 ++++---
 .../grappler/optimizers/model_pruner_test.cc  | 46 +++++++++++++------
 4 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/graph_rewriter.cc b/tensorflow/core/grappler/optimizers/graph_rewriter.cc
index fbb7e849ba..d1ab5a1d9b 100644
--- a/tensorflow/core/grappler/optimizers/graph_rewriter.cc
+++ b/tensorflow/core/grappler/optimizers/graph_rewriter.cc
@@ -64,5 +64,15 @@ bool GraphRewriter::DrivesControlDependency(const NodeDef& node) const {
          control_dependency_drivers_.end();
 }
 
+bool GraphRewriter::IsDrivenByControlDependency(const NodeDef& node) const {
+  for (const auto& input : node.input()) {
+    CHECK(!input.empty());
+    if (input[0] == '^') {
+      return true;
+    }
+  }
+  return false;
+}
+
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/graph_rewriter.h b/tensorflow/core/grappler/optimizers/graph_rewriter.h
index a9cc777809..adbe5a24c8 100644
--- a/tensorflow/core/grappler/optimizers/graph_rewriter.h
+++ b/tensorflow/core/grappler/optimizers/graph_rewriter.h
@@ -43,6 +43,10 @@ class GraphRewriter {
   // a control dependency edge.
   bool DrivesControlDependency(const NodeDef& node) const;
 
+  // Returns true if at least one of the incident edges is a control dependency
+  // edge.
+  bool IsDrivenByControlDependency(const NodeDef& node) const;
+
  private:
   std::unordered_map<string, const NodeDef*> nodes_;
   std::unordered_set<const NodeDef*> control_dependency_drivers_;
diff --git a/tensorflow/core/grappler/optimizers/model_pruner.cc b/tensorflow/core/grappler/optimizers/model_pruner.cc
index a89831b6e6..4707266572 100644
--- a/tensorflow/core/grappler/optimizers/model_pruner.cc
+++ b/tensorflow/core/grappler/optimizers/model_pruner.cc
@@ -51,24 +51,27 @@ Status ModelPruner::Optimize(Cluster* cluster, const GrapplerItem& item,
       continue;
     }
     // Don't remove nodes that drive control dependencies.
-    if (!rewriter.DrivesControlDependency(node)) {
+    // Don't remove nodes that are driven by control dependencies either since
+    // we can't ensure (yet) that we won't increase the number of control
+    // dependency edges by deleting them (for example, removing a node driven by
+    // 10 control edges and driving 10 control edges would result in the
+    // creation of 100 edges).
+    if (!rewriter.DrivesControlDependency(node) &&
+        !rewriter.IsDrivenByControlDependency(node)) {
       nodes_to_delete.insert(&node);
     }
   }
 
   for (auto& node : item.graph.node()) {
-    if (nodes_to_delete.find(&node) != nodes_to_delete.end()) {
-      continue;
-    }
     NodeDef* new_node = pruned_graph->add_node();
     *new_node = node;
     new_node->clear_input();
     rewriter.ForwardInputs(node, nodes_to_delete, new_node);
   }
 
-  LOG(INFO) << "Pruned " << nodes_to_delete.size()
-            << " nodes from the graph. The graph now contains "
-            << pruned_graph->node_size() << " nodes.";
+  VLOG(1) << "Pruned " << nodes_to_delete.size()
+          << " nodes from the graph. The graph now contains "
+          << pruned_graph->node_size() << " nodes.";
 
   return Status::OK();
 }
diff --git a/tensorflow/core/grappler/optimizers/model_pruner_test.cc b/tensorflow/core/grappler/optimizers/model_pruner_test.cc
index 47d45a6f49..67954d2914 100644
--- a/tensorflow/core/grappler/optimizers/model_pruner_test.cc
+++ b/tensorflow/core/grappler/optimizers/model_pruner_test.cc
@@ -70,16 +70,22 @@ TEST_F(ModelPrunerTest, StopGradientPruning) {
   Status status = pruner.Optimize(nullptr, item, &output);
   TF_EXPECT_OK(status);
 
-  EXPECT_EQ(3, output.node_size());
+  EXPECT_EQ(5, output.node_size());
   const NodeDef& new_a = output.node(0);
   EXPECT_EQ(NodeName(a.name()), new_a.name());
   const NodeDef& new_b = output.node(1);
   EXPECT_EQ(NodeName(b.name()), new_b.name());
-  const NodeDef& new_e = output.node(2);
+  const NodeDef& new_c = output.node(2);
+  EXPECT_EQ(NodeName(c.name()), new_c.name());
+  const NodeDef& new_d = output.node(3);
+  EXPECT_EQ(NodeName(d.name()), new_d.name());
+  const NodeDef& new_e = output.node(4);
   EXPECT_EQ(NodeName(e.name()), new_e.name());
 
   EXPECT_EQ(1, new_e.input_size());
   EXPECT_EQ(NodeName(b.name()), new_e.input(0));
+  EXPECT_EQ(1, new_d.input_size());
+  EXPECT_EQ(NodeName(b.name()), new_d.input(0));
 }
 
 TEST_F(ModelPrunerTest, IdentityPruning) {
@@ -104,18 +110,22 @@ TEST_F(ModelPrunerTest, IdentityPruning) {
   Status status = pruner.Optimize(nullptr, item, &output);
   TF_EXPECT_OK(status);
 
-  EXPECT_EQ(4, output.node_size());
+  EXPECT_EQ(5, output.node_size());
   const NodeDef& new_a = output.node(0);
   EXPECT_EQ(NodeName(a.name()), new_a.name());
   const NodeDef& new_b = output.node(1);
   EXPECT_EQ(NodeName(b.name()), new_b.name());
   const NodeDef& new_c = output.node(2);
   EXPECT_EQ(NodeName(c.name()), new_c.name());
-  const NodeDef& new_e = output.node(3);
+  const NodeDef& new_d = output.node(3);
+  EXPECT_EQ(NodeName(d.name()), new_d.name());
+  const NodeDef& new_e = output.node(4);
   EXPECT_EQ(NodeName(e.name()), new_e.name());
 
   EXPECT_EQ(1, new_e.input_size());
   EXPECT_EQ(NodeName(c.name()), new_e.input(0));
+  EXPECT_EQ(1, new_d.input_size());
+  EXPECT_EQ(NodeName(c.name()), new_d.input(0));
 }
 
 TEST_F(ModelPrunerTest, PruningSkipsCtrlDependencies) {
@@ -142,14 +152,16 @@ TEST_F(ModelPrunerTest, PruningSkipsCtrlDependencies) {
   Status status = pruner.Optimize(nullptr, item, &output);
   TF_EXPECT_OK(status);
 
-  EXPECT_EQ(4, output.node_size());
+  EXPECT_EQ(5, output.node_size());
   const NodeDef& new_a = output.node(0);
   EXPECT_EQ(NodeName(a.name()), new_a.name());
   const NodeDef& new_b = output.node(1);
   EXPECT_EQ(NodeName(b.name()), new_b.name());
   const NodeDef& new_c = output.node(2);
   EXPECT_EQ(NodeName(c.name()), new_c.name());
-  const NodeDef& new_e = output.node(3);
+  const NodeDef& new_d = output.node(3);
+  EXPECT_EQ(NodeName(d.name()), new_d.name());
+  const NodeDef& new_e = output.node(4);
   EXPECT_EQ(NodeName(e.name()), new_e.name());
 
   EXPECT_EQ(2, new_e.input_size());
@@ -157,7 +169,7 @@ TEST_F(ModelPrunerTest, PruningSkipsCtrlDependencies) {
   EXPECT_EQ("^c", new_e.input(1));
 }
 
-TEST_F(ModelPrunerTest, PruningForwardsCtrlDependencies) {
+TEST_F(ModelPrunerTest, PruningPerservesCtrlDependencies) {
   // Build a simple graph with a few trivially prunable ops.
   tensorflow::Scope s = tensorflow::Scope::NewRootScope();
 
@@ -183,20 +195,28 @@ TEST_F(ModelPrunerTest, PruningForwardsCtrlDependencies) {
   Status status = pruner.Optimize(nullptr, item, &output);
   TF_EXPECT_OK(status);
 
-  EXPECT_EQ(4, output.node_size());
+  EXPECT_EQ(6, output.node_size());
   const NodeDef& new_a = output.node(0);
   EXPECT_EQ(NodeName(a.name()), new_a.name());
   const NodeDef& new_b = output.node(1);
   EXPECT_EQ(NodeName(b.name()), new_b.name());
   const NodeDef& new_c = output.node(2);
   EXPECT_EQ(NodeName(c.name()), new_c.name());
-  const NodeDef& new_f = output.node(3);
+  const NodeDef& new_d = output.node(3);
+  EXPECT_EQ(NodeName(d.name()), new_d.name());
+  const NodeDef& new_e = output.node(4);
+  EXPECT_EQ(NodeName(e.name()), new_e.name());
+  const NodeDef& new_f = output.node(5);
   EXPECT_EQ(NodeName(f.name()), new_f.name());
 
-  EXPECT_EQ(3, new_f.input_size());
-  EXPECT_EQ(NodeName(c.name()), new_f.input(0));
-  EXPECT_EQ("^b", new_f.input(1));
-  EXPECT_EQ("^c", new_f.input(2));
+  EXPECT_EQ(1, new_f.input_size());
+  EXPECT_EQ(NodeName(e.name()), new_f.input(0));
+  EXPECT_EQ(2, new_e.input_size());
+  EXPECT_EQ(NodeName(d.name()), new_e.input(0));
+  EXPECT_EQ("^c", new_e.input(1));
+  EXPECT_EQ(2, new_d.input_size());
+  EXPECT_EQ(NodeName(c.name()), new_d.input(0));
+  EXPECT_EQ("^b", new_d.input(1));
 }
 
 TEST_F(ModelPrunerTest, PruningPerservesFetch) {
-- 
GitLab


From e4265b4b1e963db64de577c7431873ebd7d5bb6d Mon Sep 17 00:00:00 2001
From: Adam Roberts <adarob@google.com>
Date: Fri, 31 Mar 2017 19:03:33 -0800
Subject: [PATCH 0053/1563] Handle stack of TensorArray with empty elements.
 Previously caused a SIGFPE. Change: 151895125

---
 tensorflow/core/kernels/tensor_array_ops.cc   |  6 ++
 .../kernel_tests/tensor_array_ops_test.py     | 82 +++++++++++--------
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/tensorflow/core/kernels/tensor_array_ops.cc b/tensorflow/core/kernels/tensor_array_ops.cc
index 8202719b4d..73190c44c9 100644
--- a/tensorflow/core/kernels/tensor_array_ops.cc
+++ b/tensorflow/core/kernels/tensor_array_ops.cc
@@ -615,6 +615,12 @@ class TensorArrayPackOrGatherOp : public OpKernel {
 
     Tensor* output_tensor = nullptr;
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, output_shape, &output_tensor));
+
+    // If output_tensor is empty, there is nothing to concatenate so return it.
+    if (output_shape.num_elements() == 0) {
+      return;
+    }
+
     ConstMatrixVector input_tensors_flat;
     input_tensors_flat.reserve(num_indices);
     auto output_flat =
diff --git a/tensorflow/python/kernel_tests/tensor_array_ops_test.py b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
index e52ae95281..9aadf638f2 100644
--- a/tensorflow/python/kernel_tests/tensor_array_ops_test.py
+++ b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
@@ -39,7 +39,7 @@ from tensorflow.python.platform import test
 class TensorArrayTest(test.TestCase):
 
   def testTensorArrayWriteRead(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -61,7 +61,7 @@ class TensorArrayTest(test.TestCase):
 
   def _testTensorArrayWritePack(self, tf_dtype):
     dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3)
 
@@ -92,9 +92,23 @@ class TensorArrayTest(test.TestCase):
   def testTensorArrayWritePack(self):
     self._testTensorArrayWritePackMaybeLegacy()
 
+  def testEmptyTensorArrayPack(self):
+    with self.test_session():
+      ta = tensor_array_ops.TensorArray(
+          dtype=dtypes.float32, tensor_array_name="foo", size=3)
+
+      empty_element = np.zeros((0, 1), dtype=np.float32)
+      w0 = ta.write(0, empty_element)
+      w1 = w0.write(1, empty_element)
+      w2 = w1.write(2, empty_element)
+
+      c0 = w2.stack()
+
+      self.assertAllEqual([3, 0, 1], c0.eval().shape)
+
   def _testTensorArrayWriteConcat(self, tf_dtype):
     dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3, infer_shape=False)
 
@@ -137,7 +151,7 @@ class TensorArrayTest(test.TestCase):
 
   def _testTensorArrayUnpackRead(self, tf_dtype):
     dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3)
 
@@ -202,7 +216,7 @@ class TensorArrayTest(test.TestCase):
 
   def _testTensorArraySplitRead(self, tf_dtype):
     dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3, infer_shape=False)
 
@@ -259,7 +273,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArraySplitRead(dtypes.string)
 
   def testTensorGradArrayWriteRead(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -292,7 +306,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(-2.0, g_d2)
 
   def testTensorGradArrayDynamicWriteRead(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -333,7 +347,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(3, g_vs)
 
   def testTensorGradAccessTwiceReceiveSameObject(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
       g_ta_0 = ta.grad("grad")
@@ -349,7 +363,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([[4.0, 5.0]], d_r1_0)
 
   def testTensorArrayWriteWrongIndexOrDataTypeFails(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -371,7 +385,7 @@ class TensorArrayTest(test.TestCase):
         ta.write(3, 3.0).flow.eval()
 
   def testTensorArrayReadWrongIndexOrDataTypeFails(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -402,7 +416,7 @@ class TensorArrayTest(test.TestCase):
         ta.read(3).eval()
 
   def testTensorArrayWriteMultipleFails(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -412,7 +426,7 @@ class TensorArrayTest(test.TestCase):
         ta.write(2, 3.0).write(2, 3.0).flow.eval()
 
   def testTensorArrayConcatIncompatibleShapesFails(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -444,7 +458,7 @@ class TensorArrayTest(test.TestCase):
         w3.concat().eval()
 
   def testTensorArraySplitIncompatibleShapesFails(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -478,7 +492,7 @@ class TensorArrayTest(test.TestCase):
         ta.split([1.0], [1]).flow.eval()
 
   def _testTensorArrayWriteGradientAddMultipleAdds(self, dtype):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtype, tensor_array_name="foo", size=3, infer_shape=False)
       ta_grad = ta.grad("grad")
@@ -517,7 +531,7 @@ class TensorArrayTest(test.TestCase):
       self._testTensorArrayWriteGradientAddMultipleAdds(dtype)
 
   def testMultiTensorArray(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       h1 = tensor_array_ops.TensorArray(
           size=1, dtype=dtypes.float32, tensor_array_name="foo")
       w1 = h1.write(0, 4.0)
@@ -532,7 +546,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllClose(9.0, r.eval())
 
   def _testTensorArrayGradientWriteReadType(self, dtype):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.as_dtype(dtype),
           tensor_array_name="foo",
@@ -584,7 +598,7 @@ class TensorArrayTest(test.TestCase):
       self._testTensorArrayGradientWriteReadType(dtype)
 
   def _testTensorArrayGradientWritePackConcatAndRead(self):
-    with self.test_session(use_gpu=True) as sess:
+    with self.test_session() as sess:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -619,7 +633,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayGradientWritePackConcatAndRead()
 
   def testTensorArrayReadTwice(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       value = constant_op.constant([[1.0, -1.0], [10.0, -10.0]])
 
       ta_readonce = tensor_array_ops.TensorArray(
@@ -648,7 +662,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([1.0, -1.0], r1_readtwice.eval())
 
   def _testTensorArrayGradientUnpackRead(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -676,7 +690,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayGradientUnpackRead()
 
   def testTensorArrayGradientSplitConcat(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=2)
 
@@ -698,7 +712,7 @@ class TensorArrayTest(test.TestCase):
                           grad_vals[0])
 
   def _testTensorArrayGradientDynamicUnpackRead(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -723,21 +737,21 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayGradientDynamicUnpackRead()
 
   def testCloseTensorArray(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
       c1 = ta.close()
       session.run(c1)
 
   def testSizeTensorArray(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
       s = ta.size()
       self.assertAllEqual(3, s.eval())
 
   def testWriteCloseTensorArray(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -749,7 +763,7 @@ class TensorArrayTest(test.TestCase):
 
   def _testWhileLoopWritePackGradients(self, dynamic_size, dtype):
     np_dtype = dtype.as_numpy_dtype
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       v0 = array_ops.identity(np.arange(3 * 5, dtype=np_dtype).reshape(3, 5))
       var = variables.Variable(np.arange(100, 105, dtype=np_dtype))
       state0 = array_ops.identity(np.array([1] * 5, dtype=np_dtype))
@@ -864,7 +878,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllClose(31.0, grad.eval())
 
   def testSumOfTwoReadVariablesWithoutRepeatGrad(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       a = array_ops.identity(
           np.arange(
               3 * 5, dtype=np.float32).reshape(3, 5) + 1)
@@ -1062,7 +1076,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(r0.get_shape(), tensor_shape.unknown_shape())
 
   def _testGradientWhenNotAllComponentsRead(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
       x = constant_op.constant([2.0, 3.0])
       w = ta.unstack(x)
@@ -1076,7 +1090,7 @@ class TensorArrayTest(test.TestCase):
     self._testGradientWhenNotAllComponentsRead()
 
   def _testTensorArrayUnpackDynamic(self):
-    with self.test_session(use_gpu=True) as sess:
+    with self.test_session() as sess:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=3, dynamic_size=True)
       x = constant_op.constant([1.0, 2.0, 3.0])
@@ -1091,7 +1105,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayUnpackDynamic()
 
   def testTensorArraySplitDynamic(self):
-    with self.test_session(use_gpu=True) as sess:
+    with self.test_session() as sess:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=3, dynamic_size=True)
       x = constant_op.constant([1.0, 2.0, 3.0])
@@ -1103,7 +1117,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(np.array([1.0, 1.0, 1.0]), sess.run(grad)[0])
 
   def _testTensorArrayEvalEmpty(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=0, dynamic_size=False, infer_shape=False)
       with self.assertRaisesOpError(
@@ -1116,7 +1130,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayEvalEmpty()
 
   def _testTensorArrayEvalEmptyWithDefault(self):
-    with self.test_session(use_gpu=True):
+    with self.test_session():
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=0, dynamic_size=False, infer_shape=True)
       self.assertEqual(0, ta.size().eval())
@@ -1132,7 +1146,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayEvalEmptyWithDefault()
 
   def testTensorArrayScatterReadAndGradients(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -1158,7 +1172,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([[2.0, 3.0], [4.0, 5.0]], grad_vals[0])
 
   def testTensorArrayWriteGatherAndGradients(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -1249,7 +1263,7 @@ class TensorArrayTest(test.TestCase):
     self.assertTrue("gpu:0" in ta.handle.device.lower())
 
   def testTensorArrayLazyDeviceSettingDoesNotConfuseInitialAccess(self):
-    with self.test_session(use_gpu=True) as session:
+    with self.test_session() as session:
       ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
       self.assertEqual(ta.handle.device, "")
 
-- 
GitLab


From b1b09a3abda5245264efb083d2aa0c3d3e240dc3 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Fri, 31 Mar 2017 21:13:36 -0800
Subject: [PATCH 0054/1563] Change calls to use status.Update. Change:
 151899404

---
 tensorflow/core/distributed_runtime/worker.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/worker.cc b/tensorflow/core/distributed_runtime/worker.cc
index 16be15fe66..1aced4443f 100644
--- a/tensorflow/core/distributed_runtime/worker.cc
+++ b/tensorflow/core/distributed_runtime/worker.cc
@@ -117,9 +117,7 @@ void Worker::MaybeCallFinalCallback(const string& graph_handle, int step_id,
     }
   }
   if (done != nullptr) {
-    if (s.ok()) {
-      s = executor_status;
-    }
+    s.Update(executor_status);
     done(s);
   }
 }
-- 
GitLab


From 643573d41f770961255707a1aa9413d54f979ba3 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Fri, 31 Mar 2017 21:24:24 -0800
Subject: [PATCH 0055/1563] Fix bug where we ignore errors in RecvOutputsAsync.
 Change: 151899658

---
 tensorflow/core/distributed_runtime/graph_mgr.cc |  4 +---
 tensorflow/python/client/session_test.py         | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index 171e75c0d0..537d489aae 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -375,9 +375,7 @@ void GraphMgr::RecvOutputsFromRendezvousAsync(Rendezvous* rendezvous,
             }
           }
           call_state->mu.lock();
-          if (status.ok()) {
-            call_state->shared_status = status;
-          }
+          call_state->shared_status.Update(status);
           call_state->done_counter--;
           // If we are the last async call to return, call the done callback.
           if (call_state->done_counter == 0) {
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index e53a046a34..13c2736609 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -1404,6 +1404,14 @@ class SessionTest(test_util.TensorFlowTestCase):
     r2 = sess.partial_run(h, [b, c])
     self.assertEqual(r1, r2)
 
+  def runTestPartialRunMissingPlaceholderFeedException(self, sess):
+    x = array_ops.placeholder(dtypes.float32, shape=())
+    fetches = [x * 2, x * 3]
+    handle = sess.partial_run_setup(fetches=fetches, feeds=[])
+    with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                 'You must feed a value for placeholder'):
+      sess.partial_run(handle, fetches[0])
+
   def testPartialRunDirect(self):
     self.runTestPartialRun(session.Session())
 
@@ -1419,6 +1427,9 @@ class SessionTest(test_util.TensorFlowTestCase):
   def testRunAndPartialRunDirect(self):
     self.runTestRunAndPartialRun(session.Session())
 
+  def testPartialRunMissingPlaceholderFeedExceptionDirect(self):
+    self.runTestPartialRunMissingPlaceholderFeedException(session.Session())
+
   def testPartialRunDist(self):
     server = server_lib.Server.create_local_server()
     self.runTestPartialRun(session.Session(server.target))
@@ -1439,6 +1450,11 @@ class SessionTest(test_util.TensorFlowTestCase):
     server = server_lib.Server.create_local_server()
     self.runTestRunAndPartialRun(session.Session(server.target))
 
+  def testPartialRunMissingPlaceholderFeedExceptionDist(self):
+    server = server_lib.Server.create_local_server()
+    self.runTestPartialRunMissingPlaceholderFeedException(
+        session.Session(server.target))
+
   def testFeedDictKeyException(self):
     with session.Session() as sess:
       a = constant_op.constant(1.0, dtypes.float32, name='a')
-- 
GitLab


From 00d72581b3f71fe4cdffd861da84ad2c4bd31ba5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 1 Apr 2017 08:43:19 -0800
Subject: [PATCH 0056/1563] Fix reference to proto2 in boosted_trees. Change:
 151917679

---
 .../contrib/boosted_trees/lib/testutil/random_tree_gen.cc     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc
index 24259ff603..cbe26ba918 100644
--- a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.cc
@@ -30,8 +30,8 @@ namespace {
 
 // Append the given nodes to tree with transfer of pointer ownership.
 // nodes will not be usable upon return.
-void AppendNodes(DecisionTreeConfig* tree,
-                 proto2::RepeatedPtrField<TreeNode>* nodes) {
+template <typename T>
+void AppendNodes(DecisionTreeConfig* tree, T* nodes) {
   std::reverse(nodes->pointer_begin(), nodes->pointer_end());
   while (!nodes->empty()) {
     tree->mutable_nodes()->AddAllocated(nodes->ReleaseLast());
-- 
GitLab


From 01fcc46c16d9965b902e4c902a5a8d827a1a5537 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 1 Apr 2017 09:53:40 -0800
Subject: [PATCH 0057/1563] [XLA:HLO] Change HloModule to ensure computation
 names are unique. Change: 151919366

---
 .../compiler/xla/service/hlo_computation.h    |  3 +-
 tensorflow/compiler/xla/service/hlo_module.cc | 30 +++++++++++++++----
 tensorflow/compiler/xla/service/hlo_module.h  | 18 ++++++-----
 .../compiler/xla/service/hlo_module_test.cc   |  5 ++++
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_computation.h b/tensorflow/compiler/xla/service/hlo_computation.h
index ef3cba6fa0..dddcf51974 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.h
+++ b/tensorflow/compiler/xla/service/hlo_computation.h
@@ -120,6 +120,7 @@ class HloComputation {
   }
 
   const string& name() const { return name_; }
+  void set_name(const string& name) { name_ = name; }
 
   // Return a string representation of the computation.
   string ToString() const;
@@ -257,7 +258,7 @@ class HloComputation {
   // Internal helper to collect unreachable roots.
   std::vector<HloInstruction*> CollectUnreachableRoots() const;
 
-  const string name_;
+  string name_;
   HloInstruction* root_instruction_;
 
   // Module containing this computation.
diff --git a/tensorflow/compiler/xla/service/hlo_module.cc b/tensorflow/compiler/xla/service/hlo_module.cc
index 36064e93fe..8ed672aa9b 100644
--- a/tensorflow/compiler/xla/service/hlo_module.cc
+++ b/tensorflow/compiler/xla/service/hlo_module.cc
@@ -31,20 +31,38 @@ limitations under the License.
 
 namespace xla {
 
-HloComputation* HloModule::AddEntryComputation(
+HloModule::HloModule(const string& name,
+                     const VersionedComputationHandle& entry_computation_handle)
+    : name_(name),
+      entry_computation_(nullptr),
+      has_entry_computation_handle_(true),
+      entry_computation_handle_(entry_computation_handle),
+      computation_name_uniquer_(/*separator=*/".") {}
+
+HloModule::HloModule(const string& name)
+    : name_(name),
+      entry_computation_(nullptr),
+      computation_name_uniquer_(/*separator=*/".") {}
+
+HloComputation* HloModule::AddComputationInternal(
     std::unique_ptr<HloComputation> computation) {
-  CHECK_EQ(nullptr, entry_computation_);
-  entry_computation_ = computation.get();
+  computation->set_name(
+      computation_name_uniquer_.GetUniqueName(computation->name()));
   computation->set_parent(this);
   computations_.push_back(std::move(computation));
   return computations_.back().get();
 }
 
+HloComputation* HloModule::AddEntryComputation(
+    std::unique_ptr<HloComputation> computation) {
+  CHECK_EQ(nullptr, entry_computation_);
+  entry_computation_ = computation.get();
+  return AddComputationInternal(std::move(computation));
+}
+
 HloComputation* HloModule::AddEmbeddedComputation(
     std::unique_ptr<HloComputation> computation) {
-  computation->set_parent(this);
-  computations_.push_back(std::move(computation));
-  return computations_.back().get();
+  return AddComputationInternal(std::move(computation));
 }
 
 void HloModule::ReplaceComputations(
diff --git a/tensorflow/compiler/xla/service/hlo_module.h b/tensorflow/compiler/xla/service/hlo_module.h
index d598750da6..1ff5c5dacb 100644
--- a/tensorflow/compiler/xla/service/hlo_module.h
+++ b/tensorflow/compiler/xla/service/hlo_module.h
@@ -25,6 +25,7 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/name_uniquer.h"
 #include "tensorflow/compiler/xla/service/versioned_computation_handle.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
@@ -41,19 +42,14 @@ namespace xla {
 // computations are owned by the module.
 class HloModule {
  public:
-  explicit HloModule(const string& name,
-                     const VersionedComputationHandle& entry_computation_handle)
-      : name_(name),
-        entry_computation_(nullptr),
-        has_entry_computation_handle_(true),
-        entry_computation_handle_(entry_computation_handle) {}
+  HloModule(const string& name,
+            const VersionedComputationHandle& entry_computation_handle);
 
   // Constructor without a versioned computation handle. This constructor should
   // only be used for HloModules used outside of the XLA service (eg
   // tests). The versioned handle is used by the service in the compilation
   // cache.
-  explicit HloModule(const string& name)
-      : name_(name), entry_computation_(nullptr) {}
+  explicit HloModule(const string& name);
 
   // Adds an entry computation to the module. A module can only have one entry
   // computation. Returns a pointer to the newly added computation.
@@ -111,6 +107,9 @@ class HloModule {
   uint64 RandomNew64() const;
 
  private:
+  HloComputation* AddComputationInternal(
+      std::unique_ptr<HloComputation> computation);
+
   const string name_;
   HloComputation* entry_computation_;
   std::vector<std::unique_ptr<HloComputation>> computations_;
@@ -125,6 +124,9 @@ class HloModule {
   // Versioned handle of the entry computation of the module.
   bool has_entry_computation_handle_ = false;
   VersionedComputationHandle entry_computation_handle_;
+
+  // Unique name generator for computation names, which are unique per module.
+  NameUniquer computation_name_uniquer_;
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_module_test.cc b/tensorflow/compiler/xla/service/hlo_module_test.cc
index 0f4252522d..dba9731e2a 100644
--- a/tensorflow/compiler/xla/service/hlo_module_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_module_test.cc
@@ -74,6 +74,11 @@ TEST_F(HloModuleTest, TwoComputationsPostOrder) {
   EXPECT_MATCH(
       testing::ListToVec<HloComputation*>(module->MakeComputationPostOrder()),
       testing::UnorderedMatcher<HloComputation*>(computation1, computation2));
+
+  // We specified the same name for both computations, but the HloModule should
+  // have made the names unique.
+  EXPECT_EQ(computation1->name(), "Constant");
+  EXPECT_EQ(computation2->name(), "Constant.1");
 }
 
 TEST_F(HloModuleTest, DiamondComputationsPostOrder) {
-- 
GitLab


From 4fe6860e3a5f33eb06c5637b38dc1ab3df78acb3 Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Sat, 1 Apr 2017 10:08:08 -0800
Subject: [PATCH 0058/1563] Don't fold nodes that have no outgoing edges.
 Change: 151919765

---
 .../core/grappler/optimizers/constant_folding.cc   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/constant_folding.cc b/tensorflow/core/grappler/optimizers/constant_folding.cc
index 49891e2a78..7cddedef2e 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding.cc
+++ b/tensorflow/core/grappler/optimizers/constant_folding.cc
@@ -130,7 +130,6 @@ bool ConstantFolding::IsFoldable(const NodeDef& node) const {
   if (!status.ok()) {
     return false;
   }
-
   if (op_def->is_stateful()) {
     return false;
   }
@@ -144,6 +143,15 @@ bool ConstantFolding::IsFoldable(const NodeDef& node) const {
     return false;
   }
 
+  // No need to (and don't) fold nodes that have no outgoing edges. Such nodes
+  // could be introduced by an earlier constant folding pass and are preserved
+  // in case users want to fetch their values; re-processing them would
+  // lead to an error of adding a duplicated node to graph.
+  auto outputs = node_map_->GetOutputs(node.name());
+  if (outputs.empty()) {
+    return false;
+  }
+
   for (const auto& input : node.input()) {
     bool is_const = IsConst(*node_map_->GetNode(input));
     if (!is_const) {
@@ -224,8 +232,7 @@ Status ConstantFolding::EvaluateOneFoldable(const NodeDef& node,
     Status(error::INVALID_ARGUMENT, "Expected at least one output.");
   }
   for (int i = 0; i < output_tensors.size(); i++) {
-    string node_name = strings::StrCat(
-        AddPrefixToNodeName(node.name(), kConstantFoldingConst));
+    string node_name = AddPrefixToNodeName(node.name(), kConstantFoldingConst);
     if (output_tensors.size() > 1) {
       node_name = strings::StrCat(node_name, "-", i);
     }
@@ -299,6 +306,7 @@ Status ConstantFolding::Optimize(Cluster* cluster, const GrapplerItem& item,
     nodes_to_preserve_.insert(NodeName(node));
   }
   device_.reset(new DeviceSimple());
+  *output = GraphDef();
   TF_RETURN_IF_ERROR(FoldGraph(output));
   LOG(INFO) << "Optimized graph size: " << output->node_size();
   return Status::OK();
-- 
GitLab


From 406199e2835dd1ed6c1f8406de081accb0c12b75 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Sat, 1 Apr 2017 12:52:39 -0800
Subject: [PATCH 0059/1563] Set cpu family, model and frequency in the op info.
 Change: 151923693

---
 tensorflow/core/grappler/costs/utils.cc  |  5 +++
 tensorflow/core/platform/cpu_info.cc     | 40 ++++++++++++++++++++++++
 tensorflow/core/platform/cpu_info.h      | 14 +++++++++
 tensorflow/core/platform/posix/port.cc   |  5 +++
 tensorflow/core/platform/windows/port.cc |  5 +++
 5 files changed, 69 insertions(+)

diff --git a/tensorflow/core/grappler/costs/utils.cc b/tensorflow/core/grappler/costs/utils.cc
index 19266208fe..9eab8495ce 100644
--- a/tensorflow/core/grappler/costs/utils.cc
+++ b/tensorflow/core/grappler/costs/utils.cc
@@ -101,6 +101,11 @@ OpInfo::DeviceProperties GetLocalCPUInfo() {
   OpInfo::DeviceProperties device;
   device.set_type("CPU");
 
+  device.set_vendor(port::CPUVendorIDString());
+  // Combine cpu family and model into the model string.
+  device.set_model(
+      strings::StrCat((port::CPUFamily() << 4) + port::CPUModelNum()));
+  device.set_frequency(port::NominalCPUFrequency());
   device.set_num_cores(port::NumSchedulableCPUs());
   device.set_l1_cache_size(Eigen::l1CacheSize());
   device.set_l2_cache_size(Eigen::l2CacheSize());
diff --git a/tensorflow/core/platform/cpu_info.cc b/tensorflow/core/platform/cpu_info.cc
index 29241bbf33..5aa8c66a0b 100644
--- a/tensorflow/core/platform/cpu_info.cc
+++ b/tensorflow/core/platform/cpu_info.cc
@@ -68,6 +68,10 @@ int GetXCR0EAX() {
 
 // Structure for basic CPUID info
 struct CPUIDInfo {
+  string vendor_str;
+  int family;
+  int model_num;
+
   CPUIDInfo()
       : have_adx_(0),
         have_aes_(0),
@@ -114,12 +118,21 @@ struct CPUIDInfo {
 
     uint32 eax, ebx, ecx, edx;
 
+    // Get vendor string (issue CPUID with eax = 0)
+    GETCPUID(eax, ebx, ecx, edx, 0, 0);
+    cpuid->vendor_str.append(reinterpret_cast<char *>(&ebx), 4);
+    cpuid->vendor_str.append(reinterpret_cast<char *>(&edx), 4);
+    cpuid->vendor_str.append(reinterpret_cast<char *>(&ecx), 4);
+
     // To get general information and extended features we send eax = 1 and
     // ecx = 0 to cpuid.  The response is returned in eax, ebx, ecx and edx.
     // (See Intel 64 and IA-32 Architectures Software Developer's Manual
     // Volume 2A: Instruction Set Reference, A-M CPUID).
     GETCPUID(eax, ebx, ecx, edx, 1, 0);
 
+    cpuid->model_num = static_cast<int>((eax >> 4) & 0xf);
+    cpuid->family = static_cast<int>((eax >> 8) & 0xf);
+
     cpuid->have_aes_ = (ecx >> 25) & 0x1;
     cpuid->have_cmov_ = (edx >> 15) & 0x1;
     cpuid->have_cmpxchg16b_ = (ecx >> 13) & 0x1;
@@ -301,5 +314,32 @@ bool TestCPUFeature(CPUFeature feature) {
 #endif
 }
 
+std::string CPUVendorIDString() {
+#ifdef PLATFORM_IS_X86
+  InitCPUIDInfo();
+  return cpuid->vendor_str;
+#else
+  return "";
+#endif
+}
+
+int CPUFamily() {
+#ifdef PLATFORM_IS_X86
+  InitCPUIDInfo();
+  return cpuid->family;
+#else
+  return 0;
+#endif
+}
+
+int CPUModelNum() {
+#ifdef PLATFORM_IS_X86
+  InitCPUIDInfo();
+  return cpuid->model_num;
+#else
+  return 0;
+#endif
+}
+
 }  // namespace port
 }  // namespace tensorflow
diff --git a/tensorflow/core/platform/cpu_info.h b/tensorflow/core/platform/cpu_info.h
index f6eee478e8..331f3e5251 100644
--- a/tensorflow/core/platform/cpu_info.h
+++ b/tensorflow/core/platform/cpu_info.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_PLATFORM_CPU_INFO_H_
 #define TENSORFLOW_PLATFORM_CPU_INFO_H_
 
+#include <string>
+
 #if defined(PLATFORM_WINDOWS)
 #include "tensorflow/core/platform/windows/cpu_info.h"
 #endif
@@ -92,6 +94,18 @@ enum CPUFeature {
 // Checks CPU registers to return hardware capabilities.
 bool TestCPUFeature(CPUFeature feature);
 
+// Returns CPU Vendor string (i.e. 'GenuineIntel', 'AuthenticAMD', etc.)
+std::string CPUVendorIDString();
+
+// Returns CPU family.
+int CPUFamily();
+
+// Returns CPU model number.
+int CPUModelNum();
+
+// Returns nominal core processor cycles per second of each processor.
+double NominalCPUFrequency();
+
 }  // namespace port
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/platform/posix/port.cc b/tensorflow/core/platform/posix/port.cc
index e2b9c586c8..66c4ff37b9 100644
--- a/tensorflow/core/platform/posix/port.cc
+++ b/tensorflow/core/platform/posix/port.cc
@@ -156,5 +156,10 @@ bool Snappy_Uncompress(const char* input, size_t length, char* output) {
 
 string Demangle(const char* mangled) { return mangled; }
 
+double NominalCPUFrequency() {
+  // TODO(yuefengz): implement it for this platform.
+  return 1.0;
+}
+
 }  // namespace port
 }  // namespace tensorflow
diff --git a/tensorflow/core/platform/windows/port.cc b/tensorflow/core/platform/windows/port.cc
index 4a7eebbcdf..3394524aa5 100644
--- a/tensorflow/core/platform/windows/port.cc
+++ b/tensorflow/core/platform/windows/port.cc
@@ -105,5 +105,10 @@ bool Snappy_Uncompress(const char* input, size_t length, char* output) {
 
 string Demangle(const char* mangled) { return mangled; }
 
+double NominalCPUFrequency() {
+  // TODO(yuefengz): implement it for this platform.
+  return 1.0;
+}
+
 }  // namespace port
 }  // namespace tensorflow
-- 
GitLab


From 09cc9f8f57fffb629e23af5c78f92dfca0bc0bd8 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Sun, 2 Apr 2017 08:10:36 -0800
Subject: [PATCH 0060/1563] Java: Bump version to 1.1.0-rc1 in Maven POMs
 Change: 151952775

---
 tensorflow/java/README.md                     | 28 +++++++++----------
 tensorflow/java/maven/libtensorflow/pom.xml   |  2 +-
 .../java/maven/libtensorflow_jni/pom.xml      |  2 +-
 tensorflow/java/maven/pom.xml                 |  2 +-
 tensorflow/java/maven/tensorflow/pom.xml      |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tensorflow/java/README.md b/tensorflow/java/README.md
index e31f57dc25..fd24016884 100644
--- a/tensorflow/java/README.md
+++ b/tensorflow/java/README.md
@@ -24,7 +24,7 @@ your project's `pom.xml`:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc0-windows-fix</version>
+  <version>1.1.0-rc1</version>
 </dependency>
 ```
 
@@ -50,7 +50,7 @@ That's all. As an example, to create a Maven project for the
       <dependency>
         <groupId>org.tensorflow</groupId>
         <artifactId>tensorflow</artifactId>
-        <version>1.1.0-rc0-windows-fix</version>
+        <version>1.1.0-rc1</version>
       </dependency>
     </dependencies>
 </project>
@@ -75,22 +75,22 @@ That's all. As an example, to create a Maven project for the
 This section describes how to use TensorFlow armed with just a JDK installation.
 
 1.  Download the Java archive (JAR):
-    [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc0.jar)
+    [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar)
     (optionally, the Java sources:
-    [libtensorflow-src.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-src-1.1.0-rc0.jar)).
+    [libtensorflow-src.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-src-1.1.0-rc1.jar)).
 
 2.  Download the native library. GPU-enabled versions required CUDA 8 and cuDNN
     5.1. For other versions, the native library will need to be built from
     source (see below).
 
     -   Linux:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-linux-x86_64-1.1.0-rc0.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-linux-x86_64-1.1.0-rc0.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-linux-x86_64-1.1.0-rc1.tar.gz),
+        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-linux-x86_64-1.1.0-rc1.tar.gz)
     -   OS X:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-darwin-x86_64-1.1.0-rc0.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-darwin-x86_64-1.1.0-rc0.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-darwin-x86_64-1.1.0-rc1.tar.gz),
+        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-darwin-x86_64-1.1.0-rc1.tar.gz)
     -   Windows:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc0.zip)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip)
 
 
     The following shell snippet downloads and extracts the native library on
@@ -101,7 +101,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     OS=$(uname -s | tr '[:upper:]' '[:lower:]')
     mkdir -p ./jni
     curl -L \
-      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc0.tar.gz" |
+      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
     tar -xz -C ./jni
     ```
 
@@ -121,7 +121,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     then it should be compiled with:
 
     ```sh
-    javac -cp libtensorflow-1.1.0-rc0.jar MyClass.java
+    javac -cp libtensorflow-1.1.0-rc1.jar MyClass.java
     ```
 
     For a more sophisticated example, see
@@ -130,7 +130,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
 
     ```sh
     javac \
-      -cp libtensorflow-1.1.0-rc0.jar \
+      -cp libtensorflow-1.1.0-rc1.jar \
       ./src/main/java/org/tensorflow/examples/LabelImage.java
     ```
 
@@ -138,7 +138,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     library path during execution. For example:
 
     ```sh
-    java -cp libtensorflow-1.1.0-rc0.jar:. -Djava.library.path=./jni MyClass
+    java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni MyClass
     ```
 
     or for the `LabelImage` example:
@@ -146,7 +146,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     ```sh
     java \
       -Djava.library.path=./jni \
-      -cp libtensorflow-1.1.0-rc0.jar:./src/main/java \
+      -cp libtensorflow-1.1.0-rc1.jar:./src/main/java \
       org.tensorflow.examples.LabelImage
     ```
 
diff --git a/tensorflow/java/maven/libtensorflow/pom.xml b/tensorflow/java/maven/libtensorflow/pom.xml
index d8d6a50da7..ec044a3ff6 100644
--- a/tensorflow/java/maven/libtensorflow/pom.xml
+++ b/tensorflow/java/maven/libtensorflow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc0</version>
+    <version>1.1.0-rc1</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>libtensorflow</artifactId>
diff --git a/tensorflow/java/maven/libtensorflow_jni/pom.xml b/tensorflow/java/maven/libtensorflow_jni/pom.xml
index a675859638..8a243fe834 100644
--- a/tensorflow/java/maven/libtensorflow_jni/pom.xml
+++ b/tensorflow/java/maven/libtensorflow_jni/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc0</version>
+    <version>1.1.0-rc1</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>libtensorflow_jni</artifactId>
diff --git a/tensorflow/java/maven/pom.xml b/tensorflow/java/maven/pom.xml
index 35f9c2ecc3..4939ed0b63 100644
--- a/tensorflow/java/maven/pom.xml
+++ b/tensorflow/java/maven/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.tensorflow</groupId>
   <artifactId>parentpom</artifactId>
-  <version>1.1.0-rc0</version>
+  <version>1.1.0-rc1</version>
   <packaging>pom</packaging>
 
   <url>https://www.tensorflow.org</url>
diff --git a/tensorflow/java/maven/tensorflow/pom.xml b/tensorflow/java/maven/tensorflow/pom.xml
index d54face7c4..4b17d5d25a 100644
--- a/tensorflow/java/maven/tensorflow/pom.xml
+++ b/tensorflow/java/maven/tensorflow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc0</version>
+    <version>1.1.0-rc1</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>tensorflow</artifactId>
-- 
GitLab


From 13dd442b4c248a5d0cbc5ed7b407e2fd98712cc0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 2 Apr 2017 12:25:37 -0800
Subject: [PATCH 0061/1563] Remove unused transcription array. Change:
 151959018

---
 tensorflow/core/util/ctc/ctc_decoder.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tensorflow/core/util/ctc/ctc_decoder.h b/tensorflow/core/util/ctc/ctc_decoder.h
index 294419e907..5b28aeb70a 100644
--- a/tensorflow/core/util/ctc/ctc_decoder.h
+++ b/tensorflow/core/util/ctc/ctc_decoder.h
@@ -89,7 +89,6 @@ class CTCGreedyDecoder : public CTCDecoder {
       std::vector<int>& output_b = (*output)[0][b];
 
       int prev_class_ix = -1;
-      std::vector<int> transcription;
       (*scores)(b, 0) = 0;
       for (int t = 0; t < seq_len_b; ++t) {
         auto row = input[t].row(b);
@@ -98,7 +97,6 @@ class CTCGreedyDecoder : public CTCDecoder {
         if (max_class_ix != blank_index_ &&
             !(merge_repeated_ && max_class_ix == prev_class_ix)) {
           output_b.push_back(max_class_ix);
-          transcription.push_back(max_class_ix);
         }
         prev_class_ix = max_class_ix;
       }
-- 
GitLab


From 4f1273adba160d405737a72609fbf0e393642f6e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 01:39:39 -0800
Subject: [PATCH 0062/1563] Adding check_types option to nest's
 assert_same_structure, map_structure and assert_shallow_structure. Change:
 151988685

---
 tensorflow/python/util/nest.py      | 46 +++++++++++++++++++++--------
 tensorflow/python/util/nest_test.py | 25 ++++++++++++++++
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/tensorflow/python/util/nest.py b/tensorflow/python/util/nest.py
index ad0fcd31e5..ade6238981 100644
--- a/tensorflow/python/util/nest.py
+++ b/tensorflow/python/util/nest.py
@@ -99,7 +99,7 @@ def flatten(nest):
   return list(_yield_flat_nest(nest)) if is_sequence(nest) else [nest]
 
 
-def _recursive_assert_same_structure(nest1, nest2):
+def _recursive_assert_same_structure(nest1, nest2, check_types):
   is_sequence_nest1 = is_sequence(nest1)
   if is_sequence_nest1 != is_sequence(nest2):
     raise ValueError(
@@ -109,28 +109,31 @@ def _recursive_assert_same_structure(nest1, nest2):
   if is_sequence_nest1:
     type_nest1 = type(nest1)
     type_nest2 = type(nest2)
-    if type_nest1 != type_nest2:
+    if check_types and type_nest1 != type_nest2:
       raise TypeError(
           "The two structures don't have the same sequence type. First "
           "structure has type %s, while second structure has type %s."
           % (type_nest1, type_nest2))
 
     for n1, n2 in zip(nest1, nest2):
-      _recursive_assert_same_structure(n1, n2)
+      _recursive_assert_same_structure(n1, n2, check_types)
 
 
-def assert_same_structure(nest1, nest2):
+def assert_same_structure(nest1, nest2, check_types=True):
   """Asserts that two structures are nested in the same way.
 
   Args:
     nest1: an arbitrarily nested structure.
     nest2: an arbitrarily nested structure.
+    check_types: if `True` (default) types of sequences are checked as
+      well. If set to `False`, for example a list and a tuple of objects will
+      look same if they have the same size.
 
   Raises:
     ValueError: If the two structures do not have the same number of elements or
       if the two structures are not nested in the same way.
     TypeError: If the two structures differ in the type of sequence in any of
-      their substructures.
+      their substructures. Only possible if `check_types` is `True`.
   """
   len_nest1 = len(flatten(nest1)) if is_sequence(nest1) else 1
   len_nest2 = len(flatten(nest2)) if is_sequence(nest2) else 1
@@ -138,7 +141,7 @@ def assert_same_structure(nest1, nest2):
     raise ValueError("The two structures don't have the same number of "
                      "elements. First structure: %s, second structure: %s."
                      % (nest1, nest2))
-  _recursive_assert_same_structure(nest1, nest2)
+  _recursive_assert_same_structure(nest1, nest2, check_types)
 
 
 def flatten_dict_items(dictionary):
@@ -266,7 +269,7 @@ def pack_sequence_as(structure, flat_sequence):
   return _sequence_like(structure, packed)
 
 
-def map_structure(func, *structure):
+def map_structure(func, *structure, **check_types_dict):
   """Applies `func` to each entry in `structure` and returns a new structure.
 
   Applies `func(x[0], x[1], ...)` where x[i] is an entry in
@@ -277,17 +280,24 @@ def map_structure(func, *structure):
     func: A callable that acceps as many arguments are there are structures.
     *structure: scalar, or tuple or list of constructed scalars and/or other
       tuples/lists, or scalars.  Note: numpy arrays are considered scalars.
+    **check_types_dict: only valid keyword argument is `check_types`. If set to
+      `True` (default) the types of iterables within the  structures have to be
+      same (e.g. `map_structure(func, [1], (1,))` raises a `TypeError`
+      exception). To allow this set this argument to `False`.
 
   Returns:
     A new structure with the same arity as `structure`, whose values correspond
     to `func(x[0], x[1], ...)` where `x[i]` is a value in the corresponding
-    location in `structure[i]`.
+    location in `structure[i]`. If there are different sequence types and
+    `check_types` is `False` the sequence types of the first structure will be
+    used.
 
   Raises:
     TypeError: If `func` is not callable or if the structures do not match
       each other by depth tree.
     ValueError: If no structure is provided or if the structures do not match
       each other by type.
+    ValueError: If wrong keyword arguments are provided.
   """
   if not callable(func):
     raise TypeError("func must be callable, got: %s" % func)
@@ -295,8 +305,15 @@ def map_structure(func, *structure):
   if not structure:
     raise ValueError("Must provide at least one structure")
 
+  if check_types_dict:
+    if "check_types" not in check_types_dict or len(check_types_dict) > 1:
+      raise ValueError("Only valid keyword argument is check_types")
+    check_types = check_types_dict["check_types"]
+  else:
+    check_types = True
+
   for other in structure[1:]:
-    assert_same_structure(structure[0], other)
+    assert_same_structure(structure[0], other, check_types=check_types)
 
   flat_structure = [flatten(s) for s in structure]
   entries = zip(*flat_structure)
@@ -315,7 +332,7 @@ def _yield_flat_up_to(shallow_tree, input_tree):
     yield input_tree
 
 
-def assert_shallow_structure(shallow_tree, input_tree):
+def assert_shallow_structure(shallow_tree, input_tree, check_types=True):
   """Asserts that `shallow_tree` is a shallow structure of `input_tree`.
 
   That is, this function tests if the `input_tree` structure can be created from
@@ -341,11 +358,13 @@ def assert_shallow_structure(shallow_tree, input_tree):
   Args:
     shallow_tree: an arbitrarily nested structure.
     input_tree: an arbitrarily nested structure.
+    check_types: if `True` (default) the sequence types of `shallow_tree` and
+      `input_tree` have to be the same.
 
   Raises:
     TypeError: If `shallow_tree` is a sequence but `input_tree` is not.
     TypeError: If the sequence types of `shallow_tree` are different from
-      `input_tree`.
+      `input_tree`. Only raised if `check_types` is `True`.
     ValueError: If the sequence lengths of `shallow_tree` are different from
       `input_tree`.
   """
@@ -355,7 +374,7 @@ def assert_shallow_structure(shallow_tree, input_tree):
           "If shallow structure is a sequence, input must also be a sequence. "
           "Input has type: %s." % type(input_tree))
 
-    if not isinstance(input_tree, type(shallow_tree)):
+    if check_types and not isinstance(input_tree, type(shallow_tree)):
       raise TypeError(
           "The two structures don't have the same sequence type. Input "
           "structure has type %s, while shallow structure has type %s."
@@ -368,7 +387,8 @@ def assert_shallow_structure(shallow_tree, input_tree):
           % (len(input_tree), len(shallow_tree)))
 
     for shallow_branch, input_branch in zip(shallow_tree, input_tree):
-      assert_shallow_structure(shallow_branch, input_branch)
+      assert_shallow_structure(shallow_branch, input_branch,
+                               check_types=check_types)
 
 
 def flatten_up_to(shallow_tree, input_tree):
diff --git a/tensorflow/python/util/nest_test.py b/tensorflow/python/util/nest_test.py
index f6a2d8b663..8a17d990da 100644
--- a/tensorflow/python/util/nest_test.py
+++ b/tensorflow/python/util/nest_test.py
@@ -139,6 +139,13 @@ class NestTest(test.TestCase):
                                  "don't have the same nested structure"):
       nest.assert_same_structure([[3], 4], [3, [4]])
 
+    structure1_list = [[[1, 2], 3], 4, [5, 6]]
+    with self.assertRaisesRegexp(TypeError,
+                                 "don't have the same sequence type"):
+      nest.assert_same_structure(structure1, structure1_list)
+    nest.assert_same_structure(structure1, structure2, check_types=False)
+    nest.assert_same_structure(structure1, structure1_list, check_types=False)
+
   def testMapStructure(self):
     structure1 = (((1, 2), 3), 4, (5, 6))
     structure2 = (((7, 8), 9), 10, (11, 12))
@@ -169,6 +176,23 @@ class NestTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, "same nested structure"):
       nest.map_structure(lambda x, y: None, ((3, 4), 5), (3, (4, 5)))
 
+    structure1_list = [[[1, 2], 3], 4, [5, 6]]
+    with self.assertRaisesRegexp(TypeError, "same sequence type"):
+      nest.map_structure(lambda x, y: None, structure1, structure1_list)
+
+    nest.map_structure(lambda x, y: None, structure1, structure1_list,
+                       check_types=False)
+
+    with self.assertRaisesRegexp(ValueError, "same nested structure"):
+      nest.map_structure(lambda x, y: None, ((3, 4), 5), (3, (4, 5)),
+                         check_types=False)
+
+    with self.assertRaisesRegexp(ValueError, "Only valid keyword argument"):
+      nest.map_structure(lambda x: None, structure1, foo="a")
+
+    with self.assertRaisesRegexp(ValueError, "Only valid keyword argument"):
+      nest.map_structure(lambda x: None, structure1, check_types=False, foo="a")
+
   def testAssertShallowStructure(self):
     inp_ab = ["a", "b"]
     inp_abc = ["a", "b", "c"]
@@ -186,6 +210,7 @@ class NestTest(test.TestCase):
         "<(type|class) 'list'>.")
     with self.assertRaisesRegexp(TypeError, expected_message):
       nest.assert_shallow_structure(inp_ab2, inp_ab1)
+    nest.assert_shallow_structure(inp_ab2, inp_ab1, check_types=False)
 
   def testFlattenUpTo(self):
     input_tree = [[[2, 2], [3, 3]], [[4, 9], [5, 5]]]
-- 
GitLab


From ca881f4767a2076f3d085cbeb36dfafd98ffafbc Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 09:53:40 -0800
Subject: [PATCH 0063/1563] Fix unbound <table> tag. Change: 152029426

---
 tensorflow/docs_src/install/install_windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index a171f1ac4d..7a6f579341 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -193,5 +193,5 @@ ImportError: cannot import name 'descriptor'</pre>
   <td><pre>No module named "pywrap_tensorflow"</pre></td>
 </tr>
 
-<table>
+</table>
 
-- 
GitLab


From 663eaa05bf1bfa2e84d60b16dc6f4d49cecc8b9a Mon Sep 17 00:00:00 2001
From: Dan Smilkov <smilkov@google.com>
Date: Mon, 3 Apr 2017 10:00:39 -0800
Subject: [PATCH 0064/1563] Fix the circular dependency tf/contrib/tensorboard
 <--> tf/tensorboard.

tf/tensorboard should not depend on tf/contrib/.. This is resolved by moving projector_config.proto from tf/contrib/tensorboard/plugins/projector to tf/tensorboard/plugins/projector.

The user-facing API hasn't changed. `ProjectorConfig` is still exposed as `tensorflow.contrib.tensorboard.plugins.projector.ProjectorConfig`.
Change: 152030381
---
 tensorflow/contrib/cmake/tf_python.cmake                 | 2 ++
 tensorflow/contrib/tensorboard/BUILD                     | 4 ++--
 .../contrib/tensorboard/plugins/projector/__init__.py    | 3 +--
 .../tensorboard/plugins/projector/projector_api_test.py  | 2 +-
 tensorflow/docs_src/get_started/embedding_viz.md         | 6 +++---
 tensorflow/tensorboard/plugins/projector/BUILD           | 9 ++++++++-
 .../tensorboard/plugins/projector/projector_config.proto | 0
 .../tensorboard/plugins/projector/projector_plugin.py    | 2 +-
 .../plugins/projector/projector_plugin_test.py           | 2 +-
 9 files changed, 19 insertions(+), 11 deletions(-)
 rename tensorflow/{contrib => }/tensorboard/plugins/projector/projector_config.proto (100%)

diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 37bdcec086..35f4048efc 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -111,6 +111,7 @@ file(GLOB_RECURSE tf_protos_python_srcs RELATIVE ${tensorflow_source_dir}
     "${tensorflow_source_dir}/tensorflow/core/*.proto"
     "${tensorflow_source_dir}/tensorflow/python/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/session_bundle/*.proto"
+    "${tensorflow_source_dir}/tensorflow/tensorboard/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/tensorboard/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/training/*.proto"
 )
@@ -124,6 +125,7 @@ RELATIVE_PROTOBUF_GENERATE_PYTHON(
 file(GLOB_RECURSE tf_python_protos_cc_srcs RELATIVE ${tensorflow_source_dir}
     "${tensorflow_source_dir}/tensorflow/python/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/session_bundle/*.proto"
+    "${tensorflow_source_dir}/tensorflow/tensorboard/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/tensorboard/*.proto"
     "${tensorflow_source_dir}/tensorflow/contrib/training/*.proto"
 )
diff --git a/tensorflow/contrib/tensorboard/BUILD b/tensorflow/contrib/tensorboard/BUILD
index 06f8c9e18f..db6b313138 100644
--- a/tensorflow/contrib/tensorboard/BUILD
+++ b/tensorflow/contrib/tensorboard/BUILD
@@ -43,9 +43,9 @@ py_library(
     srcs = ["plugins/projector/__init__.py"],
     srcs_version = "PY2AND3",
     deps = [
-        ":protos_all_py",
         "//tensorflow/python:lib",
         "//tensorflow/tensorboard/plugins/projector:projector_plugin",
+        "//tensorflow/tensorboard/plugins/projector:protos_all_py",
     ],
 )
 
@@ -56,10 +56,10 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":projector",
-        ":protos_all_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:platform",
         "//tensorflow/python:summary",
+        "//tensorflow/tensorboard/plugins/projector:protos_all_py",
     ],
 )
 
diff --git a/tensorflow/contrib/tensorboard/plugins/projector/__init__.py b/tensorflow/contrib/tensorboard/plugins/projector/__init__.py
index c11f5d065c..635c569d73 100644
--- a/tensorflow/contrib/tensorboard/plugins/projector/__init__.py
+++ b/tensorflow/contrib/tensorboard/plugins/projector/__init__.py
@@ -28,11 +28,10 @@ from __future__ import print_function
 import os
 
 from google.protobuf import text_format
-from tensorflow.contrib.tensorboard.plugins.projector.projector_config_pb2 import EmbeddingInfo
-from tensorflow.contrib.tensorboard.plugins.projector.projector_config_pb2 import ProjectorConfig
 from tensorflow.python.lib.io import file_io
 from tensorflow.tensorboard.plugins.projector import projector_plugin
 # pylint: disable=wildcard-import
+from tensorflow.tensorboard.plugins.projector.projector_config_pb2 import *
 from tensorflow.tensorboard.plugins.projector.projector_plugin import *
 # pylint: enable=wildcard-import
 
diff --git a/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py b/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py
index 96e084fa73..91ea6bc753 100644
--- a/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py
+++ b/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py
@@ -24,10 +24,10 @@ import shutil
 from google.protobuf import text_format
 
 from tensorflow.contrib.tensorboard.plugins import projector
-from tensorflow.contrib.tensorboard.plugins.projector import projector_config_pb2
 from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 from tensorflow.python.summary.writer import writer as writer_lib
+from tensorflow.tensorboard.plugins.projector import projector_config_pb2
 
 
 class ProjectorApiTest(test.TestCase):
diff --git a/tensorflow/docs_src/get_started/embedding_viz.md b/tensorflow/docs_src/get_started/embedding_viz.md
index 6404249703..f512d5d809 100644
--- a/tensorflow/docs_src/get_started/embedding_viz.md
+++ b/tensorflow/docs_src/get_started/embedding_viz.md
@@ -39,7 +39,7 @@ labels/images to the data points. You can do this by generating a
 [metadata file](#metadata) containing the labels for each point and configuring
 the projector either by using our Python API, or manually constructing and
 saving a
-<code>[projector_config.pbtxt](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/tensorboard/plugins/projector/projector_config.proto)</code>
+<code>[projector_config.pbtxt](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/plugins/projector/projector_config.proto)</code>
 in the same directory as your checkpoint file.
 
 ## Setup
@@ -68,7 +68,7 @@ saver.save(session, os.path.join(LOG_DIR, "model.ckpt"), step)
 
 If you have any metadata (labels, images) associated with your embedding, you
 can tell TensorBoard about it either by directly storing a
-<code>[projector_config.pbtxt](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/tensorboard/plugins/projector/projector_config.proto)</code>
+<code>[projector_config.pbtxt](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/plugins/projector/projector_config.proto)</code>
 in the <code>LOG_DIR</code>, or use our python API.
 
 For instance, the following <code>projector_config.ptxt</code> associates the
@@ -91,7 +91,7 @@ N = 10000 # Number of items (vocab size).
 D = 200 # Dimensionality of the embedding.
 embedding_var = tf.Variable(tf.random_normal([N,D]), name='word_embedding')
 
-# Format: tensorflow/contrib/tensorboard/plugins/projector/projector_config.proto
+# Format: tensorflow/tensorboard/plugins/projector/projector_config.proto
 config = projector.ProjectorConfig()
 
 # You can add multiple embeddings. Here we add only one.
diff --git a/tensorflow/tensorboard/plugins/projector/BUILD b/tensorflow/tensorboard/plugins/projector/BUILD
index 7c0ab64fb8..bc26a9bd67 100644
--- a/tensorflow/tensorboard/plugins/projector/BUILD
+++ b/tensorflow/tensorboard/plugins/projector/BUILD
@@ -7,6 +7,7 @@ licenses(["notice"])  # Apache 2.0
 exports_files(["LICENSE"])
 
 load("//tensorflow:tensorflow.bzl", "py_test")
+load("//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library")
 
 py_library(
     name = "projector_plugin",
@@ -17,7 +18,7 @@ py_library(
         "//tensorflow:internal",
     ],
     deps = [
-        "//tensorflow/contrib/tensorboard:protos_all_py",
+        ":protos_all_py",
         "//tensorflow/python:errors",
         "//tensorflow/python:image_ops",
         "//tensorflow/python:lib",
@@ -54,6 +55,12 @@ py_test(
     ],
 )
 
+tf_proto_library(
+    name = "protos_all",
+    srcs = glob(["*.proto"]),
+    visibility = ["//visibility:public"],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),
diff --git a/tensorflow/contrib/tensorboard/plugins/projector/projector_config.proto b/tensorflow/tensorboard/plugins/projector/projector_config.proto
similarity index 100%
rename from tensorflow/contrib/tensorboard/plugins/projector/projector_config.proto
rename to tensorflow/tensorboard/plugins/projector/projector_config.proto
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 70450bf2a9..439e919898 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -27,7 +27,6 @@ from six import BytesIO
 from werkzeug import wrappers
 from google.protobuf import json_format
 from google.protobuf import text_format
-from tensorflow.contrib.tensorboard.plugins.projector import projector_config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
@@ -40,6 +39,7 @@ from tensorflow.python.training.saver import checkpoint_exists
 from tensorflow.python.training.saver import latest_checkpoint
 from tensorflow.tensorboard.backend.http_util import Respond
 from tensorflow.tensorboard.plugins.base_plugin import TBPlugin
+from tensorflow.tensorboard.plugins.projector import projector_config_pb2
 
 # The prefix of routes provided by this plugin.
 PLUGIN_PREFIX_ROUTE = 'projector'
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index 069e8be84e..750cb1472a 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -28,7 +28,6 @@ import numpy as np
 from werkzeug import test as werkzeug_test
 from werkzeug import wrappers
 from google.protobuf import text_format
-from tensorflow.contrib.tensorboard.plugins.projector import projector_config_pb2
 from tensorflow.core.protobuf import saver_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import ops
@@ -43,6 +42,7 @@ from tensorflow.python.summary.writer import writer
 from tensorflow.python.training import saver as saver_lib
 from tensorflow.tensorboard.backend import application
 from tensorflow.tensorboard.backend.event_processing import event_multiplexer
+from tensorflow.tensorboard.plugins.projector import projector_config_pb2
 from tensorflow.tensorboard.plugins.projector import projector_plugin
 
 
-- 
GitLab


From 2fa975023d9834794aebbecf966856b1e27b539e Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 3 Apr 2017 10:16:23 -0800
Subject: [PATCH 0065/1563] Add backprop of betainc op w.r.t. the x argument

(a, b gradients require hypergeom functions which aren't implemented).
Change: 152032766
---
 .../python/kernel_tests/betainc_op_test.py    | 117 ++++++++++++++----
 tensorflow/python/ops/math_grad.py            |  37 +++++-
 2 files changed, 126 insertions(+), 28 deletions(-)

diff --git a/tensorflow/python/kernel_tests/betainc_op_test.py b/tensorflow/python/kernel_tests/betainc_op_test.py
index afdb436dc6..08b03f8518 100644
--- a/tensorflow/python/kernel_tests/betainc_op_test.py
+++ b/tensorflow/python/kernel_tests/betainc_op_test.py
@@ -25,76 +25,78 @@ import numpy as np
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gradient_checker
+from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging
 
 
 class BetaincTest(test.TestCase):
-  use_gpu = False
 
-  def _testBetaInc(self, dtype):
+  def _testBetaInc(self, a_s, b_s, x_s, dtype):
     try:
       from scipy import special  # pylint: disable=g-import-not-at-top
       np_dt = dtype.as_numpy_dtype
 
       # Test random values
-      a_s = np.abs(np.random.randn(10, 10) * 30).astype(np_dt)  # in (0, infty)
-      b_s = np.abs(np.random.randn(10, 10) * 30).astype(np_dt)  # in (0, infty)
-      x_s = np.random.rand(10, 10).astype(np_dt)  # in (0, 1)
-      with self.test_session(use_gpu=self.use_gpu):
-        tf_a_s = constant_op.constant(a_s, dtype=dtype)
-        tf_b_s = constant_op.constant(b_s, dtype=dtype)
-        tf_x_s = constant_op.constant(x_s, dtype=dtype)
-        tf_out = math_ops.betainc(tf_a_s, tf_b_s, tf_x_s).eval()
+      a_s = a_s.astype(np_dt)  # in (0, infty)
+      b_s = b_s.astype(np_dt)  # in (0, infty)
+      x_s = x_s.astype(np_dt)  # in (0, 1)
+      tf_a_s = constant_op.constant(a_s, dtype=dtype)
+      tf_b_s = constant_op.constant(b_s, dtype=dtype)
+      tf_x_s = constant_op.constant(x_s, dtype=dtype)
+      tf_out_t = math_ops.betainc(tf_a_s, tf_b_s, tf_x_s)
+      with self.test_session():
+        tf_out = tf_out_t.eval()
       scipy_out = special.betainc(a_s, b_s, x_s).astype(np_dt)
 
       # the scipy version of betainc uses a double-only implementation.
       # TODO(ebrevdo): identify reasons for (sometime) precision loss
       # with doubles
       tol = 1e-4 if dtype == dtypes.float32 else 5e-5
-      self.assertAllCloseAccordingToType(scipy_out, tf_out, rtol=tol, atol=tol)
+      self.assertAllCloseAccordingToType(scipy_out, tf_out, rtol=tol, atol=0)
 
       # Test out-of-range values (most should return nan output)
       combinations = list(itertools.product([-1, 0, 0.5, 1.0, 1.5], repeat=3))
       a_comb, b_comb, x_comb = np.asarray(list(zip(*combinations)), dtype=np_dt)
-      with self.test_session(use_gpu=self.use_gpu):
+      with self.test_session():
         tf_comb = math_ops.betainc(a_comb, b_comb, x_comb).eval()
       scipy_comb = special.betainc(a_comb, b_comb, x_comb).astype(np_dt)
       self.assertAllCloseAccordingToType(scipy_comb, tf_comb)
 
       # Test broadcasting between scalars and other shapes
-      with self.test_session(use_gpu=self.use_gpu):
+      with self.test_session():
         self.assertAllCloseAccordingToType(
             special.betainc(0.1, b_s, x_s).astype(np_dt),
             math_ops.betainc(0.1, b_s, x_s).eval(),
             rtol=tol,
-            atol=tol)
+            atol=0)
         self.assertAllCloseAccordingToType(
             special.betainc(a_s, 0.1, x_s).astype(np_dt),
             math_ops.betainc(a_s, 0.1, x_s).eval(),
             rtol=tol,
-            atol=tol)
+            atol=0)
         self.assertAllCloseAccordingToType(
             special.betainc(a_s, b_s, 0.1).astype(np_dt),
             math_ops.betainc(a_s, b_s, 0.1).eval(),
             rtol=tol,
-            atol=tol)
+            atol=0)
         self.assertAllCloseAccordingToType(
             special.betainc(0.1, b_s, 0.1).astype(np_dt),
             math_ops.betainc(0.1, b_s, 0.1).eval(),
             rtol=tol,
-            atol=tol)
+            atol=0)
         self.assertAllCloseAccordingToType(
             special.betainc(0.1, 0.1, 0.1).astype(np_dt),
             math_ops.betainc(0.1, 0.1, 0.1).eval(),
             rtol=tol,
-            atol=tol)
+            atol=0)
 
       with self.assertRaisesRegexp(ValueError, "must be equal"):
         math_ops.betainc(0.5, [0.5], [[0.5]])
 
-      with self.test_session(use_gpu=self.use_gpu):
+      with self.test_session():
         with self.assertRaisesOpError("Shapes of .* are inconsistent"):
           a_p = array_ops.placeholder(dtype)
           b_p = array_ops.placeholder(dtype)
@@ -108,14 +110,79 @@ class BetaincTest(test.TestCase):
       tf_logging.warn("Cannot test special functions: %s" % str(e))
 
   def testBetaIncFloat(self):
-    self._testBetaInc(dtypes.float32)
+    a_s = np.abs(np.random.randn(10, 10) * 30)  # in (0, infty)
+    b_s = np.abs(np.random.randn(10, 10) * 30)  # in (0, infty)
+    x_s = np.random.rand(10, 10)  # in (0, 1)
+    self._testBetaInc(a_s, b_s, x_s, dtypes.float32)
 
   def testBetaIncDouble(self):
-    self._testBetaInc(dtypes.float64)
-
-
-class BetaincTestGPU(BetaincTest):
-  use_gpu = True
+    a_s = np.abs(np.random.randn(10, 10) * 30)  # in (0, infty)
+    b_s = np.abs(np.random.randn(10, 10) * 30)  # in (0, infty)
+    x_s = np.random.rand(10, 10)  # in (0, 1)
+    self._testBetaInc(a_s, b_s, x_s, dtypes.float64)
+
+  def testBetaIncDoubleVeryLargeValues(self):
+    a_s = np.abs(np.random.randn(10, 10) * 1e15)  # in (0, infty)
+    b_s = np.abs(np.random.randn(10, 10) * 1e15)  # in (0, infty)
+    x_s = np.random.rand(10, 10)  # in (0, 1)
+    self._testBetaInc(a_s, b_s, x_s, dtypes.float64)
+
+  def testBetaIncDoubleVerySmallValues(self):
+    a_s = np.abs(np.random.randn(10, 10) * 1e-16)  # in (0, infty)
+    b_s = np.abs(np.random.randn(10, 10) * 1e-16)  # in (0, infty)
+    x_s = np.random.rand(10, 10)  # in (0, 1)
+    self._testBetaInc(a_s, b_s, x_s, dtypes.float64)
+
+  def testBetaIncFloatVerySmallValues(self):
+    a_s = np.abs(np.random.randn(10, 10) * 1e-8)  # in (0, infty)
+    b_s = np.abs(np.random.randn(10, 10) * 1e-8)  # in (0, infty)
+    x_s = np.random.rand(10, 10)  # in (0, 1)
+    self._testBetaInc(a_s, b_s, x_s, dtypes.float32)
+
+  def testBetaIncFpropAndBpropAreNeverNAN(self):
+    with self.test_session() as sess:
+      space = np.logspace(-8, 5).tolist()
+      space_x = np.linspace(1e-16, 1 - 1e-16).tolist()
+      ga_s, gb_s, gx_s = zip(*list(itertools.product(space, space, space_x)))
+      # Test grads are never nan
+      ga_s_t = constant_op.constant(ga_s, dtype=dtypes.float32)
+      gb_s_t = constant_op.constant(gb_s, dtype=dtypes.float32)
+      gx_s_t = constant_op.constant(gx_s, dtype=dtypes.float32)
+      tf_gout_t = math_ops.betainc(ga_s_t, gb_s_t, gx_s_t)
+      tf_gout, grads_x = sess.run(
+          [tf_gout_t,
+           gradients_impl.gradients(tf_gout_t, [ga_s_t, gb_s_t, gx_s_t])[2]])
+
+      # Equivalent to `assertAllFalse` (if it existed).
+      self.assertAllEqual(np.zeros_like(grads_x).astype(np.bool),
+                          np.isnan(tf_gout))
+      self.assertAllEqual(np.zeros_like(grads_x).astype(np.bool),
+                          np.isnan(grads_x))
+
+  def testBetaIncGrads(self):
+    err_tolerance = 1e-3
+    with self.test_session():
+      # Test gradient
+      ga_s = np.abs(np.random.randn(2, 2) * 30)  # in (0, infty)
+      gb_s = np.abs(np.random.randn(2, 2) * 30)  # in (0, infty)
+      gx_s = np.random.rand(2, 2)  # in (0, 1)
+      tf_ga_s = constant_op.constant(ga_s, dtype=dtypes.float64)
+      tf_gb_s = constant_op.constant(gb_s, dtype=dtypes.float64)
+      tf_gx_s = constant_op.constant(gx_s, dtype=dtypes.float64)
+      tf_gout_t = math_ops.betainc(tf_ga_s, tf_gb_s, tf_gx_s)
+      err = gradient_checker.compute_gradient_error(
+          [tf_gx_s], [gx_s.shape], tf_gout_t, gx_s.shape)
+      print("betainc gradient err = %g " % err)
+      self.assertLess(err, err_tolerance)
+
+      # Test broadcast gradient
+      gx_s = np.random.rand()  # in (0, 1)
+      tf_gx_s = constant_op.constant(gx_s, dtype=dtypes.float64)
+      tf_gout_t = math_ops.betainc(tf_ga_s, tf_gb_s, tf_gx_s)
+      err = gradient_checker.compute_gradient_error(
+          [tf_gx_s], [()], tf_gout_t, ga_s.shape)
+      print("betainc gradient err = %g " % err)
+      self.assertLess(err, err_tolerance)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/python/ops/math_grad.py b/tensorflow/python/ops/math_grad.py
index 8aa8de530c..409e3c5111 100644
--- a/tensorflow/python/ops/math_grad.py
+++ b/tensorflow/python/ops/math_grad.py
@@ -429,7 +429,7 @@ def _DigammaGrad(op, grad):
 
 @ops.RegisterGradient("Igamma")
 def _IgammaGrad(op, grad):
-  """Returns gradient of igamma(a, x) with respect to a and x."""
+  """Returns gradient of igamma(a, x) with respect to x."""
   # TODO(ebrevdo): Perhaps add the derivative w.r.t. a
   a = op.inputs[0]
   x = op.inputs[1]
@@ -440,14 +440,43 @@ def _IgammaGrad(op, grad):
   # Perform operations in log space before summing, because Gamma(a)
   # and Gamma'(a) can grow large.
   partial_x = math_ops.exp(-x + (a - 1) * math_ops.log(x) - math_ops.lgamma(a))
+  # TODO(b/36815900): Mark None return values as NotImplemented
   return (None,
           array_ops.reshape(math_ops.reduce_sum(partial_x * grad, rx), sx))
 
 
 @ops.RegisterGradient("Igammac")
 def _IgammacGrad(op, grad):
-  """Returns gradient of igammac(a, x) = 1 - igamma(a, x) w.r.t. a and x."""
-  return [-1 * g if g is not None else None for g in _IgammaGrad(op, grad)]
+  """Returns gradient of igammac(a, x) = 1 - igamma(a, x) w.r.t. x."""
+  _, igamma_grad_x = _IgammaGrad(op, grad)
+  return None, -igamma_grad_x
+
+
+@ops.RegisterGradient("Betainc")
+def _BetaincGrad(op, grad):
+  """Returns gradient of betainc(a, b, x) with respect to x."""
+  # TODO(ebrevdo): Perhaps add the derivative w.r.t. a, b
+  a, b, x = op.inputs
+
+  # two cases: x is a scalar and a/b are same-shaped tensors, or vice
+  # versa; so its sufficient to check against shape(a).
+  sa = array_ops.shape(a)
+  sx = array_ops.shape(x)
+  # pylint: disable=protected-access
+  _, rx = gen_array_ops._broadcast_gradient_args(sa, sx)
+  # pylint: enable=protected-access
+
+  # Perform operations in log space before summing, because terms
+  # can grow large.
+  log_beta = (gen_math_ops.lgamma(a) + gen_math_ops.lgamma(b)
+              - gen_math_ops.lgamma(a + b))
+  partial_x = math_ops.exp(
+      (b - 1) * math_ops.log(1 - x) + (a - 1) * math_ops.log(x) - log_beta)
+
+  # TODO(b/36815900): Mark None return values as NotImplemented
+  return (None,  # da
+          None,  # db
+          array_ops.reshape(math_ops.reduce_sum(partial_x * grad, rx), sx))
 
 
 @ops.RegisterGradient("Zeta")
@@ -465,6 +494,7 @@ def _ZetaGrad(op, grad):
     x = math_ops.conj(x)
     q = math_ops.conj(q)
     partial_q = -x * math_ops.zeta(x + 1, q)
+    # TODO(b/36815900): Mark None return values as NotImplemented
     return (None,
             array_ops.reshape(math_ops.reduce_sum(partial_q * grad, rq), sq))
 
@@ -484,6 +514,7 @@ def _PolygammaGrad(op, grad):
     n = math_ops.conj(n)
     x = math_ops.conj(x)
     partial_x = math_ops.polygamma(n + 1, x)
+    # TODO(b/36815900): Mark None return values as NotImplemented
     return (None,
             array_ops.reshape(math_ops.reduce_sum(partial_x * grad, rx), sx))
 
-- 
GitLab


From ba17eb445d53d0a68cded931e16e6cb4cb554dc8 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 3 Apr 2017 14:15:10 -0400
Subject: [PATCH 0066/1563] Remove --no-deps flag from pip install of
 tensorflow whl in pip.sh

Fixes ongoing breakages related to the new dependencies of the
tensorflow wheel (e.g., bleach and markdown).
---
 tensorflow/tools/ci_build/builds/pip.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/builds/pip.sh b/tensorflow/tools/ci_build/builds/pip.sh
index 751f7de9a1..e0a1391d6e 100755
--- a/tensorflow/tools/ci_build/builds/pip.sh
+++ b/tensorflow/tools/ci_build/builds/pip.sh
@@ -269,7 +269,7 @@ pip install --upgrade pip==8.1.2
 
 # Force tensorflow reinstallation. Otherwise it may not get installed from
 # last build if it had the same version number as previous build.
-PIP_FLAGS="--upgrade --force-reinstall --no-deps"
+PIP_FLAGS="--upgrade --force-reinstall"
 pip install -v ${PIP_FLAGS} ${WHL_PATH} || \
     die "pip install (forcing to reinstall tensorflow) FAILED"
 echo "Successfully installed pip package ${WHL_PATH}"
-- 
GitLab


From c64831d1c1e839f6cdb98d5a58438d0b454974d8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 10:36:51 -0800
Subject: [PATCH 0067/1563] Improve docstring for eval_metrics. Change:
 152035648

---
 tensorflow/contrib/learn/python/learn/experiment.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index a8f8d995fe..cecc24c17d 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -97,7 +97,8 @@ class Experiment(object):
         finite number of batches (generally, 1 epoch over the evaluation data).
       eval_metrics: `dict` of string, metric function. If `None`, default set
         is used. This should be `None` if the `estimator` is
-        ${tf.estimator.Estimator}.
+        ${tf.estimator.Estimator}. If metrics are provided they will be
+        *appended* to the default set.
       train_steps: Perform this many steps of training. `None`, the default,
         means train forever.
       eval_steps: `evaluate` runs until input is exhausted (or another exception
-- 
GitLab


From 0f993379556d972e85597f82d70eca21e849f64f Mon Sep 17 00:00:00 2001
From: Pete Warden <pete@petewarden.com>
Date: Mon, 3 Apr 2017 20:25:07 +0100
Subject: [PATCH 0068/1563] Make sure we don't compile with SSE for i386 iOS
 simulator builds, to prevent fatal error on launch (#8918)

---
 tensorflow/contrib/makefile/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile
index 4db818a3a9..2b2e885689 100644
--- a/tensorflow/contrib/makefile/Makefile
+++ b/tensorflow/contrib/makefile/Makefile
@@ -370,6 +370,7 @@ ifeq ($(TARGET),IOS)
 	ifeq ($(IOS_ARCH),I386)
 		CXXFLAGS += -mios-simulator-version-min=$(MIN_SDK_VERSION) \
 		-arch i386 \
+		-mno-sse \
 		-fembed-bitcode \
 		-D__thread= \
 		-DUSE_GEMM_FOR_CONV \
-- 
GitLab


From a336b06d290ec624dc14ac69c9f6520a111a5fb0 Mon Sep 17 00:00:00 2001
From: "Yuan (Terry) Tang" <terrytangyuan@users.noreply.github.com>
Date: Mon, 3 Apr 2017 15:30:17 -0400
Subject: [PATCH 0069/1563] Polish weighted_sparse_column doc (#8909)

---
 tensorflow/contrib/layers/python/layers/feature_column.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 282c556424..32839b251a 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -791,9 +791,11 @@ def weighted_sparse_column(sparse_id_column,
       weight or value of the corresponding sparse id feature.
     dtype: Type of weights, such as `tf.float32`. Only floating and integer
       weights are supported.
+
   Returns:
     A _WeightedSparseColumn composed of two sparse features: one represents id,
     the other represents weight (value) of the id feature in that example.
+
   Raises:
     ValueError: if dtype is not convertible to float.
   """
-- 
GitLab


From 535928864e296ca051fd7ceedbba915fb0e81bbe Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 11:26:11 -0800
Subject: [PATCH 0070/1563] Increase kMaxRecursionDepth. Change: 152042191

---
 tensorflow/compiler/jit/mark_for_compilation_pass.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass.cc b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
index 22dbf7ec99..b27c07d0d9 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
@@ -50,7 +50,7 @@ bool HasXLAKernel(const Node& node, const DeviceType& jit_device_type) {
 }
 
 // Make sure we don't recurse infinitely on recursive functions.
-const int kMaxRecursionDepth = 5;
+const int kMaxRecursionDepth = 10;
 
 bool IsCompilableCall(const NodeDef& call_def, DeviceType jit_device_type,
                       int depth, FunctionLibraryRuntime* lib_runtime);
-- 
GitLab


From a585ccb885a01e19972718979a02f6dceb5ccb89 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 11:36:52 -0800
Subject: [PATCH 0071/1563] Add support for running an end of training hook,
 specified as a finalize_training method. Change: 152043420

---
 .../tensor_forest/client/random_forest.py     | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/tensor_forest/client/random_forest.py b/tensorflow/contrib/tensor_forest/client/random_forest.py
index 6cbe7b6d49..01697df086 100644
--- a/tensorflow/contrib/tensor_forest/client/random_forest.py
+++ b/tensorflow/contrib/tensor_forest/client/random_forest.py
@@ -31,6 +31,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.training import basic_session_run_hooks
+from tensorflow.python.training import monitored_session
 from tensorflow.python.training import session_run_hook
 
 
@@ -95,6 +97,22 @@ class TensorForestLossHook(session_run_hook.SessionRunHook):
       run_context.request_stop()
 
 
+class EveryCheckpointPreSaveListener(
+    basic_session_run_hooks.CheckpointSaverListener):
+  """Runs a given op before each checkpoint save."""
+
+  def __init__(self, op):
+    """Initializes the object.
+
+    Args:
+      op: An op to run before each checkpoint save.
+    """
+    self._op = op
+
+  def before_save(self, session, global_step_value):
+    session.run(self._op)
+
+
 def get_model_fn(params,
                  graph_builder_class,
                  device_assigner,
@@ -103,6 +121,7 @@ def get_model_fn(params,
                  num_trainers=1,
                  trainer_id=0,
                  report_feature_importances=False,
+                 model_dir=None,
                  local_eval=False):
   """Return a model function given a way to construct a graph builder."""
   def _model_fn(features, labels, mode):
@@ -138,6 +157,8 @@ def get_model_fn(params,
     # question of why we force everything to adhere to a single model_fn).
     loss_deps = []
     training_graph = None
+    training_hooks = []
+    scaffold = None
     if labels is not None and mode == model_fn_lib.ModeKeys.TRAIN:
       training_graph = control_flow_ops.group(
           graph_builder.training_graph(
@@ -146,6 +167,15 @@ def get_model_fn(params,
               trainer_id=trainer_id),
           state_ops.assign_add(contrib_framework.get_global_step(), 1))
       loss_deps.append(training_graph)
+      if hasattr(graph_builder, 'finalize_training'):
+        finalize_listener = EveryCheckpointPreSaveListener(
+            graph_builder.finalize_training())
+        scaffold = monitored_session.Scaffold()
+        training_hooks.append(
+            basic_session_run_hooks.CheckpointSaverHook(
+                model_dir, save_secs=600, save_steps=None,
+                scaffold=scaffold,
+                listeners=[finalize_listener]))
 
     training_loss = None
     if (mode == model_fn_lib.ModeKeys.EVAL or
@@ -158,7 +188,6 @@ def get_model_fn(params,
     if weights is not None:
       features[weights_name] = weights
 
-    training_hooks = []
     if early_stopping_rounds:
       training_hooks.append(TensorForestLossHook(early_stopping_rounds))
 
@@ -167,7 +196,9 @@ def get_model_fn(params,
         predictions=inference,
         loss=training_loss,
         train_op=training_graph,
-        training_hooks=training_hooks)
+        training_hooks=training_hooks,
+        scaffold=scaffold)
+
   return _model_fn
 
 
@@ -257,6 +288,7 @@ class TensorForestEstimator(estimator.Estimator):
             num_trainers=num_trainers,
             trainer_id=trainer_id,
             report_feature_importances=report_feature_importances,
+            model_dir=model_dir,
             local_eval=local_eval),
         model_dir=model_dir,
         config=config,
-- 
GitLab


From 24c9cd77d586ad900ab7da09f391425e99c11faf Mon Sep 17 00:00:00 2001
From: "Joshua V. Dillon" <jvdillon@google.com>
Date: Mon, 3 Apr 2017 11:37:25 -0800
Subject: [PATCH 0072/1563] Expand MVN broadcast logic to broadcast batch shape
 between loc/scale args. Change: 152043476

---
 .../python/kernel_tests/mvn_diag_test.py      | 25 ++++++++++++
 .../python/ops/mvn_linear_operator.py         | 38 +++++++++++++++----
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py
index aa9d45f151..406cd4ebbe 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py
@@ -103,6 +103,31 @@ class MultivariateNormalDiagTest(test.TestCase):
       self.assertAllClose(cov_mat, np.cov(samps.T),
                           atol=0.05, rtol=0.05)
 
+  def testSampleWithBroadcastScale(self):
+    # mu corresponds to a 2-batch of 3-variate normals
+    mu = np.zeros([2, 3])
+
+    # diag corresponds to no batches of 3-variate normals
+    diag = np.ones([3])
+
+    with self.test_session():
+      dist = ds.MultivariateNormalDiag(mu, diag, validate_args=True)
+
+      mean = dist.mean()
+      self.assertAllEqual([2, 3], mean.get_shape())
+      self.assertAllClose(mu, mean.eval())
+
+      n = int(1e3)
+      samps = dist.sample(n, seed=0).eval()
+      cov_mat = array_ops.matrix_diag(diag).eval()**2
+      sample_cov = np.matmul(samps.transpose([1, 2, 0]),
+                             samps.transpose([1, 0, 2])) / n
+
+      self.assertAllClose(mu, samps.mean(axis=0),
+                          atol=0.10, rtol=0.05)
+      self.assertAllClose([cov_mat, cov_mat], sample_cov,
+                          atol=0.10, rtol=0.05)
+
   def testCovariance(self):
     with self.test_session():
       mvn = ds.MultivariateNormalDiag(
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
index 734648d2d6..3bb6bb4af2 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
@@ -25,6 +25,7 @@ from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
@@ -53,6 +54,16 @@ or
 """
 
 
+def _broadcast_shape(shape1, shape2):
+  """Convenience function which statically broadcasts shape when possible."""
+  if (tensor_util.constant_value(shape1) is not None and
+      tensor_util.constant_value(shape2) is not None):
+    return array_ops.broadcast_static_shape(
+        tensor_shape.TensorShape(tensor_util.constant_value(shape1)),
+        tensor_shape.TensorShape(tensor_util.constant_value(shape2)))
+  return array_ops.broadcast_dynamic_shape(shape1, shape2)
+
+
 # TODO(b/35290280): Import in `../../__init__.py` after adding unit-tests.
 class MultivariateNormalLinearOperator(
     transformed_distribution.TransformedDistribution):
@@ -179,12 +190,25 @@ class MultivariateNormalLinearOperator(
     if not scale.dtype.is_floating:
       raise TypeError("`scale` parameter must have floating-point dtype.")
 
-    # Since expand_dims doesn't preserve constant-ness, we obtain the
-    # non-dynamic value if possible.
-    event_shape = scale.domain_dimension_tensor()
-    if tensor_util.constant_value(event_shape) is not None:
-      event_shape = tensor_util.constant_value(event_shape)
-    event_shape = event_shape[array_ops.newaxis]
+    with ops.name_scope(name, values=[loc] + scale.graph_parents):
+      # Since expand_dims doesn't preserve constant-ness, we obtain the
+      # non-dynamic value if possible.
+      event_shape = scale.range_dimension_tensor()
+      if tensor_util.constant_value(event_shape) is not None:
+        event_shape = tensor_util.constant_value(event_shape).reshape([1])
+      else:
+        event_shape = event_shape[array_ops.newaxis]
+      batch_shape = scale.batch_shape_tensor()
+      if loc is not None:
+        loc = ops.convert_to_tensor(loc, name="loc")
+        loc_batch_shape = loc.get_shape().with_rank_at_least(1)[:-1]
+        if (loc.get_shape().ndims is None or
+            not loc_batch_shape.is_fully_defined()):
+          loc_batch_shape = array_ops.shape(loc)[:-1]
+        else:
+          loc_batch_shape = ops.convert_to_tensor(loc_batch_shape,
+                                                  name="loc_batch_shape")
+        batch_shape = _broadcast_shape(batch_shape, loc_batch_shape)
 
     super(MultivariateNormalLinearOperator, self).__init__(
         distribution=normal.Normal(
@@ -192,7 +216,7 @@ class MultivariateNormalLinearOperator(
             scale=array_ops.ones([], dtype=scale.dtype)),
         bijector=bijectors.AffineLinearOperator(
             shift=loc, scale=scale, validate_args=validate_args),
-        batch_shape=scale.batch_shape_tensor(),
+        batch_shape=batch_shape,
         event_shape=event_shape,
         validate_args=validate_args,
         name=name)
-- 
GitLab


From 7ab36077ef94631144d50cc310c3a9658d572052 Mon Sep 17 00:00:00 2001
From: MikeTam1021 <MikaelTamillow96@gmail.com>
Date: Mon, 3 Apr 2017 15:03:41 -0500
Subject: [PATCH 0073/1563] tutorials/monitors/iris_monitor.py fixes (#8927)

* Iris_Monitors.py validation metric prediction key

update to "classes"

* Iris_monitors.py import removed

code to import MetricSpec

* iris_monitors.py repetitive code removed

code should not have been duplicated
---
 .../tutorials/monitors/iris_monitors.py       | 30 ++-----------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/tensorflow/examples/tutorials/monitors/iris_monitors.py b/tensorflow/examples/tutorials/monitors/iris_monitors.py
index 37ed7395e6..850d105f7b 100644
--- a/tensorflow/examples/tutorials/monitors/iris_monitors.py
+++ b/tensorflow/examples/tutorials/monitors/iris_monitors.py
@@ -21,7 +21,6 @@ import os
 
 import numpy as np
 import tensorflow as tf
-from tensorflow.contrib.learn.python.learn.metric_spec import MetricSpec
 
 tf.logging.set_verbosity(tf.logging.INFO)
 
@@ -41,18 +40,15 @@ def main(unused_argv):
       "accuracy":
           tf.contrib.learn.MetricSpec(
               metric_fn=tf.contrib.metrics.streaming_accuracy,
-              prediction_key=
-              tf.contrib.learn.PredictionKey.CLASSES),
+              prediction_key="classes"),
       "precision":
           tf.contrib.learn.MetricSpec(
               metric_fn=tf.contrib.metrics.streaming_precision,
-              prediction_key=
-              tf.contrib.learn.PredictionKey.CLASSES),
+              prediction_key="classes"),
       "recall":
           tf.contrib.learn.MetricSpec(
               metric_fn=tf.contrib.metrics.streaming_recall,
-              prediction_key=
-              tf.contrib.learn.PredictionKey.CLASSES)
+              prediction_key="classes")
   }
   validation_monitor = tf.contrib.learn.monitors.ValidationMonitor(
       test_set.data,
@@ -66,26 +62,6 @@ def main(unused_argv):
   # Specify that all features have real-value data
   feature_columns = [tf.contrib.layers.real_valued_column("", dimension=4)]
 
-  validation_metrics = {
-      "accuracy": MetricSpec(
-                          metric_fn=tf.contrib.metrics.streaming_accuracy,
-                          prediction_key="classes"),
-      "recall": MetricSpec(
-                          metric_fn=tf.contrib.metrics.streaming_recall,
-                          prediction_key="classes"),
-      "precision": MetricSpec(
-                          metric_fn=tf.contrib.metrics.streaming_precision,
-                          prediction_key="classes")
-                        }
-  validation_monitor = tf.contrib.learn.monitors.ValidationMonitor(
-      test_set.data,
-      test_set.target,
-      every_n_steps=50,
-      metrics=validation_metrics,
-      early_stopping_metric="loss",
-      early_stopping_metric_minimize=True,
-      early_stopping_rounds=200)
-
   # Build 3 layer DNN with 10, 20, 10 units respectively.
   classifier = tf.contrib.learn.DNNClassifier(
       feature_columns=feature_columns,
-- 
GitLab


From b63e9b5a01d94bb13b38b77eaacf00ec4d72b698 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 11:51:13 -0800
Subject: [PATCH 0074/1563] Fix build broken by cl/151008918 by adding missing
 #include. Change: 152045097

---
 .../boosted_trees/lib/testutil/random_tree_gen_main.cc     | 1 +
 .../resources/decision_tree_ensemble_resource.h            | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
index 7d905d4082..8d581b7c99 100644
--- a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
@@ -21,6 +21,7 @@
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/init_main.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/util/command_line_flags.h"
 
 using tensorflow::Flag;
diff --git a/tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h b/tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h
index 90e641f4bd..45c3bbadfc 100644
--- a/tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h
+++ b/tensorflow/contrib/boosted_trees/resources/decision_tree_ensemble_resource.h
@@ -19,6 +19,7 @@
 #include "tensorflow/contrib/boosted_trees/resources/stamped_resource.h"
 #include "tensorflow/core/framework/resource_mgr.h"
 #include "tensorflow/core/platform/mutex.h"
+#include "tensorflow/core/platform/protobuf.h"
 
 namespace tensorflow {
 namespace boosted_trees {
@@ -30,7 +31,7 @@ class DecisionTreeEnsembleResource : public StampedResource {
   // Constructor.
   explicit DecisionTreeEnsembleResource()
       : decision_tree_ensemble_(
-            proto2::Arena::CreateMessage<
+            protobuf::Arena::CreateMessage<
                 boosted_trees::trees::DecisionTreeEnsembleConfig>(&arena_)) {}
 
   string DebugString() override {
@@ -57,14 +58,14 @@ class DecisionTreeEnsembleResource : public StampedResource {
     // Clear tree ensemle.
     arena_.Reset();
     CHECK_EQ(0, arena_.SpaceAllocated());
-    decision_tree_ensemble_ = proto2::Arena::CreateMessage<
+    decision_tree_ensemble_ = protobuf::Arena::CreateMessage<
         boosted_trees::trees::DecisionTreeEnsembleConfig>(&arena_);
   }
 
   mutex* get_mutex() { return &mu_; }
 
  private:
-  proto2::Arena arena_;
+  protobuf::Arena arena_;
   mutex mu_;
   boosted_trees::trees::DecisionTreeEnsembleConfig* decision_tree_ensemble_;
 };
-- 
GitLab


From fd2c8bccf92eff5dae463ded593e38a38fe42359 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 11:59:18 -0800
Subject: [PATCH 0075/1563] Remove extra blank lines from auto-generated Python
 documentation. Change: 152046128

---
 tensorflow/core/ops/spectral_ops.cc | 78 +++++++++++++++++++----------
 1 file changed, 51 insertions(+), 27 deletions(-)

diff --git a/tensorflow/core/ops/spectral_ops.cc b/tensorflow/core/ops/spectral_ops.cc
index 1a2b2f3dab..09b460fd14 100644
--- a/tensorflow/core/ops/spectral_ops.cc
+++ b/tensorflow/core/ops/spectral_ops.cc
@@ -31,12 +31,14 @@ REGISTER_OP("FFT")
       return shape_inference::UnchangedShapeWithRankAtLeast(c, 1);
     })
     .Doc(R"doc(
-Compute the 1-dimensional discrete Fourier Transform over the inner-most
+Fast Fourier transform.
+
+Computes the 1-dimensional discrete Fourier transform over the inner-most
 dimension of `input`.
 
 input: A complex64 tensor.
 output: A complex64 tensor of the same shape as `input`. The inner-most
-  dimension of `input` is replaced with its 1D Fourier Transform.
+  dimension of `input` is replaced with its 1D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.fft
@@ -50,12 +52,14 @@ REGISTER_OP("IFFT")
       return shape_inference::UnchangedShapeWithRankAtLeast(c, 1);
     })
     .Doc(R"doc(
-Compute the inverse 1-dimensional discrete Fourier Transform over the inner-most
-dimension of `input`.
+Inverse fast Fourier transform.
+
+Computes the inverse 1-dimensional discrete Fourier transform over the
+inner-most dimension of `input`.
 
 input: A complex64 tensor.
 output: A complex64 tensor of the same shape as `input`. The inner-most
-  dimension of `input` is replaced with its inverse 1D Fourier Transform.
+  dimension of `input` is replaced with its inverse 1D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.ifft
@@ -69,12 +73,14 @@ REGISTER_OP("FFT2D")
       return shape_inference::UnchangedShapeWithRankAtLeast(c, 2);
     })
     .Doc(R"doc(
-Compute the 2-dimensional discrete Fourier Transform over the inner-most
+2D fast Fourier transform.
+
+Computes the 2-dimensional discrete Fourier transform over the inner-most
 2 dimensions of `input`.
 
 input: A complex64 tensor.
 output: A complex64 tensor of the same shape as `input`. The inner-most 2
-  dimensions of `input` are replaced with their 2D Fourier Transform.
+  dimensions of `input` are replaced with their 2D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.fft2
@@ -88,12 +94,14 @@ REGISTER_OP("IFFT2D")
       return shape_inference::UnchangedShapeWithRankAtLeast(c, 2);
     })
     .Doc(R"doc(
-Compute the inverse 2-dimensional discrete Fourier Transform over the inner-most
-2 dimensions of `input`.
+Inverse 2D fast Fourier transform.
+
+Computes the inverse 2-dimensional discrete Fourier transform over the
+inner-most 2 dimensions of `input`.
 
 input: A complex64 tensor.
 output: A complex64 tensor of the same shape as `input`. The inner-most 2
-  dimensions of `input` are replaced with their inverse 2D Fourier Transform.
+  dimensions of `input` are replaced with their inverse 2D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.ifft2
@@ -107,12 +115,14 @@ REGISTER_OP("FFT3D")
       return shape_inference::UnchangedShapeWithRankAtLeast(c, 3);
     })
     .Doc(R"doc(
-Compute the 3-dimensional discrete Fourier Transform over the inner-most 3
+3D fast Fourier transform.
+
+Computes the 3-dimensional discrete Fourier transform over the inner-most 3
 dimensions of `input`.
 
 input: A complex64 tensor.
 output: A complex64 tensor of the same shape as `input`. The inner-most 3
-  dimensions of `input` are replaced with their 3D Fourier Transform.
+  dimensions of `input` are replaced with their 3D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.fftn with 3 dimensions.
@@ -126,12 +136,14 @@ REGISTER_OP("IFFT3D")
       return shape_inference::UnchangedShapeWithRankAtLeast(c, 3);
     })
     .Doc(R"doc(
-Compute the inverse 3-dimensional discrete Fourier Transform over the inner-most
-3 dimensions of `input`.
+Inverse 3D fast Fourier transform.
+
+Computes the inverse 3-dimensional discrete Fourier transform over the
+inner-most 3 dimensions of `input`.
 
 input: A complex64 tensor.
 output: A complex64 tensor of the same shape as `input`. The inner-most 3
-  dimensions of `input` are replaced with their inverse 3D Fourier Transform.
+  dimensions of `input` are replaced with their inverse 3D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.ifftn with 3 dimensions.
@@ -180,7 +192,9 @@ REGISTER_OP("RFFT")
     .Output("output: complex64")
     .SetShapeFn([](InferenceContext* c) { return RFFTShape(c, true, 1); })
     .Doc(R"doc(
-Compute the 1-dimensional discrete Fourier Transform of a real-valued signal
+Real-valued fast Fourier transform.
+
+Computes the 1-dimensional discrete Fourier transform of a real-valued signal
 over the inner-most dimension of `input`.
 
 Since the DFT of a real signal is Hermitian-symmetric, `RFFT` only returns the
@@ -191,7 +205,7 @@ input: A float32 tensor.
 fft_length: An int32 tensor of shape [1]. The FFT length.
 output: A complex64 tensor of the same rank as `input`. The inner-most
   dimension of `input` is replaced with the `fft_length / 2 + 1` unique
-  frequency components of its 1D Fourier Transform.
+  frequency components of its 1D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.rfft
@@ -204,7 +218,9 @@ REGISTER_OP("IRFFT")
     .Output("output: float")
     .SetShapeFn([](InferenceContext* c) { return RFFTShape(c, false, 1); })
     .Doc(R"doc(
-Compute the inverse 1-dimensional discrete Fourier Transform of a real-valued
+Inverse real-valued fast Fourier transform.
+
+Computes the inverse 1-dimensional discrete Fourier transform of a real-valued
 signal over the inner-most dimension of `input`.
 
 The inner-most dimension of `input` is assumed to be the result of `RFFT`: the
@@ -218,7 +234,7 @@ input: A complex64 tensor.
 fft_length: An int32 tensor of shape [1]. The FFT length.
 output: A float32 tensor of the same rank as `input`. The inner-most
   dimension of `input` is replaced with the `fft_length` samples of its inverse
-  1D Fourier Transform.
+  1D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.irfft
@@ -231,7 +247,9 @@ REGISTER_OP("RFFT2D")
     .Output("output: complex64")
     .SetShapeFn([](InferenceContext* c) { return RFFTShape(c, true, 2); })
     .Doc(R"doc(
-Compute the 2-dimensional discrete Fourier Transform of a real-valued signal
+2D real-valued fast Fourier transform.
+
+Computes the 2-dimensional discrete Fourier transform of a real-valued signal
 over the inner-most 2 dimensions of `input`.
 
 Since the DFT of a real signal is Hermitian-symmetric, `RFFT2D` only returns the
@@ -242,7 +260,7 @@ positive-frequency terms.
 input: A float32 tensor.
 fft_length: An int32 tensor of shape [2]. The FFT length for each dimension.
 output: A complex64 tensor of the same rank as `input`. The inner-most 2
-  dimensions of `input` are replaced with their 2D Fourier Transform. The
+  dimensions of `input` are replaced with their 2D Fourier transform. The
   inner-most dimension contains `fft_length / 2 + 1` unique frequency
   components.
 
@@ -257,7 +275,9 @@ REGISTER_OP("IRFFT2D")
     .Output("output: float")
     .SetShapeFn([](InferenceContext* c) { return RFFTShape(c, false, 2); })
     .Doc(R"doc(
-Compute the inverse 2-dimensional discrete Fourier Transform of a real-valued
+Inverse 2D real-valued fast Fourier transform.
+
+Computes the inverse 2-dimensional discrete Fourier transform of a real-valued
 signal over the inner-most 2 dimensions of `input`.
 
 The inner-most 2 dimensions of `input` are assumed to be the result of `RFFT2D`:
@@ -271,7 +291,7 @@ input: A complex64 tensor.
 fft_length: An int32 tensor of shape [2]. The FFT length for each dimension.
 output: A float32 tensor of the same rank as `input`. The inner-most 2
   dimensions of `input` are replaced with the `fft_length` samples of their
-  inverse 2D Fourier Transform.
+  inverse 2D Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.fft.irfft2
@@ -284,7 +304,9 @@ REGISTER_OP("RFFT3D")
     .Output("output: complex64")
     .SetShapeFn([](InferenceContext* c) { return RFFTShape(c, true, 3); })
     .Doc(R"doc(
-Compute the 3-dimensional discrete Fourier Transform of a real-valued signal
+3D real-valued fast Fourier transform.
+
+Computes the 3-dimensional discrete Fourier transform of a real-valued signal
 over the inner-most 3 dimensions of `input`.
 
 Since the DFT of a real signal is Hermitian-symmetric, `RFFT3D` only returns the
@@ -295,7 +317,7 @@ positive-frequency terms.
 input: A float32 tensor.
 fft_length: An int32 tensor of shape [3]. The FFT length for each dimension.
 output: A complex64 tensor of the same rank as `input`. The inner-most 3
-  dimensions of `input` are replaced with the their 3D Fourier Transform. The
+  dimensions of `input` are replaced with the their 3D Fourier transform. The
   inner-most dimension contains `fft_length / 2 + 1` unique frequency
   components.
 
@@ -310,7 +332,9 @@ REGISTER_OP("IRFFT3D")
     .Output("output: float")
     .SetShapeFn([](InferenceContext* c) { return RFFTShape(c, false, 3); })
     .Doc(R"doc(
-Compute the inverse 3-dimensional discrete Fourier Transform of a real-valued
+Inverse 3D real-valued fast Fourier transform.
+
+Computes the inverse 3-dimensional discrete Fourier transform of a real-valued
 signal over the inner-most 3 dimensions of `input`.
 
 The inner-most 3 dimensions of `input` are assumed to be the result of `RFFT3D`:
@@ -324,7 +348,7 @@ input: A complex64 tensor.
 fft_length: An int32 tensor of shape [3]. The FFT length for each dimension.
 output: A float32 tensor of the same rank as `input`. The inner-most 3
   dimensions of `input` are replaced with the `fft_length` samples of their
-  inverse 3D real Fourier Transform.
+  inverse 3D real Fourier transform.
 
 @compatibility(numpy)
 Equivalent to np.irfftn with 3 dimensions.
-- 
GitLab


From c06042dfee9280db1c940352088adc320d5e6722 Mon Sep 17 00:00:00 2001
From: Arron Cao <csarron@users.noreply.github.com>
Date: Mon, 3 Apr 2017 16:21:15 -0400
Subject: [PATCH 0076/1563] Update lstm_ops.cc (#8915)

fix o in doc
---
 tensorflow/contrib/rnn/ops/lstm_ops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/rnn/ops/lstm_ops.cc b/tensorflow/contrib/rnn/ops/lstm_ops.cc
index 2de40825c9..699cc6c88a 100644
--- a/tensorflow/contrib/rnn/ops/lstm_ops.cc
+++ b/tensorflow/contrib/rnn/ops/lstm_ops.cc
@@ -78,7 +78,7 @@ ci = tanh(ci)
 cs = ci .* i + cs_prev .* f
 cs = clip(cs, cell_clip)
 
-o = sigmoid(cs * wco + f)
+o = sigmoid(cs * wco + o)
 co = tanh(cs)
 h = co .* o
 ```
-- 
GitLab


From 7c0e6afccaeeee5bd4c9e3b52c36aa1d8e4424a1 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoitsteiner@users.noreply.github.com>
Date: Mon, 3 Apr 2017 13:23:10 -0700
Subject: [PATCH 0077/1563] Enabled the generation of big kernels by libxsmm
 (#8929)

---
 third_party/libxsmm.BUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/third_party/libxsmm.BUILD b/third_party/libxsmm.BUILD
index 32f48d9fd2..d61b7d0277 100644
--- a/third_party/libxsmm.BUILD
+++ b/third_party/libxsmm.BUILD
@@ -12,7 +12,7 @@ libxsmm_interface_arguments = "0 1"
 
 # Arguments to ./scripts/libxsmm_config.py, see that file for detailed description.
 #  ilp64: 0 (no)
-#  big: 0 (no)
+#  big: 1 (yes)
 #  offload: 0 (no)
 #  alignment [b]
 #  prefetch: -1 (auto)
@@ -22,7 +22,7 @@ libxsmm_interface_arguments = "0 1"
 #  flags: 0 (none)
 #  alpha = 1
 #  beta = 1
-libxsmm_config_arguments = "0 0 0 64 -1 0 1 1 0 1 1"
+libxsmm_config_arguments = "0 1 0 64 -1 0 1 1 0 1 1"
 
 # Arguments to ./scripts/libxsmm_dispatch.py, see that file for detailed description.
 #  (dummy argument)
-- 
GitLab


From 89082724cf5808e151399a067bc2d7fe2ade23fd Mon Sep 17 00:00:00 2001
From: 4F2E4A2E <4F2E4A2E@users.noreply.github.com>
Date: Mon, 3 Apr 2017 22:23:48 +0200
Subject: [PATCH 0078/1563] Update get_started.md (#8924)

Correcting output.
---
 tensorflow/docs_src/get_started/get_started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 0047127530..04ac3f5848 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -110,7 +110,7 @@ print("sess.run(node3): ",sess.run(node3))
 ```
 The last two print statements produce
 ```
-node3:  Tensor("Add_2:0", shape=(), dtype=float32)
+node3:  Tensor("Add:0", shape=(), dtype=float32)
 sess.run(node3):  7.0
 ```
 
-- 
GitLab


From 185cb833448e9a72445b738615f946a027d622b8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 12:02:46 -0800
Subject: [PATCH 0079/1563] Update ops-related pbtxt files. Change: 152046621

---
 tensorflow/core/ops/ops.pbtxt | 72 +++++++++++++++++------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index a6b59c23b6..8cea2b239e 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -7162,11 +7162,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same shape as `input`. The inner-most\n  dimension of `input` is replaced with its 1D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.fft\n@end_compatibility"
+    description: "A complex64 tensor of the same shape as `input`. The inner-most\n  dimension of `input` is replaced with its 1D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.fft\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the 1-dimensional discrete Fourier Transform over the inner-most"
-  description: "dimension of `input`."
+  summary: "Fast Fourier transform."
+  description: "Computes the 1-dimensional discrete Fourier transform over the inner-most\ndimension of `input`."
 }
 op {
   name: "FFT2D"
@@ -7177,11 +7177,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same shape as `input`. The inner-most 2\n  dimensions of `input` are replaced with their 2D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.fft2\n@end_compatibility"
+    description: "A complex64 tensor of the same shape as `input`. The inner-most 2\n  dimensions of `input` are replaced with their 2D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.fft2\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the 2-dimensional discrete Fourier Transform over the inner-most"
-  description: "2 dimensions of `input`."
+  summary: "2D fast Fourier transform."
+  description: "Computes the 2-dimensional discrete Fourier transform over the inner-most\n2 dimensions of `input`."
 }
 op {
   name: "FFT3D"
@@ -7192,11 +7192,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same shape as `input`. The inner-most 3\n  dimensions of `input` are replaced with their 3D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.fftn with 3 dimensions.\n@end_compatibility"
+    description: "A complex64 tensor of the same shape as `input`. The inner-most 3\n  dimensions of `input` are replaced with their 3D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.fftn with 3 dimensions.\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the 3-dimensional discrete Fourier Transform over the inner-most 3"
-  description: "dimensions of `input`."
+  summary: "3D fast Fourier transform."
+  description: "Computes the 3-dimensional discrete Fourier transform over the inner-most 3\ndimensions of `input`."
 }
 op {
   name: "FIFOQueue"
@@ -8749,11 +8749,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same shape as `input`. The inner-most\n  dimension of `input` is replaced with its inverse 1D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.ifft\n@end_compatibility"
+    description: "A complex64 tensor of the same shape as `input`. The inner-most\n  dimension of `input` is replaced with its inverse 1D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.ifft\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the inverse 1-dimensional discrete Fourier Transform over the inner-most"
-  description: "dimension of `input`."
+  summary: "Inverse fast Fourier transform."
+  description: "Computes the inverse 1-dimensional discrete Fourier transform over the\ninner-most dimension of `input`."
 }
 op {
   name: "IFFT2D"
@@ -8764,11 +8764,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same shape as `input`. The inner-most 2\n  dimensions of `input` are replaced with their inverse 2D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.ifft2\n@end_compatibility"
+    description: "A complex64 tensor of the same shape as `input`. The inner-most 2\n  dimensions of `input` are replaced with their inverse 2D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.ifft2\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the inverse 2-dimensional discrete Fourier Transform over the inner-most"
-  description: "2 dimensions of `input`."
+  summary: "Inverse 2D fast Fourier transform."
+  description: "Computes the inverse 2-dimensional discrete Fourier transform over the\ninner-most 2 dimensions of `input`."
 }
 op {
   name: "IFFT3D"
@@ -8779,11 +8779,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same shape as `input`. The inner-most 3\n  dimensions of `input` are replaced with their inverse 3D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.ifftn with 3 dimensions.\n@end_compatibility"
+    description: "A complex64 tensor of the same shape as `input`. The inner-most 3\n  dimensions of `input` are replaced with their inverse 3D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.ifftn with 3 dimensions.\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the inverse 3-dimensional discrete Fourier Transform over the inner-most"
-  description: "3 dimensions of `input`."
+  summary: "Inverse 3D fast Fourier transform."
+  description: "Computes the inverse 3-dimensional discrete Fourier transform over the\ninner-most 3 dimensions of `input`."
 }
 op {
   name: "IRFFT"
@@ -8799,11 +8799,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A float32 tensor of the same rank as `input`. The inner-most\n  dimension of `input` is replaced with the `fft_length` samples of its inverse\n  1D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.irfft\n@end_compatibility"
+    description: "A float32 tensor of the same rank as `input`. The inner-most\n  dimension of `input` is replaced with the `fft_length` samples of its inverse\n  1D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.irfft\n@end_compatibility"
     type: DT_FLOAT
   }
-  summary: "Compute the inverse 1-dimensional discrete Fourier Transform of a real-valued"
-  description: "signal over the inner-most dimension of `input`.\n\nThe inner-most dimension of `input` is assumed to be the result of `RFFT`: the\n`fft_length / 2 + 1` unique components of the DFT of a real-valued signal. If\n`fft_length` is not provided, it is computed from the size of the inner-most\ndimension of `input` (`fft_length = 2 * (inner - 1)`). If the FFT length used to\ncompute `input` is odd, it should be provided since it cannot be inferred\nproperly."
+  summary: "Inverse real-valued fast Fourier transform."
+  description: "Computes the inverse 1-dimensional discrete Fourier transform of a real-valued\nsignal over the inner-most dimension of `input`.\n\nThe inner-most dimension of `input` is assumed to be the result of `RFFT`: the\n`fft_length / 2 + 1` unique components of the DFT of a real-valued signal. If\n`fft_length` is not provided, it is computed from the size of the inner-most\ndimension of `input` (`fft_length = 2 * (inner - 1)`). If the FFT length used to\ncompute `input` is odd, it should be provided since it cannot be inferred\nproperly."
 }
 op {
   name: "IRFFT2D"
@@ -8819,11 +8819,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A float32 tensor of the same rank as `input`. The inner-most 2\n  dimensions of `input` are replaced with the `fft_length` samples of their\n  inverse 2D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.irfft2\n@end_compatibility"
+    description: "A float32 tensor of the same rank as `input`. The inner-most 2\n  dimensions of `input` are replaced with the `fft_length` samples of their\n  inverse 2D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.irfft2\n@end_compatibility"
     type: DT_FLOAT
   }
-  summary: "Compute the inverse 2-dimensional discrete Fourier Transform of a real-valued"
-  description: "signal over the inner-most 2 dimensions of `input`.\n\nThe inner-most 2 dimensions of `input` are assumed to be the result of `RFFT2D`:\nThe inner-most dimension contains the `fft_length / 2 + 1` unique components of\nthe DFT of a real-valued signal. If `fft_length` is not provided, it is computed\nfrom the size of the inner-most 2 dimensions of `input`. If the FFT length used\nto compute `input` is odd, it should be provided since it cannot be inferred\nproperly."
+  summary: "Inverse 2D real-valued fast Fourier transform."
+  description: "Computes the inverse 2-dimensional discrete Fourier transform of a real-valued\nsignal over the inner-most 2 dimensions of `input`.\n\nThe inner-most 2 dimensions of `input` are assumed to be the result of `RFFT2D`:\nThe inner-most dimension contains the `fft_length / 2 + 1` unique components of\nthe DFT of a real-valued signal. If `fft_length` is not provided, it is computed\nfrom the size of the inner-most 2 dimensions of `input`. If the FFT length used\nto compute `input` is odd, it should be provided since it cannot be inferred\nproperly."
 }
 op {
   name: "IRFFT3D"
@@ -8839,11 +8839,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A float32 tensor of the same rank as `input`. The inner-most 3\n  dimensions of `input` are replaced with the `fft_length` samples of their\n  inverse 3D real Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.irfftn with 3 dimensions.\n@end_compatibility"
+    description: "A float32 tensor of the same rank as `input`. The inner-most 3\n  dimensions of `input` are replaced with the `fft_length` samples of their\n  inverse 3D real Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.irfftn with 3 dimensions.\n@end_compatibility"
     type: DT_FLOAT
   }
-  summary: "Compute the inverse 3-dimensional discrete Fourier Transform of a real-valued"
-  description: "signal over the inner-most 3 dimensions of `input`.\n\nThe inner-most 3 dimensions of `input` are assumed to be the result of `RFFT3D`:\nThe inner-most dimension contains the `fft_length / 2 + 1` unique components of\nthe DFT of a real-valued signal. If `fft_length` is not provided, it is computed\nfrom the size of the inner-most 3 dimensions of `input`. If the FFT length used\nto compute `input` is odd, it should be provided since it cannot be inferred\nproperly."
+  summary: "Inverse 3D real-valued fast Fourier transform."
+  description: "Computes the inverse 3-dimensional discrete Fourier transform of a real-valued\nsignal over the inner-most 3 dimensions of `input`.\n\nThe inner-most 3 dimensions of `input` are assumed to be the result of `RFFT3D`:\nThe inner-most dimension contains the `fft_length / 2 + 1` unique components of\nthe DFT of a real-valued signal. If `fft_length` is not provided, it is computed\nfrom the size of the inner-most 3 dimensions of `input`. If the FFT length used\nto compute `input` is odd, it should be provided since it cannot be inferred\nproperly."
 }
 op {
   name: "Identity"
@@ -14666,11 +14666,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same rank as `input`. The inner-most\n  dimension of `input` is replaced with the `fft_length / 2 + 1` unique\n  frequency components of its 1D Fourier Transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.rfft\n@end_compatibility"
+    description: "A complex64 tensor of the same rank as `input`. The inner-most\n  dimension of `input` is replaced with the `fft_length / 2 + 1` unique\n  frequency components of its 1D Fourier transform.\n\n@compatibility(numpy)\nEquivalent to np.fft.rfft\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the 1-dimensional discrete Fourier Transform of a real-valued signal"
-  description: "over the inner-most dimension of `input`.\n\nSince the DFT of a real signal is Hermitian-symmetric, `RFFT` only returns the\n`fft_length / 2 + 1` unique components of the FFT: the zero-frequency term,\nfollowed by the `fft_length / 2` positive-frequency terms."
+  summary: "Real-valued fast Fourier transform."
+  description: "Computes the 1-dimensional discrete Fourier transform of a real-valued signal\nover the inner-most dimension of `input`.\n\nSince the DFT of a real signal is Hermitian-symmetric, `RFFT` only returns the\n`fft_length / 2 + 1` unique components of the FFT: the zero-frequency term,\nfollowed by the `fft_length / 2` positive-frequency terms."
 }
 op {
   name: "RFFT2D"
@@ -14686,11 +14686,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same rank as `input`. The inner-most 2\n  dimensions of `input` are replaced with their 2D Fourier Transform. The\n  inner-most dimension contains `fft_length / 2 + 1` unique frequency\n  components.\n\n@compatibility(numpy)\nEquivalent to np.fft.rfft2\n@end_compatibility"
+    description: "A complex64 tensor of the same rank as `input`. The inner-most 2\n  dimensions of `input` are replaced with their 2D Fourier transform. The\n  inner-most dimension contains `fft_length / 2 + 1` unique frequency\n  components.\n\n@compatibility(numpy)\nEquivalent to np.fft.rfft2\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the 2-dimensional discrete Fourier Transform of a real-valued signal"
-  description: "over the inner-most 2 dimensions of `input`.\n\nSince the DFT of a real signal is Hermitian-symmetric, `RFFT2D` only returns the\n`fft_length / 2 + 1` unique components of the FFT for the inner-most dimension\nof `output`: the zero-frequency term, followed by the `fft_length / 2`\npositive-frequency terms."
+  summary: "2D real-valued fast Fourier transform."
+  description: "Computes the 2-dimensional discrete Fourier transform of a real-valued signal\nover the inner-most 2 dimensions of `input`.\n\nSince the DFT of a real signal is Hermitian-symmetric, `RFFT2D` only returns the\n`fft_length / 2 + 1` unique components of the FFT for the inner-most dimension\nof `output`: the zero-frequency term, followed by the `fft_length / 2`\npositive-frequency terms."
 }
 op {
   name: "RFFT3D"
@@ -14706,11 +14706,11 @@ op {
   }
   output_arg {
     name: "output"
-    description: "A complex64 tensor of the same rank as `input`. The inner-most 3\n  dimensions of `input` are replaced with the their 3D Fourier Transform. The\n  inner-most dimension contains `fft_length / 2 + 1` unique frequency\n  components.\n\n@compatibility(numpy)\nEquivalent to np.fft.rfftn with 3 dimensions.\n@end_compatibility"
+    description: "A complex64 tensor of the same rank as `input`. The inner-most 3\n  dimensions of `input` are replaced with the their 3D Fourier transform. The\n  inner-most dimension contains `fft_length / 2 + 1` unique frequency\n  components.\n\n@compatibility(numpy)\nEquivalent to np.fft.rfftn with 3 dimensions.\n@end_compatibility"
     type: DT_COMPLEX64
   }
-  summary: "Compute the 3-dimensional discrete Fourier Transform of a real-valued signal"
-  description: "over the inner-most 3 dimensions of `input`.\n\nSince the DFT of a real signal is Hermitian-symmetric, `RFFT3D` only returns the\n`fft_length / 2 + 1` unique components of the FFT for the inner-most dimension\nof `output`: the zero-frequency term, followed by the `fft_length / 2`\npositive-frequency terms."
+  summary: "3D real-valued fast Fourier transform."
+  description: "Computes the 3-dimensional discrete Fourier transform of a real-valued signal\nover the inner-most 3 dimensions of `input`.\n\nSince the DFT of a real signal is Hermitian-symmetric, `RFFT3D` only returns the\n`fft_length / 2 + 1` unique components of the FFT for the inner-most dimension\nof `output`: the zero-frequency term, followed by the `fft_length / 2`\npositive-frequency terms."
 }
 op {
   name: "RGBToHSV"
-- 
GitLab


From e8dc96621b926734c5839e801a5b609b39aa2e97 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 12:06:41 -0800
Subject: [PATCH 0080/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 152047135

---
 tensorflow/go/op/wrappers.go | 66 +++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index de014abafa..bbf687e322 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -9075,15 +9075,16 @@ func Rint(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
-// Compute the 1-dimensional discrete Fourier Transform over the inner-most
+// Fast Fourier transform.
 //
+// Computes the 1-dimensional discrete Fourier transform over the inner-most
 // dimension of `input`.
 //
 // Arguments:
 //	input: A complex64 tensor.
 //
 // Returns A complex64 tensor of the same shape as `input`. The inner-most
-//   dimension of `input` is replaced with its 1D Fourier Transform.
+//   dimension of `input` is replaced with its 1D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.fft
@@ -9714,15 +9715,16 @@ func ResourceApplyCenteredRMSProp(scope *Scope, var_ tf.Output, mg tf.Output, ms
 	return scope.AddOperation(opspec)
 }
 
-// Compute the inverse 3-dimensional discrete Fourier Transform over the inner-most
+// Inverse 3D fast Fourier transform.
 //
-// 3 dimensions of `input`.
+// Computes the inverse 3-dimensional discrete Fourier transform over the
+// inner-most 3 dimensions of `input`.
 //
 // Arguments:
 //	input: A complex64 tensor.
 //
 // Returns A complex64 tensor of the same shape as `input`. The inner-most 3
-//   dimensions of `input` are replaced with their inverse 3D Fourier Transform.
+//   dimensions of `input` are replaced with their inverse 3D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.ifftn with 3 dimensions.
@@ -9991,15 +9993,16 @@ func ResourceApplyAdam(scope *Scope, var_ tf.Output, m tf.Output, v tf.Output, b
 	return scope.AddOperation(opspec)
 }
 
-// Compute the 3-dimensional discrete Fourier Transform over the inner-most 3
+// 3D fast Fourier transform.
 //
+// Computes the 3-dimensional discrete Fourier transform over the inner-most 3
 // dimensions of `input`.
 //
 // Arguments:
 //	input: A complex64 tensor.
 //
 // Returns A complex64 tensor of the same shape as `input`. The inner-most 3
-//   dimensions of `input` are replaced with their 3D Fourier Transform.
+//   dimensions of `input` are replaced with their 3D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.fftn with 3 dimensions.
@@ -10184,15 +10187,16 @@ func ResourceApplyProximalGradientDescent(scope *Scope, var_ tf.Output, alpha tf
 	return scope.AddOperation(opspec)
 }
 
-// Compute the 2-dimensional discrete Fourier Transform over the inner-most
+// 2D fast Fourier transform.
 //
+// Computes the 2-dimensional discrete Fourier transform over the inner-most
 // 2 dimensions of `input`.
 //
 // Arguments:
 //	input: A complex64 tensor.
 //
 // Returns A complex64 tensor of the same shape as `input`. The inner-most 2
-//   dimensions of `input` are replaced with their 2D Fourier Transform.
+//   dimensions of `input` are replaced with their 2D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.fft2
@@ -10244,15 +10248,16 @@ func Fill(scope *Scope, dims tf.Output, value tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
-// Compute the inverse 2-dimensional discrete Fourier Transform over the inner-most
+// Inverse 2D fast Fourier transform.
 //
-// 2 dimensions of `input`.
+// Computes the inverse 2-dimensional discrete Fourier transform over the
+// inner-most 2 dimensions of `input`.
 //
 // Arguments:
 //	input: A complex64 tensor.
 //
 // Returns A complex64 tensor of the same shape as `input`. The inner-most 2
-//   dimensions of `input` are replaced with their inverse 2D Fourier Transform.
+//   dimensions of `input` are replaced with their inverse 2D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.ifft2
@@ -11256,8 +11261,9 @@ func Cross(scope *Scope, a tf.Output, b tf.Output) (product tf.Output) {
 	return op.Output(0)
 }
 
-// Compute the inverse 2-dimensional discrete Fourier Transform of a real-valued
+// Inverse 2D real-valued fast Fourier transform.
 //
+// Computes the inverse 2-dimensional discrete Fourier transform of a real-valued
 // signal over the inner-most 2 dimensions of `input`.
 //
 // The inner-most 2 dimensions of `input` are assumed to be the result of `RFFT2D`:
@@ -11273,7 +11279,7 @@ func Cross(scope *Scope, a tf.Output, b tf.Output) (product tf.Output) {
 //
 // Returns A float32 tensor of the same rank as `input`. The inner-most 2
 //   dimensions of `input` are replaced with the `fft_length` samples of their
-//   inverse 2D Fourier Transform.
+//   inverse 2D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.irfft2
@@ -14173,15 +14179,16 @@ func Zeta(scope *Scope, x tf.Output, q tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
-// Compute the inverse 1-dimensional discrete Fourier Transform over the inner-most
+// Inverse fast Fourier transform.
 //
-// dimension of `input`.
+// Computes the inverse 1-dimensional discrete Fourier transform over the
+// inner-most dimension of `input`.
 //
 // Arguments:
 //	input: A complex64 tensor.
 //
 // Returns A complex64 tensor of the same shape as `input`. The inner-most
-//   dimension of `input` is replaced with its inverse 1D Fourier Transform.
+//   dimension of `input` is replaced with its inverse 1D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.ifft
@@ -14200,8 +14207,9 @@ func IFFT(scope *Scope, input tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
-// Compute the inverse 1-dimensional discrete Fourier Transform of a real-valued
+// Inverse real-valued fast Fourier transform.
 //
+// Computes the inverse 1-dimensional discrete Fourier transform of a real-valued
 // signal over the inner-most dimension of `input`.
 //
 // The inner-most dimension of `input` is assumed to be the result of `RFFT`: the
@@ -14217,7 +14225,7 @@ func IFFT(scope *Scope, input tf.Output) (output tf.Output) {
 //
 // Returns A float32 tensor of the same rank as `input`. The inner-most
 //   dimension of `input` is replaced with the `fft_length` samples of its inverse
-//   1D Fourier Transform.
+//   1D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.irfft
@@ -14361,8 +14369,9 @@ func AssignAddVariableOp(scope *Scope, resource tf.Output, value tf.Output) (o *
 	return scope.AddOperation(opspec)
 }
 
-// Compute the 1-dimensional discrete Fourier Transform of a real-valued signal
+// Real-valued fast Fourier transform.
 //
+// Computes the 1-dimensional discrete Fourier transform of a real-valued signal
 // over the inner-most dimension of `input`.
 //
 // Since the DFT of a real signal is Hermitian-symmetric, `RFFT` only returns the
@@ -14375,7 +14384,7 @@ func AssignAddVariableOp(scope *Scope, resource tf.Output, value tf.Output) (o *
 //
 // Returns A complex64 tensor of the same rank as `input`. The inner-most
 //   dimension of `input` is replaced with the `fft_length / 2 + 1` unique
-//   frequency components of its 1D Fourier Transform.
+//   frequency components of its 1D Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.fft.rfft
@@ -14951,8 +14960,9 @@ func StringSplit(scope *Scope, input tf.Output, delimiter tf.Output) (indices tf
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
-// Compute the inverse 3-dimensional discrete Fourier Transform of a real-valued
+// Inverse 3D real-valued fast Fourier transform.
 //
+// Computes the inverse 3-dimensional discrete Fourier transform of a real-valued
 // signal over the inner-most 3 dimensions of `input`.
 //
 // The inner-most 3 dimensions of `input` are assumed to be the result of `RFFT3D`:
@@ -14968,7 +14978,7 @@ func StringSplit(scope *Scope, input tf.Output, delimiter tf.Output) (indices tf
 //
 // Returns A float32 tensor of the same rank as `input`. The inner-most 3
 //   dimensions of `input` are replaced with the `fft_length` samples of their
-//   inverse 3D real Fourier Transform.
+//   inverse 3D real Fourier transform.
 //
 // @compatibility(numpy)
 // Equivalent to np.irfftn with 3 dimensions.
@@ -16420,8 +16430,9 @@ func Erfc(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
-// Compute the 2-dimensional discrete Fourier Transform of a real-valued signal
+// 2D real-valued fast Fourier transform.
 //
+// Computes the 2-dimensional discrete Fourier transform of a real-valued signal
 // over the inner-most 2 dimensions of `input`.
 //
 // Since the DFT of a real signal is Hermitian-symmetric, `RFFT2D` only returns the
@@ -16434,7 +16445,7 @@ func Erfc(scope *Scope, x tf.Output) (y tf.Output) {
 //	fft_length: An int32 tensor of shape [2]. The FFT length for each dimension.
 //
 // Returns A complex64 tensor of the same rank as `input`. The inner-most 2
-//   dimensions of `input` are replaced with their 2D Fourier Transform. The
+//   dimensions of `input` are replaced with their 2D Fourier transform. The
 //   inner-most dimension contains `fft_length / 2 + 1` unique frequency
 //   components.
 //
@@ -20064,8 +20075,9 @@ func TensorArrayGatherV3(scope *Scope, handle tf.Output, indices tf.Output, flow
 	return op.Output(0)
 }
 
-// Compute the 3-dimensional discrete Fourier Transform of a real-valued signal
+// 3D real-valued fast Fourier transform.
 //
+// Computes the 3-dimensional discrete Fourier transform of a real-valued signal
 // over the inner-most 3 dimensions of `input`.
 //
 // Since the DFT of a real signal is Hermitian-symmetric, `RFFT3D` only returns the
@@ -20078,7 +20090,7 @@ func TensorArrayGatherV3(scope *Scope, handle tf.Output, indices tf.Output, flow
 //	fft_length: An int32 tensor of shape [3]. The FFT length for each dimension.
 //
 // Returns A complex64 tensor of the same rank as `input`. The inner-most 3
-//   dimensions of `input` are replaced with the their 3D Fourier Transform. The
+//   dimensions of `input` are replaced with the their 3D Fourier transform. The
 //   inner-most dimension contains `fft_length / 2 + 1` unique frequency
 //   components.
 //
-- 
GitLab


From c1ab70cc1fe31f84376a9e298bcec2680661f643 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Mon, 3 Apr 2017 12:18:40 -0800
Subject: [PATCH 0081/1563] Make one_like python op call ones_like kernel.

Same as how zeros_like works.
Change: 152048597
---
 tensorflow/core/ops/array_ops.cc     |  4 +++-
 tensorflow/python/ops/array_ops.py   | 12 ++++++------
 tensorflow/python/ops/hidden_ops.txt |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 6930af48a7..1362eba85c 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -612,7 +612,9 @@ y: a tensor of the same shape and type as x but filled with zeros.
 REGISTER_OP("OnesLike")
     .Input("x: T")
     .Output("y: T")
-    .Attr("T: {float, double, int32, int64, complex64, complex128}")
+    .Attr(
+        "T: {uint8, half, float, double, int8, int16, int32, int64, complex64, "
+        "complex128}")
     .SetShapeFn(shape_inference::UnchangedShape)
     .Doc(R"doc(
 Returns a tensor of ones with the same shape and type as x.
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 60057b9ab1..3122f8be2d 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1427,12 +1427,12 @@ def ones_like(tensor, dtype=None, name=None, optimize=True):
   """
   with ops.name_scope(name, "ones_like", [tensor]) as name:
     tensor = ops.convert_to_tensor(tensor, name="tensor")
-    ones_shape = shape_internal(tensor, optimize=optimize)
-    if dtype is None:
-      dtype = tensor.dtype
-    ret = ones(ones_shape, dtype=dtype, name=name)
-    ret.set_shape(tensor.get_shape())
-    return ret
+    if dtype is not None and tensor.dtype != dtype:
+      ret = ones(shape_internal(tensor, optimize=optimize), dtype, name=name)
+      ret.set_shape(tensor.get_shape())
+      return ret
+    else:
+      return gen_array_ops._ones_like(tensor, name=name)
 
 
 def ones(shape, dtype=dtypes.float32, name=None):
diff --git a/tensorflow/python/ops/hidden_ops.txt b/tensorflow/python/ops/hidden_ops.txt
index fbfd7bb7d6..ee8f359258 100644
--- a/tensorflow/python/ops/hidden_ops.txt
+++ b/tensorflow/python/ops/hidden_ops.txt
@@ -12,6 +12,7 @@ ListDiff
 MirrorPad
 MirrorPadGrad
 OneHot
+OnesLike
 Pack
 Pad
 ParallelConcat
-- 
GitLab


From 40c26b991a0babd5171b0eb562435ef7d854d2d4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 12:19:16 -0800
Subject: [PATCH 0082/1563] Adding Python3.6 support to ci_param_build script.
 Change: 152048672

---
 tensorflow/tools/ci_build/ci_parameterized_build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/ci_parameterized_build.sh b/tensorflow/tools/ci_build/ci_parameterized_build.sh
index cb204bc25f..5d262aa91a 100755
--- a/tensorflow/tools/ci_build/ci_parameterized_build.sh
+++ b/tensorflow/tools/ci_build/ci_parameterized_build.sh
@@ -429,7 +429,8 @@ if [[ ${TF_BUILD_PYTHON_VERSION} == "python2" ]]; then
   :
 elif [[ ${TF_BUILD_PYTHON_VERSION} == "python3" || \
         ${TF_BUILD_PYTHON_VERSION} == "python3.4" || \
-        ${TF_BUILD_PYTHON_VERSION} == "python3.5" ]]; then
+        ${TF_BUILD_PYTHON_VERSION} == "python3.5" || \
+        ${TF_BUILD_PYTHON_VERSION} == "python3.6" ]]; then
   # Supply proper environment variable to select Python 3
   if [[ "${DO_DOCKER}" == "1" ]]; then
     EXTRA_PARAMS="${EXTRA_PARAMS} -e CI_BUILD_PYTHON=${TF_BUILD_PYTHON_VERSION}"
-- 
GitLab


From 242ecdee4f4214b2051fba95b044f269c69527c0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 12:47:44 -0800
Subject: [PATCH 0083/1563] Update ops-related pbtxt files. Change: 152052325

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 29 +++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |  4 +++
 2 files changed, 33 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 2af4e8692b..562bbe41d3 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -11005,6 +11005,35 @@ op {
     }
   }
 }
+op {
+  name: "OnesLike"
+  input_arg {
+    name: "x"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "y"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_UINT8
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT8
+        type: DT_INT16
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+      }
+    }
+  }
+}
 op {
   name: "Pack"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 8cea2b239e..fab9ad8ba0 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -11892,8 +11892,12 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_UINT8
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
+        type: DT_INT8
+        type: DT_INT16
         type: DT_INT32
         type: DT_INT64
         type: DT_COMPLEX64
-- 
GitLab


From 51296e5b324d7ae97c6f90b75ce85283b24202e3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 12:58:57 -0800
Subject: [PATCH 0084/1563] Expand contrib build to more than just python.
 Change: 152053815

---
 tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
index acde10f124..45747ba2d9 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
@@ -32,7 +32,7 @@ export PYTHON_BIN_PATH=`which python3`
 yes "" | ./configure
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-gpu,-benchmark-test --test_lang_filters=py -k \
+bazel test --test_tag_filters=-gpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only \
     --test_output=errors -- \
     //tensorflow/contrib/...
-- 
GitLab


From 0864bede9c68ae6b061adf738c433e65012402a2 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Mon, 3 Apr 2017 13:02:50 -0800
Subject: [PATCH 0085/1563] Simplified the testImportIntoNamescope test Change:
 152054364

---
 tensorflow/python/training/saver_test.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py
index c0f0b309c1..3172a1d5ba 100644
--- a/tensorflow/python/training/saver_test.py
+++ b/tensorflow/python/training/saver_test.py
@@ -1785,11 +1785,9 @@ class MetaGraphTest(test.TestCase):
     # Test that we can import a meta graph into a namescope.
     test_dir = self._get_test_dir("import_into_namescope")
     filename = os.path.join(test_dir, "ckpt")
-    image = array_ops.placeholder(dtypes.float32, [None, 784])
-    label = array_ops.placeholder(dtypes.float32, [None, 10])
+    image = array_ops.placeholder(dtypes.float32, [None, 784], name="image")
+    label = array_ops.placeholder(dtypes.float32, [None, 10], name="label")
     with session.Session() as sess:
-      label = array_ops.identity(label, name="label")
-      image = array_ops.identity(image, name="image")
       weights = variables.Variable(
           random_ops.random_uniform([784, 10]), name="weights")
       bias = variables.Variable(array_ops.zeros([10]), name="bias")
-- 
GitLab


From e18c7a5332b97ddcaad7f5485c46ad8dc8fcd274 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Mon, 3 Apr 2017 13:39:46 -0800
Subject: [PATCH 0086/1563] Fix a bunch of compiler warnings. Change: 152059475

---
 tensorflow/core/distributed_runtime/master.cc |  2 +-
 .../distributed_runtime/master_session.cc     | 19 +++----------------
 .../rpc/grpc_worker_service_impl.cc           |  3 +++
 tensorflow/core/graph/quantize_training.cc    |  4 ++--
 .../grappler/optimizers/layout_optimizer.cc   |  6 +++---
 .../hexagon/hexagon_rewriter_transform.cc     |  2 +-
 tensorflow/core/kernels/image_resizer_state.h |  2 +-
 tensorflow/core/kernels/range_sampler.cc      |  2 +-
 .../remote_fused_graph_execute_utils.cc       |  4 ++--
 tensorflow/core/kernels/resize_bicubic_op.cc  |  8 ++++----
 tensorflow/core/kernels/tensor_array_ops.cc   |  4 ++--
 tensorflow/core/lib/wav/wav_io.cc             |  2 +-
 tensorflow/core/util/tensor_format.h          |  2 +-
 tensorflow/python/lib/core/py_func.cc         |  2 +-
 14 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/master.cc b/tensorflow/core/distributed_runtime/master.cc
index facbfbb264..583776b7e3 100644
--- a/tensorflow/core/distributed_runtime/master.cc
+++ b/tensorflow/core/distributed_runtime/master.cc
@@ -198,7 +198,7 @@ class DeviceFinder {
     while (num_pending_ != 0) {
       pending_zero_.wait_for(l, std::chrono::milliseconds(kLoggingPeriodMs));
       if (num_pending_ != 0) {
-        for (int i = 0; i < targets_.size(); ++i) {
+        for (int i = 0; static_cast<size_t>(i) < targets_.size(); ++i) {
           if (!seen_targets_[i]) {
             LOG(INFO)
                 << "CreateSession still waiting for response from worker: "
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 870df353cb..bd848849b5 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -440,19 +440,6 @@ Status MasterSession::ReffedClientGraph::DoRegisterPartitions(
   return s;
 }
 
-static bool CopyIfNeeded(TensorProto* in, TensorProto* out) {
-  if (in->tensor_content().empty()) {
-    // If the tensor is not encoded in tensor_content or contains 0
-    // elements, we can return it to the client directly.
-    out->Swap(in);
-  } else {
-    Tensor t(in->dtype());
-    if (!t.FromProto(cpu_allocator(), *in)) return false;
-    t.AsProtoTensorContent(out);
-  }
-  return true;
-}
-
 // Helper class to manage "num" parallel RunGraph calls.
 class RunManyGraphs {
  public:
@@ -565,7 +552,7 @@ Status MasterSession::ReffedClientGraph::RunPartitions(
     // We keep these as separate paths for now, to ensure we aren't
     // inadvertently slowing down the normal run path.
     if (is_partial_) {
-      for (int i = 0; i < req.num_feeds(); ++i) {
+      for (int i = 0; static_cast<size_t>(i) < req.num_feeds(); ++i) {
         const string& name = req.feed_name(i);
         auto iter = part.feed_key.find(name);
         if (iter == part.feed_key.end()) {
@@ -577,7 +564,7 @@ Status MasterSession::ReffedClientGraph::RunPartitions(
         if (feeds_iter == feeds.end()) {
           return errors::InvalidArgument("No feed is provided for feed=", name,
                                          ", key=", key);
-        } else if (feeds_iter->second != i) {
+        } else if (feeds_iter->second != static_cast<size_t>(i)) {
           return errors::Internal("Cannot find feed named \"", name,
                                   " in request.");
         }
@@ -585,7 +572,7 @@ Status MasterSession::ReffedClientGraph::RunPartitions(
       }
       // TODO(suharshs): Make a map from feed to fetch_key to make this faster.
       // For now, we just iterate through partitions to find the matching key.
-      for (int i = 0; i < req.num_fetches(); ++i) {
+      for (int i = 0; static_cast<size_t>(i) < req.num_fetches(); ++i) {
         const string& req_fetch = req.fetch_name(i);
         for (const auto& key_fetch : part.key_fetch) {
           if (key_fetch.second == req_fetch) {
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.cc b/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.cc
index 7854949033..80a2f89337 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.cc
@@ -49,6 +49,9 @@ const char* GrpcWorkerMethodName(GrpcWorkerMethod id) {
     case GrpcWorkerMethod::kTracing:
       return "/tensorflow.WorkerService/Tracing";
   }
+  // Shouldn't be reached.
+  LOG(FATAL) << "Invalid id: this line shouldn't be reached.";
+  return "invalid id";
 }
 
 namespace grpc {
diff --git a/tensorflow/core/graph/quantize_training.cc b/tensorflow/core/graph/quantize_training.cc
index 63294c695e..b241ab6ab3 100644
--- a/tensorflow/core/graph/quantize_training.cc
+++ b/tensorflow/core/graph/quantize_training.cc
@@ -247,7 +247,7 @@ Status ConnectVariablesToSaveOp(Graph* graph, Node* save_op,
 // Add a restore subgraph for each variable and connect to the restore_all op.
 // For each variable we add the following subgraph:
 //           Assign----restore_all
-//          /      \
+//          |      |
 //   RestoreV2    Variable
 Status AddRestoreVariableSubgraphs(Graph* graph, Node* save_op,
                                    const std::vector<const Edge*>& in_edges,
@@ -311,7 +311,7 @@ Status AddRestoreVariableSubgraphs(Graph* graph, Node* save_op,
 // Adds new variables to save and restore ops matching the Save and Restore
 // graphs created in tensorflow/python/training/saver.py.
 Status AddSaveAndRestore(Graph* graph, const std::vector<Node*>& variables) {
-  Node* save_op;
+  Node* save_op = nullptr;
   std::vector<const Edge*> in_edges;
   bool found = false;
   TF_RETURN_IF_ERROR(FindSaveOp(graph, &save_op, &in_edges, &found));
diff --git a/tensorflow/core/grappler/optimizers/layout_optimizer.cc b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
index 791944a1b3..5438bff0c1 100644
--- a/tensorflow/core/grappler/optimizers/layout_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
@@ -508,7 +508,7 @@ class BinaryOpProcessor : public AgnosticNodeProcessor {
     AttrValue attr_tensor;
     Tensor tensor(DT_INT32, TensorShape({4}));
     std::vector<int> shape = {1, num_channels, 1, 1};
-    for (int i = 0; i < shape.size(); i++) {
+    for (int i = 0; static_cast<size_t>(i) < shape.size(); i++) {
       tensor.flat<int>()(i) = shape[i];
     }
     tensor.AsProtoTensorContent(attr_tensor.mutable_tensor());
@@ -851,7 +851,7 @@ class DataLayoutOptimizer {
     node->mutable_attr()->insert({"dtype", attr_data_type});
     AttrValue attr_tensor;
     Tensor tensor(DT_INT32, TensorShape({4}));
-    for (int i = 0; i < permutation.size(); i++) {
+    for (int i = 0; static_cast<size_t>(i) < permutation.size(); i++) {
       tensor.flat<int>()(i) = permutation[i];
     }
     tensor.AsProtoTensorContent(attr_tensor.mutable_tensor());
@@ -885,7 +885,7 @@ class DataLayoutOptimizer {
     AttrValue attr_tensor;
     Tensor tensor(DT_INT32, TensorShape({3}));
     std::vector<int> axis = {0, 2, 3};
-    for (int i = 0; i < axis.size(); i++) {
+    for (int i = 0; static_cast<size_t>(i) < axis.size(); i++) {
       tensor.flat<int>()(i) = axis[i];
     }
     tensor.AsProtoTensorContent(attr_tensor.mutable_tensor());
diff --git a/tensorflow/core/kernels/hexagon/hexagon_rewriter_transform.cc b/tensorflow/core/kernels/hexagon/hexagon_rewriter_transform.cc
index f2b1958105..ee548c6887 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_rewriter_transform.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_rewriter_transform.cc
@@ -47,7 +47,7 @@ Status RewriteQuantizedStrippedModelForHexagon(
                "graph execute op...";
   std::vector<std::pair<string, Tensor>> inputs;
   std::vector<string> outputs;
-  for (auto i = 0; i < context.input_names.size(); ++i) {
+  for (auto i = 0; static_cast<size_t>(i) < context.input_names.size(); ++i) {
     const string& input_name = context.input_names.at(i);
 
     // Get input shape
diff --git a/tensorflow/core/kernels/image_resizer_state.h b/tensorflow/core/kernels/image_resizer_state.h
index 33383d16a8..9ef44a5782 100644
--- a/tensorflow/core/kernels/image_resizer_state.h
+++ b/tensorflow/core/kernels/image_resizer_state.h
@@ -122,7 +122,7 @@ struct ImageResizerState {
   int64 channels;
   float height_scale;
   float width_scale;
-  Tensor* output;
+  Tensor* output = nullptr;
 
  private:
   bool align_corners_;
diff --git a/tensorflow/core/kernels/range_sampler.cc b/tensorflow/core/kernels/range_sampler.cc
index f7c1e6c52c..7e57331ab4 100644
--- a/tensorflow/core/kernels/range_sampler.cc
+++ b/tensorflow/core/kernels/range_sampler.cc
@@ -262,7 +262,7 @@ FixedUnigramSampler::FixedUnigramSampler(int64 range,
 }
 
 float FixedUnigramSampler::Probability(int64 value) const {
-  if (value >= weights_.size() || value < 0) {
+  if (value < 0 || static_cast<size_t>(value) >= weights_.size()) {
     return 0.0;
   }
   return weights_.at(value) / total_weight_;
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
index cb16ffe675..a6eb06004a 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
@@ -168,12 +168,12 @@ RemoteFusedGraphExecuteUtils::GetExecutorBuildRegistry() {
     output_tensors.push_back(input_node_info.second);
   }
 
-  for (int i = 0; i < output_node_names.size(); ++i) {
+  for (int i = 0; static_cast<size_t>(i) < output_node_names.size(); ++i) {
     const string& name = output_node_names.at(i);
     const Tensor& tensor = output_tensors.at(i);
     EmplaceTensorShapeType(name, tensor, tensor_shape_map);
   }
-  for (int i = 0; i < input_node_info_list.size(); ++i) {
+  for (int i = 0; static_cast<size_t>(i) < input_node_info_list.size(); ++i) {
     const string& name = input_node_info_list.at(i).first;
     const Tensor& tensor = output_tensors.at(output_node_names.size() + i);
     EmplaceTensorShapeType(name, tensor, tensor_shape_map);
diff --git a/tensorflow/core/kernels/resize_bicubic_op.cc b/tensorflow/core/kernels/resize_bicubic_op.cc
index d7b063e0c1..5131bce448 100644
--- a/tensorflow/core/kernels/resize_bicubic_op.cc
+++ b/tensorflow/core/kernels/resize_bicubic_op.cc
@@ -235,9 +235,9 @@ inline void interpolate_with_caching(
       const T* y_ptr_3 = input_b_ptr + y_wai.index_3 * in_row_width;
       if (num_channels == 3) {
         // Manually unroll case of 3 channels.
-        float cached_value_0[4];
-        float cached_value_1[4];
-        float cached_value_2[4];
+        float cached_value_0[4] = {0};
+        float cached_value_1[4] = {0};
+        float cached_value_2[4] = {0};
         for (int64 x = 0; x < resizer_state.out_width; ++x) {
           const WeightsAndIndices& x_wai = x_wais[x];
           // Shift values in cached_value_* to fill first 'advance' values.
@@ -316,7 +316,7 @@ inline void interpolate_with_caching(
         }
       } else {
         for (int64 c = 0; c < num_channels; ++c) {
-          float cached_value[4];
+          float cached_value[4] = {0};
           for (int64 x = 0; x < resizer_state.out_width; ++x) {
             const WeightsAndIndices& x_wai = x_wais[x];
             // Shift values in cached_value to fill first 'advance' values.
diff --git a/tensorflow/core/kernels/tensor_array_ops.cc b/tensorflow/core/kernels/tensor_array_ops.cc
index 73190c44c9..5fc9ce5f92 100644
--- a/tensorflow/core/kernels/tensor_array_ops.cc
+++ b/tensorflow/core/kernels/tensor_array_ops.cc
@@ -288,8 +288,8 @@ class TensorArrayGradOp : public TensorArrayCreationOp {
     // may no longer be resized by new Writes.
     tensor_array->DisableDynamicSize();
 
-    int32 array_size;
-    int32 marked_size;
+    int32 array_size = 0;
+    int32 marked_size = 0;
     TF_RETURN_IF_ERROR(tensor_array->Size(&array_size));
     TF_RETURN_IF_ERROR(tensor_array->MarkedSize(&marked_size));
 
diff --git a/tensorflow/core/lib/wav/wav_io.cc b/tensorflow/core/lib/wav/wav_io.cc
index 97e218a793..028ff26ffb 100644
--- a/tensorflow/core/lib/wav/wav_io.cc
+++ b/tensorflow/core/lib/wav/wav_io.cc
@@ -262,7 +262,7 @@ Status DecodeLin16WaveAsFloatVector(const string& wav_string,
   const uint32 data_count = *sample_count * *channel_count;
   float_values->resize(data_count);
   for (int i = 0; i < data_count; ++i) {
-    int16 single_channel_value;
+    int16 single_channel_value = 0;
     TF_RETURN_IF_ERROR(
         ReadValue<int16>(wav_string, &single_channel_value, &offset));
     (*float_values)[i] = Int16SampleToFloat(single_channel_value);
diff --git a/tensorflow/core/util/tensor_format.h b/tensorflow/core/util/tensor_format.h
index fe89fe852e..8c76f0f3c5 100644
--- a/tensorflow/core/util/tensor_format.h
+++ b/tensorflow/core/util/tensor_format.h
@@ -177,7 +177,7 @@ inline TensorShape ShapeFromFormat(TensorFormat format, int64 N,
                                    gtl::ArraySlice<int64> spatial, int64 C) {
   gtl::InlinedVector<int64, 5> dim_sizes(spatial.size() + 2);
   dim_sizes[GetTensorBatchDimIndex(dim_sizes.size(), format)] = N;
-  for (int dim = 0; dim < spatial.size(); dim++) {
+  for (int dim = 0; static_cast<size_t>(dim) < spatial.size(); dim++) {
     dim_sizes[GetTensorSpatialDimIndex(dim_sizes.size(), format, dim)] =
         spatial[dim];
   }
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
index 040a4513ca..f6062aa03d 100644
--- a/tensorflow/python/lib/core/py_func.cc
+++ b/tensorflow/python/lib/core/py_func.cc
@@ -265,7 +265,7 @@ class NumpyTensorBuffer : public TensorBuffer {
 
 Status ConvertNdarrayToTensor(PyObject* obj, Tensor* ret) {
   PyArrayObject* input = reinterpret_cast<PyArrayObject*>(obj);
-  DataType dtype;
+  DataType dtype = DT_INVALID;
   TensorShape shape;
   for (int i = 0; i < PyArray_NDIM(input); ++i) {
     shape.AddDim(PyArray_SHAPE(input)[i]);
-- 
GitLab


From 01f03299baa4cb1f1b59ee7e370dc938aaba7a20 Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Mon, 3 Apr 2017 14:18:28 -0800
Subject: [PATCH 0087/1563] Add kernel_methods package to contrib Change:
 152064888

---
 tensorflow/contrib/__init__.py                |  1 +
 tensorflow/contrib/cmake/tf_python.cmake      |  3 +++
 tensorflow/contrib/kernel_methods/BUILD       | 22 +++++++++++++------
 tensorflow/contrib/kernel_methods/__init__.py |  1 -
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py
index 9b703cf090..1ce1b4da09 100644
--- a/tensorflow/contrib/__init__.py
+++ b/tensorflow/contrib/__init__.py
@@ -35,6 +35,7 @@ from tensorflow.contrib import image
 from tensorflow.contrib import input_pipeline
 from tensorflow.contrib import integrate
 from tensorflow.contrib import keras
+from tensorflow.contrib import kernel_methods
 from tensorflow.contrib import labeled_tensor
 from tensorflow.contrib import layers
 from tensorflow.contrib import learn
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 35f4048efc..39fbf603f0 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -344,6 +344,9 @@ add_python_module("tensorflow/contrib/keras/python/keras/layers")
 add_python_module("tensorflow/contrib/keras/python/keras/preprocessing")
 add_python_module("tensorflow/contrib/keras/python/keras/utils")
 add_python_module("tensorflow/contrib/keras/python/keras/wrappers")
+add_python_module("tensorflow/contrib/kernel_methods")
+add_python_module("tensorflow/contrib/kernel_methods/python")
+add_python_module("tensorflow/contrib/kernel_methods/python/mappers")
 add_python_module("tensorflow/contrib/labeled_tensor")
 add_python_module("tensorflow/contrib/labeled_tensor/python")
 add_python_module("tensorflow/contrib/labeled_tensor/python/ops")
diff --git a/tensorflow/contrib/kernel_methods/BUILD b/tensorflow/contrib/kernel_methods/BUILD
index b37cbc119f..fccaa3abd4 100644
--- a/tensorflow/contrib/kernel_methods/BUILD
+++ b/tensorflow/contrib/kernel_methods/BUILD
@@ -21,9 +21,14 @@ py_library(
         ":dense_kernel_mapper_py",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/contrib/learn",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:ops",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:util",
         "//third_party/py/numpy",
+        "@six_archive//:six",
     ],
 )
 
@@ -31,6 +36,7 @@ py_library(
     name = "dense_kernel_mapper_py",
     srcs = ["python/mappers/dense_kernel_mapper.py"],
     srcs_version = "PY2AND3",
+    deps = ["@six_archive//:six"],
 )
 
 py_test(
@@ -40,12 +46,12 @@ py_test(
     deps = [
         ":dense_kernel_mapper_py",
         ":kernel_methods",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
         "//tensorflow/python:nn",
-        "//tensorflow/python:ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:random_ops",
     ],
 )
 
@@ -55,10 +61,12 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":kernel_methods",
-        "//tensorflow/python:client_testlib",
+        "//tensorflow/contrib/layers:layers_py",
+        "//tensorflow/contrib/learn",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:sparse_tensor",
         "//third_party/py/numpy",
     ],
 )
diff --git a/tensorflow/contrib/kernel_methods/__init__.py b/tensorflow/contrib/kernel_methods/__init__.py
index 1a3a0ab77a..a715df1bf1 100644
--- a/tensorflow/contrib/kernel_methods/__init__.py
+++ b/tensorflow/contrib/kernel_methods/__init__.py
@@ -22,7 +22,6 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.kernel_methods.python.kernel_estimators import KernelLinearClassifier
-from tensorflow.contrib.kernel_methods.python.mappers import dense_kernel_mapper
 from tensorflow.contrib.kernel_methods.python.mappers.random_fourier_features import RandomFourierFeatureMapper
 
 from tensorflow.python.util.all_util import remove_undocumented
-- 
GitLab


From 65b5ca4e53fcfad350ffc3c31ff191dd56376789 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 14:18:31 -0800
Subject: [PATCH 0088/1563] Splitting scalar strict test into an internal and
 external version. Change: 152064895

---
 tensorflow/python/kernel_tests/BUILD          |  4 +--
 .../{scalar_strict_test.py => scalar_test.py} | 11 ++------
 tensorflow/python/platform/control_imports.py | 28 -------------------
 tensorflow/tools/test/check_futures_test.py   |  1 -
 4 files changed, 5 insertions(+), 39 deletions(-)
 rename tensorflow/python/kernel_tests/{scalar_strict_test.py => scalar_test.py} (95%)
 delete mode 100644 tensorflow/python/platform/control_imports.py

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 333c6b8f2b..f21402652f 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -1578,9 +1578,9 @@ cuda_py_test(
 )
 
 cuda_py_test(
-    name = "scalar_strict_test",
+    name = "scalar_test",
     size = "small",
-    srcs = ["scalar_strict_test.py"],
+    srcs = ["scalar_test.py"],
     additional_deps = [
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
diff --git a/tensorflow/python/kernel_tests/scalar_strict_test.py b/tensorflow/python/kernel_tests/scalar_test.py
similarity index 95%
rename from tensorflow/python/kernel_tests/scalar_strict_test.py
rename to tensorflow/python/kernel_tests/scalar_test.py
index e208217637..b34426cc21 100644
--- a/tensorflow/python/kernel_tests/scalar_strict_test.py
+++ b/tensorflow/python/kernel_tests/scalar_test.py
@@ -27,20 +27,15 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import sparse_ops
 import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
-from tensorflow.python.platform import control_imports
 from tensorflow.python.platform import test
 
 
-class ScalarStrictTest(test.TestCase):
+class ScalarTest(test.TestCase):
 
   def check(self, op, args, error, correct=None):
     # Within Google, the switch to scalar strict occurred at version 6.
-    if control_imports.USE_OSS:
-      lenient = []
-      strict = [5, 6]
-    else:
-      lenient = [5]
-      strict = [6]
+    lenient = []
+    strict = [5, 6]
 
     # Use placeholders to bypass shape inference, since only the C++
     # GraphDef level is ever scalar lenient.
diff --git a/tensorflow/python/platform/control_imports.py b/tensorflow/python/platform/control_imports.py
deleted file mode 100644
index 61b29ca4e5..0000000000
--- a/tensorflow/python/platform/control_imports.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-"""Switch between Google or open source dependencies."""
-# Switch between Google and OSS dependencies
-USE_OSS = True
-
-# Per-dependency switches determining whether each dependency is ready
-# to be replaced by its OSS equivalence.
-# TODO(danmane,mrry,opensource): Flip these switches, then remove them
-OSS_APP = True
-OSS_FLAGS = True
-OSS_GFILE = True
-OSS_GOOGLETEST = True
-OSS_LOGGING = True
-OSS_PARAMETERIZED = True
diff --git a/tensorflow/tools/test/check_futures_test.py b/tensorflow/tools/test/check_futures_test.py
index 36a61c0ecc..32d65adb1f 100644
--- a/tensorflow/tools/test/check_futures_test.py
+++ b/tensorflow/tools/test/check_futures_test.py
@@ -40,7 +40,6 @@ FUTURES_PATTERN_2 = re.compile(
 REQUIRED_FUTURES = frozenset(['absolute_import', 'division', 'print_function'])
 
 WHITELIST = [
-    'python/platform/control_imports.py',
     'tools/docker/jupyter_notebook_config.py',
 ]
 
-- 
GitLab


From 6a5b37e616bffe0e72678b1b06f8b1ac01acbe90 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 14:30:01 -0800
Subject: [PATCH 0089/1563] Add a xla tf graph utility to treat xla
 representation as tf graph to support mobile SOC experiments and leverage tf
 tools Change: 152066347

---
 tensorflow/BUILD                              |  1 +
 tensorflow/compiler/xla/BUILD                 |  1 +
 tensorflow/contrib/xla_tf_graph/BUILD         | 62 ++++++++++++++++
 tensorflow/contrib/xla_tf_graph/README.md     |  8 +++
 .../contrib/xla_tf_graph/xla_tf_graph_util.cc | 71 +++++++++++++++++++
 .../contrib/xla_tf_graph/xla_tf_graph_util.h  | 43 +++++++++++
 .../xla_tf_graph/xla_tf_graph_util_test.cc    | 57 +++++++++++++++
 7 files changed, 243 insertions(+)
 create mode 100644 tensorflow/contrib/xla_tf_graph/BUILD
 create mode 100644 tensorflow/contrib/xla_tf_graph/README.md
 create mode 100644 tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
 create mode 100644 tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
 create mode 100644 tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index f07ef0cabf..101d193cd6 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -249,6 +249,7 @@ filegroup(
         "//tensorflow/contrib/tfprof/python/tools/tfprof:all_files",
         "//tensorflow/contrib/training:all_files",
         "//tensorflow/contrib/util:all_files",
+        "//tensorflow/contrib/xla_tf_graph:all_files",
         "//tensorflow/core:all_files",
         "//tensorflow/core/debug:all_files",
         "//tensorflow/core/distributed_runtime:all_files",
diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index e73a29ddee..35c0efb8f0 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -6,6 +6,7 @@ package_group(
     name = "friends",
     packages = [
         "//tensorflow/compiler/...",
+        "//tensorflow/contrib/xla_tf_graph/...",
     ],
 )
 
diff --git a/tensorflow/contrib/xla_tf_graph/BUILD b/tensorflow/contrib/xla_tf_graph/BUILD
new file mode 100644
index 0000000000..aef277bc6e
--- /dev/null
+++ b/tensorflow/contrib/xla_tf_graph/BUILD
@@ -0,0 +1,62 @@
+# Description:
+#   contains parts of TensorFlow that are experimental or unstable and which are not supported.
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+)
+
+cc_library(
+    name = "xla_tf_graph_util",
+    srcs = [
+        "xla_tf_graph_util.cc",
+    ],
+    hdrs = [
+        "xla_tf_graph_util.h",
+    ],
+    deps = [
+        "//tensorflow/compiler/tf2xla:xla_compiler",
+        "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla/client",
+        "//tensorflow/compiler/xla/client:client_library",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+    ],
+)
+
+cc_test(
+    name = "xla_tf_graph_util_test",
+    srcs = ["xla_tf_graph_util_test.cc"],
+    deps = [
+        ":xla_tf_graph_util",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:function_ops",
+        "//tensorflow/cc:scope",
+        "//tensorflow/compiler/jit:xla_cpu_jit",
+        "//tensorflow/compiler/tf2xla:xla_compiler",
+        "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla/client:client_library",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:ops",
+        "//tensorflow/core:tensorflow",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core/kernels:cwise_op",
+    ],
+)
diff --git a/tensorflow/contrib/xla_tf_graph/README.md b/tensorflow/contrib/xla_tf_graph/README.md
new file mode 100644
index 0000000000..a374189e81
--- /dev/null
+++ b/tensorflow/contrib/xla_tf_graph/README.md
@@ -0,0 +1,8 @@
+# Xla Tf Graph
+
+## Description
+
+This module contains utilities to treat xla representation as tf graph to support mobile SOC experiments and leverage tf tools.
+
+Maintainers:
+- Satoshi Kataoka (satok@google.com, github.com/satok16)
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
new file mode 100644
index 0000000000..3bad9b8067
--- /dev/null
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
@@ -0,0 +1,71 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h"
+
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+#include "tensorflow/compiler/xla/client/client_library.h"
+
+namespace tensorflow {
+namespace xla_tf_graph {
+
+namespace {
+
+constexpr const char* const GRAPH_NAME = "xla_tf_graph_util";
+
+void SetupXlaCpuClient(std::unique_ptr<FunctionLibraryDefinition>* flib_def,
+                       std::unique_ptr<FunctionLibraryRuntime>* flr,
+                       std::unique_ptr<XlaCompiler>* compiler) {
+  xla::Client* client = xla::ClientLibrary::LocalClientOrDie();
+  XlaOpRegistry::RegisterCompilationKernels();
+
+  FunctionDefLibrary flib;
+  flib_def->reset(new FunctionLibraryDefinition(OpRegistry::Global(), flib));
+
+  // Setup compiler options
+  XlaCompiler::Options options;
+  options.device_type = DeviceType(DEVICE_CPU_XLA_JIT);
+  options.client = client;
+  compiler->reset(new XlaCompiler(options));
+
+  flr->reset(NewFunctionLibraryRuntime(
+      compiler->get()->device_mgr(), /*env=*/nullptr, compiler->get()->device(),
+      TF_GRAPH_DEF_VERSION, flib_def->get(), OptimizerOptions(),
+      /*custom_kernel_creator=*/nullptr));
+}
+
+}  // namespace
+
+xla::StatusOr<std::unique_ptr<xla::SessionModule>>
+ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
+                                 std::unique_ptr<Graph> graph) {
+  CHECK(graph);
+
+  std::unique_ptr<FunctionLibraryDefinition> flib_def;
+  std::unique_ptr<FunctionLibraryRuntime> flr;
+  std::unique_ptr<XlaCompiler> compiler;
+
+  SetupXlaCpuClient(&flib_def, &flr, &compiler);
+
+  // Compile graph and build computation
+  XlaCompiler::CompilationResult result;
+  TF_CHECK_OK(compiler->CompileGraph(GRAPH_NAME, std::move(graph), flr.get(),
+                                     args, &result));
+
+  return result.computation.Snapshot();
+}
+
+}  // namespace xla_tf_graph
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
new file mode 100644
index 0000000000..89dca876b0
--- /dev/null
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
@@ -0,0 +1,43 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CONTRIB_XLA_TF_GRAPH_XLA_TF_GRAPH_UTIL_H_
+#define TENSORFLOW_CONTRIB_XLA_TF_GRAPH_XLA_TF_GRAPH_UTIL_H_
+
+#include "tensorflow/compiler/tf2xla/xla_compiler.h"
+#include "tensorflow/compiler/xla/client/client.h"
+#include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/core/framework/function.h"
+#include "tensorflow/core/graph/graph.h"
+#include "tensorflow/core/platform/macros.h"
+
+namespace tensorflow {
+namespace xla_tf_graph {
+
+// A set of utilities to handle xla computation requests.
+// These utilities help developers leverage existing tools to work with
+// xla computations, also provide a way to support TensorFlow ops by
+// implementing xla computations so that they can do experiments on their
+// specialized environments.
+
+// Convert a tf graph to a xla session module
+xla::StatusOr<std::unique_ptr<xla::SessionModule>>
+ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
+                                 std::unique_ptr<Graph> graph);
+
+}  // namespace xla_tf_graph
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_CONTRIB_XLA_TF_GRAPH_XLA_TF_GRAPH_UTIL_H_
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
new file mode 100644
index 0000000000..bab4256187
--- /dev/null
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
@@ -0,0 +1,57 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h"
+#include "tensorflow/cc/framework/scope.h"
+#include "tensorflow/cc/ops/function_ops.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/compiler/xla/client/client_library.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace xla_tf_graph {
+
+static std::unique_ptr<Graph> BuildAddGraph() {
+  Scope scope = Scope::NewRootScope().ExitOnError();
+  auto a = ops::_Arg(scope.WithOpName("A"), DT_INT32, 0);
+  auto b = ops::_Arg(scope.WithOpName("B"), DT_INT32, 1);
+  auto c = ops::Add(scope.WithOpName("C"), a, b);
+  auto d = ops::_Retval(scope.WithOpName("D"), c, 0);
+  std::unique_ptr<Graph> graph(new Graph(OpRegistry::Global()));
+  TF_CHECK_OK(scope.ToGraph(graph.get()));
+  return graph;
+}
+
+TEST(XlaTfGraphUtil, ConvertTfGraphToHloModule) {
+  // Builds a description of the arguments.
+  std::vector<XlaCompiler::Argument> args(2);
+  args[0].kind = XlaCompiler::Argument::kParameter;
+  args[0].type = DT_INT32;
+  args[0].shape = TensorShape({2});
+  args[1].kind = XlaCompiler::Argument::kParameter;
+  args[1].type = DT_INT32;
+  args[1].shape = TensorShape({2});
+
+  std::unique_ptr<Graph> graph = BuildAddGraph();
+
+  TF_ASSIGN_OR_ASSERT_OK(
+      std::unique_ptr<xla::SessionModule> session_module,
+      ConvertTfGraphToXlaSessionModule(args, std::move(graph)));
+
+  ASSERT_EQ(5, session_module->entry().requests_size());
+}
+
+}  // namespace xla_tf_graph
+}  // namespace tensorflow
-- 
GitLab


From 98602f5d0b53e4d4068de336deb8eec21a5b20c9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 14:31:43 -0800
Subject: [PATCH 0090/1563] Update pypi description to reflect that our
 manylinux1 wheel does not conform to PEP531. Fix #8802 Change: 152066556

---
 tensorflow/tools/pip_package/setup.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 6d6078b6ee..376eaedc75 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -167,12 +167,15 @@ headers = (list(find_files('*.h', 'tensorflow/core')) +
            list(find_files('*', 'third_party/eigen3')) +
            list(find_files('*', 'external/eigen_archive')))
 
+tf_long_description = (
+    'Note: TensorFlow manylinux1 wheels do not conform to the '
+    'specification in PEP531.')
 
 setup(
     name=project_name,
     version=_VERSION.replace('-', ''),
     description='TensorFlow helps the tensors flow',
-    long_description='',
+    long_description=tf_long_description,
     url='http://tensorflow.org/',
     author='Google Inc.',
     author_email='opensource@google.com',
@@ -187,13 +190,14 @@ setup(
     # Add in any packaged data.
     include_package_data=True,
     package_data={
-        'tensorflow': [EXTENSION_NAME,
-                       'tensorboard/dist/bazel-html-imports.html',
-                       'tensorboard/dist/index.html',
-                       'tensorboard/dist/tf-tensorboard.html',
-                       'tensorboard/lib/css/global.css',
-                       'tensorboard/TAG',
-                     ] + matches,
+        'tensorflow': [
+            EXTENSION_NAME,
+            'tensorboard/dist/bazel-html-imports.html',
+            'tensorboard/dist/index.html',
+            'tensorboard/dist/tf-tensorboard.html',
+            'tensorboard/lib/css/global.css',
+            'tensorboard/TAG',
+        ] + matches,
     },
     zip_safe=False,
     distclass=BinaryDistribution,
@@ -212,7 +216,6 @@ setup(
         'Topic :: Scientific/Engineering :: Mathematics',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Libraries',
-        ],
+    ],
     license='Apache 2.0',
-    keywords='tensorflow tensor machine learning',
-    )
+    keywords='tensorflow tensor machine learning',)
-- 
GitLab


From 0fde061980f7c3dc88215bba616303c3057c3fb9 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 3 Apr 2017 14:36:14 -0800
Subject: [PATCH 0091/1563] [TF distributions] Add Binomial CDF support.
 Change: 152067138

---
 .../python/kernel_tests/binomial_test.py      | 46 +++++++++++++++----
 .../distributions/python/ops/binomial.py      | 34 ++++++++++++++
 2 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
index f34d7a1fd4..c473d54f47 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
@@ -69,19 +69,25 @@ class BinomialTest(test.TestCase):
       self.assertEqual((1, 3), binom.logits.get_shape())
       self.assertAllClose(logits, binom.logits.eval())
 
-  def testPmfNandCountsAgree(self):
+  def testPmfAndCdfNandCountsAgree(self):
     p = [[0.1, 0.2, 0.7]]
     n = [[5.]]
     with self.test_session():
       binom = binomial.Binomial(total_count=n, probs=p, validate_args=True)
       binom.prob([2., 3, 2]).eval()
       binom.prob([3., 1, 2]).eval()
+      binom.cdf([2., 3, 2]).eval()
+      binom.cdf([3., 1, 2]).eval()
       with self.assertRaisesOpError("Condition x >= 0.*"):
         binom.prob([-1., 4, 2]).eval()
       with self.assertRaisesOpError("Condition x <= y.*"):
         binom.prob([7., 3, 0]).eval()
+      with self.assertRaisesOpError("Condition x >= 0.*"):
+        binom.cdf([-1., 4, 2]).eval()
+      with self.assertRaisesOpError("Condition x <= y.*"):
+        binom.cdf([7., 3, 0]).eval()
 
-  def testPmfNonIntegerCounts(self):
+  def testPmfAndCdfNonIntegerCounts(self):
     p = [[0.1, 0.2, 0.7]]
     n = [[5.]]
     with self.test_session():
@@ -89,50 +95,72 @@ class BinomialTest(test.TestCase):
       binom = binomial.Binomial(total_count=n, probs=p, validate_args=True)
       binom.prob([2., 3, 2]).eval()
       binom.prob([3., 1, 2]).eval()
+      binom.cdf([2., 3, 2]).eval()
+      binom.cdf([3., 1, 2]).eval()
       # Both equality and integer checking fail.
       with self.assertRaisesOpError(
           "cannot contain fractional components."):
         binom.prob([1.0, 2.5, 1.5]).eval()
+      with self.assertRaisesOpError(
+          "cannot contain fractional components."):
+        binom.cdf([1.0, 2.5, 1.5]).eval()
 
       binom = binomial.Binomial(total_count=n, probs=p, validate_args=False)
       binom.prob([1., 2., 3.]).eval()
+      binom.cdf([1., 2., 3.]).eval()
       # Non-integer arguments work.
       binom.prob([1.0, 2.5, 1.5]).eval()
+      binom.cdf([1.0, 2.5, 1.5]).eval()
 
-  def testPmfBothZeroBatches(self):
+  def testPmfAndCdfBothZeroBatches(self):
     with self.test_session():
       # Both zero-batches.  No broadcast
       p = 0.5
       counts = 1.
-      pmf = binomial.Binomial(total_count=1., probs=p).prob(counts)
+      binom = binomial.Binomial(total_count=1., probs=p)
+      pmf = binom.prob(counts)
+      cdf = binom.cdf(counts)
       self.assertAllClose(0.5, pmf.eval())
+      self.assertAllClose(stats.binom.cdf(counts, n=1, p=p), cdf.eval())
       self.assertEqual((), pmf.get_shape())
+      self.assertEqual((), cdf.get_shape())
 
-  def testPmfBothZeroBatchesNontrivialN(self):
+  def testPmfAndCdfBothZeroBatchesNontrivialN(self):
     with self.test_session():
       # Both zero-batches.  No broadcast
       p = 0.1
       counts = 3.
       binom = binomial.Binomial(total_count=5., probs=p)
       pmf = binom.prob(counts)
+      cdf = binom.cdf(counts)
       self.assertAllClose(stats.binom.pmf(counts, n=5., p=p), pmf.eval())
+      self.assertAllClose(stats.binom.cdf(counts, n=5., p=p), cdf.eval())
       self.assertEqual((), pmf.get_shape())
+      self.assertEqual((), cdf.get_shape())
 
-  def testPmfPStretchedInBroadcastWhenSameRank(self):
+  def testPmfAndCdfPStretchedInBroadcastWhenSameRank(self):
     with self.test_session():
       p = [[0.1, 0.9]]
       counts = [[1., 2.]]
-      pmf = binomial.Binomial(total_count=3., probs=p).prob(counts)
+      binom = binomial.Binomial(total_count=3., probs=p)
+      pmf = binom.prob(counts)
+      cdf = binom.cdf(counts)
       self.assertAllClose(stats.binom.pmf(counts, n=3., p=p), pmf.eval())
+      self.assertAllClose(stats.binom.cdf(counts, n=3., p=p), cdf.eval())
       self.assertEqual((1, 2), pmf.get_shape())
+      self.assertEqual((1, 2), cdf.get_shape())
 
-  def testPmfPStretchedInBroadcastWhenLowerRank(self):
+  def testPmfAndCdfPStretchedInBroadcastWhenLowerRank(self):
     with self.test_session():
       p = [0.1, 0.4]
       counts = [[1.], [0.]]
-      pmf = binomial.Binomial(total_count=1., probs=p).prob(counts)
+      binom = binomial.Binomial(total_count=1., probs=p)
+      pmf = binom.prob(counts)
+      cdf = binom.cdf(counts)
       self.assertAllClose([[0.1, 0.4], [0.9, 0.6]], pmf.eval())
+      self.assertAllClose([[1.0, 1.0], [0.9, 0.6]], cdf.eval())
       self.assertEqual((2, 2), pmf.get_shape())
+      self.assertEqual((2, 2), cdf.get_shape())
 
   def testBinomialMean(self):
     with self.test_session():
diff --git a/tensorflow/contrib/distributions/python/ops/binomial.py b/tensorflow/contrib/distributions/python/ops/binomial.py
index ee7751c996..78eb44acb2 100644
--- a/tensorflow/contrib/distributions/python/ops/binomial.py
+++ b/tensorflow/contrib/distributions/python/ops/binomial.py
@@ -42,6 +42,28 @@ to integer values.
 """
 
 
+def _bdtr(k, n, p):
+  """The binomial cumulative distribution function.
+
+  Args:
+    k: floating point `Tensor`.
+    n: floating point `Tensor`.
+    p: floating point `Tensor`.
+
+  Returns:
+    `sum_{j=0}^k p^j (1 - p)^(n - j)`.
+  """
+  # Trick for getting safe backprop/gradients into n, k when
+  #   betainc(a = 0, ..) = nan
+  # Write:
+  #   where(unsafe, safe_output, betainc(where(unsafe, safe_input, input)))
+  ones = array_ops.ones_like(n - k)
+  k_eq_n = math_ops.equal(k, n)
+  safe_dn = array_ops.where(k_eq_n, ones, n - k)
+  dk = math_ops.betainc(a=safe_dn, b=k + 1, x=1 - p)
+  return array_ops.where(k_eq_n, ones, dk)
+
+
 class Binomial(distribution.Distribution):
   """Binomial distribution.
 
@@ -201,6 +223,18 @@ class Binomial(distribution.Distribution):
   def _prob(self, counts):
     return math_ops.exp(self._log_prob(counts))
 
+  def _cdf(self, counts):
+    counts = self._maybe_assert_valid_sample(counts)
+    probs = self.probs
+    if not (counts.shape.is_fully_defined()
+            and self.probs.shape.is_fully_defined()
+            and counts.shape.is_compatible_with(self.probs.shape)):
+      # If both shapes are well defined and equal, we skip broadcasting.
+      probs += array_ops.zeros_like(counts)
+      counts += array_ops.zeros_like(self.probs)
+
+    return _bdtr(k=counts, n=self.total_count, p=probs)
+
   def _log_unnormalized_prob(self, counts):
     counts = self._maybe_assert_valid_sample(counts)
     return (counts * math_ops.log(self.probs) +
-- 
GitLab


From 32a54fd9deab1b05121ee409c2e0ef7353c2902d Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Mon, 3 Apr 2017 14:47:34 -0800
Subject: [PATCH 0092/1563] Automated rollback of change 152048597 Change:
 152068577

---
 tensorflow/core/ops/array_ops.cc              |  4 +--
 .../core/ops/compat/ops_history.v1.pbtxt      | 29 -------------------
 tensorflow/core/ops/ops.pbtxt                 |  4 ---
 tensorflow/python/ops/array_ops.py            | 12 ++++----
 tensorflow/python/ops/hidden_ops.txt          |  1 -
 5 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 1362eba85c..6930af48a7 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -612,9 +612,7 @@ y: a tensor of the same shape and type as x but filled with zeros.
 REGISTER_OP("OnesLike")
     .Input("x: T")
     .Output("y: T")
-    .Attr(
-        "T: {uint8, half, float, double, int8, int16, int32, int64, complex64, "
-        "complex128}")
+    .Attr("T: {float, double, int32, int64, complex64, complex128}")
     .SetShapeFn(shape_inference::UnchangedShape)
     .Doc(R"doc(
 Returns a tensor of ones with the same shape and type as x.
diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 562bbe41d3..2af4e8692b 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -11005,35 +11005,6 @@ op {
     }
   }
 }
-op {
-  name: "OnesLike"
-  input_arg {
-    name: "x"
-    type_attr: "T"
-  }
-  output_arg {
-    name: "y"
-    type_attr: "T"
-  }
-  attr {
-    name: "T"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_UINT8
-        type: DT_HALF
-        type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT8
-        type: DT_INT16
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-      }
-    }
-  }
-}
 op {
   name: "Pack"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index fab9ad8ba0..8cea2b239e 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -11892,12 +11892,8 @@ op {
     type: "type"
     allowed_values {
       list {
-        type: DT_UINT8
-        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT8
-        type: DT_INT16
         type: DT_INT32
         type: DT_INT64
         type: DT_COMPLEX64
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 3122f8be2d..60057b9ab1 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1427,12 +1427,12 @@ def ones_like(tensor, dtype=None, name=None, optimize=True):
   """
   with ops.name_scope(name, "ones_like", [tensor]) as name:
     tensor = ops.convert_to_tensor(tensor, name="tensor")
-    if dtype is not None and tensor.dtype != dtype:
-      ret = ones(shape_internal(tensor, optimize=optimize), dtype, name=name)
-      ret.set_shape(tensor.get_shape())
-      return ret
-    else:
-      return gen_array_ops._ones_like(tensor, name=name)
+    ones_shape = shape_internal(tensor, optimize=optimize)
+    if dtype is None:
+      dtype = tensor.dtype
+    ret = ones(ones_shape, dtype=dtype, name=name)
+    ret.set_shape(tensor.get_shape())
+    return ret
 
 
 def ones(shape, dtype=dtypes.float32, name=None):
diff --git a/tensorflow/python/ops/hidden_ops.txt b/tensorflow/python/ops/hidden_ops.txt
index ee8f359258..fbfd7bb7d6 100644
--- a/tensorflow/python/ops/hidden_ops.txt
+++ b/tensorflow/python/ops/hidden_ops.txt
@@ -12,7 +12,6 @@ ListDiff
 MirrorPad
 MirrorPadGrad
 OneHot
-OnesLike
 Pack
 Pad
 ParallelConcat
-- 
GitLab


From 8e833fb8f6a0f3993b35eb19f7dcef157a230b3c Mon Sep 17 00:00:00 2001
From: "David G. Andersen" <dga@google.com>
Date: Mon, 3 Apr 2017 16:21:30 -0800
Subject: [PATCH 0093/1563] Eliminating some 64 bit to 32 bit silent
 downconversions. Continuing the effort to let people train neural networks
 the size of a small galaxy, or get coherent errors when they can't. Change:
 152079358

---
 tensorflow/core/lib/io/block_builder.cc | 23 +++++++++++++++--------
 tensorflow/core/lib/io/path.cc          |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tensorflow/core/lib/io/block_builder.cc b/tensorflow/core/lib/io/block_builder.cc
index 5a87da6c86..b2921c076c 100644
--- a/tensorflow/core/lib/io/block_builder.cc
+++ b/tensorflow/core/lib/io/block_builder.cc
@@ -70,10 +70,12 @@ size_t BlockBuilder::CurrentSizeEstimate() const {
 
 StringPiece BlockBuilder::Finish() {
   // Append restart array
-  for (size_t i = 0; i < restarts_.size(); i++) {
-    core::PutFixed32(&buffer_, restarts_[i]);
+  CHECK_LE(restarts_.size(), std::numeric_limits<uint32_t>::max());
+  for (const auto r : restarts_) {
+    core::PutFixed32(&buffer_, r);
   }
-  core::PutFixed32(&buffer_, restarts_.size());
+  // Downcast safe because of the CHECK.
+  core::PutFixed32(&buffer_, static_cast<uint32_t>(restarts_.size()));
   finished_ = true;
   return StringPiece(buffer_);
 }
@@ -93,19 +95,24 @@ void BlockBuilder::Add(const StringPiece& key, const StringPiece& value) {
     }
   } else {
     // Restart compression
-    restarts_.push_back(buffer_.size());
+    CHECK_LE(buffer_.size(), std::numeric_limits<uint32_t>::max());
+    restarts_.push_back(static_cast<uint32_t>(buffer_.size()));
     counter_ = 0;
   }
   const size_t non_shared = key.size() - shared;
 
+  CHECK_LE(shared, std::numeric_limits<uint32_t>::max());
+  CHECK_LE(non_shared, std::numeric_limits<uint32_t>::max());
+  CHECK_LE(value.size(), std::numeric_limits<uint32_t>::max());
+
   // Add "<shared><non_shared><value_size>" to buffer_
-  core::PutVarint32(&buffer_, shared);
-  core::PutVarint32(&buffer_, non_shared);
-  core::PutVarint32(&buffer_, value.size());
+  core::PutVarint32(&buffer_, static_cast<uint32_t>(shared));
+  core::PutVarint32(&buffer_, static_cast<uint32_t>(non_shared));
+  core::PutVarint32(&buffer_, static_cast<uint32_t>(value.size()));
 
   // Add string delta to buffer_ followed by value
   buffer_.append(key.data() + shared, non_shared);
-  buffer_.append(value.data(), value.size());
+  buffer_.append(value.data(), static_cast<uint32_t>(value.size()));
 
   // Update state
   last_key_.resize(shared);
diff --git a/tensorflow/core/lib/io/path.cc b/tensorflow/core/lib/io/path.cc
index ab2fd7739f..d93dd0296e 100644
--- a/tensorflow/core/lib/io/path.cc
+++ b/tensorflow/core/lib/io/path.cc
@@ -177,7 +177,7 @@ string CleanPath(StringPiece unclean_path) {
   }
 
   // Calculate and check the length of the cleaned path.
-  int path_length = dst - path.begin();
+  string::difference_type path_length = dst - path.begin();
   if (path_length != 0) {
     // Remove trailing '/' except if it is root path ("/" ==> path_length := 1)
     if (path_length > 1 && path[path_length - 1] == '/') {
-- 
GitLab


From d139cf3535d66c6f49e17f4a1e19a74f28301239 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Mon, 3 Apr 2017 16:22:44 -0800
Subject: [PATCH 0094/1563] Register OnesLike kernel in XLA. Change: 152079500

---
 tensorflow/compiler/tests/randomized_tests.cc  |  8 ++++++++
 tensorflow/compiler/tests/unary_ops_test.py    |  5 +++++
 tensorflow/compiler/tf2xla/kernels/shape_op.cc | 14 ++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/tensorflow/compiler/tests/randomized_tests.cc b/tensorflow/compiler/tests/randomized_tests.cc
index c3e8ff724c..a0cd905f17 100644
--- a/tensorflow/compiler/tests/randomized_tests.cc
+++ b/tensorflow/compiler/tests/randomized_tests.cc
@@ -2339,6 +2339,14 @@ TEST_F(OpTest, ZerosLike) {
   });
 }
 
+TEST_F(OpTest, OnesLike) {
+  Repeatedly([this]() {
+    DataType type = Choose<DataType>({DT_INT32, DT_FLOAT});
+    ExpectTfAndXlaOutputsAreClose(
+        OpTestBuilder("OnesLike").Input(RandomTensor(type)).Attr("T", type));
+  });
+}
+
 }  // anonymous namespace
 }  // namespace tensorflow
 
diff --git a/tensorflow/compiler/tests/unary_ops_test.py b/tensorflow/compiler/tests/unary_ops_test.py
index c96826fd0a..1e85d3a2c8 100644
--- a/tensorflow/compiler/tests/unary_ops_test.py
+++ b/tensorflow/compiler/tests/unary_ops_test.py
@@ -257,6 +257,11 @@ class UnaryOpsTest(XLATestCase):
           np.array([[4, 3], [2, 1]], dtype=dtype),
           expected=np.array([[0, 0], [0, 0]], dtype=dtype))
 
+      self._assertOpOutputMatchesExpected(
+          array_ops.ones_like,
+          np.array([[4, 3], [2, 1]], dtype=dtype),
+          expected=np.array([[1, 1], [1, 1]], dtype=dtype))
+
   def testLogicalOps(self):
     self._assertOpOutputMatchesExpected(
         math_ops.logical_not,
diff --git a/tensorflow/compiler/tf2xla/kernels/shape_op.cc b/tensorflow/compiler/tf2xla/kernels/shape_op.cc
index 74e3297dc3..24a99f253d 100644
--- a/tensorflow/compiler/tf2xla/kernels/shape_op.cc
+++ b/tensorflow/compiler/tf2xla/kernels/shape_op.cc
@@ -241,5 +241,19 @@ class ZerosLikeOp : public XlaOpKernel {
 
 REGISTER_XLA_OP(Name("ZerosLike"), ZerosLikeOp);
 
+class OnesLikeOp : public XlaOpKernel {
+ public:
+  explicit OnesLikeOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    const TensorShape input_shape = ctx->InputShape(0);
+
+    auto one = XlaHelpers::One(ctx->builder(), input_type(0));
+    ctx->SetOutput(0, ctx->builder()->Broadcast(one, input_shape.dim_sizes()));
+  }
+};
+
+REGISTER_XLA_OP(Name("OnesLike"), OnesLikeOp);
+
 }  // namespace
 }  // namespace tensorflow
-- 
GitLab


From 438c13ec9fae862bc5d416a6528035c961e02aee Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 16:36:49 -0800
Subject: [PATCH 0095/1563] Add support for creating objects inside the
 resource manager of an XLA compilation device. Change: 152080944

---
 tensorflow/compiler/tf2xla/xla_compiler.cc    |  11 +-
 tensorflow/compiler/tf2xla/xla_compiler.h     |  10 ++
 .../compiler/tf2xla/xla_compiler_test.cc      | 101 ++++++++++++++++++
 tensorflow/compiler/tf2xla/xla_op_kernel.cc   |   4 +
 tensorflow/compiler/tf2xla/xla_op_kernel.h    |   6 ++
 5 files changed, 131 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index ba975d617d..33b4a43aa1 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -59,9 +59,15 @@ Status CheckSignature(const DataTypeVector& types,
 
 XlaCompiler::XlaCompiler(XlaCompiler::Options options)
     : options_(std::move(options)),
+      initialization_status_(Status::OK()),
       next_step_id_(1),
       device_(new XlaCompilationDevice(SessionOptions(), options_.device_type)),
-      device_mgr_({device_}) {}
+      device_mgr_({device_}) {
+  if (options_.populate_resource_manager) {
+    initialization_status_ =
+        (*options_.populate_resource_manager)(device_->resource_manager());
+  }
+}
 
 XlaCompiler::~XlaCompiler() = default;
 
@@ -379,6 +385,9 @@ Status XlaCompiler::CompileGraph(string const& name,
                                  CompilationResult* result) {
   VLOG(1) << "Executing graph symbolically to populate ComputationBuilder.";
 
+  // Report the error here if initialization failed.
+  TF_RETURN_IF_ERROR(initialization_status_);
+
   xla::ComputationBuilder builder(client(), name);
   XlaContext* context =
       new XlaContext(this, &builder, options_.allow_cpu_custom_calls,
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.h b/tensorflow/compiler/tf2xla/xla_compiler.h
index 3ed920521b..3d28ca3746 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.h
+++ b/tensorflow/compiler/tf2xla/xla_compiler.h
@@ -214,6 +214,12 @@ class XlaCompiler {
     // This is useful to prune stateful operators that should not be executed
     // from a function body.
     bool prune_unreachable_nodes = false;
+
+    // If not nullptr, populate_resource_manager is called with the
+    // compilation device's resource manager when the compilation
+    // device is created, and can be used to create metadata objects
+    // that can be accessed by XLA op kernels.
+    std::function<Status(ResourceMgr*)>* populate_resource_manager = nullptr;
   };
 
   explicit XlaCompiler(Options options);
@@ -247,6 +253,7 @@ class XlaCompiler {
   Status BuildExecutable(const CompilationResult& result,
                          std::unique_ptr<xla::LocalExecutable>* executable);
 
+  const Options& options() const { return options_; }
   xla::Client* client() const { return options_.client; }
   XlaCompilationDevice* device() const { return device_; }
   const DeviceMgr* device_mgr() const { return &device_mgr_; }
@@ -260,6 +267,9 @@ class XlaCompiler {
  private:
   Options options_;
 
+  // Status set to non-OK in the constructor if initialization fails.
+  Status initialization_status_;
+
   // Returns the next step sequence number.
   int64 NextStepId();
 
diff --git a/tensorflow/compiler/tf2xla/xla_compiler_test.cc b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
index aa809f85a1..1cc7f4abd1 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler_test.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
@@ -17,12 +17,14 @@ limitations under the License.
 #include "tensorflow/cc/framework/ops.h"
 #include "tensorflow/cc/ops/function_ops.h"
 #include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/compiler/tf2xla/xla_op_kernel.h"
 #include "tensorflow/compiler/tf2xla/xla_op_registry.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/compiler/xla/client/local_client.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/resource_mgr.h"
 #include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/graph/graph_constructor.h"
@@ -33,6 +35,65 @@ limitations under the License.
 namespace tensorflow {
 namespace {
 
+// Helper class to test the ability to pass resources through to XLA
+// compiled kernels.
+class DummyResourceForTest : public ResourceBase {
+ public:
+  string DebugString() override { return "dummy"; }
+  void Increment() { ++value_; }
+  int Get() { return value_; }
+
+ private:
+  int value_ = 0;
+};
+
+class DummyReadResourceOp : public XlaOpKernel {
+ public:
+  explicit DummyReadResourceOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+  void Compile(XlaOpKernelContext* ctx) override {
+    ResourceMgr* rm = ctx->op_kernel_context()->resource_manager();
+    OP_REQUIRES(ctx, rm, errors::Internal("No resource manager."));
+    DummyResourceForTest* dummy;
+    OP_REQUIRES_OK(ctx, rm->Lookup<DummyResourceForTest>(
+                            rm->default_container(), "dummy", &dummy));
+    dummy->Increment();
+    dummy->Unref();
+
+    ctx->SetOutput(0, ctx->Input(0));
+  }
+};
+
+class DummyReadResourceCC {
+ public:
+  DummyReadResourceCC(const Scope& scope, const Input& value) {
+    if (!scope.ok()) return;
+    auto _value = ops::AsNodeOut(scope, value);
+    if (!scope.ok()) return;
+    Node* ret;
+    const auto unique_name = scope.GetUniqueNameForOp("DummyReadResource");
+    auto builder = NodeBuilder(unique_name, "DummyReadResource").Input(_value);
+    scope.UpdateBuilder(&builder);
+    scope.UpdateStatus(builder.Finalize(scope.graph(), &ret));
+    if (!scope.ok()) return;
+    this->output_ = Output(ret, 0);
+  }
+  Node* node() const { return output_.node(); }
+
+  Output output_;
+};
+
+REGISTER_OP("DummyReadResource")
+    .Input("input: int32")
+    .Output("output: int32")
+    .Doc(R"doc(
+A dummy Op.
+
+input: dummy input.
+output: dummy output.
+)doc");
+
+REGISTER_XLA_OP(Name("DummyReadResource"), DummyReadResourceOp);
+
 class XlaCompilerTest : public ::testing::Test {
  protected:
   void SetUp() override {
@@ -224,5 +285,45 @@ TEST_F(XlaCompilerTest, ConstantOutputs) {
   }
 }
 
+// Tests compilation and execution of a graph that adds two tensors.
+TEST_F(XlaCompilerTest, ResourceManager) {
+  // Builds a graph that calls the dummy resource Op.
+  Scope scope = Scope::NewRootScope().ExitOnError();
+  auto a = ops::_Arg(scope.WithOpName("A"), DT_INT32, 0);
+  auto b = DummyReadResourceCC(scope.WithOpName("B"), a);
+  auto c = ops::_Retval(scope.WithOpName("C"), b.output_, 0);
+  std::unique_ptr<Graph> graph(new Graph(OpRegistry::Global()));
+  TF_ASSERT_OK(scope.ToGraph(graph.get()));
+
+  // Builds a description of the argument.
+  std::vector<XlaCompiler::Argument> args(1);
+  args[0].kind = XlaCompiler::Argument::kParameter;
+  args[0].type = DT_INT32;
+  args[0].shape = TensorShape({2});
+
+  DummyResourceForTest* resource = new DummyResourceForTest();
+
+  // Compiles the graph.
+  auto options = DefaultOptions();
+  std::function<Status(ResourceMgr*)> populate_function =
+      [resource](ResourceMgr* rm) {
+        resource->Ref();
+        return rm->Create(rm->default_container(), "dummy", resource);
+      };
+  options.populate_resource_manager = &populate_function;
+  XlaCompiler compiler(options);
+  auto flr = BuildFunctionLibraryRuntime(compiler);
+
+  EXPECT_EQ(0, resource->Get());
+
+  XlaCompiler::CompilationResult result;
+  TF_ASSERT_OK(compiler.CompileGraph("dummy", std::move(graph), flr.get(), args,
+                                     &result));
+
+  EXPECT_EQ(1, resource->Get());
+
+  resource->Unref();
+}
+
 }  // namespace
 }  // namespace tensorflow
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.cc b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
index dc5a342bcd..53dcdec7a2 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.cc
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
@@ -354,6 +354,10 @@ void XlaOpKernelContext::SetOpHasSideEffects() {
   XlaContext::Get(context_).AddSideEffects();
 }
 
+const XlaCompiler::Options& XlaOpKernelContext::GetCompilerOptions() const {
+  return XlaContext::Get(context_).compiler()->options();
+}
+
 void XlaOpKernelContext::CtxFailure(Status s) { context_->CtxFailure(s); }
 void XlaOpKernelContext::CtxFailureWithWarning(Status s) {
   context_->CtxFailureWithWarning(s);
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.h b/tensorflow/compiler/tf2xla/xla_op_kernel.h
index d214879e3c..60e3b59d32 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.h
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_COMPILER_TF2XLA_XLA_OP_KERNEL_H_
 #define TENSORFLOW_COMPILER_TF2XLA_XLA_OP_KERNEL_H_
 
+#include "tensorflow/compiler/tf2xla/xla_compiler.h"
 #include "tensorflow/compiler/xla/client/computation_builder.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/platform/macros.h"
@@ -182,6 +183,11 @@ class XlaOpKernelContext {
   // Returns the underlying OpKernelContext. Use rarely.
   OpKernelContext* op_kernel_context() const { return context_; }
 
+  // Returns the options passed to the XlaCompiler that is being
+  // run. Used for, e.g., While to inherit options needed for nested
+  // computation.
+  const XlaCompiler::Options& GetCompilerOptions() const;
+
   // TODO(phawkins): find a better home for these helpers.
 
   // Get an XLA lambda to compute Max. This is cached in the
-- 
GitLab


From b657f5a03a7490d961e10851fba193732f5e929c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Mon, 3 Apr 2017 16:45:37 -0800
Subject: [PATCH 0096/1563] Modify the TensorBoard text dashboard so that it
 can support non-scalar string tensors.

If the string tensor passed to the text dashboard is not a scalar, then the data is automatically organized into a table.
Change: 152081823
---
 tensorflow/python/summary/text_summary.py     |  15 +-
 .../python/summary/text_summary_test.py       |  16 +-
 .../tensorboard/plugins/projector/BUILD       |   5 +-
 .../tensorboard/plugins/text/text_plugin.py   | 147 +++++++++-
 .../plugins/text/text_plugin_test.py          | 268 ++++++++++++++++--
 5 files changed, 411 insertions(+), 40 deletions(-)

diff --git a/tensorflow/python/summary/text_summary.py b/tensorflow/python/summary/text_summary.py
index 82dee45d26..52bc913b2a 100644
--- a/tensorflow/python/summary/text_summary.py
+++ b/tensorflow/python/summary/text_summary.py
@@ -34,12 +34,17 @@ def text_summary(name, tensor, collections=None):
   """Summarizes textual data.
 
   Text data summarized via this plugin will be visible in the Text Dashboard
-  in TensorBoard.
+  in TensorBoard. The standard TensorBoard Text Dashboard will render markdown
+  in the strings, and will automatically organize 1d and 2d tensors into tables.
+  If a tensor with more than 2 dimensions is provided, a 2d subarray will be
+  displayed along with a warning message. (Note that this behavior is not
+  intrinsic to the text summary api, but rather to the default TensorBoard text
+  plugin.)
 
   Args:
     name: A name for the generated node. Will also serve as a series name in
       TensorBoard.
-    tensor: a scalar string-type Tensor to summarize.
+    tensor: a string-type Tensor to summarize.
     collections: Optional list of ops.GraphKeys.  The collections to add the
       summary to.  Defaults to [_ops.GraphKeys.SUMMARIES]
 
@@ -49,16 +54,12 @@ def text_summary(name, tensor, collections=None):
     type `string` which contains `Summary` protobufs.
 
   Raises:
-    ValueError: If tensor has the wrong shape or type.
+    ValueError: If tensor has the wrong type.
   """
   if tensor.dtype != dtypes.string:
     raise ValueError("Expected tensor %s to have dtype string, got %s" %
                      (tensor.name, tensor.dtype))
 
-  if tensor.shape.ndims != 0:
-    raise ValueError("Expected tensor %s to be scalar, has shape %s" %
-                     (tensor.name, tensor.shape))
-
   t_summary = tensor_summary(name, tensor, collections=collections)
   text_assets = plugin_asset.get_plugin_asset(TextSummaryPluginAsset)
   text_assets.register_tensor(t_summary.op.name)
diff --git a/tensorflow/python/summary/text_summary_test.py b/tensorflow/python/summary/text_summary_test.py
index 69739573c1..31009702ca 100644
--- a/tensorflow/python/summary/text_summary_test.py
+++ b/tensorflow/python/summary/text_summary_test.py
@@ -40,17 +40,19 @@ class TextPluginTest(test_util.TensorFlowTestCase):
         num = array_ops.constant(1)
         text_summary.text_summary("foo", num)
 
-      with self.assertRaises(ValueError):
-        arr = array_ops.constant(["one", "two", "three"])
-        text_summary.text_summary("foo", arr)
+      # The API accepts vectors.
+      arr = array_ops.constant(["one", "two", "three"])
+      summ = text_summary.text_summary("foo", arr)
+      self.assertEqual(summ.op.type, "TensorSummary")
 
+      # the API accepts scalars
       summ = text_summary.text_summary("foo", array_ops.constant("one"))
       self.assertEqual(summ.op.type, "TensorSummary")
 
-      text_summary.text_summary("bar", array_ops.constant("2"), collections=[])
-      summaries = framework_ops.get_collection(
-          framework_ops.GraphKeys.SUMMARIES)
-      self.assertEqual(len(summaries), 1)
+  def testTextSummaryCollections(self):
+    text_summary.text_summary("bar", array_ops.constant("2"), collections=[])
+    summaries = framework_ops.get_collection(framework_ops.GraphKeys.SUMMARIES)
+    self.assertEqual(len(summaries), 0)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/tensorboard/plugins/projector/BUILD b/tensorflow/tensorboard/plugins/projector/BUILD
index bc26a9bd67..b4ed26c206 100644
--- a/tensorflow/tensorboard/plugins/projector/BUILD
+++ b/tensorflow/tensorboard/plugins/projector/BUILD
@@ -13,10 +13,7 @@ py_library(
     name = "projector_plugin",
     srcs = ["projector_plugin.py"],
     srcs_version = "PY2AND3",
-    visibility = [
-        "//learning/vis/projector:__subpackages__",
-        "//tensorflow:internal",
-    ],
+    visibility = ["//tensorflow:internal"],
     deps = [
         ":protos_all_py",
         "//tensorflow/python:errors",
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin.py b/tensorflow/tensorboard/plugins/text/text_plugin.py
index a87949877b..2c0620f564 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin.py
@@ -19,6 +19,12 @@ from __future__ import division
 from __future__ import print_function
 
 import json
+import textwrap
+
+# pylint: disable=g-bad-import-order
+# Necessary for an internal test with special behavior for numpy.
+import numpy as np
+# pylint: enable=g-bad-import-order
 
 import bleach
 # pylint: disable=g-bad-import-order
@@ -27,6 +33,7 @@ import markdown
 # pylint: enable=g-bad-import-order
 from werkzeug import wrappers
 
+from tensorflow.python.framework import tensor_util
 from tensorflow.python.summary import text_summary
 from tensorflow.tensorboard.backend import http_util
 from tensorflow.tensorboard.plugins import base_plugin
@@ -68,6 +75,10 @@ ALLOWED_TAGS = [
 
 ALLOWED_ATTRIBUTES = {'a': ['href', 'title'], 'img': ['src', 'title', 'alt']}
 
+WARNING_TEMPLATE = textwrap.dedent("""\
+  **Warning:** This text summary contained data of dimensionality %d, but only \
+  2d tables are supported. Showing a 2d slice of the data instead.""")
+
 
 def markdown_and_sanitize(markdown_string):
   """Takes a markdown string and converts it into sanitized html.
@@ -87,6 +98,7 @@ def markdown_and_sanitize(markdown_string):
   # Convert to utf-8 because we get a bytearray in python3
   if not isinstance(markdown_string, str):
     markdown_string = markdown_string.decode('utf-8')
+
   string_html = markdown.markdown(
       markdown_string, extensions=['markdown.extensions.tables'])
   string_sanitized = bleach.clean(
@@ -94,12 +106,145 @@ def markdown_and_sanitize(markdown_string):
   return string_sanitized
 
 
+def make_table_row(contents, tag='td'):
+  """Given an iterable of string contents, make a table row.
+
+  Args:
+    contents: An iterable yielding strings.
+    tag: The tag to place contents in. Defaults to 'td', you might want 'th'.
+
+  Returns:
+    A string containing the content strings, organized into a table row.
+
+  Example: make_table_row(['one', 'two', 'three']) == '''
+  <tr>
+  <td>one</td>
+  <td>two</td>
+  <td>three</td>
+  </tr>'''
+  """
+  columns = ('<%s>%s</%s>\n' % (tag, s, tag) for s in contents)
+  return '<tr>\n' + ''.join(columns) + '</tr>\n'
+
+
+def make_table(contents, headers=None):
+  """Given a numpy ndarray of strings, concatenate them into a html table.
+
+  Args:
+    contents: A np.ndarray of strings. May be 1d or 2d. In the 1d case, the
+      table is laid out vertically (i.e. row-major).
+    headers: A np.ndarray or list of string header names for the table.
+
+  Returns:
+    A string containing all of the content strings, organized into a table.
+
+  Raises:
+    ValueError: If contents is not a np.ndarray.
+    ValueError: If contents is not 1d or 2d.
+    ValueError: If contents is empty.
+    ValueError: If headers is present and not a list, tuple, or ndarray.
+    ValueError: If headers is not 1d.
+    ValueError: If number of elements in headers does not correspond to number
+      of columns in contents.
+  """
+  if not isinstance(contents, np.ndarray):
+    raise ValueError('make_table contents must be a numpy ndarray')
+
+  if contents.ndim not in [1, 2]:
+    raise ValueError('make_table requires a 1d or 2d numpy array, was %dd' %
+                     contents.ndim)
+
+  if headers:
+    if isinstance(headers, list) or isinstance(headers, tuple):
+      headers = np.array(headers)
+    if not isinstance(headers, np.ndarray):
+      raise ValueError('Could not convert headers %s into np.ndarray' % headers)
+    if headers.ndim != 1:
+      raise ValueError('Headers must be 1d, is %dd' % headers.ndim)
+    expected_n_columns = contents.shape[1] if contents.ndim == 2 else 1
+    if headers.shape[0] != expected_n_columns:
+      raise ValueError('Number of headers %d must match number of columns %d' %
+                       (headers.shape[0], expected_n_columns))
+    header = '<thead>\n%s</thead>\n' % make_table_row(headers, tag='th')
+  else:
+    header = ''
+
+  n_rows = contents.shape[0]
+  if contents.ndim == 1:
+    # If it's a vector, we need to wrap each element in a new list, otherwise
+    # we would turn the string itself into a row (see test code)
+    rows = (make_table_row([contents[i]]) for i in range(n_rows))
+  else:
+    rows = (make_table_row(contents[i, :]) for i in range(n_rows))
+
+  return '<table>\n%s<tbody>\n%s</tbody>\n</table>' % (header, ''.join(rows))
+
+
+def reduce_to_2d(arr):
+  """Given a np.npdarray with nDims > 2, reduce it to 2d.
+
+  It does this by selecting the zeroth coordinate for every dimension greater
+  than two.
+
+  Args:
+    arr: a numpy ndarray of dimension at least 2.
+
+  Returns:
+    A two-dimensional subarray from the input array.
+
+  Raises:
+    ValueError: If the argument is not a numpy ndarray, or the dimensionality
+      is too low.
+  """
+  if not isinstance(arr, np.ndarray):
+    raise ValueError('reduce_to_2d requires a numpy.ndarray')
+
+  ndims = len(arr.shape)
+  if ndims < 2:
+    raise ValueError('reduce_to_2d requires an array of dimensionality >=2')
+  # slice(None) is equivalent to `:`, so we take arr[0,0,...0,:,:]
+  slices = ([0] * (ndims - 2)) + [slice(None), slice(None)]
+  return arr[slices]
+
+
+def text_array_to_html(text_arr):
+  """Take a numpy.ndarray containing strings, and convert it into html.
+
+  If the ndarray contains a single scalar string, that string is converted to
+  html via our sanitized markdown parser. If it contains an array of strings,
+  the strings are individually converted to html and then composed into a table
+  using make_table. If the array contains dimensionality greater than 2,
+  all but two of the dimensions are removed, and a warning message is prefixed
+  to the table.
+
+  Args:
+    text_arr: A numpy.ndarray containing strings.
+
+  Returns:
+    The array converted to html.
+  """
+  if not text_arr.shape:
+    # It is a scalar. No need to put it in a table, just apply markdown
+    return markdown_and_sanitize(text_arr.astype(np.dtype(str)).tostring())
+  warning = ''
+  if len(text_arr.shape) > 2:
+    warning = markdown_and_sanitize(WARNING_TEMPLATE % len(text_arr.shape))
+    text_arr = reduce_to_2d(text_arr)
+
+  html_arr = [markdown_and_sanitize(x) for x in text_arr.reshape(-1)]
+  html_arr = np.array(html_arr).reshape(text_arr.shape)
+
+  return warning + make_table(html_arr)
+
+
 def process_string_tensor_event(event):
   """Convert a TensorEvent into a JSON-compatible response."""
+  string_arr = tensor_util.MakeNdarray(event.tensor_proto)
+  html = text_array_to_html(string_arr)
   return {
       'wall_time': event.wall_time,
       'step': event.step,
-      'text': markdown_and_sanitize(event.tensor_proto.string_val[0]),
+      'text': html,
   }
 
 
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin_test.py b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
index f1d06aa4f1..846995b9a9 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
@@ -20,6 +20,7 @@ from __future__ import print_function
 
 import os
 import textwrap
+import numpy as np
 
 from tensorflow.python.client import session
 from tensorflow.python.framework import dtypes
@@ -31,7 +32,7 @@ from tensorflow.python.summary import text_summary
 from tensorflow.tensorboard.backend.event_processing import event_multiplexer
 from tensorflow.tensorboard.plugins.text import text_plugin
 
-GEMS = ["garnet", "amethyst", "pearl", "steven"]
+GEMS = ['garnet', 'amethyst', 'pearl', 'steven']
 
 
 class TextPluginTest(test.TestCase):
@@ -52,10 +53,12 @@ class TextPluginTest(test.TestCase):
   def generate_testdata(self):
     ops.reset_default_graph()
     sess = session.Session()
-    placeholder = array_ops.placeholder(dtypes.string, shape=[])
-    summary_tensor = text_summary.text_summary("message", placeholder)
+    placeholder = array_ops.placeholder(dtypes.string)
+    summary_tensor = text_summary.text_summary('message', placeholder)
 
-    run_names = ["fry", "leela"]
+    vector_summary = text_summary.text_summary('vector', placeholder)
+
+    run_names = ['fry', 'leela']
     for run_name in run_names:
       subdir = os.path.join(self.logdir, run_name)
       writer = summary.FileWriter(subdir)
@@ -63,38 +66,62 @@ class TextPluginTest(test.TestCase):
 
       step = 0
       for gem in GEMS:
-        message = run_name + " *loves* " + gem
+        message = run_name + ' *loves* ' + gem
         feed_dict = {placeholder: message}
         summ = sess.run(summary_tensor, feed_dict=feed_dict)
         writer.add_summary(summ, global_step=step)
         step += 1
+
+      vector_message = ['one', 'two', 'three', 'four']
+      summ = sess.run(vector_summary, feed_dict={placeholder: vector_message})
+      writer.add_summary(summ)
       writer.close()
 
   def testIndex(self):
     index = self.plugin.index_impl()
     self.assertEqual(index, {
-        "fry": ["message"],
-        "leela": ["message"],
+        'fry': ['message', 'vector'],
+        'leela': ['message', 'vector'],
     })
 
   def testText(self):
-    fry = self.plugin.text_impl("fry", "message")
-    leela = self.plugin.text_impl("leela", "message")
+    fry = self.plugin.text_impl('fry', 'message')
+    leela = self.plugin.text_impl('leela', 'message')
     self.assertEqual(len(fry), 4)
     self.assertEqual(len(leela), 4)
     for i in range(4):
-      self.assertEqual(fry[i]["step"], i)
-      self.assertConverted(fry[i]["text"], "fry *loves* " + GEMS[i])
-      self.assertEqual(leela[i]["step"], i)
-      self.assertConverted(leela[i]["text"], "leela *loves* " + GEMS[i])
+      self.assertEqual(fry[i]['step'], i)
+      self.assertConverted(fry[i]['text'], 'fry *loves* ' + GEMS[i])
+      self.assertEqual(leela[i]['step'], i)
+      self.assertConverted(leela[i]['text'], 'leela *loves* ' + GEMS[i])
+
+    table = self.plugin.text_impl('fry', 'vector')[0]['text']
+    self.assertEqual(table,
+                     textwrap.dedent("""\
+      <table>
+      <tbody>
+      <tr>
+      <td><p>one</p></td>
+      </tr>
+      <tr>
+      <td><p>two</p></td>
+      </tr>
+      <tr>
+      <td><p>three</p></td>
+      </tr>
+      <tr>
+      <td><p>four</p></td>
+      </tr>
+      </tbody>
+      </table>"""))
 
   def assertTextConverted(self, actual, expected):
     self.assertEqual(text_plugin.markdown_and_sanitize(actual), expected)
 
   def testMarkdownConversion(self):
-    emphasis = "*Italics1* _Italics2_ **bold1** __bold2__"
-    emphasis_converted = ("<p><em>Italics1</em> <em>Italics2</em> "
-                          "<strong>bold1</strong> <strong>bold2</strong></p>")
+    emphasis = '*Italics1* _Italics2_ **bold1** __bold2__'
+    emphasis_converted = ('<p><em>Italics1</em> <em>Italics2</em> '
+                          '<strong>bold1</strong> <strong>bold2</strong></p>')
 
     self.assertEqual(
         text_plugin.markdown_and_sanitize(emphasis), emphasis_converted)
@@ -117,7 +144,7 @@ class TextPluginTest(test.TestCase):
     self.assertEqual(
         text_plugin.markdown_and_sanitize(md_list), md_list_converted)
 
-    link = "[TensorFlow](http://tensorflow.org)"
+    link = '[TensorFlow](http://tensorflow.org)'
     link_converted = '<p><a href="http://tensorflow.org">TensorFlow</a></p>'
     self.assertEqual(text_plugin.markdown_and_sanitize(link), link_converted)
 
@@ -159,11 +186,210 @@ class TextPluginTest(test.TestCase):
     self.assertEqual(text_plugin.markdown_and_sanitize(dangerous), sanitized)
 
     dangerous = textwrap.dedent("""\
-    hello <a name="n"
-    href="javascript:alert('xss')">*you*</a>""")
-    sanitized = "<p>hello <a><em>you</em></a></p>"
+    hello <a name='n'
+    href='javascript:alert('xss')'>*you*</a>""")
+    sanitized = '<p>hello <a><em>you</em></a></p>'
     self.assertEqual(text_plugin.markdown_and_sanitize(dangerous), sanitized)
 
+  def testTableGeneration(self):
+    array2d = np.array([['one', 'two'], ['three', 'four']])
+    expected_table = textwrap.dedent("""\
+    <table>
+    <tbody>
+    <tr>
+    <td>one</td>
+    <td>two</td>
+    </tr>
+    <tr>
+    <td>three</td>
+    <td>four</td>
+    </tr>
+    </tbody>
+    </table>""")
+    self.assertEqual(text_plugin.make_table(array2d), expected_table)
+
+    expected_table_with_headers = textwrap.dedent("""\
+    <table>
+    <thead>
+    <tr>
+    <th>c1</th>
+    <th>c2</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+    <td>one</td>
+    <td>two</td>
+    </tr>
+    <tr>
+    <td>three</td>
+    <td>four</td>
+    </tr>
+    </tbody>
+    </table>""")
+
+    actual_with_headers = text_plugin.make_table(array2d, headers=['c1', 'c2'])
+    self.assertEqual(actual_with_headers, expected_table_with_headers)
+
+    array_1d = np.array(['one', 'two', 'three', 'four', 'five'])
+    expected_1d = textwrap.dedent("""\
+    <table>
+    <tbody>
+    <tr>
+    <td>one</td>
+    </tr>
+    <tr>
+    <td>two</td>
+    </tr>
+    <tr>
+    <td>three</td>
+    </tr>
+    <tr>
+    <td>four</td>
+    </tr>
+    <tr>
+    <td>five</td>
+    </tr>
+    </tbody>
+    </table>""")
+    self.assertEqual(text_plugin.make_table(array_1d), expected_1d)
+
+    expected_1d_with_headers = textwrap.dedent("""\
+    <table>
+    <thead>
+    <tr>
+    <th>X</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+    <td>one</td>
+    </tr>
+    <tr>
+    <td>two</td>
+    </tr>
+    <tr>
+    <td>three</td>
+    </tr>
+    <tr>
+    <td>four</td>
+    </tr>
+    <tr>
+    <td>five</td>
+    </tr>
+    </tbody>
+    </table>""")
+    actual_1d_with_headers = text_plugin.make_table(array_1d, headers=['X'])
+    self.assertEqual(actual_1d_with_headers, expected_1d_with_headers)
+
+  def testMakeTableExceptions(self):
+    # Verify that contents is being type-checked and shape-checked.
+    with self.assertRaises(ValueError):
+      text_plugin.make_table([])
+
+    with self.assertRaises(ValueError):
+      text_plugin.make_table('foo')
+
+    with self.assertRaises(ValueError):
+      invalid_shape = np.full((3, 3, 3), 'nope', dtype=np.dtype('S3'))
+      text_plugin.make_table(invalid_shape)
+
+    # Test headers exceptions in 2d array case.
+    test_array = np.full((3, 3), 'foo', dtype=np.dtype('S3'))
+    with self.assertRaises(ValueError):
+      # Headers is wrong type.
+      text_plugin.make_table(test_array, headers='foo')
+    with self.assertRaises(ValueError):
+      # Too many headers.
+      text_plugin.make_table(test_array, headers=['foo', 'bar', 'zod', 'zoink'])
+    with self.assertRaises(ValueError):
+      # headers is 2d
+      text_plugin.make_table(test_array, headers=test_array)
+
+    # Also make sure the column counting logic works in the 1d array case.
+    test_array = np.array(['foo', 'bar', 'zod'])
+    with self.assertRaises(ValueError):
+      # Too many headers.
+      text_plugin.make_table(test_array, headers=test_array)
+
+  def test_reduce_to_2d(self):
+
+    def make_range_array(dim):
+      """Produce an incrementally increasing multidimensional array.
+
+      Args:
+        dim: the number of dimensions for the array
+
+      Returns:
+        An array of increasing integer elements, with dim dimensions and size
+        two in each dimension.
+
+      Example: rangeArray(2) results in [[0,1],[2,3]].
+      """
+      return np.array(range(2**dim)).reshape([2] * dim)
+
+    for i in range(2, 5):
+      actual = text_plugin.reduce_to_2d(make_range_array(i))
+      expected = make_range_array(2)
+      np.testing.assert_array_equal(actual, expected)
+
+  def test_text_array_to_html(self):
+
+    convert = text_plugin.text_array_to_html
+    scalar = np.array('foo')
+    scalar_expected = '<p>foo</p>'
+    self.assertEqual(convert(scalar), scalar_expected)
+
+    vector = np.array(['foo', 'bar'])
+    vector_expected = textwrap.dedent("""\
+      <table>
+      <tbody>
+      <tr>
+      <td><p>foo</p></td>
+      </tr>
+      <tr>
+      <td><p>bar</p></td>
+      </tr>
+      </tbody>
+      </table>""")
+    self.assertEqual(convert(vector), vector_expected)
+
+    d2 = np.array([['foo', 'bar'], ['zoink', 'zod']])
+    d2_expected = textwrap.dedent("""\
+      <table>
+      <tbody>
+      <tr>
+      <td><p>foo</p></td>
+      <td><p>bar</p></td>
+      </tr>
+      <tr>
+      <td><p>zoink</p></td>
+      <td><p>zod</p></td>
+      </tr>
+      </tbody>
+      </table>""")
+    self.assertEqual(convert(d2), d2_expected)
+
+    d3 = np.array([[['foo', 'bar'], ['zoink', 'zod']], [['FOO', 'BAR'],
+                                                        ['ZOINK', 'ZOD']]])
+
+    warning = text_plugin.markdown_and_sanitize(text_plugin.WARNING_TEMPLATE %
+                                                3)
+    d3_expected = warning + textwrap.dedent("""\
+      <table>
+      <tbody>
+      <tr>
+      <td><p>foo</p></td>
+      <td><p>bar</p></td>
+      </tr>
+      <tr>
+      <td><p>zoink</p></td>
+      <td><p>zod</p></td>
+      </tr>
+      </tbody>
+      </table>""")
+    self.assertEqual(convert(d3), d3_expected)
+
 
-if __name__ == "__main__":
+if __name__ == '__main__':
   test.main()
-- 
GitLab


From 7a825ba3d11f1c900b628b452e0d92ef45f1aacc Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Mon, 3 Apr 2017 17:31:49 -0800
Subject: [PATCH 0097/1563] Add function test to tfcompile.

This will serve as a regression test for future CLs changing how
functions are instantiated in tfcompile.
Change: 152085567
---
 tensorflow/compiler/aot/tests/BUILD              | 11 +++++++++++
 .../compiler/aot/tests/make_test_graphs.py       | 16 ++++++++++++++--
 .../aot/tests/test_graph_tffunction.config.pbtxt | 16 ++++++++++++++++
 tensorflow/compiler/aot/tests/tfcompile_test.cc  | 16 ++++++++++++++++
 4 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 tensorflow/compiler/aot/tests/test_graph_tffunction.config.pbtxt

diff --git a/tensorflow/compiler/aot/tests/BUILD b/tensorflow/compiler/aot/tests/BUILD
index ecb071a416..59d13e5393 100644
--- a/tensorflow/compiler/aot/tests/BUILD
+++ b/tensorflow/compiler/aot/tests/BUILD
@@ -51,6 +51,7 @@ genrule(
         "test_graph_tfgather.pb",
         "test_graph_tfmatmul.pb",
         "test_graph_tfmatmulandadd.pb",
+        "test_graph_tffunction.pb",
     ],
     cmd = "$(location :make_test_graphs) --out_dir $(@D)",
     tags = ["manual"],
@@ -114,6 +115,15 @@ tf_library(
     tags = ["manual"],
 )
 
+tf_library(
+    name = "test_graph_tffunction",
+    testonly = 1,
+    config = "test_graph_tffunction.config.pbtxt",
+    cpp_class = "FunctionComp",
+    graph = "test_graph_tffunction.pb",
+    tags = ["manual"],
+)
+
 cc_test(
     name = "tfcompile_test",
     srcs = ["tfcompile_test.cc"],
@@ -122,6 +132,7 @@ cc_test(
         ":test_graph_tfadd",
         ":test_graph_tfadd_with_ckpt",
         ":test_graph_tfadd_with_ckpt_saver",
+        ":test_graph_tffunction",
         ":test_graph_tfgather",
         ":test_graph_tfmatmul",
         ":test_graph_tfmatmulandadd",
diff --git a/tensorflow/compiler/aot/tests/make_test_graphs.py b/tensorflow/compiler/aot/tests/make_test_graphs.py
index 2a2d13dc49..6981cb6757 100644
--- a/tensorflow/compiler/aot/tests/make_test_graphs.py
+++ b/tensorflow/compiler/aot/tests/make_test_graphs.py
@@ -25,6 +25,7 @@ from tensorflow.core.protobuf import saver_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import function
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -95,6 +96,17 @@ def tfmatmulandadd(_):
   math_ops.add(x, y, name='x_y_sum')
 
 
+def tffunction(_):
+
+  @function.Defun(dtypes.int32, dtypes.int32)
+  def test_func(a, b):
+    return a + b
+
+  x = constant_op.constant([1], name='x_const')
+  y = constant_op.constant([2], name='y_const')
+  test_func(x, y, name='func_call')  # pylint: disable=unexpected-keyword-arg
+
+
 def write_graph(build_graph, out_dir):
   """Build a graph using build_graph and write it out."""
   g = ops.Graph()
@@ -112,6 +124,7 @@ def main(_):
   write_graph(tfgather, FLAGS.out_dir)
   write_graph(tfmatmul, FLAGS.out_dir)
   write_graph(tfmatmulandadd, FLAGS.out_dir)
+  write_graph(tffunction, FLAGS.out_dir)
 
 
 if __name__ == '__main__':
@@ -121,7 +134,6 @@ if __name__ == '__main__':
       '--out_dir',
       type=str,
       default='',
-      help='Output directory for graphs, checkpoints and savers.'
-  )
+      help='Output directory for graphs, checkpoints and savers.')
   FLAGS, unparsed = parser.parse_known_args()
   app.run(main=main, argv=[sys.argv[0]] + unparsed)
diff --git a/tensorflow/compiler/aot/tests/test_graph_tffunction.config.pbtxt b/tensorflow/compiler/aot/tests/test_graph_tffunction.config.pbtxt
new file mode 100644
index 0000000000..eb9c1cacb7
--- /dev/null
+++ b/tensorflow/compiler/aot/tests/test_graph_tffunction.config.pbtxt
@@ -0,0 +1,16 @@
+# Text form of tensorflow.tfcompile.Config proto.
+feed {
+  id { node_name: "x_const" }
+  shape {
+    dim { size: 1 }
+  }
+}
+feed {
+  id { node_name: "y_const" }
+  shape {
+    dim { size: 1 }
+  }
+}
+fetch {
+  id { node_name: "func_call" }
+}
diff --git a/tensorflow/compiler/aot/tests/tfcompile_test.cc b/tensorflow/compiler/aot/tests/tfcompile_test.cc
index f57d2859df..76343b9752 100644
--- a/tensorflow/compiler/aot/tests/tfcompile_test.cc
+++ b/tensorflow/compiler/aot/tests/tfcompile_test.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/compiler/aot/tests/test_graph_tfadd.h"
 #include "tensorflow/compiler/aot/tests/test_graph_tfadd_with_ckpt.h"
 #include "tensorflow/compiler/aot/tests/test_graph_tfadd_with_ckpt_saver.h"
+#include "tensorflow/compiler/aot/tests/test_graph_tffunction.h"
 #include "tensorflow/compiler/aot/tests/test_graph_tfgather.h"
 #include "tensorflow/compiler/aot/tests/test_graph_tfmatmul.h"
 #include "tensorflow/compiler/aot/tests/test_graph_tfmatmulandadd.h"
@@ -376,6 +377,21 @@ TEST(TFCompileTest, MatMulAndAdd1) {
   }
 }
 
+TEST(TFCompileTest, Function) {
+  // The function is equivalent to an addition
+  FunctionComp add_fn;
+  EXPECT_EQ(add_fn.arg0_data(), add_fn.args()[0]);
+  EXPECT_EQ(add_fn.arg1_data(), add_fn.args()[1]);
+
+  add_fn.arg0() = 1;
+  add_fn.arg1() = 2;
+  EXPECT_TRUE(add_fn.Run());
+  EXPECT_EQ(add_fn.error_msg(), "");
+  EXPECT_EQ(add_fn.result0(), 3);
+  EXPECT_EQ(add_fn.result0_data()[0], 3);
+  EXPECT_EQ(add_fn.result0_data(), add_fn.results()[0]);
+}
+
 }  // namespace
 }  // namespace tfcompile
 }  // namespace tensorflow
-- 
GitLab


From c3d99052ec49bb219f5e29567846d3af391d7b28 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 17:41:28 -0800
Subject: [PATCH 0098/1563] Change the state_is_tuple default to True for the
 remaining 3 cells: CoupledInputForgetGateLSTMCell, GridLSTMCell and
 AttentionCellWrapper. Change: 152086191

---
 tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py | 2 +-
 tensorflow/contrib/rnn/python/ops/rnn_cell.py               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
index d3af4de721..3fc78d4253 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
@@ -66,7 +66,7 @@ class RNNCellTest(test.TestCase):
         x = array_ops.zeros([batch_size, input_size])
         m = array_ops.zeros([batch_size, state_size])
         output, state = rnn_cell.CoupledInputForgetGateLSTMCell(
-            num_units=num_units, forget_bias=1.0)(x, m)
+            num_units=num_units, forget_bias=1.0, state_is_tuple=False)(x, m)
         sess.run([variables.global_variables_initializer()])
         res = sess.run([output, state], {
             x.name:
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index a83e954053..4eb2966ef2 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -109,7 +109,7 @@ class CoupledInputForgetGateLSTMCell(core_rnn_cell.RNNCell):
   def __init__(self, num_units, use_peepholes=False,
                initializer=None, num_proj=None, proj_clip=None,
                num_unit_shards=1, num_proj_shards=1,
-               forget_bias=1.0, state_is_tuple=False,
+               forget_bias=1.0, state_is_tuple=True,
                activation=math_ops.tanh, reuse=None):
     """Initialize the parameters for an LSTM cell.
 
@@ -457,7 +457,7 @@ class GridLSTMCell(core_rnn_cell.RNNCell):
                start_freqindex_list=None,
                end_freqindex_list=None,
                couple_input_forget_gates=False,
-               state_is_tuple=False,
+               state_is_tuple=True,
                reuse=None):
     """Initialize the parameters for an LSTM cell.
 
@@ -1043,7 +1043,7 @@ class AttentionCellWrapper(core_rnn_cell.RNNCell):
   """
 
   def __init__(self, cell, attn_length, attn_size=None, attn_vec_size=None,
-               input_size=None, state_is_tuple=False, reuse=None):
+               input_size=None, state_is_tuple=True, reuse=None):
     """Create a cell with attention.
 
     Args:
-- 
GitLab


From a02a3318ccc228638a1bda1d5ad6631cf780b329 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 3 Apr 2017 18:41:43 -0800
Subject: [PATCH 0099/1563] Fix the build in contrib/factorization. Change:
 152089511

---
 tensorflow/contrib/factorization/BUILD | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index c3fdc47242..c6b5da0f7d 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -161,12 +161,13 @@ tf_py_test(
     ],
 )
 
-tf_py_test(
-    name = "factorization_ops_test_utils",
+py_library(
+    name = "factorization_ops_test_utils_py",
     srcs = [
         "python/ops/factorization_ops_test_utils.py",
     ],
-    additional_deps = [
+    srcs_version = "PY2AND3",
+    deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework",
@@ -181,7 +182,7 @@ tf_py_test(
     additional_deps = [
         ":factorization_py",
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
-        ":factorization_ops_test_utils",
+        ":factorization_ops_test_utils_py",
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
-- 
GitLab


From 73be7de2fa877b1354bac0a969c05c98fb0bdc8f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 01:01:39 -0800
Subject: [PATCH 0100/1563] Enable windows cmake build log print all the time.
 Change: 152109123

---
 tensorflow/tools/ci_build/windows/cpu/cmake/run_build.bat | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/tools/ci_build/windows/cpu/cmake/run_build.bat b/tensorflow/tools/ci_build/windows/cpu/cmake/run_build.bat
index 3ebc591f48..07ad70dd34 100644
--- a/tensorflow/tools/ci_build/windows/cpu/cmake/run_build.bat
+++ b/tensorflow/tools/ci_build/windows/cpu/cmake/run_build.bat
@@ -37,5 +37,4 @@ SET MSBUILD_EXE="C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe"
 %CMAKE_EXE% %CMAKE_DIR% -A x64 -DSWIG_EXECUTABLE=%SWIG_EXE% -DPYTHON_EXECUTABLE=%PY_EXE% -DCMAKE_BUILD_TYPE=Release -DPYTHON_LIBRARIES=%PY_LIB% -Dtensorflow_BUILD_PYTHON_TESTS=%BUILD_PYTHON_TESTS% -Dtensorflow_BUILD_CC_TESTS=%BUILD_CC_TESTS%
 
 :: Run msbuild in the resulting VS project files to build a pip package.
-%MSBUILD_EXE% /p:Configuration=Release /maxcpucount:32 tf_python_build_pip_package.vcxproj  > msbuild.log 2>&1
-if %errorlevel% neq 0 cat msbuild.log else echo "Successfully build pip package."
+%MSBUILD_EXE% /p:Configuration=Release /maxcpucount:32 tf_python_build_pip_package.vcxproj
-- 
GitLab


From 91685c11338f9f6821baf887388d1d93e1818f96 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Tue, 4 Apr 2017 03:57:21 -0800
Subject: [PATCH 0101/1563] tfdbg: exclude some nodes with apparently
 uninitialized tensors in testDebugTrainingDynamicRNNWorks Change: 152119214

---
 .../python/debug/lib/session_debug_testlib.py    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/debug/lib/session_debug_testlib.py b/tensorflow/python/debug/lib/session_debug_testlib.py
index 511ddb1673..5acc1962cb 100644
--- a/tensorflow/python/debug/lib/session_debug_testlib.py
+++ b/tensorflow/python/debug/lib/session_debug_testlib.py
@@ -484,9 +484,19 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
       sess.run(variables.global_variables_initializer())
 
       run_options = config_pb2.RunOptions(output_partition_graphs=True)
-      debug_utils.watch_graph(run_options,
-                              sess.graph,
-                              debug_urls=self._debug_urls())
+      if any(url.startswith("grpc://") for url in self._debug_urls()):
+        debug_utils.watch_graph_with_blacklists(
+            run_options,
+            sess.graph,
+            node_name_regex_blacklist="(.*rnn/while/.*|.*TensorArray.*)",
+            debug_urls=self._debug_urls())
+        # b/36870549: Nodes with these name patterns need to be excluded from
+        # tfdbg in order to prevent MSAN warnings of uninitialized Tensors
+        # under the grpc:// debug URL scheme.
+      else:
+        debug_utils.watch_graph(
+            run_options, sess.graph, debug_urls=self._debug_urls())
+
       run_metadata = config_pb2.RunMetadata()
       sess.run(train_op, feed_dict={concat_inputs: input_values},
                options=run_options, run_metadata=run_metadata)
-- 
GitLab


From ac3c7686b9103d2b599650c073f9ac9d474559e4 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Tue, 4 Apr 2017 06:26:06 -0800
Subject: [PATCH 0102/1563] [TF:XLA] Failures from
 ComputationBuilder::IsConstant() and ComputationBuilder::ComputeConstant()
 should not be persistent.

The reason to note failures via first_error_ is so that most methods can defer failure reporting until Build() time. However this makes no sense for methods such as ComputeConstant() that return a Status already -- such methods can just return their errors directly without "polluting" other callers.
Change: 152129004
---
 tensorflow/compiler/xla/client/computation_builder.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tensorflow/compiler/xla/client/computation_builder.cc b/tensorflow/compiler/xla/client/computation_builder.cc
index 88efd87d1c..22a7068146 100644
--- a/tensorflow/compiler/xla/client/computation_builder.cc
+++ b/tensorflow/compiler/xla/client/computation_builder.cc
@@ -1229,8 +1229,7 @@ StatusOr<bool> ComputationBuilder::IsConstant(
   VLOG(2) << "done with request";
 
   if (!s.ok()) {
-    NoteError(s);
-    return first_error_;
+    return s;
   }
   return response.is_constant();
 }
@@ -1255,8 +1254,7 @@ StatusOr<std::unique_ptr<GlobalData>> ComputationBuilder::ComputeConstant(
   VLOG(2) << "done with request";
 
   if (!s.ok()) {
-    NoteError(s);
-    return first_error_;
+    return s;
   }
 
   TF_RET_CHECK(response.output().handle() != 0);
-- 
GitLab


From af21dee78f19bc88b058b387c2c4042395857e9b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 06:48:56 -0800
Subject: [PATCH 0103/1563] Adds alt text for images of equations in mnist
 beginners tutorial. Change: 152130650

---
 tensorflow/docs_src/get_started/mnist/beginners.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/docs_src/get_started/mnist/beginners.md b/tensorflow/docs_src/get_started/mnist/beginners.md
index f6d6b230b3..b9a85f3f67 100644
--- a/tensorflow/docs_src/get_started/mnist/beginners.md
+++ b/tensorflow/docs_src/get_started/mnist/beginners.md
@@ -208,7 +208,8 @@ the \\(x\\)s, add a bias, and then apply softmax.
 If we write that out as equations, we get:
 
 <div style="width:52%; margin-left:25%; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/softmax-regression-scalarequation.png">
+<img style="width:100%" src="../../images/softmax-regression-scalarequation.png"
+   alt="[y1, y2, y3] = softmax(W11*x1 + W12*x2 + W13*x3 + b1,  W21*x1 + W22*x2 + W23*x3 + b2,  W31*x1 + W32*x2 + W33*x3 + b3)">
 </div>
 
 We can "vectorize" this procedure, turning it into a matrix multiplication
@@ -216,7 +217,8 @@ and vector addition. This is helpful for computational efficiency. (It's also
 a useful way to think.)
 
 <div style="width:50%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/softmax-regression-vectorequation.png">
+<img style="width:100%" src="../../images/softmax-regression-vectorequation.png"
+ alt="[y1, y2, y3] = softmax([[W11, W12, W13], [W21, W22, W23], [W31, W32, W33]]*[x1, x2, x3] + [b1, b2, b3])">
 </div>
 
 More compactly, we can just write:
-- 
GitLab


From e2271157ebdab892a822cae7046d2a2d7b5df143 Mon Sep 17 00:00:00 2001
From: Zakaria Haque <zakaria@google.com>
Date: Tue, 4 Apr 2017 07:25:26 -0800
Subject: [PATCH 0104/1563] Adds a function in ModelFnOps to create an
 equivalent EstimatorSpec. This will allow existing custom estimators to
 easily switch to core estimator until we provide better support (like moving
 heads to core). Change: 152133991

---
 tensorflow/contrib/learn/BUILD                |  13 +
 .../learn/python/learn/estimators/model_fn.py |  90 +++++-
 .../python/learn/estimators/model_fn_test.py  | 279 ++++++++++++++++++
 3 files changed, 381 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py

diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD
index 90d4d7e3a8..148f2708c8 100644
--- a/tensorflow/contrib/learn/BUILD
+++ b/tensorflow/contrib/learn/BUILD
@@ -836,6 +836,19 @@ py_test(
     ],
 )
 
+py_test(
+    name = "model_fn_test",
+    size = "small",
+    srcs = ["python/learn/estimators/model_fn_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":learn",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_test_lib",
+        "//third_party/py/numpy",
+    ],
+)
+
 py_test(
     name = "multioutput_test",
     size = "small",
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
index 3c812a4659..6d15f83ef5 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
@@ -25,10 +25,16 @@ import six
 
 from tensorflow.contrib import framework as contrib_framework
 from tensorflow.contrib.framework import get_graph_from_inputs
-
+from tensorflow.contrib.learn.python.learn.estimators import constants
+from tensorflow.contrib.learn.python.learn.estimators import prediction_key
+from tensorflow.python.estimator import model_fn as core_model_fn_lib
+from tensorflow.python.estimator.export import export_output as core_export_lib
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.saved_model import signature_constants
 from tensorflow.python.training import session_run_hook
 
 
@@ -177,3 +183,85 @@ class ModelFnOps(
         training_chief_hooks=training_chief_hooks,
         training_hooks=training_hooks,
         scaffold=scaffold)
+
+  def estimator_spec(self, mode, default_serving_output_alternative_key=None):
+    """Creates an equivalent `EstimatorSpec`.
+
+    Args:
+      mode: One of `ModeKeys`. Specifies if this training, evaluation or
+        prediction.
+      default_serving_output_alternative_key: Required for multiple heads. If
+        you have multiple entries in `output_alternatives` dict (comparable to
+        multiple heads), `EstimatorSpec` requires a default head that will be
+        used if a Servo request does not explicitly mention which head to infer
+        on. Pass the key of the output alternative here that you want to
+        designate as default. A separate ExportOutpout for this default head
+        wil be added to the export_outputs dict with the special key
+        signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY, unless there is
+        already an enry in output_alternatives with this special key.
+
+    Returns:
+      Instance of `EstimatorSpec` that is equivalent to this `ModelFnOps`
+
+    Raises:
+      ValueError: If problem type is unknown.
+    """
+    def _scores(output_tensors):
+      scores = output_tensors.get(prediction_key.PredictionKey.SCORES)
+      if scores is None:
+        scores = output_tensors.get(prediction_key.PredictionKey.PROBABILITIES)
+      return scores
+
+    def _classes(output_tensors):  # pylint: disable=missing-docstring
+      classes = output_tensors.get(prediction_key.PredictionKey.CLASSES)
+      if classes is None:
+        logging.warning(
+            'classes is None, Servo inference will not have class ids.')
+        return None
+      elif classes.dtype != dtypes.string:
+        # Servo classification can only serve string classes
+        logging.warning(
+            'classes is not string, Servo inference will not have class ids.')
+        return None
+
+      return classes
+
+    def _export_output(problem_type, predictions):  # pylint: disable=missing-docstring
+      if problem_type == constants.ProblemType.LINEAR_REGRESSION:
+        return core_export_lib.RegressionOutput(_scores(predictions))
+
+      if (problem_type == constants.ProblemType.CLASSIFICATION or
+          problem_type == constants.ProblemType.LOGISTIC_REGRESSION):
+        return core_export_lib.ClassificationOutput(
+            scores=_scores(predictions), classes=_classes(predictions))
+
+      if problem_type == constants.ProblemType.UNSPECIFIED:
+        return core_export_lib.PredictOutput(predictions)
+
+      raise ValueError('Unknown problem_type=%s' % problem_type)
+
+    # Converts output_alternatives
+    export_outputs_dict = None
+    if self.output_alternatives:
+      output_alternatives = self.output_alternatives
+      # Adds default output_alternative if needed.
+      if (len(output_alternatives) > 1 and
+          signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY not in
+          output_alternatives):
+        output_alternatives = output_alternatives.copy()
+        output_alternatives[
+            signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY] = (
+                output_alternatives[default_serving_output_alternative_key])
+      export_outputs_dict = {key: _export_output(*val) for key, val in
+                             output_alternatives.items()}
+
+    return core_model_fn_lib.EstimatorSpec(
+        mode=mode,
+        predictions=self.predictions,
+        loss=self.loss,
+        train_op=self.train_op,
+        eval_metric_ops=self.eval_metric_ops,
+        export_outputs=export_outputs_dict,
+        training_chief_hooks=self.training_chief_hooks,
+        training_hooks=self.training_hooks,
+        scaffold=self.scaffold)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
new file mode 100644
index 0000000000..fe8b3a1b34
--- /dev/null
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
@@ -0,0 +1,279 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""ModelFnOps tests."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+
+from tensorflow.contrib.learn.python.learn.estimators import constants
+from tensorflow.contrib.learn.python.learn.estimators import model_fn
+from tensorflow.python.client import session
+from tensorflow.python.estimator.export import export_output as core_export_lib
+from tensorflow.python.framework import constant_op
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.platform import test
+from tensorflow.python.saved_model import signature_constants
+from tensorflow.python.training import basic_session_run_hooks
+from tensorflow.python.training import monitored_session
+
+
+class ModelFnopsTest(test.TestCase):
+  """Multi-output tests."""
+
+  def create_predictions(self):
+    probabilities = constant_op.constant([1., 1., 1.])
+    scores = constant_op.constant([1., 2., 3.])
+    classes = constant_op.constant([b"0", b"1", b"2"])
+    return {
+        "probabilities": probabilities,
+        "scores": scores,
+        "classes": classes}
+
+  def create_model_fn_ops(self, predictions, output_alternatives,
+                          mode=model_fn.ModeKeys.INFER):
+
+    return model_fn.ModelFnOps(
+        model_fn.ModeKeys.INFER,
+        predictions=predictions,
+        loss=constant_op.constant([1]),
+        train_op=control_flow_ops.no_op(),
+        eval_metric_ops={"metric_key": (control_flow_ops.no_op(),
+                                        control_flow_ops.no_op())},
+        # zzz
+        training_chief_hooks=[basic_session_run_hooks.StepCounterHook()],
+        training_hooks=[basic_session_run_hooks.StepCounterHook()],
+        output_alternatives=output_alternatives,
+        scaffold=monitored_session.Scaffold())
+
+  def assertEquals_except_export(self, model_fn_ops, estimator_spec):
+    self.assertEqual(model_fn_ops.predictions, estimator_spec.predictions)
+    self.assertEqual(model_fn_ops.loss, estimator_spec.loss)
+    self.assertEqual(model_fn_ops.train_op, estimator_spec.train_op)
+    self.assertEqual(model_fn_ops.eval_metric_ops,
+                     estimator_spec.eval_metric_ops)
+    self.assertEqual(model_fn_ops.training_chief_hooks,
+                     estimator_spec.training_chief_hooks)
+    self.assertEqual(model_fn_ops.training_hooks, estimator_spec.training_hooks)
+    self.assertEqual(model_fn_ops.scaffold, estimator_spec.scaffold)
+
+  def testEstimatorSpec_except_export(self):
+    predictions = self.create_predictions()
+    model_fn_ops = self.create_model_fn_ops(predictions, None)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+  def testEstimatorSpec_export_regression_with_scores(self):
+    predictions = self.create_predictions()
+    output_alternatives = {"regression_head": (
+        constants.ProblemType.LINEAR_REGRESSION, predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      regression_output = estimator_spec.export_outputs["regression_head"]
+      self.assertTrue(isinstance(
+          regression_output, core_export_lib.RegressionOutput))
+      self.assertAllEqual(predictions["scores"].eval(),
+                          regression_output.value.eval())
+
+  def testEstimatorSpec_export_regression_with_probabilities(self):
+    predictions = self.create_predictions()
+    output_alternatives_predictions = predictions.copy()
+    del output_alternatives_predictions["scores"]
+    output_alternatives = {"regression_head": (
+        constants.ProblemType.LINEAR_REGRESSION,
+        output_alternatives_predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      regression_output = estimator_spec.export_outputs["regression_head"]
+      self.assertTrue(isinstance(
+          regression_output, core_export_lib.RegressionOutput))
+      self.assertAllEqual(predictions["probabilities"].eval(),
+                          regression_output.value.eval())
+
+  def testEstimatorSpec_export_classsification(self):
+    predictions = self.create_predictions()
+    output_alternatives = {"classification_head": (
+        constants.ProblemType.CLASSIFICATION, predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      classification_output = estimator_spec.export_outputs[
+          "classification_head"]
+      self.assertTrue(isinstance(classification_output,
+                                 core_export_lib.ClassificationOutput))
+      self.assertAllEqual(predictions["scores"].eval(),
+                          classification_output.scores.eval())
+      self.assertAllEqual(predictions["classes"].eval(),
+                          classification_output.classes.eval())
+
+  def testEstimatorSpec_export_classsification_with_missing_scores(self):
+    predictions = self.create_predictions()
+    output_alternatives_predictions = predictions.copy()
+    del output_alternatives_predictions["scores"]
+    output_alternatives = {"classification_head": (
+        constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      classification_output = estimator_spec.export_outputs[
+          "classification_head"]
+      self.assertTrue(isinstance(classification_output,
+                                 core_export_lib.ClassificationOutput))
+      self.assertAllEqual(predictions["probabilities"].eval(),
+                          classification_output.scores.eval())
+      self.assertAllEqual(predictions["classes"].eval(),
+                          classification_output.classes.eval())
+
+  def testEstimatorSpec_export_classsification_with_missing_scores_proba(self):
+    predictions = self.create_predictions()
+    output_alternatives_predictions = predictions.copy()
+    del output_alternatives_predictions["scores"]
+    del output_alternatives_predictions["probabilities"]
+    output_alternatives = {"classification_head": (
+        constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      classification_output = estimator_spec.export_outputs[
+          "classification_head"]
+      self.assertTrue(isinstance(classification_output,
+                                 core_export_lib.ClassificationOutput))
+      self.assertIsNone(classification_output.scores)
+      self.assertAllEqual(predictions["classes"].eval(),
+                          classification_output.classes.eval())
+
+  def testEstimatorSpec_export_classsification_with_missing_classes(self):
+    predictions = self.create_predictions()
+    output_alternatives_predictions = predictions.copy()
+    del output_alternatives_predictions["classes"]
+    output_alternatives = {"classification_head": (
+        constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      classification_output = estimator_spec.export_outputs[
+          "classification_head"]
+      self.assertTrue(isinstance(classification_output,
+                                 core_export_lib.ClassificationOutput))
+      self.assertAllEqual(predictions["scores"].eval(),
+                          classification_output.scores.eval())
+      self.assertIsNone(classification_output.classes)
+
+  def testEstimatorSpec_export_classsification_with_nonstring_classes(self):
+    predictions = self.create_predictions()
+    output_alternatives_predictions = predictions.copy()
+    output_alternatives_predictions["classes"] = constant_op.constant(
+        [1, 2, 3])
+    output_alternatives = {"classification_head": (
+        constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      classification_output = estimator_spec.export_outputs[
+          "classification_head"]
+      self.assertTrue(isinstance(classification_output,
+                                 core_export_lib.ClassificationOutput))
+      self.assertAllEqual(predictions["scores"].eval(),
+                          classification_output.scores.eval())
+      self.assertIsNone(classification_output.classes)
+
+  def testEstimatorSpec_export_logistic(self):
+    predictions = self.create_predictions()
+    output_alternatives = {"logistic_head": (
+        constants.ProblemType.LOGISTIC_REGRESSION, predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      logistic_output = estimator_spec.export_outputs["logistic_head"]
+      self.assertTrue(isinstance(logistic_output,
+                                 core_export_lib.ClassificationOutput))
+      self.assertAllEqual(predictions["scores"].eval(),
+                          logistic_output.scores.eval())
+      self.assertAllEqual(predictions["classes"].eval(),
+                          logistic_output.classes.eval())
+
+  def testEstimatorSpec_export_unspecified(self):
+    predictions = self.create_predictions()
+    output_alternatives = {"unspecified_head": (
+        constants.ProblemType.UNSPECIFIED, predictions)}
+
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      unspecified_output = estimator_spec.export_outputs["unspecified_head"]
+      self.assertTrue(isinstance(unspecified_output,
+                                 core_export_lib.PredictOutput))
+      self.assertEqual(predictions, unspecified_output.outputs)
+
+  def testEstimatorSpec_export_multihead(self):
+    predictions = self.create_predictions()
+    output_alternatives = {
+        "regression_head": (
+            constants.ProblemType.LINEAR_REGRESSION, predictions),
+        "classification_head": (
+            constants.ProblemType.CLASSIFICATION, predictions)}
+    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+
+    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER,
+                                                 "regression_head")
+    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+
+    with session.Session():
+      regression_output = estimator_spec.export_outputs["regression_head"]
+      self.assertTrue(isinstance(
+          regression_output, core_export_lib.RegressionOutput))
+      self.assertAllEqual(predictions["scores"].eval(),
+                          regression_output.value.eval())
+
+      default_output = estimator_spec.export_outputs[
+          signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY]
+      self.assertTrue(isinstance(default_output,
+                                 core_export_lib.RegressionOutput))
+      self.assertAllEqual(predictions["scores"].eval(),
+                          default_output.value.eval())
+
+if __name__ == "__main__":
+  test.main()
-- 
GitLab


From 9c4124ce9249aa5b2edca441a8e2a01cf6587ddb Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Tue, 4 Apr 2017 08:09:24 -0800
Subject: [PATCH 0105/1563] Fix two ongoing breakages in Jenkins postsubmit
 Change: 152138513

---
 .../contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc  | 2 ++
 tensorflow/contrib/factorization/BUILD                          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
index 8d581b7c99..5ea81e8d9a 100644
--- a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen_main.cc
@@ -26,6 +26,8 @@
 
 using tensorflow::Flag;
 using tensorflow::Flags;
+using tensorflow::int32;
+using tensorflow::string;
 
 int main(int argc, char* argv[]) {
   int32 dense_feature_size = 100;
diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index c6b5da0f7d..7f359bea51 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -35,6 +35,7 @@ tf_custom_op_py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
+        ":factorization_ops_test_utils_py",
         ":gen_clustering_ops",
         ":gen_factorization_ops",
         "//tensorflow/contrib/framework:framework_py",
-- 
GitLab


From 0873aa5725dfb401d32ed73e0d28583e3cdc8069 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Tue, 4 Apr 2017 08:36:03 -0800
Subject: [PATCH 0106/1563] Fix all 64/32 bit warning in core/common_runtime.
 Change: 152141388

---
 .../core/common_runtime/bfc_allocator.cc      |  4 +--
 .../core/common_runtime/bfc_allocator.h       |  2 +-
 tensorflow/core/common_runtime/device_mgr.cc  |  2 +-
 .../core/common_runtime/direct_session.cc     |  6 ++--
 tensorflow/core/common_runtime/executor.cc    | 36 +++++++++----------
 tensorflow/core/common_runtime/executor.h     |  2 +-
 tensorflow/core/common_runtime/function.cc    | 16 +++++----
 .../common_runtime/gpu/gpu_stream_util.cc     |  2 +-
 .../core/common_runtime/gpu/process_state.cc  |  2 +-
 .../core/common_runtime/pending_counts.h      |  6 ++--
 tensorflow/core/util/util.cc                  |  2 +-
 tensorflow/core/util/util.h                   |  2 +-
 12 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/tensorflow/core/common_runtime/bfc_allocator.cc b/tensorflow/core/common_runtime/bfc_allocator.cc
index b18209cb60..2cf668400e 100644
--- a/tensorflow/core/common_runtime/bfc_allocator.cc
+++ b/tensorflow/core/common_runtime/bfc_allocator.cc
@@ -453,8 +453,8 @@ void BFCAllocator::RemoveFreeChunkIterFromBin(
 void BFCAllocator::RemoveFreeChunkFromBin(BFCAllocator::ChunkHandle h) {
   Chunk* c = ChunkFromHandle(h);
   CHECK(!c->in_use() && (c->bin_num != kInvalidBinNum));
-  int count = BinFromIndex(c->bin_num)->free_chunks.erase(h);
-  CHECK(count > 0) << "Could not find chunk in bin";
+  CHECK_GT(BinFromIndex(c->bin_num)->free_chunks.erase(h), 0)
+      << "Could not find chunk in bin";
   c->bin_num = kInvalidBinNum;
 }
 
diff --git a/tensorflow/core/common_runtime/bfc_allocator.h b/tensorflow/core/common_runtime/bfc_allocator.h
index 0b528cb0c2..b74c161dce 100644
--- a/tensorflow/core/common_runtime/bfc_allocator.h
+++ b/tensorflow/core/common_runtime/bfc_allocator.h
@@ -78,7 +78,7 @@ class BFCAllocator : public VisitableAllocator {
 
   // A ChunkHandle is an index into the chunks_ vector in BFCAllocator
   // kInvalidChunkHandle means an invalid chunk
-  typedef int ChunkHandle;
+  typedef size_t ChunkHandle;
   static const int kInvalidChunkHandle = -1;
 
   typedef int BinNum;
diff --git a/tensorflow/core/common_runtime/device_mgr.cc b/tensorflow/core/common_runtime/device_mgr.cc
index 820c4370e2..7807656cb2 100644
--- a/tensorflow/core/common_runtime/device_mgr.cc
+++ b/tensorflow/core/common_runtime/device_mgr.cc
@@ -44,7 +44,7 @@ DeviceMgr::~DeviceMgr() {
 }
 
 StringPiece DeviceMgr::CopyToBackingStore(StringPiece s) {
-  int n = s.size();
+  size_t n = s.size();
   char* space = name_backing_store_.Alloc(n);
   memcpy(space, s.data(), n);
   return StringPiece(space, n);
diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index c4b2b6c12a..eda2be3e70 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -427,7 +427,7 @@ Status DirectSession::Run(const RunOptions& run_options,
   TF_RETURN_IF_ERROR(SendInputs(inputs, executors_and_keys, run_state.rendez));
 
   // Start parallel Executors.
-  const int num_executors = executors_and_keys->items.size();
+  const size_t num_executors = executors_and_keys->items.size();
   ExecutorBarrier* barrier = new ExecutorBarrier(
       num_executors, run_state.rendez, [&run_state](const Status& ret) {
         {
@@ -458,7 +458,7 @@ Status DirectSession::Run(const RunOptions& run_options,
         options_.config.graph_options().build_cost_model();
     const int64 build_cost_model_after =
         options_.config.graph_options().build_cost_model_after();
-    int measure_step_count = executor_step_count - build_cost_model_after;
+    int64 measure_step_count = executor_step_count - build_cost_model_after;
     if (measure_step_count >= 0) {
       update_cost_model =
           ((measure_step_count + 1) % build_cost_model_every == 0);
@@ -611,7 +611,7 @@ Status DirectSession::PRunSetup(const std::vector<string>& input_names,
   }
 
   // Start parallel Executors.
-  const int num_executors = executors_and_keys->items.size();
+  const size_t num_executors = executors_and_keys->items.size();
   ExecutorBarrier* barrier = new ExecutorBarrier(
       num_executors, run_state->rendez, [run_state](const Status& ret) {
         if (!ret.ok()) {
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc
index eaa54c2c48..561e185ac4 100644
--- a/tensorflow/core/common_runtime/executor.cc
+++ b/tensorflow/core/common_runtime/executor.cc
@@ -232,7 +232,7 @@ struct NodeItem {
   int input_start = 0;
 
   // Number of output edges.
-  int num_output_edges;
+  size_t num_output_edges;
 
   PendingCounts::Handle pending_id;
 
@@ -307,7 +307,7 @@ class GraphView {
   void Initialize(const Graph* g);
   Status SetAllocAttrs(const Graph* g, const Device* device);
 
-  NodeItem* node(int id) const {
+  NodeItem* node(size_t id) const {
     DCHECK_GE(id, 0);
     DCHECK_LT(id, num_nodes_);
     uint32 offset = node_offsets_[id];
@@ -454,7 +454,7 @@ GraphView::~GraphView() {
 }
 
 size_t GraphView::NodeItemBytes(const Node* n) {
-  const int num_output_edges = n->out_edges().size();
+  const size_t num_output_edges = n->out_edges().size();
   const int num_inputs = n->num_inputs();
   const int num_outputs = n->num_outputs();
 
@@ -500,11 +500,11 @@ char* GraphView::InitializeNode(char* ptr, const Node* n) {
   // pointers). Casting to int64 is needed on 32bit CPU to avoid comparing
   // values as "int" vs "size_t" in CHECK_LE.
   CHECK_LE(static_cast<int64>(ptr - space_), kuint32max);
-  const uint32 offset = ptr - space_;
+  const uint32 offset = static_cast<uint32>(ptr - space_);
   node_offsets_[id] = offset;
   ptr += bytes;
 
-  const int num_output_edges = n->out_edges().size();
+  const size_t num_output_edges = n->out_edges().size();
   const int num_inputs = n->num_inputs();
   const int num_outputs = n->num_outputs();
 
@@ -580,9 +580,10 @@ void GraphView::Initialize(const Graph* g) {
   CHECK_EQ(ptr, space_ + total_bytes);
 }
 
-void GetMaxPendingCounts(const Node* n, int* max_pending, int* max_dead_count) {
-  const int num_in_edges = n->in_edges().size();
-  int initial_count;
+void GetMaxPendingCounts(const Node* n, size_t* max_pending,
+                         size_t* max_dead_count) {
+  const size_t num_in_edges = n->in_edges().size();
+  size_t initial_count;
   if (IsMerge(n)) {
     // merge waits all control inputs so we initialize the pending
     // count to be the number of control edges.
@@ -626,8 +627,7 @@ Status ExecutorImpl::Initialize() {
     FrameInfo* frame_info = EnsureFrameInfo(frame_name);
 
     // See if this node is a root node, and if so, add to root_nodes_.
-    const int num_in_edges = n->in_edges().size();
-    if (num_in_edges == 0) {
+    if (n->in_edges().empty()) {
       root_nodes_.push_back(n);
     }
 
@@ -659,7 +659,7 @@ Status ExecutorImpl::Initialize() {
     // pending counts data structure, and allocate a handle in
     // that frame's pending counts data structure that has enough
     // space to store these maximal count values.
-    int max_pending, max_dead;
+    size_t max_pending, max_dead;
     GetMaxPendingCounts(n, &max_pending, &max_dead);
     item->pending_id =
         frame_info->pending_counts_layout.CreateHandle(max_pending, max_dead);
@@ -896,7 +896,7 @@ class ExecutorState {
     Entry* input_tensors;
 
     // The number of outstanding ops for each iteration.
-    int outstanding_ops;
+    size_t outstanding_ops;
 
     // The number of outstanding frames for each iteration.
     int outstanding_frame_count;
@@ -1037,13 +1037,13 @@ class ExecutorState {
 
     inline IterationState* GetIteration(int64 iter)
         EXCLUSIVE_LOCKS_REQUIRED(mu) {
-      int index = iter % iterations.size();
+      size_t index = iter % iterations.size();
       return iterations[index];
     }
 
     inline void SetIteration(int64 iter, IterationState* state)
         EXCLUSIVE_LOCKS_REQUIRED(mu) {
-      int index = iter % iterations.size();
+      size_t index = iter % iterations.size();
       DCHECK(state == nullptr || iterations[index] == nullptr);
       iterations[index] = state;
     }
@@ -1404,7 +1404,7 @@ void ExecutorImpl::InitializePending(const Graph* graph,
   for (const Node* n : graph->nodes()) {
     const int id = n->id();
     const string& name = cf_info.frame_names[id];
-    int max_pending, max_dead;
+    size_t max_pending, max_dead;
     GetMaxPendingCounts(n, &max_pending, &max_dead);
     const NodeItem* item = gview_.node(id);
     PendingCounts* counts = EnsureFrameInfo(name)->pending_counts;
@@ -2027,7 +2027,7 @@ bool ExecutorState::NodeDone(const Status& s, const Node* node,
   }
 
   bool completed = false;
-  int ready_size = ready.size();
+  size_t ready_size = ready.size();
   if (ready_size == 0 || !s.ok()) {
     completed = (num_outstanding_ops_.fetch_sub(1) == 1);
   } else if (ready_size > 1) {
@@ -2375,10 +2375,10 @@ void ExecutorState::FrameState::ActivateNodes(const NodeItem* item,
                                               TaggedNodeSeq* ready) {
   const GraphView& gview = executor->gview_;
   IterationState* iter_state = GetIteration(iter);
-  const int num_output_edges = item->num_output_edges;
+  const size_t num_output_edges = item->num_output_edges;
   const EdgeInfo* edges = item->output_edge_list();
   Entry* input_tensors = iter_state->input_tensors;
-  for (int out_index = 0; out_index < num_output_edges; out_index++) {
+  for (size_t out_index = 0; out_index < num_output_edges; out_index++) {
     const EdgeInfo& e = edges[out_index];
     const int dst_id = e.dst_id;
     const NodeItem* dst_item = gview.node(dst_id);
diff --git a/tensorflow/core/common_runtime/executor.h b/tensorflow/core/common_runtime/executor.h
index 239c9666e3..93b58906dd 100644
--- a/tensorflow/core/common_runtime/executor.h
+++ b/tensorflow/core/common_runtime/executor.h
@@ -162,7 +162,7 @@ class ExecutorBarrier {
   //
   // 'done' is called after the last executor completes, and
   // ExecutorBarrier is deleted.
-  ExecutorBarrier(int num, Rendezvous* r, StatusCallback done)
+  ExecutorBarrier(size_t num, Rendezvous* r, StatusCallback done)
       : rendez_(r), done_cb_(done), pending_(num) {}
 
   ~ExecutorBarrier() {}
diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index cb7e1a40ce..5f011c2ce9 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -274,8 +274,9 @@ class CallOp : public AsyncOpKernel {
                if (!status.ok()) {
                  ctx->SetStatus(status);
                } else {
-                 CHECK_EQ(rets->size(), ctx->num_outputs());
-                 for (size_t i = 0; i < rets->size(); ++i) {
+                 const int ret_size = static_cast<int>(rets->size());
+                 CHECK_EQ(ret_size, ctx->num_outputs());
+                 for (int i = 0; i < ret_size; ++i) {
                    ctx->set_output(i, (*rets)[i]);
                  }
                }
@@ -1000,7 +1001,7 @@ string NewName(const Node* n, bool pretty) {
 void ToGraphDef(const Graph* g, GraphDef* gdef, bool pretty) {
   // We visit nodes in forward topological sort order, which is a
   // possible execution order of the graph.
-  std::vector<int> pending(g->num_node_ids());
+  std::vector<size_t> pending(g->num_node_ids());
   std::deque<const Node*> ready;
   for (const Node* n : g->nodes()) {
     pending[n->id()] = n->in_edges().size();
@@ -1154,7 +1155,7 @@ FunctionBody* SymbolicGradientHelper::Compute() {
 
   Graph* g = gbody_->graph;
 
-  const int num_y = gbody_->ret_nodes.size();
+  const int num_y = static_cast<int>(gbody_->ret_nodes.size());
 
   // Populate 'y_node_outputs_' with node function body outputs.
   // Populate 'y_grad_nodes' with initial gradient nodes for each return node of
@@ -1169,7 +1170,7 @@ FunctionBody* SymbolicGradientHelper::Compute() {
     y_node_outputs.push_back({y, 0});
     DCHECK_EQ(y->type_string(), kRetOp);
     const DataType dtype = y->input_type(0);
-    const int index = gbody_->arg_nodes.size();
+    const int index = static_cast<int>(gbody_->arg_nodes.size());
     Node* dy = AddArg(g, dtype, index);
     gbody_->arg_types.push_back(dtype);
     gbody_->arg_nodes.push_back(dy);
@@ -1177,7 +1178,7 @@ FunctionBody* SymbolicGradientHelper::Compute() {
   }
 
   // Populate 'x_nodes' with function args (excluding 'y_grad_node_outputs').
-  const int num_x = fbody_->arg_nodes.size();
+  const size_t num_x = fbody_->arg_nodes.size();
   std::vector<NodeOut> x_node_outputs;
   x_node_outputs.reserve(num_x);
   for (size_t i = 0; i < fbody_->arg_nodes.size(); ++i) {
@@ -1200,7 +1201,8 @@ FunctionBody* SymbolicGradientHelper::Compute() {
   gbody_->ret_nodes.clear();
   // Add new return nodes to the function gradient body for each node
   // in 'x_grad_nodes'.
-  for (size_t i = 0; i < fbody_->arg_types.size(); ++i) {
+  const int arg_types_size = static_cast<int>(fbody_->arg_types.size());
+  for (int i = 0; i < arg_types_size; ++i) {
     Endpoint grad = {x_grad_node_outputs[i].node, x_grad_node_outputs[i].index};
     Node* ret = AddRet(g, grad, i);
     gbody_->ret_nodes.push_back(ret);
diff --git a/tensorflow/core/common_runtime/gpu/gpu_stream_util.cc b/tensorflow/core/common_runtime/gpu/gpu_stream_util.cc
index eae917a439..de715d140a 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_stream_util.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_stream_util.cc
@@ -82,7 +82,7 @@ Status AssignStreams(const Graph* graph, const AssignStreamsOpts& opts,
     // Determine a suitable stream to use.
     int stream_id = highest_stream_id + 1;
     for (const Edge* e : n->in_edges()) {
-      const int fanout = e->src()->out_edges().size();
+      const size_t fanout = e->src()->out_edges().size();
       if (fanout == 1) {
         stream_id = (*node_to_stream_id)[e->src()->id()];
         break;
diff --git a/tensorflow/core/common_runtime/gpu/process_state.cc b/tensorflow/core/common_runtime/gpu/process_state.cc
index f9975ef0a0..cee7b6d78a 100644
--- a/tensorflow/core/common_runtime/gpu/process_state.cc
+++ b/tensorflow/core/common_runtime/gpu/process_state.cc
@@ -191,7 +191,7 @@ Allocator* ProcessState::GetCUDAHostAllocator(int numa_node) {
   // example, process_state could maybe save the first stream executor
   // it knows is valid.
   gpu::StreamExecutor* se = nullptr;
-  for (size_t i = 0; i < gpu_allocators_.size(); ++i) {
+  for (int i = 0; i < static_cast<int>(gpu_allocators_.size()); ++i) {
     if (gpu_allocators_[i] != nullptr) {
       se = GPUMachineManager()->ExecutorForDevice(i).ValueOrDie();
       break;
diff --git a/tensorflow/core/common_runtime/pending_counts.h b/tensorflow/core/common_runtime/pending_counts.h
index f0c79ad601..198eb896af 100644
--- a/tensorflow/core/common_runtime/pending_counts.h
+++ b/tensorflow/core/common_runtime/pending_counts.h
@@ -69,7 +69,7 @@ class PendingCounts {
   // to retrieve the count data for this node.
   class Layout {
    public:
-    Handle CreateHandle(int max_pending_count, int max_dead_count);
+    Handle CreateHandle(size_t max_pending_count, size_t max_dead_count);
 
    private:
     friend class PendingCounts;
@@ -91,7 +91,7 @@ class PendingCounts {
 
   ~PendingCounts() { delete[] bytes_; }
 
-  void set_initial_count(Handle h, int pending_count) {
+  void set_initial_count(Handle h, size_t pending_count) {
     if (h.is_large_) {
       LargeCounts* c = Large(h);
       c->pending = pending_count;
@@ -306,7 +306,7 @@ class PendingCounts {
 };
 
 inline PendingCounts::Handle PendingCounts::Layout::CreateHandle(
-    int max_pending_count, int max_dead_count) {
+    size_t max_pending_count, size_t max_dead_count) {
   Handle result;
   if ((max_pending_count > kMaxCountForPackedCounts) ||
       (max_dead_count > kMaxCountForPackedCounts)) {
diff --git a/tensorflow/core/util/util.cc b/tensorflow/core/util/util.cc
index 3481a6aaa4..1e5a9c5712 100644
--- a/tensorflow/core/util/util.cc
+++ b/tensorflow/core/util/util.cc
@@ -85,7 +85,7 @@ void MovingAverage::AddValue(double v) {
 
 static char hex_char[] = "0123456789abcdef";
 
-string PrintMemory(const char* ptr, int n) {
+string PrintMemory(const char* ptr, size_t n) {
   string ret;
   ret.resize(n * 3);
   for (int i = 0; i < n; ++i) {
diff --git a/tensorflow/core/util/util.h b/tensorflow/core/util/util.h
index c142f4d0d2..4adf2f14dc 100644
--- a/tensorflow/core/util/util.h
+++ b/tensorflow/core/util/util.h
@@ -49,7 +49,7 @@ class MovingAverage {
 
 // Returns a string printing bytes in ptr[0..n).  The output looks
 // like "00 01 ef cd cd ef".
-string PrintMemory(const char* ptr, int n);
+string PrintMemory(const char* ptr, size_t n);
 
 // Given a flattened index into a tensor, computes a string s so that
 // StrAppend("tensor", s) is a Python indexing expression.  E.g.,
-- 
GitLab


From 088cc36217308bc3f010d30e9f2cafd13944b151 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Tue, 4 Apr 2017 11:08:47 -0700
Subject: [PATCH 0107/1563] Updating update version script (#8940)

* Updating the install source files to be rc1 compliant. Updating the update_version script as well to handle these changes.

* Removing extraneous input.

* Removing the print statements.

* Including the java, c, and go install files.
---
 tensorflow/docs_src/install/install_c.md      |  2 +-
 tensorflow/docs_src/install/install_go.md     |  2 +-
 tensorflow/docs_src/install/install_java.md   | 16 +++++++-------
 tensorflow/docs_src/install/install_linux.md  | 22 +++++++++----------
 tensorflow/docs_src/install/install_mac.md    | 14 ++++++------
 .../docs_src/install/install_sources.md       |  4 ++--
 .../docs_src/install/install_windows.md       |  4 ++--
 tensorflow/tools/ci_build/update_version.sh   | 21 ++++++++++++++++++
 8 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index c1c7b66546..0f3914d52d 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index c9abaf2aca..6874a1f03f 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc1.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 56c4b8d2c5..45322511c6 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.0-rc1</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0</version>
+                 <version>1.1.0-rc1</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0-rc1.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -213,7 +213,7 @@ two files are available to the JVM:
 
 For example, the following command line executes the `HelloTF` program:
 
-<pre><b>java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index d80f46b7bb..a72af7ef86 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      virtualenv environment:
 
      <pre>(tensorflow)$ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -268,7 +268,7 @@ take the following steps:
 
      <pre>
      $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl</b>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl</b>
      </pre>
 
      If this step fails, see
@@ -455,7 +455,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -622,14 +622,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -641,14 +641,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -660,14 +660,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -679,14 +679,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index c9d1ce0404..69eb7473bf 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -286,7 +286,7 @@ take the following steps:
      support, issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b> </pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
      [Common installation problems](#CommonInstallationProblems).
@@ -398,7 +398,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      TensorFlow for Python 2.7:
 
      <pre> (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -594,13 +594,13 @@ This section documents the relevant values for Mac OS installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.0.1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py2-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
@@ -612,13 +612,13 @@ Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py3-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.0.1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py3-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 3bfbfe78f3..7c47436816 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -319,10 +319,10 @@ $ <b>bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pk
 Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
-for TensorFlow 1.0.1 on Linux:
+for TensorFlow 1.1.0rc1 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.0.1-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc1-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 3e5451ff4d..9a8d139e23 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.0.1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.0.1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index cde0ab7909..429437f807 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -73,6 +73,7 @@ OLD_MINOR=$(cat ${VERSION_H} | grep -E "^#define TF_MINOR_VERSION [0-9]+" | \
 cut -d ' ' -f 3)
 OLD_PATCH=$(cat ${VERSION_H} | grep -E "^#define TF_PATCH_VERSION [[:alnum:]-]+" | \
 cut -d ' ' -f 3)
+OLD_PIP_PATCH="${OLD_PATCH//-}"
 
 sed -i -e "s/^#define TF_MAJOR_VERSION ${OLD_MAJOR}/#define TF_MAJOR_VERSION ${MAJOR}/g" ${VERSION_H}
 sed -i -e "s/^#define TF_MINOR_VERSION ${OLD_MINOR}/#define TF_MINOR_VERSION ${MINOR}/g" ${VERSION_H}
@@ -92,6 +93,26 @@ check_existence file "${README_MD}"
 
 sed -i -r -e "s/${OLD_MAJOR}\.${OLD_MINOR}\.([[:alnum:]]+)-/${MAJOR}.${MINOR}.${PIP_PATCH}-/g" "${README_MD}"
 
+# Update the install md files
+NEW_PIP_TAG=$MAJOR.$MINOR.$PIP_PATCH
+OLD_PIP_TAG=$OLD_MAJOR.$OLD_MINOR.$OLD_PIP_PATCH
+
+for file in ${TF_SRC_DIR}/docs_src/install/install_{linux,mac,windows,sources}.md
+do
+  sed -i "s/tensorflow-${OLD_PIP_TAG}/tensorflow-${NEW_PIP_TAG}/g" $file
+  sed -i "s/tensorflow_gpu-${OLD_PIP_TAG}/tensorflow_gpu-${NEW_PIP_TAG}/g" $file
+  sed -i "s/TensorFlow ${OLD_PIP_TAG}/TensorFlow ${NEW_PIP_TAG}/g" $file
+done
+
+NEW_TAG=$MAJOR.$MINOR.$PATCH
+OLD_TAG=$OLD_MAJOR.$OLD_MINOR.$OLD_PATCH
+
+for file in ${TF_SRC_DIR}/docs_src/install/install_{java,go,c}.md
+do
+  sed -i "s/x86_64-${OLD_TAG}/x86_64-${NEW_TAG}/g" $file
+  sed -i "s/libtensorflow-${OLD_TAG}.jar/libtensorflow-${NEW_TAG}.jar/g" $file
+  sed -i "s/<version>${OLD_TAG}<\/version>/<version>${NEW_TAG}<\/version>/g" $file
+done
 
 # Updates to be made if there are major / minor version changes
 MAJOR_MINOR_CHANGE=0
-- 
GitLab


From d1026cf28991318c4551e691aa03927eaf4ff157 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 4 Apr 2017 10:31:51 -0800
Subject: [PATCH 0108/1563] Improve py_func error handling.

Automatically translate some python errors into corresponding TF errors at runtime.
Change: 152156821
---
 .../python/kernel_tests/py_func_test.py       | 22 +++++++
 tensorflow/python/lib/core/py_func.cc         | 64 +++++++++++++++++--
 2 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/kernel_tests/py_func_test.py b/tensorflow/python/kernel_tests/py_func_test.py
index f1bb3bdc22..c7fc7dd582 100644
--- a/tensorflow/python/kernel_tests/py_func_test.py
+++ b/tensorflow/python/kernel_tests/py_func_test.py
@@ -283,6 +283,28 @@ class PyOpTest(test.TestCase):
     with self.test_session() as sess:
       self.assertEqual(sess.run(f), [])
 
+  def _testExceptionHandling(self, py_exp, tf_exp):
+
+    def raise_exception():
+      raise py_exp("blah")  # pylint: disable=not-callable
+
+    f = script_ops.py_func(raise_exception, [], [])
+    with self.test_session() as sess:
+      with self.assertRaisesRegexp(tf_exp, "blah"):
+        sess.run(f)
+
+  def testExceptionHandling(self):
+    self._testExceptionHandling(ValueError, errors.InvalidArgumentError)
+    self._testExceptionHandling(TypeError, errors.InvalidArgumentError)
+    self._testExceptionHandling(StopIteration, errors.OutOfRangeError)
+    self._testExceptionHandling(MemoryError, errors.ResourceExhaustedError)
+    self._testExceptionHandling(NotImplementedError, errors.UnimplementedError)
+
+    class WeirdError(Exception):
+      pass
+
+    self._testExceptionHandling(WeirdError, errors.UnknownError)
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
index f6062aa03d..fe0557b535 100644
--- a/tensorflow/python/lib/core/py_func.cc
+++ b/tensorflow/python/lib/core/py_func.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
@@ -172,6 +173,48 @@ bool IsSingleNone(PyObject* obj) {
   return item == Py_None;
 }
 
+// py.__class__.__name__
+const char* ClassName(PyObject* py) {
+/* PyPy doesn't have a separate C API for old-style classes. */
+#if PY_MAJOR_VERSION < 3 && !defined(PYPY_VERSION)
+  if (PyClass_Check(py))
+    return PyString_AS_STRING(
+        CHECK_NOTNULL(reinterpret_cast<PyClassObject*>(py)->cl_name));
+  if (PyInstance_Check(py))
+    return PyString_AS_STRING(CHECK_NOTNULL(
+        reinterpret_cast<PyInstanceObject*>(py)->in_class->cl_name));
+#endif
+  if (Py_TYPE(py) == &PyType_Type) {
+    return reinterpret_cast<PyTypeObject*>(py)->tp_name;
+  }
+  return Py_TYPE(py)->tp_name;
+}
+
+string PyExcFetch() {
+  CHECK(PyErr_Occurred()) << "Must only call PyExcFetch after an exception.";
+  PyObject* ptype;
+  PyObject* pvalue;
+  PyObject* ptraceback;
+  PyErr_Fetch(&ptype, &pvalue, &ptraceback);
+  PyErr_NormalizeException(&ptype, &pvalue, &ptraceback);
+  string err = ClassName(ptype);
+  if (pvalue) {
+    PyObject* str = PyObject_Str(pvalue);
+    if (str) {
+#if PY_MAJOR_VERSION < 3
+      strings::StrAppend(&err, ": ", PyString_AS_STRING(str));
+#else
+      strings::StrAppend(&err, ": ", PyUnicode_AsUTF8(str));
+#endif
+      Py_DECREF(str);
+    }
+    Py_DECREF(pvalue);
+  }
+  Py_DECREF(ptype);
+  Py_XDECREF(ptraceback);
+  return err;
+}
+
 // Calls the registered py function through the trampoline.
 Status DoCallPyFunc(PyCall* call) {
   PyObject* trampoline = GetPyTrampoline();
@@ -189,11 +232,24 @@ Status DoCallPyFunc(PyCall* call) {
   Py_DECREF(args);
   if (result == nullptr) {
     if (PyErr_Occurred()) {
-      // TODO(zhifengc): Consider pretty-print error using LOG(STDERR).
-      PyErr_Print();
+      if (PyErr_ExceptionMatches(PyExc_ValueError) ||
+          PyErr_ExceptionMatches(PyExc_TypeError)) {
+        return errors::InvalidArgument(PyExcFetch());
+      } else if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
+        return errors::OutOfRange(PyExcFetch());
+      } else if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
+        return errors::ResourceExhausted(PyExcFetch());
+      } else if (PyErr_ExceptionMatches(PyExc_NotImplementedError)) {
+        return errors::Unimplemented(PyExcFetch());
+      } else {
+        // TODO(ebrevdo): Check if exception is an OpError and use the
+        // OpError.error_code property to map it back in the Status.
+        return errors::Unknown(PyExcFetch());
+      }
+    } else {
+      return errors::Internal("Failed to run py callback ", call->token,
+                              ": see error log.");
     }
-    return errors::Internal("Failed to run py callback ", call->token,
-                            ": see error log.");
   }
 
   // Process the return values and converts them to tf Tensors.
-- 
GitLab


From 36a47f2bdcbbdf302da6f292ceee366ebd9640d2 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Tue, 4 Apr 2017 12:21:18 -0700
Subject: [PATCH 0109/1563] Fix unbound <table> tag. (#8960)

Change: 152029426
---
 tensorflow/docs_src/install/install_windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 9a8d139e23..7cda030f58 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -193,5 +193,5 @@ ImportError: cannot import name 'descriptor'</pre>
   <td><pre>No module named "pywrap_tensorflow"</pre></td>
 </tr>
 
-<table>
+</table>
 
-- 
GitLab


From 4fcba93b846e292a300fe429111961cdf9c54e68 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 11:58:09 -0800
Subject: [PATCH 0110/1563] Update interaction with libpng so that we use the
 public API instead of knowledge of the internal libpng data structures.
 Change: 152167754

---
 tensorflow/core/lib/png/png_io.cc | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/lib/png/png_io.cc b/tensorflow/core/lib/png/png_io.cc
index bdc39e5d6f..961a78f83b 100644
--- a/tensorflow/core/lib/png/png_io.cc
+++ b/tensorflow/core/lib/png/png_io.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <string.h>
 #include <sys/types.h>
+#include <zlib.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ -152,7 +153,10 @@ bool DecodeHeader(StringPiece png_string, int* width, int* height,
   if (components != NULL) {
     switch (context.color_type) {
       case PNG_COLOR_TYPE_PALETTE:
-        *components = (context.info_ptr->valid & PNG_INFO_tRNS) ? 4 : 3;
+        *components =
+            (png_get_valid(context.png_ptr, context.info_ptr, PNG_INFO_tRNS))
+                ? 4
+                : 3;
         break;
       case PNG_COLOR_TYPE_GRAY:
         *components = 1;
@@ -176,8 +180,11 @@ bool DecodeHeader(StringPiece png_string, int* width, int* height,
   }
   if (metadata != NULL) {
     metadata->clear();
-    for (int i = 0; i < context.info_ptr->num_text; i++) {
-      const png_text& text = context.info_ptr->text[i];
+    png_textp text_ptr = NULL;
+    int num_text = 0;
+    png_get_text(context.png_ptr, context.info_ptr, &text_ptr, &num_text);
+    for (int i = 0; i < num_text; i++) {
+      const png_text& text = text_ptr[i];
       metadata->push_back(std::make_pair(text.key, text.text));
     }
   }
@@ -228,9 +235,10 @@ bool CommonInitDecode(StringPiece png_string, int desired_channels,
     return false;
   }
   if (context->channels == 0) {  // Autodetect number of channels
-    context->channels = context->info_ptr->channels;
+    context->channels = png_get_channels(context->png_ptr, context->info_ptr);
   }
-  const bool has_tRNS = (context->info_ptr->valid & PNG_INFO_tRNS) != 0;
+  const bool has_tRNS =
+      (png_get_valid(context->png_ptr, context->info_ptr, PNG_INFO_tRNS)) != 0;
   const bool has_alpha = (context->color_type & PNG_COLOR_MASK_ALPHA) != 0;
   if ((context->channels & 1) == 0) {  // We desire alpha
     if (has_alpha) {                   // There is alpha
@@ -268,7 +276,9 @@ bool CommonInitDecode(StringPiece png_string, int desired_channels,
   const bool want_gray = (context->channels < 3);
   const bool is_gray = !(context->color_type & PNG_COLOR_MASK_COLOR);
   if (is_gray) {  // upconvert gray to 8-bit if needed.
-    if (context->bit_depth < 8) png_set_gray_1_2_4_to_8(context->png_ptr);
+    if (context->bit_depth < 8) {
+      png_set_expand_gray_1_2_4_to_8(context->png_ptr);
+    }
   }
   if (want_gray) {  // output is grayscale
     if (!is_gray)
@@ -301,7 +311,9 @@ bool CommonFinishDecode(png_bytep data, int row_bytes, DecodeContext* context) {
     }
   }
 
-  context->info_ptr->valid |= PNG_INFO_IDAT;
+  // Marks iDAT as valid.
+  png_set_rows(context->png_ptr, context->info_ptr,
+               png_get_rows(context->png_ptr, context->info_ptr));
   png_read_end(context->png_ptr, context->info_ptr);
 
   // Clean up.
-- 
GitLab


From a88279b76fe1e1ed7b0223f1c4a5b554b2567049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Tue, 4 Apr 2017 11:58:40 -0800
Subject: [PATCH 0111/1563] TensorBoard plugins now contain their own
 name/route prefix. Change: 152167807

---
 tensorflow/tensorboard/backend/BUILD          |  1 +
 tensorflow/tensorboard/backend/application.py | 31 ++++++++++++------
 .../tensorboard/backend/application_test.py   | 32 ++++++++++++++++++-
 tensorflow/tensorboard/plugins/base_plugin.py |  6 ++++
 .../plugins/debugger/debugger_plugin.py       |  4 ++-
 .../plugins/debugger/debugger_plugin_test.py  |  2 +-
 .../plugins/projector/projector_plugin.py     |  4 ++-
 .../projector/projector_plugin_test.py        |  4 +--
 .../tensorboard/plugins/text/text_plugin.py   |  4 ++-
 9 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD
index b99e6c5655..4e1db85374 100644
--- a/tensorflow/tensorboard/backend/BUILD
+++ b/tensorflow/tensorboard/backend/BUILD
@@ -90,6 +90,7 @@ py_test(
         "//tensorflow/python:training",
         "//tensorflow/tensorboard",
         "//tensorflow/tensorboard/backend/event_processing:event_multiplexer",
+        "//tensorflow/tensorboard/plugins:base_plugin",
         "@org_pocoo_werkzeug//:werkzeug",
     ],
 )
diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index e812880bbd..005d183039 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -102,11 +102,11 @@ def standard_tensorboard_wsgi(logdir, purge_orphaned_data, reload_interval):
       size_guidance=DEFAULT_SIZE_GUIDANCE,
       purge_orphaned_data=purge_orphaned_data)
 
-  plugins = {
-      debugger_plugin.PLUGIN_PREFIX_ROUTE: debugger_plugin.DebuggerPlugin(),
-      projector_plugin.PLUGIN_PREFIX_ROUTE: projector_plugin.ProjectorPlugin(),
-      text_plugin.PLUGIN_PREFIX_ROUTE: text_plugin.TextPlugin(),
-  }
+  plugins = [
+      debugger_plugin.DebuggerPlugin(),
+      projector_plugin.ProjectorPlugin(),
+      text_plugin.TextPlugin(),
+  ]
 
   return TensorBoardWSGIApp(logdir, plugins, multiplexer, reload_interval)
 
@@ -128,12 +128,16 @@ class TensorBoardWSGIApp(object):
       logdir: the logdir spec that describes where data will be loaded.
         may be a directory, or comma,separated list of directories, or colons
         can be used to provide named directories
-      plugins: Map from plugin name to plugin application
+      plugins: List of plugins that extend tensorboard.plugins.BasePlugin
       multiplexer: The EventMultiplexer with TensorBoard data to serve
       reload_interval: How often (in seconds) to reload the Multiplexer
 
     Returns:
       A WSGI application that implements the TensorBoard backend.
+
+    Raises:
+      ValueError: If some plugin has no plugin_name
+      ValueError: If two plugins have the same plugin_name
     """
     self._logdir = logdir
     self._plugins = plugins
@@ -177,15 +181,22 @@ class TensorBoardWSGIApp(object):
     # Serve the routes from the registered plugins using their name as the route
     # prefix. For example if plugin z has two routes /a and /b, they will be
     # served as /data/plugin/z/a and /data/plugin/z/b.
-    for name in self._plugins:
+    plugin_names_encountered = set()
+    for plugin in self._plugins:
+      if plugin.plugin_name is None:
+        raise ValueError('Plugin %s has no plugin_name' % plugin)
+      if plugin.plugin_name in plugin_names_encountered:
+        raise ValueError('Duplicate plugins for name %s' % plugin.plugin_name)
+      plugin_names_encountered.add(plugin.plugin_name)
+
       try:
-        plugin = self._plugins[name]
         plugin_apps = plugin.get_plugin_apps(self._multiplexer, self._logdir)
       except Exception as e:  # pylint: disable=broad-except
-        logging.warning('Plugin %s failed. Exception: %s', name, str(e))
+        logging.warning('Plugin %s failed. Exception: %s', plugin.plugin_name,
+                        str(e))
         continue
       for route, app in plugin_apps.items():
-        path = DATA_PREFIX + PLUGIN_PREFIX + '/' + name + route
+        path = DATA_PREFIX + PLUGIN_PREFIX + '/' + plugin.plugin_name + route
         self.data_applications[path] = app
 
   # We use underscore_names for consistency with inherited methods.
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 234c541803..454ba63e75 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -48,6 +48,7 @@ from tensorflow.python.summary.writer import writer as writer_lib
 from tensorflow.tensorboard import tensorboard
 from tensorflow.tensorboard.backend import application
 from tensorflow.tensorboard.backend.event_processing import event_multiplexer
+from tensorflow.tensorboard.plugins import base_plugin
 
 
 class TensorboardServerTest(test.TestCase):
@@ -61,7 +62,7 @@ class TensorboardServerTest(test.TestCase):
     multiplexer = event_multiplexer.EventMultiplexer(
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
-    plugins = {}
+    plugins = []
     app = application.TensorBoardWSGIApp(
         self.temp_dir, plugins, multiplexer, reload_interval=0)
     try:
@@ -480,5 +481,34 @@ class TensorboardSimpleServerConstructionTest(test.TestCase):
     self.assertTrue(one_passed)  # We expect either IPv4 or IPv6 to be supported
 
 
+class TensorBoardApplcationConstructionTest(test.TestCase):
+
+  def testExceptions(self):
+
+    class UnnamedPlugin(base_plugin.TBPlugin):
+
+      def get_plugin_apps(self):
+        pass
+
+    class MockPlugin(UnnamedPlugin):
+      plugin_name = 'mock'
+
+    class OtherMockPlugin(UnnamedPlugin):
+      plugin_name = 'mock'
+
+    logdir = '/fake/foo'
+    multiplexer = event_multiplexer.EventMultiplexer()
+
+    # Fails if there is an unnamed plugin
+    with self.assertRaises(ValueError):
+      plugins = [UnnamedPlugin()]
+      application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
+
+    # Fails if there are two plugins with same name
+    with self.assertRaises(ValueError):
+      plugins = [MockPlugin(), OtherMockPlugin()]
+      application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
+
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/tensorboard/plugins/base_plugin.py b/tensorflow/tensorboard/plugins/base_plugin.py
index 86cfeb6cc2..8b1560cf8a 100644
--- a/tensorflow/tensorboard/plugins/base_plugin.py
+++ b/tensorflow/tensorboard/plugins/base_plugin.py
@@ -30,6 +30,12 @@ class TBPlugin(object):
   """TensorBoard plugin interface. Every plugin must extend from this class."""
   __metaclass__ = ABCMeta
 
+  # The plugin_name will also be a prefix in the http handlers generated by
+  # the plugin, e.g. `data/plugins/$PLUGIN_NAME/$HANDLER`
+  # The plugin name must be unique for each registered plugin, or
+  # a ValueError will be thrown when the application is constructed
+  plugin_name = None
+
   @abstractmethod
   def get_plugin_apps(self, multiplexer, logdir):
     """Returns a set of WSGI applications that the plugin implements.
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
index 43902efe24..cfa8f68187 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
@@ -34,7 +34,7 @@ from tensorflow.tensorboard.backend.event_processing import event_file_loader
 from tensorflow.tensorboard.plugins import base_plugin
 
 # The prefix of routes provided by this plugin.
-PLUGIN_PREFIX_ROUTE = 'debugger'
+_PLUGIN_PREFIX_ROUTE = 'debugger'
 
 # HTTP routes.
 _HEALTH_PILLS_ROUTE = '/health_pills'
@@ -63,6 +63,8 @@ class DebuggerPlugin(base_plugin.TBPlugin):
   values.
   """
 
+  plugin_name = _PLUGIN_PREFIX_ROUTE
+
   def get_plugin_apps(self, multiplexer, logdir):
     """Obtains a mapping between routes and handlers. Stores the logdir.
 
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
index 9e71e2713d..2c9135fd27 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
@@ -96,7 +96,7 @@ class DebuggerPluginTest(test.TestCase):
     })
     self.plugin = debugger_plugin.DebuggerPlugin()
     wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, {'debugger': self.plugin},
+        self.log_dir, [self.plugin],
         self.multiplexer,
         reload_interval=0)
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 439e919898..32ebb78e42 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -42,7 +42,7 @@ from tensorflow.tensorboard.plugins.base_plugin import TBPlugin
 from tensorflow.tensorboard.plugins.projector import projector_config_pb2
 
 # The prefix of routes provided by this plugin.
-PLUGIN_PREFIX_ROUTE = 'projector'
+_PLUGIN_PREFIX_ROUTE = 'projector'
 
 PROJECTOR_FILENAME = 'projector_config.pbtxt'
 
@@ -305,6 +305,8 @@ def _parse_positive_int_param(request, param_name):
 class ProjectorPlugin(TBPlugin):
   """Embedding projector."""
 
+  plugin_name = _PLUGIN_PREFIX_ROUTE
+
   def __init__(self):
     self._handlers = None
     self.readers = {}
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index 750cb1472a..5679eff4a3 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -104,10 +104,8 @@ class ProjectorAppTest(test.TestCase):
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
     plugin = projector_plugin.ProjectorPlugin()
-    plugin.get_plugin_apps(multiplexer, self.log_dir)
-    plugins = {'projector': plugin}
     wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, plugins, multiplexer, reload_interval=0)
+        self.log_dir, [plugin], multiplexer, reload_interval=0)
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
   def _Get(self, path):
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin.py b/tensorflow/tensorboard/plugins/text/text_plugin.py
index 2c0620f564..b337ce2ad0 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin.py
@@ -39,7 +39,7 @@ from tensorflow.tensorboard.backend import http_util
 from tensorflow.tensorboard.plugins import base_plugin
 
 # The prefix of routes provided by this plugin.
-PLUGIN_PREFIX_ROUTE = 'text'
+_PLUGIN_PREFIX_ROUTE = 'text'
 
 # HTTP routes
 RUNS_ROUTE = '/runs'
@@ -251,6 +251,8 @@ def process_string_tensor_event(event):
 class TextPlugin(base_plugin.TBPlugin):
   """Text Plugin for TensorBoard."""
 
+  plugin_name = _PLUGIN_PREFIX_ROUTE
+
   def index_impl(self):
     run_to_series = {}
     name = text_summary.TextSummaryPluginAsset.plugin_name
-- 
GitLab


From 19629df86ef4f57ff869e53eae211dbd905fde1f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 12:16:35 -0800
Subject: [PATCH 0112/1563] Passes trainable flag to separable_conv2d biases.
 Change: 152170239

---
 tensorflow/contrib/layers/python/layers/layers.py  |  1 +
 .../contrib/layers/python/layers/layers_test.py    | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 65dcf8577f..0140f6d0d3 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -1942,6 +1942,7 @@ def separable_convolution2d(
                                             dtype=dtype,
                                             initializer=biases_initializer,
                                             regularizer=biases_regularizer,
+                                            trainable=trainable,
                                             collections=biases_collections)
           outputs = nn.bias_add(outputs, biases)
 
diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index 3bc31a2624..2b170e92ba 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -2979,6 +2979,20 @@ class SeparableConv2dTest(test.TestCase):
       sess.run(init_op)
       sess.run(net, feed_dict={images_placeholder: images})
 
+  def testTrainableFlagIsPassedOn(self):
+    for trainable in [True, False]:
+      for num_filters in [None, 8]:
+        with ops.Graph().as_default():
+          input_size = [5, 10, 12, 3]
+
+          images = random_ops.random_uniform(input_size, seed=1)
+          layers_lib.separable_conv2d(
+              images, num_filters, [3, 3], 1, trainable=trainable)
+          model_variables = variables.get_model_variables()
+          trainable_variables = variables_lib.trainable_variables()
+          for model_variable in model_variables:
+            self.assertEqual(trainable, model_variable in trainable_variables)
+
 
 class ScaleGradientTests(test.TestCase):
   """Simple tests of the scale_gradient function."""
-- 
GitLab


From 6e81b34a1a4cd86a406bdeb84112c54948c2b7ac Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Tue, 4 Apr 2017 12:26:47 -0800
Subject: [PATCH 0113/1563] Saving resource variables with a caching device.
 Change: 152171539

---
 tensorflow/python/ops/resource_variable_ops.py |  2 ++
 tensorflow/python/training/saver_test.py       | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index e84fa21868..12b39babe0 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -422,6 +422,8 @@ def _dense_var_to_tensor(var, dtype=None, name=None, as_ref=False):
   if dtype is not None and dtype != var.value().dtype:
     print("trying to switch the dtype to ", dtype, " from ", var.value().dtype)
     return NotImplemented
+  if as_ref:
+    return var.read_value().op.inputs[0]
   return var.value()
 # pylint: enable=unused-argument,protected-access
 
diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py
index 3172a1d5ba..1a980f9311 100644
--- a/tensorflow/python/training/saver_test.py
+++ b/tensorflow/python/training/saver_test.py
@@ -156,6 +156,18 @@ class SaverTest(test.TestCase):
   def testResourceBasic(self):
     self.basicSaveRestore(resource_variable_ops.ResourceVariable)
 
+  def testResourceSaveRestoreCachingDevice(self):
+    save_path = os.path.join(self.get_temp_dir(), "resource_cache")
+    v = resource_variable_ops.ResourceVariable([1], caching_device="/cpu:0")
+    with self.test_session() as sess:
+      variables.global_variables_initializer().run()
+      save = saver_module.Saver()
+      save.save(sess, save_path)
+    with self.test_session() as sess:
+      save2 = saver_module.Saver()
+      save2.restore(sess, save_path)
+      self.assertEquals(v.eval(), [1])
+
   def testSaveCopyRestoreWithSaveRelativePaths(self):
     """Save, copy checkpoint dir and restore from copied dir.
 
-- 
GitLab


From 5cdc2d62c89cf29eb256ba91f512bd334ea4d419 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 13:25:49 -0800
Subject: [PATCH 0114/1563] Drop loss from estimator_spec.eval_metric_ops, as
 required by core Estimator. Change: 152179924

---
 .../learn/python/learn/estimators/model_fn.py | 11 +++++-
 .../python/learn/estimators/model_fn_test.py  | 38 +++++++++++--------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
index 6d15f83ef5..c0a3918549 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
@@ -26,6 +26,7 @@ import six
 from tensorflow.contrib import framework as contrib_framework
 from tensorflow.contrib.framework import get_graph_from_inputs
 from tensorflow.contrib.learn.python.learn.estimators import constants
+from tensorflow.contrib.learn.python.learn.estimators import metric_key
 from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.python.estimator import model_fn as core_model_fn_lib
 from tensorflow.python.estimator.export import export_output as core_export_lib
@@ -255,12 +256,20 @@ class ModelFnOps(
       export_outputs_dict = {key: _export_output(*val) for key, val in
                              output_alternatives.items()}
 
+    def _get_eval_metric_ops():
+      """Returns self.eval_metric_ops without loss metric."""
+      result = {}
+      for key, value in six.iteritems(self.eval_metric_ops):
+        if key != metric_key.MetricKey.LOSS:
+          result[key] = value
+      return result
+
     return core_model_fn_lib.EstimatorSpec(
         mode=mode,
         predictions=self.predictions,
         loss=self.loss,
         train_op=self.train_op,
-        eval_metric_ops=self.eval_metric_ops,
+        eval_metric_ops=_get_eval_metric_ops(),
         export_outputs=export_outputs_dict,
         training_chief_hooks=self.training_chief_hooks,
         training_hooks=self.training_hooks,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
index fe8b3a1b34..51b32359a3 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import six
 
 from tensorflow.contrib.learn.python.learn.estimators import constants
 from tensorflow.contrib.learn.python.learn.estimators import model_fn
@@ -51,19 +52,26 @@ class ModelFnopsTest(test.TestCase):
         predictions=predictions,
         loss=constant_op.constant([1]),
         train_op=control_flow_ops.no_op(),
-        eval_metric_ops={"metric_key": (control_flow_ops.no_op(),
-                                        control_flow_ops.no_op())},
+        eval_metric_ops={
+            "metric_key": (constant_op.constant(1.), control_flow_ops.no_op()),
+            "loss": (constant_op.constant(1.), control_flow_ops.no_op()),
+        },
         # zzz
         training_chief_hooks=[basic_session_run_hooks.StepCounterHook()],
         training_hooks=[basic_session_run_hooks.StepCounterHook()],
         output_alternatives=output_alternatives,
         scaffold=monitored_session.Scaffold())
 
-  def assertEquals_except_export(self, model_fn_ops, estimator_spec):
+  def assertEquals_except_export_and_eval_loss(
+      self, model_fn_ops, estimator_spec):
+    expected_eval_metric_ops = {}
+    for key, value in six.iteritems(model_fn_ops.eval_metric_ops):
+      if key != "loss":
+        expected_eval_metric_ops[key] = value
     self.assertEqual(model_fn_ops.predictions, estimator_spec.predictions)
     self.assertEqual(model_fn_ops.loss, estimator_spec.loss)
     self.assertEqual(model_fn_ops.train_op, estimator_spec.train_op)
-    self.assertEqual(model_fn_ops.eval_metric_ops,
+    self.assertEqual(expected_eval_metric_ops,
                      estimator_spec.eval_metric_ops)
     self.assertEqual(model_fn_ops.training_chief_hooks,
                      estimator_spec.training_chief_hooks)
@@ -75,7 +83,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, None)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
   def testEstimatorSpec_export_regression_with_scores(self):
     predictions = self.create_predictions()
@@ -84,7 +92,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       regression_output = estimator_spec.export_outputs["regression_head"]
@@ -103,7 +111,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       regression_output = estimator_spec.export_outputs["regression_head"]
@@ -119,7 +127,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -140,7 +148,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -162,7 +170,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -182,7 +190,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -203,7 +211,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -221,7 +229,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       logistic_output = estimator_spec.export_outputs["logistic_head"]
@@ -240,7 +248,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       unspecified_output = estimator_spec.export_outputs["unspecified_head"]
@@ -259,7 +267,7 @@ class ModelFnopsTest(test.TestCase):
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER,
                                                  "regression_head")
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       regression_output = estimator_spec.export_outputs["regression_head"]
-- 
GitLab


From 7284cd8615067fc887648fe973a418f13a5529e4 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Tue, 4 Apr 2017 13:43:39 -0800
Subject: [PATCH 0115/1563] sample_stats.percentile DOCFIX. Change: 152182295

---
 .../contrib/distributions/python/ops/sample_stats.py     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/ops/sample_stats.py b/tensorflow/contrib/distributions/python/ops/sample_stats.py
index 0b1ceefe7b..26cf922d0a 100644
--- a/tensorflow/contrib/distributions/python/ops/sample_stats.py
+++ b/tensorflow/contrib/distributions/python/ops/sample_stats.py
@@ -44,7 +44,7 @@ def percentile(x,
                keep_dims=False,
                validate_args=False,
                name=None):
-  """Compute the `q`-th percentile of `x` along leading (sample) dimensions.
+  """Compute the `q`-th percentile of `x`.
 
   Given a vector `x`, the `q`-th percentile of `x` is the value `q / 100` of the
   way from the minimum to the maximum in in a sorted copy of `x`.
@@ -58,7 +58,7 @@ def percentile(x,
 
 
   ```python
-  # Get 30th percentile with default ('linear') interpolation.
+  # Get 30th percentile with default ('nearest') interpolation.
   x = [1., 2., 3., 4.]
   percentile(x, q=30.)
   ==> 2.0
@@ -91,11 +91,10 @@ def percentile(x,
     axis:  Optional `0-D` or `1-D` integer `Tensor` with constant values.
       The axis that hold independent samples over which to return the desired
       percentile.  If `None` (the default), treat every dimension as a sample
-      dimension, returning a scalar
+      dimension, returning a scalar.
     interpolation : {"lower", "higher", "nearest"}.  Default: "nearest"
       This optional parameter specifies the interpolation method to
-      use when the desired quantile lies between two data points
-      `i < j`:
+      use when the desired quantile lies between two data points `i < j`:
         * lower: `i`.
         * higher: `j`.
         * nearest: `i` or `j`, whichever is nearest.
-- 
GitLab


From 98f6dbe9fa3b7cab41c01cc0d780d05eecb0c4a2 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 4 Apr 2017 13:57:59 -0800
Subject: [PATCH 0116/1563] Added a memory optimizer to grappler. Change:
 152184170

---
 tensorflow/core/grappler/optimizers/BUILD     | 31 +++++++
 .../grappler/optimizers/memory_optimizer.cc   | 83 +++++++++++++++++++
 .../grappler/optimizers/memory_optimizer.h    | 42 ++++++++++
 .../optimizers/memory_optimizer_test.cc       | 74 +++++++++++++++++
 4 files changed, 230 insertions(+)
 create mode 100644 tensorflow/core/grappler/optimizers/memory_optimizer.cc
 create mode 100644 tensorflow/core/grappler/optimizers/memory_optimizer.h
 create mode 100644 tensorflow/core/grappler/optimizers/memory_optimizer_test.cc

diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index d09a3c4e30..4e41c2bb12 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -117,6 +117,37 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "memory_optimizer",
+    srcs = ["memory_optimizer.cc"],
+    hdrs = [
+        "memory_optimizer.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":graph_optimizer",
+        ":graph_rewriter",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+    ],
+)
+
+cc_test(
+    name = "memory_optimizer_test",
+    srcs = ["memory_optimizer_test.cc"],
+    deps = [
+        ":memory_optimizer",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+    ],
+)
+
 cc_library(
     name = "layout_optimizer",
     srcs = ["layout_optimizer.cc"],
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer.cc b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
new file mode 100644
index 0000000000..24c6ab12ef
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
@@ -0,0 +1,83 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
+#include <unordered_set>
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/optimizers/graph_rewriter.h"
+#include "tensorflow/core/grappler/utils.h"
+
+namespace tensorflow {
+namespace grappler {
+
+std::pair<NodeDef*, NodeDef*> BuildSwapPair(NodeDef* node, int input_to_swap,
+                                            GraphDef* graph) {
+  string tensor_to_swap = strings::StrCat(node->name(), "_", input_to_swap);
+
+  // Force the tensor to be copied to cpu.
+  NodeDef* swap_out_node = graph->add_node();
+  swap_out_node->set_name(strings::StrCat("swap_out_", tensor_to_swap));
+  swap_out_node->set_op("Identity");
+  swap_out_node->set_device("/CPU");
+
+  // Force the tensor to be restored to the device.
+  NodeDef* swap_in_node = graph->add_node();
+  swap_in_node->set_name(strings::StrCat("swap_in_", tensor_to_swap));
+  swap_in_node->set_op("Identity");
+  *swap_in_node->add_input() = swap_out_node->name();
+
+  // Colocate the swap_in_ node with the node itself.
+  string coloc_group = strings::StrCat("loc@", tensor_to_swap);
+  (*swap_in_node->mutable_attr())["_class"].mutable_list()->add_s(coloc_group);
+  (*node->mutable_attr())["_class"].mutable_list()->add_s(coloc_group);
+
+  return std::make_pair(swap_out_node, swap_in_node);
+}
+
+Status MemoryOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
+                                 GraphDef* optimized_graph) {
+  *optimized_graph = item.graph;
+
+  for (auto& node : *optimized_graph->mutable_node()) {
+    if (node.attr().count("swap_to_host") == 0) {
+      continue;
+    }
+
+    // Swap all the tensors that are marked with the 'swap_to_host' attribute.
+    for (int input_id : node.attr().at("swap_to_host").list().i()) {
+      std::pair<NodeDef*, NodeDef*> swap_nodes =
+          BuildSwapPair(&node, input_id, optimized_graph);
+      *swap_nodes.first->add_input() = node.input(input_id);
+      *node.mutable_input(input_id) = swap_nodes.second->name();
+
+      // TODO(bsteiner): Make sure the tensor isn't swapped back in right away
+      // by adding a control dependency to delay the execution of the swap.
+      // string trigger;
+      //*swap_nodes.second->add_input() = strings::StrCat("^", trigger);
+    }
+  }
+
+  return Status::OK();
+}
+
+void MemoryOptimizer::Feedback(Cluster* cluster, const GrapplerItem& item,
+                               const GraphDef& optimized_graph, double result) {
+  // Nothing to do for MemoryOptimizer.
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer.h b/tensorflow/core/grappler/optimizers/memory_optimizer.h
new file mode 100644
index 0000000000..463067738b
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer.h
@@ -0,0 +1,42 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
+#define TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
+
+#include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Swap tensors in and out of device memory.
+class MemoryOptimizer : public GraphOptimizer {
+ public:
+  MemoryOptimizer() {}
+  ~MemoryOptimizer() override {}
+
+  string name() const override { return "memory_optimizer"; };
+
+  Status Optimize(Cluster* cluster, const GrapplerItem& item,
+                  GraphDef* pruned_graph) override;
+
+  void Feedback(Cluster* cluster, const GrapplerItem& item,
+                const GraphDef& pruned_graph, double result) override;
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
new file mode 100644
index 0000000000..9defa72cff
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
@@ -0,0 +1,74 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class MemoryOptimizerTest : public ::testing::Test {};
+
+TEST_F(MemoryOptimizerTest, SimpleSwapping) {
+  // Build a simple graph with an op that's marked for swapping.
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+
+  Output a = ops::Const(s.WithOpName("a"), 0.0f, {10, 10});
+  Output b = ops::AddN(s.WithOpName("b"), {a});
+  Output c = ops::AddN(s.WithOpName("c"), {b});
+  Output d = ops::AddN(s.WithOpName("d"), {c});
+  Output e = ops::AddN(s.WithOpName("e"), {b, d});
+
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+
+  EXPECT_EQ(5, item.graph.node_size());
+  EXPECT_EQ(NodeName(e.name()), item.graph.node(4).name());
+  AttrValue& val =
+      (*item.graph.mutable_node(4)->mutable_attr())["swap_to_host"];
+  val.mutable_list()->add_i(0);
+
+  MemoryOptimizer optimizer;
+  GraphDef output;
+  Status status = optimizer.Optimize(nullptr, item, &output);
+  TF_EXPECT_OK(status);
+
+  EXPECT_EQ(7, output.node_size());
+  const NodeDef& new_e = output.node(4);
+  EXPECT_EQ(NodeName(e.name()), new_e.name());
+
+  EXPECT_EQ(2, new_e.input_size());
+  EXPECT_EQ(NodeName(d.name()), new_e.input(1));
+  EXPECT_EQ("swap_in_e_0", new_e.input(0));
+
+  const NodeDef& swap_out = output.node(5);
+  EXPECT_EQ("swap_out_e_0", swap_out.name());
+
+  const NodeDef& swap_in = output.node(6);
+  EXPECT_EQ("swap_in_e_0", swap_in.name());
+
+  EXPECT_EQ(NodeName(b.name()), swap_out.input(0));
+  EXPECT_EQ(NodeName(swap_out.name()), swap_in.input(0));
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
-- 
GitLab


From f5139918b27972d5d029161928a7766caa7da4f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Tue, 4 Apr 2017 14:34:39 -0800
Subject: [PATCH 0117/1563] Change default behavior of the tf runs selector:

- If there are fewer than 41 runs, enable them all by default
- If there are 41 runs or more, disable them all by default

This is in response to user complaints that having it enable only the first ten runs by default was confusing, because it was not obvious to users that some runs had been disabled.
However, it still solves the initial user complaint that having very many runs simultaneously enabled would lag the UI.

I also changed the "toggle all runs" button to try to turn everything off before turning everything on.
Also, I improved the logic for detecting when the runs selection is back in the default state, so that we can avoid generating long URI strings wherever possible.
Change: 152188948
---
 .../tf-multi-checkbox.html                    | 46 ++++++++++++++-----
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
index bc15312fc3..ac407844f0 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
@@ -194,10 +194,11 @@ handle these situations gracefully.
         type: Object,
         observer: "synchronizeColors",
       }, // map from run name to css class
-      numRunsEnabledByDefault: {
-        // When TB first loads, first k runs are enabled, rest are disabled.
+      maxRunsToEnableByDefault: {
+        // When TB first loads, if it has k or fewer runs, they are all enabled
+        // by default. If there are more, then they are all disabled.
         type: Number,
-        value: 10,
+        value: 40,
       },
       _debouncedRegexChange: {
         type: Function,
@@ -230,8 +231,24 @@ handle these situations gracefully.
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMapping(runSelectionState)",
+      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
+    _storeRunToIsCheckedMappingWithDefault() {
+      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
+      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
+        return;
+      }
+      var _this = this;
+      var allToggledOn = this.namesMatchingRegex
+              .every(function(n) {return _this.runSelectionState[n]});
+      var allToggledOff = this.namesMatchingRegex
+              .every(function(n) {return !_this.runSelectionState[n]});
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
+        this.runSelectionState = {};
+      }
+      this._storeRunToIsCheckedMapping(this.runSelectionState);
+    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
@@ -261,9 +278,10 @@ handle these situations gracefully.
     },
     computeOutSelected: function(__, ___) {
       var runSelectionState = this.runSelectionState;
-      var num = this.numRunsEnabledByDefault;
+      var num = this.maxRunsToEnableByDefault;
+      var allEnabled = this.namesMatchingRegex.length <= num;
       return this.namesMatchingRegex.filter(function(n, i) {
-        return runSelectionState[n] == null ? i<num : runSelectionState[n];
+        return runSelectionState[n] == null ? allEnabled : runSelectionState[n];
       });
     },
     synchronizeColors: function(e) {
@@ -313,18 +331,24 @@ handle these situations gracefully.
     _regexInputObserver: TF.URIStorage.getStringObserver("regexInput", ""),
     toggleAll: function() {
       var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-                    .every(function(n) {return _this.runSelectionState[n]});
+      var anyToggledOn = this.namesMatchingRegex
+                    .some(function(n) {return _this.runSelectionState[n]});
+
 
       var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
 
-      var numRuns = this.namesMatchingRegex.length;
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      // We have runs toggled either if some were explicitly toggled on, or if
+      // we are in the default state, and there are few enough that we default
+      // to toggling on.
+      anyToggledOn = anyToggledOn || runSelectionStateIsDefault && !defaultOff;
 
-      var shouldDisable = allToggledOn || runSelectionStateIsDefault;
+      // If any are toggled on, we turn everything off. Or, if none are toggled
+      // on, we turn everything on.
 
       var newRunsDisabled = {};
       this.names.forEach(function(n) {
-        newRunsDisabled[n] = !shouldDisable;
+        newRunsDisabled[n] = !anyToggledOn;
       })
       this.runSelectionState = newRunsDisabled;
     },
-- 
GitLab


From 64ca47409ca9da89558eea7a6da85d7f1d41f174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Tue, 4 Apr 2017 14:35:05 -0800
Subject: [PATCH 0118/1563] Autogenerated Change: Change TensorBoard TAG to 52
 Change: 152189000

---
 tensorflow/tensorboard/TAG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/TAG b/tensorflow/tensorboard/TAG
index 82cced27d7..0691f67b20 100644
--- a/tensorflow/tensorboard/TAG
+++ b/tensorflow/tensorboard/TAG
@@ -1 +1 @@
-51
+52
-- 
GitLab


From a42b3fc598cd028308ee9ae9dc9ed3034a04a0bf Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Tue, 4 Apr 2017 14:36:38 -0800
Subject: [PATCH 0119/1563] Remove warning that only happening with config
 cuda. Change: 152189205

---
 tensorflow/core/common_runtime/gpu/gpu_device.cc         | 8 ++++----
 tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index a863b69cef..8b9f468487 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -274,14 +274,14 @@ Status BaseGPUDevice::FillContextMap(const Graph* graph,
                                      DeviceContextMap* device_context_map) {
   VLOG(2) << "FillContextMap";
 
-  const auto num_streams = streams_.size();
+  const size_t num_streams = streams_.size();
   // Special case for single stream.
   if (num_streams == 1) {
     return Status::OK();
   }
   const int64 before = Env::Default()->NowMicros();
   gpu_stream_util::AssignStreamsOpts opts;
-  opts.max_streams = num_streams;
+  opts.max_streams = static_cast<int32>(num_streams);
   std::unordered_map<int, int> node_to_stream_id;
   TF_RETURN_IF_ERROR(
       gpu_stream_util::AssignStreams(graph, opts, &node_to_stream_id));
@@ -519,7 +519,7 @@ void BaseGPUDevice::ReinitializeGpuDevice(OpKernelContext* context,
 Status BaseGPUDeviceFactory::CreateDevices(const SessionOptions& options,
                                            const string& name_prefix,
                                            std::vector<Device*>* devices) {
-  int n = INT_MAX;
+  size_t n = INT_MAX;
   auto iter = options.config.device_count().find("GPU");
   if (iter != options.config.device_count().end()) {
     n = iter->second;
@@ -971,7 +971,7 @@ Status BaseGPUDeviceFactory::GetValidDeviceIds(
       continue;
     }
 
-    int new_id = ids->size();
+    size_t new_id = ids->size();
     ids->push_back(visible_gpu_id);
 
     LOG(INFO) << "Creating TensorFlow device (/gpu:" << new_id << ") -> "
diff --git a/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc b/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc
index e4cd79bc7f..8226cc035c 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc
@@ -37,12 +37,12 @@ class TEST_EventMgrHelper {
     StopPollingLoop();
   }
 
-  int queue_size() {
+  size_t queue_size() {
     mutex_lock l(em_->mu_);
     return em_->used_events_.size();
   }
 
-  int free_size() {
+  size_t free_size() {
     mutex_lock l(em_->mu_);
     return em_->free_events_.size();
   }
-- 
GitLab


From 83afdc92d9bdafeb65c3f84263ad09e337ff29e7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 15:01:39 -0800
Subject: [PATCH 0120/1563] Make resource variable shared name consistent with
 non-resource variables.

Remove colocation constraint from resource variable cached value with the
variable itself.
Change: 152192203
---
 .../resource_variable_ops_test.py             | 33 +++++++++++++++++++
 .../python/ops/resource_variable_ops.py       | 22 +++++++++----
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/kernel_tests/resource_variable_ops_test.py b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
index 0b81dcb8af..2fba15801c 100644
--- a/tensorflow/python/kernel_tests/resource_variable_ops_test.py
+++ b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
@@ -195,6 +195,39 @@ class ResourceVariableOpsTest(test_util.TensorFlowTestCase):
     self.assertIsInstance(w.dtype, dtypes.DType)
     self.assertEqual(v.dtype, w.dtype)
 
+  def testCachingDevice(self):
+    with ops.device("/job:server/task:1"):
+      v = resource_variable_ops.ResourceVariable(
+          2.0, caching_device="/job:localhost")
+      self.assertEqual("/job:localhost", v.value().device)
+      with self.assertRaisesRegexp(ValueError, "No attr named '_class'"):
+        _ = v.value().op.get_attr("_class")
+
+    with ops.colocate_with(v.op):
+      w = resource_variable_ops.ResourceVariable(
+          2.0, caching_device="/job:localhost")
+      self.assertEqual("/job:localhost", w.value().device)
+      with self.assertRaisesRegexp(ValueError, "No attr named '_class'"):
+        _ = w.value().op.get_attr("_class")
+
+  def testSharedName(self):
+    with self.test_session():
+      v = resource_variable_ops.ResourceVariable(300.0, name="var1")
+      v.initializer.run()
+
+      w = resource_variable_ops.var_handle_op(dtype=v.dtype.base_dtype,
+                                              shape=v.get_shape(),
+                                              shared_name="var1")
+      w_read = resource_variable_ops.read_variable_op(w, v.dtype.base_dtype)
+      self.assertEqual(300.0, w_read.eval())
+
+      x = resource_variable_ops.var_handle_op(dtype=v.dtype.base_dtype,
+                                              shape=v.get_shape(),
+                                              shared_name="var1/")
+      x_read = resource_variable_ops.read_variable_op(x, v.dtype.base_dtype)
+      with self.assertRaisesOpError("Resource .*/var1//.* does not exist"):
+        _ = x_read.eval()
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 12b39babe0..86e0cae27a 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -159,16 +159,15 @@ class ResourceVariable(object):
     with ops.control_dependencies(None):
       with ops.name_scope(name, "Variable", [] if init_from_fn else
                           [initial_value]) as name:
+        # pylint: disable=protected-access
+        true_name = ops._name_from_scope_name(name)
         if init_from_fn:
           # Use attr_scope and device(None) to simulate the behavior of
           # colocate_with when the variable we want to colocate with doesn't
           # yet exist.
-          # pylint: disable=protected-access
-          true_name = ops._name_from_scope_name(name)
           attr = attr_value_pb2.AttrValue(
               list=attr_value_pb2.AttrValue.ListValue(
                   s=[compat.as_bytes("loc:@%s" % true_name)]))
-          # pylint: disable=protected-access
           with ops.get_default_graph()._attr_scope({"_class": attr}):
             with ops.name_scope("Initializer"), ops.device(None):
               self._initial_value = ops.convert_to_tensor(
@@ -176,7 +175,8 @@ class ResourceVariable(object):
             self._handle = gen_resource_variable_ops.var_handle_op(
                 shape=self._initial_value.get_shape(),
                 dtype=self._initial_value.dtype.base_dtype,
-                shared_name=name, name=name)
+                shared_name=true_name, name=name)
+        # pylint: enable=protected-access
 
         # Or get the initial value from a Tensor or Python object.
         else:
@@ -185,7 +185,7 @@ class ResourceVariable(object):
           self._handle = gen_resource_variable_ops.var_handle_op(
               shape=self._initial_value.get_shape(),
               dtype=self._initial_value.dtype.base_dtype,
-              shared_name=name, name=name)
+              shared_name=true_name, name=name)
 
         self._dtype = self._initial_value.dtype.base_dtype
 
@@ -201,8 +201,16 @@ class ResourceVariable(object):
               self._handle, dtype=self._dtype)
           self._graph_element = value
           if caching_device is not None:
-            with ops.device(caching_device):
-              self._cached_value = array_ops.identity(value)
+            # Variables may be created in a tf.device() or ops.colocate_with()
+            # context. At the same time, users would expect caching device to be
+            # independent of this context, and/or would not expect the current
+            # device context to be merged with the caching device spec.
+            # Therefore we reset the colocation stack before creating the cached
+            # value. Note that resetting the colocation stack will also reset
+            # the device stack.
+            with ops.colocate_with(None, ignore_existing=True):
+              with ops.device(caching_device):
+                self._cached_value = array_ops.identity(value)
           else:
             self._cached_value = None
           ops.add_to_collections(collections, self)
-- 
GitLab


From 8f74d595ef8a7a617596529e129d2a05dd18bb90 Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Tue, 4 Apr 2017 15:13:44 -0800
Subject: [PATCH 0121/1563] Add a way to specify the optimization order;
 refactor and add constant folding to meta optimizer. Change: 152193646

---
 tensorflow/core/grappler/optimizers/BUILD     |  2 +
 .../grappler/optimizers/constant_folding.cc   |  3 +-
 .../grappler/optimizers/meta_optimizer.cc     | 61 ++++++++++++++++---
 .../core/grappler/optimizers/meta_optimizer.h |  1 +
 .../core/protobuf/rewriter_config.proto       |  4 ++
 5 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 4e41c2bb12..bd96e2b33c 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -17,6 +17,7 @@ filegroup(
     srcs = glob(
         [
             "*_optimizer.*",
+            "constant_folding.*",
             "model_pruner.*",
             "graph_rewriter.*",
         ],
@@ -175,6 +176,7 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        ":constant_folding",
         ":graph_optimizer",
         ":layout_optimizer",
         ":model_pruner",
diff --git a/tensorflow/core/grappler/optimizers/constant_folding.cc b/tensorflow/core/grappler/optimizers/constant_folding.cc
index 7cddedef2e..8f79c55810 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding.cc
+++ b/tensorflow/core/grappler/optimizers/constant_folding.cc
@@ -72,8 +72,7 @@ class DeviceSimple : public DeviceBase {
                              Tensor* tensor) override {
     Tensor parsed(tensor_proto.dtype());
     if (!parsed.FromProto(cpu_allocator(), tensor_proto)) {
-      return errors::InvalidArgument("Cannot parse tensor from proto: ",
-                                     tensor_proto.DebugString());
+      return errors::InvalidArgument("Cannot parse tensor from tensor_proto.");
     }
     *tensor = parsed;
     return Status::OK();
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 44a1f5bab9..d82d5a469d 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
+#include "tensorflow/core/grappler/optimizers/constant_folding.h"
+#include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/model_pruner.h"
 #include "tensorflow/core/lib/core/status.h"
@@ -21,25 +23,64 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+std::unique_ptr<GraphOptimizer> MetaOptimizer::NewOptimizer(
+    const string& optimizer) {
+  VLOG(1) << "Adding graph optimization pass: " << optimizer;
+  std::unique_ptr<GraphOptimizer> graph_optimizer;
+  if (optimizer == "pruning") {
+    graph_optimizer.reset(new ModelPruner());
+  }
+  if (optimizer == "constfold") {
+    graph_optimizer.reset(new ConstantFolding());
+  }
+  if (optimizer == "layout") {
+    graph_optimizer.reset(new LayoutOptimizer());
+  }
+  return graph_optimizer;
+}
+
 Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
                                GraphDef* optimized_graph) {
-  bool already_optimized = false;
-  if (!cfg_.disable_model_pruning()) {
-    already_optimized = true;
-    ModelPruner pruner;
-    TF_RETURN_IF_ERROR(pruner.Optimize(nullptr, item, optimized_graph));
+  std::vector<std::unique_ptr<GraphOptimizer>> optimizers;
+  if (cfg_.optimizers().empty()) {
+    if (!cfg_.disable_model_pruning()) {
+      optimizers.push_back(std::unique_ptr<GraphOptimizer>(new ModelPruner()));
+    }
+    if (cfg_.constant_folding()) {
+      optimizers.push_back(
+          std::unique_ptr<GraphOptimizer>(new ConstantFolding()));
+    }
+    if (cfg_.optimize_tensor_layout()) {
+      optimizers.push_back(
+          std::unique_ptr<GraphOptimizer>(new LayoutOptimizer()));
+    }
+  } else {
+    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout"};
+    for (const auto& optimizer : cfg_.optimizers()) {
+      if (avaliable_optimizers.find(optimizer) != avaliable_optimizers.end()) {
+        optimizers.push_back(NewOptimizer(optimizer));
+      }
+    }
+  }
+
+  if (optimizers.empty()) {
+    *optimized_graph = item.graph;
+    return Status::OK();
   }
-  if (cfg_.optimize_tensor_layout()) {
-    LayoutOptimizer layout_optimizer;
+
+  bool already_optimized = false;
+  for (const auto& optimizer : optimizers) {
     if (!already_optimized) {
-      return layout_optimizer.Optimize(nullptr, item, optimized_graph);
+      TF_RETURN_IF_ERROR(optimizer->Optimize(nullptr, item, optimized_graph));
+      already_optimized = true;
     } else {
       GrapplerItem optimized_item = item;
       optimized_item.graph = *optimized_graph;
-      return layout_optimizer.Optimize(nullptr, optimized_item,
-                                       optimized_graph);
+      TF_RETURN_IF_ERROR(
+          optimizer->Optimize(nullptr, optimized_item, optimized_graph));
     }
   }
+
   return Status::OK();
 }
 
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.h b/tensorflow/core/grappler/optimizers/meta_optimizer.h
index d7ff03f590..9def2cd711 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.h
@@ -39,6 +39,7 @@ class MetaOptimizer : public GraphOptimizer {
                 const GraphDef& optimized_graph, double result) override;
 
  private:
+  std::unique_ptr<GraphOptimizer> NewOptimizer(const string& optimizer);
   RewriterConfig cfg_;
 };
 
diff --git a/tensorflow/core/protobuf/rewriter_config.proto b/tensorflow/core/protobuf/rewriter_config.proto
index aef69461d8..6e9eff6225 100644
--- a/tensorflow/core/protobuf/rewriter_config.proto
+++ b/tensorflow/core/protobuf/rewriter_config.proto
@@ -9,4 +9,8 @@ option java_package = "org.tensorflow.framework";
 message RewriterConfig {
   bool optimize_tensor_layout = 1;
   bool disable_model_pruning = 2;
+  bool constant_folding = 3;
+  // If non-empty, will use this as an alternative way to specify a list of
+  // optimizations to turn on and the order of the optimizations.
+  repeated string optimizers = 100;
 }
-- 
GitLab


From 9477900946f923cb43ed76ed215490d01474bfe7 Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Tue, 4 Apr 2017 15:51:13 -0800
Subject: [PATCH 0122/1563] Backport fixes and improvements from external
 Keras. Change: 152198296

---
 .../contrib/keras/python/keras/__init__.py    |   2 +-
 .../contrib/keras/python/keras/activations.py |  24 ++-
 .../python/keras/applications/resnet50.py     |   4 +-
 .../contrib/keras/python/keras/backend.py     |  94 +++++++----
 .../keras/python/keras/engine/topology.py     |  30 +++-
 .../keras/python/keras/engine/training.py     |  26 ++-
 .../keras/python/keras/initializers.py        |   9 +-
 .../python/keras/layers/convolutional.py      |  36 ++--
 .../keras/layers/convolutional_recurrent.py   |   2 +-
 .../contrib/keras/python/keras/layers/core.py |   6 +-
 .../keras/python/keras/layers/local.py        |  16 +-
 .../keras/python/keras/layers/merge.py        | 156 ++++++++++++++++--
 .../python/keras/layers/normalization.py      |   2 +-
 .../keras/python/keras/layers/pooling.py      |  16 +-
 .../keras/python/keras/layers/recurrent.py    |  26 ++-
 .../keras/python/keras/layers/wrappers.py     |  50 ++++--
 .../contrib/keras/python/keras/metrics.py     |   9 +-
 .../contrib/keras/python/keras/models.py      |  23 ++-
 .../keras/python/keras/preprocessing/image.py |   2 +-
 .../keras/python/keras/utils/generic_utils.py |   5 +-
 .../keras/python/keras/utils/layer_utils.py   |   2 +-
 .../python/keras/wrappers/scikit_learn.py     |  34 +++-
 22 files changed, 424 insertions(+), 150 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/__init__.py b/tensorflow/contrib/keras/python/keras/__init__.py
index cdfc40dff1..ec316253db 100644
--- a/tensorflow/contrib/keras/python/keras/__init__.py
+++ b/tensorflow/contrib/keras/python/keras/__init__.py
@@ -37,4 +37,4 @@ from tensorflow.contrib.keras.python.keras import utils
 from tensorflow.contrib.keras.python.keras import wrappers
 
 
-__version__ = '2.0.0-tf'
+__version__ = '2.0.2-tf'
diff --git a/tensorflow/contrib/keras/python/keras/activations.py b/tensorflow/contrib/keras/python/keras/activations.py
index 1eac52dfad..67762c83ba 100644
--- a/tensorflow/contrib/keras/python/keras/activations.py
+++ b/tensorflow/contrib/keras/python/keras/activations.py
@@ -24,18 +24,28 @@ from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import deserialize_keras_object
 
 
-def softmax(x):
+def softmax(x, axis=-1):
+  """Softmax activation function.
+
+  Arguments:
+      x : Tensor.
+      axis: Integer, axis along which the softmax normalization is applied.
+
+  Returns:
+      Tensor, output of softmax transformation.
+
+  Raises:
+      ValueError: In case `dim(x) == 1`.
+  """
   ndim = K.ndim(x)
   if ndim == 2:
     return K.softmax(x)
-  elif ndim == 3:
-    e = K.exp(x - K.max(x, axis=-1, keepdims=True))
-    s = K.sum(e, axis=-1, keepdims=True)
+  elif ndim > 2:
+    e = K.exp(x - K.max(x, axis=axis, keepdims=True))
+    s = K.sum(e, axis=axis, keepdims=True)
     return e / s
   else:
-    raise ValueError('Cannot apply softmax to a tensor '
-                     'that is not 2D or 3D. '
-                     'Here, ndim=' + str(ndim))
+    raise ValueError('Cannot apply softmax to a tensor that is 1D')
 
 
 def elu(x, alpha=1.0):
diff --git a/tensorflow/contrib/keras/python/keras/applications/resnet50.py b/tensorflow/contrib/keras/python/keras/applications/resnet50.py
index 546fcb9433..12f7ca424e 100644
--- a/tensorflow/contrib/keras/python/keras/applications/resnet50.py
+++ b/tensorflow/contrib/keras/python/keras/applications/resnet50.py
@@ -163,8 +163,8 @@ def ResNet50(include_top=True,
   specified in your Keras config file.
 
   Arguments:
-      include_top: whether to include the 3 fully-connected
-          layers at the top of the network.
+      include_top: whether to include the fully-connected
+          layer at the top of the network.
       weights: one of `None` (random initialization)
           or "imagenet" (pre-training on ImageNet).
       input_tensor: optional Keras tensor (i.e. output of `layers.Input()`)
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index 9769bce3b0..d7c646c19a 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -22,7 +22,6 @@ from __future__ import division
 from __future__ import print_function
 
 from collections import defaultdict
-import errno
 import json
 import os
 import warnings
@@ -270,6 +269,7 @@ def clear_session():
   reset_uids()
   _SESSION = None
   phase = array_ops.placeholder(dtype='bool', name='keras_learning_phase')
+  _GRAPH_LEARNING_PHASES = {}
   _GRAPH_LEARNING_PHASES[ops.get_default_graph()] = phase
 
 
@@ -1257,6 +1257,34 @@ def prod(x, axis=None, keepdims=False):
   return math_ops.reduce_prod(x, reduction_indices=axis, keep_dims=keepdims)
 
 
+def cumsum(x, axis=0):
+  """Cumulative sum of the values in a tensor, alongside the specified axis.
+
+  Arguments:
+      x: A tensor or variable.
+      axis: An integer, the axis to compute the sum.
+
+  Returns:
+      A tensor of the cumulative sum of values of `x` along `axis`.
+  """
+  axis = _normalize_axis(axis, ndim(x))
+  return math_ops.cumsum(x, axis=axis)
+
+
+def cumprod(x, axis=0):
+  """Cumulative product of the values in a tensor, alongside the specified axis.
+
+  Arguments:
+      x: A tensor or variable.
+      axis: An integer, the axis to compute the product.
+
+  Returns:
+      A tensor of the cumulative product of values of `x` along `axis`.
+  """
+  axis = _normalize_axis(axis, ndim(x))
+  return math_ops.cumprod(x, axis=axis)
+
+
 def var(x, axis=None, keepdims=False):
   """Variance of a tensor, alongside the specified axis.
 
@@ -1330,8 +1358,7 @@ def any(x, axis=None, keepdims=False):
   """
   axis = _normalize_axis(axis, ndim(x))
   x = math_ops.cast(x, dtypes_module.bool)
-  x = math_ops.reduce_any(x, reduction_indices=axis, keep_dims=keepdims)
-  return math_ops.cast(x, dtypes_module.uint8)
+  return math_ops.reduce_any(x, reduction_indices=axis, keep_dims=keepdims)
 
 
 def all(x, axis=None, keepdims=False):
@@ -1347,8 +1374,7 @@ def all(x, axis=None, keepdims=False):
   """
   axis = _normalize_axis(axis, ndim(x))
   x = math_ops.cast(x, dtypes_module.bool)
-  x = math_ops.reduce_all(x, reduction_indices=axis, keep_dims=keepdims)
-  return math_ops.cast(x, dtypes_module.uint8)
+  return math_ops.reduce_all(x, reduction_indices=axis, keep_dims=keepdims)
 
 
 def argmax(x, axis=-1):
@@ -1645,7 +1671,7 @@ def normalize_batch_in_training(x, gamma, beta, reduction_axes, epsilon=1e-3):
   """
   mean, var = nn.moments(
       x, reduction_axes, shift=None, name=None, keep_dims=False)
-  if sorted(reduction_axes) == range(ndim(x))[:-1]:
+  if sorted(reduction_axes) == list(range(ndim(x)))[:-1]:
     normed = nn.batch_normalization(x, mean, var, beta, gamma, epsilon)
   else:
     # need broadcasting
@@ -2324,8 +2350,8 @@ def rnn(step_function,
           (no time dimension),
           containing the initial values for the states used in
           the step function.
-      go_backwards: boolean. If True, do the iteration over
-          the time dimension in reverse order.
+      go_backwards: boolean. If True, do the iteration over the time
+          dimension in reverse order and return the reversed sequence.
       mask: binary tensor with shape `(samples, time, 1)`,
           with a zero for every element that is masked.
       constants: a list of constant values passed at each step.
@@ -2414,9 +2440,9 @@ def rnn(step_function,
         states = return_states
         successive_outputs.append(output)
         successive_states.append(states)
-        last_output = successive_outputs[-1]
-        new_states = successive_states[-1]
-        outputs = array_ops.stack(successive_outputs)
+      last_output = successive_outputs[-1]
+      new_states = successive_states[-1]
+      outputs = array_ops.stack(successive_outputs)
     else:
       for inp in input_list:
         output, states = step_function(inp, states + constants)
@@ -3534,19 +3560,19 @@ def ctc_decode(y_pred, input_length, greedy=True, beam_width=100, top_paths=1):
 # HIGH ORDER FUNCTIONS
 
 
-def map_fn(fn, elems, name=None):
+def map_fn(fn, elems, name=None, dtype=None):
   """Map the function fn over the elements elems and return the outputs.
 
   Arguments:
       fn: Callable that will be called upon each element in elems
       elems: tensor
       name: A string name for the map node in the graph
+      dtype: Output data type.
 
   Returns:
-      Tensor with first dimension equal to the elems and second depending on
-      fn
+      Tensor with dtype `dtype`.
   """
-  return functional_ops.map_fn(fn, elems, name=name)
+  return functional_ops.map_fn(fn, elems, name=name, dtype=dtype)
 
 
 def foldl(fn, elems, initializer=None, name=None):
@@ -3560,7 +3586,7 @@ def foldl(fn, elems, initializer=None, name=None):
       name: A string name for the foldl node in the graph
 
   Returns:
-      Same type and shape as initializer
+      Tensor with same type and shape as `initializer`.
   """
   return functional_ops.foldl(fn, elems, initializer=initializer, name=name)
 
@@ -3583,27 +3609,39 @@ def foldr(fn, elems, initializer=None, name=None):
 
 # Load Keras default configuration from config file if present.
 _keras_base_dir = os.path.expanduser('~')
-if not os.access(_keras_base_dir, os.W_OK):
-  _keras_base_dir = '/tmp'
 _keras_dir = os.path.join(_keras_base_dir, '.keras')
-if not os.path.exists(_keras_dir):
-  try:
-    os.makedirs(_keras_dir)
-  except OSError as e:
-    if e.errno == errno.EEXIST:
-      pass
-    else:
-      raise
 _config_path = os.path.expanduser(os.path.join(_keras_dir, 'keras.json'))
 if os.path.exists(_config_path):
-  _config = json.load(open(_config_path))
+  try:
+    _config = json.load(open(_config_path))
+  except json.decoder.JSONDecodeError:
+    _config = {}
   _floatx = _config.get('floatx', floatx())
   assert _floatx in {'float16', 'float32', 'float64'}
   _epsilon = _config.get('epsilon', epsilon())
   assert isinstance(_epsilon, float)
-  _backend = backend()
   _image_data_format = _config.get('image_data_format', image_data_format())
   assert _image_data_format in {'channels_last', 'channels_first'}
   set_floatx(_floatx)
   set_epsilon(_epsilon)
   set_image_data_format(_image_data_format)
+
+# Save config file.
+if os.access(_keras_base_dir, os.W_OK):
+  if not os.path.exists(_keras_dir):
+    try:
+      os.makedirs(_keras_dir)
+    except OSError:
+      # Except potential race conditions
+      # in multi-threaded environments.
+      pass
+
+  if not os.path.exists(_config_path):
+    _config = {
+        'floatx': floatx(),
+        'epsilon': epsilon(),
+        'backend': 'tensorflow',
+        'image_data_format': image_data_format()
+    }
+    with open(_config_path, 'w') as f:
+      f.write(json.dumps(_config, indent=4))
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 0f506ff0a4..e33268235f 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -295,8 +295,14 @@ class Layer(object):
     # are only applicable to input layers: do not pass these keywords
     # to non-input layers.
     allowed_kwargs = {
-        'input_shape', 'batch_input_shape', 'batch_size', 'dtype', 'name',
-        'trainable', 'weights'
+        'input_shape',
+        'batch_input_shape',
+        'batch_size',
+        'dtype',
+        'name',
+        'trainable',
+        'weights',
+        'input_dtype',  # legacy
     }
     for kwarg in kwargs:
       if kwarg not in allowed_kwargs:
@@ -320,8 +326,15 @@ class Layer(object):
           batch_size = None
         batch_input_shape = (batch_size,) + tuple(kwargs['input_shape'])
       self.batch_input_shape = batch_input_shape
-      dtype = kwargs.get('dtype', K.floatx())
+
+      # Set dtype.
+      dtype = kwargs.get('dtype')
+      if dtype is None:
+        dtype = kwargs.get('input_dtype')
+      if dtype is None:
+        dtype = K.floatx()
       self.dtype = dtype
+
     if 'weights' in kwargs:
       self._initial_weights = kwargs['weights']
     else:
@@ -485,11 +498,12 @@ class Layer(object):
                                  ': expected shape=' + str(spec.shape) +
                                  ', found shape=' + str(x_shape))
 
-  def call(self, inputs):
+  def call(self, inputs, **kwargs):  # pylint: disable=unused-argument
     """This is where the layer's logic lives.
 
     Arguments:
-        inputs: input tensor, or list/tuple of input tensors.
+        inputs: Input tensor, or list/tuple of input tensors.
+        **kwargs: Additional keyword arguments.
 
     Returns:
         A tensor or list/tuple of tensors.
@@ -518,6 +532,8 @@ class Layer(object):
         ValueError: in case the layer is missing shape information
             for its `build` call.
     """
+    if isinstance(inputs, list):
+      inputs = inputs[:]
     with K.name_scope(self.name):
       # Handle laying building (weight creating, input spec locking).
       if not self.built:
@@ -1417,7 +1433,7 @@ class Container(Layer):
       get_weights
       set_weights
       get_config
-      get_output_shape_for
+      compute_output_shape
 
   # Class Methods
       from_config
@@ -2029,7 +2045,7 @@ class Container(Layer):
       for i in range(len(input_shapes)):
         layer = self.input_layers[i]
         input_shape = input_shapes[i]
-        # It's an input layer: get_output_shape_for is identity,
+        # It's an input layer: compute_output_shape is identity,
         # and there is only one node and one tensor output.
         shape_key = layer.name + '_0_0'
         layers_to_output_shapes[shape_key] = input_shape
diff --git a/tensorflow/contrib/keras/python/keras/engine/training.py b/tensorflow/contrib/keras/python/keras/engine/training.py
index efd437f6f6..0097c4a1c2 100644
--- a/tensorflow/contrib/keras/python/keras/engine/training.py
+++ b/tensorflow/contrib/keras/python/keras/engine/training.py
@@ -733,11 +733,12 @@ class Model(Container):
       loss_functions = []
       for name in self.output_names:
         if name not in loss:
-          warnings.warn('Output "' + name + '" missing from loss dictionary. '
-                        'We assume this was done on purpose, '
-                        'and we will not be expecting '
-                        'any data to be passed to "' + name +
-                        '" during training.')
+          warnings.warn(
+              'Output "' + name + '" missing from loss dictionary. '
+              'We assume this was done on purpose, '
+              'and we will not be expecting '
+              'any data to be passed to "' + name + '" during training.',
+              stacklevel=2)
         loss_functions.append(losses.get(loss.get(name)))
     elif isinstance(loss, list):
       if len(loss) != len(self.outputs):
@@ -1202,7 +1203,7 @@ class Model(Container):
       if batch_index == 0:
         for batch_out in batch_outs:
           shape = (samples,) + batch_out.shape[1:]
-          outs.append(np.zeros(shape, dtype=K.floatx()))
+          outs.append(np.zeros(shape, dtype=batch_out.dtype))
 
       for i, batch_out in enumerate(batch_outs):
         outs[i][batch_start:batch_end] = batch_out
@@ -1718,7 +1719,7 @@ class Model(Container):
             - a tuple (inputs, targets, sample_weights).
             All arrays should contain the same number of samples.
             The generator is expected to loop over its data
-            indefinitely. An epoch finishes when `samples_per_epoch`
+            indefinitely. An epoch finishes when `steps_per_epoch`
             samples have been seen by the model.
         steps_per_epoch: Total number of steps (batches of samples)
             to yield from `generator` before declaring one epoch
@@ -1767,7 +1768,7 @@ class Model(Container):
                 f.close()
 
         model.fit_generator(generate_arrays_from_file('/my_file.txt'),
-                            samples_per_epoch=10000, epochs=10)
+                            steps_per_epoch=10000, epochs=10)
     ```
 
     Raises:
@@ -2028,7 +2029,8 @@ class Model(Container):
                         steps,
                         max_q_size=10,
                         workers=1,
-                        pickle_safe=False):
+                        pickle_safe=False,
+                        verbose=0):
     """Generates predictions for the input samples from a data generator.
 
     The generator should return the same kind of data as accepted by
@@ -2048,6 +2050,7 @@ class Model(Container):
             non picklable arguments to the generator
             as they can't be passed
             easily to children processes.
+        verbose: verbosity mode, 0 or 1.
 
     Returns:
         Numpy array(s) of predictions.
@@ -2067,6 +2070,9 @@ class Model(Container):
       enqueuer = GeneratorEnqueuer(generator, pickle_safe=pickle_safe)
       enqueuer.start(workers=workers, max_q_size=max_q_size)
 
+      if verbose == 1:
+        progbar = Progbar(target=steps)
+
       while steps_done < steps:
         generator_output = None
         while enqueuer.is_running():
@@ -2103,6 +2109,8 @@ class Model(Container):
         for i, out in enumerate(outs):
           all_outs[i].append(out)
         steps_done += 1
+        if verbose == 1:
+          progbar.update(steps_done)
 
     finally:
       if enqueuer is not None:
diff --git a/tensorflow/contrib/keras/python/keras/initializers.py b/tensorflow/contrib/keras/python/keras/initializers.py
index 621069f424..f9cb35e171 100644
--- a/tensorflow/contrib/keras/python/keras/initializers.py
+++ b/tensorflow/contrib/keras/python/keras/initializers.py
@@ -45,14 +45,16 @@ class Initializer(object):
 
 
 class Zeros(Initializer):
-  """Initializer that generates tensors initialized to 0."""
+  """Initializer that generates tensors initialized to 0.
+  """
 
   def __call__(self, shape, dtype=None):
     return K.constant(0, shape=shape, dtype=dtype)
 
 
 class Ones(Initializer):
-  """Initializer that generates tensors initialized to 1."""
+  """Initializer that generates tensors initialized to 1.
+  """
 
   def __call__(self, shape, dtype=None):
     return K.constant(1, shape=shape, dtype=dtype)
@@ -130,7 +132,7 @@ class RandomUniform(Initializer):
 class TruncatedNormal(Initializer):
   """Initializer that generates a truncated normal distribution.
 
-  These values are similar to values from a `random_normal_initializer`
+  These values are similar to values from a `RandomNormal`
   except that values more than two standard deviations from the mean
   are discarded and re-drawn. This is the recommended initializer for
   neural network weights and filters.
@@ -161,6 +163,7 @@ class VarianceScaling(Initializer):
 
   With `distribution="normal"`, samples are drawn from a truncated normal
   distribution centered on zero, with `stddev = sqrt(scale / n)` where n is:
+
       - number of input units in the weight tensor, if mode = "fan_in"
       - number of output units, if mode = "fan_out"
       - average of the numbers of input and output units, if mode = "fan_avg"
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional.py b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
index 1a28399a28..3b68022115 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
@@ -244,7 +244,7 @@ class _Conv(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
@@ -289,7 +289,7 @@ class Conv1D(_Conv):
           any `dilation_rate` value != 1.
       padding: One of `"valid"`, `"causal"` or `"same"` (case-insensitive).
           `"causal"` results in causal (dilated) convolutions, e.g. output[t]
-          depends solely on input[:t-1]. Useful when modeling temporal data
+          does not depend on input[t+1:]. Useful when modeling temporal data
           where the model should not violate the temporal order.
           See [WaveNet: A Generative Model for Raw Audio, section
             2.1](https://arxiv.org/abs/1609.03499).
@@ -395,9 +395,9 @@ class Conv2D(_Conv):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -621,7 +621,7 @@ class Conv2DTranspose(Conv2D):
 
   Arguments:
       filters: Integer, the dimensionality of the output space
-          (i.e. the number output of filters in the convolution).
+          (i.e. the number of output filters in the convolution).
       kernel_size: An integer or tuple/list of 2 integers, specifying the
           width and height of the 2D convolution window.
           Can be a single integer to specify the same value for
@@ -637,9 +637,9 @@ class Conv2DTranspose(Conv2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -688,7 +688,7 @@ class Conv2DTranspose(Conv2D):
                kernel_size,
                strides=(1, 1),
                padding='valid',
-               data_format='channels_last',
+               data_format=None,
                activation=None,
                use_bias=True,
                kernel_initializer='glorot_uniform',
@@ -845,9 +845,9 @@ class SeparableConv2D(Conv2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -1079,9 +1079,9 @@ class UpSampling2D(Layer):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -1257,7 +1257,7 @@ class ZeroPadding2D(Layer):
           - If tuple of 2 ints:
               interpreted as two different
               symmetric padding values for height and width:
-              `(symmetric_height_pad, symmetrc_width_pad)`.
+              `(symmetric_height_pad, symmetric_width_pad)`.
           - If tuple of 2 tuples of 2 ints:
               interpreted as
               `((top_pad, bottom_pad), (left_pad, right_pad))`
@@ -1265,9 +1265,9 @@ class ZeroPadding2D(Layer):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -1498,7 +1498,7 @@ class Cropping2D(Layer):
           - If tuple of 2 ints:
               interpreted as two different
               symmetric cropping values for height and width:
-              `(symmetric_height_crop, symmetrc_width_crop)`.
+              `(symmetric_height_crop, symmetric_width_crop)`.
           - If tuple of 2 tuples of 2 ints:
               interpreted as
               `((top_crop, bottom_crop), (left_crop, right_crop))`
@@ -1506,9 +1506,9 @@ class Cropping2D(Layer):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py b/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
index 4ed5046dc3..4d8ef44da7 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
@@ -357,7 +357,7 @@ class ConvLSTM2D(ConvRecurrent2D):
       self.states = [None, None]
 
     if self.data_format == 'channels_first':
-      channel_axis = 1
+      channel_axis = 2
     else:
       channel_axis = -1
     if input_shape[channel_axis] is None:
diff --git a/tensorflow/contrib/keras/python/keras/layers/core.py b/tensorflow/contrib/keras/python/keras/layers/core.py
index 1207cc119f..8dd55aaa2e 100644
--- a/tensorflow/contrib/keras/python/keras/layers/core.py
+++ b/tensorflow/contrib/keras/python/keras/layers/core.py
@@ -88,7 +88,7 @@ class Dropout(Layer):
   """Applies Dropout to the input.
 
   Dropout consists in randomly setting
-  a fraction `p` of input units to 0 at each update during training time,
+  a fraction `rate` of input units to 0 at each update during training time,
   which helps prevent overfitting.
 
   Arguments:
@@ -140,7 +140,7 @@ class SpatialDropout1D(Dropout):
   between feature maps and should be used instead.
 
   Arguments:
-      p: float between 0 and 1. Fraction of the input units to drop.
+      rate: float between 0 and 1. Fraction of the input units to drop.
 
   Input shape:
       3D tensor with shape:
@@ -775,7 +775,7 @@ class Dense(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
diff --git a/tensorflow/contrib/keras/python/keras/layers/local.py b/tensorflow/contrib/keras/python/keras/layers/local.py
index 3bf5ee4f0f..895d6e3727 100644
--- a/tensorflow/contrib/keras/python/keras/layers/local.py
+++ b/tensorflow/contrib/keras/python/keras/layers/local.py
@@ -59,7 +59,8 @@ class LocallyConnected1D(Layer):
           specifying the stride length of the convolution.
           Specifying any stride value != 1 is incompatible with specifying
           any `dilation_rate` value != 1.
-      padding: One of `"valid"` or `"same"` (case-insensitive).
+      padding: Currently only supports `"valid"` (case-insensitive).
+          `"same"` may be supported in the future.
       activation: Activation function to use.
           If you don't specify anything, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
@@ -188,7 +189,7 @@ class LocallyConnected1D(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
@@ -239,16 +240,15 @@ class LocallyConnected2D(Layer):
           specifying the strides of the convolution along the width and height.
           Can be a single integer to specify the same value for
           all spatial dimensions.
-          Specifying any stride value != 1 is incompatible with specifying
-          any `dilation_rate` value != 1.
-      padding: one of `"valid"` or `"same"` (case-insensitive).
+      padding: Currently only support `"valid"` (case-insensitive).
+          `"same"` will be supported in future.
       data_format: A string,
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -460,7 +460,7 @@ class LocallyConnected2D(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
diff --git a/tensorflow/contrib/keras/python/keras/layers/merge.py b/tensorflow/contrib/keras/python/keras/layers/merge.py
index eea4313d31..d52bd2bbb3 100644
--- a/tensorflow/contrib/keras/python/keras/layers/merge.py
+++ b/tensorflow/contrib/keras/python/keras/layers/merge.py
@@ -41,6 +41,44 @@ class _Merge(Layer):
   def _merge_function(self, inputs):
     raise NotImplementedError
 
+  def _compute_elemwise_op_output_shape(self, shape1, shape2):
+    """Computes the shape of the resultant of an elementwise operation.
+
+    Arguments:
+        shape1: tuple or None. Shape of the first tensor
+        shape2: tuple or None. Shape of the second tensor
+
+    Returns:
+        expected output shape when an element-wise operation is
+        carried out on 2 tensors with shapes shape1 and shape2.
+        tuple or None.
+
+    Raises:
+        ValueError: if shape1 and shape2 are not compatible for
+            element-wise operations.
+    """
+    if None in [shape1, shape2]:
+      return None
+    elif len(shape1) < len(shape2):
+      return self._compute_elemwise_op_output_shape(shape2, shape1)
+    elif not shape2:
+      return shape1
+    output_shape = list(shape1[:-len(shape2)])
+    for i, j in zip(shape1[-len(shape2):], shape2):
+      if i is None or j is None:
+        output_shape.append(None)
+      elif i == 1:
+        output_shape.append(j)
+      elif j == 1:
+        output_shape.append(i)
+      else:
+        if i != j:
+          raise ValueError('Operands could not be broadcast '
+                           'together with shapes ' + str(shape1) + ' ' + str(
+                               shape2))
+        output_shape.append(i)
+    return tuple(output_shape)
+
   def build(self, input_shape):
     # Used purely for shape validation.
     if not isinstance(input_shape, list):
@@ -49,23 +87,107 @@ class _Merge(Layer):
       raise ValueError('A merge layer should be called '
                        'on a list of at least 2 inputs. '
                        'Got ' + str(len(input_shape)) + ' inputs.')
-    if all([shape is None for shape in input_shape]):
-      return
-    input_shapes = [
-        tuple(tensor_shape.TensorShape(shape).as_list())
-        for shape in input_shape
-    ]
-    # TODO(fchollet): handle shapes with None entries.
-    input_shapes_set = set(input_shapes)
-    if None in input_shapes_set:
-      input_shapes_set.remove(None)
-    if len(input_shapes_set) > 1:
-      raise ValueError('Only tensors of same shape can '
-                       'be merged by layer' + self.name +
-                       ' Got input shapes: %s' % input_shapes)
+    batch_sizes = [s[0] for s in input_shape if s is not None]
+    batch_sizes = set(batch_sizes)
+    batch_sizes -= set([None])
+    if len(batch_sizes) > 1:
+      raise ValueError('Can not merge tensors with different '
+                       'batch sizes. Got tensors with shapes : ' + str(
+                           input_shape))
+    if input_shape[0] is None:
+      output_shape = None
+    else:
+      output_shape = input_shape[0][1:]
+    for i in range(1, len(input_shape)):
+      if input_shape[i] is None:
+        shape = None
+      else:
+        shape = input_shape[i][1:]
+      output_shape = self._compute_elemwise_op_output_shape(output_shape, shape)
+    # If the inputs have different ranks, we have to reshape them
+    # to make them broadcastable.
+    if None not in input_shape and len(set(map(len, input_shape))) == 1:
+      self._reshape_required = False
+    else:
+      self._reshape_required = True
 
   def call(self, inputs):
-    return self._merge_function(inputs)
+    if self._reshape_required:
+      reshaped_inputs = []
+      input_ndims = list(map(K.ndim, inputs))
+      if None not in input_ndims:
+        # If ranks of all inputs are available,
+        # we simply expand each of them at axis=1
+        # until all of them have the same rank.
+        max_ndim = max(input_ndims)
+        for x in inputs:
+          x_ndim = K.ndim(x)
+          for _ in range(max_ndim - x_ndim):
+            x = K.expand_dims(x, 1)
+          reshaped_inputs.append(x)
+        return self._merge_function(reshaped_inputs)
+      else:
+        # Transpose all inputs so that batch size is the last dimension.
+        # (batch_size, dim1, dim2, ... ) -> (dim1, dim2, ... , batch_size)
+        transposed = False
+        for x in inputs:
+          x_ndim = K.ndim(x)
+          if x_ndim is None:
+            x_shape = K.shape(x)
+            batch_size = x_shape[0]
+            new_shape = K.concatenate([x_shape[1:], K.expand_dims(batch_size)])
+            x_transposed = K.reshape(x,
+                                     K.stack([batch_size, K.prod(x_shape[1:])]))
+            x_transposed = K.permute_dimensions(x_transposed, (1, 0))
+            x_transposed = K.reshape(x_transposed, new_shape)
+            reshaped_inputs.append(x_transposed)
+            transposed = True
+          elif x_ndim > 1:
+            dims = list(range(1, x_ndim)) + [0]
+            reshaped_inputs.append(K.permute_dimensions(x, dims))
+            transposed = True
+          else:
+            # We don't transpose inputs if they are 1D vectors or scalars.
+            reshaped_inputs.append(x)
+        y = self._merge_function(reshaped_inputs)
+        y_ndim = K.ndim(y)
+        if transposed:
+          # If inputs have been transposed, we have to transpose the output too.
+          if y_ndim is None:
+            y_shape = K.shape(y)
+            y_ndim = K.shape(y_shape)[0]
+            batch_size = y_shape[y_ndim - 1]
+            new_shape = K.concatenate(
+                [K.expand_dims(batch_size), y_shape[:y_ndim - 1]])
+            y = K.reshape(y, (-1, batch_size))
+            y = K.permute_dimensions(y, (1, 0))
+            y = K.reshape(y, new_shape)
+          elif y_ndim > 1:
+            dims = [y_ndim - 1] + list(range(y_ndim - 1))
+            y = K.permute_dimensions(y, dims)
+        return y
+    else:
+      return self._merge_function(inputs)
+
+  def compute_output_shape(self, input_shape):
+    if input_shape[0] is None:
+      output_shape = None
+    else:
+      output_shape = input_shape[0][1:]
+    for i in range(1, len(input_shape)):
+      if input_shape[i] is None:
+        shape = None
+      else:
+        shape = input_shape[i][1:]
+      output_shape = self._compute_elemwise_op_output_shape(output_shape, shape)
+    batch_sizes = [s[0] for s in input_shape if s is not None]
+    batch_sizes = set(batch_sizes)
+    batch_sizes -= set([None])
+    if len(batch_sizes) == 1:
+      output_shape = (list(batch_sizes)[0],) + output_shape
+    else:
+      output_shape = (None,) + output_shape
+    return output_shape
 
   def compute_mask(self, inputs, mask=None):
     if mask is None:
@@ -219,8 +341,8 @@ class Concatenate(_Merge):
     for input_i, mask_i in zip(inputs, mask):
       if mask_i is None:
         # Input is unmasked. Append all 1s to masks,
-        # but cast it to uint8 first
-        masks.append(K.cast(K.ones_like(input_i), 'uint8'))
+        # but cast it to bool first
+        masks.append(K.cast(K.ones_like(input_i), 'bool'))
       elif K.ndim(mask_i) < K.ndim(input_i):
         # Mask is smaller than the input, expand it
         masks.append(K.expand_dims(mask_i))
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index 41c618cc79..d429cd6d9b 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -154,7 +154,7 @@ class BatchNormalization(Layer):
     broadcast_shape[self.axis] = input_shape[self.axis]
 
     # Determines whether broadcasting is needed.
-    needs_broadcasting = (sorted(reduction_axes) != range(ndim)[:-1])
+    needs_broadcasting = (sorted(reduction_axes) != list(range(ndim))[:-1])
 
     normed, mean, variance = K.normalize_batch_in_training(
         inputs, self.gamma, self.beta, reduction_axes, epsilon=self.epsilon)
diff --git a/tensorflow/contrib/keras/python/keras/layers/pooling.py b/tensorflow/contrib/keras/python/keras/layers/pooling.py
index e31caed3ec..47c88bf4d0 100644
--- a/tensorflow/contrib/keras/python/keras/layers/pooling.py
+++ b/tensorflow/contrib/keras/python/keras/layers/pooling.py
@@ -199,9 +199,9 @@ class MaxPooling2D(_Pooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -255,9 +255,9 @@ class AveragePooling2D(_Pooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -542,9 +542,9 @@ class GlobalAveragePooling2D(_GlobalPooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -577,9 +577,9 @@ class GlobalMaxPooling2D(_GlobalPooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
diff --git a/tensorflow/contrib/keras/python/keras/layers/recurrent.py b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
index 06986d3eaa..6301132f4d 100644
--- a/tensorflow/contrib/keras/python/keras/layers/recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
@@ -105,8 +105,16 @@ class Recurrent(Layer):
       # now model.output_shape == (None, 32)
       # note: `None` is the batch dimension.
 
-      # for subsequent layers, not need to specify the input size:
+      # for subsequent layers, no need to specify the input size:
       model.add(LSTM(16))
+
+      # to stack recurrent layers, you must use return_sequences=True
+      # on any recurrent layer that feeds into another recurrent layer.
+      # note that you only need to specify the input size on the first layer.
+      model = Sequential()
+      model.add(LSTM(64, input_dim=64, input_length=10, return_sequences=True))
+      model.add(LSTM(32, return_sequences=True))
+      model.add(LSTM(10))
   ```
 
   Arguments:
@@ -116,7 +124,8 @@ class Recurrent(Layer):
       return_sequences: Boolean. Whether to return the last output
           in the output sequence, or the full sequence.
       go_backwards: Boolean (default False).
-          If True, process the input sequence backwards.
+          If True, process the input sequence backwards and return the
+          reversed sequence.
       stateful: Boolean (default False). If True, the last state
           for each sample at index i in a batch will be used as initial
           state for the sample of index i in the following batch.
@@ -398,6 +407,7 @@ class SimpleRNN(Recurrent):
       units: Positive integer, dimensionality of the output space.
       activation: Activation function to use.
           If you don't specify anything, no activation is applied
+          If you pass None, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
       use_bias: Boolean, whether the layer uses a bias vector.
       kernel_initializer: Initializer for the `kernel` weights matrix,
@@ -547,7 +557,7 @@ class SimpleRNN(Recurrent):
 
   def get_constants(self, inputs, training=None):
     constants = []
-    if self.implementation == 0 and 0 < self.dropout < 1:
+    if self.implementation != 0 and 0 < self.dropout < 1:
       input_shape = K.int_shape(inputs)
       input_dim = input_shape[-1]
       ones = K.ones_like(K.reshape(inputs[:, 0, 0], (-1, 1)))
@@ -619,7 +629,7 @@ class GRU(Recurrent):
   Arguments:
       units: Positive integer, dimensionality of the output space.
       activation: Activation function to use.
-          If you don't specify anything, no activation is applied
+          If you pass None, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
       recurrent_activation: Activation function to use
           for the recurrent step.
@@ -792,7 +802,7 @@ class GRU(Recurrent):
 
   def get_constants(self, inputs, training=None):
     constants = []
-    if self.implementation == 0 and 0 < self.dropout < 1:
+    if self.implementation != 0 and 0 < self.dropout < 1:
       input_shape = K.int_shape(inputs)
       input_dim = input_shape[-1]
       ones = K.ones_like(K.reshape(inputs[:, 0, 0], (-1, 1)))
@@ -861,7 +871,7 @@ class GRU(Recurrent):
         if self.use_bias:
           x_z = K.bias_add(x_z, self.bias_z)
           x_r = K.bias_add(x_r, self.bias_r)
-          x_h = K.bias_add(x_r, self.bias_h)
+          x_h = K.bias_add(x_h, self.bias_h)
       else:
         raise ValueError('Unknown `implementation` mode.')
       z = self.recurrent_activation(x_z + K.dot(h_tm1 * rec_dp_mask[0],
@@ -924,7 +934,7 @@ class LSTM(Recurrent):
   Arguments:
       units: Positive integer, dimensionality of the output space.
       activation: Activation function to use.
-          If you don't specify anything, no activation is applied
+          If you pass None, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
       recurrent_activation: Activation function to use
           for the recurrent step.
@@ -1127,7 +1137,7 @@ class LSTM(Recurrent):
 
   def get_constants(self, inputs, training=None):
     constants = []
-    if self.implementation == 0 and 0 < self.dropout < 1:
+    if self.implementation != 0 and 0 < self.dropout < 1:
       input_shape = K.int_shape(inputs)
       input_dim = input_shape[-1]
       ones = K.ones_like(K.reshape(inputs[:, 0, 0], (-1, 1)))
diff --git a/tensorflow/contrib/keras/python/keras/layers/wrappers.py b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
index 75b4810e40..eeb67493ee 100644
--- a/tensorflow/contrib/keras/python/keras/layers/wrappers.py
+++ b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
+# pylint: disable=protected-access
 """Wrapper layers: layers that augment the functionality of another layer.
 """
 from __future__ import absolute_import
@@ -19,6 +20,7 @@ from __future__ import division
 from __future__ import print_function
 
 import copy
+import inspect
 
 from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.engine import InputSpec
@@ -70,9 +72,10 @@ class Wrapper(Layer):
     return dict(list(base_config.items()) + list(config.items()))
 
   @classmethod
-  def from_config(cls, config):
+  def from_config(cls, config, custom_objects=None):
     from tensorflow.contrib.keras.python.keras.layers import deserialize as deserialize_layer  # pylint: disable=g-import-not-at-top
-    layer = deserialize_layer(config.pop('layer'))
+    layer = deserialize_layer(
+        config.pop('layer'), custom_objects=custom_objects)
     return cls(layer, **config)
 
 
@@ -188,12 +191,15 @@ class Bidirectional(Wrapper):
           If None, the outputs will not be combined,
           they will be returned as a list.
 
+  Raises:
+      ValueError: In case of invalid `merge_mode` argument.
+
   Examples:
 
   ```python
       model = Sequential()
       model.add(Bidirectional(LSTM(10, return_sequences=True), input_shape=(5,
-        10)))
+      10)))
       model.add(Bidirectional(LSTM(10)))
       model.add(Dense(5))
       model.add(Activation('softmax'))
@@ -242,29 +248,47 @@ class Bidirectional(Wrapper):
       shape = self.forward_layer._compute_output_shape(input_shape)  # pylint: disable=protected-access
       return [shape, copy.copy(shape)]
 
-  def call(self, inputs, mask=None):
-    y = self.forward_layer.call(inputs, mask)
-    y_rev = self.backward_layer.call(inputs, mask)
+  def call(self, inputs, training=None, mask=None):
+    kwargs = {}
+    func_args = inspect.getargspec(self.layer.call).args
+    if 'training' in func_args:
+      kwargs['training'] = training
+    if 'mask' in func_args:
+      kwargs['mask'] = mask
+
+    y = self.forward_layer.call(inputs, **kwargs)
+    y_rev = self.backward_layer.call(inputs, **kwargs)
     if self.return_sequences:
       y_rev = K.reverse(y_rev, 1)
     if self.merge_mode == 'concat':
-      return K.concatenate([y, y_rev])
+      output = K.concatenate([y, y_rev])
     elif self.merge_mode == 'sum':
-      return y + y_rev
+      output = y + y_rev
     elif self.merge_mode == 'ave':
-      return (y + y_rev) / 2
+      output = (y + y_rev) / 2
     elif self.merge_mode == 'mul':
-      return y * y_rev
+      output = y * y_rev
     elif self.merge_mode is None:
-      return [y, y_rev]
+      output = [y, y_rev]
+
+    # Properly set learning phase
+    if 0 < self.layer.dropout + self.layer.recurrent_dropout:
+      if self.merge_mode is None:
+        for out in output:
+          out._uses_learning_phase = True
+      else:
+        output._uses_learning_phase = True
+    return output
 
   def reset_states(self):
     self.forward_layer.reset_states()
     self.backward_layer.reset_states()
 
   def build(self, input_shape):
-    self.forward_layer.build(input_shape)
-    self.backward_layer.build(input_shape)
+    with K.name_scope(self.forward_layer.name):
+      self.forward_layer.build(input_shape)
+    with K.name_scope(self.backward_layer.name):
+      self.backward_layer.build(input_shape)
     self.built = True
 
   def compute_mask(self, inputs, mask):
diff --git a/tensorflow/contrib/keras/python/keras/metrics.py b/tensorflow/contrib/keras/python/keras/metrics.py
index d7266c94cf..59d380f73b 100644
--- a/tensorflow/contrib/keras/python/keras/metrics.py
+++ b/tensorflow/contrib/keras/python/keras/metrics.py
@@ -43,12 +43,15 @@ def binary_accuracy(y_true, y_pred):
 
 
 def categorical_accuracy(y_true, y_pred):
-  return K.equal(K.argmax(y_true, axis=-1), K.argmax(y_pred, axis=-1))
+  return K.cast(
+      K.equal(K.argmax(y_true, axis=-1), K.argmax(y_pred, axis=-1)), K.floatx())
 
 
 def sparse_categorical_accuracy(y_true, y_pred):
-  return K.equal(
-      K.max(y_true, axis=-1), K.cast(K.argmax(y_pred, axis=-1), K.floatx()))
+  return K.cast(
+      K.equal(
+          K.max(y_true, axis=-1), K.cast(K.argmax(y_pred, axis=-1),
+                                         K.floatx())), K.floatx())
 
 
 def top_k_categorical_accuracy(y_true, y_pred, k=5):
diff --git a/tensorflow/contrib/keras/python/keras/models.py b/tensorflow/contrib/keras/python/keras/models.py
index 2be4431d03..5289bb732b 100644
--- a/tensorflow/contrib/keras/python/keras/models.py
+++ b/tensorflow/contrib/keras/python/keras/models.py
@@ -207,7 +207,7 @@ def load_model(filepath, custom_objects=None):
       ValueError: In case of an invalid savefile.
   """
   if h5py is None:
-    raise ImportError('`save_model` requires h5py.')
+    raise ImportError('`load_model` requires h5py.')
 
   if not custom_objects:
     custom_objects = {}
@@ -1006,7 +1006,7 @@ class Sequential(Model):
         steps_per_epoch: Total number of steps (batches of samples)
             to yield from `generator` before declaring one epoch
             finished and starting the next epoch. It should typically
-            be equal to the number of unique samples if your dataset
+            be equal to the number of unique samples of your dataset
             divided by the batch size.
         epochs: Integer, total number of iterations on the data.
         verbose: Verbosity mode, 0, 1, or 2.
@@ -1017,8 +1017,10 @@ class Sequential(Model):
             - A tuple (inputs, targets, sample_weights).
         validation_steps: Only relevant if `validation_data`
             is a generator.
-            Number of samples to use from validation generator
-            at the end of every epoch.
+            Number of steps to yield from validation generator
+            at the end of every epoch. It should typically
+            be equal to the number of unique samples of your
+            validation dataset divided by the batch size.
         class_weight: Dictionary mapping class indices to a weight
             for the class.
         max_q_size: Maximum size for the generator queue
@@ -1050,7 +1052,7 @@ class Sequential(Model):
                     # and labels, from each line in the file
                     x, y = process_line(line)
                     yield (x, y)
-                f.close()
+                    f.close()
 
         model.fit_generator(generate_arrays_from_file('/my_file.txt'),
                             samples_per_epoch=10000, epochs=10)
@@ -1119,7 +1121,8 @@ class Sequential(Model):
                         steps,
                         max_q_size=10,
                         workers=1,
-                        pickle_safe=False):
+                        pickle_safe=False,
+                        verbose=0):
     """Generates predictions for the input samples from a data generator.
 
     The generator should return the same kind of data as accepted by
@@ -1136,6 +1139,7 @@ class Sequential(Model):
             relies on multiprocessing, you should not pass
             non picklable arguments to the generator
             as they can't be passed easily to children processes.
+        verbose: verbosity mode, 0 or 1.
 
     Returns:
         A Numpy array of predictions.
@@ -1147,7 +1151,8 @@ class Sequential(Model):
         steps,
         max_q_size=max_q_size,
         workers=workers,
-        pickle_safe=pickle_safe)
+        pickle_safe=pickle_safe,
+        verbose=verbose)
 
   def get_config(self):
     config = []
@@ -1159,9 +1164,9 @@ class Sequential(Model):
     return copy.deepcopy(config)
 
   @classmethod
-  def from_config(cls, config):
+  def from_config(cls, config, custom_objects=None):
     model = cls()
     for conf in config:
-      layer = layer_module.deserialize(conf)
+      layer = layer_module.deserialize(conf, custom_objects=custom_objects)
       model.add(layer)
     return model
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/image.py b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
index 86c7650a07..de0749ae02 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/image.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
@@ -785,7 +785,7 @@ class Iterator(object):
           index_array = np.random.permutation(n)
 
       current_index = (self.batch_index * batch_size) % n
-      if n >= current_index + batch_size:
+      if n > current_index + batch_size:
         current_batch_size = batch_size
         self.batch_index += 1
       else:
diff --git a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
index c1e0296835..6e83fde2c9 100644
--- a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
@@ -172,7 +172,8 @@ def deserialize_keras_object(identifier,
     else:
       fn = module_objects.get(function_name)
       if fn is None:
-        raise ValueError('Unknown ' + printable_module_name, ':' + class_name)
+        raise ValueError('Unknown ' + printable_module_name,
+                         ':' + function_name)
     return fn
   else:
     raise ValueError('Could not interpret serialized ' + printable_module_name +
@@ -215,6 +216,8 @@ def func_load(code, defaults=None, closure=None, globs=None):
   """
   if isinstance(code, (tuple, list)):  # unpack previous dump
     code, defaults, closure = code
+    if isinstance(defaults, list):
+      defaults = tuple(defaults)
   code = marshal.loads(code.encode('raw_unicode_escape'))
   if globs is None:
     globs = globals()
diff --git a/tensorflow/contrib/keras/python/keras/utils/layer_utils.py b/tensorflow/contrib/keras/python/keras/utils/layer_utils.py
index 32e0de7d3d..26878fdd57 100644
--- a/tensorflow/contrib/keras/python/keras/utils/layer_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/layer_utils.py
@@ -171,7 +171,7 @@ def count_total_params(layers, layer_set=None):
           [K.count_params(p) for p in layer.trainable_weights])
       non_trainable_count += np.sum(
           [K.count_params(p) for p in layer.non_trainable_weights])
-  return trainable_count, non_trainable_count
+  return int(trainable_count), int(non_trainable_count)
 
 
 def convert_all_kernels_in_model(model):
diff --git a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
index ecda890fec..323c31aee8 100644
--- a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
+++ b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
@@ -194,6 +194,36 @@ class KerasClassifier(BaseWrapper):
   """Implementation of the scikit-learn classifier API for Keras.
   """
 
+  def fit(self, x, y, **kwargs):
+    """Constructs a new model with `build_fn` & fit the model to `(x, y)`.
+
+    Arguments:
+        x : array-like, shape `(n_samples, n_features)`
+            Training samples where n_samples in the number of samples
+            and n_features is the number of features.
+        y : array-like, shape `(n_samples,)` or `(n_samples, n_outputs)`
+            True labels for X.
+        **kwargs: dictionary arguments
+            Legal arguments are the arguments of `Sequential.fit`
+
+    Returns:
+        history : object
+            details about the training history at each epoch.
+
+    Raises:
+        ValueError: In case of invalid shape for `y` argument.
+    """
+    y = np.array(y)
+    if len(y.shape) == 2 and y.shape[1] > 1:
+      self.classes_ = np.arange(y.shape[1])
+    elif (len(y.shape) == 2 and y.shape[1] == 1) or len(y.shape) == 1:
+      self.classes_ = np.unique(y)
+      y = np.searchsorted(self.classes_, y)
+    else:
+      raise ValueError('Invalid shape for y: ' + str(y.shape))
+    self.n_classes_ = len(self.classes_)
+    return super(KerasClassifier, self).fit(x, y, **kwargs)
+
   def predict(self, x, **kwargs):
     """Returns the class predictions for the given test data.
 
@@ -210,7 +240,8 @@ class KerasClassifier(BaseWrapper):
             Class predictions.
     """
     kwargs = self.filter_sk_params(Sequential.predict_classes, kwargs)
-    return self.model.predict_classes(x, **kwargs)
+    classes = self.model.predict_classes(x, **kwargs)
+    return self.classes_[classes]
 
   def predict_proba(self, x, **kwargs):
     """Returns class probability estimates for the given test data.
@@ -261,6 +292,7 @@ class KerasClassifier(BaseWrapper):
             compute accuracy. You should pass `metrics=["accuracy"]` to
             the `.compile()` method of the model.
     """
+    y = np.searchsorted(self.classes_, y)
     kwargs = self.filter_sk_params(Sequential.evaluate, kwargs)
 
     loss_name = self.model.loss
-- 
GitLab


From ccbc8991db3943ef984405881a1c917c530f902f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 16:10:08 -0800
Subject: [PATCH 0123/1563] Merge changes from github. Change: 152200430

---
 .gitignore                                    |    1 +
 README.md                                     |   17 +-
 RELEASE.md                                    |  109 +-
 WORKSPACE                                     |    8 +-
 configure                                     |   90 +-
 .../compiler/aot/tests/make_test_graphs.py    |    4 +-
 tensorflow/compiler/tests/nary_ops_test.py    |   14 +-
 .../compiler/tests/pooling_ops_3d_test.py     |   18 +-
 tensorflow/contrib/android/cmake/build.gradle |    3 +-
 tensorflow/contrib/cmake/CMakeLists.txt       |   26 +-
 tensorflow/contrib/cmake/README.md            |    8 +-
 .../contrib/cmake/external/jemalloc.cmake     |   33 +
 tensorflow/contrib/cmake/tf_tools.cmake       |    5 +-
 .../camera/CameraExampleViewController.h      |    1 -
 .../camera/CameraExampleViewController.mm     |   25 -
 .../camera_example.xcodeproj/project.pbxproj  |    4 -
 .../ios_examples/camera/data/grace_hopper.jpg |  Bin 73746 -> 0 bytes
 .../contrib/ios_examples/camera/squarePNG.png |  Bin 9432 -> 0 bytes
 .../layers/python/layers/embedding_ops.py     |  357 +++-
 .../python/layers/embedding_ops_test.py       |  291 ++-
 .../layers/python/layers/feature_column.py    |    2 +
 .../contrib/learn/python/learn/README.md      |   18 +-
 .../dataframe/queues/feeding_functions.py     |    1 +
 .../python/learn/estimators/run_config.py     |    8 +-
 .../learn/python/learn/learn_io/__init__.py   |    1 +
 .../python/learn/learn_io/generator_io.py     |  134 ++
 .../learn/learn_io/generator_io_test.py       |  348 ++++
 tensorflow/contrib/makefile/Makefile          |    1 +
 tensorflow/contrib/makefile/README.md         |    2 +-
 .../opt/python/training/external_optimizer.py |   16 +-
 tensorflow/contrib/rnn/ops/lstm_ops.cc        |    2 +-
 .../seq2seq/python/ops/attention_wrapper.py   |   12 +-
 tensorflow/contrib/seq2seq/python/ops/loss.py |   39 +-
 tensorflow/core/BUILD                         |    6 +-
 tensorflow/core/graph/mkl_layout_pass.cc      | 1086 ++++++++--
 tensorflow/core/graph/mkl_layout_pass_test.cc |  440 +++-
 .../core/graph/mkl_tfconversion_pass.cc       |   17 +-
 .../core/graph/mkl_tfconversion_pass_test.cc  |   36 +-
 tensorflow/core/kernels/BUILD                 |  113 +-
 .../core/kernels/conv_grad_filter_ops.cc      |  115 +
 .../core/kernels/conv_grad_input_ops.cc       |   88 +-
 tensorflow/core/kernels/conv_ops.cc           |   10 +-
 tensorflow/core/kernels/conv_ops_gpu_3.cu.cc  |    2 +
 tensorflow/core/kernels/cudnn_pooling_gpu.cc  |    8 +-
 tensorflow/core/kernels/maxpooling_op.cc      |  491 ++++-
 .../core/kernels/maxpooling_op_gpu.cu.cc      |  264 ++-
 tensorflow/core/kernels/maxpooling_op_gpu.h   |   92 +-
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |  428 ++++
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |  264 +++
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |  422 ++++
 .../core/kernels/mkl_conv_grad_input_ops.cc   |  355 ++++
 tensorflow/core/kernels/mkl_conv_ops.cc       |  391 ++--
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |  506 +++++
 .../core/kernels/mkl_pooling_ops_common.cc    |  150 ++
 .../core/kernels/mkl_pooling_ops_common.h     |   92 +
 tensorflow/core/kernels/mkl_relu_op.cc        |  397 ++++
 tensorflow/core/kernels/mkl_tfconv_op.cc      |   22 +-
 tensorflow/core/kernels/pooling_ops_3d.cc     |  314 ++-
 tensorflow/core/kernels/pooling_ops_3d.h      |   66 +
 .../core/kernels/pooling_ops_3d_gpu.cu.cc     |  172 ++
 tensorflow/core/kernels/pooling_ops_3d_gpu.h  |   48 +
 tensorflow/core/kernels/pooling_ops_common.cc |   13 +-
 tensorflow/core/kernels/random_op.cc          |    5 +-
 tensorflow/core/kernels/sparse_matmul_op.cc   |  279 +--
 tensorflow/core/kernels/sparse_matmul_op.h    |   16 +-
 tensorflow/core/kernels/xsmm_conv2d.cc        |  482 +++--
 tensorflow/core/lib/io/inputbuffer.cc         |   32 +-
 tensorflow/core/ops/array_ops.cc              |    5 +
 tensorflow/core/ops/nn_grad.cc                |   31 +
 tensorflow/core/ops/nn_ops.cc                 |  338 ++-
 tensorflow/core/ops/ops.pbtxt                 |   53 +
 tensorflow/core/platform/cpu_info.cc          |   30 +-
 tensorflow/core/platform/windows/port.cc      |   51 +-
 tensorflow/core/util/mkl_util.h               |  143 +-
 tensorflow/docs_src/about/roadmap.md          |    5 +-
 tensorflow/docs_src/extend/adding_an_op.md    |   11 +-
 .../docs_src/get_started/get_started.md       |   12 +-
 tensorflow/docs_src/tutorials/wide.md         |    2 +-
 tensorflow/examples/android/README.md         |    8 +-
 tensorflow/examples/android/build.gradle      |    2 +-
 .../tutorials/deepdream/deepdream.ipynb       |    2 +-
 .../tutorials/monitors/iris_monitors.py       |   30 +-
 tensorflow/go/doc.go                          |   28 +-
 .../go/example_inception_inference_test.go    |   30 +-
 tensorflow/go/genop/internal/genop.go         |   40 +-
 tensorflow/go/genop/internal/genop_test.go    |   28 +-
 tensorflow/go/genop/internal/lib.go           |   27 +-
 tensorflow/go/genop/main.go                   |   28 +-
 tensorflow/go/graph.go                        |   28 +-
 tensorflow/go/graph_test.go                   |   28 +-
 tensorflow/go/lib.go                          |   28 +-
 tensorflow/go/op/generate.go                  |   28 +-
 tensorflow/go/op/op.go                        |   28 +-
 tensorflow/go/op/op_test.go                   |   28 +-
 tensorflow/go/op/scope.go                     |   28 +-
 tensorflow/go/op/scope_test.go                |   28 +-
 tensorflow/go/operation.go                    |   28 +-
 tensorflow/go/operation_test.go               |   28 +-
 tensorflow/go/saved_model.go                  |   28 +-
 tensorflow/go/saved_model_test.go             |   28 +-
 tensorflow/go/session.cpp                     |   28 +-
 tensorflow/go/session.go                      |   28 +-
 tensorflow/go/session_test.go                 |   28 +-
 tensorflow/go/shape.go                        |   28 +-
 tensorflow/go/shape_test.go                   |   28 +-
 tensorflow/go/status.go                       |   28 +-
 tensorflow/go/tensor.go                       |   28 +-
 tensorflow/go/tensor_test.go                  |   28 +-
 tensorflow/go/util_test.go                    |   28 +-
 tensorflow/go/version.go                      |   28 +-
 tensorflow/java/maven/README.md               |   44 +-
 tensorflow/python/estimator/estimator.py      |   11 +-
 tensorflow/python/estimator/estimator_test.py |   32 +-
 .../inputs/queues/feeding_functions.py        |   64 +-
 tensorflow/python/framework/tensor_util.py    |    4 +
 .../python/framework/tensor_util_test.py      |   94 +-
 .../kernel_tests/pooling_ops_3d_test.py       |   24 +-
 .../python/kernel_tests/pooling_ops_test.py   |  303 ++-
 tensorflow/python/layers/normalization.py     |    2 +-
 tensorflow/python/ops/hidden_ops.txt          |    5 +
 tensorflow/python/ops/linalg_ops.py           |    6 +-
 tensorflow/python/ops/nn_grad.py              |  102 +-
 tensorflow/python/ops/nn_ops.py               |    4 +-
 tensorflow/python/platform/control_imports.py |   27 +
 tensorflow/python/platform/googletest.py      |    2 +-
 tensorflow/python/saved_model/builder_impl.py |    2 +-
 tensorflow/stream_executor/cuda/cuda_dnn.cc   |   73 +
 tensorflow/stream_executor/cuda/cuda_dnn.h    |   16 +
 tensorflow/stream_executor/dnn.h              |   38 +-
 tensorflow/stream_executor/stream.cc          |   51 +
 tensorflow/stream_executor/stream.h           |   14 +
 .../components/vz_line_chart/vz-line-chart.ts |   34 +-
 tensorflow/tensorboard/plugins/debugger/BUILD |    1 +
 tensorflow/tensorflow.bzl                     | 1009 +++++----
 tensorflow/tools/ci_build/Dockerfile.android  |    3 +-
 tensorflow/tools/ci_build/builds/pip.sh       |    2 +-
 .../ci_build/windows/bazel/common_env.sh      |    2 +-
 .../ci_build/windows/cpu/bazel/common_env.sh  |   50 -
 tensorflow/tools/dist_test/Dockerfile         |    2 +-
 tensorflow/tools/docker/Dockerfile.devel      |    2 +-
 tensorflow/tools/docker/Dockerfile.devel-gpu  |    2 +-
 tensorflow/tools/graph_transforms/README.md   |    4 +-
 tensorflow/tools/pip_package/setup.py         |    7 +-
 tensorflow/tools/test/check_futures_test.py   |    1 +
 tensorflow/workspace.bzl                      | 1856 ++++++++---------
 third_party/gpus/cuda_configure.bzl           |    8 +-
 third_party/libxsmm.BUILD                     |   37 +-
 147 files changed, 10938 insertions(+), 3340 deletions(-)
 create mode 100644 tensorflow/contrib/cmake/external/jemalloc.cmake
 delete mode 100644 tensorflow/contrib/ios_examples/camera/data/grace_hopper.jpg
 delete mode 100644 tensorflow/contrib/ios_examples/camera/squarePNG.png
 create mode 100644 tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
 create mode 100644 tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
 create mode 100644 tensorflow/core/kernels/mkl_avgpooling_op.cc
 create mode 100644 tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
 create mode 100644 tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
 create mode 100644 tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
 create mode 100644 tensorflow/core/kernels/mkl_maxpooling_op.cc
 create mode 100644 tensorflow/core/kernels/mkl_pooling_ops_common.cc
 create mode 100644 tensorflow/core/kernels/mkl_pooling_ops_common.h
 create mode 100644 tensorflow/core/kernels/mkl_relu_op.cc
 create mode 100644 tensorflow/core/kernels/pooling_ops_3d.h
 create mode 100644 tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc
 create mode 100644 tensorflow/core/kernels/pooling_ops_3d_gpu.h
 create mode 100644 tensorflow/python/platform/control_imports.py
 delete mode 100644 tensorflow/tools/ci_build/windows/cpu/bazel/common_env.sh

diff --git a/.gitignore b/.gitignore
index 01f06be1a9..900e5a53cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .ipynb_checkpoints
 node_modules
 /.bazelrc
+/.tf_configure.bazelrc
 /bazel-*
 /third_party/py/numpy/numpy_include
 /tools/bazel.rc
diff --git a/README.md b/README.md
index 84c42aad18..d9f05a67e0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 <div align="center">
   <img src="https://www.tensorflow.org/images/tf_logo_transp.png"><br><br>
 </div>
+
 -----------------
 
 | **`Linux CPU`** | **`Linux GPU`** | **`Mac OS CPU`** | **`Windows CPU`** | **`Android`** |
@@ -33,12 +34,12 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.0.1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.0.1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.0.1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.0.1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.0.1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.0.1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.0.1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.0.1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.0.1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.0.1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.0.1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
@@ -59,11 +60,11 @@ Hello, TensorFlow!
 >>>
 ```
 
-##For more information
+## For more information
 
 * [TensorFlow website](http://tensorflow.org)
 * [TensorFlow whitepaper](http://download.tensorflow.org/paper/whitepaper2015.pdf)
 * [TensorFlow Model Zoo](https://github.com/tensorflow/models)
 * [TensorFlow MOOC on Udacity](https://www.udacity.com/course/deep-learning--ud730)
 
-The TensorFlow community has created amazing things with TensorFlow, please see the [resources section of tensorflow.org](https://www.tensorflow.org/versions/master/resources#community) for an incomplete list.
+The TensorFlow community has created amazing things with TensorFlow, please see the [resources section of tensorflow.org](https://www.tensorflow.org/about/#community) for an incomplete list.
diff --git a/RELEASE.md b/RELEASE.md
index 5f261a4543..156cc2e3af 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,3 +1,110 @@
+# Release 1.1.0
+
+## Major Features and Improvements
+* Added Java API support for Windows.
+* Added `tf.spectral` module. Moved existing FFT ops to `tf.spectral` while
+  keeping an alias in the old location (`tf.*`).
+* Added 1D, 2D and 3D Fourier transform ops for real signals to `tf.spectral`.
+* Added a `tf.bincount` function.
+* Added Keras 2 API to contrib.
+* Added a new lightweight queue-like object - `RecordInput`.
+* Added `tf.contrib.image.compose_transforms` function.
+* Bring `tf.estimator.*` into the API. Non-deprecated functionality from `tf.contrib.learn.Estimator` is moved to `tf.estimator.Estimator` with cosmetic changes.
+* Docker images: TF images on gcr.io and Docker Hub are upgraded to ubuntu:16.04.
+* Added the following features to TensorFlow Debugger (tfdbg):
+  * Ability to inspect Python source file against TF ops and tensors (command `print_source` / `ps`)
+  * New navigation bar in Curses-based UI
+  * NodeStepper (command `invoke_stepper`) now uses intermediate tensor dumps. It also uses `TensorHandles` as direct feeds during successive `cont` calls for improved performance and reduced memory consumption.
+
+## Deprecations
+
+* TensorFlow 1.1.0 will be the last time we release a binary with Mac GPU support. Going forward, we will stop testing on Mac GPU systems. We continue to welcome patches that maintain Mac GPU support, and we will try to keep the Mac GPU build working.
+
+## Changes to contrib APIs
+* The behavior of RNNCells is now stricter due to the transition towards making RNNCells act more like Keras layers.
+  * If an RNNCell is used twice in two different variable scopes, an error is raised describing how to avoid this behavior.
+  * If an RNNCell is used in a variable scope with existing conflicting variables, an error is raised showing that the RNNCell must be constructed with argument `reuse=True`.
+* Deprecated contrib/distributions `pmf`, `pdf`, `log_pmf`, `log_pdf`.
+* Moved `bayesflow.special_math` to distributions.
+* `tf.contrib.tensor_forest.python.tensor_forest.RandomForestDeviceAssigner` removed.
+* Changed some MVN classes and parameters:
+  * `tf.contrib.distributions.MultivariateNormalFull` replaced by `tf.contrib.distributions.MultivariateNormalTriL`.
+  * `tf.contrib.distributions.MultivariateNormalCholesky` replaced by `tf.contrib.distributions.MultivariateNormalTriL`
+  * `tf.contrib.distributions.MultivariateNormalDiagWithSoftplusStDev` replaced
+    by `tf.contrib.distributions.MultivariateNormalDiagWithSoftplusScale`
+  * `tf.contrib.distributions.MultivariateNormalDiag` arguments changed from `mu`, `diag_stddev` to `log`, `scale_diag`.
+  * `tf.contrib.distributions.MultivariateNormalDiagPlusVDVT` removed.
+  * `tf.contrib.distributions.MultivariateNormalDiagPlusLowRank` added.
+
+## Bug Fixes and Other Changes
+* Java: Support for loading models exported using the SavedModel API (courtesy @EronWright).
+* Go: Added support for incremental graph execution.
+* Fix a bug in the WALS solver when single-threaded.
+* Added support for integer sparse feature values in `tf.contrib.layers.sparse_column_with_keys`.
+* Fixed `tf.set_random_seed(0)` to be deterministic for all ops.
+* Stability improvements for the GCS file system support.
+* Improved TensorForest performance.
+* Added support for multiple filename globs in `tf.matching_files`.
+* `LogMessage` now includes a timestamp as beginning of a message.
+* Added MultiBox person detector example standalone binary.
+* Android demo: Makefile build functionality added to build.gradle to fully support building TensorFlow demo in Android on Windows.
+* Android demo: read MultiBox priors from txt file rather than protobuf.
+* Added colocation constraints to `StagingArea`.
+* `sparse_matmul_op` reenabled for Android builds.
+* Restrict weights rank to be the same as the broadcast target, to avoid ambiguity on broadcast rules.
+* Upgraded libxsmm to 1.7.1 and applied other changes for performance and memory usage.
+* Fixed bfloat16 integration of LIBXSMM sparse mat-mul.
+* Improved performance and reduce memory usage by allowing ops to forward input buffers to output buffers and perform computations in-place.
+* Improved the performance of CPU assignment for strings.
+* Speed up matrix * vector multiplication and matrix * matrix with unknown shapes.
+* C API: Graph imports now support input remapping, control dependencies, and returning imported nodes (see `TF_GraphImportGraphDefWithReturnOutputs()`)
+* Multiple C++ API updates.
+* Multiple TensorBoard updates including:
+  * Users can now view image summaries at various sampled steps (instead of just the last step).
+  * Bugs involving switching runs as well as the image dashboard are fixed.
+  * Removed data download links from TensorBoard.
+  * TensorBoard uses a relative data directory, for easier embedding.
+  * TensorBoard automatically ignores outliers for domain calculation, and formats proportional values consistently.
+* Multiple tfdbg bug fixes:
+  * Fixed Windows compatibility issues.
+  * Command history now persists across runs.
+
+## Thanks to our Contributors
+
+This release contains contributions from many people at Google, as well as:
+
+A. Besir Kurtulmus, Adal Chiriliuc, @akash, Alec-Desouza, Alex Rothberg, Alex
+Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton
+Loss, @Aravind, @Arie, Ashutosh Das, AuréLien Geron, Bairen Yi, @bakunyo, Ben
+Visser, Brady Zhou, Calpa Liu, Changming Sun, Chi Zeng, Chih Cheng Liang,
+Christopher Berner, Clark Zinzow, @Conchylicultor, Courtial Florian, Dan Ellis,
+Dan J, Dan Jarvis, Daniel Ylitalo, Darren Garvey, David Norman, David Truong,
+@DavidNorman, Dimitar Pavlov, Dmitry Persiyanov, @Eddie, @elirex, Erfan
+Noury, Eron Wright, Evgeny Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher
+Coder, Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang,
+@guilherme, @guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo
+Gao, Igor ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason
+Morton, Jay Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi,
+@jiqiu, Joan Thibault, John C F, Jojy G Varghese, Jon Malmaud, Julian Berman,
+Julian Niedermeier, Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle
+Bostelmann, @Lezcano, Li Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh,
+Marek Kolodziej, Mark Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael
+Gharbi, MichaëL Defferrard, Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal,
+Nayana Thorat, @nghiattran, Nicholas Connor, Nikolaas Steenbergen, Niraj Patel,
+Niranjan Hasabnis, @Panmari, Pavel Bulanov, Philip Pries Henningsen, Philipp
+Jund, @polonez, Prayag Verma, Rahul Kavi, Raphael Gontijo Lopes, @rasbt, Raven
+Iqqe, Reid Pryzant, Richard Shin, Rizwan Asif, Russell Kaplan, Ryo Asakura,
+RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay, Sean Papay, @seaotterman,
+@selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano Probst, @taknevski,
+@tbonza, @teldridge11, Yuan (Terry) Tang, Tim Anglade, Tomas Reimers, Tomer Gafner,
+Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad
+Firoiu, @wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yuan (Terry) Tang,
+@Yufeng, Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
+
+We are also grateful to all who filed issues or helped resolve them, asked and
+answered questions, and were part of inspiring discussions.
+
+
 # Release 1.0.1
 
 ## Bug Fixes and Other Changes
@@ -94,7 +201,7 @@ To help you upgrade your existing TensorFlow Python code to match the API change
 * In the C++ API (in tensorflow/cc), Input, Output, etc. have moved
   from the tensorflow::ops namespace to tensorflow.
 * Change arg order for `{softmax,sparse_softmax,sigmoid}_cross_entropy_with_logits` to be (labels, predictions), and force use of named args.
-* tf.nn.rnn_cell.* and most functions in tf.nn.rnn.* (with the exception of dynamic_rnn and raw_rnn) are temporarily in tf.contrib.rnn.  They will be moved back into core for TF 1.1.
+* tf.nn.rnn_cell.* and most functions in tf.nn.rnn.* (with the exception of dynamic_rnn and raw_rnn) are temporarily in tf.contrib.rnn.  They will be moved back into core for TF 1.2.
 * `tf.nn.sampled_softmax_loss` and `tf.nn.nce_loss` have both changed their API such that you need to switch the `inputs, labels` to `labels, inputs` parameters.
 * The shape keyword argument of the `SparseTensor` constructor changes its name to `dense_shape` between Tensorflow 0.12 and Tensorflow 1.0.
 
diff --git a/WORKSPACE b/WORKSPACE
index 6ec1a7df3e..cab8389a55 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,7 +20,9 @@ load("//tensorflow:workspace.bzl", "tf_workspace")
 #android_sdk_repository(
 #    name = "androidsdk",
 #    api_level = 23,
-#    build_tools_version = "25.0.1",
+#    # Ensure that you have the build_tools_version below installed in the 
+#    # SDK manager as it updates periodically.
+#    build_tools_version = "25.0.2",
 #    # Replace with path to Android SDK on your system
 #    path = "<PATH_TO_SDK>",
 #)
@@ -29,7 +31,9 @@ load("//tensorflow:workspace.bzl", "tf_workspace")
 #android_ndk_repository(
 #    name="androidndk",
 #    path="<PATH_TO_NDK>",
-#    api_level=14) # This needs to be 14 or higher to compile TensorFlow.
+#    # This needs to be 14 or higher to compile TensorFlow. 
+#    # Note that the NDK version is not the API level.
+#    api_level=14)
 
 # Please add all new TensorFlow dependencies in workspace.bzl.
 tf_workspace()
diff --git a/configure b/configure
index e59ee2a925..6360641be2 100755
--- a/configure
+++ b/configure
@@ -8,9 +8,6 @@ pushd `dirname $0` > /dev/null
 SOURCE_BASE_DIR=`pwd -P`
 popd > /dev/null
 
-# This file contains customized config settings.
-touch .bazelrc
-
 PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
 
 function is_linux() {
@@ -38,14 +35,6 @@ function is_windows() {
   fi
 }
 
-function bazel_fetch() {
-  if [ -z "$TF_BAZEL_TARGETS" ]; then
-    bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
-  else
-    bazel fetch $TF_BAZEL_TARGETS
-  fi
-}
-
 function sed_hyphen_i() {
   if is_macos; then
     sed -i '' "$@"
@@ -54,6 +43,21 @@ function sed_hyphen_i() {
   fi
 }
 
+function write_to_bazelrc() {
+  echo "$1" >> .tf_configure.bazelrc
+}
+
+function write_action_env_to_bazelrc() {
+  write_to_bazelrc "build --action_env $1=\"$2\""
+}
+
+# This file contains customized config settings.
+rm -f .tf_configure.bazelrc
+touch .tf_configure.bazelrc
+touch .bazelrc
+sed_hyphen_i "/tf_configure/d" .bazelrc
+echo "import .tf_configure.bazelrc" >> .bazelrc
+
 # Delete any leftover BUILD files from the Makefile build, which would interfere
 # with Bazel parsing.
 MAKEFILE_DOWNLOAD_DIR=tensorflow/contrib/makefile/downloads
@@ -164,6 +168,7 @@ if is_windows; then
   TF_NEED_HDFS=0
   TF_NEED_JEMALLOC=0
   TF_NEED_OPENCL=0
+  TF_CUDA_CLANG=0
 fi
 
 if is_linux; then
@@ -181,9 +186,8 @@ else
   TF_NEED_JEMALLOC=0
 fi
 
-sed_hyphen_i -e "/with_jemalloc/d" .bazelrc
 if [[ "$TF_NEED_JEMALLOC" == "1" ]]; then
-  echo 'build --define with_jemalloc=true' >>.bazelrc
+  write_to_bazelrc 'build --define with_jemalloc=true'
 fi
 
 while [[ "$TF_NEED_GCP" == "" ]]; do
@@ -200,9 +204,8 @@ while [[ "$TF_NEED_GCP" == "" ]]; do
   esac
 done
 
-sed_hyphen_i -e "/with_gcp_support/d" .bazelrc
 if [[ "$TF_NEED_GCP" == "1" ]]; then
-  echo 'build --define with_gcp_support=true' >>.bazelrc
+  write_to_bazelrc 'build --define with_gcp_support=true'
 fi
 
 while [[ "$TF_NEED_HDFS" == "" ]]; do
@@ -219,9 +222,8 @@ while [[ "$TF_NEED_HDFS" == "" ]]; do
   esac
 done
 
-sed_hyphen_i -e "/with_hdfs_support/d" .bazelrc
 if [[ "$TF_NEED_HDFS" == "1" ]]; then
-  echo 'build --define with_hdfs_support=true' >>.bazelrc
+  write_to_bazelrc 'build --define with_hdfs_support=true'
 fi
 
 ## Enable XLA.
@@ -235,9 +237,8 @@ while [[ "$TF_ENABLE_XLA" == "" ]]; do
   esac
 done
 
-sed_hyphen_i -e "/with_xla_support/d" .bazelrc
 if [[ "$TF_ENABLE_XLA" == "1" ]]; then
-  echo 'build --define with_xla_support=true' >>.bazelrc
+  write_to_bazelrc 'build --define with_xla_support=true'
 fi
 
 
@@ -279,23 +280,11 @@ while [ "$TF_NEED_CUDA" == "" ]; do
   esac
 done
 
-sed_hyphen_i -e "/--action_env TF_NEED_CUDA/d" .bazelrc
-sed_hyphen_i -e "/--action_env CUD/d" .bazelrc
-sed_hyphen_i -e "/--action_env GCC_HOST/d" .bazelrc
-sed_hyphen_i -e "/--action_env TF_CUD/d" .bazelrc
-sed_hyphen_i -e "/--action_env CLANG_CUDA/d" .bazelrc
-
 export TF_NEED_CUDA
-echo "build --action_env TF_NEED_CUDA=$TF_NEED_CUDA" >>.bazelrc
+write_action_env_to_bazelrc "TF_NEED_CUDA" "$TF_NEED_CUDA"
 
 export TF_NEED_OPENCL
 
-if [[ "$TF_NEED_CUDA" == "0" ]] && [[ "$TF_NEED_OPENCL" == "0" ]]; then
-  echo "Configuration finished"
-  bazel_fetch
-  exit
-fi
-
 if [ "$TF_NEED_CUDA" == "1" ]; then
 while [[ "$TF_CUDA_CLANG" == "" ]]; do
   read -p "Do you want to use clang as CUDA compiler? [y/N] " INPUT
@@ -308,7 +297,7 @@ while [[ "$TF_CUDA_CLANG" == "" ]]; do
 done
 
 export TF_CUDA_CLANG
-echo "build --action_env TF_CUDA_CLANG=$TF_CUDA_CLANG" >>.bazelrc
+write_action_env_to_bazelrc "TF_CUDA_CLANG" "$TF_CUDA_CLANG"
 
 # Set up which gcc nvcc should use as the host compiler
 # No need to set this on Windows
@@ -324,7 +313,7 @@ while [[ "$TF_CUDA_CLANG" != "1" ]] && ! is_windows && true; do
   fi
   if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
     export GCC_HOST_COMPILER_PATH
-    echo "build --action_env GCC_HOST_COMPILER_PATH=\"$GCC_HOST_COMPILER_PATH\"" >>.bazelrc
+    write_action_env_to_bazelrc "GCC_HOST_COMPILER_PATH" "$GCC_HOST_COMPILER_PATH"
     break
   fi
   echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
@@ -348,7 +337,7 @@ while [[ "$TF_CUDA_CLANG" == "1" ]] && true; do
   fi
   if [ -e "$CLANG_CUDA_COMPILER_PATH" ]; then
     export CLANG_CUDA_COMPILER_PATH
-    echo "build --action_env CLANG_CUDA_COMPILER_PATH=\"$CLANG_CUDA_COMPILER_PATH\"" >>.bazelrc
+    write_action_env_to_bazelrc "CLANG_CUDA_COMPILER_PATH" "$CLANG_CUDA_COMPILER_PATH"
     break
   fi
   echo "Invalid clang path. ${CLANG_CUDA_COMPILER_PATH} cannot be found" 1>&2
@@ -399,10 +388,9 @@ while true; do
 
   if [ -e "${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH}" ]; then
     export CUDA_TOOLKIT_PATH
-    echo "build --action_env CUDA_TOOLKIT_PATH=\"$CUDA_TOOLKIT_PATH\"" >>.bazelrc
-
+    write_action_env_to_bazelrc "CUDA_TOOLKIT_PATH" "$CUDA_TOOLKIT_PATH"
     export TF_CUDA_VERSION
-    echo "build --action_env TF_CUDA_VERSION=$TF_CUDA_VERSION" >>.bazelrc
+    write_action_env_to_bazelrc "TF_CUDA_VERSION" "$TF_CUDA_VERSION"
     break
   fi
   echo "Invalid path to CUDA $TF_CUDA_VERSION toolkit. ${CUDA_TOOLKIT_PATH}/${CUDA_RT_LIB_PATH} cannot be found"
@@ -417,9 +405,9 @@ done
 
 # Find out where the cuDNN library is installed
 while true; do
-  # Configure the Cudnn version to use.
+  # Configure the cuDNN version to use.
   if [ -z "$TF_CUDNN_VERSION" ]; then
-    read -p "Please specify the Cudnn version you want to use. [Leave empty to use system default]: " TF_CUDNN_VERSION
+    read -p "Please specify the cuDNN version you want to use. [Leave empty to use system default]: " TF_CUDNN_VERSION
   fi
 
   fromuser=""
@@ -454,10 +442,9 @@ while true; do
 
   if [ -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_ALT_PATH}" -o -e "$CUDNN_INSTALL_PATH/${CUDA_DNN_LIB_PATH}" ]; then
     export TF_CUDNN_VERSION
-    echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc
-
+    write_action_env_to_bazelrc "TF_CUDNN_VERSION" "$TF_CUDNN_VERSION"
     export CUDNN_INSTALL_PATH
-    echo "build --action_env CUDNN_INSTALL_PATH=\"$CUDNN_INSTALL_PATH\"" >>.bazelrc
+    write_action_env_to_bazelrc "CUDNN_INSTALL_PATH" "$CUDNN_INSTALL_PATH"
     break
   fi
 
@@ -470,10 +457,9 @@ while true; do
     CUDNN_PATH_FROM_LDCONFIG="$($LDCONFIG_BIN -p | sed -n 's/.*libcudnn.so .* => \(.*\)/\1/p')"
     if [ -e "${CUDNN_PATH_FROM_LDCONFIG}${TF_CUDNN_EXT}" ]; then
       export TF_CUDNN_VERSION
-      echo "build --action_env TF_CUDNN_VERSION=$TF_CUDNN_VERSION" >>.bazelrc
-
+      write_action_env_to_bazelrc "TF_CUDNN_VERSION" "$TF_CUDNN_VERSION"
       export CUDNN_INSTALL_PATH="$(dirname ${CUDNN_PATH_FROM_LDCONFIG})"
-      echo "build --action_env CUDNN_INSTALL_PATH=\"$CUDNN_INSTALL_PATH\"" >>.bazelrc
+      write_action_env_to_bazelrc "CUDNN_INSTALL_PATH" "$CUDNN_INSTALL_PATH"
       break
     fi
   fi
@@ -525,7 +511,7 @@ EOF
     fi
   else
     export TF_CUDA_COMPUTE_CAPABILITIES
-    echo "build --action_env TF_CUDA_COMPUTE_CAPABILITIES=$TF_CUDA_COMPUTE_CAPABILITIES" >>.bazelrc
+    write_action_env_to_bazelrc "TF_CUDA_COMPUTE_CAPABILITIES" "$TF_CUDA_COMPUTE_CAPABILITIES"
     break
   fi
   TF_CUDA_COMPUTE_CAPABILITIES=""
@@ -536,9 +522,9 @@ if is_windows; then
   export CUDA_PATH="$CUDA_TOOLKIT_PATH"
   export CUDA_COMPUTE_CAPABILITIES="$TF_CUDA_COMPUTE_CAPABILITIES"
   export NO_WHOLE_ARCHIVE_OPTION=1
-
-  # Set GCC_HOST_COMPILER_PATH to keep cuda_configure.bzl happy
-  export GCC_HOST_COMPILER_PATH="/usr/bin/dummy_compiler"
+  write_action_env_to_bazelrc "CUDA_PATH" "$CUDA_PATH"
+  write_action_env_to_bazelrc "CUDA_COMPUTE_CAPABILITIES" "$CUDA_COMPUTE_CAPABILITIES"
+  write_action_env_to_bazelrc "NO_WHOLE_ARCHIVE_OPTION" "1"
 fi
 
 # end of if "$TF_NEED_CUDA" == "1"
@@ -629,6 +615,6 @@ done
 # end of if "$TF_NEED_OPENCL" == "1"
 fi
 
-bazel_fetch
-
+# TODO(gunan): Remove once bazel correctly handles changes in remote repositories.
+bazel clean
 echo "Configuration finished"
diff --git a/tensorflow/compiler/aot/tests/make_test_graphs.py b/tensorflow/compiler/aot/tests/make_test_graphs.py
index 6981cb6757..98c13958d3 100644
--- a/tensorflow/compiler/aot/tests/make_test_graphs.py
+++ b/tensorflow/compiler/aot/tests/make_test_graphs.py
@@ -72,7 +72,7 @@ def tfadd_with_ckpt_saver(out_dir):
     saver.save(sess, ckpt_file)
     # Without the SaverDef, the restore op won't be named correctly.
     saver_file = '%s/test_graph_tfadd_with_ckpt_saver.saver' % out_dir
-    with open(saver_file, 'w') as f:
+    with open(saver_file, 'wb') as f:
       f.write(saver.as_saver_def().SerializeToString())
 
 
@@ -113,7 +113,7 @@ def write_graph(build_graph, out_dir):
   with g.as_default():
     build_graph(out_dir)
     filename = '%s/test_graph_%s.pb' % (out_dir, build_graph.__name__)
-    with open(filename, 'w') as f:
+    with open(filename, 'wb') as f:
       f.write(g.as_graph_def().SerializeToString())
 
 
diff --git a/tensorflow/compiler/tests/nary_ops_test.py b/tensorflow/compiler/tests/nary_ops_test.py
index a1f1e67a9f..2660e1d572 100644
--- a/tensorflow/compiler/tests/nary_ops_test.py
+++ b/tensorflow/compiler/tests/nary_ops_test.py
@@ -116,12 +116,14 @@ class NAryOpsTest(XLATestCase):
                     np.array([1, 1], dtype=np.int32)],
                    expected=np.array([[], []], dtype=np.float32))
 
-    self._testNAry(lambda x: array_ops.strided_slice(*x),
-                   [np.array([[], [], []], dtype=np.float32),
-                    np.array([1, 0], dtype=np.int64),
-                    np.array([3, 0], dtype=np.int64),
-                    np.array([1, 1], dtype=np.int64)],
-                   expected=np.array([[], []], dtype=np.float32))
+    if np.int64 in self.int_types:
+      self._testNAry(
+          lambda x: array_ops.strided_slice(*x), [
+              np.array([[], [], []], dtype=np.float32), np.array(
+                  [1, 0], dtype=np.int64), np.array([3, 0], dtype=np.int64),
+              np.array([1, 1], dtype=np.int64)
+          ],
+          expected=np.array([[], []], dtype=np.float32))
 
     self._testNAry(lambda x: array_ops.strided_slice(*x),
                    [np.array([[1, 2, 3], [4, 5, 6], [7, 8, 9]],
diff --git a/tensorflow/compiler/tests/pooling_ops_3d_test.py b/tensorflow/compiler/tests/pooling_ops_3d_test.py
index 4eed903963..eb48fe555a 100644
--- a/tensorflow/compiler/tests/pooling_ops_3d_test.py
+++ b/tensorflow/compiler/tests/pooling_ops_3d_test.py
@@ -33,7 +33,7 @@ from tensorflow.python.platform import test
 # MaxPoolGrad.
 def _AvgPoolGrad(inputs, outputs, output_gradients, ksize, strides, padding):
   del outputs  # Unused by average-pooling gradients.
-  return gen_nn_ops.avg_pool3d_grad(
+  return gen_nn_ops._avg_pool3d_grad(
       inputs.get_shape().as_list(),
       output_gradients,
       ksize=ksize,
@@ -263,7 +263,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradValidPadding1_1_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[1, 3, 3, 3, 1],
         ksize=[1, 1, 1],
         strides=[1, 1, 1],
@@ -272,7 +272,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradValidPadding2_1_6_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[2, 3, 3, 6, 3],
         ksize=[2, 2, 2],
         strides=[1, 1, 1],
@@ -281,7 +281,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradValidPadding2_1_7_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[2, 3, 5, 7, 3],
         ksize=[2, 2, 2],
         strides=[1, 1, 1],
@@ -290,7 +290,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradValidPadding2_2_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[2, 2, 2, 2, 3],
         ksize=[2, 2, 2],
         strides=[2, 2, 2],
@@ -299,7 +299,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradSamePadding1_1_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[2, 3, 2, 4, 1],
         ksize=[1, 1, 1],
         strides=[1, 1, 1],
@@ -308,7 +308,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradSamePadding2_1_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[2, 3, 2, 4, 1],
         ksize=[2, 2, 2],
         strides=[1, 1, 1],
@@ -317,7 +317,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradSamePadding2_2_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[2, 5, 2, 4, 3],
         ksize=[2, 2, 2],
         strides=[2, 2, 2],
@@ -326,7 +326,7 @@ class Pooling3DTest(XLATestCase):
   def testMaxPoolGradSamePadding3_1_3d(self):
     self._VerifyGradient(
         nn_ops.max_pool3d,
-        gen_nn_ops.max_pool3d_grad,
+        gen_nn_ops._max_pool3d_grad,
         input_sizes=[1, 3, 3, 7, 1],
         ksize=[3, 3, 3],
         strides=[1, 1, 1],
diff --git a/tensorflow/contrib/android/cmake/build.gradle b/tensorflow/contrib/android/cmake/build.gradle
index fb87de6212..17a57b99fd 100644
--- a/tensorflow/contrib/android/cmake/build.gradle
+++ b/tensorflow/contrib/android/cmake/build.gradle
@@ -5,7 +5,8 @@ def TF_SRC_DIR = projectDir.toString() + "/../../../.."
 
 android {
     compileSdkVersion 24
-    buildToolsVersion '25.0.1'
+    // Check local build_tools_version as this is liable to change within Android Studio.
+    buildToolsVersion '25.0.2'
 
     // for debugging native code purpose
     publishNonDefault true
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 3c8dc869af..e27df6898e 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -22,6 +22,7 @@ option(tensorflow_ENABLE_GPU "Enable GPU support" OFF)
 option(tensorflow_ENABLE_SSL_SUPPORT "Enable boringssl support" OFF)
 option(tensorflow_ENABLE_GRPC_SUPPORT "Enable gRPC support" ON)
 option(tensorflow_ENABLE_HDFS_SUPPORT "Enable HDFS support" OFF)
+option(tensorflow_ENABLE_JEMALLOC_SUPPORT "Enable jemalloc support" OFF)
 option(tensorflow_BUILD_CC_EXAMPLE "Build the C++ tutorial example" ON)
 option(tensorflow_BUILD_PYTHON_BINDINGS "Build the Python bindings" ON)
 option(tensorflow_BUILD_ALL_KERNELS "Build all OpKernels" ON)
@@ -29,6 +30,7 @@ option(tensorflow_BUILD_CONTRIB_KERNELS "Build OpKernels from tensorflow/contrib
 option(tensorflow_BUILD_CC_TESTS "Build cc unit tests " OFF)
 option(tensorflow_BUILD_PYTHON_TESTS "Build python unit tests " OFF)
 option(tensorflow_OPTIMIZE_FOR_NATIVE_ARCH "Enable compiler optimizations for the native processor architecture (if available)" ON)
+option(tensorflow_WIN_CPU_SIMD_OPTIONS "Enables CPU SIMD instructions")
 
 if (NOT WIN32)
   # Threads: defines CMAKE_THREAD_LIBS_INIT and adds -pthread compile option
@@ -81,6 +83,22 @@ if (tensorflow_OPTIMIZE_FOR_NATIVE_ARCH)
   endif()
 endif()
 
+# MSVC SIMD instructions
+if (tensorflow_WIN_CPU_SIMD_OPTIONS)
+  if (WIN32)
+    CHECK_CXX_COMPILER_FLAG("${tensorflow_WIN_CPU_SIMD_OPTIONS}" COMPILER_OPT_WIN_CPU_SIMD_SUPPORTED)
+    if(COMPILER_OPT_WIN_CPU_SIMD_SUPPORTED)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${tensorflow_WIN_CPU_SIMD_OPTIONS}")
+    else()
+      message(FATAL_ERROR "${tensorflow_WIN_CPU_SIMD_OPTIONS} not supported")
+    endif()
+  endif()
+endif()
+
+if (tensorflow_ENABLE_JEMALLOC_SUPPORT)
+  add_definitions(-DTENSORFLOW_USE_JEMALLOC -DJEMALLOC_EXPORT=)
+endif()
+
 # External dependencies
 include(zlib)
 include(gif)
@@ -148,6 +166,12 @@ if(tensorflow_ENABLE_GRPC_SUPPORT)
   list(APPEND tensorflow_EXTERNAL_DEPENDENCIES grpc)
   include_directories(${GRPC_INCLUDE_DIRS})
 endif()
+if(tensorflow_ENABLE_JEMALLOC_SUPPORT)
+  include(jemalloc)
+  list(APPEND tensorflow_EXTERNAL_LIBRARIES ${jemalloc_STATIC_LIBRARIES})
+  list(APPEND tensorflow_EXTERNAL_DEPENDENCIES jemalloc)
+  include_directories(${jemalloc_INCLUDE_DIRS})
+endif()
 if(WIN32)
   list(APPEND tensorflow_EXTERNAL_LIBRARIES wsock32 ws2_32 shlwapi)
 endif()
@@ -202,7 +226,6 @@ endif()
 
 # Let's get to work!
 include(tf_core_framework.cmake)
-include(tf_tools.cmake)
 # NOTE: Disabled until issue #3996 is fixed.
 # include(tf_stream_executor.cmake)
 if (tensorflow_ENABLE_GPU)
@@ -223,6 +246,7 @@ if(tensorflow_BUILD_CC_EXAMPLE)
   include(tf_tutorials.cmake)
   include(tf_label_image_example.cmake)
 endif()
+include(tf_tools.cmake)
 if(tensorflow_BUILD_PYTHON_BINDINGS)
   include(tensorboard)
   include(tf_python.cmake)
diff --git a/tensorflow/contrib/cmake/README.md b/tensorflow/contrib/cmake/README.md
index 2641d5292d..af949f79fa 100644
--- a/tensorflow/contrib/cmake/README.md
+++ b/tensorflow/contrib/cmake/README.md
@@ -45,7 +45,7 @@ bindings.
 
 ### Pre-requisites
 
-* CMake version 3.5 up to 3.6
+* CMake version 3.5 or later.
 
 * [Git](http://git-scm.com)
 
@@ -181,7 +181,11 @@ Step-by-step Windows build
    More? -Dtensorflow_ENABLE_GPU=ON ^
    More? -DCUDNN_HOME="D:\...\cudnn"
    ```
-    
+   To enable SIMD instructions with MSVC, as AVX and SSE, define it as follows:
+   ```
+   More? -Dtensorflow_WIN_CPU_SIMD_OPTIONS=/arch:AVX
+   ```     
+
    Note that the `-DCMAKE_BUILD_TYPE=Release` flag must match the build
    configuration that you choose when invoking `msbuild`. The known-good
    values are `Release` and `RelWithDebInfo`. The `Debug` build type is
diff --git a/tensorflow/contrib/cmake/external/jemalloc.cmake b/tensorflow/contrib/cmake/external/jemalloc.cmake
new file mode 100644
index 0000000000..b0b212eeb6
--- /dev/null
+++ b/tensorflow/contrib/cmake/external/jemalloc.cmake
@@ -0,0 +1,33 @@
+include (ExternalProject)
+
+set(jemalloc_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/jemalloc/src/jemalloc/include)
+set(jemalloc_URL https://github.com/jemalloc/jemalloc-cmake/archive/jemalloc-cmake.4.3.1.tar.gz)
+set(jemalloc_HASH SHA256=f9be9a05fe906deb5c1c8ca818071a7d2e27d66fd87f5ba9a7bf3750bcedeaf0)
+set(jemalloc_BUILD ${CMAKE_CURRENT_BINARY_DIR}/jemalloc/src/jemalloc)
+
+if (WIN32)
+    set(jemalloc_INCLUDE_DIRS
+        ${jemalloc_INCLUDE_DIRS} 
+        ${CMAKE_CURRENT_BINARY_DIR}/jemalloc/src/jemalloc/include/msvc_compat
+    )
+    set(jemalloc_ADDITIONAL_CMAKE_OPTIONS -A x64)
+    set(jemalloc_STATIC_LIBRARIES ${jemalloc_BUILD}/Release/jemalloc.lib)
+else()
+    set(jemalloc_STATIC_LIBRARIES ${jemalloc_BUILD}/Release/jemalloc.a)
+endif()
+
+ExternalProject_Add(jemalloc
+    PREFIX jemalloc
+    URL ${jemalloc_URL}
+    URL_HASH ${jemalloc_HASH}
+    DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+        -Dwith-jemalloc-prefix:STRING=jemalloc_
+        -Dwithout-export:BOOL=ON
+        ${jemalloc_ADDITIONAL_CMAKE_OPTIONS}
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release --target jemalloc
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Skipping install step."
+)
diff --git a/tensorflow/contrib/cmake/tf_tools.cmake b/tensorflow/contrib/cmake/tf_tools.cmake
index 5151fdb444..636caf5f3d 100644
--- a/tensorflow/contrib/cmake/tf_tools.cmake
+++ b/tensorflow/contrib/cmake/tf_tools.cmake
@@ -63,7 +63,6 @@ add_executable(${transform_graph}
 
 target_link_libraries(${transform_graph} PUBLIC
   tf_protos_cc
-  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
@@ -83,7 +82,6 @@ add_executable(${summarize_graph}
 
 target_link_libraries(${summarize_graph} PUBLIC
   tf_protos_cc
-  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
@@ -103,7 +101,6 @@ add_executable(${compare_graphs}
 
 target_link_libraries(${compare_graphs} PUBLIC
   tf_protos_cc
-  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
@@ -118,6 +115,8 @@ add_executable(${benchmark_model}
     $<TARGET_OBJECTS:tf_core_ops>
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
 )
 
 target_link_libraries(${benchmark_model} PUBLIC
diff --git a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.h b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.h
index 0aefbc6eed..df744428a8 100644
--- a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.h
+++ b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.h
@@ -29,7 +29,6 @@
   dispatch_queue_t videoDataOutputQueue;
   AVCaptureStillImageOutput *stillImageOutput;
   UIView *flashView;
-  UIImage *square;
   BOOL isUsingFrontFacingCamera;
   AVSpeechSynthesizer *synth;
   NSMutableDictionary *oldPredictionValues;
diff --git a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
index e975a25b5e..20c49d5b6a 100644
--- a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
+++ b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
@@ -369,13 +369,8 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
   isUsingFrontFacingCamera = !isUsingFrontFacingCamera;
 }
 
-- (void)didReceiveMemoryWarning {
-  [super didReceiveMemoryWarning];
-}
-
 - (void)viewDidLoad {
   [super viewDidLoad];
-  square = [UIImage imageNamed:@"squarePNG"];
   synth = [[AVSpeechSynthesizer alloc] init];
   labelLayers = [[NSMutableArray alloc] init];
   oldPredictionValues = [[NSMutableDictionary alloc] init];
@@ -399,26 +394,6 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
   [self setupAVCapture];
 }
 
-- (void)viewDidUnload {
-  [super viewDidUnload];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-  [super viewWillAppear:animated];
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-  [super viewDidAppear:animated];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-  [super viewWillDisappear:animated];
-}
-
-- (void)viewDidDisappear:(BOOL)animated {
-  [super viewDidDisappear:animated];
-}
-
 - (BOOL)shouldAutorotateToInterfaceOrientation:
     (UIInterfaceOrientation)interfaceOrientation {
   return (interfaceOrientation == UIInterfaceOrientationPortrait);
diff --git a/tensorflow/contrib/ios_examples/camera/camera_example.xcodeproj/project.pbxproj b/tensorflow/contrib/ios_examples/camera/camera_example.xcodeproj/project.pbxproj
index 1134d0e117..e9d783e49d 100644
--- a/tensorflow/contrib/ios_examples/camera/camera_example.xcodeproj/project.pbxproj
+++ b/tensorflow/contrib/ios_examples/camera/camera_example.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
 		591D3ECF1CFF7FCE0059011C /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 591D3ECE1CFF7FCE0059011C /* ImageIO.framework */; };
 		591D3ED21CFF85C30059011C /* ios_image_load.mm in Sources */ = {isa = PBXBuildFile; fileRef = 591D3ED11CFF85C30059011C /* ios_image_load.mm */; };
 		591D3ED51CFF85FD0059011C /* tensorflow_utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 591D3ED31CFF85FD0059011C /* tensorflow_utils.mm */; };
-		591D3EDA1CFFA83A0059011C /* grace_hopper.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 591D3ED71CFFA83A0059011C /* grace_hopper.jpg */; };
 		591D3EDB1CFFA83A0059011C /* imagenet_comp_graph_label_strings.txt in Resources */ = {isa = PBXBuildFile; fileRef = 591D3ED81CFFA83A0059011C /* imagenet_comp_graph_label_strings.txt */; };
 		591D3EDC1CFFA83A0059011C /* tensorflow_inception_graph.pb in Resources */ = {isa = PBXBuildFile; fileRef = 591D3ED91CFFA83A0059011C /* tensorflow_inception_graph.pb */; };
 		591D3EDF1CFFAD230059011C /* libprotobuf-lite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 591D3EDD1CFFAD230059011C /* libprotobuf-lite.a */; };
@@ -38,7 +37,6 @@
 		591D3ED11CFF85C30059011C /* ios_image_load.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ios_image_load.mm; sourceTree = SOURCE_ROOT; };
 		591D3ED31CFF85FD0059011C /* tensorflow_utils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = tensorflow_utils.mm; sourceTree = SOURCE_ROOT; };
 		591D3ED41CFF85FD0059011C /* tensorflow_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tensorflow_utils.h; sourceTree = SOURCE_ROOT; };
-		591D3ED71CFFA83A0059011C /* grace_hopper.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = grace_hopper.jpg; sourceTree = "<group>"; };
 		591D3ED81CFFA83A0059011C /* imagenet_comp_graph_label_strings.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = imagenet_comp_graph_label_strings.txt; sourceTree = "<group>"; };
 		591D3ED91CFFA83A0059011C /* tensorflow_inception_graph.pb */ = {isa = PBXFileReference; lastKnownFileType = file; path = tensorflow_inception_graph.pb; sourceTree = "<group>"; };
 		591D3EDD1CFFAD230059011C /* libprotobuf-lite.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libprotobuf-lite.a"; path = "../../makefile/gen/protobuf_ios/lib/libprotobuf-lite.a"; sourceTree = "<group>"; };
@@ -79,7 +77,6 @@
 		591D3ED61CFFA83A0059011C /* data */ = {
 			isa = PBXGroup;
 			children = (
-				591D3ED71CFFA83A0059011C /* grace_hopper.jpg */,
 				591D3ED81CFFA83A0059011C /* imagenet_comp_graph_label_strings.txt */,
 				591D3ED91CFFA83A0059011C /* tensorflow_inception_graph.pb */,
 			);
@@ -199,7 +196,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				591D3EDA1CFFA83A0059011C /* grace_hopper.jpg in Resources */,
 				591D3EDC1CFFA83A0059011C /* tensorflow_inception_graph.pb in Resources */,
 				592FF90D18EDD0DA00C164F8 /* MainStoryboard_iPhone.storyboard in Resources */,
 				591D3EDB1CFFA83A0059011C /* imagenet_comp_graph_label_strings.txt in Resources */,
diff --git a/tensorflow/contrib/ios_examples/camera/data/grace_hopper.jpg b/tensorflow/contrib/ios_examples/camera/data/grace_hopper.jpg
deleted file mode 100644
index d2a427810f679db537236c5430873a81a62ef412..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73746
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
V$n-nGruxf%n}}6*JLn|in*a~IGLHZN

diff --git a/tensorflow/contrib/ios_examples/camera/squarePNG.png b/tensorflow/contrib/ios_examples/camera/squarePNG.png
deleted file mode 100644
index e26ff840ed932bcbedaf1891a79b1c3ae87c6213..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9432
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

diff --git a/tensorflow/contrib/layers/python/layers/embedding_ops.py b/tensorflow/contrib/layers/python/layers/embedding_ops.py
index f0ed31d1d1..b1a7f7ee59 100644
--- a/tensorflow/contrib/layers/python/layers/embedding_ops.py
+++ b/tensorflow/contrib/layers/python/layers/embedding_ops.py
@@ -17,24 +17,31 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from six.moves import xrange  # pylint: disable=redefined-builtin
+
 from tensorflow.contrib.framework.python.framework import tensor_util as contrib_tensor_util
 from tensorflow.contrib.layers.python.ops import sparse_feature_cross_op
 
+from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import clip_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 
 __all__ = [
     "safe_embedding_lookup_sparse", "scattered_embedding_lookup",
-    "scattered_embedding_lookup_sparse", "embedding_lookup_unique"
+    "scattered_embedding_lookup_sparse", "embedding_lookup_unique",
+    "embedding_lookup_sparse_with_distributed_aggregation"
 ]
 
 
@@ -548,3 +555,351 @@ def _sampled_scattered_embedding_lookup_sparse(params,
     return math_ops.unsorted_segment_sum(embeddings, segment_ids,
                                          num_segments=num_segments,
                                          name=name_scope)
+
+
+def embedding_lookup_sparse_with_distributed_aggregation(
+    params,
+    sp_ids,
+    sp_weights,
+    partition_strategy="mod",
+    name=None,
+    combiner=None,
+    max_norm=None):
+  """Computes embeddings for the given ids and weights.
+
+  Embeddings belonging to same param are aggregated on that device first. This
+  op is intended to decrease data transmission and improve parallelism. See
+  `tf.nn.embedding_lookup_sparse` for the functionality and example of this op.
+
+  Args:
+    params: A single tensor representing the complete embedding tensor,
+      or a list of P tensors all of same shape except for the first dimension,
+      representing sharded embedding tensors.  Alternatively, a
+      `PartitionedVariable`, created by partitioning along dimension 0. Each
+      element must be appropriately sized for the given `partition_strategy`.
+    sp_ids: N x M SparseTensor of int64 ids (typically from FeatureValueToId),
+      where N is typically batch size and M is arbitrary.
+    sp_weights: either a SparseTensor of float / double weights, or None to
+      indicate all weights should be taken to be 1. If specified, sp_weights
+      must have exactly the same shape and indices as sp_ids.
+    partition_strategy: A string specifying the partitioning strategy, relevant
+      if `len(params) > 1`. Currently `"div"` and `"mod"` are supported. Default
+      is `"mod"`. See `tf.nn.embedding_lookup` for more details.
+    name: Optional name for the op.
+    combiner: A string specifying the reduction op. Currently "mean", "sqrtn"
+      and "sum" are supported.
+      "sum" computes the weighted sum of the embedding results for each row.
+      "mean" is the weighted sum divided by the total weight.
+      "sqrtn" is the weighted sum divided by the square root of the sum of the
+      squares of the weights.
+    max_norm: If not None, each embedding is normalized to have l2 norm equal
+      to max_norm before combining.
+
+  Returns:
+    A dense tensor representing the combined embeddings for the
+    sparse ids. For each row in the dense tensor represented by sp_ids, the op
+    looks up the embeddings for all ids in that row, multiplies them by the
+    corresponding weight, and combines these embeddings as specified.
+
+  Raises:
+    TypeError: If sp_ids is not a SparseTensor, or if sp_weights is neither
+      None nor SparseTensor.
+    ValueError: If combiner is not one of {"mean", "sqrtn", "sum"}.
+  """
+  if combiner is None:
+    logging.warn("The default value of combiner will change from \"mean\" "
+                 "to \"sqrtn\" after 2016/11/01.")
+    combiner = "mean"
+  if combiner not in ("mean", "sqrtn", "sum"):
+    raise ValueError("combiner must be one of 'mean', 'sqrtn' or 'sum'")
+  if isinstance(params, variables.PartitionedVariable):
+    params = list(params)  # Iterate to get the underlying Variables.
+  if not isinstance(params, list):
+    params = [params]
+  if not isinstance(sp_ids, sparse_tensor.SparseTensor):
+    raise TypeError("sp_ids must be SparseTensor")
+  ignore_weights = sp_weights is None
+  if not ignore_weights:
+    if not isinstance(sp_weights, sparse_tensor.SparseTensor):
+      raise TypeError("sp_weights must be either None or SparseTensor")
+    sp_ids.values.get_shape().assert_is_compatible_with(
+        sp_weights.values.get_shape())
+    sp_ids.indices.get_shape().assert_is_compatible_with(
+        sp_weights.indices.get_shape())
+    sp_ids.dense_shape.get_shape().assert_is_compatible_with(
+        sp_weights.dense_shape.get_shape())
+    # TODO(yleon): Add enhanced node assertions to verify that sp_ids and
+    # sp_weights have equal indices and shapes.
+
+  with ops.name_scope(name, "embedding_lookup_sparse",
+                      params + [sp_ids]) as name:
+    segment_ids = sp_ids.indices[:, 0]
+    if segment_ids.dtype != dtypes.int32:
+      segment_ids = math_ops.cast(segment_ids, dtypes.int32)
+
+    ids = sp_ids.values
+    if ignore_weights:
+      ids, idx = array_ops.unique(ids)
+    else:
+      idx = None
+
+    weights = None if ignore_weights else sp_weights.values
+    embeddings = _embedding_lookup_with_distributed_aggregation(
+        params,
+        ids,
+        partition_strategy=partition_strategy,
+        max_norm=max_norm,
+        weights=weights,
+        idx=idx,
+        segment_ids=segment_ids)
+    # Set weights to all one if ignore weights.
+    if ignore_weights:
+      weights = array_ops.fill([array_ops.shape(segment_ids)[0]], 1)
+    if weights.dtype != embeddings.dtype:
+      weights = math_ops.cast(weights, embeddings.dtype)
+    # Reshape weights.
+    ones = array_ops.fill(
+        array_ops.expand_dims(array_ops.rank(embeddings) - 1, 0), 1)
+    bcast_weights_shape = array_ops.concat([array_ops.shape(weights), ones], 0)
+    orig_weights_shape = weights.get_shape()
+    weights = array_ops.reshape(weights, bcast_weights_shape)
+    if embeddings.get_shape().ndims is not None:
+      weights.set_shape(
+          orig_weights_shape.concatenate(
+              [1 for _ in range(embeddings.get_shape().ndims - 1)]))
+
+    if combiner == "mean":
+      weight_sum = math_ops.segment_sum(weights, segment_ids)
+      embeddings = math_ops.div(embeddings, weight_sum)
+    elif combiner == "sqrtn":
+      weights_squared = math_ops.pow(weights, 2)
+      weight_sum = math_ops.segment_sum(weights_squared, segment_ids)
+      weight_sum_sqrt = math_ops.sqrt(weight_sum)
+      embeddings = math_ops.div(embeddings, weight_sum_sqrt)
+    elif combiner != "sum":
+      assert False, "Unrecognized combiner"
+    return embeddings
+
+
+def _do_gather(params, ids, validate_indices=True, name=None):
+  """Deals with doing gather differently for resource variables."""
+  if isinstance(params, resource_variable_ops.ResourceVariable):
+    return params.sparse_read(ids, name=name)
+  return array_ops.gather(
+      params, ids, name=name, validate_indices=validate_indices)
+
+
+def _embedding_lookup_with_distributed_aggregation(params,
+                                                   ids,
+                                                   partition_strategy="mod",
+                                                   name=None,
+                                                   validate_indices=True,
+                                                   max_norm=None,
+                                                   weights=None,
+                                                   idx=None,
+                                                   segment_ids=None):
+  """Lookup helper for embedding_lookup_sparse_with_distributed_aggregation."""
+  if params is None or params == []:  # pylint: disable=g-explicit-bool-comparison
+    raise ValueError("Need at least one param")
+  if isinstance(params, variables.PartitionedVariable):
+    params = list(params)  # Iterate to get the underlying Variables.
+  if not isinstance(params, list):
+    params = [params]
+
+  def maybe_normalize(x):
+    if max_norm is not None:
+      if x.get_shape().ndims is not None:
+        ndims = x.get_shape().ndims
+      else:
+        ndims = array_ops.size(array_ops.shape(x))
+      return clip_ops.clip_by_norm(x, max_norm, axes=list(range(1, ndims)))
+    return x
+
+  with ops.name_scope(name, "embedding_lookup_with_distributed_aggregation",
+                      params + [ids]) as name:
+    np = len(params)  # Number of partitions
+    # Preserve the resource variable status to avoid accidental dense reads.
+    if not any(
+        isinstance(p, resource_variable_ops.ResourceVariable) for p in params):
+      params = ops.convert_n_to_tensor_or_indexed_slices(params, name="params")
+    if np == 1:
+      with ops.colocate_with(params[0]):
+        ret = maybe_normalize(
+            _do_gather(params[0], ids, validate_indices=validate_indices))
+        ignore_weights = weights is None
+        if not ignore_weights:
+          if weights.dtype != ret.dtype:
+            weights = math_ops.cast(weights, ret.dtype)
+          # Reshape to allow broadcast
+          ones = array_ops.fill(
+              array_ops.expand_dims(array_ops.rank(ret) - 1, 0), 1)
+          bcast_weights_shape = array_ops.concat(
+              [array_ops.shape(weights), ones], 0)
+          orig_weights_shape = weights.get_shape()
+          weights = array_ops.reshape(weights, bcast_weights_shape)
+          # Set weights shape after reshape
+          if ret.get_shape().ndims is not None:
+            weights.set_shape(
+                orig_weights_shape.concatenate(
+                    [1 for _ in range(ret.get_shape().ndims - 1)]))
+          ret *= weights
+          return math_ops.segment_sum(ret, segment_ids, name=name)
+        else:
+          return math_ops.sparse_segment_sum(ret, idx, segment_ids, name=name)
+    else:
+      ids = ops.convert_to_tensor(ids, name="ids")
+      flat_ids = array_ops.reshape(ids, [-1])
+      original_indices = math_ops.range(array_ops.size(flat_ids))
+
+      # Create p_assignments and set new_ids depending on the strategy.
+      if partition_strategy == "mod":
+        p_assignments = flat_ids % np
+        new_ids = flat_ids // np
+      elif partition_strategy == "div":
+        # Compute num_total_ids as the sum of dim-0 of params, then assign to
+        # partitions based on a constant number of ids per partition. Optimize
+        # if we already know the full shape statically.
+        dim_0_size = params[0].get_shape()[0]
+        for p in xrange(1, np):
+          dim_0_size += params[p].get_shape()[0]
+        if dim_0_size.value:
+          num_total_ids = constant_op.constant(dim_0_size.value, flat_ids.dtype)
+        else:
+          dim_0_sizes = []
+          for p in xrange(np):
+            if params[p].get_shape()[0].value is not None:
+              dim_0_sizes.append(params[p].get_shape()[0].value)
+            else:
+              with ops.colocate_with(params[p]):
+                dim_0_sizes.append(array_ops.shape(params[p])[0])
+          num_total_ids = math_ops.reduce_sum(
+              math_ops.cast(array_ops.stack(dim_0_sizes), flat_ids.dtype))
+        ids_per_partition = num_total_ids // np
+        extras = num_total_ids % np
+
+        p_assignments = math_ops.maximum(flat_ids // (ids_per_partition + 1), (
+            flat_ids - extras) // ids_per_partition)
+
+        # Emulate a conditional using a boolean indicator tensor
+        is_in_first_extras_partitions = math_ops.cast(p_assignments < extras,
+                                                      flat_ids.dtype)
+        new_ids = (is_in_first_extras_partitions * (flat_ids %
+                                                    (ids_per_partition + 1)) +
+                   (1 - is_in_first_extras_partitions) * (
+                       (flat_ids - extras) % ids_per_partition))
+      else:
+        raise ValueError("Unrecognized partition strategy: " +
+                         partition_strategy)
+
+      # Cast partition assignments to int32 for use in dynamic_partition.
+      # There really should not be more than 2^32 partitions.
+      p_assignments = math_ops.cast(p_assignments, dtypes.int32)
+      # Partition list of ids based on assignments into np separate lists
+      gather_ids = data_flow_ops.dynamic_partition(new_ids, p_assignments, np)
+      # Similarly, partition the original indices.
+      pindices = data_flow_ops.dynamic_partition(original_indices,
+                                                 p_assignments, np)
+      # Do np separate lookups, finding embeddings for plist[p] in params[p]
+      partitioned_result = []
+      for p in xrange(np):
+        with ops.colocate_with(params[p]):
+          partitioned_result.append(
+              _do_gather(
+                  params[p], gather_ids[p], validate_indices=validate_indices))
+
+      ignore_weights = weights is None
+      if not ignore_weights:
+        # Partition weights according to pindices.
+        partitioned_weight = []
+        for p in xrange(np):
+          partitioned_weight.append(array_ops.gather(weights, pindices[p]))
+      # Reshape each partition result.
+      element_shape = params[0].get_shape()[1:]
+      for p in params[1:]:
+        element_shape = element_shape.merge_with(p.get_shape()[1:])
+      if element_shape.is_fully_defined():
+        for p in xrange(np):
+          with ops.colocate_with(params[p]):
+            partitioned_result[p] = array_ops.reshape(
+                partitioned_result[p],
+                array_ops.concat([array_ops.shape(pindices[p]), element_shape],
+                                 0))
+      else:
+        with ops.colocate_with(params[0]):
+          params_shape = array_ops.shape(params[0])
+        for p in xrange(np):
+          with ops.colocate_with(params[p]):
+            partitioned_result[p] = array_ops.reshape(
+                partitioned_result[p],
+                array_ops.concat([
+                    array_ops.shape(pindices[p]), array_ops.slice(
+                        params_shape, [1], [-1])
+                ], 0))
+      # Normalize each partition result.
+      for p in xrange(np):
+        with ops.colocate_with(params[p]):
+          partitioned_result[p] = maybe_normalize(partitioned_result[p])
+      if not ignore_weights:
+        # Multiply each partition result with partition weights.
+        for p in xrange(np):
+          with ops.colocate_with(params[p]):
+            if partitioned_weight[p].dtype != partitioned_result[p].dtype:
+              partitioned_weight[p] = math_ops.cast(partitioned_weight[p],
+                                                    partitioned_result[p].dtype)
+            # Reshape partition weights.
+            ones = array_ops.fill(
+                array_ops.expand_dims(
+                    array_ops.rank(partitioned_result[p]) - 1, 0), 1)
+            bcast_weights_shape = array_ops.concat(
+                [array_ops.shape(partitioned_weight[p]), ones], 0)
+            orig_weights_shape = partitioned_weight[p].get_shape()
+            partitioned_weight[p] = array_ops.reshape(partitioned_weight[p],
+                                                      bcast_weights_shape)
+            if partitioned_result[p].get_shape().ndims is not None:
+              partitioned_weight[p].set_shape(
+                  orig_weights_shape.concatenate([
+                      1
+                      for _ in range(partitioned_result[p].get_shape().ndims -
+                                     1)
+                  ]))
+            partitioned_result[p] *= partitioned_weight[p]
+      partitioned_segment_ids = []
+      for p in xrange(np):
+        if not ignore_weights:
+          # Partition segment_ids according to pindices.
+          p_segment_ids = array_ops.gather(segment_ids, pindices[p])
+          # Number the p_segment_ids to meet segment_sum's requirements. Note
+          # that unique_p_segment_ids contains unique segment ids of this
+          # partiton and these ids' order is unchanged.
+          unique_p_segment_ids, unique_p_segment_idx = array_ops.unique(
+              p_segment_ids)
+          partitioned_segment_ids.append(unique_p_segment_ids)
+          # segment_sum this partition's result.
+          with ops.colocate_with(params[p]):
+            partitioned_result[p] = math_ops.segment_sum(
+                partitioned_result[p], unique_p_segment_idx)
+        else:
+          # When ignore weights, we need to get indexs of elements in idx and
+          # segment_ids.
+          _, exclude_idx = array_ops.setdiff1d(idx, pindices[p])
+          all_idx = math_ops.range(array_ops.shape(idx)[0])
+          _, include_idx = array_ops.setdiff1d(all_idx, exclude_idx)
+          # Gather segment_ids and idx according to indexs.
+          p_segment_ids = array_ops.gather(segment_ids, include_idx)
+          p_idx = array_ops.gather(idx, include_idx)
+          # Number the p_segment_ids, same as ignore_weights case above.
+          unique_p_segment_ids, unique_p_segment_idx = array_ops.unique(
+              p_segment_ids)
+          _, unique_p_idx_idx = array_ops.unique(p_idx)
+          partitioned_segment_ids.append(unique_p_segment_ids)
+          with ops.colocate_with(params[p]):
+            partitioned_result[p] = math_ops.sparse_segment_sum(
+                partitioned_result[p], unique_p_idx_idx, unique_p_segment_idx)
+      # Concat each partition's segment_ids and result for final segment_sum.
+      concat_segment_ids = array_ops.concat(partitioned_segment_ids, 0)
+      concat_partitioned_result = array_ops.concat(partitioned_result, 0)
+      return math_ops.unsorted_segment_sum(
+          concat_partitioned_result,
+          concat_segment_ids,
+          math_ops.reduce_max(concat_segment_ids) + 1,
+          name=name)
diff --git a/tensorflow/contrib/layers/python/layers/embedding_ops_test.py b/tensorflow/contrib/layers/python/layers/embedding_ops_test.py
index dfa8067f27..bf25144982 100644
--- a/tensorflow/contrib/layers/python/layers/embedding_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/embedding_ops_test.py
@@ -31,10 +31,13 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors_impl
 from tensorflow.python.framework import random_seed
 from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.platform import test
+from tensorflow.python.util import compat
 
 
 class SafeEmbeddingLookupSparseTest(test.TestCase):
@@ -143,8 +146,8 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       self.assertAllClose(
           embedding_lookup_result,
           [(embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4,
-           [0] * 4, embedding_weights[0][2],
-           (embedding_weights[0][0] + embedding_weights[0][1]) / 2.0])
+           [0] * 4, embedding_weights[0][2], (
+               embedding_weights[0][0] + embedding_weights[0][1]) / 2.0])
 
   def test_safe_embedding_lookup_sparse_partitioned(self):
     with self.test_session():
@@ -169,8 +172,8 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids)
       embedding_weights = [
-          constant_op.constant(
-              w, dtype=dtypes.float64) for w in embedding_weights
+          constant_op.constant(w, dtype=dtypes.float64)
+          for w in embedding_weights
       ]
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids, sparse_weights)
@@ -183,11 +186,10 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       embedding_lookup_result = (embedding_ops.safe_embedding_lookup_sparse(
           embedding_weights, sparse_ids, sparse_weights).eval())
 
-      self.assertAllClose(
-          embedding_lookup_result,
-          [[(1.0 * embedding_weights[0][0] + 2.0 * embedding_weights[0][1]) /
-            3.0, [0] * 4, [0] * 4],
-           [embedding_weights[0][2], [0] * 4, [0] * 4]])
+      self.assertAllClose(embedding_lookup_result, [[
+          (1.0 * embedding_weights[0][0] + 2.0 * embedding_weights[0][1]) / 3.0,
+          [0] * 4, [0] * 4
+      ], [embedding_weights[0][2], [0] * 4, [0] * 4]])
 
   def test_safe_embedding_lookup_sparse_3d_return_special_vector(self):
     with self.test_session():
@@ -213,14 +215,13 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       embedding_lookup_result = (embedding_ops.safe_embedding_lookup_sparse(
           embedding_weights, sparse_ids, None).eval())
 
-      self.assertAllClose(
-          embedding_lookup_result,
-          [[(embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4,
-            [0] * 4], [
-                embedding_weights[0][2],
-                (embedding_weights[0][0] + embedding_weights[0][1]) / 2.0,
-                [0] * 4
-            ]])
+      self.assertAllClose(embedding_lookup_result, [[(
+          embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4, [
+              0
+          ] * 4], [
+              embedding_weights[0][2],
+              (embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4
+          ]])
 
   def test_safe_embedding_lookup_sparse_3d_partitioned(self):
     with self.test_session():
@@ -231,13 +232,12 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
           embedding_weights, sparse_ids, None).eval())
 
       embedding_weights = list(itertools.chain(*embedding_weights))
-      self.assertAllClose(embedding_lookup_result,
-                          [[(embedding_weights[0] + embedding_weights[1]) / 2.0,
-                            [0] * 4, [0] * 4], [
-                                embedding_weights[2],
-                                (embedding_weights[0] + embedding_weights[1]) /
-                                2.0, [0] * 4
-                            ]])
+      self.assertAllClose(embedding_lookup_result, [[
+          (embedding_weights[0] + embedding_weights[1]) / 2.0, [0] * 4, [0] * 4
+      ], [
+          embedding_weights[2],
+          (embedding_weights[0] + embedding_weights[1]) / 2.0, [0] * 4
+      ]])
 
   def test_safe_embedding_lookup_sparse_3d_partitioned_inconsistent_weights(
       self):
@@ -249,8 +249,8 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids)
       embedding_weights = [
-          constant_op.constant(
-              w, dtype=dtypes.float64) for w in embedding_weights
+          constant_op.constant(w, dtype=dtypes.float64)
+          for w in embedding_weights
       ]
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids, sparse_weights)
@@ -299,8 +299,8 @@ class ScatteredEmbeddingLookupTest(test.TestCase):
       self.assertAllEqual(embedding_lookup_result[0],
                           embedding_lookup_result[1])
       # Different embedding expected for different value.
-      embedding_diff = np.min((embedding_lookup_result[2] -
-                               embedding_lookup_result[0])**2)
+      embedding_diff = np.min(
+          (embedding_lookup_result[2] - embedding_lookup_result[0])**2)
       self.assertGreater(embedding_diff, 0)
 
   def test_scattered_embedding_coverage(self):
@@ -318,8 +318,8 @@ class ScatteredEmbeddingLookupTest(test.TestCase):
   def test_scattered_embedding_multi_dimension(self):
     with self.test_session():
       embedding_weights = self._random_weights()
-      values = constant_op.constant(
-          [["foo", "bar", "bar"], ["bar", "bar", "foo"]])
+      values = constant_op.constant([["foo", "bar", "bar"],
+                                     ["bar", "bar", "foo"]])
 
       embedding_lookup_result = embedding_ops.scattered_embedding_lookup(
           embedding_weights, values, dimension=10).eval()
@@ -338,8 +338,8 @@ class ScatteredEmbeddingLookupTest(test.TestCase):
 
       embedding_lookup_result = (
           embedding_ops.scattered_embedding_lookup_sparse(
-              embedding_weights, sparse_tensor, dimension=5, combiner="mean")
-          .eval())
+              embedding_weights, sparse_tensor, dimension=5,
+              combiner="mean").eval())
 
       self.assertAllEqual(embedding_lookup_result.shape, [5, 5])
       # Same non-zero embedding for the empty rows filled with a default value.
@@ -431,8 +431,8 @@ class SampledScatteredEmbeddingLookupTest(test.TestCase):
   def test_hashed_embedding_multi_dimension(self):
     with self.test_session():
       embedding_weights = self._random_weights()
-      values = constant_op.constant(
-          [["foo", "bar", "bar"], ["bar", "bar", "foo"]])
+      values = constant_op.constant([["foo", "bar", "bar"],
+                                     ["bar", "bar", "foo"]])
       sampled_candidates = constant_op.constant(
           [[[1, 3, 4, 6], [1, 7, 8, 9], [1, 7, 8, 9]],
            [[1, 7, 8, 9], [1, 7, 8, 9], [1, 3, 4, 6]]])
@@ -489,8 +489,8 @@ class SampledScatteredEmbeddingLookupSparseTest(test.TestCase):
       result = embedding_ops._sampled_scattered_embedding_lookup_sparse(
           params, sp_values, dimension=5, hash_key=self._hash_key)
 
-      self.assertAllClose(result.eval(), [[0., 0., 0., 0., 0.],
-                                          [.3, .2, .2, .3, .1],
+      self.assertAllClose(result.eval(), [[0., 0., 0., 0.,
+                                           0.], [.3, .2, .2, .3, .1],
                                           [0., 0., 0., 0., 0.]])
 
   def test_output_values_with_sampled_candidates(self):
@@ -563,5 +563,224 @@ class SampledScatteredEmbeddingLookupSparseTest(test.TestCase):
       self.assertAllClose(result.eval(), result_abc.eval())
 
 
+def _PName(param_id):
+  return "p" + str(param_id)
+
+
+def _EmbeddingParams(num_shards,
+                     vocab_size,
+                     dtype=dtypes.float32,
+                     shape=None,
+                     use_shapeless_placeholder=False):
+  p = []
+  params = {}
+  feed_dict = {}
+  if not shape:
+    shape = [10]
+  for i in range(num_shards):
+    shard_shape = [vocab_size // num_shards] + shape
+    if i < vocab_size % num_shards:  # Excess goes evenly on the first shards
+      shard_shape[0] += 1
+
+    param_name = _PName(i)
+
+    if use_shapeless_placeholder:
+      param = array_ops.placeholder(dtype, shape=None, name=param_name)
+    else:
+      param = constant_op.constant(
+          1.0, shape=shard_shape, dtype=dtype, name=param_name)
+    p.append(param)
+    np_type = "f" if dtype == dtypes.float32 else "d"
+    val = (np.random.rand(*shard_shape).astype(np_type)) + 1
+    params[param_name + ":0"] = val
+    feed_dict[param.name] = val
+  return p, params, feed_dict
+
+
+def _EmbeddingResult(params,
+                     id_vals,
+                     num_shards,
+                     vocab_size,
+                     partition_strategy="mod",
+                     weight_vals=None):
+  if weight_vals is None:
+    weight_vals = np.copy(id_vals)
+    weight_vals.fill(1)
+  values = []
+  weights = []
+  weights_squared = []
+  for ids, wts in zip(id_vals, weight_vals):
+    value_aggregation = None
+    weight_aggregation = None
+    squared_weight_aggregation = None
+    if isinstance(ids, compat.integral_types):
+      ids = [ids]
+      wts = [wts]
+    for i, weight_value in zip(ids, wts):
+      if partition_strategy == "mod":
+        val = np.copy(params[_PName(i % num_shards) + ":0"][
+            i // num_shards, :]) * weight_value
+      elif partition_strategy == "div":
+        ids_per_partition, extras = divmod(vocab_size, num_shards)
+        threshold = extras * (ids_per_partition + 1)
+        if i < threshold:
+          partition = i // (ids_per_partition + 1)
+          offset = i % (ids_per_partition + 1)
+        else:
+          partition = extras + (i - threshold) // ids_per_partition
+          offset = (i - threshold) % ids_per_partition
+        val = np.copy(
+            params[_PName(partition) + ":0"][offset, :]) * weight_value
+      else:
+        assert False
+      if value_aggregation is None:
+        assert weight_aggregation is None
+        assert squared_weight_aggregation is None
+        value_aggregation = val
+        weight_aggregation = weight_value
+        squared_weight_aggregation = weight_value * weight_value
+      else:
+        assert weight_aggregation is not None
+        assert squared_weight_aggregation is not None
+        value_aggregation += val
+        weight_aggregation += weight_value
+        squared_weight_aggregation += weight_value * weight_value
+    values.append(value_aggregation)
+    weights.append(weight_aggregation)
+    weights_squared.append(squared_weight_aggregation)
+  values = np.array(values).astype(np.float32)
+  weights = np.array(weights).astype(np.float32)
+  weights_squared = np.array(weights_squared).astype(np.float32)
+  return values, weights, weights_squared
+
+
+class EmbeddingLookupSparseWithDistributedAggregationTest(test.TestCase):
+
+  def _RandomIdsAndWeights(self, batch_size, vocab_size):
+    max_val_per_entry = 6
+    vals_per_batch_entry = np.random.randint(
+        1, max_val_per_entry, size=batch_size)
+    num_vals = np.sum(vals_per_batch_entry)
+
+    ids = np.random.randint(vocab_size, size=num_vals)
+    weights = 1 + np.random.rand(num_vals)
+
+    indices = []
+    for batch_entry, num_val in enumerate(vals_per_batch_entry):
+      for val_index in range(num_val):
+        indices.append([batch_entry, val_index])
+
+    shape = [batch_size, max_val_per_entry]
+
+    sp_ids = sparse_tensor_lib.SparseTensor(
+        constant_op.constant(indices, dtypes.int64),
+        constant_op.constant(ids, dtypes.int32),
+        constant_op.constant(shape, dtypes.int64))
+    sp_weights = sparse_tensor_lib.SparseTensor(
+        constant_op.constant(indices, dtypes.int64),
+        constant_op.constant(weights, dtypes.float32),
+        constant_op.constant(shape, dtypes.int64))
+
+    return sp_ids, sp_weights, ids, weights, vals_per_batch_entry
+
+  def _GroupByBatchEntry(self, vals, vals_per_batch_entry):
+    grouped_vals = []
+    index = 0
+    for num_val in vals_per_batch_entry:
+      grouped_vals.append(list(vals[index:(index + num_val)]))
+      index += num_val
+    return grouped_vals
+
+  def testEmbeddingLookupSparse(self):
+    vocab_size = 13
+    batch_size = 10
+    param_shape = [2, 5]
+    expected_lookup_result_shape = [None] + param_shape
+
+    sp_ids, sp_weights, ids, weights, vals_per_batch_entry = (
+        self._RandomIdsAndWeights(batch_size, vocab_size))
+
+    grouped_ids = self._GroupByBatchEntry(ids, vals_per_batch_entry)
+    grouped_weights = self._GroupByBatchEntry(weights, vals_per_batch_entry)
+    grouped_ignored_weights = self._GroupByBatchEntry(
+        np.ones(np.sum(vals_per_batch_entry)), vals_per_batch_entry)
+
+    for num_shards, combiner, dtype, ignore_weights in itertools.product(
+        [1, 5], ["sum", "mean", "sqrtn"], [dtypes.float32,
+                                           dtypes.float64], [True, False]):
+
+      with self.test_session():
+        p, params, feed_dict = _EmbeddingParams(
+            num_shards, vocab_size, shape=param_shape, dtype=dtype)
+        embedding_sum = \
+            embedding_ops.embedding_lookup_sparse_with_distributed_aggregation(
+                p,
+                sp_ids,
+                None if ignore_weights else sp_weights,
+                combiner=combiner)
+
+        self.assertEqual(embedding_sum.get_shape().as_list(),
+                         expected_lookup_result_shape)
+
+        tf_embedding_sum = embedding_sum.eval(feed_dict=feed_dict)
+
+        np_embedding_sum, np_weight_sum, np_weight_sq_sum = _EmbeddingResult(
+            params,
+            grouped_ids,
+            num_shards,
+            vocab_size,
+            weight_vals=grouped_ignored_weights
+            if ignore_weights else grouped_weights)
+        if combiner == "mean":
+          np_embedding_sum /= np.reshape(np_weight_sum, (batch_size, 1, 1))
+        if combiner == "sqrtn":
+          np_embedding_sum /= np.reshape(
+              np.sqrt(np_weight_sq_sum), (batch_size, 1, 1))
+        self.assertAllClose(np_embedding_sum, tf_embedding_sum)
+
+  def testGradientsEmbeddingLookupSparse(self):
+    vocab_size = 12
+    batch_size = 4
+    param_shape = [2, 3]
+    sp_ids, sp_weights, _, _, _ = (self._RandomIdsAndWeights(
+        batch_size, vocab_size))
+
+    for num_shards, combiner, dtype, ignore_weights in itertools.product(
+        [1, 3], ["sum", "mean", "sqrtn"], [dtypes.float32,
+                                           dtypes.float64], [True, False]):
+      with self.test_session():
+        x, params, _ = _EmbeddingParams(
+            num_shards, vocab_size, shape=param_shape, dtype=dtype)
+
+        y = embedding_ops.embedding_lookup_sparse_with_distributed_aggregation(
+            x,
+            sp_ids,
+            None if ignore_weights else sp_weights,
+            combiner=combiner)
+        x_name = [_PName(i) for i in range(num_shards)]
+        x_init_value = [params[x_n + ":0"] for x_n in x_name]
+        x_shape = [i.shape for i in x_init_value]
+        y_shape = [batch_size] + list(params[_PName(0) + ":0"].shape[1:])
+        err = gradient_checker.compute_gradient_error(
+            x, x_shape, y, y_shape, x_init_value=x_init_value)
+      self.assertLess(err, 1e-5 if dtype == dtypes.float64 else 2e-3)
+
+  def testIncompatibleShapes(self):
+    with self.test_session():
+      x, _, _ = _EmbeddingParams(1, 10, dtype=dtypes.float32)
+      sp_ids = sparse_tensor_lib.SparseTensor(
+          constant_op.constant([[0, 0], [0, 1], [1, 0]], dtypes.int64),
+          constant_op.constant([0, 1, 2], dtypes.int32),
+          constant_op.constant([2, 2], dtypes.int64))
+      sp_weights = sparse_tensor_lib.SparseTensor(
+          constant_op.constant([[0, 0], [0, 1]], dtypes.int64),
+          constant_op.constant([12.0, 5.0], dtypes.float32),
+          constant_op.constant([1, 2], dtypes.int64))
+
+      with self.assertRaises(ValueError):
+        embedding_ops.embedding_lookup_sparse_with_distributed_aggregation(
+            x, sp_ids, sp_weights, combiner="mean")
+
+
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 282c556424..32839b251a 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -791,9 +791,11 @@ def weighted_sparse_column(sparse_id_column,
       weight or value of the corresponding sparse id feature.
     dtype: Type of weights, such as `tf.float32`. Only floating and integer
       weights are supported.
+
   Returns:
     A _WeightedSparseColumn composed of two sparse features: one represents id,
     the other represents weight (value) of the id feature in that example.
+
   Raises:
     ValueError: if dtype is not convertible to float.
   """
diff --git a/tensorflow/contrib/learn/python/learn/README.md b/tensorflow/contrib/learn/python/learn/README.md
index 0aae178e9a..6a7b0ea614 100644
--- a/tensorflow/contrib/learn/python/learn/README.md
+++ b/tensorflow/contrib/learn/python/learn/README.md
@@ -9,7 +9,7 @@ TF Learn is a simplified interface for TensorFlow, to get people started on pred
 
 ### Why *TensorFlow Learn*?
 
-- To smooth the transition from the [scikit-learn](http://scikit-learn.org/stable/) world of one-liner machine learning into the more open world of building different shapes of ML models. You can start by using [fit](../../../../g3doc/api_docs/python/contrib.learn.md#Estimator.fit)/[predict](../../../../g3doc/api_docs/python/contrib.learn.md#Estimator.predict) and slide into TensorFlow APIs as you are getting comfortable.
+- To smooth the transition from the [scikit-learn](http://scikit-learn.org/stable/) world of one-liner machine learning into the more open world of building different shapes of ML models. You can start by using [fit](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/Estimator#fit)/[predict](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/Estimator#predict) and slide into TensorFlow APIs as you are getting comfortable.
 - To provide a set of reference models that will be easy to integrate with existing code.
 
 ## Installation
@@ -43,17 +43,17 @@ Optionally you can install [scikit-learn](http://scikit-learn.org/stable/) and [
 ### Existing Estimator Implementations
 
 -   [`LinearClassifier`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/linear.py)
-    ([docs](../../../../g3doc/api_docs/python/contrib.learn.md#LinearClassifier))
+    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/LinearClassifier))
 -   [`LinearRegressor`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/linear.py)
-    ([docs](../../../../g3doc/api_docs/python/contrib.learn.md#LinearRegressor))
+    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/LinearRegressor))
 -   [`DNNClassifier`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn.py)
-    ([docs](../../../../g3doc/api_docs/python/contrib.learn.md#DNNClassifier))
+    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNClassifier))
 -   [`DNNRegressor`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn.py)
-    ([docs](../../../../g3doc/api_docs/python/contrib.learn.md#DNNRegressor))
+    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNRegressor))
 -   [`DNNLinearCombinedClassifier`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py)
-    ([docs](../../../../g3doc/api_docs/python/contrib.learn.md#DNNLinearCombinedClassifier))
+    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNLinearCombinedClassifier))
 -   [`DNNLinearCombinedRegressor`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py)
-    ([docs](../../../../g3doc/api_docs/python/contrib.learn.md#DNNLinearCombinedRegressor))
+    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNLinearCombinedRegressor))
 -   [`SVM`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/svm.py)
     ([docs](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/g3doc/svm.md))
 -   [`GMM`](https://www.tensorflow.org/code/tensorflow/contrib/factorization/python/ops/gmm.py)
@@ -67,7 +67,7 @@ Below are a few simple examples of the API. For more examples, please see [examp
 
 General tips:
 
--  It's useful to rescale a dataset to 0 mean and unit standard deviation before passing it to an [`Estimator`](../../../../g3doc/api_docs/python/contrib.learn.md#estimators). [Stochastic Gradient Descent](https://en.wikipedia.org/wiki/Stochastic_gradient_descent) doesn't always do the right thing when variable are at very different scales.
+-  It's useful to rescale a dataset to 0 mean and unit standard deviation before passing it to an [`Estimator`](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/Estimator). [Stochastic Gradient Descent](https://en.wikipedia.org/wiki/Stochastic_gradient_descent) doesn't always do the right thing when variable are at very different scales.
 
 -  Categorical variables should be managed before passing input to the estimator.
 
@@ -219,7 +219,7 @@ INFO:tensorflow:Loss for final step: 0.0162506.</pre>
 
 ## Summaries
 
-If you supply a `model_dir` argument to your `Estimator`s, TensorFlow will write summaries for ``loss`` and histograms for variables in this directory. (You can also add custom summaries in your custom model function by calling [Summary](../../../../g3doc/api_docs/python/train.md#summary-operations) operations.)
+If you supply a `model_dir` argument to your `Estimator`s, TensorFlow will write summaries for ``loss`` and histograms for variables in this directory. (You can also add custom summaries in your custom model function by calling [Summary](https://www.tensorflow.org/api_guides/python/summary) operations.)
 
 To view the summaries in TensorBoard, run the following command, where `logdir` is the `model_dir` for your `Estimator`:
 
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
index b2da9a7cc0..b891bf2301 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
@@ -22,6 +22,7 @@ from __future__ import print_function
 # pylint: disable=unused-import
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _ArrayFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _enqueue_data as enqueue_data
+from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _OrderedDictNumpyFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _PandasFeedFn
 # pylint: enable=unused-import
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 8f8ab3b335..bc7465bbc2 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -200,6 +200,7 @@ class RunConfig(ClusterConfig):
   parameter servers), you probably want to use `learn_runner.EstimatorConfig`
   instead.
   """
+  _USE_DEFAULT = 0
 
   def __init__(self,
                master=None,
@@ -208,7 +209,7 @@ class RunConfig(ClusterConfig):
                gpu_memory_fraction=1,
                tf_random_seed=None,
                save_summary_steps=100,
-               save_checkpoints_secs=600,
+               save_checkpoints_secs=_USE_DEFAULT,
                save_checkpoints_steps=None,
                keep_checkpoint_max=5,
                keep_checkpoint_every_n_hours=10000,
@@ -260,6 +261,11 @@ class RunConfig(ClusterConfig):
     self._tf_random_seed = tf_random_seed
     self._save_summary_steps = save_summary_steps
     self._save_checkpoints_secs = save_checkpoints_secs
+    if save_checkpoints_secs == RunConfig._USE_DEFAULT:
+      if save_checkpoints_steps is None:
+        self._save_checkpoints_secs = 600
+      else:
+        self._save_checkpoints_secs = None
     self._save_checkpoints_steps = save_checkpoints_steps
 
     # TODO(weiho): Remove these after ModelFn refactoring, when users can
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/__init__.py b/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
index 32252cd8e3..4567928358 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
@@ -35,3 +35,4 @@ from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import extract_pan
 from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import extract_pandas_matrix
 from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import HAS_PANDAS
 from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import pandas_input_fn
+from tensorflow.contrib.learn.python.learn.learn_io.generator_io import generator_input_fn
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
new file mode 100644
index 0000000000..5859bb6b47
--- /dev/null
+++ b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
@@ -0,0 +1,134 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Methods to allow generator of dict with numpy arrays."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from types import FunctionType, GeneratorType
+from collections import Container
+
+from tensorflow.contrib.learn.python.learn.dataframe.queues import feeding_functions
+
+
+def generator_input_fn(x,
+                       target_key=None,
+                       batch_size=128,
+                       num_epochs=1,
+                       shuffle=True,
+                       queue_capacity=1000,
+                       num_threads=1):
+  """Returns input function that would dicts of numpy arrays
+       yielded from a generator.
+  
+  It is assumed that every dict yielded from the dictionary represents
+  a single sample. The generator should consume a single epoch of the data.
+
+  This returns a function outputting `features` and `target` based on the dict
+  of numpy arrays. The dict `features` has the same keys as an element yielded
+  from x.
+
+  Example:
+    ```python
+    def generator():
+      for index in range(10):
+        yield {'height': np.random.randint(32,36),
+              'age': np.random.randint(18, 80),
+              'label': np.ones(1)}
+
+    with tf.Session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator, target_key="label", batch_size=2, shuffle=False,
+          num_epochs=1)
+    ```
+
+  Args:
+    x: Generator Function, returns a `Generator` that will yield the data
+      in `dict` of numpy arrays
+    target_key: String or Container of Strings, the key or Container of keys of
+      the numpy arrays in x dictionaries to use as target.
+    batch_size: Integer, size of batches to return.
+    num_epochs: Integer, number of epochs to iterate over data. If `None` will
+      run forever.
+    shuffle: Boolean, if True shuffles the queue. Avoid shuffle at prediction
+      time.
+    queue_capacity: Integer, size of queue to accumulate.
+    num_threads: Integer, number of threads used for reading and enqueueing.
+
+  Returns:
+    Function, that returns a feature `dict` with `Tensors` and an optional
+     label `dict` with `Tensors`, or if target_key is `str` label is a `Tensor`
+
+  Raises:
+    TypeError: `x` is not `FunctionType`.
+    TypeError: `x()` is not `GeneratorType`.
+    TypeError: `next(x())` is not `dict`.
+    TypeError: `target_key` is not `str` or `target_key` is not `Container`
+       of `str`.
+    KeyError:  `target_key` not a key or `target_key[index]` not in next(`x()`).
+    KeyError: `key` mismatch between dicts emitted from `x()`
+  """
+  if not isinstance(x, FunctionType):
+    raise TypeError(
+        'x must be generator function; got {}'.format(type(x).__name__))
+  generator = x()
+  if not isinstance(generator, GeneratorType):
+    raise TypeError(
+        'x() must be generator; got {}'.format(type(generator).__name__))
+  data = next(generator)
+  if not isinstance(data, dict):
+    raise TypeError('x() must yield dict; got {}'.format(type(data).__name__))
+  input_keys = sorted(next(x()).keys())
+  if target_key is not None:
+    if isinstance(target_key, str):
+      target_key = [target_key]
+    elif isinstance(target_key, Container):
+      for item in target_key:
+        if not isinstance(item, str):
+          raise TypeError('target_key must be str or Container of str; got {}'.
+                          format(type(item).__name__))
+        if item not in input_keys:
+          raise KeyError(
+              'target_key not in yielded dict. Expected {} keys; got {}'.format(
+                  input_keys, item))
+    else:
+      raise TypeError('target_key must be str or Container of str; got {}'.
+                      format(type(target_key).__name__))
+
+  def _generator_input_fn():
+    """generator input function."""
+    queue = feeding_functions.enqueue_data(
+        x,
+        queue_capacity,
+        shuffle=shuffle,
+        num_threads=num_threads,
+        enqueue_size=batch_size,
+        num_epochs=num_epochs)
+
+    features = (queue.dequeue_many(batch_size)
+                if num_epochs is None else queue.dequeue_up_to(batch_size))
+    if not isinstance(features, list):
+      features = [features]
+    features = dict(zip(input_keys, features))
+    if target_key is not None:
+      if len(target_key) > 1:
+        target = {key: features.pop(key) for key in target_key}
+      else:
+        target = features.pop(target_key[0])
+      return features, target
+    return features
+
+  return _generator_input_fn
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py b/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
new file mode 100644
index 0000000000..bc767ec18b
--- /dev/null
+++ b/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
@@ -0,0 +1,348 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for numpy_io."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import sys
+
+# TODO: #6568 Remove this hack that makes dlopen() not crash.
+if hasattr(sys, 'getdlopenflags') and hasattr(sys, 'setdlopenflags'):
+  import ctypes
+
+  sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
+
+import numpy as np
+from tensorflow.contrib.learn.python.learn.learn_io import generator_io
+from tensorflow.python.framework import errors
+from tensorflow.python.platform import test
+from tensorflow.python.training import coordinator
+from tensorflow.python.training import queue_runner_impl
+
+
+class GeneratorIoTest(test.TestCase):
+
+  def testGeneratorInputFn(self):
+
+    def generator():
+      for index in range(2):
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32
+        }
+
+    with self.test_session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator,
+          target_key='label',
+          batch_size=2,
+          shuffle=False,
+          num_epochs=1)
+      features, target = input_fn()
+
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(session, coord=coord)
+
+      res = session.run([features, target])
+      self.assertAllEqual(res[0]['a'], np.asarray([0, 1]).reshape(-1, 1))
+      self.assertAllEqual(res[0]['b'], np.asarray([32, 33]).reshape(-1, 1))
+      self.assertAllEqual(res[1], np.asarray([-32, -31]).reshape(-1, 1))
+
+      session.run([features])
+      with self.assertRaises(errors.OutOfRangeError):
+        session.run([features, target])
+
+      coord.request_stop()
+      coord.join(threads)
+
+  def testGeneratorSingleInputFn(self):
+
+    def generator():
+      for index in range(2):
+        yield {'a': np.ones(1) * index}
+
+    with self.test_session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
+      features = input_fn()
+
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(session, coord=coord)
+
+      res = session.run([features])
+      self.assertAllEqual(res[0]['a'], np.asarray([0, 1]).reshape(-1, 1))
+
+      session.run([features])
+      with self.assertRaises(errors.OutOfRangeError):
+        session.run([features])
+
+      coord.request_stop()
+      coord.join(threads)
+
+  def testGeneratorInputFnLabelDict(self):
+
+    def generator():
+      for index in range(2):
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32,
+            'label2': np.ones(1) * index - 64,
+        }
+
+    with self.test_session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator,
+          target_key=['label', 'label2'],
+          batch_size=2,
+          shuffle=False,
+          num_epochs=1)
+      features, target = input_fn()
+
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(session, coord=coord)
+
+      res = session.run([features, target])
+      self.assertAllEqual(res[0]['a'], np.asarray([0, 1]).reshape(-1, 1))
+      self.assertAllEqual(res[0]['b'], np.asarray([32, 33]).reshape(-1, 1))
+      self.assertAllEqual(res[1]['label'], np.asarray([-32, -31]).reshape(
+          -1, 1))
+      self.assertAllEqual(res[1]['label2'],
+                          np.asarray([-64, -63]).reshape(-1, 1))
+
+      session.run([features])
+      with self.assertRaises(errors.OutOfRangeError):
+        session.run([features, target])
+
+      coord.request_stop()
+      coord.join(threads)
+
+  def testGeneratorInputFnWithDifferentDimensionsOfFeatures(self):
+
+    def generator():
+      for index in range(100):
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
+
+    with self.test_session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator,
+          target_key='label',
+          batch_size=2,
+          shuffle=False,
+          num_epochs=1)
+      features, target = input_fn()
+
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(session, coord=coord)
+
+      res = session.run([features, target])
+      self.assertAllEqual(res[0]['a'],
+                          np.vstack((np.zeros((10, 10)), np.ones(
+                              (10, 10)))).reshape(2, 10, 10))
+      self.assertAllEqual(res[0]['b'],
+                          np.vstack((np.zeros((5, 5)), np.ones(
+                              (5, 5)))).reshape(2, 5, 5) + 32)
+      self.assertAllEqual(res[1],
+                          np.vstack((np.zeros((3, 3)), np.ones(
+                              (3, 3)))).reshape(2, 3, 3) - 32)
+
+      coord.request_stop()
+      coord.join(threads)
+
+  def testGeneratorInputFnWithXAsNonGeneratorFunction(self):
+    x = np.arange(32, 36)
+    with self.test_session():
+      with self.assertRaisesRegexp(TypeError, 'x must be generator function'):
+        failing_input_fn = generator_io.generator_input_fn(
+            x, batch_size=2, shuffle=False, num_epochs=1)
+        failing_input_fn()
+
+  def testGeneratorInputFnWithXAsNonGenerator(self):
+
+    def generator():
+      return np.arange(32, 36)
+
+    with self.test_session():
+      with self.assertRaisesRegexp(TypeError, 'x\(\) must be generator'):
+        failing_input_fn = generator_io.generator_input_fn(
+            generator, batch_size=2, shuffle=False, num_epochs=1)
+        failing_input_fn()
+
+  def testGeneratorInputFnWithXAsNonGeneratorYieldingDicts(self):
+
+    def generator():
+      yield np.arange(32, 36)
+
+    with self.test_session():
+      with self.assertRaisesRegexp(TypeError, 'x\(\) must yield dict'):
+        failing_input_fn = generator_io.generator_input_fn(
+            generator, batch_size=2, shuffle=False, num_epochs=1)
+        failing_input_fn()
+
+  def testGeneratorInputFNWithTargetLabelNotString(self):
+
+    def generator():
+      for index in range(2):
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
+
+    y = np.arange(32, 36)
+    with self.test_session():
+      with self.assertRaisesRegexp(TypeError, 'target_key must be str or'
+                                   ' Container of str'):
+        failing_input_fn = generator_io.generator_input_fn(
+            generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
+        failing_input_fn()
+
+  def testGeneratorInputFNWithTargetLabelListNotString(self):
+
+    def generator():
+      for index in range(2):
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
+
+    y = ['label', np.arange(10)]
+    with self.test_session():
+      with self.assertRaisesRegexp(TypeError, 'target_key must be str or'
+                                   ' Container of str'):
+        failing_input_fn = generator_io.generator_input_fn(
+            generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
+        failing_input_fn()
+
+  def testGeneratorInputFNWithTargetLabelNotInDict(self):
+
+    def generator():
+      for index in range(2):
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
+
+    y = ['label', 'target']
+    with self.test_session():
+      with self.assertRaisesRegexp(KeyError, 'target_key not in yielded dict'):
+        failing_input_fn = generator_io.generator_input_fn(
+            generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
+        failing_input_fn()
+
+  def testGeneratorInputFnWithNoTargetKey(self):
+
+    def generator():
+      for index in range(2):
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32
+        }
+
+    with self.test_session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
+      features = input_fn()
+
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(session, coord=coord)
+
+      res = session.run(features)
+      self.assertAllEqual(res['a'], np.asarray([0, 1]).reshape(-1, 1))
+      self.assertAllEqual(res['b'], np.asarray([32, 33]).reshape(-1, 1))
+      self.assertAllEqual(res['label'], np.asarray([-32, -31]).reshape(-1, 1))
+
+      session.run([features])
+      with self.assertRaises(errors.OutOfRangeError):
+        session.run([features])
+
+      coord.request_stop()
+      coord.join(threads)
+
+  def testGeneratorInputFnWithBatchLargerthanData(self):
+
+    def generator():
+      for index in range(2):
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32
+        }
+
+    with self.test_session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator, target_key=None, batch_size=4, shuffle=False, num_epochs=1)
+      features = input_fn()
+
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(session, coord=coord)
+
+      res = session.run(features)
+      self.assertAllEqual(res['a'], np.asarray([0, 1, 0, 1]).reshape(-1, 1))
+      self.assertAllEqual(res['b'], np.asarray([32, 33, 32, 33]).reshape(-1, 1))
+      self.assertAllEqual(res['label'],
+                          np.asarray([-32, -31, -32, -31]).reshape(-1, 1))
+
+      with self.assertRaises(errors.OutOfRangeError):
+        session.run([features])
+
+      coord.request_stop()
+      coord.join(threads)
+
+  def testGeneratorInputFnWithMismatchinGeneratorKeys(self):
+
+    def generator():
+      index = 0
+      yield {
+          'a': np.ones(1) * index,
+          'b': np.ones(1) * index + 32,
+          'label': np.ones(1) * index - 32
+      }
+      index = 1
+      yield {
+          'a': np.ones(1) * index,
+          'c': np.ones(1) * index + 32,
+          'label': np.ones(1) * index - 32
+      }
+
+    with self.test_session() as session:
+      input_fn = generator_io.generator_input_fn(
+          generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
+      features = input_fn()
+
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(session, coord=coord)
+
+      with self.assertRaises(errors.OutOfRangeError):
+        session.run([features])
+
+      with self.assertRaisesRegex(KeyError, 'key mismatch between dicts emitted'
+                                  ' by GenFunExpected'):
+        coord.request_stop()
+        coord.join(threads)
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile
index 4db818a3a9..2b2e885689 100644
--- a/tensorflow/contrib/makefile/Makefile
+++ b/tensorflow/contrib/makefile/Makefile
@@ -370,6 +370,7 @@ ifeq ($(TARGET),IOS)
 	ifeq ($(IOS_ARCH),I386)
 		CXXFLAGS += -mios-simulator-version-min=$(MIN_SDK_VERSION) \
 		-arch i386 \
+		-mno-sse \
 		-fembed-bitcode \
 		-D__thread= \
 		-DUSE_GEMM_FOR_CONV \
diff --git a/tensorflow/contrib/makefile/README.md b/tensorflow/contrib/makefile/README.md
index ac10dfc722..f061b58775 100644
--- a/tensorflow/contrib/makefile/README.md
+++ b/tensorflow/contrib/makefile/README.md
@@ -75,7 +75,7 @@ To run the executable, use:
 
 ```bash
 tensorflow/contrib/makefile/gen/bin/benchmark \
- --graph=~/graphs/inception/tensorflow_inception_graph.pb
+ --graph=$HOME/graphs/inception/tensorflow_inception_graph.pb
 ```
 
 ## Android
diff --git a/tensorflow/contrib/opt/python/training/external_optimizer.py b/tensorflow/contrib/opt/python/training/external_optimizer.py
index ff80167ff4..0909760b38 100644
--- a/tensorflow/contrib/opt/python/training/external_optimizer.py
+++ b/tensorflow/contrib/opt/python/training/external_optimizer.py
@@ -99,8 +99,13 @@ class ExternalOptimizerInterface(object):
         slice(start, end) for start, end in zip(accumulated_dims[:-1],
                                                 accumulated_dims[1:])]
 
-  def minimize(self, session=None, feed_dict=None, fetches=None,
-               step_callback=None, loss_callback=None):
+  def minimize(self,
+               session=None,
+               feed_dict=None,
+               fetches=None,
+               step_callback=None,
+               loss_callback=None,
+               **run_kwargs):
     """Minimize a scalar `Tensor`.
 
     Variables subject to optimization are updated in-place at the end of
@@ -120,6 +125,7 @@ class ExternalOptimizerInterface(object):
         flattened into a single vector.
       loss_callback: A function to be called every time the loss and gradients
         are computed, with evaluated fetches supplied as positional arguments.
+      **run_kwargs: kwargs to pass to `session.run`.
     """
     session = session or ops.get_default_session()
     feed_dict = feed_dict or {}
@@ -160,8 +166,10 @@ class ExternalOptimizerInterface(object):
                 for packing_slice in self._packing_slices]
 
     # Set optimization variables to their new values.
-    session.run(self._var_updates,
-                feed_dict=dict(zip(self._update_placeholders, var_vals)))
+    session.run(
+        self._var_updates,
+        feed_dict=dict(zip(self._update_placeholders, var_vals)),
+        **run_kwargs)
 
   def _minimize(self, initial_val, loss_grad_func, equality_funcs,
                 equality_grad_funcs, inequality_funcs, inequality_grad_funcs,
diff --git a/tensorflow/contrib/rnn/ops/lstm_ops.cc b/tensorflow/contrib/rnn/ops/lstm_ops.cc
index 2de40825c9..699cc6c88a 100644
--- a/tensorflow/contrib/rnn/ops/lstm_ops.cc
+++ b/tensorflow/contrib/rnn/ops/lstm_ops.cc
@@ -78,7 +78,7 @@ ci = tanh(ci)
 cs = ci .* i + cs_prev .* f
 cs = clip(cs, cell_clip)
 
-o = sigmoid(cs * wco + f)
+o = sigmoid(cs * wco + o)
 co = tanh(cs)
 h = co .* o
 ```
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index b55e1ff848..d01d375119 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -322,9 +322,10 @@ class BahdanauAttention(_BaseAttentionMechanism):
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
+
     Returns:
       score: Tensor of dtype matching `self.values` and shape
-        `[batch_size, self.num_units]`.
+        `[batch_size, max_time]` (`max_time` is memory's `max_time`).
     """
     with variable_scope.variable_scope(None, "bahdanau_attention", [query]):
       processed_query = self.query_layer(query) if self.query_layer else query
@@ -522,7 +523,8 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     - Step 5: Calculate the context vector as the inner product between the
       alignments and the attention_mechanism's values (memory).
     - Step 6: Calculate the attention output by concatenating the cell output
-      and context through the attention layer.
+      and context through the attention layer (a linear layer with
+      `attention_size` outputs).
 
     Args:
       inputs: (Possibly nested tuple of) Tensor, the input at this time step.
@@ -531,10 +533,10 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       scope: Must be `None`.
 
     Returns:
-      A tuple `(attention, next_state)`, where:
+      A tuple `(attention_or_cell_output, next_state)`, where:
 
-      - `attention` is the attention passed to the layer above.
-      - `next_state` is an instance of `AttentionWrapperState`
+      - `attention_or_cell_output` depending on `output_attention`.
+      - `next_state` is an instance of `DynamicAttentionWrapperState`
          containing the state calculated at this time step.
 
     Raises:
diff --git a/tensorflow/contrib/seq2seq/python/ops/loss.py b/tensorflow/contrib/seq2seq/python/ops/loss.py
index cfe6ac5134..39a6d2f58b 100644
--- a/tensorflow/contrib/seq2seq/python/ops/loss.py
+++ b/tensorflow/contrib/seq2seq/python/ops/loss.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
 """Seq2seq loss operations for use in sequence models.
 """
 
@@ -28,22 +27,33 @@ from tensorflow.python.ops import nn_ops
 __all__ = ["sequence_loss"]
 
 
-def sequence_loss(logits, targets, weights,
-                  average_across_timesteps=True, average_across_batch=True,
-                  softmax_loss_function=None, name=None):
-  """Weighted cross-entropy loss for a sequence of logits (per example).
+def sequence_loss(logits,
+                  targets,
+                  weights,
+                  average_across_timesteps=True,
+                  average_across_batch=True,
+                  softmax_loss_function=None,
+                  name=None):
+  """Weighted cross-entropy loss for a sequence of logits.
+
+  Depending on the values of `average_across_timesteps` and
+  `average_across_batch`, the return Tensor will have rank 0, 1, or 2 as these
+  arguments reduce the cross-entropy at each target, which has shape
+  `[batch_size, sequence_length]`, over their respective dimensions. For
+  example, if `average_across_timesteps` is `True` and `average_across_batch`
+  is `False`, then the return Tensor will have shape `[batch_size]`.
 
   Args:
-    logits: A 3D Tensor of shape
-      [batch_size x sequence_length x num_decoder_symbols] and dtype float.
+    logits: A Tensor of shape
+      `[batch_size, sequence_length, num_decoder_symbols]` and dtype float.
       The logits correspond to the prediction across all classes at each
       timestep.
-    targets: A 2D Tensor of shape [batch_size x sequence_length] and dtype
+    targets: A Tensor of shape `[batch_size, sequence_length]` and dtype
       int. The target represents the true class at each timestep.
-    weights: A 2D Tensor of shape [batch_size x sequence_length] and dtype
-      float. Weights constitutes the weighting of each prediction in the
-      sequence. When using weights as masking set all valid timesteps to 1 and
-      all padded timesteps to 0.
+    weights: A Tensor of shape `[batch_size, sequence_length]` and dtype
+      float. `weights` constitutes the weighting of each prediction in the
+      sequence. When using `weights` as masking, set all valid timesteps to 1
+      and all padded timesteps to 0, e.g. a mask returned by `tf.sequence_mask`.
     average_across_timesteps: If set, sum the cost across the sequence
       dimension and divide the cost by the total label weight across timesteps.
     average_across_batch: If set, sum the cost across the batch dimension and
@@ -55,7 +65,10 @@ def sequence_loss(logits, targets, weights,
     name: Optional name for this operation, defaults to "sequence_loss".
 
   Returns:
-    A scalar float Tensor: The average log-perplexity per symbol (weighted).
+    A float Tensor of rank 0, 1, or 2 depending on the
+    `average_across_timesteps` and `average_across_batch` arguments. By default,
+    it has rank 0 (scalar) and is the weighted average cross-entropy
+    (log-perplexity) per symbol.
 
   Raises:
     ValueError: logits does not have 3 dimensions or targets does not have 2
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 4aa39e5202..ba761cd7c6 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -721,7 +721,8 @@ cc_library(
         "//tensorflow/core/kernels:quantized_ops",
     ]) + if_mkl([
         "//tensorflow/core/kernels:mkl_conv_op",
-        "//tensorflow/core/kernels:mkl_matmul_op",
+        "//tensorflow/core/kernels:mkl_pooling_ops",
+        "//tensorflow/core/kernels:mkl_relu_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
     ]),
 )
@@ -2094,7 +2095,8 @@ tf_cc_test_mkl(
         "//tensorflow/cc:scope",
         "//tensorflow/cc:sendrecv_ops",
         "//tensorflow/core/kernels:mkl_conv_op",
-        "//tensorflow/core/kernels:mkl_matmul_op",
+        "//tensorflow/core/kernels:mkl_pooling_ops",
+        "//tensorflow/core/kernels:mkl_relu_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
         "//tensorflow/core/kernels:ops_util",
         "//third_party/eigen3",
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 9a2e4bcfa0..309c4cd774 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -15,13 +15,15 @@ limitations under the License.
 
 #ifdef INTEL_MKL
 
+#include <algorithm>
 #include <functional>
 #include <memory>
+#include <queue>
+#include <set>
 #include <string>
 #include <unordered_set>
 #include <utility>
 #include <vector>
-
 #include "tensorflow/core/common_runtime/function.h"
 #include "tensorflow/core/common_runtime/optimization_registry.h"
 #include "tensorflow/core/framework/node_def_util.h"
@@ -39,68 +41,91 @@ limitations under the License.
 
 namespace tensorflow {
 
-// This pass implements rewriting of graph for propagating Mkl
-// layout as an additional output tensor (we will loosely call a
-// tensor that carries Mkl layout as Mkl tensor henceforth.)
-// from every Mkl supported NN layer.
+// This pass implements rewriting of graph to support following scenarios:
+// (A) Merging nodes in the graph
+// (B) Rewriting a node in the graph to a new node
+//     Rewrite happens under following 2 scenarios:
+//     1) Propagating Mkl layout as an additional output tensor
+//        (we will loosely call a tensor that carries Mkl layout as Mkl tensor
+//         henceforth.) from every Mkl supported NN layer.
+//     2) Context-based rewrite: This is neded in order to optimize
+//        gradient ops of Conv2D+AddBias. Gradient op of both the Conv2D and
+//        MatMul is BiasAddGrad, and we need to rewrite BiasAddGrad into
+//        Conv2D-specific BiasAddGrad, and MatMul-specific BiasAddGrad.
+//        This is context-specific optimization, where the context is the
+//        forward operator that the BiasAddGrad corresponds to.
+//
+// Example of A : Merging nodes in the graph
+// -----------------------------------------
+// Currently, we merge Conv2D+AddBias together. Consider Conv2D and BiasAdd as:
+//
+//           O = Conv2D(A, B)
+//           P = BiasAdd(O, C)
+//
+// We merge them into Conv2DWithBias as:
+//           P = MklConv2DWithBias(A, A_m, B, B_m, C, C_m)
 //
-// As a example, consider Relu layer. Current definition of Relu
-// layer looks like:
+// Meaning of A_m, B_m and C_m is explained in B.1.
+//
+// Merge rules:
+//  - Merge for Conv2D and BiasAdd happens only when output of Conv2D _only_
+//    goes to BiasAdd.
+//  - Also, the intersection of attributes of both the nodes must have same
+//    values.
+//  - Both the nodes must have been assigned to same device (if any).
+//
+// Example of B.1 : Rewriting nodes to Mkl nodes
+// ---------------------------------------------
+// Consider Relu layer. Current definition of Relu layer looks like:
 //
 //           O = Relu(A)
 //
 // Relu has 1 input (A), and 1 output (O).
 //
-// This rewrite pass will generate a new graph node for Relu
-// (new node is called MklRelu) as:
+// This rewrite pass will generate a new graph node for Relu (new node is
+// called MklRelu) as:
 //
 //          O, O_m = MklRelu(A, A_m)
 //
-// MklRelu has 2 inputs (A and A_m) and 2 outputs (O and O_m).
-// Here A input is same as A input of Relu; O output is same
-// as O output of Relu. O_m is the additional output tensor
-// that will be set by MklRelu, and it represents Mkl tensor
-// corresponding to O -- in other words, O_m is some kind of
-// metadata for O. A_m is additional input of Relu, and it
-// represents metadata for A - as O_m is metadata for O, A_m
-// is metadata for A. MklRelu receives this metadata from
-// previous layer (in the graph).
+// MklRelu has 2 inputs (A and A_m) and 2 outputs (O and O_m). Here A input is
+// same as A input of Relu; O output is same as O output of Relu. O_m is the
+// additional output tensor that will be set by MklRelu, and it represents
+// Mkl tensor corresponding to O -- in other words, O_m is some kind of
+// metadata for O. A_m is additional input of Relu, and it represents metadata
+// for A - as O_m is metadata for O, A_m is metadata for A. MklRelu receives
+// this metadata from previous layer (in the graph).
 //
-// When previous layer in the graph is Mkl layer, A_m will
-// represent a valid Mkl tensor. But when previous Mkl layer
-// is not an Mkl layer, then A_m represents a dummy Mkl tensor.
+// When previous layer in the graph is Mkl layer, A_m will represent a valid
+// Mkl tensor. But when previous Mkl layer is not an Mkl layer, then A_m
+// represents a dummy Mkl tensor.
 //
 // Rewriting rules:
-//   - Selection of an op for rewriting happens by registering
-//     an op with this pass. If an op is not registered, then
-//     it is not rewritten.
+//  - Selection of an op for rewriting happens by registering an op with this
+//     pass. If an op is not registered, then it is not rewritten.
 //  - Number of inputs after rewriting:
-//      Since for every input Tensorflow tensor, the rewritten
-//      layer gets Mkl tensor, rewritten op gets 2*N inputs,
-//      where N is the number of inputs for original op.
+//      Since for every input Tensorflow tensor, the rewritten layer gets Mkl
+//      tensor, rewritten op gets 2*N inputs, where N is the number of inputs
+//      for original op.
 //  - Number of outputs after rewriting:
-//      Since for every output Tensorflow tensor, the rewritten
-//      layer generates Mkl tensor, rewritten op generates 2*N
-//      outputs, where N is the number of outputs of original op.
+//      Since for every output Tensorflow tensor, the rewritten layer generates
+//      Mkl tensor, rewritten op generates 2*N outputs, where N is the number
+//      of outputs of original op.
 //  - Ordering of Tensorflow tensors and Mkl tensors:
-//      Since every op generates twice the number of inputs and
-//      outputs, one could imagine different ordering among
-//      Tensorflow tensors and Mkl tensors. E.g., let's assume
-//      an op 'Conv2D' takes (A, B) as input, then new op
-//      'MklConv2D' can take (A, A_m, B, B_m) as input or it
-//      can also take (A, B, A_m, B_m) as input. Among N inputs
-//      one can get N! permutations.
-//
-//      So the question is: which one do we follow? Currently,
-//      we follow an intuitive order where Mkl tensor follows a
-//      corresponding Tensorflow tensor immediately. In the
-//      context of above example, it will be: (A, A_m, B, B_m).
-//      We follow same ordering rule for output tensors.
-//
-// NOTE: Current rewriting approach rewrites an op to Mkl op without
-//      any conditions. But in the future, it may be possible to
-//      consider conditions such as input shapes and sizes to rewrite
-//      an op.
+//      Since every op generates twice the number of inputs and outputs, one
+//      could imagine different ordering among Tensorflow tensors and Mkl
+//      tensors. E.g., let's assume an op 'Conv2D' takes (A, B) as input, then
+//      new op 'MklConv2D' can take (A, A_m, B, B_m) as input or it can also
+//      take (A, B, A_m, B_m) as input. Among N inputs one can get N!
+//      permutations.
+//
+//      So the question is: which one do we follow? Currently, we follow an
+//      intuitive order where Mkl tensor follows a corresponding Tensorflow
+//      tensor immediately. In the context of above example, it will be: (A,
+//      A_m, B, B_m). We follow same ordering rule for output tensors.
+//
+// NOTE: Current rewriting approach rewrites an op to Mkl op without any
+//      conditions. But in the future, it may be possible to consider
+//      conditions such as input shapes and sizes to rewrite an op.
 //
 // Graph rewrite algorithm:
 //      Algorithm: Graph Rewrite
@@ -147,13 +172,137 @@ namespace tensorflow {
 //        it is, then we rewrite that node after constructing new inputs to
 //        the node. If it is not Mkl layer, then we do not rewrite the node.
 //
+// Handling workspace propagation for certain ops:
+//
+//        Certain backward ops in MKL (MaxPool, LRN and BatchNorm) require
+//        passing of workspace from their corresponding forward ops. But
+//        TensorFlow does not have a notion of workspace and as a result
+//        does not allow producing additional outputs from these forward ops.
+//        For these ops, we need to add an additional edge between forward
+//        ops and their corresponding backward ops, and this edge carries
+//        workspace tensor value and another edge carries Mkl tensor for
+//        workspace tensor.
+//
+//        Example:
+//
+//        Typical graph for MaxPool and its gradient looks like:
+//
+//        A = MaxPool(T)
+//        B = MaxPoolGrad(X, A, Y)
+//
+//        We will transform this graph to propagate workspace as:
+//
+//        A, A_m, W, W_m = MklMaxPool(T, T_m)
+//        B, B_m = MklMaxPoolGrad(X, X_m, A, A_m, Y, Y_m, W, W_m)
+//
+//        Here W is the workspace tensor. Transformed tensors with name
+//        suffix _m are Mkl tensors and this transformation has been done
+//        using the algorithm discussed earlier. The transformation for
+//        workspace only adds extra outputs (W, W_m) for forward op and
+//        connects them to corresponding backward ops.
+//
+//        Terms:
+//
+//        Forward op name = name of the op in the forward pass
+//          where workspace originates (MaxPool in this example)
+//        Backward op name = name of the op in the backward pass that receives
+//          workspace from forward op (MaxPoolGrad in the example)
+//        Slot = Number of the output or input slot that will be
+//               used by the workspace (2 for MklMaxPool as W is 3rd
+//               output of MaxPool (0 is 1st); 6 for MklMaxPoolGrad)
+//
+//        Question:
+//
+//        How do we associate backward op to forward op? There can be more
+//        than one op with exact same name.
+//
+//        In this example we associate MaxPoolGrad with MaxPool. But there
+//        could be more than one MaxPool ops. To solve this problem, we look
+//        for _direct_ edge between forward op and backward op (tensor A is
+//        flowing along this edge in the example.)
+//
+//        How do we transform forward and backward op when there is no direct
+//        edge between them? In such case, we generate dummy tensors as
+//        workspace tensors. For the example, transformation of MaxPool will
+//        be exactly same --- it is just that MaxPool won't generate any
+//        workspace tensor. For MaxPoolGrad, transformation will also be same,
+//        but instead of connecting W and W_m with outputs of MaxPool, we will
+//        produce dummy tensors for them, and we will set workspace_enabled
+//        attribute to false.
+//
+// Example of B.2 : Context-based node rewrite
+// -------------------------------------------
+// Consider BiasAddGrad op as:
+//
+//           O = MklConv2D(A, A_m, B, B_m, C, C_m)
+//           P = BiasAddGrad(O)
+//
+// Then we rewrite is as:
+//
+//           P = Conv2DWithBiasBackpropBias(O, O_m)
+//
+// 'Distance' between input of BiasAddGrad and MklConv2D in terms of hops is
+// the context matching depth. If MklConv2DWithBias is not within the context
+// matching depth, then we do not rewrite BiasAddGrad.
+
+// How many hops do we search for matching node in the backward dataflow graph?
+// We use maxhop of 10 based on empirical observations. Also, these are
+// maxhops in backward data-flow graph. Since input of forward nodes (Conv2D)
+// directly goes to backward nodes, we do not expect the hop-distance
+// would be more than few nodes.
+static size_t kNodeMergeContextMaxDepth = 10;
+
 class MklLayoutRewritePass : public GraphOptimizationPass {
  public:
   MklLayoutRewritePass() {
     csinfo_.conv2d = "Conv2D";
-
-    ninfo_.push_back(
-        {csinfo_.conv2d, GetMklOpName(csinfo_.conv2d), 2, CopyAttrsConv2D});
+    csinfo_.mklconv2d = "MklConv2D";
+    csinfo_.mklconv2dwithbias = "MklConv2DWithBias";
+    csinfo_.mklconv2dwithbiasbackpropbias = "MklConv2DWithBiasBackpropBias";
+    csinfo_.biasadd = "BiasAdd";
+    csinfo_.matmul = "MatMul";
+    csinfo_.biasaddgrad = "BiasAddGrad";
+    csinfo_.relu = "Relu";
+    csinfo_.relugrad = "ReluGrad";
+    csinfo_.maxpool = "MaxPool";
+    csinfo_.maxpoolgrad = "MaxPoolGrad";
+    csinfo_.avgpool = "AvgPool";
+    csinfo_.avgpoolgrad = "AvgPoolGrad";
+    csinfo_.conv2dgradinput = "Conv2DBackpropInput";
+    csinfo_.conv2dgradfilter = "Conv2DBackpropFilter";
+
+    rinfo_.push_back(
+        {csinfo_.conv2d, csinfo_.mklconv2d, 2, CopyAttrsConv2D, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.conv2dgradfilter,
+                      GetMklOpName(csinfo_.conv2dgradfilter), 3,
+                      CopyAttrsConv2D, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.conv2dgradinput,
+                      GetMklOpName(csinfo_.conv2dgradinput), 3, CopyAttrsConv2D,
+                      AlwaysRewrite});
+    rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu), 1,
+                      CopyAttrsRelu, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.maxpool, GetMklOpName(csinfo_.maxpool), 1,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.maxpoolgrad, GetMklOpName(csinfo_.maxpoolgrad), 3,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avgpool, GetMklOpName(csinfo_.avgpool), 1,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avgpoolgrad, GetMklOpName(csinfo_.avgpoolgrad), 2,
+                      CopyAttrsPooling, AlwaysRewrite});
+
+    // Add info about which ops to add workspace edge to and the slots.
+    wsinfo_.push_back({csinfo_.maxpool, csinfo_.maxpoolgrad, 0, 1, 2, 6});
+
+    // Add a rule for merging nodes
+    minfo_.push_back(
+        {csinfo_.mklconv2d, csinfo_.biasadd, 0, csinfo_.mklconv2dwithbias});
+
+    // We use maxhop of 10 based on empirical observations. Also, these are
+    // maxhops in backward data-flow graph. Since input of forward nodes
+    // (Conv2D) directly goes to backward nodes, we do not expect the
+    // hop-distance would be more than few nodes.
+    cinfo_.push_back({csinfo_.biasaddgrad, csinfo_.mklconv2dwithbias,
+                      kNodeMergeContextMaxDepth});
   }
 
   // Standard interface to run pass
@@ -176,20 +325,79 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string name;     // Original name of the op in the graph
     string newname;  // New name of op in the graph
     int numins;      // Number of inputs to the original op
-    std::function<void(Node*, NodeBuilder*)>
-        copyattrs;  // Function handler
-                    // to copy attributes from old node to new node.
-  } NodesInfo;
+    // Function handler to copy attributes from old node to new node.
+    std::function<void(const Node*, NodeBuilder*)> copyattrs;
+    std::function<bool(const Node*)> rewriterule;  // Rule under which to
+                                                   // rewrite this node.
+  } RewriteInfo;
+
+  /// Structure to specify forward op, backward op, and the slot numbers
+  /// in forward and backward op where we will add workspace edge.
+  typedef struct {
+    string fwdop;   // Name of the forward op in the graph
+    string bwdop;   // Name of the backward op in the graph
+    int fwdslot;    // Output slot in the forward op node where actual
+                    // output tensor resides
+    int bwdslot;    // Input slot in the backward op node where actual
+                    // input tensor resides
+    int wsfwdslot;  // Output slot in the forward op node where workspace
+                    // edge is added
+    int wsbwdslot;  // Input slot in the backward op node where workspace
+                    // edge is added
+  } WorkSpaceInfo;
+
+  /// Structure to specify information used in node merge
+  typedef struct {
+    string pred;     // Predecessor node string
+    string succ;     // Successor node string
+    int op;          // What operand no the predecessor node corresponds
+                     // to successor node?
+    string newnode;  // Name of the node after merge
+  } MergeInfo;
+
+  /// Structure to specify the context information used in node rewrite rule
+  typedef struct {
+    string node;    // Name of the node to be rewritten
+    string fwd;     // Node name in forward pass that this node
+                    // corresponds to
+    size_t maxhop;  // Maximum number of hops the fwd is located
+                    // from this node. If fwd is farther than maxhop
+                    // then we do not rewrite the node.
+  } ContextInfo;
 
   /// Structure to store all constant strings
   struct {
     string relu;
     string relugrad;
+    // Conv ops
     string conv2d;
+    string mklconv2d;
+    string conv2dgradinput;
+    string conv2dgradfilter;
+    string mklconv2dwithbias;
+    string mklconv2dwithbiasbackpropbias;
+    // Pooling ops
+    string maxpool;
+    string maxpoolgrad;
+    string avgpool;
+    string avgpoolgrad;
+    // Others
+    string biasadd;
+    string matmul;
+    string biasaddgrad;
   } csinfo_;
 
   /// Maintain info about nodes to rewrite
-  std::vector<NodesInfo> ninfo_;
+  std::vector<RewriteInfo> rinfo_;
+
+  /// Maintain info about nodes to add workspace edge
+  std::vector<WorkSpaceInfo> wsinfo_;
+
+  /// Maintain info  to be merged
+  std::vector<MergeInfo> minfo_;
+
+  /// Maintain info about nodes to rewrite
+  static std::vector<ContextInfo> cinfo_;
 
   /// Hash table to maintain nodes visited in the graph.
   std::unordered_set<const Node*> visited_nodes_;
@@ -209,6 +417,9 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // Mark the node as rewritten
   inline void MarkRewrittenNode(Node* n) { visited_nodes_.insert(n); }
 
+  // Clear all visited nodes
+  inline void UnMarkRewrittenNodes() { visited_nodes_.clear(); }
+
   // Get the name of Mkl op from original TensorFlow op
   // We prefix 'Mkl' to the original op to get Mkl op.
   // TODO(nhasabni) We should move this to mkl_util.h.
@@ -218,6 +429,71 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     return string(kMklOpPrefix) + name;
   }
 
+  // Return a node that can be merged with input node 'n'
+  //
+  // @return pointer to the node if we can find such a
+  // node. Otherwise, it returns nullptr.
+  Node* CheckForNodeMerge(const Node* n) const;
+
+  // Merge predecessor node with its successor.
+  // Currently, we merge Conv2D with BiasAdd only.
+  //
+  // Input nodes succ and pred may be deleted if the call to
+  // this function is successful. Attempt to use the pointers
+  // after the call to function may result is undefined behaviors.
+  //
+  // @input g - input graph, succ - successor node, pred - predecessor node
+  // @return Status::OK(), if merging is successful and supported.
+  //         Returns appropriate Status error code otherwise.
+  //         Graph is updated in case nodes are merged. Otherwise, it is
+  //         not updated.
+  Status MergeNode(std::unique_ptr<Graph>* g, Node* succ, Node* pred);
+
+  // Check if the node 'n' has any applicable rewrite rule
+  // We check for 2 scenarios for rewrite.
+  //
+  // @return RewriteInfo* for the applicable rewrite rule
+  const RewriteInfo* CheckForNodeRewrite(const Node* n) const;
+
+  // Default rewrite rule to be used in scenario 1 for rewrite.
+  // @return - true (since we want to always rewrite)
+  static bool AlwaysRewrite(const Node* n) { return true; }
+  // Rewrite rule that uses context-information for matching
+  // used in scenario 2.
+  //
+  // @input - Node 'n' for which to search for matching context
+  // @return - true if matching context is found; false otherwise.
+  static bool ContextMatchRewrite(const Node* n);
+
+  // Helper function that searches the matching contextinfo for the node.
+  // Implements depth-first search in the data dependence graph for the
+  // gradient op in the backward direction.
+  //
+  // @input n - Node (gradient op) whose contextinfo is to be searched,
+  //        fwdn - pointer to node from the forward pass that this node
+  //        belongs to. fwdn cannot be NULL.
+  // @return Matching contextinfo in case a match is found; null otherwise.
+  //         Also updates *fwdn with pointer to forward node that this context
+  //         matches.
+  static const ContextInfo* SearchMatchingContext(const Node* n,
+                                                  const Node** fwdn);
+
+  // Rewrites input node to a new node specified by its matching rewrite info.
+  //
+  // Method first searches matching rewrite info for input node and then
+  // uses that info to rewrite.
+  //
+  // Input node may be deleted in case of rewrite. Attempt to use the node
+  // after the call can result in undefined behaviors.
+  //
+  // @input  g - input graph, n - Node to be rewritten,
+  //         ri - matching rewriteinfo
+  // @return Status::OK(), if the input node is rewritten;
+  //         Returns appropriate Status error code otherwise.
+  //         Graph is updated in case the input node is rewritten.
+  //         Otherwise, it is not updated.
+  Status RewriteNode(std::unique_ptr<Graph>* g, Node* n, const RewriteInfo* ri);
+
   // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
   // in graph 'g'. Original node is input in 'orign'.
   //
@@ -230,28 +506,40 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
                      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
                      NodeBuilder* nb, Node* orign);
 
-  // Rewrite Node 'n' in graph 'g' with rewrite information specified in 'ni'
-  // Returns Status::OK() if node rewrite is successful, otherwise returns
-  // appropriate error status
-  Status RewriteNode(std::unique_ptr<Graph>* g, Node* n, const NodesInfo& ni);
+  // Add workspace edge on the input or output side of Node 'orign' by using
+  // NodeBuilder 'nb' for the new node provided. If 'orign' does not dictate
+  // adding workspace edge then do not add it.
+  void AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g, Node* orign,
+                                NodeBuilder* nb);
 
   // Functions specific to operators to copy attributes
   // We need operator-specific function to copy attributes because the framework
   // does not provide any generic function for it.
-  static void CopyAttrsConv2D(Node* orign, NodeBuilder* nb);
+  static void CopyAttrsConv2D(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsBiasAddGrad(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsPooling(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsRelu(const Node* orign, NodeBuilder* nb);
 
   // Generate a graph node in graph 'g' representing a dummy Mkl tensor node,
   // using node for original node 'orign' and return it in '*out'.
   // TODO(nhasabni) We should move this to mkl_util.h
   void GetDummyMklTensorNode(std::unique_ptr<Graph>* g, Node** out,
                              Node* orign);
+  void GetDummyWorkspaceTensorNode(std::unique_ptr<Graph>* g, Node** out,
+                                   Node* orign);
 };
 
+std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
+
 // We register Mkl rewrite pass for phase 1 in pre-placement group.
 // Do not change the ordering of the Mkl passes.
 REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 1,
                       MklLayoutRewritePass);
 
+//////////////////////////////////////////////////////////////////////////
+//           Helper functions for creating new node
+//////////////////////////////////////////////////////////////////////////
+
 static void FillInputs(const Node* n,
                        gtl::InlinedVector<Node*, 4>* control_edges,
                        gtl::InlinedVector<std::pair<Node*, int>, 4>* in) {
@@ -273,47 +561,6 @@ static void FillInputs(const Node* n,
   }
 }
 
-//////////////////////////////////////////////////////////////////////////
-
-// Macros to build new node with different number of inputs.
-// We need this way because we need to specify all the inputs when
-// building a node. Comment at core/graph/node_builder.h, line 85-86.
-
-#define SETUP_INPUTS1(nb, op1)      \
-  do {                              \
-    nb->Input(op1.node, op1.index); \
-  } while (0)
-
-#define SETUP_INPUTS2(nb, op1, op2) \
-  do {                              \
-    nb->Input(op1.node, op1.index); \
-    nb->Input(op2.node, op2.index); \
-  } while (0)
-
-#define SETUP_INPUTS3(nb, op1, op2, op3) \
-  do {                                   \
-    nb->Input(op1.node, op1.index);      \
-    nb->Input(op2.node, op2.index);      \
-    nb->Input(op3.node, op3.index);      \
-  } while (0)
-
-#define SETUP_INPUTS4(nb, op1, op2, op3, op4) \
-  do {                                        \
-    nb->Input(op1.node, op1.index);           \
-    nb->Input(op2.node, op2.index);           \
-    nb->Input(op3.node, op3.index);           \
-    nb->Input(op4.node, op4.index);           \
-  } while (0)
-
-#define SETUP_INPUTS5(nb, op1, op2, op3, op4, op5) \
-  do {                                             \
-    nb->Input(op1.node, op1.index);                \
-    nb->Input(op2.node, op2.index);                \
-    nb->Input(op3.node, op3.index);                \
-    nb->Input(op4.node, op4.index);                \
-    nb->Input(op5.node, op5.index);                \
-  } while (0)
-
 // TODO(nhasabni) We should move this to mkl_util.h.
 void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
                                                  Node** out, Node* orign) {
@@ -335,6 +582,7 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
                                           // device as device of original
                                           // node.
           .Finalize(&**g, out));
+  (*out)->set_assigned_device_name(orign->assigned_device_name());
 }
 
 Status MklLayoutRewritePass::SetUpInputs(
@@ -359,7 +607,7 @@ Status MklLayoutRewritePass::SetUpInputs(
       TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
       // If this op has been rewritten, then its name must have been same as
       // Mkl op.
-      CHECK_EQ(mkl_layer_registry::IsMklLayer(n->type_string()), true);
+      CHECK_EQ(mkl_layer_registry::IsMklLayer(n->type_string(), T), true);
       // src slot number for Mkl tensor would be the one next to TF tensor
       // slot number.
       new_inputs.push_back(NodeBuilder::NodeOut(n, inputs[i].second + 1));
@@ -380,38 +628,140 @@ Status MklLayoutRewritePass::SetUpInputs(
   // N for Mkl tensors corresponding to each Tensorflow tensors.
   CHECK_EQ(new_inputs.size(), inputs.size() * 2);
 
-  // 2. Let's build the node with new inputs.
-  switch (new_inputs.size()) {
-    case 0:  // We don't need to do anything for no input as we have
-             // already built node.
-      break;
-    case 1:
-      SETUP_INPUTS1(nb, new_inputs[0]);
-      break;
-    case 2:
-      SETUP_INPUTS2(nb, new_inputs[0], new_inputs[1]);
-      break;
-    case 3:
-      SETUP_INPUTS3(nb, new_inputs[0], new_inputs[1], new_inputs[2]);
-      break;
-    case 4:
-      SETUP_INPUTS4(nb, new_inputs[0], new_inputs[1], new_inputs[2],
-                    new_inputs[3]);
-      break;
-    case 5:
-      SETUP_INPUTS5(nb, new_inputs[0], new_inputs[1], new_inputs[2],
-                    new_inputs[3], new_inputs[4]);
-      break;
-    default: {
-      return Status(error::Code::UNIMPLEMENTED,
-                    "Could not create node with given number of inputs");
-    }
+  // 2. Let's add the new inputs.
+  for (auto ni : new_inputs) {
+    nb->Input(ni.node, ni.index);
   }
 
   return Status::OK();
 }
 
-void MklLayoutRewritePass::CopyAttrsConv2D(Node* orign, NodeBuilder* nb) {
+//////////////////////////////////////////////////////////////////////////
+//           Helper functions related to workspace pass
+//////////////////////////////////////////////////////////////////////////
+
+// TODO(nhasabni) We should move this to mkl_util.h.
+void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
+    std::unique_ptr<Graph>* g, Node** out, Node* orign) {
+  // We use a tensor of shape {1} and value 0 to represent
+  // dummy float tensor. We need this as a dummy workspace tensor.
+  // Workspace tensor has type float.
+  const DataType dt = DataTypeToEnum<float>::v();
+  TensorProto proto;
+  proto.set_dtype(dt);
+  float zero[1] = {0};
+  proto.set_tensor_content(const_cast<const void*>(static_cast<void*>(&zero)),
+                           4);
+  TensorShape dummy_shape({1});
+  dummy_shape.AsProto(proto.mutable_tensor_shape());
+  TF_CHECK_OK(
+      NodeBuilder((*g)->NewName("DMT"), "Const")
+          .Attr("value", proto)
+          .Attr("dtype", dt)
+          .Device(orign->def().device())  // We place this node on same
+                                          // device as device of original
+                                          // node.
+          .Finalize(&**g, out));
+  (*out)->set_assigned_device_name(orign->assigned_device_name());
+}
+
+void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
+                                                    Node* orign,
+                                                    NodeBuilder* nb) {
+  bool workspace_edge_added = false;
+  DataType T;
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  for (auto ws : wsinfo_) {
+    if (orign->type_string() == ws.fwdop &&
+        mkl_layer_registry::IsMklLayer(GetMklOpName(orign->type_string()), T)) {
+      // If this op is a fwd op, then we need to check if there is an
+      // edge from this node's fwdslot to bwdop's bwdslot. If there is
+      // an edge, then we just add an attribute on this node for setting
+      // workspace_passed to true. We don't add actual workspace edge
+      // in this node. Actual workspace edge gets added in the backward
+      // op for this node.
+      for (const Edge* e : orign->out_edges()) {
+        if (e->src_output() == ws.fwdslot &&
+            e->dst()->type_string() == ws.bwdop &&
+            e->dst_input() == ws.bwdslot) {
+          nb->Attr("workspace_enabled", true);
+          VLOG(1) << "MklLayoutRewritePass: workspace_enabled for "
+                  << orign->type_string();
+          workspace_edge_added = true;
+          // We found the edge that we were looking for, so break.
+          break;
+        }
+      }
+
+      if (!workspace_edge_added) {
+        // If we are here, then we did not find backward operator for this
+        // node.
+        nb->Attr("workspace_enabled", false);
+      }
+    } else if (orign->type_string() == ws.bwdop &&
+               mkl_layer_registry::IsMklLayer(
+                   GetMklOpName(orign->type_string()), T)) {
+      // If this op is a bwd op, then we need to add workspace edge and
+      // it's Mkl tensor edge between its corresponding fwd op and this
+      // op. Corresponding fwd op is specified in 'fwdop' field of
+      // workspace info. fwdslot and bwdslot in workspace info specify
+      // an edge between which slots connect forward and backward op.
+      // Once all these criteria match, we add a workspace edge between
+      // wsfwdslot and wsbwdslot. It's corresponding Mkl tensor is added
+      // in wsfwdslot+1 and wsbwdslot+1.
+      for (const Edge* e : orign->in_edges()) {
+        if (e->src_output() == ws.fwdslot &&
+            // We would have rewritten the forward op, so we need to use
+            // GetMklOpName call to get its Mkl name.
+            e->src()->type_string() == GetMklOpName(ws.fwdop) &&
+            e->dst_input() == ws.bwdslot) {
+          nb->Attr("workspace_enabled", true);
+          // Add workspace edge between fwd op and bwd op.
+          nb->Input(e->src(), ws.wsfwdslot);
+          // Add Mkl tensor edge for workspace edge between fwd op and bwd op.
+          nb->Input(e->src(), ws.wsfwdslot + 1);
+          // In terms of input ordering, we add these calls to add Input
+          // here because workspace edge (and its Mkl tensor) is the last
+          // edge in the fwdop and bwdop. So all inputs before workspace
+          // tensor have been added by SetUpInputs function.
+          VLOG(1) << "MklLayoutRewritePass: workspace_enabled for "
+                  << orign->type_string();
+          workspace_edge_added = true;
+          // We found the edge that we were looking for, so break.
+          break;
+        }
+      }
+
+      // If we are here means we did not find fwd op that feeds to this
+      // bwd op. So in this case, we need to generate dummy tensors for
+      // workspace input and Mkl tensor for workspace, and set
+      // workspace_enabled to false.
+      if (!workspace_edge_added) {
+        nb->Attr("workspace_enabled", false);
+        Node* dmt_ws = nullptr;      // Dummy tensor for workspace
+        Node* dmt_mkl_ws = nullptr;  // Dummy Mkl tensor for workspace
+        GetDummyWorkspaceTensorNode(g, &dmt_ws, orign);
+        GetDummyMklTensorNode(g, &dmt_mkl_ws, orign);
+        CHECK_NOTNULL(dmt_ws);
+        CHECK_NOTNULL(dmt_mkl_ws);
+        nb->Input(dmt_ws, 0);      // We add dummy tensor as workspace tensor.
+        nb->Input(dmt_mkl_ws, 0);  // We add dummy tensor as Mkl
+                                   // tensor for workspace tensor.
+        VLOG(1) << "MklLayoutRewritePass: dummy workspace_enabled for "
+                << orign->type_string();
+      }
+    } else {
+      // If this node does not match any workspace info, then we do not
+      // do anything special for workspace propagation for it.
+    }
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Op-specific functions to copy attributes from old node to new node
+//////////////////////////////////////////////////////////////////////////
+
+void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
   DataType T;
   string data_format;
   string padding;
@@ -433,19 +783,280 @@ void MklLayoutRewritePass::CopyAttrsConv2D(Node* orign, NodeBuilder* nb) {
   nb->Attr("use_cudnn_on_gpu", use_cudnn_on_gpu);
 }
 
+void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
+                                                NodeBuilder* nb) {
+  DataType T;
+  string data_format;
+  std::vector<int32> strides;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("strides", strides);
+  nb->Attr("data_format", data_format);
+}
+
+void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
+                                            NodeBuilder* nb) {
+  DataType T;
+  string data_format;
+  string padding;
+  std::vector<int32> ksize, strides;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "ksize", &ksize));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "padding", &padding));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("ksize", ksize);
+  nb->Attr("strides", strides);
+  nb->Attr("padding", padding);
+  nb->Attr("data_format", data_format);
+}
+
+void MklLayoutRewritePass::CopyAttrsRelu(const Node* orign, NodeBuilder* nb) {
+  DataType T;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+}
+
+//////////////////////////////////////////////////////////////////////////
+//           Helper functions related to node merge pass
+//////////////////////////////////////////////////////////////////////////
+
+Node* MklLayoutRewritePass::CheckForNodeMerge(const Node* a) const {
+  // TODO(nhasabni) Add check for type of node similar to CheckForNodeRewrite
+  // once we support BiasAddGrad as Mkl layer.
+
+  // Search for all matching mergeinfo.
+  // We allow more than one match for extensibility.
+  std::vector<const MergeInfo*> matching_mi;
+  for (auto mi = minfo_.cbegin(); mi != minfo_.cend(); ++mi) {
+    if (a->type_string() == mi->succ) {
+      matching_mi.push_back(&*mi);
+    }
+  }
+
+  for (const MergeInfo* mi : matching_mi) {
+    const int N_in = a->num_inputs();
+    if (mi->op >= N_in) {
+      continue;
+    }
+
+    // Get the control edges and input of node
+    gtl::InlinedVector<Node*, 4> a_control_edges;
+    gtl::InlinedVector<std::pair<Node*, int>, 4> a_in(N_in);
+    FillInputs(a, &a_control_edges, &a_in);
+
+    // Get operand op of the operator
+    Node* b = nullptr;
+    b = a_in[mi->op].first;
+    if (b == nullptr || (b->type_string() != mi->pred)) {
+      // NOTE: Should the first check be assert?
+      continue;
+    }
+
+    gtl::InlinedVector<Node*, 4> b_control_edges;
+    gtl::InlinedVector<std::pair<Node*, int>, 4> b_in(N_in);
+    FillInputs(b, &b_control_edges, &b_in);
+
+    // Shouldn't merge if a and b have different control edges.
+    if (a_control_edges != b_control_edges) {
+      continue;
+    } else {
+      // We found a match.
+      return b;
+    }
+  }
+
+  return nullptr;
+}
+
+Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
+                                       Node* pred) {
+  CHECK_NOTNULL(succ);
+  CHECK_NOTNULL(pred);
+
+  if (succ->type_string() == csinfo_.biasadd &&
+      pred->type_string() == csinfo_.mklconv2d) {
+    // 1. Get all attributes from input nodes.
+    DataType T_pred, T_succ;
+    string padding;
+    std::vector<int32> strides;
+    string data_format_pred, data_format_succ;
+    bool use_cudnn_on_gnu;
+    TF_CHECK_OK(GetNodeAttr(pred->def(), "T", &T_pred));
+    TF_CHECK_OK(GetNodeAttr(succ->def(), "T", &T_succ));
+    TF_CHECK_OK(GetNodeAttr(pred->def(), "padding", &padding));
+    TF_CHECK_OK(GetNodeAttr(pred->def(), "strides", &strides));
+    TF_CHECK_OK(GetNodeAttr(pred->def(), "data_format", &data_format_pred));
+    TF_CHECK_OK(GetNodeAttr(succ->def(), "data_format", &data_format_succ));
+    TF_CHECK_OK(
+        GetNodeAttr(pred->def(), "use_cudnn_on_gpu", &use_cudnn_on_gnu));
+    // We check to ensure that data formats of both succ and pred are same.
+    // We expect them to be same, so we can enforce this as assert.
+    // But assert can be too strict, so we enforce this as a check.
+    // If the check fails, then we do not merge two nodes.
+    // We also do same check for devices.
+    if (data_format_pred != data_format_succ || T_pred != T_succ ||
+        pred->assigned_device_name() != succ->assigned_device_name() ||
+        pred->def().device() != succ->def().device()) {
+      return Status(error::Code::INVALID_ARGUMENT,
+                    "data_format or T attribute or devices of Conv2D and "
+                    "BiasAdd do not match. Will skip node merge optimization");
+    }
+
+    const int succ_num = succ->num_inputs();
+    gtl::InlinedVector<Node*, 4> succ_control_edges;
+    gtl::InlinedVector<std::pair<Node*, int>, 4> succ_in(succ_num);
+    FillInputs(succ, &succ_control_edges, &succ_in);
+
+    const int pred_num = pred->num_inputs();
+    gtl::InlinedVector<Node*, 4> pred_control_edges;
+    gtl::InlinedVector<std::pair<Node*, int>, 4> pred_in(pred_num);
+    FillInputs(pred, &pred_control_edges, &pred_in);
+
+    // We need to ensure that there is only 1 edge between Conv2D and AddBias.
+    // Otherwise, merging is semantically incorrect.
+    if (pred->out_edges().size() != 1) {
+      return Status(error::Code::INVALID_ARGUMENT,
+                    "Conv2D has multiple outputs."
+                    "Will skip node merge optimization");
+    }
+
+    for (const Edge* e : pred->out_edges()) {
+      if (e->dst() != succ) {
+        return Status(error::Code::INVALID_ARGUMENT,
+                      "Conv2D does not feed to BiasAdd."
+                      "Will skip node merge optimization");
+      }
+    }
+
+    // 2. Get inputs from both the nodes.
+    // Find the 2 inputs from the conv and the bias from the add Bias.
+    // Get operand 0, 1 of conv2D and their Mkl tensors.
+    CHECK_EQ(pred->in_edges().size(), 4);  // MklConv2D must have 4 inputs.
+    // Get operand 1 of add_bias
+    // BiasAdd must have 2 inputs: Conv, bias
+    CHECK_EQ(succ->in_edges().size(), 2);
+    Node* oper3_mkl = nullptr;  // Mkl tensor corresponding to oper3
+    int oper3_mkl_slot = 0;     // For dummy MKL tensor node, output slot is 0.
+    GetDummyMklTensorNode(g, &oper3_mkl, succ);  // Get dummy Mkl tensor node
+    // as BiasAdd does not have Mkl tensor as input.
+    CHECK_NOTNULL(oper3_mkl);
+
+    // We will use the node name of BiasAdd as the name of new node
+    // Build new node. We use same name as original node, but change the op
+    // name.
+    NodeBuilder nb(succ->name(), csinfo_.mklconv2dwithbias);
+    nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
+    nb.Input(pred_in[1].first, pred_in[1].second);  // Mkl for In1
+    nb.Input(pred_in[2].first, pred_in[2].second);  // In2 of Conv2D
+    nb.Input(pred_in[3].first, pred_in[3].second);  // Mkl for In2
+    nb.Input(succ_in[1].first, succ_in[1].second);  // In2 of BiasAdd
+    nb.Input(oper3_mkl, oper3_mkl_slot);            // Mkl for In2 of BiasAdd
+
+    // Copy attributes from Conv2D to Conv2DWithBias.
+    CopyAttrsConv2D(const_cast<const Node*>(pred), &nb);
+
+    // Copy the device assigned to old node to new node.
+    nb.Device(succ->def().device());
+
+    // Create node.
+    Node* newn;
+    nb.Finalize(&**g, &newn);
+    CHECK_NOTNULL(newn);
+
+    // Set the Mkl layer label for this op.
+    newn->AddAttr("_kernel", mkl_layer_registry::kMklLayerLabel);
+
+    // Incoming edges are fixed, we will fix the outgoing edges now.
+    for (const Edge* e : succ->out_edges()) {
+      (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
+    }
+
+    // Copy device assigned to old node to new node.
+    // It's ok to use pred or succ as we have enforced a check that
+    // both have same device assigned.
+    newn->set_assigned_device_name(pred->assigned_device_name());
+
+    VLOG(1) << "MklLayoutRewritePass: Merged old node:" << pred->DebugString()
+            << ", and node: " << succ->DebugString()
+            << ", into node:" << newn->DebugString();
+
+    (*g)->RemoveNode(succ);
+    (*g)->RemoveNode(pred);
+    MarkRewrittenNode(newn);
+
+    return Status::OK();
+  }
+
+  return Status(error::Code::UNIMPLEMENTED,
+                "Unimplemented case for node merge optimization.");
+}
+
+//////////////////////////////////////////////////////////////////////////
+//           Helper functions for node rewrite
+//////////////////////////////////////////////////////////////////////////
+
 Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
-                                         const NodesInfo& ni) {
-  VLOG(1) << "MKLLayoutRewritePass: Original node:" << orign->DebugString();
+                                         const RewriteInfo* ri) {
+  CHECK_NOTNULL(ri);
+  CHECK_NOTNULL(orign);
+
+  VLOG(1) << "MklLayoutRewritePass: Original node:" << orign->DebugString();
+
+  // Check if this is scenario 2 (context-based rewrite).
+  // Get the matching ContextInfo if it is.
+  const Node* fwdn = nullptr;
+  const ContextInfo* ci = nullptr;
+  bool is_context_based_rewrite = false;
+  if ((ci = SearchMatchingContext(orign, &fwdn)) != nullptr) {
+    CHECK_NOTNULL(fwdn);
+    is_context_based_rewrite = true;
+
+    // Sanity checks for context-based rewrite (if any)
+    if (orign->type_string() == csinfo_.biasaddgrad &&
+        ri->newname == csinfo_.mklconv2dwithbiasbackpropbias) {
+      DataType orig_T, ctx_T;
+      string orig_data_format, ctx_data_format;
+      TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &orig_T));
+      TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &orig_data_format));
+      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "T", &ctx_T));
+      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "data_format", &ctx_data_format));
+
+      if (orig_data_format != ctx_data_format || orig_T != ctx_T ||
+          orign->assigned_device_name() != fwdn->assigned_device_name() ||
+          orign->def().device() != fwdn->def().device()) {
+        return Status(
+            error::Code::INVALID_ARGUMENT,
+            "data_format or T attribute or devices of BiasAddGrad and "
+            "Conv2D do not match. Will skip node rewrite optimization");
+      }
+    }
+  }
 
   // Get all inputs.
   const int num = orign->num_inputs();
-  CHECK_EQ(num, ni.numins);
+  CHECK_EQ(num, ri->numins);
   gtl::InlinedVector<Node*, 4> control_edges;
   gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num);
   FillInputs(orign, &control_edges, &inputs);
 
   // Build new node. We use same name as original node, but change the op name.
-  NodeBuilder nb(orign->name().c_str(), ni.newname.c_str());
+  NodeBuilder nb(orign->name().c_str(), ri->newname.c_str());
   // Copy user-specified device assigned to original node to new node.
   nb.Device(orign->def().device());
   // Set up new inputs to the rewritten node.
@@ -453,20 +1064,48 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   if (s != Status::OK()) {
     return s;
   }
-  // Copy attributes from original node to new node.
-  ni.copyattrs(orign, &nb);
+
+  // Copy attributes from original node to new node (for scenario 1).
+  // For context-based rewrite, we use context to copy the attributes.
+  if (is_context_based_rewrite) {
+    if (orign->type_string() == csinfo_.biasaddgrad &&
+        ri->newname == csinfo_.mklconv2dwithbiasbackpropbias) {
+      CHECK_NOTNULL(fwdn);
+      ri->copyattrs(fwdn, &nb);
+    } else {
+      return Status(error::Code::UNIMPLEMENTED,
+                    "Unimplemented case for node rewrite optimization.");
+    }
+  } else {
+    ri->copyattrs(const_cast<const Node*>(orign), &nb);
+  }
   // Set the Mkl layer label for this op.
   nb.Attr("_kernel", mkl_layer_registry::kMklLayerLabel);
-  Node* newn = nullptr;
+
+  // Add workspace edge to this node if needed.
+  // We add workspace edge only for MaxPool, LRN and BatchNorm.
+  AddWorkSpaceEdgeIfNeeded(g, orign, &nb);
 
   // Finalize graph and get new node.
+  Node* newn = nullptr;
   TF_CHECK_OK(nb.Finalize(&**g, &newn));
   CHECK_NOTNULL(newn);
 
   // Incoming edges from 'orign' node to new 'newn' node are already copied
   // in BuildNode. Copy outgoing edges from 'orign' node to new 'newn' node.
+  // Since the output also follows same ordering among Tensorflow tensors and
+  // Mkl tensors. We need to connect Tensorflow tensors appropriately.
+  // Specifically, nth output of original node will become 2*nth output of
+  // Mkl node. GetTensorDataIndex provides this mapping function.
   for (const Edge* e : orign->out_edges()) {
-    (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
+    // We need to handle control-edges by using their original slot number.
+    // Generally, -1 is reserved for control slot.
+    if (e->src_output() < 0) {
+      (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
+    } else {
+      (*g)->AddEdge(newn, GetTensorDataIndex(e->src_output()), e->dst(),
+                    e->dst_input());
+    }
   }
 
   // Copy the runtime device assigned from original code to new node.
@@ -476,10 +1115,123 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   (*g)->RemoveNode(orign);
   MarkRewrittenNode(newn);
 
-  VLOG(1) << "MKLLayoutRewritePass: New node:" << newn->DebugString();
+  VLOG(1) << "MklLayoutRewritePass: New node:" << newn->DebugString();
   return Status::OK();
 }
 
+const MklLayoutRewritePass::ContextInfo*
+MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
+  CHECK_NOTNULL(n);
+  CHECK_NOTNULL(fwdn);
+  *fwdn = nullptr;
+
+  // Search for matching contextinfo based on node name.
+  // There could be more than one matching contextinfos.
+  bool is_matching_cinfo_found = false;
+  std::vector<const ContextInfo*> mci;
+  for (auto ci = cinfo_.cbegin(); ci != cinfo_.cend(); ++ci) {
+    if (n->type_string() == ci->node) {
+      mci.push_back(&*ci);
+      is_matching_cinfo_found = true;
+    }
+  }
+  // If no matching contextinfo is found, return immediately.
+  if (!is_matching_cinfo_found) {
+    return nullptr;
+  }
+
+  VLOG(1) << "MklLayoutRewritePass: Searching graph for: " << n->type_string()
+          << " in backwards.";
+
+  // Now we will check for forward op name for context info in data
+  // flow graph. Get the max hops we should search for the fwd node.
+  // We are now going to search (breadth-first) backwards in data
+  // dependence graph (for up to max hops) from n for the node
+  // specified in fwd.
+  // queue to maintain nodes to be visited and depth info for
+  // breadth-first search
+  std::queue<std::pair<const Node*, int>> nqueue;
+  const Node* curr_node = n;
+  size_t curr_depth = 0;
+  nqueue.push(std::make_pair(curr_node, curr_depth));
+
+  while (curr_depth < kNodeMergeContextMaxDepth && !nqueue.empty()) {
+    std::pair<const Node*, int> curr_pair = nqueue.front();
+    nqueue.pop();
+
+    std::set<const Node*> visited_nodes;
+    curr_node = curr_pair.first;
+    curr_depth = curr_pair.second;
+    CHECK_NOTNULL(curr_node);
+
+    VLOG(1) << "MklLayoutRewritePass: Visiting node: "
+            << curr_node->type_string() << " at depth: " << curr_depth
+            << " for node: " << n->type_string();
+
+    // If we find a match, we return immediately.
+    for (const ContextInfo* ci : mci) {
+      if (curr_node->type_string() == ci->fwd) {
+        *fwdn = curr_node;
+        return ci;
+      }
+    }
+
+    // Else we explore backward edges from current node.
+    // Add the source nodes of all incoming edges of the node to the queue.
+    for (const Edge* e : curr_node->in_edges()) {
+      // We do not visit already visited node.
+      if (visited_nodes.find(e->src()) == visited_nodes.end()) {
+        // Depth of these nodes is 1 more than the depth of current node.
+        nqueue.push(std::make_pair(e->src(), curr_depth + 1));
+        visited_nodes.insert(e->src());
+      }
+    }
+  } /* while */
+
+  return nullptr;
+}
+
+bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n) {
+  const Node* fwdn = nullptr;
+  return SearchMatchingContext(n, &fwdn) != nullptr;
+}
+
+const MklLayoutRewritePass::RewriteInfo*
+MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
+  CHECK_NOTNULL(n);
+
+  // First check if node along with its type is supported by MKL layer.
+  // We do not want to rewrite an op into Mkl op if types are not supported.
+  // E.g., MklRelu does not support INT32. So we cannot rewrite Relu to
+  // MklRelu if type is INT32.
+  DataType T;
+  if (!GetNodeAttr(n->def(), "T", &T).ok()) {
+    return nullptr;
+  }
+  if (!mkl_layer_registry::IsMklLayer(GetMklOpName(n->type_string()), T)) {
+    return nullptr;
+  }
+
+  // We support 2 types of node rewrites:
+  // 1. Rewriting BiasAddGrad depending on its context.
+  // 2. Rewriting an op to Mkl op always
+  // We return true if any of these 2 conditions is met.
+
+  // Find matching RewriteInfo and then check that rewrite rule applies.
+  for (auto ri = rinfo_.cbegin(); ri != rinfo_.cend(); ++ri) {
+    if (n->type_string().compare(ri->name) == 0 && ri->rewriterule(n)) {
+      return &*ri;
+    }
+  }
+
+  // Else return not found.
+  return nullptr;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//              Run function for the pass
+///////////////////////////////////////////////////////////////////////////////
+
 bool MklLayoutRewritePass::RunPass(std::unique_ptr<Graph>* g) {
   bool result = false;
   CHECK_NOTNULL(g);
@@ -494,40 +1246,46 @@ bool MklLayoutRewritePass::RunPass(std::unique_ptr<Graph>* g) {
       continue;
     }
 
-    for (const NodesInfo& ni : ninfo_) {
-      DataType dtype = DT_INVALID;
-      // An op needs to have data type (T) attribute and its corresponding
-      // Mkl op name must be supported.
-      if (GetNodeAttr(n->def(), "T", &dtype) == Status::OK() &&
-          mkl_layer_registry::IsMklLayer(GetMklOpName(n->type_string())) &&
-          n->type_string().compare(ni.name) == 0) {
-        string node_name = n->name();
-        string op_name = n->type_string();
-
-        VLOG(1) << "MKLLayoutRewritePass: Scheduled node " << node_name
-                << " with op " << op_name << " for rewrite using"
-                << " layout optimization.";
-
-        if (RewriteNode(g, n, ni) == Status::OK()) {
-          VLOG(1) << "MKLLayoutRewritePass: Successfully rewrote node "
-                  << node_name << " with op " << op_name
-                  << " for Mkl layout optimization.";
-          result = true;
-          break;  // We found matching nodesinfo so no need to search next.
-        }
+    const RewriteInfo* ri = nullptr;
+    Node* predn = nullptr;
+    // We will first search if node is to be rewritten
+    if ((ri = CheckForNodeRewrite(n)) != nullptr) {
+      string node_name = n->name();
+      string op_name = n->type_string();
+
+      VLOG(1) << "MklLayoutRewritePass: Scheduled node " << node_name
+              << " with op " << op_name << " for rewrite using"
+              << " layout optimization.";
+
+      if (RewriteNode(g, n, ri) == Status::OK()) {
+        VLOG(1) << "MklLayoutRewritePass: rewrote node " << node_name
+                << " with op " << op_name << " for Mkl layout optimization.";
+        result = true;
+      }
+    } else if ((predn = CheckForNodeMerge(n)) != nullptr) {
+      // Otherwise, we will check if the node is to be merged.
+      string n1_name = n->name();
+      string n2_name = predn->name();
+
+      VLOG(1) << "MklLayoutRewritePass: Scheduled nodes " << n1_name << " and "
+              << n2_name << " for merging";
+
+      if (MergeNode(g, n, predn) == Status::OK()) {
+        VLOG(1) << "MklLayoutRewritePass: Merged nodes " << n1_name << " and "
+                << n2_name;
+        result = true;
       }
     }
   }
 
   DumpGraph("After running MklLayoutRewritePass", &**g);
 
+  // Clear marked nodes as the same graph pass may be used multiple times.
+  UnMarkRewrittenNodes();
+
   return result;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-//              Run function for the pass
-///////////////////////////////////////////////////////////////////////////////
-
 bool RunMklLayoutRewritePass(std::unique_ptr<Graph>* g) {
   return MklLayoutRewritePass().RunPass(g);
 }
diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc
index 10671ee2e9..142d60d611 100644
--- a/tensorflow/core/graph/mkl_layout_pass_test.cc
+++ b/tensorflow/core/graph/mkl_layout_pass_test.cc
@@ -18,7 +18,10 @@ limitations under the License.
 #include "tensorflow/core/graph/mkl_layout_pass.h"
 #include "tensorflow/core/util/mkl_util.h"
 
+#include <algorithm>
+#include <string>
 #include <vector>
+
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/graph/graph.h"
@@ -107,10 +110,345 @@ class MklLayoutPassTest : public ::testing::Test {
 };
 
 REGISTER_OP("Input").Output("o: float").SetIsStateful();
+REGISTER_OP("HalfInput").Output("o: half").SetIsStateful();
+REGISTER_OP("MklInput").Output("o: uint8").SetIsStateful();
+REGISTER_OP("MklInput2").Output("o: uint8").Output("o1: uint8").SetIsStateful();
+
+/////////////////////////////////////////////////////////////////////
+//  Unit tests related to node merge optiimization
+/////////////////////////////////////////////////////////////////////
+
+TEST_F(MklLayoutPassTest, Basic) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Mul);D(Mul)|"
+            "A->C;A->D;B->C:1;B->D:1");
+}
+
+// Test set 1: Conv2D + AddBias
+
+// C=MklConv2D(A,M,B,N); E=BiasAdd(C,D); Z=Sub(E,Y)
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'M', 'B', 'N']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['C', 'D'] }"
+      "node { name: 'Y' op: 'Input'}"
+      "node { name: 'Z' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['E', 'Y']}");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
+            "M(MklInput);N(MklInput);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
+            "DMT/_0->E:5;E->Z;M->E:1;N->E:3;Y->Z:1");
+}
+
+// C=MklConv2D(A,M:1,B,N:1); E=BiasAdd(C,D); Z=Sub(E,Y)
+// Test for correct output slots selected
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput2'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'N' op: 'MklInput2'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'M:1', 'B', 'N:1']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['C', 'D'] }"
+      "node { name: 'Y' op: 'Input'}"
+      "node { name: 'Z' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['E', 'Y']}");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
+            "M(MklInput2);N(MklInput2);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
+            "DMT/_0->E:5;E->Z;M:1->E:1;N:1->E:3;Y->Z:1");
+}
+
+// C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
+// This is a case of node rewrite followed by node merge.
+// We will first rewrite Conv2D to MklConv2D, and then merge MklConv2D
+// with BiasAdd to produce MklConv2DWithBias.
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['C', 'D'] }"
+      "node { name: 'Y' op: 'Input'}"
+      "node { name: 'Z' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['E', 'Y']}");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);E(MklConv2DWithBias);Y(Input);Z(Sub)|"
+            "A->E;B->E:2;D->E:4;DMT/_0->E:1;DMT/_1->E:3;DMT/_2->E:5;"
+            "E->Z;Y->Z:1");
+}
+
+// Graph contains only MklConv2D, no AddBias.
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_NoAddBias) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'M', 'B', 'N']}");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(MklConv2D);M(MklInput);N(MklInput)|"
+            "A->C;B->C:2;M->C:1;N->C:3");
+}
+
+// MklConv2D output does not go to BiasAdd.
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow1) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'M', 'B', 'N']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['D', 'E'] }");  // Output of MklConv2D does not go to BiasAdd.
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
+            "M(MklInput);N(MklInput)|A->C;B->C:2;D->F;E->F:1;M->C:1;N->C:3");
+}
+
+// MklConv2D has two outgoing edges: BiasAdd and some other dummy node (Add).
+// Merge should not be done in such case.
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'M', 'B', 'N']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['D', 'E'] }"  // Conv2D has two outputs.
+                              // No merge should happen.
+      "node { name: 'G' op: 'Add'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['C', 'E'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
+            "G(Add);M(MklInput);N(MklInput)|A->C;B->C:2;C->G;D->F;"
+            "E->F:1;E->G:1;M->C:1;N->C:3");
+}
+
+// data_format attribute value mismatch. Merge should not be done
+// in such case.
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_AttrMismatch) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'M', 'B', 'N']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NHCW' } }"
+      " input: ['C', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(MklConv2D);D(Input);E(BiasAdd);M(MklInput);"
+            "N(MklInput)|A->C;B->C:2;C->E;D->E:1;M->C:1;N->C:3");
+}
+
+// No MklConv2D in context, but Conv2D in context.
+// Only Conv2D would be rewritten to MklConv2D, but no rewrite
+// for BiasAddGrad should happen.
+// C=MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D)
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'M', 'B', 'N']}"
+      "node { name: 'D' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['C', 'A']}"
+      "node { name: 'E' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(MklConv2D);D(Sub);E(BiasAddGrad);"
+            "M(MklInput);N(MklInput)|A->C;A->D:1;B->C:2;C->D;D->E;"
+            "M->C:1;N->C:3");
+}
+
+// No Conv2D in the context for BiasAddGrad. No rewrite should happen.
+// C=Add(A,B); D=Sub(C,A); E=BiasAddGrad(D)
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Negative_NoConv2D) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Add'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['C', 'A']}"
+      "node { name: 'E' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
+            "A->C;A->D:1;B->C:1;C->D;D->E");
+}
+
+// No Conv2D in the context for BiasAddGrad, but MatMul in context.
+// Rewrite should happen, but name of BiasAddGrad does not change.
+// C=MatMul(A,B); D=Sub(C,A); E=BiasAddGrad(D)
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Negative_NoConv2D_MatMul) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'MatMul'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'transpose_a'      value { b: false } }"
+      " attr { key: 'transpose_b'      value { b: false } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['C', 'A']}"
+      "node { name: 'E' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
+            "A->C;A->D:1;B->C:1;C->D;D->E");
+}
+
+// Test set 3: MatMul..BiasAddGrad -> BiasAddGrad rewrite tests
+// C=MatMul(A,B); D=Sub(C,A); E=BiasAddGrad(D)
+TEST_F(MklLayoutPassTest, NodeMerge_MatMulBiasAddGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'MatMul'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'transpose_a'      value { b: false } }"
+      " attr { key: 'transpose_b'      value { b: false } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['C', 'A']}"
+      "node { name: 'E' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
+            "A->C;A->D:1;B->C:1;C->D;D->E");
+}
+
+// No MatMul in the context for BiasAddGrad. No rewrite should happen.
+// C=Add(A,B); D=Sub(C,A); E=BiasAddGrad(D)
+TEST_F(MklLayoutPassTest, NodeMerge_MatMulBiasAddGrad_Negative_NoMatMul) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Add'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['C', 'A']}"
+      "node { name: 'E' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
+            "A->C;A->D:1;B->C:1;C->D;D->E");
+}
+
+/////////////////////////////////////////////////////////////////////
+//  Unit tests related to rewriting node to Mkl node
+/////////////////////////////////////////////////////////////////////
 
 // Single Conv2D Op; No Mkl layer on the input and on the output.
 // We will generate dummy Mkl tensor as 2nd input of Conv2D.
-TEST_F(MklLayoutPassTest, Conv2D_Basic) {
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Basic) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'B' op: 'Input'}"
@@ -130,7 +468,7 @@ TEST_F(MklLayoutPassTest, Conv2D_Basic) {
 
 // 2 Conv2D Ops in sequence. Both should get transformed and 1st Conv2D will
 // have 2 outputs, both of which will be inputs to next Conv2D.
-TEST_F(MklLayoutPassTest, Conv2D_Positive1) {
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Positive1) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'B' op: 'Input'}"
@@ -156,6 +494,104 @@ TEST_F(MklLayoutPassTest, Conv2D_Positive1) {
             "C:1->D:3;D->E:1;DMT/_0->C:1;DMT/_1->C:3;DMT/_2->D:1");
 }
 
+// Conv2D with INT32 which is not supported by Mkl
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Negative_UnsupportedType) {
+  InitGraph(
+      "node { name: 'A' op: 'HalfInput'}"
+      "node { name: 'B' op: 'HalfInput'}"
+      "node { name: 'C' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_HALF } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_HALF } }"
+      " input: ['B', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(HalfInput);B(HalfInput);C(Conv2D);D(Mul)|"
+            "A->C;B->C:1;B->D;C->D:1");
+}
+
+/////////////////////////////////////////////////////////////////////
+//  Unit tests related to rewriting node for workspace edges
+/////////////////////////////////////////////////////////////////////
+
+/* Test MaxPool->MaxPoolGrad replacement by workspace+rewrite nodes. */
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'MaxPoolGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['C', 'B', 'D'] }"
+      "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'E'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MklMaxPool);C(Input);D(Input);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(MklMaxPoolGrad);F(Mul)|"
+            "A->B;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;C->E;C->F;D->E:4;"
+            "DMT/_0->B:1;DMT/_1->E:1;DMT/_2->E:5;E->F:1");
+}
+
+// Test MaxPool>MaxPoolGrad replacement when only one of them is present.
+// In this case, we will rewrite MaxPool node but workspace edges will not
+// be present.
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative1) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MklMaxPool);C(Mul);DMT/_0(Const)|"
+            "A->B;A->C;B->C:1;DMT/_0->B:1");
+}
+
+// Test MaxPool->MaxPoolGrad replacement when only one of them is present.
+// In this case, we will rewrite MaxPoolGrad and for workspace tensor and
+// its Mkl part, we will generate dummy tensor.
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'MaxPoolGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A', 'B', 'C'] }"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(MklMaxPoolGrad);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
+            "A->D;A->E;B->D:2;C->D:4;D->E:1;DMT/_0->D:1;DMT/_1->D:3;"
+            "DMT/_2->D:5;DMT/_3->D:6;DMT/_4->D:7");
+}
+
+/////////////////////////////////////////////////////////////////////
+
 static void BM_MklLayoutRewritePass(int iters, int op_nodes) {
   testing::StopTiming();
   string s;
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 8c3adad6f0..7c3836b308 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -81,9 +81,10 @@ class MklToTfConversionPass : public GraphOptimizationPass {
   // Is the input Op supported by Mkl-specific layout?
   //
   // @input op_name string of the op
+  // @input T Datatype to use for checking input op
   // @return true if op is Mkl supported; false, otherwise.
-  inline bool IsMklSupportedOp(const string& op_name) const {
-    return mkl_layer_registry::IsMklLayer(op_name);
+  inline bool IsMklSupportedOp(const string& op_name, DataType T) const {
+    return mkl_layer_registry::IsMklLayer(op_name, T);
   }
 
   // Insert layout conversion node on the edge pointed by 'e' from graph 'g'.
@@ -188,6 +189,13 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
       continue;
     }
 
+    // We skip adding MklToTf on an edge between X->MklToTf or
+    // MklToTf->X, where X is any layer.
+    if (src->type_string().compare("MklToTf") == 0 ||
+        dst->type_string().compare("MklToTf") == 0) {
+      continue;
+    }
+
     VLOG(1) << "MklToTfConversionPass: InsertConversionNodes: "
             << src->type_string() << " and " << dst->type_string();
 
@@ -202,8 +210,9 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
     GetNodeAttr(dst->def(), "T", &dst_datatype);
 
     // Check if src with is Mkl-compliant, while dst is not Mkl-compliant.
-    if (IsMklSupportedOp(src->type_string()) &&
-        !IsMklSupportedOp(dst->type_string())) {
+
+    if (IsMklSupportedOp(src->type_string(), src_datatype) &&
+        !IsMklSupportedOp(dst->type_string(), dst_datatype)) {
       VLOG(1) << "MklToTfConversionPass: Scheduled nodes " << src->name()
               << " and " << dst->name() << " for inserting conversion nodes";
       candidate_edges.push_back(const_cast<Edge*>(e));
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
index 0a63cf6ddb..7d9237f845 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
@@ -17,7 +17,10 @@ limitations under the License.
 
 #include "tensorflow/core/graph/mkl_tfconversion_pass.h"
 
+#include <algorithm>
+#include <string>
 #include <vector>
+
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/graph/graph.h"
@@ -146,31 +149,34 @@ TEST_F(MklToTfConversionPass, Positive) {
             "C:1->Mkl2Tf/_0:1;D->E:1;M->C:1;Mkl2Tf/_0->E;N->C:3");
 }
 
-// MklConv2D followed by Non-Mkl layer, and MklConv2D uses half type
-// C=MklConv2D(A,M,B,N); E=Sub(C,D)
-// MklToTf node should be inserted.
-TEST_F(MklToTfConversionPass, Positive_Type) {
+// MklConv2D followed by MklToTf op followed by Non-Mkl layer.
+// C=MklConv2D(A,M,B,N); D=MklToTf(C:0, C:1) F=Sub(D,E)
+// MklToTf node should not be inserted again.
+TEST_F(MklToTfConversionPass, Negative_DoubleInsert) {
   InitGraph(
-      "node { name: 'A' op: 'HalfInput'}"
+      "node { name: 'A' op: 'Input'}"
       "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'HalfInput'}"
+      "node { name: 'B' op: 'Input'}"
       "node { name: 'N' op: 'MklInput'}"
       "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_HALF } }"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
       " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'HalfInput'}"
-      "node { name: 'E' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_HALF } }"
-      " input: ['C', 'D']}");
+      "node { name: 'D' op: 'MklToTf'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['C:0', 'C:1']}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['D', 'E']}");
   EXPECT_EQ(DoRunMklToTfConversionPass(),
-            "A(HalfInput);B(HalfInput);C(MklConv2D);D(HalfInput);"
-            "E(Sub);M(MklInput);Mkl2Tf/_0(MklToTf);N(MklInput)|"
-            "A->C;B->C:2;C->Mkl2Tf/_0;C:1->Mkl2Tf/_0:1;D->E:1;"
-            "M->C:1;Mkl2Tf/_0->E;N->C:3");
+            "A(Input);B(Input);C(MklConv2D);D(MklToTf);E(Input);"
+            "F(Sub);M(MklInput);N(MklInput)|"
+            "A->C;B->C:2;C->D;C:1->D:1;D->F;E->F:1;M->C:1;N->C:3");
 }
 
 // C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 9f516efd71..9c47d520d9 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -27,6 +27,7 @@ load(
     "tf_copts",
     "tf_opts_nortti_if_android",
     "tf_kernel_library",
+    "tf_mkl_kernel_library",
     "cc_header_only_library",
 )
 load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_test")
@@ -2241,6 +2242,12 @@ tf_kernel_library(
 
 tf_kernel_library(
     name = "matmul_op",
+    srcs = [
+        "matmul_op.cc",
+    ] + if_mkl([
+        "mkl_matmul_op.cc",
+    ]),
+    hdrs = ["matmul_op.h"],
     defines = select({
         ":xsmm": [
             "TENSORFLOW_USE_LIBXSMM",
@@ -2248,13 +2255,14 @@ tf_kernel_library(
         ],
         "//conditions:default": [],
     }),
-    prefix = "matmul_op",
     deps = MATH_DEPS + select({
         ":xsmm": [
             "@libxsmm_archive//:xsmm_avx",
         ],
         "//conditions:default": [],
-    }),
+    }) + if_mkl([
+        "//third_party/mkl:intel_binary_blob",
+    ]),
 )
 
 tf_kernel_library(
@@ -2770,6 +2778,7 @@ tf_kernel_library(
         "cudnn_pooling_gpu.h",
         "fractional_pool_common.h",
         "maxpooling_op.h",
+        "pooling_ops_3d.h",
         "pooling_ops_common.h",
     ],
     gpu_srcs = [
@@ -2780,6 +2789,8 @@ tf_kernel_library(
         "maxpooling_op_gpu.h",
         "pooling_ops_common.h",
         "pooling_ops_common_gpu.h",
+        "pooling_ops_3d_gpu.h",
+        "pooling_ops_3d_gpu.cu.cc",
     ],
     deps = [
         ":conv_2d",
@@ -4468,49 +4479,69 @@ tf_cc_test(
     ],
 )
 
-if_mkl(
-    tf_kernel_library(
-        name = "mkl_matmul_op",
-        prefix = "mkl_matmul",
-        deps = [
-            ":math",
-            "//third_party/mkl:intel_binary_blob",
-        ],
-    ),
+tf_mkl_kernel_library(
+    name = "mkl_conv_op",
+    prefix = "mkl_conv",
+    deps = [
+        ":bounds_check",
+        ":conv_ops",
+        ":ops_util",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:nn_ops_op_lib",
+        "//third_party/mkl:intel_binary_blob",
+    ],
 )
 
-if_mkl(
-    tf_kernel_library(
-        name = "mkl_conv_op",
-        prefix = "mkl_conv",
-        deps = [
-            ":bounds_check",
-            ":ops_util",
-            "//tensorflow/core:core_cpu",
-            "//tensorflow/core:framework",
-            "//tensorflow/core:lib",
-            "//tensorflow/core:lib_internal",
-            "//tensorflow/core:nn_ops_op_lib",
-            "//third_party/mkl:intel_binary_blob",
-        ],
-    ),
+tf_mkl_kernel_library(
+    name = "mkl_tfconv_op",
+    prefix = "mkl_tfconv",
+    deps = [
+        ":bounds_check",
+        ":ops_util",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:nn_ops_op_lib",
+        "//third_party/mkl:intel_binary_blob",
+    ],
 )
 
-if_mkl(
-    tf_kernel_library(
-        name = "mkl_tfconv_op",
-        prefix = "mkl_tfconv",
-        deps = [
-            ":bounds_check",
-            ":ops_util",
-            "//tensorflow/core:core_cpu",
-            "//tensorflow/core:framework",
-            "//tensorflow/core:lib",
-            "//tensorflow/core:lib_internal",
-            "//tensorflow/core:nn_ops_op_lib",
-            "//third_party/mkl:intel_binary_blob",
-        ],
-    ),
+tf_mkl_kernel_library(
+    name = "mkl_pooling_ops",
+    srcs = [
+        "mkl_avgpooling_op.cc",
+        "mkl_maxpooling_op.cc",
+        "mkl_pooling_ops_common.cc",
+    ],
+    hdrs = ["mkl_pooling_ops_common.h"],
+    deps = [
+        ":ops_util",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:nn_ops_op_lib",
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
+tf_mkl_kernel_library(
+    name = "mkl_relu_op",
+    prefix = "mkl_relu",
+    deps = [
+        ":bounds_check",
+        ":ops_util",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:nn_ops_op_lib",
+        "//third_party/mkl:intel_binary_blob",
+    ],
 )
 
 # -----------------------------------------------------------------------------
diff --git a/tensorflow/core/kernels/conv_grad_filter_ops.cc b/tensorflow/core/kernels/conv_grad_filter_ops.cc
index 2e385f2c55..f88862bfeb 100644
--- a/tensorflow/core/kernels/conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/conv_grad_filter_ops.cc
@@ -30,6 +30,9 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/tensor_slice.h"
 #include "tensorflow/core/kernels/conv_2d.h"
+#ifdef TENSORFLOW_USE_LIBXSMM
+#include "tensorflow/core/kernels/xsmm_conv2d.h"
+#endif
 #include "tensorflow/core/kernels/ops_util.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
@@ -88,6 +91,75 @@ namespace tensorflow {
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
 
+#ifdef TENSORFLOW_USE_LIBXSMM
+template <typename Device, class T>
+struct LaunchXsmmBackwardFilter {
+  bool operator()(OpKernelContext* context, const Device& d,
+                  typename TTypes<T, 4>::ConstTensor input_backward,
+                  typename TTypes<T, 4>::Tensor kernel,
+                  typename TTypes<T, 4>::ConstTensor output_backward,
+                  int input_rows, int input_cols, int row_stride,
+                  int col_stride, int pad_h, int pad_w,
+                  TensorFormat data_format) const {
+    return false;
+  }
+};
+
+template <>
+struct LaunchXsmmBackwardFilter<CPUDevice, float> {
+  bool operator()(OpKernelContext* context, const CPUDevice& d,
+                  typename TTypes<float, 4>::ConstTensor input,
+                  typename TTypes<float, 4>::Tensor filter,
+                  typename TTypes<float, 4>::ConstTensor output, int input_rows,
+                  int input_cols, int row_stride, int col_stride, int pad_h,
+                  int pad_w, TensorFormat data_format) const {
+    auto batch = input.dimension(0);
+    auto in_depth = input.dimension(3);
+    auto out_depth = output.dimension(3);
+    auto filter_rows = filter.dimension(0);
+    auto filter_cols = filter.dimension(1);
+
+    auto num_threads =
+        context->device()->tensorflow_cpu_worker_threads()->num_threads;
+    // See libxsmm_dnn.h for this struct definition.
+    libxsmm_dnn_conv_desc desc;
+    desc.N = batch;
+    desc.C = in_depth;
+    desc.H = input_rows;
+    desc.W = input_cols;
+    desc.K = out_depth;
+    desc.R = filter_rows;
+    desc.S = filter_cols;
+    desc.u = row_stride;
+    desc.v = col_stride;
+    desc.pad_h = pad_h;
+    desc.pad_w = pad_w;
+    desc.pad_h_in = 0;  // pad_rows;  // ignored by libxsmm for now.
+    desc.pad_w_in = 0;  // pad_cols;  // ignored by libxsmm for now.
+    desc.pad_h_out = 0;
+    desc.pad_w_out = 0;
+    desc.threads = num_threads;
+    desc.algo = LIBXSMM_DNN_CONV_ALGO_DIRECT;
+    desc.buffer_format = LIBXSMM_DNN_TENSOR_FORMAT_NHWC;
+    desc.filter_format = LIBXSMM_DNN_TENSOR_FORMAT_RSCK;
+    desc.fuse_ops = LIBXSMM_DNN_CONV_FUSE_NONE;
+    desc.options = LIBXSMM_DNN_CONV_OPTION_NONE;
+    desc.datatype = LIBXSMM_DNN_DATATYPE_F32;
+
+    if (!CanUseXsmmConv2D(desc, data_format)) {
+      return false;
+    }
+
+    auto input_ptr = input.data();
+    auto filter_ptr = filter.data();
+    auto output_ptr = output.data();
+    bool success = functor::XsmmBkwFilterConv2D<CPUDevice, float>()(
+        context, desc, input_ptr, filter_ptr, output_ptr);
+    return success;
+  }
+};
+#endif
+
 template <typename Device, class T>
 class Conv2DFastBackpropFilterOp : public OpKernel {
  public:
@@ -135,6 +207,36 @@ class Conv2DFastBackpropFilterOp : public OpKernel {
     OP_REQUIRES_OK(context,
                    context->allocate_output(0, filter_shape, &filter_backprop));
 
+#if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
+
+    int64 pad_top, pad_bottom;
+    int64 pad_left, pad_right;
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[0].input_size, dims.spatial_dims[0].filter_size,
+            dims.spatial_dims[0].stride, padding_,
+            &dims.spatial_dims[0].output_size, &pad_top, &pad_bottom));
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[1].input_size, dims.spatial_dims[1].filter_size,
+            dims.spatial_dims[1].stride, padding_,
+            &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
+
+    if (pad_left == pad_right && pad_top == pad_bottom) {
+      if (LaunchXsmmBackwardFilter<Device, T>()(
+              context, context->eigen_device<Device>(), input.tensor<T, 4>(),
+              filter_backprop->tensor<T, 4>(), out_backprop.tensor<T, 4>(),
+              dims.spatial_dims[0].input_size, dims.spatial_dims[1].input_size,
+              (int)dims.spatial_dims[0].stride,
+              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              data_format_)) {
+        return;
+      }
+    }
+#endif
+
     functor::SpatialConvolutionBackwardKernel<Device, T>()(
         context->eigen_device<Device>(), filter_backprop->tensor<T, 4>(),
         input.tensor<T, 4>(), out_backprop.tensor<T, 4>(),
@@ -213,6 +315,19 @@ class Conv2DCustomBackpropFilterOp : public OpKernel {
             dims.spatial_dims[1].input_size, dims.spatial_dims[1].filter_size,
             dims.spatial_dims[1].stride, padding_,
             &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
+#if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
+    if (pad_left == pad_right && pad_top == pad_bottom) {
+      if (LaunchXsmmBackwardFilter<Device, T>()(
+              context, context->eigen_device<Device>(), input.tensor<T, 4>(),
+              filter_backprop->tensor<T, 4>(), out_backprop.tensor<T, 4>(),
+              dims.spatial_dims[0].input_size, dims.spatial_dims[1].input_size,
+              (int)dims.spatial_dims[0].stride,
+              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              data_format_)) {
+        return;
+      }
+    }
+#endif
 
     // The total dimension size of each kernel.
     const int filter_total_size = dims.spatial_dims[0].filter_size *
diff --git a/tensorflow/core/kernels/conv_grad_input_ops.cc b/tensorflow/core/kernels/conv_grad_input_ops.cc
index 8bc79bebd9..e79c9465cb 100644
--- a/tensorflow/core/kernels/conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/conv_grad_input_ops.cc
@@ -131,7 +131,8 @@ struct LaunchXsmmBackwardInputConvolution {
                   typename TTypes<T, 4>::ConstTensor kernel,
                   typename TTypes<T, 4>::ConstTensor output_backward,
                   int input_rows, int input_cols, int row_stride,
-                  int col_stride, TensorFormat data_format) const {
+                  int col_stride, int pad_h, int pad_w,
+                  TensorFormat data_format) const {
     return false;
   }
 };
@@ -143,7 +144,8 @@ struct LaunchXsmmBackwardInputConvolution<CPUDevice, float> {
                   typename TTypes<float, 4>::ConstTensor kernel,
                   typename TTypes<float, 4>::ConstTensor output_backward,
                   int input_rows, int input_cols, int row_stride,
-                  int col_stride, TensorFormat data_format) const {
+                  int col_stride, int pad_h, int pad_w,
+                  TensorFormat data_format) const {
     auto batch = input_backward.dimension(0);
     auto in_depth = input_backward.dimension(3);
     auto out_depth = output_backward.dimension(3);
@@ -162,10 +164,10 @@ struct LaunchXsmmBackwardInputConvolution<CPUDevice, float> {
     desc.S = filter_cols;
     desc.u = row_stride;
     desc.v = col_stride;
-    desc.pad_h = 0;
-    desc.pad_w = 0;
-    desc.pad_h_in = 0;  // pad_rows;  // ignored by libxsmm for now.
-    desc.pad_w_in = 0;  // pad_cols;  // ignored by libxsmm for now.
+    desc.pad_h = pad_h;
+    desc.pad_w = pad_w;
+    desc.pad_h_in = 0;
+    desc.pad_w_in = 0;
     desc.pad_h_out = 0;
     desc.pad_w_out = 0;
     desc.threads = num_threads;
@@ -174,7 +176,7 @@ struct LaunchXsmmBackwardInputConvolution<CPUDevice, float> {
     desc.filter_format =
         LIBXSMM_DNN_TENSOR_FORMAT_LIBXSMM;  // LIBXSMM_DNN_TENSOR_FORMAT_RSCK;
     desc.fuse_ops = LIBXSMM_DNN_CONV_FUSE_NONE;
-    desc.options = LIBXSMM_DNN_CONV_OPTION_NONE;
+    desc.options = LIBXSMM_DNN_CONV_OPTION_WU_EXT_FILTER_REDUCE;
     desc.datatype = LIBXSMM_DNN_DATATYPE_F32;
 
     auto input_ptr = input_backward.data();
@@ -236,13 +238,31 @@ class Conv2DFastBackpropInputOp : public OpKernel {
                    context->allocate_output(0, input_shape, &in_backprop));
 
 #if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
-    if (LaunchXsmmBackwardInputConvolution<Device, T>()(
-            context, context->eigen_device<Device>(),
-            in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
-            out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
-            dims.spatial_dims[1].input_size, dims.spatial_dims[0].stride,
-            dims.spatial_dims[1].stride, data_format_)) {
-      return;
+    int64 pad_top, pad_bottom;
+    int64 pad_left, pad_right;
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[0].input_size, dims.spatial_dims[0].filter_size,
+            dims.spatial_dims[0].stride, padding_,
+            &dims.spatial_dims[0].output_size, &pad_top, &pad_bottom));
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[1].input_size, dims.spatial_dims[1].filter_size,
+            dims.spatial_dims[1].stride, padding_,
+            &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
+
+    if (pad_left == pad_right && pad_top == pad_bottom) {
+      if (LaunchXsmmBackwardInputConvolution<Device, T>()(
+              context, context->eigen_device<Device>(),
+              in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
+              out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
+              dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
+              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              data_format_)) {
+        return;
+      }
     }
 #endif
 
@@ -309,21 +329,39 @@ class Conv2DCustomBackpropInputOp : public OpKernel {
     OP_REQUIRES_OK(context,
                    context->allocate_output(0, input_shape, &in_backprop));
 
+// TODO(andydavis) Consider moving code shared with
+// Conv2DCustomBackpropFilterOp into a shared helper function.
 #if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
-    if (LaunchXsmmBackwardInputConvolution<Device, T>()(
-            context, context->eigen_device<Device>(),
-            in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
-            out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
-            dims.spatial_dims[1].input_size, dims.spatial_dims[0].stride,
-            dims.spatial_dims[1].stride, data_format_)) {
-      return;
-    }
-#endif
+    int64 pad_top, pad_bottom;
+    int64 pad_left, pad_right;
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[0].input_size, dims.spatial_dims[0].filter_size,
+            dims.spatial_dims[0].stride, padding_,
+            &dims.spatial_dims[0].output_size, &pad_top, &pad_bottom));
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[1].input_size, dims.spatial_dims[1].filter_size,
+            dims.spatial_dims[1].stride, padding_,
+            &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
 
-    // TODO(andydavis) Consider moving code shared with
-    // Conv2DCustomBackpropFilterOp into a shared helper function.
+    if (pad_left == pad_right && pad_top == pad_bottom) {
+      if (LaunchXsmmBackwardInputConvolution<Device, T>()(
+              context, context->eigen_device<Device>(),
+              in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
+              out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
+              dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
+              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              data_format_)) {
+        return;
+      }
+    }
+#else
     int64 pad_top, pad_bottom;
     int64 pad_left, pad_right;
+#endif
     OP_REQUIRES_OK(
         context,
         GetWindowedOutputSizeVerbose(
diff --git a/tensorflow/core/kernels/conv_ops.cc b/tensorflow/core/kernels/conv_ops.cc
index facfe4467d..8076daf387 100644
--- a/tensorflow/core/kernels/conv_ops.cc
+++ b/tensorflow/core/kernels/conv_ops.cc
@@ -213,8 +213,8 @@ class LaunchXsmmConvOp<CPUDevice, float> {
     desc.v = stride_cols;
     desc.pad_h = pad_rows;
     desc.pad_w = pad_cols;
-    desc.pad_h_in = pad_rows;  // libxsmm supports only physical padding for now
-    desc.pad_w_in = pad_cols;  // libxsmm supports only physical padding for now
+    desc.pad_h_in = 0;
+    desc.pad_w_in = 0;
     desc.pad_h_out = 0;
     desc.pad_w_out = 0;
     desc.threads = num_threads;
@@ -222,13 +222,17 @@ class LaunchXsmmConvOp<CPUDevice, float> {
     desc.buffer_format = LIBXSMM_DNN_TENSOR_FORMAT_NHWC;
     desc.filter_format = LIBXSMM_DNN_TENSOR_FORMAT_LIBXSMM;
     desc.fuse_ops = LIBXSMM_DNN_CONV_FUSE_NONE;
-    desc.options = LIBXSMM_DNN_CONV_OPTION_NONE;
+    desc.options = LIBXSMM_DNN_CONV_OPTION_WU_EXT_FILTER_REDUCE;
     desc.datatype = LIBXSMM_DNN_DATATYPE_F32;
 
     if (!CanUseXsmmConv2D(desc, data_format)) {
       return false;
     }
 
+    if (!CanUseXsmmConv2D(desc, data_format)) {
+      return false;
+    }
+
     auto input_ptr = input.template flat<float>().data();
     auto filter_ptr = filter.template flat<float>().data();
     auto output_ptr = output->template flat<float>().data();
diff --git a/tensorflow/core/kernels/conv_ops_gpu_3.cu.cc b/tensorflow/core/kernels/conv_ops_gpu_3.cu.cc
index bb99d627a5..2307c2de0e 100644
--- a/tensorflow/core/kernels/conv_ops_gpu_3.cu.cc
+++ b/tensorflow/core/kernels/conv_ops_gpu_3.cu.cc
@@ -548,9 +548,11 @@ template struct functor::TransformFilter<GPUDevice, Eigen::half, int, 4>;
 template struct functor::ReverseTransformFilter<GPUDevice, float, 4>;
 template struct functor::ReverseTransformFilter<GPUDevice, Eigen::half, 4>;
 
+template struct functor::NHWCToNCHW<GPUDevice, double, 4>;
 template struct functor::NHWCToNCHW<GPUDevice, float, 4>;
 template struct functor::NHWCToNCHW<GPUDevice, Eigen::half, 4>;
 
+template struct functor::NCHWToNHWC<GPUDevice, double, 4>;
 template struct functor::NCHWToNHWC<GPUDevice, float, 4>;
 template struct functor::NCHWToNHWC<GPUDevice, Eigen::half, 4>;
 
diff --git a/tensorflow/core/kernels/cudnn_pooling_gpu.cc b/tensorflow/core/kernels/cudnn_pooling_gpu.cc
index 66f9249234..5939ecdf62 100644
--- a/tensorflow/core/kernels/cudnn_pooling_gpu.cc
+++ b/tensorflow/core/kernels/cudnn_pooling_gpu.cc
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include <array>
 
+#include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/kernels/conv_2d.h"
 #include "tensorflow/core/kernels/conv_3d.h"
 #include "tensorflow/core/kernels/conv_ops_gpu.h"
@@ -242,8 +243,11 @@ void DnnPooling3dGradOp<T>::Compute(
   }
 }
 
-template class DnnPooling3dOp<float>;
-template class DnnPooling3dGradOp<float>;
+#define DEFINE_DNN_OPS(T)           \
+  template class DnnPooling3dOp<T>; \
+  template class DnnPooling3dGradOp<T>;
+TF_CALL_float(DEFINE_DNN_OPS) TF_CALL_half(DEFINE_DNN_OPS)
+#undef DEFINE_DNN_OPS
 
 #endif  // GOOGLE_CUDA
 
diff --git a/tensorflow/core/kernels/maxpooling_op.cc b/tensorflow/core/kernels/maxpooling_op.cc
index 41c6251ac7..eb590280c9 100644
--- a/tensorflow/core/kernels/maxpooling_op.cc
+++ b/tensorflow/core/kernels/maxpooling_op.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/tensor_slice.h"
@@ -46,6 +47,7 @@ limitations under the License.
 namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
+typedef Eigen::GpuDevice GPUDevice;
 
 const int kInvalidMaxPoolingIndex = -1;
 
@@ -187,40 +189,6 @@ static void SpatialMaxPoolWithArgMaxHelper(
         params.tensor_in_batch, shard_cost, shard);
 }
 
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool").Device(DEVICE_CPU).TypeConstraint<float>("T"),
-    MaxPoolingOp<CPUDevice, float>);
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool").Device(DEVICE_CPU).TypeConstraint<Eigen::half>("T"),
-    MaxPoolingOp<CPUDevice, Eigen::half>);
-
-#if GOOGLE_CUDA
-// Forward declarations for the functor specializations for GPU.
-namespace functor {
-#define DECLARE_GPU_SPEC(T)                                            \
-  template <>                                                          \
-  void SpatialMaxPooling<Eigen::GpuDevice, T>::operator()(             \
-      const Eigen::GpuDevice& d, typename TTypes<T, 4>::Tensor output, \
-      typename TTypes<T, 4>::ConstTensor input, int window_rows,       \
-      int window_cols, int row_stride, int col_stride,                 \
-      const Eigen::PaddingType& padding);                              \
-  extern template struct SpatialMaxPooling<Eigen::GpuDevice, T>;
-
-DECLARE_GPU_SPEC(float);
-#undef DECLARE_GPU_SPEC
-}  // namespace functor
-
-// Note(jiayq): Currently, the Caffe custom implementation is faster than the
-// default Eigen implementation so we are using the custom kernel as the
-// default. However, you can explicitly invoke the eigen version using
-// kernel_label_map.
-REGISTER_KERNEL_BUILDER(Name("MaxPool")
-                            .Device(DEVICE_GPU)
-                            .TypeConstraint<float>("T")
-                            .Label("eigen_tensor"),
-                        MaxPoolingOp<Eigen::GpuDevice, float>);
-#endif  // GOOGLE_CUDA
-
 // The operation to compute MaxPool gradients.
 // It takes three inputs:
 //   - The original input tensor
@@ -237,7 +205,7 @@ class MaxPoolingGradOp : public OpKernel {
                 errors::InvalidArgument("Invalid data format"));
     OP_REQUIRES(
         context, data_format_ == FORMAT_NHWC,
-        errors::InvalidArgument("Default MaxPoolinGradOp only supports NHWC ",
+        errors::InvalidArgument("Default MaxPoolingGradOp only supports NHWC ",
                                 "on device type ",
                                 DeviceTypeString(context->device_type())));
     OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
@@ -305,13 +273,6 @@ class MaxPoolingGradOp : public OpKernel {
   TensorFormat data_format_;
 };
 
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPoolGrad").Device(DEVICE_CPU).TypeConstraint<float>("T"),
-    MaxPoolingGradOp<CPUDevice, float>);
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPoolGrad").Device(DEVICE_CPU).TypeConstraint<Eigen::half>("T"),
-    MaxPoolingGradOp<CPUDevice, Eigen::half>);
-
 #ifdef GOOGLE_CUDA
 
 template <typename T>
@@ -329,13 +290,13 @@ static void MaxPoolingBackwardCustomKernel(
     return;
   }
 
-  MaxPoolBackwardNoMask(
+  functor::MaxPoolBackwardNoMask<T>()(
       tensor_in->flat<T>().data(), params.tensor_in_batch,
       params.tensor_in_rows, params.tensor_in_cols, params.depth,
       params.out_height, params.out_width, params.window_rows,
       params.window_cols, params.row_stride, params.col_stride, params.pad_rows,
-      params.pad_cols, out_backprop.flat<T>().data(),
-      output->flat<T>().data(), context->eigen_device<Eigen::GpuDevice>());
+      params.pad_cols, out_backprop.flat<T>().data(), output->flat<T>().data(),
+      context->eigen_device<Eigen::GpuDevice>());
 }
 
 template <class T>
@@ -403,12 +364,252 @@ class MaxPoolingGradOp<Eigen::GpuDevice, T> : public OpKernel {
   bool use_dnn_;
 };
 
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPoolGrad").Device(DEVICE_GPU).TypeConstraint<float>("T"),
-    MaxPoolingGradOp<Eigen::GpuDevice, float>);
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPoolGrad").Device(DEVICE_GPU).TypeConstraint<Eigen::half>("T"),
-    MaxPoolingGradOp<Eigen::GpuDevice, Eigen::half>);
+#endif  // GOOGLE_CUDA
+
+// The operation to compute gradient of MaxPool gradients.
+// It takes three inputs:
+//   - The original input tensor
+//   - The original output tensor
+//   - Backprop tensor for output gradients
+// It produces one output: backprop tensor for output gradient.
+template <class Device, class T>
+class MaxPoolingGradGradOp : public OpKernel {
+ public:
+  explicit MaxPoolingGradGradOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string data_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES(
+        context, data_format_ == FORMAT_NHWC,
+        errors::InvalidArgument(
+            "Default MaxPoolingGradGradOp only supports NHWC ",
+            "on device type ", DeviceTypeString(context->device_type())));
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 4,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 4,
+                errors::InvalidArgument("Sliding window strides field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    OP_REQUIRES(context, ksize_[0] == 1 && stride_[0] == 1,
+                errors::Unimplemented(
+                    "Pooling is not yet supported on the batch dimension."));
+    OP_REQUIRES(
+        context, ksize_[3] == 1 && stride_[3] == 1,
+        errors::Unimplemented(
+            "MaxPoolingGradGrad is not yet supported on the depth dimension."));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& tensor_in = context->input(0);
+    const Tensor& tensor_out = context->input(1);
+    const Tensor& out_grad_backprop = context->input(2);
+
+    // For maxpooling, tensor_in should have 4 dimensions.
+    OP_REQUIRES(context, tensor_in.dims() == 4,
+                errors::InvalidArgument("tensor_in must be 4-dimensional"));
+    OP_REQUIRES(context, tensor_out.dims() == 4,
+                errors::InvalidArgument("tensor_out must be 4-dimensional"));
+    // For maxpooling, out_grad_backprop should have 4 dimensions.
+    OP_REQUIRES(
+        context, out_grad_backprop.dims() == 4,
+        errors::InvalidArgument("out_grad_backprop must be 4-dimensional"));
+
+    PoolParameters params{context,  ksize_,      stride_,
+                          padding_, FORMAT_NHWC, tensor_in.shape()};
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(context, context->forward_input_or_allocate_output(
+                                {2}, 0, tensor_out.shape(), &output));
+
+    SpatialMaxPoolGradGrad(context, output, tensor_in, tensor_out,
+                           out_grad_backprop, params, padding_);
+  }
+
+ private:
+  void SpatialMaxPoolGradGrad(OpKernelContext* context, Tensor* bottom_diff,
+                              const Tensor& tensor_in, const Tensor& tensor_out,
+                              const Tensor& top_diff,
+                              const PoolParameters& params,
+                              const Padding& padding) {
+    typedef Eigen::Map<const Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>>
+        ConstEigenMatrixMap;
+    typedef Eigen::Map<Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>>
+        EigenMatrixMap;
+
+    ConstEigenMatrixMap in_mat(
+        tensor_in.flat<T>().data(), params.depth,
+        params.tensor_in_cols * params.tensor_in_rows * params.tensor_in_batch);
+    ConstEigenMatrixMap out_mat(
+        tensor_out.flat<T>().data(), params.depth,
+        params.out_width * params.out_height * params.tensor_in_batch);
+    ConstEigenMatrixMap top_diff_mat(
+        top_diff.flat<T>().data(), params.depth,
+        params.tensor_in_cols * params.tensor_in_rows * params.tensor_in_batch);
+    EigenMatrixMap bottom_diff_mat(
+        bottom_diff->flat<T>().data(), params.depth,
+        params.out_width * params.out_height * params.tensor_in_batch);
+
+    const DeviceBase::CpuWorkerThreads& worker_threads =
+        *(context->device()->tensorflow_cpu_worker_threads());
+
+    // The following code basically does the following:
+    // 1. Flattens the input, output, top_diff and bottom_diff tensors into
+    //    two dimensional arrays.
+    //    tensor_in_as_matrix:
+    //      depth by (tensor_in_cols * tensor_in_rows * tensor_in_batch)
+    //    tensor_out_as_matrix:
+    //      depth by (out_width * out_height * tensor_in_batch)
+    //    top_diff_as_matrix:
+    //      depth by (tensor_in_cols * tensor_in_rows * tensor_in_batch)
+    //    bottom_diff_as_matrix:
+    //      depth by (out_width * out_height * tensor_in_batch)
+    //
+    // 2. Walks through the set of columns in the flattened
+    //    tensor_in_as_matrix, tensor_out_as_matrix, top_diff_as_matrix
+    //    and updates the column(s) corresponding to the maximum values in
+    //    tensor_out_as_matrix with the corresponding values in
+    //    top_diff_as_matrix.
+    auto shard = [&params, &in_mat, &out_mat, &top_diff_mat, &bottom_diff_mat](
+                     int64 start, int64 limit) {
+      const int32 depth = params.depth;
+      const int32 in_rows = params.tensor_in_rows;
+      const int32 in_cols = params.tensor_in_cols;
+      const int32 pad_rows = params.pad_rows;
+      const int32 pad_cols = params.pad_cols;
+      const int32 window_rows = params.window_rows;
+      const int32 window_cols = params.window_cols;
+      const int32 row_stride = params.row_stride;
+      const int32 col_stride = params.col_stride;
+      const int32 out_height = params.out_height;
+      const int32 out_width = params.out_width;
+
+      {
+        // Initializes the output grad backprop tensor with 0.
+        const int32 output_image_size = out_height * out_width * params.depth;
+        EigenMatrixMap bottom_diff_shard(
+            bottom_diff_mat.data() + start * output_image_size, 1,
+            (limit - start) * output_image_size);
+        bottom_diff_shard.setZero();
+      }
+
+      for (int b = start; b < limit; ++b) {
+        for (int ph = 0; ph < out_height; ++ph) {
+          for (int pw = 0; pw < out_width; ++pw) {
+            // (h_start, h_end) * (w_start, w_end) is the range that the input
+            // vector projects to.
+            int h_start = ph * row_stride - pad_rows;
+            const int h_end = std::min(h_start + window_rows, in_rows);
+            int w_start = pw * col_stride - pad_cols;
+            const int w_end = std::min(w_start + window_cols, in_cols);
+            h_start = std::max(h_start, 0);
+            w_start = std::max(w_start, 0);
+            const int out_index = (b * out_height + ph) * out_width + pw;
+            // Find value corresponding to the input maximum in top_diff.
+            for (int d = 0; d < depth; ++d) {
+              const T& output_ref = out_mat.coeffRef(d, out_index);
+              bool should_stop = false;
+              for (int h = h_start; h < h_end && !should_stop; ++h) {
+                for (int w = w_start; w < w_end && !should_stop; ++w) {
+                  const int in_index = (b * in_rows + h) * in_cols + w;
+                  const T& input_ref = in_mat.coeffRef(d, in_index);
+                  if (output_ref == input_ref) {
+                    T& bottom_diff_ref = bottom_diff_mat.coeffRef(d, out_index);
+                    bottom_diff_ref = top_diff_mat.coeffRef(d, in_index);
+                    should_stop = true;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+
+    const int64 shard_cost = params.out_width * params.out_height *
+                             params.depth * params.window_rows *
+                             params.window_cols;
+    Shard(worker_threads.num_threads, worker_threads.workers,
+          params.tensor_in_batch, shard_cost, shard);
+  }
+
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+  TensorFormat data_format_;
+};
+
+#ifdef GOOGLE_CUDA
+
+template <class T>
+class MaxPoolingGradGradOp<Eigen::GpuDevice, T> : public OpKernel {
+ public:
+  typedef Eigen::GpuDevice Device;
+
+  explicit MaxPoolingGradGradOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string data_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 4,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 4,
+                errors::InvalidArgument("Sliding window strides field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    const int32 ksize_n = GetTensorDim(ksize_, data_format_, 'N');
+    const int32 stride_n = GetTensorDim(stride_, data_format_, 'N');
+    OP_REQUIRES(context, ksize_n == 1 && stride_n == 1,
+                errors::Unimplemented(
+                    "Pooling is not yet supported on the batch dimension."));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& tensor_in = context->input(0);
+    const Tensor& tensor_out = context->input(1);
+    const Tensor& out_grad_backprop = context->input(2);
+
+    // For maxpooling, tensor_in should have 4 dimensions.
+    OP_REQUIRES(context, tensor_in.dims() == 4,
+                errors::InvalidArgument("tensor_in must be 4-dimensional 4"));
+    OP_REQUIRES(context, tensor_out.dims() == 4,
+                errors::InvalidArgument("tensor_out must be 4-dimensional"));
+    // For maxpooling, out_grad_backprop should have 4 dimensions.
+    OP_REQUIRES(
+        context, out_grad_backprop.dims() == 4,
+        errors::InvalidArgument("out_grad_backprop must be 4-dimensional"));
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(context, context->forward_input_or_allocate_output(
+                                {2}, 0, tensor_out.shape(), &output));
+
+    PoolParameters params{context,  ksize_,       stride_,
+                          padding_, data_format_, tensor_in.shape()};
+
+    functor::MaxPoolGradBackwardNoMask<T>()(
+        data_format_, tensor_in.flat<T>().data(), tensor_out.flat<T>().data(),
+        params.tensor_in_batch, params.out_height, params.out_width,
+        params.depth, params.tensor_in_rows, params.tensor_in_cols,
+        params.window_rows, params.window_cols, params.row_stride,
+        params.col_stride, params.pad_rows, params.pad_cols,
+        out_grad_backprop.flat<T>().data(), output->flat<T>().data(),
+        context->eigen_device<Eigen::GpuDevice>());
+  }
+
+ private:
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+  TensorFormat data_format_;
+  bool use_dnn_;
+};
 
 #endif  // GOOGLE_CUDA
 
@@ -565,6 +766,56 @@ class MaxPoolingGradWithArgmaxOp : public OpKernel {
   Padding padding_;
 };
 
+template <typename Device, typename T>
+struct LaunchMaxPoolingGradGradWithArgmax;
+
+template <typename Device, typename T>
+class MaxPoolingGradGradWithArgmaxOp : public OpKernel {
+ public:
+  explicit MaxPoolingGradGradWithArgmaxOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 4,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 4,
+                errors::InvalidArgument("Sliding window stride field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    OP_REQUIRES(context, ksize_[0] == 1 && stride_[0] == 1,
+                errors::Unimplemented(
+                    "Pooling is not yet supported on the batch dimension."));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& tensor_in = context->input(0);
+    const Tensor& grad_in = context->input(1);
+    const Tensor& argmax = context->input(2);
+
+    PoolParameters params{context,  ksize_,      stride_,
+                          padding_, FORMAT_NHWC, tensor_in.shape()};
+    if (!context->status().ok()) {
+      return;
+    }
+
+    TensorShape out_shape({params.tensor_in_batch, params.out_height,
+                           params.out_width, params.depth});
+
+    Tensor* grad_out = nullptr;
+    OP_REQUIRES_OK(context, context->forward_input_or_allocate_output(
+                                {1}, 0, out_shape, &grad_out));
+
+    LaunchMaxPoolingGradGradWithArgmax<Device, T>::launch(
+        context, params, grad_in, argmax, grad_out);
+  }
+
+ private:
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+};
+
 #if GOOGLE_CUDA
 template <typename T>
 class MaxPoolingNoMaskOp<GPUDevice, T> : public OpKernel {
@@ -631,7 +882,7 @@ template <typename T>
 struct LaunchMaxPoolingNoMask<Eigen::GpuDevice, T> {
   static void launch(OpKernelContext* context, const PoolParameters& params,
                      const Tensor& input, Tensor* output) {
-    bool status = MaxPoolForwardWithOptionalArgmax(
+    bool status = functor::MaxPoolForwardWithOptionalArgmax<T>()(
         input.flat<T>().data(), params.tensor_in_batch, params.tensor_in_rows,
         params.tensor_in_cols, params.depth, params.out_height,
         params.out_width, params.window_rows, params.window_cols,
@@ -644,18 +895,11 @@ struct LaunchMaxPoolingNoMask<Eigen::GpuDevice, T> {
   }
 };
 
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool").Device(DEVICE_GPU).TypeConstraint<float>("T"),
-    MaxPoolingNoMaskOp<Eigen::GpuDevice, float>);
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool").Device(DEVICE_GPU).TypeConstraint<Eigen::half>("T"),
-    MaxPoolingNoMaskOp<Eigen::GpuDevice, Eigen::half>);
-
 template <typename T>
 struct LaunchMaxPoolingWithArgmax<Eigen::GpuDevice, T> {
   static void launch(OpKernelContext* context, const PoolParameters& params,
                      const Tensor& input, Tensor* output, Tensor* argmax) {
-    bool status = MaxPoolForwardWithOptionalArgmax(
+    bool status = functor::MaxPoolForwardWithOptionalArgmax<T>()(
         input.flat<T>().data(), params.tensor_in_batch, params.tensor_in_rows,
         params.tensor_in_cols, params.depth, params.out_height,
         params.out_width, params.window_rows, params.window_cols,
@@ -670,17 +914,6 @@ struct LaunchMaxPoolingWithArgmax<Eigen::GpuDevice, T> {
   }
 };
 
-REGISTER_KERNEL_BUILDER(Name("MaxPoolWithArgmax")
-                            .Device(DEVICE_GPU)
-                            .TypeConstraint<int64>("Targmax")
-                            .TypeConstraint<float>("T"),
-                        MaxPoolingWithArgmaxOp<Eigen::GpuDevice, float>);
-REGISTER_KERNEL_BUILDER(Name("MaxPoolWithArgmax")
-                            .Device(DEVICE_GPU)
-                            .TypeConstraint<int64>("Targmax")
-                            .TypeConstraint<Eigen::half>("T"),
-                        MaxPoolingWithArgmaxOp<Eigen::GpuDevice, Eigen::half>);
-
 template <typename T>
 struct LaunchMaxPoolingGradWithArgmax<Eigen::GpuDevice, T> {
   static void launch(OpKernelContext* context, const PoolParameters& params,
@@ -693,30 +926,118 @@ struct LaunchMaxPoolingGradWithArgmax<Eigen::GpuDevice, T> {
     const int top_offset = params.out_height * params.out_width * params.depth;
     const int bottom_offset =
         params.tensor_in_rows * params.tensor_in_cols * params.depth;
-    bool status = MaxPoolBackwardWithArgmax(
+    bool status = functor::MaxPoolBackwardWithArgmax<T>()(
         output_size, input_size, grad_in.flat<T>().data(),
         reinterpret_cast<const int64*>(argmax.flat<int64>().data()), top_offset,
         bottom_offset, grad_out->flat<T>().data(), context->eigen_gpu_device());
     if (!status) {
       context->SetStatus(
-          errors::Internal("Failed launching MaxPoolForwardWithArgmax"));
+          errors::Internal("Failed launching MaxPoolBackwardWithArgmax"));
     }
   }
 };
 
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPoolGradWithArgmax")
-        .Device(DEVICE_GPU)
-        .TypeConstraint<float>("T")
-        .TypeConstraint<int64>("Targmax"),
-    MaxPoolingGradWithArgmaxOp<Eigen::GpuDevice, float>);
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPoolGradWithArgmax")
-        .Device(DEVICE_GPU)
-        .TypeConstraint<Eigen::half>("T")
-        .TypeConstraint<int64>("Targmax"),
-    MaxPoolingGradWithArgmaxOp<Eigen::GpuDevice, Eigen::half>);
+template <typename T>
+struct LaunchMaxPoolingGradGradWithArgmax<Eigen::GpuDevice, T> {
+  static void launch(OpKernelContext* context, const PoolParameters& params,
+                     const Tensor& grad_in, const Tensor& argmax,
+                     Tensor* grad_out) {
+    const int input_size = params.tensor_in_batch * params.tensor_in_rows *
+                           params.tensor_in_cols * params.depth;
+    const int output_size = params.tensor_in_batch * params.out_height *
+                            params.out_width * params.depth;
+    const int top_offset =
+        params.tensor_in_rows * params.tensor_in_cols * params.depth;
+    const int bottom_offset =
+        params.out_width * params.out_height * params.depth;
+    bool status = functor::MaxPoolGradBackwardWithArgmax<T>()(
+        output_size, input_size, grad_in.flat<T>().data(),
+        reinterpret_cast<const int64*>(argmax.flat<int64>().data()), top_offset,
+        bottom_offset, grad_out->flat<T>().data(), context->eigen_gpu_device());
+    if (!status) {
+      context->SetStatus(
+          errors::Internal("Failed launching MaxPoolGradBackwardWithArgmax"));
+    }
+  }
+};
 
 #endif  // GOOGLE_CUDA
 
+#define REGISTER_MAX_POOL_KERNELS(D, T)                                  \
+  REGISTER_KERNEL_BUILDER(                                               \
+      Name("MaxPoolGrad").Device(DEVICE_##D).TypeConstraint<T>("T"),     \
+      MaxPoolingGradOp<D##Device, T>);                                   \
+  REGISTER_KERNEL_BUILDER(                                               \
+      Name("MaxPoolGradGrad").Device(DEVICE_##D).TypeConstraint<T>("T"), \
+      MaxPoolingGradGradOp<D##Device, T>);
+
+// Below kernels implemented only for CPU device.
+#define REGISTER_CPU_ONLY_POOL_KERNELS(T)                        \
+  REGISTER_KERNEL_BUILDER(                                       \
+      Name("MaxPool").Device(DEVICE_CPU).TypeConstraint<T>("T"), \
+      MaxPoolingOp<CPUDevice, T>);
+TF_CALL_REAL_NUMBER_TYPES(REGISTER_CPU_ONLY_POOL_KERNELS);
+#undef REGISTER_CPU_ONLY_POOL_KERNELS
+
+#define REGISTER_CPU_MAX_POOL_KERNELS(T) REGISTER_MAX_POOL_KERNELS(CPU, T);
+TF_CALL_REAL_NUMBER_TYPES(REGISTER_CPU_MAX_POOL_KERNELS);
+#undef REGISTER_CPU_KERNELS
+
+#if GOOGLE_CUDA
+
+// Forward declarations for the functor specializations for GPU.
+namespace functor {
+#define DECLARE_GPU_SPEC(T)                                            \
+  template <>                                                          \
+  void SpatialMaxPooling<Eigen::GpuDevice, T>::operator()(             \
+      const Eigen::GpuDevice& d, typename TTypes<T, 4>::Tensor output, \
+      typename TTypes<T, 4>::ConstTensor input, int window_rows,       \
+      int window_cols, int row_stride, int col_stride,                 \
+      const Eigen::PaddingType& padding);                              \
+  extern template struct SpatialMaxPooling<Eigen::GpuDevice, T>;
+
+TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPEC);
+#undef DECLARE_GPU_SPEC
+}  // namespace functor
+
+#define REGISTER_GPU_MAX_POOL_KERNELS(T) REGISTER_MAX_POOL_KERNELS(GPU, T)
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_MAX_POOL_KERNELS);
+#undef REGISTER_GPU_MAX_POOL_KERNELS
+
+// Below kernels currently implemented only for GPU device.
+// Note(jiayq): Currently, the Caffe custom implementation is faster than the
+// default Eigen implementation so we are using the custom kernel as the
+// default. However, you can explicitly invoke the eigen version using
+// kernel_label_map.
+#define REGISTER_GPU_ONLY_POOL_KERNELS(T)                            \
+  REGISTER_KERNEL_BUILDER(Name("MaxPool")                            \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<T>("T")                \
+                              .Label("eigen_tensor"),                \
+                          MaxPoolingOp<GPUDevice, T>);               \
+  REGISTER_KERNEL_BUILDER(                                           \
+      Name("MaxPool").Device(DEVICE_GPU).TypeConstraint<T>("T"),     \
+      MaxPoolingNoMaskOp<GPUDevice, T>);                             \
+  REGISTER_KERNEL_BUILDER(Name("MaxPoolWithArgmax")                  \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<int64>("Targmax")      \
+                              .TypeConstraint<T>("T"),               \
+                          MaxPoolingWithArgmaxOp<GPUDevice, T>);     \
+  REGISTER_KERNEL_BUILDER(Name("MaxPoolGradWithArgmax")              \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<T>("T")                \
+                              .TypeConstraint<int64>("Targmax"),     \
+                          MaxPoolingGradWithArgmaxOp<GPUDevice, T>); \
+  REGISTER_KERNEL_BUILDER(Name("MaxPoolGradGradWithArgmax")          \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<T>("T")                \
+                              .TypeConstraint<int64>("Targmax"),     \
+                          MaxPoolingGradGradWithArgmaxOp<GPUDevice, T>);
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_ONLY_POOL_KERNELS);
+#undef REGISTER_GPU_ONLY_POOL_KERNELS
+
+#endif  // GOOGLE_CUDA
+
+#undef REGISTER_MAX_POOL_KERNELS
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
index 91b50b1e11..0c638ca233 100644
--- a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
@@ -199,32 +199,145 @@ __global__ void MaxPoolBackward(const int nthreads, const dtype* top_diff,
   }
 }
 
-#undef CUDA_1D_KERNEL_LOOP
-}  // namespace
+// The parameters to the kernels in the gradient gradient function is as
+// follows:
+//     nthreads: the number of threads, which is equal to the output size. The
+//         gradient of the MaxPooling gradient w.r.t. the output data has a
+//         dimensions of N*C*Hout*Wout
+//     bottom_data: the bottom data of N*H*W*C (or N*C*H*W) items.
+//     output_data: the output data of N*Hout*Wout*C (or N*C*Hout*Wout) items.
+//     height, width, pooled_height, pooled_width: the input and output sizes.
+//     kernel_h, kernel_w: the kernel sizes.
+//     stride_h, stride_w: the strides.
+//     pad_t, pad_l: the padding values on the top and left side.
+//     top_diff: the gradient of the gradient of the output data w.r.t. the
+//         input data, of size N*H*W*C (or N*C*H*W).
+//     bottom_diff: the gradient of the gradient w.r.t. output.
+template <typename dtype>
+__global__ void MaxPoolGradBackwardNoMaskNCHW(
+    const int nthreads, const dtype* bottom_data, const dtype* output_data,
+    const int pooled_height, const int pooled_width, const int channels,
+    const int height, const int width, const int kernel_h, const int kernel_w,
+    const int stride_h, const int stride_w, const int pad_t, const int pad_l,
+    const dtype* top_diff, dtype* bottom_diff) {
+  CUDA_1D_KERNEL_LOOP(index, nthreads) {
+    // First find out the index to the maximum, since we have no mask.
+    int pw = index % pooled_width;
+    int ph = (index / pooled_width) % pooled_height;
+    int c = (index / pooled_width / pooled_height) % channels;
+    int n = index / pooled_width / pooled_height / channels;
+    int hstart = ph * stride_h - pad_t;
+    int wstart = pw * stride_w - pad_l;
+    const int hend = min(hstart + kernel_h, height);
+    const int wend = min(wstart + kernel_w, width);
+    hstart = max(hstart, 0);
+    wstart = max(wstart, 0);
+    bool should_stop = false;
+    int maxidx = -1;
+    const dtype* bottom_data_n = bottom_data + n * channels * height * width;
+    // Propagate only first value from top_diff corresponding to the maximum.
+    for (int h = hstart; h < hend && !should_stop; ++h) {
+      for (int w = wstart; w < wend && !should_stop; ++w) {
+        int idx = c * height * width + h * width + w;
+        if (output_data[index] == bottom_data_n[idx]) {
+          maxidx = idx;
+          should_stop = true;
+        }
+      }
+    }
+    // Set the bottom diff (atomic is not necessary). The index could still be
+    // uninitialized, if all the bottom_data are NaN.
+    if (maxidx != -1) {
+      bottom_diff[index] = top_diff[n * channels * height * width + maxidx];
+    }
+  }
+}
 
-bool MaxPoolForwardWithOptionalArgmax(
-    const float* bottom_data, const int batch, const int height,
-    const int width, const int channels, const int pooled_height,
-    const int pooled_width, const int kernel_h, const int kernel_w,
+template <typename dtype>
+__global__ void MaxPoolGradBackwardNoMaskNHWC(
+    const int nthreads, const dtype* bottom_data, const dtype* output_data,
+    const int pooled_height, const int pooled_width, const int channels,
+    const int height, const int width, const int kernel_h, const int kernel_w,
     const int stride_h, const int stride_w, const int pad_t, const int pad_l,
-    float* top_data, int64* mask, const Eigen::GpuDevice& d) {
-  const int kThreadsPerBlock = 1024;
-  const int output_size = batch * channels * pooled_height * pooled_width;
+    const dtype* top_diff, dtype* bottom_diff) {
+  CUDA_1D_KERNEL_LOOP(index, nthreads) {
+    // First find out the index to the maximum, since we have no mask.
+    int n = index;
+    int c = n % channels;
+    n /= channels;
+    int wstart = (n % pooled_width) * stride_w - pad_l;
+    n /= pooled_width;
+    int hstart = (n % pooled_height) * stride_h - pad_t;
+    n /= pooled_height;
+    int hend = min(hstart + kernel_h, height);
+    int wend = min(wstart + kernel_w, width);
+    hstart = max(hstart, 0);
+    wstart = max(wstart, 0);
+    bool should_stop = false;
+    int maxidx = -1;
+    const dtype* bottom_data_n = bottom_data + n * height * width * channels;
+    // Propagate only first value from top_diff corresponding to the maximum.
+    for (int h = hstart; h < hend && !should_stop; ++h) {
+      for (int w = wstart; w < wend && !should_stop; ++w) {
+        int idx = (h * width + w) * channels + c;
+        if (output_data[index] == bottom_data_n[idx]) {
+          maxidx = idx;
+          should_stop = true;
+        }
+      }
+    }
+    // Set the bottom diff (atomic is not necessary). The index could still be
+    // uninitialized, if all the bottom_data are NaN.
+    if (maxidx != -1) {
+      bottom_diff[index] = top_diff[n * height * width * channels + maxidx];
+    }
+  }
+}
 
-  MaxPoolForwardNHWC<<<(output_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
-                       kThreadsPerBlock, 0, d.stream()>>>(
-      output_size, bottom_data, height, width, channels, pooled_height,
-      pooled_width, kernel_h, kernel_w, stride_h, stride_w, pad_t, pad_l,
-      top_data, mask);
-  return d.ok();
+// The parameters to the kernels in the gradient gradient function is as
+// follows:
+//     nthreads: the number of threads, which is equal to the output size. The
+//         gradient of the MaxPooling gradient w.r.t. the output data has a
+//         dimensions of N*C*Hout*Wout
+//     top_diff: the gradient of the gradient of the output data w.r.t. the
+//         input data, of size N*H*W*C (or N*C*H*W). As we have stored the
+//         flattened index of the input entries, the backward function is
+//         agnostic of the input storage order.
+//     mask: the output mask of the same size as top_data. It is stored in
+//         int form, keeping track of the flattened index of the input item that
+//         produces the max output.
+//     top_offset: the pre-computed per-image offset of the maxpool input
+//         gradient. This is equal to H*W*C. We choose to pre-compute this so we
+//         do not  need to compute it every time inside the kernel.
+//     bottom_offset: the pre-computed per-image offset of the maxpool output.
+//         This is equal to Hout*Wout*C.
+//     bottom_diff: the gradient of the gradient w.r.t. output.
+// This function relies on CudaAtomicAdd to avoid race conditions. Also, before
+// the kernel is run, you will need to make sure that bottom_diff is filled with
+// zero first.
+template <typename dtype>
+__global__ void MaxPoolGradBackward(const int nthreads, const dtype* top_diff,
+                                    const int64* mask, const int top_offset,
+                                    const int bottom_offset,
+                                    dtype* bottom_diff) {
+  CUDA_1D_KERNEL_LOOP(index, nthreads) {
+    int image_id = (index / bottom_offset);
+    bottom_diff[index] = top_diff[image_id * top_offset + mask[index]];
+  }
 }
 
-bool MaxPoolForwardWithOptionalArgmax(
-    const Eigen::half* bottom_data, const int batch, const int height,
-    const int width, const int channels, const int pooled_height,
-    const int pooled_width, const int kernel_h, const int kernel_w,
-    const int stride_h, const int stride_w, const int pad_t, const int pad_l,
-    Eigen::half* top_data, int64* mask, const Eigen::GpuDevice& d) {
+#undef CUDA_1D_KERNEL_LOOP
+}  // namespace
+
+namespace functor {
+
+template <typename T>
+bool MaxPoolForwardWithOptionalArgmax<T>::operator()(
+    const T* bottom_data, const int batch, const int height, const int width,
+    const int channels, const int pooled_height, const int pooled_width,
+    const int kernel_h, const int kernel_w, const int stride_h,
+    const int stride_w, const int pad_t, const int pad_l, T* top_data,
+    int64* mask, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
   const int output_size = batch * channels * pooled_height * pooled_width;
 
@@ -236,14 +349,13 @@ bool MaxPoolForwardWithOptionalArgmax(
   return d.ok();
 }
 
-bool MaxPoolBackwardNoMask(const float* bottom_data, const int batch,
-                           const int height, const int width,
-                           const int channels, const int pooled_height,
-                           const int pooled_width, const int kernel_h,
-                           const int kernel_w, const int stride_h,
-                           const int stride_w, const int pad_t, const int pad_l,
-                           const float* top_diff, float* bottom_diff,
-                           const Eigen::GpuDevice& d) {
+template <typename T>
+bool MaxPoolBackwardNoMask<T>::operator()(
+    const T* bottom_data, const int batch, const int height, const int width,
+    const int channels, const int pooled_height, const int pooled_width,
+    const int kernel_h, const int kernel_w, const int stride_h,
+    const int stride_w, const int pad_t, const int pad_l, const T* top_diff,
+    T* bottom_diff, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
   const int bottom_size = batch * channels * height * width;
   const int top_size = batch * channels * pooled_height * pooled_width;
@@ -260,34 +372,11 @@ bool MaxPoolBackwardNoMask(const float* bottom_data, const int batch,
   return d.ok();
 }
 
-bool MaxPoolBackwardNoMask(const Eigen::half* bottom_data, const int batch,
-                           const int height, const int width,
-                           const int channels, const int pooled_height,
-                           const int pooled_width, const int kernel_h,
-                           const int kernel_w, const int stride_h,
-                           const int stride_w, const int pad_t, const int pad_l,
-                           const Eigen::half* top_diff, Eigen::half* bottom_diff,
-                           const Eigen::GpuDevice& d) {
-  const int kThreadsPerBlock = 1024;
-  const int bottom_size = batch * channels * height * width;
-  const int top_size = batch * channels * pooled_height * pooled_width;
-
-  SetZero<<<(bottom_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
-            kThreadsPerBlock, 0, d.stream()>>>(bottom_size, bottom_diff);
-
-  MaxPoolBackwardNoMaskNHWC<<<(top_size + kThreadsPerBlock - 1) /
-                                  kThreadsPerBlock,
-                              kThreadsPerBlock, 0, d.stream()>>>(
-      top_size, bottom_data, height, width, channels, pooled_height,
-      pooled_width, kernel_h, kernel_w, stride_h, stride_w, pad_t, pad_l,
-      top_diff, bottom_diff);
-  return d.ok();
-}
-
-bool MaxPoolBackwardWithArgmax(const int output_size, const int input_size,
-                               const float* top_diff, const int64* mask,
-                               const int top_offset, const int bottom_offset,
-                               float* bottom_diff, const Eigen::GpuDevice& d) {
+template <typename T>
+bool MaxPoolBackwardWithArgmax<T>::operator()(
+    const int output_size, const int input_size, const T* top_diff,
+    const int64* mask, const int top_offset, const int bottom_offset,
+    T* bottom_diff, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
   SetZero<<<(input_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
             kThreadsPerBlock, 0, d.stream()>>>(input_size, bottom_diff);
@@ -297,30 +386,61 @@ bool MaxPoolBackwardWithArgmax(const int output_size, const int input_size,
   return d.ok();
 }
 
-bool MaxPoolBackwardWithArgmax(const int output_size, const int input_size,
-                               const Eigen::half* top_diff, const int64* mask,
-                               const int top_offset, const int bottom_offset,
-                               Eigen::half* bottom_diff,
-                               const Eigen::GpuDevice& d) {
-  const int kThreadsPerBlock = 1024;
-  SetZero<<<(input_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
-            kThreadsPerBlock, 0, d.stream()>>>(input_size, bottom_diff);
-  MaxPoolBackward<<<(output_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
-                    kThreadsPerBlock, 0, d.stream()>>>(
-      output_size, top_diff, mask, top_offset, bottom_offset, bottom_diff);
+template <typename T>
+bool MaxPoolGradBackwardNoMask<T>::operator()(
+    TensorFormat data_format, const T* bottom_data, const T* output_data,
+    const int batch, const int pooled_height, const int pooled_width,
+    const int channels, const int height, const int width, const int kernel_h,
+    const int kernel_w, const int stride_h, const int stride_w, const int pad_t,
+    const int pad_l, const T* top_diff, T* bottom_diff,
+    const Eigen::GpuDevice& d) {
+  const int num_kernels = batch * channels * pooled_height * pooled_width;
+  CudaLaunchConfig config = GetCudaLaunchConfig(num_kernels, d);
+
+  if (data_format == FORMAT_NHWC) {
+    MaxPoolGradBackwardNoMaskNHWC<<<config.block_count, config.thread_per_block,
+                                    0, d.stream()>>>(
+        num_kernels, bottom_data, output_data, pooled_height, pooled_width,
+        channels, height, width, kernel_h, kernel_w, stride_h, stride_w, pad_t,
+        pad_l, top_diff, bottom_diff);
+  } else {
+    MaxPoolGradBackwardNoMaskNCHW<<<config.block_count, config.thread_per_block,
+                                    0, d.stream()>>>(
+        num_kernels, bottom_data, output_data, pooled_height, pooled_width,
+        channels, height, width, kernel_h, kernel_w, stride_h, stride_w, pad_t,
+        pad_l, top_diff, bottom_diff);
+  }
+  return d.ok();
+}
+
+template <typename T>
+bool MaxPoolGradBackwardWithArgmax<T>::operator()(
+    const int output_size, const int input_size, const T* top_diff,
+    const int64* mask, const int top_offset, const int bottom_offset,
+    T* bottom_diff, const Eigen::GpuDevice& d) {
+  CudaLaunchConfig config = GetCudaLaunchConfig(output_size, d);
+  MaxPoolGradBackward<<<config.block_count, config.thread_per_block, 0,
+                        d.stream()>>>(output_size, top_diff, mask, top_offset,
+                                      bottom_offset, bottom_diff);
   return d.ok();
 }
 
 typedef Eigen::GpuDevice GPUDevice;
 
-#define DEFINE_GPU_KERNELS(T) \
-  template struct functor::SpatialMaxPooling<GPUDevice, T>;
+#define DEFINE_GPU_KERNELS(T)                          \
+  template struct SpatialMaxPooling<GPUDevice, T>;     \
+  template struct MaxPoolForwardWithOptionalArgmax<T>; \
+  template struct MaxPoolBackwardWithArgmax<T>;        \
+  template struct MaxPoolBackwardNoMask<T>;            \
+  template struct MaxPoolGradBackwardWithArgmax<T>;    \
+  template struct MaxPoolGradBackwardNoMask<T>;
 
-DEFINE_GPU_KERNELS(float)
-DEFINE_GPU_KERNELS(Eigen::half)
+TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_KERNELS);
 
 #undef DEFINE_GPU_KERNELS
 
+}  // namespace functor
+
 }  // end namespace tensorflow
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.h b/tensorflow/core/kernels/maxpooling_op_gpu.h
index d1c73a372e..d2029f5719 100644
--- a/tensorflow/core/kernels/maxpooling_op_gpu.h
+++ b/tensorflow/core/kernels/maxpooling_op_gpu.h
@@ -24,54 +24,62 @@ limitations under the License.
 
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/util/tensor_format.h"
 
 namespace tensorflow {
 
+namespace functor {
 // Run the forward pass of max pooling, optionally writing the argmax indices to
 // the mask array, if it is not nullptr. If mask is passed in as nullptr, the
 // argmax indices are not written.
-bool MaxPoolForwardWithOptionalArgmax(
-    const float* bottom_data, const int batch, const int height,
-    const int width, const int channels, const int pooled_height,
-    const int pooled_width, const int kernel_h, const int kernel_w,
-    const int stride_h, const int stride_w, const int pad_t, const int pad_l,
-    float* top_data, int64* mask, const Eigen::GpuDevice& d);
-
-bool MaxPoolForwardWithOptionalArgmax(
-    const Eigen::half* bottom_data, const int batch, const int height,
-    const int width, const int channels, const int pooled_height,
-    const int pooled_width, const int kernel_h, const int kernel_w,
-    const int stride_h, const int stride_w, const int pad_t, const int pad_l,
-    Eigen::half* top_data, int64* mask, const Eigen::GpuDevice& d);
-
-bool MaxPoolBackwardWithArgmax(const int output_size, const int input_size,
-                               const float* top_diff, const int64* mask,
-                               const int top_offset, const int bottom_offset,
-                               float* bottom_diff, const Eigen::GpuDevice& d);
-
-bool MaxPoolBackwardWithArgmax(const int output_size, const int input_size,
-                               const Eigen::half* top_diff, const int64* mask,
-                               const int top_offset, const int bottom_offset,
-                               Eigen::half* bottom_diff,
-                               const Eigen::GpuDevice& d);
-
-bool MaxPoolBackwardNoMask(const float* bottom_data, const int batch,
-                           const int height, const int width,
-                           const int channels, const int pooled_height,
-                           const int pooled_width, const int kernel_h,
-                           const int kernel_w, const int stride_h,
-                           const int stride_w, const int pad_t, const int pad_l,
-                           const float* top_diff, float* bottom_diff,
-                           const Eigen::GpuDevice& d);
-
-bool MaxPoolBackwardNoMask(const Eigen::half* bottom_data, const int batch,
-                           const int height, const int width,
-                           const int channels, const int pooled_height,
-                           const int pooled_width, const int kernel_h,
-                           const int kernel_w, const int stride_h,
-                           const int stride_w, const int pad_t, const int pad_l,
-                           const Eigen::half* top_diff, Eigen::half* bottom_diff,
-                           const Eigen::GpuDevice& d);
+template <typename T>
+struct MaxPoolForwardWithOptionalArgmax {
+  bool operator()(const T* bottom_data, const int batch, const int height,
+                  const int width, const int channels, const int pooled_height,
+                  const int pooled_width, const int kernel_h,
+                  const int kernel_w, const int stride_h, const int stride_w,
+                  const int pad_t, const int pad_l, T* top_data, int64* mask,
+                  const Eigen::GpuDevice& d);
+};
+
+template <typename T>
+struct MaxPoolBackwardWithArgmax {
+  bool operator()(const int output_size, const int input_size,
+                  const T* top_diff, const int64* mask, const int top_offset,
+                  const int bottom_offset, T* bottom_diff,
+                  const Eigen::GpuDevice& d);
+};
+
+template <typename T>
+struct MaxPoolBackwardNoMask {
+  bool operator()(const T* bottom_data, const int batch, const int height,
+                  const int width, const int channels, const int pooled_height,
+                  const int pooled_width, const int kernel_h,
+                  const int kernel_w, const int stride_h, const int stride_w,
+                  const int pad_t, const int pad_l, const T* top_diff,
+                  T* bottom_diff, const Eigen::GpuDevice& d);
+};
+
+template <typename T>
+struct MaxPoolGradBackwardWithArgmax {
+  bool operator()(const int output_size, const int input_size,
+                  const T* top_diff, const int64* mask, const int top_offset,
+                  const int bottom_offset, T* bottom_diff,
+                  const Eigen::GpuDevice& d);
+};
+
+template <typename T>
+struct MaxPoolGradBackwardNoMask {
+  bool operator()(TensorFormat data_format, const T* bottom_data,
+                  const T* output_data, const int batch,
+                  const int pooled_height, const int pooled_width,
+                  const int channels, const int height, const int width,
+                  const int kernel_h, const int kernel_w, const int stride_h,
+                  const int stride_w, const int pad_t, const int pad_l,
+                  const T* top_diff, T* bottom_diff, const Eigen::GpuDevice& d);
+};
+
+}  // namespace functor
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
new file mode 100644
index 0000000000..71918fe269
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -0,0 +1,428 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ==============================================================================*/
+
+#ifdef INTEL_MKL
+#define EIGEN_USE_THREADS
+
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/framework/common_shape_fns.h"
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+#include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+template <typename Device, typename T>
+class MklAvgPoolingOp : public UnaryOp<T> {
+ public:
+  explicit MklAvgPoolingOp(OpKernelConstruction* context)
+      : UnaryOp<T>(context) {
+    string data_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 4,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 4,
+                errors::InvalidArgument("Sliding window stride field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    OP_REQUIRES(context, ksize_[0] == 1 && stride_[0] == 1,
+                errors::Unimplemented("Pooling is not yet supported on the "
+                                      "batch dimension."));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklAvgPoolingOpContext mkl_context;
+    const Tensor& tensor_in = MklGetInput(context, 0);
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+
+    if (!input_in_mkl_format)
+      mkl_context.params.in_dim = tensor_in.dims();
+    else
+      mkl_context.params.in_dim = mkl_context.input_shape.GetDimension();
+
+    MklPoolParameters pool_params;
+    if (!input_in_mkl_format) {
+      pool_params.Init(context, ksize_, stride_, padding_, data_format_,
+                       tensor_in.shape());
+    } else {
+      pool_params.Init(context, ksize_, stride_, padding_, data_format_,
+                       &mkl_context.input_shape);
+    }
+
+    // Extract the parameters for the op from the pooling specs
+    ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
+
+    Tensor mkl_tmp_input_buf_tensor_;
+    mkl_context.MklCreateLayoutsAndPrimitives(context,
+                                              &mkl_tmp_input_buf_tensor_);
+
+    Tensor workspace_tensor;
+    void* workspace_buf;
+    AllocTmpBuffer(context, &workspace_tensor, mkl_context.lt_workspace,
+                   &workspace_buf);
+
+    if (mkl_context.convert_input != nullptr) {
+      if (input_in_mkl_format == false) {
+        CHECK_EQ(
+            dnnConversionExecute_F32(
+                mkl_context.convert_input,
+                static_cast<void*>(const_cast<T*>(tensor_in.flat<T>().data())),
+                mkl_context.input_buf),
+            E_SUCCESS);
+        CHECK_EQ(dnnDelete_F32(mkl_context.convert_input), E_SUCCESS);
+      } else {
+        mkl_context.input_shape.GetConvertedFlatData(
+            mkl_context.lt_prim_input,
+            static_cast<void*>(const_cast<T*>(tensor_in.flat<T>().data())),
+            mkl_context.input_buf);
+      }
+      mkl_context.pooling_res[dnnResourceSrc] = mkl_context.input_buf;
+    } else {
+      mkl_context.pooling_res[dnnResourceSrc] =
+          static_cast<void*>(const_cast<T*>(tensor_in.flat<T>().data()));
+    }
+
+    // Declare output tensor and allocate memory
+    Tensor* output = nullptr;
+    TensorShape tensor_out_shape;
+    MklShape mkl_out_shape;
+    mkl_out_shape.SetMklTensor(true);
+    mkl_out_shape.SetMklLayout(mkl_context.prim_pooling_fwd, dnnResourceDst);
+    mkl_out_shape.SetTfLayout(mkl_context.params.in_dim,
+                              mkl_context.params.out_sizes,
+                              mkl_context.params.out_strides);
+    mkl_out_shape.SetTfDimOrder(mkl_context.params.in_dim, data_format_);
+
+    tensor_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                                mkl_out_shape.GetMklLayout())) /
+                            sizeof(T));
+
+    AllocateOutputSetMklshape(context, 0, &output, tensor_out_shape,
+                              mkl_out_shape);
+    mkl_context.pooling_res[dnnResourceDst] =
+        static_cast<void*>(output->flat<T>().data());
+
+    mkl_context.pooling_res[dnnResourceWorkspace] = workspace_buf;
+
+    CHECK_EQ(
+        dnnExecute_F32(mkl_context.prim_pooling_fwd, mkl_context.pooling_res),
+        E_SUCCESS);
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    MklPoolingOpParams params;
+    MklShape input_shape;
+    dnnPrimitive_t prim_pooling_fwd, convert_input;
+    dnnLayout_t lt_user_input, lt_prim_input, lt_workspace;
+    void* input_buf;
+    void* pooling_res[dnnResourceNumber];
+
+    void MklCreateLayoutsAndPrimitives(OpKernelContext* context,
+                                       Tensor* mkl_tmp_input_buf_tensor) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+
+      if (!input_in_mkl_format) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_user_input, params.in_dim,
+                                     params.in_sizes, params.in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_user_input = (dnnLayout_t)input_shape.GetCurLayout();
+      }
+
+      dnnAlgorithm_t algorithm = dnnAlgorithmPoolingAvg;
+      dnnPrimitiveAttributes_t primAttr = nullptr;
+
+      // Create DNN primitives
+      CHECK_EQ(dnnPoolingCreateForward_F32(
+                   &prim_pooling_fwd, primAttr, algorithm, lt_user_input,
+                   params.kernel_size, params.kernel_stride, params.in_offset,
+                   dnnBorderZerosAsymm),
+               E_SUCCESS);
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &lt_prim_input, prim_pooling_fwd, dnnResourceSrc),
+               E_SUCCESS);
+      if (!dnnLayoutCompare_F32(lt_user_input, lt_prim_input)) {
+        CHECK_EQ(dnnConversionCreate_F32(&convert_input, lt_user_input,
+                                         lt_prim_input),
+                 E_SUCCESS);
+
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, lt_prim_input,
+                       &input_buf);
+      }
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_workspace, prim_pooling_fwd,
+                                                dnnResourceWorkspace),
+               E_SUCCESS);
+    }
+
+    void MklCleanup() {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      if (!input_in_mkl_format) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_user_input), E_SUCCESS);
+      }
+
+      CHECK_EQ(dnnDelete_F32(prim_pooling_fwd), E_SUCCESS);
+      CHECK_EQ(dnnLayoutDelete_F32(lt_prim_input), E_SUCCESS);
+    }
+  } MklAvgPoolingOpContext;
+
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+  TensorFormat data_format_;
+};
+
+//-----------------------------------------------------------------------------
+
+template <class Device, class T>
+class MklAvgPoolingGradOp : public OpKernel {
+ public:
+  explicit MklAvgPoolingGradOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string data_format;
+
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 4,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 4,
+                errors::InvalidArgument("Sliding window strides field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    OP_REQUIRES(context, ksize_[0] == 1 && stride_[0] == 1,
+                errors::Unimplemented("Pooling is not yet supported on the "
+                                      "batch dimension."));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklAvgPoolingGradOpContext mkl_context;
+    const Tensor& tensor_in_shape = MklGetInput(context, 0);
+    const Tensor& out_backprop = MklGetInput(context, 1);
+    GetMklShape(context, 1, &mkl_context.out_backprop_shape);
+    bool outbackprop_in_mkl_format =
+        mkl_context.out_backprop_shape.IsMklTensor();
+
+    TensorShape output_shape;
+    auto shape_vec = tensor_in_shape.vec<int32>();
+    for (int64 i = 0; i < tensor_in_shape.NumElements(); ++i) {
+      output_shape.AddDim(shape_vec(i));
+    }
+
+    MklPoolParameters pool_params;
+    pool_params.Init(context, ksize_, stride_, padding_, data_format_,
+                     output_shape);
+
+    // Extract the parameters for the op from the pooling specs
+    ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
+
+    // Tensors needed to create temporary buffers
+    Tensor outbackprop_buf_tensor;
+    void* outbackprop_buf;
+    mkl_context.MklCreateLayoutsAndPrimitives(context);
+
+    // Check if outbackprop layout requires conversion.
+    if (!dnnLayoutCompare_F32(mkl_context.lt_user_outbackprop,
+                              mkl_context.lt_prim_outbackprop)) {
+      CHECK_EQ(dnnConversionCreate_F32(&mkl_context.convert_outbackprop,
+                                       mkl_context.lt_user_outbackprop,
+                                       mkl_context.lt_prim_outbackprop),
+               E_SUCCESS);
+
+      AllocTmpBuffer(context, &outbackprop_buf_tensor,
+                     mkl_context.lt_prim_outbackprop, &outbackprop_buf);
+
+      if (!outbackprop_in_mkl_format) {
+        CHECK_EQ(dnnConversionExecute_F32(mkl_context.convert_outbackprop,
+                                          static_cast<void*>(const_cast<T*>(
+                                              out_backprop.flat<T>().data())),
+                                          outbackprop_buf),
+                 E_SUCCESS);
+        CHECK_EQ(dnnDelete_F32(mkl_context.convert_outbackprop), E_SUCCESS);
+      } else {
+        mkl_context.out_backprop_shape.GetConvertedFlatData(
+            mkl_context.lt_prim_outbackprop,
+            static_cast<void*>(const_cast<T*>(out_backprop.flat<T>().data())),
+            outbackprop_buf);
+      }
+      mkl_context.pooling_res[dnnResourceDiffDst] = outbackprop_buf;
+    } else {
+      mkl_context.pooling_res[dnnResourceDiffDst] =
+          static_cast<void*>(const_cast<T*>(out_backprop.flat<T>().data()));
+    }
+
+    // Handle workspace requirements.
+    Tensor workspace_buf_tensor;
+    void* workspace_buf;
+    AllocTmpBuffer(context, &workspace_buf_tensor, mkl_context.lt_workspace,
+                   &workspace_buf);
+    mkl_context.pooling_res[dnnResourceWorkspace] = workspace_buf;
+
+    // Handle MKL output tensor setup.
+    Tensor* output = nullptr;
+    TensorShape tensor_out_shape;
+    MklShape mkl_out_shape;
+    mkl_out_shape.SetMklTensor(true);
+    mkl_out_shape.SetMklLayout(mkl_context.prim_pooling_bwd,
+                               dnnResourceDiffSrc);
+    mkl_out_shape.SetTfLayout(mkl_context.params.in_dim,
+                              mkl_context.params.in_sizes,
+                              mkl_context.params.in_strides);
+    mkl_out_shape.SetTfDimOrder(mkl_context.params.in_dim, data_format_);
+
+    tensor_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                                mkl_out_shape.GetMklLayout())) /
+                            sizeof(T));
+
+    AllocateOutputSetMklshape(context, 0, &output, tensor_out_shape,
+                              mkl_out_shape);
+
+    // Set output tensor.
+    mkl_context.pooling_res[dnnResourceDiffSrc] =
+        static_cast<void*>(output->flat<T>().data());
+
+    // Execute primitive.
+    CHECK_EQ(
+        dnnExecute_F32(mkl_context.prim_pooling_bwd, mkl_context.pooling_res),
+        E_SUCCESS);
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    MklPoolingOpParams params;
+    MklShape out_backprop_shape;
+    dnnPrimitive_t prim_pooling_bwd, convert_outbackprop;
+    void* pooling_res[dnnResourceNumber];
+    dnnLayout_t lt_user_input, lt_user_outbackprop, lt_prim_outbackprop,
+        lt_workspace;
+
+    void MklCreateLayoutsAndPrimitives(OpKernelContext* context) {
+      const Tensor& tensor_in_shape = MklGetInput(context, 0);
+      const Tensor& out_backprop = MklGetInput(context, 1);
+      bool outbackprop_in_mkl_format = out_backprop_shape.IsMklTensor();
+
+      if (!outbackprop_in_mkl_format) {
+        // For avgpooling, tensor_in_shape should have 1 dimension, and 4
+        // elements.
+        OP_REQUIRES(
+            context,
+            tensor_in_shape.dims() == 1 && tensor_in_shape.NumElements() == 4,
+            errors::InvalidArgument("original input shape must be "
+                                    "1-dimensional and 4 elements"));
+
+        // For avgpooling, out_backprop should have 4 dimensions.
+        OP_REQUIRES(context, out_backprop.dims() == 4,
+                    errors::InvalidArgument("out_backprop must be "
+                                            "4-dimensional"));
+      } else {
+        // Input in MKL format.
+        OP_REQUIRES(
+            context, out_backprop.dims() == 2,
+            errors::InvalidArgument("out_backprop in MKL format must be "
+                                    "2-dimensional"));
+
+        // For avgpooling, out_backprop should have 4 dimensions.
+        OP_REQUIRES(context, out_backprop_shape.GetDimension() == 4,
+                    errors::InvalidArgument("out_backprop must be "
+                                            "4-dimensional"));
+      }
+
+      // TODO(inteltf): Get outbackprop layout.
+      // Do we need to create layout in every invocation?
+      if (!outbackprop_in_mkl_format) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_user_outbackprop, params.in_dim,
+                                     params.out_sizes, params.out_strides),
+                 E_SUCCESS);
+      } else {
+        lt_user_outbackprop = (dnnLayout_t)out_backprop_shape.GetCurLayout();
+      }
+
+      // Create the backward primitive
+      // Create DNN user layout
+      CHECK_EQ(dnnLayoutCreate_F32(&lt_user_input, params.in_dim,
+                                   params.in_sizes, params.in_strides),
+               E_SUCCESS);
+
+      // Create PoolingBackward primitive
+      dnnAlgorithm_t algorithm = dnnAlgorithmPoolingAvg;
+      dnnPrimitiveAttributes_t primAttr = nullptr;
+      CHECK_EQ(dnnPoolingCreateBackward_F32(
+                   &prim_pooling_bwd, primAttr, algorithm, lt_user_input,
+                   params.kernel_size, params.kernel_stride, params.in_offset,
+                   dnnBorderZerosAsymm),
+               E_SUCCESS);
+
+      // Create expected outbackprop layout from the primitive.
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &lt_prim_outbackprop, prim_pooling_bwd, dnnResourceDiffDst),
+               E_SUCCESS);
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_workspace, prim_pooling_bwd,
+                                                dnnResourceWorkspace),
+               E_SUCCESS);
+    }
+
+    void MklCleanup() {
+      bool outbackprop_in_mkl_format = out_backprop_shape.IsMklTensor();
+      CHECK_EQ(dnnDelete_F32(prim_pooling_bwd), E_SUCCESS);
+      CHECK_EQ(dnnLayoutDelete_F32(lt_user_input), E_SUCCESS);
+      if (!outbackprop_in_mkl_format) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_user_outbackprop), E_SUCCESS);
+      }
+      CHECK_EQ(dnnLayoutDelete_F32(lt_prim_outbackprop), E_SUCCESS);
+      CHECK_EQ(dnnLayoutDelete_F32(lt_workspace), E_SUCCESS);
+    }
+  } MklAvgPoolingGradOpContext;
+
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+  TensorFormat data_format_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("MklAvgPool")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<float>("T")
+                            .Label(mkl_layer_registry::kMklLayerLabel),
+                        MklAvgPoolingOp<CPUDevice, float>);
+
+REGISTER_KERNEL_BUILDER(Name("MklAvgPoolGrad")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<float>("T")
+                            .Label(mkl_layer_registry::kMklLayerLabel),
+                        MklAvgPoolingGradOp<CPUDevice, float>);
+
+}  // namespace tensorflow
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
new file mode 100644
index 0000000000..627fd83b0d
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -0,0 +1,264 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/nn_ops.cc.This opkernel uses MKL library, create MKL
+// layout and primitives, use MKL dnn primitives to compute convolution backward
+// bias.
+
+#ifdef INTEL_MKL
+
+#define USE_EIGEN_TENSOR
+#define EIGEN_USE_THREADS
+
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/tensor_slice.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/util/padding.h"
+#include "tensorflow/core/util/tensor_format.h"
+#include "tensorflow/core/util/use_cudnn.h"
+#include "tensorflow/core/util/work_sharder.h"
+
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+template <typename Device, class T>
+class MklConv2DCustomBackpropBiasOp : public OpKernel {
+ public:
+  explicit MklConv2DCustomBackpropBiasOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string data_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+  }
+  ~MklConv2DCustomBackpropBiasOp() {}
+
+  void Compute(OpKernelContext* context) override {
+    MklConvBackBiasOpContext mkl_context;
+    const Tensor& input = MklGetInput(context, 0);
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    bool input_is_mkl = mkl_context.input_shape.IsMklTensor();
+
+    if (input_is_mkl) {
+      OP_REQUIRES(
+          context, mkl_context.input_shape.GetDimension() == 4,
+          errors::InvalidArgument("Input tensor must be 4-dimensional"));
+    } else {
+      OP_REQUIRES(context, input.dims() == 4,
+                  errors::InvalidArgument("input must be 4-dimensional",
+                                          input.shape().DebugString()));
+    }
+
+    if (input_is_mkl) {
+      mkl_context.c_size = mkl_context.input_shape.GetSizes()[MklDims::C];
+    } else if (data_format_ == FORMAT_NHWC || data_format_ == FORMAT_NCHW) {
+      mkl_context.c_size = GetTensorDim(input, data_format_, 'C');
+    } else {
+      errors::InvalidArgument("Unknown format ",
+                              " Format must be either NCHW or NHWC. ");
+    }
+    TensorShape output_shape{mkl_context.c_size};
+
+    Tensor* bias_backprop = nullptr;
+    MklShape output_mkl_shape;
+    output_mkl_shape.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 0, &bias_backprop, output_shape,
+                              output_mkl_shape);
+
+    mkl_context.in_dims = 4;
+
+    if (input_is_mkl) {  // get the shape from the mkl shape
+      mkl_context.in_sizes[MklDims::W] =
+          mkl_context.input_shape.GetSizes()[MklDims::W];
+      mkl_context.in_sizes[MklDims::H] =
+          mkl_context.input_shape.GetSizes()[MklDims::H];
+      mkl_context.in_sizes[MklDims::C] =
+          mkl_context.input_shape.GetSizes()[MklDims::C];
+      mkl_context.in_sizes[MklDims::N] =
+          mkl_context.input_shape.GetSizes()[MklDims::N];
+    } else {
+      mkl_context.in_sizes[MklDims::W] = GetTensorDim(input, data_format_, 'W');
+      mkl_context.in_sizes[MklDims::H] = GetTensorDim(input, data_format_, 'H');
+      mkl_context.in_sizes[MklDims::C] = GetTensorDim(input, data_format_, 'C');
+      mkl_context.in_sizes[MklDims::N] = GetTensorDim(input, data_format_, 'N');
+      GetStridesFromSizes(data_format_, mkl_context.in_strides,
+                          mkl_context.in_sizes);
+    }
+
+    mkl_context.out_sizes[0] = mkl_context.c_size;
+    mkl_context.out_strides[0] = 1;
+
+    CHECK_EQ(
+        dnnConvolutionCreateBackwardBias_F32(
+            &mkl_context.prim_conv_bwdbias, NULL, dnnAlgorithmConvolutionDirect,
+            mkl_context.in_dims, mkl_context.in_sizes),
+        E_SUCCESS);
+
+    mkl_context.MklCreateInputLayouts(context);
+
+    Tensor mkl_tmp_input_buf, mkl_tmp_outbackprop_buf;
+    mkl_context.MklPrepareConvolutionInputs(context, &mkl_tmp_input_buf);
+    mkl_context.MklPrepareConvolutionOutputs(context, &mkl_tmp_outbackprop_buf,
+                                             bias_backprop);
+
+    CHECK_EQ(
+        dnnExecute_F32(mkl_context.prim_conv_bwdbias, mkl_context.conv_res),
+        E_SUCCESS);
+    if (mkl_context.should_convert_output) {
+      CHECK_EQ(dnnConversionExecute_F32(
+                   mkl_context.convert_outbackprop, mkl_context.outbackprop_buf,
+                   static_cast<void*>(bias_backprop->flat<T>().data())),
+               E_SUCCESS);
+    }
+    // deletes layouts
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    int in_dims;
+    int c_size;
+    size_t in_sizes[4];
+    size_t in_strides[4];
+    size_t out_sizes[1];
+    size_t out_strides[1];
+    size_t filter_sizes[4];
+    size_t filter_strides[4];
+    int input_offset[2];
+    size_t conv_stride[2];
+    MklShape input_shape;
+    dnnPrimitive_t prim_conv_bwdbias;
+    void* conv_res[dnnResourceNumber];
+    dnnLayout_t lt_input, lt_outbackprop;
+    bool should_convert_output;
+    dnnPrimitive_t convert_outbackprop;
+    void* outbackprop_buf;
+
+    // Create MKL dnnLayout_t objects for tensors coming into the layer
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool input_is_mkl = input_shape.IsMklTensor();
+
+      CHECK_EQ(dnnLayoutCreate_F32(&lt_outbackprop, 1, out_sizes, out_strides),
+               E_SUCCESS);
+      if (input_is_mkl) {
+        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      }
+    }
+
+    // Compare incoming output tensor layouts with MKL preferred layouts and
+    // convert data to the preferred layout if necessary
+    void MklPrepareConvolutionOutputs(OpKernelContext* context,
+                                      Tensor* mkl_tmp_outbackprop_buf,
+                                      Tensor* bias_backprop) {
+      dnnLayout_t mkl_prim_internal_outbackprop = nullptr;
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_prim_internal_outbackprop,
+                                                prim_conv_bwdbias,
+                                                dnnResourceDiffBias),
+               E_SUCCESS);
+      should_convert_output =
+          !dnnLayoutCompare_F32(lt_outbackprop, mkl_prim_internal_outbackprop);
+      if (should_convert_output) {
+        CHECK_EQ(dnnConversionCreate_F32(&convert_outbackprop,
+                                         mkl_prim_internal_outbackprop,
+                                         lt_outbackprop),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_outbackprop_buf,
+                       mkl_prim_internal_outbackprop, &outbackprop_buf);
+        conv_res[dnnResourceDiffBias] = outbackprop_buf;
+      } else {
+        conv_res[dnnResourceDiffBias] =
+            static_cast<void*>(const_cast<T*>(bias_backprop->flat<T>().data()));
+      }
+
+      dnnLayoutDelete_F32(mkl_prim_internal_outbackprop);
+    }
+
+    // Compare incoming input tensor layouts with MKL preferred layouts and
+    // convert data to the preferred layout if necessary
+    void MklPrepareConvolutionInputs(OpKernelContext* context,
+                                     Tensor* mkl_tmp_input_buf) {
+      dnnLayout_t mkl_prim_internal_input = nullptr;
+      dnnPrimitive_t mkl_convert_input = nullptr;
+      void* input_buf = nullptr;
+      const Tensor& input = MklGetInput(context, 0);
+
+      CHECK_EQ(
+          dnnLayoutCreateFromPrimitive_F32(
+              &mkl_prim_internal_input, prim_conv_bwdbias, dnnResourceDiffDst),
+          E_SUCCESS);
+
+      if (!dnnLayoutCompare_F32(lt_input, mkl_prim_internal_input)) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_convert_input, lt_input,
+                                         mkl_prim_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf, mkl_prim_internal_input,
+                       &input_buf);
+        CHECK_EQ(dnnConversionExecute_F32(
+                     mkl_convert_input,
+                     static_cast<void*>(const_cast<T*>(input.flat<T>().data())),
+                     input_buf),
+                 E_SUCCESS);
+        conv_res[dnnResourceDiffDst] = input_buf;
+        dnnDelete_F32(mkl_convert_input);
+      } else {
+        conv_res[dnnResourceDiffDst] =
+            static_cast<void*>(const_cast<T*>(input.flat<T>().data()));
+      }
+
+      dnnLayoutDelete_F32(mkl_prim_internal_input);
+    }
+
+    // Cleanup member layouts and primitives
+    void MklCleanup() {
+      bool input_is_mkl = input_shape.IsMklTensor();
+      if (!input_is_mkl) dnnLayoutDelete_F32(lt_input);
+      dnnLayoutDelete_F32(lt_outbackprop);
+
+      if (should_convert_output) dnnDelete_F32(convert_outbackprop);
+      dnnDelete_F32(prim_conv_bwdbias);
+    }
+  } MklConvBackBiasOpContext;
+
+  TensorFormat data_format_;
+  TF_DISALLOW_COPY_AND_ASSIGN(MklConv2DCustomBackpropBiasOp);
+};
+
+#define REGISTER_CPU_KERNELS(T)                                           \
+  REGISTER_KERNEL_BUILDER(Name("MklConv2DWithBiasBackpropBias")           \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<T>("T")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklConv2DCustomBackpropBiasOp<CPUDevice, T>);
+
+TF_CALL_float(REGISTER_CPU_KERNELS);
+#undef REGISTER_CPU_KERNELS
+} /* namespace tensorflow */
+#endif /* INTEL_MKL */
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
new file mode 100644
index 0000000000..85198d89f5
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -0,0 +1,422 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/nn_ops.cc.
+
+#ifdef INTEL_MKL
+
+#include <algorithm>
+#include <vector>
+
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/tensor_slice.h"
+#include "tensorflow/core/kernels/conv_grad_ops.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/util/padding.h"
+#include "tensorflow/core/util/tensor_format.h"
+#include "tensorflow/core/util/use_cudnn.h"
+#include "tensorflow/core/util/work_sharder.h"
+
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+template <typename Device, class T>
+class MklConv2DCustomBackpropFilterOp : public OpKernel {
+ public:
+  explicit MklConv2DCustomBackpropFilterOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string data_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &strides_));
+    int stride_n = GetTensorDim(strides_, data_format_, 'N');
+    int stride_c = GetTensorDim(strides_, data_format_, 'C');
+    OP_REQUIRES(
+        context, (stride_n == 1 && stride_c == 1),
+        errors::InvalidArgument("Current implementation does not yet support "
+                                "strides in the batch and depth dimensions."));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklConv2DGradFilterOpContext mkl_context;
+    const Tensor& input = MklGetInput(context, 0);
+    GetMklShape(context, 0, &(mkl_context.input_shape));
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+
+    const Tensor& filter_sizes = MklGetInput(context, 1);
+
+    const Tensor& out_backprop = MklGetInput(context, 2);
+    GetMklShape(context, 2, &(mkl_context.out_backprop_shape));
+    bool out_backprop_in_mkl_format =
+        mkl_context.out_backprop_shape.IsMklTensor();
+
+    TensorShape input_shape, filter_shape, out_backprop_shape;
+
+    OP_REQUIRES(
+        context, TensorShapeUtils::IsVector(filter_sizes.shape()),
+        errors::InvalidArgument(
+            "Conv2DCustomBackpropFilter: filter_sizes input must be 1-dim, "
+            "not ",
+            filter_sizes.dims()));
+    OP_REQUIRES_OK(context, TensorShapeUtils::MakeShape(
+                                filter_sizes.vec<int32>(), &filter_shape));
+
+    ConvBackpropDimensions backprop_dims;
+
+    // Generate shape for input if input is in MKL format.
+    if (input_in_mkl_format) {
+      OP_REQUIRES(context, mkl_context.input_shape.GetDimension() == 4,
+                  errors::InvalidArgument(
+                      "Conv2DCustomBackpropFilter: input size must be 4-dim"));
+
+      MklSizesToTFSizes(context, data_format_, mkl_context.input_shape,
+                        &input_shape);
+    } else {
+      input_shape = input.shape();
+    }
+
+    // Generate shape for outback prop if input is in MKL format.
+    if (out_backprop_in_mkl_format) {
+      OP_REQUIRES(
+          context, mkl_context.out_backprop_shape.GetDimension() == 4,
+          errors::InvalidArgument(
+              "Conv2DCustomBackpropFilter: outbackprop size must be 4-dim"));
+
+      MklSizesToTFSizes(context, data_format_, mkl_context.out_backprop_shape,
+                        &out_backprop_shape);
+    } else {
+      out_backprop_shape = out_backprop.shape();
+    }
+
+    OP_REQUIRES_OK(context,
+                   ConvBackpropComputeDimensions(
+                       "Conv2DCustomBackpropFilter", /*num_spatial_dims=*/2,
+                       input_shape, filter_shape, out_backprop_shape, strides_,
+                       padding_, data_format_, &backprop_dims));
+
+    int64 pad_top, pad_bottom;
+    int64 pad_left, pad_right;
+    OP_REQUIRES_OK(context, GetWindowedOutputSizeVerbose(
+                                backprop_dims.spatial_dims[0].input_size,
+                                backprop_dims.spatial_dims[0].filter_size,
+                                backprop_dims.spatial_dims[0].stride, padding_,
+                                &backprop_dims.spatial_dims[0].output_size,
+                                &pad_top, &pad_bottom));
+    OP_REQUIRES_OK(context, GetWindowedOutputSizeVerbose(
+                                backprop_dims.spatial_dims[1].input_size,
+                                backprop_dims.spatial_dims[1].filter_size,
+                                backprop_dims.spatial_dims[1].stride, padding_,
+                                &backprop_dims.spatial_dims[1].output_size,
+                                &pad_left, &pad_right));
+
+    // Create MKL primitives for convolution filter grad
+    mkl_context.in_dims = input_in_mkl_format
+                              ? mkl_context.input_shape.GetDimension()
+                              : input.dims();
+    mkl_context.out_dims = out_backprop_in_mkl_format
+                               ? mkl_context.out_backprop_shape.GetDimension()
+                               : out_backprop.dims();
+    mkl_context.in_sizes[0] =
+        static_cast<size_t>(backprop_dims.spatial_dims[1].input_size);
+    mkl_context.in_sizes[1] =
+        static_cast<size_t>(backprop_dims.spatial_dims[0].input_size);
+    mkl_context.in_sizes[2] = static_cast<size_t>(backprop_dims.in_depth);
+    mkl_context.in_sizes[3] = static_cast<size_t>(backprop_dims.batch_size);
+    mkl_context.out_sizes[0] =
+        static_cast<size_t>(backprop_dims.spatial_dims[1].output_size);
+    mkl_context.out_sizes[1] =
+        static_cast<size_t>(backprop_dims.spatial_dims[0].output_size);
+    mkl_context.out_sizes[2] = static_cast<size_t>(backprop_dims.out_depth);
+    mkl_context.out_sizes[3] = static_cast<size_t>(backprop_dims.batch_size);
+    mkl_context.input_offsets[0] = static_cast<int>(-pad_left);
+    mkl_context.input_offsets[1] = static_cast<int>(-pad_top);
+    mkl_context.conv_strides[0] =
+        static_cast<size_t>(backprop_dims.spatial_dims[1].stride);
+    mkl_context.conv_strides[1] =
+        static_cast<size_t>(backprop_dims.spatial_dims[0].stride);
+
+    GetStridesFromSizes(data_format_, mkl_context.in_strides,
+                        mkl_context.in_sizes);
+    GetStridesFromSizes(data_format_, mkl_context.out_strides,
+                        mkl_context.out_sizes);
+
+    // MKL understands dimensions in 0, 1, 2, and 3 indices denotes
+    // filter cols, rows, input channels, and output depth/channels.
+    mkl_context.filter_dims = 4;
+    mkl_context.filter_sizes[0] = backprop_dims.spatial_dims[1].filter_size;
+    mkl_context.filter_sizes[1] = backprop_dims.spatial_dims[0].filter_size;
+    mkl_context.filter_sizes[2] = backprop_dims.in_depth;
+    mkl_context.filter_sizes[3] = backprop_dims.out_depth;
+
+    // We want filter grad to be in TF format, so
+    // make the strides accordingly to reflect this fact.
+    // Note TF filter layout : (rows, cols, in_depth, out_depth),
+    // while row is the innermost dimension.
+    mkl_context.filter_strides[0] =
+        backprop_dims.out_depth * backprop_dims.in_depth;
+    mkl_context.filter_strides[1] = backprop_dims.out_depth *
+                                    backprop_dims.in_depth *
+                                    backprop_dims.spatial_dims[1].filter_size;
+    mkl_context.filter_strides[2] = backprop_dims.out_depth;
+    mkl_context.filter_strides[3] = 1;
+
+    mkl_context.conv_strides[0] = backprop_dims.spatial_dims[1].stride;
+    mkl_context.conv_strides[1] = backprop_dims.spatial_dims[0].stride;
+
+    // Create convolution-grad-filter primitive
+    CHECK_EQ(dnnConvolutionCreateBackwardFilter_F32(
+                 &mkl_context.prim_conv_bwdfilter, nullptr,
+                 dnnAlgorithmConvolutionDirect, mkl_context.in_dims,
+                 mkl_context.in_sizes, mkl_context.out_sizes,
+                 mkl_context.filter_sizes, mkl_context.conv_strides,
+                 mkl_context.input_offsets, dnnBorderZeros),
+             E_SUCCESS);
+
+    // Create the layouts for entities in received context.
+    mkl_context.MklCreateInputLayouts(context);
+
+    // Mkl needs the entities in its native format.
+    // So create temporary tensors along with buffers to
+    // convert the received entities.
+    Tensor mkl_tmp_input_buf_tensor, mkl_tmp_out_backprop_buf_tensor;
+    // This preparation sets (1) dnnResourceSrc (2) dnnResourceDiffDst
+    mkl_context.MklPrepareInputs(context, &mkl_tmp_input_buf_tensor,
+                                 &mkl_tmp_out_backprop_buf_tensor);
+
+    // Final conv-grad-filter should be in TF layout.
+    Tensor* grad_filter;
+    mkl_context.grad_filter_shape.SetMklTensor(false);
+    mkl_context.grad_filter_shape.SetTfLayout(mkl_context.filter_dims,
+                                              mkl_context.filter_sizes,
+                                              mkl_context.filter_strides);
+    AllocateOutputSetMklshape(context, 0, &grad_filter, filter_shape,
+                              mkl_context.grad_filter_shape);
+
+    // Need to set member variable for TF layout
+    mkl_context.lt_grad_filter = mkl_context.grad_filter_shape.GetTfLayout();
+
+    // MKL conv-grad-filter might produce grad in its internal layout
+    Tensor mkl_tmp_grad_filter_buf_tensor;
+    // This preparation sets conversion primitive if required
+    // and allocates temporary tensor and its buffer without doing conversions.
+    // Also sets (3) dnnResourceDiffFilter accordingly
+    mkl_context.MklPrepareGradFilter(context, grad_filter,
+                                     &mkl_tmp_grad_filter_buf_tensor);
+
+    // After setting all the required dnnResources, ready for execution!
+    CHECK_EQ(
+        dnnExecute_F32(mkl_context.prim_conv_bwdfilter, mkl_context.conv_res),
+        E_SUCCESS);
+
+    // Convert grad-filter to TF layout
+    if (mkl_context.convert_bwdfilter != nullptr) {
+      void* mkl_buf_convert_grad_filter =
+          const_cast<void*>(static_cast<const void*>(
+              mkl_tmp_grad_filter_buf_tensor.flat<T>().data()));
+      void* mkl_buf_grad_filter = const_cast<void*>(
+          static_cast<const void*>(grad_filter->flat<T>().data()));
+      CHECK_EQ(dnnConversionExecute_F32(mkl_context.convert_bwdfilter,
+                                        mkl_buf_convert_grad_filter,
+                                        mkl_buf_grad_filter),
+               E_SUCCESS);
+    }
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    int in_dims;
+    size_t in_sizes[4];
+    size_t in_strides[4];
+    int out_dims;
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    int filter_dims;
+    size_t filter_sizes[4];
+    size_t filter_strides[4];
+    int input_offsets[2];
+    size_t conv_strides[2];
+    MklShape input_shape, grad_filter_shape, out_backprop_shape;
+    dnnPrimitive_t prim_conv_bwdfilter, convert_bwdfilter;
+    dnnLayout_t lt_input, lt_grad_filter, lt_out_backprop;
+    void* conv_res[dnnResourceNumber];
+
+    void MklCleanup() {
+      // Cleanup member layouts and primitives except "lt_grad_filter_"
+      // which points to MklShape's TFLayout
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      bool out_backprop_in_mkl_format = out_backprop_shape.IsMklTensor();
+      if (!input_in_mkl_format) dnnLayoutDelete_F32(lt_input);
+      if (!out_backprop_in_mkl_format) dnnLayoutDelete_F32(lt_out_backprop);
+      if (convert_bwdfilter != nullptr) dnnDelete_F32(convert_bwdfilter);
+      dnnDelete_F32(prim_conv_bwdfilter);
+    }
+
+    // Create MKL dnnLayout_t objects for tensors coming into the layer
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      if (input_in_mkl_format) {
+        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      }
+
+      bool out_backprop_in_mkl_format = out_backprop_shape.IsMklTensor();
+      if (out_backprop_in_mkl_format) {
+        lt_out_backprop =
+            static_cast<dnnLayout_t>(out_backprop_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_out_backprop, out_dims, out_sizes,
+                                     out_strides),
+                 E_SUCCESS);
+      }
+    }
+
+    // Compare incoming tensor layouts with MKL preferred layouts and convert
+    // data to the preferred layout if necessary
+    void MklPrepareInputs(OpKernelContext* context,
+                          Tensor* mkl_tmp_input_buf_tensor,
+                          Tensor* mkl_tmp_out_backprop_buf_tensor) {
+      bool mkl_convert_input, mkl_convert_out_backprop;
+      dnnPrimitive_t mkl_prim_convert_input, mkl_prim_convert_out_backprop;
+      dnnLayout_t mkl_lt_internal_input, mkl_lt_internal_out_backprop;
+      void *mkl_buf_convert_input, *mkl_buf_convert_out_backprop;
+
+      mkl_prim_convert_input = nullptr;
+      mkl_prim_convert_out_backprop = nullptr;
+      mkl_lt_internal_input = nullptr;
+      mkl_lt_internal_out_backprop = nullptr;
+      mkl_buf_convert_input = nullptr;
+      mkl_buf_convert_out_backprop = nullptr;
+
+      // Compare with internal layouts and convert if needed
+      const Tensor& input = MklGetInput(context, 0);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &mkl_lt_internal_input, prim_conv_bwdfilter, dnnResourceSrc),
+               E_SUCCESS);
+      mkl_convert_input =
+          !dnnLayoutCompare_F32(mkl_lt_internal_input, lt_input);
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input, lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &mkl_buf_convert_input);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input, mkl_buf_input,
+                                          mkl_buf_convert_input),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_input);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
+
+      conv_res[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_convert_input : mkl_buf_input;
+
+      const Tensor& out_backprop = MklGetInput(context, 2);
+      void* mkl_buf_out_backprop = const_cast<void*>(
+          static_cast<const void*>(out_backprop.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_out_backprop,
+                                                prim_conv_bwdfilter,
+                                                dnnResourceDiffDst),
+               E_SUCCESS);
+      mkl_convert_out_backprop =
+          !dnnLayoutCompare_F32(mkl_lt_internal_out_backprop, lt_out_backprop);
+      if (mkl_convert_out_backprop) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_out_backprop,
+                                         lt_out_backprop,
+                                         mkl_lt_internal_out_backprop),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_out_backprop_buf_tensor,
+                       lt_out_backprop, &mkl_buf_convert_out_backprop);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_out_backprop,
+                                          mkl_buf_out_backprop,
+                                          mkl_buf_convert_out_backprop),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_out_backprop);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_out_backprop);
+
+      conv_res[dnnResourceDiffDst] = (mkl_convert_out_backprop)
+                                         ? mkl_buf_convert_out_backprop
+                                         : mkl_buf_out_backprop;
+    }
+
+    void MklPrepareGradFilter(OpKernelContext* context, Tensor* grad_filter,
+                              Tensor* mkl_tmp_grad_filter_buf_tensor) {
+      bool mkl_convert_grad_filter;
+      dnnLayout_t mkl_lt_internal_grad_filter = nullptr;
+      void* mkl_buf_convert_grad_filter = nullptr;
+      void* mkl_buf_grad_filter = const_cast<void*>(
+          static_cast<const void*>(grad_filter->flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_grad_filter,
+                                                prim_conv_bwdfilter,
+                                                dnnResourceDiffFilter),
+               E_SUCCESS);
+      mkl_convert_grad_filter =
+          !dnnLayoutCompare_F32(mkl_lt_internal_grad_filter, lt_grad_filter);
+      if (mkl_convert_grad_filter) {
+        CHECK_EQ(dnnConversionCreate_F32(&convert_bwdfilter,
+                                         mkl_lt_internal_grad_filter,
+                                         lt_grad_filter),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_grad_filter_buf_tensor,
+                       mkl_lt_internal_grad_filter,
+                       &mkl_buf_convert_grad_filter);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_grad_filter);
+
+      conv_res[dnnResourceDiffFilter] = (mkl_convert_grad_filter)
+                                            ? mkl_buf_convert_grad_filter
+                                            : mkl_buf_grad_filter;
+    }
+  } MklConv2DGradFilterOpContext;
+
+  std::vector<int32> strides_;
+  Padding padding_;
+  TensorFormat data_format_;
+};
+
+#define REGISTER_MKL_FILTER_KERNELS(T)                                    \
+  REGISTER_KERNEL_BUILDER(Name("MklConv2DBackpropFilter")                 \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<T>("T")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklConv2DCustomBackpropFilterOp<CPUDevice, T>);
+
+TF_CALL_float(REGISTER_MKL_FILTER_KERNELS);
+#undef REGISTER_MKL_FILTER_KERNELS
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
new file mode 100644
index 0000000000..c7d95c86bc
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -0,0 +1,355 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/nn_ops.cc. This opkernel uses MKL library, create MKL
+// layout and primitives, use MKL dnn primitives to compute convolution backward
+// input
+
+#ifdef INTEL_MKL
+
+#define USE_EIGEN_TENSOR
+#define EIGEN_USE_THREADS
+#include <algorithm>
+#include <vector>
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/tensor_slice.h"
+#include "tensorflow/core/kernels/conv_grad_ops.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/util/mkl_util.h"
+#include "tensorflow/core/util/padding.h"
+#include "tensorflow/core/util/tensor_format.h"
+#include "tensorflow/core/util/use_cudnn.h"
+#include "tensorflow/core/util/work_sharder.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+template <typename Device, class T>
+class MklConv2DCustomBackpropInputOp : public OpKernel {
+ public:
+  ~MklConv2DCustomBackpropInputOp() {}
+  explicit MklConv2DCustomBackpropInputOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string dataformat;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &dataformat));
+    OP_REQUIRES(context, FormatFromString(dataformat, &data_format),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &strides));
+    int stride_n = GetTensorDim(strides, data_format, 'N');
+    int stride_c = GetTensorDim(strides, data_format, 'C');
+    OP_REQUIRES(
+        context, (stride_n == 1 && stride_c == 1),
+        errors::InvalidArgument("Current implementation does not yet support "
+                                "strides in the batch and depth dimensions."));
+
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklConvBackInputOpContext mkl_context;
+    const Tensor& input = MklGetInput(context, 0);
+    const Tensor& filter = MklGetInput(context, 1);
+
+    GetMklShape(context, 1, &(mkl_context.filter_shape));
+    bool filter_in_mkl_format = mkl_context.filter_shape.IsMklTensor();
+
+    const Tensor& out_backprop = MklGetInput(context, 2);
+    GetMklShape(context, 2, &(mkl_context.outback_shape));
+    bool outback_in_mkl_format = mkl_context.outback_shape.IsMklTensor();
+
+    TensorShape input_shape, filter_shape, outback_shape;
+
+    // Generate input shape.
+    OP_REQUIRES(
+        context, TensorShapeUtils::IsVector(input.shape()),
+        errors::InvalidArgument(
+            "Conv2DBackpropInput: input_sizes input must be 1-dim, not ",
+            input.dims()));
+    OP_REQUIRES_OK(
+        context, TensorShapeUtils::MakeShape(input.vec<int32>(), &input_shape));
+
+    // Generate shape for filter prop if input is in MKL format.
+    if (filter_in_mkl_format) {
+      OP_REQUIRES(context, mkl_context.filter_shape.GetDimension() == 4,
+                  errors::InvalidArgument(
+                      "Conv2DCustomBackpropInput: size must be 4-dim"));
+
+      MklSizesToTFSizes(context, data_format, mkl_context.filter_shape,
+                        &filter_shape);
+    } else {
+      filter_shape = filter.shape();
+    }
+
+    // Generate shape for outback prop if input is in MKL format.
+    if (outback_in_mkl_format) {
+      OP_REQUIRES(context, mkl_context.outback_shape.GetDimension() == 4,
+                  errors::InvalidArgument(
+                      "Conv2DCustomBackpropInput: size must be 4-dim"));
+
+      MklSizesToTFSizes(context, data_format, mkl_context.outback_shape,
+                        &outback_shape);
+    } else {
+      outback_shape = out_backprop.shape();
+    }
+
+    ConvBackpropDimensions dims;
+    OP_REQUIRES_OK(
+        context,
+        ConvBackpropComputeDimensions(
+            "Conv2DCustomBackpropInput", /*num_spatial_dims=*/2, input_shape,
+            filter_shape, outback_shape, strides, padding, data_format, &dims));
+
+    int64 pad_top, pad_bottom;
+    int64 pad_left, pad_right;
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[0].input_size, dims.spatial_dims[0].filter_size,
+            dims.spatial_dims[0].stride, padding,
+            &dims.spatial_dims[0].output_size, &pad_top, &pad_bottom));
+    OP_REQUIRES_OK(
+        context,
+        GetWindowedOutputSizeVerbose(
+            dims.spatial_dims[1].input_size, dims.spatial_dims[1].filter_size,
+            dims.spatial_dims[1].stride, padding,
+            &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
+
+    mkl_context.in_dims = 4;
+
+    mkl_context.in_sizes[0] =
+        static_cast<size_t>(dims.spatial_dims[1].input_size);
+    mkl_context.in_sizes[1] =
+        static_cast<size_t>(dims.spatial_dims[0].input_size);
+    mkl_context.in_sizes[2] = static_cast<size_t>(dims.in_depth);
+    mkl_context.in_sizes[3] = static_cast<size_t>(dims.batch_size);
+
+    mkl_context.out_sizes[0] =
+        static_cast<size_t>(dims.spatial_dims[1].output_size);
+    mkl_context.out_sizes[1] =
+        static_cast<size_t>(dims.spatial_dims[0].output_size);
+    mkl_context.out_sizes[2] = static_cast<size_t>(dims.out_depth);
+    mkl_context.out_sizes[3] = static_cast<size_t>(dims.batch_size);
+
+    mkl_context.input_offset[0] = static_cast<int>(-pad_left);
+    mkl_context.input_offset[1] = static_cast<int>(-pad_top);
+
+    mkl_context.conv_strides[0] =
+        static_cast<size_t>(dims.spatial_dims[1].stride);
+    mkl_context.conv_strides[1] =
+        static_cast<size_t>(dims.spatial_dims[0].stride);
+
+    GetStridesFromSizes(data_format, mkl_context.out_strides,
+                        mkl_context.out_sizes);
+    GetStridesFromSizes(data_format, mkl_context.in_strides,
+                        mkl_context.in_sizes);
+
+    mkl_context.filter_size[0] = dims.spatial_dims[1].filter_size;
+    mkl_context.filter_size[1] = dims.spatial_dims[0].filter_size;
+    mkl_context.filter_size[2] = dims.in_depth;
+    mkl_context.filter_size[3] = dims.out_depth;
+
+    mkl_context.filter_stride[0] =
+        mkl_context.filter_size[2] * mkl_context.filter_size[3];
+    mkl_context.filter_stride[1] = mkl_context.filter_size[2] *
+                                   mkl_context.filter_size[0] *
+                                   mkl_context.filter_size[3];
+    mkl_context.filter_stride[2] = mkl_context.filter_size[3];
+    mkl_context.filter_stride[3] = 1;
+
+    CHECK_EQ(
+        dnnConvolutionCreateBackwardData_F32(
+            &mkl_context.prim_bwddata, NULL, dnnAlgorithmConvolutionDirect,
+            mkl_context.in_dims, mkl_context.in_sizes, mkl_context.out_sizes,
+            mkl_context.filter_size, mkl_context.conv_strides,
+            mkl_context.input_offset, dnnBorderZeros),
+        E_SUCCESS);
+
+    // Allocate output tensor and shape
+    TensorShape mkl_out_shape;
+    MklShape mklOutputShape;
+    mklOutputShape.SetMklTensor(true);
+    mklOutputShape.SetMklLayout(mkl_context.prim_bwddata, dnnResourceDiffSrc);
+    mklOutputShape.SetTfLayout(mkl_context.in_dims, mkl_context.in_sizes,
+                               mkl_context.in_strides);
+    // MKL might change the dimension ordering.
+    // Create mapping to recover the original TF dimension order
+    mklOutputShape.SetTfDimOrder(mkl_context.in_dims, data_format);
+
+    Tensor* in_backprop = nullptr;
+    mkl_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                             mklOutputShape.GetMklLayout())) /
+                         sizeof(T));
+    AllocateOutputSetMklshape(context, 0, &in_backprop, mkl_out_shape,
+                              mklOutputShape);
+
+    mkl_context.conv_res[dnnResourceDiffSrc] =
+        static_cast<void*>(const_cast<T*>(in_backprop->flat<T>().data()));
+
+    mkl_context.MklCreateInputLayouts(context);
+    Tensor mkl_tmp_outbackprop_buf_tensor, mkl_tmp_filter_buf_tensor;
+    mkl_context.MklPrepareConvolutionInputs(
+        context, &mkl_tmp_outbackprop_buf_tensor, &mkl_tmp_filter_buf_tensor);
+
+    CHECK_EQ(dnnExecute_F32(mkl_context.prim_bwddata, mkl_context.conv_res),
+             E_SUCCESS);
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    int in_dims;
+    size_t in_sizes[4];
+    size_t in_strides[4];
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    int input_offset[2];
+    size_t filter_size[4];
+    size_t filter_stride[4];
+    size_t conv_strides[2];
+    MklShape filter_shape, outback_shape;
+    dnnPrimitive_t prim_bwddata;
+    void* conv_res[dnnResourceNumber];
+    dnnLayout_t lt_filter, lt_outbackprop;
+
+    // Create MKL dnnLayout_t objects for tensors coming into the layer
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool filter_in_mkl_format = filter_shape.IsMklTensor();
+      bool outback_in_mkl_format = outback_shape.IsMklTensor();
+      if (filter_in_mkl_format) {
+        lt_filter = (dnnLayout_t)filter_shape.GetCurLayout();
+      } else {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_filter, in_dims, filter_size,
+                                     filter_stride),
+                 E_SUCCESS);
+      }
+
+      if (outback_in_mkl_format) {
+        lt_outbackprop = (dnnLayout_t)outback_shape.GetCurLayout();
+      } else {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_outbackprop, in_dims, out_sizes,
+                                     out_strides),
+                 E_SUCCESS);
+      }
+    }
+
+    // Compare incoming input tensor layouts with MKL preferred layouts and
+    // convert data to the preferred layout if necessary
+    void MklPrepareConvolutionInputs(OpKernelContext* context,
+                                     Tensor* mkl_tmp_outbackprop_buf_tensor,
+                                     Tensor* mkl_tmp_filter_buf_tensor) {
+      dnnPrimitive_t mkl_convert_filter = nullptr,
+                     mkl_convert_outbackprop = nullptr;
+      void *mkl_filter_buf = nullptr, *mkl_outbackprop_buf = nullptr;
+      dnnLayout_t mkl_lt_filter_internal = nullptr,
+                  mkl_lt_outbackprop_internal = nullptr;
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &mkl_lt_filter_internal, prim_bwddata, dnnResourceFilter),
+               E_SUCCESS);
+
+      const Tensor& filter = MklGetInput(context, 1);
+
+      CHECK_EQ(
+          dnnLayoutCreateFromPrimitive_F32(&mkl_lt_outbackprop_internal,
+                                           prim_bwddata, dnnResourceDiffDst),
+          E_SUCCESS);
+      if (!dnnLayoutCompare_F32(mkl_lt_filter_internal, lt_filter)) {
+        // Create conversion primitive
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_convert_filter, lt_filter,
+                                         mkl_lt_filter_internal),
+                 E_SUCCESS);
+
+        AllocTmpBuffer(context, mkl_tmp_filter_buf_tensor,
+                       mkl_lt_filter_internal, &mkl_filter_buf);
+        CHECK_EQ(
+            dnnConversionExecute_F32(
+                mkl_convert_filter,
+                static_cast<void*>(const_cast<T*>(filter.flat<T>().data())),
+                mkl_filter_buf),
+            E_SUCCESS);
+
+        // Assign filter buf to resources[] for convolution.
+        conv_res[dnnResourceFilter] = mkl_filter_buf;
+        dnnDelete_F32(mkl_convert_filter);
+      } else {
+        // If we do not need any layout conversion for filter, then
+        // we direclty assign input filter to resources[].
+        conv_res[dnnResourceFilter] =
+            static_cast<void*>(const_cast<T*>(filter.flat<T>().data()));
+      }
+      dnnLayoutDelete_F32(mkl_lt_filter_internal);
+      const Tensor& out_backprop = MklGetInput(context, 2);
+      // --
+      // We do similar steps as above for outputbackprop.
+      if (!dnnLayoutCompare_F32(mkl_lt_outbackprop_internal, lt_outbackprop)) {
+        CHECK_EQ(
+            dnnConversionCreate_F32(&mkl_convert_outbackprop, lt_outbackprop,
+                                    mkl_lt_outbackprop_internal),
+            E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_outbackprop_buf_tensor,
+                       mkl_lt_outbackprop_internal, &mkl_outbackprop_buf);
+
+        CHECK_EQ(dnnConversionExecute_F32(mkl_convert_outbackprop,
+                                          static_cast<void*>(const_cast<T*>(
+                                              out_backprop.flat<T>().data())),
+                                          mkl_outbackprop_buf),
+                 E_SUCCESS);
+
+        conv_res[dnnResourceDiffDst] = mkl_outbackprop_buf;
+        dnnDelete_F32(mkl_convert_outbackprop);
+      } else {
+        conv_res[dnnResourceDiffDst] =
+            static_cast<void*>(const_cast<T*>(out_backprop.flat<T>().data()));
+      }
+      dnnLayoutDelete_F32(mkl_lt_outbackprop_internal);
+    }
+
+    // Cleanup member layouts and primitives
+    void MklCleanup() {
+      bool filter_in_mkl_format = filter_shape.IsMklTensor();
+      bool outback_in_mkl_format = outback_shape.IsMklTensor();
+      if (!filter_in_mkl_format) dnnLayoutDelete_F32(lt_filter);
+      if (!outback_in_mkl_format) dnnLayoutDelete_F32(lt_outbackprop);
+      dnnDelete_F32(prim_bwddata);
+    }
+  } MklConvBackInputOpContext;
+
+  std::vector<int32> strides;
+  Padding padding;
+  TensorFormat data_format;
+};
+
+#define REGISTER_MKL_CPU_KERNELS(T)                                       \
+  REGISTER_KERNEL_BUILDER(Name("MklConv2DBackpropInput")                  \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<T>("T")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklConv2DCustomBackpropInputOp<CPUDevice, T>);
+
+TF_CALL_float(REGISTER_MKL_CPU_KERNELS);
+#undef REGISTER_MKL_CPU_KERNELS
+
+}  // namespace tensorflow
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index 5a9a82d2e9..e5c4c21a10 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -43,7 +43,6 @@ limitations under the License.
 namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
-typedef Eigen::GpuDevice GPUDevice;
 
 template <typename Device, typename T, bool biasEnabled>
 class MklConv2DOp : public OpKernel {
@@ -70,9 +69,10 @@ class MklConv2DOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* context) override {
+    MklConv2DOpContext mkl_context;
     const Tensor& input = MklGetInput(context, 0);
-    GetMklShape(context, 0, &(mkl_params_.input_shape));
-    bool input_in_mkl_format = mkl_params_.input_shape.IsMklTensor();
+    GetMklShape(context, 0, &(mkl_context.input_shape));
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
 
     const Tensor& filter = MklGetInput(context, 1);
     MklShape mkl_filter_shape;
@@ -104,9 +104,9 @@ class MklConv2DOp : public OpKernel {
           errors::InvalidArgument("filter too large"));
     }
 
-    const int64 input_depth = input_in_mkl_format
-                                  ? mkl_params_.input_shape.GetSizes()[2]
-                                  : GetTensorDim(input, data_format_, 'C');
+    const int64 input_depth =
+        input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'C')
+                            : GetTensorDim(input, data_format_, 'C');
     OP_REQUIRES(context, input_depth == filter.dim_size(2),
                 errors::InvalidArgument(
                     "input and filter must have the same depth: ", input_depth,
@@ -116,9 +116,9 @@ class MklConv2DOp : public OpKernel {
 
     // The second dimension for input is rows/height.
     // The first dimension for filter is rows/height.
-    const int64 input_rows_raw = input_in_mkl_format
-                                     ? mkl_params_.input_shape.GetSizes()[1]
-                                     : GetTensorDim(input, data_format_, 'H');
+    const int64 input_rows_raw =
+        input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'H')
+                            : GetTensorDim(input, data_format_, 'H');
     OP_REQUIRES(
         context,
         FastBoundsCheck(input_rows_raw, std::numeric_limits<int>::max()),
@@ -128,9 +128,9 @@ class MklConv2DOp : public OpKernel {
 
     // The third dimension for input is columns/width.
     // The second dimension for filter is columns/width.
-    const int64 input_cols_raw = input_in_mkl_format
-                                     ? mkl_params_.input_shape.GetSizes()[0]
-                                     : GetTensorDim(input, data_format_, 'W');
+    const int64 input_cols_raw =
+        input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'W')
+                            : GetTensorDim(input, data_format_, 'W');
     OP_REQUIRES(
         context,
         FastBoundsCheck(input_cols_raw, std::numeric_limits<int>::max()),
@@ -139,9 +139,9 @@ class MklConv2DOp : public OpKernel {
     const int filter_cols = static_cast<int>(filter.dim_size(1));
 
     // The first dimension for input is batch.
-    const int64 input_batch_raw = input_in_mkl_format
-                                      ? mkl_params_.input_shape.GetSizes()[3]
-                                      : GetTensorDim(input, data_format_, 'N');
+    const int64 input_batch_raw =
+        input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'N')
+                            : GetTensorDim(input, data_format_, 'N');
     OP_REQUIRES(
         context,
         FastBoundsCheck(input_batch_raw, std::numeric_limits<int>::max()),
@@ -184,98 +184,105 @@ class MklConv2DOp : public OpKernel {
     }
 
     // Create MKL convolution primitives
-    mkl_params_.in_dims = input_in_mkl_format
-                              ? mkl_params_.input_shape.GetDimension()
+    mkl_context.in_dims = input_in_mkl_format
+                              ? mkl_context.input_shape.GetDimension()
                               : input.dims();
-    mkl_params_.filter_dims = filter.dims();
-    mkl_params_.in_sizes[0] = static_cast<size_t>(input_cols);
-    mkl_params_.in_sizes[1] = static_cast<size_t>(input_rows);
-    mkl_params_.in_sizes[2] = static_cast<size_t>(input_depth);
-    mkl_params_.in_sizes[3] = static_cast<size_t>(batch);
-    mkl_params_.out_sizes[0] = static_cast<size_t>(out_cols);
-    mkl_params_.out_sizes[1] = static_cast<size_t>(out_rows);
-    mkl_params_.out_sizes[2] = static_cast<size_t>(out_depth);
-    mkl_params_.out_sizes[3] = static_cast<size_t>(batch);
-    mkl_params_.input_offset[0] = static_cast<int>(-pad_cols);
-    mkl_params_.input_offset[1] = static_cast<int>(-pad_rows);
-    mkl_params_.conv_stride[0] = static_cast<size_t>(stride_cols);
-    mkl_params_.conv_stride[1] = static_cast<size_t>(stride_rows);
-
-    GetStridesFromSizes(data_format_, mkl_params_.out_strides,
-                        mkl_params_.out_sizes);
-    GetStridesFromSizes(data_format_, mkl_params_.in_strides,
-                        mkl_params_.in_sizes);
+    mkl_context.filter_dims = filter.dims();
+
+    mkl_context.in_sizes[MklDims::W] = static_cast<size_t>(input_cols);
+    mkl_context.in_sizes[MklDims::H] = static_cast<size_t>(input_rows);
+    mkl_context.in_sizes[MklDims::C] = static_cast<size_t>(input_depth);
+    mkl_context.in_sizes[MklDims::N] = static_cast<size_t>(batch);
+
+    mkl_context.out_sizes[MklDims::W] = static_cast<size_t>(out_cols);
+    mkl_context.out_sizes[MklDims::H] = static_cast<size_t>(out_rows);
+    mkl_context.out_sizes[MklDims::C] = static_cast<size_t>(out_depth);
+    mkl_context.out_sizes[MklDims::N] = static_cast<size_t>(batch);
+
+    mkl_context.input_offset[0] = static_cast<int>(-pad_cols);
+    mkl_context.input_offset[1] = static_cast<int>(-pad_rows);
+
+    mkl_context.conv_stride[0] = static_cast<size_t>(stride_cols);
+    mkl_context.conv_stride[1] = static_cast<size_t>(stride_rows);
+
+    GetStridesFromSizes(data_format_, mkl_context.out_strides,
+                        mkl_context.out_sizes);
+    GetStridesFromSizes(data_format_, mkl_context.in_strides,
+                        mkl_context.in_sizes);
 
     // TF filter dimension order (out_depth, in_depth, cols, rows) ->
     // MKL filter dimension order (out_depth, in_depth, rows, cols)
-    mkl_params_.filter_sizes[0] = filter.dim_size(1);  // cols
-    mkl_params_.filter_sizes[1] = filter.dim_size(0);  // rows
-    mkl_params_.filter_sizes[2] = filter.dim_size(2);  // in_depth
-    mkl_params_.filter_sizes[3] = filter.dim_size(3);  // out_depth
+    mkl_context.filter_sizes[0] = filter.dim_size(1);  // cols
+    mkl_context.filter_sizes[1] = filter.dim_size(0);  // rows
+    mkl_context.filter_sizes[2] = filter.dim_size(2);  // in_depth
+    mkl_context.filter_sizes[3] = filter.dim_size(3);  // out_depth
 
     // TF filter layout - (rows, cols, in_depth, out_depth)
-    mkl_params_.filter_strides[0] =
+    mkl_context.filter_strides[0] =
         filter.dim_size(2) * filter.dim_size(3);  // cols
-    mkl_params_.filter_strides[1] =
+    mkl_context.filter_strides[1] =
         filter.dim_size(1) * filter.dim_size(2) * filter.dim_size(3);  // rows
-    mkl_params_.filter_strides[2] = filter.dim_size(3);  // in_depth
-    mkl_params_.filter_strides[3] = 1;                   // out_depth
+    mkl_context.filter_strides[2] = filter.dim_size(3);  // in_depth
+    mkl_context.filter_strides[3] = 1;                   // out_depth
 
     if (biasEnabled) {
       const Tensor& bias = MklGetInput(context, 2);
-      mkl_params_.bias_sizes[0] = {static_cast<size_t>(bias.dim_size(0))};
-      mkl_params_.bias_strides[0] = {1};
+      mkl_context.bias_sizes[0] = {static_cast<size_t>(bias.dim_size(0))};
+      mkl_context.bias_strides[0] = {1};
     }
 
     // Create Convolution Primitive
     if (biasEnabled) {
-      CHECK_EQ(dnnConvolutionCreateForwardBias_F32(
-                   &mkl_prim_convolution_fwd_, nullptr,
-                   dnnAlgorithmConvolutionDirect, mkl_params_.in_dims,
-                   mkl_params_.in_sizes, mkl_params_.out_sizes,
-                   mkl_params_.filter_sizes, mkl_params_.conv_stride,
-                   mkl_params_.input_offset, dnnBorderZeros),
-               E_SUCCESS);
+      CHECK_EQ(
+          dnnConvolutionCreateForwardBias_F32(
+              &mkl_context.prim_fwd, nullptr, dnnAlgorithmConvolutionDirect,
+              mkl_context.in_dims, mkl_context.in_sizes, mkl_context.out_sizes,
+              mkl_context.filter_sizes, mkl_context.conv_stride,
+              mkl_context.input_offset, dnnBorderZeros),
+          E_SUCCESS);
     } else {
-      CHECK_EQ(dnnConvolutionCreateForward_F32(
-                   &mkl_prim_convolution_fwd_, nullptr,
-                   dnnAlgorithmConvolutionDirect, mkl_params_.in_dims,
-                   mkl_params_.in_sizes, mkl_params_.out_sizes,
-                   mkl_params_.filter_sizes, mkl_params_.conv_stride,
-                   mkl_params_.input_offset, dnnBorderZeros),
-               E_SUCCESS);
+      CHECK_EQ(
+          dnnConvolutionCreateForward_F32(
+              &mkl_context.prim_fwd, nullptr, dnnAlgorithmConvolutionDirect,
+              mkl_context.in_dims, mkl_context.in_sizes, mkl_context.out_sizes,
+              mkl_context.filter_sizes, mkl_context.conv_stride,
+              mkl_context.input_offset, dnnBorderZeros),
+          E_SUCCESS);
     }
 
     TensorShape mkl_output_tf_shape;
     MklShape mkl_output_mkl_shape;
     mkl_output_mkl_shape.SetMklTensor(true);
-    mkl_output_mkl_shape.SetMklLayout(mkl_prim_convolution_fwd_,
-                                      dnnResourceDst);
-    mkl_output_mkl_shape.SetTfLayout(mkl_params_.in_dims, mkl_params_.out_sizes,
-                                     mkl_params_.out_strides);
+    mkl_output_mkl_shape.SetMklLayout(mkl_context.prim_fwd, dnnResourceDst);
+    mkl_output_mkl_shape.SetTfLayout(mkl_context.in_dims, mkl_context.out_sizes,
+                                     mkl_context.out_strides);
+    // MKL might change the dimension ordering
+    // Create mapping to recover the original TF dimension order
+    mkl_output_mkl_shape.SetTfDimOrder(mkl_context.in_dims, data_format_);
+
     mkl_output_tf_shape.AddDim(
         dnnLayoutGetMemorySize_F32(
             static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
         sizeof(T));
     AllocateOutputSetMklshape(context, 0, &output, mkl_output_tf_shape,
                               mkl_output_mkl_shape);
-    mkl_conv_res_[dnnResourceDst] =
+    mkl_context.conv_res[dnnResourceDst] =
         static_cast<void*>(output->flat<T>().data());
 
-    MklCreateInputLayouts(context);
+    mkl_context.MklCreateInputLayouts(context);
 
     Tensor mkl_tmp_input_buf_tensor, mkl_tmp_filter_buf_tensor,
         mkl_tmp_bias_buf_tensor;  // Temp tensor used to allocate tmp
                                   // buffers
-    MklPrepareConvolutionInputs(context, &mkl_tmp_input_buf_tensor,
-                                &mkl_tmp_filter_buf_tensor,
-                                &mkl_tmp_bias_buf_tensor);
+    mkl_context.MklPrepareConvolutionInputs(context, &mkl_tmp_input_buf_tensor,
+                                            &mkl_tmp_filter_buf_tensor,
+                                            &mkl_tmp_bias_buf_tensor);
 
     // Execute convolution
-    CHECK_EQ(dnnExecute_F32(mkl_prim_convolution_fwd_, mkl_conv_res_),
+    CHECK_EQ(dnnExecute_F32(mkl_context.prim_fwd, mkl_context.conv_res),
              E_SUCCESS);
 
-    MklCleanup();
+    mkl_context.MklCleanup();
   }
 
  private:
@@ -293,151 +300,141 @@ class MklConv2DOp : public OpKernel {
     int input_offset[2];
     size_t conv_stride[2];
     MklShape input_shape;
-  } MklConv2DOpParams;
-
-  // Create MKL dnnLayout_t objects for tensors coming into the layer
-  void MklCreateInputLayouts(OpKernelContext* context) {
-    bool input_in_mkl_format = mkl_params_.input_shape.IsMklTensor();
-    if (input_in_mkl_format) {
-      mkl_lt_input_ =
-          static_cast<dnnLayout_t>(mkl_params_.input_shape.GetCurLayout());
-    } else {
-      CHECK_EQ(
-          dnnLayoutCreate_F32(&mkl_lt_input_, mkl_params_.in_dims,
-                              mkl_params_.in_sizes, mkl_params_.in_strides),
-          E_SUCCESS);
-    }
-
-    CHECK_EQ(dnnLayoutCreate_F32(&mkl_lt_filter_, mkl_params_.filter_dims,
-                                 mkl_params_.filter_sizes,
-                                 mkl_params_.filter_strides),
-             E_SUCCESS);
+    dnnPrimitive_t prim_fwd;
+    void* conv_res[dnnResourceNumber];
+    dnnLayout_t lt_filter, lt_bias, lt_input;
+
+    // Create MKL dnnLayout_t objects for tensors coming into the layer
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      if (input_in_mkl_format) {
+        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      }
 
-    if (biasEnabled) {
-      CHECK_EQ(dnnLayoutCreate_F32(&mkl_lt_bias_, 1, mkl_params_.bias_sizes,
-                                   mkl_params_.bias_strides),
+      CHECK_EQ(dnnLayoutCreate_F32(&lt_filter, filter_dims, filter_sizes,
+                                   filter_strides),
                E_SUCCESS);
-    }
-  }
 
-  // Compare incoming tensor layouts with MKL preferred layouts and convert
-  // data to the preferred layout if necessary
-  void MklPrepareConvolutionInputs(OpKernelContext* context,
-                                   Tensor* mkl_tmp_input_buf_tensor,
-                                   Tensor* mkl_tmp_filter_buf_tensor,
-                                   Tensor* mkl_tmp_bias_buf_tensor) {
-    bool mkl_convert_input, mkl_convert_filter, mkl_convert_bias;
-    dnnPrimitive_t mkl_prim_convert_filter, mkl_prim_convert_bias,
-        mkl_prim_convert_input;
-    dnnLayout_t mkl_lt_internal_filter, mkl_lt_internal_bias,
-        mkl_lt_internal_input;
-    void *mkl_buf_convert_input, *mkl_buf_convert_filter, *mkl_buf_convert_bias;
-    mkl_prim_convert_filter = nullptr;
-    mkl_prim_convert_bias = nullptr;
-    mkl_prim_convert_input = nullptr;
-    mkl_lt_internal_filter = nullptr;
-    mkl_lt_internal_bias = nullptr;
-    mkl_lt_internal_input = nullptr;
-    mkl_buf_convert_input = nullptr;
-    mkl_buf_convert_filter = nullptr;
-    mkl_buf_convert_bias = nullptr;
-
-    // Compare with internal layouts and convert if needed
-    const Tensor& input = MklGetInput(context, 0);
-    void* mkl_buf_input =
-        const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
-    CHECK_EQ(
-        dnnLayoutCreateFromPrimitive_F32(
-            &mkl_lt_internal_input, mkl_prim_convolution_fwd_, dnnResourceSrc),
-        E_SUCCESS);
-    mkl_convert_input =
-        !dnnLayoutCompare_F32(mkl_lt_internal_input, mkl_lt_input_);
-    if (mkl_convert_input) {
-      CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input, mkl_lt_input_,
-                                       mkl_lt_internal_input),
-               E_SUCCESS);
-      AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
-                     &mkl_buf_convert_input);
-      CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input, mkl_buf_input,
-                                        mkl_buf_convert_input),
-               E_SUCCESS);
-      dnnDelete_F32(mkl_prim_convert_input);
+      if (biasEnabled) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_bias, 1, bias_sizes, bias_strides),
+                 E_SUCCESS);
+      }
     }
-    dnnLayoutDelete_F32(mkl_lt_internal_input);
-
-    mkl_conv_res_[dnnResourceSrc] =
-        (mkl_convert_input) ? mkl_buf_convert_input : mkl_buf_input;
 
-    const Tensor& filter = MklGetInput(context, 1);
-    void* mkl_buf_filter =
-        const_cast<void*>(static_cast<const void*>(filter.flat<T>().data()));
-    CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_filter,
-                                              mkl_prim_convolution_fwd_,
-                                              dnnResourceFilter),
-             E_SUCCESS);
-    mkl_convert_filter =
-        !dnnLayoutCompare_F32(mkl_lt_internal_filter, mkl_lt_filter_);
-    if (mkl_convert_filter) {
-      CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_filter, mkl_lt_filter_,
-                                       mkl_lt_internal_filter),
-               E_SUCCESS);
-      AllocTmpBuffer(context, mkl_tmp_filter_buf_tensor, mkl_lt_internal_filter,
-                     &mkl_buf_convert_filter);
-      CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_filter, mkl_buf_filter,
-                                        mkl_buf_convert_filter),
+    // Compare incoming tensor layouts with MKL preferred layouts and convert
+    // data to the preferred layout if necessary
+    void MklPrepareConvolutionInputs(OpKernelContext* context,
+                                     Tensor* mkl_tmp_input_buf_tensor,
+                                     Tensor* mkl_tmp_filter_buf_tensor,
+                                     Tensor* mkl_tmp_bias_buf_tensor) {
+      bool mkl_convert_input, mkl_convert_filter, mkl_convert_bias;
+      dnnPrimitive_t mkl_prim_convert_filter, mkl_prim_convert_bias,
+          mkl_prim_convert_input;
+      dnnLayout_t mkl_lt_internal_filter, mkl_lt_internal_bias,
+          mkl_lt_internal_input;
+      void *mkl_buf_convert_input, *mkl_buf_convert_filter,
+          *mkl_buf_convert_bias;
+      mkl_prim_convert_filter = nullptr;
+      mkl_prim_convert_bias = nullptr;
+      mkl_prim_convert_input = nullptr;
+      mkl_lt_internal_filter = nullptr;
+      mkl_lt_internal_bias = nullptr;
+      mkl_lt_internal_input = nullptr;
+      mkl_buf_convert_input = nullptr;
+      mkl_buf_convert_filter = nullptr;
+      mkl_buf_convert_bias = nullptr;
+
+      // Compare with internal layouts and convert if needed
+      const Tensor& input = MklGetInput(context, 0);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_input,
+                                                prim_fwd, dnnResourceSrc),
                E_SUCCESS);
-      dnnDelete_F32(mkl_prim_convert_filter);
-    }
-    dnnLayoutDelete_F32(mkl_lt_internal_filter);
+      mkl_convert_input =
+          !dnnLayoutCompare_F32(mkl_lt_internal_input, lt_input);
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input, lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &mkl_buf_convert_input);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input, mkl_buf_input,
+                                          mkl_buf_convert_input),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_input);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
 
-    mkl_conv_res_[dnnResourceFilter] =
-        (mkl_convert_filter) ? mkl_buf_convert_filter : mkl_buf_filter;
+      conv_res[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_convert_input : mkl_buf_input;
 
-    if (biasEnabled) {
-      const Tensor& bias = MklGetInput(context, 2);
-      void* mkl_buf_bias =
-          const_cast<void*>(static_cast<const void*>(bias.flat<T>().data()));
-      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_bias,
-                                                mkl_prim_convolution_fwd_,
-                                                dnnResourceBias),
+      const Tensor& filter = MklGetInput(context, 1);
+      void* mkl_buf_filter =
+          const_cast<void*>(static_cast<const void*>(filter.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_filter,
+                                                prim_fwd, dnnResourceFilter),
                E_SUCCESS);
-      mkl_convert_bias =
-          !dnnLayoutCompare_F32(mkl_lt_internal_bias, mkl_lt_bias_);
-      if (mkl_convert_bias) {
-        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_bias, mkl_lt_bias_,
-                                         mkl_lt_internal_bias),
+      mkl_convert_filter =
+          !dnnLayoutCompare_F32(mkl_lt_internal_filter, lt_filter);
+      if (mkl_convert_filter) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_filter, lt_filter,
+                                         mkl_lt_internal_filter),
                  E_SUCCESS);
-        AllocTmpBuffer(context, mkl_tmp_bias_buf_tensor, mkl_lt_internal_bias,
-                       &mkl_buf_convert_bias);
-        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_bias, mkl_buf_bias,
-                                          mkl_buf_convert_bias),
-                 E_SUCCESS);
-        dnnDelete_F32(mkl_prim_convert_bias);
+        AllocTmpBuffer(context, mkl_tmp_filter_buf_tensor,
+                       mkl_lt_internal_filter, &mkl_buf_convert_filter);
+        CHECK_EQ(
+            dnnConversionExecute_F32(mkl_prim_convert_filter, mkl_buf_filter,
+                                     mkl_buf_convert_filter),
+            E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_filter);
       }
-      dnnLayoutDelete_F32(mkl_lt_internal_bias);
+      dnnLayoutDelete_F32(mkl_lt_internal_filter);
+
+      conv_res[dnnResourceFilter] =
+          (mkl_convert_filter) ? mkl_buf_convert_filter : mkl_buf_filter;
 
-      mkl_conv_res_[dnnResourceBias] =
-          (mkl_convert_bias) ? mkl_buf_convert_bias : mkl_buf_bias;
+      if (biasEnabled) {
+        const Tensor& bias = MklGetInput(context, 2);
+        void* mkl_buf_bias =
+            const_cast<void*>(static_cast<const void*>(bias.flat<T>().data()));
+        CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_bias,
+                                                  prim_fwd, dnnResourceBias),
+                 E_SUCCESS);
+        mkl_convert_bias = !dnnLayoutCompare_F32(mkl_lt_internal_bias, lt_bias);
+        if (mkl_convert_bias) {
+          CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_bias, lt_bias,
+                                           mkl_lt_internal_bias),
+                   E_SUCCESS);
+          AllocTmpBuffer(context, mkl_tmp_bias_buf_tensor, mkl_lt_internal_bias,
+                         &mkl_buf_convert_bias);
+          CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_bias, mkl_buf_bias,
+                                            mkl_buf_convert_bias),
+                   E_SUCCESS);
+          dnnDelete_F32(mkl_prim_convert_bias);
+        }
+        dnnLayoutDelete_F32(mkl_lt_internal_bias);
+
+        conv_res[dnnResourceBias] =
+            (mkl_convert_bias) ? mkl_buf_convert_bias : mkl_buf_bias;
+      }
     }
-  }
 
-  void MklCleanup() {
-    bool input_in_mkl_format = mkl_params_.input_shape.IsMklTensor();
-    dnnDelete_F32(mkl_prim_convolution_fwd_);
-    if (!input_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_input_);
-    dnnLayoutDelete_F32(mkl_lt_filter_);
-    if (biasEnabled) dnnLayoutDelete_F32(mkl_lt_bias_);
-  }
+    void MklCleanup() {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      dnnDelete_F32(prim_fwd);
+      if (!input_in_mkl_format) dnnLayoutDelete_F32(lt_input);
+      dnnLayoutDelete_F32(lt_filter);
+      if (biasEnabled) dnnLayoutDelete_F32(lt_bias);
+    }
+  } MklConv2DOpContext;
 
   std::vector<int32> strides_;
   Padding padding_;
   TensorFormat data_format_;
-
-  MklConv2DOpParams mkl_params_;
-  dnnPrimitive_t mkl_prim_convolution_fwd_ = nullptr;
-  void* mkl_conv_res_[dnnResourceNumber];
-  dnnLayout_t mkl_lt_filter_ = nullptr, mkl_lt_bias_ = nullptr,
-              mkl_lt_input_ = nullptr;
 };
 
 #define REGISTER_MKL_CPU(T)                                               \
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
new file mode 100644
index 0000000000..9d6cfb0c97
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -0,0 +1,506 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/nn_ops.cc.
+#ifdef INTEL_MKL
+#define EIGEN_USE_THREADS
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/util/mkl_util.h"
+#include "tensorflow/core/util/padding.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+// An implementation of MaxPooling (forward).
+template <typename Device, typename T>
+class MklMaxPoolingOp : public OpKernel {
+ public:
+  explicit MklMaxPoolingOp(OpKernelConstruction* context) : OpKernel(context) {
+    string data_format;
+
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 4,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 4,
+                errors::InvalidArgument("Sliding window stride field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    OP_REQUIRES(context, ksize_[0] == 1 && stride_[0] == 1,
+                errors::Unimplemented("Pooling is not yet supported on the "
+                                      "batch dimension."));
+
+    workspace_enabled_ = false;
+    // We may not get this attribute for this node if it does not go through
+    // graph rewrite pass. So we do not check for error while retrieving this
+    // attribute value.
+    context->GetAttr("workspace_enabled", &workspace_enabled_);
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklMaxPoolingOpContext mkl_context;
+    // Get the input tensor
+    const Tensor& tensor_in = MklGetInput(context, 0);
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+
+    mkl_context.params.in_dim = 4;
+    MklPoolParameters pool_params;
+    if (input_in_mkl_format == false) {
+      pool_params.Init(context, ksize_, stride_, padding_, data_format_,
+                       tensor_in.shape());
+      OP_REQUIRES(
+          context, (pool_params.depth_window == 1),
+          errors::Unimplemented("Depthwise max pooling not supported by MKL"));
+
+    } else {
+      pool_params.Init(context, ksize_, stride_, padding_, data_format_,
+                       &mkl_context.input_shape);
+    }
+
+    // Extract the parameters for the op from the pooling specs
+
+    ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
+
+    mkl_context.MklCreateLayoutsAndPrimitives(context);
+
+    // Declare output tensor
+    TensorShape tensor_out_shape;
+    MklShape mkl_out_shape;
+    mkl_out_shape.SetMklTensor(true);
+    mkl_out_shape.SetMklLayout(mkl_context.prim_pooling_fwd, dnnResourceDst);
+    mkl_out_shape.SetTfLayout(mkl_context.params.in_dim,
+                              mkl_context.params.out_sizes,
+                              mkl_context.params.out_strides);
+    mkl_out_shape.SetTfDimOrder(mkl_context.params.in_dim, data_format_);
+
+    Tensor* output_tensor = nullptr;
+    tensor_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                                mkl_out_shape.GetMklLayout())) /
+                            sizeof(T));
+    AllocateOutputSetMklshape(context, 0, &output_tensor, tensor_out_shape,
+                              mkl_out_shape);
+
+    if (!workspace_enabled_) {
+      mkl_out_shape.SetMklTensor(false);
+    }
+
+    Tensor* workspace_tensor;
+    void* workspace_buf = nullptr;
+    if (workspace_enabled_) {
+      TensorShape workspace_shape;
+      workspace_shape.AddDim(
+          dnnLayoutGetMemorySize_F32(
+              static_cast<dnnLayout_t>(mkl_context.lt_workspace)) /
+          sizeof(T));
+      AllocateOutputSetMklshape(context, 1, &workspace_tensor, workspace_shape,
+                                mkl_out_shape);
+      mkl_context.pooling_res[dnnResourceWorkspace] = const_cast<void*>(
+          static_cast<const void*>(workspace_tensor->flat<T>().data()));
+    } else {
+      AllocTmpBuffer(context, workspace_tensor, mkl_context.lt_workspace,
+                     &workspace_buf);
+      mkl_context.pooling_res[dnnResourceWorkspace] = workspace_buf;
+    }
+
+    mkl_context.pooling_res[dnnResourceSrc] =
+        const_cast<void*>(static_cast<const void*>(tensor_in.flat<T>().data()));
+    mkl_context.pooling_res[dnnResourceDst] = const_cast<void*>(
+        static_cast<const void*>(output_tensor->flat<T>().data()));
+
+    CHECK_EQ(
+        dnnExecute_F32(mkl_context.prim_pooling_fwd, mkl_context.pooling_res),
+        E_SUCCESS);
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    MklPoolingOpParams params;
+    MklShape input_shape;
+    void* pooling_res[dnnResourceNumber];
+    dnnPrimitive_t prim_pooling_fwd;
+    dnnLayout_t lt_user_input, lt_workspace;
+
+    void MklCreateLayoutsAndPrimitives(OpKernelContext* context) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      // Create or use existing DNN user layout
+      if (input_in_mkl_format == false) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_user_input, params.in_dim,
+                                     params.in_sizes, params.in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_user_input = (dnnLayout_t)input_shape.GetCurLayout();
+      }
+
+      dnnAlgorithm_t algorithm = dnnAlgorithmPoolingMax;
+      dnnPrimitiveAttributes_t primAttr = nullptr;
+
+      // Create DNN primitives
+      CHECK_EQ(dnnPoolingCreateForward_F32(
+                   &prim_pooling_fwd, primAttr, algorithm, lt_user_input,
+                   params.kernel_size, params.kernel_stride, params.in_offset,
+                   dnnBorderZerosAsymm),
+               E_SUCCESS);
+
+      // Creates layout for the workspace
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_workspace, prim_pooling_fwd,
+                                                dnnResourceWorkspace),
+               E_SUCCESS);
+    }
+
+    void MklCleanup() {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      CHECK_EQ(dnnDelete_F32(prim_pooling_fwd), E_SUCCESS);
+      if (!input_in_mkl_format) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_user_input), E_SUCCESS);
+      }
+      CHECK_EQ(dnnLayoutDelete_F32(lt_workspace), E_SUCCESS);
+    }
+  } MklMaxPoolingOpContext;
+
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+  TensorFormat data_format_;
+  bool workspace_enabled_;
+};
+
+// The operation to compute MaxPool gradients.
+// It takes three inputs:
+//   - The original input tensor
+//   - The original output tensor
+//   - Backprop tensor for output
+// It produces one output: backprop tensor for input.
+template <class Device, class T>
+class MklMaxPoolingGradOp : public OpKernel {
+ public:
+  explicit MklMaxPoolingGradOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string data_format;
+
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 4,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 4,
+                errors::InvalidArgument("Sliding window strides field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    OP_REQUIRES(context, ksize_[0] == 1 && stride_[0] == 1,
+                errors::Unimplemented(
+                    "Pooling is not yet supported on the batch dimension."));
+    workspace_enabled_ = false;
+    // We may not get this attribute for this node if it does not go through
+    // graph rewrite pass. So we do not check for error while retrieving this
+    // attribute value.
+    context->GetAttr("workspace_enabled", &workspace_enabled_);
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklMaxPoolingGradOpContext mkl_context;
+    // Input - The original input tensor
+    const Tensor& tensor_in = MklGetInput(context, 0);
+
+    // Output - Backprop tensor for input.
+    Tensor* output_tensor = nullptr;
+
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    GetMklShape(context, 2, &mkl_context.output_backprop_shape);
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+
+    if (input_in_mkl_format == false)
+      mkl_context.params.in_dim = tensor_in.dims();
+    else
+      mkl_context.params.in_dim = mkl_context.input_shape.GetDimension();
+
+    MklPoolParameters pool_params;
+    if (input_in_mkl_format == false) {
+      pool_params.Init(context, ksize_, stride_, padding_, data_format_,
+                       tensor_in.shape());
+      OP_REQUIRES(
+          context, (pool_params.depth_window == 1),
+          errors::Unimplemented("Depthwise max pooling not supported by MKL"));
+
+    } else {
+      pool_params.Init(context, ksize_, stride_, padding_, data_format_,
+                       &mkl_context.input_shape);
+    }
+
+    // Extract the parameters for the op from the pooling specs
+    ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
+
+    mkl_context.MklCreateLayouts(context);
+    mkl_context.MklCreatePrimitives(context, workspace_enabled_);
+    mkl_context.MklPrepareInputs(context, workspace_enabled_);
+
+    // Create shape for the input back prop output
+    TensorShape mkl_input_backprop;
+    MklShape mkl_output_shape;
+    mkl_output_shape.SetMklTensor(true);
+    mkl_output_shape.SetMklLayout(mkl_context.prim_pooling_bwd,
+                                  dnnResourceDiffSrc);
+    mkl_output_shape.SetTfLayout(mkl_context.params.in_dim,
+                                 mkl_context.params.in_sizes,
+                                 mkl_context.params.in_strides);
+    mkl_output_shape.SetTfDimOrder(mkl_context.params.in_dim, data_format_);
+
+    mkl_input_backprop.AddDim(
+        dnnLayoutGetMemorySize_F32(
+            static_cast<dnnLayout_t>(mkl_output_shape.GetMklLayout())) /
+        sizeof(T));
+    AllocateOutputSetMklshape(context, 0, &output_tensor, mkl_input_backprop,
+                              mkl_output_shape);
+    mkl_context.pooling_res[dnnResourceDiffSrc] = const_cast<void*>(
+        static_cast<const void*>(output_tensor->flat<T>().data()));
+
+    int64 output_size = output_tensor->NumElements();
+    for (int64 i = 0; i < output_size; ++i) {
+      (static_cast<float*>(mkl_context.pooling_res[dnnResourceDiffSrc]))[i] = 0;
+    }
+
+    CHECK_EQ(
+        dnnExecute_F32(mkl_context.prim_pooling_bwd, mkl_context.pooling_res),
+        E_SUCCESS);
+
+    mkl_context.MklCleanup(workspace_enabled_);
+  }
+
+ private:
+  typedef struct {
+    MklPoolingOpParams params;
+    MklShape input_shape, output_backprop_shape;
+    void* pooling_resfwd[dnnResourceNumber];
+    void* pooling_res[dnnResourceNumber];
+    dnnPrimitive_t prim_pooling_fwd, prim_pooling_bwd, convert_input,
+        convert_outbackprop;
+    dnnLayout_t lt_outbackprop_user, lt_outbackprop_prim, lt_input_user,
+        lt_input_prim;
+    void* input_buf;
+    void* outbackprop_buf;
+
+    void MklCreateLayouts(OpKernelContext* context) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      bool outbackprop_in_mkl_format = output_backprop_shape.IsMklTensor();
+      // Create DNN user layout for input and outbackprop or get existing layout
+      if (input_in_mkl_format == false) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input_user, params.in_dim,
+                                     params.in_sizes, params.in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_input_user = (dnnLayout_t)input_shape.GetCurLayout();
+      }
+
+      // We dont care about the output layout for now as we can create it from
+      // primitives for the max pooling fwd prop
+      if (outbackprop_in_mkl_format == false) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_outbackprop_user, params.in_dim,
+                                     params.out_sizes, params.out_strides),
+                 E_SUCCESS);
+      } else {
+        lt_outbackprop_user = (dnnLayout_t)output_backprop_shape.GetCurLayout();
+      }
+    }
+
+    // Create DNN primitives
+    void MklCreatePrimitives(OpKernelContext* context, bool workspace_enabled) {
+      dnnAlgorithm_t algorithm = dnnAlgorithmPoolingMax;
+      dnnPrimitiveAttributes_t primAttr = nullptr;
+
+      if (workspace_enabled == false) {
+        CHECK_EQ(dnnPoolingCreateForward_F32(
+                     &prim_pooling_fwd, primAttr, algorithm, lt_input_user,
+                     params.kernel_size, params.kernel_stride, params.in_offset,
+                     dnnBorderZerosAsymm),
+                 E_SUCCESS);
+      }
+
+      CHECK_EQ(dnnPoolingCreateBackward_F32(
+                   &prim_pooling_bwd, primAttr, algorithm, lt_input_user,
+                   params.kernel_size, params.kernel_stride, params.in_offset,
+                   dnnBorderZerosAsymm),
+               E_SUCCESS);
+
+      // Creates conversions
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &lt_outbackprop_prim, prim_pooling_bwd, dnnResourceDiffDst),
+               E_SUCCESS);
+
+      // Tensors needed to create temporary buffers
+      Tensor input_buf_tensor, outbackprop_buf_tensor;
+
+      if (workspace_enabled == false) {
+        CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                     &lt_input_prim, prim_pooling_fwd, dnnResourceSrc),
+                 E_SUCCESS);
+        if (!dnnLayoutCompare_F32(lt_input_user, lt_input_prim)) {
+          CHECK_EQ(dnnConversionCreate_F32(&convert_input, lt_input_user,
+                                           lt_input_prim),
+                   E_SUCCESS);
+          AllocTmpBuffer(context, &input_buf_tensor, lt_input_prim, &input_buf);
+        }
+      }
+
+      if (!dnnLayoutCompare_F32(lt_outbackprop_user, lt_outbackprop_prim)) {
+        CHECK_EQ(
+            dnnConversionCreate_F32(&convert_outbackprop, lt_outbackprop_user,
+                                    lt_outbackprop_prim),
+            E_SUCCESS);
+        AllocTmpBuffer(context, &outbackprop_buf_tensor, lt_outbackprop_prim,
+                       &outbackprop_buf);
+      }
+    }
+
+    // Compare incoming tensor layouts with MKL preferred layouts and convert
+    // data to the preferred layout if necessary
+    void MklPrepareInputs(OpKernelContext* context, bool workspace_enabled) {
+      const Tensor& tensor_in = MklGetInput(context, 0);
+      const Tensor& out_backprop = MklGetInput(context, 2);
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      bool outbackprop_in_mkl_format = output_backprop_shape.IsMklTensor();
+
+      void* tmp_output_buf;
+      Tensor tmp_output_buf_tensor;
+
+      void* workspace_buf;
+      Tensor workspace_buf_tensor;
+
+      if (workspace_enabled == false) {
+        if (convert_input != nullptr) {
+          if (input_in_mkl_format == false) {
+            CHECK_EQ(dnnConversionExecute_F32(
+                         convert_input,
+                         const_cast<void*>(static_cast<const void*>(
+                             tensor_in.flat<T>().data())),
+                         input_buf),
+                     E_SUCCESS);
+            CHECK_EQ(dnnDelete_F32(convert_input), E_SUCCESS);
+            convert_input = nullptr;
+          } else {
+            input_shape.GetConvertedFlatData(
+                lt_input_prim,
+                const_cast<void*>(
+                    static_cast<const void*>(tensor_in.flat<T>().data())),
+                input_buf);
+          }
+          pooling_resfwd[dnnResourceSrc] = input_buf;
+        } else {
+          pooling_resfwd[dnnResourceSrc] = const_cast<void*>(
+              static_cast<const void*>(tensor_in.flat<T>().data()));
+        }
+
+        dnnLayout_t lt_workspace;
+        CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                     &lt_workspace, prim_pooling_fwd, dnnResourceWorkspace),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, &workspace_buf_tensor, lt_workspace,
+                       &workspace_buf);
+        pooling_resfwd[dnnResourceWorkspace] = workspace_buf;
+
+        dnnLayoutDelete_F32(lt_workspace);
+
+        // We create the layout for max pooling fwd prop tmp output here
+        AllocTmpBuffer(context, &tmp_output_buf_tensor, lt_outbackprop_prim,
+                       &tmp_output_buf);
+        pooling_resfwd[dnnResourceDst] = tmp_output_buf;
+
+        CHECK_EQ(dnnExecute_F32(prim_pooling_fwd, pooling_resfwd), E_SUCCESS);
+        pooling_res[dnnResourceWorkspace] =
+            pooling_resfwd[dnnResourceWorkspace];
+      } else {
+        const Tensor& workspace = MklGetInput(context, 3);
+        pooling_res[dnnResourceWorkspace] = const_cast<void*>(
+            static_cast<const void*>(workspace.flat<T>().data()));
+      }
+
+      // Out backprop conversions if needed
+      if (convert_outbackprop != nullptr) {
+        if (outbackprop_in_mkl_format == false) {
+          CHECK_EQ(dnnConversionExecute_F32(
+                       convert_outbackprop,
+                       const_cast<void*>(static_cast<const void*>(
+                           out_backprop.flat<T>().data())),
+                       outbackprop_buf),
+                   E_SUCCESS);
+          CHECK_EQ(dnnDelete_F32(convert_outbackprop), E_SUCCESS);
+        } else {
+          output_backprop_shape.GetConvertedFlatData(
+              lt_outbackprop_prim,
+              const_cast<void*>(
+                  static_cast<const void*>(out_backprop.flat<T>().data())),
+              outbackprop_buf);
+        }
+        pooling_res[dnnResourceDiffDst] = outbackprop_buf;
+      } else {
+        pooling_res[dnnResourceDiffDst] = const_cast<void*>(
+            static_cast<const void*>(out_backprop.flat<T>().data()));
+      }
+    }
+
+    void MklCleanup(bool workspace_enabled) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      bool outbackprop_in_mkl_format = output_backprop_shape.IsMklTensor();
+      if (workspace_enabled == false) {
+        CHECK_EQ(dnnDelete_F32(prim_pooling_fwd), E_SUCCESS);
+      }
+      CHECK_EQ(dnnDelete_F32(prim_pooling_bwd), E_SUCCESS);
+      if (outbackprop_in_mkl_format == false) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_outbackprop_user), E_SUCCESS);
+      }
+      CHECK_EQ(dnnLayoutDelete_F32(lt_outbackprop_prim), E_SUCCESS);
+      if (input_in_mkl_format == false) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_input_user), E_SUCCESS);
+      }
+      if (workspace_enabled == false) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_input_prim), E_SUCCESS);
+      }
+    }
+  } MklMaxPoolingGradOpContext;
+
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+  TensorFormat data_format_;
+
+  bool workspace_enabled_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("MklMaxPool")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<float>("T")
+                            .Label(mkl_layer_registry::kMklLayerLabel),
+                        MklMaxPoolingOp<CPUDevice, float>);
+
+REGISTER_KERNEL_BUILDER(Name("MklMaxPoolGrad")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<float>("T")
+                            .Label(mkl_layer_registry::kMklLayerLabel),
+                        MklMaxPoolingGradOp<CPUDevice, float>);
+
+}  // namespace tensorflow
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.cc b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
new file mode 100644
index 0000000000..d88bd4c640
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
@@ -0,0 +1,150 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef INTEL_MKL
+#include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
+#include <vector>
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/framework/common_shape_fns.h"
+
+namespace tensorflow {
+
+// Initialization for TensorFlow format
+void MklPoolParameters::Init(OpKernelContext* context,
+                             const std::vector<int32>& ksize,
+                             const std::vector<int32>& stride, Padding padding,
+                             TensorFormat data_format,
+                             const TensorShape& tensor_in_shape) {
+  // For maxpooling, tensor_in should have 4 dimensions.
+  OP_REQUIRES(context, tensor_in_shape.dims() == 4,
+              errors::InvalidArgument("tensor_in must be 4-dimensional"));
+
+  depth = GetTensorDim(tensor_in_shape, data_format, 'C');
+  tensor_in_cols = GetTensorDim(tensor_in_shape, data_format, 'W');
+  tensor_in_rows = GetTensorDim(tensor_in_shape, data_format, 'H');
+  tensor_in_batch = GetTensorDim(tensor_in_shape, data_format, 'N');
+
+  Init(context, ksize, stride, padding, data_format);
+}
+
+// Initialization for MKL format
+void MklPoolParameters::Init(OpKernelContext* context,
+                             const std::vector<int32>& ksize,
+                             const std::vector<int32>& stride, Padding padding,
+                             TensorFormat data_format,
+                             const MklShape* mklInputShape) {
+  // Get the input sizes
+  depth = mklInputShape->GetSizes()[2];
+  tensor_in_cols = mklInputShape->GetSizes()[0];
+  tensor_in_rows = mklInputShape->GetSizes()[1];
+  tensor_in_batch = mklInputShape->GetSizes()[3];
+
+  Init(context, ksize, stride, padding, data_format);
+}
+
+// Common Initialization for TensorFlow and MKL formats
+void MklPoolParameters::Init(OpKernelContext* context,
+                             const std::vector<int32>& ksize,
+                             const std::vector<int32>& stride, Padding padding,
+                             TensorFormat data_format) {
+  // Get the data format
+  this->data_format = data_format;
+
+  // Get the output sizes
+  window_rows = GetTensorDim(ksize, data_format, 'H');
+  window_cols = GetTensorDim(ksize, data_format, 'W');
+  depth_window = GetTensorDim(ksize, data_format, 'C');
+
+  // Get the strides
+  row_stride = GetTensorDim(stride, data_format, 'H');
+  col_stride = GetTensorDim(stride, data_format, 'W');
+  depth_stride = GetTensorDim(stride, data_format, 'C');
+
+  // We only support 2D pooling across width/height and depthwise
+  // pooling, not a combination.
+  OP_REQUIRES(context,
+              (depth_window == 1 || (window_rows == 1 && window_cols == 1)),
+              errors::Unimplemented(
+                  "MaxPooling supports exactly one of pooling across depth "
+                  "or pooling across width/height."));
+
+  if (depth_window == 1) {
+    OP_REQUIRES_OK(context, GetWindowedOutputSizeVerbose(
+                                tensor_in_rows, window_rows, row_stride,
+                                padding, &out_height, &pad_top, &pad_bottom));
+
+    OP_REQUIRES_OK(context, GetWindowedOutputSizeVerbose(
+                                tensor_in_cols, window_cols, col_stride,
+                                padding, &out_width, &pad_left, &pad_right));
+  } else {
+    // Our current version of depthwise max pooling does not support
+    // any padding, and expects the depth_window to equal the depth
+    // stride (no overlapping).
+    OP_REQUIRES(context, depth % depth_window == 0,
+                errors::Unimplemented("Depthwise max pooling requires the"
+                                      " depth window to evenly divide the"
+                                      " input depth"));
+    OP_REQUIRES(context, depth_stride == depth_window,
+                errors::Unimplemented("Depthwise max pooling requires the"
+                                      " depth window to equal the depth"
+                                      " stride"));
+
+    // The current version of depthwise max is only implemented on CPU.
+    OP_REQUIRES(context,
+                (DeviceType(static_cast<Device*>(context->device())
+                                ->attributes()
+                                .device_type()) == DeviceType(DEVICE_CPU)),
+                errors::Unimplemented("Depthwise max pooling is currently "
+                                      "only implemented for CPU devices."));
+
+    pad_depth = 0;
+    out_depth = depth / depth_window;
+  }
+}
+
+// Transfers the right parameters for pooling to the op parameters
+// Updates context->status if there is an invalid input.
+void ExtractMklOpParams(OpKernelContext* context, TensorFormat data_format,
+                        const MklPoolParameters& params,
+                        MklPoolingOpParams* mkl_params) {
+  mkl_params->in_sizes[0] = params.tensor_in_cols;
+  mkl_params->in_sizes[1] = params.tensor_in_rows;
+  mkl_params->in_sizes[2] = params.depth;
+  mkl_params->in_sizes[3] = params.tensor_in_batch;
+
+  GetStridesFromSizes(data_format, mkl_params->in_strides,
+                      mkl_params->in_sizes);
+
+  mkl_params->out_sizes[0] = params.out_width;
+  mkl_params->out_sizes[1] = params.out_height;
+  mkl_params->out_sizes[2] = params.depth;
+  mkl_params->out_sizes[3] = params.tensor_in_batch;
+
+  GetStridesFromSizes(data_format, mkl_params->out_strides,
+                      mkl_params->out_sizes);
+
+  mkl_params->in_offset[0] = -params.pad_left;
+  mkl_params->in_offset[1] = -params.pad_top;
+  mkl_params->in_offset[2] = -params.pad_right;
+  mkl_params->in_offset[3] = -params.pad_bottom;
+
+  mkl_params->kernel_stride[0] = params.col_stride;
+  mkl_params->kernel_stride[1] = params.row_stride;
+
+  mkl_params->kernel_size[0] = params.window_cols;
+  mkl_params->kernel_size[1] = params.window_rows;
+}
+}  // namespace tensorflow
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.h b/tensorflow/core/kernels/mkl_pooling_ops_common.h
new file mode 100644
index 0000000000..92ea2beb25
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_pooling_ops_common.h
@@ -0,0 +1,92 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CORE_KERNELS_MKL_POOLING_OPS_COMMON_H_
+#define TENSORFLOW_CORE_KERNELS_MKL_POOLING_OPS_COMMON_H_
+
+#ifdef INTEL_MKL
+#include <vector>
+#include "tensorflow/core/util/mkl_util.h"
+#include "tensorflow/core/util/padding.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+struct MklPoolParameters {
+  int depth;
+
+  int tensor_in_cols;
+  int tensor_in_rows;
+  int tensor_in_batch;
+
+  int window_rows;
+  int window_cols;
+  int depth_window;
+
+  int row_stride;
+  int col_stride;
+  int depth_stride;
+
+  int64 out_height;
+  int64 out_width;
+  int out_depth;
+
+  int64 pad_left;
+  int64 pad_right;
+  int64 pad_top;
+  int64 pad_bottom;
+  int pad_depth;
+
+  TensorFormat data_format;
+
+  // Updates context->status if there is an invalid input.
+  void Init(OpKernelContext* context, const std::vector<int32>& ksize,
+            const std::vector<int32>& stride, Padding padding,
+            TensorFormat data_format, const TensorShape& tensor_in_shape);
+  void Init(OpKernelContext* context, const std::vector<int32>& ksize,
+            const std::vector<int32>& stride, Padding padding,
+            TensorFormat data_format, const MklShape* mkl_in_shape);
+
+ private:
+  // Common initialization for TensorFlow and MKL formats
+  void Init(OpKernelContext* context, const std::vector<int32>& ksize,
+            const std::vector<int32>& stride, Padding padding,
+            TensorFormat data_format);
+};
+
+//-------------------------------------------------------------------
+// Utility functions
+
+typedef struct {
+  size_t in_dim;
+  size_t in_sizes[4];
+  size_t in_strides[4];
+  size_t out_sizes[4];
+  size_t out_strides[4];
+  int in_offset[4];
+  size_t kernel_stride[2];
+  size_t kernel_size[2];
+} MklPoolingOpParams;
+
+// Transfers the right parameters for pooling to the op parameters
+// Updates context->status if there is an invalid input.
+void ExtractMklOpParams(OpKernelContext* context, TensorFormat data_format,
+                        const MklPoolParameters& params,
+                        MklPoolingOpParams* mkl_params);
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
+#endif  // TENSORFLOW_CORE_KERNELS_MKL_POOLING_OPS_COMMON_H_
diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc
new file mode 100644
index 0000000000..7809711524
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_relu_op.cc
@@ -0,0 +1,397 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/nn_ops.cc.
+#ifdef INTEL_MKL
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/errors.h"
+
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/platform/default/logging.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+struct MklReluHelpers {
+  static void ValidateSameSizeHelper(OpKernelContext* context, const Tensor& g,
+                                     const Tensor& a) {
+    OP_REQUIRES(context, a.IsSameSize(g),
+                errors::InvalidArgument("g and a must be the same size"));
+  }
+  static bool ValidateSameSize(OpKernelContext* context, const Tensor& g,
+                               const Tensor& a) {
+    ValidateSameSizeHelper(context, g, a);
+    return context->status().ok();
+  }
+};
+
+template <typename Device, typename T>
+class MklReluOp : public OpKernel {
+ public:
+  ~MklReluOp() {}
+
+  explicit MklReluOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    MklReluOpContext mkl_context;
+
+    const Tensor& input = MklGetInput(context, 0);
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    void* user_i = static_cast<void*>(const_cast<T*>(input.flat<T>().data()));
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+    if (!input_in_mkl_format && !input.dims()) {  // handle the case of a scalar
+      const TensorShape& o_shape = input.shape();
+      Tensor* out_tensor = nullptr;
+      mkl_context.output_shape.SetMklTensor(false);
+      AllocateOutputSetMklshape(context, 0, &out_tensor, o_shape,
+                                mkl_context.output_shape);
+      void* out_o = static_cast<void*>(out_tensor->flat<T>().data());
+      (static_cast<T*>(out_o))[0] =
+          std::max((static_cast<T*>(user_i))[0], static_cast<T>(0));
+      return;
+    }
+
+    // Generate size, stride for input if input is in MKL format.
+    if (input_in_mkl_format) {
+      mkl_context.in_dims = mkl_context.input_shape.GetDimension();
+      mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+      mkl_context.in_strides = new size_t[mkl_context.in_dims];
+      for (int i = 0; i < mkl_context.in_dims; i++) {
+        mkl_context.in_sizes[i] = mkl_context.input_shape.GetSizes()[i];
+        mkl_context.in_strides[i] = mkl_context.input_shape.GetStrides()[i];
+      }
+    } else {
+      mkl_context.in_dims = input.dims();
+      mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+      mkl_context.in_strides = new size_t[mkl_context.in_dims];
+      for (int i = 0; i < mkl_context.in_dims; i++) {
+        mkl_context.in_sizes[i] = input.dim_size((mkl_context.in_dims - 1) - i);
+      }
+      mkl_context.in_strides[0] = 1;
+      for (int i = 1; i < mkl_context.in_dims; i++) {
+        mkl_context.in_strides[i] =
+            mkl_context.in_strides[i - 1] * mkl_context.in_sizes[i - 1];
+      }
+    }
+
+    float negative_slope = 0.0;
+    mkl_context.MklCreateInputLayouts(context);
+    CHECK_EQ(dnnReLUCreateForward_F32(&mkl_context.prim_relu_fwd, NULL,
+                                      mkl_context.lt_input, negative_slope),
+             E_SUCCESS);
+
+    Tensor* output = nullptr;
+
+    if (input_in_mkl_format) {
+      TensorShape tf_shape;
+      mkl_context.output_shape.SetMklTensor(true);
+      mkl_context.output_shape.SetMklLayout(mkl_context.prim_relu_fwd,
+                                            dnnResourceDst);
+      mkl_context.output_shape.SetTfLayout(
+          mkl_context.in_dims, mkl_context.in_sizes, mkl_context.in_strides);
+      mkl_context.output_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.input_shape.GetTfToMklDimMap());
+      tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                          mkl_context.output_shape.GetMklLayout())) /
+                      sizeof(T));
+      AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+                                mkl_context.output_shape);
+    } else {
+      const TensorShape& o_shape = input.shape();
+      mkl_context.output_shape.SetMklTensor(false);
+      AllocateOutputSetMklshape(context, 0, &output, o_shape,
+                                mkl_context.output_shape);
+    }
+
+    void* user_o = static_cast<void*>(const_cast<T*>(output->flat<T>().data()));
+
+    mkl_context.relu_res[dnnResourceDst] = user_o;
+    mkl_context.relu_res[dnnResourceSrc] = user_i;
+    CHECK_EQ(dnnExecute_F32(mkl_context.prim_relu_fwd, mkl_context.relu_res),
+             E_SUCCESS);
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    int in_dims;
+    size_t* in_sizes;
+    size_t* in_strides;
+    MklShape input_shape, output_shape;
+    dnnPrimitive_t prim_relu_fwd = nullptr;
+    void* relu_res[dnnResourceNumber];
+    dnnLayout_t lt_input = nullptr;
+
+    void MklCleanup() {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      if (!input_in_mkl_format) {
+        dnnLayoutDelete_F32(lt_input);
+        free(in_sizes);
+        free(in_strides);
+      }
+      dnnDelete_F32(prim_relu_fwd);
+    }
+
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      if (!input_in_mkl_format) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
+      }
+    }
+  } MklReluOpContext;
+};
+
+template <typename Device, typename T>
+class MklReluGradOp : public OpKernel {
+ public:
+  ~MklReluGradOp() {}
+
+  explicit MklReluGradOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override;
+
+ private:
+  typedef struct {
+    int in_dims;
+    size_t* in_sizes;
+    size_t* in_strides;
+    MklShape input_shape, grad_shape, output_shape;
+    void* relu_res[dnnResourceNumber];
+    dnnPrimitive_t prim_relu_bwd;
+    dnnLayout_t lt_input, lt_grad;
+
+    void MklPrepareReluGradInputs(OpKernelContext* context,
+                                  Tensor* mkl_tmp_grad_buf_tensor,
+                                  Tensor* mkl_tmp_input_buf_tensor) {
+      dnnPrimitive_t cv_user_to_reluB_input, cv_user_to_reluB_grad;
+      dnnLayout_t mkl_lt_internal_input, mkl_lt_internal_grad;
+
+      const Tensor& g = MklGetInput(context, 0);
+      const Tensor& a = MklGetInput(context, 1);
+
+      void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
+      void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &mkl_lt_internal_grad, prim_relu_bwd, dnnResourceDiffDst),
+               E_SUCCESS);
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_input,
+                                                prim_relu_bwd, dnnResourceSrc),
+               E_SUCCESS);
+
+      if (!dnnLayoutCompare_F32(mkl_lt_internal_grad, lt_grad)) {
+        AllocTmpBuffer(context, mkl_tmp_grad_buf_tensor, mkl_lt_internal_grad,
+                       &relu_res[dnnResourceDiffDst]);
+        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_grad, lt_grad,
+                                         mkl_lt_internal_grad),
+                 E_SUCCESS);
+        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_grad, user_g,
+                                          relu_res[dnnResourceDiffDst]),
+                 E_SUCCESS);
+        dnnDelete_F32(cv_user_to_reluB_grad);
+      } else {
+        relu_res[dnnResourceDiffDst] = user_g;
+      }
+
+      if (!dnnLayoutCompare_F32(mkl_lt_internal_input, lt_input)) {
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &relu_res[dnnResourceSrc]);
+        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_input, lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_input, user_i,
+                                          relu_res[dnnResourceSrc]),
+                 E_SUCCESS);
+        dnnDelete_F32(cv_user_to_reluB_input);
+      } else {
+        relu_res[dnnResourceSrc] = user_i;
+      }
+
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
+      dnnLayoutDelete_F32(mkl_lt_internal_grad);
+    }
+
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool grad_is_mkl = grad_shape.IsMklTensor();
+      bool input_is_mkl = input_shape.IsMklTensor();
+      if (!input_is_mkl) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
+      }
+
+      if (!grad_is_mkl) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_grad, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_grad = static_cast<dnnLayout_t>(grad_shape.GetCurLayout());
+      }
+    }
+
+    void MklCleanup() {
+      bool grad_is_mkl = grad_shape.IsMklTensor();
+      bool input_is_mkl = input_shape.IsMklTensor();
+      dnnDelete_F32(prim_relu_bwd);
+      if (!input_is_mkl) {
+        dnnLayoutDelete_F32(lt_input);
+        free(in_sizes);
+        free(in_strides);
+      }
+      if (!grad_is_mkl) {
+        dnnLayoutDelete_F32(lt_grad);
+      }
+    }
+  } MklReluGradOpContext;
+};
+
+template <typename Device, typename T>
+
+void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
+  MklReluGradOpContext mkl_context;
+  const Tensor& g = MklGetInput(context, 0);
+  const Tensor& a = MklGetInput(context, 1);
+
+  void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
+  void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
+
+  GetMklShape(context, 0, &mkl_context.grad_shape);
+  GetMklShape(context, 1, &mkl_context.input_shape);
+
+  bool grad_is_mkl = mkl_context.grad_shape.IsMklTensor();
+  bool input_is_mkl = mkl_context.input_shape.IsMklTensor();
+  if (!input_is_mkl && !grad_is_mkl &&
+      !MklReluHelpers::ValidateSameSize(context, g, a))
+    return;
+  Tensor* output = nullptr;
+  if (!input_is_mkl && !grad_is_mkl &&
+      !a.dims()) {  // handle the case of a scalar
+    // Allocate space for g and
+    const TensorShape& g_shape = g.shape();
+    mkl_context.output_shape.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 0, &output, g_shape,
+                              mkl_context.output_shape);
+    void* out_o = static_cast<void*>(output->flat<T>().data());
+    (static_cast<T*>(out_o))[0] =
+        (static_cast<T*>(user_g))[0] * ((static_cast<T*>(user_i))[0] > 0);
+    return;
+  }
+
+  // Generate size, stride for input if input/grad is in MKL format.
+  if (grad_is_mkl || input_is_mkl) {
+    const MklShape* tmp_mkl_shape =
+        (grad_is_mkl) ? &mkl_context.grad_shape : &mkl_context.input_shape;
+
+    mkl_context.in_dims = tmp_mkl_shape->GetDimension();
+    mkl_context.in_strides = new size_t[mkl_context.in_dims];
+    mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+    for (int i = 0; i < mkl_context.in_dims; i++) {
+      mkl_context.in_sizes[i] = tmp_mkl_shape->GetSizes()[i];
+      mkl_context.in_strides[i] = tmp_mkl_shape->GetStrides()[i];
+    }
+  } else {
+    mkl_context.in_dims = g.dims();
+    mkl_context.in_strides = new size_t[mkl_context.in_dims];
+    mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+
+    for (int i = 0; i < mkl_context.in_dims; i++) {
+      mkl_context.in_sizes[i] = g.dim_size((mkl_context.in_dims - 1) - i);
+    }
+    mkl_context.in_strides[0] = 1;
+    for (int i = 1; i < mkl_context.in_dims; i++) {
+      mkl_context.in_strides[i] =
+          mkl_context.in_strides[i - 1] * mkl_context.in_sizes[i - 1];
+    }
+  }
+
+  mkl_context.MklCreateInputLayouts(context);
+  float negative_slope = 0.0;
+  CHECK_EQ(dnnReLUCreateBackward_F32(&mkl_context.prim_relu_bwd, NULL,
+                                     mkl_context.lt_grad, mkl_context.lt_input,
+                                     negative_slope),
+           E_SUCCESS);
+  Tensor mkl_tmp_grad_buf_tensor, mkl_tmp_input_buf_tensor;
+  mkl_context.MklPrepareReluGradInputs(context, &mkl_tmp_grad_buf_tensor,
+                                       &mkl_tmp_input_buf_tensor);
+
+  if (input_is_mkl ||
+      grad_is_mkl) { /*if  grad or input are MKL leave it in MKL*/
+    TensorShape tf_shape;
+    mkl_context.output_shape.SetMklTensor(true);
+    mkl_context.output_shape.SetMklLayout(mkl_context.prim_relu_bwd,
+                                          dnnResourceDiffSrc);
+    mkl_context.output_shape.SetTfLayout(
+        mkl_context.in_dims, mkl_context.in_sizes, mkl_context.in_strides);
+    // If input_is_mkl or grad_is_mkl, then we copy strides and sizes from Mkl
+    // shape of one that is in MKL layout.
+    if (grad_is_mkl == true) {
+      mkl_context.output_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.grad_shape.GetTfToMklDimMap());
+    } else {
+      mkl_context.output_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.input_shape.GetTfToMklDimMap());
+    }
+
+    tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                        mkl_context.output_shape.GetMklLayout())) /
+                    sizeof(T));
+    AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+                              mkl_context.output_shape);
+
+  } else {
+    const TensorShape& o_shape = g.shape();
+    mkl_context.output_shape.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 0, &output, o_shape,
+                              mkl_context.output_shape);
+  }
+
+  mkl_context.relu_res[dnnResourceDiffSrc] =
+      static_cast<void*>(output->flat<T>().data());
+
+  CHECK_EQ(dnnExecute_F32(mkl_context.prim_relu_bwd, mkl_context.relu_res),
+           E_SUCCESS);
+  mkl_context.MklCleanup();
+}
+
+/* Register DNN kernels for supported operations and supported types - right now
+ * it is only Relu and f32*/
+#define REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES(type)                   \
+  REGISTER_KERNEL_BUILDER(Name("MklRelu")                                 \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<type>("T")                  \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklReluOp<CPUDevice, type>);                    \
+  REGISTER_KERNEL_BUILDER(Name("MklReluGrad")                             \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<type>("T")                  \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklReluGradOp<CPUDevice, type>);
+TF_CALL_float(REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES);
+
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_tfconv_op.cc b/tensorflow/core/kernels/mkl_tfconv_op.cc
index 35029152ec..51f90b3f90 100644
--- a/tensorflow/core/kernels/mkl_tfconv_op.cc
+++ b/tensorflow/core/kernels/mkl_tfconv_op.cc
@@ -67,28 +67,10 @@ class MklToTfOp : public OpKernel {
     CHECK_EQ(op_data_type, input_data_type);
     CHECK_EQ(op_data_type, output_data_type);
 
-    // We need to recreate Tf tensor shape based on sizes and strides.
-    // Ideally, we should know what the data_format is, but that attribute
-    // to this op is not reliable. So below, we rely of sorting logic where
-    // we sort strides first and then sizes.
     TensorShape output_shape;
-    std::vector<std::pair<int, int>> shape_size;
     for (size_t i = 0; i < input_shape.GetDimension(); i++) {
-      VLOG(1) << "Size: " << input_shape.GetSizes()[i]
-              << ", Strides: " << input_shape.GetStrides()[i];
-      shape_size.push_back(std::make_pair(input_shape.GetSizes()[i],
-                                          input_shape.GetStrides()[i]));
-    }
-
-    std::sort(shape_size.begin(), shape_size.end(),
-              [](std::pair<int, int> a, std::pair<int, int> b) {
-                return (a.second > b.second) ||
-                       (a.second == b.second && a.first > b.first);
-              });
-
-    for (std::pair<int, int> s_s : shape_size) {
-      VLOG(1) << "Added dimension: " << s_s.first;
-      output_shape.AddDim(s_s.first);
+      // Outermost to innermost dimension
+      output_shape.AddDim(input_shape.GetSizes()[input_shape.tf_dim_idx(i)]);
     }
 
     // Allocate output tensor.
diff --git a/tensorflow/core/kernels/pooling_ops_3d.cc b/tensorflow/core/kernels/pooling_ops_3d.cc
index f12c18eaa8..538dca24ae 100644
--- a/tensorflow/core/kernels/pooling_ops_3d.cc
+++ b/tensorflow/core/kernels/pooling_ops_3d.cc
@@ -14,12 +14,15 @@ limitations under the License.
 ==============================================================================*/
 #define EIGEN_USE_THREADS
 
+#include "tensorflow/core/kernels/pooling_ops_3d.h"
+
 #include <array>
 
 #include "third_party/eigen3/Eigen/Core"
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/tensor_slice.h"
@@ -28,15 +31,64 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/util/padding.h"
 #include "tensorflow/core/util/tensor_format.h"
+#include "tensorflow/core/util/work_sharder.h"
 
 #if GOOGLE_CUDA
 #include "tensorflow/core/kernels/cudnn_pooling_gpu.h"
+#include "tensorflow/core/kernels/pooling_ops_3d_gpu.h"
 #endif
 namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
 
+Pool3dParameters::Pool3dParameters(OpKernelContext* context,
+                                   const std::vector<int32>& ksize,
+                                   const std::vector<int32>& stride,
+                                   Padding padding, TensorFormat data_format,
+                                   const TensorShape& tensor_in_shape) {
+  // For maxpooling, tensor_in should have 4 dimensions.
+  OP_REQUIRES(context, tensor_in_shape.dims() == 5,
+              errors::InvalidArgument("tensor_in must be 4-dimensional"));
+
+  this->data_format = data_format;
+  depth = GetTensorDim(tensor_in_shape, data_format, 'C');
+  tensor_in_planes = GetTensorDim(tensor_in_shape, data_format, '0');
+  tensor_in_rows = GetTensorDim(tensor_in_shape, data_format, '1');
+  tensor_in_cols = GetTensorDim(tensor_in_shape, data_format, '2');
+  tensor_in_batch = GetTensorDim(tensor_in_shape, data_format, 'N');
+  window_planes = GetTensorDim(ksize, data_format, '0');
+  window_rows = GetTensorDim(ksize, data_format, '1');
+  window_cols = GetTensorDim(ksize, data_format, '2');
+  depth_window = GetTensorDim(ksize, data_format, 'C');
+  plane_stride = GetTensorDim(stride, data_format, '0');
+  row_stride = GetTensorDim(stride, data_format, '1');
+  col_stride = GetTensorDim(stride, data_format, '2');
+  depth_stride = GetTensorDim(stride, data_format, 'C');
+
+  // We only support 3D pooling across plane/width/height. Depthwise
+  // pooling is not supported.
+  OP_REQUIRES(
+      context, depth_window == 1 && depth_stride == 1,
+      errors::Unimplemented(
+          "Pooling3d only supports pooling across plane/width/height."));
+
+  OP_REQUIRES_OK(context, GetWindowedOutputSize(tensor_in_planes, window_planes,
+                                                plane_stride, padding,
+                                                &out_plane, &pad_planes));
+  OP_REQUIRES_OK(context,
+                 GetWindowedOutputSize(tensor_in_rows, window_rows, row_stride,
+                                       padding, &out_height, &pad_rows));
+  OP_REQUIRES_OK(context,
+                 GetWindowedOutputSize(tensor_in_cols, window_cols, col_stride,
+                                       padding, &out_width, &pad_cols));
+}
+
+TensorShape Pool3dParameters::forward_output_shape() {
+  return ShapeFromFormat(data_format, tensor_in_batch,
+                         {{out_plane, out_height, out_width}}, depth);
+}
+
 enum PoolingType { MAX, AVG };
 
 template <typename Device, typename T, PoolingType Type>
@@ -147,12 +199,6 @@ class Pooling3DOp : public UnaryOp<T> {
   Padding padding_;
   TensorFormat data_format_;
 };
-REGISTER_KERNEL_BUILDER(
-    Name("AvgPool3D").Device(DEVICE_CPU).TypeConstraint<float>("T"),
-    Pooling3DOp<CPUDevice, float, AVG>);
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool3D").Device(DEVICE_CPU).TypeConstraint<float>("T"),
-    Pooling3DOp<CPUDevice, float, MAX>);
 
 template <typename Device, typename T>
 struct LaunchMaxPooling3dGradOp;
@@ -331,10 +377,6 @@ class MaxPooling3dGradOp : public OpKernel {
   TensorFormat data_format_;
 };
 
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool3DGrad").Device(DEVICE_CPU).TypeConstraint<float>("T"),
-    MaxPooling3dGradOp<CPUDevice, float>);
-
 template <typename Device, typename T>
 struct LaunchAvgPooling3dGradOp;
 
@@ -499,11 +541,208 @@ class AvgPooling3dGradOp : public OpKernel {
   TensorFormat data_format_;
 };
 
-REGISTER_KERNEL_BUILDER(Name("AvgPool3DGrad")
-                            .Device(DEVICE_CPU)
-                            .TypeConstraint<float>("T")
-                            .HostMemory("orig_input_shape"),
-                        AvgPooling3dGradOp<CPUDevice, float>);
+template <typename Device, typename T>
+struct LaunchMaxPooling3dGradGradOp;
+
+template <typename T>
+struct LaunchMaxPooling3dGradGradOp<CPUDevice, T> {
+  static void launch(OpKernelContext* context, const Pool3dParameters& params,
+                     const Tensor& tensor_in, const Tensor& tensor_out,
+                     const Tensor& tensor_top_diff,
+                     Tensor* tensor_bottom_diff) {
+    OP_REQUIRES(
+        context, params.data_format == FORMAT_NHWC,
+        errors::InvalidArgument("Default MaxPooling3dGradGradOp only supports",
+                                "NDHWC on CPU device type"));
+
+    typedef Eigen::Map<const Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>>
+        ConstEigenMatrixMap;
+    typedef Eigen::Map<Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>>
+        EigenMatrixMap;
+
+    ConstEigenMatrixMap in_mat(tensor_in.flat<T>().data(), params.depth,
+                               params.tensor_in_planes * params.tensor_in_cols *
+                                   params.tensor_in_rows *
+                                   params.tensor_in_batch);
+    ConstEigenMatrixMap out_mat(tensor_out.flat<T>().data(), params.depth,
+                                params.out_plane * params.out_width *
+                                    params.out_height * params.tensor_in_batch);
+    ConstEigenMatrixMap top_diff_mat(
+        tensor_top_diff.flat<T>().data(), params.depth,
+        params.tensor_in_planes * params.tensor_in_cols *
+            params.tensor_in_rows * params.tensor_in_batch);
+    EigenMatrixMap bottom_diff_mat(
+        tensor_bottom_diff->flat<T>().data(), params.depth,
+        params.out_plane * params.out_width * params.out_height *
+            params.tensor_in_batch);
+
+    const DeviceBase::CpuWorkerThreads& worker_threads =
+        *(context->device()->tensorflow_cpu_worker_threads());
+
+    auto shard = [&params, &in_mat, &out_mat, &top_diff_mat, &bottom_diff_mat](
+                     int64 start, int64 limit) {
+      const int32 depth = params.depth;
+      const int32 in_planes = params.tensor_in_planes;
+      const int32 in_rows = params.tensor_in_rows;
+      const int32 in_cols = params.tensor_in_cols;
+      const int32 pad_planes = params.pad_planes;
+      const int32 pad_rows = params.pad_rows;
+      const int32 pad_cols = params.pad_cols;
+      const int32 window_planes = params.window_planes;
+      const int32 window_rows = params.window_rows;
+      const int32 window_cols = params.window_cols;
+      const int32 plane_stride = params.plane_stride;
+      const int32 row_stride = params.row_stride;
+      const int32 col_stride = params.col_stride;
+      const int32 out_plane = params.out_plane;
+      const int32 out_height = params.out_height;
+      const int32 out_width = params.out_width;
+
+      {
+        // Initializes the output grad backprop tensor with 0.
+        const int32 output_image_size =
+            out_plane * out_height * out_width * params.depth;
+        EigenMatrixMap bottom_diff_shard(
+            bottom_diff_mat.data() + start * output_image_size, 1,
+            (limit - start) * output_image_size);
+        bottom_diff_shard.setZero();
+      }
+
+      for (int b = start; b < limit; ++b) {
+        for (int pp = 0; pp < out_plane; ++pp) {
+          for (int ph = 0; ph < out_height; ++ph) {
+            for (int pw = 0; pw < out_width; ++pw) {
+              // (p_start, p_end) * (h_start, h_end) * (w_start, w_end) is the
+              // range that the input vector projects to.
+              int p_start = pp * plane_stride - pad_planes;
+              const int p_end = std::min(p_start + window_planes, in_planes);
+              int h_start = ph * row_stride - pad_rows;
+              const int h_end = std::min(h_start + window_rows, in_rows);
+              int w_start = pw * col_stride - pad_cols;
+              const int w_end = std::min(w_start + window_cols, in_cols);
+              p_start = std::max(p_start, 0);
+              h_start = std::max(h_start, 0);
+              w_start = std::max(w_start, 0);
+              const int out_index =
+                  ((b * out_plane + pp) * out_height + ph) * out_width + pw;
+              // Find value corresponding to the input maximum in top_diff.
+              for (int d = 0; d < depth; ++d) {
+                const T& output_ref = out_mat.coeffRef(d, out_index);
+                bool should_stop = false;
+                for (int p = p_start; p < p_end && !should_stop; ++p) {
+                  for (int h = h_start; h < h_end && !should_stop; ++h) {
+                    for (int w = w_start; w < w_end && !should_stop; ++w) {
+                      const int in_index =
+                          ((b * in_planes + p) * in_rows + h) * in_cols + w;
+                      const T& input_ref = in_mat.coeffRef(d, in_index);
+                      if (output_ref == input_ref) {
+                        T& bottom_diff_ref =
+                            bottom_diff_mat.coeffRef(d, out_index);
+                        bottom_diff_ref = top_diff_mat.coeffRef(d, in_index);
+                        should_stop = true;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+    const int64 shard_cost =
+        params.out_plane * params.out_height * params.out_width * params.depth *
+        params.window_planes * params.window_rows * params.window_cols;
+    Shard(worker_threads.num_threads, worker_threads.workers,
+          params.tensor_in_batch, shard_cost, shard);
+  }
+};
+
+template <class Device, class T>
+class MaxPooling3dGradGradOp : public OpKernel {
+ public:
+  explicit MaxPooling3dGradGradOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    string data_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
+    OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("ksize", &ksize_));
+    OP_REQUIRES(context, ksize_.size() == 5,
+                errors::InvalidArgument("Sliding window ksize field must "
+                                        "specify 5 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &stride_));
+    OP_REQUIRES(context, stride_.size() == 5,
+                errors::InvalidArgument("Sliding window strides field must "
+                                        "specify 5 dimensions"));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+    OP_REQUIRES(context, ksize_[0] == 1 && stride_[0] == 1,
+                errors::Unimplemented(
+                    "Pooling is not yet supported on the batch dimension."));
+    const int32 ksize_c = GetTensorDim(ksize_, data_format_, 'C');
+    const int32 stride_c = GetTensorDim(stride_, data_format_, 'C');
+    OP_REQUIRES(context, ksize_c == 1 && stride_c == 1,
+                errors::Unimplemented("MaxPooling3dGradGrad is not yet "
+                                      "supported on the depth dimension."));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& tensor_in = context->input(0);
+    const Tensor& tensor_out = context->input(1);
+    const Tensor& out_grad_backprop = context->input(2);
+
+    // For maxpooling3d, tensor_in should have 5 dimensions.
+    OP_REQUIRES(context, tensor_in.dims() == 5,
+                errors::InvalidArgument("tensor_in must be 5-dimensional"));
+    OP_REQUIRES(context, tensor_out.dims() == 5,
+                errors::InvalidArgument("tensor_out must be 5-dimensional"));
+    // For maxpooling3d, out_grad_backprop should have 5 dimensions.
+    OP_REQUIRES(
+        context, out_grad_backprop.dims() == 5,
+        errors::InvalidArgument("out_grad_backprop must be 5-dimensional"));
+
+    Pool3dParameters params{context,  ksize_,       stride_,
+                            padding_, data_format_, tensor_in.shape()};
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(context, context->forward_input_or_allocate_output(
+                                {2}, 0, tensor_out.shape(), &output));
+
+    LaunchMaxPooling3dGradGradOp<Device, T>::launch(
+        context, params, tensor_in, tensor_out, out_grad_backprop, output);
+  }
+
+ private:
+  std::vector<int32> ksize_;
+  std::vector<int32> stride_;
+  Padding padding_;
+  TensorFormat data_format_;
+};
+
+#define REGISTER_KERNELS(D, T)                                             \
+  REGISTER_KERNEL_BUILDER(                                                 \
+      Name("MaxPool3D").Device(DEVICE_##D).TypeConstraint<T>("T"),         \
+      Pooling3DOp<D##Device, T, MAX>);                                     \
+  REGISTER_KERNEL_BUILDER(Name("MaxPool3DGrad")                            \
+                              .Device(DEVICE_##D)                          \
+                              .TypeConstraint<T>("T")                      \
+                              .TypeConstraint<T>("TInput"),                \
+                          MaxPooling3dGradOp<D##Device, T>);               \
+  REGISTER_KERNEL_BUILDER(                                                 \
+      Name("MaxPool3DGradGrad").Device(DEVICE_##D).TypeConstraint<T>("T"), \
+      MaxPooling3dGradGradOp<D##Device, T>);                               \
+  REGISTER_KERNEL_BUILDER(                                                 \
+      Name("AvgPool3D").Device(DEVICE_##D).TypeConstraint<T>("T"),         \
+      Pooling3DOp<D##Device, T, AVG>);                                     \
+  REGISTER_KERNEL_BUILDER(Name("AvgPool3DGrad")                            \
+                              .Device(DEVICE_##D)                          \
+                              .TypeConstraint<T>("T")                      \
+                              .HostMemory("orig_input_shape"),             \
+                          AvgPooling3dGradOp<D##Device, T>);
+
+#define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T)
+TF_CALL_float(REGISTER_CPU_KERNELS);
+#undef REGISTER_CPU_KERNELS
 
 #if GOOGLE_CUDA
 
@@ -535,13 +774,6 @@ struct LaunchPoolingOp<GPUDevice, T, MAX> {
   }
 };
 
-REGISTER_KERNEL_BUILDER(
-    Name("AvgPool3D").Device(DEVICE_GPU).TypeConstraint<float>("T"),
-    Pooling3DOp<GPUDevice, float, AVG>);
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool3D").Device(DEVICE_GPU).TypeConstraint<float>("T"),
-    Pooling3DOp<GPUDevice, float, MAX>);
-
 template <typename T>
 struct LaunchMaxPooling3dGradOp<GPUDevice, T> {
   static void launch(OpKernelContext* context, const Tensor& tensor_in,
@@ -559,10 +791,6 @@ struct LaunchMaxPooling3dGradOp<GPUDevice, T> {
   }
 };
 
-REGISTER_KERNEL_BUILDER(
-    Name("MaxPool3DGrad").Device(DEVICE_GPU).TypeConstraint<float>("T"),
-    MaxPooling3dGradOp<GPUDevice, float>);
-
 template <typename T>
 struct LaunchAvgPooling3dGradOp<GPUDevice, T> {
   static void launch(OpKernelContext* context,
@@ -579,12 +807,36 @@ struct LaunchAvgPooling3dGradOp<GPUDevice, T> {
         nullptr, nullptr, output);
   }
 };
-REGISTER_KERNEL_BUILDER(Name("AvgPool3DGrad")
-                            .Device(DEVICE_GPU)
-                            .TypeConstraint<float>("T")
-                            .HostMemory("orig_input_shape"),
-                        AvgPooling3dGradOp<GPUDevice, float>);
+
+template <typename T>
+struct LaunchMaxPooling3dGradGradOp<GPUDevice, T> {
+  static void launch(OpKernelContext* context, const Pool3dParameters& params,
+                     const Tensor& tensor_in, const Tensor& tensor_out,
+                     const Tensor& tensor_top_diff,
+                     Tensor* tensor_bottom_diff) {
+    bool status = functor::MaxPool3dGradBackward<T>()(
+        params.data_format, tensor_in.flat<T>().data(),
+        tensor_out.flat<T>().data(), params.tensor_in_batch, params.out_plane,
+        params.out_height, params.out_width, params.depth,
+        params.tensor_in_planes, params.tensor_in_rows, params.tensor_in_cols,
+        params.window_planes, params.window_rows, params.window_cols,
+        params.plane_stride, params.row_stride, params.col_stride,
+        params.pad_planes, params.pad_rows, params.pad_cols,
+        tensor_top_diff.flat<T>().data(), tensor_bottom_diff->flat<T>().data(),
+        context->eigen_gpu_device());
+    if (!status) {
+      context->SetStatus(
+          errors::Internal("Failed launching MaxPool3dGradBackward"));
+    }
+  }
+};
+
+#define REGISTER_GPU_KERNELS(T) REGISTER_KERNELS(GPU, T)
+TF_CALL_float(REGISTER_GPU_KERNELS) TF_CALL_half(REGISTER_GPU_KERNELS)
+#undef REGISTER_GPU_KERNELS
 
 #endif  // GOOGLE_CUDA
 
+#undef REGISTER_KERNELS
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/pooling_ops_3d.h b/tensorflow/core/kernels/pooling_ops_3d.h
new file mode 100644
index 0000000000..7954e2cf83
--- /dev/null
+++ b/tensorflow/core/kernels/pooling_ops_3d.h
@@ -0,0 +1,66 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_KERNELS_POOLING_OPS_3D_H_
+#define TENSORFLOW_KERNELS_POOLING_OPS_3D_H_
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/util/padding.h"
+#include "tensorflow/core/util/tensor_format.h"
+
+namespace tensorflow {
+
+// A helper class to manage sizes and shapes for 3d pooling operations.
+struct Pool3dParameters {
+  // Updates context->status if there is an invalid input.
+  Pool3dParameters(OpKernelContext* context, const std::vector<int32>& ksize,
+                   const std::vector<int32>& stride, Padding padding,
+                   TensorFormat data_format,
+                   const TensorShape& tensor_in_shape);
+
+  // Returns the shape of the output for "forward" pooling operations.
+  TensorShape forward_output_shape();
+
+  int depth;
+
+  int tensor_in_planes;
+  int tensor_in_cols;
+  int tensor_in_rows;
+  int tensor_in_batch;
+
+  int window_planes;
+  int window_cols;
+  int window_rows;
+  int depth_window;
+
+  int plane_stride;
+  int col_stride;
+  int row_stride;
+  int depth_stride;
+
+  int64 out_plane;
+  int64 out_height;
+  int64 out_width;
+
+  int64 pad_planes;
+  int64 pad_cols;
+  int64 pad_rows;
+
+  TensorFormat data_format;
+};
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_KERNELS_POOLING_OPS_3D_H_
diff --git a/tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc b/tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc
new file mode 100644
index 0000000000..341a43c368
--- /dev/null
+++ b/tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc
@@ -0,0 +1,172 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#if GOOGLE_CUDA
+
+#define EIGEN_USE_GPU
+
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/kernels/pooling_ops_3d_gpu.h"
+#include "tensorflow/core/util/cuda_kernel_helper.h"
+#include "tensorflow/core/util/tensor_format.h"
+
+namespace tensorflow {
+
+namespace {
+
+template <typename dtype>
+__global__ void MaxPoolGradBackwardNoMaskNCDHW(
+    const int nthreads, const dtype* bottom_data, const dtype* output_data,
+    const int pooled_plane, const int pooled_height, const int pooled_width,
+    const int channels, const int plane, const int height, const int width,
+    const int kernel_p, const int kernel_h, const int kernel_w,
+    const int stride_p, const int stride_h, const int stride_w, const int pad_p,
+    const int pad_t, const int pad_l, const dtype* top_diff,
+    dtype* bottom_diff) {
+  CUDA_1D_KERNEL_LOOP(index, nthreads) {
+    // First find out the index to the maximum, since we have no mask.
+    int pw = index % pooled_width;
+    int ph = (index / pooled_width) % pooled_height;
+    int pp = (index / pooled_width / pooled_height) % pooled_plane;
+    int c = (index / pooled_width / pooled_height / pooled_plane) % channels;
+    int n = (index / pooled_width / pooled_height / pooled_plane / channels);
+    int pstart = pp * stride_p - pad_p;
+    int hstart = ph * stride_h - pad_t;
+    int wstart = pw * stride_w - pad_l;
+    const int pend = min(pstart + kernel_p, plane);
+    const int hend = min(hstart + kernel_h, height);
+    const int wend = min(wstart + kernel_w, width);
+    pstart = max(pstart, 0);
+    hstart = max(hstart, 0);
+    wstart = max(wstart, 0);
+    bool should_stop = false;
+    int maxidx = -1;
+    const dtype* bottom_data_n =
+        bottom_data + n * channels * plane * height * width;
+    // Propagate only first value from top_diff corresponding to the maximum.
+    for (int p = pstart; p < pend && !should_stop; ++p) {
+      for (int h = hstart; h < hend && !should_stop; ++h) {
+        for (int w = wstart; w < wend && !should_stop; ++w) {
+          int idx = c * plane * height * width + (p * height + h) * width + w;
+          if (output_data[index] == bottom_data_n[idx]) {
+            maxidx = idx;
+            should_stop = true;
+          }
+        }
+      }
+    }
+    // Set the bottom diff (atomic is not necessary). The index could still be
+    // uninitialized, if all the bottom_data are NaN.
+    if (maxidx != -1) {
+      bottom_diff[index] =
+          top_diff[n * channels * plane * height * width + maxidx];
+    }
+  }
+}
+
+template <typename dtype>
+__global__ void MaxPoolGradBackwardNoMaskNDHWC(
+    const int nthreads, const dtype* bottom_data, const dtype* output_data,
+    const int pooled_plane, const int pooled_height, const int pooled_width,
+    const int channels, const int plane, const int height, const int width,
+    const int kernel_p, const int kernel_h, const int kernel_w,
+    const int stride_p, const int stride_h, const int stride_w, const int pad_p,
+    const int pad_t, const int pad_l, const dtype* top_diff,
+    dtype* bottom_diff) {
+  CUDA_1D_KERNEL_LOOP(index, nthreads) {
+    // First find out the index to the maximum, since we have no mask.
+    int n = index;
+    int c = n % channels;
+    n /= channels;
+    int wstart = (n % pooled_width) * stride_w - pad_l;
+    int wend = min(wstart + kernel_w, width);
+    wstart = max(wstart, 0);
+    n /= pooled_width;
+    int hstart = (n % pooled_height) * stride_h - pad_t;
+    int hend = min(hstart + kernel_h, height);
+    hstart = max(hstart, 0);
+    n /= pooled_height;
+    int pstart = (n % pooled_plane) * stride_p - pad_p;
+    int pend = min(pstart + kernel_p, plane);
+    pstart = max(pstart, 0);
+    n /= pooled_plane;
+    bool should_stop = false;
+    int maxidx = -1;
+    const dtype* bottom_data_n =
+        bottom_data + n * plane * height * width * channels;
+    // Propagate only first value from top_diff corresponding to the maximum.
+    for (int p = pstart; p < pend && !should_stop; ++p) {
+      for (int h = hstart; h < hend && !should_stop; ++h) {
+        for (int w = wstart; w < wend && !should_stop; ++w) {
+          int idx = ((p * height + h) * width + w) * channels + c;
+          if (output_data[index] == bottom_data_n[idx]) {
+            maxidx = idx;
+            should_stop = true;
+          }
+        }
+      }
+    }
+    // Set the bottom diff (atomic is not necessary). The index could still be
+    // uninitialized, if all the bottom_data are NaN.
+    if (maxidx != -1) {
+      bottom_diff[index] =
+          top_diff[n * plane * height * width * channels + maxidx];
+    }
+  }
+}
+
+}  // namespace
+
+namespace functor {
+
+template <typename T>
+bool MaxPool3dGradBackward<T>::operator()(
+    TensorFormat data_format, const T* bottom_data, const T* output_data,
+    const int batch, const int pooled_plane, const int pooled_height,
+    const int pooled_width, const int channels, const int plane,
+    const int height, const int width, const int kernel_p, const int kernel_h,
+    const int kernel_w, const int stride_p, const int stride_h,
+    const int stride_w, const int pad_p, const int pad_t, const int pad_l,
+    const T* top_diff, T* bottom_diff, const Eigen::GpuDevice& d) {
+  int num_kernels =
+      batch * channels * pooled_plane * pooled_height * pooled_width;
+  CudaLaunchConfig config = GetCudaLaunchConfig(num_kernels, d);
+  if (data_format == FORMAT_NHWC) {
+    MaxPoolGradBackwardNoMaskNDHWC<<<config.block_count,
+                                     config.thread_per_block, 0, d.stream()>>>(
+        num_kernels, bottom_data, output_data, pooled_plane, pooled_height,
+        pooled_width, channels, plane, height, width, kernel_p, kernel_h,
+        kernel_w, stride_p, stride_h, stride_w, pad_p, pad_t, pad_l, top_diff,
+        bottom_diff);
+  } else {
+    MaxPoolGradBackwardNoMaskNCDHW<<<config.block_count,
+                                     config.thread_per_block, 0, d.stream()>>>(
+        num_kernels, bottom_data, output_data, pooled_plane, pooled_height,
+        pooled_width, channels, plane, height, width, kernel_p, kernel_h,
+        kernel_w, stride_p, stride_h, stride_w, pad_p, pad_t, pad_l, top_diff,
+        bottom_diff);
+  }
+  return d.ok();
+}
+
+}  // namespace functor
+
+#define DEFINE_GPU_SPECS(T) template struct functor::MaxPool3dGradBackward<T>;
+TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
+#undef DEFINE_GPU_SPECS
+
+}  // namespace tensorflow
+
+#endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/pooling_ops_3d_gpu.h b/tensorflow/core/kernels/pooling_ops_3d_gpu.h
new file mode 100644
index 0000000000..350b1b6732
--- /dev/null
+++ b/tensorflow/core/kernels/pooling_ops_3d_gpu.h
@@ -0,0 +1,48 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#if !GOOGLE_CUDA
+#error This file must only be included when building with Cuda support
+#endif
+
+#ifndef TENSORFLOW_CORE_KERNELS_POOLING_OP_3D_GPU_H_
+#define TENSORFLOW_CORE_KERNELS_POOLING_OP_3D_GPU_H_
+
+#define EIGEN_USE_GPU
+
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/util/tensor_format.h"
+
+namespace tensorflow {
+
+namespace functor {
+template <typename T>
+struct MaxPool3dGradBackward {
+  bool operator()(TensorFormat data_format, const T* bottom_data,
+                  const T* output_data, const int batch, const int pooled_plane,
+                  const int pooled_height, const int pooled_width,
+                  const int channels, const int plane, const int height,
+                  const int width, const int kernel_p, const int kernel_h,
+                  const int kernel_w, const int stride_p, const int stride_h,
+                  const int stride_w, const int pad_p, const int pad_t,
+                  const int pad_l, const T* top_diff, T* bottom_diff,
+                  const Eigen::GpuDevice& d);
+};
+}  // namespace functor
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_CORE_KERNELS_POOLING_OP_3D_H_
diff --git a/tensorflow/core/kernels/pooling_ops_common.cc b/tensorflow/core/kernels/pooling_ops_common.cc
index 3fe16c66b8..37747a3199 100644
--- a/tensorflow/core/kernels/pooling_ops_common.cc
+++ b/tensorflow/core/kernels/pooling_ops_common.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <vector>
 #include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 
 #if GOOGLE_CUDA
@@ -127,8 +128,7 @@ namespace functor {
       typename TTypes<T, 4>::Tensor out);                           \
   extern template struct TransformDepth<GPUDevice, T, Eigen::DenseIndex>;
 
-DECLARE_GPU_SPEC(float);
-DECLARE_GPU_SPEC(Eigen::half);
+TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPEC)
 #undef DECLARE_GPU_SPEC
 }  // namespace functor
 
@@ -373,10 +373,11 @@ void DnnPoolingGradOp<T>::Compute(
   }
 }
 
-template class DnnPoolingOp<Eigen::half>;
-template class DnnPoolingOp<float>;
-template class DnnPoolingGradOp<Eigen::half>;
-template class DnnPoolingGradOp<float>;
+#define DEFINE_DNN_OPS(T)         \
+  template class DnnPoolingOp<T>; \
+  template class DnnPoolingGradOp<T>;
+TF_CALL_GPU_NUMBER_TYPES(DEFINE_DNN_OPS)
+#undef DEFINE_DNN_OPS
 
 #endif  // GOOGLE_CUDA
 
diff --git a/tensorflow/core/kernels/random_op.cc b/tensorflow/core/kernels/random_op.cc
index f3c7e0f26b..3063fedac8 100644
--- a/tensorflow/core/kernels/random_op.cc
+++ b/tensorflow/core/kernels/random_op.cc
@@ -303,10 +303,7 @@ class RandomGammaOp : public OpKernel {
                                                       &samples_shape));
     }
     const int64 num_samples = samples_shape.num_elements();
-    OP_REQUIRES(ctx, num_samples > 0,
-                errors::InvalidArgument(
-                    "Input shape should have non-zero element count, got: ",
-                    num_samples));
+    if (num_samples == 0) return;
 
     samples_shape.AppendShape(alpha_t.shape());
     // Allocate output samples.
diff --git a/tensorflow/core/kernels/sparse_matmul_op.cc b/tensorflow/core/kernels/sparse_matmul_op.cc
index 2ed0522ce4..46e743b4cf 100644
--- a/tensorflow/core/kernels/sparse_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_matmul_op.cc
@@ -837,15 +837,6 @@ class SparseMatMul {
 };
 
 #ifdef TENSORFLOW_USE_LIBXSMM
-#ifdef EXTRA_CACHE_LOGGING
-static tensorflow::mutex global_cache_stats_lock;
-static int total_num_entries_outstanding GUARDED_BY(global_cache_stats_lock) =
-    0;
-static int total_num_entries_in_cache GUARDED_BY(global_cache_stats_lock) = 0;
-#endif  // EXTRA_CACHE_LOGGING
-
-static const int max_entries_per_graph_node = 40;
-
 template <typename TL, typename TR>
 class LibxsmmSparseMatMul {
   typedef Eigen::Tensor<TL, 2, Eigen::RowMajor> MatrixL;
@@ -861,7 +852,6 @@ class LibxsmmSparseMatMul {
       MatrixMapR;
 
  public:
-#if 1
   // This structure contains a set of libxsmm kernels for sizes that have been
   // encountered previously by this operator so that libxsmm does not need to
   // reallocate its scratchpad memory each time (which hurts performance
@@ -880,181 +870,57 @@ class LibxsmmSparseMatMul {
       // useful (it is an empty struct right now)
       typename SparseMatMul<TL, TR>::TensorInfoCache
           non_libxsmm_cache;  // Currently not used
-      TF_DISALLOW_COPY_AND_ASSIGN(TensorInfoCacheEntry);
-      ~TensorInfoCacheEntry() {
-#ifdef EXTRA_CACHE_LOGGING
-        LOG(INFO) << "Deleting tensor cache entry at " << (void*)this;
-#endif  // EXTRA_CACHE_LOGGING
-        libxsmm_spmdm_destroy(&handle);
-      }
     };
-    // protects entries; invariant: entries is a valid std::list.
+    // protects entries; invariant: entries is a valid std::multimap
     tensorflow::mutex lock;
     // Because there could be multiple matrix multiplies with the same sizes
     // going on at the same time, we need to allow multiple cache entries for a
     // given set of parameters. Taking and returning entries is used to make
     // sure the same cache entry is not used from two threads at a time.
-    using entries_map_type = std::list<std::pair<
-        std::tuple<int, int, int, int>,
-        std::unique_ptr<TensorInfoCacheEntry>>>;  // multimap in LRU order
-    entries_map_type entries GUARDED_BY(
-        lock);  // MRU element at end so reverse search will find it first
-    int num_entries_outstanding GUARDED_BY(lock);
-
-    TensorInfoCache() : lock(), entries(), num_entries_outstanding(0) {}
+    std::multimap<std::tuple<int, int, int, int>,
+                  std::unique_ptr<TensorInfoCacheEntry>>
+        entries GUARDED_BY(lock);
+
+    TensorInfoCache() : lock(), entries() {}
     // Look up and remove first entry with these parameters, creating one if
     // there isn't one
     std::unique_ptr<TensorInfoCacheEntry> take_cache_entry(int M, int K, int N,
                                                            int max_threads)
-#ifdef EXTRA_CACHE_LOGGING
-        LOCKS_EXCLUDED(lock, global_cache_stats_lock)
-#else
-        LOCKS_EXCLUDED(lock)
-#endif
-    {
+        LOCKS_EXCLUDED(lock) {
       tensorflow::mutex_lock ml(lock);
-#ifdef EXTRA_CACHE_LOGGING
-      tensorflow::mutex_lock ml2(global_cache_stats_lock);
-#endif
       auto key = std::make_tuple(M, K, N, max_threads);
-      auto it_rev =
-          std::find_if(entries.rbegin(), entries.rend(),
-                       [&](const typename entries_map_type::value_type& e) {
-                         return e.first == key;
-                       });
-      auto it =
-          (it_rev == entries.rend() ? entries.end() : std::next(it_rev).base());
+      auto it = entries.find(key);
       if (it != entries.end()) {
         auto val = std::move(it->second);
         entries.erase(it);
-        ++num_entries_outstanding;
-#ifdef EXTRA_CACHE_LOGGING
-        ++total_num_entries_outstanding;
-        --total_num_entries_in_cache;
-        LOG(INFO) << "Used existing cache entry at " << (void*)val.get()
-                  << " for " << M << "x" << K << "x" << N << " max_threads "
-                  << max_threads
-                  << ", num_entries_outstanding = " << num_entries_outstanding
-                  << ", new cache size = " << entries.size()
-                  << ", total num_entries_outstanding = "
-                  << total_num_entries_outstanding
-                  << ", total cache size = " << total_num_entries_in_cache;
-#endif
         return val;
       } else {
-        while (!entries.empty() &&
-               entries.size() + num_entries_outstanding + 1 >
-                   max_entries_per_graph_node) {
-#ifdef EXTRA_CACHE_LOGGING
-          LOG(INFO) << "Removing old cache entry at "
-                    << (void*)entries.front().second.get();
-#endif
-          entries.pop_front();
-        }
         std::unique_ptr<TensorInfoCacheEntry> e{
             new TensorInfoCacheEntry{M, K, N, max_threads, {}, nullptr}};
         // setup scoped allocator, which uses cpu_allocator() for this scope
         const libxsmm_tf_allocator<libxsmm_scratch_allocator> tf_allocator;
         libxsmm_spmdm_init(M, N, K, max_threads, &e->handle, &e->output_csr);
-        ++num_entries_outstanding;
-#ifdef EXTRA_CACHE_LOGGING
-        ++total_num_entries_outstanding;
-        LOG(INFO) << "Created cache entry at " << (void*)e.get() << " for " << M
-                  << "x" << K << "x" << N << " max_threads " << max_threads
-                  << ", num_entries_outstanding = " << num_entries_outstanding
-                  << ", new cache size = " << entries.size()
-                  << ", total num_entries_outstanding = "
-                  << total_num_entries_outstanding
-                  << ", total cache size = " << total_num_entries_in_cache;
-#endif
         return e;
       }
     }
     // Add a cache entry with certain parameters
     void return_cache_entry(std::unique_ptr<TensorInfoCacheEntry> e)
-#ifdef EXTRA_CACHE_LOGGING
-        LOCKS_EXCLUDED(lock, global_cache_stats_lock)
-#else
-        LOCKS_EXCLUDED(lock)
-#endif
-    {
+        LOCKS_EXCLUDED(lock) {
       tensorflow::mutex_lock ml(lock);
-#ifdef EXTRA_CACHE_LOGGING
-      tensorflow::mutex_lock ml2(global_cache_stats_lock);
-#endif
       auto key = std::make_tuple(e->M, e->K, e->N, e->max_threads);
-      --num_entries_outstanding;
-#ifdef EXTRA_CACHE_LOGGING
-      --total_num_entries_outstanding;
-      LOG(INFO) << "Returned cache entry at " << (void*)e.get() << " for "
-                << e->M << "x" << e->K << "x" << e->N << " max_threads "
-                << e->max_threads
-                << ", num_entries_outstanding = " << num_entries_outstanding
-                << ", prev cache size = " << entries.size()
-                << ", total num_entries_outstanding = "
-                << total_num_entries_outstanding
-                << ", total cache size = " << total_num_entries_in_cache;
-#endif
-      entries.push_back(std::make_pair(key, std::move(e)));
-#ifdef EXTRA_CACHE_LOGGING
-      ++total_num_entries_in_cache;
-#endif
+      entries.insert(std::make_pair(key, std::move(e)));
     }
     ~TensorInfoCache() {
       tensorflow::mutex_lock ml(lock);
-#ifdef EXTRA_CACHE_LOGGING
-      tensorflow::mutex_lock ml2(global_cache_stats_lock);
-      LOG(INFO) << "Deleting TensorInfoCache, cache size = " << entries.size()
-                << ", total num_entries_outstanding = "
-                << total_num_entries_outstanding
-                << ", total cache size = " << total_num_entries_in_cache;
-#endif
-      CHECK_EQ(num_entries_outstanding, 0);
+      for (auto& p : entries) {
+        libxsmm_spmdm_destroy(&p.second->handle);
+      }
       entries.clear();
     }
 
    private:
     TF_DISALLOW_COPY_AND_ASSIGN(TensorInfoCache);
   };
-#else
-  // This structure contains a set of libxsmm kernels for sizes that have been
-  // encountered previously by this operator so that libxsmm does not need to
-  // reallocate its scratchpad memory each time (which hurts performance
-  // substantially).
-  struct TensorInfoCache {
-    struct TensorInfoCacheEntry {
-      // Parameters for kernel
-      int M;
-      int K;
-      int N;
-      int max_threads;
-      // libxsmm handle and matrix data
-      libxsmm_spmdm_handle handle;
-      libxsmm_CSR_sparseslice* output_csr;
-      // Chain to non-libxsmm implementation's cache in case that ever becomes
-      // useful (it is an empty struct right now)
-      typename SparseMatMul<TL, TR>::TensorInfoCache
-          non_libxsmm_cache;  // Currently not used
-    };
-    TensorInfoCache() {}
-    // Look up and remove first entry with these parameters, creating one if
-    // there isn't one
-    std::unique_ptr<TensorInfoCacheEntry> take_cache_entry(int M, int K, int N,
-                                                           int max_threads) {
-      std::unique_ptr<TensorInfoCacheEntry> e{
-          new TensorInfoCacheEntry{M, K, N, max_threads, {}, nullptr}};
-      libxsmm_spmdm_init(M, N, K, max_threads, &e->handle, &e->output_csr);
-      return e;
-    }
-    // Add a cache entry with certain parameters
-    void return_cache_entry(std::unique_ptr<TensorInfoCacheEntry> e) {
-      libxsmm_spmdm_destroy(&e->handle);
-    }
-
-   private:
-    TF_DISALLOW_COPY_AND_ASSIGN(TensorInfoCache);
-  };
-#endif
 
   // Perform matrix multiplication of "left" and "right", and store the result
   // in *"output".
@@ -1479,21 +1345,21 @@ inline void SparseMatMul<TL, TR>::ComputeBlockSizes(
 
 template <typename F>
 void do_on_all_threads(const DeviceBase::CpuWorkerThreads* thread_pool,
-                       ptrdiff_t max_thread_count, const F& f) {
+                       const F& f) {
   int num_threads = thread_pool->num_threads;
   if (num_threads == 0) {
     LOG(FATAL) << "Have 0 threads in thread pool";
   } else if (num_threads == 1) {
-    f(0, 1);
+    f(0);
   } else {
     BlockingCounter counter(num_threads - 1);
     for (int i = 1; i < num_threads; ++i) {
       thread_pool->workers->Schedule([&, i]() {
-        f(i, num_threads);
+        f(i);
         counter.DecrementCount();
       });
     }
-    f(0, num_threads);
+    f(0);
     counter.Wait();
   }
 }
@@ -1522,24 +1388,21 @@ void wrapper_libxsmm_spmdm_createSparseSlice_generic_thread(
 
 void wrapper_libxsmm_spmdm_compute_generic_thread(
     empty_type_wrapper<bfloat16>, const libxsmm_spmdm_handle* handle,
-    char transA, char transB, libxsmm_CSR_sparseslice* A_sparse,
-    const bfloat16* B, char transC, float* C, int block_id, int tid,
-    int nthreads) {
-  const uint16 alpha = 1;
-  const uint16 beta = 0;
+    char transA, char transB, const bfloat16* alpha,
+    libxsmm_CSR_sparseslice* A_sparse, const bfloat16* B, char transC,
+    const bfloat16* beta, float* C, int block_id, int tid, int nthreads) {
   return libxsmm_spmdm_compute_bfloat16_thread(
-      handle, transA, transB, &alpha, A_sparse,
-      reinterpret_cast<const uint16*>(B), transC, &beta, C, block_id, tid,
-      nthreads);
+      handle, transA, transB, reinterpret_cast<const uint16*>(alpha), A_sparse,
+      reinterpret_cast<const uint16*>(B), transC,
+      reinterpret_cast<const uint16*>(beta), C, block_id, tid, nthreads);
 }
 void wrapper_libxsmm_spmdm_compute_generic_thread(
     empty_type_wrapper<float>, const libxsmm_spmdm_handle* handle, char transA,
-    char transB, libxsmm_CSR_sparseslice* A_sparse, const float* B, char transC,
-    float* C, int block_id, int tid, int nthreads) {
-  const float alpha = 1.f;
-  const float beta = 0.f;
-  return libxsmm_spmdm_compute_fp32_thread(handle, transA, transB, &alpha,
-                                           A_sparse, B, transC, &beta, C,
+    char transB, const float* alpha, libxsmm_CSR_sparseslice* A_sparse,
+    const float* B, char transC, const float* beta, float* C, int block_id,
+    int tid, int nthreads) {
+  return libxsmm_spmdm_compute_fp32_thread(handle, transA, transB, alpha,
+                                           A_sparse, B, transC, beta, C,
                                            block_id, tid, nthreads);
 }
 
@@ -1590,13 +1453,11 @@ inline void LibxsmmSparseMatMul<TL, TR>::Compute(
   const int left_dim1 = transpose_left ? left.dimension(0) : left.dimension(1);
   const int right_dim0 = right.dimension(0);
   const int right_dim1 = right.dimension(1);
-  const int output_dim0 =
-      transpose_output ? output->dimension(1) : output->dimension(0);
-  const int output_dim1 =
-      transpose_output ? output->dimension(0) : output->dimension(1);
   CHECK_EQ(left_dim1, right_dim0);
-  CHECK_EQ(left_dim0, output_dim0);
-  CHECK_EQ(right_dim1, output_dim1);
+  CHECK_EQ(left_dim0,
+           (transpose_output ? output->dimension(1) : output->dimension(0)));
+  CHECK_EQ(right_dim1,
+           (transpose_output ? output->dimension(0) : output->dimension(1)));
   if (left_dim0 < 32 || left_dim1 < 32 || right_dim1 < 32) {
     // Causes problems in libxsmm
     SparseMatMul<TL, TR>::Compute(
@@ -1614,50 +1475,42 @@ inline void LibxsmmSparseMatMul<TL, TR>::Compute(
   // Convert the left matrix to compressed sparse row (CSR) format
   ptrdiff_t total_num_creation_blocks =
       libxsmm_spmdm_get_num_createSparseSlice_blocks(&entry->handle);
-  ptrdiff_t total_num_mult_blocks =
-      libxsmm_spmdm_get_num_compute_blocks(&entry->handle);
-  bool use_libxsmm =
-      !(total_num_creation_blocks + total_num_mult_blocks < num_threads &&
-        !transpose_left && !transpose_output);
-  if (!use_libxsmm) {
-    // Avoid some performance issues in libxsmm (FIXME)
-    cache->return_cache_entry(std::move(entry));
-    SparseMatMul<TL, TR>::Compute(
-        nullptr /* Assumes no cached data for fallback */, left, right,
-        transpose_left, thread_pool, transpose_output, output);
-    return;
-  }
   std::atomic<int> cur_create_block_number;
   cur_create_block_number.store(0);
-  do_on_all_threads(thread_pool, total_num_creation_blocks,
-                    [&](int i, int actual_num_threads) {
-                      PinnedToCurrentCPU pin;
-                      while (true) {
-                        int work_item = cur_create_block_number.fetch_add(1);
-                        if (work_item >= total_num_creation_blocks) break;
-                        wrapper_libxsmm_spmdm_createSparseSlice_generic_thread(
-                            empty_type_wrapper<TL>{}, &entry->handle,
-                            (transpose_left ? 'T' : 'N'), left_data,
-                            entry->output_csr, work_item, i,
-                            actual_num_threads);
-                      }
-                    });
+  do_on_all_threads(thread_pool, [&](int i) {
+    PinnedToCurrentCPU pin;
+    while (true) {
+      int work_item = cur_create_block_number.fetch_add(1);
+      if (work_item >= total_num_creation_blocks) break;
+      wrapper_libxsmm_spmdm_createSparseSlice_generic_thread(
+          empty_type_wrapper<TL>{}, &entry->handle,
+          (transpose_left ? 'T' : 'N'), left_data, entry->output_csr, work_item,
+          i, num_threads);
+    }
+  });
   // Do matrix-matrix multiplication
+  // TODO(jewillco): libxsmm doesn't support beta != 1 yet -- remove when
+  // release
+  // includes beta handling
+  memset(output_data, 0, left_dim0 * right_dim1 * sizeof(TR));
+  ptrdiff_t total_num_mult_blocks =
+      libxsmm_spmdm_get_num_compute_blocks(&entry->handle);
   std::atomic<int> cur_mult_block_number;
   cur_mult_block_number.store(0);
-  do_on_all_threads(
-      thread_pool, total_num_mult_blocks, [&](int i, int actual_num_threads) {
-        PinnedToCurrentCPU pin;
-        while (true) {
-          int work_item = cur_mult_block_number.fetch_add(1);
-          if (work_item >= total_num_mult_blocks) break;
-          wrapper_libxsmm_spmdm_compute_generic_thread(
-              empty_type_wrapper<TL>{}, &entry->handle,
-              (transpose_left ? 'T' : 'N'), 'N', entry->output_csr, right_data,
-              (transpose_output ? 'T' : 'N'), output_data, work_item, i,
-              actual_num_threads);
-        }
-      });
+  do_on_all_threads(thread_pool, [&](int i) {
+    PinnedToCurrentCPU pin;
+    while (true) {
+      int work_item = cur_mult_block_number.fetch_add(1);
+      if (work_item >= total_num_mult_blocks) break;
+      const TL alpha(1.0);  // Stored in a variable so we can get a pointer
+      const TL beta(0.0);   // Stored in a variable so we can get a pointer
+      wrapper_libxsmm_spmdm_compute_generic_thread(
+          empty_type_wrapper<TL>{}, &entry->handle,
+          (transpose_left ? 'T' : 'N'), 'N', &alpha, entry->output_csr,
+          right_data, (transpose_output ? 'T' : 'N'), &beta, output_data,
+          work_item, i, num_threads);
+    }
+  });
   // Put handle + CSR storage back into cache
   cache->return_cache_entry(std::move(entry));
 }
@@ -1803,17 +1656,15 @@ inline void SparseMatMul<TL, TR>::Compute(
                           SparseMatMulOp<TA, TB, LibxsmmSparseMatMul>);
 #endif
 
+REGISTER_SPARSE_MATMUL(bfloat16, bfloat16);
+
 REGISTER_SPARSE_MATMUL(float, bfloat16);
 
 REGISTER_SPARSE_MATMUL(bfloat16, float);
 
 #ifdef TENSORFLOW_USE_LIBXSMM
-REGISTER_SPARSE_MATMUL_LIBXSMM(bfloat16, bfloat16);
-
 REGISTER_SPARSE_MATMUL_LIBXSMM(float, float);
 #else
-REGISTER_SPARSE_MATMUL(bfloat16, bfloat16);
-
 REGISTER_SPARSE_MATMUL(float, float);
 #endif
 
diff --git a/tensorflow/core/kernels/sparse_matmul_op.h b/tensorflow/core/kernels/sparse_matmul_op.h
index bff6a0c9b3..61bd6593c3 100644
--- a/tensorflow/core/kernels/sparse_matmul_op.h
+++ b/tensorflow/core/kernels/sparse_matmul_op.h
@@ -255,13 +255,12 @@ EIGEN_STRONG_INLINE Packet8d pbroadcast_second<Packet8d>(const Packet8d& a_in) {
 }
 template <>
 EIGEN_STRONG_INLINE Packet8d pbroadcast_third<Packet8d>(const Packet8d& a_in) {
-  Packet2d a = _mm256_extractf128_pd(_mm512_castpd512_pd256(a_in), 1);
+  Packet2d a = _mm512_extractf32x4_ps(a_in, 1);
   return _mm512_broadcastsd_pd(a);
 }
 template <>
 EIGEN_STRONG_INLINE Packet8d pbroadcast_fourth<Packet8d>(const Packet8d& a_in) {
-  Packet2d a =
-      _mm_permute_pd(_mm256_extractf128_pd(_mm512_castpd512_pd256(a_in), 1), 3);
+  Packet2d a = _mm_permute_pd(_mm512_extractf32x4_ps(a_in, 1), 3);
   return _mm512_broadcastsd_pd(a);
 }
 template <>
@@ -418,17 +417,14 @@ EIGEN_STRONG_INLINE Packet8f pbroadcast_fourth<Packet8f>(const Packet8f& a) {
 
 template <typename Packet>
 EIGEN_DEVICE_FUNC inline Packet16f pexpand_bf16_l(const Packet16f& from) {
-  return _mm512_castsi512_ps(_mm512_slli_epi32(
-      _mm512_cvtepu16_epi32(_mm512_castsi512_si256(_mm512_castps_si512(from))),
-      16));
+  return _mm512_slli_epi32(_mm512_cvtepu16_epi32(_mm512_castsi512_si256(from)),
+                           16);
 }
 
 template <typename Packet>
 EIGEN_DEVICE_FUNC inline Packet16f pexpand_bf16_u(const Packet16f& from) {
-  return _mm512_castsi512_ps(
-      _mm512_slli_epi32(_mm512_cvtepu16_epi32(_mm256_castpd_si256(
-                            _mm512_extractf64x4_pd(_mm512_castps_pd(from), 1))),
-                        16));
+  return _mm512_slli_epi32(
+      _mm512_cvtepu16_epi32(_mm512_extractf64x4_pd(from, 1)), 16);
 }
 
 #endif
diff --git a/tensorflow/core/kernels/xsmm_conv2d.cc b/tensorflow/core/kernels/xsmm_conv2d.cc
index 823cdf7e09..878abe9712 100644
--- a/tensorflow/core/kernels/xsmm_conv2d.cc
+++ b/tensorflow/core/kernels/xsmm_conv2d.cc
@@ -26,14 +26,18 @@ void dummy_xsmm_conv2d_ensure_file_is_not_empty(void);
 #include "tensorflow/core/kernels/xsmm_conv2d.h"
 
 #include <stdlib.h>
+#include <cstring>
+#if 0
+#include <omp.h>
+#endif
 
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/lib/core/blocking_counter.h"
 #include "tensorflow/core/lib/core/threadpool.h"
 
+#include "libxsmm_main.h"  // TODO(bsteiner): API to avoid incl. header from src/
 #include "include/libxsmm_cpuid.h"
-#include "libxsmm_dnn_handle.h"
-#include "libxsmm_malloc.h"
+#include "include/libxsmm_malloc.h"
 
 namespace tensorflow {
 
@@ -59,10 +63,6 @@ bool CanUseXsmmConv2D(const libxsmm_dnn_conv_desc& desc,
     VLOG(1) << "Cannot use XSMM convolutions: unsupported format!";
     return false;
   }
-  if (desc.pad_h_in != 0 || desc.pad_w_in != 0) {
-    VLOG(1) << "Cannot use XSMM convolutions: unsupported padding!";
-    return false;
-  }
   if (desc.K % VECTOR_SIZE != 0) {
     VLOG(1) << "Cannot use XSMM convolutions: output features count not"
                " divisible by vector size!";
@@ -72,7 +72,6 @@ bool CanUseXsmmConv2D(const libxsmm_dnn_conv_desc& desc,
   return true;
 }
 
-
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
 namespace functor {
@@ -83,25 +82,34 @@ static void chk_libxsmm_err(libxsmm_dnn_err_t status, string msg) {
   }
 }
 
-LIBXSMM_INLINE void copy_RSCK_to_custom(const float* rsck, float *kcrs, int R, int S, int C, int K,int blocksifm, int blocksofm, int ifmblock,int ofmblock, int start, int end)
-{
-  LIBXSMM_VLA_DECL(4, const      float, input, rsck, S, C,K);
-  LIBXSMM_VLA_DECL(6, float, output, kcrs, blocksifm,R,S,ifmblock, ofmblock);
-  int r, s, k,c, v1,v2;
-  
-  for (k = start; k < end ; k++ ) { 
-    for(c = 0; c < blocksifm;c++){
-      for ( r = 0; r < R; r++ ) {
-        for ( s = 0; s < S; s++ ){
-          for ( v1 = c*ifmblock; v1 < std::min(C,(c+1)*ifmblock) ; v1++ ) {
-            for ( v2 = k*ofmblock; v2 < std::min(K, (k+1)*ofmblock); v2++ )
-              LIBXSMM_VLA_ACCESS(6,  output, k,c, r, s,v1- c*ifmblock,v2-k*ofmblock, blocksifm, R, S,ifmblock,ofmblock) = LIBXSMM_VLA_ACCESS(4, input, r, s, v1, v2,  S, C, K);
-            for ( v2 = K; v2 < (k+1)*ofmblock ; v2++ )
-              LIBXSMM_VLA_ACCESS(6,  output, k,c, r, s,v1- c*ifmblock,v2-k*ofmblock, blocksifm, R, S,ifmblock,ofmblock) = 0.0f; 
-            }
-          for ( v1 = C; v1 < (c+1)*ifmblock ; v1++ ) {
-            for ( v2 = k*ofmblock; v2 < (k+1)*ofmblock; v2++ )
-              LIBXSMM_VLA_ACCESS(6,  output, k,c, r, s,v1- c*ifmblock,v2-k*ofmblock, blocksifm, R, S,ifmblock,ofmblock) = 0.0f;
+LIBXSMM_INLINE void copy_RSCK_to_custom(const float* rsck, float* kcrs, int R,
+                                        int S, int C, int K, int blocksifm,
+                                        int blocksofm, int ifmblock,
+                                        int ofmblock, int start, int end) {
+  LIBXSMM_VLA_DECL(4, const float, input, rsck, S, C, K);
+  LIBXSMM_VLA_DECL(6, float, output, kcrs, blocksifm, R, S, ifmblock, ofmblock);
+  int r, s, k, c, v1, v2;
+
+  for (k = start; k < end; k++) {
+    for (c = 0; c < blocksifm; c++) {
+      for (r = 0; r < R; r++) {
+        for (s = 0; s < S; s++) {
+          for (v1 = c * ifmblock; v1 < std::min(C, (c + 1) * ifmblock); v1++) {
+            for (v2 = k * ofmblock; v2 < std::min(K, (k + 1) * ofmblock); v2++)
+              LIBXSMM_VLA_ACCESS(6, output, k, c, r, s, v1 - c * ifmblock,
+                                 v2 - k * ofmblock, blocksifm, R, S, ifmblock,
+                                 ofmblock) =
+                  LIBXSMM_VLA_ACCESS(4, input, r, s, v1, v2, S, C, K);
+            for (v2 = K; v2 < (k + 1) * ofmblock; v2++)
+              LIBXSMM_VLA_ACCESS(6, output, k, c, r, s, v1 - c * ifmblock,
+                                 v2 - k * ofmblock, blocksifm, R, S, ifmblock,
+                                 ofmblock) = 0.0f;
+          }
+          for (v1 = C; v1 < (c + 1) * ifmblock; v1++) {
+            for (v2 = k * ofmblock; v2 < (k + 1) * ofmblock; v2++)
+              LIBXSMM_VLA_ACCESS(6, output, k, c, r, s, v1 - c * ifmblock,
+                                 v2 - k * ofmblock, blocksifm, R, S, ifmblock,
+                                 ofmblock) = 0.0f;
           }
         }
       }
@@ -109,35 +117,28 @@ LIBXSMM_INLINE void copy_RSCK_to_custom(const float* rsck, float *kcrs, int R, i
   }
 }
 
- 
+class libxsmm_dnn_conv_desc_wrap {
+ public:
+  const libxsmm_dnn_conv_desc d;
 
-class libxsmm_dnn_conv_desc_wrap{
-  public:
-    const libxsmm_dnn_conv_desc d;
- 
-    libxsmm_dnn_conv_desc_wrap(const libxsmm_dnn_conv_desc &d_) : d(d_){
-    }
-    bool operator==(const libxsmm_dnn_conv_desc_wrap  &w) const{
-      return( d.N == w.d.N &&
-              d.C == w.d.C &&
-              d.H == w.d.H &&
-              d.W == w.d.W &&
-              d.K == w.d.K &&
-              d.R == w.d.R &&
-              d.S == w.d.S &&
-              d.u == w.d.u &&
-              d.v == w.d.v &&
-              d.pad_h_in == w.d.pad_h_in &&
-              d.pad_w_in == w.d.pad_w_in
-            );
-    }
+  libxsmm_dnn_conv_desc_wrap(const libxsmm_dnn_conv_desc& d_) : d(d_) {}
+  bool operator==(const libxsmm_dnn_conv_desc_wrap& w) const {
+    return (d.N == w.d.N && d.C == w.d.C && d.H == w.d.H && d.W == w.d.W &&
+            d.K == w.d.K && d.R == w.d.R && d.S == w.d.S && d.u == w.d.u &&
+            d.v == w.d.v && d.pad_h == w.d.pad_h && d.pad_w == w.d.pad_w);
+  }
 };
- 
- 
-struct HashFunction{
-  std::size_t operator()(const libxsmm_dnn_conv_desc_wrap & w) const{
+
+struct HashFunction {
+  std::size_t operator()(const libxsmm_dnn_conv_desc_wrap& w) const {
+    // unsigned char ptr[sizeof(&w.d)];
+
+    // memcpy(ptr, (unsigned char *)&w.d, sizeof(&w.d))
+
+    //
+    /*
     std::ostringstream N,C,H,W,K,R,S,u,v,padh,padw;
- 
+
     N << w.d.N; C << w.d.C;
     H << w.d.H; W << w.d.W;
     K << w.d.K; R << w.d.R;
@@ -152,59 +153,71 @@ struct HashFunction{
                        + S.str() + u.str()\
                        + v.str() + padh.str()\
                        + padw.str();
-
-    return ( std::hash<std::string>()(out_));
+    //
+    //
+    */
+    return (std::hash<unsigned long long>()((unsigned long long)&(w.d)));
   }
 };
 
-class handles{
-  public:
-    libxsmm_dnn_layer* find( const libxsmm_dnn_conv_desc_wrap &w) {
-      std::unordered_map<libxsmm_dnn_conv_desc_wrap , libxsmm_dnn_layer*,
-                         HashFunction>::iterator i = libxsmm_handles.find(w);
-      if (i == libxsmm_handles.end()){
-        libxsmm_dnn_err_t status;
-        libxsmm_dnn_layer* libxsmm_handle =
-            libxsmm_dnn_create_conv_layer(w.d, &status);
-        chk_libxsmm_err(status, "Create handle");
-        libxsmm_handles.insert(std::make_pair(w, libxsmm_handle));
-        return libxsmm_handle;
-      }
-      else
-        return i->second;
-    }
-   ~handles(){
-     std::unordered_map<libxsmm_dnn_conv_desc_wrap , libxsmm_dnn_layer*,
-                        HashFunction>::iterator i;
-    for (i= libxsmm_handles.begin(); i != libxsmm_handles.end(); i++)
+class handles {
+ public:
+  libxsmm_dnn_layer* find(const libxsmm_dnn_conv_desc_wrap& w) {
+    std::unordered_map<libxsmm_dnn_conv_desc_wrap, libxsmm_dnn_layer*,
+                       HashFunction>::iterator i = libxsmm_handles.find(w);
+    if (i == libxsmm_handles.end()) {
+      libxsmm_dnn_err_t status;
+      libxsmm_dnn_layer* libxsmm_handle =
+          libxsmm_dnn_create_conv_layer(w.d, &status);
+      chk_libxsmm_err(status, "Create handle");
+      libxsmm_handles.insert(std::make_pair(w, libxsmm_handle));
+      return libxsmm_handle;
+    } else
+      return i->second;
+  }
+  ~handles() {
+    std::unordered_map<libxsmm_dnn_conv_desc_wrap, libxsmm_dnn_layer*,
+                       HashFunction>::iterator i;
+    for (i = libxsmm_handles.begin(); i != libxsmm_handles.end(); i++)
       chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(i->second),
-                    "Destroy handle");
-    }
-  private:
-    std::unordered_map<libxsmm_dnn_conv_desc_wrap , libxsmm_dnn_layer*, HashFunction> libxsmm_handles;
+                      "Destroy handle");
+  }
+
+ private:
+  std::unordered_map<libxsmm_dnn_conv_desc_wrap, libxsmm_dnn_layer*,
+                     HashFunction>
+      libxsmm_handles;
 };
 
 static handles libxsmm_handles;
 
+//#define LIBXSMM_DETAILED_TIMING
+
 template <typename InputPtr, typename FilterPtr, typename OutputPtr>
 static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
                                    const libxsmm_dnn_conv_desc& desc,
-                                   libxsmm_dnn_compute_kind kind, InputPtr input,
-                                   FilterPtr filter, OutputPtr output) {
+                                   libxsmm_dnn_compute_kind kind,
+                                   InputPtr input, FilterPtr filter,
+                                   OutputPtr output) {
+#if defined(LIBXSMM_DETAILED_TIMING)
+  unsigned long long l_tick1, l_tick2, l_tick3, l_tick4, l_tick5, l_tick6,
+      l_tick7, l_tick8, l_tick9, l_tick10;
+  l_tick1 = libxsmm_timer_tick();
+#endif
   // setup scoped allocator, which adopts the allocator from the context
   const libxsmm_tf_allocator<libxsmm_scratch_allocator> tf_allocator(*ctx);
   libxsmm_dnn_err_t status;
   libxsmm_dnn_layer* libxsmm_handle;
   libxsmm_dnn_conv_desc_wrap w(desc);
   void* scratch;
- 
-  if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD)
-    libxsmm_handle = libxsmm_handles.find(w);
-  else {
-    libxsmm_handle = libxsmm_dnn_create_conv_layer(desc, &status);
-    chk_libxsmm_err(status, "Create handle");
-  }
-  
+
+  // if(kind == LIBXSMM_DNN_COMPUTE_KIND_FWD)
+  libxsmm_handle = libxsmm_handles.find(w);
+  // else{
+  //  libxsmm_handle = libxsmm_dnn_create_conv_layer(desc, &status);
+  //  chk_libxsmm_err(status, "Create handle");
+  //}
+
   status = libxsmm_dnn_get_codegen_success(libxsmm_handle, kind);
   if (status == LIBXSMM_DNN_WARN_FALLBACK) {
     chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(libxsmm_handle),
@@ -217,100 +230,168 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
   libxsmm_dnn_buffer* libxsmm_output;
   libxsmm_dnn_filter* libxsmm_filter;
 
- /*
-  const DeviceBase::CpuWorkerThreads* worker_threads =
-      ctx->device()->tensorflow_cpu_worker_threads();
-
-  int num_threads = worker_threads->num_threads;
-*/
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick2 = libxsmm_timer_tick();
+#endif
 
   int ifmblock = (libxsmm_handle->ifmblock);
   int ofmblock = (libxsmm_handle->ofmblock);
 
-  int blocksifm = desc.C%ifmblock ==0 ? desc.C/ifmblock :desc.C/ifmblock + 1;
-  int blocksofm = desc.K%ofmblock ==0 ? desc.K/ofmblock :desc.K/ofmblock + 1;
-  float *native_filter = (float*)libxsmm_aligned_scratch(
-      blocksofm*blocksifm*desc.R*desc.S*ifmblock*ofmblock*sizeof(float),
-      2097152);
+  int blocksifm =
+      desc.C % ifmblock == 0 ? desc.C / ifmblock : desc.C / ifmblock + 1;
+  int blocksofm =
+      desc.K % ofmblock == 0 ? desc.K / ofmblock : desc.K / ofmblock + 1;
+  float* native_filter =
+      (float*)libxsmm_aligned_scratch(blocksofm * blocksifm * desc.R * desc.S *
+                                          ifmblock * ofmblock * sizeof(float),
+                                      2097152);
 
   const DeviceBase::CpuWorkerThreads* worker_threads =
       ctx->device()->tensorflow_cpu_worker_threads();
 
   int num_threads = worker_threads->num_threads;
 
-
-  if(blocksofm > num_threads){
-    int work = blocksofm;
-    BlockingCounter count(num_threads);
-    for (int i = 0; i < num_threads; ++i) {
+#if 1
+  if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD ||
+      kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
+    if (blocksofm > num_threads) {
+      int work = blocksofm;
+      BlockingCounter count(num_threads);
+      for (int i = 0; i < num_threads; ++i) {
         worker_threads->workers->Schedule([=, &count]() {
-        int start = work/num_threads*i;
-        int end =  (start + work/num_threads) > work ? work: start + work/num_threads;  
-        copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S,desc.C, desc.K,blocksifm,blocksofm,ifmblock,ofmblock,start, end);
-        count.DecrementCount();
+          int start = work / num_threads * i;
+          int end = (start + work / num_threads) > work
+                        ? work
+                        : start + work / num_threads;
+          copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S, desc.C,
+                              desc.K, blocksifm, blocksofm, ifmblock, ofmblock,
+                              start, end);
+          count.DecrementCount();
         });
-    }
-    count.Wait();
-  }
-  else{
+      }
+      count.Wait();
+    } else {
+      int work = blocksofm;
+      int num_threads = work;
 
-    int work = blocksofm;
-    int num_threads = work;
-    
-    BlockingCounter count(num_threads);
-    for (int i = 0; i < num_threads; ++i) {
+      BlockingCounter count(num_threads);
+      for (int i = 0; i < num_threads; ++i) {
         worker_threads->workers->Schedule([=, &count]() {
-        int start = i;
-        int end =  i+1;
-        copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S,desc.C, desc.K,blocksifm,blocksofm,ifmblock,ofmblock, start, end);
-        count.DecrementCount();
+          int start = i;
+          int end = i + 1;
+          copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S, desc.C,
+                              desc.K, blocksifm, blocksofm, ifmblock, ofmblock,
+                              start, end);
+          count.DecrementCount();
         });
+      }
+      count.Wait();
     }
-    count.Wait();
   }
-
-  libxsmm_input = libxsmm_dnn_link_buffer(
-      libxsmm_handle, LIBXSMM_DNN_INPUT, input, LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
+  // Added: for weight update
+  else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
+    libxsmm_filter =
+        libxsmm_dnn_link_filter(libxsmm_handle, LIBXSMM_DNN_FILTER, filter,
+                                LIBXSMM_DNN_TENSOR_FORMAT_RSCK_PTR, &status);
+    chk_libxsmm_err(status,
+                    "Link filter");  // weight update is in RSCK as
+                                     // filter should be returned in RSCK
+                                     // format
+  }
+#else
+  memset(native_filter, 0,
+         blocksofm * blocksifm * desc.R * desc.S * ifmblock * ofmblock *
+             sizeof(float));
+#endif
+
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick3 = libxsmm_timer_tick();
+#endif
+
+  libxsmm_input =
+      libxsmm_dnn_link_buffer(libxsmm_handle, LIBXSMM_DNN_INPUT, input,
+                              LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
   chk_libxsmm_err(status, "Link input buffer");
-  libxsmm_output = libxsmm_dnn_link_buffer(
-      libxsmm_handle, LIBXSMM_DNN_OUTPUT, output, LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
+  libxsmm_output =
+      libxsmm_dnn_link_buffer(libxsmm_handle, LIBXSMM_DNN_OUTPUT, output,
+                              LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
   chk_libxsmm_err(status, "Link output buffer");
-  libxsmm_filter = libxsmm_dnn_link_filter(
-      libxsmm_handle, LIBXSMM_DNN_FILTER, native_filter, LIBXSMM_DNN_TENSOR_FORMAT_LIBXSMM_PTR, &status);
-  chk_libxsmm_err(status, "Link filter");
-
-  chk_libxsmm_err(libxsmm_dnn_zero_buffer(libxsmm_output), "Zero output");
-
-
+  if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD ||
+      kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
+    libxsmm_filter = libxsmm_dnn_link_filter(
+        libxsmm_handle, LIBXSMM_DNN_FILTER, native_filter,
+        LIBXSMM_DNN_TENSOR_FORMAT_LIBXSMM_PTR, &status);
+    chk_libxsmm_err(status, "Link filter");
+  }
   if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD) {
-    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input, LIBXSMM_DNN_REGULAR_INPUT),
+    chk_libxsmm_err(libxsmm_dnn_zero_buffer(libxsmm_output), "Zero output");
+
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input,
+                                            LIBXSMM_DNN_REGULAR_INPUT),
                     "Bind input forward");
-    chk_libxsmm_err(
-        libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output, LIBXSMM_DNN_REGULAR_OUTPUT),
-        "Bind output forward");
-    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter, LIBXSMM_DNN_REGULAR_FILTER),
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output,
+                                            LIBXSMM_DNN_REGULAR_OUTPUT),
+                    "Bind output forward");
+    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter,
+                                            LIBXSMM_DNN_REGULAR_FILTER),
                     "Bind filter forward");
-  } else {
-    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input, LIBXSMM_DNN_GRADIENT_INPUT),
+  } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
+    chk_libxsmm_err(libxsmm_dnn_zero_buffer(libxsmm_input), "Zero input");
+
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input,
+                                            LIBXSMM_DNN_GRADIENT_INPUT),
                     "Bind input backward");
-    chk_libxsmm_err(
-        libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output, LIBXSMM_DNN_GRADIENT_OUTPUT),
-        "Bind output backward");
-    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter, LIBXSMM_DNN_REGULAR_FILTER),
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output,
+                                            LIBXSMM_DNN_GRADIENT_OUTPUT),
+                    "Bind output backward");
+    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter,
+                                            LIBXSMM_DNN_REGULAR_FILTER),
                     "Bind filter backward");
+  } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
+    chk_libxsmm_err(libxsmm_dnn_zero_filter(libxsmm_filter), "Zero filter");
+
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input,
+                                            LIBXSMM_DNN_REGULAR_INPUT),
+                    "Bind input weight udpate");
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output,
+                                            LIBXSMM_DNN_GRADIENT_OUTPUT),
+                    "Bind output weight update");
+    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter,
+                                            LIBXSMM_DNN_GRADIENT_FILTER),
+                    "Bind filter weight update");
+  } else {
+    /* shouldn't happen */
   }
 
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick4 = libxsmm_timer_tick();
+#endif
+
   /* bind scratch */
-  scratch = (void*)libxsmm_aligned_scratch( libxsmm_dnn_get_scratch_size( libxsmm_handle, kind, &status ), 2097152);
-  chk_libxsmm_err( status, "scratch allocation" );
-  chk_libxsmm_err( libxsmm_dnn_bind_scratch( libxsmm_handle, kind, scratch ), "binding scratch" );
+  scratch = (void*)libxsmm_aligned_scratch(
+      libxsmm_dnn_get_scratch_size(libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL,
+                                   &status),
+      2097152);
+  chk_libxsmm_err(status, "scratch allocation");
+  chk_libxsmm_err(libxsmm_dnn_bind_scratch(
+                      libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL, scratch),
+                  "binding scratch");
+
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick5 = libxsmm_timer_tick();
+#endif
 
   if (kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
     libxsmm_dnn_transpose_filter(libxsmm_handle, LIBXSMM_DNN_FILTER);
   }
 
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick6 = libxsmm_timer_tick();
+#endif
+
+#if 1
   BlockingCounter counter(num_threads);
-  
+
   for (int i = 0; i < num_threads; ++i) {
     worker_threads->workers->Schedule([=, &counter]() {
       chk_libxsmm_err(libxsmm_dnn_execute_st(libxsmm_handle, kind, 0, i),
@@ -319,28 +400,97 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
     });
   }
   counter.Wait();
+#else
+#pragma omp parallel
+  {
+    chk_libxsmm_err(
+        libxsmm_dnn_execute_st(libxsmm_handle, kind, 0, omp_get_thread_num()),
+        "Worker");
+  }
+#endif
+
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick7 = libxsmm_timer_tick();
+#endif
+
+  if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
+    libxsmm_dnn_reduce_wu_filters(libxsmm_handle, LIBXSMM_DNN_GRADIENT_FILTER);
+  }
+
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick8 = libxsmm_timer_tick();
+#endif
 
   /* clean up */
-  chk_libxsmm_err( libxsmm_dnn_release_scratch( libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL ), "release scratch" );
+  chk_libxsmm_err(
+      libxsmm_dnn_release_scratch(libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL),
+      "release scratch");
   if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD) {
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_REGULAR_INPUT ), "release input" );
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_REGULAR_OUTPUT ), "release output" );
-    chk_libxsmm_err( libxsmm_dnn_release_filter( libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER ), "release filter" );
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_REGULAR_INPUT),
+        "release input");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_REGULAR_OUTPUT),
+        "release output");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_filter(libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER),
+        "release filter");
+  } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_GRADIENT_INPUT),
+        "release input");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_GRADIENT_OUTPUT),
+        "release output");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_filter(libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER),
+        "release filter");
+  } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_REGULAR_INPUT),
+        "release input");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_GRADIENT_OUTPUT),
+        "release output");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_filter(libxsmm_handle, LIBXSMM_DNN_GRADIENT_FILTER),
+        "release filter");
   } else {
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_GRADIENT_INPUT ), "release input" );
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_GRADIENT_OUTPUT ), "release output" );
-    chk_libxsmm_err( libxsmm_dnn_release_filter( libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER ), "release filter" );
+    /* shouldn't happen */
   }
   chk_libxsmm_err(libxsmm_dnn_destroy_buffer(libxsmm_input), "Destroy input");
   chk_libxsmm_err(libxsmm_dnn_destroy_buffer(libxsmm_output), "Destroy output");
   chk_libxsmm_err(libxsmm_dnn_destroy_filter(libxsmm_filter), "Destroy filter");
-  
-  if(kind != LIBXSMM_DNN_COMPUTE_KIND_FWD)
-    chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(libxsmm_handle),
-                  "Destroy handle");
+
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick9 = libxsmm_timer_tick();
+#endif
+
+  // if(kind != LIBXSMM_DNN_COMPUTE_KIND_FWD)
+  // chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(libxsmm_handle),
+  //               "Destroy handle");
 
   libxsmm_free(native_filter);
   libxsmm_free(scratch);
+
+#if defined(LIBXSMM_DETAILED_TIMING)
+  l_tick10 = libxsmm_timer_tick();
+  printf(
+      "time for convolution (%i, %i, %i, %i, %i): %f, %f, %f, %f, %f, %f, %f, "
+      "%f, %f, %f\n",
+      desc.N, desc.C, desc.K, desc.R, desc.S,
+      libxsmm_timer_duration(l_tick1, l_tick2),
+      libxsmm_timer_duration(l_tick2, l_tick3),
+      libxsmm_timer_duration(l_tick3, l_tick4),
+      libxsmm_timer_duration(l_tick4, l_tick5),
+      libxsmm_timer_duration(l_tick5, l_tick6),
+      libxsmm_timer_duration(l_tick6, l_tick7),
+      libxsmm_timer_duration(l_tick7, l_tick8),
+      libxsmm_timer_duration(l_tick8, l_tick9),
+      libxsmm_timer_duration(l_tick9, l_tick10),
+      libxsmm_timer_duration(l_tick1, l_tick10));
+#endif
+
   return true;  // Succeeded
 }
 
@@ -348,8 +498,8 @@ template <typename T>
 struct XsmmFwdConv2D<CPUDevice, T> {
   bool operator()(OpKernelContext* ctx, const libxsmm_dnn_conv_desc& desc,
                   const T* input, const T* filter, T* output) {
-    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_FWD, input,
-                                  filter, output);
+    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_FWD,
+                                  input, filter, output);
   }
 };
 
@@ -357,8 +507,8 @@ template <typename T>
 struct XsmmBkwInputConv2D<CPUDevice, T> {
   bool operator()(OpKernelContext* ctx, const libxsmm_dnn_conv_desc& desc,
                   T* input, const T* filter, const T* output) {
-    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_BWD, input,
-                                  filter, output);
+    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_BWD,
+                                  input, filter, output);
   }
 };
 
@@ -366,8 +516,8 @@ template <typename T>
 struct XsmmBkwFilterConv2D<CPUDevice, T> {
   bool operator()(OpKernelContext* ctx, const libxsmm_dnn_conv_desc& desc,
                   const T* input, T* filter, const T* output) {
-    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_UPD, input,
-                                  filter, output);
+    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_UPD,
+                                  input, filter, output);
   }
 };
 
diff --git a/tensorflow/core/lib/io/inputbuffer.cc b/tensorflow/core/lib/io/inputbuffer.cc
index 9cff1d349e..7efe2dc543 100644
--- a/tensorflow/core/lib/io/inputbuffer.cc
+++ b/tensorflow/core/lib/io/inputbuffer.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/lib/io/inputbuffer.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/platform/logging.h"
 
 namespace tensorflow {
 namespace io {
@@ -43,25 +44,26 @@ Status InputBuffer::FillBuffer() {
 
 Status InputBuffer::ReadLine(string* result) {
   result->clear();
-  int i;
   Status s;
-  for (i = 0;; i++) {
-    if (pos_ == limit_) {
-      // Get more data into buffer
-      s = FillBuffer();
-      if (limit_ == buf_) {
-        break;
+  do {
+    size_t buf_remain = limit_ - pos_;
+    char* newline = static_cast<char*>(memchr(pos_, '\n', buf_remain));
+    if (newline != nullptr) {
+      size_t result_len = newline - pos_;
+      result->append(pos_, result_len);
+      pos_ = newline + 1;
+      if (!result->empty() && result->back() == '\r') {
+        result->resize(result->size() - 1);
       }
-    }
-    char c = *pos_++;
-    if (c == '\n') {
-      // We don't append the '\n' to *result
       return Status::OK();
     }
-    // We don't append '\r' to *result
-    if (c != '\r') {
-      *result += c;
-    }
+    if (buf_remain > 0) result->append(pos_, buf_remain);
+    // Get more data into buffer
+    s = FillBuffer();
+    DCHECK_EQ(pos_, buf_);
+  } while (limit_ != buf_);
+  if (!result->empty() && result->back() == '\r') {
+    result->resize(result->size() - 1);
   }
   if (errors::IsOutOfRange(s) && !result->empty()) {
     return Status::OK();
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 6930af48a7..e81490c498 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1323,6 +1323,11 @@ Produces an output tensor with shape `indices.shape + params.shape[1:]` where:
 If `indices` is a permutation and `len(indices) == params.shape[0]` then
 this operation will permute `params` accordingly.
 
+`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
+`indices` are always validated to be within range. If assigned to GPU,
+out-of-bound indices result in unspecified behavior (currently the result is
+`0`, but this may become an error in the future).
+
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 <img style="width:100%" src="../../images/Gather.png" alt>
 </div>
diff --git a/tensorflow/core/ops/nn_grad.cc b/tensorflow/core/ops/nn_grad.cc
index e3b876b240..05ad635f58 100644
--- a/tensorflow/core/ops/nn_grad.cc
+++ b/tensorflow/core/ops/nn_grad.cc
@@ -181,4 +181,35 @@ Status MaxPoolGrad(const AttrSlice& attrs, FunctionDef* g) {
 }
 REGISTER_OP_GRADIENT("MaxPool", MaxPoolGrad);
 
+Status MaxPoolGradGrad(const AttrSlice& attrs, FunctionDef* g) {
+  // clang-format off
+  *g = FDH::Define(
+    // Arg defs
+    {"input: T", "grad: T"},
+    // Ret val defs
+    {"output: T"},
+    // Attr defs
+    {"T: {float, half} = DT_FLOAT",
+     "ksize: list(int) >= 4",
+     "strides: list(int) >= 4",
+     GetPaddingAttrString()},
+    // Nodes
+    {
+      // Invoke MaxPool again to recompute the outputs (removed by CSE?).
+      {{"maxpool"}, "MaxPool", {"input"},
+       /*Attrs=*/{{"T", "$T"},
+                  {"ksize", "$ksize"},
+                  {"strides", "$strides"},
+                  {"padding", "$padding"}}},
+      {{"output"}, "MaxPoolGradGrad", {"input", "maxpool", "grad"},
+       /*Attrs=*/{{"T", "$T"},
+                  {"ksize", "$ksize"},
+                  {"strides", "$strides"},
+                  {"padding", "$padding"}}}
+    });
+  // clang-format on
+  return Status::OK();
+}
+REGISTER_OP_GRADIENT("MaxPoolGrad", MaxPoolGradGrad);
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/ops/nn_ops.cc b/tensorflow/core/ops/nn_ops.cc
index e56b27b0c0..e9d5897af0 100644
--- a/tensorflow/core/ops/nn_ops.cc
+++ b/tensorflow/core/ops/nn_ops.cc
@@ -89,7 +89,7 @@ REGISTER_OP("AvgPool")
     .Attr("strides: list(int) >= 4")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
-    .Attr("T: {float, half, double}")
+    .Attr("T: realnumbertype")
     .SetShapeFn(shape_inference::AvgPoolShape)
     .Doc(R"doc(
 Performs average pooling on the input.
@@ -117,7 +117,7 @@ REGISTER_OP("AvgPoolGrad")
     .Attr("strides: list(int) >= 4")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
-    .Attr("T: {float, half, double}")
+    .Attr("T: realnumbertype")
     .SetShapeFn([](InferenceContext* c) {
       // NOTE(mrry): We could in principle work out the shape from the
       // gradients and the attrs, but if we do not know orig_input_shape
@@ -1186,15 +1186,16 @@ data_format: The data format of the input and output data. With the
 )doc");
 
 REGISTER_OP("MaxPool3DGrad")
-    .Input("orig_input: float")
-    .Input("orig_output: float")
+    .Input("orig_input: TInput")
+    .Input("orig_output: TInput")
     .Input("grad: T")
     .Output("output: T")
     .Attr("ksize: list(int) >= 5 ")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
-    .Attr("T: numbertype")
+    .Attr("T: numbertype = DT_FLOAT")
+    .Attr("TInput: numbertype = DT_FLOAT")
     .SetShapeFn([](InferenceContext* c) {
       return UnchangedShapeWithRank(c, 5);
     })
@@ -1216,6 +1217,44 @@ data_format: The data format of the input and output data. With the
         [batch, in_channels, in_depth, in_height, in_width].
 )doc");
 
+REGISTER_OP("MaxPool3DGradGrad")
+    .Input("orig_input: T")
+    .Input("orig_output: T")
+    .Input("grad: T")
+    .Output("output: T")
+    .Attr("ksize: list(int) >= 5 ")
+    .Attr("strides: list(int) >= 5")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnet3dDataFormatAttrString())
+    .Attr("T: realnumbertype")
+    .SetShapeFn([](InferenceContext* c) {
+      TF_RETURN_IF_ERROR(shape_inference::Pool3DShape(c));
+      ShapeHandle unused;
+      // Validate 'orig_input' is the same shape as 'grad'
+      TF_RETURN_IF_ERROR(c->Merge(c->input(0), c->input(2), &unused));
+      // Validate 'orig_output' is same shape as 'output'
+      TF_RETURN_IF_ERROR(c->Merge(c->input(1), c->output(0), &unused));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Computes second-order gradients of the maxpooling function.
+
+ksize: 1-D tensor of length 5. The size of the window for each dimension of
+  the input tensor. Must have `ksize[0] = ksize[4] = 1`.
+strides: 1-D tensor of length 5. The stride of the sliding window for each
+  dimension of `input`. Must have `strides[0] = strides[4] = 1`.
+padding: The type of padding algorithm to use.
+orig_input: The original input tensor.
+orig_output: The original output tensor.
+grad: Output backprop of shape `[batch, depth, rows, cols, channels]`.
+output: Gradients of gradients w.r.t. the input to `max_pool`.
+data_format: The data format of the input and output data. With the
+    default format "NDHWC", the data is stored in the order of:
+        [batch, in_depth, in_height, in_width, in_channels].
+    Alternatively, the format could be "NCDHW", the data storage order is:
+        [batch, in_channels, in_depth, in_height, in_width].
+)doc");
+
 // --------------------------------------------------------------------------
 
 REGISTER_OP("L2Loss")
@@ -1303,7 +1342,7 @@ output: The gradients for LRN.
 // --------------------------------------------------------------------------
 
 REGISTER_OP("MaxPool")
-    .Attr("T: {float, half} = DT_FLOAT")
+    .Attr("T: realnumbertype = DT_FLOAT")
     .Attr("ksize: list(int) >= 4")
     .Attr("strides: list(int) >= 4")
     .Attr(GetPaddingAttrString())
@@ -1336,7 +1375,7 @@ REGISTER_OP("MaxPoolGrad")
     .Input("orig_output: T")
     .Input("grad: T")
     .Output("output: T")
-    .Attr("T: {float, half} = DT_FLOAT")
+    .Attr("T: realnumbertype = DT_FLOAT")
     .SetShapeFn([](InferenceContext* c) {
       return UnchangedShapeWithRank(c, 4);
     })
@@ -1358,6 +1397,43 @@ grad: 4-D.  Gradients w.r.t. the output of `max_pool`.
 output: Gradients w.r.t. the input to `max_pool`.
 )doc");
 
+REGISTER_OP("MaxPoolGradGrad")
+    .Attr("ksize: list(int) >= 4")
+    .Attr("strides: list(int) >= 4")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnetDataFormatAttrString())
+    .Input("orig_input: T")
+    .Input("orig_output: T")
+    .Input("grad: T")
+    .Output("output: T")
+    .Attr("T: realnumbertype")
+    .SetShapeFn([](InferenceContext* c) {
+      TF_RETURN_IF_ERROR(shape_inference::MaxPoolShape(c));
+      ShapeHandle unused;
+      // Validate 'orig_input' is the same shape as 'grad'
+      TF_RETURN_IF_ERROR(c->Merge(c->input(0), c->input(2), &unused));
+      // Validate 'orig_output' is same shape as 'output'
+      TF_RETURN_IF_ERROR(c->Merge(c->input(1), c->output(0), &unused));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Computes second-order gradients of the maxpooling function.
+
+ksize: The size of the window for each dimension of the input tensor.
+strides: The stride of the sliding window for each dimension of the
+  input tensor.
+padding: The type of padding algorithm to use.
+data_format: Specify the data format of the input and output data. With the
+    default format "NHWC", the data is stored in the order of:
+        [batch, in_height, in_width, in_channels].
+    Alternatively, the format could be "NCHW", the data storage order of:
+        [batch, in_channels, in_height, in_width].
+orig_input: The original input tensor.
+orig_output: The original output tensor.
+grad: 4-D.  Gradients of gradients w.r.t. the input of `max_pool`.
+output: Gradients of gradients w.r.t. the input to `max_pool`.
+)doc");
+
 REGISTER_OP("MaxPoolWithArgmax")
     .Attr("ksize: list(int) >= 4")
     .Attr("strides: list(int) >= 4")
@@ -1366,7 +1442,7 @@ REGISTER_OP("MaxPoolWithArgmax")
     .Input("input: T")
     .Output("output: T")
     .Output("argmax: Targmax")
-    .Attr("T: {float, half} = DT_FLOAT")
+    .Attr("T: realnumbertype")
     .SetShapeFn([](InferenceContext* c) {
       TF_RETURN_IF_ERROR(shape_inference::MaxPoolShape(c));
       c->set_output(1, c->output(0));
@@ -1397,7 +1473,7 @@ REGISTER_OP("MaxPoolGradWithArgmax")
     .Input("grad: T")
     .Input("argmax: Targmax")
     .Output("output: T")
-    .Attr("T: {float, half} = DT_FLOAT")
+    .Attr("T: realnumbertype")
     .SetShapeFn([](InferenceContext* c) {
       return UnchangedShapeWithRank(c, 4);
     })
@@ -1415,6 +1491,39 @@ argmax: The indices of the maximum values chosen for each output of `max_pool`.
 output: Gradients w.r.t. the input of `max_pool`.
 )doc");
 
+REGISTER_OP("MaxPoolGradGradWithArgmax")
+    .Attr("ksize: list(int) >= 4")
+    .Attr("strides: list(int) >= 4")
+    .Attr(GetPaddingAttrString())
+    .Attr("Targmax: {int32, int64}")
+    .Input("input: T")
+    .Input("grad: T")
+    .Input("argmax: Targmax")
+    .Output("output: T")
+    .Attr("T: realnumbertype")
+    .SetShapeFn([](InferenceContext* c) {
+      TF_RETURN_IF_ERROR(shape_inference::MaxPoolShape(c));
+      ShapeHandle unused;
+      // Validate 'orig_input' is the same shape as 'grad'
+      TF_RETURN_IF_ERROR(c->Merge(c->input(0), c->input(1), &unused));
+      // Validate 'argmax' is same shape as 'output'
+      TF_RETURN_IF_ERROR(c->Merge(c->input(2), c->output(0), &unused));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Computes second-order gradients of the maxpooling function.
+
+ksize: The size of the window for each dimension of the input tensor.
+strides: The stride of the sliding window for each dimension of the
+  input tensor.
+padding: The type of padding algorithm to use.
+input: The original input.
+grad: 4-D with shape `[batch, height, width, channels]`.  Gradients w.r.t. the
+  input of `max_pool`.
+argmax: The indices of the maximum values chosen for each output of `max_pool`.
+output: Gradients of gradients w.r.t. the input of `max_pool`.
+)doc");
+
 // --------------------------------------------------------------------------
 
 REGISTER_OP("Dilation2D")
@@ -2517,7 +2626,10 @@ REGISTER_OP("MklConv2D")
     .Attr(GetConvnetDataFormatAttrString())
     .SetShapeFn(shape_inference::Conv2DShape)
     .Doc(R"doc(
-MKL version of Conv2D
+MKL version of Conv2D operator. Uses MKL DNN APIs to perform 2D convolution.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
 )doc");
 
 REGISTER_OP("MklConv2DWithBias")
@@ -2533,14 +2645,216 @@ REGISTER_OP("MklConv2DWithBias")
     .Attr("strides: list(int)")
     .Attr("use_cudnn_on_gpu: bool = true")
     .Attr(GetPaddingAttrString())
-    .Attr(GetConvnetDataFormatAttrString());
+    .Attr(GetConvnetDataFormatAttrString())
+    .Doc(R"doc(
+MKL version of Conv2D and BiasAdd operator. Uses MKL DNN APIs to perform
+2D convolution and add Bias to the output of convolution.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklConv2DBackpropFilter")
+    .Input("input: T")
+    .Input("mkl_input: uint8")
+    .Input("filter_sizes: int32")
+    .Input("mkl_filter_size: uint8")
+    .Input("out_backprop: T")
+    .Input("mkl_out_backprop: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("T: {half, float, double}")
+    .Attr("strides: list(int)")
+    .Attr("use_cudnn_on_gpu: bool = true")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnetDataFormatAttrString())
+    .SetShapeFn([](InferenceContext* c) {
+      return InputTensorShapeOrUnknown(c, 2 /* input_idx */, 4 /* ndims */);
+    })
+    .Doc(R"doc(
+MKL version of Conv2DBackpropFilter. Uses MKL DNN APIs to compute the
+gradients of convolution with respect to the filter.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklConv2DWithBiasBackpropBias")
+    .Input("out_backprop: T")
+    .Input("mkl_out_backprop: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("T: {half, float, double}")
+    .Attr("strides: list(int)")
+    .Attr(GetConvnetDataFormatAttrString())
+    .Doc(R"doc(
+MKL version of Conv2DBackpropBias. Uses MKL DNN APIs to compute the
+gradients of convolution with respect to the bias.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklConv2DBackpropInput")
+    .Input("input_sizes: int32")
+    .Input("mkl_input_sizes: uint8")
+    .Input("filter: T")
+    .Input("mkl_filter: uint8")
+    .Input("out_backprop: T")
+    .Input("mkl_out_backprop: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("T: {half, float, double}")
+    .Attr("strides: list(int)")
+    .Attr("use_cudnn_on_gpu: bool = true")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnetDataFormatAttrString())
+    .SetShapeFn([](InferenceContext* c) {
+      return InputTensorShapeOrUnknown(c, 0 /* input_idx */, 4 /* ndims */);
+    })
+    .Doc(R"doc(
+MKL version of Convolution2D backward input. Uses MKL DNN APIs to compute the
+gradients of convolution with respect to the input.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklRelu")
+    .Input("features: T")
+    .Input("mkl_features: uint8")
+    .Output("activations: T")
+    .Output("mkl_activations: uint8")
+    .Attr("T: realnumbertype")
+    .SetShapeFn(shape_inference::UnchangedShape)
+    .Doc(R"doc(
+MKL version of Relu operator. Uses MKL DNN APIs to implement Relu operator.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklReluGrad")
+    .Input("gradients: T")
+    .Input("mkl_gradients: uint8")
+    .Input("features: T")
+    .Input("mkl_features: uint8")
+    .Output("backprops: T")
+    .Output("mkl_backprops: uint8")
+    .Attr("T: realnumbertype")
+    .SetShapeFn(shape_inference::MergeBothInputsShapeFn)
+    .Doc(R"doc(
+MKL version of ReluGrad operator. Uses MKL DNN APIs to compute rectified
+linear gradients for Relu operation.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklMaxPool")
+    .Attr("T: {float, half} = DT_FLOAT")
+    .Attr("ksize: list(int) >= 4")
+    .Attr("strides: list(int) >= 4")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnetDataFormatAttrString())
+    .Attr("workspace_enabled: bool = false")
+    .Input("input: T")
+    .Input("mkl_input: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Output("workspace: T")
+    .Output("mkl_workspace: uint8")
+    .SetShapeFn(shape_inference::MaxPoolShape)
+    .Doc(R"doc(
+MKL version of MaxPool operator. Uses MKL DNN APIs to perform max pooling
+on the input.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklMaxPoolGrad")
+    .Attr("T: {float, half} = DT_FLOAT")
+    .Attr("ksize: list(int) >= 4")
+    .Attr("strides: list(int) >= 4")
+    .Attr("workspace_enabled: bool = false")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnetDataFormatAttrString())
+    .Input("orig_input: T")
+    .Input("mkl_orig_input: uint8")
+    .Input("orig_output: T")
+    .Input("mkl_orig_output: uint8")
+    .Input("grad: T")
+    .Input("mkl_grad: uint8")
+    .Input("workspace: T")
+    .Input("mkl_workspace: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .SetShapeFn([](InferenceContext* c) {
+      return UnchangedShapeWithRank(c, 4);
+    })
+    .Doc(R"doc(
+MKL version of MaxPoolGrad. Uses MKL DNN APIs to compute gradients of
+MaxPool operator.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklAvgPool")
+    .Input("value: T")
+    .Input("mkl_input: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("ksize: list(int) >= 4")
+    .Attr("strides: list(int) >= 4")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnetDataFormatAttrString())
+    .Attr("T: {float, half, double}")
+    .SetShapeFn(shape_inference::AvgPoolShape)
+    .Doc(R"doc(
+MKL version of AvgPool operator. Uses MKL DNN APIs to perform average pooling
+on the input.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklAvgPoolGrad")
+    .Input("orig_input_shape: int32")
+    .Input("mkl_orig_input: uint8")
+    .Input("grad: T")
+    .Input("mkl_grad: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("ksize: list(int) >= 4")
+    .Attr("strides: list(int) >= 4")
+    .Attr(GetPaddingAttrString())
+    .Attr(GetConvnetDataFormatAttrString())
+    .Attr("T: {float, half, double}")
+    .SetShapeFn([](InferenceContext* c) {
+      return InputTensorShapeOrUnknown(c, 0 /* input_idx */, 4 /* ndims */);
+    })
+    .Doc(R"doc(
+MKL version of AvgPoolGrad operator. Uses MKL DNN APIs to compute gradients
+of AvgPool function.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
 
 REGISTER_OP("MklToTf")
     .Input("input: T")
     .Input("mkl_input: uint8")
     .Output("output: T")
     .Attr("T: {half, float, double}")
-    .Attr(GetConvnetDataFormatAttrString());
+    .Attr(GetConvnetDataFormatAttrString())
+    .Doc(R"doc(
+MKL operator to convert a tensor from MKL layout to TensorFlow layout.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
 #endif  // INTEL_MKL
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 8cea2b239e..d1f9bbb391 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -25842,6 +25842,59 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
+op {
+  name: "UnsortedSegmentSum"
+  input_arg {
+    name: "data"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "segment_ids"
+    description: "A tensor whose shape is a prefix of `data.shape`."
+    type_attr: "Tindices"
+  }
+  input_arg {
+    name: "num_segments"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "Tindices"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  summary: "Computes the max along segments of a tensor."
+  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
+}
 op {
   name: "Unstage"
   output_arg {
diff --git a/tensorflow/core/platform/cpu_info.cc b/tensorflow/core/platform/cpu_info.cc
index 5aa8c66a0b..906826e6f8 100644
--- a/tensorflow/core/platform/cpu_info.cc
+++ b/tensorflow/core/platform/cpu_info.cc
@@ -67,11 +67,8 @@ int GetXCR0EAX() {
 #endif
 
 // Structure for basic CPUID info
-struct CPUIDInfo {
-  string vendor_str;
-  int family;
-  int model_num;
-
+class CPUIDInfo {
+ public:
   CPUIDInfo()
       : have_adx_(0),
         have_aes_(0),
@@ -120,9 +117,9 @@ struct CPUIDInfo {
 
     // Get vendor string (issue CPUID with eax = 0)
     GETCPUID(eax, ebx, ecx, edx, 0, 0);
-    cpuid->vendor_str.append(reinterpret_cast<char *>(&ebx), 4);
-    cpuid->vendor_str.append(reinterpret_cast<char *>(&edx), 4);
-    cpuid->vendor_str.append(reinterpret_cast<char *>(&ecx), 4);
+    cpuid->vendor_str_.append(reinterpret_cast<char *>(&ebx), 4);
+    cpuid->vendor_str_.append(reinterpret_cast<char *>(&edx), 4);
+    cpuid->vendor_str_.append(reinterpret_cast<char *>(&ecx), 4);
 
     // To get general information and extended features we send eax = 1 and
     // ecx = 0 to cpuid.  The response is returned in eax, ebx, ecx and edx.
@@ -130,8 +127,8 @@ struct CPUIDInfo {
     // Volume 2A: Instruction Set Reference, A-M CPUID).
     GETCPUID(eax, ebx, ecx, edx, 1, 0);
 
-    cpuid->model_num = static_cast<int>((eax >> 4) & 0xf);
-    cpuid->family = static_cast<int>((eax >> 8) & 0xf);
+    cpuid->model_num_ = static_cast<int>((eax >> 4) & 0xf);
+    cpuid->family_ = static_cast<int>((eax >> 8) & 0xf);
 
     cpuid->have_aes_ = (ecx >> 25) & 0x1;
     cpuid->have_cmov_ = (edx >> 15) & 0x1;
@@ -253,6 +250,10 @@ struct CPUIDInfo {
     return false;
   }
 
+  string vendor_str() const { return vendor_str_; }
+  int family() const { return family_; }
+  int model_num() { return model_num_; }
+
  private:
   int highest_eax_;
   int have_adx_ : 1;
@@ -292,6 +293,9 @@ struct CPUIDInfo {
   int have_sse4_2_ : 1;
   int have_ssse3_ : 1;
   int have_hypervisor_ : 1;
+  string vendor_str_;
+  int family_;
+  int model_num_;
 };
 
 std::once_flag cpuid_once_flag;
@@ -317,7 +321,7 @@ bool TestCPUFeature(CPUFeature feature) {
 std::string CPUVendorIDString() {
 #ifdef PLATFORM_IS_X86
   InitCPUIDInfo();
-  return cpuid->vendor_str;
+  return cpuid->vendor_str();
 #else
   return "";
 #endif
@@ -326,7 +330,7 @@ std::string CPUVendorIDString() {
 int CPUFamily() {
 #ifdef PLATFORM_IS_X86
   InitCPUIDInfo();
-  return cpuid->family;
+  return cpuid->family();
 #else
   return 0;
 #endif
@@ -335,7 +339,7 @@ int CPUFamily() {
 int CPUModelNum() {
 #ifdef PLATFORM_IS_X86
   InitCPUIDInfo();
-  return cpuid->model_num;
+  return cpuid->model_num();
 #else
   return 0;
 #endif
diff --git a/tensorflow/core/platform/windows/port.cc b/tensorflow/core/platform/windows/port.cc
index 3394524aa5..85b53e07c4 100644
--- a/tensorflow/core/platform/windows/port.cc
+++ b/tensorflow/core/platform/windows/port.cc
@@ -13,6 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#ifdef TENSORFLOW_USE_JEMALLOC
+#include "jemalloc/jemalloc.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,16 +57,55 @@ int NumSchedulableCPUs() {
 }
 
 void* AlignedMalloc(size_t size, int minimum_alignment) {
+#ifdef TENSORFLOW_USE_JEMALLOC
+  void* ptr = NULL;
+  // posix_memalign requires that the requested alignment be at least
+  // sizeof(void*). In this case, fall back on malloc which should return
+  // memory aligned to at least the size of a pointer.
+  const int required_alignment = sizeof(void*);
+  if (minimum_alignment < required_alignment) return Malloc(size);
+  int err = jemalloc_posix_memalign(&ptr, minimum_alignment, size);
+  if (err != 0) {
+    return NULL;
+  } else {
+    return ptr;
+  }
+#else
   return _aligned_malloc(size, minimum_alignment);
+#endif
 }
 
-void AlignedFree(void* aligned_memory) { _aligned_free(aligned_memory); }
+void AlignedFree(void* aligned_memory) {
+#ifdef TENSORFLOW_USE_JEMALLOC
+  jemalloc_free(aligned_memory);
+#else
+  _aligned_free(aligned_memory);
+#endif
+}
 
-void* Malloc(size_t size) { return ::malloc(size); }
+void* Malloc(size_t size) {
+#ifdef TENSORFLOW_USE_JEMALLOC
+  return jemalloc_malloc(size);
+#else
+  return malloc(size);
+#endif
+}
 
-void* Realloc(void* ptr, size_t size) { return ::realloc(ptr, size); }
+void* Realloc(void* ptr, size_t size) {
+#ifdef TENSORFLOW_USE_JEMALLOC
+  return jemalloc_realloc(ptr, size);
+#else
+  return realloc(ptr, size);
+#endif
+}
 
-void Free(void* ptr) { ::free(ptr); }
+void Free(void* ptr) {
+#ifdef TENSORFLOW_USE_JEMALLOC
+  return jemalloc_free(ptr);
+#else
+  return free(ptr);
+#endif
+}
 
 void MallocExtension_ReleaseToSystem(std::size_t num_bytes) {
   // No-op.
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index abd5a16ed5..ebbe195bbc 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -16,6 +16,10 @@ limitations under the License.
 #ifndef TENSORFLOW_CORE_UTIL_MKL_UTIL_H_
 #define TENSORFLOW_CORE_UTIL_MKL_UTIL_H_
 #ifdef INTEL_MKL
+
+#include <string>
+#include <vector>
+
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
 #include "third_party/mkl/include/mkl_service.h"
@@ -40,6 +44,8 @@ namespace tensorflow {
 // MKL operation, and did not go through a conversion to a standard
 // Tensorflow tensor.
 
+typedef enum { W = 0, H = 1, C = 2, N = 3 } MklDims;
+
 class MklShape {
  public:
   MklShape() {}
@@ -50,12 +56,15 @@ class MklShape {
     if (strides_) delete[] strides_;
     if (mklLayout_) CHECK_EQ(dnnLayoutDelete_F32(mklLayout_), E_SUCCESS);
     if (tfLayout_) CHECK_EQ(dnnLayoutDelete_F32(tfLayout_), E_SUCCESS);
+    if (tf_to_mkl_dim_map_) delete[] tf_to_mkl_dim_map_;
   }
 
   const bool IsMklTensor() const { return isMklTensor_; }
 
   void SetMklTensor(const bool isMklTensor) { isMklTensor_ = isMklTensor; }
 
+  void SetDimensions(const size_t dimension) { dimension_ = dimension; }
+
   void SetMklLayout(const void* primitive, size_t resourceType) {
     CHECK_EQ(
         dnnLayoutCreateFromPrimitive_F32(&mklLayout_, (dnnPrimitive_t)primitive,
@@ -66,7 +75,8 @@ class MklShape {
   void SetTfLayout(const size_t dimension, const size_t* sizes,
                    const size_t* strides) {
     dimension_ = dimension;
-    if (dimension > 0) {  // MKl doesn't support dimension 0
+
+    if (dimension > 0) {  // MKl doesn't support zero dimension tensors
       sizes_ = new size_t[dimension];
       strides_ = new size_t[dimension];
 
@@ -79,6 +89,45 @@ class MklShape {
     }
   }
 
+  // Default case - MKL dim ordering is opposite of TF dim ordering
+  // MKL -> (DIMS-1)...0 where (DIMS-1) is outermost dim and 0 is innermost dim
+  // TF  -> 0...(DIMS-1) where 0 is outermost dim and (DIMS-1) is innermost dim
+  // For layers that rely on data_format semantics (conv, pooling etc.)
+  // or operate only on certain dimensions (relu, concat, split etc.),
+  // Mkl APIs might require us to reorder these dimensions. In such cases,
+  // kernels should explicitly set this map
+  void SetTfDimOrder(const size_t dimension) {
+    CHECK(dimension == dimension_);
+    if (tf_to_mkl_dim_map_ == nullptr) {
+      tf_to_mkl_dim_map_ = new size_t[dimension];
+    }
+    for (size_t ii = 0; ii < dimension; ii++) {
+      tf_to_mkl_dim_map_[ii] = dimension - (ii + 1);
+    }
+  }
+
+  void SetTfDimOrder(const size_t dimension, const size_t* tf_to_mkl_dim_map) {
+    CHECK(dimension == dimension_);
+    if (tf_to_mkl_dim_map_ == nullptr) {
+      tf_to_mkl_dim_map_ = new size_t[dimension];
+    }
+    for (size_t ii = 0; ii < dimension; ii++) {
+      tf_to_mkl_dim_map_[ii] = tf_to_mkl_dim_map[ii];
+    }
+  }
+
+  void SetTfDimOrder(const size_t dimension, TensorFormat data_format) {
+    CHECK_EQ(dimension, 4);
+    CHECK(dimension == dimension_);
+    if (tf_to_mkl_dim_map_ == nullptr) {
+      tf_to_mkl_dim_map_ = new size_t[dimension];
+    }
+    tf_to_mkl_dim_map_[GetTensorDimIndex<2>(data_format, 'W')] = MklDims::W;
+    tf_to_mkl_dim_map_[GetTensorDimIndex<2>(data_format, 'H')] = MklDims::H;
+    tf_to_mkl_dim_map_[GetTensorDimIndex<2>(data_format, 'C')] = MklDims::C;
+    tf_to_mkl_dim_map_[GetTensorDimIndex<2>(data_format, 'N')] = MklDims::N;
+  }
+
   const dnnLayout_t GetMklLayout() const { return mklLayout_; }
   const dnnLayout_t GetTfLayout() const { return tfLayout_; }
   const dnnLayout_t GetCurLayout() const {
@@ -86,7 +135,10 @@ class MklShape {
   }
   size_t GetDimension() const { return dimension_; }
   const size_t* GetSizes() const { return sizes_; }
+  int64 dim_size(int index) const { return sizes_[index]; }
   const size_t* GetStrides() const { return strides_; }
+  const size_t* GetTfToMklDimMap() const { return tf_to_mkl_dim_map_; }
+  size_t tf_dim_idx(int index) const { return tf_to_mkl_dim_map_[index]; }
 
   void GetConvertedFlatData(dnnLayout_t targetLayout, void* input,
                             void* output) const {
@@ -107,21 +159,23 @@ class MklShape {
 // The data is serialized in this order
 // isMklTensor_
 // dimension_
-// sizes
-// strides
+// sizes_
+// strides_
 // mklLayout_
 // tfLayout_
+// tf_to_mkl_dim_map_
 
 #define SIZE_OF_MKL_DNN_BUF \
   (dnnLayoutSerializationBufferSize_F32())  // Size of buffer needed to
                                             // serialize dnn_layout pointer
 
 // Size of buffer to hold the serialized object, the size is computed as follows
-// sizeof(isMklTensor_) + sizeof(dimension_) + sizeof(sizes) + sizeof(strides)
+// sizeof(isMklTensor_) + sizeof(dimension_) + sizeof(sizes_) + sizeof(strides_)
 // + sizeof(mklLayout_ buffer) + sizeof(tfLayout_ buffer)
+// + sizeof(tf_to_mkl_dim_map_)
 
 #define SIZE_OF_MKL_SERIAL_DATA(dims) \
-  (2 * sizeof(size_t) + 2 * dims * sizeof(size_t) + 2 * SIZE_OF_MKL_DNN_BUF)
+  (2 * sizeof(size_t) + 3 * dims * sizeof(size_t) + 2 * SIZE_OF_MKL_DNN_BUF)
 
 // First we need to define some macro for offsets into the serial buffer where
 // different elements of Mklshape is written/read from
@@ -140,6 +194,9 @@ class MklShape {
   (STRIDES_OFFSET(dims) + dims * sizeof(size_t))  // Location of mklLayout_
 #define TF_LAYOUT_OFFSET(dims) \
   (MKL_LAYOUT_OFFSET(dims) + SIZE_OF_MKL_DNN_BUF)  // Location of tfLayout_
+// Location of tf_to_mkl_dim_map_
+#define TF_TO_MKL_DIM_MAP_OFFSET(dims) \
+  (TF_LAYOUT_OFFSET(dims) + SIZE_OF_MKL_DNN_BUF)
 
   // TODO(agramesh1) make sure to create a const to share with rewrite pass
   // for min size of MKL metadata tensor.
@@ -156,11 +213,14 @@ class MklShape {
           << "Bufsize too small in DeSerialize";
       sizes_ = new size_t[dimension_];
       strides_ = new size_t[dimension_];
+      tf_to_mkl_dim_map_ = new size_t[dimension_];
       for (int i = 0; i < dimension_; i++) {
         sizes_[i] =
             reinterpret_cast<const size_t*>(buf + SIZES_OFFSET(dimension_))[i];
         strides_[i] = reinterpret_cast<const size_t*>(
             buf + STRIDES_OFFSET(dimension_))[i];
+        tf_to_mkl_dim_map_[i] = reinterpret_cast<const size_t*>(
+            buf + TF_TO_MKL_DIM_MAP_OFFSET(dimension_))[i];
       }
       CHECK_EQ(dnnLayoutDeserialize_F32(&mklLayout_,
                                         buf + MKL_LAYOUT_OFFSET(dimension_)),
@@ -183,6 +243,9 @@ class MklShape {
             sizes_[i];
         reinterpret_cast<size_t*>(buf + STRIDES_OFFSET(dimension_))[i] =
             strides_[i];
+        reinterpret_cast<size_t*>(buf +
+                                  TF_TO_MKL_DIM_MAP_OFFSET(dimension_))[i] =
+            tf_to_mkl_dim_map_[i];
       }
       CHECK_EQ(dnnLayoutSerialize_F32(mklLayout_,
                                       buf + MKL_LAYOUT_OFFSET(dimension_)),
@@ -202,6 +265,8 @@ class MklShape {
   size_t dimension_ = 0;
   size_t* sizes_ = nullptr;    // Required by MKL for conversions
   size_t* strides_ = nullptr;  // Required by MKL for conversions
+  // TF dimension corresponding to this MKL dimension
+  size_t* tf_to_mkl_dim_map_ = nullptr;
 };
 
 int inline GetTensorDataIndex(int n) {
@@ -275,18 +340,78 @@ inline void GetStridesFromSizes(TensorFormat data_format, size_t* strides,
   }
 }
 
+inline void MklSizesToTFSizes(OpKernelContext* context,
+                              TensorFormat data_format_,
+                              const MklShape& mklshape, TensorShape* tfshape) {
+  size_t tf_dim = mklshape.GetDimension();
+  const size_t* tf_sizes = mklshape.GetSizes();
+
+  // TODO(agramesh1): check if this constraint is applicable in other cases
+  // (besides BackpropInput, BackpropFilter).
+  OP_REQUIRES(context, tf_dim == 4,
+              errors::InvalidArgument("MKLSizesToTFSizes: size must be 4-dim"));
+  std::vector<int32> sizes;
+
+  sizes.push_back(tf_sizes[3]);
+
+  if (data_format_ == FORMAT_NHWC) {
+    sizes.push_back(tf_sizes[1]);
+    sizes.push_back(tf_sizes[0]);
+    sizes.push_back(tf_sizes[2]);
+  } else {
+    sizes.push_back(tf_sizes[2]);
+    sizes.push_back(tf_sizes[1]);
+    sizes.push_back(tf_sizes[0]);
+  }
+
+  OP_REQUIRES_OK(context, TensorShapeUtils::MakeShape(sizes, tfshape));
+}
+
+inline int32 GetMklTensorDimIndex(char dimension) {
+  switch (dimension) {
+    case 'N':
+      return MklDims::N;
+    case 'C':
+      return MklDims::C;
+    case 'H':
+      return MklDims::H;
+    case 'W':
+      return MklDims::W;
+    default:
+      LOG(FATAL) << "Invalid dimension: " << dimension;
+      return -1;  // Avoid compiler warning about missing return value
+  }
+}
+
+inline int64 GetMklTensorDim(const MklShape& mklshape, char dimension) {
+  int index = GetMklTensorDimIndex(dimension);
+  CHECK(index >= 0 && index < mklshape.GetDimension())
+      << "Invalid index from the dimension: " << index << ", " << dimension;
+  return mklshape.dim_size(index);
+}
+
 namespace mkl_layer_registry {
 
 static const char* kMklLayerLabel = "MklLayer";
-static const string kMklLayerLabelPattern = "label='MklLayer'";
+static const char* kMklLayerLabelPattern = "label='MklLayer'";
 
-// Check whether opname is registered as MKL-compliant in the registry.
+// Check whether opname with type T is registered as MKL-compliant.
 //
 // @input: name of the op
+// @input: T datatype to be used for checking op
 // @return: true if opname is registered as Mkl layer op
-static inline bool IsMklLayer(const std::string& op_name) {
+static inline bool IsMklLayer(const std::string& op_name, DataType T) {
   string kernel = KernelsRegisteredForOp(op_name);
-  return kernel.find(kMklLayerLabelPattern) != string::npos;
+  // Currently, MKL only supports float type for ops. So we check if
+  // the type is float. Actually, we should query kernel registration and
+  // find out if op is supported for type T. But there is no API to query
+  // kernel registration using name and type.
+  bool result =
+      (kernel.find(kMklLayerLabelPattern) != string::npos) && (T == DT_FLOAT);
+  if (result == true) {
+    VLOG(1) << "mkl_layer_registry::" << op_name << " is " << kMklLayerLabel;
+  }
+  return result;
 }
 
 }  // namespace mkl_layer_registry
diff --git a/tensorflow/docs_src/about/roadmap.md b/tensorflow/docs_src/about/roadmap.md
index 76c734830a..1789e050fa 100644
--- a/tensorflow/docs_src/about/roadmap.md
+++ b/tensorflow/docs_src/about/roadmap.md
@@ -12,9 +12,8 @@ we do not have timelines for these features.
 
 ### Improve non-Python language support
 
-* Improve C++ API for graph construction and gradients
-* Java language support
-* Go language support
+* Support for adding gradient computation for graphs constructed in other
+  languages (C++, Java, Go etc.)
 
 ### Making TensorFlow easier to use
 * High-level APIs
diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index 4fc4c2faa2..45f7530506 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -229,7 +229,7 @@ do the following to run it from Python :
 
 ```python
 import tensorflow as tf
-zero_out_module = tf.load_op_library('zero_out.so')
+zero_out_module = tf.load_op_library('./zero_out.so')
 with tf.Session(''):
   zero_out_module.zero_out([[1, 2], [3, 4]]).eval()
 
@@ -243,14 +243,13 @@ named `ZeroOut` in the C++ files, the python function will be called `zero_out`.
 
 To make the op available as a regular function `import`-able from a Python
 module, it maybe useful to have the `load_op_library` call in a Python source
-file as follows (see [zero_out_op_1.py](https://www.tensorflow.org/code/tensorflow/examples/adding_an_op/zero_out_op_1.py))
-:
+file as follows:
 
 ```python
 import tensorflow as tf
 
-_zero_out_module = tf.load_op_library('zero_out_op_kernel_1.so')
-zero_out = _zero_out_module.zero_out
+zero_out_module = tf.load_op_library('./zero_out.so')
+zero_out = zero_out_module.zero_out
 ```
 
 ## Verify that the op works
@@ -264,7 +263,7 @@ import tensorflow as tf
 
 class ZeroOutTest(tf.test.TestCase):
   def testZeroOut(self):
-    zero_out_module = tf.load_op_library('zero_out.so')
+    zero_out_module = tf.load_op_library('./zero_out.so')
     with self.test_session():
       result = zero_out_module.zero_out([5, 4, 3, 2, 1])
       self.assertAllEqual(result.eval(), [5, 0, 0, 0, 0])
diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index b71249de0a..04ac3f5848 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -71,7 +71,7 @@ is a constant. Like all TensorFlow constants, it takes no inputs, and it outputs
 a value it stores internally. We can create two floating point Tensors `node1`
 and `node2` as follows:
 ```python
-node1 = tf.constant(3.0, tf.float32)
+node1 = tf.constant(3.0, dtype=tf.float32)
 node2 = tf.constant(4.0) # also tf.float32 implicitly
 print(node1, node2)
 ```
@@ -110,7 +110,7 @@ print("sess.run(node3): ",sess.run(node3))
 ```
 The last two print statements produce
 ```
-node3:  Tensor("Add_2:0", shape=(), dtype=float32)
+node3:  Tensor("Add:0", shape=(), dtype=float32)
 sess.run(node3):  7.0
 ```
 
@@ -173,8 +173,8 @@ initial value:
 
 
 ```python
-W = tf.Variable([.3], tf.float32)
-b = tf.Variable([-.3], tf.float32)
+W = tf.Variable([.3], dtype=tf.float32)
+b = tf.Variable([-.3], dtype=tf.float32)
 x = tf.placeholder(tf.float32)
 linear_model = W * x + b
 ```
@@ -294,8 +294,8 @@ import numpy as np
 import tensorflow as tf
 
 # Model parameters
-W = tf.Variable([.3], tf.float32)
-b = tf.Variable([-.3], tf.float32)
+W = tf.Variable([.3], dtype=tf.float32)
+b = tf.Variable([-.3], dtype=tf.float32)
 # Model input and output
 x = tf.placeholder(tf.float32)
 linear_model = W * x + b
diff --git a/tensorflow/docs_src/tutorials/wide.md b/tensorflow/docs_src/tutorials/wide.md
index 471811ea1a..1b72ba0746 100644
--- a/tensorflow/docs_src/tutorials/wide.md
+++ b/tensorflow/docs_src/tutorials/wide.md
@@ -27,7 +27,7 @@ https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/learn/w
        # Mac OS X
        $ sudo easy_install pip
        $ sudo easy_install --upgrade six
-      ```
+       ```
 
     2. Use `pip` to install pandas:
 
diff --git a/tensorflow/examples/android/README.md b/tensorflow/examples/android/README.md
index 81a2a66617..0414566b98 100644
--- a/tensorflow/examples/android/README.md
+++ b/tensorflow/examples/android/README.md
@@ -32,9 +32,7 @@ on API >= 14 devices.
         (https://arxiv.org/abs/1610.07629) to restyle the camera preview image
         to that of a number of different artists.
 
-<img src="sample_images/classify1.jpg" width="30%">
-<img src="sample_images/stylize1.jpg" width="30%">
-<img src="sample_images/detect1.jpg" width="30%">
+<img src="sample_images/classify1.jpg" width="30%"><img src="sample_images/stylize1.jpg" width="30%"><img src="sample_images/detect1.jpg" width="30%">
 
 ## Prebuilt APK:
 
@@ -83,7 +81,7 @@ instead.
 Bazel is the primary build system for TensorFlow. To build with Bazel,
 it and the Android NDK and SDK must be installed on your system.
 
-1. Get the recommended Bazel version listed in [os_setup.html](https://www.tensorflow.org/versions/master/get_started/os_setup.html#source)
+1. Install the latest version of Bazel as per the instructions [on the Bazel website](https://bazel.build/versions/master/docs/install.html).
 2. The Android NDK is required to build the native (C/C++) TensorFlow code.
         The current recommended version is 12b, which may be found
         [here](https://developer.android.com/ndk/downloads/older_releases.html#ndk-12b-downloads).
@@ -96,7 +94,7 @@ it and the Android NDK and SDK must be installed on your system.
 
 ##### Edit WORKSPACE
 
-The Android entries in [`<workspace_root>/WORKSPACE`](../../../WORKSPACE#L2-L13)
+The Android entries in [`<workspace_root>/WORKSPACE`](../../../WORKSPACE#L19-L32)
 must be uncommented with the paths filled in appropriately depending on where
 you installed the NDK and SDK. Otherwise an error such as:
 "The external label '//external:android/sdk' is not bound to anything" will
diff --git a/tensorflow/examples/android/build.gradle b/tensorflow/examples/android/build.gradle
index ed05a083a9..4f241027f4 100644
--- a/tensorflow/examples/android/build.gradle
+++ b/tensorflow/examples/android/build.gradle
@@ -67,7 +67,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     lintOptions {
         abortOnError false
diff --git a/tensorflow/examples/tutorials/deepdream/deepdream.ipynb b/tensorflow/examples/tutorials/deepdream/deepdream.ipynb
index 016b21cd12..4ff8e368c4 100644
--- a/tensorflow/examples/tutorials/deepdream/deepdream.ipynb
+++ b/tensorflow/examples/tutorials/deepdream/deepdream.ipynb
@@ -278,7 +278,7 @@
     "            tensor = n.attr['value'].tensor\n",
     "            size = len(tensor.tensor_content)\n",
     "            if size > max_const_size:\n",
-    "                tensor.tensor_content = bytes(\"<stripped %d bytes>\"%size)\n",
+    "                tensor.tensor_content = tf.compat.as_bytes(\"<stripped %d bytes>\"%size)\n",
     "    return strip_def\n",
     "  \n",
     "def rename_nodes(graph_def, rename_func):\n",
diff --git a/tensorflow/examples/tutorials/monitors/iris_monitors.py b/tensorflow/examples/tutorials/monitors/iris_monitors.py
index a4bf353856..850d105f7b 100644
--- a/tensorflow/examples/tutorials/monitors/iris_monitors.py
+++ b/tensorflow/examples/tutorials/monitors/iris_monitors.py
@@ -21,7 +21,6 @@ import os
 
 import numpy as np
 import tensorflow as tf
-from tensorflow.contrib.learn.python.learn.metric_spec import MetricSpec
 
 tf.logging.set_verbosity(tf.logging.INFO)
 
@@ -41,18 +40,15 @@ def main(unused_argv):
       "accuracy":
           tf.contrib.learn.MetricSpec(
               metric_fn=tf.contrib.metrics.streaming_accuracy,
-              prediction_key=
-              tf.contrib.learn.prediction_key.PredictionKey.CLASSES),
+              prediction_key="classes"),
       "precision":
           tf.contrib.learn.MetricSpec(
               metric_fn=tf.contrib.metrics.streaming_precision,
-              prediction_key=
-              tf.contrib.learn.prediction_key.PredictionKey.CLASSES),
+              prediction_key="classes"),
       "recall":
           tf.contrib.learn.MetricSpec(
               metric_fn=tf.contrib.metrics.streaming_recall,
-              prediction_key=
-              tf.contrib.learn.prediction_key.PredictionKey.CLASSES)
+              prediction_key="classes")
   }
   validation_monitor = tf.contrib.learn.monitors.ValidationMonitor(
       test_set.data,
@@ -66,26 +62,6 @@ def main(unused_argv):
   # Specify that all features have real-value data
   feature_columns = [tf.contrib.layers.real_valued_column("", dimension=4)]
 
-  validation_metrics = {
-      "accuracy": MetricSpec(
-                          metric_fn=tf.contrib.metrics.streaming_accuracy,
-                          prediction_key="classes"),
-      "recall": MetricSpec(
-                          metric_fn=tf.contrib.metrics.streaming_recall,
-                          prediction_key="classes"),
-      "precision": MetricSpec(
-                          metric_fn=tf.contrib.metrics.streaming_precision,
-                          prediction_key="classes")
-                        }
-  validation_monitor = tf.contrib.learn.monitors.ValidationMonitor(
-      test_set.data,
-      test_set.target,
-      every_n_steps=50,
-      metrics=validation_metrics,
-      early_stopping_metric="loss",
-      early_stopping_metric_minimize=True,
-      early_stopping_rounds=200)
-
   # Build 3 layer DNN with 10, 20, 10 units respectively.
   classifier = tf.contrib.learn.DNNClassifier(
       feature_columns=feature_columns,
diff --git a/tensorflow/go/doc.go b/tensorflow/go/doc.go
index 79fbf9797e..a59652b160 100644
--- a/tensorflow/go/doc.go
+++ b/tensorflow/go/doc.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 // Package tensorflow is a Go binding to TensorFlow.
 //
diff --git a/tensorflow/go/example_inception_inference_test.go b/tensorflow/go/example_inception_inference_test.go
index 42d169ed9a..682bd245cc 100644
--- a/tensorflow/go/example_inception_inference_test.go
+++ b/tensorflow/go/example_inception_inference_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow_test
 
@@ -26,8 +28,8 @@ import (
 	"os"
 	"path/filepath"
 
-	tf "github.com/tensorflow/tensorflow/tensorflow/go"
 	"github.com/tensorflow/tensorflow/tensorflow/go/op"
+	tf "github.com/tensorflow/tensorflow/tensorflow/go"
 )
 
 func Example() {
diff --git a/tensorflow/go/genop/internal/genop.go b/tensorflow/go/genop/internal/genop.go
index d17c1ca41d..dec08dee1c 100644
--- a/tensorflow/go/genop/internal/genop.go
+++ b/tensorflow/go/genop/internal/genop.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 // Package internal generates Go source code with functions for TensorFlow operations.
 //
@@ -156,12 +158,12 @@ func makeOutputList(op *tf.Operation, start int, output string) ([]tf.Output, in
 `))
 
 	tmplOp = template.Must(template.New("op").Funcs(template.FuncMap{
-		"MakeComment": makeComment,
-		"GoType":      goType,
-		"CamelCase":   camelCase,
-		"Identifier":  identifier,
-		"IsListArg":   isListArg,
-		"IsListAttr":  isListAttr,
+		"MakeComment":       makeComment,
+		"GoType":            goType,
+		"CamelCase":         camelCase,
+		"Identifier":        identifier,
+		"IsListArg":         isListArg,
+		"IsListAttr":        isListAttr,
 		"StripLeadingColon": stripLeadingColon,
 	}).Parse(`
 {{if .OptionalAttrs -}}
diff --git a/tensorflow/go/genop/internal/genop_test.go b/tensorflow/go/genop/internal/genop_test.go
index 00ac4827e4..c984c0063a 100644
--- a/tensorflow/go/genop/internal/genop_test.go
+++ b/tensorflow/go/genop/internal/genop_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package internal
 
diff --git a/tensorflow/go/genop/internal/lib.go b/tensorflow/go/genop/internal/lib.go
index ed902f8b4d..71e8c1c93f 100644
--- a/tensorflow/go/genop/internal/lib.go
+++ b/tensorflow/go/genop/internal/lib.go
@@ -1,17 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package internal
 
 // #cgo LDFLAGS: -ltensorflow
diff --git a/tensorflow/go/genop/main.go b/tensorflow/go/genop/main.go
index 46163ef0ad..b6f8e2d5a8 100644
--- a/tensorflow/go/genop/main.go
+++ b/tensorflow/go/genop/main.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 //go:generate sh generate.sh
 
diff --git a/tensorflow/go/graph.go b/tensorflow/go/graph.go
index c64ba84432..e65619e80b 100644
--- a/tensorflow/go/graph.go
+++ b/tensorflow/go/graph.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/graph_test.go b/tensorflow/go/graph_test.go
index 43f80ff4eb..c3120bc720 100644
--- a/tensorflow/go/graph_test.go
+++ b/tensorflow/go/graph_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/lib.go b/tensorflow/go/lib.go
index 7f96c7809a..551cfa0b01 100644
--- a/tensorflow/go/lib.go
+++ b/tensorflow/go/lib.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/op/generate.go b/tensorflow/go/op/generate.go
index ed35964969..17ece1c7a2 100644
--- a/tensorflow/go/op/generate.go
+++ b/tensorflow/go/op/generate.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 //go:generate go generate ../genop
 //go:generate go run ../genop/main.go -outfile wrappers.go
diff --git a/tensorflow/go/op/op.go b/tensorflow/go/op/op.go
index 29c5998724..1c20bd441a 100644
--- a/tensorflow/go/op/op.go
+++ b/tensorflow/go/op/op.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 // Package op defines functions for adding TensorFlow operations to a Graph.
 //
diff --git a/tensorflow/go/op/op_test.go b/tensorflow/go/op/op_test.go
index eaa27bfcd0..65877dca96 100644
--- a/tensorflow/go/op/op_test.go
+++ b/tensorflow/go/op/op_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 // Tests for the generated code of some operations.
 
diff --git a/tensorflow/go/op/scope.go b/tensorflow/go/op/scope.go
index c9fc432cd2..d87833f451 100644
--- a/tensorflow/go/op/scope.go
+++ b/tensorflow/go/op/scope.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package op
 
diff --git a/tensorflow/go/op/scope_test.go b/tensorflow/go/op/scope_test.go
index 0c3825c178..b74fd24b26 100644
--- a/tensorflow/go/op/scope_test.go
+++ b/tensorflow/go/op/scope_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package op
 
diff --git a/tensorflow/go/operation.go b/tensorflow/go/operation.go
index 9c035e5e18..e8f67c4f73 100644
--- a/tensorflow/go/operation.go
+++ b/tensorflow/go/operation.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/operation_test.go b/tensorflow/go/operation_test.go
index a5e36f6683..7cba043af2 100644
--- a/tensorflow/go/operation_test.go
+++ b/tensorflow/go/operation_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/saved_model.go b/tensorflow/go/saved_model.go
index 32e40d9a95..7aeaaec942 100644
--- a/tensorflow/go/saved_model.go
+++ b/tensorflow/go/saved_model.go
@@ -1,16 +1,18 @@
-// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/saved_model_test.go b/tensorflow/go/saved_model_test.go
index bc4d8e1b90..5f6f70c3ef 100644
--- a/tensorflow/go/saved_model_test.go
+++ b/tensorflow/go/saved_model_test.go
@@ -1,16 +1,18 @@
-// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/session.cpp b/tensorflow/go/session.cpp
index 9f6fd1f341..efa225505b 100644
--- a/tensorflow/go/session.cpp
+++ b/tensorflow/go/session.cpp
@@ -1,16 +1,18 @@
-// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 // TODO(ashankar): Remove this file when TensorFlow 1.1 is released.
 // See lib.go for details.
diff --git a/tensorflow/go/session.go b/tensorflow/go/session.go
index 5a6e1e37ad..3add412dcd 100644
--- a/tensorflow/go/session.go
+++ b/tensorflow/go/session.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/session_test.go b/tensorflow/go/session_test.go
index 4c1b862e1f..73d78a8e57 100644
--- a/tensorflow/go/session_test.go
+++ b/tensorflow/go/session_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/shape.go b/tensorflow/go/shape.go
index c48bbf29a3..114ab5decb 100644
--- a/tensorflow/go/shape.go
+++ b/tensorflow/go/shape.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/shape_test.go b/tensorflow/go/shape_test.go
index f8f3d4e94b..94ffd27162 100644
--- a/tensorflow/go/shape_test.go
+++ b/tensorflow/go/shape_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/status.go b/tensorflow/go/status.go
index a1f7ed5481..b4df83665a 100644
--- a/tensorflow/go/status.go
+++ b/tensorflow/go/status.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/tensor.go b/tensorflow/go/tensor.go
index f96e796e5e..34e797a2b3 100644
--- a/tensorflow/go/tensor.go
+++ b/tensorflow/go/tensor.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/tensor_test.go b/tensorflow/go/tensor_test.go
index 9a87923830..2fc7553f87 100644
--- a/tensorflow/go/tensor_test.go
+++ b/tensorflow/go/tensor_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/util_test.go b/tensorflow/go/util_test.go
index 492c3b1e8b..2bec954246 100644
--- a/tensorflow/go/util_test.go
+++ b/tensorflow/go/util_test.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/go/version.go b/tensorflow/go/version.go
index c777c44bea..7de909d036 100644
--- a/tensorflow/go/version.go
+++ b/tensorflow/go/version.go
@@ -1,16 +1,18 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package tensorflow
 
diff --git a/tensorflow/java/maven/README.md b/tensorflow/java/maven/README.md
index 2eb29a200b..19a214f42d 100644
--- a/tensorflow/java/maven/README.md
+++ b/tensorflow/java/maven/README.md
@@ -68,28 +68,28 @@ conducted in a [Docker](https://www.docker.com) container.
     SONATYPE_PASSWORD="your_sonatype.org_password_here"
     GPG_PASSPHRASE="your_gpg_passphrase_here"
     cat >/tmp/settings.xml <<EOF
-<settings>
-  <servers>
-    <server>
-      <id>ossrh</id>
-      <username>${SONATYPE_USERNAME}</username>
-      <password>${SONATYPE_PASSWORD}</password>
-    </server>
-  </servers>
-  <profiles>
-    <profile>
-      <id>ossrh</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <gpg.executable>gpg2</gpg.executable>
-        <gpg.passphrase>${GPG_PASSPHRASE}</gpg.passphrase>
-      </properties>
-    </profile>
-  </profiles>
-</settings>
-EOF
+    <settings>
+      <servers>
+        <server>
+          <id>ossrh</id>
+          <username>${SONATYPE_USERNAME}</username>
+          <password>${SONATYPE_PASSWORD}</password>
+        </server>
+      </servers>
+      <profiles>
+        <profile>
+          <id>ossrh</id>
+          <activation>
+            <activeByDefault>true</activeByDefault>
+          </activation>
+          <properties>
+            <gpg.executable>gpg2</gpg.executable>
+            <gpg.passphrase>${GPG_PASSPHRASE}</gpg.passphrase>
+          </properties>
+        </profile>
+      </profiles>
+    </settings>
+    EOF
     ```
 
 2.  Run the `release.sh` script.
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 9891ae4eaf..36918af552 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -266,7 +266,11 @@ class Estimator(object):
         checkpoint_path=checkpoint_path,
         name=name)
 
-  def predict(self, input_fn, predict_keys=None, hooks=None):
+  def predict(self,
+              input_fn,
+              predict_keys=None,
+              hooks=None,
+              checkpoint_path=None):
     """Returns predictions for given features.
 
     Args:
@@ -281,6 +285,8 @@ class Estimator(object):
         `None`, returns all.
       hooks: List of `SessionRunHook` subclass instances. Used for callbacks
         inside the prediction call.
+      checkpoint_path: Path of a specific checkpoint to predict. If `None`, the
+        latest checkpoint in `model_dir` is used.
 
     Yields:
       Evaluated values of `predictions` tensors.
@@ -294,7 +300,8 @@ class Estimator(object):
     """
     hooks = _check_hooks_type(hooks)
     # Check that model has been trained.
-    checkpoint_path = saver.latest_checkpoint(self._model_dir)
+    if not checkpoint_path:
+      checkpoint_path = saver.latest_checkpoint(self._model_dir)
     if not checkpoint_path:
       raise ValueError('Could not find trained model in model_dir: {}.'.format(
           self._model_dir))
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 398ff20b6b..a1659156a6 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -618,12 +618,20 @@ class EstimatorEvaluateTest(test.TestCase):
 
 class EstimatorPredictTest(test.TestCase):
 
-  def test_no_trained_model(self):
+  def test_no_trained_model_in_model_dir(self):
     est = estimator.Estimator(model_fn=model_fn_global_step_incrementer)
     with self.assertRaisesRegexp(ValueError,
                                  'Could not find trained model in model_dir'):
       next(est.predict(dummy_input_fn))
 
+  def test_no_trained_model_invalid_checkpoint_path(self):
+    est = estimator.Estimator(model_fn=model_fn_global_step_incrementer)
+    with self.assertRaises(ValueError):
+      next(
+          est.predict(
+              dummy_input_fn,
+              checkpoint_path=saver.latest_checkpoint('fakedir')))
+
   def test_tensor_predictions(self):
 
     def _model_fn(features, labels, mode):
@@ -828,6 +836,28 @@ class EstimatorPredictTest(test.TestCase):
     est2 = estimator.Estimator(model_fn=_model_fn, model_dir=est1.model_dir)
     self.assertEqual([32.], next(est2.predict(dummy_input_fn)))
 
+  def test_predict_from_checkpoint_path(self):
+
+    def _model_fn(features, labels, mode):
+      _, _ = features, labels
+      v = variables.Variable([[16.]], name='weight')
+      prediction = v * 2
+      return model_fn_lib.EstimatorSpec(
+          mode,
+          loss=constant_op.constant(0.),
+          train_op=constant_op.constant(0.),
+          predictions=prediction)
+
+    est1 = estimator.Estimator(model_fn=_model_fn)
+    est1.train(dummy_input_fn, steps=1)
+    est2 = estimator.Estimator(model_fn=_model_fn, model_dir=est1.model_dir)
+    self.assertEqual(
+        [32.],
+        next(
+            est2.predict(
+                dummy_input_fn,
+                checkpoint_path=saver.latest_checkpoint(est1.model_dir))))
+
   def test_scaffold_is_used(self):
 
     def _model_fn_scaffold(features, labels, mode):
diff --git a/tensorflow/python/estimator/inputs/queues/feeding_functions.py b/tensorflow/python/estimator/inputs/queues/feeding_functions.py
index 9da2bce0f8..a6f5157680 100644
--- a/tensorflow/python/estimator/inputs/queues/feeding_functions.py
+++ b/tensorflow/python/estimator/inputs/queues/feeding_functions.py
@@ -20,7 +20,9 @@ from __future__ import print_function
 
 import collections
 import random
+import types as tp
 import numpy as np
+import six
 
 from tensorflow.python.estimator.inputs.queues import feeding_queue_runner as fqr
 from tensorflow.python.framework import dtypes
@@ -218,6 +220,54 @@ class _PandasFeedFn(object):
     return feed_dict
 
 
+class _GeneratorFeedFn(object):
+  """Creates feed dictionaries from `Generator` of `dicts` of numpy arrays."""
+
+  def __init__(self,
+               placeholders,
+               generator,
+               batch_size,
+               random_start=False,
+               seed=None,
+               num_epochs=None):
+    first_sample = next(generator())
+    if len(placeholders) != len(first_sample):
+      raise ValueError("Expected {} placeholders; got {}.".format(
+          len(first_sample), len(placeholders)))
+    self._keys = sorted(list(first_sample.keys()))
+    self._col_placeholders = placeholders
+    self._generator_function = generator
+    self._iterator = generator()
+    self._batch_size = batch_size
+    self._num_epochs = num_epochs
+    self._epoch = 0
+    random.seed(seed)
+
+  def __call__(self):
+    if self._num_epochs and self._epoch >= self._num_epochs:
+      raise errors.OutOfRangeError(None, None,
+                                   "Already emitted %s epochs." % self._epoch)
+    list_dict = {}
+    list_dict_size = 0
+    while list_dict_size < self._batch_size:
+      try:
+        data_row = next(self._iterator)
+      except StopIteration:
+        self._epoch += 1
+        self._iterator = self._generator_function()
+        data_row = next(self._iterator)
+      for index, key in enumerate(self._keys):
+        if key not in data_row.keys():
+          raise KeyError("key mismatch between dicts emitted by GenFun"
+                         "Expected {} keys; got {}".format(
+                             self._keys, data_row.keys()))
+        list_dict.setdefault(self._col_placeholders[index],
+                             list()).append(data_row[key])
+        list_dict_size += 1
+    feed_dict = {key: np.asarray(item) for key, item in list(list_dict.items())}
+    return feed_dict
+
+
 def _enqueue_data(data,
                   capacity,
                   shuffle=False,
@@ -235,8 +285,9 @@ def _enqueue_data(data,
     numpy arrays, the first enqueued `Tensor` contains the row number.
 
   Args:
-    data: a numpy `ndarray`, `OrderedDict` of numpy arrays, or pandas
-      `DataFrame` that will be read into the queue.
+    data: a numpy `ndarray`, `OrderedDict` of numpy arrays, or a generator
+       yielding `dict`s of numpy arrays  or pandas `DataFrame` that will be read
+       into the queue.
     capacity: the capacity of the queue.
     shuffle: whether or not to shuffle the rows of the array.
     min_after_dequeue: minimum number of elements that can remain in the queue
@@ -254,7 +305,7 @@ def _enqueue_data(data,
 
   Raises:
     TypeError: `data` is not a Pandas `DataFrame`, an `OrderedDict` of numpy
-      arrays  or a numpy `ndarray`.
+      arrays, a numpy `ndarray`, or a generator producing these.
   """
   with ops.name_scope(name):
     if isinstance(data, np.ndarray):
@@ -267,6 +318,13 @@ def _enqueue_data(data,
       ]
       queue_shapes = [()] + [col.shape[1:] for col in data.values()]
       get_feed_fn = _OrderedDictNumpyFeedFn
+    elif isinstance(data, tp.FunctionType):
+      x_first_el = six.next(data())
+      x_first_keys = sorted(x_first_el.keys())
+      x_first_values = [x_first_el[key] for key in x_first_keys]
+      types = [dtypes.as_dtype(col.dtype) for col in x_first_values]
+      queue_shapes = [col.shape for col in x_first_values]
+      get_feed_fn = _GeneratorFeedFn
     elif HAS_PANDAS and isinstance(data, pd.DataFrame):
       types = [
           dtypes.as_dtype(dt) for dt in [data.index.dtype] + list(data.dtypes)
diff --git a/tensorflow/python/framework/tensor_util.py b/tensorflow/python/framework/tensor_util.py
index 13262a0bd8..c2378ac4b2 100644
--- a/tensorflow/python/framework/tensor_util.py
+++ b/tensorflow/python/framework/tensor_util.py
@@ -355,6 +355,10 @@ def make_tensor_proto(values, dtype=None, shape=None, verify_shape=False):
       nparray = values.astype(dtype.as_numpy_dtype)
     else:
       nparray = values
+  elif callable(getattr(values, "__array__", None)):
+    # If a class has the __array__ method, then it is possible to convert
+    # to numpy array.
+    nparray = np.asarray(values, dtype=dtype)
   else:
     if values is None:
       raise ValueError("None values not supported.")
diff --git a/tensorflow/python/framework/tensor_util_test.py b/tensorflow/python/framework/tensor_util_test.py
index 47d3681a1f..dfefc27f99 100644
--- a/tensorflow/python/framework/tensor_util_test.py
+++ b/tensorflow/python/framework/tensor_util_test.py
@@ -23,6 +23,7 @@ import sys
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
@@ -47,13 +48,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatN(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0])
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } }
@@ -65,12 +66,12 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatTyped(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], dtype=dtypes.float32)
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
+        """, t)
     else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
@@ -83,13 +84,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatTypeCoerce(self):
     t = tensor_util.make_tensor_proto([10, 20, 30], dtype=dtypes.float32)
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } }
@@ -102,13 +103,13 @@ class TensorUtilTest(test.TestCase):
   def testFloatTypeCoerceNdarray(self):
     arr = np.asarray([10, 20, 30], dtype="int")
     t = tensor_util.make_tensor_proto(arr, dtype=dtypes.float32)
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else: 
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } }
@@ -120,13 +121,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatSizes(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], shape=[1, 3])
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 1 } dim { size: 3 } }
@@ -138,13 +139,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatSizes2(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], shape=[3, 1])
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } dim { size: 1 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } dim { size: 1 } }
@@ -166,13 +167,13 @@ class TensorUtilTest(test.TestCase):
   def testFloatNpArrayFloat64(self):
     t = tensor_util.make_tensor_proto(
         np.array([[10.0, 20.0, 30.0]], dtype=np.float64))
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_DOUBLE  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "@$\000\000\000\000\000\000@4\000\000\000\000\000\000@>\000\000\000\000\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_DOUBLE
         tensor_shape { dim { size: 1 } dim { size: 3 } }
@@ -257,13 +258,13 @@ class TensorUtilTest(test.TestCase):
 
   def testIntNDefaultType(self):
     t = tensor_util.make_tensor_proto([10, 20, 30, 40], shape=[2, 2])
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_INT32  
         tensor_shape { dim { size: 2 } dim { size: 2 } }  
         tensor_content: "\000\000\000\\n\000\000\000\024\000\000\000\036\000\000\000("  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_INT32
         tensor_shape { dim { size: 2 } dim { size: 2 } }
@@ -327,13 +328,13 @@ class TensorUtilTest(test.TestCase):
   def testLongN(self):
     t = tensor_util.make_tensor_proto(
         [10, 20, 30], shape=[1, 3], dtype=dtypes.int64)
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_INT64  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "\000\000\000\000\000\000\000\\n\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\036"  
-        """, t)  
-    else: 
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_INT64
         tensor_shape { dim { size: 1 } dim { size: 3 } }
@@ -345,13 +346,13 @@ class TensorUtilTest(test.TestCase):
 
   def testLongNpArray(self):
     t = tensor_util.make_tensor_proto(np.array([10, 20, 30]))
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_INT64  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\000\000\000\000\000\000\\n\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\036"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_INT64
         tensor_shape { dim { size: 3 } }
@@ -366,13 +367,13 @@ class TensorUtilTest(test.TestCase):
     data = [(21,), (22,), (23,)]
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.qint32)
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_QINT32  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\000\000\025\000\000\000\026\000\000\000\027"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_QINT32
         tensor_shape { dim { size: 3 } }
@@ -403,13 +404,13 @@ class TensorUtilTest(test.TestCase):
     self.assertAllEqual(np.array(data, dtype=a.dtype), a)
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.quint16)
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_QUINT16  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\025\000\026\000\027"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_QUINT16
         tensor_shape { dim { size: 3 } }
@@ -420,13 +421,13 @@ class TensorUtilTest(test.TestCase):
     self.assertAllEqual(np.array(data, dtype=a.dtype), a)
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.qint16)
-    if sys.byteorder == "big":  
+    if sys.byteorder == "big":
       self.assertProtoEquals("""  
         dtype: DT_QINT16  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\025\000\026\000\027"  
-        """, t)  
-    else: 
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_QINT16
         tensor_shape { dim { size: 3 } }
@@ -667,6 +668,23 @@ class TensorUtilTest(test.TestCase):
     self.assertFalse(tensor_util.ShapeEquals(t, [1, 4]))
     self.assertFalse(tensor_util.ShapeEquals(t, [4]))
 
+  def testMockArray(self):
+
+    class MockArray(object):
+
+      def __init__(self, array):
+        self.array = array
+
+      def __array__(self, dtype=None):
+        return np.asarray(self.array, dtype)
+
+    with self.test_session() as sess:
+      ma = MockArray(np.array([10, 20, 30]))
+      t = ops.convert_to_tensor(ma)
+      a = sess.run(t)
+      self.assertEquals(np.int64, a.dtype)
+      self.assertAllClose(np.array([10, 20, 30], dtype=np.int64), a)
+
 
 class ConstantValueTest(test.TestCase):
 
diff --git a/tensorflow/python/kernel_tests/pooling_ops_3d_test.py b/tensorflow/python/kernel_tests/pooling_ops_3d_test.py
index ca38f1af9f..fa1553a3f6 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_3d_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_3d_test.py
@@ -23,6 +23,7 @@ import numpy as np
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import gradient_checker
+from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import nn_ops
 import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import test
@@ -234,7 +235,8 @@ class PoolingTest(test.TestCase):
     x = np.arange(1, total_size + 1, dtype=np.float32)
     with self.test_session(use_gpu=use_gpu):
       input_tensor = constant_op.constant(x, shape=input_sizes, name="input")
-      err_margin = 1e-3
+      err_g_margin = 1e-3
+      err_gg_margin = 1.5e-2
       if pool_func == nn_ops.avg_pool3d:
         func_name = "avg_pool3d"
         x_init_value = None
@@ -259,19 +261,27 @@ class PoolingTest(test.TestCase):
           padding=padding,
           data_format=data_format,
           name=func_name)
+      t_g = gradients_impl.gradients(t**2, input_tensor)[0]
 
-      if data_format == "NCDHW":
-        t = test_util.NCHWToNHWC(t)
-
-      err = gradient_checker.compute_gradient_error(
+      err_g = gradient_checker.compute_gradient_error(
           input_tensor,
           input_sizes,
           t,
           output_sizes,
           x_init_value=x_init_value,
           delta=1e-2)
-    print("%s gradient error = " % func_name, err)
-    self.assertLess(err, err_margin)
+      err_gg = gradient_checker.compute_gradient_error(
+          input_tensor,
+          input_sizes,
+          t_g,
+          input_sizes,
+          x_init_value=x_init_value,
+          delta=1e-2)
+
+    print("%s gradient error = " % func_name, err_g)
+    self.assertLess(err_g, err_g_margin)
+    print("%s second-order gradient error = " % func_name, err_gg)
+    self.assertLess(err_gg, err_gg_margin)
 
   def _ConstructAndTestGradient(self,
                                 pool_func,
diff --git a/tensorflow/python/kernel_tests/pooling_ops_test.py b/tensorflow/python/kernel_tests/pooling_ops_test.py
index e657faa131..c3e2a640b7 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_test.py
@@ -27,6 +27,7 @@ from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gen_nn_ops
 from tensorflow.python.ops import gradient_checker
+from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import nn_ops
 import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import test
@@ -522,7 +523,7 @@ class PoolingTest(test.TestCase):
   # The following are tests that verify that the CPU and GPU implementations
   # produce the same resuts.
   def _CompareMaxPoolingFwd(self, input_shape, ksize, strides, padding):
-    for dtype in np.float32, np.float16:
+    for dtype in np.float64, np.float32, np.float16:
       tensor_input = np.random.rand(*input_shape).astype(dtype)
       with self.test_session(use_gpu=True):
         t = constant_op.constant(tensor_input, shape=input_shape)
@@ -536,7 +537,7 @@ class PoolingTest(test.TestCase):
 
   def _CompareMaxPoolingBk(self, input_shape, output_shape, ksize, strides,
                            padding):
-    for dtype in np.float32, np.float16:
+    for dtype in np.float64, np.float32, np.float16:
       # Generate numbers in a narrow range, so that there are many duplicates
       # in the input.
       tensor_input = np.random.random_integers(0, 3, input_shape).astype(dtype)
@@ -559,12 +560,39 @@ class PoolingTest(test.TestCase):
                                            padding)
         cpu_val = out_op.eval()
         self.assertShapeEqual(cpu_val, out_op)
-      if dtype == np.float16:
-        # The CPU version accumulates its gradient on fp16, so it's less
-        # accurate than the GPU version that does the accumulation on fp32
-        self.assertAllClose(cpu_val, gpu_val, rtol=0.01, atol=0.01)
-      else:
-        self.assertAllClose(cpu_val, gpu_val)
+      # The CPU version accumulates its gradient on fp16, so it's less
+      # accurate than the GPU version that does the accumulation on fp32
+      self.assertAllCloseAccordingToType(
+          cpu_val, gpu_val, half_rtol=0.01, half_atol=0.01)
+
+  def _CompareMaxPoolingGradBk(self, input_shape, output_shape, ksize, strides,
+                               padding):
+    for dtype in np.float64, np.float32, np.float16:
+      # Generate numbers in a narrow range, so that there are many duplicates
+      # in the input.
+      tensor_input = np.random.random_integers(0, 3, input_shape).astype(dtype)
+      with self.test_session(use_gpu=True):
+        t = constant_op.constant(tensor_input, shape=input_shape)
+        _, argmax_op = nn_ops.max_pool_with_argmax(t, ksize, strides, padding)
+        argmax = argmax_op.eval()
+        grad_in = constant_op.constant(tensor_input, shape=input_shape)
+        out_op = gen_nn_ops._max_pool_grad_grad_with_argmax(
+            t, grad_in, argmax, ksize, strides, padding)
+        gpu_val = out_op.eval()
+        self.assertShapeEqual(gpu_val, out_op)
+      with self.test_session(use_gpu=False):
+        t = constant_op.constant(tensor_input, shape=input_shape)
+        out_op = nn_ops.max_pool(t, ksize, strides, padding)
+        orig_out = out_op.eval()
+        grad_in = constant_op.constant(tensor_input, shape=input_shape)
+        out_op = gen_nn_ops._max_pool_grad_grad(t, orig_out, grad_in, ksize,
+                                                strides, padding)
+        cpu_val = out_op.eval()
+        self.assertShapeEqual(cpu_val, out_op)
+      # The CPU version accumulates its gradient on fp16, so it's less
+      # accurate than the GPU version that does the accumulation on fp32
+      self.assertAllCloseAccordingToType(
+          cpu_val, gpu_val, half_rtol=0.01, half_atol=0.01)
 
   def testMaxPoolingWithArgmax(self):
     # MaxPoolWithArgMax is implemented only on CUDA.
@@ -608,6 +636,28 @@ class PoolingTest(test.TestCase):
       self.assertAllClose(out,
                           [11.0, 12.0, 0.0, 13.0, 0.0, 14.0, 0.0, 0.0, 0.0])
 
+  def testMaxPoolingGradGradWithArgmax(self):
+    # MaxPoolWithArgMax is implemented only on CUDA.
+    if not test.is_gpu_available(cuda_only=True):
+      return
+    orig_input = [1.0, 1.0, 1.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0]
+    tensor_input = [11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0]
+    tensor_argmax = list(np.array([0, 1, 3, 5], dtype=np.int64))
+    with self.test_session(use_gpu=True):
+      orig_in = constant_op.constant(orig_input, shape=[1, 3, 3, 1])
+      t = constant_op.constant(tensor_input, shape=[1, 3, 3, 1])
+      argmax = constant_op.constant(
+          tensor_argmax, shape=[1, 2, 2, 1], dtype=dtypes.int64)
+      out_op = gen_nn_ops._max_pool_grad_grad_with_argmax(
+          orig_in,
+          t,
+          argmax,
+          ksize=[1, 2, 2, 1],
+          strides=[1, 1, 1, 1],
+          padding="VALID")
+      out = out_op.eval().flatten()
+      self.assertAllClose(out, [11.0, 12.0, 14.0, 16.0])
+
   def _ConstructAndTestGradient(self,
                                 pool_func,
                                 input_sizes,
@@ -648,14 +698,14 @@ class PoolingTest(test.TestCase):
       input_tensor = constant_op.constant(x, shape=input_sizes, name="input")
       if pool_func == nn_ops.avg_pool:
         func_name = "avg_pool"
-        err_margin = 1e-4
+        err_tolerance = 1e-4
       else:
         if x_init_value is None:
           x_init_value = np.asfarray(
               np.arange(1, total_size + 1),
               dtype=np.float32).reshape(input_sizes)
         func_name = "max_pool"
-        err_margin = 1e-3
+        err_tolerance = 1e-3
       if data_format == "NCHW":
         ksize = [1, 1, window_rows, window_rows]
         strides = [1, 1, row_stride, col_stride]
@@ -682,7 +732,84 @@ class PoolingTest(test.TestCase):
           x_init_value=x_init_value,
           delta=1e-2)
     print("%s gradient error = " % func_name, err)
-    self.assertLess(err, err_margin)
+    self.assertLess(err, err_tolerance)
+
+  def _ConstructAndTestSecondGradient(self,
+                                      pool_func,
+                                      input_sizes,
+                                      output_sizes,
+                                      window_rows,
+                                      window_cols,
+                                      row_stride,
+                                      col_stride,
+                                      padding,
+                                      data_format,
+                                      use_gpu,
+                                      x_init_value=None):
+    """Verifies the second-order gradients of the pooling function.
+
+    Args:
+      pool_func: Function to be called, co.MaxPool, co.AvgPool,
+        or the Lua version.
+      input_sizes: Input tensor dimensions.
+      output_sizes: Output tensor dimensions.
+      window_rows: kernel size in row dim
+      window_cols: kernel size in col dim
+      row_stride: Row Stride.
+      col_stride: Col Stride.
+      padding: Padding type.
+      data_format: Data format.
+      use_gpu: whether we are running on GPU
+      x_init_value: Values to be passed to the gradient checker.
+    """
+    assert input_sizes[0] == output_sizes[0]
+    assert input_sizes[3] == output_sizes[3]
+    total_size = 1
+    for s in input_sizes:
+      total_size *= s
+    # Initializes the input tensor with array containing incrementing
+    # numbers from 1.
+    x = [f * 1.0 for f in range(1, total_size + 1)]
+    with self.test_session(use_gpu=use_gpu):
+      input_tensor = constant_op.constant(x, shape=input_sizes, name="input")
+      if pool_func == nn_ops.avg_pool:
+        func_name = "avg_pool"
+        err_tolerance = 1e-3
+      else:
+        if x_init_value is None:
+          x_init_value = np.asfarray(
+              np.arange(1, total_size + 1),
+              dtype=np.float32).reshape(input_sizes)
+        func_name = "max_pool"
+        err_tolerance = 1e-2
+      if data_format == "NCHW":
+        ksize = [1, 1, window_rows, window_rows]
+        strides = [1, 1, row_stride, col_stride]
+        t = test_util.NHWCToNCHW(input_tensor)
+      else:
+        ksize = [1, window_rows, window_rows, 1]
+        strides = [1, row_stride, col_stride, 1]
+        t = input_tensor
+      t = pool_func(
+          t,
+          ksize=ksize,
+          strides=strides,
+          padding=padding,
+          data_format=data_format,
+          name=func_name)
+      if data_format == "NCHW":
+        t = test_util.NHWCToNCHW(t)
+
+      t_g = gradients_impl.gradients(t**2, input_tensor)[0]
+      err = gradient_checker.compute_gradient_error(
+          input_tensor,
+          input_sizes,
+          t_g,
+          input_sizes,
+          x_init_value=x_init_value,
+          delta=1e-2)
+    print("%s second-order gradient error = " % func_name, err)
+    self.assertLess(err, err_tolerance)
 
   def _testMaxPoolGradValidPadding1_1(self, data_format, use_gpu):
     self._ConstructAndTestGradient(
@@ -1051,6 +1178,144 @@ class PoolingTest(test.TestCase):
     self._testMaxPoolGradDirectWithNans2_1()
     self._testMaxPoolGradDirectWithNans2_2()
 
+  def _testMaxPoolGradGradValidPadding1_1(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[1, 3, 3, 1],
+        output_sizes=[1, 3, 3, 1],
+        window_rows=1,
+        window_cols=1,
+        row_stride=1,
+        col_stride=1,
+        padding="VALID",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def _testMaxPoolGradGradValidPadding2_1_6(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[2, 6, 6, 3],
+        output_sizes=[2, 5, 5, 3],
+        window_rows=2,
+        window_cols=2,
+        row_stride=1,
+        col_stride=1,
+        padding="VALID",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def _testMaxPoolGradGradValidPadding2_1_7(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[2, 7, 7, 3],
+        output_sizes=[2, 6, 6, 3],
+        window_rows=2,
+        window_cols=2,
+        row_stride=1,
+        col_stride=1,
+        padding="VALID",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def _testMaxPoolGradGradValidPadding2_2(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[2, 2, 2, 3],
+        output_sizes=[2, 1, 1, 3],
+        window_rows=2,
+        window_cols=2,
+        row_stride=2,
+        col_stride=2,
+        padding="VALID",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def _testMaxPoolGradGradSamePadding1_1(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[2, 2, 4, 3],
+        output_sizes=[2, 2, 4, 3],
+        window_rows=1,
+        window_cols=1,
+        row_stride=1,
+        col_stride=1,
+        padding="SAME",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def _testMaxPoolGradGradSamePadding2_1(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[2, 2, 4, 3],
+        output_sizes=[2, 2, 4, 3],
+        window_rows=2,
+        window_cols=2,
+        row_stride=1,
+        col_stride=1,
+        padding="SAME",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def _testMaxPoolGradGradSamePadding2_2(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[2, 2, 4, 3],
+        output_sizes=[2, 1, 2, 3],
+        window_rows=2,
+        window_cols=2,
+        row_stride=2,
+        col_stride=2,
+        padding="SAME",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def _testMaxPoolGradGradSamePadding3_1(self, data_format, use_gpu):
+    self._ConstructAndTestSecondGradient(
+        nn_ops.max_pool,
+        input_sizes=[1, 7, 7, 1],
+        output_sizes=[1, 7, 7, 1],
+        window_rows=3,
+        window_cols=3,
+        row_stride=1,
+        col_stride=1,
+        padding="SAME",
+        data_format=data_format,
+        use_gpu=use_gpu)
+
+  def testMaxPoolGradGrad(self):
+    for (data_format, use_gpu) in GetTestConfigs():
+      self._testMaxPoolGradGradValidPadding1_1(data_format, use_gpu)
+      self._testMaxPoolGradGradValidPadding2_1_6(data_format, use_gpu)
+      self._testMaxPoolGradGradValidPadding2_1_7(data_format, use_gpu)
+      self._testMaxPoolGradGradValidPadding2_2(data_format, use_gpu)
+      self._testMaxPoolGradGradSamePadding1_1(data_format, use_gpu)
+      self._testMaxPoolGradGradSamePadding2_1(data_format, use_gpu)
+      self._testMaxPoolGradGradSamePadding2_2(data_format, use_gpu)
+      self._testMaxPoolGradGradSamePadding3_1(data_format, use_gpu)
+
+  def _MaxPoolGradGrad(self, orig_input, orig_output, grad, window_rows,
+                       window_cols, row_stride, col_stride, padding):
+    """Max Pooling Second-Order Gradient.
+
+    Args:
+      orig_input: A float Tensor. The original input tensor.
+      orig_output: A float Tensor. The original output tensor.
+      grad: A float Tensor.
+        The 4D (batch x out_rows x out_cols x depth) output backprop.
+      window_rows: integer. Kernel size along rows dimension.
+      window_cols: integer. Kernel size along cols dimension.
+      row_stride: integer. Stride along rows dimension
+      col_stride: integer. Stride along cols dimension
+      padding: PoolingOpDef.Padding.  Padding type.
+
+    Returns:
+      A Tensor.
+    """
+    return gen_nn_ops._max_pool_grad_grad(orig_input, orig_output, grad,
+                                          [1, window_rows, window_cols,
+                                           1], [1, row_stride, col_stride,
+                                                1], padding)
+
   def testAvgPoolGrad(self):
     for (data_format, use_gpu) in GetTestConfigs():
       self._testAvgPoolGradValidPadding1_1(data_format, use_gpu)
@@ -1239,6 +1504,19 @@ def GetMaxPoolGradTest(input_size, filter_size, output_size, strides, padding):
   return Test
 
 
+def GetMaxPoolGradGradTest(input_size, filter_size, output_size, strides,
+                           padding):
+
+  def Test(self):
+    # MaxPoolWithArgMax is implemented only on CUDA.
+    if not test.is_gpu_available(cuda_only=True):
+      return
+    self._CompareMaxPoolingGradBk(input_size, output_size, filter_size, strides,
+                                  padding)
+
+  return Test
+
+
 if __name__ == "__main__":
   for (name_, input_size_, filter_size_, output_size_, stride_,
        padding_) in GetShrunkInceptionMaxPoolShapes():
@@ -1247,4 +1525,7 @@ if __name__ == "__main__":
     setattr(PoolingTest, "testMaxPoolGrad_" + name_,
             GetMaxPoolGradTest(input_size_, filter_size_, output_size_, stride_,
                                padding_))
+    setattr(PoolingTest, "testMaxPoolGradGrad_" + name_,
+            GetMaxPoolGradGradTest(input_size_, filter_size_, output_size_,
+                                   stride_, padding_))
   test.main()
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 19f6a98547..8659382834 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -162,7 +162,7 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
     broadcast_shape[self.axis] = input_shape[self.axis].value
 
     # Determines whether broadcasting is needed.
-    needs_broadcasting = (sorted(reduction_axes) != range(ndim)[:-1])
+    needs_broadcasting = (sorted(reduction_axes) != list(range(ndim))[:-1])
 
     # Determine a boolean value for `training`: could be True, False, or None.
     training_value = utils.constant_value(training)
diff --git a/tensorflow/python/ops/hidden_ops.txt b/tensorflow/python/ops/hidden_ops.txt
index fbfd7bb7d6..4981cb6a2e 100644
--- a/tensorflow/python/ops/hidden_ops.txt
+++ b/tensorflow/python/ops/hidden_ops.txt
@@ -252,6 +252,7 @@ TruncateMod
 
 # nn_ops
 AvgPoolGrad  # "*Grad" accessible through nn_grad instead of nn_ops.
+AvgPool3DGrad
 BatchNormWithGlobalNormalization
 BatchNormWithGlobalNormalizationGrad
 FusedBatchNorm
@@ -260,6 +261,10 @@ SparseSoftmaxCrossEntropyWithLogits
 LRNGrad
 MaxPoolGrad
 MaxPoolGradWithArgmax
+MaxPoolGradGrad
+MaxPoolGradGradWithArgmax
+MaxPool3DGrad
+MaxPool3DGradGrad
 ReluGrad
 Relu6Grad
 EluGrad
diff --git a/tensorflow/python/ops/linalg_ops.py b/tensorflow/python/ops/linalg_ops.py
index d6e7f5f58f..e2fd25675e 100644
--- a/tensorflow/python/ops/linalg_ops.py
+++ b/tensorflow/python/ops/linalg_ops.py
@@ -240,7 +240,7 @@ def svd(tensor, full_matrices=False, compute_uv=True, name=None):
   # a is a tensor.
   # s is a tensor of singular values.
   # u is a tensor of left singular vectors.
-  #v is a tensor of right singular vectors.
+  # v is a tensor of right singular vectors.
   s, u, v = svd(a)
   s = svd(a, compute_uv=False)
   ```
@@ -258,10 +258,10 @@ def svd(tensor, full_matrices=False, compute_uv=True, name=None):
 
   Returns:
     s: Singular values. Shape is `[..., P]`.
-    u: Right singular vectors. If `full_matrices` is `False` (default) then
+    u: Left singular vectors. If `full_matrices` is `False` (default) then
       shape is `[..., M, P]`; if `full_matrices` is `True` then shape is
       `[..., M, M]`. Not returned if `compute_uv` is `False`.
-    v: Left singular vectors. If `full_matrices` is `False` (default) then
+    v: Right singular vectors. If `full_matrices` is `False` (default) then
       shape is `[..., N, P]`. If `full_matrices` is `True` then shape is
       `[..., N, N]`. Not returned if `compute_uv` is `False`.
 
diff --git a/tensorflow/python/ops/nn_grad.py b/tensorflow/python/ops/nn_grad.py
index a01466e1ae..f5e9550b97 100644
--- a/tensorflow/python/ops/nn_grad.py
+++ b/tensorflow/python/ops/nn_grad.py
@@ -121,7 +121,7 @@ def _Conv3DBackpropFilterGrad(op, grad):
 
 @ops.RegisterGradient("AvgPool3D")
 def _AvgPool3DGrad(op, grad):
-  return nn_ops.avg_pool3d_grad(
+  return gen_nn_ops._avg_pool3d_grad(
       array_ops.shape(op.inputs[0]),
       grad,
       ksize=op.get_attr("ksize"),
@@ -130,15 +130,58 @@ def _AvgPool3DGrad(op, grad):
       data_format=op.get_attr("data_format"))
 
 
+@ops.RegisterGradient("AvgPool3DGrad")
+def _AvgPool3DGradGrad(op, grad):
+  return (array_ops.stop_gradient(op.inputs[0]), gen_nn_ops.avg_pool3d(
+      grad,
+      op.get_attr("ksize"),
+      op.get_attr("strides"),
+      op.get_attr("padding"),
+      data_format=op.get_attr("data_format")))
+
+
 @ops.RegisterGradient("MaxPool3D")
 def _MaxPool3DGrad(op, grad):
-  return nn_ops.max_pool3d_grad(op.inputs[0],
-                                op.outputs[0],
-                                grad,
-                                ksize=op.get_attr("ksize"),
-                                strides=op.get_attr("strides"),
-                                padding=op.get_attr("padding"),
-                                data_format=op.get_attr("data_format"))
+  return gen_nn_ops._max_pool3d_grad(
+      op.inputs[0],
+      op.outputs[0],
+      grad,
+      ksize=op.get_attr("ksize"),
+      strides=op.get_attr("strides"),
+      padding=op.get_attr("padding"),
+      data_format=op.get_attr("data_format"))
+
+
+@ops.RegisterGradient("MaxPool3DGrad")
+def _MaxPool3DGradGrad(op, grad):
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool3d_grad_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
+
+
+@ops.RegisterGradient("MaxPool3DGradGrad")
+def _MaxPool3DGradGradGrad(op, grad):
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool3d_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
 
 
 @ops.RegisterGradient("Softmax")
@@ -214,6 +257,7 @@ def _BiasAddGrad(op, received_grad):
   return (received_grad, gen_nn_ops.bias_add_grad(out_backprop=received_grad,
                                                   data_format=data_format))
 
+
 @ops.RegisterGradient("BiasAddGrad")
 def _BiasAddGradGrad(op, received_grad):
   """Gradient for the BiasAddGrad op.
@@ -438,6 +482,16 @@ def _AvgPoolGrad(op, grad):
       data_format=op.get_attr("data_format"))
 
 
+@ops.RegisterGradient("AvgPoolGrad")
+def _AvgPoolGradGrad(op, grad):
+  return (array_ops.stop_gradient(op.inputs[0]), gen_nn_ops._avg_pool(
+      grad,
+      op.get_attr("ksize"),
+      op.get_attr("strides"),
+      op.get_attr("padding"),
+      data_format=op.get_attr("data_format")))
+
+
 @ops.RegisterGradient("MaxPool")
 def _MaxPoolGrad(op, grad):
   return gen_nn_ops._max_pool_grad(op.inputs[0],
@@ -449,6 +503,38 @@ def _MaxPoolGrad(op, grad):
                                    data_format=op.get_attr("data_format"))
 
 
+@ops.RegisterGradient("MaxPoolGrad")
+def _MaxPoolGradGrad(op, grad):
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool_grad_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
+
+
+@ops.RegisterGradient("MaxPoolGradGrad")
+def _MaxPoolGradGradGrad(op, grad):
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
+
+
 @ops.RegisterGradient("FractionalMaxPool")
 def _FractionalMaxPoolGrad(op, grad_0, unused_grad_1, unused_grad_2):
   """Returns gradient for FractionalMaxPool.
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 5e6767e30f..4b45b92342 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -39,6 +39,8 @@ from tensorflow.python.ops.gen_nn_ops import *
 # Aliases for some automatically-generated names.
 local_response_normalization = gen_nn_ops.lrn
 
+# pylint: disable=protected-access
+
 
 def _non_atrous_convolution(input, filter, padding, data_format=None,  # pylint: disable=redefined-builtin
                             strides=None, name=None):
@@ -1698,7 +1700,7 @@ def sparse_softmax_cross_entropy_with_logits(_sentinel=None,  # pylint: disable=
   a probability distribution for each entry, see
   `softmax_cross_entropy_with_logits`.
 
-  **WARNING:** This op expects unscaled logits, since it performs a softmax
+  **WARNING:** This op expects unscaled logits, since it performs a `softmax`
   on `logits` internally for efficiency.  Do not call this op with the
   output of `softmax`, as it will produce incorrect results.
 
diff --git a/tensorflow/python/platform/control_imports.py b/tensorflow/python/platform/control_imports.py
new file mode 100644
index 0000000000..b8e8e78ef3
--- /dev/null
+++ b/tensorflow/python/platform/control_imports.py
@@ -0,0 +1,27 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Switch between Google or open source dependencies."""
+# Switch between Google and OSS dependencies
+USE_OSS = True
+
+# Per-dependency switches determining whether each dependency is ready
+# to be replaced by its OSS equivalence.
+# TODO(danmane,mrry,opensource): Flip these switches, then remove them
+OSS_APP = True
+OSS_FLAGS = True
+OSS_GFILE = True
+OSS_GOOGLETEST = True
+OSS_LOGGING = True
+OSS_PARAMETERIZED = True
diff --git a/tensorflow/python/platform/googletest.py b/tensorflow/python/platform/googletest.py
index 5227d2e35c..1e74b1512b 100644
--- a/tensorflow/python/platform/googletest.py
+++ b/tensorflow/python/platform/googletest.py
@@ -99,6 +99,7 @@ def main(argv=None):  # pylint: disable=function-redefined
 
 def GetTempDir():
   """Return a temporary directory for tests to use."""
+  global _googletest_temp_dir
   if not _googletest_temp_dir:
     first_frame = inspect.stack()[-1][0]
     temp_dir = os.path.join(
@@ -112,7 +113,6 @@ def GetTempDir():
         logging.error('Error removing %s: %s', dirname, e)
 
     atexit.register(delete_temp_dir)
-    global _googletest_temp_dir
     _googletest_temp_dir = temp_dir
 
   return _googletest_temp_dir
diff --git a/tensorflow/python/saved_model/builder_impl.py b/tensorflow/python/saved_model/builder_impl.py
index 7b4fabad95..d075a04ca2 100644
--- a/tensorflow/python/saved_model/builder_impl.py
+++ b/tensorflow/python/saved_model/builder_impl.py
@@ -57,7 +57,7 @@ class SavedModelBuilder(object):
   Typical usage for the `SavedModelBuilder`:
   ```python
   ...
-  builder = saved_model_builder.SavedModelBuilder(export_dir)
+  builder = saved_model.builder.SavedModelBuilder(export_dir)
 
   with tf.Session(graph=tf.Graph()) as sess:
     ...
diff --git a/tensorflow/stream_executor/cuda/cuda_dnn.cc b/tensorflow/stream_executor/cuda/cuda_dnn.cc
index 965061053f..6c06a73943 100644
--- a/tensorflow/stream_executor/cuda/cuda_dnn.cc
+++ b/tensorflow/stream_executor/cuda/cuda_dnn.cc
@@ -3081,6 +3081,41 @@ bool CudnnSupport::DoActivate(Stream* stream,
   return true;
 }
 
+bool CudnnSupport::DoPoolForward(
+    Stream* stream, const dnn::PoolingDescriptor& pooling_dimensions,
+    const dnn::BatchDescriptor& input_dimensions,
+    const DeviceMemory<double>& input_data,
+    const dnn::BatchDescriptor& output_dimensions,
+    DeviceMemory<double>* output_data) {
+  mutex_lock lock{dnn_handle_mutex_};
+  auto status = wrap::cudnnSetStream(parent_, ToHandle(dnn_handle_),
+                                     AsCUDAStreamValue(stream));
+  if (status != CUDNN_STATUS_SUCCESS) {
+    LOG(ERROR) << "failed to set stream for cudnn handle: " << ToString(status);
+    return false;
+  }
+
+  // Alpha is the scaling factor for input.
+  double alpha = 1.0;
+  // Beta is the scaling factor for output.
+  double beta = 0.0;
+
+  ScopedTensorDescriptor src_desc{parent_, input_dimensions, CUDNN_DATA_DOUBLE};
+  ScopedTensorDescriptor dest_desc{parent_, output_dimensions,
+                                   CUDNN_DATA_DOUBLE};
+  ScopedPoolingDescriptor pooling_desc{parent_, pooling_dimensions};
+  status = wrap::cudnnPoolingForward(
+      parent_, ToHandle(dnn_handle_), pooling_desc.handle(), &alpha,
+      src_desc.handle(), input_data.opaque(), &beta, dest_desc.handle(),
+      output_data->opaque());
+  if (status != CUDNN_STATUS_SUCCESS) {
+    LOG(ERROR) << "failed to enqueue forward pooling on stream: "
+               << ToString(status);
+    return false;
+  }
+  return true;
+}
+
 bool CudnnSupport::DoPoolForward(
     Stream* stream, const dnn::PoolingDescriptor& pooling_dimensions,
     const dnn::BatchDescriptor& input_dimensions,
@@ -3150,6 +3185,44 @@ bool CudnnSupport::DoPoolForward(
   return true;
 }
 
+bool CudnnSupport::DoPoolBackward(
+    Stream* stream, const dnn::PoolingDescriptor& pooling_dimensions,
+    const dnn::BatchDescriptor& input_dimensions,
+    const DeviceMemory<double>& input_data,
+    const dnn::BatchDescriptor& output_dimensions,
+    const DeviceMemory<double>& output_data,
+    const DeviceMemory<double>& input_diff_data,
+    DeviceMemory<double>* output_diff_data) {
+  mutex_lock lock{dnn_handle_mutex_};
+  auto status = wrap::cudnnSetStream(parent_, ToHandle(dnn_handle_),
+                                     AsCUDAStreamValue(stream));
+  if (status != CUDNN_STATUS_SUCCESS) {
+    LOG(ERROR) << "failed to set stream for cudnn handle: " << ToString(status);
+    return false;
+  }
+
+  // Alpha is the scaling factor for input.
+  double alpha = 1.0;
+  // Beta is the scaling factor for output.
+  double beta = 0.0;
+
+  ScopedTensorDescriptor src_desc{parent_, input_dimensions, CUDNN_DATA_DOUBLE};
+  ScopedTensorDescriptor dest_desc{parent_, output_dimensions,
+                                   CUDNN_DATA_DOUBLE};
+  ScopedPoolingDescriptor pooling_desc{parent_, pooling_dimensions};
+  status = wrap::cudnnPoolingBackward(
+      parent_, ToHandle(dnn_handle_), pooling_desc.handle(), &alpha,
+      dest_desc.handle(), output_data.opaque(), dest_desc.handle(),
+      input_diff_data.opaque(), src_desc.handle(), input_data.opaque(), &beta,
+      src_desc.handle(), output_diff_data->opaque());
+  if (status != CUDNN_STATUS_SUCCESS) {
+    LOG(ERROR) << "failed to enqueue backward pooling on stream: "
+               << ToString(status);
+    return false;
+  }
+  return true;
+}
+
 bool CudnnSupport::DoPoolBackward(
     Stream* stream, const dnn::PoolingDescriptor& pooling_dimensions,
     const dnn::BatchDescriptor& input_dimensions,
diff --git a/tensorflow/stream_executor/cuda/cuda_dnn.h b/tensorflow/stream_executor/cuda/cuda_dnn.h
index cfc7e29574..b280b73c70 100644
--- a/tensorflow/stream_executor/cuda/cuda_dnn.h
+++ b/tensorflow/stream_executor/cuda/cuda_dnn.h
@@ -305,6 +305,13 @@ class CudnnSupport : public dnn::DnnSupport {
                   const DeviceMemory<float>& input_data,
                   DeviceMemory<float>* output_data, uint64 options) override;
 
+  bool DoPoolForward(Stream* stream,
+                     const dnn::PoolingDescriptor& pooling_dimensions,
+                     const dnn::BatchDescriptor& input_dimensions,
+                     const DeviceMemory<double>& input_data,
+                     const dnn::BatchDescriptor& output_dimensions,
+                     DeviceMemory<double>* output_data) override;
+
   bool DoPoolForward(Stream* stream,
                      const dnn::PoolingDescriptor& pooling_dimensions,
                      const dnn::BatchDescriptor& input_dimensions,
@@ -319,6 +326,15 @@ class CudnnSupport : public dnn::DnnSupport {
                      const dnn::BatchDescriptor& output_dimensions,
                      DeviceMemory<Eigen::half>* output_data) override;
 
+  bool DoPoolBackward(Stream* stream,
+                      const dnn::PoolingDescriptor& pooling_dimensions,
+                      const dnn::BatchDescriptor& input_dimensions,
+                      const DeviceMemory<double>& input_data,
+                      const dnn::BatchDescriptor& output_dimensions,
+                      const DeviceMemory<double>& output_data,
+                      const DeviceMemory<double>& input_diff_data,
+                      DeviceMemory<double>* output_diff_data) override;
+
   bool DoPoolBackward(Stream* stream,
                       const dnn::PoolingDescriptor& pooling_dimensions,
                       const dnn::BatchDescriptor& input_dimensions,
diff --git a/tensorflow/stream_executor/dnn.h b/tensorflow/stream_executor/dnn.h
index d6b3f51705..c5805064f3 100644
--- a/tensorflow/stream_executor/dnn.h
+++ b/tensorflow/stream_executor/dnn.h
@@ -1280,14 +1280,39 @@ class DnnSupport {
                              const dnn::BatchDescriptor& output_dimensions,
                              DeviceMemory<float>* output_data) = 0;
 
+  virtual bool DoPoolForward(Stream* stream,
+                             const dnn::PoolingDescriptor& pooling_dimensions,
+                             const dnn::BatchDescriptor& input_dimensions,
+                             const DeviceMemory<double>& input_data,
+                             const dnn::BatchDescriptor& output_dimensions,
+                             DeviceMemory<double>* output_data) {
+    LOG(FATAL) << "DoPoolForward not implemented for double.";
+    return false;
+  }
+
   virtual bool DoPoolForward(Stream* stream,
                              const dnn::PoolingDescriptor& pooling_dimensions,
                              const dnn::BatchDescriptor& input_dimensions,
                              const DeviceMemory<Eigen::half>& input_data,
                              const dnn::BatchDescriptor& output_dimensions,
-                             DeviceMemory<Eigen::half>* output_data) = 0;
+                             DeviceMemory<Eigen::half>* output_data) {
+    LOG(FATAL) << "DoPoolForward not implemented for float16.";
+    return false;
+  }
 
   // Performs differentiation of the pooling operation.
+  virtual bool DoPoolBackward(Stream* stream,
+                              const dnn::PoolingDescriptor& pooling_dimensions,
+                              const dnn::BatchDescriptor& input_dimensions,
+                              const DeviceMemory<double>& input_data,
+                              const dnn::BatchDescriptor& output_dimensions,
+                              const DeviceMemory<double>& output_data,
+                              const DeviceMemory<double>& input_diff_data,
+                              DeviceMemory<double>* output_diff_data) {
+    LOG(FATAL) << "DoPoolBackward not implemented.";
+    return false;
+  }
+
   virtual bool DoPoolBackward(Stream* stream,
                               const dnn::PoolingDescriptor& pooling_dimensions,
                               const dnn::BatchDescriptor& input_dimensions,
@@ -1295,7 +1320,10 @@ class DnnSupport {
                               const dnn::BatchDescriptor& output_dimensions,
                               const DeviceMemory<float>& output_data,
                               const DeviceMemory<float>& input_diff_data,
-                              DeviceMemory<float>* output_diff_data) = 0;
+                              DeviceMemory<float>* output_diff_data) {
+    LOG(FATAL) << "DoPoolBackward not implemented.";
+    return false;
+  }
 
   virtual bool DoPoolBackward(Stream* stream,
                               const dnn::PoolingDescriptor& pooling_dimensions,
@@ -1304,7 +1332,10 @@ class DnnSupport {
                               const dnn::BatchDescriptor& output_dimensions,
                               const DeviceMemory<Eigen::half>& output_data,
                               const DeviceMemory<Eigen::half>& input_diff_data,
-                              DeviceMemory<Eigen::half>* output_diff_data) = 0;
+                              DeviceMemory<Eigen::half>* output_diff_data) {
+    LOG(FATAL) << "DoPoolBackward not implemented.";
+    return false;
+  }
 
   // Applies local response normalization to the values from
   // input_data and writes the result to output_data. See comments on
@@ -1884,4 +1915,3 @@ class DnnSupport {
 }  // namespace perftools
 
 #endif  // TENSORFLOW_STREAM_EXECUTOR_DNN_H_
-
diff --git a/tensorflow/stream_executor/stream.cc b/tensorflow/stream_executor/stream.cc
index 76cbf0b1b6..a393b07703 100644
--- a/tensorflow/stream_executor/stream.cc
+++ b/tensorflow/stream_executor/stream.cc
@@ -963,6 +963,30 @@ Stream &Stream::ThenBiasAdd(const DeviceMemory<float> &input_data,
   return *this;
 }
 
+Stream &Stream::ThenPoolForward(
+    const dnn::PoolingDescriptor &pooling_dimensions,
+    const dnn::BatchDescriptor &input_dimensions,
+    const DeviceMemory<double> &input_data,
+    const dnn::BatchDescriptor &output_dimensions,
+    DeviceMemory<double> *output_data) {
+  VLOG_CALL(PARAM(pooling_dimensions), PARAM(input_dimensions),
+            PARAM(input_data), PARAM(output_dimensions), PARAM(output_data));
+
+  if (ok()) {
+    if (dnn::DnnSupport *dnn = parent_->AsDnn()) {
+      CheckError(dnn->DoPoolForward(this, pooling_dimensions, input_dimensions,
+                                    input_data, output_dimensions,
+                                    output_data));
+    } else {
+      SetError();
+      LOG(WARNING)
+          << "attempting to perform DNN operation using StreamExecutor "
+             "without DNN support";
+    }
+  }
+  return *this;
+}
+
 Stream &Stream::ThenPoolForward(
     const dnn::PoolingDescriptor &pooling_dimensions,
     const dnn::BatchDescriptor &input_dimensions,
@@ -1005,6 +1029,33 @@ Stream &Stream::ThenPoolForward(
   return *this;
 }
 
+Stream &Stream::ThenPoolBackward(
+    const dnn::PoolingDescriptor &pooling_dimensions,
+    const dnn::BatchDescriptor &input_dimensions,
+    const DeviceMemory<double> &input_data,
+    const dnn::BatchDescriptor &output_dimensions,
+    const DeviceMemory<double> &output_data,
+    const DeviceMemory<double> &input_diff_data,
+    DeviceMemory<double> *output_diff_data) {
+  VLOG_CALL(PARAM(pooling_dimensions), PARAM(input_dimensions),
+            PARAM(input_data), PARAM(output_dimensions), PARAM(output_data),
+            PARAM(input_diff_data), PARAM(output_diff_data));
+
+  if (ok()) {
+    if (dnn::DnnSupport *dnn = parent_->AsDnn()) {
+      CheckError(dnn->DoPoolBackward(this, pooling_dimensions, input_dimensions,
+                                     input_data, output_dimensions, output_data,
+                                     input_diff_data, output_diff_data));
+    } else {
+      SetError();
+      LOG(WARNING)
+          << "attempting to perform DNN operation using StreamExecutor "
+             "without DNN support";
+    }
+  }
+  return *this;
+}
+
 Stream &Stream::ThenPoolBackward(
     const dnn::PoolingDescriptor &pooling_dimensions,
     const dnn::BatchDescriptor &input_dimensions,
diff --git a/tensorflow/stream_executor/stream.h b/tensorflow/stream_executor/stream.h
index f22fba1d74..5b46b86f54 100644
--- a/tensorflow/stream_executor/stream.h
+++ b/tensorflow/stream_executor/stream.h
@@ -465,6 +465,12 @@ class Stream {
                       const dnn::BatchDescriptor &dimensions,
                       DeviceMemory<float> *output_data);
 
+  Stream &ThenPoolForward(const dnn::PoolingDescriptor &pooling_dimensions,
+                          const dnn::BatchDescriptor &input_dimensions,
+                          const DeviceMemory<double> &input_data,
+                          const dnn::BatchDescriptor &output_dimensions,
+                          DeviceMemory<double> *output_data);
+
   Stream &ThenPoolForward(const dnn::PoolingDescriptor &pooling_dimensions,
                           const dnn::BatchDescriptor &input_dimensions,
                           const DeviceMemory<float> &input_data,
@@ -477,6 +483,14 @@ class Stream {
                           const dnn::BatchDescriptor &output_dimensions,
                           DeviceMemory<Eigen::half> *output_data);
 
+  Stream &ThenPoolBackward(const dnn::PoolingDescriptor &pooling_dimensions,
+                           const dnn::BatchDescriptor &input_dimensions,
+                           const DeviceMemory<double> &input_data,
+                           const dnn::BatchDescriptor &output_dimensions,
+                           const DeviceMemory<double> &output_data,
+                           const DeviceMemory<double> &input_diff_data,
+                           DeviceMemory<double> *output_diff_data);
+
   Stream &ThenPoolBackward(const dnn::PoolingDescriptor &pooling_dimensions,
                            const dnn::BatchDescriptor &input_dimensions,
                            const DeviceMemory<float> &input_data,
diff --git a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts b/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
index 3ca1d8da29..4bc6a8a837 100644
--- a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
+++ b/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
@@ -453,35 +453,19 @@ module VZ {
     }
 
     private resmoothDataset(dataset: Plottable.Dataset) {
-      // When increasing the smoothing window, it smoothes a lot with the first
-      // few points and then starts to gradually smooth slower, so using an
-      // exponential function makes the slider more consistent. 1000^x has a
-      // range of [1, 1000], so subtracting 1 and dividing by 999 results in a
-      // range of [0, 1], which can be used as the percentage of the data, so
-      // that the kernel size can be specified as a percentage instead of a
-      // hardcoded number, what would be bad with multiple series.
-      let factor = (Math.pow(1000, this.smoothingWeight) - 1) / 999;
       let data = dataset.data();
-      let kernelRadius = Math.floor(data.length * factor / 2);
-
-      data.forEach((d, i) => {
-        let actualKernelRadius = Math.min(kernelRadius, i);
-        let start = i - actualKernelRadius;
-        let end = i + actualKernelRadius + 1;
-        if (end >= data.length) {
-          // In the beginning, it's OK for the smoothing window to be small,
-          // but this is not desirable towards the end. Rather than shrinking
-          // the window, or extrapolating data to fill the gap, we're simply
-          // not going to display the smoothed line towards the end.
-          d.smoothed = Infinity;
-        } else if (!_.isFinite(d.scalar)) {
-          // Only smooth finite numbers.
+      const smoothingWeight = this.smoothingWeight;
+      let last = data.length > 0 ? data[0].scalar : NaN;
+      data.forEach((d) => {
+        if (!_.isFinite(last)) {
           d.smoothed = d.scalar;
         } else {
-          d.smoothed = d3.mean(
-              data.slice(start, end).filter((d) => _.isFinite(d.scalar)),
-              (d) => d.scalar);
+          // 1st-order IIR low-pass filter to attenuate the higher-
+          // frequency components of the time-series.
+          d.smoothed =
+              last * smoothingWeight + (1 - smoothingWeight) * d.scalar;
         }
+        last = d.smoothed;
       });
     }
 
diff --git a/tensorflow/tensorboard/plugins/debugger/BUILD b/tensorflow/tensorboard/plugins/debugger/BUILD
index 86254dc3aa..38aa719b9b 100644
--- a/tensorflow/tensorboard/plugins/debugger/BUILD
+++ b/tensorflow/tensorboard/plugins/debugger/BUILD
@@ -30,6 +30,7 @@ py_test(
     srcs = ["debugger_plugin_test.py"],
     main = "debugger_plugin_test.py",
     srcs_version = "PY2AND3",
+    tags = ["no_pip"],
     deps = [
         ":debugger_plugin",
         "//tensorflow/core:protos_all_py",
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index a5637de1aa..a8007b803d 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -1,42 +1,45 @@
 # -*- Python -*-
 
+
 # Given a source file, generate a test name.
 # i.e. "common_runtime/direct_session_test.cc" becomes
 #      "common_runtime_direct_session_test"
 def src_to_test_name(src):
   return src.replace("/", "_").split(".")[0]
 
+
 # Return the options to use for a C++ library or binary build.
 # Uses the ":optmode" config_setting to pick the options.
 load(
     "//tensorflow/core:platform/default/build_config_root.bzl",
     "tf_cuda_tests_tags",
     "tf_sycl_tests_tags",
-    "tf_additional_xla_deps_py",
-)
-load(
-    "@local_config_cuda//cuda:build_defs.bzl",
-    "if_cuda",
-    "cuda_default_copts"
-)
+    "tf_additional_xla_deps_py",)
+load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda", "cuda_default_copts")
 
 load(
     "//third_party/mkl:build_defs.bzl",
-    "if_mkl",
-)
+    "if_mkl",)
+
 
 # List of proto files for android builds
 def tf_android_core_proto_sources(core_proto_sources_relative):
-  return ["//tensorflow/core:" + p
-          for p in core_proto_sources_relative]
+  return [
+      "//tensorflow/core:" + p for p in core_proto_sources_relative
+  ]
+
 
 # Returns the list of pb.h and proto.h headers that are generated for
 # tf_android_core_proto_sources().
 def tf_android_core_proto_headers(core_proto_sources_relative):
-  return (["//tensorflow/core/" + p.replace(".proto", ".pb.h")
-          for p in core_proto_sources_relative] +
-         ["//tensorflow/core/" + p.replace(".proto", ".proto.h")
-          for p in core_proto_sources_relative])
+  return ([
+      "//tensorflow/core/" + p.replace(".proto", ".pb.h")
+      for p in core_proto_sources_relative
+  ] + [
+      "//tensorflow/core/" + p.replace(".proto", ".proto.h")
+      for p in core_proto_sources_relative
+  ])
+
 
 def if_android_x86(a):
   return select({
@@ -52,30 +55,35 @@ def if_android_arm(a):
       "//conditions:default": [],
   })
 
+
 def if_android_arm64(a):
   return select({
       "//tensorflow:android_arm64": a,
       "//conditions:default": [],
   })
 
+
 def if_not_android(a):
   return select({
       "//tensorflow:android": [],
       "//conditions:default": a,
   })
 
+
 def if_android(a):
   return select({
       "//tensorflow:android": a,
       "//conditions:default": [],
   })
 
+
 def if_ios(a):
   return select({
       "//tensorflow:ios": a,
       "//conditions:default": [],
   })
 
+
 def if_mobile(a):
   return select({
       "//tensorflow:android": a,
@@ -83,6 +91,7 @@ def if_mobile(a):
       "//conditions:default": [],
   })
 
+
 def if_not_mobile(a):
   return select({
       "//tensorflow:android": [],
@@ -90,12 +99,14 @@ def if_not_mobile(a):
       "//conditions:default": a,
   })
 
+
 def if_not_windows(a):
   return select({
       "//tensorflow:windows": [],
       "//conditions:default": a,
   })
 
+
 def if_x86(a):
   return select({
       "//tensorflow:linux_x86_64": a,
@@ -103,33 +114,34 @@ def if_x86(a):
       "//conditions:default": [],
   })
 
+
 # LINT.IfChange
 def tf_copts():
-  return (["-DEIGEN_AVOID_STL_ARRAY",
-           "-Iexternal/gemmlowp",
-           "-Wno-sign-compare",
-           "-fno-exceptions",] +
-          if_cuda(["-DGOOGLE_CUDA=1"]) +
-          if_mkl(["-DINTEL_MKL=1"]) +
-          if_android_arm(["-mfpu=neon"]) +
-          if_x86(["-msse3"]) +
-          select({
-              "//tensorflow:android": [
-                  "-std=c++11",
-                  "-DTF_LEAN_BINARY",
-                  "-O2",
-              ],
-              "//tensorflow:darwin": [],
-              "//tensorflow:windows": [
-                "/DLANG_CXX11",
-                "/D__VERSION__=\\\"MSVC\\\"",
-                "/DPLATFORM_WINDOWS",
-                "/DTF_COMPILE_LIBRARY",
-                "/DEIGEN_HAS_C99_MATH",
-                "/DTENSORFLOW_USE_EIGEN_THREADPOOL",
-              ],
-              "//tensorflow:ios": ["-std=c++11"],
-              "//conditions:default": ["-pthread"]}))
+  return ([
+      "-DEIGEN_AVOID_STL_ARRAY",
+      "-Iexternal/gemmlowp",
+      "-Wno-sign-compare",
+      "-fno-exceptions",
+  ] + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]) + if_android_arm(
+      ["-mfpu=neon"]) + if_x86(["-msse3"]) + select({
+          "//tensorflow:android": [
+              "-std=c++11",
+              "-DTF_LEAN_BINARY",
+              "-O2",
+          ],
+          "//tensorflow:darwin": [],
+          "//tensorflow:windows": [
+              "/DLANG_CXX11",
+              "/D__VERSION__=\\\"MSVC\\\"",
+              "/DPLATFORM_WINDOWS",
+              "/DTF_COMPILE_LIBRARY",
+              "/DEIGEN_HAS_C99_MATH",
+              "/DTENSORFLOW_USE_EIGEN_THREADPOOL",
+          ],
+          "//tensorflow:ios": ["-std=c++11"],
+          "//conditions:default": ["-pthread"]
+      }))
+
 
 def tf_opts_nortti_if_android():
   return if_android([
@@ -137,8 +149,11 @@ def tf_opts_nortti_if_android():
       "-DGOOGLE_PROTOBUF_NO_RTTI",
       "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
   ]) + if_android_x86(["-msse4.1"])
+
+
 # LINT.ThenChange(//tensorflow/contrib/android/cmake/CMakeLists.txt)
 
+
 # Given a list of "op_lib_names" (a list of files in the ops directory
 # without their .cc extensions), generate a library for that file.
 def tf_gen_op_libs(op_lib_names, deps=None):
@@ -147,15 +162,19 @@ def tf_gen_op_libs(op_lib_names, deps=None):
   if not deps:
     deps = []
   for n in op_lib_names:
-    native.cc_library(name=n + "_op_lib",
-                      copts=tf_copts(),
-                      srcs=["ops/" + n + ".cc"],
-                      deps=deps + ["//tensorflow/core:framework"],
-                      visibility=["//visibility:public"],
-                      alwayslink=1,
-                      linkstatic=1,)
-
-def tf_gen_op_wrapper_cc(name, out_ops_file, pkg="",
+    native.cc_library(
+        name=n + "_op_lib",
+        copts=tf_copts(),
+        srcs=["ops/" + n + ".cc"],
+        deps=deps + ["//tensorflow/core:framework"],
+        visibility=["//visibility:public"],
+        alwayslink=1,
+        linkstatic=1,)
+
+
+def tf_gen_op_wrapper_cc(name,
+                         out_ops_file,
+                         pkg="",
                          op_gen="//tensorflow/cc:cc_op_gen_main",
                          deps=None,
                          override_file=None,
@@ -165,12 +184,11 @@ def tf_gen_op_wrapper_cc(name, out_ops_file, pkg="",
   if deps == None:
     deps = [pkg + ":" + name + "_op_lib"]
   native.cc_binary(
-      name = tool,
-      copts = tf_copts(),
-      linkopts = ["-lm"],
-      linkstatic = 1,   # Faster to link this one-time-use binary dynamically
-      deps = [op_gen] + deps
-  )
+      name=tool,
+      copts=tf_copts(),
+      linkopts=["-lm"],
+      linkstatic=1,  # Faster to link this one-time-use binary dynamically
+      deps=[op_gen] + deps)
 
   if override_file == None:
     srcs = []
@@ -180,14 +198,17 @@ def tf_gen_op_wrapper_cc(name, out_ops_file, pkg="",
     override_arg = "$(location " + override_file + ")"
   native.genrule(
       name=name + "_genrule",
-      outs=[out_ops_file + ".h", out_ops_file + ".cc",
-            out_ops_file + "_internal.h", out_ops_file + "_internal.cc"],
+      outs=[
+          out_ops_file + ".h", out_ops_file + ".cc",
+          out_ops_file + "_internal.h", out_ops_file + "_internal.cc"
+      ],
       srcs=srcs,
       tools=[":" + tool],
       cmd=("$(location :" + tool + ") $(location :" + out_ops_file + ".h) " +
            "$(location :" + out_ops_file + ".cc) " + override_arg + " " +
            str(include_internal_ops)))
 
+
 # Given a list of "op_lib_names" (a list of files in the ops directory
 # without their .cc extensions), generate individual C++ .cc and .h
 # files for each of the ops files mentioned, and then generate a
@@ -235,59 +256,72 @@ def tf_gen_op_wrappers_cc(name,
   internalhdrs = []
   for n in op_lib_names:
     tf_gen_op_wrapper_cc(
-        n, "ops/" + n, pkg=pkg, op_gen=op_gen, override_file=override_file,
+        n,
+        "ops/" + n,
+        pkg=pkg,
+        op_gen=op_gen,
+        override_file=override_file,
         include_internal_ops=include_internal_ops)
     subsrcs += ["ops/" + n + ".cc"]
     subhdrs += ["ops/" + n + ".h"]
     internalsrcs += ["ops/" + n + "_internal.cc"]
     internalhdrs += ["ops/" + n + "_internal.h"]
 
-  native.cc_library(name=name,
-                    srcs=subsrcs,
-                    hdrs=subhdrs,
-                    deps=deps + if_not_android([
-                        "//tensorflow/core:core_cpu",
-                        "//tensorflow/core:framework",
-                        "//tensorflow/core:lib",
-                        "//tensorflow/core:protos_all_cc",
-                    ]) + if_android([
-                        "//tensorflow/core:android_tensorflow_lib",
-                    ]),
-                    copts=tf_copts(),
-                    alwayslink=1,
-                    visibility=visibility)
-  native.cc_library(name=name + "_internal",
-                    srcs=internalsrcs,
-                    hdrs=internalhdrs,
-                    deps=deps + if_not_android([
-                        "//tensorflow/core:core_cpu",
-                        "//tensorflow/core:framework",
-                        "//tensorflow/core:lib",
-                        "//tensorflow/core:protos_all_cc",
-                    ]) + if_android([
-                        "//tensorflow/core:android_tensorflow_lib",
-                    ]),
-                    copts=tf_copts(),
-                    alwayslink=1,
-                    visibility=["//tensorflow:internal"])
+  native.cc_library(
+      name=name,
+      srcs=subsrcs,
+      hdrs=subhdrs,
+      deps=deps + if_not_android([
+          "//tensorflow/core:core_cpu",
+          "//tensorflow/core:framework",
+          "//tensorflow/core:lib",
+          "//tensorflow/core:protos_all_cc",
+      ]) + if_android([
+          "//tensorflow/core:android_tensorflow_lib",
+      ]),
+      copts=tf_copts(),
+      alwayslink=1,
+      visibility=visibility)
+  native.cc_library(
+      name=name + "_internal",
+      srcs=internalsrcs,
+      hdrs=internalhdrs,
+      deps=deps + if_not_android([
+          "//tensorflow/core:core_cpu",
+          "//tensorflow/core:framework",
+          "//tensorflow/core:lib",
+          "//tensorflow/core:protos_all_cc",
+      ]) + if_android([
+          "//tensorflow/core:android_tensorflow_lib",
+      ]),
+      copts=tf_copts(),
+      alwayslink=1,
+      visibility=["//tensorflow:internal"])
+
 
 # Invoke this rule in .../tensorflow/python to build the wrapper library.
-def tf_gen_op_wrapper_py(name, out=None, hidden=None, visibility=None, deps=[],
-                         require_shape_functions=False, hidden_file=None,
+def tf_gen_op_wrapper_py(name,
+                         out=None,
+                         hidden=None,
+                         visibility=None,
+                         deps=[],
+                         require_shape_functions=False,
+                         hidden_file=None,
                          generated_target_name=None):
   # Construct a cc_binary containing the specified ops.
   tool_name = "gen_" + name + "_py_wrappers_cc"
   if not deps:
     deps = ["//tensorflow/core:" + name + "_op_lib"]
   native.cc_binary(
-      name = tool_name,
-      linkopts = ["-lm"],
-      copts = tf_copts(),
-      linkstatic = 1,   # Faster to link this one-time-use binary dynamically
-      deps = (["//tensorflow/core:framework",
-               "//tensorflow/python:python_op_gen_main"] + deps),
-      visibility = ["//tensorflow:internal"],
-  )
+      name=tool_name,
+      linkopts=["-lm"],
+      copts=tf_copts(),
+      linkstatic=1,  # Faster to link this one-time-use binary dynamically
+      deps=([
+          "//tensorflow/core:framework",
+          "//tensorflow/python:python_op_gen_main"
+      ] + deps),
+      visibility=["//tensorflow:internal"],)
 
   # Invoke the previous cc_binary to generate a python file.
   if not out:
@@ -299,8 +333,8 @@ def tf_gen_op_wrapper_py(name, out=None, hidden=None, visibility=None, deps=[],
         name=name + "_pygenrule",
         outs=[out],
         tools=[tool_name],
-        cmd=("$(location " + tool_name + ") " + ",".join(hidden)
-             + " " + ("1" if require_shape_functions else "0") + " > $@"))
+        cmd=("$(location " + tool_name + ") " + ",".join(hidden) + " " +
+             ("1" if require_shape_functions else "0") + " > $@"))
   elif hidden_file:
     # `hidden_file` is file containing a list of op names to be hidden in the
     # generated module.
@@ -309,77 +343,120 @@ def tf_gen_op_wrapper_py(name, out=None, hidden=None, visibility=None, deps=[],
         outs=[out],
         srcs=[hidden_file],
         tools=[tool_name],
-        cmd=("$(location " + tool_name + ") @$(location "
-             + hidden_file + ") " + ("1" if require_shape_functions else "0")
-             + " > $@"))
+        cmd=("$(location " + tool_name + ") @$(location " + hidden_file + ") " +
+             ("1" if require_shape_functions else "0") + " > $@"))
   else:
     # No ops should be hidden in the generated module.
     native.genrule(
         name=name + "_pygenrule",
         outs=[out],
         tools=[tool_name],
-        cmd=("$(location " + tool_name + ") "
-             + ("1" if require_shape_functions else "0") + " > $@"))
+        cmd=("$(location " + tool_name + ") " +
+             ("1" if require_shape_functions else "0") + " > $@"))
 
   # Make a py_library out of the generated python file.
   if not generated_target_name:
     generated_target_name = name
-  native.py_library(name=generated_target_name,
-                    srcs=[out],
-                    srcs_version="PY2AND3",
-                    visibility=visibility,
-                    deps=[
-                        "//tensorflow/python:framework_for_generated_wrappers_v2",
-                    ],)
+  native.py_library(
+      name=generated_target_name,
+      srcs=[out],
+      srcs_version="PY2AND3",
+      visibility=visibility,
+      deps=[
+          "//tensorflow/python:framework_for_generated_wrappers_v2",
+      ],)
+
 
 # Define a bazel macro that creates cc_test for tensorflow.
 # TODO(opensource): we need to enable this to work around the hidden symbol
 # __cudaRegisterFatBinary error. Need more investigations.
-def tf_cc_test(name, srcs, deps, linkstatic=0, tags=[], data=[], size="medium",
-               suffix="", args=None, linkopts=[]):
-  native.cc_test(name="%s%s" % (name, suffix),
-                 srcs=srcs,
-                 size=size,
-                 args=args,
-                 copts=tf_copts(),
-                 data=data,
-                 deps=deps,
-                 linkopts=["-lpthread", "-lm"] + linkopts,
-                 linkstatic=linkstatic,
-                 tags=tags)
+def tf_cc_test(name,
+               srcs,
+               deps,
+               linkstatic=0,
+               tags=[],
+               data=[],
+               size="medium",
+               suffix="",
+               args=None,
+               linkopts=[]):
+  native.cc_test(
+      name="%s%s" % (name, suffix),
+      srcs=srcs,
+      size=size,
+      args=args,
+      copts=tf_copts(),
+      data=data,
+      deps=deps,
+      linkopts=["-lpthread", "-lm"] + linkopts,
+      linkstatic=linkstatic,
+      tags=tags)
+
 
 # Part of the testing workflow requires a distinguishable name for the build
 # rules that involve a GPU, even if otherwise identical to the base rule.
-def tf_cc_test_gpu(name, srcs, deps, linkstatic=0, tags=[], data=[],
-                   size="medium", suffix="", args=None):
-  tf_cc_test(name, srcs, deps, linkstatic=linkstatic, tags=tags, data=data,
-             size=size, suffix=suffix, args=args)
-
-def tf_cuda_cc_test(name, srcs=[], deps=[], tags=[], data=[], size="medium",
-                    linkstatic=0, args=[], linkopts=[]):
-  tf_cc_test(name=name,
-             srcs=srcs,
-             deps=deps,
-             tags=tags + ["manual"],
-             data=data,
-             size=size,
-             linkstatic=linkstatic,
-             linkopts=linkopts,
-             args=args)
-  tf_cc_test(name=name,
-             srcs=srcs,
-             suffix="_gpu",
-             deps=deps + if_cuda(["//tensorflow/core:gpu_runtime"]),
-             linkstatic=if_cuda(1, 0),
-             tags=tags + tf_cuda_tests_tags(),
-             data=data,
-             size=size,
-             linkopts=linkopts,
-             args=args)
+def tf_cc_test_gpu(name,
+                   srcs,
+                   deps,
+                   linkstatic=0,
+                   tags=[],
+                   data=[],
+                   size="medium",
+                   suffix="",
+                   args=None):
+  tf_cc_test(
+      name,
+      srcs,
+      deps,
+      linkstatic=linkstatic,
+      tags=tags,
+      data=data,
+      size=size,
+      suffix=suffix,
+      args=args)
+
+
+def tf_cuda_cc_test(name,
+                    srcs=[],
+                    deps=[],
+                    tags=[],
+                    data=[],
+                    size="medium",
+                    linkstatic=0,
+                    args=[],
+                    linkopts=[]):
+  tf_cc_test(
+      name=name,
+      srcs=srcs,
+      deps=deps,
+      tags=tags + ["manual"],
+      data=data,
+      size=size,
+      linkstatic=linkstatic,
+      linkopts=linkopts,
+      args=args)
+  tf_cc_test(
+      name=name,
+      srcs=srcs,
+      suffix="_gpu",
+      deps=deps + if_cuda(["//tensorflow/core:gpu_runtime"]),
+      linkstatic=if_cuda(1, 0),
+      tags=tags + tf_cuda_tests_tags(),
+      data=data,
+      size=size,
+      linkopts=linkopts,
+      args=args)
+
 
 # Create a cc_test for each of the tensorflow tests listed in "tests"
-def tf_cc_tests(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
-                args=None, linkopts=[]):
+def tf_cc_tests(srcs,
+                deps,
+                name="",
+                linkstatic=0,
+                tags=[],
+                size="medium",
+                args=None,
+                linkopts=[]):
   for src in srcs:
     tf_cc_test(
         name=src_to_test_name(src),
@@ -391,17 +468,35 @@ def tf_cc_tests(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
         args=args,
         linkopts=linkopts)
 
-def tf_cc_test_mkl(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
-                    args=None):
+
+def tf_cc_test_mkl(srcs,
+                   deps,
+                   name="",
+                   linkstatic=0,
+                   tags=[],
+                   size="medium",
+                   args=None):
   if_mkl(tf_cc_tests(srcs, deps, linkstatic, tags=tags, size=size, args=args))
 
-def tf_cc_tests_gpu(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
+
+def tf_cc_tests_gpu(srcs,
+                    deps,
+                    name="",
+                    linkstatic=0,
+                    tags=[],
+                    size="medium",
                     args=None):
   tf_cc_tests(srcs, deps, linkstatic, tags=tags, size=size, args=args)
 
 
-def tf_cuda_cc_tests(srcs, deps, name='', tags=[], size="medium", linkstatic=0,
-                     args=None, linkopts=[]):
+def tf_cuda_cc_tests(srcs,
+                     deps,
+                     name="",
+                     tags=[],
+                     size="medium",
+                     linkstatic=0,
+                     args=None,
+                     linkopts=[]):
   for src in srcs:
     tf_cuda_cc_test(
         name=src_to_test_name(src),
@@ -413,48 +508,52 @@ def tf_cuda_cc_tests(srcs, deps, name='', tags=[], size="medium", linkstatic=0,
         args=args,
         linkopts=linkopts)
 
+
 def _cuda_copts():
-    """Gets the appropriate set of copts for (maybe) CUDA compilation.
+  """Gets the appropriate set of copts for (maybe) CUDA compilation.
 
     If we're doing CUDA compilation, returns copts for our particular CUDA
     compiler.  If we're not doing CUDA compilation, returns an empty list.
 
     """
-    return cuda_default_copts() + select({
-        "//conditions:default": [],
-        "@local_config_cuda//cuda:using_nvcc": (
-            [
-                "-nvcc_options=relaxed-constexpr",
-                "-nvcc_options=ftz=true",
-            ]
-        ),
-        "@local_config_cuda//cuda:using_clang": (
-            [
-                "-fcuda-flush-denormals-to-zero",
-            ]
-        ),
-    })
+  return cuda_default_copts() + select({
+      "//conditions:default": [],
+      "@local_config_cuda//cuda:using_nvcc": ([
+          "-nvcc_options=relaxed-constexpr",
+          "-nvcc_options=ftz=true",
+      ]),
+      "@local_config_cuda//cuda:using_clang": ([
+          "-fcuda-flush-denormals-to-zero",
+      ]),
+  })
+
 
 # Build defs for TensorFlow kernels
 
+
 # When this target is built using --config=cuda, a cc_library is built
 # that passes -DGOOGLE_CUDA=1 and '-x cuda', linking in additional
 # libraries needed by GPU kernels.
-def tf_gpu_kernel_library(srcs, copts=[], cuda_copts=[], deps=[], hdrs=[],
+def tf_gpu_kernel_library(srcs,
+                          copts=[],
+                          cuda_copts=[],
+                          deps=[],
+                          hdrs=[],
                           **kwargs):
   copts = copts + _cuda_copts() + if_cuda(cuda_copts) + tf_copts()
 
   native.cc_library(
-      srcs = srcs,
-      hdrs = hdrs,
-      copts = copts,
-      deps = deps + if_cuda([
+      srcs=srcs,
+      hdrs=hdrs,
+      copts=copts,
+      deps=deps + if_cuda([
           "//tensorflow/core:cuda",
           "//tensorflow/core:gpu_lib",
       ]),
       alwayslink=1,
       **kwargs)
 
+
 def tf_cuda_library(deps=None, cuda_deps=None, copts=None, **kwargs):
   """Generate a cc_library with a conditional set of CUDA dependencies.
 
@@ -479,15 +578,23 @@ def tf_cuda_library(deps=None, cuda_deps=None, copts=None, **kwargs):
     copts = []
 
   native.cc_library(
-      deps = deps + if_cuda(cuda_deps + [
+      deps=deps + if_cuda(cuda_deps + [
           "//tensorflow/core:cuda",
           "@local_config_cuda//cuda:cuda_headers"
       ]),
-      copts = copts + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]),
+      copts=copts + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]),
       **kwargs)
 
-def tf_kernel_library(name, prefix=None, srcs=None, gpu_srcs=None, hdrs=None,
-                      deps=None, alwayslink=1, copts=tf_copts(), **kwargs):
+
+def tf_kernel_library(name,
+                      prefix=None,
+                      srcs=None,
+                      gpu_srcs=None,
+                      hdrs=None,
+                      deps=None,
+                      alwayslink=1,
+                      copts=tf_copts(),
+                      **kwargs):
   """A rule to build a TensorFlow OpKernel.
 
   May either specify srcs/hdrs or prefix.  Similar to tf_cuda_library,
@@ -517,38 +624,59 @@ def tf_kernel_library(name, prefix=None, srcs=None, gpu_srcs=None, hdrs=None,
     deps = []
 
   if prefix:
-    if native.glob([prefix + "*.cu.cc"], exclude = ["*test*"]):
+    if native.glob([prefix + "*.cu.cc"], exclude=["*test*"]):
       if not gpu_srcs:
         gpu_srcs = []
-      gpu_srcs = gpu_srcs + native.glob([prefix + "*.cu.cc", prefix + "*.h"],
-                                        exclude = [prefix + "*test*"])
-    srcs = srcs + native.glob([prefix + "*.cc"],
-                              exclude = [prefix + "*test*", prefix + "*.cu.cc"])
-    hdrs = hdrs + native.glob([prefix + "*.h"], exclude = [prefix + "*test*",
-                                                           prefix + "*.cu.h"])
+      gpu_srcs = gpu_srcs + native.glob(
+          [prefix + "*.cu.cc", prefix + "*.h"], exclude=[prefix + "*test*"])
+    srcs = srcs + native.glob(
+        [prefix + "*.cc"], exclude=[prefix + "*test*", prefix + "*.cu.cc"])
+    hdrs = hdrs + native.glob(
+        [prefix + "*.h"], exclude=[prefix + "*test*", prefix + "*.cu.h"])
 
   cuda_deps = ["//tensorflow/core:gpu_lib"]
   if gpu_srcs:
     for gpu_src in gpu_srcs:
       if gpu_src.endswith(".cc") and not gpu_src.endswith(".cu.cc"):
-        fail("{} not allowed in gpu_srcs. .cc sources must end with .cu.cc".format(gpu_src))
+        fail("{} not allowed in gpu_srcs. .cc sources must end with .cu.cc".
+             format(gpu_src))
     tf_gpu_kernel_library(
-        name = name + "_gpu",
-        srcs = gpu_srcs,
-        deps = deps,
-        **kwargs)
+        name=name + "_gpu", srcs=gpu_srcs, deps=deps, **kwargs)
     cuda_deps.extend([":" + name + "_gpu"])
   tf_cuda_library(
-      name = name,
-      srcs = srcs,
-      hdrs = hdrs,
-      copts = copts,
-      cuda_deps = cuda_deps,
-      linkstatic = 1,   # Needed since alwayslink is broken in bazel b/27630669
-      alwayslink = alwayslink,
-      deps = deps,
+      name=name,
+      srcs=srcs,
+      hdrs=hdrs,
+      copts=copts,
+      cuda_deps=cuda_deps,
+      linkstatic=1,  # Needed since alwayslink is broken in bazel b/27630669
+      alwayslink=alwayslink,
+      deps=deps,
       **kwargs)
 
+
+def tf_mkl_kernel_library(name,
+                          prefix=None,
+                          srcs=None,
+                          gpu_srcs=None,
+                          hdrs=None,
+                          deps=None,
+                          alwayslink=1,
+                          copts=tf_copts(),
+                          **kwargs):
+  if_mkl(
+      tf_kernel_library(
+          name,
+          prefix=prefix,
+          srcs=srcs,
+          gpu_srcs=gpu_srcs,
+          hdrs=hdrs,
+          deps=deps,
+          alwayslink=alwayslink,
+          copts=copts,
+          **kwargs))
+
+
 # Bazel rules for building swig files.
 def _py_wrap_cc_impl(ctx):
   srcs = ctx.files.srcs
@@ -564,59 +692,61 @@ def _py_wrap_cc_impl(ctx):
   inputs += ctx.files.toolchain_deps
   swig_include_dirs = set(_get_repository_roots(ctx, inputs))
   swig_include_dirs += sorted([f.dirname for f in ctx.files._swiglib])
-  args = ["-c++",
-          "-python",
-          "-module", module_name,
-          "-o", ctx.outputs.cc_out.path,
-          "-outdir", ctx.outputs.py_out.dirname]
+  args = [
+      "-c++", "-python", "-module", module_name, "-o", ctx.outputs.cc_out.path,
+      "-outdir", ctx.outputs.py_out.dirname
+  ]
   args += ["-l" + f.path for f in ctx.files.swig_includes]
   args += ["-I" + i for i in swig_include_dirs]
   args += [src.path]
-  outputs = [ctx.outputs.cc_out,
-             ctx.outputs.py_out]
-  ctx.action(executable=ctx.executable._swig,
-             arguments=args,
-             inputs=list(inputs),
-             outputs=outputs,
-             mnemonic="PythonSwig",
-             progress_message="SWIGing " + src.path)
+  outputs = [ctx.outputs.cc_out, ctx.outputs.py_out]
+  ctx.action(
+      executable=ctx.executable._swig,
+      arguments=args,
+      inputs=list(inputs),
+      outputs=outputs,
+      mnemonic="PythonSwig",
+      progress_message="SWIGing " + src.path)
   return struct(files=set(outputs))
 
+
 _py_wrap_cc = rule(
-    attrs = {
-        "srcs": attr.label_list(
-            mandatory = True,
-            allow_files = True,
-        ),
-        "swig_includes": attr.label_list(
-            cfg = "data",
-            allow_files = True,
-        ),
-        "deps": attr.label_list(
-            allow_files = True,
-            providers = ["cc"],
-        ),
-        "toolchain_deps": attr.label_list(
-            allow_files = True,
-        ),
-        "module_name": attr.string(mandatory = True),
-        "py_module_name": attr.string(mandatory = True),
-        "_swig": attr.label(
-            default = Label("@swig//:swig"),
-            executable = True,
-            cfg = "host",
-        ),
-        "_swiglib": attr.label(
-            default = Label("@swig//:templates"),
-            allow_files = True,
-        ),
+    attrs={
+        "srcs":
+            attr.label_list(
+                mandatory=True,
+                allow_files=True,),
+        "swig_includes":
+            attr.label_list(
+                cfg="data",
+                allow_files=True,),
+        "deps":
+            attr.label_list(
+                allow_files=True,
+                providers=["cc"],),
+        "toolchain_deps":
+            attr.label_list(
+                allow_files=True,),
+        "module_name":
+            attr.string(mandatory=True),
+        "py_module_name":
+            attr.string(mandatory=True),
+        "_swig":
+            attr.label(
+                default=Label("@swig//:swig"),
+                executable=True,
+                cfg="host",),
+        "_swiglib":
+            attr.label(
+                default=Label("@swig//:templates"),
+                allow_files=True,),
     },
-    outputs = {
+    outputs={
         "cc_out": "%{module_name}.cc",
         "py_out": "%{py_module_name}.py",
     },
-    implementation = _py_wrap_cc_impl,
-)
+    implementation=_py_wrap_cc_impl,)
+
 
 def _get_repository_roots(ctx, files):
   """Returns abnormal root directories under which files reside.
@@ -647,6 +777,7 @@ def _get_repository_roots(ctx, files):
       result[root] -= 1
   return [k for v, k in sorted([(v, k) for k, v in result.items()])]
 
+
 # Bazel rule for collecting the header files that a target depends on.
 def _transitive_hdrs_impl(ctx):
   outputs = set()
@@ -654,30 +785,27 @@ def _transitive_hdrs_impl(ctx):
     outputs += dep.cc.transitive_headers
   return struct(files=outputs)
 
+
 _transitive_hdrs = rule(
-    attrs = {
+    attrs={
         "deps": attr.label_list(
-            allow_files = True,
-            providers = ["cc"],
-        ),
+            allow_files=True,
+            providers=["cc"],),
     },
-    implementation = _transitive_hdrs_impl,
-)
+    implementation=_transitive_hdrs_impl,)
+
 
 def transitive_hdrs(name, deps=[], **kwargs):
-  _transitive_hdrs(name=name + "_gather",
-                   deps=deps)
-  native.filegroup(name=name,
-                   srcs=[":" + name + "_gather"])
+  _transitive_hdrs(name=name + "_gather", deps=deps)
+  native.filegroup(name=name, srcs=[":" + name + "_gather"])
+
 
 # Create a header only library that includes all the headers exported by
 # the libraries in deps.
 def cc_header_only_library(name, deps=[], **kwargs):
-  _transitive_hdrs(name=name + "_gather",
-                   deps=deps)
-  native.cc_library(name=name,
-                    hdrs=[":" + name + "_gather"],
-                    **kwargs)
+  _transitive_hdrs(name=name + "_gather", deps=deps)
+  native.cc_library(name=name, hdrs=[":" + name + "_gather"], **kwargs)
+
 
 def tf_custom_op_library_additional_deps():
   return [
@@ -686,6 +814,7 @@ def tf_custom_op_library_additional_deps():
       "//tensorflow/core:framework_headers_lib",
   ]
 
+
 # Traverse the dependency graph along the "deps" attribute of the
 # target and return a struct with one field called 'tf_collected_deps'.
 # tf_collected_deps will be the union of the deps of the current target
@@ -699,14 +828,16 @@ def _collect_deps_aspect_impl(target, ctx):
         alldeps = alldeps | dep.tf_collected_deps
   return struct(tf_collected_deps=alldeps)
 
+
 collect_deps_aspect = aspect(
-    implementation=_collect_deps_aspect_impl,
-    attr_aspects=["deps"])
+    implementation=_collect_deps_aspect_impl, attr_aspects=["deps"])
+
 
 def _dep_label(dep):
   label = dep.label
   return label.package + ":" + label.name
 
+
 # This rule checks that the transitive dependencies of targets listed
 # in the 'deps' attribute don't depend on the targets listed in
 # the 'disallowed_deps' attribute.
@@ -718,23 +849,23 @@ def _check_deps_impl(ctx):
     for dep in input_dep.tf_collected_deps:
       for disallowed_dep in disallowed_deps:
         if dep == disallowed_dep.label:
-          fail(_dep_label(input_dep) + " cannot depend on " +
-               _dep_label(disallowed_dep))
+          fail(
+              _dep_label(input_dep) + " cannot depend on " + _dep_label(
+                  disallowed_dep))
   return struct()
 
+
 check_deps = rule(
     _check_deps_impl,
-    attrs = {
-        "deps": attr.label_list(
-            aspects=[collect_deps_aspect],
-            mandatory = True,
-            allow_files = True
-        ),
-        "disallowed_deps": attr.label_list(
-            mandatory = True,
-            allow_files = True
-        )},
-)
+    attrs={
+        "deps":
+            attr.label_list(
+                aspects=[collect_deps_aspect], mandatory=True,
+                allow_files=True),
+        "disallowed_deps":
+            attr.label_list(mandatory=True, allow_files=True)
+    },)
+
 
 # Helper to build a dynamic library (.so) from the sources containing
 # implementations of custom ops and kernels.
@@ -747,33 +878,42 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
   if gpu_srcs:
     basename = name.split(".")[0]
     native.cc_library(
-        name = basename + "_gpu",
-        srcs = gpu_srcs,
-        copts = _cuda_copts(),
-        deps = deps + if_cuda(cuda_deps))
+        name=basename + "_gpu",
+        srcs=gpu_srcs,
+        copts=_cuda_copts(),
+        deps=deps + if_cuda(cuda_deps))
     cuda_deps.extend([":" + basename + "_gpu"])
 
-  check_deps(name=name+"_check_deps",
-             deps=deps + if_cuda(cuda_deps),
-             disallowed_deps=["//tensorflow/core:framework",
-                              "//tensorflow/core:lib"])
-
-  native.cc_binary(name=name,
-                   srcs=srcs,
-                   deps=deps + if_cuda(cuda_deps),
-                   data=[name + "_check_deps"],
-                   copts=tf_copts(),
-                   linkshared=1,
-                   linkopts = select({
-                       "//conditions:default": [
-                           "-lm",
-                       ],
-                       "//tensorflow:darwin": [],
-                   }),
-  )
-
-def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
-                            srcs_version="PY2AND3", visibility=None, deps=[]):
+  check_deps(
+      name=name + "_check_deps",
+      deps=deps + if_cuda(cuda_deps),
+      disallowed_deps=[
+          "//tensorflow/core:framework",
+          "//tensorflow/core:lib"
+      ])
+
+  native.cc_binary(
+      name=name,
+      srcs=srcs,
+      deps=deps + if_cuda(cuda_deps),
+      data=[name + "_check_deps"],
+      copts=tf_copts(),
+      linkshared=1,
+      linkopts=select({
+          "//conditions:default": [
+              "-lm",
+          ],
+          "//tensorflow:darwin": [],
+      }),)
+
+
+def tf_custom_op_py_library(name,
+                            srcs=[],
+                            dso=[],
+                            kernels=[],
+                            srcs_version="PY2AND3",
+                            visibility=None,
+                            deps=[]):
   kernels = kernels  # unused argument
   native.py_library(
       name=name,
@@ -781,86 +921,103 @@ def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
       srcs=srcs,
       srcs_version=srcs_version,
       visibility=visibility,
-      deps=deps,
-  )
+      deps=deps,)
+
 
 def tf_extension_linkopts():
   return []  # No extension link opts
 
+
 def tf_extension_copts():
   return []  # No extension c opts
 
-def tf_py_wrap_cc(name, srcs, swig_includes=[], deps=[], copts=[], **kwargs):
+
+def tf_py_wrap_cc(name,
+                             srcs,
+                             swig_includes=[],
+                             deps=[],
+                             copts=[],
+                             **kwargs):
   module_name = name.split("/")[-1]
   # Convert a rule name such as foo/bar/baz to foo/bar/_baz.so
   # and use that as the name for the rule producing the .so file.
   cc_library_name = "/".join(name.split("/")[:-1] + ["_" + module_name + ".so"])
-  cc_library_pyd_name = "/".join(name.split("/")[:-1] + ["_" + module_name + ".pyd"])
+  cc_library_pyd_name = "/".join(
+      name.split("/")[:-1] + ["_" + module_name + ".pyd"])
   extra_deps = []
-  _py_wrap_cc(name=name + "_py_wrap",
-              srcs=srcs,
-              swig_includes=swig_includes,
-              deps=deps + extra_deps,
-              toolchain_deps=["//tools/defaults:crosstool"],
-              module_name=module_name,
-              py_module_name=name)
+  _py_wrap_cc(
+      name=name + "_py_wrap",
+      srcs=srcs,
+      swig_includes=swig_includes,
+      deps=deps + extra_deps,
+      toolchain_deps=["//tools/defaults:crosstool"],
+      module_name=module_name,
+      py_module_name=name)
   extra_linkopts = select({
       "@local_config_cuda//cuda:darwin": [
           "-Wl,-exported_symbols_list",
           "//tensorflow:tf_exported_symbols.lds"
       ],
-      "//tensorflow:windows": [
-      ],
+      str(Label("//tensorflow:windows")): [],
       "//conditions:default": [
           "-Wl,--version-script",
           "//tensorflow:tf_version_script.lds"
-      ]})
+      ]
+  })
   extra_deps += select({
       "@local_config_cuda//cuda:darwin": [
-        "//tensorflow:tf_exported_symbols.lds"
-      ],
-      "//tensorflow:windows": [
+          "//tensorflow:tf_exported_symbols.lds"
       ],
+      "//tensorflow:windows": [],
       "//conditions:default": [
-        "//tensorflow:tf_version_script.lds"
+          "//tensorflow:tf_version_script.lds"
       ]
   })
 
   native.cc_binary(
       name=cc_library_name,
       srcs=[module_name + ".cc"],
-      copts=(copts + ["-Wno-self-assign",
-                      "-Wno-sign-compare",
-                      "-Wno-write-strings"]
-             + tf_extension_copts()),
+      copts=(copts + [
+          "-Wno-self-assign", "-Wno-sign-compare", "-Wno-write-strings"
+      ] + tf_extension_copts()),
       linkopts=tf_extension_linkopts() + extra_linkopts,
       linkstatic=1,
       linkshared=1,
       deps=deps + extra_deps)
   native.genrule(
-      name = "gen_" + cc_library_pyd_name,
-      srcs = [":" + cc_library_name],
-      outs = [cc_library_pyd_name],
-      cmd = "cp $< $@",
-  )
-  native.py_library(name=name,
-                    srcs=[":" + name + ".py"],
-                    srcs_version="PY2AND3",
-                    data=select({
-                      "//tensorflow:windows": [":" + cc_library_pyd_name],
-                      "//conditions:default": [":" + cc_library_name],
-                    }))
+      name="gen_" + cc_library_pyd_name,
+      srcs=[":" + cc_library_name],
+      outs=[cc_library_pyd_name],
+      cmd="cp $< $@",)
+  native.py_library(
+      name=name,
+      srcs=[":" + name + ".py"],
+      srcs_version="PY2AND3",
+      data=select({
+          "//tensorflow:windows": [":" + cc_library_pyd_name],
+          "//conditions:default": [":" + cc_library_name],
+      }))
+
 
 def py_test(deps=[], **kwargs):
   native.py_test(
       deps=select({
-          "//conditions:default" : deps,
-          "//tensorflow:no_tensorflow_py_deps" : []
+          "//conditions:default": deps,
+          "//tensorflow:no_tensorflow_py_deps": []
       }),
       **kwargs)
 
-def tf_py_test(name, srcs, size="medium", data=[], main=None, args=[],
-               tags=[], shard_count=1, additional_deps=[], flaky=0,
+
+def tf_py_test(name,
+               srcs,
+               size="medium",
+               data=[],
+               main=None,
+               args=[],
+               tags=[],
+               shard_count=1,
+               additional_deps=[],
+               flaky=0,
                xla_enabled=False):
   if xla_enabled:
     additional_deps += tf_additional_xla_deps_py()
@@ -875,46 +1032,67 @@ def tf_py_test(name, srcs, size="medium", data=[], main=None, args=[],
       shard_count=shard_count,
       data=data,
       deps=select({
-          "//conditions:default" : [
-            "//tensorflow/python:extra_py_tests_deps",
-            "//tensorflow/python:gradient_checker",
+          "//conditions:default": [
+              "//tensorflow/python:extra_py_tests_deps",
+              "//tensorflow/python:gradient_checker",
           ] + additional_deps,
-          "//tensorflow:no_tensorflow_py_deps" : []
+          "//tensorflow:no_tensorflow_py_deps": []
       }),
       flaky=flaky,
       srcs_version="PY2AND3")
 
-def cuda_py_test(name, srcs, size="medium", data=[], main=None, args=[],
-                 shard_count=1, additional_deps=[], tags=[], flaky=0,
+
+def cuda_py_test(name,
+                 srcs,
+                 size="medium",
+                 data=[],
+                 main=None,
+                 args=[],
+                 shard_count=1,
+                 additional_deps=[],
+                 tags=[],
+                 flaky=0,
                  xla_enabled=False):
   test_tags = tags + tf_cuda_tests_tags()
-  tf_py_test(name=name,
-             size=size,
-             srcs=srcs,
-             data=data,
-             main=main,
-             args=args,
-             tags=test_tags,
-             shard_count=shard_count,
-             additional_deps=additional_deps,
-             flaky=flaky,
-             xla_enabled=xla_enabled)
-
-def sycl_py_test(name, srcs, size="medium", data=[], main=None, args=[],
-                 shard_count=1, additional_deps=[], tags=[], flaky=0,
+  tf_py_test(
+      name=name,
+      size=size,
+      srcs=srcs,
+      data=data,
+      main=main,
+      args=args,
+      tags=test_tags,
+      shard_count=shard_count,
+      additional_deps=additional_deps,
+      flaky=flaky,
+      xla_enabled=xla_enabled)
+
+
+def sycl_py_test(name,
+                 srcs,
+                 size="medium",
+                 data=[],
+                 main=None,
+                 args=[],
+                 shard_count=1,
+                 additional_deps=[],
+                 tags=[],
+                 flaky=0,
                  xla_enabled=False):
- test_tags = tags + tf_sycl_tests_tags()
- tf_py_test(name=name,
-            size=size,
-            srcs=srcs,
-            data=data,
-            main=main,
-            args=args,
-            tags=test_tags,
-            shard_count=shard_count,
-            additional_deps=additional_deps,
-            flaky=flaky,
-            xla_enabled=xla_enabled)
+  test_tags = tags + tf_sycl_tests_tags()
+  tf_py_test(
+      name=name,
+      size=size,
+      srcs=srcs,
+      data=data,
+      main=main,
+      args=args,
+      tags=test_tags,
+      shard_count=shard_count,
+      additional_deps=additional_deps,
+      flaky=flaky,
+      xla_enabled=xla_enabled)
+
 
 def py_tests(name,
              srcs,
@@ -929,22 +1107,39 @@ def py_tests(name,
     test_name = src.split("/")[-1].split(".")[0]
     if prefix:
       test_name = "%s_%s" % (prefix, test_name)
-    tf_py_test(name=test_name,
-               size=size,
-               srcs=[src],
-               main=src,
-               tags=tags,
-               shard_count=shard_count,
-               data=data,
-               additional_deps=additional_deps,
-               xla_enabled=xla_enabled)
-
-def cuda_py_tests(name, srcs, size="medium", additional_deps=[], data=[],
-                  shard_count=1, tags=[], prefix="", xla_enabled=False):
+    tf_py_test(
+        name=test_name,
+        size=size,
+        srcs=[src],
+        main=src,
+        tags=tags,
+        shard_count=shard_count,
+        data=data,
+        additional_deps=additional_deps,
+        xla_enabled=xla_enabled)
+
+
+def cuda_py_tests(name,
+                  srcs,
+                  size="medium",
+                  additional_deps=[],
+                  data=[],
+                  shard_count=1,
+                  tags=[],
+                  prefix="",
+                  xla_enabled=False):
   test_tags = tags + tf_cuda_tests_tags()
-  py_tests(name=name, size=size, srcs=srcs, additional_deps=additional_deps,
-           data=data, tags=test_tags, shard_count=shard_count,prefix=prefix,
-           xla_enabled=xla_enabled)
+  py_tests(
+      name=name,
+      size=size,
+      srcs=srcs,
+      additional_deps=additional_deps,
+      data=data,
+      tags=test_tags,
+      shard_count=shard_count,
+      prefix=prefix,
+      xla_enabled=xla_enabled)
+
 
 # Creates a genrule named <name> for running tools/proto_text's generator to
 # make the proto_text functions, for the protos passed in <srcs>.
@@ -952,40 +1147,46 @@ def cuda_py_tests(name, srcs, size="medium", additional_deps=[], data=[],
 # Return a struct with fields (hdrs, srcs) containing the names of the
 # generated files.
 def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs):
-  out_hdrs = ([p.replace(".proto", ".pb_text.h") for p in srcs] +
-              [p.replace(".proto", ".pb_text-impl.h") for p in srcs])
+  out_hdrs = (
+      [p.replace(".proto", ".pb_text.h")
+       for p in srcs] + [p.replace(".proto", ".pb_text-impl.h") for p in srcs])
   out_srcs = [p.replace(".proto", ".pb_text.cc") for p in srcs]
   native.genrule(
-        name = name,
-        srcs = srcs + ["//tensorflow/tools/proto_text:placeholder.txt"],
-        outs = out_hdrs + out_srcs,
-        cmd = "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) " +
-              "$(@D) " + srcs_relative_dir + " $(SRCS)",
-        tools = ["//tensorflow/tools/proto_text:gen_proto_text_functions"],
-    )
+      name=name,
+      srcs=srcs + ["//tensorflow/tools/proto_text:placeholder.txt"],
+      outs=out_hdrs + out_srcs,
+      cmd=
+      "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) "
+      + "$(@D) " + srcs_relative_dir + " $(SRCS)",
+      tools=[
+          "//tensorflow/tools/proto_text:gen_proto_text_functions"
+      ],)
   return struct(hdrs=out_hdrs, srcs=out_srcs)
 
+
 def tf_genrule_cmd_append_to_srcs(to_append):
-    return ("cat $(SRCS) > $(@) && " +
-            "echo >> $(@) && " +
-            "echo " + to_append + " >> $(@)")
+  return ("cat $(SRCS) > $(@) && " + "echo >> $(@) && " + "echo " + to_append +
+          " >> $(@)")
 
 
 def tf_version_info_genrule():
   native.genrule(
-      name = "version_info_gen",
-      srcs = [
+      name="version_info_gen",
+      srcs=[
           "//tensorflow/tools/git:gen/spec.json",
           "//tensorflow/tools/git:gen/head",
           "//tensorflow/tools/git:gen/branch_ref",
       ],
-      outs = ["util/version_info.cc"],
-      cmd = "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
-      local = 1,
-      tools = ["//tensorflow/tools/git:gen_git_source.py"],
-  )
-
-def cc_library_with_android_deps(deps, android_deps=[],
-                                common_deps=[], **kwargs):
+      outs=["util/version_info.cc"],
+      cmd=
+      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      local=1,
+      tools=["//tensorflow/tools/git:gen_git_source.py"],)
+
+
+def cc_library_with_android_deps(deps,
+                                 android_deps=[],
+                                 common_deps=[],
+                                 **kwargs):
   deps = if_not_android(deps) + if_android(android_deps) + common_deps
   native.cc_library(deps=deps, **kwargs)
diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android
index 4d46c672ab..c6679f7882 100644
--- a/tensorflow/tools/ci_build/Dockerfile.android
+++ b/tensorflow/tools/ci_build/Dockerfile.android
@@ -29,7 +29,8 @@ RUN mkdir -p ${ANDROID_DEV_HOME}
 ENV ANDROID_SDK_FILENAME tools_r25.2.5-linux.zip
 ENV ANDROID_SDK_URL https://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
 ENV ANDROID_API_LEVEL 23
-ENV ANDROID_BUILD_TOOLS_VERSION 25.0.1
+# Build Tools Version liable to change.
+ENV ANDROID_BUILD_TOOLS_VERSION 25.0.2
 ENV ANDROID_SDK_HOME ${ANDROID_DEV_HOME}/sdk
 ENV PATH ${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools
 RUN cd ${ANDROID_DEV_HOME} && \
diff --git a/tensorflow/tools/ci_build/builds/pip.sh b/tensorflow/tools/ci_build/builds/pip.sh
index 751f7de9a1..e0a1391d6e 100755
--- a/tensorflow/tools/ci_build/builds/pip.sh
+++ b/tensorflow/tools/ci_build/builds/pip.sh
@@ -269,7 +269,7 @@ pip install --upgrade pip==8.1.2
 
 # Force tensorflow reinstallation. Otherwise it may not get installed from
 # last build if it had the same version number as previous build.
-PIP_FLAGS="--upgrade --force-reinstall --no-deps"
+PIP_FLAGS="--upgrade --force-reinstall"
 pip install -v ${PIP_FLAGS} ${WHL_PATH} || \
     die "pip install (forcing to reinstall tensorflow) FAILED"
 echo "Successfully installed pip package ${WHL_PATH}"
diff --git a/tensorflow/tools/ci_build/windows/bazel/common_env.sh b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
index 662de93c16..b993747521 100644
--- a/tensorflow/tools/ci_build/windows/bazel/common_env.sh
+++ b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
@@ -54,4 +54,4 @@ export PATH="/c/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/extras/CUPT
 export PATH="/c/tools/cuda/bin:$PATH"
 
 # Set the common build options on Windows
-export BUILD_OPTS='--cpu=x64_windows_msvc --host_cpu=x64_windows_msvc --copt=/w --verbose_failures --experimental_ui'
+export BUILD_OPTS='--cpu=x64_windows_msvc --host_cpu=x64_windows_msvc --copt=-w --host_copt=-w --verbose_failures --experimental_ui'
diff --git a/tensorflow/tools/ci_build/windows/cpu/bazel/common_env.sh b/tensorflow/tools/ci_build/windows/cpu/bazel/common_env.sh
deleted file mode 100644
index 6e7e555065..0000000000
--- a/tensorflow/tools/ci_build/windows/cpu/bazel/common_env.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-#
-# This script assumes the standard setup on tensorflow Jenkins windows machines.
-# It is NOT guaranteed to work on any other machine. Use at your own risk!
-#
-# REQUIREMENTS:
-# * All installed in standard locations:
-#   - JDK8, and JAVA_HOME set.
-#   - Microsoft Visual Studio 2015 Community Edition
-#   - Msys2
-#   - Anaconda3
-# * Bazel windows executable copied as "bazel.exe" and included in PATH.
-
-# All commands shall pass, and all should be visible.
-set -x
-set -e
-
-# Use a temporary directory with a short name.
-export TMPDIR="C:/tmp"
-mkdir -p "$TMPDIR"
-
-# Set bash path
-export BAZEL_SH="C:/tools/msys64/usr/bin/bash"
-
-# Set Python path for ./configure
-export PYTHON_BIN_PATH="C:/Program Files/Anaconda3/python"
-
-# Set Python path for cc_configure.bzl
-export BAZEL_PYTHON="C:/Program Files/Anaconda3/python"
-
-# Set Visual Studio path
-export BAZEL_VS="C:/Program Files (x86)/Microsoft Visual Studio 14.0"
-
-# Add python into PATH, it's needed because gen_git_source.py uses
-# '/usr/bin/env python' as a shebang
-export PATH="/c/Program Files/Anaconda3:$PATH"
diff --git a/tensorflow/tools/dist_test/Dockerfile b/tensorflow/tools/dist_test/Dockerfile
index 65d7e1717e..83bbeeca8a 100644
--- a/tensorflow/tools/dist_test/Dockerfile
+++ b/tensorflow/tools/dist_test/Dockerfile
@@ -23,7 +23,7 @@ FROM ubuntu:16.04
 MAINTAINER Shanqing Cai <cais@google.com>
 
 RUN apt-get update
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get install -y \
     curl \
     python \
     python-numpy \
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index dd18b61017..7bf7fd5719 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -82,7 +82,7 @@ RUN mkdir /bazel && \
 
 RUN git clone https://github.com/tensorflow/tensorflow.git && \
     cd tensorflow && \
-    git checkout r1.0
+    git checkout r1.1
 WORKDIR /tensorflow
 
 # TODO(craigcitro): Don't install the pip package, since it makes it
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 8ead2f15ae..769731974a 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -82,7 +82,7 @@ RUN mkdir /bazel && \
 
 RUN git clone https://github.com/tensorflow/tensorflow.git && \
     cd tensorflow && \
-    git checkout r1.0
+    git checkout r1.1
 WORKDIR /tensorflow
 
 # Configure the build for our CUDA configuration.
diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index 6597adb68a..06ae78ef5d 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -103,8 +103,8 @@ output layers of the model are. The best source for these is the model training
 process, where for a classifier the inputs will be the nodes that receive the
 data from the training set, and the output will be the predictions. If you're
 unsure, the
-[summarize_graph](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/graph_transforms/summarize_graph.cc)
-can inspect the model and provide guesses about likely input and output nodes,
+[summarize_graph](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/graph_transforms/summarize_graph_main.cc)
+tool can inspect the model and provide guesses about likely input and output nodes,
 as well as other information that's useful for debugging. Here's an example of
 how to use it on the [Inception V3
 graph](http://download.tensorflow.org/models/image/imagenet/inception-2015-12-05.tgz):
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 376eaedc75..f591e50ac9 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.0.1'
+_VERSION = '1.1.0-rc0'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
@@ -167,15 +167,12 @@ headers = (list(find_files('*.h', 'tensorflow/core')) +
            list(find_files('*', 'third_party/eigen3')) +
            list(find_files('*', 'external/eigen_archive')))
 
-tf_long_description = (
-    'Note: TensorFlow manylinux1 wheels do not conform to the '
-    'specification in PEP531.')
 
 setup(
     name=project_name,
     version=_VERSION.replace('-', ''),
     description='TensorFlow helps the tensors flow',
-    long_description=tf_long_description,
+    long_description='',
     url='http://tensorflow.org/',
     author='Google Inc.',
     author_email='opensource@google.com',
diff --git a/tensorflow/tools/test/check_futures_test.py b/tensorflow/tools/test/check_futures_test.py
index 32d65adb1f..36a61c0ecc 100644
--- a/tensorflow/tools/test/check_futures_test.py
+++ b/tensorflow/tools/test/check_futures_test.py
@@ -40,6 +40,7 @@ FUTURES_PATTERN_2 = re.compile(
 REQUIRED_FUTURES = frozenset(['absolute_import', 'division', 'print_function'])
 
 WHITELIST = [
+    'python/platform/control_imports.py',
     'tools/docker/jupyter_notebook_config.py',
 ]
 
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index b4578d6860..7bcdb1613d 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -1,9 +1,11 @@
 # TensorFlow external dependencies that can be loaded in WORKSPACE files.
 
-load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external")
+load("@io_bazel_rules_closure//closure/private:java_import_external.bzl",
+     "java_import_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
 load("//third_party/gpus:cuda_configure.bzl", "cuda_configure")
+
 load("//third_party/sycl:sycl_configure.bzl", "sycl_configure")
 
 
@@ -14,20 +16,23 @@ def _parse_bazel_version(bazel_version):
 
   # Split into (release, date) parts and only return the release
   # as a tuple of integers.
-  parts = version.split('-', 1)
+  parts = version.split("-", 1)
 
   # Turn "release" into a tuple of strings
   version_tuple = ()
-  for number in parts[0].split('.'):
+  for number in parts[0].split("."):
     version_tuple += (str(number),)
   return version_tuple
 
+
 # Check that a specific bazel version is being used.
 def check_version(bazel_version):
   if "bazel_version" not in dir(native):
-    fail("\nCurrent Bazel version is lower than 0.2.1, expected at least %s\n" % bazel_version)
+    fail("\nCurrent Bazel version is lower than 0.2.1, expected at least %s\n" %
+         bazel_version)
   elif not native.bazel_version:
-    print("\nCurrent Bazel is not a release version, cannot check for compatibility.")
+    print("\nCurrent Bazel is not a release version, cannot check for " +
+          "compatibility.")
     print("Make sure that you are running at least Bazel %s.\n" % bazel_version)
   else:
     current_bazel_version = _parse_bazel_version(native.bazel_version)
@@ -37,523 +42,529 @@ def check_version(bazel_version):
           native.bazel_version, bazel_version))
   pass
 
+
 def _repos_are_siblings():
   return Label("@foo//bar").workspace_root.startswith("../")
 
+
 # Temporary workaround to support including TensorFlow as a submodule until this
 # use-case is supported in the next Bazel release.
 def _temp_workaround_http_archive_impl(repo_ctx):
-   repo_ctx.template("BUILD", repo_ctx.attr.build_file,
-                     {
-                         "%prefix%" : ".." if _repos_are_siblings() else "external",
-                         "%ws%": repo_ctx.attr.repository
-                     }, False)
-   repo_ctx.download_and_extract(repo_ctx.attr.urls, "", repo_ctx.attr.sha256,
-                                 "", repo_ctx.attr.strip_prefix)
-   if repo_ctx.attr.patch_file != None:
-     _apply_patch(repo_ctx, repo_ctx.attr.patch_file)
+  repo_ctx.template("BUILD", repo_ctx.attr.build_file, {
+      "%prefix%": ".." if _repos_are_siblings() else "external",
+      "%ws%": repo_ctx.attr.repository
+  }, False)
+  repo_ctx.download_and_extract(repo_ctx.attr.urls, "", repo_ctx.attr.sha256,
+                                "", repo_ctx.attr.strip_prefix)
+  if repo_ctx.attr.patch_file != None:
+    _apply_patch(repo_ctx, repo_ctx.attr.patch_file)
+
 
 temp_workaround_http_archive = repository_rule(
-   implementation=_temp_workaround_http_archive_impl,
-   attrs = {
-      "build_file": attr.label(),
-      "repository": attr.string(),
-      "patch_file": attr.label(default = None),
-      "urls": attr.string_list(default = []),
-      "sha256": attr.string(default = ""),
-      "strip_prefix": attr.string(default = ""),
-   })
+    implementation=_temp_workaround_http_archive_impl,
+    attrs={
+        "build_file": attr.label(),
+        "repository": attr.string(),
+        "patch_file": attr.label(default=None),
+        "urls": attr.string_list(default=[]),
+        "sha256": attr.string(default=""),
+        "strip_prefix": attr.string(default=""),
+    })
+
 
 # Executes specified command with arguments and calls 'fail' if it exited with non-zero code
 def _execute_and_check_ret_code(repo_ctx, cmd_and_args):
   result = repo_ctx.execute(cmd_and_args)
   if result.return_code != 0:
-    fail(("Non-zero return code({1}) when executing '{0}':\n" +
-          "Stdout: {2}\n" +
-          "Stderr: {3}").format(" ".join(cmd_and_args),
-                                result.return_code, result.stdout, result.stderr))
+    fail(("Non-zero return code({1}) when executing '{0}':\n" + "Stdout: {2}\n"
+          + "Stderr: {3}").format(" ".join(cmd_and_args), result.return_code,
+                                  result.stdout, result.stderr))
+
 
 # Apply a patch_file to the repository root directory
 # Runs 'patch -p1'
 def _apply_patch(repo_ctx, patch_file):
-  _execute_and_check_ret_code(repo_ctx, ["patch", "-p1",
-                                         "-d", repo_ctx.path("."),
-                                         "-i", repo_ctx.path(patch_file)])
+  _execute_and_check_ret_code(repo_ctx, [
+      "patch", "-p1", "-d", repo_ctx.path("."), "-i", repo_ctx.path(patch_file)
+  ])
+
 
 # Download the repository and apply a patch to its root
 def _patched_http_archive_impl(repo_ctx):
-  repo_ctx.download_and_extract(repo_ctx.attr.urls,
-                                sha256 = repo_ctx.attr.sha256,
-                                stripPrefix = repo_ctx.attr.strip_prefix)
+  repo_ctx.download_and_extract(
+      repo_ctx.attr.urls,
+      sha256=repo_ctx.attr.sha256,
+      stripPrefix=repo_ctx.attr.strip_prefix)
   _apply_patch(repo_ctx, repo_ctx.attr.patch_file)
 
+
 patched_http_archive = repository_rule(
-    implementation = _patched_http_archive_impl,
-    attrs = {
-      "patch_file": attr.label(),
-      "build_file": attr.label(),
-      "repository": attr.string(),
-      "urls": attr.string_list(default = []),
-      "sha256": attr.string(default = ""),
-      "strip_prefix": attr.string(default = ""),
+    implementation=_patched_http_archive_impl,
+    attrs={
+        "patch_file": attr.label(),
+        "build_file": attr.label(),
+        "repository": attr.string(),
+        "urls": attr.string_list(default=[]),
+        "sha256": attr.string(default=""),
+        "strip_prefix": attr.string(default=""),
     })
 
+
 # If TensorFlow is linked as a submodule.
 # path_prefix and tf_repo_name are no longer used.
-def tf_workspace(path_prefix = "", tf_repo_name = ""):
+def tf_workspace(path_prefix="", tf_repo_name=""):
   # We must check the bazel version before trying to parse any other BUILD
   # files, in case the parsing of those build files depends on the bazel
   # version we require here.
   check_version("0.4.5")
-  cuda_configure(name = "local_config_cuda")
-  sycl_configure(name = "local_config_sycl")
+  cuda_configure(name="local_config_cuda")
+  sycl_configure(name="local_config_sycl")
   if path_prefix:
-    print("path_prefix was specified to tf_workspace but is no longer used and will be removed in the future.")
+    print(
+        "path_prefix was specified to tf_workspace but is no longer used and " +
+        "will be removed in the future."
+    )
   if tf_repo_name:
-    print("tf_repo_name was specified to tf_workspace but is no longer used and will be removed in the future.")
+    print(
+        "tf_repo_name was specified to tf_workspace but is no longer used " +
+        "and will be removed in the future."
+    )
 
   native.new_http_archive(
-      name = "eigen_archive",
-      urls = [
+      name="eigen_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
           "https://bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
       ],
-      sha256 = "a39834683eb5bdb9a7434f0ab3621d2cbc3b07e8002db6de101e45ec536723eb",
-      strip_prefix = "eigen-eigen-deff8b280204",
-      build_file = str(Label("//third_party:eigen.BUILD")),
-  )
+      sha256="a39834683eb5bdb9a7434f0ab3621d2cbc3b07e8002db6de101e45ec536723eb",
+      strip_prefix="eigen-eigen-deff8b280204",
+      build_file=str(Label("//third_party:eigen.BUILD")),)
 
   native.new_http_archive(
-      name = "libxsmm_archive",
-      urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/hfp/libxsmm/archive/1.7.1.tar.gz",
-          "https://github.com/hfp/libxsmm/archive/1.7.1.tar.gz",
+      name="libxsmm_archive",
+      urls=[
+          "http://bazel-mirror.storage.googleapis.com/github.com/hfp/libxsmm/archive/1.8.tar.gz",
+          "https://github.com/hfp/libxsmm/archive/1.8.tar.gz",
       ],
-      sha256 = "9d3f63ce3eed62f04e4036de6f2be2ce0ff07781ca571af6e0bf85b077edf17a",
-      strip_prefix = "libxsmm-1.7.1",
-      build_file = str(Label("//third_party:libxsmm.BUILD")),
-  )
+      sha256="0330201afb5525d0950ec861fec9dd75eb40a03845ebe03d2c635cf8bfc14fea",
+      strip_prefix="libxsmm-1.8",
+      build_file=str(Label("//third_party:libxsmm.BUILD")),)
 
   native.bind(
-      name = "xsmm_avx",
-      actual = "@libxsmm_archive//third_party:xsmm_avx",
-  )
+      name="xsmm_avx",
+      actual="@libxsmm_archive//third_party:xsmm_avx",)
+
+  native.new_http_archive(
+      name="ortools_archive",
+      urls=[
+          "http://bazel-mirror.storage.googleapis.com/github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
+          "https://github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
+      ],
+      sha256="932075525642b04ac6f1b50589f1df5cd72ec2f448b721fd32234cf183f0e755",
+      strip_prefix="or-tools-253f7955c6a1fd805408fba2e42ac6d45b312d15/src",
+      build_file=str(Label("//third_party:ortools.BUILD")),)
 
   native.http_archive(
-      name = "com_googlesource_code_re2",
-      urls = [
+      name="com_googlesource_code_re2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
           "https://github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
       ],
-      sha256 = "bd63550101e056427c9e7ff12a408c1c8b74e9803f393ca916b2926fc2c4906f",
-      strip_prefix = "re2-b94b7cd42e9f02673cd748c1ac1d16db4052514c",
-  )
+      sha256="bd63550101e056427c9e7ff12a408c1c8b74e9803f393ca916b2926fc2c4906f",
+      strip_prefix="re2-b94b7cd42e9f02673cd748c1ac1d16db4052514c",)
 
   native.http_archive(
-      name = "gemmlowp",
-      urls = [
+      name="gemmlowp",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
           "https://github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
       ],
-      sha256 = "75d40ea8e68b0d1644f052fffe8f14a410b2a73d40ccb859a95c0578d194ec26",
-      strip_prefix = "gemmlowp-a6f29d8ac48d63293f845f2253eccbf86bc28321",
-  )
+      sha256="75d40ea8e68b0d1644f052fffe8f14a410b2a73d40ccb859a95c0578d194ec26",
+      strip_prefix="gemmlowp-a6f29d8ac48d63293f845f2253eccbf86bc28321",)
 
   native.new_http_archive(
-      name = "farmhash_archive",
-      urls = [
+      name="farmhash_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
           "https://github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
       ],
-      sha256 = "4c626d1f306bda2c6804ab955892f803f5245f4dcaecb4979dc08b091256da54",
-      strip_prefix = "farmhash-92e897b282426729f4724d91a637596c7e2fe28f",
-      build_file = str(Label("//third_party:farmhash.BUILD")),
-  )
+      sha256="4c626d1f306bda2c6804ab955892f803f5245f4dcaecb4979dc08b091256da54",
+      strip_prefix="farmhash-92e897b282426729f4724d91a637596c7e2fe28f",
+      build_file=str(Label("//third_party:farmhash.BUILD")),)
 
   native.bind(
-      name = "farmhash",
-      actual = "@farmhash//:farmhash",
-  )
+      name="farmhash",
+      actual="@farmhash//:farmhash",)
 
   native.new_http_archive(
-      name = "highwayhash",
-      urls = [
+      name="highwayhash",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
           "https://github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
       ],
-      sha256 = "0f30a15b1566d93f146c8d149878a06e91d9bb7ec2cfd76906df62a82be4aac9",
-      strip_prefix = "highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b",
-      build_file = str(Label("//third_party:highwayhash.BUILD")),
-  )
+      sha256="0f30a15b1566d93f146c8d149878a06e91d9bb7ec2cfd76906df62a82be4aac9",
+      strip_prefix="highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b",
+      build_file=str(Label("//third_party:highwayhash.BUILD")),)
 
   native.new_http_archive(
-      name = "nasm",
-      urls = [
+      name="nasm",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.bz2",
           "http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2",
       ],
-      sha256 = "00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
-      strip_prefix = "nasm-2.12.02",
-      build_file = str(Label("//third_party:nasm.BUILD")),
-  )
+      sha256="00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
+      strip_prefix="nasm-2.12.02",
+      build_file=str(Label("//third_party:nasm.BUILD")),)
 
   temp_workaround_http_archive(
-      name = "jpeg",
-      urls = [
+      name="jpeg",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
           "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
       ],
-      sha256 = "c15a9607892113946379ccea3ca8b85018301b200754f209453ab21674268e77",
-      strip_prefix = "libjpeg-turbo-1.5.1",
-      build_file = str(Label("//third_party/jpeg:jpeg.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="c15a9607892113946379ccea3ca8b85018301b200754f209453ab21674268e77",
+      strip_prefix="libjpeg-turbo-1.5.1",
+      build_file=str(Label("//third_party/jpeg:jpeg.BUILD")),
+      repository=tf_repo_name,)
 
   native.new_http_archive(
-      name = "png_archive",
-      urls = [
+      name="png_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/glennrp/libpng/archive/v1.2.53.zip",
           "https://github.com/glennrp/libpng/archive/v1.2.53.zip",
       ],
-      sha256 = "c35bcc6387495ee6e757507a68ba036d38ad05b415c2553b3debe2a57647a692",
-      strip_prefix = "libpng-1.2.53",
-      build_file = str(Label("//third_party:png.BUILD")),
-  )
+      sha256="c35bcc6387495ee6e757507a68ba036d38ad05b415c2553b3debe2a57647a692",
+      strip_prefix="libpng-1.2.53",
+      build_file=str(Label("//third_party:png.BUILD")),)
 
   native.new_http_archive(
-      name = "gif_archive",
-      urls = [
+      name="gif_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
       ],
-      sha256 = "34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1",
-      strip_prefix = "giflib-5.1.4",
-      build_file = str(Label("//third_party:gif.BUILD")),
-  )
+      sha256="34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1",
+      strip_prefix="giflib-5.1.4",
+      build_file=str(Label("//third_party:gif.BUILD")),)
 
   native.new_http_archive(
-      name = "six_archive",
-      urls = [
+      name="six_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
           "http://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
       ],
-      sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
-      strip_prefix = "six-1.10.0",
-      build_file = str(Label("//third_party:six.BUILD")),
-  )
+      sha256="105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
+      strip_prefix="six-1.10.0",
+      build_file=str(Label("//third_party:six.BUILD")),)
 
   native.new_http_archive(
-      name = "org_pythonhosted_markdown",
-      urls = [
+      name="org_pythonhosted_markdown",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
           "https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
       ],
-      strip_prefix = "Markdown-2.6.8",
-      sha256 = "0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33",
-      build_file = str(Label("//third_party:markdown.BUILD")),
-  )
+      strip_prefix="Markdown-2.6.8",
+      sha256="0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33",
+      build_file=str(Label("//third_party:markdown.BUILD")),)
 
   native.new_http_archive(
-      name = "org_html5lib",
-      urls = [
+      name="org_html5lib",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
           "https://github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
       ],
-      sha256 = "adb36c879264e8880b92589c4c4fe0814cd9d157b73328b14d728f48a6bab0a4",
-      strip_prefix = "html5lib-python-1.0b8",
-      build_file = str(Label("//third_party:html5lib.BUILD")),
-  )
+      sha256="adb36c879264e8880b92589c4c4fe0814cd9d157b73328b14d728f48a6bab0a4",
+      strip_prefix="html5lib-python-1.0b8",
+      build_file=str(Label("//third_party:html5lib.BUILD")),)
 
   native.new_http_archive(
-      name = "org_mozilla_bleach",
-      urls = [
+      name="org_mozilla_bleach",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/mozilla/bleach/archive/v1.5.tar.gz",
           "https://github.com/mozilla/bleach/archive/v1.5.tar.gz",
       ],
-      strip_prefix = "bleach-1.5",
-      sha256 = "0d68713d02ba4148c417ab1637dd819333d96929a34401d0233947bec0881ad8",
-      build_file = str(Label("//third_party:bleach.BUILD")),
-  )
+      strip_prefix="bleach-1.5",
+      sha256="0d68713d02ba4148c417ab1637dd819333d96929a34401d0233947bec0881ad8",
+      build_file=str(Label("//third_party:bleach.BUILD")),)
 
   native.new_http_archive(
-      name = "org_pocoo_werkzeug",
-      urls = [
+      name="org_pocoo_werkzeug",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
           "https://pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
       ],
-      strip_prefix = "Werkzeug-0.11.10",
-      sha256 = "cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee",
-      build_file = str(Label("//third_party:werkzeug.BUILD")),
-  )
+      strip_prefix="Werkzeug-0.11.10",
+      sha256="cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee",
+      build_file=str(Label("//third_party:werkzeug.BUILD")),)
 
   native.bind(
-      name = "six",
-      actual = "@six_archive//:six",
-  )
+      name="six",
+      actual="@six_archive//:six",)
 
   patched_http_archive(
-      name = "protobuf",
-      urls = [
+      name="protobuf",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
-      sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
-      strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
+      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
       # TODO: remove patching when tensorflow stops linking same protos into
       #       multiple shared libraries loaded in runtime by python.
       #       This patch fixes a runtime crash when tensorflow is compiled
       #       with clang -O2 on Linux (see https://github.com/tensorflow/tensorflow/issues/8394)
-      patch_file = str(Label("//third_party/protobuf:add_noinlines.patch")),
-  )
+      patch_file=str(Label("//third_party/protobuf:add_noinlines.patch")),)
+
+  # We need to import the protobuf library under the names com_google_protobuf
+  # and com_google_protobuf_cc to enable proto_library support in bazel.
+  # Unfortunately there is no way to alias http_archives at the moment.
+  native.http_archive(
+      name="com_google_protobuf",
+      urls=[
+          "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
+          "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
+      ],
+      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",)
+
+  native.http_archive(
+      name="com_google_protobuf_cc",
+      urls=[
+          "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
+          "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
+      ],
+      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",)
 
   native.new_http_archive(
-      name = "gmock_archive",
-      urls = [
+      name="gmock_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/googletest/archive/release-1.8.0.zip",
           "https://github.com/google/googletest/archive/release-1.8.0.zip",
       ],
-      sha256 = "f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
-      strip_prefix = "googletest-release-1.8.0",
-      build_file = str(Label("//third_party:gmock.BUILD")),
-  )
+      sha256="f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
+      strip_prefix="googletest-release-1.8.0",
+      build_file=str(Label("//third_party:gmock.BUILD")),)
 
   native.bind(
-      name = "gtest",
-      actual = "@gmock_archive//:gtest",
-  )
+      name="gtest",
+      actual="@gmock_archive//:gtest",)
 
   native.bind(
-      name = "gtest_main",
-      actual = "@gmock_archive//:gtest_main",
-  )
+      name="gtest_main",
+      actual="@gmock_archive//:gtest_main",)
+
+  native.git_repository(
+      name="com_github_gflags_gflags",
+      commit="f8a0efe03aa69b3336d8e228b37d4ccb17324b88",
+      remote="https://github.com/gflags/gflags.git",)
 
   native.bind(
-      name = "python_headers",
-      actual = str(Label("//util/python:python_headers")),
-  )
+      name="python_headers",
+      actual=str(Label("//util/python:python_headers")),)
 
   native.new_http_archive(
-      name = "pcre",
-      sha256 = "ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7",
-      urls = [
+      name="pcre",
+      sha256="ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
           "http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
       ],
-      strip_prefix = "pcre-8.39",
-      build_file = str(Label("//third_party:pcre.BUILD")),
-  )
+      strip_prefix="pcre-8.39",
+      build_file=str(Label("//third_party:pcre.BUILD")),)
 
   native.new_http_archive(
-      name = "swig",
-      sha256 = "58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
-      urls = [
+      name="swig",
+      sha256="58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
       ],
-      strip_prefix = "swig-3.0.8",
-      build_file = str(Label("//third_party:swig.BUILD")),
-  )
+      strip_prefix="swig-3.0.8",
+      build_file=str(Label("//third_party:swig.BUILD")),)
 
   temp_workaround_http_archive(
-      name = "curl",
-      sha256 = "ff3e80c1ca6a068428726cd7dd19037a47cc538ce58ef61c59587191039b2ca6",
-      urls = [
+      name="curl",
+      sha256="ff3e80c1ca6a068428726cd7dd19037a47cc538ce58ef61c59587191039b2ca6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/curl.haxx.se/download/curl-7.49.1.tar.gz",
           "https://curl.haxx.se/download/curl-7.49.1.tar.gz",
       ],
-      strip_prefix = "curl-7.49.1",
-      build_file = str(Label("//third_party:curl.BUILD")),
-      repository = tf_repo_name
-  )
+      strip_prefix="curl-7.49.1",
+      build_file=str(Label("//third_party:curl.BUILD")),
+      repository=tf_repo_name)
 
   # grpc expects //external:protobuf_clib and //external:protobuf_compiler
   # to point to the protobuf's compiler library.
   native.bind(
-      name = "protobuf_clib",
-      actual = "@protobuf//:protoc_lib",
-  )
+      name="protobuf_clib",
+      actual="@protobuf//:protoc_lib",)
 
   native.bind(
-      name = "protobuf_compiler",
-      actual = "@protobuf//:protoc_lib",
-  )
+      name="protobuf_compiler",
+      actual="@protobuf//:protoc_lib",)
 
   native.new_http_archive(
-      name = "grpc",
-      urls = [
+      name="grpc",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
           "https://github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
       ],
-      sha256 = "a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31",
-      strip_prefix = "grpc-d7ff4ff40071d2b486a052183e3e9f9382afb745",
-      build_file = str(Label("//third_party:grpc.BUILD")),
-  )
+      sha256="a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31",
+      strip_prefix="grpc-d7ff4ff40071d2b486a052183e3e9f9382afb745",
+      build_file=str(Label("//third_party:grpc.BUILD")),)
 
   # protobuf expects //external:grpc_cpp_plugin to point to grpc's
   # C++ plugin code generator.
   native.bind(
-      name = "grpc_cpp_plugin",
-      actual = "@grpc//:grpc_cpp_plugin",
-  )
+      name="grpc_cpp_plugin",
+      actual="@grpc//:grpc_cpp_plugin",)
 
   native.bind(
-      name = "grpc_lib",
-      actual = "@grpc//:grpc++_unsecure",
-  )
+      name="grpc_lib",
+      actual="@grpc//:grpc++_unsecure",)
 
   native.new_http_archive(
-      name = "linenoise",
-      sha256 = "7f51f45887a3d31b4ce4fa5965210a5e64637ceac12720cfce7954d6a2e812f7",
-      urls = [
+      name="linenoise",
+      sha256="7f51f45887a3d31b4ce4fa5965210a5e64637ceac12720cfce7954d6a2e812f7",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
           "https://github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
       ],
-      strip_prefix = "linenoise-c894b9e59f02203dbe4e2be657572cf88c4230c3",
-      build_file = str(Label("//third_party:linenoise.BUILD")),
-  )
+      strip_prefix="linenoise-c894b9e59f02203dbe4e2be657572cf88c4230c3",
+      build_file=str(Label("//third_party:linenoise.BUILD")),)
 
   # TODO(phawkins): currently, this rule uses an unofficial LLVM mirror.
   # Switch to an official source of snapshots if/when possible.
   temp_workaround_http_archive(
-      name = "llvm",
-      urls = [
+      name="llvm",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
           "https://github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
       ],
-      sha256 = "3cecf39bf4b3854629d610bb321bb57e0e46bda9110bd51c3bae5a4171c82bab",
-      strip_prefix = "llvm-5d2b26453d4bca5a13b69b0130e4369d1fcd393d",
-      build_file = str(Label("//third_party/llvm:llvm.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="3cecf39bf4b3854629d610bb321bb57e0e46bda9110bd51c3bae5a4171c82bab",
+      strip_prefix="llvm-5d2b26453d4bca5a13b69b0130e4369d1fcd393d",
+      build_file=str(Label("//third_party/llvm:llvm.BUILD")),
+      repository=tf_repo_name,)
 
   native.new_http_archive(
-      name = "jsoncpp_git",
-      urls = [
+      name="jsoncpp_git",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
           "https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
       ],
-      sha256 = "07d34db40593d257324ec5fb9debc4dc33f29f8fb44e33a2eeb35503e61d0fe2",
-      strip_prefix = "jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70",
-      build_file = str(Label("//third_party:jsoncpp.BUILD")),
-  )
+      sha256="07d34db40593d257324ec5fb9debc4dc33f29f8fb44e33a2eeb35503e61d0fe2",
+      strip_prefix="jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70",
+      build_file=str(Label("//third_party:jsoncpp.BUILD")),)
 
   native.bind(
-      name = "jsoncpp",
-      actual = "@jsoncpp_git//:jsoncpp",
-  )
+      name="jsoncpp",
+      actual="@jsoncpp_git//:jsoncpp",)
 
   native.http_archive(
-      name = "boringssl",
-      urls = [
+      name="boringssl",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",
           "https://github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",  # 2016-07-11
       ],
-      sha256 = "025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
-      strip_prefix = "boringssl-bbcaa15b0647816b9a1a9b9e0d209cd6712f0105",
-  )
+      sha256="025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
+      strip_prefix="boringssl-bbcaa15b0647816b9a1a9b9e0d209cd6712f0105",)
 
   native.new_http_archive(
-      name = "nanopb_git",
-      urls = [
+      name="nanopb_git",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
           "https://github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
       ],
-      sha256 = "ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33",
-      strip_prefix = "nanopb-1251fa1065afc0d62f635e0f63fec8276e14e13c",
-      build_file = str(Label("//third_party:nanopb.BUILD")),
-  )
+      sha256="ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33",
+      strip_prefix="nanopb-1251fa1065afc0d62f635e0f63fec8276e14e13c",
+      build_file=str(Label("//third_party:nanopb.BUILD")),)
 
   native.bind(
-      name = "nanopb",
-      actual = "@nanopb_git//:nanopb",
-  )
+      name="nanopb",
+      actual="@nanopb_git//:nanopb",)
 
   native.new_http_archive(
-      name = "zlib_archive",
-      urls = [
+      name="zlib_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/zlib.net/zlib-1.2.8.tar.gz",
           "http://zlib.net/fossils/zlib-1.2.8.tar.gz",
       ],
-      sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
-      strip_prefix = "zlib-1.2.8",
-      build_file = str(Label("//third_party:zlib.BUILD")),
-  )
+      sha256="36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
+      strip_prefix="zlib-1.2.8",
+      build_file=str(Label("//third_party:zlib.BUILD")),)
 
   native.bind(
-      name = "zlib",
-      actual = "@zlib_archive//:zlib",
-  )
+      name="zlib",
+      actual="@zlib_archive//:zlib",)
 
   temp_workaround_http_archive(
-      name = "snappy",
-      urls = [
+      name="snappy",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/snappy/archive/1.1.4.zip",
           "https://github.com/google/snappy/archive/1.1.4.zip",
       ],
-      sha256 = "6c74d2b663170d68184da353cdd71b5b7d57bc8888ef1e99b4929b5d680dba54",
-      strip_prefix = "snappy-1.1.4",
-      build_file = str(Label("//third_party:snappy.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="6c74d2b663170d68184da353cdd71b5b7d57bc8888ef1e99b4929b5d680dba54",
+      strip_prefix="snappy-1.1.4",
+      build_file=str(Label("//third_party:snappy.BUILD")),
+      repository=tf_repo_name,)
 
   temp_workaround_http_archive(
-      name = "nccl_archive",
-      urls = [
+      name="nccl_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
           "https://github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
       ],
-      sha256 = "6787f0eed88d52ee8e32956fa4947d92c139da469f1d8e311c307f27d641118e",
-      strip_prefix = "nccl-024d1e267845f2ed06f3e2e42476d50f04a00ee6",
-      build_file = str(Label("//third_party/nccl:nccl.BUILD")),
+      sha256="6787f0eed88d52ee8e32956fa4947d92c139da469f1d8e311c307f27d641118e",
+      strip_prefix="nccl-024d1e267845f2ed06f3e2e42476d50f04a00ee6",
+      build_file=str(Label("//third_party/nccl:nccl.BUILD")),
       # TODO: Remove patching after the fix is merged into nccl(see https://github.com/NVIDIA/nccl/pull/78)
-      patch_file = str(Label("//third_party/nccl:fix_clang_compilation.patch")),
-      repository = tf_repo_name,
-  )
+      patch_file=str(Label("//third_party/nccl:fix_clang_compilation.patch")),
+      repository=tf_repo_name,)
 
   java_import_external(
-      name = "junit",
-      jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
-      jar_urls = [
+      name="junit",
+      jar_sha256=
+      "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
+      jar_urls=[
           "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://maven.ibiblio.org/maven2/junit/junit/4.12/junit-4.12.jar",
       ],
-      licenses = ["reciprocal"],  # Common Public License Version 1.0
-      testonly_ = True,
-      deps = ["@org_hamcrest_core"],
-  )
+      licenses=["reciprocal"],  # Common Public License Version 1.0
+      testonly_=True,
+      deps=["@org_hamcrest_core"],)
 
   java_import_external(
-      name = "org_hamcrest_core",
-      jar_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
-      jar_urls = [
+      name="org_hamcrest_core",
+      jar_sha256=
+      "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
+      jar_urls=[
           "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://maven.ibiblio.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
       ],
-      licenses = ["notice"],  # New BSD License
-      testonly_ = True,
-  )
+      licenses=["notice"],  # New BSD License
+      testonly_=True,)
 
   temp_workaround_http_archive(
-      name = "jemalloc",
-      urls = [
+      name="jemalloc",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
           "https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
       ],
-      sha256 = "3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8",
-      strip_prefix = "jemalloc-4.4.0",
-      build_file = str(Label("//third_party:jemalloc.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8",
+      strip_prefix="jemalloc-4.4.0",
+      build_file=str(Label("//third_party:jemalloc.BUILD")),
+      repository=tf_repo_name,)
 
   ##############################################################################
   # TensorBoard Build Tools
 
   filegroup_external(
-      name = "org_nodejs",
+      name="org_nodejs",
       # MIT with portions licensed:
       # - MIT
       # - Old MIT
@@ -563,14 +574,14 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
       # - Unicode
       # - zlib
       # - Artistic 2.0
-      licenses = ["notice"],
-      sha256_urls_extract_macos = {
+      licenses=["notice"],
+      sha256_urls_extract_macos={
           "47109a00cac344d80296c195451bb5eee7c21727fcef1594384ddfe1f852957a": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
           ],
       },
-      sha256_urls_windows = {
+      sha256_urls_windows={
           "606c44c42d17866c017c50c0afadad411d9492ac4281d2431b937f881911614e": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/win-x64/node.exe",
               "http://nodejs.org/dist/v4.3.2/win-x64/node.exe",
@@ -580,26 +591,25 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://nodejs.org/dist/v4.3.2/win-x64/node.lib",
           ],
       },
-      sha256_urls_extract = {
+      sha256_urls_extract={
           "4350d0431b49697517c6cca5d66adf5f74eb9101c52f52ae959fa94225822d44": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
           ],
       },
-      strip_prefix = {
+      strip_prefix={
           "node-v4.3.2-darwin-x64.tar.xz": "node-v4.3.2-darwin-x64",
           "node-v4.3.2-linux-x64.tar.xz": "node-v4.3.2-linux-x64",
       },
-      executable = [
+      executable=[
           "node",
           "node.exe",
-      ],
-  )
+      ],)
 
   filegroup_external(
-      name = "com_microsoft_typescript",
-      licenses = ["notice"],  # Apache 2.0
-      sha256_urls = {
+      name="com_microsoft_typescript",
+      licenses=["notice"],  # Apache 2.0
+      sha256_urls={
           "e3d9e320a2cae99be4aaa37953961a48323cdf16ba9aa2557a44d69571cd9b8d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
@@ -609,7 +619,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/lib.es6.d.ts",
           ],
       },
-      extra_build_file_content = "\n".join([
+      extra_build_file_content="\n".join([
           "sh_binary(",
           "    name = \"tsc\",",
           "    srcs = [\"tsc.sh\"],",
@@ -632,40 +642,37 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "          \"EOF\",",
           "    executable = True,",
           ")",
-      ]),
-  )
+      ]),)
 
   ##############################################################################
   # TensorBoard JavaScript Production Dependencies
 
   filegroup_external(
-      name = "com_lodash",
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      name="com_lodash",
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "7c7b391810bc08cf815683431857c51b5ee190062ae4f557e1e4689d6dd910ea": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
               "https://raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "com_numericjs",
+      name="com_numericjs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "dfaca3b8485bee735788cc6eebca82ea25719adc1fb8911c7799c6bd5a95df3b": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
               "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "com_palantir_plottable",
+      name="com_palantir_plottable",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "77510d7538dbd3b59f1c8a06f68131b38562e3be546364747618d5112723e818": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
@@ -678,61 +685,56 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "io_github_cpettitt_dagre",
+      name="io_github_cpettitt_dagre",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "7323829ddd77924a69e2b1235ded3eac30acd990da0f037e0fbd3c8e9035b50d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
               "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "io_github_cpettitt_graphlib",
+      name="io_github_cpettitt_graphlib",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "772045d412b1513b549be991c2e1846c38019429d43974efcae943fbe83489bf": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
               "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "io_github_waylonflinn_weblas",
+      name="io_github_waylonflinn_weblas",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "f138fce57f673ca8a633f4aee5ae5b6fcb6ad0de59069a42a74e996fd04d8fcc": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
               "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_d3js",
+      name="org_d3js",
       # no @license header
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256_urls = {
+      licenses=["notice"],  # BSD-3-Clause
+      sha256_urls={
           "bc1e38838f5c5c8e040132d41efee6bfddbef728210bd566479dc1694af1d3f5": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
               "https://raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_definitelytyped",
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      name="org_definitelytyped",
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "b7da645f6e5555feb7aeede73775da0023ce2257df9c8e76c9159266035a9c0d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
@@ -749,14 +751,13 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_threejs",
+      name="org_threejs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "7aff264bd84c90bed3c72a4dc31db8c19151853c6df6980f52b01d3e9872c82d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
@@ -765,190 +766,179 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
           ],
-      },
-  )
+      },)
 
   ##############################################################################
   # TensorBoard JavaScript Testing Dependencies
 
   filegroup_external(
-      name = "com_chaijs",
+      name="com_chaijs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "b926b325ad9843bf0b7a6d580ef78bb560e47c484b98680098d4fd9b31b77cd9": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
               "https://raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_mochajs",
+      name="org_mochajs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "e36d865a17ffdf5868e55e736526ae30f3d4bc667c85a2a28cd5c850a82361e2": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
               "https://raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
           ],
-      },
-  )
+      },)
 
   ##############################################################################
   # TensorBoard Polymer Dependencies
 
   webfiles_external(
-      name = "org_polymer_font_roboto",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
-      urls = [
+      name="org_polymer_font_roboto",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
           "https://github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
       ],
-      strip_prefix = "font-roboto-1.0.1",
-      path = "/font-roboto",
-      srcs = ["roboto.html"],
-  )
+      strip_prefix="font-roboto-1.0.1",
+      path="/font-roboto",
+      srcs=["roboto.html"],)
 
   webfiles_external(
-      name = "org_polymer_iron_a11y_announcer",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
-      urls = [
+      name="org_polymer_iron_a11y_announcer",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
       ],
-      strip_prefix = "iron-a11y-announcer-1.0.5",
-      path = "/iron-a11y-announcer",
-      srcs = ["iron-a11y-announcer.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-a11y-announcer-1.0.5",
+      path="/iron-a11y-announcer",
+      srcs=["iron-a11y-announcer.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_a11y_keys_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
-      urls = [
+      name="org_polymer_iron_a11y_keys_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
       ],
-      strip_prefix = "iron-a11y-keys-behavior-1.1.8",
-      path = "/iron-a11y-keys-behavior",
-      srcs = ["iron-a11y-keys-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-a11y-keys-behavior-1.1.8",
+      path="/iron-a11y-keys-behavior",
+      srcs=["iron-a11y-keys-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_ajax",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
-      urls = [
+      name="org_polymer_iron_ajax",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
       ],
-      strip_prefix = "iron-ajax-1.2.0",
-      path = "/iron-ajax",
-      srcs = [
+      strip_prefix="iron-ajax-1.2.0",
+      path="/iron-ajax",
+      srcs=[
           "iron-ajax.html",
           "iron-request.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_promise_polyfill",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_autogrow_textarea",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
-      urls = [
+      name="org_polymer_iron_autogrow_textarea",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
       ],
-      strip_prefix = "iron-autogrow-textarea-1.0.12",
-      path = "/iron-autogrow-textarea",
-      srcs = ["iron-autogrow-textarea.html"],
-      deps = [
+      strip_prefix="iron-autogrow-textarea-1.0.12",
+      path="/iron-autogrow-textarea",
+      srcs=["iron-autogrow-textarea.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_validatable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_behaviors",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
-      urls = [
+      name="org_polymer_iron_behaviors",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
           "https://github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
       ],
-      strip_prefix = "iron-behaviors-1.0.17",
-      path = "/iron-behaviors",
-      srcs = [
+      strip_prefix="iron-behaviors-1.0.17",
+      path="/iron-behaviors",
+      srcs=[
           "iron-button-state.html",
           "iron-control-state.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_checked_element_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
-      urls = [
+      name="org_polymer_iron_checked_element_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix = "iron-checked-element-behavior-1.0.4",
-      path = "/iron-checked-element-behavior",
-      srcs = ["iron-checked-element-behavior.html"],
-      deps = [
+      strip_prefix="iron-checked-element-behavior-1.0.4",
+      path="/iron-checked-element-behavior",
+      srcs=["iron-checked-element-behavior.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_validatable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_collapse",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
-      urls = [
+      name="org_polymer_iron_collapse",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
           "https://github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
       ],
-      strip_prefix = "iron-collapse-1.0.8",
-      path = "/iron-collapse",
-      srcs = ["iron-collapse.html"],
-      deps = [
+      strip_prefix="iron-collapse-1.0.8",
+      path="/iron-collapse",
+      srcs=["iron-collapse.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_resizable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_demo_helpers",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
-      urls = [
+      name="org_polymer_iron_demo_helpers",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
       ],
-      strip_prefix = "iron-demo-helpers-1.1.0",
-      path = "/iron-demo-helpers",
-      srcs = [
+      strip_prefix="iron-demo-helpers-1.1.0",
+      path="/iron-demo-helpers",
+      srcs=[
           "demo-pages-shared-styles.html",
           "demo-snippet.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_icons",
@@ -956,109 +946,103 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_icon_button",
           "@org_polymer_paper_styles",
           "@org_polymer_prism_element",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_dropdown",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
-      urls = [
+      name="org_polymer_iron_dropdown",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix = "iron-dropdown-1.4.0",
-      path = "/iron-dropdown",
-      srcs = [
+      strip_prefix="iron-dropdown-1.4.0",
+      path="/iron-dropdown",
+      srcs=[
           "iron-dropdown.html",
           "iron-dropdown-scroll-manager.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_overlay_behavior",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_neon_animation",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_fit_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
-      urls = [
+      name="org_polymer_iron_fit_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
       ],
-      strip_prefix = "iron-fit-behavior-1.2.5",
-      path = "/iron-fit-behavior",
-      srcs = ["iron-fit-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-fit-behavior-1.2.5",
+      path="/iron-fit-behavior",
+      srcs=["iron-fit-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_flex_layout",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
-      urls = [
+      name="org_polymer_iron_flex_layout",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
       ],
-      strip_prefix = "iron-flex-layout-1.3.0",
-      path = "/iron-flex-layout",
-      srcs = [
+      strip_prefix="iron-flex-layout-1.3.0",
+      path="/iron-flex-layout",
+      srcs=[
           "classes/iron-flex-layout.html",
           "classes/iron-shadow-flex-layout.html",
           "iron-flex-layout.html",
           "iron-flex-layout-classes.html",
       ],
-      deps = ["@org_polymer"],
-  )
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_form_element_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
-      urls = [
+      name="org_polymer_iron_form_element_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
       ],
-      strip_prefix = "iron-form-element-behavior-1.0.6",
-      path = "/iron-form-element-behavior",
-      srcs = ["iron-form-element-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-form-element-behavior-1.0.6",
+      path="/iron-form-element-behavior",
+      srcs=["iron-form-element-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_icon",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
-      urls = [
+      name="org_polymer_iron_icon",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
       ],
-      strip_prefix = "iron-icon-1.0.11",
-      path = "/iron-icon",
-      srcs = ["iron-icon.html"],
-      deps = [
+      strip_prefix="iron-icon-1.0.11",
+      path="/iron-icon",
+      srcs=["iron-icon.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_meta",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_icons",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
-      urls = [
+      name="org_polymer_iron_icons",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix = "iron-icons-1.1.3",
-      path = "/iron-icons",
-      srcs = [
+      strip_prefix="iron-icons-1.1.3",
+      path="/iron-icons",
+      srcs=[
           "av-icons.html",
           "communication-icons.html",
           "device-icons.html",
@@ -1071,247 +1055,233 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "places-icons.html",
           "social-icons.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer_iron_icon",
           "@org_polymer_iron_iconset_svg",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_iconset_svg",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
-      urls = [
+      name="org_polymer_iron_iconset_svg",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
       ],
-      strip_prefix = "iron-iconset-svg-1.1.0",
-      path = "/iron-iconset-svg",
-      srcs = ["iron-iconset-svg.html"],
-      deps = [
+      strip_prefix="iron-iconset-svg-1.1.0",
+      path="/iron-iconset-svg",
+      srcs=["iron-iconset-svg.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_meta",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_input",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
-      urls = [
+      name="org_polymer_iron_input",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
           "https://github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
       ],
-      strip_prefix = "iron-input-1.0.10",
-      path = "/iron-input",
-      srcs = ["iron-input.html"],
-      deps = [
+      strip_prefix="iron-input-1.0.10",
+      path="/iron-input",
+      srcs=["iron-input.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_announcer",
           "@org_polymer_iron_validatable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_list",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
-      urls = [
+      name="org_polymer_iron_list",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
           "https://github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
       ],
-      strip_prefix = "iron-list-1.3.9",
-      path = "/iron-list",
-      srcs = ["iron-list.html"],
-      deps = [
+      strip_prefix="iron-list-1.3.9",
+      path="/iron-list",
+      srcs=["iron-list.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_iron_scroll_target_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_menu_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
-      urls = [
+      name="org_polymer_iron_menu_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
           "https://github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
       ],
-      strip_prefix = "iron-menu-behavior-1.1.10",
-      path = "/iron-menu-behavior",
-      srcs = [
+      strip_prefix="iron-menu-behavior-1.1.10",
+      path="/iron-menu-behavior",
+      srcs=[
           "iron-menu-behavior.html",
           "iron-menubar-behavior.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_selector",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_meta",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
-      urls = [
+      name="org_polymer_iron_meta",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix = "iron-meta-1.1.1",
-      path = "/iron-meta",
-      srcs = ["iron-meta.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-meta-1.1.1",
+      path="/iron-meta",
+      srcs=["iron-meta.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_overlay_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
-      urls = [
+      name="org_polymer_iron_overlay_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
           "https://github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
       ],
-      strip_prefix = "iron-overlay-behavior-1.10.1",
-      path = "/iron-overlay-behavior",
-      srcs = [
+      strip_prefix="iron-overlay-behavior-1.10.1",
+      path="/iron-overlay-behavior",
+      srcs=[
           "iron-focusables-helper.html",
           "iron-overlay-backdrop.html",
           "iron-overlay-behavior.html",
           "iron-overlay-manager.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_fit_behavior",
           "@org_polymer_iron_resizable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_range_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
-      urls = [
+      name="org_polymer_iron_range_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix = "iron-range-behavior-1.0.4",
-      path = "/iron-range-behavior",
-      srcs = ["iron-range-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-range-behavior-1.0.4",
+      path="/iron-range-behavior",
+      srcs=["iron-range-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_resizable_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
-      urls = [
+      name="org_polymer_iron_resizable_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
       ],
-      strip_prefix = "iron-resizable-behavior-1.0.3",
-      path = "/iron-resizable-behavior",
-      srcs = ["iron-resizable-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-resizable-behavior-1.0.3",
+      path="/iron-resizable-behavior",
+      srcs=["iron-resizable-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_scroll_target_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
-      urls = [
+      name="org_polymer_iron_scroll_target_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
       ],
-      strip_prefix = "iron-scroll-target-behavior-1.0.3",
-      path = "/iron-scroll-target-behavior",
-      srcs = ["iron-scroll-target-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-scroll-target-behavior-1.0.3",
+      path="/iron-scroll-target-behavior",
+      srcs=["iron-scroll-target-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_selector",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
-      urls = [
+      name="org_polymer_iron_selector",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
           "https://github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
       ],
-      strip_prefix = "iron-selector-1.5.2",
-      path = "/iron-selector",
-      srcs = [
+      strip_prefix="iron-selector-1.5.2",
+      path="/iron-selector",
+      srcs=[
           "iron-multi-selectable.html",
           "iron-selectable.html",
           "iron-selection.html",
           "iron-selector.html",
       ],
-      deps = ["@org_polymer"],
-  )
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_validatable_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
-      urls = [
+      name="org_polymer_iron_validatable_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix = "iron-validatable-behavior-1.1.1",
-      path = "/iron-validatable-behavior",
-      srcs = ["iron-validatable-behavior.html"],
-      deps = [
+      strip_prefix="iron-validatable-behavior-1.1.1",
+      path="/iron-validatable-behavior",
+      srcs=["iron-validatable-behavior.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_meta",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_marked",
-      licenses = ["notice"],  # MIT
-      sha256 = "93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
-      urls = [
+      name="org_polymer_marked",
+      licenses=["notice"],  # MIT
+      sha256="93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/chjj/marked/archive/v0.3.2.zip",
           "https://github.com/chjj/marked/archive/v0.3.2.zip",
       ],
-      strip_prefix = "marked-0.3.2",
-      path = "/marked",
-      srcs = ["lib/marked.js"],
-  )
+      strip_prefix="marked-0.3.2",
+      path="/marked",
+      srcs=["lib/marked.js"],)
 
   webfiles_external(
-      name = "org_polymer_marked_element",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
-      urls = [
+      name="org_polymer_marked_element",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix = "marked-element-1.1.3",
-      path = "/marked-element",
-      srcs = [
+      strip_prefix="marked-element-1.1.3",
+      path="/marked-element",
+      srcs=[
           "marked-element.html",
           "marked-import.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_marked",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_neon_animation",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
-      urls = [
+      name="org_polymer_neon_animation",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
       ],
-      strip_prefix = "neon-animation-1.2.2",
-      path = "/neon-animation",
-      srcs = [
+      strip_prefix="neon-animation-1.2.2",
+      path="/neon-animation",
+      srcs=[
           "animations/cascaded-animation.html",
           "animations/fade-in-animation.html",
           "animations/fade-out-animation.html",
@@ -1341,155 +1311,148 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "neon-shared-element-animation-behavior.html",
           "web-animations.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_meta",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_iron_selector",
           "@org_polymer_web_animations_js",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_behaviors",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
-      urls = [
+      name="org_polymer_paper_behaviors",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
       ],
-      strip_prefix = "paper-behaviors-1.0.12",
-      path = "/paper-behaviors",
-      srcs = [
+      strip_prefix="paper-behaviors-1.0.12",
+      path="/paper-behaviors",
+      srcs=[
           "paper-button-behavior.html",
           "paper-checked-element-behavior.html",
           "paper-inky-focus-behavior.html",
           "paper-ripple-behavior.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_checked_element_behavior",
           "@org_polymer_paper_ripple",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
-      urls = [
+      name="org_polymer_paper_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
       ],
-      strip_prefix = "paper-button-1.0.11",
-      path = "/paper-button",
-      srcs = ["paper-button.html"],
-      deps = [
+      strip_prefix="paper-button-1.0.11",
+      path="/paper-button",
+      srcs=["paper-button.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_material",
           "@org_polymer_paper_ripple",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_checkbox",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
-      urls = [
+      name="org_polymer_paper_checkbox",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix = "paper-checkbox-1.4.0",
-      path = "/paper-checkbox",
-      srcs = ["paper-checkbox.html"],
-      deps = [
+      strip_prefix="paper-checkbox-1.4.0",
+      path="/paper-checkbox",
+      srcs=["paper-checkbox.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dialog",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
-      urls = [
+      name="org_polymer_paper_dialog",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix = "paper-dialog-1.0.4",
-      path = "/paper-dialog",
-      srcs = ["paper-dialog.html"],
-      deps = [
+      strip_prefix="paper-dialog-1.0.4",
+      path="/paper-dialog",
+      srcs=["paper-dialog.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_neon_animation",
           "@org_polymer_paper_dialog_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dialog_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
-      urls = [
+      name="org_polymer_paper_dialog_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
       ],
-      strip_prefix = "paper-dialog-behavior-1.2.5",
-      path = "/paper-dialog-behavior",
-      srcs = [
+      strip_prefix="paper-dialog-behavior-1.2.5",
+      path="/paper-dialog-behavior",
+      srcs=[
           "paper-dialog-behavior.html",
           "paper-dialog-common.css",
           "paper-dialog-shared-styles.html",
       ],
-      suppress = ["cssSyntax"],
-      deps = [
+      suppress=["cssSyntax"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_overlay_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dialog_scrollable",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
-      urls = [
+      name="org_polymer_paper_dialog_scrollable",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
       ],
-      strip_prefix = "paper-dialog-scrollable-1.1.5",
-      path = "/paper-dialog-scrollable",
-      srcs = ["paper-dialog-scrollable.html"],
-      deps = [
+      strip_prefix="paper-dialog-scrollable-1.1.5",
+      path="/paper-dialog-scrollable",
+      srcs=["paper-dialog-scrollable.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_dialog_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dropdown_menu",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
-      urls = [
+      name="org_polymer_paper_dropdown_menu",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix = "paper-dropdown-menu-1.4.0",
-      path = "/paper-dropdown-menu",
-      srcs = [
+      strip_prefix="paper-dropdown-menu-1.4.0",
+      path="/paper-dropdown-menu",
+      srcs=[
           "paper-dropdown-menu.html",
           "paper-dropdown-menu-icons.html",
           "paper-dropdown-menu-light.html",
           "paper-dropdown-menu-shared-styles.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
@@ -1502,59 +1465,56 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_menu_button",
           "@org_polymer_paper_ripple",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_header_panel",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
-      urls = [
+      name="org_polymer_paper_header_panel",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-header-panel-1.1.4",
-      path = "/paper-header-panel",
-      srcs = ["paper-header-panel.html"],
-      deps = [
+      strip_prefix="paper-header-panel-1.1.4",
+      path="/paper-header-panel",
+      srcs=["paper-header-panel.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_icon_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
-      urls = [
+      name="org_polymer_paper_icon_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix = "paper-icon-button-1.1.3",
-      path = "/paper-icon-button",
-      srcs = [
+      strip_prefix="paper-icon-button-1.1.3",
+      path="/paper-icon-button",
+      srcs=[
           "paper-icon-button.html",
           "paper-icon-button-light.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_icon",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_input",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
-      urls = [
+      name="org_polymer_paper_input",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
           "https://github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
       ],
-      strip_prefix = "paper-input-1.1.18",
-      path = "/paper-input",
-      srcs = [
+      strip_prefix="paper-input-1.1.18",
+      path="/paper-input",
+      srcs=[
           "paper-input.html",
           "paper-input-addon-behavior.html",
           "paper-input-behavior.html",
@@ -1563,7 +1523,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "paper-input-error.html",
           "paper-textarea.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_autogrow_textarea",
@@ -1572,206 +1532,196 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_input",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_item",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
-      urls = [
+      name="org_polymer_paper_item",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-item-1.1.4",
-      path = "/paper-item",
-      srcs = [
+      strip_prefix="paper-item-1.1.4",
+      path="/paper-item",
+      srcs=[
           "paper-icon-item.html",
           "paper-item.html",
           "paper-item-behavior.html",
           "paper-item-body.html",
           "paper-item-shared-styles.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_listbox",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
-      urls = [
+      name="org_polymer_paper_listbox",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix = "paper-listbox-1.1.2",
-      path = "/paper-listbox",
-      srcs = ["paper-listbox.html"],
-      deps = [
+      strip_prefix="paper-listbox-1.1.2",
+      path="/paper-listbox",
+      srcs=["paper-listbox.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_menu_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_material",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
-      urls = [
+      name="org_polymer_paper_material",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
       ],
-      strip_prefix = "paper-material-1.0.6",
-      path = "/paper-material",
-      srcs = [
+      strip_prefix="paper-material-1.0.6",
+      path="/paper-material",
+      srcs=[
           "paper-material.html",
           "paper-material-shared-styles.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_menu",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
-      urls = [
+      name="org_polymer_paper_menu",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
       ],
-      strip_prefix = "paper-menu-1.2.2",
-      path = "/paper-menu",
-      srcs = [
+      strip_prefix="paper-menu-1.2.2",
+      path="/paper-menu",
+      srcs=[
           "paper-menu.html",
           "paper-menu-shared-styles.html",
           "paper-submenu.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_collapse",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_menu_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_menu_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
-      urls = [
+      name="org_polymer_paper_menu_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
           "https://github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
       ],
-      strip_prefix = "paper-menu-button-1.5.1",
-      path = "/paper-menu-button",
-      srcs = [
+      strip_prefix="paper-menu-button-1.5.1",
+      path="/paper-menu-button",
+      srcs=[
           "paper-menu-button.html",
           "paper-menu-button-animations.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_dropdown",
           "@org_polymer_neon_animation",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_progress",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
-      urls = [
+      name="org_polymer_paper_progress",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
       ],
-      strip_prefix = "paper-progress-1.0.9",
-      path = "/paper-progress",
-      srcs = ["paper-progress.html"],
-      deps = [
+      strip_prefix="paper-progress-1.0.9",
+      path="/paper-progress",
+      srcs=["paper-progress.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_range_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_radio_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
-      urls = [
+      name="org_polymer_paper_radio_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix = "paper-radio-button-1.1.2",
-      path = "/paper-radio-button",
-      srcs = ["paper-radio-button.html"],
-      deps = [
+      strip_prefix="paper-radio-button-1.1.2",
+      path="/paper-radio-button",
+      srcs=["paper-radio-button.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_radio_group",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
-      urls = [
+      name="org_polymer_paper_radio_group",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
       ],
-      strip_prefix = "paper-radio-group-1.0.9",
-      path = "/paper-radio-group",
-      srcs = ["paper-radio-group.html"],
-      deps = [
+      strip_prefix="paper-radio-group-1.0.9",
+      path="/paper-radio-group",
+      srcs=["paper-radio-group.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_selector",
           "@org_polymer_paper_radio_button",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_ripple",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
-      urls = [
+      name="org_polymer_paper_ripple",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
       ],
-      strip_prefix = "paper-ripple-1.0.5",
-      path = "/paper-ripple",
-      srcs = ["paper-ripple.html"],
-      deps = [
+      strip_prefix="paper-ripple-1.0.5",
+      path="/paper-ripple",
+      srcs=["paper-ripple.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_slider",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
-      urls = [
+      name="org_polymer_paper_slider",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
           "https://github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
       ],
-      strip_prefix = "paper-slider-1.0.10",
-      path = "/paper-slider",
-      srcs = ["paper-slider.html"],
-      deps = [
+      strip_prefix="paper-slider-1.0.10",
+      path="/paper-slider",
+      srcs=["paper-slider.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_flex_layout",
@@ -1781,43 +1731,39 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_input",
           "@org_polymer_paper_progress",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_spinner",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
-      urls = [
+      name="org_polymer_paper_spinner",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix = "paper-spinner-1.1.1",
-      path = "/paper-spinner",
-      srcs = [
-          "paper-spinner.html",
-          "paper-spinner-behavior.html",
-          "paper-spinner-lite.html",
-          "paper-spinner-styles.html"
+      strip_prefix="paper-spinner-1.1.1",
+      path="/paper-spinner",
+      srcs=[
+          "paper-spinner.html", "paper-spinner-behavior.html",
+          "paper-spinner-lite.html", "paper-spinner-styles.html"
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_styles",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
-      urls = [
+      name="org_polymer_paper_styles",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-styles-1.1.4",
-      path = "/paper-styles",
-      srcs = [
+      strip_prefix="paper-styles-1.1.4",
+      path="/paper-styles",
+      srcs=[
           "classes/global.html",
           "classes/shadow.html",
           "classes/shadow-layout.html",
@@ -1831,29 +1777,28 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "shadow.html",
           "typography.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_font_roboto",
           "@org_polymer_iron_flex_layout",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_tabs",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
-      urls = [
+      name="org_polymer_paper_tabs",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
           "https://github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
       ],
-      strip_prefix = "paper-tabs-1.7.0",
-      path = "/paper-tabs",
-      srcs = [
+      strip_prefix="paper-tabs-1.7.0",
+      path="/paper-tabs",
+      srcs=[
           "paper-tab.html",
           "paper-tabs.html",
           "paper-tabs-icons.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
@@ -1864,177 +1809,165 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_icon_button",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_toast",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
-      urls = [
+      name="org_polymer_paper_toast",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
       ],
-      strip_prefix = "paper-toast-1.3.0",
-      path = "/paper-toast",
-      srcs = ["paper-toast.html"],
-      deps = [
+      strip_prefix="paper-toast-1.3.0",
+      path="/paper-toast",
+      srcs=["paper-toast.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_announcer",
           "@org_polymer_iron_overlay_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_toggle_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
-      urls = [
+      name="org_polymer_paper_toggle_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
       ],
-      strip_prefix = "paper-toggle-button-1.2.0",
-      path = "/paper-toggle-button",
-      srcs = ["paper-toggle-button.html"],
-      deps = [
+      strip_prefix="paper-toggle-button-1.2.0",
+      path="/paper-toggle-button",
+      srcs=["paper-toggle-button.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_toolbar",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
-      urls = [
+      name="org_polymer_paper_toolbar",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-toolbar-1.1.4",
-      path = "/paper-toolbar",
-      srcs = ["paper-toolbar.html"],
-      deps = [
+      strip_prefix="paper-toolbar-1.1.4",
+      path="/paper-toolbar",
+      srcs=["paper-toolbar.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_tooltip",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
-      urls = [
+      name="org_polymer_paper_tooltip",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix = "paper-tooltip-1.1.2",
-      path = "/paper-tooltip",
-      srcs = ["paper-tooltip.html"],
-      deps = [
+      strip_prefix="paper-tooltip-1.1.2",
+      path="/paper-tooltip",
+      srcs=["paper-tooltip.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_neon_animation",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
-      strip_prefix = "polymer-1.7.0",
-      urls = [
+      name="org_polymer",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
+      strip_prefix="polymer-1.7.0",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/polymer/polymer/archive/v1.7.0.tar.gz",
           "https://github.com/polymer/polymer/archive/v1.7.0.tar.gz",
       ],
-      path = "/polymer",
-      srcs = [
+      path="/polymer",
+      srcs=[
           "polymer.html",
           "polymer-micro.html",
           "polymer-mini.html",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_prism",
-      licenses = ["notice"],  # MIT
-      sha256 = "e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
-      urls = [
+      name="org_polymer_prism",
+      licenses=["notice"],  # MIT
+      sha256="e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
           "https://github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
       ],
-      strip_prefix = "prism-abee2b7587f1925e57777044270e2a1860810994",
-      path = "/prism",
-      srcs = [
+      strip_prefix="prism-abee2b7587f1925e57777044270e2a1860810994",
+      path="/prism",
+      srcs=[
           "prism.js",
           "themes/prism.css",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_prism_element",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
-      urls = [
+      name="org_polymer_prism_element",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
           "https://github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
       ],
-      strip_prefix = "prism-element-1.0.4",
-      path = "/prism-element",
-      srcs = [
+      strip_prefix="prism-element-1.0.4",
+      path="/prism-element",
+      srcs=[
           "prism-highlighter.html",
           "prism-import.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_prism",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_promise_polyfill",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
-      strip_prefix = "promise-polyfill-1.0.0",
-      urls = [
+      name="org_polymer_promise_polyfill",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
+      strip_prefix="promise-polyfill-1.0.0",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
           "https://github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
       ],
-      path = "/promise-polyfill",
-      srcs = [
-          "Promise.js",
-          "Promise-Statics.js",
-          "promise-polyfill.html",
+      path="/promise-polyfill",
+      srcs=[
+          "Promise.js", "Promise-Statics.js", "promise-polyfill.html",
           "promise-polyfill-lite.html"
       ],
-      deps = ["@org_polymer"],
-  )
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_web_animations_js",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
-      urls = [
+      name="org_polymer_web_animations_js",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
           "https://github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
       ],
-      strip_prefix = "web-animations-js-2.2.1",
-      path = "/web-animations-js",
-      srcs = ["web-animations-next-lite.min.js"],
-  )
+      strip_prefix="web-animations-js-2.2.1",
+      path="/web-animations-js",
+      srcs=["web-animations-next-lite.min.js"],)
 
   webfiles_external(
-      name = "org_polymer_webcomponentsjs",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
-      urls = [
+      name="org_polymer_webcomponentsjs",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
           "https://github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
       ],
-      strip_prefix = "webcomponentsjs-0.7.22",
-      path = "/webcomponentsjs",
-      srcs = [
+      strip_prefix="webcomponentsjs-0.7.22",
+      path="/webcomponentsjs",
+      srcs=[
           "CustomElements.js",
           "CustomElements.min.js",
           "HTMLImports.js",
@@ -2047,5 +1980,4 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "webcomponents.min.js",
           "webcomponents-lite.js",
           "webcomponents-lite.min.js",
-      ],
-  )
+      ],)
diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index bbe0442eaf..05ff584be0 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -39,6 +39,11 @@ _DEFAULT_CUDA_COMPUTE_CAPABILITIES = ["3.5", "5.2"]
 # BEGIN cc_configure common functions.
 def find_cc(repository_ctx):
   """Find the C++ compiler."""
+  # On Windows, we use Bazel's MSVC CROSSTOOL for GPU build
+  # Return a dummy value for GCC detection here to avoid error
+  if _cpu_value(repository_ctx) == "Windows":
+    return "/use/--config x64_windows_msvc/instead"
+
   if _use_cuda_clang(repository_ctx):
     target_cc_name = "clang"
     cc_path_envvar = _CLANG_CUDA_COMPILER_PATH
@@ -297,7 +302,7 @@ def _find_cuda_define(repository_ctx, cudnn_header_dir, define):
   cudnn_h_path = repository_ctx.path("%s/cudnn.h" % cudnn_header_dir)
   if not cudnn_h_path.exists:
     auto_configure_fail("Cannot find cudnn.h at %s" % str(cudnn_h_path))
-  result = repository_ctx.execute(["grep", "-E", define, str(cudnn_h_path)])
+  result = repository_ctx.execute(["grep", "--color=never", "-E", define, str(cudnn_h_path)])
   if result.stderr:
     auto_configure_fail("Error reading %s: %s" %
                         (result.stderr, str(cudnn_h_path)))
@@ -874,6 +879,7 @@ def _cuda_autoconf_impl(repository_ctx):
     _create_cuda_repository(repository_ctx)
 
 
+
 cuda_configure = repository_rule(
     implementation = _cuda_autoconf_impl,
     environ = [
diff --git a/third_party/libxsmm.BUILD b/third_party/libxsmm.BUILD
index 037009c072..53a814b4b8 100644
--- a/third_party/libxsmm.BUILD
+++ b/third_party/libxsmm.BUILD
@@ -12,7 +12,7 @@ libxsmm_interface_arguments = "0 1"
 
 # Arguments to ./scripts/libxsmm_config.py, see that file for detailed description.
 #  ilp64: 0 (no)
-#  big: 0 (no)
+#  big: 1 (yes)
 #  offload: 0 (no)
 #  alignment [b]
 #  prefetch: -1 (auto)
@@ -22,7 +22,7 @@ libxsmm_interface_arguments = "0 1"
 #  flags: 0 (none)
 #  alpha = 1
 #  beta = 1
-libxsmm_config_arguments = "0 0 0 64 -1 0 1 1 0 1 1"
+libxsmm_config_arguments = "0 1 0 64 -1 0 1 1 0 1 1"
 
 # Arguments to ./scripts/libxsmm_dispatch.py, see that file for detailed description.
 #  (dummy argument)
@@ -56,22 +56,26 @@ genrule(
 cc_library(
     name = "xsmm_avx",
     srcs = [
-        "src/libxsmm_main.c",
+        "src/libxsmm_cpuid_x86.c",
+        "src/libxsmm_dnn.c",
+        "src/libxsmm_dnn_convolution_backward.c",
+        "src/libxsmm_dnn_convolution_forward.c",
+        "src/libxsmm_dnn_convolution_weight_update.c",
+        "src/libxsmm_dnn_convolution_winograd_backward.c",
+        "src/libxsmm_dnn_convolution_winograd_forward.c",
+        "src/libxsmm_dnn_convolution_winograd_weight_update.c",
+        "src/libxsmm_dnn_handle.c",
         "src/libxsmm_dump.c",
-        "src/libxsmm_malloc.c",
+        "src/libxsmm_fsspmdm.c",
         "src/libxsmm_gemm.c",
+        "src/libxsmm_main.c",
+        "src/libxsmm_malloc.c",
+        "src/libxsmm_perf.c",
+        "src/libxsmm_spmdm.c",
+        "src/libxsmm_sync.c",
         "src/libxsmm_timer.c",
         "src/libxsmm_trace.c",
         "src/libxsmm_trans.c",
-        "src/libxsmm_sync.c",
-        "src/libxsmm_perf.c",
-        "src/libxsmm_spmdm.c",
-        "src/libxsmm_dnn.c",
-        "src/libxsmm_dnn_handle.c",
-        "src/libxsmm_dnn_convolution_forward.c",
-        "src/libxsmm_dnn_convolution_backward.c",
-        "src/libxsmm_dnn_convolution_weight_update.c",
-        "src/libxsmm_cpuid_x86.c",
     ] + glob([
         "src/generator_*.c",
     ]),
@@ -79,6 +83,7 @@ cc_library(
         "include/libxsmm_cpuid.h",
         "include/libxsmm_dnn.h",
         "include/libxsmm_frontend.h",
+        "include/libxsmm_fsspmdm.h",
         "include/libxsmm_generator.h",
         "include/libxsmm_intrinsics_x86.h",
         "include/libxsmm_macros.h",
@@ -91,14 +96,16 @@ cc_library(
         "include/libxsmm.h",
         "include/libxsmm_config.h",
         "include/libxsmm_dispatch.h",
-    ],
+    ] + glob([
+        # trigger rebuild if template changed
+        "src/template/*.c",
+    ]),
     copts = [
         "-mavx",  # JIT does not work without avx anyway, and this silences some CRC32 warnings.
         "-Wno-vla",  # Libxsmm convolutions heavily use VLA.
     ],
     defines = [
         "LIBXSMM_BUILD",
-        "LIBXSMM_CPUID_X86_NOINLINE",
         "__BLAS=0",
     ],
     includes = [
-- 
GitLab


From 9fca99ccfee234b4eaa154d4eb44d4c1ed2fb79c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 16:13:08 -0800
Subject: [PATCH 0124/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 152200754

---
 tensorflow/go/op/wrappers.go | 1293 +++++++++++++++++++---------------
 1 file changed, 712 insertions(+), 581 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index bbf687e322..877961d0aa 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -4841,6 +4841,59 @@ func DynamicStitch(scope *Scope, indices []tf.Output, data []tf.Output) (merged
 	return op.Output(0)
 }
 
+// CropAndResizeGradBoxesAttr is an optional argument to CropAndResizeGradBoxes.
+type CropAndResizeGradBoxesAttr func(optionalAttr)
+
+// CropAndResizeGradBoxesMethod sets the optional method attribute to value.
+//
+// value: A string specifying the interpolation method. Only 'bilinear' is
+// supported for now.
+// If not specified, defaults to "bilinear"
+func CropAndResizeGradBoxesMethod(value string) CropAndResizeGradBoxesAttr {
+	return func(m optionalAttr) {
+		m["method"] = value
+	}
+}
+
+// Computes the gradient of the crop_and_resize op wrt the input boxes tensor.
+//
+// Arguments:
+//	grads: A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
+//	image: A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
+// Both `image_height` and `image_width` need to be positive.
+//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
+// specifies the coordinates of a box in the `box_ind[i]` image and is specified
+// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
+// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
+// `[0, 1]` interval of normalized image height is mapped to
+// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
+// which case the sampled crop is an up-down flipped version of the original
+// image. The width dimension is treated similarly. Normalized coordinates
+// outside the `[0, 1]` range are allowed, in which case we use
+// `extrapolation_value` to extrapolate the input image values.
+//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
+// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
+//
+// Returns A 2-D tensor of shape `[num_boxes, 4]`.
+func CropAndResizeGradBoxes(scope *Scope, grads tf.Output, image tf.Output, boxes tf.Output, box_ind tf.Output, optional ...CropAndResizeGradBoxesAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "CropAndResizeGradBoxes",
+		Input: []tf.Input{
+			grads, image, boxes, box_ind,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes softmax cross entropy cost and gradients to backpropagate.
 //
 // Unlike `SoftmaxCrossEntropyWithLogits`, this operation does not accept
@@ -5205,10 +5258,10 @@ func FusedBatchNormGrad(scope *Scope, y_backprop tf.Output, x tf.Output, scale t
 	return op.Output(0), op.Output(1), op.Output(2), op.Output(3), op.Output(4)
 }
 
-// AvgPool3DAttr is an optional argument to AvgPool3D.
-type AvgPool3DAttr func(optionalAttr)
+// MaxPool3DGradGradAttr is an optional argument to MaxPool3DGradGrad.
+type MaxPool3DGradGradAttr func(optionalAttr)
 
-// AvgPool3DDataFormat sets the optional data_format attribute to value.
+// MaxPool3DGradGradDataFormat sets the optional data_format attribute to value.
 //
 // value: The data format of the input and output data. With the
 // default format "NDHWC", the data is stored in the order of:
@@ -5216,24 +5269,26 @@ type AvgPool3DAttr func(optionalAttr)
 // Alternatively, the format could be "NCDHW", the data storage order is:
 //     [batch, in_channels, in_depth, in_height, in_width].
 // If not specified, defaults to "NDHWC"
-func AvgPool3DDataFormat(value string) AvgPool3DAttr {
+func MaxPool3DGradGradDataFormat(value string) MaxPool3DGradGradAttr {
 	return func(m optionalAttr) {
 		m["data_format"] = value
 	}
 }
 
-// Performs 3D average pooling on the input.
+// Computes second-order gradients of the maxpooling function.
 //
 // Arguments:
-//	input: Shape `[batch, depth, rows, cols, channels]` tensor to pool over.
+//	orig_input: The original input tensor.
+//	orig_output: The original output tensor.
+//	grad: Output backprop of shape `[batch, depth, rows, cols, channels]`.
 //	ksize: 1-D tensor of length 5. The size of the window for each dimension of
 // the input tensor. Must have `ksize[0] = ksize[4] = 1`.
 //	strides: 1-D tensor of length 5. The stride of the sliding window for each
 // dimension of `input`. Must have `strides[0] = strides[4] = 1`.
 //	padding: The type of padding algorithm to use.
 //
-// Returns The average pooled output tensor.
-func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DAttr) (output tf.Output) {
+// Returns Gradients of gradients w.r.t. the input to `max_pool`.
+func MaxPool3DGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPool3DGradGradAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -5242,9 +5297,9 @@ func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, pa
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "AvgPool3D",
+		Type: "MaxPool3DGradGrad",
 		Input: []tf.Input{
-			input,
+			orig_input, orig_output, grad,
 		},
 		Attrs: attrs,
 	}
@@ -5252,35 +5307,6 @@ func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, pa
 	return op.Output(0)
 }
 
-// Produces the max pool of the input tensor for quantized types.
-//
-// Arguments:
-//	input: The 4D (batch x rows x cols x depth) Tensor to MaxReduce over.
-//	min_input: The float value that the lowest quantized input value represents.
-//	max_input: The float value that the highest quantized input value represents.
-//	ksize: The size of the window for each dimension of the input tensor.
-// The length must be 4 to match the number of dimensions of the input.
-//	strides: The stride of the sliding window for each dimension of the input
-// tensor. The length must be 4 to match the number of dimensions of the input.
-//	padding: The type of padding algorithm to use.
-//
-// Returns The float value that the lowest quantized output value represents.The float value that the highest quantized output value represents.
-func QuantizedMaxPool(scope *Scope, input tf.Output, min_input tf.Output, max_input tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output, min_output tf.Output, max_output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
-	opspec := tf.OpSpec{
-		Type: "QuantizedMaxPool",
-		Input: []tf.Input{
-			input, min_input, max_input,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
 // FakeQuantWithMinMaxArgsGradientAttr is an optional argument to FakeQuantWithMinMaxArgsGradient.
 type FakeQuantWithMinMaxArgsGradientAttr func(optionalAttr)
 
@@ -5403,6 +5429,82 @@ func Equal(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
+// AvgPool3DAttr is an optional argument to AvgPool3D.
+type AvgPool3DAttr func(optionalAttr)
+
+// AvgPool3DDataFormat sets the optional data_format attribute to value.
+//
+// value: The data format of the input and output data. With the
+// default format "NDHWC", the data is stored in the order of:
+//     [batch, in_depth, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCDHW", the data storage order is:
+//     [batch, in_channels, in_depth, in_height, in_width].
+// If not specified, defaults to "NDHWC"
+func AvgPool3DDataFormat(value string) AvgPool3DAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Performs 3D average pooling on the input.
+//
+// Arguments:
+//	input: Shape `[batch, depth, rows, cols, channels]` tensor to pool over.
+//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
+// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
+//	strides: 1-D tensor of length 5. The stride of the sliding window for each
+// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
+//	padding: The type of padding algorithm to use.
+//
+// Returns The average pooled output tensor.
+func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "AvgPool3D",
+		Input: []tf.Input{
+			input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Produces the max pool of the input tensor for quantized types.
+//
+// Arguments:
+//	input: The 4D (batch x rows x cols x depth) Tensor to MaxReduce over.
+//	min_input: The float value that the lowest quantized input value represents.
+//	max_input: The float value that the highest quantized input value represents.
+//	ksize: The size of the window for each dimension of the input tensor.
+// The length must be 4 to match the number of dimensions of the input.
+//	strides: The stride of the sliding window for each dimension of the input
+// tensor. The length must be 4 to match the number of dimensions of the input.
+//	padding: The type of padding algorithm to use.
+//
+// Returns The float value that the lowest quantized output value represents.The float value that the highest quantized output value represents.
+func QuantizedMaxPool(scope *Scope, input tf.Output, min_input tf.Output, max_input tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output, min_output tf.Output, max_output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "QuantizedMaxPool",
+		Input: []tf.Input{
+			input, min_input, max_input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
 // Conv3DBackpropInputV2Attr is an optional argument to Conv3DBackpropInputV2.
 type Conv3DBackpropInputV2Attr func(optionalAttr)
 
@@ -5959,64 +6061,6 @@ func BiasAddV1(scope *Scope, value tf.Output, bias tf.Output) (output tf.Output)
 	return op.Output(0)
 }
 
-// FractionalAvgPoolGradAttr is an optional argument to FractionalAvgPoolGrad.
-type FractionalAvgPoolGradAttr func(optionalAttr)
-
-// FractionalAvgPoolGradOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [41/3, 26/3] for fractional avg pooling.
-// If not specified, defaults to false
-func FractionalAvgPoolGradOverlapping(value bool) FractionalAvgPoolGradAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// Computes gradient of the FractionalAvgPool function.
-//
-// Unlike FractionalMaxPoolGrad, we don't need to find arg_max for
-// FractionalAvgPoolGrad, we just need to evenly back-propagate each element of
-// out_backprop to those indices that form the same pooling cell. Therefore, we
-// just need to know the shape of original input tensor, instead of the whole
-// tensor.
-//
-// Arguments:
-//	orig_input_tensor_shape: Original input tensor shape for `fractional_avg_pool`
-//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
-// w.r.t. the output of `fractional_avg_pool`.
-//	row_pooling_sequence: row pooling sequence, form pooling region with
-// col_pooling_sequence.
-//	col_pooling_sequence: column pooling sequence, form pooling region with
-// row_pooling sequence.
-//
-// Returns 4-D.  Gradients w.r.t. the input of `fractional_avg_pool`.
-func FractionalAvgPoolGrad(scope *Scope, orig_input_tensor_shape tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalAvgPoolGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalAvgPoolGrad",
-		Input: []tf.Input{
-			orig_input_tensor_shape, out_backprop, row_pooling_sequence, col_pooling_sequence,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Conv2DBackpropInputAttr is an optional argument to Conv2DBackpropInput.
 type Conv2DBackpropInputAttr func(optionalAttr)
 
@@ -6219,104 +6263,6 @@ func Sigmoid(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
-// FractionalMaxPoolGradAttr is an optional argument to FractionalMaxPoolGrad.
-type FractionalMaxPoolGradAttr func(optionalAttr)
-
-// FractionalMaxPoolGradOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [20, 16] for fractional max pooling.
-// If not specified, defaults to false
-func FractionalMaxPoolGradOverlapping(value bool) FractionalMaxPoolGradAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// Computes gradient of the FractionalMaxPool function.
-//
-// Arguments:
-//	orig_input: Original input for `fractional_max_pool`
-//	orig_output: Original output for `fractional_max_pool`
-//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
-// w.r.t. the output of `fractional_max_pool`.
-//	row_pooling_sequence: row pooling sequence, form pooling region with
-// col_pooling_sequence.
-//	col_pooling_sequence: column pooling sequence, form pooling region with
-// row_pooling sequence.
-//
-// Returns 4-D.  Gradients w.r.t. the input of `fractional_max_pool`.
-func FractionalMaxPoolGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalMaxPoolGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalMaxPoolGrad",
-		Input: []tf.Input{
-			orig_input, orig_output, out_backprop, row_pooling_sequence, col_pooling_sequence,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// ResourceApplyAdagradDAAttr is an optional argument to ResourceApplyAdagradDA.
-type ResourceApplyAdagradDAAttr func(optionalAttr)
-
-// ResourceApplyAdagradDAUseLocking sets the optional use_locking attribute to value.
-//
-// value: If True, updating of the var and accum tensors will be protected by
-// a lock; otherwise the behavior is undefined, but may exhibit less contention.
-// If not specified, defaults to false
-func ResourceApplyAdagradDAUseLocking(value bool) ResourceApplyAdagradDAAttr {
-	return func(m optionalAttr) {
-		m["use_locking"] = value
-	}
-}
-
-// Update '*var' according to the proximal adagrad scheme.
-//
-// Arguments:
-//	var_: Should be from a Variable().
-//	gradient_accumulator: Should be from a Variable().
-//	gradient_squared_accumulator: Should be from a Variable().
-//	grad: The gradient.
-//	lr: Scaling factor. Must be a scalar.
-//	l1: L1 regularization. Must be a scalar.
-//	l2: L2 regularization. Must be a scalar.
-//	global_step: Training step number. Must be a scalar.
-//
-// Returns the created operation.
-func ResourceApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceApplyAdagradDAAttr) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "ResourceApplyAdagradDA",
-		Input: []tf.Input{
-			var_, gradient_accumulator, gradient_squared_accumulator, grad, lr, l1, l2, global_step,
-		},
-		Attrs: attrs,
-	}
-	return scope.AddOperation(opspec)
-}
-
 // ComputeAccidentalHitsAttr is an optional argument to ComputeAccidentalHits.
 type ComputeAccidentalHitsAttr func(optionalAttr)
 
@@ -9304,6 +9250,64 @@ func FractionalMaxPool(scope *Scope, value tf.Output, pooling_ratio []float32, o
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
+// FractionalAvgPoolGradAttr is an optional argument to FractionalAvgPoolGrad.
+type FractionalAvgPoolGradAttr func(optionalAttr)
+
+// FractionalAvgPoolGradOverlapping sets the optional overlapping attribute to value.
+//
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [41/3, 26/3] for fractional avg pooling.
+// If not specified, defaults to false
+func FractionalAvgPoolGradOverlapping(value bool) FractionalAvgPoolGradAttr {
+	return func(m optionalAttr) {
+		m["overlapping"] = value
+	}
+}
+
+// Computes gradient of the FractionalAvgPool function.
+//
+// Unlike FractionalMaxPoolGrad, we don't need to find arg_max for
+// FractionalAvgPoolGrad, we just need to evenly back-propagate each element of
+// out_backprop to those indices that form the same pooling cell. Therefore, we
+// just need to know the shape of original input tensor, instead of the whole
+// tensor.
+//
+// Arguments:
+//	orig_input_tensor_shape: Original input tensor shape for `fractional_avg_pool`
+//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
+// w.r.t. the output of `fractional_avg_pool`.
+//	row_pooling_sequence: row pooling sequence, form pooling region with
+// col_pooling_sequence.
+//	col_pooling_sequence: column pooling sequence, form pooling region with
+// row_pooling sequence.
+//
+// Returns 4-D.  Gradients w.r.t. the input of `fractional_avg_pool`.
+func FractionalAvgPoolGrad(scope *Scope, orig_input_tensor_shape tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalAvgPoolGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "FractionalAvgPoolGrad",
+		Input: []tf.Input{
+			orig_input_tensor_shape, out_backprop, row_pooling_sequence, col_pooling_sequence,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Reorders a SparseTensor into the canonical, row-major ordering.
 //
 // Note that by convention, all sparse ops preserve the canonical ordering along
@@ -9769,6 +9773,35 @@ func RequantizationRange(scope *Scope, input tf.Output, input_min tf.Output, inp
 	return op.Output(0), op.Output(1)
 }
 
+// Computes second-order gradients of the maxpooling function.
+//
+// Arguments:
+//	input: The original input.
+//	grad: 4-D with shape `[batch, height, width, channels]`.  Gradients w.r.t. the
+// input of `max_pool`.
+//	argmax: The indices of the maximum values chosen for each output of `max_pool`.
+//	ksize: The size of the window for each dimension of the input tensor.
+//	strides: The stride of the sliding window for each dimension of the
+// input tensor.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients of gradients w.r.t. the input of `max_pool`.
+func MaxPoolGradGradWithArgmax(scope *Scope, input tf.Output, grad tf.Output, argmax tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "MaxPoolGradGradWithArgmax",
+		Input: []tf.Input{
+			input, grad, argmax,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // DepthwiseConv2dNativeBackpropInputAttr is an optional argument to DepthwiseConv2dNativeBackpropInput.
 type DepthwiseConv2dNativeBackpropInputAttr func(optionalAttr)
 
@@ -10520,8 +10553,105 @@ func ResourceSparseApplyAdagradDAUseLocking(value bool) ResourceSparseApplyAdagr
 //	l2: L2 regularization. Must be a scalar.
 //	global_step: Training step number. Must be a scalar.
 //
-// Returns the created operation.
-func ResourceSparseApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, indices tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceSparseApplyAdagradDAAttr) (o *tf.Operation) {
+// Returns the created operation.
+func ResourceSparseApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, indices tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceSparseApplyAdagradDAAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceSparseApplyAdagradDA",
+		Input: []tf.Input{
+			var_, gradient_accumulator, gradient_squared_accumulator, grad, indices, lr, l1, l2, global_step,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
+// ResourceApplyAdagradDAAttr is an optional argument to ResourceApplyAdagradDA.
+type ResourceApplyAdagradDAAttr func(optionalAttr)
+
+// ResourceApplyAdagradDAUseLocking sets the optional use_locking attribute to value.
+//
+// value: If True, updating of the var and accum tensors will be protected by
+// a lock; otherwise the behavior is undefined, but may exhibit less contention.
+// If not specified, defaults to false
+func ResourceApplyAdagradDAUseLocking(value bool) ResourceApplyAdagradDAAttr {
+	return func(m optionalAttr) {
+		m["use_locking"] = value
+	}
+}
+
+// Update '*var' according to the proximal adagrad scheme.
+//
+// Arguments:
+//	var_: Should be from a Variable().
+//	gradient_accumulator: Should be from a Variable().
+//	gradient_squared_accumulator: Should be from a Variable().
+//	grad: The gradient.
+//	lr: Scaling factor. Must be a scalar.
+//	l1: L1 regularization. Must be a scalar.
+//	l2: L2 regularization. Must be a scalar.
+//	global_step: Training step number. Must be a scalar.
+//
+// Returns the created operation.
+func ResourceApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceApplyAdagradDAAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceApplyAdagradDA",
+		Input: []tf.Input{
+			var_, gradient_accumulator, gradient_squared_accumulator, grad, lr, l1, l2, global_step,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
+// FractionalMaxPoolGradAttr is an optional argument to FractionalMaxPoolGrad.
+type FractionalMaxPoolGradAttr func(optionalAttr)
+
+// FractionalMaxPoolGradOverlapping sets the optional overlapping attribute to value.
+//
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [20, 16] for fractional max pooling.
+// If not specified, defaults to false
+func FractionalMaxPoolGradOverlapping(value bool) FractionalMaxPoolGradAttr {
+	return func(m optionalAttr) {
+		m["overlapping"] = value
+	}
+}
+
+// Computes gradient of the FractionalMaxPool function.
+//
+// Arguments:
+//	orig_input: Original input for `fractional_max_pool`
+//	orig_output: Original output for `fractional_max_pool`
+//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
+// w.r.t. the output of `fractional_max_pool`.
+//	row_pooling_sequence: row pooling sequence, form pooling region with
+// col_pooling_sequence.
+//	col_pooling_sequence: column pooling sequence, form pooling region with
+// row_pooling sequence.
+//
+// Returns 4-D.  Gradients w.r.t. the input of `fractional_max_pool`.
+func FractionalMaxPoolGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalMaxPoolGradAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -10530,13 +10660,14 @@ func ResourceSparseApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumul
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "ResourceSparseApplyAdagradDA",
+		Type: "FractionalMaxPoolGrad",
 		Input: []tf.Input{
-			var_, gradient_accumulator, gradient_squared_accumulator, grad, indices, lr, l1, l2, global_step,
+			orig_input, orig_output, out_backprop, row_pooling_sequence, col_pooling_sequence,
 		},
 		Attrs: attrs,
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
 // AvgPool3DGradAttr is an optional argument to AvgPool3DGrad.
@@ -12160,6 +12291,118 @@ func SparseDenseCwiseMul(scope *Scope, sp_indices tf.Output, sp_values tf.Output
 	return op.Output(0)
 }
 
+// NonMaxSuppressionAttr is an optional argument to NonMaxSuppression.
+type NonMaxSuppressionAttr func(optionalAttr)
+
+// NonMaxSuppressionIouThreshold sets the optional iou_threshold attribute to value.
+//
+// value: A float representing the threshold for deciding whether boxes
+// overlap too much with respect to IOU.
+// If not specified, defaults to 0.5
+func NonMaxSuppressionIouThreshold(value float32) NonMaxSuppressionAttr {
+	return func(m optionalAttr) {
+		m["iou_threshold"] = value
+	}
+}
+
+// Greedily selects a subset of bounding boxes in descending order of score,
+//
+// pruning away boxes that have high intersection-over-union (IOU) overlap
+// with previously selected boxes.  Bounding boxes are supplied as
+// [y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any
+// diagonal pair of box corners and the coordinates can be provided as normalized
+// (i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm
+// is agnostic to where the origin is in the coordinate system.  Note that this
+// algorithm is invariant to orthogonal transformations and translations
+// of the coordinate system; thus translating or reflections of the coordinate
+// system result in the same boxes being selected by the algorithm.
+//
+// The output of this operation is a set of integers indexing into the input
+// collection of bounding boxes representing the selected boxes.  The bounding
+// box coordinates corresponding to the selected indices can then be obtained
+// using the `tf.gather operation`.  For example:
+//
+//   selected_indices = tf.image.non_max_suppression(
+//       boxes, scores, max_output_size, iou_threshold)
+//   selected_boxes = tf.gather(boxes, selected_indices)
+//
+// Arguments:
+//	boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
+//	scores: A 1-D float tensor of shape `[num_boxes]` representing a single
+// score corresponding to each box (each row of boxes).
+//	max_output_size: A scalar integer tensor representing the maximum number of
+// boxes to be selected by non max suppression.
+//
+// Returns A 1-D integer tensor of shape `[M]` representing the selected
+// indices from the boxes tensor, where `M <= max_output_size`.
+func NonMaxSuppression(scope *Scope, boxes tf.Output, scores tf.Output, max_output_size tf.Output, optional ...NonMaxSuppressionAttr) (selected_indices tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "NonMaxSuppression",
+		Input: []tf.Input{
+			boxes, scores, max_output_size,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// ResourceApplyAdadeltaAttr is an optional argument to ResourceApplyAdadelta.
+type ResourceApplyAdadeltaAttr func(optionalAttr)
+
+// ResourceApplyAdadeltaUseLocking sets the optional use_locking attribute to value.
+//
+// value: If True, updating of the var, accum and update_accum tensors will be protected by
+// a lock; otherwise the behavior is undefined, but may exhibit less contention.
+// If not specified, defaults to false
+func ResourceApplyAdadeltaUseLocking(value bool) ResourceApplyAdadeltaAttr {
+	return func(m optionalAttr) {
+		m["use_locking"] = value
+	}
+}
+
+// Update '*var' according to the adadelta scheme.
+//
+// accum = rho() * accum + (1 - rho()) * grad.square();
+// update = (update_accum + epsilon).sqrt() * (accum + epsilon()).rsqrt() * grad;
+// update_accum = rho() * update_accum + (1 - rho()) * update.square();
+// var -= update;
+//
+// Arguments:
+//	var_: Should be from a Variable().
+//	accum: Should be from a Variable().
+//	accum_update: Should be from a Variable().
+//	lr: Scaling factor. Must be a scalar.
+//	rho: Decay factor. Must be a scalar.
+//	epsilon: Constant factor. Must be a scalar.
+//	grad: The gradient.
+//
+// Returns the created operation.
+func ResourceApplyAdadelta(scope *Scope, var_ tf.Output, accum tf.Output, accum_update tf.Output, lr tf.Output, rho tf.Output, epsilon tf.Output, grad tf.Output, optional ...ResourceApplyAdadeltaAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceApplyAdadelta",
+		Input: []tf.Input{
+			var_, accum, accum_update, lr, rho, epsilon, grad,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
 // Shuffle dimensions of x according to a permutation.
 //
 // The output `y` has the same rank as `x`. The shapes of `x` and `y` satisfy:
@@ -12861,6 +13104,11 @@ func GatherValidateIndices(value bool) GatherAttr {
 // If `indices` is a permutation and `len(indices) == params.shape[0]` then
 // this operation will permute `params` accordingly.
 //
+// `validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
+// `indices` are always validated to be within range. If assigned to GPU,
+// out-of-bound indices result in unspecified behavior (currently the result is
+// `0`, but this may become an error in the future).
+//
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 // <img style="width:100%" src="../../images/Gather.png" alt>
 // </div>
@@ -13341,132 +13589,16 @@ func ResizeBilinearAlignCorners(value bool) ResizeBilinearAttr {
 
 // Resize `images` to `size` using bilinear interpolation.
 //
-// Input images can be of different types but output images are always float.
-//
-// Arguments:
-//	images: 4-D with shape `[batch, height, width, channels]`.
-//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
-// new size for the images.
-//
-// Returns 4-D with shape
-// `[batch, new_height, new_width, channels]`.
-func ResizeBilinear(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeBilinearAttr) (resized_images tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "ResizeBilinear",
-		Input: []tf.Input{
-			images, size,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// RandomPoissonAttr is an optional argument to RandomPoisson.
-type RandomPoissonAttr func(optionalAttr)
-
-// RandomPoissonSeed sets the optional seed attribute to value.
-//
-// value: If either `seed` or `seed2` are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func RandomPoissonSeed(value int64) RandomPoissonAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// RandomPoissonSeed2 sets the optional seed2 attribute to value.
-//
-// value: A second seed to avoid seed collision.
-// If not specified, defaults to 0
-func RandomPoissonSeed2(value int64) RandomPoissonAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Outputs random values from the Poisson distribution(s) described by rate.
-//
-// This op uses two algorithms, depending on rate. If rate >= 10, then
-// the algorithm by Hormann is used to acquire samples via
-// transformation-rejection.
-// See http://www.sciencedirect.com/science/article/pii/0167668793909974.
-//
-// Otherwise, Knuth's algorithm is used to acquire samples via multiplying uniform
-// random variables.
-// See Donald E. Knuth (1969). Seminumerical Algorithms. The Art of Computer
-// Programming, Volume 2. Addison Wesley
-//
-// Arguments:
-//	shape: 1-D integer tensor. Shape of independent samples to draw from each
-// distribution described by the shape parameters given in rate.
-//	rate: A tensor in which each scalar is a "rate" parameter describing the
-// associated poisson distribution.
-//
-// Returns A tensor with shape `shape + shape(rate)`. Each slice
-// `[:, ..., :, i0, i1, ...iN]` contains the samples drawn for
-// `rate[i0, i1, ...iN]`. The dtype of the output matches the dtype of
-// rate.
-func RandomPoisson(scope *Scope, shape tf.Output, rate tf.Output, optional ...RandomPoissonAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "RandomPoisson",
-		Input: []tf.Input{
-			shape, rate,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// ResourceApplyAdadeltaAttr is an optional argument to ResourceApplyAdadelta.
-type ResourceApplyAdadeltaAttr func(optionalAttr)
-
-// ResourceApplyAdadeltaUseLocking sets the optional use_locking attribute to value.
-//
-// value: If True, updating of the var, accum and update_accum tensors will be protected by
-// a lock; otherwise the behavior is undefined, but may exhibit less contention.
-// If not specified, defaults to false
-func ResourceApplyAdadeltaUseLocking(value bool) ResourceApplyAdadeltaAttr {
-	return func(m optionalAttr) {
-		m["use_locking"] = value
-	}
-}
-
-// Update '*var' according to the adadelta scheme.
-//
-// accum = rho() * accum + (1 - rho()) * grad.square();
-// update = (update_accum + epsilon).sqrt() * (accum + epsilon()).rsqrt() * grad;
-// update_accum = rho() * update_accum + (1 - rho()) * update.square();
-// var -= update;
-//
-// Arguments:
-//	var_: Should be from a Variable().
-//	accum: Should be from a Variable().
-//	accum_update: Should be from a Variable().
-//	lr: Scaling factor. Must be a scalar.
-//	rho: Decay factor. Must be a scalar.
-//	epsilon: Constant factor. Must be a scalar.
-//	grad: The gradient.
-//
-// Returns the created operation.
-func ResourceApplyAdadelta(scope *Scope, var_ tf.Output, accum tf.Output, accum_update tf.Output, lr tf.Output, rho tf.Output, epsilon tf.Output, grad tf.Output, optional ...ResourceApplyAdadeltaAttr) (o *tf.Operation) {
+// Input images can be of different types but output images are always float.
+//
+// Arguments:
+//	images: 4-D with shape `[batch, height, width, channels]`.
+//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
+// new size for the images.
+//
+// Returns 4-D with shape
+// `[batch, new_height, new_width, channels]`.
+func ResizeBilinear(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeBilinearAttr) (resized_images tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -13475,60 +13607,64 @@ func ResourceApplyAdadelta(scope *Scope, var_ tf.Output, accum tf.Output, accum_
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "ResourceApplyAdadelta",
+		Type: "ResizeBilinear",
 		Input: []tf.Input{
-			var_, accum, accum_update, lr, rho, epsilon, grad,
+			images, size,
 		},
 		Attrs: attrs,
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
-// NonMaxSuppressionAttr is an optional argument to NonMaxSuppression.
-type NonMaxSuppressionAttr func(optionalAttr)
+// RandomPoissonAttr is an optional argument to RandomPoisson.
+type RandomPoissonAttr func(optionalAttr)
 
-// NonMaxSuppressionIouThreshold sets the optional iou_threshold attribute to value.
+// RandomPoissonSeed sets the optional seed attribute to value.
 //
-// value: A float representing the threshold for deciding whether boxes
-// overlap too much with respect to IOU.
-// If not specified, defaults to 0.5
-func NonMaxSuppressionIouThreshold(value float32) NonMaxSuppressionAttr {
+// value: If either `seed` or `seed2` are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func RandomPoissonSeed(value int64) RandomPoissonAttr {
 	return func(m optionalAttr) {
-		m["iou_threshold"] = value
+		m["seed"] = value
 	}
 }
 
-// Greedily selects a subset of bounding boxes in descending order of score,
+// RandomPoissonSeed2 sets the optional seed2 attribute to value.
 //
-// pruning away boxes that have high intersection-over-union (IOU) overlap
-// with previously selected boxes.  Bounding boxes are supplied as
-// [y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any
-// diagonal pair of box corners and the coordinates can be provided as normalized
-// (i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm
-// is agnostic to where the origin is in the coordinate system.  Note that this
-// algorithm is invariant to orthogonal transformations and translations
-// of the coordinate system; thus translating or reflections of the coordinate
-// system result in the same boxes being selected by the algorithm.
+// value: A second seed to avoid seed collision.
+// If not specified, defaults to 0
+func RandomPoissonSeed2(value int64) RandomPoissonAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Outputs random values from the Poisson distribution(s) described by rate.
 //
-// The output of this operation is a set of integers indexing into the input
-// collection of bounding boxes representing the selected boxes.  The bounding
-// box coordinates corresponding to the selected indices can then be obtained
-// using the `tf.gather operation`.  For example:
+// This op uses two algorithms, depending on rate. If rate >= 10, then
+// the algorithm by Hormann is used to acquire samples via
+// transformation-rejection.
+// See http://www.sciencedirect.com/science/article/pii/0167668793909974.
 //
-//   selected_indices = tf.image.non_max_suppression(
-//       boxes, scores, max_output_size, iou_threshold)
-//   selected_boxes = tf.gather(boxes, selected_indices)
+// Otherwise, Knuth's algorithm is used to acquire samples via multiplying uniform
+// random variables.
+// See Donald E. Knuth (1969). Seminumerical Algorithms. The Art of Computer
+// Programming, Volume 2. Addison Wesley
 //
 // Arguments:
-//	boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
-//	scores: A 1-D float tensor of shape `[num_boxes]` representing a single
-// score corresponding to each box (each row of boxes).
-//	max_output_size: A scalar integer tensor representing the maximum number of
-// boxes to be selected by non max suppression.
+//	shape: 1-D integer tensor. Shape of independent samples to draw from each
+// distribution described by the shape parameters given in rate.
+//	rate: A tensor in which each scalar is a "rate" parameter describing the
+// associated poisson distribution.
 //
-// Returns A 1-D integer tensor of shape `[M]` representing the selected
-// indices from the boxes tensor, where `M <= max_output_size`.
-func NonMaxSuppression(scope *Scope, boxes tf.Output, scores tf.Output, max_output_size tf.Output, optional ...NonMaxSuppressionAttr) (selected_indices tf.Output) {
+// Returns A tensor with shape `shape + shape(rate)`. Each slice
+// `[:, ..., :, i0, i1, ...iN]` contains the samples drawn for
+// `rate[i0, i1, ...iN]`. The dtype of the output matches the dtype of
+// rate.
+func RandomPoisson(scope *Scope, shape tf.Output, rate tf.Output, optional ...RandomPoissonAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -13537,9 +13673,9 @@ func NonMaxSuppression(scope *Scope, boxes tf.Output, scores tf.Output, max_outp
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "NonMaxSuppression",
+		Type: "RandomPoisson",
 		Input: []tf.Input{
-			boxes, scores, max_output_size,
+			shape, rate,
 		},
 		Attrs: attrs,
 	}
@@ -15015,170 +15151,6 @@ func NotEqual(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
-// FractionalAvgPoolAttr is an optional argument to FractionalAvgPool.
-type FractionalAvgPoolAttr func(optionalAttr)
-
-// FractionalAvgPoolPseudoRandom sets the optional pseudo_random attribute to value.
-//
-// value: When set to True, generates the pooling sequence in a
-// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
-// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
-// difference between pseudorandom and random.
-// If not specified, defaults to false
-func FractionalAvgPoolPseudoRandom(value bool) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["pseudo_random"] = value
-	}
-}
-
-// FractionalAvgPoolOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [41/3, 26/3] for fractional avg pooling.
-// If not specified, defaults to false
-func FractionalAvgPoolOverlapping(value bool) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// FractionalAvgPoolDeterministic sets the optional deterministic attribute to value.
-//
-// value: When set to True, a fixed pooling region will be used when
-// iterating over a FractionalAvgPool node in the computation graph. Mainly used
-// in unit test to make FractionalAvgPool deterministic.
-// If not specified, defaults to false
-func FractionalAvgPoolDeterministic(value bool) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["deterministic"] = value
-	}
-}
-
-// FractionalAvgPoolSeed sets the optional seed attribute to value.
-//
-// value: If either seed or seed2 are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func FractionalAvgPoolSeed(value int64) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// FractionalAvgPoolSeed2 sets the optional seed2 attribute to value.
-//
-// value: An second seed to avoid seed collision.
-// If not specified, defaults to 0
-func FractionalAvgPoolSeed2(value int64) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Performs fractional average pooling on the input.
-//
-// Fractional average pooling is similar to Fractional max pooling in the pooling
-// region generation step. The only difference is that after pooling regions are
-// generated, a mean operation is performed instead of a max operation in each
-// pooling region.
-//
-// Arguments:
-//	value: 4-D with shape `[batch, height, width, channels]`.
-//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
-// supports row and col dimension and should be >= 1.0. For example, a valid
-// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
-// must be 1.0 because we don't allow pooling on batch and channels
-// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
-// respectively.
-//
-// Returns output tensor after fractional avg pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
-func FractionalAvgPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalAvgPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalAvgPool",
-		Input: []tf.Input{
-			value,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// RandomCropAttr is an optional argument to RandomCrop.
-type RandomCropAttr func(optionalAttr)
-
-// RandomCropSeed sets the optional seed attribute to value.
-//
-// value: If either seed or seed2 are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func RandomCropSeed(value int64) RandomCropAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// RandomCropSeed2 sets the optional seed2 attribute to value.
-//
-// value: An second seed to avoid seed collision.
-// If not specified, defaults to 0
-func RandomCropSeed2(value int64) RandomCropAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Randomly crop `image`.
-//
-// DEPRECATED at GraphDef version 8: Random crop is now pure Python
-//
-// `size` is a 1-D int64 tensor with 2 elements representing the crop height and
-// width.  The values must be non negative.
-//
-// This Op picks a random location in `image` and crops a `height` by `width`
-// rectangle from that location.  The random location is picked so the cropped
-// area will fit inside the original image.
-//
-// Arguments:
-//	image: 3-D of shape `[height, width, channels]`.
-//	size: 1-D of length 2 containing: `crop_height`, `crop_width`..
-//
-// Returns 3-D of shape `[crop_height, crop_width, channels].`
-func RandomCrop(scope *Scope, image tf.Output, size tf.Output, optional ...RandomCropAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "RandomCrop",
-		Input: []tf.Input{
-			image, size,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Returns immutable tensor from memory region.
 //
 // The current implementation memmaps the tensor from a file.
@@ -15493,6 +15465,170 @@ func IdentityReaderV2(scope *Scope, optional ...IdentityReaderV2Attr) (reader_ha
 	return op.Output(0)
 }
 
+// RandomCropAttr is an optional argument to RandomCrop.
+type RandomCropAttr func(optionalAttr)
+
+// RandomCropSeed sets the optional seed attribute to value.
+//
+// value: If either seed or seed2 are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func RandomCropSeed(value int64) RandomCropAttr {
+	return func(m optionalAttr) {
+		m["seed"] = value
+	}
+}
+
+// RandomCropSeed2 sets the optional seed2 attribute to value.
+//
+// value: An second seed to avoid seed collision.
+// If not specified, defaults to 0
+func RandomCropSeed2(value int64) RandomCropAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Randomly crop `image`.
+//
+// DEPRECATED at GraphDef version 8: Random crop is now pure Python
+//
+// `size` is a 1-D int64 tensor with 2 elements representing the crop height and
+// width.  The values must be non negative.
+//
+// This Op picks a random location in `image` and crops a `height` by `width`
+// rectangle from that location.  The random location is picked so the cropped
+// area will fit inside the original image.
+//
+// Arguments:
+//	image: 3-D of shape `[height, width, channels]`.
+//	size: 1-D of length 2 containing: `crop_height`, `crop_width`..
+//
+// Returns 3-D of shape `[crop_height, crop_width, channels].`
+func RandomCrop(scope *Scope, image tf.Output, size tf.Output, optional ...RandomCropAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "RandomCrop",
+		Input: []tf.Input{
+			image, size,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// FractionalAvgPoolAttr is an optional argument to FractionalAvgPool.
+type FractionalAvgPoolAttr func(optionalAttr)
+
+// FractionalAvgPoolPseudoRandom sets the optional pseudo_random attribute to value.
+//
+// value: When set to True, generates the pooling sequence in a
+// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
+// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
+// difference between pseudorandom and random.
+// If not specified, defaults to false
+func FractionalAvgPoolPseudoRandom(value bool) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["pseudo_random"] = value
+	}
+}
+
+// FractionalAvgPoolOverlapping sets the optional overlapping attribute to value.
+//
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [41/3, 26/3] for fractional avg pooling.
+// If not specified, defaults to false
+func FractionalAvgPoolOverlapping(value bool) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["overlapping"] = value
+	}
+}
+
+// FractionalAvgPoolDeterministic sets the optional deterministic attribute to value.
+//
+// value: When set to True, a fixed pooling region will be used when
+// iterating over a FractionalAvgPool node in the computation graph. Mainly used
+// in unit test to make FractionalAvgPool deterministic.
+// If not specified, defaults to false
+func FractionalAvgPoolDeterministic(value bool) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["deterministic"] = value
+	}
+}
+
+// FractionalAvgPoolSeed sets the optional seed attribute to value.
+//
+// value: If either seed or seed2 are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func FractionalAvgPoolSeed(value int64) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["seed"] = value
+	}
+}
+
+// FractionalAvgPoolSeed2 sets the optional seed2 attribute to value.
+//
+// value: An second seed to avoid seed collision.
+// If not specified, defaults to 0
+func FractionalAvgPoolSeed2(value int64) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Performs fractional average pooling on the input.
+//
+// Fractional average pooling is similar to Fractional max pooling in the pooling
+// region generation step. The only difference is that after pooling regions are
+// generated, a mean operation is performed instead of a max operation in each
+// pooling region.
+//
+// Arguments:
+//	value: 4-D with shape `[batch, height, width, channels]`.
+//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
+// supports row and col dimension and should be >= 1.0. For example, a valid
+// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
+// must be 1.0 because we don't allow pooling on batch and channels
+// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
+// respectively.
+//
+// Returns output tensor after fractional avg pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
+func FractionalAvgPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalAvgPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "FractionalAvgPool",
+		Input: []tf.Input{
+			value,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
 // Produces the average pool of the input tensor for quantized types.
 //
 // Arguments:
@@ -18157,59 +18293,6 @@ func Bincount(scope *Scope, arr tf.Output, size tf.Output, weights tf.Output) (b
 	return op.Output(0)
 }
 
-// CropAndResizeGradBoxesAttr is an optional argument to CropAndResizeGradBoxes.
-type CropAndResizeGradBoxesAttr func(optionalAttr)
-
-// CropAndResizeGradBoxesMethod sets the optional method attribute to value.
-//
-// value: A string specifying the interpolation method. Only 'bilinear' is
-// supported for now.
-// If not specified, defaults to "bilinear"
-func CropAndResizeGradBoxesMethod(value string) CropAndResizeGradBoxesAttr {
-	return func(m optionalAttr) {
-		m["method"] = value
-	}
-}
-
-// Computes the gradient of the crop_and_resize op wrt the input boxes tensor.
-//
-// Arguments:
-//	grads: A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
-//	image: A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
-// Both `image_height` and `image_width` need to be positive.
-//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
-// specifies the coordinates of a box in the `box_ind[i]` image and is specified
-// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
-// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
-// `[0, 1]` interval of normalized image height is mapped to
-// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
-// which case the sampled crop is an up-down flipped version of the original
-// image. The width dimension is treated similarly. Normalized coordinates
-// outside the `[0, 1]` range are allowed, in which case we use
-// `extrapolation_value` to extrapolate the input image values.
-//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
-// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
-//
-// Returns A 2-D tensor of shape `[num_boxes, 4]`.
-func CropAndResizeGradBoxes(scope *Scope, grads tf.Output, image tf.Output, boxes tf.Output, box_ind tf.Output, optional ...CropAndResizeGradBoxesAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "CropAndResizeGradBoxes",
-		Input: []tf.Input{
-			grads, image, boxes, box_ind,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Reshapes a quantized tensor as per the Reshape op.
 //
 // ```
@@ -20075,6 +20158,54 @@ func TensorArrayGatherV3(scope *Scope, handle tf.Output, indices tf.Output, flow
 	return op.Output(0)
 }
 
+// MaxPoolGradGradAttr is an optional argument to MaxPoolGradGrad.
+type MaxPoolGradGradAttr func(optionalAttr)
+
+// MaxPoolGradGradDataFormat sets the optional data_format attribute to value.
+//
+// value: Specify the data format of the input and output data. With the
+// default format "NHWC", the data is stored in the order of:
+//     [batch, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCHW", the data storage order of:
+//     [batch, in_channels, in_height, in_width].
+// If not specified, defaults to "NHWC"
+func MaxPoolGradGradDataFormat(value string) MaxPoolGradGradAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Computes second-order gradients of the maxpooling function.
+//
+// Arguments:
+//	orig_input: The original input tensor.
+//	orig_output: The original output tensor.
+//	grad: 4-D.  Gradients of gradients w.r.t. the input of `max_pool`.
+//	ksize: The size of the window for each dimension of the input tensor.
+//	strides: The stride of the sliding window for each dimension of the
+// input tensor.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients of gradients w.r.t. the input to `max_pool`.
+func MaxPoolGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPoolGradGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MaxPoolGradGrad",
+		Input: []tf.Input{
+			orig_input, orig_output, grad,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // 3D real-valued fast Fourier transform.
 //
 // Computes the 3-dimensional discrete Fourier transform of a real-valued signal
-- 
GitLab


From c354ba3470a56e271cff63e037509d9fbb253110 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 16:34:14 -0800
Subject: [PATCH 0125/1563] Update ops-related pbtxt files. Change: 152203174

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 747 +++++++++++++++++-
 tensorflow/core/ops/ops.pbtxt                 | 373 +++++++--
 2 files changed, 1042 insertions(+), 78 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 2af4e8692b..c538a278a3 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1782,6 +1782,69 @@ op {
     }
   }
 }
+op {
+  name: "AvgPool"
+  input_arg {
+    name: "value"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "AvgPool3D"
   input_arg {
@@ -2097,6 +2160,73 @@ op {
     }
   }
 }
+op {
+  name: "AvgPoolGrad"
+  input_arg {
+    name: "orig_input_shape"
+    type: DT_INT32
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "Barrier"
   output_arg {
@@ -9755,6 +9885,72 @@ op {
     }
   }
 }
+op {
+  name: "MaxPool"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+}
 op {
   name: "MaxPool3D"
   input_arg {
@@ -10018,14 +10214,14 @@ op {
   }
 }
 op {
-  name: "MaxPoolGrad"
+  name: "MaxPool3DGrad"
   input_arg {
     name: "orig_input"
-    type_attr: "T"
+    type_attr: "TInput"
   }
   input_arg {
     name: "orig_output"
-    type_attr: "T"
+    type_attr: "TInput"
   }
   input_arg {
     name: "grad"
@@ -10039,13 +10235,13 @@ op {
     name: "ksize"
     type: "list(int)"
     has_minimum: true
-    minimum: 4
+    minimum: 5
   }
   attr {
     name: "strides"
     type: "list(int)"
     has_minimum: true
-    minimum: 4
+    minimum: 5
   }
   attr {
     name: "padding"
@@ -10061,12 +10257,12 @@ op {
     name: "data_format"
     type: "string"
     default_value {
-      s: "NHWC"
+      s: "NDHWC"
     }
     allowed_values {
       list {
-        s: "NHWC"
-        s: "NCHW"
+        s: "NDHWC"
+        s: "NCDHW"
       }
     }
   }
@@ -10079,24 +10275,61 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "TInput"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
         type: DT_HALF
       }
     }
   }
 }
 op {
-  name: "MaxPoolGradWithArgmax"
+  name: "MaxPool3DGradGrad"
   input_arg {
-    name: "input"
+    name: "orig_input"
     type_attr: "T"
   }
   input_arg {
-    name: "grad"
+    name: "orig_output"
     type_attr: "T"
   }
   input_arg {
-    name: "argmax"
-    type_attr: "Targmax"
+    name: "grad"
+    type_attr: "T"
   }
   output_arg {
     name: "output"
@@ -10106,7 +10339,358 @@ op {
     name: "ksize"
     type: "list(int)"
     has_minimum: true
-    minimum: 4
+    minimum: 5
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 5
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NDHWC"
+    }
+    allowed_values {
+      list {
+        s: "NDHWC"
+        s: "NCDHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGrad"
+  input_arg {
+    name: "orig_input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGrad"
+  input_arg {
+    name: "orig_input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGradGrad"
+  input_arg {
+    name: "orig_input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGradGradWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGradWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
   }
   attr {
     name: "strides"
@@ -10148,6 +10732,74 @@ op {
     }
   }
 }
+op {
+  name: "MaxPoolGradWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "MaxPoolWithArgmax"
   input_arg {
@@ -10211,6 +10863,73 @@ op {
     }
   }
 }
+op {
+  name: "MaxPoolWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    default_value {
+      type: DT_INT64
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "Maximum"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index d1f9bbb391..172bdf02e2 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -2034,8 +2034,14 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_HALF
         type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
       }
     }
   }
@@ -2259,8 +2265,14 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_HALF
         type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
       }
     }
   }
@@ -8465,7 +8477,7 @@ op {
     }
   }
   summary: "Gather slices from `params` according to `indices`."
-  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/Gather.png\" alt>\n</div>"
+  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in unspecified behavior (currently the result is\n`0`, but this may become an error in the future).\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/Gather.png\" alt>\n</div>"
 }
 op {
   name: "GatherNd"
@@ -10574,6 +10586,13 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -10699,12 +10718,12 @@ op {
   input_arg {
     name: "orig_input"
     description: "The original input tensor."
-    type: DT_FLOAT
+    type_attr: "TInput"
   }
   input_arg {
     name: "orig_output"
     description: "The original output tensor."
-    type: DT_FLOAT
+    type_attr: "TInput"
   }
   input_arg {
     name: "grad"
@@ -10757,6 +10776,34 @@ op {
   attr {
     name: "T"
     type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "TInput"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
     allowed_values {
       list {
         type: DT_FLOAT
@@ -10778,6 +10825,86 @@ op {
   }
   summary: "Computes gradients of max pooling function."
 }
+op {
+  name: "MaxPool3DGradGrad"
+  input_arg {
+    name: "orig_input"
+    description: "The original input tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    description: "The original output tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    description: "Output backprop of shape `[batch, depth, rows, cols, channels]`."
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    description: "Gradients of gradients w.r.t. the input to `max_pool`."
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    description: "1-D tensor of length 5. The size of the window for each dimension of\nthe input tensor. Must have `ksize[0] = ksize[4] = 1`."
+    has_minimum: true
+    minimum: 5
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    description: "1-D tensor of length 5. The stride of the sliding window for each\ndimension of `input`. Must have `strides[0] = strides[4] = 1`."
+    has_minimum: true
+    minimum: 5
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    description: "The type of padding algorithm to use."
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NDHWC"
+    }
+    description: "The data format of the input and output data. With the\ndefault format \"NDHWC\", the data is stored in the order of:\n    [batch, in_depth, in_height, in_width, in_channels].\nAlternatively, the format could be \"NCDHW\", the data storage order is:\n    [batch, in_channels, in_depth, in_height, in_width]."
+    allowed_values {
+      list {
+        s: "NDHWC"
+        s: "NCDHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  summary: "Computes second-order gradients of the maxpooling function."
+}
 op {
   name: "MaxPoolGrad"
   input_arg {
@@ -10848,12 +10975,175 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
   }
   summary: "Computes gradients of the maxpooling function."
 }
+op {
+  name: "MaxPoolGradGrad"
+  input_arg {
+    name: "orig_input"
+    description: "The original input tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    description: "The original output tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    description: "4-D.  Gradients of gradients w.r.t. the input of `max_pool`."
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    description: "Gradients of gradients w.r.t. the input to `max_pool`."
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    description: "The size of the window for each dimension of the input tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    description: "The stride of the sliding window for each dimension of the\ninput tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    description: "The type of padding algorithm to use."
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    description: "Specify the data format of the input and output data. With the\ndefault format \"NHWC\", the data is stored in the order of:\n    [batch, in_height, in_width, in_channels].\nAlternatively, the format could be \"NCHW\", the data storage order of:\n    [batch, in_channels, in_height, in_width]."
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  summary: "Computes second-order gradients of the maxpooling function."
+}
+op {
+  name: "MaxPoolGradGradWithArgmax"
+  input_arg {
+    name: "input"
+    description: "The original input."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    description: "4-D with shape `[batch, height, width, channels]`.  Gradients w.r.t. the\ninput of `max_pool`."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    description: "The indices of the maximum values chosen for each output of `max_pool`."
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    description: "Gradients of gradients w.r.t. the input of `max_pool`."
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    description: "The size of the window for each dimension of the input tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    description: "The stride of the sliding window for each dimension of the\ninput tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    description: "The type of padding algorithm to use."
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  summary: "Computes second-order gradients of the maxpooling function."
+}
 op {
   name: "MaxPoolGradWithArgmax"
   input_arg {
@@ -10914,12 +11204,16 @@ op {
   attr {
     name: "T"
     type: "type"
-    default_value {
-      type: DT_FLOAT
-    }
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -10984,12 +11278,16 @@ op {
   attr {
     name: "T"
     type: "type"
-    default_value {
-      type: DT_FLOAT
-    }
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -25842,59 +26140,6 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
-op {
-  name: "UnsortedSegmentSum"
-  input_arg {
-    name: "data"
-    type_attr: "T"
-  }
-  input_arg {
-    name: "segment_ids"
-    description: "A tensor whose shape is a prefix of `data.shape`."
-    type_attr: "Tindices"
-  }
-  input_arg {
-    name: "num_segments"
-    type: DT_INT32
-  }
-  output_arg {
-    name: "output"
-    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
-    type_attr: "T"
-  }
-  attr {
-    name: "T"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
-      }
-    }
-  }
-  attr {
-    name: "Tindices"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_INT32
-        type: DT_INT64
-      }
-    }
-  }
-  summary: "Computes the max along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
-}
 op {
   name: "Unstage"
   output_arg {
-- 
GitLab


From 39c74da44a8fe40e83d3b0ec24904bc9ce303581 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Tue, 4 Apr 2017 16:53:37 -0800
Subject: [PATCH 0126/1563] Make ImportGraphDef() work with functions.

In addition to modify graph_constructor.cc, this patch adds some other
functionality to enable importing fucntions:
* Ability to add FunctionDefLibraries to Graphs and
  FunctionLibraryDefinitions (in addition to existing functions)
* FunctionDefsEqual() utility function
Change: 152205258
---
 tensorflow/core/framework/function.cc         |  42 ++++
 tensorflow/core/framework/function.h          |   7 +
 tensorflow/core/framework/function_test.cc    |  32 +++
 tensorflow/core/graph/graph.cc                |  42 +++-
 tensorflow/core/graph/graph.h                 |   6 +
 tensorflow/core/graph/graph_constructor.cc    |  16 +-
 tensorflow/core/graph/graph_constructor.h     |   2 -
 .../core/graph/graph_constructor_test.cc      | 209 ++++++++++++++++--
 tensorflow/core/graph/graph_test.cc           |  56 +++++
 tensorflow/core/util/equal_graph_def.cc       |  16 +-
 tensorflow/core/util/equal_graph_def.h        |   9 +
 tensorflow/core/util/equal_graph_def_test.cc  |  31 ++-
 12 files changed, 416 insertions(+), 52 deletions(-)

diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index e1603330eb..002929d58a 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
 
@@ -652,6 +653,36 @@ string DebugStringWhole(const GraphDef& gdef) {
   return ret;
 }
 
+bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2) {
+  // NOTE(skyewm): Using MessageDifferencer would be better here, but that is
+  // currently not included in tensorflow/core/platform/default/protobuf.h, so
+  // play fast and loose here.  I don't see anything in OpDef that should allow
+  // multiple equivalent string serializations, with the exception of
+  // AttrValues, which can vary for tensor values (see AreAttrValuesEqual()
+  // comments).
+  string sig1, sig2;
+  f1.signature().SerializeToString(&sig1);
+  f2.signature().SerializeToString(&sig2);
+  if (sig1 != sig2) return false;
+
+  if (f1.attr().size() != f2.attr().size()) return false;
+  for (auto iter1 : f1.attr()) {
+    auto iter2 = f2.attr().find(iter1.first);
+    if (iter2 == f2.attr().end()) return false;
+    if (!AreAttrValuesEqual(iter1.second, iter2->second)) return false;
+  }
+
+  if (!EqualRepeatedNodeDef(f1.node_def(), f2.node_def(), nullptr)) {
+    return false;
+  }
+
+  std::map<string, string> ret1(f1.ret().begin(), f1.ret().end());
+  std::map<string, string> ret2(f2.ret().begin(), f2.ret().end());
+  if (ret1 != ret2) return false;
+
+  return true;
+}
+
 string Canonicalize(const string& funcname,
                     const InstantiateAttrValueMap& attrs) {
   std::vector<string> entries;
@@ -802,6 +833,17 @@ Status FunctionLibraryDefinition::AddLibrary(
   return Status::OK();
 }
 
+Status FunctionLibraryDefinition::AddLibrary(
+    const FunctionDefLibrary& lib_def) {
+  for (const FunctionDef& fdef : lib_def.function()) {
+    TF_RETURN_IF_ERROR(AddFunctionDef(fdef));
+  }
+  for (const GradientDef& grad : lib_def.gradient()) {
+    TF_RETURN_IF_ERROR(AddGradientDef(grad));
+  }
+  return Status::OK();
+}
+
 string FunctionLibraryDefinition::FindGradient(const string& func) const {
   return gtl::FindWithDefault(func_grad_, func, "");
 }
diff --git a/tensorflow/core/framework/function.h b/tensorflow/core/framework/function.h
index e27311041f..63c868ac9b 100644
--- a/tensorflow/core/framework/function.h
+++ b/tensorflow/core/framework/function.h
@@ -230,6 +230,10 @@ string DebugString(const GraphDef& instantiated_func_def);
 // its supporting functions defined in its library).
 string DebugStringWhole(const GraphDef& gdef);
 
+// Returns true if f1 == f2. Compares all fields, including descriptions. Order
+// of NodeDefs doesn't matter.
+bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2);
+
 // Returns a canonicalized string for the instantiation of the
 // function of the given "name" and attributes "attrs".
 //
@@ -303,6 +307,9 @@ class FunctionLibraryDefinition : public OpRegistryInterface {
   // Adds the functions and gradients in 'other' to this function library.
   Status AddLibrary(const FunctionLibraryDefinition& other);
 
+  // Adds the functions and gradients in 'lib_def' to this function library.
+  Status AddLibrary(const FunctionDefLibrary& lib_def);
+
   // If the gradient function for 'func' is specified explicitly in
   // the library, returns the gradient function name.  Otherwise,
   // returns an empty string.
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index 414b097997..4cd9dce0de 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -1107,4 +1107,36 @@ TEST(FunctionLibraryDefinitionTest, GetAttr_Gradient) {
   EXPECT_EQ(annotation, false);  // WXPlusB has no custom gradient.
 }
 
+// TODO(skyewm): this could be more thorough
+TEST(FunctionDefsEqualTest, TestFunctionDefsEqual) {
+  // Equal functions
+  FunctionDef fdef1 = test::function::XTimesTwo();
+  FunctionDef fdef2 = test::function::XTimesTwo();
+  EXPECT_TRUE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different functions
+  fdef2 = test::function::XTimesFour();
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different signatures
+  fdef2 = test::function::XTimesTwo();
+  fdef2.mutable_signature()->mutable_input_arg(0)->set_name("foo");
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Descriptions must be equal
+  fdef2 = test::function::XTimesTwo();
+  fdef2.mutable_signature()->mutable_input_arg(0)->set_description("foo");
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different NodeDefs
+  fdef2 = test::function::XTimesTwo();
+  *fdef2.add_node_def() = fdef2.node_def(0);
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different return values
+  fdef2 = test::function::XTimesTwo();
+  (*fdef2.mutable_ret())["y"] = "y:z:1";  // originally is "y:z:0"
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+}
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index 65baf4cd85..c19764d082 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -360,6 +360,45 @@ void Graph::RemoveEdge(const Edge* e) {
   free_edges_.push_back(del);
 }
 
+Status Graph::AddFunctionLibrary(const FunctionDefLibrary& fdef_lib) {
+  for (const FunctionDef& fdef : fdef_lib.function()) {
+    const FunctionDef* preexisting_fdef = ops_.Find(fdef.signature().name());
+    if (preexisting_fdef != nullptr) {
+      if (!FunctionDefsEqual(*preexisting_fdef, fdef)) {
+        return errors::InvalidArgument(
+            "Cannot add function '", fdef.signature().name(),
+            "' because a different function with the same name already "
+            "exists.");
+      }
+      // Ignore duplicate FunctionDefs
+      continue;
+    }
+    // TODO(skyewm): fix test breakages and reenable this check
+    // const OpDef* op_def;
+    // if (ops_.LookUpOpDef(fdef.signature().name(), &op_def).ok()) {
+    //   return errors::InvalidArgument(
+    //       "Cannot add function '", fdef.signature().name(),
+    //       "' because an op with the same name already exists.");
+    // }
+    TF_RETURN_IF_ERROR(ops_.AddFunctionDef(fdef));
+  }
+  for (const GradientDef& grad : fdef_lib.gradient()) {
+    string preexisting_grad_func = ops_.FindGradient(grad.function_name());
+    if (!preexisting_grad_func.empty()) {
+      if (preexisting_grad_func != grad.gradient_func()) {
+        return errors::InvalidArgument(
+            "Cannot assign gradient function '", grad.gradient_func(), "' to '",
+            grad.function_name(), "' because it already has gradient function ",
+            "'", preexisting_grad_func, "'");
+      }
+      // Ignore duplicate GradientDefs
+      continue;
+    }
+    TF_RETURN_IF_ERROR(ops_.AddGradientDef(grad));
+  }
+  return Status::OK();
+}
+
 namespace {
 
 void AddInput(NodeDef* dst, StringPiece src_name, int src_slot) {
@@ -380,7 +419,8 @@ void Graph::ToGraphDef(GraphDef* graph_def) const {
 
 void Graph::ToGraphDefSubRange(GraphDef* graph_def, int from_node_id) const {
   graph_def->Clear();
-  graph_def->mutable_versions()->CopyFrom(versions());
+  *graph_def->mutable_versions() = versions();
+  *graph_def->mutable_library() = ops_.ToProto();
   std::vector<const Edge*>
       inputs;  // Construct this outside the loop for speed.
   for (auto id = from_node_id; id < num_node_ids(); ++id) {
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index 4af4b0bb10..83bb797d1b 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -324,6 +324,12 @@ class Graph {
   // REQUIRES: The edge must exist.
   void RemoveEdge(const Edge* edge);
 
+  // Adds the function and gradient definitions in `fdef_lib` to this graph's op
+  // registry. Ignores duplicate functions, and returns a bad status if an
+  // imported function differs from an existing function or op with the same
+  // name.
+  Status AddFunctionLibrary(const FunctionDefLibrary& fdef_lib);
+
   // The number of live nodes in the graph.
   //
   // Because nodes can be removed from the graph, num_nodes() is often
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
index 6b27e4e294..6b3b5d3604 100644
--- a/tensorflow/core/graph/graph_constructor.cc
+++ b/tensorflow/core/graph/graph_constructor.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/common_runtime/shape_refiner.h"
+#include "tensorflow/core/framework/function.h"
 #include "tensorflow/core/framework/function.pb.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def_util.h"
@@ -604,6 +605,10 @@ void GraphConstructor::AddPrefixToNodeDef(
 }
 
 Status GraphConstructor::Convert() {
+  // Import functions before adding nodes, since imported nodes may refer to
+  // functions
+  TF_RETURN_IF_ERROR(g_->AddFunctionLibrary(gdef_->library()));
+
   std::vector<InputInfo> inputs;
   int processed = 0;
   // Process the NodeDefs in topological order.
@@ -705,7 +710,12 @@ Status GraphConstructor::Convert() {
         TF_RETURN_IF_ERROR(MakeEdge(inputs[i].node, inputs[i].index, node, i));
       }
     }
-    TF_RETURN_IF_ERROR(ValidateShape(node));
+
+    // TODO(skyewm): remove conditional when b/35715995 ("Functions lack shape
+    // inference") is resolved.
+    if (g_->flib_def().Find(node_def->name()) == nullptr) {
+      TF_RETURN_IF_ERROR(ValidateShape(node));
+    }
 
     // Update pending_count_ for outputs.
     for (size_t i = 0; i < outputs_[o].size(); ++i) {
@@ -847,10 +857,6 @@ Status ImportGraphDef(const ImportGraphDefOptions& opts, const GraphDef& gdef,
           return_tensors->size(), ")");
     }
   }
-  if (gdef.library().function_size() != 0) {
-    return errors::Unimplemented(
-        "Importing GraphDefs containing functions not yet implemented");
-  }
   return GraphConstructor::Construct(opts, &gdef, g, refiner, return_tensors);
 }
 
diff --git a/tensorflow/core/graph/graph_constructor.h b/tensorflow/core/graph/graph_constructor.h
index 4252b08e48..186859d132 100644
--- a/tensorflow/core/graph/graph_constructor.h
+++ b/tensorflow/core/graph/graph_constructor.h
@@ -113,8 +113,6 @@ struct ImportGraphDefOptions {
   // with ops that are not defined in the binary calling ImportGraphDef.
   // Similar to the producer_op_list argument to import_graph_def in the
   // python API.
-
-  // TODO(skyewm): Enable importing functions
 };
 
 // Each `return_tensors` entry is the requested node and output index. The index
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index 7c847916d1..e20dabc891 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -31,6 +31,7 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/public/session.h"
 #include "tensorflow/core/public/version.h"
 
 // TODO(josh11b): Test InitCostModel().
@@ -2008,30 +2009,196 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ErrorsDoNoChangeTheGraph) {
 #undef EXPECT_IMPORT_FAILURE
 }
 
-TEST_F(GraphConstructorTest, ImportGraphDef_ErrorFunctionDefsUnimplemented) {
-  ExpectError(
+TEST_F(GraphConstructorTest, ImportGraphDef_FunctionDefs) {
+  // Import a graph def containing a function. The graph def was generated using
+  // this python code:
+  // @function.Defun(tf.float32, tf.float32, tf.float32)
+  // def FooGrad(x, y, dz): return dz, dz
+  //
+  // @function.Defun(tf.float32, tf.float32, grad_func=FooGrad)
+  // def Foo(x, y): return x + y
+  //
+  // p1 = tf.placeholder(tf.float32)
+  // p2 = tf.placeholder(tf.float32)
+  // foo = Foo(p1, p2)
+  ImportGraphDefOptions opts;
+  ExpectOK(
       R"EOF(
-library {
-  function {
-    signature {
-      name: "Foo_cc661786"
-      input_arg {
-        name: "x"
-        type: DT_FLOAT
+      node {
+        name: "Placeholder" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
+      }
+      node {
+        name: "Placeholder_1" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
       }
-      output_arg {
-        name: "x"
-        type: DT_FLOAT
+      node {
+        name: "Foo_d03c39a3" op: "Foo_d03c39a3"
+        input: "Placeholder" input: "Placeholder_1"
       }
-    }
-    ret {
-      key: "x"
-      value: "x:0"
-    }
-  }
-})EOF",
-      ImportGraphDefOptions(),
-      {"Importing GraphDefs containing functions not yet implemented"});
+      library {
+        function {
+          signature {
+            name: "Foo_d03c39a3"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            output_arg { name: "add" type: DT_FLOAT }
+          }
+          node_def {
+            name: "add" op: "Add" input: "x" input: "y"
+            attr { key: "T" value { type: DT_FLOAT } }
+          }
+          ret { key: "add" value: "add:z:0" }
+        }
+        function {
+          signature {
+            name: "FooGrad_dc60abc8"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            input_arg { name: "dz" type: DT_FLOAT }
+            output_arg { name: "dz" type: DT_FLOAT }
+            output_arg { name: "dz_U0" type: DT_FLOAT }
+          }
+          ret { key: "dz" value: "dz:0" }
+          ret { key: "dz_U0" value: "dz:0" }
+        }
+        gradient {
+          function_name: "Foo_d03c39a3" gradient_func: "FooGrad_dc60abc8"
+        }
+      }
+      versions { producer: 21 min_consumer: 12 }
+      )EOF",
+      opts);
+
+  EXPECT_TRUE(HasNode("Placeholder"));
+  EXPECT_TRUE(HasNode("Placeholder_1"));
+  EXPECT_TRUE(HasNode("Foo_d03c39a3"));
+  // Check that Foo and FooGrad have been imported
+  const OpDef* op_def;
+  TF_ASSERT_OK(graph_.op_registry()->LookUpOpDef("Foo_d03c39a3", &op_def));
+  TF_ASSERT_OK(graph_.op_registry()->LookUpOpDef("FooGrad_dc60abc8", &op_def));
+
+  // Re-serialize and run the graph. This tests that re-serialized functions can
+  // be imported again and that imported functions can be run.
+  GraphDef gdef;
+  graph_.ToGraphDef(&gdef);
+  EXPECT_EQ(gdef.library().function_size(), 2);
+  EXPECT_EQ(gdef.library().gradient_size(), 1);
+  EXPECT_EQ(gdef.library().gradient()[0].function_name(), "Foo_d03c39a3");
+  EXPECT_EQ(gdef.library().gradient()[0].gradient_func(), "FooGrad_dc60abc8");
+
+  std::unique_ptr<Session> sess(NewSession(SessionOptions()));
+  TF_ASSERT_OK(sess->Create(gdef));
+
+  Tensor p1(DT_FLOAT, TensorShape({1}));
+  p1.scalar<float>()() = 1.0;
+  Tensor p2(DT_FLOAT, TensorShape({1}));
+  p2.scalar<float>()() = 2.0;
+  std::vector<std::pair<string, Tensor>> inputs = {{"Placeholder", p1},
+                                                   {"Placeholder_1", p2}};
+  std::vector<string> output_names = {"Foo_d03c39a3"};
+  std::vector<string> target_names;
+  std::vector<Tensor> outputs;
+  TF_ASSERT_OK(sess->Run(inputs, output_names, target_names, &outputs));
+
+  ASSERT_EQ(outputs.size(), 1);
+  EXPECT_EQ(outputs[0].scalar<float>()(), 3.0);
+}
+
+TEST_F(GraphConstructorTest, ImportGraphDef_NestedFunctionDefs) {
+  // Import a graph def containing a function. The graph def was generated using
+  // this python code:
+  //   @function.Defun(tf.float32, tf.float32)
+  //   def Inner(x, y): return x + y
+  //
+  //   @function.Defun(tf.float32, tf.float32)
+  //   def Outer(x, y): return Inner(x, y)
+  //
+  //   p1 = tf.placeholder(tf.float32)
+  //   p2 = tf.placeholder(tf.float32)
+  //   Outer(p1, p2)
+  ImportGraphDefOptions opts;
+  ExpectOK(
+      R"EOF(
+      node {
+        name: "Placeholder" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
+      }
+      node {
+        name: "Placeholder_1" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
+      }
+      node {
+        name: "Outer_966fa13d" op: "Outer_966fa13d"
+        input: "Placeholder" input: "Placeholder_1"
+      }
+      library {
+        function {
+          signature {
+            name: "Outer_966fa13d"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            output_arg { name: "Inner_d03c39a3" type: DT_FLOAT }
+          }
+          node_def {
+            name: "Inner_d03c39a3" op: "Inner_d03c39a3" input: "x" input: "y"
+          }
+          ret { key: "Inner_d03c39a3" value: "Inner_d03c39a3:add:0" }
+        }
+        function {
+          signature {
+            name: "Inner_d03c39a3"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            output_arg { name: "add" type: DT_FLOAT }
+          }
+          node_def {
+            name: "add" op: "Add" input: "x" input: "y"
+            attr { key: "T" value { type: DT_FLOAT } }
+          }
+          ret { key: "add" value: "add:z:0" }
+        }
+      }
+      versions { producer: 21 min_consumer: 12 }
+      )EOF",
+      opts);
+
+  EXPECT_TRUE(HasNode("Placeholder"));
+  EXPECT_TRUE(HasNode("Placeholder_1"));
+  EXPECT_TRUE(HasNode("Outer_966fa13d"));
+  // Check that Inner and Outer have been imported
+  const OpDef* op_def;
+  Status s = graph_.op_registry()->LookUpOpDef("Inner_d03c39a3", &op_def);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+  s = graph_.op_registry()->LookUpOpDef("Outer_966fa13d", &op_def);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+
+  // Re-serialize and run the graph. This tests that re-serialized functions can
+  // be imported again and that imported functions can be run.
+  GraphDef gdef;
+  graph_.ToGraphDef(&gdef);
+  std::unique_ptr<Session> sess(NewSession(SessionOptions()));
+  s = sess->Create(gdef);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+
+  Tensor p1(DT_FLOAT, TensorShape({1}));
+  p1.scalar<float>()() = 1.0;
+  Tensor p2(DT_FLOAT, TensorShape({1}));
+  p2.scalar<float>()() = 2.0;
+  std::vector<std::pair<string, Tensor>> inputs = {{"Placeholder", p1},
+                                                   {"Placeholder_1", p2}};
+  std::vector<string> output_names = {"Outer_966fa13d"};
+  std::vector<string> target_names;
+  std::vector<Tensor> outputs;
+  s = sess->Run(inputs, output_names, target_names, &outputs);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+
+  ASSERT_EQ(outputs.size(), 1);
+  EXPECT_EQ(outputs[0].scalar<float>()(), 3.0);
 }
 
 TEST_F(GraphConstructorTest, CopyGraph) {
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index f5ed7a83e4..739ad90efd 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <set>
 #include <vector>
+#include "tensorflow/core/framework/function_testlib.h"
 #include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/graph/node_builder.h"
 #include "tensorflow/core/kernels/ops_util.h"
@@ -387,6 +388,61 @@ TEST_F(GraphTest, InputEdges) {
   TF_EXPECT_OK(b->input_edges(&edges));
 }
 
+TEST_F(GraphTest, AddFunctionLibrary) {
+  // Basic functionality
+  FunctionDefLibrary proto;
+  *proto.add_function() = test::function::XTimesTwo();
+  *proto.add_function() = test::function::XTimesFour();
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesTwo") != nullptr);
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesFour") != nullptr);
+
+  // Duplicate functions are ignored
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesTwo") != nullptr);
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesFour") != nullptr);
+
+  // Duplicate names corresponding to different functions trigger an error
+  FunctionDefLibrary error_proto = proto;
+  *error_proto.mutable_function(0)->add_node_def() =
+      error_proto.function(0).node_def(0);
+  Status s = graph_.AddFunctionLibrary(error_proto);
+  EXPECT_FALSE(s.ok());
+  EXPECT_EQ(s.error_message(),
+            "Cannot add function 'XTimesTwo' because a different function with "
+            "the same name already exists.");
+
+  // TODO(skyewm): reenable along with duplicate op check
+  // Function with same name as an existing op triggers an error
+  // error_proto = proto;
+  // error_proto.mutable_function(0)->mutable_signature()->set_name("Add");
+  // s = graph_.AddFunctionLibrary(error_proto);
+  // EXPECT_FALSE(s.ok());
+  // EXPECT_EQ(s.error_message(),
+  //           "Cannot add function 'Add' because an op with the same name "
+  //           "already exists.");
+
+  // Adding a gradient function to an existing function is ok
+  GradientDef* grad = proto.add_gradient();
+  grad->set_function_name("XTimesTwo");
+  grad->set_gradient_func("Undefined");  // undefined funcs in grads are ok
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_EQ(graph_.flib_def().FindGradient("XTimesTwo"), "Undefined");
+
+  // Duplicate gradients are ignored
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_EQ(graph_.flib_def().FindGradient("XTimesTwo"), "Undefined");
+
+  // Conflicting gradient triggers an error
+  error_proto = proto;
+  error_proto.mutable_gradient(0)->set_gradient_func("Undefined2");
+  s = graph_.AddFunctionLibrary(error_proto);
+  EXPECT_FALSE(s.ok());
+  EXPECT_EQ(s.error_message(),
+            "Cannot assign gradient function 'Undefined2' to 'XTimesTwo' "
+            "because it already has gradient function 'Undefined'");
+}
+
 REGISTER_OP("Input").Output("o: float");
 REGISTER_OP("In2Out1").Input("a: float").Input("b: float").Output("o: float");
 
diff --git a/tensorflow/core/util/equal_graph_def.cc b/tensorflow/core/util/equal_graph_def.cc
index 7e7a3f5223..2db026da56 100644
--- a/tensorflow/core/util/equal_graph_def.cc
+++ b/tensorflow/core/util/equal_graph_def.cc
@@ -28,13 +28,18 @@ bool EqualGraphDef(const GraphDef& actual, const GraphDef& expected,
                    string* diff, const EqualGraphDefOptions& options) {
   // Intentionally do not check that versions match so that this routine can
   // be used for less brittle golden file tests.
+  return EqualRepeatedNodeDef(actual.node(), expected.node(), diff, options);
+}
 
+bool EqualRepeatedNodeDef(const protobuf::RepeatedPtrField<NodeDef>& actual,
+                          const protobuf::RepeatedPtrField<NodeDef>& expected,
+                          string* diff, const EqualGraphDefOptions& options) {
   std::unordered_map<string, const NodeDef*> actual_index;
-  for (const NodeDef& node : actual.node()) {
+  for (const NodeDef& node : actual) {
     actual_index[node.name()] = &node;
   }
 
-  for (const NodeDef& expected_node : expected.node()) {
+  for (const NodeDef& expected_node : expected) {
     auto actual_iter = actual_index.find(expected_node.name());
     if (actual_iter == actual_index.end()) {
       if (diff != nullptr) {
@@ -53,10 +58,9 @@ bool EqualGraphDef(const GraphDef& actual, const GraphDef& expected,
 
   if (!actual_index.empty()) {
     if (diff != nullptr) {
-      *diff = strings::StrCat("Found unexpected node '",
-                              SummarizeNodeDef(*actual_index.begin()->second),
-                              "' not in expected graph:\n",
-                              SummarizeGraphDef(expected));
+      *diff =
+          strings::StrCat("Found unexpected node '",
+                          SummarizeNodeDef(*actual_index.begin()->second), "'");
     }
     return false;
   }
diff --git a/tensorflow/core/util/equal_graph_def.h b/tensorflow/core/util/equal_graph_def.h
index 82f8bd0713..1ce6181c2e 100644
--- a/tensorflow/core/util/equal_graph_def.h
+++ b/tensorflow/core/util/equal_graph_def.h
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/graph_def_util.h"
+#include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -44,6 +45,14 @@ bool EqualGraphDef(const GraphDef& actual, const GraphDef& expected,
 bool EqualNodeDef(const NodeDef& actual, const NodeDef& expected, string* diff,
                   const EqualGraphDefOptions& options = {});
 
+// Determines if actual and expected are equal, ignoring ordering. If they're
+// different and diff != nullptr, *diff is set to an explanation of the
+// difference.
+bool EqualRepeatedNodeDef(const protobuf::RepeatedPtrField<NodeDef>& actual,
+                          const protobuf::RepeatedPtrField<NodeDef>& expected,
+                          string* diff,
+                          const EqualGraphDefOptions& options = {});
+
 #define TF_EXPECT_GRAPH_EQ(expected, actual)                  \
   do {                                                        \
     string diff;                                              \
diff --git a/tensorflow/core/util/equal_graph_def_test.cc b/tensorflow/core/util/equal_graph_def_test.cc
index 9ce951e6ef..af870c5c60 100644
--- a/tensorflow/core/util/equal_graph_def_test.cc
+++ b/tensorflow/core/util/equal_graph_def_test.cc
@@ -47,8 +47,7 @@ class EqualGraphDefTest : public ::testing::Test {
  protected:
   EqualGraphDefTest()
       : e_(GraphDefBuilder::kFailImmediately),
-        a_(GraphDefBuilder::kFailImmediately) {
-  }
+        a_(GraphDefBuilder::kFailImmediately) {}
 
   bool Match() {
     GraphDef expected;
@@ -89,11 +88,7 @@ TEST_F(EqualGraphDefTest, ExtraNode) {
   Input(a_.opts().WithName("A"));
   Input(a_.opts().WithName("B"));
   EXPECT_FALSE(Match());
-  EXPECT_EQ(strings::StrCat(
-                "Found unexpected node 'B = Input[]()' not in expected graph:\n"
-                "versions = producer: ",
-                TF_GRAPH_DEF_VERSION, ";\n", "A = Input[]();\n"),
-            diff_);
+  EXPECT_EQ("Found unexpected node 'B = Input[]()'", diff_);
 }
 
 TEST_F(EqualGraphDefTest, NodeOrder) {
@@ -169,21 +164,23 @@ TEST_F(EqualGraphDefTest, ControlInputOrder) {
   Node* b = Input(e_.opts().WithName("B"));
   Node* c = Input(e_.opts().WithName("C"));
   Node* d = Input(e_.opts().WithName("D"));
-  Combine(a, a, e_.opts()
-                    .WithName("E")
-                    .WithControlInput(b)
-                    .WithControlInput(c)
-                    .WithControlInput(d));
+  Combine(a, a,
+          e_.opts()
+              .WithName("E")
+              .WithControlInput(b)
+              .WithControlInput(c)
+              .WithControlInput(d));
 
   a = Input(a_.opts().WithName("A"));
   b = Input(a_.opts().WithName("B"));
   c = Input(a_.opts().WithName("C"));
   d = Input(a_.opts().WithName("D"));
-  Combine(a, a, a_.opts()
-                    .WithName("E")
-                    .WithControlInput(c)
-                    .WithControlInput(d)
-                    .WithControlInput(b));
+  Combine(a, a,
+          a_.opts()
+              .WithName("E")
+              .WithControlInput(c)
+              .WithControlInput(d)
+              .WithControlInput(b));
   EXPECT_TRUE(Match()) << diff_;
 }
 
-- 
GitLab


From 61dc7b3dedd08a3d513a66b353778a20c80a9f7f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 17:09:38 -0800
Subject: [PATCH 0127/1563] Expand contrib test to more than just test targets.
 Change: 152206822

---
 tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
index 45747ba2d9..a03cab0cca 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
@@ -33,6 +33,6 @@ yes "" | ./configure
 
 # Run bazel test command. Double test timeouts to avoid flakes.
 bazel test --test_tag_filters=-gpu,-benchmark-test -k \
-    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only \
+    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --test_output=errors -- \
     //tensorflow/contrib/...
-- 
GitLab


From a9b7946540a27cc53bbdc9db1564196979fe30ae Mon Sep 17 00:00:00 2001
From: Yifei Feng <fengyifei2026@gmail.com>
Date: Tue, 4 Apr 2017 18:55:38 -0700
Subject: [PATCH 0128/1563] Remove empty line in dummy file. (#8942)

---
 third_party/sycl/crosstool/BUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/third_party/sycl/crosstool/BUILD b/third_party/sycl/crosstool/BUILD
index 8b13789179..e69de29bb2 100644
--- a/third_party/sycl/crosstool/BUILD
+++ b/third_party/sycl/crosstool/BUILD
@@ -1 +0,0 @@
-
-- 
GitLab


From ff247e5f4efffd438d2ebbba017ae2e87c144182 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 4 Apr 2017 18:43:48 -0800
Subject: [PATCH 0129/1563] Preserve graph version during optimization Change:
 152213262

---
 tensorflow/core/grappler/optimizers/meta_optimizer.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index d82d5a469d..67ffa7a4b6 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -14,6 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
+#include "tensorflow/core/framework/versions.pb.h"
 #include "tensorflow/core/grappler/optimizers/constant_folding.h"
 #include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
@@ -81,6 +82,9 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
     }
   }
 
+  // Copy the graph version.
+  *optimized_graph->mutable_versions() = item.graph.versions();
+
   return Status::OK();
 }
 
-- 
GitLab


From df4fcc79bb466a30045aad9cb999614c04bfd02b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 4 Apr 2017 18:51:49 -0800
Subject: [PATCH 0130/1563] Exclude enter and exit nodes from shape refiner's
 constant folding. Change: 152213637

---
 tensorflow/core/common_runtime/shape_refiner.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index f58faefa9f..f2dff0bf75 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -299,6 +299,13 @@ Status ShapeRefiner::ExtractConstantSubgraph(
       return Status::OK();
     }
 
+    // Don't constant fold enter/exit currently either, as it's easy to end
+    // up with a partial frame.
+    if (IsEnter(current_node) || IsExit(current_node)) {
+      *is_constant_graph = false;
+      return Status::OK();
+    }
+
     // If there is nothing more to recurse down, see if
     // the generator node is a constant.
     if (current_node->num_inputs() == 0) {
-- 
GitLab


From 2a276a0e9fadd2a13c4e165344ad1abedf67884c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 00:44:51 -0800
Subject: [PATCH 0131/1563] Allow reshape_mover and algebraic_simplifier to
 make multiple mutations, by avoiding the short-circuit std::any_of. Change:
 152232810

---
 .../xla/service/algebraic_simplifier.cc       | 15 +++---
 .../compiler/xla/service/reshape_mover.cc     | 20 ++++----
 .../xla/service/reshape_mover_test.cc         | 51 +++++++++++++++++++
 3 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 4c058484b9..415aafe69a 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -1348,13 +1348,14 @@ Status AlgebraicSimplifierVisitor::HandleMinimum(HloInstruction* minimum,
 StatusOr<bool> AlgebraicSimplifier::Run(HloModule* module) {
   XLA_VLOG_LINES(2,
                  "AlgebraicSimplifier::Run(), before:\n" + module->ToString());
-  bool changed =
-      std::any_of(module->computations().begin(), module->computations().end(),
-                  [=](const std::unique_ptr<HloComputation>& computation) {
-                    return AlgebraicSimplifierVisitor::Run(
-                        computation.get(), is_layout_sensitive_,
-                        valid_bitcast_callback_, enable_dot_simplification_);
-                  });
+  bool changed = false;
+  for (auto& comp : module->computations()) {
+    if (AlgebraicSimplifierVisitor::Run(comp.get(), is_layout_sensitive_,
+                                        valid_bitcast_callback_,
+                                        enable_dot_simplification_)) {
+      changed = true;
+    }
+  }
   XLA_VLOG_LINES(2,
                  "AlgebraicSimplifier::Run(), after:\n" + module->ToString());
   return changed;
diff --git a/tensorflow/compiler/xla/service/reshape_mover.cc b/tensorflow/compiler/xla/service/reshape_mover.cc
index 3bff35544c..b72ef95a6a 100644
--- a/tensorflow/compiler/xla/service/reshape_mover.cc
+++ b/tensorflow/compiler/xla/service/reshape_mover.cc
@@ -234,17 +234,15 @@ bool TrySinkReshapeOrTranspose(HloComputation* computation,
 }  // namespace
 
 StatusOr<bool> ReshapeMover::Run(HloModule* module) {
-  return std::any_of(
-      module->computations().begin(), module->computations().end(),
-      [](const std::unique_ptr<HloComputation>& computation) {
-        std::list<HloInstruction*> postorder =
-            computation->MakeInstructionPostOrder();
-        return std::any_of(postorder.begin(), postorder.end(),
-                           [&computation](HloInstruction* instruction) {
-                             return TrySinkReshapeOrTranspose(computation.get(),
-                                                              instruction);
-                           });
-      });
+  bool changed = false;
+  for (const auto& comp : module->computations()) {
+    for (HloInstruction* instruction : comp->MakeInstructionPostOrder()) {
+      if (TrySinkReshapeOrTranspose(comp.get(), instruction)) {
+        changed = true;
+      }
+    }
+  }
+  return changed;
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/reshape_mover_test.cc b/tensorflow/compiler/xla/service/reshape_mover_test.cc
index 1862e2e992..09a673ea80 100644
--- a/tensorflow/compiler/xla/service/reshape_mover_test.cc
+++ b/tensorflow/compiler/xla/service/reshape_mover_test.cc
@@ -202,5 +202,56 @@ TEST_F(ReshapeMoverTest, ScalarReshapeNotMovedAcrossSelect) {
   EXPECT_EQ(select, computation->root_instruction());
 }
 
+// Tree looks like this:
+//
+// add1
+// |
+// +- reshape2 - param2
+// |
+// +- reshape3 - add0
+//               |
+//               + reshape0 - param0
+//               |
+//               + reshape1 - param1
+//
+// We expect reshape{0,1} AND reshape{2,3} to be lifted.
+TEST_F(ReshapeMoverTest, MultiplePasses) {
+  auto shape1 = ShapeUtil::MakeShape(F32, {1, 8, 1, 7});
+  auto shape2 = ShapeUtil::MakeShape(F32, {8, 7, 1});
+  auto shape3 = ShapeUtil::MakeShape(F32, {8, 7});
+  HloComputation::Builder builder(TestName());
+  auto param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, shape1, "param0"));
+  auto param1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, shape1, "param1"));
+  auto param2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(2, shape2, "param2"));
+  auto reshape0 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape2, param0));
+  auto reshape1 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape2, param1));
+  auto add0 = builder.AddInstruction(HloInstruction::CreateBinary(
+      shape2, HloOpcode::kAdd, reshape0, reshape1));
+  auto reshape2 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape3, param2));
+  auto reshape3 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape3, add0));
+  auto add1 = builder.AddInstruction(HloInstruction::CreateBinary(
+      shape3, HloOpcode::kAdd, reshape2, reshape3));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+  EXPECT_EQ(add1, computation->root_instruction());
+  EXPECT_TRUE(ReshapeMover().Run(module.get()).ValueOrDie());
+  EXPECT_EQ(HloOpcode::kReshape, computation->root_instruction()->opcode());
+  EXPECT_EQ(HloOpcode::kAdd,
+            computation->root_instruction()->operand(0)->opcode());
+  const auto& add_params =
+      computation->root_instruction()->operand(0)->operands();
+  EXPECT_EQ(2, add_params.size());
+  EXPECT_EQ(HloOpcode::kParameter, add_params[0]->opcode());
+  EXPECT_EQ(HloOpcode::kReshape, add_params[1]->opcode());
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 94947b59417af27fb6cf0049355b49c97afd93ae Mon Sep 17 00:00:00 2001
From: Asim Shankar <asimshankar@gmail.com>
Date: Wed, 5 Apr 2017 07:40:22 -0700
Subject: [PATCH 0132/1563] contrib/slim: Fix broken links in README.md (#8974)

Fixes #8969
---
 tensorflow/contrib/slim/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md
index 94b0263ae8..dae50e67c5 100644
--- a/tensorflow/contrib/slim/README.md
+++ b/tensorflow/contrib/slim/README.md
@@ -109,7 +109,7 @@ weights = slim.variable('weights',
 Note that in native TensorFlow, there are two types of variables: regular
 variables and local (transient) variables. The vast majority of variables are
 regular variables: once created, they can be saved to disk using a
-[saver](https://www.tensorflow.org/versions/r0.11/api_docs/python/state_ops.html#Saver).
+[saver](https://www.tensorflow.org/api_docs/python/tf/train/Saver).
 Local variables are those variables that only exist for the duration of a
 session and are not saved to disk.
 
@@ -289,10 +289,10 @@ slim.stack(x, slim.conv2d, [(32, [3, 3]), (32, [1, 1]), (64, [3, 3]), (64, [1, 1
 ### Scopes
 
 In addition to the types of scope mechanisms in TensorFlow
-([name_scope](https://www.tensorflow.org/api_docs/python/framework.html#name_scope),
-[variable_scope](https://www.tensorflow.org/api_docs/python/state_layers.html#variable_scope),
+([name_scope](https://www.tensorflow.org/api_docs/python/tf/name_scope),
+[variable_scope](https://www.tensorflow.org/api_docs/python/tf/variable_scope),
 TF-Slim adds a new scoping mechanism called
-[arg_scope](https://www.tensorflow.org/code/tensorflow/contrib/framework/python/ops/arg_scope.py).
+[arg_scope](https://www.tensorflow.org/api_docs/python/tf/contrib/framework/arg_scope),
 This new scope allows a user to specify one or more operations and a set of
 arguments which will be passed to each of the operations defined in the
 `arg_scope`. This functionality is best illustrated by example. Consider the
-- 
GitLab


From b93a88f86d6d01569704d140b972e10794cf0e36 Mon Sep 17 00:00:00 2001
From: Andrew Selle <aselle@andyselle.com>
Date: Wed, 5 Apr 2017 07:56:18 -0700
Subject: [PATCH 0133/1563] Update the issue template to be more compact.
 (#8939)

---
 ISSUE_TEMPLATE.md | 45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index af76188c2f..50f67963bf 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,36 +1,15 @@
-NOTE: Only file GitHub issues for bugs and feature requests.  All other topics will be closed.
+NOTE: Issues that are not bugs or feature requests will be closed. Please ask usage questions on StackOverflow.
 
-For general support from the community, see [StackOverflow](https://stackoverflow.com/questions/tagged/tensorflow).
-To make bugs and feature requests more easy to find and organize, we close issues that are deemed
-out of scope for GitHub Issues and point people to StackOverflow.
+### You must complete this information or else your issue will be closed
+- *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
+- *TensorFlow installed from (source or binary)?*:
+- *TensorFlow version*:
+- *Bazel version (if compiling from source)*:
+- *CUDA/cuDNN version*:
+- *GPU Model and Memory*:
+- *Exact command to reproduce*:
 
-For bugs or installation issues, please provide the following information.
-The more information you provide, the more easily we will be able to offer
-help and advice.
+### Describe the problem clearly
 
-### What related GitHub issues or StackOverflow threads have you found by searching the web for your problem?
-
-### Environment info
-Operating System:
-
-Installed version of CUDA and cuDNN: 
-(please attach the output of `ls -l /path/to/cuda/lib/libcud*`):
-
-If installed from binary pip package, provide:
-
-1. A link to the pip package you installed:
-2. The output from `python -c "import tensorflow; print(tensorflow.__version__)"`.
-
-If installed from source, provide 
-
-1. The commit hash (`git rev-parse HEAD`)
-2. The output of `bazel version`
-
-### If possible, provide a minimal reproducible example (We usually don't have time to read hundreds of lines of your code)
-
-
-### What other attempted solutions have you tried?
-
-
-### Logs or other output that would be helpful
-(If logs are large, please upload as attachment or provide link).
+### Source Code / Logs
+Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full-traceback. Large logs and files should be attached. Try to reproducible test-case code the bare-minimum necessary to generate the problem
-- 
GitLab


From 916fcfb39a23afd96893bf85cb6f29c71a483642 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Wed, 5 Apr 2017 08:38:56 -0800
Subject: [PATCH 0134/1563] Fix dynamic_rnn transpose bug (can input/output
 non-3d tensors).

Also a few cleanups to RNN code.
Change: 152267628
---
 .../contrib/seq2seq/python/ops/decoder.py     | 30 +-------
 tensorflow/python/ops/rnn.py                  | 68 +++++++++++--------
 2 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/decoder.py b/tensorflow/contrib/seq2seq/python/ops/decoder.py
index 1d2674af30..6338eb152e 100644
--- a/tensorflow/contrib/seq2seq/python/ops/decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/decoder.py
@@ -31,6 +31,7 @@ from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import rnn
 from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.util import nest
@@ -38,34 +39,7 @@ from tensorflow.python.util import nest
 __all__ = ["Decoder", "dynamic_decode"]
 
 
-def _transpose_batch_time(x):
-  """Transpose the batch and time dimensions of a Tensor.
-
-  Retains as much of the static shape information as possible.
-
-  Args:
-    x: A tensor of rank 2 or higher.
-
-  Returns:
-    x transposed along the first two dimensions.
-
-  Raises:
-    ValueError: if `x` is rank 1 or lower.
-  """
-  x_static_shape = x.get_shape()
-  if x_static_shape.ndims is not None and x_static_shape.ndims < 2:
-    raise ValueError(
-        "Expected input tensor %s to have rank at least 2, but saw shape: %s" %
-        (x, x_static_shape))
-  x_rank = array_ops.rank(x)
-  x_t = array_ops.transpose(
-      x, array_ops.concat(
-          ([1, 0], math_ops.range(2, x_rank)), axis=0))
-  x_t.set_shape(
-      tensor_shape.TensorShape([
-          x_static_shape[1].value, x_static_shape[0].value
-      ]).concatenate(x_static_shape[2:]))
-  return x_t
+_transpose_batch_time = rnn._transpose_batch_time  # pylint: disable=protected-access
 
 
 @six.add_metaclass(abc.ABCMeta)
diff --git a/tensorflow/python/ops/rnn.py b/tensorflow/python/ops/rnn.py
index 162b13ec21..1051478a7f 100644
--- a/tensorflow/python/ops/rnn.py
+++ b/tensorflow/python/ops/rnn.py
@@ -37,6 +37,36 @@ _state_size_with_prefix = rnn_cell_impl._state_size_with_prefix
 # pylint: enable=protected-access
 
 
+def _transpose_batch_time(x):
+  """Transpose the batch and time dimensions of a Tensor.
+
+  Retains as much of the static shape information as possible.
+
+  Args:
+    x: A tensor of rank 2 or higher.
+
+  Returns:
+    x transposed along the first two dimensions.
+
+  Raises:
+    ValueError: if `x` is rank 1 or lower.
+  """
+  x_static_shape = x.get_shape()
+  if x_static_shape.ndims is not None and x_static_shape.ndims < 2:
+    raise ValueError(
+        "Expected input tensor %s to have rank at least 2, but saw shape: %s" %
+        (x, x_static_shape))
+  x_rank = array_ops.rank(x)
+  x_t = array_ops.transpose(
+      x, array_ops.concat(
+          ([1, 0], math_ops.range(2, x_rank)), axis=0))
+  x_t.set_shape(
+      tensor_shape.TensorShape([
+          x_static_shape[1].value, x_static_shape[0].value
+      ]).concatenate(x_static_shape[2:]))
+  return x_t
+
+
 def _infer_state_dtype(explicit_dtype, state):
   """Infer the dtype of an RNN state.
 
@@ -492,8 +522,8 @@ def dynamic_rnn(cell, inputs, sequence_length=None, initial_state=None,
 
   if not time_major:
     # (B,T,D) => (T,B,D)
-    flat_input = tuple(array_ops.transpose(input_, [1, 0, 2])
-                       for input_ in flat_input)
+    flat_input = [ops.convert_to_tensor(input_) for input_ in flat_input]
+    flat_input = tuple(_transpose_batch_time(input_) for input_ in flat_input)
 
   parallel_iterations = parallel_iterations or 32
   if sequence_length is not None:
@@ -556,11 +586,7 @@ def dynamic_rnn(cell, inputs, sequence_length=None, initial_state=None,
     # to shape [batch, time, depth]
     if not time_major:
       # (T,B,D) => (B,T,D)
-      flat_output = nest.flatten(outputs)
-      flat_output = [array_ops.transpose(output, [1, 0, 2])
-                     for output in flat_output]
-      outputs = nest.pack_sequence_as(
-          structure=outputs, flat_sequence=flat_output)
+      outputs = nest.map_structure(_transpose_batch_time, outputs)
 
     return (outputs, final_state)
 
@@ -1003,34 +1029,20 @@ def raw_rnn(cell, loop_fn,
 
       def _copy_some_through(current, candidate):
         """Copy some tensors through via array_ops.where."""
-        current_flat = nest.flatten(current)
-        candidate_flat = nest.flatten(candidate)
-        # pylint: disable=g-long-lambda,cell-var-from-loop
-        result_flat = [
-            _on_device(
-                lambda: array_ops.where(
-                    elements_finished, current_i, candidate_i),
-                device=candidate_i.op.device)
-            for (current_i, candidate_i) in zip(current_flat, candidate_flat)]
-        # pylint: enable=g-long-lambda,cell-var-from-loop
-        return nest.pack_sequence_as(
-            structure=current, flat_sequence=result_flat)
+        def copy_fn(cur_i, cand_i):
+          return _on_device(
+              lambda: array_ops.where(elements_finished, cur_i, cand_i),
+              device=cand_i.op.device)
+        return nest.map_structure(copy_fn, current, candidate)
 
       emit_output = _copy_some_through(zero_emit, emit_output)
       next_state = _copy_some_through(state, next_state)
 
-      emit_output_flat = nest.flatten(emit_output)
-      emit_ta_flat = nest.flatten(emit_ta)
+      emit_ta = nest.map_structure(
+          lambda ta, emit: ta.write(time, emit), emit_ta, emit_output)
 
       elements_finished = math_ops.logical_or(elements_finished, next_finished)
 
-      emit_ta_flat = [
-          ta.write(time, emit)
-          for (ta, emit) in zip(emit_ta_flat, emit_output_flat)]
-
-      emit_ta = nest.pack_sequence_as(
-          structure=emit_structure, flat_sequence=emit_ta_flat)
-
       return (next_time, elements_finished, next_input,
               emit_ta, next_state, loop_state)
 
-- 
GitLab


From 97c447c0fc0c0c85473287b2828460cbab3f8128 Mon Sep 17 00:00:00 2001
From: Kiril Gorovoy <kgorovoy@google.com>
Date: Wed, 5 Apr 2017 09:19:54 -0800
Subject: [PATCH 0135/1563] Fix flaky tests Change: 152272801

---
 tensorflow/contrib/learn/python/learn/utils/gc_test.py | 4 ----
 tensorflow/contrib/session_bundle/gc_test.py           | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/utils/gc_test.py b/tensorflow/contrib/learn/python/learn/utils/gc_test.py
index d3270dcc16..9c63096d0e 100644
--- a/tensorflow/contrib/learn/python/learn/utils/gc_test.py
+++ b/tensorflow/contrib/learn/python/learn/utils/gc_test.py
@@ -29,10 +29,6 @@ from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 
 
-def tearDownModule():
-  gfile.DeleteRecursively(test.get_temp_dir())
-
-
 class GcTest(test_util.TensorFlowTestCase):
 
   def testLargestExportVersions(self):
diff --git a/tensorflow/contrib/session_bundle/gc_test.py b/tensorflow/contrib/session_bundle/gc_test.py
index 1a8ee93cca..8faf3ef3d4 100644
--- a/tensorflow/contrib/session_bundle/gc_test.py
+++ b/tensorflow/contrib/session_bundle/gc_test.py
@@ -29,10 +29,6 @@ from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 
 
-def tearDownModule():
-  gfile.DeleteRecursively(test.get_temp_dir())
-
-
 class GcTest(test_util.TensorFlowTestCase):
 
   def testLargestExportVersions(self):
-- 
GitLab


From 72ae81b7a3e7ae940ba9ed34dab5082529afa0dd Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Wed, 5 Apr 2017 09:47:31 -0800
Subject: [PATCH 0136/1563] Add an auto parallelization grappler optimization
 pass. Change: 152276787

---
 tensorflow/core/grappler/optimizers/BUILD     |  34 +++
 .../core/grappler/optimizers/auto_parallel.cc | 260 ++++++++++++++++++
 .../core/grappler/optimizers/auto_parallel.h  |  63 +++++
 .../grappler/optimizers/auto_parallel_test.cc | 125 +++++++++
 4 files changed, 482 insertions(+)
 create mode 100644 tensorflow/core/grappler/optimizers/auto_parallel.cc
 create mode 100644 tensorflow/core/grappler/optimizers/auto_parallel.h
 create mode 100644 tensorflow/core/grappler/optimizers/auto_parallel_test.cc

diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index bd96e2b33c..5c119d77e3 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -25,6 +25,40 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+cc_library(
+    name = "auto_parallel",
+    srcs = ["auto_parallel.cc"],
+    hdrs = [
+        "auto_parallel.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":graph_optimizer",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:devices",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/clusters:cluster",
+    ],
+)
+
+cc_test(
+    name = "auto_parallel_test",
+    srcs = ["auto_parallel_test.cc"],
+    deps = [
+        ":auto_parallel",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+    ],
+)
+
 cc_library(
     name = "constant_folding",
     srcs = ["constant_folding.cc"],
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.cc b/tensorflow/core/grappler/optimizers/auto_parallel.cc
new file mode 100644
index 0000000000..77ab178653
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.cc
@@ -0,0 +1,260 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/auto_parallel.h"
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/clusters/cluster.h"
+#include "tensorflow/core/grappler/devices.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+
+namespace tensorflow {
+namespace grappler {
+const char kAutoParallelPrefix[] = "AutoParallel";
+
+NodeDef* AutoParallel::AddNodeDivConst() {
+  NodeDef* node = graph_.add_node();
+  node->set_name(strings::StrCat(kAutoParallelPrefix, "-Div-Const"));
+  node->set_op("Const");
+
+  AttrValue attr_data_type;
+  attr_data_type.set_type(DT_FLOAT);
+  node->mutable_attr()->insert({"dtype", attr_data_type});
+
+  AttrValue attr_tensor;
+  auto tensor = attr_tensor.mutable_tensor();
+  tensor->add_float_val(static_cast<float>(num_replicas_));
+  tensor->set_dtype(DT_FLOAT);
+  node->mutable_attr()->insert({"value", attr_tensor});
+  return node;
+}
+
+NodeDef* AutoParallel::AddNodeDiv(const string& name, const string& input_a,
+                                  const string& input_b) {
+  NodeDef* node = graph_.add_node();
+  node->set_name(strings::StrCat(kAutoParallelPrefix, "-Div-", name));
+  node->set_op("RealDiv");
+  node->add_input(input_a);
+  node->add_input(input_b);
+  AttrValue attr_type;
+  attr_type.set_type(DT_FLOAT);
+  node->mutable_attr()->insert({"T", attr_type});
+  return node;
+}
+
+NodeDef* AutoParallel::AddNodeControl(const string& name,
+                                      const std::set<string>& deps,
+                                      GraphDef* graph) {
+  NodeDef* node = graph->add_node();
+  node->set_name(name);
+  node->set_op("NoOp");
+  for (const auto& dep : deps) {
+    node->add_input(strings::StrCat("^", dep));
+  }
+  return node;
+}
+
+Status AutoParallel::Initialize(const GrapplerItem& item) {
+  num_gpus_ = GetNumAvailableGPUs();
+  LOG(INFO) << "Number of GPUs: " << num_gpus_;
+  item_ = &item;
+  graph_ = item.graph;
+  LOG(INFO) << "Original graph size: " << graph_.node_size();
+  if (item.fetch.empty()) {
+    return Status(error::INVALID_ARGUMENT, "No fetch nodes provided.");
+  }
+
+  if (item.MainVariables().empty()) {
+    return Status(error::INVALID_ARGUMENT, "No variables provided.");
+  }
+
+  for (const auto& init : item.init_ops) {
+    VLOG(1) << "Init node: " << init;
+  }
+
+  for (const auto& fetch : item.fetch) {
+    VLOG(1) << "Fetch node: " << fetch;
+  }
+
+  for (const auto& var : item.MainVariables()) {
+    VLOG(2) << "Variable: " << var->name();
+  }
+
+  std::set<string> apply_gradients_ops = {"ApplyGradientDescent",
+                                          "ApplyProximalGradientDescent",
+                                          "ApplyAdadelta",
+                                          "ApplyAdagrad",
+                                          "ApplyProximalAdagrad",
+                                          "ApplyAdagradDA",
+                                          "ApplyFtrl",
+                                          "ApplyMomentum",
+                                          "ApplyAdam",
+                                          "ApplyRMSProp",
+                                          "ApplyCenteredRMSProp"};
+  const NodeDef* dequeue_node = nullptr;
+  for (int i = 0; i < graph_.node_size(); i++) {
+    all_nodes_.insert(
+        std::make_pair(graph_.node(i).name(), graph_.mutable_node(i)));
+    if (graph_.node(i).op() == "QueueDequeueManyV2") {
+      dequeue_node = graph_.mutable_node(i);
+    }
+    if (apply_gradients_ops.find(graph_.node(i).op()) !=
+        apply_gradients_ops.end()) {
+      apply_gradients_nodes_.insert(graph_.node(i).name());
+      VLOG(2) << "Apply gradients node: " << graph_.node(i).name();
+    }
+  }
+
+  auto div_const_node = AddNodeDivConst();
+  all_nodes_.insert(std::make_pair(div_const_node->name(), div_const_node));
+  std::map<string, int> gradient_pos = {{"ApplyGradientDescent", 2},
+                                        {"ApplyProximalGradientDescent", 4},
+                                        {"ApplyAdadelta", 6},
+                                        {"ApplyAdagrad", 3},
+                                        {"ApplyProximalAdagrad", 5},
+                                        {"ApplyAdagradDA", 3},
+                                        {"ApplyFtrl", 3},
+                                        {"ApplyMomentum", 3},
+                                        {"ApplyAdam", 9},
+                                        {"ApplyRMSProp", 7},
+                                        {"ApplyCenteredRMSProp", 8}};
+  for (const auto& apply_gradient_node_name : apply_gradients_nodes_) {
+    auto apply_gradients_op = all_nodes_[apply_gradient_node_name]->op();
+    auto apply_gradients_node = all_nodes_[apply_gradient_node_name];
+
+    auto div_node = AddNodeDiv(
+        apply_gradient_node_name,
+        apply_gradients_node->input(gradient_pos[apply_gradients_op]),
+        div_const_node->name());
+    all_nodes_.insert(std::make_pair(div_node->name(), div_node));
+    *apply_gradients_node->mutable_input(gradient_pos[apply_gradients_op]) =
+        div_node->name();
+  }
+  LOG(INFO) << "Graph size after adding div nodes: " << all_nodes_.size();
+
+  auto train_nodes = ComputeTransitiveFanin(graph_, item.fetch);
+  LOG(INFO) << "Number of training nodes: " << train_nodes.size();
+
+  std::vector<const NodeDef*> input_nodes;
+  if (dequeue_node) {
+    LOG(INFO) << "Dequeue node: " << dequeue_node->name();
+    input_nodes = ComputeTransitiveFanin(graph_, {dequeue_node->name()});
+  }
+  LOG(INFO) << "Number of input nodes: " << input_nodes.size();
+
+  std::set<string> dont_replicate_nodes;
+  for (const auto& variable : item.MainVariables()) {
+    dont_replicate_nodes.insert(variable->name());
+  }
+  // Don't replicate all input nodes, except the dequeue node.
+  for (const auto& input_node : input_nodes) {
+    if (input_node->name() != dequeue_node->name()) {
+      dont_replicate_nodes.insert(input_node->name());
+    }
+  }
+
+  for (const auto& node : train_nodes) {
+    if (dont_replicate_nodes.find(node->name()) == dont_replicate_nodes.end()) {
+      replica_nodes_.insert(node->name());
+    }
+  }
+  LOG(INFO) << "Number of replica nodes: " << replica_nodes_.size();
+
+  for (const auto& node : all_nodes_) {
+    if (replica_nodes_.find(node.first) == replica_nodes_.end()) {
+      shared_nodes_.insert(node.first);
+    }
+  }
+  LOG(INFO) << "Number of shared nodes: " << shared_nodes_.size();
+  return Status::OK();
+}
+
+bool AutoParallel::NotSharedNode(const string& name) {
+  return shared_nodes_.find(name) == shared_nodes_.end();
+}
+
+void AutoParallel::AddSharedNodes(GraphDef* graph) {
+  string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", 0);
+  for (const auto& node : shared_nodes_) {
+    auto new_node = graph->add_node();
+    *new_node = *all_nodes_[node];
+    for (int i = 0; i < new_node->input_size(); i++) {
+      if (NotSharedNode(NodeName(new_node->input(i)))) {
+        string new_name = AddPrefixToNodeName(new_node->input(i), prefix);
+        *new_node->mutable_input(i) = new_name;
+      }
+    }
+  }
+}
+
+void AutoParallel::AddOneReplica(GraphDef* graph, int number) {
+  string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", number);
+  for (const auto& node : replica_nodes_) {
+    auto new_node = graph->add_node();
+    *new_node = *all_nodes_[node];
+    if (NotSharedNode(new_node->name())) {
+      new_node->set_name(AddPrefixToNodeName(new_node->name(), prefix));
+      if (num_gpus_ > 0) {
+        new_node->set_device(strings::StrCat("/gpu:", number % num_gpus_));
+      }
+      for (int i = 0; i < new_node->input_size(); i++) {
+        if (NotSharedNode(NodeName(new_node->input(i)))) {
+          string new_name = AddPrefixToNodeName(new_node->input(i), prefix);
+          *new_node->mutable_input(i) = new_name;
+        }
+      }
+    }
+  }
+}
+
+void AutoParallel::BuildGraph(GraphDef* graph) {
+  AddSharedNodes(graph);
+  for (int i = 0; i < num_replicas_; i++) {
+    AddOneReplica(graph, i);
+  }
+  std::set<string> fetches;
+  for (int i = 0; i < item_->fetch.size(); i++) {
+    for (int j = 0; j < num_replicas_; j++) {
+      string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", j);
+      string fetch = AddPrefixToNodeName(item_->fetch[i], prefix);
+      fetches.insert(fetch);
+    }
+  }
+  string name_control =
+      strings::StrCat(kAutoParallelPrefix, "-Control-", "Fetch");
+  auto control = AddNodeControl(name_control, fetches, graph);
+
+  for (const auto& fetch : item_->fetch) {
+    AddNodeControl(fetch, {control->name()}, graph);
+  }
+  LOG(INFO) << "Parallelized graph size: " << graph->node_size();
+}
+
+Status AutoParallel::Optimize(Cluster* cluster, const GrapplerItem& item,
+                              GraphDef* output) {
+  TF_RETURN_IF_ERROR(Initialize(item));
+  BuildGraph(output);
+  return Status::OK();
+}
+
+void AutoParallel::Feedback(Cluster* cluster, const GrapplerItem& item,
+                            const GraphDef& optimize_output, double result) {
+  // TODO(yaozhang): Add feedback.
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.h b/tensorflow/core/grappler/optimizers/auto_parallel.h
new file mode 100644
index 0000000000..cac0db2c23
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.h
@@ -0,0 +1,63 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_OPTIMIZERS_AUTO_PARALLEL_H_
+#define TENSORFLOW_GRAPPLER_OPTIMIZERS_AUTO_PARALLEL_H_
+
+#include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Automatically parallelize a graph by splitting in the batch dimension.
+class AutoParallel : public GraphOptimizer {
+ public:
+  AutoParallel(int num_replicas) : num_replicas_(num_replicas) {}
+  ~AutoParallel() override {}
+
+  string name() const override { return "autoparallel"; };
+
+  Status Optimize(Cluster* cluster, const GrapplerItem& item,
+                  GraphDef* output) override;
+
+  void Feedback(Cluster* cluster, const GrapplerItem& item,
+                const GraphDef& optimize_output, double result) override;
+
+ private:
+  GraphDef graph_;
+  std::map<string, NodeDef*> all_nodes_;
+  std::set<string> apply_gradients_nodes_;
+  std::set<string> replica_nodes_;
+  std::set<string> shared_nodes_;
+  const GrapplerItem* item_;
+  int num_replicas_;
+  int num_gpus_;
+  Status Initialize(const GrapplerItem& item);
+  NodeDef* AddNodeDivConst();
+  NodeDef* AddNodeDiv(const string& name, const string& input_a,
+                      const string& input_b);
+  NodeDef* AddNodeControl(const string& name, const std::set<string>& deps,
+                          GraphDef* graph);
+  bool NotSharedNode(const string& name);
+  void AddSharedNodes(GraphDef* graph);
+  void AddOneReplica(GraphDef* graph, int number);
+  void BuildGraph(GraphDef* graph);
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_OPTIMIZERS_AUTO_PARALLEL_H_
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel_test.cc b/tensorflow/core/grappler/optimizers/auto_parallel_test.cc
new file mode 100644
index 0000000000..b7786ccd14
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/auto_parallel_test.cc
@@ -0,0 +1,125 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/auto_parallel.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class AutoParallelTest : public ::testing::Test {};
+
+TEST_F(AutoParallelTest, SimpleParallel) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  Output constant_a = ops::Const(s.WithOpName("constant_a"), 1.0f, {1});
+  Output constant_b = ops::Const(s.WithOpName("constant_b"), 1, {1});
+  Output var = ops::Variable(s.WithOpName("var"), {1}, DT_FLOAT);
+  Output assign = ops::Assign(s.WithOpName("assign"), {var}, {constant_a});
+  Output fifo_queue = ops::FIFOQueue(s.WithOpName("fifo_queue"), {DT_FLOAT});
+  auto dequeue = ops::QueueDequeueMany(s.WithOpName("dequeue"), {fifo_queue},
+                                       {constant_b}, {DT_FLOAT});
+  Output add = ops::AddN(s.WithOpName("add"), {constant_a, dequeue[0]});
+  Output learning_rate = ops::Const(s.WithOpName("learning_rate"), 0.01f, {1});
+  Output apply_gradient = ops::ApplyGradientDescent(
+      s.WithOpName("apply_gradient"), {var}, {learning_rate}, {add});
+
+  GrapplerItem item;
+  item.init_ops.push_back("assign");
+  item.fetch.push_back("apply_gradient");
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+
+  AutoParallel parallel(2);
+  GraphDef output;
+  Status status = parallel.Optimize(nullptr, item, &output);
+  TF_EXPECT_OK(status);
+  EXPECT_EQ(20, output.node_size());
+
+  const NodeDef& node_assign = output.node(0);
+  EXPECT_EQ("assign", node_assign.name());
+  EXPECT_EQ("AutoParallel-Replica-0-constant_a", node_assign.input(1));
+
+  const NodeDef& node_constant_b = output.node(1);
+  EXPECT_EQ("constant_b", node_constant_b.name());
+
+  const NodeDef& node_fifo_queue = output.node(2);
+  EXPECT_EQ("fifo_queue", node_fifo_queue.name());
+
+  const NodeDef& node_var = output.node(3);
+  EXPECT_EQ("var", node_var.name());
+
+  const NodeDef& node_div_const0 = output.node(4);
+  EXPECT_EQ("AutoParallel-Replica-0-AutoParallel-Div-Const",
+            node_div_const0.name());
+
+  const NodeDef& node_div0 = output.node(5);
+  EXPECT_EQ("AutoParallel-Replica-0-AutoParallel-Div-apply_gradient",
+            node_div0.name());
+  const NodeDef& node_add0 = output.node(6);
+  EXPECT_EQ("AutoParallel-Replica-0-add", node_add0.name());
+
+  const NodeDef& node_gradient0 = output.node(7);
+  EXPECT_EQ("AutoParallel-Replica-0-apply_gradient", node_gradient0.name());
+
+  const NodeDef& node_constant_a0 = output.node(8);
+  EXPECT_EQ("AutoParallel-Replica-0-constant_a", node_constant_a0.name());
+
+  const NodeDef& node_dequeue0 = output.node(9);
+  EXPECT_EQ("AutoParallel-Replica-0-dequeue", node_dequeue0.name());
+
+  const NodeDef& node_learning_rate0 = output.node(10);
+  EXPECT_EQ("AutoParallel-Replica-0-learning_rate", node_learning_rate0.name());
+
+  const NodeDef& node_div_const1 = output.node(11);
+  EXPECT_EQ("AutoParallel-Replica-1-AutoParallel-Div-Const",
+            node_div_const1.name());
+
+  const NodeDef& node_div1 = output.node(12);
+  EXPECT_EQ("AutoParallel-Replica-1-AutoParallel-Div-apply_gradient",
+            node_div1.name());
+
+  const NodeDef& node_add1 = output.node(13);
+  EXPECT_EQ("AutoParallel-Replica-1-add", node_add1.name());
+
+  const NodeDef& node_gradient1 = output.node(14);
+  EXPECT_EQ("AutoParallel-Replica-1-apply_gradient", node_gradient1.name());
+
+  const NodeDef& node_constant_a1 = output.node(15);
+  EXPECT_EQ("AutoParallel-Replica-1-constant_a", node_constant_a1.name());
+
+  const NodeDef& node_dequeue1 = output.node(16);
+  EXPECT_EQ("AutoParallel-Replica-1-dequeue", node_dequeue1.name());
+
+  const NodeDef& node_learning_rate1 = output.node(17);
+  EXPECT_EQ("AutoParallel-Replica-1-learning_rate", node_learning_rate1.name());
+
+  const NodeDef& node_fetch = output.node(18);
+  EXPECT_EQ("AutoParallel-Control-Fetch", node_fetch.name());
+  EXPECT_EQ("^AutoParallel-Replica-0-apply_gradient", node_fetch.input(0));
+  EXPECT_EQ("^AutoParallel-Replica-1-apply_gradient", node_fetch.input(1));
+
+  const NodeDef& node_gradient = output.node(19);
+  EXPECT_EQ("apply_gradient", node_gradient.name());
+  EXPECT_EQ("^AutoParallel-Control-Fetch", node_gradient.input(0));
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
-- 
GitLab


From 1f3a46868ddf4572b1b7c312da2f4ca229a2eb95 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 09:55:32 -0800
Subject: [PATCH 0137/1563] Change json.decode.JSONDecodeError to ValueError. 
 JSONDecodeError seems to be the exception used in the simplejson module, not
 the json module. Change: 152278012

---
 tensorflow/contrib/keras/python/keras/backend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index d7c646c19a..d149138796 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -3614,7 +3614,7 @@ _config_path = os.path.expanduser(os.path.join(_keras_dir, 'keras.json'))
 if os.path.exists(_config_path):
   try:
     _config = json.load(open(_config_path))
-  except json.decoder.JSONDecodeError:
+  except ValueError:
     _config = {}
   _floatx = _config.get('floatx', floatx())
   assert _floatx in {'float16', 'float32', 'float64'}
-- 
GitLab


From eac453899489ca23a1ba03dd80be5c8d37485262 Mon Sep 17 00:00:00 2001
From: Dan Smilkov <smilkov@google.com>
Date: Wed, 5 Apr 2017 10:18:40 -0800
Subject: [PATCH 0138/1563] Internal change. Change: 152281471

---
 tensorflow/tensorboard/plugins/debugger/BUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tensorflow/tensorboard/plugins/debugger/BUILD b/tensorflow/tensorboard/plugins/debugger/BUILD
index 38aa719b9b..86254dc3aa 100644
--- a/tensorflow/tensorboard/plugins/debugger/BUILD
+++ b/tensorflow/tensorboard/plugins/debugger/BUILD
@@ -30,7 +30,6 @@ py_test(
     srcs = ["debugger_plugin_test.py"],
     main = "debugger_plugin_test.py",
     srcs_version = "PY2AND3",
-    tags = ["no_pip"],
     deps = [
         ":debugger_plugin",
         "//tensorflow/core:protos_all_py",
-- 
GitLab


From 971b11dcca8942c76b601a1b418ccd98a9b25f4a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 11:11:16 -0800
Subject: [PATCH 0139/1563] [XLA] Force buffer sharing of separate while
 instructions. Change: 152288540

---
 tensorflow/compiler/xla/service/BUILD         |   2 +
 .../compiler/xla/service/buffer_assignment.cc | 163 ++++++++++++++----
 .../compiler/xla/service/buffer_assignment.h  |  10 +-
 .../xla/service/buffer_assignment_test.cc     | 161 ++++++++++++++++-
 .../compiler/xla/service/liveness_util.cc     |  11 +-
 .../xla/service/liveness_util_test.cc         |  68 ++++++++
 6 files changed, 377 insertions(+), 38 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index b9118fab25..695e4e7f07 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -594,8 +594,10 @@ cc_test(
     deps = [
         ":buffer_assignment",
         ":computation_tracker",
+        ":copy_insertion",
         ":cpu_plugin",
         ":hlo",
+        ":hlo_ordering",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:types",
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index e2b550fc02..931f589800 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -41,6 +41,8 @@ limitations under the License.
 
 namespace xla {
 
+using ::tensorflow::gtl::FlatMap;
+using ::tensorflow::gtl::FlatSet;
 using ::tensorflow::strings::Appendf;
 using ::tensorflow::strings::HumanReadableNumBytes;
 
@@ -394,8 +396,8 @@ Status GatherComputationsByAllocationType(
 
   // Sets for quickly checking membership. Computations are returned in vectors
   // for stable iteration.
-  tensorflow::gtl::FlatSet<HloComputation*> thread_local_set;
-  tensorflow::gtl::FlatSet<HloComputation*> global_set;
+  FlatSet<HloComputation*> thread_local_set;
+  FlatSet<HloComputation*> global_set;
 
   while (!worklist.empty()) {
     auto worklist_front = worklist.front();
@@ -554,10 +556,9 @@ bool BufferAssigner::MaybeAssignBuffer(BufferAllocation* allocation,
 
 Status BufferAssigner::AssignBuffersForComputation(
     const HloComputation* computation, bool is_thread_local,
-    const tensorflow::gtl::FlatSet<const HloInstruction*>* hlos_to_allocate,
-    const tensorflow::gtl::FlatSet<const LogicalBuffer*>& colocated_buffers,
-    const tensorflow::gtl::FlatSet<BufferAllocation::Index>&
-        colocated_allocations,
+    const FlatSet<const HloInstruction*>* hlos_to_allocate,
+    const FlatSet<const LogicalBuffer*>& colocated_buffers,
+    const FlatSet<BufferAllocation::Index>& colocated_allocations,
     BufferAssignment* assignment) {
   // Buffers are sorted and assigned to BufferAllocations in decreasing order of
   // size.
@@ -578,7 +579,7 @@ Status BufferAssigner::AssignBuffersForComputation(
 
   // Generate a post order sort of instructions for sorting of the
   // LogicalBuffers.
-  tensorflow::gtl::FlatMap<const HloInstruction*, int> post_order_position;
+  FlatMap<const HloInstruction*, int> post_order_position;
   int position = 0;
   for (auto* instruction : computation->MakeInstructionPostOrder()) {
     post_order_position.emplace(instruction, position);
@@ -590,7 +591,7 @@ Status BufferAssigner::AssignBuffersForComputation(
   const BufferLiveness& liveness = assignment->liveness();
   const std::vector<const HloInstruction*>* sequential_order =
       liveness.hlo_ordering().SequentialOrder(*computation);
-  tensorflow::gtl::FlatSet<const LogicalBuffer*> unassigned_temp_buffers;
+  FlatSet<const LogicalBuffer*> unassigned_temp_buffers;
 
   // Sort the LogicalBuffers first by size. We assign the larger LogicalBuffers
   // first for simplicity. This means any previously created BufferAllocation is
@@ -791,7 +792,7 @@ Status BufferAssigner::AssignBuffersForComputation(
 
 Status BufferAssigner::AssignBuffersWithSequentialOrdering(
     const std::vector<const HloInstruction*>& sequence,
-    const tensorflow::gtl::FlatSet<const LogicalBuffer*>& buffers_to_assign,
+    const FlatSet<const LogicalBuffer*>& buffers_to_assign,
     const HloComputation& computation, BufferAssignment* assignment) {
   // Run the sequence of instructions through the heap simulator.  The heuristic
   // that seems to give the best results is lazy-best-fit, with all runs of
@@ -881,40 +882,137 @@ void BufferAssigner::AddSetToColocatedBufferSets(
   }
 }
 
+// Conceptually the same as AddSetToColocatedBufferSets, but specific to the
+// colocated buffers for while instructions. 'colocated_set' contains the
+// buffers for a single while instruction that must be colocated. The idea here
+// is to apply a memory-saving heuristic for separate while instructions whose
+// buffers are disjoint in liveness, by using the colocation mechanism to force
+// buffer sharing. This often reduces memory for multi-layer RNNs.
+//
+// TODO(b/32491382): We should be able to remove this heuristic after we
+// implement module-level liveness analysis, which would let us directly detect
+// buffer sharing opportunities between the while instruction buffer and the
+// buffers from the predicate and body computation, as well as sharing across
+// different while instructions.
+void BufferAssigner::AddWhileSetToColocatedBufferSets(
+    const std::vector<const LogicalBuffer*>& colocated_set,
+    const LogicalBuffer* while_init_buffer, const HloInstruction* while_hlo,
+    const HloComputation& computation, const BufferLiveness& buffer_liveness,
+    std::vector<ColocatedBufferSet>* colocated_buffer_sets) {
+  CHECK(!colocated_set.empty());
+
+  // Parallel while loops cannot safely share colocated buffer sets.
+  if (buffer_liveness.hlo_ordering().SequentialOrder(computation) == nullptr) {
+    AddSetToColocatedBufferSets(colocated_set, colocated_buffer_sets);
+    return;
+  }
+
+  // Scan 'colocated_buffer_sets' in reverse order for locality; colocated sets
+  // are added in postorder over computations and instructions.
+  const int64 init_buffer_size = buffer_size_(*while_init_buffer);
+  for (int i = colocated_buffer_sets->size() - 1; i >= 0; --i) {
+    const ColocatedBufferSet& predecessor_set = (*colocated_buffer_sets)[i];
+
+    // Skip predecessor sets not associated with while loops.
+    if (std::all_of(predecessor_set.begin(), predecessor_set.end(),
+                    [](const LogicalBuffer* buffer) {
+                      return buffer->instruction()->opcode() !=
+                             HloOpcode::kWhile;
+                    })) {
+      continue;
+    }
+
+    // Skip predecessor sets already associated with 'while_hlo'.
+    if (std::any_of(predecessor_set.begin(), predecessor_set.end(),
+                    [&while_hlo](const LogicalBuffer* buffer) {
+                      return buffer->instruction() == while_hlo;
+                    })) {
+      continue;
+    }
+
+    // Build vector of predecessor while result buffers.
+    std::vector<const LogicalBuffer*> predecessor_while_buffers;
+    for (const LogicalBuffer* buffer : predecessor_set) {
+      if (buffer->instruction()->opcode() == HloOpcode::kWhile &&
+          buffer_size_(*buffer) == init_buffer_size &&
+          buffer->instruction()->parent() == &computation) {
+        predecessor_while_buffers.push_back(buffer);
+      }
+    }
+    if (predecessor_while_buffers.empty()) {
+      continue;
+    }
+
+    // Skip predecessor set if the live range of any predecessor buffers
+    // overlaps with 'while_init_buffer'. Note that tuple element buffer
+    // forwarding can cause the same buffer to appear on both sides of the
+    // interference comparison below.
+    if (std::any_of(
+            predecessor_while_buffers.begin(), predecessor_while_buffers.end(),
+            [while_init_buffer, &buffer_liveness](const LogicalBuffer* buffer) {
+              return while_init_buffer->id() != buffer->id() &&
+                     buffer_liveness.MayInterfere(*while_init_buffer, *buffer);
+            })) {
+      continue;
+    }
+
+    // All our checks have passed; merge 'predecessor_set' with 'colocated_set',
+    // and add the merged set to 'colocated_buffer_sets'. This forces the
+    // colocation of buffers across different while instructions.
+    FlatSet<const LogicalBuffer*> unique;
+    unique.insert(predecessor_set.begin(), predecessor_set.end());
+    unique.insert(colocated_set.begin(), colocated_set.end());
+    std::vector<const LogicalBuffer*> merged_set(unique.begin(), unique.end());
+    AddSetToColocatedBufferSets(merged_set, colocated_buffer_sets);
+    return;
+  }
+
+  // Failed to merge into predecessor set; add 'colocated_set' as-is.
+  AddSetToColocatedBufferSets(colocated_set, colocated_buffer_sets);
+}
+
 namespace {
+
 // Checks that points-to set of 'instruction' is unambiguous and distinct
 // (ensured by CopyInsertion), then adds the buffer from the points-to set at
 // 'index' to 'colocated_set'.
-void AddBufferToColocatedSet(const HloInstruction* instruction,
-                             const ShapeIndex& index,
-                             const TuplePointsToAnalysis& points_to_analysis,
-                             std::vector<const LogicalBuffer*>* colocated_set) {
+const LogicalBuffer* AddBufferToColocatedSet(
+    const HloInstruction* instruction, const ShapeIndex& index,
+    const TuplePointsToAnalysis& points_to_analysis,
+    std::vector<const LogicalBuffer*>* colocated_set) {
   // CopyInsertion ensures root points-to set is unambiguous and distinct.
   const auto& points_to = points_to_analysis.GetPointsToSet(instruction);
   CHECK(!points_to.IsAmbiguous());
   CHECK(points_to.IsDistinct());
   colocated_set->push_back(points_to.element(index)[0]);
+  return colocated_set->back();
 }
+
 }  // namespace
 
 // Builds sets of buffers in 'colocated_buffer_sets' which should be colocated
 // in the same allocation (currently just supports kWhile and kCall).
 void BufferAssigner::BuildColocatedBufferSets(
-    const HloModule* module, const TuplePointsToAnalysis& points_to_analysis,
+    const HloModule* module, const BufferLiveness& buffer_liveness,
     std::vector<ColocatedBufferSet>* colocated_buffer_sets) {
-  for (auto& computation : module->computations()) {
-    for (auto& instruction : computation->instructions()) {
+  const TuplePointsToAnalysis& points_to_analysis =
+      buffer_liveness.points_to_analysis();
+  for (const HloComputation* computation : module->MakeComputationPostOrder()) {
+    for (const HloInstruction* instruction :
+         computation->MakeInstructionPostOrder()) {
       const HloOpcode opcode = instruction->opcode();
       if (opcode == HloOpcode::kWhile) {
-        HloInstruction* while_hlo = instruction.get();
+        const HloInstruction* while_hlo = instruction;
         TF_CHECK_OK(ShapeUtil::ForEachSubshape(
             while_hlo->shape(),
-            [this, while_hlo, &points_to_analysis, colocated_buffer_sets](
-                const Shape& /*subshape*/, const ShapeIndex& index) {
+            [this, while_hlo, &points_to_analysis, &buffer_liveness,
+             computation, colocated_buffer_sets](const Shape& /*subshape*/,
+                                                 const ShapeIndex& index) {
               std::vector<const LogicalBuffer*> colocated_set;
               // Add while.init.
-              AddBufferToColocatedSet(while_hlo->operand(0), index,
-                                      points_to_analysis, &colocated_set);
+              auto* init_buffer =
+                  AddBufferToColocatedSet(while_hlo->operand(0), index,
+                                          points_to_analysis, &colocated_set);
               // Add while.result.
               AddBufferToColocatedSet(while_hlo, index, points_to_analysis,
                                       &colocated_set);
@@ -930,12 +1028,15 @@ void BufferAssigner::BuildColocatedBufferSets(
               AddBufferToColocatedSet(
                   while_hlo->while_body()->root_instruction(), index,
                   points_to_analysis, &colocated_set);
-              AddSetToColocatedBufferSets(colocated_set, colocated_buffer_sets);
+              AddWhileSetToColocatedBufferSets(
+                  colocated_set, init_buffer, while_hlo, *computation,
+                  buffer_liveness, colocated_buffer_sets);
               return Status::OK();
             }));
       } else if (opcode == HloOpcode::kCall) {
-        HloInstruction* call_hlo = instruction.get();
-        HloInstruction* root_hlo = call_hlo->to_apply()->root_instruction();
+        const HloInstruction* call_hlo = instruction;
+        const HloInstruction* root_hlo =
+            call_hlo->to_apply()->root_instruction();
         TF_CHECK_OK(ShapeUtil::ForEachSubshape(
             call_hlo->shape(),
             [this, call_hlo, root_hlo, &points_to_analysis,
@@ -961,8 +1062,8 @@ void BufferAssigner::BuildColocatedBufferSets(
 void BufferAssigner::AssignColocatedBufferSets(
     const std::vector<ColocatedBufferSet>& colocated_buffer_sets,
     BufferAssignment* assignment,
-    tensorflow::gtl::FlatSet<const LogicalBuffer*>* colocated_buffers,
-    tensorflow::gtl::FlatSet<BufferAllocation::Index>* colocated_allocations) {
+    FlatSet<const LogicalBuffer*>* colocated_buffers,
+    FlatSet<BufferAllocation::Index>* colocated_allocations) {
   for (const ColocatedBufferSet& colocated_buffer_set : colocated_buffer_sets) {
     BufferAllocation* allocation = nullptr;
     for (const LogicalBuffer* buffer : colocated_buffer_set) {
@@ -1008,9 +1109,9 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
 
   // Set of HLO's to allocate if hlos_to_allocate is given. Passed as a set to
   // AssignBuffersForComputation for fast membership testing.
-  std::unique_ptr<tensorflow::gtl::FlatSet<const HloInstruction*>> hlo_set;
+  std::unique_ptr<FlatSet<const HloInstruction*>> hlo_set;
   if (hlos_to_allocate != nullptr) {
-    hlo_set = MakeUnique<tensorflow::gtl::FlatSet<const HloInstruction*>>(
+    hlo_set = MakeUnique<FlatSet<const HloInstruction*>>(
         hlos_to_allocate->begin(), hlos_to_allocate->end());
   }
 
@@ -1022,11 +1123,11 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
   // Once b/32491382 enables module-level liveness analysis, we may be able
   // to assign colocated buffers (or at least reuse their allocation for
   // buffers outside of the set) in AssignBuffersForComputation.
-  tensorflow::gtl::FlatSet<const LogicalBuffer*> colocated_buffers;
-  tensorflow::gtl::FlatSet<BufferAllocation::Index> colocated_allocations;
+  FlatSet<const LogicalBuffer*> colocated_buffers;
+  FlatSet<BufferAllocation::Index> colocated_allocations;
   if (colocate_related_buffers_) {
     std::vector<ColocatedBufferSet> colocated_buffer_sets;
-    BuildColocatedBufferSets(module, assignment->points_to_analysis(),
+    BuildColocatedBufferSets(module, assignment->liveness(),
                              &colocated_buffer_sets);
     AssignColocatedBufferSets(colocated_buffer_sets, assignment.get(),
                               &colocated_buffers, &colocated_allocations);
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.h b/tensorflow/compiler/xla/service/buffer_assignment.h
index b82acb19b3..ec1375e24d 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.h
+++ b/tensorflow/compiler/xla/service/buffer_assignment.h
@@ -465,7 +465,7 @@ class BufferAssigner {
   // ColocatedBufferSet aggregates a set of related LogicalBuffers from 'module'
   // which should be colocated in the same buffer allocation.
   void BuildColocatedBufferSets(
-      const HloModule* module, const TuplePointsToAnalysis& points_to_analysis,
+      const HloModule* module, const BufferLiveness& buffer_liveness,
       std::vector<ColocatedBufferSet>* colocated_buffer_sets);
 
   // For each buffer set in 'colocated_buffer_sets', assigns all buffers in the
@@ -482,6 +482,14 @@ class BufferAssigner {
       const std::vector<const LogicalBuffer*>& colocated_set,
       std::vector<ColocatedBufferSet>* colocated_buffer_sets);
 
+  // Conceptually the same as AddSetToColocatedBufferSets, but specific to the
+  // colocated buffers for while instructions.
+  void AddWhileSetToColocatedBufferSets(
+      const std::vector<const LogicalBuffer*>& colocated_set,
+      const LogicalBuffer* while_init_buffer, const HloInstruction* while_hlo,
+      const HloComputation& computation, const BufferLiveness& buffer_liveness,
+      std::vector<ColocatedBufferSet>* colocated_buffer_sets);
+
   const HloModule* module_;
 
   // Function which returns the buffer size for a given logical buffer (shape).
diff --git a/tensorflow/compiler/xla/service/buffer_assignment_test.cc b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
index bb7342d508..f6637d6098 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
@@ -23,10 +23,12 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/computation_tracker.h"
+#include "tensorflow/compiler/xla/service/copy_insertion.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/hlo_ordering.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/types.h"
@@ -1245,6 +1247,163 @@ TEST_F(BufferAssignmentTest, OneTempAllocation) {
   }
 }
 
-}  // namespace
+class WhileBufferAssignmentTest : public HloTestBase {
+ protected:
+  std::unique_ptr<HloComputation> BuildWhileConditionComputation(
+      const string& name) {
+    auto builder = HloComputation::Builder(name);
+    builder.AddInstruction(
+        HloInstruction::CreateParameter(0, loop_state_shape_, "loop_state"));
+    auto zero = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<int>(0)));
+    auto ten = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<int>(10)));
+    builder.AddInstruction(HloInstruction::CreateBinary(
+        ShapeUtil::MakeShape(PRED, {}), HloOpcode::kLt, zero, ten));
+    return builder.Build();
+  }
+
+  std::unique_ptr<HloComputation> BuildWhileBodyComputation(
+      const string& name) {
+    auto builder = HloComputation::Builder(name);
+    auto loop_state = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, loop_state_shape_, "loop_state"));
+    auto input = builder.AddInstruction(
+        HloInstruction::CreateGetTupleElement(data_shape_, loop_state, 0));
+    auto weights = builder.AddInstruction(
+        HloInstruction::CreateGetTupleElement(data_shape_, loop_state, 1));
+    auto output = builder.AddInstruction(HloInstruction::CreateBinary(
+        data_shape_, HloOpcode::kMultiply, input, weights));
+    builder.AddInstruction(
+        HloInstruction::CreateTuple({input, weights, output}));
+    return builder.Build();
+  }
+
+  void RunCopyInsertion(HloModule* module) {
+    CopyInsertion copy_insertion;
+    EXPECT_IS_OK(copy_insertion.Run(module).status());
+  }
+
+  std::unique_ptr<BufferAssignment> RunBufferAssignment(HloModule* module,
+                                                        int64 alignment = 1) {
+    auto sequence =
+        CreateMemoryMinimizingSequence(*module, ByteSizeOf).ConsumeValueOrDie();
+    return BufferAssigner::Run(
+               module, MakeUnique<SequentialHloOrdering>(module, sequence),
+               ByteSizeOf, alignment)
+        .ConsumeValueOrDie();
+  }
+
+  static int64 ByteSizeOf(const LogicalBuffer& buffer) {
+    return ShapeUtil::ByteSizeOf(buffer.shape(), sizeof(void*));
+  }
+
+  Shape data_shape_ = ShapeUtil::MakeShape(F32, {4});
+  Shape loop_state_shape_ =
+      ShapeUtil::MakeTupleShape({data_shape_, data_shape_, data_shape_});
+};
+
+TEST_F(WhileBufferAssignmentTest, TwoForwardWhileLoops) {
+  auto module = MakeUnique<HloModule>(TestName());
+  auto builder = HloComputation::Builder("entry");
+
+  auto input0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape_, "input0"));
+  auto weights0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, data_shape_, "weights0"));
+  auto weights1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(2, data_shape_, "weights1"));
+
+  auto zero = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0.0)));
+  auto output0 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+  auto output1 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+
+  auto cond0 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body0 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+
+  auto tuple0 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input0, weights0, output0}));
+  auto while0 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond0, body0, tuple0));
+
+  auto cond1 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body1 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+  auto input1 = builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(data_shape_, while0, 2));
+  auto tuple1 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input1, weights1, output1}));
+  auto while1 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond1, body1, tuple1));
+
+  module->AddEntryComputation(builder.Build());
+  RunCopyInsertion(module.get());
+  auto assignment = RunBufferAssignment(module.get());
 
+  // While instruction 'while0' has no predecessor while instructions with
+  // which to share allocations.
+
+  // While instruction 'while1' can share allocations with the following
+  // buffers:
+  // *) while0[2], while1[0]
+  // *) while0[1], while1[1]
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {2}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {0}).ConsumeValueOrDie());
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {1}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {1}).ConsumeValueOrDie());
+}
+
+TEST_F(WhileBufferAssignmentTest, OneForwardBackwardWhileLoopSet) {
+  auto module = MakeUnique<HloModule>(TestName());
+  auto builder = HloComputation::Builder("entry");
+
+  auto input0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape_, "input0"));
+  auto weights0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, data_shape_, "weights0"));
+
+  auto zero = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0.0)));
+  auto output0 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+  auto output1 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+
+  auto cond0 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body0 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+
+  auto tuple0 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input0, weights0, output0}));
+  auto while0 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond0, body0, tuple0));
+
+  auto cond1 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body1 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+
+  auto tuple1 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input0, weights0, output1}));
+  auto while1 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond1, body1, tuple1));
+
+  module->AddEntryComputation(builder.Build());
+  RunCopyInsertion(module.get());
+  auto assignment = RunBufferAssignment(module.get());
+
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {2}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {0}).ConsumeValueOrDie());
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {1}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {1}).ConsumeValueOrDie());
+}
+
+}  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/liveness_util.cc b/tensorflow/compiler/xla/service/liveness_util.cc
index caaf56a551..1f625ae0e2 100644
--- a/tensorflow/compiler/xla/service/liveness_util.cc
+++ b/tensorflow/compiler/xla/service/liveness_util.cc
@@ -101,12 +101,12 @@ std::vector<std::pair<HloInstruction*, int64>> GetAllUsesOfInstructionAtIndex(
 }  // namespace
 
 // User and operand can share buffers iff both instructions emit the same shape
-// and layout, and 'user' meets one of the following two qualifications:
-// *) Is element-wise.
+// and layout, and 'user' meets one of the following qualifications:
+// *) Is element-wise. Or...
 // *) Is a loop fusion instruction where the only use of 'operand' at 'index'
 //    in the set 'user.fused_instructions' is a DynamicUpdateSlice fused root
-//    at operand 0.
-// *) Use of 'operand' is DynamicUpdateSlice at operand index 0.
+//    at operand 0. Or...
+// *) The 'user' of 'operand' is DynamicUpdateSlice or While at operand index 0.
 bool CanShareOperandBufferWithUser(
     HloInstruction* operand, const ShapeIndex& operand_index,
     HloInstruction* user, const ShapeIndex& user_index,
@@ -144,7 +144,8 @@ bool CanShareOperandBufferWithUser(
       break;
     }
     return false;
-  } else if (user->opcode() == HloOpcode::kDynamicUpdateSlice) {
+  } else if (user->opcode() == HloOpcode::kDynamicUpdateSlice ||
+             user->opcode() == HloOpcode::kWhile) {
     // We eliminated other users in BufferLiveness::live_range_strictly_before,
     // so here we just need to check that the use is at operand index 0.
     std::vector<int64> operand_indices = user->OperandIndices(operand);
diff --git a/tensorflow/compiler/xla/service/liveness_util_test.cc b/tensorflow/compiler/xla/service/liveness_util_test.cc
index 2ff71d6f3c..079b59265b 100644
--- a/tensorflow/compiler/xla/service/liveness_util_test.cc
+++ b/tensorflow/compiler/xla/service/liveness_util_test.cc
@@ -185,5 +185,73 @@ TEST_F(CanShareOperandBufferWithUserTest, FusedDynamicUpdateSlice) {
                                             *points_to_analysis_));
 }
 
+TEST_F(CanShareOperandBufferWithUserTest, DynamicUpdateSliceCanShare) {
+  auto builder = HloComputation::Builder(TestName());
+
+  Shape data_shape = ShapeUtil::MakeShape(F32, {8});
+  Shape update_shape = ShapeUtil::MakeShape(F32, {4});
+  Shape starts_shape = ShapeUtil::MakeShape(S32, {1});
+  auto data = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape, "data"));
+  auto update = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, update_shape, "update"));
+  auto starts = builder.AddInstruction(
+      HloInstruction::CreateParameter(2, starts_shape, "starts"));
+  auto dus = builder.AddInstruction(HloInstruction::CreateDynamicUpdateSlice(
+      data_shape, data, update, starts));
+
+  BuildModuleAndRunAnalysis(builder.Build());
+
+  // The DynamicUpdateSlice instruction can share with the data operand, but not
+  // with update or starts.
+  EXPECT_TRUE(
+      CanShareOperandBufferWithUser(data, {}, dus, {}, *points_to_analysis_));
+  EXPECT_FALSE(
+      CanShareOperandBufferWithUser(update, {}, dus, {}, *points_to_analysis_));
+  EXPECT_FALSE(
+      CanShareOperandBufferWithUser(starts, {}, dus, {}, *points_to_analysis_));
+}
+
+TEST_F(CanShareOperandBufferWithUserTest, WhileCanShare) {
+  Shape data_shape = ShapeUtil::MakeShape(F32, {8});
+
+  auto make_cond = [this, &data_shape]() {
+    auto builder = HloComputation::Builder(TestName() + ".Cond");
+    auto data = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, data_shape, "data"));
+    builder.AddInstruction(HloInstruction::CreateBinary(
+        ShapeUtil::MakeShape(PRED, {}), HloOpcode::kEq, data, data));
+    return builder.Build();
+  };
+
+  auto make_body = [this, &data_shape]() {
+    auto builder = HloComputation::Builder(TestName() + ".Body");
+    auto data = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, data_shape, "data"));
+    builder.AddInstruction(
+        HloInstruction::CreateBinary(data_shape, HloOpcode::kAdd, data, data));
+    return builder.Build();
+  };
+
+  module_ = MakeUnique<HloModule>(TestName());
+  HloComputation* cond_computation =
+      module_->AddEmbeddedComputation(make_cond());
+  HloComputation* body_computation =
+      module_->AddEmbeddedComputation(make_body());
+
+  auto builder = HloComputation::Builder(TestName());
+  auto data = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape, "data"));
+  auto whil = builder.AddInstruction(HloInstruction::CreateWhile(
+      data_shape, cond_computation, body_computation, data));
+  computation_ = module_->AddEntryComputation(builder.Build());
+
+  RunAnalysis();
+
+  // The While instruction can share with the data operand.
+  EXPECT_TRUE(
+      CanShareOperandBufferWithUser(data, {}, whil, {}, *points_to_analysis_));
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 765006ea74324acccdebfa2d6e7222c088a0d2ce Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Wed, 5 Apr 2017 11:23:31 -0800
Subject: [PATCH 0140/1563] replica_device_setter should work for resource
 variables Change: 152289915

---
 tensorflow/python/training/device_setter.py      | 2 +-
 tensorflow/python/training/device_setter_test.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/training/device_setter.py b/tensorflow/python/training/device_setter.py
index 7f403f4927..85ee10379a 100644
--- a/tensorflow/python/training/device_setter.py
+++ b/tensorflow/python/training/device_setter.py
@@ -198,7 +198,7 @@ def replica_device_setter(ps_tasks=0, ps_device="/job:ps",
   if ps_ops is None:
     # TODO(sherrym): Variables in the LOCAL_VARIABLES collection should not be
     # placed in the parameter server.
-    ps_ops = ["Variable", "VariableV2"]
+    ps_ops = ["Variable", "VariableV2", "VarHandleOp"]
 
   if not merge_devices:
     logging.warning(
diff --git a/tensorflow/python/training/device_setter_test.py b/tensorflow/python/training/device_setter_test.py
index e05f0f6a1c..bc29e0d21c 100644
--- a/tensorflow/python/training/device_setter_test.py
+++ b/tensorflow/python/training/device_setter_test.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.python.framework import ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 from tensorflow.python.training import device_setter
@@ -46,6 +47,12 @@ class DeviceSetterTest(test.TestCase):
       self.assertDeviceEqual("/job:ps/task:1", w.initializer.device)
       self.assertDeviceEqual("/job:worker/cpu:0", a.device)
 
+  def testResource(self):
+    with ops.device(
+        device_setter.replica_device_setter(cluster=self._cluster_spec)):
+      v = resource_variable_ops.ResourceVariable([1, 2])
+      self.assertDeviceEqual("/job:ps/task:0", v.device)
+
   def testPS2TasksWithClusterSpecClass(self):
     with ops.device(
         device_setter.replica_device_setter(cluster=self._cluster_spec)):
-- 
GitLab


From 8268476073824a55eb25c127f6fe0d5b5374f75d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 11:30:37 -0800
Subject: [PATCH 0141/1563] Fix ./configure script 1. Add %workspace% in
 .bazelrc file when using import statement 2. Write action_env into bazelrc
 file for required environment variables for OpenCL support Change: 152290700

---
 configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 6360641be2..48a4594da6 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,7 @@ rm -f .tf_configure.bazelrc
 touch .tf_configure.bazelrc
 touch .bazelrc
 sed_hyphen_i "/tf_configure/d" .bazelrc
-echo "import .tf_configure.bazelrc" >> .bazelrc
+echo "import %workspace%/.tf_configure.bazelrc" >> .bazelrc
 
 # Delete any leftover BUILD files from the Makefile build, which would interfere
 # with Bazel parsing.
@@ -284,6 +284,7 @@ export TF_NEED_CUDA
 write_action_env_to_bazelrc "TF_NEED_CUDA" "$TF_NEED_CUDA"
 
 export TF_NEED_OPENCL
+write_action_env_to_bazelrc "TF_NEED_OPENCL" "$TF_NEED_OPENCL"
 
 if [ "$TF_NEED_CUDA" == "1" ]; then
 while [[ "$TF_CUDA_CLANG" == "" ]]; do
@@ -547,6 +548,7 @@ while true; do
   fi
   if [ -e "$HOST_CXX_COMPILER" ]; then
     export HOST_CXX_COMPILER
+    write_action_env_to_bazelrc "HOST_CXX_COMPILER" "$HOST_CXX_COMPILER"
     break
   fi
   echo "Invalid C++ compiler path. ${HOST_CXX_COMPILER} cannot be found" 1>&2
@@ -570,6 +572,7 @@ while true; do
   fi
   if [ -e "$HOST_C_COMPILER" ]; then
     export HOST_C_COMPILER
+    write_action_env_to_bazelrc "HOST_C_COMPILER" "$HOST_C_COMPILER"
     break
   fi
   echo "Invalid C compiler path. ${HOST_C_COMPILER} cannot be found" 1>&2
@@ -600,6 +603,7 @@ while true; do
 
   if [ -e "${COMPUTECPP_TOOLKIT_PATH}/${SYCL_RT_LIB_PATH}" ]; then
     export COMPUTECPP_TOOLKIT_PATH
+    write_action_env_to_bazelrc "COMPUTECPP_TOOLKIT_PATH" "$COMPUTECPP_TOOLKIT_PATH"
     break
   fi
   echo "Invalid SYCL $TF_OPENCL_VERSION library path. ${COMPUTECPP_TOOLKIT_PATH}/${SYCL_RT_LIB_PATH} cannot be found"
-- 
GitLab


From 0b1aee350e8bf06ed1beb994ca949a9ed67b40f3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 11:55:08 -0800
Subject: [PATCH 0142/1563] Pointing a number of Tensorboard graph
 visualization-related help links to the new locations for the correspondent
 API documentation. Change: 152293459

---
 .../tf_dashboard_common/tf-no-data-warning.html          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html
index dbc1dc5c5f..c90efac1d6 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html
@@ -34,10 +34,9 @@ Display a warning when there is no data found.
             and pass the graph either via the constructor, or by calling its
             <code>add_graph()</code> method.
             You may want to check out the
-            <a href="https://www.tensorflow.org/versions/master/how_tos/graph_viz/index.html">
+            <a href="https://www.tensorflow.org/get_started/graph_viz">
               graph visualizer tutorial
-            </a>
-            .
+            </a>.
           </p>
         </template>
         <template is="dom-if" if="[[_isProjector(dataType)]]">
@@ -53,7 +52,7 @@ Display a warning when there is no data found.
               <li>
                 You are not saving any checkpoint. To save your model,
                 create a
-                <a href="https://www.tensorflow.org/versions/master/api_docs/python/state_ops.html#Saver">
+                <a href="https://www.tensorflow.org/api_docs/python/tf/train/Saver">
                   <code>tf.train.Saver</code>
                 </a>
                 and save your model periodically
@@ -86,7 +85,7 @@ Display a warning when there is no data found.
             README
           </a>
           and perhaps the
-          <a href="https://www.tensorflow.org/versions/master/how_tos/summaries_and_tensorboard/index.html">
+          <a href="https://www.tensorflow.org/get_started/summaries_and_tensorboard">
             TensorBoard tutorial
           </a>.
         </p>
-- 
GitLab


From c699e5fa03b1f01913636de620aae5e550e58d40 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Wed, 5 Apr 2017 12:26:32 -0800
Subject: [PATCH 0143/1563] Restore most of pull request #8606

Pull request #8606 added str(Label(...)) for most dependencies in
tensorflow.bzl, allowing most functions to be used from repositories which
include TensorFlow as a submodule.  Unfortunately, it broke when pulled into
Google and was removed in cl/152200430.  This CL restores the change, except
for two Android-only functions; these were the only problematic bits.
Change: 152297413
---
 tensorflow/tensorflow.bzl | 144 ++++++++++++++++++++------------------
 1 file changed, 75 insertions(+), 69 deletions(-)

diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index a8007b803d..ddffabd8cb 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -41,76 +41,82 @@ def tf_android_core_proto_headers(core_proto_sources_relative):
   ])
 
 
+# Sanitize a dependency so that it works correctly from code that includes
+# TensorFlow as a submodule.
+def clean_dep(dep):
+  return str(Label(dep))
+
+
 def if_android_x86(a):
   return select({
-      "//tensorflow:android_x86": a,
-      "//tensorflow:android_x86_64": a,
+      clean_dep("//tensorflow:android_x86"): a,
+      clean_dep("//tensorflow:android_x86_64"): a,
       "//conditions:default": [],
   })
 
 
 def if_android_arm(a):
   return select({
-      "//tensorflow:android_arm": a,
+      clean_dep("//tensorflow:android_arm"): a,
       "//conditions:default": [],
   })
 
 
 def if_android_arm64(a):
   return select({
-      "//tensorflow:android_arm64": a,
+      clean_dep("//tensorflow:android_arm64"): a,
       "//conditions:default": [],
   })
 
 
 def if_not_android(a):
   return select({
-      "//tensorflow:android": [],
+      clean_dep("//tensorflow:android"): [],
       "//conditions:default": a,
   })
 
 
 def if_android(a):
   return select({
-      "//tensorflow:android": a,
+      clean_dep("//tensorflow:android"): a,
       "//conditions:default": [],
   })
 
 
 def if_ios(a):
   return select({
-      "//tensorflow:ios": a,
+      clean_dep("//tensorflow:ios"): a,
       "//conditions:default": [],
   })
 
 
 def if_mobile(a):
   return select({
-      "//tensorflow:android": a,
-      "//tensorflow:ios": a,
+      clean_dep("//tensorflow:android"): a,
+      clean_dep("//tensorflow:ios"): a,
       "//conditions:default": [],
   })
 
 
 def if_not_mobile(a):
   return select({
-      "//tensorflow:android": [],
-      "//tensorflow:ios": [],
+      clean_dep("//tensorflow:android"): [],
+      clean_dep("//tensorflow:ios"): [],
       "//conditions:default": a,
   })
 
 
 def if_not_windows(a):
   return select({
-      "//tensorflow:windows": [],
+      clean_dep("//tensorflow:windows"): [],
       "//conditions:default": a,
   })
 
 
 def if_x86(a):
   return select({
-      "//tensorflow:linux_x86_64": a,
-      "//tensorflow:windows": a,
+      clean_dep("//tensorflow:linux_x86_64"): a,
+      clean_dep("//tensorflow:windows"): a,
       "//conditions:default": [],
   })
 
@@ -124,13 +130,13 @@ def tf_copts():
       "-fno-exceptions",
   ] + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]) + if_android_arm(
       ["-mfpu=neon"]) + if_x86(["-msse3"]) + select({
-          "//tensorflow:android": [
+          clean_dep("//tensorflow:android"): [
               "-std=c++11",
               "-DTF_LEAN_BINARY",
               "-O2",
           ],
-          "//tensorflow:darwin": [],
-          "//tensorflow:windows": [
+          clean_dep("//tensorflow:darwin"): [],
+          clean_dep("//tensorflow:windows"): [
               "/DLANG_CXX11",
               "/D__VERSION__=\\\"MSVC\\\"",
               "/DPLATFORM_WINDOWS",
@@ -138,7 +144,7 @@ def tf_copts():
               "/DEIGEN_HAS_C99_MATH",
               "/DTENSORFLOW_USE_EIGEN_THREADPOOL",
           ],
-          "//tensorflow:ios": ["-std=c++11"],
+          clean_dep("//tensorflow:ios"): ["-std=c++11"],
           "//conditions:default": ["-pthread"]
       }))
 
@@ -166,7 +172,7 @@ def tf_gen_op_libs(op_lib_names, deps=None):
         name=n + "_op_lib",
         copts=tf_copts(),
         srcs=["ops/" + n + ".cc"],
-        deps=deps + ["//tensorflow/core:framework"],
+        deps=deps + [clean_dep("//tensorflow/core:framework")],
         visibility=["//visibility:public"],
         alwayslink=1,
         linkstatic=1,)
@@ -175,7 +181,7 @@ def tf_gen_op_libs(op_lib_names, deps=None):
 def tf_gen_op_wrapper_cc(name,
                          out_ops_file,
                          pkg="",
-                         op_gen="//tensorflow/cc:cc_op_gen_main",
+                         op_gen=clean_dep("//tensorflow/cc:cc_op_gen_main"),
                          deps=None,
                          override_file=None,
                          include_internal_ops=0):
@@ -242,11 +248,11 @@ def tf_gen_op_wrappers_cc(name,
                           other_hdrs=[],
                           pkg="",
                           deps=[
-                              "//tensorflow/cc:ops",
-                              "//tensorflow/cc:scope",
-                              "//tensorflow/cc:const_op",
+                              clean_dep("//tensorflow/cc:ops"),
+                              clean_dep("//tensorflow/cc:scope"),
+                              clean_dep("//tensorflow/cc:const_op"),
                           ],
-                          op_gen="//tensorflow/cc:cc_op_gen_main",
+                          op_gen=clean_dep("//tensorflow/cc:cc_op_gen_main"),
                           override_file=None,
                           include_internal_ops=0,
                           visibility=None):
@@ -272,12 +278,12 @@ def tf_gen_op_wrappers_cc(name,
       srcs=subsrcs,
       hdrs=subhdrs,
       deps=deps + if_not_android([
-          "//tensorflow/core:core_cpu",
-          "//tensorflow/core:framework",
-          "//tensorflow/core:lib",
-          "//tensorflow/core:protos_all_cc",
+          clean_dep("//tensorflow/core:core_cpu"),
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/core:lib"),
+          clean_dep("//tensorflow/core:protos_all_cc"),
       ]) + if_android([
-          "//tensorflow/core:android_tensorflow_lib",
+          clean_dep("//tensorflow/core:android_tensorflow_lib"),
       ]),
       copts=tf_copts(),
       alwayslink=1,
@@ -287,16 +293,16 @@ def tf_gen_op_wrappers_cc(name,
       srcs=internalsrcs,
       hdrs=internalhdrs,
       deps=deps + if_not_android([
-          "//tensorflow/core:core_cpu",
-          "//tensorflow/core:framework",
-          "//tensorflow/core:lib",
-          "//tensorflow/core:protos_all_cc",
+          clean_dep("//tensorflow/core:core_cpu"),
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/core:lib"),
+          clean_dep("//tensorflow/core:protos_all_cc"),
       ]) + if_android([
-          "//tensorflow/core:android_tensorflow_lib",
+          clean_dep("//tensorflow/core:android_tensorflow_lib"),
       ]),
       copts=tf_copts(),
       alwayslink=1,
-      visibility=["//tensorflow:internal"])
+      visibility=[clean_dep("//tensorflow:internal")])
 
 
 # Invoke this rule in .../tensorflow/python to build the wrapper library.
@@ -311,17 +317,17 @@ def tf_gen_op_wrapper_py(name,
   # Construct a cc_binary containing the specified ops.
   tool_name = "gen_" + name + "_py_wrappers_cc"
   if not deps:
-    deps = ["//tensorflow/core:" + name + "_op_lib"]
+    deps = [str(Label("//tensorflow/core:" + name + "_op_lib"))]
   native.cc_binary(
       name=tool_name,
       linkopts=["-lm"],
       copts=tf_copts(),
       linkstatic=1,  # Faster to link this one-time-use binary dynamically
       deps=([
-          "//tensorflow/core:framework",
-          "//tensorflow/python:python_op_gen_main"
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/python:python_op_gen_main")
       ] + deps),
-      visibility=["//tensorflow:internal"],)
+      visibility=[clean_dep("//tensorflow:internal")],)
 
   # Invoke the previous cc_binary to generate a python file.
   if not out:
@@ -363,7 +369,7 @@ def tf_gen_op_wrapper_py(name,
       srcs_version="PY2AND3",
       visibility=visibility,
       deps=[
-          "//tensorflow/python:framework_for_generated_wrappers_v2",
+          clean_dep("//tensorflow/python:framework_for_generated_wrappers_v2"),
       ],)
 
 
@@ -439,7 +445,7 @@ def tf_cuda_cc_test(name,
       name=name,
       srcs=srcs,
       suffix="_gpu",
-      deps=deps + if_cuda(["//tensorflow/core:gpu_runtime"]),
+      deps=deps + if_cuda([clean_dep("//tensorflow/core:gpu_runtime")]),
       linkstatic=if_cuda(1, 0),
       tags=tags + tf_cuda_tests_tags(),
       data=data,
@@ -547,8 +553,8 @@ def tf_gpu_kernel_library(srcs,
       hdrs=hdrs,
       copts=copts,
       deps=deps + if_cuda([
-          "//tensorflow/core:cuda",
-          "//tensorflow/core:gpu_lib",
+          clean_dep("//tensorflow/core:cuda"),
+          clean_dep("//tensorflow/core:gpu_lib"),
       ]),
       alwayslink=1,
       **kwargs)
@@ -579,7 +585,7 @@ def tf_cuda_library(deps=None, cuda_deps=None, copts=None, **kwargs):
 
   native.cc_library(
       deps=deps + if_cuda(cuda_deps + [
-          "//tensorflow/core:cuda",
+          clean_dep("//tensorflow/core:cuda"),
           "@local_config_cuda//cuda:cuda_headers"
       ]),
       copts=copts + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]),
@@ -634,7 +640,7 @@ def tf_kernel_library(name,
     hdrs = hdrs + native.glob(
         [prefix + "*.h"], exclude=[prefix + "*test*", prefix + "*.cu.h"])
 
-  cuda_deps = ["//tensorflow/core:gpu_lib"]
+  cuda_deps = [clean_dep("//tensorflow/core:gpu_lib")]
   if gpu_srcs:
     for gpu_src in gpu_srcs:
       if gpu_src.endswith(".cc") and not gpu_src.endswith(".cu.cc"):
@@ -810,8 +816,8 @@ def cc_header_only_library(name, deps=[], **kwargs):
 def tf_custom_op_library_additional_deps():
   return [
       "@protobuf//:protobuf_headers",
-      "//third_party/eigen3",
-      "//tensorflow/core:framework_headers_lib",
+      clean_dep("//third_party/eigen3"),
+      clean_dep("//tensorflow/core:framework_headers_lib"),
   ]
 
 
@@ -871,7 +877,7 @@ check_deps = rule(
 # implementations of custom ops and kernels.
 def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
   cuda_deps = [
-      "//tensorflow/core:stream_executor_headers_lib",
+      clean_dep("//tensorflow/core:stream_executor_headers_lib"),
       "@local_config_cuda//cuda:cudart_static",
   ]
   deps = deps + tf_custom_op_library_additional_deps()
@@ -888,8 +894,8 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
       name=name + "_check_deps",
       deps=deps + if_cuda(cuda_deps),
       disallowed_deps=[
-          "//tensorflow/core:framework",
-          "//tensorflow/core:lib"
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/core:lib")
       ])
 
   native.cc_binary(
@@ -903,7 +909,7 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
           "//conditions:default": [
               "-lm",
           ],
-          "//tensorflow:darwin": [],
+          clean_dep("//tensorflow:darwin"): [],
       }),)
 
 
@@ -956,21 +962,21 @@ def tf_py_wrap_cc(name,
   extra_linkopts = select({
       "@local_config_cuda//cuda:darwin": [
           "-Wl,-exported_symbols_list",
-          "//tensorflow:tf_exported_symbols.lds"
+          clean_dep("//tensorflow:tf_exported_symbols.lds")
       ],
-      str(Label("//tensorflow:windows")): [],
+      clean_dep("//tensorflow:windows"): [],
       "//conditions:default": [
           "-Wl,--version-script",
-          "//tensorflow:tf_version_script.lds"
+          clean_dep("//tensorflow:tf_version_script.lds")
       ]
   })
   extra_deps += select({
       "@local_config_cuda//cuda:darwin": [
-          "//tensorflow:tf_exported_symbols.lds"
+          clean_dep("//tensorflow:tf_exported_symbols.lds")
       ],
-      "//tensorflow:windows": [],
+      clean_dep("//tensorflow:windows"): [],
       "//conditions:default": [
-          "//tensorflow:tf_version_script.lds"
+          clean_dep("//tensorflow:tf_version_script.lds")
       ]
   })
 
@@ -994,7 +1000,7 @@ def tf_py_wrap_cc(name,
       srcs=[":" + name + ".py"],
       srcs_version="PY2AND3",
       data=select({
-          "//tensorflow:windows": [":" + cc_library_pyd_name],
+          clean_dep("//tensorflow:windows"): [":" + cc_library_pyd_name],
           "//conditions:default": [":" + cc_library_name],
       }))
 
@@ -1003,7 +1009,7 @@ def py_test(deps=[], **kwargs):
   native.py_test(
       deps=select({
           "//conditions:default": deps,
-          "//tensorflow:no_tensorflow_py_deps": []
+          clean_dep("//tensorflow:no_tensorflow_py_deps"): []
       }),
       **kwargs)
 
@@ -1028,15 +1034,15 @@ def tf_py_test(name,
       main=main,
       args=args,
       tags=tags,
-      visibility=["//tensorflow:internal"],
+      visibility=[clean_dep("//tensorflow:internal")],
       shard_count=shard_count,
       data=data,
       deps=select({
           "//conditions:default": [
-              "//tensorflow/python:extra_py_tests_deps",
-              "//tensorflow/python:gradient_checker",
+              clean_dep("//tensorflow/python:extra_py_tests_deps"),
+              clean_dep("//tensorflow/python:gradient_checker"),
           ] + additional_deps,
-          "//tensorflow:no_tensorflow_py_deps": []
+          clean_dep("//tensorflow:no_tensorflow_py_deps"): []
       }),
       flaky=flaky,
       srcs_version="PY2AND3")
@@ -1153,13 +1159,13 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs):
   out_srcs = [p.replace(".proto", ".pb_text.cc") for p in srcs]
   native.genrule(
       name=name,
-      srcs=srcs + ["//tensorflow/tools/proto_text:placeholder.txt"],
+      srcs=srcs + [clean_dep("//tensorflow/tools/proto_text:placeholder.txt")],
       outs=out_hdrs + out_srcs,
       cmd=
       "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) "
       + "$(@D) " + srcs_relative_dir + " $(SRCS)",
       tools=[
-          "//tensorflow/tools/proto_text:gen_proto_text_functions"
+          clean_dep("//tensorflow/tools/proto_text:gen_proto_text_functions")
       ],)
   return struct(hdrs=out_hdrs, srcs=out_srcs)
 
@@ -1173,15 +1179,15 @@ def tf_version_info_genrule():
   native.genrule(
       name="version_info_gen",
       srcs=[
-          "//tensorflow/tools/git:gen/spec.json",
-          "//tensorflow/tools/git:gen/head",
-          "//tensorflow/tools/git:gen/branch_ref",
+          clean_dep("//tensorflow/tools/git:gen/spec.json"),
+          clean_dep("//tensorflow/tools/git:gen/head"),
+          clean_dep("//tensorflow/tools/git:gen/branch_ref"),
       ],
       outs=["util/version_info.cc"],
       cmd=
       "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
       local=1,
-      tools=["//tensorflow/tools/git:gen_git_source.py"],)
+      tools=[clean_dep("//tensorflow/tools/git:gen_git_source.py")],)
 
 
 def cc_library_with_android_deps(deps,
-- 
GitLab


From e018a983a5abb5d849f1ec5393fb0834c7d78c8f Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Wed, 5 Apr 2017 12:28:15 -0800
Subject: [PATCH 0144/1563] Removed dead code in Estimator. Change: 152297597

---
 tensorflow/python/estimator/estimator.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 36918af552..4890845e03 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -643,12 +643,6 @@ class Estimator(object):
 
     return eval_results
 
-  def _verify_default_metric_key(self, metric_key, eval_dict):
-    if metric_key in six.iterkeys(eval_dict):
-      raise ValueError(
-          'Metric with name `%s` is not allowed, because Estimator '
-          'already defines a default metric with the same name.' % metric_key)
-
 
 def _check_hooks_type(hooks):
   """Returns hooks if all are SessionRunHook, raises TypeError otherwise."""
-- 
GitLab


From e69f71759adac4a794d5b159358af5253cb243bf Mon Sep 17 00:00:00 2001
From: Rohan Jain <rohan100jain@gmail.com>
Date: Wed, 5 Apr 2017 14:10:53 -0700
Subject: [PATCH 0145/1563] Branch 152232810 (#8988)

* Improve py_func error handling.

Automatically translate some python errors into corresponding TF errors at runtime.
Change: 152156821

* Update interaction with libpng so that we use the public API instead of
knowledge of the internal libpng data structures.
Change: 152167754

* TensorBoard plugins now contain their own name/route prefix.
Change: 152167807

* Passes trainable flag to separable_conv2d biases.
Change: 152170239

* Saving resource variables with a caching device.
Change: 152171539

* Drop loss from estimator_spec.eval_metric_ops, as required by core Estimator.
Change: 152179924

* sample_stats.percentile DOCFIX.
Change: 152182295

* Added a memory optimizer to grappler.
Change: 152184170

* Change default behavior of the tf runs selector:

- If there are fewer than 41 runs, enable them all by default
- If there are 41 runs or more, disable them all by default

This is in response to user complaints that having it enable only the first ten runs by default was confusing, because it was not obvious to users that some runs had been disabled.
However, it still solves the initial user complaint that having very many runs simultaneously enabled would lag the UI.

I also changed the "toggle all runs" button to try to turn everything off before turning everything on.
Also, I improved the logic for detecting when the runs selection is back in the default state, so that we can avoid generating long URI strings wherever possible.
Change: 152188948

* Autogenerated Change: Change TensorBoard TAG to 52
Change: 152189000

* Remove warning that only happening with config cuda.
Change: 152189205

* Make resource variable shared name consistent with non-resource variables.

Remove colocation constraint from resource variable cached value with the
variable itself.
Change: 152192203

* Add a way to specify the optimization order; refactor and add constant folding to meta optimizer.
Change: 152193646

* Backport fixes and improvements from external Keras.
Change: 152198296

* Merge changes from github.
Change: 152200430

* Go: Update generated wrapper functions for TensorFlow ops.
Change: 152200754

* Update ops-related pbtxt files.
Change: 152203174

* Make ImportGraphDef() work with functions.

In addition to modify graph_constructor.cc, this patch adds some other
functionality to enable importing fucntions:
* Ability to add FunctionDefLibraries to Graphs and
  FunctionLibraryDefinitions (in addition to existing functions)
* FunctionDefsEqual() utility function
Change: 152205258

* Expand contrib test to more than just test targets.
Change: 152206822

* Preserve graph version during optimization
Change: 152213262

* Exclude enter and exit nodes from shape refiner's constant folding.
Change: 152213637

* Allow reshape_mover and algebraic_simplifier to make multiple mutations, by avoiding the short-circuit
std::any_of.
Change: 152232810

* fixing workspace.bzl

* workspace.bzl further fixes

* fixing tensorflow.bzl merge conflicts

* fixing typo in dnn.h

* fixing bad merge for dnn.h
---
 tensorflow/compiler/tests/nary_ops_test.py    |   15 +-
 .../xla/service/algebraic_simplifier.cc       |   15 +-
 .../compiler/xla/service/reshape_mover.cc     |   20 +-
 .../xla/service/reshape_mover_test.cc         |   51 +
 .../distributions/python/ops/sample_stats.py  |    9 +-
 .../contrib/keras/python/keras/__init__.py    |    2 +-
 .../contrib/keras/python/keras/activations.py |   24 +-
 .../python/keras/applications/resnet50.py     |    4 +-
 .../contrib/keras/python/keras/backend.py     |   94 +-
 .../keras/python/keras/engine/topology.py     |   30 +-
 .../keras/python/keras/engine/training.py     |   26 +-
 .../keras/python/keras/initializers.py        |    9 +-
 .../python/keras/layers/convolutional.py      |   36 +-
 .../keras/layers/convolutional_recurrent.py   |    2 +-
 .../contrib/keras/python/keras/layers/core.py |    6 +-
 .../keras/python/keras/layers/local.py        |   16 +-
 .../keras/python/keras/layers/merge.py        |  156 +-
 .../python/keras/layers/normalization.py      |    2 +-
 .../keras/python/keras/layers/pooling.py      |   16 +-
 .../keras/python/keras/layers/recurrent.py    |   26 +-
 .../keras/python/keras/layers/wrappers.py     |   50 +-
 .../contrib/keras/python/keras/metrics.py     |    9 +-
 .../contrib/keras/python/keras/models.py      |   23 +-
 .../keras/python/keras/preprocessing/image.py |    2 +-
 .../keras/python/keras/utils/generic_utils.py |    5 +-
 .../keras/python/keras/utils/layer_utils.py   |    2 +-
 .../python/keras/wrappers/scikit_learn.py     |   34 +-
 .../layers/python/layers/embedding_ops.py     |  113 +-
 .../python/layers/embedding_ops_test.py       |  104 +-
 .../contrib/layers/python/layers/layers.py    |    1 +
 .../layers/python/layers/layers_test.py       |   14 +
 .../dataframe/queues/feeding_functions.py     |    1 +
 .../learn/python/learn/estimators/model_fn.py |   11 +-
 .../python/learn/estimators/model_fn_test.py  |   38 +-
 .../python/learn/learn_io/generator_io.py     |   44 +-
 .../learn/learn_io/generator_io_test.py       |  168 +-
 .../opt/python/training/external_optimizer.py |   18 +-
 tensorflow/contrib/seq2seq/python/ops/loss.py |   26 +-
 .../core/common_runtime/gpu/gpu_device.cc     |    8 +-
 .../common_runtime/gpu/gpu_event_mgr_test.cc  |    4 +-
 .../core/common_runtime/shape_refiner.cc      |    7 +
 tensorflow/core/framework/function.cc         |   42 +
 tensorflow/core/framework/function.h          |    7 +
 tensorflow/core/framework/function_test.cc    |   32 +
 tensorflow/core/graph/graph.cc                |   42 +-
 tensorflow/core/graph/graph.h                 |    6 +
 tensorflow/core/graph/graph_constructor.cc    |   16 +-
 tensorflow/core/graph/graph_constructor.h     |    2 -
 .../core/graph/graph_constructor_test.cc      |  209 +-
 tensorflow/core/graph/graph_test.cc           |   56 +
 tensorflow/core/graph/mkl_layout_pass.cc      |  242 ++-
 tensorflow/core/graph/mkl_layout_pass_test.cc |   17 +-
 .../core/graph/mkl_tfconversion_pass.cc       |    2 +-
 .../core/graph/mkl_tfconversion_pass_test.cc  |    4 +-
 tensorflow/core/grappler/optimizers/BUILD     |   33 +
 .../grappler/optimizers/constant_folding.cc   |    3 +-
 .../grappler/optimizers/memory_optimizer.cc   |   83 +
 .../grappler/optimizers/memory_optimizer.h    |   42 +
 .../optimizers/memory_optimizer_test.cc       |   74 +
 .../grappler/optimizers/meta_optimizer.cc     |   65 +-
 .../core/grappler/optimizers/meta_optimizer.h |    1 +
 .../core/kernels/conv_grad_filter_ops.cc      |   69 +-
 .../core/kernels/conv_grad_input_ops.cc       |   40 +-
 tensorflow/core/kernels/cudnn_pooling_gpu.cc  |    7 +-
 tensorflow/core/kernels/maxpooling_op.cc      |   61 +-
 .../core/kernels/maxpooling_op_gpu.cu.cc      |   28 +-
 tensorflow/core/kernels/maxpooling_op_gpu.h   |   40 +-
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |    9 +-
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |    2 +-
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |    2 +-
 .../core/kernels/mkl_conv_grad_input_ops.cc   |    4 +-
 tensorflow/core/kernels/mkl_conv_ops.cc       |   29 +-
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |   22 +-
 .../core/kernels/mkl_pooling_ops_common.cc    |  264 ++-
 .../core/kernels/mkl_pooling_ops_common.h     |    9 +-
 tensorflow/core/kernels/mkl_relu_op.cc        |  794 +++----
 tensorflow/core/kernels/pooling_ops_3d.cc     |   26 +-
 .../core/kernels/pooling_ops_3d_gpu.cu.cc     |    7 +-
 tensorflow/core/kernels/pooling_ops_common.cc |    2 +-
 tensorflow/core/kernels/xsmm_conv2d.cc        |  394 ++--
 tensorflow/core/lib/io/inputbuffer.cc         |    2 +-
 tensorflow/core/lib/png/png_io.cc             |   26 +-
 .../core/ops/compat/ops_history.v1.pbtxt      |  747 ++++++-
 tensorflow/core/ops/nn_grad.cc                |    1 -
 tensorflow/core/ops/ops.pbtxt                 |  320 ++-
 tensorflow/core/platform/cpu_info.cc          |   27 +-
 tensorflow/core/platform/windows/port.cc      |   27 +-
 .../core/protobuf/rewriter_config.proto       |    4 +
 tensorflow/core/util/equal_graph_def.cc       |   16 +-
 tensorflow/core/util/equal_graph_def.h        |    9 +
 tensorflow/core/util/equal_graph_def_test.cc  |   31 +-
 tensorflow/core/util/mkl_util.h               |   10 +-
 .../go/example_inception_inference_test.go    |    2 +-
 tensorflow/go/genop/internal/genop.go         |   12 +-
 tensorflow/go/op/wrappers.go                  | 1293 ++++++------
 tensorflow/python/estimator/estimator.py      |    6 +-
 tensorflow/python/estimator/estimator_test.py |   14 +-
 .../inputs/queues/feeding_functions.py        |   11 +-
 .../python/framework/tensor_util_test.py      |  106 +-
 .../kernel_tests/pooling_ops_3d_test.py       |    2 +-
 .../python/kernel_tests/pooling_ops_test.py   |   58 +-
 .../python/kernel_tests/py_func_test.py       |   22 +
 .../resource_variable_ops_test.py             |   33 +
 tensorflow/python/lib/core/py_func.cc         |   64 +-
 tensorflow/python/ops/nn_grad.py              |  127 +-
 tensorflow/python/ops/nn_ops.py               |    2 +
 .../python/ops/resource_variable_ops.py       |   24 +-
 tensorflow/python/platform/control_imports.py |   27 +
 tensorflow/python/training/saver_test.py      |   12 +
 tensorflow/stream_executor/cuda/cuda_dnn.cc   |    7 +-
 tensorflow/stream_executor/dnn.h              |   32 +-
 tensorflow/tensorboard/TAG                    |    2 +-
 tensorflow/tensorboard/backend/BUILD          |    1 +
 tensorflow/tensorboard/backend/application.py |   31 +-
 .../tensorboard/backend/application_test.py   |   32 +-
 .../tf-multi-checkbox.html                    |   46 +-
 .../components/vz_line_chart/vz-line-chart.ts |    8 +-
 tensorflow/tensorboard/plugins/base_plugin.py |    6 +
 .../plugins/debugger/debugger_plugin.py       |    4 +-
 .../plugins/debugger/debugger_plugin_test.py  |    2 +-
 .../plugins/projector/projector_plugin.py     |    4 +-
 .../projector/projector_plugin_test.py        |    4 +-
 .../tensorboard/plugins/text/text_plugin.py   |    4 +-
 tensorflow/tensorflow.bzl                     | 1029 ++++++----
 .../ci_build/linux/cpu/run_py3_contrib.sh     |    2 +-
 tensorflow/tools/pip_package/setup.py         |    5 +-
 tensorflow/tools/test/check_futures_test.py   |    1 +
 tensorflow/workspace.bzl                      | 1827 ++++++++---------
 third_party/libxsmm.BUILD                     |    3 +-
 129 files changed, 6371 insertions(+), 3742 deletions(-)
 create mode 100644 tensorflow/core/grappler/optimizers/memory_optimizer.cc
 create mode 100644 tensorflow/core/grappler/optimizers/memory_optimizer.h
 create mode 100644 tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
 create mode 100644 tensorflow/python/platform/control_imports.py

diff --git a/tensorflow/compiler/tests/nary_ops_test.py b/tensorflow/compiler/tests/nary_ops_test.py
index e89c411d01..2660e1d572 100644
--- a/tensorflow/compiler/tests/nary_ops_test.py
+++ b/tensorflow/compiler/tests/nary_ops_test.py
@@ -116,13 +116,14 @@ class NAryOpsTest(XLATestCase):
                     np.array([1, 1], dtype=np.int32)],
                    expected=np.array([[], []], dtype=np.float32))
 
-    if (np.int64 in self.int_types):
-      self._testNAry(lambda x: array_ops.strided_slice(*x),
-                     [np.array([[], [], []], dtype=np.float32),
-                      np.array([1, 0], dtype=np.int64),
-                      np.array([3, 0], dtype=np.int64),
-                      np.array([1, 1], dtype=np.int64)],
-                     expected=np.array([[], []], dtype=np.float32))
+    if np.int64 in self.int_types:
+      self._testNAry(
+          lambda x: array_ops.strided_slice(*x), [
+              np.array([[], [], []], dtype=np.float32), np.array(
+                  [1, 0], dtype=np.int64), np.array([3, 0], dtype=np.int64),
+              np.array([1, 1], dtype=np.int64)
+          ],
+          expected=np.array([[], []], dtype=np.float32))
 
     self._testNAry(lambda x: array_ops.strided_slice(*x),
                    [np.array([[1, 2, 3], [4, 5, 6], [7, 8, 9]],
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 4c058484b9..415aafe69a 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -1348,13 +1348,14 @@ Status AlgebraicSimplifierVisitor::HandleMinimum(HloInstruction* minimum,
 StatusOr<bool> AlgebraicSimplifier::Run(HloModule* module) {
   XLA_VLOG_LINES(2,
                  "AlgebraicSimplifier::Run(), before:\n" + module->ToString());
-  bool changed =
-      std::any_of(module->computations().begin(), module->computations().end(),
-                  [=](const std::unique_ptr<HloComputation>& computation) {
-                    return AlgebraicSimplifierVisitor::Run(
-                        computation.get(), is_layout_sensitive_,
-                        valid_bitcast_callback_, enable_dot_simplification_);
-                  });
+  bool changed = false;
+  for (auto& comp : module->computations()) {
+    if (AlgebraicSimplifierVisitor::Run(comp.get(), is_layout_sensitive_,
+                                        valid_bitcast_callback_,
+                                        enable_dot_simplification_)) {
+      changed = true;
+    }
+  }
   XLA_VLOG_LINES(2,
                  "AlgebraicSimplifier::Run(), after:\n" + module->ToString());
   return changed;
diff --git a/tensorflow/compiler/xla/service/reshape_mover.cc b/tensorflow/compiler/xla/service/reshape_mover.cc
index 3bff35544c..b72ef95a6a 100644
--- a/tensorflow/compiler/xla/service/reshape_mover.cc
+++ b/tensorflow/compiler/xla/service/reshape_mover.cc
@@ -234,17 +234,15 @@ bool TrySinkReshapeOrTranspose(HloComputation* computation,
 }  // namespace
 
 StatusOr<bool> ReshapeMover::Run(HloModule* module) {
-  return std::any_of(
-      module->computations().begin(), module->computations().end(),
-      [](const std::unique_ptr<HloComputation>& computation) {
-        std::list<HloInstruction*> postorder =
-            computation->MakeInstructionPostOrder();
-        return std::any_of(postorder.begin(), postorder.end(),
-                           [&computation](HloInstruction* instruction) {
-                             return TrySinkReshapeOrTranspose(computation.get(),
-                                                              instruction);
-                           });
-      });
+  bool changed = false;
+  for (const auto& comp : module->computations()) {
+    for (HloInstruction* instruction : comp->MakeInstructionPostOrder()) {
+      if (TrySinkReshapeOrTranspose(comp.get(), instruction)) {
+        changed = true;
+      }
+    }
+  }
+  return changed;
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/reshape_mover_test.cc b/tensorflow/compiler/xla/service/reshape_mover_test.cc
index 1862e2e992..09a673ea80 100644
--- a/tensorflow/compiler/xla/service/reshape_mover_test.cc
+++ b/tensorflow/compiler/xla/service/reshape_mover_test.cc
@@ -202,5 +202,56 @@ TEST_F(ReshapeMoverTest, ScalarReshapeNotMovedAcrossSelect) {
   EXPECT_EQ(select, computation->root_instruction());
 }
 
+// Tree looks like this:
+//
+// add1
+// |
+// +- reshape2 - param2
+// |
+// +- reshape3 - add0
+//               |
+//               + reshape0 - param0
+//               |
+//               + reshape1 - param1
+//
+// We expect reshape{0,1} AND reshape{2,3} to be lifted.
+TEST_F(ReshapeMoverTest, MultiplePasses) {
+  auto shape1 = ShapeUtil::MakeShape(F32, {1, 8, 1, 7});
+  auto shape2 = ShapeUtil::MakeShape(F32, {8, 7, 1});
+  auto shape3 = ShapeUtil::MakeShape(F32, {8, 7});
+  HloComputation::Builder builder(TestName());
+  auto param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, shape1, "param0"));
+  auto param1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, shape1, "param1"));
+  auto param2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(2, shape2, "param2"));
+  auto reshape0 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape2, param0));
+  auto reshape1 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape2, param1));
+  auto add0 = builder.AddInstruction(HloInstruction::CreateBinary(
+      shape2, HloOpcode::kAdd, reshape0, reshape1));
+  auto reshape2 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape3, param2));
+  auto reshape3 =
+      builder.AddInstruction(HloInstruction::CreateReshape(shape3, add0));
+  auto add1 = builder.AddInstruction(HloInstruction::CreateBinary(
+      shape3, HloOpcode::kAdd, reshape2, reshape3));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+  EXPECT_EQ(add1, computation->root_instruction());
+  EXPECT_TRUE(ReshapeMover().Run(module.get()).ValueOrDie());
+  EXPECT_EQ(HloOpcode::kReshape, computation->root_instruction()->opcode());
+  EXPECT_EQ(HloOpcode::kAdd,
+            computation->root_instruction()->operand(0)->opcode());
+  const auto& add_params =
+      computation->root_instruction()->operand(0)->operands();
+  EXPECT_EQ(2, add_params.size());
+  EXPECT_EQ(HloOpcode::kParameter, add_params[0]->opcode());
+  EXPECT_EQ(HloOpcode::kReshape, add_params[1]->opcode());
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/contrib/distributions/python/ops/sample_stats.py b/tensorflow/contrib/distributions/python/ops/sample_stats.py
index 0b1ceefe7b..26cf922d0a 100644
--- a/tensorflow/contrib/distributions/python/ops/sample_stats.py
+++ b/tensorflow/contrib/distributions/python/ops/sample_stats.py
@@ -44,7 +44,7 @@ def percentile(x,
                keep_dims=False,
                validate_args=False,
                name=None):
-  """Compute the `q`-th percentile of `x` along leading (sample) dimensions.
+  """Compute the `q`-th percentile of `x`.
 
   Given a vector `x`, the `q`-th percentile of `x` is the value `q / 100` of the
   way from the minimum to the maximum in in a sorted copy of `x`.
@@ -58,7 +58,7 @@ def percentile(x,
 
 
   ```python
-  # Get 30th percentile with default ('linear') interpolation.
+  # Get 30th percentile with default ('nearest') interpolation.
   x = [1., 2., 3., 4.]
   percentile(x, q=30.)
   ==> 2.0
@@ -91,11 +91,10 @@ def percentile(x,
     axis:  Optional `0-D` or `1-D` integer `Tensor` with constant values.
       The axis that hold independent samples over which to return the desired
       percentile.  If `None` (the default), treat every dimension as a sample
-      dimension, returning a scalar
+      dimension, returning a scalar.
     interpolation : {"lower", "higher", "nearest"}.  Default: "nearest"
       This optional parameter specifies the interpolation method to
-      use when the desired quantile lies between two data points
-      `i < j`:
+      use when the desired quantile lies between two data points `i < j`:
         * lower: `i`.
         * higher: `j`.
         * nearest: `i` or `j`, whichever is nearest.
diff --git a/tensorflow/contrib/keras/python/keras/__init__.py b/tensorflow/contrib/keras/python/keras/__init__.py
index cdfc40dff1..ec316253db 100644
--- a/tensorflow/contrib/keras/python/keras/__init__.py
+++ b/tensorflow/contrib/keras/python/keras/__init__.py
@@ -37,4 +37,4 @@ from tensorflow.contrib.keras.python.keras import utils
 from tensorflow.contrib.keras.python.keras import wrappers
 
 
-__version__ = '2.0.0-tf'
+__version__ = '2.0.2-tf'
diff --git a/tensorflow/contrib/keras/python/keras/activations.py b/tensorflow/contrib/keras/python/keras/activations.py
index 1eac52dfad..67762c83ba 100644
--- a/tensorflow/contrib/keras/python/keras/activations.py
+++ b/tensorflow/contrib/keras/python/keras/activations.py
@@ -24,18 +24,28 @@ from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import deserialize_keras_object
 
 
-def softmax(x):
+def softmax(x, axis=-1):
+  """Softmax activation function.
+
+  Arguments:
+      x : Tensor.
+      axis: Integer, axis along which the softmax normalization is applied.
+
+  Returns:
+      Tensor, output of softmax transformation.
+
+  Raises:
+      ValueError: In case `dim(x) == 1`.
+  """
   ndim = K.ndim(x)
   if ndim == 2:
     return K.softmax(x)
-  elif ndim == 3:
-    e = K.exp(x - K.max(x, axis=-1, keepdims=True))
-    s = K.sum(e, axis=-1, keepdims=True)
+  elif ndim > 2:
+    e = K.exp(x - K.max(x, axis=axis, keepdims=True))
+    s = K.sum(e, axis=axis, keepdims=True)
     return e / s
   else:
-    raise ValueError('Cannot apply softmax to a tensor '
-                     'that is not 2D or 3D. '
-                     'Here, ndim=' + str(ndim))
+    raise ValueError('Cannot apply softmax to a tensor that is 1D')
 
 
 def elu(x, alpha=1.0):
diff --git a/tensorflow/contrib/keras/python/keras/applications/resnet50.py b/tensorflow/contrib/keras/python/keras/applications/resnet50.py
index 546fcb9433..12f7ca424e 100644
--- a/tensorflow/contrib/keras/python/keras/applications/resnet50.py
+++ b/tensorflow/contrib/keras/python/keras/applications/resnet50.py
@@ -163,8 +163,8 @@ def ResNet50(include_top=True,
   specified in your Keras config file.
 
   Arguments:
-      include_top: whether to include the 3 fully-connected
-          layers at the top of the network.
+      include_top: whether to include the fully-connected
+          layer at the top of the network.
       weights: one of `None` (random initialization)
           or "imagenet" (pre-training on ImageNet).
       input_tensor: optional Keras tensor (i.e. output of `layers.Input()`)
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index 9769bce3b0..d7c646c19a 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -22,7 +22,6 @@ from __future__ import division
 from __future__ import print_function
 
 from collections import defaultdict
-import errno
 import json
 import os
 import warnings
@@ -270,6 +269,7 @@ def clear_session():
   reset_uids()
   _SESSION = None
   phase = array_ops.placeholder(dtype='bool', name='keras_learning_phase')
+  _GRAPH_LEARNING_PHASES = {}
   _GRAPH_LEARNING_PHASES[ops.get_default_graph()] = phase
 
 
@@ -1257,6 +1257,34 @@ def prod(x, axis=None, keepdims=False):
   return math_ops.reduce_prod(x, reduction_indices=axis, keep_dims=keepdims)
 
 
+def cumsum(x, axis=0):
+  """Cumulative sum of the values in a tensor, alongside the specified axis.
+
+  Arguments:
+      x: A tensor or variable.
+      axis: An integer, the axis to compute the sum.
+
+  Returns:
+      A tensor of the cumulative sum of values of `x` along `axis`.
+  """
+  axis = _normalize_axis(axis, ndim(x))
+  return math_ops.cumsum(x, axis=axis)
+
+
+def cumprod(x, axis=0):
+  """Cumulative product of the values in a tensor, alongside the specified axis.
+
+  Arguments:
+      x: A tensor or variable.
+      axis: An integer, the axis to compute the product.
+
+  Returns:
+      A tensor of the cumulative product of values of `x` along `axis`.
+  """
+  axis = _normalize_axis(axis, ndim(x))
+  return math_ops.cumprod(x, axis=axis)
+
+
 def var(x, axis=None, keepdims=False):
   """Variance of a tensor, alongside the specified axis.
 
@@ -1330,8 +1358,7 @@ def any(x, axis=None, keepdims=False):
   """
   axis = _normalize_axis(axis, ndim(x))
   x = math_ops.cast(x, dtypes_module.bool)
-  x = math_ops.reduce_any(x, reduction_indices=axis, keep_dims=keepdims)
-  return math_ops.cast(x, dtypes_module.uint8)
+  return math_ops.reduce_any(x, reduction_indices=axis, keep_dims=keepdims)
 
 
 def all(x, axis=None, keepdims=False):
@@ -1347,8 +1374,7 @@ def all(x, axis=None, keepdims=False):
   """
   axis = _normalize_axis(axis, ndim(x))
   x = math_ops.cast(x, dtypes_module.bool)
-  x = math_ops.reduce_all(x, reduction_indices=axis, keep_dims=keepdims)
-  return math_ops.cast(x, dtypes_module.uint8)
+  return math_ops.reduce_all(x, reduction_indices=axis, keep_dims=keepdims)
 
 
 def argmax(x, axis=-1):
@@ -1645,7 +1671,7 @@ def normalize_batch_in_training(x, gamma, beta, reduction_axes, epsilon=1e-3):
   """
   mean, var = nn.moments(
       x, reduction_axes, shift=None, name=None, keep_dims=False)
-  if sorted(reduction_axes) == range(ndim(x))[:-1]:
+  if sorted(reduction_axes) == list(range(ndim(x)))[:-1]:
     normed = nn.batch_normalization(x, mean, var, beta, gamma, epsilon)
   else:
     # need broadcasting
@@ -2324,8 +2350,8 @@ def rnn(step_function,
           (no time dimension),
           containing the initial values for the states used in
           the step function.
-      go_backwards: boolean. If True, do the iteration over
-          the time dimension in reverse order.
+      go_backwards: boolean. If True, do the iteration over the time
+          dimension in reverse order and return the reversed sequence.
       mask: binary tensor with shape `(samples, time, 1)`,
           with a zero for every element that is masked.
       constants: a list of constant values passed at each step.
@@ -2414,9 +2440,9 @@ def rnn(step_function,
         states = return_states
         successive_outputs.append(output)
         successive_states.append(states)
-        last_output = successive_outputs[-1]
-        new_states = successive_states[-1]
-        outputs = array_ops.stack(successive_outputs)
+      last_output = successive_outputs[-1]
+      new_states = successive_states[-1]
+      outputs = array_ops.stack(successive_outputs)
     else:
       for inp in input_list:
         output, states = step_function(inp, states + constants)
@@ -3534,19 +3560,19 @@ def ctc_decode(y_pred, input_length, greedy=True, beam_width=100, top_paths=1):
 # HIGH ORDER FUNCTIONS
 
 
-def map_fn(fn, elems, name=None):
+def map_fn(fn, elems, name=None, dtype=None):
   """Map the function fn over the elements elems and return the outputs.
 
   Arguments:
       fn: Callable that will be called upon each element in elems
       elems: tensor
       name: A string name for the map node in the graph
+      dtype: Output data type.
 
   Returns:
-      Tensor with first dimension equal to the elems and second depending on
-      fn
+      Tensor with dtype `dtype`.
   """
-  return functional_ops.map_fn(fn, elems, name=name)
+  return functional_ops.map_fn(fn, elems, name=name, dtype=dtype)
 
 
 def foldl(fn, elems, initializer=None, name=None):
@@ -3560,7 +3586,7 @@ def foldl(fn, elems, initializer=None, name=None):
       name: A string name for the foldl node in the graph
 
   Returns:
-      Same type and shape as initializer
+      Tensor with same type and shape as `initializer`.
   """
   return functional_ops.foldl(fn, elems, initializer=initializer, name=name)
 
@@ -3583,27 +3609,39 @@ def foldr(fn, elems, initializer=None, name=None):
 
 # Load Keras default configuration from config file if present.
 _keras_base_dir = os.path.expanduser('~')
-if not os.access(_keras_base_dir, os.W_OK):
-  _keras_base_dir = '/tmp'
 _keras_dir = os.path.join(_keras_base_dir, '.keras')
-if not os.path.exists(_keras_dir):
-  try:
-    os.makedirs(_keras_dir)
-  except OSError as e:
-    if e.errno == errno.EEXIST:
-      pass
-    else:
-      raise
 _config_path = os.path.expanduser(os.path.join(_keras_dir, 'keras.json'))
 if os.path.exists(_config_path):
-  _config = json.load(open(_config_path))
+  try:
+    _config = json.load(open(_config_path))
+  except json.decoder.JSONDecodeError:
+    _config = {}
   _floatx = _config.get('floatx', floatx())
   assert _floatx in {'float16', 'float32', 'float64'}
   _epsilon = _config.get('epsilon', epsilon())
   assert isinstance(_epsilon, float)
-  _backend = backend()
   _image_data_format = _config.get('image_data_format', image_data_format())
   assert _image_data_format in {'channels_last', 'channels_first'}
   set_floatx(_floatx)
   set_epsilon(_epsilon)
   set_image_data_format(_image_data_format)
+
+# Save config file.
+if os.access(_keras_base_dir, os.W_OK):
+  if not os.path.exists(_keras_dir):
+    try:
+      os.makedirs(_keras_dir)
+    except OSError:
+      # Except potential race conditions
+      # in multi-threaded environments.
+      pass
+
+  if not os.path.exists(_config_path):
+    _config = {
+        'floatx': floatx(),
+        'epsilon': epsilon(),
+        'backend': 'tensorflow',
+        'image_data_format': image_data_format()
+    }
+    with open(_config_path, 'w') as f:
+      f.write(json.dumps(_config, indent=4))
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 0f506ff0a4..e33268235f 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -295,8 +295,14 @@ class Layer(object):
     # are only applicable to input layers: do not pass these keywords
     # to non-input layers.
     allowed_kwargs = {
-        'input_shape', 'batch_input_shape', 'batch_size', 'dtype', 'name',
-        'trainable', 'weights'
+        'input_shape',
+        'batch_input_shape',
+        'batch_size',
+        'dtype',
+        'name',
+        'trainable',
+        'weights',
+        'input_dtype',  # legacy
     }
     for kwarg in kwargs:
       if kwarg not in allowed_kwargs:
@@ -320,8 +326,15 @@ class Layer(object):
           batch_size = None
         batch_input_shape = (batch_size,) + tuple(kwargs['input_shape'])
       self.batch_input_shape = batch_input_shape
-      dtype = kwargs.get('dtype', K.floatx())
+
+      # Set dtype.
+      dtype = kwargs.get('dtype')
+      if dtype is None:
+        dtype = kwargs.get('input_dtype')
+      if dtype is None:
+        dtype = K.floatx()
       self.dtype = dtype
+
     if 'weights' in kwargs:
       self._initial_weights = kwargs['weights']
     else:
@@ -485,11 +498,12 @@ class Layer(object):
                                  ': expected shape=' + str(spec.shape) +
                                  ', found shape=' + str(x_shape))
 
-  def call(self, inputs):
+  def call(self, inputs, **kwargs):  # pylint: disable=unused-argument
     """This is where the layer's logic lives.
 
     Arguments:
-        inputs: input tensor, or list/tuple of input tensors.
+        inputs: Input tensor, or list/tuple of input tensors.
+        **kwargs: Additional keyword arguments.
 
     Returns:
         A tensor or list/tuple of tensors.
@@ -518,6 +532,8 @@ class Layer(object):
         ValueError: in case the layer is missing shape information
             for its `build` call.
     """
+    if isinstance(inputs, list):
+      inputs = inputs[:]
     with K.name_scope(self.name):
       # Handle laying building (weight creating, input spec locking).
       if not self.built:
@@ -1417,7 +1433,7 @@ class Container(Layer):
       get_weights
       set_weights
       get_config
-      get_output_shape_for
+      compute_output_shape
 
   # Class Methods
       from_config
@@ -2029,7 +2045,7 @@ class Container(Layer):
       for i in range(len(input_shapes)):
         layer = self.input_layers[i]
         input_shape = input_shapes[i]
-        # It's an input layer: get_output_shape_for is identity,
+        # It's an input layer: compute_output_shape is identity,
         # and there is only one node and one tensor output.
         shape_key = layer.name + '_0_0'
         layers_to_output_shapes[shape_key] = input_shape
diff --git a/tensorflow/contrib/keras/python/keras/engine/training.py b/tensorflow/contrib/keras/python/keras/engine/training.py
index efd437f6f6..0097c4a1c2 100644
--- a/tensorflow/contrib/keras/python/keras/engine/training.py
+++ b/tensorflow/contrib/keras/python/keras/engine/training.py
@@ -733,11 +733,12 @@ class Model(Container):
       loss_functions = []
       for name in self.output_names:
         if name not in loss:
-          warnings.warn('Output "' + name + '" missing from loss dictionary. '
-                        'We assume this was done on purpose, '
-                        'and we will not be expecting '
-                        'any data to be passed to "' + name +
-                        '" during training.')
+          warnings.warn(
+              'Output "' + name + '" missing from loss dictionary. '
+              'We assume this was done on purpose, '
+              'and we will not be expecting '
+              'any data to be passed to "' + name + '" during training.',
+              stacklevel=2)
         loss_functions.append(losses.get(loss.get(name)))
     elif isinstance(loss, list):
       if len(loss) != len(self.outputs):
@@ -1202,7 +1203,7 @@ class Model(Container):
       if batch_index == 0:
         for batch_out in batch_outs:
           shape = (samples,) + batch_out.shape[1:]
-          outs.append(np.zeros(shape, dtype=K.floatx()))
+          outs.append(np.zeros(shape, dtype=batch_out.dtype))
 
       for i, batch_out in enumerate(batch_outs):
         outs[i][batch_start:batch_end] = batch_out
@@ -1718,7 +1719,7 @@ class Model(Container):
             - a tuple (inputs, targets, sample_weights).
             All arrays should contain the same number of samples.
             The generator is expected to loop over its data
-            indefinitely. An epoch finishes when `samples_per_epoch`
+            indefinitely. An epoch finishes when `steps_per_epoch`
             samples have been seen by the model.
         steps_per_epoch: Total number of steps (batches of samples)
             to yield from `generator` before declaring one epoch
@@ -1767,7 +1768,7 @@ class Model(Container):
                 f.close()
 
         model.fit_generator(generate_arrays_from_file('/my_file.txt'),
-                            samples_per_epoch=10000, epochs=10)
+                            steps_per_epoch=10000, epochs=10)
     ```
 
     Raises:
@@ -2028,7 +2029,8 @@ class Model(Container):
                         steps,
                         max_q_size=10,
                         workers=1,
-                        pickle_safe=False):
+                        pickle_safe=False,
+                        verbose=0):
     """Generates predictions for the input samples from a data generator.
 
     The generator should return the same kind of data as accepted by
@@ -2048,6 +2050,7 @@ class Model(Container):
             non picklable arguments to the generator
             as they can't be passed
             easily to children processes.
+        verbose: verbosity mode, 0 or 1.
 
     Returns:
         Numpy array(s) of predictions.
@@ -2067,6 +2070,9 @@ class Model(Container):
       enqueuer = GeneratorEnqueuer(generator, pickle_safe=pickle_safe)
       enqueuer.start(workers=workers, max_q_size=max_q_size)
 
+      if verbose == 1:
+        progbar = Progbar(target=steps)
+
       while steps_done < steps:
         generator_output = None
         while enqueuer.is_running():
@@ -2103,6 +2109,8 @@ class Model(Container):
         for i, out in enumerate(outs):
           all_outs[i].append(out)
         steps_done += 1
+        if verbose == 1:
+          progbar.update(steps_done)
 
     finally:
       if enqueuer is not None:
diff --git a/tensorflow/contrib/keras/python/keras/initializers.py b/tensorflow/contrib/keras/python/keras/initializers.py
index 621069f424..f9cb35e171 100644
--- a/tensorflow/contrib/keras/python/keras/initializers.py
+++ b/tensorflow/contrib/keras/python/keras/initializers.py
@@ -45,14 +45,16 @@ class Initializer(object):
 
 
 class Zeros(Initializer):
-  """Initializer that generates tensors initialized to 0."""
+  """Initializer that generates tensors initialized to 0.
+  """
 
   def __call__(self, shape, dtype=None):
     return K.constant(0, shape=shape, dtype=dtype)
 
 
 class Ones(Initializer):
-  """Initializer that generates tensors initialized to 1."""
+  """Initializer that generates tensors initialized to 1.
+  """
 
   def __call__(self, shape, dtype=None):
     return K.constant(1, shape=shape, dtype=dtype)
@@ -130,7 +132,7 @@ class RandomUniform(Initializer):
 class TruncatedNormal(Initializer):
   """Initializer that generates a truncated normal distribution.
 
-  These values are similar to values from a `random_normal_initializer`
+  These values are similar to values from a `RandomNormal`
   except that values more than two standard deviations from the mean
   are discarded and re-drawn. This is the recommended initializer for
   neural network weights and filters.
@@ -161,6 +163,7 @@ class VarianceScaling(Initializer):
 
   With `distribution="normal"`, samples are drawn from a truncated normal
   distribution centered on zero, with `stddev = sqrt(scale / n)` where n is:
+
       - number of input units in the weight tensor, if mode = "fan_in"
       - number of output units, if mode = "fan_out"
       - average of the numbers of input and output units, if mode = "fan_avg"
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional.py b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
index 1a28399a28..3b68022115 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
@@ -244,7 +244,7 @@ class _Conv(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
@@ -289,7 +289,7 @@ class Conv1D(_Conv):
           any `dilation_rate` value != 1.
       padding: One of `"valid"`, `"causal"` or `"same"` (case-insensitive).
           `"causal"` results in causal (dilated) convolutions, e.g. output[t]
-          depends solely on input[:t-1]. Useful when modeling temporal data
+          does not depend on input[t+1:]. Useful when modeling temporal data
           where the model should not violate the temporal order.
           See [WaveNet: A Generative Model for Raw Audio, section
             2.1](https://arxiv.org/abs/1609.03499).
@@ -395,9 +395,9 @@ class Conv2D(_Conv):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -621,7 +621,7 @@ class Conv2DTranspose(Conv2D):
 
   Arguments:
       filters: Integer, the dimensionality of the output space
-          (i.e. the number output of filters in the convolution).
+          (i.e. the number of output filters in the convolution).
       kernel_size: An integer or tuple/list of 2 integers, specifying the
           width and height of the 2D convolution window.
           Can be a single integer to specify the same value for
@@ -637,9 +637,9 @@ class Conv2DTranspose(Conv2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -688,7 +688,7 @@ class Conv2DTranspose(Conv2D):
                kernel_size,
                strides=(1, 1),
                padding='valid',
-               data_format='channels_last',
+               data_format=None,
                activation=None,
                use_bias=True,
                kernel_initializer='glorot_uniform',
@@ -845,9 +845,9 @@ class SeparableConv2D(Conv2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -1079,9 +1079,9 @@ class UpSampling2D(Layer):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -1257,7 +1257,7 @@ class ZeroPadding2D(Layer):
           - If tuple of 2 ints:
               interpreted as two different
               symmetric padding values for height and width:
-              `(symmetric_height_pad, symmetrc_width_pad)`.
+              `(symmetric_height_pad, symmetric_width_pad)`.
           - If tuple of 2 tuples of 2 ints:
               interpreted as
               `((top_pad, bottom_pad), (left_pad, right_pad))`
@@ -1265,9 +1265,9 @@ class ZeroPadding2D(Layer):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -1498,7 +1498,7 @@ class Cropping2D(Layer):
           - If tuple of 2 ints:
               interpreted as two different
               symmetric cropping values for height and width:
-              `(symmetric_height_crop, symmetrc_width_crop)`.
+              `(symmetric_height_crop, symmetric_width_crop)`.
           - If tuple of 2 tuples of 2 ints:
               interpreted as
               `((top_crop, bottom_crop), (left_crop, right_crop))`
@@ -1506,9 +1506,9 @@ class Cropping2D(Layer):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py b/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
index 4ed5046dc3..4d8ef44da7 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
@@ -357,7 +357,7 @@ class ConvLSTM2D(ConvRecurrent2D):
       self.states = [None, None]
 
     if self.data_format == 'channels_first':
-      channel_axis = 1
+      channel_axis = 2
     else:
       channel_axis = -1
     if input_shape[channel_axis] is None:
diff --git a/tensorflow/contrib/keras/python/keras/layers/core.py b/tensorflow/contrib/keras/python/keras/layers/core.py
index 1207cc119f..8dd55aaa2e 100644
--- a/tensorflow/contrib/keras/python/keras/layers/core.py
+++ b/tensorflow/contrib/keras/python/keras/layers/core.py
@@ -88,7 +88,7 @@ class Dropout(Layer):
   """Applies Dropout to the input.
 
   Dropout consists in randomly setting
-  a fraction `p` of input units to 0 at each update during training time,
+  a fraction `rate` of input units to 0 at each update during training time,
   which helps prevent overfitting.
 
   Arguments:
@@ -140,7 +140,7 @@ class SpatialDropout1D(Dropout):
   between feature maps and should be used instead.
 
   Arguments:
-      p: float between 0 and 1. Fraction of the input units to drop.
+      rate: float between 0 and 1. Fraction of the input units to drop.
 
   Input shape:
       3D tensor with shape:
@@ -775,7 +775,7 @@ class Dense(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
diff --git a/tensorflow/contrib/keras/python/keras/layers/local.py b/tensorflow/contrib/keras/python/keras/layers/local.py
index 3bf5ee4f0f..895d6e3727 100644
--- a/tensorflow/contrib/keras/python/keras/layers/local.py
+++ b/tensorflow/contrib/keras/python/keras/layers/local.py
@@ -59,7 +59,8 @@ class LocallyConnected1D(Layer):
           specifying the stride length of the convolution.
           Specifying any stride value != 1 is incompatible with specifying
           any `dilation_rate` value != 1.
-      padding: One of `"valid"` or `"same"` (case-insensitive).
+      padding: Currently only supports `"valid"` (case-insensitive).
+          `"same"` may be supported in the future.
       activation: Activation function to use.
           If you don't specify anything, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
@@ -188,7 +189,7 @@ class LocallyConnected1D(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
@@ -239,16 +240,15 @@ class LocallyConnected2D(Layer):
           specifying the strides of the convolution along the width and height.
           Can be a single integer to specify the same value for
           all spatial dimensions.
-          Specifying any stride value != 1 is incompatible with specifying
-          any `dilation_rate` value != 1.
-      padding: one of `"valid"` or `"same"` (case-insensitive).
+      padding: Currently only support `"valid"` (case-insensitive).
+          `"same"` will be supported in future.
       data_format: A string,
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -460,7 +460,7 @@ class LocallyConnected2D(Layer):
         'kernel_initializer':
             initializers.serialize(self.kernel_initializer),
         'bias_initializer':
-            initializers.serialize(self.kernel_initializer),
+            initializers.serialize(self.bias_initializer),
         'kernel_regularizer':
             regularizers.serialize(self.kernel_regularizer),
         'bias_regularizer':
diff --git a/tensorflow/contrib/keras/python/keras/layers/merge.py b/tensorflow/contrib/keras/python/keras/layers/merge.py
index eea4313d31..d52bd2bbb3 100644
--- a/tensorflow/contrib/keras/python/keras/layers/merge.py
+++ b/tensorflow/contrib/keras/python/keras/layers/merge.py
@@ -41,6 +41,44 @@ class _Merge(Layer):
   def _merge_function(self, inputs):
     raise NotImplementedError
 
+  def _compute_elemwise_op_output_shape(self, shape1, shape2):
+    """Computes the shape of the resultant of an elementwise operation.
+
+    Arguments:
+        shape1: tuple or None. Shape of the first tensor
+        shape2: tuple or None. Shape of the second tensor
+
+    Returns:
+        expected output shape when an element-wise operation is
+        carried out on 2 tensors with shapes shape1 and shape2.
+        tuple or None.
+
+    Raises:
+        ValueError: if shape1 and shape2 are not compatible for
+            element-wise operations.
+    """
+    if None in [shape1, shape2]:
+      return None
+    elif len(shape1) < len(shape2):
+      return self._compute_elemwise_op_output_shape(shape2, shape1)
+    elif not shape2:
+      return shape1
+    output_shape = list(shape1[:-len(shape2)])
+    for i, j in zip(shape1[-len(shape2):], shape2):
+      if i is None or j is None:
+        output_shape.append(None)
+      elif i == 1:
+        output_shape.append(j)
+      elif j == 1:
+        output_shape.append(i)
+      else:
+        if i != j:
+          raise ValueError('Operands could not be broadcast '
+                           'together with shapes ' + str(shape1) + ' ' + str(
+                               shape2))
+        output_shape.append(i)
+    return tuple(output_shape)
+
   def build(self, input_shape):
     # Used purely for shape validation.
     if not isinstance(input_shape, list):
@@ -49,23 +87,107 @@ class _Merge(Layer):
       raise ValueError('A merge layer should be called '
                        'on a list of at least 2 inputs. '
                        'Got ' + str(len(input_shape)) + ' inputs.')
-    if all([shape is None for shape in input_shape]):
-      return
-    input_shapes = [
-        tuple(tensor_shape.TensorShape(shape).as_list())
-        for shape in input_shape
-    ]
-    # TODO(fchollet): handle shapes with None entries.
-    input_shapes_set = set(input_shapes)
-    if None in input_shapes_set:
-      input_shapes_set.remove(None)
-    if len(input_shapes_set) > 1:
-      raise ValueError('Only tensors of same shape can '
-                       'be merged by layer' + self.name +
-                       ' Got input shapes: %s' % input_shapes)
+    batch_sizes = [s[0] for s in input_shape if s is not None]
+    batch_sizes = set(batch_sizes)
+    batch_sizes -= set([None])
+    if len(batch_sizes) > 1:
+      raise ValueError('Can not merge tensors with different '
+                       'batch sizes. Got tensors with shapes : ' + str(
+                           input_shape))
+    if input_shape[0] is None:
+      output_shape = None
+    else:
+      output_shape = input_shape[0][1:]
+    for i in range(1, len(input_shape)):
+      if input_shape[i] is None:
+        shape = None
+      else:
+        shape = input_shape[i][1:]
+      output_shape = self._compute_elemwise_op_output_shape(output_shape, shape)
+    # If the inputs have different ranks, we have to reshape them
+    # to make them broadcastable.
+    if None not in input_shape and len(set(map(len, input_shape))) == 1:
+      self._reshape_required = False
+    else:
+      self._reshape_required = True
 
   def call(self, inputs):
-    return self._merge_function(inputs)
+    if self._reshape_required:
+      reshaped_inputs = []
+      input_ndims = list(map(K.ndim, inputs))
+      if None not in input_ndims:
+        # If ranks of all inputs are available,
+        # we simply expand each of them at axis=1
+        # until all of them have the same rank.
+        max_ndim = max(input_ndims)
+        for x in inputs:
+          x_ndim = K.ndim(x)
+          for _ in range(max_ndim - x_ndim):
+            x = K.expand_dims(x, 1)
+          reshaped_inputs.append(x)
+        return self._merge_function(reshaped_inputs)
+      else:
+        # Transpose all inputs so that batch size is the last dimension.
+        # (batch_size, dim1, dim2, ... ) -> (dim1, dim2, ... , batch_size)
+        transposed = False
+        for x in inputs:
+          x_ndim = K.ndim(x)
+          if x_ndim is None:
+            x_shape = K.shape(x)
+            batch_size = x_shape[0]
+            new_shape = K.concatenate([x_shape[1:], K.expand_dims(batch_size)])
+            x_transposed = K.reshape(x,
+                                     K.stack([batch_size, K.prod(x_shape[1:])]))
+            x_transposed = K.permute_dimensions(x_transposed, (1, 0))
+            x_transposed = K.reshape(x_transposed, new_shape)
+            reshaped_inputs.append(x_transposed)
+            transposed = True
+          elif x_ndim > 1:
+            dims = list(range(1, x_ndim)) + [0]
+            reshaped_inputs.append(K.permute_dimensions(x, dims))
+            transposed = True
+          else:
+            # We don't transpose inputs if they are 1D vectors or scalars.
+            reshaped_inputs.append(x)
+        y = self._merge_function(reshaped_inputs)
+        y_ndim = K.ndim(y)
+        if transposed:
+          # If inputs have been transposed, we have to transpose the output too.
+          if y_ndim is None:
+            y_shape = K.shape(y)
+            y_ndim = K.shape(y_shape)[0]
+            batch_size = y_shape[y_ndim - 1]
+            new_shape = K.concatenate(
+                [K.expand_dims(batch_size), y_shape[:y_ndim - 1]])
+            y = K.reshape(y, (-1, batch_size))
+            y = K.permute_dimensions(y, (1, 0))
+            y = K.reshape(y, new_shape)
+          elif y_ndim > 1:
+            dims = [y_ndim - 1] + list(range(y_ndim - 1))
+            y = K.permute_dimensions(y, dims)
+        return y
+    else:
+      return self._merge_function(inputs)
+
+  def compute_output_shape(self, input_shape):
+    if input_shape[0] is None:
+      output_shape = None
+    else:
+      output_shape = input_shape[0][1:]
+    for i in range(1, len(input_shape)):
+      if input_shape[i] is None:
+        shape = None
+      else:
+        shape = input_shape[i][1:]
+      output_shape = self._compute_elemwise_op_output_shape(output_shape, shape)
+    batch_sizes = [s[0] for s in input_shape if s is not None]
+    batch_sizes = set(batch_sizes)
+    batch_sizes -= set([None])
+    if len(batch_sizes) == 1:
+      output_shape = (list(batch_sizes)[0],) + output_shape
+    else:
+      output_shape = (None,) + output_shape
+    return output_shape
 
   def compute_mask(self, inputs, mask=None):
     if mask is None:
@@ -219,8 +341,8 @@ class Concatenate(_Merge):
     for input_i, mask_i in zip(inputs, mask):
       if mask_i is None:
         # Input is unmasked. Append all 1s to masks,
-        # but cast it to uint8 first
-        masks.append(K.cast(K.ones_like(input_i), 'uint8'))
+        # but cast it to bool first
+        masks.append(K.cast(K.ones_like(input_i), 'bool'))
       elif K.ndim(mask_i) < K.ndim(input_i):
         # Mask is smaller than the input, expand it
         masks.append(K.expand_dims(mask_i))
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index 41c618cc79..d429cd6d9b 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -154,7 +154,7 @@ class BatchNormalization(Layer):
     broadcast_shape[self.axis] = input_shape[self.axis]
 
     # Determines whether broadcasting is needed.
-    needs_broadcasting = (sorted(reduction_axes) != range(ndim)[:-1])
+    needs_broadcasting = (sorted(reduction_axes) != list(range(ndim))[:-1])
 
     normed, mean, variance = K.normalize_batch_in_training(
         inputs, self.gamma, self.beta, reduction_axes, epsilon=self.epsilon)
diff --git a/tensorflow/contrib/keras/python/keras/layers/pooling.py b/tensorflow/contrib/keras/python/keras/layers/pooling.py
index e31caed3ec..47c88bf4d0 100644
--- a/tensorflow/contrib/keras/python/keras/layers/pooling.py
+++ b/tensorflow/contrib/keras/python/keras/layers/pooling.py
@@ -199,9 +199,9 @@ class MaxPooling2D(_Pooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -255,9 +255,9 @@ class AveragePooling2D(_Pooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -542,9 +542,9 @@ class GlobalAveragePooling2D(_GlobalPooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
@@ -577,9 +577,9 @@ class GlobalMaxPooling2D(_GlobalPooling2D):
           one of `channels_last` (default) or `channels_first`.
           The ordering of the dimensions in the inputs.
           `channels_last` corresponds to inputs with shape
-          `(batch, width, height, channels)` while `channels_first`
+          `(batch, height, width, channels)` while `channels_first`
           corresponds to inputs with shape
-          `(batch, channels, width, height)`.
+          `(batch, channels, height, width)`.
           It defaults to the `image_data_format` value found in your
           Keras config file at `~/.keras/keras.json`.
           If you never set it, then it will be "channels_last".
diff --git a/tensorflow/contrib/keras/python/keras/layers/recurrent.py b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
index 06986d3eaa..6301132f4d 100644
--- a/tensorflow/contrib/keras/python/keras/layers/recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
@@ -105,8 +105,16 @@ class Recurrent(Layer):
       # now model.output_shape == (None, 32)
       # note: `None` is the batch dimension.
 
-      # for subsequent layers, not need to specify the input size:
+      # for subsequent layers, no need to specify the input size:
       model.add(LSTM(16))
+
+      # to stack recurrent layers, you must use return_sequences=True
+      # on any recurrent layer that feeds into another recurrent layer.
+      # note that you only need to specify the input size on the first layer.
+      model = Sequential()
+      model.add(LSTM(64, input_dim=64, input_length=10, return_sequences=True))
+      model.add(LSTM(32, return_sequences=True))
+      model.add(LSTM(10))
   ```
 
   Arguments:
@@ -116,7 +124,8 @@ class Recurrent(Layer):
       return_sequences: Boolean. Whether to return the last output
           in the output sequence, or the full sequence.
       go_backwards: Boolean (default False).
-          If True, process the input sequence backwards.
+          If True, process the input sequence backwards and return the
+          reversed sequence.
       stateful: Boolean (default False). If True, the last state
           for each sample at index i in a batch will be used as initial
           state for the sample of index i in the following batch.
@@ -398,6 +407,7 @@ class SimpleRNN(Recurrent):
       units: Positive integer, dimensionality of the output space.
       activation: Activation function to use.
           If you don't specify anything, no activation is applied
+          If you pass None, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
       use_bias: Boolean, whether the layer uses a bias vector.
       kernel_initializer: Initializer for the `kernel` weights matrix,
@@ -547,7 +557,7 @@ class SimpleRNN(Recurrent):
 
   def get_constants(self, inputs, training=None):
     constants = []
-    if self.implementation == 0 and 0 < self.dropout < 1:
+    if self.implementation != 0 and 0 < self.dropout < 1:
       input_shape = K.int_shape(inputs)
       input_dim = input_shape[-1]
       ones = K.ones_like(K.reshape(inputs[:, 0, 0], (-1, 1)))
@@ -619,7 +629,7 @@ class GRU(Recurrent):
   Arguments:
       units: Positive integer, dimensionality of the output space.
       activation: Activation function to use.
-          If you don't specify anything, no activation is applied
+          If you pass None, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
       recurrent_activation: Activation function to use
           for the recurrent step.
@@ -792,7 +802,7 @@ class GRU(Recurrent):
 
   def get_constants(self, inputs, training=None):
     constants = []
-    if self.implementation == 0 and 0 < self.dropout < 1:
+    if self.implementation != 0 and 0 < self.dropout < 1:
       input_shape = K.int_shape(inputs)
       input_dim = input_shape[-1]
       ones = K.ones_like(K.reshape(inputs[:, 0, 0], (-1, 1)))
@@ -861,7 +871,7 @@ class GRU(Recurrent):
         if self.use_bias:
           x_z = K.bias_add(x_z, self.bias_z)
           x_r = K.bias_add(x_r, self.bias_r)
-          x_h = K.bias_add(x_r, self.bias_h)
+          x_h = K.bias_add(x_h, self.bias_h)
       else:
         raise ValueError('Unknown `implementation` mode.')
       z = self.recurrent_activation(x_z + K.dot(h_tm1 * rec_dp_mask[0],
@@ -924,7 +934,7 @@ class LSTM(Recurrent):
   Arguments:
       units: Positive integer, dimensionality of the output space.
       activation: Activation function to use.
-          If you don't specify anything, no activation is applied
+          If you pass None, no activation is applied
           (ie. "linear" activation: `a(x) = x`).
       recurrent_activation: Activation function to use
           for the recurrent step.
@@ -1127,7 +1137,7 @@ class LSTM(Recurrent):
 
   def get_constants(self, inputs, training=None):
     constants = []
-    if self.implementation == 0 and 0 < self.dropout < 1:
+    if self.implementation != 0 and 0 < self.dropout < 1:
       input_shape = K.int_shape(inputs)
       input_dim = input_shape[-1]
       ones = K.ones_like(K.reshape(inputs[:, 0, 0], (-1, 1)))
diff --git a/tensorflow/contrib/keras/python/keras/layers/wrappers.py b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
index 75b4810e40..eeb67493ee 100644
--- a/tensorflow/contrib/keras/python/keras/layers/wrappers.py
+++ b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
+# pylint: disable=protected-access
 """Wrapper layers: layers that augment the functionality of another layer.
 """
 from __future__ import absolute_import
@@ -19,6 +20,7 @@ from __future__ import division
 from __future__ import print_function
 
 import copy
+import inspect
 
 from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.engine import InputSpec
@@ -70,9 +72,10 @@ class Wrapper(Layer):
     return dict(list(base_config.items()) + list(config.items()))
 
   @classmethod
-  def from_config(cls, config):
+  def from_config(cls, config, custom_objects=None):
     from tensorflow.contrib.keras.python.keras.layers import deserialize as deserialize_layer  # pylint: disable=g-import-not-at-top
-    layer = deserialize_layer(config.pop('layer'))
+    layer = deserialize_layer(
+        config.pop('layer'), custom_objects=custom_objects)
     return cls(layer, **config)
 
 
@@ -188,12 +191,15 @@ class Bidirectional(Wrapper):
           If None, the outputs will not be combined,
           they will be returned as a list.
 
+  Raises:
+      ValueError: In case of invalid `merge_mode` argument.
+
   Examples:
 
   ```python
       model = Sequential()
       model.add(Bidirectional(LSTM(10, return_sequences=True), input_shape=(5,
-        10)))
+      10)))
       model.add(Bidirectional(LSTM(10)))
       model.add(Dense(5))
       model.add(Activation('softmax'))
@@ -242,29 +248,47 @@ class Bidirectional(Wrapper):
       shape = self.forward_layer._compute_output_shape(input_shape)  # pylint: disable=protected-access
       return [shape, copy.copy(shape)]
 
-  def call(self, inputs, mask=None):
-    y = self.forward_layer.call(inputs, mask)
-    y_rev = self.backward_layer.call(inputs, mask)
+  def call(self, inputs, training=None, mask=None):
+    kwargs = {}
+    func_args = inspect.getargspec(self.layer.call).args
+    if 'training' in func_args:
+      kwargs['training'] = training
+    if 'mask' in func_args:
+      kwargs['mask'] = mask
+
+    y = self.forward_layer.call(inputs, **kwargs)
+    y_rev = self.backward_layer.call(inputs, **kwargs)
     if self.return_sequences:
       y_rev = K.reverse(y_rev, 1)
     if self.merge_mode == 'concat':
-      return K.concatenate([y, y_rev])
+      output = K.concatenate([y, y_rev])
     elif self.merge_mode == 'sum':
-      return y + y_rev
+      output = y + y_rev
     elif self.merge_mode == 'ave':
-      return (y + y_rev) / 2
+      output = (y + y_rev) / 2
     elif self.merge_mode == 'mul':
-      return y * y_rev
+      output = y * y_rev
     elif self.merge_mode is None:
-      return [y, y_rev]
+      output = [y, y_rev]
+
+    # Properly set learning phase
+    if 0 < self.layer.dropout + self.layer.recurrent_dropout:
+      if self.merge_mode is None:
+        for out in output:
+          out._uses_learning_phase = True
+      else:
+        output._uses_learning_phase = True
+    return output
 
   def reset_states(self):
     self.forward_layer.reset_states()
     self.backward_layer.reset_states()
 
   def build(self, input_shape):
-    self.forward_layer.build(input_shape)
-    self.backward_layer.build(input_shape)
+    with K.name_scope(self.forward_layer.name):
+      self.forward_layer.build(input_shape)
+    with K.name_scope(self.backward_layer.name):
+      self.backward_layer.build(input_shape)
     self.built = True
 
   def compute_mask(self, inputs, mask):
diff --git a/tensorflow/contrib/keras/python/keras/metrics.py b/tensorflow/contrib/keras/python/keras/metrics.py
index d7266c94cf..59d380f73b 100644
--- a/tensorflow/contrib/keras/python/keras/metrics.py
+++ b/tensorflow/contrib/keras/python/keras/metrics.py
@@ -43,12 +43,15 @@ def binary_accuracy(y_true, y_pred):
 
 
 def categorical_accuracy(y_true, y_pred):
-  return K.equal(K.argmax(y_true, axis=-1), K.argmax(y_pred, axis=-1))
+  return K.cast(
+      K.equal(K.argmax(y_true, axis=-1), K.argmax(y_pred, axis=-1)), K.floatx())
 
 
 def sparse_categorical_accuracy(y_true, y_pred):
-  return K.equal(
-      K.max(y_true, axis=-1), K.cast(K.argmax(y_pred, axis=-1), K.floatx()))
+  return K.cast(
+      K.equal(
+          K.max(y_true, axis=-1), K.cast(K.argmax(y_pred, axis=-1),
+                                         K.floatx())), K.floatx())
 
 
 def top_k_categorical_accuracy(y_true, y_pred, k=5):
diff --git a/tensorflow/contrib/keras/python/keras/models.py b/tensorflow/contrib/keras/python/keras/models.py
index 2be4431d03..5289bb732b 100644
--- a/tensorflow/contrib/keras/python/keras/models.py
+++ b/tensorflow/contrib/keras/python/keras/models.py
@@ -207,7 +207,7 @@ def load_model(filepath, custom_objects=None):
       ValueError: In case of an invalid savefile.
   """
   if h5py is None:
-    raise ImportError('`save_model` requires h5py.')
+    raise ImportError('`load_model` requires h5py.')
 
   if not custom_objects:
     custom_objects = {}
@@ -1006,7 +1006,7 @@ class Sequential(Model):
         steps_per_epoch: Total number of steps (batches of samples)
             to yield from `generator` before declaring one epoch
             finished and starting the next epoch. It should typically
-            be equal to the number of unique samples if your dataset
+            be equal to the number of unique samples of your dataset
             divided by the batch size.
         epochs: Integer, total number of iterations on the data.
         verbose: Verbosity mode, 0, 1, or 2.
@@ -1017,8 +1017,10 @@ class Sequential(Model):
             - A tuple (inputs, targets, sample_weights).
         validation_steps: Only relevant if `validation_data`
             is a generator.
-            Number of samples to use from validation generator
-            at the end of every epoch.
+            Number of steps to yield from validation generator
+            at the end of every epoch. It should typically
+            be equal to the number of unique samples of your
+            validation dataset divided by the batch size.
         class_weight: Dictionary mapping class indices to a weight
             for the class.
         max_q_size: Maximum size for the generator queue
@@ -1050,7 +1052,7 @@ class Sequential(Model):
                     # and labels, from each line in the file
                     x, y = process_line(line)
                     yield (x, y)
-                f.close()
+                    f.close()
 
         model.fit_generator(generate_arrays_from_file('/my_file.txt'),
                             samples_per_epoch=10000, epochs=10)
@@ -1119,7 +1121,8 @@ class Sequential(Model):
                         steps,
                         max_q_size=10,
                         workers=1,
-                        pickle_safe=False):
+                        pickle_safe=False,
+                        verbose=0):
     """Generates predictions for the input samples from a data generator.
 
     The generator should return the same kind of data as accepted by
@@ -1136,6 +1139,7 @@ class Sequential(Model):
             relies on multiprocessing, you should not pass
             non picklable arguments to the generator
             as they can't be passed easily to children processes.
+        verbose: verbosity mode, 0 or 1.
 
     Returns:
         A Numpy array of predictions.
@@ -1147,7 +1151,8 @@ class Sequential(Model):
         steps,
         max_q_size=max_q_size,
         workers=workers,
-        pickle_safe=pickle_safe)
+        pickle_safe=pickle_safe,
+        verbose=verbose)
 
   def get_config(self):
     config = []
@@ -1159,9 +1164,9 @@ class Sequential(Model):
     return copy.deepcopy(config)
 
   @classmethod
-  def from_config(cls, config):
+  def from_config(cls, config, custom_objects=None):
     model = cls()
     for conf in config:
-      layer = layer_module.deserialize(conf)
+      layer = layer_module.deserialize(conf, custom_objects=custom_objects)
       model.add(layer)
     return model
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/image.py b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
index 86c7650a07..de0749ae02 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/image.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
@@ -785,7 +785,7 @@ class Iterator(object):
           index_array = np.random.permutation(n)
 
       current_index = (self.batch_index * batch_size) % n
-      if n >= current_index + batch_size:
+      if n > current_index + batch_size:
         current_batch_size = batch_size
         self.batch_index += 1
       else:
diff --git a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
index c1e0296835..6e83fde2c9 100644
--- a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
@@ -172,7 +172,8 @@ def deserialize_keras_object(identifier,
     else:
       fn = module_objects.get(function_name)
       if fn is None:
-        raise ValueError('Unknown ' + printable_module_name, ':' + class_name)
+        raise ValueError('Unknown ' + printable_module_name,
+                         ':' + function_name)
     return fn
   else:
     raise ValueError('Could not interpret serialized ' + printable_module_name +
@@ -215,6 +216,8 @@ def func_load(code, defaults=None, closure=None, globs=None):
   """
   if isinstance(code, (tuple, list)):  # unpack previous dump
     code, defaults, closure = code
+    if isinstance(defaults, list):
+      defaults = tuple(defaults)
   code = marshal.loads(code.encode('raw_unicode_escape'))
   if globs is None:
     globs = globals()
diff --git a/tensorflow/contrib/keras/python/keras/utils/layer_utils.py b/tensorflow/contrib/keras/python/keras/utils/layer_utils.py
index 32e0de7d3d..26878fdd57 100644
--- a/tensorflow/contrib/keras/python/keras/utils/layer_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/layer_utils.py
@@ -171,7 +171,7 @@ def count_total_params(layers, layer_set=None):
           [K.count_params(p) for p in layer.trainable_weights])
       non_trainable_count += np.sum(
           [K.count_params(p) for p in layer.non_trainable_weights])
-  return trainable_count, non_trainable_count
+  return int(trainable_count), int(non_trainable_count)
 
 
 def convert_all_kernels_in_model(model):
diff --git a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
index ecda890fec..323c31aee8 100644
--- a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
+++ b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
@@ -194,6 +194,36 @@ class KerasClassifier(BaseWrapper):
   """Implementation of the scikit-learn classifier API for Keras.
   """
 
+  def fit(self, x, y, **kwargs):
+    """Constructs a new model with `build_fn` & fit the model to `(x, y)`.
+
+    Arguments:
+        x : array-like, shape `(n_samples, n_features)`
+            Training samples where n_samples in the number of samples
+            and n_features is the number of features.
+        y : array-like, shape `(n_samples,)` or `(n_samples, n_outputs)`
+            True labels for X.
+        **kwargs: dictionary arguments
+            Legal arguments are the arguments of `Sequential.fit`
+
+    Returns:
+        history : object
+            details about the training history at each epoch.
+
+    Raises:
+        ValueError: In case of invalid shape for `y` argument.
+    """
+    y = np.array(y)
+    if len(y.shape) == 2 and y.shape[1] > 1:
+      self.classes_ = np.arange(y.shape[1])
+    elif (len(y.shape) == 2 and y.shape[1] == 1) or len(y.shape) == 1:
+      self.classes_ = np.unique(y)
+      y = np.searchsorted(self.classes_, y)
+    else:
+      raise ValueError('Invalid shape for y: ' + str(y.shape))
+    self.n_classes_ = len(self.classes_)
+    return super(KerasClassifier, self).fit(x, y, **kwargs)
+
   def predict(self, x, **kwargs):
     """Returns the class predictions for the given test data.
 
@@ -210,7 +240,8 @@ class KerasClassifier(BaseWrapper):
             Class predictions.
     """
     kwargs = self.filter_sk_params(Sequential.predict_classes, kwargs)
-    return self.model.predict_classes(x, **kwargs)
+    classes = self.model.predict_classes(x, **kwargs)
+    return self.classes_[classes]
 
   def predict_proba(self, x, **kwargs):
     """Returns class probability estimates for the given test data.
@@ -261,6 +292,7 @@ class KerasClassifier(BaseWrapper):
             compute accuracy. You should pass `metrics=["accuracy"]` to
             the `.compile()` method of the model.
     """
+    y = np.searchsorted(self.classes_, y)
     kwargs = self.filter_sk_params(Sequential.evaluate, kwargs)
 
     loss_name = self.model.loss
diff --git a/tensorflow/contrib/layers/python/layers/embedding_ops.py b/tensorflow/contrib/layers/python/layers/embedding_ops.py
index e42e885364..b1a7f7ee59 100644
--- a/tensorflow/contrib/layers/python/layers/embedding_ops.py
+++ b/tensorflow/contrib/layers/python/layers/embedding_ops.py
@@ -22,11 +22,13 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensorflow.contrib.framework.python.framework import tensor_util as contrib_tensor_util
 from tensorflow.contrib.layers.python.ops import sparse_feature_cross_op
 
+from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import clip_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import embedding_ops
@@ -555,8 +557,13 @@ def _sampled_scattered_embedding_lookup_sparse(params,
                                          name=name_scope)
 
 
-def embedding_lookup_sparse_with_distributed_aggregation(params, sp_ids,
-    sp_weights, partition_strategy="mod", name=None, combiner=None,
+def embedding_lookup_sparse_with_distributed_aggregation(
+    params,
+    sp_ids,
+    sp_weights,
+    partition_strategy="mod",
+    name=None,
+    combiner=None,
     max_norm=None):
   """Computes embeddings for the given ids and weights.
 
@@ -638,8 +645,13 @@ def embedding_lookup_sparse_with_distributed_aggregation(params, sp_ids,
 
     weights = None if ignore_weights else sp_weights.values
     embeddings = _embedding_lookup_with_distributed_aggregation(
-        params, ids, partition_strategy=partition_strategy, max_norm=max_norm,
-        weights=weights, idx=idx, segment_ids=segment_ids)
+        params,
+        ids,
+        partition_strategy=partition_strategy,
+        max_norm=max_norm,
+        weights=weights,
+        idx=idx,
+        segment_ids=segment_ids)
     # Set weights to all one if ignore weights.
     if ignore_weights:
       weights = array_ops.fill([array_ops.shape(segment_ids)[0]], 1)
@@ -648,13 +660,13 @@ def embedding_lookup_sparse_with_distributed_aggregation(params, sp_ids,
     # Reshape weights.
     ones = array_ops.fill(
         array_ops.expand_dims(array_ops.rank(embeddings) - 1, 0), 1)
-    bcast_weights_shape = array_ops.concat([array_ops.shape(weights), ones],
-                                           0)
+    bcast_weights_shape = array_ops.concat([array_ops.shape(weights), ones], 0)
     orig_weights_shape = weights.get_shape()
     weights = array_ops.reshape(weights, bcast_weights_shape)
     if embeddings.get_shape().ndims is not None:
-      weights.set_shape(orig_weights_shape.concatenate(
-          [1 for _ in range(embeddings.get_shape().ndims - 1)]))
+      weights.set_shape(
+          orig_weights_shape.concatenate(
+              [1 for _ in range(embeddings.get_shape().ndims - 1)]))
 
     if combiner == "mean":
       weight_sum = math_ops.segment_sum(weights, segment_ids)
@@ -677,16 +689,23 @@ def _do_gather(params, ids, validate_indices=True, name=None):
       params, ids, name=name, validate_indices=validate_indices)
 
 
-def _embedding_lookup_with_distributed_aggregation(params, ids,
-    partition_strategy="mod", name=None, validate_indices=True, max_norm=None,
-    weights=None, idx=None, segment_ids=None):
-  """ Lookup helper for embedding_lookup_sparse_with_distributed_aggregation."""
+def _embedding_lookup_with_distributed_aggregation(params,
+                                                   ids,
+                                                   partition_strategy="mod",
+                                                   name=None,
+                                                   validate_indices=True,
+                                                   max_norm=None,
+                                                   weights=None,
+                                                   idx=None,
+                                                   segment_ids=None):
+  """Lookup helper for embedding_lookup_sparse_with_distributed_aggregation."""
   if params is None or params == []:  # pylint: disable=g-explicit-bool-comparison
     raise ValueError("Need at least one param")
   if isinstance(params, variables.PartitionedVariable):
     params = list(params)  # Iterate to get the underlying Variables.
   if not isinstance(params, list):
     params = [params]
+
   def maybe_normalize(x):
     if max_norm is not None:
       if x.get_shape().ndims is not None:
@@ -695,18 +714,18 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
         ndims = array_ops.size(array_ops.shape(x))
       return clip_ops.clip_by_norm(x, max_norm, axes=list(range(1, ndims)))
     return x
+
   with ops.name_scope(name, "embedding_lookup_with_distributed_aggregation",
-      params + [ids]) as name:
+                      params + [ids]) as name:
     np = len(params)  # Number of partitions
     # Preserve the resource variable status to avoid accidental dense reads.
-    if not any(isinstance(p, resource_variable_ops.ResourceVariable)
-               for p in params):
+    if not any(
+        isinstance(p, resource_variable_ops.ResourceVariable) for p in params):
       params = ops.convert_n_to_tensor_or_indexed_slices(params, name="params")
     if np == 1:
       with ops.colocate_with(params[0]):
         ret = maybe_normalize(
-            _do_gather(
-                params[0], ids, validate_indices=validate_indices))
+            _do_gather(params[0], ids, validate_indices=validate_indices))
         ignore_weights = weights is None
         if not ignore_weights:
           if weights.dtype != ret.dtype:
@@ -720,8 +739,9 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
           weights = array_ops.reshape(weights, bcast_weights_shape)
           # Set weights shape after reshape
           if ret.get_shape().ndims is not None:
-            weights.set_shape(orig_weights_shape.concatenate(
-                [1 for _ in range(ret.get_shape().ndims - 1)]))
+            weights.set_shape(
+                orig_weights_shape.concatenate(
+                    [1 for _ in range(ret.get_shape().ndims - 1)]))
           ret *= weights
           return math_ops.segment_sum(ret, segment_ids, name=name)
         else:
@@ -757,18 +777,16 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
         ids_per_partition = num_total_ids // np
         extras = num_total_ids % np
 
-        p_assignments = math_ops.maximum(
-            flat_ids // (ids_per_partition + 1),
-            (flat_ids - extras) // ids_per_partition)
+        p_assignments = math_ops.maximum(flat_ids // (ids_per_partition + 1), (
+            flat_ids - extras) // ids_per_partition)
 
         # Emulate a conditional using a boolean indicator tensor
-        is_in_first_extras_partitions = math_ops.cast(
-            p_assignments < extras, flat_ids.dtype)
-        new_ids = (
-            is_in_first_extras_partitions * (
-                flat_ids % (ids_per_partition + 1)) +
-            (1 - is_in_first_extras_partitions) * (
-                (flat_ids - extras) % ids_per_partition))
+        is_in_first_extras_partitions = math_ops.cast(p_assignments < extras,
+                                                      flat_ids.dtype)
+        new_ids = (is_in_first_extras_partitions * (flat_ids %
+                                                    (ids_per_partition + 1)) +
+                   (1 - is_in_first_extras_partitions) * (
+                       (flat_ids - extras) % ids_per_partition))
       else:
         raise ValueError("Unrecognized partition strategy: " +
                          partition_strategy)
@@ -786,8 +804,8 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
       for p in xrange(np):
         with ops.colocate_with(params[p]):
           partitioned_result.append(
-              _do_gather(params[p], gather_ids[p],
-                         validate_indices=validate_indices))
+              _do_gather(
+                  params[p], gather_ids[p], validate_indices=validate_indices))
 
       ignore_weights = weights is None
       if not ignore_weights:
@@ -802,17 +820,21 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
       if element_shape.is_fully_defined():
         for p in xrange(np):
           with ops.colocate_with(params[p]):
-            partitioned_result[p] = array_ops.reshape(partitioned_result[p],
-                array_ops.concat(
-                    [array_ops.shape(pindices[p]), element_shape], 0))
+            partitioned_result[p] = array_ops.reshape(
+                partitioned_result[p],
+                array_ops.concat([array_ops.shape(pindices[p]), element_shape],
+                                 0))
       else:
         with ops.colocate_with(params[0]):
           params_shape = array_ops.shape(params[0])
         for p in xrange(np):
           with ops.colocate_with(params[p]):
-            partitioned_result[p] = array_ops.reshape(partitioned_result[p],
-                array_ops.concat([array_ops.shape(pindices[p]),
-                    array_ops.slice(params_shape, [1], [-1])], 0))
+            partitioned_result[p] = array_ops.reshape(
+                partitioned_result[p],
+                array_ops.concat([
+                    array_ops.shape(pindices[p]), array_ops.slice(
+                        params_shape, [1], [-1])
+                ], 0))
       # Normalize each partition result.
       for p in xrange(np):
         with ops.colocate_with(params[p]):
@@ -823,7 +845,7 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
           with ops.colocate_with(params[p]):
             if partitioned_weight[p].dtype != partitioned_result[p].dtype:
               partitioned_weight[p] = math_ops.cast(partitioned_weight[p],
-                  partitioned_result[p].dtype)
+                                                    partitioned_result[p].dtype)
             # Reshape partition weights.
             ones = array_ops.fill(
                 array_ops.expand_dims(
@@ -834,9 +856,12 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
             partitioned_weight[p] = array_ops.reshape(partitioned_weight[p],
                                                       bcast_weights_shape)
             if partitioned_result[p].get_shape().ndims is not None:
-              partitioned_weight[p].set_shape(orig_weights_shape.concatenate(
-                  [1 for _ in range(
-                      partitioned_result[p].get_shape().ndims - 1)]))
+              partitioned_weight[p].set_shape(
+                  orig_weights_shape.concatenate([
+                      1
+                      for _ in range(partitioned_result[p].get_shape().ndims -
+                                     1)
+                  ]))
             partitioned_result[p] *= partitioned_weight[p]
       partitioned_segment_ids = []
       for p in xrange(np):
@@ -874,5 +899,7 @@ def _embedding_lookup_with_distributed_aggregation(params, ids,
       concat_segment_ids = array_ops.concat(partitioned_segment_ids, 0)
       concat_partitioned_result = array_ops.concat(partitioned_result, 0)
       return math_ops.unsorted_segment_sum(
-          concat_partitioned_result, concat_segment_ids,
-          math_ops.reduce_max(concat_segment_ids) + 1, name=name)
+          concat_partitioned_result,
+          concat_segment_ids,
+          math_ops.reduce_max(concat_segment_ids) + 1,
+          name=name)
diff --git a/tensorflow/contrib/layers/python/layers/embedding_ops_test.py b/tensorflow/contrib/layers/python/layers/embedding_ops_test.py
index eb38d70c52..bf25144982 100644
--- a/tensorflow/contrib/layers/python/layers/embedding_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/embedding_ops_test.py
@@ -31,8 +31,9 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors_impl
 from tensorflow.python.framework import random_seed
 from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
-from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradient_checker
+from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.platform import test
@@ -145,8 +146,8 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       self.assertAllClose(
           embedding_lookup_result,
           [(embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4,
-           [0] * 4, embedding_weights[0][2],
-           (embedding_weights[0][0] + embedding_weights[0][1]) / 2.0])
+           [0] * 4, embedding_weights[0][2], (
+               embedding_weights[0][0] + embedding_weights[0][1]) / 2.0])
 
   def test_safe_embedding_lookup_sparse_partitioned(self):
     with self.test_session():
@@ -171,8 +172,8 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids)
       embedding_weights = [
-          constant_op.constant(
-              w, dtype=dtypes.float64) for w in embedding_weights
+          constant_op.constant(w, dtype=dtypes.float64)
+          for w in embedding_weights
       ]
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids, sparse_weights)
@@ -185,11 +186,10 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       embedding_lookup_result = (embedding_ops.safe_embedding_lookup_sparse(
           embedding_weights, sparse_ids, sparse_weights).eval())
 
-      self.assertAllClose(
-          embedding_lookup_result,
-          [[(1.0 * embedding_weights[0][0] + 2.0 * embedding_weights[0][1]) /
-            3.0, [0] * 4, [0] * 4],
-           [embedding_weights[0][2], [0] * 4, [0] * 4]])
+      self.assertAllClose(embedding_lookup_result, [[
+          (1.0 * embedding_weights[0][0] + 2.0 * embedding_weights[0][1]) / 3.0,
+          [0] * 4, [0] * 4
+      ], [embedding_weights[0][2], [0] * 4, [0] * 4]])
 
   def test_safe_embedding_lookup_sparse_3d_return_special_vector(self):
     with self.test_session():
@@ -215,14 +215,13 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       embedding_lookup_result = (embedding_ops.safe_embedding_lookup_sparse(
           embedding_weights, sparse_ids, None).eval())
 
-      self.assertAllClose(
-          embedding_lookup_result,
-          [[(embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4,
-            [0] * 4], [
-                embedding_weights[0][2],
-                (embedding_weights[0][0] + embedding_weights[0][1]) / 2.0,
-                [0] * 4
-            ]])
+      self.assertAllClose(embedding_lookup_result, [[(
+          embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4, [
+              0
+          ] * 4], [
+              embedding_weights[0][2],
+              (embedding_weights[0][0] + embedding_weights[0][1]) / 2.0, [0] * 4
+          ]])
 
   def test_safe_embedding_lookup_sparse_3d_partitioned(self):
     with self.test_session():
@@ -233,13 +232,12 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
           embedding_weights, sparse_ids, None).eval())
 
       embedding_weights = list(itertools.chain(*embedding_weights))
-      self.assertAllClose(embedding_lookup_result,
-                          [[(embedding_weights[0] + embedding_weights[1]) / 2.0,
-                            [0] * 4, [0] * 4], [
-                                embedding_weights[2],
-                                (embedding_weights[0] + embedding_weights[1]) /
-                                2.0, [0] * 4
-                            ]])
+      self.assertAllClose(embedding_lookup_result, [[
+          (embedding_weights[0] + embedding_weights[1]) / 2.0, [0] * 4, [0] * 4
+      ], [
+          embedding_weights[2],
+          (embedding_weights[0] + embedding_weights[1]) / 2.0, [0] * 4
+      ]])
 
   def test_safe_embedding_lookup_sparse_3d_partitioned_inconsistent_weights(
       self):
@@ -251,8 +249,8 @@ class SafeEmbeddingLookupSparseTest(test.TestCase):
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids)
       embedding_weights = [
-          constant_op.constant(
-              w, dtype=dtypes.float64) for w in embedding_weights
+          constant_op.constant(w, dtype=dtypes.float64)
+          for w in embedding_weights
       ]
       self.assertRaises(ValueError, embedding_ops.safe_embedding_lookup_sparse,
                         embedding_weights, sparse_ids, sparse_weights)
@@ -301,8 +299,8 @@ class ScatteredEmbeddingLookupTest(test.TestCase):
       self.assertAllEqual(embedding_lookup_result[0],
                           embedding_lookup_result[1])
       # Different embedding expected for different value.
-      embedding_diff = np.min((embedding_lookup_result[2] -
-                               embedding_lookup_result[0])**2)
+      embedding_diff = np.min(
+          (embedding_lookup_result[2] - embedding_lookup_result[0])**2)
       self.assertGreater(embedding_diff, 0)
 
   def test_scattered_embedding_coverage(self):
@@ -320,8 +318,8 @@ class ScatteredEmbeddingLookupTest(test.TestCase):
   def test_scattered_embedding_multi_dimension(self):
     with self.test_session():
       embedding_weights = self._random_weights()
-      values = constant_op.constant(
-          [["foo", "bar", "bar"], ["bar", "bar", "foo"]])
+      values = constant_op.constant([["foo", "bar", "bar"],
+                                     ["bar", "bar", "foo"]])
 
       embedding_lookup_result = embedding_ops.scattered_embedding_lookup(
           embedding_weights, values, dimension=10).eval()
@@ -340,8 +338,8 @@ class ScatteredEmbeddingLookupTest(test.TestCase):
 
       embedding_lookup_result = (
           embedding_ops.scattered_embedding_lookup_sparse(
-              embedding_weights, sparse_tensor, dimension=5, combiner="mean")
-          .eval())
+              embedding_weights, sparse_tensor, dimension=5,
+              combiner="mean").eval())
 
       self.assertAllEqual(embedding_lookup_result.shape, [5, 5])
       # Same non-zero embedding for the empty rows filled with a default value.
@@ -433,8 +431,8 @@ class SampledScatteredEmbeddingLookupTest(test.TestCase):
   def test_hashed_embedding_multi_dimension(self):
     with self.test_session():
       embedding_weights = self._random_weights()
-      values = constant_op.constant(
-          [["foo", "bar", "bar"], ["bar", "bar", "foo"]])
+      values = constant_op.constant([["foo", "bar", "bar"],
+                                     ["bar", "bar", "foo"]])
       sampled_candidates = constant_op.constant(
           [[[1, 3, 4, 6], [1, 7, 8, 9], [1, 7, 8, 9]],
            [[1, 7, 8, 9], [1, 7, 8, 9], [1, 3, 4, 6]]])
@@ -491,8 +489,8 @@ class SampledScatteredEmbeddingLookupSparseTest(test.TestCase):
       result = embedding_ops._sampled_scattered_embedding_lookup_sparse(
           params, sp_values, dimension=5, hash_key=self._hash_key)
 
-      self.assertAllClose(result.eval(), [[0., 0., 0., 0., 0.],
-                                          [.3, .2, .2, .3, .1],
+      self.assertAllClose(result.eval(), [[0., 0., 0., 0.,
+                                           0.], [.3, .2, .2, .3, .1],
                                           [0., 0., 0., 0., 0.]])
 
   def test_output_values_with_sampled_candidates(self):
@@ -631,8 +629,8 @@ def _EmbeddingResult(params,
         else:
           partition = extras + (i - threshold) // ids_per_partition
           offset = (i - threshold) % ids_per_partition
-        val = np.copy(params[_PName(partition) + ":0"][
-            offset, :]) * weight_value
+        val = np.copy(
+            params[_PName(partition) + ":0"][offset, :]) * weight_value
       else:
         assert False
       if value_aggregation is None:
@@ -707,19 +705,19 @@ class EmbeddingLookupSparseWithDistributedAggregationTest(test.TestCase):
     grouped_ignored_weights = self._GroupByBatchEntry(
         np.ones(np.sum(vals_per_batch_entry)), vals_per_batch_entry)
 
-    for num_shards, combiner, dtype, ignore_weights in itertools.product([1, 5],
-        ["sum", "mean", "sqrtn"], [dtypes.float32, dtypes.float64],
-        [True, False]):
+    for num_shards, combiner, dtype, ignore_weights in itertools.product(
+        [1, 5], ["sum", "mean", "sqrtn"], [dtypes.float32,
+                                           dtypes.float64], [True, False]):
 
       with self.test_session():
         p, params, feed_dict = _EmbeddingParams(
             num_shards, vocab_size, shape=param_shape, dtype=dtype)
         embedding_sum = \
             embedding_ops.embedding_lookup_sparse_with_distributed_aggregation(
-            p,
-            sp_ids,
-            None if ignore_weights else sp_weights,
-            combiner=combiner)
+                p,
+                sp_ids,
+                None if ignore_weights else sp_weights,
+                combiner=combiner)
 
         self.assertEqual(embedding_sum.get_shape().as_list(),
                          expected_lookup_result_shape)
@@ -731,8 +729,8 @@ class EmbeddingLookupSparseWithDistributedAggregationTest(test.TestCase):
             grouped_ids,
             num_shards,
             vocab_size,
-            weight_vals=grouped_ignored_weights if ignore_weights else
-            grouped_weights)
+            weight_vals=grouped_ignored_weights
+            if ignore_weights else grouped_weights)
         if combiner == "mean":
           np_embedding_sum /= np.reshape(np_weight_sum, (batch_size, 1, 1))
         if combiner == "sqrtn":
@@ -744,12 +742,12 @@ class EmbeddingLookupSparseWithDistributedAggregationTest(test.TestCase):
     vocab_size = 12
     batch_size = 4
     param_shape = [2, 3]
-    sp_ids, sp_weights, _, _, _ = (
-        self._RandomIdsAndWeights(batch_size, vocab_size))
+    sp_ids, sp_weights, _, _, _ = (self._RandomIdsAndWeights(
+        batch_size, vocab_size))
 
-    for num_shards, combiner, dtype, ignore_weights in itertools.product([1, 3],
-        ["sum", "mean", "sqrtn"], [dtypes.float32, dtypes.float64],
-        [True, False]):
+    for num_shards, combiner, dtype, ignore_weights in itertools.product(
+        [1, 3], ["sum", "mean", "sqrtn"], [dtypes.float32,
+                                           dtypes.float64], [True, False]):
       with self.test_session():
         x, params, _ = _EmbeddingParams(
             num_shards, vocab_size, shape=param_shape, dtype=dtype)
diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 65dcf8577f..0140f6d0d3 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -1942,6 +1942,7 @@ def separable_convolution2d(
                                             dtype=dtype,
                                             initializer=biases_initializer,
                                             regularizer=biases_regularizer,
+                                            trainable=trainable,
                                             collections=biases_collections)
           outputs = nn.bias_add(outputs, biases)
 
diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index 3bc31a2624..2b170e92ba 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -2979,6 +2979,20 @@ class SeparableConv2dTest(test.TestCase):
       sess.run(init_op)
       sess.run(net, feed_dict={images_placeholder: images})
 
+  def testTrainableFlagIsPassedOn(self):
+    for trainable in [True, False]:
+      for num_filters in [None, 8]:
+        with ops.Graph().as_default():
+          input_size = [5, 10, 12, 3]
+
+          images = random_ops.random_uniform(input_size, seed=1)
+          layers_lib.separable_conv2d(
+              images, num_filters, [3, 3], 1, trainable=trainable)
+          model_variables = variables.get_model_variables()
+          trainable_variables = variables_lib.trainable_variables()
+          for model_variable in model_variables:
+            self.assertEqual(trainable, model_variable in trainable_variables)
+
 
 class ScaleGradientTests(test.TestCase):
   """Simple tests of the scale_gradient function."""
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
index e71ad9b50b..dfe08bb863 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
@@ -22,6 +22,7 @@ from __future__ import print_function
 # pylint: disable=unused-import
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _ArrayFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _enqueue_data as enqueue_data
+from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _OrderedDictNumpyFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _PandasFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
index 6d15f83ef5..c0a3918549 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
@@ -26,6 +26,7 @@ import six
 from tensorflow.contrib import framework as contrib_framework
 from tensorflow.contrib.framework import get_graph_from_inputs
 from tensorflow.contrib.learn.python.learn.estimators import constants
+from tensorflow.contrib.learn.python.learn.estimators import metric_key
 from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.python.estimator import model_fn as core_model_fn_lib
 from tensorflow.python.estimator.export import export_output as core_export_lib
@@ -255,12 +256,20 @@ class ModelFnOps(
       export_outputs_dict = {key: _export_output(*val) for key, val in
                              output_alternatives.items()}
 
+    def _get_eval_metric_ops():
+      """Returns self.eval_metric_ops without loss metric."""
+      result = {}
+      for key, value in six.iteritems(self.eval_metric_ops):
+        if key != metric_key.MetricKey.LOSS:
+          result[key] = value
+      return result
+
     return core_model_fn_lib.EstimatorSpec(
         mode=mode,
         predictions=self.predictions,
         loss=self.loss,
         train_op=self.train_op,
-        eval_metric_ops=self.eval_metric_ops,
+        eval_metric_ops=_get_eval_metric_ops(),
         export_outputs=export_outputs_dict,
         training_chief_hooks=self.training_chief_hooks,
         training_hooks=self.training_hooks,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
index fe8b3a1b34..51b32359a3 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import six
 
 from tensorflow.contrib.learn.python.learn.estimators import constants
 from tensorflow.contrib.learn.python.learn.estimators import model_fn
@@ -51,19 +52,26 @@ class ModelFnopsTest(test.TestCase):
         predictions=predictions,
         loss=constant_op.constant([1]),
         train_op=control_flow_ops.no_op(),
-        eval_metric_ops={"metric_key": (control_flow_ops.no_op(),
-                                        control_flow_ops.no_op())},
+        eval_metric_ops={
+            "metric_key": (constant_op.constant(1.), control_flow_ops.no_op()),
+            "loss": (constant_op.constant(1.), control_flow_ops.no_op()),
+        },
         # zzz
         training_chief_hooks=[basic_session_run_hooks.StepCounterHook()],
         training_hooks=[basic_session_run_hooks.StepCounterHook()],
         output_alternatives=output_alternatives,
         scaffold=monitored_session.Scaffold())
 
-  def assertEquals_except_export(self, model_fn_ops, estimator_spec):
+  def assertEquals_except_export_and_eval_loss(
+      self, model_fn_ops, estimator_spec):
+    expected_eval_metric_ops = {}
+    for key, value in six.iteritems(model_fn_ops.eval_metric_ops):
+      if key != "loss":
+        expected_eval_metric_ops[key] = value
     self.assertEqual(model_fn_ops.predictions, estimator_spec.predictions)
     self.assertEqual(model_fn_ops.loss, estimator_spec.loss)
     self.assertEqual(model_fn_ops.train_op, estimator_spec.train_op)
-    self.assertEqual(model_fn_ops.eval_metric_ops,
+    self.assertEqual(expected_eval_metric_ops,
                      estimator_spec.eval_metric_ops)
     self.assertEqual(model_fn_ops.training_chief_hooks,
                      estimator_spec.training_chief_hooks)
@@ -75,7 +83,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, None)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
   def testEstimatorSpec_export_regression_with_scores(self):
     predictions = self.create_predictions()
@@ -84,7 +92,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       regression_output = estimator_spec.export_outputs["regression_head"]
@@ -103,7 +111,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       regression_output = estimator_spec.export_outputs["regression_head"]
@@ -119,7 +127,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -140,7 +148,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -162,7 +170,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -182,7 +190,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -203,7 +211,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       classification_output = estimator_spec.export_outputs[
@@ -221,7 +229,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       logistic_output = estimator_spec.export_outputs["logistic_head"]
@@ -240,7 +248,7 @@ class ModelFnopsTest(test.TestCase):
     model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       unspecified_output = estimator_spec.export_outputs["unspecified_head"]
@@ -259,7 +267,7 @@ class ModelFnopsTest(test.TestCase):
 
     estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER,
                                                  "regression_head")
-    self.assertEquals_except_export(model_fn_ops, estimator_spec)
+    self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
       regression_output = estimator_spec.export_outputs["regression_head"]
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
index 7d08f9b452..4a70f00407 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
@@ -18,8 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from types import FunctionType, GeneratorType
 from collections import Container
+from types import FunctionType
+from types import GeneratorType
 
 from tensorflow.contrib.learn.python.learn.dataframe.queues import feeding_functions
 
@@ -33,7 +34,7 @@ def generator_input_fn(x,
                        num_threads=1):
   """Returns input function that would dicts of numpy arrays
        yielded from a generator.
-  
+
   It is assumed that every dict yielded from the dictionary represents
   a single sample. The generator should consume a single epoch of the data.
 
@@ -82,47 +83,44 @@ def generator_input_fn(x,
     KeyError: `key` mismatch between dicts emitted from `x()`
   """
   if not isinstance(x, FunctionType):
-    raise TypeError('x must be generator function; got {}'.format(
-        type(x).__name__))
+    raise TypeError(
+        'x must be generator function; got {}'.format(type(x).__name__))
   generator = x()
   if not isinstance(generator, GeneratorType):
-    raise TypeError('x() must be generator; got {}'.format(
-        type(generator).__name__))
+    raise TypeError(
+        'x() must be generator; got {}'.format(type(generator).__name__))
   data = next(generator)
   if not isinstance(data, dict):
-    raise TypeError('x() must yield dict; got {}'.format(
-        type(data).__name__))
+    raise TypeError('x() must yield dict; got {}'.format(type(data).__name__))
   input_keys = sorted(next(x()).keys())
   if target_key is not None:
     if isinstance(target_key, str):
       target_key = [target_key]
-    elif isinstance(target_key,  Container):
+    elif isinstance(target_key, Container):
       for item in target_key:
         if not isinstance(item, str):
-          raise TypeError(
-              'target_key must be str or Container of str; got {}'.format(
-                  type(item).__name__))
+          raise TypeError('target_key must be str or Container of str; got {}'.
+                          format(type(item).__name__))
         if item not in input_keys:
           raise KeyError(
               'target_key not in yielded dict. Expected {} keys; got {}'.format(
                   input_keys, item))
     else:
-      raise TypeError(
-          'target_key must be str or Container of str; got {}'.format(
-              type(target_key).__name__))
+      raise TypeError('target_key must be str or Container of str; got {}'.
+                      format(type(target_key).__name__))
 
   def _generator_input_fn():
     """generator input function."""
     queue = feeding_functions.enqueue_data(
-      x,
-      queue_capacity,
-      shuffle=shuffle,
-      num_threads=num_threads,
-      enqueue_size=batch_size,
-      num_epochs=num_epochs)
+        x,
+        queue_capacity,
+        shuffle=shuffle,
+        num_threads=num_threads,
+        enqueue_size=batch_size,
+        num_epochs=num_epochs)
 
-    features = (queue.dequeue_many(batch_size) if num_epochs is None
-                else queue.dequeue_up_to(batch_size))
+    features = (queue.dequeue_many(batch_size)
+                if num_epochs is None else queue.dequeue_up_to(batch_size))
     if not isinstance(features, list):
       features = [features]
     features = dict(zip(input_keys, features))
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py b/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
index 8d3cdec819..ae68e35c21 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
@@ -35,17 +35,24 @@ from tensorflow.python.training import queue_runner_impl
 
 
 class GeneratorIoTest(test.TestCase):
+ 
   def testGeneratorInputFn(self):
 
     def generator():
       for index in range(2):
-        yield {'a': np.ones(1) * index,
-               'b': np.ones(1) * index + 32,
-               'label': np.ones(1) * index - 32}
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32
+        }
 
     with self.test_session() as session:
       input_fn = generator_io.generator_input_fn(
-        generator, target_key='label', batch_size=2, shuffle=False, num_epochs=1)
+          generator,
+          target_key='label',
+          batch_size=2,
+          shuffle=False,
+          num_epochs=1)
       features, target = input_fn()
 
       coord = coordinator.Coordinator()
@@ -71,7 +78,7 @@ class GeneratorIoTest(test.TestCase):
 
     with self.test_session() as session:
       input_fn = generator_io.generator_input_fn(
-        generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
+          generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
       features = input_fn()
 
       coord = coordinator.Coordinator()
@@ -91,15 +98,20 @@ class GeneratorIoTest(test.TestCase):
 
     def generator():
       for index in range(2):
-        yield {'a': np.ones(1) * index,
-               'b': np.ones(1) * index + 32,
-               'label': np.ones(1) * index - 32,
-               'label2': np.ones(1) * index - 64,
-               }
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32,
+            'label2': np.ones(1) * index - 64,
+        }
 
     with self.test_session() as session:
       input_fn = generator_io.generator_input_fn(
-        generator, target_key=['label','label2'], batch_size=2, shuffle=False, num_epochs=1)
+          generator,
+          target_key=['label', 'label2'],
+          batch_size=2,
+          shuffle=False,
+          num_epochs=1)
       features, target = input_fn()
 
       coord = coordinator.Coordinator()
@@ -108,8 +120,10 @@ class GeneratorIoTest(test.TestCase):
       res = session.run([features, target])
       self.assertAllEqual(res[0]['a'], np.asarray([0, 1]).reshape(-1, 1))
       self.assertAllEqual(res[0]['b'], np.asarray([32, 33]).reshape(-1, 1))
-      self.assertAllEqual(res[1]['label'], np.asarray([-32, -31]).reshape(-1, 1))
-      self.assertAllEqual(res[1]['label2'], np.asarray([-64, -63]).reshape(-1, 1))
+      self.assertAllEqual(res[1]['label'], np.asarray([-32, -31]).reshape(
+          -1, 1))
+      self.assertAllEqual(res[1]['label2'],
+                          np.asarray([-64, -63]).reshape(-1, 1))
 
       session.run([features])
       with self.assertRaises(errors.OutOfRangeError):
@@ -122,22 +136,34 @@ class GeneratorIoTest(test.TestCase):
 
     def generator():
       for index in range(100):
-        yield {'a': np.ones((10, 10)) * index,
-               'b': np.ones((5, 5)) * index + 32,
-               'label': np.ones((3, 3)) * index - 32}
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
 
     with self.test_session() as session:
       input_fn = generator_io.generator_input_fn(
-        generator, target_key="label", batch_size=2, shuffle=False, num_epochs=1)
+          generator,
+          target_key='label',
+          batch_size=2,
+          shuffle=False,
+          num_epochs=1)
       features, target = input_fn()
 
       coord = coordinator.Coordinator()
       threads = queue_runner_impl.start_queue_runners(session, coord=coord)
 
       res = session.run([features, target])
-      self.assertAllEqual(res[0]['a'], np.vstack((np.zeros((10, 10)), np.ones((10, 10)))).reshape(2, 10, 10))
-      self.assertAllEqual(res[0]['b'], np.vstack((np.zeros((5, 5)), np.ones((5, 5)))).reshape(2, 5, 5) + 32)
-      self.assertAllEqual(res[1], np.vstack((np.zeros((3, 3)), np.ones((3, 3)))).reshape(2, 3, 3) - 32)
+      self.assertAllEqual(res[0]['a'],
+                          np.vstack((np.zeros((10, 10)), np.ones(
+                              (10, 10)))).reshape(2, 10, 10))
+      self.assertAllEqual(res[0]['b'],
+                          np.vstack((np.zeros((5, 5)), np.ones(
+                              (5, 5)))).reshape(2, 5, 5) + 32)
+      self.assertAllEqual(res[1],
+                          np.vstack((np.zeros((3, 3)), np.ones(
+                              (3, 3)))).reshape(2, 3, 3) - 32)
 
       coord.request_stop()
       coord.join(threads)
@@ -147,82 +173,97 @@ class GeneratorIoTest(test.TestCase):
     with self.test_session():
       with self.assertRaisesRegexp(TypeError, 'x must be generator function'):
         failing_input_fn = generator_io.generator_input_fn(
-          x, batch_size=2, shuffle=False, num_epochs=1)
+            x, batch_size=2, shuffle=False, num_epochs=1)
         failing_input_fn()
 
   def testGeneratorInputFnWithXAsNonGenerator(self):
+
     def generator():
       return np.arange(32, 36)
+
     with self.test_session():
-      with self.assertRaisesRegexp(TypeError, "x\(\) must be generator"):
+      with self.assertRaisesRegexp(TypeError, 'x\(\) must be generator'):
         failing_input_fn = generator_io.generator_input_fn(
-          generator, batch_size=2, shuffle=False, num_epochs=1)
+            generator, batch_size=2, shuffle=False, num_epochs=1)
         failing_input_fn()
 
   def testGeneratorInputFnWithXAsNonGeneratorYieldingDicts(self):
+
     def generator():
       yield np.arange(32, 36)
+
     with self.test_session():
-      with self.assertRaisesRegexp(TypeError, "x\(\) must yield dict"):
+      with self.assertRaisesRegexp(TypeError, 'x\(\) must yield dict'):
         failing_input_fn = generator_io.generator_input_fn(
-          generator, batch_size=2, shuffle=False, num_epochs=1)
+            generator, batch_size=2, shuffle=False, num_epochs=1)
         failing_input_fn()
 
   def testGeneratorInputFNWithTargetLabelNotString(self):
+
     def generator():
       for index in range(2):
-        yield {'a': np.ones((10, 10)) * index,
-               'b': np.ones((5, 5)) * index + 32,
-               'label': np.ones((3, 3)) * index - 32}
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
 
     y = np.arange(32, 36)
     with self.test_session():
       with self.assertRaisesRegexp(TypeError, 'target_key must be str or'
-                                              ' Container of str'):
+                                   ' Container of str'):
         failing_input_fn = generator_io.generator_input_fn(
-          generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
+            generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
         failing_input_fn()
 
   def testGeneratorInputFNWithTargetLabelListNotString(self):
+
     def generator():
       for index in range(2):
-        yield {'a': np.ones((10, 10)) * index,
-               'b': np.ones((5, 5)) * index + 32,
-               'label': np.ones((3, 3)) * index - 32}
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
 
-    y = ["label", np.arange(10)]
+    y = ['label', np.arange(10)]
     with self.test_session():
       with self.assertRaisesRegexp(TypeError, 'target_key must be str or'
-                                              ' Container of str'):
+                                   ' Container of str'):
         failing_input_fn = generator_io.generator_input_fn(
-          generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
+            generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
         failing_input_fn()
 
   def testGeneratorInputFNWithTargetLabelNotInDict(self):
+
     def generator():
       for index in range(2):
-        yield {'a': np.ones((10, 10)) * index,
-               'b': np.ones((5, 5)) * index + 32,
-               'label': np.ones((3, 3)) * index - 32}
+        yield {
+            'a': np.ones((10, 10)) * index,
+            'b': np.ones((5, 5)) * index + 32,
+            'label': np.ones((3, 3)) * index - 32
+        }
 
-    y = ["label", "target"]
+    y = ['label', 'target']
     with self.test_session():
-      with self.assertRaisesRegexp(KeyError,
-                                   'target_key not in yielded dict'):
+      with self.assertRaisesRegexp(KeyError, 'target_key not in yielded dict'):
         failing_input_fn = generator_io.generator_input_fn(
-          generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
+            generator, target_key=y, batch_size=2, shuffle=False, num_epochs=1)
         failing_input_fn()
 
   def testGeneratorInputFnWithNoTargetKey(self):
+
     def generator():
       for index in range(2):
-        yield {'a': np.ones(1) * index,
-               'b': np.ones(1) * index + 32,
-               'label': np.ones(1) * index - 32}
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32
+        }
 
     with self.test_session() as session:
       input_fn = generator_io.generator_input_fn(
-        generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
+          generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
       features = input_fn()
 
       coord = coordinator.Coordinator()
@@ -241,15 +282,18 @@ class GeneratorIoTest(test.TestCase):
       coord.join(threads)
 
   def testGeneratorInputFnWithBatchLargerthanData(self):
+
     def generator():
       for index in range(2):
-        yield {'a': np.ones(1) * index,
-               'b': np.ones(1) * index + 32,
-               'label': np.ones(1) * index - 32}
+        yield {
+            'a': np.ones(1) * index,
+            'b': np.ones(1) * index + 32,
+            'label': np.ones(1) * index - 32
+        }
 
     with self.test_session() as session:
       input_fn = generator_io.generator_input_fn(
-        generator, target_key=None, batch_size=4, shuffle=False, num_epochs=1)
+          generator, target_key=None, batch_size=4, shuffle=False, num_epochs=1)
       features = input_fn()
 
       coord = coordinator.Coordinator()
@@ -268,19 +312,24 @@ class GeneratorIoTest(test.TestCase):
       coord.join(threads)
 
   def testGeneratorInputFnWithMismatchinGeneratorKeys(self):
+
     def generator():
       index = 0
-      yield {'a': np.ones(1) * index,
-             'b': np.ones(1) * index + 32,
-             'label': np.ones(1) * index - 32}
+      yield {
+          'a': np.ones(1) * index,
+          'b': np.ones(1) * index + 32,
+          'label': np.ones(1) * index - 32
+      }
       index = 1
-      yield {'a': np.ones(1) * index,
-             'c': np.ones(1) * index + 32,
-             'label': np.ones(1) * index - 32}
+      yield {
+          'a': np.ones(1) * index,
+          'c': np.ones(1) * index + 32,
+          'label': np.ones(1) * index - 32
+      }
 
     with self.test_session() as session:
       input_fn = generator_io.generator_input_fn(
-        generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
+          generator, target_key=None, batch_size=2, shuffle=False, num_epochs=1)
       features = input_fn()
 
       coord = coordinator.Coordinator()
@@ -290,9 +339,10 @@ class GeneratorIoTest(test.TestCase):
         session.run([features])
 
       with self.assertRaisesRegex(KeyError, 'key mismatch between dicts emitted'
-                                            ' by GenFunExpected'):
+                                  ' by GenFunExpected'):
         coord.request_stop()
         coord.join(threads)
 
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/opt/python/training/external_optimizer.py b/tensorflow/contrib/opt/python/training/external_optimizer.py
index db04cd2560..0909760b38 100644
--- a/tensorflow/contrib/opt/python/training/external_optimizer.py
+++ b/tensorflow/contrib/opt/python/training/external_optimizer.py
@@ -99,8 +99,13 @@ class ExternalOptimizerInterface(object):
         slice(start, end) for start, end in zip(accumulated_dims[:-1],
                                                 accumulated_dims[1:])]
 
-  def minimize(self, session=None, feed_dict=None, fetches=None,
-               step_callback=None, loss_callback=None, **run_kwargs):
+  def minimize(self,
+               session=None,
+               feed_dict=None,
+               fetches=None,
+               step_callback=None,
+               loss_callback=None,
+               **run_kwargs):
     """Minimize a scalar `Tensor`.
 
     Variables subject to optimization are updated in-place at the end of
@@ -120,7 +125,7 @@ class ExternalOptimizerInterface(object):
         flattened into a single vector.
       loss_callback: A function to be called every time the loss and gradients
         are computed, with evaluated fetches supplied as positional arguments.
-      run_kwargs: kwargs to pass to `session.run`.
+      **run_kwargs: kwargs to pass to `session.run`.
     """
     session = session or ops.get_default_session()
     feed_dict = feed_dict or {}
@@ -161,9 +166,10 @@ class ExternalOptimizerInterface(object):
                 for packing_slice in self._packing_slices]
 
     # Set optimization variables to their new values.
-    session.run(self._var_updates,
-                feed_dict=dict(zip(self._update_placeholders, var_vals)),
-                **run_kwargs)
+    session.run(
+        self._var_updates,
+        feed_dict=dict(zip(self._update_placeholders, var_vals)),
+        **run_kwargs)
 
   def _minimize(self, initial_val, loss_grad_func, equality_funcs,
                 equality_grad_funcs, inequality_funcs, inequality_grad_funcs,
diff --git a/tensorflow/contrib/seq2seq/python/ops/loss.py b/tensorflow/contrib/seq2seq/python/ops/loss.py
index 7e67c5f8a4..39a6d2f58b 100644
--- a/tensorflow/contrib/seq2seq/python/ops/loss.py
+++ b/tensorflow/contrib/seq2seq/python/ops/loss.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
 """Seq2seq loss operations for use in sequence models.
 """
 
@@ -28,16 +27,21 @@ from tensorflow.python.ops import nn_ops
 __all__ = ["sequence_loss"]
 
 
-def sequence_loss(logits, targets, weights,
-                  average_across_timesteps=True, average_across_batch=True,
-                  softmax_loss_function=None, name=None):
-  """Weighted cross-entropy loss for a sequence of logits. Depending on the
-  values of `average_across_timesteps` and `average_across_batch`, the return
-  Tensor will have rank 0, 1, or 2 as these arguments reduce the cross-entropy
-  at each target, which has shape `[batch_size, sequence_length]`, over their
-  respective dimensions. For example, if `average_across_timesteps` is `True`
-  and `average_across_batch` is `False`, then the return Tensor will have shape
-  `[batch_size]`.
+def sequence_loss(logits,
+                  targets,
+                  weights,
+                  average_across_timesteps=True,
+                  average_across_batch=True,
+                  softmax_loss_function=None,
+                  name=None):
+  """Weighted cross-entropy loss for a sequence of logits.
+
+  Depending on the values of `average_across_timesteps` and
+  `average_across_batch`, the return Tensor will have rank 0, 1, or 2 as these
+  arguments reduce the cross-entropy at each target, which has shape
+  `[batch_size, sequence_length]`, over their respective dimensions. For
+  example, if `average_across_timesteps` is `True` and `average_across_batch`
+  is `False`, then the return Tensor will have shape `[batch_size]`.
 
   Args:
     logits: A Tensor of shape
diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index a863b69cef..8b9f468487 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -274,14 +274,14 @@ Status BaseGPUDevice::FillContextMap(const Graph* graph,
                                      DeviceContextMap* device_context_map) {
   VLOG(2) << "FillContextMap";
 
-  const auto num_streams = streams_.size();
+  const size_t num_streams = streams_.size();
   // Special case for single stream.
   if (num_streams == 1) {
     return Status::OK();
   }
   const int64 before = Env::Default()->NowMicros();
   gpu_stream_util::AssignStreamsOpts opts;
-  opts.max_streams = num_streams;
+  opts.max_streams = static_cast<int32>(num_streams);
   std::unordered_map<int, int> node_to_stream_id;
   TF_RETURN_IF_ERROR(
       gpu_stream_util::AssignStreams(graph, opts, &node_to_stream_id));
@@ -519,7 +519,7 @@ void BaseGPUDevice::ReinitializeGpuDevice(OpKernelContext* context,
 Status BaseGPUDeviceFactory::CreateDevices(const SessionOptions& options,
                                            const string& name_prefix,
                                            std::vector<Device*>* devices) {
-  int n = INT_MAX;
+  size_t n = INT_MAX;
   auto iter = options.config.device_count().find("GPU");
   if (iter != options.config.device_count().end()) {
     n = iter->second;
@@ -971,7 +971,7 @@ Status BaseGPUDeviceFactory::GetValidDeviceIds(
       continue;
     }
 
-    int new_id = ids->size();
+    size_t new_id = ids->size();
     ids->push_back(visible_gpu_id);
 
     LOG(INFO) << "Creating TensorFlow device (/gpu:" << new_id << ") -> "
diff --git a/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc b/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc
index e4cd79bc7f..8226cc035c 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_event_mgr_test.cc
@@ -37,12 +37,12 @@ class TEST_EventMgrHelper {
     StopPollingLoop();
   }
 
-  int queue_size() {
+  size_t queue_size() {
     mutex_lock l(em_->mu_);
     return em_->used_events_.size();
   }
 
-  int free_size() {
+  size_t free_size() {
     mutex_lock l(em_->mu_);
     return em_->free_events_.size();
   }
diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index f58faefa9f..f2dff0bf75 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -299,6 +299,13 @@ Status ShapeRefiner::ExtractConstantSubgraph(
       return Status::OK();
     }
 
+    // Don't constant fold enter/exit currently either, as it's easy to end
+    // up with a partial frame.
+    if (IsEnter(current_node) || IsExit(current_node)) {
+      *is_constant_graph = false;
+      return Status::OK();
+    }
+
     // If there is nothing more to recurse down, see if
     // the generator node is a constant.
     if (current_node->num_inputs() == 0) {
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index e1603330eb..002929d58a 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
 
@@ -652,6 +653,36 @@ string DebugStringWhole(const GraphDef& gdef) {
   return ret;
 }
 
+bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2) {
+  // NOTE(skyewm): Using MessageDifferencer would be better here, but that is
+  // currently not included in tensorflow/core/platform/default/protobuf.h, so
+  // play fast and loose here.  I don't see anything in OpDef that should allow
+  // multiple equivalent string serializations, with the exception of
+  // AttrValues, which can vary for tensor values (see AreAttrValuesEqual()
+  // comments).
+  string sig1, sig2;
+  f1.signature().SerializeToString(&sig1);
+  f2.signature().SerializeToString(&sig2);
+  if (sig1 != sig2) return false;
+
+  if (f1.attr().size() != f2.attr().size()) return false;
+  for (auto iter1 : f1.attr()) {
+    auto iter2 = f2.attr().find(iter1.first);
+    if (iter2 == f2.attr().end()) return false;
+    if (!AreAttrValuesEqual(iter1.second, iter2->second)) return false;
+  }
+
+  if (!EqualRepeatedNodeDef(f1.node_def(), f2.node_def(), nullptr)) {
+    return false;
+  }
+
+  std::map<string, string> ret1(f1.ret().begin(), f1.ret().end());
+  std::map<string, string> ret2(f2.ret().begin(), f2.ret().end());
+  if (ret1 != ret2) return false;
+
+  return true;
+}
+
 string Canonicalize(const string& funcname,
                     const InstantiateAttrValueMap& attrs) {
   std::vector<string> entries;
@@ -802,6 +833,17 @@ Status FunctionLibraryDefinition::AddLibrary(
   return Status::OK();
 }
 
+Status FunctionLibraryDefinition::AddLibrary(
+    const FunctionDefLibrary& lib_def) {
+  for (const FunctionDef& fdef : lib_def.function()) {
+    TF_RETURN_IF_ERROR(AddFunctionDef(fdef));
+  }
+  for (const GradientDef& grad : lib_def.gradient()) {
+    TF_RETURN_IF_ERROR(AddGradientDef(grad));
+  }
+  return Status::OK();
+}
+
 string FunctionLibraryDefinition::FindGradient(const string& func) const {
   return gtl::FindWithDefault(func_grad_, func, "");
 }
diff --git a/tensorflow/core/framework/function.h b/tensorflow/core/framework/function.h
index e27311041f..63c868ac9b 100644
--- a/tensorflow/core/framework/function.h
+++ b/tensorflow/core/framework/function.h
@@ -230,6 +230,10 @@ string DebugString(const GraphDef& instantiated_func_def);
 // its supporting functions defined in its library).
 string DebugStringWhole(const GraphDef& gdef);
 
+// Returns true if f1 == f2. Compares all fields, including descriptions. Order
+// of NodeDefs doesn't matter.
+bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2);
+
 // Returns a canonicalized string for the instantiation of the
 // function of the given "name" and attributes "attrs".
 //
@@ -303,6 +307,9 @@ class FunctionLibraryDefinition : public OpRegistryInterface {
   // Adds the functions and gradients in 'other' to this function library.
   Status AddLibrary(const FunctionLibraryDefinition& other);
 
+  // Adds the functions and gradients in 'lib_def' to this function library.
+  Status AddLibrary(const FunctionDefLibrary& lib_def);
+
   // If the gradient function for 'func' is specified explicitly in
   // the library, returns the gradient function name.  Otherwise,
   // returns an empty string.
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index 414b097997..4cd9dce0de 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -1107,4 +1107,36 @@ TEST(FunctionLibraryDefinitionTest, GetAttr_Gradient) {
   EXPECT_EQ(annotation, false);  // WXPlusB has no custom gradient.
 }
 
+// TODO(skyewm): this could be more thorough
+TEST(FunctionDefsEqualTest, TestFunctionDefsEqual) {
+  // Equal functions
+  FunctionDef fdef1 = test::function::XTimesTwo();
+  FunctionDef fdef2 = test::function::XTimesTwo();
+  EXPECT_TRUE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different functions
+  fdef2 = test::function::XTimesFour();
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different signatures
+  fdef2 = test::function::XTimesTwo();
+  fdef2.mutable_signature()->mutable_input_arg(0)->set_name("foo");
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Descriptions must be equal
+  fdef2 = test::function::XTimesTwo();
+  fdef2.mutable_signature()->mutable_input_arg(0)->set_description("foo");
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different NodeDefs
+  fdef2 = test::function::XTimesTwo();
+  *fdef2.add_node_def() = fdef2.node_def(0);
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+
+  // Different return values
+  fdef2 = test::function::XTimesTwo();
+  (*fdef2.mutable_ret())["y"] = "y:z:1";  // originally is "y:z:0"
+  EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
+}
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index 65baf4cd85..c19764d082 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -360,6 +360,45 @@ void Graph::RemoveEdge(const Edge* e) {
   free_edges_.push_back(del);
 }
 
+Status Graph::AddFunctionLibrary(const FunctionDefLibrary& fdef_lib) {
+  for (const FunctionDef& fdef : fdef_lib.function()) {
+    const FunctionDef* preexisting_fdef = ops_.Find(fdef.signature().name());
+    if (preexisting_fdef != nullptr) {
+      if (!FunctionDefsEqual(*preexisting_fdef, fdef)) {
+        return errors::InvalidArgument(
+            "Cannot add function '", fdef.signature().name(),
+            "' because a different function with the same name already "
+            "exists.");
+      }
+      // Ignore duplicate FunctionDefs
+      continue;
+    }
+    // TODO(skyewm): fix test breakages and reenable this check
+    // const OpDef* op_def;
+    // if (ops_.LookUpOpDef(fdef.signature().name(), &op_def).ok()) {
+    //   return errors::InvalidArgument(
+    //       "Cannot add function '", fdef.signature().name(),
+    //       "' because an op with the same name already exists.");
+    // }
+    TF_RETURN_IF_ERROR(ops_.AddFunctionDef(fdef));
+  }
+  for (const GradientDef& grad : fdef_lib.gradient()) {
+    string preexisting_grad_func = ops_.FindGradient(grad.function_name());
+    if (!preexisting_grad_func.empty()) {
+      if (preexisting_grad_func != grad.gradient_func()) {
+        return errors::InvalidArgument(
+            "Cannot assign gradient function '", grad.gradient_func(), "' to '",
+            grad.function_name(), "' because it already has gradient function ",
+            "'", preexisting_grad_func, "'");
+      }
+      // Ignore duplicate GradientDefs
+      continue;
+    }
+    TF_RETURN_IF_ERROR(ops_.AddGradientDef(grad));
+  }
+  return Status::OK();
+}
+
 namespace {
 
 void AddInput(NodeDef* dst, StringPiece src_name, int src_slot) {
@@ -380,7 +419,8 @@ void Graph::ToGraphDef(GraphDef* graph_def) const {
 
 void Graph::ToGraphDefSubRange(GraphDef* graph_def, int from_node_id) const {
   graph_def->Clear();
-  graph_def->mutable_versions()->CopyFrom(versions());
+  *graph_def->mutable_versions() = versions();
+  *graph_def->mutable_library() = ops_.ToProto();
   std::vector<const Edge*>
       inputs;  // Construct this outside the loop for speed.
   for (auto id = from_node_id; id < num_node_ids(); ++id) {
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index 4af4b0bb10..83bb797d1b 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -324,6 +324,12 @@ class Graph {
   // REQUIRES: The edge must exist.
   void RemoveEdge(const Edge* edge);
 
+  // Adds the function and gradient definitions in `fdef_lib` to this graph's op
+  // registry. Ignores duplicate functions, and returns a bad status if an
+  // imported function differs from an existing function or op with the same
+  // name.
+  Status AddFunctionLibrary(const FunctionDefLibrary& fdef_lib);
+
   // The number of live nodes in the graph.
   //
   // Because nodes can be removed from the graph, num_nodes() is often
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
index 6b27e4e294..6b3b5d3604 100644
--- a/tensorflow/core/graph/graph_constructor.cc
+++ b/tensorflow/core/graph/graph_constructor.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/common_runtime/shape_refiner.h"
+#include "tensorflow/core/framework/function.h"
 #include "tensorflow/core/framework/function.pb.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def_util.h"
@@ -604,6 +605,10 @@ void GraphConstructor::AddPrefixToNodeDef(
 }
 
 Status GraphConstructor::Convert() {
+  // Import functions before adding nodes, since imported nodes may refer to
+  // functions
+  TF_RETURN_IF_ERROR(g_->AddFunctionLibrary(gdef_->library()));
+
   std::vector<InputInfo> inputs;
   int processed = 0;
   // Process the NodeDefs in topological order.
@@ -705,7 +710,12 @@ Status GraphConstructor::Convert() {
         TF_RETURN_IF_ERROR(MakeEdge(inputs[i].node, inputs[i].index, node, i));
       }
     }
-    TF_RETURN_IF_ERROR(ValidateShape(node));
+
+    // TODO(skyewm): remove conditional when b/35715995 ("Functions lack shape
+    // inference") is resolved.
+    if (g_->flib_def().Find(node_def->name()) == nullptr) {
+      TF_RETURN_IF_ERROR(ValidateShape(node));
+    }
 
     // Update pending_count_ for outputs.
     for (size_t i = 0; i < outputs_[o].size(); ++i) {
@@ -847,10 +857,6 @@ Status ImportGraphDef(const ImportGraphDefOptions& opts, const GraphDef& gdef,
           return_tensors->size(), ")");
     }
   }
-  if (gdef.library().function_size() != 0) {
-    return errors::Unimplemented(
-        "Importing GraphDefs containing functions not yet implemented");
-  }
   return GraphConstructor::Construct(opts, &gdef, g, refiner, return_tensors);
 }
 
diff --git a/tensorflow/core/graph/graph_constructor.h b/tensorflow/core/graph/graph_constructor.h
index 4252b08e48..186859d132 100644
--- a/tensorflow/core/graph/graph_constructor.h
+++ b/tensorflow/core/graph/graph_constructor.h
@@ -113,8 +113,6 @@ struct ImportGraphDefOptions {
   // with ops that are not defined in the binary calling ImportGraphDef.
   // Similar to the producer_op_list argument to import_graph_def in the
   // python API.
-
-  // TODO(skyewm): Enable importing functions
 };
 
 // Each `return_tensors` entry is the requested node and output index. The index
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index 7c847916d1..e20dabc891 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -31,6 +31,7 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/public/session.h"
 #include "tensorflow/core/public/version.h"
 
 // TODO(josh11b): Test InitCostModel().
@@ -2008,30 +2009,196 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ErrorsDoNoChangeTheGraph) {
 #undef EXPECT_IMPORT_FAILURE
 }
 
-TEST_F(GraphConstructorTest, ImportGraphDef_ErrorFunctionDefsUnimplemented) {
-  ExpectError(
+TEST_F(GraphConstructorTest, ImportGraphDef_FunctionDefs) {
+  // Import a graph def containing a function. The graph def was generated using
+  // this python code:
+  // @function.Defun(tf.float32, tf.float32, tf.float32)
+  // def FooGrad(x, y, dz): return dz, dz
+  //
+  // @function.Defun(tf.float32, tf.float32, grad_func=FooGrad)
+  // def Foo(x, y): return x + y
+  //
+  // p1 = tf.placeholder(tf.float32)
+  // p2 = tf.placeholder(tf.float32)
+  // foo = Foo(p1, p2)
+  ImportGraphDefOptions opts;
+  ExpectOK(
       R"EOF(
-library {
-  function {
-    signature {
-      name: "Foo_cc661786"
-      input_arg {
-        name: "x"
-        type: DT_FLOAT
+      node {
+        name: "Placeholder" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
+      }
+      node {
+        name: "Placeholder_1" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
       }
-      output_arg {
-        name: "x"
-        type: DT_FLOAT
+      node {
+        name: "Foo_d03c39a3" op: "Foo_d03c39a3"
+        input: "Placeholder" input: "Placeholder_1"
       }
-    }
-    ret {
-      key: "x"
-      value: "x:0"
-    }
-  }
-})EOF",
-      ImportGraphDefOptions(),
-      {"Importing GraphDefs containing functions not yet implemented"});
+      library {
+        function {
+          signature {
+            name: "Foo_d03c39a3"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            output_arg { name: "add" type: DT_FLOAT }
+          }
+          node_def {
+            name: "add" op: "Add" input: "x" input: "y"
+            attr { key: "T" value { type: DT_FLOAT } }
+          }
+          ret { key: "add" value: "add:z:0" }
+        }
+        function {
+          signature {
+            name: "FooGrad_dc60abc8"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            input_arg { name: "dz" type: DT_FLOAT }
+            output_arg { name: "dz" type: DT_FLOAT }
+            output_arg { name: "dz_U0" type: DT_FLOAT }
+          }
+          ret { key: "dz" value: "dz:0" }
+          ret { key: "dz_U0" value: "dz:0" }
+        }
+        gradient {
+          function_name: "Foo_d03c39a3" gradient_func: "FooGrad_dc60abc8"
+        }
+      }
+      versions { producer: 21 min_consumer: 12 }
+      )EOF",
+      opts);
+
+  EXPECT_TRUE(HasNode("Placeholder"));
+  EXPECT_TRUE(HasNode("Placeholder_1"));
+  EXPECT_TRUE(HasNode("Foo_d03c39a3"));
+  // Check that Foo and FooGrad have been imported
+  const OpDef* op_def;
+  TF_ASSERT_OK(graph_.op_registry()->LookUpOpDef("Foo_d03c39a3", &op_def));
+  TF_ASSERT_OK(graph_.op_registry()->LookUpOpDef("FooGrad_dc60abc8", &op_def));
+
+  // Re-serialize and run the graph. This tests that re-serialized functions can
+  // be imported again and that imported functions can be run.
+  GraphDef gdef;
+  graph_.ToGraphDef(&gdef);
+  EXPECT_EQ(gdef.library().function_size(), 2);
+  EXPECT_EQ(gdef.library().gradient_size(), 1);
+  EXPECT_EQ(gdef.library().gradient()[0].function_name(), "Foo_d03c39a3");
+  EXPECT_EQ(gdef.library().gradient()[0].gradient_func(), "FooGrad_dc60abc8");
+
+  std::unique_ptr<Session> sess(NewSession(SessionOptions()));
+  TF_ASSERT_OK(sess->Create(gdef));
+
+  Tensor p1(DT_FLOAT, TensorShape({1}));
+  p1.scalar<float>()() = 1.0;
+  Tensor p2(DT_FLOAT, TensorShape({1}));
+  p2.scalar<float>()() = 2.0;
+  std::vector<std::pair<string, Tensor>> inputs = {{"Placeholder", p1},
+                                                   {"Placeholder_1", p2}};
+  std::vector<string> output_names = {"Foo_d03c39a3"};
+  std::vector<string> target_names;
+  std::vector<Tensor> outputs;
+  TF_ASSERT_OK(sess->Run(inputs, output_names, target_names, &outputs));
+
+  ASSERT_EQ(outputs.size(), 1);
+  EXPECT_EQ(outputs[0].scalar<float>()(), 3.0);
+}
+
+TEST_F(GraphConstructorTest, ImportGraphDef_NestedFunctionDefs) {
+  // Import a graph def containing a function. The graph def was generated using
+  // this python code:
+  //   @function.Defun(tf.float32, tf.float32)
+  //   def Inner(x, y): return x + y
+  //
+  //   @function.Defun(tf.float32, tf.float32)
+  //   def Outer(x, y): return Inner(x, y)
+  //
+  //   p1 = tf.placeholder(tf.float32)
+  //   p2 = tf.placeholder(tf.float32)
+  //   Outer(p1, p2)
+  ImportGraphDefOptions opts;
+  ExpectOK(
+      R"EOF(
+      node {
+        name: "Placeholder" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
+      }
+      node {
+        name: "Placeholder_1" op: "Placeholder"
+        attr { key: "dtype" value { type: DT_FLOAT } }
+        attr { key: "shape" value { shape { } } }
+      }
+      node {
+        name: "Outer_966fa13d" op: "Outer_966fa13d"
+        input: "Placeholder" input: "Placeholder_1"
+      }
+      library {
+        function {
+          signature {
+            name: "Outer_966fa13d"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            output_arg { name: "Inner_d03c39a3" type: DT_FLOAT }
+          }
+          node_def {
+            name: "Inner_d03c39a3" op: "Inner_d03c39a3" input: "x" input: "y"
+          }
+          ret { key: "Inner_d03c39a3" value: "Inner_d03c39a3:add:0" }
+        }
+        function {
+          signature {
+            name: "Inner_d03c39a3"
+            input_arg { name: "x" type: DT_FLOAT }
+            input_arg { name: "y" type: DT_FLOAT }
+            output_arg { name: "add" type: DT_FLOAT }
+          }
+          node_def {
+            name: "add" op: "Add" input: "x" input: "y"
+            attr { key: "T" value { type: DT_FLOAT } }
+          }
+          ret { key: "add" value: "add:z:0" }
+        }
+      }
+      versions { producer: 21 min_consumer: 12 }
+      )EOF",
+      opts);
+
+  EXPECT_TRUE(HasNode("Placeholder"));
+  EXPECT_TRUE(HasNode("Placeholder_1"));
+  EXPECT_TRUE(HasNode("Outer_966fa13d"));
+  // Check that Inner and Outer have been imported
+  const OpDef* op_def;
+  Status s = graph_.op_registry()->LookUpOpDef("Inner_d03c39a3", &op_def);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+  s = graph_.op_registry()->LookUpOpDef("Outer_966fa13d", &op_def);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+
+  // Re-serialize and run the graph. This tests that re-serialized functions can
+  // be imported again and that imported functions can be run.
+  GraphDef gdef;
+  graph_.ToGraphDef(&gdef);
+  std::unique_ptr<Session> sess(NewSession(SessionOptions()));
+  s = sess->Create(gdef);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+
+  Tensor p1(DT_FLOAT, TensorShape({1}));
+  p1.scalar<float>()() = 1.0;
+  Tensor p2(DT_FLOAT, TensorShape({1}));
+  p2.scalar<float>()() = 2.0;
+  std::vector<std::pair<string, Tensor>> inputs = {{"Placeholder", p1},
+                                                   {"Placeholder_1", p2}};
+  std::vector<string> output_names = {"Outer_966fa13d"};
+  std::vector<string> target_names;
+  std::vector<Tensor> outputs;
+  s = sess->Run(inputs, output_names, target_names, &outputs);
+  ASSERT_TRUE(s.ok()) << s.error_message();
+
+  ASSERT_EQ(outputs.size(), 1);
+  EXPECT_EQ(outputs[0].scalar<float>()(), 3.0);
 }
 
 TEST_F(GraphConstructorTest, CopyGraph) {
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index f5ed7a83e4..739ad90efd 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <set>
 #include <vector>
+#include "tensorflow/core/framework/function_testlib.h"
 #include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/graph/node_builder.h"
 #include "tensorflow/core/kernels/ops_util.h"
@@ -387,6 +388,61 @@ TEST_F(GraphTest, InputEdges) {
   TF_EXPECT_OK(b->input_edges(&edges));
 }
 
+TEST_F(GraphTest, AddFunctionLibrary) {
+  // Basic functionality
+  FunctionDefLibrary proto;
+  *proto.add_function() = test::function::XTimesTwo();
+  *proto.add_function() = test::function::XTimesFour();
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesTwo") != nullptr);
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesFour") != nullptr);
+
+  // Duplicate functions are ignored
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesTwo") != nullptr);
+  EXPECT_TRUE(graph_.flib_def().Find("XTimesFour") != nullptr);
+
+  // Duplicate names corresponding to different functions trigger an error
+  FunctionDefLibrary error_proto = proto;
+  *error_proto.mutable_function(0)->add_node_def() =
+      error_proto.function(0).node_def(0);
+  Status s = graph_.AddFunctionLibrary(error_proto);
+  EXPECT_FALSE(s.ok());
+  EXPECT_EQ(s.error_message(),
+            "Cannot add function 'XTimesTwo' because a different function with "
+            "the same name already exists.");
+
+  // TODO(skyewm): reenable along with duplicate op check
+  // Function with same name as an existing op triggers an error
+  // error_proto = proto;
+  // error_proto.mutable_function(0)->mutable_signature()->set_name("Add");
+  // s = graph_.AddFunctionLibrary(error_proto);
+  // EXPECT_FALSE(s.ok());
+  // EXPECT_EQ(s.error_message(),
+  //           "Cannot add function 'Add' because an op with the same name "
+  //           "already exists.");
+
+  // Adding a gradient function to an existing function is ok
+  GradientDef* grad = proto.add_gradient();
+  grad->set_function_name("XTimesTwo");
+  grad->set_gradient_func("Undefined");  // undefined funcs in grads are ok
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_EQ(graph_.flib_def().FindGradient("XTimesTwo"), "Undefined");
+
+  // Duplicate gradients are ignored
+  TF_EXPECT_OK(graph_.AddFunctionLibrary(proto));
+  EXPECT_EQ(graph_.flib_def().FindGradient("XTimesTwo"), "Undefined");
+
+  // Conflicting gradient triggers an error
+  error_proto = proto;
+  error_proto.mutable_gradient(0)->set_gradient_func("Undefined2");
+  s = graph_.AddFunctionLibrary(error_proto);
+  EXPECT_FALSE(s.ok());
+  EXPECT_EQ(s.error_message(),
+            "Cannot assign gradient function 'Undefined2' to 'XTimesTwo' "
+            "because it already has gradient function 'Undefined'");
+}
+
 REGISTER_OP("Input").Output("o: float");
 REGISTER_OP("In2Out1").Input("a: float").Input("b: float").Output("o: float");
 
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 6deaa79485..309c4cd774 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -255,47 +255,47 @@ static size_t kNodeMergeContextMaxDepth = 10;
 class MklLayoutRewritePass : public GraphOptimizationPass {
  public:
   MklLayoutRewritePass() {
-    csinfo_.conv2d            = "Conv2D";
-    csinfo_.mklconv2d         = "MklConv2D";
+    csinfo_.conv2d = "Conv2D";
+    csinfo_.mklconv2d = "MklConv2D";
     csinfo_.mklconv2dwithbias = "MklConv2DWithBias";
     csinfo_.mklconv2dwithbiasbackpropbias = "MklConv2DWithBiasBackpropBias";
-    csinfo_.biasadd           = "BiasAdd";
-    csinfo_.matmul            = "MatMul";
-    csinfo_.biasaddgrad       = "BiasAddGrad";
-    csinfo_.relu              = "Relu";
-    csinfo_.relugrad          = "ReluGrad";
-    csinfo_.maxpool           = "MaxPool";
-    csinfo_.maxpoolgrad       = "MaxPoolGrad";
-    csinfo_.avgpool           = "AvgPool";
-    csinfo_.avgpoolgrad       = "AvgPoolGrad";
-    csinfo_.conv2dgradinput   = "Conv2DBackpropInput";
-    csinfo_.conv2dgradfilter  = "Conv2DBackpropFilter";
-
-    rinfo_.push_back({csinfo_.conv2d,   csinfo_.mklconv2d,
-                      2, CopyAttrsConv2D, AlwaysRewrite});
+    csinfo_.biasadd = "BiasAdd";
+    csinfo_.matmul = "MatMul";
+    csinfo_.biasaddgrad = "BiasAddGrad";
+    csinfo_.relu = "Relu";
+    csinfo_.relugrad = "ReluGrad";
+    csinfo_.maxpool = "MaxPool";
+    csinfo_.maxpoolgrad = "MaxPoolGrad";
+    csinfo_.avgpool = "AvgPool";
+    csinfo_.avgpoolgrad = "AvgPoolGrad";
+    csinfo_.conv2dgradinput = "Conv2DBackpropInput";
+    csinfo_.conv2dgradfilter = "Conv2DBackpropFilter";
+
+    rinfo_.push_back(
+        {csinfo_.conv2d, csinfo_.mklconv2d, 2, CopyAttrsConv2D, AlwaysRewrite});
     rinfo_.push_back({csinfo_.conv2dgradfilter,
-        GetMklOpName(csinfo_.conv2dgradfilter),
-                      3, CopyAttrsConv2D, AlwaysRewrite});
+                      GetMklOpName(csinfo_.conv2dgradfilter), 3,
+                      CopyAttrsConv2D, AlwaysRewrite});
     rinfo_.push_back({csinfo_.conv2dgradinput,
-        GetMklOpName(csinfo_.conv2dgradinput),
-                      3, CopyAttrsConv2D, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu),
-                      1, CopyAttrsRelu, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.maxpool, GetMklOpName(csinfo_.maxpool),
-                      1, CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.maxpoolgrad, GetMklOpName(csinfo_.maxpoolgrad),
-                      3, CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpool, GetMklOpName(csinfo_.avgpool),
-                      1, CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpoolgrad, GetMklOpName(csinfo_.avgpoolgrad),
-                      2, CopyAttrsPooling, AlwaysRewrite});
+                      GetMklOpName(csinfo_.conv2dgradinput), 3, CopyAttrsConv2D,
+                      AlwaysRewrite});
+    rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu), 1,
+                      CopyAttrsRelu, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.maxpool, GetMklOpName(csinfo_.maxpool), 1,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.maxpoolgrad, GetMklOpName(csinfo_.maxpoolgrad), 3,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avgpool, GetMklOpName(csinfo_.avgpool), 1,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avgpoolgrad, GetMklOpName(csinfo_.avgpoolgrad), 2,
+                      CopyAttrsPooling, AlwaysRewrite});
 
     // Add info about which ops to add workspace edge to and the slots.
     wsinfo_.push_back({csinfo_.maxpool, csinfo_.maxpoolgrad, 0, 1, 2, 6});
 
     // Add a rule for merging nodes
-    minfo_.push_back({csinfo_.mklconv2d, csinfo_.biasadd, 0,
-                      csinfo_.mklconv2dwithbias});
+    minfo_.push_back(
+        {csinfo_.mklconv2d, csinfo_.biasadd, 0, csinfo_.mklconv2dwithbias});
 
     // We use maxhop of 10 based on empirical observations. Also, these are
     // maxhops in backward data-flow graph. Since input of forward nodes
@@ -322,13 +322,13 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   /// the number of inputs to the original op, and the function to be used
   /// to copy attributes for the op
   typedef struct {
-    string name;   // Original name of the op in the graph
-    string newname;   // New name of op in the graph
-    int    numins;  // Number of inputs to the original op
+    string name;     // Original name of the op in the graph
+    string newname;  // New name of op in the graph
+    int numins;      // Number of inputs to the original op
     // Function handler to copy attributes from old node to new node.
     std::function<void(const Node*, NodeBuilder*)> copyattrs;
     std::function<bool(const Node*)> rewriterule;  // Rule under which to
-                    // rewrite this node.
+                                                   // rewrite this node.
   } RewriteInfo;
 
   /// Structure to specify forward op, backward op, and the slot numbers
@@ -348,18 +348,18 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
 
   /// Structure to specify information used in node merge
   typedef struct {
-    string pred;  // Predecessor node string
-    string succ;  // Successor node string
-    int    op;    // What operand no the predecessor node corresponds
-                  // to successor node?
+    string pred;     // Predecessor node string
+    string succ;     // Successor node string
+    int op;          // What operand no the predecessor node corresponds
+                     // to successor node?
     string newnode;  // Name of the node after merge
   } MergeInfo;
 
   /// Structure to specify the context information used in node rewrite rule
   typedef struct {
-    string node;  // Name of the node to be rewritten
-    string fwd;  // Node name in forward pass that this node
-                 // corresponds to
+    string node;    // Name of the node to be rewritten
+    string fwd;     // Node name in forward pass that this node
+                    // corresponds to
     size_t maxhop;  // Maximum number of hops the fwd is located
                     // from this node. If fwd is farther than maxhop
                     // then we do not rewrite the node.
@@ -418,9 +418,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   inline void MarkRewrittenNode(Node* n) { visited_nodes_.insert(n); }
 
   // Clear all visited nodes
-  inline void UnMarkRewrittenNodes() {
-    visited_nodes_.clear();
-  }
+  inline void UnMarkRewrittenNodes() { visited_nodes_.clear(); }
 
   // Get the name of Mkl op from original TensorFlow op
   // We prefix 'Mkl' to the original op to get Mkl op.
@@ -455,7 +453,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // We check for 2 scenarios for rewrite.
   //
   // @return RewriteInfo* for the applicable rewrite rule
-  const RewriteInfo* CheckForNodeRewrite(const Node *n) const;
+  const RewriteInfo* CheckForNodeRewrite(const Node* n) const;
 
   // Default rewrite rule to be used in scenario 1 for rewrite.
   // @return - true (since we want to always rewrite)
@@ -512,7 +510,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // NodeBuilder 'nb' for the new node provided. If 'orign' does not dictate
   // adding workspace edge then do not add it.
   void AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g, Node* orign,
-      NodeBuilder* nb);
+                                NodeBuilder* nb);
 
   // Functions specific to operators to copy attributes
   // We need operator-specific function to copy attributes because the framework
@@ -528,10 +526,9 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   void GetDummyMklTensorNode(std::unique_ptr<Graph>* g, Node** out,
                              Node* orign);
   void GetDummyWorkspaceTensorNode(std::unique_ptr<Graph>* g, Node** out,
-                             Node* orign);
+                                   Node* orign);
 };
 
-
 std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
 
 // We register Mkl rewrite pass for phase 1 in pre-placement group.
@@ -539,7 +536,6 @@ std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
 REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 1,
                       MklLayoutRewritePass);
 
-
 //////////////////////////////////////////////////////////////////////////
 //           Helper functions for creating new node
 //////////////////////////////////////////////////////////////////////////
@@ -578,13 +574,14 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
                            8);
   TensorShape dummy_shape({8});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                 .Attr("value", proto)
-                 .Attr("dtype", dt)
-                 .Device(orign->def().device())  // We place this node on same
-                                             // device as device of original
-                                             // node.
-                 .Finalize(&**g, out));
+  TF_CHECK_OK(
+      NodeBuilder((*g)->NewName("DMT"), "Const")
+          .Attr("value", proto)
+          .Attr("dtype", dt)
+          .Device(orign->def().device())  // We place this node on same
+                                          // device as device of original
+                                          // node.
+          .Finalize(&**g, out));
   (*out)->set_assigned_device_name(orign->assigned_device_name());
 }
 
@@ -653,29 +650,30 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
   TensorProto proto;
   proto.set_dtype(dt);
   float zero[1] = {0};
-  proto.set_tensor_content(const_cast<const void*>(
-      static_cast<void*>(&zero)), 4);
+  proto.set_tensor_content(const_cast<const void*>(static_cast<void*>(&zero)),
+                           4);
   TensorShape dummy_shape({1});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                 .Attr("value", proto)
-                 .Attr("dtype", dt)
-                 .Device(orign->def().device())  // We place this node on same
-                                             // device as device of original
-                                             // node.
-                 .Finalize(&**g, out));
+  TF_CHECK_OK(
+      NodeBuilder((*g)->NewName("DMT"), "Const")
+          .Attr("value", proto)
+          .Attr("dtype", dt)
+          .Device(orign->def().device())  // We place this node on same
+                                          // device as device of original
+                                          // node.
+          .Finalize(&**g, out));
   (*out)->set_assigned_device_name(orign->assigned_device_name());
 }
 
 void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
-    Node* orign, NodeBuilder* nb) {
+                                                    Node* orign,
+                                                    NodeBuilder* nb) {
   bool workspace_edge_added = false;
   DataType T;
   TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
   for (auto ws : wsinfo_) {
     if (orign->type_string() == ws.fwdop &&
-        mkl_layer_registry::IsMklLayer(
-          GetMklOpName(orign->type_string()), T)) {
+        mkl_layer_registry::IsMklLayer(GetMklOpName(orign->type_string()), T)) {
       // If this op is a fwd op, then we need to check if there is an
       // edge from this node's fwdslot to bwdop's bwdslot. If there is
       // an edge, then we just add an attribute on this node for setting
@@ -701,8 +699,8 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         nb->Attr("workspace_enabled", false);
       }
     } else if (orign->type_string() == ws.bwdop &&
-          mkl_layer_registry::IsMklLayer(
-            GetMklOpName(orign->type_string()), T)) {
+               mkl_layer_registry::IsMklLayer(
+                   GetMklOpName(orign->type_string()), T)) {
       // If this op is a bwd op, then we need to add workspace edge and
       // it's Mkl tensor edge between its corresponding fwd op and this
       // op. Corresponding fwd op is specified in 'fwdop' field of
@@ -721,7 +719,7 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
           // Add workspace edge between fwd op and bwd op.
           nb->Input(e->src(), ws.wsfwdslot);
           // Add Mkl tensor edge for workspace edge between fwd op and bwd op.
-          nb->Input(e->src(), ws.wsfwdslot+1);
+          nb->Input(e->src(), ws.wsfwdslot + 1);
           // In terms of input ordering, we add these calls to add Input
           // here because workspace edge (and its Mkl tensor) is the last
           // edge in the fwdop and bwdop. So all inputs before workspace
@@ -740,17 +738,17 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
       // workspace_enabled to false.
       if (!workspace_edge_added) {
         nb->Attr("workspace_enabled", false);
-        Node* dmt_ws = nullptr;  // Dummy tensor for workspace
+        Node* dmt_ws = nullptr;      // Dummy tensor for workspace
         Node* dmt_mkl_ws = nullptr;  // Dummy Mkl tensor for workspace
         GetDummyWorkspaceTensorNode(g, &dmt_ws, orign);
         GetDummyMklTensorNode(g, &dmt_mkl_ws, orign);
         CHECK_NOTNULL(dmt_ws);
         CHECK_NOTNULL(dmt_mkl_ws);
-        nb->Input(dmt_ws, 0);  // We add dummy tensor as workspace tensor.
+        nb->Input(dmt_ws, 0);      // We add dummy tensor as workspace tensor.
         nb->Input(dmt_mkl_ws, 0);  // We add dummy tensor as Mkl
-                             // tensor for workspace tensor.
+                                   // tensor for workspace tensor.
         VLOG(1) << "MklLayoutRewritePass: dummy workspace_enabled for "
-              << orign->type_string();
+                << orign->type_string();
       }
     } else {
       // If this node does not match any workspace info, then we do not
@@ -763,8 +761,7 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
 // Op-specific functions to copy attributes from old node to new node
 //////////////////////////////////////////////////////////////////////////
 
-void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign,
-    NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
   DataType T;
   string data_format;
   string padding;
@@ -787,7 +784,7 @@ void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign,
 }
 
 void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
-    NodeBuilder* nb) {
+                                                NodeBuilder* nb) {
   DataType T;
   string data_format;
   std::vector<int32> strides;
@@ -804,7 +801,7 @@ void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
 }
 
 void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
-    NodeBuilder* nb) {
+                                            NodeBuilder* nb) {
   DataType T;
   string data_format;
   string padding;
@@ -864,7 +861,7 @@ Node* MklLayoutRewritePass::CheckForNodeMerge(const Node* a) const {
     FillInputs(a, &a_control_edges, &a_in);
 
     // Get operand op of the operator
-    Node *b = nullptr;
+    Node* b = nullptr;
     b = a_in[mi->op].first;
     if (b == nullptr || (b->type_string() != mi->pred)) {
       // NOTE: Should the first check be assert?
@@ -887,8 +884,8 @@ Node* MklLayoutRewritePass::CheckForNodeMerge(const Node* a) const {
   return nullptr;
 }
 
-Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g,
-                                     Node* succ, Node* pred) {
+Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
+                                       Node* pred) {
   CHECK_NOTNULL(succ);
   CHECK_NOTNULL(pred);
 
@@ -906,15 +903,14 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g,
     TF_CHECK_OK(GetNodeAttr(pred->def(), "strides", &strides));
     TF_CHECK_OK(GetNodeAttr(pred->def(), "data_format", &data_format_pred));
     TF_CHECK_OK(GetNodeAttr(succ->def(), "data_format", &data_format_succ));
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "use_cudnn_on_gpu",
-                            &use_cudnn_on_gnu));
+    TF_CHECK_OK(
+        GetNodeAttr(pred->def(), "use_cudnn_on_gpu", &use_cudnn_on_gnu));
     // We check to ensure that data formats of both succ and pred are same.
     // We expect them to be same, so we can enforce this as assert.
     // But assert can be too strict, so we enforce this as a check.
     // If the check fails, then we do not merge two nodes.
     // We also do same check for devices.
-    if (data_format_pred != data_format_succ ||
-        T_pred != T_succ ||
+    if (data_format_pred != data_format_succ || T_pred != T_succ ||
         pred->assigned_device_name() != succ->assigned_device_name() ||
         pred->def().device() != succ->def().device()) {
       return Status(error::Code::INVALID_ARGUMENT,
@@ -940,11 +936,11 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g,
                     "Will skip node merge optimization");
     }
 
-    for (const Edge *e : pred->out_edges()) {
+    for (const Edge* e : pred->out_edges()) {
       if (e->dst() != succ) {
         return Status(error::Code::INVALID_ARGUMENT,
-                    "Conv2D does not feed to BiasAdd."
-                    "Will skip node merge optimization");
+                      "Conv2D does not feed to BiasAdd."
+                      "Will skip node merge optimization");
       }
     }
 
@@ -955,8 +951,8 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g,
     // Get operand 1 of add_bias
     // BiasAdd must have 2 inputs: Conv, bias
     CHECK_EQ(succ->in_edges().size(), 2);
-    Node* oper3_mkl    = nullptr;  // Mkl tensor corresponding to oper3
-    int oper3_mkl_slot = 0;  // For dummy MKL tensor node, output slot is 0.
+    Node* oper3_mkl = nullptr;  // Mkl tensor corresponding to oper3
+    int oper3_mkl_slot = 0;     // For dummy MKL tensor node, output slot is 0.
     GetDummyMklTensorNode(g, &oper3_mkl, succ);  // Get dummy Mkl tensor node
     // as BiasAdd does not have Mkl tensor as input.
     CHECK_NOTNULL(oper3_mkl);
@@ -997,8 +993,8 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g,
     newn->set_assigned_device_name(pred->assigned_device_name());
 
     VLOG(1) << "MklLayoutRewritePass: Merged old node:" << pred->DebugString()
-            << ", and node: " << succ->DebugString() << ", into node:"
-            << newn->DebugString();
+            << ", and node: " << succ->DebugString()
+            << ", into node:" << newn->DebugString();
 
     (*g)->RemoveNode(succ);
     (*g)->RemoveNode(pred);
@@ -1015,8 +1011,8 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g,
 //           Helper functions for node rewrite
 //////////////////////////////////////////////////////////////////////////
 
-Status MklLayoutRewritePass::RewriteNode(
-    std::unique_ptr<Graph>* g, Node* orign, const RewriteInfo* ri) {
+Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
+                                         const RewriteInfo* ri) {
   CHECK_NOTNULL(ri);
   CHECK_NOTNULL(orign);
 
@@ -1044,9 +1040,10 @@ Status MklLayoutRewritePass::RewriteNode(
       if (orig_data_format != ctx_data_format || orig_T != ctx_T ||
           orign->assigned_device_name() != fwdn->assigned_device_name() ||
           orign->def().device() != fwdn->def().device()) {
-        return Status(error::Code::INVALID_ARGUMENT,
-                    "data_format or T attribute or devices of BiasAddGrad and "
-                    "Conv2D do not match. Will skip node rewrite optimization");
+        return Status(
+            error::Code::INVALID_ARGUMENT,
+            "data_format or T attribute or devices of BiasAddGrad and "
+            "Conv2D do not match. Will skip node rewrite optimization");
       }
     }
   }
@@ -1077,7 +1074,7 @@ Status MklLayoutRewritePass::RewriteNode(
       ri->copyattrs(fwdn, &nb);
     } else {
       return Status(error::Code::UNIMPLEMENTED,
-                "Unimplemented case for node rewrite optimization.");
+                    "Unimplemented case for node rewrite optimization.");
     }
   } else {
     ri->copyattrs(const_cast<const Node*>(orign), &nb);
@@ -1106,8 +1103,8 @@ Status MklLayoutRewritePass::RewriteNode(
     if (e->src_output() < 0) {
       (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
     } else {
-      (*g)->AddEdge(newn, GetTensorDataIndex(e->src_output()),
-                  e->dst(), e->dst_input());
+      (*g)->AddEdge(newn, GetTensorDataIndex(e->src_output()), e->dst(),
+                    e->dst_input());
     }
   }
 
@@ -1123,8 +1120,7 @@ Status MklLayoutRewritePass::RewriteNode(
 }
 
 const MklLayoutRewritePass::ContextInfo*
-MklLayoutRewritePass::SearchMatchingContext(const Node* n,
-    const Node** fwdn) {
+MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
   CHECK_NOTNULL(n);
   CHECK_NOTNULL(fwdn);
   *fwdn = nullptr;
@@ -1144,8 +1140,8 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n,
     return nullptr;
   }
 
-  VLOG(1) << "MklLayoutRewritePass: Searching graph for: "
-          << n->type_string() << " in backwards.";
+  VLOG(1) << "MklLayoutRewritePass: Searching graph for: " << n->type_string()
+          << " in backwards.";
 
   // Now we will check for forward op name for context info in data
   // flow graph. Get the max hops we should search for the fwd node.
@@ -1164,13 +1160,12 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n,
     nqueue.pop();
 
     std::set<const Node*> visited_nodes;
-    curr_node  = curr_pair.first;
+    curr_node = curr_pair.first;
     curr_depth = curr_pair.second;
     CHECK_NOTNULL(curr_node);
 
     VLOG(1) << "MklLayoutRewritePass: Visiting node: "
-            << curr_node->type_string()
-            << " at depth: " << curr_depth
+            << curr_node->type_string() << " at depth: " << curr_depth
             << " for node: " << n->type_string();
 
     // If we find a match, we return immediately.
@@ -1186,9 +1181,9 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n,
     for (const Edge* e : curr_node->in_edges()) {
       // We do not visit already visited node.
       if (visited_nodes.find(e->src()) == visited_nodes.end()) {
-         // Depth of these nodes is 1 more than the depth of current node.
-         nqueue.push(std::make_pair(e->src(), curr_depth+1));
-         visited_nodes.insert(e->src());
+        // Depth of these nodes is 1 more than the depth of current node.
+        nqueue.push(std::make_pair(e->src(), curr_depth + 1));
+        visited_nodes.insert(e->src());
       }
     }
   } /* while */
@@ -1202,8 +1197,7 @@ bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n) {
 }
 
 const MklLayoutRewritePass::RewriteInfo*
-MklLayoutRewritePass::CheckForNodeRewrite(
-    const Node *n) const {
+MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
   CHECK_NOTNULL(n);
 
   // First check if node along with its type is supported by MKL layer.
@@ -1238,8 +1232,7 @@ MklLayoutRewritePass::CheckForNodeRewrite(
 //              Run function for the pass
 ///////////////////////////////////////////////////////////////////////////////
 
-bool MklLayoutRewritePass::RunPass(
-    std::unique_ptr<Graph>* g) {
+bool MklLayoutRewritePass::RunPass(std::unique_ptr<Graph>* g) {
   bool result = false;
   CHECK_NOTNULL(g);
 
@@ -1265,22 +1258,21 @@ bool MklLayoutRewritePass::RunPass(
               << " layout optimization.";
 
       if (RewriteNode(g, n, ri) == Status::OK()) {
-          VLOG(1) << "MklLayoutRewritePass: rewrote node "
-                  << node_name << " with op " << op_name
-                  << " for Mkl layout optimization.";
-          result = true;
+        VLOG(1) << "MklLayoutRewritePass: rewrote node " << node_name
+                << " with op " << op_name << " for Mkl layout optimization.";
+        result = true;
       }
     } else if ((predn = CheckForNodeMerge(n)) != nullptr) {
       // Otherwise, we will check if the node is to be merged.
       string n1_name = n->name();
       string n2_name = predn->name();
 
-      VLOG(1) << "MklLayoutRewritePass: Scheduled nodes "
-              << n1_name << " and " << n2_name << " for merging";
+      VLOG(1) << "MklLayoutRewritePass: Scheduled nodes " << n1_name << " and "
+              << n2_name << " for merging";
 
       if (MergeNode(g, n, predn) == Status::OK()) {
-        VLOG(1) << "MklLayoutRewritePass: Merged nodes " << n1_name
-              << " and " << n2_name;
+        VLOG(1) << "MklLayoutRewritePass: Merged nodes " << n1_name << " and "
+                << n2_name;
         result = true;
       }
     }
diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc
index dd7ee45a70..142d60d611 100644
--- a/tensorflow/core/graph/mkl_layout_pass_test.cc
+++ b/tensorflow/core/graph/mkl_layout_pass_test.cc
@@ -18,9 +18,9 @@ limitations under the License.
 #include "tensorflow/core/graph/mkl_layout_pass.h"
 #include "tensorflow/core/util/mkl_util.h"
 
-#include <vector>
-#include <string>
 #include <algorithm>
+#include <string>
+#include <vector>
 
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/tensor.h"
@@ -112,8 +112,7 @@ class MklLayoutPassTest : public ::testing::Test {
 REGISTER_OP("Input").Output("o: float").SetIsStateful();
 REGISTER_OP("HalfInput").Output("o: half").SetIsStateful();
 REGISTER_OP("MklInput").Output("o: uint8").SetIsStateful();
-REGISTER_OP("MklInput2").Output("o: uint8")
-                        .Output("o1: uint8").SetIsStateful();
+REGISTER_OP("MklInput2").Output("o: uint8").Output("o1: uint8").SetIsStateful();
 
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to node merge optiimization
@@ -240,7 +239,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_NoAddBias) {
       " input: ['A', 'M', 'B', 'N']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);M(MklInput);N(MklInput)|"
-             "A->C;B->C:2;M->C:1;N->C:3");
+            "A->C;B->C:2;M->C:1;N->C:3");
 }
 
 // MklConv2D output does not go to BiasAdd.
@@ -372,7 +371,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Negative_NoConv2D) {
       " input: ['D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
+            "A->C;A->D:1;B->C:1;C->D;D->E");
 }
 
 // No Conv2D in the context for BiasAddGrad, but MatMul in context.
@@ -396,7 +395,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Negative_NoConv2D_MatMul) {
       " input: ['D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
+            "A->C;A->D:1;B->C:1;C->D;D->E");
 }
 
 // Test set 3: MatMul..BiasAddGrad -> BiasAddGrad rewrite tests
@@ -419,7 +418,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_MatMulBiasAddGrad_Positive) {
       " input: ['D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
+            "A->C;A->D:1;B->C:1;C->D;D->E");
 }
 
 // No MatMul in the context for BiasAddGrad. No rewrite should happen.
@@ -440,7 +439,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_MatMulBiasAddGrad_Negative_NoMatMul) {
       " input: ['D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
+            "A->C;A->D:1;B->C:1;C->D;D->E");
 }
 
 /////////////////////////////////////////////////////////////////////
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 2097d432be..7c3836b308 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -212,7 +212,7 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
     // Check if src with is Mkl-compliant, while dst is not Mkl-compliant.
 
     if (IsMklSupportedOp(src->type_string(), src_datatype) &&
-       !IsMklSupportedOp(dst->type_string(), dst_datatype)) {
+        !IsMklSupportedOp(dst->type_string(), dst_datatype)) {
       VLOG(1) << "MklToTfConversionPass: Scheduled nodes " << src->name()
               << " and " << dst->name() << " for inserting conversion nodes";
       candidate_edges.push_back(const_cast<Edge*>(e));
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
index 4e211980d7..7d9237f845 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
@@ -17,9 +17,9 @@ limitations under the License.
 
 #include "tensorflow/core/graph/mkl_tfconversion_pass.h"
 
-#include <vector>
-#include <string>
 #include <algorithm>
+#include <string>
+#include <vector>
 
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/tensor.h"
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index d09a3c4e30..bd96e2b33c 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -17,6 +17,7 @@ filegroup(
     srcs = glob(
         [
             "*_optimizer.*",
+            "constant_folding.*",
             "model_pruner.*",
             "graph_rewriter.*",
         ],
@@ -117,6 +118,37 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "memory_optimizer",
+    srcs = ["memory_optimizer.cc"],
+    hdrs = [
+        "memory_optimizer.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":graph_optimizer",
+        ":graph_rewriter",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+    ],
+)
+
+cc_test(
+    name = "memory_optimizer_test",
+    srcs = ["memory_optimizer_test.cc"],
+    deps = [
+        ":memory_optimizer",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+    ],
+)
+
 cc_library(
     name = "layout_optimizer",
     srcs = ["layout_optimizer.cc"],
@@ -144,6 +176,7 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        ":constant_folding",
         ":graph_optimizer",
         ":layout_optimizer",
         ":model_pruner",
diff --git a/tensorflow/core/grappler/optimizers/constant_folding.cc b/tensorflow/core/grappler/optimizers/constant_folding.cc
index 7cddedef2e..8f79c55810 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding.cc
+++ b/tensorflow/core/grappler/optimizers/constant_folding.cc
@@ -72,8 +72,7 @@ class DeviceSimple : public DeviceBase {
                              Tensor* tensor) override {
     Tensor parsed(tensor_proto.dtype());
     if (!parsed.FromProto(cpu_allocator(), tensor_proto)) {
-      return errors::InvalidArgument("Cannot parse tensor from proto: ",
-                                     tensor_proto.DebugString());
+      return errors::InvalidArgument("Cannot parse tensor from tensor_proto.");
     }
     *tensor = parsed;
     return Status::OK();
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer.cc b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
new file mode 100644
index 0000000000..24c6ab12ef
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
@@ -0,0 +1,83 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
+#include <unordered_set>
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/optimizers/graph_rewriter.h"
+#include "tensorflow/core/grappler/utils.h"
+
+namespace tensorflow {
+namespace grappler {
+
+std::pair<NodeDef*, NodeDef*> BuildSwapPair(NodeDef* node, int input_to_swap,
+                                            GraphDef* graph) {
+  string tensor_to_swap = strings::StrCat(node->name(), "_", input_to_swap);
+
+  // Force the tensor to be copied to cpu.
+  NodeDef* swap_out_node = graph->add_node();
+  swap_out_node->set_name(strings::StrCat("swap_out_", tensor_to_swap));
+  swap_out_node->set_op("Identity");
+  swap_out_node->set_device("/CPU");
+
+  // Force the tensor to be restored to the device.
+  NodeDef* swap_in_node = graph->add_node();
+  swap_in_node->set_name(strings::StrCat("swap_in_", tensor_to_swap));
+  swap_in_node->set_op("Identity");
+  *swap_in_node->add_input() = swap_out_node->name();
+
+  // Colocate the swap_in_ node with the node itself.
+  string coloc_group = strings::StrCat("loc@", tensor_to_swap);
+  (*swap_in_node->mutable_attr())["_class"].mutable_list()->add_s(coloc_group);
+  (*node->mutable_attr())["_class"].mutable_list()->add_s(coloc_group);
+
+  return std::make_pair(swap_out_node, swap_in_node);
+}
+
+Status MemoryOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
+                                 GraphDef* optimized_graph) {
+  *optimized_graph = item.graph;
+
+  for (auto& node : *optimized_graph->mutable_node()) {
+    if (node.attr().count("swap_to_host") == 0) {
+      continue;
+    }
+
+    // Swap all the tensors that are marked with the 'swap_to_host' attribute.
+    for (int input_id : node.attr().at("swap_to_host").list().i()) {
+      std::pair<NodeDef*, NodeDef*> swap_nodes =
+          BuildSwapPair(&node, input_id, optimized_graph);
+      *swap_nodes.first->add_input() = node.input(input_id);
+      *node.mutable_input(input_id) = swap_nodes.second->name();
+
+      // TODO(bsteiner): Make sure the tensor isn't swapped back in right away
+      // by adding a control dependency to delay the execution of the swap.
+      // string trigger;
+      //*swap_nodes.second->add_input() = strings::StrCat("^", trigger);
+    }
+  }
+
+  return Status::OK();
+}
+
+void MemoryOptimizer::Feedback(Cluster* cluster, const GrapplerItem& item,
+                               const GraphDef& optimized_graph, double result) {
+  // Nothing to do for MemoryOptimizer.
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer.h b/tensorflow/core/grappler/optimizers/memory_optimizer.h
new file mode 100644
index 0000000000..463067738b
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer.h
@@ -0,0 +1,42 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
+#define TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
+
+#include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Swap tensors in and out of device memory.
+class MemoryOptimizer : public GraphOptimizer {
+ public:
+  MemoryOptimizer() {}
+  ~MemoryOptimizer() override {}
+
+  string name() const override { return "memory_optimizer"; };
+
+  Status Optimize(Cluster* cluster, const GrapplerItem& item,
+                  GraphDef* pruned_graph) override;
+
+  void Feedback(Cluster* cluster, const GrapplerItem& item,
+                const GraphDef& pruned_graph, double result) override;
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
new file mode 100644
index 0000000000..9defa72cff
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
@@ -0,0 +1,74 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class MemoryOptimizerTest : public ::testing::Test {};
+
+TEST_F(MemoryOptimizerTest, SimpleSwapping) {
+  // Build a simple graph with an op that's marked for swapping.
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+
+  Output a = ops::Const(s.WithOpName("a"), 0.0f, {10, 10});
+  Output b = ops::AddN(s.WithOpName("b"), {a});
+  Output c = ops::AddN(s.WithOpName("c"), {b});
+  Output d = ops::AddN(s.WithOpName("d"), {c});
+  Output e = ops::AddN(s.WithOpName("e"), {b, d});
+
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+
+  EXPECT_EQ(5, item.graph.node_size());
+  EXPECT_EQ(NodeName(e.name()), item.graph.node(4).name());
+  AttrValue& val =
+      (*item.graph.mutable_node(4)->mutable_attr())["swap_to_host"];
+  val.mutable_list()->add_i(0);
+
+  MemoryOptimizer optimizer;
+  GraphDef output;
+  Status status = optimizer.Optimize(nullptr, item, &output);
+  TF_EXPECT_OK(status);
+
+  EXPECT_EQ(7, output.node_size());
+  const NodeDef& new_e = output.node(4);
+  EXPECT_EQ(NodeName(e.name()), new_e.name());
+
+  EXPECT_EQ(2, new_e.input_size());
+  EXPECT_EQ(NodeName(d.name()), new_e.input(1));
+  EXPECT_EQ("swap_in_e_0", new_e.input(0));
+
+  const NodeDef& swap_out = output.node(5);
+  EXPECT_EQ("swap_out_e_0", swap_out.name());
+
+  const NodeDef& swap_in = output.node(6);
+  EXPECT_EQ("swap_in_e_0", swap_in.name());
+
+  EXPECT_EQ(NodeName(b.name()), swap_out.input(0));
+  EXPECT_EQ(NodeName(swap_out.name()), swap_in.input(0));
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 44a1f5bab9..67ffa7a4b6 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -14,6 +14,9 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
+#include "tensorflow/core/framework/versions.pb.h"
+#include "tensorflow/core/grappler/optimizers/constant_folding.h"
+#include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/model_pruner.h"
 #include "tensorflow/core/lib/core/status.h"
@@ -21,25 +24,67 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+std::unique_ptr<GraphOptimizer> MetaOptimizer::NewOptimizer(
+    const string& optimizer) {
+  VLOG(1) << "Adding graph optimization pass: " << optimizer;
+  std::unique_ptr<GraphOptimizer> graph_optimizer;
+  if (optimizer == "pruning") {
+    graph_optimizer.reset(new ModelPruner());
+  }
+  if (optimizer == "constfold") {
+    graph_optimizer.reset(new ConstantFolding());
+  }
+  if (optimizer == "layout") {
+    graph_optimizer.reset(new LayoutOptimizer());
+  }
+  return graph_optimizer;
+}
+
 Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
                                GraphDef* optimized_graph) {
-  bool already_optimized = false;
-  if (!cfg_.disable_model_pruning()) {
-    already_optimized = true;
-    ModelPruner pruner;
-    TF_RETURN_IF_ERROR(pruner.Optimize(nullptr, item, optimized_graph));
+  std::vector<std::unique_ptr<GraphOptimizer>> optimizers;
+  if (cfg_.optimizers().empty()) {
+    if (!cfg_.disable_model_pruning()) {
+      optimizers.push_back(std::unique_ptr<GraphOptimizer>(new ModelPruner()));
+    }
+    if (cfg_.constant_folding()) {
+      optimizers.push_back(
+          std::unique_ptr<GraphOptimizer>(new ConstantFolding()));
+    }
+    if (cfg_.optimize_tensor_layout()) {
+      optimizers.push_back(
+          std::unique_ptr<GraphOptimizer>(new LayoutOptimizer()));
+    }
+  } else {
+    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout"};
+    for (const auto& optimizer : cfg_.optimizers()) {
+      if (avaliable_optimizers.find(optimizer) != avaliable_optimizers.end()) {
+        optimizers.push_back(NewOptimizer(optimizer));
+      }
+    }
+  }
+
+  if (optimizers.empty()) {
+    *optimized_graph = item.graph;
+    return Status::OK();
   }
-  if (cfg_.optimize_tensor_layout()) {
-    LayoutOptimizer layout_optimizer;
+
+  bool already_optimized = false;
+  for (const auto& optimizer : optimizers) {
     if (!already_optimized) {
-      return layout_optimizer.Optimize(nullptr, item, optimized_graph);
+      TF_RETURN_IF_ERROR(optimizer->Optimize(nullptr, item, optimized_graph));
+      already_optimized = true;
     } else {
       GrapplerItem optimized_item = item;
       optimized_item.graph = *optimized_graph;
-      return layout_optimizer.Optimize(nullptr, optimized_item,
-                                       optimized_graph);
+      TF_RETURN_IF_ERROR(
+          optimizer->Optimize(nullptr, optimized_item, optimized_graph));
     }
   }
+
+  // Copy the graph version.
+  *optimized_graph->mutable_versions() = item.graph.versions();
+
   return Status::OK();
 }
 
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.h b/tensorflow/core/grappler/optimizers/meta_optimizer.h
index d7ff03f590..9def2cd711 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.h
@@ -39,6 +39,7 @@ class MetaOptimizer : public GraphOptimizer {
                 const GraphDef& optimized_graph, double result) override;
 
  private:
+  std::unique_ptr<GraphOptimizer> NewOptimizer(const string& optimizer);
   RewriterConfig cfg_;
 };
 
diff --git a/tensorflow/core/kernels/conv_grad_filter_ops.cc b/tensorflow/core/kernels/conv_grad_filter_ops.cc
index a59277f18e..20394cad43 100644
--- a/tensorflow/core/kernels/conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/conv_grad_filter_ops.cc
@@ -99,25 +99,26 @@ struct LaunchXsmmBackwardFilter {
                   typename TTypes<T, 4>::Tensor kernel,
                   typename TTypes<T, 4>::ConstTensor output_backward,
                   int input_rows, int input_cols, int row_stride,
-                  int col_stride, int pad_h, int pad_w, TensorFormat data_format) const {
+                  int col_stride, int pad_h, int pad_w,
+                  TensorFormat data_format) const {
     return false;
   }
 };
- 
+
 template <>
 struct LaunchXsmmBackwardFilter<CPUDevice, float> {
   bool operator()(OpKernelContext* context, const CPUDevice& d,
                   typename TTypes<float, 4>::ConstTensor input,
                   typename TTypes<float, 4>::Tensor filter,
-                  typename TTypes<float, 4>::ConstTensor output,
-                  int input_rows, int input_cols, int row_stride,
-                  int col_stride,int pad_h, int pad_w,  TensorFormat data_format) const {
+                  typename TTypes<float, 4>::ConstTensor output, int input_rows,
+                  int input_cols, int row_stride, int col_stride, int pad_h,
+                  int pad_w, TensorFormat data_format) const {
     auto batch = input.dimension(0);
     auto in_depth = input.dimension(3);
     auto out_depth = output.dimension(3);
     auto filter_rows = filter.dimension(0);
     auto filter_cols = filter.dimension(1);
- 
+
     auto num_threads =
         context->device()->tensorflow_cpu_worker_threads()->num_threads;
     // See libxsmm_dnn.h for this struct definition.
@@ -144,13 +145,11 @@ struct LaunchXsmmBackwardFilter<CPUDevice, float> {
     desc.fuse_ops = LIBXSMM_DNN_CONV_FUSE_NONE;
     desc.options = LIBXSMM_DNN_CONV_OPTION_NONE;
     desc.datatype = LIBXSMM_DNN_DATATYPE_F32;
- 
- 
+
     if (!CanUseXsmmConv2D(desc, data_format)) {
       return false;
     }
- 
- 
+
     auto input_ptr = input.data();
     auto filter_ptr = filter.data();
     auto output_ptr = output.data();
@@ -161,8 +160,6 @@ struct LaunchXsmmBackwardFilter<CPUDevice, float> {
 };
 #endif
 
-
-
 template <typename Device, class T>
 class Conv2DFastBackpropFilterOp : public OpKernel {
  public:
@@ -210,8 +207,7 @@ class Conv2DFastBackpropFilterOp : public OpKernel {
     OP_REQUIRES_OK(context,
                    context->allocate_output(0, filter_shape, &filter_backprop));
 
-    #if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
- 
+#if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
     int64 pad_top, pad_bottom;
     int64 pad_left, pad_right;
     OP_REQUIRES_OK(
@@ -226,22 +222,20 @@ class Conv2DFastBackpropFilterOp : public OpKernel {
             dims.spatial_dims[1].input_size, dims.spatial_dims[1].filter_size,
             dims.spatial_dims[1].stride, padding_,
             &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
- 
-    if ( pad_left == pad_right && pad_top == pad_bottom ) {
- 
+
+    if (pad_left == pad_right && pad_top == pad_bottom) {
       if (LaunchXsmmBackwardFilter<Device, T>()(
-            context, context->eigen_device<Device>(),
-            input.tensor<T, 4>(),filter_backprop->tensor<T, 4>(),
-            out_backprop.tensor<T, 4>(),  dims.spatial_dims[0].input_size,
-            dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
-            (int)dims.spatial_dims[1].stride,(int)pad_top, (int)pad_left, data_format_)) {
-      return;
+              context, context->eigen_device<Device>(), input.tensor<T, 4>(),
+              filter_backprop->tensor<T, 4>(), out_backprop.tensor<T, 4>(),
+              dims.spatial_dims[0].input_size, dims.spatial_dims[1].input_size,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
+              data_format_)) {
+        return;
       }
     }
-    #endif
-
-
-
+#endif
 
     functor::SpatialConvolutionBackwardKernel<Device, T>()(
         context->eigen_device<Device>(), filter_backprop->tensor<T, 4>(),
@@ -321,19 +315,20 @@ class Conv2DCustomBackpropFilterOp : public OpKernel {
             dims.spatial_dims[1].input_size, dims.spatial_dims[1].filter_size,
             dims.spatial_dims[1].stride, padding_,
             &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
-  #if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
-    if ( pad_left == pad_right && pad_top == pad_bottom ) {
- 
+#if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
+    if (pad_left == pad_right && pad_top == pad_bottom) {
       if (LaunchXsmmBackwardFilter<Device, T>()(
-            context, context->eigen_device<Device>(),
-            input.tensor<T, 4>(),filter_backprop->tensor<T, 4>(),
-            out_backprop.tensor<T, 4>(),  dims.spatial_dims[0].input_size,
-            dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
-            (int)dims.spatial_dims[1].stride,(int)pad_top, (int)pad_left, data_format_)) {
-      return;
+              context, context->eigen_device<Device>(), input.tensor<T, 4>(),
+              filter_backprop->tensor<T, 4>(), out_backprop.tensor<T, 4>(),
+              dims.spatial_dims[0].input_size, dims.spatial_dims[1].input_size,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
+              data_format_)) {
+        return;
       }
     }
-  #endif
+#endif
 
     // The total dimension size of each kernel.
     const int filter_total_size = dims.spatial_dims[0].filter_size *
diff --git a/tensorflow/core/kernels/conv_grad_input_ops.cc b/tensorflow/core/kernels/conv_grad_input_ops.cc
index 7e0912b4db..9a50431a2f 100644
--- a/tensorflow/core/kernels/conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/conv_grad_input_ops.cc
@@ -131,7 +131,8 @@ struct LaunchXsmmBackwardInputConvolution {
                   typename TTypes<T, 4>::ConstTensor kernel,
                   typename TTypes<T, 4>::ConstTensor output_backward,
                   int input_rows, int input_cols, int row_stride,
-                  int col_stride, int pad_h, int pad_w, TensorFormat data_format) const {
+                  int col_stride, int pad_h, int pad_w,
+                  TensorFormat data_format) const {
     return false;
   }
 };
@@ -143,7 +144,8 @@ struct LaunchXsmmBackwardInputConvolution<CPUDevice, float> {
                   typename TTypes<float, 4>::ConstTensor kernel,
                   typename TTypes<float, 4>::ConstTensor output_backward,
                   int input_rows, int input_cols, int row_stride,
-                  int col_stride, int pad_h, int pad_w, TensorFormat data_format) const {
+                  int col_stride, int pad_h, int pad_w,
+                  TensorFormat data_format) const {
     auto batch = input_backward.dimension(0);
     auto in_depth = input_backward.dimension(3);
     auto out_depth = output_backward.dimension(3);
@@ -251,13 +253,16 @@ class Conv2DFastBackpropInputOp : public OpKernel {
             dims.spatial_dims[1].stride, padding_,
             &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
 
-    if ( pad_left == pad_right && pad_top == pad_bottom ) {
+    if (pad_left == pad_right && pad_top == pad_bottom) {
       if (LaunchXsmmBackwardInputConvolution<Device, T>()(
-            context, context->eigen_device<Device>(),
-            in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
-            out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
-            dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
-            (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left, data_format_)) {
+              context, context->eigen_device<Device>(),
+              in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
+              out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
+              dims.spatial_dims[1].input_size,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
+              data_format_)) {
         return;
       }
     }
@@ -326,8 +331,8 @@ class Conv2DCustomBackpropInputOp : public OpKernel {
     OP_REQUIRES_OK(context,
                    context->allocate_output(0, input_shape, &in_backprop));
 
-    // TODO(andydavis) Consider moving code shared with
-    // Conv2DCustomBackpropFilterOp into a shared helper function.
+// TODO(andydavis) Consider moving code shared with
+// Conv2DCustomBackpropFilterOp into a shared helper function.
 #if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
     int64 pad_top, pad_bottom;
     int64 pad_left, pad_right;
@@ -344,13 +349,16 @@ class Conv2DCustomBackpropInputOp : public OpKernel {
             dims.spatial_dims[1].stride, padding_,
             &dims.spatial_dims[1].output_size, &pad_left, &pad_right));
 
-    if ( pad_left == pad_right && pad_top == pad_bottom ) {
+    if (pad_left == pad_right && pad_top == pad_bottom) {
       if (LaunchXsmmBackwardInputConvolution<Device, T>()(
-            context, context->eigen_device<Device>(),
-            in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
-            out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
-            dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
-            (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left, data_format_)) {
+              context, context->eigen_device<Device>(),
+              in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
+              out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
+              dims.spatial_dims[1].input_size,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
+              data_format_)) {
         return;
       }
     }
diff --git a/tensorflow/core/kernels/cudnn_pooling_gpu.cc b/tensorflow/core/kernels/cudnn_pooling_gpu.cc
index 93efc93957..5939ecdf62 100644
--- a/tensorflow/core/kernels/cudnn_pooling_gpu.cc
+++ b/tensorflow/core/kernels/cudnn_pooling_gpu.cc
@@ -243,11 +243,10 @@ void DnnPooling3dGradOp<T>::Compute(
   }
 }
 
-#define DEFINE_DNN_OPS(T)                       \
-  template class DnnPooling3dOp<T>;               \
+#define DEFINE_DNN_OPS(T)           \
+  template class DnnPooling3dOp<T>; \
   template class DnnPooling3dGradOp<T>;
-TF_CALL_float(DEFINE_DNN_OPS)
-TF_CALL_half(DEFINE_DNN_OPS)
+TF_CALL_float(DEFINE_DNN_OPS) TF_CALL_half(DEFINE_DNN_OPS)
 #undef DEFINE_DNN_OPS
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/maxpooling_op.cc b/tensorflow/core/kernels/maxpooling_op.cc
index 3a0f19ffb0..eb590280c9 100644
--- a/tensorflow/core/kernels/maxpooling_op.cc
+++ b/tensorflow/core/kernels/maxpooling_op.cc
@@ -295,8 +295,8 @@ static void MaxPoolingBackwardCustomKernel(
       params.tensor_in_rows, params.tensor_in_cols, params.depth,
       params.out_height, params.out_width, params.window_rows,
       params.window_cols, params.row_stride, params.col_stride, params.pad_rows,
-      params.pad_cols, out_backprop.flat<T>().data(),
-      output->flat<T>().data(), context->eigen_device<Eigen::GpuDevice>());
+      params.pad_cols, out_backprop.flat<T>().data(), output->flat<T>().data(),
+      context->eigen_device<Eigen::GpuDevice>());
 }
 
 template <class T>
@@ -474,8 +474,7 @@ class MaxPoolingGradGradOp : public OpKernel {
     //    tensor_out_as_matrix with the corresponding values in
     //    top_diff_as_matrix.
     auto shard = [&params, &in_mat, &out_mat, &top_diff_mat, &bottom_diff_mat](
-        int64 start, int64 limit) {
-
+                     int64 start, int64 limit) {
       const int32 depth = params.depth;
       const int32 in_rows = params.tensor_in_rows;
       const int32 in_cols = params.tensor_in_cols;
@@ -1010,38 +1009,34 @@ TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_MAX_POOL_KERNELS);
 // default Eigen implementation so we are using the custom kernel as the
 // default. However, you can explicitly invoke the eigen version using
 // kernel_label_map.
-#define REGISTER_GPU_ONLY_POOL_KERNELS(T)                        \
-  REGISTER_KERNEL_BUILDER(                                       \
-      Name("MaxPool")                                            \
-          .Device(DEVICE_GPU)                                    \
-          .TypeConstraint<T>("T")                                \
-          .Label("eigen_tensor"),                                \
-      MaxPoolingOp<GPUDevice, T>);                               \
-  REGISTER_KERNEL_BUILDER(                                       \
-      Name("MaxPool").Device(DEVICE_GPU).TypeConstraint<T>("T"), \
-      MaxPoolingNoMaskOp<GPUDevice, T>);                         \
-  REGISTER_KERNEL_BUILDER(                                       \
-      Name("MaxPoolWithArgmax")                                  \
-          .Device(DEVICE_GPU)                                    \
-          .TypeConstraint<int64>("Targmax")                      \
-          .TypeConstraint<T>("T"),                               \
-      MaxPoolingWithArgmaxOp<GPUDevice, T>);                     \
-  REGISTER_KERNEL_BUILDER(                                       \
-      Name("MaxPoolGradWithArgmax")                              \
-          .Device(DEVICE_GPU)                                    \
-          .TypeConstraint<T>("T")                                \
-          .TypeConstraint<int64>("Targmax"),                     \
-      MaxPoolingGradWithArgmaxOp<GPUDevice, T>);                 \
-  REGISTER_KERNEL_BUILDER(                                       \
-      Name("MaxPoolGradGradWithArgmax")                          \
-          .Device(DEVICE_GPU)                                    \
-          .TypeConstraint<T>("T")                                \
-          .TypeConstraint<int64>("Targmax"),                     \
-      MaxPoolingGradGradWithArgmaxOp<GPUDevice, T>);
+#define REGISTER_GPU_ONLY_POOL_KERNELS(T)                            \
+  REGISTER_KERNEL_BUILDER(Name("MaxPool")                            \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<T>("T")                \
+                              .Label("eigen_tensor"),                \
+                          MaxPoolingOp<GPUDevice, T>);               \
+  REGISTER_KERNEL_BUILDER(                                           \
+      Name("MaxPool").Device(DEVICE_GPU).TypeConstraint<T>("T"),     \
+      MaxPoolingNoMaskOp<GPUDevice, T>);                             \
+  REGISTER_KERNEL_BUILDER(Name("MaxPoolWithArgmax")                  \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<int64>("Targmax")      \
+                              .TypeConstraint<T>("T"),               \
+                          MaxPoolingWithArgmaxOp<GPUDevice, T>);     \
+  REGISTER_KERNEL_BUILDER(Name("MaxPoolGradWithArgmax")              \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<T>("T")                \
+                              .TypeConstraint<int64>("Targmax"),     \
+                          MaxPoolingGradWithArgmaxOp<GPUDevice, T>); \
+  REGISTER_KERNEL_BUILDER(Name("MaxPoolGradGradWithArgmax")          \
+                              .Device(DEVICE_GPU)                    \
+                              .TypeConstraint<T>("T")                \
+                              .TypeConstraint<int64>("Targmax"),     \
+                          MaxPoolingGradGradWithArgmaxOp<GPUDevice, T>);
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_ONLY_POOL_KERNELS);
 #undef REGISTER_GPU_ONLY_POOL_KERNELS
 
-#endif // GOOGLE_CUDA
+#endif  // GOOGLE_CUDA
 
 #undef REGISTER_MAX_POOL_KERNELS
 
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
index 5462c6401d..32b210ecb7 100644
--- a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
@@ -333,11 +333,11 @@ namespace functor {
 
 template <typename T>
 bool MaxPoolForwardWithOptionalArgmax<T>::operator()(
-    const T* bottom_data, const int batch, const int height,
-    const int width, const int channels, const int pooled_height,
-    const int pooled_width, const int kernel_h, const int kernel_w,
-    const int stride_h, const int stride_w, const int pad_t, const int pad_l,
-    T* top_data, int64* mask, const Eigen::GpuDevice& d) {
+    const T* bottom_data, const int batch, const int height, const int width,
+    const int channels, const int pooled_height, const int pooled_width,
+    const int kernel_h, const int kernel_w, const int stride_h,
+    const int stride_w, const int pad_t, const int pad_l, T* top_data,
+    int64* mask, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
   const int output_size = batch * channels * pooled_height * pooled_width;
 
@@ -351,14 +351,11 @@ bool MaxPoolForwardWithOptionalArgmax<T>::operator()(
 
 template <typename T>
 bool MaxPoolBackwardNoMask<T>::operator()(
-    const T* bottom_data, const int batch,
-    const int height, const int width,
-    const int channels, const int pooled_height,
-    const int pooled_width, const int kernel_h,
-    const int kernel_w, const int stride_h,
-    const int stride_w, const int pad_t, const int pad_l,
-    const T* top_diff, T* bottom_diff,
-    const Eigen::GpuDevice& d) {
+    const T* bottom_data, const int batch, const int height, const int width,
+    const int channels, const int pooled_height, const int pooled_width,
+    const int kernel_h, const int kernel_w, const int stride_h,
+    const int stride_w, const int pad_t, const int pad_l, const T* top_diff,
+    T* bottom_diff, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
   const int bottom_size = batch * channels * height * width;
   const int top_size = batch * channels * pooled_height * pooled_width;
@@ -377,9 +374,8 @@ bool MaxPoolBackwardNoMask<T>::operator()(
 
 template <typename T>
 bool MaxPoolBackwardWithArgmax<T>::operator()(
-    const int output_size, const int input_size,
-    const T* top_diff, const int64* mask,
-    const int top_offset, const int bottom_offset,
+    const int output_size, const int input_size, const T* top_diff,
+    const int64* mask, const int top_offset, const int bottom_offset,
     T* bottom_diff, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
   SetZero<<<(input_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.h b/tensorflow/core/kernels/maxpooling_op_gpu.h
index 99e2b73d0c..d2029f5719 100644
--- a/tensorflow/core/kernels/maxpooling_op_gpu.h
+++ b/tensorflow/core/kernels/maxpooling_op_gpu.h
@@ -36,38 +36,36 @@ template <typename T>
 struct MaxPoolForwardWithOptionalArgmax {
   bool operator()(const T* bottom_data, const int batch, const int height,
                   const int width, const int channels, const int pooled_height,
-                  const int pooled_width, const int kernel_h, const int kernel_w,
-                  const int stride_h, const int stride_w, const int pad_t, const int pad_l,
-                  T* top_data, int64* mask, const Eigen::GpuDevice& d);
+                  const int pooled_width, const int kernel_h,
+                  const int kernel_w, const int stride_h, const int stride_w,
+                  const int pad_t, const int pad_l, T* top_data, int64* mask,
+                  const Eigen::GpuDevice& d);
 };
 
-
 template <typename T>
 struct MaxPoolBackwardWithArgmax {
   bool operator()(const int output_size, const int input_size,
-                  const T* top_diff, const int64* mask,
-                  const int top_offset, const int bottom_offset,
-                  T* bottom_diff, const Eigen::GpuDevice& d);
+                  const T* top_diff, const int64* mask, const int top_offset,
+                  const int bottom_offset, T* bottom_diff,
+                  const Eigen::GpuDevice& d);
 };
 
 template <typename T>
 struct MaxPoolBackwardNoMask {
-  bool operator()(const T* bottom_data, const int batch,
-                  const int height, const int width,
-                  const int channels, const int pooled_height,
+  bool operator()(const T* bottom_data, const int batch, const int height,
+                  const int width, const int channels, const int pooled_height,
                   const int pooled_width, const int kernel_h,
-                  const int kernel_w, const int stride_h,
-                  const int stride_w, const int pad_t, const int pad_l,
-                  const T* top_diff, T* bottom_diff,
-                  const Eigen::GpuDevice& d);
+                  const int kernel_w, const int stride_h, const int stride_w,
+                  const int pad_t, const int pad_l, const T* top_diff,
+                  T* bottom_diff, const Eigen::GpuDevice& d);
 };
 
 template <typename T>
 struct MaxPoolGradBackwardWithArgmax {
   bool operator()(const int output_size, const int input_size,
-                  const T* top_diff, const int64* mask,
-                  const int top_offset, const int bottom_offset,
-                  T* bottom_diff, const Eigen::GpuDevice& d);
+                  const T* top_diff, const int64* mask, const int top_offset,
+                  const int bottom_offset, T* bottom_diff,
+                  const Eigen::GpuDevice& d);
 };
 
 template <typename T>
@@ -75,12 +73,10 @@ struct MaxPoolGradBackwardNoMask {
   bool operator()(TensorFormat data_format, const T* bottom_data,
                   const T* output_data, const int batch,
                   const int pooled_height, const int pooled_width,
-                  const int channels, const int height,
-                  const int width, const int kernel_h,
-                  const int kernel_w, const int stride_h,
+                  const int channels, const int height, const int width,
+                  const int kernel_h, const int kernel_w, const int stride_h,
                   const int stride_w, const int pad_t, const int pad_l,
-                  const T* top_diff, T* bottom_diff,
-                  const Eigen::GpuDevice& d);
+                  const T* top_diff, T* bottom_diff, const Eigen::GpuDevice& d);
 };
 
 }  // namespace functor
diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
index f1f6a9ce53..71918fe269 100644
--- a/tensorflow/core/kernels/mkl_avgpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -336,10 +336,11 @@ class MklAvgPoolingGradOp : public OpKernel {
       if (!outbackprop_in_mkl_format) {
         // For avgpooling, tensor_in_shape should have 1 dimension, and 4
         // elements.
-        OP_REQUIRES(context, tensor_in_shape.dims() == 1 &&
-                                 tensor_in_shape.NumElements() == 4,
-                    errors::InvalidArgument("original input shape must be "
-                                            "1-dimensional and 4 elements"));
+        OP_REQUIRES(
+            context,
+            tensor_in_shape.dims() == 1 && tensor_in_shape.NumElements() == 4,
+            errors::InvalidArgument("original input shape must be "
+                                    "1-dimensional and 4 elements"));
 
         // For avgpooling, out_backprop should have 4 dimensions.
         OP_REQUIRES(context, out_backprop.dims() == 4,
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
index 90b9f7ba90..627fd83b0d 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -38,9 +38,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
-#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
index 266f433e70..85198d89f5 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -37,9 +37,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
-#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index c5ebe8024e..c7d95c86bc 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -23,6 +23,8 @@ limitations under the License.
 #define EIGEN_USE_THREADS
 #include <algorithm>
 #include <vector>
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -40,8 +42,6 @@ limitations under the License.
 #include "tensorflow/core/util/tensor_format.h"
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
-#include "third_party/mkl/include/mkl_dnn.h"
-#include "third_party/mkl/include/mkl_dnn_types.h"
 
 namespace tensorflow {
 
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index acd37786ff..e5c4c21a10 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -107,10 +107,10 @@ class MklConv2DOp : public OpKernel {
     const int64 input_depth =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'C')
                             : GetTensorDim(input, data_format_, 'C');
-    OP_REQUIRES(
-        context, input_depth == filter.dim_size(2),
-        errors::InvalidArgument("input and filter must have the same depth: ",
-                                input_depth, " vs ", filter.dim_size(2)));
+    OP_REQUIRES(context, input_depth == filter.dim_size(2),
+                errors::InvalidArgument(
+                    "input and filter must have the same depth: ", input_depth,
+                    " vs ", filter.dim_size(2)));
     // The last dimension for filter is out_depth.
     const int out_depth = static_cast<int>(filter.dim_size(3));
 
@@ -119,9 +119,10 @@ class MklConv2DOp : public OpKernel {
     const int64 input_rows_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'H')
                             : GetTensorDim(input, data_format_, 'H');
-    OP_REQUIRES(context, FastBoundsCheck(input_rows_raw,
-                                         std::numeric_limits<int>::max()),
-                errors::InvalidArgument("Input rows too large"));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(input_rows_raw, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("Input rows too large"));
     const int input_rows = static_cast<int>(input_rows_raw);
     const int filter_rows = static_cast<int>(filter.dim_size(0));
 
@@ -130,9 +131,10 @@ class MklConv2DOp : public OpKernel {
     const int64 input_cols_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'W')
                             : GetTensorDim(input, data_format_, 'W');
-    OP_REQUIRES(context, FastBoundsCheck(input_cols_raw,
-                                         std::numeric_limits<int>::max()),
-                errors::InvalidArgument("Input cols too large"));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(input_cols_raw, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("Input cols too large"));
     const int input_cols = static_cast<int>(input_cols_raw);
     const int filter_cols = static_cast<int>(filter.dim_size(1));
 
@@ -140,9 +142,10 @@ class MklConv2DOp : public OpKernel {
     const int64 input_batch_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'N')
                             : GetTensorDim(input, data_format_, 'N');
-    OP_REQUIRES(context, FastBoundsCheck(input_batch_raw,
-                                         std::numeric_limits<int>::max()),
-                errors::InvalidArgument("batch is too large"));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(input_batch_raw, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("batch is too large"));
     const int batch = static_cast<int>(input_batch_raw);
 
     // For now we take the stride from the second and third dimensions only (we
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index 7e3efdcc06..9d6cfb0c97 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -393,18 +393,19 @@ class MklMaxPoolingGradOp : public OpKernel {
       if (workspace_enabled == false) {
         if (convert_input != nullptr) {
           if (input_in_mkl_format == false) {
-            CHECK_EQ(
-                dnnConversionExecute_F32(
-                    convert_input, const_cast<void*>(static_cast<const void*>(
-                                       tensor_in.flat<T>().data())),
-                    input_buf),
-                E_SUCCESS);
+            CHECK_EQ(dnnConversionExecute_F32(
+                         convert_input,
+                         const_cast<void*>(static_cast<const void*>(
+                             tensor_in.flat<T>().data())),
+                         input_buf),
+                     E_SUCCESS);
             CHECK_EQ(dnnDelete_F32(convert_input), E_SUCCESS);
             convert_input = nullptr;
           } else {
             input_shape.GetConvertedFlatData(
-                lt_input_prim, const_cast<void*>(static_cast<const void*>(
-                                   tensor_in.flat<T>().data())),
+                lt_input_prim,
+                const_cast<void*>(
+                    static_cast<const void*>(tensor_in.flat<T>().data())),
                 input_buf);
           }
           pooling_resfwd[dnnResourceSrc] = input_buf;
@@ -449,8 +450,9 @@ class MklMaxPoolingGradOp : public OpKernel {
           CHECK_EQ(dnnDelete_F32(convert_outbackprop), E_SUCCESS);
         } else {
           output_backprop_shape.GetConvertedFlatData(
-              lt_outbackprop_prim, const_cast<void*>(static_cast<const void*>(
-                                       out_backprop.flat<T>().data())),
+              lt_outbackprop_prim,
+              const_cast<void*>(
+                  static_cast<const void*>(out_backprop.flat<T>().data())),
               outbackprop_buf);
         }
         pooling_res[dnnResourceDiffDst] = outbackprop_buf;
diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.cc b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
index 3eb472d7e3..d88bd4c640 100644
--- a/tensorflow/core/kernels/mkl_pooling_ops_common.cc
+++ b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
@@ -14,153 +14,137 @@ limitations under the License.
 ==============================================================================*/
 
 #ifdef INTEL_MKL
-#include <vector>
-#include "tensorflow/core/framework/common_shape_fns.h"
 #include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
+#include <vector>
 #include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/framework/common_shape_fns.h"
 
 namespace tensorflow {
 
-  // Initialization for TensorFlow format
-  void MklPoolParameters::Init(OpKernelContext* context,
-                               const std::vector<int32>& ksize,
-                               const std::vector<int32>& stride,
-                               Padding padding,
-                               TensorFormat data_format,
-                               const TensorShape& tensor_in_shape) {
-    // For maxpooling, tensor_in should have 4 dimensions.
-    OP_REQUIRES(context, tensor_in_shape.dims() == 4,
-                errors::InvalidArgument("tensor_in must be 4-dimensional"));
-
-    depth = GetTensorDim(tensor_in_shape, data_format, 'C');
-    tensor_in_cols = GetTensorDim(tensor_in_shape, data_format, 'W');
-    tensor_in_rows = GetTensorDim(tensor_in_shape, data_format, 'H');
-    tensor_in_batch = GetTensorDim(tensor_in_shape, data_format, 'N');
-
-    Init(context, ksize, stride, padding, data_format);
-  }
-
-  // Initialization for MKL format
-  void MklPoolParameters::Init(OpKernelContext* context,
-                               const std::vector<int32>& ksize,
-                               const std::vector<int32>& stride,
-                               Padding padding,
-                               TensorFormat data_format,
-                               const MklShape* mklInputShape) {
-    // Get the input sizes
-    depth = mklInputShape->GetSizes()[2];
-    tensor_in_cols = mklInputShape->GetSizes()[0];
-    tensor_in_rows = mklInputShape->GetSizes()[1];
-    tensor_in_batch = mklInputShape->GetSizes()[3];
-
-    Init(context, ksize, stride, padding, data_format);
-  }
-
-  // Common Initialization for TensorFlow and MKL formats
-  void MklPoolParameters::Init(OpKernelContext* context,
-                               const std::vector<int32>& ksize,
-                               const std::vector<int32>& stride,
-                               Padding padding,
-                               TensorFormat data_format) {
-    // Get the data format
-    this->data_format = data_format;
-
-    // Get the output sizes
-    window_rows = GetTensorDim(ksize, data_format, 'H');
-    window_cols = GetTensorDim(ksize, data_format, 'W');
-    depth_window = GetTensorDim(ksize, data_format, 'C');
-
-    // Get the strides
-    row_stride = GetTensorDim(stride, data_format, 'H');
-    col_stride = GetTensorDim(stride, data_format, 'W');
-    depth_stride = GetTensorDim(stride, data_format, 'C');
-
-    // We only support 2D pooling across width/height and depthwise
-    // pooling, not a combination.
-    OP_REQUIRES(context,
-                (depth_window == 1 || (window_rows == 1 && window_cols == 1)),
-                errors::Unimplemented(
+// Initialization for TensorFlow format
+void MklPoolParameters::Init(OpKernelContext* context,
+                             const std::vector<int32>& ksize,
+                             const std::vector<int32>& stride, Padding padding,
+                             TensorFormat data_format,
+                             const TensorShape& tensor_in_shape) {
+  // For maxpooling, tensor_in should have 4 dimensions.
+  OP_REQUIRES(context, tensor_in_shape.dims() == 4,
+              errors::InvalidArgument("tensor_in must be 4-dimensional"));
+
+  depth = GetTensorDim(tensor_in_shape, data_format, 'C');
+  tensor_in_cols = GetTensorDim(tensor_in_shape, data_format, 'W');
+  tensor_in_rows = GetTensorDim(tensor_in_shape, data_format, 'H');
+  tensor_in_batch = GetTensorDim(tensor_in_shape, data_format, 'N');
+
+  Init(context, ksize, stride, padding, data_format);
+}
+
+// Initialization for MKL format
+void MklPoolParameters::Init(OpKernelContext* context,
+                             const std::vector<int32>& ksize,
+                             const std::vector<int32>& stride, Padding padding,
+                             TensorFormat data_format,
+                             const MklShape* mklInputShape) {
+  // Get the input sizes
+  depth = mklInputShape->GetSizes()[2];
+  tensor_in_cols = mklInputShape->GetSizes()[0];
+  tensor_in_rows = mklInputShape->GetSizes()[1];
+  tensor_in_batch = mklInputShape->GetSizes()[3];
+
+  Init(context, ksize, stride, padding, data_format);
+}
+
+// Common Initialization for TensorFlow and MKL formats
+void MklPoolParameters::Init(OpKernelContext* context,
+                             const std::vector<int32>& ksize,
+                             const std::vector<int32>& stride, Padding padding,
+                             TensorFormat data_format) {
+  // Get the data format
+  this->data_format = data_format;
+
+  // Get the output sizes
+  window_rows = GetTensorDim(ksize, data_format, 'H');
+  window_cols = GetTensorDim(ksize, data_format, 'W');
+  depth_window = GetTensorDim(ksize, data_format, 'C');
+
+  // Get the strides
+  row_stride = GetTensorDim(stride, data_format, 'H');
+  col_stride = GetTensorDim(stride, data_format, 'W');
+  depth_stride = GetTensorDim(stride, data_format, 'C');
+
+  // We only support 2D pooling across width/height and depthwise
+  // pooling, not a combination.
+  OP_REQUIRES(context,
+              (depth_window == 1 || (window_rows == 1 && window_cols == 1)),
+              errors::Unimplemented(
                   "MaxPooling supports exactly one of pooling across depth "
                   "or pooling across width/height."));
 
-    if (depth_window == 1) {
-      OP_REQUIRES_OK(context,
-                     GetWindowedOutputSizeVerbose(tensor_in_rows,
-                                                  window_rows,
-                                                  row_stride,
-                                                  padding,
-                                                  &out_height,
-                                                  &pad_top,
-                                                  &pad_bottom));
-
-      OP_REQUIRES_OK(context,
-                     GetWindowedOutputSizeVerbose(tensor_in_cols,
-                                                  window_cols,
-                                                  col_stride,
-                                                  padding,
-                                                  &out_width,
-                                                  &pad_left,
-                                                  &pad_right));
-    } else {
-      // Our current version of depthwise max pooling does not support
-      // any padding, and expects the depth_window to equal the depth
-      // stride (no overlapping).
-      OP_REQUIRES(context, depth % depth_window == 0,
-                  errors::Unimplemented("Depthwise max pooling requires the"
-                                        " depth window to evenly divide the"
-                                        " input depth"));
-      OP_REQUIRES(context, depth_stride == depth_window,
-                  errors::Unimplemented("Depthwise max pooling requires the"
-                                        " depth window to equal the depth"
-                                        " stride"));
-
-      // The current version of depthwise max is only implemented on CPU.
-      OP_REQUIRES(context,
-                  (DeviceType(static_cast<Device*>(context->device())
-                              ->attributes()
-                              .device_type()) == DeviceType(DEVICE_CPU)),
-                  errors::Unimplemented("Depthwise max pooling is currently "
-                                        "only implemented for CPU devices."));
-
-      pad_depth = 0;
-      out_depth = depth / depth_window;
-    }
-  }
-
-  // Transfers the right parameters for pooling to the op parameters
-  // Updates context->status if there is an invalid input.
-  void ExtractMklOpParams(OpKernelContext* context,
-                          TensorFormat data_format,
-                          const MklPoolParameters &params,
-                          MklPoolingOpParams *mkl_params) {
-    mkl_params->in_sizes[0] = params.tensor_in_cols;
-    mkl_params->in_sizes[1] = params.tensor_in_rows;
-    mkl_params->in_sizes[2] = params.depth;
-    mkl_params->in_sizes[3] = params.tensor_in_batch;
-
-    GetStridesFromSizes(data_format,
-                        mkl_params->in_strides,
-                        mkl_params->in_sizes);
-
-    mkl_params->out_sizes[0] = params.out_width;
-    mkl_params->out_sizes[1] = params.out_height;
-    mkl_params->out_sizes[2] = params.depth;
-    mkl_params->out_sizes[3] = params.tensor_in_batch;
-
-    GetStridesFromSizes(data_format,
-                        mkl_params->out_strides,
-                        mkl_params->out_sizes);
-
-    mkl_params->in_offset[0] = -params.pad_left;
-    mkl_params->in_offset[1] = -params.pad_top;
-    mkl_params->in_offset[2] = -params.pad_right;
-    mkl_params->in_offset[3] = -params.pad_bottom;
-
-    mkl_params->kernel_stride[0] = params.col_stride;
-    mkl_params->kernel_stride[1] = params.row_stride;
-
-    mkl_params->kernel_size[0] = params.window_cols;
-    mkl_params->kernel_size[1] = params.window_rows;
+  if (depth_window == 1) {
+    OP_REQUIRES_OK(context, GetWindowedOutputSizeVerbose(
+                                tensor_in_rows, window_rows, row_stride,
+                                padding, &out_height, &pad_top, &pad_bottom));
+
+    OP_REQUIRES_OK(context, GetWindowedOutputSizeVerbose(
+                                tensor_in_cols, window_cols, col_stride,
+                                padding, &out_width, &pad_left, &pad_right));
+  } else {
+    // Our current version of depthwise max pooling does not support
+    // any padding, and expects the depth_window to equal the depth
+    // stride (no overlapping).
+    OP_REQUIRES(context, depth % depth_window == 0,
+                errors::Unimplemented("Depthwise max pooling requires the"
+                                      " depth window to evenly divide the"
+                                      " input depth"));
+    OP_REQUIRES(context, depth_stride == depth_window,
+                errors::Unimplemented("Depthwise max pooling requires the"
+                                      " depth window to equal the depth"
+                                      " stride"));
+
+    // The current version of depthwise max is only implemented on CPU.
+    OP_REQUIRES(context,
+                (DeviceType(static_cast<Device*>(context->device())
+                                ->attributes()
+                                .device_type()) == DeviceType(DEVICE_CPU)),
+                errors::Unimplemented("Depthwise max pooling is currently "
+                                      "only implemented for CPU devices."));
+
+    pad_depth = 0;
+    out_depth = depth / depth_window;
   }
-}       // namespace tensorflow
+}
+
+// Transfers the right parameters for pooling to the op parameters
+// Updates context->status if there is an invalid input.
+void ExtractMklOpParams(OpKernelContext* context, TensorFormat data_format,
+                        const MklPoolParameters& params,
+                        MklPoolingOpParams* mkl_params) {
+  mkl_params->in_sizes[0] = params.tensor_in_cols;
+  mkl_params->in_sizes[1] = params.tensor_in_rows;
+  mkl_params->in_sizes[2] = params.depth;
+  mkl_params->in_sizes[3] = params.tensor_in_batch;
+
+  GetStridesFromSizes(data_format, mkl_params->in_strides,
+                      mkl_params->in_sizes);
+
+  mkl_params->out_sizes[0] = params.out_width;
+  mkl_params->out_sizes[1] = params.out_height;
+  mkl_params->out_sizes[2] = params.depth;
+  mkl_params->out_sizes[3] = params.tensor_in_batch;
+
+  GetStridesFromSizes(data_format, mkl_params->out_strides,
+                      mkl_params->out_sizes);
+
+  mkl_params->in_offset[0] = -params.pad_left;
+  mkl_params->in_offset[1] = -params.pad_top;
+  mkl_params->in_offset[2] = -params.pad_right;
+  mkl_params->in_offset[3] = -params.pad_bottom;
+
+  mkl_params->kernel_stride[0] = params.col_stride;
+  mkl_params->kernel_stride[1] = params.row_stride;
+
+  mkl_params->kernel_size[0] = params.window_cols;
+  mkl_params->kernel_size[1] = params.window_rows;
+}
+}  // namespace tensorflow
 #endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.h b/tensorflow/core/kernels/mkl_pooling_ops_common.h
index 0a7c4dd15e..92ea2beb25 100644
--- a/tensorflow/core/kernels/mkl_pooling_ops_common.h
+++ b/tensorflow/core/kernels/mkl_pooling_ops_common.h
@@ -76,17 +76,16 @@ typedef struct {
   size_t in_strides[4];
   size_t out_sizes[4];
   size_t out_strides[4];
-  int    in_offset[4];
+  int in_offset[4];
   size_t kernel_stride[2];
   size_t kernel_size[2];
 } MklPoolingOpParams;
 
 // Transfers the right parameters for pooling to the op parameters
 // Updates context->status if there is an invalid input.
-void ExtractMklOpParams(OpKernelContext* context,
-                        TensorFormat data_format,
-                        const MklPoolParameters &params,
-                        MklPoolingOpParams *mkl_params);
+void ExtractMklOpParams(OpKernelContext* context, TensorFormat data_format,
+                        const MklPoolParameters& params,
+                        MklPoolingOpParams* mkl_params);
 }  // namespace tensorflow
 
 #endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc
index 63c0374981..7809711524 100644
--- a/tensorflow/core/kernels/mkl_relu_op.cc
+++ b/tensorflow/core/kernels/mkl_relu_op.cc
@@ -1,397 +1,397 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// See docs in ../ops/nn_ops.cc.
-#ifdef INTEL_MKL
-
-#include "tensorflow/core/framework/numeric_op.h"
-#include "tensorflow/core/framework/op_kernel.h"
-#include "tensorflow/core/framework/register_types.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/lib/core/errors.h"
-#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
-
-#include "tensorflow/core/platform/default/logging.h"
-#include "tensorflow/core/util/mkl_util.h"
-#include "third_party/mkl/include/mkl_dnn.h"
-#include "third_party/mkl/include/mkl_dnn_types.h"
-
-namespace tensorflow {
-
-typedef Eigen::ThreadPoolDevice CPUDevice;
-
-struct MklReluHelpers {
-  static void ValidateSameSizeHelper(OpKernelContext* context, const Tensor& g,
-                                     const Tensor& a) {
-    OP_REQUIRES(context, a.IsSameSize(g),
-                errors::InvalidArgument("g and a must be the same size"));
-  }
-  static bool ValidateSameSize(OpKernelContext* context, const Tensor& g,
-                               const Tensor& a) {
-    ValidateSameSizeHelper(context, g, a);
-    return context->status().ok();
-  }
-};
-
-template <typename Device, typename T>
-class MklReluOp : public OpKernel {
- public:
-  ~MklReluOp() {}
-
-  explicit MklReluOp(OpKernelConstruction* context) : OpKernel(context) {}
-
-  void Compute(OpKernelContext* context) override {
-    MklReluOpContext mkl_context;
-
-    const Tensor& input = MklGetInput(context, 0);
-    GetMklShape(context, 0, &mkl_context.input_shape);
-    void* user_i = static_cast<void*>(const_cast<T*>(input.flat<T>().data()));
-    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
-    if (!input_in_mkl_format && !input.dims()) {  // handle the case of a scalar
-      const TensorShape& o_shape = input.shape();
-      Tensor* out_tensor = nullptr;
-      mkl_context.output_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &out_tensor, o_shape,
-                                mkl_context.output_shape);
-      void* out_o = static_cast<void*>(out_tensor->flat<T>().data());
-      (static_cast<T*>(out_o))[0] =
-          std::max((static_cast<T*>(user_i))[0], static_cast<T>(0));
-      return;
-    }
-
-    // Generate size, stride for input if input is in MKL format.
-    if (input_in_mkl_format) {
-      mkl_context.in_dims = mkl_context.input_shape.GetDimension();
-      mkl_context.in_sizes = new size_t[mkl_context.in_dims];
-      mkl_context.in_strides = new size_t[mkl_context.in_dims];
-      for (int i = 0; i < mkl_context.in_dims; i++) {
-        mkl_context.in_sizes[i] = mkl_context.input_shape.GetSizes()[i];
-        mkl_context.in_strides[i] = mkl_context.input_shape.GetStrides()[i];
-      }
-    } else {
-      mkl_context.in_dims = input.dims();
-      mkl_context.in_sizes = new size_t[mkl_context.in_dims];
-      mkl_context.in_strides = new size_t[mkl_context.in_dims];
-      for (int i = 0; i < mkl_context.in_dims; i++) {
-        mkl_context.in_sizes[i] = input.dim_size((mkl_context.in_dims - 1) - i);
-      }
-      mkl_context.in_strides[0] = 1;
-      for (int i = 1; i < mkl_context.in_dims; i++) {
-        mkl_context.in_strides[i] =
-            mkl_context.in_strides[i - 1] * mkl_context.in_sizes[i - 1];
-      }
-    }
-
-    float negative_slope = 0.0;
-    mkl_context.MklCreateInputLayouts(context);
-    CHECK_EQ(dnnReLUCreateForward_F32(&mkl_context.prim_relu_fwd, NULL,
-                                      mkl_context.lt_input, negative_slope),
-             E_SUCCESS);
-
-    Tensor* output = nullptr;
-
-    if (input_in_mkl_format) {
-      TensorShape tf_shape;
-      mkl_context.output_shape.SetMklTensor(true);
-      mkl_context.output_shape.SetMklLayout(mkl_context.prim_relu_fwd,
-                                            dnnResourceDst);
-      mkl_context.output_shape.SetTfLayout(
-          mkl_context.in_dims, mkl_context.in_sizes, mkl_context.in_strides);
-      mkl_context.output_shape.SetTfDimOrder(
-          mkl_context.in_dims, mkl_context.input_shape.GetTfToMklDimMap());
-      tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
-                          mkl_context.output_shape.GetMklLayout())) /
-                      sizeof(T));
-      AllocateOutputSetMklshape(context, 0, &output, tf_shape,
-                                mkl_context.output_shape);
-    } else {
-      const TensorShape& o_shape = input.shape();
-      mkl_context.output_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &output, o_shape,
-                                mkl_context.output_shape);
-    }
-
-    void* user_o = static_cast<void*>(const_cast<T*>(output->flat<T>().data()));
-
-    mkl_context.relu_res[dnnResourceDst] = user_o;
-    mkl_context.relu_res[dnnResourceSrc] = user_i;
-    CHECK_EQ(dnnExecute_F32(mkl_context.prim_relu_fwd, mkl_context.relu_res),
-             E_SUCCESS);
-    mkl_context.MklCleanup();
-  }
-
- private:
-  typedef struct {
-    int in_dims;
-    size_t* in_sizes;
-    size_t* in_strides;
-    MklShape input_shape, output_shape;
-    dnnPrimitive_t prim_relu_fwd = nullptr;
-    void* relu_res[dnnResourceNumber];
-    dnnLayout_t lt_input = nullptr;
-
-    void MklCleanup() {
-      bool input_in_mkl_format = input_shape.IsMklTensor();
-      if (!input_in_mkl_format) {
-        dnnLayoutDelete_F32(lt_input);
-        free(in_sizes);
-        free(in_strides);
-      }
-      dnnDelete_F32(prim_relu_fwd);
-    }
-
-    void MklCreateInputLayouts(OpKernelContext* context) {
-      bool input_in_mkl_format = input_shape.IsMklTensor();
-      if (!input_in_mkl_format) {
-        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
-                 E_SUCCESS);
-      } else {
-        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
-      }
-    }
-  } MklReluOpContext;
-};
-
-template <typename Device, typename T>
-class MklReluGradOp : public OpKernel {
- public:
-  ~MklReluGradOp() {}
-
-  explicit MklReluGradOp(OpKernelConstruction* context) : OpKernel(context) {}
-
-  void Compute(OpKernelContext* context) override;
-
- private:
-  typedef struct {
-    int in_dims;
-    size_t* in_sizes;
-    size_t* in_strides;
-    MklShape input_shape, grad_shape, output_shape;
-    void* relu_res[dnnResourceNumber];
-    dnnPrimitive_t prim_relu_bwd;
-    dnnLayout_t lt_input, lt_grad;
-
-    void MklPrepareReluGradInputs(OpKernelContext* context,
-                                  Tensor* mkl_tmp_grad_buf_tensor,
-                                  Tensor* mkl_tmp_input_buf_tensor) {
-      dnnPrimitive_t cv_user_to_reluB_input, cv_user_to_reluB_grad;
-      dnnLayout_t mkl_lt_internal_input, mkl_lt_internal_grad;
-
-      const Tensor& g = MklGetInput(context, 0);
-      const Tensor& a = MklGetInput(context, 1);
-
-      void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
-      void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
-
-      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
-                   &mkl_lt_internal_grad, prim_relu_bwd, dnnResourceDiffDst),
-               E_SUCCESS);
-
-      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_input,
-                                                prim_relu_bwd, dnnResourceSrc),
-               E_SUCCESS);
-
-      if (!dnnLayoutCompare_F32(mkl_lt_internal_grad, lt_grad)) {
-        AllocTmpBuffer(context, mkl_tmp_grad_buf_tensor, mkl_lt_internal_grad,
-                       &relu_res[dnnResourceDiffDst]);
-        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_grad, lt_grad,
-                                         mkl_lt_internal_grad),
-                 E_SUCCESS);
-        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_grad, user_g,
-                                          relu_res[dnnResourceDiffDst]),
-                 E_SUCCESS);
-        dnnDelete_F32(cv_user_to_reluB_grad);
-      } else {
-        relu_res[dnnResourceDiffDst] = user_g;
-      }
-
-      if (!dnnLayoutCompare_F32(mkl_lt_internal_input, lt_input)) {
-        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
-                       &relu_res[dnnResourceSrc]);
-        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_input, lt_input,
-                                         mkl_lt_internal_input),
-                 E_SUCCESS);
-        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_input, user_i,
-                                          relu_res[dnnResourceSrc]),
-                 E_SUCCESS);
-        dnnDelete_F32(cv_user_to_reluB_input);
-      } else {
-        relu_res[dnnResourceSrc] = user_i;
-      }
-
-      dnnLayoutDelete_F32(mkl_lt_internal_input);
-      dnnLayoutDelete_F32(mkl_lt_internal_grad);
-    }
-
-    void MklCreateInputLayouts(OpKernelContext* context) {
-      bool grad_is_mkl = grad_shape.IsMklTensor();
-      bool input_is_mkl = input_shape.IsMklTensor();
-      if (!input_is_mkl) {
-        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
-                 E_SUCCESS);
-      } else {
-        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
-      }
-
-      if (!grad_is_mkl) {
-        CHECK_EQ(dnnLayoutCreate_F32(&lt_grad, in_dims, in_sizes, in_strides),
-                 E_SUCCESS);
-      } else {
-        lt_grad = static_cast<dnnLayout_t>(grad_shape.GetCurLayout());
-      }
-    }
-
-    void MklCleanup() {
-      bool grad_is_mkl = grad_shape.IsMklTensor();
-      bool input_is_mkl = input_shape.IsMklTensor();
-      dnnDelete_F32(prim_relu_bwd);
-      if (!input_is_mkl) {
-        dnnLayoutDelete_F32(lt_input);
-        free(in_sizes);
-        free(in_strides);
-      }
-      if (!grad_is_mkl) {
-        dnnLayoutDelete_F32(lt_grad);
-      }
-    }
-  } MklReluGradOpContext;
-};
-
-template <typename Device, typename T>
-
-void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
-  MklReluGradOpContext mkl_context;
-  const Tensor& g = MklGetInput(context, 0);
-  const Tensor& a = MklGetInput(context, 1);
-
-  void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
-  void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
-
-  GetMklShape(context, 0, &mkl_context.grad_shape);
-  GetMklShape(context, 1, &mkl_context.input_shape);
-
-  bool grad_is_mkl = mkl_context.grad_shape.IsMklTensor();
-  bool input_is_mkl = mkl_context.input_shape.IsMklTensor();
-  if (!input_is_mkl && !grad_is_mkl &&
-      !MklReluHelpers::ValidateSameSize(context, g, a))
-    return;
-  Tensor* output = nullptr;
-  if (!input_is_mkl && !grad_is_mkl &&
-      !a.dims()) {  // handle the case of a scalar
-    // Allocate space for g and
-    const TensorShape& g_shape = g.shape();
-    mkl_context.output_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &output, g_shape,
-                              mkl_context.output_shape);
-    void* out_o = static_cast<void*>(output->flat<T>().data());
-    (static_cast<T*>(out_o))[0] =
-        (static_cast<T*>(user_g))[0] * ((static_cast<T*>(user_i))[0] > 0);
-    return;
-  }
-
-  // Generate size, stride for input if input/grad is in MKL format.
-  if (grad_is_mkl || input_is_mkl) {
-    const MklShape* tmp_mkl_shape =
-        (grad_is_mkl) ? &mkl_context.grad_shape : &mkl_context.input_shape;
-
-    mkl_context.in_dims = tmp_mkl_shape->GetDimension();
-    mkl_context.in_strides = new size_t[mkl_context.in_dims];
-    mkl_context.in_sizes = new size_t[mkl_context.in_dims];
-    for (int i = 0; i < mkl_context.in_dims; i++) {
-      mkl_context.in_sizes[i] = tmp_mkl_shape->GetSizes()[i];
-      mkl_context.in_strides[i] = tmp_mkl_shape->GetStrides()[i];
-    }
-  } else {
-    mkl_context.in_dims = g.dims();
-    mkl_context.in_strides = new size_t[mkl_context.in_dims];
-    mkl_context.in_sizes = new size_t[mkl_context.in_dims];
-
-    for (int i = 0; i < mkl_context.in_dims; i++) {
-      mkl_context.in_sizes[i] = g.dim_size((mkl_context.in_dims - 1) - i);
-    }
-    mkl_context.in_strides[0] = 1;
-    for (int i = 1; i < mkl_context.in_dims; i++) {
-      mkl_context.in_strides[i] =
-          mkl_context.in_strides[i - 1] * mkl_context.in_sizes[i - 1];
-    }
-  }
-
-  mkl_context.MklCreateInputLayouts(context);
-  float negative_slope = 0.0;
-  CHECK_EQ(dnnReLUCreateBackward_F32(&mkl_context.prim_relu_bwd, NULL,
-                                     mkl_context.lt_grad, mkl_context.lt_input,
-                                     negative_slope),
-           E_SUCCESS);
-  Tensor mkl_tmp_grad_buf_tensor, mkl_tmp_input_buf_tensor;
-  mkl_context.MklPrepareReluGradInputs(context, &mkl_tmp_grad_buf_tensor,
-                                       &mkl_tmp_input_buf_tensor);
-
-  if (input_is_mkl ||
-      grad_is_mkl) { /*if  grad or input are MKL leave it in MKL*/
-    TensorShape tf_shape;
-    mkl_context.output_shape.SetMklTensor(true);
-    mkl_context.output_shape.SetMklLayout(mkl_context.prim_relu_bwd,
-                                          dnnResourceDiffSrc);
-    mkl_context.output_shape.SetTfLayout(
-        mkl_context.in_dims, mkl_context.in_sizes, mkl_context.in_strides);
-    // If input_is_mkl or grad_is_mkl, then we copy strides and sizes from Mkl
-    // shape of one that is in MKL layout.
-    if (grad_is_mkl == true) {
-      mkl_context.output_shape.SetTfDimOrder(
-          mkl_context.in_dims, mkl_context.grad_shape.GetTfToMklDimMap());
-    } else {
-      mkl_context.output_shape.SetTfDimOrder(
-          mkl_context.in_dims, mkl_context.input_shape.GetTfToMklDimMap());
-    }
-
-    tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
-                        mkl_context.output_shape.GetMklLayout())) /
-                    sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output, tf_shape,
-                              mkl_context.output_shape);
-
-  } else {
-    const TensorShape& o_shape = g.shape();
-    mkl_context.output_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &output, o_shape,
-                              mkl_context.output_shape);
-  }
-
-  mkl_context.relu_res[dnnResourceDiffSrc] =
-      static_cast<void*>(output->flat<T>().data());
-
-  CHECK_EQ(dnnExecute_F32(mkl_context.prim_relu_bwd, mkl_context.relu_res),
-           E_SUCCESS);
-  mkl_context.MklCleanup();
-}
-
-/* Register DNN kernels for supported operations and supported types - right now
- * it is only Relu and f32*/
-#define REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES(type)                   \
-  REGISTER_KERNEL_BUILDER(Name("MklRelu")                                 \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<type>("T")                  \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
-                          MklReluOp<CPUDevice, type>);                    \
-  REGISTER_KERNEL_BUILDER(Name("MklReluGrad")                             \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<type>("T")                  \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
-                          MklReluGradOp<CPUDevice, type>);
-TF_CALL_float(REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES);
-
-}  // namespace tensorflow
-
-#endif  // INTEL_MKL
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/nn_ops.cc.
+#ifdef INTEL_MKL
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/errors.h"
+
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/platform/default/logging.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+struct MklReluHelpers {
+  static void ValidateSameSizeHelper(OpKernelContext* context, const Tensor& g,
+                                     const Tensor& a) {
+    OP_REQUIRES(context, a.IsSameSize(g),
+                errors::InvalidArgument("g and a must be the same size"));
+  }
+  static bool ValidateSameSize(OpKernelContext* context, const Tensor& g,
+                               const Tensor& a) {
+    ValidateSameSizeHelper(context, g, a);
+    return context->status().ok();
+  }
+};
+
+template <typename Device, typename T>
+class MklReluOp : public OpKernel {
+ public:
+  ~MklReluOp() {}
+
+  explicit MklReluOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    MklReluOpContext mkl_context;
+
+    const Tensor& input = MklGetInput(context, 0);
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    void* user_i = static_cast<void*>(const_cast<T*>(input.flat<T>().data()));
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+    if (!input_in_mkl_format && !input.dims()) {  // handle the case of a scalar
+      const TensorShape& o_shape = input.shape();
+      Tensor* out_tensor = nullptr;
+      mkl_context.output_shape.SetMklTensor(false);
+      AllocateOutputSetMklshape(context, 0, &out_tensor, o_shape,
+                                mkl_context.output_shape);
+      void* out_o = static_cast<void*>(out_tensor->flat<T>().data());
+      (static_cast<T*>(out_o))[0] =
+          std::max((static_cast<T*>(user_i))[0], static_cast<T>(0));
+      return;
+    }
+
+    // Generate size, stride for input if input is in MKL format.
+    if (input_in_mkl_format) {
+      mkl_context.in_dims = mkl_context.input_shape.GetDimension();
+      mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+      mkl_context.in_strides = new size_t[mkl_context.in_dims];
+      for (int i = 0; i < mkl_context.in_dims; i++) {
+        mkl_context.in_sizes[i] = mkl_context.input_shape.GetSizes()[i];
+        mkl_context.in_strides[i] = mkl_context.input_shape.GetStrides()[i];
+      }
+    } else {
+      mkl_context.in_dims = input.dims();
+      mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+      mkl_context.in_strides = new size_t[mkl_context.in_dims];
+      for (int i = 0; i < mkl_context.in_dims; i++) {
+        mkl_context.in_sizes[i] = input.dim_size((mkl_context.in_dims - 1) - i);
+      }
+      mkl_context.in_strides[0] = 1;
+      for (int i = 1; i < mkl_context.in_dims; i++) {
+        mkl_context.in_strides[i] =
+            mkl_context.in_strides[i - 1] * mkl_context.in_sizes[i - 1];
+      }
+    }
+
+    float negative_slope = 0.0;
+    mkl_context.MklCreateInputLayouts(context);
+    CHECK_EQ(dnnReLUCreateForward_F32(&mkl_context.prim_relu_fwd, NULL,
+                                      mkl_context.lt_input, negative_slope),
+             E_SUCCESS);
+
+    Tensor* output = nullptr;
+
+    if (input_in_mkl_format) {
+      TensorShape tf_shape;
+      mkl_context.output_shape.SetMklTensor(true);
+      mkl_context.output_shape.SetMklLayout(mkl_context.prim_relu_fwd,
+                                            dnnResourceDst);
+      mkl_context.output_shape.SetTfLayout(
+          mkl_context.in_dims, mkl_context.in_sizes, mkl_context.in_strides);
+      mkl_context.output_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.input_shape.GetTfToMklDimMap());
+      tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                          mkl_context.output_shape.GetMklLayout())) /
+                      sizeof(T));
+      AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+                                mkl_context.output_shape);
+    } else {
+      const TensorShape& o_shape = input.shape();
+      mkl_context.output_shape.SetMklTensor(false);
+      AllocateOutputSetMklshape(context, 0, &output, o_shape,
+                                mkl_context.output_shape);
+    }
+
+    void* user_o = static_cast<void*>(const_cast<T*>(output->flat<T>().data()));
+
+    mkl_context.relu_res[dnnResourceDst] = user_o;
+    mkl_context.relu_res[dnnResourceSrc] = user_i;
+    CHECK_EQ(dnnExecute_F32(mkl_context.prim_relu_fwd, mkl_context.relu_res),
+             E_SUCCESS);
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    int in_dims;
+    size_t* in_sizes;
+    size_t* in_strides;
+    MklShape input_shape, output_shape;
+    dnnPrimitive_t prim_relu_fwd = nullptr;
+    void* relu_res[dnnResourceNumber];
+    dnnLayout_t lt_input = nullptr;
+
+    void MklCleanup() {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      if (!input_in_mkl_format) {
+        dnnLayoutDelete_F32(lt_input);
+        free(in_sizes);
+        free(in_strides);
+      }
+      dnnDelete_F32(prim_relu_fwd);
+    }
+
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool input_in_mkl_format = input_shape.IsMklTensor();
+      if (!input_in_mkl_format) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
+      }
+    }
+  } MklReluOpContext;
+};
+
+template <typename Device, typename T>
+class MklReluGradOp : public OpKernel {
+ public:
+  ~MklReluGradOp() {}
+
+  explicit MklReluGradOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override;
+
+ private:
+  typedef struct {
+    int in_dims;
+    size_t* in_sizes;
+    size_t* in_strides;
+    MklShape input_shape, grad_shape, output_shape;
+    void* relu_res[dnnResourceNumber];
+    dnnPrimitive_t prim_relu_bwd;
+    dnnLayout_t lt_input, lt_grad;
+
+    void MklPrepareReluGradInputs(OpKernelContext* context,
+                                  Tensor* mkl_tmp_grad_buf_tensor,
+                                  Tensor* mkl_tmp_input_buf_tensor) {
+      dnnPrimitive_t cv_user_to_reluB_input, cv_user_to_reluB_grad;
+      dnnLayout_t mkl_lt_internal_input, mkl_lt_internal_grad;
+
+      const Tensor& g = MklGetInput(context, 0);
+      const Tensor& a = MklGetInput(context, 1);
+
+      void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
+      void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &mkl_lt_internal_grad, prim_relu_bwd, dnnResourceDiffDst),
+               E_SUCCESS);
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_input,
+                                                prim_relu_bwd, dnnResourceSrc),
+               E_SUCCESS);
+
+      if (!dnnLayoutCompare_F32(mkl_lt_internal_grad, lt_grad)) {
+        AllocTmpBuffer(context, mkl_tmp_grad_buf_tensor, mkl_lt_internal_grad,
+                       &relu_res[dnnResourceDiffDst]);
+        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_grad, lt_grad,
+                                         mkl_lt_internal_grad),
+                 E_SUCCESS);
+        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_grad, user_g,
+                                          relu_res[dnnResourceDiffDst]),
+                 E_SUCCESS);
+        dnnDelete_F32(cv_user_to_reluB_grad);
+      } else {
+        relu_res[dnnResourceDiffDst] = user_g;
+      }
+
+      if (!dnnLayoutCompare_F32(mkl_lt_internal_input, lt_input)) {
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &relu_res[dnnResourceSrc]);
+        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_input, lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_input, user_i,
+                                          relu_res[dnnResourceSrc]),
+                 E_SUCCESS);
+        dnnDelete_F32(cv_user_to_reluB_input);
+      } else {
+        relu_res[dnnResourceSrc] = user_i;
+      }
+
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
+      dnnLayoutDelete_F32(mkl_lt_internal_grad);
+    }
+
+    void MklCreateInputLayouts(OpKernelContext* context) {
+      bool grad_is_mkl = grad_shape.IsMklTensor();
+      bool input_is_mkl = input_shape.IsMklTensor();
+      if (!input_is_mkl) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_input = static_cast<dnnLayout_t>(input_shape.GetCurLayout());
+      }
+
+      if (!grad_is_mkl) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_grad, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_grad = static_cast<dnnLayout_t>(grad_shape.GetCurLayout());
+      }
+    }
+
+    void MklCleanup() {
+      bool grad_is_mkl = grad_shape.IsMklTensor();
+      bool input_is_mkl = input_shape.IsMklTensor();
+      dnnDelete_F32(prim_relu_bwd);
+      if (!input_is_mkl) {
+        dnnLayoutDelete_F32(lt_input);
+        free(in_sizes);
+        free(in_strides);
+      }
+      if (!grad_is_mkl) {
+        dnnLayoutDelete_F32(lt_grad);
+      }
+    }
+  } MklReluGradOpContext;
+};
+
+template <typename Device, typename T>
+
+void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
+  MklReluGradOpContext mkl_context;
+  const Tensor& g = MklGetInput(context, 0);
+  const Tensor& a = MklGetInput(context, 1);
+
+  void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
+  void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
+
+  GetMklShape(context, 0, &mkl_context.grad_shape);
+  GetMklShape(context, 1, &mkl_context.input_shape);
+
+  bool grad_is_mkl = mkl_context.grad_shape.IsMklTensor();
+  bool input_is_mkl = mkl_context.input_shape.IsMklTensor();
+  if (!input_is_mkl && !grad_is_mkl &&
+      !MklReluHelpers::ValidateSameSize(context, g, a))
+    return;
+  Tensor* output = nullptr;
+  if (!input_is_mkl && !grad_is_mkl &&
+      !a.dims()) {  // handle the case of a scalar
+    // Allocate space for g and
+    const TensorShape& g_shape = g.shape();
+    mkl_context.output_shape.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 0, &output, g_shape,
+                              mkl_context.output_shape);
+    void* out_o = static_cast<void*>(output->flat<T>().data());
+    (static_cast<T*>(out_o))[0] =
+        (static_cast<T*>(user_g))[0] * ((static_cast<T*>(user_i))[0] > 0);
+    return;
+  }
+
+  // Generate size, stride for input if input/grad is in MKL format.
+  if (grad_is_mkl || input_is_mkl) {
+    const MklShape* tmp_mkl_shape =
+        (grad_is_mkl) ? &mkl_context.grad_shape : &mkl_context.input_shape;
+
+    mkl_context.in_dims = tmp_mkl_shape->GetDimension();
+    mkl_context.in_strides = new size_t[mkl_context.in_dims];
+    mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+    for (int i = 0; i < mkl_context.in_dims; i++) {
+      mkl_context.in_sizes[i] = tmp_mkl_shape->GetSizes()[i];
+      mkl_context.in_strides[i] = tmp_mkl_shape->GetStrides()[i];
+    }
+  } else {
+    mkl_context.in_dims = g.dims();
+    mkl_context.in_strides = new size_t[mkl_context.in_dims];
+    mkl_context.in_sizes = new size_t[mkl_context.in_dims];
+
+    for (int i = 0; i < mkl_context.in_dims; i++) {
+      mkl_context.in_sizes[i] = g.dim_size((mkl_context.in_dims - 1) - i);
+    }
+    mkl_context.in_strides[0] = 1;
+    for (int i = 1; i < mkl_context.in_dims; i++) {
+      mkl_context.in_strides[i] =
+          mkl_context.in_strides[i - 1] * mkl_context.in_sizes[i - 1];
+    }
+  }
+
+  mkl_context.MklCreateInputLayouts(context);
+  float negative_slope = 0.0;
+  CHECK_EQ(dnnReLUCreateBackward_F32(&mkl_context.prim_relu_bwd, NULL,
+                                     mkl_context.lt_grad, mkl_context.lt_input,
+                                     negative_slope),
+           E_SUCCESS);
+  Tensor mkl_tmp_grad_buf_tensor, mkl_tmp_input_buf_tensor;
+  mkl_context.MklPrepareReluGradInputs(context, &mkl_tmp_grad_buf_tensor,
+                                       &mkl_tmp_input_buf_tensor);
+
+  if (input_is_mkl ||
+      grad_is_mkl) { /*if  grad or input are MKL leave it in MKL*/
+    TensorShape tf_shape;
+    mkl_context.output_shape.SetMklTensor(true);
+    mkl_context.output_shape.SetMklLayout(mkl_context.prim_relu_bwd,
+                                          dnnResourceDiffSrc);
+    mkl_context.output_shape.SetTfLayout(
+        mkl_context.in_dims, mkl_context.in_sizes, mkl_context.in_strides);
+    // If input_is_mkl or grad_is_mkl, then we copy strides and sizes from Mkl
+    // shape of one that is in MKL layout.
+    if (grad_is_mkl == true) {
+      mkl_context.output_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.grad_shape.GetTfToMklDimMap());
+    } else {
+      mkl_context.output_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.input_shape.GetTfToMklDimMap());
+    }
+
+    tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                        mkl_context.output_shape.GetMklLayout())) /
+                    sizeof(T));
+    AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+                              mkl_context.output_shape);
+
+  } else {
+    const TensorShape& o_shape = g.shape();
+    mkl_context.output_shape.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 0, &output, o_shape,
+                              mkl_context.output_shape);
+  }
+
+  mkl_context.relu_res[dnnResourceDiffSrc] =
+      static_cast<void*>(output->flat<T>().data());
+
+  CHECK_EQ(dnnExecute_F32(mkl_context.prim_relu_bwd, mkl_context.relu_res),
+           E_SUCCESS);
+  mkl_context.MklCleanup();
+}
+
+/* Register DNN kernels for supported operations and supported types - right now
+ * it is only Relu and f32*/
+#define REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES(type)                   \
+  REGISTER_KERNEL_BUILDER(Name("MklRelu")                                 \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<type>("T")                  \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklReluOp<CPUDevice, type>);                    \
+  REGISTER_KERNEL_BUILDER(Name("MklReluGrad")                             \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<type>("T")                  \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklReluGradOp<CPUDevice, type>);
+TF_CALL_float(REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES);
+
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/pooling_ops_3d.cc b/tensorflow/core/kernels/pooling_ops_3d.cc
index 44861d9595..538dca24ae 100644
--- a/tensorflow/core/kernels/pooling_ops_3d.cc
+++ b/tensorflow/core/kernels/pooling_ops_3d.cc
@@ -580,8 +580,7 @@ struct LaunchMaxPooling3dGradGradOp<CPUDevice, T> {
         *(context->device()->tensorflow_cpu_worker_threads());
 
     auto shard = [&params, &in_mat, &out_mat, &top_diff_mat, &bottom_diff_mat](
-        int64 start, int64 limit) {
-
+                     int64 start, int64 limit) {
       const int32 depth = params.depth;
       const int32 in_planes = params.tensor_in_planes;
       const int32 in_rows = params.tensor_in_rows;
@@ -682,10 +681,9 @@ class MaxPooling3dGradGradOp : public OpKernel {
                     "Pooling is not yet supported on the batch dimension."));
     const int32 ksize_c = GetTensorDim(ksize_, data_format_, 'C');
     const int32 stride_c = GetTensorDim(stride_, data_format_, 'C');
-    OP_REQUIRES(
-        context, ksize_c == 1 && stride_c == 1,
-        errors::Unimplemented(
-            "MaxPooling3dGradGrad is not yet supported on the depth dimension."));
+    OP_REQUIRES(context, ksize_c == 1 && stride_c == 1,
+                errors::Unimplemented("MaxPooling3dGradGrad is not yet "
+                                      "supported on the depth dimension."));
   }
 
   void Compute(OpKernelContext* context) override {
@@ -703,7 +701,7 @@ class MaxPooling3dGradGradOp : public OpKernel {
         context, out_grad_backprop.dims() == 5,
         errors::InvalidArgument("out_grad_backprop must be 5-dimensional"));
 
-    Pool3dParameters params{context, ksize_, stride_,
+    Pool3dParameters params{context,  ksize_,       stride_,
                             padding_, data_format_, tensor_in.shape()};
 
     Tensor* output = nullptr;
@@ -736,12 +734,11 @@ class MaxPooling3dGradGradOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(                                                 \
       Name("AvgPool3D").Device(DEVICE_##D).TypeConstraint<T>("T"),         \
       Pooling3DOp<D##Device, T, AVG>);                                     \
-  REGISTER_KERNEL_BUILDER(                                                 \
-      Name("AvgPool3DGrad")                                                \
-          .Device(DEVICE_##D)                                              \
-          .TypeConstraint<T>("T")                                          \
-          .HostMemory("orig_input_shape"),                                 \
-      AvgPooling3dGradOp<D##Device, T>);
+  REGISTER_KERNEL_BUILDER(Name("AvgPool3DGrad")                            \
+                              .Device(DEVICE_##D)                          \
+                              .TypeConstraint<T>("T")                      \
+                              .HostMemory("orig_input_shape"),             \
+                          AvgPooling3dGradOp<D##Device, T>);
 
 #define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T)
 TF_CALL_float(REGISTER_CPU_KERNELS);
@@ -835,8 +832,7 @@ struct LaunchMaxPooling3dGradGradOp<GPUDevice, T> {
 };
 
 #define REGISTER_GPU_KERNELS(T) REGISTER_KERNELS(GPU, T)
-TF_CALL_float(REGISTER_GPU_KERNELS)
-TF_CALL_half(REGISTER_GPU_KERNELS)
+TF_CALL_float(REGISTER_GPU_KERNELS) TF_CALL_half(REGISTER_GPU_KERNELS)
 #undef REGISTER_GPU_KERNELS
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc b/tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc
index 08af188b28..341a43c368 100644
--- a/tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc
+++ b/tensorflow/core/kernels/pooling_ops_3d_gpu.cu.cc
@@ -17,8 +17,8 @@ limitations under the License.
 
 #define EIGEN_USE_GPU
 
-#include "tensorflow/core/kernels/pooling_ops_3d_gpu.h"
 #include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/kernels/pooling_ops_3d_gpu.h"
 #include "tensorflow/core/util/cuda_kernel_helper.h"
 #include "tensorflow/core/util/tensor_format.h"
 
@@ -159,12 +159,11 @@ bool MaxPool3dGradBackward<T>::operator()(
         bottom_diff);
   }
   return d.ok();
-};
+}
 
 }  // namespace functor
 
-#define DEFINE_GPU_SPECS(T) \
-  template struct functor::MaxPool3dGradBackward<T>;
+#define DEFINE_GPU_SPECS(T) template struct functor::MaxPool3dGradBackward<T>;
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 #undef DEFINE_GPU_SPECS
 
diff --git a/tensorflow/core/kernels/pooling_ops_common.cc b/tensorflow/core/kernels/pooling_ops_common.cc
index 9e7314cad5..37747a3199 100644
--- a/tensorflow/core/kernels/pooling_ops_common.cc
+++ b/tensorflow/core/kernels/pooling_ops_common.cc
@@ -373,7 +373,7 @@ void DnnPoolingGradOp<T>::Compute(
   }
 }
 
-#define DEFINE_DNN_OPS(T)       \
+#define DEFINE_DNN_OPS(T)         \
   template class DnnPoolingOp<T>; \
   template class DnnPoolingGradOp<T>;
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_DNN_OPS)
diff --git a/tensorflow/core/kernels/xsmm_conv2d.cc b/tensorflow/core/kernels/xsmm_conv2d.cc
index d3a29c2e3e..7936cbcd46 100644
--- a/tensorflow/core/kernels/xsmm_conv2d.cc
+++ b/tensorflow/core/kernels/xsmm_conv2d.cc
@@ -35,9 +35,9 @@ void dummy_xsmm_conv2d_ensure_file_is_not_empty(void);
 #include "tensorflow/core/lib/core/blocking_counter.h"
 #include "tensorflow/core/lib/core/threadpool.h"
 
+#include "libxsmm_main.h"  // TODO(bsteiner): API to avoid incl. header from src/
 #include "include/libxsmm_cpuid.h"
 #include "include/libxsmm_malloc.h"
-#include "libxsmm_main.h" // TODO: API to avoid incl. header from src/
 
 namespace tensorflow {
 
@@ -72,7 +72,6 @@ bool CanUseXsmmConv2D(const libxsmm_dnn_conv_desc& desc,
   return true;
 }
 
-
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
 namespace functor {
@@ -83,25 +82,34 @@ static void chk_libxsmm_err(libxsmm_dnn_err_t status, string msg) {
   }
 }
 
-LIBXSMM_INLINE void copy_RSCK_to_custom(const float* rsck, float *kcrs, int R, int S, int C, int K,int blocksifm, int blocksofm, int ifmblock,int ofmblock, int start, int end)
-{
-  LIBXSMM_VLA_DECL(4, const      float, input, rsck, S, C,K);
-  LIBXSMM_VLA_DECL(6, float, output, kcrs, blocksifm,R,S,ifmblock, ofmblock);
-  int r, s, k,c, v1,v2;
-  
-  for (k = start; k < end ; k++ ) { 
-    for(c = 0; c < blocksifm;c++){
-      for ( r = 0; r < R; r++ ) {
-        for ( s = 0; s < S; s++ ){
-          for ( v1 = c*ifmblock; v1 < std::min(C,(c+1)*ifmblock) ; v1++ ) {
-            for ( v2 = k*ofmblock; v2 < std::min(K, (k+1)*ofmblock); v2++ )
-              LIBXSMM_VLA_ACCESS(6,  output, k,c, r, s,v1- c*ifmblock,v2-k*ofmblock, blocksifm, R, S,ifmblock,ofmblock) = LIBXSMM_VLA_ACCESS(4, input, r, s, v1, v2,  S, C, K);
-            for ( v2 = K; v2 < (k+1)*ofmblock ; v2++ )
-              LIBXSMM_VLA_ACCESS(6,  output, k,c, r, s,v1- c*ifmblock,v2-k*ofmblock, blocksifm, R, S,ifmblock,ofmblock) = 0.0f; 
-            }
-          for ( v1 = C; v1 < (c+1)*ifmblock ; v1++ ) {
-            for ( v2 = k*ofmblock; v2 < (k+1)*ofmblock; v2++ )
-              LIBXSMM_VLA_ACCESS(6,  output, k,c, r, s,v1- c*ifmblock,v2-k*ofmblock, blocksifm, R, S,ifmblock,ofmblock) = 0.0f;
+LIBXSMM_INLINE void copy_RSCK_to_custom(const float* rsck, float* kcrs, int R,
+                                        int S, int C, int K, int blocksifm,
+                                        int blocksofm, int ifmblock,
+                                        int ofmblock, int start, int end) {
+  LIBXSMM_VLA_DECL(4, const float, input, rsck, S, C, K);
+  LIBXSMM_VLA_DECL(6, float, output, kcrs, blocksifm, R, S, ifmblock, ofmblock);
+  int r, s, k, c, v1, v2;
+
+  for (k = start; k < end; k++) {
+    for (c = 0; c < blocksifm; c++) {
+      for (r = 0; r < R; r++) {
+        for (s = 0; s < S; s++) {
+          for (v1 = c * ifmblock; v1 < std::min(C, (c + 1) * ifmblock); v1++) {
+            for (v2 = k * ofmblock; v2 < std::min(K, (k + 1) * ofmblock); v2++)
+              LIBXSMM_VLA_ACCESS(6, output, k, c, r, s, v1 - c * ifmblock,
+                                 v2 - k * ofmblock, blocksifm, R, S, ifmblock,
+                                 ofmblock) =
+                  LIBXSMM_VLA_ACCESS(4, input, r, s, v1, v2, S, C, K);
+            for (v2 = K; v2 < (k + 1) * ofmblock; v2++)
+              LIBXSMM_VLA_ACCESS(6, output, k, c, r, s, v1 - c * ifmblock,
+                                 v2 - k * ofmblock, blocksifm, R, S, ifmblock,
+                                 ofmblock) = 0.0f;
+          }
+          for (v1 = C; v1 < (c + 1) * ifmblock; v1++) {
+            for (v2 = k * ofmblock; v2 < (k + 1) * ofmblock; v2++)
+              LIBXSMM_VLA_ACCESS(6, output, k, c, r, s, v1 - c * ifmblock,
+                                 v2 - k * ofmblock, blocksifm, R, S, ifmblock,
+                                 ofmblock) = 0.0f;
           }
         }
       }
@@ -109,47 +117,28 @@ LIBXSMM_INLINE void copy_RSCK_to_custom(const float* rsck, float *kcrs, int R, i
   }
 }
 
- 
+class libxsmm_dnn_conv_desc_wrap {
+ public:
+  const libxsmm_dnn_conv_desc d;
 
-class libxsmm_dnn_conv_desc_wrap{
-  public:
-    const libxsmm_dnn_conv_desc d;
- 
-    libxsmm_dnn_conv_desc_wrap(const libxsmm_dnn_conv_desc &d_) : d(d_){
-    }
-    bool operator==(const libxsmm_dnn_conv_desc_wrap  &w) const{
-      return( d.N == w.d.N &&
-              d.C == w.d.C &&
-              d.H == w.d.H &&
-              d.W == w.d.W &&
-              d.K == w.d.K &&
-              d.R == w.d.R &&
-              d.S == w.d.S &&
-              d.u == w.d.u &&
-              d.v == w.d.v &&
-              d.pad_h == w.d.pad_h &&
-              d.pad_w == w.d.pad_w
-            );
-    }
+  libxsmm_dnn_conv_desc_wrap(const libxsmm_dnn_conv_desc& d_) : d(d_) {}
+  bool operator==(const libxsmm_dnn_conv_desc_wrap& w) const {
+    return (d.N == w.d.N && d.C == w.d.C && d.H == w.d.H && d.W == w.d.W &&
+            d.K == w.d.K && d.R == w.d.R && d.S == w.d.S && d.u == w.d.u &&
+            d.v == w.d.v && d.pad_h == w.d.pad_h && d.pad_w == w.d.pad_w);
+  }
 };
- 
- 
-struct HashFunction{
-  std::size_t operator()(const libxsmm_dnn_conv_desc_wrap & w) const{
-   
-    
 
+struct HashFunction {
+  std::size_t operator()(const libxsmm_dnn_conv_desc_wrap& w) const {
+    // unsigned char ptr[sizeof(&w.d)];
 
-    //unsigned char ptr[sizeof(&w.d)];
-
-    
-    //memcpy(ptr, (unsigned char *)&w.d, sizeof(&w.d))
-                                       
+    // memcpy(ptr, (unsigned char *)&w.d, sizeof(&w.d))
 
     //
     /*
     std::ostringstream N,C,H,W,K,R,S,u,v,padh,padw;
- 
+
     N << w.d.N; C << w.d.C;
     H << w.d.H; W << w.d.W;
     K << w.d.K; R << w.d.R;
@@ -167,47 +156,53 @@ struct HashFunction{
     //
     //
     */
-    return ( std::hash<unsigned long long>()((unsigned long long)&(w.d)));
+    return (std::hash<unsigned long long>()((unsigned long long)&(w.d)));
   }
 };
- 
-class handles{
-  public:
-    libxsmm_dnn_layer* find( const libxsmm_dnn_conv_desc_wrap &w) {
-      std::unordered_map<libxsmm_dnn_conv_desc_wrap , libxsmm_dnn_layer*, HashFunction>::iterator i = libxsmm_handles.find(w);
-      if (i == libxsmm_handles.end()){
-        libxsmm_dnn_err_t status;
-        libxsmm_dnn_layer* libxsmm_handle = libxsmm_dnn_create_conv_layer(w.d, &status);
-        chk_libxsmm_err(status, "Create handle");
-        libxsmm_handles.insert(std::make_pair(w, libxsmm_handle));
-        return libxsmm_handle;
-      }
-      else
-        return i->second;
+
+class handles {
+ public:
+  libxsmm_dnn_layer* find(const libxsmm_dnn_conv_desc_wrap& w) {
+    std::unordered_map<libxsmm_dnn_conv_desc_wrap, libxsmm_dnn_layer*,
+                       HashFunction>::iterator i = libxsmm_handles.find(w);
+    if (i == libxsmm_handles.end()) {
+      libxsmm_dnn_err_t status;
+      libxsmm_dnn_layer* libxsmm_handle =
+          libxsmm_dnn_create_conv_layer(w.d, &status);
+      chk_libxsmm_err(status, "Create handle");
+      libxsmm_handles.insert(std::make_pair(w, libxsmm_handle));
+      return libxsmm_handle;
+    } else {
+      return i->second;
     }
-   ~handles(){
-    std::unordered_map<libxsmm_dnn_conv_desc_wrap , libxsmm_dnn_layer*, HashFunction>::iterator i;
-    for (i= libxsmm_handles.begin(); i != libxsmm_handles.end(); i++)
+  }
+  ~handles() {
+    std::unordered_map<libxsmm_dnn_conv_desc_wrap, libxsmm_dnn_layer*,
+                       HashFunction>::iterator i;
+    for (i = libxsmm_handles.begin(); i != libxsmm_handles.end(); i++)
       chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(i->second),
-                    "Destroy handle");
-    }
-  private:
- 
-    std::unordered_map<libxsmm_dnn_conv_desc_wrap , libxsmm_dnn_layer*, HashFunction> libxsmm_handles;
- 
+                      "Destroy handle");
+  }
+
+ private:
+  std::unordered_map<libxsmm_dnn_conv_desc_wrap, libxsmm_dnn_layer*,
+                     HashFunction>
+      libxsmm_handles;
 };
 
 static handles libxsmm_handles;
 
-//#define LIBXSMM_DETAILED_TIMING
+// #define LIBXSMM_DETAILED_TIMING
 
 template <typename InputPtr, typename FilterPtr, typename OutputPtr>
 static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
                                    const libxsmm_dnn_conv_desc& desc,
-                                   libxsmm_dnn_compute_kind kind, InputPtr input,
-                                   FilterPtr filter, OutputPtr output) {
+                                   libxsmm_dnn_compute_kind kind,
+                                   InputPtr input, FilterPtr filter,
+                                   OutputPtr output) {
 #if defined(LIBXSMM_DETAILED_TIMING)
-  unsigned long long l_tick1, l_tick2, l_tick3, l_tick4, l_tick5, l_tick6, l_tick7, l_tick8, l_tick9, l_tick10;
+  unsigned long long l_tick1, l_tick2, l_tick3, l_tick4, l_tick5, l_tick6,
+      l_tick7, l_tick8, l_tick9, l_tick10;
   l_tick1 = libxsmm_timer_tick();
 #endif
   // setup scoped allocator, which adopts the allocator from the context
@@ -216,14 +211,14 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
   libxsmm_dnn_layer* libxsmm_handle;
   libxsmm_dnn_conv_desc_wrap w(desc);
   void* scratch;
- 
-  //if(kind == LIBXSMM_DNN_COMPUTE_KIND_FWD)
+
+  // if(kind == LIBXSMM_DNN_COMPUTE_KIND_FWD)
   libxsmm_handle = libxsmm_handles.find(w);
-  //else{
+  // else{
   //  libxsmm_handle = libxsmm_dnn_create_conv_layer(desc, &status);
   //  chk_libxsmm_err(status, "Create handle");
   //}
-  
+
   status = libxsmm_dnn_get_codegen_success(libxsmm_handle, kind);
   if (status == LIBXSMM_DNN_WARN_FALLBACK) {
     chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(libxsmm_handle),
@@ -241,12 +236,16 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 #endif
 
   int ifmblock = (libxsmm_handle->ifmblock);
-  int ofmblock = (libxsmm_handle->ofmblock); 
+  int ofmblock = (libxsmm_handle->ofmblock);
 
-  int blocksifm = desc.C%ifmblock ==0 ? desc.C/ifmblock :desc.C/ifmblock + 1;           
-  int blocksofm = desc.K%ofmblock ==0 ? desc.K/ofmblock :desc.K/ofmblock + 1;
-  float *native_filter = (float*)libxsmm_aligned_scratch( blocksofm*blocksifm*desc.R*desc.S*ifmblock*ofmblock*sizeof(float), 2097152);
- 
+  int blocksifm =
+      desc.C % ifmblock == 0 ? desc.C / ifmblock : desc.C / ifmblock + 1;
+  int blocksofm =
+      desc.K % ofmblock == 0 ? desc.K / ofmblock : desc.K / ofmblock + 1;
+  float* native_filter =
+      (float*)libxsmm_aligned_scratch(blocksofm * blocksifm * desc.R * desc.S *
+                                          ifmblock * ofmblock * sizeof(float),
+                                      2097152);
 
   const DeviceBase::CpuWorkerThreads* worker_threads =
       ctx->device()->tensorflow_cpu_worker_threads();
@@ -254,90 +253,111 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
   int num_threads = worker_threads->num_threads;
 
 #if 1
-  if(kind ==  LIBXSMM_DNN_COMPUTE_KIND_FWD || kind ==  LIBXSMM_DNN_COMPUTE_KIND_BWD){
-    if(blocksofm > num_threads){
+  if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD ||
+      kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
+    if (blocksofm > num_threads) {
       int work = blocksofm;
       BlockingCounter count(num_threads);
       for (int i = 0; i < num_threads; ++i) {
         worker_threads->workers->Schedule([=, &count]() {
-        int start = work/num_threads*i;
-        int end =  (start + work/num_threads) > work ? work: start + work/num_threads;
-        copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S,desc.C, desc.K,blocksifm,blocksofm,ifmblock,ofmblock,start, end);
-        count.DecrementCount();
+          int start = work / num_threads * i;
+          int end = (start + work / num_threads) > work
+                        ? work
+                        : start + work / num_threads;
+          copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S, desc.C,
+                              desc.K, blocksifm, blocksofm, ifmblock, ofmblock,
+                              start, end);
+          count.DecrementCount();
         });
       }
       count.Wait();
-    }
-    else{
- 
+    } else {
       int work = blocksofm;
       int num_threads = work;
- 
+
       BlockingCounter count(num_threads);
       for (int i = 0; i < num_threads; ++i) {
         worker_threads->workers->Schedule([=, &count]() {
-        int start = i;
-        int end =  i+1;
-        copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S,desc.C, desc.K,blocksifm,blocksofm,ifmblock,ofmblock, start, end);
-        count.DecrementCount();
+          int start = i;
+          int end = i + 1;
+          copy_RSCK_to_custom(filter, native_filter, desc.R, desc.S, desc.C,
+                              desc.K, blocksifm, blocksofm, ifmblock, ofmblock,
+                              start, end);
+          count.DecrementCount();
         });
       }
       count.Wait();
     }
-  }
-  //Added: for weight update
-  else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD){
-    libxsmm_filter = libxsmm_dnn_link_filter(libxsmm_handle, LIBXSMM_DNN_FILTER, filter, LIBXSMM_DNN_TENSOR_FORMAT_RSCK_PTR, &status);
-    chk_libxsmm_err(status, "Link filter");//weight update is in RSCK as filter should be returned in RSCK format
+  } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
+    // Added: for weight update
+    libxsmm_filter =
+        libxsmm_dnn_link_filter(libxsmm_handle, LIBXSMM_DNN_FILTER, filter,
+                                LIBXSMM_DNN_TENSOR_FORMAT_RSCK_PTR, &status);
+    chk_libxsmm_err(status,
+                    "Link filter");  // weight update is in RSCK as
+                                     // filter should be returned in RSCK
+                                     // format
   }
 #else
-  memset( native_filter, 0, blocksofm*blocksifm*desc.R*desc.S*ifmblock*ofmblock*sizeof(float));
+  memset(native_filter, 0,
+         blocksofm * blocksifm * desc.R * desc.S * ifmblock * ofmblock *
+             sizeof(float));
 #endif
 
 #if defined(LIBXSMM_DETAILED_TIMING)
   l_tick3 = libxsmm_timer_tick();
 #endif
 
-  libxsmm_input = libxsmm_dnn_link_buffer(
-      libxsmm_handle, LIBXSMM_DNN_INPUT, input, LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
+  libxsmm_input =
+      libxsmm_dnn_link_buffer(libxsmm_handle, LIBXSMM_DNN_INPUT, input,
+                              LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
   chk_libxsmm_err(status, "Link input buffer");
-  libxsmm_output = libxsmm_dnn_link_buffer(
-      libxsmm_handle, LIBXSMM_DNN_OUTPUT, output, LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
+  libxsmm_output =
+      libxsmm_dnn_link_buffer(libxsmm_handle, LIBXSMM_DNN_OUTPUT, output,
+                              LIBXSMM_DNN_TENSOR_FORMAT_NHWC_PTR, &status);
   chk_libxsmm_err(status, "Link output buffer");
-  if(kind == LIBXSMM_DNN_COMPUTE_KIND_FWD || kind == LIBXSMM_DNN_COMPUTE_KIND_BWD){
-  libxsmm_filter = libxsmm_dnn_link_filter(
-      libxsmm_handle, LIBXSMM_DNN_FILTER, native_filter, LIBXSMM_DNN_TENSOR_FORMAT_LIBXSMM_PTR, &status);
-  chk_libxsmm_err(status, "Link filter");
+  if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD ||
+      kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
+    libxsmm_filter = libxsmm_dnn_link_filter(
+        libxsmm_handle, LIBXSMM_DNN_FILTER, native_filter,
+        LIBXSMM_DNN_TENSOR_FORMAT_LIBXSMM_PTR, &status);
+    chk_libxsmm_err(status, "Link filter");
   }
   if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD) {
     chk_libxsmm_err(libxsmm_dnn_zero_buffer(libxsmm_output), "Zero output");
 
-    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input, LIBXSMM_DNN_REGULAR_INPUT),
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input,
+                                            LIBXSMM_DNN_REGULAR_INPUT),
                     "Bind input forward");
-    chk_libxsmm_err(
-        libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output, LIBXSMM_DNN_REGULAR_OUTPUT),
-        "Bind output forward");
-    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter, LIBXSMM_DNN_REGULAR_FILTER),
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output,
+                                            LIBXSMM_DNN_REGULAR_OUTPUT),
+                    "Bind output forward");
+    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter,
+                                            LIBXSMM_DNN_REGULAR_FILTER),
                     "Bind filter forward");
   } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
     chk_libxsmm_err(libxsmm_dnn_zero_buffer(libxsmm_input), "Zero input");
 
-    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input, LIBXSMM_DNN_GRADIENT_INPUT),
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input,
+                                            LIBXSMM_DNN_GRADIENT_INPUT),
                     "Bind input backward");
-    chk_libxsmm_err(
-        libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output, LIBXSMM_DNN_GRADIENT_OUTPUT),
-        "Bind output backward");
-    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter, LIBXSMM_DNN_REGULAR_FILTER),
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output,
+                                            LIBXSMM_DNN_GRADIENT_OUTPUT),
+                    "Bind output backward");
+    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter,
+                                            LIBXSMM_DNN_REGULAR_FILTER),
                     "Bind filter backward");
   } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
     chk_libxsmm_err(libxsmm_dnn_zero_filter(libxsmm_filter), "Zero filter");
 
-    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input, LIBXSMM_DNN_REGULAR_INPUT),
-                    "Bind input weight udpate");
-    chk_libxsmm_err(
-        libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output, LIBXSMM_DNN_GRADIENT_OUTPUT),
-        "Bind output weight update");
-    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter, LIBXSMM_DNN_GRADIENT_FILTER),
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input,
+                                            LIBXSMM_DNN_REGULAR_INPUT),
+                    "Bind input weight update");
+    chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output,
+                                            LIBXSMM_DNN_GRADIENT_OUTPUT),
+                    "Bind output weight update");
+    chk_libxsmm_err(libxsmm_dnn_bind_filter(libxsmm_handle, libxsmm_filter,
+                                            LIBXSMM_DNN_GRADIENT_FILTER),
                     "Bind filter weight update");
   } else {
     /* shouldn't happen */
@@ -348,9 +368,14 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 #endif
 
   /* bind scratch */
-  scratch = (void*)libxsmm_aligned_scratch( libxsmm_dnn_get_scratch_size( libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL, &status ), 2097152);
-  chk_libxsmm_err( status, "scratch allocation" );
-  chk_libxsmm_err( libxsmm_dnn_bind_scratch( libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL, scratch ), "binding scratch" );
+  scratch = (void*)libxsmm_aligned_scratch(
+      libxsmm_dnn_get_scratch_size(libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL,
+                                   &status),
+      2097152);
+  chk_libxsmm_err(status, "scratch allocation");
+  chk_libxsmm_err(libxsmm_dnn_bind_scratch(
+                      libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL, scratch),
+                  "binding scratch");
 
 #if defined(LIBXSMM_DETAILED_TIMING)
   l_tick5 = libxsmm_timer_tick();
@@ -366,7 +391,7 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 
 #if 1
   BlockingCounter counter(num_threads);
-  
+
   for (int i = 0; i < num_threads; ++i) {
     worker_threads->workers->Schedule([=, &counter]() {
       chk_libxsmm_err(libxsmm_dnn_execute_st(libxsmm_handle, kind, 0, i),
@@ -376,9 +401,11 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
   }
   counter.Wait();
 #else
-  #pragma omp parallel
+#pragma omp parallel
   {
-    chk_libxsmm_err(libxsmm_dnn_execute_st(libxsmm_handle, kind, 0, omp_get_thread_num()), "Worker");
+    chk_libxsmm_err(
+        libxsmm_dnn_execute_st(libxsmm_handle, kind, 0, omp_get_thread_num()),
+        "Worker");
   }
 #endif
 
@@ -387,7 +414,7 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 #endif
 
   if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
-    libxsmm_dnn_reduce_wu_filters( libxsmm_handle, LIBXSMM_DNN_GRADIENT_FILTER );
+    libxsmm_dnn_reduce_wu_filters(libxsmm_handle, LIBXSMM_DNN_GRADIENT_FILTER);
   }
 
 #if defined(LIBXSMM_DETAILED_TIMING)
@@ -395,19 +422,39 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 #endif
 
   /* clean up */
-  chk_libxsmm_err( libxsmm_dnn_release_scratch( libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL ), "release scratch" );
+  chk_libxsmm_err(
+      libxsmm_dnn_release_scratch(libxsmm_handle, LIBXSMM_DNN_COMPUTE_KIND_ALL),
+      "release scratch");
   if (kind == LIBXSMM_DNN_COMPUTE_KIND_FWD) {
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_REGULAR_INPUT ), "release input" );
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_REGULAR_OUTPUT ), "release output" );
-    chk_libxsmm_err( libxsmm_dnn_release_filter( libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER ), "release filter" );
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_REGULAR_INPUT),
+        "release input");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_REGULAR_OUTPUT),
+        "release output");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_filter(libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER),
+        "release filter");
   } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_BWD) {
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_GRADIENT_INPUT ), "release input" );
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_GRADIENT_OUTPUT ), "release output" );
-    chk_libxsmm_err( libxsmm_dnn_release_filter( libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER ), "release filter" );
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_GRADIENT_INPUT),
+        "release input");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_GRADIENT_OUTPUT),
+        "release output");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_filter(libxsmm_handle, LIBXSMM_DNN_REGULAR_FILTER),
+        "release filter");
   } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_REGULAR_INPUT ), "release input" );
-    chk_libxsmm_err( libxsmm_dnn_release_buffer( libxsmm_handle, LIBXSMM_DNN_GRADIENT_OUTPUT ), "release output" );
-    chk_libxsmm_err( libxsmm_dnn_release_filter( libxsmm_handle, LIBXSMM_DNN_GRADIENT_FILTER ), "release filter" );
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_REGULAR_INPUT),
+        "release input");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_buffer(libxsmm_handle, LIBXSMM_DNN_GRADIENT_OUTPUT),
+        "release output");
+    chk_libxsmm_err(
+        libxsmm_dnn_release_filter(libxsmm_handle, LIBXSMM_DNN_GRADIENT_FILTER),
+        "release filter");
   } else {
     /* shouldn't happen */
   }
@@ -418,9 +465,9 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 #if defined(LIBXSMM_DETAILED_TIMING)
   l_tick9 = libxsmm_timer_tick();
 #endif
-  
-  //if(kind != LIBXSMM_DNN_COMPUTE_KIND_FWD)
-  //chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(libxsmm_handle),
+
+  // if(kind != LIBXSMM_DNN_COMPUTE_KIND_FWD)
+  // chk_libxsmm_err(libxsmm_dnn_destroy_conv_layer(libxsmm_handle),
   //               "Destroy handle");
 
   libxsmm_free(native_filter);
@@ -428,17 +475,20 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 
 #if defined(LIBXSMM_DETAILED_TIMING)
   l_tick10 = libxsmm_timer_tick();
-  printf("time for convolution (%i, %i, %i, %i, %i): %f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n", desc.N, desc.C, desc.K, desc.R, desc.S, 
-                                                                                      libxsmm_timer_duration(l_tick1, l_tick2),
-                                                                                      libxsmm_timer_duration(l_tick2, l_tick3),
-                                                                                      libxsmm_timer_duration(l_tick3, l_tick4),
-                                                                                      libxsmm_timer_duration(l_tick4, l_tick5),
-                                                                                      libxsmm_timer_duration(l_tick5, l_tick6),
-                                                                                      libxsmm_timer_duration(l_tick6, l_tick7),
-                                                                                      libxsmm_timer_duration(l_tick7, l_tick8),
-                                                                                      libxsmm_timer_duration(l_tick8, l_tick9),
-                                                                                      libxsmm_timer_duration(l_tick9, l_tick10),
-                                                                                      libxsmm_timer_duration(l_tick1, l_tick10)  );
+  printf(
+      "time for convolution (%i, %i, %i, %i, %i): %f, %f, %f, %f, %f, %f, %f, "
+      "%f, %f, %f\n",
+      desc.N, desc.C, desc.K, desc.R, desc.S,
+      libxsmm_timer_duration(l_tick1, l_tick2),
+      libxsmm_timer_duration(l_tick2, l_tick3),
+      libxsmm_timer_duration(l_tick3, l_tick4),
+      libxsmm_timer_duration(l_tick4, l_tick5),
+      libxsmm_timer_duration(l_tick5, l_tick6),
+      libxsmm_timer_duration(l_tick6, l_tick7),
+      libxsmm_timer_duration(l_tick7, l_tick8),
+      libxsmm_timer_duration(l_tick8, l_tick9),
+      libxsmm_timer_duration(l_tick9, l_tick10),
+      libxsmm_timer_duration(l_tick1, l_tick10));
 #endif
 
   return true;  // Succeeded
@@ -448,8 +498,8 @@ template <typename T>
 struct XsmmFwdConv2D<CPUDevice, T> {
   bool operator()(OpKernelContext* ctx, const libxsmm_dnn_conv_desc& desc,
                   const T* input, const T* filter, T* output) {
-    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_FWD, input,
-                                  filter, output);
+    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_FWD,
+                                  input, filter, output);
   }
 };
 
@@ -457,8 +507,8 @@ template <typename T>
 struct XsmmBkwInputConv2D<CPUDevice, T> {
   bool operator()(OpKernelContext* ctx, const libxsmm_dnn_conv_desc& desc,
                   T* input, const T* filter, const T* output) {
-    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_BWD, input,
-                                  filter, output);
+    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_BWD,
+                                  input, filter, output);
   }
 };
 
@@ -466,8 +516,8 @@ template <typename T>
 struct XsmmBkwFilterConv2D<CPUDevice, T> {
   bool operator()(OpKernelContext* ctx, const libxsmm_dnn_conv_desc& desc,
                   const T* input, T* filter, const T* output) {
-    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_UPD, input,
-                                  filter, output);
+    return CallLibxsmmConvGeneric(ctx, desc, LIBXSMM_DNN_COMPUTE_KIND_UPD,
+                                  input, filter, output);
   }
 };
 
diff --git a/tensorflow/core/lib/io/inputbuffer.cc b/tensorflow/core/lib/io/inputbuffer.cc
index 750737a62d..7efe2dc543 100644
--- a/tensorflow/core/lib/io/inputbuffer.cc
+++ b/tensorflow/core/lib/io/inputbuffer.cc
@@ -47,7 +47,7 @@ Status InputBuffer::ReadLine(string* result) {
   Status s;
   do {
     size_t buf_remain = limit_ - pos_;
-    char* newline = (char*)memchr(pos_, '\n', buf_remain);
+    char* newline = static_cast<char*>(memchr(pos_, '\n', buf_remain));
     if (newline != nullptr) {
       size_t result_len = newline - pos_;
       result->append(pos_, result_len);
diff --git a/tensorflow/core/lib/png/png_io.cc b/tensorflow/core/lib/png/png_io.cc
index bdc39e5d6f..961a78f83b 100644
--- a/tensorflow/core/lib/png/png_io.cc
+++ b/tensorflow/core/lib/png/png_io.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <string.h>
 #include <sys/types.h>
+#include <zlib.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ -152,7 +153,10 @@ bool DecodeHeader(StringPiece png_string, int* width, int* height,
   if (components != NULL) {
     switch (context.color_type) {
       case PNG_COLOR_TYPE_PALETTE:
-        *components = (context.info_ptr->valid & PNG_INFO_tRNS) ? 4 : 3;
+        *components =
+            (png_get_valid(context.png_ptr, context.info_ptr, PNG_INFO_tRNS))
+                ? 4
+                : 3;
         break;
       case PNG_COLOR_TYPE_GRAY:
         *components = 1;
@@ -176,8 +180,11 @@ bool DecodeHeader(StringPiece png_string, int* width, int* height,
   }
   if (metadata != NULL) {
     metadata->clear();
-    for (int i = 0; i < context.info_ptr->num_text; i++) {
-      const png_text& text = context.info_ptr->text[i];
+    png_textp text_ptr = NULL;
+    int num_text = 0;
+    png_get_text(context.png_ptr, context.info_ptr, &text_ptr, &num_text);
+    for (int i = 0; i < num_text; i++) {
+      const png_text& text = text_ptr[i];
       metadata->push_back(std::make_pair(text.key, text.text));
     }
   }
@@ -228,9 +235,10 @@ bool CommonInitDecode(StringPiece png_string, int desired_channels,
     return false;
   }
   if (context->channels == 0) {  // Autodetect number of channels
-    context->channels = context->info_ptr->channels;
+    context->channels = png_get_channels(context->png_ptr, context->info_ptr);
   }
-  const bool has_tRNS = (context->info_ptr->valid & PNG_INFO_tRNS) != 0;
+  const bool has_tRNS =
+      (png_get_valid(context->png_ptr, context->info_ptr, PNG_INFO_tRNS)) != 0;
   const bool has_alpha = (context->color_type & PNG_COLOR_MASK_ALPHA) != 0;
   if ((context->channels & 1) == 0) {  // We desire alpha
     if (has_alpha) {                   // There is alpha
@@ -268,7 +276,9 @@ bool CommonInitDecode(StringPiece png_string, int desired_channels,
   const bool want_gray = (context->channels < 3);
   const bool is_gray = !(context->color_type & PNG_COLOR_MASK_COLOR);
   if (is_gray) {  // upconvert gray to 8-bit if needed.
-    if (context->bit_depth < 8) png_set_gray_1_2_4_to_8(context->png_ptr);
+    if (context->bit_depth < 8) {
+      png_set_expand_gray_1_2_4_to_8(context->png_ptr);
+    }
   }
   if (want_gray) {  // output is grayscale
     if (!is_gray)
@@ -301,7 +311,9 @@ bool CommonFinishDecode(png_bytep data, int row_bytes, DecodeContext* context) {
     }
   }
 
-  context->info_ptr->valid |= PNG_INFO_IDAT;
+  // Marks iDAT as valid.
+  png_set_rows(context->png_ptr, context->info_ptr,
+               png_get_rows(context->png_ptr, context->info_ptr));
   png_read_end(context->png_ptr, context->info_ptr);
 
   // Clean up.
diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 2af4e8692b..c538a278a3 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1782,6 +1782,69 @@ op {
     }
   }
 }
+op {
+  name: "AvgPool"
+  input_arg {
+    name: "value"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "AvgPool3D"
   input_arg {
@@ -2097,6 +2160,73 @@ op {
     }
   }
 }
+op {
+  name: "AvgPoolGrad"
+  input_arg {
+    name: "orig_input_shape"
+    type: DT_INT32
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "Barrier"
   output_arg {
@@ -9755,6 +9885,72 @@ op {
     }
   }
 }
+op {
+  name: "MaxPool"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+}
 op {
   name: "MaxPool3D"
   input_arg {
@@ -10018,14 +10214,14 @@ op {
   }
 }
 op {
-  name: "MaxPoolGrad"
+  name: "MaxPool3DGrad"
   input_arg {
     name: "orig_input"
-    type_attr: "T"
+    type_attr: "TInput"
   }
   input_arg {
     name: "orig_output"
-    type_attr: "T"
+    type_attr: "TInput"
   }
   input_arg {
     name: "grad"
@@ -10039,13 +10235,13 @@ op {
     name: "ksize"
     type: "list(int)"
     has_minimum: true
-    minimum: 4
+    minimum: 5
   }
   attr {
     name: "strides"
     type: "list(int)"
     has_minimum: true
-    minimum: 4
+    minimum: 5
   }
   attr {
     name: "padding"
@@ -10061,12 +10257,12 @@ op {
     name: "data_format"
     type: "string"
     default_value {
-      s: "NHWC"
+      s: "NDHWC"
     }
     allowed_values {
       list {
-        s: "NHWC"
-        s: "NCHW"
+        s: "NDHWC"
+        s: "NCDHW"
       }
     }
   }
@@ -10079,24 +10275,61 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "TInput"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
         type: DT_HALF
       }
     }
   }
 }
 op {
-  name: "MaxPoolGradWithArgmax"
+  name: "MaxPool3DGradGrad"
   input_arg {
-    name: "input"
+    name: "orig_input"
     type_attr: "T"
   }
   input_arg {
-    name: "grad"
+    name: "orig_output"
     type_attr: "T"
   }
   input_arg {
-    name: "argmax"
-    type_attr: "Targmax"
+    name: "grad"
+    type_attr: "T"
   }
   output_arg {
     name: "output"
@@ -10106,7 +10339,358 @@ op {
     name: "ksize"
     type: "list(int)"
     has_minimum: true
-    minimum: 4
+    minimum: 5
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 5
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NDHWC"
+    }
+    allowed_values {
+      list {
+        s: "NDHWC"
+        s: "NCDHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGrad"
+  input_arg {
+    name: "orig_input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGrad"
+  input_arg {
+    name: "orig_input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGradGrad"
+  input_arg {
+    name: "orig_input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGradGradWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
+op {
+  name: "MaxPoolGradWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
   }
   attr {
     name: "strides"
@@ -10148,6 +10732,74 @@ op {
     }
   }
 }
+op {
+  name: "MaxPoolGradWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "MaxPoolWithArgmax"
   input_arg {
@@ -10211,6 +10863,73 @@ op {
     }
   }
 }
+op {
+  name: "MaxPoolWithArgmax"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "argmax"
+    type_attr: "Targmax"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    default_value {
+      type: DT_INT64
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+}
 op {
   name: "Maximum"
   input_arg {
diff --git a/tensorflow/core/ops/nn_grad.cc b/tensorflow/core/ops/nn_grad.cc
index 8a86f90e5c..05ad635f58 100644
--- a/tensorflow/core/ops/nn_grad.cc
+++ b/tensorflow/core/ops/nn_grad.cc
@@ -181,7 +181,6 @@ Status MaxPoolGrad(const AttrSlice& attrs, FunctionDef* g) {
 }
 REGISTER_OP_GRADIENT("MaxPool", MaxPoolGrad);
 
-
 Status MaxPoolGradGrad(const AttrSlice& attrs, FunctionDef* g) {
   // clang-format off
   *g = FDH::Define(
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index d1f9bbb391..4a644b55e6 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -2034,8 +2034,14 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_HALF
         type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
       }
     }
   }
@@ -2259,8 +2265,14 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_HALF
         type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
       }
     }
   }
@@ -8465,7 +8477,7 @@ op {
     }
   }
   summary: "Gather slices from `params` according to `indices`."
-  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/Gather.png\" alt>\n</div>"
+  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in unspecified behavior (currently the result is\n`0`, but this may become an error in the future).\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/Gather.png\" alt>\n</div>"
 }
 op {
   name: "GatherNd"
@@ -10574,6 +10586,13 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -10699,12 +10718,12 @@ op {
   input_arg {
     name: "orig_input"
     description: "The original input tensor."
-    type: DT_FLOAT
+    type_attr: "TInput"
   }
   input_arg {
     name: "orig_output"
     description: "The original output tensor."
-    type: DT_FLOAT
+    type_attr: "TInput"
   }
   input_arg {
     name: "grad"
@@ -10757,6 +10776,34 @@ op {
   attr {
     name: "T"
     type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "TInput"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
     allowed_values {
       list {
         type: DT_FLOAT
@@ -10778,6 +10825,86 @@ op {
   }
   summary: "Computes gradients of max pooling function."
 }
+op {
+  name: "MaxPool3DGradGrad"
+  input_arg {
+    name: "orig_input"
+    description: "The original input tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    description: "The original output tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    description: "Output backprop of shape `[batch, depth, rows, cols, channels]`."
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    description: "Gradients of gradients w.r.t. the input to `max_pool`."
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    description: "1-D tensor of length 5. The size of the window for each dimension of\nthe input tensor. Must have `ksize[0] = ksize[4] = 1`."
+    has_minimum: true
+    minimum: 5
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    description: "1-D tensor of length 5. The stride of the sliding window for each\ndimension of `input`. Must have `strides[0] = strides[4] = 1`."
+    has_minimum: true
+    minimum: 5
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    description: "The type of padding algorithm to use."
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NDHWC"
+    }
+    description: "The data format of the input and output data. With the\ndefault format \"NDHWC\", the data is stored in the order of:\n    [batch, in_depth, in_height, in_width, in_channels].\nAlternatively, the format could be \"NCDHW\", the data storage order is:\n    [batch, in_channels, in_depth, in_height, in_width]."
+    allowed_values {
+      list {
+        s: "NDHWC"
+        s: "NCDHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  summary: "Computes second-order gradients of the maxpooling function."
+}
 op {
   name: "MaxPoolGrad"
   input_arg {
@@ -10848,12 +10975,175 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
   }
   summary: "Computes gradients of the maxpooling function."
 }
+op {
+  name: "MaxPoolGradGrad"
+  input_arg {
+    name: "orig_input"
+    description: "The original input tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "orig_output"
+    description: "The original output tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    description: "4-D.  Gradients of gradients w.r.t. the input of `max_pool`."
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    description: "Gradients of gradients w.r.t. the input to `max_pool`."
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    description: "The size of the window for each dimension of the input tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    description: "The stride of the sliding window for each dimension of the\ninput tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    description: "The type of padding algorithm to use."
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    description: "Specify the data format of the input and output data. With the\ndefault format \"NHWC\", the data is stored in the order of:\n    [batch, in_height, in_width, in_channels].\nAlternatively, the format could be \"NCHW\", the data storage order of:\n    [batch, in_channels, in_height, in_width]."
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  summary: "Computes second-order gradients of the maxpooling function."
+}
+op {
+  name: "MaxPoolGradGradWithArgmax"
+  input_arg {
+    name: "input"
+    description: "The original input."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    description: "4-D with shape `[batch, height, width, channels]`.  Gradients w.r.t. the\ninput of `max_pool`."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "argmax"
+    description: "The indices of the maximum values chosen for each output of `max_pool`."
+    type_attr: "Targmax"
+  }
+  output_arg {
+    name: "output"
+    description: "Gradients of gradients w.r.t. the input of `max_pool`."
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    description: "The size of the window for each dimension of the input tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    description: "The stride of the sliding window for each dimension of the\ninput tensor."
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    description: "The type of padding algorithm to use."
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "Targmax"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
+        type: DT_HALF
+      }
+    }
+  }
+  summary: "Computes second-order gradients of the maxpooling function."
+}
 op {
   name: "MaxPoolGradWithArgmax"
   input_arg {
@@ -10914,12 +11204,16 @@ op {
   attr {
     name: "T"
     type: "type"
-    default_value {
-      type: DT_FLOAT
-    }
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -10984,12 +11278,16 @@ op {
   attr {
     name: "T"
     type: "type"
-    default_value {
-      type: DT_FLOAT
-    }
     allowed_values {
       list {
         type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_UINT8
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_UINT16
         type: DT_HALF
       }
     }
diff --git a/tensorflow/core/platform/cpu_info.cc b/tensorflow/core/platform/cpu_info.cc
index 451b7209bb..9edf2de64c 100644
--- a/tensorflow/core/platform/cpu_info.cc
+++ b/tensorflow/core/platform/cpu_info.cc
@@ -69,10 +69,6 @@ int GetXCR0EAX() {
 // Structure for basic CPUID info
 class CPUIDInfo {
 public:
-  string vendor_str;
-  int family;
-  int model_num;
-
   CPUIDInfo()
       : have_adx_(0),
         have_aes_(0),
@@ -121,9 +117,9 @@ public:
 
     // Get vendor string (issue CPUID with eax = 0)
     GETCPUID(eax, ebx, ecx, edx, 0, 0);
-    cpuid->vendor_str.append(reinterpret_cast<char *>(&ebx), 4);
-    cpuid->vendor_str.append(reinterpret_cast<char *>(&edx), 4);
-    cpuid->vendor_str.append(reinterpret_cast<char *>(&ecx), 4);
+    cpuid->vendor_str_.append(reinterpret_cast<char *>(&ebx), 4);
+    cpuid->vendor_str_.append(reinterpret_cast<char *>(&edx), 4);
+    cpuid->vendor_str_.append(reinterpret_cast<char *>(&ecx), 4);
 
     // To get general information and extended features we send eax = 1 and
     // ecx = 0 to cpuid.  The response is returned in eax, ebx, ecx and edx.
@@ -131,8 +127,8 @@ public:
     // Volume 2A: Instruction Set Reference, A-M CPUID).
     GETCPUID(eax, ebx, ecx, edx, 1, 0);
 
-    cpuid->model_num = static_cast<int>((eax >> 4) & 0xf);
-    cpuid->family = static_cast<int>((eax >> 8) & 0xf);
+    cpuid->model_num_ = static_cast<int>((eax >> 4) & 0xf);
+    cpuid->family_ = static_cast<int>((eax >> 8) & 0xf);
 
     cpuid->have_aes_ = (ecx >> 25) & 0x1;
     cpuid->have_cmov_ = (edx >> 15) & 0x1;
@@ -254,6 +250,10 @@ public:
     return false;
   }
 
+  string vendor_str() const { return vendor_str_; }
+  int family() const { return family_; }
+  int model_num() { return model_num_; }
+
  private:
   int highest_eax_;
   int have_adx_ : 1;
@@ -293,6 +293,9 @@ public:
   int have_sse4_2_ : 1;
   int have_ssse3_ : 1;
   int have_hypervisor_ : 1;
+  string vendor_str_;
+  int family_;
+  int model_num_;
 };
 
 std::once_flag cpuid_once_flag;
@@ -318,7 +321,7 @@ bool TestCPUFeature(CPUFeature feature) {
 std::string CPUVendorIDString() {
 #ifdef PLATFORM_IS_X86
   InitCPUIDInfo();
-  return cpuid->vendor_str;
+  return cpuid->vendor_str();
 #else
   return "";
 #endif
@@ -327,7 +330,7 @@ std::string CPUVendorIDString() {
 int CPUFamily() {
 #ifdef PLATFORM_IS_X86
   InitCPUIDInfo();
-  return cpuid->family;
+  return cpuid->family();
 #else
   return 0;
 #endif
@@ -336,7 +339,7 @@ int CPUFamily() {
 int CPUModelNum() {
 #ifdef PLATFORM_IS_X86
   InitCPUIDInfo();
-  return cpuid->model_num;
+  return cpuid->model_num();
 #else
   return 0;
 #endif
diff --git a/tensorflow/core/platform/windows/port.cc b/tensorflow/core/platform/windows/port.cc
index b29f978f66..85b53e07c4 100644
--- a/tensorflow/core/platform/windows/port.cc
+++ b/tensorflow/core/platform/windows/port.cc
@@ -58,21 +58,20 @@ int NumSchedulableCPUs() {
 
 void* AlignedMalloc(size_t size, int minimum_alignment) {
 #ifdef TENSORFLOW_USE_JEMALLOC
-    void* ptr = NULL;
-    // posix_memalign requires that the requested alignment be at least
-    // sizeof(void*). In this case, fall back on malloc which should return
-    // memory aligned to at least the size of a pointer.
-    const int required_alignment = sizeof(void*);
-    if (minimum_alignment < required_alignment) return Malloc(size);
-    int err = jemalloc_posix_memalign(&ptr, minimum_alignment, size);
-    if (err != 0) {
-        return NULL;
-    }
-    else {
-        return ptr;
-    }
+  void* ptr = NULL;
+  // posix_memalign requires that the requested alignment be at least
+  // sizeof(void*). In this case, fall back on malloc which should return
+  // memory aligned to at least the size of a pointer.
+  const int required_alignment = sizeof(void*);
+  if (minimum_alignment < required_alignment) return Malloc(size);
+  int err = jemalloc_posix_memalign(&ptr, minimum_alignment, size);
+  if (err != 0) {
+    return NULL;
+  } else {
+    return ptr;
+  }
 #else
-    return _aligned_malloc(size, minimum_alignment);
+  return _aligned_malloc(size, minimum_alignment);
 #endif
 }
 
diff --git a/tensorflow/core/protobuf/rewriter_config.proto b/tensorflow/core/protobuf/rewriter_config.proto
index aef69461d8..6e9eff6225 100644
--- a/tensorflow/core/protobuf/rewriter_config.proto
+++ b/tensorflow/core/protobuf/rewriter_config.proto
@@ -9,4 +9,8 @@ option java_package = "org.tensorflow.framework";
 message RewriterConfig {
   bool optimize_tensor_layout = 1;
   bool disable_model_pruning = 2;
+  bool constant_folding = 3;
+  // If non-empty, will use this as an alternative way to specify a list of
+  // optimizations to turn on and the order of the optimizations.
+  repeated string optimizers = 100;
 }
diff --git a/tensorflow/core/util/equal_graph_def.cc b/tensorflow/core/util/equal_graph_def.cc
index 7e7a3f5223..2db026da56 100644
--- a/tensorflow/core/util/equal_graph_def.cc
+++ b/tensorflow/core/util/equal_graph_def.cc
@@ -28,13 +28,18 @@ bool EqualGraphDef(const GraphDef& actual, const GraphDef& expected,
                    string* diff, const EqualGraphDefOptions& options) {
   // Intentionally do not check that versions match so that this routine can
   // be used for less brittle golden file tests.
+  return EqualRepeatedNodeDef(actual.node(), expected.node(), diff, options);
+}
 
+bool EqualRepeatedNodeDef(const protobuf::RepeatedPtrField<NodeDef>& actual,
+                          const protobuf::RepeatedPtrField<NodeDef>& expected,
+                          string* diff, const EqualGraphDefOptions& options) {
   std::unordered_map<string, const NodeDef*> actual_index;
-  for (const NodeDef& node : actual.node()) {
+  for (const NodeDef& node : actual) {
     actual_index[node.name()] = &node;
   }
 
-  for (const NodeDef& expected_node : expected.node()) {
+  for (const NodeDef& expected_node : expected) {
     auto actual_iter = actual_index.find(expected_node.name());
     if (actual_iter == actual_index.end()) {
       if (diff != nullptr) {
@@ -53,10 +58,9 @@ bool EqualGraphDef(const GraphDef& actual, const GraphDef& expected,
 
   if (!actual_index.empty()) {
     if (diff != nullptr) {
-      *diff = strings::StrCat("Found unexpected node '",
-                              SummarizeNodeDef(*actual_index.begin()->second),
-                              "' not in expected graph:\n",
-                              SummarizeGraphDef(expected));
+      *diff =
+          strings::StrCat("Found unexpected node '",
+                          SummarizeNodeDef(*actual_index.begin()->second), "'");
     }
     return false;
   }
diff --git a/tensorflow/core/util/equal_graph_def.h b/tensorflow/core/util/equal_graph_def.h
index 82f8bd0713..1ce6181c2e 100644
--- a/tensorflow/core/util/equal_graph_def.h
+++ b/tensorflow/core/util/equal_graph_def.h
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/graph_def_util.h"
+#include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -44,6 +45,14 @@ bool EqualGraphDef(const GraphDef& actual, const GraphDef& expected,
 bool EqualNodeDef(const NodeDef& actual, const NodeDef& expected, string* diff,
                   const EqualGraphDefOptions& options = {});
 
+// Determines if actual and expected are equal, ignoring ordering. If they're
+// different and diff != nullptr, *diff is set to an explanation of the
+// difference.
+bool EqualRepeatedNodeDef(const protobuf::RepeatedPtrField<NodeDef>& actual,
+                          const protobuf::RepeatedPtrField<NodeDef>& expected,
+                          string* diff,
+                          const EqualGraphDefOptions& options = {});
+
 #define TF_EXPECT_GRAPH_EQ(expected, actual)                  \
   do {                                                        \
     string diff;                                              \
diff --git a/tensorflow/core/util/equal_graph_def_test.cc b/tensorflow/core/util/equal_graph_def_test.cc
index 9ce951e6ef..af870c5c60 100644
--- a/tensorflow/core/util/equal_graph_def_test.cc
+++ b/tensorflow/core/util/equal_graph_def_test.cc
@@ -47,8 +47,7 @@ class EqualGraphDefTest : public ::testing::Test {
  protected:
   EqualGraphDefTest()
       : e_(GraphDefBuilder::kFailImmediately),
-        a_(GraphDefBuilder::kFailImmediately) {
-  }
+        a_(GraphDefBuilder::kFailImmediately) {}
 
   bool Match() {
     GraphDef expected;
@@ -89,11 +88,7 @@ TEST_F(EqualGraphDefTest, ExtraNode) {
   Input(a_.opts().WithName("A"));
   Input(a_.opts().WithName("B"));
   EXPECT_FALSE(Match());
-  EXPECT_EQ(strings::StrCat(
-                "Found unexpected node 'B = Input[]()' not in expected graph:\n"
-                "versions = producer: ",
-                TF_GRAPH_DEF_VERSION, ";\n", "A = Input[]();\n"),
-            diff_);
+  EXPECT_EQ("Found unexpected node 'B = Input[]()'", diff_);
 }
 
 TEST_F(EqualGraphDefTest, NodeOrder) {
@@ -169,21 +164,23 @@ TEST_F(EqualGraphDefTest, ControlInputOrder) {
   Node* b = Input(e_.opts().WithName("B"));
   Node* c = Input(e_.opts().WithName("C"));
   Node* d = Input(e_.opts().WithName("D"));
-  Combine(a, a, e_.opts()
-                    .WithName("E")
-                    .WithControlInput(b)
-                    .WithControlInput(c)
-                    .WithControlInput(d));
+  Combine(a, a,
+          e_.opts()
+              .WithName("E")
+              .WithControlInput(b)
+              .WithControlInput(c)
+              .WithControlInput(d));
 
   a = Input(a_.opts().WithName("A"));
   b = Input(a_.opts().WithName("B"));
   c = Input(a_.opts().WithName("C"));
   d = Input(a_.opts().WithName("D"));
-  Combine(a, a, a_.opts()
-                    .WithName("E")
-                    .WithControlInput(c)
-                    .WithControlInput(d)
-                    .WithControlInput(b));
+  Combine(a, a,
+          a_.opts()
+              .WithName("E")
+              .WithControlInput(c)
+              .WithControlInput(d)
+              .WithControlInput(b));
   EXPECT_TRUE(Match()) << diff_;
 }
 
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index 4556fae2a3..ebbe195bbc 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -17,8 +17,8 @@ limitations under the License.
 #define TENSORFLOW_CORE_UTIL_MKL_UTIL_H_
 #ifdef INTEL_MKL
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
@@ -63,9 +63,7 @@ class MklShape {
 
   void SetMklTensor(const bool isMklTensor) { isMklTensor_ = isMklTensor; }
 
-  void SetDimensions(const size_t dimension) {
-    dimension_ = dimension;
-  }
+  void SetDimensions(const size_t dimension) { dimension_ = dimension; }
 
   void SetMklLayout(const void* primitive, size_t resourceType) {
     CHECK_EQ(
@@ -408,8 +406,8 @@ static inline bool IsMklLayer(const std::string& op_name, DataType T) {
   // the type is float. Actually, we should query kernel registration and
   // find out if op is supported for type T. But there is no API to query
   // kernel registration using name and type.
-  bool result = (kernel.find(kMklLayerLabelPattern) != string::npos) &&
-                (T == DT_FLOAT);
+  bool result =
+      (kernel.find(kMklLayerLabelPattern) != string::npos) && (T == DT_FLOAT);
   if (result == true) {
     VLOG(1) << "mkl_layer_registry::" << op_name << " is " << kMklLayerLabel;
   }
diff --git a/tensorflow/go/example_inception_inference_test.go b/tensorflow/go/example_inception_inference_test.go
index 87056b85a2..682bd245cc 100644
--- a/tensorflow/go/example_inception_inference_test.go
+++ b/tensorflow/go/example_inception_inference_test.go
@@ -28,8 +28,8 @@ import (
 	"os"
 	"path/filepath"
 
-	tf "github.com/tensorflow/tensorflow/tensorflow/go"
 	"github.com/tensorflow/tensorflow/tensorflow/go/op"
+	tf "github.com/tensorflow/tensorflow/tensorflow/go"
 )
 
 func Example() {
diff --git a/tensorflow/go/genop/internal/genop.go b/tensorflow/go/genop/internal/genop.go
index 7c9c5a4d6e..dec08dee1c 100644
--- a/tensorflow/go/genop/internal/genop.go
+++ b/tensorflow/go/genop/internal/genop.go
@@ -158,12 +158,12 @@ func makeOutputList(op *tf.Operation, start int, output string) ([]tf.Output, in
 `))
 
 	tmplOp = template.Must(template.New("op").Funcs(template.FuncMap{
-		"MakeComment": makeComment,
-		"GoType":      goType,
-		"CamelCase":   camelCase,
-		"Identifier":  identifier,
-		"IsListArg":   isListArg,
-		"IsListAttr":  isListAttr,
+		"MakeComment":       makeComment,
+		"GoType":            goType,
+		"CamelCase":         camelCase,
+		"Identifier":        identifier,
+		"IsListArg":         isListArg,
+		"IsListAttr":        isListAttr,
 		"StripLeadingColon": stripLeadingColon,
 	}).Parse(`
 {{if .OptionalAttrs -}}
diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index bbf687e322..877961d0aa 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -4841,6 +4841,59 @@ func DynamicStitch(scope *Scope, indices []tf.Output, data []tf.Output) (merged
 	return op.Output(0)
 }
 
+// CropAndResizeGradBoxesAttr is an optional argument to CropAndResizeGradBoxes.
+type CropAndResizeGradBoxesAttr func(optionalAttr)
+
+// CropAndResizeGradBoxesMethod sets the optional method attribute to value.
+//
+// value: A string specifying the interpolation method. Only 'bilinear' is
+// supported for now.
+// If not specified, defaults to "bilinear"
+func CropAndResizeGradBoxesMethod(value string) CropAndResizeGradBoxesAttr {
+	return func(m optionalAttr) {
+		m["method"] = value
+	}
+}
+
+// Computes the gradient of the crop_and_resize op wrt the input boxes tensor.
+//
+// Arguments:
+//	grads: A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
+//	image: A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
+// Both `image_height` and `image_width` need to be positive.
+//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
+// specifies the coordinates of a box in the `box_ind[i]` image and is specified
+// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
+// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
+// `[0, 1]` interval of normalized image height is mapped to
+// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
+// which case the sampled crop is an up-down flipped version of the original
+// image. The width dimension is treated similarly. Normalized coordinates
+// outside the `[0, 1]` range are allowed, in which case we use
+// `extrapolation_value` to extrapolate the input image values.
+//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
+// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
+//
+// Returns A 2-D tensor of shape `[num_boxes, 4]`.
+func CropAndResizeGradBoxes(scope *Scope, grads tf.Output, image tf.Output, boxes tf.Output, box_ind tf.Output, optional ...CropAndResizeGradBoxesAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "CropAndResizeGradBoxes",
+		Input: []tf.Input{
+			grads, image, boxes, box_ind,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes softmax cross entropy cost and gradients to backpropagate.
 //
 // Unlike `SoftmaxCrossEntropyWithLogits`, this operation does not accept
@@ -5205,10 +5258,10 @@ func FusedBatchNormGrad(scope *Scope, y_backprop tf.Output, x tf.Output, scale t
 	return op.Output(0), op.Output(1), op.Output(2), op.Output(3), op.Output(4)
 }
 
-// AvgPool3DAttr is an optional argument to AvgPool3D.
-type AvgPool3DAttr func(optionalAttr)
+// MaxPool3DGradGradAttr is an optional argument to MaxPool3DGradGrad.
+type MaxPool3DGradGradAttr func(optionalAttr)
 
-// AvgPool3DDataFormat sets the optional data_format attribute to value.
+// MaxPool3DGradGradDataFormat sets the optional data_format attribute to value.
 //
 // value: The data format of the input and output data. With the
 // default format "NDHWC", the data is stored in the order of:
@@ -5216,24 +5269,26 @@ type AvgPool3DAttr func(optionalAttr)
 // Alternatively, the format could be "NCDHW", the data storage order is:
 //     [batch, in_channels, in_depth, in_height, in_width].
 // If not specified, defaults to "NDHWC"
-func AvgPool3DDataFormat(value string) AvgPool3DAttr {
+func MaxPool3DGradGradDataFormat(value string) MaxPool3DGradGradAttr {
 	return func(m optionalAttr) {
 		m["data_format"] = value
 	}
 }
 
-// Performs 3D average pooling on the input.
+// Computes second-order gradients of the maxpooling function.
 //
 // Arguments:
-//	input: Shape `[batch, depth, rows, cols, channels]` tensor to pool over.
+//	orig_input: The original input tensor.
+//	orig_output: The original output tensor.
+//	grad: Output backprop of shape `[batch, depth, rows, cols, channels]`.
 //	ksize: 1-D tensor of length 5. The size of the window for each dimension of
 // the input tensor. Must have `ksize[0] = ksize[4] = 1`.
 //	strides: 1-D tensor of length 5. The stride of the sliding window for each
 // dimension of `input`. Must have `strides[0] = strides[4] = 1`.
 //	padding: The type of padding algorithm to use.
 //
-// Returns The average pooled output tensor.
-func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DAttr) (output tf.Output) {
+// Returns Gradients of gradients w.r.t. the input to `max_pool`.
+func MaxPool3DGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPool3DGradGradAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -5242,9 +5297,9 @@ func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, pa
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "AvgPool3D",
+		Type: "MaxPool3DGradGrad",
 		Input: []tf.Input{
-			input,
+			orig_input, orig_output, grad,
 		},
 		Attrs: attrs,
 	}
@@ -5252,35 +5307,6 @@ func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, pa
 	return op.Output(0)
 }
 
-// Produces the max pool of the input tensor for quantized types.
-//
-// Arguments:
-//	input: The 4D (batch x rows x cols x depth) Tensor to MaxReduce over.
-//	min_input: The float value that the lowest quantized input value represents.
-//	max_input: The float value that the highest quantized input value represents.
-//	ksize: The size of the window for each dimension of the input tensor.
-// The length must be 4 to match the number of dimensions of the input.
-//	strides: The stride of the sliding window for each dimension of the input
-// tensor. The length must be 4 to match the number of dimensions of the input.
-//	padding: The type of padding algorithm to use.
-//
-// Returns The float value that the lowest quantized output value represents.The float value that the highest quantized output value represents.
-func QuantizedMaxPool(scope *Scope, input tf.Output, min_input tf.Output, max_input tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output, min_output tf.Output, max_output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
-	opspec := tf.OpSpec{
-		Type: "QuantizedMaxPool",
-		Input: []tf.Input{
-			input, min_input, max_input,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
 // FakeQuantWithMinMaxArgsGradientAttr is an optional argument to FakeQuantWithMinMaxArgsGradient.
 type FakeQuantWithMinMaxArgsGradientAttr func(optionalAttr)
 
@@ -5403,6 +5429,82 @@ func Equal(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
+// AvgPool3DAttr is an optional argument to AvgPool3D.
+type AvgPool3DAttr func(optionalAttr)
+
+// AvgPool3DDataFormat sets the optional data_format attribute to value.
+//
+// value: The data format of the input and output data. With the
+// default format "NDHWC", the data is stored in the order of:
+//     [batch, in_depth, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCDHW", the data storage order is:
+//     [batch, in_channels, in_depth, in_height, in_width].
+// If not specified, defaults to "NDHWC"
+func AvgPool3DDataFormat(value string) AvgPool3DAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Performs 3D average pooling on the input.
+//
+// Arguments:
+//	input: Shape `[batch, depth, rows, cols, channels]` tensor to pool over.
+//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
+// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
+//	strides: 1-D tensor of length 5. The stride of the sliding window for each
+// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
+//	padding: The type of padding algorithm to use.
+//
+// Returns The average pooled output tensor.
+func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "AvgPool3D",
+		Input: []tf.Input{
+			input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Produces the max pool of the input tensor for quantized types.
+//
+// Arguments:
+//	input: The 4D (batch x rows x cols x depth) Tensor to MaxReduce over.
+//	min_input: The float value that the lowest quantized input value represents.
+//	max_input: The float value that the highest quantized input value represents.
+//	ksize: The size of the window for each dimension of the input tensor.
+// The length must be 4 to match the number of dimensions of the input.
+//	strides: The stride of the sliding window for each dimension of the input
+// tensor. The length must be 4 to match the number of dimensions of the input.
+//	padding: The type of padding algorithm to use.
+//
+// Returns The float value that the lowest quantized output value represents.The float value that the highest quantized output value represents.
+func QuantizedMaxPool(scope *Scope, input tf.Output, min_input tf.Output, max_input tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output, min_output tf.Output, max_output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "QuantizedMaxPool",
+		Input: []tf.Input{
+			input, min_input, max_input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
 // Conv3DBackpropInputV2Attr is an optional argument to Conv3DBackpropInputV2.
 type Conv3DBackpropInputV2Attr func(optionalAttr)
 
@@ -5959,64 +6061,6 @@ func BiasAddV1(scope *Scope, value tf.Output, bias tf.Output) (output tf.Output)
 	return op.Output(0)
 }
 
-// FractionalAvgPoolGradAttr is an optional argument to FractionalAvgPoolGrad.
-type FractionalAvgPoolGradAttr func(optionalAttr)
-
-// FractionalAvgPoolGradOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [41/3, 26/3] for fractional avg pooling.
-// If not specified, defaults to false
-func FractionalAvgPoolGradOverlapping(value bool) FractionalAvgPoolGradAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// Computes gradient of the FractionalAvgPool function.
-//
-// Unlike FractionalMaxPoolGrad, we don't need to find arg_max for
-// FractionalAvgPoolGrad, we just need to evenly back-propagate each element of
-// out_backprop to those indices that form the same pooling cell. Therefore, we
-// just need to know the shape of original input tensor, instead of the whole
-// tensor.
-//
-// Arguments:
-//	orig_input_tensor_shape: Original input tensor shape for `fractional_avg_pool`
-//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
-// w.r.t. the output of `fractional_avg_pool`.
-//	row_pooling_sequence: row pooling sequence, form pooling region with
-// col_pooling_sequence.
-//	col_pooling_sequence: column pooling sequence, form pooling region with
-// row_pooling sequence.
-//
-// Returns 4-D.  Gradients w.r.t. the input of `fractional_avg_pool`.
-func FractionalAvgPoolGrad(scope *Scope, orig_input_tensor_shape tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalAvgPoolGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalAvgPoolGrad",
-		Input: []tf.Input{
-			orig_input_tensor_shape, out_backprop, row_pooling_sequence, col_pooling_sequence,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Conv2DBackpropInputAttr is an optional argument to Conv2DBackpropInput.
 type Conv2DBackpropInputAttr func(optionalAttr)
 
@@ -6219,104 +6263,6 @@ func Sigmoid(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
-// FractionalMaxPoolGradAttr is an optional argument to FractionalMaxPoolGrad.
-type FractionalMaxPoolGradAttr func(optionalAttr)
-
-// FractionalMaxPoolGradOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [20, 16] for fractional max pooling.
-// If not specified, defaults to false
-func FractionalMaxPoolGradOverlapping(value bool) FractionalMaxPoolGradAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// Computes gradient of the FractionalMaxPool function.
-//
-// Arguments:
-//	orig_input: Original input for `fractional_max_pool`
-//	orig_output: Original output for `fractional_max_pool`
-//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
-// w.r.t. the output of `fractional_max_pool`.
-//	row_pooling_sequence: row pooling sequence, form pooling region with
-// col_pooling_sequence.
-//	col_pooling_sequence: column pooling sequence, form pooling region with
-// row_pooling sequence.
-//
-// Returns 4-D.  Gradients w.r.t. the input of `fractional_max_pool`.
-func FractionalMaxPoolGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalMaxPoolGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalMaxPoolGrad",
-		Input: []tf.Input{
-			orig_input, orig_output, out_backprop, row_pooling_sequence, col_pooling_sequence,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// ResourceApplyAdagradDAAttr is an optional argument to ResourceApplyAdagradDA.
-type ResourceApplyAdagradDAAttr func(optionalAttr)
-
-// ResourceApplyAdagradDAUseLocking sets the optional use_locking attribute to value.
-//
-// value: If True, updating of the var and accum tensors will be protected by
-// a lock; otherwise the behavior is undefined, but may exhibit less contention.
-// If not specified, defaults to false
-func ResourceApplyAdagradDAUseLocking(value bool) ResourceApplyAdagradDAAttr {
-	return func(m optionalAttr) {
-		m["use_locking"] = value
-	}
-}
-
-// Update '*var' according to the proximal adagrad scheme.
-//
-// Arguments:
-//	var_: Should be from a Variable().
-//	gradient_accumulator: Should be from a Variable().
-//	gradient_squared_accumulator: Should be from a Variable().
-//	grad: The gradient.
-//	lr: Scaling factor. Must be a scalar.
-//	l1: L1 regularization. Must be a scalar.
-//	l2: L2 regularization. Must be a scalar.
-//	global_step: Training step number. Must be a scalar.
-//
-// Returns the created operation.
-func ResourceApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceApplyAdagradDAAttr) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "ResourceApplyAdagradDA",
-		Input: []tf.Input{
-			var_, gradient_accumulator, gradient_squared_accumulator, grad, lr, l1, l2, global_step,
-		},
-		Attrs: attrs,
-	}
-	return scope.AddOperation(opspec)
-}
-
 // ComputeAccidentalHitsAttr is an optional argument to ComputeAccidentalHits.
 type ComputeAccidentalHitsAttr func(optionalAttr)
 
@@ -9304,6 +9250,64 @@ func FractionalMaxPool(scope *Scope, value tf.Output, pooling_ratio []float32, o
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
+// FractionalAvgPoolGradAttr is an optional argument to FractionalAvgPoolGrad.
+type FractionalAvgPoolGradAttr func(optionalAttr)
+
+// FractionalAvgPoolGradOverlapping sets the optional overlapping attribute to value.
+//
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [41/3, 26/3] for fractional avg pooling.
+// If not specified, defaults to false
+func FractionalAvgPoolGradOverlapping(value bool) FractionalAvgPoolGradAttr {
+	return func(m optionalAttr) {
+		m["overlapping"] = value
+	}
+}
+
+// Computes gradient of the FractionalAvgPool function.
+//
+// Unlike FractionalMaxPoolGrad, we don't need to find arg_max for
+// FractionalAvgPoolGrad, we just need to evenly back-propagate each element of
+// out_backprop to those indices that form the same pooling cell. Therefore, we
+// just need to know the shape of original input tensor, instead of the whole
+// tensor.
+//
+// Arguments:
+//	orig_input_tensor_shape: Original input tensor shape for `fractional_avg_pool`
+//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
+// w.r.t. the output of `fractional_avg_pool`.
+//	row_pooling_sequence: row pooling sequence, form pooling region with
+// col_pooling_sequence.
+//	col_pooling_sequence: column pooling sequence, form pooling region with
+// row_pooling sequence.
+//
+// Returns 4-D.  Gradients w.r.t. the input of `fractional_avg_pool`.
+func FractionalAvgPoolGrad(scope *Scope, orig_input_tensor_shape tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalAvgPoolGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "FractionalAvgPoolGrad",
+		Input: []tf.Input{
+			orig_input_tensor_shape, out_backprop, row_pooling_sequence, col_pooling_sequence,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Reorders a SparseTensor into the canonical, row-major ordering.
 //
 // Note that by convention, all sparse ops preserve the canonical ordering along
@@ -9769,6 +9773,35 @@ func RequantizationRange(scope *Scope, input tf.Output, input_min tf.Output, inp
 	return op.Output(0), op.Output(1)
 }
 
+// Computes second-order gradients of the maxpooling function.
+//
+// Arguments:
+//	input: The original input.
+//	grad: 4-D with shape `[batch, height, width, channels]`.  Gradients w.r.t. the
+// input of `max_pool`.
+//	argmax: The indices of the maximum values chosen for each output of `max_pool`.
+//	ksize: The size of the window for each dimension of the input tensor.
+//	strides: The stride of the sliding window for each dimension of the
+// input tensor.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients of gradients w.r.t. the input of `max_pool`.
+func MaxPoolGradGradWithArgmax(scope *Scope, input tf.Output, grad tf.Output, argmax tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "MaxPoolGradGradWithArgmax",
+		Input: []tf.Input{
+			input, grad, argmax,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // DepthwiseConv2dNativeBackpropInputAttr is an optional argument to DepthwiseConv2dNativeBackpropInput.
 type DepthwiseConv2dNativeBackpropInputAttr func(optionalAttr)
 
@@ -10520,8 +10553,105 @@ func ResourceSparseApplyAdagradDAUseLocking(value bool) ResourceSparseApplyAdagr
 //	l2: L2 regularization. Must be a scalar.
 //	global_step: Training step number. Must be a scalar.
 //
-// Returns the created operation.
-func ResourceSparseApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, indices tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceSparseApplyAdagradDAAttr) (o *tf.Operation) {
+// Returns the created operation.
+func ResourceSparseApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, indices tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceSparseApplyAdagradDAAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceSparseApplyAdagradDA",
+		Input: []tf.Input{
+			var_, gradient_accumulator, gradient_squared_accumulator, grad, indices, lr, l1, l2, global_step,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
+// ResourceApplyAdagradDAAttr is an optional argument to ResourceApplyAdagradDA.
+type ResourceApplyAdagradDAAttr func(optionalAttr)
+
+// ResourceApplyAdagradDAUseLocking sets the optional use_locking attribute to value.
+//
+// value: If True, updating of the var and accum tensors will be protected by
+// a lock; otherwise the behavior is undefined, but may exhibit less contention.
+// If not specified, defaults to false
+func ResourceApplyAdagradDAUseLocking(value bool) ResourceApplyAdagradDAAttr {
+	return func(m optionalAttr) {
+		m["use_locking"] = value
+	}
+}
+
+// Update '*var' according to the proximal adagrad scheme.
+//
+// Arguments:
+//	var_: Should be from a Variable().
+//	gradient_accumulator: Should be from a Variable().
+//	gradient_squared_accumulator: Should be from a Variable().
+//	grad: The gradient.
+//	lr: Scaling factor. Must be a scalar.
+//	l1: L1 regularization. Must be a scalar.
+//	l2: L2 regularization. Must be a scalar.
+//	global_step: Training step number. Must be a scalar.
+//
+// Returns the created operation.
+func ResourceApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumulator tf.Output, gradient_squared_accumulator tf.Output, grad tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, global_step tf.Output, optional ...ResourceApplyAdagradDAAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceApplyAdagradDA",
+		Input: []tf.Input{
+			var_, gradient_accumulator, gradient_squared_accumulator, grad, lr, l1, l2, global_step,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
+// FractionalMaxPoolGradAttr is an optional argument to FractionalMaxPoolGrad.
+type FractionalMaxPoolGradAttr func(optionalAttr)
+
+// FractionalMaxPoolGradOverlapping sets the optional overlapping attribute to value.
+//
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [20, 16] for fractional max pooling.
+// If not specified, defaults to false
+func FractionalMaxPoolGradOverlapping(value bool) FractionalMaxPoolGradAttr {
+	return func(m optionalAttr) {
+		m["overlapping"] = value
+	}
+}
+
+// Computes gradient of the FractionalMaxPool function.
+//
+// Arguments:
+//	orig_input: Original input for `fractional_max_pool`
+//	orig_output: Original output for `fractional_max_pool`
+//	out_backprop: 4-D with shape `[batch, height, width, channels]`.  Gradients
+// w.r.t. the output of `fractional_max_pool`.
+//	row_pooling_sequence: row pooling sequence, form pooling region with
+// col_pooling_sequence.
+//	col_pooling_sequence: column pooling sequence, form pooling region with
+// row_pooling sequence.
+//
+// Returns 4-D.  Gradients w.r.t. the input of `fractional_max_pool`.
+func FractionalMaxPoolGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, out_backprop tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output, optional ...FractionalMaxPoolGradAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -10530,13 +10660,14 @@ func ResourceSparseApplyAdagradDA(scope *Scope, var_ tf.Output, gradient_accumul
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "ResourceSparseApplyAdagradDA",
+		Type: "FractionalMaxPoolGrad",
 		Input: []tf.Input{
-			var_, gradient_accumulator, gradient_squared_accumulator, grad, indices, lr, l1, l2, global_step,
+			orig_input, orig_output, out_backprop, row_pooling_sequence, col_pooling_sequence,
 		},
 		Attrs: attrs,
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
 // AvgPool3DGradAttr is an optional argument to AvgPool3DGrad.
@@ -12160,6 +12291,118 @@ func SparseDenseCwiseMul(scope *Scope, sp_indices tf.Output, sp_values tf.Output
 	return op.Output(0)
 }
 
+// NonMaxSuppressionAttr is an optional argument to NonMaxSuppression.
+type NonMaxSuppressionAttr func(optionalAttr)
+
+// NonMaxSuppressionIouThreshold sets the optional iou_threshold attribute to value.
+//
+// value: A float representing the threshold for deciding whether boxes
+// overlap too much with respect to IOU.
+// If not specified, defaults to 0.5
+func NonMaxSuppressionIouThreshold(value float32) NonMaxSuppressionAttr {
+	return func(m optionalAttr) {
+		m["iou_threshold"] = value
+	}
+}
+
+// Greedily selects a subset of bounding boxes in descending order of score,
+//
+// pruning away boxes that have high intersection-over-union (IOU) overlap
+// with previously selected boxes.  Bounding boxes are supplied as
+// [y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any
+// diagonal pair of box corners and the coordinates can be provided as normalized
+// (i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm
+// is agnostic to where the origin is in the coordinate system.  Note that this
+// algorithm is invariant to orthogonal transformations and translations
+// of the coordinate system; thus translating or reflections of the coordinate
+// system result in the same boxes being selected by the algorithm.
+//
+// The output of this operation is a set of integers indexing into the input
+// collection of bounding boxes representing the selected boxes.  The bounding
+// box coordinates corresponding to the selected indices can then be obtained
+// using the `tf.gather operation`.  For example:
+//
+//   selected_indices = tf.image.non_max_suppression(
+//       boxes, scores, max_output_size, iou_threshold)
+//   selected_boxes = tf.gather(boxes, selected_indices)
+//
+// Arguments:
+//	boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
+//	scores: A 1-D float tensor of shape `[num_boxes]` representing a single
+// score corresponding to each box (each row of boxes).
+//	max_output_size: A scalar integer tensor representing the maximum number of
+// boxes to be selected by non max suppression.
+//
+// Returns A 1-D integer tensor of shape `[M]` representing the selected
+// indices from the boxes tensor, where `M <= max_output_size`.
+func NonMaxSuppression(scope *Scope, boxes tf.Output, scores tf.Output, max_output_size tf.Output, optional ...NonMaxSuppressionAttr) (selected_indices tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "NonMaxSuppression",
+		Input: []tf.Input{
+			boxes, scores, max_output_size,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// ResourceApplyAdadeltaAttr is an optional argument to ResourceApplyAdadelta.
+type ResourceApplyAdadeltaAttr func(optionalAttr)
+
+// ResourceApplyAdadeltaUseLocking sets the optional use_locking attribute to value.
+//
+// value: If True, updating of the var, accum and update_accum tensors will be protected by
+// a lock; otherwise the behavior is undefined, but may exhibit less contention.
+// If not specified, defaults to false
+func ResourceApplyAdadeltaUseLocking(value bool) ResourceApplyAdadeltaAttr {
+	return func(m optionalAttr) {
+		m["use_locking"] = value
+	}
+}
+
+// Update '*var' according to the adadelta scheme.
+//
+// accum = rho() * accum + (1 - rho()) * grad.square();
+// update = (update_accum + epsilon).sqrt() * (accum + epsilon()).rsqrt() * grad;
+// update_accum = rho() * update_accum + (1 - rho()) * update.square();
+// var -= update;
+//
+// Arguments:
+//	var_: Should be from a Variable().
+//	accum: Should be from a Variable().
+//	accum_update: Should be from a Variable().
+//	lr: Scaling factor. Must be a scalar.
+//	rho: Decay factor. Must be a scalar.
+//	epsilon: Constant factor. Must be a scalar.
+//	grad: The gradient.
+//
+// Returns the created operation.
+func ResourceApplyAdadelta(scope *Scope, var_ tf.Output, accum tf.Output, accum_update tf.Output, lr tf.Output, rho tf.Output, epsilon tf.Output, grad tf.Output, optional ...ResourceApplyAdadeltaAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceApplyAdadelta",
+		Input: []tf.Input{
+			var_, accum, accum_update, lr, rho, epsilon, grad,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
 // Shuffle dimensions of x according to a permutation.
 //
 // The output `y` has the same rank as `x`. The shapes of `x` and `y` satisfy:
@@ -12861,6 +13104,11 @@ func GatherValidateIndices(value bool) GatherAttr {
 // If `indices` is a permutation and `len(indices) == params.shape[0]` then
 // this operation will permute `params` accordingly.
 //
+// `validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
+// `indices` are always validated to be within range. If assigned to GPU,
+// out-of-bound indices result in unspecified behavior (currently the result is
+// `0`, but this may become an error in the future).
+//
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 // <img style="width:100%" src="../../images/Gather.png" alt>
 // </div>
@@ -13341,132 +13589,16 @@ func ResizeBilinearAlignCorners(value bool) ResizeBilinearAttr {
 
 // Resize `images` to `size` using bilinear interpolation.
 //
-// Input images can be of different types but output images are always float.
-//
-// Arguments:
-//	images: 4-D with shape `[batch, height, width, channels]`.
-//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
-// new size for the images.
-//
-// Returns 4-D with shape
-// `[batch, new_height, new_width, channels]`.
-func ResizeBilinear(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeBilinearAttr) (resized_images tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "ResizeBilinear",
-		Input: []tf.Input{
-			images, size,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// RandomPoissonAttr is an optional argument to RandomPoisson.
-type RandomPoissonAttr func(optionalAttr)
-
-// RandomPoissonSeed sets the optional seed attribute to value.
-//
-// value: If either `seed` or `seed2` are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func RandomPoissonSeed(value int64) RandomPoissonAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// RandomPoissonSeed2 sets the optional seed2 attribute to value.
-//
-// value: A second seed to avoid seed collision.
-// If not specified, defaults to 0
-func RandomPoissonSeed2(value int64) RandomPoissonAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Outputs random values from the Poisson distribution(s) described by rate.
-//
-// This op uses two algorithms, depending on rate. If rate >= 10, then
-// the algorithm by Hormann is used to acquire samples via
-// transformation-rejection.
-// See http://www.sciencedirect.com/science/article/pii/0167668793909974.
-//
-// Otherwise, Knuth's algorithm is used to acquire samples via multiplying uniform
-// random variables.
-// See Donald E. Knuth (1969). Seminumerical Algorithms. The Art of Computer
-// Programming, Volume 2. Addison Wesley
-//
-// Arguments:
-//	shape: 1-D integer tensor. Shape of independent samples to draw from each
-// distribution described by the shape parameters given in rate.
-//	rate: A tensor in which each scalar is a "rate" parameter describing the
-// associated poisson distribution.
-//
-// Returns A tensor with shape `shape + shape(rate)`. Each slice
-// `[:, ..., :, i0, i1, ...iN]` contains the samples drawn for
-// `rate[i0, i1, ...iN]`. The dtype of the output matches the dtype of
-// rate.
-func RandomPoisson(scope *Scope, shape tf.Output, rate tf.Output, optional ...RandomPoissonAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "RandomPoisson",
-		Input: []tf.Input{
-			shape, rate,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// ResourceApplyAdadeltaAttr is an optional argument to ResourceApplyAdadelta.
-type ResourceApplyAdadeltaAttr func(optionalAttr)
-
-// ResourceApplyAdadeltaUseLocking sets the optional use_locking attribute to value.
-//
-// value: If True, updating of the var, accum and update_accum tensors will be protected by
-// a lock; otherwise the behavior is undefined, but may exhibit less contention.
-// If not specified, defaults to false
-func ResourceApplyAdadeltaUseLocking(value bool) ResourceApplyAdadeltaAttr {
-	return func(m optionalAttr) {
-		m["use_locking"] = value
-	}
-}
-
-// Update '*var' according to the adadelta scheme.
-//
-// accum = rho() * accum + (1 - rho()) * grad.square();
-// update = (update_accum + epsilon).sqrt() * (accum + epsilon()).rsqrt() * grad;
-// update_accum = rho() * update_accum + (1 - rho()) * update.square();
-// var -= update;
-//
-// Arguments:
-//	var_: Should be from a Variable().
-//	accum: Should be from a Variable().
-//	accum_update: Should be from a Variable().
-//	lr: Scaling factor. Must be a scalar.
-//	rho: Decay factor. Must be a scalar.
-//	epsilon: Constant factor. Must be a scalar.
-//	grad: The gradient.
-//
-// Returns the created operation.
-func ResourceApplyAdadelta(scope *Scope, var_ tf.Output, accum tf.Output, accum_update tf.Output, lr tf.Output, rho tf.Output, epsilon tf.Output, grad tf.Output, optional ...ResourceApplyAdadeltaAttr) (o *tf.Operation) {
+// Input images can be of different types but output images are always float.
+//
+// Arguments:
+//	images: 4-D with shape `[batch, height, width, channels]`.
+//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
+// new size for the images.
+//
+// Returns 4-D with shape
+// `[batch, new_height, new_width, channels]`.
+func ResizeBilinear(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeBilinearAttr) (resized_images tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -13475,60 +13607,64 @@ func ResourceApplyAdadelta(scope *Scope, var_ tf.Output, accum tf.Output, accum_
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "ResourceApplyAdadelta",
+		Type: "ResizeBilinear",
 		Input: []tf.Input{
-			var_, accum, accum_update, lr, rho, epsilon, grad,
+			images, size,
 		},
 		Attrs: attrs,
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
-// NonMaxSuppressionAttr is an optional argument to NonMaxSuppression.
-type NonMaxSuppressionAttr func(optionalAttr)
+// RandomPoissonAttr is an optional argument to RandomPoisson.
+type RandomPoissonAttr func(optionalAttr)
 
-// NonMaxSuppressionIouThreshold sets the optional iou_threshold attribute to value.
+// RandomPoissonSeed sets the optional seed attribute to value.
 //
-// value: A float representing the threshold for deciding whether boxes
-// overlap too much with respect to IOU.
-// If not specified, defaults to 0.5
-func NonMaxSuppressionIouThreshold(value float32) NonMaxSuppressionAttr {
+// value: If either `seed` or `seed2` are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func RandomPoissonSeed(value int64) RandomPoissonAttr {
 	return func(m optionalAttr) {
-		m["iou_threshold"] = value
+		m["seed"] = value
 	}
 }
 
-// Greedily selects a subset of bounding boxes in descending order of score,
+// RandomPoissonSeed2 sets the optional seed2 attribute to value.
 //
-// pruning away boxes that have high intersection-over-union (IOU) overlap
-// with previously selected boxes.  Bounding boxes are supplied as
-// [y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any
-// diagonal pair of box corners and the coordinates can be provided as normalized
-// (i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm
-// is agnostic to where the origin is in the coordinate system.  Note that this
-// algorithm is invariant to orthogonal transformations and translations
-// of the coordinate system; thus translating or reflections of the coordinate
-// system result in the same boxes being selected by the algorithm.
+// value: A second seed to avoid seed collision.
+// If not specified, defaults to 0
+func RandomPoissonSeed2(value int64) RandomPoissonAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Outputs random values from the Poisson distribution(s) described by rate.
 //
-// The output of this operation is a set of integers indexing into the input
-// collection of bounding boxes representing the selected boxes.  The bounding
-// box coordinates corresponding to the selected indices can then be obtained
-// using the `tf.gather operation`.  For example:
+// This op uses two algorithms, depending on rate. If rate >= 10, then
+// the algorithm by Hormann is used to acquire samples via
+// transformation-rejection.
+// See http://www.sciencedirect.com/science/article/pii/0167668793909974.
 //
-//   selected_indices = tf.image.non_max_suppression(
-//       boxes, scores, max_output_size, iou_threshold)
-//   selected_boxes = tf.gather(boxes, selected_indices)
+// Otherwise, Knuth's algorithm is used to acquire samples via multiplying uniform
+// random variables.
+// See Donald E. Knuth (1969). Seminumerical Algorithms. The Art of Computer
+// Programming, Volume 2. Addison Wesley
 //
 // Arguments:
-//	boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
-//	scores: A 1-D float tensor of shape `[num_boxes]` representing a single
-// score corresponding to each box (each row of boxes).
-//	max_output_size: A scalar integer tensor representing the maximum number of
-// boxes to be selected by non max suppression.
+//	shape: 1-D integer tensor. Shape of independent samples to draw from each
+// distribution described by the shape parameters given in rate.
+//	rate: A tensor in which each scalar is a "rate" parameter describing the
+// associated poisson distribution.
 //
-// Returns A 1-D integer tensor of shape `[M]` representing the selected
-// indices from the boxes tensor, where `M <= max_output_size`.
-func NonMaxSuppression(scope *Scope, boxes tf.Output, scores tf.Output, max_output_size tf.Output, optional ...NonMaxSuppressionAttr) (selected_indices tf.Output) {
+// Returns A tensor with shape `shape + shape(rate)`. Each slice
+// `[:, ..., :, i0, i1, ...iN]` contains the samples drawn for
+// `rate[i0, i1, ...iN]`. The dtype of the output matches the dtype of
+// rate.
+func RandomPoisson(scope *Scope, shape tf.Output, rate tf.Output, optional ...RandomPoissonAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -13537,9 +13673,9 @@ func NonMaxSuppression(scope *Scope, boxes tf.Output, scores tf.Output, max_outp
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "NonMaxSuppression",
+		Type: "RandomPoisson",
 		Input: []tf.Input{
-			boxes, scores, max_output_size,
+			shape, rate,
 		},
 		Attrs: attrs,
 	}
@@ -15015,170 +15151,6 @@ func NotEqual(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
-// FractionalAvgPoolAttr is an optional argument to FractionalAvgPool.
-type FractionalAvgPoolAttr func(optionalAttr)
-
-// FractionalAvgPoolPseudoRandom sets the optional pseudo_random attribute to value.
-//
-// value: When set to True, generates the pooling sequence in a
-// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
-// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
-// difference between pseudorandom and random.
-// If not specified, defaults to false
-func FractionalAvgPoolPseudoRandom(value bool) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["pseudo_random"] = value
-	}
-}
-
-// FractionalAvgPoolOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [41/3, 26/3] for fractional avg pooling.
-// If not specified, defaults to false
-func FractionalAvgPoolOverlapping(value bool) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// FractionalAvgPoolDeterministic sets the optional deterministic attribute to value.
-//
-// value: When set to True, a fixed pooling region will be used when
-// iterating over a FractionalAvgPool node in the computation graph. Mainly used
-// in unit test to make FractionalAvgPool deterministic.
-// If not specified, defaults to false
-func FractionalAvgPoolDeterministic(value bool) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["deterministic"] = value
-	}
-}
-
-// FractionalAvgPoolSeed sets the optional seed attribute to value.
-//
-// value: If either seed or seed2 are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func FractionalAvgPoolSeed(value int64) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// FractionalAvgPoolSeed2 sets the optional seed2 attribute to value.
-//
-// value: An second seed to avoid seed collision.
-// If not specified, defaults to 0
-func FractionalAvgPoolSeed2(value int64) FractionalAvgPoolAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Performs fractional average pooling on the input.
-//
-// Fractional average pooling is similar to Fractional max pooling in the pooling
-// region generation step. The only difference is that after pooling regions are
-// generated, a mean operation is performed instead of a max operation in each
-// pooling region.
-//
-// Arguments:
-//	value: 4-D with shape `[batch, height, width, channels]`.
-//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
-// supports row and col dimension and should be >= 1.0. For example, a valid
-// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
-// must be 1.0 because we don't allow pooling on batch and channels
-// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
-// respectively.
-//
-// Returns output tensor after fractional avg pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
-func FractionalAvgPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalAvgPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalAvgPool",
-		Input: []tf.Input{
-			value,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// RandomCropAttr is an optional argument to RandomCrop.
-type RandomCropAttr func(optionalAttr)
-
-// RandomCropSeed sets the optional seed attribute to value.
-//
-// value: If either seed or seed2 are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func RandomCropSeed(value int64) RandomCropAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// RandomCropSeed2 sets the optional seed2 attribute to value.
-//
-// value: An second seed to avoid seed collision.
-// If not specified, defaults to 0
-func RandomCropSeed2(value int64) RandomCropAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Randomly crop `image`.
-//
-// DEPRECATED at GraphDef version 8: Random crop is now pure Python
-//
-// `size` is a 1-D int64 tensor with 2 elements representing the crop height and
-// width.  The values must be non negative.
-//
-// This Op picks a random location in `image` and crops a `height` by `width`
-// rectangle from that location.  The random location is picked so the cropped
-// area will fit inside the original image.
-//
-// Arguments:
-//	image: 3-D of shape `[height, width, channels]`.
-//	size: 1-D of length 2 containing: `crop_height`, `crop_width`..
-//
-// Returns 3-D of shape `[crop_height, crop_width, channels].`
-func RandomCrop(scope *Scope, image tf.Output, size tf.Output, optional ...RandomCropAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "RandomCrop",
-		Input: []tf.Input{
-			image, size,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Returns immutable tensor from memory region.
 //
 // The current implementation memmaps the tensor from a file.
@@ -15493,6 +15465,170 @@ func IdentityReaderV2(scope *Scope, optional ...IdentityReaderV2Attr) (reader_ha
 	return op.Output(0)
 }
 
+// RandomCropAttr is an optional argument to RandomCrop.
+type RandomCropAttr func(optionalAttr)
+
+// RandomCropSeed sets the optional seed attribute to value.
+//
+// value: If either seed or seed2 are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func RandomCropSeed(value int64) RandomCropAttr {
+	return func(m optionalAttr) {
+		m["seed"] = value
+	}
+}
+
+// RandomCropSeed2 sets the optional seed2 attribute to value.
+//
+// value: An second seed to avoid seed collision.
+// If not specified, defaults to 0
+func RandomCropSeed2(value int64) RandomCropAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Randomly crop `image`.
+//
+// DEPRECATED at GraphDef version 8: Random crop is now pure Python
+//
+// `size` is a 1-D int64 tensor with 2 elements representing the crop height and
+// width.  The values must be non negative.
+//
+// This Op picks a random location in `image` and crops a `height` by `width`
+// rectangle from that location.  The random location is picked so the cropped
+// area will fit inside the original image.
+//
+// Arguments:
+//	image: 3-D of shape `[height, width, channels]`.
+//	size: 1-D of length 2 containing: `crop_height`, `crop_width`..
+//
+// Returns 3-D of shape `[crop_height, crop_width, channels].`
+func RandomCrop(scope *Scope, image tf.Output, size tf.Output, optional ...RandomCropAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "RandomCrop",
+		Input: []tf.Input{
+			image, size,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// FractionalAvgPoolAttr is an optional argument to FractionalAvgPool.
+type FractionalAvgPoolAttr func(optionalAttr)
+
+// FractionalAvgPoolPseudoRandom sets the optional pseudo_random attribute to value.
+//
+// value: When set to True, generates the pooling sequence in a
+// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
+// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
+// difference between pseudorandom and random.
+// If not specified, defaults to false
+func FractionalAvgPoolPseudoRandom(value bool) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["pseudo_random"] = value
+	}
+}
+
+// FractionalAvgPoolOverlapping sets the optional overlapping attribute to value.
+//
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [41/3, 26/3] for fractional avg pooling.
+// If not specified, defaults to false
+func FractionalAvgPoolOverlapping(value bool) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["overlapping"] = value
+	}
+}
+
+// FractionalAvgPoolDeterministic sets the optional deterministic attribute to value.
+//
+// value: When set to True, a fixed pooling region will be used when
+// iterating over a FractionalAvgPool node in the computation graph. Mainly used
+// in unit test to make FractionalAvgPool deterministic.
+// If not specified, defaults to false
+func FractionalAvgPoolDeterministic(value bool) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["deterministic"] = value
+	}
+}
+
+// FractionalAvgPoolSeed sets the optional seed attribute to value.
+//
+// value: If either seed or seed2 are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func FractionalAvgPoolSeed(value int64) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["seed"] = value
+	}
+}
+
+// FractionalAvgPoolSeed2 sets the optional seed2 attribute to value.
+//
+// value: An second seed to avoid seed collision.
+// If not specified, defaults to 0
+func FractionalAvgPoolSeed2(value int64) FractionalAvgPoolAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Performs fractional average pooling on the input.
+//
+// Fractional average pooling is similar to Fractional max pooling in the pooling
+// region generation step. The only difference is that after pooling regions are
+// generated, a mean operation is performed instead of a max operation in each
+// pooling region.
+//
+// Arguments:
+//	value: 4-D with shape `[batch, height, width, channels]`.
+//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
+// supports row and col dimension and should be >= 1.0. For example, a valid
+// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
+// must be 1.0 because we don't allow pooling on batch and channels
+// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
+// respectively.
+//
+// Returns output tensor after fractional avg pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
+func FractionalAvgPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalAvgPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "FractionalAvgPool",
+		Input: []tf.Input{
+			value,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
 // Produces the average pool of the input tensor for quantized types.
 //
 // Arguments:
@@ -18157,59 +18293,6 @@ func Bincount(scope *Scope, arr tf.Output, size tf.Output, weights tf.Output) (b
 	return op.Output(0)
 }
 
-// CropAndResizeGradBoxesAttr is an optional argument to CropAndResizeGradBoxes.
-type CropAndResizeGradBoxesAttr func(optionalAttr)
-
-// CropAndResizeGradBoxesMethod sets the optional method attribute to value.
-//
-// value: A string specifying the interpolation method. Only 'bilinear' is
-// supported for now.
-// If not specified, defaults to "bilinear"
-func CropAndResizeGradBoxesMethod(value string) CropAndResizeGradBoxesAttr {
-	return func(m optionalAttr) {
-		m["method"] = value
-	}
-}
-
-// Computes the gradient of the crop_and_resize op wrt the input boxes tensor.
-//
-// Arguments:
-//	grads: A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
-//	image: A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
-// Both `image_height` and `image_width` need to be positive.
-//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
-// specifies the coordinates of a box in the `box_ind[i]` image and is specified
-// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
-// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
-// `[0, 1]` interval of normalized image height is mapped to
-// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
-// which case the sampled crop is an up-down flipped version of the original
-// image. The width dimension is treated similarly. Normalized coordinates
-// outside the `[0, 1]` range are allowed, in which case we use
-// `extrapolation_value` to extrapolate the input image values.
-//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
-// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
-//
-// Returns A 2-D tensor of shape `[num_boxes, 4]`.
-func CropAndResizeGradBoxes(scope *Scope, grads tf.Output, image tf.Output, boxes tf.Output, box_ind tf.Output, optional ...CropAndResizeGradBoxesAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "CropAndResizeGradBoxes",
-		Input: []tf.Input{
-			grads, image, boxes, box_ind,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Reshapes a quantized tensor as per the Reshape op.
 //
 // ```
@@ -20075,6 +20158,54 @@ func TensorArrayGatherV3(scope *Scope, handle tf.Output, indices tf.Output, flow
 	return op.Output(0)
 }
 
+// MaxPoolGradGradAttr is an optional argument to MaxPoolGradGrad.
+type MaxPoolGradGradAttr func(optionalAttr)
+
+// MaxPoolGradGradDataFormat sets the optional data_format attribute to value.
+//
+// value: Specify the data format of the input and output data. With the
+// default format "NHWC", the data is stored in the order of:
+//     [batch, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCHW", the data storage order of:
+//     [batch, in_channels, in_height, in_width].
+// If not specified, defaults to "NHWC"
+func MaxPoolGradGradDataFormat(value string) MaxPoolGradGradAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Computes second-order gradients of the maxpooling function.
+//
+// Arguments:
+//	orig_input: The original input tensor.
+//	orig_output: The original output tensor.
+//	grad: 4-D.  Gradients of gradients w.r.t. the input of `max_pool`.
+//	ksize: The size of the window for each dimension of the input tensor.
+//	strides: The stride of the sliding window for each dimension of the
+// input tensor.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients of gradients w.r.t. the input to `max_pool`.
+func MaxPoolGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPoolGradGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MaxPoolGradGrad",
+		Input: []tf.Input{
+			orig_input, orig_output, grad,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // 3D real-valued fast Fourier transform.
 //
 // Computes the 3-dimensional discrete Fourier transform of a real-valued signal
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index c20a24b2ee..36918af552 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -266,7 +266,11 @@ class Estimator(object):
         checkpoint_path=checkpoint_path,
         name=name)
 
-  def predict(self, input_fn, predict_keys=None, hooks=None, checkpoint_path=None):
+  def predict(self,
+              input_fn,
+              predict_keys=None,
+              hooks=None,
+              checkpoint_path=None):
     """Returns predictions for given features.
 
     Args:
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 889ba3cf38..a1659156a6 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -627,7 +627,10 @@ class EstimatorPredictTest(test.TestCase):
   def test_no_trained_model_invalid_checkpoint_path(self):
     est = estimator.Estimator(model_fn=model_fn_global_step_incrementer)
     with self.assertRaises(ValueError):
-      next(est.predict(dummy_input_fn, checkpoint_path=saver.latest_checkpoint("fakedir")))
+      next(
+          est.predict(
+              dummy_input_fn,
+              checkpoint_path=saver.latest_checkpoint('fakedir')))
 
   def test_tensor_predictions(self):
 
@@ -848,9 +851,12 @@ class EstimatorPredictTest(test.TestCase):
     est1 = estimator.Estimator(model_fn=_model_fn)
     est1.train(dummy_input_fn, steps=1)
     est2 = estimator.Estimator(model_fn=_model_fn, model_dir=est1.model_dir)
-    self.assertEqual([32.], next(est2.predict(
-      dummy_input_fn,
-      checkpoint_path=saver.latest_checkpoint(est1.model_dir))))
+    self.assertEqual(
+        [32.],
+        next(
+            est2.predict(
+                dummy_input_fn,
+                checkpoint_path=saver.latest_checkpoint(est1.model_dir))))
 
   def test_scaffold_is_used(self):
 
diff --git a/tensorflow/python/estimator/inputs/queues/feeding_functions.py b/tensorflow/python/estimator/inputs/queues/feeding_functions.py
index dab8ffea75..a6f5157680 100644
--- a/tensorflow/python/estimator/inputs/queues/feeding_functions.py
+++ b/tensorflow/python/estimator/inputs/queues/feeding_functions.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 import collections
 import random
+import types as tp
 import numpy as np
 import six
-import types as tp
 
 from tensorflow.python.estimator.inputs.queues import feeding_queue_runner as fqr
 from tensorflow.python.framework import dtypes
@@ -245,8 +245,8 @@ class _GeneratorFeedFn(object):
 
   def __call__(self):
     if self._num_epochs and self._epoch >= self._num_epochs:
-      raise errors.OutOfRangeError(
-          None, None, "Already emitted %s epochs." % self._epoch)
+      raise errors.OutOfRangeError(None, None,
+                                   "Already emitted %s epochs." % self._epoch)
     list_dict = {}
     list_dict_size = 0
     while list_dict_size < self._batch_size:
@@ -258,8 +258,9 @@ class _GeneratorFeedFn(object):
         data_row = next(self._iterator)
       for index, key in enumerate(self._keys):
         if key not in data_row.keys():
-          raise KeyError('key mismatch between dicts emitted by GenFun'
-              'Expected {} keys; got {}'.format( self._keys, data_row.keys()))
+          raise KeyError("key mismatch between dicts emitted by GenFun"
+                         "Expected {} keys; got {}".format(
+                             self._keys, data_row.keys()))
         list_dict.setdefault(self._col_placeholders[index],
                              list()).append(data_row[key])
         list_dict_size += 1
diff --git a/tensorflow/python/framework/tensor_util_test.py b/tensorflow/python/framework/tensor_util_test.py
index 727438a56d..5eb5230404 100644
--- a/tensorflow/python/framework/tensor_util_test.py
+++ b/tensorflow/python/framework/tensor_util_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import numpy as np
 import sys
+import numpy as np
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -48,13 +48,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatN(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0])
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } }
@@ -66,12 +66,12 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatTyped(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], dtype=dtypes.float32)
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
+        """, t)
     else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
@@ -84,13 +84,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatTypeCoerce(self):
     t = tensor_util.make_tensor_proto([10, 20, 30], dtype=dtypes.float32)
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } }
@@ -103,13 +103,13 @@ class TensorUtilTest(test.TestCase):
   def testFloatTypeCoerceNdarray(self):
     arr = np.asarray([10, 20, 30], dtype="int")
     t = tensor_util.make_tensor_proto(arr, dtype=dtypes.float32)
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else: 
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } }
@@ -121,13 +121,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatSizes(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], shape=[1, 3])
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 1 } dim { size: 3 } }
@@ -139,13 +139,13 @@ class TensorUtilTest(test.TestCase):
 
   def testFloatSizes2(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], shape=[3, 1])
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } dim { size: 1 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_FLOAT
         tensor_shape { dim { size: 3 } dim { size: 1 } }
@@ -167,13 +167,13 @@ class TensorUtilTest(test.TestCase):
   def testFloatNpArrayFloat64(self):
     t = tensor_util.make_tensor_proto(
         np.array([[10.0, 20.0, 30.0]], dtype=np.float64))
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_DOUBLE  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "@$\000\000\000\000\000\000@4\000\000\000\000\000\000@>\000\000\000\000\000\000"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_DOUBLE
         tensor_shape { dim { size: 1 } dim { size: 3 } }
@@ -258,13 +258,13 @@ class TensorUtilTest(test.TestCase):
 
   def testIntNDefaultType(self):
     t = tensor_util.make_tensor_proto([10, 20, 30, 40], shape=[2, 2])
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_INT32  
         tensor_shape { dim { size: 2 } dim { size: 2 } }  
         tensor_content: "\000\000\000\\n\000\000\000\024\000\000\000\036\000\000\000("  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_INT32
         tensor_shape { dim { size: 2 } dim { size: 2 } }
@@ -328,13 +328,13 @@ class TensorUtilTest(test.TestCase):
   def testLongN(self):
     t = tensor_util.make_tensor_proto(
         [10, 20, 30], shape=[1, 3], dtype=dtypes.int64)
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_INT64  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "\000\000\000\000\000\000\000\\n\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\036"  
-        """, t)  
-    else: 
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_INT64
         tensor_shape { dim { size: 1 } dim { size: 3 } }
@@ -346,13 +346,13 @@ class TensorUtilTest(test.TestCase):
 
   def testLongNpArray(self):
     t = tensor_util.make_tensor_proto(np.array([10, 20, 30]))
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_INT64  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\000\000\000\000\000\000\\n\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\036"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_INT64
         tensor_shape { dim { size: 3 } }
@@ -367,13 +367,13 @@ class TensorUtilTest(test.TestCase):
     data = [(21,), (22,), (23,)]
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.qint32)
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_QINT32  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\000\000\025\000\000\000\026\000\000\000\027"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_QINT32
         tensor_shape { dim { size: 3 } }
@@ -404,13 +404,13 @@ class TensorUtilTest(test.TestCase):
     self.assertAllEqual(np.array(data, dtype=a.dtype), a)
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.quint16)
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_QUINT16  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\025\000\026\000\027"  
-        """, t)  
-    else:  
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_QUINT16
         tensor_shape { dim { size: 3 } }
@@ -421,13 +421,13 @@ class TensorUtilTest(test.TestCase):
     self.assertAllEqual(np.array(data, dtype=a.dtype), a)
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.qint16)
-    if sys.byteorder == "big":  
-      self.assertProtoEquals("""  
+    if sys.byteorder == "big":
+      self.assertProtoEquals("""
         dtype: DT_QINT16  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\025\000\026\000\027"  
-        """, t)  
-    else: 
+        """, t)
+    else:
       self.assertProtoEquals("""
         dtype: DT_QINT16
         tensor_shape { dim { size: 3 } }
@@ -669,7 +669,9 @@ class TensorUtilTest(test.TestCase):
     self.assertFalse(tensor_util.ShapeEquals(t, [4]))
 
   def testMockArray(self):
+
     class MockArray(object):
+
       def __init__(self, array):
         self.array = array
 
diff --git a/tensorflow/python/kernel_tests/pooling_ops_3d_test.py b/tensorflow/python/kernel_tests/pooling_ops_3d_test.py
index 5e9b7766a7..fa1553a3f6 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_3d_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_3d_test.py
@@ -261,7 +261,7 @@ class PoolingTest(test.TestCase):
           padding=padding,
           data_format=data_format,
           name=func_name)
-      t_g = gradients_impl.gradients(t ** 2, input_tensor)[0]
+      t_g = gradients_impl.gradients(t**2, input_tensor)[0]
 
       err_g = gradient_checker.compute_gradient_error(
           input_tensor,
diff --git a/tensorflow/python/kernel_tests/pooling_ops_test.py b/tensorflow/python/kernel_tests/pooling_ops_test.py
index 85b01be266..1b6c8bef98 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_test.py
@@ -24,10 +24,10 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors_impl
 from tensorflow.python.framework import test_util
-from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gen_nn_ops
 from tensorflow.python.ops import gradient_checker
+from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import nn_ops
 import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import test
@@ -97,7 +97,7 @@ class PoolingTest(test.TestCase):
     # Initializes the input tensor with array containing incrementing
     # numbers from 1.
     x = [f * 1.0 for f in range(1, total_size + 1)]
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=use_gpu):
       t = constant_op.constant(x, shape=input_sizes, dtype=data_type)
       if data_format == "NCHW":
         t = test_util.NHWCToNCHW(t)
@@ -497,7 +497,7 @@ class PoolingTest(test.TestCase):
                                          strides,
                                          error_msg,
                                          use_gpu=False):
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=use_gpu):
       t = constant_op.constant(1.0, shape=in_size)
       with self.assertRaisesRegexp(errors_impl.UnimplementedError, error_msg):
         t = nn_ops.max_pool(
@@ -562,7 +562,8 @@ class PoolingTest(test.TestCase):
         self.assertShapeEqual(cpu_val, out_op)
       # The CPU version accumulates its gradient on fp16, so it's less
       # accurate than the GPU version that does the accumulation on fp32
-      self.assertAllCloseAccordingToType(cpu_val, gpu_val, half_rtol=0.01, half_atol=0.01)
+      self.assertAllCloseAccordingToType(
+          cpu_val, gpu_val, half_rtol=0.01, half_atol=0.01)
 
   def _CompareMaxPoolingGradBk(self, input_shape, output_shape, ksize, strides,
                                padding):
@@ -570,14 +571,13 @@ class PoolingTest(test.TestCase):
       # Generate numbers in a narrow range, so that there are many duplicates
       # in the input.
       tensor_input = np.random.random_integers(0, 3, input_shape).astype(dtype)
-      tensor_output = np.random.rand(*output_shape).astype(dtype)
       with self.test_session(use_gpu=True):
         t = constant_op.constant(tensor_input, shape=input_shape)
         _, argmax_op = nn_ops.max_pool_with_argmax(t, ksize, strides, padding)
         argmax = argmax_op.eval()
         grad_in = constant_op.constant(tensor_input, shape=input_shape)
-        out_op = gen_nn_ops._max_pool_grad_grad_with_argmax(t, grad_in, argmax,
-                                                            ksize, strides, padding)
+        out_op = gen_nn_ops._max_pool_grad_grad_with_argmax(
+            t, grad_in, argmax, ksize, strides, padding)
         gpu_val = out_op.eval()
         self.assertShapeEqual(gpu_val, out_op)
       with self.test_session(use_gpu=False):
@@ -585,13 +585,14 @@ class PoolingTest(test.TestCase):
         out_op = nn_ops.max_pool(t, ksize, strides, padding)
         orig_out = out_op.eval()
         grad_in = constant_op.constant(tensor_input, shape=input_shape)
-        out_op = gen_nn_ops._max_pool_grad_grad(t, orig_out, grad_in, ksize, strides,
-                                                padding)
+        out_op = gen_nn_ops._max_pool_grad_grad(t, orig_out, grad_in, ksize,
+                                                strides, padding)
         cpu_val = out_op.eval()
         self.assertShapeEqual(cpu_val, out_op)
       # The CPU version accumulates its gradient on fp16, so it's less
       # accurate than the GPU version that does the accumulation on fp32
-      self.assertAllCloseAccordingToType(cpu_val, gpu_val, half_rtol=0.01, half_atol=0.01)
+      self.assertAllCloseAccordingToType(
+          cpu_val, gpu_val, half_rtol=0.01, half_atol=0.01)
 
   def testMaxPoolingWithArgmax(self):
     # MaxPoolWithArgMax is implemented only on CUDA.
@@ -619,7 +620,7 @@ class PoolingTest(test.TestCase):
     orig_input = [1.0, 1.0, 1.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0]
     tensor_input = [11.0, 12.0, 13.0, 14.0]
     tensor_argmax = list(np.array([0, 1, 3, 5], dtype=np.int64))
-    with self.test_session(use_gpu=True) as sess:
+    with self.test_session(use_gpu=True):
       orig_in = constant_op.constant(orig_input, shape=[1, 3, 3, 1])
       t = constant_op.constant(tensor_input, shape=[1, 2, 2, 1])
       argmax = constant_op.constant(
@@ -642,7 +643,7 @@ class PoolingTest(test.TestCase):
     orig_input = [1.0, 1.0, 1.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0]
     tensor_input = [11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0]
     tensor_argmax = list(np.array([0, 1, 3, 5], dtype=np.int64))
-    with self.test_session(use_gpu=True) as sess:
+    with self.test_session(use_gpu=True):
       orig_in = constant_op.constant(orig_input, shape=[1, 3, 3, 1])
       t = constant_op.constant(tensor_input, shape=[1, 3, 3, 1])
       argmax = constant_op.constant(
@@ -655,8 +656,7 @@ class PoolingTest(test.TestCase):
           strides=[1, 1, 1, 1],
           padding="VALID")
       out = out_op.eval().flatten()
-      self.assertAllClose(out,
-                          [11.0, 12.0, 14.0, 16.0])
+      self.assertAllClose(out, [11.0, 12.0, 14.0, 16.0])
 
   def _ConstructAndTestGradient(self,
                                 pool_func,
@@ -791,16 +791,16 @@ class PoolingTest(test.TestCase):
         strides = [1, row_stride, col_stride, 1]
         t = input_tensor
       t = pool_func(
-        t,
-        ksize=ksize,
-        strides=strides,
-        padding=padding,
-        data_format=data_format,
-        name=func_name)
+          t,
+          ksize=ksize,
+          strides=strides,
+          padding=padding,
+          data_format=data_format,
+          name=func_name)
       if data_format == "NCHW":
         t = test_util.NHWCToNCHW(t)
 
-      t_g = gradients_impl.gradients(t ** 2, input_tensor)[0]
+      t_g = gradients_impl.gradients(t**2, input_tensor)[0]
       err = gradient_checker.compute_gradient_error(
           input_tensor,
           input_sizes,
@@ -952,7 +952,7 @@ class PoolingTest(test.TestCase):
                              expected_input_backprop, input_sizes, output_sizes,
                              window_rows, window_cols, row_stride, col_stride,
                              padding, use_gpu):
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=use_gpu):
       input_tensor = constant_op.constant(input_data, shape=input_sizes)
       output_tensor = nn_ops.max_pool(input_tensor,
                                       [1, window_rows, window_cols, 1],
@@ -1312,8 +1312,10 @@ class PoolingTest(test.TestCase):
       A Tensor.
     """
     return gen_nn_ops._max_pool_grad_grad(orig_input, orig_output, grad,
-                                          [1, window_rows, window_cols, 1],
-                                          [1, row_stride, col_stride, 1], padding)
+                                          [1, window_rows, window_cols,
+                                           1], [1, row_stride, col_stride,
+                                                1], padding)
+
   def testAvgPoolGrad(self):
     for (data_format, use_gpu) in GetTestConfigs():
       self._testAvgPoolGradValidPadding1_1(data_format, use_gpu)
@@ -1501,7 +1503,9 @@ def GetMaxPoolGradTest(input_size, filter_size, output_size, strides, padding):
 
   return Test
 
-def GetMaxPoolGradGradTest(input_size, filter_size, output_size, strides, padding):
+
+def GetMaxPoolGradGradTest(input_size, filter_size, output_size, strides,
+                           padding):
 
   def Test(self):
     # MaxPoolWithArgMax is implemented only on CUDA.
@@ -1522,6 +1526,6 @@ if __name__ == "__main__":
             GetMaxPoolGradTest(input_size_, filter_size_, output_size_, stride_,
                                padding_))
     setattr(PoolingTest, "testMaxPoolGradGrad_" + name_,
-            GetMaxPoolGradGradTest(input_size_, filter_size_, output_size_, stride_,
-                                   padding_))
+            GetMaxPoolGradGradTest(input_size_, filter_size_, output_size_,
+                                   stride_, padding_))
   test.main()
diff --git a/tensorflow/python/kernel_tests/py_func_test.py b/tensorflow/python/kernel_tests/py_func_test.py
index f1bb3bdc22..c7fc7dd582 100644
--- a/tensorflow/python/kernel_tests/py_func_test.py
+++ b/tensorflow/python/kernel_tests/py_func_test.py
@@ -283,6 +283,28 @@ class PyOpTest(test.TestCase):
     with self.test_session() as sess:
       self.assertEqual(sess.run(f), [])
 
+  def _testExceptionHandling(self, py_exp, tf_exp):
+
+    def raise_exception():
+      raise py_exp("blah")  # pylint: disable=not-callable
+
+    f = script_ops.py_func(raise_exception, [], [])
+    with self.test_session() as sess:
+      with self.assertRaisesRegexp(tf_exp, "blah"):
+        sess.run(f)
+
+  def testExceptionHandling(self):
+    self._testExceptionHandling(ValueError, errors.InvalidArgumentError)
+    self._testExceptionHandling(TypeError, errors.InvalidArgumentError)
+    self._testExceptionHandling(StopIteration, errors.OutOfRangeError)
+    self._testExceptionHandling(MemoryError, errors.ResourceExhaustedError)
+    self._testExceptionHandling(NotImplementedError, errors.UnimplementedError)
+
+    class WeirdError(Exception):
+      pass
+
+    self._testExceptionHandling(WeirdError, errors.UnknownError)
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/kernel_tests/resource_variable_ops_test.py b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
index 0b81dcb8af..2fba15801c 100644
--- a/tensorflow/python/kernel_tests/resource_variable_ops_test.py
+++ b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
@@ -195,6 +195,39 @@ class ResourceVariableOpsTest(test_util.TensorFlowTestCase):
     self.assertIsInstance(w.dtype, dtypes.DType)
     self.assertEqual(v.dtype, w.dtype)
 
+  def testCachingDevice(self):
+    with ops.device("/job:server/task:1"):
+      v = resource_variable_ops.ResourceVariable(
+          2.0, caching_device="/job:localhost")
+      self.assertEqual("/job:localhost", v.value().device)
+      with self.assertRaisesRegexp(ValueError, "No attr named '_class'"):
+        _ = v.value().op.get_attr("_class")
+
+    with ops.colocate_with(v.op):
+      w = resource_variable_ops.ResourceVariable(
+          2.0, caching_device="/job:localhost")
+      self.assertEqual("/job:localhost", w.value().device)
+      with self.assertRaisesRegexp(ValueError, "No attr named '_class'"):
+        _ = w.value().op.get_attr("_class")
+
+  def testSharedName(self):
+    with self.test_session():
+      v = resource_variable_ops.ResourceVariable(300.0, name="var1")
+      v.initializer.run()
+
+      w = resource_variable_ops.var_handle_op(dtype=v.dtype.base_dtype,
+                                              shape=v.get_shape(),
+                                              shared_name="var1")
+      w_read = resource_variable_ops.read_variable_op(w, v.dtype.base_dtype)
+      self.assertEqual(300.0, w_read.eval())
+
+      x = resource_variable_ops.var_handle_op(dtype=v.dtype.base_dtype,
+                                              shape=v.get_shape(),
+                                              shared_name="var1/")
+      x_read = resource_variable_ops.read_variable_op(x, v.dtype.base_dtype)
+      with self.assertRaisesOpError("Resource .*/var1//.* does not exist"):
+        _ = x_read.eval()
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
index f6062aa03d..fe0557b535 100644
--- a/tensorflow/python/lib/core/py_func.cc
+++ b/tensorflow/python/lib/core/py_func.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
@@ -172,6 +173,48 @@ bool IsSingleNone(PyObject* obj) {
   return item == Py_None;
 }
 
+// py.__class__.__name__
+const char* ClassName(PyObject* py) {
+/* PyPy doesn't have a separate C API for old-style classes. */
+#if PY_MAJOR_VERSION < 3 && !defined(PYPY_VERSION)
+  if (PyClass_Check(py))
+    return PyString_AS_STRING(
+        CHECK_NOTNULL(reinterpret_cast<PyClassObject*>(py)->cl_name));
+  if (PyInstance_Check(py))
+    return PyString_AS_STRING(CHECK_NOTNULL(
+        reinterpret_cast<PyInstanceObject*>(py)->in_class->cl_name));
+#endif
+  if (Py_TYPE(py) == &PyType_Type) {
+    return reinterpret_cast<PyTypeObject*>(py)->tp_name;
+  }
+  return Py_TYPE(py)->tp_name;
+}
+
+string PyExcFetch() {
+  CHECK(PyErr_Occurred()) << "Must only call PyExcFetch after an exception.";
+  PyObject* ptype;
+  PyObject* pvalue;
+  PyObject* ptraceback;
+  PyErr_Fetch(&ptype, &pvalue, &ptraceback);
+  PyErr_NormalizeException(&ptype, &pvalue, &ptraceback);
+  string err = ClassName(ptype);
+  if (pvalue) {
+    PyObject* str = PyObject_Str(pvalue);
+    if (str) {
+#if PY_MAJOR_VERSION < 3
+      strings::StrAppend(&err, ": ", PyString_AS_STRING(str));
+#else
+      strings::StrAppend(&err, ": ", PyUnicode_AsUTF8(str));
+#endif
+      Py_DECREF(str);
+    }
+    Py_DECREF(pvalue);
+  }
+  Py_DECREF(ptype);
+  Py_XDECREF(ptraceback);
+  return err;
+}
+
 // Calls the registered py function through the trampoline.
 Status DoCallPyFunc(PyCall* call) {
   PyObject* trampoline = GetPyTrampoline();
@@ -189,11 +232,24 @@ Status DoCallPyFunc(PyCall* call) {
   Py_DECREF(args);
   if (result == nullptr) {
     if (PyErr_Occurred()) {
-      // TODO(zhifengc): Consider pretty-print error using LOG(STDERR).
-      PyErr_Print();
+      if (PyErr_ExceptionMatches(PyExc_ValueError) ||
+          PyErr_ExceptionMatches(PyExc_TypeError)) {
+        return errors::InvalidArgument(PyExcFetch());
+      } else if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
+        return errors::OutOfRange(PyExcFetch());
+      } else if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
+        return errors::ResourceExhausted(PyExcFetch());
+      } else if (PyErr_ExceptionMatches(PyExc_NotImplementedError)) {
+        return errors::Unimplemented(PyExcFetch());
+      } else {
+        // TODO(ebrevdo): Check if exception is an OpError and use the
+        // OpError.error_code property to map it back in the Status.
+        return errors::Unknown(PyExcFetch());
+      }
+    } else {
+      return errors::Internal("Failed to run py callback ", call->token,
+                              ": see error log.");
     }
-    return errors::Internal("Failed to run py callback ", call->token,
-                            ": see error log.");
   }
 
   // Process the return values and converts them to tf Tensors.
diff --git a/tensorflow/python/ops/nn_grad.py b/tensorflow/python/ops/nn_grad.py
index 93f6f97ee4..9b765390b3 100644
--- a/tensorflow/python/ops/nn_grad.py
+++ b/tensorflow/python/ops/nn_grad.py
@@ -21,10 +21,10 @@ from __future__ import print_function
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gen_nn_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import sparse_ops
-from tensorflow.python.ops import gen_nn_ops
 
 
 @ops.RegisterGradient("Conv2DBackpropInput")
@@ -132,12 +132,12 @@ def _AvgPool3DGrad(op, grad):
 
 @ops.RegisterGradient("AvgPool3DGrad")
 def _AvgPool3DGradGrad(op, grad):
-  return (array_ops.stop_gradient(op.inputs[0]),
-          gen_nn_ops.avg_pool3d(grad,
-                                op.get_attr("ksize"),
-                                op.get_attr("strides"),
-                                op.get_attr("padding"),
-                                data_format=op.get_attr("data_format")))
+  return (array_ops.stop_gradient(op.inputs[0]), gen_nn_ops.avg_pool3d(
+      grad,
+      op.get_attr("ksize"),
+      op.get_attr("strides"),
+      op.get_attr("padding"),
+      data_format=op.get_attr("data_format")))
 
 
 @ops.RegisterGradient("MaxPool3D")
@@ -154,32 +154,34 @@ def _MaxPool3DGrad(op, grad):
 
 @ops.RegisterGradient("MaxPool3DGrad")
 def _MaxPool3DGradGrad(op, grad):
-  return (array_ops.zeros(shape=array_ops.shape(op.inputs[0]),
-                          dtype=op.inputs[0].dtype),
-          array_ops.zeros(shape=array_ops.shape(op.inputs[1]),
-                          dtype=op.inputs[1].dtype),
-          gen_nn_ops._max_pool3d_grad_grad(op.inputs[0],
-                                           op.inputs[1],
-                                           grad,
-                                           op.get_attr("ksize"),
-                                           op.get_attr("strides"),
-                                           padding=op.get_attr("padding"),
-                                           data_format=op.get_attr("data_format")))
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool3d_grad_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
 
 
 @ops.RegisterGradient("MaxPool3DGradGrad")
 def _MaxPool3DGradGradGrad(op, grad):
-  return (array_ops.zeros(shape=array_ops.shape(op.inputs[0]),
-                          dtype=op.inputs[0].dtype),
-          array_ops.zeros(shape=array_ops.shape(op.inputs[1]),
-                          dtype=op.inputs[1].dtype),
-          gen_nn_ops._max_pool3d_grad(op.inputs[0],
-                                      op.inputs[1],
-                                      grad,
-                                      op.get_attr("ksize"),
-                                      op.get_attr("strides"),
-                                      padding=op.get_attr("padding"),
-                                      data_format=op.get_attr("data_format")))
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool3d_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
 
 
 @ops.RegisterGradient("Softmax")
@@ -328,7 +330,7 @@ def _EluGradGrad(op, grad):
   return (gen_nn_ops._elu_grad(grad, op.outputs[0]),
           array_ops.where(
               x < 0., gen_nn_ops._elu_grad(grad, op.outputs[0] + 1),
-              array_ops.zeros(shape = array_ops.shape(x), dtype = x.dtype)))
+              array_ops.zeros(shape=array_ops.shape(x), dtype=x.dtype)))
 
 
 @ops.RegisterGradient("Relu6")
@@ -385,12 +387,13 @@ def _SoftmaxCrossEntropyWithLogitsGrad(op, grad_loss, grad_grad):
   softmax_grad = op.outputs[1]
   grad = _BroadcastMul(grad_loss, softmax_grad)
 
-  if grad_grad.op.type not in ('ZerosLike', 'Zeros'):
+  if grad_grad.op.type not in ("ZerosLike", "Zeros"):
     logits = op.inputs[0]
     softmax = nn_ops.softmax(logits)
 
-    grad += ((grad_grad - array_ops.squeeze(math_ops.matmul(grad_grad[:, None, :],
-                                                              softmax[:, :, None]), axis=1)) * softmax)
+    grad += ((grad_grad - array_ops.squeeze(
+        math_ops.matmul(grad_grad[:, None, :],
+                        softmax[:, :, None]), axis=1)) * softmax)
 
   return grad, None
 
@@ -482,12 +485,12 @@ def _AvgPoolGrad(op, grad):
 
 @ops.RegisterGradient("AvgPoolGrad")
 def _AvgPoolGradGrad(op, grad):
-  return (array_ops.stop_gradient(op.inputs[0]),
-          gen_nn_ops._avg_pool(grad,
-                               op.get_attr("ksize"),
-                               op.get_attr("strides"),
-                               op.get_attr("padding"),
-                               data_format=op.get_attr("data_format")))
+  return (array_ops.stop_gradient(op.inputs[0]), gen_nn_ops._avg_pool(
+      grad,
+      op.get_attr("ksize"),
+      op.get_attr("strides"),
+      op.get_attr("padding"),
+      data_format=op.get_attr("data_format")))
 
 
 @ops.RegisterGradient("MaxPool")
@@ -503,32 +506,34 @@ def _MaxPoolGrad(op, grad):
 
 @ops.RegisterGradient("MaxPoolGrad")
 def _MaxPoolGradGrad(op, grad):
-  return (array_ops.zeros(shape=array_ops.shape(op.inputs[0]),
-                          dtype=op.inputs[0].dtype),
-          array_ops.zeros(shape=array_ops.shape(op.inputs[1]),
-                          dtype=op.inputs[1].dtype),
-          gen_nn_ops._max_pool_grad_grad(op.inputs[0],
-                                         op.inputs[1],
-                                         grad,
-                                         op.get_attr("ksize"),
-                                         op.get_attr("strides"),
-                                         padding=op.get_attr("padding"),
-                                         data_format=op.get_attr("data_format")))
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool_grad_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
 
 
 @ops.RegisterGradient("MaxPoolGradGrad")
 def _MaxPoolGradGradGrad(op, grad):
-  return (array_ops.zeros(shape=array_ops.shape(op.inputs[0]),
-                          dtype=op.inputs[0].dtype),
-          array_ops.zeros(shape=array_ops.shape(op.inputs[1]),
-                          dtype=op.inputs[1].dtype),
-          gen_nn_ops._max_pool_grad(op.inputs[0],
-                                    op.inputs[1],
-                                    grad,
-                                    op.get_attr("ksize"),
-                                    op.get_attr("strides"),
-                                    padding=op.get_attr("padding"),
-                                    data_format=op.get_attr("data_format")))
+  return (array_ops.zeros(
+      shape=array_ops.shape(op.inputs[0]),
+      dtype=op.inputs[0].dtype), array_ops.zeros(
+          shape=array_ops.shape(op.inputs[1]), dtype=op.inputs[1].dtype),
+          gen_nn_ops._max_pool_grad(
+              op.inputs[0],
+              op.inputs[1],
+              grad,
+              op.get_attr("ksize"),
+              op.get_attr("strides"),
+              padding=op.get_attr("padding"),
+              data_format=op.get_attr("data_format")))
 
 
 @ops.RegisterGradient("FractionalMaxPool")
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index b2ccec0a9d..99d29a3719 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -39,6 +39,8 @@ from tensorflow.python.ops.gen_nn_ops import *
 # Aliases for some automatically-generated names.
 local_response_normalization = gen_nn_ops.lrn
 
+# pylint: disable=protected-access
+
 
 def _non_atrous_convolution(input, filter, padding, data_format=None,  # pylint: disable=redefined-builtin
                             strides=None, name=None):
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index e84fa21868..86e0cae27a 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -159,16 +159,15 @@ class ResourceVariable(object):
     with ops.control_dependencies(None):
       with ops.name_scope(name, "Variable", [] if init_from_fn else
                           [initial_value]) as name:
+        # pylint: disable=protected-access
+        true_name = ops._name_from_scope_name(name)
         if init_from_fn:
           # Use attr_scope and device(None) to simulate the behavior of
           # colocate_with when the variable we want to colocate with doesn't
           # yet exist.
-          # pylint: disable=protected-access
-          true_name = ops._name_from_scope_name(name)
           attr = attr_value_pb2.AttrValue(
               list=attr_value_pb2.AttrValue.ListValue(
                   s=[compat.as_bytes("loc:@%s" % true_name)]))
-          # pylint: disable=protected-access
           with ops.get_default_graph()._attr_scope({"_class": attr}):
             with ops.name_scope("Initializer"), ops.device(None):
               self._initial_value = ops.convert_to_tensor(
@@ -176,7 +175,8 @@ class ResourceVariable(object):
             self._handle = gen_resource_variable_ops.var_handle_op(
                 shape=self._initial_value.get_shape(),
                 dtype=self._initial_value.dtype.base_dtype,
-                shared_name=name, name=name)
+                shared_name=true_name, name=name)
+        # pylint: enable=protected-access
 
         # Or get the initial value from a Tensor or Python object.
         else:
@@ -185,7 +185,7 @@ class ResourceVariable(object):
           self._handle = gen_resource_variable_ops.var_handle_op(
               shape=self._initial_value.get_shape(),
               dtype=self._initial_value.dtype.base_dtype,
-              shared_name=name, name=name)
+              shared_name=true_name, name=name)
 
         self._dtype = self._initial_value.dtype.base_dtype
 
@@ -201,8 +201,16 @@ class ResourceVariable(object):
               self._handle, dtype=self._dtype)
           self._graph_element = value
           if caching_device is not None:
-            with ops.device(caching_device):
-              self._cached_value = array_ops.identity(value)
+            # Variables may be created in a tf.device() or ops.colocate_with()
+            # context. At the same time, users would expect caching device to be
+            # independent of this context, and/or would not expect the current
+            # device context to be merged with the caching device spec.
+            # Therefore we reset the colocation stack before creating the cached
+            # value. Note that resetting the colocation stack will also reset
+            # the device stack.
+            with ops.colocate_with(None, ignore_existing=True):
+              with ops.device(caching_device):
+                self._cached_value = array_ops.identity(value)
           else:
             self._cached_value = None
           ops.add_to_collections(collections, self)
@@ -422,6 +430,8 @@ def _dense_var_to_tensor(var, dtype=None, name=None, as_ref=False):
   if dtype is not None and dtype != var.value().dtype:
     print("trying to switch the dtype to ", dtype, " from ", var.value().dtype)
     return NotImplemented
+  if as_ref:
+    return var.read_value().op.inputs[0]
   return var.value()
 # pylint: enable=unused-argument,protected-access
 
diff --git a/tensorflow/python/platform/control_imports.py b/tensorflow/python/platform/control_imports.py
new file mode 100644
index 0000000000..b8e8e78ef3
--- /dev/null
+++ b/tensorflow/python/platform/control_imports.py
@@ -0,0 +1,27 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Switch between Google or open source dependencies."""
+# Switch between Google and OSS dependencies
+USE_OSS = True
+
+# Per-dependency switches determining whether each dependency is ready
+# to be replaced by its OSS equivalence.
+# TODO(danmane,mrry,opensource): Flip these switches, then remove them
+OSS_APP = True
+OSS_FLAGS = True
+OSS_GFILE = True
+OSS_GOOGLETEST = True
+OSS_LOGGING = True
+OSS_PARAMETERIZED = True
diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py
index 3172a1d5ba..1a980f9311 100644
--- a/tensorflow/python/training/saver_test.py
+++ b/tensorflow/python/training/saver_test.py
@@ -156,6 +156,18 @@ class SaverTest(test.TestCase):
   def testResourceBasic(self):
     self.basicSaveRestore(resource_variable_ops.ResourceVariable)
 
+  def testResourceSaveRestoreCachingDevice(self):
+    save_path = os.path.join(self.get_temp_dir(), "resource_cache")
+    v = resource_variable_ops.ResourceVariable([1], caching_device="/cpu:0")
+    with self.test_session() as sess:
+      variables.global_variables_initializer().run()
+      save = saver_module.Saver()
+      save.save(sess, save_path)
+    with self.test_session() as sess:
+      save2 = saver_module.Saver()
+      save2.restore(sess, save_path)
+      self.assertEquals(v.eval(), [1])
+
   def testSaveCopyRestoreWithSaveRelativePaths(self):
     """Save, copy checkpoint dir and restore from copied dir.
 
diff --git a/tensorflow/stream_executor/cuda/cuda_dnn.cc b/tensorflow/stream_executor/cuda/cuda_dnn.cc
index eed0d43a3c..b6d841f365 100644
--- a/tensorflow/stream_executor/cuda/cuda_dnn.cc
+++ b/tensorflow/stream_executor/cuda/cuda_dnn.cc
@@ -1202,7 +1202,8 @@ class CudnnRnnSequenceTensorDescriptor
     // Only the first one needs to be destroyed. All others are the same.
     cudnnStatus_t status =
         wrap::cudnnDestroyTensorDescriptor(parent_, handles_[0]);
-    CUDNN_RETURN_IF_FAIL(status, "Failed to destroy sequence tensor descriptor");
+    CUDNN_RETURN_IF_FAIL(status,
+                         "Failed to destroy sequence tensor descriptor");
   }
 
   const cudnnTensorDescriptor_t* handles() const {
@@ -3089,7 +3090,7 @@ bool CudnnSupport::DoPoolForward(
     DeviceMemory<double>* output_data) {
   mutex_lock lock{dnn_handle_mutex_};
   auto status = wrap::cudnnSetStream(parent_, ToHandle(dnn_handle_),
-                                        AsCUDAStreamValue(stream));
+                                     AsCUDAStreamValue(stream));
   if (status != CUDNN_STATUS_SUCCESS) {
     LOG(ERROR) << "failed to set stream for cudnn handle: " << ToString(status);
     return false;
@@ -3195,7 +3196,7 @@ bool CudnnSupport::DoPoolBackward(
     DeviceMemory<double>* output_diff_data) {
   mutex_lock lock{dnn_handle_mutex_};
   auto status = wrap::cudnnSetStream(parent_, ToHandle(dnn_handle_),
-                                        AsCUDAStreamValue(stream));
+                                     AsCUDAStreamValue(stream));
   if (status != CUDNN_STATUS_SUCCESS) {
     LOG(ERROR) << "failed to set stream for cudnn handle: " << ToString(status);
     return false;
diff --git a/tensorflow/stream_executor/dnn.h b/tensorflow/stream_executor/dnn.h
index 2cd4eda411..c5805064f3 100644
--- a/tensorflow/stream_executor/dnn.h
+++ b/tensorflow/stream_executor/dnn.h
@@ -1276,23 +1276,29 @@ class DnnSupport {
   virtual bool DoPoolForward(Stream* stream,
                              const dnn::PoolingDescriptor& pooling_dimensions,
                              const dnn::BatchDescriptor& input_dimensions,
-                             const DeviceMemory<double>& input_data,
+                             const DeviceMemory<float>& input_data,
                              const dnn::BatchDescriptor& output_dimensions,
-                             DeviceMemory<double>* output_data) = 0;
+                             DeviceMemory<float>* output_data) = 0;
 
   virtual bool DoPoolForward(Stream* stream,
                              const dnn::PoolingDescriptor& pooling_dimensions,
                              const dnn::BatchDescriptor& input_dimensions,
-                             const DeviceMemory<float>& input_data,
+                             const DeviceMemory<double>& input_data,
                              const dnn::BatchDescriptor& output_dimensions,
-                             DeviceMemory<float>* output_data) = 0;
+                             DeviceMemory<double>* output_data) {
+    LOG(FATAL) << "DoPoolForward not implemented for double.";
+    return false;
+  }
 
   virtual bool DoPoolForward(Stream* stream,
                              const dnn::PoolingDescriptor& pooling_dimensions,
                              const dnn::BatchDescriptor& input_dimensions,
                              const DeviceMemory<Eigen::half>& input_data,
                              const dnn::BatchDescriptor& output_dimensions,
-                             DeviceMemory<Eigen::half>* output_data) = 0;
+                             DeviceMemory<Eigen::half>* output_data) {
+    LOG(FATAL) << "DoPoolForward not implemented for float16.";
+    return false;
+  }
 
   // Performs differentiation of the pooling operation.
   virtual bool DoPoolBackward(Stream* stream,
@@ -1302,7 +1308,10 @@ class DnnSupport {
                               const dnn::BatchDescriptor& output_dimensions,
                               const DeviceMemory<double>& output_data,
                               const DeviceMemory<double>& input_diff_data,
-                              DeviceMemory<double>* output_diff_data) = 0;
+                              DeviceMemory<double>* output_diff_data) {
+    LOG(FATAL) << "DoPoolBackward not implemented.";
+    return false;
+  }
 
   virtual bool DoPoolBackward(Stream* stream,
                               const dnn::PoolingDescriptor& pooling_dimensions,
@@ -1311,7 +1320,10 @@ class DnnSupport {
                               const dnn::BatchDescriptor& output_dimensions,
                               const DeviceMemory<float>& output_data,
                               const DeviceMemory<float>& input_diff_data,
-                              DeviceMemory<float>* output_diff_data) = 0;
+                              DeviceMemory<float>* output_diff_data) {
+    LOG(FATAL) << "DoPoolBackward not implemented.";
+    return false;
+  }
 
   virtual bool DoPoolBackward(Stream* stream,
                               const dnn::PoolingDescriptor& pooling_dimensions,
@@ -1320,7 +1332,10 @@ class DnnSupport {
                               const dnn::BatchDescriptor& output_dimensions,
                               const DeviceMemory<Eigen::half>& output_data,
                               const DeviceMemory<Eigen::half>& input_diff_data,
-                              DeviceMemory<Eigen::half>* output_diff_data) = 0;
+                              DeviceMemory<Eigen::half>* output_diff_data) {
+    LOG(FATAL) << "DoPoolBackward not implemented.";
+    return false;
+  }
 
   // Applies local response normalization to the values from
   // input_data and writes the result to output_data. See comments on
@@ -1900,4 +1915,3 @@ class DnnSupport {
 }  // namespace perftools
 
 #endif  // TENSORFLOW_STREAM_EXECUTOR_DNN_H_
-
diff --git a/tensorflow/tensorboard/TAG b/tensorflow/tensorboard/TAG
index 82cced27d7..0691f67b20 100644
--- a/tensorflow/tensorboard/TAG
+++ b/tensorflow/tensorboard/TAG
@@ -1 +1 @@
-51
+52
diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD
index b99e6c5655..4e1db85374 100644
--- a/tensorflow/tensorboard/backend/BUILD
+++ b/tensorflow/tensorboard/backend/BUILD
@@ -90,6 +90,7 @@ py_test(
         "//tensorflow/python:training",
         "//tensorflow/tensorboard",
         "//tensorflow/tensorboard/backend/event_processing:event_multiplexer",
+        "//tensorflow/tensorboard/plugins:base_plugin",
         "@org_pocoo_werkzeug//:werkzeug",
     ],
 )
diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index e812880bbd..005d183039 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -102,11 +102,11 @@ def standard_tensorboard_wsgi(logdir, purge_orphaned_data, reload_interval):
       size_guidance=DEFAULT_SIZE_GUIDANCE,
       purge_orphaned_data=purge_orphaned_data)
 
-  plugins = {
-      debugger_plugin.PLUGIN_PREFIX_ROUTE: debugger_plugin.DebuggerPlugin(),
-      projector_plugin.PLUGIN_PREFIX_ROUTE: projector_plugin.ProjectorPlugin(),
-      text_plugin.PLUGIN_PREFIX_ROUTE: text_plugin.TextPlugin(),
-  }
+  plugins = [
+      debugger_plugin.DebuggerPlugin(),
+      projector_plugin.ProjectorPlugin(),
+      text_plugin.TextPlugin(),
+  ]
 
   return TensorBoardWSGIApp(logdir, plugins, multiplexer, reload_interval)
 
@@ -128,12 +128,16 @@ class TensorBoardWSGIApp(object):
       logdir: the logdir spec that describes where data will be loaded.
         may be a directory, or comma,separated list of directories, or colons
         can be used to provide named directories
-      plugins: Map from plugin name to plugin application
+      plugins: List of plugins that extend tensorboard.plugins.BasePlugin
       multiplexer: The EventMultiplexer with TensorBoard data to serve
       reload_interval: How often (in seconds) to reload the Multiplexer
 
     Returns:
       A WSGI application that implements the TensorBoard backend.
+
+    Raises:
+      ValueError: If some plugin has no plugin_name
+      ValueError: If two plugins have the same plugin_name
     """
     self._logdir = logdir
     self._plugins = plugins
@@ -177,15 +181,22 @@ class TensorBoardWSGIApp(object):
     # Serve the routes from the registered plugins using their name as the route
     # prefix. For example if plugin z has two routes /a and /b, they will be
     # served as /data/plugin/z/a and /data/plugin/z/b.
-    for name in self._plugins:
+    plugin_names_encountered = set()
+    for plugin in self._plugins:
+      if plugin.plugin_name is None:
+        raise ValueError('Plugin %s has no plugin_name' % plugin)
+      if plugin.plugin_name in plugin_names_encountered:
+        raise ValueError('Duplicate plugins for name %s' % plugin.plugin_name)
+      plugin_names_encountered.add(plugin.plugin_name)
+
       try:
-        plugin = self._plugins[name]
         plugin_apps = plugin.get_plugin_apps(self._multiplexer, self._logdir)
       except Exception as e:  # pylint: disable=broad-except
-        logging.warning('Plugin %s failed. Exception: %s', name, str(e))
+        logging.warning('Plugin %s failed. Exception: %s', plugin.plugin_name,
+                        str(e))
         continue
       for route, app in plugin_apps.items():
-        path = DATA_PREFIX + PLUGIN_PREFIX + '/' + name + route
+        path = DATA_PREFIX + PLUGIN_PREFIX + '/' + plugin.plugin_name + route
         self.data_applications[path] = app
 
   # We use underscore_names for consistency with inherited methods.
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 234c541803..454ba63e75 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -48,6 +48,7 @@ from tensorflow.python.summary.writer import writer as writer_lib
 from tensorflow.tensorboard import tensorboard
 from tensorflow.tensorboard.backend import application
 from tensorflow.tensorboard.backend.event_processing import event_multiplexer
+from tensorflow.tensorboard.plugins import base_plugin
 
 
 class TensorboardServerTest(test.TestCase):
@@ -61,7 +62,7 @@ class TensorboardServerTest(test.TestCase):
     multiplexer = event_multiplexer.EventMultiplexer(
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
-    plugins = {}
+    plugins = []
     app = application.TensorBoardWSGIApp(
         self.temp_dir, plugins, multiplexer, reload_interval=0)
     try:
@@ -480,5 +481,34 @@ class TensorboardSimpleServerConstructionTest(test.TestCase):
     self.assertTrue(one_passed)  # We expect either IPv4 or IPv6 to be supported
 
 
+class TensorBoardApplcationConstructionTest(test.TestCase):
+
+  def testExceptions(self):
+
+    class UnnamedPlugin(base_plugin.TBPlugin):
+
+      def get_plugin_apps(self):
+        pass
+
+    class MockPlugin(UnnamedPlugin):
+      plugin_name = 'mock'
+
+    class OtherMockPlugin(UnnamedPlugin):
+      plugin_name = 'mock'
+
+    logdir = '/fake/foo'
+    multiplexer = event_multiplexer.EventMultiplexer()
+
+    # Fails if there is an unnamed plugin
+    with self.assertRaises(ValueError):
+      plugins = [UnnamedPlugin()]
+      application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
+
+    # Fails if there are two plugins with same name
+    with self.assertRaises(ValueError):
+      plugins = [MockPlugin(), OtherMockPlugin()]
+      application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
+
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
index bc15312fc3..ac407844f0 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
@@ -194,10 +194,11 @@ handle these situations gracefully.
         type: Object,
         observer: "synchronizeColors",
       }, // map from run name to css class
-      numRunsEnabledByDefault: {
-        // When TB first loads, first k runs are enabled, rest are disabled.
+      maxRunsToEnableByDefault: {
+        // When TB first loads, if it has k or fewer runs, they are all enabled
+        // by default. If there are more, then they are all disabled.
         type: Number,
-        value: 10,
+        value: 40,
       },
       _debouncedRegexChange: {
         type: Function,
@@ -230,8 +231,24 @@ handle these situations gracefully.
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMapping(runSelectionState)",
+      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
+    _storeRunToIsCheckedMappingWithDefault() {
+      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
+      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
+        return;
+      }
+      var _this = this;
+      var allToggledOn = this.namesMatchingRegex
+              .every(function(n) {return _this.runSelectionState[n]});
+      var allToggledOff = this.namesMatchingRegex
+              .every(function(n) {return !_this.runSelectionState[n]});
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
+        this.runSelectionState = {};
+      }
+      this._storeRunToIsCheckedMapping(this.runSelectionState);
+    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
@@ -261,9 +278,10 @@ handle these situations gracefully.
     },
     computeOutSelected: function(__, ___) {
       var runSelectionState = this.runSelectionState;
-      var num = this.numRunsEnabledByDefault;
+      var num = this.maxRunsToEnableByDefault;
+      var allEnabled = this.namesMatchingRegex.length <= num;
       return this.namesMatchingRegex.filter(function(n, i) {
-        return runSelectionState[n] == null ? i<num : runSelectionState[n];
+        return runSelectionState[n] == null ? allEnabled : runSelectionState[n];
       });
     },
     synchronizeColors: function(e) {
@@ -313,18 +331,24 @@ handle these situations gracefully.
     _regexInputObserver: TF.URIStorage.getStringObserver("regexInput", ""),
     toggleAll: function() {
       var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-                    .every(function(n) {return _this.runSelectionState[n]});
+      var anyToggledOn = this.namesMatchingRegex
+                    .some(function(n) {return _this.runSelectionState[n]});
+
 
       var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
 
-      var numRuns = this.namesMatchingRegex.length;
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      // We have runs toggled either if some were explicitly toggled on, or if
+      // we are in the default state, and there are few enough that we default
+      // to toggling on.
+      anyToggledOn = anyToggledOn || runSelectionStateIsDefault && !defaultOff;
 
-      var shouldDisable = allToggledOn || runSelectionStateIsDefault;
+      // If any are toggled on, we turn everything off. Or, if none are toggled
+      // on, we turn everything on.
 
       var newRunsDisabled = {};
       this.names.forEach(function(n) {
-        newRunsDisabled[n] = !shouldDisable;
+        newRunsDisabled[n] = !anyToggledOn;
       })
       this.runSelectionState = newRunsDisabled;
     },
diff --git a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts b/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
index 59da03d455..4bc6a8a837 100644
--- a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
+++ b/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
@@ -453,8 +453,8 @@ module VZ {
     }
 
     private resmoothDataset(dataset: Plottable.Dataset) {
-      var data = dataset.data();
-      var smoothingWeight = this.smoothingWeight;
+      let data = dataset.data();
+      const smoothingWeight = this.smoothingWeight;
       let last = data.length > 0 ? data[0].scalar : NaN;
       data.forEach((d) => {
         if (!_.isFinite(last)) {
@@ -462,8 +462,8 @@ module VZ {
         } else {
           // 1st-order IIR low-pass filter to attenuate the higher-
           // frequency components of the time-series.
-          d.smoothed = last * smoothingWeight +
-                       (1 - smoothingWeight) * d.scalar;
+          d.smoothed =
+              last * smoothingWeight + (1 - smoothingWeight) * d.scalar;
         }
         last = d.smoothed;
       });
diff --git a/tensorflow/tensorboard/plugins/base_plugin.py b/tensorflow/tensorboard/plugins/base_plugin.py
index 86cfeb6cc2..8b1560cf8a 100644
--- a/tensorflow/tensorboard/plugins/base_plugin.py
+++ b/tensorflow/tensorboard/plugins/base_plugin.py
@@ -30,6 +30,12 @@ class TBPlugin(object):
   """TensorBoard plugin interface. Every plugin must extend from this class."""
   __metaclass__ = ABCMeta
 
+  # The plugin_name will also be a prefix in the http handlers generated by
+  # the plugin, e.g. `data/plugins/$PLUGIN_NAME/$HANDLER`
+  # The plugin name must be unique for each registered plugin, or
+  # a ValueError will be thrown when the application is constructed
+  plugin_name = None
+
   @abstractmethod
   def get_plugin_apps(self, multiplexer, logdir):
     """Returns a set of WSGI applications that the plugin implements.
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
index 43902efe24..cfa8f68187 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
@@ -34,7 +34,7 @@ from tensorflow.tensorboard.backend.event_processing import event_file_loader
 from tensorflow.tensorboard.plugins import base_plugin
 
 # The prefix of routes provided by this plugin.
-PLUGIN_PREFIX_ROUTE = 'debugger'
+_PLUGIN_PREFIX_ROUTE = 'debugger'
 
 # HTTP routes.
 _HEALTH_PILLS_ROUTE = '/health_pills'
@@ -63,6 +63,8 @@ class DebuggerPlugin(base_plugin.TBPlugin):
   values.
   """
 
+  plugin_name = _PLUGIN_PREFIX_ROUTE
+
   def get_plugin_apps(self, multiplexer, logdir):
     """Obtains a mapping between routes and handlers. Stores the logdir.
 
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
index 9e71e2713d..2c9135fd27 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
@@ -96,7 +96,7 @@ class DebuggerPluginTest(test.TestCase):
     })
     self.plugin = debugger_plugin.DebuggerPlugin()
     wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, {'debugger': self.plugin},
+        self.log_dir, [self.plugin],
         self.multiplexer,
         reload_interval=0)
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 439e919898..32ebb78e42 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -42,7 +42,7 @@ from tensorflow.tensorboard.plugins.base_plugin import TBPlugin
 from tensorflow.tensorboard.plugins.projector import projector_config_pb2
 
 # The prefix of routes provided by this plugin.
-PLUGIN_PREFIX_ROUTE = 'projector'
+_PLUGIN_PREFIX_ROUTE = 'projector'
 
 PROJECTOR_FILENAME = 'projector_config.pbtxt'
 
@@ -305,6 +305,8 @@ def _parse_positive_int_param(request, param_name):
 class ProjectorPlugin(TBPlugin):
   """Embedding projector."""
 
+  plugin_name = _PLUGIN_PREFIX_ROUTE
+
   def __init__(self):
     self._handlers = None
     self.readers = {}
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index 750cb1472a..5679eff4a3 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -104,10 +104,8 @@ class ProjectorAppTest(test.TestCase):
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
     plugin = projector_plugin.ProjectorPlugin()
-    plugin.get_plugin_apps(multiplexer, self.log_dir)
-    plugins = {'projector': plugin}
     wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, plugins, multiplexer, reload_interval=0)
+        self.log_dir, [plugin], multiplexer, reload_interval=0)
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
   def _Get(self, path):
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin.py b/tensorflow/tensorboard/plugins/text/text_plugin.py
index 2c0620f564..b337ce2ad0 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin.py
@@ -39,7 +39,7 @@ from tensorflow.tensorboard.backend import http_util
 from tensorflow.tensorboard.plugins import base_plugin
 
 # The prefix of routes provided by this plugin.
-PLUGIN_PREFIX_ROUTE = 'text'
+_PLUGIN_PREFIX_ROUTE = 'text'
 
 # HTTP routes
 RUNS_ROUTE = '/runs'
@@ -251,6 +251,8 @@ def process_string_tensor_event(event):
 class TextPlugin(base_plugin.TBPlugin):
   """Text Plugin for TensorBoard."""
 
+  plugin_name = _PLUGIN_PREFIX_ROUTE
+
   def index_impl(self):
     run_to_series = {}
     name = text_summary.TextSummaryPluginAsset.plugin_name
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index c8254f0062..156f7b13bd 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -1,42 +1,45 @@
 # -*- Python -*-
 
+
 # Given a source file, generate a test name.
 # i.e. "common_runtime/direct_session_test.cc" becomes
 #      "common_runtime_direct_session_test"
 def src_to_test_name(src):
   return src.replace("/", "_").split(".")[0]
 
+
 # Return the options to use for a C++ library or binary build.
 # Uses the ":optmode" config_setting to pick the options.
 load(
     "//tensorflow/core:platform/default/build_config_root.bzl",
     "tf_cuda_tests_tags",
     "tf_sycl_tests_tags",
-    "tf_additional_xla_deps_py",
-)
-load(
-    "@local_config_cuda//cuda:build_defs.bzl",
-    "if_cuda",
-    "cuda_default_copts"
-)
+    "tf_additional_xla_deps_py",)
+load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda", "cuda_default_copts")
 
 load(
     "//third_party/mkl:build_defs.bzl",
-    "if_mkl",
-)
+    "if_mkl",)
+
 
 # List of proto files for android builds
 def tf_android_core_proto_sources(core_proto_sources_relative):
-  return [str(Label("//tensorflow/core:" + p))
-          for p in core_proto_sources_relative]
+  return [
+      "//tensorflow/core:" + p for p in core_proto_sources_relative
+  ]
+
 
 # Returns the list of pb.h and proto.h headers that are generated for
 # tf_android_core_proto_sources().
 def tf_android_core_proto_headers(core_proto_sources_relative):
-  return ([str(Label("//tensorflow/core/" + p.replace(".proto", ".pb.h")))
-          for p in core_proto_sources_relative] +
-         [str(Label("//tensorflow/core/" + p.replace(".proto", ".proto.h")))
-          for p in core_proto_sources_relative])
+  return ([
+      "//tensorflow/core/" + p.replace(".proto", ".pb.h")
+      for p in core_proto_sources_relative
+  ] + [
+      "//tensorflow/core/" + p.replace(".proto", ".proto.h")
+      for p in core_proto_sources_relative
+  ])
+
 
 def if_android_x86(a):
   return select({
@@ -52,30 +55,35 @@ def if_android_arm(a):
       "//conditions:default": [],
   })
 
+
 def if_android_arm64(a):
   return select({
       str(Label("//tensorflow:android_arm64")): a,
       "//conditions:default": [],
   })
 
+
 def if_not_android(a):
   return select({
       str(Label("//tensorflow:android")): [],
       "//conditions:default": a,
   })
 
+
 def if_android(a):
   return select({
       str(Label("//tensorflow:android")): a,
       "//conditions:default": [],
   })
 
+
 def if_ios(a):
   return select({
       str(Label("//tensorflow:ios")): a,
       "//conditions:default": [],
   })
 
+
 def if_mobile(a):
   return select({
       str(Label("//tensorflow:android")): a,
@@ -83,6 +91,7 @@ def if_mobile(a):
       "//conditions:default": [],
   })
 
+
 def if_not_mobile(a):
   return select({
       str(Label("//tensorflow:android")): [],
@@ -90,12 +99,14 @@ def if_not_mobile(a):
       "//conditions:default": a,
   })
 
+
 def if_not_windows(a):
   return select({
       str(Label("//tensorflow:windows")): [],
       "//conditions:default": a,
   })
 
+
 def if_x86(a):
   return select({
       str(Label("//tensorflow:linux_x86_64")): a,
@@ -103,33 +114,34 @@ def if_x86(a):
       "//conditions:default": [],
   })
 
+
 # LINT.IfChange
 def tf_copts():
-  return (["-DEIGEN_AVOID_STL_ARRAY",
-           "-Iexternal/gemmlowp",
-           "-Wno-sign-compare",
-           "-fno-exceptions",] +
-          if_cuda(["-DGOOGLE_CUDA=1"]) +
-          if_mkl(["-DINTEL_MKL=1"]) +
-          if_android_arm(["-mfpu=neon"]) +
-          if_x86(["-msse3"]) +
-          select({
-              str(Label("//tensorflow:android")): [
-                  "-std=c++11",
-                  "-DTF_LEAN_BINARY",
-                  "-O2",
-              ],
-              str(Label("//tensorflow:darwin")): [],
-              str(Label("//tensorflow:windows")): [
-                "/DLANG_CXX11",
-                "/D__VERSION__=\\\"MSVC\\\"",
-                "/DPLATFORM_WINDOWS",
-                "/DTF_COMPILE_LIBRARY",
-                "/DEIGEN_HAS_C99_MATH",
-                "/DTENSORFLOW_USE_EIGEN_THREADPOOL",
-              ],
-              str(Label("//tensorflow:ios")): ["-std=c++11"],
-              "//conditions:default": ["-pthread"]}))
+  return ([
+      "-DEIGEN_AVOID_STL_ARRAY",
+      "-Iexternal/gemmlowp",
+      "-Wno-sign-compare",
+      "-fno-exceptions",
+  ] + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]) + if_android_arm(
+      ["-mfpu=neon"]) + if_x86(["-msse3"]) + select({
+          "//tensorflow:android": [
+              "-std=c++11",
+              "-DTF_LEAN_BINARY",
+              "-O2",
+          ],
+          "//tensorflow:darwin": [],
+          "//tensorflow:windows": [
+              "/DLANG_CXX11",
+              "/D__VERSION__=\\\"MSVC\\\"",
+              "/DPLATFORM_WINDOWS",
+              "/DTF_COMPILE_LIBRARY",
+              "/DEIGEN_HAS_C99_MATH",
+              "/DTENSORFLOW_USE_EIGEN_THREADPOOL",
+          ],
+          "//tensorflow:ios": ["-std=c++11"],
+          "//conditions:default": ["-pthread"]
+      }))
+
 
 def tf_opts_nortti_if_android():
   return if_android([
@@ -137,8 +149,11 @@ def tf_opts_nortti_if_android():
       "-DGOOGLE_PROTOBUF_NO_RTTI",
       "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
   ]) + if_android_x86(["-msse4.1"])
+
+
 # LINT.ThenChange(//tensorflow/contrib/android/cmake/CMakeLists.txt)
 
+
 # Given a list of "op_lib_names" (a list of files in the ops directory
 # without their .cc extensions), generate a library for that file.
 def tf_gen_op_libs(op_lib_names, deps=None):
@@ -147,16 +162,20 @@ def tf_gen_op_libs(op_lib_names, deps=None):
   if not deps:
     deps = []
   for n in op_lib_names:
-    native.cc_library(name=n + "_op_lib",
-                      copts=tf_copts(),
-                      srcs=["ops/" + n + ".cc"],
-                      deps=deps + [str(Label("//tensorflow/core:framework"))],
-                      visibility=["//visibility:public"],
-                      alwayslink=1,
-                      linkstatic=1,)
-
-def tf_gen_op_wrapper_cc(name, out_ops_file, pkg="",
-                         op_gen=str(Label("//tensorflow/cc:cc_op_gen_main")),
+    native.cc_library(
+        name=n + "_op_lib",
+        copts=tf_copts(),
+        srcs=["ops/" + n + ".cc"],
+        deps=deps + ["//tensorflow/core:framework"],
+        visibility=["//visibility:public"],
+        alwayslink=1,
+        linkstatic=1,)
+
+
+def tf_gen_op_wrapper_cc(name,
+                         out_ops_file,
+                         pkg="",
+                         op_gen="//tensorflow/cc:cc_op_gen_main",
                          deps=None,
                          override_file=None,
                          include_internal_ops=0):
@@ -165,12 +184,11 @@ def tf_gen_op_wrapper_cc(name, out_ops_file, pkg="",
   if deps == None:
     deps = [pkg + ":" + name + "_op_lib"]
   native.cc_binary(
-      name = tool,
-      copts = tf_copts(),
-      linkopts = ["-lm"],
-      linkstatic = 1,   # Faster to link this one-time-use binary dynamically
-      deps = [op_gen] + deps
-  )
+      name=tool,
+      copts=tf_copts(),
+      linkopts=["-lm"],
+      linkstatic=1,  # Faster to link this one-time-use binary dynamically
+      deps=[op_gen] + deps)
 
   if override_file == None:
     srcs = []
@@ -180,14 +198,17 @@ def tf_gen_op_wrapper_cc(name, out_ops_file, pkg="",
     override_arg = "$(location " + override_file + ")"
   native.genrule(
       name=name + "_genrule",
-      outs=[out_ops_file + ".h", out_ops_file + ".cc",
-            out_ops_file + "_internal.h", out_ops_file + "_internal.cc"],
+      outs=[
+          out_ops_file + ".h", out_ops_file + ".cc",
+          out_ops_file + "_internal.h", out_ops_file + "_internal.cc"
+      ],
       srcs=srcs,
       tools=[":" + tool],
       cmd=("$(location :" + tool + ") $(location :" + out_ops_file + ".h) " +
            "$(location :" + out_ops_file + ".cc) " + override_arg + " " +
            str(include_internal_ops)))
 
+
 # Given a list of "op_lib_names" (a list of files in the ops directory
 # without their .cc extensions), generate individual C++ .cc and .h
 # files for each of the ops files mentioned, and then generate a
@@ -235,59 +256,72 @@ def tf_gen_op_wrappers_cc(name,
   internalhdrs = []
   for n in op_lib_names:
     tf_gen_op_wrapper_cc(
-        n, "ops/" + n, pkg=pkg, op_gen=op_gen, override_file=override_file,
+        n,
+        "ops/" + n,
+        pkg=pkg,
+        op_gen=op_gen,
+        override_file=override_file,
         include_internal_ops=include_internal_ops)
     subsrcs += ["ops/" + n + ".cc"]
     subhdrs += ["ops/" + n + ".h"]
     internalsrcs += ["ops/" + n + "_internal.cc"]
     internalhdrs += ["ops/" + n + "_internal.h"]
 
-  native.cc_library(name=name,
-                    srcs=subsrcs,
-                    hdrs=subhdrs,
-                    deps=deps + if_not_android([
-                        str(Label("//tensorflow/core:core_cpu")),
-                        str(Label("//tensorflow/core:framework")),
-                        str(Label("//tensorflow/core:lib")),
-                        str(Label("//tensorflow/core:protos_all_cc")),
-                    ]) + if_android([
-                        str(Label("//tensorflow/core:android_tensorflow_lib")),
-                    ]),
-                    copts=tf_copts(),
-                    alwayslink=1,
-                    visibility=visibility)
-  native.cc_library(name=name + "_internal",
-                    srcs=internalsrcs,
-                    hdrs=internalhdrs,
-                    deps=deps + if_not_android([
-                        str(Label("//tensorflow/core:core_cpu")),
-                        str(Label("//tensorflow/core:framework")),
-                        str(Label("//tensorflow/core:lib")),
-                        str(Label("//tensorflow/core:protos_all_cc")),
-                    ]) + if_android([
-                        str(Label("//tensorflow/core:android_tensorflow_lib")),
-                    ]),
-                    copts=tf_copts(),
-                    alwayslink=1,
-                    visibility=[str(Label("//tensorflow:internal"))])
+  native.cc_library(
+      name=name,
+      srcs=subsrcs,
+      hdrs=subhdrs,
+      deps=deps + if_not_android([
+          "//tensorflow/core:core_cpu",
+          "//tensorflow/core:framework",
+          "//tensorflow/core:lib",
+          "//tensorflow/core:protos_all_cc",
+      ]) + if_android([
+          "//tensorflow/core:android_tensorflow_lib",
+      ]),
+      copts=tf_copts(),
+      alwayslink=1,
+      visibility=visibility)
+  native.cc_library(
+      name=name + "_internal",
+      srcs=internalsrcs,
+      hdrs=internalhdrs,
+      deps=deps + if_not_android([
+          "//tensorflow/core:core_cpu",
+          "//tensorflow/core:framework",
+          "//tensorflow/core:lib",
+          "//tensorflow/core:protos_all_cc",
+      ]) + if_android([
+          "//tensorflow/core:android_tensorflow_lib",
+      ]),
+      copts=tf_copts(),
+      alwayslink=1,
+      visibility=["//tensorflow:internal"])
+
 
 # Invoke this rule in .../tensorflow/python to build the wrapper library.
-def tf_gen_op_wrapper_py(name, out=None, hidden=None, visibility=None, deps=[],
-                         require_shape_functions=False, hidden_file=None,
+def tf_gen_op_wrapper_py(name,
+                         out=None,
+                         hidden=None,
+                         visibility=None,
+                         deps=[],
+                         require_shape_functions=False,
+                         hidden_file=None,
                          generated_target_name=None):
   # Construct a cc_binary containing the specified ops.
   tool_name = "gen_" + name + "_py_wrappers_cc"
   if not deps:
     deps = [str(Label("//tensorflow/core:" + name + "_op_lib"))]
   native.cc_binary(
-      name = tool_name,
-      linkopts = ["-lm"],
-      copts = tf_copts(),
-      linkstatic = 1,   # Faster to link this one-time-use binary dynamically
-      deps = ([str(Label("//tensorflow/core:framework")),
-               str(Label("//tensorflow/python:python_op_gen_main"))] + deps),
-      visibility = [str(Label("//tensorflow:internal"))],
-  )
+      name=tool_name,
+      linkopts=["-lm"],
+      copts=tf_copts(),
+      linkstatic=1,  # Faster to link this one-time-use binary dynamically
+      deps=([
+          "//tensorflow/core:framework",
+          "//tensorflow/python:python_op_gen_main"
+      ] + deps),
+      visibility=["//tensorflow:internal"],)
 
   # Invoke the previous cc_binary to generate a python file.
   if not out:
@@ -299,8 +333,8 @@ def tf_gen_op_wrapper_py(name, out=None, hidden=None, visibility=None, deps=[],
         name=name + "_pygenrule",
         outs=[out],
         tools=[tool_name],
-        cmd=("$(location " + tool_name + ") " + ",".join(hidden)
-             + " " + ("1" if require_shape_functions else "0") + " > $@"))
+        cmd=("$(location " + tool_name + ") " + ",".join(hidden) + " " +
+             ("1" if require_shape_functions else "0") + " > $@"))
   elif hidden_file:
     # `hidden_file` is file containing a list of op names to be hidden in the
     # generated module.
@@ -309,77 +343,120 @@ def tf_gen_op_wrapper_py(name, out=None, hidden=None, visibility=None, deps=[],
         outs=[out],
         srcs=[hidden_file],
         tools=[tool_name],
-        cmd=("$(location " + tool_name + ") @$(location "
-             + hidden_file + ") " + ("1" if require_shape_functions else "0")
-             + " > $@"))
+        cmd=("$(location " + tool_name + ") @$(location " + hidden_file + ") " +
+             ("1" if require_shape_functions else "0") + " > $@"))
   else:
     # No ops should be hidden in the generated module.
     native.genrule(
         name=name + "_pygenrule",
         outs=[out],
         tools=[tool_name],
-        cmd=("$(location " + tool_name + ") "
-             + ("1" if require_shape_functions else "0") + " > $@"))
+        cmd=("$(location " + tool_name + ") " +
+             ("1" if require_shape_functions else "0") + " > $@"))
 
   # Make a py_library out of the generated python file.
   if not generated_target_name:
     generated_target_name = name
-  native.py_library(name=generated_target_name,
-                    srcs=[out],
-                    srcs_version="PY2AND3",
-                    visibility=visibility,
-                    deps=[
-                        str(Label("//tensorflow/python:framework_for_generated_wrappers_v2")),
-                    ],)
+  native.py_library(
+      name=generated_target_name,
+      srcs=[out],
+      srcs_version="PY2AND3",
+      visibility=visibility,
+      deps=[
+          "//tensorflow/python:framework_for_generated_wrappers_v2",
+      ],)
+
 
 # Define a bazel macro that creates cc_test for tensorflow.
 # TODO(opensource): we need to enable this to work around the hidden symbol
 # __cudaRegisterFatBinary error. Need more investigations.
-def tf_cc_test(name, srcs, deps, linkstatic=0, tags=[], data=[], size="medium",
-               suffix="", args=None, linkopts=[]):
-  native.cc_test(name="%s%s" % (name, suffix),
-                 srcs=srcs,
-                 size=size,
-                 args=args,
-                 copts=tf_copts(),
-                 data=data,
-                 deps=deps,
-                 linkopts=["-lpthread", "-lm"] + linkopts,
-                 linkstatic=linkstatic,
-                 tags=tags)
+def tf_cc_test(name,
+               srcs,
+               deps,
+               linkstatic=0,
+               tags=[],
+               data=[],
+               size="medium",
+               suffix="",
+               args=None,
+               linkopts=[]):
+  native.cc_test(
+      name="%s%s" % (name, suffix),
+      srcs=srcs,
+      size=size,
+      args=args,
+      copts=tf_copts(),
+      data=data,
+      deps=deps,
+      linkopts=["-lpthread", "-lm"] + linkopts,
+      linkstatic=linkstatic,
+      tags=tags)
+
 
 # Part of the testing workflow requires a distinguishable name for the build
 # rules that involve a GPU, even if otherwise identical to the base rule.
-def tf_cc_test_gpu(name, srcs, deps, linkstatic=0, tags=[], data=[],
-                   size="medium", suffix="", args=None):
-  tf_cc_test(name, srcs, deps, linkstatic=linkstatic, tags=tags, data=data,
-             size=size, suffix=suffix, args=args)
-
-def tf_cuda_cc_test(name, srcs=[], deps=[], tags=[], data=[], size="medium",
-                    linkstatic=0, args=[], linkopts=[]):
-  tf_cc_test(name=name,
-             srcs=srcs,
-             deps=deps,
-             tags=tags + ["manual"],
-             data=data,
-             size=size,
-             linkstatic=linkstatic,
-             linkopts=linkopts,
-             args=args)
-  tf_cc_test(name=name,
-             srcs=srcs,
-             suffix="_gpu",
-             deps=deps + if_cuda([str(Label("//tensorflow/core:gpu_runtime"))]),
-             linkstatic=if_cuda(1, 0),
-             tags=tags + tf_cuda_tests_tags(),
-             data=data,
-             size=size,
-             linkopts=linkopts,
-             args=args)
+def tf_cc_test_gpu(name,
+                   srcs,
+                   deps,
+                   linkstatic=0,
+                   tags=[],
+                   data=[],
+                   size="medium",
+                   suffix="",
+                   args=None):
+  tf_cc_test(
+      name,
+      srcs,
+      deps,
+      linkstatic=linkstatic,
+      tags=tags,
+      data=data,
+      size=size,
+      suffix=suffix,
+      args=args)
+
+
+def tf_cuda_cc_test(name,
+                    srcs=[],
+                    deps=[],
+                    tags=[],
+                    data=[],
+                    size="medium",
+                    linkstatic=0,
+                    args=[],
+                    linkopts=[]):
+  tf_cc_test(
+      name=name,
+      srcs=srcs,
+      deps=deps,
+      tags=tags + ["manual"],
+      data=data,
+      size=size,
+      linkstatic=linkstatic,
+      linkopts=linkopts,
+      args=args)
+  tf_cc_test(
+      name=name,
+      srcs=srcs,
+      suffix="_gpu",
+      deps=deps + if_cuda(["//tensorflow/core:gpu_runtime"]),
+      linkstatic=if_cuda(1, 0),
+      tags=tags + tf_cuda_tests_tags(),
+      data=data,
+      size=size,
+      linkopts=linkopts,
+      args=args)
+
 
 # Create a cc_test for each of the tensorflow tests listed in "tests"
-def tf_cc_tests(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
-                args=None, linkopts=[]):
+def tf_cc_tests(srcs,
+                deps,
+                name="",
+                linkstatic=0,
+                tags=[],
+                size="medium",
+                args=None,
+                linkopts=[]):
   for src in srcs:
     tf_cc_test(
         name=src_to_test_name(src),
@@ -391,17 +468,35 @@ def tf_cc_tests(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
         args=args,
         linkopts=linkopts)
 
-def tf_cc_test_mkl(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
-                    args=None):
+
+def tf_cc_test_mkl(srcs,
+                   deps,
+                   name="",
+                   linkstatic=0,
+                   tags=[],
+                   size="medium",
+                   args=None):
   if_mkl(tf_cc_tests(srcs, deps, linkstatic, tags=tags, size=size, args=args))
 
-def tf_cc_tests_gpu(srcs, deps, name='', linkstatic=0, tags=[], size="medium",
+
+def tf_cc_tests_gpu(srcs,
+                    deps,
+                    name="",
+                    linkstatic=0,
+                    tags=[],
+                    size="medium",
                     args=None):
   tf_cc_tests(srcs, deps, linkstatic, tags=tags, size=size, args=args)
 
 
-def tf_cuda_cc_tests(srcs, deps, name='', tags=[], size="medium", linkstatic=0,
-                     args=None, linkopts=[]):
+def tf_cuda_cc_tests(srcs,
+                     deps,
+                     name="",
+                     tags=[],
+                     size="medium",
+                     linkstatic=0,
+                     args=None,
+                     linkopts=[]):
   for src in srcs:
     tf_cuda_cc_test(
         name=src_to_test_name(src),
@@ -413,48 +508,52 @@ def tf_cuda_cc_tests(srcs, deps, name='', tags=[], size="medium", linkstatic=0,
         args=args,
         linkopts=linkopts)
 
+
 def _cuda_copts():
-    """Gets the appropriate set of copts for (maybe) CUDA compilation.
+  """Gets the appropriate set of copts for (maybe) CUDA compilation.
 
     If we're doing CUDA compilation, returns copts for our particular CUDA
     compiler.  If we're not doing CUDA compilation, returns an empty list.
 
     """
-    return cuda_default_copts() + select({
-        "//conditions:default": [],
-        "@local_config_cuda//cuda:using_nvcc": (
-            [
-                "-nvcc_options=relaxed-constexpr",
-                "-nvcc_options=ftz=true",
-            ]
-        ),
-        "@local_config_cuda//cuda:using_clang": (
-            [
-                "-fcuda-flush-denormals-to-zero",
-            ]
-        ),
-    })
+  return cuda_default_copts() + select({
+      "//conditions:default": [],
+      "@local_config_cuda//cuda:using_nvcc": ([
+          "-nvcc_options=relaxed-constexpr",
+          "-nvcc_options=ftz=true",
+      ]),
+      "@local_config_cuda//cuda:using_clang": ([
+          "-fcuda-flush-denormals-to-zero",
+      ]),
+  })
+
 
 # Build defs for TensorFlow kernels
 
+
 # When this target is built using --config=cuda, a cc_library is built
 # that passes -DGOOGLE_CUDA=1 and '-x cuda', linking in additional
 # libraries needed by GPU kernels.
-def tf_gpu_kernel_library(srcs, copts=[], cuda_copts=[], deps=[], hdrs=[],
+def tf_gpu_kernel_library(srcs,
+                          copts=[],
+                          cuda_copts=[],
+                          deps=[],
+                          hdrs=[],
                           **kwargs):
   copts = copts + _cuda_copts() + if_cuda(cuda_copts) + tf_copts()
 
   native.cc_library(
-      srcs = srcs,
-      hdrs = hdrs,
-      copts = copts,
-      deps = deps + if_cuda([
-          str(Label("//tensorflow/core:cuda")),
-          str(Label("//tensorflow/core:gpu_lib")),
+      srcs=srcs,
+      hdrs=hdrs,
+      copts=copts,
+      deps=deps + if_cuda([
+          "//tensorflow/core:cuda",
+          "//tensorflow/core:gpu_lib",
       ]),
       alwayslink=1,
       **kwargs)
 
+
 def tf_cuda_library(deps=None, cuda_deps=None, copts=None, **kwargs):
   """Generate a cc_library with a conditional set of CUDA dependencies.
 
@@ -479,15 +578,23 @@ def tf_cuda_library(deps=None, cuda_deps=None, copts=None, **kwargs):
     copts = []
 
   native.cc_library(
-      deps = deps + if_cuda(cuda_deps + [
-          str(Label("//tensorflow/core:cuda")),
+      deps=deps + if_cuda(cuda_deps + [
+          "//tensorflow/core:cuda",
           "@local_config_cuda//cuda:cuda_headers"
       ]),
-      copts = copts + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]),
+      copts=copts + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]),
       **kwargs)
 
-def tf_kernel_library(name, prefix=None, srcs=None, gpu_srcs=None, hdrs=None,
-                      deps=None, alwayslink=1, copts=tf_copts(), **kwargs):
+
+def tf_kernel_library(name,
+                      prefix=None,
+                      srcs=None,
+                      gpu_srcs=None,
+                      hdrs=None,
+                      deps=None,
+                      alwayslink=1,
+                      copts=tf_copts(),
+                      **kwargs):
   """A rule to build a TensorFlow OpKernel.
 
   May either specify srcs/hdrs or prefix.  Similar to tf_cuda_library,
@@ -517,43 +624,58 @@ def tf_kernel_library(name, prefix=None, srcs=None, gpu_srcs=None, hdrs=None,
     deps = []
 
   if prefix:
-    if native.glob([prefix + "*.cu.cc"], exclude = ["*test*"]):
+    if native.glob([prefix + "*.cu.cc"], exclude=["*test*"]):
       if not gpu_srcs:
         gpu_srcs = []
-      gpu_srcs = gpu_srcs + native.glob([prefix + "*.cu.cc", prefix + "*.h"],
-                                        exclude = [prefix + "*test*"])
-    srcs = srcs + native.glob([prefix + "*.cc"],
-                              exclude = [prefix + "*test*", prefix + "*.cu.cc"])
-    hdrs = hdrs + native.glob([prefix + "*.h"], exclude = [prefix + "*test*",
-                                                           prefix + "*.cu.h"])
+      gpu_srcs = gpu_srcs + native.glob(
+          [prefix + "*.cu.cc", prefix + "*.h"], exclude=[prefix + "*test*"])
+    srcs = srcs + native.glob(
+        [prefix + "*.cc"], exclude=[prefix + "*test*", prefix + "*.cu.cc"])
+    hdrs = hdrs + native.glob(
+        [prefix + "*.h"], exclude=[prefix + "*test*", prefix + "*.cu.h"])
 
   cuda_deps = [str(Label("//tensorflow/core:gpu_lib"))]
   if gpu_srcs:
     for gpu_src in gpu_srcs:
       if gpu_src.endswith(".cc") and not gpu_src.endswith(".cu.cc"):
-        fail("{} not allowed in gpu_srcs. .cc sources must end with .cu.cc".format(gpu_src))
+        fail("{} not allowed in gpu_srcs. .cc sources must end with .cu.cc".
+             format(gpu_src))
     tf_gpu_kernel_library(
-        name = name + "_gpu",
-        srcs = gpu_srcs,
-        deps = deps,
-        **kwargs)
+        name=name + "_gpu", srcs=gpu_srcs, deps=deps, **kwargs)
     cuda_deps.extend([":" + name + "_gpu"])
   tf_cuda_library(
-      name = name,
-      srcs = srcs,
-      hdrs = hdrs,
-      copts = copts,
-      cuda_deps = cuda_deps,
-      linkstatic = 1,   # Needed since alwayslink is broken in bazel b/27630669
-      alwayslink = alwayslink,
-      deps = deps,
+      name=name,
+      srcs=srcs,
+      hdrs=hdrs,
+      copts=copts,
+      cuda_deps=cuda_deps,
+      linkstatic=1,  # Needed since alwayslink is broken in bazel b/27630669
+      alwayslink=alwayslink,
+      deps=deps,
       **kwargs)
 
-def tf_mkl_kernel_library(name, prefix=None, srcs=None, gpu_srcs=None, hdrs=None,
-                      deps=None, alwayslink=1, copts=tf_copts(), **kwargs):
-  if_mkl(tf_kernel_library(name, prefix=prefix, srcs=srcs, gpu_srcs=gpu_srcs, 
-                                 hdrs=hdrs, deps=deps, alwayslink=alwayslink, 
-                                 copts=copts, **kwargs))
+
+def tf_mkl_kernel_library(name,
+                          prefix=None,
+                          srcs=None,
+                          gpu_srcs=None,
+                          hdrs=None,
+                          deps=None,
+                          alwayslink=1,
+                          copts=tf_copts(),
+                          **kwargs):
+  if_mkl(
+      tf_kernel_library(
+          name,
+          prefix=prefix,
+          srcs=srcs,
+          gpu_srcs=gpu_srcs,
+          hdrs=hdrs,
+          deps=deps,
+          alwayslink=alwayslink,
+          copts=copts,
+          **kwargs))
+
 
 # Bazel rules for building swig files.
 def _py_wrap_cc_impl(ctx):
@@ -570,59 +692,61 @@ def _py_wrap_cc_impl(ctx):
   inputs += ctx.files.toolchain_deps
   swig_include_dirs = set(_get_repository_roots(ctx, inputs))
   swig_include_dirs += sorted([f.dirname for f in ctx.files._swiglib])
-  args = ["-c++",
-          "-python",
-          "-module", module_name,
-          "-o", ctx.outputs.cc_out.path,
-          "-outdir", ctx.outputs.py_out.dirname]
+  args = [
+      "-c++", "-python", "-module", module_name, "-o", ctx.outputs.cc_out.path,
+      "-outdir", ctx.outputs.py_out.dirname
+  ]
   args += ["-l" + f.path for f in ctx.files.swig_includes]
   args += ["-I" + i for i in swig_include_dirs]
   args += [src.path]
-  outputs = [ctx.outputs.cc_out,
-             ctx.outputs.py_out]
-  ctx.action(executable=ctx.executable._swig,
-             arguments=args,
-             inputs=list(inputs),
-             outputs=outputs,
-             mnemonic="PythonSwig",
-             progress_message="SWIGing " + src.path)
+  outputs = [ctx.outputs.cc_out, ctx.outputs.py_out]
+  ctx.action(
+      executable=ctx.executable._swig,
+      arguments=args,
+      inputs=list(inputs),
+      outputs=outputs,
+      mnemonic="PythonSwig",
+      progress_message="SWIGing " + src.path)
   return struct(files=set(outputs))
 
+
 _py_wrap_cc = rule(
-    attrs = {
-        "srcs": attr.label_list(
-            mandatory = True,
-            allow_files = True,
-        ),
-        "swig_includes": attr.label_list(
-            cfg = "data",
-            allow_files = True,
-        ),
-        "deps": attr.label_list(
-            allow_files = True,
-            providers = ["cc"],
-        ),
-        "toolchain_deps": attr.label_list(
-            allow_files = True,
-        ),
-        "module_name": attr.string(mandatory = True),
-        "py_module_name": attr.string(mandatory = True),
-        "_swig": attr.label(
-            default = Label("@swig//:swig"),
-            executable = True,
-            cfg = "host",
-        ),
-        "_swiglib": attr.label(
-            default = Label("@swig//:templates"),
-            allow_files = True,
-        ),
+    attrs={
+        "srcs":
+            attr.label_list(
+                mandatory=True,
+                allow_files=True,),
+        "swig_includes":
+            attr.label_list(
+                cfg="data",
+                allow_files=True,),
+        "deps":
+            attr.label_list(
+                allow_files=True,
+                providers=["cc"],),
+        "toolchain_deps":
+            attr.label_list(
+                allow_files=True,),
+        "module_name":
+            attr.string(mandatory=True),
+        "py_module_name":
+            attr.string(mandatory=True),
+        "_swig":
+            attr.label(
+                default=Label("@swig//:swig"),
+                executable=True,
+                cfg="host",),
+        "_swiglib":
+            attr.label(
+                default=Label("@swig//:templates"),
+                allow_files=True,),
     },
-    outputs = {
+    outputs={
         "cc_out": "%{module_name}.cc",
         "py_out": "%{py_module_name}.py",
     },
-    implementation = _py_wrap_cc_impl,
-)
+    implementation=_py_wrap_cc_impl,)
+
 
 def _get_repository_roots(ctx, files):
   """Returns abnormal root directories under which files reside.
@@ -653,6 +777,7 @@ def _get_repository_roots(ctx, files):
       result[root] -= 1
   return [k for v, k in sorted([(v, k) for k, v in result.items()])]
 
+
 # Bazel rule for collecting the header files that a target depends on.
 def _transitive_hdrs_impl(ctx):
   outputs = set()
@@ -660,30 +785,27 @@ def _transitive_hdrs_impl(ctx):
     outputs += dep.cc.transitive_headers
   return struct(files=outputs)
 
+
 _transitive_hdrs = rule(
-    attrs = {
+    attrs={
         "deps": attr.label_list(
-            allow_files = True,
-            providers = ["cc"],
-        ),
+            allow_files=True,
+            providers=["cc"],),
     },
-    implementation = _transitive_hdrs_impl,
-)
+    implementation=_transitive_hdrs_impl,)
+
 
 def transitive_hdrs(name, deps=[], **kwargs):
-  _transitive_hdrs(name=name + "_gather",
-                   deps=deps)
-  native.filegroup(name=name,
-                   srcs=[":" + name + "_gather"])
+  _transitive_hdrs(name=name + "_gather", deps=deps)
+  native.filegroup(name=name, srcs=[":" + name + "_gather"])
+
 
 # Create a header only library that includes all the headers exported by
 # the libraries in deps.
 def cc_header_only_library(name, deps=[], **kwargs):
-  _transitive_hdrs(name=name + "_gather",
-                   deps=deps)
-  native.cc_library(name=name,
-                    hdrs=[":" + name + "_gather"],
-                    **kwargs)
+  _transitive_hdrs(name=name + "_gather", deps=deps)
+  native.cc_library(name=name, hdrs=[":" + name + "_gather"], **kwargs)
+
 
 def tf_custom_op_library_additional_deps():
   return [
@@ -692,6 +814,7 @@ def tf_custom_op_library_additional_deps():
       str(Label("//tensorflow/core:framework_headers_lib")),
   ]
 
+
 # Traverse the dependency graph along the "deps" attribute of the
 # target and return a struct with one field called 'tf_collected_deps'.
 # tf_collected_deps will be the union of the deps of the current target
@@ -705,14 +828,16 @@ def _collect_deps_aspect_impl(target, ctx):
         alldeps = alldeps | dep.tf_collected_deps
   return struct(tf_collected_deps=alldeps)
 
+
 collect_deps_aspect = aspect(
-    implementation=_collect_deps_aspect_impl,
-    attr_aspects=["deps"])
+    implementation=_collect_deps_aspect_impl, attr_aspects=["deps"])
+
 
 def _dep_label(dep):
   label = dep.label
   return label.package + ":" + label.name
 
+
 # This rule checks that the transitive dependencies of targets listed
 # in the 'deps' attribute don't depend on the targets listed in
 # the 'disallowed_deps' attribute.
@@ -724,23 +849,23 @@ def _check_deps_impl(ctx):
     for dep in input_dep.tf_collected_deps:
       for disallowed_dep in disallowed_deps:
         if dep == disallowed_dep.label:
-          fail(_dep_label(input_dep) + " cannot depend on " +
-               _dep_label(disallowed_dep))
+          fail(
+              _dep_label(input_dep) + " cannot depend on " + _dep_label(
+                  disallowed_dep))
   return struct()
 
+
 check_deps = rule(
     _check_deps_impl,
-    attrs = {
-        "deps": attr.label_list(
-            aspects=[collect_deps_aspect],
-            mandatory = True,
-            allow_files = True
-        ),
-        "disallowed_deps": attr.label_list(
-            mandatory = True,
-            allow_files = True
-        )},
-)
+    attrs={
+        "deps":
+            attr.label_list(
+                aspects=[collect_deps_aspect], mandatory=True,
+                allow_files=True),
+        "disallowed_deps":
+            attr.label_list(mandatory=True, allow_files=True)
+    },)
+
 
 # Helper to build a dynamic library (.so) from the sources containing
 # implementations of custom ops and kernels.
@@ -753,33 +878,42 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
   if gpu_srcs:
     basename = name.split(".")[0]
     native.cc_library(
-        name = basename + "_gpu",
-        srcs = gpu_srcs,
-        copts = _cuda_copts(),
-        deps = deps + if_cuda(cuda_deps))
+        name=basename + "_gpu",
+        srcs=gpu_srcs,
+        copts=_cuda_copts(),
+        deps=deps + if_cuda(cuda_deps))
     cuda_deps.extend([":" + basename + "_gpu"])
 
-  check_deps(name=name+"_check_deps",
-             deps=deps + if_cuda(cuda_deps),
-             disallowed_deps=[str(Label("//tensorflow/core:framework")),
-                              str(Label("//tensorflow/core:lib"))])
-
-  native.cc_binary(name=name,
-                   srcs=srcs,
-                   deps=deps + if_cuda(cuda_deps),
-                   data=[name + "_check_deps"],
-                   copts=tf_copts(),
-                   linkshared=1,
-                   linkopts = select({
-                       "//conditions:default": [
-                           "-lm",
-                       ],
-                       str(Label("//tensorflow:darwin")): [],
-                   }),
-  )
-
-def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
-                            srcs_version="PY2AND3", visibility=None, deps=[]):
+  check_deps(
+      name=name + "_check_deps",
+      deps=deps + if_cuda(cuda_deps),
+      disallowed_deps=[
+          "//tensorflow/core:framework",
+          "//tensorflow/core:lib"
+      ])
+
+  native.cc_binary(
+      name=name,
+      srcs=srcs,
+      deps=deps + if_cuda(cuda_deps),
+      data=[name + "_check_deps"],
+      copts=tf_copts(),
+      linkshared=1,
+      linkopts=select({
+          "//conditions:default": [
+              "-lm",
+          ],
+          "//tensorflow:darwin": [],
+      }),)
+
+
+def tf_custom_op_py_library(name,
+                            srcs=[],
+                            dso=[],
+                            kernels=[],
+                            srcs_version="PY2AND3",
+                            visibility=None,
+                            deps=[]):
   kernels = kernels  # unused argument
   native.py_library(
       name=name,
@@ -787,86 +921,103 @@ def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
       srcs=srcs,
       srcs_version=srcs_version,
       visibility=visibility,
-      deps=deps,
-  )
+      deps=deps,)
+
 
 def tf_extension_linkopts():
   return []  # No extension link opts
 
+
 def tf_extension_copts():
   return []  # No extension c opts
 
-def tf_py_wrap_cc(name, srcs, swig_includes=[], deps=[], copts=[], **kwargs):
+
+def tf_py_wrap_cc(name,
+                             srcs,
+                             swig_includes=[],
+                             deps=[],
+                             copts=[],
+                             **kwargs):
   module_name = name.split("/")[-1]
   # Convert a rule name such as foo/bar/baz to foo/bar/_baz.so
   # and use that as the name for the rule producing the .so file.
   cc_library_name = "/".join(name.split("/")[:-1] + ["_" + module_name + ".so"])
-  cc_library_pyd_name = "/".join(name.split("/")[:-1] + ["_" + module_name + ".pyd"])
+  cc_library_pyd_name = "/".join(
+      name.split("/")[:-1] + ["_" + module_name + ".pyd"])
   extra_deps = []
-  _py_wrap_cc(name=name + "_py_wrap",
-              srcs=srcs,
-              swig_includes=swig_includes,
-              deps=deps + extra_deps,
-              toolchain_deps=["//tools/defaults:crosstool"],
-              module_name=module_name,
-              py_module_name=name)
+  _py_wrap_cc(
+      name=name + "_py_wrap",
+      srcs=srcs,
+      swig_includes=swig_includes,
+      deps=deps + extra_deps,
+      toolchain_deps=["//tools/defaults:crosstool"],
+      module_name=module_name,
+      py_module_name=name)
   extra_linkopts = select({
       "@local_config_cuda//cuda:darwin": [
           "-Wl,-exported_symbols_list",
           str(Label("//tensorflow:tf_exported_symbols.lds"))
       ],
-      str(Label("//tensorflow:windows")): [
-      ],
+      str(Label("//tensorflow:windows")): [],
       "//conditions:default": [
           "-Wl,--version-script",
-          str(Label("//tensorflow:tf_version_script.lds"))
-      ]})
+          "//tensorflow:tf_version_script.lds"
+      ]
+  })
   extra_deps += select({
       "@local_config_cuda//cuda:darwin": [
-        str(Label("//tensorflow:tf_exported_symbols.lds"))
-      ],
-      str(Label("//tensorflow:windows")): [
+          "//tensorflow:tf_exported_symbols.lds"
       ],
+      "//tensorflow:windows": [],
       "//conditions:default": [
-        str(Label("//tensorflow:tf_version_script.lds"))
+          "//tensorflow:tf_version_script.lds"
       ]
   })
 
   native.cc_binary(
       name=cc_library_name,
       srcs=[module_name + ".cc"],
-      copts=(copts + ["-Wno-self-assign",
-                      "-Wno-sign-compare",
-                      "-Wno-write-strings"]
-             + tf_extension_copts()),
+      copts=(copts + [
+          "-Wno-self-assign", "-Wno-sign-compare", "-Wno-write-strings"
+      ] + tf_extension_copts()),
       linkopts=tf_extension_linkopts() + extra_linkopts,
       linkstatic=1,
       linkshared=1,
       deps=deps + extra_deps)
   native.genrule(
-      name = "gen_" + cc_library_pyd_name,
-      srcs = [":" + cc_library_name],
-      outs = [cc_library_pyd_name],
-      cmd = "cp $< $@",
-  )
-  native.py_library(name=name,
-                    srcs=[":" + name + ".py"],
-                    srcs_version="PY2AND3",
-                    data=select({
-                      str(Label("//tensorflow:windows")): [":" + cc_library_pyd_name],
-                      "//conditions:default": [":" + cc_library_name],
-                    }))
+      name="gen_" + cc_library_pyd_name,
+      srcs=[":" + cc_library_name],
+      outs=[cc_library_pyd_name],
+      cmd="cp $< $@",)
+  native.py_library(
+      name=name,
+      srcs=[":" + name + ".py"],
+      srcs_version="PY2AND3",
+      data=select({
+          "//tensorflow:windows": [":" + cc_library_pyd_name],
+          "//conditions:default": [":" + cc_library_name],
+      }))
+
 
 def py_test(deps=[], **kwargs):
   native.py_test(
       deps=select({
-          "//conditions:default" : deps,
-          str(Label("//tensorflow:no_tensorflow_py_deps")) : []
+          "//conditions:default": deps,
+          "//tensorflow:no_tensorflow_py_deps": []
       }),
       **kwargs)
 
-def tf_py_test(name, srcs, size="medium", data=[], main=None, args=[],
-               tags=[], shard_count=1, additional_deps=[], flaky=0,
+
+def tf_py_test(name,
+               srcs,
+               size="medium",
+               data=[],
+               main=None,
+               args=[],
+               tags=[],
+               shard_count=1,
+               additional_deps=[],
+               flaky=0,
                xla_enabled=False):
   if xla_enabled:
     additional_deps += tf_additional_xla_deps_py()
@@ -881,46 +1032,67 @@ def tf_py_test(name, srcs, size="medium", data=[], main=None, args=[],
       shard_count=shard_count,
       data=data,
       deps=select({
-          "//conditions:default" : [
-            str(Label("//tensorflow/python:extra_py_tests_deps")),
-            str(Label("//tensorflow/python:gradient_checker")),
+          "//conditions:default": [
+              "//tensorflow/python:extra_py_tests_deps",
+              "//tensorflow/python:gradient_checker",
           ] + additional_deps,
-          str(Label("//tensorflow:no_tensorflow_py_deps")) : []
+          "//tensorflow:no_tensorflow_py_deps": []
       }),
       flaky=flaky,
       srcs_version="PY2AND3")
 
-def cuda_py_test(name, srcs, size="medium", data=[], main=None, args=[],
-                 shard_count=1, additional_deps=[], tags=[], flaky=0,
+
+def cuda_py_test(name,
+                 srcs,
+                 size="medium",
+                 data=[],
+                 main=None,
+                 args=[],
+                 shard_count=1,
+                 additional_deps=[],
+                 tags=[],
+                 flaky=0,
                  xla_enabled=False):
   test_tags = tags + tf_cuda_tests_tags()
-  tf_py_test(name=name,
-             size=size,
-             srcs=srcs,
-             data=data,
-             main=main,
-             args=args,
-             tags=test_tags,
-             shard_count=shard_count,
-             additional_deps=additional_deps,
-             flaky=flaky,
-             xla_enabled=xla_enabled)
-
-def sycl_py_test(name, srcs, size="medium", data=[], main=None, args=[],
-                 shard_count=1, additional_deps=[], tags=[], flaky=0,
+  tf_py_test(
+      name=name,
+      size=size,
+      srcs=srcs,
+      data=data,
+      main=main,
+      args=args,
+      tags=test_tags,
+      shard_count=shard_count,
+      additional_deps=additional_deps,
+      flaky=flaky,
+      xla_enabled=xla_enabled)
+
+
+def sycl_py_test(name,
+                 srcs,
+                 size="medium",
+                 data=[],
+                 main=None,
+                 args=[],
+                 shard_count=1,
+                 additional_deps=[],
+                 tags=[],
+                 flaky=0,
                  xla_enabled=False):
- test_tags = tags + tf_sycl_tests_tags()
- tf_py_test(name=name,
-            size=size,
-            srcs=srcs,
-            data=data,
-            main=main,
-            args=args,
-            tags=test_tags,
-            shard_count=shard_count,
-            additional_deps=additional_deps,
-            flaky=flaky,
-            xla_enabled=xla_enabled)
+  test_tags = tags + tf_sycl_tests_tags()
+  tf_py_test(
+      name=name,
+      size=size,
+      srcs=srcs,
+      data=data,
+      main=main,
+      args=args,
+      tags=test_tags,
+      shard_count=shard_count,
+      additional_deps=additional_deps,
+      flaky=flaky,
+      xla_enabled=xla_enabled)
+
 
 def py_tests(name,
              srcs,
@@ -935,22 +1107,39 @@ def py_tests(name,
     test_name = src.split("/")[-1].split(".")[0]
     if prefix:
       test_name = "%s_%s" % (prefix, test_name)
-    tf_py_test(name=test_name,
-               size=size,
-               srcs=[src],
-               main=src,
-               tags=tags,
-               shard_count=shard_count,
-               data=data,
-               additional_deps=additional_deps,
-               xla_enabled=xla_enabled)
-
-def cuda_py_tests(name, srcs, size="medium", additional_deps=[], data=[],
-                  shard_count=1, tags=[], prefix="", xla_enabled=False):
+    tf_py_test(
+        name=test_name,
+        size=size,
+        srcs=[src],
+        main=src,
+        tags=tags,
+        shard_count=shard_count,
+        data=data,
+        additional_deps=additional_deps,
+        xla_enabled=xla_enabled)
+
+
+def cuda_py_tests(name,
+                  srcs,
+                  size="medium",
+                  additional_deps=[],
+                  data=[],
+                  shard_count=1,
+                  tags=[],
+                  prefix="",
+                  xla_enabled=False):
   test_tags = tags + tf_cuda_tests_tags()
-  py_tests(name=name, size=size, srcs=srcs, additional_deps=additional_deps,
-           data=data, tags=test_tags, shard_count=shard_count,prefix=prefix,
-           xla_enabled=xla_enabled)
+  py_tests(
+      name=name,
+      size=size,
+      srcs=srcs,
+      additional_deps=additional_deps,
+      data=data,
+      tags=test_tags,
+      shard_count=shard_count,
+      prefix=prefix,
+      xla_enabled=xla_enabled)
+
 
 # Creates a genrule named <name> for running tools/proto_text's generator to
 # make the proto_text functions, for the protos passed in <srcs>.
@@ -958,40 +1147,46 @@ def cuda_py_tests(name, srcs, size="medium", additional_deps=[], data=[],
 # Return a struct with fields (hdrs, srcs) containing the names of the
 # generated files.
 def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs):
-  out_hdrs = ([p.replace(".proto", ".pb_text.h") for p in srcs] +
-              [p.replace(".proto", ".pb_text-impl.h") for p in srcs])
+  out_hdrs = (
+      [p.replace(".proto", ".pb_text.h")
+       for p in srcs] + [p.replace(".proto", ".pb_text-impl.h") for p in srcs])
   out_srcs = [p.replace(".proto", ".pb_text.cc") for p in srcs]
   native.genrule(
-        name = name,
-        srcs = srcs + [str(Label("//tensorflow/tools/proto_text:placeholder.txt"))],
-        outs = out_hdrs + out_srcs,
-        cmd = "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) " +
-              "$(@D) " + srcs_relative_dir + " $(SRCS)",
-        tools = [str(Label("//tensorflow/tools/proto_text:gen_proto_text_functions"))],
-    )
+      name=name,
+      srcs=srcs + ["//tensorflow/tools/proto_text:placeholder.txt"],
+      outs=out_hdrs + out_srcs,
+      cmd=
+      "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) "
+      + "$(@D) " + srcs_relative_dir + " $(SRCS)",
+      tools=[
+          "//tensorflow/tools/proto_text:gen_proto_text_functions"
+      ],)
   return struct(hdrs=out_hdrs, srcs=out_srcs)
 
+
 def tf_genrule_cmd_append_to_srcs(to_append):
-    return ("cat $(SRCS) > $(@) && " +
-            "echo >> $(@) && " +
-            "echo " + to_append + " >> $(@)")
+  return ("cat $(SRCS) > $(@) && " + "echo >> $(@) && " + "echo " + to_append +
+          " >> $(@)")
 
 
 def tf_version_info_genrule():
   native.genrule(
-      name = "version_info_gen",
-      srcs = [
-          str(Label("//tensorflow/tools/git:gen/spec.json")),
-          str(Label("//tensorflow/tools/git:gen/head")),
-          str(Label("//tensorflow/tools/git:gen/branch_ref")),
+      name="version_info_gen",
+      srcs=[
+          "//tensorflow/tools/git:gen/spec.json",
+          "//tensorflow/tools/git:gen/head",
+          "//tensorflow/tools/git:gen/branch_ref",
       ],
-      outs = ["util/version_info.cc"],
-      cmd = "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
-      local = 1,
-      tools = [str(Label("//tensorflow/tools/git:gen_git_source.py"))],
-  )
-
-def cc_library_with_android_deps(deps, android_deps=[],
-                                common_deps=[], **kwargs):
+      outs=["util/version_info.cc"],
+      cmd=
+      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      local=1,
+      tools=["//tensorflow/tools/git:gen_git_source.py"],)
+
+
+def cc_library_with_android_deps(deps,
+                                 android_deps=[],
+                                 common_deps=[],
+                                 **kwargs):
   deps = if_not_android(deps) + if_android(android_deps) + common_deps
   native.cc_library(deps=deps, **kwargs)
diff --git a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
index 45747ba2d9..a03cab0cca 100755
--- a/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
+++ b/tensorflow/tools/ci_build/linux/cpu/run_py3_contrib.sh
@@ -33,6 +33,6 @@ yes "" | ./configure
 
 # Run bazel test command. Double test timeouts to avoid flakes.
 bazel test --test_tag_filters=-gpu,-benchmark-test -k \
-    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only \
+    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
     --test_output=errors -- \
     //tensorflow/contrib/...
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 594dde3d7b..f591e50ac9 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -167,15 +167,12 @@ headers = (list(find_files('*.h', 'tensorflow/core')) +
            list(find_files('*', 'third_party/eigen3')) +
            list(find_files('*', 'external/eigen_archive')))
 
-tf_long_description = (
-    'Note: TensorFlow manylinux1 wheels do not conform to the '
-    'specification in PEP531.')
 
 setup(
     name=project_name,
     version=_VERSION.replace('-', ''),
     description='TensorFlow helps the tensors flow',
-    long_description=tf_long_description,
+    long_description='',
     url='http://tensorflow.org/',
     author='Google Inc.',
     author_email='opensource@google.com',
diff --git a/tensorflow/tools/test/check_futures_test.py b/tensorflow/tools/test/check_futures_test.py
index 32d65adb1f..36a61c0ecc 100644
--- a/tensorflow/tools/test/check_futures_test.py
+++ b/tensorflow/tools/test/check_futures_test.py
@@ -40,6 +40,7 @@ FUTURES_PATTERN_2 = re.compile(
 REQUIRED_FUTURES = frozenset(['absolute_import', 'division', 'print_function'])
 
 WHITELIST = [
+    'python/platform/control_imports.py',
     'tools/docker/jupyter_notebook_config.py',
 ]
 
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 4a39723cdc..0a79bdf6e4 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -1,9 +1,11 @@
 # TensorFlow external dependencies that can be loaded in WORKSPACE files.
 
-load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external")
+load("@io_bazel_rules_closure//closure/private:java_import_external.bzl",
+     "java_import_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
 load("//third_party/gpus:cuda_configure.bzl", "cuda_configure")
+
 load("//third_party/sycl:sycl_configure.bzl", "sycl_configure")
 
 
@@ -14,20 +16,23 @@ def _parse_bazel_version(bazel_version):
 
   # Split into (release, date) parts and only return the release
   # as a tuple of integers.
-  parts = version.split('-', 1)
+  parts = version.split("-", 1)
 
   # Turn "release" into a tuple of strings
   version_tuple = ()
-  for number in parts[0].split('.'):
+  for number in parts[0].split("."):
     version_tuple += (str(number),)
   return version_tuple
 
+
 # Check that a specific bazel version is being used.
 def check_version(bazel_version):
   if "bazel_version" not in dir(native):
-    fail("\nCurrent Bazel version is lower than 0.2.1, expected at least %s\n" % bazel_version)
+    fail("\nCurrent Bazel version is lower than 0.2.1, expected at least %s\n" %
+         bazel_version)
   elif not native.bazel_version:
-    print("\nCurrent Bazel is not a release version, cannot check for compatibility.")
+    print("\nCurrent Bazel is not a release version, cannot check for " +
+          "compatibility.")
     print("Make sure that you are running at least Bazel %s.\n" % bazel_version)
   else:
     current_bazel_version = _parse_bazel_version(native.bazel_version)
@@ -37,286 +42,279 @@ def check_version(bazel_version):
           native.bazel_version, bazel_version))
   pass
 
+
 def _repos_are_siblings():
   return Label("@foo//bar").workspace_root.startswith("../")
 
+
 # Temporary workaround to support including TensorFlow as a submodule until this
 # use-case is supported in the next Bazel release.
 def _temp_workaround_http_archive_impl(repo_ctx):
-   repo_ctx.template("BUILD", repo_ctx.attr.build_file,
-                     {
-                         "%prefix%" : ".." if _repos_are_siblings() else "external",
-                         "%ws%": repo_ctx.attr.repository
-                     }, False)
-   repo_ctx.download_and_extract(repo_ctx.attr.urls, "", repo_ctx.attr.sha256,
-                                 "", repo_ctx.attr.strip_prefix)
-   if repo_ctx.attr.patch_file != None:
-     _apply_patch(repo_ctx, repo_ctx.attr.patch_file)
+  repo_ctx.template("BUILD", repo_ctx.attr.build_file, {
+      "%prefix%": ".." if _repos_are_siblings() else "external",
+      "%ws%": repo_ctx.attr.repository
+  }, False)
+  repo_ctx.download_and_extract(repo_ctx.attr.urls, "", repo_ctx.attr.sha256,
+                                "", repo_ctx.attr.strip_prefix)
+  if repo_ctx.attr.patch_file != None:
+    _apply_patch(repo_ctx, repo_ctx.attr.patch_file)
+
 
 temp_workaround_http_archive = repository_rule(
-   implementation=_temp_workaround_http_archive_impl,
-   attrs = {
-      "build_file": attr.label(),
-      "repository": attr.string(),
-      "patch_file": attr.label(default = None),
-      "urls": attr.string_list(default = []),
-      "sha256": attr.string(default = ""),
-      "strip_prefix": attr.string(default = ""),
-   })
+    implementation=_temp_workaround_http_archive_impl,
+    attrs={
+        "build_file": attr.label(),
+        "repository": attr.string(),
+        "patch_file": attr.label(default=None),
+        "urls": attr.string_list(default=[]),
+        "sha256": attr.string(default=""),
+        "strip_prefix": attr.string(default=""),
+    })
+
 
 # Executes specified command with arguments and calls 'fail' if it exited with non-zero code
 def _execute_and_check_ret_code(repo_ctx, cmd_and_args):
   result = repo_ctx.execute(cmd_and_args)
   if result.return_code != 0:
-    fail(("Non-zero return code({1}) when executing '{0}':\n" +
-          "Stdout: {2}\n" +
-          "Stderr: {3}").format(" ".join(cmd_and_args),
-                                result.return_code, result.stdout, result.stderr))
+    fail(("Non-zero return code({1}) when executing '{0}':\n" + "Stdout: {2}\n"
+          + "Stderr: {3}").format(" ".join(cmd_and_args), result.return_code,
+                                  result.stdout, result.stderr))
+
 
 # Apply a patch_file to the repository root directory
 # Runs 'patch -p1'
 def _apply_patch(repo_ctx, patch_file):
-  _execute_and_check_ret_code(repo_ctx, ["patch", "-p1",
-                                         "-d", repo_ctx.path("."),
-                                         "-i", repo_ctx.path(patch_file)])
+  _execute_and_check_ret_code(repo_ctx, [
+      "patch", "-p1", "-d", repo_ctx.path("."), "-i", repo_ctx.path(patch_file)
+  ])
+
 
 # Download the repository and apply a patch to its root
 def _patched_http_archive_impl(repo_ctx):
-  repo_ctx.download_and_extract(repo_ctx.attr.urls,
-                                sha256 = repo_ctx.attr.sha256,
-                                stripPrefix = repo_ctx.attr.strip_prefix)
+  repo_ctx.download_and_extract(
+      repo_ctx.attr.urls,
+      sha256=repo_ctx.attr.sha256,
+      stripPrefix=repo_ctx.attr.strip_prefix)
   _apply_patch(repo_ctx, repo_ctx.attr.patch_file)
 
+
 patched_http_archive = repository_rule(
-    implementation = _patched_http_archive_impl,
-    attrs = {
-      "patch_file": attr.label(),
-      "build_file": attr.label(),
-      "repository": attr.string(),
-      "urls": attr.string_list(default = []),
-      "sha256": attr.string(default = ""),
-      "strip_prefix": attr.string(default = ""),
+    implementation=_patched_http_archive_impl,
+    attrs={
+        "patch_file": attr.label(),
+        "build_file": attr.label(),
+        "repository": attr.string(),
+        "urls": attr.string_list(default=[]),
+        "sha256": attr.string(default=""),
+        "strip_prefix": attr.string(default=""),
     })
 
+
 # If TensorFlow is linked as a submodule.
 # path_prefix and tf_repo_name are no longer used.
-def tf_workspace(path_prefix = "", tf_repo_name = ""):
+def tf_workspace(path_prefix="", tf_repo_name=""):
   # We must check the bazel version before trying to parse any other BUILD
   # files, in case the parsing of those build files depends on the bazel
   # version we require here.
   check_version("0.4.5")
-  cuda_configure(name = "local_config_cuda")
-  sycl_configure(name = "local_config_sycl")
+  cuda_configure(name="local_config_cuda")
+  sycl_configure(name="local_config_sycl")
   if path_prefix:
-    print("path_prefix was specified to tf_workspace but is no longer used and will be removed in the future.")
+    print(
+        "path_prefix was specified to tf_workspace but is no longer used and " +
+        "will be removed in the future."
+    )
   if tf_repo_name:
-    print("tf_repo_name was specified to tf_workspace but is no longer used and will be removed in the future.")
+    print(
+        "tf_repo_name was specified to tf_workspace but is no longer used " +
+        "and will be removed in the future."
+    )
 
   native.new_http_archive(
-      name = "eigen_archive",
-      urls = [
+      name="eigen_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
           "https://bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
       ],
-      sha256 = "a39834683eb5bdb9a7434f0ab3621d2cbc3b07e8002db6de101e45ec536723eb",
-      strip_prefix = "eigen-eigen-deff8b280204",
-      build_file = str(Label("//third_party:eigen.BUILD")),
-  )
+      sha256="a39834683eb5bdb9a7434f0ab3621d2cbc3b07e8002db6de101e45ec536723eb",
+      strip_prefix="eigen-eigen-deff8b280204",
+      build_file=str(Label("//third_party:eigen.BUILD")),)
 
   native.new_http_archive(
-      name = "libxsmm_archive",
-      urls = [
+      name="libxsmm_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/hfp/libxsmm/archive/1.8.tar.gz",
           "https://github.com/hfp/libxsmm/archive/1.8.tar.gz",
       ],
-      sha256 = "0330201afb5525d0950ec861fec9dd75eb40a03845ebe03d2c635cf8bfc14fea",
-      strip_prefix = "libxsmm-1.8",
-      build_file = str(Label("//third_party:libxsmm.BUILD")),
-  )
+      sha256="0330201afb5525d0950ec861fec9dd75eb40a03845ebe03d2c635cf8bfc14fea",
+      strip_prefix="libxsmm-1.8",
+      build_file=str(Label("//third_party:libxsmm.BUILD")),)
 
   native.bind(
-      name = "xsmm_avx",
-      actual = "@libxsmm_archive//third_party:xsmm_avx",
-  )
+      name="xsmm_avx",
+      actual="@libxsmm_archive//third_party:xsmm_avx",)
 
   native.new_http_archive(
-      name = "ortools_archive",
-      urls = [
+      name="ortools_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
           "https://github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
       ],
-      sha256 = "932075525642b04ac6f1b50589f1df5cd72ec2f448b721fd32234cf183f0e755",
-      strip_prefix = "or-tools-253f7955c6a1fd805408fba2e42ac6d45b312d15/src",
-      build_file = str(Label("//third_party:ortools.BUILD")),
-  )
+      sha256="932075525642b04ac6f1b50589f1df5cd72ec2f448b721fd32234cf183f0e755",
+      strip_prefix="or-tools-253f7955c6a1fd805408fba2e42ac6d45b312d15/src",
+      build_file=str(Label("//third_party:ortools.BUILD")),)
 
   native.http_archive(
-      name = "com_googlesource_code_re2",
-      urls = [
+      name="com_googlesource_code_re2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
           "https://github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
       ],
-      sha256 = "bd63550101e056427c9e7ff12a408c1c8b74e9803f393ca916b2926fc2c4906f",
-      strip_prefix = "re2-b94b7cd42e9f02673cd748c1ac1d16db4052514c",
-  )
+      sha256="bd63550101e056427c9e7ff12a408c1c8b74e9803f393ca916b2926fc2c4906f",
+      strip_prefix="re2-b94b7cd42e9f02673cd748c1ac1d16db4052514c",)
 
   native.http_archive(
-      name = "gemmlowp",
-      urls = [
+      name="gemmlowp",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
           "https://github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
       ],
-      sha256 = "75d40ea8e68b0d1644f052fffe8f14a410b2a73d40ccb859a95c0578d194ec26",
-      strip_prefix = "gemmlowp-a6f29d8ac48d63293f845f2253eccbf86bc28321",
-  )
+      sha256="75d40ea8e68b0d1644f052fffe8f14a410b2a73d40ccb859a95c0578d194ec26",
+      strip_prefix="gemmlowp-a6f29d8ac48d63293f845f2253eccbf86bc28321",)
 
   native.new_http_archive(
-      name = "farmhash_archive",
-      urls = [
+      name="farmhash_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
           "https://github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
       ],
-      sha256 = "4c626d1f306bda2c6804ab955892f803f5245f4dcaecb4979dc08b091256da54",
-      strip_prefix = "farmhash-92e897b282426729f4724d91a637596c7e2fe28f",
-      build_file = str(Label("//third_party:farmhash.BUILD")),
-  )
+      sha256="4c626d1f306bda2c6804ab955892f803f5245f4dcaecb4979dc08b091256da54",
+      strip_prefix="farmhash-92e897b282426729f4724d91a637596c7e2fe28f",
+      build_file=str(Label("//third_party:farmhash.BUILD")),)
 
   native.bind(
-      name = "farmhash",
-      actual = "@farmhash//:farmhash",
-  )
+      name="farmhash",
+      actual="@farmhash//:farmhash",)
 
   native.new_http_archive(
-      name = "highwayhash",
-      urls = [
+      name="highwayhash",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
           "https://github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
       ],
-      sha256 = "0f30a15b1566d93f146c8d149878a06e91d9bb7ec2cfd76906df62a82be4aac9",
-      strip_prefix = "highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b",
-      build_file = str(Label("//third_party:highwayhash.BUILD")),
-  )
+      sha256="0f30a15b1566d93f146c8d149878a06e91d9bb7ec2cfd76906df62a82be4aac9",
+      strip_prefix="highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b",
+      build_file=str(Label("//third_party:highwayhash.BUILD")),)
 
   native.new_http_archive(
-      name = "nasm",
-      urls = [
+      name="nasm",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.bz2",
           "http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2",
       ],
-      sha256 = "00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
-      strip_prefix = "nasm-2.12.02",
-      build_file = str(Label("//third_party:nasm.BUILD")),
-  )
+      sha256="00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
+      strip_prefix="nasm-2.12.02",
+      build_file=str(Label("//third_party:nasm.BUILD")),)
 
   temp_workaround_http_archive(
-      name = "jpeg",
-      urls = [
+      name="jpeg",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
           "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
       ],
-      sha256 = "c15a9607892113946379ccea3ca8b85018301b200754f209453ab21674268e77",
-      strip_prefix = "libjpeg-turbo-1.5.1",
-      build_file = str(Label("//third_party/jpeg:jpeg.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="c15a9607892113946379ccea3ca8b85018301b200754f209453ab21674268e77",
+      strip_prefix="libjpeg-turbo-1.5.1",
+      build_file=str(Label("//third_party/jpeg:jpeg.BUILD")),
+      repository=tf_repo_name,)
 
   native.new_http_archive(
-      name = "png_archive",
-      urls = [
+      name="png_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/glennrp/libpng/archive/v1.2.53.zip",
           "https://github.com/glennrp/libpng/archive/v1.2.53.zip",
       ],
-      sha256 = "c35bcc6387495ee6e757507a68ba036d38ad05b415c2553b3debe2a57647a692",
-      strip_prefix = "libpng-1.2.53",
-      build_file = str(Label("//third_party:png.BUILD")),
-  )
+      sha256="c35bcc6387495ee6e757507a68ba036d38ad05b415c2553b3debe2a57647a692",
+      strip_prefix="libpng-1.2.53",
+      build_file=str(Label("//third_party:png.BUILD")),)
 
   native.new_http_archive(
-      name = "gif_archive",
-      urls = [
+      name="gif_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
       ],
-      sha256 = "34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1",
-      strip_prefix = "giflib-5.1.4",
-      build_file = str(Label("//third_party:gif.BUILD")),
-  )
+      sha256="34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1",
+      strip_prefix="giflib-5.1.4",
+      build_file=str(Label("//third_party:gif.BUILD")),)
 
   native.new_http_archive(
-      name = "six_archive",
-      urls = [
+      name="six_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
           "http://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
       ],
-      sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
-      strip_prefix = "six-1.10.0",
-      build_file = str(Label("//third_party:six.BUILD")),
-  )
+      sha256="105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
+      strip_prefix="six-1.10.0",
+      build_file=str(Label("//third_party:six.BUILD")),)
 
   native.new_http_archive(
-      name = "org_pythonhosted_markdown",
-      urls = [
+      name="org_pythonhosted_markdown",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
           "https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
       ],
-      strip_prefix = "Markdown-2.6.8",
-      sha256 = "0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33",
-      build_file = str(Label("//third_party:markdown.BUILD")),
-  )
+      strip_prefix="Markdown-2.6.8",
+      sha256="0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33",
+      build_file=str(Label("//third_party:markdown.BUILD")),)
 
   native.new_http_archive(
-      name = "org_html5lib",
-      urls = [
+      name="org_html5lib",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
           "https://github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
       ],
-      sha256 = "adb36c879264e8880b92589c4c4fe0814cd9d157b73328b14d728f48a6bab0a4",
-      strip_prefix = "html5lib-python-1.0b8",
-      build_file = str(Label("//third_party:html5lib.BUILD")),
-  )
+      sha256="adb36c879264e8880b92589c4c4fe0814cd9d157b73328b14d728f48a6bab0a4",
+      strip_prefix="html5lib-python-1.0b8",
+      build_file=str(Label("//third_party:html5lib.BUILD")),)
 
   native.new_http_archive(
-      name = "org_mozilla_bleach",
-      urls = [
+      name="org_mozilla_bleach",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/mozilla/bleach/archive/v1.5.tar.gz",
           "https://github.com/mozilla/bleach/archive/v1.5.tar.gz",
       ],
-      strip_prefix = "bleach-1.5",
-      sha256 = "0d68713d02ba4148c417ab1637dd819333d96929a34401d0233947bec0881ad8",
-      build_file = str(Label("//third_party:bleach.BUILD")),
-  )
+      strip_prefix="bleach-1.5",
+      sha256="0d68713d02ba4148c417ab1637dd819333d96929a34401d0233947bec0881ad8",
+      build_file=str(Label("//third_party:bleach.BUILD")),)
 
   native.new_http_archive(
-      name = "org_pocoo_werkzeug",
-      urls = [
+      name="org_pocoo_werkzeug",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
           "https://pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
       ],
-      strip_prefix = "Werkzeug-0.11.10",
-      sha256 = "cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee",
-      build_file = str(Label("//third_party:werkzeug.BUILD")),
-  )
+      strip_prefix="Werkzeug-0.11.10",
+      sha256="cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee",
+      build_file=str(Label("//third_party:werkzeug.BUILD")),)
 
   native.bind(
-      name = "six",
-      actual = "@six_archive//:six",
-  )
+      name="six",
+      actual="@six_archive//:six",)
 
   patched_http_archive(
-      name = "protobuf",
-      urls = [
+      name="protobuf",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
-      sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
-      strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
+      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
       # TODO: remove patching when tensorflow stops linking same protos into
       #       multiple shared libraries loaded in runtime by python.
       #       This patch fixes a runtime crash when tensorflow is compiled
       #       with clang -O2 on Linux (see https://github.com/tensorflow/tensorflow/issues/8394)
-      patch_file = str(Label("//third_party/protobuf:add_noinlines.patch")),
-  )
+      patch_file=str(Label("//third_party/protobuf:add_noinlines.patch")),)
 
   # We need to import the protobuf library under the names com_google_protobuf
   # and com_google_protobuf_cc to enable proto_library support in bazel.
@@ -342,25 +340,22 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
   )
 
   native.new_http_archive(
-      name = "gmock_archive",
-      urls = [
+      name="gmock_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/googletest/archive/release-1.8.0.zip",
           "https://github.com/google/googletest/archive/release-1.8.0.zip",
       ],
-      sha256 = "f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
-      strip_prefix = "googletest-release-1.8.0",
-      build_file = str(Label("//third_party:gmock.BUILD")),
-  )
+      sha256="f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
+      strip_prefix="googletest-release-1.8.0",
+      build_file=str(Label("//third_party:gmock.BUILD")),)
 
   native.bind(
-      name = "gtest",
-      actual = "@gmock_archive//:gtest",
-  )
+      name="gtest",
+      actual="@gmock_archive//:gtest",)
 
   native.bind(
-      name = "gtest_main",
-      actual = "@gmock_archive//:gtest_main",
-  )
+      name="gtest_main",
+      actual="@gmock_archive//:gtest_main",)
 
   native.git_repository(
     name   = "com_github_gflags_gflags",
@@ -369,231 +364,210 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
   )
 
   native.bind(
-      name = "python_headers",
-      actual = str(Label("//util/python:python_headers")),
-  )
+      name="python_headers",
+      actual=str(Label("//util/python:python_headers")),)
 
   native.new_http_archive(
-      name = "pcre",
-      sha256 = "ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7",
-      urls = [
+      name="pcre",
+      sha256="ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
           "http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
       ],
-      strip_prefix = "pcre-8.39",
-      build_file = str(Label("//third_party:pcre.BUILD")),
-  )
+      strip_prefix="pcre-8.39",
+      build_file=str(Label("//third_party:pcre.BUILD")),)
 
   native.new_http_archive(
-      name = "swig",
-      sha256 = "58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
-      urls = [
+      name="swig",
+      sha256="58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
       ],
-      strip_prefix = "swig-3.0.8",
-      build_file = str(Label("//third_party:swig.BUILD")),
-  )
+      strip_prefix="swig-3.0.8",
+      build_file=str(Label("//third_party:swig.BUILD")),)
 
   temp_workaround_http_archive(
-      name = "curl",
-      sha256 = "ff3e80c1ca6a068428726cd7dd19037a47cc538ce58ef61c59587191039b2ca6",
-      urls = [
+      name="curl",
+      sha256="ff3e80c1ca6a068428726cd7dd19037a47cc538ce58ef61c59587191039b2ca6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/curl.haxx.se/download/curl-7.49.1.tar.gz",
           "https://curl.haxx.se/download/curl-7.49.1.tar.gz",
       ],
-      strip_prefix = "curl-7.49.1",
-      build_file = str(Label("//third_party:curl.BUILD")),
-      repository = tf_repo_name
-  )
+      strip_prefix="curl-7.49.1",
+      build_file=str(Label("//third_party:curl.BUILD")),
+      repository=tf_repo_name)
 
   # grpc expects //external:protobuf_clib and //external:protobuf_compiler
   # to point to the protobuf's compiler library.
   native.bind(
-      name = "protobuf_clib",
-      actual = "@protobuf//:protoc_lib",
-  )
+      name="protobuf_clib",
+      actual="@protobuf//:protoc_lib",)
 
   native.bind(
-      name = "protobuf_compiler",
-      actual = "@protobuf//:protoc_lib",
-  )
+      name="protobuf_compiler",
+      actual="@protobuf//:protoc_lib",)
 
   native.new_http_archive(
-      name = "grpc",
-      urls = [
+      name="grpc",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
           "https://github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
       ],
-      sha256 = "a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31",
-      strip_prefix = "grpc-d7ff4ff40071d2b486a052183e3e9f9382afb745",
-      build_file = str(Label("//third_party:grpc.BUILD")),
-  )
+      sha256="a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31",
+      strip_prefix="grpc-d7ff4ff40071d2b486a052183e3e9f9382afb745",
+      build_file=str(Label("//third_party:grpc.BUILD")),)
 
   # protobuf expects //external:grpc_cpp_plugin to point to grpc's
   # C++ plugin code generator.
   native.bind(
-      name = "grpc_cpp_plugin",
-      actual = "@grpc//:grpc_cpp_plugin",
-  )
+      name="grpc_cpp_plugin",
+      actual="@grpc//:grpc_cpp_plugin",)
 
   native.bind(
-      name = "grpc_lib",
-      actual = "@grpc//:grpc++_unsecure",
-  )
+      name="grpc_lib",
+      actual="@grpc//:grpc++_unsecure",)
 
   native.new_http_archive(
-      name = "linenoise",
-      sha256 = "7f51f45887a3d31b4ce4fa5965210a5e64637ceac12720cfce7954d6a2e812f7",
-      urls = [
+      name="linenoise",
+      sha256="7f51f45887a3d31b4ce4fa5965210a5e64637ceac12720cfce7954d6a2e812f7",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
           "https://github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
       ],
-      strip_prefix = "linenoise-c894b9e59f02203dbe4e2be657572cf88c4230c3",
-      build_file = str(Label("//third_party:linenoise.BUILD")),
-  )
+      strip_prefix="linenoise-c894b9e59f02203dbe4e2be657572cf88c4230c3",
+      build_file=str(Label("//third_party:linenoise.BUILD")),)
 
   # TODO(phawkins): currently, this rule uses an unofficial LLVM mirror.
   # Switch to an official source of snapshots if/when possible.
   temp_workaround_http_archive(
-      name = "llvm",
-      urls = [
+      name="llvm",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
           "https://github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
       ],
-      sha256 = "3cecf39bf4b3854629d610bb321bb57e0e46bda9110bd51c3bae5a4171c82bab",
-      strip_prefix = "llvm-5d2b26453d4bca5a13b69b0130e4369d1fcd393d",
-      build_file = str(Label("//third_party/llvm:llvm.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="3cecf39bf4b3854629d610bb321bb57e0e46bda9110bd51c3bae5a4171c82bab",
+      strip_prefix="llvm-5d2b26453d4bca5a13b69b0130e4369d1fcd393d",
+      build_file=str(Label("//third_party/llvm:llvm.BUILD")),
+      repository=tf_repo_name,)
 
   native.new_http_archive(
-      name = "jsoncpp_git",
-      urls = [
+      name="jsoncpp_git",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
           "https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
       ],
-      sha256 = "07d34db40593d257324ec5fb9debc4dc33f29f8fb44e33a2eeb35503e61d0fe2",
-      strip_prefix = "jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70",
-      build_file = str(Label("//third_party:jsoncpp.BUILD")),
-  )
+      sha256="07d34db40593d257324ec5fb9debc4dc33f29f8fb44e33a2eeb35503e61d0fe2",
+      strip_prefix="jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70",
+      build_file=str(Label("//third_party:jsoncpp.BUILD")),)
 
   native.bind(
-      name = "jsoncpp",
-      actual = "@jsoncpp_git//:jsoncpp",
-  )
+      name="jsoncpp",
+      actual="@jsoncpp_git//:jsoncpp",)
 
   native.http_archive(
-      name = "boringssl",
-      urls = [
+      name="boringssl",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",
           "https://github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",  # 2016-07-11
       ],
-      sha256 = "025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
-      strip_prefix = "boringssl-bbcaa15b0647816b9a1a9b9e0d209cd6712f0105",
-  )
+      sha256="025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
+      strip_prefix="boringssl-bbcaa15b0647816b9a1a9b9e0d209cd6712f0105",)
 
   native.new_http_archive(
-      name = "nanopb_git",
-      urls = [
+      name="nanopb_git",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
           "https://github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
       ],
-      sha256 = "ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33",
-      strip_prefix = "nanopb-1251fa1065afc0d62f635e0f63fec8276e14e13c",
-      build_file = str(Label("//third_party:nanopb.BUILD")),
-  )
+      sha256="ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33",
+      strip_prefix="nanopb-1251fa1065afc0d62f635e0f63fec8276e14e13c",
+      build_file=str(Label("//third_party:nanopb.BUILD")),)
 
   native.bind(
-      name = "nanopb",
-      actual = "@nanopb_git//:nanopb",
-  )
+      name="nanopb",
+      actual="@nanopb_git//:nanopb",)
 
   native.new_http_archive(
-      name = "zlib_archive",
-      urls = [
+      name="zlib_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/zlib.net/zlib-1.2.8.tar.gz",
           "http://zlib.net/fossils/zlib-1.2.8.tar.gz",
       ],
-      sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
-      strip_prefix = "zlib-1.2.8",
-      build_file = str(Label("//third_party:zlib.BUILD")),
-  )
+      sha256="36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
+      strip_prefix="zlib-1.2.8",
+      build_file=str(Label("//third_party:zlib.BUILD")),)
 
   native.bind(
-      name = "zlib",
-      actual = "@zlib_archive//:zlib",
-  )
+      name="zlib",
+      actual="@zlib_archive//:zlib",)
 
   temp_workaround_http_archive(
-      name = "snappy",
-      urls = [
+      name="snappy",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/snappy/archive/1.1.4.zip",
           "https://github.com/google/snappy/archive/1.1.4.zip",
       ],
-      sha256 = "6c74d2b663170d68184da353cdd71b5b7d57bc8888ef1e99b4929b5d680dba54",
-      strip_prefix = "snappy-1.1.4",
-      build_file = str(Label("//third_party:snappy.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="6c74d2b663170d68184da353cdd71b5b7d57bc8888ef1e99b4929b5d680dba54",
+      strip_prefix="snappy-1.1.4",
+      build_file=str(Label("//third_party:snappy.BUILD")),
+      repository=tf_repo_name,)
 
   temp_workaround_http_archive(
-      name = "nccl_archive",
-      urls = [
+      name="nccl_archive",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
           "https://github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
       ],
-      sha256 = "6787f0eed88d52ee8e32956fa4947d92c139da469f1d8e311c307f27d641118e",
-      strip_prefix = "nccl-024d1e267845f2ed06f3e2e42476d50f04a00ee6",
-      build_file = str(Label("//third_party/nccl:nccl.BUILD")),
+      sha256="6787f0eed88d52ee8e32956fa4947d92c139da469f1d8e311c307f27d641118e",
+      strip_prefix="nccl-024d1e267845f2ed06f3e2e42476d50f04a00ee6",
+      build_file=str(Label("//third_party/nccl:nccl.BUILD")),
       # TODO: Remove patching after the fix is merged into nccl(see https://github.com/NVIDIA/nccl/pull/78)
-      patch_file = str(Label("//third_party/nccl:fix_clang_compilation.patch")),
-      repository = tf_repo_name,
-  )
+      patch_file=str(Label("//third_party/nccl:fix_clang_compilation.patch")),
+      repository=tf_repo_name,)
 
   java_import_external(
-      name = "junit",
-      jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
-      jar_urls = [
+      name="junit",
+      jar_sha256=
+      "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
+      jar_urls=[
           "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://maven.ibiblio.org/maven2/junit/junit/4.12/junit-4.12.jar",
       ],
-      licenses = ["reciprocal"],  # Common Public License Version 1.0
-      testonly_ = True,
-      deps = ["@org_hamcrest_core"],
-  )
+      licenses=["reciprocal"],  # Common Public License Version 1.0
+      testonly_=True,
+      deps=["@org_hamcrest_core"],)
 
   java_import_external(
-      name = "org_hamcrest_core",
-      jar_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
-      jar_urls = [
+      name="org_hamcrest_core",
+      jar_sha256=
+      "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
+      jar_urls=[
           "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://maven.ibiblio.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
       ],
-      licenses = ["notice"],  # New BSD License
-      testonly_ = True,
-  )
+      licenses=["notice"],  # New BSD License
+      testonly_=True,)
 
   temp_workaround_http_archive(
-      name = "jemalloc",
-      urls = [
+      name="jemalloc",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
           "https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
       ],
-      sha256 = "3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8",
-      strip_prefix = "jemalloc-4.4.0",
-      build_file = str(Label("//third_party:jemalloc.BUILD")),
-      repository = tf_repo_name,
-  )
+      sha256="3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8",
+      strip_prefix="jemalloc-4.4.0",
+      build_file=str(Label("//third_party:jemalloc.BUILD")),
+      repository=tf_repo_name,)
 
   ##############################################################################
   # TensorBoard Build Tools
 
   filegroup_external(
-      name = "org_nodejs",
+      name="org_nodejs",
       # MIT with portions licensed:
       # - MIT
       # - Old MIT
@@ -603,14 +577,14 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
       # - Unicode
       # - zlib
       # - Artistic 2.0
-      licenses = ["notice"],
-      sha256_urls_extract_macos = {
+      licenses=["notice"],
+      sha256_urls_extract_macos={
           "47109a00cac344d80296c195451bb5eee7c21727fcef1594384ddfe1f852957a": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
           ],
       },
-      sha256_urls_windows = {
+      sha256_urls_windows={
           "606c44c42d17866c017c50c0afadad411d9492ac4281d2431b937f881911614e": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/win-x64/node.exe",
               "http://nodejs.org/dist/v4.3.2/win-x64/node.exe",
@@ -620,26 +594,25 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://nodejs.org/dist/v4.3.2/win-x64/node.lib",
           ],
       },
-      sha256_urls_extract = {
+      sha256_urls_extract={
           "4350d0431b49697517c6cca5d66adf5f74eb9101c52f52ae959fa94225822d44": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
           ],
       },
-      strip_prefix = {
+      strip_prefix={
           "node-v4.3.2-darwin-x64.tar.xz": "node-v4.3.2-darwin-x64",
           "node-v4.3.2-linux-x64.tar.xz": "node-v4.3.2-linux-x64",
       },
-      executable = [
+      executable=[
           "node",
           "node.exe",
-      ],
-  )
+      ],)
 
   filegroup_external(
-      name = "com_microsoft_typescript",
-      licenses = ["notice"],  # Apache 2.0
-      sha256_urls = {
+      name="com_microsoft_typescript",
+      licenses=["notice"],  # Apache 2.0
+      sha256_urls={
           "e3d9e320a2cae99be4aaa37953961a48323cdf16ba9aa2557a44d69571cd9b8d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
@@ -649,7 +622,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/lib.es6.d.ts",
           ],
       },
-      extra_build_file_content = "\n".join([
+      extra_build_file_content="\n".join([
           "sh_binary(",
           "    name = \"tsc\",",
           "    srcs = [\"tsc.sh\"],",
@@ -672,40 +645,37 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "          \"EOF\",",
           "    executable = True,",
           ")",
-      ]),
-  )
+      ]),)
 
   ##############################################################################
   # TensorBoard JavaScript Production Dependencies
 
   filegroup_external(
-      name = "com_lodash",
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      name="com_lodash",
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "7c7b391810bc08cf815683431857c51b5ee190062ae4f557e1e4689d6dd910ea": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
               "https://raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "com_numericjs",
+      name="com_numericjs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "dfaca3b8485bee735788cc6eebca82ea25719adc1fb8911c7799c6bd5a95df3b": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
               "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "com_palantir_plottable",
+      name="com_palantir_plottable",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "77510d7538dbd3b59f1c8a06f68131b38562e3be546364747618d5112723e818": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
@@ -718,61 +688,56 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "io_github_cpettitt_dagre",
+      name="io_github_cpettitt_dagre",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "7323829ddd77924a69e2b1235ded3eac30acd990da0f037e0fbd3c8e9035b50d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
               "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "io_github_cpettitt_graphlib",
+      name="io_github_cpettitt_graphlib",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "772045d412b1513b549be991c2e1846c38019429d43974efcae943fbe83489bf": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
               "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "io_github_waylonflinn_weblas",
+      name="io_github_waylonflinn_weblas",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "f138fce57f673ca8a633f4aee5ae5b6fcb6ad0de59069a42a74e996fd04d8fcc": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
               "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_d3js",
+      name="org_d3js",
       # no @license header
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256_urls = {
+      licenses=["notice"],  # BSD-3-Clause
+      sha256_urls={
           "bc1e38838f5c5c8e040132d41efee6bfddbef728210bd566479dc1694af1d3f5": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
               "https://raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_definitelytyped",
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      name="org_definitelytyped",
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "b7da645f6e5555feb7aeede73775da0023ce2257df9c8e76c9159266035a9c0d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
@@ -789,14 +754,13 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_threejs",
+      name="org_threejs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "7aff264bd84c90bed3c72a4dc31db8c19151853c6df6980f52b01d3e9872c82d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
@@ -805,190 +769,179 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
           ],
-      },
-  )
+      },)
 
   ##############################################################################
   # TensorBoard JavaScript Testing Dependencies
 
   filegroup_external(
-      name = "com_chaijs",
+      name="com_chaijs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "b926b325ad9843bf0b7a6d580ef78bb560e47c484b98680098d4fd9b31b77cd9": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
               "https://raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
           ],
-      },
-  )
+      },)
 
   filegroup_external(
-      name = "org_mochajs",
+      name="org_mochajs",
       # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
+      licenses=["notice"],  # MIT
+      sha256_urls={
           "e36d865a17ffdf5868e55e736526ae30f3d4bc667c85a2a28cd5c850a82361e2": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
               "https://raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
           ],
-      },
-  )
+      },)
 
   ##############################################################################
   # TensorBoard Polymer Dependencies
 
   webfiles_external(
-      name = "org_polymer_font_roboto",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
-      urls = [
+      name="org_polymer_font_roboto",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
           "https://github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
       ],
-      strip_prefix = "font-roboto-1.0.1",
-      path = "/font-roboto",
-      srcs = ["roboto.html"],
-  )
+      strip_prefix="font-roboto-1.0.1",
+      path="/font-roboto",
+      srcs=["roboto.html"],)
 
   webfiles_external(
-      name = "org_polymer_iron_a11y_announcer",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
-      urls = [
+      name="org_polymer_iron_a11y_announcer",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
       ],
-      strip_prefix = "iron-a11y-announcer-1.0.5",
-      path = "/iron-a11y-announcer",
-      srcs = ["iron-a11y-announcer.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-a11y-announcer-1.0.5",
+      path="/iron-a11y-announcer",
+      srcs=["iron-a11y-announcer.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_a11y_keys_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
-      urls = [
+      name="org_polymer_iron_a11y_keys_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
       ],
-      strip_prefix = "iron-a11y-keys-behavior-1.1.8",
-      path = "/iron-a11y-keys-behavior",
-      srcs = ["iron-a11y-keys-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-a11y-keys-behavior-1.1.8",
+      path="/iron-a11y-keys-behavior",
+      srcs=["iron-a11y-keys-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_ajax",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
-      urls = [
+      name="org_polymer_iron_ajax",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
       ],
-      strip_prefix = "iron-ajax-1.2.0",
-      path = "/iron-ajax",
-      srcs = [
+      strip_prefix="iron-ajax-1.2.0",
+      path="/iron-ajax",
+      srcs=[
           "iron-ajax.html",
           "iron-request.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_promise_polyfill",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_autogrow_textarea",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
-      urls = [
+      name="org_polymer_iron_autogrow_textarea",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
       ],
-      strip_prefix = "iron-autogrow-textarea-1.0.12",
-      path = "/iron-autogrow-textarea",
-      srcs = ["iron-autogrow-textarea.html"],
-      deps = [
+      strip_prefix="iron-autogrow-textarea-1.0.12",
+      path="/iron-autogrow-textarea",
+      srcs=["iron-autogrow-textarea.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_validatable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_behaviors",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
-      urls = [
+      name="org_polymer_iron_behaviors",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
           "https://github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
       ],
-      strip_prefix = "iron-behaviors-1.0.17",
-      path = "/iron-behaviors",
-      srcs = [
+      strip_prefix="iron-behaviors-1.0.17",
+      path="/iron-behaviors",
+      srcs=[
           "iron-button-state.html",
           "iron-control-state.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_checked_element_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
-      urls = [
+      name="org_polymer_iron_checked_element_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix = "iron-checked-element-behavior-1.0.4",
-      path = "/iron-checked-element-behavior",
-      srcs = ["iron-checked-element-behavior.html"],
-      deps = [
+      strip_prefix="iron-checked-element-behavior-1.0.4",
+      path="/iron-checked-element-behavior",
+      srcs=["iron-checked-element-behavior.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_validatable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_collapse",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
-      urls = [
+      name="org_polymer_iron_collapse",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
           "https://github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
       ],
-      strip_prefix = "iron-collapse-1.0.8",
-      path = "/iron-collapse",
-      srcs = ["iron-collapse.html"],
-      deps = [
+      strip_prefix="iron-collapse-1.0.8",
+      path="/iron-collapse",
+      srcs=["iron-collapse.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_resizable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_demo_helpers",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
-      urls = [
+      name="org_polymer_iron_demo_helpers",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
       ],
-      strip_prefix = "iron-demo-helpers-1.1.0",
-      path = "/iron-demo-helpers",
-      srcs = [
+      strip_prefix="iron-demo-helpers-1.1.0",
+      path="/iron-demo-helpers",
+      srcs=[
           "demo-pages-shared-styles.html",
           "demo-snippet.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_icons",
@@ -996,109 +949,103 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_icon_button",
           "@org_polymer_paper_styles",
           "@org_polymer_prism_element",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_dropdown",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
-      urls = [
+      name="org_polymer_iron_dropdown",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix = "iron-dropdown-1.4.0",
-      path = "/iron-dropdown",
-      srcs = [
+      strip_prefix="iron-dropdown-1.4.0",
+      path="/iron-dropdown",
+      srcs=[
           "iron-dropdown.html",
           "iron-dropdown-scroll-manager.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_overlay_behavior",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_neon_animation",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_fit_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
-      urls = [
+      name="org_polymer_iron_fit_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
       ],
-      strip_prefix = "iron-fit-behavior-1.2.5",
-      path = "/iron-fit-behavior",
-      srcs = ["iron-fit-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-fit-behavior-1.2.5",
+      path="/iron-fit-behavior",
+      srcs=["iron-fit-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_flex_layout",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
-      urls = [
+      name="org_polymer_iron_flex_layout",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
       ],
-      strip_prefix = "iron-flex-layout-1.3.0",
-      path = "/iron-flex-layout",
-      srcs = [
+      strip_prefix="iron-flex-layout-1.3.0",
+      path="/iron-flex-layout",
+      srcs=[
           "classes/iron-flex-layout.html",
           "classes/iron-shadow-flex-layout.html",
           "iron-flex-layout.html",
           "iron-flex-layout-classes.html",
       ],
-      deps = ["@org_polymer"],
-  )
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_form_element_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
-      urls = [
+      name="org_polymer_iron_form_element_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
       ],
-      strip_prefix = "iron-form-element-behavior-1.0.6",
-      path = "/iron-form-element-behavior",
-      srcs = ["iron-form-element-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-form-element-behavior-1.0.6",
+      path="/iron-form-element-behavior",
+      srcs=["iron-form-element-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_icon",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
-      urls = [
+      name="org_polymer_iron_icon",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
       ],
-      strip_prefix = "iron-icon-1.0.11",
-      path = "/iron-icon",
-      srcs = ["iron-icon.html"],
-      deps = [
+      strip_prefix="iron-icon-1.0.11",
+      path="/iron-icon",
+      srcs=["iron-icon.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_meta",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_icons",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
-      urls = [
+      name="org_polymer_iron_icons",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix = "iron-icons-1.1.3",
-      path = "/iron-icons",
-      srcs = [
+      strip_prefix="iron-icons-1.1.3",
+      path="/iron-icons",
+      srcs=[
           "av-icons.html",
           "communication-icons.html",
           "device-icons.html",
@@ -1111,247 +1058,233 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "places-icons.html",
           "social-icons.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer_iron_icon",
           "@org_polymer_iron_iconset_svg",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_iconset_svg",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
-      urls = [
+      name="org_polymer_iron_iconset_svg",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
       ],
-      strip_prefix = "iron-iconset-svg-1.1.0",
-      path = "/iron-iconset-svg",
-      srcs = ["iron-iconset-svg.html"],
-      deps = [
+      strip_prefix="iron-iconset-svg-1.1.0",
+      path="/iron-iconset-svg",
+      srcs=["iron-iconset-svg.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_meta",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_input",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
-      urls = [
+      name="org_polymer_iron_input",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
           "https://github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
       ],
-      strip_prefix = "iron-input-1.0.10",
-      path = "/iron-input",
-      srcs = ["iron-input.html"],
-      deps = [
+      strip_prefix="iron-input-1.0.10",
+      path="/iron-input",
+      srcs=["iron-input.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_announcer",
           "@org_polymer_iron_validatable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_list",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
-      urls = [
+      name="org_polymer_iron_list",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
           "https://github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
       ],
-      strip_prefix = "iron-list-1.3.9",
-      path = "/iron-list",
-      srcs = ["iron-list.html"],
-      deps = [
+      strip_prefix="iron-list-1.3.9",
+      path="/iron-list",
+      srcs=["iron-list.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_iron_scroll_target_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_menu_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
-      urls = [
+      name="org_polymer_iron_menu_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
           "https://github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
       ],
-      strip_prefix = "iron-menu-behavior-1.1.10",
-      path = "/iron-menu-behavior",
-      srcs = [
+      strip_prefix="iron-menu-behavior-1.1.10",
+      path="/iron-menu-behavior",
+      srcs=[
           "iron-menu-behavior.html",
           "iron-menubar-behavior.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_selector",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_meta",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
-      urls = [
+      name="org_polymer_iron_meta",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix = "iron-meta-1.1.1",
-      path = "/iron-meta",
-      srcs = ["iron-meta.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-meta-1.1.1",
+      path="/iron-meta",
+      srcs=["iron-meta.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_overlay_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
-      urls = [
+      name="org_polymer_iron_overlay_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
           "https://github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
       ],
-      strip_prefix = "iron-overlay-behavior-1.10.1",
-      path = "/iron-overlay-behavior",
-      srcs = [
+      strip_prefix="iron-overlay-behavior-1.10.1",
+      path="/iron-overlay-behavior",
+      srcs=[
           "iron-focusables-helper.html",
           "iron-overlay-backdrop.html",
           "iron-overlay-behavior.html",
           "iron-overlay-manager.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_fit_behavior",
           "@org_polymer_iron_resizable_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_iron_range_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
-      urls = [
+      name="org_polymer_iron_range_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix = "iron-range-behavior-1.0.4",
-      path = "/iron-range-behavior",
-      srcs = ["iron-range-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-range-behavior-1.0.4",
+      path="/iron-range-behavior",
+      srcs=["iron-range-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_resizable_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
-      urls = [
+      name="org_polymer_iron_resizable_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
       ],
-      strip_prefix = "iron-resizable-behavior-1.0.3",
-      path = "/iron-resizable-behavior",
-      srcs = ["iron-resizable-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-resizable-behavior-1.0.3",
+      path="/iron-resizable-behavior",
+      srcs=["iron-resizable-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_scroll_target_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
-      urls = [
+      name="org_polymer_iron_scroll_target_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
       ],
-      strip_prefix = "iron-scroll-target-behavior-1.0.3",
-      path = "/iron-scroll-target-behavior",
-      srcs = ["iron-scroll-target-behavior.html"],
-      deps = ["@org_polymer"],
-  )
+      strip_prefix="iron-scroll-target-behavior-1.0.3",
+      path="/iron-scroll-target-behavior",
+      srcs=["iron-scroll-target-behavior.html"],
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_selector",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
-      urls = [
+      name="org_polymer_iron_selector",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
           "https://github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
       ],
-      strip_prefix = "iron-selector-1.5.2",
-      path = "/iron-selector",
-      srcs = [
+      strip_prefix="iron-selector-1.5.2",
+      path="/iron-selector",
+      srcs=[
           "iron-multi-selectable.html",
           "iron-selectable.html",
           "iron-selection.html",
           "iron-selector.html",
       ],
-      deps = ["@org_polymer"],
-  )
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_iron_validatable_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
-      urls = [
+      name="org_polymer_iron_validatable_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix = "iron-validatable-behavior-1.1.1",
-      path = "/iron-validatable-behavior",
-      srcs = ["iron-validatable-behavior.html"],
-      deps = [
+      strip_prefix="iron-validatable-behavior-1.1.1",
+      path="/iron-validatable-behavior",
+      srcs=["iron-validatable-behavior.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_meta",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_marked",
-      licenses = ["notice"],  # MIT
-      sha256 = "93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
-      urls = [
+      name="org_polymer_marked",
+      licenses=["notice"],  # MIT
+      sha256="93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/chjj/marked/archive/v0.3.2.zip",
           "https://github.com/chjj/marked/archive/v0.3.2.zip",
       ],
-      strip_prefix = "marked-0.3.2",
-      path = "/marked",
-      srcs = ["lib/marked.js"],
-  )
+      strip_prefix="marked-0.3.2",
+      path="/marked",
+      srcs=["lib/marked.js"],)
 
   webfiles_external(
-      name = "org_polymer_marked_element",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
-      urls = [
+      name="org_polymer_marked_element",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix = "marked-element-1.1.3",
-      path = "/marked-element",
-      srcs = [
+      strip_prefix="marked-element-1.1.3",
+      path="/marked-element",
+      srcs=[
           "marked-element.html",
           "marked-import.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_marked",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_neon_animation",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
-      urls = [
+      name="org_polymer_neon_animation",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
       ],
-      strip_prefix = "neon-animation-1.2.2",
-      path = "/neon-animation",
-      srcs = [
+      strip_prefix="neon-animation-1.2.2",
+      path="/neon-animation",
+      srcs=[
           "animations/cascaded-animation.html",
           "animations/fade-in-animation.html",
           "animations/fade-out-animation.html",
@@ -1381,155 +1314,148 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "neon-shared-element-animation-behavior.html",
           "web-animations.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_meta",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_iron_selector",
           "@org_polymer_web_animations_js",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_behaviors",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
-      urls = [
+      name="org_polymer_paper_behaviors",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
       ],
-      strip_prefix = "paper-behaviors-1.0.12",
-      path = "/paper-behaviors",
-      srcs = [
+      strip_prefix="paper-behaviors-1.0.12",
+      path="/paper-behaviors",
+      srcs=[
           "paper-button-behavior.html",
           "paper-checked-element-behavior.html",
           "paper-inky-focus-behavior.html",
           "paper-ripple-behavior.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_checked_element_behavior",
           "@org_polymer_paper_ripple",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
-      urls = [
+      name="org_polymer_paper_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
       ],
-      strip_prefix = "paper-button-1.0.11",
-      path = "/paper-button",
-      srcs = ["paper-button.html"],
-      deps = [
+      strip_prefix="paper-button-1.0.11",
+      path="/paper-button",
+      srcs=["paper-button.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_material",
           "@org_polymer_paper_ripple",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_checkbox",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
-      urls = [
+      name="org_polymer_paper_checkbox",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix = "paper-checkbox-1.4.0",
-      path = "/paper-checkbox",
-      srcs = ["paper-checkbox.html"],
-      deps = [
+      strip_prefix="paper-checkbox-1.4.0",
+      path="/paper-checkbox",
+      srcs=["paper-checkbox.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dialog",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
-      urls = [
+      name="org_polymer_paper_dialog",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix = "paper-dialog-1.0.4",
-      path = "/paper-dialog",
-      srcs = ["paper-dialog.html"],
-      deps = [
+      strip_prefix="paper-dialog-1.0.4",
+      path="/paper-dialog",
+      srcs=["paper-dialog.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_neon_animation",
           "@org_polymer_paper_dialog_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dialog_behavior",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
-      urls = [
+      name="org_polymer_paper_dialog_behavior",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
       ],
-      strip_prefix = "paper-dialog-behavior-1.2.5",
-      path = "/paper-dialog-behavior",
-      srcs = [
+      strip_prefix="paper-dialog-behavior-1.2.5",
+      path="/paper-dialog-behavior",
+      srcs=[
           "paper-dialog-behavior.html",
           "paper-dialog-common.css",
           "paper-dialog-shared-styles.html",
       ],
-      suppress = ["cssSyntax"],
-      deps = [
+      suppress=["cssSyntax"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_overlay_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dialog_scrollable",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
-      urls = [
+      name="org_polymer_paper_dialog_scrollable",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
       ],
-      strip_prefix = "paper-dialog-scrollable-1.1.5",
-      path = "/paper-dialog-scrollable",
-      srcs = ["paper-dialog-scrollable.html"],
-      deps = [
+      strip_prefix="paper-dialog-scrollable-1.1.5",
+      path="/paper-dialog-scrollable",
+      srcs=["paper-dialog-scrollable.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_dialog_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_dropdown_menu",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
-      urls = [
+      name="org_polymer_paper_dropdown_menu",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix = "paper-dropdown-menu-1.4.0",
-      path = "/paper-dropdown-menu",
-      srcs = [
+      strip_prefix="paper-dropdown-menu-1.4.0",
+      path="/paper-dropdown-menu",
+      srcs=[
           "paper-dropdown-menu.html",
           "paper-dropdown-menu-icons.html",
           "paper-dropdown-menu-light.html",
           "paper-dropdown-menu-shared-styles.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
@@ -1542,59 +1468,56 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_menu_button",
           "@org_polymer_paper_ripple",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_header_panel",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
-      urls = [
+      name="org_polymer_paper_header_panel",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-header-panel-1.1.4",
-      path = "/paper-header-panel",
-      srcs = ["paper-header-panel.html"],
-      deps = [
+      strip_prefix="paper-header-panel-1.1.4",
+      path="/paper-header-panel",
+      srcs=["paper-header-panel.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_icon_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
-      urls = [
+      name="org_polymer_paper_icon_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix = "paper-icon-button-1.1.3",
-      path = "/paper-icon-button",
-      srcs = [
+      strip_prefix="paper-icon-button-1.1.3",
+      path="/paper-icon-button",
+      srcs=[
           "paper-icon-button.html",
           "paper-icon-button-light.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_icon",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_input",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
-      urls = [
+      name="org_polymer_paper_input",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
           "https://github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
       ],
-      strip_prefix = "paper-input-1.1.18",
-      path = "/paper-input",
-      srcs = [
+      strip_prefix="paper-input-1.1.18",
+      path="/paper-input",
+      srcs=[
           "paper-input.html",
           "paper-input-addon-behavior.html",
           "paper-input-behavior.html",
@@ -1603,7 +1526,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "paper-input-error.html",
           "paper-textarea.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_autogrow_textarea",
@@ -1612,206 +1535,196 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_input",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_item",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
-      urls = [
+      name="org_polymer_paper_item",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-item-1.1.4",
-      path = "/paper-item",
-      srcs = [
+      strip_prefix="paper-item-1.1.4",
+      path="/paper-item",
+      srcs=[
           "paper-icon-item.html",
           "paper-item.html",
           "paper-item-behavior.html",
           "paper-item-body.html",
           "paper-item-shared-styles.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_listbox",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
-      urls = [
+      name="org_polymer_paper_listbox",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix = "paper-listbox-1.1.2",
-      path = "/paper-listbox",
-      srcs = ["paper-listbox.html"],
-      deps = [
+      strip_prefix="paper-listbox-1.1.2",
+      path="/paper-listbox",
+      srcs=["paper-listbox.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_menu_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_material",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
-      urls = [
+      name="org_polymer_paper_material",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
       ],
-      strip_prefix = "paper-material-1.0.6",
-      path = "/paper-material",
-      srcs = [
+      strip_prefix="paper-material-1.0.6",
+      path="/paper-material",
+      srcs=[
           "paper-material.html",
           "paper-material-shared-styles.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_menu",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
-      urls = [
+      name="org_polymer_paper_menu",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
       ],
-      strip_prefix = "paper-menu-1.2.2",
-      path = "/paper-menu",
-      srcs = [
+      strip_prefix="paper-menu-1.2.2",
+      path="/paper-menu",
+      srcs=[
           "paper-menu.html",
           "paper-menu-shared-styles.html",
           "paper-submenu.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_collapse",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_menu_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_menu_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
-      urls = [
+      name="org_polymer_paper_menu_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
           "https://github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
       ],
-      strip_prefix = "paper-menu-button-1.5.1",
-      path = "/paper-menu-button",
-      srcs = [
+      strip_prefix="paper-menu-button-1.5.1",
+      path="/paper-menu-button",
+      srcs=[
           "paper-menu-button.html",
           "paper-menu-button-animations.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_dropdown",
           "@org_polymer_neon_animation",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_progress",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
-      urls = [
+      name="org_polymer_paper_progress",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
       ],
-      strip_prefix = "paper-progress-1.0.9",
-      path = "/paper-progress",
-      srcs = ["paper-progress.html"],
-      deps = [
+      strip_prefix="paper-progress-1.0.9",
+      path="/paper-progress",
+      srcs=["paper-progress.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_range_behavior",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_radio_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
-      urls = [
+      name="org_polymer_paper_radio_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix = "paper-radio-button-1.1.2",
-      path = "/paper-radio-button",
-      srcs = ["paper-radio-button.html"],
-      deps = [
+      strip_prefix="paper-radio-button-1.1.2",
+      path="/paper-radio-button",
+      srcs=["paper-radio-button.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_radio_group",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
-      urls = [
+      name="org_polymer_paper_radio_group",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
       ],
-      strip_prefix = "paper-radio-group-1.0.9",
-      path = "/paper-radio-group",
-      srcs = ["paper-radio-group.html"],
-      deps = [
+      strip_prefix="paper-radio-group-1.0.9",
+      path="/paper-radio-group",
+      srcs=["paper-radio-group.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_selector",
           "@org_polymer_paper_radio_button",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_ripple",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
-      urls = [
+      name="org_polymer_paper_ripple",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
       ],
-      strip_prefix = "paper-ripple-1.0.5",
-      path = "/paper-ripple",
-      srcs = ["paper-ripple.html"],
-      deps = [
+      strip_prefix="paper-ripple-1.0.5",
+      path="/paper-ripple",
+      srcs=["paper-ripple.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_slider",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
-      urls = [
+      name="org_polymer_paper_slider",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
           "https://github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
       ],
-      strip_prefix = "paper-slider-1.0.10",
-      path = "/paper-slider",
-      srcs = ["paper-slider.html"],
-      deps = [
+      strip_prefix="paper-slider-1.0.10",
+      path="/paper-slider",
+      srcs=["paper-slider.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_flex_layout",
@@ -1821,43 +1734,39 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_input",
           "@org_polymer_paper_progress",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_spinner",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
-      urls = [
+      name="org_polymer_paper_spinner",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix = "paper-spinner-1.1.1",
-      path = "/paper-spinner",
-      srcs = [
-          "paper-spinner.html",
-          "paper-spinner-behavior.html",
-          "paper-spinner-lite.html",
-          "paper-spinner-styles.html"
+      strip_prefix="paper-spinner-1.1.1",
+      path="/paper-spinner",
+      srcs=[
+          "paper-spinner.html", "paper-spinner-behavior.html",
+          "paper-spinner-lite.html", "paper-spinner-styles.html"
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_styles",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
-      urls = [
+      name="org_polymer_paper_styles",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-styles-1.1.4",
-      path = "/paper-styles",
-      srcs = [
+      strip_prefix="paper-styles-1.1.4",
+      path="/paper-styles",
+      srcs=[
           "classes/global.html",
           "classes/shadow.html",
           "classes/shadow-layout.html",
@@ -1871,29 +1780,28 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "shadow.html",
           "typography.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_font_roboto",
           "@org_polymer_iron_flex_layout",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_tabs",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
-      urls = [
+      name="org_polymer_paper_tabs",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
           "https://github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
       ],
-      strip_prefix = "paper-tabs-1.7.0",
-      path = "/paper-tabs",
-      srcs = [
+      strip_prefix="paper-tabs-1.7.0",
+      path="/paper-tabs",
+      srcs=[
           "paper-tab.html",
           "paper-tabs.html",
           "paper-tabs-icons.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
@@ -1904,177 +1812,165 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_icon_button",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_toast",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
-      urls = [
+      name="org_polymer_paper_toast",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
       ],
-      strip_prefix = "paper-toast-1.3.0",
-      path = "/paper-toast",
-      srcs = ["paper-toast.html"],
-      deps = [
+      strip_prefix="paper-toast-1.3.0",
+      path="/paper-toast",
+      srcs=["paper-toast.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_a11y_announcer",
           "@org_polymer_iron_overlay_behavior",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_toggle_button",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
-      urls = [
+      name="org_polymer_paper_toggle_button",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
       ],
-      strip_prefix = "paper-toggle-button-1.2.0",
-      path = "/paper-toggle-button",
-      srcs = ["paper-toggle-button.html"],
-      deps = [
+      strip_prefix="paper-toggle-button-1.2.0",
+      path="/paper-toggle-button",
+      srcs=["paper-toggle-button.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_toolbar",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
-      urls = [
+      name="org_polymer_paper_toolbar",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix = "paper-toolbar-1.1.4",
-      path = "/paper-toolbar",
-      srcs = ["paper-toolbar.html"],
-      deps = [
+      strip_prefix="paper-toolbar-1.1.4",
+      path="/paper-toolbar",
+      srcs=["paper-toolbar.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_paper_tooltip",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
-      urls = [
+      name="org_polymer_paper_tooltip",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix = "paper-tooltip-1.1.2",
-      path = "/paper-tooltip",
-      srcs = ["paper-tooltip.html"],
-      deps = [
+      strip_prefix="paper-tooltip-1.1.2",
+      path="/paper-tooltip",
+      srcs=["paper-tooltip.html"],
+      deps=[
           "@org_polymer",
           "@org_polymer_neon_animation",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
-      strip_prefix = "polymer-1.7.0",
-      urls = [
+      name="org_polymer",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
+      strip_prefix="polymer-1.7.0",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/polymer/polymer/archive/v1.7.0.tar.gz",
           "https://github.com/polymer/polymer/archive/v1.7.0.tar.gz",
       ],
-      path = "/polymer",
-      srcs = [
+      path="/polymer",
+      srcs=[
           "polymer.html",
           "polymer-micro.html",
           "polymer-mini.html",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_prism",
-      licenses = ["notice"],  # MIT
-      sha256 = "e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
-      urls = [
+      name="org_polymer_prism",
+      licenses=["notice"],  # MIT
+      sha256="e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
           "https://github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
       ],
-      strip_prefix = "prism-abee2b7587f1925e57777044270e2a1860810994",
-      path = "/prism",
-      srcs = [
+      strip_prefix="prism-abee2b7587f1925e57777044270e2a1860810994",
+      path="/prism",
+      srcs=[
           "prism.js",
           "themes/prism.css",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_prism_element",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
-      urls = [
+      name="org_polymer_prism_element",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
           "https://github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
       ],
-      strip_prefix = "prism-element-1.0.4",
-      path = "/prism-element",
-      srcs = [
+      strip_prefix="prism-element-1.0.4",
+      path="/prism-element",
+      srcs=[
           "prism-highlighter.html",
           "prism-import.html",
       ],
-      deps = [
+      deps=[
           "@org_polymer",
           "@org_polymer_prism",
-      ],
-  )
+      ],)
 
   webfiles_external(
-      name = "org_polymer_promise_polyfill",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
-      strip_prefix = "promise-polyfill-1.0.0",
-      urls = [
+      name="org_polymer_promise_polyfill",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
+      strip_prefix="promise-polyfill-1.0.0",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
           "https://github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
       ],
-      path = "/promise-polyfill",
-      srcs = [
-          "Promise.js",
-          "Promise-Statics.js",
-          "promise-polyfill.html",
+      path="/promise-polyfill",
+      srcs=[
+          "Promise.js", "Promise-Statics.js", "promise-polyfill.html",
           "promise-polyfill-lite.html"
       ],
-      deps = ["@org_polymer"],
-  )
+      deps=["@org_polymer"],)
 
   webfiles_external(
-      name = "org_polymer_web_animations_js",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
-      urls = [
+      name="org_polymer_web_animations_js",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
           "https://github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
       ],
-      strip_prefix = "web-animations-js-2.2.1",
-      path = "/web-animations-js",
-      srcs = ["web-animations-next-lite.min.js"],
-  )
+      strip_prefix="web-animations-js-2.2.1",
+      path="/web-animations-js",
+      srcs=["web-animations-next-lite.min.js"],)
 
   webfiles_external(
-      name = "org_polymer_webcomponentsjs",
-      licenses = ["notice"],  # BSD-3-Clause
-      sha256 = "138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
-      urls = [
+      name="org_polymer_webcomponentsjs",
+      licenses=["notice"],  # BSD-3-Clause
+      sha256="138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
           "https://github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
       ],
-      strip_prefix = "webcomponentsjs-0.7.22",
-      path = "/webcomponentsjs",
-      srcs = [
+      strip_prefix="webcomponentsjs-0.7.22",
+      path="/webcomponentsjs",
+      srcs=[
           "CustomElements.js",
           "CustomElements.min.js",
           "HTMLImports.js",
@@ -2087,5 +1983,4 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
           "webcomponents.min.js",
           "webcomponents-lite.js",
           "webcomponents-lite.min.js",
-      ],
-  )
+      ],)
diff --git a/third_party/libxsmm.BUILD b/third_party/libxsmm.BUILD
index d61b7d0277..53a814b4b8 100644
--- a/third_party/libxsmm.BUILD
+++ b/third_party/libxsmm.BUILD
@@ -96,7 +96,8 @@ cc_library(
         "include/libxsmm.h",
         "include/libxsmm_config.h",
         "include/libxsmm_dispatch.h",
-    ] + glob([ # trigger rebuild if template changed
+    ] + glob([
+        # trigger rebuild if template changed
         "src/template/*.c",
     ]),
     copts = [
-- 
GitLab


From fd2bfed807979442e80f27a46df69ca7b579d42a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 13:11:42 -0800
Subject: [PATCH 0146/1563] Assert rank is at least equal to new_rank for
 `_sparse_inner_flatten`. Change: 152303319

---
 .../contrib/layers/python/layers/layers.py    |  4 ++++
 .../layers/python/layers/layers_test.py       | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 0140f6d0d3..bf2a372f04 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -1241,6 +1241,10 @@ def flatten(inputs,
 
 def _sparse_inner_flatten(inputs, new_rank):
   """Helper function for `inner_flatten`."""
+  inputs_rank = inputs.dense_shape.get_shape().as_list()[0]
+  if inputs_rank < new_rank:
+    raise ValueError('inputs has rank less than new_rank.')
+
   outer_dimensions = inputs.dense_shape[:new_rank - 1]
   inner_dimensions = inputs.dense_shape[new_rank - 1:]
   new_shape = array_ops.concat((outer_dimensions,
diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index 2b170e92ba..4cdc8ca005 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -1465,6 +1465,30 @@ class PartialFlattenTest(test.TestCase):
     flattened5 = _layers._inner_flatten(inputs, 5)
     self.assertEqual([2, None, 4, None, 30], flattened5.get_shape().as_list())
 
+  def testDenseFlattenRankAssertion(self):
+    """Test `_inner_flatten` rank assertion for dense tensors."""
+    shape = [2, 3]
+    new_rank = 3
+    inputs = array_ops.placeholder(dtypes.int32)
+    inputs.set_shape(shape)
+
+    with self.assertRaisesRegexp(ValueError,
+                                 'inputs has rank less than new_rank'):
+      _layers._inner_flatten(inputs, new_rank)
+
+  def testSparseFlattenRankAssertion(self):
+    """Test `_inner_flatten` rank assertion for sparse tensors."""
+    shape = [2, 3]
+    new_rank = 3
+    np.random.seed(10301)
+    random_ = np.random.rand(*shape)
+    indices, values, _ = _sparsify(random_)
+    inputs = sparse_tensor.SparseTensor(indices, values, shape)
+
+    with self.assertRaisesRegexp(ValueError,
+                                 'inputs has rank less than new_rank'):
+      _layers._inner_flatten(inputs, new_rank)
+
 
 class FCTest(test.TestCase):
 
-- 
GitLab


From 1fbabf4b3842558b1f0188c11f9f9e6b98c4b8a5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 13:19:04 -0800
Subject: [PATCH 0147/1563] Extend quantization ranges to include 0.0f. Change:
 152304380

---
 tensorflow/core/kernels/quantize_op.cc        |   1 +
 tensorflow/core/kernels/quantize_op_test.cc   |  44 +++++++
 .../graph_transforms/quantize_weights.cc      |   4 +
 .../graph_transforms/quantize_weights_test.cc | 120 +++++++++++++-----
 4 files changed, 136 insertions(+), 33 deletions(-)

diff --git a/tensorflow/core/kernels/quantize_op.cc b/tensorflow/core/kernels/quantize_op.cc
index 7b34c32ceb..f649287fc1 100644
--- a/tensorflow/core/kernels/quantize_op.cc
+++ b/tensorflow/core/kernels/quantize_op.cc
@@ -86,6 +86,7 @@ class QuantizeV2Op : public OpKernel {
                                                   fabsf(input_max_range))) /
                           100.0f;
     max_range = std::max(input_max_range, min_range + epsilon);
+    max_range = std::max(0.0f, max_range);
 
     Tensor* output = nullptr;
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, input.shape(), &output));
diff --git a/tensorflow/core/kernels/quantize_op_test.cc b/tensorflow/core/kernels/quantize_op_test.cc
index 41996852f1..48bde3b497 100644
--- a/tensorflow/core/kernels/quantize_op_test.cc
+++ b/tensorflow/core/kernels/quantize_op_test.cc
@@ -132,6 +132,50 @@ TEST_F(QuantizedOpTest, QuantizeV2EqualRange) {
   EXPECT_LT(0.0f, output_max);
 }
 
+TEST_F(QuantizedOpTest, QuantizeV2MovesMinToIncludeZero) {
+  TF_ASSERT_OK(NodeDefBuilder("quantize_op", "QuantizeV2")
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Attr("T", DataTypeToEnum<quint8>::v())
+                   .Attr("mode", "MIN_FIRST")
+                   .Finalize(node_def()));
+  TF_ASSERT_OK(InitOp());
+  AddInputFromArray<float>(TensorShape({3}), {0.1, 0.2, 0.3});
+  AddInputFromArray<float>(TensorShape({1}), {0.1});
+  AddInputFromArray<float>(TensorShape({1}), {0.3});
+  TF_ASSERT_OK(RunOpKernel());
+  Tensor expected(allocator(), DT_QUINT8, TensorShape({3}));
+  test::FillValues<quint8>(&expected, {85, 170, 255});
+  test::ExpectTensorEqual<quint8>(expected, *GetOutput(0));
+  const float output_min = GetOutput(1)->flat<float>()(0);
+  const float output_max = GetOutput(2)->flat<float>()(0);
+  EXPECT_NEAR(0.0f, output_min, 1e-5f);
+  EXPECT_NEAR(0.3f, output_max, 1e-5f);
+}
+
+TEST_F(QuantizedOpTest, QuantizeV2MovesMaxToIncludeZero) {
+  TF_ASSERT_OK(NodeDefBuilder("quantize_op", "QuantizeV2")
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Attr("T", DataTypeToEnum<quint8>::v())
+                   .Attr("mode", "MIN_FIRST")
+                   .Finalize(node_def()));
+  TF_ASSERT_OK(InitOp());
+  AddInputFromArray<float>(TensorShape({3}), {-0.1, -0.2, -0.3});
+  AddInputFromArray<float>(TensorShape({1}), {-0.3});
+  AddInputFromArray<float>(TensorShape({1}), {-0.1});
+  TF_ASSERT_OK(RunOpKernel());
+  Tensor expected(allocator(), DT_QUINT8, TensorShape({3}));
+  test::FillValues<quint8>(&expected, {170, 85, 0});
+  test::ExpectTensorEqual<quint8>(expected, *GetOutput(0));
+  const float output_min = GetOutput(1)->flat<float>()(0);
+  const float output_max = GetOutput(2)->flat<float>()(0);
+  EXPECT_NEAR(-0.3f, output_min, 1e-5f);
+  EXPECT_NEAR(0.0f, output_max, 1e-5f);
+}
+
 TEST_F(QuantizedOpTest, Dequantize) {
   TF_ASSERT_OK(NodeDefBuilder("dequantize_op", "Dequantize")
                    .Input(FakeInput(DT_QUINT8))
diff --git a/tensorflow/tools/graph_transforms/quantize_weights.cc b/tensorflow/tools/graph_transforms/quantize_weights.cc
index e6f1498224..66d800f0da 100644
--- a/tensorflow/tools/graph_transforms/quantize_weights.cc
+++ b/tensorflow/tools/graph_transforms/quantize_weights.cc
@@ -70,6 +70,10 @@ Status QuantizeWeights(const GraphDef& input_graph_def,
           min = std::min(min, value);
           max = std::max(max, value);
         }
+        // Make sure the quantization range includes 0.0f. Not all quantized
+        // Ops behave properly if 0.0f is not in the range.
+        min = std::min(min, 0.0f);
+        max = std::max(0.0f, max);
         // min_value == max_value is a tricky case. It can occur for general
         // tensors, and of course for scalars. The quantized ops cannot deal
         // with this case, so we set max_value to something else.
diff --git a/tensorflow/tools/graph_transforms/quantize_weights_test.cc b/tensorflow/tools/graph_transforms/quantize_weights_test.cc
index cd5feed358..e1a105bdd3 100644
--- a/tensorflow/tools/graph_transforms/quantize_weights_test.cc
+++ b/tensorflow/tools/graph_transforms/quantize_weights_test.cc
@@ -35,51 +35,46 @@ Status QuantizeWeights(const GraphDef& input_graph_def,
 
 class QuantizeWeightsTest : public ::testing::Test {
  protected:
-  void TestQuantizeWeights() {
+  void BuildGraphDef(const TensorShape& input_shape,
+                     std::initializer_list<float> input_values,
+                     const TensorShape& weight_shape,
+                     std::initializer_list<float> weight_values,
+                     GraphDef* original_graph_def) {
     auto root = tensorflow::Scope::NewRootScope();
-    using namespace ::tensorflow::ops;  // NOLINT(build/namespaces)
 
-    Tensor input_data(DT_FLOAT, TensorShape({1, 1, 6, 2}));
-    test::FillValues<float>(
-        &input_data, {1.0f, 4.0f, 2.0f, 5.0f, 3.0f, 6.0f, -1.0f, -4.0f, -2.0f,
-                      -5.0f, -3.0f, -6.0f});
+    Tensor input_data(DT_FLOAT, input_shape);
+    test::FillValues<float>(&input_data, input_values);
     Output input_op =
-        Const(root.WithOpName("input_op"), Input::Initializer(input_data));
+        ops::Const(root.WithOpName("input_op"), Input::Initializer(input_data));
 
-    Tensor weights_data(DT_FLOAT, TensorShape({1, 2, 2, 10}));
-    test::FillValues<float>(
-        &weights_data,
-        {1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f,
-         3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f,
-         0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f,
-         0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f});
-    Output weights_op =
-        Const(root.WithOpName("weights_op"), Input::Initializer(weights_data));
+    Tensor weights_data(DT_FLOAT, weight_shape);
+    test::FillValues<float>(&weights_data, weight_values);
+    Output weights_op = ops::Const(root.WithOpName("weights_op"),
+                                   Input::Initializer(weights_data));
 
-    Output conv_op = Conv2D(root.WithOpName("output"), input_op, weights_op,
-                            {1, 1, 1, 1}, "VALID");
+    Output conv_op = ops::Conv2D(root.WithOpName("output"), input_op,
+                                 weights_op, {1, 1, 1, 1}, "VALID");
 
-    GraphDef original_graph_def;
-    TF_ASSERT_OK(root.ToGraphDef(&original_graph_def));
+    TF_ASSERT_OK(root.ToGraphDef(original_graph_def));
+  }
 
-    std::unique_ptr<Session> original_session(NewSession(SessionOptions()));
-    TF_ASSERT_OK(original_session->Create(original_graph_def));
-    std::vector<Tensor> original_outputs;
-    TF_ASSERT_OK(original_session->Run({}, {"output"}, {}, &original_outputs));
+  void TestQuantizeWeights() {
+    GraphDef original_graph_def;
+    BuildGraphDef({1, 1, 6, 2},
+                  {1.0f, 4.0f, 2.0f, 5.0f, 3.0f, 6.0f, -1.0f, -4.0f, -2.0f,
+                   -5.0f, -3.0f, -6.0f},
+                  {1, 2, 2, 10},
+                  {1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f,
+                   3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f,
+                   0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f,
+                   0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f},
+                  &original_graph_def);
 
     GraphDef quantized_graph_def;
     TF_ASSERT_OK(QuantizeWeights(original_graph_def, {{}, {"output"}},
                                  &quantized_graph_def));
 
-    std::unique_ptr<Session> quantized_session(NewSession(SessionOptions()));
-    TF_ASSERT_OK(quantized_session->Create(quantized_graph_def));
-    std::vector<Tensor> quantized_outputs;
-    TF_ASSERT_OK(
-        quantized_session->Run({}, {"output"}, {}, &quantized_outputs));
-
-    test::ExpectTensorNear<float>(original_outputs[0], quantized_outputs[0],
-                                  0.5);
-
+    // Verify the structure of the quantized graph.
     std::map<string, const NodeDef*> node_lookup;
     MapNamesToNodes(quantized_graph_def, &node_lookup);
     EXPECT_EQ(1, node_lookup.count("input_op"));
@@ -94,10 +89,69 @@ class QuantizeWeightsTest : public ::testing::Test {
     const NodeDef* q_weights_const = node_lookup.at(weights_const_name);
     EXPECT_EQ("Const", q_weights_const->op());
     EXPECT_EQ(DT_QUINT8, q_weights_const->attr().at("dtype").type());
+
+    // Run the the original graph.
+    std::unique_ptr<Session> original_session(NewSession(SessionOptions()));
+    TF_ASSERT_OK(original_session->Create(original_graph_def));
+    std::vector<Tensor> original_outputs;
+    TF_ASSERT_OK(original_session->Run({}, {"output"}, {}, &original_outputs));
+
+    // Run the the quantized graph.
+    std::unique_ptr<Session> quantized_session(NewSession(SessionOptions()));
+    TF_ASSERT_OK(quantized_session->Create(quantized_graph_def));
+    std::vector<Tensor> quantized_outputs;
+    TF_ASSERT_OK(
+        quantized_session->Run({}, {"output"}, {}, &quantized_outputs));
+
+    // Compare the results
+    test::ExpectTensorNear<float>(original_outputs[0], quantized_outputs[0],
+                                  0.5);
   }
 };
 
 TEST_F(QuantizeWeightsTest, TestQuantizeWeights) { TestQuantizeWeights(); }
 
+TEST_F(QuantizeWeightsTest, RangesAlwaysIncludeZero) {
+  GraphDef original_graph_def;
+  BuildGraphDef({1, 1, 4, 4},
+                {-1.0f, -4.0f, -2.0f, -5.0f, -1.0f, -4.0f, -2.0f, -5.0f, -1.0f,
+                 -4.0f, -2.0f, -5.0f, -1.0f, -4.0f, -2.0f, -5.0f},
+                {1, 2, 2, 10},
+                {1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f,
+                 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f,
+                 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f,
+                 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f},
+                &original_graph_def);
+  GraphDef quantized_graph_def;
+  TF_ASSERT_OK(QuantizeWeights(original_graph_def, {{}, {"output"}},
+                               &quantized_graph_def));
+
+  std::map<string, const NodeDef*> node_lookup;
+  MapNamesToNodes(quantized_graph_def, &node_lookup);
+
+  auto expected_tensor = [](float value) {
+    Tensor tensor(DT_FLOAT, TensorShape({}));
+    test::FillValues<float>(&tensor, {value});
+    return tensor;
+  };
+  auto existing_tensor = [&node_lookup](string op) {
+    const NodeDef* node_def = node_lookup.at(op);
+    CHECK(node_def);
+    return GetNodeTensorAttr(*node_def, "value");
+  };
+
+  // The max of input_op is moved from -1.0 to 0.0.
+  test::ExpectTensorNear<float>(
+      expected_tensor(-5.0), existing_tensor("input_op_quantized_min"), 1e-5);
+  test::ExpectTensorNear<float>(
+      expected_tensor(0.0), existing_tensor("input_op_quantized_max"), 1e-5);
+
+  // The min of weights_op is moved from 0.1 to 0.0.
+  test::ExpectTensorNear<float>(
+      expected_tensor(0.0), existing_tensor("weights_op_quantized_min"), 1e-5);
+  test::ExpectTensorNear<float>(
+      expected_tensor(4.0), existing_tensor("weights_op_quantized_max"), 1e-5);
+}
+
 }  // namespace graph_transforms
 }  // namespace tensorflow
-- 
GitLab


From c76241258a566b82ac3cdd57fdfaab353d89b8f1 Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Wed, 5 Apr 2017 13:35:02 -0800
Subject: [PATCH 0148/1563] Remove Keras config file saving. Change: 152306552

---
 .../contrib/keras/python/keras/backend.py     | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index d149138796..1882ae35f5 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -3625,23 +3625,3 @@ if os.path.exists(_config_path):
   set_floatx(_floatx)
   set_epsilon(_epsilon)
   set_image_data_format(_image_data_format)
-
-# Save config file.
-if os.access(_keras_base_dir, os.W_OK):
-  if not os.path.exists(_keras_dir):
-    try:
-      os.makedirs(_keras_dir)
-    except OSError:
-      # Except potential race conditions
-      # in multi-threaded environments.
-      pass
-
-  if not os.path.exists(_config_path):
-    _config = {
-        'floatx': floatx(),
-        'epsilon': epsilon(),
-        'backend': 'tensorflow',
-        'image_data_format': image_data_format()
-    }
-    with open(_config_path, 'w') as f:
-      f.write(json.dumps(_config, indent=4))
-- 
GitLab


From 06c622b321e7b2ebf12cb1c208649efacab71166 Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Wed, 5 Apr 2017 14:05:45 -0800
Subject: [PATCH 0149/1563] API backwards compatibility tests. Change:
 152310869

---
 tensorflow/BUILD                              |    3 +
 tensorflow/tools/api/golden/BUILD             |   24 +
 .../tensorflow.-aggregation-method.pbtxt      |   24 +
 .../tensorflow.-attr-value.-list-value.pbtxt  |  108 +
 .../api/golden/tensorflow.-attr-value.pbtxt   |  120 +
 ...orflow.-conditional-accumulator-base.pbtxt |   29 +
 .../tensorflow.-conditional-accumulator.pbtxt |   38 +
 ...ow.-config-proto.-device-count-entry.pbtxt |   84 +
 .../api/golden/tensorflow.-config-proto.pbtxt |  132 ++
 .../tools/api/golden/tensorflow.-d-type.pbtxt |   77 +
 .../api/golden/tensorflow.-device-spec.pbtxt  |   37 +
 .../api/golden/tensorflow.-dimension.pbtxt    |   25 +
 .../tools/api/golden/tensorflow.-event.pbtxt  |  112 +
 .../golden/tensorflow.-f-i-f-o-queue.pbtxt    |   62 +
 .../tensorflow.-fixed-len-feature.pbtxt       |   27 +
 ...nsorflow.-fixed-len-sequence-feature.pbtxt |   31 +
 ...nsorflow.-fixed-length-record-reader.pbtxt |   46 +
 .../golden/tensorflow.-g-p-u-options.pbtxt    |  104 +
 .../api/golden/tensorflow.-graph-def.pbtxt    |   92 +
 .../api/golden/tensorflow.-graph-keys.pbtxt   |  136 ++
 .../golden/tensorflow.-graph-options.pbtxt    |  112 +
 .../tools/api/golden/tensorflow.-graph.pbtxt  |  129 ++
 .../golden/tensorflow.-histogram-proto.pbtxt  |  104 +
 .../golden/tensorflow.-identity-reader.pbtxt  |   46 +
 .../golden/tensorflow.-indexed-slices.pbtxt   |   42 +
 .../tensorflow.-interactive-session.pbtxt     |   43 +
 .../api/golden/tensorflow.-log-message.pbtxt  |  112 +
 ...nsorflow.-name-attr-list.-attr-entry.pbtxt |   84 +
 .../golden/tensorflow.-name-attr-list.pbtxt   |   88 +
 .../tensorflow.-node-def.-attr-entry.pbtxt    |   84 +
 .../api/golden/tensorflow.-node-def.pbtxt     |  100 +
 .../api/golden/tensorflow.-op-error.pbtxt     |   29 +
 .../api/golden/tensorflow.-operation.pbtxt    |   65 +
 .../tensorflow.-optimizer-options.pbtxt       |  128 ++
 .../tensorflow.-padding-f-i-f-o-queue.pbtxt   |   62 +
 .../golden/tensorflow.-priority-queue.pbtxt   |   62 +
 .../api/golden/tensorflow.-queue-base.pbtxt   |   61 +
 .../tensorflow.-random-shuffle-queue.pbtxt    |   62 +
 .../api/golden/tensorflow.-reader-base.pbtxt  |   45 +
 .../tensorflow.-register-gradient.pbtxt       |    9 +
 .../golden/tensorflow.-rewriter-config.pbtxt  |   92 +
 .../api/golden/tensorflow.-run-metadata.pbtxt |   88 +
 .../api/golden/tensorflow.-run-options.pbtxt  |  116 +
 .../api/golden/tensorflow.-session-log.pbtxt  |  108 +
 .../api/golden/tensorflow.-session.pbtxt      |   47 +
 ...flow.-sparse-conditional-accumulator.pbtxt |   46 +
 .../golden/tensorflow.-sparse-feature.pbtxt   |   35 +
 .../tensorflow.-sparse-tensor-value.pbtxt     |   26 +
 .../golden/tensorflow.-sparse-tensor.pbtxt    |   46 +
 .../golden/tensorflow.-summary.-audio.pbtxt   |   96 +
 .../golden/tensorflow.-summary.-image.pbtxt   |   92 +
 .../golden/tensorflow.-summary.-value.pbtxt   |  108 +
 .../api/golden/tensorflow.-summary.pbtxt      |   92 +
 .../tensorflow.-t-f-record-reader.pbtxt       |   46 +
 .../api/golden/tensorflow.-tensor-array.pbtxt |   69 +
 .../api/golden/tensorflow.-tensor-info.pbtxt  |   88 +
 .../api/golden/tensorflow.-tensor-shape.pbtxt |   73 +
 .../tools/api/golden/tensorflow.-tensor.pbtxt |   58 +
 .../golden/tensorflow.-text-line-reader.pbtxt |   46 +
 .../golden/tensorflow.-var-len-feature.pbtxt  |   19 +
 .../golden/tensorflow.-variable-scope.pbtxt   |   97 +
 ...ensorflow.-variable.-save-slice-info.pbtxt |   17 +
 .../api/golden/tensorflow.-variable.pbtxt     |  101 +
 .../tensorflow.-whole-file-reader.pbtxt       |   46 +
 .../tools/api/golden/tensorflow.app.pbtxt     |   11 +
 .../tools/api/golden/tensorflow.compat.pbtxt  |   35 +
 .../tensorflow.constant_initializer.pbtxt     |   10 +
 .../tensorflow.errors.-aborted-error.pbtxt    |   30 +
 ...sorflow.errors.-already-exists-error.pbtxt |   30 +
 .../tensorflow.errors.-cancelled-error.pbtxt  |   30 +
 .../tensorflow.errors.-data-loss-error.pbtxt  |   30 +
 ...flow.errors.-deadline-exceeded-error.pbtxt |   30 +
 ...ow.errors.-failed-precondition-error.pbtxt |   30 +
 .../tensorflow.errors.-internal-error.pbtxt   |   30 +
 ...rflow.errors.-invalid-argument-error.pbtxt |   30 +
 .../tensorflow.errors.-not-found-error.pbtxt  |   30 +
 .../golden/tensorflow.errors.-op-error.pbtxt  |   29 +
 ...ensorflow.errors.-out-of-range-error.pbtxt |   30 +
 ...flow.errors.-permission-denied-error.pbtxt |   30 +
 ...low.errors.-resource-exhausted-error.pbtxt |   30 +
 ...orflow.errors.-unauthenticated-error.pbtxt |   30 +
 ...tensorflow.errors.-unavailable-error.pbtxt |   30 +
 ...nsorflow.errors.-unimplemented-error.pbtxt |   30 +
 .../tensorflow.errors.-unknown-error.pbtxt    |   30 +
 .../tools/api/golden/tensorflow.errors.pbtxt  |  151 ++
 ...tensorflow.estimator.-estimator-spec.pbtxt |   47 +
 .../tensorflow.estimator.-estimator.pbtxt     |   37 +
 .../tensorflow.estimator.-mode-keys.pbtxt     |   20 +
 .../tensorflow.estimator.-run-config.pbtxt    |   64 +
 ...-classification-output.__metaclass__.pbtxt |   14 +
 ...imator.export.-classification-output.pbtxt |   22 +
 ....export.-export-output.__metaclass__.pbtxt |   14 +
 ...flow.estimator.export.-export-output.pbtxt |   12 +
 ...export.-predict-output.__metaclass__.pbtxt |   14 +
 ...low.estimator.export.-predict-output.pbtxt |   18 +
 ...ort.-regression-output.__metaclass__.pbtxt |   14 +
 ....estimator.export.-regression-output.pbtxt |   18 +
 ...mator.export.-serving-input-receiver.pbtxt |   23 +
 .../golden/tensorflow.estimator.export.pbtxt  |   31 +
 .../golden/tensorflow.estimator.inputs.pbtxt  |   11 +
 .../api/golden/tensorflow.estimator.pbtxt     |   27 +
 .../tensorflow.gfile.-fast-g-file.pbtxt       |   58 +
 .../api/golden/tensorflow.gfile.-g-file.pbtxt |   58 +
 .../api/golden/tensorflow.gfile.-open.pbtxt   |   58 +
 .../tools/api/golden/tensorflow.gfile.pbtxt   |   63 +
 .../api/golden/tensorflow.graph_util.pbtxt    |   23 +
 .../tensorflow.image.-resize-method.pbtxt     |   24 +
 .../tools/api/golden/tensorflow.image.pbtxt   |  175 ++
 .../tools/api/golden/tensorflow.layers.pbtxt  |   59 +
 .../tools/api/golden/tensorflow.logging.pbtxt |   83 +
 .../tools/api/golden/tensorflow.losses.pbtxt  |   63 +
 .../tools/api/golden/tensorflow.metrics.pbtxt |   99 +
 .../tools/api/golden/tensorflow.nn.pbtxt      |  323 +++
 .../golden/tensorflow.ones_initializer.pbtxt  |   10 +
 .../tensorflow.orthogonal_initializer.pbtxt   |   10 +
 tensorflow/tools/api/golden/tensorflow.pbtxt  | 1943 +++++++++++++++++
 ...thon_io.-t-f-record-compression-type.pbtxt |   20 +
 ...orflow.python_io.-t-f-record-options.pbtxt |   17 +
 ...sorflow.python_io.-t-f-record-writer.pbtxt |   17 +
 .../api/golden/tensorflow.python_io.pbtxt     |   19 +
 ...tensorflow.random_normal_initializer.pbtxt |   10 +
 ...ensorflow.random_uniform_initializer.pbtxt |   10 +
 .../golden/tensorflow.resource_loader.pbtxt   |   23 +
 ...d_model.builder.-saved-model-builder.pbtxt |   21 +
 .../tensorflow.saved_model.builder.pbtxt      |    7 +
 .../tensorflow.saved_model.constants.pbtxt    |   39 +
 .../tensorflow.saved_model.loader.pbtxt       |   11 +
 .../tensorflow.saved_model.main_op.pbtxt      |   11 +
 .../api/golden/tensorflow.saved_model.pbtxt   |   35 +
 ...flow.saved_model.signature_constants.pbtxt |   47 +
 ...flow.saved_model.signature_def_utils.pbtxt |   19 +
 ...tensorflow.saved_model.tag_constants.pbtxt |   11 +
 .../golden/tensorflow.saved_model.utils.pbtxt |    7 +
 .../tools/api/golden/tensorflow.sdca.pbtxt    |    3 +
 .../tools/api/golden/tensorflow.sets.pbtxt    |   19 +
 .../api/golden/tensorflow.spectral.pbtxt      |   51 +
 .../golden/tensorflow.summary.-event.pbtxt    |  112 +
 ...ensorflow.summary.-file-writer-cache.pbtxt |   16 +
 .../tensorflow.summary.-file-writer.pbtxt     |   50 +
 .../tensorflow.summary.-session-log.pbtxt     |  108 +
 ...sorflow.summary.-summary-description.pbtxt |   80 +
 .../tensorflow.summary.-summary.-audio.pbtxt  |   96 +
 .../tensorflow.summary.-summary.-image.pbtxt  |   92 +
 .../tensorflow.summary.-summary.-value.pbtxt  |  108 +
 .../golden/tensorflow.summary.-summary.pbtxt  |   92 +
 ...sorflow.summary.-tagged-run-metadata.pbtxt |   84 +
 .../tools/api/golden/tensorflow.summary.pbtxt |   67 +
 .../api/golden/tensorflow.sysconfig.pbtxt     |   11 +
 .../golden/tensorflow.test.-benchmark.pbtxt   |   21 +
 .../tools/api/golden/tensorflow.test.pbtxt    |   51 +
 ...tensorflow.train.-adadelta-optimizer.pbtxt |   46 +
 ...sorflow.train.-adagrad-d-a-optimizer.pbtxt |   46 +
 .../tensorflow.train.-adagrad-optimizer.pbtxt |   46 +
 .../tensorflow.train.-adam-optimizer.pbtxt    |   46 +
 .../golden/tensorflow.train.-bytes-list.pbtxt |   80 +
 ...sorflow.train.-checkpoint-saver-hook.pbtxt |   30 +
 ...sorflow.train.-chief-session-creator.pbtxt |   14 +
 .../tensorflow.train.-cluster-def.pbtxt       |   80 +
 .../tensorflow.train.-cluster-spec.pbtxt      |   37 +
 .../tensorflow.train.-coordinator.pbtxt       |   45 +
 .../golden/tensorflow.train.-example.pbtxt    |   80 +
 ...ow.train.-exponential-moving-average.pbtxt |   25 +
 .../tensorflow.train.-feature-list.pbtxt      |   80 +
 ...n.-feature-lists.-feature-list-entry.pbtxt |   84 +
 .../tensorflow.train.-feature-lists.pbtxt     |   84 +
 .../golden/tensorflow.train.-feature.pbtxt    |   88 +
 ...rflow.train.-features.-feature-entry.pbtxt |   84 +
 .../golden/tensorflow.train.-features.pbtxt   |   84 +
 .../tensorflow.train.-feed-fn-hook.pbtxt      |   30 +
 .../tensorflow.train.-final-ops-hook.pbtxt    |   34 +
 .../golden/tensorflow.train.-float-list.pbtxt |   80 +
 .../tensorflow.train.-ftrl-optimizer.pbtxt    |   46 +
 ...rflow.train.-global-step-waiter-hook.pbtxt |   30 +
 ...ow.train.-gradient-descent-optimizer.pbtxt |   46 +
 .../golden/tensorflow.train.-int64-list.pbtxt |   80 +
 ...nsorflow.train.-job-def.-tasks-entry.pbtxt |   84 +
 .../golden/tensorflow.train.-job-def.pbtxt    |   88 +
 ...ensorflow.train.-logging-tensor-hook.pbtxt |   30 +
 .../tensorflow.train.-looper-thread.pbtxt     |   73 +
 ...tensorflow.train.-momentum-optimizer.pbtxt |   46 +
 .../tensorflow.train.-monitored-session.pbtxt |   26 +
 ...rain.-nan-loss-during-training-error.pbtxt |   16 +
 .../tensorflow.train.-nan-tensor-hook.pbtxt   |   30 +
 .../golden/tensorflow.train.-optimizer.pbtxt  |   45 +
 ...ow.train.-proximal-adagrad-optimizer.pbtxt |   46 +
 ...-proximal-gradient-descent-optimizer.pbtxt |   46 +
 .../tensorflow.train.-queue-runner.pbtxt      |   49 +
 ...nsorflow.train.-r-m-s-prop-optimizer.pbtxt |   46 +
 .../golden/tensorflow.train.-saver-def.pbtxt  |  120 +
 .../api/golden/tensorflow.train.-saver.pbtxt  |   53 +
 .../golden/tensorflow.train.-scaffold.pbtxt   |   49 +
 ...nsorflow.train.-second-or-step-timer.pbtxt |   21 +
 .../tensorflow.train.-sequence-example.pbtxt  |   84 +
 .../golden/tensorflow.train.-server-def.pbtxt |   96 +
 .../api/golden/tensorflow.train.-server.pbtxt |   29 +
 .../tensorflow.train.-session-creator.pbtxt   |   12 +
 .../tensorflow.train.-session-manager.pbtxt   |   21 +
 .../tensorflow.train.-session-run-args.pbtxt  |   27 +
 ...ensorflow.train.-session-run-context.pbtxt |   25 +
 .../tensorflow.train.-session-run-hook.pbtxt  |   28 +
 ...tensorflow.train.-session-run-values.pbtxt |   27 +
 ...ow.train.-singular-monitored-session.pbtxt |   30 +
 .../tensorflow.train.-step-counter-hook.pbtxt |   30 +
 .../tensorflow.train.-stop-at-step-hook.pbtxt |   30 +
 ...tensorflow.train.-summary-saver-hook.pbtxt |   30 +
 .../golden/tensorflow.train.-supervisor.pbtxt |  153 ++
 ...rflow.train.-sync-replicas-optimizer.pbtxt |   58 +
 ...orflow.train.-worker-session-creator.pbtxt |   14 +
 .../tools/api/golden/tensorflow.train.pbtxt   |  391 ++++
 ...low.train.queue_runner.-queue-runner.pbtxt |   49 +
 .../tensorflow.train.queue_runner.pbtxt       |   15 +
 ...sorflow.truncated_normal_initializer.pbtxt |   10 +
 ...low.uniform_unit_scaling_initializer.pbtxt |   10 +
 .../golden/tensorflow.zeros_initializer.pbtxt |   10 +
 tensorflow/tools/api/lib/BUILD                |   39 +
 tensorflow/tools/api/lib/api_objects.proto    |   31 +
 .../api/lib/python_object_to_proto_visitor.py |  165 ++
 .../tools/api/tests/API_UPDATE_WARNING.txt    |    7 +
 tensorflow/tools/api/tests/BUILD              |   43 +
 tensorflow/tools/api/tests/README.txt         |   13 +
 .../tools/api/tests/api_compatibility_test.py |  238 ++
 tensorflow/tools/common/public_api.py         |    2 +-
 222 files changed, 13975 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/tools/api/golden/BUILD
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-event.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.app.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.compat.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.layers.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.logging.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.losses.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.nn.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sets.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.test.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/lib/BUILD
 create mode 100644 tensorflow/tools/api/lib/api_objects.proto
 create mode 100644 tensorflow/tools/api/lib/python_object_to_proto_visitor.py
 create mode 100644 tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
 create mode 100644 tensorflow/tools/api/tests/BUILD
 create mode 100644 tensorflow/tools/api/tests/README.txt
 create mode 100644 tensorflow/tools/api/tests/api_compatibility_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 101d193cd6..37dc8e265f 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -304,6 +304,9 @@ filegroup(
         "//tensorflow/tensorboard/plugins/projector:all_files",
         "//tensorflow/tensorboard/plugins/text:all_files",
         "//tensorflow/tensorboard/scripts:all_files",
+        "//tensorflow/tools/api/golden:all_files",
+        "//tensorflow/tools/api/lib:all_files",
+        "//tensorflow/tools/api/tests:all_files",
         "//tensorflow/tools/common:all_files",
         "//tensorflow/tools/compatibility:all_files",
         "//tensorflow/tools/dist_test/server:all_files",
diff --git a/tensorflow/tools/api/golden/BUILD b/tensorflow/tools/api/golden/BUILD
new file mode 100644
index 0000000000..08436396a6
--- /dev/null
+++ b/tensorflow/tools/api/golden/BUILD
@@ -0,0 +1,24 @@
+# TensorFlow API backwards compatibility test goldens.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "api_golden",
+    srcs = glob(["*.pbtxt"]),
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
new file mode 100644
index 0000000000..f79029d3fe
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.AggregationMethod"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.gradients_impl.AggregationMethod\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "ADD_N"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "EXPERIMENTAL_ACCUMULATE_N"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "EXPERIMENTAL_TREE"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
new file mode 100644
index 0000000000..0fb1aaba28
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.AttrValue.ListValue"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.ListValue\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
new file mode 100644
index 0000000000..e7a3a1f02f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
@@ -0,0 +1,120 @@
+path: "tensorflow.AttrValue"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrValue\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ListValue"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "PLACEHOLDER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
new file mode 100644
index 0000000000..c9a32c16b3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.ConditionalAccumulatorBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'accumulator_ref\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
new file mode 100644
index 0000000000..d23b3bd0ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
@@ -0,0 +1,38 @@
+path: "tensorflow.ConditionalAccumulator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulator\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'conditional_accumulator\'], "
+  }
+  member_method {
+    name: "apply_grad"
+    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
new file mode 100644
index 0000000000..29bb3be35c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.ConfigProto.DeviceCountEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.DeviceCountEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
new file mode 100644
index 0000000000..805a9bdd4f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
@@ -0,0 +1,132 @@
+path: "tensorflow.ConfigProto"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.ConfigProto\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ALLOW_SOFT_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DEVICE_COUNT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEVICE_FILTERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DeviceCountEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "GPU_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTER_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTRA_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_DEVICE_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPERATION_TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PLACEMENT_PERIOD_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "RPC_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_INTER_OP_THREAD_POOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "USE_PER_SESSION_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
new file mode 100644
index 0000000000..0b5b88bba8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
@@ -0,0 +1,77 @@
+path: "tensorflow.DType"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "as_datatype_enum"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "as_numpy_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "base_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_bool"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_complex"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_floating"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_integer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_numpy_compatible"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_quantized"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_unsigned"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "limits"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "max"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "min"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "real_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "size"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'type_enum\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
new file mode 100644
index 0000000000..92e535c341
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.DeviceSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.device.DeviceSpec\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "job"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "replica"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'job\', \'replica\', \'task\', \'device_type\', \'device_index\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "from_string"
+    argspec: "args=[\'spec\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_from"
+    argspec: "args=[\'self\', \'dev\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "parse_from_string"
+    argspec: "args=[\'self\', \'spec\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_string"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt b/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
new file mode 100644
index 0000000000..a9ab27719b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.Dimension"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.tensor_shape.Dimension\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "value"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
new file mode 100644
index 0000000000..9bf8c12428
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.Event"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
new file mode 100644
index 0000000000..72cc532447
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.FIFOQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.FIFOQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'fifo_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
new file mode 100644
index 0000000000..6933814a7b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.FixedLenFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "default_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
new file mode 100644
index 0000000000..c538787951
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
@@ -0,0 +1,31 @@
+path: "tensorflow.FixedLenSequenceFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "allow_missing"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "default_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
new file mode 100644
index 0000000000..e7e36e2bb3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.FixedLengthRecordReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.FixedLengthRecordReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'record_bytes\', \'header_bytes\', \'footer_bytes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
new file mode 100644
index 0000000000..48cda623f7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
@@ -0,0 +1,104 @@
+path: "tensorflow.GPUOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GPUOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ALLOCATOR_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ALLOW_GROWTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFERRED_DELETION_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "POLLING_ACTIVE_DELAY_USECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "POLLING_INACTIVE_DELAY_MSECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VISIBLE_DEVICE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
new file mode 100644
index 0000000000..1495e847cb
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.GraphDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.graph_pb2.GraphDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LIBRARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
new file mode 100644
index 0000000000..ef2cfe3787
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
@@ -0,0 +1,136 @@
+path: "tensorflow.GraphKeys"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.GraphKeys\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "ACTIVATIONS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ASSET_FILEPATHS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "BIASES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CONCATENATED_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "COND_CONTEXT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "EVAL_STEP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GLOBAL_STEP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GLOBAL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_RESOURCES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOSSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MODEL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MOVING_AVERAGE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "QUEUE_RUNNERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "READY_FOR_LOCAL_INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "READY_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGULARIZATION_LOSSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "RESOURCES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVEABLE_OBJECTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUMMARIES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUMMARY_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TABLE_INITIALIZERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINABLE_RESOURCE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINABLE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAIN_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "UPDATE_OPS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "WEIGHTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "WHILE_CONTEXT"
+    mtype: "<type \'str\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
new file mode 100644
index 0000000000..0844f891ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.GraphOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GraphOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BUILD_COST_MODEL_AFTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BUILD_COST_MODEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENABLE_BFLOAT16_SENDRECV_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ENABLE_RECV_SCHEDULING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "INFER_SHAPES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZER_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PLACE_PRUNED_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "REWRITE_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TIMELINE_STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
new file mode 100644
index 0000000000..566456a255
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
@@ -0,0 +1,129 @@
+path: "tensorflow.Graph"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Graph\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "building_function"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "finalized"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def_versions"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "seed"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "version"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_to_collection"
+    argspec: "args=[\'self\', \'name\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_to_collections"
+    argspec: "args=[\'self\', \'names\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_graph_def"
+    argspec: "args=[\'self\', \'from_version\', \'add_shapes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "as_graph_element"
+    argspec: "args=[\'self\', \'obj\', \'allow_tensor\', \'allow_operation\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
+  }
+  member_method {
+    name: "clear_collection"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "colocate_with"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "container"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "control_dependencies"
+    argspec: "args=[\'self\', \'control_inputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "create_op"
+    argspec: "args=[\'self\', \'op_type\', \'inputs\', \'dtypes\', \'input_types\', \'name\', \'attrs\', \'op_def\', \'compute_shapes\', \'compute_device\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "device"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "finalize"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_all_collection_keys"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'self\', \'name\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection_ref"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_operation_by_name"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_operations"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_tensor_by_name"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gradient_override_map"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "is_feedable"
+    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_fetchable"
+    argspec: "args=[\'self\', \'tensor_or_op\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "name_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "prevent_feeding"
+    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "prevent_fetching"
+    argspec: "args=[\'self\', \'op\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "unique_name"
+    argspec: "args=[\'self\', \'name\', \'mark_as_used\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
new file mode 100644
index 0000000000..2567d2fe60
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
@@ -0,0 +1,104 @@
+path: "tensorflow.HistogramProto"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.HistogramProto\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BUCKET_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BUCKET_LIMIT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MAX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MIN_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUM_SQUARES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
new file mode 100644
index 0000000000..2eda320d63
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.IdentityReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.IdentityReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt b/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
new file mode 100644
index 0000000000..fee84d8530
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
@@ -0,0 +1,42 @@
+path: "tensorflow.IndexedSlices"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.IndexedSlices\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'values\', \'indices\', \'dense_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
new file mode 100644
index 0000000000..623f4b1a27
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
@@ -0,0 +1,43 @@
+path: "tensorflow.InteractiveSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.client.session.InteractiveSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "sess_str"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "partial_run"
+    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "partial_run_setup"
+    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
new file mode 100644
index 0000000000..a43c5eb7e3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.LogMessage"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.LogMessage\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEBUGGING"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ERROR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FATAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INFO"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Level"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNKNOWN"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WARN"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
new file mode 100644
index 0000000000..2750bd780c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.NameAttrList.AttrEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
new file mode 100644
index 0000000000..d10faf67d0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.NameAttrList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.NameAttrList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AttrEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
new file mode 100644
index 0000000000..b1b62d60f1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.NodeDef.AttrEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.AttrEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
new file mode 100644
index 0000000000..b812b4df2b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
@@ -0,0 +1,100 @@
+path: "tensorflow.NodeDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.NodeDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AttrEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DEVICE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "INPUT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
new file mode 100644
index 0000000000..7e59615534
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.OpError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
new file mode 100644
index 0000000000..0f43a49ee9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
@@ -0,0 +1,65 @@
+path: "tensorflow.Operation"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Operation\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "control_inputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "inputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "outputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "traceback"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "type"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'g\', \'inputs\', \'output_types\', \'control_inputs\', \'input_types\', \'original_op\', \'op_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "colocation_groups"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_attr"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "values"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
new file mode 100644
index 0000000000..5dd1ee47c9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
@@ -0,0 +1,128 @@
+path: "tensorflow.OptimizerOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.OptimizerOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DO_COMMON_SUBEXPRESSION_ELIMINATION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_CONSTANT_FOLDING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_FUNCTION_INLINING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "GLOBAL_JIT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GlobalJitLevel"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "L0"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "L1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Level"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "OFF"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ON_1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ON_2"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
new file mode 100644
index 0000000000..1bfe723ce7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.PaddingFIFOQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PaddingFIFOQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'padding_fifo_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
new file mode 100644
index 0000000000..dbe25f3a5b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.PriorityQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PriorityQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'types\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'priority_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
new file mode 100644
index 0000000000..9263d73a51
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
@@ -0,0 +1,61 @@
+path: "tensorflow.QueueBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtypes\', \'shapes\', \'names\', \'queue_ref\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
new file mode 100644
index 0000000000..ec783ffe5a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.RandomShuffleQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.RandomShuffleQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'min_after_dequeue\', \'dtypes\', \'shapes\', \'names\', \'seed\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'random_shuffle_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
new file mode 100644
index 0000000000..f6a3ce76a1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.ReaderBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'reader_ref\', \'supports_serialize\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt b/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
new file mode 100644
index 0000000000..4d6e4137d1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
@@ -0,0 +1,9 @@
+path: "tensorflow.RegisterGradient"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.RegisterGradient\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
new file mode 100644
index 0000000000..529a9cbd87
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.RewriterConfig"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.rewriter_config_pb2.RewriterConfig\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONSTANT_FOLDING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DISABLE_MODEL_PRUNING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "OPTIMIZERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZE_TENSOR_LAYOUT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
new file mode 100644
index 0000000000..808fa0fa21
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.RunMetadata"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunMetadata\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COST_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_STATS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
new file mode 100644
index 0000000000..5ad6804a78
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
@@ -0,0 +1,116 @@
+path: "tensorflow.RunOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEBUG_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FULL_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "HARDWARE_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTER_OP_THREAD_POOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NO_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OUTPUT_PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SOFTWARE_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TRACE_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TraceLevel"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
new file mode 100644
index 0000000000..ec66d7f335
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.SessionLog"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CHECKPOINT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "START"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_UNSPECIFIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STOP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SessionStatus"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
new file mode 100644
index 0000000000..f5c597548f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.Session"
+tf_class {
+  is_instance: "<class \'tensorflow.python.client.session.Session\'>"
+  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "sess_str"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "partial_run"
+    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "partial_run_setup"
+    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'target\', \'containers\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
new file mode 100644
index 0000000000..2260279ad2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.SparseConditionalAccumulator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.SparseConditionalAccumulator\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'sparse_conditional_accumulator\'], "
+  }
+  member_method {
+    name: "apply_grad"
+    argspec: "args=[\'self\', \'grad_indices\', \'grad_values\', \'grad_shape\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
+  }
+  member_method {
+    name: "apply_indexed_slices_grad"
+    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_indexed_slices_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
new file mode 100644
index 0000000000..d875394fb5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.SparseFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "already_sorted"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "index_key"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "size"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "value_key"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
new file mode 100644
index 0000000000..d33fd4d5d7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
@@ -0,0 +1,26 @@
+path: "tensorflow.SparseTensorValue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensorValue\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
new file mode 100644
index 0000000000..eac236d498
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.SparseTensor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensor\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'indices\', \'values\', \'dense_shape\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "from_value"
+    argspec: "args=[\'cls\', \'sparse_tensor_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
new file mode 100644
index 0000000000..781010d75e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.Summary.Audio"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
new file mode 100644
index 0000000000..feb9c7ee92
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.Summary.Image"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
new file mode 100644
index 0000000000..d02fb9ecd4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.Summary.Value"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
new file mode 100644
index 0000000000..38de17fa9e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.Summary"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "Audio"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "Image"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
new file mode 100644
index 0000000000..cdf7937391
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.TFRecordReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.TFRecordReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'options\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
new file mode 100644
index 0000000000..a0fad4df52
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
@@ -0,0 +1,69 @@
+path: "tensorflow.TensorArray"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.tensor_array_ops.TensorArray\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "flow"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "handle"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'size\', \'dynamic_size\', \'clear_after_read\', \'tensor_array_name\', \'handle\', \'flow\', \'infer_shape\', \'element_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "concat"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "gather"
+    argspec: "args=[\'self\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "grad"
+    argspec: "args=[\'self\', \'source\', \'flow\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "identity"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'index\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scatter"
+    argspec: "args=[\'self\', \'indices\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "split"
+    argspec: "args=[\'self\', \'value\', \'lengths\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "stack"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unstack"
+    argspec: "args=[\'self\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'index\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
new file mode 100644
index 0000000000..87632fb7b9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.TensorInfo"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.TensorInfo\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DTYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
new file mode 100644
index 0000000000..d5b9cb8f5e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
@@ -0,0 +1,73 @@
+path: "tensorflow.TensorShape"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.tensor_shape.TensorShape\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dims"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ndims"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dims\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_list"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_proto"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_has_rank"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_fully_defined"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_same_rank"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "concatenate"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_fully_defined"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_elements"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank_at_least"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank_at_most"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
new file mode 100644
index 0000000000..38d19bb537
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.Tensor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Tensor\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "OVERLOADABLE_OPERATORS"
+    mtype: "<type \'set\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "value_index"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'op\', \'value_index\', \'dtype\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "consumers"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_shape"
+    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
new file mode 100644
index 0000000000..e9779f0762
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.TextLineReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.TextLineReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'skip_header_lines\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
new file mode 100644
index 0000000000..54b66f43f8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.VarLenFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
new file mode 100644
index 0000000000..c9b2dfd677
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
@@ -0,0 +1,97 @@
+path: "tensorflow.VariableScope"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variable_scope.VariableScope\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "caching_device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "custom_getter"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initializer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "original_name_scope"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "partitioner"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "regularizer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "reuse"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "use_resource"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'reuse\', \'name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'name_scope\', \'dtype\', \'use_resource\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\', \'None\', \'None\', \'None\', \'\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_variable"
+    argspec: "args=[\'self\', \'var_store\', \'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'reuse\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "global_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reuse_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_caching_device"
+    argspec: "args=[\'self\', \'caching_device\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_custom_getter"
+    argspec: "args=[\'self\', \'custom_getter\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_dtype"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_initializer"
+    argspec: "args=[\'self\', \'initializer\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_partitioner"
+    argspec: "args=[\'self\', \'partitioner\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_regularizer"
+    argspec: "args=[\'self\', \'regularizer\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_use_resource"
+    argspec: "args=[\'self\', \'use_resource\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "trainable_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
new file mode 100644
index 0000000000..ac3ccd468b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.Variable.SaveSliceInfo"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variables.SaveSliceInfo\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "spec"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'full_name\', \'full_shape\', \'var_offset\', \'var_shape\', \'save_slice_info_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
new file mode 100644
index 0000000000..d67a2713f7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
@@ -0,0 +1,101 @@
+path: "tensorflow.Variable"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variables.Variable\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "SaveSliceInfo"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initial_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initializer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'initial_value\', \'trainable\', \'collections\', \'validate_shape\', \'caching_device\', \'name\', \'variable_def\', \'dtype\', \'expected_shape\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'True\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign"
+    argspec: "args=[\'self\', \'value\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "assign_add"
+    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "assign_sub"
+    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "count_up_to"
+    argspec: "args=[\'self\', \'limit\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'variable_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "initialized_value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load"
+    argspec: "args=[\'self\', \'value\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "scatter_sub"
+    argspec: "args=[\'self\', \'sparse_delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "set_shape"
+    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
new file mode 100644
index 0000000000..4ac759891c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.WholeFileReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.WholeFileReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.app.pbtxt b/tensorflow/tools/api/golden/tensorflow.app.pbtxt
new file mode 100644
index 0000000000..85044a8987
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.app.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.app"
+tf_module {
+  member {
+    name: "flags"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'main\', \'argv\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.compat.pbtxt b/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
new file mode 100644
index 0000000000..ccc6031400
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.compat"
+tf_module {
+  member {
+    name: "bytes_or_text_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "complex_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "integral_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "real_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member_method {
+    name: "as_bytes"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+  member_method {
+    name: "as_str"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+  member_method {
+    name: "as_str_any"
+    argspec: "args=[\'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_text"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
new file mode 100644
index 0000000000..d34bfe5147
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.constant_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Constant\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\', \'dtype\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'0\', \"<dtype: \'float32\'>\", \'False\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
new file mode 100644
index 0000000000..ea9186b0b9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.AbortedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.AbortedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
new file mode 100644
index 0000000000..4e155081dd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.AlreadyExistsError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.AlreadyExistsError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
new file mode 100644
index 0000000000..b02a0e023a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.CancelledError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.CancelledError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
new file mode 100644
index 0000000000..c1fa66342a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.DataLossError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.DataLossError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
new file mode 100644
index 0000000000..8e03793619
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.DeadlineExceededError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.DeadlineExceededError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
new file mode 100644
index 0000000000..384d4b534c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.FailedPreconditionError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.FailedPreconditionError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
new file mode 100644
index 0000000000..ac5c4d7879
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.InternalError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.InternalError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
new file mode 100644
index 0000000000..161edd4a7c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.InvalidArgumentError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.InvalidArgumentError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
new file mode 100644
index 0000000000..1e64730ac6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.NotFoundError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.NotFoundError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
new file mode 100644
index 0000000000..b1f14c0457
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.errors.OpError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
new file mode 100644
index 0000000000..6365e47286
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.OutOfRangeError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OutOfRangeError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
new file mode 100644
index 0000000000..dc8a66f9ea
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.PermissionDeniedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.PermissionDeniedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
new file mode 100644
index 0000000000..85bb384b46
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.ResourceExhaustedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.ResourceExhaustedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
new file mode 100644
index 0000000000..d57d7ac2f2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnauthenticatedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnauthenticatedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
new file mode 100644
index 0000000000..cc33e6ed8d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnavailableError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnavailableError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
new file mode 100644
index 0000000000..b8c2e22dbd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnimplementedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnimplementedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
new file mode 100644
index 0000000000..8ffcfae95b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnknownError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnknownError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=[\'2\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
new file mode 100644
index 0000000000..0ad1c19603
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
@@ -0,0 +1,151 @@
+path: "tensorflow.errors"
+tf_module {
+  member {
+    name: "ABORTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ALREADY_EXISTS"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AbortedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AlreadyExistsError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "CANCELLED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CancelledError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DATA_LOSS"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEADLINE_EXCEEDED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DataLossError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DeadlineExceededError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FAILED_PRECONDITION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FailedPreconditionError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "INTERNAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INVALID_ARGUMENT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "InternalError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "InvalidArgumentError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NOT_FOUND"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NotFoundError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OK"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OUT_OF_RANGE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OpError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OutOfRangeError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "PERMISSION_DENIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PermissionDeniedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RESOURCE_EXHAUSTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ResourceExhaustedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UNAUTHENTICATED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNAVAILABLE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNIMPLEMENTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNKNOWN"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UnauthenticatedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnavailableError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnimplementedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnknownError"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "error_code_from_exception_type"
+    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "exception_type_from_error_code"
+    argspec: "args=[\'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "raise_exception_on_not_ok_status"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
new file mode 100644
index 0000000000..5dbfe21726
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.estimator.EstimatorSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "eval_metric_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "export_outputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "loss"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "predictions"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "scaffold"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "train_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "training_chief_hooks"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "training_hooks"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
new file mode 100644
index 0000000000..7a769fd546
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.estimator.Estimator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.estimator.Estimator\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "config"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "model_dir"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "params"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'model_fn\', \'model_dir\', \'config\', \'params\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "evaluate"
+    argspec: "args=[\'self\', \'input_fn\', \'steps\', \'hooks\', \'checkpoint_path\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "export_savedmodel"
+    argspec: "args=[\'self\', \'export_dir_base\', \'serving_input_receiver_fn\', \'assets_extra\', \'as_text\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "predict"
+    argspec: "args=[\'self\', \'input_fn\', \'predict_keys\', \'hooks\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "train"
+    argspec: "args=[\'self\', \'input_fn\', \'hooks\', \'steps\', \'max_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
new file mode 100644
index 0000000000..6a1c24fa63
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
@@ -0,0 +1,20 @@
+path: "tensorflow.estimator.ModeKeys"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.ModeKeys\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "EVAL"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAIN"
+    mtype: "<type \'str\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
new file mode 100644
index 0000000000..5f3dee5b40
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
@@ -0,0 +1,64 @@
+path: "tensorflow.estimator.RunConfig"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.run_config.RunConfig\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cluster_spec"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "evaluation_master"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_chief"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "keep_checkpoint_every_n_hours"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "keep_checkpoint_max"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "master"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "num_ps_replicas"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "num_worker_replicas"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_checkpoints_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_checkpoints_steps"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_summary_steps"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task_id"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task_type"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "tf_random_seed"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..3cf7af8da9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.ClassificationOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
new file mode 100644
index 0000000000..2df1840c4a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
@@ -0,0 +1,22 @@
+path: "tensorflow.estimator.export.ClassificationOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ClassificationOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "classes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "scores"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scores\', \'classes\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..5d165ccbf9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.ExportOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
new file mode 100644
index 0000000000..fa62e8ced8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
@@ -0,0 +1,12 @@
+path: "tensorflow.estimator.export.ExportOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..743495ba98
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.PredictOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
new file mode 100644
index 0000000000..e0160b10ce
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
@@ -0,0 +1,18 @@
+path: "tensorflow.estimator.export.PredictOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.PredictOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "outputs"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'outputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..dbf4e3dec8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.RegressionOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
new file mode 100644
index 0000000000..905f0e0553
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
@@ -0,0 +1,18 @@
+path: "tensorflow.estimator.export.RegressionOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.RegressionOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "value"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
new file mode 100644
index 0000000000..0d9e044308
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.estimator.export.ServingInputReceiver"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "features"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "receiver_tensors"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
new file mode 100644
index 0000000000..4d0dddb3bc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
@@ -0,0 +1,31 @@
+path: "tensorflow.estimator.export"
+tf_module {
+  member {
+    name: "ClassificationOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "ExportOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "PredictOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "RegressionOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "ServingInputReceiver"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "build_parsing_serving_input_receiver_fn"
+    argspec: "args=[\'feature_spec\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "build_raw_serving_input_receiver_fn"
+    argspec: "args=[\'features\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
new file mode 100644
index 0000000000..b318fea1f8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.estimator.inputs"
+tf_module {
+  member_method {
+    name: "numpy_input_fn"
+    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\'], "
+  }
+  member_method {
+    name: "pandas_input_fn"
+    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\', \'target_column\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\', \'target\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
new file mode 100644
index 0000000000..0d5dc73271
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.estimator"
+tf_module {
+  member {
+    name: "Estimator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "EstimatorSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ModeKeys"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RunConfig"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "export"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "inputs"
+    mtype: "<type \'module\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
new file mode 100644
index 0000000000..41497dc869
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.FastGFile"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.FastGFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
new file mode 100644
index 0000000000..bab0f279b2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.GFile"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
new file mode 100644
index 0000000000..86e577c19a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.Open"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
new file mode 100644
index 0000000000..65b55a8b7c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
@@ -0,0 +1,63 @@
+path: "tensorflow.gfile"
+tf_module {
+  member {
+    name: "FastGFile"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GFile"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Open"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "Copy"
+    argspec: "args=[\'oldpath\', \'newpath\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "DeleteRecursively"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Exists"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Glob"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "IsDirectory"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "ListDirectory"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "MakeDirs"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "MkDir"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Remove"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Rename"
+    argspec: "args=[\'oldname\', \'newname\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "Stat"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Walk"
+    argspec: "args=[\'top\', \'in_order\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt b/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
new file mode 100644
index 0000000000..76a2df757e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.graph_util"
+tf_module {
+  member_method {
+    name: "convert_variables_to_constants"
+    argspec: "args=[\'sess\', \'input_graph_def\', \'output_node_names\', \'variable_names_whitelist\', \'variable_names_blacklist\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "extract_sub_graph"
+    argspec: "args=[\'graph_def\', \'dest_nodes\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "must_run_on_cpu"
+    argspec: "args=[\'node\', \'pin_variables_on_cpu\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "remove_training_nodes"
+    argspec: "args=[\'input_graph\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tensor_shape_from_node_def_name"
+    argspec: "args=[\'graph\', \'input_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
new file mode 100644
index 0000000000..dbc360b13e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.image.ResizeMethod"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.image_ops_impl.ResizeMethod\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "AREA"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BICUBIC"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BILINEAR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NEAREST_NEIGHBOR"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
new file mode 100644
index 0000000000..6002f36bac
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
@@ -0,0 +1,175 @@
+path: "tensorflow.image"
+tf_module {
+  member {
+    name: "ResizeMethod"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "adjust_brightness"
+    argspec: "args=[\'image\', \'delta\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "adjust_contrast"
+    argspec: "args=[\'images\', \'contrast_factor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "adjust_gamma"
+    argspec: "args=[\'image\', \'gamma\', \'gain\'], varargs=None, keywords=None, defaults=[\'1\', \'1\'], "
+  }
+  member_method {
+    name: "adjust_hue"
+    argspec: "args=[\'image\', \'delta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "adjust_saturation"
+    argspec: "args=[\'image\', \'saturation_factor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "central_crop"
+    argspec: "args=[\'image\', \'central_fraction\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "convert_image_dtype"
+    argspec: "args=[\'image\', \'dtype\', \'saturate\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "crop_and_resize"
+    argspec: "args=[\'image\', \'boxes\', \'box_ind\', \'crop_size\', \'method\', \'extrapolation_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "crop_to_bounding_box"
+    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "decode_gif"
+    argspec: "args=[\'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_image"
+    argspec: "args=[\'contents\', \'channels\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_jpeg"
+    argspec: "args=[\'contents\', \'channels\', \'ratio\', \'fancy_upscaling\', \'try_recover_truncated\', \'acceptable_fraction\', \'dct_method\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_png"
+    argspec: "args=[\'contents\', \'channels\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "draw_bounding_boxes"
+    argspec: "args=[\'images\', \'boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "encode_jpeg"
+    argspec: "args=[\'image\', \'format\', \'quality\', \'progressive\', \'optimize_size\', \'chroma_downsampling\', \'density_unit\', \'x_density\', \'y_density\', \'xmp_metadata\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "encode_png"
+    argspec: "args=[\'image\', \'compression\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "extract_glimpse"
+    argspec: "args=[\'input\', \'size\', \'offsets\', \'centered\', \'normalized\', \'uniform_noise\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "flip_left_right"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flip_up_down"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "grayscale_to_rgb"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "hsv_to_rgb"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "non_max_suppression"
+    argspec: "args=[\'boxes\', \'scores\', \'max_output_size\', \'iou_threshold\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "pad_to_bounding_box"
+    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "per_image_standardization"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "random_brightness"
+    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_contrast"
+    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_flip_left_right"
+    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_flip_up_down"
+    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_hue"
+    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_saturation"
+    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "resize_area"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_bicubic"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_bilinear"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_image_with_crop_or_pad"
+    argspec: "args=[\'image\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "resize_images"
+    argspec: "args=[\'images\', \'size\', \'method\', \'align_corners\'], varargs=None, keywords=None, defaults=[\'0\', \'False\'], "
+  }
+  member_method {
+    name: "resize_nearest_neighbor"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rgb_to_grayscale"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rgb_to_hsv"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rot90"
+    argspec: "args=[\'image\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\'], "
+  }
+  member_method {
+    name: "sample_distorted_bounding_box"
+    argspec: "args=[\'image_size\', \'bounding_boxes\', \'seed\', \'seed2\', \'min_object_covered\', \'aspect_ratio_range\', \'area_range\', \'max_attempts\', \'use_image_if_no_bounding_boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "total_variation"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "transpose_image"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
new file mode 100644
index 0000000000..fe72e979ab
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
@@ -0,0 +1,59 @@
+path: "tensorflow.layers"
+tf_module {
+  member_method {
+    name: "average_pooling1d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "average_pooling2d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "average_pooling3d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "batch_normalization"
+    argspec: "args=[\'inputs\', \'axis\', \'momentum\', \'epsilon\', \'center\', \'scale\', \'beta_initializer\', \'gamma_initializer\', \'moving_mean_initializer\', \'moving_variance_initializer\', \'beta_regularizer\', \'gamma_regularizer\', \'training\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'-1\', \'0.99\', \'0.001\', \'True\', \'True\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'None\', \'None\', \'False\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv1d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'1\', \'valid\', \'channels_last\', \'1\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_transpose"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1, 1)\', \'valid\', \'channels_last\', \'(1, 1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dense"
+    argspec: "args=[\'inputs\', \'units\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dropout"
+    argspec: "args=[\'inputs\', \'rate\', \'noise_shape\', \'seed\', \'training\', \'name\'], varargs=None, keywords=None, defaults=[\'0.5\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling1d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling2d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling3d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "separable_conv2d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'depth_multiplier\', \'activation\', \'use_bias\', \'depthwise_initializer\', \'pointwise_initializer\', \'bias_initializer\', \'depthwise_regularizer\', \'pointwise_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'1\', \'None\', \'True\', \'None\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.logging.pbtxt b/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
new file mode 100644
index 0000000000..85bb15455d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
@@ -0,0 +1,83 @@
+path: "tensorflow.logging"
+tf_module {
+  member {
+    name: "DEBUG"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ERROR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FATAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INFO"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WARN"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "TaskLevelStatusMessage"
+    argspec: "args=[\'msg\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "debug"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "error"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "fatal"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_verbosity"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "info"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "log"
+    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "log_every_n"
+    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log_first_n"
+    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log_if"
+    argspec: "args=[\'level\', \'msg\', \'condition\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_verbosity"
+    argspec: "args=[\'v\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "vlog"
+    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "warn"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "warning"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
new file mode 100644
index 0000000000..5477ac5817
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
@@ -0,0 +1,63 @@
+path: "tensorflow.losses"
+tf_module {
+  member_method {
+    name: "absolute_difference"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "add_loss"
+    argspec: "args=[\'loss\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'losses\'], "
+  }
+  member_method {
+    name: "compute_weighted_loss"
+    argspec: "args=[\'losses\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "cosine_distance"
+    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "get_losses"
+    argspec: "args=[\'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'losses\'], "
+  }
+  member_method {
+    name: "get_regularization_loss"
+    argspec: "args=[\'scope\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'total_regularization_loss\'], "
+  }
+  member_method {
+    name: "get_regularization_losses"
+    argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_total_loss"
+    argspec: "args=[\'add_regularization_losses\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'total_loss\'], "
+  }
+  member_method {
+    name: "hinge_loss"
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "log_loss"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'epsilon\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1e-07\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "mean_pairwise_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "sigmoid_cross_entropy"
+    argspec: "args=[\'multi_class_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "softmax_cross_entropy"
+    argspec: "args=[\'onehot_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "sparse_softmax_cross_entropy"
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt b/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
new file mode 100644
index 0000000000..262d11c38e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
@@ -0,0 +1,99 @@
+path: "tensorflow.metrics"
+tf_module {
+  member_method {
+    name: "accuracy"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "auc"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'curve\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'ROC\', \'None\'], "
+  }
+  member_method {
+    name: "false_negatives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "false_positives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean"
+    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_absolute_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_cosine_distance"
+    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_iou"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_per_class_accuracy"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_relative_error"
+    argspec: "args=[\'labels\', \'predictions\', \'normalizer\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_tensor"
+    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "percentage_below"
+    argspec: "args=[\'values\', \'threshold\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "precision"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "precision_at_thresholds"
+    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall_at_thresholds"
+    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "root_mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sensitivity_at_specificity"
+    argspec: "args=[\'labels\', \'predictions\', \'specificity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_average_precision_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_precision_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "specificity_at_sensitivity"
+    argspec: "args=[\'labels\', \'predictions\', \'sensitivity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "true_positives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
new file mode 100644
index 0000000000..192ceac2dd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
@@ -0,0 +1,323 @@
+path: "tensorflow.nn"
+tf_module {
+  member_method {
+    name: "all_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "atrous_conv2d"
+    argspec: "args=[\'value\', \'filters\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "atrous_conv2d_transpose"
+    argspec: "args=[\'value\', \'filters\', \'output_shape\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "avg_pool"
+    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "avg_pool3d"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "batch_norm_with_global_normalization"
+    argspec: "args=[\'t\', \'m\', \'v\', \'beta\', \'gamma\', \'variance_epsilon\', \'scale_after_normalization\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_normalization"
+    argspec: "args=[\'x\', \'mean\', \'variance\', \'offset\', \'scale\', \'variance_epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "bias_add"
+    argspec: "args=[\'value\', \'bias\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "bidirectional_dynamic_rnn"
+    argspec: "args=[\'cell_fw\', \'cell_bw\', \'inputs\', \'sequence_length\', \'initial_state_fw\', \'initial_state_bw\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "compute_accidental_hits"
+    argspec: "args=[\'true_classes\', \'sampled_candidates\', \'num_true\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv1d"
+    argspec: "args=[\'value\', \'filters\', \'stride\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_backprop_filter"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_backprop_input"
+    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_transpose"
+    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d_backprop_filter_v2"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d_transpose"
+    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "convolution"
+    argspec: "args=[\'input\', \'filter\', \'padding\', \'strides\', \'dilation_rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "crelu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ctc_beam_search_decoder"
+    argspec: "args=[\'inputs\', \'sequence_length\', \'beam_width\', \'top_paths\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'100\', \'1\', \'True\'], "
+  }
+  member_method {
+    name: "ctc_greedy_decoder"
+    argspec: "args=[\'inputs\', \'sequence_length\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "ctc_loss"
+    argspec: "args=[\'labels\', \'inputs\', \'sequence_length\', \'preprocess_collapse_repeated\', \'ctc_merge_repeated\', \'time_major\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native_backprop_filter"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native_backprop_input"
+    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "dilation2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dropout"
+    argspec: "args=[\'x\', \'keep_prob\', \'noise_shape\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dynamic_rnn"
+    argspec: "args=[\'cell\', \'inputs\', \'sequence_length\', \'initial_state\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "elu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "embedding_lookup"
+    argspec: "args=[\'params\', \'ids\', \'partition_strategy\', \'name\', \'validate_indices\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "embedding_lookup_sparse"
+    argspec: "args=[\'params\', \'sp_ids\', \'sp_weights\', \'partition_strategy\', \'name\', \'combiner\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "erosion2d"
+    argspec: "args=[\'value\', \'kernel\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fixed_unigram_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'vocab_file\', \'distortion\', \'num_reserved_ids\', \'num_shards\', \'shard\', \'unigrams\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'\', \'1.0\', \'0\', \'1\', \'0\', \'()\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fractional_avg_pool"
+    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fractional_max_pool"
+    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fused_batch_norm"
+    argspec: "args=[\'x\', \'scale\', \'offset\', \'mean\', \'variance\', \'epsilon\', \'data_format\', \'is_training\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'0.001\', \'NHWC\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "in_top_k"
+    argspec: "args=[\'predictions\', \'targets\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "l2_loss"
+    argspec: "args=[\'t\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "l2_normalize"
+    argspec: "args=[\'x\', \'dim\', \'epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'1e-12\', \'None\'], "
+  }
+  member_method {
+    name: "learned_unigram_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "local_response_normalization"
+    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "log_poisson_loss"
+    argspec: "args=[\'targets\', \'log_input\', \'compute_full_loss\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "log_softmax"
+    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
+  }
+  member_method {
+    name: "log_uniform_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "lrn"
+    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool"
+    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool3d"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool_with_argmax"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'Targmax\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "moments"
+    argspec: "args=[\'x\', \'axes\', \'shift\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "nce_loss"
+    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'mod\', \'nce_loss\'], "
+  }
+  member_method {
+    name: "normalize_moments"
+    argspec: "args=[\'counts\', \'mean_ss\', \'variance_ss\', \'shift\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "pool"
+    argspec: "args=[\'input\', \'window_shape\', \'pooling_type\', \'padding\', \'dilation_rate\', \'strides\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_avg_pool"
+    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "quantized_conv2d"
+    argspec: "args=[\'input\', \'filter\', \'min_input\', \'max_input\', \'min_filter\', \'max_filter\', \'strides\', \'padding\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_max_pool"
+    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "quantized_relu_x"
+    argspec: "args=[\'features\', \'max_value\', \'min_features\', \'max_features\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "raw_rnn"
+    argspec: "args=[\'cell\', \'loop_fn\', \'parallel_iterations\', \'swap_memory\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "relu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "relu6"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "relu_layer"
+    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sampled_softmax_loss"
+    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'True\', \'mod\', \'sampled_softmax_loss\'], "
+  }
+  member_method {
+    name: "separable_conv2d"
+    argspec: "args=[\'input\', \'depthwise_filter\', \'pointwise_filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sigmoid_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "softmax"
+    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
+  }
+  member_method {
+    name: "softmax_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'-1\', \'None\'], "
+  }
+  member_method {
+    name: "softplus"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "softsign"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_softmax_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sufficient_statistics"
+    argspec: "args=[\'x\', \'axes\', \'shift\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "tanh"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "top_k"
+    argspec: "args=[\'input\', \'k\', \'sorted\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "uniform_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "weighted_cross_entropy_with_logits"
+    argspec: "args=[\'targets\', \'logits\', \'pos_weight\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "weighted_moments"
+    argspec: "args=[\'x\', \'axes\', \'frequency_weights\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "with_space_to_batch"
+    argspec: "args=[\'input\', \'dilation_rate\', \'padding\', \'op\', \'filter_shape\', \'spatial_dims\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "xw_plus_b"
+    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "zero_fraction"
+    argspec: "args=[\'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
new file mode 100644
index 0000000000..d84ddc6eb0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.ones_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Ones\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
new file mode 100644
index 0000000000..c8e266e70c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.orthogonal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Orthogonal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'gain\', \'dtype\', \'seed\'], varargs=None, keywords=None, defaults=[\'1.0\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
new file mode 100644
index 0000000000..2bcb2dd8f3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -0,0 +1,1943 @@
+path: "tensorflow"
+tf_module {
+  member {
+    name: "AggregationMethod"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AttrValue"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "COMPILER_VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ConditionalAccumulator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ConditionalAccumulatorBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ConfigProto"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DType"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DeviceSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Dimension"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Event"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FIFOQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLenFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLenSequenceFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLengthRecordReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GIT_VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GPUOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION_MIN_CONSUMER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION_MIN_PRODUCER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Graph"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GraphDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "GraphKeys"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GraphOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "HistogramProto"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "IdentityReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "IndexedSlices"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "InteractiveSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "LogMessage"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "NameAttrList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "NodeDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "OpError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Operation"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OptimizerOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "PaddingFIFOQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "PriorityQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "QUANTIZED_DTYPES"
+    mtype: "<type \'frozenset\'>"
+  }
+  member {
+    name: "QueueBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RandomShuffleQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ReaderBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RegisterGradient"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RewriterConfig"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "RunMetadata"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "RunOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Session"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionLog"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SparseConditionalAccumulator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseTensor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseTensorValue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Summary"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TFRecordReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Tensor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TensorArray"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TensorInfo"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TensorShape"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TextLineReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VarLenFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Variable"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "VariableScope"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "WholeFileReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "app"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "bfloat16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "bool"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "compat"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "complex128"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "complex64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "constant_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "contrib"
+    mtype: "<class \'_LazyContribLoader\'>"
+  }
+  member {
+    name: "double"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "errors"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "estimator"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "flags"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "float16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "float32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "float64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "gfile"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "graph_util"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "half"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "image"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "int16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "layers"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "logging"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "losses"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "metrics"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "newaxis"
+    mtype: "<type \'NoneType\'>"
+  }
+  member {
+    name: "nn"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "ones_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "orthogonal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "python_io"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "pywrap_tensorflow"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "qint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "qint32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "qint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "quint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "quint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "random_normal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "random_uniform_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "resource"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "resource_loader"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "saved_model"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sdca"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sets"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "spectral"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "string"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "summary"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sysconfig"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "test"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "train"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "truncated_normal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "uint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "uint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "uniform_unit_scaling_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "user_ops"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "zeros_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "Assert"
+    argspec: "args=[\'condition\', \'data\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "NoGradient"
+    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "NotDifferentiable"
+    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Print"
+    argspec: "args=[\'input_\', \'data\', \'message\', \'first_n\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "abs"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "accumulate_n"
+    argspec: "args=[\'inputs\', \'shape\', \'tensor_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "acos"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_check_numerics_ops"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_n"
+    argspec: "args=[\'inputs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_to_collection"
+    argspec: "args=[\'name\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "all_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "arg_max"
+    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "arg_min"
+    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "argmax"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "argmin"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_dtype"
+    argspec: "args=[\'type_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_string"
+    argspec: "args=[\'input\', \'precision\', \'scientific\', \'shortest\', \'width\', \'fill\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "asin"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assert_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_greater"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_greater_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_integer"
+    argspec: "args=[\'x\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_less"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_less_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_negative"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_non_negative"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_non_positive"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_none_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_positive"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_proper_iterable"
+    argspec: "args=[\'values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_rank"
+    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_rank_at_least"
+    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_same_float_dtype"
+    argspec: "args=[\'tensors\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_scalar"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assert_type"
+    argspec: "args=[\'tensor\', \'tf_type\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_variables_initialized"
+    argspec: "args=[\'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assign"
+    argspec: "args=[\'ref\', \'value\', \'validate_shape\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign_add"
+    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign_sub"
+    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "atan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_to_space"
+    argspec: "args=[\'input\', \'crops\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_to_space_nd"
+    argspec: "args=[\'input\', \'block_shape\', \'crops\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "betainc"
+    argspec: "args=[\'a\', \'b\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "bincount"
+    argspec: "args=[\'arr\', \'minlength\', \'maxlength\', \'weights\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "bitcast"
+    argspec: "args=[\'input\', \'type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "boolean_mask"
+    argspec: "args=[\'tensor\', \'mask\', \'name\'], varargs=None, keywords=None, defaults=[\'boolean_mask\'], "
+  }
+  member_method {
+    name: "broadcast_dynamic_shape"
+    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "broadcast_static_shape"
+    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "case"
+    argspec: "args=[\'pred_fn_pairs\', \'default\', \'exclusive\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'case\'], "
+  }
+  member_method {
+    name: "cast"
+    argspec: "args=[\'x\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ceil"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "check_numerics"
+    argspec: "args=[\'tensor\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cholesky"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cholesky_solve"
+    argspec: "args=[\'chol\', \'rhs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clip_by_average_norm"
+    argspec: "args=[\'t\', \'clip_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clip_by_global_norm"
+    argspec: "args=[\'t_list\', \'clip_norm\', \'use_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "clip_by_norm"
+    argspec: "args=[\'t\', \'clip_norm\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "clip_by_value"
+    argspec: "args=[\'t\', \'clip_value_min\', \'clip_value_max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "complex"
+    argspec: "args=[\'real\', \'imag\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "concat"
+    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'concat\'], "
+  }
+  member_method {
+    name: "cond"
+    argspec: "args=[\'pred\', \'fn1\', \'fn2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "confusion_matrix"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'dtype\', \'name\', \'weights\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conj"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "constant"
+    argspec: "args=[\'value\', \'dtype\', \'shape\', \'name\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'Const\', \'False\'], "
+  }
+  member_method {
+    name: "container"
+    argspec: "args=[\'container_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "control_dependencies"
+    argspec: "args=[\'control_inputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "convert_to_tensor"
+    argspec: "args=[\'value\', \'dtype\', \'name\', \'preferred_dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "convert_to_tensor_or_indexed_slices"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "convert_to_tensor_or_sparse_tensor"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "cos"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "count_nonzero"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'dtype\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \"<dtype: \'int64\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "count_up_to"
+    argspec: "args=[\'ref\', \'limit\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "create_partitioned_variables"
+    argspec: "args=[\'shape\', \'slicing\', \'initializer\', \'dtype\', \'trainable\', \'collections\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'True\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "cross"
+    argspec: "args=[\'a\', \'b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cumprod"
+    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "cumsum"
+    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "decode_base64"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_csv"
+    argspec: "args=[\'records\', \'record_defaults\', \'field_delim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_json_example"
+    argspec: "args=[\'json_examples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_raw"
+    argspec: "args=[\'bytes\', \'out_type\', \'little_endian\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "delete_session_tensor"
+    argspec: "args=[\'handle\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "depth_to_space"
+    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequantize"
+    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "deserialize_many_sparse"
+    argspec: "args=[\'serialized_sparse\', \'dtype\', \'rank\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "device"
+    argspec: "args=[\'device_name_or_function\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "diag"
+    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "diag_part"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "digamma"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "div"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "divide"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dynamic_partition"
+    argspec: "args=[\'data\', \'partitions\', \'num_partitions\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dynamic_stitch"
+    argspec: "args=[\'indices\', \'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "edit_distance"
+    argspec: "args=[\'hypothesis\', \'truth\', \'normalize\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'edit_distance\'], "
+  }
+  member_method {
+    name: "einsum"
+    argspec: "args=[\'equation\'], varargs=inputs, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "encode_base64"
+    argspec: "args=[\'input\', \'pad\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "erf"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "erfc"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "exp"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "expand_dims"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "expm1"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "extract_image_patches"
+    argspec: "args=[\'images\', \'ksizes\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "eye"
+    argspec: "args=[\'num_rows\', \'num_columns\', \'batch_shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_args"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_args_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_per_channel"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_per_channel_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fill"
+    argspec: "args=[\'dims\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fixed_size_partitioner"
+    argspec: "args=[\'num_shards\', \'axis\'], varargs=None, keywords=None, defaults=[\'0\'], "
+  }
+  member_method {
+    name: "floor"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floor_div"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floordiv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floormod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "foldl"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "foldr"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "gather"
+    argspec: "args=[\'params\', \'indices\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "gather_nd"
+    argspec: "args=[\'params\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'key\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection_ref"
+    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_default_graph"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_default_session"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_local_variable"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_seed"
+    argspec: "args=[\'op_seed\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_session_handle"
+    argspec: "args=[\'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_session_tensor"
+    argspec: "args=[\'handle\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_variable"
+    argspec: "args=[\'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_variable_scope"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "global_norm"
+    argspec: "args=[\'t_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "global_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "global_variables_initializer"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gradients"
+    argspec: "args=[\'ys\', \'xs\', \'grad_ys\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'None\', \'gradients\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "greater"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "greater_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "group"
+    argspec: "args=[], varargs=inputs, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "hessians"
+    argspec: "args=[\'ys\', \'xs\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'hessians\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "histogram_fixed_width"
+    argspec: "args=[\'values\', \'value_range\', \'nbins\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'100\', \"<dtype: \'int32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "identity"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "igamma"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "igammac"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "imag"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "import_graph_def"
+    argspec: "args=[\'graph_def\', \'input_map\', \'return_elements\', \'name\', \'op_dict\', \'producer_op_list\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "initialize_all_tables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_all_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_local_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "invert_permutation"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_finite"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_inf"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_nan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_non_decreasing"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_numeric_tensor"
+    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_strictly_increasing"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_variable_initialized"
+    argspec: "args=[\'variable\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "lbeta"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'lbeta\'], "
+  }
+  member_method {
+    name: "less"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "less_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "lgamma"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "lin_space"
+    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "linspace"
+    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "load_file_system_library"
+    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load_op_library"
+    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "local_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "local_variables_initializer"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "log1p"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_and"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_not"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_or"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_xor"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'LogicalXor\'], "
+  }
+  member_method {
+    name: "make_template"
+    argspec: "args=[\'name_\', \'func_\', \'create_scope_now_\', \'unique_name_\', \'custom_getter_\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "map_fn"
+    argspec: "args=[\'fn\', \'elems\', \'dtype\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "matching_files"
+    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matmul"
+    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'adjoint_a\', \'adjoint_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'False\', \'False\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_band_part"
+    argspec: "args=[\'input\', \'num_lower\', \'num_upper\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_determinant"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_diag"
+    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_diag_part"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_inverse"
+    argspec: "args=[\'input\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_set_diag"
+    argspec: "args=[\'input\', \'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_solve"
+    argspec: "args=[\'matrix\', \'rhs\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_solve_ls"
+    argspec: "args=[\'matrix\', \'rhs\', \'l2_regularizer\', \'fast\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_transpose"
+    argspec: "args=[\'a\', \'name\'], varargs=None, keywords=None, defaults=[\'matrix_transpose\'], "
+  }
+  member_method {
+    name: "matrix_triangular_solve"
+    argspec: "args=[\'matrix\', \'rhs\', \'lower\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maximum"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "meshgrid"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "min_max_variable_partitioner"
+    argspec: "args=[\'max_partitions\', \'axis\', \'min_slice_size\', \'bytes_per_string_element\'], varargs=None, keywords=None, defaults=[\'1\', \'0\', \'262144\', \'16\'], "
+  }
+  member_method {
+    name: "minimum"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "mod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "model_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "moving_average_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "multinomial"
+    argspec: "args=[\'logits\', \'num_samples\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "multiply"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "name_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "negative"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "no_op"
+    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "no_regularizer"
+    argspec: "args=[\'_\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "norm"
+    argspec: "args=[\'tensor\', \'ord\', \'axis\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'euclidean\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "not_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "one_hot"
+    argspec: "args=[\'indices\', \'depth\', \'on_value\', \'off_value\', \'axis\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "ones"
+    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "ones_like"
+    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "op_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "pad"
+    argspec: "args=[\'tensor\', \'paddings\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'CONSTANT\', \'None\'], "
+  }
+  member_method {
+    name: "parallel_stack"
+    argspec: "args=[\'values\', \'name\'], varargs=None, keywords=None, defaults=[\'parallel_stack\'], "
+  }
+  member_method {
+    name: "parse_example"
+    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_single_example"
+    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_single_sequence_example"
+    argspec: "args=[\'serialized\', \'context_features\', \'sequence_features\', \'example_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_tensor"
+    argspec: "args=[\'serialized\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "placeholder"
+    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "placeholder_with_default"
+    argspec: "args=[\'input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "polygamma"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "pow"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "py_func"
+    argspec: "args=[\'func\', \'inp\', \'Tout\', \'stateful\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'None\'], "
+  }
+  member_method {
+    name: "qr"
+    argspec: "args=[\'input\', \'full_matrices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantize_v2"
+    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'T\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_concat"
+    argspec: "args=[\'concat_dim\', \'values\', \'input_mins\', \'input_maxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_crop"
+    argspec: "args=[\'value\', \'size\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_gamma"
+    argspec: "args=[\'shape\', \'alpha\', \'beta\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_normal"
+    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_poisson"
+    argspec: "args=[\'lam\', \'shape\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_shuffle"
+    argspec: "args=[\'value\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_uniform"
+    argspec: "args=[\'shape\', \'minval\', \'maxval\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "range"
+    argspec: "args=[\'start\', \'limit\', \'delta\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'range\'], "
+  }
+  member_method {
+    name: "rank"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_file"
+    argspec: "args=[\'filename\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "real"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "realdiv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reciprocal"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reduce_all"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_any"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_join"
+    argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_logsumexp"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_max"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_mean"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_min"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_prod"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_sum"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "register_tensor_conversion_function"
+    argspec: "args=[\'base_type\', \'conversion_func\', \'priority\'], varargs=None, keywords=None, defaults=[\'100\'], "
+  }
+  member_method {
+    name: "report_uninitialized_variables"
+    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'report_uninitialized_variables\'], "
+  }
+  member_method {
+    name: "required_space_to_batch_paddings"
+    argspec: "args=[\'input_shape\', \'block_shape\', \'base_paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "reset_default_graph"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reshape"
+    argspec: "args=[\'tensor\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reverse"
+    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reverse_sequence"
+    argspec: "args=[\'input\', \'seq_lengths\', \'seq_axis\', \'batch_axis\', \'name\', \'seq_dim\', \'batch_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reverse_v2"
+    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rint"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "round"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rsqrt"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "saturate_cast"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scalar_mul"
+    argspec: "args=[\'scalar\', \'x\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "scan"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_add"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_div"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_mul"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd"
+    argspec: "args=[\'indices\', \'updates\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_add"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_sub"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_update"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_sub"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_update"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "segment_max"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_mean"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_min"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_prod"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_sum"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "self_adjoint_eig"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "self_adjoint_eigvals"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sequence_mask"
+    argspec: "args=[\'lengths\', \'maxlen\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'bool\'>\", \'None\'], "
+  }
+  member_method {
+    name: "serialize_many_sparse"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_sparse"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_random_seed"
+    argspec: "args=[\'seed\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setdiff1d"
+    argspec: "args=[\'x\', \'y\', \'index_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'int32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "shape"
+    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "shape_n"
+    argspec: "args=[\'input\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sign"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sin"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "slice"
+    argspec: "args=[\'input_\', \'begin\', \'size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_batch"
+    argspec: "args=[\'input\', \'paddings\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_batch_nd"
+    argspec: "args=[\'input\', \'block_shape\', \'paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_depth"
+    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_add"
+    argspec: "args=[\'a\', \'b\', \'thresh\'], varargs=None, keywords=None, defaults=[\'0\'], "
+  }
+  member_method {
+    name: "sparse_concat"
+    argspec: "args=[\'axis\', \'sp_inputs\', \'name\', \'expand_nonconcat_dim\', \'concat_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_fill_empty_rows"
+    argspec: "args=[\'sp_input\', \'default_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_mask"
+    argspec: "args=[\'a\', \'mask_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_matmul"
+    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_maximum"
+    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_merge"
+    argspec: "args=[\'sp_ids\', \'sp_values\', \'vocab_size\', \'name\', \'already_sorted\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "sparse_minimum"
+    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_placeholder"
+    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reduce_sum"
+    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reduce_sum_sparse"
+    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reorder"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_reset_shape"
+    argspec: "args=[\'sp_input\', \'new_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_reshape"
+    argspec: "args=[\'sp_input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_retain"
+    argspec: "args=[\'sp_input\', \'to_retain\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "sparse_segment_mean"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_segment_sqrt_n"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_segment_sum"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_softmax"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_split"
+    argspec: "args=[\'keyword_required\', \'sp_input\', \'num_split\', \'axis\', \'name\', \'split_dim\'], varargs=None, keywords=None, defaults=[\'KeywordRequired()\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_tensor_dense_matmul"
+    argspec: "args=[\'sp_a\', \'b\', \'adjoint_a\', \'adjoint_b\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_tensor_to_dense"
+    argspec: "args=[\'sp_input\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_to_dense"
+    argspec: "args=[\'sparse_indices\', \'output_shape\', \'sparse_values\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_to_indicator"
+    argspec: "args=[\'sp_input\', \'vocab_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_transpose"
+    argspec: "args=[\'sp_input\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "split"
+    argspec: "args=[\'value\', \'num_or_size_splits\', \'axis\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'split\'], "
+  }
+  member_method {
+    name: "sqrt"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "square"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "squared_difference"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "squeeze"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'squeeze_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "stack"
+    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'stack\'], "
+  }
+  member_method {
+    name: "stop_gradient"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "strided_slice"
+    argspec: "args=[\'input_\', \'begin\', \'end\', \'strides\', \'begin_mask\', \'end_mask\', \'ellipsis_mask\', \'new_axis_mask\', \'shrink_axis_mask\', \'var\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'0\', \'0\', \'0\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "string_join"
+    argspec: "args=[\'inputs\', \'separator\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "string_split"
+    argspec: "args=[\'source\', \'delimiter\'], varargs=None, keywords=None, defaults=[\' \'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket"
+    argspec: "args=[\'string_tensor\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket_fast"
+    argspec: "args=[\'input\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket_strong"
+    argspec: "args=[\'input\', \'num_buckets\', \'key\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_number"
+    argspec: "args=[\'string_tensor\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "substr"
+    argspec: "args=[\'input\', \'pos\', \'len\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "subtract"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "svd"
+    argspec: "args=[\'tensor\', \'full_matrices\', \'compute_uv\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "tables_initializer"
+    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'init_all_tables\'], "
+  }
+  member_method {
+    name: "tan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tanh"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tensordot"
+    argspec: "args=[\'a\', \'b\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tile"
+    argspec: "args=[\'input\', \'multiples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_bfloat16"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToBFloat16\'], "
+  }
+  member_method {
+    name: "to_double"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToDouble\'], "
+  }
+  member_method {
+    name: "to_float"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToFloat\'], "
+  }
+  member_method {
+    name: "to_int32"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt32\'], "
+  }
+  member_method {
+    name: "to_int64"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt64\'], "
+  }
+  member_method {
+    name: "trace"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "trainable_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "transpose"
+    argspec: "args=[\'a\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'transpose\'], "
+  }
+  member_method {
+    name: "truediv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "truncated_normal"
+    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "truncatediv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "truncatemod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tuple"
+    argspec: "args=[\'tensors\', \'name\', \'control_inputs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unique"
+    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unique_with_counts"
+    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unsorted_segment_max"
+    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unsorted_segment_sum"
+    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unstack"
+    argspec: "args=[\'value\', \'num\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'unstack\'], "
+  }
+  member_method {
+    name: "variable_axis_size_partitioner"
+    argspec: "args=[\'max_shard_bytes\', \'axis\', \'bytes_per_string_element\', \'max_shards\'], varargs=None, keywords=None, defaults=[\'0\', \'16\', \'None\'], "
+  }
+  member_method {
+    name: "variable_op_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "variable_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "variables_initializer"
+    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], "
+  }
+  member_method {
+    name: "verify_tensor_all_finite"
+    argspec: "args=[\'t\', \'msg\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "where"
+    argspec: "args=[\'condition\', \'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "while_loop"
+    argspec: "args=[\'cond\', \'body\', \'loop_vars\', \'shape_invariants\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "write_file"
+    argspec: "args=[\'filename\', \'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "zeros"
+    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "zeros_like"
+    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "zeta"
+    argspec: "args=[\'x\', \'q\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
new file mode 100644
index 0000000000..4941dda50e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
@@ -0,0 +1,20 @@
+path: "tensorflow.python_io.TFRecordCompressionType"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordCompressionType\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GZIP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ZLIB"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
new file mode 100644
index 0000000000..0853716023
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.python_io.TFRecordOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordOptions\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "compression_type_map"
+    mtype: "<type \'dict\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'compression_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_compression_type_string"
+    argspec: "args=[\'cls\', \'options\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
new file mode 100644
index 0000000000..af0c11ca14
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.python_io.TFRecordWriter"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordWriter\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'record\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
new file mode 100644
index 0000000000..7c9953e5fe
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.python_io"
+tf_module {
+  member {
+    name: "TFRecordCompressionType"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TFRecordOptions"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TFRecordWriter"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "tf_record_iterator"
+    argspec: "args=[\'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
new file mode 100644
index 0000000000..70308bc601
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.random_normal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomNormal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
new file mode 100644
index 0000000000..37bb1956e8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.random_uniform_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomUniform\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'minval\', \'maxval\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
new file mode 100644
index 0000000000..288b78b4cd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.resource_loader"
+tf_module {
+  member_method {
+    name: "get_data_files_path"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_path_to_datafile"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_root_dir_with_all_resources"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load_resource"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readahead_file_path"
+    argspec: "args=[\'path\', \'readahead\'], varargs=None, keywords=None, defaults=[\'128M\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
new file mode 100644
index 0000000000..56d76902fd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.saved_model.builder.SavedModelBuilder"
+tf_class {
+  is_instance: "<class \'tensorflow.python.saved_model.builder_impl.SavedModelBuilder\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'export_dir\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_meta_graph"
+    argspec: "args=[\'self\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "add_meta_graph_and_variables"
+    argspec: "args=[\'self\', \'sess\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "save"
+    argspec: "args=[\'self\', \'as_text\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
new file mode 100644
index 0000000000..adc697ad1c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
@@ -0,0 +1,7 @@
+path: "tensorflow.saved_model.builder"
+tf_module {
+  member {
+    name: "SavedModelBuilder"
+    mtype: "<type \'type\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
new file mode 100644
index 0000000000..20e10aa094
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
@@ -0,0 +1,39 @@
+path: "tensorflow.saved_model.constants"
+tf_module {
+  member {
+    name: "ASSETS_DIRECTORY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ASSETS_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LEGACY_INIT_OP_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MAIN_OP_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_FILENAME_PB"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_FILENAME_PBTXT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_SCHEMA_VERSION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VARIABLES_DIRECTORY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VARIABLES_FILENAME"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
new file mode 100644
index 0000000000..896e2160c6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.loader"
+tf_module {
+  member_method {
+    name: "load"
+    argspec: "args=[\'sess\', \'tags\', \'export_dir\'], varargs=None, keywords=saver_kwargs, defaults=None"
+  }
+  member_method {
+    name: "maybe_saved_model_directory"
+    argspec: "args=[\'export_dir\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
new file mode 100644
index 0000000000..176cb788c2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.main_op"
+tf_module {
+  member_method {
+    name: "main_op"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "main_op_with_restore"
+    argspec: "args=[\'restore_op_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
new file mode 100644
index 0000000000..5683766b28
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.saved_model"
+tf_module {
+  member {
+    name: "builder"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "loader"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "main_op"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "signature_constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "signature_def_utils"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "tag_constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "utils"
+    mtype: "<type \'module\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
new file mode 100644
index 0000000000..478d410e06
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.saved_model.signature_constants"
+tf_module {
+  member {
+    name: "CLASSIFY_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_OUTPUT_CLASSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_OUTPUT_SCORES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "DEFAULT_SERVING_SIGNATURE_DEF_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_OUTPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_OUTPUTS"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
new file mode 100644
index 0000000000..e9867d84c3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.saved_model.signature_def_utils"
+tf_module {
+  member_method {
+    name: "build_signature_def"
+    argspec: "args=[\'inputs\', \'outputs\', \'method_name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "classification_signature_def"
+    argspec: "args=[\'examples\', \'classes\', \'scores\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "predict_signature_def"
+    argspec: "args=[\'inputs\', \'outputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "regression_signature_def"
+    argspec: "args=[\'examples\', \'predictions\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
new file mode 100644
index 0000000000..7c24b7ad3c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.tag_constants"
+tf_module {
+  member {
+    name: "SERVING"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINING"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
new file mode 100644
index 0000000000..bc150e56a3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
@@ -0,0 +1,7 @@
+path: "tensorflow.saved_model.utils"
+tf_module {
+  member_method {
+    name: "build_tensor_info"
+    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
new file mode 100644
index 0000000000..7c9e6a25c7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
@@ -0,0 +1,3 @@
+path: "tensorflow.sdca"
+tf_module {
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sets.pbtxt b/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
new file mode 100644
index 0000000000..8a196b1a55
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.sets"
+tf_module {
+  member_method {
+    name: "set_difference"
+    argspec: "args=[\'a\', \'b\', \'aminusb\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
+  }
+  member_method {
+    name: "set_intersection"
+    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "set_size"
+    argspec: "args=[\'a\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "set_union"
+    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt b/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
new file mode 100644
index 0000000000..84883c1a39
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
@@ -0,0 +1,51 @@
+path: "tensorflow.spectral"
+tf_module {
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "irfft"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "irfft2d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "irfft3d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft2d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft3d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
new file mode 100644
index 0000000000..ab3449d80f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.summary.Event"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
new file mode 100644
index 0000000000..2a5b63dcea
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
@@ -0,0 +1,16 @@
+path: "tensorflow.summary.FileWriterCache"
+tf_class {
+  is_instance: "<class \'tensorflow.python.summary.writer.writer_cache.FileWriterCache\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "clear"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get"
+    argspec: "args=[\'logdir\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
new file mode 100644
index 0000000000..502c35ee7b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
@@ -0,0 +1,50 @@
+path: "tensorflow.summary.FileWriter"
+tf_class {
+  is_instance: "<class \'tensorflow.python.summary.writer.writer.FileWriter\'>"
+  is_instance: "<class \'tensorflow.python.summary.writer.writer.SummaryToEventTransformer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'logdir\', \'graph\', \'max_queue\', \'flush_secs\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'120\', \'None\'], "
+  }
+  member_method {
+    name: "add_event"
+    argspec: "args=[\'self\', \'event\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_graph"
+    argspec: "args=[\'self\', \'graph\', \'global_step\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "add_meta_graph"
+    argspec: "args=[\'self\', \'meta_graph_def\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_run_metadata"
+    argspec: "args=[\'self\', \'run_metadata\', \'tag\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_session_log"
+    argspec: "args=[\'self\', \'session_log\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_summary"
+    argspec: "args=[\'self\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_logdir"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reopen"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
new file mode 100644
index 0000000000..92ca4872ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.summary.SessionLog"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CHECKPOINT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "START"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_UNSPECIFIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STOP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SessionStatus"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
new file mode 100644
index 0000000000..f93da2196a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.summary.SummaryDescription"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.SummaryDescription\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "TYPE_HINT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
new file mode 100644
index 0000000000..605e305e82
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.summary.Summary.Audio"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
new file mode 100644
index 0000000000..0646972196
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.summary.Summary.Image"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
new file mode 100644
index 0000000000..5294b37f57
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.summary.Summary.Value"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
new file mode 100644
index 0000000000..132ef1b7d2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.summary.Summary"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "Audio"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "Image"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
new file mode 100644
index 0000000000..4dce20819d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.summary.TaggedRunMetadata"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.TaggedRunMetadata\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
new file mode 100644
index 0000000000..c3d0bea10c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
@@ -0,0 +1,67 @@
+path: "tensorflow.summary"
+tf_module {
+  member {
+    name: "Event"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FileWriter"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FileWriterCache"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionLog"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Summary"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SummaryDescription"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TaggedRunMetadata"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "audio"
+    argspec: "args=[\'name\', \'tensor\', \'sample_rate\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
+  }
+  member_method {
+    name: "get_summary_description"
+    argspec: "args=[\'node_def\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "histogram"
+    argspec: "args=[\'name\', \'values\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "image"
+    argspec: "args=[\'name\', \'tensor\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
+  }
+  member_method {
+    name: "merge"
+    argspec: "args=[\'inputs\', \'collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "merge_all"
+    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=[\'summaries\'], "
+  }
+  member_method {
+    name: "scalar"
+    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tensor_summary"
+    argspec: "args=[\'name\', \'tensor\', \'summary_description\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "text"
+    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
new file mode 100644
index 0000000000..02dec04b9c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.sysconfig"
+tf_module {
+  member_method {
+    name: "get_include"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_lib"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
new file mode 100644
index 0000000000..df528e26b6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.test.Benchmark"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.benchmark.TensorFlowBenchmark\'>"
+  is_instance: "<class \'tensorflow.python.platform.benchmark.Benchmark\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "is_abstract"
+    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "report_benchmark"
+    argspec: "args=[\'self\', \'iters\', \'cpu_time\', \'wall_time\', \'throughput\', \'extras\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "run_op_benchmark"
+    argspec: "args=[\'self\', \'sess\', \'op_or_tensor\', \'feed_dict\', \'burn_iters\', \'min_iters\', \'store_trace\', \'store_memory_usage\', \'name\', \'extras\', \'mbs\'], varargs=None, keywords=None, defaults=[\'None\', \'2\', \'10\', \'False\', \'True\', \'None\', \'None\', \'0\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
new file mode 100644
index 0000000000..c4768a68bf
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
@@ -0,0 +1,51 @@
+path: "tensorflow.test"
+tf_module {
+  member {
+    name: "Benchmark"
+    mtype: "<class \'tensorflow.python.platform.benchmark._BenchmarkRegistrar\'>"
+  }
+  member {
+    name: "TestCase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "mock"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "assert_equal_graph_def"
+    argspec: "args=[\'actual\', \'expected\', \'checkpoint_v2\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "compute_gradient"
+    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradient_error"
+    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_temp_dir"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gpu_device_name"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_built_with_cuda"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_gpu_available"
+    argspec: "args=[\'cuda_only\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "main"
+    argspec: "args=[\'argv\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "test_src_dir_path"
+    argspec: "args=[\'relative_path\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
new file mode 100644
index 0000000000..8c91c5b4d9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdadeltaOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adadelta.AdadeltaOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'rho\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.95\', \'1e-08\', \'False\', \'Adadelta\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
new file mode 100644
index 0000000000..05d38d62cc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdagradDAOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adagrad_da.AdagradDAOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'global_step\', \'initial_gradient_squared_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'AdagradDA\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
new file mode 100644
index 0000000000..19ca9f5763
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdagradOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adagrad.AdagradOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'False\', \'Adagrad\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
new file mode 100644
index 0000000000..c8144e2db7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdamOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adam.AdamOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'beta1\', \'beta2\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.9\', \'0.999\', \'1e-08\', \'False\', \'Adam\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
new file mode 100644
index 0000000000..8cf52b817f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.BytesList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.BytesList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
new file mode 100644
index 0000000000..c3037baa8c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.CheckpointSaverHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.CheckpointSaverHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'checkpoint_dir\', \'save_secs\', \'save_steps\', \'saver\', \'checkpoint_basename\', \'scaffold\', \'listeners\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'model.ckpt\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
new file mode 100644
index 0000000000..abbe273be3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.train.ChiefSessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.ChiefSessionCreator\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'checkpoint_filename_with_path\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
new file mode 100644
index 0000000000..feb73bd7d4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.ClusterDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ClusterDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "JOB_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
new file mode 100644
index 0000000000..1658b15a5f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.train.ClusterSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.server_lib.ClusterSpec\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "jobs"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'cluster\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_cluster_def"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_dict"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "job_tasks"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_tasks"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "task_address"
+    argspec: "args=[\'self\', \'job_name\', \'task_index\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "task_indices"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
new file mode 100644
index 0000000000..11277f077e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.train.Coordinator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.coordinator.Coordinator\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "joined"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'clean_stop_exception_types\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clear_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\', \'threads\', \'stop_grace_period_secs\', \'ignore_live_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'120\', \'False\'], "
+  }
+  member_method {
+    name: "raise_requested_exception"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "register_thread"
+    argspec: "args=[\'self\', \'thread\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop_on_exception"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "wait_for_stop"
+    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
new file mode 100644
index 0000000000..f7215a2037
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.Example"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.example_pb2.Example\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
new file mode 100644
index 0000000000..737acbe07c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.train.ExponentialMovingAverage"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.moving_averages.ExponentialMovingAverage\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'decay\', \'num_updates\', \'zero_debias\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'ExponentialMovingAverage\'], "
+  }
+  member_method {
+    name: "apply"
+    argspec: "args=[\'self\', \'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "average"
+    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "average_name"
+    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "variables_to_restore"
+    argspec: "args=[\'self\', \'moving_avg_variables\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
new file mode 100644
index 0000000000..3ad98354d6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.FeatureList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
new file mode 100644
index 0000000000..cd171f4ca3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.FeatureLists.FeatureListEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureListEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
new file mode 100644
index 0000000000..3d95017d58
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.FeatureLists"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureLists\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FeatureListEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
new file mode 100644
index 0000000000..9cca132bba
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.train.Feature"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Feature\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BYTES_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FLOAT_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INT64_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
new file mode 100644
index 0000000000..858aee0341
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.Features.FeatureEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
new file mode 100644
index 0000000000..49cd12153b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.Features"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Features\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FeatureEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
new file mode 100644
index 0000000000..7bec4d032c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.FeedFnHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FeedFnHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'feed_fn\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
new file mode 100644
index 0000000000..31cf9aaeb2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
@@ -0,0 +1,34 @@
+path: "tensorflow.train.FinalOpsHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FinalOpsHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "final_ops_values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'final_ops\', \'final_ops_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
new file mode 100644
index 0000000000..e3f01334b5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.FloatList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FloatList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
new file mode 100644
index 0000000000..0252474a1d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.FtrlOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.ftrl.FtrlOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'learning_rate_power\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'-0.5\', \'0.1\', \'0.0\', \'0.0\', \'False\', \'Ftrl\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
new file mode 100644
index 0000000000..147448618e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.GlobalStepWaiterHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.GlobalStepWaiterHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'wait_until_step\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
new file mode 100644
index 0000000000..bdd4c52568
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.GradientDescentOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.gradient_descent.GradientDescentOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'GradientDescent\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
new file mode 100644
index 0000000000..8917dc122c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.Int64List"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Int64List\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
new file mode 100644
index 0000000000..2d7fcbe545
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.JobDef.TasksEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.TasksEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
new file mode 100644
index 0000000000..fc5b76341d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.train.JobDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.JobDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TASKS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TasksEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
new file mode 100644
index 0000000000..e55c47b356
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.LoggingTensorHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.LoggingTensorHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'tensors\', \'every_n_iter\', \'every_n_secs\', \'formatter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
new file mode 100644
index 0000000000..c61859004e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
@@ -0,0 +1,73 @@
+path: "tensorflow.train.LooperThread"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.coordinator.LooperThread\'>"
+  is_instance: "<class \'threading.Thread\'>"
+  member {
+    name: "daemon"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ident"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "getName"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "isAlive"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "isDaemon"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_alive"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "loop"
+    argspec: "args=[\'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setDaemon"
+    argspec: "args=[\'self\', \'daemonic\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setName"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
new file mode 100644
index 0000000000..7cf5488a15
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.MomentumOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.momentum.MomentumOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'momentum\', \'use_locking\', \'name\', \'use_nesterov\'], varargs=None, keywords=None, defaults=[\'False\', \'Momentum\', \'False\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
new file mode 100644
index 0000000000..3a5cc015b4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
@@ -0,0 +1,26 @@
+path: "tensorflow.train.MonitoredSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.MonitoredSession\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'session_creator\', \'hooks\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'120\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
new file mode 100644
index 0000000000..25fd5e75a7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
@@ -0,0 +1,16 @@
+path: "tensorflow.train.NanLossDuringTrainingError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanLossDuringTrainingError\'>"
+  is_instance: "<type \'exceptions.RuntimeError\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
new file mode 100644
index 0000000000..7d1c89f9b3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.NanTensorHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanTensorHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'loss_tensor\', \'fail_on_nan_loss\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
new file mode 100644
index 0000000000..20b0c4d1b5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.train.Optimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
new file mode 100644
index 0000000000..571d846b6c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.ProximalAdagradOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.proximal_adagrad.ProximalAdagradOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'ProximalAdagrad\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
new file mode 100644
index 0000000000..1feb136e7f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.ProximalGradientDescentOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.proximal_gradient_descent.ProximalGradientDescentOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'0.0\', \'False\', \'ProximalGradientDescent\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
new file mode 100644
index 0000000000..d84d0058ee
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.QueueRunner"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cancel_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "close_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "enqueue_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "exceptions_raised"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_closed_exception_types"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_threads"
+    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
new file mode 100644
index 0000000000..2aa4ae6d2d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.RMSPropOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.rmsprop.RMSPropOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'decay\', \'momentum\', \'epsilon\', \'use_locking\', \'centered\', \'name\'], varargs=None, keywords=None, defaults=[\'0.9\', \'0.0\', \'1e-10\', \'False\', \'False\', \'RMSProp\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
new file mode 100644
index 0000000000..84498a64f5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
@@ -0,0 +1,120 @@
+path: "tensorflow.train.SaverDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.saver_pb2.SaverDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CheckpointFormatVersion"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILENAME_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "KEEP_CHECKPOINT_EVERY_N_HOURS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LEGACY"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MAX_TO_KEEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "RESTORE_OP_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAVE_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHARDED_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "V1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "V2"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
new file mode 100644
index 0000000000..7494fe1cc8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
@@ -0,0 +1,53 @@
+path: "tensorflow.train.Saver"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.saver.Saver\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "last_checkpoints"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'var_list\', \'reshape\', \'sharded\', \'max_to_keep\', \'keep_checkpoint_every_n_hours\', \'name\', \'restore_sequentially\', \'saver_def\', \'builder\', \'defer_build\', \'allow_empty\', \'write_version\', \'pad_step_number\', \'save_relative_paths\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\', \'5\', \'10000.0\', \'None\', \'False\', \'None\', \'None\', \'False\', \'False\', \'2\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "as_saver_def"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "build"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "export_meta_graph"
+    argspec: "args=[\'self\', \'filename\', \'collection_list\', \'as_text\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'saver_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "recover_last_checkpoints"
+    argspec: "args=[\'self\', \'checkpoint_paths\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "restore"
+    argspec: "args=[\'self\', \'sess\', \'save_path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "save"
+    argspec: "args=[\'self\', \'sess\', \'save_path\', \'global_step\', \'latest_filename\', \'meta_graph_suffix\', \'write_meta_graph\', \'write_state\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'meta\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "set_last_checkpoints"
+    argspec: "args=[\'self\', \'last_checkpoints\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_last_checkpoints_with_time"
+    argspec: "args=[\'self\', \'last_checkpoints_with_time\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
new file mode 100644
index 0000000000..21234fe739
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.Scaffold"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.Scaffold\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "init_feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_fn"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_for_local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "saver"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'init_op\', \'init_feed_dict\', \'init_fn\', \'ready_op\', \'ready_for_local_init_op\', \'local_init_op\', \'summary_op\', \'saver\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "finalize"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_or_default"
+    argspec: "args=[\'arg_name\', \'collection_key\', \'default_constructor\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
new file mode 100644
index 0000000000..45528d4e87
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.train.SecondOrStepTimer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SecondOrStepTimer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'every_secs\', \'every_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "last_triggered_step"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "should_trigger_for_step"
+    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "update_last_triggered_step"
+    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
new file mode 100644
index 0000000000..9ab9553702
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.SequenceExample"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.example_pb2.SequenceExample\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTEXT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_LISTS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
new file mode 100644
index 0000000000..af0a3b73cc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.train.ServerDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ServerDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CLUSTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFAULT_SESSION_CONFIG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "JOB_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PROTOCOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TASK_INDEX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
new file mode 100644
index 0000000000..9b8f185f5b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.train.Server"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.server_lib.Server\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "server_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "target"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'server_or_cluster_def\', \'job_name\', \'task_index\', \'protocol\', \'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "create_local_server"
+    argspec: "args=[\'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
new file mode 100644
index 0000000000..beb232715f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
@@ -0,0 +1,12 @@
+path: "tensorflow.train.SessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
new file mode 100644
index 0000000000..cc31bb4e4b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.train.SessionManager"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_manager.SessionManager\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'local_init_op\', \'ready_op\', \'ready_for_local_init_op\', \'graph\', \'recovery_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'30\'], "
+  }
+  member_method {
+    name: "prepare_session"
+    argspec: "args=[\'self\', \'master\', \'init_op\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\', \'init_feed_dict\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'7200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recover_session"
+    argspec: "args=[\'self\', \'master\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'7200\', \'None\'], "
+  }
+  member_method {
+    name: "wait_for_session"
+    argspec: "args=[\'self\', \'master\', \'config\', \'max_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'inf\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
new file mode 100644
index 0000000000..442990893e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.train.SessionRunArgs"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "fetches"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "options"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
new file mode 100644
index 0000000000..d5adb15c95
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.train.SessionRunContext"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunContext\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "original_args"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "stop_requested"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'original_args\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
new file mode 100644
index 0000000000..db1aa24acf
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
@@ -0,0 +1,28 @@
+path: "tensorflow.train.SessionRunHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
new file mode 100644
index 0000000000..0b401d59c4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.train.SessionRunValues"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "options"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "results"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "run_metadata"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
new file mode 100644
index 0000000000..62bfdab40b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.SingularMonitoredSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SingularMonitoredSession\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'hooks\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\', \'None\', \'None\', \'120\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "raw_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
new file mode 100644
index 0000000000..13261f6dde
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.StepCounterHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StepCounterHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'every_n_steps\', \'every_n_secs\', \'output_dir\', \'summary_writer\'], varargs=None, keywords=None, defaults=[\'100\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
new file mode 100644
index 0000000000..e388599b0b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.StopAtStepHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StopAtStepHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'num_steps\', \'last_step\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
new file mode 100644
index 0000000000..697c3667b0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.SummarySaverHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SummarySaverHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'save_steps\', \'save_secs\', \'output_dir\', \'summary_writer\', \'scaffold\', \'summary_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
new file mode 100644
index 0000000000..cc9bd5c136
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
@@ -0,0 +1,153 @@
+path: "tensorflow.train.Supervisor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.supervisor.Supervisor\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "USE_DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "coord"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "global_step"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_chief"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_for_local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_model_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_path"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_summaries_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "saver"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session_manager"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_writer"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "Loop"
+    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "PrepareSession"
+    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
+  }
+  member_method {
+    name: "RequestStop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ShouldStop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "StartQueueRunners"
+    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "StartStandardServices"
+    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Stop"
+    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "StopOnException"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "SummaryComputed"
+    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "WaitForStop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'graph\', \'ready_op\', \'ready_for_local_init_op\', \'is_chief\', \'init_op\', \'init_feed_dict\', \'local_init_op\', \'logdir\', \'summary_op\', \'saver\', \'global_step\', \'save_summaries_secs\', \'save_model_secs\', \'recovery_wait_secs\', \'stop_grace_secs\', \'checkpoint_basename\', \'session_manager\', \'summary_writer\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'True\', \'0\', \'None\', \'0\', \'None\', \'0\', \'0\', \'0\', \'120\', \'600\', \'30\', \'120\', \'model.ckpt\', \'None\', \'0\', \'None\'], "
+  }
+  member_method {
+    name: "loop"
+    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "managed_session"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "prepare_or_wait_for_session"
+    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "start_standard_services"
+    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop"
+    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "stop_on_exception"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "summary_computed"
+    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "wait_for_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
new file mode 100644
index 0000000000..915d8501af
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.train.SyncReplicasOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.sync_replicas_optimizer.SyncReplicasOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'opt\', \'replicas_to_aggregate\', \'total_num_replicas\', \'variable_averages\', \'variables_to_average\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'sync_replicas\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_chief_queue_runner"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_init_tokens_op"
+    argspec: "args=[\'self\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "make_session_run_hook"
+    argspec: "args=[\'self\', \'is_chief\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
new file mode 100644
index 0000000000..140407651a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.train.WorkerSessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.WorkerSessionCreator\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\'], "
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
new file mode 100644
index 0000000000..5f2c851719
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
@@ -0,0 +1,391 @@
+path: "tensorflow.train"
+tf_module {
+  member {
+    name: "AdadeltaOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdagradDAOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdagradOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdamOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "BytesList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "CheckpointSaverHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ChiefSessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ClusterDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "ClusterSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Coordinator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Example"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "ExponentialMovingAverage"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Feature"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeatureList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeatureLists"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Features"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeedFnHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FinalOpsHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FloatList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FtrlOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GlobalStepWaiterHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GradientDescentOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Int64List"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "JobDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "LoggingTensorHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "LooperThread"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "MomentumOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "MonitoredSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NanLossDuringTrainingError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NanTensorHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Optimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ProximalAdagradOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ProximalGradientDescentOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "QueueRunner"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RMSPropOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Saver"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SaverDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Scaffold"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SecondOrStepTimer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SequenceExample"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Server"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ServerDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionManager"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunArgs"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunContext"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunValues"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SingularMonitoredSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "StepCounterHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "StopAtStepHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SummarySaverHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Supervisor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SyncReplicasOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "WorkerSessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "queue_runner"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "MonitoredTrainingSession"
+    argspec: "args=[\'master\', \'is_chief\', \'checkpoint_dir\', \'scaffold\', \'hooks\', \'chief_only_hooks\', \'save_checkpoint_secs\', \'save_summaries_steps\', \'save_summaries_secs\', \'config\', \'stop_grace_period_secs\', \'log_step_count_steps\'], varargs=None, keywords=None, defaults=[\'\', \'True\', \'None\', \'None\', \'None\', \'None\', \'600\', \'100\', \'None\', \'None\', \'120\', \'10000\'], "
+  }
+  member_method {
+    name: "NewCheckpointReader"
+    argspec: "args=[\'filepattern\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_queue_runner"
+    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
+  }
+  member_method {
+    name: "assert_global_step"
+    argspec: "args=[\'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "basic_train_loop"
+    argspec: "args=[\'supervisor\', \'train_step_fn\', \'args\', \'kwargs\', \'master\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\'], "
+  }
+  member_method {
+    name: "batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "checkpoint_exists"
+    argspec: "args=[\'checkpoint_prefix\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "create_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "do_quantize_training_on_graphdef"
+    argspec: "args=[\'input_graph\', \'num_bits\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "exponential_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "export_meta_graph"
+    argspec: "args=[\'filename\', \'meta_info_def\', \'graph_def\', \'saver_def\', \'collection_list\', \'as_text\', \'graph\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'None\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "generate_checkpoint_state_proto"
+    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_checkpoint_mtimes"
+    argspec: "args=[\'checkpoint_prefixes\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_checkpoint_state"
+    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_or_create_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "global_step"
+    argspec: "args=[\'sess\', \'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "import_meta_graph"
+    argspec: "args=[\'meta_graph_or_file\', \'clear_devices\', \'import_scope\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "input_producer"
+    argspec: "args=[\'input_tensor\', \'element_shape\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'summary_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "inverse_time_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "latest_checkpoint"
+    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "limit_epochs"
+    argspec: "args=[\'tensor\', \'num_epochs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "match_filenames_once"
+    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "maybe_batch"
+    argspec: "args=[\'tensors\', \'keep_input\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_batch_join"
+    argspec: "args=[\'tensors_list\', \'keep_input\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_shuffle_batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_shuffle_batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "natural_exp_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "piecewise_constant"
+    argspec: "args=[\'x\', \'boundaries\', \'values\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "polynomial_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'end_learning_rate\', \'power\', \'cycle\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0001\', \'1.0\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "range_input_producer"
+    argspec: "args=[\'limit\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "replica_device_setter"
+    argspec: "args=[\'ps_tasks\', \'ps_device\', \'worker_device\', \'merge_devices\', \'cluster\', \'ps_ops\', \'ps_strategy\'], varargs=None, keywords=None, defaults=[\'0\', \'/job:ps\', \'/job:worker\', \'True\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "shuffle_batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "shuffle_batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "slice_input_producer"
+    argspec: "args=[\'tensor_list\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
+  }
+  member_method {
+    name: "string_input_producer"
+    argspec: "args=[\'string_tensor\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "summary_iterator"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "update_checkpoint_state"
+    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "write_graph"
+    argspec: "args=[\'graph_or_graph_def\', \'logdir\', \'name\', \'as_text\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
new file mode 100644
index 0000000000..23d402de30
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.queue_runner.QueueRunner"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cancel_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "close_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "enqueue_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "exceptions_raised"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_closed_exception_types"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_threads"
+    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
new file mode 100644
index 0000000000..6e2d043049
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
@@ -0,0 +1,15 @@
+path: "tensorflow.train.queue_runner"
+tf_module {
+  member {
+    name: "QueueRunner"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "add_queue_runner"
+    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
new file mode 100644
index 0000000000..7c48f4af07
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.truncated_normal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.TruncatedNormal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
new file mode 100644
index 0000000000..4558db619e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.uniform_unit_scaling_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.UniformUnitScaling\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'factor\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
new file mode 100644
index 0000000000..8313009a68
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.zeros_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Zeros\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/lib/BUILD b/tensorflow/tools/api/lib/BUILD
new file mode 100644
index 0000000000..cdfa0e7be5
--- /dev/null
+++ b/tensorflow/tools/api/lib/BUILD
@@ -0,0 +1,39 @@
+# Helper libraries for TensorFlow API compatibility test.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load(
+    "//tensorflow/core:platform/default/build_config.bzl",
+    "tf_proto_library",
+)
+
+tf_proto_library(
+    name = "api_objects_proto",
+    srcs = ["api_objects.proto"],
+)
+
+py_library(
+    name = "python_object_to_proto_visitor",
+    srcs = ["python_object_to_proto_visitor.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":api_objects_proto_py",
+        "//tensorflow/tools/common:traverse",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/lib/api_objects.proto b/tensorflow/tools/api/lib/api_objects.proto
new file mode 100644
index 0000000000..0966a5f1d5
--- /dev/null
+++ b/tensorflow/tools/api/lib/api_objects.proto
@@ -0,0 +1,31 @@
+syntax = "proto2";
+
+package third_party.tensorflow.tools.api;
+
+message TFAPIMember {
+  optional string name = 1;
+  optional string mtype = 2;
+};
+
+message TFAPIMethod {
+  optional string name = 1;
+  optional string path = 2;
+  optional string argspec = 3;
+};
+
+message TFAPIModule {
+  repeated TFAPIMember member = 1;
+  repeated TFAPIMethod member_method = 2;
+};
+
+message TFAPIClass {
+  repeated string is_instance = 1;
+  repeated TFAPIMember member = 2;
+  repeated TFAPIMethod member_method = 3;
+};
+
+message TFAPIObject {
+  optional string path = 1;
+  optional TFAPIModule tf_module = 2;
+  optional TFAPIClass tf_class = 3;
+};
diff --git a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
new file mode 100644
index 0000000000..0dde24d621
--- /dev/null
+++ b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
@@ -0,0 +1,165 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ==============================================================================
+"""A visitor class that generates protobufs for each pyton object."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import inspect
+
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.tools.api.lib import api_objects_pb2
+
+
+# Following object need to be handled individually.
+_CORNER_CASES = {
+    '': {'contrib': {'name': 'contrib',
+                     'mtype': '<class \'_LazyContribLoader\'>'},
+         'tools': {}},
+}
+
+
+def _SanitizedArgSpec(obj):
+  """Get an ArgSpec string that is free of addresses.
+
+  We have callables as function arg defaults. This results in addresses in
+  getargspec output. This function returns a sanitized string list of base
+  classes.
+
+  Args:
+    obj: A python routine for us the create the sanitized arspec of.
+
+  Returns:
+    string, a string representation of the argspec.
+  """
+  output_string = ''
+  unsanitized_arg_spec = inspect.getargspec(obj)
+
+  for clean_attr in ('args', 'varargs', 'keywords'):
+    output_string += '%s=%s, ' % (clean_attr,
+                                  getattr(unsanitized_arg_spec, clean_attr))
+
+  if unsanitized_arg_spec.defaults:
+    sanitized_defaults = []
+    for val in unsanitized_arg_spec.defaults:
+      str_val = str(val)
+      if ' object at 0x' in str_val:
+        sanitized_defaults.append('%s instance>' % str_val.split(' at ')[0])
+      else:
+        sanitized_defaults.append(str_val)
+
+    output_string += 'defaults=%s, ' % sanitized_defaults
+
+  else:
+    output_string += 'defaults=None'
+
+  return output_string
+
+
+def _SanitizedMRO(obj):
+  """Get a list of superclasses with minimal amount of non-TF classes.
+
+  Based on many parameters like python version, OS, protobuf implementation
+  or changes in google core libraries the list of superclasses of a class
+  can change. We only return the first non-TF class to be robust to non API
+  affecting changes. The Method Resolution Order returned by inspect.getmro
+  is still maintained in the return value.
+
+  Args:
+    obj: A python routine for us the create the sanitized arspec of.
+
+  Returns:
+    list of strings, string representation of the class names.
+  """
+  return_list = []
+  for cls in inspect.getmro(obj):
+    str_repr = str(cls)
+    return_list.append(str_repr)
+    if 'tensorflow' not in str_repr:
+      break
+
+  return return_list
+
+
+class PythonObjectToProtoVisitor(object):
+  """A visitor that summarizes given python objects as protobufs."""
+
+  def __init__(self):
+    # A dict to store all protocol buffers.
+    # Keyed by "path" to the object.
+    self._protos = {}
+
+  def GetProtos(self):
+    """Return the list of protos stored."""
+    return self._protos
+
+  def __call__(self, path, parent, children):
+    # The path to the object.
+    lib_path = 'tensorflow.%s' % path if path else 'tensorflow'
+
+    # A small helper method to construct members(children) protos.
+    def _AddMember(member_name, member_obj, proto):
+      """Add the child object to the object being constructed."""
+      if member_name == '__init__' or not member_name.startswith('_'):
+        if inspect.isroutine(member_obj):
+          new_method = proto.member_method.add()
+          new_method.name = member_name
+          # If member_obj is a python builtin, there is no way to get its
+          # argspec, because it is implemented on the C side. It also has no
+          # func_code.
+          if getattr(member_obj, 'func_code', None):
+            new_method.argspec = _SanitizedArgSpec(member_obj)
+        else:
+          new_member = proto.member.add()
+          new_member.name = member_name
+          new_member.mtype = str(type(member_obj))
+
+    parent_corner_cases = _CORNER_CASES.get(path, {})
+
+    # Decide if we have a module or a class.
+    if inspect.ismodule(parent):
+      # Create a module object.
+      module_obj = api_objects_pb2.TFAPIModule()
+      for name, child in children:
+        if name in parent_corner_cases:
+          # If we have an empty entry, skip this object.
+          if parent_corner_cases[name]:
+            module_obj.member.add(**(parent_corner_cases[name]))
+        else:
+          _AddMember(name, child, module_obj)
+
+      # Store the constructed module object.
+      self._protos[lib_path] = api_objects_pb2.TFAPIObject(
+          path=lib_path, tf_module=module_obj)
+    elif inspect.isclass(parent):
+      # Construct a class.
+      class_obj = api_objects_pb2.TFAPIClass()
+      class_obj.is_instance.extend(_SanitizedMRO(parent))
+      for name, child in children:
+        if name in parent_corner_cases:
+          # If we have an empty entry, skip this object.
+          if parent_corner_cases[name]:
+            module_obj.member.add(**(parent_corner_cases[name]))
+        else:
+          _AddMember(name, child, class_obj)
+
+      # Store the constructed class object.
+      self._protos[lib_path] = api_objects_pb2.TFAPIObject(
+          path=lib_path, tf_class=class_obj)
+    else:
+      logging.error('Illegal call to ApiProtoDump::_py_obj_to_proto.'
+                    'Object is neither a module nor a class: %s', path)
diff --git a/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt b/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
new file mode 100644
index 0000000000..54b0cfcb3c
--- /dev/null
+++ b/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
@@ -0,0 +1,7 @@
+Golden file update requested!
+All test failures have been skipped, see the logs for detected diffs.
+This test is now going to write new golden files.
+Make sure to package the updates together with your change.
+
+You will need an explicit API approval. This may take longer than a normal
+review.
diff --git a/tensorflow/tools/api/tests/BUILD b/tensorflow/tools/api/tests/BUILD
new file mode 100644
index 0000000000..bfee211dca
--- /dev/null
+++ b/tensorflow/tools/api/tests/BUILD
@@ -0,0 +1,43 @@
+# TensorFlow API backwards compatibility tests.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files([
+    "README.txt",
+    "API_UPDATE_WARNING.txt",
+])
+
+py_test(
+    name = "api_compatibility_test",
+    srcs = ["api_compatibility_test.py"],
+    data = [
+        "//tensorflow/tools/api/golden:api_golden",
+        "//tensorflow/tools/api/tests:API_UPDATE_WARNING.txt",
+        "//tensorflow/tools/api/tests:README.txt",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python:platform",
+        "//tensorflow/tools/api/lib:python_object_to_proto_visitor",
+        "//tensorflow/tools/common:public_api",
+        "//tensorflow/tools/common:traverse",
+        "@protobuf//:protobuf_python",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/tests/README.txt b/tensorflow/tools/api/tests/README.txt
new file mode 100644
index 0000000000..3463eeec6f
--- /dev/null
+++ b/tensorflow/tools/api/tests/README.txt
@@ -0,0 +1,13 @@
+TensorFlow API backwards compatibility test
+This test ensures all changes to the public API of TensorFlow are intended.
+
+If this test fails, it means a change has been made to the public API. Backwards
+incompatible changes are not allowed. You can run the test as follows to update
+test goldens and package them with your change.
+
+    $ bazel build tensorflow/tools/api/tests:api_compatibility_test
+    $ bazel-bin/tensorflow/tools/api/tests/api_compatibility_test \
+          --update_goldens True
+
+You will need an API approval to make changes to the public TensorFlow API. This
+includes additions to the API.
diff --git a/tensorflow/tools/api/tests/api_compatibility_test.py b/tensorflow/tools/api/tests/api_compatibility_test.py
new file mode 100644
index 0000000000..27865fdc89
--- /dev/null
+++ b/tensorflow/tools/api/tests/api_compatibility_test.py
@@ -0,0 +1,238 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ==============================================================================
+"""TensorFlow API compatibility tests.
+
+This test ensures all changes to the public API of TensorFlow are intended.
+
+If this test fails, it means a change has been made to the public API. Backwards
+incompatible changes are not allowed. You can run the test with
+"--update_goldens" flag set to "True" to update goldens when making changes to
+the public TF python API.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import os
+import re
+import sys
+import unittest
+
+import tensorflow as tf
+
+from google.protobuf import text_format
+
+from tensorflow.python.lib.io import file_io
+from tensorflow.python.platform import resource_loader
+from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.tools.api.lib import api_objects_pb2
+from tensorflow.tools.api.lib import python_object_to_proto_visitor
+from tensorflow.tools.common import public_api
+from tensorflow.tools.common import traverse
+
+# FLAGS defined at the bottom:
+FLAGS = None
+# DEFINE_boolean, update_goldens, default False:
+_UPDATE_GOLDENS_HELP = """
+     Update stored golden files if API is updated. WARNING: All API changes
+     have to be authorized by TensorFlow leads.
+"""
+
+# DEFINE_boolean, verbose_diffs, default False:
+_VERBOSE_DIFFS_HELP = """
+     If set to true, print line by line diffs on all libraries. If set to
+     false, only print which libraries have differences.
+"""
+
+_API_GOLDEN_FOLDER = 'tensorflow/tools/api/golden'
+_TEST_README_FILE = 'tensorflow/tools/api/tests/README.txt'
+_UPDATE_WARNING_FILE = 'tensorflow/tools/api/tests/API_UPDATE_WARNING.txt'
+
+
+def _KeyToFilePath(key):
+  """From a given key, construct a filepath."""
+  def _ReplaceCapsWithDash(matchobj):
+    match = matchobj.group(0)
+    return '-%s' % (match.lower())
+
+  case_insensitive_key = re.sub('([A-Z]{1})', _ReplaceCapsWithDash, key)
+  return os.path.join(_API_GOLDEN_FOLDER, '%s.pbtxt' % case_insensitive_key)
+
+
+def _FileNameToKey(filename):
+  """From a given filename, construct a key we use for api objects."""
+  def _ReplaceDashWithCaps(matchobj):
+    match = matchobj.group(0)
+    return match[1].upper()
+
+  base_filename = os.path.basename(filename)
+  base_filename_without_ext = os.path.splitext(base_filename)[0]
+  api_object_key = re.sub(
+      '((-[a-z]){1})', _ReplaceDashWithCaps, base_filename_without_ext)
+  return api_object_key
+
+
+class ApiCompatibilityTest(test.TestCase):
+
+  def __init__(self, *args, **kwargs):
+    super(ApiCompatibilityTest, self).__init__(*args, **kwargs)
+
+    golden_update_warning_filename = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _UPDATE_WARNING_FILE)
+    self._update_golden_warning = file_io.read_file_to_string(
+        golden_update_warning_filename)
+
+    test_readme_filename = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _TEST_README_FILE)
+    self._test_readme_message = file_io.read_file_to_string(
+        test_readme_filename)
+
+  def _AssertProtoDictEquals(self,
+                             expected_dict,
+                             actual_dict,
+                             verbose=False,
+                             update_goldens=False):
+    """Diff given dicts of protobufs and report differences a readable way.
+
+    Args:
+      expected_dict: a dict of TFAPIObject protos constructed from golden
+          files.
+      actual_dict: a ict of TFAPIObject protos constructed by reading from the
+          TF package linked to the test.
+      verbose: Whether to log the full diffs, or simply report which files were
+          different.
+      update_goldens: Whether to update goldens when there are diffs found.
+    """
+    diffs = []
+    verbose_diffs = []
+
+    expected_keys = set(expected_dict.keys())
+    actual_keys = set(actual_dict.keys())
+    only_in_expected = expected_keys - actual_keys
+    only_in_actual = actual_keys - expected_keys
+    all_keys = expected_keys | actual_keys
+
+    # This will be populated below.
+    updated_keys = []
+
+    for key in all_keys:
+      diff_message = ''
+      verbose_diff_message = ''
+      # First check if the key is not found in one or the other.
+      if key in only_in_expected:
+        diff_message = 'Object %s expected but not found (removed).' % key
+        verbose_diff_message = diff_message
+      elif key in only_in_actual:
+        diff_message = 'New object %s found (added).' % key
+        verbose_diff_message = diff_message
+      else:
+        # Now we can run an actual proto diff.
+        try:
+          self.assertProtoEquals(expected_dict[key], actual_dict[key])
+        except AssertionError as e:
+          updated_keys.append(key)
+          diff_message = 'Change detected in python object: %s.' % key
+          verbose_diff_message = str(e)
+
+      # All difference cases covered above. If any difference found, add to the
+      # list.
+      if diff_message:
+        diffs.append(diff_message)
+        verbose_diffs.append(verbose_diff_message)
+
+    # If diffs are found, handle them based on flags.
+    if diffs:
+      diff_count = len(diffs)
+      logging.error(self._test_readme_message)
+      logging.error('%d differences found between API and golden.', diff_count)
+      messages = verbose_diffs if verbose else diffs
+      for i in range(diff_count):
+        logging.error('Issue %d\t: %s', i + 1, messages[i])
+
+      if update_goldens:
+        # Write files if requested.
+        logging.warning(self._update_golden_warning)
+
+        # If the keys are only in expected, some objects are deleted.
+        # Remove files.
+        for key in only_in_expected:
+          filepath = _KeyToFilePath(key)
+          file_io.delete_file(filepath)
+
+        # If the files are only in actual (current library), these are new
+        # modules. Write them to files. Also record all updates in files.
+        for key in only_in_actual | set(updated_keys):
+          filepath = _KeyToFilePath(key)
+          file_io.write_string_to_file(
+              filepath, text_format.MessageToString(actual_dict[key]))
+      else:
+        # Fail if we cannot fix the test by updating goldens.
+        self.fail('%d differences found between API and golden.' % diff_count)
+
+    else:
+      logging.info('No differences found between API and golden.')
+
+  @unittest.skipUnless(
+      sys.version_info.major == 2 and os.uname()[0] == 'Linux',
+      'API compabitility test goldens are generated using python2 on Linux.')
+  def testAPIBackwardsCompatibility(self):
+    # Extract all API stuff.
+    visitor = python_object_to_proto_visitor.PythonObjectToProtoVisitor()
+    traverse.traverse(tf, public_api.PublicAPIVisitor(visitor))
+    proto_dict = visitor.GetProtos()
+
+    # Read all golden files.
+    expression = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _KeyToFilePath('*'))
+    golden_file_list = file_io.get_matching_files(expression)
+
+    def _ReadFileToProto(filename):
+      """Read a filename, create a protobuf from its contents."""
+      ret_val = api_objects_pb2.TFAPIObject()
+      text_format.Merge(file_io.read_file_to_string(filename), ret_val)
+      return ret_val
+
+    golden_proto_dict = {
+        _FileNameToKey(filename): _ReadFileToProto(filename)
+        for filename in golden_file_list
+    }
+
+    # Diff them. Do not fail if called with update.
+    # If the test is run to update goldens, only report diffs but do not fail.
+    self._AssertProtoDictEquals(
+        golden_proto_dict,
+        proto_dict,
+        verbose=FLAGS.verbose_diffs,
+        update_goldens=FLAGS.update_goldens)
+
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.add_argument(
+      '--update_goldens', type=bool, default=False, help=_UPDATE_GOLDENS_HELP)
+  parser.add_argument(
+      '--verbose_diffs', type=bool, default=False, help=_VERBOSE_DIFFS_HELP)
+  FLAGS, unparsed = parser.parse_known_args()
+
+  # Now update argv, so that unittest library does not get confused.
+  sys.argv = [sys.argv[0]] + unparsed
+  test.main()
diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 3364ff6bc9..97447a18a7 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -56,7 +56,7 @@ class PublicAPIVisitor(object):
 
       # Everything below here is legitimate.
       'app': ['flags'],  # It'll stay, but it's not officially part of the API.
-      'test': ['mock'],  # Imported for compatibility between py2/3.
+      'test': ['mock', 'TestCase'],  # Imported for compatibility between py2/3.
   }
 
   @property
-- 
GitLab


From db47f97ca884e0e368e4124cc6971346d1d41345 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 5 Apr 2017 14:28:07 -0800
Subject: [PATCH 0150/1563] [TF:XLA] Add a test for an R3 -> R4 broadcast.
 Change: 152313967

---
 .../compiler/xla/tests/broadcast_test.cc      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tensorflow/compiler/xla/tests/broadcast_test.cc b/tensorflow/compiler/xla/tests/broadcast_test.cc
index 1796a732e5..16d4282466 100644
--- a/tensorflow/compiler/xla/tests/broadcast_test.cc
+++ b/tensorflow/compiler/xla/tests/broadcast_test.cc
@@ -265,6 +265,37 @@ TEST_F(BroadcastTest, Broadcast_R2_2x2_To_R4_3x3x2x2) {
       *LiteralUtil::CreateR4FromArray4D<float>(expected), *result, error_spec_);
 }
 
+TEST_F(BroadcastTest, Broadcast_R3_2x3x4_to_R4_2x3x4x5) {
+  auto builder = HloComputation::Builder(TestName());
+  Array3D<float> input_vals(2, 3, 4);
+  input_vals.FillRandom(1.0);
+
+  Array4D<float> expected(2, 3, 4, 5);
+  for (int i = 0; i < 2; ++i) {
+    for (int j = 0; j < 3; ++j) {
+      for (int k = 0; k < 4; ++k) {
+        for (int m = 0; m < 5; ++m) {
+          expected(i, j, k, m) = input_vals(i, j, k);
+        }
+      }
+    }
+  }
+  auto input = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR3FromArray3D<float>(input_vals)));
+
+  // Broadcast vector in dimensions 2 and 3.
+  builder.AddInstruction(HloInstruction::CreateBroadcast(
+      ShapeUtil::MakeShape(F32, {2, 3, 4, 5}), input, {0, 1, 2}));
+
+  // Create HLO module, compile, and execute.
+  auto hlo_module = MakeUnique<HloModule>(TestName());
+  hlo_module->AddEntryComputation(builder.Build());
+  auto result = ExecuteAndTransfer(std::move(hlo_module), {});
+
+  LiteralTestUtil::ExpectNear(
+      *LiteralUtil::CreateR4FromArray4D<float>(expected), *result, error_spec_);
+}
+
 }  // namespace
 }  // namespace xla
 
-- 
GitLab


From 046b7b0056340ddd2fff6f7d4552a4d942b9c87b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 15:39:39 -0800
Subject: [PATCH 0151/1563] Fix the problem that no enough placeholders for
 persistent tensor batch delete

The deleter_key is always a device_name, hence there is only one
of it. Hence, we cannot delete >1 handles at one time.

In the fix, it creates delete placeholder on demand, the max
number of placeholders is _DEAD_HANDLES_THRESHOLD.
Change: 152322770
---
 tensorflow/python/client/session.py  |  3 ++-
 tensorflow/python/ops/session_ops.py | 14 ++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/client/session.py b/tensorflow/python/client/session.py
index 6900ac9a4f..5b50df3ed3 100644
--- a/tensorflow/python/client/session.py
+++ b/tensorflow/python/client/session.py
@@ -1094,8 +1094,9 @@ class BaseSession(SessionInterface):
     if tensors_to_delete:
       feeds = {}
       fetches = []
-      for tensor_handle in tensors_to_delete:
+      for deleter_key, tensor_handle in enumerate(tensors_to_delete):
         holder, deleter = session_ops._get_handle_deleter(self.graph,
+                                                          deleter_key,
                                                           tensor_handle)
         feeds[holder] = tensor_handle
         fetches.append(deleter)
diff --git a/tensorflow/python/ops/session_ops.py b/tensorflow/python/ops/session_ops.py
index 0a06982ad7..3d038cfd8a 100644
--- a/tensorflow/python/ops/session_ops.py
+++ b/tensorflow/python/ops/session_ops.py
@@ -116,7 +116,7 @@ class TensorHandle(object):
       raise TypeError("Persistent tensor %s may have already been deleted."
                       % self.handle)
     self._auto_gc_enabled = False
-    holder, deleter = _get_handle_deleter(self._session.graph, self._handle)
+    holder, deleter = _get_handle_deleter(self._session.graph, 0, self._handle)
     self._session.run(deleter, feed_dict={holder: self.handle})
 
   def get_raw_handle(self):
@@ -141,11 +141,6 @@ class TensorHandle(object):
     handle_parts = str(handle).split(";")
     return handle_parts[0] + ";" + handle_parts[-1]
 
-  @staticmethod
-  def _get_deleter_key(handle):
-    """The graph key for deleter."""
-    return str(handle).split(";")[-1]
-
   @staticmethod
   def _get_mover_key(feeder, handle):
     """The graph key for mover."""
@@ -302,10 +297,9 @@ def _get_handle_mover(graph, feeder, handle):
   return result
 
 
-def _get_handle_deleter(graph, handle):
+def _get_handle_deleter(graph, deleter_key, handle):
   """Return a deletion subgraph for this handle."""
-  graph_key = TensorHandle._get_deleter_key(handle)
-  result = graph._handle_deleters.get(graph_key)
+  result = graph._handle_deleters.get(deleter_key)
   if result is None:
     # Create deleter if we haven't done it.
     handle_device = TensorHandle._get_device_name(handle)
@@ -313,5 +307,5 @@ def _get_handle_deleter(graph, handle):
       holder = array_ops.placeholder(dtypes.string)
       deleter = gen_data_flow_ops._delete_session_tensor(holder)
     result = (holder, deleter)
-    graph._handle_deleters[graph_key] = result
+    graph._handle_deleters[deleter_key] = result
   return result
-- 
GitLab


From e43836df930858afccd020e563d3e1dc98f05033 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 15:45:39 -0800
Subject: [PATCH 0152/1563] [XLA] Add several reduction tests. Change:
 152323510

---
 tensorflow/compiler/xla/tests/reduce_test.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/tests/reduce_test.cc b/tensorflow/compiler/xla/tests/reduce_test.cc
index 34fce21758..d00a317534 100644
--- a/tensorflow/compiler/xla/tests/reduce_test.cc
+++ b/tensorflow/compiler/xla/tests/reduce_test.cc
@@ -211,9 +211,9 @@ XLA_TEST_F(ReduceTest, ReduceR1_0_F32_To_R0) { RunR1ToR0Test(0); }
 XLA_TEST_F(ReduceTest, ReduceR1_1_F32_To_R0) { RunR1ToR0Test(1); }
 XLA_TEST_F(ReduceTest, ReduceR1_2_F32_To_R0) { RunR1ToR0Test(2); }
 XLA_TEST_F(ReduceTest, ReduceR1_16_F32_To_R0) { RunR1ToR0Test(16); }
-XLA_TEST_F(ReduceTest, ReduceR1_240_F32_To_R0) { RunR1ToR0Test(240); }
 XLA_TEST_F(ReduceTest, ReduceR1_128_F32_To_R0) { RunR1ToR0Test(128); }
 XLA_TEST_F(ReduceTest, ReduceR1_129_F32_To_R0) { RunR1ToR0Test(129); }
+XLA_TEST_F(ReduceTest, ReduceR1_240_F32_To_R0) { RunR1ToR0Test(240); }
 XLA_TEST_F(ReduceTest, ReduceR1_256_F32_To_R0) { RunR1ToR0Test(256); }
 XLA_TEST_F(ReduceTest, ReduceR1_1024_F32_To_R0) { RunR1ToR0Test(1024); }
 XLA_TEST_F(ReduceTest, ReduceR1_2048_F32_To_R0) { RunR1ToR0Test(2048); }
@@ -221,6 +221,9 @@ XLA_TEST_F(ReduceTest, ReduceR1_16K_F32_To_R0) { RunR1ToR0Test(16 * 1024); }
 XLA_TEST_F(ReduceTest, ReduceR1_16KP1_F32_To_R0) {
   RunR1ToR0Test(16 * 1024 + 1);
 }
+XLA_TEST_F(ReduceTest, ReduceR1_64K_F32_To_R0) { RunR1ToR0Test(64 * 1024); }
+XLA_TEST_F(ReduceTest, ReduceR1_1M_F32_To_R0) { RunR1ToR0Test(1024 * 1024); }
+XLA_TEST_F(ReduceTest, ReduceR1_16M_F32_To_R0) { RunR1ToR0Test(4096 * 4096); }
 
 XLA_TEST_F(ReduceTest, ReduceR2_0x0_To_R0) { RunR2ToR0Test(0, 0); }
 XLA_TEST_F(ReduceTest, ReduceR2_0x2_To_R0) { RunR2ToR0Test(0, 2); }
-- 
GitLab


From dc14caf8dce06611832664b9a77a8aa8de9ec889 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 5 Apr 2017 15:46:58 -0800
Subject: [PATCH 0153/1563] Added the memory optimizer to the meta optimizer.
 Change: 152323689

---
 tensorflow/core/grappler/optimizers/BUILD        |  1 +
 .../core/grappler/optimizers/meta_optimizer.cc   | 12 ++++++++++--
 tensorflow/core/protobuf/rewriter_config.proto   |  9 +++++++++
 .../api/golden/tensorflow.-rewriter-config.pbtxt | 16 ++++++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 5c119d77e3..2ea150ce18 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -213,6 +213,7 @@ cc_library(
         ":constant_folding",
         ":graph_optimizer",
         ":layout_optimizer",
+        ":memory_optimizer",
         ":model_pruner",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 67ffa7a4b6..0fe9359b75 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "tensorflow/core/grappler/optimizers/constant_folding.h"
 #include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
+#include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/model_pruner.h"
 #include "tensorflow/core/lib/core/status.h"
 
@@ -37,6 +38,9 @@ std::unique_ptr<GraphOptimizer> MetaOptimizer::NewOptimizer(
   if (optimizer == "layout") {
     graph_optimizer.reset(new LayoutOptimizer());
   }
+  if (optimizer == "memory") {
+    graph_optimizer.reset(new MemoryOptimizer());
+  }
   return graph_optimizer;
 }
 
@@ -55,8 +59,13 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
       optimizers.push_back(
           std::unique_ptr<GraphOptimizer>(new LayoutOptimizer()));
     }
+    if (cfg_.memory_optimization() > 0) {
+      optimizers.push_back(
+          std::unique_ptr<GraphOptimizer>(new MemoryOptimizer()));
+    }
   } else {
-    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout"};
+    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout",
+                                             "memory"};
     for (const auto& optimizer : cfg_.optimizers()) {
       if (avaliable_optimizers.find(optimizer) != avaliable_optimizers.end()) {
         optimizers.push_back(NewOptimizer(optimizer));
@@ -81,7 +90,6 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
           optimizer->Optimize(nullptr, optimized_item, optimized_graph));
     }
   }
-
   // Copy the graph version.
   *optimized_graph->mutable_versions() = item.graph.versions();
 
diff --git a/tensorflow/core/protobuf/rewriter_config.proto b/tensorflow/core/protobuf/rewriter_config.proto
index 6e9eff6225..63821cb55e 100644
--- a/tensorflow/core/protobuf/rewriter_config.proto
+++ b/tensorflow/core/protobuf/rewriter_config.proto
@@ -10,6 +10,15 @@ message RewriterConfig {
   bool optimize_tensor_layout = 1;
   bool disable_model_pruning = 2;
   bool constant_folding = 3;
+
+  enum MemOptType {
+    // Fully disabled
+    NO_MEM_OPT = 0;
+    // Driven by manual annotations
+    MANUAL = 1;
+  }
+  MemOptType memory_optimization = 4;
+
   // If non-empty, will use this as an alternative way to specify a list of
   // optimizations to turn on and the order of the optimizations.
   repeated string optimizers = 100;
diff --git a/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
index 529a9cbd87..85a53c3074 100644
--- a/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
@@ -18,6 +18,22 @@ tf_class {
     name: "Extensions"
     mtype: "<type \'getset_descriptor\'>"
   }
+  member {
+    name: "MANUAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MEMORY_OPTIMIZATION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MemOptType"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "NO_MEM_OPT"
+    mtype: "<type \'int\'>"
+  }
   member {
     name: "OPTIMIZERS_FIELD_NUMBER"
     mtype: "<type \'int\'>"
-- 
GitLab


From 9d57702513001bfded19e72c76a986cce56d5f00 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 5 Apr 2017 16:35:47 -0800
Subject: [PATCH 0154/1563] Started a set of utilities to categorize op types
 Change: 152329057

---
 tensorflow/core/grappler/BUILD                | 11 +++++++
 .../core/grappler/grappler_item_builder.cc    |  3 +-
 tensorflow/core/grappler/op_types.cc          | 27 +++++++++++++++++
 tensorflow/core/grappler/op_types.h           | 29 +++++++++++++++++++
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/core/grappler/op_types.cc
 create mode 100644 tensorflow/core/grappler/op_types.h

diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index c42eebae53..5d74d3d3b1 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -29,6 +29,16 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+cc_library(
+    name = "op_types",
+    srcs = ["op_types.cc"],
+    hdrs = ["op_types.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "utils",
     srcs = ["utils.cc"],
@@ -88,6 +98,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":grappler_item",
+        ":op_types",
         ":utils",
         "//tensorflow/core:framework_internal",
         "//tensorflow/core:lib_internal",
diff --git a/tensorflow/core/grappler/grappler_item_builder.cc b/tensorflow/core/grappler/grappler_item_builder.cc
index 7889b0e025..e37b908fc6 100644
--- a/tensorflow/core/grappler/grappler_item_builder.cc
+++ b/tensorflow/core/grappler/grappler_item_builder.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/core/framework/types.pb.h"
 #include "tensorflow/core/framework/variable.pb.h"
 #include "tensorflow/core/grappler/inputs/utils.h"
+#include "tensorflow/core/grappler/op_types.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/protobuf/meta_graph.pb.h"
 
@@ -90,7 +91,7 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
       node.clear_device();
     }
 
-    if (node.op() == "Placeholder" || node.op() == "PlaceholderV2") {
+    if (IsPlaceholder(node)) {
       if (node.attr().count("dtype") == 0) {
         LOG(ERROR) << "Unknown type for placeholder " << node.name()
                    << ", skipping this input";
diff --git a/tensorflow/core/grappler/op_types.cc b/tensorflow/core/grappler/op_types.cc
new file mode 100644
index 0000000000..33ef498db0
--- /dev/null
+++ b/tensorflow/core/grappler/op_types.cc
@@ -0,0 +1,27 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/op_types.h"
+
+namespace tensorflow {
+namespace grappler {
+
+bool IsPlaceholder(const NodeDef& node) {
+  const auto op = node.op();
+  return op == "Placeholder" || op == "PlaceholderV2";
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/op_types.h b/tensorflow/core/grappler/op_types.h
new file mode 100644
index 0000000000..30a3c91411
--- /dev/null
+++ b/tensorflow/core/grappler/op_types.h
@@ -0,0 +1,29 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_OP_TYPES_H_
+#define TENSORFLOW_GRAPPLER_OP_TYPES_H_
+
+#include "tensorflow/core/framework/node_def.pb.h"
+
+namespace tensorflow {
+namespace grappler {
+
+bool IsPlaceholder(const NodeDef& node);
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_OP_TYPES_H_
-- 
GitLab


From a24c6b842d982de8a38ae5058ace91cb47ee3cef Mon Sep 17 00:00:00 2001
From: Pete Warden <petewarden@google.com>
Date: Wed, 5 Apr 2017 17:10:48 -0800
Subject: [PATCH 0155/1563] Add AudioSpectrogram op to TensorFlow for audio
 feature generation Change: 152332221

---
 tensorflow/BUILD                              |   1 +
 tensorflow/contrib/cmake/CMakeLists.txt       |   3 +
 tensorflow/contrib/cmake/external/fft2d.cmake |  37 ++
 .../cmake/patches/fft2d/CMakeLists.txt        |  17 +
 tensorflow/core/BUILD                         |   9 +-
 tensorflow/core/kernels/BUILD                 | 111 ++++++
 tensorflow/core/kernels/spectrogram.cc        | 212 +++++++++++
 tensorflow/core/kernels/spectrogram.h         | 112 ++++++
 .../kernels/spectrogram_convert_test_data.cc  |  56 +++
 tensorflow/core/kernels/spectrogram_op.cc     | 120 +++++++
 .../core/kernels/spectrogram_op_test.cc       | 104 ++++++
 tensorflow/core/kernels/spectrogram_test.cc   | 340 ++++++++++++++++++
 .../core/kernels/spectrogram_test_data/README |   8 +
 .../short_test_segment.wav                    | Bin 0 -> 91784 bytes
 .../short_test_segment_spectrogram.csv.bin    | Bin 0 -> 365968 bytes
 ...t_test_segment_spectrogram_400_200.csv.bin | Bin 0 -> 468768 bytes
 .../core/kernels/spectrogram_test_utils.cc    | 288 +++++++++++++++
 .../core/kernels/spectrogram_test_utils.h     |  81 +++++
 tensorflow/core/lib/core/bits.h               |  13 +
 tensorflow/core/ops/audio_ops.cc              |  79 ++++
 .../core/platform/default/build_config/BUILD  |   1 +
 tensorflow/core/util/command_line_flags.cc    |  28 ++
 tensorflow/core/util/command_line_flags.h     |   4 +-
 .../core/util/command_line_flags_test.cc      |  35 +-
 tensorflow/examples/wav_to_spectrogram/BUILD  |  68 ++++
 .../examples/wav_to_spectrogram/README.md     |  49 +++
 .../examples/wav_to_spectrogram/main.cc       |  66 ++++
 .../wav_to_spectrogram/wav_to_spectrogram.cc  |  97 +++++
 .../wav_to_spectrogram/wav_to_spectrogram.h   |  31 ++
 .../wav_to_spectrogram_test.cc                |  37 ++
 tensorflow/tools/lib_package/BUILD            |   4 +
 tensorflow/tools/pip_package/BUILD            |   2 +
 tensorflow/workspace.bzl                      |  10 +
 third_party/fft2d/BUILD                       |  30 ++
 third_party/fft2d/LICENSE                     |   3 +
 third_party/fft2d/fft.h                       |  36 ++
 third_party/fft2d/fft2d.BUILD                 |  36 ++
 37 files changed, 2120 insertions(+), 8 deletions(-)
 create mode 100644 tensorflow/contrib/cmake/external/fft2d.cmake
 create mode 100644 tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
 create mode 100644 tensorflow/core/kernels/spectrogram.cc
 create mode 100644 tensorflow/core/kernels/spectrogram.h
 create mode 100644 tensorflow/core/kernels/spectrogram_convert_test_data.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_op.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_op_test.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_test.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/README
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin
 create mode 100644 tensorflow/core/kernels/spectrogram_test_utils.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_test_utils.h
 create mode 100644 tensorflow/examples/wav_to_spectrogram/BUILD
 create mode 100644 tensorflow/examples/wav_to_spectrogram/README.md
 create mode 100644 tensorflow/examples/wav_to_spectrogram/main.cc
 create mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
 create mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
 create mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc
 create mode 100644 third_party/fft2d/BUILD
 create mode 100644 third_party/fft2d/LICENSE
 create mode 100644 third_party/fft2d/fft.h
 create mode 100644 third_party/fft2d/fft2d.BUILD

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 37dc8e265f..5d2b1e74df 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -276,6 +276,7 @@ filegroup(
         "//tensorflow/examples/tutorials/estimators:all_files",
         "//tensorflow/examples/tutorials/mnist:all_files",
         "//tensorflow/examples/tutorials/word2vec:all_files",
+        "//tensorflow/examples/wav_to_spectrogram:all_files",
         "//tensorflow/go:all_files",
         "//tensorflow/java:all_files",
         "//tensorflow/java/src/main/java/org/tensorflow/examples:all_files",
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index e27df6898e..31a3d45a98 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -108,6 +108,7 @@ include(eigen)
 include(gemmlowp)
 include(jsoncpp)
 include(farmhash)
+include(fft2d)
 include(highwayhash)
 include(protobuf)
 if (tensorflow_BUILD_CC_TESTS)
@@ -121,6 +122,7 @@ set(tensorflow_EXTERNAL_LIBRARIES
     ${jpeg_STATIC_LIBRARIES}
     ${jsoncpp_STATIC_LIBRARIES}
     ${farmhash_STATIC_LIBRARIES}
+    ${fft2d_STATIC_LIBRARIES}
     ${highwayhash_STATIC_LIBRARIES}
     ${protobuf_STATIC_LIBRARIES}
 )
@@ -135,6 +137,7 @@ set(tensorflow_EXTERNAL_DEPENDENCIES
     protobuf
     eigen
     gemmlowp
+    fft2d
 )
 
 include_directories(
diff --git a/tensorflow/contrib/cmake/external/fft2d.cmake b/tensorflow/contrib/cmake/external/fft2d.cmake
new file mode 100644
index 0000000000..50c6b91684
--- /dev/null
+++ b/tensorflow/contrib/cmake/external/fft2d.cmake
@@ -0,0 +1,37 @@
+include (ExternalProject)
+
+set(fft2d_URL http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz)
+set(fft2d_HASH SHA256=52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296)
+set(fft2d_BUILD ${CMAKE_CURRENT_BINARY_DIR}/fft2d/)
+set(fft2d_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/fft2d/src)
+
+if(WIN32)
+  set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/lib/fft2d.lib)
+
+  ExternalProject_Add(fft2d
+      PREFIX fft2d
+      URL ${fft2d_URL}
+      URL_HASH ${fft2d_HASH}
+      DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+      BUILD_IN_SOURCE 1
+      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt
+      INSTALL_DIR ${fft2d_INSTALL}
+      CMAKE_CACHE_ARGS
+          -DCMAKE_BUILD_TYPE:STRING=Release
+          -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+          -DCMAKE_INSTALL_PREFIX:STRING=${fft2d_INSTALL})
+else()
+  set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/fft2d/libfft2d.a)
+
+  ExternalProject_Add(fft2d
+      PREFIX fft2d
+      URL ${fft2d_URL}
+      URL_HASH ${fft2d_HASH}
+      DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+      BUILD_IN_SOURCE 1
+      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt
+      INSTALL_DIR $(fft2d_INSTALL)
+      INSTALL_COMMAND echo
+      BUILD_COMMAND $(MAKE))
+    
+endif()
diff --git a/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt b/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
new file mode 100644
index 0000000000..b31ea3ed98
--- /dev/null
+++ b/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.8.3)
+
+project(fft2d)
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+set(FFT2D_SRCS
+    "fftsg.c"
+)
+
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_library(fft2d ${FFT2D_SRCS})
+
+install(TARGETS fft2d
+  LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+  ARCHIVE DESTINATION lib COMPONENT Development)
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index ba761cd7c6..6b7e297c4f 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -494,7 +494,6 @@ cc_library(
 tf_gen_op_libs(
     op_lib_names = [
         "array_ops",
-        "audio_ops",
         "candidate_sampling_ops",
         "control_flow_ops",
         "ctc_ops",
@@ -524,6 +523,13 @@ tf_gen_op_libs(
     ],
 )
 
+tf_gen_op_libs(
+    op_lib_names = [
+        "audio_ops",
+    ],
+    deps = [":lib"],
+)
+
 cc_library(
     name = "debug_ops_op_lib",
     srcs = ["ops/debug_ops.cc"],
@@ -686,6 +692,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//tensorflow/core/kernels:array",
+        "//tensorflow/core/kernels:audio",
         "//tensorflow/core/kernels:bincount_op",
         "//tensorflow/core/kernels:candidate_sampler_ops",
         "//tensorflow/core/kernels:control_flow_ops",
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 9c47d520d9..0a4fd0f256 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -3537,6 +3537,117 @@ tf_kernel_library(
     ],
 )
 
+filegroup(
+    name = "spectrogram_test_data",
+    srcs = [
+        "spectrogram_test_data/short_test_segment.wav",
+        "spectrogram_test_data/short_test_segment_spectrogram.csv.bin",
+        "spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "spectrogram",
+    srcs = ["spectrogram.cc"],
+    hdrs = ["spectrogram.h"],
+    copts = tf_copts(),
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//third_party/fft2d:fft2d_headers",
+        "@fft2d//:fft2d",
+    ],
+)
+
+cc_library(
+    name = "spectrogram_test_utils",
+    testonly = 1,
+    srcs = ["spectrogram_test_utils.cc"],
+    hdrs = ["spectrogram_test_utils.h"],
+    copts = tf_copts(),
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+    ],
+)
+
+cc_binary(
+    name = "spectrogram_convert_test_data",
+    testonly = 1,
+    srcs = ["spectrogram_convert_test_data.cc"],
+    deps = [
+        ":spectrogram_test_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_cc_test(
+    name = "spectrogram_test",
+    size = "medium",
+    srcs = ["spectrogram_test.cc"],
+    data = [":spectrogram_test_data"],
+    deps = [
+        ":spectrogram",
+        ":spectrogram_test_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:lib_test_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//third_party/eigen3",
+    ],
+)
+
+tf_kernel_library(
+    name = "spectrogram_op",
+    prefix = "spectrogram_op",
+    deps = [
+        ":spectrogram",
+        "//tensorflow/core:audio_ops_op_lib",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+    alwayslink = 1,
+)
+
+tf_cuda_cc_test(
+    name = "spectrogram_op_test",
+    size = "small",
+    srcs = ["spectrogram_op_test.cc"],
+    deps = [
+        ":ops_util",
+        ":spectrogram_op",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:client_session",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:tensorflow",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+    ],
+)
+
+cc_library(
+    name = "audio",
+    deps = [
+        ":decode_wav_op",
+        ":encode_wav_op",
+        ":spectrogram_op",
+    ],
+)
+
 # Android libraries -----------------------------------------------------------
 
 # Changes to the Android srcs here should be replicated in
diff --git a/tensorflow/core/kernels/spectrogram.cc b/tensorflow/core/kernels/spectrogram.cc
new file mode 100644
index 0000000000..7531d5d64a
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram.cc
@@ -0,0 +1,212 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/spectrogram.h"
+
+#include <math.h>
+
+#include "third_party/fft2d/fft.h"
+#include "tensorflow/core/lib/core/bits.h"
+
+namespace tensorflow {
+
+using std::complex;
+
+namespace {
+// Returns the default Hann window function for the spectrogram.
+void GetPeriodicHann(int window_length, std::vector<double>* window) {
+  // Some platforms don't have M_PI, so define a local constant here.
+  const double pi = std::atan(1) * 4;
+  window->resize(window_length);
+  for (int i = 0; i < window_length; ++i) {
+    (*window)[i] = 0.5 - 0.5 * cos((2 * pi * i) / window_length);
+  }
+}
+}  // namespace
+
+bool Spectrogram::Initialize(int window_length, int step_length) {
+  std::vector<double> window;
+  GetPeriodicHann(window_length, &window);
+  return Initialize(window, step_length);
+}
+
+bool Spectrogram::Initialize(const std::vector<double>& window,
+                             int step_length) {
+  window_length_ = window.size();
+  window_ = window;  // Copy window.
+  if (window_length_ < 2) {
+    LOG(ERROR) << "Window length too short.";
+    initialized_ = false;
+    return false;
+  }
+
+  step_length_ = step_length;
+  if (step_length_ < 1) {
+    LOG(ERROR) << "Step length must be positive.";
+    initialized_ = false;
+    return false;
+  }
+
+  fft_length_ = NextPowerOfTwo(window_length_);
+  CHECK(fft_length_ >= window_length_);
+  output_frequency_channels_ = 1 + fft_length_ / 2;
+
+  // Allocate 2 more than what rdft needs, so we can rationalize the layout.
+  fft_input_output_.assign(fft_length_ + 2, 0.0);
+
+  int half_fft_length = fft_length_ / 2;
+  fft_double_working_area_.assign(half_fft_length, 0.0);
+  fft_integer_working_area_.assign(2 + static_cast<int>(sqrt(half_fft_length)),
+                                   0);
+  // Set flag element to ensure that the working areas are initialized
+  // on the first call to cdft.  It's redundant given the assign above,
+  // but keep it as a reminder.
+  fft_integer_working_area_[0] = 0;
+  input_queue_.clear();
+  samples_to_next_step_ = window_length_;
+  initialized_ = true;
+  return true;
+}
+
+template <class InputSample, class OutputSample>
+bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<InputSample>& input,
+    std::vector<std::vector<complex<OutputSample>>>* output) {
+  if (!initialized_) {
+    LOG(ERROR) << "ComputeComplexSpectrogram() called before successful call "
+               << "to Initialize().";
+    return false;
+  }
+  CHECK(output);
+  output->clear();
+  int input_start = 0;
+  while (GetNextWindowOfSamples(input, &input_start)) {
+    DCHECK_EQ(input_queue_.size(), window_length_);
+    ProcessCoreFFT();  // Processes input_queue_ to fft_input_output_.
+    // Add a new slice vector onto the output, to save new result to.
+    output->resize(output->size() + 1);
+    // Get a reference to the newly added slice to fill in.
+    auto& spectrogram_slice = output->back();
+    spectrogram_slice.resize(output_frequency_channels_);
+    for (int i = 0; i < output_frequency_channels_; ++i) {
+      // This will convert double to float if it needs to.
+      spectrogram_slice[i] = complex<OutputSample>(
+          fft_input_output_[2 * i], fft_input_output_[2 * i + 1]);
+    }
+  }
+  return true;
+}
+// Instantiate it four ways:
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<float>& input, std::vector<std::vector<complex<float>>>*);
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<double>& input,
+    std::vector<std::vector<complex<float>>>*);
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<float>& input,
+    std::vector<std::vector<complex<double>>>*);
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<double>& input,
+    std::vector<std::vector<complex<double>>>*);
+
+template <class InputSample, class OutputSample>
+bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<InputSample>& input,
+    std::vector<std::vector<OutputSample>>* output) {
+  if (!initialized_) {
+    LOG(ERROR) << "ComputeSquaredMagnitudeSpectrogram() called before "
+               << "successful call to Initialize().";
+    return false;
+  }
+  CHECK(output);
+  output->clear();
+  int input_start = 0;
+  while (GetNextWindowOfSamples(input, &input_start)) {
+    DCHECK_EQ(input_queue_.size(), window_length_);
+    ProcessCoreFFT();  // Processes input_queue_ to fft_input_output_.
+    // Add a new slice vector onto the output, to save new result to.
+    output->resize(output->size() + 1);
+    // Get a reference to the newly added slice to fill in.
+    auto& spectrogram_slice = output->back();
+    spectrogram_slice.resize(output_frequency_channels_);
+    for (int i = 0; i < output_frequency_channels_; ++i) {
+      // Similar to the Complex case, except storing the norm.
+      // But the norm function is known to be a performance killer,
+      // so do it this way with explicit real and imagninary temps.
+      const double re = fft_input_output_[2 * i];
+      const double im = fft_input_output_[2 * i + 1];
+      // Which finally converts double to float if it needs to.
+      spectrogram_slice[i] = re * re + im * im;
+    }
+  }
+  return true;
+}
+// Instantiate it four ways:
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<float>& input, std::vector<std::vector<float>>*);
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<double>& input, std::vector<std::vector<float>>*);
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<float>& input, std::vector<std::vector<double>>*);
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<double>& input, std::vector<std::vector<double>>*);
+
+// Return true if a full window of samples is prepared; manage the queue.
+template <class InputSample>
+bool Spectrogram::GetNextWindowOfSamples(const std::vector<InputSample>& input,
+                                         int* input_start) {
+  auto input_it = input.begin() + *input_start;
+  int input_remaining = input.end() - input_it;
+  if (samples_to_next_step_ > input_remaining) {
+    // Copy in as many samples are left and return false, no full window.
+    input_queue_.insert(input_queue_.end(), input_it, input.end());
+    *input_start += input_remaining;  // Increases it to input.size().
+    samples_to_next_step_ -= input_remaining;
+    return false;  // Not enough for a full window.
+  } else {
+    // Copy just enough into queue to make a new window, then trim the
+    // front off the queue to make it window-sized.
+    input_queue_.insert(input_queue_.end(), input_it,
+                        input_it + samples_to_next_step_);
+    *input_start += samples_to_next_step_;
+    input_queue_.erase(
+        input_queue_.begin(),
+        input_queue_.begin() + input_queue_.size() - window_length_);
+    DCHECK_EQ(window_length_, input_queue_.size());
+    samples_to_next_step_ = step_length_;  // Be ready for next time.
+    return true;  // Yes, input_queue_ now contains exactly a window-full.
+  }
+}
+
+void Spectrogram::ProcessCoreFFT() {
+  for (int j = 0; j < window_length_; ++j) {
+    fft_input_output_[j] = input_queue_[j] * window_[j];
+  }
+  // Zero-pad the rest of the input buffer.
+  for (int j = window_length_; j < fft_length_; ++j) {
+    fft_input_output_[j] = 0.0;
+  }
+  const int kForwardFFT = 1;  // 1 means forward; -1 reverse.
+  // This real FFT is a fair amount faster than using cdft here.
+  rdft(fft_length_, kForwardFFT, &fft_input_output_[0],
+       &fft_integer_working_area_[0], &fft_double_working_area_[0]);
+  // Make rdft result look like cdft result;
+  // unpack the last real value from the first position's imag slot.
+  fft_input_output_[fft_length_] = fft_input_output_[1];
+  fft_input_output_[fft_length_ + 1] = 0;
+  fft_input_output_[1] = 0;
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram.h b/tensorflow/core/kernels/spectrogram.h
new file mode 100644
index 0000000000..5476a0a961
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram.h
@@ -0,0 +1,112 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Class for generating spectrogram slices from a waveform.
+// Initialize() should be called before calls to other functions.  Once
+// Initialize() has been called and returned true, The Compute*() functions can
+// be called repeatedly with sequential input data (ie. the first element of the
+// next input vector directly follows the last element of the previous input
+// vector). Whenever enough audio samples are buffered to produce a
+// new frame, it will be placed in output. Output is cleared on each
+// call to Compute*(). This class is thread-unsafe, and should only be
+// called from one thread at a time.
+// With the default parameters, the output of this class should be very
+// close to the results of the following MATLAB code:
+// overlap_samples = window_length_samples - step_samples;
+// window = hann(window_length_samples, 'periodic');
+// S = abs(spectrogram(audio, window, overlap_samples)).^2;
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
+
+#include <complex>
+#include <deque>
+#include <vector>
+
+#include "third_party/fft2d/fft.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+class Spectrogram {
+ public:
+  Spectrogram() : initialized_(false) {}
+  ~Spectrogram() {}
+
+  // Initializes the class with a given window length and step length
+  // (both in samples). Internally a Hann window is used as the window
+  // function. Returns true on success, after which calls to Process()
+  // are possible. window_length must be greater than 1 and step
+  // length must be greater than 0.
+  bool Initialize(int window_length, int step_length);
+
+  // Initialize with an explicit window instead of a length.
+  bool Initialize(const std::vector<double>& window, int step_length);
+
+  // Processes an arbitrary amount of audio data (contained in input)
+  // to yield complex spectrogram frames. After a successful call to
+  // Initialize(), Process() may be called repeatedly with new input data
+  // each time.  The audio input is buffered internally, and the output
+  // vector is populated with as many temporally-ordered spectral slices
+  // as it is possible to generate from the input.  The output is cleared
+  // on each call before the new frames (if any) are added.
+  //
+  // The template parameters can be float or double.
+  template <class InputSample, class OutputSample>
+  bool ComputeComplexSpectrogram(
+      const std::vector<InputSample>& input,
+      std::vector<std::vector<std::complex<OutputSample>>>* output);
+
+  // This function works as the one above, but returns the power
+  // (the L2 norm, or the squared magnitude) of each complex value.
+  template <class InputSample, class OutputSample>
+  bool ComputeSquaredMagnitudeSpectrogram(
+      const std::vector<InputSample>& input,
+      std::vector<std::vector<OutputSample>>* output);
+
+  // Return reference to the window function used internally.
+  const std::vector<double>& GetWindow() const { return window_; }
+
+  // Return the number of frequency channels in the spectrogram.
+  int output_frequency_channels() const { return output_frequency_channels_; }
+
+ private:
+  template <class InputSample>
+  bool GetNextWindowOfSamples(const std::vector<InputSample>& input,
+                              int* input_start);
+  void ProcessCoreFFT();
+
+  int fft_length_;
+  int output_frequency_channels_;
+  int window_length_;
+  int step_length_;
+  bool initialized_;
+  int samples_to_next_step_;
+
+  std::vector<double> window_;
+  std::vector<double> fft_input_output_;
+  std::deque<double> input_queue_;
+
+  // Working data areas for the FFT routines.
+  std::vector<int> fft_integer_working_area_;
+  std::vector<double> fft_double_working_area_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(Spectrogram);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
diff --git a/tensorflow/core/kernels/spectrogram_convert_test_data.cc b/tensorflow/core/kernels/spectrogram_convert_test_data.cc
new file mode 100644
index 0000000000..bae13c0213
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_convert_test_data.cc
@@ -0,0 +1,56 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/spectrogram_test_utils.h"
+
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+namespace wav {
+
+// This takes a CSV file representing an array of complex numbers, and saves out
+// a version using a binary format to save space in the repository.
+Status ConvertCsvToRaw(const string& input_filename) {
+  std::vector<std::vector<std::complex<double>>> input_data;
+  ReadCSVFileToComplexVectorOrDie(input_filename, &input_data);
+  const string output_filename = input_filename + ".bin";
+  if (!WriteComplexVectorToRawFloatFile(output_filename, input_data)) {
+    return errors::InvalidArgument("Failed to write raw float file ",
+                                   input_filename);
+  }
+  LOG(INFO) << "Wrote raw file to " << output_filename;
+  return Status::OK();
+}
+
+}  // namespace wav
+}  // namespace tensorflow
+
+int main(int argc, char* argv[]) {
+  tensorflow::port::InitMain(argv[0], &argc, &argv);
+  if (argc < 2) {
+    LOG(ERROR) << "You must supply a CSV file as the first argument";
+    return 1;
+  }
+  tensorflow::string filename(argv[1]);
+  tensorflow::Status status = tensorflow::wav::ConvertCsvToRaw(filename);
+  if (!status.ok()) {
+    LOG(ERROR) << "Error processing '" << filename << "':" << status;
+    return 1;
+  }
+  return 0;
+}
diff --git a/tensorflow/core/kernels/spectrogram_op.cc b/tensorflow/core/kernels/spectrogram_op.cc
new file mode 100644
index 0000000000..98d9bb1ad1
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_op.cc
@@ -0,0 +1,120 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/audio_ops.cc
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/spectrogram.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+// Create a spectrogram frequency visualization from audio data.
+class SpectrogramOp : public OpKernel {
+ public:
+  explicit SpectrogramOp(OpKernelConstruction* context) : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("window_size", &window_size_));
+    OP_REQUIRES_OK(context, context->GetAttr("stride", &stride_));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("magnitude_squared", &magnitude_squared_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input = context->input(0);
+    OP_REQUIRES(context, input.dims() == 2,
+                errors::InvalidArgument("input must be 2-dimensional",
+                                        input.shape().DebugString()));
+    Spectrogram spectrogram;
+    OP_REQUIRES(context, spectrogram.Initialize(window_size_, stride_),
+                errors::InvalidArgument(
+                    "Spectrogram initialization failed for window size ",
+                    window_size_, " and stride ", stride_));
+
+    const auto input_as_matrix = input.matrix<float>();
+
+    const int64 sample_count = input.dim_size(0);
+    const int64 channel_count = input.dim_size(1);
+
+    const int64 output_width = spectrogram.output_frequency_channels();
+    const int64 length_minus_window = (sample_count - window_size_);
+    int64 output_height;
+    if (length_minus_window < 0) {
+      output_height = 0;
+    } else {
+      output_height = 1 + (length_minus_window / stride_);
+    }
+    const int64 output_slices = channel_count;
+
+    Tensor* output_tensor = nullptr;
+    OP_REQUIRES_OK(
+        context,
+        context->allocate_output(
+            0, TensorShape({output_slices, output_height, output_width}),
+            &output_tensor));
+    auto output_flat = output_tensor->flat<float>().data();
+
+    std::vector<float> input_for_channel(sample_count);
+    for (int64 channel = 0; channel < channel_count; ++channel) {
+      float* output_slice =
+          output_flat + (channel * output_height * output_width);
+      for (int i = 0; i < sample_count; ++i) {
+        input_for_channel[i] = input_as_matrix(i, channel);
+      }
+      std::vector<std::vector<float>> spectrogram_output;
+      OP_REQUIRES(context,
+                  spectrogram.ComputeSquaredMagnitudeSpectrogram(
+                      input_for_channel, &spectrogram_output),
+                  errors::InvalidArgument("Spectrogram compute failed"));
+      OP_REQUIRES(context, (spectrogram_output.size() == output_height),
+                  errors::InvalidArgument(
+                      "Spectrogram size calculation failed: Expected height ",
+                      output_height, " but got ", spectrogram_output.size()));
+      OP_REQUIRES(context,
+                  spectrogram_output.empty() ||
+                      (spectrogram_output[0].size() == output_width),
+                  errors::InvalidArgument(
+                      "Spectrogram size calculation failed: Expected width ",
+                      output_width, " but got ", spectrogram_output[0].size()));
+      for (int row_index = 0; row_index < output_height; ++row_index) {
+        const std::vector<float>& spectrogram_row =
+            spectrogram_output[row_index];
+        DCHECK_EQ(spectrogram_row.size(), output_width);
+        float* output_row = output_slice + (row_index * output_width);
+        if (magnitude_squared_) {
+          for (int i = 0; i < output_width; ++i) {
+            output_row[i] = spectrogram_row[i];
+          }
+        } else {
+          for (int i = 0; i < output_width; ++i) {
+            output_row[i] = sqrtf(spectrogram_row[i]);
+          }
+        }
+      }
+    }
+  }
+
+ private:
+  int32 window_size_;
+  int32 stride_;
+  bool magnitude_squared_;
+};
+REGISTER_KERNEL_BUILDER(Name("AudioSpectrogram").Device(DEVICE_CPU),
+                        SpectrogramOp);
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_op_test.cc b/tensorflow/core/kernels/spectrogram_op_test.cc
new file mode 100644
index 0000000000..5c3cbeeeb9
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_op_test.cc
@@ -0,0 +1,104 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#define EIGEN_USE_THREADS
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "tensorflow/cc/client/client_session.h"
+#include "tensorflow/cc/ops/audio_ops.h"
+#include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/math_ops.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/framework/types.pb.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+
+using namespace ops;  // NOLINT(build/namespaces)
+
+TEST(SpectrogramOpTest, SimpleTest) {
+  Scope root = Scope::NewRootScope();
+
+  Tensor audio_tensor(DT_FLOAT, TensorShape({8, 1}));
+  test::FillValues<float>(&audio_tensor,
+                          {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f});
+
+  Output audio_const_op = Const(root.WithOpName("audio_const_op"),
+                                Input::Initializer(audio_tensor));
+
+  AudioSpectrogram spectrogram_op =
+      AudioSpectrogram(root.WithOpName("spectrogram_op"), audio_const_op, 8, 1);
+
+  TF_ASSERT_OK(root.status());
+
+  ClientSession session(root);
+  std::vector<Tensor> outputs;
+
+  TF_EXPECT_OK(session.Run(ClientSession::FeedType(),
+                           {spectrogram_op.spectrogram}, &outputs));
+
+  const Tensor& spectrogram_tensor = outputs[0];
+
+  EXPECT_EQ(3, spectrogram_tensor.dims());
+  EXPECT_EQ(5, spectrogram_tensor.dim_size(2));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(1));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(0));
+
+  test::ExpectTensorNear<float>(
+      spectrogram_tensor,
+      test::AsTensor<float>({0, 1, 2, 1, 0}, TensorShape({1, 1, 5})), 1e-3);
+}
+
+TEST(SpectrogramOpTest, SquaredTest) {
+  Scope root = Scope::NewRootScope();
+
+  Tensor audio_tensor(DT_FLOAT, TensorShape({8, 1}));
+  test::FillValues<float>(&audio_tensor,
+                          {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f});
+
+  Output audio_const_op = Const(root.WithOpName("audio_const_op"),
+                                Input::Initializer(audio_tensor));
+
+  AudioSpectrogram spectrogram_op =
+      AudioSpectrogram(root.WithOpName("spectrogram_op"), audio_const_op, 8, 1,
+                       AudioSpectrogram::Attrs().MagnitudeSquared(true));
+
+  TF_ASSERT_OK(root.status());
+
+  ClientSession session(root);
+  std::vector<Tensor> outputs;
+
+  TF_EXPECT_OK(session.Run(ClientSession::FeedType(),
+                           {spectrogram_op.spectrogram}, &outputs));
+
+  const Tensor& spectrogram_tensor = outputs[0];
+
+  EXPECT_EQ(3, spectrogram_tensor.dims());
+  EXPECT_EQ(5, spectrogram_tensor.dim_size(2));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(1));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(0));
+
+  test::ExpectTensorNear<float>(
+      spectrogram_tensor,
+      test::AsTensor<float>({0, 1, 4, 1, 0}, TensorShape({1, 1, 5})), 1e-3);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test.cc b/tensorflow/core/kernels/spectrogram_test.cc
new file mode 100644
index 0000000000..73175a91a0
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test.cc
@@ -0,0 +1,340 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// The MATLAB test data were generated using GenerateTestData.m.
+
+#include "tensorflow/core/kernels/spectrogram.h"
+
+#include <complex>
+#include <vector>
+
+#include "tensorflow/core/kernels/spectrogram_test_utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+using ::std::complex;
+
+const char kInputFilename[] =
+    "core/kernels/spectrogram_test_data/short_test_segment.wav";
+
+const char kExpectedFilename[] =
+    "core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin";
+const int kDataVectorLength = 257;
+const int kNumberOfFramesInTestData = 178;
+
+const char kExpectedNonPowerOfTwoFilename[] =
+    "core/kernels/spectrogram_test_data/"
+    "short_test_segment_spectrogram_400_200.csv.bin";
+const int kNonPowerOfTwoDataVectorLength = 257;
+const int kNumberOfFramesInNonPowerOfTwoTestData = 228;
+
+TEST(SpectrogramTest, TooLittleDataYieldsNoFrames) {
+  Spectrogram sgram;
+  sgram.Initialize(400, 200);
+  std::vector<double> input;
+  // Generate 44 samples of audio.
+  SineWave(44100, 1000.0, 0.001, &input);
+  EXPECT_EQ(44, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(0, output.size());
+}
+
+TEST(SpectrogramTest, StepSizeSmallerThanWindow) {
+  Spectrogram sgram;
+  EXPECT_TRUE(sgram.Initialize(400, 200));
+  std::vector<double> input;
+  // Generate 661 samples of audio.
+  SineWave(44100, 1000.0, 0.015, &input);
+  EXPECT_EQ(661, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(2, output.size());
+}
+
+TEST(SpectrogramTest, StepSizeBiggerThanWindow) {
+  Spectrogram sgram;
+  EXPECT_TRUE(sgram.Initialize(200, 400));
+  std::vector<double> input;
+  // Generate 882 samples of audio.
+  SineWave(44100, 1000.0, 0.02, &input);
+  EXPECT_EQ(882, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(2, output.size());
+}
+
+TEST(SpectrogramTest, StepSizeBiggerThanWindow2) {
+  Spectrogram sgram;
+  EXPECT_TRUE(sgram.Initialize(200, 400));
+  std::vector<double> input;
+  // Generate more than 600 but fewer than 800 samples of audio.
+  SineWave(44100, 1000.0, 0.016, &input);
+  EXPECT_GT(input.size(), 600);
+  EXPECT_LT(input.size(), 800);
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(2, output.size());
+}
+
+TEST(SpectrogramTest,
+     MultipleCallsToComputeComplexSpectrogramMayYieldDifferentNumbersOfFrames) {
+  // Repeatedly pass inputs with "extra" samples beyond complete windows
+  // and check that the excess points cumulate to eventually cause an
+  // extra output frame.
+  Spectrogram sgram;
+  sgram.Initialize(200, 400);
+  std::vector<double> input;
+  // Generate 882 samples of audio.
+  SineWave(44100, 1000.0, 0.02, &input);
+  EXPECT_EQ(882, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  const std::vector<int> expected_output_sizes = {
+      2,  // One pass of input leaves 82 samples buffered after two steps of
+          // 400.
+      2,  // Passing in 882 samples again will now leave 164 samples buffered.
+      3,  // Third time gives 246 extra samples, triggering an extra output
+          // frame.
+  };
+  for (int expected_output_size : expected_output_sizes) {
+    sgram.ComputeComplexSpectrogram(input, &output);
+    EXPECT_EQ(expected_output_size, output.size());
+  }
+}
+
+TEST(SpectrogramTest, CumulatingExcessInputsForOverlappingFrames) {
+  // Input frames that don't fit into whole windows are cumulated even when
+  // the windows have overlap (similar to
+  // MultipleCallsToComputeComplexSpectrogramMayYieldDifferentNumbersOfFrames
+  // but with window size/hop size swapped).
+  Spectrogram sgram;
+  sgram.Initialize(400, 200);
+  std::vector<double> input;
+  // Generate 882 samples of audio.
+  SineWave(44100, 1000.0, 0.02, &input);
+  EXPECT_EQ(882, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  const std::vector<int> expected_output_sizes = {
+      3,  // Windows 0..400, 200..600, 400..800 with 82 samples buffered.
+      4,  // 1764 frames input; outputs from 600, 800, 1000, 1200..1600.
+      5,  // 2646 frames in; outputs from 1400, 1600, 1800, 2000, 2200..2600.
+  };
+  for (int expected_output_size : expected_output_sizes) {
+    sgram.ComputeComplexSpectrogram(input, &output);
+    EXPECT_EQ(expected_output_size, output.size());
+  }
+}
+
+TEST(SpectrogramTest, StepSizeEqualToWindowWorks) {
+  Spectrogram sgram;
+  sgram.Initialize(200, 200);
+  std::vector<double> input;
+  // Generate 2205 samples of audio.
+  SineWave(44100, 1000.0, 0.05, &input);
+  EXPECT_EQ(2205, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(11, output.size());
+}
+
+template <class ExpectedSample, class ActualSample>
+void CompareComplexData(
+    const std::vector<std::vector<complex<ExpectedSample>>>& expected,
+    const std::vector<std::vector<complex<ActualSample>>>& actual,
+    double tolerance) {
+  ASSERT_EQ(actual.size(), expected.size());
+  for (int i = 0; i < expected.size(); ++i) {
+    ASSERT_EQ(expected[i].size(), actual[i].size());
+    for (int j = 0; j < expected[i].size(); ++j) {
+      ASSERT_NEAR(real(expected[i][j]), real(actual[i][j]), tolerance)
+          << ": where i=" << i << " and j=" << j << ".";
+      ASSERT_NEAR(imag(expected[i][j]), imag(actual[i][j]), tolerance)
+          << ": where i=" << i << " and j=" << j << ".";
+    }
+  }
+}
+
+template <class Sample>
+double GetMaximumAbsolute(const std::vector<std::vector<Sample>>& spectrogram) {
+  double max_absolute = 0.0;
+  for (int i = 0; i < spectrogram.size(); ++i) {
+    for (int j = 0; j < spectrogram[i].size(); ++j) {
+      double absolute_value = std::abs(spectrogram[i][j]);
+      if (absolute_value > max_absolute) {
+        max_absolute = absolute_value;
+      }
+    }
+  }
+  return max_absolute;
+}
+
+template <class ExpectedSample, class ActualSample>
+void CompareMagnitudeData(
+    const std::vector<std::vector<complex<ExpectedSample>>>&
+        expected_complex_output,
+    const std::vector<std::vector<ActualSample>>& actual_squared_magnitude,
+    double tolerance) {
+  ASSERT_EQ(actual_squared_magnitude.size(), expected_complex_output.size());
+  for (int i = 0; i < expected_complex_output.size(); ++i) {
+    ASSERT_EQ(expected_complex_output[i].size(),
+              actual_squared_magnitude[i].size());
+    for (int j = 0; j < expected_complex_output[i].size(); ++j) {
+      ASSERT_NEAR(norm(expected_complex_output[i][j]),
+                  actual_squared_magnitude[i][j], tolerance)
+          << ": where i=" << i << " and j=" << j << ".";
+    }
+  }
+}
+
+TEST(SpectrogramTest, ReInitializationWorks) {
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  std::vector<std::vector<complex<double>>> first_output;
+  std::vector<std::vector<complex<double>>> second_output;
+  sgram.Initialize(512, 256);
+  sgram.ComputeComplexSpectrogram(input, &first_output);
+  // Re-Initialize it.
+  sgram.Initialize(512, 256);
+  sgram.ComputeComplexSpectrogram(input, &second_output);
+  // Verify identical outputs.
+  ASSERT_EQ(first_output.size(), second_output.size());
+  int slice_size = first_output[0].size();
+  for (int i = 0; i < first_output.size(); ++i) {
+    ASSERT_EQ(slice_size, first_output[i].size());
+    ASSERT_EQ(slice_size, second_output[i].size());
+    for (int j = 0; j < slice_size; ++j) {
+      ASSERT_EQ(first_output[i][j], second_output[i][j]);
+    }
+  }
+}
+
+TEST(SpectrogramTest, ComputedComplexDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  CompareComplexData(expected_output, output, 1e-5);
+}
+
+TEST(SpectrogramTest, ComputedFloatComplexDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> double_input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &double_input));
+  std::vector<float> input;
+  input.assign(double_input.begin(), double_input.end());
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<complex<float>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  CompareComplexData(expected_output, output, 1e-4);
+}
+
+TEST(SpectrogramTest, ComputedSquaredMagnitudeDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<double>> output;
+  sgram.ComputeSquaredMagnitudeSpectrogram(input, &output);
+  CompareMagnitudeData(expected_output, output, 1e-3);
+}
+
+TEST(SpectrogramTest, ComputedFloatSquaredMagnitudeDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> double_input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &double_input));
+  EXPECT_EQ(kInputDataLength, double_input.size());
+  std::vector<float> input;
+  input.assign(double_input.begin(), double_input.end());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<float>> output;
+  sgram.ComputeSquaredMagnitudeSpectrogram(input, &output);
+  double max_absolute = GetMaximumAbsolute(output);
+  EXPECT_GT(max_absolute, 2300.0);  // Verify that we have some big numbers.
+  // Squaring increases dynamic range; max square is about 2300,
+  // so 2e-4 is about 7 decimal digits; not bad for a float.
+  CompareMagnitudeData(expected_output, output, 2e-4);
+}
+
+TEST(SpectrogramTest, ComputedNonPowerOfTwoComplexDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(400, 200);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(),
+                               kExpectedNonPowerOfTwoFilename),
+      kNonPowerOfTwoDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInNonPowerOfTwoTestData, expected_output.size());
+  EXPECT_EQ(kNonPowerOfTwoDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  CompareComplexData(expected_output, output, 1e-5);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test_data/README b/tensorflow/core/kernels/spectrogram_test_data/README
new file mode 100644
index 0000000000..271238e0c9
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test_data/README
@@ -0,0 +1,8 @@
+The CSV spectrogram files in this directory are generated from the
+matlab code in ./matlab/GenerateTestData.m
+To save space in the repo, you'll then need to convert them into a binary packed
+format using the convert_test_data.cc command line tool.
+
+
+short_test_segment.wav is approximately 1s of music audio.
+
diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav
new file mode 100644
index 0000000000000000000000000000000000000000..7339dfd08c8b31806e4e12c4421b7b0312173953
GIT binary patch
literal 91784
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
amQv;w%%Lm+tXAyXx$OB53cnHa69)iyveY;L

literal 0
HcmV?d00001

diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin
new file mode 100644
index 0000000000000000000000000000000000000000..67b9e2487c3f9cf960ad4af96f0688683e91cb02
GIT binary patch
literal 365968
zcmZo-nr6$uz`!tLN}I#<GbN7KYGn?x*J&TjNO5qKwOZ|<cS!i)x{j9z7>;hWmoD4r
z@Ob5H``6k}_Pwx>vn!a+V?WpN$i6SvO84hmnA-ab{@R~k$hKd+Psc&*{(L*Txu^Ek
zJl(J_d~@FZkFRy?nJNtIpD&Q!KSgcVo(qAz`;W~2urHjU&0cK1|GvPVT>HNoNZGI9
zPT%|EQ`r7JqAd1Z|LX1EEc&?X5y!QCI~(No|MhLQ6FZl>=l}8MeQhRQ_WLW$_OaZY
zuvc&HE4xPzRQJ!A_jsStl=pUXZl~@0+WCE7X+ppK*0OVUAFK-Y_suzO$L70jFZ;T`
z`+2U<uxI|o=&(>><Nk$FS^HjRbJ#~$AK&+4`tiM=7`*N3j#k-uH^uE!4lLNWz;3qf
z>$B;07T<VmKdi6aw{XLey)xTo?Oi`5-}Y~2rQM#jr}iyeyK`UkbW{6_$tUbK_BZZ3
zwf@uI^9?&~&plsnw_kSQzRUd^_f>t9wet}=ymw!?f!&$XG@E9gEqhf%RqY<W;MtdA
zmAO~V?SXAvq|d&E2dC}*S`ur=k|JR%o33R0EWzGJPMKj}a(dg|*=yd~s&ujJ3(E-K
z+jmCQ{y0bdzPV3%_HUBkYB%Hb$-SPNIBbpXx7(?k$m~;GUuny>`i_nI{Mmc^4zlmx
z@720*!=tJ8kFPGYofz%7U-a8iyUoncZNJq0*xP<Ud*8W>kM~7OncCg=TW<H&EY#Lv
z*%6zj*9`kM?*F>CKca8%|Fl20&$*V{)*VsUCoRNlr?Vu(?onvR-tthbeH%3=?45Nv
z)Q&f?Wp4;m{JwMV`t7R!=<PGvbz<LyW&7=xoMN`u6G_^)_k+^@uU8M+sR_NcON>z3
zpMTVOUwO^}yMiJSyI&k1_rA1ywrAO$CR-b=-FuICX4+O>*t54}wTtcXUHx`K`R)7s
zk3{c#_++Y`xIV`&w=?Yfk{B%a`mSW&cVW#uJ4UaSwhw+a?&E&kX_s|y&u-h275fZy
z=iA;@eP=t5;f2kc_qw(dUUcn=xudwRpvh<N!iUDTan_7>8ZWc$mU^-8`+mK9pJs#C
zUf#{CY_sQa*y+gi?Y&eneV>!9uib9ZopwA+qxNcMx$e_CD7bHa?p@o&pPy_ueNNaL
z^fGPlrhPYUU1X(fJJ=WO{eHf2&zb4&d!64twSC)@z4vnNjD0?5%<Mcls_eFvJMU9^
zu4ZfgTFTD-sPw+*HQalz98t3SReo=8?=;(e2iUW1??3oqyTCVjPqxRpy%Vj3?ex44
z*mnML*<1YY#a^THg8MQr{kGK-{B8TQH*BxtUJaXTpHA#``8s#c>8lC0iJca<Y~}}S
z)F%h+n=oOzt-xO^yNTy+*vystXEUoqZJ)`TyL)3@7un`IINRQ;+r0PN#Hlu_4ia`b
z{1W@ZIKJ=w%WZ9^=KI6;q0yqf!ZHW;rhFIPYv7h_TO0q;wybEo4QB=CzT$?1d-cU$
z+5XIWW&3+^q^;OevweB{!}oo2GP0ZM6=|p1c6M*cFUx)5fBJ00P9C;h`jUOG^1F4r
zmu_UXtyi15_m1q-z0;>y+CAW$WNUgiYu{ovcH10lXFIl}roGi6GW(=Vb8V}4%Gz}p
zcGym{pSD*ZjA`FJ2j+eH0sS_HTf^-%mo(UlI$qzqGrDW<*Vbs;ND~X20<pz=iz}zt
z&Ntd*yRy+`FL&Lcz3*aT_kKJkYS;0y+x9lU(Z0-dlf9h=hiq#ezPI6FU1IIS_i^{L
zuGf2vBK2(7x*XkoDdWT5>lcLfww$?cdz5Rdt^1GKy}!Cl_A+Howmq&nZMV|F*?Yb|
zm~Fdj65HM@+MoB%_4sX5ey77$U9M-3*ll)e?h2i~N{UW<<uf^LRr8kEJ`vutLo6?G
zui{N1+p?Q`ZMKUG>}~9A+nXJ*VVAAyVcXwdV)j^lzPDF6#>4i)ngm;~XHI)>Z~ki2
z@6&B{+<TEt?6e5mP3Hsmp08NB=fXywJvP7B?)_s{XtU~ry50XpbN6T_zuUVsPTAHr
zf4R-`19f|xt!=GSp6}fq?RRk39>&?$i>KyVJvX-A)i}|@%H+ZNowMuOEg8JncSU?v
z*jcJ!Vl_XtdFR8j(>v!}m|?Yod4i=;`NmxV9v64~{?BX`ChoqYOL^DM+Hk{NJo758
z_6et3@stGY+IH7(*E~HQs~_CuRtnV-yMBE#+I8l;iIpV#JWHqlJ(fZrc3a$b>Dgrv
zy4KvXqr=L>UVqo>gU5GvD9^DpVcTuFKtRgU=Sae?1vaNGCLaD~X?H1T$CA%ZmR8X{
z+q<0S@BAz>ZKs#|2FpejHuEDVEp{#W!DV&ru)ftHsoEW<_E+t+_e<F295Kss^;tKo
z@0^ErX5W|GF+V}U;*#Fw?feScEGK_Hv(qTWV8_gy8<ys04({aEYS_6T^n&H-h)T=%
zr}%a)H)P&fWirF^#T#GCW9Gh=8;>dPTz1TQXVp^SUAGu(cd|cNVC8kw+Um9P{9TRr
z+jcQGSX%kt;jp^NQ@^vVB;K-Wzp&+gOV*vbj?O#p?daP%nfK3*P2&1iEJB%9ew(v*
zS!*8K73Cvg6~Hmg%C?Eqa@8%}U9FvrJ1w4STgm8r->GrOX6J{lpO$_e2Y1GY9NMvW
z-V)3C;=Vh)9<=S0R}8egvPRoVvqx&ztQMYK0S%m12{p@ihMwTIbSR0jQdpw5bDfOK
zuBYykc7A<x-}0VOujMqiQ#+SVTeQ>QySY_(%`?l3NiMqrIAwQjn`C17gOA<nV&^<d
z&$PWeFK6)Y;yYz-)%D%gs=IO9&a|`lcBY(C-nB;|)$Dh1vlXcRpOV^f07O5OeCF_V
zzS_a)2!?~v0%;B*#{V6*Jb7)ODCc!B%JuhtGk+sTae3(j&&#JDi1iI}Sl-}hFDTw?
zXR0M&pKn&R|7>BkJ@-~GyZuLU_rIumW4Cj^?0!3z7yDWp!)+bDE7*1?GuzjvSlE|;
z;@PJn7P|jje3xC^XFa<;{J;0D(UjbquwsYZixgYCm9rS^?2Q-O32xoJ&)YC||M@D8
zeMP7L*=@V=&TiW>o4poX#<tTgE!>y&OL@QjbsKyBtSNR+<TdxNllo&P7Jtp|tP<OP
z@2R`?uKBWN-&6jz`z$7M+4ICD*sT$X+L!nH+8)vCJM9y!o9(B%vK-+3b9n#z`L6bR
zc3ay2|95upt(WZki+z3f&U|lWU)Va+&dGvpzu$$#ef<+I*u9eeVmHO{+rC5pn)cr^
zn_;(I-NF9+UoG2Zd{TD*x2D;Z=Zfr)pQ5sV($Q;n$!|B=eb2hR&(^lUHbZ@y-QJsT
z_wKZrXj^b%r(LMTB3rp5iu-*G%lBz--flNR)Wr5}kImj`0%~?Uj-A|lOgwhq*Oe`H
zO>q}(l}?22(+sKK^N4%CZM2E!-s0<X_g2`&+Bs?%+Bj97-pk3#X*c7g?!H-xY1Vsd
zOKh%Ga_u|aQfaqrg6uv;8NPk<nBLe;73;7G`0-({lkxd|DU1^P#d5jr^^Aq=!yBdd
zE?f84)<S>BzV$wP_Z^8mXZP^xj=klgDf{OB@VC2j|Awt!)oa`3a`O8E|NYz3cUaG^
zpiOk&<!zC+_qrC@O1y8|$J5DXYv*>@)@$mdJrX}F?OJD>*a%zp?#o+qX75A(*L$|O
zF4)^IqHk9wA#L|Xr(w^7&j)M`Kb_qh6{om&A^S7iWqUU6+o#;LSDgE;-GZY3d!Oi9
z?K6$lvRhIwZg;ZG)h_z3!M+1$m+ZS1XTGoL^Ku(k_f9*f11&c1%k=ja+i$kL_Tll~
zACvyrPD+_!*OFGhFUoepKFcS!ZBF`3u(?o?X&W7*VawIoXB)C5$JXyk&R&nrm9{6_
zB<v1tv)*^y`t82zGB&%DRxj-&&P(pg+U2wF%%YDr|E5*jE}s=;7u4~`Mp|s{zKv}9
zdu8<6?6TaOZS5?7?p^ok$li-0Pi*<_?6K*VSh{zE(_h=$+)MX*IQj2m7GSXpWaPHx
zjbhxFH^bWQ)<+h*)<xX=ELg4fa)cD`>Fl|)TV5e_@8XBw_E<BT*?oVx-j?fk!@htF
zzP-^Kj@lVN^V~Ok&HH`DA`9*Go~^ZGe`C2Xyu)Z8`)yO(mc%$ajS$7X3l9YDyR$9W
zmND<Ft)_0@-t#+r_D=iFX{Xu8v!^Tf(cbSX&h3`@vfoBiJiw~$;4K^GSp_zU`aAaq
zUzuWSGkd-5%iSCHN}FxjGbMVC)h*U-Hu)J&Hmo;x?LL&=X5*_Fytj8A-`<scihEDD
z=~+)MWwf*QU21#z@|L~-*6!YGmbTaS|7L!>G>M!&UY;8J%uHqW@?Pq-RbZ00%{4u=
zN9sk~UeA<Cds_d^+Y?Y_Xgl*NldWT$-(K6D1$$(UEwlYDsJQ3#W|qCz*_PV|*1y}m
zG4{;fBjp?S9P_HRZTR)fMsl^-9wi=e+wWJq_G%Pz>=m1CX=hT}zxVXYi+g>}w%e|~
zH*2qYa><@~?-*>3i$C3Sqk5k0FaKU!uFuSS-sv{(nQ?BhwWy8dUP~_4z44W{w)x#R
zcOO6BzIWq7xxMKtWNkn3RoX6Ce!^zS9Q!?2mOi%nFYv);-kimIKm7^WtEoBLw)g(e
zUHW3HZFXLrV0(N*``*AMJbUlXI%nH0cxR85;rqQ^YJ9eN9?rIH8&2$5@6^3}uIaKp
zMv*V~=zX)XeSd71&GvfTy;Uw9wi~<3Z5tn+*!%da*j`O9E!zlz>3gbX+_kxTdA*I!
z5`(=(?>MZtE@HQRIOXH+??;;Vyw|#C^QKy9Z=7-6-lnKMwo@dvY*%>q?N#yTustGm
zYER|FroF9|4{S1g+-wi_ZM0eRF?z4wI!o(}qw2PNxq*9l^Y`p__B~<k_0ni3`&70)
zX-9wV>c1&%ZE$JwPRloMEc&hr?8^A<z9abH6ibyUl{?L%b$1m__t@1HB5QTvx|3D8
z->;pw3koc6MXs`pNO0M8_z2&w9|xtaN^<P13LVbw3{)uJ<*im}xkRGH>eYTW%cFHZ
zyRvMwcWv<8V|jl`s+Gx)_??!ge0RNm^3ig}=Ixd&GAz3yzZqH<c*|SmZq?t#Ct|eg
z(wz#cZ3!1FYj4Kv%22i1nWxxj`7zega`TKUJ6hv5?i6~>Zq<5nx8(+T>0KG~r<*^T
zxYhid{mY%t&kI<+-8kQJ_hjXrB0KNy_;-|jr`nmNmdPJp?}%0u-z91hU|!ZHZ`G$|
zYE?CH;m!@qR_!wAe!jC&+|nv(c97LEj_npvRXICbrK5LdePP-qT;gweW{R_wl4hCZ
ztcF!PuLgPVia*|C(f+l=QtOldj<BjM%cW&L+mBAM-tpy`{;s%%&6fA<Ct69po3`^t
ztHUndnuMJ-C(c{8Ie1w%3$pEEYb)7V|Kp?Ot3ydv{mqIy|8W=Xy2jCGS^Lz{O1;a*
z{K!=GU3#bGca}Y2wsH_<-(D+yac7io)z0Z6>nxq`bXcAjso&ZBGkRzJcaxo|iG7ww
z+h$wJ@iXl7te$SJRz7R{dd_L)q9<B+a<6f+%)LC-;*NdAE>nfomY4RIS}B;s?o4)m
zwex>hoaNCkTvpBZI(96Q5ZtwUt(WE7In9<?e4lsLZ~D9K@1;7+Rl=KhGJfIQS*5|g
z^Htp@OLM12t8cc9yDq3r+Xbrs-<H-nfN1gmhxd2*H95+b+8o&ES$@z&KFML$!!XC-
z@_F`a^^^{7y6<-2aKt|QtdpzuZCZWbezn@Qy&JNo@2^>Mz&`C4gS}|UiQTInwAwRX
z)7^ija{d0u^L6&0QZCr(8SmMbXB%Z_ts}XAJ8%9z|Ifc|b2#tsYdgkczvAU|dxxt#
z_ibC!x&O72{$9UjUiQuw>-I8SZQcKHqM`ltpw;%pt}pgkr5Eq_j}zUuXeXP!<POGt
zQyz!zk)QC_uBldT|ADEC_dUJJX>S!-YBzU+*godT^7|8v+U<N@n(R;Xyxh0@w&wnT
z6dAjHyZUV6*yQXdJX>!UQX_O=$)ipCwoH+BSg}^kZbz%he%-A*_xinN-?ukI+AeN(
zmtBrW&%ULq+<Wu97TGb`sqTBP`_y)Ox#vC|H|zarpH1yQ#{RYwuKKd?P5jJ#GZ${y
zcVM%E{pVzP`#_;D`#9%!?^B(!({|&wPkR>~xobPeR>>}MF5^CtIj8JiUHENtUM*w)
z=g<Flrzx`8F9?dTb?E8ed+F`jJzP9{ZCG9_+RpmcY^%Ste(%A$!+ST@>Fx<VY;CK3
zC)_r-Drk?>jkdihn_Kp-h<Raqe`mWbw}$q<t>ub){VyG|RV&i5i>r6Aeb%PD??9K$
zz8`n??bTv%-fK0t*^Vzn)ZSypqJ7u7PVM`?LDbG!u6FO1%2vDh46{A9(Kq&;O4YMF
zJ9Cj;$HSj{m#pI0C*u*dci9~y+k52+c1g$l_PJc2wJ-ht9J>z%(spv28}=QkFW>t}
z*3fRrI!8Ol`O^FPGVkm?{A;~k7x%`!J1tJ{d;H~!t*BeC%~FGFd!HZku}d#pY|9Y4
z(59o;cW=+P+<gu!h3!7g_Oi1NU9orVe$$=O0Y~?mpIx^1wY;GnFMrs+zotTaPT5G<
zyIU{YSL^?4pNDF--Ho^lw!goG*zWf-wtdoiY429aX*Nz5cG}uLbKF<k?7GKlMyg%K
z#+iHni|Fq4HD}%%X8LH4&`xi=FIR8w68~nt?;=~*?m5Su_8ED|?<sKEW+yi#+4jZC
z^?Us!p6*>W<?vpkKoOhex3uiMBqHoq?r5}$=FHt!5+=IOD0;rF==~iwTLQYQwGLj{
z^Eyvu?^KS%Hqr|`?2fRlv{_Z(x36&KqCN9nYi%c-YO-OUS7IwV@62Ai?lrcSYQlD=
z`9Jr1xc=OGTz#3fWw@eUozGp{{_n>77O`&Ld)?B&?sC>l8^OZpoxjAp_FkxXy_Z-0
zk*!#I$lkTLBdk|4e6&rP`)F@=J@+1|P&qrME$MrwuJhf;*Y{y}e<QzLX~Ig|v|#zY
z)45Xiey*LfXIg8bbz-8A?WH37-P<nc?~VHHzh|-GZ|iHE{I&<3jcjw={r8B5JMC@B
z)!7@)8E(V4^R{iAU8KzgC!@W8Pvz{DbP?FAzvi9ocjmIa)yoz4HUIf*YjKRjE_yrv
zz8PJ4doRga*s&PJ?crE_X0OZYQ&whd(`}afJhX0{8EO--JIOYNcgdd3&b51|r>)u3
zS-aGRsj|-Yz=XXP{lYu<-qu~UM>}kZ?WJ!lHjh*j_O95ZuqWpEOq<QqC);MW&9sqv
zp|bbP^`O0TcJu7@w^(FT^k|Z;jH;pS;l}HG*EU$%@G>5<owsY*-p*dTy~aIRy9=*+
z+1$AF!gjAw)t)$i=e<VNHnyE#4EMUfJhnGwW|r-NbL(xtiErCGaYE~ElYPdv#eNKX
z=QCQ^#?Okg>6?(U_f1@j^@eTzw$pfy*l_%Lu~%cozP+MPci9@%U9x4pAhY*p=CVCs
z4|ZACOmW*AwK2jf^8~YP>@#NDeVtymi{540tj+kmS0YGZ@3eV$Y%30{>~#%YwD;R3
zS=->l;kJo)*4YSEyt6)?6|sBnR<pf5|26hjrJLK9)F;`hZROaL!Ogz+3m?Z`^T?t-
zQ!3Be9KL+r=F88JJuijbty7sU*fd^!Ze{k$YwrQ>$USbm+iaTyMfQ4qoxb-_1&{64
zw&}KfweB`MObquLlrislbT`ySa0ct{+;5V*6E`t!pSDZKD(LrFi-%$zyMoW^Tjg4D
z@65UJWv8UEot4<X)jREGZ{Eo_YlmfiZ}ZM2+7Xrv8*W;}?w!2zRQ^HBJMEXZ2bA&e
zlnmH!&SEFF^XB^{JB%BZEY}&#w2<LCw$uIoft`~or&{g^erGu=dc#irMaDa;J6){I
z98Ozq=FHzUYyR$?GPZ(Nq02pX6iZCrd5kM_d#a6yRo3#ymQP*9cO8sU*k!S3z9moe
z3d<|6m+ti0_uS&nY<^3R4`RFSzFofU+&wv~ir14YA77rabAQ~;ovucbmTvotEwor2
zEehYSu#8sG+1ZrLw5#;T4|6rUM9WF$H+HPKoNM{%wuKdobctoKO8%~tuX5X?pDwfH
zD68L9Bo(!DHZ!l4b;VlC6?==ee2m|-LnpD_^611TmUDjz@9<P~+jUd+?9Lk^D&|K^
z7_9=;|5@()`(kHzpTZ7D=O-3gmnwG7=xnw4wz=HWT0qU>sP*+7%z?d@|L@-2{;xP>
z7jI>kr6OaX)w+y`T@TiL-8pG@s?{VvJ*%b*cXw*Pdb_j!0GFjy?W~>8R?1lv=IB{T
z@tf~dGBMeu<1o)s%Jr({qGFC+R~RC9Huavh{FXY!!dBC7Cwt?c9f>={tme$)wi4S@
zvupjP;$2%lrdcsPwXo8@skKvp!PBzOfMHj}#DHC|H!@q@&sMh5`}AR_ZvWApy7zvX
zSA1DwdCBvWrGDu$3+CVFch(m8?R04`wY1Rc+9{o|*z$jApJm{5{#~3?<t(r6SYipP
z|9Lt!4}$3F@_LT9L*5;DH%08=gFPMg3*Ieq2-v&M!LmB$z?VjkgY`Q%IE43`I<Aw*
zJaFJd+kviYa<;7dm+!rCtHDm&>!^K`PT#(1oX7UQl$>Jw=zq!n)cX;32V2hA&)gGa
zr;@*Uzv;Oa+o;<6wz?`Y`@)i)>`(U2+Q+A7xj*&qF}p>kE9~Yhf4eU!XxF}D7X$3Y
zc*E^y=34DPx3gjYMV;_H{0cwq8oO88ZA@+7d-ZXJo#?mO`^uR9@0(X7X#b*qqn%Ip
z<$Y0BSNCNz_uCn#^VmC?9oZ+I%&|XdZIV5U`awITb<X=Wx|wZt6LsypSDoGeGjECA
z>3xC@pZY%RyBLtRKT=M3A9G%+jr8%2c1~IycB_4k+NQJ3*|)u5!#+`k88#FCowB`o
z#>(zyIqSZ@hZ6e?{+rlu{E}gN&F{v(*8MehrB^!laGHqi56ddt=as(3j_-V)T}X(|
z-m+GoeTjw}_uRTZ!EWn|XSRX+T<zpbdG<xD(c52<@X}`Uj?H!@Tz73b?{MxlwQ|~5
ze3Zj>OPRghrN3P^96G!9K4TZ(o4xP2ja$h<+va7RwgGO8`wn;|?yJZRunptzw%aJ2
zYAaxJeNVy1c{U#oz1{nM;_SV@HyyOqIu)~bZQOsGbhf0u?+tov?Nt`-UO2UIpSvc5
zefMr%JEd6%_PI^0-OK(ucJFo788(gjini-BZtmH${<V#@#0HyxYlQdCYYDY!e|66K
z$9Lg<ChJA*{@q?==ecU)KI^vjeN$f~+4Y6(wmr6D#okMNnzk~1x2?CTsPA>V6kvPy
z<B7dt2`~0WsQB2W%Czi>W_-HWTr<$lxHo4n`@cVX->hh~wUCUpO>?xgog|~XSNYMZ
zy$T}R_ogL0u-)1I-}cHZk$nxD%4|fYFx#Ecf4w(^UwNNUbC0dkr(?DPvSzyklLc*`
z+FI^i@?LXy_5Opl?A&wr&aqyx_ej)X+s*Zzd-!uF?qwIXwyo5-u_u$||4y$}`nF;$
z?0at>P`7Q#F5NBZ_{sL|d{;YJzy5uf_yhON<Y%_qaaDcK9i6#*qvy--KCidRw#iv=
z@8u1fY&W(awM(}?vsb0<$i7I?9^121jcp?&#P=OvUSxZ#x5M_Q%njSrzh`aC!*lm>
z|7h7WcilYOCl6NJx;?eAGwe6q*XKER-;IMzc4bZtcJq(A>|K>0uumZ9o9&H~DjSiI
z(0zxGR@r7;F|x~7Ik}g2V&GocpS*UA%B!rqt1b8D|9QGsLa<`*+Xx=J632eqmHS@q
zNpSJ9{-PJZH!-tgZ=xul)fCHvHda~_Y;z2~_Pi>S-n;M{vu%n-j%|B(>z-ew@AjTJ
zb79Yt(8sp?wd-x;cih?gZc6iBi9b7SH?o)7bewM5tGZiYx4s3RZS3=zd)LL3+sNxm
z*v-5dx%+JEhP_8Q1gxj}?cbCC;NqShh8ml^<6ri4a&_7sU{SF>>+)%DXV4v+ol~Xl
z>@FU*TGsM;@9XO>d)4L^+8$90*~4*9cW>3JeA}a12DYDGd+c5CR)6nnm2%r<x0LrB
zzP@_zhvYh2&AyqoYtxtQH9W7rXU&eywr-4#d*b(-?N$6%v-8)kb2e`}jrYFZdUTKd
zrWo4-oy0x=3f=dZepziZb<_Uc&c~Q+C!2cgd6w0^cj+W^8~$^fZI}us*`8<)w)G77
zyZ1<U=3Zg(9k$u?PVQ!Fv)C(tBE@#+RTFDPEt|bwo>Oe(1Q*+Uy1Zi7q2{T3l%2Tu
zDjxCKvubaw?TUpHt!1;t_9$%Swe9zG-digpVdLLkZOiGgXV2^_-Ftt%oxg|oOqi_|
z3+vv`kL_&EY2LJz<?h`Z`7wR(61k<eGwT=a7QBCPkJ3WUJqw)e_XfxX+LoTaXR|9j
zYwz6j1G`g|m2LOEKW($oFK6$LkIXhbJF0B|6~Er|mHXMA&J)Tu^FFlO{CU-|$CO)m
zuWz=j?Tc?Rwq1?Nd-F9cth6E-ZFfer?|t9ayr(2<x$WCcPP?CMy0WLMmBDJU=Y-v&
zmY1w@HFoXdEqQA(+eXw{|HVAZ$Nx6(3XNgi`Sgg2RrPKKE7lylT~}W!@2Zo0ZW$fH
zY4v-enq|)OvYoZv$9Db_j<P5(USwH#Hq$auy?3Y3dfA<y-Wgl|(fhMQS$l^mzk`&O
z@RUv4y#%;+#lOkep>V}@r>4L%bM16Pt3wJ!mi#N$S)6W4*vWj!Yu9SSy*pL}?6myr
z)3@{2#rU0j9_d=yM@Lv0?ww=4PQPYXbehbrk}N5!ZJNg{4=s`3#k+5(#mx17R-xuH
zyVkF^*(IfQ$Wr*Jp4H>38J15f7<V<_oxQVu`b5h$a-S^bTwbvAQ-r#uybFVsG`GgC
z{5p{xCw6|elyQ;RwM4wxJSs=jQg>0_&gm@@R&9EHmOK9(+nH`?X4x(9amQ!1pk3Bm
zHdrh@Wo30GaJl8)n~^(o?`ZD2mbPmL6I-g~$E~Y(E?uo|zWmU7OZzRnRw<j+cDV2a
z?s99MyJPk%ZL95`+bo}LW7@UUJ9d}!C0;8Z_8zN7iP<}Q`D%6<FOk?)TXNP?XVrYG
z)ykn3eiQO{8CP{%Ui)#*GKiCT*Uf#5yG&)6ttwA(S?&L`edn8$nLCq2mRda7(`K1@
zkIm|q@HR_+-iBSbrsV80+7@Ox^{}ATo$EDL91^k?t$h=AaWgsW`tf0orSe%et0~{7
zn|FQUvi!8%+VcMNtrmRTjh5GA{dT<YNZ$3b`=3RTO@`Ids~o!yd_A%A|Nr%t+FxXL
zTJAF6@$k<NOWt*>EIz!j+4VPwX;)5wuvMl{2zXwgynP3FJV1(P=Yi#NS&jnd4?3Kj
zQGD>6mBPW`gT{`Nngkp(T&Er|{rYhKVutShi<=Mc|5cN}|My`V2TO+O_Qy>b4#*Vy
z+19UqzV9C6GP|^>GxoE$%(XuDN#(%r2@U(YoH!k{GUe=;{>kqzpOI?!=<yRf;i-0e
zBUl>u35fpKC;gs%e__^3JL52M`#)~BdvDe)+V?v9-@ZhVn|5dW3hb5lGVi;0nPLC#
zw^#Q$s=u&JOMPPNwsn^6dF|D96E`;RtJZ(9_eX8C-G^No`?i&y+Lz&c#;$#>j{W-8
zvipDa74Dy~>Wba74HEW$K5gC?x$F48TThqUAHKfAe#(mD`>&O4*}u)X+U}YCXS>al
z80|uBrS|DQHnV%bxN?u2WT$PwqzJn?XBGBYwqM)ZC6TzVuXw?p&kn)%pEf1gF}(EJ
zAI9RlPjBMxy_;s_?-MqWu$NYTXeYxwVV}T<jD59H+ic&>wAmA<%eU`z$XZ*^r=E7_
z552Oh)c4t!JH2T?r?%kk!?|+y+R5{6mtA7nmn0~%cOAowJuYI-w&mL_ZKr(5*!x!d
zu(bi(3R|}1t$Tj2+PQcAJuMrxd8=$?=EvEsxqWeO=Hf;B#KT%`SEtF?{pJs_ZHtT8
zn_Kj9uf^W}J*&Du*v3w1wv7y8wyog&X`8~oe4pFoBl{leuC@EV*U2v8lhVG~X6?2;
zrW0)!-)pc9f3kkpn^4|;TJ9!$Sf!WQE;-s`t=GJ8@9xW2Y^6{8@9nsmwlBTF-_BE0
z+U~7v%ig%#$M^2O@@mi4?hUpdc+c*cleWX=&(beeS^A&%I)A9&{b0im+hfxoS#8e$
zzh`1fyzMosIlH&)654Acc*K@VYRca5-!Jwq)B0+w=l^$)6@SX!s$&OjSMct)2~y$Q
z>*ndWcUPx}?e5~6HXe#|_a2lFx1Gs)ez(J>j=jzu=C%=B6K%4VcG<9ny|&r2a{r!i
z))jkK|9G=|QKg`5V}I@*p*^Q<|Ae2nanje^cj#oi_2mVBY~QAu?lor7-P`e&$9B5U
zl)c-7j@t$VzOeOvWVSD_NpbJYg8#PbrcKxrx$KT@$q5!~e~FL#I0gG`g?-Q1b+fP8
zo0}B5XQ$u-o0pcwdpTrw*&3Jx@2%XjYVSp!J{vpsxqE7l)!Y6**RyAN?dHAnW|i)l
zUoU8<WpLW|*rd~YZ%>=Gcb@h?n@@NC+gARcx7X)`@V;mBH`y|nCfXjAG2HtwKWBHM
z*&Lg^>4$BW+p$_dulcd(WT3H4mrDL#`Rv3!wkMlx7p85qda>Th_LBn7-h3C6y_1jf
z+8UkJ*^|CSa#xweM(bt&8+KmqVzD_bXSesBaNnNK)h)JiMyqy<_${}#EvmL*SwC}c
zU!eA$jYr#U9~b1=_G_-NkyLNo8#Hs)-krxb+casdw5h1DvF$#oX8SUWW8bd3(R;iv
z-m{HbIctx4*Y92J4IlSxR#(`YRdmcYx#pEkb?o=Oy5;VBn9lduZVndPD|#+&&kOfo
zHv6CNv03L@Wux{)fA7Zkr+39&J!bQNQ|cb`AB${!4jtTmHfQ&qlNu*%_TPJ9d2nsf
zo?GWmS~;iHS<mKLVKYPFxW%)Ns(VBBTJL#Y{>)}e=LxHQ%~$q(P>kNqBe%->{6Tr!
z`zz9HSG&6JZNHYZ_c6y38v*P8Hn$fZ-t#QGWN+c-g|?G6#@Kdt7Vl-<5V+^E#BJ-h
zhnCwMZ06XrPvOs=t#(T-mvq_fdSc+d=UVm?n?6-b+q6k-d!nBm-ed2ly?a5~gFV;o
zD()#?=U`j8^R9KS+lM_mYb|%rYj4|a5vywZM8n;Nx0-!#_7^vsIrFUdTnUrd>v49z
zP0r45Hiw*9t*z%}SpP6J+k5l3<{pzNR<`foUfsohR?T{QpWdFLg<N}^Hb1i2)Wc&d
z;3>B^Gyd(K*{79kwSs5bJPX;gM|tx`%US!b+i;ev*}Rfr+`F3Zz@EMH^lhrbRd(`L
z=Ip87#BZxFxZTEW!h=05&2x4yGTXdcTKMIzzcM$iPnmw&)#CWxl5N{FD`&HvmNB;_
zcRBuBwqq6V7E1}oLp#cun0NWi6}Q@CAZ?{6e{HAHt9?7~Ow`#KzCv;5B?~8uOF<tk
zJLAkO8P0Cnsm0M?p}%y7Ww0i@rNi5+JEx~i*`YHv!g9gsww>}JZI;@u&6X`PY}-~B
zR_yGSzOi#rr-Ie7HLJ|s7HRHGx7%m=x?5|P`lj5SY+9^VN!K>+jE?ECIKN2K>hmAh
zog8z2ZZ8dez4LJ`+b;E4S1q|Vn^~1^du!S2%(*M5C3$D(*SQv7dS>iAFF48K;``Jc
z+g;5q7u9UD{NuyFt7jF%uALLFSu#&;wJfQ=xO3XlUJL)GPOAow#vNwTsk<`5K3Tl^
zJK4h5Sl^;|TY}}(=9ZoB+3GFAcJ*02OJ1?_tlWFci2gXseHQ*Zl_FZqm;?lOa%#8l
z{Byf`=dVY7mWFrMS#YGY?^4<Q!{Tvtqg93F3d_^Is=HkEn06^&m$3{#Fvqf!S=`d%
zL&DAn<~w&@y^y}c-#Op%d7!|~P^ntWEsm;Iler>x<=IW#xw7YhWyGOrJF6PE?D#L-
zW9hD8XT`BN#$uh!#9dcj&)!)s%3<ZvHp4tldaI?-QaLM*49{I+vlX|0<H)hn$qnB1
z*nQ#7V<%fJ8(XJY2<uJSQL}CF&go}gSXP&8-TA<=dWXAgtW{Io)t%SxKHoXriOuTx
zVV|AXWDl7YzN@jEvdMfGtH81y`MnNSGvl}|9h!7^`OLT8u6kL`>bqc~d7f(RE{&ZI
z7Ts1&R!7!_?sQ+Tx(hT8P$_Q@9uN4p(%4b|>5K#4jf4+goYa57AoR4|<yjXTnE13E
z{T6IHaPFJ(!Ar~UJN)LD=@4ZecEDJ0>HcLklkKHmE!sCx_~HJw5;^-XYMipw<jS*u
zIq$Rmjyv4;zgbKUoK1Jw@9)Cl@cDD#-qW`^_ODysV-s;jXy4s_ZhM24U3U2f%lBQb
z7PTvusMx1r_<vuF<UTtlb0hob^^N<Ky^Hs+ovXU<+{1pmITIJzHmxqSTW6(d&ypaw
z?@>wg{wrw=cA3?YcDwH>?8^$Xw<}rLVs}zt$G+oYzWX@Sn(b9Oi|kw$b?%?UFnym%
z%}2WrJ2%^DRMgw3rtaF`7@oK<ME92clW>;3wmByIK0JM9>$#?4pYKCUyA1Wcduz*=
z?JG%-u-R$KW|zbvZp$C&y6@~aEjxXGUVFAu#r;ufPxmeVEoL9(|IAMQqM9u~i}wDe
z-;4HT_MWvneJI9umH(2xb={L~Fa2w>dF`aJM^~ZSwqKmtUR0=Z-&C#U{qnO^>@HLa
z*w0v2y(e)m!@g>saNDmZ80=I-qW0P@ZrR%%&TDg7OVZZ(g}aTw0olD9w{6|a?W}3b
zd0@Jo)Vwo$3w|x#Cl@o>wjfi|&NENa)@cF%o>eQ)S)UJY*=xs>w%2lJ|Mo=_b8T;|
zs^9xEa@pQ<FW1|(m_%E#uivyUUANYDZ$zi<lKh^%%Gdtb8pk%<a=m-FS6uMmo^^FE
zt$CmBw2{2qW9v|FzPIIZ;XW%PNjrC=d3OC*g7+O-%ec=?db;hi4GV2%=^nFL^G$T`
zpA{*4S98y?JuWrJwtd<5z5C1)ZLD6*wN(##vv&&Pg1y!ClWe(X#@c=?JYjQDZtq?n
zg{Zx2U%j<G@#?n~_vHFL4<&+a_3lpIo7N(^x3b33Hsj`To0X3j+w8u?xA!;mqdl%g
zA8dTDx9s7WAHV0r+78=g@0F}MmiX<}`^;za(>!r+u4C(-)@@sD&Al(}u@({B%ck|)
zCVa<I8<l89+pnB!t@r#mvPVNZc#rZ0*1di=F6{aF>Xc21&Lx|@8BR9$-OO!*%68bi
zdBVQ;Tygha|2=Yh&#vXO>-av^R{YMsebUN(He24VvYWlCeeb>W#J$^Ws%#%}cJDbT
zo4z+~;eMOHLiM&^4lwL}aEx#7C&o0JED=XrXA^6iE=S&dMHdbCw$J-zTd2R>*261w
z@2WTJ_Qn~UwV8kGz0K|;&-T1Lwb}e{m51%p?N@fk=LhXweTviey-24`=bb%!Ip1Hf
zIW2d?wy3Lnx3Tk#J@db5?%mU5yZ8ST1>2-l4co;k-*?aX5wYj;wW+(UFLdwOqG@2g
zyVAzy+me^NkE(39*`k$Tb4NCGPmT86J;A3A?vc5-eNU0diQR4|Hrw|8+G5j{(75;5
zes<eKyw_~BbvpOFnIX4#ntAK)me4=D4XPyeKCeo%)sf)0J@lV_Zx^fR-WhYa_V}|_
z+0HX!v2EKnZLhBF%{|v*HEnk=IM_I*SK1^shVF@z7u);$-+CLq3~t+t+Dd!1E7$B%
z+@EJFA$7y%z^oH{*o?mK`N`V8M{1*j&E6BMY@7ur+bBIfwL5=W_FhM|<9jqL=h$vD
zV7JwL^<j@sa`PTOuVs7YS{=4gWVNy7Sns)aYl!FGD1r4h7wSd#v~QVb6RGHDt2V9O
zvi`)0J$Xl_?`7#W-EE@w&o+A9<=vH=SL~f!!EVd7=!4CTl=QtvIb`<)>S@?=H@~$?
z+~9AuAjD?Rk&s}U+lMCD)TpNHy=zy#dp?Vj?Xinm)_rQ4d*tpm?NLp9YV&CigKe%?
z>Rykc=)FtMSJ|c?le2x+A-DJQRmR;b|8KJXb*y-|cAc(`>i=X*R>q~f`JeLJ7`b1z
zUUl>89((BnyII(qY)n5I?2;2U-m_$t*q;3xx@>snU$i;@RD4fZoW$P$!G<;q8+O=~
zpZ3}Fam_57eGJ~ajeR2a&gPhCbLWDKt;K7RJuexz?qNSxXSIrDp^d{^zCDxwo!s-A
zU*6^ktBp;AwBBw{)>B*aBaF9CJbh``<Q$e=K8#1Lj1G5NJuTPWb*8Cq*KFYi%O6j|
ztsZmv?_~J5a@VwVGj@nyTw;~J>+<$VETX%zmu#}!p&_z!`TqEwZ|yc&sxRfSoV+P&
z`=$0t+t+_f-Fe!%!D7#A{T(Y6lXklO-()FJvS5cxPyJ5AuB(=ZSO3`2H(hMkBCR8q
z`U-khx?8vJJS1<lGw$7E%Lu`5JKuh--#NWnz^YQQ(L(E4`Y!Qw{#`0uORVxe7g`GS
z>g|&CXWjm*u6yU}$1YaCn3SxVXEyIz*sr&XcXy-Zl^|iOSB)V%8a?H9Y(Kxx@)qm=
zo%=-=S_mJsveLWSw5#{B*skq08?EN@9k!HKblbI;$#mD!e}+55XX#qaIeyntL%rGZ
z%<BUd4z2aOgbf*Y3E51vQaH|P`QI>YS97AYmHm%9mT$7cc7?Xyw1}3{w2IL+-gW)f
zlb!K;N>+EaY_>G!T5b8N@6gV_MaH|l{`Xs2zIC>mFVJN!8K1RlLDcS@R|5B2&d^n|
zlD^isGxGDJok5&hR`zOb7DpaD+-b^mdMDc%o?VVTvR3=w_gG~<|7F2s5VFg8pVh7d
zrSVpaIM-S}IC5_1?zAjRvA?3b8V|Sce7MiSO7vrw<-s<NT}|pzyB7Tuwc38F#ES2t
z_paORX}fGz@mm!=7qJSS6|_^RG<0XDbhqX5G~b<ivKqV0udcJSD^s^peK~jMbQU)Y
zk4^>4#HPJFpS9*$>|lOq`H8i`+-&CCoszwiE!TznS^l?++SRpu-;SnNRp9Y}1snAo
zLG6J>%K8WYC+Rx+K9F-1EPHogbF}@z<3%$Md@*BiTp#$xp*3E5uj?eM1L3__?2o6U
z?^n*ZJy5sO*}?6sqP<e!-TgKkz4m7omhNAvyJ>&0b+>(<KC^>r0H=MuzsiC4cg*%*
zI<Uxo=gUkx|IgF+ow&unH_b3&-%`~D)_hw#>@xRm-*be=$8OQXq`i){r}v%l+_7)j
zb6$HE0dxCH$EEfs_3qqjt*>ckc=O1<`Epu&Z-$iGExh{8?#{GB`wAMj?VCC0x81Cs
z{=MsMPV8d}th9R)cXp4)`Xl?8s?6<OE|=K}B&hHAnPg$tx$ULRivMf&H*e*#m)m&E
z{@C=W{U+h|`((4!?Bma@-?u#P_uh97Zgz2>o%iKMrr1olYijf6@!!2YZ5M1y(}Ha*
zzjxa`>d4+B)os4Nf~j(^0V|7r@g}{!4?B+RTYjj>uJFBx{b_E8y`LV;-ZwGg<sQRy
zKAStQO!vNQk+QukamTisb%&i*Qu)61RmS_7G863bb6f1rGhWymS=DZP=Awperh)L@
zb2C`>ra11mS@iz6_34;yYd(2%8*`brHjI~)Y>!T~-_2vnu&@8O@4l&9*4nyH_p*Dw
zBhU7kNQ{k(hSA<EC$7Dx&c^NaOWC@+eszHD^zhD|GVE%53g6A!d-?;f?Sv0)cIP+6
z?3LVIweN@9(mfR{Oty*db!?qZU9)-6f5(PPc;TM%WS_k=SM0EP6vt#ck$acTtNrqJ
zd%rE%+vvV@pU~b*wyMn9b~Bio_e#C}x5xF#Lz}LW`8J>D-rgg>aoe8j9g4Q;QMYYU
z;@9pKir#6%-G9}#Mmcov7DbW0rni>Z969o1x7M^hHui>LHa}`Y_c|wT+%qX4*LKqe
zF&pE4yS)PG#(NpPg=`hJIosY}a&*t{kZm?qo=mpqd1d$Rcu}<1>-7ceCFTLP%8Ipn
z3KlZ#J(Uq+Q@PU4Hs@)F?a3|ddnfOFwYPU^na!T!{kEHv!uK|F)a?CmOvpCz-4p9>
zg}F8<Hk!6mKDpa;KQY;}K%;7}PL|r<7rQ>&81j_c%+$GL{Zn+(ZV@))y-b@_Z0DzE
z*tv$v?KKbX-gj~#gYAcyskT;<e0yKpEwR?<`fX#<FlU!n@0{JoBl2z1`v2^i)A4k-
z&q^)ZRYnK)_($06@%1pXZF-rqw>od1byj$X?as|sd*+o+-D9$-eNWqhYu0Z#R_$3`
zd}GfIBNkh`vN+o_g-W|wxpMZ3FXY%$C^XI1N&Tg@jqHZKm4=SHf8JVZbA#J=_q!__
zt%WYv*{J!=vw3t+X^-P;|K0CCcI+vhY`y13K!**hyP(aY)Dt%ICENBeUJKki<K;%1
zb$^&_SNgHooc_3APwl_{y<9ye)`?GgZ71BDzsoOKdbig8jW)CV_Uz$Wb=dm7RjExb
z<Gww6{`u^QtleN;y!WI{LGjVulUf`1oD}8UeP*)Zp65jqc7GQtv#}L;Y;z)*Z|~K=
zy?bti8rx2EP_f><kbUpGv(~$fwrSXA1|?WM6MDTT@yjxs@c8?C>@1k}iumQ(KB~QL
zV`Lw==SIx`-3KE?_EaC3u}79|jkT8;tIhKS-o24;PFsJs*0SCnetGxz<VahKDT{5a
zIE(hK%xK@U>z#z{reGPH19y0BirMb%xx0AA9<DWqZEhs8Sx>$2e$U?-EPKRVGHgv5
zpIa}Bo4V)spB1~$v#RXna%$W?U5nqgafOwQq?yE?`S&jDRykp}Tf<e*wtB;P>k}(t
z_nJQz*{$*Uv<=6+UslV4nymx&8SQ=;^>z0@^{IQ}8Z~W>e7Rz?>-5b%Hrfii_ttmX
zNayd_^?@hEs^gr<ZbnZ%YmYTryT38{?*92|`fh_2{?_sG4K|^>81}qPE7&91{=xe4
z6kTg2?p?cMc<gOh4;5Iw)Gyi1#$IOaz{<MEJhjD&v(C=y%dWlF|5=_`G4B=JQ*!vp
z?pg=&-J1C(HXUw;)=oMzcW>mBwSL*uy=%Tu+-}`KUF*yX|1DfjZQW^m*wE@)@>TPL
z1(z%rS>CtMtq`?ZI$dSgms0|}?tJ9m`Fr9v%c>jUR=O@iJCzdBcJchKv3wFLWmWl*
zao0D?FFQk*H(6#b)wP(juw>_xV_Pk)%_dkT+HK!iyJy{wpLXt+RVKSFey*3@KGUva
zhwPs<+ZXn3-|>E$><+QetR1`F@$G!@eU|02)*MTo;5|Ful{W0GexkgqGH$!&FP)iI
zyG!rxJRDuN>+tPxtILzlZ(qyYu&aHlz13XyN0#EVr|!&u?_u#b>)4JfwO1`J8E)D(
z)kI-enp=$JnKv&iIkx)j+O<=8r(vU()t9B&79X;wSZ>?&-I7=P>(0!Fg}YAw-n6q)
z)5q%B7E7xIv*j(GY$)Fq?Eh%zzSU=}l0;8gTw2|-tL$I)4yl?B%LJDS3&|_iyBa;G
z@94DiuzJ3N*;2aIXJ^3vZ>DBtGL|{1EtZjc-tDZo{Bft|4OXj-My@+o^ewcQpc`p*
zt#``K+iZcmT7Q1C_-=pP^8co#JOA&K+R-n!)RZ@YV<*4=Y0GP74wmtcPVdy)ykln~
z-&ISulIxZRy!yMgJ*lzOmCv`@EI(nVGDqC5`&ZI-q=mXz8Ao*Pl)J6D^YijKmhDq!
z?A)+WYG-U@zS-nD1q-z`;+DVIJGSRaU)W)_zGCOQ`@%c#yt!w&=vkR1O9a!-L%te2
zl<s&~JZ~_toS1sdqCvUH!d>?B&Q>MIT~Yret+ux2T5Y@cb*B-t#;!dH6D&RK7g!b~
zvRVGuoM{>I`_j&&2R^&hjZG|hYJOR|_w6?a)&HxlJi+4ur3V!qYve8MqkgCz*yyWw
zFy?&zftv4&9V{IFIsEef?65<H<6!iKs|P0ZSv#;T_i->XS+p-QUFd+VccOhJ(<Xa`
zkS_cFx#jzmX2071zH9FO*5hinv-_DHjtX6|t5|$)zlmz#{zZA(_Ieq+?YADfWzA{Q
zx&QAKhy5Qf$lIH5_+htwqv-z1S)z8X`##xiRV}nrzSOfXs7rpot%-=;>ZK-jMp0J#
z;^Z^zMCUBGV|#Ud-wg42`_#9}+wT+Sw41&0?>?TLllKbFQn70_%(6|g-fTC$M{HlM
zr`>*|Z;Ne>ex9<M?kT)a$J1ute!))rxl(=hKdP4RXXV|yfBjQl`{r&rdlSRheT->F
zd*AYHuwC~xWuJxGT-!?j<#uTqK6?`mvh6ckCTqJjc&F|DX*2fqH%IQXdzoVQLBhZ`
z=WK_afY(zy#w(xp-OV=J&-AC$?nBZ6yCVYJdyPLc?R_~p&Z^t)>7GhW(Y=qY-`h1z
zJ81jiz1MzOpEY}H>-O0F)akKl+#bCr_GrD0&<c*d*&qMyQC!(?8$4x>b&%$^y=xDi
zv@yNWY8&!lk4;gcz~0c<=zW!DhIU_cI_*{{N9@~kuXXRySC+OO(^_rz@8q(n4Vt`{
zt2E6z-b&Hd_ot$5kB*gXn6v#}LoU;OlM=7l{QC9Z_HD5E-a3{uHgj7J*j!p^wCDR1
z_B}hknp>ZeTyMh~v}(^Ap0+)rwxw1Ik0#m#vpDT*pPIR+qWhTL%DLJ$()oG&7M|$X
zyR=)!w#WUT?XRF-s}708y{UV*>}h_*XS;LVXPa;Pw(oJs;orN0ZHx7Z8=AI_?Y4W4
zu-oqyeD=V`s6^WKYN^3ql?$8qs7PtsDxG?^tF!Rpo~`%7Y-@NYS)Y7Wxwm@5HtUli
zcGgT;Cv9$uH`_3*6x@4y#T@HYMOkaRoSD1N`U==K&S15gKFMM4g2`8GmhYRh$MdGt
z-nXAqY&UH-vQa(!(fWt8gH8T3@4W`9F;*hqylpL?Deb+p`u?5+ABt^6GAHZ_Utn&#
zgy*nLXN%2VjZ1rW>xgID<b*fueyg+6<^YfF-VF;c?BvNewM+Tbvo~h1#J+fqB-`Fi
zd^Q4{j5ep|KCqcN?b)8vZR_?hW~SLZ+#F`Zar3v8{8#HevC?06mzqfJJy*rC*T3kD
zEl1Tf+XXI}dusx?_THTN%KC!bygl44J-aJeBW-d$g?F{&NZM|mvUc~KzJGi2bU)bK
zQQc&7!SBpo^V`jPyX~3nE*ucDeP(L6H&Ok*^~Ck!)>9wNw#nWvvd2-fWe?9EzC8>9
zGxyY5bJ)yy$!(*!KhnlAt7(s{G0z_Ho6ff1^tt!wOlIDDEP-cF;hBpzM<eF%G4T`G
z+q-qSZTe|<tMv_0dw+Xz*qW+dvYPF?aL?{`1{--FJL^A&`a3goYxnGqZ`%|0EWzf#
z{xKWxTW76TKH9Kn(Z@Zz)@CN#yvq5x>-BN_J>E@vd+MUr+3cMhXtQd<oIUZEbZsWq
z>02*Rli9oDzom`R!fiGeN*~&spS05Ez0~BrUTkmnJnyTt@!z??rhkH|ZBp#<Jq6bc
z_ZIU0u_?QA-KOOQ+g^EgI~$|J;Wm8^&-REpS?u}AH_IlWjm<V!=fEBj_8WW37kJy4
z@QB#lE$Xvw@BL~O;X27`aY)|o;>BTm#BV3;IriLa51Y1>tzw3%?NeFpy|1pU*gey2
zhYds8j6E;z=U5*#*R+ul+_R@yIe2$Xb*GKTUZ*`-xh%T{*>75#X}4M*5J=qF^Y!lT
z<PWE<TIV|1+;gk7o_f!BPr5+-u6jWs>!^PQyJekStmb9gT8V!Yv*cnC+@+S|wkuL4
zW7oIzxz+~)4qC-ti`{MV#mD+i`QKe8Au+od-iGXYcXzqf`P0GHZAwdbON+8v`*zQ=
zE|{0LyQ7H9`e9h+Zlx#PyOYc(S--i(Y&|W0r)9Fmyxp7vPj<X5I%d6V)}x&QLBDr-
z>`dOVXJUh8_w`RZ*cJ=yJjT~+kv8R_g{8gy&gN%)yChVDEPtQlwVJU|)-vty#+~mH
zMJ+89ge?;l^mgre=V@8Kgwe|3`Tw0t)2HlISCqEeKTF#3_k~M4o7Ly;jC`cJ!+Pa<
zONn)zmRD1AcAjWHxufU&63Z|4VcTX$+V7NQs<E80V4{WJ%qu%%MAn$^JL7Jtcc#TM
zW}D<rSugor0h638U$1&<X)Td%S?!Xrb35zLogbpUZr74~wxj#xKg*QvnU<N3>bvZ(
z$L-w7YP^&2x2si6p10M^{Loz*O>=iRKAUf8wNGOgXVJHv@zQ54&AffB)@<mqymR5k
z&SPe6yPnQGYFTit-fGo(iCyO{ZFd%@+E~Q5bXkP?@>`zOb>A6NdUuEA=`$8rm<_D#
zU3DxqZ_V17Z<V+6Ro%~>OWQpxpLCqwabJ&Rm%!2ptEH2ETbhXc-)S*>!p<F`hC46q
z-fj7qd7q{5^2IxM8_qCqbc@}oDi^gw^_Qkq*KvhiSI=qgI%Lmg)w4p-(k+q2vhL$m
z%iJQbovts-cIJICvOE@9VWHHpZD+vto}F`IXIYBB{$WwCSYdhU*)mJBIl{Ys-CVol
z@3#O;uHXkdWgNOJ+f_GOzAD+VW9hjkJFGOnZGW*<)9Tc$KRd<BR__uD&$ra+DzMTE
zxo#P?U2$hJKj%({g4H{n*X`f=v0d7d<vx>D%-tx<LVFEMCp}rqm3pPSiZ4{`{F!{h
z@@Mtm9ecu;na4hDv-t4nuI1LR`z?*qdv}(UrS3ddy>SP}ouFNPGkPp~i~Foj{@7=B
zUDh2uFJN#k1w0;*R$OuLJKGh9>vtp^IZ|dGP}|92muf10@XDf+1AFYX9Bc1KIGhqW
zw?BF1N4sb}5r-$5@Ad~)<sVRHkGFUGHN##|SZTk7@;`f4D-ru`iGTK&X*BO=QsUpg
zWWyAD7uIh3Ia{6fpWZ!pzw5u#whMj=*mnxa+G{51+aD{wxbI5b!F@7kXYMV^n!0aF
zy@B1i@RK&xPS^M99(rzPar&*zu`^wJ4V<)X;yt(QOZDR3ce!$}U3R#;-I|gc`yO_A
z?t69cklmthnRfXPuI{_iIAz~$jlFh{&&k_g-?L&*@jtQsP4_<ST~NMgx0b|oyE|sm
z_AhmI@Avjr+Hci#-`<g1)h>!xWdHicXSOqpmF<3)sO($q*SPO{#+TjA3_Nx=T}N!M
zUufQ=p76}J%-3*VAK$BeJKJ~KZR~q#cYSL6zE+0beaS+l`z$_BvHQWrYOg&(b|3#$
z!+pVFkv1>7p6&52U1RgVw0Mu$4z_)@hqu|q1Q^=s`aAC5xqjZ>6KBuZ<$ap7`_|3Q
zJ^KYUY=1L0?*7A9xVJYz-PXmk%+}DiVQ-MA`QG2>I&A;0(%60Q{EEHXSG(C=uR3nq
ztUrIBa^BlLl2c^tzMc%;J3F>x534Y@t;OpvyJJLO*rba#?uq~Neh*jALz~1;J8j%=
zZL}8I!m}^@Wu<jhvVvVm%d0)QD~$JkJGs$jBX`IiXU?=etQ(tcUaeEMnZ0buu2$Kd
zdzRIi?ww~UYv*2m$9D3juzf4|J@zt1GTDl4W7vDZL*Mq0gsAo7)=2A)H!FAFX1TJb
zH`CIlaPJ+Pw~r!h%I(c<Z1Vr@zErYqkN<_*J@q1@yM_KQwmHJ^)q1vQ?(Pj7Ypt&Q
z_p(;MxZFlMvTsko(usRA%+A^9J+|C^_jmao{Yurn=I6Mqw0HN~3bG!xj*;QoTgiEG
z_gV2)o7A*Ldw#NtSRUfBvGor~-)l96Yp=}WYTE<`Mw@8I&^_<>ckbDjX10sBP}Vk}
zsc?_Xp$&U>_FuPo_=VfrBWcziBS9vckGczNUal#zUQ^q?XL9ZGJu8#{TYosFXv2PB
zlg;N-Y`ecyKHJ-V=J1{zo0GOyv)yb(AL;Gst=PZki{XQv_J-efzhGHs?On!Xv&-i7
zZZpZxJD$xIvknQ?+R3K>(7G!s#rC{<_TG7XANF32*lW9a)&$$_S3LH{-@Lcy;J;q$
zuQfup8(#n3x&4jTo)(4z>yQbYdyl^AvANLs+s54W>E5j^4{ZYanCyx-hU_)mA-`wJ
z=2<rW#)^A4a~a#H$t~C=`sw{1fnAQaexA&>w@zm6ecvp)`^1wUHg|g+_MA^^vcA{*
z&eGlef%)u(hBhgT_ItSwTkSctb&hSr;pux!Dns`E|0Hj_uj8Bb`^4ToyLAF~pNMhZ
zBgNxulOndsrhwgP&sWLvJu|I6ZQ9zl?Xofu-F@$#fR*$l$vr=$R@tmjw6d9V@XDT2
z9^F0X8~AMWtJQ53>$t4@c0}(va46Wu@0*Ox!-lzgmY>bvliI+sr)OfW%^!C4Jz{aE
zY%FH2w%xBQv$r;7=H4<^H=A|6Gi_A9^X^%1v3GY~8mo;HhmUn#m%Pm#mdIU(WwCp5
z`es<|*IZ>2al&U$!T%3?VygRX>Mj}E#LsE9R%NrZx+2iAM|>CaPK&+L)~$L=t#7WH
zxcjj<!=Bv?0=8P8gZ8Lq3GJ<0uWPGcdC|th?B5>YTetSqoa(b)TEEKrt{Ug={!6#4
zHC9iw{xAG|mqoxw%lF5ctd7@M?N)U>u*?7OcFXh3nN}0TURxc0@3LE1Z<i&b?F{QT
zf3NRibA7gJp4}Qt!%w_c;UV*O`2OM8Rlxsv=WnH8OV;n@R=J#cyUy?i?o`bYx4yVe
zXqR3t!)^_+`Ifh)bXlD%civSJy=hlFH>0&PgO}CsSd-nSW4>6rga}(3_}toMvA}BA
zzxqzA3+}V5^o3k4L%#OynmW1EO7O<RonOM|?wWc$z>?kXsb%7JcFUPAXU$ncQ!Fn_
zs_hE-B)rRPJ-gNBP+Kd<kC%3=ey+c(F*wAsy?&>q;xv~XOHy+!z6yTbIop5F&YAxd
ztd@4qwcMlrY-jC`wL996i(08IJZR}H8?;MnOZN`j3Kpw?)ZaV*hMe2E+WD;IODQ(X
zyHDQiym8`%CEu|dmX0CbyDsvq+o}Dh$}0T0v87N(_AafnnmZMY^{rg3M65m@W!iPP
zbk@$(lU7-l{(rgCIC-LllV*+8?kDSZ1cycKQa`cB;!f?x9ak%!?yNOFXvrWYXZbBj
z(CXL^EzADdGj_SHGqLn(legkqb!ul{-=du%r`jyr3np5sFMGc|_h-LlmABT;xzA@>
zu<u;A<4<GyE<c;!7M^9QRyQwCw0QoU#qx$#>JBqo*`1H~30duHT(Pr6vSHWb$sAUf
zwK~oFB7Jr-#+6z93yiZm5+k}Ze)9aCT6y1gUY{qnQ_+0=4vQ*v3(=$BEz7>nvD9E=
z-u35B$*yC$Yb`k<XIll?tlMe5|KiR`4-Z+!6`e8vwyR|a(}~KRvqJvvoWJ^{g|Ho)
z)m?RG%k|gpZdb3g-&Iw)(|iV_mzC%X&7JS`_w2ZJ_RNlGzO_4!+3vIyvlHEEGxyF8
z3v)+HjaSEaN-cYCx$T#=rHkRzUB`S=t%BYcS|w;N-X*B&zl+O9!b<!{i`4<EsXI?h
z6Wleo>8E+C4(HCbv-7Ra*hN@W&p*10^J=T*5^h_o=RRIL6J}nqeEq~=XNjfpE^Dvf
z7G9yJE%VPaSv6iex6`3tWmo;tZYzbw_EtrT6L<AJXa=_f1bu_R;{ifO{EqCE9u94{
z-rApuXFPb>pkx0rgJSzFH?ALu_AzmEa_@0ie_j1xbMb}!))tNqkK?%=KC7Iy+urkZ
z|Bp$J_l0pT-k<z*j-5@-TYI;IpKQ9yL+s-}ZQXasdCmU$?6Uh_y`OF`EpUAIM)vjl
z-|}nNJGgGN3y^f%$LP4k?rzKOed0d^_kA&*WBYMkjP17HLiV>F&9RODl(L`KLvr8w
z=xV#um8mv<k7n7m9e8T1G`ne^Yr&em*;);D`;M~hVXNJ<@00h#UCe=e_RR;^*<Ca+
z-rtdKu)p$$r~SOk@9h?(GwzRCEn>Gkq|H`z!_NH~73{YA&7Rn=oITCvlsnIUhHFRm
zKJQ&`yItp{?X%Wt`_d1+*~8E?$&OKR_ufjqmwP9t{IfZG<cIZ}Nf!HVZ*JWs)*)yA
zd6&@c`H~F#n<D?&2$a3DQx09Uch4u&{m+yy*nBX*V&^BEWOLwp*WPQo!d5%(3fs87
z7TLR-ce$NKYrE~b-`e{ZZMnNAQg)-=t|wf!{R}=<HxEwR>%+Ns&u^=I+w6XCTQ8xT
zdqj7(?1?&b#QOQGvOO6b>Nah&me?-HzO(znjKqDjSDxDwplfE=WMyi*+4IJp565@z
zk(r*m>t1=W%@ZT(y~(|Cd#9vLwRL%@Ve9a1=U$ns*|rVySJ`r|T(tMXH=n(4*ko;N
zKMC5JKDlMhr#NfR|LJ$F8(D5xeUwnQa$~mJJ-3WuSD;b<o`uS_dpF3u+w;-&kL~u7
z?Y69Ew(p&Gf_3kYK406tF)MeAvAXS@9{$Mct(~y#C!t4sHbpPmegDdOoBUVncW+NL
zw_)Xt+@q}}w8t%Qp7p~($2}LhciOyJ*kBX#`tTm%nBHA`>UFK<;yU(l++AtYvwyZt
z`llCrmf1${;j5gpW36%hZe1Z}TkXtDYqsNUd)_1{*w{a8+w*x(vGpX;S2moi3-`G6
zx9{0(z+wAoOV{r24tMt~ZOOKobh*Liuhp78F9Kfd;d{bq`}^-Mn>l`Rd(EcA?!IYY
zYa8*gdyip8>)zviFKu$y>e{k@Z{0mb$az=cuc_86Hs7+Dal+PSN1f!}ORA3hGUtEY
zQ`1*u*TQ|*=8{UuUe&tEHoiMut=tSg?Y0h`vS;dovfcLe)2x#&Tkq<bW@`OzRmAQk
zjsAPTd_A!{bMa<d&b^0h_Pom2Tf(Wn=QlUAtut4?&EXm0d(xk6*^?4+c$X=Y`<@WJ
zJ=VqLH*B(PAMUxoD!_JPc8jfb;M2Xl)?ItAc&6KW)iT+Ji#u7f)ZE$AyngBKME*NA
zMVBJ?B>Y#|^SR`RO`Qn4jq%)Vdp4;h?0I7lvfKW`9P0=*DO(*0F`HO!^Sw_0O!mC@
zjIk~2x@J>t=DPP+o9$i(^IRK+Kfi6(m|xvJd*htlTlkV}a%=ZmZLzf4b4{mzPZS%I
z&D6IGYz$%_?Cx02y~l7B`yQXQ;=5mK|FPmX4Y84mnPf9*BiEj-lY(}H8SC1Zng#8d
zaeeuoy=Qk@w;1HvJmQ|T%UNLco}>L+ZC*5*+rAW!+xv@2V(+dWe71bWAFM0C?Ax_}
zMe6R2Y+Y8nH_6-Fn*DY6rb)fK=d&-hmbrUscWgq5bwLNWjrHfJdzPksu)MZJ(>7G_
z%C3qxo_lJpvhO)7^>X(e8$TO~rHoeJCY;;dIrGKtFg4rV{32^@=1<sY?L9+juW8~1
zo1iaKZP%Fw?fqmQyEh^Cq|H5zqt+F_KU%5SweNPn^?LWuJ3=;&yP0fMnd5gWoiN#L
zo6TZr8F*yJn~B0!E9GK$s-BG6wN684XGE@r)$FS~EjKxxu~;v*Xy@F|hj-Q~1X_g4
z+_ap1`mUu_QS8oR>>9g%W{F$=YIn8T`2FRMc_DE-k9_a3_-B-}OZ2bb&b59ktya!`
zXZc^Kbl2kLlXm8n|FtYP>$cceIoGsjrN8AQ_AZM@&u8xBNL;k@+~PkL8rO_0cS}g^
zS{Qk6=hN6It0@LSR=fE9clNaK?AmkLb?2ea=Pj$ZJM5g7bZ+Oj<SUl$r{|hyPO!8%
ze3IYXAd+#{$|~!fHG8*OzUsVe`TBi^Wp3z`9a>>icWUbU?`Zd!u;YC563b~mTP(d!
zHSU_WY{AZWw(VBd{hxLwpKRNeerv5&tdgu1Q}p&-CJrBWiu%P_+55b=>^t4FbGg_2
zohM{3ZJ${swe#Ppujb8l^_KHZU3R{TpR;4b>U_&`4wIetnHeqh+xA%c1w6G#efe!?
zi#o%uXT^zD|1b1fuBa&5HK9#n=i(#JEt_T>w9NY3uv6&U*_}Vk4_W5dUb9@TuC}wz
zFJ#xb1JibjH1t?Cef72~v9sAVLB?;F|K~8v^N)7!=<VsTWXnBmq2`yjOYd`tm1TK}
z)f`3TUEZ8Gcg87R+L3jAx8;WGVU{l+x9*x?G<WB-v-7R8`IcM0;nCS~WM#8O)z79~
z#|lj?7r!#Hx?8EX>%lwb9rHfKSX#+`-qAfz&LV~>)l%!Are)nl$DK;|HktiBZ@+V1
zh`HsS{XLc!LYsFk`1{xLp;p6=@JX|Fi5=a)W8n&0D^r(=7Bg(m?9e#7%cB45$(@f(
zEq1ab##w3eGFy6mYS=Y<`U?xs#q+GruUlyOxw~#xV7%Y1E4%(%Dhi5Obsy~Bxvwa3
z*O^PREj&1vS{+#$Z7Db_eb;Yy)?M6-HLT{P%36K(-MCZdll-oS^4Bb!4r^N~Wm)Xp
z&StQ~k<;B$zrDuNRYG{z%bRn}#TWTn8GMY|dGn3;uEr;wmaP2ER)2IeEIw>Z-1TVJ
zy6rDTG%Q65ge-SRFSEQPp$={b{6A9z9uJt|H|?Ngi;CUdkCu*cTW#!AJ~KH^me_jW
zb(h7#;%Q+HJ2wbATw2fI@V)l_{%1`O_i%RxIxxJq*>~Xcqy3_f?e_Ehn7{Xo>HGby
zY)$rj_M8r02etO|w`<t%y>{PLW=Hw{cR8l^|3Ve*{+~FoPy3al-Q~|`_f6dyzyJEO
z_cp=5Z0%QklCc+FmA~)50K<NzOrHIGx%zf-@2A-7`N{4RIq_hh*vn?SM`~63f~1r7
zJ!C#)J5MppE+AKF@5a#5eFgb1ZA)%WvGq6Ky@yBe#~zt)53F8`3EIlPf4=XevC|$$
z+fR1)X79Dl-qf`(u<wW6TZ_r|{V!wom%iGuKjBQH-I?0=cI{iw+p?Bg>~ZO{*;{1H
zY2y>Ev-dvJLEF_?>b99lhxXQ-*WD+)=j`6y(!BQD_U*E}{Eub7%k<^@UMFSR9rHQA
z_ms=iy{*Bk?Y2mU*;=HXut`qdZM{h*X<ujahdnwu?`^Fwr`qOe7TIy#>e%agPItfE
z2fjVkLeK18exGf-C~42$FUwc#RWdT)6LxKqt$6iB+t1JQ_IjN@y(io_)>f4L&Tj6m
z<9o_OylkC6EZ)l(8^4$T;UC*gD}L>nWa6?nFZ{lZuJ0oo7G@`#@6HqVa;=-YJ0i!y
z)@YgT&K^Pk-Re9W_Xx%9+M{r7w(X-&BDV55l6x(eP1(aSNpLUg$7MF&zn<Ax2=nbp
zIN7p0-^zH;Wr;_7wyrX<-uP>h&E;L9wpCRtY%?cM*n3`uWna_-Z`&2y+H76B_V4MK
z+qOqYUBV{Uy}|mB!)j|@n>p4S_lND4R{Xu&XPe(1tt*Oq3fzuZ`^<h})AZxH^-tkN
zd-AL&?6z8}y36nar%iZdijDOmfjtM^=kK{F(6ehz+HxD8qV>BACphk&c39Tt5l_(`
ziAy(k)vM>(6iyJc*}<B!CwAh8-6y1ZY+OGo?s@BKU@bpsf{pKtc~(dK9rjcdeA<0l
zglErAl?PTc!&q%++?TU%pKG;OxclvH?`uM~hZ<UJu3KE)bK=l@YyaLiHcWeJ_HL4Y
zw8x{V(zfE#PwSJ4yLT%|P1yUG=Z%frndNrJPO<E}*u7_8UhY%dsGha9<$q@FdBLY<
z>pm%AS6G_ip4<N1HU)Mu)-^N4_7t>nT2JiwY@K{zkBxg~q)olW{Jj|*>-W~)m|$yo
z@UU&iJjuOBPPp&A8@AYH)A8vx$C)Nt2EA&t68EsS(NyN$J;!zW9`hh!o3FMD_H=IR
z-Ft-Lo6XXKQ??tOcx~Qv`0lNl*tw_f^97q}SBk9#HaF~fvqE@J(yV`0(xSFDJnoWv
zTA$q7J;}t<rd4l_&F(49)`wp&*b{p;dH3^kox2R5RqZM7w6ggb9Bcb<ar>UUpuW8q
zA2{30i#%rYy=KiW|MQ=%n5?30^8f2tJ26Y`O`dAJ$7=Ocn|5h0o8aHVdrZauTVFD}
zXsxqNaPO;Eo2(V5=-5U`rtf)BRKKT@X_vK%<itIzwm-4_#c{!=+vvO%*Ogbhzocnf
z8)S6s`Sj}kp3dIcHVl16w(bnU*8I*h_B;$R-m_l5epl!FKI{DT&vqR+ac5WKwB=S8
z4IWqp&YHFJ^>c>ZirnvZhx#U4f2>xwz53vbwU<fM-jiA@_na`RvAM@-ZBux2mNkD}
z%kGbNX6<skzsUNIpXY9svfDen<0Ne|ICkvT-!^BD+e<6k`XXLi&*?Yz+C0Cp=gO`b
zwuYaItnGqW_Q*b#ww}z~v-{|jnO09alB`+uICjqxN!sQ1lgX;neA=!Zw~kwEvt_rc
z{rGI>hO`?yc1SO_wBEj8XMSDXP9~*d%l_r=Ru^|Z*r_4+W@p-SA@l#QzHZNGi8hzH
z%58pl#z{-Xw_7b4`CBc{9$?*-WP4{Pr^Q^0U{<l654r?*EUms{aj`1MGVAbU%N<81
zSgzM`*eUD$b%)B_9E;W~0=wR}NbmIdo^0hgS8r#~w)$P(&upyrT4`8a{;*@G2)Ecy
zTQQDZ7kfYNa1K0XS(zPczP_lzV&Y?6%Q<)SEo)>S?eOIF*!l0s77MF7-Cg%GJGcLH
zU1gQR<ZqesvuoG-O7~qQ!U<No@8(!dzIS#f&#sxf7`qI2F8v#5we87@?MrL<cD@Ln
zvF$=Y*3O^>6D@gmH0;nQov_2~z<-PUIo#%FAMe_6<kGpFwT|m7C53iaew?~wr@>~^
zorgqE?2x&9)k5h-iKWC8F3Y%cfjeUJTrK}sCR?nk_`b7Xm-f!r52`IcUo5cPU)i@)
zyrFkz@zP5c3nz!{SfyTT*{%88a!*o*MSJW0oooI|?n;l8wiMs}#&YkY*XF0p#doRf
zFR=VkI@>Db9_ubiwZdH=Rz9~p!O?Fa{`IqkkK8NE3A^NXt$FRZGil~R%VvM+ox5&v
zY%}CqvxD71z>?Wj$Ew}`#m<`^%Da{dyt6zbw0C>q$!j|s{_ot8^tZ)wy83lXhP)EX
zIoum|^6tH{^JCju%i2lnEjQ_<?U)~N&@8cW+s>knZ##9ek6S)%VYAB3aoXj!Lw|=y
z#uTe<z8`mn#p&!?o3ze?H@V%CH|eCMsWX?Q<+&|8X1#g8^X>s@%c<(Cx0x__?V6>(
z#bVz*7b|<I$ej$zyDVnhl(L$0MR(VeKis<l-q=`eIiO(K{ZVgMXZ(80+L=*S8>jxV
z*tzM@PJYAqT~RA6cO4fpxB5HB-Rjl3Jj?&qk~;$*6ztk%8^5!vUDxW_omG|=UKTsA
zt>fCsS}e3<$C{!YObajV5SVOWS!2AyV%m}d%k*E3mOBLdc2ym{wKH90rPaGVCoH=k
zLe3GYJjM?m58$z%=b-UP*MTEut3!={=z-Ozo9u4p&2pG*({wOEs{FuV<7mh9&D-o3
z?yo<P(b>Ph>VWQkwIk2%e+#MEU%t3*|5Apt_RL0;_Fv(+vwu22lf&){G5fs>7Vp28
z@xuONXNUc4Zr}ayLMH5Ok`uRMZ7kdGsk6;)^&1m=Hip)H58GS!&6%yTuWEs${S}@T
zyEijt?^_YXus{2(^8Pcevi2*N-?n?WxoMvS|2f<HmR9>dKT6uSVMdgl?X*>PZ$cCI
z$~Wrnd$dB;woj*L@0rCr_qFo<ve~X}YtK+rV|O&`-oAiY%lGwMliv5~**?2(RucCA
zcXjVih+x^zZ#>ifM7y$e?~kZ`FTA|%a{C4M@lR9T7bAMs=GA{&+pzg__c}$X>|y>}
zU^_`fWnbcX72B*&|Lu${l=ek(EZsNT<DqTi;<GkK4{6ywo$_SwdY8NVj+9v0o&2!K
z&g03Ry?YDntxIPd-~P&G``%nzZo4VBUfcE0cG<W5WAy$q@AWpe7eCltlB~3S<+^F_
z&QL9z&&Jzre&wIp)0`S=Q~a)D&!@#)wjrhNwp&fx_iEi-y0_E6%eE}+u&vw6ReR+B
zgzRnQK4|@Z+UH#bWr=&5BbjVlAHLtsxAXZPd!Da0Uw=02F$;9vQ<ueJ*OKpK^XNsy
zz63AkeQym}?B4%<XM4XrZ|{o0={8qS%(7+4mD+3KQofhpiO1&5sw%5VU-sI_ZvSCZ
z<NI~bvu5@^u9E`x9*~XSsc`p<t!>i%ofhVydvmuv+ub$ofX%`SPB!gKNA|4gU%V&u
z=VF_C%33z36CUpV(>}#o;_1;nYzf)cUrUs1<#<f?*q*q)=kFJP>&}ZOY$6Yu+9+8)
z*durE${q&ii8e1gXWATm<iAIA375^3e;hU&MML%!=Nj&*DxJQ2`>Z+E&;7G(63y#v
z6x1f~d3MNmPrAk)8*{Jg){Z9~_Dt&G-MixJ$K5=Sglu_uK3UHTE#B>?*kH4-SKKNp
z^6Va#^x8d~hb;Eon|Q%`-Qug(#pkoE3#aATIw{??4)yHY8@zPho_UqQHpiRYb}?)=
z+k1Px-Co0(WV`Yc3+(Ks#q7JGxoe-8?7rQZN0!^3oV?7|T+iQDdgFsV-%}L!nk{46
zEs@4)Ga*55_oUnNtfwAs-n;A7e`|G51-o~X-&nK0-LZGRmeC%ox94ouS>)`wZqB;*
zO?I@+LmO8c&RbsAYV(u#Fxl$uIqAx7d&}0<hC_jA@2vx3woljX*twf~<=%!rF*b`M
zlWi|AzHfcbcio<6K>~YL+U~HnDde}FcB#$Edu{lx0~!CU^giqE+J3{?%0+dCRVDwX
zJ$@bv)(nD5w#PcJTdkNWxOax*w>^egA+}Y#YPPd2Q}+IvoVI7~<Ow!=yIL$?ODXPn
z#Mxkzo^@*XH+%iPN!updbWOf(Gwq(vo;yBIcI4V@-u>?C0W0yH@;0`{YSwIW3oK(>
zt#%)oSF!uD&X?Va!RM@h&#AROwk>1N-aFH+zW#b|z0#A<=J@JoyW77`vd)~f&PI}t
zZSP+zk39x*8*K`{E!)lGRI*D`Z@Tp%YlR((K_a{Q*FLkHUie|>2BD_i=eO>(yp-|O
zdh&7(n{Rm=_e@*kwAa%8sZFIoqiud2`=0&NH|}XFklST`U1e8p0LL!r;&Yb$tCsJS
z58|*~*C}Pa;+MO%R$h<Il*zd^lN8$bu726S_sNP>+l!fvwhk{p?QUq(*`si2`>yL7
z40i3w3D|XRS@*8^$(=iO_;M}dFMQt_UioEb=H_*lPgh&-5I<(MGqq={MboL)ogQV%
zI}a>8XZiJW?~VsDt9O3?FK-ppw9DeCx7aS9>HL<<*cf-2DQ@1`m@RIVP^oKqRr0ds
zU6zcUYdXDm{o~kb89wK>We3ke3r4>?=EvC?cfIymyF*S$#VYd@%Px_<$9Fn>J!tt(
z)@|qfg~FDHuV1z-P+hZA>f)}Q_cEVbGFrP>e#;fLoS)dUb9u1rE(_09mg~H3SsajG
zWU*`0O^dq=40o+J47TL@7ityy*J<aCc^*4G4_(~Job`5x@tJLwyg5-j!&<T|Z=Eu+
znkgx}!`swim-*dC7U!nQS;#sb+xg?v0?WdG1(xgIs_*K^<l4!sS7LQDNzAe%{r%1t
z4;SzJ>GZ>V{e~n<|2vy^#>?HexFPCk)g$_S#|$>_T|cieSO&0gSiSngz02gx{GCy^
zbgX*P4_JPyxVK}vnfk8BpT&1YypXj@*NCwa?tZ!Rk-pZhFs@UUR?>x*l@i4kKNoJX
z*c4N?)Bc{4W#R7rooRh5c6!LLS@ks+SRVW}aogE7%sV_)F6}IJ=h`*7$ZBVnwwM*O
zoq^T2l~p_Lt$nof+q@k+@7Fu+l#w}N`Tx3smD}RKmfPoX?@U$QxGP3geV1rKi&fw3
zP^&%KS9hd%x$NRzEWdM(lDXBr(3YJSUUKc4TeQvc3Hv|Gymb+l5eB6@4~3cR;+Qah
zr(9UB6~Eh3%l4V!yYvrw?>um%+tT2EjOEr(6D%eCTz5V?thCE)!dVMmHxsMw9UFHF
z9XP*}?XtU7$XuVDKN=qFRJ(0w^|RPvr``myUE*Q;Ew{+b-nlrQcbDi?b*s#$x>ha<
z>XvpZ6?SgXl;7o|^=s$))*}}C9y?oo`n%qep@e^zTa~V*u*K}10_)9pO$br4Tv6m=
zd1#BS)dhZe3x~N4J3Zgtv~1xpx9~W2W@mOr?@o&e^DIIIAMWG`*4TOIN|Du{sWMj6
zQml9JT`Ac0tV_&lt>#>-Gyj?`whJ}wT5g@X>xfCe<t2`8@P2_gojKs~fRjtQ4`!~L
zbwG8Ss$=`oCI`3W{~cbW#XDHv;y)<2`rHA-QziRPCO@-pcpGc)GwsU$PrA4Fy)Qms
zf5cYX-sAduyJep(9nvq)vR|X>dVuZytNq+-<Ln>$aqQ=QCBHAKqR0M#iQK+(Uxe)E
zRkqs+`_A6)lFPdP_SH7~8OKuXeHqT|^I4F%zxvbWeZRCA><rzE?DCaV?RPZ1vAg-|
z=)NP&v-ZV^%(DyYTew&G(1v|7e~j#oPQSlL#d6uc-p|gqK@}}_Nh^%(micbnyY1r?
zTl*!8Y}%)C?ALysZuiq<o!t|WY5R^QZL@u;YiOryX0%`9*}=U>wX^M~*?ii|*Qm2^
z_f;>uy0`cD9y<DV?~6SK`%JoxY;|A7+RadwwYBQ_yjRj!Y;Rt1=iZ5C5_Y@no$Rb9
zUfx%@cG=#rUkB{AZ<?@&|60kuWt${yXUsISOLL!Ry~o+hMuK(!-tWRKdzWi;+pgI=
z%eLdLj~$o!HaltNefwTBl<wbkQ_M~$P0~JceveJb@9%qMZ+*5|Z#C0)D{sbLf8`l_
zl9!#fF-}ahHZk|HQ847*qx!vVug6sHy;J-b+kT(F-qzvp^WCWt|MpD0k+bLVqo;fL
zs@CpV{7l()>h@JON0<ED?Q~(;9)sSQ*2Z5~?|t?saF5K=Id&f%@9kk;)4FeMg{JL^
zquRFR2i^AG+LO2ExTe3Y?6LyeO;cF+Hr;%&=aSqu8$O@)yJZ!ktnHc}?K$vY!FHK@
zlkHBMwR_W&L-yYN%VR72e7jBdDM9N4^M3C34py^SY#L`%wCu{BX*1LI^z=pAWNovu
z(L8k0+V|mhYu|7Ad+P4U?Omt&$XaEZz3pttSeplXukM*=)4YfG!x8IOpXb>u=zO>P
zN0H?ouBm)Bq0&=!pOg4){dvobT`M`6_pD;iwh^#dyL<Az_&we>UN-T!ukL!VY1{5+
zQM0XUSLyEEI$y*lW^JAAe@*K>_V@Pe>5ANLrJ;Y#CTS|K&Ds|!d;NEr@0r5nWt$&r
zw`bL}hCN<O-t0;$(%GZ@pw5>4>vS8zmnC~A?3lc}Gv@5>v!1=SlUK{_eVR3A-;0?O
z?Hrygw3Ge6VBfrm^LyvERok9un{N9~Zk|n7Lg(HmLB=*GPIB9rzSpttf52~JP$soU
zqQ1+v?wRb~+tzOTcpMJe)@>2A%emCQ_r~_3J-<CfZ7Y+O?OF1F;U4!gf17J=r*;MI
z^4M)K%fjZC0^jcN-Oamy7q!|vS<JBa&a0n$W;JoxPT@OX!?>x*`ZA}&9{EiY)&=Kd
zt*g{M_q_6v-}y<j!b;KC--`EHyyd@cDQnAq&s}CAF?(i(3)(Q1dfMz;dw6$+RiE{V
zkcQnSYZdqE9+tBxv<kGnwySP;%%Q?PC)BT7A9#9bdzAXNU91I3*2jES?I{b~zo)Z0
z)^^>dtv1hI%I&Rc-o0CG(-CX2?;Lx0(@yVH+gEI(pvq`9gZItucU7IcLX5Ur+8lAV
zcG{(4?ZYm-+ax$*_lxt47WWrP>@s5twX|5Gvb*rkLF;Gx?QN7Vl<oN{WV`3kMPHj4
z-{x9x{UNve>!bc%ei>7D-MLg^nI^Dc=fSE)*5>`otoO;x*<G@rZjb1(ygk49JZvW(
zo@DbZq;{`|!KGbn+YZ}Y^VqnnSnuLaSB56b!@BD&)46wBa<5ae+`VMFl~&C3UC(y@
zw|TkAW4C<7?!7)+kJ-Hc-D4|o{>z@#`a*lMgG6mU@y*!9+v;rfY<uXgvSzIvYfhP1
zUb)z28F5v6XXLCMmVp8Dx36M0-qmG3Z)d--lT~JwyQS)H-CevFm3IC=&t%n+xqatK
zgJ~9<@2Ok;x7f4u`p!y=)%iIV;%^`Al$xMnsjydS*U#5gmOiGdt!7StyR%d4;;zg+
z(=C18ZL&(7)3`lc=Kjuazbh@jt}@#B-^q4Y;Kg=J&R@?h8?NozA=05>X|_UhyF$*C
zotuyUw5ThXWO*Ut@6HPy!aFXtF<U)uWZfylo4WI~&(<AAVrO>f_|;in<d8J0R@2{k
zrfiYr*J+tMIcpY~yT99LnfrR<&W~0TEG=(*Fw6WXu}e#+(Q*ZUjiveeg%;ghfjd-B
z)a?9epSL3~Mrh}uU@MENg^w+z#h+W|Ofuc6`G#RvL=^Kb8S`8Vxs#?=d`jj!gXAym
z-1+XL<%f(-mQMti?r>ddxNE0l_0H*TZdR{YURt_8FW(vV@XXGQ;qP{=J#^l3ah{#!
zjj-e$w^sD;EUmh}^M>V7OABRPOYSc2T^A$jcKCESTluavvyin+-^G`_W~Wi4gw?XH
z7^_sZ#+?<lJiF@6Sa)bmU9ltW?gq=iGqyX|Oy@95I8$xa`1<_LFYz_I_AgYiw0-Dl
zRW<eUP6h4eT?|GRR;T`-wOo8yb$fu|Udx!RYj%DvVzkt&y1)I$yojx06Bby0v}E2@
zq35;pc5kcYB);DkM_*g+$kP(onaaRnxk_sP&ikHGJ1>8hvGPovZjpLdZdZKQq@5Oe
z8de*As#-;6m|841h}z{>E3vEOeYd6Rrp1=5rxmR1g68gsYi8N?#<9WTuk}U?fj4qH
zALhN-;b4%n<Ho}qmPV}JR&Vzi?5Zg9+9mQr(#pPN!Hy06T9&6bw^%SG$nQG0I@R)T
z%Y4hnW;-ljF?3m^_rKlIc;(X0O{wa;HZ(U_F85uw!!2>;_79sYtt3KDT2`07-ub~;
za91eDznwwmnwDEbs;m;+4sFldB(>|x2_wrddnfNaAMR?&ktJX?@9T=4e_9oGX`B4E
z{IBuca=uODuFsi1JFTKrti0~71fM79C%NMQXy3rOJ8SIomw7m>n=9*Rro`ePB*=4c
zWz7l)*LtP{ZaZ2IK6vNp@b!?hW5^@F{gVsp4*b+>**7Cjbbo`vdi%WCSbKd{$pf>E
zqa8%n?6Ef#n|Q!uN}T<q4mO7`wVnI*ENl16?lIrry57w`<lPqg6H_MHIo`0?zlL%B
z{^_lJc0I=e?OU&O+OhAOu}}V(nq8@sslEGy=>3Ti#{1V-ezOy>+GWciQ)%P4_`IFW
zy1sp#9{cyDm|d~^meOIj_|p8ni{}LG<A|HK?{VmM+ZX;ucD32%cA00ZY`yl&?w_N2
ze2?8J7JJh~)4c^gbN6`)PqKTj_1x}GF2jC}EqnI$ep_t!bEd-H!;Xo2e=-T#9$mJ0
z@6vB}b|%vlZF9ae?@RF%vrSSBw@q(bvgdlmygfO($M&X2Xz!cK7-bvr)7y@(r^wdQ
zl*4v@+^jwKHf!xue0tF4@q`_=|Mt(@yW?Hgp2D(6wmy<w)||U6?5w{C+IMz8-`5%4
zyFato-LAx6z<$k^bvBO!?Di&3kh9UOW3Xl7UcbjUf9LM(;|(?~!o}7vY<u^3KN7I{
zSJiB5D1T&c*R`#C4QglFz7lq`owhO1R^z+#-uFhCdxI<uZBNQ2Sgl*0x~KA(wN1{W
zLpFD+F6=pMn6~#>H`m@q?*dz~-br@dq09DUvd!OjrhJ0Ur#E@FOOBWAnH(l<t8(q!
zu6Zp}_wX;N-(%StVw2BZU?cS~de4p1PPYH&t=Y4AQte&=dp6s?3AuZw^qjE@QDd~N
zH|yM;bN$Eed4-er^sjKV$>HL&4c^DPCnJ3K9>1DXJG&Yfth)R*>@j@SV-wISYMT}(
zymz0M+a8Bk|80)2$6IGkow;X=pRu(<+<KdhMJ9XFk1X6X%jT@L!tWky^Z50<KQek+
ze-oIrD`bVZ)vTX?t@YkmSl_92-{U7&wp-lG&&ELP@NR|WcWnOteQk4;A#AUZwDevk
z_YND0Xjhx61M_V>ZymGoe$}|=l(6*P)V}Y#((a$PdG#yR#v|<eu8rl{d%XnB_PkY{
zW7~2#(?-a=WRJg~&K{4QUu|4t+HLE9w(Pr=6T0t)(L%cqHl}v#XYSd{a87g2jnfaT
zx6bq2`>#cDkN12<+x*fkyN)HV-E-OV?`|zaUfYeEIriRKe9R{8!z|ky|K#>bzE;^Q
zc8A-pR?yMLCRKKCz`S{Tp1cvW(YkMM)1B44TSsQb&KyTRYrXh8yYnmCtwjDO>^XVj
zgw2&x(zeeQl<)m3=($IOJ=nJ4l<l5g_g8yn?wMuX^~c6W@445m^SjpXI%%zKC3?Z%
z;);I8Zt2zRyU$m}*gU*vWz)H>ZqHI(lRaCf8Cz>EeqmA2U$>{2$!^c$I3`<d!^<{C
zk`8;~n<Dn8Cdlkoc(UKh<Y$KUF})jmdLO;E(ie!b{h2MW=icYXdrFk;taaE~tlzmT
z+?^NqVfXnq9vhxtoHmz#e%tlPA#(RL`JSB_iyN#G=1K32e}B^|VQ%fN|EZ^T#r&VJ
zQ{wp1UESODYyvrbcJI0$z30{+o!yMTXYaN%EwJ&o<F$EFe0z7W(w3c%x18IxL(F2g
zYKN0mr(UC_n)j;RqSG^WCqLz~vArp0JA2;F-H9_z_o^=wx3+uy*?QgS$yWDHU9|cx
zzjIgB4KwR-+tXHz1?#OgSV!*m?R4HPyH0$!?20~{<QH0dHagtfV;5*|n{(`|bwaV!
zUb}sE)|=jBS#MesXBBl;)#^%U+OEvdd6r+Uf3nypGvDfGVUE?ch=g7LyhU~$iZZZr
z^$oCO@|<A)oMWzKSdiDw3r&K%I8H}deqhtE?0<B}Y(g=&W&XkCJ3Sw~vXnKEvHH9F
z<IZlUs-68-&N~k_>Fs*=G}k<_+uf>lLbj#p%m+JPOyRJSRgtjx-08M!@dQz;X_KE?
z^4J>eO3volWl{d$V(Y99%k5hwEdLkTS-4wsS+yVMvWl6XwQHT&;$7`imRe>`oM6?j
zvEK67q2`@?|K8jAKlk>w30I{pA1F=R`C`XWi>y0+mgnX7?fl7ob!Wi3d6s`y_FBrO
z>X;vxz04v^meFeZmsOU{8%lQ7Z{paM!6;$%*j>!hZ}YG1aYr6+|6|FvOV@Voj&!z(
zmNL!HEK@7^t>n)4?cCy`u<PbQi=9T!GM2s{_E>&cbH~D_W!uge^|GBNshyUW9<H`z
zSSPS6@#gFumkKqloUd=&Dd}Oj%O{N8YX9e8D~m*hT`EkSI|COgSrtbu-Wl3wzw2k8
zh~>jXWh>i?o}CN67wqg^_tx?m)2AJ)&-z=&J`%Gs%U{0po4M^Sw!a5=Ue2<xstdEX
z5-DQZC9;Zjm$vOX({<9@EzdgGTJl6s-MK|wWT))AbK5J!xy`pNoM$<;>yM>cz17ZB
zy=uFH+9fO)8vD1a6maYkeVb<0I>Fg$?y5<<I^8Dk)Z~q@dVDKu2h(MVU4E0kTPkTE
zvE1hCzH7tRS36_wOIls{uWQv?B(kf1%fFom0>rG=T6tJiN_y_HII&`vv_z8CvwT@A
z72!!cl{lVSoHfYXp16T&$M4TGcOJgmVs22h*7A{T&yGtU9W7^?FznpA{o>A|&)Y4x
zAD(8(-M`$D!{24+g_JqF-bGE^sp^|yRk8Pi<tG359p{#v-FfAc`7UnP7^`I6YAc-$
z4ZAFwI4yF&Xj_GwhVL?Rov^c!Ic>+mDeElf-OR9R3VFPP$xn2b@%qO*SH5quh*xj3
zjPzY$`Rw)Qoo#z>?tE`M)ymjR(CWgrv|SS(6zr;6zS~0B$ki(Qy@4gy-zPg8t}ogF
zs{jA$`+&y-c+4{nelAl!xNMD-<E;nl99T?0?LV+k+wrByLVKMc$AjPOJN7S$+hxx)
zv%>zM@+3R8)x~y)o`mi@|I&Q_ewRh|*KU{{n6k8ce{)2NgJw&c{acU8`}eqq+nvu7
zvpag|@V>oSqWc$K6W#x*WwQM?Q+d1dOZM$Mv&_amNVs}mz^Xs{F8FlrSy%64x0qq(
zK0ec$eVW_M?dP1IYUlmo{yvLK+_v}orr0jYOxt&oFU{^;(=OYPUBCBvacJ+G&=+WT
zw>Zkq#JSz3Mr7~4#^=9xNBf_&v;Mi%ZbzW?9u~cu`>Yx~_GRVQ+vPJx+uaxQ-^X>D
zb$>(ID%-gs2KJmQd-vYCdUfC8a}0JpZi;p~e<$z#_}Ro(gE8CI#8_?b*KGoOXW5_M
zTPBfVYs1uG+q}$ppMKCZ+s7YyZP;ve_L)?M*(r&8*?Efn+U@QCcW=f|o_+E*|Mw_J
z>shy@X4?9cPP6ssGuo?hh0ktppM?FKDR=g@J?z@g!aK!|XS107bNdN<noT+OsZVd;
zdp7W%ZJORP+sTi`_dH`s-s8GdW^ZwZ#@>TFN^ENL4eY$#{q|aT%-olGtj+fP8!Nj+
zORe3C&e40VAII%6&Xu$++CA4=fX{W$rE|`EDpqZ?`MOx%wwIUR&a*sq@3O!T`_?&I
z?B(KGZFl_JUE3w8Pi>~?ZrGD(TC<mDV({L?dra1E&fD3xPdR42#CG1EIRY<sYldrC
zTWhS}%doT3W+tP#orOb}jV;HPy^VItd;K;m@3}p_(nkK&Ya4m~*}E66Qs2AwQu!W}
zKWlBy_omq}tYO--Y~sS*)8C!6Nqc2tQzCO^k4$!@71x708|#kEdl<g%*`w}t$7Z?X
zMjNr+`}XX89lU4KrXx0jj}mOex2f;Bm0Y_=^-{o|`lwu+WsgqT%wA%=Crf?$p086q
zZ7QCq*p&Za*&|afx94)o{ym{-SNH68kg>J>oMrpqy3HP@mg{>y-1Xh9eCejm6`_e%
z>*P)LUKdH*ZM3M_#<5M=#-9C^WsZfyUdc1;dw)(+w|y_%XuFWT(7N;P{5@q0UH3W(
zOt!hryUF&(1-E^RpC#^<(5tbl&|bOA{$uOjQ_h8ZDs1%jOs%_ZbH+b?x9voMJqnf~
zHV&;adnT;s-zy(}(6aP){_f+F@wSgoY_iolY`OR6u~~b6%HFj6@iWY3$@$m29hTKu
zvpzd*{pM-M?(^JYR+2Bct;?NrcWp9bw9!y?wtafbd~cBSn!N!&nzn1j#BBqQp4zqV
z`&#P=&QvRT<6XOVNfqqgSG>(iP+{|~a@qbJPdJ`io?RZk`%=v$t7p1;Ha|Zw?eTbU
zd3S-HgpEhm5^Loj`MbksGwzkxeq_%FO=VlbgTA&b9_D+N@?6}L`+{@#%4@m1c%FaU
zIV*VTo{ge2tiHvm+PZ9Dw-O58vgg9t;vMaNYpm6Ck6S8OXYF}wDYE-uK(q~Ka<%D;
z_4&JBoUOJh+}mbVST}LkV)J#o{BHi<G4<|Yi?u7ctd2Wa?26P0-6LRbZj<yz#Wr=>
z@jd@aMfRrrS#M+EBx<8t$GWF{GsCXuQxvQuC!gNMxcr9Y*BO7T-EOnloKf4d+q>Lk
zk0(pRp7e#Y_w0Q1&t}RbCfiT5X74dyuD7R&rOul1&n3%_-%h)Q3m5Euz44Y+{`qj5
zRqv~JeF!k!b9O<Rb*RsJ%X#V1Ht)V=*)TiK*;Ap{vq!aq$y)RBHtV3fb=E23io5S{
z%-TJtz|;C&e2aBi%Z*)HuP^MXzs_Z)^&r9OTgUC49yhFZvh2KI`64KLXW_pcJ3QGO
zE&o@pw=7t3ZD&#8%^e{t+pHcm`RsgMmb^>NDaG=Zl;MtVFP(Rtcze-On<vl8ohQQ5
zWNr6O<5Zqqp|aNIuUD+tu~xWyr`e2V%hXklR__<gu?*ZTwrh)X{Z8k-GP@@6XIY%O
zvfk=SP20{b>%@0mTJ_w*vb$jCqdZ2-|E9ZlMzV=oHe6M-npeEue4nNNj-zZ!yEbo?
zuw+YYw#r$taHsTxwq3e8(=8rU-?mKp7_~F^|5wZJ@42kv`%-sZx_f&2_dk|a>#a0)
zDSMsUIho(Z;#OGejuJURtC#sMR{vJ-+nF8Uw<~z!V~a~K-FMun>$9xsf441@vwY`*
z77wda(;F;WOXGHF*B;-=zf#QVdM1yRQ9;wrG@n1)-yUCPS-0WvPQ^~%UA8Z6Eq~ju
zwUm~bX0B6nbw_n|-p+TXg_aEIZI&J_0=pI|FR(N><hOd;YrE_1<C7L&|7cll_^!1p
z`n>wCm4%X4&Eo4U1LebZCMsy{412i4qD_2(rDA*Q&hq(_Er0x2XL(|i&@NNAg*%m2
za$DBDl(aN|dw;vgiZ?r7Ry^LZV2h*GO4(-18C_mG@5feJRL_&%na)4i;(*BJo%fh0
z?i8A2Yc*N)(T?zE|8^dXpJ%!L-DFFhgiSkhgkM<vJ}+f;^61&^YdvjtiADSDnkFb|
z@${U7)g4Y@tAL%acBW6$*m2bSu_dcm^3K-h9Xpq7SikenyDQsSo!PAJ-JNeKvv2Lr
zZ?b7S8~xW<PS^0XJf{+}bGpr~od?6KcBaiVu}m>sXlXl3$l}(Nr#lx1F<Z^$WU*Se
z-EWs+-yU;Kjx(0pXQV87&Zh5N!0>n{!>j+>O*=!adJ}7`=Iq+L>sS1gUHR5at=`XN
zv$|}ryz7V)_bvs~&6ZPVaak#ynY>eU!IB+|9(C?K^DfTf$jhsiF71Z9__i?bberX3
zb*FOvj+Y;MEW;PIS(>}c?$TYtwet*nrR7KKzZUtyfjdF%fCHZwfX4&0|2sMKXXQG0
z7Z*9alf34@8fA4*K`H3KEr%4xz2?jZ{W|0hzMgf;!Tdm}L-mF^`^En3wF}U=XSe74
zzx{kih3&nLw%R-RmLI5`5WY`3a+1U3`=|C*-sCt?{$RG9bk<~h*OoPQ8;^DG_lOtR
zU&<(J9~d*$uDg8Rp2RxmeNlU#@6G&TYFD^@fvxF^vvxPG3G6+$HG9AIv*&xS?$xqS
z`t@<ob@%D}1cXcMSlmPQEvwzRum1>#ePI-%z2tSxeLlqx_HDUew092U9J^<87T8sb
zE#J2<T4w*GvTb&sX0EoYwzAyk9G<-QctzA+qb)7_dTxEUd!is_e=FZ)e^}3leW^+F
z?BZtD+3gMO*gMhS!QSiQ({?Y_PPM&bZD4o(QRiL@&cuDPZ|2*orSjNbye_p*<dwW#
zV90CR#QM2=jlTZ3wc_O6$Ex;z??Sc!yKfsc_C?*Exwq^>hTY0dnS1&t9NXJIW4+Ds
z`2lwJyDr*A`|R9z-92o-7O$$^sf(xVmR+dX{qc#E&184`y*p1x?2Wm>Yxnj4Qrp^%
zR(tPwP2T%H>CoO2ksUS_re=1M(*tdt-&yT*`J`u?o8M>4Dfw=1)6Q_4w2o-o9a2nt
z9rSkY*(@Pq>r~fev-D--Ug^o|)<vc3_I_oTu?w-iU^n0O;Xe6`)AniTEVG+-$#Qq=
z-<Nw<d~MouRLEja2e+rK$H)15CPz%(Gu@=k=GV89-Ai7sv2t1>V<(f;z4In_*S?FJ
z`1eeBEMV7iuzJtxHOzYzFALi4{B+Ug;u5aCHhh<M{r)x0TF!svo=F|-w#mtlYz{3;
z*~8A=vfDVTYtIxB*4_0cAFU5{9|p}kSpPnK#D;HE^q%~Pjy-}$b8Pq<x~v}@nPZ(i
zzuD&I@{~Px7d-Yn`tjacebXYF1vi~{FV@(+XV+ZzT~%^Vt!FOO-E-8ybI+W%m(~w@
zJ8afv*4nO7WZZMi_2AwKigLS`C&}1up3!2}ykLn<s#TQL10RLGuc97XuRA=?W`20#
z9?{iHY%V&f+Gbwau=m`vjJ@d}Hrq;Wma*M(Qesc--rBuNoGbP$m~Lk`dCQC48}GR6
zYktpXJ3rUMmh+$R-U)t3c5Liouys`ox2|WHwCBRs<vZg89Cja7ykj#%aDz>*(K?$Q
z+oJcjHt_A!t4gzd74+CvwqeJfEuG4HLRkH*zwc<;ZL+D<`gfbxE}zWRyWg&yXSwR*
zYb)U#U7M~wW>)GOckE?NR^Hv#!Eg6dtHLTir+M$MN`EU)em`pg-BRnA<uO+4{I2Y7
zbX&S>b(5O)!ki+jyQxA}xA|x9GJ3ANE9;2F?hAIAyPt%*T66p@v;JMkziZL=P1f6k
zeD-Y4@!z|=Ynx4w(qh}0PgM8RbMozdxy@^r^~c7Y9tBf(E64Wl3Fb1jG2E(b%hx<}
zw|(!PJu0!=cT3A;?3T_?wh_x0w&`<o*kf}0`0hOh0@k*L2dr-7C0Rx5W$zMjX5W>!
zWakdq2+^H4EOM+^F2A+ftGjvU%|$jg3q0rVIWGNbkL3&=Tg(4JHVV5$_V7DCvwF|J
zaJThx5$oTH_jaCY%i3+fILNBjg3)HbuFoE|<!g7pzHVxBX>!OOR>So+>Va!*npjTk
znKVIZ&xUUeyC!5aT634GS|4rAv!0=wXq{d%Vb98_t-B3oEwz#THrbkuD{Bw)D@B|2
z#Y=1)XE5#kb8GsZ7OnR-Q;u)2KCk_Bcf#|3RyWIcS#`W++EuyDad&=;+3xGw>{ffv
zUbNDlU}1S>!<VgVe~9d?l>ffds5{ScTdto~^zD5+S1LN~a$<F`yv(F-A-FNt>do0U
ztHYXhyI$XVYAKQ;wCh;*&s~2WFSO80W3)P`B4D-t#3D=1Z}vNHELOH`J7Boef>U|t
zdI5c_D;XDd-ao;xi^cnd<=lfMJChaXTb}6Xv&>&7zq9e1kLBFo;yax_=4~s!^J2T`
z#}hj<uB^7Ky!6syr!d2=CCOIXZ|eG6Zjo)UJTtS%a)ONh&f6Dn?})74Xd$&lYS%g$
ztsNE%URZK|k+&4E?YAsoY}i@5YyFPqw#yc?(&Tnk$FuL+s={lvq>;<2;iH1(o`8*(
z*R)PqM7e+7S^7t1*N<x=mV4PFcI-4evNLr_sMXAayDXnf&)rq8l3*EHVP++_=lPBX
z6|G$?_f>Z4XGB|R8?4*8eVfKEuBY!T*(=U(TjpA5(ZF=TQZz-+QvC8I^M%|pyR=&8
z>=c?SXxUrJX(`|7Zf>La!{X^_9V^lQF*`3ZZQG??>9JE|=Mt+MA7rgO*6rLm(f9C9
z)BY7Z%kl**UH0F!{9?tvi#K=e4gn`Ks}rFDJ2Tui?VMz@aOW%as+~LjyIDy;YPM{(
zlHT=U%~?yE<JFedp0>MsN&_twFUMIiuQJ%Ve-Y0vhQ{2TVnWAv_$oB)%(psh{yU`J
zO6~4l%Pm^XyD}C%+o^US+iD`)+@0m?G<T^KM_bK(sjzeMl7O8vLfNe>#C3M<tIgke
zEk@bux`=?~;eaU?rnPE2?Uqh5uU$0PqR{>I&bBiOJC{FiwY=|QZy6dAu;T`!#Ln1D
z;XC(NNLmRq&9Y2O>fWU^J$PrXUzb&2Ec=eX(^__2dTnlbe$#QQ&CCB;xL#krOZ;M-
zWoFqG%cUNEyH4$N*^xW-fyI8$`#XQ{vaw2v{%Fa6g=N=v%e_0-iL_W;{J+GK*}!9m
z$n(yfk9HlmT$z<`8E);iOMT^P%YP>Vt=4|k+4b+li=C72&$G;scxYL2Wtk;|r1CDu
z|1P^4zv}JyV(V`8u*(3vKETJ@3p^f>BxZ9kdvoQ%xBvb+__CNg&bzB}aMOu*_UU)E
z939U1ANb|WejwI=?*1Qw@wQo#KkZ-ItluZsq+&1fD{y~A>*@Uk8*LpT?62<Aj;lVP
z`Owb(eauPw*$cMs{i}9-pUY+zTcfi~_DR3Y_HNl+yFZI<qFoBBul<{y-uo6Dnz~Qz
z-`l-g?%VD%J6>idU+T86H*4m;)4TNSb*0YQZq63mFW|V)c8z7aUFY2OdlR{8?7}R!
z+ey3@*)R2%WB(G9iFRps+w3ZyPu~4mZ1o<gRlNIdRS4UD37cbQ^K05Z^Ub>Z{w(jX
zo4QzF-^(dVd&`zP+h0gB+1qkBWB==YGS(c|itO$l39t*x)VBSjlD&^7hGCDVnu=Y7
z+YBofA@+S|wmsUjG+Wnpafpx21;zb)o9p@PUT>ReS7EBX&#SLvp8&6jO|uJ^T`)tu
zUG8M>eRCfd?kh1gwsSc-*VbkI<vmZ2zS-@-Ah&mssE=K$<WoCwf#ds>>y!6uuz1)B
zOnPePZn|ubt7ww#d*yoTB?i~`GBw_}5&4>8d+4{a?fcHvHjSS1_j(ww*duwVcaJ;I
zHruDal<j6+=h)YzYO!zb-<dY<s(H3|Jto@ZG8*ibE$*@TG*5hY#@4TUxW1QI7c6eE
z-nh$aPlRmvzBTLmZB0zo?f<(p>}BfX*w1>D*P3I;4cma1M{Qaw1Z^g`Oxg2GaKWC*
zaZbCpixk?tKCff_{L~d|qsgE4GB&5}T{t<*uI1!X+x^Nv_g<OLy;nY_$7b>=U7Pux
z{<|G?TK4d5I&CGAR$v_*v(M(r<V>4}PZE3iQhayYuH9!fm6LO?&4-QF?rHqCJF-G-
z)OOq1<jN`TnN?x5H(B<lm3Ld9t;fW7yX!tO?VaopV542izGwT^z&&~FytZ`<Cfn#<
z(%ajX!nNnA*M6Jq-;4L~x|>^1xEg0u-Kk>5${A>@Z>YDoPO*9KS@BTYiXGuLQ`Ot|
zT>I9v=kwwHHk><;+muXZ+xzPNHS52#x@^S4dG}gZ%Iy6ix5oD8#cEqClT~}$HrwvK
zFFw;I!Hm<EX-~v%>(g`hK7Z9|Q(tRrx9UXJo~8{F`*bgV*<C0TYjd`Ig3aM5E!!!s
zyLQz+`?P1L)w^A<jxDl&6Ct;!!@9_(?0oEA2Nf0D<>8EWY8#pMrR-|o`&o9c?YX=e
z*0mDT_jE{C?$&$EZ*6ue)bg>B^Nz$n>vtHPY1=tTxyVYY(R_E&rWjkH*Z*v;oj<vk
z*HvZjigUKM>~hzv73O*G36x8;-v8Ug#&k}kbzA=Ioq66CyM9Va>@<vW+IjGmzBOOy
z^xXkR)AsO3soR|TQe(4eXY6kEyt%ubI!vskZkX7V?XlUb$Q8V2XF!kbiO2T4lrNvz
zllthhm5qky?u78@Jtxd1_89Sq+Dab(V6&{};2sOnZF{tf7FxePV7%*cf$g3Z7rAXD
zWHf9#f2`PTEq7?wRsV=x#YvpItKzb)5~KC4Tc-9~`9*EFR4RLJb$Y*|)!G@?c2B9B
zyT|e=gKhOwRa>o{C3~k{f4#@|gS4#|1Cz}j{l4Aev9ot?&HB7sS~tTw*e=SZ@;&pO
z2sg7mGQ4}N1(PONTc>`u>FS@gdxwGB-YwdaHb?DN+Guhe+a1fiYiIoN^Hxv3ZrUZ@
zbk5R&|FFf5eCa)R-`uf&a;L(kfdBsPo7wVvs(B{tvDK2YekS|U#`M|?%jfHb_bkj8
zwl)asvzFLmY5g{I-R|ofL-)AtY1^fiE?~3$N`X~xtIV!f-a1x1A6+cX6$N(9`Eqy1
zR>5Ga9mx}R%C0on#Vqy1vd{m4<)THicRdZa+r9VW{#{K{ZPrerm#k&j_UsCqvuJmn
z=v#|3iNaRX48$yrwO5!+?PJ;Xk>SaX;5{EK&lb2@%`SPoLp!TsSG#2I&Ns~>R>3YA
zmgOeSJNC3E?(F(<Yv=trQ_S^kGpuBH7Fz!IciP1)U}Y)E*Kcv-K<2KB<r6K<F1uQ#
zPY||TyIW$X;YGb&uP&(U=#l2OdN(i9GU1tx<#dfpJC_}3+sXClg(YYGhn+h#qb%yS
zvs=A1`L*+cV%1KiPXfEv<(2N3Znw~C1@Br*zf-GszBw0W(e_AY=iDWpJ56UF-TCaI
z$gVG|_gR`ZPqfng+q%=}jnb}9;^kJR=MP!L?Vq%3%95Eoon~LK{J&k%YFTK9<@<?p
zyTo3oSsrfOXK~<D*RJaMR#uUXC05L7$-6|`&+aId+idCnZ{7A;<*GXyg0Jp8vv`N4
z;IdN|F1P$FHn6?6`1-_k*S5lT^SK`HEgk=yv)r(y(VRnAbr(AygXLkZeoOz}^*e4A
zOtF|-uDJ7^%(We>(!_SIP<vqcY;m-e?{24ET(yn65*11;ABbpMEs|;2A?NqeLf1>t
zYUhK1T^F9W?EEyF%c_1|>rOWxHp>O3|9AdcJaeb&<|3=fch^}mTYcWiRI0S=$@E8-
zdDZMz;<56(n(IF7Omn_xk&|w3l|5m)g>k9nt~|b7mV8qstSr^un$Nl|zH{2&e>>mD
zUf(H{@xXEg`^g<#=LL6N5)`!3<kPX_e8;})%{EKR<mM8qAiXn|#xrAfU6FgVb3xcV
zO9!L1JNHD??d;_5wPMLUZov{-z3cZvajS2$n0IXZ*uHDZ(l3@fvWu+R&AE0QcM#vT
zpKtok`SW`$<8CtUtdu*tT|8>LC8J~gPSyiAcI;dC*s|A8(PF!m;V!0<>>VEO)U7IK
z{@niS(8C?<vn?%u^W3y(dC$KyuJGwjO{dK}1D7XQRepV9StB-e*K{2n@OZ#m89(rN
zz>ClhhyJof4t2-u4&3qOcjUiw@IY8z`oYIKagM7mXgexd2_Bq0@!x^^53CL+*rqsa
z+i`CH>Za@ajMW$0rymnLFrRaqz0|@62bc9?2kifrA28kLYtLDG#$MA+bswLS&HkXZ
z4tA31V)mPy=G(oTZftX7ithf5-CX;h@wVErK9{$@n#EyvNci8rs9R@jzr~u{Zpahf
zU!f6U_w6{Jy^Qu@+kAl|`_xt}+}C{Ij5S;BTHCLC{@dAc&ayk_ylG#w(%yY{Z~5;%
z(0#?uzhbhT-IH7U0`EKTd%Sgl-SHn0dls!0-zS~%%%<>=r}c5}Tl;>`TD-4`Q_p_E
z$9HzpB|iH!x;6HehnDPpEv35e-1Eb`izeQ+o!lt1C+ytxy(ib{*q&k8YTGIzv`^XJ
zXy4ICadt*=4{RIesqWi(tHgHmD=9no2|D|x%Zcv0SLtW>DfO4N{fC&nmX%7jX<;v{
zehLcjK7M=q-V4dGb~lRI?birh+!v!<zW<zorrpfNU+j)@>DVsVt86p(T=|}^*~vD$
zH8<P5KJ;VH+{;{hudENTt+BanbMu(pUQe_9y$K8pY`MM!+b}Xm?#q@tY}<I()$V`v
zs=cmS$$OP=pS5{(=#$NcN0~O2D{A&gOBUK32-v#&_BRH*n&5S|T2>7E@6E2;w{qrD
zyKo^VyTrD2dtN&+?`^DQ+bbk<WOt;Kylv=dW?PPQp}mV$pYGAh*=N1;tbmREh1a%E
zbwh3ae@E}Dk!9Mq@ybbC{^&!tIV~@C&r=ZJTiDED<7iN4;~cSNw^`5C-9A<KcD1hd
zwEog`+9uUfcXx`o%3gJyyEY2~4%+nXmESvo+tWthKG^1Vo#Y<>FQ&Vvs|Z+cz1Oiz
z_sqgQ_t)>VS<ZXZ#?fWjo^Q|h?fHG;hjnNahs~!uZF?I1glxoDS=s0dY}+O1;A4}Q
zWnrzvu+B=L!D8<^W|h6K^;&F;^_gv_e3`SS+C<b!e9^N#Nm+h-mNEUd**S5_uAIPF
z>l;D5wvRh*?~dOSyZ8OCz&#StJ+^sg%B^fU`u6@fZoGRjbExga?UQXUZe-i*%j2|<
z<4MOJ|LKx;4-74Bza87TCn%F;ujaDFHu4PHY<jDY?$LaHY}Z`t2<y%bS9bfqRoyeM
zv1zwNda<p0hQ;2L=+%2$_Pw=T%IR!d^=Ikchu%l`xSS8SsYnvC*~{F#>-;l5OH=RH
zR!2jat^4ycc6~W?%}R2UmX(%*<6hZ)GJCT>&9`0tW}@wRKmEOCnosu>ecErs&MUvi
zaBbtBV^_1S6L{sUc7B;=CH`%m)%ors%Wm%5I}`jQ_vFflS?kE{ve9&u+p~~o(H^PJ
zWxE(vG;FMI>Dd0VJ+jB*TjbtiWk%a>p<bKsj#hixj5qAc*m7o<-|RVi%+}QHx_8{m
zHtb%X^(Ku!d-gvT*!5|0fHiM&gSC0K*sd)C)AyubTej=o(p;OD(UR7>j%~Xlqq(g=
zddKZn-I={-$_8ocnvIie8kjn*-!T2$eR-Mrp1KN7oBI51yOV!A?Y{9t#8zmL!k*8o
zkL~gM{?Gc%E#ut>IAr%ktIFG4%5}GS=c~Gh-~RmW*vhTeD%=}(3GkU(6`r%)b6x()
zZdHFa+wT{ZtaVo{-7`Cf#p+dxpY_|DY}RKQ3U=#Bo!%wU+iD%9{CXFs#ZN2apj>P1
zB{F-AX3f~MOu*0Du-wB|P4|j5kCepT>3_<1XYX8O{b>TP&EC%E);b4f@6i?M*z?20
z$A;g)%jWpj{ky&`?%wq%^{z#B>A7762Yh!nB%QO^#kzV|$@-r=Tqkr}SU+mB`e~kI
z)x!13GWlM=wboTdYwPJ!dm7`u@7}7s(b^?-vGwb(YP<AXSaw}_Fu^j{VaASw=OcD-
zKDoD(wbpH?--#|uaS=(Y%Mr&c!@DzfEqi!lr}5I)mL_w5TRH^uTgY+#-En+l-%jK0
zn|7|dG|#fak!5GezIJnt6d%j#d2!~Q{~4_~AMM=v@yq_5?i?#ElN9)OUVbC6v!rnS
zj&Hl?ZWme{zmp^EyT#qp6Rhkvw(XeWws=>m_bf}UJ8D)x&IIq89%FAQ-DPg|lS_No
z;;(Zom+fG%)c@tbD|z}gOOEH&mYSUbJJ&qzu?R|kyK`Fi9n0g4#a3Tfop-G@`?xdd
z`aH`3mLEGizues+RLN!4w1L&ijWfu?MdIL2vDHqNS3_NP8nNuzdE->sc8T0C<_F?l
zSk88wurnll+0N(6LRK@bh*(Zu(YRBv_0dkd^)GiyhOt>$O^CCydp2eJF(d9>KPRYJ
zw4c6YS>}+nb4ItquE@^;=BxOOt(5;r?(8i4yHmvbfaOP~o0eyMb9O#4$=k)cTy5vy
zv_h+*Yu_w$+`sO8XDe@U-_O+QMa<frZ8xQMEuY%G^H7uZuKzpaEoV+&V3oe6#ZqVO
zf}J6DT{{c!&EC2E!~x4c-CaAk<_Yeqzv^l=+j+kwvlhn=v1My5_u47$YPV|MA<p^9
zQf)cUt`30<JAKN7Ety|(>`XtcwS%>*%W9p;oSkjI!*^{9O0r`9tZr`kBXrjTIRUHf
z|9dRwR6Ffrp3H6)F#U|>Me~z8*L+vAY+>TvRd;X4PF7nJt6!5=TWSTI-x>WyU{|@!
z0n6VPwXJSEbKbeV`r^(!^|?FaQ`IbWf|giLocd*Z5|6e8>(A3W&o5Hlap!NK)tc8o
zEcVTc-(@@R<4)~@cb2CD&Rf>?oiL5E)wcW)H_!6OHs)On^VD|v$zHO2b==*uciNww
zN9($GSQ;x^MSK#n+PvkkS%bjlo&P?GgU=5zXyXNs2kdJ)dZ2gr^n+_|S~=XzZgsrd
zbo;=hwZaD#nm;>qAOGnfK1JJ(SH}8)#B8nuxBu<8-{H4pKZn%+{TohmIoxLDv_HnD
zav(;J+2Q2{I|tQ=x(7bLIlABO(rMe*dtB{yJd(HXe{#XrqT-~TpX)cfH}$>y8D{U@
zmtb<iZk_Lqy=GHY?N<Ggv^(afXIG{2cHe>-S$l6@d~0{W_4&SU%g^s!*urQ3xkkj!
zq4U>1FTuICuXnTA=ZLcJuiN%+pK?H(-NSVo?6RHT?$wLc-^cT?(QftSS9@#j>Fq1y
z-ev3P8E6w6%4j<^yv;VI_R8K*n;rK)+oop!QcA>j!9uJ3@%c+_8GTJ`EYxlHHQ(d6
z+wv~j_U4`&woe`UZGSDx-^<HXv3D&`)ZTUWS8Nh5bKBb8_qJUY^Udb<RN;NyN(=YK
z_vPA7l8LpeEdOtty=cn5->b6rw%AD9*?pU}SM6y29<ee5+xxTS_d2xe*qy9quowDs
zaNk1T#QgymTkJkO-)tB3J8y4ZM2qcn@6O#V(|h-%KIE{uv$fymiK)#VKgOUvDX*Mt
z<sW+3aLt*qx3sZgZ|MDrdu%pq*+p4!*ew(l+ZS8AWAAdi^EMKm4SOakFSBwKIA?P@
zw97{P*=lR+zr8kBtR(l@zS?BFa@i-l-^ttdCCFab_t9g9ouu?E+a5mmy~Q83ZDPtD
zZOS5M?O9#5V2^o<naz6p)ZN$qcJ5rUQrp`4>6g9bCmZ)>>Q>s#a^tXD!OgU<Pr7Gs
z#O6shG0zljwkn71*_<4)M|va2Zi6FCHs`IE*wh6%?l!5oyN6L{j^(*@cH4EC#=8?z
zr1q-1q}ce)x?_`>y>8FFeZAK2oieP|BgOYV-XXBd<Eod9%OpD+jjfF~*YvV>*DU9^
zD!b0P=aJ{i-I8h{HVfvy+&yE$@;$p}#n}|fuCX~PaB;Wa-s(L`AC&j>W=q<J>si=n
zt&rbqz`khr;T$=e?G~?hae1xWvtwP7%{5Ll+pA?hdu|<jxQBVgq22S=ZLnc@U20P~
zQ)2IdTb+CM8>rjLO4wQl%RkxE^y%pC<J;nFpRH@RWqf9}?^%5I-lWwgcFX)W?z#O#
zZEuFWi7m&}RvYO{Gxtmlo3Y2PJ<&SSVAZa3OtQPS{HnHDx^CJY7lDbpRyIzw@%3cg
zd&pF9_eT*K8x?~nn`o0>8}>_Td(N|b+dU`2U{~?ij~44?#dl6TcYBuvQ_*har`&sl
zX0EnjwCb}hza_QzMBl-^2RFXAx#RT4<`{GR9`SZxo056Icggrq-@Ts4(MH30lV$2l
zi9L~BA=bAQ=GjDu3+#EEzI9KzW6Q3Ee}ZkEyw|o#v$fn)A0xlV%uT^IblX;&iL1Q!
zo}7GT&#&3lHi~w)tQ$@*+|89U(K?}nY0sk$XRA-wxoj;oqxNiEwsntHuCvW8gYMm*
zo(b(f61&@G=Zrhn9&=~z*^tMzhc(RAI;T#+x~8sjm+$V{T}h$(d*-Wg?m4x0x=s6y
zRvU)z5_`%dXY5|NCEKQBd#TOV>V`cmE=qgXHrDT+Gxws+%4%1e_R>GQq~;y63JR98
zatxojd({z#-KRNQcgNa%-SxL;vh{-r_pN_ASlZlWY}^ya{d14r$_X}~JG*Qi<gVT=
zdp6f{``UxMmcMb{_1o^g)%0H99Sd_8?vmXmvzsaAk>!@BzjkkumD*Eq*V?v*<E70d
zX8pZO7eCx{<lk27r2Z4ulV3lvp7Ms#CR06V&oRwoyHhqu*qoT*zI%<#)?H6Td98c$
z7h3+Cy?qz&!autWdpT`BuIRN{)84Z?p-N>>;_-&v3O6}-e!41V9eclc_wP%(yXF7t
z+Wh-8(c1j&)7?+b|KBCrT5k1;ZI<Qz%0D|N{M)s2**0sdrRR2Ao?X(v)0Jt4<tMXr
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%0Df)#Z`<
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
Jmkw?R005nUfC~Ts

literal 0
HcmV?d00001

diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d5e4cc5dd60e96211ced3eaf6f08929bf61cff4e
GIT binary patch
literal 468768
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%0A!|!T$xD`IzQVia>5J{^$Z@k;xK7FHbavOS
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
Avj6}9

literal 0
HcmV?d00001

diff --git a/tensorflow/core/kernels/spectrogram_test_utils.cc b/tensorflow/core/kernels/spectrogram_test_utils.cc
new file mode 100644
index 0000000000..a2141c649f
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test_utils.cc
@@ -0,0 +1,288 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/spectrogram_test_utils.h"
+
+#include <math.h>
+#include <stddef.h>
+
+#include "tensorflow/core/lib/core/error_codes.pb.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/wav/wav_io.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+bool ReadWaveFileToVector(const string& file_name, std::vector<double>* data) {
+  string wav_data;
+  if (!ReadFileToString(Env::Default(), file_name, &wav_data).ok()) {
+    LOG(ERROR) << "Wave file read failed for " << file_name;
+    return false;
+  }
+  std::vector<float> decoded_data;
+  uint32 decoded_sample_count;
+  uint16 decoded_channel_count;
+  uint32 decoded_sample_rate;
+  if (!wav::DecodeLin16WaveAsFloatVector(
+           wav_data, &decoded_data, &decoded_sample_count,
+           &decoded_channel_count, &decoded_sample_rate)
+           .ok()) {
+    return false;
+  }
+  // Convert from float to double for the output value.
+  data->resize(decoded_data.size());
+  for (int i = 0; i < decoded_data.size(); ++i) {
+    (*data)[i] = decoded_data[i];
+  }
+  return true;
+}
+
+bool ReadRawFloatFileToComplexVector(
+    const string& file_name, int row_length,
+    std::vector<std::vector<std::complex<double> > >* data) {
+  data->clear();
+  string data_string;
+  if (!ReadFileToString(Env::Default(), file_name, &data_string).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  float real_out;
+  float imag_out;
+  const int kBytesPerValue = 4;
+  CHECK_EQ(sizeof(real_out), kBytesPerValue);
+  std::vector<std::complex<double> > data_row;
+  int row_counter = 0;
+  int offset = 0;
+  const int end = data_string.size();
+  while (offset < end) {
+    memcpy(&real_out, data_string.data() + offset, kBytesPerValue);
+    offset += kBytesPerValue;
+    memcpy(&imag_out, data_string.data() + offset, kBytesPerValue);
+    offset += kBytesPerValue;
+    if (row_counter >= row_length) {
+      data->push_back(data_row);
+      data_row.clear();
+      row_counter = 0;
+    }
+    data_row.push_back(std::complex<double>(real_out, imag_out));
+    ++row_counter;
+  }
+  if (row_counter >= row_length) {
+    data->push_back(data_row);
+  }
+  return true;
+}
+
+void ReadCSVFileToComplexVectorOrDie(
+    const string& file_name,
+    std::vector<std::vector<std::complex<double> > >* data) {
+  data->clear();
+  string data_string;
+  if (!ReadFileToString(Env::Default(), file_name, &data_string).ok()) {
+    LOG(FATAL) << "Failed to open file " << file_name;
+    return;
+  }
+  std::vector<string> lines = str_util::Split(data_string, '\n');
+  for (const string& line : lines) {
+    if (line == "") {
+      continue;
+    }
+    std::vector<std::complex<double> > data_line;
+    std::vector<string> values = str_util::Split(line, ',');
+    for (std::vector<string>::const_iterator i = values.begin();
+         i != values.end(); ++i) {
+      // each element of values may be in the form:
+      // 0.001+0.002i, 0.001, 0.001i, -1.2i, -1.2-3.2i, 1.5, 1.5e-03+21.0i
+      std::vector<string> parts;
+      // Find the first instance of + or - after the second character
+      // in the string, that does not immediately follow an 'e'.
+      size_t operator_index = i->find_first_of("+-", 2);
+      if (operator_index < i->size() &&
+          i->substr(operator_index - 1, 1) == "e") {
+        operator_index = i->find_first_of("+-", operator_index + 1);
+      }
+      parts.push_back(i->substr(0, operator_index));
+      if (operator_index < i->size()) {
+        parts.push_back(i->substr(operator_index, string::npos));
+      }
+
+      double real_part = 0.0;
+      double imaginary_part = 0.0;
+      for (std::vector<string>::const_iterator j = parts.begin();
+           j != parts.end(); ++j) {
+        if (j->find_first_of("ij") != string::npos) {
+          strings::safe_strtod((*j).c_str(), &imaginary_part);
+        } else {
+          strings::safe_strtod((*j).c_str(), &real_part);
+        }
+      }
+      data_line.push_back(std::complex<double>(real_part, imaginary_part));
+    }
+    data->push_back(data_line);
+  }
+}
+
+void ReadCSVFileToArrayOrDie(const string& filename,
+                             std::vector<std::vector<float> >* array) {
+  string contents;
+  TF_CHECK_OK(ReadFileToString(Env::Default(), filename, &contents));
+  std::vector<string> lines = str_util::Split(contents, '\n');
+  contents.clear();
+
+  array->clear();
+  std::vector<float> values;
+  for (int l = 0; l < lines.size(); ++l) {
+    values.clear();
+    CHECK(str_util::SplitAndParseAsFloats(lines[l], ',', &values));
+    array->push_back(values);
+  }
+}
+
+bool WriteDoubleVectorToFile(const string& file_name,
+                             const std::vector<double>& data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < data.size(); ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteFloatVectorToFile(const string& file_name,
+                            const std::vector<float>& data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < data.size(); ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteDoubleArrayToFile(const string& file_name, int size,
+                            const double* data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < size; ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteFloatArrayToFile(const string& file_name, int size,
+                           const float* data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < size; ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteComplexVectorToRawFloatFile(
+    const string& file_name,
+    const std::vector<std::vector<std::complex<double> > >& data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < data.size(); ++i) {
+    for (int j = 0; j < data[i].size(); ++j) {
+      const float real_part(real(data[i][j]));
+      if (!file->Append(StringPiece(reinterpret_cast<const char*>(&real_part),
+                                    sizeof(real_part)))
+               .ok()) {
+        LOG(ERROR) << "Failed to append to file " << file_name;
+        return false;
+      }
+
+      const float imag_part(imag(data[i][j]));
+      if (!file->Append(StringPiece(reinterpret_cast<const char*>(&imag_part),
+                                    sizeof(imag_part)))
+               .ok()) {
+        LOG(ERROR) << "Failed to append to file " << file_name;
+        return false;
+      }
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+void SineWave(int sample_rate, float frequency, float duration_seconds,
+              std::vector<double>* data) {
+  data->clear();
+  for (int i = 0; i < static_cast<int>(sample_rate * duration_seconds); ++i) {
+    data->push_back(
+        sin(2.0 * M_PI * i * frequency / static_cast<double>(sample_rate)));
+  }
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test_utils.h b/tensorflow/core/kernels/spectrogram_test_utils.h
new file mode 100644
index 0000000000..59a903549e
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test_utils.h
@@ -0,0 +1,81 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
+
+#include <complex>
+#include <string>
+#include <vector>
+
+#include "tensorflow/core/framework/types.h"
+
+namespace tensorflow {
+
+// Reads a wav format file into a vector of floating-point values with range
+// -1.0 to 1.0.
+bool ReadWaveFileToVector(const string& file_name, std::vector<double>* data);
+
+// Reads a binary file containing 32-bit floating point values in the
+// form [real_1, imag_1, real_2, imag_2, ...] into a rectangular array
+// of complex values where row_length is the length of each inner vector.
+bool ReadRawFloatFileToComplexVector(
+    const string& file_name, int row_length,
+    std::vector<std::vector<std::complex<double> > >* data);
+
+// Reads a CSV file of numbers in the format 1.1+2.2i,1.1,2.2i,3.3j into data.
+void ReadCSVFileToComplexVectorOrDie(
+    const string& file_name,
+    std::vector<std::vector<std::complex<double> > >* data);
+
+// Reads a 2D array of floats from an ASCII text file, where each line is a row
+// of the array, and elements are separated by commas.
+void ReadCSVFileToArrayOrDie(const string& filename,
+                             std::vector<std::vector<float> >* array);
+
+// Write a binary file containing 64-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteDoubleVectorToFile(const string& file_name,
+                             const std::vector<double>& data);
+
+// Write a binary file containing 32-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteFloatVectorToFile(const string& file_name,
+                            const std::vector<float>& data);
+
+// Write a binary file containing 64-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteDoubleArrayToFile(const string& file_name, int size,
+                            const double* data);
+
+// Write a binary file containing 32-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteFloatArrayToFile(const string& file_name, int size,
+                           const float* data);
+
+// Write a binary file in the format read by
+// ReadRawDoubleFileToComplexVector above.
+bool WriteComplexVectorToRawFloatFile(
+    const string& file_name,
+    const std::vector<std::vector<std::complex<double> > >& data);
+
+// Generate a sine wave with the provided parameters, and populate
+// data with the samples.
+void SineWave(int sample_rate, float frequency, float duration_seconds,
+              std::vector<double>* data);
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
diff --git a/tensorflow/core/lib/core/bits.h b/tensorflow/core/lib/core/bits.h
index 30ad0c2bea..1110ef5c2a 100644
--- a/tensorflow/core/lib/core/bits.h
+++ b/tensorflow/core/lib/core/bits.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LIB_CORE_BITS_H_
 #define TENSORFLOW_LIB_CORE_BITS_H_
 
+#include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -91,6 +92,18 @@ inline int Log2Ceiling64(uint64 n) {
     return floor + 1;
 }
 
+inline uint32 NextPowerOfTwo(uint32 value) {
+  int exponent = Log2Ceiling(value);
+  DCHECK_LT(exponent, std::numeric_limits<uint32>::digits);
+  return 1 << exponent;
+}
+
+inline uint64 NextPowerOfTwo64(uint64 value) {
+  int exponent = Log2Ceiling(value);
+  DCHECK_LT(exponent, std::numeric_limits<uint64>::digits);
+  return 1LL << exponent;
+}
+
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_LIB_CORE_BITS_H_
diff --git a/tensorflow/core/ops/audio_ops.cc b/tensorflow/core/ops/audio_ops.cc
index d6dedc3820..2f55e45e37 100644
--- a/tensorflow/core/ops/audio_ops.cc
+++ b/tensorflow/core/ops/audio_ops.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/framework/common_shape_fns.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/shape_inference.h"
+#include "tensorflow/core/lib/core/bits.h"
 
 namespace tensorflow {
 
@@ -66,6 +67,39 @@ Status EncodeWavShapeFn(InferenceContext* c) {
   return Status::OK();
 }
 
+Status SpectrogramShapeFn(InferenceContext* c) {
+  ShapeHandle input;
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 2, &input));
+  int32 window_size;
+  TF_RETURN_IF_ERROR(c->GetAttr("window_size", &window_size));
+  int32 stride;
+  TF_RETURN_IF_ERROR(c->GetAttr("stride", &stride));
+
+  DimensionHandle input_channels = c->Dim(input, 0);
+  DimensionHandle input_length = c->Dim(input, 1);
+
+  DimensionHandle output_length;
+  if (!c->ValueKnown(input_length)) {
+    output_length = c->UnknownDim();
+  } else {
+    const int64 input_length_value = c->Value(input_length);
+    const int64 length_minus_window = (input_length_value - window_size);
+    int64 output_length_value;
+    if (length_minus_window < 0) {
+      output_length_value = 0;
+    } else {
+      output_length_value = 1 + (length_minus_window / stride);
+    }
+    output_length = c->MakeDim(output_length_value);
+  }
+
+  DimensionHandle output_channels =
+      c->MakeDim(1 + NextPowerOfTwo(window_size) / 2);
+  c->set_output(0,
+                c->MakeShape({input_channels, output_length, output_channels}));
+  return Status::OK();
+}
+
 }  // namespace
 
 REGISTER_OP("DecodeWav")
@@ -121,4 +155,49 @@ sample_rate: Scalar containing the sample frequency.
 contents: 0-D. WAV-encoded file contents.
 )doc");
 
+REGISTER_OP("AudioSpectrogram")
+    .Input("input: float")
+    .Attr("window_size: int")
+    .Attr("stride: int")
+    .Attr("magnitude_squared: bool = false")
+    .Output("spectrogram: float")
+    .SetShapeFn(SpectrogramShapeFn)
+    .Doc(R"doc(
+Produces a visualization of audio data over time.
+
+Spectrograms are a standard way of representing audio information as a series of
+slices of frequency information, one slice for each window of time. By joining
+these together into a sequence, they form a distinctive fingerprint of the sound
+over time.
+
+This op expects to receive audio data as an input, stored as floats in the range
+-1 to 1, together with a window width in samples, and a stride specifying how
+far to move the window between slices. From this it generates a three
+dimensional output. The lowest dimension has an amplitude value for each
+frequency during that time slice. The next dimension is time, with successive
+frequency slices. The final dimension is for the channels in the input, so a
+stereo audio input would have two here for example.
+
+This means the layout when converted and saved as an image is rotated 90 degrees
+clockwise from a typical spectrogram. Time is descending down the Y axis, and
+the frequency decreases from left to right.
+
+Each value in the result represents the square root of the sum of the real and
+imaginary parts of an FFT on the current window of samples. In this way, the
+lowest dimension represents the power of each frequency in the current window,
+and adjacent windows are concatenated in the next dimension.
+
+To get a more intuitive and visual look at what this operation does, you can run
+tensorflow/examples/wav_to_spectrogram to read in an audio file and save out the
+resulting spectrogram as a PNG image.
+
+input: Float representation of audio data.
+window_size: How wide the input window is in samples. For the highest efficiency
+  this should be a power of two, but other values are accepted.
+stride: How widely apart the center of adjacent sample windows should be.
+magnitude_squared: Whether to return the squared magnitude or just the
+  magnitude. Using squared magnitude can avoid extra calculations.
+spectrogram: 3D representation of the audio frequencies as an image.
+)doc");
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/platform/default/build_config/BUILD b/tensorflow/core/platform/default/build_config/BUILD
index 0857010f7c..62af852173 100644
--- a/tensorflow/core/platform/default/build_config/BUILD
+++ b/tensorflow/core/platform/default/build_config/BUILD
@@ -92,6 +92,7 @@ cc_library(
         "//tensorflow/core:protos_cc",
         "@com_googlesource_code_re2//:re2",
         "@farmhash_archive//:farmhash",
+        "@fft2d//:fft2d",
         "@highwayhash//:sip_hash",
         "@png_archive//:png",
     ],
diff --git a/tensorflow/core/util/command_line_flags.cc b/tensorflow/core/util/command_line_flags.cc
index 03eb076f30..8373eb1f9e 100644
--- a/tensorflow/core/util/command_line_flags.cc
+++ b/tensorflow/core/util/command_line_flags.cc
@@ -93,6 +93,22 @@ bool ParseBoolFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag,
   return false;
 }
 
+bool ParseFloatFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag,
+                    float* dst, bool* value_parsing_ok) {
+  *value_parsing_ok = true;
+  if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) {
+    char extra;
+    if (sscanf(arg.data(), "%f%c", dst, &extra) != 1) {
+      LOG(ERROR) << "Couldn't interpret value " << arg << " for flag " << flag
+                 << ".";
+      *value_parsing_ok = false;
+    }
+    return true;
+  }
+
+  return false;
+}
+
 }  // namespace
 
 Flag::Flag(const char* name, tensorflow::int32* dst, const string& usage_text)
@@ -116,6 +132,12 @@ Flag::Flag(const char* name, string* dst, const string& usage_text)
       string_value_(dst),
       usage_text_(usage_text) {}
 
+Flag::Flag(const char* name, float* dst, const string& usage_text)
+    : name_(name),
+      type_(TYPE_FLOAT),
+      float_value_(dst),
+      usage_text_(usage_text) {}
+
 bool Flag::Parse(string arg, bool* value_parsing_ok) const {
   bool result = false;
   if (type_ == TYPE_INT) {
@@ -126,6 +148,8 @@ bool Flag::Parse(string arg, bool* value_parsing_ok) const {
     result = ParseBoolFlag(arg, name_, bool_value_, value_parsing_ok);
   } else if (type_ == TYPE_STRING) {
     result = ParseStringFlag(arg, name_, string_value_, value_parsing_ok);
+  } else if (type_ == TYPE_FLOAT) {
+    result = ParseFloatFlag(arg, name_, float_value_, value_parsing_ok);
   }
   return result;
 }
@@ -195,6 +219,10 @@ bool Flag::Parse(string arg, bool* value_parsing_ok) const {
       type_name = "string";
       flag_string = strings::Printf("--%s=\"%s\"", flag.name_.c_str(),
                                     flag.string_value_->c_str());
+    } else if (flag.type_ == Flag::TYPE_FLOAT) {
+      type_name = "float";
+      flag_string =
+          strings::Printf("--%s=%f", flag.name_.c_str(), *flag.float_value_);
     }
     strings::Appendf(&usage_text, "\t%-33s\t%s\t%s\n", flag_string.c_str(),
                      type_name, flag.usage_text_.c_str());
diff --git a/tensorflow/core/util/command_line_flags.h b/tensorflow/core/util/command_line_flags.h
index 2c77d7874f..f349df16fd 100644
--- a/tensorflow/core/util/command_line_flags.h
+++ b/tensorflow/core/util/command_line_flags.h
@@ -65,6 +65,7 @@ class Flag {
   Flag(const char* name, int64* dst1, const string& usage_text);
   Flag(const char* name, bool* dst, const string& usage_text);
   Flag(const char* name, string* dst, const string& usage_text);
+  Flag(const char* name, float* dst, const string& usage_text);
 
  private:
   friend class Flags;
@@ -72,11 +73,12 @@ class Flag {
   bool Parse(string arg, bool* value_parsing_ok) const;
 
   string name_;
-  enum { TYPE_INT, TYPE_INT64, TYPE_BOOL, TYPE_STRING } type_;
+  enum { TYPE_INT, TYPE_INT64, TYPE_BOOL, TYPE_STRING, TYPE_FLOAT } type_;
   int* int_value_;
   int64* int64_value_;
   bool* bool_value_;
   string* string_value_;
+  float* float_value_;
   string usage_text_;
 };
 
diff --git a/tensorflow/core/util/command_line_flags_test.cc b/tensorflow/core/util/command_line_flags_test.cc
index b002e35899..62025463af 100644
--- a/tensorflow/core/util/command_line_flags_test.cc
+++ b/tensorflow/core/util/command_line_flags_test.cc
@@ -32,29 +32,35 @@ std::vector<char *> CharPointerVectorFromStrings(
   }
   return result;
 }
-}
+}  // namespace
 
 TEST(CommandLineFlagsTest, BasicUsage) {
   int some_int = 10;
   int64 some_int64 = 21474836470;  // max int32 is 2147483647
   bool some_switch = false;
   string some_name = "something";
-  int argc = 5;
-  std::vector<string> argv_strings = {
-      "program_name", "--some_int=20", "--some_int64=214748364700",
-      "--some_switch", "--some_name=somethingelse"};
+  float some_float = -23.23f;
+  int argc = 6;
+  std::vector<string> argv_strings = {"program_name",
+                                      "--some_int=20",
+                                      "--some_int64=214748364700",
+                                      "--some_switch",
+                                      "--some_name=somethingelse",
+                                      "--some_float=42.0"};
   std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings);
   bool parsed_ok =
       Flags::Parse(&argc, argv_array.data(),
                    {Flag("some_int", &some_int, "some int"),
                     Flag("some_int64", &some_int64, "some int64"),
                     Flag("some_switch", &some_switch, "some switch"),
-                    Flag("some_name", &some_name, "some name")});
+                    Flag("some_name", &some_name, "some name"),
+                    Flag("some_float", &some_float, "some float")});
   EXPECT_EQ(true, parsed_ok);
   EXPECT_EQ(20, some_int);
   EXPECT_EQ(214748364700, some_int64);
   EXPECT_EQ(true, some_switch);
   EXPECT_EQ("somethingelse", some_name);
+  EXPECT_NEAR(42.0f, some_float, 1e-5f);
   EXPECT_EQ(argc, 1);
 }
 
@@ -85,6 +91,21 @@ TEST(CommandLineFlagsTest, BadBoolValue) {
   EXPECT_EQ(argc, 1);
 }
 
+TEST(CommandLineFlagsTest, BadFloatValue) {
+  float some_float = -23.23f;
+  int argc = 2;
+  std::vector<string> argv_strings = {"program_name",
+                                      "--some_float=notanumber"};
+  std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings);
+  bool parsed_ok =
+      Flags::Parse(&argc, argv_array.data(),
+                   {Flag("some_float", &some_float, "some float")});
+
+  EXPECT_EQ(false, parsed_ok);
+  EXPECT_NEAR(-23.23f, some_float, 1e-5f);
+  EXPECT_EQ(argc, 1);
+}
+
 // Return whether str==pat, but allowing any whitespace in pat
 // to match zero or more whitespace characters in str.
 static bool MatchWithAnyWhitespace(const string &str, const string &pat) {
@@ -111,6 +132,8 @@ TEST(CommandLineFlagsTest, UsageString) {
   int64 some_int64 = 21474836470;  // max int32 is 2147483647
   bool some_switch = false;
   string some_name = "something";
+  // Don't test float in this case, because precision is hard to predict and
+  // match against, and we don't want a flakey test.
   const string tool_name = "some_tool_name";
   string usage = Flags::Usage(tool_name + "<flags>",
                               {Flag("some_int", &some_int, "some int"),
diff --git a/tensorflow/examples/wav_to_spectrogram/BUILD b/tensorflow/examples/wav_to_spectrogram/BUILD
new file mode 100644
index 0000000000..1e72324fb0
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/BUILD
@@ -0,0 +1,68 @@
+# Description:
+#   TensorFlow C++ inference example for labeling images.
+
+package(
+    default_visibility = ["//tensorflow:internal"],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+cc_library(
+    name = "wav_to_spectrogram_lib",
+    srcs = [
+        "wav_to_spectrogram.cc",
+    ],
+    hdrs = [
+        "wav_to_spectrogram.h",
+    ],
+    deps = [
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:tensorflow",
+    ],
+)
+
+cc_binary(
+    name = "wav_to_spectrogram",
+    srcs = [
+        "main.cc",
+    ],
+    deps = [
+        ":wav_to_spectrogram_lib",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:tensorflow",
+    ],
+)
+
+cc_test(
+    name = "wav_to_spectrogram_test",
+    size = "medium",
+    srcs = ["wav_to_spectrogram_test.cc"],
+    deps = [
+        ":wav_to_spectrogram_lib",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+            "bin/**",
+            "gen/**",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/examples/wav_to_spectrogram/README.md b/tensorflow/examples/wav_to_spectrogram/README.md
new file mode 100644
index 0000000000..7f7eb43700
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/README.md
@@ -0,0 +1,49 @@
+# TensorFlow Spectrogram Example
+
+This example shows how you can load audio from a .wav file, convert it to a
+spectrogram, and then save it out as a PNG image. A spectrogram is a
+visualization of the frequencies in sound over time, and can be useful as a
+feature for neural network recognition on noise or speech.
+
+## Building
+
+To build it, run this command:
+
+```bash
+bazel build tensorflow/examples/wav_to_spectrogram/...
+```
+
+That should build a binary executable that you can then run like this:
+
+```bash
+bazel-bin/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram
+```
+
+This uses a default test audio file that's part of the TensorFlow source code,
+and writes out the image to the current directory as spectrogram.png.
+
+## Options
+
+To load your own audio, you need to supply a .wav file in LIN16 format, and use
+the `--input_audio` flag to pass in the path.
+
+To control how the spectrogram is created, you can specify the `--window_size`
+and `--stride` arguments, which control how wide the window used to estimate
+frequencies is, and how widely adjacent windows are spaced.
+
+The `--output_image` flag sets the path to save the image file to. This is
+always written out in PNG format, even if you specify a different file
+extension.
+
+If your result seems too dark, try using the `--brightness` flag to make the
+output image easier to see.
+
+Here's an example of how to use all of them together:
+
+```bash
+bazel-bin/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram \
+--input_wav=/tmp/my_audio.wav \
+--window=1024 \
+--stride=512 \
+--output_image=/tmp/my_spectrogram.png
+```
diff --git a/tensorflow/examples/wav_to_spectrogram/main.cc b/tensorflow/examples/wav_to_spectrogram/main.cc
new file mode 100644
index 0000000000..539e6c4fe4
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/main.cc
@@ -0,0 +1,66 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
+
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/util/command_line_flags.h"
+
+int main(int argc, char* argv[]) {
+  // These are the command-line flags the program can understand.
+  // They define where the graph and input data is located, and what kind of
+  // input the model expects. If you train your own model, or use something
+  // other than inception_v3, then you'll need to update these.
+  tensorflow::string input_wav =
+      "tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav";
+  tensorflow::int32 window_size = 256;
+  tensorflow::int32 stride = 128;
+  float brightness = 64.0f;
+  tensorflow::string output_image = "spectrogram.png";
+  std::vector<tensorflow::Flag> flag_list = {
+      tensorflow::Flag("input_wav", &input_wav, "audio file to load"),
+      tensorflow::Flag("window_size", &window_size,
+                       "frequency sample window width"),
+      tensorflow::Flag("stride", &stride,
+                       "how far apart to place frequency windows"),
+      tensorflow::Flag("brightness", &brightness,
+                       "controls how bright the output image is"),
+      tensorflow::Flag("output_image", &output_image,
+                       "where to save the spectrogram image to"),
+  };
+  tensorflow::string usage = tensorflow::Flags::Usage(argv[0], flag_list);
+  const bool parse_result = tensorflow::Flags::Parse(&argc, argv, flag_list);
+  if (!parse_result) {
+    LOG(ERROR) << usage;
+    return -1;
+  }
+
+  // We need to call this to set up global state for TensorFlow.
+  tensorflow::port::InitMain(argv[0], &argc, &argv);
+  if (argc > 1) {
+    LOG(ERROR) << "Unknown argument " << argv[1] << "\n" << usage;
+    return -1;
+  }
+
+  tensorflow::Status wav_status = WavToSpectrogram(
+      input_wav, window_size, stride, brightness, output_image);
+  if (!wav_status.ok()) {
+    LOG(ERROR) << "WavToSpectrogram failed with " << wav_status;
+    return -1;
+  }
+
+  return 0;
+}
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
new file mode 100644
index 0000000000..c69a359637
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
@@ -0,0 +1,97 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
+
+#include <vector>
+
+#include "tensorflow/cc/ops/audio_ops.h"
+#include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/image_ops.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/graph/default_device.h"
+#include "tensorflow/core/graph/graph_def_builder.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/public/session.h"
+#include "tensorflow/core/util/command_line_flags.h"
+
+using tensorflow::DT_FLOAT;
+using tensorflow::DT_UINT8;
+using tensorflow::Output;
+using tensorflow::TensorShape;
+
+// Runs a TensorFlow graph to convert an audio file into a visualization.
+tensorflow::Status WavToSpectrogram(const tensorflow::string& input_wav,
+                                    tensorflow::int32 window_size,
+                                    tensorflow::int32 stride, float brightness,
+                                    const tensorflow::string& output_image) {
+  auto root = tensorflow::Scope::NewRootScope();
+  using namespace tensorflow::ops;  // NOLINT(build/namespaces)
+  // The following block creates a TensorFlow graph that:
+  //  - Reads and decodes the audio file into a tensor of float samples.
+  //  - Creates a float spectrogram from those samples.
+  //  - Scales, clamps, and converts that spectrogram to 0 to 255 uint8's.
+  //  - Reshapes the tensor so that it's [height, width, 1] for imaging.
+  //  - Encodes it as a PNG stream and saves it out to a file.
+  Output file_reader = ReadFile(root.WithOpName("input_wav"), input_wav);
+  DecodeWav wav_decoder =
+      DecodeWav(root.WithOpName("wav_decoder"), file_reader);
+  Output spectrogram = AudioSpectrogram(root.WithOpName("spectrogram"),
+                                        wav_decoder.audio, window_size, stride);
+  Output brightness_placeholder =
+      Placeholder(root.WithOpName("brightness_placeholder"), DT_FLOAT,
+                  Placeholder::Attrs().Shape(TensorShape({})));
+  Output mul = Mul(root.WithOpName("mul"), spectrogram, brightness_placeholder);
+  Output min_const = Const(root.WithOpName("min_const"), 255.0f);
+  Output min = Minimum(root.WithOpName("min"), mul, min_const);
+  Output cast = Cast(root.WithOpName("cast"), min, DT_UINT8);
+  Output expand_dims_const = Const(root.WithOpName("expand_dims_const"), -1);
+  Output expand_dims =
+      ExpandDims(root.WithOpName("expand_dims"), cast, expand_dims_const);
+  Output squeeze = Squeeze(root.WithOpName("squeeze"), expand_dims,
+                           Squeeze::Attrs().SqueezeDims({0}));
+  Output png_encoder = EncodePng(root.WithOpName("png_encoder"), squeeze);
+  WriteFile file_writer =
+      WriteFile(root.WithOpName("output_image"), output_image, png_encoder);
+  tensorflow::GraphDef graph;
+  TF_RETURN_IF_ERROR(root.ToGraphDef(&graph));
+
+  // Build a session object from this graph definition. The power of TensorFlow
+  // is that you can reuse complex computations like this, so usually we'd run a
+  // lot of different inputs through it. In this example, we're just doing a
+  // one-off run, so we'll create it and then use it immediately.
+  std::unique_ptr<tensorflow::Session> session(
+      tensorflow::NewSession(tensorflow::SessionOptions()));
+  TF_RETURN_IF_ERROR(session->Create(graph));
+
+  // We're passing in the brightness as an input, so create a tensor to hold the
+  // value.
+  tensorflow::Tensor brightness_tensor(DT_FLOAT, TensorShape({}));
+  brightness_tensor.scalar<float>()() = brightness;
+
+  // Run the session to analyze the audio and write out the file.
+  TF_RETURN_IF_ERROR(
+      session->Run({{"brightness_placeholder", brightness_tensor}}, {},
+                   {"output_image"}, nullptr));
+  return tensorflow::Status::OK();
+}
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
new file mode 100644
index 0000000000..fa8cb0abe9
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
@@ -0,0 +1,31 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
+#define THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
+
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/types.h"
+
+// Runs a TensorFlow graph to convert an audio file into a visualization. Takes
+// in the path to the audio file, the window size and stride parameters
+// controlling the spectrogram creation, the brightness scaling to use, and a
+// path to save the output PNG file to.
+tensorflow::Status WavToSpectrogram(const tensorflow::string& input_wav,
+                                    tensorflow::int32 window_size,
+                                    tensorflow::int32 stride, float brightness,
+                                    const tensorflow::string& output_image);
+
+#endif  // THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc
new file mode 100644
index 0000000000..e599711445
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc
@@ -0,0 +1,37 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
+
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/lib/wav/wav_io.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/test.h"
+
+TEST(WavToSpectrogramTest, WavToSpectrogramTest) {
+  const tensorflow::string input_wav =
+      tensorflow::io::JoinPath(tensorflow::testing::TmpDir(), "input_wav.wav");
+  const tensorflow::string output_image = tensorflow::io::JoinPath(
+      tensorflow::testing::TmpDir(), "output_image.png");
+  float audio[8] = {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f};
+  tensorflow::string wav_string;
+  TF_ASSERT_OK(
+      tensorflow::wav::EncodeAudioAsS16LEWav(audio, 44100, 1, 8, &wav_string));
+  TF_ASSERT_OK(tensorflow::WriteStringToFile(tensorflow::Env::Default(),
+                                             input_wav, wav_string));
+  TF_ASSERT_OK(WavToSpectrogram(input_wav, 4, 4, 64.0f, output_image));
+  TF_EXPECT_OK(tensorflow::Env::Default()->FileExists(output_image));
+}
diff --git a/tensorflow/tools/lib_package/BUILD b/tensorflow/tools/lib_package/BUILD
index 3e049724f6..a8e6ecdbf0 100644
--- a/tensorflow/tools/lib_package/BUILD
+++ b/tensorflow/tools/lib_package/BUILD
@@ -79,11 +79,13 @@ genrule(
     srcs = [
         "//third_party/hadoop:LICENSE.txt",
         "//third_party/eigen3:LICENSE",
+        "//third_party/fft2d:LICENSE",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
+        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@highwayhash//:LICENSE",
@@ -106,11 +108,13 @@ genrule(
     srcs = [
         "//third_party/hadoop:LICENSE.txt",
         "//third_party/eigen3:LICENSE",
+        "//third_party/fft2d:LICENSE",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
+        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@highwayhash//:LICENSE",
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 2a96e80ccb..c17a7f7fb1 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -91,12 +91,14 @@ filegroup(
     name = "licenses",
     data = [
         "//third_party/eigen3:LICENSE",
+        "//third_party/fft2d:LICENSE",
         "//third_party/hadoop:LICENSE.txt",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
+        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@grpc//:LICENSE",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 7bcdb1613d..dd42c69dd2 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -500,6 +500,16 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name="zlib",
       actual="@zlib_archive//:zlib",)
 
+  native.new_http_archive(
+      name = "fft2d",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
+          "http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
+      ],
+      sha256 = "52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296",
+      build_file = str(Label("//third_party/fft2d:fft2d.BUILD")),
+  )
+
   temp_workaround_http_archive(
       name="snappy",
       urls=[
diff --git a/third_party/fft2d/BUILD b/third_party/fft2d/BUILD
new file mode 100644
index 0000000000..93ea06e81b
--- /dev/null
+++ b/third_party/fft2d/BUILD
@@ -0,0 +1,30 @@
+# Headers for 2D Fast Fourier Transform package
+# from http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html
+# This is a separate package because the original downloaded archive doesn't
+# contain any header files.
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+# Unrestricted use; can only distribute original package.
+# See fft/readme.txt
+licenses(["notice"])
+
+exports_files(["LICENSE"])
+
+cc_library(
+    name = "fft2d_headers",
+    srcs = ["fft.h"],
+)
+
+objc_library(
+    name = "fft2d_headersd_ios",
+    srcs = ["fft.h"],
+)
+
+# Export the source code so that it could be compiled for Andoid native apps.
+filegroup(
+    name = "fft2d_headers_srcs",
+    srcs = ["fft.h"],
+)
diff --git a/third_party/fft2d/LICENSE b/third_party/fft2d/LICENSE
new file mode 100644
index 0000000000..2bd85506a8
--- /dev/null
+++ b/third_party/fft2d/LICENSE
@@ -0,0 +1,3 @@
+Copyright(C) 1997,2001 Takuya OOURA (email: ooura@kurims.kyoto-u.ac.jp).
+You may use, copy, modify this code for any purpose and 
+without fee. You may distribute this ORIGINAL package.
diff --git a/third_party/fft2d/fft.h b/third_party/fft2d/fft.h
new file mode 100644
index 0000000000..252cc01fec
--- /dev/null
+++ b/third_party/fft2d/fft.h
@@ -0,0 +1,36 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Declarations for 1D FFT routines in third_party/fft2d/fft.
+
+#ifndef THIRD_PARTY_FFT2D_FFT_H__
+#define THIRD_PARTY_FFT2D_FFT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void cdft(int, int, double *, int *, double *);
+extern void rdft(int, int, double *, int *, double *);
+extern void ddct(int, int, double *, int *, double *);
+extern void ddst(int, int, double *, int *, double *);
+extern void dfct(int, double *, double *, int *, double *);
+extern void dfst(int, double *, double *, int *, double *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // THIRD_PARTY_FFT2D_FFT_H__
diff --git a/third_party/fft2d/fft2d.BUILD b/third_party/fft2d/fft2d.BUILD
new file mode 100644
index 0000000000..3dbd36aec0
--- /dev/null
+++ b/third_party/fft2d/fft2d.BUILD
@@ -0,0 +1,36 @@
+# 2D Fast Fourier Transform package
+# from http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+# Unrestricted use; can only distribute original package.
+licenses(["notice"])
+
+exports_files(["fft/readme.txt"])
+
+FFT2D_SRCS = [
+    "fft/fftsg.c",
+]
+
+# This is the main 2D FFT library.  The 2D FFTs in this library call
+# 1D FFTs.  In addition, fast DCTs are provided for the special case
+# of 8x8 and 16x16.  This code in this library is referred to as
+# "Version II" on http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html.
+cc_library(
+    name = "fft2d",
+    srcs = FFT2D_SRCS,
+    linkopts = ["-lm"],
+)
+
+objc_library(
+    name = "fft2d_ios",
+    srcs = FFT2D_SRCS,
+)
+
+# Export the source code so that it could be compiled for Andoid native apps.
+filegroup(
+    name = "fft2d_srcs",
+    srcs = FFT2D_SRCS,
+)
-- 
GitLab


From 88feb346baaf8a344f7c6b02f474277962081b58 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 17:17:49 -0800
Subject: [PATCH 0156/1563] Update ops-related pbtxt files. Change: 152332812

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 26 +++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 33 +++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index c538a278a3..9a29487b82 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1666,6 +1666,32 @@ op {
     }
   }
 }
+op {
+  name: "AudioSpectrogram"
+  input_arg {
+    name: "input"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "spectrogram"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "window_size"
+    type: "int"
+  }
+  attr {
+    name: "stride"
+    type: "int"
+  }
+  attr {
+    name: "magnitude_squared"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+}
 op {
   name: "AudioSummary"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 172bdf02e2..31341e714b 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -1903,6 +1903,39 @@ op {
   }
   summary: "Computes atan of x element-wise."
 }
+op {
+  name: "AudioSpectrogram"
+  input_arg {
+    name: "input"
+    description: "Float representation of audio data."
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "spectrogram"
+    description: "3D representation of the audio frequencies as an image."
+    type: DT_FLOAT
+  }
+  attr {
+    name: "window_size"
+    type: "int"
+    description: "How wide the input window is in samples. For the highest efficiency\nthis should be a power of two, but other values are accepted."
+  }
+  attr {
+    name: "stride"
+    type: "int"
+    description: "How widely apart the center of adjacent sample windows should be."
+  }
+  attr {
+    name: "magnitude_squared"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "Whether to return the squared magnitude or just the\nmagnitude. Using squared magnitude can avoid extra calculations."
+  }
+  summary: "Produces a visualization of audio data over time."
+  description: "Spectrograms are a standard way of representing audio information as a series of\nslices of frequency information, one slice for each window of time. By joining\nthese together into a sequence, they form a distinctive fingerprint of the sound\nover time.\n\nThis op expects to receive audio data as an input, stored as floats in the range\n-1 to 1, together with a window width in samples, and a stride specifying how\nfar to move the window between slices. From this it generates a three\ndimensional output. The lowest dimension has an amplitude value for each\nfrequency during that time slice. The next dimension is time, with successive\nfrequency slices. The final dimension is for the channels in the input, so a\nstereo audio input would have two here for example.\n\nThis means the layout when converted and saved as an image is rotated 90 degrees\nclockwise from a typical spectrogram. Time is descending down the Y axis, and\nthe frequency decreases from left to right.\n\nEach value in the result represents the square root of the sum of the real and\nimaginary parts of an FFT on the current window of samples. In this way, the\nlowest dimension represents the power of each frequency in the current window,\nand adjacent windows are concatenated in the next dimension.\n\nTo get a more intuitive and visual look at what this operation does, you can run\ntensorflow/examples/wav_to_spectrogram to read in an audio file and save out the\nresulting spectrogram as a PNG image."
+}
 op {
   name: "AudioSummary"
   input_arg {
-- 
GitLab


From 3a064890405362207bba90eb1277b50ab0968c1b Mon Sep 17 00:00:00 2001
From: zjj2wry <zhengjiajin2016@gmail.com>
Date: Thu, 6 Apr 2017 09:38:20 +0800
Subject: [PATCH 0157/1563] delete fist null line (#8995)

---
 tensorflow/java/src/main/native/operation_jni.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tensorflow/java/src/main/native/operation_jni.h b/tensorflow/java/src/main/native/operation_jni.h
index fe14882dde..6292a48069 100644
--- a/tensorflow/java/src/main/native/operation_jni.h
+++ b/tensorflow/java/src/main/native/operation_jni.h
@@ -1,4 +1,3 @@
-
 /* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
-- 
GitLab


From ac043eee22df08d44f23543b86bb085b6660a3e7 Mon Sep 17 00:00:00 2001
From: zjj2wry <zhengjiajin2016@gmail.com>
Date: Thu, 6 Apr 2017 09:38:46 +0800
Subject: [PATCH 0158/1563] use /* instead of // (#8991)

---
 .../src/main/java/org/tensorflow/Shape.java   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tensorflow/java/src/main/java/org/tensorflow/Shape.java b/tensorflow/java/src/main/java/org/tensorflow/Shape.java
index f6677e9a15..90d6cf7b85 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/Shape.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/Shape.java
@@ -1,16 +1,17 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
 
 package org.tensorflow;
 
-- 
GitLab


From 43292decf62c1c16042a8da3a1ebd06d87c42d32 Mon Sep 17 00:00:00 2001
From: Adriano Carmezim <Carmezim.filho@gmail.com>
Date: Thu, 6 Apr 2017 02:40:33 +0100
Subject: [PATCH 0159/1563] links typo fix (#8984)

---
 tensorflow/contrib/cmake/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/cmake/README.md b/tensorflow/contrib/cmake/README.md
index af949f79fa..14d99a30cd 100644
--- a/tensorflow/contrib/cmake/README.md
+++ b/tensorflow/contrib/cmake/README.md
@@ -68,8 +68,8 @@ bindings.
   - [Anaconda 4.1.1 (Python 3.5 64-bit)](https://www.continuum.io/downloads)
   - [Git for Windows version 2.9.2.windows.1](https://git-scm.com/download/win)
   - [swigwin-3.0.10](http://www.swig.org/download.html)
-  - [NVidia CUDA Toolkit 8.0] (https://developer.nvidia.com/cuda-downloads)
-  - [NVidia CUDNN 5.1] (https://developer.nvidia.com/cudnn)
+  - [NVidia CUDA Toolkit 8.0](https://developer.nvidia.com/cuda-downloads)
+  - [NVidia CUDNN 5.1](https://developer.nvidia.com/cudnn)
   - [CMake 3.6](https://cmake.org/files/v3.6/cmake-3.6.3-win64-x64.msi)
   
 * Ubuntu 14.04
-- 
GitLab


From 62a07cc877b4f1fa403852a8231aa6ebf0191974 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 5 Apr 2017 18:42:01 -0700
Subject: [PATCH 0160/1563] Use html5lib version that bleach wants (#9004)

Fixes #8971
---
 tensorflow/tools/pip_package/setup.py | 2 +-
 tensorflow/workspace.bzl              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index f591e50ac9..810bd9527e 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -36,7 +36,7 @@ REQUIRED_PACKAGES = [
     'six >= 1.10.0',
     'protobuf >= 3.2.0',
     'werkzeug >= 0.11.10',
-    'html5lib == 1.0b8',
+    'html5lib == 0.9999999',  # identical to 1.0b8
     'markdown == 2.2.0',
     'bleach == 1.5.0',
 ]
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 0a79bdf6e4..d0ef1d32fc 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -271,11 +271,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name="org_html5lib",
       urls=[
-          "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
-          "https://github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
+          "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",
+          "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",  # identical to 1.0b8
       ],
-      sha256="adb36c879264e8880b92589c4c4fe0814cd9d157b73328b14d728f48a6bab0a4",
-      strip_prefix="html5lib-python-1.0b8",
+      sha256="184257f98539159a433e2a2197309657ae1283b4c44dbd9c87b2f02ff36adce8",
+      strip_prefix="html5lib-python-0.9999999",
       build_file=str(Label("//third_party:html5lib.BUILD")),)
 
   native.new_http_archive(
-- 
GitLab


From e2177df4fc3000fcab237bebaf6900693904ad26 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Wed, 5 Apr 2017 18:44:47 -0700
Subject: [PATCH 0161/1563] Merge rc1 back into master. (#8998)

* Internal changes (#8808)

Change: 151077399

* Internal change.
Change: 151391358

* Fixes correctness of ProximalAdagrad and ProximalGradientDescent under normal training with L1/L2.

Also fixes issue where optimizers write to the same memory location multiple times, causing inconsistencies during distributed training.
Change: 151479203

* Support for domain buckets, e.g gs://bucketname.domain-example.com/...
Change: 151516660

* Initial release of installation guides for Java, C, and Go.
Updated leftnav_files to provide pointers to new installation guides.
Updated landing page (index.md) to distinguish between OS installs and language
installs.
Change: 151712658

* Updating the Writing Tensorflow Documentation doc to reflect changes in TF1.0 and onward.
Change: 151761382

* Java: Maven: Fix some boo boos with the Windows installation.

- The resource path should not use the platform's file separator.
- Restore the commands to download and extract the Windows native libraries.
- Unrelated tweaks the README
Change: 151161421

* Add the corresponding --action_env to .bazelrc from ./configure (#8637)

This will make the fetch phase reproducible so the refetch does
not happens unless people re-run configure (the environment variable
are stored in the .bazelrc file).

Fixes #8619.

* force grep to not use color (#8784)

* Revert "Add the corresponding --action_env to .bazelrc from ./configure (#8637)"

This reverts commit fba05c300bf6840e76787680ed7fd1239cdb9ad0.

* Rollback of adjust contract change: Breaks backwards compatibility, and is inconsistent with other adjust_ops.
Change: 151792071

* tfdbg: fix a bug in graph validation related to tf.while_loops

CL/147488620 fixed a bug where the debugger would hang at Enter and NextIteration nodes under certain conditions. But it introduced another bug where the debug dumps from Enter and NextIteration may get generated later than downstream nodes in the tf.while_loop body, causing "causility violation" during debug_data.DebugDumpDir's validation process under certain conditions (e.g., backpropagation on a dynamic_rnn). This CL fixes that by excluding Enter and NextIteration nodes from the validation process.

Fixes: #8337
Change: 151787432

* Updating the r1.1.0-rc0 references to r1.1.0-rc1.

* Add bazel clean back info the configure script for 1.1 release.

* Updating the authors in RELEASE.md and updating new bug fixes.

* Implementing Yifei and Gunan's suggestions.

* Increasing indent for one bug fix.

* Disable gradients_test testWarnings for python versions 3.6 or above.
Change: 151507105

* Updating update version script (#8940)

* Updating the install source files to be rc1 compliant. Updating the update_version script as well to handle these changes.

* Removing extraneous input.

* Removing the print statements.

* Including the java, c, and go install files.

* Fix unbound <table> tag. (#8960)

Change: 152029426
---
 README.md                                     | 12 ++---
 RELEASE.md                                    | 52 ++++++++++---------
 tensorflow/core/public/version.h              |  2 +-
 tensorflow/docs_src/install/install_c.md      |  2 +-
 tensorflow/docs_src/install/install_go.md     |  2 +-
 tensorflow/docs_src/install/install_java.md   | 16 +++---
 tensorflow/docs_src/install/install_linux.md  | 26 +++++-----
 tensorflow/docs_src/install/install_mac.md    | 14 ++---
 .../docs_src/install/install_sources.md       |  4 +-
 .../docs_src/install/install_windows.md       |  4 +-
 tensorflow/tools/ci_build/update_version.sh   | 21 ++++++++
 tensorflow/tools/pip_package/setup.py         |  2 +-
 12 files changed, 90 insertions(+), 67 deletions(-)

diff --git a/README.md b/README.md
index d9f05a67e0..cd0bffde79 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,12 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
diff --git a/RELEASE.md b/RELEASE.md
index 156cc2e3af..ebb5c28451 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -15,6 +15,7 @@
   * Ability to inspect Python source file against TF ops and tensors (command `print_source` / `ps`)
   * New navigation bar in Curses-based UI
   * NodeStepper (command `invoke_stepper`) now uses intermediate tensor dumps. It also uses `TensorHandles` as direct feeds during successive `cont` calls for improved performance and reduced memory consumption.
+* Initial release of installation guides for Java, C, and Go.
 
 ## Deprecations
 
@@ -68,38 +69,39 @@
 * Multiple tfdbg bug fixes:
   * Fixed Windows compatibility issues.
   * Command history now persists across runs.
+  * Bug fix in graph validation related to `tf.while_loops`.
+* Java Maven fixes for bugs with Windows installation.
 
 ## Thanks to our Contributors
 
 This release contains contributions from many people at Google, as well as:
 
 A. Besir Kurtulmus, Adal Chiriliuc, @akash, Alec-Desouza, Alex Rothberg, Alex
-Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton
+Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton 
 Loss, @Aravind, @Arie, Ashutosh Das, AuréLien Geron, Bairen Yi, @bakunyo, Ben
-Visser, Brady Zhou, Calpa Liu, Changming Sun, Chi Zeng, Chih Cheng Liang,
-Christopher Berner, Clark Zinzow, @Conchylicultor, Courtial Florian, Dan Ellis,
-Dan J, Dan Jarvis, Daniel Ylitalo, Darren Garvey, David Norman, David Truong,
-@DavidNorman, Dimitar Pavlov, Dmitry Persiyanov, @Eddie, @elirex, Erfan
-Noury, Eron Wright, Evgeny Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher
-Coder, Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang,
-@guilherme, @guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo
-Gao, Igor ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason
-Morton, Jay Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi,
-@jiqiu, Joan Thibault, John C F, Jojy G Varghese, Jon Malmaud, Julian Berman,
-Julian Niedermeier, Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle
-Bostelmann, @Lezcano, Li Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh,
-Marek Kolodziej, Mark Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael
-Gharbi, MichaëL Defferrard, Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal,
-Nayana Thorat, @nghiattran, Nicholas Connor, Nikolaas Steenbergen, Niraj Patel,
-Niranjan Hasabnis, @Panmari, Pavel Bulanov, Philip Pries Henningsen, Philipp
-Jund, @polonez, Prayag Verma, Rahul Kavi, Raphael Gontijo Lopes, @rasbt, Raven
-Iqqe, Reid Pryzant, Richard Shin, Rizwan Asif, Russell Kaplan, Ryo Asakura,
-RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay, Sean Papay, @seaotterman,
-@selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano Probst, @taknevski,
-@tbonza, @teldridge11, Yuan (Terry) Tang, Tim Anglade, Tomas Reimers, Tomer Gafner,
-Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad
-Firoiu, @wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yuan (Terry) Tang,
-@Yufeng, Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
+Visser, Brady Zhou, Calpa Liu, Changming Sun, Chih Cheng Liang, Christopher
+Berner, Clark Zinzow, @Conchylicultor, Dan Ellis, Dan J, Dan Jarvis, Daniel
+Ylitalo, Darren Garvey, David Norman, David Truong, @DavidNorman, Dimitar
+Pavlov, Dmitry Persiyanov, @Eddie, @elirex, Erfan Noury, Eron Wright, Evgeny
+Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher Coder, Florian Courtial,
+Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang, @guilherme,
+@guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo Gao, Igor
+ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason Morton, Jay
+Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi, @jiqiu, Joan Thibault,
+John C F, Jojy George Varghese, Jon Malmaud, Julian Berman, Julian Niedermeier,
+Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle Bostelmann, @Lezcano, Li
+Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh, Marek Kolodziej, Mark
+Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael Gharbi, MichaëL Defferrard,
+Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal, Nayana Thorat, @nghiattran,
+Nicholas Connor, Nikolaas Steenbergen, Niraj Patel, Niranjan Hasabnis, @Panmari,
+Pavel Bulanov, Philip Pries Henningsen, Philipp Jund, @polonez, Prayag Verma, Rahul
+Kavi, Raphael Gontijo Lopes, @rasbt, Raven Iqqe, Reid Pryzant, Richard Shin, Rizwan
+Asif, Russell Kaplan, Ryo Asakura, RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay,
+Sean Papay, @seaotterman, @selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano
+Probst, @taknevski, @tbonza, @teldridge11, Tim Anglade, Tomas Reimers, Tomer Gafner,
+Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad Firoiu,
+@wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yi Liu, Yuan (Terry) Tang, @Yufeng,
+Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
 
 We are also grateful to all who filed issues or helped resolve them, asked and
 answered questions, and were part of inspiring discussions.
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index f7278c3502..14e45c37d9 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -20,7 +20,7 @@ limitations under the License.
 
 #define TF_MAJOR_VERSION 1
 #define TF_MINOR_VERSION 1
-#define TF_PATCH_VERSION 0-rc0
+#define TF_PATCH_VERSION 0-rc1
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index c1c7b66546..0f3914d52d 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index c9abaf2aca..6874a1f03f 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc1.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 111b046689..127d8fd029 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.0-rc1</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0</version>
+                 <version>1.1.0-rc1</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0-rc1.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -213,7 +213,7 @@ two files are available to the JVM:
 
 For example, the following command line executes the `HelloTF` program:
 
-<pre><b>java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index 4a537135b6..4a5d63f337 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -166,7 +166,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      virtualenv environment:
 
      <pre> (tensorflow)$ <b>pip install --upgrade \\
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#common_installation_problems).
@@ -270,7 +270,7 @@ take the following steps:
      the following command:
 
      <pre> $ <b>sudo pip install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
 
      If this step fails, see
      [Common Installation Problems](#common_installation_problems).
@@ -336,9 +336,9 @@ where:
     * <tt>gcr.io/tensorflow/tensorflow:latest-devel</tt>, which is the latest
       TensorFlow CPU Binary image plus source code.
     * <tt>gcr.io/tensorflow/tensorflow:<i>version</i></tt>, which is the
-      specified version (for example, 1.0.1) of TensorFlow CPU binary image.
+      specified version (for example, 1.1.0rc1) of TensorFlow CPU binary image.
     * <tt>gcr.io/tensorflow/tensorflow:<i>version</i>-devel</tt>, which is
-      the specified version (for example, 1.0.1) of the TensorFlow GPU
+      the specified version (for example, 1.1.0rc1) of the TensorFlow GPU
       binary image plus source code.
 
     <tt>gcr.io</tt> is the Google Container Registry. Note that some
@@ -456,7 +456,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -624,14 +624,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -643,14 +643,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -662,14 +662,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -681,14 +681,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index 68ad3ceba9..c989b31ca4 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -286,7 +286,7 @@ take the following steps:
      support, issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b> </pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
      [Common installation problems](#CommonInstallationProblems).
@@ -398,7 +398,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      TensorFlow for Python 2.7:
 
      <pre> (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -604,13 +604,13 @@ This section documents the relevant values for Mac OS installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.0.1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py2-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
@@ -622,13 +622,13 @@ Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py3-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.0.1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py3-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 25e428f574..7d452feafa 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -319,10 +319,10 @@ $ <b>bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pk
 Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
-for TensorFlow 1.0.1 on Linux:
+for TensorFlow 1.1.0rc1 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.0.1-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc1-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 7a6f579341..7d3d13c34a 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.0.1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.0.1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index cde0ab7909..429437f807 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -73,6 +73,7 @@ OLD_MINOR=$(cat ${VERSION_H} | grep -E "^#define TF_MINOR_VERSION [0-9]+" | \
 cut -d ' ' -f 3)
 OLD_PATCH=$(cat ${VERSION_H} | grep -E "^#define TF_PATCH_VERSION [[:alnum:]-]+" | \
 cut -d ' ' -f 3)
+OLD_PIP_PATCH="${OLD_PATCH//-}"
 
 sed -i -e "s/^#define TF_MAJOR_VERSION ${OLD_MAJOR}/#define TF_MAJOR_VERSION ${MAJOR}/g" ${VERSION_H}
 sed -i -e "s/^#define TF_MINOR_VERSION ${OLD_MINOR}/#define TF_MINOR_VERSION ${MINOR}/g" ${VERSION_H}
@@ -92,6 +93,26 @@ check_existence file "${README_MD}"
 
 sed -i -r -e "s/${OLD_MAJOR}\.${OLD_MINOR}\.([[:alnum:]]+)-/${MAJOR}.${MINOR}.${PIP_PATCH}-/g" "${README_MD}"
 
+# Update the install md files
+NEW_PIP_TAG=$MAJOR.$MINOR.$PIP_PATCH
+OLD_PIP_TAG=$OLD_MAJOR.$OLD_MINOR.$OLD_PIP_PATCH
+
+for file in ${TF_SRC_DIR}/docs_src/install/install_{linux,mac,windows,sources}.md
+do
+  sed -i "s/tensorflow-${OLD_PIP_TAG}/tensorflow-${NEW_PIP_TAG}/g" $file
+  sed -i "s/tensorflow_gpu-${OLD_PIP_TAG}/tensorflow_gpu-${NEW_PIP_TAG}/g" $file
+  sed -i "s/TensorFlow ${OLD_PIP_TAG}/TensorFlow ${NEW_PIP_TAG}/g" $file
+done
+
+NEW_TAG=$MAJOR.$MINOR.$PATCH
+OLD_TAG=$OLD_MAJOR.$OLD_MINOR.$OLD_PATCH
+
+for file in ${TF_SRC_DIR}/docs_src/install/install_{java,go,c}.md
+do
+  sed -i "s/x86_64-${OLD_TAG}/x86_64-${NEW_TAG}/g" $file
+  sed -i "s/libtensorflow-${OLD_TAG}.jar/libtensorflow-${NEW_TAG}.jar/g" $file
+  sed -i "s/<version>${OLD_TAG}<\/version>/<version>${NEW_TAG}<\/version>/g" $file
+done
 
 # Updates to be made if there are major / minor version changes
 MAJOR_MINOR_CHANGE=0
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 810bd9527e..3253440a23 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc0'
+_VERSION = '1.1.0-rc1'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
-- 
GitLab


From 3354bc966862afb2fac05fba9002de05f3535e17 Mon Sep 17 00:00:00 2001
From: zjj2wry <zhengjiajin2016@gmail.com>
Date: Thu, 6 Apr 2017 10:05:57 +0800
Subject: [PATCH 0162/1563] wipe out null string (#8990)

---
 tensorflow/docs_src/get_started/get_started.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 04ac3f5848..6ae61b43a0 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -1,4 +1,3 @@
-
 # Getting Started With TensorFlow
 
 This guide gets you started programming in TensorFlow. Before using this guide,
-- 
GitLab


From 4c9ec814db9e01c5ad25b6fed2745bf8abbe9706 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 17:33:07 -0800
Subject: [PATCH 0163/1563] Automated rollback of change 152332221 Change:
 152333917

---
 tensorflow/BUILD                              |   1 -
 tensorflow/contrib/cmake/CMakeLists.txt       |   3 -
 tensorflow/contrib/cmake/external/fft2d.cmake |  37 --
 .../cmake/patches/fft2d/CMakeLists.txt        |  17 -
 tensorflow/core/BUILD                         |   9 +-
 tensorflow/core/kernels/BUILD                 | 111 ------
 tensorflow/core/kernels/spectrogram.cc        | 212 -----------
 tensorflow/core/kernels/spectrogram.h         | 112 ------
 .../kernels/spectrogram_convert_test_data.cc  |  56 ---
 tensorflow/core/kernels/spectrogram_op.cc     | 120 -------
 .../core/kernels/spectrogram_op_test.cc       | 104 ------
 tensorflow/core/kernels/spectrogram_test.cc   | 340 ------------------
 .../core/kernels/spectrogram_test_data/README |   8 -
 .../short_test_segment.wav                    | Bin 91784 -> 0 bytes
 .../short_test_segment_spectrogram.csv.bin    | Bin 365968 -> 0 bytes
 ...t_test_segment_spectrogram_400_200.csv.bin | Bin 468768 -> 0 bytes
 .../core/kernels/spectrogram_test_utils.cc    | 288 ---------------
 .../core/kernels/spectrogram_test_utils.h     |  81 -----
 tensorflow/core/lib/core/bits.h               |  13 -
 tensorflow/core/ops/audio_ops.cc              |  79 ----
 .../core/platform/default/build_config/BUILD  |   1 -
 tensorflow/core/util/command_line_flags.cc    |  28 --
 tensorflow/core/util/command_line_flags.h     |   4 +-
 .../core/util/command_line_flags_test.cc      |  35 +-
 tensorflow/examples/wav_to_spectrogram/BUILD  |  68 ----
 .../examples/wav_to_spectrogram/README.md     |  49 ---
 .../examples/wav_to_spectrogram/main.cc       |  66 ----
 .../wav_to_spectrogram/wav_to_spectrogram.cc  |  97 -----
 .../wav_to_spectrogram/wav_to_spectrogram.h   |  31 --
 .../wav_to_spectrogram_test.cc                |  37 --
 tensorflow/tools/lib_package/BUILD            |   4 -
 tensorflow/tools/pip_package/BUILD            |   2 -
 tensorflow/workspace.bzl                      |  10 -
 33 files changed, 8 insertions(+), 2015 deletions(-)
 delete mode 100644 tensorflow/contrib/cmake/external/fft2d.cmake
 delete mode 100644 tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
 delete mode 100644 tensorflow/core/kernels/spectrogram.cc
 delete mode 100644 tensorflow/core/kernels/spectrogram.h
 delete mode 100644 tensorflow/core/kernels/spectrogram_convert_test_data.cc
 delete mode 100644 tensorflow/core/kernels/spectrogram_op.cc
 delete mode 100644 tensorflow/core/kernels/spectrogram_op_test.cc
 delete mode 100644 tensorflow/core/kernels/spectrogram_test.cc
 delete mode 100644 tensorflow/core/kernels/spectrogram_test_data/README
 delete mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav
 delete mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin
 delete mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin
 delete mode 100644 tensorflow/core/kernels/spectrogram_test_utils.cc
 delete mode 100644 tensorflow/core/kernels/spectrogram_test_utils.h
 delete mode 100644 tensorflow/examples/wav_to_spectrogram/BUILD
 delete mode 100644 tensorflow/examples/wav_to_spectrogram/README.md
 delete mode 100644 tensorflow/examples/wav_to_spectrogram/main.cc
 delete mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
 delete mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
 delete mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 5d2b1e74df..37dc8e265f 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -276,7 +276,6 @@ filegroup(
         "//tensorflow/examples/tutorials/estimators:all_files",
         "//tensorflow/examples/tutorials/mnist:all_files",
         "//tensorflow/examples/tutorials/word2vec:all_files",
-        "//tensorflow/examples/wav_to_spectrogram:all_files",
         "//tensorflow/go:all_files",
         "//tensorflow/java:all_files",
         "//tensorflow/java/src/main/java/org/tensorflow/examples:all_files",
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 31a3d45a98..e27df6898e 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -108,7 +108,6 @@ include(eigen)
 include(gemmlowp)
 include(jsoncpp)
 include(farmhash)
-include(fft2d)
 include(highwayhash)
 include(protobuf)
 if (tensorflow_BUILD_CC_TESTS)
@@ -122,7 +121,6 @@ set(tensorflow_EXTERNAL_LIBRARIES
     ${jpeg_STATIC_LIBRARIES}
     ${jsoncpp_STATIC_LIBRARIES}
     ${farmhash_STATIC_LIBRARIES}
-    ${fft2d_STATIC_LIBRARIES}
     ${highwayhash_STATIC_LIBRARIES}
     ${protobuf_STATIC_LIBRARIES}
 )
@@ -137,7 +135,6 @@ set(tensorflow_EXTERNAL_DEPENDENCIES
     protobuf
     eigen
     gemmlowp
-    fft2d
 )
 
 include_directories(
diff --git a/tensorflow/contrib/cmake/external/fft2d.cmake b/tensorflow/contrib/cmake/external/fft2d.cmake
deleted file mode 100644
index 50c6b91684..0000000000
--- a/tensorflow/contrib/cmake/external/fft2d.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-include (ExternalProject)
-
-set(fft2d_URL http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz)
-set(fft2d_HASH SHA256=52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296)
-set(fft2d_BUILD ${CMAKE_CURRENT_BINARY_DIR}/fft2d/)
-set(fft2d_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/fft2d/src)
-
-if(WIN32)
-  set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/lib/fft2d.lib)
-
-  ExternalProject_Add(fft2d
-      PREFIX fft2d
-      URL ${fft2d_URL}
-      URL_HASH ${fft2d_HASH}
-      DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
-      BUILD_IN_SOURCE 1
-      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt
-      INSTALL_DIR ${fft2d_INSTALL}
-      CMAKE_CACHE_ARGS
-          -DCMAKE_BUILD_TYPE:STRING=Release
-          -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-          -DCMAKE_INSTALL_PREFIX:STRING=${fft2d_INSTALL})
-else()
-  set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/fft2d/libfft2d.a)
-
-  ExternalProject_Add(fft2d
-      PREFIX fft2d
-      URL ${fft2d_URL}
-      URL_HASH ${fft2d_HASH}
-      DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
-      BUILD_IN_SOURCE 1
-      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt
-      INSTALL_DIR $(fft2d_INSTALL)
-      INSTALL_COMMAND echo
-      BUILD_COMMAND $(MAKE))
-    
-endif()
diff --git a/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt b/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
deleted file mode 100644
index b31ea3ed98..0000000000
--- a/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 2.8.3)
-
-project(fft2d)
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-set(FFT2D_SRCS
-    "fftsg.c"
-)
-
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
-
-add_library(fft2d ${FFT2D_SRCS})
-
-install(TARGETS fft2d
-  LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
-  ARCHIVE DESTINATION lib COMPONENT Development)
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 6b7e297c4f..ba761cd7c6 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -494,6 +494,7 @@ cc_library(
 tf_gen_op_libs(
     op_lib_names = [
         "array_ops",
+        "audio_ops",
         "candidate_sampling_ops",
         "control_flow_ops",
         "ctc_ops",
@@ -523,13 +524,6 @@ tf_gen_op_libs(
     ],
 )
 
-tf_gen_op_libs(
-    op_lib_names = [
-        "audio_ops",
-    ],
-    deps = [":lib"],
-)
-
 cc_library(
     name = "debug_ops_op_lib",
     srcs = ["ops/debug_ops.cc"],
@@ -692,7 +686,6 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//tensorflow/core/kernels:array",
-        "//tensorflow/core/kernels:audio",
         "//tensorflow/core/kernels:bincount_op",
         "//tensorflow/core/kernels:candidate_sampler_ops",
         "//tensorflow/core/kernels:control_flow_ops",
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 0a4fd0f256..9c47d520d9 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -3537,117 +3537,6 @@ tf_kernel_library(
     ],
 )
 
-filegroup(
-    name = "spectrogram_test_data",
-    srcs = [
-        "spectrogram_test_data/short_test_segment.wav",
-        "spectrogram_test_data/short_test_segment_spectrogram.csv.bin",
-        "spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "spectrogram",
-    srcs = ["spectrogram.cc"],
-    hdrs = ["spectrogram.h"],
-    copts = tf_copts(),
-    deps = [
-        "//tensorflow/core:framework",
-        "//tensorflow/core:lib",
-        "//third_party/fft2d:fft2d_headers",
-        "@fft2d//:fft2d",
-    ],
-)
-
-cc_library(
-    name = "spectrogram_test_utils",
-    testonly = 1,
-    srcs = ["spectrogram_test_utils.cc"],
-    hdrs = ["spectrogram_test_utils.h"],
-    copts = tf_copts(),
-    deps = [
-        "//tensorflow/core:framework",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/core:test",
-    ],
-)
-
-cc_binary(
-    name = "spectrogram_convert_test_data",
-    testonly = 1,
-    srcs = ["spectrogram_convert_test_data.cc"],
-    deps = [
-        ":spectrogram_test_utils",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
-    ],
-)
-
-tf_cc_test(
-    name = "spectrogram_test",
-    size = "medium",
-    srcs = ["spectrogram_test.cc"],
-    data = [":spectrogram_test_data"],
-    deps = [
-        ":spectrogram",
-        ":spectrogram_test_utils",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
-        "//tensorflow/core:lib_test_internal",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/core:test",
-        "//tensorflow/core:test_main",
-        "//third_party/eigen3",
-    ],
-)
-
-tf_kernel_library(
-    name = "spectrogram_op",
-    prefix = "spectrogram_op",
-    deps = [
-        ":spectrogram",
-        "//tensorflow/core:audio_ops_op_lib",
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
-    ],
-    alwayslink = 1,
-)
-
-tf_cuda_cc_test(
-    name = "spectrogram_op_test",
-    size = "small",
-    srcs = ["spectrogram_op_test.cc"],
-    deps = [
-        ":ops_util",
-        ":spectrogram_op",
-        "//tensorflow/cc:cc_ops",
-        "//tensorflow/cc:client_session",
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/core:tensorflow",
-        "//tensorflow/core:test",
-        "//tensorflow/core:test_main",
-        "//tensorflow/core:testlib",
-    ],
-)
-
-cc_library(
-    name = "audio",
-    deps = [
-        ":decode_wav_op",
-        ":encode_wav_op",
-        ":spectrogram_op",
-    ],
-)
-
 # Android libraries -----------------------------------------------------------
 
 # Changes to the Android srcs here should be replicated in
diff --git a/tensorflow/core/kernels/spectrogram.cc b/tensorflow/core/kernels/spectrogram.cc
deleted file mode 100644
index 7531d5d64a..0000000000
--- a/tensorflow/core/kernels/spectrogram.cc
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/core/kernels/spectrogram.h"
-
-#include <math.h>
-
-#include "third_party/fft2d/fft.h"
-#include "tensorflow/core/lib/core/bits.h"
-
-namespace tensorflow {
-
-using std::complex;
-
-namespace {
-// Returns the default Hann window function for the spectrogram.
-void GetPeriodicHann(int window_length, std::vector<double>* window) {
-  // Some platforms don't have M_PI, so define a local constant here.
-  const double pi = std::atan(1) * 4;
-  window->resize(window_length);
-  for (int i = 0; i < window_length; ++i) {
-    (*window)[i] = 0.5 - 0.5 * cos((2 * pi * i) / window_length);
-  }
-}
-}  // namespace
-
-bool Spectrogram::Initialize(int window_length, int step_length) {
-  std::vector<double> window;
-  GetPeriodicHann(window_length, &window);
-  return Initialize(window, step_length);
-}
-
-bool Spectrogram::Initialize(const std::vector<double>& window,
-                             int step_length) {
-  window_length_ = window.size();
-  window_ = window;  // Copy window.
-  if (window_length_ < 2) {
-    LOG(ERROR) << "Window length too short.";
-    initialized_ = false;
-    return false;
-  }
-
-  step_length_ = step_length;
-  if (step_length_ < 1) {
-    LOG(ERROR) << "Step length must be positive.";
-    initialized_ = false;
-    return false;
-  }
-
-  fft_length_ = NextPowerOfTwo(window_length_);
-  CHECK(fft_length_ >= window_length_);
-  output_frequency_channels_ = 1 + fft_length_ / 2;
-
-  // Allocate 2 more than what rdft needs, so we can rationalize the layout.
-  fft_input_output_.assign(fft_length_ + 2, 0.0);
-
-  int half_fft_length = fft_length_ / 2;
-  fft_double_working_area_.assign(half_fft_length, 0.0);
-  fft_integer_working_area_.assign(2 + static_cast<int>(sqrt(half_fft_length)),
-                                   0);
-  // Set flag element to ensure that the working areas are initialized
-  // on the first call to cdft.  It's redundant given the assign above,
-  // but keep it as a reminder.
-  fft_integer_working_area_[0] = 0;
-  input_queue_.clear();
-  samples_to_next_step_ = window_length_;
-  initialized_ = true;
-  return true;
-}
-
-template <class InputSample, class OutputSample>
-bool Spectrogram::ComputeComplexSpectrogram(
-    const std::vector<InputSample>& input,
-    std::vector<std::vector<complex<OutputSample>>>* output) {
-  if (!initialized_) {
-    LOG(ERROR) << "ComputeComplexSpectrogram() called before successful call "
-               << "to Initialize().";
-    return false;
-  }
-  CHECK(output);
-  output->clear();
-  int input_start = 0;
-  while (GetNextWindowOfSamples(input, &input_start)) {
-    DCHECK_EQ(input_queue_.size(), window_length_);
-    ProcessCoreFFT();  // Processes input_queue_ to fft_input_output_.
-    // Add a new slice vector onto the output, to save new result to.
-    output->resize(output->size() + 1);
-    // Get a reference to the newly added slice to fill in.
-    auto& spectrogram_slice = output->back();
-    spectrogram_slice.resize(output_frequency_channels_);
-    for (int i = 0; i < output_frequency_channels_; ++i) {
-      // This will convert double to float if it needs to.
-      spectrogram_slice[i] = complex<OutputSample>(
-          fft_input_output_[2 * i], fft_input_output_[2 * i + 1]);
-    }
-  }
-  return true;
-}
-// Instantiate it four ways:
-template bool Spectrogram::ComputeComplexSpectrogram(
-    const std::vector<float>& input, std::vector<std::vector<complex<float>>>*);
-template bool Spectrogram::ComputeComplexSpectrogram(
-    const std::vector<double>& input,
-    std::vector<std::vector<complex<float>>>*);
-template bool Spectrogram::ComputeComplexSpectrogram(
-    const std::vector<float>& input,
-    std::vector<std::vector<complex<double>>>*);
-template bool Spectrogram::ComputeComplexSpectrogram(
-    const std::vector<double>& input,
-    std::vector<std::vector<complex<double>>>*);
-
-template <class InputSample, class OutputSample>
-bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
-    const std::vector<InputSample>& input,
-    std::vector<std::vector<OutputSample>>* output) {
-  if (!initialized_) {
-    LOG(ERROR) << "ComputeSquaredMagnitudeSpectrogram() called before "
-               << "successful call to Initialize().";
-    return false;
-  }
-  CHECK(output);
-  output->clear();
-  int input_start = 0;
-  while (GetNextWindowOfSamples(input, &input_start)) {
-    DCHECK_EQ(input_queue_.size(), window_length_);
-    ProcessCoreFFT();  // Processes input_queue_ to fft_input_output_.
-    // Add a new slice vector onto the output, to save new result to.
-    output->resize(output->size() + 1);
-    // Get a reference to the newly added slice to fill in.
-    auto& spectrogram_slice = output->back();
-    spectrogram_slice.resize(output_frequency_channels_);
-    for (int i = 0; i < output_frequency_channels_; ++i) {
-      // Similar to the Complex case, except storing the norm.
-      // But the norm function is known to be a performance killer,
-      // so do it this way with explicit real and imagninary temps.
-      const double re = fft_input_output_[2 * i];
-      const double im = fft_input_output_[2 * i + 1];
-      // Which finally converts double to float if it needs to.
-      spectrogram_slice[i] = re * re + im * im;
-    }
-  }
-  return true;
-}
-// Instantiate it four ways:
-template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
-    const std::vector<float>& input, std::vector<std::vector<float>>*);
-template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
-    const std::vector<double>& input, std::vector<std::vector<float>>*);
-template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
-    const std::vector<float>& input, std::vector<std::vector<double>>*);
-template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
-    const std::vector<double>& input, std::vector<std::vector<double>>*);
-
-// Return true if a full window of samples is prepared; manage the queue.
-template <class InputSample>
-bool Spectrogram::GetNextWindowOfSamples(const std::vector<InputSample>& input,
-                                         int* input_start) {
-  auto input_it = input.begin() + *input_start;
-  int input_remaining = input.end() - input_it;
-  if (samples_to_next_step_ > input_remaining) {
-    // Copy in as many samples are left and return false, no full window.
-    input_queue_.insert(input_queue_.end(), input_it, input.end());
-    *input_start += input_remaining;  // Increases it to input.size().
-    samples_to_next_step_ -= input_remaining;
-    return false;  // Not enough for a full window.
-  } else {
-    // Copy just enough into queue to make a new window, then trim the
-    // front off the queue to make it window-sized.
-    input_queue_.insert(input_queue_.end(), input_it,
-                        input_it + samples_to_next_step_);
-    *input_start += samples_to_next_step_;
-    input_queue_.erase(
-        input_queue_.begin(),
-        input_queue_.begin() + input_queue_.size() - window_length_);
-    DCHECK_EQ(window_length_, input_queue_.size());
-    samples_to_next_step_ = step_length_;  // Be ready for next time.
-    return true;  // Yes, input_queue_ now contains exactly a window-full.
-  }
-}
-
-void Spectrogram::ProcessCoreFFT() {
-  for (int j = 0; j < window_length_; ++j) {
-    fft_input_output_[j] = input_queue_[j] * window_[j];
-  }
-  // Zero-pad the rest of the input buffer.
-  for (int j = window_length_; j < fft_length_; ++j) {
-    fft_input_output_[j] = 0.0;
-  }
-  const int kForwardFFT = 1;  // 1 means forward; -1 reverse.
-  // This real FFT is a fair amount faster than using cdft here.
-  rdft(fft_length_, kForwardFFT, &fft_input_output_[0],
-       &fft_integer_working_area_[0], &fft_double_working_area_[0]);
-  // Make rdft result look like cdft result;
-  // unpack the last real value from the first position's imag slot.
-  fft_input_output_[fft_length_] = fft_input_output_[1];
-  fft_input_output_[fft_length_ + 1] = 0;
-  fft_input_output_[1] = 0;
-}
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram.h b/tensorflow/core/kernels/spectrogram.h
deleted file mode 100644
index 5476a0a961..0000000000
--- a/tensorflow/core/kernels/spectrogram.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// Class for generating spectrogram slices from a waveform.
-// Initialize() should be called before calls to other functions.  Once
-// Initialize() has been called and returned true, The Compute*() functions can
-// be called repeatedly with sequential input data (ie. the first element of the
-// next input vector directly follows the last element of the previous input
-// vector). Whenever enough audio samples are buffered to produce a
-// new frame, it will be placed in output. Output is cleared on each
-// call to Compute*(). This class is thread-unsafe, and should only be
-// called from one thread at a time.
-// With the default parameters, the output of this class should be very
-// close to the results of the following MATLAB code:
-// overlap_samples = window_length_samples - step_samples;
-// window = hann(window_length_samples, 'periodic');
-// S = abs(spectrogram(audio, window, overlap_samples)).^2;
-
-#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
-#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
-
-#include <complex>
-#include <deque>
-#include <vector>
-
-#include "third_party/fft2d/fft.h"
-#include "tensorflow/core/framework/op_kernel.h"
-#include "tensorflow/core/framework/tensor.h"
-
-namespace tensorflow {
-
-class Spectrogram {
- public:
-  Spectrogram() : initialized_(false) {}
-  ~Spectrogram() {}
-
-  // Initializes the class with a given window length and step length
-  // (both in samples). Internally a Hann window is used as the window
-  // function. Returns true on success, after which calls to Process()
-  // are possible. window_length must be greater than 1 and step
-  // length must be greater than 0.
-  bool Initialize(int window_length, int step_length);
-
-  // Initialize with an explicit window instead of a length.
-  bool Initialize(const std::vector<double>& window, int step_length);
-
-  // Processes an arbitrary amount of audio data (contained in input)
-  // to yield complex spectrogram frames. After a successful call to
-  // Initialize(), Process() may be called repeatedly with new input data
-  // each time.  The audio input is buffered internally, and the output
-  // vector is populated with as many temporally-ordered spectral slices
-  // as it is possible to generate from the input.  The output is cleared
-  // on each call before the new frames (if any) are added.
-  //
-  // The template parameters can be float or double.
-  template <class InputSample, class OutputSample>
-  bool ComputeComplexSpectrogram(
-      const std::vector<InputSample>& input,
-      std::vector<std::vector<std::complex<OutputSample>>>* output);
-
-  // This function works as the one above, but returns the power
-  // (the L2 norm, or the squared magnitude) of each complex value.
-  template <class InputSample, class OutputSample>
-  bool ComputeSquaredMagnitudeSpectrogram(
-      const std::vector<InputSample>& input,
-      std::vector<std::vector<OutputSample>>* output);
-
-  // Return reference to the window function used internally.
-  const std::vector<double>& GetWindow() const { return window_; }
-
-  // Return the number of frequency channels in the spectrogram.
-  int output_frequency_channels() const { return output_frequency_channels_; }
-
- private:
-  template <class InputSample>
-  bool GetNextWindowOfSamples(const std::vector<InputSample>& input,
-                              int* input_start);
-  void ProcessCoreFFT();
-
-  int fft_length_;
-  int output_frequency_channels_;
-  int window_length_;
-  int step_length_;
-  bool initialized_;
-  int samples_to_next_step_;
-
-  std::vector<double> window_;
-  std::vector<double> fft_input_output_;
-  std::deque<double> input_queue_;
-
-  // Working data areas for the FFT routines.
-  std::vector<int> fft_integer_working_area_;
-  std::vector<double> fft_double_working_area_;
-
-  TF_DISALLOW_COPY_AND_ASSIGN(Spectrogram);
-};
-
-}  // namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
diff --git a/tensorflow/core/kernels/spectrogram_convert_test_data.cc b/tensorflow/core/kernels/spectrogram_convert_test_data.cc
deleted file mode 100644
index bae13c0213..0000000000
--- a/tensorflow/core/kernels/spectrogram_convert_test_data.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/core/kernels/spectrogram_test_utils.h"
-
-#include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/platform/init_main.h"
-#include "tensorflow/core/platform/logging.h"
-
-namespace tensorflow {
-namespace wav {
-
-// This takes a CSV file representing an array of complex numbers, and saves out
-// a version using a binary format to save space in the repository.
-Status ConvertCsvToRaw(const string& input_filename) {
-  std::vector<std::vector<std::complex<double>>> input_data;
-  ReadCSVFileToComplexVectorOrDie(input_filename, &input_data);
-  const string output_filename = input_filename + ".bin";
-  if (!WriteComplexVectorToRawFloatFile(output_filename, input_data)) {
-    return errors::InvalidArgument("Failed to write raw float file ",
-                                   input_filename);
-  }
-  LOG(INFO) << "Wrote raw file to " << output_filename;
-  return Status::OK();
-}
-
-}  // namespace wav
-}  // namespace tensorflow
-
-int main(int argc, char* argv[]) {
-  tensorflow::port::InitMain(argv[0], &argc, &argv);
-  if (argc < 2) {
-    LOG(ERROR) << "You must supply a CSV file as the first argument";
-    return 1;
-  }
-  tensorflow::string filename(argv[1]);
-  tensorflow::Status status = tensorflow::wav::ConvertCsvToRaw(filename);
-  if (!status.ok()) {
-    LOG(ERROR) << "Error processing '" << filename << "':" << status;
-    return 1;
-  }
-  return 0;
-}
diff --git a/tensorflow/core/kernels/spectrogram_op.cc b/tensorflow/core/kernels/spectrogram_op.cc
deleted file mode 100644
index 98d9bb1ad1..0000000000
--- a/tensorflow/core/kernels/spectrogram_op.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// See docs in ../ops/audio_ops.cc
-
-#include "tensorflow/core/framework/op_kernel.h"
-#include "tensorflow/core/framework/register_types.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/framework/tensor_shape.h"
-#include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/kernels/spectrogram.h"
-#include "tensorflow/core/lib/core/status.h"
-
-namespace tensorflow {
-
-// Create a spectrogram frequency visualization from audio data.
-class SpectrogramOp : public OpKernel {
- public:
-  explicit SpectrogramOp(OpKernelConstruction* context) : OpKernel(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("window_size", &window_size_));
-    OP_REQUIRES_OK(context, context->GetAttr("stride", &stride_));
-    OP_REQUIRES_OK(context,
-                   context->GetAttr("magnitude_squared", &magnitude_squared_));
-  }
-
-  void Compute(OpKernelContext* context) override {
-    const Tensor& input = context->input(0);
-    OP_REQUIRES(context, input.dims() == 2,
-                errors::InvalidArgument("input must be 2-dimensional",
-                                        input.shape().DebugString()));
-    Spectrogram spectrogram;
-    OP_REQUIRES(context, spectrogram.Initialize(window_size_, stride_),
-                errors::InvalidArgument(
-                    "Spectrogram initialization failed for window size ",
-                    window_size_, " and stride ", stride_));
-
-    const auto input_as_matrix = input.matrix<float>();
-
-    const int64 sample_count = input.dim_size(0);
-    const int64 channel_count = input.dim_size(1);
-
-    const int64 output_width = spectrogram.output_frequency_channels();
-    const int64 length_minus_window = (sample_count - window_size_);
-    int64 output_height;
-    if (length_minus_window < 0) {
-      output_height = 0;
-    } else {
-      output_height = 1 + (length_minus_window / stride_);
-    }
-    const int64 output_slices = channel_count;
-
-    Tensor* output_tensor = nullptr;
-    OP_REQUIRES_OK(
-        context,
-        context->allocate_output(
-            0, TensorShape({output_slices, output_height, output_width}),
-            &output_tensor));
-    auto output_flat = output_tensor->flat<float>().data();
-
-    std::vector<float> input_for_channel(sample_count);
-    for (int64 channel = 0; channel < channel_count; ++channel) {
-      float* output_slice =
-          output_flat + (channel * output_height * output_width);
-      for (int i = 0; i < sample_count; ++i) {
-        input_for_channel[i] = input_as_matrix(i, channel);
-      }
-      std::vector<std::vector<float>> spectrogram_output;
-      OP_REQUIRES(context,
-                  spectrogram.ComputeSquaredMagnitudeSpectrogram(
-                      input_for_channel, &spectrogram_output),
-                  errors::InvalidArgument("Spectrogram compute failed"));
-      OP_REQUIRES(context, (spectrogram_output.size() == output_height),
-                  errors::InvalidArgument(
-                      "Spectrogram size calculation failed: Expected height ",
-                      output_height, " but got ", spectrogram_output.size()));
-      OP_REQUIRES(context,
-                  spectrogram_output.empty() ||
-                      (spectrogram_output[0].size() == output_width),
-                  errors::InvalidArgument(
-                      "Spectrogram size calculation failed: Expected width ",
-                      output_width, " but got ", spectrogram_output[0].size()));
-      for (int row_index = 0; row_index < output_height; ++row_index) {
-        const std::vector<float>& spectrogram_row =
-            spectrogram_output[row_index];
-        DCHECK_EQ(spectrogram_row.size(), output_width);
-        float* output_row = output_slice + (row_index * output_width);
-        if (magnitude_squared_) {
-          for (int i = 0; i < output_width; ++i) {
-            output_row[i] = spectrogram_row[i];
-          }
-        } else {
-          for (int i = 0; i < output_width; ++i) {
-            output_row[i] = sqrtf(spectrogram_row[i]);
-          }
-        }
-      }
-    }
-  }
-
- private:
-  int32 window_size_;
-  int32 stride_;
-  bool magnitude_squared_;
-};
-REGISTER_KERNEL_BUILDER(Name("AudioSpectrogram").Device(DEVICE_CPU),
-                        SpectrogramOp);
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_op_test.cc b/tensorflow/core/kernels/spectrogram_op_test.cc
deleted file mode 100644
index 5c3cbeeeb9..0000000000
--- a/tensorflow/core/kernels/spectrogram_op_test.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#define EIGEN_USE_THREADS
-
-#include <functional>
-#include <memory>
-#include <vector>
-
-#include "tensorflow/cc/client/client_session.h"
-#include "tensorflow/cc/ops/audio_ops.h"
-#include "tensorflow/cc/ops/const_op.h"
-#include "tensorflow/cc/ops/math_ops.h"
-#include "tensorflow/core/framework/tensor_testutil.h"
-#include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/framework/types.pb.h"
-#include "tensorflow/core/kernels/ops_util.h"
-#include "tensorflow/core/lib/core/status_test_util.h"
-#include "tensorflow/core/platform/test.h"
-
-namespace tensorflow {
-
-using namespace ops;  // NOLINT(build/namespaces)
-
-TEST(SpectrogramOpTest, SimpleTest) {
-  Scope root = Scope::NewRootScope();
-
-  Tensor audio_tensor(DT_FLOAT, TensorShape({8, 1}));
-  test::FillValues<float>(&audio_tensor,
-                          {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f});
-
-  Output audio_const_op = Const(root.WithOpName("audio_const_op"),
-                                Input::Initializer(audio_tensor));
-
-  AudioSpectrogram spectrogram_op =
-      AudioSpectrogram(root.WithOpName("spectrogram_op"), audio_const_op, 8, 1);
-
-  TF_ASSERT_OK(root.status());
-
-  ClientSession session(root);
-  std::vector<Tensor> outputs;
-
-  TF_EXPECT_OK(session.Run(ClientSession::FeedType(),
-                           {spectrogram_op.spectrogram}, &outputs));
-
-  const Tensor& spectrogram_tensor = outputs[0];
-
-  EXPECT_EQ(3, spectrogram_tensor.dims());
-  EXPECT_EQ(5, spectrogram_tensor.dim_size(2));
-  EXPECT_EQ(1, spectrogram_tensor.dim_size(1));
-  EXPECT_EQ(1, spectrogram_tensor.dim_size(0));
-
-  test::ExpectTensorNear<float>(
-      spectrogram_tensor,
-      test::AsTensor<float>({0, 1, 2, 1, 0}, TensorShape({1, 1, 5})), 1e-3);
-}
-
-TEST(SpectrogramOpTest, SquaredTest) {
-  Scope root = Scope::NewRootScope();
-
-  Tensor audio_tensor(DT_FLOAT, TensorShape({8, 1}));
-  test::FillValues<float>(&audio_tensor,
-                          {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f});
-
-  Output audio_const_op = Const(root.WithOpName("audio_const_op"),
-                                Input::Initializer(audio_tensor));
-
-  AudioSpectrogram spectrogram_op =
-      AudioSpectrogram(root.WithOpName("spectrogram_op"), audio_const_op, 8, 1,
-                       AudioSpectrogram::Attrs().MagnitudeSquared(true));
-
-  TF_ASSERT_OK(root.status());
-
-  ClientSession session(root);
-  std::vector<Tensor> outputs;
-
-  TF_EXPECT_OK(session.Run(ClientSession::FeedType(),
-                           {spectrogram_op.spectrogram}, &outputs));
-
-  const Tensor& spectrogram_tensor = outputs[0];
-
-  EXPECT_EQ(3, spectrogram_tensor.dims());
-  EXPECT_EQ(5, spectrogram_tensor.dim_size(2));
-  EXPECT_EQ(1, spectrogram_tensor.dim_size(1));
-  EXPECT_EQ(1, spectrogram_tensor.dim_size(0));
-
-  test::ExpectTensorNear<float>(
-      spectrogram_tensor,
-      test::AsTensor<float>({0, 1, 4, 1, 0}, TensorShape({1, 1, 5})), 1e-3);
-}
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test.cc b/tensorflow/core/kernels/spectrogram_test.cc
deleted file mode 100644
index 73175a91a0..0000000000
--- a/tensorflow/core/kernels/spectrogram_test.cc
+++ /dev/null
@@ -1,340 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// The MATLAB test data were generated using GenerateTestData.m.
-
-#include "tensorflow/core/kernels/spectrogram.h"
-
-#include <complex>
-#include <vector>
-
-#include "tensorflow/core/kernels/spectrogram_test_utils.h"
-#include "tensorflow/core/lib/core/status_test_util.h"
-#include "tensorflow/core/lib/io/path.h"
-#include "tensorflow/core/platform/test.h"
-#include "tensorflow/core/platform/types.h"
-
-namespace tensorflow {
-
-using ::std::complex;
-
-const char kInputFilename[] =
-    "core/kernels/spectrogram_test_data/short_test_segment.wav";
-
-const char kExpectedFilename[] =
-    "core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin";
-const int kDataVectorLength = 257;
-const int kNumberOfFramesInTestData = 178;
-
-const char kExpectedNonPowerOfTwoFilename[] =
-    "core/kernels/spectrogram_test_data/"
-    "short_test_segment_spectrogram_400_200.csv.bin";
-const int kNonPowerOfTwoDataVectorLength = 257;
-const int kNumberOfFramesInNonPowerOfTwoTestData = 228;
-
-TEST(SpectrogramTest, TooLittleDataYieldsNoFrames) {
-  Spectrogram sgram;
-  sgram.Initialize(400, 200);
-  std::vector<double> input;
-  // Generate 44 samples of audio.
-  SineWave(44100, 1000.0, 0.001, &input);
-  EXPECT_EQ(44, input.size());
-  std::vector<std::vector<complex<double>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  EXPECT_EQ(0, output.size());
-}
-
-TEST(SpectrogramTest, StepSizeSmallerThanWindow) {
-  Spectrogram sgram;
-  EXPECT_TRUE(sgram.Initialize(400, 200));
-  std::vector<double> input;
-  // Generate 661 samples of audio.
-  SineWave(44100, 1000.0, 0.015, &input);
-  EXPECT_EQ(661, input.size());
-  std::vector<std::vector<complex<double>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  EXPECT_EQ(2, output.size());
-}
-
-TEST(SpectrogramTest, StepSizeBiggerThanWindow) {
-  Spectrogram sgram;
-  EXPECT_TRUE(sgram.Initialize(200, 400));
-  std::vector<double> input;
-  // Generate 882 samples of audio.
-  SineWave(44100, 1000.0, 0.02, &input);
-  EXPECT_EQ(882, input.size());
-  std::vector<std::vector<complex<double>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  EXPECT_EQ(2, output.size());
-}
-
-TEST(SpectrogramTest, StepSizeBiggerThanWindow2) {
-  Spectrogram sgram;
-  EXPECT_TRUE(sgram.Initialize(200, 400));
-  std::vector<double> input;
-  // Generate more than 600 but fewer than 800 samples of audio.
-  SineWave(44100, 1000.0, 0.016, &input);
-  EXPECT_GT(input.size(), 600);
-  EXPECT_LT(input.size(), 800);
-  std::vector<std::vector<complex<double>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  EXPECT_EQ(2, output.size());
-}
-
-TEST(SpectrogramTest,
-     MultipleCallsToComputeComplexSpectrogramMayYieldDifferentNumbersOfFrames) {
-  // Repeatedly pass inputs with "extra" samples beyond complete windows
-  // and check that the excess points cumulate to eventually cause an
-  // extra output frame.
-  Spectrogram sgram;
-  sgram.Initialize(200, 400);
-  std::vector<double> input;
-  // Generate 882 samples of audio.
-  SineWave(44100, 1000.0, 0.02, &input);
-  EXPECT_EQ(882, input.size());
-  std::vector<std::vector<complex<double>>> output;
-  const std::vector<int> expected_output_sizes = {
-      2,  // One pass of input leaves 82 samples buffered after two steps of
-          // 400.
-      2,  // Passing in 882 samples again will now leave 164 samples buffered.
-      3,  // Third time gives 246 extra samples, triggering an extra output
-          // frame.
-  };
-  for (int expected_output_size : expected_output_sizes) {
-    sgram.ComputeComplexSpectrogram(input, &output);
-    EXPECT_EQ(expected_output_size, output.size());
-  }
-}
-
-TEST(SpectrogramTest, CumulatingExcessInputsForOverlappingFrames) {
-  // Input frames that don't fit into whole windows are cumulated even when
-  // the windows have overlap (similar to
-  // MultipleCallsToComputeComplexSpectrogramMayYieldDifferentNumbersOfFrames
-  // but with window size/hop size swapped).
-  Spectrogram sgram;
-  sgram.Initialize(400, 200);
-  std::vector<double> input;
-  // Generate 882 samples of audio.
-  SineWave(44100, 1000.0, 0.02, &input);
-  EXPECT_EQ(882, input.size());
-  std::vector<std::vector<complex<double>>> output;
-  const std::vector<int> expected_output_sizes = {
-      3,  // Windows 0..400, 200..600, 400..800 with 82 samples buffered.
-      4,  // 1764 frames input; outputs from 600, 800, 1000, 1200..1600.
-      5,  // 2646 frames in; outputs from 1400, 1600, 1800, 2000, 2200..2600.
-  };
-  for (int expected_output_size : expected_output_sizes) {
-    sgram.ComputeComplexSpectrogram(input, &output);
-    EXPECT_EQ(expected_output_size, output.size());
-  }
-}
-
-TEST(SpectrogramTest, StepSizeEqualToWindowWorks) {
-  Spectrogram sgram;
-  sgram.Initialize(200, 200);
-  std::vector<double> input;
-  // Generate 2205 samples of audio.
-  SineWave(44100, 1000.0, 0.05, &input);
-  EXPECT_EQ(2205, input.size());
-  std::vector<std::vector<complex<double>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  EXPECT_EQ(11, output.size());
-}
-
-template <class ExpectedSample, class ActualSample>
-void CompareComplexData(
-    const std::vector<std::vector<complex<ExpectedSample>>>& expected,
-    const std::vector<std::vector<complex<ActualSample>>>& actual,
-    double tolerance) {
-  ASSERT_EQ(actual.size(), expected.size());
-  for (int i = 0; i < expected.size(); ++i) {
-    ASSERT_EQ(expected[i].size(), actual[i].size());
-    for (int j = 0; j < expected[i].size(); ++j) {
-      ASSERT_NEAR(real(expected[i][j]), real(actual[i][j]), tolerance)
-          << ": where i=" << i << " and j=" << j << ".";
-      ASSERT_NEAR(imag(expected[i][j]), imag(actual[i][j]), tolerance)
-          << ": where i=" << i << " and j=" << j << ".";
-    }
-  }
-}
-
-template <class Sample>
-double GetMaximumAbsolute(const std::vector<std::vector<Sample>>& spectrogram) {
-  double max_absolute = 0.0;
-  for (int i = 0; i < spectrogram.size(); ++i) {
-    for (int j = 0; j < spectrogram[i].size(); ++j) {
-      double absolute_value = std::abs(spectrogram[i][j]);
-      if (absolute_value > max_absolute) {
-        max_absolute = absolute_value;
-      }
-    }
-  }
-  return max_absolute;
-}
-
-template <class ExpectedSample, class ActualSample>
-void CompareMagnitudeData(
-    const std::vector<std::vector<complex<ExpectedSample>>>&
-        expected_complex_output,
-    const std::vector<std::vector<ActualSample>>& actual_squared_magnitude,
-    double tolerance) {
-  ASSERT_EQ(actual_squared_magnitude.size(), expected_complex_output.size());
-  for (int i = 0; i < expected_complex_output.size(); ++i) {
-    ASSERT_EQ(expected_complex_output[i].size(),
-              actual_squared_magnitude[i].size());
-    for (int j = 0; j < expected_complex_output[i].size(); ++j) {
-      ASSERT_NEAR(norm(expected_complex_output[i][j]),
-                  actual_squared_magnitude[i][j], tolerance)
-          << ": where i=" << i << " and j=" << j << ".";
-    }
-  }
-}
-
-TEST(SpectrogramTest, ReInitializationWorks) {
-  Spectrogram sgram;
-  sgram.Initialize(512, 256);
-  std::vector<double> input;
-  CHECK(ReadWaveFileToVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
-      &input));
-  std::vector<std::vector<complex<double>>> first_output;
-  std::vector<std::vector<complex<double>>> second_output;
-  sgram.Initialize(512, 256);
-  sgram.ComputeComplexSpectrogram(input, &first_output);
-  // Re-Initialize it.
-  sgram.Initialize(512, 256);
-  sgram.ComputeComplexSpectrogram(input, &second_output);
-  // Verify identical outputs.
-  ASSERT_EQ(first_output.size(), second_output.size());
-  int slice_size = first_output[0].size();
-  for (int i = 0; i < first_output.size(); ++i) {
-    ASSERT_EQ(slice_size, first_output[i].size());
-    ASSERT_EQ(slice_size, second_output[i].size());
-    for (int j = 0; j < slice_size; ++j) {
-      ASSERT_EQ(first_output[i][j], second_output[i][j]);
-    }
-  }
-}
-
-TEST(SpectrogramTest, ComputedComplexDataAgreeWithMatlab) {
-  const int kInputDataLength = 45870;
-  Spectrogram sgram;
-  sgram.Initialize(512, 256);
-  std::vector<double> input;
-  CHECK(ReadWaveFileToVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
-      &input));
-  EXPECT_EQ(kInputDataLength, input.size());
-  std::vector<std::vector<complex<double>>> expected_output;
-  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
-      kDataVectorLength, &expected_output));
-  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
-  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
-  std::vector<std::vector<complex<double>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  CompareComplexData(expected_output, output, 1e-5);
-}
-
-TEST(SpectrogramTest, ComputedFloatComplexDataAgreeWithMatlab) {
-  const int kInputDataLength = 45870;
-  Spectrogram sgram;
-  sgram.Initialize(512, 256);
-  std::vector<double> double_input;
-  CHECK(ReadWaveFileToVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
-      &double_input));
-  std::vector<float> input;
-  input.assign(double_input.begin(), double_input.end());
-  EXPECT_EQ(kInputDataLength, input.size());
-  std::vector<std::vector<complex<double>>> expected_output;
-  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
-      kDataVectorLength, &expected_output));
-  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
-  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
-  std::vector<std::vector<complex<float>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  CompareComplexData(expected_output, output, 1e-4);
-}
-
-TEST(SpectrogramTest, ComputedSquaredMagnitudeDataAgreeWithMatlab) {
-  const int kInputDataLength = 45870;
-  Spectrogram sgram;
-  sgram.Initialize(512, 256);
-  std::vector<double> input;
-  CHECK(ReadWaveFileToVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
-      &input));
-  EXPECT_EQ(kInputDataLength, input.size());
-  std::vector<std::vector<complex<double>>> expected_output;
-  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
-      kDataVectorLength, &expected_output));
-  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
-  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
-  std::vector<std::vector<double>> output;
-  sgram.ComputeSquaredMagnitudeSpectrogram(input, &output);
-  CompareMagnitudeData(expected_output, output, 1e-3);
-}
-
-TEST(SpectrogramTest, ComputedFloatSquaredMagnitudeDataAgreeWithMatlab) {
-  const int kInputDataLength = 45870;
-  Spectrogram sgram;
-  sgram.Initialize(512, 256);
-  std::vector<double> double_input;
-  CHECK(ReadWaveFileToVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
-      &double_input));
-  EXPECT_EQ(kInputDataLength, double_input.size());
-  std::vector<float> input;
-  input.assign(double_input.begin(), double_input.end());
-  std::vector<std::vector<complex<double>>> expected_output;
-  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
-      kDataVectorLength, &expected_output));
-  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
-  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
-  std::vector<std::vector<float>> output;
-  sgram.ComputeSquaredMagnitudeSpectrogram(input, &output);
-  double max_absolute = GetMaximumAbsolute(output);
-  EXPECT_GT(max_absolute, 2300.0);  // Verify that we have some big numbers.
-  // Squaring increases dynamic range; max square is about 2300,
-  // so 2e-4 is about 7 decimal digits; not bad for a float.
-  CompareMagnitudeData(expected_output, output, 2e-4);
-}
-
-TEST(SpectrogramTest, ComputedNonPowerOfTwoComplexDataAgreeWithMatlab) {
-  const int kInputDataLength = 45870;
-  Spectrogram sgram;
-  sgram.Initialize(400, 200);
-  std::vector<double> input;
-  CHECK(ReadWaveFileToVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
-      &input));
-  EXPECT_EQ(kInputDataLength, input.size());
-  std::vector<std::vector<complex<double>>> expected_output;
-  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
-      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(),
-                               kExpectedNonPowerOfTwoFilename),
-      kNonPowerOfTwoDataVectorLength, &expected_output));
-  EXPECT_EQ(kNumberOfFramesInNonPowerOfTwoTestData, expected_output.size());
-  EXPECT_EQ(kNonPowerOfTwoDataVectorLength, expected_output[0].size());
-  std::vector<std::vector<complex<double>>> output;
-  sgram.ComputeComplexSpectrogram(input, &output);
-  CompareComplexData(expected_output, output, 1e-5);
-}
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test_data/README b/tensorflow/core/kernels/spectrogram_test_data/README
deleted file mode 100644
index 271238e0c9..0000000000
--- a/tensorflow/core/kernels/spectrogram_test_data/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The CSV spectrogram files in this directory are generated from the
-matlab code in ./matlab/GenerateTestData.m
-To save space in the repo, you'll then need to convert them into a binary packed
-format using the convert_test_data.cc command line tool.
-
-
-short_test_segment.wav is approximately 1s of music audio.
-
diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav
deleted file mode 100644
index 7339dfd08c8b31806e4e12c4421b7b0312173953..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 91784
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
amQv;w%%Lm+tXAyXx$OB53cnHa69)iyveY;L

diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin
deleted file mode 100644
index 67b9e2487c3f9cf960ad4af96f0688683e91cb02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365968
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%0D|N{M)s2**0sdrRR2Ao?X(v)0Jt4<tMXr
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%0Df)#Z`<
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
Jmkw?R005nUfC~Ts

diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin
deleted file mode 100644
index d5e4cc5dd60e96211ced3eaf6f08929bf61cff4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468768
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%0A!|!T$xD`IzQVia>5J{^$Z@k;xK7FHbavOS
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
Avj6}9

diff --git a/tensorflow/core/kernels/spectrogram_test_utils.cc b/tensorflow/core/kernels/spectrogram_test_utils.cc
deleted file mode 100644
index a2141c649f..0000000000
--- a/tensorflow/core/kernels/spectrogram_test_utils.cc
+++ /dev/null
@@ -1,288 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/core/kernels/spectrogram_test_utils.h"
-
-#include <math.h>
-#include <stddef.h>
-
-#include "tensorflow/core/lib/core/error_codes.pb.h"
-#include "tensorflow/core/lib/core/status_test_util.h"
-#include "tensorflow/core/lib/io/path.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/wav/wav_io.h"
-#include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/test.h"
-#include "tensorflow/core/platform/types.h"
-
-namespace tensorflow {
-
-bool ReadWaveFileToVector(const string& file_name, std::vector<double>* data) {
-  string wav_data;
-  if (!ReadFileToString(Env::Default(), file_name, &wav_data).ok()) {
-    LOG(ERROR) << "Wave file read failed for " << file_name;
-    return false;
-  }
-  std::vector<float> decoded_data;
-  uint32 decoded_sample_count;
-  uint16 decoded_channel_count;
-  uint32 decoded_sample_rate;
-  if (!wav::DecodeLin16WaveAsFloatVector(
-           wav_data, &decoded_data, &decoded_sample_count,
-           &decoded_channel_count, &decoded_sample_rate)
-           .ok()) {
-    return false;
-  }
-  // Convert from float to double for the output value.
-  data->resize(decoded_data.size());
-  for (int i = 0; i < decoded_data.size(); ++i) {
-    (*data)[i] = decoded_data[i];
-  }
-  return true;
-}
-
-bool ReadRawFloatFileToComplexVector(
-    const string& file_name, int row_length,
-    std::vector<std::vector<std::complex<double> > >* data) {
-  data->clear();
-  string data_string;
-  if (!ReadFileToString(Env::Default(), file_name, &data_string).ok()) {
-    LOG(ERROR) << "Failed to open file " << file_name;
-    return false;
-  }
-  float real_out;
-  float imag_out;
-  const int kBytesPerValue = 4;
-  CHECK_EQ(sizeof(real_out), kBytesPerValue);
-  std::vector<std::complex<double> > data_row;
-  int row_counter = 0;
-  int offset = 0;
-  const int end = data_string.size();
-  while (offset < end) {
-    memcpy(&real_out, data_string.data() + offset, kBytesPerValue);
-    offset += kBytesPerValue;
-    memcpy(&imag_out, data_string.data() + offset, kBytesPerValue);
-    offset += kBytesPerValue;
-    if (row_counter >= row_length) {
-      data->push_back(data_row);
-      data_row.clear();
-      row_counter = 0;
-    }
-    data_row.push_back(std::complex<double>(real_out, imag_out));
-    ++row_counter;
-  }
-  if (row_counter >= row_length) {
-    data->push_back(data_row);
-  }
-  return true;
-}
-
-void ReadCSVFileToComplexVectorOrDie(
-    const string& file_name,
-    std::vector<std::vector<std::complex<double> > >* data) {
-  data->clear();
-  string data_string;
-  if (!ReadFileToString(Env::Default(), file_name, &data_string).ok()) {
-    LOG(FATAL) << "Failed to open file " << file_name;
-    return;
-  }
-  std::vector<string> lines = str_util::Split(data_string, '\n');
-  for (const string& line : lines) {
-    if (line == "") {
-      continue;
-    }
-    std::vector<std::complex<double> > data_line;
-    std::vector<string> values = str_util::Split(line, ',');
-    for (std::vector<string>::const_iterator i = values.begin();
-         i != values.end(); ++i) {
-      // each element of values may be in the form:
-      // 0.001+0.002i, 0.001, 0.001i, -1.2i, -1.2-3.2i, 1.5, 1.5e-03+21.0i
-      std::vector<string> parts;
-      // Find the first instance of + or - after the second character
-      // in the string, that does not immediately follow an 'e'.
-      size_t operator_index = i->find_first_of("+-", 2);
-      if (operator_index < i->size() &&
-          i->substr(operator_index - 1, 1) == "e") {
-        operator_index = i->find_first_of("+-", operator_index + 1);
-      }
-      parts.push_back(i->substr(0, operator_index));
-      if (operator_index < i->size()) {
-        parts.push_back(i->substr(operator_index, string::npos));
-      }
-
-      double real_part = 0.0;
-      double imaginary_part = 0.0;
-      for (std::vector<string>::const_iterator j = parts.begin();
-           j != parts.end(); ++j) {
-        if (j->find_first_of("ij") != string::npos) {
-          strings::safe_strtod((*j).c_str(), &imaginary_part);
-        } else {
-          strings::safe_strtod((*j).c_str(), &real_part);
-        }
-      }
-      data_line.push_back(std::complex<double>(real_part, imaginary_part));
-    }
-    data->push_back(data_line);
-  }
-}
-
-void ReadCSVFileToArrayOrDie(const string& filename,
-                             std::vector<std::vector<float> >* array) {
-  string contents;
-  TF_CHECK_OK(ReadFileToString(Env::Default(), filename, &contents));
-  std::vector<string> lines = str_util::Split(contents, '\n');
-  contents.clear();
-
-  array->clear();
-  std::vector<float> values;
-  for (int l = 0; l < lines.size(); ++l) {
-    values.clear();
-    CHECK(str_util::SplitAndParseAsFloats(lines[l], ',', &values));
-    array->push_back(values);
-  }
-}
-
-bool WriteDoubleVectorToFile(const string& file_name,
-                             const std::vector<double>& data) {
-  std::unique_ptr<WritableFile> file;
-  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
-    LOG(ERROR) << "Failed to open file " << file_name;
-    return false;
-  }
-  for (int i = 0; i < data.size(); ++i) {
-    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
-                                  sizeof(data[i])))
-             .ok()) {
-      LOG(ERROR) << "Failed to append to file " << file_name;
-      return false;
-    }
-  }
-  if (!file->Close().ok()) {
-    LOG(ERROR) << "Failed to close file " << file_name;
-    return false;
-  }
-  return true;
-}
-
-bool WriteFloatVectorToFile(const string& file_name,
-                            const std::vector<float>& data) {
-  std::unique_ptr<WritableFile> file;
-  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
-    LOG(ERROR) << "Failed to open file " << file_name;
-    return false;
-  }
-  for (int i = 0; i < data.size(); ++i) {
-    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
-                                  sizeof(data[i])))
-             .ok()) {
-      LOG(ERROR) << "Failed to append to file " << file_name;
-      return false;
-    }
-  }
-  if (!file->Close().ok()) {
-    LOG(ERROR) << "Failed to close file " << file_name;
-    return false;
-  }
-  return true;
-}
-
-bool WriteDoubleArrayToFile(const string& file_name, int size,
-                            const double* data) {
-  std::unique_ptr<WritableFile> file;
-  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
-    LOG(ERROR) << "Failed to open file " << file_name;
-    return false;
-  }
-  for (int i = 0; i < size; ++i) {
-    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
-                                  sizeof(data[i])))
-             .ok()) {
-      LOG(ERROR) << "Failed to append to file " << file_name;
-      return false;
-    }
-  }
-  if (!file->Close().ok()) {
-    LOG(ERROR) << "Failed to close file " << file_name;
-    return false;
-  }
-  return true;
-}
-
-bool WriteFloatArrayToFile(const string& file_name, int size,
-                           const float* data) {
-  std::unique_ptr<WritableFile> file;
-  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
-    LOG(ERROR) << "Failed to open file " << file_name;
-    return false;
-  }
-  for (int i = 0; i < size; ++i) {
-    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
-                                  sizeof(data[i])))
-             .ok()) {
-      LOG(ERROR) << "Failed to append to file " << file_name;
-      return false;
-    }
-  }
-  if (!file->Close().ok()) {
-    LOG(ERROR) << "Failed to close file " << file_name;
-    return false;
-  }
-  return true;
-}
-
-bool WriteComplexVectorToRawFloatFile(
-    const string& file_name,
-    const std::vector<std::vector<std::complex<double> > >& data) {
-  std::unique_ptr<WritableFile> file;
-  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
-    LOG(ERROR) << "Failed to open file " << file_name;
-    return false;
-  }
-  for (int i = 0; i < data.size(); ++i) {
-    for (int j = 0; j < data[i].size(); ++j) {
-      const float real_part(real(data[i][j]));
-      if (!file->Append(StringPiece(reinterpret_cast<const char*>(&real_part),
-                                    sizeof(real_part)))
-               .ok()) {
-        LOG(ERROR) << "Failed to append to file " << file_name;
-        return false;
-      }
-
-      const float imag_part(imag(data[i][j]));
-      if (!file->Append(StringPiece(reinterpret_cast<const char*>(&imag_part),
-                                    sizeof(imag_part)))
-               .ok()) {
-        LOG(ERROR) << "Failed to append to file " << file_name;
-        return false;
-      }
-    }
-  }
-  if (!file->Close().ok()) {
-    LOG(ERROR) << "Failed to close file " << file_name;
-    return false;
-  }
-  return true;
-}
-
-void SineWave(int sample_rate, float frequency, float duration_seconds,
-              std::vector<double>* data) {
-  data->clear();
-  for (int i = 0; i < static_cast<int>(sample_rate * duration_seconds); ++i) {
-    data->push_back(
-        sin(2.0 * M_PI * i * frequency / static_cast<double>(sample_rate)));
-  }
-}
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test_utils.h b/tensorflow/core/kernels/spectrogram_test_utils.h
deleted file mode 100644
index 59a903549e..0000000000
--- a/tensorflow/core/kernels/spectrogram_test_utils.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
-#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
-
-#include <complex>
-#include <string>
-#include <vector>
-
-#include "tensorflow/core/framework/types.h"
-
-namespace tensorflow {
-
-// Reads a wav format file into a vector of floating-point values with range
-// -1.0 to 1.0.
-bool ReadWaveFileToVector(const string& file_name, std::vector<double>* data);
-
-// Reads a binary file containing 32-bit floating point values in the
-// form [real_1, imag_1, real_2, imag_2, ...] into a rectangular array
-// of complex values where row_length is the length of each inner vector.
-bool ReadRawFloatFileToComplexVector(
-    const string& file_name, int row_length,
-    std::vector<std::vector<std::complex<double> > >* data);
-
-// Reads a CSV file of numbers in the format 1.1+2.2i,1.1,2.2i,3.3j into data.
-void ReadCSVFileToComplexVectorOrDie(
-    const string& file_name,
-    std::vector<std::vector<std::complex<double> > >* data);
-
-// Reads a 2D array of floats from an ASCII text file, where each line is a row
-// of the array, and elements are separated by commas.
-void ReadCSVFileToArrayOrDie(const string& filename,
-                             std::vector<std::vector<float> >* array);
-
-// Write a binary file containing 64-bit floating-point values for
-// reading by, for example, MATLAB.
-bool WriteDoubleVectorToFile(const string& file_name,
-                             const std::vector<double>& data);
-
-// Write a binary file containing 32-bit floating-point values for
-// reading by, for example, MATLAB.
-bool WriteFloatVectorToFile(const string& file_name,
-                            const std::vector<float>& data);
-
-// Write a binary file containing 64-bit floating-point values for
-// reading by, for example, MATLAB.
-bool WriteDoubleArrayToFile(const string& file_name, int size,
-                            const double* data);
-
-// Write a binary file containing 32-bit floating-point values for
-// reading by, for example, MATLAB.
-bool WriteFloatArrayToFile(const string& file_name, int size,
-                           const float* data);
-
-// Write a binary file in the format read by
-// ReadRawDoubleFileToComplexVector above.
-bool WriteComplexVectorToRawFloatFile(
-    const string& file_name,
-    const std::vector<std::vector<std::complex<double> > >& data);
-
-// Generate a sine wave with the provided parameters, and populate
-// data with the samples.
-void SineWave(int sample_rate, float frequency, float duration_seconds,
-              std::vector<double>* data);
-
-}  // namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
diff --git a/tensorflow/core/lib/core/bits.h b/tensorflow/core/lib/core/bits.h
index 1110ef5c2a..30ad0c2bea 100644
--- a/tensorflow/core/lib/core/bits.h
+++ b/tensorflow/core/lib/core/bits.h
@@ -16,7 +16,6 @@ limitations under the License.
 #ifndef TENSORFLOW_LIB_CORE_BITS_H_
 #define TENSORFLOW_LIB_CORE_BITS_H_
 
-#include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -92,18 +91,6 @@ inline int Log2Ceiling64(uint64 n) {
     return floor + 1;
 }
 
-inline uint32 NextPowerOfTwo(uint32 value) {
-  int exponent = Log2Ceiling(value);
-  DCHECK_LT(exponent, std::numeric_limits<uint32>::digits);
-  return 1 << exponent;
-}
-
-inline uint64 NextPowerOfTwo64(uint64 value) {
-  int exponent = Log2Ceiling(value);
-  DCHECK_LT(exponent, std::numeric_limits<uint64>::digits);
-  return 1LL << exponent;
-}
-
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_LIB_CORE_BITS_H_
diff --git a/tensorflow/core/ops/audio_ops.cc b/tensorflow/core/ops/audio_ops.cc
index 2f55e45e37..d6dedc3820 100644
--- a/tensorflow/core/ops/audio_ops.cc
+++ b/tensorflow/core/ops/audio_ops.cc
@@ -16,7 +16,6 @@ limitations under the License.
 #include "tensorflow/core/framework/common_shape_fns.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/shape_inference.h"
-#include "tensorflow/core/lib/core/bits.h"
 
 namespace tensorflow {
 
@@ -67,39 +66,6 @@ Status EncodeWavShapeFn(InferenceContext* c) {
   return Status::OK();
 }
 
-Status SpectrogramShapeFn(InferenceContext* c) {
-  ShapeHandle input;
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 2, &input));
-  int32 window_size;
-  TF_RETURN_IF_ERROR(c->GetAttr("window_size", &window_size));
-  int32 stride;
-  TF_RETURN_IF_ERROR(c->GetAttr("stride", &stride));
-
-  DimensionHandle input_channels = c->Dim(input, 0);
-  DimensionHandle input_length = c->Dim(input, 1);
-
-  DimensionHandle output_length;
-  if (!c->ValueKnown(input_length)) {
-    output_length = c->UnknownDim();
-  } else {
-    const int64 input_length_value = c->Value(input_length);
-    const int64 length_minus_window = (input_length_value - window_size);
-    int64 output_length_value;
-    if (length_minus_window < 0) {
-      output_length_value = 0;
-    } else {
-      output_length_value = 1 + (length_minus_window / stride);
-    }
-    output_length = c->MakeDim(output_length_value);
-  }
-
-  DimensionHandle output_channels =
-      c->MakeDim(1 + NextPowerOfTwo(window_size) / 2);
-  c->set_output(0,
-                c->MakeShape({input_channels, output_length, output_channels}));
-  return Status::OK();
-}
-
 }  // namespace
 
 REGISTER_OP("DecodeWav")
@@ -155,49 +121,4 @@ sample_rate: Scalar containing the sample frequency.
 contents: 0-D. WAV-encoded file contents.
 )doc");
 
-REGISTER_OP("AudioSpectrogram")
-    .Input("input: float")
-    .Attr("window_size: int")
-    .Attr("stride: int")
-    .Attr("magnitude_squared: bool = false")
-    .Output("spectrogram: float")
-    .SetShapeFn(SpectrogramShapeFn)
-    .Doc(R"doc(
-Produces a visualization of audio data over time.
-
-Spectrograms are a standard way of representing audio information as a series of
-slices of frequency information, one slice for each window of time. By joining
-these together into a sequence, they form a distinctive fingerprint of the sound
-over time.
-
-This op expects to receive audio data as an input, stored as floats in the range
--1 to 1, together with a window width in samples, and a stride specifying how
-far to move the window between slices. From this it generates a three
-dimensional output. The lowest dimension has an amplitude value for each
-frequency during that time slice. The next dimension is time, with successive
-frequency slices. The final dimension is for the channels in the input, so a
-stereo audio input would have two here for example.
-
-This means the layout when converted and saved as an image is rotated 90 degrees
-clockwise from a typical spectrogram. Time is descending down the Y axis, and
-the frequency decreases from left to right.
-
-Each value in the result represents the square root of the sum of the real and
-imaginary parts of an FFT on the current window of samples. In this way, the
-lowest dimension represents the power of each frequency in the current window,
-and adjacent windows are concatenated in the next dimension.
-
-To get a more intuitive and visual look at what this operation does, you can run
-tensorflow/examples/wav_to_spectrogram to read in an audio file and save out the
-resulting spectrogram as a PNG image.
-
-input: Float representation of audio data.
-window_size: How wide the input window is in samples. For the highest efficiency
-  this should be a power of two, but other values are accepted.
-stride: How widely apart the center of adjacent sample windows should be.
-magnitude_squared: Whether to return the squared magnitude or just the
-  magnitude. Using squared magnitude can avoid extra calculations.
-spectrogram: 3D representation of the audio frequencies as an image.
-)doc");
-
 }  // namespace tensorflow
diff --git a/tensorflow/core/platform/default/build_config/BUILD b/tensorflow/core/platform/default/build_config/BUILD
index 62af852173..0857010f7c 100644
--- a/tensorflow/core/platform/default/build_config/BUILD
+++ b/tensorflow/core/platform/default/build_config/BUILD
@@ -92,7 +92,6 @@ cc_library(
         "//tensorflow/core:protos_cc",
         "@com_googlesource_code_re2//:re2",
         "@farmhash_archive//:farmhash",
-        "@fft2d//:fft2d",
         "@highwayhash//:sip_hash",
         "@png_archive//:png",
     ],
diff --git a/tensorflow/core/util/command_line_flags.cc b/tensorflow/core/util/command_line_flags.cc
index 8373eb1f9e..03eb076f30 100644
--- a/tensorflow/core/util/command_line_flags.cc
+++ b/tensorflow/core/util/command_line_flags.cc
@@ -93,22 +93,6 @@ bool ParseBoolFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag,
   return false;
 }
 
-bool ParseFloatFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag,
-                    float* dst, bool* value_parsing_ok) {
-  *value_parsing_ok = true;
-  if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) {
-    char extra;
-    if (sscanf(arg.data(), "%f%c", dst, &extra) != 1) {
-      LOG(ERROR) << "Couldn't interpret value " << arg << " for flag " << flag
-                 << ".";
-      *value_parsing_ok = false;
-    }
-    return true;
-  }
-
-  return false;
-}
-
 }  // namespace
 
 Flag::Flag(const char* name, tensorflow::int32* dst, const string& usage_text)
@@ -132,12 +116,6 @@ Flag::Flag(const char* name, string* dst, const string& usage_text)
       string_value_(dst),
       usage_text_(usage_text) {}
 
-Flag::Flag(const char* name, float* dst, const string& usage_text)
-    : name_(name),
-      type_(TYPE_FLOAT),
-      float_value_(dst),
-      usage_text_(usage_text) {}
-
 bool Flag::Parse(string arg, bool* value_parsing_ok) const {
   bool result = false;
   if (type_ == TYPE_INT) {
@@ -148,8 +126,6 @@ bool Flag::Parse(string arg, bool* value_parsing_ok) const {
     result = ParseBoolFlag(arg, name_, bool_value_, value_parsing_ok);
   } else if (type_ == TYPE_STRING) {
     result = ParseStringFlag(arg, name_, string_value_, value_parsing_ok);
-  } else if (type_ == TYPE_FLOAT) {
-    result = ParseFloatFlag(arg, name_, float_value_, value_parsing_ok);
   }
   return result;
 }
@@ -219,10 +195,6 @@ bool Flag::Parse(string arg, bool* value_parsing_ok) const {
       type_name = "string";
       flag_string = strings::Printf("--%s=\"%s\"", flag.name_.c_str(),
                                     flag.string_value_->c_str());
-    } else if (flag.type_ == Flag::TYPE_FLOAT) {
-      type_name = "float";
-      flag_string =
-          strings::Printf("--%s=%f", flag.name_.c_str(), *flag.float_value_);
     }
     strings::Appendf(&usage_text, "\t%-33s\t%s\t%s\n", flag_string.c_str(),
                      type_name, flag.usage_text_.c_str());
diff --git a/tensorflow/core/util/command_line_flags.h b/tensorflow/core/util/command_line_flags.h
index f349df16fd..2c77d7874f 100644
--- a/tensorflow/core/util/command_line_flags.h
+++ b/tensorflow/core/util/command_line_flags.h
@@ -65,7 +65,6 @@ class Flag {
   Flag(const char* name, int64* dst1, const string& usage_text);
   Flag(const char* name, bool* dst, const string& usage_text);
   Flag(const char* name, string* dst, const string& usage_text);
-  Flag(const char* name, float* dst, const string& usage_text);
 
  private:
   friend class Flags;
@@ -73,12 +72,11 @@ class Flag {
   bool Parse(string arg, bool* value_parsing_ok) const;
 
   string name_;
-  enum { TYPE_INT, TYPE_INT64, TYPE_BOOL, TYPE_STRING, TYPE_FLOAT } type_;
+  enum { TYPE_INT, TYPE_INT64, TYPE_BOOL, TYPE_STRING } type_;
   int* int_value_;
   int64* int64_value_;
   bool* bool_value_;
   string* string_value_;
-  float* float_value_;
   string usage_text_;
 };
 
diff --git a/tensorflow/core/util/command_line_flags_test.cc b/tensorflow/core/util/command_line_flags_test.cc
index 62025463af..b002e35899 100644
--- a/tensorflow/core/util/command_line_flags_test.cc
+++ b/tensorflow/core/util/command_line_flags_test.cc
@@ -32,35 +32,29 @@ std::vector<char *> CharPointerVectorFromStrings(
   }
   return result;
 }
-}  // namespace
+}
 
 TEST(CommandLineFlagsTest, BasicUsage) {
   int some_int = 10;
   int64 some_int64 = 21474836470;  // max int32 is 2147483647
   bool some_switch = false;
   string some_name = "something";
-  float some_float = -23.23f;
-  int argc = 6;
-  std::vector<string> argv_strings = {"program_name",
-                                      "--some_int=20",
-                                      "--some_int64=214748364700",
-                                      "--some_switch",
-                                      "--some_name=somethingelse",
-                                      "--some_float=42.0"};
+  int argc = 5;
+  std::vector<string> argv_strings = {
+      "program_name", "--some_int=20", "--some_int64=214748364700",
+      "--some_switch", "--some_name=somethingelse"};
   std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings);
   bool parsed_ok =
       Flags::Parse(&argc, argv_array.data(),
                    {Flag("some_int", &some_int, "some int"),
                     Flag("some_int64", &some_int64, "some int64"),
                     Flag("some_switch", &some_switch, "some switch"),
-                    Flag("some_name", &some_name, "some name"),
-                    Flag("some_float", &some_float, "some float")});
+                    Flag("some_name", &some_name, "some name")});
   EXPECT_EQ(true, parsed_ok);
   EXPECT_EQ(20, some_int);
   EXPECT_EQ(214748364700, some_int64);
   EXPECT_EQ(true, some_switch);
   EXPECT_EQ("somethingelse", some_name);
-  EXPECT_NEAR(42.0f, some_float, 1e-5f);
   EXPECT_EQ(argc, 1);
 }
 
@@ -91,21 +85,6 @@ TEST(CommandLineFlagsTest, BadBoolValue) {
   EXPECT_EQ(argc, 1);
 }
 
-TEST(CommandLineFlagsTest, BadFloatValue) {
-  float some_float = -23.23f;
-  int argc = 2;
-  std::vector<string> argv_strings = {"program_name",
-                                      "--some_float=notanumber"};
-  std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings);
-  bool parsed_ok =
-      Flags::Parse(&argc, argv_array.data(),
-                   {Flag("some_float", &some_float, "some float")});
-
-  EXPECT_EQ(false, parsed_ok);
-  EXPECT_NEAR(-23.23f, some_float, 1e-5f);
-  EXPECT_EQ(argc, 1);
-}
-
 // Return whether str==pat, but allowing any whitespace in pat
 // to match zero or more whitespace characters in str.
 static bool MatchWithAnyWhitespace(const string &str, const string &pat) {
@@ -132,8 +111,6 @@ TEST(CommandLineFlagsTest, UsageString) {
   int64 some_int64 = 21474836470;  // max int32 is 2147483647
   bool some_switch = false;
   string some_name = "something";
-  // Don't test float in this case, because precision is hard to predict and
-  // match against, and we don't want a flakey test.
   const string tool_name = "some_tool_name";
   string usage = Flags::Usage(tool_name + "<flags>",
                               {Flag("some_int", &some_int, "some int"),
diff --git a/tensorflow/examples/wav_to_spectrogram/BUILD b/tensorflow/examples/wav_to_spectrogram/BUILD
deleted file mode 100644
index 1e72324fb0..0000000000
--- a/tensorflow/examples/wav_to_spectrogram/BUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Description:
-#   TensorFlow C++ inference example for labeling images.
-
-package(
-    default_visibility = ["//tensorflow:internal"],
-    features = [
-        "-layering_check",
-        "-parse_headers",
-    ],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-cc_library(
-    name = "wav_to_spectrogram_lib",
-    srcs = [
-        "wav_to_spectrogram.cc",
-    ],
-    hdrs = [
-        "wav_to_spectrogram.h",
-    ],
-    deps = [
-        "//tensorflow/cc:cc_ops",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:tensorflow",
-    ],
-)
-
-cc_binary(
-    name = "wav_to_spectrogram",
-    srcs = [
-        "main.cc",
-    ],
-    deps = [
-        ":wav_to_spectrogram_lib",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:tensorflow",
-    ],
-)
-
-cc_test(
-    name = "wav_to_spectrogram_test",
-    size = "medium",
-    srcs = ["wav_to_spectrogram_test.cc"],
-    deps = [
-        ":wav_to_spectrogram_lib",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
-        "//tensorflow/core:test",
-        "//tensorflow/core:test_main",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-            "bin/**",
-            "gen/**",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/examples/wav_to_spectrogram/README.md b/tensorflow/examples/wav_to_spectrogram/README.md
deleted file mode 100644
index 7f7eb43700..0000000000
--- a/tensorflow/examples/wav_to_spectrogram/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# TensorFlow Spectrogram Example
-
-This example shows how you can load audio from a .wav file, convert it to a
-spectrogram, and then save it out as a PNG image. A spectrogram is a
-visualization of the frequencies in sound over time, and can be useful as a
-feature for neural network recognition on noise or speech.
-
-## Building
-
-To build it, run this command:
-
-```bash
-bazel build tensorflow/examples/wav_to_spectrogram/...
-```
-
-That should build a binary executable that you can then run like this:
-
-```bash
-bazel-bin/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram
-```
-
-This uses a default test audio file that's part of the TensorFlow source code,
-and writes out the image to the current directory as spectrogram.png.
-
-## Options
-
-To load your own audio, you need to supply a .wav file in LIN16 format, and use
-the `--input_audio` flag to pass in the path.
-
-To control how the spectrogram is created, you can specify the `--window_size`
-and `--stride` arguments, which control how wide the window used to estimate
-frequencies is, and how widely adjacent windows are spaced.
-
-The `--output_image` flag sets the path to save the image file to. This is
-always written out in PNG format, even if you specify a different file
-extension.
-
-If your result seems too dark, try using the `--brightness` flag to make the
-output image easier to see.
-
-Here's an example of how to use all of them together:
-
-```bash
-bazel-bin/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram \
---input_wav=/tmp/my_audio.wav \
---window=1024 \
---stride=512 \
---output_image=/tmp/my_spectrogram.png
-```
diff --git a/tensorflow/examples/wav_to_spectrogram/main.cc b/tensorflow/examples/wav_to_spectrogram/main.cc
deleted file mode 100644
index 539e6c4fe4..0000000000
--- a/tensorflow/examples/wav_to_spectrogram/main.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
-
-#include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/core/platform/init_main.h"
-#include "tensorflow/core/util/command_line_flags.h"
-
-int main(int argc, char* argv[]) {
-  // These are the command-line flags the program can understand.
-  // They define where the graph and input data is located, and what kind of
-  // input the model expects. If you train your own model, or use something
-  // other than inception_v3, then you'll need to update these.
-  tensorflow::string input_wav =
-      "tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav";
-  tensorflow::int32 window_size = 256;
-  tensorflow::int32 stride = 128;
-  float brightness = 64.0f;
-  tensorflow::string output_image = "spectrogram.png";
-  std::vector<tensorflow::Flag> flag_list = {
-      tensorflow::Flag("input_wav", &input_wav, "audio file to load"),
-      tensorflow::Flag("window_size", &window_size,
-                       "frequency sample window width"),
-      tensorflow::Flag("stride", &stride,
-                       "how far apart to place frequency windows"),
-      tensorflow::Flag("brightness", &brightness,
-                       "controls how bright the output image is"),
-      tensorflow::Flag("output_image", &output_image,
-                       "where to save the spectrogram image to"),
-  };
-  tensorflow::string usage = tensorflow::Flags::Usage(argv[0], flag_list);
-  const bool parse_result = tensorflow::Flags::Parse(&argc, argv, flag_list);
-  if (!parse_result) {
-    LOG(ERROR) << usage;
-    return -1;
-  }
-
-  // We need to call this to set up global state for TensorFlow.
-  tensorflow::port::InitMain(argv[0], &argc, &argv);
-  if (argc > 1) {
-    LOG(ERROR) << "Unknown argument " << argv[1] << "\n" << usage;
-    return -1;
-  }
-
-  tensorflow::Status wav_status = WavToSpectrogram(
-      input_wav, window_size, stride, brightness, output_image);
-  if (!wav_status.ok()) {
-    LOG(ERROR) << "WavToSpectrogram failed with " << wav_status;
-    return -1;
-  }
-
-  return 0;
-}
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
deleted file mode 100644
index c69a359637..0000000000
--- a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
-
-#include <vector>
-
-#include "tensorflow/cc/ops/audio_ops.h"
-#include "tensorflow/cc/ops/const_op.h"
-#include "tensorflow/cc/ops/image_ops.h"
-#include "tensorflow/cc/ops/standard_ops.h"
-#include "tensorflow/core/framework/graph.pb.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/graph/default_device.h"
-#include "tensorflow/core/graph/graph_def_builder.h"
-#include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/core/lib/core/stringpiece.h"
-#include "tensorflow/core/lib/core/threadpool.h"
-#include "tensorflow/core/lib/io/path.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-#include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/types.h"
-#include "tensorflow/core/public/session.h"
-#include "tensorflow/core/util/command_line_flags.h"
-
-using tensorflow::DT_FLOAT;
-using tensorflow::DT_UINT8;
-using tensorflow::Output;
-using tensorflow::TensorShape;
-
-// Runs a TensorFlow graph to convert an audio file into a visualization.
-tensorflow::Status WavToSpectrogram(const tensorflow::string& input_wav,
-                                    tensorflow::int32 window_size,
-                                    tensorflow::int32 stride, float brightness,
-                                    const tensorflow::string& output_image) {
-  auto root = tensorflow::Scope::NewRootScope();
-  using namespace tensorflow::ops;  // NOLINT(build/namespaces)
-  // The following block creates a TensorFlow graph that:
-  //  - Reads and decodes the audio file into a tensor of float samples.
-  //  - Creates a float spectrogram from those samples.
-  //  - Scales, clamps, and converts that spectrogram to 0 to 255 uint8's.
-  //  - Reshapes the tensor so that it's [height, width, 1] for imaging.
-  //  - Encodes it as a PNG stream and saves it out to a file.
-  Output file_reader = ReadFile(root.WithOpName("input_wav"), input_wav);
-  DecodeWav wav_decoder =
-      DecodeWav(root.WithOpName("wav_decoder"), file_reader);
-  Output spectrogram = AudioSpectrogram(root.WithOpName("spectrogram"),
-                                        wav_decoder.audio, window_size, stride);
-  Output brightness_placeholder =
-      Placeholder(root.WithOpName("brightness_placeholder"), DT_FLOAT,
-                  Placeholder::Attrs().Shape(TensorShape({})));
-  Output mul = Mul(root.WithOpName("mul"), spectrogram, brightness_placeholder);
-  Output min_const = Const(root.WithOpName("min_const"), 255.0f);
-  Output min = Minimum(root.WithOpName("min"), mul, min_const);
-  Output cast = Cast(root.WithOpName("cast"), min, DT_UINT8);
-  Output expand_dims_const = Const(root.WithOpName("expand_dims_const"), -1);
-  Output expand_dims =
-      ExpandDims(root.WithOpName("expand_dims"), cast, expand_dims_const);
-  Output squeeze = Squeeze(root.WithOpName("squeeze"), expand_dims,
-                           Squeeze::Attrs().SqueezeDims({0}));
-  Output png_encoder = EncodePng(root.WithOpName("png_encoder"), squeeze);
-  WriteFile file_writer =
-      WriteFile(root.WithOpName("output_image"), output_image, png_encoder);
-  tensorflow::GraphDef graph;
-  TF_RETURN_IF_ERROR(root.ToGraphDef(&graph));
-
-  // Build a session object from this graph definition. The power of TensorFlow
-  // is that you can reuse complex computations like this, so usually we'd run a
-  // lot of different inputs through it. In this example, we're just doing a
-  // one-off run, so we'll create it and then use it immediately.
-  std::unique_ptr<tensorflow::Session> session(
-      tensorflow::NewSession(tensorflow::SessionOptions()));
-  TF_RETURN_IF_ERROR(session->Create(graph));
-
-  // We're passing in the brightness as an input, so create a tensor to hold the
-  // value.
-  tensorflow::Tensor brightness_tensor(DT_FLOAT, TensorShape({}));
-  brightness_tensor.scalar<float>()() = brightness;
-
-  // Run the session to analyze the audio and write out the file.
-  TF_RETURN_IF_ERROR(
-      session->Run({{"brightness_placeholder", brightness_tensor}}, {},
-                   {"output_image"}, nullptr));
-  return tensorflow::Status::OK();
-}
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
deleted file mode 100644
index fa8cb0abe9..0000000000
--- a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
-#define THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
-
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/platform/types.h"
-
-// Runs a TensorFlow graph to convert an audio file into a visualization. Takes
-// in the path to the audio file, the window size and stride parameters
-// controlling the spectrogram creation, the brightness scaling to use, and a
-// path to save the output PNG file to.
-tensorflow::Status WavToSpectrogram(const tensorflow::string& input_wav,
-                                    tensorflow::int32 window_size,
-                                    tensorflow::int32 stride, float brightness,
-                                    const tensorflow::string& output_image);
-
-#endif  // THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc
deleted file mode 100644
index e599711445..0000000000
--- a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
-
-#include "tensorflow/core/lib/core/status_test_util.h"
-#include "tensorflow/core/lib/io/path.h"
-#include "tensorflow/core/lib/wav/wav_io.h"
-#include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/test.h"
-
-TEST(WavToSpectrogramTest, WavToSpectrogramTest) {
-  const tensorflow::string input_wav =
-      tensorflow::io::JoinPath(tensorflow::testing::TmpDir(), "input_wav.wav");
-  const tensorflow::string output_image = tensorflow::io::JoinPath(
-      tensorflow::testing::TmpDir(), "output_image.png");
-  float audio[8] = {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f};
-  tensorflow::string wav_string;
-  TF_ASSERT_OK(
-      tensorflow::wav::EncodeAudioAsS16LEWav(audio, 44100, 1, 8, &wav_string));
-  TF_ASSERT_OK(tensorflow::WriteStringToFile(tensorflow::Env::Default(),
-                                             input_wav, wav_string));
-  TF_ASSERT_OK(WavToSpectrogram(input_wav, 4, 4, 64.0f, output_image));
-  TF_EXPECT_OK(tensorflow::Env::Default()->FileExists(output_image));
-}
diff --git a/tensorflow/tools/lib_package/BUILD b/tensorflow/tools/lib_package/BUILD
index a8e6ecdbf0..3e049724f6 100644
--- a/tensorflow/tools/lib_package/BUILD
+++ b/tensorflow/tools/lib_package/BUILD
@@ -79,13 +79,11 @@ genrule(
     srcs = [
         "//third_party/hadoop:LICENSE.txt",
         "//third_party/eigen3:LICENSE",
-        "//third_party/fft2d:LICENSE",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
-        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@highwayhash//:LICENSE",
@@ -108,13 +106,11 @@ genrule(
     srcs = [
         "//third_party/hadoop:LICENSE.txt",
         "//third_party/eigen3:LICENSE",
-        "//third_party/fft2d:LICENSE",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
-        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@highwayhash//:LICENSE",
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index c17a7f7fb1..2a96e80ccb 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -91,14 +91,12 @@ filegroup(
     name = "licenses",
     data = [
         "//third_party/eigen3:LICENSE",
-        "//third_party/fft2d:LICENSE",
         "//third_party/hadoop:LICENSE.txt",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
-        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@grpc//:LICENSE",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index dd42c69dd2..7bcdb1613d 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -500,16 +500,6 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name="zlib",
       actual="@zlib_archive//:zlib",)
 
-  native.new_http_archive(
-      name = "fft2d",
-      urls = [
-          "http://bazel-mirror.storage.googleapis.com/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
-          "http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
-      ],
-      sha256 = "52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296",
-      build_file = str(Label("//third_party/fft2d:fft2d.BUILD")),
-  )
-
   temp_workaround_http_archive(
       name="snappy",
       urls=[
-- 
GitLab


From 8dee064f1b06ca3cf225daa16c9a2a75ddd323f1 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 5 Apr 2017 18:46:38 -0800
Subject: [PATCH 0164/1563] Call Py_CLEAR on dead fields during
 TF_RESOURCE-to-ndarray conversion Change: 152338333

---
 tensorflow/python/client/tf_session_helper.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/client/tf_session_helper.cc b/tensorflow/python/client/tf_session_helper.cc
index 99c154bd99..930eb5f283 100644
--- a/tensorflow/python/client/tf_session_helper.cc
+++ b/tensorflow/python/client/tf_session_helper.cc
@@ -375,6 +375,8 @@ Status GetPyArrayDescrForTensor(const TF_Tensor* tensor,
     PyObject* fields = PyList_New(1);
     PyList_SetItem(fields, 0, field);
     int convert_result = PyArray_DescrConverter(fields, descr);
+    Py_CLEAR(field);
+    Py_CLEAR(fields);
     if (convert_result != 1) {
       return errors::Internal("Failed to create numpy array description for ",
                               "TF_RESOURCE-type tensor");
-- 
GitLab


From 25d63db4fa2c83ddc46348dc24453b2ddf27d523 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Wed, 5 Apr 2017 21:30:39 -0700
Subject: [PATCH 0165/1563] Allow SavedModelBuilder to overwrite existing
 folders (#8902)

* Add overwrite directory feature to SavedModelBuilder

* Make indenting consistent to the rest of the code

* Change Assertion Error's message to reflect new parameter

* Make comment defining overwrite clearer
---
 tensorflow/python/saved_model/builder_impl.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/saved_model/builder_impl.py b/tensorflow/python/saved_model/builder_impl.py
index d075a04ca2..4bf0f62e74 100644
--- a/tensorflow/python/saved_model/builder_impl.py
+++ b/tensorflow/python/saved_model/builder_impl.py
@@ -76,16 +76,25 @@ class SavedModelBuilder(object):
   ```
   """
 
-  def __init__(self, export_dir):
+  def __init__(self, export_dir, overwrite=False):
+    """Construct a SavedModelBuilder.
+
+    Args:
+      export_dir: The directory to export to
+      overwrite: If `True` deletes export_dir if it already exists
+    """
     self._saved_model = saved_model_pb2.SavedModel()
     self._saved_model.saved_model_schema_version = (
         constants.SAVED_MODEL_SCHEMA_VERSION)
 
     self._export_dir = export_dir
     if file_io.file_exists(export_dir):
-      raise AssertionError(
-          "Export directory already exists. Please specify a different export "
-          "directory: %s" % export_dir)
+      if overwrite:
+        file_io.delete_recursively(export_dir)
+      else:
+        raise AssertionError(
+            "Export directory already exists. Please specify a different export "
+            "directory: %s or change overwrite flag to `True`" % export_dir)
 
     file_io.recursive_create_dir(self._export_dir)
 
-- 
GitLab


From 4b2d3e7a3f7a103a381ebc840d536fe1e094908c Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Wed, 5 Apr 2017 20:34:39 -0800
Subject: [PATCH 0166/1563] [TF contrib seq2seq] Initial, incomplete
 implementation of beam search decoder.

**DOES NOT WORK, pushed for collaboration only**
Change: 152343927
---
 .../seq2seq/python/ops/beam_search_decoder.py | 236 ++++++++++++++++++
 1 file changed, 236 insertions(+)
 create mode 100644 tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py

diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
new file mode 100644
index 0000000000..2ad0fd5310
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -0,0 +1,236 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""A decoder that performs beam search.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import collections
+
+from tensorflow.contrib.rnn import core_rnn_cell
+from tensorflow.contrib.seq2seq.python.ops import decoder
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.framework import tensor_util
+from tensorflow.python.layers import base as layers_base
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import embedding_ops
+from tensorflow.python.ops import tensor_array_ops
+from tensorflow.python.util import nest
+
+
+__all__ = [
+    "BeamSearchDecoderOutput",
+    "BeamSearchDecoderState",
+    "BeamSearchDecoder",
+]
+
+
+class BeamSearchDecoderOutput(
+    collections.namedtuple("BeamSearchDecoderOutput", ("rnn_output",))):
+  pass
+
+
+class BeamSearchDecoderState(
+    collections.namedtuple("BeamSearchDecoderState",
+                           ("cell_state", "log_prob", "beam_ids"))):
+  pass
+
+
+class BeamSearchDecoder(decoder.Decoder):
+  """BeamSearch sampling decoder."""
+
+  def __init__(self, cell, embedding, start_tokens, end_token,
+               initial_state, beam_width, output_layer=None):
+    """Initialize BeamSearchDecoder.
+
+    Args:
+      cell: An `RNNCell` instance.
+      embedding: A callable that takes a vector tensor of `ids` (argmax ids),
+        or the `params` argument for `embedding_lookup`.
+      start_tokens: `int32` vector shaped `[batch_size]`, the start tokens.
+      end_token: `int32` scalar, the token that marks end of decoding.
+      initial_state: A (possibly nested tuple of...) tensors and TensorArrays.
+      beam_width:  Python integer, the number of beams
+      output_layer: (Optional) An instance of `tf.layers.Layer`, i.e.,
+        `tf.layers.Dense`.  Optional layer to apply to the RNN output prior
+        to storing the result or sampling.
+
+    Raises:
+      TypeError: if `cell` is not an instance of `RNNCell`,
+        or `output_layer` is not an instance of `tf.layers.Layer`.
+      ValueError: If `start_tokens` is not a vector or
+        `end_token` is not a scalar.
+    """
+    if not isinstance(cell, core_rnn_cell.RNNCell):
+      raise TypeError("cell must be an RNNCell, received: %s" % type(cell))
+    if (output_layer is not None
+        and not isinstance(output_layer, layers_base._Layer)):  # pylint: disable=protected-access
+      raise TypeError(
+          "output_layer must be a Layer, received: %s" % type(output_layer))
+    self._cell = cell
+    self._initial_cell_state = initial_state
+    self._output_layer = output_layer
+
+    if callable(embedding):
+      self._embedding_fn = embedding
+    else:
+      self._embedding_fn = (
+          lambda ids: embedding_ops.embedding_lookup(embedding, ids))
+
+    self._start_tokens = ops.convert_to_tensor(
+        start_tokens, dtype=dtypes.int32, name="start_tokens")
+    self._end_token = ops.convert_to_tensor(
+        end_token, dtype=dtypes.int32, name="end_token")
+    if self._start_tokens.get_shape().ndims != 1:
+      raise ValueError("start_tokens must be a vector")
+    self._batch_size = array_ops.size(start_tokens)
+    self._beam_width = beam_width
+    if self._end_token.get_shape().ndims != 0:
+      raise ValueError("end_token must be a scalar")
+    self._start_inputs = self._embedding_fn(self._start_tokens)
+
+  @property
+  def batch_size(self):
+    return self._batch_size
+
+  def _rnn_output_size(self):
+    size = self._cell.output_size
+    if self._output_layer is None:
+      return size
+    else:
+      # To use layer's compute_output_shape, we need to convert the
+      # RNNCell's output_size entries into shapes with an unknown
+      # batch size.  We then pass this through the layer's
+      # compute_output_shape and read off all but the first (batch)
+      # dimensions to get the output size of the rnn with the layer
+      # applied to the top.
+      output_shape_with_unknown_batch = nest.map_structure(
+          lambda s: tensor_shape.TensorShape([None]).concatenate(s),
+          size)
+      layer_output_shape = self._output_layer._compute_output_shape(  # pylint: disable=protected-access
+          output_shape_with_unknown_batch)
+      return nest.map_structure(lambda s: s[1:], layer_output_shape)
+
+  @property
+  def output_size(self):
+    # Return the cell output and the id
+    prepend_beam_width = (
+        lambda s: tensor_shape.TensorShape([self._beam_width]).concatenate(s))
+    return BeamSearchDecoderOutput(
+        rnn_output=nest.map_structure(
+            prepend_beam_width, self._rnn_output_size()))
+
+  @property
+  def output_dtype(self):
+    # Assume the dtype of the cell is the output_size structure
+    # containing the input_state's first component's dtype.
+    # Return that structure and int32 (the id)
+    dtype = nest.flatten(self._initial_cell_state)[0].dtype
+    return BeamSearchDecoderOutput(
+        rnn_output=nest.map_structure(lambda _: dtype, self._rnn_output_size()))
+
+  def initialize(self, name=None):
+    """Initialize the decoder.
+
+    Args:
+      name: Name scope for any created operations.
+
+    Returns:
+      `(finished, first_inputs, initial_state)`.
+    """
+    finished, first_inputs = self._finished, self._first_inputs
+
+    initial_state = BeamSearchDecoderState(
+        cell_state=self._initial_cell_state,
+        log_probs=array_ops.zeros(
+            [self.batch_size, self.beam_width],
+            dtype=nest.flatten(self._initial_cell_state)[0].dtype),
+        beam_ids=tensor_array_ops.TensorArray(
+            size=0, dynamic_size=True, dtype=dtypes.int32,
+            clear_after_read=False))
+
+    return (finished, first_inputs, initial_state)
+
+  def _merge_batch_beams(self, t):
+    t_static_shape = t.shape
+    t_shape = array_ops.shape(t)
+    static_batch_size = tensor_util.constant_value(self._batch_size)
+    batch_size_beam_width = (
+        None if static_batch_size is None
+        else static_batch_size * self._beam_width)
+    reshaped_t = array_ops.reshape(
+        t, array_ops.concat(
+            ([self._batch_size * self._beam_width], t_shape[2:]), 0))
+    reshaped_t.set_shape(
+        (tensor_shape.TensorShape([batch_size_beam_width])
+         .concatenate(t_static_shape[2:])))
+    return reshaped_t
+
+  def _split_batch_beams(self, t):
+    t_static_shape = t.shape
+    t_shape = array_ops.shape(t)
+    reshaped_t = array_ops.reshape(
+        t, array_ops.concat(
+            ([self._batch_size, self._beam_width], t_shape[1:]), 0))
+    static_batch_size = tensor_util.constant_value(self._batch_size)
+    reshaped_t.set_shape(
+        (tensor_shape.TensorShape([static_batch_size, self._beam_width])
+         .concatenate(t_static_shape[1:])))
+    return reshaped_t
+
+  def step(self, time, inputs, state, name=None):
+    """Perform a decoding step.
+
+    Args:
+      time: scalar `int32` tensor.
+      inputs: A (structure of) input tensors.
+      state: A (structure of) state tensors and TensorArrays.
+      name: Name scope for any created operations.
+
+    Returns:
+      `(outputs, next_state, next_inputs, finished)`.
+    """
+    with ops.name_scope(name, "BeamSearchDecoderStep", (time, inputs, state)):
+      cell_state = state.cell_state
+      inputs = nest.map_structure(self._merge_batch_beams, inputs)
+      cell_state = nest.map_structure(self._merge_batch_beams, cell_state)
+      cell_outputs, next_cell_state = self._cell(inputs, cell_state)
+      cell_outputs = nest.map_structure(self._split_batch_beams, cell_outputs)
+      next_cell_state = nest.map_structure(self._split_batch_beams,
+                                           next_cell_state)
+
+      if self._output_layer is not None:
+        cell_outputs = self._output_layer(cell_outputs)
+
+      # TODO(cinjon): Calculate next_log_probs, next_beam_ids,
+      #   finished, next_inputs, final_cell_state via beam search
+      #   via self._embedding
+      # ....
+      next_beam_ids, next_log_probs, final_cell_state, next_inputs, finished = (
+          None, None, None, None, None)
+
+      beam_ids = state.beam_ids.write(time, next_beam_ids)
+
+      outputs = BeamSearchDecoderOutput(cell_outputs)
+      next_state = BeamSearchDecoderState(
+          log_probs=next_log_probs,
+          beam_ids=beam_ids,
+          cell_state=final_cell_state)
+
+    return (outputs, next_state, next_inputs, finished)
-- 
GitLab


From ffd4e6223d9cf388594256be80621d071661b307 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 5 Apr 2017 21:04:00 -0800
Subject: [PATCH 0167/1563] [XLA] Change HloPassPipeline to disallow Add* calls
 after Run. Change: 152345578

---
 tensorflow/compiler/xla/service/hlo_pass_pipeline.cc | 2 ++
 tensorflow/compiler/xla/service/hlo_pass_pipeline.h  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc b/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
index 6e3c983071..eb7fe467b3 100644
--- a/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
+++ b/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
@@ -40,6 +40,8 @@ void DumpModule(const Compiler::HloDumper& dumper_, const HloModule& module,
 }  // namespace
 
 StatusOr<bool> HloPassPipeline::Run(HloModule* module) {
+  run_called_ = true;
+
   legacy_flags::HloPassPipelineFlags* flags =
       legacy_flags::GetHloPassPipelineFlags();
   std::vector<string> tmp =
diff --git a/tensorflow/compiler/xla/service/hlo_pass_pipeline.h b/tensorflow/compiler/xla/service/hlo_pass_pipeline.h
index a8c2d51873..682c4b952d 100644
--- a/tensorflow/compiler/xla/service/hlo_pass_pipeline.h
+++ b/tensorflow/compiler/xla/service/hlo_pass_pipeline.h
@@ -47,6 +47,7 @@ class HloPassPipeline : public HloPassInterface {
   // Returns a reference to the added pass.
   template <typename T, typename... Args>
   T& AddPass(Args&&... args) {
+    CHECK(!run_called_) << "AddPass cannot be called after Run";
     auto pass = new T(std::forward<Args>(args)...);
     passes_.push_back(std::unique_ptr<T>(pass));
     return *pass;
@@ -57,6 +58,7 @@ class HloPassPipeline : public HloPassInterface {
   // (it is required to always return "false" from its Run() method).
   template <typename T, typename... Args>
   T& AddInvariantChecker(Args&&... args) {
+    CHECK(!run_called_) << "AddInvariantChecker cannot be called after Run";
     auto pass = new T(std::forward<Args>(args)...);
     invariant_checkers_.push_back(std::unique_ptr<T>(pass));
     return *pass;
@@ -70,6 +72,7 @@ class HloPassPipeline : public HloPassInterface {
   Compiler::HloDumper dumper_;
   std::vector<std::unique_ptr<HloPassInterface>> passes_;
   std::vector<std::unique_ptr<HloPassInterface>> invariant_checkers_;
+  bool run_called_ = false;
 
   TF_DISALLOW_COPY_AND_ASSIGN(HloPassPipeline);
 };
-- 
GitLab


From abd97e08acfcfabf3a6f11a1cf5dafe797127db6 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 5 Apr 2017 22:10:57 -0800
Subject: [PATCH 0168/1563] Automated rollback of change 152332812 Change:
 152349057

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 26 ---------------
 tensorflow/core/ops/ops.pbtxt                 | 33 -------------------
 2 files changed, 59 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 9a29487b82..c538a278a3 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1666,32 +1666,6 @@ op {
     }
   }
 }
-op {
-  name: "AudioSpectrogram"
-  input_arg {
-    name: "input"
-    type: DT_FLOAT
-  }
-  output_arg {
-    name: "spectrogram"
-    type: DT_FLOAT
-  }
-  attr {
-    name: "window_size"
-    type: "int"
-  }
-  attr {
-    name: "stride"
-    type: "int"
-  }
-  attr {
-    name: "magnitude_squared"
-    type: "bool"
-    default_value {
-      b: false
-    }
-  }
-}
 op {
   name: "AudioSummary"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 31341e714b..172bdf02e2 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -1903,39 +1903,6 @@ op {
   }
   summary: "Computes atan of x element-wise."
 }
-op {
-  name: "AudioSpectrogram"
-  input_arg {
-    name: "input"
-    description: "Float representation of audio data."
-    type: DT_FLOAT
-  }
-  output_arg {
-    name: "spectrogram"
-    description: "3D representation of the audio frequencies as an image."
-    type: DT_FLOAT
-  }
-  attr {
-    name: "window_size"
-    type: "int"
-    description: "How wide the input window is in samples. For the highest efficiency\nthis should be a power of two, but other values are accepted."
-  }
-  attr {
-    name: "stride"
-    type: "int"
-    description: "How widely apart the center of adjacent sample windows should be."
-  }
-  attr {
-    name: "magnitude_squared"
-    type: "bool"
-    default_value {
-      b: false
-    }
-    description: "Whether to return the squared magnitude or just the\nmagnitude. Using squared magnitude can avoid extra calculations."
-  }
-  summary: "Produces a visualization of audio data over time."
-  description: "Spectrograms are a standard way of representing audio information as a series of\nslices of frequency information, one slice for each window of time. By joining\nthese together into a sequence, they form a distinctive fingerprint of the sound\nover time.\n\nThis op expects to receive audio data as an input, stored as floats in the range\n-1 to 1, together with a window width in samples, and a stride specifying how\nfar to move the window between slices. From this it generates a three\ndimensional output. The lowest dimension has an amplitude value for each\nfrequency during that time slice. The next dimension is time, with successive\nfrequency slices. The final dimension is for the channels in the input, so a\nstereo audio input would have two here for example.\n\nThis means the layout when converted and saved as an image is rotated 90 degrees\nclockwise from a typical spectrogram. Time is descending down the Y axis, and\nthe frequency decreases from left to right.\n\nEach value in the result represents the square root of the sum of the real and\nimaginary parts of an FFT on the current window of samples. In this way, the\nlowest dimension represents the power of each frequency in the current window,\nand adjacent windows are concatenated in the next dimension.\n\nTo get a more intuitive and visual look at what this operation does, you can run\ntensorflow/examples/wav_to_spectrogram to read in an audio file and save out the\nresulting spectrogram as a PNG image."
-}
 op {
   name: "AudioSummary"
   input_arg {
-- 
GitLab


From 36de539d177192aa5a5a2cd69212a722dcf28f17 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 5 Apr 2017 23:42:31 -0800
Subject: [PATCH 0169/1563] Remove all 64/32 bit compiler warnings from
 core/ops. Change: 152353506

---
 tensorflow/core/framework/shape_inference.cc | 22 ++++++++++++++------
 tensorflow/core/framework/shape_inference.h  | 14 ++++++-------
 tensorflow/core/ops/array_ops.cc             | 12 +++++------
 tensorflow/core/ops/data_flow_ops.cc         |  2 +-
 tensorflow/core/ops/set_ops.cc               |  4 ++--
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/tensorflow/core/framework/shape_inference.cc b/tensorflow/core/framework/shape_inference.cc
index 449d8f55f5..a990dc2f04 100644
--- a/tensorflow/core/framework/shape_inference.cc
+++ b/tensorflow/core/framework/shape_inference.cc
@@ -239,8 +239,11 @@ string InferenceContext::DebugString() const {
                          ProtoDebugString(node_def_));
 }
 
-Status InferenceContext::WithRank(ShapeHandle shape, int32 rank,
+Status InferenceContext::WithRank(ShapeHandle shape, int64 rank,
                                   ShapeHandle* out) {
+  if (rank > kint32max) {
+    return errors::InvalidArgument("Rank cannot exceed kint32max");
+  }
   const int32 existing = Rank(shape);
   if (existing == rank) {
     *out = shape;
@@ -261,8 +264,11 @@ Status InferenceContext::WithRank(ShapeHandle shape, int32 rank,
                                  existing);
 }
 
-Status InferenceContext::WithRankAtLeast(ShapeHandle shape, int32 rank,
+Status InferenceContext::WithRankAtLeast(ShapeHandle shape, int64 rank,
                                          ShapeHandle* out) {
+  if (rank > kint32max) {
+    return errors::InvalidArgument("Rank cannot exceed kint32max");
+  }
   const int32 existing = Rank(shape);
   if (existing >= rank) {
     *out = shape;
@@ -276,8 +282,11 @@ Status InferenceContext::WithRankAtLeast(ShapeHandle shape, int32 rank,
                                  " but is rank ", existing);
 }
 
-Status InferenceContext::WithRankAtMost(ShapeHandle shape, int32 rank,
+Status InferenceContext::WithRankAtMost(ShapeHandle shape, int64 rank,
                                         ShapeHandle* out) {
+  if (rank > kint32max) {
+    return errors::InvalidArgument("Rank cannot exceed kint32max");
+  }
   const int32 existing = Rank(shape);
   if (existing == kUnknownRank) {
     return ReturnUnknownShape(out);
@@ -470,12 +479,12 @@ Status InferenceContext::Concatenate(ShapeHandle s1, ShapeHandle s2,
   return ReturnCreatedShape(dims, out);
 }
 
-Status InferenceContext::ReplaceDim(ShapeHandle s, int dim_index_in,
+Status InferenceContext::ReplaceDim(ShapeHandle s, int64 dim_index_in,
                                     DimensionHandle new_dim, ShapeHandle* out) {
   if (!RankKnown(s)) {
     return ReturnUnknownShape(out);
   }
-  int dim_index = dim_index_in;
+  int64 dim_index = dim_index_in;
   if (dim_index < 0) {
     dim_index = s->dims_.size() + dim_index;
   }
@@ -510,7 +519,8 @@ ShapeHandle InferenceContext::UnknownShape() {
   return shape_manager_.UnknownShape();
 }
 
-ShapeHandle InferenceContext::UnknownShapeOfRank(int32 rank) {
+ShapeHandle InferenceContext::UnknownShapeOfRank(int64 rank) {
+  CHECK_LE(rank, kint32max) << "rank must be less than kint32max";
   std::vector<DimensionHandle> dims(rank);
   for (int32 i = 0; i < rank; ++i) {
     dims[i] = UnknownDim();
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index b7f1725c5f..5e116884c6 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -194,7 +194,7 @@ class InferenceContext {
     return s;
   }
 
-  ShapeHandle input(int idx) const { return inputs_[idx]; }
+  ShapeHandle input(int64 idx) const { return inputs_[idx]; }
   Status input(StringPiece input_name, std::vector<ShapeHandle>* output) const;
   int num_inputs() const { return inputs_.size(); }
 
@@ -237,7 +237,7 @@ class InferenceContext {
 
   // idx can be negative for an offset from end of dimensions.
   // idx must be in the range [-1 * s.rank, s.rank).
-  DimensionHandle Dim(ShapeHandle s, int32 idx) {
+  DimensionHandle Dim(ShapeHandle s, int64 idx) {
     if (s->rank_ == kUnknownRank) {
       return UnknownDim();
     }
@@ -277,11 +277,11 @@ class InferenceContext {
   // the shape with asserted rank in <*out>. Otherwise return an error.
   //
   // Note that <*out> may be set to <shape>.
-  Status WithRank(ShapeHandle shape, int32 rank,
+  Status WithRank(ShapeHandle shape, int64 rank,
                   ShapeHandle* out) TF_MUST_USE_RESULT;
-  Status WithRankAtLeast(ShapeHandle shape, int32 rank,
+  Status WithRankAtLeast(ShapeHandle shape, int64 rank,
                          ShapeHandle* out) TF_MUST_USE_RESULT;
-  Status WithRankAtMost(ShapeHandle shape, int32 rank,
+  Status WithRankAtMost(ShapeHandle shape, int64 rank,
                         ShapeHandle* out) TF_MUST_USE_RESULT;
 
   // If <dim> has value <value>, or its value is unknown, returns OK and returns
@@ -332,7 +332,7 @@ class InferenceContext {
 
   // Returns in <out> the shape from replacing <s.dim[dim_index]> with
   // <new_dim>.
-  Status ReplaceDim(ShapeHandle s, int dim_index, DimensionHandle new_dim,
+  Status ReplaceDim(ShapeHandle s, int64 dim_index, DimensionHandle new_dim,
                     ShapeHandle* out) TF_MUST_USE_RESULT;
 
   // Returns a new shape with the given dims. The returned value is owned by
@@ -344,7 +344,7 @@ class InferenceContext {
   ShapeHandle UnknownShape();
 
   // Returns a shape with specified rank but unknown dims.
-  ShapeHandle UnknownShapeOfRank(int32 rank);
+  ShapeHandle UnknownShapeOfRank(int64 rank);
 
   // Returns a new shape of zero dimensions.
   ShapeHandle Scalar();
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e81490c498..b43a917dca 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -41,10 +41,10 @@ Status GetAxisForPackAndUnpack(InferenceContext* c, int32 rank_after_pack,
 }
 
 template <typename T>
-std::vector<int64> AsInt64(const Tensor* tensor, int num_elements) {
+std::vector<int64> AsInt64(const Tensor* tensor, int64 num_elements) {
   std::vector<int64> ret(num_elements);
   auto data = tensor->vec<T>();
-  for (int i = 0; i < num_elements; ++i) {
+  for (int64 i = 0; i < num_elements; ++i) {
     ret[i] = data(i);
   }
   return ret;
@@ -52,11 +52,11 @@ std::vector<int64> AsInt64(const Tensor* tensor, int num_elements) {
 
 template <typename T>
 Status PadKnown(InferenceContext* c, ShapeHandle input,
-                const Tensor* paddings_t, int32 num_dims) {
+                const Tensor* paddings_t, int64 num_dims) {
   // paddings_t is known.
   std::vector<DimensionHandle> dims(num_dims);
   auto paddings_data = paddings_t->matrix<T>();
-  for (int i = 0; i < num_dims; ++i) {
+  for (int64 i = 0; i < num_dims; ++i) {
     const T pad0 = paddings_data(i, 0);
     const T pad1 = paddings_data(i, 1);
     if (pad0 < 0 || pad1 < 0) {
@@ -2644,10 +2644,10 @@ output: The padded tensor.
 namespace {
 template <typename T>
 Status MirrorPadKnown(InferenceContext* c, ShapeHandle input,
-                      const Tensor* paddings_t, int32 input_rank) {
+                      const Tensor* paddings_t, int64 input_rank) {
   auto paddings_data = paddings_t->matrix<T>();
   std::vector<DimensionHandle> dims(input_rank);
-  for (int i = 0; i < input_rank; ++i) {
+  for (int64 i = 0; i < input_rank; ++i) {
     const int64 pad0 = static_cast<int64>(paddings_data(i, 0));
     const int64 pad1 = static_cast<int64>(paddings_data(i, 1));
     if (pad0 < 0 || pad1 < 0) {
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index 10b5df91f1..7e7d499f88 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -120,7 +120,7 @@ REGISTER_OP("DynamicStitch")
       TF_RETURN_IF_ERROR(c->GetAttr("N", &num_partitions));
 
       ShapeHandle extra_shape = c->UnknownShape();
-      for (int i = 0; i < num_partitions; ++i) {
+      for (int64 i = 0; i < num_partitions; ++i) {
         ShapeHandle indices_shape = c->input(i);
         ShapeHandle data_shape = c->input(i + num_partitions);
         if (!c->RankKnown(indices_shape)) {
diff --git a/tensorflow/core/ops/set_ops.cc b/tensorflow/core/ops/set_ops.cc
index fad7007207..85d1335dcf 100644
--- a/tensorflow/core/ops/set_ops.cc
+++ b/tensorflow/core/ops/set_ops.cc
@@ -235,7 +235,7 @@ REGISTER_OP("SparseToSparseSetOperation")
       DimensionHandle input1_rank_dim = c->Dim(input1_shape_shape, 0);
       DimensionHandle output_rank_dim;
       if (c->ValueKnown(input0_rank_dim)) {
-        const int32 input0_rank = c->Value(input0_rank_dim);
+        const int64 input0_rank = c->Value(input0_rank_dim);
         if (input0_rank < 2) {
           return errors::InvalidArgument("Input 0, expected rank >= 2, got ",
                                          input0_rank, ".");
@@ -244,7 +244,7 @@ REGISTER_OP("SparseToSparseSetOperation")
             c->WithValue(input1_rank_dim, input0_rank, &input1_rank_dim));
         output_rank_dim = input0_rank_dim;
       } else if (c->ValueKnown(input1_rank_dim)) {
-        const int32 input1_rank = c->Value(input1_rank_dim);
+        const int64 input1_rank = c->Value(input1_rank_dim);
         if (input1_rank < 2) {
           return errors::InvalidArgument("Input 1, expected rank >= 2, got ",
                                          input1_rank, ".");
-- 
GitLab


From b0989a0280971034bd838fa176ae3f92b210e8dc Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Thu, 6 Apr 2017 03:01:27 -0800
Subject: [PATCH 0170/1563] libtensorflow.so: Don't export private symbols.

With this change, libtensorflow.so will only export
functions defined in c_api.h. This also results in
a decreased binary size of libtensorflow.so.

On Linux the decrease was from roughly 150MB to 67MB.
On OS X it was from roughly 101MB to 82MB.

Also fixes #8923
Change: 152366053
---
 tensorflow/BUILD                  | 15 +++++++++++++++
 tensorflow/c/BUILD                |  8 ++++++++
 tensorflow/c/exported_symbols.lds |  1 +
 tensorflow/c/version_script.lds   |  9 +++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 tensorflow/c/exported_symbols.lds
 create mode 100644 tensorflow/c/version_script.lds

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 37dc8e265f..0cc460c1d3 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -346,9 +346,24 @@ filegroup(
 # -------------------------------------------
 cc_binary(
     name = "libtensorflow.so",
+    linkopts = select({
+        "//tensorflow:darwin": [
+            "-Wl,-exported_symbols_list",  # This line must be directly followed by the exported_symbols.lds file
+            "//tensorflow/c:exported_symbols.lds",
+        ],
+        "//tensorflow:windows": [],
+        "//conditions:default": [
+            "-z defs",
+            "-s",
+            "-Wl,--version-script",  #  This line must be directly followed by the version_script.lds file
+            "//tensorflow/c:version_script.lds",
+        ],
+    }),
     linkshared = 1,
     deps = [
         "//tensorflow/c:c_api",
+        "//tensorflow/c:exported_symbols.lds",
+        "//tensorflow/c:version_script.lds",
         "//tensorflow/core:tensorflow",
     ],
 )
diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index 0019dfeeb1..6e39deee63 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -45,6 +45,14 @@ tf_cuda_library(
     }),
 )
 
+exports_files(
+    [
+        "version_script.lds",
+        "exported_symbols.lds",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 tf_cuda_library(
     name = "tf_status_helper",
     srcs = ["tf_status_helper.cc"],
diff --git a/tensorflow/c/exported_symbols.lds b/tensorflow/c/exported_symbols.lds
new file mode 100644
index 0000000000..a14bdaa48b
--- /dev/null
+++ b/tensorflow/c/exported_symbols.lds
@@ -0,0 +1 @@
+_TF_*
diff --git a/tensorflow/c/version_script.lds b/tensorflow/c/version_script.lds
new file mode 100644
index 0000000000..455bd7362b
--- /dev/null
+++ b/tensorflow/c/version_script.lds
@@ -0,0 +1,9 @@
+VERS_1.0 {
+  # Export symbols in c_api.h.
+  global:
+    TF_*;
+
+  # Hide everything else.
+  local:
+    *;
+};
-- 
GitLab


From a291c8ab3232af1c2458699101d8dbb6ae4661c6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 07:14:08 -0800
Subject: [PATCH 0171/1563] Add Elu ops in XLA. Change: 152383201

---
 tensorflow/compiler/tests/binary_ops_test.py  |  6 ++
 tensorflow/compiler/tests/randomized_tests.cc | 17 +++++
 tensorflow/compiler/tests/unary_ops_test.py   |  5 ++
 tensorflow/compiler/tf2xla/kernels/BUILD      |  1 +
 tensorflow/compiler/tf2xla/kernels/elu_op.cc  | 65 +++++++++++++++++++
 5 files changed, 94 insertions(+)
 create mode 100644 tensorflow/compiler/tf2xla/kernels/elu_op.cc

diff --git a/tensorflow/compiler/tests/binary_ops_test.py b/tensorflow/compiler/tests/binary_ops_test.py
index 9efdaee7ab..7221a0a3c7 100644
--- a/tensorflow/compiler/tests/binary_ops_test.py
+++ b/tensorflow/compiler/tests/binary_ops_test.py
@@ -107,6 +107,12 @@ class BinaryOpsTest(XLATestCase):
           np.array([5, 6, 7, 8], dtype=dtype),
           expected=np.array([-75, -48, -21, 0], dtype=dtype))
 
+      self._testBinary(
+          gen_nn_ops._elu_grad,
+          np.array([1, 2, 3, 4, 5, 6], dtype=dtype),
+          np.array([-.6, -.4, -.2, 0, .2, .4], dtype=dtype),
+          expected=np.array([0.4, 1.2, 2.4, 4, 5, 6], dtype=dtype))
+
       self._testBinary(
           gen_nn_ops._relu_grad,
           np.array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], dtype=dtype),
diff --git a/tensorflow/compiler/tests/randomized_tests.cc b/tensorflow/compiler/tests/randomized_tests.cc
index a0cd905f17..18c4e3dcb1 100644
--- a/tensorflow/compiler/tests/randomized_tests.cc
+++ b/tensorflow/compiler/tests/randomized_tests.cc
@@ -1214,6 +1214,23 @@ TEST_F(OpTest, DynamicStitch) {
   });
 }
 
+TEST_F(OpTest, Elu) {
+  Repeatedly([this]() {
+    ExpectTfAndXlaOutputsAreClose(
+        OpTestBuilder("Elu").Input(RandomTensor(DT_FLOAT)).Attr("T", DT_FLOAT));
+  });
+}
+
+TEST_F(OpTest, EluGrad) {
+  Repeatedly([this]() {
+    auto dims = RandomDims();
+    ExpectTfAndXlaOutputsAreClose(OpTestBuilder("EluGrad")
+                                      .Input(RandomTensor(DT_FLOAT, dims))
+                                      .Input(RandomTensor(DT_FLOAT, dims))
+                                      .Attr("T", DT_FLOAT));
+  });
+}
+
 TEST_F(OpTest, Equal) {
   Repeatedly([this]() {
     DataType type = Choose<DataType>({DT_INT32, DT_FLOAT});
diff --git a/tensorflow/compiler/tests/unary_ops_test.py b/tensorflow/compiler/tests/unary_ops_test.py
index 1e85d3a2c8..3f324d1071 100644
--- a/tensorflow/compiler/tests/unary_ops_test.py
+++ b/tensorflow/compiler/tests/unary_ops_test.py
@@ -209,6 +209,11 @@ class UnaryOpsTest(XLATestCase):
                [-3.4401896, -2.4401896, -1.4401897, -0.44018969]],
               dtype=dtype))
 
+      self._assertOpOutputMatchesExpected(
+          nn_ops.elu,
+          np.array([[-1, 0, 1]], dtype=dtype),
+          expected=np.array([[-0.63212056, 0, 1]], dtype=dtype))
+
       self._assertOpOutputMatchesExpected(
           nn_ops.relu,
           np.array([[-1, 1]], dtype=dtype),
diff --git a/tensorflow/compiler/tf2xla/kernels/BUILD b/tensorflow/compiler/tf2xla/kernels/BUILD
index 2ee80a41e8..e4f73b529f 100644
--- a/tensorflow/compiler/tf2xla/kernels/BUILD
+++ b/tensorflow/compiler/tf2xla/kernels/BUILD
@@ -26,6 +26,7 @@ tf_kernel_library(
         "depthwise_conv_ops.cc",
         "diag_op.cc",
         "dynamic_stitch_op.cc",
+        "elu_op.cc",
         "fill_op.cc",
         "function_ops.cc",
         "identity_op.cc",
diff --git a/tensorflow/compiler/tf2xla/kernels/elu_op.cc b/tensorflow/compiler/tf2xla/kernels/elu_op.cc
new file mode 100644
index 0000000000..62a5e1bd42
--- /dev/null
+++ b/tensorflow/compiler/tf2xla/kernels/elu_op.cc
@@ -0,0 +1,65 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Native XLA implementations of XLA Elu Ops
+
+#include "tensorflow/compiler/tf2xla/kernels/cwise_ops.h"
+#include "tensorflow/compiler/tf2xla/xla_helpers.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+#include "tensorflow/compiler/xla/client/computation_builder.h"
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/core/framework/kernel_def_builder.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/no_op.h"
+
+namespace tensorflow {
+namespace {
+
+class EluOp : public XlaOpKernel {
+ public:
+  explicit EluOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+  // Computes the max of the scalar input x and 0.
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::ComputationBuilder* b = ctx->builder();
+    const auto zero = XlaHelpers::Zero(b, input_type(0));
+    const auto one = XlaHelpers::One(b, input_type(0));
+    const auto pred = b->Gt(ctx->Input(0), zero);
+    const auto expm1 = b->Sub(b->Exp(ctx->Input(0)), one);
+    ctx->SetOutput(0, b->Select(pred, ctx->Input(0), expm1));
+  }
+};
+
+class EluGradOp : public XlaOpKernel {
+ public:
+  explicit EluGradOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+  // Return the lhs (incoming gradient) if the rhs (input feature) > 0,
+  // otherwise return lhs * (1 + rhs).
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::ComputationBuilder* b = ctx->builder();
+    const auto zero = XlaHelpers::Zero(b, input_type(0));
+    const auto one = XlaHelpers::One(b, input_type(0));
+    const auto grad = ctx->Input(0);
+    const auto activation = ctx->Input(1);
+    const auto exp_grad = b->Mul(grad, b->Add(activation, one));
+    const auto pred = b->Gt(activation, zero);
+    ctx->SetOutput(0, b->Select(pred, grad, exp_grad));
+  }
+};
+
+REGISTER_XLA_OP(Name("Elu"), EluOp);
+REGISTER_XLA_OP(Name("EluGrad"), EluGradOp);
+
+}  // namespace
+}  // namespace tensorflow
-- 
GitLab


From d599e9615237326bfb94a37a186fb495b0901ad6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 07:19:31 -0800
Subject: [PATCH 0172/1563] Fixed test. ('broadcast_dims' has size 1) Change:
 152383633

---
 tensorflow/compiler/xla/service/algebraic_simplifier_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 27a1c0fec8..0969cff39a 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -868,7 +868,7 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_1_3x2x1_6x1x1x1) {
       computation->root_instruction()->dimensions();
   EXPECT_EQ(1, broadcast_dims.size());
   EXPECT_TRUE(broadcast_dims[0] == 1 || broadcast_dims[0] == 2 ||
-              broadcast_dims[3] == 3);
+              broadcast_dims[0] == 3);
 }
 
 TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_4_3x2x4x2_6x8) {
-- 
GitLab


From bc4101eb4d1d088faaadb68991e4c177bdf249bd Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 6 Apr 2017 13:21:48 -0400
Subject: [PATCH 0173/1563] In non-devel Docker images, positively confirm
 --allow-root (#9021)

to avoid an error that started to happen recently:
[C 10:09:34.858 NotebookApp] Running as root is not recommended. Use
--allow-root to bypass.

E.g., see
http://ci.tensorflow.org/view/Nightly/job/nightly-docker-cpu/TF_DOCKER_BUILD_IS_DEVEL=NO,TF_DOCKER_BUILD_PYTHON_VERSION=PYTHON2,label=gcs-access/361/console
---
 tensorflow/tools/docker/Dockerfile     | 2 +-
 tensorflow/tools/docker/Dockerfile.gpu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/docker/Dockerfile b/tensorflow/tools/docker/Dockerfile
index b61eb5db37..5b3f1f936a 100644
--- a/tensorflow/tools/docker/Dockerfile
+++ b/tensorflow/tools/docker/Dockerfile
@@ -66,4 +66,4 @@ EXPOSE 8888
 
 WORKDIR "/notebooks"
 
-CMD ["/run_jupyter.sh"]
+CMD ["/run_jupyter.sh", "--allow-root"]
diff --git a/tensorflow/tools/docker/Dockerfile.gpu b/tensorflow/tools/docker/Dockerfile.gpu
index b2b39501cd..88876421f5 100644
--- a/tensorflow/tools/docker/Dockerfile.gpu
+++ b/tensorflow/tools/docker/Dockerfile.gpu
@@ -69,4 +69,4 @@ EXPOSE 8888
 
 WORKDIR "/notebooks"
 
-CMD ["/run_jupyter.sh"]
+CMD ["/run_jupyter.sh", "--allow-root"]
-- 
GitLab


From 3bd5c880bf1f4834441c8a2f976fa81e738c9a28 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 09:32:47 -0800
Subject: [PATCH 0174/1563] Add more detailed error message for rank assertion
 in _sparse_inner_flatten. Change: 152397909

---
 tensorflow/contrib/layers/python/layers/layers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index bf2a372f04..cc70f5312c 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -1243,7 +1243,10 @@ def _sparse_inner_flatten(inputs, new_rank):
   """Helper function for `inner_flatten`."""
   inputs_rank = inputs.dense_shape.get_shape().as_list()[0]
   if inputs_rank < new_rank:
-    raise ValueError('inputs has rank less than new_rank.')
+    raise ValueError(
+        'Inputs has rank less than new_rank. {} must have rank at least'
+        ' {}. Received rank {}, shape {}'.format(inputs, new_rank, inputs_rank,
+                                                 inputs.get_shape()))
 
   outer_dimensions = inputs.dense_shape[:new_rank - 1]
   inner_dimensions = inputs.dense_shape[new_rank - 1:]
-- 
GitLab


From b3ce6f3df62452fb2f19478076e1648b5862c758 Mon Sep 17 00:00:00 2001
From: Zongheng Yang <zongheng@google.com>
Date: Thu, 6 Apr 2017 10:02:29 -0800
Subject: [PATCH 0175/1563] tensor_bundle: propagrates errors related to
 directory creation. Change: 152401909

---
 tensorflow/core/kernels/save_restore_v2_ops.cc |  6 ++++--
 .../core/util/tensor_bundle/tensor_bundle.cc   | 18 ++++++++++--------
 .../core/util/tensor_bundle/tensor_bundle.h    |  4 ++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/tensorflow/core/kernels/save_restore_v2_ops.cc b/tensorflow/core/kernels/save_restore_v2_ops.cc
index 2e09956578..c665bc5b03 100644
--- a/tensorflow/core/kernels/save_restore_v2_ops.cc
+++ b/tensorflow/core/kernels/save_restore_v2_ops.cc
@@ -47,8 +47,9 @@ void ValidateInputs(bool is_save_op, OpKernelContext* context,
       context, prefix.NumElements() == 1,
       errors::InvalidArgument("Input prefix should have a single element, got ",
                               prefix.NumElements(), " instead."));
-  OP_REQUIRES(context, TensorShapeUtils::IsVector(tensor_names.shape()) &&
-                           TensorShapeUtils::IsVector(shape_and_slices.shape()),
+  OP_REQUIRES(context,
+              TensorShapeUtils::IsVector(tensor_names.shape()) &&
+                  TensorShapeUtils::IsVector(shape_and_slices.shape()),
               errors::InvalidArgument(
                   "Input tensor_names and shape_and_slices "
                   "should be an 1-D tensors, got ",
@@ -105,6 +106,7 @@ class SaveV2 : public OpKernel {
     const auto& shape_and_slices_flat = shape_and_slices.flat<string>();
 
     BundleWriter writer(Env::Default(), prefix_string);
+    OP_REQUIRES_OK(context, writer.status());
     VLOG(1) << "BundleWriter, prefix_string: " << prefix_string;
 
     for (int i = 0; i < num_tensors; ++i) {
diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
index b8989b2c3e..80a910e689 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
@@ -249,8 +249,10 @@ BundleWriter::BundleWriter(Env* env, StringPiece prefix)
                                      random::New64())),
       out_(nullptr),
       size_(0) {
-  status_ =
-      env_->CreateDir(io::Dirname(prefix_).ToString());  // Ignores errors.
+  status_ = env_->CreateDir(io::Dirname(prefix_).ToString());
+  if (!status_.ok() && !errors::IsAlreadyExists(status_)) {
+    return;
+  }
   const string filename = DataFilename(prefix_, 0, 1);
   std::unique_ptr<WritableFile> wrapper;
   status_ = env_->NewWritableFile(tmp_data_path_, &wrapper);
@@ -264,9 +266,9 @@ BundleWriter::BundleWriter(Env* env, StringPiece prefix)
 BundleWriter::~BundleWriter() { CHECK(out_ == nullptr); }
 
 Status BundleWriter::Add(StringPiece key, const Tensor& val) {
+  if (!status_.ok()) return status_;
   CHECK_NE(key, kHeaderEntryKey);
   const string key_string = key.ToString();
-  if (!status_.ok()) return status_;
   if (entries_.find(key_string) != entries_.end()) {
     status_ = errors::InvalidArgument("Adding duplicate key: ", key);
     return status_;
@@ -301,14 +303,14 @@ Status BundleWriter::AddSlice(StringPiece full_tensor_key,
                               const TensorShape& full_tensor_shape,
                               const TensorSlice& slice_spec,
                               const Tensor& slice_tensor) {
+  if (!status_.ok()) return status_;
+  CHECK_NE(full_tensor_key, kHeaderEntryKey);
+
   // If just a singleton full slice, use the regular Add() to be more efficient.
   if (IsFullSlice(slice_spec, full_tensor_shape)) {
     return Add(full_tensor_key, slice_tensor);
   }
 
-  CHECK_NE(full_tensor_key, kHeaderEntryKey);
-  if (!status_.ok()) return status_;
-
   // Inserts/updates the full tensor's metadata entry.
   //
   // In the case of a sharded save, MergeBundles() is responsible for merging
@@ -516,7 +518,8 @@ Status MergeBundles(Env* env, gtl::ArraySlice<string> prefixes,
   // Merges all metadata tables.
   // TODO(zhifengc): KeyValue sorter if it becomes too big.
   MergeState merge;
-  env->CreateDir(io::Dirname(merged_prefix).ToString()).IgnoreError();
+  Status status = env->CreateDir(io::Dirname(merged_prefix).ToString());
+  if (!status.ok() && !errors::IsAlreadyExists(status)) return status;
   for (int i = 0; i < prefixes.size(); ++i) {
     TF_RETURN_IF_ERROR(MergeOneBundle(env, prefixes[i], &merge));
   }
@@ -534,7 +537,6 @@ Status MergeBundles(Env* env, gtl::ArraySlice<string> prefixes,
   std::unique_ptr<WritableFile> merged_metadata;
   TF_RETURN_IF_ERROR(
       env->NewWritableFile(MetaFilename(merged_prefix), &merged_metadata));
-  Status status;
   {
     table::TableBuilder builder(table::Options(), merged_metadata.get());
     // Header entry.
diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.h b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
index bca3910f59..676bfe4df6 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.h
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
@@ -100,6 +100,10 @@ extern const int kTensorBundleVersion;
 extern const char* const kHeaderEntryKey;
 
 // Builds a string-string table of tensor names to BundleEntryProto (metadata).
+//
+// On construction, attempts to create a directory given by the dirname of
+// "prefix", so "status()" must be checked before calling any member functions.
+//
 // All threads accessing the same BundleWriter must synchronize.
 class BundleWriter {
  public:
-- 
GitLab


From cf2d4ce2f861a1729cc7376107cbfd11b7bf8911 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Thu, 6 Apr 2017 10:23:44 -0800
Subject: [PATCH 0176/1563] matrix_adjoint added to
 contrib/linalg/linear_operator_util Change: 152404828

---
 .../kernel_tests/linear_operator_util_test.py | 23 +++++++++
 .../linalg/python/ops/linear_operator_util.py | 47 +++++++++++++++++++
 .../python/kernel_tests/linalg_ops_test.py    |  2 +-
 tensorflow/python/ops/array_ops.py            | 11 +++++
 4 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py
index a06af336e7..f047f4b978 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py
@@ -229,6 +229,29 @@ class MatmulWithBroadcastTest(test.TestCase):
       self.assertAllEqual(expected, result)
 
 
+class MatrixAdjointTest(test.TestCase):
+
+  def testNonBatchMatrix(self):
+    a = [[1, 2, 3j], [4, 5, -6j]]  # Shape (2, 3)
+    expected = [[1, 4], [2, 5], [-3j, 6j]]  # Shape (3, 2)
+    with self.test_session():
+      a_adj = linear_operator_util.matrix_adjoint(a)
+      self.assertEqual((3, 2), a_adj.get_shape())
+      self.assertAllClose(expected, a_adj.eval())
+
+  def testBatchMatrix(self):
+    matrix_0 = [[1j, 2, 3], [4, 5, 6]]
+    matrix_0_a = [[-1j, 4], [2, 5], [3, 6]]
+    matrix_1 = [[11, 22, 33], [44, 55, 66j]]
+    matrix_1_a = [[11, 44], [22, 55], [33, -66j]]
+    batch_matrix = [matrix_0, matrix_1]  # Shape (2, 2, 3)
+    expected_adj = [matrix_0_a, matrix_1_a]  # Shape (2, 3, 2)
+    with self.test_session():
+      matrix_adj = linear_operator_util.matrix_adjoint(batch_matrix)
+      self.assertEqual((2, 3, 2), matrix_adj.get_shape())
+      self.assertAllEqual(expected_adj, matrix_adj.eval())
+
+
 class DomainDimensionStubOperator(object):
 
   def __init__(self, domain_dimension):
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_util.py b/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
index a52a235677..9f8cb23169 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
@@ -289,6 +289,53 @@ def matmul_with_broadcast(a,
         b_is_sparse=b_is_sparse)
 
 
+def matrix_adjoint(a, name="matrix_adjoint"):
+  """Transposes last two dimensions of tensor `a`, and takes complex conjugate.
+
+  If `a` is real valued, the result is equivalent to `matrix_transpose`.
+
+  For example:
+
+  ```python
+  # Matrix with no batch dimension.
+  # 'x' is [[1 2 3j]
+  #         [4 5 -6j]]
+  tf.matrix_adjoint(x) ==> [[1 4]
+                            [2 5]
+                            [-3j 6j]]
+
+  # Matrix with two batch dimensions.
+  # x.shape is [1, 2, 3, 4]
+  # tf.matrix_adjoint(x) is shape [1, 2, 4, 3]
+  ```
+
+  Note that `tf.matmul` provides kwargs allowing for adjoint of arguments.  This
+  is done with minimal cost, and is preferable to using this function. E.g.
+
+  ```
+  # Good!  Adjoint is taken at minimal additional cost.
+  tf.matmul(matrix, b, adjoint_b=True)
+
+  # Inefficient!
+  tf.matmul(matrix, tf.matrix_adjoint(b))
+  ```
+
+  Args:
+    a: A `Tensor` with `rank >= 2`.
+    name: A name for the operation (optional).
+
+  Returns:
+    A batch matrix `Tensor` with same `dtype` as `a`.
+
+  Raises:
+    ValueError:  If `a` is determined statically to have `rank < 2`.
+  """
+  with ops.name_scope(name, values=[a]):
+    a = ops.convert_to_tensor(a, name="a")
+    a_transpose = array_ops.matrix_transpose(a)
+    return math_ops.conj(a_transpose)
+
+
 def shape_tensor(shape, name=None):
   """Convert Tensor using default type, unless empty list or tuple."""
   # Works just like random_ops._ShapeTensor.
diff --git a/tensorflow/python/kernel_tests/linalg_ops_test.py b/tensorflow/python/kernel_tests/linalg_ops_test.py
index ff299e6511..153d4ab662 100644
--- a/tensorflow/python/kernel_tests/linalg_ops_test.py
+++ b/tensorflow/python/kernel_tests/linalg_ops_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tensorflow.python.ops.special_math_ops."""
+"""Tests for tensorflow.python.ops.linalg_ops."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 60057b9ab1..5ebfe5b89f 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1292,6 +1292,17 @@ def matrix_transpose(a, name="matrix_transpose"):
   # tf.matrix_transpose(x) is shape [1, 2, 4, 3]
   ```
 
+  Note that `tf.matmul` provides kwargs allowing for transpose of arguments.
+  This is done with minimal cost, and is preferable to using this function. E.g.
+
+  ```
+  # Good!  Transpose is taken at minimal additional cost.
+  tf.matmul(matrix, b, transpose_b=True)
+
+  # Inefficient!
+  tf.matmul(matrix, tf.matrix_transpose(b))
+  ```
+
   Args:
     a: A `Tensor` with `rank >= 2`.
     name: A name for the operation (optional).
-- 
GitLab


From e671e3ddcbe86933f27cc481f276b27e3603af0a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 10:34:38 -0800
Subject: [PATCH 0177/1563] Add an is_active method to plugins

This method determines whether a plugin is active. A plugin may be inactive if say it lacks data. This new is_active method allows us to add a route to TensorBoard noting which plugins are active. The frontend could then avoid querying routes of inactive plugins.
Change: 152406232
---
 .../tensorboard/backend/application_test.py   |  3 ++
 .../event_processing/event_accumulator.py     |  8 ++++
 .../event_accumulator_test.py                 | 10 +++-
 .../event_processing/event_multiplexer.py     | 15 ++++++
 .../event_multiplexer_test.py                 | 47 +++++++++++++++----
 tensorflow/tensorboard/plugins/base_plugin.py | 12 +++++
 .../plugins/debugger/debugger_plugin.py       | 15 ++++++
 .../plugins/debugger/debugger_plugin_test.py  | 13 +++++
 .../plugins/projector/projector_plugin.py     | 10 ++++
 .../projector/projector_plugin_test.py        | 17 ++++++-
 .../tensorboard/plugins/text/text_plugin.py   | 10 ++++
 .../plugins/text/text_plugin_test.py          | 14 ++++++
 12 files changed, 160 insertions(+), 14 deletions(-)

diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 454ba63e75..5be843fb14 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -490,6 +490,9 @@ class TensorBoardApplcationConstructionTest(test.TestCase):
       def get_plugin_apps(self):
         pass
 
+      def is_active(self):
+        return True
+
     class MockPlugin(UnnamedPlugin):
       plugin_name = 'mock'
 
diff --git a/tensorflow/tensorboard/backend/event_processing/event_accumulator.py b/tensorflow/tensorboard/backend/event_processing/event_accumulator.py
index beba28da06..d5a91bbb6a 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_accumulator.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_accumulator.py
@@ -438,6 +438,14 @@ class EventAccumulator(object):
     """
     return self._health_pills.Items(node_name)
 
+  def GetOpsWithHealthPills(self):
+    """Determines which ops have at least 1 health pill event.
+
+    Returns:
+      A list of names of ops with at least 1 health pill event.
+    """
+    return self._health_pills.Keys()
+
   def Graph(self):
     """Return the graph definition, if there is one.
 
diff --git a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
index 38a8cd915f..3734e470b6 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
@@ -297,8 +297,6 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     acc = ea.EventAccumulator(gen)
     gen.AddHealthPill(13371337, 41, 'Add', 0, range(1, 13))
     gen.AddHealthPill(13381338, 42, 'Add', 1, range(42, 54))
-
-    acc = ea.EventAccumulator(gen)
     acc.Reload()
 
     # Retrieve the health pills for each node name.
@@ -321,6 +319,14 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
             value=range(42, 54)),
         gotten_events[1])
 
+  def testGetOpsWithHealthPills(self):
+    gen = _EventGenerator(self)
+    acc = ea.EventAccumulator(gen)
+    gen.AddHealthPill(13371337, 41, 'Add', 0, range(1, 13))
+    gen.AddHealthPill(13381338, 42, 'MatMul', 1, range(42, 54))
+    acc.Reload()
+    self.assertItemsEqual(['Add', 'MatMul'], acc.GetOpsWithHealthPills())
+
   def testHistograms(self):
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
diff --git a/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py b/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py
index bbf958820a..08e6dbb57d 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py
@@ -287,6 +287,21 @@ class EventMultiplexer(object):
     accumulator = self._GetAccumulator(run)
     return accumulator.HealthPills(node_name)
 
+  def GetOpsWithHealthPills(self, run):
+    """Determines which ops have at least 1 health pill event for a given run.
+
+    Args:
+      run: The name of the run.
+
+    Raises:
+      KeyError: If the run is not found, or the node name is not available for
+        the given run.
+
+    Returns:
+      The list of names of ops with health pill events.
+    """
+    return self._GetAccumulator(run).GetOpsWithHealthPills()
+
   def Graph(self, run):
     """Retrieve the graph associated with the provided run.
 
diff --git a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
index ed5cac4014..ded1856d7e 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
@@ -17,6 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import functools
 import os
 import os.path
 import shutil
@@ -45,10 +46,16 @@ def _CreateCleanDirectory(path):
 
 class _FakeAccumulator(object):
 
-  def __init__(self, path):
+  def __init__(self, path, health_pill_mapping=None):
+    """Constructs a fake accumulator with some fake events.
+
+    Args:
+      path: The path for the run that this accumulator is for.
+      health_pill_mapping: An optional mapping from Op to health pill strings.
+    """
     self._path = path
     self.reload_called = False
-    self._node_names_to_health_pills = {'Add': ['hp1', 'hp2']}
+    self._node_names_to_health_pills = health_pill_mapping or {}
 
   def Tags(self):
     return {event_accumulator.IMAGES: ['im1', 'im2'],
@@ -74,6 +81,9 @@ class _FakeAccumulator(object):
     health_pills = self._node_names_to_health_pills[node_name]
     return [self._path + '/' + health_pill for health_pill in health_pills]
 
+  def GetOpsWithHealthPills(self):
+    return self._node_names_to_health_pills.keys()
+
   def Histograms(self, tag_name):
     return self._TagHelper(tag_name, event_accumulator.HISTOGRAMS)
 
@@ -93,14 +103,13 @@ class _FakeAccumulator(object):
     self.reload_called = True
 
 
-# pylint: disable=unused-argument
-def _GetFakeAccumulator(
-    path,
-    size_guidance=None,
-    compression_bps=None,
-    purge_orphaned_data=None):
-  return _FakeAccumulator(path)
-# pylint: enable=unused-argument
+def _GetFakeAccumulator(path,
+                        size_guidance=None,
+                        compression_bps=None,
+                        purge_orphaned_data=None,
+                        health_pill_mapping=None):
+  del size_guidance, compression_bps, purge_orphaned_data  # Unused.
+  return _FakeAccumulator(path, health_pill_mapping=health_pill_mapping)
 
 
 class EventMultiplexerTest(test_util.TensorFlowTestCase):
@@ -141,9 +150,27 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertEqual(run1_expected, run1_actual)
 
   def testHealthPills(self):
+    self.stubs.Set(event_accumulator, 'EventAccumulator',
+                   functools.partial(
+                       _GetFakeAccumulator,
+                       health_pill_mapping={'Add': ['hp1', 'hp2']}))
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     self.assertEqual(['path1/hp1', 'path1/hp2'], x.HealthPills('run1', 'Add'))
 
+  def testGetOpsWithHealthPillsWhenHealthPillsAreNotAvailable(self):
+    # The event accumulator lacks health pills for the run.
+    x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
+    self.assertItemsEqual([], x.GetOpsWithHealthPills('run1'))
+
+  def testGetOpsWithHealthPillsWhenHealthPillsAreAvailable(self):
+    # The event accumulator has health pills for the run.
+    self.stubs.Set(event_accumulator, 'EventAccumulator',
+                   functools.partial(
+                       _GetFakeAccumulator,
+                       health_pill_mapping={'Add': ['hp1', 'hp2']}))
+    x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
+    self.assertItemsEqual(['Add'], x.GetOpsWithHealthPills('run1'))
+
   def testExceptions(self):
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     with self.assertRaises(KeyError):
diff --git a/tensorflow/tensorboard/plugins/base_plugin.py b/tensorflow/tensorboard/plugins/base_plugin.py
index 8b1560cf8a..259046dfb4 100644
--- a/tensorflow/tensorboard/plugins/base_plugin.py
+++ b/tensorflow/tensorboard/plugins/base_plugin.py
@@ -51,3 +51,15 @@ class TBPlugin(object):
       A dict mapping route paths to WSGI applications.
     """
     raise NotImplementedError()
+
+  @abstractmethod
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    A plugin may not be active for instance if it lacks relevant data. If a
+    plugin is inactive, the frontend may avoid issuing requests to its routes.
+
+    Returns:
+      A boolean value. Whether this plugin is active.
+    """
+    raise NotImplementedError()
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
index cfa8f68187..5d34bb91db 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
@@ -82,6 +82,21 @@ class DebuggerPlugin(base_plugin.TBPlugin):
         _HEALTH_PILLS_ROUTE: self._serve_health_pills_handler,
     }
 
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    This plugin is active if any health pills information is present for any
+    run. This method must be called only after get_plugin_apps has been called.
+
+    Returns:
+      A boolean. Whether this plugin is active.
+    """
+    for run_name in self._event_multiplexer.Runs():
+      if self._event_multiplexer.GetOpsWithHealthPills(run_name):
+        return True
+
+    return False
+
   @wrappers.Request.application
   def _serve_health_pills_handler(self, request):
     """A (wrapped) werkzeug handler for serving health pills.
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
index 2c9135fd27..f1cc2e06da 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
@@ -146,6 +146,19 @@ class DebuggerPluginTest(test.TestCase):
     self.assertIn('/health_pills', apps)
     self.assertIsInstance(apps['/health_pills'], collections.Callable)
 
+  def testHealthPillsPluginIsActive(self):
+    self.plugin.get_plugin_apps(self.multiplexer, self.log_dir)
+
+    # The multiplexer has sampled health pills.
+    self.assertTrue(self.plugin.is_active())
+
+  def testHealthPillsPluginIsInactive(self):
+    self.plugin.get_plugin_apps(
+        event_multiplexer.EventMultiplexer({}), self.log_dir)
+
+    # The multiplexer lacks sampled health pills.
+    self.assertFalse(self.plugin.is_active())
+
   def testRequestHealthPillsForRunFoo(self):
     """Tests that the plugin produces health pills for a specified run."""
     response = self.server.post(
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 32ebb78e42..ace5cadca1 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -328,6 +328,16 @@ class ProjectorPlugin(TBPlugin):
     }
     return self._handlers
 
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    This plugin is only active if any run has an embedding.
+
+    Returns:
+      A boolean. Whether this plugin is active.
+    """
+    return bool(self.configs)
+
   @property
   def configs(self):
     """Returns a map of run paths to `ProjectorConfig` protos."""
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index 5679eff4a3..e4b28695b0 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -99,13 +99,26 @@ class ProjectorAppTest(test.TestCase):
     expected_tensor = np.array([[6, 6]], dtype='float32')
     self.assertTrue(np.array_equal(tensor, expected_tensor))
 
+  def testPluginIsActive(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    # Embedding data is available.
+    self.assertTrue(self.plugin.is_active())
+
+  def testPluginIsNotActive(self):
+    self._SetupWSGIApp()
+
+    # Embedding data is not available.
+    self.assertFalse(self.plugin.is_active())
+
   def _SetupWSGIApp(self):
     multiplexer = event_multiplexer.EventMultiplexer(
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
-    plugin = projector_plugin.ProjectorPlugin()
+    self.plugin = projector_plugin.ProjectorPlugin()
     wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [plugin], multiplexer, reload_interval=0)
+        self.log_dir, [self.plugin], multiplexer, reload_interval=0)
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
   def _Get(self, path):
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin.py b/tensorflow/tensorboard/plugins/text/text_plugin.py
index b337ce2ad0..427a761d1e 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin.py
@@ -292,3 +292,13 @@ class TextPlugin(base_plugin.TBPlugin):
         RUNS_ROUTE: self.runs_route,
         TEXT_ROUTE: self.text_route,
     }
+
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    This plugin is only active if TensorBoard sampled any text summaries.
+
+    Returns:
+      Whether this plugin is active.
+    """
+    return bool(self.index_impl())
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin_test.py b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
index 846995b9a9..91dca289ce 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
@@ -390,6 +390,20 @@ class TextPluginTest(test.TestCase):
       </table>""")
     self.assertEqual(convert(d3), d3_expected)
 
+  def testPluginIsActive(self):
+    plugin = text_plugin.TextPlugin()
+    multiplexer = event_multiplexer.EventMultiplexer()
+    plugin.get_plugin_apps(event_multiplexer.EventMultiplexer(), None)
+
+    # The plugin is inactive because text summaries are not available.
+    self.assertFalse(plugin.is_active())
+
+    multiplexer.AddRunsFromDirectory(self.logdir)
+    multiplexer.Reload()
+
+    # The plugin is active because text summaries are available.
+    self.assertTrue(self.plugin.is_active())
+
 
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From b2e0dda6c6f92e4b14e567a508e1a5b5d475decc Mon Sep 17 00:00:00 2001
From: Lukasz Kaiser <lukaszkaiser@google.com>
Date: Thu, 6 Apr 2017 11:12:18 -0800
Subject: [PATCH 0178/1563] Replace a gather op for shapes by a stack op so
 dilated convolutions can be placed on GPU even with strict placing (before
 the gather went to CPU). Change: 152411159

---
 tensorflow/python/ops/nn_ops.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 4b45b92342..2d44f55e2c 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -375,7 +375,9 @@ def with_space_to_batch(
     input_shape_list = input.get_shape().as_list()
     input_spatial_shape = [input_shape_list[i] for i in spatial_dims]
   if input_spatial_shape is None or None in input_spatial_shape:
-    input_spatial_shape = array_ops.gather(array_ops.shape(input), spatial_dims)
+    input_shape_tensor = array_ops.shape(input)
+    input_spatial_shape = array_ops.stack(
+        [input_shape_tensor[i] for i in spatial_dims])
 
   paddings, crops = array_ops.required_space_to_batch_paddings(
       input_shape=input_spatial_shape,
-- 
GitLab


From a667a52ee909975389e48ffe30fb4ff9570635da Mon Sep 17 00:00:00 2001
From: Androbin <robin.richtsfeld@gmail.com>
Date: Thu, 6 Apr 2017 21:55:23 +0200
Subject: [PATCH 0179/1563] corrected which graph_def to validate (#8907)

* corrected which graph_def to validate

After each transformation comes a check for validity.
merged_graph_def was already tested a few lines above.
output_graph_def should be tested directly afterwards.

* Update quantize_nodes.cc
---
 tensorflow/tools/graph_transforms/quantize_nodes.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/graph_transforms/quantize_nodes.cc b/tensorflow/tools/graph_transforms/quantize_nodes.cc
index 5d1c76834f..78078ab6ab 100644
--- a/tensorflow/tools/graph_transforms/quantize_nodes.cc
+++ b/tensorflow/tools/graph_transforms/quantize_nodes.cc
@@ -941,7 +941,7 @@ Status QuantizeNodes(const GraphDef& input_graph_def,
   // keep interoperability with float ops.
   TF_RETURN_IF_ERROR(RemoveRedundantQuantizations(deduped_graph_def, context,
                                                   output_graph_def));
-  TF_RETURN_IF_ERROR(IsGraphValid(merged_graph_def));
+  TF_RETURN_IF_ERROR(IsGraphValid(*output_graph_def));
 
   return Status::OK();
 }
-- 
GitLab


From 96bc32eab3b21192bfd065a5944c12269fe3f5a4 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 6 Apr 2017 12:02:29 -0800
Subject: [PATCH 0180/1563] [TF:XLA] Implement BatchToSpace, BatchToSpaceND,
 SpaceToBatch, SpaceToBatchND. Fix crashes in core implementations of the same
 operators for zero-sized blocks. Change: 152416903

---
 tensorflow/compiler/tests/BUILD               |  13 +
 tensorflow/compiler/tests/randomized_tests.cc | 162 ++++++++++-
 .../compiler/tests/spacetobatch_op_test.py    | 266 ++++++++++++++++++
 tensorflow/compiler/tf2xla/const_analysis.cc  |   6 +
 tensorflow/compiler/tf2xla/kernels/BUILD      |   2 +
 .../tf2xla/kernels/batchtospace_op.cc         | 186 ++++++++++++
 .../tf2xla/kernels/spacetobatch_op.cc         | 190 +++++++++++++
 tensorflow/compiler/tf2xla/xla_op_kernel.cc   |  25 ++
 tensorflow/compiler/tf2xla/xla_op_kernel.h    |   3 +
 tensorflow/core/kernels/batchtospace_op.cc    |   4 +
 tensorflow/core/kernels/spacetobatch_op.cc    |   4 +
 11 files changed, 858 insertions(+), 3 deletions(-)
 create mode 100644 tensorflow/compiler/tests/spacetobatch_op_test.py
 create mode 100644 tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc
 create mode 100644 tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc

diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD
index 03e255e6b8..740a35c7ae 100644
--- a/tensorflow/compiler/tests/BUILD
+++ b/tensorflow/compiler/tests/BUILD
@@ -305,6 +305,19 @@ tf_xla_py_test(
     ],
 )
 
+tf_xla_py_test(
+    name = "spacetobatch_op_test",
+    size = "medium",
+    srcs = ["spacetobatch_op_test.py"],
+    deps = [
+        ":xla_test",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 tf_xla_py_test(
     name = "ternary_ops_test",
     size = "small",
diff --git a/tensorflow/compiler/tests/randomized_tests.cc b/tensorflow/compiler/tests/randomized_tests.cc
index 18c4e3dcb1..7d91594db0 100644
--- a/tensorflow/compiler/tests/randomized_tests.cc
+++ b/tensorflow/compiler/tests/randomized_tests.cc
@@ -218,12 +218,11 @@ class OpTest : public ::testing::Test {
   static constexpr int kDefaultMaxRank = 5;
   static constexpr int64 kDefaultMaxDimensionSize = 20LL;
 
-  // Returns a random dimension size.
+  // Returns a random dimension size, in the range [min, max).
   int64 RandomDim(int64 min = 0, int64 max = kDefaultMaxDimensionSize);
 
   // Returns a random shape. The tensor has rank in the range [min_rank,
-  // max_rank).
-  // Each dimension has size [0, kDefaultMaxDimensionSize].
+  // max_rank). Each dimension has size [min_size, max_size).
   std::vector<int64> RandomDims(int min_rank = 0,
                                 int max_rank = kDefaultMaxRank,
                                 int64 min_size = 0,
@@ -668,6 +667,9 @@ void OpTest::ExpectTfAndXlaOutputsAreClose(const OpTestBuilder& builder,
     VLOG(1) << "Expected graph failed with status: " << s << ". Skipping test";
     return;
   }
+  for (const Tensor& expected : expected_outputs) {
+    VLOG(1) << "Expected: " << expected.DebugString();
+  }
 
   VLOG(1) << "Running test graph";
   TF_ASSERT_OK(session_->Run(test_feeds, test_fetches, {}, &test_outputs));
@@ -877,6 +879,79 @@ TEST_F(OpTest, BatchMatMul) {
   });
 }
 
+TEST_F(OpTest, BatchToSpace) {
+  Repeatedly([this]() {
+    const int num_block_dims = 2;
+    std::vector<int64> block_dims =
+        RandomDims(num_block_dims, num_block_dims, 0, 5);
+    int64 block_size = RandomDim(0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + 1);
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[0] *= block_size;
+      input_dims[1 + i] = block_dims[i];
+    }
+    input_dims[1 + num_block_dims] = RandomDim();
+
+    std::vector<int64> crop_vals;
+    std::uniform_int_distribution<int> distribution(0, 4);
+    for (int i = 0; i < num_block_dims; ++i) {
+      // Chooses crop values; does not always choose legal values.
+      crop_vals.push_back(distribution(generator()));
+      crop_vals.push_back(distribution(generator()));
+    }
+    Tensor crops;
+    CHECK(crops.CopyFrom(AsIntTensor(DT_INT32, crop_vals),
+                         TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(OpTestBuilder("BatchToSpace")
+                                      .Input(RandomTensor(DT_FLOAT, input_dims))
+                                      .Input(crops)
+                                      .Attr("T", DT_FLOAT)
+                                      .Attr("block_size", block_size));
+  });
+}
+
+TEST_F(OpTest, BatchToSpaceND) {
+  Repeatedly([this]() {
+    std::vector<int64> block_dims = RandomDims(1, 3, 0, 5);
+    int num_block_dims = block_dims.size();
+    std::vector<int64> remaining_dims = RandomDims(0, 3);
+    std::vector<int64> block_multipliers =
+        RandomDims(block_dims.size(), block_dims.size(), 0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + remaining_dims.size());
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[0] *= block_dims[i];
+    }
+    std::copy(block_multipliers.begin(), block_multipliers.end(),
+              input_dims.begin() + 1);
+    std::copy(remaining_dims.begin(), remaining_dims.end(),
+              input_dims.begin() + 1 + num_block_dims);
+
+    std::vector<int64> crop_vals;
+    std::uniform_int_distribution<int> distribution(0, 3);
+    for (int i = 0; i < num_block_dims; ++i) {
+      // Chooses crop values; does not always choose legal values.
+      crop_vals.push_back(distribution(generator()));
+      crop_vals.push_back(distribution(generator()));
+    }
+    Tensor crops;
+    CHECK(crops.CopyFrom(AsIntTensor(DT_INT32, crop_vals),
+                         TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(
+        OpTestBuilder("BatchToSpaceND")
+            .Input(RandomTensor(DT_FLOAT, input_dims))
+            .Input(test::AsTensor<int32>(
+                std::vector<int32>(block_dims.begin(), block_dims.end())))
+            .Input(crops)
+            .Attr("T", DT_FLOAT));
+  });
+}
+
 TEST_F(OpTest, BiasAdd) {
   Repeatedly([this]() {
     auto x = RandomTensor(DT_FLOAT, RandomDims(2, kDefaultMaxRank));
@@ -2036,6 +2111,87 @@ TEST_F(OpTest, SoftplusGrad) {
   });
 }
 
+TEST_F(OpTest, SpaceToBatch) {
+  Repeatedly([this]() {
+    std::vector<int64> block_dims = RandomDims(4, 4, 0, 5);
+    const int num_block_dims = 2;
+    int64 block_size = RandomDim(0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + 1);
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[1 + i] = block_dims[i] * block_size;
+    }
+    input_dims[1 + num_block_dims] = RandomDim();
+
+    std::vector<int64> padding_vals;
+    std::uniform_int_distribution<int> distribution(0, 7);
+    for (int i = 0; i < num_block_dims; ++i) {
+      int64 pad_before;
+      int64 pad_after;
+      do {
+        pad_before = distribution(generator());
+        pad_after = distribution(generator());
+      } while (pad_before + pad_after > input_dims[1 + i]);
+      input_dims[1 + i] -= pad_before + pad_after;
+      padding_vals.push_back(pad_before);
+      padding_vals.push_back(pad_after);
+    }
+    Tensor paddings;
+    CHECK(paddings.CopyFrom(AsIntTensor(DT_INT32, padding_vals),
+                            TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(OpTestBuilder("SpaceToBatch")
+                                      .Input(RandomTensor(DT_FLOAT, input_dims))
+                                      .Input(paddings)
+                                      .Attr("T", DT_FLOAT)
+                                      .Attr("block_size", block_size));
+  });
+}
+
+TEST_F(OpTest, SpaceToBatchND) {
+  Repeatedly([this]() {
+    std::vector<int64> block_dims = RandomDims(1, 3, 0, 5);
+    int num_block_dims = block_dims.size();
+    std::vector<int64> remaining_dims = RandomDims(0, 3);
+    std::vector<int64> block_multipliers =
+        RandomDims(block_dims.size(), block_dims.size(), 0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + remaining_dims.size());
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[1 + i] = block_dims[i] * block_multipliers[i];
+    }
+    std::copy(remaining_dims.begin(), remaining_dims.end(),
+              input_dims.begin() + 1 + num_block_dims);
+
+    std::vector<int64> padding_vals;
+    std::uniform_int_distribution<int> distribution(0, 7);
+    for (int i = 0; i < num_block_dims; ++i) {
+      int64 pad_before;
+      int64 pad_after;
+      do {
+        pad_before = distribution(generator());
+        pad_after = distribution(generator());
+      } while (pad_before + pad_after > input_dims[1 + i]);
+      input_dims[1 + i] -= pad_before + pad_after;
+      padding_vals.push_back(pad_before);
+      padding_vals.push_back(pad_after);
+    }
+    Tensor paddings;
+    CHECK(paddings.CopyFrom(AsIntTensor(DT_INT32, padding_vals),
+                            TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(
+        OpTestBuilder("SpaceToBatchND")
+            .Input(RandomTensor(DT_FLOAT, input_dims))
+            .Input(test::AsTensor<int32>(
+                std::vector<int32>(block_dims.begin(), block_dims.end())))
+            .Input(paddings)
+            .Attr("T", DT_FLOAT));
+  });
+}
+
 TEST_F(OpTest, SparseMatMul) {
   Repeatedly([this]() {
     int64 x = RandomDim();
diff --git a/tensorflow/compiler/tests/spacetobatch_op_test.py b/tensorflow/compiler/tests/spacetobatch_op_test.py
new file mode 100644
index 0000000000..9c3b86c84b
--- /dev/null
+++ b/tensorflow/compiler/tests/spacetobatch_op_test.py
@@ -0,0 +1,266 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Functional tests for SpaceToBatch and BatchToSpace ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.compiler.tests.xla_test import XLATestCase
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gen_array_ops
+from tensorflow.python.platform import test
+
+
+def space_to_batch_direct(input_array, block_shape, paddings):
+  """Direct Python implementation of space-to-batch conversion.
+
+  This is used for tests only.
+
+  Args:
+    input_array: N-D array
+    block_shape: 1-D array of shape [num_block_dims].
+    paddings: 2-D array of shape [num_block_dims, 2].
+
+  Returns:
+    Converted tensor.
+  """
+  input_array = np.array(input_array)
+  block_shape = np.array(block_shape)
+  num_block_dims = len(block_shape)
+  paddings = np.array(paddings).reshape((len(block_shape), 2))
+
+  padded = np.pad(input_array,
+                  pad_width=([[0, 0]] + list(paddings) + [[0, 0]] *
+                             (input_array.ndim - 1 - num_block_dims)),
+                  mode="constant")
+  reshaped_padded_shape = [input_array.shape[0]]
+  output_shape = [input_array.shape[0] * np.prod(block_shape)]
+  for block_dim, block_shape_value in enumerate(block_shape):
+    reduced_size = padded.shape[block_dim + 1] // block_shape_value
+    reshaped_padded_shape.append(reduced_size)
+    output_shape.append(reduced_size)
+    reshaped_padded_shape.append(block_shape_value)
+  reshaped_padded_shape.extend(input_array.shape[num_block_dims + 1:])
+  output_shape.extend(input_array.shape[num_block_dims + 1:])
+
+  reshaped_padded = padded.reshape(reshaped_padded_shape)
+  permuted_reshaped_padded = np.transpose(reshaped_padded, (
+      list(np.arange(num_block_dims) * 2 + 2) + [0] +
+      list(np.arange(num_block_dims) * 2 + 1) + list(
+          np.arange(input_array.ndim - num_block_dims - 1) + 1 + num_block_dims
+          * 2)))
+  return permuted_reshaped_padded.reshape(output_shape)
+
+
+class SpaceToBatchTest(XLATestCase):
+  """Tests input-output pairs for the SpaceToBatch and BatchToSpace ops."""
+
+  def _testPad(self, inputs, paddings, block_size, outputs):
+    with self.test_session() as sess, self.test_scope():
+      for dtype in self.float_types:
+        # outputs = space_to_batch(inputs)
+        placeholder = array_ops.placeholder(dtype)
+        x_tf = gen_array_ops._space_to_batch(
+            placeholder, paddings, block_size=block_size)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: inputs}), outputs)
+        # inputs = batch_to_space(outputs)
+        x_tf = gen_array_ops._batch_to_space(
+            placeholder, paddings, block_size=block_size)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: outputs}), inputs)
+
+  def _testOne(self, inputs, block_size, outputs):
+    paddings = np.zeros((2, 2), dtype=np.int32)
+    self._testPad(inputs, paddings, block_size, outputs)
+
+  # [1, 2, 2, 1] <-> [4, 1, 1, 1]
+  def testSmallInput2x2(self):
+    x_np = [[[[1], [2]], [[3], [4]]]]
+    block_size = 2
+    x_out = [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # [1, 2, 2, 1] <-> [1, 3, 3, 1] (padding) <-> [9, 1, 1, 1]
+  def testSmallInput2x2Pad1x0(self):
+    x_np = [[[[1], [2]], [[3], [4]]]]
+    paddings = np.array([[1, 0], [1, 0]], dtype=np.int32)
+    block_size = 3
+    x_out = [[[[0]]], [[[0]]], [[[0]]], [[[0]]], [[[1]]], [[[2]]], [[[0]]],
+             [[[3]]], [[[4]]]]
+    self._testPad(x_np, paddings, block_size, x_out)
+
+  # Test with depth larger than 1.
+  # [1, 2, 2, 3] <-> [4, 1, 1, 3]
+  def testDepthInput2x2(self):
+    x_np = [[[[1, 2, 3], [4, 5, 6]], [[7, 8, 9], [10, 11, 12]]]]
+    block_size = 2
+    x_out = [[[[1, 2, 3]]], [[[4, 5, 6]]], [[[7, 8, 9]]], [[[10, 11, 12]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # Test for larger input dimensions.
+  # [1, 4, 4, 1] <-> [4, 2, 2, 1]
+  def testLargerInput2x2(self):
+    x_np = [[[[1], [2], [3], [4]], [[5], [6], [7], [8]],
+             [[9], [10], [11], [12]], [[13], [14], [15], [16]]]]
+    block_size = 2
+    x_out = [[[[1], [3]], [[9], [11]]], [[[2], [4]], [[10], [12]]],
+             [[[5], [7]], [[13], [15]]], [[[6], [8]], [[14], [16]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # Test with batch larger than 1.
+  # [2, 2, 4, 1] <-> [8, 1, 2, 1]
+  def testBatchInput2x2(self):
+    x_np = [[[[1], [2], [3], [4]], [[5], [6], [7], [8]]],
+            [[[9], [10], [11], [12]], [[13], [14], [15], [16]]]]
+    block_size = 2
+    x_out = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
+             [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # Tests for larger input spatial dimensions AND batch larger than 1, to ensure
+  # that elements are correctly laid out spatially and properly interleaved
+  # along the batch dimension.
+  # [2, 4, 4, 1] <-> [8, 2, 2, 1]
+  def testLargerInputBatch2x2(self):
+    x_np = [[[[1], [2], [3], [4]], [[5], [6], [7], [8]],
+             [[9], [10], [11], [12]], [[13], [14], [15], [16]]],
+            [[[17], [18], [19], [20]], [[21], [22], [23], [24]],
+             [[25], [26], [27], [28]], [[29], [30], [31], [32]]]]
+    x_out = [[[[1], [3]], [[9], [11]]], [[[17], [19]], [[25], [27]]],
+             [[[2], [4]], [[10], [12]]], [[[18], [20]], [[26], [28]]],
+             [[[5], [7]], [[13], [15]]], [[[21], [23]], [[29], [31]]],
+             [[[6], [8]], [[14], [16]]], [[[22], [24]], [[30], [32]]]]
+    block_size = 2
+    self._testOne(x_np, block_size, x_out)
+
+
+class SpaceToBatchNDTest(XLATestCase):
+  """Tests input-output pairs for the SpaceToBatchND and BatchToSpaceND ops."""
+
+  def _testPad(self, inputs, block_shape, paddings, outputs):
+    block_shape = np.array(block_shape)
+    paddings = np.array(paddings).reshape((len(block_shape), 2))
+    with self.test_session() as sess, self.test_scope():
+      for dtype in self.float_types:
+        placeholder = array_ops.placeholder(dtype)
+        # outputs = space_to_batch(inputs)
+        x_tf = array_ops.space_to_batch_nd(placeholder, block_shape, paddings)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: inputs}), outputs)
+        # inputs = batch_to_space(outputs)
+        placeholder = array_ops.placeholder(dtype)
+        x_tf = array_ops.batch_to_space_nd(placeholder, block_shape, paddings)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: outputs}), inputs)
+
+  def _testDirect(self, input_shape, block_shape, paddings):
+    inputs = np.arange(np.prod(input_shape), dtype=np.float32)
+    inputs = inputs.reshape(input_shape)
+    self._testPad(inputs, block_shape, paddings,
+                  space_to_batch_direct(inputs, block_shape, paddings))
+
+  def testZeroBlockDimsZeroRemainingDims(self):
+    self._testPad(
+        inputs=[1, 2],
+        block_shape=[],
+        paddings=[],
+        outputs=[1, 2],)
+
+  def testZeroBlockDimsOneRemainingDim(self):
+    self._testPad(
+        inputs=[[1, 2], [3, 4]],
+        block_shape=[],
+        paddings=[],
+        outputs=[[1, 2], [3, 4]])
+
+    # Same thing, but with a no-op block dim.
+    self._testPad(
+        inputs=[[1, 2], [3, 4]],
+        block_shape=[1],
+        paddings=[[0, 0]],
+        outputs=[[1, 2], [3, 4]])
+
+  def testZeroBlockDimsTwoRemainingDims(self):
+    self._testPad(
+        inputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
+        block_shape=[],
+        paddings=[],
+        outputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
+
+    # Same thing, but with a no-op block dim.
+    self._testPad(
+        inputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
+        block_shape=[1],
+        paddings=[[0, 0]],
+        outputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
+
+    # Same thing, but with two no-op block dims.
+    self._testPad(
+        inputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
+        block_shape=[1, 1],
+        paddings=[[0, 0], [0, 0]],
+        outputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
+
+  def testOneBlockDimZeroRemainingDims(self):
+    self._testPad(
+        inputs=[[1, 2, 3], [4, 5, 6]],
+        block_shape=[2],
+        paddings=[1, 0],
+        outputs=[[0, 2], [0, 5], [1, 3], [4, 6]])
+
+  def testOneBlockDimOneRemainingDim(self):
+    self._testPad(
+        inputs=[[[1, 11], [2, 21], [3, 31]], [[4, 41], [5, 51], [6, 61]]],
+        block_shape=[2],
+        paddings=[1, 0],
+        outputs=[[[0, 0], [2, 21]], [[0, 0], [5, 51]], [[1, 11], [3, 31]],
+                 [[4, 41], [6, 61]]])
+
+  def testDirect(self):
+    # Test with zero-size remaining dimension.
+    self._testDirect(
+        input_shape=[3, 1, 2, 0], block_shape=[3], paddings=[[0, 2]])
+
+    # Test with zero-size blocked dimension.
+    self._testDirect(
+        input_shape=[3, 0, 2, 5], block_shape=[3], paddings=[[0, 0]])
+
+    # Test with padding up from zero size.
+    self._testDirect(
+        input_shape=[3, 0, 2, 5], block_shape=[3], paddings=[[1, 2]])
+
+    self._testDirect(
+        input_shape=[3, 3, 4, 5, 2],
+        block_shape=[3, 4, 2],
+        paddings=[[1, 2], [0, 0], [3, 0]])
+
+    self._testDirect(
+        input_shape=[3, 3, 4, 5, 2],
+        block_shape=[3, 4, 2, 2],
+        paddings=[[1, 2], [0, 0], [3, 0], [0, 0]])
+
+    self._testDirect(
+        input_shape=[3, 2, 2, 3, 4, 5, 2, 5],
+        block_shape=[1, 1, 3, 4, 2, 2],
+        paddings=[[0, 0], [0, 0], [1, 2], [0, 0], [3, 0], [0, 0]])
+
+    self._testDirect(
+        input_shape=[3, 2, 2, 3, 4, 5, 2, 5],
+        block_shape=[1, 1, 3, 4, 2, 2, 1],
+        paddings=[[0, 0], [0, 0], [1, 2], [0, 0], [3, 0], [0, 0], [0, 0]])
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/compiler/tf2xla/const_analysis.cc b/tensorflow/compiler/tf2xla/const_analysis.cc
index 53aa749a0a..44ff13ca34 100644
--- a/tensorflow/compiler/tf2xla/const_analysis.cc
+++ b/tensorflow/compiler/tf2xla/const_analysis.cc
@@ -35,6 +35,9 @@ Status BackwardsConstAnalysis(const Graph& g,
       {"Any", "reduction_indices"},
       {"ArgMax", "dimension"},
       {"AvgPoolGrad", "orig_input_shape"},
+      {"BatchToSpace", "crops"},
+      {"BatchToSpaceND", "block_shape"},
+      {"BatchToSpaceND", "crops"},
       {"BroadcastGradientArgs", "s0"},
       {"BroadcastGradientArgs", "s1"},
       {"Concat", "concat_dim"},
@@ -69,6 +72,9 @@ Status BackwardsConstAnalysis(const Graph& g,
       {"ReverseV2", "axis"},
       {"Slice", "begin"},
       {"Slice", "size"},
+      {"SpaceToBatch", "paddings"},
+      {"SpaceToBatchND", "block_shape"},
+      {"SpaceToBatchND", "paddings"},
       {"Split", "split_dim"},
       {"SplitV", "split_dim"},
       {"SplitV", "size_splits"},
diff --git a/tensorflow/compiler/tf2xla/kernels/BUILD b/tensorflow/compiler/tf2xla/kernels/BUILD
index e4f73b529f..14d2a72f7c 100644
--- a/tensorflow/compiler/tf2xla/kernels/BUILD
+++ b/tensorflow/compiler/tf2xla/kernels/BUILD
@@ -15,6 +15,7 @@ tf_kernel_library(
     srcs = [
         "aggregate_ops.cc",
         "batch_matmul_op.cc",
+        "batchtospace_op.cc",
         "bcast_ops.cc",
         "bias_ops.cc",
         "binary_ops.cc",
@@ -50,6 +51,7 @@ tf_kernel_library(
         "shape_op.cc",
         "slice_op.cc",
         "softmax_op.cc",
+        "spacetobatch_op.cc",
         "split_op.cc",
         "strided_slice_op.cc",
         "tile_ops.cc",
diff --git a/tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc b/tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc
new file mode 100644
index 0000000000..eb4bd47ee5
--- /dev/null
+++ b/tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc
@@ -0,0 +1,186 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/tf2xla/xla_helpers.h"
+#include "tensorflow/compiler/tf2xla/xla_op_kernel.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+
+namespace tensorflow {
+namespace {
+
+void BatchToSpace(XlaOpKernelContext* ctx,
+                  const xla::ComputationDataHandle& input, DataType input_dtype,
+                  const TensorShape& input_tensor_shape,
+                  gtl::ArraySlice<int64> block_shape,
+                  const xla::Literal& crops) {
+  const int input_rank = input_tensor_shape.dims();
+  const gtl::InlinedVector<int64, 4> input_shape =
+      input_tensor_shape.dim_sizes();
+  const int block_rank = block_shape.size();
+
+  OP_REQUIRES(
+      ctx, input_rank >= 1 + block_rank,
+      errors::InvalidArgument("input rank should be >= ", 1 + block_rank,
+                              " instead of ", input_rank));
+  gtl::ArraySlice<int64> remainder_shape(input_shape);
+  remainder_shape.remove_prefix(1 + block_rank);
+
+  OP_REQUIRES(
+      ctx,
+      xla::ShapeUtil::Rank(crops.shape()) == 2 &&
+          block_rank == xla::ShapeUtil::GetDimension(crops.shape(), 0) &&
+          2 == xla::ShapeUtil::GetDimension(crops.shape(), 1),
+      errors::InvalidArgument("crops should have shape [", block_rank,
+                              ", 2] instead of ",
+                              xla::ShapeUtil::HumanString(crops.shape())));
+
+  xla::ComputationBuilder* b = ctx->builder();
+  const int64 batch_size = input_shape[0];
+
+  // Compute the product of the block_shape values.
+  int64 block_num_elems = 1;
+  for (int i = 0; i < block_rank; ++i) {
+    block_num_elems *= block_shape[i];
+  }
+  OP_REQUIRES(ctx, block_num_elems > 0,
+              errors::InvalidArgument(
+                  "The product of the block dimensions must be positive"));
+
+  // 1. Reshape `input` to `reshaped` of shape:
+  //      [block_shape[0], ..., block_shape[M-1],
+  //       batch / prod(block_shape),
+  //       input_shape[1], ..., input_shape[N-1]]
+
+  OP_REQUIRES(
+      ctx, batch_size % block_num_elems == 0,
+      errors::InvalidArgument("Input batch dimension (", batch_size,
+                              ") is not divisible by product of block sizes (",
+                              block_num_elems, ")"));
+  std::vector<int64> reshaped_shape(input_rank + block_rank);
+  std::copy(block_shape.begin(), block_shape.end(), reshaped_shape.begin());
+  reshaped_shape[block_rank] = batch_size / block_num_elems;
+  std::copy(input_shape.begin() + 1, input_shape.end(),
+            reshaped_shape.begin() + block_rank + 1);
+  xla::ComputationDataHandle reshaped = b->Reshape(input, reshaped_shape);
+
+  // 2. Permute dimensions of `reshaped` to produce `permuted` of shape
+  //      [batch / prod(block_shape),
+  //
+  //       input_shape[1], block_shape[0],
+  //       ...,
+  //       input_shape[M], block_shape[M-1],
+  //
+  //       input_shape[M+1], ..., input_shape[N-1]]
+  std::vector<int64> permutation(reshaped_shape.size());
+  permutation[0] = block_rank;
+  for (int i = 0; i < block_rank; ++i) {
+    permutation[1 + 2 * i] = block_rank + 1 + i;
+    permutation[1 + 2 * i + 1] = i;
+  }
+  std::iota(permutation.begin() + 1 + block_rank * 2, permutation.end(),
+            1 + block_rank * 2);
+  xla::ComputationDataHandle permuted = b->Transpose(reshaped, permutation);
+
+  // 3. Reshape `permuted` to produce `reshaped_permuted` of shape
+  //      [batch / prod(block_shape),
+  //
+  //       input_shape[1] * block_shape[0],
+  //       ...,
+  //       input_shape[M] * block_shape[M-1],
+  //
+  //       input_shape[M+1],
+  //       ...,
+  //       input_shape[N-1]]
+  std::vector<int64> reshaped_permuted_shape(input_rank);
+  reshaped_permuted_shape[0] = batch_size / block_num_elems;
+  for (int i = 0; i < block_rank; ++i) {
+    reshaped_permuted_shape[1 + i] = block_shape[i] * input_shape[1 + i];
+  }
+  std::copy(remainder_shape.begin(), remainder_shape.end(),
+            reshaped_permuted_shape.begin() + 1 + block_rank);
+
+  xla::ComputationDataHandle reshaped_permuted =
+      b->Reshape(permuted, reshaped_permuted_shape);
+
+  // 4. Crop the start and end of dimensions `[1, ..., M]` of
+  //    `reshaped_permuted` according to `crops` to produce the output of shape:
+  //      [batch / prod(block_shape),
+  //
+  //       input_shape[1] * block_shape[0] - crops[0,0] - crops[0,1],
+  //       ...,
+  //       input_shape[M] * block_shape[M-1] - crops[M-1,0] - crops[M-1,1],
+  //
+  //       input_shape[M+1], ..., input_shape[N-1]]
+  std::vector<int64> start_indices(input_rank, 0);
+  std::vector<int64> end_indices = reshaped_permuted_shape;
+  for (int i = 0; i < block_rank; ++i) {
+    int64 crop_start = xla::LiteralUtil::Get<int64>(crops, {i, 0});
+    int64 crop_end = xla::LiteralUtil::Get<int64>(crops, {i, 1});
+    OP_REQUIRES(ctx, crop_start >= 0 && crop_end >= 0,
+                errors::InvalidArgument("Crops must be non-negative"));
+    start_indices[1 + i] = crop_start;
+    end_indices[1 + i] -= crop_end;
+    OP_REQUIRES(
+        ctx, start_indices[1 + i] <= end_indices[1 + i],
+        errors::InvalidArgument(
+            "Cropped size must be non-negative: start: ", crop_start,
+            " end: ", crop_end, " size ", reshaped_permuted_shape[1 + i]));
+  }
+  xla::ComputationDataHandle output =
+      b->Slice(reshaped_permuted, start_indices, end_indices);
+  ctx->SetOutput(0, output);
+}
+
+class BatchToSpaceNDOp : public XlaOpKernel {
+ public:
+  explicit BatchToSpaceNDOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    std::vector<int64> block_shape;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsIntVector(1, &block_shape));
+
+    xla::Literal crops;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(2, &crops));
+
+    BatchToSpace(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 block_shape, crops);
+  }
+};
+REGISTER_XLA_OP(Name("BatchToSpaceND"), BatchToSpaceNDOp);
+
+class BatchToSpaceOp : public XlaOpKernel {
+ public:
+  explicit BatchToSpaceOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("block_size", &block_size_));
+    OP_REQUIRES(
+        ctx, block_size_ > 1,
+        errors::InvalidArgument("Block size should be > 1: ", block_size_));
+  }
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::Literal crops;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(1, &crops));
+
+    BatchToSpace(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 {block_size_, block_size_}, crops);
+  }
+
+ private:
+  int block_size_;
+};
+REGISTER_XLA_OP(Name("BatchToSpace"), BatchToSpaceOp);
+
+}  // namespace
+}  // namespace tensorflow
diff --git a/tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc b/tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc
new file mode 100644
index 0000000000..f15b354cb2
--- /dev/null
+++ b/tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc
@@ -0,0 +1,190 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/tf2xla/xla_helpers.h"
+#include "tensorflow/compiler/tf2xla/xla_op_kernel.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+
+namespace tensorflow {
+namespace {
+
+void SpaceToBatch(XlaOpKernelContext* ctx,
+                  const xla::ComputationDataHandle& input, DataType input_dtype,
+                  const TensorShape& input_tensor_shape,
+                  gtl::ArraySlice<int64> block_shape,
+                  const xla::Literal& paddings) {
+  const int input_rank = input_tensor_shape.dims();
+  const gtl::InlinedVector<int64, 4> input_shape =
+      input_tensor_shape.dim_sizes();
+  const int block_rank = block_shape.size();
+
+  OP_REQUIRES(
+      ctx, input_rank >= 1 + block_rank,
+      errors::InvalidArgument("input rank should be >= ", 1 + block_rank,
+                              " instead of ", input_rank));
+  gtl::ArraySlice<int64> remainder_shape(input_shape);
+  remainder_shape.remove_prefix(1 + block_rank);
+
+  OP_REQUIRES(
+      ctx,
+      xla::ShapeUtil::Rank(paddings.shape()) == 2 &&
+          block_rank == xla::ShapeUtil::GetDimension(paddings.shape(), 0) &&
+          2 == xla::ShapeUtil::GetDimension(paddings.shape(), 1),
+      errors::InvalidArgument("paddings should have shape [", block_rank,
+                              ", 2] instead of ",
+                              xla::ShapeUtil::HumanString(paddings.shape())));
+
+  xla::ComputationBuilder* b = ctx->builder();
+
+  // 1. Zero-pad the start and end of dimensions `[1, ..., M]` of the
+  //  input according to `paddings` to produce `padded` of shape `padded_shape`.
+  xla::PaddingConfig padding_config;
+  std::vector<int64> padded_shape(input_shape.begin(), input_shape.end());
+  int64 block_num_elems = 1LL;
+  padding_config.add_dimensions();  // Don't pad the batch dimension.
+  for (int i = 0; i < block_rank; ++i) {
+    auto* dim = padding_config.add_dimensions();
+    int64 pad_start = xla::LiteralUtil::Get<int64>(paddings, {i, 0});
+    int64 pad_end = xla::LiteralUtil::Get<int64>(paddings, {i, 1});
+    OP_REQUIRES(ctx, pad_start >= 0 && pad_end >= 0,
+                errors::InvalidArgument("Paddings must be non-negative"));
+    dim->set_edge_padding_low(pad_start);
+    dim->set_edge_padding_high(pad_end);
+    padded_shape[1 + i] += pad_start + pad_end;
+    block_num_elems *= block_shape[i];
+  }
+  // Don't pad the remainder dimensions.
+  for (int i = 0; i < remainder_shape.size(); ++i) {
+    padding_config.add_dimensions();
+  }
+  OP_REQUIRES(ctx, block_num_elems > 0,
+              errors::InvalidArgument(
+                  "The product of the block dimensions must be positive"));
+
+  xla::ComputationDataHandle padded =
+      b->Pad(input, XlaHelpers::Zero(b, input_dtype), padding_config);
+
+  // 2. Reshape `padded` to `reshaped_padded` of shape:
+  //
+  //      [batch] +
+  //      [padded_shape[1] / block_shape[0],
+  //        block_shape[0],
+  //       ...,
+  //       padded_shape[M] / block_shape[M-1],
+  //       block_shape[M-1]] +
+  //      remaining_shape
+  const int64 batch_size = input_shape[0];
+  std::vector<int64> reshaped_padded_shape(input_rank + block_rank);
+  reshaped_padded_shape[0] = batch_size;
+  for (int i = 0; i < block_rank; ++i) {
+    OP_REQUIRES(ctx, padded_shape[1 + i] % block_shape[i] == 0,
+                errors::InvalidArgument("padded_shape[", 1 + i,
+                                        "]=", padded_shape[1 + i],
+                                        " is not divisible by block_shape[", i,
+                                        "]=", block_shape[i]));
+
+    reshaped_padded_shape[1 + i * 2] = padded_shape[1 + i] / block_shape[i];
+    reshaped_padded_shape[1 + i * 2 + 1] = block_shape[i];
+  }
+  std::copy(remainder_shape.begin(), remainder_shape.end(),
+            reshaped_padded_shape.begin() + 1 + 2 * block_rank);
+
+  xla::ComputationDataHandle reshaped_padded =
+      b->Reshape(padded, reshaped_padded_shape);
+
+  // 3. Permute dimensions of `reshaped_padded` to produce
+  //    `permuted_reshaped_padded` of shape:
+  //
+  //      block_shape +
+  //      [batch] +
+  //      [padded_shape[1] / block_shape[0],
+  //       ...,
+  //       padded_shape[M] / block_shape[M-1]] +
+  //      remaining_shape
+  std::vector<int64> permutation(reshaped_padded_shape.size());
+  for (int i = 0; i < block_rank; ++i) {
+    permutation[i] = 1 + 2 * i + 1;
+    permutation[block_rank + 1 + i] = 1 + 2 * i;
+  }
+  permutation[block_rank] = 0;
+  std::iota(permutation.begin() + 1 + block_rank * 2, permutation.end(),
+            1 + block_rank * 2);
+  xla::ComputationDataHandle permuted_reshaped_padded =
+      b->Transpose(reshaped_padded, permutation);
+
+  // 4. Reshape `permuted_reshaped_padded` to flatten `block_shape` into the
+  //    batch dimension, producing an output tensor of shape:
+  //
+  //      [batch * prod(block_shape)] +
+  //      [padded_shape[1] / block_shape[0],
+  //       ...,
+  //       padded_shape[M] / block_shape[M-1]] +
+  //      remaining_shape
+  // Determine the length of the prefix of block dims that can be combined
+  // into the batch dimension due to having no padding and block_shape=1.
+  std::vector<int64> output_shape(input_rank);
+  output_shape[0] = batch_size * block_num_elems;
+  for (int i = 0; i < block_rank; ++i) {
+    output_shape[1 + i] = padded_shape[1 + i] / block_shape[i];
+  }
+  std::copy(remainder_shape.begin(), remainder_shape.end(),
+            output_shape.begin() + 1 + block_rank);
+
+  xla::ComputationDataHandle output =
+      b->Reshape(permuted_reshaped_padded, output_shape);
+  ctx->SetOutput(0, output);
+}
+
+class SpaceToBatchNDOp : public XlaOpKernel {
+ public:
+  explicit SpaceToBatchNDOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    std::vector<int64> block_shape;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsIntVector(1, &block_shape));
+
+    xla::Literal paddings;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(2, &paddings));
+
+    SpaceToBatch(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 block_shape, paddings);
+  }
+};
+REGISTER_XLA_OP(Name("SpaceToBatchND"), SpaceToBatchNDOp);
+
+class SpaceToBatchOp : public XlaOpKernel {
+ public:
+  explicit SpaceToBatchOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("block_size", &block_size_));
+    OP_REQUIRES(
+        ctx, block_size_ > 1,
+        errors::InvalidArgument("Block size should be > 1: ", block_size_));
+  }
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::Literal paddings;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(1, &paddings));
+
+    SpaceToBatch(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 {block_size_, block_size_}, paddings);
+  }
+
+ private:
+  int block_size_;
+};
+REGISTER_XLA_OP(Name("SpaceToBatch"), SpaceToBatchOp);
+
+}  // namespace
+}  // namespace tensorflow
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.cc b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
index 53dcdec7a2..a022de36a2 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.cc
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
@@ -186,6 +186,31 @@ Status XlaOpKernelContext::ConstantInputAsIntVector(int index,
   return LiteralToInt64Vector(literal, out);
 }
 
+Status XlaOpKernelContext::ConstantInputAsInt64Literal(int index,
+                                                       xla::Literal* out) {
+  xla::Literal literal;
+  TF_RETURN_IF_ERROR(ConstantInput(index, &literal));
+  switch (literal.shape().element_type()) {
+    case xla::S32:
+      out->Clear();
+      *out->mutable_shape() = literal.shape();
+      out->mutable_shape()->set_element_type(xla::S64);
+      for (int32 x : literal.s32s()) {
+        out->add_s64s(x);
+      }
+      return Status::OK();
+
+    case xla::S64:
+      out->Swap(&literal);
+      return Status::OK();
+
+    default:
+      return errors::InvalidArgument(
+          "Invalid argument to ConstantInputAsInt64Literal: ",
+          xla::ShapeUtil::HumanString(literal.shape()));
+  }
+}
+
 // TODO(phawkins): validate that the dimensions form a valid shape, fail
 // gracefully if they do not.
 Status XlaOpKernelContext::ConstantInputAsShape(int index, TensorShape* shape) {
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.h b/tensorflow/compiler/tf2xla/xla_op_kernel.h
index 60e3b59d32..f97e07bea5 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.h
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.h
@@ -110,6 +110,9 @@ class XlaOpKernelContext {
   // Converts a constant 1D int32 or int64 tensor into a vector of int64s.
   Status ConstantInputAsIntVector(int index, std::vector<int64>* out);
 
+  // Converts a constant int32 or int64 Tensor into an xla int64 Literal.
+  Status ConstantInputAsInt64Literal(int index, xla::Literal* out);
+
   // Converts a constant 1D int32 or int64 tensor into a TensorShape.
   Status ConstantInputAsShape(int index, TensorShape* shape);
 
diff --git a/tensorflow/core/kernels/batchtospace_op.cc b/tensorflow/core/kernels/batchtospace_op.cc
index b24a834083..99b5d3daaa 100644
--- a/tensorflow/core/kernels/batchtospace_op.cc
+++ b/tensorflow/core/kernels/batchtospace_op.cc
@@ -97,6 +97,10 @@ static void BatchToSpaceOpCompute(OpKernelContext* context,
   for (int block_dim = 0; block_dim < block_dims; ++block_dim) {
     block_shape_product *= block_shape[block_dim];
   }
+  OP_REQUIRES(
+      context, block_shape_product > 0,
+      errors::InvalidArgument("Product of block sizes must be positive, got ",
+                              block_shape_product));
 
   const int64 orig_input_batch_size = orig_input_tensor.dim_size(0);
   OP_REQUIRES(
diff --git a/tensorflow/core/kernels/spacetobatch_op.cc b/tensorflow/core/kernels/spacetobatch_op.cc
index 3815716ccd..c513683918 100644
--- a/tensorflow/core/kernels/spacetobatch_op.cc
+++ b/tensorflow/core/kernels/spacetobatch_op.cc
@@ -100,6 +100,10 @@ void SpaceToBatchOpCompute(OpKernelContext* context,
   for (int block_dim = 0; block_dim < block_dims; ++block_dim) {
     block_shape_product *= block_shape[block_dim];
   }
+  OP_REQUIRES(
+      context, block_shape_product > 0,
+      errors::InvalidArgument("Product of block sizes must be positive, got ",
+                              block_shape_product));
 
   const int internal_block_dims =
       block_dims - removed_prefix_block_dims - removed_suffix_block_dims;
-- 
GitLab


From f4ca857134be8fa076e585e028471d6f1a0fcf7c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 12:28:10 -0800
Subject: [PATCH 0181/1563] Estimator saves relative paths in checkpoint.
 Change: 152420211

---
 tensorflow/python/estimator/BUILD             | 16 +++++++-
 tensorflow/python/estimator/estimator.py      |  3 +-
 tensorflow/python/estimator/estimator_test.py | 38 +++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/estimator/BUILD b/tensorflow/python/estimator/BUILD
index 616b7ae49b..f1471a515f 100644
--- a/tensorflow/python/estimator/BUILD
+++ b/tensorflow/python/estimator/BUILD
@@ -108,18 +108,19 @@ py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
-        ":checkpoint_utils",
         ":export",
         ":model_fn",
         ":run_config",
         "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:client",
         "//tensorflow/python:control_flow_ops",
-        "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:metrics",
         "//tensorflow/python:platform",
+        "//tensorflow/python:random_seed",
         "//tensorflow/python:summary",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
         "//tensorflow/python/saved_model:builder",
         "//tensorflow/python/saved_model:tag_constants",
     ],
@@ -131,20 +132,31 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":estimator",
+        ":export",
         ":model_fn",
         ":numpy_io",
         ":run_config",
+        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:init_ops",
         "//tensorflow/python:layers",
+        "//tensorflow/python:lib",
+        "//tensorflow/python:metrics",
+        "//tensorflow/python:parsing_ops",
+        "//tensorflow/python:platform",
         "//tensorflow/python:saver_test_utils",
         "//tensorflow/python:session",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
+        "//tensorflow/python:variables",
         "//tensorflow/python/ops/losses",
         "//tensorflow/python/saved_model:loader",
+        "//tensorflow/python/saved_model:tag_constants",
     ],
 )
 
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 4890845e03..d92c6526a7 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -552,7 +552,8 @@ class Estimator(object):
                               training.Saver(
                                   sharded=True,
                                   max_to_keep=self._config.keep_checkpoint_max,
-                                  defer_build=True))
+                                  defer_build=True,
+                                  save_relative_paths=True))
 
       chief_hooks = []
       if (self._config.save_checkpoints_secs or
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index a1659156a6..84813073d3 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -23,6 +23,8 @@ import tempfile
 
 import numpy as np
 
+from google.protobuf import text_format
+
 from tensorflow.python.client import session
 from tensorflow.python.estimator import estimator
 from tensorflow.python.estimator import model_fn as model_fn_lib
@@ -34,6 +36,7 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.layers import layers
+from tensorflow.python.lib.io import file_io
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
@@ -48,6 +51,7 @@ from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.saved_model import loader
 from tensorflow.python.saved_model import tag_constants
+from tensorflow.python.training import checkpoint_state_pb2
 from tensorflow.python.training import saver
 from tensorflow.python.training import saver_test_utils
 from tensorflow.python.training import session_run_hook
@@ -236,6 +240,40 @@ class EstimatorTrainTest(test.TestCase):
     self.assertEqual(
         5, estimator._load_global_step_from_checkpoint_dir(est.model_dir))
 
+  def test_checkpoint_contains_relative_paths(self):
+    tmpdir = tempfile.mkdtemp()
+    est = estimator.Estimator(
+        model_dir=tmpdir,
+        model_fn=model_fn_global_step_incrementer)
+    est.train(dummy_input_fn, steps=5)
+
+    checkpoint_file_content = file_io.read_file_to_string(
+        os.path.join(tmpdir, 'checkpoint'))
+    ckpt = checkpoint_state_pb2.CheckpointState()
+    text_format.Merge(checkpoint_file_content, ckpt)
+    self.assertEqual(ckpt.model_checkpoint_path, 'model.ckpt-5')
+    self.assertAllEqual(
+        ['model.ckpt-1', 'model.ckpt-5'], ckpt.all_model_checkpoint_paths)
+
+  def test_train_save_copy_reload(self):
+    tmpdir = tempfile.mkdtemp()
+    model_dir1 = os.path.join(tmpdir, 'model_dir1')
+    est1 = estimator.Estimator(
+        model_dir=model_dir1,
+        model_fn=model_fn_global_step_incrementer)
+    est1.train(dummy_input_fn, steps=5)
+
+    model_dir2 = os.path.join(tmpdir, 'model_dir2')
+    os.renames(model_dir1, model_dir2)
+    est2 = estimator.Estimator(
+        model_dir=model_dir2,
+        model_fn=model_fn_global_step_incrementer)
+    self.assertEqual(
+        5, estimator._load_global_step_from_checkpoint_dir(est2.model_dir))
+    est2.train(dummy_input_fn, steps=5)
+    self.assertEqual(
+        10, estimator._load_global_step_from_checkpoint_dir(est2.model_dir))
+
   def test_steps0_raises_error(self):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
-- 
GitLab


From fa21d4d83d55f4b81326037800050b1dc89ea228 Mon Sep 17 00:00:00 2001
From: Martin Wicke <martin.wicke@gmail.com>
Date: Thu, 6 Apr 2017 13:29:11 -0700
Subject: [PATCH 0182/1563] Revert "Allow SavedModelBuilder to overwrite
 existing folders (#8902)"

This reverts commit 25d63db4fa2c83ddc46348dc24453b2ddf27d523.
---
 tensorflow/python/saved_model/builder_impl.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/tensorflow/python/saved_model/builder_impl.py b/tensorflow/python/saved_model/builder_impl.py
index 4bf0f62e74..d075a04ca2 100644
--- a/tensorflow/python/saved_model/builder_impl.py
+++ b/tensorflow/python/saved_model/builder_impl.py
@@ -76,25 +76,16 @@ class SavedModelBuilder(object):
   ```
   """
 
-  def __init__(self, export_dir, overwrite=False):
-    """Construct a SavedModelBuilder.
-
-    Args:
-      export_dir: The directory to export to
-      overwrite: If `True` deletes export_dir if it already exists
-    """
+  def __init__(self, export_dir):
     self._saved_model = saved_model_pb2.SavedModel()
     self._saved_model.saved_model_schema_version = (
         constants.SAVED_MODEL_SCHEMA_VERSION)
 
     self._export_dir = export_dir
     if file_io.file_exists(export_dir):
-      if overwrite:
-        file_io.delete_recursively(export_dir)
-      else:
-        raise AssertionError(
-            "Export directory already exists. Please specify a different export "
-            "directory: %s or change overwrite flag to `True`" % export_dir)
+      raise AssertionError(
+          "Export directory already exists. Please specify a different export "
+          "directory: %s" % export_dir)
 
     file_io.recursive_create_dir(self._export_dir)
 
-- 
GitLab


From 5fc14e22172722a115a282cbde8c4770e305aef5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 12:48:33 -0800
Subject: [PATCH 0183/1563] Fix layers_test exception regex matching. Change:
 152422855

---
 tensorflow/contrib/layers/python/layers/layers_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index 4cdc8ca005..ee4ebf2c43 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -1486,7 +1486,7 @@ class PartialFlattenTest(test.TestCase):
     inputs = sparse_tensor.SparseTensor(indices, values, shape)
 
     with self.assertRaisesRegexp(ValueError,
-                                 'inputs has rank less than new_rank'):
+                                 'Inputs has rank less than new_rank'):
       _layers._inner_flatten(inputs, new_rank)
 
 
-- 
GitLab


From 025d6021cff3356497b7a33e4ea4f77e57b700ba Mon Sep 17 00:00:00 2001
From: "Joshua V. Dillon" <jvdillon@google.com>
Date: Thu, 6 Apr 2017 13:00:11 -0800
Subject: [PATCH 0184/1563] Unhide bijectors. Correct TransformedDistribution
 docstring. Change: 152424418

---
 .../kernel_tests/stochastic_tensor_test.py    | 40 +++++-----
 tensorflow/contrib/distributions/__init__.py  | 13 ++--
 .../bijectors/affine_linear_operator_test.py  |  8 +-
 .../kernel_tests/bijectors/affine_test.py     | 74 +++++++++---------
 .../kernel_tests/bijectors/bijector_test.py   |  8 +-
 .../kernel_tests/bijectors/chain_test.py      | 25 +++---
 .../bijectors/cholesky_outer_product_test.py  |  4 +-
 .../bijectors/conditional_bijector_test.py    |  4 +-
 .../python/kernel_tests/bijectors/exp_test.py | 15 ++--
 .../kernel_tests/bijectors/identity_test.py   | 10 +--
 .../kernel_tests/bijectors/inline_test.py     | 10 +--
 .../kernel_tests/bijectors/invert_test.py     |  4 +-
 .../bijectors/power_transform_test.py         | 15 ++--
 .../bijectors/sigmoid_centered_test.py        |  4 +-
 .../kernel_tests/bijectors/sigmoid_test.py    | 21 +++--
 .../bijectors/softmax_centered_test.py        | 16 ++--
 .../kernel_tests/bijectors/softplus_test.py   | 25 +++---
 ...nditional_transformed_distribution_test.py |  4 +-
 .../python/ops/bijectors/__init__.py          |  4 +
 .../python/ops/relaxed_bernoulli.py           |  6 +-
 .../python/ops/transformed_distribution.py    | 76 ++++++-------------
 .../python/ops/vector_student_t.py            |  2 +-
 22 files changed, 186 insertions(+), 202 deletions(-)

diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
index 81e40dbe5e..5ce64cbe3d 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
@@ -19,16 +19,16 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-from tensorflow.contrib import distributions as distributions_lib
+
 from tensorflow.contrib.bayesflow.python.ops import stochastic_gradient_estimators
 from tensorflow.contrib.bayesflow.python.ops import stochastic_tensor_impl
+from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
-distributions = distributions_lib
 sge = stochastic_gradient_estimators
 st = stochastic_tensor_impl
 
@@ -42,20 +42,20 @@ class StochasticTensorTest(test.TestCase):
       sigma2 = constant_op.constant([0.1, 0.2, 0.3])
 
       prior_default = st.StochasticTensor(
-          distributions.Normal(
+          normal.Normal(
               loc=mu, scale=sigma))
       self.assertTrue(isinstance(prior_default.value_type, st.SampleValue))
       prior_0 = st.StochasticTensor(
-          distributions.Normal(
+          normal.Normal(
               loc=mu, scale=sigma),
           dist_value_type=st.SampleValue())
       self.assertTrue(isinstance(prior_0.value_type, st.SampleValue))
 
       with st.value_type(st.SampleValue()):
-        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.SampleValue))
         likelihood = st.StochasticTensor(
-            distributions.Normal(
+            normal.Normal(
                 loc=prior, scale=sigma2))
         self.assertTrue(isinstance(likelihood.value_type, st.SampleValue))
 
@@ -85,7 +85,7 @@ class StochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
 
       with st.value_type(st.MeanValue()):
-        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.MeanValue))
 
       prior_mean = prior.mean()
@@ -102,7 +102,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue()):
         prior_single = st.StochasticTensor(
-            distributions.Normal(
+            normal.Normal(
                 loc=mu, scale=sigma))
 
       prior_single_value = prior_single.value()
@@ -113,7 +113,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(1)):
         prior_single = st.StochasticTensor(
-            distributions.Normal(
+            normal.Normal(
                 loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior_single.value_type, st.SampleValue))
 
@@ -125,7 +125,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(2)):
         prior_double = st.StochasticTensor(
-            distributions.Normal(
+            normal.Normal(
                 loc=mu, scale=sigma))
 
       prior_double_value = prior_double.value()
@@ -139,10 +139,10 @@ class StochasticTensorTest(test.TestCase):
       mu = [0.0, -1.0, 1.0]
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       with st.value_type(st.MeanValue()):
-        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
         entropy = prior.entropy()
         deep_entropy = prior.distribution.entropy()
-        expected_deep_entropy = distributions.Normal(
+        expected_deep_entropy = normal.Normal(
             loc=mu, scale=sigma).entropy()
         entropies = sess.run([entropy, deep_entropy, expected_deep_entropy])
         self.assertAllEqual(entropies[2], entropies[0])
@@ -155,7 +155,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With default
       with st.value_type(st.MeanValue(stop_gradient=True)):
-        dt = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        dt = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
       loss = dt.loss([constant_op.constant(2.0)])
       self.assertTrue(loss is not None)
       self.assertAllClose(
@@ -163,7 +163,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With passed-in loss_fn.
       dt = st.StochasticTensor(
-          distributions.Normal(
+          normal.Normal(
               loc=mu, scale=sigma),
           dist_value_type=st.MeanValue(stop_gradient=True),
           loss_fn=sge.get_score_function_with_constant_baseline(
@@ -199,7 +199,7 @@ class ObservedStochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       obs = array_ops.zeros((2, 3))
       z = st.ObservedStochasticTensor(
-          distributions.Normal(
+          normal.Normal(
               loc=mu, scale=sigma), value=obs)
       [obs_val, z_val] = sess.run([obs, z.value()])
       self.assertAllEqual(obs_val, z_val)
@@ -212,14 +212,14 @@ class ObservedStochasticTensorTest(test.TestCase):
     sigma = array_ops.placeholder(dtypes.float32)
     obs = array_ops.placeholder(dtypes.float32)
     z = st.ObservedStochasticTensor(
-        distributions.Normal(
+        normal.Normal(
             loc=mu, scale=sigma), value=obs)
 
     mu2 = array_ops.placeholder(dtypes.float32, shape=[None])
     sigma2 = array_ops.placeholder(dtypes.float32, shape=[None])
     obs2 = array_ops.placeholder(dtypes.float32, shape=[None, None])
     z2 = st.ObservedStochasticTensor(
-        distributions.Normal(
+        normal.Normal(
             loc=mu2, scale=sigma2), value=obs2)
 
     coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
@@ -231,19 +231,19 @@ class ObservedStochasticTensorTest(test.TestCase):
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
+        normal.Normal(
             loc=mu, scale=sigma),
         value=array_ops.zeros((3,)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
+        normal.Normal(
             loc=mu, scale=sigma),
         value=array_ops.zeros((3, 1)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
+        normal.Normal(
             loc=mu, scale=sigma),
         value=array_ops.zeros(
             (1, 2), dtype=dtypes.int32))
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 470b9edb79..257aefa857 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -90,10 +90,9 @@ from __future__ import print_function
 
 # pylint: disable=unused-import,wildcard-import,line-too-long,g-importing-member
 
-
+from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops.bernoulli import *
 from tensorflow.contrib.distributions.python.ops.beta import *
-from tensorflow.contrib.distributions.python.ops.bijectors import *
 from tensorflow.contrib.distributions.python.ops.binomial import *
 from tensorflow.contrib.distributions.python.ops.categorical import *
 from tensorflow.contrib.distributions.python.ops.chi2 import *
@@ -135,8 +134,12 @@ from tensorflow.contrib.distributions.python.ops.wishart import *
 
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = ['ConditionalDistribution',
-                    'ConditionalTransformedDistribution',
-                    'FULLY_REPARAMETERIZED', 'NOT_REPARAMETERIZED']
+_allowed_symbols = [
+    'bijectors',
+    'ConditionalDistribution',
+    'ConditionalTransformedDistribution',
+    'FULLY_REPARAMETERIZED',
+    'NOT_REPARAMETERIZED',
+]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
index d4f83567e4..0738754b21 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.contrib import linalg
-from tensorflow.contrib.distributions.python.ops.bijectors import affine_linear_operator as affine_linear_operator_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.affine_linear_operator import AffineLinearOperator
 from tensorflow.python.platform import test
 
 
@@ -29,7 +29,7 @@ class AffineLinearOperatorTest(test.TestCase):
 
   def testIdentity(self):
     with self.test_session():
-      affine = affine_linear_operator_lib.AffineLinearOperator(
+      affine = AffineLinearOperator(
           validate_args=True)
       x = np.array([[1, 0, -1], [2, 3, 4]], dtype=np.float32)
       y = x
@@ -48,7 +48,7 @@ class AffineLinearOperatorTest(test.TestCase):
       diag = np.array([[1, 2, 3],
                        [2, 5, 6]], dtype=np.float32)
       scale = linalg.LinearOperatorDiag(diag, is_non_singular=True)
-      affine = affine_linear_operator_lib.AffineLinearOperator(
+      affine = AffineLinearOperator(
           shift=shift, scale=scale, validate_args=True)
 
       x = np.array([[1, 0, -1], [2, 3, 4]], dtype=np.float32)
@@ -73,7 +73,7 @@ class AffineLinearOperatorTest(test.TestCase):
                         [4, 3, 2]]],
                       dtype=np.float32)
       scale = linalg.LinearOperatorTriL(tril, is_non_singular=True)
-      affine = affine_linear_operator_lib.AffineLinearOperator(
+      affine = AffineLinearOperator(
           shift=shift, scale=scale, validate_args=True)
 
       x = np.array([[[1, 0, -1],
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
index 71460a1769..295e64a0d8 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
@@ -22,8 +22,8 @@ import itertools
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import affine as affine_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors.affine import Affine
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -36,7 +36,7 @@ class AffineBijectorTest(test.TestCase):
     with self.test_session():
       mu = -1.
       # scale corresponds to 1.
-      bijector = affine_lib.Affine(shift=mu, event_ndims=0)
+      bijector = Affine(shift=mu, event_ndims=0)
       self.assertEqual("affine", bijector.name)
 
   def testNoBatchScalarViaIdentity(self):
@@ -53,7 +53,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu, scale_identity_multiplier=2., event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 2, 3]  # Three scalar samples (no batches).
@@ -76,7 +76,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[2.], event_ndims=0)
+        bijector = Affine(shift=mu, scale_diag=[2.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 2, 3]  # Three scalar samples (no batches).
         self.assertAllClose([1., 3, 5], run(bijector.forward, x))
@@ -98,7 +98,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2.
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu, scale_identity_multiplier=2., event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [[1., 2, 3], [4, 5, 6]]  # Weird sample shape.
@@ -126,7 +126,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1.]
         # One batch, scalar.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, event_ndims=0)
+        bijector = Affine(shift=mu, event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1.]  # One sample from one batches.
         self.assertAllClose([2.], run(bijector.forward, x))
@@ -148,7 +148,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1.]
         # One batch, scalar.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[1.], event_ndims=0)
+        bijector = Affine(shift=mu, scale_diag=[1.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1.]  # One sample from one batches.
         self.assertAllClose([2.], run(bijector.forward, x))
@@ -170,7 +170,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Univariate, two batches.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, event_ndims=0)
+        bijector = Affine(shift=mu, event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 1]  # One sample from each of two batches.
         self.assertAllClose([2., 0], run(bijector.forward, x))
@@ -192,7 +192,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Univariate, two batches.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[1.], event_ndims=0)
+        bijector = Affine(shift=mu, scale_diag=[1.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 1]  # One sample from each of two batches.
         self.assertAllClose([2., 0], run(bijector.forward, x))
@@ -214,7 +214,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Multivariate
         # Corresponds to scale = [[1., 0], [0, 1.]]
-        bijector = affine_lib.Affine(shift=mu)
+        bijector = Affine(shift=mu)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 1]
         # matmul(sigma, x) + shift
@@ -245,7 +245,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Multivariate
         # Corresponds to scale = [[2., 0], [0, 1.]]
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[2., 1])
+        bijector = Affine(shift=mu, scale_diag=[2., 1])
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 1]
         # matmul(sigma, x) + shift
@@ -287,7 +287,7 @@ class AffineBijectorTest(test.TestCase):
           event_ndims: event_ndims_value
       }
 
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu, scale_diag=scale_diag, event_ndims=event_ndims)
       self.assertEqual(1, sess.run(bijector.event_ndims, feed_dict))
       self.assertAllClose([[3., 1]], sess.run(bijector.forward(x), feed_dict))
@@ -311,7 +311,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [[1., -1]]
         # Corresponds to 1 2x2 matrix, with twos on the diagonal.
         scale = 2.
-        bijector = affine_lib.Affine(shift=mu, scale_identity_multiplier=scale)
+        bijector = Affine(shift=mu, scale_identity_multiplier=scale)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[[1., 1]]]
         self.assertAllClose([[[3., 1]]], run(bijector.forward, x))
@@ -334,7 +334,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [[1., -1]]
         # Corresponds to 1 2x2 matrix, with twos on the diagonal.
         scale_diag = [[2., 2]]
-        bijector = affine_lib.Affine(shift=mu, scale_diag=scale_diag)
+        bijector = Affine(shift=mu, scale_diag=scale_diag)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[[1., 1]]]
         self.assertAllClose([[[3., 1]]], run(bijector.forward, x))
@@ -361,7 +361,7 @@ class AffineBijectorTest(test.TestCase):
           event_ndims: event_ndims_value
       }
 
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu, scale_diag=scale_diag, event_ndims=event_ndims)
       self.assertEqual(1, sess.run(bijector.event_ndims, feed_dict))
       self.assertAllClose([[[3., 1]]], sess.run(bijector.forward(x), feed_dict))
@@ -384,7 +384,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=1.,
             scale_diag=[1.],
@@ -410,7 +410,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[2., 0], [2, 2]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=1.,
             scale_tril=[[1., 0], [2., 1]])
@@ -435,7 +435,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[2., 0], [2, 3]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu, scale_diag=[1., 2.], scale_tril=[[1., 0], [2., 1]])
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[1., 2]]  # One multivariate sample.
@@ -458,7 +458,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[3., 0], [2, 4]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=1.0,
             scale_diag=[1., 2.],
@@ -484,14 +484,14 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [0, 2, 0], [0, 0, 3]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=2.,
             scale_perturb_diag=[2., 1],
             scale_perturb_factor=[[2., 0],
                                   [0., 0],
                                   [0, 1]])
-        bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 2, 3])
+        bijector_ref = Affine(shift=mu, scale_diag=[10., 2, 3])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
@@ -522,14 +522,14 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [0, 3, 0], [0, 0, 5]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_diag=[2., 3, 4],
             scale_perturb_diag=[2., 1],
             scale_perturb_factor=[[2., 0],
                                   [0., 0],
                                   [0, 1]])
-        bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 3, 5])
+        bijector_ref = Affine(shift=mu, scale_diag=[10., 3, 5])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
@@ -559,7 +559,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [1, 3, 0], [2, 3, 5]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_tril=[[2., 0, 0],
                         [1, 3, 0],
@@ -568,7 +568,7 @@ class AffineBijectorTest(test.TestCase):
             scale_perturb_factor=[[2., 0],
                                   [0., 0],
                                   [0, 1]])
-        bijector_ref = affine_lib.Affine(
+        bijector_ref = Affine(
             shift=mu, scale_tril=[[10., 0, 0],
                                   [1, 3, 0],
                                   [2, 3, 5]])
@@ -601,12 +601,12 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[6, 0, 0], [1, 3, 0], [2, 3, 5]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_tril=[[2., 0, 0], [1, 3, 0], [2, 3, 4]],
             scale_perturb_diag=None,
             scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
-        bijector_ref = affine_lib.Affine(
+        bijector_ref = Affine(
             shift=mu, scale_tril=[[6., 0, 0], [1, 3, 0], [2, 3, 5]])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -626,7 +626,7 @@ class AffineBijectorTest(test.TestCase):
   def testNoBatchMultivariateRaisesWhenSingular(self):
     with self.test_session():
       mu = [1., -1]
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu,
           # Has zero on the diagonal.
           scale_diag=[0., 1],
@@ -638,14 +638,14 @@ class AffineBijectorTest(test.TestCase):
     with self.test_session():
       mu = [1., -1]
       # Scale corresponds to 2x2 identity matrix.
-      bijector = affine_lib.Affine(shift=mu, event_ndims=2, validate_args=True)
+      bijector = Affine(shift=mu, event_ndims=2, validate_args=True)
       bijector.forward([1., 1.]).eval()
 
   def testScaleZeroScalarRaises(self):
     with self.test_session():
       mu = -1.
       # Check Identity matrix with zero scaling.
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu,
           scale_identity_multiplier=0.0,
           event_ndims=0,
@@ -654,16 +654,16 @@ class AffineBijectorTest(test.TestCase):
         bijector.forward(1.).eval()
 
       # Check Diag matrix with zero scaling.
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu, scale_diag=[0.0], event_ndims=0, validate_args=True)
       with self.assertRaisesOpError("Condition x > 0"):
         bijector.forward(1.).eval()
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=3.6, scale_identity_multiplier=0.42, event_ndims=0)
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
   def _makeScale(self,
@@ -743,9 +743,9 @@ class AffineBijectorTest(test.TestCase):
         # We haven't specified enough information for the scale.
         if scale is None:
           with self.assertRaisesRegexp(ValueError, ("must be specified.")):
-            bijector = affine_lib.Affine(shift=shift, **bijector_args)
+            bijector = Affine(shift=shift, **bijector_args)
         else:
-          bijector = affine_lib.Affine(shift=shift, **bijector_args)
+          bijector = Affine(shift=shift, **bijector_args)
           np_x = x
           # For the case a vector is passed in, we need to make the shape
           # match the matrix for matmul to work.
@@ -823,7 +823,7 @@ class AffineBijectorTest(test.TestCase):
   def testScalePropertyAssertsCorrectly(self):
     with self.test_session():
       with self.assertRaises(NotImplementedError):
-        scale = affine_lib.Affine(  # pylint:disable=unused-variable
+        scale = Affine(  # pylint:disable=unused-variable
             scale_tril=[[1., 0], [2, 1]],
             scale_perturb_factor=[2., 1.]).scale
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
index 94f3bc959b..3ba6aa5293 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
@@ -22,7 +22,7 @@ import abc
 
 import six
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector as bijector_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector import Bijector
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
@@ -36,10 +36,10 @@ class BaseBijectorTest(test.TestCase):
       with self.assertRaisesRegexp(TypeError,
                                    ("Can't instantiate abstract class Bijector "
                                     "with abstract methods __init__")):
-        bijector_lib.Bijector()
+        Bijector()
 
   def testDefaults(self):
-    class _BareBonesBijector(bijector_lib.Bijector):
+    class _BareBonesBijector(Bijector):
       """Minimal specification of a `Bijector`."""
 
       def __init__(self):
@@ -80,7 +80,7 @@ class IntentionallyMissingError(Exception):
   pass
 
 
-class BrokenBijector(bijector_lib.Bijector):
+class BrokenBijector(Bijector):
   """Forward and inverse are not inverses of each other."""
 
   def __init__(self, forward_missing=False, inverse_missing=False):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
index ecf068bf6b..a647f963ed 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
@@ -20,11 +20,11 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import chain as chain_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import softmax_centered as softmax_centered_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import softplus as softplus_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.chain import Chain
+from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
+from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
+from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.platform import test
 
@@ -34,8 +34,7 @@ class ChainBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      chain = chain_lib.Chain((exp_lib.Exp(event_ndims=1),
-                               softplus_lib.Softplus(event_ndims=1)))
+      chain = Chain((Exp(event_ndims=1), Softplus(event_ndims=1)))
       self.assertEqual("chain_of_exp_of_softplus", chain.name)
       x = np.asarray([[[1., 2.],
                        [2., 3.]]])
@@ -49,7 +48,7 @@ class ChainBijectorTest(test.TestCase):
 
   def testBijectorIdentity(self):
     with self.test_session():
-      chain = chain_lib.Chain()
+      chain = Chain()
       self.assertEqual("identity", chain.name)
       x = np.asarray([[[1., 2.],
                        [2., 3.]]])
@@ -60,16 +59,16 @@ class ChainBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = chain_lib.Chain((exp_lib.Exp(), softplus_lib.Softplus()))
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Chain((Exp(), Softplus()))
+      assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
     with self.test_session():
-      bijector = chain_lib.Chain([
-          softmax_centered_lib.SoftmaxCentered(
+      bijector = Chain([
+          SoftmaxCentered(
               event_ndims=1, validate_args=True),
-          softmax_centered_lib.SoftmaxCentered(
+          SoftmaxCentered(
               event_ndims=0, validate_args=True)])
       x = tensor_shape.TensorShape([])
       y = tensor_shape.TensorShape([2 + 1])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
index 7b09553be9..267e4ad350 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -57,7 +57,7 @@ class InvertBijectorTest(test.TestCase):
   def testScalarCongruency(self):
     with self.test_session():
       bijector = bijectors.Invert(bijectors.Exp())
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
index 9c2a1c8f91..26e0d2a539 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
@@ -18,12 +18,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import conditional_bijector
+from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import ConditionalBijector
 from tensorflow.python.framework import dtypes
 from tensorflow.python.platform import test
 
 
-class _TestBijector(conditional_bijector.ConditionalBijector):
+class _TestBijector(ConditionalBijector):
 
   def __init__(self):
     super(_TestBijector, self).__init__(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
index 04ddf09b69..c30ce60cac 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
@@ -20,8 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
 from tensorflow.python.platform import test
 
 
@@ -30,7 +31,7 @@ class ExpBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      bijector = exp_lib.Exp(event_ndims=1)
+      bijector = Exp(event_ndims=1)
       self.assertEqual("exp", bijector.name)
       x = [[[1.], [2.]]]
       y = np.exp(x)
@@ -44,16 +45,16 @@ class ExpBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = exp_lib.Exp()
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Exp()
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=1.5, rtol=0.05)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      bijector = exp_lib.Exp(event_ndims=0)
+      bijector = Exp(event_ndims=0)
       x = np.linspace(-10, 10, num=10).astype(np.float32)
       y = np.logspace(-10, 10, num=10).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(bijector, x, y)
+      assert_bijective_and_finite(bijector, x, y)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
index f6aabe0d63..0969c293d4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import identity as identity_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
 from tensorflow.python.platform import test
 
 
@@ -28,7 +28,7 @@ class IdentityBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      bijector = identity_lib.Identity()
+      bijector = Identity()
       self.assertEqual("identity", bijector.name)
       x = [[[0.], [1.]]]
       self.assertAllEqual(x, bijector.forward(x).eval())
@@ -38,8 +38,8 @@ class IdentityBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = identity_lib.Identity()
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Identity()
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
index c17c67c6f5..739fa6d439 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import inline as inline_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
+from tensorflow.contrib.distributions.python.ops.bijectors.inline import Inline
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -33,8 +33,8 @@ class InlineBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      exp = exp_lib.Exp(event_ndims=1)
-      inline = inline_lib.Inline(
+      exp = Exp(event_ndims=1)
+      inline = Inline(
           forward_fn=math_ops.exp,
           inverse_fn=math_ops.log,
           inverse_log_det_jacobian_fn=(
@@ -57,7 +57,7 @@ class InlineBijectorTest(test.TestCase):
 
   def testShapeGetters(self):
     with self.test_session():
-      bijector = inline_lib.Inline(
+      bijector = Inline(
           forward_event_shape_tensor_fn=lambda x: array_ops.concat((x, [1]), 0),
           forward_event_shape_fn=lambda x: x.as_list() + [1],
           inverse_event_shape_tensor_fn=lambda x: x[:-1],
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
index 7b09553be9..267e4ad350 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -57,7 +57,7 @@ class InvertBijectorTest(test.TestCase):
   def testScalarCongruency(self):
     with self.test_session():
       bijector = bijectors.Invert(bijectors.Exp())
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
index e95bbdf67e..b30a3b599b 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
@@ -20,8 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import power_transform as power_transform_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.power_transform import PowerTransform
 from tensorflow.python.platform import test
 
 
@@ -31,7 +32,7 @@ class PowerTransformBijectorTest(test.TestCase):
   def testBijector(self):
     with self.test_session():
       c = 0.2
-      bijector = power_transform_lib.PowerTransform(
+      bijector = PowerTransform(
           power=c, event_ndims=1, validate_args=True)
       self.assertEqual("power_transform", bijector.name)
       x = np.array([[[-1.], [2.], [-5. + 1e-4]]])
@@ -49,18 +50,18 @@ class PowerTransformBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = power_transform_lib.PowerTransform(
+      bijector = PowerTransform(
           power=0.2, validate_args=True)
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=1.5, rtol=0.05)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      bijector = power_transform_lib.PowerTransform(
+      bijector = PowerTransform(
           power=0.2, event_ndims=0, validate_args=True)
       x = np.linspace(-4.999, 10, num=10).astype(np.float32)
       y = np.logspace(0.001, 10, num=10).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(bijector, x, y, rtol=1e-3)
+      assert_bijective_and_finite(bijector, x, y, rtol=1e-3)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
index 8884da146d..4ff3f334cc 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid_centered as sigmoid_centered_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid_centered import SigmoidCentered
 from tensorflow.python.platform import test
 
 
@@ -29,7 +29,7 @@ class SigmoidCenteredBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      sigmoid = sigmoid_centered_lib.SigmoidCentered()
+      sigmoid = SigmoidCentered()
       self.assertEqual("sigmoid_centered", sigmoid.name)
       x = np.log([[2., 3, 4],
                   [4., 8, 12]])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
index e16f9dff22..9a96b91c6d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
@@ -21,8 +21,9 @@ from __future__ import print_function
 import numpy as np
 from scipy import special
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
 from tensorflow.python.platform import test
 
 
@@ -31,35 +32,33 @@ class SigmoidBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      self.assertEqual("sigmoid", sigmoid.Sigmoid().name)
+      self.assertEqual("sigmoid", Sigmoid().name)
       x = np.linspace(-10., 10., 100).reshape([2, 5, 10]).astype(np.float32)
       y = special.expit(x)
       ildj = -np.log(y) - np.log1p(-y)
       self.assertAllClose(
-          y, sigmoid.Sigmoid().forward(x).eval(),
+          y, Sigmoid().forward(x).eval(),
           atol=0., rtol=1e-2)
       self.assertAllClose(
-          x, sigmoid.Sigmoid().inverse(y).eval(),
+          x, Sigmoid().inverse(y).eval(),
           atol=0., rtol=1e-4)
       self.assertAllClose(
-          ildj, sigmoid.Sigmoid().inverse_log_det_jacobian(y).eval(),
+          ildj, Sigmoid().inverse_log_det_jacobian(y).eval(),
           atol=0., rtol=1e-6)
       self.assertAllClose(
-          -ildj, sigmoid.Sigmoid().forward_log_det_jacobian(x).eval(),
+          -ildj, Sigmoid().forward_log_det_jacobian(x).eval(),
           atol=0., rtol=1e-4)
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector_test_util.assert_scalar_congruency(
-          sigmoid.Sigmoid(), lower_x=-7., upper_x=7.)
+      assert_scalar_congruency(Sigmoid(), lower_x=-7., upper_x=7.)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
       x = np.linspace(-7., 7., 100).astype(np.float32)
       eps = 1e-3
       y = np.linspace(eps, 1. - eps, 100).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(
-          sigmoid.Sigmoid(), x, y, atol=0., rtol=1e-4)
+      assert_bijective_and_finite(Sigmoid(), x, y, atol=0., rtol=1e-4)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
index 97df62ec05..173d52686d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import softmax_centered as softmax_centered_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.platform import test
 
@@ -34,7 +34,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectorScalar(self):
     with self.test_session():
-      softmax = softmax_centered_lib.SoftmaxCentered()  # scalar by default
+      softmax = SoftmaxCentered()  # scalar by default
       self.assertEqual("softmax_centered", softmax.name)
       x = np.log([[2., 3, 4],
                   [4., 8, 12]])
@@ -59,7 +59,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectorVector(self):
     with self.test_session():
-      softmax = softmax_centered_lib.SoftmaxCentered(event_ndims=1)
+      softmax = SoftmaxCentered(event_ndims=1)
       self.assertEqual("softmax_centered", softmax.name)
       x = np.log([[2., 3, 4], [4., 8, 12]])
       y = [[0.2, 0.3, 0.4, 0.1], [0.16, 0.32, 0.48, 0.04]]
@@ -80,11 +80,11 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
     with self.test_session():
       for x, y, b in ((tensor_shape.TensorShape([]),
                        tensor_shape.TensorShape([2]),
-                       softmax_centered_lib.SoftmaxCentered(
+                       SoftmaxCentered(
                            event_ndims=0, validate_args=True)),
                       (tensor_shape.TensorShape([4]),
                        tensor_shape.TensorShape([5]),
-                       softmax_centered_lib.SoftmaxCentered(
+                       SoftmaxCentered(
                            event_ndims=1, validate_args=True))):
         self.assertAllEqual(y, b.forward_event_shape(x))
         self.assertAllEqual(y.as_list(),
@@ -95,7 +95,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      softmax = softmax_centered_lib.SoftmaxCentered(event_ndims=1)
+      softmax = SoftmaxCentered(event_ndims=1)
       x = np.linspace(-50, 50, num=10).reshape(5, 2).astype(np.float32)
       # Make y values on the simplex with a wide range.
       y_0 = np.ones(5).astype(np.float32)
@@ -104,7 +104,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
       y = np.array([y_0, y_1, y_2])
       y /= y.sum(axis=0)
       y = y.T  # y.shape = [5, 3]
-      bijector_test_util.assert_bijective_and_finite(softmax, x, y)
+      assert_bijective_and_finite(softmax, x, y)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
index a7db1dcc6c..2c58519fda 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
@@ -20,8 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import softplus as softplus_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
 from tensorflow.python.platform import test
 
 rng = np.random.RandomState(42)
@@ -42,7 +43,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorForwardInverseEventDimsZero(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       self.assertEqual("softplus", bijector.name)
       x = 2 * rng.randn(2, 10)
       y = self._softplus(x)
@@ -52,7 +53,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorLogDetJacobianEventDimsZero(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       y = 2 * rng.rand(2, 10)
       # No reduction needed if event_dims = 0.
       ildj = self._softplus_ildj_before_reduction(y)
@@ -61,7 +62,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorForwardInverseEventDimsOne(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=1)
+      bijector = Softplus(event_ndims=1)
       self.assertEqual("softplus", bijector.name)
       x = 2 * rng.randn(2, 10)
       y = self._softplus(x)
@@ -71,7 +72,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorLogDetJacobianEventDimsOne(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=1)
+      bijector = Softplus(event_ndims=1)
       y = 2 * rng.rand(2, 10)
       ildj_before = self._softplus_ildj_before_reduction(y)
       ildj = np.sum(ildj_before, axis=1)
@@ -80,28 +81,28 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Softplus(event_ndims=0)
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
   def testBijectiveAndFinite32bit(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       x = np.linspace(-20., 20., 100).astype(np.float32)
       y = np.logspace(-10, 10, 100).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(
+      assert_bijective_and_finite(
           bijector, x, y, rtol=1e-2, atol=1e-2)
 
   def testBijectiveAndFinite16bit(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       # softplus(-20) is zero, so we can't use such a large range as in 32bit.
       x = np.linspace(-10., 20., 100).astype(np.float16)
       # Note that float16 is only in the open set (0, inf) for a smaller
       # logspace range.  The actual range was (-7, 4), so use something smaller
       # for the test.
       y = np.logspace(-6, 3, 100).astype(np.float16)
-      bijector_test_util.assert_bijective_and_finite(
+      assert_bijective_and_finite(
           bijector, x, y, rtol=1e-1, atol=1e-3)
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py b/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
index eacdfd9ccc..545471907f 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
@@ -22,7 +22,7 @@ import numpy as np
 
 from tensorflow.contrib import distributions
 from tensorflow.contrib.distributions.python.kernel_tests import transformed_distribution_test
-from tensorflow.contrib.distributions.python.ops.bijectors import conditional_bijector
+from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import ConditionalBijector
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -32,7 +32,7 @@ from tensorflow.python.platform import test
 ds = distributions
 
 
-class _ChooseLocation(conditional_bijector.ConditionalBijector):
+class _ChooseLocation(ConditionalBijector):
   """A Bijector which chooses between one of two location parameters."""
 
   def __init__(self, loc, name="ChooseLocation"):
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
index 2e83ed6e41..40fcb36769 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
@@ -56,3 +56,7 @@ from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered impo
 from tensorflow.contrib.distributions.python.ops.bijectors.softplus import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
+
+from tensorflow.python.util.all_util import remove_undocumented
+
+remove_undocumented(__name__)
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
index 7fee2e1f3a..af675787b1 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
@@ -21,7 +21,9 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import logistic
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
-from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid as sigmoid_lib
+# Bijectors must be directly imported because `remove_undocumented` prevents
+# individual file imports.
+from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -176,7 +178,7 @@ class RelaxedBernoulli(transformed_distribution.TransformedDistribution):
                                          validate_args=validate_args,
                                          allow_nan_stats=allow_nan_stats,
                                          name=name + "/Logistic"),
-          bijector=sigmoid_lib.Sigmoid(validate_args=validate_args),
+          bijector=Sigmoid(validate_args=validate_args),
           validate_args=validate_args,
           name=name)
     self._parameters = parameters
diff --git a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
index 844f78ca96..1403adbda2 100644
--- a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
@@ -19,9 +19,11 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution as distributions
+from tensorflow.contrib.distributions.python.ops import distribution as distribution_lib
 from tensorflow.contrib.distributions.python.ops import distribution_util
-from tensorflow.contrib.distributions.python.ops.bijectors import identity as identity_lib
+# Bijectors must be directly imported because `remove_undocumented` prevents
+# individual file imports.
+from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -119,7 +121,7 @@ def _is_scalar_from_shape(shape):
   return _logical_equal(_ndims_from_shape(shape), 0)
 
 
-class TransformedDistribution(distributions.Distribution):
+class TransformedDistribution(distribution_lib.Distribution):
   """A Transformed Distribution.
 
   A `TransformedDistribution` models `p(y)` given a base distribution `p(x)`,
@@ -146,49 +148,19 @@ class TransformedDistribution(distributions.Distribution):
 
   A `TransformedDistribution` implements the following operations:
 
-    * `sample`:
+    * `sample`
+      Mathematically:   `Y = g(X)`
+      Programmatically: `bijector.forward(distribution.sample(...))`
 
-      Mathematically:
+    * `log_prob`
+      Mathematically:   `(log o pdf)(Y=y) = (log o pdf o g^{-1})(y)
+                         + (log o abs o det o J o g^{-1})(y)`
+      Programmatically: `(distribution.log_prob(bijector.inverse(y))
+                         + bijector.inverse_log_det_jacobian(y))`
 
-      ```none
-      Y = g(X)
-      ```
-
-      Programmatically:
-
-      ```python
-      return bijector.forward(distribution.sample(...))
-      ```
-
-    * `log_prob`:
-
-      Mathematically:
-
-      ```none
-      (log o pdf)(Y=y) = (log o pdf o g^{-1})(y) +
-                           (log o abs o det o J o g^{-1})(y)
-      ```
-
-      Programmatically:
-
-      ```python
-      return (distribution.log_prob(bijector.inverse(y)) +
-              bijector.inverse_log_det_jacobian(y))
-      ```
-
-    * `log_cdf`:
-
-      Mathematically:
-
-      ```none
-      (log o cdf)(Y=y) = (log o cdf o g^{-1})(y)
-      ```
-
-      Programmatically:
-
-      ```python
-      return distribution.log_cdf(bijector.inverse(x))
-      ```
+    * `log_cdf`
+      Mathematically:   `(log o cdf)(Y=y) = (log o cdf o g^{-1})(y)`
+      Programmatically: `distribution.log_cdf(bijector.inverse(x))`
 
     * and similarly for: `cdf`, `prob`, `log_survival_function`,
      `survival_function`.
@@ -199,7 +171,7 @@ class TransformedDistribution(distributions.Distribution):
   ```python
   ds = tf.contrib.distributions
   log_normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=mu, scale=sigma),
+    distribution=ds.Normal(loc=0., scale=1.),
     bijector=ds.bijectors.Exp(),
     name="LogNormalTransformedDistribution")
   ```
@@ -209,7 +181,7 @@ class TransformedDistribution(distributions.Distribution):
   ```python
   ds = tf.contrib.distributions
   log_normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=mu, scale=sigma),
+    distribution=ds.Normal(loc=0., scale=1.),
     bijector=ds.bijectors.Inline(
       forward_fn=tf.exp,
       inverse_fn=tf.log,
@@ -223,8 +195,11 @@ class TransformedDistribution(distributions.Distribution):
   ```python
   ds = tf.contrib.distributions
   normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=0, scale=1),
-    bijector=ds.bijectors.ScaleAndShift(loc=mu, scale=sigma, event_ndims=0),
+    distribution=ds.Normal(loc=0., scale=1.),
+    bijector=ds.bijectors.Affine(
+      shift=-1.,
+      scale_identity_multiplier=2.,
+      event_ndims=0),
     name="NormalTransformedDistribution")
   ```
 
@@ -237,7 +212,6 @@ class TransformedDistribution(distributions.Distribution):
   multivariate Normal as a `TransformedDistribution`.
 
   ```python
-  bs = tf.contrib.distributions.bijector
   ds = tf.contrib.distributions
   # We will create two MVNs with batch_shape = event_shape = 2.
   mean = [[-1., 0],      # batch:0
@@ -248,7 +222,7 @@ class TransformedDistribution(distributions.Distribution):
                [2, 2]]]  # batch:1
   mvn1 = ds.TransformedDistribution(
       distribution=ds.Normal(loc=0., scale=1.),
-      bijector=bs.Affine(shift=mean, tril=chol_cov),
+      bijector=ds.bijectors.Affine(shift=mean, scale_tril=chol_cov),
       batch_shape=[2],  # Valid because base_distribution.batch_shape == [].
       event_shape=[2])  # Valid because base_distribution.event_shape == [].
   mvn2 = ds.MultivariateNormalTriL(loc=mean, scale_tril=chol_cov)
@@ -291,7 +265,7 @@ class TransformedDistribution(distributions.Distribution):
       self._empty = constant_op.constant([], dtype=dtypes.int32, name="empty")
 
       if bijector is None:
-        bijector = identity_lib.Identity(validate_args=validate_args)
+        bijector = Identity(validate_args=validate_args)
 
       # We will keep track of a static and dynamic version of
       # self._is_{batch,event}_override. This way we can do more prior to graph
diff --git a/tensorflow/contrib/distributions/python/ops/vector_student_t.py b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
index 2f4b33b7e7..8d680ab27a 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
@@ -191,7 +191,7 @@ class _VectorStudentT(transformed_distribution.TransformedDistribution):
   ```
 
   For more examples of how to construct the `scale` matrix, see the
-  `bijectors.Affine` docstring.
+  `tf.contrib.distributions.bijectors.Affine` docstring.
 
   """
 
-- 
GitLab


From f8dce81aeaff40dc78d398741854ad8766806f91 Mon Sep 17 00:00:00 2001
From: Guenther Schmuelling <guschmue@microsoft.com>
Date: Thu, 6 Apr 2017 15:31:08 -0700
Subject: [PATCH 0185/1563] fix windows gpu build by disabling nccl which
 currently will not (#9005)

compile/work on windows
---
 tensorflow/contrib/cmake/tf_core_kernels.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index 0663ba1637..36bcf50b06 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -102,6 +102,10 @@ if(WIN32)
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/lstm_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/gru_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/lstm_ops.cc"
+      # temporarily disable nccl (nccl itself needs to be ported to windows first)
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_manager.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_ops.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/ops/nccl_ops.cc"
   )
   list(REMOVE_ITEM tf_core_kernels_srcs ${tf_core_kernels_windows_exclude_srcs})
 endif(WIN32)
-- 
GitLab


From e47421946abee9a5afc184e6f9d3d1cfc67c8589 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 14:55:42 -0800
Subject: [PATCH 0186/1563] Choosing a saner default for min_eval_frequency in
 the constructor for Experiment for the GCS file system, because the default
 of 1 causes performance problems. Change: 152439984

---
 .../contrib/learn/python/learn/experiment.py  | 15 +++++++++--
 .../learn/python/learn/experiment_test.py     | 27 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index cecc24c17d..e3bcd68291 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -76,7 +76,7 @@ class Experiment(object):
                local_eval_frequency=None,
                eval_delay_secs=120,
                continuous_eval_throttle_secs=60,
-               min_eval_frequency=1,
+               min_eval_frequency=None,
                delay_workers_by_global_step=False,
                export_strategies=None,
                train_steps_per_iteration=None):
@@ -116,6 +116,8 @@ class Experiment(object):
       min_eval_frequency: (applies only to train_and_evaluate). the minimum
         number of steps between evaluations. Of course, evaluation does not
         occur if no new snapshot is available, hence, this is the minimum.
+        If None, defaults to 1, unless model_dir is on GCS, in which case the
+        default is 1000.
       delay_workers_by_global_step: if `True` delays training workers
         based on global step instead of time.
       export_strategies: A list of `ExportStrategy`s, or a single one, or None.
@@ -156,7 +158,12 @@ class Experiment(object):
     self._local_eval_frequency = local_eval_frequency
     self._eval_delay_secs = eval_delay_secs
     self._continuous_eval_throttle_secs = continuous_eval_throttle_secs
-    self._min_eval_frequency = min_eval_frequency
+    # Using 1 on a non-cached file system requires a lot of overhead to
+    # read the checkpoint state file. This is particular bad on GCS, so
+    # we use a different default. This is a temporary band-aid, to be
+    # fixed holistically later (b/36498507).
+    default_min_eval_frequency = 1000 if _is_gcs(estimator.model_dir) else 1
+    self._min_eval_frequency = min_eval_frequency or default_min_eval_frequency
     self._delay_workers_by_global_step = delay_workers_by_global_step
     self._train_monitors = train_monitors[:] if train_monitors else []
     self._eval_hooks = eval_hooks[:] if eval_hooks else []
@@ -695,3 +702,7 @@ def _new_attr_context(obj, attr):
     yield
   finally:
     setattr(obj, attr, saved)
+
+
+def _is_gcs(model_dir):
+  return model_dir and model_dir.startswith("gs://")
diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index 00ed062b0a..f4b4994fb1 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -174,7 +174,7 @@ class ExperimentTest(test.TestCase):
     return [TestEstimator(config=config, eval_dict=eval_dict),
             TestCoreEstimator(config=config, eval_dict=eval_dict)]
 
-  def test_eval_metrcis_for_core_estimator(self):
+  def test_eval_metrics_for_core_estimator(self):
     est = TestCoreEstimator()
     with self.assertRaisesRegexp(
         ValueError, '`eval_metrics` must be `None`'):
@@ -546,6 +546,31 @@ class ExperimentTest(test.TestCase):
       self.assertEqual([noop_hook], est.eval_hooks)
       self.assertTrue(isinstance(est.monitors[0], monitors.ValidationMonitor))
 
+  def test_min_eval_frequency_defaults(self):
+    def dummy_model_fn(features, labels):  # pylint: disable=unused-argument
+      pass
+
+    # The default value when model_dir is on GCS is 1000
+    estimator = core_estimator.Estimator(dummy_model_fn, 'gs://dummy_bucket')
+    ex = experiment.Experiment(
+        estimator, train_input_fn=None, eval_input_fn=None)
+    self.assertEquals(ex._min_eval_frequency, 1000)
+
+    # The default value when model_dir is not on GCS is 1
+    estimator = core_estimator.Estimator(dummy_model_fn, '/tmp/dummy')
+    ex = experiment.Experiment(
+        estimator, train_input_fn=None, eval_input_fn=None)
+    self.assertEquals(ex._min_eval_frequency, 1)
+
+    # Make sure default not used when explicitly set
+    estimator = core_estimator.Estimator(dummy_model_fn, 'gs://dummy_bucket')
+    ex = experiment.Experiment(
+        estimator,
+        min_eval_frequency=123,
+        train_input_fn=None,
+        eval_input_fn=None)
+    self.assertEquals(ex._min_eval_frequency, 123)
+
   def test_continuous_train_and_eval(self):
     for est in self._estimators_for_tests(eval_dict={'global_step': 100}):
       eval_metrics = 'eval_metrics' if not isinstance(
-- 
GitLab


From 77c57961cc318efd9f0480e646fff3b84839150d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 15:13:56 -0800
Subject: [PATCH 0187/1563] Inherit use_resource from scope for partitioned
 variables. Change: 152442103

---
 tensorflow/python/ops/variable_scope.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index 19c5d3c3ea..b3745fa4e6 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -974,6 +974,8 @@ class VariableScope(object):
       partitioner = self._partitioner
     if dtype is None:
       dtype = self._dtype
+    if use_resource is None:
+      use_resource = self._use_resource
 
     if self._custom_getter is not None:
       raise ValueError(
-- 
GitLab


From d06ba60313bc121b4cba1277174b14e55e81938d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 15:46:52 -0800
Subject: [PATCH 0188/1563] Support quantized reshape in hexagon runtime
 Change: 152445539

---
 .../hexagon/hexagon_graph_execution_test.cc   | 113 ++++++++++++++----
 .../hexagon/hexagon_ops_definitions.cc        |   1 +
 2 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
index c5d5657492..a383cc8199 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
@@ -295,6 +295,83 @@ static void RunFusedGraph(const GraphDef& fused_graph_def) {
       reinterpret_cast<const float*>(output_tensor.flat<float>().data()));
 }
 
+static void CompareGraphTransferInfo(const GraphTransferInfo& gfi0,
+                                     const GraphTransferInfo& gfi1) {
+  LOG(INFO) << "(1) node count: " << gfi1.node_info_size() << ", "
+            << gfi1.const_node_info_size();
+
+  // 1. check node_info
+  ASSERT_EQ(gfi0.node_info_size(), gfi1.node_info_size());
+  for (int i = 0; i < gfi0.node_info_size(); ++i) {
+    const GraphTransferInfo::NodeInfo& ni0 = gfi0.node_info(i);
+    const GraphTransferInfo::NodeInfo& ni1 = gfi1.node_info(i);
+    EXPECT_EQ(ni0.DebugString(), ni1.DebugString());
+    EXPECT_EQ(ni0.ByteSize(), ni1.ByteSize());
+  }
+
+  // 2. check const_node_info
+  ASSERT_EQ(gfi0.const_node_info_size(), gfi1.const_node_info_size());
+  for (int i = 0; i < gfi0.const_node_info_size(); ++i) {
+    const GraphTransferInfo::ConstNodeInfo& cni0 = gfi0.const_node_info(i);
+    const GraphTransferInfo::ConstNodeInfo& cni1 = gfi1.const_node_info(i);
+    ASSERT_EQ(cni0.shape_size(), cni1.shape_size());
+    for (int j = 0; j < cni0.shape_size(); ++j) {
+      EXPECT_EQ(cni0.shape(j), cni1.shape(j));
+    }
+    EXPECT_EQ(cni0.ByteSize(), cni1.ByteSize());
+    EXPECT_EQ(cni0.DebugString(), cni1.DebugString());
+  }
+
+  // 3. check node_input_info
+  ASSERT_EQ(gfi0.node_input_info_size(), gfi1.node_input_info_size());
+  for (int i = 0; i < gfi0.node_input_info_size(); ++i) {
+    const GraphTransferInfo::NodeInputInfo& nii0 = gfi0.node_input_info(i);
+    const GraphTransferInfo::NodeInputInfo& nii1 = gfi1.node_input_info(i);
+    EXPECT_EQ(nii0.ByteSize(), nii1.ByteSize());
+    EXPECT_EQ(nii0.DebugString(), nii1.DebugString());
+  }
+
+  // 4. check node_output_info
+  ASSERT_EQ(gfi0.node_output_info_size(), gfi1.node_output_info_size());
+  for (int i = 0; i < gfi0.node_output_info_size(); ++i) {
+    const GraphTransferInfo::NodeOutputInfo& noi0 = gfi0.node_output_info(i);
+    const GraphTransferInfo::NodeOutputInfo& noi1 = gfi1.node_output_info(i);
+    ASSERT_EQ(noi0.max_byte_size_size(), noi1.max_byte_size_size());
+    for (int j = 0; j < noi0.max_byte_size_size(); ++j) {
+      EXPECT_EQ(noi0.max_byte_size(j), noi1.max_byte_size(j));
+    }
+    EXPECT_EQ(noi0.ByteSize(), noi1.ByteSize());
+    EXPECT_EQ(noi0.DebugString(), noi1.DebugString());
+  }
+
+  // 5. check graph_input_node_info
+  ASSERT_EQ(gfi0.graph_input_node_info_size(),
+            gfi1.graph_input_node_info_size());
+  for (int i = 0; i < gfi0.graph_input_node_info_size(); ++i) {
+    const GraphTransferInfo::GraphInputNodeInfo& gini0 =
+        gfi0.graph_input_node_info(i);
+    const GraphTransferInfo::GraphInputNodeInfo& gini1 =
+        gfi0.graph_input_node_info(i);
+    EXPECT_EQ(gini0.ByteSize(), gini1.ByteSize());
+    EXPECT_EQ(gini0.DebugString(), gini1.DebugString());
+  }
+
+  // 6. check graph_output_node_info
+  ASSERT_EQ(gfi0.graph_output_node_info_size(),
+            gfi1.graph_output_node_info_size());
+  for (int i = 0; i < gfi0.graph_output_node_info_size(); ++i) {
+    const GraphTransferInfo::GraphOutputNodeInfo& goni0 =
+        gfi0.graph_output_node_info(i);
+    const GraphTransferInfo::GraphOutputNodeInfo& goni1 =
+        gfi0.graph_output_node_info(i);
+    EXPECT_EQ(goni0.ByteSize(), goni1.ByteSize());
+    EXPECT_EQ(goni0.DebugString(), goni1.DebugString());
+  }
+
+  // 7. check destination
+  EXPECT_EQ(gfi0.destination(), gfi1.destination());
+}
+
 // CAVEAT: This test only runs when you specify hexagon library using
 // makefile.
 // CAVEAT: This test is disabled by default because hexagon can keep only
@@ -450,34 +527,22 @@ TEST(GraphTransferer, DISABLED_CheckShapeInferencePerformance) {
   prof1.Stop();
   prof1.DumpStatistics("Estiame shape by shape inference");
 
-  LOG(INFO) << "(1) node count: " << gfi1.node_info_size() << ", "
-            << gfi1.const_node_info_size();
+  CompareGraphTransferInfo(gfi0, gfi1);
 
-  ASSERT_EQ(gfi0.node_info_size(), gfi1.node_info_size());
+  const RemoteFusedGraphExecuteInfo ei0 =
+      BuildRemoteFusedGraphExecuteInfoWithGraphTransferInfo(gfi0);
+  const RemoteFusedGraphExecuteInfo ei1 =
+      BuildRemoteFusedGraphExecuteInfoWithGraphTransferInfo(gfi1);
 
-  ASSERT_EQ(gt0.GetGraphTransferInfo().const_node_info_size(),
-            gt1.GetGraphTransferInfo().const_node_info_size());
+  GraphTransferInfo rgfi0;
+  rgfi0.ParseFromString(ei0.serialized_executor_parameters());
+  GraphTransferInfo rgfi1;
+  rgfi1.ParseFromString(ei1.serialized_executor_parameters());
 
-  for (int i = 0; i < gfi0.const_node_info_size(); ++i) {
-    const GraphTransferInfo::ConstNodeInfo& ni0 = gfi0.const_node_info(i);
-    const GraphTransferInfo::ConstNodeInfo& ni1 = gfi1.const_node_info(i);
-    ASSERT_EQ(ni0.shape_size(), ni1.shape_size());
-    for (int j = 0; j < ni0.shape_size(); ++j) {
-      EXPECT_EQ(ni0.shape(j), ni1.shape(j));
-    }
-  }
-
-  ASSERT_EQ(gfi0.node_output_info_size(), gfi1.node_output_info_size());
-  for (int i = 0; i < gfi0.node_output_info_size(); ++i) {
-    const GraphTransferInfo::NodeOutputInfo& no0 = gfi0.node_output_info(i);
-    const GraphTransferInfo::NodeOutputInfo& no1 = gfi1.node_output_info(i);
-    ASSERT_EQ(no0.max_byte_size_size(), no1.max_byte_size_size());
-    for (int j = 0; j < no0.max_byte_size_size(); ++j) {
-      EXPECT_EQ(no0.max_byte_size(j), no1.max_byte_size(j));
-    }
-  }
+  CompareGraphTransferInfo(rgfi0, rgfi1);
+  CompareGraphTransferInfo(gfi0, rgfi0);
+  CompareGraphTransferInfo(gfi1, rgfi1);
 }
-
 #endif
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
index 851d87b15b..ad9200e948 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
@@ -174,6 +174,7 @@ const std::unordered_map<string, SupportedOpType> OP_NAME_TO_SOC_OP_TYPE_MAP{
     {"Placeholder", SupportedOpType::NOP},
     {"RequantizationRange", SupportedOpType::REQUANTIZATION_RANGE_32},
     {"Requantize", SupportedOpType::REQUANTIZE_32_TO_8},
+    {"QuantizedReshape", SupportedOpType::QUANTIZED_RESHAPE},
 };
 
 /* static */ const IGraphTransferOpsDefinitions&
-- 
GitLab


From 5226234de780d09cfdf5d83bbdaf065a73f8bc51 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 6 Apr 2017 15:50:56 -0800
Subject: [PATCH 0189/1563] tfdbg CLI: add command list_source (ls) + UI fixes
 and improvements

The new list_source (shorthand: ls) command lists Python source files responsible for constructing the nodes and tensors encountered in the run() call.

It divides the source files into two categories and list them separately.
1) files that are not part of the TensorFlow Python library, and
2) files that are a part of it.

The list contains information about how many nodes, tensors and dumps of tensors the files is responsible for. The file paths contain clickable links to the existing print_source/ps command.

The list_source/ls command supports filtering by file-path and node-name regex patterns.

UI fixes:
* Fixed inconsistent black vs. transparent background color that made the layout look messy on some terminal types. Now using the transparent color for default font color consistently.
* In the print_source command output, add clickable links to expand source lines and graph elements.
Change: 152446002
---
 tensorflow/python/debug/BUILD                 |   2 +
 tensorflow/python/debug/cli/analyzer_cli.py   | 166 ++++++++++++++++--
 .../python/debug/cli/analyzer_cli_test.py     |  91 +++++++++-
 tensorflow/python/debug/cli/cli_shared.py     |  12 +-
 tensorflow/python/debug/cli/curses_ui.py      |  84 ++++++---
 tensorflow/python/debug/cli/stepper_cli.py    |  20 +--
 tensorflow/python/debug/lib/source_utils.py   | 145 ++++++++++++++-
 .../python/debug/lib/source_utils_test.py     | 158 +++++++++++++++++
 8 files changed, 618 insertions(+), 60 deletions(-)

diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 56dd7ceba5..0b87660e5d 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -185,6 +185,7 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":base_ui",
+        ":cli_shared",
         ":command_parser",
         ":curses_widgets",
         ":debugger_cli_common",
@@ -375,6 +376,7 @@ py_test(
         ":debug_utils",
         ":source_utils",
         "//tensorflow/python:client",
+        "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
diff --git a/tensorflow/python/debug/cli/analyzer_cli.py b/tensorflow/python/debug/cli/analyzer_cli.py
index 0c8004e254..95d3f3f249 100644
--- a/tensorflow/python/debug/cli/analyzer_cli.py
+++ b/tensorflow/python/debug/cli/analyzer_cli.py
@@ -345,6 +345,25 @@ class DebugAnalyzer(object):
         help="Print source beginning at line number (1-based.)")
     self._arg_parsers["print_source"] = ap
 
+    # Parser for list_source.
+    ap = argparse.ArgumentParser(
+        description="List source files responsible for constructing nodes and "
+        "tensors present in the run().",
+        usage=argparse.SUPPRESS)
+    ap.add_argument(
+        "-p",
+        "--path_filter",
+        type=str,
+        default="",
+        help="Regular expression filter for file path.")
+    ap.add_argument(
+        "-n",
+        "--node_name_filter",
+        type=str,
+        default="",
+        help="Regular expression filter for node name.")
+    self._arg_parsers["list_source"] = ap
+
     # TODO(cais): Implement list_nodes.
 
   def add_tensor_filter(self, filter_name, filter_callable):
@@ -979,6 +998,15 @@ class DebugAnalyzer(object):
 
     return output
 
+  def _reconstruct_print_source_command(self,
+                                        parsed,
+                                        line_begin_decrease=0,
+                                        max_elements_per_line_increase=0):
+    return "ps %s %s -b %d -m %d" % (
+        parsed.source_file_path, "-t" if parsed.tensors else "",
+        max(parsed.line_begin - line_begin_decrease, 1),
+        parsed.max_elements_per_line + max_elements_per_line_increase)
+
   def print_source(self, args, screen_info=None):
     """Print the content of a source file."""
     del screen_info  # Unused.
@@ -1000,12 +1028,20 @@ class DebugAnalyzer(object):
 
     labeled_source_lines = []
     if parsed.line_begin > 1:
-      labeled_source_lines.append(
-          RL("(... Omitted %d source lines ...)" % (parsed.line_begin - 1),
-             "bold"))
+      omitted_info_line = RL(
+          "(... Omitted %d source lines ...) " % (parsed.line_begin - 1),
+          "bold")
+      omitted_info_line += RL(
+          "+5",
+          debugger_cli_common.MenuItem(
+              None,
+              self._reconstruct_print_source_command(
+                  parsed, line_begin_decrease=5)))
+      labeled_source_lines.append(omitted_info_line)
 
     for i, line in enumerate(source_lines[parsed.line_begin - 1:]):
-      annotated_line = RL("L%d" % (i + parsed.line_begin), "yellow")
+      annotated_line = RL("L%d" % (i + parsed.line_begin),
+                          cli_shared.COLOR_YELLOW)
       annotated_line += " " * (line_num_width - len(annotated_line))
       annotated_line += line
       labeled_source_lines.append(annotated_line)
@@ -1014,11 +1050,17 @@ class DebugAnalyzer(object):
         sorted_elements = sorted(source_annotation[i + parsed.line_begin])
         for k, element in enumerate(sorted_elements):
           if k >= parsed.max_elements_per_line:
-            labeled_source_lines.append(
-                "    (... Omitted %d of %d %s ...)" % (
-                    len(sorted_elements) - parsed.max_elements_per_line,
-                    len(sorted_elements),
-                    "tensor(s)" if parsed.tensors else "op(s)"))
+            omitted_info_line = RL("    (... Omitted %d of %d %s ...) " % (
+                len(sorted_elements) - parsed.max_elements_per_line,
+                len(sorted_elements),
+                "tensor(s)" if parsed.tensors else "op(s)"))
+            omitted_info_line += RL(
+                "+5",
+                debugger_cli_common.MenuItem(
+                    None,
+                    self._reconstruct_print_source_command(
+                        parsed, max_elements_per_line_increase=5)))
+            labeled_source_lines.append(omitted_info_line)
             break
 
           label = RL(" " * 4)
@@ -1026,7 +1068,7 @@ class DebugAnalyzer(object):
               debug_data.get_node_name(element)):
             attribute = debugger_cli_common.MenuItem("", "pt %s" % element)
           else:
-            attribute = "blue"
+            attribute = cli_shared.COLOR_BLUE
 
           label += RL(element, attribute)
           labeled_source_lines.append(label)
@@ -1036,6 +1078,105 @@ class DebugAnalyzer(object):
     _add_main_menu(output, node_name=None)
     return output
 
+  def _make_source_table(self, source_list, is_tf_py_library):
+    """Make a table summarizing the source files that create nodes and tensors.
+
+    Args:
+      source_list: List of source files and related information as a list of
+        tuples (file_path, is_tf_library, num_nodes, num_tensors, num_dumps,
+        first_line).
+      is_tf_py_library: (`bool`) whether this table is for files that belong
+        to the TensorFlow Python library.
+
+    Returns:
+      The table as a `debugger_cli_common.RichTextLines` object.
+    """
+    path_head = "Source file path"
+    num_nodes_head = "#(nodes)"
+    num_tensors_head = "#(tensors)"
+    num_dumps_head = "#(tensor dumps)"
+
+    if is_tf_py_library:
+      # Use color to mark files that are guessed to belong to TensorFlow Python
+      # library.
+      color = cli_shared.COLOR_GRAY
+      lines = [RL("TensorFlow Python library file(s):", color)]
+    else:
+      color = cli_shared.COLOR_WHITE
+      lines = [RL("File(s) outside TensorFlow Python library:", color)]
+
+    if not source_list:
+      lines.append(RL("[No files.]"))
+      lines.append(RL())
+      return debugger_cli_common.rich_text_lines_from_rich_line_list(lines)
+
+    path_column_width = max(
+        max([len(item[0]) for item in source_list]), len(path_head)) + 1
+    num_nodes_column_width = max(
+        max([len(str(item[2])) for item in source_list]),
+        len(num_nodes_head)) + 1
+    num_tensors_column_width = max(
+        max([len(str(item[3])) for item in source_list]),
+        len(num_tensors_head)) + 1
+
+    head = RL(path_head + " " * (path_column_width - len(path_head)), color)
+    head += RL(num_nodes_head + " " * (
+        num_nodes_column_width - len(num_nodes_head)), color)
+    head += RL(num_tensors_head + " " * (
+        num_tensors_column_width - len(num_tensors_head)), color)
+    head += RL(num_dumps_head, color)
+
+    lines.append(head)
+
+    for item in source_list:
+      path_attributes = [debugger_cli_common.MenuItem(
+          None, "ps %s -b %d" % (item[0], item[5])), color]
+
+      line = RL(item[0], path_attributes)
+      line += " " * (path_column_width - len(line))
+      line += RL(
+          str(item[2]) + " " * (num_nodes_column_width - len(str(item[2]))),
+          color)
+      line += RL(
+          str(item[3]) + " " * (num_tensors_column_width - len(str(item[3]))),
+          color)
+      line += RL(str(item[4]), color)
+      lines.append(line)
+    lines.append(RL())
+
+    return debugger_cli_common.rich_text_lines_from_rich_line_list(lines)
+
+  def list_source(self, args, screen_info=None):
+    """List Python source files that constructed nodes and tensors."""
+    del screen_info  # Unused.
+
+    parsed = self._arg_parsers["list_source"].parse_args(args)
+    source_list = source_utils.list_source_files_against_dump(
+        self._debug_dump,
+        path_regex_whitelist=parsed.path_filter,
+        node_name_regex_whitelist=parsed.node_name_filter)
+
+    top_lines = [
+        RL("List of source files that created nodes in this run", "bold")]
+    if parsed.path_filter:
+      top_lines.append(
+          RL("File path regex filter: \"%s\"" % parsed.path_filter))
+    if parsed.node_name_filter:
+      top_lines.append(
+          RL("Node name regex filter: \"%s\"" % parsed.node_name_filter))
+    top_lines.append(RL())
+    output = debugger_cli_common.rich_text_lines_from_rich_line_list(top_lines)
+    if not source_list:
+      output.append("[No source file information.]")
+      return output
+
+    output.extend(self._make_source_table(
+        [item for item in source_list if not item[1]], False))
+    output.extend(self._make_source_table(
+        [item for item in source_list if item[1]], True))
+    _add_main_menu(output, node_name=None)
+    return output
+
   def _list_inputs_or_outputs(self,
                               recursive,
                               node_name,
@@ -1395,6 +1536,11 @@ def create_analyzer_ui(debug_dump,
       analyzer.print_source,
       analyzer.get_help("print_source"),
       prefix_aliases=["ps"])
+  cli.register_command_handler(
+      "list_source",
+      analyzer.list_source,
+      analyzer.get_help("list_source"),
+      prefix_aliases=["ls"])
 
   dumped_tensor_names = []
   for datum in debug_dump.dumped_tensor_data:
diff --git a/tensorflow/python/debug/cli/analyzer_cli_test.py b/tensorflow/python/debug/cli/analyzer_cli_test.py
index bb2d72e2e4..185d395126 100644
--- a/tensorflow/python/debug/cli/analyzer_cli_test.py
+++ b/tensorflow/python/debug/cli/analyzer_cli_test.py
@@ -28,6 +28,7 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.debug.cli import analyzer_cli
+from tensorflow.python.debug.cli import cli_shared
 from tensorflow.python.debug.cli import command_parser
 from tensorflow.python.debug.cli import debugger_cli_common
 from tensorflow.python.debug.lib import debug_data
@@ -569,6 +570,11 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         cls._analyzer.print_source,
         cls._analyzer.get_help("print_source"),
         prefix_aliases=["ps"])
+    cls._registry.register_command_handler(
+        "list_source",
+        cls._analyzer.list_source,
+        cls._analyzer.get_help("list_source"),
+        prefix_aliases=["ls"])
 
   @classmethod
   def tearDownClass(cls):
@@ -906,7 +912,7 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         ["ERROR: There is no node named \"bar\" in the partition graphs"],
         out.lines)
     # Check color indicating error.
-    self.assertEqual({0: [(0, 59, "red")]}, out.font_attr_segs)
+    self.assertEqual({0: [(0, 59, cli_shared.COLOR_RED)]}, out.font_attr_segs)
     check_main_menu(self, out, list_tensors_enabled=True)
 
   def testPrintTensor(self):
@@ -1172,7 +1178,7 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
                      out.font_attr_segs[index + 1][0][2].content)
     # simple_mul_add/u/Assign is not used in this run because the Variable has
     # already been initialized.
-    self.assertEqual("blue", out.font_attr_segs[index + 2][0][2])
+    self.assertEqual(cli_shared.COLOR_BLUE, out.font_attr_segs[index + 2][0][2])
     self.assertEqual("pt simple_mul_add/u/read",
                      out.font_attr_segs[index + 3][0][2].content)
 
@@ -1234,6 +1240,12 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         screen_info={"cols": 80})
 
     self.assertIn("Omitted 2 source lines", out.lines[0])
+    self.assertTrue(out.lines[0].endswith("+5"))
+    expand_lines_command = out.font_attr_segs[0][-1][2].content
+    self.assertStartsWith(expand_lines_command,
+                          "ps %s " % self._curr_file_path)
+    self.assertIn("-b 1", expand_lines_command)
+
     self.assertIsNone(self._findSourceLine(out, 1))
     self.assertIsNone(self._findSourceLine(out, 2))
     self.assertIsNotNone(self._findSourceLine(out, 3))
@@ -1250,7 +1262,7 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
                      out.font_attr_segs[index + 1][0][2].content)
     # simple_mul_add/u/Assign is not used in this run because the Variable has
     # already been initialized.
-    self.assertEqual("blue", out.font_attr_segs[index + 2][0][2])
+    self.assertEqual(cli_shared.COLOR_BLUE, out.font_attr_segs[index + 2][0][2])
     self.assertEqual("pt simple_mul_add/u/read",
                      out.font_attr_segs[index + 3][0][2].content)
 
@@ -1266,10 +1278,81 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         ["L%d         u = variables.Variable(u_init, name=u_name)" %
          self._u_line_number,
          "    simple_mul_add/u",
-         "    (... Omitted 2 of 3 op(s) ...)"],
+         "    (... Omitted 2 of 3 op(s) ...) +5"],
         out.lines[index : index + 3])
     self.assertEqual("pt simple_mul_add/u",
                      out.font_attr_segs[index + 1][0][2].content)
+    more_elements_command = out.font_attr_segs[index + 2][-1][2].content
+    self.assertStartsWith(more_elements_command,
+                          "ps %s " % self._curr_file_path)
+    self.assertIn(" -m 6", more_elements_command)
+
+  def testListSourceWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command("list_source", [])
+
+    non_tf_lib_files_start = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("Source file path")][0] + 1
+    non_tf_lib_files_end = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("TensorFlow Python library file(s):")][0] - 1
+    non_tf_lib_files = [
+        line.split(" ")[0] for line
+        in out.lines[non_tf_lib_files_start : non_tf_lib_files_end]]
+    self.assertIn(self._curr_file_path, non_tf_lib_files)
+
+    # Check that the TF library files are marked with special color attribute.
+    for i in xrange(non_tf_lib_files_end + 1, len(out.lines)):
+      if not out.lines[i]:
+        continue
+      for attr_seg in  out.font_attr_segs[i]:
+        self.assertTrue(cli_shared.COLOR_GRAY in attr_seg[2] or
+                        attr_seg[2] == cli_shared.COLOR_GRAY)
+
+  def testListSourceWithNodeNameFilterWithMatchesWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command("list_source", ["-n", ".*/read"])
+
+    self.assertStartsWith(out.lines[1], "Node name regex filter: \".*/read\"")
+
+    non_tf_lib_files_start = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("Source file path")][0] + 1
+    non_tf_lib_files_end = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("TensorFlow Python library file(s):")][0] - 1
+    non_tf_lib_files = [
+        line.split(" ")[0] for line
+        in out.lines[non_tf_lib_files_start : non_tf_lib_files_end]]
+    self.assertIn(self._curr_file_path, non_tf_lib_files)
+
+    # Check that the TF library files are marked with special color attribute.
+    for i in xrange(non_tf_lib_files_end + 1, len(out.lines)):
+      if not out.lines[i]:
+        continue
+      for attr_seg in  out.font_attr_segs[i]:
+        self.assertTrue(cli_shared.COLOR_GRAY in attr_seg[2] or
+                        attr_seg[2] == cli_shared.COLOR_GRAY)
+
+  def testListSourceWithNodeNameFilterWithNoMatchesWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command("list_source", ["-n", "^$"])
+
+    self.assertEqual([
+        "List of source files that created nodes in this run",
+        "Node name regex filter: \"^$\"", "",
+        "[No source file information.]"], out.lines)
+
+  def testListSourceWithPathAndNodeNameFiltersWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command(
+        "list_source", ["-p", self._curr_file_path, "-n", ".*read"])
+
+    self.assertEqual([
+        "List of source files that created nodes in this run",
+        "File path regex filter: \"%s\"" % self._curr_file_path,
+        "Node name regex filter: \".*read\"", ""], out.lines[:4])
 
 
 class AnalyzerCLIPrintLargeTensorTest(test_util.TensorFlowTestCase):
diff --git a/tensorflow/python/debug/cli/cli_shared.py b/tensorflow/python/debug/cli/cli_shared.py
index b195347950..8ff0916761 100644
--- a/tensorflow/python/debug/cli/cli_shared.py
+++ b/tensorflow/python/debug/cli/cli_shared.py
@@ -32,6 +32,16 @@ RL = debugger_cli_common.RichLine
 # when printing the value of the tensor.
 DEFAULT_NDARRAY_DISPLAY_THRESHOLD = 2000
 
+COLOR_BLACK = "black"
+COLOR_BLUE = "blue"
+COLOR_CYAN = "cyan"
+COLOR_GRAY = "gray"
+COLOR_GREEN = "green"
+COLOR_MAGENTA = "magenta"
+COLOR_RED = "red"
+COLOR_WHITE = "white"
+COLOR_YELLOW = "yellow"
+
 
 def bytes_to_readable_str(num_bytes, include_b=False):
   """Generate a human-readable string representing number of bytes.
@@ -154,7 +164,7 @@ def error(msg):
   """
 
   return debugger_cli_common.rich_text_lines_from_rich_line_list([
-      RL("ERROR: " + msg, "red")])
+      RL("ERROR: " + msg, COLOR_RED)])
 
 
 def _get_fetch_name(fetch):
diff --git a/tensorflow/python/debug/cli/curses_ui.py b/tensorflow/python/debug/cli/curses_ui.py
index d8d3bce3de..b7549b406b 100644
--- a/tensorflow/python/debug/cli/curses_ui.py
+++ b/tensorflow/python/debug/cli/curses_ui.py
@@ -20,6 +20,7 @@ from __future__ import print_function
 import collections
 import curses
 from curses import textpad
+import os
 import signal
 import sys
 import threading
@@ -27,6 +28,7 @@ import threading
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.python.debug.cli import base_ui
+from tensorflow.python.debug.cli import cli_shared
 from tensorflow.python.debug.cli import command_parser
 from tensorflow.python.debug.cli import curses_widgets
 from tensorflow.python.debug.cli import debugger_cli_common
@@ -42,6 +44,9 @@ _SCROLL_HOME = "home"
 _SCROLL_END = "end"
 _SCROLL_TO_LINE_INDEX = "scroll_to_line_index"
 
+_COLOR_READY_COLORTERMS = ["gnome-terminal", "xfce4-terminal"]
+_COLOR_ENABLED_TERM = "xterm-256color"
+
 
 def _get_command_from_line_attr_segs(mouse_x, attr_segs):
   """Attempt to extract command from the attribute segments of a line.
@@ -77,7 +82,7 @@ class ScrollBar(object):
   event in the screen region it occupies.
   """
 
-  BASE_ATTR = "black_on_white"
+  BASE_ATTR = cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE
 
   def __init__(self,
                min_x,
@@ -225,27 +230,36 @@ class CursesUI(base_ui.BaseUI):
   }
 
   _FOREGROUND_COLORS = {
-      "white": curses.COLOR_WHITE,
-      "red": curses.COLOR_RED,
-      "green": curses.COLOR_GREEN,
-      "yellow": curses.COLOR_YELLOW,
-      "blue": curses.COLOR_BLUE,
-      "cyan": curses.COLOR_CYAN,
-      "magenta": curses.COLOR_MAGENTA,
-      "black": curses.COLOR_BLACK,
+      cli_shared.COLOR_WHITE: curses.COLOR_WHITE,
+      cli_shared.COLOR_RED: curses.COLOR_RED,
+      cli_shared.COLOR_GREEN: curses.COLOR_GREEN,
+      cli_shared.COLOR_YELLOW: curses.COLOR_YELLOW,
+      cli_shared.COLOR_BLUE: curses.COLOR_BLUE,
+      cli_shared.COLOR_CYAN: curses.COLOR_CYAN,
+      cli_shared.COLOR_MAGENTA: curses.COLOR_MAGENTA,
+      cli_shared.COLOR_BLACK: curses.COLOR_BLACK,
   }
   _BACKGROUND_COLORS = {
-      "white": curses.COLOR_WHITE,
-      "black": curses.COLOR_BLACK,
+      "transparent": -1,
+      cli_shared.COLOR_WHITE: curses.COLOR_WHITE,
+      cli_shared.COLOR_BLACK: curses.COLOR_BLACK,
   }
 
   # Font attribute for search and highlighting.
-  _SEARCH_HIGHLIGHT_FONT_ATTR = "black_on_white"
-  _ARRAY_INDICES_COLOR_PAIR = "black_on_white"
-  _ERROR_TOAST_COLOR_PAIR = "red_on_white"
-  _INFO_TOAST_COLOR_PAIR = "blue_on_white"
-  _STATUS_BAR_COLOR_PAIR = "black_on_white"
-  _UI_WAIT_COLOR_PAIR = "magenta_on_white"
+  _SEARCH_HIGHLIGHT_FONT_ATTR = (
+      cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE)
+  _ARRAY_INDICES_COLOR_PAIR = (
+      cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE)
+  _ERROR_TOAST_COLOR_PAIR = (
+      cli_shared.COLOR_RED + "_on_" + cli_shared.COLOR_WHITE)
+  _INFO_TOAST_COLOR_PAIR = (
+      cli_shared.COLOR_BLUE + "_on_" + cli_shared.COLOR_WHITE)
+  _STATUS_BAR_COLOR_PAIR = (
+      cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE)
+  _UI_WAIT_COLOR_PAIR = (
+      cli_shared.COLOR_MAGENTA + "_on_" + cli_shared.COLOR_WHITE)
+  _NAVIGATION_WARNING_COLOR_PAIR = (
+      cli_shared.COLOR_RED + "_on_" + cli_shared.COLOR_WHITE)
 
   _UI_WAIT_MESSAGE = "Processing..."
 
@@ -370,29 +384,43 @@ class CursesUI(base_ui.BaseUI):
 
     Creates curses stdscr and initialize the color pairs for display.
     """
-
+    # If the terminal type is color-ready, enable it.
+    if os.getenv("COLORTERM") in _COLOR_READY_COLORTERMS:
+      os.environ["TERM"] = _COLOR_ENABLED_TERM
     self._stdscr = curses.initscr()
     self._command_window = None
+    self._screen_color_init()
 
-    # Prepare color pairs.
+  def _screen_color_init(self):
+    """Initialization of screen colors."""
     curses.start_color()
-
+    curses.use_default_colors()
     self._color_pairs = {}
     color_index = 0
 
+    # Prepare color pairs.
     for fg_color in self._FOREGROUND_COLORS:
       for bg_color in self._BACKGROUND_COLORS:
-
         color_index += 1
         curses.init_pair(color_index, self._FOREGROUND_COLORS[fg_color],
                          self._BACKGROUND_COLORS[bg_color])
 
         color_name = fg_color
-        if bg_color != "black":
+        if bg_color != "transparent":
           color_name += "_on_" + bg_color
 
         self._color_pairs[color_name] = curses.color_pair(color_index)
 
+    # Try getting color(s) available only under 256-color support.
+    try:
+      color_index += 1
+      curses.init_pair(color_index, 245, -1)
+      self._color_pairs[cli_shared.COLOR_GRAY] = curses.color_pair(color_index)
+    except curses.error:
+      # Use fall-back color(s):
+      self._color_pairs[cli_shared.COLOR_GRAY] = (
+          self._color_pairs[cli_shared.COLOR_GREEN])
+
     # A_BOLD or A_BLINK is not really a "color". But place it here for
     # convenience.
     self._color_pairs["bold"] = curses.A_BOLD
@@ -400,7 +428,7 @@ class CursesUI(base_ui.BaseUI):
     self._color_pairs["underline"] = curses.A_UNDERLINE
 
     # Default color pair to use when a specified color pair does not exist.
-    self._default_color_pair = self._color_pairs["white"]
+    self._default_color_pair = self._color_pairs[cli_shared.COLOR_WHITE]
 
   def _screen_launch(self, enable_mouse_on_start):
     """Launch the curses screen."""
@@ -588,7 +616,7 @@ class CursesUI(base_ui.BaseUI):
         scroll_position = item.scroll_position
       else:
         self._toast("At the LATEST in navigation history!",
-                    color="red_on_white")
+                    color=self._NAVIGATION_WARNING_COLOR_PAIR)
         return
     else:
       if self._nav_history.can_go_back():
@@ -596,7 +624,7 @@ class CursesUI(base_ui.BaseUI):
         scroll_position = item.scroll_position
       else:
         self._toast("At the OLDEST in navigation history!",
-                    color="red_on_white")
+                    color=self._NAVIGATION_WARNING_COLOR_PAIR)
         return
 
     self._display_output(item.screen_output)
@@ -959,7 +987,7 @@ class CursesUI(base_ui.BaseUI):
       self._curr_wrapped_output.lines.append("Output cut off at %d lines!" %
                                              self.max_output_lines)
       self._curr_wrapped_output.font_attr_segs[self.max_output_lines] = [
-          (0, len(output.lines[-1]), "magenta")
+          (0, len(output.lines[-1]), cli_shared.COLOR_MAGENTA)
       ]
 
     self._display_nav_bar()
@@ -1518,7 +1546,9 @@ class CursesUI(base_ui.BaseUI):
 
     pad, _, _ = self._display_lines(
         debugger_cli_common.RichTextLines(
-            message, font_attr_segs={0: [(0, len(message), color or "white")]}),
+            message,
+            font_attr_segs={
+                0: [(0, len(message), color or cli_shared.COLOR_WHITE)]}),
         0)
 
     right_end = min(len(message), self._max_x - 2)
diff --git a/tensorflow/python/debug/cli/stepper_cli.py b/tensorflow/python/debug/cli/stepper_cli.py
index aee0849832..94eb2754da 100644
--- a/tensorflow/python/debug/cli/stepper_cli.py
+++ b/tensorflow/python/debug/cli/stepper_cli.py
@@ -68,19 +68,19 @@ class NodeStepperCLI(object):
   _UPDATED_ATTRIBUTE = "bold"
 
   _STATE_COLORS = {
-      STATE_CONT: "green",
-      STATE_DIRTY_VARIABLE: "magenta",
-      STATE_DUMPED_INTERMEDIATE: "blue",
-      STATE_OVERRIDDEN: "yellow",
-      STATE_IS_PLACEHOLDER: "cyan",
-      STATE_UNFEEDABLE: "red",
+      STATE_CONT: cli_shared.COLOR_GREEN,
+      STATE_DIRTY_VARIABLE: cli_shared.COLOR_MAGENTA,
+      STATE_DUMPED_INTERMEDIATE: cli_shared.COLOR_BLUE,
+      STATE_OVERRIDDEN: cli_shared.COLOR_YELLOW,
+      STATE_IS_PLACEHOLDER: cli_shared.COLOR_CYAN,
+      STATE_UNFEEDABLE: cli_shared.COLOR_RED,
   }
 
   _FEED_COLORS = {
-      stepper.NodeStepper.FEED_TYPE_CLIENT: "white",
-      stepper.NodeStepper.FEED_TYPE_HANDLE: "green",
-      stepper.NodeStepper.FEED_TYPE_OVERRIDE: "yellow",
-      stepper.NodeStepper.FEED_TYPE_DUMPED_INTERMEDIATE: "blue",
+      stepper.NodeStepper.FEED_TYPE_CLIENT: cli_shared.COLOR_WHITE,
+      stepper.NodeStepper.FEED_TYPE_HANDLE: cli_shared.COLOR_GREEN,
+      stepper.NodeStepper.FEED_TYPE_OVERRIDE: cli_shared.COLOR_YELLOW,
+      stepper.NodeStepper.FEED_TYPE_DUMPED_INTERMEDIATE: cli_shared.COLOR_BLUE,
   }
 
   def __init__(self, node_stepper):
diff --git a/tensorflow/python/debug/lib/source_utils.py b/tensorflow/python/debug/lib/source_utils.py
index cc949932cb..b8a5daf860 100644
--- a/tensorflow/python/debug/lib/source_utils.py
+++ b/tensorflow/python/debug/lib/source_utils.py
@@ -18,13 +18,47 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
 import os
+import re
+
+_TENSORFLOW_BASEDIR = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.dirname(
+        os.path.normpath(os.path.abspath(__file__))))))
 
 
 def _convert_watch_key_to_tensor_name(watch_key):
   return watch_key[:watch_key.rfind(":")]
 
 
+def _guess_is_tensorflow_py_library(py_file_path):
+  """Guess whether a Python source file is a part of the tensorflow library.
+
+  Special cases:
+    1) Returns False for unit-test files in the library (*_test.py),
+    2) Returns False for files under python/debug/examples.
+
+  Args:
+    py_file_path: full path of the Python source file in question.
+
+  Returns:
+    (`bool`) Whether the file is a part of the tensorflow library.
+
+  Raises:
+    ValueError: if py_file_path does not end with ".py".
+  """
+
+  if not py_file_path.endswith(".py"):
+    raise ValueError(
+        "Input file path (%s) is not a Python source file." % py_file_path)
+  py_file_path = os.path.normpath(os.path.abspath(py_file_path))
+
+  return (py_file_path.startswith(_TENSORFLOW_BASEDIR) and
+          not py_file_path.endswith("_test.py") and
+          not os.path.dirname(py_file_path).endswith(
+              os.path.normpath("python/debug/examples")))
+
+
 def annotate_source(dump,
                     source_file_path,
                     do_dumped_tensors=False,
@@ -61,21 +95,16 @@ def annotate_source(dump,
     raise ValueError("Cannot perform source annotation due to a lack of set "
                      "Python graph in the dump object")
 
-  source_file_path = os.path.normpath(source_file_path)
+  source_file_path = os.path.normpath(os.path.abspath(source_file_path))
 
   line_to_op_names = {}
   for op in py_graph.get_operations():
-    try:
-      traceback = dump.node_traceback(op.name)
-    except KeyError:
-      pass
-
-    for file_path, line_number, _, _ in reversed(traceback):
+    for file_path, line_number, _, _ in reversed(dump.node_traceback(op.name)):
       if (min_line is not None and line_number < min_line or
           max_line is not None and line_number >= max_line):
         continue
 
-      if os.path.normpath(file_path) != source_file_path:
+      if os.path.normpath(os.path.abspath(file_path)) != source_file_path:
         continue
 
       if do_dumped_tensors:
@@ -95,3 +124,103 @@ def annotate_source(dump,
         break
 
   return line_to_op_names
+
+
+def list_source_files_against_dump(dump,
+                                   path_regex_whitelist=None,
+                                   node_name_regex_whitelist=None):
+  """Generate a list of source files with information regarding ops and tensors.
+
+  Args:
+    dump: (`DebugDumpDir`) A `DebugDumpDir` object of which the Python graph
+      has been loaded.
+    path_regex_whitelist: A regular-expression filter for source file path.
+    node_name_regex_whitelist: A regular-expression filter for node names.
+
+  Returns:
+    A list of tuples regarding the Python source files involved in constructing
+    the ops and tensors contained in `dump`. Each tuple is:
+      (source_file_path, is_tf_library, num_nodes, num_tensors, num_dumps,
+       first_line)
+
+      is_tf_library: (`bool`) A guess of whether the file belongs to the
+        TensorFlow Python library.
+      num_nodes: How many nodes were created by lines of this source file.
+        These include nodes with dumps and those without.
+      num_tensors: How many Tensors were created by lines of this source file.
+        These include Tensors with dumps and those without.
+      num_dumps: How many debug Tensor dumps were from nodes (and Tensors)
+        that were created by this source file.
+      first_line: The first line number (1-based) that created any nodes or
+        Tensors in this source file.
+
+    The list is sorted by ascending order of source_file_path.
+
+  Raises:
+    ValueError: If the dump object does not have a Python graph set.
+  """
+
+  py_graph = dump.python_graph
+  if not py_graph:
+    raise ValueError("Cannot generate source list due to a lack of set "
+                     "Python graph in the dump object")
+
+  path_to_node_names = collections.defaultdict(set)
+  path_to_tensor_names = collections.defaultdict(set)
+  path_to_first_line = {}
+  tensor_name_to_num_dumps = {}
+
+  path_regex = (re.compile(path_regex_whitelist)
+                if path_regex_whitelist else None)
+  node_name_regex = (re.compile(node_name_regex_whitelist)
+                     if node_name_regex_whitelist else None)
+
+  to_skip_file_paths = set()
+  for op in py_graph.get_operations():
+    if node_name_regex and not node_name_regex.match(op.name):
+      continue
+
+    for file_path, line_number, _, _ in dump.node_traceback(op.name):
+      file_path = os.path.normpath(os.path.abspath(file_path))
+      if (file_path in to_skip_file_paths or
+          path_regex and not path_regex.match(file_path) or
+          not os.path.isfile(file_path)):
+        to_skip_file_paths.add(file_path)
+        continue
+
+      path_to_node_names[file_path].add(op.name)
+      if file_path in path_to_first_line:
+        if path_to_first_line[file_path] > line_number:
+          path_to_first_line[file_path] = line_number
+      else:
+        path_to_first_line[file_path] = line_number
+
+      for output_tensor in op.outputs:
+        tensor_name = output_tensor.name
+        path_to_tensor_names[file_path].add(tensor_name)
+
+      watch_keys = dump.debug_watch_keys(op.name)
+      for watch_key in watch_keys:
+        node_name, output_slot, debug_op = watch_key.split(":")
+        tensor_name = "%s:%s" % (node_name, output_slot)
+        if tensor_name not in tensor_name_to_num_dumps:
+          tensor_name_to_num_dumps[tensor_name] = len(
+              dump.get_tensors(node_name, int(output_slot), debug_op))
+
+  path_to_num_dumps = {}
+  for path in path_to_tensor_names:
+    path_to_num_dumps[path] = sum(
+        tensor_name_to_num_dumps.get(tensor_name, 0)
+        for tensor_name in path_to_tensor_names[path])
+
+  output = []
+  for file_path in path_to_node_names:
+    output.append((
+        file_path,
+        _guess_is_tensorflow_py_library(file_path),
+        len(path_to_node_names.get(file_path, {})),
+        len(path_to_tensor_names.get(file_path, {})),
+        path_to_num_dumps.get(file_path, 0),
+        path_to_first_line[file_path]))
+
+  return sorted(output, key=lambda x: x[0])
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index 5d28bff207..6010723d46 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -33,6 +33,7 @@ from tensorflow.python.debug.lib import source_utils
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_util
+from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
@@ -42,6 +43,37 @@ def line_number_above():
   return inspect.stack()[1][2] - 1
 
 
+class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
+
+  def setUp(self):
+    self.curr_file_path = os.path.normpath(os.path.abspath(__file__))
+
+  def tearDown(self):
+    ops.reset_default_graph()
+
+  def testGuessedBaseDirIsProbablyCorrect(self):
+    self.assertEqual(
+        "tensorflow", os.path.basename(source_utils._TENSORFLOW_BASEDIR))
+
+  def testUnitTestFileReturnsFalse(self):
+    self.assertFalse(source_utils._guess_is_tensorflow_py_library(
+        self.curr_file_path))
+
+  def testSourceUtilModuleReturnsTrue(self):
+    self.assertTrue(source_utils._guess_is_tensorflow_py_library(
+        source_utils.__file__))
+
+  def testFileInPythonKernelsPathReturnsTrue(self):
+    x = constant_op.constant(42.0, name="x")
+    self.assertTrue(source_utils._guess_is_tensorflow_py_library(
+        x.op.traceback[-1][0]))
+
+  def testNonPythonFileRaisesException(self):
+    with self.assertRaisesRegexp(ValueError, r"is not a Python source file"):
+      source_utils._guess_is_tensorflow_py_library(
+          os.path.join(os.path.dirname(self.curr_file_path), "foo.cc"))
+
+
 class SourceHelperTest(test_util.TensorFlowTestCase):
 
   def createAndRunGraphHelper(self):
@@ -199,5 +231,131 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
     os.remove(unrelated_source_path)
 
 
+class ListSourceAgainstDumpTest(test_util.TensorFlowTestCase):
+
+  def createAndRunGraphWithWhileLoop(self):
+    """Create and run a TensorFlow Graph with a while loop to generate dumps."""
+
+    self.dump_root = self.get_temp_dir()
+    self.curr_file_path = os.path.abspath(
+        inspect.getfile(inspect.currentframe()))
+
+    # Run a simple TF graph to generate some debug dumps that can be used in
+    # source annotation.
+    with session.Session() as sess:
+      loop_body = lambda i: math_ops.add(i, 2)
+      self.traceback_first_line = line_number_above()
+
+      loop_cond = lambda i: math_ops.less(i, 16)
+
+      i = constant_op.constant(10, name="i")
+      loop = control_flow_ops.while_loop(loop_cond, loop_body, [i])
+
+      run_options = config_pb2.RunOptions(output_partition_graphs=True)
+      debug_utils.watch_graph(
+          run_options, sess.graph, debug_urls=["file://%s" % self.dump_root])
+      run_metadata = config_pb2.RunMetadata()
+      sess.run(loop, options=run_options, run_metadata=run_metadata)
+
+      self.dump = debug_data.DebugDumpDir(
+          self.dump_root, partition_graphs=run_metadata.partition_graphs)
+      self.dump.set_python_graph(sess.graph)
+
+  def setUp(self):
+    self.createAndRunGraphWithWhileLoop()
+
+  def tearDown(self):
+    if os.path.isdir(self.dump_root):
+      shutil.rmtree(self.dump_root)
+    ops.reset_default_graph()
+
+  def testGenerateSourceList(self):
+    source_list = source_utils.list_source_files_against_dump(self.dump)
+
+    # Assert that the file paths are sorted and unique.
+    file_paths = [item[0] for item in source_list]
+    self.assertEqual(sorted(file_paths), file_paths)
+    self.assertEqual(len(set(file_paths)), len(file_paths))
+
+    # Assert that each item of source_list has length 6.
+    for item in source_list:
+      self.assertTrue(isinstance(item, tuple))
+      self.assertEqual(6, len(item))
+
+    # The while loop body should have executed 3 times. The following table
+    # lists the tensors and how many times each of them is dumped.
+    #   Tensor name            # of times dumped:
+    #   i:0                    1
+    #   while/Enter:0          1
+    #   while/Merge:0          4
+    #   while/Merge:1          4
+    #   while/Less/y:0         4
+    #   while/Less:0           4
+    #   while/LoopCond:0       4
+    #   while/Switch:0         1
+    #   while/Swtich:1         3
+    #   while/Identity:0       3
+    #   while/Add/y:0          3
+    #   while/Add:0            3
+    #   while/NextIteration:0  3
+    #   while/Exit:0           1
+    # ----------------------------
+    #   (Total)                39
+    #
+    # The total number of nodes is 12.
+    # The total number of tensors is 14 (2 of the nodes have 2 outputs:
+    #   while/Merge, while/Switch).
+
+    _, is_tf_py_library, num_nodes, num_tensors, num_dumps, first_line = (
+        source_list[file_paths.index(self.curr_file_path)])
+    self.assertFalse(is_tf_py_library)
+    self.assertEqual(12, num_nodes)
+    self.assertEqual(14, num_tensors)
+    self.assertEqual(39, num_dumps)
+    self.assertEqual(self.traceback_first_line, first_line)
+
+  def testGenerateSourceListWithNodeNameFilter(self):
+    source_list = source_utils.list_source_files_against_dump(
+        self.dump, node_name_regex_whitelist=r"while/Add.*")
+
+    # Assert that the file paths are sorted.
+    file_paths = [item[0] for item in source_list]
+    self.assertEqual(sorted(file_paths), file_paths)
+    self.assertEqual(len(set(file_paths)), len(file_paths))
+
+    # Assert that each item of source_list has length 4.
+    for item in source_list:
+      self.assertTrue(isinstance(item, tuple))
+      self.assertEqual(6, len(item))
+
+    # Due to the node-name filtering the result should only contain 2 nodes
+    # and 2 tensors. The total number of dumped tensors should be 6:
+    #   while/Add/y:0          3
+    #   while/Add:0            3
+    _, is_tf_py_library, num_nodes, num_tensors, num_dumps, _ = (
+        source_list[file_paths.index(self.curr_file_path)])
+    self.assertFalse(is_tf_py_library)
+    self.assertEqual(2, num_nodes)
+    self.assertEqual(2, num_tensors)
+    self.assertEqual(6, num_dumps)
+
+  def testGenerateSourceListWithPathRegexFilter(self):
+    curr_file_basename = os.path.basename(self.curr_file_path)
+    source_list = source_utils.list_source_files_against_dump(
+        self.dump,
+        path_regex_whitelist=(
+            ".*" + curr_file_basename.replace(".", "\\.") + "$"))
+
+    self.assertEqual(1, len(source_list))
+    (file_path, is_tf_py_library, num_nodes, num_tensors, num_dumps,
+     first_line) = source_list[0]
+    self.assertEqual(self.curr_file_path, file_path)
+    self.assertFalse(is_tf_py_library)
+    self.assertEqual(12, num_nodes)
+    self.assertEqual(14, num_tensors)
+    self.assertEqual(39, num_dumps)
+    self.assertEqual(self.traceback_first_line, first_line)
+
+
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From a957eb9cb5ccc238b3196707be4ed22b91b67913 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Thu, 6 Apr 2017 15:54:16 -0800
Subject: [PATCH 0190/1563] tfcompile: Be a little more verbose about missing
 required flags.

Fixes #9014
Change: 152446338
---
 tensorflow/compiler/aot/tfcompile_main.cc | 30 +++++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/tensorflow/compiler/aot/tfcompile_main.cc b/tensorflow/compiler/aot/tfcompile_main.cc
index 85ef9560bb..59a45538a7 100644
--- a/tensorflow/compiler/aot/tfcompile_main.cc
+++ b/tensorflow/compiler/aot/tfcompile_main.cc
@@ -52,7 +52,8 @@ const char kUsageHeader[] =
     "header file that gives access to the functionality in the object file.\n"
     "A typical invocation looks like this:\n"
     "\n"
-    "   $ tfcompile --graph=mygraph.pb --config=myfile.pbtxt\n"
+    "   $ tfcompile --graph=mygraph.pb --config=myfile.pbtxt "
+    "--cpp_class=\"mynamespace::MyComputation\"\n"
     "\n";
 
 Status ReadProtoFile(const string& kind, const string& fname,
@@ -73,6 +74,9 @@ void ParseTensorId(const string& name, TensorId* id) {
 Status Main(const MainFlags& flags) {
   // Process config.
   Config config;
+  if (flags.config.empty()) {
+    return errors::InvalidArgument("Must specify --config");
+  }
   TF_RETURN_IF_ERROR(ReadProtoFile("config", flags.config, &config));
   TF_RETURN_IF_ERROR(ValidateConfig(config));
   if (flags.dump_fetch_nodes) {
@@ -85,6 +89,9 @@ Status Main(const MainFlags& flags) {
   }
 
   // Read and initialize the graph.
+  if (flags.graph.empty()) {
+    return errors::InvalidArgument("Must specify --graph");
+  }
   GraphDef graph_def;
   TF_RETURN_IF_ERROR(ReadProtoFile("graph", flags.graph, &graph_def));
   std::unique_ptr<Graph> graph;
@@ -101,6 +108,9 @@ Status Main(const MainFlags& flags) {
   TF_RETURN_IF_ERROR(WriteStringToFile(env, flags.out_object,
                                        StringPiece(obj.data(), obj.size())));
   HeaderOpts header_opts;
+  if (flags.cpp_class.empty()) {
+    return errors::InvalidArgument("Must specify --cpp_class");
+  }
   TF_RETURN_IF_ERROR(ParseCppClass(flags.cpp_class, &header_opts.class_name,
                                    &header_opts.namespaces));
   string header;
@@ -131,12 +141,16 @@ int main(int argc, char** argv) {
   QCHECK(parsed_flags_ok) << "\n" << usage;
 
   tensorflow::port::InitMain(usage.c_str(), &argc, &argv);
-  QCHECK(argc == 1 && !flags.config.empty() &&
-         (flags.dump_fetch_nodes ||
-          (!flags.graph.empty() && !flags.entry_point.empty())))
-      << "\n"
-      << usage;
-
-  TF_QCHECK_OK(tensorflow::tfcompile::Main(flags));
+  QCHECK(argc == 1) << "\nERROR: This command does not take any arguments "
+                       "other than flags\n\n"
+                    << usage;
+  tensorflow::Status status = tensorflow::tfcompile::Main(flags);
+  if (status.code() == tensorflow::error::INVALID_ARGUMENT) {
+    std::cerr << "INVALID ARGUMENTS: " << status.error_message() << "\n\n"
+              << usage;
+    return 1;
+  } else {
+    TF_QCHECK_OK(status);
+  }
   return 0;
 }
-- 
GitLab


From f0d1d69e098458c95e07e37b93bb8ee38b2b7294 Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Thu, 6 Apr 2017 16:03:16 -0800
Subject: [PATCH 0191/1563] Disable failing test cases in pooling_ops_test.
 Change: 152447322

---
 tensorflow/python/kernel_tests/pooling_ops_test.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/kernel_tests/pooling_ops_test.py b/tensorflow/python/kernel_tests/pooling_ops_test.py
index c3e2a640b7..03291bbb0d 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_test.py
@@ -1289,9 +1289,10 @@ class PoolingTest(test.TestCase):
       self._testMaxPoolGradGradValidPadding2_1_7(data_format, use_gpu)
       self._testMaxPoolGradGradValidPadding2_2(data_format, use_gpu)
       self._testMaxPoolGradGradSamePadding1_1(data_format, use_gpu)
-      self._testMaxPoolGradGradSamePadding2_1(data_format, use_gpu)
       self._testMaxPoolGradGradSamePadding2_2(data_format, use_gpu)
-      self._testMaxPoolGradGradSamePadding3_1(data_format, use_gpu)
+      # Disable flaky test case
+      # self._testMaxPoolGradGradSamePadding2_1(data_format, use_gpu)
+      # self._testMaxPoolGradGradSamePadding3_1(data_format, use_gpu)
 
   def _MaxPoolGradGrad(self, orig_input, orig_output, grad, window_rows,
                        window_cols, row_stride, col_stride, padding):
-- 
GitLab


From a71260bf4c2450772646f66ab8f093df664c00a6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 16:11:50 -0800
Subject: [PATCH 0192/1563] Register more types for tf.image_crop_and_resize().
 Resolves #9020. Change: 152448160

---
 tensorflow/core/kernels/crop_and_resize_op.cc | 49 +++++++++++-------
 .../core/kernels/crop_and_resize_op_gpu.cu.cc | 34 ++++++-------
 .../core/kernels/crop_and_resize_op_test.cc   | 51 ++++++++++++++-----
 3 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index caf73420ba..746fe63e2a 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -216,12 +216,14 @@ struct CropAndResize<CPUDevice, T> {
           const float x_lerp = in_x - left_x_index;
 
           for (int d = 0; d < depth; ++d) {
-            const float top_left(image(b_in, top_y_index, left_x_index, d));
-            const float top_right(image(b_in, top_y_index, right_x_index, d));
-            const float bottom_left(
-                image(b_in, bottom_y_index, left_x_index, d));
-            const float bottom_right(
-                image(b_in, bottom_y_index, right_x_index, d));
+            const float top_left(
+                static_cast<float>(image(b_in, top_y_index, left_x_index, d)));
+            const float top_right(
+                static_cast<float>(image(b_in, top_y_index, right_x_index, d)));
+            const float bottom_left(static_cast<float>(
+                image(b_in, bottom_y_index, left_x_index, d)));
+            const float bottom_right(static_cast<float>(
+                image(b_in, bottom_y_index, right_x_index, d)));
             const float top = top_left + (top_right - top_left) * x_lerp;
             const float bottom =
                 bottom_left + (bottom_right - bottom_left) * x_lerp;
@@ -545,12 +547,14 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
           const float x_lerp = in_x - left_x_index;
 
           for (int d = 0; d < depth; ++d) {
-            const float top_left(image(b_in, top_y_index, left_x_index, d));
-            const float top_right(image(b_in, top_y_index, right_x_index, d));
-            const float bottom_left(
-                image(b_in, bottom_y_index, left_x_index, d));
-            const float bottom_right(
-                image(b_in, bottom_y_index, right_x_index, d));
+            const float top_left(
+                static_cast<float>(image(b_in, top_y_index, left_x_index, d)));
+            const float top_right(
+                static_cast<float>(image(b_in, top_y_index, right_x_index, d)));
+            const float bottom_left(static_cast<float>(
+                image(b_in, bottom_y_index, left_x_index, d)));
+            const float bottom_right(static_cast<float>(
+                image(b_in, bottom_y_index, right_x_index, d)));
             // Compute the image gradient.
             float image_grad_y = (1 - x_lerp) * (bottom_left - top_left) +
                                  x_lerp * (bottom_right - top_right);
@@ -606,18 +610,25 @@ inline void CheckValidBoxInd<CPUDevice>(
                               .HostMemory("crop_size"),            \
                           CropAndResizeOp<CPUDevice, T>);          \
                                                                    \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradImage")           \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T")              \
-                              .HostMemory("image_size"),           \
-                          CropAndResizeGradImageOp<CPUDevice, T>); \
-                                                                   \
   REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")           \
                               .Device(DEVICE_CPU)                  \
                               .TypeConstraint<T>("T"),             \
                           CropAndResizeGradBoxesOp<CPUDevice, T>);
 
+TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNEL);
+
+#undef REGISTER_KERNEL
+
+#define REGISTER_KERNEL(T)                               \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradImage") \
+                              .Device(DEVICE_CPU)        \
+                              .TypeConstraint<T>("T")    \
+                              .HostMemory("image_size"), \
+                          CropAndResizeGradImageOp<CPUDevice, T>);
+
+TF_CALL_half(REGISTER_KERNEL);
 TF_CALL_float(REGISTER_KERNEL);
+TF_CALL_double(REGISTER_KERNEL);
 
 #undef REGISTER_KERNEL
 
@@ -685,7 +696,7 @@ inline void CheckValidBoxInd<GPUDevice>(
                               .TypeConstraint<T>("T"),             \
                           CropAndResizeGradBoxesOp<GPUDevice, T>);
 
-TF_CALL_float(REGISTER_KERNEL);
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_KERNEL);
 
 #undef REGISTER_KERNEL
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
index 75146b28e6..254475db46 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
@@ -88,26 +88,26 @@ __global__ void CropAndResizeKernel(
     const int right_x_index = ceilf(in_x);
     const float x_lerp = in_x - left_x_index;
 
-    const float top_left(
+    const float top_left(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d]);
-    const float top_right(
+                  d]));
+    const float top_right(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d]);
-    const float bottom_left(
+                  d]));
+    const float bottom_left(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d]);
-    const float bottom_right(
+                  d]));
+    const float bottom_right(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d]);
+                  d]));
     const float top = top_left + (top_right - top_left) * x_lerp;
     const float bottom = bottom_left + (bottom_right - bottom_left) * x_lerp;
     crops_ptr[out_idx] = top + (bottom - top) * y_lerp;
@@ -258,26 +258,26 @@ __global__ void CropAndResizeBackpropBoxesKernel(
     const int right_x_index = ceilf(in_x);
     const float x_lerp = in_x - left_x_index;
 
-    const float top_left =
+    const float top_left(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d];
-    const float top_right =
+                  d]));
+    const float top_right(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d];
-    const float bottom_left =
+                  d]));
+    const float bottom_left(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d];
-    const float bottom_right =
+                  d]));
+    const float bottom_right(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d];
+                  d]));
 
     // Compute the image gradient.
     float image_grad_y = (1 - x_lerp) * (bottom_left - top_left) +
@@ -436,7 +436,7 @@ struct CropAndResizeBackpropBoxes<GPUDevice, T> {
   template struct CropAndResizeBackpropImage<GPUDevice, T>; \
   template struct CropAndResizeBackpropBoxes<GPUDevice, T>;
 
-TF_CALL_float(DEFINE_GPU_SPECS);
+TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_test.cc b/tensorflow/core/kernels/crop_and_resize_op_test.cc
index 68e077e44d..3a7f180598 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_test.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_test.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def_builder.h"
 #include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/framework/types.h"
@@ -31,9 +32,10 @@ namespace tensorflow {
 
 class CropAndResizeOpTest : public OpsTestBase {
  protected:
+  template <typename T>
   void MakeOp(float extrapolation_value) {
     TF_EXPECT_OK(NodeDefBuilder("crop_and_resize_op", "CropAndResize")
-                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(DataTypeToEnum<T>::value))
                      .Input(FakeInput(DT_FLOAT))
                      .Input(FakeInput(DT_INT32))
                      .Input(FakeInput(DT_INT32))
@@ -43,12 +45,33 @@ class CropAndResizeOpTest : public OpsTestBase {
   }
 };
 
-TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1) {
-  MakeOp(0);
+#define REGISTER_TEST(T)                                               \
+  TEST_F(CropAndResizeOpTest, TestCropAndResize##T) {                  \
+    MakeOp<T>(0);                                                      \
+    AddInputFromArray<T>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});     \
+    AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});       \
+    AddInputFromArray<int32>(TensorShape({1}), {0});                   \
+    AddInputFromArray<int32>(TensorShape({2}), {1, 1});                \
+    TF_ASSERT_OK(RunOpKernel());                                       \
+                                                                       \
+    Tensor expected(allocator(), DT_FLOAT, TensorShape({1, 1, 1, 1})); \
+    test::FillValues<float>(&expected, {2.5});                         \
+    test::ExpectTensorEqual<float>(expected, *GetOutput(0));           \
+  }
+
+REGISTER_TEST(float)
+REGISTER_TEST(double)
+REGISTER_TEST(int8)
+REGISTER_TEST(uint8)
+
+#undef REGISTER_TEST
+
+TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1Uint8) {
+  MakeOp<uint8>(0);
   // Input:
   //  1, 2
   //  3, 4
-  AddInputFromArray<float>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
+  AddInputFromArray<uint8>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({1}), {0});
   AddInputFromArray<int32>(TensorShape({2}), {1, 1});
@@ -60,7 +83,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1Flipped) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -76,7 +99,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1Flipped) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -97,7 +120,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Flipped) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -118,7 +141,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Flipped) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2, 3
   //  4, 5, 6
@@ -143,7 +166,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2Flipped) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2, 3
   //  4, 5, 6
@@ -169,7 +192,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2Flipped) {
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Extrapolated) {
   const float v = -1;
-  MakeOp(v);
+  MakeOp<float>(v);
   // Input:
   //  1, 2
   //  3, 4
@@ -190,7 +213,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Extrapolated) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3NoCrop) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -208,7 +231,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3NoCrop) {
 }
 
 TEST_F(CropAndResizeOpTest, TestInvalidInputShape) {
-  MakeOp(0);
+  MakeOp<float>(0);
   AddInputFromArray<float>(TensorShape({2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({1}), {0});
@@ -220,7 +243,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidInputShape) {
 }
 
 TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
-  MakeOp(0);
+  MakeOp<float>(0);
   AddInputFromArray<float>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({2}), {0, 0});
@@ -233,7 +256,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
 }
 
 TEST_F(CropAndResizeOpTest, TestInvalidBoxIndex) {
-  MakeOp(0);
+  MakeOp<float>(0);
   AddInputFromArray<float>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({1}), {1});
-- 
GitLab


From d5d7a8f57d266eed9777cec8eaf65201de36dcc1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 16:39:19 -0800
Subject: [PATCH 0193/1563] Automated rollback of change 152439984 Change:
 152450929

---
 .../contrib/learn/python/learn/experiment.py  | 15 ++---------
 .../learn/python/learn/experiment_test.py     | 27 +------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index e3bcd68291..cecc24c17d 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -76,7 +76,7 @@ class Experiment(object):
                local_eval_frequency=None,
                eval_delay_secs=120,
                continuous_eval_throttle_secs=60,
-               min_eval_frequency=None,
+               min_eval_frequency=1,
                delay_workers_by_global_step=False,
                export_strategies=None,
                train_steps_per_iteration=None):
@@ -116,8 +116,6 @@ class Experiment(object):
       min_eval_frequency: (applies only to train_and_evaluate). the minimum
         number of steps between evaluations. Of course, evaluation does not
         occur if no new snapshot is available, hence, this is the minimum.
-        If None, defaults to 1, unless model_dir is on GCS, in which case the
-        default is 1000.
       delay_workers_by_global_step: if `True` delays training workers
         based on global step instead of time.
       export_strategies: A list of `ExportStrategy`s, or a single one, or None.
@@ -158,12 +156,7 @@ class Experiment(object):
     self._local_eval_frequency = local_eval_frequency
     self._eval_delay_secs = eval_delay_secs
     self._continuous_eval_throttle_secs = continuous_eval_throttle_secs
-    # Using 1 on a non-cached file system requires a lot of overhead to
-    # read the checkpoint state file. This is particular bad on GCS, so
-    # we use a different default. This is a temporary band-aid, to be
-    # fixed holistically later (b/36498507).
-    default_min_eval_frequency = 1000 if _is_gcs(estimator.model_dir) else 1
-    self._min_eval_frequency = min_eval_frequency or default_min_eval_frequency
+    self._min_eval_frequency = min_eval_frequency
     self._delay_workers_by_global_step = delay_workers_by_global_step
     self._train_monitors = train_monitors[:] if train_monitors else []
     self._eval_hooks = eval_hooks[:] if eval_hooks else []
@@ -702,7 +695,3 @@ def _new_attr_context(obj, attr):
     yield
   finally:
     setattr(obj, attr, saved)
-
-
-def _is_gcs(model_dir):
-  return model_dir and model_dir.startswith("gs://")
diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index f4b4994fb1..00ed062b0a 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -174,7 +174,7 @@ class ExperimentTest(test.TestCase):
     return [TestEstimator(config=config, eval_dict=eval_dict),
             TestCoreEstimator(config=config, eval_dict=eval_dict)]
 
-  def test_eval_metrics_for_core_estimator(self):
+  def test_eval_metrcis_for_core_estimator(self):
     est = TestCoreEstimator()
     with self.assertRaisesRegexp(
         ValueError, '`eval_metrics` must be `None`'):
@@ -546,31 +546,6 @@ class ExperimentTest(test.TestCase):
       self.assertEqual([noop_hook], est.eval_hooks)
       self.assertTrue(isinstance(est.monitors[0], monitors.ValidationMonitor))
 
-  def test_min_eval_frequency_defaults(self):
-    def dummy_model_fn(features, labels):  # pylint: disable=unused-argument
-      pass
-
-    # The default value when model_dir is on GCS is 1000
-    estimator = core_estimator.Estimator(dummy_model_fn, 'gs://dummy_bucket')
-    ex = experiment.Experiment(
-        estimator, train_input_fn=None, eval_input_fn=None)
-    self.assertEquals(ex._min_eval_frequency, 1000)
-
-    # The default value when model_dir is not on GCS is 1
-    estimator = core_estimator.Estimator(dummy_model_fn, '/tmp/dummy')
-    ex = experiment.Experiment(
-        estimator, train_input_fn=None, eval_input_fn=None)
-    self.assertEquals(ex._min_eval_frequency, 1)
-
-    # Make sure default not used when explicitly set
-    estimator = core_estimator.Estimator(dummy_model_fn, 'gs://dummy_bucket')
-    ex = experiment.Experiment(
-        estimator,
-        min_eval_frequency=123,
-        train_input_fn=None,
-        eval_input_fn=None)
-    self.assertEquals(ex._min_eval_frequency, 123)
-
   def test_continuous_train_and_eval(self):
     for est in self._estimators_for_tests(eval_dict={'global_step': 100}):
       eval_metrics = 'eval_metrics' if not isinstance(
-- 
GitLab


From 4030622860a0cb5e6a175a9fe5852ef70aae183c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 16:45:03 -0800
Subject: [PATCH 0194/1563] Add a route to TensorBoard for fetching plugin
 names

Specifically, we add a /data/plugins_listing route to the TensorBoard application. This route responds with an object mapping the name of each initialized plugin to whether it is active.

This route could help the frontend avoid issuing requests to inactive plugins.

Ordered the listing of routes within application.py so there is a little more organization.

Refactored the test for application to use a fake plugin.
Change: 152451390
---
 tensorflow/tensorboard/backend/application.py | 48 +++++++++----
 .../tensorboard/backend/application_test.py   | 68 ++++++++++++++-----
 tensorflow/tensorboard/http_api.md            |  7 ++
 3 files changed, 91 insertions(+), 32 deletions(-)

diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index 005d183039..974762822f 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -61,6 +61,7 @@ DATA_PREFIX = '/data'
 LOGDIR_ROUTE = '/logdir'
 RUNS_ROUTE = '/runs'
 PLUGIN_PREFIX = '/plugin'
+PLUGINS_LISTING_ROUTE = '/plugins_listing'
 SCALARS_ROUTE = '/' + event_accumulator.SCALARS
 IMAGES_ROUTE = '/' + event_accumulator.IMAGES
 AUDIO_ROUTE = '/' + event_accumulator.AUDIO
@@ -152,30 +153,34 @@ class TensorBoardWSGIApp(object):
       reload_multiplexer(self._multiplexer, path_to_run)
 
     self.data_applications = {
-        DATA_PREFIX + LOGDIR_ROUTE:
-            self._serve_logdir,
-        DATA_PREFIX + SCALARS_ROUTE:
-            self._serve_scalars,
+        '/app.js':
+            self._serve_js,
+        DATA_PREFIX + AUDIO_ROUTE:
+            self._serve_audio,
+        DATA_PREFIX + COMPRESSED_HISTOGRAMS_ROUTE:
+            self._serve_compressed_histograms,
         DATA_PREFIX + GRAPH_ROUTE:
             self._serve_graph,
-        DATA_PREFIX + RUN_METADATA_ROUTE:
-            self._serve_run_metadata,
         DATA_PREFIX + HISTOGRAMS_ROUTE:
             self._serve_histograms,
-        DATA_PREFIX + COMPRESSED_HISTOGRAMS_ROUTE:
-            self._serve_compressed_histograms,
         DATA_PREFIX + IMAGES_ROUTE:
             self._serve_images,
-        DATA_PREFIX + INDIVIDUAL_IMAGE_ROUTE:
-            self._serve_image,
-        DATA_PREFIX + AUDIO_ROUTE:
-            self._serve_audio,
         DATA_PREFIX + INDIVIDUAL_AUDIO_ROUTE:
             self._serve_individual_audio,
+        DATA_PREFIX + INDIVIDUAL_IMAGE_ROUTE:
+            self._serve_image,
+        DATA_PREFIX + LOGDIR_ROUTE:
+            self._serve_logdir,
+        # TODO(chizeng): Delete this RPC once we have skylark rules that obviate
+        # the need for the frontend to determine which plugins are active.
+        DATA_PREFIX + PLUGINS_LISTING_ROUTE:
+            self._serve_plugins_listing,
+        DATA_PREFIX + RUN_METADATA_ROUTE:
+            self._serve_run_metadata,
         DATA_PREFIX + RUNS_ROUTE:
             self._serve_runs,
-        '/app.js':
-            self._serve_js
+        DATA_PREFIX + SCALARS_ROUTE:
+            self._serve_scalars,
     }
 
     # Serve the routes from the registered plugins using their name as the route
@@ -488,6 +493,21 @@ class TensorBoardWSGIApp(object):
     })
     return query_string
 
+  @wrappers.Request.application
+  def _serve_plugins_listing(self, request):
+    """Serves an object mapping plugin name to whether it is enabled.
+
+    Args:
+      request: The werkzeug.Request object.
+
+    Returns:
+      A werkzeug.Response object.
+    """
+    return http_util.Respond(
+        request,
+        {plugin.plugin_name: plugin.is_active() for plugin in self._plugins},
+        'application/json')
+
   @wrappers.Request.application
   def _serve_runs(self, request):
     """WSGI app serving a JSON object about runs and tags.
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 5be843fb14..002709cd5b 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -51,6 +51,40 @@ from tensorflow.tensorboard.backend.event_processing import event_multiplexer
 from tensorflow.tensorboard.plugins import base_plugin
 
 
+class FakePlugin(base_plugin.TBPlugin):
+  """A plugin with no functionality."""
+
+  def __init__(self, plugin_name, is_active_value):
+    """Constructs a fake plugin.
+
+    Args:
+      plugin_name: The name of this plugin.
+      is_active_value: Whether the plugin is active.
+    """
+    self.plugin_name = plugin_name
+    self._is_active_value = is_active_value
+
+  def get_plugin_apps(self, multiplexer, logdir):
+    """Returns a mapping from routes to handlers offered by this plugin.
+
+    Args:
+      multiplexer: The event multiplexer.
+      logdir: The path to the directory containing logs.
+
+    Returns:
+      An empty dict. This plugin offers no routes.
+    """
+    return {}
+
+  def is_active(self):
+    """Returns whether this plugin is active.
+
+    Returns:
+      A boolean. Whether this plugin is active.
+    """
+    return self._is_active_value
+
+
 class TensorboardServerTest(test.TestCase):
   _only_use_meta_graph = False  # Server data contains only a GraphDef
 
@@ -62,7 +96,10 @@ class TensorboardServerTest(test.TestCase):
     multiplexer = event_multiplexer.EventMultiplexer(
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
-    plugins = []
+    plugins = [
+        FakePlugin(plugin_name='foo', is_active_value=True),
+        FakePlugin(plugin_name='bar', is_active_value=False)
+    ]
     app = application.TensorBoardWSGIApp(
         self.temp_dir, plugins, multiplexer, reload_interval=0)
     try:
@@ -124,6 +161,12 @@ class TensorboardServerTest(test.TestCase):
     parsed_object = self._getJson('/data/logdir')
     self.assertEqual(parsed_object, {'logdir': self.temp_dir})
 
+  def testPluginsListing(self):
+    """Test the format of the data/plugins_listing endpoint."""
+    parsed_object = self._getJson('/data/plugins_listing')
+    # Plugin foo is active. Plugin bar is not.
+    self.assertEqual(parsed_object, {'foo': True, 'bar': False})
+
   def testRuns(self):
     """Test the format of the /data/runs endpoint."""
     run_json = self._getJson('/data/runs')
@@ -484,32 +527,21 @@ class TensorboardSimpleServerConstructionTest(test.TestCase):
 class TensorBoardApplcationConstructionTest(test.TestCase):
 
   def testExceptions(self):
-
-    class UnnamedPlugin(base_plugin.TBPlugin):
-
-      def get_plugin_apps(self):
-        pass
-
-      def is_active(self):
-        return True
-
-    class MockPlugin(UnnamedPlugin):
-      plugin_name = 'mock'
-
-    class OtherMockPlugin(UnnamedPlugin):
-      plugin_name = 'mock'
-
     logdir = '/fake/foo'
     multiplexer = event_multiplexer.EventMultiplexer()
 
     # Fails if there is an unnamed plugin
     with self.assertRaises(ValueError):
-      plugins = [UnnamedPlugin()]
+      # This plugin lacks a name.
+      plugins = [FakePlugin(plugin_name=None, is_active_value=True)]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
     # Fails if there are two plugins with same name
     with self.assertRaises(ValueError):
-      plugins = [MockPlugin(), OtherMockPlugin()]
+      plugins = [
+          FakePlugin(plugin_name='foo', is_active_value=True),
+          FakePlugin(plugin_name='foo', is_active_value=True),
+      ]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
 
diff --git a/tensorflow/tensorboard/http_api.md b/tensorflow/tensorboard/http_api.md
index 16c2f95ae1..00aeb6353e 100644
--- a/tensorflow/tensorboard/http_api.md
+++ b/tensorflow/tensorboard/http_api.md
@@ -36,6 +36,13 @@ Returns a JSON object with a key "logdir" that maps to the `logdir` argument
 
 The `logdir` argument is the path of the directory that contains events files.
 
+## `data/plugins_listing`
+
+Returns a dict mapping from plugin name to a boolean indicating whether the
+plugin is active. A plugin might be inactive, for instance, if it lacks relevant
+data. Every plugin has a key. This route helps the frontend avoid issuing
+requests to an inactive plugin - the routes of an inactive plugin do not work.
+
 ## `data/runs`
 
 Returns a dictionary mapping from `run name` (quoted string) to dictionaries
-- 
GitLab


From 0ca0b63fddda9bc81ad3bce00594b06e0c543ea9 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 6 Apr 2017 17:07:09 -0800
Subject: [PATCH 0195/1563] Added the ability to retrieve the amount of usable
 gpu memory Change: 152453470

---
 tensorflow/core/grappler/devices.cc | 16 ++++++++++++++++
 tensorflow/core/grappler/devices.h  |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/tensorflow/core/grappler/devices.cc b/tensorflow/core/grappler/devices.cc
index d3fc9044d3..b318ac22d4 100644
--- a/tensorflow/core/grappler/devices.cc
+++ b/tensorflow/core/grappler/devices.cc
@@ -53,6 +53,22 @@ int GetNumAvailableGPUs() {
   return num_eligible_gpus;
 }
 
+int64 AvailableGPUMemory(int gpu_id) {
+#if GOOGLE_CUDA
+  // Look up the device, to see its attributes.
+  perftools::gputools::Platform* gpu_platform = GPUMachineManager();
+  CHECK_LT(gpu_id, gpu_platform->VisibleDeviceCount());
+  perftools::gputools::StreamExecutor* se =
+      gpu_platform->ExecutorForDevice(gpu_id).ValueOrDie();
+  int64 total_memory, available_memory;
+  CHECK(se->DeviceMemoryUsage(&available_memory, &total_memory));
+
+  return available_memory;
+#else
+  return 0;
+#endif
+}
+
 int GetNumAvailableLogicalCPUCores() { return port::NumSchedulableCPUs(); }
 
 }  // end namespace grappler
diff --git a/tensorflow/core/grappler/devices.h b/tensorflow/core/grappler/devices.h
index 329e8e2e65..2d6c41888d 100644
--- a/tensorflow/core/grappler/devices.h
+++ b/tensorflow/core/grappler/devices.h
@@ -29,6 +29,10 @@ namespace grappler {
 // than 8.
 int GetNumAvailableGPUs();
 
+// Maximum amount of gpu memory available per gpu. gpu_id must be in the range
+// [0, num_available_gpu)
+int64 AvailableGPUMemory(int gpu_id);
+
 // Get the number of logical CPU cores (aka hyperthreads) available.
 int GetNumAvailableLogicalCPUCores();
 
-- 
GitLab


From 7f28f166092e8f6621bc264e12a7201a22f76997 Mon Sep 17 00:00:00 2001
From: Lukasz Kaiser <lukaszkaiser@google.com>
Date: Thu, 6 Apr 2017 17:21:41 -0800
Subject: [PATCH 0196/1563] Allow to set session ConfigProto in RunConfig and
 use it in Estimator. Change: 152454548

---
 .../learn/python/learn/estimators/estimator.py        | 11 ++++++++---
 .../learn/python/learn/estimators/run_config.py       | 11 ++++++++++-
 tensorflow/python/estimator/estimator.py              | 11 ++++++++---
 tensorflow/python/estimator/run_config.py             |  4 ++++
 .../api/golden/tensorflow.estimator.-run-config.pbtxt |  4 ++++
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 107454dca1..29ea692f8f 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -362,6 +362,11 @@ class BaseEstimator(
       self._config = config
     logging.info('Using config: %s', str(vars(self._config)))
 
+    if self._config.session_config is None:
+      self._session_config = config_pb2.ConfigProto(allow_soft_placement=True)
+    else:
+      self._session_config = self._config.session_config
+
     # Model directory.
     if (model_dir is not None) and (self._config.model_dir is not None):
       if model_dir != self._config.model_dir:
@@ -829,7 +834,7 @@ class BaseEstimator(
           eval_ops=update_op,
           final_ops=eval_dict,
           hooks=hooks,
-          config=config_pb2.ConfigProto(allow_soft_placement=True))
+          config=self._session_config)
       current_global_step = eval_results[global_step_key]
 
       _write_dict_to_summary(eval_dir, eval_results, current_global_step)
@@ -864,7 +869,7 @@ class BaseEstimator(
           session_creator=monitored_session.ChiefSessionCreator(
               checkpoint_filename_with_path=checkpoint_path,
               scaffold=infer_ops.scaffold,
-              config=config_pb2.ConfigProto(allow_soft_placement=True)))
+              config=self._session_config))
       if not as_iterable:
         with mon_sess:
           if not mon_sess.should_stop():
@@ -976,7 +981,7 @@ class BaseEstimator(
           chief_only_hooks=chief_hooks + model_fn_ops.training_chief_hooks,
           save_checkpoint_secs=0,  # Saving is handled by a hook.
           save_summaries_steps=self._config.save_summary_steps,
-          config=config_pb2.ConfigProto(allow_soft_placement=True)
+          config=self._session_config
       ) as mon_sess:
         loss = None
         while not mon_sess.should_stop():
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index bc7465bbc2..37ee814b62 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -214,7 +214,8 @@ class RunConfig(ClusterConfig):
                keep_checkpoint_max=5,
                keep_checkpoint_every_n_hours=10000,
                evaluation_master='',
-               model_dir=None):
+               model_dir=None,
+               session_config=None):
     """Constructor.
 
     Note that the superclass `ClusterConfig` may set properties like
@@ -246,6 +247,9 @@ class RunConfig(ClusterConfig):
       evaluation_master: the master on which to perform evaluation.
       model_dir: directory where model parameters, graph etc are saved. If
         `None`, see `Estimator` about where the model will be saved.
+      session_config: a ConfigProto used to set session parameters, or None.
+         Note - using this argument, it is easy to provide settings which break
+         otherwise perfectly good models. Use with care.
     """
     super(RunConfig, self).__init__(
         master=master, evaluation_master=evaluation_master)
@@ -261,6 +265,7 @@ class RunConfig(ClusterConfig):
     self._tf_random_seed = tf_random_seed
     self._save_summary_steps = save_summary_steps
     self._save_checkpoints_secs = save_checkpoints_secs
+    self._session_config = session_config
     if save_checkpoints_secs == RunConfig._USE_DEFAULT:
       if save_checkpoints_steps is None:
         self._save_checkpoints_secs = 600
@@ -345,6 +350,10 @@ class RunConfig(ClusterConfig):
   def save_checkpoints_steps(self):
     return self._save_checkpoints_steps
 
+  @property
+  def session_config(self):
+    return self._session_config
+
   @property
   def keep_checkpoint_max(self):
     return self._keep_checkpoint_max
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index d92c6526a7..80c5bbf684 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -141,6 +141,11 @@ class Estimator(object):
 
     logging.info('Using config: %s', str(vars(self._config)))
 
+    if self._config.session_config is None:
+      self._session_config = config_pb2.ConfigProto(allow_soft_placement=True)
+    else:
+      self._session_config = self._config.session_config
+
     self._device_fn = _get_replica_device_setter(self._config)
 
     if model_fn is None:
@@ -317,7 +322,7 @@ class Estimator(object):
           session_creator=training.ChiefSessionCreator(
               checkpoint_filename_with_path=checkpoint_path,
               scaffold=estimator_spec.scaffold,
-              config=config_pb2.ConfigProto(allow_soft_placement=True)),
+              config=self._session_config),
           hooks=hooks) as mon_sess:
         while not mon_sess.should_stop():
           preds_evaluated = mon_sess.run(predictions)
@@ -580,7 +585,7 @@ class Estimator(object):
           chief_only_hooks=chief_hooks + estimator_spec.training_chief_hooks,
           save_checkpoint_secs=0,  # Saving is handled by a hook.
           save_summaries_steps=self._config.save_summary_steps,
-          config=config_pb2.ConfigProto(allow_soft_placement=True)) as mon_sess:
+          config=self._session_config) as mon_sess:
         loss = None
         while not mon_sess.should_stop():
           _, loss = mon_sess.run([estimator_spec.train_op, estimator_spec.loss])
@@ -635,7 +640,7 @@ class Estimator(object):
           eval_ops=update_op,
           final_ops=eval_dict,
           hooks=hooks,
-          config=config_pb2.ConfigProto(allow_soft_placement=True))
+          config=self._session_config)
 
       _write_dict_to_summary(
           output_dir=eval_dir,
diff --git a/tensorflow/python/estimator/run_config.py b/tensorflow/python/estimator/run_config.py
index c6e6c60991..79b55c6853 100644
--- a/tensorflow/python/estimator/run_config.py
+++ b/tensorflow/python/estimator/run_config.py
@@ -72,6 +72,10 @@ class RunConfig(object):
   def save_checkpoints_secs(self):
     return 600
 
+  @property
+  def session_config(self):
+    return None
+
   @property
   def save_checkpoints_steps(self):
     return None
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
index 5f3dee5b40..8fd991a317 100644
--- a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
@@ -46,6 +46,10 @@ tf_class {
     name: "save_summary_steps"
     mtype: "<type \'property\'>"
   }
+  member {
+    name: "session_config"
+    mtype: "<type \'property\'>"
+  }
   member {
     name: "task_id"
     mtype: "<type \'property\'>"
-- 
GitLab


From 983fdfe955a16e6a67204b825782e1a30141482a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 17:43:30 -0800
Subject: [PATCH 0197/1563] Colocate ResourceVariable reads with their handles.
 Change: 152455939

---
 tensorflow/python/ops/resource_variable_ops.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 86e0cae27a..77f0468c01 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -197,8 +197,10 @@ class ResourceVariable(object):
             self._initialize_op = gen_resource_variable_ops.assign_variable_op(
                 self._handle, self._initial_value, name=n)
         with ops.name_scope("Read"), ops.colocate_with(self._handle):
-          value = gen_resource_variable_ops.read_variable_op(
-              self._handle, dtype=self._dtype)
+          # Manually assign reads to the handle's device to avoid log messages.
+          with ops.device(self._handle.device):
+            value = gen_resource_variable_ops.read_variable_op(
+                self._handle, dtype=self._dtype)
           self._graph_element = value
           if caching_device is not None:
             # Variables may be created in a tf.device() or ops.colocate_with()
@@ -276,8 +278,9 @@ class ResourceVariable(object):
     """A cached operation which reads the value of this variable."""
     if self._cached_value is not None:
       return self._cached_value
-    return gen_resource_variable_ops.read_variable_op(
-        self._handle, dtype=self._dtype)
+    with ops.device(self._handle.device):
+      return gen_resource_variable_ops.read_variable_op(
+          self._handle, dtype=self._dtype)
 
   def _as_graph_element(self):
     """Conversion function for Graph.as_graph_element()."""
@@ -318,8 +321,9 @@ class ResourceVariable(object):
      the read operation.
     """
     with ops.name_scope("Read"):
-      value = gen_resource_variable_ops.read_variable_op(
-          self._handle, dtype=self._dtype)
+      with ops.device(self._handle.device):
+        value = gen_resource_variable_ops.read_variable_op(
+            self._handle, dtype=self._dtype)
     # Return an identity so it can get placed on whatever device the context
     # specifies instead of the device where the variable is.
     return array_ops.identity(value)
-- 
GitLab


From c70d43f844a7d70a7149c34e4e5bad2b2d5591fb Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 6 Apr 2017 17:46:26 -0800
Subject: [PATCH 0198/1563] tfdbg: update doc for new command list_source/ls
 Change: 152456128

---
 tensorflow/docs_src/programmers_guide/debugger.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/docs_src/programmers_guide/debugger.md b/tensorflow/docs_src/programmers_guide/debugger.md
index 6f442e6e0c..10eebf6f42 100644
--- a/tensorflow/docs_src/programmers_guide/debugger.md
+++ b/tensorflow/docs_src/programmers_guide/debugger.md
@@ -130,6 +130,8 @@ Try the following commands at the `tfdbg>` prompt (referencing the code at
 | `lo -r hidden/Relu:0` | List the recipients of the output of the node `hidden/Relu`, recursively—i.e., the output recipient tree. |
 | `lt -n softmax.*` | List all dumped tensors whose names match the regular-expression pattern `softmax.*`. |
 | `lt -t MatMul` | List all dumped tensors whose node type is `MatMul`. |
+| `ls` | List all Python source files responsible for constructing the nodes (and tensors) in the current graph. |
+| `ls -n softmax.*` | List Python source files responsible for constructing the nodes whose names match the pattern `softmax.*`. |
 | `ps /path/to/source.py` | Print the Python source file source.py, with the lines annotated with the ops created at each of them, respectively. |
 | `ps -t /path/to/source.py` | Same as the command above, but perform annotation using dumped Tensors, instead of ops. |
 | `ps -b 30 /path/to/source.py` | Annotate source.py beginning at line 30. |
-- 
GitLab


From a2d85018d5c883e5c781f3dd751e74a3aed3d0a4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 17:48:38 -0800
Subject: [PATCH 0199/1563] Make rnn directions slightly easier to follow.
 Change: 152456296

---
 tensorflow/docs_src/tutorials/recurrent.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tensorflow/docs_src/tutorials/recurrent.md b/tensorflow/docs_src/tutorials/recurrent.md
index a1c0532f5a..8cc6cf15ef 100644
--- a/tensorflow/docs_src/tutorials/recurrent.md
+++ b/tensorflow/docs_src/tutorials/recurrent.md
@@ -173,15 +173,22 @@ final_state = state
 
 ## Run the Code
 
-Start by cloning the [TensorFlow models repo](https://github.com/tensorflow/models) from GitHub.
-You'll also need to download the PTB dataset, as discussed at the beginning of
-this tutorial; we'll assume the dataset is located in `/tmp/simple-examples/data`.
+Before running the code, download the PTB dataset, as discussed at the beginning
+of this tutorial.  Then, extract the PTB dataset underneath your home directory
+as follows:
 
-Run the following commands:
+```bsh
+tar xvfz simple-examples.tgz -C $HOME
+```
+_(Note: On Windows, you may need to use
+[other tools](https://wiki.haskell.org/How_to_unpack_a_tar_file_in_Windows).)_
+
+Now, clone the [TensorFlow models repo](https://github.com/tensorflow/models)
+from GitHub. Run the following commands:
 
-```bash
+```bsh
 cd models/tutorials/rnn/ptb
-python ptb_word_lm.py --data_path=/tmp/simple-examples/data/ --model=small
+python ptb_word_lm.py --data_path=$HOME/simple-examples/data/ --model=small
 ```
 
 There are 3 supported model configurations in the tutorial code: "small",
-- 
GitLab


From 14999f9ddcc27988fd9d22636315cedd971ec3de Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 18:17:30 -0800
Subject: [PATCH 0200/1563] Internal change Change: 152458104

---
 tensorflow/python/ops/array_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 5ebfe5b89f..45efc51d5c 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -196,7 +196,7 @@ def broadcast_dynamic_shape(shape_x, shape_y):
 
   Args:
     shape_x: A rank 1 integer `Tensor`, representing the shape of x.
-    shape_y: A rank 1 integer `Tensor`, representing the shape of x.
+    shape_y: A rank 1 integer `Tensor`, representing the shape of y.
   Returns:
     A rank 1 integer `Tensor` representing the broadcasted shape.
   """
-- 
GitLab


From 55c809b62d688637813c828301e528cb2fbcc54b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 18:34:44 -0800
Subject: [PATCH 0201/1563] Adds batch renormalization.

NOTE: if you use renormalization, you might want to use faster moving average updates, i.e. lower `decay` values.
Change: 152458872
---
 .../contrib/layers/python/layers/layers.py    |  26 +-
 tensorflow/python/layers/normalization.py     | 273 ++++++++++++++----
 .../python/layers/normalization_test.py       |  59 ++++
 .../tools/api/golden/tensorflow.layers.pbtxt  |   2 +-
 4 files changed, 294 insertions(+), 66 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index cc70f5312c..13cabe6e04 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -379,7 +379,10 @@ def batch_norm(inputs,
                fused=False,
                data_format=DATA_FORMAT_NHWC,
                zero_debias_moving_mean=False,
-               scope=None):
+               scope=None,
+               renorm=False,
+               renorm_clipping=None,
+               renorm_decay=0.99):
   """Adds a Batch Normalization layer from http://arxiv.org/abs/1502.03167.
 
     "Batch Normalization: Accelerating Deep Network Training by Reducing
@@ -446,6 +449,19 @@ def batch_norm(inputs,
     zero_debias_moving_mean: Use zero_debias for moving_mean. It creates a new
       pair of variables 'moving_mean/biased' and 'moving_mean/local_step'.
     scope: Optional scope for `variable_scope`.
+    renorm: Whether to use Batch Renormalization
+      (https://arxiv.org/abs/1702.03275). This adds extra variables during
+      training. The inference is the same for either value of this parameter.
+    renorm_clipping: A dictionary that may map keys 'rmax', 'rmin', 'dmax' to
+      scalar `Tensors` used to clip the renorm correction. The correction
+      `(r, d)` is used as `corrected_value = normalized_value * r + d`, with
+      `r` clipped to [rmin, rmax], and `d` to [-dmax, dmax]. Missing rmax, rmin,
+      dmax are set to inf, 0, inf, respectively.
+    renorm_decay: Momentum used to update the moving means and standard
+      deviations with renorm. Unlike `momentum`, this affects training
+      and should be neither too small (which would add noise) nor too large
+      (which would give stale estimates). Note that `decay` is still applied
+      to get the means and variances for inference.
 
   Returns:
     A `Tensor` representing the output of the operation.
@@ -464,6 +480,8 @@ def batch_norm(inputs,
     if param_regularizers is not None:
       raise ValueError('Regularizers are not currently '
                        'supported for fused batch norm.')
+    if renorm:
+      raise ValueError('Renorm is not supported for fused batch norm.')
     return _fused_batch_norm(
         inputs,
         decay=decay,
@@ -524,6 +542,9 @@ def batch_norm(inputs,
           beta_regularizer=beta_regularizer,
           gamma_regularizer=gamma_regularizer,
           trainable=trainable,
+          renorm=renorm,
+          renorm_clipping=renorm_clipping,
+          renorm_momentum=renorm_decay,
           name=sc.name,
           _scope=sc,
           _reuse=reuse)
@@ -551,6 +572,9 @@ def batch_norm(inputs,
     # Custom updates collections are not supported because the update logic
     # is different in this case, in particular w.r.t. "forced updates" and
     # update op reuse.
+    if renorm:
+      raise ValueError('renorm is not supported with batch_weights, '
+                       'updates_collections or zero_debias_moving_mean')
     inputs_shape = inputs.get_shape()
     inputs_rank = inputs_shape.ndims
     if inputs_rank is None:
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 8659382834..c998f57da7 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -69,6 +69,19 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
     trainable: Boolean, if `True` also add variables to the graph collection
       `GraphKeys.TRAINABLE_VARIABLES` (see tf.Variable).
     name: A string, the name of the layer.
+    renorm: Whether to use Batch Renormalization
+      (https://arxiv.org/abs/1702.03275). This adds extra variables during
+      training. The inference is the same for either value of this parameter.
+    renorm_clipping: A dictionary that may map keys 'rmax', 'rmin', 'dmax' to
+      scalar `Tensors` used to clip the renorm correction. The correction
+      `(r, d)` is used as `corrected_value = normalized_value * r + d`, with
+      `r` clipped to [rmin, rmax], and `d` to [-dmax, dmax]. Missing rmax, rmin,
+      dmax are set to inf, 0, inf, respectively.
+    renorm_momentum: Momentum used to update the moving means and standard
+      deviations with renorm. Unlike `momentum`, this affects training
+      and should be neither too small (which would add noise) nor too large
+      (which would give stale estimates). Note that `momentum` is still applied
+      to get the means and variances for inference.
   """
 
   def __init__(self,
@@ -85,6 +98,9 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
                gamma_regularizer=None,
                trainable=True,
                name=None,
+               renorm=False,
+               renorm_clipping=None,
+               renorm_momentum=0.99,
                **kwargs):
     super(BatchNormalization, self).__init__(
         name=name, trainable=trainable, **kwargs)
@@ -99,6 +115,15 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
     self.moving_variance_initializer = moving_variance_initializer
     self.beta_regularizer = beta_regularizer
     self.gamma_regularizer = gamma_regularizer
+    self.renorm = renorm
+    if renorm:
+      renorm_clipping = renorm_clipping or {}
+      keys = ['rmax', 'rmin', 'dmax']
+      if set(renorm_clipping) - set(keys):
+        raise ValueError('renorm_clipping %s contains keys not in %s' %
+                         (renorm_clipping, keys))
+      self.renorm_clipping = renorm_clipping
+      self.renorm_momentum = renorm_momentum
 
   def build(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape)
@@ -148,9 +173,90 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
           shape=(param_dim,),
           initializer=self.moving_variance_initializer,
           trainable=False)
+      if self.renorm:
+        # Create variables to maintain the moving mean and standard deviation.
+        # These are used in training and thus are different from the moving
+        # averages above. The renorm variables are colocated with moving_mean
+        # and moving_variance.
+        # NOTE: below, the outer `with device` block causes the current device
+        # stack to be cleared. The nested ones use a `lambda` to set the desired
+        # device and ignore any devices that may be set by the custom getter.
+        def _renorm_variable(name, shape):
+          var = vs.get_variable(name,
+                                shape=shape,
+                                initializer=init_ops.zeros_initializer(),
+                                trainable=False)
+          return var
+        with ops.device(None):
+          with ops.device(lambda _: self.moving_mean.device):
+            self.renorm_mean = _renorm_variable('renorm_mean', (param_dim,))
+            self.renorm_mean_weight = _renorm_variable('renorm_mean_weight', ())
+          # We initialize renorm_stddev to 0, and maintain the (0-initialized)
+          # renorm_stddev_weight. This allows us to (1) mix the average
+          # stddev with the minibatch stddev early in training, and (2) compute
+          # the unbiased average stddev by dividing renorm_stddev by the weight.
+          with ops.device(lambda _: self.moving_variance.device):
+            self.renorm_stddev = _renorm_variable('renorm_stddev', (param_dim,))
+            self.renorm_stddev_weight = _renorm_variable(
+                'renorm_stddev_weight', ())
     finally:
       vs.get_variable_scope().set_partitioner(partitioner)
 
+  def _renorm_correction_and_moments(self, mean, variance, training):
+    """Returns the correction and update values for renorm."""
+    stddev = math_ops.sqrt(variance + self.epsilon)
+    # Compute the average mean and standard deviation, as if they were
+    # initialized with this batch's moments.
+    mixed_renorm_mean = (self.renorm_mean +
+                         (1. - self.renorm_mean_weight) * mean)
+    mixed_renorm_stddev = (self.renorm_stddev +
+                           (1. - self.renorm_stddev_weight) * stddev)
+    # Compute the corrections for batch renorm.
+    r = stddev / mixed_renorm_stddev
+    d = (mean - mixed_renorm_mean) / mixed_renorm_stddev
+    # Ensure the corrections use pre-update moving averages.
+    with ops.control_dependencies([r, d]):
+      mean = array_ops.identity(mean)
+      stddev = array_ops.identity(stddev)
+    rmin, rmax, dmax = [self.renorm_clipping.get(key)
+                        for key in ['rmin', 'rmax', 'dmax']]
+    if rmin is not None:
+      r = math_ops.maximum(r, rmin)
+    if rmax is not None:
+      r = math_ops.minimum(r, rmax)
+    if dmax is not None:
+      d = math_ops.maximum(d, -dmax)
+      d = math_ops.minimum(d, dmax)
+    # When not training, use r=1, d=0, and decay=1 meaning no updates.
+    r = _smart_select(training, lambda: r, lambda: array_ops.ones_like(r))
+    d = _smart_select(training, lambda: d, lambda: array_ops.zeros_like(d))
+    decay = _smart_select(training, lambda: self.renorm_momentum, lambda: 1.)
+    def _update_renorm_variable(var, weight, value):
+      """Updates a moving average and weight, returns the unbiased value."""
+      # Update the variables without zero debiasing. The debiasing will be
+      # accomplished by dividing the exponential moving average by the weight.
+      # For example, after a single update, the moving average would be
+      # (1-decay) * value. and the weight will be 1-decay, with their ratio
+      # giving value.
+      new_var = moving_averages.assign_moving_average(
+          var, value, decay, zero_debias=False)
+      new_weight = moving_averages.assign_moving_average(
+          weight, 1., decay, zero_debias=False)
+      return new_var / new_weight
+
+    with ops.colocate_with(self.moving_mean):
+      new_mean = _update_renorm_variable(self.renorm_mean,
+                                         self.renorm_mean_weight,
+                                         mean)
+    with ops.colocate_with(self.moving_variance):
+      new_stddev = _update_renorm_variable(self.renorm_stddev,
+                                           self.renorm_stddev_weight,
+                                           stddev)
+      # Make sqrt(moving_variance + epsilon) = new_stddev.
+      new_variance = math_ops.square(new_stddev) - self.epsilon
+
+    return (r, d, new_mean, new_variance)
+
   def call(self, inputs, training=False):
     # First, compute the axes along which to reduce the mean / variance,
     # as well as the broadcast shape to be used for all parameters.
@@ -164,82 +270,66 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
     # Determines whether broadcasting is needed.
     needs_broadcasting = (sorted(reduction_axes) != list(range(ndim))[:-1])
 
+    scale, offset = self.gamma, self.beta
+
     # Determine a boolean value for `training`: could be True, False, or None.
     training_value = utils.constant_value(training)
-
-    if needs_broadcasting:
-      # In this case we must explictly broadcast all parameters.
-      if self.center:
-        broadcast_beta = array_ops.reshape(self.beta, broadcast_shape)
-      else:
-        broadcast_beta = None
-      if self.scale:
-        broadcast_gamma = array_ops.reshape(self.gamma, broadcast_shape)
-      else:
-        broadcast_gamma = None
-
     if training_value is not False:
-      if needs_broadcasting:
-        broadcast_mean, broadcast_variance = nn.moments(
-            inputs, reduction_axes, keep_dims=True)
-        mean = array_ops.reshape(broadcast_mean, [-1])
-        variance = array_ops.reshape(broadcast_variance, [-1])
+      # Some of the computations here are not necessary when training==False
+      # but not a constant. However, this makes the code simpler.
+      mean, variance = nn.moments(inputs, reduction_axes)
+      if self.renorm:
+        r, d, new_mean, new_variance = self._renorm_correction_and_moments(
+            mean, variance, training)
+        # When training, the normalized values (say, x) will be transformed as
+        # x * gamma + beta without renorm, and (x * r + d) * gamma + beta
+        # = x * (r * gamma) + (d * gamma + beta) with renorm.
+        scale = array_ops.stop_gradient(r, name='renorm_r')
+        offset = array_ops.stop_gradient(d, name='renorm_d')
+        if self.gamma is not None:
+          scale *= self.gamma
+          offset *= self.gamma
+        if self.beta is not None:
+          offset += self.beta
       else:
-        mean, variance = nn.moments(inputs, reduction_axes)
+        new_mean, new_variance = mean, variance
+
+      # Update moving averages when training, and prevent updates otherwise.
+      decay = _smart_select(training, lambda: self.momentum, lambda: 1.)
+      mean_update = moving_averages.assign_moving_average(
+          self.moving_mean, new_mean, decay, zero_debias=False)
+      variance_update = moving_averages.assign_moving_average(
+          self.moving_variance, new_variance, decay, zero_debias=False)
 
-      # Prepare updates if necessary.
       if not self.updates:
-        mean_update = moving_averages.assign_moving_average(
-            self.moving_mean, mean, self.momentum, zero_debias=False)
-        variance_update = moving_averages.assign_moving_average(
-            self.moving_variance, variance, self.momentum, zero_debias=False)
         # In the future this should be refactored into a self.add_update
         # methods in order to allow for instance-based BN layer sharing
         # across unrelated input streams (e.g. like in Keras).
         self.updates.append(mean_update)
         self.updates.append(variance_update)
 
-    # Normalize batch. We do this inside separate functions for training
-    # and inference so as to avoid evaluating both branches.
-    def normalize_in_test():
-      if needs_broadcasting:
-        broadcast_moving_mean = array_ops.reshape(self.moving_mean,
-                                                  broadcast_shape)
-        broadcast_moving_variance = array_ops.reshape(self.moving_variance,
-                                                      broadcast_shape)
-        return nn.batch_normalization(inputs,
-                                      broadcast_moving_mean,
-                                      broadcast_moving_variance,
-                                      broadcast_beta,
-                                      broadcast_gamma,
-                                      self.epsilon)
-      else:
-        return nn.batch_normalization(inputs,
-                                      self.moving_mean,
-                                      self.moving_variance,
-                                      self.beta if self.center else None,
-                                      self.gamma if self.scale else None,
-                                      self.epsilon)
-
-    def normalize_in_training():
-      if needs_broadcasting:
-        return nn.batch_normalization(inputs,
-                                      broadcast_mean,
-                                      broadcast_variance,
-                                      broadcast_beta,
-                                      broadcast_gamma,
-                                      self.epsilon)
-      else:
-        return nn.batch_normalization(inputs,
-                                      mean,
-                                      variance,
-                                      self.beta if self.center else None,
-                                      self.gamma if self.scale else None,
-                                      self.epsilon)
+      mean = _smart_select(training,
+                           lambda: mean,
+                           lambda: self.moving_mean)
+      variance = _smart_select(training,
+                               lambda: variance,
+                               lambda: self.moving_variance)
+
+    else:
+      mean, variance = self.moving_mean, self.moving_variance
 
-    return utils.smart_cond(training,
-                            normalize_in_training,
-                            normalize_in_test)
+    def _broadcast(v):
+      if needs_broadcasting and v is not None:
+        # In this case we must explictly broadcast all parameters.
+        return array_ops.reshape(v, broadcast_shape)
+      return v
+
+    return nn.batch_normalization(inputs,
+                                  _broadcast(mean),
+                                  _broadcast(variance),
+                                  _broadcast(offset),
+                                  _broadcast(scale),
+                                  self.epsilon)
 
 
 def batch_normalization(inputs,
@@ -257,7 +347,10 @@ def batch_normalization(inputs,
                         training=False,
                         trainable=True,
                         name=None,
-                        reuse=None):
+                        reuse=None,
+                        renorm=False,
+                        renorm_clipping=None,
+                        renorm_momentum=0.99):
   """Functional interface for the batch normalization layer.
 
   Reference: http://arxiv.org/abs/1502.03167
@@ -294,6 +387,19 @@ def batch_normalization(inputs,
     name: String, the name of the layer.
     reuse: Boolean, whether to reuse the weights of a previous layer
       by the same name.
+    renorm: Whether to use Batch Renormalization
+      (https://arxiv.org/abs/1702.03275). This adds extra variables during
+      training. The inference is the same for either value of this parameter.
+    renorm_clipping: A dictionary that may map keys 'rmax', 'rmin', 'dmax' to
+      scalar `Tensors` used to clip the renorm correction. The correction
+      `(r, d)` is used as `corrected_value = normalized_value * r + d`, with
+      `r` clipped to [rmin, rmax], and `d` to [-dmax, dmax]. Missing rmax, rmin,
+      dmax are set to inf, 0, inf, respectively.
+    renorm_momentum: Momentum used to update the moving means and standard
+      deviations with renorm. Unlike `momentum`, this affects training
+      and should be neither too small (which would add noise) nor too large
+      (which would give stale estimates). Note that `momentum` is still applied
+      to get the means and variances for inference.
 
   Returns:
     Output tensor.
@@ -311,6 +417,9 @@ def batch_normalization(inputs,
       beta_regularizer=beta_regularizer,
       gamma_regularizer=gamma_regularizer,
       trainable=trainable,
+      renorm=renorm,
+      renorm_clipping=renorm_clipping,
+      renorm_momentum=renorm_momentum,
       name=name,
       _reuse=reuse,
       _scope=name)
@@ -321,3 +430,39 @@ def batch_normalization(inputs,
 
 BatchNorm = BatchNormalization
 batch_norm = batch_normalization
+
+
+# Helper function
+
+
+def _smart_select(pred, fn_then, fn_else):
+  """Selects fn_then() or fn_else() based on the value of pred.
+
+  The purpose of this function is the same as `utils.smart_cond`. However, at
+  the moment there is a bug (b/36297356) that seems to kick in only when
+  `smart_cond` delegates to `tf.cond`, which sometimes results in the training
+  hanging when using parameter servers. This function will output the result
+  of `fn_then` or `fn_else` if `pred` is known at graph construction time.
+  Otherwise, it will use `tf.where` which will result in some redundant work
+  (both branches will be computed but only one selected). However, the tensors
+  involved will usually be small (means and variances in batchnorm), so the
+  cost will be small and will not be incurred at all if `pred` is a constant.
+
+  Args:
+    pred: A boolean scalar `Tensor`.
+    fn_then: A callable to use when pred==True.
+    fn_else: A callable to use when pred==False.
+
+  Returns:
+    A `Tensor` whose value is fn_then() or fn_else() based on the value of pred.
+  """
+  pred_value = utils.constant_value(pred)
+  if pred_value:
+    return fn_then()
+  elif pred_value is False:
+    return fn_else()
+  t_then = array_ops.expand_dims(fn_then(), 0)
+  t_else = array_ops.expand_dims(fn_else(), 0)
+  pred = array_ops.reshape(pred, [1])
+  result = array_ops.where(pred, t_then, t_else)
+  return array_ops.squeeze(result, [0])
diff --git a/tensorflow/python/layers/normalization_test.py b/tensorflow/python/layers/normalization_test.py
index 91b7cb6f48..0f82f73ea4 100644
--- a/tensorflow/python/layers/normalization_test.py
+++ b/tensorflow/python/layers/normalization_test.py
@@ -24,6 +24,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.layers import normalization as normalization_layers
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import variable_scope
@@ -513,6 +514,64 @@ class BNTest(test.TestCase):
     _ = bn.apply(inputs, training=training)
     self.assertEqual(len(bn.losses), 1)
 
+  def testRenorm(self):
+    shape = (4, 3)
+    xt = array_ops.placeholder(dtypes.float32, shape)
+    momentum = 0.99
+    renorm_momentum = 0.8
+    rmax = 1.1
+    rmin = 0.9
+    dmax = 0.1
+    gamma = 2.
+    beta = 3.
+    epsilon = 0.001
+    bn = normalization_layers.BatchNormalization(
+        axis=1,
+        gamma_initializer=init_ops.constant_initializer(gamma),
+        beta_initializer=init_ops.constant_initializer(beta),
+        epsilon=epsilon,
+        momentum=momentum,
+        renorm=True,
+        renorm_clipping={'rmax': rmax, 'rmin': rmin, 'dmax': dmax},
+        renorm_momentum=renorm_momentum)
+    training = array_ops.placeholder(dtypes.bool)
+    yt = bn.apply(xt, training=training)
+
+    moving_mean = 0.
+    moving_variance = 1.
+    renorm_mean = renorm_stddev = 0.
+    renorm_weight = 0.
+    with self.test_session(use_gpu=True) as sess:
+      sess.run(variables.global_variables_initializer())
+      for _ in range(5):
+        x = np.random.random(shape)
+
+        mean = x.mean(0)
+        stddev = np.sqrt(x.var(0) + epsilon)
+        adj_mean = renorm_mean + (1. - renorm_weight) * mean
+        adj_stddev = renorm_stddev + (1. - renorm_weight) * stddev
+        r = (stddev / adj_stddev).clip(rmin, rmax)
+        d = ((mean - adj_mean) / adj_stddev).clip(-dmax, dmax)
+        y_train = ((x - mean) / stddev * r + d) * gamma + beta
+        renorm_mean += (mean - renorm_mean) * (1. - renorm_momentum)
+        renorm_stddev += (stddev - renorm_stddev) * (1. - renorm_momentum)
+        renorm_weight += (1. - renorm_weight) * (1. - renorm_momentum)
+        moving_mean += (renorm_mean / renorm_weight -
+                        moving_mean) * (1. - momentum)
+        moving_variance += ((renorm_stddev / renorm_weight) ** 2 - epsilon -
+                            moving_variance) * (1. - momentum)
+
+        y_test = ((x - moving_mean) / (moving_variance + epsilon) ** 0.5 *
+                  gamma) + beta
+
+        yt_val_train, _, _ = sess.run([yt] + bn.updates,
+                                      feed_dict={xt: x, training: True})
+        yt_val_test, _, _ = sess.run([yt] + bn.updates,
+                                     feed_dict={xt: x, training: False})
+
+        self.assertAllClose(y_train, yt_val_train, atol=1e-5)
+        self.assertAllClose(y_test, yt_val_test, atol=1e-5)
+
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
index fe72e979ab..6ca38e259b 100644
--- a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
@@ -14,7 +14,7 @@ tf_module {
   }
   member_method {
     name: "batch_normalization"
-    argspec: "args=[\'inputs\', \'axis\', \'momentum\', \'epsilon\', \'center\', \'scale\', \'beta_initializer\', \'gamma_initializer\', \'moving_mean_initializer\', \'moving_variance_initializer\', \'beta_regularizer\', \'gamma_regularizer\', \'training\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'-1\', \'0.99\', \'0.001\', \'True\', \'True\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'None\', \'None\', \'False\', \'True\', \'None\', \'None\'], "
+    argspec: "args=[\'inputs\', \'axis\', \'momentum\', \'epsilon\', \'center\', \'scale\', \'beta_initializer\', \'gamma_initializer\', \'moving_mean_initializer\', \'moving_variance_initializer\', \'beta_regularizer\', \'gamma_regularizer\', \'training\', \'trainable\', \'name\', \'reuse\', \'renorm\', \'renorm_clipping\', \'renorm_momentum\'], varargs=None, keywords=None, defaults=[\'-1\', \'0.99\', \'0.001\', \'True\', \'True\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'None\', \'None\', \'False\', \'True\', \'None\', \'None\', \'False\', \'None\', \'0.99\'], "
   }
   member_method {
     name: "conv1d"
-- 
GitLab


From 4c341895e4e33c86f4086c7ac5ee809e58a9d7ee Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Thu, 6 Apr 2017 18:41:00 -0800
Subject: [PATCH 0202/1563] When using ImportGraphDef with a passed in
 ShapeRefiner, use the producer version of the GraphDef when importing; the
 ShapeRefiner may be initialized with a different graph_def_version, so we
 need to be able to override it.

The test failed without the change to graph_constructor and passes with it.
The test uses a legacy graph that is supported (reduction shape).
Change: 152459169
---
 .../core/common_runtime/shape_refiner.h       |   6 +-
 tensorflow/core/graph/graph_constructor.cc    |  35 +++-
 .../core/graph/graph_constructor_test.cc      | 171 ++++++++++++++++++
 3 files changed, 206 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/common_runtime/shape_refiner.h b/tensorflow/core/common_runtime/shape_refiner.h
index bbde0924c7..f23f9361eb 100644
--- a/tensorflow/core/common_runtime/shape_refiner.h
+++ b/tensorflow/core/common_runtime/shape_refiner.h
@@ -64,6 +64,10 @@ class ShapeRefiner {
     return it->second.get();
   }
 
+  // Getters and setters for graph_def_version_.
+  int32 graph_def_version() { return graph_def_version_; }
+  void set_graph_def_version(int32 version) { graph_def_version_ = version; }
+
  private:
   // Extracts the subgraph ending at 'node' that is statically
   // computable and inserts into 'out_graph'. If statically computable,
@@ -100,7 +104,7 @@ class ShapeRefiner {
                               const Node* node, int dst_idx,
                               shape_inference::ShapeHandle* result);
 
-  const int graph_def_version_;
+  int32 graph_def_version_;
   const OpRegistryInterface* const ops_registry_;
 
   // The lifetime of the tensors are bound to the runner, so it should be the
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
index 6b3b5d3604..9d4a0a52f7 100644
--- a/tensorflow/core/graph/graph_constructor.cc
+++ b/tensorflow/core/graph/graph_constructor.cc
@@ -839,11 +839,6 @@ Status ConvertGraphDefToGraph(const GraphConstructorOptions& opts,
 Status ImportGraphDef(const ImportGraphDefOptions& opts, const GraphDef& gdef,
                       Graph* g, ShapeRefiner* refiner,
                       std::vector<std::pair<Node*, int>>* return_tensors) {
-  ShapeRefiner default_refiner(gdef.versions().producer(), g->op_registry());
-  if (refiner == nullptr) {
-    refiner = &default_refiner;
-  }
-
   if (!opts.return_tensors.empty()) {
     if (return_tensors == nullptr) {
       return errors::InvalidArgument(
@@ -857,6 +852,36 @@ Status ImportGraphDef(const ImportGraphDefOptions& opts, const GraphDef& gdef,
           return_tensors->size(), ")");
     }
   }
+
+  ShapeRefiner default_refiner(gdef.versions().producer(), g->op_registry());
+  if (refiner == nullptr) {
+    refiner = &default_refiner;
+  } else {
+    // Log a warning if we are importing a GraphDef at an older
+    // producer version after already having added non-source/sink
+    // nodes to the graph in the past.
+    if (gdef.versions().producer() > 0 &&
+        gdef.versions().producer() < refiner->graph_def_version() &&
+        g->num_nodes() > 2) {
+      LOG(WARNING) << "Importing a graph with a lower producer version "
+                   << gdef.versions().producer()
+                   << " into an existing graph with producer version "
+                   << refiner->graph_def_version() << ". Shape inference will "
+                   << "have run different parts of the graph with different "
+                   << "producer versions.";
+    }
+  }
+
+  // Set the graph def version of the refiner as the min of the
+  // current value and the version from the graph we are about to
+  // import.
+  //
+  // Note: to match Run() semantics, we should re-run shape inference
+  // on the entire graph if the producer version has changed.  For now
+  // we log the warning above.
+  refiner->set_graph_def_version(
+      std::min(refiner->graph_def_version(), gdef.versions().producer()));
+
   return GraphConstructor::Construct(opts, &gdef, g, refiner, return_tensors);
 }
 
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index e20dabc891..e3b7f322cb 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -2271,5 +2271,176 @@ TEST_F(GraphConstructorTest, GraphDefVersionMergingDuringImport) {
   EXPECT_EQ(3, graph_.versions().bad_consumers(2));
 }
 
+TEST_F(GraphConstructorTest, ImportGraphDefProvidedShapeRefinerVersions) {
+  ImportGraphDefOptions opts;
+  // A valid graph at producer version 20, but one
+  // that would not import if the graph_def_version were 21.
+  string gdef_ascii = strings::StrCat(R"EOF(
+node {
+  name: "Sum/input"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\001\000\000\000\002\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Sum/reduction_indices"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\000\000\000\000\001\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Sum"
+  op: "Sum"
+  input: "Sum/input"
+  input: "Sum/reduction_indices"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+versions {
+  producer: 20
+})EOF");
+
+  // Create a shape refiner with the latest TF_GRAPH_DEF_VERSION.
+  // Importing the graphdef with an existing refiner should
+  // make the refiner inherit the graphdef version from the
+  // passed in graphdef since it has a lower producer.
+  ShapeRefiner refiner(TF_GRAPH_DEF_VERSION, graph_.op_registry());
+  ExpectOK(gdef_ascii, opts, &refiner);
+
+  // Add another node with a higher producer
+  gdef_ascii = strings::StrCat(R"EOF(
+node {
+  name: "RandomConst"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\001\000\000\000\002\000\000\000"
+      }
+    }
+  }
+}
+versions {
+  producer: 21
+})EOF");
+
+  ExpectOK(gdef_ascii, opts, &refiner);
+  // Check that the refiner's graph def version is the lowest of
+  // the graph defs we have seen so far.
+  EXPECT_EQ(20, refiner.graph_def_version());
+
+  // Add another node with a lower producer
+  gdef_ascii = strings::StrCat(R"EOF(
+node {
+  name: "RandomConst2"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\001\000\000\000\002\000\000\000"
+      }
+    }
+  }
+}
+versions {
+  producer: 17
+})EOF");
+  ExpectOK(gdef_ascii, opts, &refiner);
+
+  // Check that the refiner's graph def version is the lowest of
+  // the graph defs we have seen so far.
+  EXPECT_EQ(17, refiner.graph_def_version());
+}
+
 }  // namespace
 }  // namespace tensorflow
-- 
GitLab


From 5ecd81aa1356c5014e3f5ae222af872f8fe34cfe Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 19:30:06 -0800
Subject: [PATCH 0203/1563] Allow any iterable for `export_strategies` arg.
 Change: 152461826

---
 .../contrib/learn/python/learn/experiment.py  | 26 +++++++++++--------
 .../learn/python/learn/experiment_test.py     | 23 ++++++++++++++--
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index cecc24c17d..4f7c72c9dd 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -118,7 +118,8 @@ class Experiment(object):
         occur if no new snapshot is available, hence, this is the minimum.
       delay_workers_by_global_step: if `True` delays training workers
         based on global step instead of time.
-      export_strategies: A list of `ExportStrategy`s, or a single one, or None.
+      export_strategies: Iterable of `ExportStrategy`s, or a single one, or
+        `None`.
       train_steps_per_iteration: (applies only to continuous_train_and_eval).
         Perform this many (integer) number of train steps for each
         training-evaluation iteration. With a small value, the model will be
@@ -184,16 +185,19 @@ class Experiment(object):
   def eval_steps(self):
     return self._eval_steps
 
-  def _set_export_strategies(self, value):
-    if value is None:
-      self._export_strategies = []
-    elif isinstance(value, list):
-      self._export_strategies = value[:]
-    elif isinstance(value, export_strategy.ExportStrategy):
-      self._export_strategies = [value]
-    else:
-      raise ValueError("`export_strategies` must be an ExportStrategy, "
-                       "a list of ExportStrategies, or None.")
+  def _set_export_strategies(self, values):  # pylint: disable=missing-docstring
+    export_strategies = []
+    if values:
+      if isinstance(values, export_strategy.ExportStrategy):
+        export_strategies.append(values)
+      else:
+        for value in values:
+          if not isinstance(value, export_strategy.ExportStrategy):
+            raise ValueError("`export_strategies` must be an ExportStrategy,"
+                             " an iterable of ExportStrategy, or `None`,"
+                             " found %s." % value)
+          export_strategies.append(value)
+    self._export_strategies = tuple(export_strategies)
 
   def extend_train_hooks(self, additional_hooks):
     """Extends the hooks for training."""
diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index 00ed062b0a..f9f95f8e67 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -484,6 +484,25 @@ class ExperimentTest(test.TestCase):
       self.assertAllEqual([noop_hook, another_noop_hook], ex._train_monitors)
       self.assertAllEqual([noop_hook], input_hooks)
 
+  def test_invalid_export_strategies(self):
+    for est in self._estimators_for_tests():
+      with self.assertRaisesRegexp(ValueError, 'ExportStrategy'):
+        experiment.Experiment(
+            est,
+            train_input_fn='train_input',
+            eval_input_fn='eval_input',
+            train_steps=100,
+            eval_steps=100,
+            export_strategies='not_an_export_strategy')
+      with self.assertRaisesRegexp(ValueError, 'ExportStrategy'):
+        experiment.Experiment(
+            est,
+            train_input_fn='train_input',
+            eval_input_fn='eval_input',
+            train_steps=100,
+            eval_steps=100,
+            export_strategies=['not_an_export_srategy'])
+
   def test_export_strategies_reset(self):
     for est in self._estimators_for_tests():
       eval_metrics = 'eval_metrics' if not isinstance(
@@ -498,7 +517,7 @@ class ExperimentTest(test.TestCase):
           eval_metrics=eval_metrics,
           train_steps=100,
           eval_steps=100,
-          export_strategies=[export_strategy_1])
+          export_strategies=(export_strategy_1,))
       ex.train_and_evaluate()
       self.assertEqual(1, est.export_count)
 
@@ -728,7 +747,7 @@ class ExperimentTest(test.TestCase):
           est,
           train_input_fn='train_input',
           eval_input_fn='eval_input',
-          export_strategies=[exp_strategy])
+          export_strategies=(exp_strategy,))
       ex.test()
       self.assertEqual(1, est.fit_count)
       self.assertEqual(1, est.eval_count)
-- 
GitLab


From f120db94539bb05025ddc6771e73be8790a76dbb Mon Sep 17 00:00:00 2001
From: Lukasz Kaiser <lukaszkaiser@google.com>
Date: Thu, 6 Apr 2017 20:38:22 -0800
Subject: [PATCH 0204/1563] Log steps/sec every 100 steps in MonitoredSession,
 as before. Change: 152465320

---
 tensorflow/python/training/monitored_session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index cf8692eda1..6d6128d207 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -252,7 +252,7 @@ def MonitoredTrainingSession(master='',  # pylint: disable=invalid-name
                              save_summaries_secs=None,
                              config=None,
                              stop_grace_period_secs=120,
-                             log_step_count_steps=10000):
+                             log_step_count_steps=100):
   """Creates a `MonitoredSession` for training.
 
   For a chief, this utility sets proper session initializer/restorer. It also
-- 
GitLab


From 0ca4d911321e60d27e91a93ef892332b1b9523ff Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 20:38:54 -0800
Subject: [PATCH 0205/1563] Fixes documentation to note that the in case of
 ties the identity of the return value of ArgMin and ArgMaxis not guaranteed .
 Change: 152465346

---
 tensorflow/core/ops/math_ops.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index b69ce13775..c99a933f2c 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -1256,6 +1256,8 @@ REGISTER_OP("ArgMax")
     .Doc(R"doc(
 Returns the index with the largest value across dimensions of a tensor.
 
+Note: in case of ties the identity of the return value is not guaranteed.
+
 dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
   of the input Tensor to reduce across. For vectors, use dimension = 0.
 )doc");
@@ -1270,6 +1272,8 @@ REGISTER_OP("ArgMin")
     .Doc(R"doc(
 Returns the index with the smallest value across dimensions of a tensor.
 
+Note: in case of ties the identity of the return value is not guaranteed.
+
 dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
   of the input Tensor to reduce across. For vectors, use dimension = 0.
 )doc");
-- 
GitLab


From 55ad623ecaf12de0260008395afb061cdf75f55d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 20:49:46 -0800
Subject: [PATCH 0206/1563] Automated rollback of change 152465346 Change:
 152465844

---
 tensorflow/core/ops/math_ops.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index c99a933f2c..b69ce13775 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -1256,8 +1256,6 @@ REGISTER_OP("ArgMax")
     .Doc(R"doc(
 Returns the index with the largest value across dimensions of a tensor.
 
-Note: in case of ties the identity of the return value is not guaranteed.
-
 dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
   of the input Tensor to reduce across. For vectors, use dimension = 0.
 )doc");
@@ -1272,8 +1270,6 @@ REGISTER_OP("ArgMin")
     .Doc(R"doc(
 Returns the index with the smallest value across dimensions of a tensor.
 
-Note: in case of ties the identity of the return value is not guaranteed.
-
 dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
   of the input Tensor to reduce across. For vectors, use dimension = 0.
 )doc");
-- 
GitLab


From 3a997b0e28fc9dd89cdb9406cd607f80e3c08bd1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 20:54:45 -0800
Subject: [PATCH 0207/1563] Fix shape inference fn on _ParallelConcatStart.
 Change: 152466076

---
 tensorflow/core/ops/array_ops.cc      |  9 ++++++---
 tensorflow/core/ops/array_ops_test.cc | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index b43a917dca..e2e07a4bf1 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1244,9 +1244,12 @@ REGISTER_OP("_ParallelConcatStart")
     .Attr("dtype: type")
     .SetIsStateful()
     .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle out;
-      TF_RETURN_IF_ERROR(c->MakeShapeFromShapeTensor(0, &out));
-      c->set_output(0, out);
+      TensorShapeProto shape_proto;
+      TF_RETURN_IF_ERROR(c->GetAttr("shape", &shape_proto));
+      ShapeHandle output_shape;
+      TF_RETURN_IF_ERROR(
+          c->MakeShapeFromShapeProto(shape_proto, &output_shape));
+      c->set_output(0, output_shape);
       return Status::OK();
     })
     .Doc(R"doc(
diff --git a/tensorflow/core/ops/array_ops_test.cc b/tensorflow/core/ops/array_ops_test.cc
index bc99fb09e5..adb1320fc7 100644
--- a/tensorflow/core/ops/array_ops_test.cc
+++ b/tensorflow/core/ops/array_ops_test.cc
@@ -1626,4 +1626,16 @@ TEST(ArrayOpsTest, QuantizedConcat_ShapeFn) {
   // Note that other cases of concat are covered in the Concat tests.
 }
 
+TEST(StateOpsTest, _ParallelConcatStart_ShapeFn) {
+  ShapeInferenceTestOp op("_ParallelConcatStart");
+  TensorShape shape({1, 2, 3});
+  TensorShapeProto shape_proto;
+  shape.AsProto(&shape_proto);
+  TF_ASSERT_OK(NodeDefBuilder("test", "_ParallelConcatStart")
+                   .Attr("shape", shape_proto)
+                   .Attr("dtype", DT_FLOAT)
+                   .Finalize(&op.node_def));
+  INFER_OK(op, "", "[1,2,3]");
+}
+
 }  // end namespace tensorflow
-- 
GitLab


From f8e5c0620fd0395437c4317ada068258ef43d620 Mon Sep 17 00:00:00 2001
From: Andrew Selle <aselle@google.com>
Date: Thu, 6 Apr 2017 20:55:40 -0800
Subject: [PATCH 0208/1563] Fix getting started guide

Explain numerical differences in loss
fix one example to print
Change: 152466119
---
 tensorflow/docs_src/get_started/get_started.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 04ac3f5848..81426bbb92 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -324,6 +324,10 @@ When run, it produces
 W: [-0.9999969] b: [ 0.99999082] loss: 5.69997e-11
 ```
 
+Notice that the loss is a very small number (close to zero). If you run this
+program your loss will not be exactly the same, because the model is initialized
+with random values.
+
 This more complicated program can still be visualized in TensorBoard
 ![TensorBoard final model visualization](../images/getting_started_final.png)
 
-- 
GitLab


From 2dca3420ff04a4bd1e520e895845c9b7fda22972 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 6 Apr 2017 21:18:26 -0800
Subject: [PATCH 0209/1563] Remove superfluous mode argument. Change: 152467334

---
 .../learn/python/learn/estimators/model_fn.py | 18 ++++--
 .../python/learn/estimators/model_fn_test.py  | 56 +++++++++++--------
 2 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
index c0a3918549..c56741a4d1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
@@ -53,12 +53,17 @@ class ModeKeys(object):
   EVAL = 'eval'
   INFER = 'infer'
 
+  @classmethod
+  def validate(cls, key):
+    if key not in (cls.TRAIN, cls.EVAL, cls.INFER):
+      raise ValueError('Invalid mode %s.' % key)
+
 
 class ModelFnOps(
     collections.namedtuple('ModelFnOps', [
         'predictions', 'loss', 'train_op', 'eval_metric_ops',
         'output_alternatives', 'training_chief_hooks', 'training_hooks',
-        'scaffold'
+        'scaffold', 'mode'
     ])):
   """Ops returned from a model_fn."""
 
@@ -119,6 +124,8 @@ class ModelFnOps(
     Raises:
       ValueError: If validation fails.
     """
+    ModeKeys.validate(mode)
+
     # Assert all ops are from the same graph.
     get_graph_from_inputs((predictions, loss, train_op))
 
@@ -183,14 +190,13 @@ class ModelFnOps(
         output_alternatives=output_alternatives,
         training_chief_hooks=training_chief_hooks,
         training_hooks=training_hooks,
-        scaffold=scaffold)
+        scaffold=scaffold,
+        mode=mode)
 
-  def estimator_spec(self, mode, default_serving_output_alternative_key=None):
+  def estimator_spec(self, default_serving_output_alternative_key=None):
     """Creates an equivalent `EstimatorSpec`.
 
     Args:
-      mode: One of `ModeKeys`. Specifies if this training, evaluation or
-        prediction.
       default_serving_output_alternative_key: Required for multiple heads. If
         you have multiple entries in `output_alternatives` dict (comparable to
         multiple heads), `EstimatorSpec` requires a default head that will be
@@ -265,7 +271,7 @@ class ModelFnOps(
       return result
 
     return core_model_fn_lib.EstimatorSpec(
-        mode=mode,
+        mode=self.mode,
         predictions=self.predictions,
         loss=self.loss,
         train_op=self.train_op,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
index 51b32359a3..4f76013a2a 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
@@ -80,18 +80,20 @@ class ModelFnopsTest(test.TestCase):
 
   def testEstimatorSpec_except_export(self):
     predictions = self.create_predictions()
-    model_fn_ops = self.create_model_fn_ops(predictions, None)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, None, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
   def testEstimatorSpec_export_regression_with_scores(self):
     predictions = self.create_predictions()
     output_alternatives = {"regression_head": (
         constants.ProblemType.LINEAR_REGRESSION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -108,9 +110,10 @@ class ModelFnopsTest(test.TestCase):
     output_alternatives = {"regression_head": (
         constants.ProblemType.LINEAR_REGRESSION,
         output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -124,9 +127,10 @@ class ModelFnopsTest(test.TestCase):
     predictions = self.create_predictions()
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -145,9 +149,10 @@ class ModelFnopsTest(test.TestCase):
     del output_alternatives_predictions["scores"]
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -167,9 +172,10 @@ class ModelFnopsTest(test.TestCase):
     del output_alternatives_predictions["probabilities"]
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -187,9 +193,10 @@ class ModelFnopsTest(test.TestCase):
     del output_alternatives_predictions["classes"]
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -208,9 +215,10 @@ class ModelFnopsTest(test.TestCase):
         [1, 2, 3])
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -226,9 +234,10 @@ class ModelFnopsTest(test.TestCase):
     predictions = self.create_predictions()
     output_alternatives = {"logistic_head": (
         constants.ProblemType.LOGISTIC_REGRESSION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -245,9 +254,10 @@ class ModelFnopsTest(test.TestCase):
     output_alternatives = {"unspecified_head": (
         constants.ProblemType.UNSPECIFIED, predictions)}
 
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -263,10 +273,10 @@ class ModelFnopsTest(test.TestCase):
             constants.ProblemType.LINEAR_REGRESSION, predictions),
         "classification_head": (
             constants.ProblemType.CLASSIFICATION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER,
-                                                 "regression_head")
+    estimator_spec = model_fn_ops.estimator_spec("regression_head")
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
-- 
GitLab


From bea7cabfd0c32638d4c102c636270cbfecc6665b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 00:46:42 -0800
Subject: [PATCH 0210/1563] Add a tool that converts HLO computations to
 tensorflow GraphDef which can be visualized on Tensorboard.

This CL defines basic tensorflow::OpDef for each HLO instruction/node. More attributes (e.g. shapes, colors) will be added in the future.
Change: 152477918
---
 tensorflow/compiler/xla/service/hlo_opcode.cc |  13 ++
 tensorflow/compiler/xla/service/hlo_opcode.h  |   3 +
 tensorflow/compiler/xla/tools/BUILD           |  44 ++++++
 .../dumped_computation_to_tf_graphdef.cc      | 139 ++++++++++++++++++
 .../compiler/xla/tools/hlo_tfgraph_builder.cc | 129 ++++++++++++++++
 .../compiler/xla/tools/hlo_tfgraph_builder.h  |  59 ++++++++
 .../xla/tools/hlo_tfgraph_builder_test.cc     | 107 ++++++++++++++
 7 files changed, 494 insertions(+)
 create mode 100644 tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
 create mode 100644 tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
 create mode 100644 tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
 create mode 100644 tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc

diff --git a/tensorflow/compiler/xla/service/hlo_opcode.cc b/tensorflow/compiler/xla/service/hlo_opcode.cc
index 616b239a93..ceb0cdaa31 100644
--- a/tensorflow/compiler/xla/service/hlo_opcode.cc
+++ b/tensorflow/compiler/xla/service/hlo_opcode.cc
@@ -165,4 +165,17 @@ bool HloOpcodeIsComparison(HloOpcode opcode) {
   }
 }
 
+bool HloOpcodeIsVariadic(HloOpcode opcode) {
+  switch (opcode) {
+    case HloOpcode::kCall:
+    case HloOpcode::kConcatenate:
+    case HloOpcode::kFusion:
+    case HloOpcode::kMap:
+    case HloOpcode::kTuple:
+      return true;
+    default:
+      return false;
+  }
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_opcode.h b/tensorflow/compiler/xla/service/hlo_opcode.h
index 978ed5e79b..e2cdbfdfa7 100644
--- a/tensorflow/compiler/xla/service/hlo_opcode.h
+++ b/tensorflow/compiler/xla/service/hlo_opcode.h
@@ -104,6 +104,9 @@ inline std::ostream& operator<<(std::ostream& os, HloOpcode opcode) {
 // Returns true iff the given opcode is a comparison operation.
 bool HloOpcodeIsComparison(HloOpcode opcode);
 
+// Returns true iff the given opcode has variadic operands.
+bool HloOpcodeIsVariadic(HloOpcode opcode);
+
 }  // namespace xla
 
 #endif  // TENSORFLOW_COMPILER_XLA_SERVICE_HLO_OPCODE_H_
diff --git a/tensorflow/compiler/xla/tools/BUILD b/tensorflow/compiler/xla/tools/BUILD
index 46eab7f02b..1c4ca44631 100644
--- a/tensorflow/compiler/xla/tools/BUILD
+++ b/tensorflow/compiler/xla/tools/BUILD
@@ -176,6 +176,50 @@ cc_binary(
     ],
 )
 
+cc_library(
+    name = "hlo_tfgraph_builder",
+    srcs = ["hlo_tfgraph_builder.cc"],
+    hdrs = ["hlo_tfgraph_builder.h"],
+    deps = [
+        "//tensorflow/compiler/xla/service:hlo",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
+cc_test(
+    name = "hlo_tfgraph_builder_test",
+    srcs = ["hlo_tfgraph_builder_test.cc"],
+    deps = [
+        ":hlo_tfgraph_builder",
+        "//tensorflow/compiler/xla/client:computation_builder",
+        "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+cc_binary(
+    name = "dumped_computation_to_tf_graphdef",
+    srcs = ["dumped_computation_to_tf_graphdef.cc"],
+    deps = [
+        ":hlo_tfgraph_builder",
+        "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:types",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/client",
+        "//tensorflow/compiler/xla/client:client_library",
+        "//tensorflow/compiler/xla/client:computation",
+        "//tensorflow/compiler/xla/client:local_client",
+        "//tensorflow/compiler/xla/service",
+        "//tensorflow/compiler/xla/service:hlo_graph_dumper",
+        "//tensorflow/compiler/xla/service:session_proto",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
 # -----------------------------------------------------------------------------
 
 filegroup(
diff --git a/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc b/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
new file mode 100644
index 0000000000..1aa769ee5a
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
@@ -0,0 +1,139 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Usage: dumped_computation_to_tf_graph \
+//          --output_dir=/tmp/graphs/ some_binary_snapshot_proto*
+//
+// Dumps a tensorflow GraphDef in text format for a snapshot computation. The
+// dumped graph is an HLO computation with HLO instructions as nodes and can be
+// visualized on Tensorboard. Upload the dumped files on Tensorboard.
+//
+// some_binary_snapshot_proto is obtained by serializing the SessionModule from
+// ServiceInterface::SnapshotComputation to disk.
+
+#include <stdio.h>
+#include <memory>
+#include <string>
+
+#include "tensorflow/compiler/xla/client/client.h"
+#include "tensorflow/compiler/xla/client/client_library.h"
+#include "tensorflow/compiler/xla/client/computation.h"
+#include "tensorflow/compiler/xla/client/local_client.h"
+#include "tensorflow/compiler/xla/service/service.h"
+#include "tensorflow/compiler/xla/service/session.pb.h"
+#include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/types.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/logging.h"
+
+using tensorflow::Env;
+using tensorflow::io::JoinPath;
+using tensorflow::strings::StrAppend;
+
+namespace xla {
+namespace tools {
+namespace {
+
+// Dumps all computations in the module to the given directory.
+void DumpTfGraph(const HloModule& module, const string& directory_path) {
+  Env* env = Env::Default();
+  TF_CHECK_OK(env->RecursivelyCreateDir(directory_path));
+  string fname = module.name();
+  std::replace(fname.begin(), fname.end(), '/', '_');
+  // Since the file name will be used as the top-level scope name, clean it up
+  // to make it a valid scope name.
+  CleanNodeName(&fname);
+  StrAppend(&fname, ".pbtxt");
+  string path = JoinPath(directory_path, fname);
+  HloTfGraphBuilder builder;
+  TF_CHECK_OK(builder.AddComputation(*module.entry_computation()));
+  std::cout << "Dumping " << module.name() << " to " << path << std::endl;
+  TF_CHECK_OK(WriteTextProto(env, path, builder.GetGraphDef()));
+}
+
+}  // namespace
+
+void RealMain(tensorflow::gtl::ArraySlice<char*> args,
+              const string& output_dir) {
+  LocalClient* client = ClientLibrary::LocalClientOrDie();
+  // To avoid adding a new flag, use local service and lower the computations
+  // locally.
+  LocalService* local_service =
+      ClientLibrary::GetXlaService(client->platform());
+  // Build HloModule for each Computation and dump to file.
+  for (char* arg : args) {
+    SessionModule session_module;
+    TF_CHECK_OK(tensorflow::ReadBinaryProto(tensorflow::Env::Default(), arg,
+                                            &session_module));
+    auto computation_status = client->LoadSnapshot(session_module);
+    if (!computation_status.ok()) {
+      fprintf(stderr, "could not load snapshot for %s: %s\n", arg,
+              computation_status.status().ToString().c_str());
+      continue;
+    }
+    Computation computation = computation_status.ConsumeValueOrDie();
+
+    StatusOr<UserComputation*> user_computation_status =
+        local_service->computation_tracker().Resolve(computation.handle());
+    if (!user_computation_status.ok()) {
+      fprintf(stderr,
+              "failed to resolve computation to UserComputation %s: %s\n", arg,
+              user_computation_status.status().ToString().c_str());
+      continue;
+    }
+
+    auto* user_computation = user_computation_status.ValueOrDie();
+    StatusOr<std::unique_ptr<HloModule>> module_status =
+        local_service->computation_tracker().BuildHloModule(
+            user_computation->GetVersionedHandle());
+
+    if (!module_status.ok()) {
+      fprintf(stderr, "failed to build HloModule %s: %s\n", arg,
+              module_status.status().ToString().c_str());
+      continue;
+    }
+
+    DumpTfGraph(*module_status.ValueOrDie(), output_dir);
+  }
+}
+
+}  // namespace tools
+}  // namespace xla
+
+int main(int argc, char** argv) {
+  string output_dir = "";
+  const std::vector<tensorflow::Flag> flag_list = {
+      tensorflow::Flag("output_dir", &output_dir,
+                       "Directory to write GraphDef data to."),
+  };
+
+  string usage = tensorflow::Flags::Usage(argv[0], flag_list);
+  bool parse_ok = tensorflow::Flags::Parse(&argc, argv, flag_list);
+  if (!parse_ok || output_dir.empty()) {
+    LOG(QFATAL) << usage;
+  }
+  tensorflow::port::InitMain(argv[0], &argc, &argv);
+
+  tensorflow::gtl::ArraySlice<char*> args(argv, argc);
+  args.pop_front();  // Pop off the binary name, argv[0]
+  xla::tools::RealMain(args, output_dir);
+  return 0;
+}
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
new file mode 100644
index 0000000000..8e04ea3ae4
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
@@ -0,0 +1,129 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+LIcensed under the Apache License, Version 2.0 (the "License");
+You may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+
+using ::tensorflow::GraphDef;
+using ::tensorflow::NodeDef;
+using ::tensorflow::strings::StrAppend;
+using ::tensorflow::strings::StrCat;
+
+namespace xla {
+namespace tools {
+
+static string GetOpDefName(const HloInstruction* instruction) {
+  string name = StrCat("hlo-", HloOpcodeString(instruction->opcode()));
+  tensorflow::str_util::TitlecaseString(&name, "-");
+  name.erase(std::remove(name.begin(), name.end(), '-'), name.end());
+
+  if (instruction->opcode() == HloOpcode::kFusion) {
+    string fusion_name = ToString(instruction->fusion_kind());
+    StrAppend(&name, tensorflow::StringPiece(fusion_name).substr(1));
+  }
+  return name;
+}
+
+void CleanNodeName(string* name) {
+  name->erase(std::remove(name->begin(), name->end(), '%'), name->end());
+  const string chars_to_replace = "<>[]";
+  auto pred = [&](char c) {
+    return std::find(chars_to_replace.begin(), chars_to_replace.end(), c) !=
+           chars_to_replace.end();
+  };
+  std::replace_if(name->begin(), name->end(), pred, '_');
+}
+
+Status HloTfGraphBuilder::AddComputation(const HloComputation& computation) {
+  LOG(INFO) << "Adding computation " << computation.name();
+  for (auto embedded : computation.MakeEmbeddedComputationsList()) {
+    LOG(INFO) << "Adding embedded computation " << embedded->name();
+    for (auto& instruction : embedded->instructions()) {
+      TF_RETURN_IF_ERROR(AddInstruction(instruction.get()));
+    }
+  }
+  for (auto& instruction : computation.instructions()) {
+    TF_RETURN_IF_ERROR(AddInstruction(instruction.get()));
+  }
+  return Status::OK();
+}
+
+const GraphDef& HloTfGraphBuilder::GetGraphDef() const { return graph_def_; }
+
+const string& HloTfGraphBuilder::GetNodeNameForInstruction(
+    const HloInstruction* instruction) {
+  if (ContainsKey(instruction_to_node_name_, instruction)) {
+    return instruction_to_node_name_[instruction];
+  }
+  // If an instruction is fused, put it in the subgraph of the fusion;
+  // otherwise, put it in the computation subgraph.
+  string node_name =
+      instruction->IsFused()
+          ? GetNodeNameForInstruction(instruction->fusion_instruction())
+          : instruction->parent()->name();
+  string instruction_name = instruction->name();
+  if (instruction->opcode() == HloOpcode::kParameter) {
+    StrAppend(&instruction_name, ".", instruction->parameter_number());
+  }
+  StrAppend(&node_name, "/", instruction_name);
+  CleanNodeName(&node_name);
+  auto ret =
+      instruction_to_node_name_.insert(std::make_pair(instruction, node_name));
+  CHECK(ret.second);
+  return ret.first->second;
+}
+
+// TODO(b/36987876): Add more attribute information e.g. shapes, dimensions etc.
+void HloTfGraphBuilder::SetNodeAttrs(const HloInstruction* instruction,
+                                     NodeDef* node_def) const {
+  // Set the number of arguments for instructions that have variadic operands.
+  if (HloOpcodeIsVariadic(instruction->opcode())) {
+    tensorflow::AttrValue attr_value;
+    attr_value.set_i(instruction->operands().size());
+    (*node_def->mutable_attr())["ArgNum"] = attr_value;
+  }
+}
+
+Status HloTfGraphBuilder::AddInstruction(const HloInstruction* instruction) {
+  if (!visited_instructions_.insert(instruction).second) {
+    // Skip instructions that have already been added.
+    return Status::OK();
+  }
+
+  NodeDef* node_def = graph_def_.add_node();
+  node_def->set_name(GetNodeNameForInstruction(instruction));
+  node_def->set_op(GetOpDefName(instruction));
+  SetNodeAttrs(instruction, node_def);
+  if (instruction->opcode() == HloOpcode::kFusion) {
+    for (auto& fused_instruction : instruction->fused_instructions()) {
+      TF_RETURN_IF_ERROR(AddInstruction(fused_instruction.get()));
+    }
+  }
+  // Add all edges including control edges.
+  for (unsigned i = 0; i < instruction->operands().size(); ++i) {
+    *node_def->add_input() = GetNodeNameForInstruction(instruction->operand(i));
+  }
+  // Called computations are control dependencies.
+  for (const auto* called_computation : instruction->called_computations()) {
+    *node_def->add_input() = StrCat(
+        "^", GetNodeNameForInstruction(called_computation->root_instruction()));
+  }
+  return Status::OK();
+}
+
+}  // namespace tools
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
new file mode 100644
index 0000000000..3052eae113
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
@@ -0,0 +1,59 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
+#define THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
+
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/graph/graph.h"
+
+namespace xla {
+namespace tools {
+
+// This constructs a tensorflow graph for HLO computations.
+class HloTfGraphBuilder {
+ public:
+  // Adds a computation to the graph.
+  Status AddComputation(const HloComputation& computation);
+
+  const tensorflow::GraphDef& GetGraphDef() const;
+
+ private:
+  // Gets the node name of an instruction. The node name is hierarchical. For
+  // example, if an instruction is fused, it will be put in a subgraph of the
+  // fusion instruction.
+  const string& GetNodeNameForInstruction(const HloInstruction* instruction);
+
+  void SetNodeAttrs(const HloInstruction* instruction,
+                    tensorflow::NodeDef* node_def) const;
+
+  Status AddInstruction(const HloInstruction* instruction);
+
+  tensorflow::GraphDef graph_def_;
+  // This records instructions that have been visited.
+  std::unordered_set<const HloInstruction*> visited_instructions_;
+  // A cache that maps instruction to the node name.
+  std::unordered_map<const HloInstruction*, string> instruction_to_node_name_;
+};
+
+// Cleans the node name to make it a valid name in a tensorflow graph.
+void CleanNodeName(string* name);
+
+}  // namespace tools
+}  // namespace xla
+
+#endif  // THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
new file mode 100644
index 0000000000..57144d0385
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
@@ -0,0 +1,107 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/client/computation_builder.h"
+#include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+
+namespace xla {
+namespace tools {
+namespace {
+
+using ::tensorflow::GraphDef;
+
+class HloTfGraphBuilderTest : public HloTestBase {
+ protected:
+  HloTfGraphBuilderTest() {}
+  HloTfGraphBuilder generator_;
+
+  // Create a computation which takes a scalar and returns its negation.
+  std::unique_ptr<HloComputation> CreateNegateComputation() {
+    auto builder = HloComputation::Builder("Negate");
+    auto param = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, r0f32_, "param0"));
+    builder.AddInstruction(
+        HloInstruction::CreateUnary(r0f32_, HloOpcode::kNegate, param));
+    return builder.Build();
+  }
+
+  // Creates a computation which calls map with the given computation.
+  std::unique_ptr<HloComputation> CreateMapComputation(
+      HloComputation* map_computation) {
+    auto builder = HloComputation::Builder("Map");
+    auto param = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, r0f32_, "param0"));
+    builder.AddInstruction(
+        HloInstruction::CreateMap(r0f32_, {param}, map_computation));
+    return builder.Build();
+  }
+  Shape r0f32_ = ShapeUtil::MakeShape(F32, {});
+};
+
+TEST_F(HloTfGraphBuilderTest, SimpleNegateComputation) {
+  auto negate_computation = CreateNegateComputation();
+  TF_CHECK_OK(generator_.AddComputation(*negate_computation));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 2);
+  EXPECT_EQ(graph_def.node(0).name(), "Negate/param0.0");
+  EXPECT_EQ(graph_def.node(0).op(), "HloParameter");
+  EXPECT_EQ(graph_def.node(1).name(), "Negate/negate");
+  EXPECT_EQ(graph_def.node(1).op(), "HloNegate");
+  EXPECT_EQ(graph_def.node(1).input_size(), 1);
+  EXPECT_EQ(graph_def.node(1).input(0), "Negate/param0.0");
+}
+
+TEST_F(HloTfGraphBuilderTest, GreaterThanOrEqualTo) {
+  auto builder = HloComputation::Builder("GE");
+  auto param_1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r0f32_, "param0"));
+  auto param_2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, r0f32_, "param1"));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32_, HloOpcode::kGe, param_1, param_2));
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 3);
+  EXPECT_EQ(graph_def.node(0).name(), "GE/param0.0");
+  EXPECT_EQ(graph_def.node(1).name(), "GE/param1.1");
+  EXPECT_EQ(graph_def.node(2).input_size(), 2);
+  EXPECT_EQ(graph_def.node(2).name(), "GE/greater-than-or-equal-to");
+  EXPECT_EQ(graph_def.node(2).op(), "HloGreaterThanOrEqualTo");
+}
+
+TEST_F(HloTfGraphBuilderTest, EmbeddedComputationsDiamond) {
+  // Create computations with a diamond-shaped callgraph.
+  auto negate_computation = CreateNegateComputation();
+  auto map1_computation = CreateMapComputation(negate_computation.get());
+  auto map2_computation = CreateMapComputation(negate_computation.get());
+
+  auto builder = HloComputation::Builder(TestName());
+  auto param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r0f32_, "param0"));
+  auto map1 = builder.AddInstruction(
+      HloInstruction::CreateMap(r0f32_, {param}, map1_computation.get()));
+  auto map2 = builder.AddInstruction(
+      HloInstruction::CreateMap(r0f32_, {param}, map2_computation.get()));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32_, HloOpcode::kAdd, map1, map2));
+  auto computation = builder.Build();
+  TF_CHECK_OK(generator_.AddComputation(*computation));
+  EXPECT_GT(generator_.GetGraphDef().node_size(), 0);
+}
+
+}  // namespace
+}  // namespace tools
+}  // namespace xla
-- 
GitLab


From c3095c0501584a40f9e3853cd5ba0ca2d64bb39b Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Fri, 7 Apr 2017 06:05:19 -0800
Subject: [PATCH 0211/1563] [TF:XLA] Increase shard count of
 //third_party/tensorflow/compiler/tests:spacetobatch_test to reduce flakiness
 when built under ASAN. Change: 152496244

---
 tensorflow/compiler/tests/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD
index 740a35c7ae..0592e3d4b1 100644
--- a/tensorflow/compiler/tests/BUILD
+++ b/tensorflow/compiler/tests/BUILD
@@ -309,6 +309,7 @@ tf_xla_py_test(
     name = "spacetobatch_op_test",
     size = "medium",
     srcs = ["spacetobatch_op_test.py"],
+    shard_count = 3,
     deps = [
         ":xla_test",
         "//tensorflow/python:array_ops",
-- 
GitLab


From 2dde5e37534282abd1d6df48ab3deb1c7ec17ae6 Mon Sep 17 00:00:00 2001
From: Dan Smilkov <smilkov@google.com>
Date: Fri, 7 Apr 2017 07:53:05 -0800
Subject: [PATCH 0212/1563] Make projector plugin backend read assets saved via
 the PluginAssets API.

At the same time, keep backwards compatibility with the old way of looking up assets.
Change: 152504793
---
 .../plugins/projector/projector_plugin.py     |  97 ++++--
 .../projector/projector_plugin_test.py        | 315 +++++++++++++++++-
 2 files changed, 371 insertions(+), 41 deletions(-)

diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index ace5cadca1..001c6e1e35 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -45,6 +45,8 @@ from tensorflow.tensorboard.plugins.projector import projector_config_pb2
 _PLUGIN_PREFIX_ROUTE = 'projector'
 
 PROJECTOR_FILENAME = 'projector_config.pbtxt'
+_PLUGIN_NAME = 'org_tensorflow_tensorboard_projector'
+_PLUGINS_DIR = 'plugins'
 
 # HTTP routes.
 CONFIG_ROUTE = '/info'
@@ -112,7 +114,7 @@ class EmbeddingMetadata(object):
 
 class ProjectorPluginAsset(plugin_asset.PluginAsset):
   """Provides a registry for assets needed by the Projector plugin."""
-  plugin_name = 'org_tensorflow_tensorboard_projector'
+  plugin_name = _PLUGIN_NAME
 
   def __init__(self):
     self._config = projector_config_pb2.ProjectorConfig()
@@ -259,12 +261,20 @@ def _read_tensor_file(fpath):
   return np.array(tensor, dtype='float32')
 
 
+def _assets_dir_to_logdir(assets_dir):
+  sub_path = os.path.sep + _PLUGINS_DIR + os.path.sep
+  if sub_path in assets_dir:
+    two_parents_up = os.pardir + os.path.sep + os.pardir
+    return os.path.abspath(os.path.join(assets_dir, two_parents_up))
+  return assets_dir
+
+
 def _latest_checkpoints_changed(configs, run_path_pairs):
   """Returns true if the latest checkpoint has changed in any of the runs."""
-  for run_name, logdir in run_path_pairs:
+  for run_name, assets_dir in run_path_pairs:
     if run_name not in configs:
       config = projector_config_pb2.ProjectorConfig()
-      config_fpath = os.path.join(logdir, PROJECTOR_FILENAME)
+      config_fpath = os.path.join(assets_dir, PROJECTOR_FILENAME)
       if file_io.file_exists(config_fpath):
         file_content = file_io.read_file_to_string(config_fpath)
         text_format.Merge(file_content, config)
@@ -272,6 +282,7 @@ def _latest_checkpoints_changed(configs, run_path_pairs):
       config = configs[run_name]
 
     # See if you can find a checkpoint file in the logdir.
+    logdir = _assets_dir_to_logdir(assets_dir)
     ckpt_path = _find_latest_checkpoint(logdir)
     if not ckpt_path:
       continue
@@ -302,6 +313,12 @@ def _parse_positive_int_param(request, param_name):
     return -1
 
 
+def _rel_to_abs_asset_path(fpath, config_fpath):
+  if not os.path.isabs(fpath):
+    return os.path.join(os.path.dirname(config_fpath), fpath)
+  return fpath
+
+
 class ProjectorPlugin(TBPlugin):
   """Embedding projector."""
 
@@ -314,8 +331,10 @@ class ProjectorPlugin(TBPlugin):
     self.logdir = None
     self._configs = None
     self.old_num_run_paths = None
+    self.multiplexer = None
 
   def get_plugin_apps(self, multiplexer, logdir):
+    self.multiplexer = multiplexer
     self.run_paths = multiplexer.RunPaths()
     self.logdir = logdir
     self._handlers = {
@@ -342,6 +361,7 @@ class ProjectorPlugin(TBPlugin):
   def configs(self):
     """Returns a map of run paths to `ProjectorConfig` protos."""
     run_path_pairs = list(self.run_paths.items())
+    self._append_plugin_asset_directories(run_path_pairs)
     # If there are no summary event files, the projector should still work,
     # treating the `logdir` as the model checkpoint directory.
     if not run_path_pairs:
@@ -369,7 +389,9 @@ class ProjectorPlugin(TBPlugin):
           embedding.tensor_name = embedding.tensor_name[:-2]
         # Find the size of embeddings associated with a tensors file.
         if embedding.tensor_path and not embedding.tensor_shape:
-          tensor = _read_tensor_file(embedding.tensor_path)
+          fpath = _rel_to_abs_asset_path(embedding.tensor_path,
+                                         self.config_fpaths[run])
+          tensor = _read_tensor_file(fpath)
           embedding.tensor_shape.extend([len(tensor), len(tensor[0])])
 
       reader = self._get_reader_for_run(run)
@@ -407,13 +429,12 @@ class ProjectorPlugin(TBPlugin):
     """Reads and returns the projector config files in every run directory."""
     configs = {}
     config_fpaths = {}
-    for run_name, logdir in run_path_pairs:
+    for run_name, assets_dir in run_path_pairs:
       config = projector_config_pb2.ProjectorConfig()
-      config_fpath = os.path.join(logdir, PROJECTOR_FILENAME)
+      config_fpath = os.path.join(assets_dir, PROJECTOR_FILENAME)
       if file_io.file_exists(config_fpath):
         file_content = file_io.read_file_to_string(config_fpath)
         text_format.Merge(file_content, config)
-
       has_tensor_files = False
       for embedding in config.embeddings:
         if embedding.tensor_path:
@@ -422,6 +443,7 @@ class ProjectorPlugin(TBPlugin):
 
       if not config.model_checkpoint_path:
         # See if you can find a checkpoint file in the logdir.
+        logdir = _assets_dir_to_logdir(assets_dir)
         ckpt_path = _find_latest_checkpoint(logdir)
         if not ckpt_path and not has_tensor_files:
           continue
@@ -431,7 +453,7 @@ class ProjectorPlugin(TBPlugin):
       # Sanity check for the checkpoint file.
       if (config.model_checkpoint_path and
           not checkpoint_exists(config.model_checkpoint_path)):
-        logging.warning('Checkpoint file %s not found',
+        logging.warning('Checkpoint file "%s" not found',
                         config.model_checkpoint_path)
         continue
       configs[run_name] = config
@@ -448,7 +470,7 @@ class ProjectorPlugin(TBPlugin):
       try:
         reader = NewCheckpointReader(config.model_checkpoint_path)
       except Exception:  # pylint: disable=broad-except
-        logging.warning('Failed reading %s', config.model_checkpoint_path)
+        logging.warning('Failed reading "%s"', config.model_checkpoint_path)
     self.readers[run] = reader
     return reader
 
@@ -479,6 +501,12 @@ class ProjectorPlugin(TBPlugin):
         return info
     return None
 
+  def _append_plugin_asset_directories(self, run_path_pairs):
+    for run in self.multiplexer.PluginAssets(_PLUGIN_NAME):
+      assets_dir = os.path.join(self.run_paths[run], _PLUGINS_DIR, _PLUGIN_NAME)
+      assets_path_pair = (run, os.path.abspath(assets_dir))
+      run_path_pairs.append(assets_path_pair)
+
   @wrappers.Request.application
   def _serve_runs(self, request):
     """Returns a list of runs that have embeddings."""
@@ -491,7 +519,7 @@ class ProjectorPlugin(TBPlugin):
       return Respond(request, 'query parameter "run" is required', 'text/plain',
                      400)
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     return Respond(request,
@@ -515,17 +543,19 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     fpath = self._get_metadata_file_for_tensor(name, config)
     if not fpath:
       return Respond(
           request,
-          'No metadata file found for tensor %s in the config file %s' %
+          'No metadata file found for tensor "%s" in the config file "%s"' %
           (name, self.config_fpaths[run]), 'text/plain', 400)
+    fpath = _rel_to_abs_asset_path(fpath, self.config_fpaths[run])
     if not file_io.file_exists(fpath) or file_io.is_directory(fpath):
-      return Respond(request, '%s is not a file' % fpath, 'text/plain', 400)
+      return Respond(request, '"%s" not found, or is not a file' % fpath,
+                     'text/plain', 400)
 
     num_header_rows = 0
     with file_io.FileIO(fpath, 'r') as f:
@@ -558,26 +588,24 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
-    reader = self._get_reader_for_run(run)
     config = self.configs[run]
 
-    if reader is None:
-      # See if there is a tensor file in the config.
-      embedding = self._get_embedding(name, config)
-      if not embedding or not embedding.tensor_path:
-        return Respond(request,
-                       'Tensor %s has no tensor_path in the config' % name,
-                       'text/plain', 400)
-      if not file_io.file_exists(embedding.tensor_path):
+    # See if there is a tensor file in the config.
+    embedding = self._get_embedding(name, config)
+    if embedding and embedding.tensor_path:
+      fpath = _rel_to_abs_asset_path(embedding.tensor_path,
+                                     self.config_fpaths[run])
+      if not file_io.file_exists(fpath):
         return Respond(request,
-                       'Tensor file %s does not exist' % embedding.tensor_path,
+                       'Tensor file "%s" does not exist' % fpath,
                        'text/plain', 400)
-      tensor = _read_tensor_file(embedding.tensor_path)
+      tensor = _read_tensor_file(fpath)
     else:
-      if not reader.has_tensor(name):
-        return Respond(request, 'Tensor %s not found in checkpoint dir %s' %
+      reader = self._get_reader_for_run(run)
+      if not reader or not reader.has_tensor(name):
+        return Respond(request, 'Tensor "%s" not found in checkpoint dir "%s"' %
                        (name, config.model_checkpoint_path), 'text/plain', 400)
       try:
         tensor = reader.get_tensor(name)
@@ -605,17 +633,19 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     fpath = self._get_bookmarks_file_for_tensor(name, config)
     if not fpath:
       return Respond(
           request,
-          'No bookmarks file found for tensor %s in the config file %s' %
+          'No bookmarks file found for tensor "%s" in the config file "%s"' %
           (name, self.config_fpaths[run]), 'text/plain', 400)
+    fpath = _rel_to_abs_asset_path(fpath, self.config_fpaths[run])
     if not file_io.file_exists(fpath) or file_io.is_directory(fpath):
-      return Respond(request, '%s is not a file' % fpath, 'text/plain', 400)
+      return Respond(request, '"%s" not found, or is not a file' % fpath,
+                     'text/plain', 400)
 
     bookmarks_json = None
     with file_io.FileIO(fpath, 'rb') as f:
@@ -635,7 +665,7 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     embedding_info = self._get_embedding(name, config)
@@ -643,12 +673,13 @@ class ProjectorPlugin(TBPlugin):
     if not embedding_info or not embedding_info.sprite.image_path:
       return Respond(
           request,
-          'No sprite image file found for tensor %s in the config file %s' %
+          'No sprite image file found for tensor "%s" in the config file "%s"' %
           (name, self.config_fpaths[run]), 'text/plain', 400)
 
     fpath = os.path.expanduser(embedding_info.sprite.image_path)
+    fpath = _rel_to_abs_asset_path(fpath, self.config_fpaths[run])
     if not file_io.file_exists(fpath) or file_io.is_directory(fpath):
-      return Respond(request, '%s does not exist or is directory' % fpath,
+      return Respond(request, '"%s" does not exist or is directory' % fpath,
                      'text/plain', 400)
     f = file_io.FileIO(fpath, 'rb')
     encoded_image_string = f.read()
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index e4b28695b0..9e2e7159d8 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -55,7 +55,7 @@ class ProjectorAppTest(test.TestCase):
     self._GenerateProjectorTestData()
     self._SetupWSGIApp()
     run_json = self._GetJson('/data/plugin/projector/runs')
-    self.assertEqual(run_json, ['.'])
+    self.assertTrue(run_json)
 
   def testRunsWithNoCheckpoint(self):
     self._SetupWSGIApp()
@@ -73,6 +73,19 @@ class ProjectorAppTest(test.TestCase):
     run_json = self._GetJson('/data/plugin/projector/runs')
     self.assertEqual(run_json, [])
 
+  def testRunsWithInvalidModelCheckpointPathInConfig(self):
+    config_path = os.path.join(self.log_dir, 'projector_config.pbtxt')
+    config = projector_config_pb2.ProjectorConfig()
+    config.model_checkpoint_path = 'does_not_exist'
+    embedding = config.embeddings.add()
+    embedding.tensor_name = 'var1'
+    with gfile.GFile(config_path, 'w') as f:
+      f.write(text_format.MessageToString(config))
+    self._SetupWSGIApp()
+
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertEqual(run_json, [])
+
   def testInfoWithValidCheckpoint(self):
     self._GenerateProjectorTestData()
     self._SetupWSGIApp()
@@ -80,7 +93,8 @@ class ProjectorAppTest(test.TestCase):
     info_json = self._GetJson('/data/plugin/projector/info?run=.')
     self.assertItemsEqual(info_json['embeddings'], [{
         'tensorShape': [1, 2],
-        'tensorName': 'var1'
+        'tensorName': 'var1',
+        'bookmarksPath': 'bookmarks.json'
     }, {
         'tensorShape': [10, 10],
         'tensorName': 'var2'
@@ -95,8 +109,264 @@ class ProjectorAppTest(test.TestCase):
 
     url = '/data/plugin/projector/tensor?run=.&name=var1'
     tensor_bytes = self._Get(url).data
-    tensor = np.reshape(np.fromstring(tensor_bytes, dtype='float32'), [1, 2])
-    expected_tensor = np.array([[6, 6]], dtype='float32')
+    expected_tensor = np.array([[6, 6]], dtype=np.float32)
+    self._AssertTensorResponse(tensor_bytes, expected_tensor)
+
+  def testBookmarksRequestMissingRunAndName(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksRequestMissingName(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=.'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksRequestMissingRun(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?name=var1'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksUnknownRun(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=unknown&name=var1'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksUnknownName(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=.&name=unknown'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarks(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=.&name=var1'
+    bookmark = self._GetJson(url)
+    self.assertEqual(bookmark, {'a': 'b'})
+
+  def testEndpointsNoAssets(self):
+    g = ops.Graph()
+    with g.as_default():
+      plugin_asset.get_plugin_asset(projector_plugin.ProjectorPluginAsset)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertEqual(run_json, [])
+
+  def testEndpointsMetadataForVariableAssets(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('test', metadata)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertTrue(run_json)
+
+    run = run_json[0]
+    metedata_query = '/data/plugin/projector/metadata?run=%s&name=test' % run
+    metadata_tsv = self._Get(metedata_query).data
+    self.assertEqual(metadata_tsv, b'a\nb\nc\n')
+
+    unk_tensor_query = '/data/plugin/projector/tensor?run=%s&name=test' % run
+    response = self._Get(unk_tensor_query)
+    self.assertEqual(response.status_code, 400)
+
+    expected_tensor = np.array([[6, 6]], dtype=np.float32)
+    tensor_query = '/data/plugin/projector/tensor?run=%s&name=var1' % run
+    tensor_bytes = self._Get(tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, expected_tensor)
+
+  def testEndpointsMetadataForVariableAssetsButNoCheckpoint(self):
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('test', metadata)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertEqual(run_json, [])
+
+  def testEndpointsTensorAndMetadataAssets(self):
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('test', metadata)
+    expected_tensor = np.array([[1, 2], [3, 4], [5, 6]])
+    image1 = np.array([[[1, 2, 3], [4, 5, 6]],
+                       [[7, 8, 9], [10, 11, 12]]])
+    image2 = np.array([[[10, 20, 30], [40, 50, 60]],
+                       [[70, 80, 90], [100, 110, 120]]])
+    manager.add_embedding('emb', expected_tensor, metadata, [image1, image2],
+                          [2, 2])
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertTrue(run_json)
+
+    run = run_json[0]
+    metadata_query = '/data/plugin/projector/metadata?run=%s&name=emb' % run
+    metadata_tsv = self._Get(metadata_query).data
+    self.assertEqual(metadata_tsv, b'a\nb\nc\n')
+
+    unk_metadata_query = '/data/plugin/projector/metadata?run=%s&name=q' % run
+    response = self._Get(unk_metadata_query)
+    self.assertEqual(response.status_code, 400)
+
+    tensor_query = '/data/plugin/projector/tensor?run=%s&name=emb' % run
+    tensor_bytes = self._Get(tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, expected_tensor)
+
+    unk_tensor_query = '/data/plugin/projector/tensor?run=%s&name=var1' % run
+    response = self._Get(unk_tensor_query)
+    self.assertEqual(response.status_code, 400)
+
+    image_query = '/data/plugin/projector/sprite_image?run=%s&name=emb' % run
+    image_bytes = self._Get(image_query).data
+    with ops.Graph().as_default():
+      s = session.Session()
+      image_array = image_ops.decode_png(image_bytes).eval(session=s).tolist()
+    expected_sprite_image = [
+        [[1, 2, 3], [4, 5, 6], [10, 20, 30], [40, 50, 60]],
+        [[7, 8, 9], [10, 11, 12], [70, 80, 90], [100, 110, 120]],
+        [[0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0]],
+        [[0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0]]
+    ]
+    self.assertEqual(image_array, expected_sprite_image)
+
+  def testSpriteImageRequestMissingRunAndName(self):
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageRequestMissingName(self):
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image?run=.'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageRequestMissingRun(self):
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image?name=emb'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageUnknownRun(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+    image1 = np.array([[[1, 2, 3], [4, 5, 6]],
+                       [[7, 8, 9], [10, 11, 12]]])
+    image2 = np.array([[[10, 20, 30], [40, 50, 60]],
+                       [[70, 80, 90], [100, 110, 120]]])
+    manager.add_metadata_for_embedding_variable('var1',
+                                                thumbnails=[image1, image2],
+                                                thumbnail_dim=[2, 2])
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+    self._SetupWSGIApp()
+
+    q = '/data/plugin/projector/sprite_image?run=unknown&name=var1'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageUnknownName(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+    image1 = np.array([[[1, 2, 3], [4, 5, 6]],
+                       [[7, 8, 9], [10, 11, 12]]])
+    image2 = np.array([[[10, 20, 30], [40, 50, 60]],
+                       [[70, 80, 90], [100, 110, 120]]])
+    manager.add_metadata_for_embedding_variable('var1',
+                                                thumbnails=[image1, image2],
+                                                thumbnail_dim=[2, 2])
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image?run=.&name=unknown'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testEndpointsComboTensorAssetsAndCheckpoint(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('var1', metadata)
+
+    new_tensor_values = np.array([[1, 2], [3, 4], [5, 6]])
+    manager.add_embedding('new_tensor', new_tensor_values)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertTrue(run_json)
+
+    run = run_json[0]
+    var1_values = np.array([[6, 6]], dtype=np.float32)
+    var1_tensor_query = '/data/plugin/projector/tensor?run=%s&name=var1' % run
+    tensor_bytes = self._Get(var1_tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, var1_values)
+
+    metadata_query = '/data/plugin/projector/metadata?run=%s&name=var1' % run
+    metadata_tsv = self._Get(metadata_query).data
+    self.assertEqual(metadata_tsv, b'a\nb\nc\n')
+
+    tensor_query = '/data/plugin/projector/tensor?run=%s&name=new_tensor' % run
+    tensor_bytes = self._Get(tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, new_tensor_values)
+
+  def _AssertTensorResponse(self, tensor_bytes, expected_tensor):
+    tensor = np.reshape(np.fromstring(tensor_bytes, dtype=np.float32),
+                        expected_tensor.shape)
     self.assertTrue(np.array_equal(tensor, expected_tensor))
 
   def testPluginIsActive(self):
@@ -137,6 +407,11 @@ class ProjectorAppTest(test.TestCase):
     embedding = config.embeddings.add()
     # Add an embedding by its canonical tensor name.
     embedding.tensor_name = 'var1:0'
+
+    with gfile.GFile(os.path.join(self.log_dir, 'bookmarks.json'), 'w') as f:
+      f.write('{"a": "b"}')
+    embedding.bookmarks_path = 'bookmarks.json'
+
     config_pbtxt = text_format.MessageToString(config)
     with gfile.GFile(config_path, 'w') as f:
       f.write(config_pbtxt)
@@ -355,6 +630,30 @@ class ProjectorPluginAssetTest(test.TestCase):
           'test', np.array([[1], [2], [3]]), thumbnails=thumbnails,
           thumbnail_dim=[4])
 
+  def testAddEmbeddingThumbnailListHasNoEntries(self):
+    manager = plugin_asset.get_plugin_asset(
+        projector_plugin.ProjectorPluginAsset)
+
+    with self.assertRaises(ValueError):
+      manager.add_embedding('test', np.array([[1]]), thumbnails=[],
+                            thumbnail_dim=[1, 1])
+
+  def testAddEmbeddingThumbnailListNotOfRank4(self):
+    manager = plugin_asset.get_plugin_asset(
+        projector_plugin.ProjectorPluginAsset)
+
+    with self.assertRaises(ValueError):
+      manager.add_embedding('test2', np.array([[1]]),
+                            thumbnails=np.array([[1]]), thumbnail_dim=[1, 1])
+
+  def testAddEmbeddingThumbnailListEntriesNot3DTensors(self):
+    manager = plugin_asset.get_plugin_asset(
+        projector_plugin.ProjectorPluginAsset)
+
+    with self.assertRaises(ValueError):
+      manager.add_embedding('test3', np.array([[1]]), thumbnails=[[1, 2, 3]],
+                            thumbnail_dim=[1, 1])
+
   def testAddEmbeddingWithMetadataOfIncorrectLength(self):
     manager = plugin_asset.get_plugin_asset(
         projector_plugin.ProjectorPluginAsset)
@@ -405,8 +704,8 @@ class ProjectorPluginAssetTest(test.TestCase):
 
     with ops.Graph().as_default() as g:
       plugin_asset.get_plugin_asset(projector_plugin.ProjectorPluginAsset)
-      fw = writer.FileWriter(logdir)
-      fw.add_graph(g)
+      fw = writer.FileWriter(logdir, graph=g)
+      fw.close()
 
     with gfile.Open(os.path.join(plugin_dir, 'projector_config.pbtxt')) as f:
       content = f.read()
@@ -418,8 +717,8 @@ class ProjectorPluginAssetTest(test.TestCase):
                               projector_plugin.ProjectorPluginAsset.plugin_name)
 
     with ops.Graph().as_default() as g:
-      fw = writer.FileWriter(logdir)
-      fw.add_graph(g)
+      fw = writer.FileWriter(logdir, graph=g)
+      fw.close()
 
     self.assertFalse(
         gfile.Exists(plugin_dir),
-- 
GitLab


From 35c88a7f7d0189809dfb630396566eec078dc5db Mon Sep 17 00:00:00 2001
From: Vincent Vanhoucke <vanhoucke@google.com>
Date: Fri, 7 Apr 2017 07:54:39 -0800
Subject: [PATCH 0213/1563] Move MNIST pointers to mirror hosted by the CVDF on
 Google Cloud. Fixes: #9031 Change: 152504901

---
 tensorflow/contrib/learn/python/learn/datasets/mnist.py   | 3 ++-
 tensorflow/tools/dist_test/server/Dockerfile.test         | 8 ++++----
 .../tools/docker/notebooks/3_mnist_from_scratch.ipynb     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/datasets/mnist.py b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
index 01262ff5f8..fd50070dac 100644
--- a/tensorflow/contrib/learn/python/learn/datasets/mnist.py
+++ b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
@@ -27,7 +27,8 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensorflow.contrib.learn.python.learn.datasets import base
 from tensorflow.python.framework import dtypes
 
-SOURCE_URL = 'http://yann.lecun.com/exdb/mnist/'
+# CVDF mirror of http://yann.lecun.com/exdb/mnist/
+SOURCE_URL = 'https://storage.googleapis.com/cvdf-datasets/mnist/'
 
 
 def _read32(bytestream):
diff --git a/tensorflow/tools/dist_test/server/Dockerfile.test b/tensorflow/tools/dist_test/server/Dockerfile.test
index 3cd3d5206d..908af8af9b 100644
--- a/tensorflow/tools/dist_test/server/Dockerfile.test
+++ b/tensorflow/tools/dist_test/server/Dockerfile.test
@@ -52,13 +52,13 @@ ADD . /var/tf-k8s
 # Download MNIST data for tests
 RUN mkdir -p /tmp/mnist-data
 RUN curl -o /tmp/mnist-data/train-labels-idx1-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/train-labels-idx1-ubyte.gz
 RUN curl -o /tmp/mnist-data/train-images-idx3-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/train-images-idx3-ubyte.gz
 RUN curl -o /tmp/mnist-data/t10k-labels-idx1-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/t10k-labels-idx1-ubyte.gz
 RUN curl -o /tmp/mnist-data/t10k-images-idx3-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/t10k-images-idx3-ubyte.gz
 
 # Download Census data for Wide & Deep test
 RUN mkdir -p /tmp/census-data
diff --git a/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb b/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb
index b35b14df1f..c9f2b1ab9e 100644
--- a/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb
+++ b/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb
@@ -134,7 +134,7 @@
     "import os\n",
     "from six.moves.urllib.request import urlretrieve\n",
     "\n",
-    "SOURCE_URL = 'http://yann.lecun.com/exdb/mnist/'\n",
+    "SOURCE_URL = 'https://storage.googleapis.com/cvdf-datasets/mnist/'\n",
     "WORK_DIRECTORY = \"/tmp/mnist-data\"\n",
     "\n",
     "def maybe_download(filename):\n",
-- 
GitLab


From d0697156736ff137a8d8f6bcd934aa935bf89001 Mon Sep 17 00:00:00 2001
From: Rohan Jain <rohanj@google.com>
Date: Fri, 7 Apr 2017 08:29:08 -0800
Subject: [PATCH 0214/1563] Merge changes from github. Change: 152508170

---
 ISSUE_TEMPLATE.md                             | 45 +++--------
 README.md                                     | 12 +--
 RELEASE.md                                    | 52 +++++++------
 .../kernel_tests/stochastic_tensor_test.py    | 40 +++++-----
 tensorflow/contrib/cmake/README.md            |  4 +-
 tensorflow/contrib/distributions/__init__.py  | 13 ++--
 .../bijectors/affine_linear_operator_test.py  |  8 +-
 .../kernel_tests/bijectors/affine_test.py     | 74 +++++++++---------
 .../kernel_tests/bijectors/bijector_test.py   |  8 +-
 .../kernel_tests/bijectors/chain_test.py      | 25 +++---
 .../bijectors/cholesky_outer_product_test.py  |  4 +-
 .../bijectors/conditional_bijector_test.py    |  4 +-
 .../python/kernel_tests/bijectors/exp_test.py | 15 ++--
 .../kernel_tests/bijectors/identity_test.py   | 10 +--
 .../kernel_tests/bijectors/inline_test.py     | 10 +--
 .../kernel_tests/bijectors/invert_test.py     |  4 +-
 .../bijectors/power_transform_test.py         | 15 ++--
 .../bijectors/sigmoid_centered_test.py        |  4 +-
 .../kernel_tests/bijectors/sigmoid_test.py    | 21 ++---
 .../bijectors/softmax_centered_test.py        | 16 ++--
 .../kernel_tests/bijectors/softplus_test.py   | 25 +++---
 ...nditional_transformed_distribution_test.py |  4 +-
 .../python/ops/bijectors/__init__.py          |  4 -
 .../python/ops/relaxed_bernoulli.py           |  6 +-
 .../python/ops/transformed_distribution.py    | 76 +++++++++++++------
 .../python/ops/vector_student_t.py            |  2 +-
 .../contrib/keras/python/keras/backend.py     | 20 +++++
 .../dataframe/queues/feeding_functions.py     |  1 +
 .../python/learn/learn_io/generator_io.py     |  5 +-
 tensorflow/contrib/slim/README.md             |  8 +-
 .../core/kernels/conv_grad_filter_ops.cc      | 11 +--
 .../core/kernels/conv_grad_input_ops.cc       | 12 ++-
 .../core/kernels/maxpooling_op_gpu.cu.cc      |  4 +-
 tensorflow/core/kernels/xsmm_conv2d.cc        | 16 ++--
 tensorflow/core/ops/ops.pbtxt                 | 53 +++++++++++++
 tensorflow/core/public/version.h              |  4 +-
 .../docs_src/get_started/get_started.md       |  1 -
 tensorflow/docs_src/install/install_c.md      |  2 +-
 tensorflow/docs_src/install/install_go.md     |  2 +-
 tensorflow/docs_src/install/install_java.md   | 16 ++--
 tensorflow/docs_src/install/install_linux.md  | 26 +++----
 tensorflow/docs_src/install/install_mac.md    | 14 ++--
 .../docs_src/install/install_sources.md       |  4 +-
 .../docs_src/install/install_windows.md       |  4 +-
 tensorflow/java/README.md                     | 40 +++++-----
 .../src/main/java/org/tensorflow/Shape.java   | 27 +++----
 .../java/src/main/native/operation_jni.h      |  1 -
 .../python/framework/tensor_util_test.py      | 28 +++----
 .../python/kernel_tests/pooling_ops_test.py   |  8 +-
 tensorflow/python/ops/nn_grad.py              | 11 +--
 tensorflow/python/ops/nn_ops.py               |  2 +-
 tensorflow/stream_executor/cuda/cuda_dnn.cc   |  3 +-
 tensorflow/tensorboard/plugins/debugger/BUILD |  1 +
 tensorflow/tools/ci_build/update_version.sh   | 21 +++++
 tensorflow/tools/docker/Dockerfile            |  2 +-
 tensorflow/tools/docker/Dockerfile.gpu        |  2 +-
 .../tools/graph_transforms/quantize_nodes.cc  |  2 +-
 tensorflow/tools/pip_package/setup.py         |  4 +-
 tensorflow/workspace.bzl                      |  8 +-
 59 files changed, 482 insertions(+), 382 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index af76188c2f..50f67963bf 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,36 +1,15 @@
-NOTE: Only file GitHub issues for bugs and feature requests.  All other topics will be closed.
+NOTE: Issues that are not bugs or feature requests will be closed. Please ask usage questions on StackOverflow.
 
-For general support from the community, see [StackOverflow](https://stackoverflow.com/questions/tagged/tensorflow).
-To make bugs and feature requests more easy to find and organize, we close issues that are deemed
-out of scope for GitHub Issues and point people to StackOverflow.
+### You must complete this information or else your issue will be closed
+- *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
+- *TensorFlow installed from (source or binary)?*:
+- *TensorFlow version*:
+- *Bazel version (if compiling from source)*:
+- *CUDA/cuDNN version*:
+- *GPU Model and Memory*:
+- *Exact command to reproduce*:
 
-For bugs or installation issues, please provide the following information.
-The more information you provide, the more easily we will be able to offer
-help and advice.
+### Describe the problem clearly
 
-### What related GitHub issues or StackOverflow threads have you found by searching the web for your problem?
-
-### Environment info
-Operating System:
-
-Installed version of CUDA and cuDNN: 
-(please attach the output of `ls -l /path/to/cuda/lib/libcud*`):
-
-If installed from binary pip package, provide:
-
-1. A link to the pip package you installed:
-2. The output from `python -c "import tensorflow; print(tensorflow.__version__)"`.
-
-If installed from source, provide 
-
-1. The commit hash (`git rev-parse HEAD`)
-2. The output of `bazel version`
-
-### If possible, provide a minimal reproducible example (We usually don't have time to read hundreds of lines of your code)
-
-
-### What other attempted solutions have you tried?
-
-
-### Logs or other output that would be helpful
-(If logs are large, please upload as attachment or provide link).
+### Source Code / Logs
+Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full-traceback. Large logs and files should be attached. Try to reproducible test-case code the bare-minimum necessary to generate the problem
diff --git a/README.md b/README.md
index d9f05a67e0..cd0bffde79 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,12 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
diff --git a/RELEASE.md b/RELEASE.md
index 156cc2e3af..ebb5c28451 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -15,6 +15,7 @@
   * Ability to inspect Python source file against TF ops and tensors (command `print_source` / `ps`)
   * New navigation bar in Curses-based UI
   * NodeStepper (command `invoke_stepper`) now uses intermediate tensor dumps. It also uses `TensorHandles` as direct feeds during successive `cont` calls for improved performance and reduced memory consumption.
+* Initial release of installation guides for Java, C, and Go.
 
 ## Deprecations
 
@@ -68,38 +69,39 @@
 * Multiple tfdbg bug fixes:
   * Fixed Windows compatibility issues.
   * Command history now persists across runs.
+  * Bug fix in graph validation related to `tf.while_loops`.
+* Java Maven fixes for bugs with Windows installation.
 
 ## Thanks to our Contributors
 
 This release contains contributions from many people at Google, as well as:
 
 A. Besir Kurtulmus, Adal Chiriliuc, @akash, Alec-Desouza, Alex Rothberg, Alex
-Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton
+Sergeev, Alexander Heinecke, Allen Guo, Andreas Madsen, Ankesh Anand, Anton 
 Loss, @Aravind, @Arie, Ashutosh Das, AuréLien Geron, Bairen Yi, @bakunyo, Ben
-Visser, Brady Zhou, Calpa Liu, Changming Sun, Chi Zeng, Chih Cheng Liang,
-Christopher Berner, Clark Zinzow, @Conchylicultor, Courtial Florian, Dan Ellis,
-Dan J, Dan Jarvis, Daniel Ylitalo, Darren Garvey, David Norman, David Truong,
-@DavidNorman, Dimitar Pavlov, Dmitry Persiyanov, @Eddie, @elirex, Erfan
-Noury, Eron Wright, Evgeny Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher
-Coder, Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang,
-@guilherme, @guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo
-Gao, Igor ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason
-Morton, Jay Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi,
-@jiqiu, Joan Thibault, John C F, Jojy G Varghese, Jon Malmaud, Julian Berman,
-Julian Niedermeier, Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle
-Bostelmann, @Lezcano, Li Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh,
-Marek Kolodziej, Mark Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael
-Gharbi, MichaëL Defferrard, Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal,
-Nayana Thorat, @nghiattran, Nicholas Connor, Nikolaas Steenbergen, Niraj Patel,
-Niranjan Hasabnis, @Panmari, Pavel Bulanov, Philip Pries Henningsen, Philipp
-Jund, @polonez, Prayag Verma, Rahul Kavi, Raphael Gontijo Lopes, @rasbt, Raven
-Iqqe, Reid Pryzant, Richard Shin, Rizwan Asif, Russell Kaplan, Ryo Asakura,
-RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay, Sean Papay, @seaotterman,
-@selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano Probst, @taknevski,
-@tbonza, @teldridge11, Yuan (Terry) Tang, Tim Anglade, Tomas Reimers, Tomer Gafner,
-Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad
-Firoiu, @wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yuan (Terry) Tang,
-@Yufeng, Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
+Visser, Brady Zhou, Calpa Liu, Changming Sun, Chih Cheng Liang, Christopher
+Berner, Clark Zinzow, @Conchylicultor, Dan Ellis, Dan J, Dan Jarvis, Daniel
+Ylitalo, Darren Garvey, David Norman, David Truong, @DavidNorman, Dimitar
+Pavlov, Dmitry Persiyanov, @Eddie, @elirex, Erfan Noury, Eron Wright, Evgeny
+Mazovetskiy, Fabrizio (Misto) Milo, @fanlu, Fisher Coder, Florian Courtial,
+Franck Dernoncourt, Gagan Goel, Gao, Xiang, @Gautam, Gefu Tang, @guilherme,
+@guschmue, Hannah Provenza, Hans Pabst, @hartb, Hsiao Yi, Huazuo Gao, Igor
+ChorążEwicz, Ivan Smirnov, Jakub Kolodziejczyk, Jason Gavris, Jason Morton, Jay
+Young, Jayaram Bobba, Jeremy Sawruk, Jiaming Liu, Jihun Choi, @jiqiu, Joan Thibault,
+John C F, Jojy George Varghese, Jon Malmaud, Julian Berman, Julian Niedermeier,
+Junpeng Lao, Kai Sasaki, @Kankroc, Karl Lessard, Kyle Bostelmann, @Lezcano, Li
+Yi, Luo Yun, @lurker, Mahmoud-Abuzaina, Mandeep Singh, Marek Kolodziej, Mark
+Szepieniec, Martial Hue, Medhat Omr, Memo Akten, Michael Gharbi, MichaëL Defferrard,
+Milan Straka, @MircoT, @mlucool, Muammar Ibn Faisal, Nayana Thorat, @nghiattran,
+Nicholas Connor, Nikolaas Steenbergen, Niraj Patel, Niranjan Hasabnis, @Panmari,
+Pavel Bulanov, Philip Pries Henningsen, Philipp Jund, @polonez, Prayag Verma, Rahul
+Kavi, Raphael Gontijo Lopes, @rasbt, Raven Iqqe, Reid Pryzant, Richard Shin, Rizwan
+Asif, Russell Kaplan, Ryo Asakura, RüDiger Busche, Saisai Shao, Sam Abrahams, @sanosay,
+Sean Papay, @seaotterman, @selay01, Shaurya Sharma, Sriram Narayanamoorthy, Stefano
+Probst, @taknevski, @tbonza, @teldridge11, Tim Anglade, Tomas Reimers, Tomer Gafner,
+Valentin Iovene, Vamsi Sripathi, Viktor Malyi, Vit Stepanovs, Vivek Rane, Vlad Firoiu,
+@wangg12, @will, Xiaoyu Tao, Yaroslav Bulatov, Yi Liu, Yuan (Terry) Tang, @Yufeng,
+Yuming Wang, Yuxin Wu, Zafar Takhirov, Ziming Dong
 
 We are also grateful to all who filed issues or helped resolve them, asked and
 answered questions, and were part of inspiring discussions.
diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
index 5ce64cbe3d..81e40dbe5e 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
@@ -19,16 +19,16 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-
+from tensorflow.contrib import distributions as distributions_lib
 from tensorflow.contrib.bayesflow.python.ops import stochastic_gradient_estimators
 from tensorflow.contrib.bayesflow.python.ops import stochastic_tensor_impl
-from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
+distributions = distributions_lib
 sge = stochastic_gradient_estimators
 st = stochastic_tensor_impl
 
@@ -42,20 +42,20 @@ class StochasticTensorTest(test.TestCase):
       sigma2 = constant_op.constant([0.1, 0.2, 0.3])
 
       prior_default = st.StochasticTensor(
-          normal.Normal(
+          distributions.Normal(
               loc=mu, scale=sigma))
       self.assertTrue(isinstance(prior_default.value_type, st.SampleValue))
       prior_0 = st.StochasticTensor(
-          normal.Normal(
+          distributions.Normal(
               loc=mu, scale=sigma),
           dist_value_type=st.SampleValue())
       self.assertTrue(isinstance(prior_0.value_type, st.SampleValue))
 
       with st.value_type(st.SampleValue()):
-        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.SampleValue))
         likelihood = st.StochasticTensor(
-            normal.Normal(
+            distributions.Normal(
                 loc=prior, scale=sigma2))
         self.assertTrue(isinstance(likelihood.value_type, st.SampleValue))
 
@@ -85,7 +85,7 @@ class StochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
 
       with st.value_type(st.MeanValue()):
-        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.MeanValue))
 
       prior_mean = prior.mean()
@@ -102,7 +102,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue()):
         prior_single = st.StochasticTensor(
-            normal.Normal(
+            distributions.Normal(
                 loc=mu, scale=sigma))
 
       prior_single_value = prior_single.value()
@@ -113,7 +113,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(1)):
         prior_single = st.StochasticTensor(
-            normal.Normal(
+            distributions.Normal(
                 loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior_single.value_type, st.SampleValue))
 
@@ -125,7 +125,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(2)):
         prior_double = st.StochasticTensor(
-            normal.Normal(
+            distributions.Normal(
                 loc=mu, scale=sigma))
 
       prior_double_value = prior_double.value()
@@ -139,10 +139,10 @@ class StochasticTensorTest(test.TestCase):
       mu = [0.0, -1.0, 1.0]
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       with st.value_type(st.MeanValue()):
-        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
         entropy = prior.entropy()
         deep_entropy = prior.distribution.entropy()
-        expected_deep_entropy = normal.Normal(
+        expected_deep_entropy = distributions.Normal(
             loc=mu, scale=sigma).entropy()
         entropies = sess.run([entropy, deep_entropy, expected_deep_entropy])
         self.assertAllEqual(entropies[2], entropies[0])
@@ -155,7 +155,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With default
       with st.value_type(st.MeanValue(stop_gradient=True)):
-        dt = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
+        dt = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
       loss = dt.loss([constant_op.constant(2.0)])
       self.assertTrue(loss is not None)
       self.assertAllClose(
@@ -163,7 +163,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With passed-in loss_fn.
       dt = st.StochasticTensor(
-          normal.Normal(
+          distributions.Normal(
               loc=mu, scale=sigma),
           dist_value_type=st.MeanValue(stop_gradient=True),
           loss_fn=sge.get_score_function_with_constant_baseline(
@@ -199,7 +199,7 @@ class ObservedStochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       obs = array_ops.zeros((2, 3))
       z = st.ObservedStochasticTensor(
-          normal.Normal(
+          distributions.Normal(
               loc=mu, scale=sigma), value=obs)
       [obs_val, z_val] = sess.run([obs, z.value()])
       self.assertAllEqual(obs_val, z_val)
@@ -212,14 +212,14 @@ class ObservedStochasticTensorTest(test.TestCase):
     sigma = array_ops.placeholder(dtypes.float32)
     obs = array_ops.placeholder(dtypes.float32)
     z = st.ObservedStochasticTensor(
-        normal.Normal(
+        distributions.Normal(
             loc=mu, scale=sigma), value=obs)
 
     mu2 = array_ops.placeholder(dtypes.float32, shape=[None])
     sigma2 = array_ops.placeholder(dtypes.float32, shape=[None])
     obs2 = array_ops.placeholder(dtypes.float32, shape=[None, None])
     z2 = st.ObservedStochasticTensor(
-        normal.Normal(
+        distributions.Normal(
             loc=mu2, scale=sigma2), value=obs2)
 
     coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
@@ -231,19 +231,19 @@ class ObservedStochasticTensorTest(test.TestCase):
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        normal.Normal(
+        distributions.Normal(
             loc=mu, scale=sigma),
         value=array_ops.zeros((3,)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        normal.Normal(
+        distributions.Normal(
             loc=mu, scale=sigma),
         value=array_ops.zeros((3, 1)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        normal.Normal(
+        distributions.Normal(
             loc=mu, scale=sigma),
         value=array_ops.zeros(
             (1, 2), dtype=dtypes.int32))
diff --git a/tensorflow/contrib/cmake/README.md b/tensorflow/contrib/cmake/README.md
index af949f79fa..14d99a30cd 100644
--- a/tensorflow/contrib/cmake/README.md
+++ b/tensorflow/contrib/cmake/README.md
@@ -68,8 +68,8 @@ bindings.
   - [Anaconda 4.1.1 (Python 3.5 64-bit)](https://www.continuum.io/downloads)
   - [Git for Windows version 2.9.2.windows.1](https://git-scm.com/download/win)
   - [swigwin-3.0.10](http://www.swig.org/download.html)
-  - [NVidia CUDA Toolkit 8.0] (https://developer.nvidia.com/cuda-downloads)
-  - [NVidia CUDNN 5.1] (https://developer.nvidia.com/cudnn)
+  - [NVidia CUDA Toolkit 8.0](https://developer.nvidia.com/cuda-downloads)
+  - [NVidia CUDNN 5.1](https://developer.nvidia.com/cudnn)
   - [CMake 3.6](https://cmake.org/files/v3.6/cmake-3.6.3-win64-x64.msi)
   
 * Ubuntu 14.04
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 257aefa857..470b9edb79 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -90,9 +90,10 @@ from __future__ import print_function
 
 # pylint: disable=unused-import,wildcard-import,line-too-long,g-importing-member
 
-from tensorflow.contrib.distributions.python.ops import bijectors
+
 from tensorflow.contrib.distributions.python.ops.bernoulli import *
 from tensorflow.contrib.distributions.python.ops.beta import *
+from tensorflow.contrib.distributions.python.ops.bijectors import *
 from tensorflow.contrib.distributions.python.ops.binomial import *
 from tensorflow.contrib.distributions.python.ops.categorical import *
 from tensorflow.contrib.distributions.python.ops.chi2 import *
@@ -134,12 +135,8 @@ from tensorflow.contrib.distributions.python.ops.wishart import *
 
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = [
-    'bijectors',
-    'ConditionalDistribution',
-    'ConditionalTransformedDistribution',
-    'FULLY_REPARAMETERIZED',
-    'NOT_REPARAMETERIZED',
-]
+_allowed_symbols = ['ConditionalDistribution',
+                    'ConditionalTransformedDistribution',
+                    'FULLY_REPARAMETERIZED', 'NOT_REPARAMETERIZED']
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
index 0738754b21..d4f83567e4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.contrib import linalg
-from tensorflow.contrib.distributions.python.ops.bijectors.affine_linear_operator import AffineLinearOperator
+from tensorflow.contrib.distributions.python.ops.bijectors import affine_linear_operator as affine_linear_operator_lib
 from tensorflow.python.platform import test
 
 
@@ -29,7 +29,7 @@ class AffineLinearOperatorTest(test.TestCase):
 
   def testIdentity(self):
     with self.test_session():
-      affine = AffineLinearOperator(
+      affine = affine_linear_operator_lib.AffineLinearOperator(
           validate_args=True)
       x = np.array([[1, 0, -1], [2, 3, 4]], dtype=np.float32)
       y = x
@@ -48,7 +48,7 @@ class AffineLinearOperatorTest(test.TestCase):
       diag = np.array([[1, 2, 3],
                        [2, 5, 6]], dtype=np.float32)
       scale = linalg.LinearOperatorDiag(diag, is_non_singular=True)
-      affine = AffineLinearOperator(
+      affine = affine_linear_operator_lib.AffineLinearOperator(
           shift=shift, scale=scale, validate_args=True)
 
       x = np.array([[1, 0, -1], [2, 3, 4]], dtype=np.float32)
@@ -73,7 +73,7 @@ class AffineLinearOperatorTest(test.TestCase):
                         [4, 3, 2]]],
                       dtype=np.float32)
       scale = linalg.LinearOperatorTriL(tril, is_non_singular=True)
-      affine = AffineLinearOperator(
+      affine = affine_linear_operator_lib.AffineLinearOperator(
           shift=shift, scale=scale, validate_args=True)
 
       x = np.array([[[1, 0, -1],
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
index 295e64a0d8..71460a1769 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
@@ -22,8 +22,8 @@ import itertools
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.affine import Affine
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors import affine as affine_lib
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -36,7 +36,7 @@ class AffineBijectorTest(test.TestCase):
     with self.test_session():
       mu = -1.
       # scale corresponds to 1.
-      bijector = Affine(shift=mu, event_ndims=0)
+      bijector = affine_lib.Affine(shift=mu, event_ndims=0)
       self.assertEqual("affine", bijector.name)
 
   def testNoBatchScalarViaIdentity(self):
@@ -53,7 +53,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu, scale_identity_multiplier=2., event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 2, 3]  # Three scalar samples (no batches).
@@ -76,7 +76,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = Affine(shift=mu, scale_diag=[2.], event_ndims=0)
+        bijector = affine_lib.Affine(shift=mu, scale_diag=[2.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 2, 3]  # Three scalar samples (no batches).
         self.assertAllClose([1., 3, 5], run(bijector.forward, x))
@@ -98,7 +98,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2.
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu, scale_identity_multiplier=2., event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [[1., 2, 3], [4, 5, 6]]  # Weird sample shape.
@@ -126,7 +126,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1.]
         # One batch, scalar.
         # Corresponds to scale = 1.
-        bijector = Affine(shift=mu, event_ndims=0)
+        bijector = affine_lib.Affine(shift=mu, event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1.]  # One sample from one batches.
         self.assertAllClose([2.], run(bijector.forward, x))
@@ -148,7 +148,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1.]
         # One batch, scalar.
         # Corresponds to scale = 1.
-        bijector = Affine(shift=mu, scale_diag=[1.], event_ndims=0)
+        bijector = affine_lib.Affine(shift=mu, scale_diag=[1.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1.]  # One sample from one batches.
         self.assertAllClose([2.], run(bijector.forward, x))
@@ -170,7 +170,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Univariate, two batches.
         # Corresponds to scale = 1.
-        bijector = Affine(shift=mu, event_ndims=0)
+        bijector = affine_lib.Affine(shift=mu, event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 1]  # One sample from each of two batches.
         self.assertAllClose([2., 0], run(bijector.forward, x))
@@ -192,7 +192,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Univariate, two batches.
         # Corresponds to scale = 1.
-        bijector = Affine(shift=mu, scale_diag=[1.], event_ndims=0)
+        bijector = affine_lib.Affine(shift=mu, scale_diag=[1.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 1]  # One sample from each of two batches.
         self.assertAllClose([2., 0], run(bijector.forward, x))
@@ -214,7 +214,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Multivariate
         # Corresponds to scale = [[1., 0], [0, 1.]]
-        bijector = Affine(shift=mu)
+        bijector = affine_lib.Affine(shift=mu)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 1]
         # matmul(sigma, x) + shift
@@ -245,7 +245,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Multivariate
         # Corresponds to scale = [[2., 0], [0, 1.]]
-        bijector = Affine(shift=mu, scale_diag=[2., 1])
+        bijector = affine_lib.Affine(shift=mu, scale_diag=[2., 1])
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 1]
         # matmul(sigma, x) + shift
@@ -287,7 +287,7 @@ class AffineBijectorTest(test.TestCase):
           event_ndims: event_ndims_value
       }
 
-      bijector = Affine(
+      bijector = affine_lib.Affine(
           shift=mu, scale_diag=scale_diag, event_ndims=event_ndims)
       self.assertEqual(1, sess.run(bijector.event_ndims, feed_dict))
       self.assertAllClose([[3., 1]], sess.run(bijector.forward(x), feed_dict))
@@ -311,7 +311,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [[1., -1]]
         # Corresponds to 1 2x2 matrix, with twos on the diagonal.
         scale = 2.
-        bijector = Affine(shift=mu, scale_identity_multiplier=scale)
+        bijector = affine_lib.Affine(shift=mu, scale_identity_multiplier=scale)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[[1., 1]]]
         self.assertAllClose([[[3., 1]]], run(bijector.forward, x))
@@ -334,7 +334,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [[1., -1]]
         # Corresponds to 1 2x2 matrix, with twos on the diagonal.
         scale_diag = [[2., 2]]
-        bijector = Affine(shift=mu, scale_diag=scale_diag)
+        bijector = affine_lib.Affine(shift=mu, scale_diag=scale_diag)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[[1., 1]]]
         self.assertAllClose([[[3., 1]]], run(bijector.forward, x))
@@ -361,7 +361,7 @@ class AffineBijectorTest(test.TestCase):
           event_ndims: event_ndims_value
       }
 
-      bijector = Affine(
+      bijector = affine_lib.Affine(
           shift=mu, scale_diag=scale_diag, event_ndims=event_ndims)
       self.assertEqual(1, sess.run(bijector.event_ndims, feed_dict))
       self.assertAllClose([[[3., 1]]], sess.run(bijector.forward(x), feed_dict))
@@ -384,7 +384,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu,
             scale_identity_multiplier=1.,
             scale_diag=[1.],
@@ -410,7 +410,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[2., 0], [2, 2]]
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu,
             scale_identity_multiplier=1.,
             scale_tril=[[1., 0], [2., 1]])
@@ -435,7 +435,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[2., 0], [2, 3]]
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu, scale_diag=[1., 2.], scale_tril=[[1., 0], [2., 1]])
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[1., 2]]  # One multivariate sample.
@@ -458,7 +458,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[3., 0], [2, 4]]
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu,
             scale_identity_multiplier=1.0,
             scale_diag=[1., 2.],
@@ -484,14 +484,14 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [0, 2, 0], [0, 0, 3]]
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu,
             scale_identity_multiplier=2.,
             scale_perturb_diag=[2., 1],
             scale_perturb_factor=[[2., 0],
                                   [0., 0],
                                   [0, 1]])
-        bijector_ref = Affine(shift=mu, scale_diag=[10., 2, 3])
+        bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 2, 3])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
@@ -522,14 +522,14 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [0, 3, 0], [0, 0, 5]]
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu,
             scale_diag=[2., 3, 4],
             scale_perturb_diag=[2., 1],
             scale_perturb_factor=[[2., 0],
                                   [0., 0],
                                   [0, 1]])
-        bijector_ref = Affine(shift=mu, scale_diag=[10., 3, 5])
+        bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 3, 5])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
@@ -559,7 +559,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [1, 3, 0], [2, 3, 5]]
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu,
             scale_tril=[[2., 0, 0],
                         [1, 3, 0],
@@ -568,7 +568,7 @@ class AffineBijectorTest(test.TestCase):
             scale_perturb_factor=[[2., 0],
                                   [0., 0],
                                   [0, 1]])
-        bijector_ref = Affine(
+        bijector_ref = affine_lib.Affine(
             shift=mu, scale_tril=[[10., 0, 0],
                                   [1, 3, 0],
                                   [2, 3, 5]])
@@ -601,12 +601,12 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[6, 0, 0], [1, 3, 0], [2, 3, 5]]
-        bijector = Affine(
+        bijector = affine_lib.Affine(
             shift=mu,
             scale_tril=[[2., 0, 0], [1, 3, 0], [2, 3, 4]],
             scale_perturb_diag=None,
             scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
-        bijector_ref = Affine(
+        bijector_ref = affine_lib.Affine(
             shift=mu, scale_tril=[[6., 0, 0], [1, 3, 0], [2, 3, 5]])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -626,7 +626,7 @@ class AffineBijectorTest(test.TestCase):
   def testNoBatchMultivariateRaisesWhenSingular(self):
     with self.test_session():
       mu = [1., -1]
-      bijector = Affine(
+      bijector = affine_lib.Affine(
           shift=mu,
           # Has zero on the diagonal.
           scale_diag=[0., 1],
@@ -638,14 +638,14 @@ class AffineBijectorTest(test.TestCase):
     with self.test_session():
       mu = [1., -1]
       # Scale corresponds to 2x2 identity matrix.
-      bijector = Affine(shift=mu, event_ndims=2, validate_args=True)
+      bijector = affine_lib.Affine(shift=mu, event_ndims=2, validate_args=True)
       bijector.forward([1., 1.]).eval()
 
   def testScaleZeroScalarRaises(self):
     with self.test_session():
       mu = -1.
       # Check Identity matrix with zero scaling.
-      bijector = Affine(
+      bijector = affine_lib.Affine(
           shift=mu,
           scale_identity_multiplier=0.0,
           event_ndims=0,
@@ -654,16 +654,16 @@ class AffineBijectorTest(test.TestCase):
         bijector.forward(1.).eval()
 
       # Check Diag matrix with zero scaling.
-      bijector = Affine(
+      bijector = affine_lib.Affine(
           shift=mu, scale_diag=[0.0], event_ndims=0, validate_args=True)
       with self.assertRaisesOpError("Condition x > 0"):
         bijector.forward(1.).eval()
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = Affine(
+      bijector = affine_lib.Affine(
           shift=3.6, scale_identity_multiplier=0.42, event_ndims=0)
-      assert_scalar_congruency(
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
   def _makeScale(self,
@@ -743,9 +743,9 @@ class AffineBijectorTest(test.TestCase):
         # We haven't specified enough information for the scale.
         if scale is None:
           with self.assertRaisesRegexp(ValueError, ("must be specified.")):
-            bijector = Affine(shift=shift, **bijector_args)
+            bijector = affine_lib.Affine(shift=shift, **bijector_args)
         else:
-          bijector = Affine(shift=shift, **bijector_args)
+          bijector = affine_lib.Affine(shift=shift, **bijector_args)
           np_x = x
           # For the case a vector is passed in, we need to make the shape
           # match the matrix for matmul to work.
@@ -823,7 +823,7 @@ class AffineBijectorTest(test.TestCase):
   def testScalePropertyAssertsCorrectly(self):
     with self.test_session():
       with self.assertRaises(NotImplementedError):
-        scale = Affine(  # pylint:disable=unused-variable
+        scale = affine_lib.Affine(  # pylint:disable=unused-variable
             scale_tril=[[1., 0], [2, 1]],
             scale_perturb_factor=[2., 1.]).scale
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
index 3ba6aa5293..94f3bc959b 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
@@ -22,7 +22,7 @@ import abc
 
 import six
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector import Bijector
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector as bijector_lib
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
@@ -36,10 +36,10 @@ class BaseBijectorTest(test.TestCase):
       with self.assertRaisesRegexp(TypeError,
                                    ("Can't instantiate abstract class Bijector "
                                     "with abstract methods __init__")):
-        Bijector()
+        bijector_lib.Bijector()
 
   def testDefaults(self):
-    class _BareBonesBijector(Bijector):
+    class _BareBonesBijector(bijector_lib.Bijector):
       """Minimal specification of a `Bijector`."""
 
       def __init__(self):
@@ -80,7 +80,7 @@ class IntentionallyMissingError(Exception):
   pass
 
 
-class BrokenBijector(Bijector):
+class BrokenBijector(bijector_lib.Bijector):
   """Forward and inverse are not inverses of each other."""
 
   def __init__(self, forward_missing=False, inverse_missing=False):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
index a647f963ed..ecf068bf6b 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
@@ -20,11 +20,11 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
-from tensorflow.contrib.distributions.python.ops.bijectors.chain import Chain
-from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
-from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
-from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors import chain as chain_lib
+from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
+from tensorflow.contrib.distributions.python.ops.bijectors import softmax_centered as softmax_centered_lib
+from tensorflow.contrib.distributions.python.ops.bijectors import softplus as softplus_lib
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.platform import test
 
@@ -34,7 +34,8 @@ class ChainBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      chain = Chain((Exp(event_ndims=1), Softplus(event_ndims=1)))
+      chain = chain_lib.Chain((exp_lib.Exp(event_ndims=1),
+                               softplus_lib.Softplus(event_ndims=1)))
       self.assertEqual("chain_of_exp_of_softplus", chain.name)
       x = np.asarray([[[1., 2.],
                        [2., 3.]]])
@@ -48,7 +49,7 @@ class ChainBijectorTest(test.TestCase):
 
   def testBijectorIdentity(self):
     with self.test_session():
-      chain = Chain()
+      chain = chain_lib.Chain()
       self.assertEqual("identity", chain.name)
       x = np.asarray([[[1., 2.],
                        [2., 3.]]])
@@ -59,16 +60,16 @@ class ChainBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = Chain((Exp(), Softplus()))
-      assert_scalar_congruency(
+      bijector = chain_lib.Chain((exp_lib.Exp(), softplus_lib.Softplus()))
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
     with self.test_session():
-      bijector = Chain([
-          SoftmaxCentered(
+      bijector = chain_lib.Chain([
+          softmax_centered_lib.SoftmaxCentered(
               event_ndims=1, validate_args=True),
-          SoftmaxCentered(
+          softmax_centered_lib.SoftmaxCentered(
               event_ndims=0, validate_args=True)])
       x = tensor_shape.TensorShape([])
       y = tensor_shape.TensorShape([2 + 1])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
index 267e4ad350..7b09553be9 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -57,7 +57,7 @@ class InvertBijectorTest(test.TestCase):
   def testScalarCongruency(self):
     with self.test_session():
       bijector = bijectors.Invert(bijectors.Exp())
-      assert_scalar_congruency(
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
index 26e0d2a539..9c2a1c8f91 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
@@ -18,12 +18,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import ConditionalBijector
+from tensorflow.contrib.distributions.python.ops.bijectors import conditional_bijector
 from tensorflow.python.framework import dtypes
 from tensorflow.python.platform import test
 
 
-class _TestBijector(ConditionalBijector):
+class _TestBijector(conditional_bijector.ConditionalBijector):
 
   def __init__(self):
     super(_TestBijector, self).__init__(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
index c30ce60cac..04ddf09b69 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
@@ -20,9 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
-from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
 from tensorflow.python.platform import test
 
 
@@ -31,7 +30,7 @@ class ExpBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      bijector = Exp(event_ndims=1)
+      bijector = exp_lib.Exp(event_ndims=1)
       self.assertEqual("exp", bijector.name)
       x = [[[1.], [2.]]]
       y = np.exp(x)
@@ -45,16 +44,16 @@ class ExpBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = Exp()
-      assert_scalar_congruency(
+      bijector = exp_lib.Exp()
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=1.5, rtol=0.05)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      bijector = Exp(event_ndims=0)
+      bijector = exp_lib.Exp(event_ndims=0)
       x = np.linspace(-10, 10, num=10).astype(np.float32)
       y = np.logspace(-10, 10, num=10).astype(np.float32)
-      assert_bijective_and_finite(bijector, x, y)
+      bijector_test_util.assert_bijective_and_finite(bijector, x, y)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
index 0969c293d4..f6aabe0d63 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
-from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors import identity as identity_lib
 from tensorflow.python.platform import test
 
 
@@ -28,7 +28,7 @@ class IdentityBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      bijector = Identity()
+      bijector = identity_lib.Identity()
       self.assertEqual("identity", bijector.name)
       x = [[[0.], [1.]]]
       self.assertAllEqual(x, bijector.forward(x).eval())
@@ -38,8 +38,8 @@ class IdentityBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = Identity()
-      assert_scalar_congruency(
+      bijector = identity_lib.Identity()
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
index 739fa6d439..c17c67c6f5 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
-from tensorflow.contrib.distributions.python.ops.bijectors.inline import Inline
+from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
+from tensorflow.contrib.distributions.python.ops.bijectors import inline as inline_lib
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -33,8 +33,8 @@ class InlineBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      exp = Exp(event_ndims=1)
-      inline = Inline(
+      exp = exp_lib.Exp(event_ndims=1)
+      inline = inline_lib.Inline(
           forward_fn=math_ops.exp,
           inverse_fn=math_ops.log,
           inverse_log_det_jacobian_fn=(
@@ -57,7 +57,7 @@ class InlineBijectorTest(test.TestCase):
 
   def testShapeGetters(self):
     with self.test_session():
-      bijector = Inline(
+      bijector = inline_lib.Inline(
           forward_event_shape_tensor_fn=lambda x: array_ops.concat((x, [1]), 0),
           forward_event_shape_fn=lambda x: x.as_list() + [1],
           inverse_event_shape_tensor_fn=lambda x: x[:-1],
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
index 267e4ad350..7b09553be9 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -57,7 +57,7 @@ class InvertBijectorTest(test.TestCase):
   def testScalarCongruency(self):
     with self.test_session():
       bijector = bijectors.Invert(bijectors.Exp())
-      assert_scalar_congruency(
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
index b30a3b599b..e95bbdf67e 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
@@ -20,9 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
-from tensorflow.contrib.distributions.python.ops.bijectors.power_transform import PowerTransform
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors import power_transform as power_transform_lib
 from tensorflow.python.platform import test
 
 
@@ -32,7 +31,7 @@ class PowerTransformBijectorTest(test.TestCase):
   def testBijector(self):
     with self.test_session():
       c = 0.2
-      bijector = PowerTransform(
+      bijector = power_transform_lib.PowerTransform(
           power=c, event_ndims=1, validate_args=True)
       self.assertEqual("power_transform", bijector.name)
       x = np.array([[[-1.], [2.], [-5. + 1e-4]]])
@@ -50,18 +49,18 @@ class PowerTransformBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = PowerTransform(
+      bijector = power_transform_lib.PowerTransform(
           power=0.2, validate_args=True)
-      assert_scalar_congruency(
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=1.5, rtol=0.05)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      bijector = PowerTransform(
+      bijector = power_transform_lib.PowerTransform(
           power=0.2, event_ndims=0, validate_args=True)
       x = np.linspace(-4.999, 10, num=10).astype(np.float32)
       y = np.logspace(0.001, 10, num=10).astype(np.float32)
-      assert_bijective_and_finite(bijector, x, y, rtol=1e-3)
+      bijector_test_util.assert_bijective_and_finite(bijector, x, y, rtol=1e-3)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
index 4ff3f334cc..8884da146d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid_centered import SigmoidCentered
+from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid_centered as sigmoid_centered_lib
 from tensorflow.python.platform import test
 
 
@@ -29,7 +29,7 @@ class SigmoidCenteredBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      sigmoid = SigmoidCentered()
+      sigmoid = sigmoid_centered_lib.SigmoidCentered()
       self.assertEqual("sigmoid_centered", sigmoid.name)
       x = np.log([[2., 3, 4],
                   [4., 8, 12]])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
index 9a96b91c6d..e16f9dff22 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
@@ -21,9 +21,8 @@ from __future__ import print_function
 import numpy as np
 from scipy import special
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
-from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid
 from tensorflow.python.platform import test
 
 
@@ -32,33 +31,35 @@ class SigmoidBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      self.assertEqual("sigmoid", Sigmoid().name)
+      self.assertEqual("sigmoid", sigmoid.Sigmoid().name)
       x = np.linspace(-10., 10., 100).reshape([2, 5, 10]).astype(np.float32)
       y = special.expit(x)
       ildj = -np.log(y) - np.log1p(-y)
       self.assertAllClose(
-          y, Sigmoid().forward(x).eval(),
+          y, sigmoid.Sigmoid().forward(x).eval(),
           atol=0., rtol=1e-2)
       self.assertAllClose(
-          x, Sigmoid().inverse(y).eval(),
+          x, sigmoid.Sigmoid().inverse(y).eval(),
           atol=0., rtol=1e-4)
       self.assertAllClose(
-          ildj, Sigmoid().inverse_log_det_jacobian(y).eval(),
+          ildj, sigmoid.Sigmoid().inverse_log_det_jacobian(y).eval(),
           atol=0., rtol=1e-6)
       self.assertAllClose(
-          -ildj, Sigmoid().forward_log_det_jacobian(x).eval(),
+          -ildj, sigmoid.Sigmoid().forward_log_det_jacobian(x).eval(),
           atol=0., rtol=1e-4)
 
   def testScalarCongruency(self):
     with self.test_session():
-      assert_scalar_congruency(Sigmoid(), lower_x=-7., upper_x=7.)
+      bijector_test_util.assert_scalar_congruency(
+          sigmoid.Sigmoid(), lower_x=-7., upper_x=7.)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
       x = np.linspace(-7., 7., 100).astype(np.float32)
       eps = 1e-3
       y = np.linspace(eps, 1. - eps, 100).astype(np.float32)
-      assert_bijective_and_finite(Sigmoid(), x, y, atol=0., rtol=1e-4)
+      bijector_test_util.assert_bijective_and_finite(
+          sigmoid.Sigmoid(), x, y, atol=0., rtol=1e-4)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
index 173d52686d..97df62ec05 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors import softmax_centered as softmax_centered_lib
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.platform import test
 
@@ -34,7 +34,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectorScalar(self):
     with self.test_session():
-      softmax = SoftmaxCentered()  # scalar by default
+      softmax = softmax_centered_lib.SoftmaxCentered()  # scalar by default
       self.assertEqual("softmax_centered", softmax.name)
       x = np.log([[2., 3, 4],
                   [4., 8, 12]])
@@ -59,7 +59,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectorVector(self):
     with self.test_session():
-      softmax = SoftmaxCentered(event_ndims=1)
+      softmax = softmax_centered_lib.SoftmaxCentered(event_ndims=1)
       self.assertEqual("softmax_centered", softmax.name)
       x = np.log([[2., 3, 4], [4., 8, 12]])
       y = [[0.2, 0.3, 0.4, 0.1], [0.16, 0.32, 0.48, 0.04]]
@@ -80,11 +80,11 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
     with self.test_session():
       for x, y, b in ((tensor_shape.TensorShape([]),
                        tensor_shape.TensorShape([2]),
-                       SoftmaxCentered(
+                       softmax_centered_lib.SoftmaxCentered(
                            event_ndims=0, validate_args=True)),
                       (tensor_shape.TensorShape([4]),
                        tensor_shape.TensorShape([5]),
-                       SoftmaxCentered(
+                       softmax_centered_lib.SoftmaxCentered(
                            event_ndims=1, validate_args=True))):
         self.assertAllEqual(y, b.forward_event_shape(x))
         self.assertAllEqual(y.as_list(),
@@ -95,7 +95,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      softmax = SoftmaxCentered(event_ndims=1)
+      softmax = softmax_centered_lib.SoftmaxCentered(event_ndims=1)
       x = np.linspace(-50, 50, num=10).reshape(5, 2).astype(np.float32)
       # Make y values on the simplex with a wide range.
       y_0 = np.ones(5).astype(np.float32)
@@ -104,7 +104,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
       y = np.array([y_0, y_1, y_2])
       y /= y.sum(axis=0)
       y = y.T  # y.shape = [5, 3]
-      assert_bijective_and_finite(softmax, x, y)
+      bijector_test_util.assert_bijective_and_finite(softmax, x, y)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
index 2c58519fda..a7db1dcc6c 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
@@ -20,9 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
-from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
+from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors import softplus as softplus_lib
 from tensorflow.python.platform import test
 
 rng = np.random.RandomState(42)
@@ -43,7 +42,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorForwardInverseEventDimsZero(self):
     with self.test_session():
-      bijector = Softplus(event_ndims=0)
+      bijector = softplus_lib.Softplus(event_ndims=0)
       self.assertEqual("softplus", bijector.name)
       x = 2 * rng.randn(2, 10)
       y = self._softplus(x)
@@ -53,7 +52,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorLogDetJacobianEventDimsZero(self):
     with self.test_session():
-      bijector = Softplus(event_ndims=0)
+      bijector = softplus_lib.Softplus(event_ndims=0)
       y = 2 * rng.rand(2, 10)
       # No reduction needed if event_dims = 0.
       ildj = self._softplus_ildj_before_reduction(y)
@@ -62,7 +61,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorForwardInverseEventDimsOne(self):
     with self.test_session():
-      bijector = Softplus(event_ndims=1)
+      bijector = softplus_lib.Softplus(event_ndims=1)
       self.assertEqual("softplus", bijector.name)
       x = 2 * rng.randn(2, 10)
       y = self._softplus(x)
@@ -72,7 +71,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorLogDetJacobianEventDimsOne(self):
     with self.test_session():
-      bijector = Softplus(event_ndims=1)
+      bijector = softplus_lib.Softplus(event_ndims=1)
       y = 2 * rng.rand(2, 10)
       ildj_before = self._softplus_ildj_before_reduction(y)
       ildj = np.sum(ildj_before, axis=1)
@@ -81,28 +80,28 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = Softplus(event_ndims=0)
-      assert_scalar_congruency(
+      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
   def testBijectiveAndFinite32bit(self):
     with self.test_session():
-      bijector = Softplus(event_ndims=0)
+      bijector = softplus_lib.Softplus(event_ndims=0)
       x = np.linspace(-20., 20., 100).astype(np.float32)
       y = np.logspace(-10, 10, 100).astype(np.float32)
-      assert_bijective_and_finite(
+      bijector_test_util.assert_bijective_and_finite(
           bijector, x, y, rtol=1e-2, atol=1e-2)
 
   def testBijectiveAndFinite16bit(self):
     with self.test_session():
-      bijector = Softplus(event_ndims=0)
+      bijector = softplus_lib.Softplus(event_ndims=0)
       # softplus(-20) is zero, so we can't use such a large range as in 32bit.
       x = np.linspace(-10., 20., 100).astype(np.float16)
       # Note that float16 is only in the open set (0, inf) for a smaller
       # logspace range.  The actual range was (-7, 4), so use something smaller
       # for the test.
       y = np.logspace(-6, 3, 100).astype(np.float16)
-      assert_bijective_and_finite(
+      bijector_test_util.assert_bijective_and_finite(
           bijector, x, y, rtol=1e-1, atol=1e-3)
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py b/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
index 545471907f..eacdfd9ccc 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
@@ -22,7 +22,7 @@ import numpy as np
 
 from tensorflow.contrib import distributions
 from tensorflow.contrib.distributions.python.kernel_tests import transformed_distribution_test
-from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import ConditionalBijector
+from tensorflow.contrib.distributions.python.ops.bijectors import conditional_bijector
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -32,7 +32,7 @@ from tensorflow.python.platform import test
 ds = distributions
 
 
-class _ChooseLocation(ConditionalBijector):
+class _ChooseLocation(conditional_bijector.ConditionalBijector):
   """A Bijector which chooses between one of two location parameters."""
 
   def __init__(self, loc, name="ChooseLocation"):
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
index 40fcb36769..2e83ed6e41 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
@@ -56,7 +56,3 @@ from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered impo
 from tensorflow.contrib.distributions.python.ops.bijectors.softplus import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
-
-from tensorflow.python.util.all_util import remove_undocumented
-
-remove_undocumented(__name__)
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
index af675787b1..7fee2e1f3a 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
@@ -21,9 +21,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import logistic
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
-# Bijectors must be directly imported because `remove_undocumented` prevents
-# individual file imports.
-from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
+from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid as sigmoid_lib
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -178,7 +176,7 @@ class RelaxedBernoulli(transformed_distribution.TransformedDistribution):
                                          validate_args=validate_args,
                                          allow_nan_stats=allow_nan_stats,
                                          name=name + "/Logistic"),
-          bijector=Sigmoid(validate_args=validate_args),
+          bijector=sigmoid_lib.Sigmoid(validate_args=validate_args),
           validate_args=validate_args,
           name=name)
     self._parameters = parameters
diff --git a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
index 1403adbda2..844f78ca96 100644
--- a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
@@ -19,11 +19,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution as distribution_lib
+from tensorflow.contrib.distributions.python.ops import distribution as distributions
 from tensorflow.contrib.distributions.python.ops import distribution_util
-# Bijectors must be directly imported because `remove_undocumented` prevents
-# individual file imports.
-from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
+from tensorflow.contrib.distributions.python.ops.bijectors import identity as identity_lib
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -121,7 +119,7 @@ def _is_scalar_from_shape(shape):
   return _logical_equal(_ndims_from_shape(shape), 0)
 
 
-class TransformedDistribution(distribution_lib.Distribution):
+class TransformedDistribution(distributions.Distribution):
   """A Transformed Distribution.
 
   A `TransformedDistribution` models `p(y)` given a base distribution `p(x)`,
@@ -148,19 +146,49 @@ class TransformedDistribution(distribution_lib.Distribution):
 
   A `TransformedDistribution` implements the following operations:
 
-    * `sample`
-      Mathematically:   `Y = g(X)`
-      Programmatically: `bijector.forward(distribution.sample(...))`
+    * `sample`:
 
-    * `log_prob`
-      Mathematically:   `(log o pdf)(Y=y) = (log o pdf o g^{-1})(y)
-                         + (log o abs o det o J o g^{-1})(y)`
-      Programmatically: `(distribution.log_prob(bijector.inverse(y))
-                         + bijector.inverse_log_det_jacobian(y))`
+      Mathematically:
 
-    * `log_cdf`
-      Mathematically:   `(log o cdf)(Y=y) = (log o cdf o g^{-1})(y)`
-      Programmatically: `distribution.log_cdf(bijector.inverse(x))`
+      ```none
+      Y = g(X)
+      ```
+
+      Programmatically:
+
+      ```python
+      return bijector.forward(distribution.sample(...))
+      ```
+
+    * `log_prob`:
+
+      Mathematically:
+
+      ```none
+      (log o pdf)(Y=y) = (log o pdf o g^{-1})(y) +
+                           (log o abs o det o J o g^{-1})(y)
+      ```
+
+      Programmatically:
+
+      ```python
+      return (distribution.log_prob(bijector.inverse(y)) +
+              bijector.inverse_log_det_jacobian(y))
+      ```
+
+    * `log_cdf`:
+
+      Mathematically:
+
+      ```none
+      (log o cdf)(Y=y) = (log o cdf o g^{-1})(y)
+      ```
+
+      Programmatically:
+
+      ```python
+      return distribution.log_cdf(bijector.inverse(x))
+      ```
 
     * and similarly for: `cdf`, `prob`, `log_survival_function`,
      `survival_function`.
@@ -171,7 +199,7 @@ class TransformedDistribution(distribution_lib.Distribution):
   ```python
   ds = tf.contrib.distributions
   log_normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=0., scale=1.),
+    distribution=ds.Normal(loc=mu, scale=sigma),
     bijector=ds.bijectors.Exp(),
     name="LogNormalTransformedDistribution")
   ```
@@ -181,7 +209,7 @@ class TransformedDistribution(distribution_lib.Distribution):
   ```python
   ds = tf.contrib.distributions
   log_normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=0., scale=1.),
+    distribution=ds.Normal(loc=mu, scale=sigma),
     bijector=ds.bijectors.Inline(
       forward_fn=tf.exp,
       inverse_fn=tf.log,
@@ -195,11 +223,8 @@ class TransformedDistribution(distribution_lib.Distribution):
   ```python
   ds = tf.contrib.distributions
   normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=0., scale=1.),
-    bijector=ds.bijectors.Affine(
-      shift=-1.,
-      scale_identity_multiplier=2.,
-      event_ndims=0),
+    distribution=ds.Normal(loc=0, scale=1),
+    bijector=ds.bijectors.ScaleAndShift(loc=mu, scale=sigma, event_ndims=0),
     name="NormalTransformedDistribution")
   ```
 
@@ -212,6 +237,7 @@ class TransformedDistribution(distribution_lib.Distribution):
   multivariate Normal as a `TransformedDistribution`.
 
   ```python
+  bs = tf.contrib.distributions.bijector
   ds = tf.contrib.distributions
   # We will create two MVNs with batch_shape = event_shape = 2.
   mean = [[-1., 0],      # batch:0
@@ -222,7 +248,7 @@ class TransformedDistribution(distribution_lib.Distribution):
                [2, 2]]]  # batch:1
   mvn1 = ds.TransformedDistribution(
       distribution=ds.Normal(loc=0., scale=1.),
-      bijector=ds.bijectors.Affine(shift=mean, scale_tril=chol_cov),
+      bijector=bs.Affine(shift=mean, tril=chol_cov),
       batch_shape=[2],  # Valid because base_distribution.batch_shape == [].
       event_shape=[2])  # Valid because base_distribution.event_shape == [].
   mvn2 = ds.MultivariateNormalTriL(loc=mean, scale_tril=chol_cov)
@@ -265,7 +291,7 @@ class TransformedDistribution(distribution_lib.Distribution):
       self._empty = constant_op.constant([], dtype=dtypes.int32, name="empty")
 
       if bijector is None:
-        bijector = Identity(validate_args=validate_args)
+        bijector = identity_lib.Identity(validate_args=validate_args)
 
       # We will keep track of a static and dynamic version of
       # self._is_{batch,event}_override. This way we can do more prior to graph
diff --git a/tensorflow/contrib/distributions/python/ops/vector_student_t.py b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
index 8d680ab27a..2f4b33b7e7 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
@@ -191,7 +191,7 @@ class _VectorStudentT(transformed_distribution.TransformedDistribution):
   ```
 
   For more examples of how to construct the `scale` matrix, see the
-  `tf.contrib.distributions.bijectors.Affine` docstring.
+  `bijectors.Affine` docstring.
 
   """
 
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index 1882ae35f5..d149138796 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -3625,3 +3625,23 @@ if os.path.exists(_config_path):
   set_floatx(_floatx)
   set_epsilon(_epsilon)
   set_image_data_format(_image_data_format)
+
+# Save config file.
+if os.access(_keras_base_dir, os.W_OK):
+  if not os.path.exists(_keras_dir):
+    try:
+      os.makedirs(_keras_dir)
+    except OSError:
+      # Except potential race conditions
+      # in multi-threaded environments.
+      pass
+
+  if not os.path.exists(_config_path):
+    _config = {
+        'floatx': floatx(),
+        'epsilon': epsilon(),
+        'backend': 'tensorflow',
+        'image_data_format': image_data_format()
+    }
+    with open(_config_path, 'w') as f:
+      f.write(json.dumps(_config, indent=4))
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
index b891bf2301..dfe08bb863 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
@@ -25,4 +25,5 @@ from tensorflow.python.estimator.inputs.queues.feeding_functions import _enqueue
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _OrderedDictNumpyFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _PandasFeedFn
+from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 # pylint: enable=unused-import
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
index 5859bb6b47..c302c7725a 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
@@ -18,8 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from types import FunctionType, GeneratorType
 from collections import Container
+from types import FunctionType
+from types import GeneratorType
 
 from tensorflow.contrib.learn.python.learn.dataframe.queues import feeding_functions
 
@@ -33,7 +34,7 @@ def generator_input_fn(x,
                        num_threads=1):
   """Returns input function that would dicts of numpy arrays
        yielded from a generator.
-  
+
   It is assumed that every dict yielded from the dictionary represents
   a single sample. The generator should consume a single epoch of the data.
 
diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md
index 94b0263ae8..dae50e67c5 100644
--- a/tensorflow/contrib/slim/README.md
+++ b/tensorflow/contrib/slim/README.md
@@ -109,7 +109,7 @@ weights = slim.variable('weights',
 Note that in native TensorFlow, there are two types of variables: regular
 variables and local (transient) variables. The vast majority of variables are
 regular variables: once created, they can be saved to disk using a
-[saver](https://www.tensorflow.org/versions/r0.11/api_docs/python/state_ops.html#Saver).
+[saver](https://www.tensorflow.org/api_docs/python/tf/train/Saver).
 Local variables are those variables that only exist for the duration of a
 session and are not saved to disk.
 
@@ -289,10 +289,10 @@ slim.stack(x, slim.conv2d, [(32, [3, 3]), (32, [1, 1]), (64, [3, 3]), (64, [1, 1
 ### Scopes
 
 In addition to the types of scope mechanisms in TensorFlow
-([name_scope](https://www.tensorflow.org/api_docs/python/framework.html#name_scope),
-[variable_scope](https://www.tensorflow.org/api_docs/python/state_layers.html#variable_scope),
+([name_scope](https://www.tensorflow.org/api_docs/python/tf/name_scope),
+[variable_scope](https://www.tensorflow.org/api_docs/python/tf/variable_scope),
 TF-Slim adds a new scoping mechanism called
-[arg_scope](https://www.tensorflow.org/code/tensorflow/contrib/framework/python/ops/arg_scope.py).
+[arg_scope](https://www.tensorflow.org/api_docs/python/tf/contrib/framework/arg_scope),
 This new scope allows a user to specify one or more operations and a set of
 arguments which will be passed to each of the operations defined in the
 `arg_scope`. This functionality is best illustrated by example. Consider the
diff --git a/tensorflow/core/kernels/conv_grad_filter_ops.cc b/tensorflow/core/kernels/conv_grad_filter_ops.cc
index f88862bfeb..20394cad43 100644
--- a/tensorflow/core/kernels/conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/conv_grad_filter_ops.cc
@@ -208,7 +208,6 @@ class Conv2DFastBackpropFilterOp : public OpKernel {
                    context->allocate_output(0, filter_shape, &filter_backprop));
 
 #if defined TENSORFLOW_USE_LIBXSMM && defined TENSORFLOW_USE_LIBXSMM_BACKWARD
-
     int64 pad_top, pad_bottom;
     int64 pad_left, pad_right;
     OP_REQUIRES_OK(
@@ -229,8 +228,9 @@ class Conv2DFastBackpropFilterOp : public OpKernel {
               context, context->eigen_device<Device>(), input.tensor<T, 4>(),
               filter_backprop->tensor<T, 4>(), out_backprop.tensor<T, 4>(),
               dims.spatial_dims[0].input_size, dims.spatial_dims[1].input_size,
-              (int)dims.spatial_dims[0].stride,
-              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
               data_format_)) {
         return;
       }
@@ -321,8 +321,9 @@ class Conv2DCustomBackpropFilterOp : public OpKernel {
               context, context->eigen_device<Device>(), input.tensor<T, 4>(),
               filter_backprop->tensor<T, 4>(), out_backprop.tensor<T, 4>(),
               dims.spatial_dims[0].input_size, dims.spatial_dims[1].input_size,
-              (int)dims.spatial_dims[0].stride,
-              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
               data_format_)) {
         return;
       }
diff --git a/tensorflow/core/kernels/conv_grad_input_ops.cc b/tensorflow/core/kernels/conv_grad_input_ops.cc
index e79c9465cb..9a50431a2f 100644
--- a/tensorflow/core/kernels/conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/conv_grad_input_ops.cc
@@ -258,8 +258,10 @@ class Conv2DFastBackpropInputOp : public OpKernel {
               context, context->eigen_device<Device>(),
               in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
               out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
-              dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
-              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              dims.spatial_dims[1].input_size,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
               data_format_)) {
         return;
       }
@@ -352,8 +354,10 @@ class Conv2DCustomBackpropInputOp : public OpKernel {
               context, context->eigen_device<Device>(),
               in_backprop->tensor<T, 4>(), filter.tensor<T, 4>(),
               out_backprop.tensor<T, 4>(), dims.spatial_dims[0].input_size,
-              dims.spatial_dims[1].input_size, (int)dims.spatial_dims[0].stride,
-              (int)dims.spatial_dims[1].stride, (int)pad_top, (int)pad_left,
+              dims.spatial_dims[1].input_size,
+              static_cast<int>(dims.spatial_dims[0].stride),
+              static_cast<int>(dims.spatial_dims[1].stride),
+              static_cast<int>(pad_top), static_cast<int>(pad_left),
               data_format_)) {
         return;
       }
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
index 0c638ca233..32b210ecb7 100644
--- a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
@@ -379,10 +379,10 @@ bool MaxPoolBackwardWithArgmax<T>::operator()(
     T* bottom_diff, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
   SetZero<<<(input_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
-            kThreadsPerBlock, 0, d.stream()>>>(input_size, bottom_diff);
+    kThreadsPerBlock, 0, d.stream()>>>(input_size, bottom_diff);
   MaxPoolBackward<<<(output_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
                     kThreadsPerBlock, 0, d.stream()>>>(
-      output_size, top_diff, mask, top_offset, bottom_offset, bottom_diff);
+                                        output_size, top_diff, mask, top_offset, bottom_offset, bottom_diff);
   return d.ok();
 }
 
diff --git a/tensorflow/core/kernels/xsmm_conv2d.cc b/tensorflow/core/kernels/xsmm_conv2d.cc
index 878abe9712..7936cbcd46 100644
--- a/tensorflow/core/kernels/xsmm_conv2d.cc
+++ b/tensorflow/core/kernels/xsmm_conv2d.cc
@@ -145,8 +145,8 @@ struct HashFunction {
     S << w.d.S; u << w.d.u;
     v << w.d.v; padh << w.d.pad_h_in;
     padw << w.d.pad_w_in;
-
-
+ 
+ 
     std::string out_ =   N.str() + C.str()\
                        + H.str() + W.str()\
                        + K.str() + R.str()\
@@ -172,8 +172,9 @@ class handles {
       chk_libxsmm_err(status, "Create handle");
       libxsmm_handles.insert(std::make_pair(w, libxsmm_handle));
       return libxsmm_handle;
-    } else
+    } else {
       return i->second;
+    }
   }
   ~handles() {
     std::unordered_map<libxsmm_dnn_conv_desc_wrap, libxsmm_dnn_layer*,
@@ -191,7 +192,7 @@ class handles {
 
 static handles libxsmm_handles;
 
-//#define LIBXSMM_DETAILED_TIMING
+// #define LIBXSMM_DETAILED_TIMING
 
 template <typename InputPtr, typename FilterPtr, typename OutputPtr>
 static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
@@ -287,9 +288,8 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
       }
       count.Wait();
     }
-  }
-  // Added: for weight update
-  else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
+  } else if (kind == LIBXSMM_DNN_COMPUTE_KIND_UPD) {
+    // Added: for weight update
     libxsmm_filter =
         libxsmm_dnn_link_filter(libxsmm_handle, LIBXSMM_DNN_FILTER, filter,
                                 LIBXSMM_DNN_TENSOR_FORMAT_RSCK_PTR, &status);
@@ -352,7 +352,7 @@ static bool CallLibxsmmConvGeneric(OpKernelContext* ctx,
 
     chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_input,
                                             LIBXSMM_DNN_REGULAR_INPUT),
-                    "Bind input weight udpate");
+                    "Bind input weight update");
     chk_libxsmm_err(libxsmm_dnn_bind_buffer(libxsmm_handle, libxsmm_output,
                                             LIBXSMM_DNN_GRADIENT_OUTPUT),
                     "Bind output weight update");
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 172bdf02e2..4a644b55e6 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -26140,6 +26140,59 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
+op {
+  name: "UnsortedSegmentSum"
+  input_arg {
+    name: "data"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "segment_ids"
+    description: "A tensor whose shape is a prefix of `data.shape`."
+    type_attr: "Tindices"
+  }
+  input_arg {
+    name: "num_segments"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "Tindices"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  summary: "Computes the max along segments of a tensor."
+  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
+}
 op {
   name: "Unstage"
   output_arg {
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index d175107be0..14e45c37d9 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -19,8 +19,8 @@ limitations under the License.
 // TensorFlow uses semantic versioning, see http://semver.org/.
 
 #define TF_MAJOR_VERSION 1
-#define TF_MINOR_VERSION 0
-#define TF_PATCH_VERSION 1
+#define TF_MINOR_VERSION 1
+#define TF_PATCH_VERSION 0-rc1
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 81426bbb92..6116c7d87f 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -1,4 +1,3 @@
-
 # Getting Started With TensorFlow
 
 This guide gets you started programming in TensorFlow. Before using this guide,
diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index c1c7b66546..0f3914d52d 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index c9abaf2aca..6874a1f03f 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc1.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 111b046689..127d8fd029 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.0-rc1</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0</version>
+                 <version>1.1.0-rc1</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0-rc1.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -213,7 +213,7 @@ two files are available to the JVM:
 
 For example, the following command line executes the `HelloTF` program:
 
-<pre><b>java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index 4a537135b6..4a5d63f337 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -166,7 +166,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      virtualenv environment:
 
      <pre> (tensorflow)$ <b>pip install --upgrade \\
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#common_installation_problems).
@@ -270,7 +270,7 @@ take the following steps:
      the following command:
 
      <pre> $ <b>sudo pip install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
 
      If this step fails, see
      [Common Installation Problems](#common_installation_problems).
@@ -336,9 +336,9 @@ where:
     * <tt>gcr.io/tensorflow/tensorflow:latest-devel</tt>, which is the latest
       TensorFlow CPU Binary image plus source code.
     * <tt>gcr.io/tensorflow/tensorflow:<i>version</i></tt>, which is the
-      specified version (for example, 1.0.1) of TensorFlow CPU binary image.
+      specified version (for example, 1.1.0rc1) of TensorFlow CPU binary image.
     * <tt>gcr.io/tensorflow/tensorflow:<i>version</i>-devel</tt>, which is
-      the specified version (for example, 1.0.1) of the TensorFlow GPU
+      the specified version (for example, 1.1.0rc1) of the TensorFlow GPU
       binary image plus source code.
 
     <tt>gcr.io</tt> is the Google Container Registry. Note that some
@@ -456,7 +456,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -624,14 +624,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -643,14 +643,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -662,14 +662,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -681,14 +681,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.0.1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.0.1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index 68ad3ceba9..c989b31ca4 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -286,7 +286,7 @@ take the following steps:
      support, issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b> </pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
      [Common installation problems](#CommonInstallationProblems).
@@ -398,7 +398,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      TensorFlow for Python 2.7:
 
      <pre> (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -604,13 +604,13 @@ This section documents the relevant values for Mac OS installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.0.1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py2-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
@@ -622,13 +622,13 @@ Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.0.1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py3-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.0.1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py3-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 25e428f574..7d452feafa 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -319,10 +319,10 @@ $ <b>bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pk
 Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
-for TensorFlow 1.0.1 on Linux:
+for TensorFlow 1.1.0rc1 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.0.1-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc1-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 7a6f579341..7d3d13c34a 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.0.1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.0.1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
diff --git a/tensorflow/java/README.md b/tensorflow/java/README.md
index fd24016884..42cd24a7df 100644
--- a/tensorflow/java/README.md
+++ b/tensorflow/java/README.md
@@ -34,26 +34,26 @@ That's all. As an example, to create a Maven project for the
 1.  Create a `pom.xml`:
 
     ```xml
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.myorg</groupId>
-    <artifactId>label-image</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <properties>
-      <exec.mainClass>org.tensorflow.examples.LabelImage</exec.mainClass>
-      <!-- The LabelImage example code requires at least JDK 1.7. -->
-      <!-- The maven compiler plugin defaults to a lower version -->
-      <maven.compiler.source>1.7</maven.compiler.source>
-      <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-    <dependencies>
-      <dependency>
-        <groupId>org.tensorflow</groupId>
-        <artifactId>tensorflow</artifactId>
-        <version>1.1.0-rc1</version>
-      </dependency>
-    </dependencies>
-</project>
+    <project>
+        <modelVersion>4.0.0</modelVersion>
+        <groupId>org.myorg</groupId>
+        <artifactId>label-image</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <properties>
+          <exec.mainClass>org.tensorflow.examples.LabelImage</exec.mainClass>
+          <!-- The LabelImage example code requires at least JDK 1.7. -->
+          <!-- The maven compiler plugin defaults to a lower version -->
+          <maven.compiler.source>1.7</maven.compiler.source>
+          <maven.compiler.target>1.7</maven.compiler.target>
+        </properties>
+        <dependencies>
+          <dependency>
+            <groupId>org.tensorflow</groupId>
+            <artifactId>tensorflow</artifactId>
+            <version>1.1.0-rc1</version>
+          </dependency>
+        </dependencies>
+    </project>
     ```
 
 2.  Download the [example source](https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/java/src/main/java/org/tensorflow/examples/LabelImage.java)
diff --git a/tensorflow/java/src/main/java/org/tensorflow/Shape.java b/tensorflow/java/src/main/java/org/tensorflow/Shape.java
index f6677e9a15..90d6cf7b85 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/Shape.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/Shape.java
@@ -1,16 +1,17 @@
-// Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
 
 package org.tensorflow;
 
diff --git a/tensorflow/java/src/main/native/operation_jni.h b/tensorflow/java/src/main/native/operation_jni.h
index fe14882dde..6292a48069 100644
--- a/tensorflow/java/src/main/native/operation_jni.h
+++ b/tensorflow/java/src/main/native/operation_jni.h
@@ -1,4 +1,3 @@
-
 /* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tensorflow/python/framework/tensor_util_test.py b/tensorflow/python/framework/tensor_util_test.py
index dfefc27f99..5eb5230404 100644
--- a/tensorflow/python/framework/tensor_util_test.py
+++ b/tensorflow/python/framework/tensor_util_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import numpy as np
 import sys
+import numpy as np
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -49,7 +49,7 @@ class TensorUtilTest(test.TestCase):
   def testFloatN(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0])
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
@@ -67,7 +67,7 @@ class TensorUtilTest(test.TestCase):
   def testFloatTyped(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], dtype=dtypes.float32)
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
@@ -85,7 +85,7 @@ class TensorUtilTest(test.TestCase):
   def testFloatTypeCoerce(self):
     t = tensor_util.make_tensor_proto([10, 20, 30], dtype=dtypes.float32)
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
@@ -104,7 +104,7 @@ class TensorUtilTest(test.TestCase):
     arr = np.asarray([10, 20, 30], dtype="int")
     t = tensor_util.make_tensor_proto(arr, dtype=dtypes.float32)
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
@@ -122,7 +122,7 @@ class TensorUtilTest(test.TestCase):
   def testFloatSizes(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], shape=[1, 3])
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
@@ -140,7 +140,7 @@ class TensorUtilTest(test.TestCase):
   def testFloatSizes2(self):
     t = tensor_util.make_tensor_proto([10.0, 20.0, 30.0], shape=[3, 1])
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_FLOAT  
         tensor_shape { dim { size: 3 } dim { size: 1 } }  
         tensor_content: "A \000\000A\240\000\000A\360\000\000"  
@@ -168,7 +168,7 @@ class TensorUtilTest(test.TestCase):
     t = tensor_util.make_tensor_proto(
         np.array([[10.0, 20.0, 30.0]], dtype=np.float64))
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_DOUBLE  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "@$\000\000\000\000\000\000@4\000\000\000\000\000\000@>\000\000\000\000\000\000"  
@@ -259,7 +259,7 @@ class TensorUtilTest(test.TestCase):
   def testIntNDefaultType(self):
     t = tensor_util.make_tensor_proto([10, 20, 30, 40], shape=[2, 2])
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_INT32  
         tensor_shape { dim { size: 2 } dim { size: 2 } }  
         tensor_content: "\000\000\000\\n\000\000\000\024\000\000\000\036\000\000\000("  
@@ -329,7 +329,7 @@ class TensorUtilTest(test.TestCase):
     t = tensor_util.make_tensor_proto(
         [10, 20, 30], shape=[1, 3], dtype=dtypes.int64)
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_INT64  
         tensor_shape { dim { size: 1 } dim { size: 3 } }  
         tensor_content: "\000\000\000\000\000\000\000\\n\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\036"  
@@ -347,7 +347,7 @@ class TensorUtilTest(test.TestCase):
   def testLongNpArray(self):
     t = tensor_util.make_tensor_proto(np.array([10, 20, 30]))
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_INT64  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\000\000\000\000\000\000\\n\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\036"  
@@ -368,7 +368,7 @@ class TensorUtilTest(test.TestCase):
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.qint32)
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_QINT32  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\000\000\025\000\000\000\026\000\000\000\027"  
@@ -405,7 +405,7 @@ class TensorUtilTest(test.TestCase):
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.quint16)
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_QUINT16  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\025\000\026\000\027"  
@@ -422,7 +422,7 @@ class TensorUtilTest(test.TestCase):
 
     t = tensor_util.make_tensor_proto(data, dtype=dtypes.qint16)
     if sys.byteorder == "big":
-      self.assertProtoEquals("""  
+      self.assertProtoEquals("""
         dtype: DT_QINT16  
         tensor_shape { dim { size: 3 } }  
         tensor_content: "\000\025\000\026\000\027"  
diff --git a/tensorflow/python/kernel_tests/pooling_ops_test.py b/tensorflow/python/kernel_tests/pooling_ops_test.py
index 03291bbb0d..53a0d7d806 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_test.py
@@ -97,7 +97,7 @@ class PoolingTest(test.TestCase):
     # Initializes the input tensor with array containing incrementing
     # numbers from 1.
     x = [f * 1.0 for f in range(1, total_size + 1)]
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=use_gpu):
       t = constant_op.constant(x, shape=input_sizes, dtype=data_type)
       if data_format == "NCHW":
         t = test_util.NHWCToNCHW(t)
@@ -497,7 +497,7 @@ class PoolingTest(test.TestCase):
                                          strides,
                                          error_msg,
                                          use_gpu=False):
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=use_gpu):
       t = constant_op.constant(1.0, shape=in_size)
       with self.assertRaisesRegexp(errors_impl.UnimplementedError, error_msg):
         t = nn_ops.max_pool(
@@ -620,7 +620,7 @@ class PoolingTest(test.TestCase):
     orig_input = [1.0, 1.0, 1.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0]
     tensor_input = [11.0, 12.0, 13.0, 14.0]
     tensor_argmax = list(np.array([0, 1, 3, 5], dtype=np.int64))
-    with self.test_session(use_gpu=True) as sess:
+    with self.test_session(use_gpu=True):
       orig_in = constant_op.constant(orig_input, shape=[1, 3, 3, 1])
       t = constant_op.constant(tensor_input, shape=[1, 2, 2, 1])
       argmax = constant_op.constant(
@@ -952,7 +952,7 @@ class PoolingTest(test.TestCase):
                              expected_input_backprop, input_sizes, output_sizes,
                              window_rows, window_cols, row_stride, col_stride,
                              padding, use_gpu):
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=use_gpu):
       input_tensor = constant_op.constant(input_data, shape=input_sizes)
       output_tensor = nn_ops.max_pool(input_tensor,
                                       [1, window_rows, window_cols, 1],
diff --git a/tensorflow/python/ops/nn_grad.py b/tensorflow/python/ops/nn_grad.py
index f5e9550b97..9b765390b3 100644
--- a/tensorflow/python/ops/nn_grad.py
+++ b/tensorflow/python/ops/nn_grad.py
@@ -21,10 +21,10 @@ from __future__ import print_function
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gen_nn_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import sparse_ops
-from tensorflow.python.ops import gen_nn_ops
 
 
 @ops.RegisterGradient("Conv2DBackpropInput")
@@ -330,7 +330,7 @@ def _EluGradGrad(op, grad):
   return (gen_nn_ops._elu_grad(grad, op.outputs[0]),
           array_ops.where(
               x < 0., gen_nn_ops._elu_grad(grad, op.outputs[0] + 1),
-              array_ops.zeros(shape = array_ops.shape(x), dtype = x.dtype)))
+              array_ops.zeros(shape=array_ops.shape(x), dtype=x.dtype)))
 
 
 @ops.RegisterGradient("Relu6")
@@ -387,12 +387,13 @@ def _SoftmaxCrossEntropyWithLogitsGrad(op, grad_loss, grad_grad):
   softmax_grad = op.outputs[1]
   grad = _BroadcastMul(grad_loss, softmax_grad)
 
-  if grad_grad.op.type not in ('ZerosLike', 'Zeros'):
+  if grad_grad.op.type not in ("ZerosLike", "Zeros"):
     logits = op.inputs[0]
     softmax = nn_ops.softmax(logits)
 
-    grad += ((grad_grad - array_ops.squeeze(math_ops.matmul(grad_grad[:, None, :],
-                                                              softmax[:, :, None]), axis=1)) * softmax)
+    grad += ((grad_grad - array_ops.squeeze(
+        math_ops.matmul(grad_grad[:, None, :],
+                        softmax[:, :, None]), axis=1)) * softmax)
 
   return grad, None
 
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 2d44f55e2c..901d6a12f6 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -2044,7 +2044,7 @@ def conv1d(value, filters, stride, padding,
     [1, filter_width, in_channels, out_channels].
   The result is then reshaped back to
     [batch, out_width, out_channels]
-  (where out_width is a function of the stride and padding as in conv2d) and
+  \(where out_width is a function of the stride and padding as in conv2d\) and
   returned to the caller.
 
   Args:
diff --git a/tensorflow/stream_executor/cuda/cuda_dnn.cc b/tensorflow/stream_executor/cuda/cuda_dnn.cc
index 6c06a73943..b6d841f365 100644
--- a/tensorflow/stream_executor/cuda/cuda_dnn.cc
+++ b/tensorflow/stream_executor/cuda/cuda_dnn.cc
@@ -1202,7 +1202,8 @@ class CudnnRnnSequenceTensorDescriptor
     // Only the first one needs to be destroyed. All others are the same.
     cudnnStatus_t status =
         wrap::cudnnDestroyTensorDescriptor(parent_, handles_[0]);
-    CUDNN_RETURN_IF_FAIL(status, "Failed to destroy sequence tensor descriptor");
+    CUDNN_RETURN_IF_FAIL(status,
+                         "Failed to destroy sequence tensor descriptor");
   }
 
   const cudnnTensorDescriptor_t* handles() const {
diff --git a/tensorflow/tensorboard/plugins/debugger/BUILD b/tensorflow/tensorboard/plugins/debugger/BUILD
index 86254dc3aa..38aa719b9b 100644
--- a/tensorflow/tensorboard/plugins/debugger/BUILD
+++ b/tensorflow/tensorboard/plugins/debugger/BUILD
@@ -30,6 +30,7 @@ py_test(
     srcs = ["debugger_plugin_test.py"],
     main = "debugger_plugin_test.py",
     srcs_version = "PY2AND3",
+    tags = ["no_pip"],
     deps = [
         ":debugger_plugin",
         "//tensorflow/core:protos_all_py",
diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index cde0ab7909..429437f807 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -73,6 +73,7 @@ OLD_MINOR=$(cat ${VERSION_H} | grep -E "^#define TF_MINOR_VERSION [0-9]+" | \
 cut -d ' ' -f 3)
 OLD_PATCH=$(cat ${VERSION_H} | grep -E "^#define TF_PATCH_VERSION [[:alnum:]-]+" | \
 cut -d ' ' -f 3)
+OLD_PIP_PATCH="${OLD_PATCH//-}"
 
 sed -i -e "s/^#define TF_MAJOR_VERSION ${OLD_MAJOR}/#define TF_MAJOR_VERSION ${MAJOR}/g" ${VERSION_H}
 sed -i -e "s/^#define TF_MINOR_VERSION ${OLD_MINOR}/#define TF_MINOR_VERSION ${MINOR}/g" ${VERSION_H}
@@ -92,6 +93,26 @@ check_existence file "${README_MD}"
 
 sed -i -r -e "s/${OLD_MAJOR}\.${OLD_MINOR}\.([[:alnum:]]+)-/${MAJOR}.${MINOR}.${PIP_PATCH}-/g" "${README_MD}"
 
+# Update the install md files
+NEW_PIP_TAG=$MAJOR.$MINOR.$PIP_PATCH
+OLD_PIP_TAG=$OLD_MAJOR.$OLD_MINOR.$OLD_PIP_PATCH
+
+for file in ${TF_SRC_DIR}/docs_src/install/install_{linux,mac,windows,sources}.md
+do
+  sed -i "s/tensorflow-${OLD_PIP_TAG}/tensorflow-${NEW_PIP_TAG}/g" $file
+  sed -i "s/tensorflow_gpu-${OLD_PIP_TAG}/tensorflow_gpu-${NEW_PIP_TAG}/g" $file
+  sed -i "s/TensorFlow ${OLD_PIP_TAG}/TensorFlow ${NEW_PIP_TAG}/g" $file
+done
+
+NEW_TAG=$MAJOR.$MINOR.$PATCH
+OLD_TAG=$OLD_MAJOR.$OLD_MINOR.$OLD_PATCH
+
+for file in ${TF_SRC_DIR}/docs_src/install/install_{java,go,c}.md
+do
+  sed -i "s/x86_64-${OLD_TAG}/x86_64-${NEW_TAG}/g" $file
+  sed -i "s/libtensorflow-${OLD_TAG}.jar/libtensorflow-${NEW_TAG}.jar/g" $file
+  sed -i "s/<version>${OLD_TAG}<\/version>/<version>${NEW_TAG}<\/version>/g" $file
+done
 
 # Updates to be made if there are major / minor version changes
 MAJOR_MINOR_CHANGE=0
diff --git a/tensorflow/tools/docker/Dockerfile b/tensorflow/tools/docker/Dockerfile
index b61eb5db37..5b3f1f936a 100644
--- a/tensorflow/tools/docker/Dockerfile
+++ b/tensorflow/tools/docker/Dockerfile
@@ -66,4 +66,4 @@ EXPOSE 8888
 
 WORKDIR "/notebooks"
 
-CMD ["/run_jupyter.sh"]
+CMD ["/run_jupyter.sh", "--allow-root"]
diff --git a/tensorflow/tools/docker/Dockerfile.gpu b/tensorflow/tools/docker/Dockerfile.gpu
index b2b39501cd..88876421f5 100644
--- a/tensorflow/tools/docker/Dockerfile.gpu
+++ b/tensorflow/tools/docker/Dockerfile.gpu
@@ -69,4 +69,4 @@ EXPOSE 8888
 
 WORKDIR "/notebooks"
 
-CMD ["/run_jupyter.sh"]
+CMD ["/run_jupyter.sh", "--allow-root"]
diff --git a/tensorflow/tools/graph_transforms/quantize_nodes.cc b/tensorflow/tools/graph_transforms/quantize_nodes.cc
index 5d1c76834f..78078ab6ab 100644
--- a/tensorflow/tools/graph_transforms/quantize_nodes.cc
+++ b/tensorflow/tools/graph_transforms/quantize_nodes.cc
@@ -941,7 +941,7 @@ Status QuantizeNodes(const GraphDef& input_graph_def,
   // keep interoperability with float ops.
   TF_RETURN_IF_ERROR(RemoveRedundantQuantizations(deduped_graph_def, context,
                                                   output_graph_def));
-  TF_RETURN_IF_ERROR(IsGraphValid(merged_graph_def));
+  TF_RETURN_IF_ERROR(IsGraphValid(*output_graph_def));
 
   return Status::OK();
 }
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index f591e50ac9..3253440a23 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,14 +29,14 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc0'
+_VERSION = '1.1.0-rc1'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
     'six >= 1.10.0',
     'protobuf >= 3.2.0',
     'werkzeug >= 0.11.10',
-    'html5lib == 1.0b8',
+    'html5lib == 0.9999999',  # identical to 1.0b8
     'markdown == 2.2.0',
     'bleach == 1.5.0',
 ]
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 7bcdb1613d..93d4605ad8 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -271,11 +271,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name="org_html5lib",
       urls=[
-          "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
-          "https://github.com/html5lib/html5lib-python/archive/1.0b8.tar.gz",
+          "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",
+          "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",  # identical to 1.0b8
       ],
-      sha256="adb36c879264e8880b92589c4c4fe0814cd9d157b73328b14d728f48a6bab0a4",
-      strip_prefix="html5lib-python-1.0b8",
+      sha256="184257f98539159a433e2a2197309657ae1283b4c44dbd9c87b2f02ff36adce8",
+      strip_prefix="html5lib-python-0.9999999",
       build_file=str(Label("//third_party:html5lib.BUILD")),)
 
   native.new_http_archive(
-- 
GitLab


From 0cb8adae19ef79b6f1a5cf8f41be7a172277934d Mon Sep 17 00:00:00 2001
From: Lukasz Kaiser <lukaszkaiser@google.com>
Date: Fri, 7 Apr 2017 09:52:34 -0800
Subject: [PATCH 0215/1563] Update API after changing default step couter
 frequency before. Change: 152517535

---
 tensorflow/tools/api/golden/tensorflow.train.pbtxt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/api/golden/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
index 5f2c851719..86af18f824 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
@@ -226,7 +226,7 @@ tf_module {
   }
   member_method {
     name: "MonitoredTrainingSession"
-    argspec: "args=[\'master\', \'is_chief\', \'checkpoint_dir\', \'scaffold\', \'hooks\', \'chief_only_hooks\', \'save_checkpoint_secs\', \'save_summaries_steps\', \'save_summaries_secs\', \'config\', \'stop_grace_period_secs\', \'log_step_count_steps\'], varargs=None, keywords=None, defaults=[\'\', \'True\', \'None\', \'None\', \'None\', \'None\', \'600\', \'100\', \'None\', \'None\', \'120\', \'10000\'], "
+    argspec: "args=[\'master\', \'is_chief\', \'checkpoint_dir\', \'scaffold\', \'hooks\', \'chief_only_hooks\', \'save_checkpoint_secs\', \'save_summaries_steps\', \'save_summaries_secs\', \'config\', \'stop_grace_period_secs\', \'log_step_count_steps\'], varargs=None, keywords=None, defaults=[\'\', \'True\', \'None\', \'None\', \'None\', \'None\', \'600\', \'100\', \'None\', \'None\', \'120\', \'100\'], "
   }
   member_method {
     name: "NewCheckpointReader"
-- 
GitLab


From 54dfebaa68cfb4e7e5703e8bbfd866f45abfee54 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 7 Apr 2017 10:25:45 -0800
Subject: [PATCH 0216/1563] Move a few random op helper functions to header
 files

1. shape_inference::RandomShape
2. OpKernel::MakeShape(Tensor, TensorShape*)
Change: 152522156
---
 tensorflow/core/BUILD                         |  1 +
 tensorflow/core/framework/common_shape_fns.cc |  7 +++++
 tensorflow/core/framework/common_shape_fns.h  |  3 ++
 tensorflow/core/framework/op_kernel.cc        | 17 +++++++++++
 tensorflow/core/framework/op_kernel.h         |  4 +++
 tensorflow/core/kernels/random_op.cc          | 30 ++++++-------------
 tensorflow/core/kernels/random_poisson_op.cc  | 22 ++------------
 tensorflow/core/lib/random/philox_random.h    | 14 +++++----
 tensorflow/core/ops/random_ops.cc             | 21 ++++---------
 9 files changed, 56 insertions(+), 63 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index ba761cd7c6..144bf94f21 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -272,6 +272,7 @@ cc_library(
         "lib/monitoring/sampler.h",
         "lib/random/distribution_sampler.h",
         "lib/random/philox_random.h",
+        "lib/random/random_distributions.h",
         "lib/random/simple_philox.h",
         "lib/strings/numbers.h",
         "lib/strings/str_util.h",
diff --git a/tensorflow/core/framework/common_shape_fns.cc b/tensorflow/core/framework/common_shape_fns.cc
index 4c87a453e2..d5e6e293d6 100644
--- a/tensorflow/core/framework/common_shape_fns.cc
+++ b/tensorflow/core/framework/common_shape_fns.cc
@@ -873,6 +873,13 @@ Status BroadcastBinaryOpShapeFn(InferenceContext* c) {
   return Status::OK();
 }
 
+Status RandomShape(shape_inference::InferenceContext* c) {
+  shape_inference::ShapeHandle out;
+  TF_RETURN_IF_ERROR(c->MakeShapeFromShapeTensor(0, &out));
+  c->set_output(0, out);
+  return Status::OK();
+}
+
 Status ValidateSparseTensor(InferenceContext* c, ShapeHandle indices_shape,
                             ShapeHandle values_shape, ShapeHandle shape_shape) {
   // Validate ranks.
diff --git a/tensorflow/core/framework/common_shape_fns.h b/tensorflow/core/framework/common_shape_fns.h
index 73509fb7fb..dc99e48adb 100644
--- a/tensorflow/core/framework/common_shape_fns.h
+++ b/tensorflow/core/framework/common_shape_fns.h
@@ -199,6 +199,9 @@ Status ConcatV2Shape(shape_inference::InferenceContext* c);
 // Tested by ops/math_ops_test.cc.
 Status BroadcastBinaryOpShapeFn(InferenceContext* c);
 
+// Shape function for random operations.
+Status RandomShape(shape_inference::InferenceContext* c);
+
 // Validates the 3 component tensors of a sparse tensor have the proper
 // shapes. This mimics SparseTensor.__init__ in python/framework/ops.py.
 Status ValidateSparseTensor(InferenceContext* c, ShapeHandle indices_shape,
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 3626de58d6..3d913cdaf0 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -125,6 +125,23 @@ Status OpKernel::OutputRange(StringPiece output_name, int* start,
   }
 }
 
+Status OpKernel::MakeShape(const Tensor& shape, TensorShape* out) const {
+  if (!IsLegacyVector(shape.shape())) {
+    return errors::InvalidArgument(
+        "shape must be a vector of {int32,int64}, got shape ",
+        shape.shape().DebugString());
+  }
+  if (shape.dtype() == DataType::DT_INT32) {
+    auto vec = shape.flat<int32>();
+    return TensorShapeUtils::MakeShape(vec.data(), vec.size(), out);
+  } else if (shape.dtype() == DataType::DT_INT64) {
+    auto vec = shape.flat<int64>();
+    return TensorShapeUtils::MakeShape(vec.data(), vec.size(), out);
+  } else {
+    return errors::InvalidArgument("shape must be a vector of {int32,int64}.");
+  }
+}
+
 void AsyncOpKernel::Compute(OpKernelContext* context) {
   Notification n;
   ComputeAsync(context, [&n]() { n.Notify(); });
diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index d874b9087f..91e6a98304 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -151,6 +151,10 @@ class OpKernel {
     return shape.dims() == 1 || (allow_legacy_scalars() && shape.dims() == 0);
   }
 
+  // Turn a shape Tensor into a TensorShape
+  // TODO(irving): Move to TensorShapeUtils once !allow_legacy_scalars
+  Status MakeShape(const Tensor& shape, TensorShape* out) const;
+
  private:
   const NodeDef def_;
   const DataTypeVector input_types_;
diff --git a/tensorflow/core/kernels/random_op.cc b/tensorflow/core/kernels/random_op.cc
index 3063fedac8..80b1be8d4c 100644
--- a/tensorflow/core/kernels/random_op.cc
+++ b/tensorflow/core/kernels/random_op.cc
@@ -178,27 +178,9 @@ namespace {
 
 static Status AllocateOutputWithShape(OpKernelContext* ctx, const Tensor& shape,
                                       int index, Tensor** output) {
-  if (!ctx->op_kernel().IsLegacyVector(shape.shape())) {
-    return errors::InvalidArgument(
-        "shape must be a vector of {int32,int64}, got shape ",
-        shape.shape().DebugString());
-  }
-  if (shape.dtype() == DataType::DT_INT32) {
-    auto vec = shape.flat<int32>();
-    TensorShape tensor_shape;
-    TF_RETURN_IF_ERROR(
-        TensorShapeUtils::MakeShape(vec.data(), vec.size(), &tensor_shape));
-    TF_RETURN_IF_ERROR(ctx->allocate_output(index, tensor_shape, output));
-  } else if (shape.dtype() == DataType::DT_INT64) {
-    auto vec = shape.flat<int64>();
-    TensorShape tensor_shape;
-    TF_RETURN_IF_ERROR(
-        TensorShapeUtils::MakeShape(vec.data(), vec.size(), &tensor_shape));
-    TF_RETURN_IF_ERROR(ctx->allocate_output(index, tensor_shape, output));
-  } else {
-    return errors::InvalidArgument("shape must be a vector of {int32,int64}.");
-  }
-  return Status::OK();
+  TensorShape tensor_shape;
+  TF_RETURN_IF_ERROR(ctx->op_kernel().MakeShape(shape, &tensor_shape));
+  return ctx->allocate_output(index, tensor_shape, output);
 }
 
 // For now, use the same interface as RandomOp, so we can choose either one
@@ -465,6 +447,12 @@ class RandomGammaOp : public OpKernel {
 #define REGISTER(TYPE)                                                      \
   template struct functor::FillPhiloxRandom<                                \
       CPUDevice, random::UniformDistribution<random::PhiloxRandom, TYPE> >; \
+  template struct functor::FillPhiloxRandom<                                \
+      CPUDevice, random::NormalDistribution<random::PhiloxRandom, TYPE> >;  \
+  template struct functor::FillPhiloxRandom<                                \
+      CPUDevice,                                                            \
+      random::TruncatedNormalDistribution<                                  \
+          random::SingleSampleAdapter<random::PhiloxRandom>, TYPE> >;       \
   REGISTER_KERNEL_BUILDER(                                                  \
       Name("RandomUniform")                                                 \
           .Device(DEVICE_CPU)                                               \
diff --git a/tensorflow/core/kernels/random_poisson_op.cc b/tensorflow/core/kernels/random_poisson_op.cc
index 553a4a7f93..66123e47c6 100644
--- a/tensorflow/core/kernels/random_poisson_op.cc
+++ b/tensorflow/core/kernels/random_poisson_op.cc
@@ -291,33 +291,15 @@ class RandomPoissonOp : public OpKernel {
     const Tensor& shape_t = ctx->input(0);
     const Tensor& rate_t = ctx->input(1);
 
-    OP_REQUIRES(ctx,
-                TensorShapeUtils::IsVector(shape_t.shape()) &&
-                    (shape_t.dtype() == DataType::DT_INT32 ||
-                     shape_t.dtype() == DataType::DT_INT64),
-                errors::InvalidArgument(
-                    "shape must be a vector of {int32,int64}, got shape: ",
-                    shape_t.DebugString()));
     TensorShape samples_shape;
-    if (shape_t.dtype() == DataType::DT_INT32) {
-      auto vec = shape_t.flat<int32>();
-      OP_REQUIRES_OK(ctx, TensorShapeUtils::MakeShape(vec.data(), vec.size(),
-                                                      &samples_shape));
-    } else if (shape_t.dtype() == DataType::DT_INT64) {
-      auto vec = shape_t.flat<int64>();
-      OP_REQUIRES_OK(ctx, TensorShapeUtils::MakeShape(vec.data(), vec.size(),
-                                                      &samples_shape));
-    }
+    OP_REQUIRES_OK(ctx, MakeShape(shape_t, &samples_shape));
     const int64 num_samples = samples_shape.num_elements();
-    OP_REQUIRES(ctx, num_samples > 0,
-                errors::InvalidArgument(
-                    "Input shape should have non-zero element count, got: ",
-                    num_samples));
 
     samples_shape.AppendShape(rate_t.shape());
     // Allocate output samples.
     Tensor* samples_t = nullptr;
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, samples_shape, &samples_t));
+    if (num_samples == 0) return;
 
     const auto rate_flat = rate_t.flat<T>().data();
     const int64 num_rate = rate_t.NumElements();
diff --git a/tensorflow/core/lib/random/philox_random.h b/tensorflow/core/lib/random/philox_random.h
index 1fec5a3b44..b2adb4462b 100644
--- a/tensorflow/core/lib/random/philox_random.h
+++ b/tensorflow/core/lib/random/philox_random.h
@@ -101,12 +101,15 @@ class Array {
 // 2. PhiloxRandom is compilable by gcc and nvcc.
 class PhiloxRandom {
  public:
-  typedef Array<uint32, 4> ResultType;
-  typedef uint32 ResultElementType;
+  using ResultType = Array<uint32, 4>;
+  using ResultElementType = uint32;
   // The number of elements that will be returned.
   static const int kResultElementCount = 4;
   // Cost of generation of a single element (in cycles).
   static const int kElementCost = 10;
+  // The type for the 64-bit key stored in the form of two 32-bit uint
+  // that are used in the diffusion process.
+  using Key = Array<uint32, 2>;
 
   PHILOX_DEVICE_INLINE
   PhiloxRandom() {}
@@ -125,6 +128,9 @@ class PhiloxRandom {
     counter_[3] = static_cast<uint32>(seed_hi >> 32);
   }
 
+  PHILOX_DEVICE_INLINE
+  PhiloxRandom(ResultType counter, Key key) : counter_(counter), key_(key) {}
+
   // Skip the specified number of samples of 128-bits in the current stream.
   PHILOX_DEVICE_INLINE
   void Skip(uint64 count) {
@@ -178,10 +184,6 @@ class PhiloxRandom {
   }
 
  private:
-  // The type for the 64-bit key stored in the form of two 32-bit uint
-  // that are used in the diffusion process.
-  typedef Array<uint32, 2> Key;
-
   // We use the same constants as recommended by the original paper.
   static const uint32 kPhiloxW32A = 0x9E3779B9;
   static const uint32 kPhiloxW32B = 0xBB67AE85;
diff --git a/tensorflow/core/ops/random_ops.cc b/tensorflow/core/ops/random_ops.cc
index 7b2da9d8e6..392ac32010 100644
--- a/tensorflow/core/ops/random_ops.cc
+++ b/tensorflow/core/ops/random_ops.cc
@@ -23,17 +23,6 @@ using shape_inference::DimensionHandle;
 using shape_inference::InferenceContext;
 using shape_inference::ShapeHandle;
 
-namespace {
-
-Status RandomShape(InferenceContext* c) {
-  ShapeHandle out;
-  TF_RETURN_IF_ERROR(c->MakeShapeFromShapeTensor(0, &out));
-  c->set_output(0, out);
-  return Status::OK();
-}
-
-}  // namepsace
-
 REGISTER_OP("RandomUniform")
     .Input("shape: T")
     .SetIsStateful()
@@ -42,7 +31,7 @@ REGISTER_OP("RandomUniform")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a uniform distribution.
 
@@ -69,7 +58,7 @@ REGISTER_OP("RandomUniformInt")
     .Attr("seed2: int = 0")
     .Attr("Tout: {int32, int64}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random integers from a uniform distribution.
 
@@ -100,7 +89,7 @@ REGISTER_OP("RandomStandardNormal")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a normal distribution.
 
@@ -128,7 +117,7 @@ REGISTER_OP("ParameterizedTruncatedNormal")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a normal distribution. The parameters may each be a
 scalar which applies to the entire output, or a vector of length shape[0] which
@@ -158,7 +147,7 @@ REGISTER_OP("TruncatedNormal")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a truncated normal distribution.
 
-- 
GitLab


From 841d3dbf2be11fc34f1be3bbabe8443b98e60528 Mon Sep 17 00:00:00 2001
From: Olivia Nordquist <nolivia@google.com>
Date: Fri, 7 Apr 2017 10:28:17 -0800
Subject: [PATCH 0217/1563] addresses the divide by zero bug Change: 152522488

---
 .../learn/python/learn/learn_io/graph_io.py        |  5 +++--
 .../learn/python/learn/learn_io/graph_io_test.py   | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
index 0f317b7bb0..9bdd3206b2 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
@@ -359,8 +359,9 @@ def _read_keyed_batch_examples_helper(file_pattern,
   # Check input parameters are given and reasonable.
   if (not queue_capacity) or (queue_capacity <= 0):
     raise ValueError('Invalid queue_capacity %s.' % queue_capacity)
-  if (batch_size is None) or ((not isinstance(batch_size, ops.Tensor)) and
-                              (batch_size <= 0 or batch_size > queue_capacity)):
+  if (batch_size is None) or (
+      (not isinstance(batch_size, ops.Tensor)) and
+      (batch_size <= 0 or batch_size >= queue_capacity)):
     raise ValueError('Invalid batch_size %s, with queue_capacity %s.' %
                      (batch_size, queue_capacity))
   if (read_batch_size is None) or (
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
index 83643689e1..542aaabc95 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
@@ -112,6 +112,18 @@ class GraphIOTest(test.TestCase):
         queue_capacity=queue_capacity,
         num_threads=num_threads,
         name=name)
+    self.assertRaisesRegexp(
+        ValueError,
+        "Invalid batch_size",
+        graph_io.read_batch_examples,
+        _VALID_FILE_PATTERN,
+        default_batch_size,
+        io_ops.TFRecordReader,
+        False,
+        num_epochs=None,
+        queue_capacity=default_batch_size,
+        num_threads=num_threads,
+        name=name)
     self.assertRaisesRegexp(
         ValueError,
         "Invalid queue_capacity",
@@ -356,7 +368,7 @@ class GraphIOTest(test.TestCase):
     ]
     filename = self._create_temp_file("".join(json_lines))
     batch_size = 10000
-    queue_capacity = 10000
+    queue_capacity = 100000
     name = "my_large_batch"
 
     features = {"sequence": parsing_ops.FixedLenFeature([], dtypes_lib.string)}
-- 
GitLab


From 1f8f71d9c25014458d12124364cc942c61a28c28 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Fri, 7 Apr 2017 10:39:53 -0800
Subject: [PATCH 0218/1563] Clarify doc on tf.assign. Change: 152523909

---
 tensorflow/python/ops/state_ops.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/ops/state_ops.py b/tensorflow/python/ops/state_ops.py
index 2a64cb7b70..f46f56cbb7 100644
--- a/tensorflow/python/ops/state_ops.py
+++ b/tensorflow/python/ops/state_ops.py
@@ -243,8 +243,9 @@ def assign_add(ref, value, use_locking=None, name=None):
 def assign(ref, value, validate_shape=None, use_locking=None, name=None):
   """Update 'ref' by assigning 'value' to it.
 
-  This operation outputs "ref" after the assignment is done.
-  This makes it easier to chain operations that need to use the reset value.
+  This operation outputs a Tensor that holds the new value of 'ref' after
+    the value has been assigned. This makes it easier to chain operations
+    that need to use the reset value.
 
   Args:
     ref: A mutable `Tensor`.
@@ -261,8 +262,8 @@ def assign(ref, value, validate_shape=None, use_locking=None, name=None):
     name: A name for the operation (optional).
 
   Returns:
-    Same as "ref".  Returned as a convenience for operations that want
-    to use the new value after the variable has been reset.
+    A `Tensor` that will hold the new value of 'ref' after
+      the assignment has completed.
   """
   if ref.dtype._is_ref_dtype:
     return gen_state_ops.assign(
-- 
GitLab


From 9a1b76bc77c06d65799c1f0352eb5dc1dd5b932f Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Fri, 7 Apr 2017 10:50:35 -0800
Subject: [PATCH 0219/1563] Sparse adam for resource variables. Change:
 152525327

---
 tensorflow/python/training/adam.py      | 33 +++++++++++++++++++------
 tensorflow/python/training/adam_test.py | 16 +++++++++---
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index 111461f784..4b0ef50df5 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -21,6 +21,7 @@ from __future__ import print_function
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.training import optimizer
@@ -154,7 +155,7 @@ class AdamOptimizer(optimizer.Optimizer):
         math_ops.cast(self._epsilon_t, grad.dtype.base_dtype),
         grad, use_locking=self._use_locking)
 
-  def _apply_sparse(self, grad, var):
+  def _apply_sparse_shared(self, grad, var, indices, scatter_add):
     beta1_power = math_ops.cast(self._beta1_power, var.dtype.base_dtype)
     beta2_power = math_ops.cast(self._beta2_power, var.dtype.base_dtype)
     lr_t = math_ops.cast(self._lr_t, var.dtype.base_dtype)
@@ -164,23 +165,39 @@ class AdamOptimizer(optimizer.Optimizer):
     lr = (lr_t * math_ops.sqrt(1 - beta2_power) / (1 - beta1_power))
     # m_t = beta1 * m + (1 - beta1) * g_t
     m = self.get_slot(var, "m")
-    m_scaled_g_values = grad.values * (1 - beta1_t)
+    m_scaled_g_values = grad * (1 - beta1_t)
     m_t = state_ops.assign(m, m * beta1_t,
                            use_locking=self._use_locking)
-    m_t = state_ops.scatter_add(m_t, grad.indices, m_scaled_g_values,
-                                use_locking=self._use_locking)
+    with ops.control_dependencies([m_t]):
+      m_t = scatter_add(m, indices, m_scaled_g_values)
     # v_t = beta2 * v + (1 - beta2) * (g_t * g_t)
     v = self.get_slot(var, "v")
-    v_scaled_g_values = (grad.values * grad.values) * (1 - beta2_t)
-    v_t = state_ops.assign(v, v * beta2_t, use_locking=self._use_locking)
-    v_t = state_ops.scatter_add(v_t, grad.indices, v_scaled_g_values,
-                                use_locking=self._use_locking)
+    v_scaled_g_values = (grad * grad) * (1 - beta2_t)
+    v_t = state_ops.assign(v, v * beta2_t)
+    with ops.control_dependencies([v_t]):
+      v_t = scatter_add(v, indices, v_scaled_g_values)
     v_sqrt = math_ops.sqrt(v_t)
     var_update = state_ops.assign_sub(var,
                                       lr * m_t / (v_sqrt + epsilon_t),
                                       use_locking=self._use_locking)
     return control_flow_ops.group(*[var_update, m_t, v_t])
 
+  def _apply_sparse(self, grad, var):
+    return self._apply_sparse_shared(
+        grad.values, var, grad.indices,
+        lambda x, i, v: state_ops.scatter_add(  # pylint: disable=g-long-lambda
+            x, i, v, use_locking=self._use_locking))
+
+  def _resource_scatter_add(self, x, i, v):
+    with ops.control_dependencies(
+        [resource_variable_ops.resource_scatter_add(
+            x.handle, i, v)]):
+      return x.value()
+
+  def _resource_apply_sparse(self, grad, var, indices):
+    return self._apply_sparse_shared(
+        grad, var, indices, self._resource_scatter_add)
+
   def _finish(self, update_ops, name_scope):
     # Update the power accumulators.
     with ops.control_dependencies(update_ops):
diff --git a/tensorflow/python/training/adam_test.py b/tensorflow/python/training/adam_test.py
index 00ff5d9b9d..62b171e234 100644
--- a/tensorflow/python/training/adam_test.py
+++ b/tensorflow/python/training/adam_test.py
@@ -52,7 +52,7 @@ def adam_update_numpy(param,
 
 class AdamOptimizerTest(test.TestCase):
 
-  def testSparse(self):
+  def doTestSparse(self, use_resource=False):
     for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
       with self.test_session():
         # Initialize variables for numpy implementation.
@@ -62,8 +62,12 @@ class AdamOptimizerTest(test.TestCase):
         var1_np = np.array([3.0, 4.0], dtype=dtype.as_numpy_dtype)
         grads1_np = np.array([0.01, 0.01], dtype=dtype.as_numpy_dtype)
 
-        var0 = variables.Variable(var0_np)
-        var1 = variables.Variable(var1_np)
+        if use_resource:
+          var0 = resource_variable_ops.ResourceVariable(var0_np)
+          var1 = resource_variable_ops.ResourceVariable(var1_np)
+        else:
+          var0 = variables.Variable(var0_np)
+          var1 = variables.Variable(var1_np)
         grads0_np_indices = np.array([0, 1], dtype=np.int32)
         grads0 = ops.IndexedSlices(
             constant_op.constant(grads0_np),
@@ -95,6 +99,12 @@ class AdamOptimizerTest(test.TestCase):
           self.assertAllCloseAccordingToType(var0_np, var0.eval())
           self.assertAllCloseAccordingToType(var1_np, var1.eval())
 
+  def testSparse(self):
+    self.doTestSparse(use_resource=False)
+
+  def testResourceSparse(self):
+    self.doTestSparse(use_resource=True)
+
   def testSparseDevicePlacement(self):
     for index_dtype in [dtypes.int32, dtypes.int64]:
       with self.test_session(force_gpu=test.is_gpu_available()):
-- 
GitLab


From 2238fd708c191e3939a9caee0de7cf74a4b391f6 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Fri, 7 Apr 2017 11:19:20 -0800
Subject: [PATCH 0220/1563] Automated rollback of change 152310869 Change:
 152528732

---
 tensorflow/BUILD                              |    3 -
 tensorflow/tools/api/golden/BUILD             |   24 -
 .../tensorflow.-aggregation-method.pbtxt      |   24 -
 .../tensorflow.-attr-value.-list-value.pbtxt  |  108 -
 .../api/golden/tensorflow.-attr-value.pbtxt   |  120 -
 ...orflow.-conditional-accumulator-base.pbtxt |   29 -
 .../tensorflow.-conditional-accumulator.pbtxt |   38 -
 ...ow.-config-proto.-device-count-entry.pbtxt |   84 -
 .../api/golden/tensorflow.-config-proto.pbtxt |  132 --
 .../tools/api/golden/tensorflow.-d-type.pbtxt |   77 -
 .../api/golden/tensorflow.-device-spec.pbtxt  |   37 -
 .../api/golden/tensorflow.-dimension.pbtxt    |   25 -
 .../tools/api/golden/tensorflow.-event.pbtxt  |  112 -
 .../golden/tensorflow.-f-i-f-o-queue.pbtxt    |   62 -
 .../tensorflow.-fixed-len-feature.pbtxt       |   27 -
 ...nsorflow.-fixed-len-sequence-feature.pbtxt |   31 -
 ...nsorflow.-fixed-length-record-reader.pbtxt |   46 -
 .../golden/tensorflow.-g-p-u-options.pbtxt    |  104 -
 .../api/golden/tensorflow.-graph-def.pbtxt    |   92 -
 .../api/golden/tensorflow.-graph-keys.pbtxt   |  136 --
 .../golden/tensorflow.-graph-options.pbtxt    |  112 -
 .../tools/api/golden/tensorflow.-graph.pbtxt  |  129 --
 .../golden/tensorflow.-histogram-proto.pbtxt  |  104 -
 .../golden/tensorflow.-identity-reader.pbtxt  |   46 -
 .../golden/tensorflow.-indexed-slices.pbtxt   |   42 -
 .../tensorflow.-interactive-session.pbtxt     |   43 -
 .../api/golden/tensorflow.-log-message.pbtxt  |  112 -
 ...nsorflow.-name-attr-list.-attr-entry.pbtxt |   84 -
 .../golden/tensorflow.-name-attr-list.pbtxt   |   88 -
 .../tensorflow.-node-def.-attr-entry.pbtxt    |   84 -
 .../api/golden/tensorflow.-node-def.pbtxt     |  100 -
 .../api/golden/tensorflow.-op-error.pbtxt     |   29 -
 .../api/golden/tensorflow.-operation.pbtxt    |   65 -
 .../tensorflow.-optimizer-options.pbtxt       |  128 --
 .../tensorflow.-padding-f-i-f-o-queue.pbtxt   |   62 -
 .../golden/tensorflow.-priority-queue.pbtxt   |   62 -
 .../api/golden/tensorflow.-queue-base.pbtxt   |   61 -
 .../tensorflow.-random-shuffle-queue.pbtxt    |   62 -
 .../api/golden/tensorflow.-reader-base.pbtxt  |   45 -
 .../tensorflow.-register-gradient.pbtxt       |    9 -
 .../golden/tensorflow.-rewriter-config.pbtxt  |  108 -
 .../api/golden/tensorflow.-run-metadata.pbtxt |   88 -
 .../api/golden/tensorflow.-run-options.pbtxt  |  116 -
 .../api/golden/tensorflow.-session-log.pbtxt  |  108 -
 .../api/golden/tensorflow.-session.pbtxt      |   47 -
 ...flow.-sparse-conditional-accumulator.pbtxt |   46 -
 .../golden/tensorflow.-sparse-feature.pbtxt   |   35 -
 .../tensorflow.-sparse-tensor-value.pbtxt     |   26 -
 .../golden/tensorflow.-sparse-tensor.pbtxt    |   46 -
 .../golden/tensorflow.-summary.-audio.pbtxt   |   96 -
 .../golden/tensorflow.-summary.-image.pbtxt   |   92 -
 .../golden/tensorflow.-summary.-value.pbtxt   |  108 -
 .../api/golden/tensorflow.-summary.pbtxt      |   92 -
 .../tensorflow.-t-f-record-reader.pbtxt       |   46 -
 .../api/golden/tensorflow.-tensor-array.pbtxt |   69 -
 .../api/golden/tensorflow.-tensor-info.pbtxt  |   88 -
 .../api/golden/tensorflow.-tensor-shape.pbtxt |   73 -
 .../tools/api/golden/tensorflow.-tensor.pbtxt |   58 -
 .../golden/tensorflow.-text-line-reader.pbtxt |   46 -
 .../golden/tensorflow.-var-len-feature.pbtxt  |   19 -
 .../golden/tensorflow.-variable-scope.pbtxt   |   97 -
 ...ensorflow.-variable.-save-slice-info.pbtxt |   17 -
 .../api/golden/tensorflow.-variable.pbtxt     |  101 -
 .../tensorflow.-whole-file-reader.pbtxt       |   46 -
 .../tools/api/golden/tensorflow.app.pbtxt     |   11 -
 .../tools/api/golden/tensorflow.compat.pbtxt  |   35 -
 .../tensorflow.constant_initializer.pbtxt     |   10 -
 .../tensorflow.errors.-aborted-error.pbtxt    |   30 -
 ...sorflow.errors.-already-exists-error.pbtxt |   30 -
 .../tensorflow.errors.-cancelled-error.pbtxt  |   30 -
 .../tensorflow.errors.-data-loss-error.pbtxt  |   30 -
 ...flow.errors.-deadline-exceeded-error.pbtxt |   30 -
 ...ow.errors.-failed-precondition-error.pbtxt |   30 -
 .../tensorflow.errors.-internal-error.pbtxt   |   30 -
 ...rflow.errors.-invalid-argument-error.pbtxt |   30 -
 .../tensorflow.errors.-not-found-error.pbtxt  |   30 -
 .../golden/tensorflow.errors.-op-error.pbtxt  |   29 -
 ...ensorflow.errors.-out-of-range-error.pbtxt |   30 -
 ...flow.errors.-permission-denied-error.pbtxt |   30 -
 ...low.errors.-resource-exhausted-error.pbtxt |   30 -
 ...orflow.errors.-unauthenticated-error.pbtxt |   30 -
 ...tensorflow.errors.-unavailable-error.pbtxt |   30 -
 ...nsorflow.errors.-unimplemented-error.pbtxt |   30 -
 .../tensorflow.errors.-unknown-error.pbtxt    |   30 -
 .../tools/api/golden/tensorflow.errors.pbtxt  |  151 --
 ...tensorflow.estimator.-estimator-spec.pbtxt |   47 -
 .../tensorflow.estimator.-estimator.pbtxt     |   37 -
 .../tensorflow.estimator.-mode-keys.pbtxt     |   20 -
 .../tensorflow.estimator.-run-config.pbtxt    |   68 -
 ...-classification-output.__metaclass__.pbtxt |   14 -
 ...imator.export.-classification-output.pbtxt |   22 -
 ....export.-export-output.__metaclass__.pbtxt |   14 -
 ...flow.estimator.export.-export-output.pbtxt |   12 -
 ...export.-predict-output.__metaclass__.pbtxt |   14 -
 ...low.estimator.export.-predict-output.pbtxt |   18 -
 ...ort.-regression-output.__metaclass__.pbtxt |   14 -
 ....estimator.export.-regression-output.pbtxt |   18 -
 ...mator.export.-serving-input-receiver.pbtxt |   23 -
 .../golden/tensorflow.estimator.export.pbtxt  |   31 -
 .../golden/tensorflow.estimator.inputs.pbtxt  |   11 -
 .../api/golden/tensorflow.estimator.pbtxt     |   27 -
 .../tensorflow.gfile.-fast-g-file.pbtxt       |   58 -
 .../api/golden/tensorflow.gfile.-g-file.pbtxt |   58 -
 .../api/golden/tensorflow.gfile.-open.pbtxt   |   58 -
 .../tools/api/golden/tensorflow.gfile.pbtxt   |   63 -
 .../api/golden/tensorflow.graph_util.pbtxt    |   23 -
 .../tensorflow.image.-resize-method.pbtxt     |   24 -
 .../tools/api/golden/tensorflow.image.pbtxt   |  175 --
 .../tools/api/golden/tensorflow.layers.pbtxt  |   59 -
 .../tools/api/golden/tensorflow.logging.pbtxt |   83 -
 .../tools/api/golden/tensorflow.losses.pbtxt  |   63 -
 .../tools/api/golden/tensorflow.metrics.pbtxt |   99 -
 .../tools/api/golden/tensorflow.nn.pbtxt      |  323 ---
 .../golden/tensorflow.ones_initializer.pbtxt  |   10 -
 .../tensorflow.orthogonal_initializer.pbtxt   |   10 -
 tensorflow/tools/api/golden/tensorflow.pbtxt  | 1943 -----------------
 ...thon_io.-t-f-record-compression-type.pbtxt |   20 -
 ...orflow.python_io.-t-f-record-options.pbtxt |   17 -
 ...sorflow.python_io.-t-f-record-writer.pbtxt |   17 -
 .../api/golden/tensorflow.python_io.pbtxt     |   19 -
 ...tensorflow.random_normal_initializer.pbtxt |   10 -
 ...ensorflow.random_uniform_initializer.pbtxt |   10 -
 .../golden/tensorflow.resource_loader.pbtxt   |   23 -
 ...d_model.builder.-saved-model-builder.pbtxt |   21 -
 .../tensorflow.saved_model.builder.pbtxt      |    7 -
 .../tensorflow.saved_model.constants.pbtxt    |   39 -
 .../tensorflow.saved_model.loader.pbtxt       |   11 -
 .../tensorflow.saved_model.main_op.pbtxt      |   11 -
 .../api/golden/tensorflow.saved_model.pbtxt   |   35 -
 ...flow.saved_model.signature_constants.pbtxt |   47 -
 ...flow.saved_model.signature_def_utils.pbtxt |   19 -
 ...tensorflow.saved_model.tag_constants.pbtxt |   11 -
 .../golden/tensorflow.saved_model.utils.pbtxt |    7 -
 .../tools/api/golden/tensorflow.sdca.pbtxt    |    3 -
 .../tools/api/golden/tensorflow.sets.pbtxt    |   19 -
 .../api/golden/tensorflow.spectral.pbtxt      |   51 -
 .../golden/tensorflow.summary.-event.pbtxt    |  112 -
 ...ensorflow.summary.-file-writer-cache.pbtxt |   16 -
 .../tensorflow.summary.-file-writer.pbtxt     |   50 -
 .../tensorflow.summary.-session-log.pbtxt     |  108 -
 ...sorflow.summary.-summary-description.pbtxt |   80 -
 .../tensorflow.summary.-summary.-audio.pbtxt  |   96 -
 .../tensorflow.summary.-summary.-image.pbtxt  |   92 -
 .../tensorflow.summary.-summary.-value.pbtxt  |  108 -
 .../golden/tensorflow.summary.-summary.pbtxt  |   92 -
 ...sorflow.summary.-tagged-run-metadata.pbtxt |   84 -
 .../tools/api/golden/tensorflow.summary.pbtxt |   67 -
 .../api/golden/tensorflow.sysconfig.pbtxt     |   11 -
 .../golden/tensorflow.test.-benchmark.pbtxt   |   21 -
 .../tools/api/golden/tensorflow.test.pbtxt    |   51 -
 ...tensorflow.train.-adadelta-optimizer.pbtxt |   46 -
 ...sorflow.train.-adagrad-d-a-optimizer.pbtxt |   46 -
 .../tensorflow.train.-adagrad-optimizer.pbtxt |   46 -
 .../tensorflow.train.-adam-optimizer.pbtxt    |   46 -
 .../golden/tensorflow.train.-bytes-list.pbtxt |   80 -
 ...sorflow.train.-checkpoint-saver-hook.pbtxt |   30 -
 ...sorflow.train.-chief-session-creator.pbtxt |   14 -
 .../tensorflow.train.-cluster-def.pbtxt       |   80 -
 .../tensorflow.train.-cluster-spec.pbtxt      |   37 -
 .../tensorflow.train.-coordinator.pbtxt       |   45 -
 .../golden/tensorflow.train.-example.pbtxt    |   80 -
 ...ow.train.-exponential-moving-average.pbtxt |   25 -
 .../tensorflow.train.-feature-list.pbtxt      |   80 -
 ...n.-feature-lists.-feature-list-entry.pbtxt |   84 -
 .../tensorflow.train.-feature-lists.pbtxt     |   84 -
 .../golden/tensorflow.train.-feature.pbtxt    |   88 -
 ...rflow.train.-features.-feature-entry.pbtxt |   84 -
 .../golden/tensorflow.train.-features.pbtxt   |   84 -
 .../tensorflow.train.-feed-fn-hook.pbtxt      |   30 -
 .../tensorflow.train.-final-ops-hook.pbtxt    |   34 -
 .../golden/tensorflow.train.-float-list.pbtxt |   80 -
 .../tensorflow.train.-ftrl-optimizer.pbtxt    |   46 -
 ...rflow.train.-global-step-waiter-hook.pbtxt |   30 -
 ...ow.train.-gradient-descent-optimizer.pbtxt |   46 -
 .../golden/tensorflow.train.-int64-list.pbtxt |   80 -
 ...nsorflow.train.-job-def.-tasks-entry.pbtxt |   84 -
 .../golden/tensorflow.train.-job-def.pbtxt    |   88 -
 ...ensorflow.train.-logging-tensor-hook.pbtxt |   30 -
 .../tensorflow.train.-looper-thread.pbtxt     |   73 -
 ...tensorflow.train.-momentum-optimizer.pbtxt |   46 -
 .../tensorflow.train.-monitored-session.pbtxt |   26 -
 ...rain.-nan-loss-during-training-error.pbtxt |   16 -
 .../tensorflow.train.-nan-tensor-hook.pbtxt   |   30 -
 .../golden/tensorflow.train.-optimizer.pbtxt  |   45 -
 ...ow.train.-proximal-adagrad-optimizer.pbtxt |   46 -
 ...-proximal-gradient-descent-optimizer.pbtxt |   46 -
 .../tensorflow.train.-queue-runner.pbtxt      |   49 -
 ...nsorflow.train.-r-m-s-prop-optimizer.pbtxt |   46 -
 .../golden/tensorflow.train.-saver-def.pbtxt  |  120 -
 .../api/golden/tensorflow.train.-saver.pbtxt  |   53 -
 .../golden/tensorflow.train.-scaffold.pbtxt   |   49 -
 ...nsorflow.train.-second-or-step-timer.pbtxt |   21 -
 .../tensorflow.train.-sequence-example.pbtxt  |   84 -
 .../golden/tensorflow.train.-server-def.pbtxt |   96 -
 .../api/golden/tensorflow.train.-server.pbtxt |   29 -
 .../tensorflow.train.-session-creator.pbtxt   |   12 -
 .../tensorflow.train.-session-manager.pbtxt   |   21 -
 .../tensorflow.train.-session-run-args.pbtxt  |   27 -
 ...ensorflow.train.-session-run-context.pbtxt |   25 -
 .../tensorflow.train.-session-run-hook.pbtxt  |   28 -
 ...tensorflow.train.-session-run-values.pbtxt |   27 -
 ...ow.train.-singular-monitored-session.pbtxt |   30 -
 .../tensorflow.train.-step-counter-hook.pbtxt |   30 -
 .../tensorflow.train.-stop-at-step-hook.pbtxt |   30 -
 ...tensorflow.train.-summary-saver-hook.pbtxt |   30 -
 .../golden/tensorflow.train.-supervisor.pbtxt |  153 --
 ...rflow.train.-sync-replicas-optimizer.pbtxt |   58 -
 ...orflow.train.-worker-session-creator.pbtxt |   14 -
 .../tools/api/golden/tensorflow.train.pbtxt   |  391 ----
 ...low.train.queue_runner.-queue-runner.pbtxt |   49 -
 .../tensorflow.train.queue_runner.pbtxt       |   15 -
 ...sorflow.truncated_normal_initializer.pbtxt |   10 -
 ...low.uniform_unit_scaling_initializer.pbtxt |   10 -
 .../golden/tensorflow.zeros_initializer.pbtxt |   10 -
 tensorflow/tools/api/lib/BUILD                |   39 -
 tensorflow/tools/api/lib/api_objects.proto    |   31 -
 .../api/lib/python_object_to_proto_visitor.py |  165 --
 .../tools/api/tests/API_UPDATE_WARNING.txt    |    7 -
 tensorflow/tools/api/tests/BUILD              |   43 -
 tensorflow/tools/api/tests/README.txt         |   13 -
 .../tools/api/tests/api_compatibility_test.py |  238 --
 tensorflow/tools/common/public_api.py         |    2 +-
 222 files changed, 1 insertion(+), 13995 deletions(-)
 delete mode 100644 tensorflow/tools/api/golden/BUILD
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-event.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-session.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.app.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.compat.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.errors.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.image.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.layers.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.logging.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.losses.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.nn.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.sets.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.summary.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.test.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
 delete mode 100644 tensorflow/tools/api/lib/BUILD
 delete mode 100644 tensorflow/tools/api/lib/api_objects.proto
 delete mode 100644 tensorflow/tools/api/lib/python_object_to_proto_visitor.py
 delete mode 100644 tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
 delete mode 100644 tensorflow/tools/api/tests/BUILD
 delete mode 100644 tensorflow/tools/api/tests/README.txt
 delete mode 100644 tensorflow/tools/api/tests/api_compatibility_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 0cc460c1d3..365468540d 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -304,9 +304,6 @@ filegroup(
         "//tensorflow/tensorboard/plugins/projector:all_files",
         "//tensorflow/tensorboard/plugins/text:all_files",
         "//tensorflow/tensorboard/scripts:all_files",
-        "//tensorflow/tools/api/golden:all_files",
-        "//tensorflow/tools/api/lib:all_files",
-        "//tensorflow/tools/api/tests:all_files",
         "//tensorflow/tools/common:all_files",
         "//tensorflow/tools/compatibility:all_files",
         "//tensorflow/tools/dist_test/server:all_files",
diff --git a/tensorflow/tools/api/golden/BUILD b/tensorflow/tools/api/golden/BUILD
deleted file mode 100644
index 08436396a6..0000000000
--- a/tensorflow/tools/api/golden/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# TensorFlow API backwards compatibility test goldens.
-
-package(
-    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-filegroup(
-    name = "api_golden",
-    srcs = glob(["*.pbtxt"]),
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
deleted file mode 100644
index f79029d3fe..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
+++ /dev/null
@@ -1,24 +0,0 @@
-path: "tensorflow.AggregationMethod"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.gradients_impl.AggregationMethod\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "ADD_N"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DEFAULT"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "EXPERIMENTAL_ACCUMULATE_N"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "EXPERIMENTAL_TREE"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
deleted file mode 100644
index 0fb1aaba28..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
+++ /dev/null
@@ -1,108 +0,0 @@
-path: "tensorflow.AttrValue.ListValue"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.ListValue\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "B_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FUNC_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "F_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "I_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SHAPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "S_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TENSOR_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TYPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
deleted file mode 100644
index e7a3a1f02f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
+++ /dev/null
@@ -1,120 +0,0 @@
-path: "tensorflow.AttrValue"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrValue\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "B_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FUNC_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "F_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "I_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "LIST_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ListValue"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "PLACEHOLDER_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SHAPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "S_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TENSOR_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TYPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
deleted file mode 100644
index c9a32c16b3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
+++ /dev/null
@@ -1,29 +0,0 @@
-path: "tensorflow.ConditionalAccumulatorBase"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "accumulator_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dtype\', \'shape\', \'accumulator_ref\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "num_accumulated"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "set_global_step"
-    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
deleted file mode 100644
index d23b3bd0ca..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
+++ /dev/null
@@ -1,38 +0,0 @@
-path: "tensorflow.ConditionalAccumulator"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulator\'>"
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "accumulator_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'conditional_accumulator\'], "
-  }
-  member_method {
-    name: "apply_grad"
-    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
-  }
-  member_method {
-    name: "num_accumulated"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "set_global_step"
-    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "take_grad"
-    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
deleted file mode 100644
index 29bb3be35c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.ConfigProto.DeviceCountEntry"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.DeviceCountEntry\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "KEY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
deleted file mode 100644
index 805a9bdd4f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
+++ /dev/null
@@ -1,132 +0,0 @@
-path: "tensorflow.ConfigProto"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.ConfigProto\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "ALLOW_SOFT_PLACEMENT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "DEVICE_COUNT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DEVICE_FILTERS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DeviceCountEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "GPU_OPTIONS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GRAPH_OPTIONS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "INTER_OP_PARALLELISM_THREADS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "INTRA_OP_PARALLELISM_THREADS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "LOG_DEVICE_PLACEMENT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OPERATION_TIMEOUT_IN_MS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "PLACEMENT_PERIOD_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "RPC_OPTIONS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SESSION_INTER_OP_THREAD_POOL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "USE_PER_SESSION_THREADS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
deleted file mode 100644
index 0b5b88bba8..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
+++ /dev/null
@@ -1,77 +0,0 @@
-path: "tensorflow.DType"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "as_datatype_enum"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "as_numpy_dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "base_dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_bool"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_complex"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_floating"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_integer"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_numpy_compatible"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_quantized"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_unsigned"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "limits"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "max"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "min"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "real_dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "size"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'type_enum\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_compatible_with"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
deleted file mode 100644
index 92e535c341..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
+++ /dev/null
@@ -1,37 +0,0 @@
-path: "tensorflow.DeviceSpec"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.device.DeviceSpec\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "job"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "replica"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "task"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'job\', \'replica\', \'task\', \'device_type\', \'device_index\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "from_string"
-    argspec: "args=[\'spec\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "merge_from"
-    argspec: "args=[\'self\', \'dev\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "parse_from_string"
-    argspec: "args=[\'self\', \'spec\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "to_string"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt b/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
deleted file mode 100644
index a9ab27719b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
+++ /dev/null
@@ -1,25 +0,0 @@
-path: "tensorflow.Dimension"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.tensor_shape.Dimension\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "value"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "assert_is_compatible_with"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_compatible_with"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "merge_with"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
deleted file mode 100644
index 9bf8c12428..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
+++ /dev/null
@@ -1,112 +0,0 @@
-path: "tensorflow.Event"
-tf_class {
-  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FILE_VERSION_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GRAPH_DEF_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "LOG_MESSAGE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "META_GRAPH_DEF_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SESSION_LOG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STEP_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SUMMARY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "WALL_TIME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
deleted file mode 100644
index 72cc532447..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
+++ /dev/null
@@ -1,62 +0,0 @@
-path: "tensorflow.FIFOQueue"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.FIFOQueue\'>"
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dtypes"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "names"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shapes"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'fifo_queue\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "dequeue"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_many"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_up_to"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue_many"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "from_list"
-    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
deleted file mode 100644
index 6933814a7b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
+++ /dev/null
@@ -1,27 +0,0 @@
-path: "tensorflow.FixedLenFeature"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "default_value"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shape"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
deleted file mode 100644
index c538787951..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
+++ /dev/null
@@ -1,31 +0,0 @@
-path: "tensorflow.FixedLenSequenceFeature"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "allow_missing"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "default_value"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shape"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
deleted file mode 100644
index e7e36e2bb3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.FixedLengthRecordReader"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.io_ops.FixedLengthRecordReader\'>"
-  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "reader_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "supports_serialize"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'record_bytes\', \'header_bytes\', \'footer_bytes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "num_records_produced"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_work_units_completed"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_up_to"
-    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reset"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "restore_state"
-    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "serialize_state"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
deleted file mode 100644
index 48cda623f7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
+++ /dev/null
@@ -1,104 +0,0 @@
-path: "tensorflow.GPUOptions"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GPUOptions\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "ALLOCATOR_TYPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ALLOW_GROWTH_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DEFERRED_DELETION_BYTES_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "POLLING_ACTIVE_DELAY_USECS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "POLLING_INACTIVE_DELAY_MSECS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VISIBLE_DEVICE_LIST_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
deleted file mode 100644
index 1495e847cb..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
+++ /dev/null
@@ -1,92 +0,0 @@
-path: "tensorflow.GraphDef"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.graph_pb2.GraphDef\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "LIBRARY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NODE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VERSIONS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VERSION_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
deleted file mode 100644
index ef2cfe3787..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
+++ /dev/null
@@ -1,136 +0,0 @@
-path: "tensorflow.GraphKeys"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.ops.GraphKeys\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "ACTIVATIONS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "ASSET_FILEPATHS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "BIASES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "CONCATENATED_VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "COND_CONTEXT"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "EVAL_STEP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "GLOBAL_STEP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "GLOBAL_VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "INIT_OP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "LOCAL_INIT_OP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "LOCAL_RESOURCES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "LOCAL_VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "LOSSES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "MODEL_VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "MOVING_AVERAGE_VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "QUEUE_RUNNERS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "READY_FOR_LOCAL_INIT_OP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "READY_OP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "REGULARIZATION_LOSSES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "RESOURCES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "SAVEABLE_OBJECTS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "SAVERS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "SUMMARIES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "SUMMARY_OP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "TABLE_INITIALIZERS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "TRAINABLE_RESOURCE_VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "TRAINABLE_VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "TRAIN_OP"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "UPDATE_OPS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "VARIABLES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "WEIGHTS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "WHILE_CONTEXT"
-    mtype: "<type \'str\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
deleted file mode 100644
index 0844f891ca..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
+++ /dev/null
@@ -1,112 +0,0 @@
-path: "tensorflow.GraphOptions"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GraphOptions\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "BUILD_COST_MODEL_AFTER_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "BUILD_COST_MODEL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "ENABLE_BFLOAT16_SENDRECV_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ENABLE_RECV_SCHEDULING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "INFER_SHAPES_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OPTIMIZER_OPTIONS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "PLACE_PRUNED_GRAPH_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "REWRITE_OPTIONS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TIMELINE_STEP_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
deleted file mode 100644
index 566456a255..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
+++ /dev/null
@@ -1,129 +0,0 @@
-path: "tensorflow.Graph"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.ops.Graph\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "building_function"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "finalized"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph_def_versions"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "seed"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "version"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "add_to_collection"
-    argspec: "args=[\'self\', \'name\', \'value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "add_to_collections"
-    argspec: "args=[\'self\', \'names\', \'value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_default"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_graph_def"
-    argspec: "args=[\'self\', \'from_version\', \'add_shapes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
-  }
-  member_method {
-    name: "as_graph_element"
-    argspec: "args=[\'self\', \'obj\', \'allow_tensor\', \'allow_operation\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
-  }
-  member_method {
-    name: "clear_collection"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "colocate_with"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "container"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "control_dependencies"
-    argspec: "args=[\'self\', \'control_inputs\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "create_op"
-    argspec: "args=[\'self\', \'op_type\', \'inputs\', \'dtypes\', \'input_types\', \'name\', \'attrs\', \'op_def\', \'compute_shapes\', \'compute_device\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'True\'], "
-  }
-  member_method {
-    name: "device"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "finalize"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_all_collection_keys"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_collection"
-    argspec: "args=[\'self\', \'name\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_collection_ref"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_operation_by_name"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_operations"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_tensor_by_name"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "gradient_override_map"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "is_feedable"
-    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_fetchable"
-    argspec: "args=[\'self\', \'tensor_or_op\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "name_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "prevent_feeding"
-    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "prevent_fetching"
-    argspec: "args=[\'self\', \'op\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "unique_name"
-    argspec: "args=[\'self\', \'name\', \'mark_as_used\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
deleted file mode 100644
index 2567d2fe60..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
+++ /dev/null
@@ -1,104 +0,0 @@
-path: "tensorflow.HistogramProto"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.HistogramProto\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "BUCKET_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "BUCKET_LIMIT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "MAX_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "MIN_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NUM_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SUM_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SUM_SQUARES_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
deleted file mode 100644
index 2eda320d63..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.IdentityReader"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.io_ops.IdentityReader\'>"
-  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "reader_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "supports_serialize"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_records_produced"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_work_units_completed"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_up_to"
-    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reset"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "restore_state"
-    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "serialize_state"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt b/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
deleted file mode 100644
index fee84d8530..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
+++ /dev/null
@@ -1,42 +0,0 @@
-path: "tensorflow.IndexedSlices"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.ops.IndexedSlices\'>"
-  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dense_shape"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "device"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "indices"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "values"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'values\', \'indices\', \'dense_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
deleted file mode 100644
index 623f4b1a27..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
+++ /dev/null
@@ -1,43 +0,0 @@
-path: "tensorflow.InteractiveSession"
-tf_class {
-  is_instance: "<class \'tensorflow.python.client.session.InteractiveSession\'>"
-  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
-  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "sess_str"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "as_default"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "partial_run"
-    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "partial_run_setup"
-    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "run"
-    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
deleted file mode 100644
index a43c5eb7e3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
+++ /dev/null
@@ -1,112 +0,0 @@
-path: "tensorflow.LogMessage"
-tf_class {
-  is_instance: "<class \'tensorflow.core.util.event_pb2.LogMessage\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DEBUGGING"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "ERROR"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FATAL"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "INFO"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "LEVEL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Level"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member {
-    name: "MESSAGE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "UNKNOWN"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "WARN"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
deleted file mode 100644
index 2750bd780c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.NameAttrList.AttrEntry"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrEntry\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "KEY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
deleted file mode 100644
index d10faf67d0..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
+++ /dev/null
@@ -1,88 +0,0 @@
-path: "tensorflow.NameAttrList"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.NameAttrList\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "ATTR_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "AttrEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
deleted file mode 100644
index b1b62d60f1..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.NodeDef.AttrEntry"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.AttrEntry\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "KEY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
deleted file mode 100644
index b812b4df2b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
+++ /dev/null
@@ -1,100 +0,0 @@
-path: "tensorflow.NodeDef"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.NodeDef\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "ATTR_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "AttrEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "DEVICE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "INPUT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OP_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
deleted file mode 100644
index 7e59615534..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
+++ /dev/null
@@ -1,29 +0,0 @@
-path: "tensorflow.OpError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
deleted file mode 100644
index 0f43a49ee9..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
+++ /dev/null
@@ -1,65 +0,0 @@
-path: "tensorflow.Operation"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.ops.Operation\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "control_inputs"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "device"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "inputs"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "outputs"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "traceback"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "type"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'g\', \'inputs\', \'output_types\', \'control_inputs\', \'input_types\', \'original_op\', \'op_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "colocation_groups"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_attr"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "run"
-    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "values"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
deleted file mode 100644
index 5dd1ee47c9..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
+++ /dev/null
@@ -1,128 +0,0 @@
-path: "tensorflow.OptimizerOptions"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.OptimizerOptions\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DEFAULT"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "DO_COMMON_SUBEXPRESSION_ELIMINATION_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DO_CONSTANT_FOLDING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DO_FUNCTION_INLINING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "GLOBAL_JIT_LEVEL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GlobalJitLevel"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member {
-    name: "L0"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "L1"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Level"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member {
-    name: "OFF"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ON_1"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ON_2"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OPT_LEVEL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
deleted file mode 100644
index 1bfe723ce7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
+++ /dev/null
@@ -1,62 +0,0 @@
-path: "tensorflow.PaddingFIFOQueue"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PaddingFIFOQueue\'>"
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dtypes"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "names"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shapes"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'padding_fifo_queue\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "dequeue"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_many"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_up_to"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue_many"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "from_list"
-    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
deleted file mode 100644
index dbe25f3a5b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
+++ /dev/null
@@ -1,62 +0,0 @@
-path: "tensorflow.PriorityQueue"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PriorityQueue\'>"
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dtypes"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "names"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shapes"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'capacity\', \'types\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'priority_queue\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "dequeue"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_many"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_up_to"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue_many"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "from_list"
-    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
deleted file mode 100644
index 9263d73a51..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
+++ /dev/null
@@ -1,61 +0,0 @@
-path: "tensorflow.QueueBase"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dtypes"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "names"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shapes"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dtypes\', \'shapes\', \'names\', \'queue_ref\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "dequeue"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_many"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_up_to"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue_many"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "from_list"
-    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
deleted file mode 100644
index ec783ffe5a..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
+++ /dev/null
@@ -1,62 +0,0 @@
-path: "tensorflow.RandomShuffleQueue"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.RandomShuffleQueue\'>"
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dtypes"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "names"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shapes"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'capacity\', \'min_after_dequeue\', \'dtypes\', \'shapes\', \'names\', \'seed\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'random_shuffle_queue\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "dequeue"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_many"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequeue_up_to"
-    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "enqueue_many"
-    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "from_list"
-    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
deleted file mode 100644
index f6a3ce76a1..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
+++ /dev/null
@@ -1,45 +0,0 @@
-path: "tensorflow.ReaderBase"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "reader_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "supports_serialize"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'reader_ref\', \'supports_serialize\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "num_records_produced"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_work_units_completed"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_up_to"
-    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reset"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "restore_state"
-    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "serialize_state"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt b/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
deleted file mode 100644
index 4d6e4137d1..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
+++ /dev/null
@@ -1,9 +0,0 @@
-path: "tensorflow.RegisterGradient"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.ops.RegisterGradient\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'op_type\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
deleted file mode 100644
index 85a53c3074..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
+++ /dev/null
@@ -1,108 +0,0 @@
-path: "tensorflow.RewriterConfig"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.rewriter_config_pb2.RewriterConfig\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CONSTANT_FOLDING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "DISABLE_MODEL_PRUNING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "MANUAL"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "MEMORY_OPTIMIZATION_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "MemOptType"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member {
-    name: "NO_MEM_OPT"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OPTIMIZERS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OPTIMIZE_TENSOR_LAYOUT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
deleted file mode 100644
index 808fa0fa21..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
+++ /dev/null
@@ -1,88 +0,0 @@
-path: "tensorflow.RunMetadata"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunMetadata\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "COST_GRAPH_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "PARTITION_GRAPHS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STEP_STATS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
deleted file mode 100644
index 5ad6804a78..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
+++ /dev/null
@@ -1,116 +0,0 @@
-path: "tensorflow.RunOptions"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunOptions\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DEBUG_OPTIONS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FULL_TRACE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "HARDWARE_TRACE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "INTER_OP_THREAD_POOL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NO_TRACE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OUTPUT_PARTITION_GRAPHS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SOFTWARE_TRACE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TIMEOUT_IN_MS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TRACE_LEVEL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TraceLevel"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
deleted file mode 100644
index ec66d7f335..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
+++ /dev/null
@@ -1,108 +0,0 @@
-path: "tensorflow.SessionLog"
-tf_class {
-  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CHECKPOINT"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "CHECKPOINT_PATH_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "MSG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "START"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STATUS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STATUS_UNSPECIFIED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STOP"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SessionStatus"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
deleted file mode 100644
index f5c597548f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
+++ /dev/null
@@ -1,47 +0,0 @@
-path: "tensorflow.Session"
-tf_class {
-  is_instance: "<class \'tensorflow.python.client.session.Session\'>"
-  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
-  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "sess_str"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "as_default"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "partial_run"
-    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "partial_run_setup"
-    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reset"
-    argspec: "args=[\'target\', \'containers\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "run"
-    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
deleted file mode 100644
index 2260279ad2..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.SparseConditionalAccumulator"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.SparseConditionalAccumulator\'>"
-  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "accumulator_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'sparse_conditional_accumulator\'], "
-  }
-  member_method {
-    name: "apply_grad"
-    argspec: "args=[\'self\', \'grad_indices\', \'grad_values\', \'grad_shape\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
-  }
-  member_method {
-    name: "apply_indexed_slices_grad"
-    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
-  }
-  member_method {
-    name: "num_accumulated"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "set_global_step"
-    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "take_grad"
-    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "take_indexed_slices_grad"
-    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
deleted file mode 100644
index d875394fb5..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
+++ /dev/null
@@ -1,35 +0,0 @@
-path: "tensorflow.SparseFeature"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "already_sorted"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "index_key"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "size"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "value_key"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
deleted file mode 100644
index d33fd4d5d7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
+++ /dev/null
@@ -1,26 +0,0 @@
-path: "tensorflow.SparseTensorValue"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensorValue\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "dense_shape"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "indices"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "values"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
deleted file mode 100644
index eac236d498..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.SparseTensor"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensor\'>"
-  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dense_shape"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "indices"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "values"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'indices\', \'values\', \'dense_shape\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "eval"
-    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "from_value"
-    argspec: "args=[\'cls\', \'sparse_tensor_value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_shape"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
deleted file mode 100644
index 781010d75e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
+++ /dev/null
@@ -1,96 +0,0 @@
-path: "tensorflow.Summary.Audio"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CONTENT_TYPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "LENGTH_FRAMES_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NUM_CHANNELS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SAMPLE_RATE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
deleted file mode 100644
index feb9c7ee92..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
+++ /dev/null
@@ -1,92 +0,0 @@
-path: "tensorflow.Summary.Image"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "COLORSPACE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "HEIGHT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "WIDTH_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
deleted file mode 100644
index d02fb9ecd4..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
+++ /dev/null
@@ -1,108 +0,0 @@
-path: "tensorflow.Summary.Value"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "AUDIO_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "HISTO_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "IMAGE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NODE_NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SIMPLE_VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TAG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TENSOR_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
deleted file mode 100644
index 38de17fa9e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
+++ /dev/null
@@ -1,92 +0,0 @@
-path: "tensorflow.Summary"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "Audio"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "Image"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Value"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
deleted file mode 100644
index cdf7937391..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.TFRecordReader"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.io_ops.TFRecordReader\'>"
-  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "reader_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "supports_serialize"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'name\', \'options\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "num_records_produced"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_work_units_completed"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_up_to"
-    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reset"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "restore_state"
-    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "serialize_state"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
deleted file mode 100644
index a0fad4df52..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
+++ /dev/null
@@ -1,69 +0,0 @@
-path: "tensorflow.TensorArray"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.tensor_array_ops.TensorArray\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "flow"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "handle"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dtype\', \'size\', \'dynamic_size\', \'clear_after_read\', \'tensor_array_name\', \'handle\', \'flow\', \'infer_shape\', \'element_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "concat"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "gather"
-    argspec: "args=[\'self\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "grad"
-    argspec: "args=[\'self\', \'source\', \'flow\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "identity"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'index\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "scatter"
-    argspec: "args=[\'self\', \'indices\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "split"
-    argspec: "args=[\'self\', \'value\', \'lengths\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "stack"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "unstack"
-    argspec: "args=[\'self\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "write"
-    argspec: "args=[\'self\', \'index\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
deleted file mode 100644
index 87632fb7b9..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
+++ /dev/null
@@ -1,88 +0,0 @@
-path: "tensorflow.TensorInfo"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.TensorInfo\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "DTYPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TENSOR_SHAPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
deleted file mode 100644
index d5b9cb8f5e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
+++ /dev/null
@@ -1,73 +0,0 @@
-path: "tensorflow.TensorShape"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.tensor_shape.TensorShape\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "dims"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "ndims"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dims\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_list"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_proto"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "assert_has_rank"
-    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "assert_is_compatible_with"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "assert_is_fully_defined"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "assert_same_rank"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "concatenate"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_compatible_with"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_fully_defined"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "merge_with"
-    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "num_elements"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "with_rank"
-    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "with_rank_at_least"
-    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "with_rank_at_most"
-    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
deleted file mode 100644
index 38d19bb537..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
+++ /dev/null
@@ -1,58 +0,0 @@
-path: "tensorflow.Tensor"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.ops.Tensor\'>"
-  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "OVERLOADABLE_OPERATORS"
-    mtype: "<type \'set\'>"
-  }
-  member {
-    name: "device"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shape"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "value_index"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'op\', \'value_index\', \'dtype\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "consumers"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "eval"
-    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "get_shape"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_shape"
-    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
deleted file mode 100644
index e9779f0762..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.TextLineReader"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.io_ops.TextLineReader\'>"
-  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "reader_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "supports_serialize"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'skip_header_lines\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "num_records_produced"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_work_units_completed"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_up_to"
-    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reset"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "restore_state"
-    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "serialize_state"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
deleted file mode 100644
index 54b66f43f8..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
+++ /dev/null
@@ -1,19 +0,0 @@
-path: "tensorflow.VarLenFeature"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
-  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
deleted file mode 100644
index c9b2dfd677..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
+++ /dev/null
@@ -1,97 +0,0 @@
-path: "tensorflow.VariableScope"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.variable_scope.VariableScope\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "caching_device"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "custom_getter"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "initializer"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "original_name_scope"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "partitioner"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "regularizer"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "reuse"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "use_resource"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'reuse\', \'name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'name_scope\', \'dtype\', \'use_resource\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\', \'None\', \'None\', \'None\', \'\', \"<dtype: \'float32\'>\", \'None\'], "
-  }
-  member_method {
-    name: "get_collection"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_variable"
-    argspec: "args=[\'self\', \'var_store\', \'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'reuse\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "global_variables"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "reuse_variables"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_caching_device"
-    argspec: "args=[\'self\', \'caching_device\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_custom_getter"
-    argspec: "args=[\'self\', \'custom_getter\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_dtype"
-    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_initializer"
-    argspec: "args=[\'self\', \'initializer\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_partitioner"
-    argspec: "args=[\'self\', \'partitioner\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_regularizer"
-    argspec: "args=[\'self\', \'regularizer\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_use_resource"
-    argspec: "args=[\'self\', \'use_resource\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "trainable_variables"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
deleted file mode 100644
index ac3ccd468b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
+++ /dev/null
@@ -1,17 +0,0 @@
-path: "tensorflow.Variable.SaveSliceInfo"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.variables.SaveSliceInfo\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "spec"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'full_name\', \'full_shape\', \'var_offset\', \'var_shape\', \'save_slice_info_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "to_proto"
-    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
deleted file mode 100644
index d67a2713f7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
+++ /dev/null
@@ -1,101 +0,0 @@
-path: "tensorflow.Variable"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.variables.Variable\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "SaveSliceInfo"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "device"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "initial_value"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "initializer"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "shape"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'initial_value\', \'trainable\', \'collections\', \'validate_shape\', \'caching_device\', \'name\', \'variable_def\', \'dtype\', \'expected_shape\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'True\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assign"
-    argspec: "args=[\'self\', \'value\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "assign_add"
-    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "assign_sub"
-    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "count_up_to"
-    argspec: "args=[\'self\', \'limit\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "eval"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "from_proto"
-    argspec: "args=[\'variable_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_shape"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "initialized_value"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "load"
-    argspec: "args=[\'self\', \'value\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_value"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "scatter_sub"
-    argspec: "args=[\'self\', \'sparse_delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "set_shape"
-    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "to_proto"
-    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "value"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
deleted file mode 100644
index 4ac759891c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.WholeFileReader"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.io_ops.WholeFileReader\'>"
-  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "reader_ref"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "supports_serialize"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_records_produced"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "num_work_units_completed"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_up_to"
-    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reset"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "restore_state"
-    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "serialize_state"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.app.pbtxt b/tensorflow/tools/api/golden/tensorflow.app.pbtxt
deleted file mode 100644
index 85044a8987..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.app.pbtxt
+++ /dev/null
@@ -1,11 +0,0 @@
-path: "tensorflow.app"
-tf_module {
-  member {
-    name: "flags"
-    mtype: "<type \'module\'>"
-  }
-  member_method {
-    name: "run"
-    argspec: "args=[\'main\', \'argv\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.compat.pbtxt b/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
deleted file mode 100644
index ccc6031400..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
+++ /dev/null
@@ -1,35 +0,0 @@
-path: "tensorflow.compat"
-tf_module {
-  member {
-    name: "bytes_or_text_types"
-    mtype: "<type \'tuple\'>"
-  }
-  member {
-    name: "complex_types"
-    mtype: "<type \'tuple\'>"
-  }
-  member {
-    name: "integral_types"
-    mtype: "<type \'tuple\'>"
-  }
-  member {
-    name: "real_types"
-    mtype: "<type \'tuple\'>"
-  }
-  member_method {
-    name: "as_bytes"
-    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
-  }
-  member_method {
-    name: "as_str"
-    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
-  }
-  member_method {
-    name: "as_str_any"
-    argspec: "args=[\'value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_text"
-    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
deleted file mode 100644
index d34bfe5147..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.constant_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Constant\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'value\', \'dtype\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'0\', \"<dtype: \'float32\'>\", \'False\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
deleted file mode 100644
index ea9186b0b9..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.AbortedError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.AbortedError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
deleted file mode 100644
index 4e155081dd..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.AlreadyExistsError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.AlreadyExistsError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
deleted file mode 100644
index b02a0e023a..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.CancelledError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.CancelledError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
deleted file mode 100644
index c1fa66342a..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.DataLossError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.DataLossError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
deleted file mode 100644
index 8e03793619..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.DeadlineExceededError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.DeadlineExceededError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
deleted file mode 100644
index 384d4b534c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.FailedPreconditionError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.FailedPreconditionError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
deleted file mode 100644
index ac5c4d7879..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.InternalError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.InternalError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
deleted file mode 100644
index 161edd4a7c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.InvalidArgumentError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.InvalidArgumentError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
deleted file mode 100644
index 1e64730ac6..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.NotFoundError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.NotFoundError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
deleted file mode 100644
index b1f14c0457..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
+++ /dev/null
@@ -1,29 +0,0 @@
-path: "tensorflow.errors.OpError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
deleted file mode 100644
index 6365e47286..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.OutOfRangeError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OutOfRangeError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
deleted file mode 100644
index dc8a66f9ea..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.PermissionDeniedError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.PermissionDeniedError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
deleted file mode 100644
index 85bb384b46..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.ResourceExhaustedError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.ResourceExhaustedError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
deleted file mode 100644
index d57d7ac2f2..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.UnauthenticatedError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnauthenticatedError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
deleted file mode 100644
index cc33e6ed8d..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.UnavailableError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnavailableError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
deleted file mode 100644
index b8c2e22dbd..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.UnimplementedError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnimplementedError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
deleted file mode 100644
index 8ffcfae95b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.errors.UnknownError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnknownError\'>"
-  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
-  is_instance: "<type \'exceptions.Exception\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "error_code"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "node_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=[\'2\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
deleted file mode 100644
index 0ad1c19603..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
+++ /dev/null
@@ -1,151 +0,0 @@
-path: "tensorflow.errors"
-tf_module {
-  member {
-    name: "ABORTED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ALREADY_EXISTS"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "AbortedError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "AlreadyExistsError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "CANCELLED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "CancelledError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "DATA_LOSS"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DEADLINE_EXCEEDED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DataLossError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "DeadlineExceededError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "FAILED_PRECONDITION"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "FailedPreconditionError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "INTERNAL"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "INVALID_ARGUMENT"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "InternalError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "InvalidArgumentError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "NOT_FOUND"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NotFoundError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "OK"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OUT_OF_RANGE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OpError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "OutOfRangeError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "PERMISSION_DENIED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "PermissionDeniedError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "RESOURCE_EXHAUSTED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ResourceExhaustedError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "UNAUTHENTICATED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "UNAVAILABLE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "UNIMPLEMENTED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "UNKNOWN"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "UnauthenticatedError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "UnavailableError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "UnimplementedError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "UnknownError"
-    mtype: "<type \'type\'>"
-  }
-  member_method {
-    name: "error_code_from_exception_type"
-    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "exception_type_from_error_code"
-    argspec: "args=[\'error_code\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "raise_exception_on_not_ok_status"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
deleted file mode 100644
index 5dbfe21726..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
+++ /dev/null
@@ -1,47 +0,0 @@
-path: "tensorflow.estimator.EstimatorSpec"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
-  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "eval_metric_ops"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "export_outputs"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "loss"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "predictions"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "scaffold"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "train_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "training_chief_hooks"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "training_hooks"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
deleted file mode 100644
index 7a769fd546..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
+++ /dev/null
@@ -1,37 +0,0 @@
-path: "tensorflow.estimator.Estimator"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.estimator.Estimator\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "config"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "model_dir"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "params"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'model_fn\', \'model_dir\', \'config\', \'params\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "evaluate"
-    argspec: "args=[\'self\', \'input_fn\', \'steps\', \'hooks\', \'checkpoint_path\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "export_savedmodel"
-    argspec: "args=[\'self\', \'export_dir_base\', \'serving_input_receiver_fn\', \'assets_extra\', \'as_text\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "predict"
-    argspec: "args=[\'self\', \'input_fn\', \'predict_keys\', \'hooks\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "train"
-    argspec: "args=[\'self\', \'input_fn\', \'hooks\', \'steps\', \'max_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
deleted file mode 100644
index 6a1c24fa63..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
+++ /dev/null
@@ -1,20 +0,0 @@
-path: "tensorflow.estimator.ModeKeys"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.model_fn.ModeKeys\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "EVAL"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "PREDICT"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "TRAIN"
-    mtype: "<type \'str\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
deleted file mode 100644
index 8fd991a317..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
+++ /dev/null
@@ -1,68 +0,0 @@
-path: "tensorflow.estimator.RunConfig"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.run_config.RunConfig\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "cluster_spec"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "evaluation_master"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_chief"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "keep_checkpoint_every_n_hours"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "keep_checkpoint_max"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "master"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "num_ps_replicas"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "num_worker_replicas"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "save_checkpoints_secs"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "save_checkpoints_steps"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "save_summary_steps"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "session_config"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "task_id"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "task_type"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "tf_random_seed"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
deleted file mode 100644
index 3cf7af8da9..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
+++ /dev/null
@@ -1,14 +0,0 @@
-path: "tensorflow.estimator.export.ClassificationOutput.__metaclass__"
-tf_class {
-  is_instance: "<class \'abc.ABCMeta\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "mro"
-  }
-  member_method {
-    name: "register"
-    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
deleted file mode 100644
index 2df1840c4a..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
+++ /dev/null
@@ -1,22 +0,0 @@
-path: "tensorflow.estimator.export.ClassificationOutput"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ClassificationOutput\'>"
-  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "classes"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "scores"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'scores\', \'classes\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "as_signature_def"
-    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
deleted file mode 100644
index 5d165ccbf9..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
+++ /dev/null
@@ -1,14 +0,0 @@
-path: "tensorflow.estimator.export.ExportOutput.__metaclass__"
-tf_class {
-  is_instance: "<class \'abc.ABCMeta\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "mro"
-  }
-  member_method {
-    name: "register"
-    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
deleted file mode 100644
index fa62e8ced8..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
+++ /dev/null
@@ -1,12 +0,0 @@
-path: "tensorflow.estimator.export.ExportOutput"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "as_signature_def"
-    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
deleted file mode 100644
index 743495ba98..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
+++ /dev/null
@@ -1,14 +0,0 @@
-path: "tensorflow.estimator.export.PredictOutput.__metaclass__"
-tf_class {
-  is_instance: "<class \'abc.ABCMeta\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "mro"
-  }
-  member_method {
-    name: "register"
-    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
deleted file mode 100644
index e0160b10ce..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
+++ /dev/null
@@ -1,18 +0,0 @@
-path: "tensorflow.estimator.export.PredictOutput"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.export.export_output.PredictOutput\'>"
-  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "outputs"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'outputs\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_signature_def"
-    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
deleted file mode 100644
index dbf4e3dec8..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
+++ /dev/null
@@ -1,14 +0,0 @@
-path: "tensorflow.estimator.export.RegressionOutput.__metaclass__"
-tf_class {
-  is_instance: "<class \'abc.ABCMeta\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "mro"
-  }
-  member_method {
-    name: "register"
-    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
deleted file mode 100644
index 905f0e0553..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
+++ /dev/null
@@ -1,18 +0,0 @@
-path: "tensorflow.estimator.export.RegressionOutput"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.export.export_output.RegressionOutput\'>"
-  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "value"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_signature_def"
-    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
deleted file mode 100644
index 0d9e044308..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
+++ /dev/null
@@ -1,23 +0,0 @@
-path: "tensorflow.estimator.export.ServingInputReceiver"
-tf_class {
-  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
-  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "features"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "receiver_tensors"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
deleted file mode 100644
index 4d0dddb3bc..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
+++ /dev/null
@@ -1,31 +0,0 @@
-path: "tensorflow.estimator.export"
-tf_module {
-  member {
-    name: "ClassificationOutput"
-    mtype: "<class \'abc.ABCMeta\'>"
-  }
-  member {
-    name: "ExportOutput"
-    mtype: "<class \'abc.ABCMeta\'>"
-  }
-  member {
-    name: "PredictOutput"
-    mtype: "<class \'abc.ABCMeta\'>"
-  }
-  member {
-    name: "RegressionOutput"
-    mtype: "<class \'abc.ABCMeta\'>"
-  }
-  member {
-    name: "ServingInputReceiver"
-    mtype: "<type \'type\'>"
-  }
-  member_method {
-    name: "build_parsing_serving_input_receiver_fn"
-    argspec: "args=[\'feature_spec\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "build_raw_serving_input_receiver_fn"
-    argspec: "args=[\'features\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
deleted file mode 100644
index b318fea1f8..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
+++ /dev/null
@@ -1,11 +0,0 @@
-path: "tensorflow.estimator.inputs"
-tf_module {
-  member_method {
-    name: "numpy_input_fn"
-    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\'], "
-  }
-  member_method {
-    name: "pandas_input_fn"
-    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\', \'target_column\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\', \'target\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
deleted file mode 100644
index 0d5dc73271..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
+++ /dev/null
@@ -1,27 +0,0 @@
-path: "tensorflow.estimator"
-tf_module {
-  member {
-    name: "Estimator"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "EstimatorSpec"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ModeKeys"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "RunConfig"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "export"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "inputs"
-    mtype: "<type \'module\'>"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
deleted file mode 100644
index 41497dc869..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
+++ /dev/null
@@ -1,58 +0,0 @@
-path: "tensorflow.gfile.FastGFile"
-tf_class {
-  is_instance: "<class \'tensorflow.python.platform.gfile.FastGFile\'>"
-  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "mode"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "flush"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "next"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
-  }
-  member_method {
-    name: "readline"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "readlines"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "seek"
-    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "tell"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "write"
-    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
deleted file mode 100644
index bab0f279b2..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
+++ /dev/null
@@ -1,58 +0,0 @@
-path: "tensorflow.gfile.GFile"
-tf_class {
-  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
-  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "mode"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "flush"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "next"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
-  }
-  member_method {
-    name: "readline"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "readlines"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "seek"
-    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "tell"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "write"
-    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
deleted file mode 100644
index 86e577c19a..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
+++ /dev/null
@@ -1,58 +0,0 @@
-path: "tensorflow.gfile.Open"
-tf_class {
-  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
-  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "mode"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "flush"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "next"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "read"
-    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
-  }
-  member_method {
-    name: "readline"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "readlines"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "seek"
-    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "tell"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "write"
-    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
deleted file mode 100644
index 65b55a8b7c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
+++ /dev/null
@@ -1,63 +0,0 @@
-path: "tensorflow.gfile"
-tf_module {
-  member {
-    name: "FastGFile"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "GFile"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Open"
-    mtype: "<type \'type\'>"
-  }
-  member_method {
-    name: "Copy"
-    argspec: "args=[\'oldpath\', \'newpath\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "DeleteRecursively"
-    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "Exists"
-    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "Glob"
-    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "IsDirectory"
-    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "ListDirectory"
-    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "MakeDirs"
-    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "MkDir"
-    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "Remove"
-    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "Rename"
-    argspec: "args=[\'oldname\', \'newname\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "Stat"
-    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "Walk"
-    argspec: "args=[\'top\', \'in_order\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt b/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
deleted file mode 100644
index 76a2df757e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
+++ /dev/null
@@ -1,23 +0,0 @@
-path: "tensorflow.graph_util"
-tf_module {
-  member_method {
-    name: "convert_variables_to_constants"
-    argspec: "args=[\'sess\', \'input_graph_def\', \'output_node_names\', \'variable_names_whitelist\', \'variable_names_blacklist\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "extract_sub_graph"
-    argspec: "args=[\'graph_def\', \'dest_nodes\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "must_run_on_cpu"
-    argspec: "args=[\'node\', \'pin_variables_on_cpu\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "remove_training_nodes"
-    argspec: "args=[\'input_graph\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "tensor_shape_from_node_def_name"
-    argspec: "args=[\'graph\', \'input_name\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
deleted file mode 100644
index dbc360b13e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
+++ /dev/null
@@ -1,24 +0,0 @@
-path: "tensorflow.image.ResizeMethod"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.image_ops_impl.ResizeMethod\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "AREA"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "BICUBIC"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "BILINEAR"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NEAREST_NEIGHBOR"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
deleted file mode 100644
index 6002f36bac..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.image.pbtxt
+++ /dev/null
@@ -1,175 +0,0 @@
-path: "tensorflow.image"
-tf_module {
-  member {
-    name: "ResizeMethod"
-    mtype: "<type \'type\'>"
-  }
-  member_method {
-    name: "adjust_brightness"
-    argspec: "args=[\'image\', \'delta\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "adjust_contrast"
-    argspec: "args=[\'images\', \'contrast_factor\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "adjust_gamma"
-    argspec: "args=[\'image\', \'gamma\', \'gain\'], varargs=None, keywords=None, defaults=[\'1\', \'1\'], "
-  }
-  member_method {
-    name: "adjust_hue"
-    argspec: "args=[\'image\', \'delta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "adjust_saturation"
-    argspec: "args=[\'image\', \'saturation_factor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "central_crop"
-    argspec: "args=[\'image\', \'central_fraction\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "convert_image_dtype"
-    argspec: "args=[\'image\', \'dtype\', \'saturate\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "crop_and_resize"
-    argspec: "args=[\'image\', \'boxes\', \'box_ind\', \'crop_size\', \'method\', \'extrapolation_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "crop_to_bounding_box"
-    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "decode_gif"
-    argspec: "args=[\'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "decode_image"
-    argspec: "args=[\'contents\', \'channels\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "decode_jpeg"
-    argspec: "args=[\'contents\', \'channels\', \'ratio\', \'fancy_upscaling\', \'try_recover_truncated\', \'acceptable_fraction\', \'dct_method\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "decode_png"
-    argspec: "args=[\'contents\', \'channels\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "draw_bounding_boxes"
-    argspec: "args=[\'images\', \'boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "encode_jpeg"
-    argspec: "args=[\'image\', \'format\', \'quality\', \'progressive\', \'optimize_size\', \'chroma_downsampling\', \'density_unit\', \'x_density\', \'y_density\', \'xmp_metadata\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "encode_png"
-    argspec: "args=[\'image\', \'compression\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "extract_glimpse"
-    argspec: "args=[\'input\', \'size\', \'offsets\', \'centered\', \'normalized\', \'uniform_noise\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "flip_left_right"
-    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "flip_up_down"
-    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "grayscale_to_rgb"
-    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "hsv_to_rgb"
-    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "non_max_suppression"
-    argspec: "args=[\'boxes\', \'scores\', \'max_output_size\', \'iou_threshold\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "pad_to_bounding_box"
-    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "per_image_standardization"
-    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "random_brightness"
-    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "random_contrast"
-    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "random_flip_left_right"
-    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "random_flip_up_down"
-    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "random_hue"
-    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "random_saturation"
-    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "resize_area"
-    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "resize_bicubic"
-    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "resize_bilinear"
-    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "resize_image_with_crop_or_pad"
-    argspec: "args=[\'image\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "resize_images"
-    argspec: "args=[\'images\', \'size\', \'method\', \'align_corners\'], varargs=None, keywords=None, defaults=[\'0\', \'False\'], "
-  }
-  member_method {
-    name: "resize_nearest_neighbor"
-    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "rgb_to_grayscale"
-    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "rgb_to_hsv"
-    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "rot90"
-    argspec: "args=[\'image\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\'], "
-  }
-  member_method {
-    name: "sample_distorted_bounding_box"
-    argspec: "args=[\'image_size\', \'bounding_boxes\', \'seed\', \'seed2\', \'min_object_covered\', \'aspect_ratio_range\', \'area_range\', \'max_attempts\', \'use_image_if_no_bounding_boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "total_variation"
-    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "transpose_image"
-    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
deleted file mode 100644
index 6ca38e259b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
+++ /dev/null
@@ -1,59 +0,0 @@
-path: "tensorflow.layers"
-tf_module {
-  member_method {
-    name: "average_pooling1d"
-    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
-  }
-  member_method {
-    name: "average_pooling2d"
-    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
-  }
-  member_method {
-    name: "average_pooling3d"
-    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
-  }
-  member_method {
-    name: "batch_normalization"
-    argspec: "args=[\'inputs\', \'axis\', \'momentum\', \'epsilon\', \'center\', \'scale\', \'beta_initializer\', \'gamma_initializer\', \'moving_mean_initializer\', \'moving_variance_initializer\', \'beta_regularizer\', \'gamma_regularizer\', \'training\', \'trainable\', \'name\', \'reuse\', \'renorm\', \'renorm_clipping\', \'renorm_momentum\'], varargs=None, keywords=None, defaults=[\'-1\', \'0.99\', \'0.001\', \'True\', \'True\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'None\', \'None\', \'False\', \'True\', \'None\', \'None\', \'False\', \'None\', \'0.99\'], "
-  }
-  member_method {
-    name: "conv1d"
-    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'1\', \'valid\', \'channels_last\', \'1\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv2d"
-    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv2d_transpose"
-    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv3d"
-    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1, 1)\', \'valid\', \'channels_last\', \'(1, 1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "dense"
-    argspec: "args=[\'inputs\', \'units\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "dropout"
-    argspec: "args=[\'inputs\', \'rate\', \'noise_shape\', \'seed\', \'training\', \'name\'], varargs=None, keywords=None, defaults=[\'0.5\', \'None\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "max_pooling1d"
-    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
-  }
-  member_method {
-    name: "max_pooling2d"
-    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
-  }
-  member_method {
-    name: "max_pooling3d"
-    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
-  }
-  member_method {
-    name: "separable_conv2d"
-    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'depth_multiplier\', \'activation\', \'use_bias\', \'depthwise_initializer\', \'pointwise_initializer\', \'bias_initializer\', \'depthwise_regularizer\', \'pointwise_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'1\', \'None\', \'True\', \'None\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.logging.pbtxt b/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
deleted file mode 100644
index 85bb15455d..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
+++ /dev/null
@@ -1,83 +0,0 @@
-path: "tensorflow.logging"
-tf_module {
-  member {
-    name: "DEBUG"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ERROR"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "FATAL"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "INFO"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "WARN"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "TaskLevelStatusMessage"
-    argspec: "args=[\'msg\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "debug"
-    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "error"
-    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "fatal"
-    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "flush"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_verbosity"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "info"
-    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "log"
-    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "log_every_n"
-    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "log_first_n"
-    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "log_if"
-    argspec: "args=[\'level\', \'msg\', \'condition\'], varargs=args, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_verbosity"
-    argspec: "args=[\'v\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "vlog"
-    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "warn"
-    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "warning"
-    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
deleted file mode 100644
index 5477ac5817..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
+++ /dev/null
@@ -1,63 +0,0 @@
-path: "tensorflow.losses"
-tf_module {
-  member_method {
-    name: "absolute_difference"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "add_loss"
-    argspec: "args=[\'loss\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'losses\'], "
-  }
-  member_method {
-    name: "compute_weighted_loss"
-    argspec: "args=[\'losses\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "cosine_distance"
-    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'1.0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "get_losses"
-    argspec: "args=[\'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'losses\'], "
-  }
-  member_method {
-    name: "get_regularization_loss"
-    argspec: "args=[\'scope\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'total_regularization_loss\'], "
-  }
-  member_method {
-    name: "get_regularization_losses"
-    argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_total_loss"
-    argspec: "args=[\'add_regularization_losses\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'total_loss\'], "
-  }
-  member_method {
-    name: "hinge_loss"
-    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "log_loss"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'epsilon\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1e-07\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "mean_pairwise_squared_error"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "mean_squared_error"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "sigmoid_cross_entropy"
-    argspec: "args=[\'multi_class_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "softmax_cross_entropy"
-    argspec: "args=[\'onehot_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
-  }
-  member_method {
-    name: "sparse_softmax_cross_entropy"
-    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt b/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
deleted file mode 100644
index 262d11c38e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
+++ /dev/null
@@ -1,99 +0,0 @@
-path: "tensorflow.metrics"
-tf_module {
-  member_method {
-    name: "accuracy"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "auc"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'curve\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'ROC\', \'None\'], "
-  }
-  member_method {
-    name: "false_negatives"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "false_positives"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean"
-    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean_absolute_error"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean_cosine_distance"
-    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean_iou"
-    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean_per_class_accuracy"
-    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean_relative_error"
-    argspec: "args=[\'labels\', \'predictions\', \'normalizer\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean_squared_error"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "mean_tensor"
-    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "percentage_below"
-    argspec: "args=[\'values\', \'threshold\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "precision"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "precision_at_thresholds"
-    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "recall"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "recall_at_k"
-    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "recall_at_thresholds"
-    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "root_mean_squared_error"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "sensitivity_at_specificity"
-    argspec: "args=[\'labels\', \'predictions\', \'specificity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_average_precision_at_k"
-    argspec: "args=[\'labels\', \'predictions\', \'k\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_precision_at_k"
-    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "specificity_at_sensitivity"
-    argspec: "args=[\'labels\', \'predictions\', \'sensitivity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "true_positives"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
deleted file mode 100644
index 192ceac2dd..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
+++ /dev/null
@@ -1,323 +0,0 @@
-path: "tensorflow.nn"
-tf_module {
-  member_method {
-    name: "all_candidate_sampler"
-    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "atrous_conv2d"
-    argspec: "args=[\'value\', \'filters\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "atrous_conv2d_transpose"
-    argspec: "args=[\'value\', \'filters\', \'output_shape\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "avg_pool"
-    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
-  }
-  member_method {
-    name: "avg_pool3d"
-    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "batch_norm_with_global_normalization"
-    argspec: "args=[\'t\', \'m\', \'v\', \'beta\', \'gamma\', \'variance_epsilon\', \'scale_after_normalization\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "batch_normalization"
-    argspec: "args=[\'x\', \'mean\', \'variance\', \'offset\', \'scale\', \'variance_epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "bias_add"
-    argspec: "args=[\'value\', \'bias\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "bidirectional_dynamic_rnn"
-    argspec: "args=[\'cell_fw\', \'cell_bw\', \'inputs\', \'sequence_length\', \'initial_state_fw\', \'initial_state_bw\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "compute_accidental_hits"
-    argspec: "args=[\'true_classes\', \'sampled_candidates\', \'num_true\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv1d"
-    argspec: "args=[\'value\', \'filters\', \'stride\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv2d"
-    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv2d_backprop_filter"
-    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv2d_backprop_input"
-    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv2d_transpose"
-    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'NHWC\', \'None\'], "
-  }
-  member_method {
-    name: "conv3d"
-    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv3d_backprop_filter_v2"
-    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "conv3d_transpose"
-    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "convolution"
-    argspec: "args=[\'input\', \'filter\', \'padding\', \'strides\', \'dilation_rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "crelu"
-    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ctc_beam_search_decoder"
-    argspec: "args=[\'inputs\', \'sequence_length\', \'beam_width\', \'top_paths\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'100\', \'1\', \'True\'], "
-  }
-  member_method {
-    name: "ctc_greedy_decoder"
-    argspec: "args=[\'inputs\', \'sequence_length\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-  member_method {
-    name: "ctc_loss"
-    argspec: "args=[\'labels\', \'inputs\', \'sequence_length\', \'preprocess_collapse_repeated\', \'ctc_merge_repeated\', \'time_major\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'True\'], "
-  }
-  member_method {
-    name: "depthwise_conv2d"
-    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "depthwise_conv2d_native"
-    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "depthwise_conv2d_native_backprop_filter"
-    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "depthwise_conv2d_native_backprop_input"
-    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "dilation2d"
-    argspec: "args=[\'input\', \'filter\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dropout"
-    argspec: "args=[\'x\', \'keep_prob\', \'noise_shape\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "dynamic_rnn"
-    argspec: "args=[\'cell\', \'inputs\', \'sequence_length\', \'initial_state\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "elu"
-    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "embedding_lookup"
-    argspec: "args=[\'params\', \'ids\', \'partition_strategy\', \'name\', \'validate_indices\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "embedding_lookup_sparse"
-    argspec: "args=[\'params\', \'sp_ids\', \'sp_weights\', \'partition_strategy\', \'name\', \'combiner\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "erosion2d"
-    argspec: "args=[\'value\', \'kernel\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fixed_unigram_candidate_sampler"
-    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'vocab_file\', \'distortion\', \'num_reserved_ids\', \'num_shards\', \'shard\', \'unigrams\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'\', \'1.0\', \'0\', \'1\', \'0\', \'()\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "fractional_avg_pool"
-    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "fractional_max_pool"
-    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "fused_batch_norm"
-    argspec: "args=[\'x\', \'scale\', \'offset\', \'mean\', \'variance\', \'epsilon\', \'data_format\', \'is_training\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'0.001\', \'NHWC\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "in_top_k"
-    argspec: "args=[\'predictions\', \'targets\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "l2_loss"
-    argspec: "args=[\'t\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "l2_normalize"
-    argspec: "args=[\'x\', \'dim\', \'epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'1e-12\', \'None\'], "
-  }
-  member_method {
-    name: "learned_unigram_candidate_sampler"
-    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "local_response_normalization"
-    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "log_poisson_loss"
-    argspec: "args=[\'targets\', \'log_input\', \'compute_full_loss\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "log_softmax"
-    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
-  }
-  member_method {
-    name: "log_uniform_candidate_sampler"
-    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "lrn"
-    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "max_pool"
-    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
-  }
-  member_method {
-    name: "max_pool3d"
-    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "max_pool_with_argmax"
-    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'Targmax\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "moments"
-    argspec: "args=[\'x\', \'axes\', \'shift\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\'], "
-  }
-  member_method {
-    name: "nce_loss"
-    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'mod\', \'nce_loss\'], "
-  }
-  member_method {
-    name: "normalize_moments"
-    argspec: "args=[\'counts\', \'mean_ss\', \'variance_ss\', \'shift\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "pool"
-    argspec: "args=[\'input\', \'window_shape\', \'pooling_type\', \'padding\', \'dilation_rate\', \'strides\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "quantized_avg_pool"
-    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "quantized_conv2d"
-    argspec: "args=[\'input\', \'filter\', \'min_input\', \'max_input\', \'min_filter\', \'max_filter\', \'strides\', \'padding\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "quantized_max_pool"
-    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "quantized_relu_x"
-    argspec: "args=[\'features\', \'max_value\', \'min_features\', \'max_features\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "raw_rnn"
-    argspec: "args=[\'cell\', \'loop_fn\', \'parallel_iterations\', \'swap_memory\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "relu"
-    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "relu6"
-    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "relu_layer"
-    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sampled_softmax_loss"
-    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'True\', \'mod\', \'sampled_softmax_loss\'], "
-  }
-  member_method {
-    name: "separable_conv2d"
-    argspec: "args=[\'input\', \'depthwise_filter\', \'pointwise_filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "sigmoid"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sigmoid_cross_entropy_with_logits"
-    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "softmax"
-    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
-  }
-  member_method {
-    name: "softmax_cross_entropy_with_logits"
-    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'-1\', \'None\'], "
-  }
-  member_method {
-    name: "softplus"
-    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "softsign"
-    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_softmax_cross_entropy_with_logits"
-    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "sufficient_statistics"
-    argspec: "args=[\'x\', \'axes\', \'shift\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "tanh"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "top_k"
-    argspec: "args=[\'input\', \'k\', \'sorted\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "uniform_candidate_sampler"
-    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "weighted_cross_entropy_with_logits"
-    argspec: "args=[\'targets\', \'logits\', \'pos_weight\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "weighted_moments"
-    argspec: "args=[\'x\', \'axes\', \'frequency_weights\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
-  }
-  member_method {
-    name: "with_space_to_batch"
-    argspec: "args=[\'input\', \'dilation_rate\', \'padding\', \'op\', \'filter_shape\', \'spatial_dims\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "xw_plus_b"
-    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "zero_fraction"
-    argspec: "args=[\'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
deleted file mode 100644
index d84ddc6eb0..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.ones_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Ones\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
deleted file mode 100644
index c8e266e70c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.orthogonal_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Orthogonal\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'gain\', \'dtype\', \'seed\'], varargs=None, keywords=None, defaults=[\'1.0\', \"<dtype: \'float32\'>\", \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
deleted file mode 100644
index 2bcb2dd8f3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ /dev/null
@@ -1,1943 +0,0 @@
-path: "tensorflow"
-tf_module {
-  member {
-    name: "AggregationMethod"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "AttrValue"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "COMPILER_VERSION"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "ConditionalAccumulator"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ConditionalAccumulatorBase"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ConfigProto"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "DType"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "DeviceSpec"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Dimension"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Event"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "FIFOQueue"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "FixedLenFeature"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "FixedLenSequenceFeature"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "FixedLengthRecordReader"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "GIT_VERSION"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "GPUOptions"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "GRAPH_DEF_VERSION"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GRAPH_DEF_VERSION_MIN_CONSUMER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GRAPH_DEF_VERSION_MIN_PRODUCER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Graph"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "GraphDef"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "GraphKeys"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "GraphOptions"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "HistogramProto"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "IdentityReader"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "IndexedSlices"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "InteractiveSession"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "LogMessage"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "NameAttrList"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "NodeDef"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "OpError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Operation"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "OptimizerOptions"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "PaddingFIFOQueue"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "PriorityQueue"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "QUANTIZED_DTYPES"
-    mtype: "<type \'frozenset\'>"
-  }
-  member {
-    name: "QueueBase"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "RandomShuffleQueue"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ReaderBase"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "RegisterGradient"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "RewriterConfig"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "RunMetadata"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "RunOptions"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "Session"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SessionLog"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "SparseConditionalAccumulator"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SparseFeature"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SparseTensor"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SparseTensorValue"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Summary"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "TFRecordReader"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Tensor"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "TensorArray"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "TensorInfo"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "TensorShape"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "TextLineReader"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "VERSION"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "VarLenFeature"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Variable"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "VariableScope"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "WholeFileReader"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "app"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "bfloat16"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "bool"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "compat"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "complex128"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "complex64"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "constant_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "contrib"
-    mtype: "<class \'_LazyContribLoader\'>"
-  }
-  member {
-    name: "double"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "errors"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "estimator"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "flags"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "float16"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "float32"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "float64"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "gfile"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "graph_util"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "half"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "image"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "int16"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "int32"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "int64"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "int8"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "layers"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "logging"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "losses"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "metrics"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "newaxis"
-    mtype: "<type \'NoneType\'>"
-  }
-  member {
-    name: "nn"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "ones_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "orthogonal_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "python_io"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "pywrap_tensorflow"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "qint16"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "qint32"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "qint8"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "quint16"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "quint8"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "random_normal_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "random_uniform_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "resource"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "resource_loader"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "saved_model"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "sdca"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "sets"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "spectral"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "string"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "summary"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "sysconfig"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "test"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "train"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "truncated_normal_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "uint16"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "uint8"
-    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
-  }
-  member {
-    name: "uniform_unit_scaling_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "user_ops"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "zeros_initializer"
-    mtype: "<type \'type\'>"
-  }
-  member_method {
-    name: "Assert"
-    argspec: "args=[\'condition\', \'data\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "NoGradient"
-    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "NotDifferentiable"
-    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "Print"
-    argspec: "args=[\'input_\', \'data\', \'message\', \'first_n\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "abs"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "accumulate_n"
-    argspec: "args=[\'inputs\', \'shape\', \'tensor_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "acos"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "add"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "add_check_numerics_ops"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "add_n"
-    argspec: "args=[\'inputs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "add_to_collection"
-    argspec: "args=[\'name\', \'value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "all_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "arg_max"
-    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "arg_min"
-    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "argmax"
-    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "argmin"
-    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "as_dtype"
-    argspec: "args=[\'type_value\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_string"
-    argspec: "args=[\'input\', \'precision\', \'scientific\', \'shortest\', \'width\', \'fill\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "asin"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "assert_equal"
-    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_greater"
-    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_greater_equal"
-    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_integer"
-    argspec: "args=[\'x\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_less"
-    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_less_equal"
-    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_negative"
-    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_non_negative"
-    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_non_positive"
-    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_none_equal"
-    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_positive"
-    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_proper_iterable"
-    argspec: "args=[\'values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "assert_rank"
-    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_rank_at_least"
-    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_same_float_dtype"
-    argspec: "args=[\'tensors\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_scalar"
-    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "assert_type"
-    argspec: "args=[\'tensor\', \'tf_type\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "assert_variables_initialized"
-    argspec: "args=[\'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "assign"
-    argspec: "args=[\'ref\', \'value\', \'validate_shape\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "assign_add"
-    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "assign_sub"
-    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "atan"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "batch_to_space"
-    argspec: "args=[\'input\', \'crops\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "batch_to_space_nd"
-    argspec: "args=[\'input\', \'block_shape\', \'crops\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "betainc"
-    argspec: "args=[\'a\', \'b\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "bincount"
-    argspec: "args=[\'arr\', \'minlength\', \'maxlength\', \'weights\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \"<dtype: \'int32\'>\"], "
-  }
-  member_method {
-    name: "bitcast"
-    argspec: "args=[\'input\', \'type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "boolean_mask"
-    argspec: "args=[\'tensor\', \'mask\', \'name\'], varargs=None, keywords=None, defaults=[\'boolean_mask\'], "
-  }
-  member_method {
-    name: "broadcast_dynamic_shape"
-    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "broadcast_static_shape"
-    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "case"
-    argspec: "args=[\'pred_fn_pairs\', \'default\', \'exclusive\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'case\'], "
-  }
-  member_method {
-    name: "cast"
-    argspec: "args=[\'x\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ceil"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "check_numerics"
-    argspec: "args=[\'tensor\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "cholesky"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "cholesky_solve"
-    argspec: "args=[\'chol\', \'rhs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "clip_by_average_norm"
-    argspec: "args=[\'t\', \'clip_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "clip_by_global_norm"
-    argspec: "args=[\'t_list\', \'clip_norm\', \'use_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "clip_by_norm"
-    argspec: "args=[\'t\', \'clip_norm\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "clip_by_value"
-    argspec: "args=[\'t\', \'clip_value_min\', \'clip_value_max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "complex"
-    argspec: "args=[\'real\', \'imag\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "concat"
-    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'concat\'], "
-  }
-  member_method {
-    name: "cond"
-    argspec: "args=[\'pred\', \'fn1\', \'fn2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "confusion_matrix"
-    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'dtype\', \'name\', \'weights\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\", \'None\', \'None\'], "
-  }
-  member_method {
-    name: "conj"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "constant"
-    argspec: "args=[\'value\', \'dtype\', \'shape\', \'name\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'Const\', \'False\'], "
-  }
-  member_method {
-    name: "container"
-    argspec: "args=[\'container_name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "control_dependencies"
-    argspec: "args=[\'control_inputs\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "convert_to_tensor"
-    argspec: "args=[\'value\', \'dtype\', \'name\', \'preferred_dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "convert_to_tensor_or_indexed_slices"
-    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "convert_to_tensor_or_sparse_tensor"
-    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "cos"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "count_nonzero"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'dtype\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \"<dtype: \'int64\'>\", \'None\', \'None\'], "
-  }
-  member_method {
-    name: "count_up_to"
-    argspec: "args=[\'ref\', \'limit\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "create_partitioned_variables"
-    argspec: "args=[\'shape\', \'slicing\', \'initializer\', \'dtype\', \'trainable\', \'collections\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'True\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "cross"
-    argspec: "args=[\'a\', \'b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "cumprod"
-    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "cumsum"
-    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "decode_base64"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "decode_csv"
-    argspec: "args=[\'records\', \'record_defaults\', \'field_delim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "decode_json_example"
-    argspec: "args=[\'json_examples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "decode_raw"
-    argspec: "args=[\'bytes\', \'out_type\', \'little_endian\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "delete_session_tensor"
-    argspec: "args=[\'handle\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "depth_to_space"
-    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dequantize"
-    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "deserialize_many_sparse"
-    argspec: "args=[\'serialized_sparse\', \'dtype\', \'rank\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "device"
-    argspec: "args=[\'device_name_or_function\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "diag"
-    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "diag_part"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "digamma"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "div"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "divide"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dynamic_partition"
-    argspec: "args=[\'data\', \'partitions\', \'num_partitions\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "dynamic_stitch"
-    argspec: "args=[\'indices\', \'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "edit_distance"
-    argspec: "args=[\'hypothesis\', \'truth\', \'normalize\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'edit_distance\'], "
-  }
-  member_method {
-    name: "einsum"
-    argspec: "args=[\'equation\'], varargs=inputs, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "encode_base64"
-    argspec: "args=[\'input\', \'pad\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "equal"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "erf"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "erfc"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "exp"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "expand_dims"
-    argspec: "args=[\'input\', \'axis\', \'name\', \'dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "expm1"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "extract_image_patches"
-    argspec: "args=[\'images\', \'ksizes\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "eye"
-    argspec: "args=[\'num_rows\', \'num_columns\', \'batch_shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \"<dtype: \'float32\'>\", \'None\'], "
-  }
-  member_method {
-    name: "fake_quant_with_min_max_args"
-    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "fake_quant_with_min_max_args_gradient"
-    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "fake_quant_with_min_max_vars"
-    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fake_quant_with_min_max_vars_gradient"
-    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fake_quant_with_min_max_vars_per_channel"
-    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fake_quant_with_min_max_vars_per_channel_gradient"
-    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fill"
-    argspec: "args=[\'dims\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fixed_size_partitioner"
-    argspec: "args=[\'num_shards\', \'axis\'], varargs=None, keywords=None, defaults=[\'0\'], "
-  }
-  member_method {
-    name: "floor"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "floor_div"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "floordiv"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "floormod"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "foldl"
-    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "foldr"
-    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "gather"
-    argspec: "args=[\'params\', \'indices\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "gather_nd"
-    argspec: "args=[\'params\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_collection"
-    argspec: "args=[\'key\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_collection_ref"
-    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_default_graph"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_default_session"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_local_variable"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "get_seed"
-    argspec: "args=[\'op_seed\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_session_handle"
-    argspec: "args=[\'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_session_tensor"
-    argspec: "args=[\'handle\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_variable"
-    argspec: "args=[\'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "get_variable_scope"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "global_norm"
-    argspec: "args=[\'t_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "global_variables"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "global_variables_initializer"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "gradients"
-    argspec: "args=[\'ys\', \'xs\', \'grad_ys\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'None\', \'gradients\', \'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "greater"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "greater_equal"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "group"
-    argspec: "args=[], varargs=inputs, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "hessians"
-    argspec: "args=[\'ys\', \'xs\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'hessians\', \'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "histogram_fixed_width"
-    argspec: "args=[\'values\', \'value_range\', \'nbins\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'100\', \"<dtype: \'int32\'>\", \'None\'], "
-  }
-  member_method {
-    name: "identity"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "igamma"
-    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "igammac"
-    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "imag"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "import_graph_def"
-    argspec: "args=[\'graph_def\', \'input_map\', \'return_elements\', \'name\', \'op_dict\', \'producer_op_list\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "initialize_all_tables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "initialize_all_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "initialize_local_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "initialize_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "invert_permutation"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "is_finite"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "is_inf"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "is_nan"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "is_non_decreasing"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "is_numeric_tensor"
-    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_strictly_increasing"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "is_variable_initialized"
-    argspec: "args=[\'variable\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "lbeta"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'lbeta\'], "
-  }
-  member_method {
-    name: "less"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "less_equal"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "lgamma"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "lin_space"
-    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "linspace"
-    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "load_file_system_library"
-    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "load_op_library"
-    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "local_variables"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "local_variables_initializer"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "log"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "log1p"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "logical_and"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "logical_not"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "logical_or"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "logical_xor"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'LogicalXor\'], "
-  }
-  member_method {
-    name: "make_template"
-    argspec: "args=[\'name_\', \'func_\', \'create_scope_now_\', \'unique_name_\', \'custom_getter_\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "map_fn"
-    argspec: "args=[\'fn\', \'elems\', \'dtype\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "matching_files"
-    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "matmul"
-    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'adjoint_a\', \'adjoint_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'False\', \'False\', \'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "matrix_band_part"
-    argspec: "args=[\'input\', \'num_lower\', \'num_upper\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "matrix_determinant"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "matrix_diag"
-    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "matrix_diag_part"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "matrix_inverse"
-    argspec: "args=[\'input\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "matrix_set_diag"
-    argspec: "args=[\'input\', \'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "matrix_solve"
-    argspec: "args=[\'matrix\', \'rhs\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "matrix_solve_ls"
-    argspec: "args=[\'matrix\', \'rhs\', \'l2_regularizer\', \'fast\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "matrix_transpose"
-    argspec: "args=[\'a\', \'name\'], varargs=None, keywords=None, defaults=[\'matrix_transpose\'], "
-  }
-  member_method {
-    name: "matrix_triangular_solve"
-    argspec: "args=[\'matrix\', \'rhs\', \'lower\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "maximum"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "meshgrid"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "min_max_variable_partitioner"
-    argspec: "args=[\'max_partitions\', \'axis\', \'min_slice_size\', \'bytes_per_string_element\'], varargs=None, keywords=None, defaults=[\'1\', \'0\', \'262144\', \'16\'], "
-  }
-  member_method {
-    name: "minimum"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "mod"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "model_variables"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "moving_average_variables"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "multinomial"
-    argspec: "args=[\'logits\', \'num_samples\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "multiply"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "name_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "negative"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "no_op"
-    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "no_regularizer"
-    argspec: "args=[\'_\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "norm"
-    argspec: "args=[\'tensor\', \'ord\', \'axis\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'euclidean\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "not_equal"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "one_hot"
-    argspec: "args=[\'indices\', \'depth\', \'on_value\', \'off_value\', \'axis\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "ones"
-    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
-  }
-  member_method {
-    name: "ones_like"
-    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
-  }
-  member_method {
-    name: "op_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "pad"
-    argspec: "args=[\'tensor\', \'paddings\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'CONSTANT\', \'None\'], "
-  }
-  member_method {
-    name: "parallel_stack"
-    argspec: "args=[\'values\', \'name\'], varargs=None, keywords=None, defaults=[\'parallel_stack\'], "
-  }
-  member_method {
-    name: "parse_example"
-    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "parse_single_example"
-    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "parse_single_sequence_example"
-    argspec: "args=[\'serialized\', \'context_features\', \'sequence_features\', \'example_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "parse_tensor"
-    argspec: "args=[\'serialized\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "placeholder"
-    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "placeholder_with_default"
-    argspec: "args=[\'input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "polygamma"
-    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "pow"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "py_func"
-    argspec: "args=[\'func\', \'inp\', \'Tout\', \'stateful\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'None\'], "
-  }
-  member_method {
-    name: "qr"
-    argspec: "args=[\'input\', \'full_matrices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "quantize_v2"
-    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'T\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "quantized_concat"
-    argspec: "args=[\'concat_dim\', \'values\', \'input_mins\', \'input_maxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "random_crop"
-    argspec: "args=[\'value\', \'size\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "random_gamma"
-    argspec: "args=[\'shape\', \'alpha\', \'beta\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
-  }
-  member_method {
-    name: "random_normal"
-    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
-  }
-  member_method {
-    name: "random_poisson"
-    argspec: "args=[\'lam\', \'shape\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\', \'None\'], "
-  }
-  member_method {
-    name: "random_shuffle"
-    argspec: "args=[\'value\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "random_uniform"
-    argspec: "args=[\'shape\', \'minval\', \'maxval\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
-  }
-  member_method {
-    name: "range"
-    argspec: "args=[\'start\', \'limit\', \'delta\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'range\'], "
-  }
-  member_method {
-    name: "rank"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "read_file"
-    argspec: "args=[\'filename\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "real"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "realdiv"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reciprocal"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reduce_all"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_any"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_join"
-    argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_logsumexp"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_max"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_mean"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_min"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_prod"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reduce_sum"
-    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "register_tensor_conversion_function"
-    argspec: "args=[\'base_type\', \'conversion_func\', \'priority\'], varargs=None, keywords=None, defaults=[\'100\'], "
-  }
-  member_method {
-    name: "report_uninitialized_variables"
-    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'report_uninitialized_variables\'], "
-  }
-  member_method {
-    name: "required_space_to_batch_paddings"
-    argspec: "args=[\'input_shape\', \'block_shape\', \'base_paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "reset_default_graph"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "reshape"
-    argspec: "args=[\'tensor\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reverse"
-    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "reverse_sequence"
-    argspec: "args=[\'input\', \'seq_lengths\', \'seq_axis\', \'batch_axis\', \'name\', \'seq_dim\', \'batch_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "reverse_v2"
-    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "rint"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "round"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "rsqrt"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "saturate_cast"
-    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "scalar_mul"
-    argspec: "args=[\'scalar\', \'x\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "scan"
-    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_add"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_div"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_mul"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_nd"
-    argspec: "args=[\'indices\', \'updates\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "scatter_nd_add"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_nd_sub"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_nd_update"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_sub"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "scatter_update"
-    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "segment_max"
-    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "segment_mean"
-    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "segment_min"
-    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "segment_prod"
-    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "segment_sum"
-    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "self_adjoint_eig"
-    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "self_adjoint_eigvals"
-    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sequence_mask"
-    argspec: "args=[\'lengths\', \'maxlen\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'bool\'>\", \'None\'], "
-  }
-  member_method {
-    name: "serialize_many_sparse"
-    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "serialize_sparse"
-    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "set_random_seed"
-    argspec: "args=[\'seed\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "setdiff1d"
-    argspec: "args=[\'x\', \'y\', \'index_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'int32\'>\", \'None\'], "
-  }
-  member_method {
-    name: "shape"
-    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
-  }
-  member_method {
-    name: "shape_n"
-    argspec: "args=[\'input\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "sigmoid"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sign"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sin"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "size"
-    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
-  }
-  member_method {
-    name: "slice"
-    argspec: "args=[\'input_\', \'begin\', \'size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "space_to_batch"
-    argspec: "args=[\'input\', \'paddings\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "space_to_batch_nd"
-    argspec: "args=[\'input\', \'block_shape\', \'paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "space_to_depth"
-    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_add"
-    argspec: "args=[\'a\', \'b\', \'thresh\'], varargs=None, keywords=None, defaults=[\'0\'], "
-  }
-  member_method {
-    name: "sparse_concat"
-    argspec: "args=[\'axis\', \'sp_inputs\', \'name\', \'expand_nonconcat_dim\', \'concat_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_fill_empty_rows"
-    argspec: "args=[\'sp_input\', \'default_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_mask"
-    argspec: "args=[\'a\', \'mask_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_matmul"
-    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_maximum"
-    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_merge"
-    argspec: "args=[\'sp_ids\', \'sp_values\', \'vocab_size\', \'name\', \'already_sorted\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
-  }
-  member_method {
-    name: "sparse_minimum"
-    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_placeholder"
-    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_reduce_sum"
-    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_reduce_sum_sparse"
-    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_reorder"
-    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_reset_shape"
-    argspec: "args=[\'sp_input\', \'new_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_reshape"
-    argspec: "args=[\'sp_input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_retain"
-    argspec: "args=[\'sp_input\', \'to_retain\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "sparse_segment_mean"
-    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_segment_sqrt_n"
-    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_segment_sum"
-    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_softmax"
-    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_split"
-    argspec: "args=[\'keyword_required\', \'sp_input\', \'num_split\', \'axis\', \'name\', \'split_dim\'], varargs=None, keywords=None, defaults=[\'KeywordRequired()\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_tensor_dense_matmul"
-    argspec: "args=[\'sp_a\', \'b\', \'adjoint_a\', \'adjoint_b\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_tensor_to_dense"
-    argspec: "args=[\'sp_input\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_to_dense"
-    argspec: "args=[\'sparse_indices\', \'output_shape\', \'sparse_values\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "sparse_to_indicator"
-    argspec: "args=[\'sp_input\', \'vocab_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "sparse_transpose"
-    argspec: "args=[\'sp_input\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "split"
-    argspec: "args=[\'value\', \'num_or_size_splits\', \'axis\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'split\'], "
-  }
-  member_method {
-    name: "sqrt"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "square"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "squared_difference"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "squeeze"
-    argspec: "args=[\'input\', \'axis\', \'name\', \'squeeze_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "stack"
-    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'stack\'], "
-  }
-  member_method {
-    name: "stop_gradient"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "strided_slice"
-    argspec: "args=[\'input_\', \'begin\', \'end\', \'strides\', \'begin_mask\', \'end_mask\', \'ellipsis_mask\', \'new_axis_mask\', \'shrink_axis_mask\', \'var\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'0\', \'0\', \'0\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "string_join"
-    argspec: "args=[\'inputs\', \'separator\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "string_split"
-    argspec: "args=[\'source\', \'delimiter\'], varargs=None, keywords=None, defaults=[\' \'], "
-  }
-  member_method {
-    name: "string_to_hash_bucket"
-    argspec: "args=[\'string_tensor\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "string_to_hash_bucket_fast"
-    argspec: "args=[\'input\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "string_to_hash_bucket_strong"
-    argspec: "args=[\'input\', \'num_buckets\', \'key\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "string_to_number"
-    argspec: "args=[\'string_tensor\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "substr"
-    argspec: "args=[\'input\', \'pos\', \'len\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "subtract"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "svd"
-    argspec: "args=[\'tensor\', \'full_matrices\', \'compute_uv\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'None\'], "
-  }
-  member_method {
-    name: "tables_initializer"
-    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'init_all_tables\'], "
-  }
-  member_method {
-    name: "tan"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "tanh"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "tensordot"
-    argspec: "args=[\'a\', \'b\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "tile"
-    argspec: "args=[\'input\', \'multiples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "to_bfloat16"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToBFloat16\'], "
-  }
-  member_method {
-    name: "to_double"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToDouble\'], "
-  }
-  member_method {
-    name: "to_float"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToFloat\'], "
-  }
-  member_method {
-    name: "to_int32"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt32\'], "
-  }
-  member_method {
-    name: "to_int64"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt64\'], "
-  }
-  member_method {
-    name: "trace"
-    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "trainable_variables"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "transpose"
-    argspec: "args=[\'a\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'transpose\'], "
-  }
-  member_method {
-    name: "truediv"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "truncated_normal"
-    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
-  }
-  member_method {
-    name: "truncatediv"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "truncatemod"
-    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "tuple"
-    argspec: "args=[\'tensors\', \'name\', \'control_inputs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "unique"
-    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "unique_with_counts"
-    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "unsorted_segment_max"
-    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "unsorted_segment_sum"
-    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "unstack"
-    argspec: "args=[\'value\', \'num\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'unstack\'], "
-  }
-  member_method {
-    name: "variable_axis_size_partitioner"
-    argspec: "args=[\'max_shard_bytes\', \'axis\', \'bytes_per_string_element\', \'max_shards\'], varargs=None, keywords=None, defaults=[\'0\', \'16\', \'None\'], "
-  }
-  member_method {
-    name: "variable_op_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "variable_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "variables_initializer"
-    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], "
-  }
-  member_method {
-    name: "verify_tensor_all_finite"
-    argspec: "args=[\'t\', \'msg\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "where"
-    argspec: "args=[\'condition\', \'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "while_loop"
-    argspec: "args=[\'cond\', \'body\', \'loop_vars\', \'shape_invariants\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "write_file"
-    argspec: "args=[\'filename\', \'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "zeros"
-    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
-  }
-  member_method {
-    name: "zeros_like"
-    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
-  }
-  member_method {
-    name: "zeta"
-    argspec: "args=[\'x\', \'q\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
deleted file mode 100644
index 4941dda50e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
+++ /dev/null
@@ -1,20 +0,0 @@
-path: "tensorflow.python_io.TFRecordCompressionType"
-tf_class {
-  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordCompressionType\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GZIP"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "ZLIB"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
deleted file mode 100644
index 0853716023..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
+++ /dev/null
@@ -1,17 +0,0 @@
-path: "tensorflow.python_io.TFRecordOptions"
-tf_class {
-  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordOptions\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "compression_type_map"
-    mtype: "<type \'dict\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'compression_type\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_compression_type_string"
-    argspec: "args=[\'cls\', \'options\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
deleted file mode 100644
index af0c11ca14..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
+++ /dev/null
@@ -1,17 +0,0 @@
-path: "tensorflow.python_io.TFRecordWriter"
-tf_class {
-  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordWriter\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "write"
-    argspec: "args=[\'self\', \'record\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
deleted file mode 100644
index 7c9953e5fe..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
+++ /dev/null
@@ -1,19 +0,0 @@
-path: "tensorflow.python_io"
-tf_module {
-  member {
-    name: "TFRecordCompressionType"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "TFRecordOptions"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "TFRecordWriter"
-    mtype: "<type \'type\'>"
-  }
-  member_method {
-    name: "tf_record_iterator"
-    argspec: "args=[\'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
deleted file mode 100644
index 70308bc601..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.random_normal_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomNormal\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
deleted file mode 100644
index 37bb1956e8..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.random_uniform_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomUniform\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'minval\', \'maxval\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'None\', \"<dtype: \'float32\'>\"], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
deleted file mode 100644
index 288b78b4cd..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
+++ /dev/null
@@ -1,23 +0,0 @@
-path: "tensorflow.resource_loader"
-tf_module {
-  member_method {
-    name: "get_data_files_path"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_path_to_datafile"
-    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_root_dir_with_all_resources"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "load_resource"
-    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "readahead_file_path"
-    argspec: "args=[\'path\', \'readahead\'], varargs=None, keywords=None, defaults=[\'128M\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
deleted file mode 100644
index 56d76902fd..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
+++ /dev/null
@@ -1,21 +0,0 @@
-path: "tensorflow.saved_model.builder.SavedModelBuilder"
-tf_class {
-  is_instance: "<class \'tensorflow.python.saved_model.builder_impl.SavedModelBuilder\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'export_dir\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "add_meta_graph"
-    argspec: "args=[\'self\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "add_meta_graph_and_variables"
-    argspec: "args=[\'self\', \'sess\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "save"
-    argspec: "args=[\'self\', \'as_text\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
deleted file mode 100644
index adc697ad1c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
+++ /dev/null
@@ -1,7 +0,0 @@
-path: "tensorflow.saved_model.builder"
-tf_module {
-  member {
-    name: "SavedModelBuilder"
-    mtype: "<type \'type\'>"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
deleted file mode 100644
index 20e10aa094..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
+++ /dev/null
@@ -1,39 +0,0 @@
-path: "tensorflow.saved_model.constants"
-tf_module {
-  member {
-    name: "ASSETS_DIRECTORY"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "ASSETS_KEY"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "LEGACY_INIT_OP_KEY"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "MAIN_OP_KEY"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "SAVED_MODEL_FILENAME_PB"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "SAVED_MODEL_FILENAME_PBTXT"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "SAVED_MODEL_SCHEMA_VERSION"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VARIABLES_DIRECTORY"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "VARIABLES_FILENAME"
-    mtype: "<type \'str\'>"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
deleted file mode 100644
index 896e2160c6..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
+++ /dev/null
@@ -1,11 +0,0 @@
-path: "tensorflow.saved_model.loader"
-tf_module {
-  member_method {
-    name: "load"
-    argspec: "args=[\'sess\', \'tags\', \'export_dir\'], varargs=None, keywords=saver_kwargs, defaults=None"
-  }
-  member_method {
-    name: "maybe_saved_model_directory"
-    argspec: "args=[\'export_dir\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
deleted file mode 100644
index 176cb788c2..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
+++ /dev/null
@@ -1,11 +0,0 @@
-path: "tensorflow.saved_model.main_op"
-tf_module {
-  member_method {
-    name: "main_op"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "main_op_with_restore"
-    argspec: "args=[\'restore_op_name\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
deleted file mode 100644
index 5683766b28..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
+++ /dev/null
@@ -1,35 +0,0 @@
-path: "tensorflow.saved_model"
-tf_module {
-  member {
-    name: "builder"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "constants"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "loader"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "main_op"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "signature_constants"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "signature_def_utils"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "tag_constants"
-    mtype: "<type \'module\'>"
-  }
-  member {
-    name: "utils"
-    mtype: "<type \'module\'>"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
deleted file mode 100644
index 478d410e06..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
+++ /dev/null
@@ -1,47 +0,0 @@
-path: "tensorflow.saved_model.signature_constants"
-tf_module {
-  member {
-    name: "CLASSIFY_INPUTS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "CLASSIFY_METHOD_NAME"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "CLASSIFY_OUTPUT_CLASSES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "CLASSIFY_OUTPUT_SCORES"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "DEFAULT_SERVING_SIGNATURE_DEF_KEY"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "PREDICT_INPUTS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "PREDICT_METHOD_NAME"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "PREDICT_OUTPUTS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "REGRESS_INPUTS"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "REGRESS_METHOD_NAME"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "REGRESS_OUTPUTS"
-    mtype: "<type \'str\'>"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
deleted file mode 100644
index e9867d84c3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
+++ /dev/null
@@ -1,19 +0,0 @@
-path: "tensorflow.saved_model.signature_def_utils"
-tf_module {
-  member_method {
-    name: "build_signature_def"
-    argspec: "args=[\'inputs\', \'outputs\', \'method_name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "classification_signature_def"
-    argspec: "args=[\'examples\', \'classes\', \'scores\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "predict_signature_def"
-    argspec: "args=[\'inputs\', \'outputs\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "regression_signature_def"
-    argspec: "args=[\'examples\', \'predictions\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
deleted file mode 100644
index 7c24b7ad3c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
+++ /dev/null
@@ -1,11 +0,0 @@
-path: "tensorflow.saved_model.tag_constants"
-tf_module {
-  member {
-    name: "SERVING"
-    mtype: "<type \'str\'>"
-  }
-  member {
-    name: "TRAINING"
-    mtype: "<type \'str\'>"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
deleted file mode 100644
index bc150e56a3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
+++ /dev/null
@@ -1,7 +0,0 @@
-path: "tensorflow.saved_model.utils"
-tf_module {
-  member_method {
-    name: "build_tensor_info"
-    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
deleted file mode 100644
index 7c9e6a25c7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
+++ /dev/null
@@ -1,3 +0,0 @@
-path: "tensorflow.sdca"
-tf_module {
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.sets.pbtxt b/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
deleted file mode 100644
index 8a196b1a55..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
+++ /dev/null
@@ -1,19 +0,0 @@
-path: "tensorflow.sets"
-tf_module {
-  member_method {
-    name: "set_difference"
-    argspec: "args=[\'a\', \'b\', \'aminusb\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
-  }
-  member_method {
-    name: "set_intersection"
-    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-  member_method {
-    name: "set_size"
-    argspec: "args=[\'a\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-  member_method {
-    name: "set_union"
-    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt b/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
deleted file mode 100644
index 84883c1a39..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
+++ /dev/null
@@ -1,51 +0,0 @@
-path: "tensorflow.spectral"
-tf_module {
-  member_method {
-    name: "fft"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "irfft"
-    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "irfft2d"
-    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "irfft3d"
-    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "rfft"
-    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "rfft2d"
-    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "rfft3d"
-    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
deleted file mode 100644
index ab3449d80f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
+++ /dev/null
@@ -1,112 +0,0 @@
-path: "tensorflow.summary.Event"
-tf_class {
-  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FILE_VERSION_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GRAPH_DEF_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "LOG_MESSAGE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "META_GRAPH_DEF_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SESSION_LOG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STEP_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SUMMARY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "WALL_TIME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
deleted file mode 100644
index 2a5b63dcea..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
+++ /dev/null
@@ -1,16 +0,0 @@
-path: "tensorflow.summary.FileWriterCache"
-tf_class {
-  is_instance: "<class \'tensorflow.python.summary.writer.writer_cache.FileWriterCache\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "clear"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get"
-    argspec: "args=[\'logdir\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
deleted file mode 100644
index 502c35ee7b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
+++ /dev/null
@@ -1,50 +0,0 @@
-path: "tensorflow.summary.FileWriter"
-tf_class {
-  is_instance: "<class \'tensorflow.python.summary.writer.writer.FileWriter\'>"
-  is_instance: "<class \'tensorflow.python.summary.writer.writer.SummaryToEventTransformer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'logdir\', \'graph\', \'max_queue\', \'flush_secs\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'120\', \'None\'], "
-  }
-  member_method {
-    name: "add_event"
-    argspec: "args=[\'self\', \'event\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "add_graph"
-    argspec: "args=[\'self\', \'graph\', \'global_step\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "add_meta_graph"
-    argspec: "args=[\'self\', \'meta_graph_def\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "add_run_metadata"
-    argspec: "args=[\'self\', \'run_metadata\', \'tag\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "add_session_log"
-    argspec: "args=[\'self\', \'session_log\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "add_summary"
-    argspec: "args=[\'self\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "flush"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_logdir"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "reopen"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
deleted file mode 100644
index 92ca4872ca..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
+++ /dev/null
@@ -1,108 +0,0 @@
-path: "tensorflow.summary.SessionLog"
-tf_class {
-  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CHECKPOINT"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "CHECKPOINT_PATH_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "MSG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "START"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STATUS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STATUS_UNSPECIFIED"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "STOP"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SessionStatus"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
deleted file mode 100644
index f93da2196a..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
+++ /dev/null
@@ -1,80 +0,0 @@
-path: "tensorflow.summary.SummaryDescription"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.SummaryDescription\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "TYPE_HINT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
deleted file mode 100644
index 605e305e82..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
+++ /dev/null
@@ -1,96 +0,0 @@
-path: "tensorflow.summary.Summary.Audio"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CONTENT_TYPE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "LENGTH_FRAMES_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NUM_CHANNELS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SAMPLE_RATE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
deleted file mode 100644
index 0646972196..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
+++ /dev/null
@@ -1,92 +0,0 @@
-path: "tensorflow.summary.Summary.Image"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "COLORSPACE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "HEIGHT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "WIDTH_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
deleted file mode 100644
index 5294b37f57..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
+++ /dev/null
@@ -1,108 +0,0 @@
-path: "tensorflow.summary.Summary.Value"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "AUDIO_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "HISTO_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "IMAGE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "NODE_NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SIMPLE_VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TAG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TENSOR_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
deleted file mode 100644
index 132ef1b7d2..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
+++ /dev/null
@@ -1,92 +0,0 @@
-path: "tensorflow.summary.Summary"
-tf_class {
-  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "Audio"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "Image"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "Value"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
deleted file mode 100644
index 4dce20819d..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.summary.TaggedRunMetadata"
-tf_class {
-  is_instance: "<class \'tensorflow.core.util.event_pb2.TaggedRunMetadata\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "RUN_METADATA_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TAG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
deleted file mode 100644
index c3d0bea10c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
+++ /dev/null
@@ -1,67 +0,0 @@
-path: "tensorflow.summary"
-tf_module {
-  member {
-    name: "Event"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "FileWriter"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "FileWriterCache"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SessionLog"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "Summary"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "SummaryDescription"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "TaggedRunMetadata"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member_method {
-    name: "audio"
-    argspec: "args=[\'name\', \'tensor\', \'sample_rate\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
-  }
-  member_method {
-    name: "get_summary_description"
-    argspec: "args=[\'node_def\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "histogram"
-    argspec: "args=[\'name\', \'values\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "image"
-    argspec: "args=[\'name\', \'tensor\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
-  }
-  member_method {
-    name: "merge"
-    argspec: "args=[\'inputs\', \'collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "merge_all"
-    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=[\'summaries\'], "
-  }
-  member_method {
-    name: "scalar"
-    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "tensor_summary"
-    argspec: "args=[\'name\', \'tensor\', \'summary_description\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "text"
-    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
deleted file mode 100644
index 02dec04b9c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
+++ /dev/null
@@ -1,11 +0,0 @@
-path: "tensorflow.sysconfig"
-tf_module {
-  member_method {
-    name: "get_include"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_lib"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
deleted file mode 100644
index df528e26b6..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
+++ /dev/null
@@ -1,21 +0,0 @@
-path: "tensorflow.test.Benchmark"
-tf_class {
-  is_instance: "<class \'tensorflow.python.platform.benchmark.TensorFlowBenchmark\'>"
-  is_instance: "<class \'tensorflow.python.platform.benchmark.Benchmark\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "is_abstract"
-    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "report_benchmark"
-    argspec: "args=[\'self\', \'iters\', \'cpu_time\', \'wall_time\', \'throughput\', \'extras\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "run_op_benchmark"
-    argspec: "args=[\'self\', \'sess\', \'op_or_tensor\', \'feed_dict\', \'burn_iters\', \'min_iters\', \'store_trace\', \'store_memory_usage\', \'name\', \'extras\', \'mbs\'], varargs=None, keywords=None, defaults=[\'None\', \'2\', \'10\', \'False\', \'True\', \'None\', \'None\', \'0\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
deleted file mode 100644
index c4768a68bf..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.test.pbtxt
+++ /dev/null
@@ -1,51 +0,0 @@
-path: "tensorflow.test"
-tf_module {
-  member {
-    name: "Benchmark"
-    mtype: "<class \'tensorflow.python.platform.benchmark._BenchmarkRegistrar\'>"
-  }
-  member {
-    name: "TestCase"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "mock"
-    mtype: "<type \'module\'>"
-  }
-  member_method {
-    name: "assert_equal_graph_def"
-    argspec: "args=[\'actual\', \'expected\', \'checkpoint_v2\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "compute_gradient"
-    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradient_error"
-    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "get_temp_dir"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "gpu_device_name"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_built_with_cuda"
-    argspec: "args=[], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_gpu_available"
-    argspec: "args=[\'cuda_only\'], varargs=None, keywords=None, defaults=[\'False\'], "
-  }
-  member_method {
-    name: "main"
-    argspec: "args=[\'argv\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "test_src_dir_path"
-    argspec: "args=[\'relative_path\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
deleted file mode 100644
index 8c91c5b4d9..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.AdadeltaOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.adadelta.AdadeltaOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'rho\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.95\', \'1e-08\', \'False\', \'Adadelta\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
deleted file mode 100644
index 05d38d62cc..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.AdagradDAOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.adagrad_da.AdagradDAOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'global_step\', \'initial_gradient_squared_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'AdagradDA\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
deleted file mode 100644
index 19ca9f5763..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.AdagradOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.adagrad.AdagradOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'False\', \'Adagrad\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
deleted file mode 100644
index c8144e2db7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.AdamOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.adam.AdamOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'beta1\', \'beta2\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.9\', \'0.999\', \'1e-08\', \'False\', \'Adam\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
deleted file mode 100644
index 8cf52b817f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
+++ /dev/null
@@ -1,80 +0,0 @@
-path: "tensorflow.train.BytesList"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.BytesList\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
deleted file mode 100644
index c3037baa8c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.CheckpointSaverHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.CheckpointSaverHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'checkpoint_dir\', \'save_secs\', \'save_steps\', \'saver\', \'checkpoint_basename\', \'scaffold\', \'listeners\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'model.ckpt\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
deleted file mode 100644
index abbe273be3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
+++ /dev/null
@@ -1,14 +0,0 @@
-path: "tensorflow.train.ChiefSessionCreator"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.monitored_session.ChiefSessionCreator\'>"
-  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'checkpoint_filename_with_path\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "create_session"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
deleted file mode 100644
index feb73bd7d4..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
+++ /dev/null
@@ -1,80 +0,0 @@
-path: "tensorflow.train.ClusterDef"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ClusterDef\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "JOB_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
deleted file mode 100644
index 1658b15a5f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
+++ /dev/null
@@ -1,37 +0,0 @@
-path: "tensorflow.train.ClusterSpec"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.server_lib.ClusterSpec\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "jobs"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'cluster\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_cluster_def"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "as_dict"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "job_tasks"
-    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "num_tasks"
-    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "task_address"
-    argspec: "args=[\'self\', \'job_name\', \'task_index\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "task_indices"
-    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
deleted file mode 100644
index 11277f077e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
+++ /dev/null
@@ -1,45 +0,0 @@
-path: "tensorflow.train.Coordinator"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.coordinator.Coordinator\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "joined"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'clean_stop_exception_types\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "clear_stop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "join"
-    argspec: "args=[\'self\', \'threads\', \'stop_grace_period_secs\', \'ignore_live_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'120\', \'False\'], "
-  }
-  member_method {
-    name: "raise_requested_exception"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "register_thread"
-    argspec: "args=[\'self\', \'thread\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "request_stop"
-    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "should_stop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "stop_on_exception"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "wait_for_stop"
-    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
deleted file mode 100644
index f7215a2037..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
+++ /dev/null
@@ -1,80 +0,0 @@
-path: "tensorflow.train.Example"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.example_pb2.Example\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FEATURES_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
deleted file mode 100644
index 737acbe07c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
+++ /dev/null
@@ -1,25 +0,0 @@
-path: "tensorflow.train.ExponentialMovingAverage"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.moving_averages.ExponentialMovingAverage\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'decay\', \'num_updates\', \'zero_debias\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'ExponentialMovingAverage\'], "
-  }
-  member_method {
-    name: "apply"
-    argspec: "args=[\'self\', \'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "average"
-    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "average_name"
-    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "variables_to_restore"
-    argspec: "args=[\'self\', \'moving_avg_variables\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
deleted file mode 100644
index 3ad98354d6..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
+++ /dev/null
@@ -1,80 +0,0 @@
-path: "tensorflow.train.FeatureList"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureList\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FEATURE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
deleted file mode 100644
index cd171f4ca3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.train.FeatureLists.FeatureListEntry"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureListEntry\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "KEY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
deleted file mode 100644
index 3d95017d58..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.train.FeatureLists"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureLists\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FEATURE_LIST_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "FeatureListEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
deleted file mode 100644
index 9cca132bba..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
+++ /dev/null
@@ -1,88 +0,0 @@
-path: "tensorflow.train.Feature"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.Feature\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "BYTES_LIST_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FLOAT_LIST_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "INT64_LIST_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
deleted file mode 100644
index 858aee0341..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.train.Features.FeatureEntry"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureEntry\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "KEY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
deleted file mode 100644
index 49cd12153b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.train.Features"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.Features\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FEATURE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "FeatureEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
deleted file mode 100644
index 7bec4d032c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.FeedFnHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FeedFnHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'feed_fn\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
deleted file mode 100644
index 31cf9aaeb2..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
+++ /dev/null
@@ -1,34 +0,0 @@
-path: "tensorflow.train.FinalOpsHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FinalOpsHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "final_ops_values"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'final_ops\', \'final_ops_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
deleted file mode 100644
index e3f01334b5..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
+++ /dev/null
@@ -1,80 +0,0 @@
-path: "tensorflow.train.FloatList"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.FloatList\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
deleted file mode 100644
index 0252474a1d..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.FtrlOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.ftrl.FtrlOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'learning_rate_power\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'-0.5\', \'0.1\', \'0.0\', \'0.0\', \'False\', \'Ftrl\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
deleted file mode 100644
index 147448618e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.GlobalStepWaiterHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.GlobalStepWaiterHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'wait_until_step\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
deleted file mode 100644
index bdd4c52568..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.GradientDescentOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.gradient_descent.GradientDescentOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'GradientDescent\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
deleted file mode 100644
index 8917dc122c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
+++ /dev/null
@@ -1,80 +0,0 @@
-path: "tensorflow.train.Int64List"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.feature_pb2.Int64List\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
deleted file mode 100644
index 2d7fcbe545..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.train.JobDef.TasksEntry"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.TasksEntry\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "KEY_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VALUE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
deleted file mode 100644
index fc5b76341d..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
+++ /dev/null
@@ -1,88 +0,0 @@
-path: "tensorflow.train.JobDef"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.JobDef\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TASKS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TasksEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
deleted file mode 100644
index e55c47b356..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.LoggingTensorHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.LoggingTensorHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'tensors\', \'every_n_iter\', \'every_n_secs\', \'formatter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
deleted file mode 100644
index c61859004e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
+++ /dev/null
@@ -1,73 +0,0 @@
-path: "tensorflow.train.LooperThread"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.coordinator.LooperThread\'>"
-  is_instance: "<class \'threading.Thread\'>"
-  member {
-    name: "daemon"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "ident"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "getName"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "isAlive"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "isDaemon"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "is_alive"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "join"
-    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "loop"
-    argspec: "args=[\'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "run"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "run_loop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "setDaemon"
-    argspec: "args=[\'self\', \'daemonic\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "setName"
-    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "start"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "start_loop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "stop_loop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
deleted file mode 100644
index 7cf5488a15..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.MomentumOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.momentum.MomentumOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'momentum\', \'use_locking\', \'name\', \'use_nesterov\'], varargs=None, keywords=None, defaults=[\'False\', \'Momentum\', \'False\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
deleted file mode 100644
index 3a5cc015b4..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
+++ /dev/null
@@ -1,26 +0,0 @@
-path: "tensorflow.train.MonitoredSession"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.monitored_session.MonitoredSession\'>"
-  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'session_creator\', \'hooks\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'120\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "run"
-    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "should_stop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
deleted file mode 100644
index 25fd5e75a7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
+++ /dev/null
@@ -1,16 +0,0 @@
-path: "tensorflow.train.NanLossDuringTrainingError"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanLossDuringTrainingError\'>"
-  is_instance: "<type \'exceptions.RuntimeError\'>"
-  member {
-    name: "args"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
deleted file mode 100644
index 7d1c89f9b3..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.NanTensorHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanTensorHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'loss_tensor\', \'fail_on_nan_loss\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
deleted file mode 100644
index 20b0c4d1b5..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
+++ /dev/null
@@ -1,45 +0,0 @@
-path: "tensorflow.train.Optimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
deleted file mode 100644
index 571d846b6c..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.ProximalAdagradOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.proximal_adagrad.ProximalAdagradOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'ProximalAdagrad\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
deleted file mode 100644
index 1feb136e7f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.ProximalGradientDescentOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.proximal_gradient_descent.ProximalGradientDescentOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'0.0\', \'False\', \'ProximalGradientDescent\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
deleted file mode 100644
index d84d0058ee..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
+++ /dev/null
@@ -1,49 +0,0 @@
-path: "tensorflow.train.QueueRunner"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "cancel_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "close_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "enqueue_ops"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "exceptions_raised"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue_closed_exception_types"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "create_threads"
-    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
-  }
-  member_method {
-    name: "from_proto"
-    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "to_proto"
-    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
deleted file mode 100644
index 2aa4ae6d2d..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
+++ /dev/null
@@ -1,46 +0,0 @@
-path: "tensorflow.train.RMSPropOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.rmsprop.RMSPropOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'decay\', \'momentum\', \'epsilon\', \'use_locking\', \'centered\', \'name\'], varargs=None, keywords=None, defaults=[\'0.9\', \'0.0\', \'1e-10\', \'False\', \'False\', \'RMSProp\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
deleted file mode 100644
index 84498a64f5..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
+++ /dev/null
@@ -1,120 +0,0 @@
-path: "tensorflow.train.SaverDef"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.saver_pb2.SaverDef\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CheckpointFormatVersion"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FILENAME_TENSOR_NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "KEEP_CHECKPOINT_EVERY_N_HOURS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "LEGACY"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "MAX_TO_KEEP_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "RESTORE_OP_NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SAVE_TENSOR_NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "SHARDED_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "V1"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "V2"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "VERSION_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
deleted file mode 100644
index 7494fe1cc8..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
+++ /dev/null
@@ -1,53 +0,0 @@
-path: "tensorflow.train.Saver"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.saver.Saver\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "last_checkpoints"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'var_list\', \'reshape\', \'sharded\', \'max_to_keep\', \'keep_checkpoint_every_n_hours\', \'name\', \'restore_sequentially\', \'saver_def\', \'builder\', \'defer_build\', \'allow_empty\', \'write_version\', \'pad_step_number\', \'save_relative_paths\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\', \'5\', \'10000.0\', \'None\', \'False\', \'None\', \'None\', \'False\', \'False\', \'2\', \'False\', \'False\'], "
-  }
-  member_method {
-    name: "as_saver_def"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "build"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "export_meta_graph"
-    argspec: "args=[\'self\', \'filename\', \'collection_list\', \'as_text\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\', \'None\', \'False\'], "
-  }
-  member_method {
-    name: "from_proto"
-    argspec: "args=[\'saver_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "recover_last_checkpoints"
-    argspec: "args=[\'self\', \'checkpoint_paths\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "restore"
-    argspec: "args=[\'self\', \'sess\', \'save_path\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "save"
-    argspec: "args=[\'self\', \'sess\', \'save_path\', \'global_step\', \'latest_filename\', \'meta_graph_suffix\', \'write_meta_graph\', \'write_state\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'meta\', \'True\', \'True\'], "
-  }
-  member_method {
-    name: "set_last_checkpoints"
-    argspec: "args=[\'self\', \'last_checkpoints\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "set_last_checkpoints_with_time"
-    argspec: "args=[\'self\', \'last_checkpoints_with_time\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "to_proto"
-    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
deleted file mode 100644
index 21234fe739..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
+++ /dev/null
@@ -1,49 +0,0 @@
-path: "tensorflow.train.Scaffold"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.monitored_session.Scaffold\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "init_feed_dict"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "init_fn"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "init_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "local_init_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "ready_for_local_init_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "ready_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "saver"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "summary_op"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'init_op\', \'init_feed_dict\', \'init_fn\', \'ready_op\', \'ready_for_local_init_op\', \'local_init_op\', \'summary_op\', \'saver\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "finalize"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_or_default"
-    argspec: "args=[\'arg_name\', \'collection_key\', \'default_constructor\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
deleted file mode 100644
index 45528d4e87..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
+++ /dev/null
@@ -1,21 +0,0 @@
-path: "tensorflow.train.SecondOrStepTimer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SecondOrStepTimer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'every_secs\', \'every_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "last_triggered_step"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "should_trigger_for_step"
-    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "update_last_triggered_step"
-    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
deleted file mode 100644
index 9ab9553702..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
+++ /dev/null
@@ -1,84 +0,0 @@
-path: "tensorflow.train.SequenceExample"
-tf_class {
-  is_instance: "<class \'tensorflow.core.example.example_pb2.SequenceExample\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CONTEXT_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "FEATURE_LISTS_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
deleted file mode 100644
index af0a3b73cc..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
+++ /dev/null
@@ -1,96 +0,0 @@
-path: "tensorflow.train.ServerDef"
-tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ServerDef\'>"
-  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
-  member {
-    name: "CLUSTER_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DEFAULT_SESSION_CONFIG_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
-  }
-  member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "JOB_NAME_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "PROTOCOL_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "TASK_INDEX_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "ByteSize"
-  }
-  member_method {
-    name: "Clear"
-  }
-  member_method {
-    name: "ClearExtension"
-  }
-  member_method {
-    name: "ClearField"
-  }
-  member_method {
-    name: "CopyFrom"
-  }
-  member_method {
-    name: "DiscardUnknownFields"
-  }
-  member_method {
-    name: "FindInitializationErrors"
-  }
-  member_method {
-    name: "FromString"
-  }
-  member_method {
-    name: "HasExtension"
-  }
-  member_method {
-    name: "HasField"
-  }
-  member_method {
-    name: "IsInitialized"
-  }
-  member_method {
-    name: "ListFields"
-  }
-  member_method {
-    name: "MergeFrom"
-  }
-  member_method {
-    name: "MergeFromString"
-  }
-  member_method {
-    name: "ParseFromString"
-  }
-  member_method {
-    name: "RegisterExtension"
-  }
-  member_method {
-    name: "SerializePartialToString"
-  }
-  member_method {
-    name: "SerializeToString"
-  }
-  member_method {
-    name: "SetInParent"
-  }
-  member_method {
-    name: "WhichOneof"
-  }
-  member_method {
-    name: "__init__"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
deleted file mode 100644
index 9b8f185f5b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
+++ /dev/null
@@ -1,29 +0,0 @@
-path: "tensorflow.train.Server"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.server_lib.Server\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "server_def"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "target"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'server_or_cluster_def\', \'job_name\', \'task_index\', \'protocol\', \'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\'], "
-  }
-  member_method {
-    name: "create_local_server"
-    argspec: "args=[\'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
-  }
-  member_method {
-    name: "join"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "start"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
deleted file mode 100644
index beb232715f..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
+++ /dev/null
@@ -1,12 +0,0 @@
-path: "tensorflow.train.SessionCreator"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "create_session"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
deleted file mode 100644
index cc31bb4e4b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
+++ /dev/null
@@ -1,21 +0,0 @@
-path: "tensorflow.train.SessionManager"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.session_manager.SessionManager\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'local_init_op\', \'ready_op\', \'ready_for_local_init_op\', \'graph\', \'recovery_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'30\'], "
-  }
-  member_method {
-    name: "prepare_session"
-    argspec: "args=[\'self\', \'master\', \'init_op\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\', \'init_feed_dict\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'7200\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "recover_session"
-    argspec: "args=[\'self\', \'master\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'7200\', \'None\'], "
-  }
-  member_method {
-    name: "wait_for_session"
-    argspec: "args=[\'self\', \'master\', \'config\', \'max_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'inf\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
deleted file mode 100644
index 442990893e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
+++ /dev/null
@@ -1,27 +0,0 @@
-path: "tensorflow.train.SessionRunArgs"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "feed_dict"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "fetches"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "options"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
deleted file mode 100644
index d5adb15c95..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
+++ /dev/null
@@ -1,25 +0,0 @@
-path: "tensorflow.train.SessionRunContext"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunContext\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "original_args"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "session"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "stop_requested"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'original_args\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "request_stop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
deleted file mode 100644
index db1aa24acf..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
+++ /dev/null
@@ -1,28 +0,0 @@
-path: "tensorflow.train.SessionRunHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
deleted file mode 100644
index 0b401d59c4..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
+++ /dev/null
@@ -1,27 +0,0 @@
-path: "tensorflow.train.SessionRunValues"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
-  is_instance: "<type \'tuple\'>"
-  member {
-    name: "options"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "results"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "run_metadata"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "index"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
deleted file mode 100644
index 62bfdab40b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.SingularMonitoredSession"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.monitored_session.SingularMonitoredSession\'>"
-  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "graph"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'hooks\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\', \'None\', \'None\', \'120\'], "
-  }
-  member_method {
-    name: "close"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "raw_session"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "run"
-    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "should_stop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
deleted file mode 100644
index 13261f6dde..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.StepCounterHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StepCounterHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'every_n_steps\', \'every_n_secs\', \'output_dir\', \'summary_writer\'], varargs=None, keywords=None, defaults=[\'100\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
deleted file mode 100644
index e388599b0b..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.StopAtStepHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StopAtStepHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'num_steps\', \'last_step\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
deleted file mode 100644
index 697c3667b0..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
+++ /dev/null
@@ -1,30 +0,0 @@
-path: "tensorflow.train.SummarySaverHook"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SummarySaverHook\'>"
-  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'save_steps\', \'save_secs\', \'output_dir\', \'summary_writer\', \'scaffold\', \'summary_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "after_create_session"
-    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "after_run"
-    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "before_run"
-    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "begin"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "end"
-    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
deleted file mode 100644
index cc9bd5c136..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
+++ /dev/null
@@ -1,153 +0,0 @@
-path: "tensorflow.train.Supervisor"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.supervisor.Supervisor\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "USE_DEFAULT"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "coord"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "global_step"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "init_feed_dict"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "init_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "is_chief"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "ready_for_local_init_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "ready_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "save_model_secs"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "save_path"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "save_summaries_secs"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "saver"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "session_manager"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "summary_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "summary_writer"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "Loop"
-    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "PrepareSession"
-    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
-  }
-  member_method {
-    name: "RequestStop"
-    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ShouldStop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "StartQueueRunners"
-    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "StartStandardServices"
-    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "Stop"
-    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
-  }
-  member_method {
-    name: "StopOnException"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "SummaryComputed"
-    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "WaitForStop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'graph\', \'ready_op\', \'ready_for_local_init_op\', \'is_chief\', \'init_op\', \'init_feed_dict\', \'local_init_op\', \'logdir\', \'summary_op\', \'saver\', \'global_step\', \'save_summaries_secs\', \'save_model_secs\', \'recovery_wait_secs\', \'stop_grace_secs\', \'checkpoint_basename\', \'session_manager\', \'summary_writer\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'True\', \'0\', \'None\', \'0\', \'None\', \'0\', \'0\', \'0\', \'120\', \'600\', \'30\', \'120\', \'model.ckpt\', \'None\', \'0\', \'None\'], "
-  }
-  member_method {
-    name: "loop"
-    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "managed_session"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
-  }
-  member_method {
-    name: "prepare_or_wait_for_session"
-    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
-  }
-  member_method {
-    name: "request_stop"
-    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "should_stop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "start_queue_runners"
-    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "start_standard_services"
-    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "stop"
-    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
-  }
-  member_method {
-    name: "stop_on_exception"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "summary_computed"
-    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "wait_for_stop"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
deleted file mode 100644
index 915d8501af..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
+++ /dev/null
@@ -1,58 +0,0 @@
-path: "tensorflow.train.SyncReplicasOptimizer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.sync_replicas_optimizer.SyncReplicasOptimizer\'>"
-  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "GATE_GRAPH"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_NONE"
-    mtype: "<type \'int\'>"
-  }
-  member {
-    name: "GATE_OP"
-    mtype: "<type \'int\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'opt\', \'replicas_to_aggregate\', \'total_num_replicas\', \'variable_averages\', \'variables_to_average\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'sync_replicas\'], "
-  }
-  member_method {
-    name: "apply_gradients"
-    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "compute_gradients"
-    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "get_chief_queue_runner"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_init_tokens_op"
-    argspec: "args=[\'self\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
-  }
-  member_method {
-    name: "get_name"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_slot"
-    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "get_slot_names"
-    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
-  }
-  member_method {
-    name: "make_session_run_hook"
-    argspec: "args=[\'self\', \'is_chief\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
-  }
-  member_method {
-    name: "minimize"
-    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
deleted file mode 100644
index 140407651a..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
+++ /dev/null
@@ -1,14 +0,0 @@
-path: "tensorflow.train.WorkerSessionCreator"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.monitored_session.WorkerSessionCreator\'>"
-  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\'], "
-  }
-  member_method {
-    name: "create_session"
-    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
deleted file mode 100644
index 86af18f824..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.pbtxt
+++ /dev/null
@@ -1,391 +0,0 @@
-path: "tensorflow.train"
-tf_module {
-  member {
-    name: "AdadeltaOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "AdagradDAOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "AdagradOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "AdamOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "BytesList"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "CheckpointSaverHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ChiefSessionCreator"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ClusterDef"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "ClusterSpec"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Coordinator"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Example"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "ExponentialMovingAverage"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Feature"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "FeatureList"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "FeatureLists"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "Features"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "FeedFnHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "FinalOpsHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "FloatList"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "FtrlOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "GlobalStepWaiterHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "GradientDescentOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Int64List"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "JobDef"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "LoggingTensorHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "LooperThread"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "MomentumOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "MonitoredSession"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "NanLossDuringTrainingError"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "NanTensorHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Optimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ProximalAdagradOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ProximalGradientDescentOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "QueueRunner"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "RMSPropOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Saver"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SaverDef"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "Scaffold"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SecondOrStepTimer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SequenceExample"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "Server"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "ServerDef"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "SessionCreator"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SessionManager"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SessionRunArgs"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SessionRunContext"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SessionRunHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SessionRunValues"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SingularMonitoredSession"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "StepCounterHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "StopAtStepHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SummarySaverHook"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "Supervisor"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "SyncReplicasOptimizer"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "WorkerSessionCreator"
-    mtype: "<type \'type\'>"
-  }
-  member {
-    name: "queue_runner"
-    mtype: "<type \'module\'>"
-  }
-  member_method {
-    name: "MonitoredTrainingSession"
-    argspec: "args=[\'master\', \'is_chief\', \'checkpoint_dir\', \'scaffold\', \'hooks\', \'chief_only_hooks\', \'save_checkpoint_secs\', \'save_summaries_steps\', \'save_summaries_secs\', \'config\', \'stop_grace_period_secs\', \'log_step_count_steps\'], varargs=None, keywords=None, defaults=[\'\', \'True\', \'None\', \'None\', \'None\', \'None\', \'600\', \'100\', \'None\', \'None\', \'120\', \'100\'], "
-  }
-  member_method {
-    name: "NewCheckpointReader"
-    argspec: "args=[\'filepattern\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "add_queue_runner"
-    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
-  }
-  member_method {
-    name: "assert_global_step"
-    argspec: "args=[\'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "basic_train_loop"
-    argspec: "args=[\'supervisor\', \'train_step_fn\', \'args\', \'kwargs\', \'master\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\'], "
-  }
-  member_method {
-    name: "batch"
-    argspec: "args=[\'tensors\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "batch_join"
-    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "checkpoint_exists"
-    argspec: "args=[\'checkpoint_prefix\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "create_global_step"
-    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "do_quantize_training_on_graphdef"
-    argspec: "args=[\'input_graph\', \'num_bits\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "exponential_decay"
-    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "export_meta_graph"
-    argspec: "args=[\'filename\', \'meta_info_def\', \'graph_def\', \'saver_def\', \'collection_list\', \'as_text\', \'graph\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'None\', \'None\', \'False\'], "
-  }
-  member_method {
-    name: "generate_checkpoint_state_proto"
-    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_checkpoint_mtimes"
-    argspec: "args=[\'checkpoint_prefixes\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "get_checkpoint_state"
-    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_global_step"
-    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "get_or_create_global_step"
-    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "global_step"
-    argspec: "args=[\'sess\', \'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "import_meta_graph"
-    argspec: "args=[\'meta_graph_or_file\', \'clear_devices\', \'import_scope\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "input_producer"
-    argspec: "args=[\'input_tensor\', \'element_shape\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'summary_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "inverse_time_decay"
-    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "latest_checkpoint"
-    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "limit_epochs"
-    argspec: "args=[\'tensor\', \'num_epochs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "match_filenames_once"
-    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "maybe_batch"
-    argspec: "args=[\'tensors\', \'keep_input\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "maybe_batch_join"
-    argspec: "args=[\'tensors_list\', \'keep_input\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "maybe_shuffle_batch"
-    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "maybe_shuffle_batch_join"
-    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "natural_exp_decay"
-    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
-  }
-  member_method {
-    name: "piecewise_constant"
-    argspec: "args=[\'x\', \'boundaries\', \'values\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "polynomial_decay"
-    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'end_learning_rate\', \'power\', \'cycle\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0001\', \'1.0\', \'False\', \'None\'], "
-  }
-  member_method {
-    name: "range_input_producer"
-    argspec: "args=[\'limit\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "replica_device_setter"
-    argspec: "args=[\'ps_tasks\', \'ps_device\', \'worker_device\', \'merge_devices\', \'cluster\', \'ps_ops\', \'ps_strategy\'], varargs=None, keywords=None, defaults=[\'0\', \'/job:ps\', \'/job:worker\', \'True\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "shuffle_batch"
-    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "shuffle_batch_join"
-    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "slice_input_producer"
-    argspec: "args=[\'tensor_list\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "start_queue_runners"
-    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
-  }
-  member_method {
-    name: "string_input_producer"
-    argspec: "args=[\'string_tensor\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "summary_iterator"
-    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
-  }
-  member_method {
-    name: "update_checkpoint_state"
-    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
-  }
-  member_method {
-    name: "write_graph"
-    argspec: "args=[\'graph_or_graph_def\', \'logdir\', \'name\', \'as_text\'], varargs=None, keywords=None, defaults=[\'True\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
deleted file mode 100644
index 23d402de30..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
+++ /dev/null
@@ -1,49 +0,0 @@
-path: "tensorflow.train.queue_runner.QueueRunner"
-tf_class {
-  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
-  is_instance: "<type \'object\'>"
-  member {
-    name: "cancel_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "close_op"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "enqueue_ops"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "exceptions_raised"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue"
-    mtype: "<type \'property\'>"
-  }
-  member {
-    name: "queue_closed_exception_types"
-    mtype: "<type \'property\'>"
-  }
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
-  }
-  member_method {
-    name: "create_threads"
-    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
-  }
-  member_method {
-    name: "from_proto"
-    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "to_proto"
-    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
deleted file mode 100644
index 6e2d043049..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
+++ /dev/null
@@ -1,15 +0,0 @@
-path: "tensorflow.train.queue_runner"
-tf_module {
-  member {
-    name: "QueueRunner"
-    mtype: "<type \'type\'>"
-  }
-  member_method {
-    name: "add_queue_runner"
-    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
-  }
-  member_method {
-    name: "start_queue_runners"
-    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
deleted file mode 100644
index 7c48f4af07..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.truncated_normal_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.TruncatedNormal\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
deleted file mode 100644
index 4558db619e..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.uniform_unit_scaling_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.UniformUnitScaling\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'factor\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
-  }
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
deleted file mode 100644
index 8313009a68..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
+++ /dev/null
@@ -1,10 +0,0 @@
-path: "tensorflow.zeros_initializer"
-tf_class {
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Zeros\'>"
-  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
-  is_instance: "<type \'object\'>"
-  member_method {
-    name: "__init__"
-    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
-  }
-}
diff --git a/tensorflow/tools/api/lib/BUILD b/tensorflow/tools/api/lib/BUILD
deleted file mode 100644
index cdfa0e7be5..0000000000
--- a/tensorflow/tools/api/lib/BUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Helper libraries for TensorFlow API compatibility test.
-
-package(
-    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-load(
-    "//tensorflow/core:platform/default/build_config.bzl",
-    "tf_proto_library",
-)
-
-tf_proto_library(
-    name = "api_objects_proto",
-    srcs = ["api_objects.proto"],
-)
-
-py_library(
-    name = "python_object_to_proto_visitor",
-    srcs = ["python_object_to_proto_visitor.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":api_objects_proto_py",
-        "//tensorflow/tools/common:traverse",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tools/api/lib/api_objects.proto b/tensorflow/tools/api/lib/api_objects.proto
deleted file mode 100644
index 0966a5f1d5..0000000000
--- a/tensorflow/tools/api/lib/api_objects.proto
+++ /dev/null
@@ -1,31 +0,0 @@
-syntax = "proto2";
-
-package third_party.tensorflow.tools.api;
-
-message TFAPIMember {
-  optional string name = 1;
-  optional string mtype = 2;
-};
-
-message TFAPIMethod {
-  optional string name = 1;
-  optional string path = 2;
-  optional string argspec = 3;
-};
-
-message TFAPIModule {
-  repeated TFAPIMember member = 1;
-  repeated TFAPIMethod member_method = 2;
-};
-
-message TFAPIClass {
-  repeated string is_instance = 1;
-  repeated TFAPIMember member = 2;
-  repeated TFAPIMethod member_method = 3;
-};
-
-message TFAPIObject {
-  optional string path = 1;
-  optional TFAPIModule tf_module = 2;
-  optional TFAPIClass tf_class = 3;
-};
diff --git a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
deleted file mode 100644
index 0dde24d621..0000000000
--- a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ==============================================================================
-"""A visitor class that generates protobufs for each pyton object."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import inspect
-
-from tensorflow.python.platform import tf_logging as logging
-from tensorflow.tools.api.lib import api_objects_pb2
-
-
-# Following object need to be handled individually.
-_CORNER_CASES = {
-    '': {'contrib': {'name': 'contrib',
-                     'mtype': '<class \'_LazyContribLoader\'>'},
-         'tools': {}},
-}
-
-
-def _SanitizedArgSpec(obj):
-  """Get an ArgSpec string that is free of addresses.
-
-  We have callables as function arg defaults. This results in addresses in
-  getargspec output. This function returns a sanitized string list of base
-  classes.
-
-  Args:
-    obj: A python routine for us the create the sanitized arspec of.
-
-  Returns:
-    string, a string representation of the argspec.
-  """
-  output_string = ''
-  unsanitized_arg_spec = inspect.getargspec(obj)
-
-  for clean_attr in ('args', 'varargs', 'keywords'):
-    output_string += '%s=%s, ' % (clean_attr,
-                                  getattr(unsanitized_arg_spec, clean_attr))
-
-  if unsanitized_arg_spec.defaults:
-    sanitized_defaults = []
-    for val in unsanitized_arg_spec.defaults:
-      str_val = str(val)
-      if ' object at 0x' in str_val:
-        sanitized_defaults.append('%s instance>' % str_val.split(' at ')[0])
-      else:
-        sanitized_defaults.append(str_val)
-
-    output_string += 'defaults=%s, ' % sanitized_defaults
-
-  else:
-    output_string += 'defaults=None'
-
-  return output_string
-
-
-def _SanitizedMRO(obj):
-  """Get a list of superclasses with minimal amount of non-TF classes.
-
-  Based on many parameters like python version, OS, protobuf implementation
-  or changes in google core libraries the list of superclasses of a class
-  can change. We only return the first non-TF class to be robust to non API
-  affecting changes. The Method Resolution Order returned by inspect.getmro
-  is still maintained in the return value.
-
-  Args:
-    obj: A python routine for us the create the sanitized arspec of.
-
-  Returns:
-    list of strings, string representation of the class names.
-  """
-  return_list = []
-  for cls in inspect.getmro(obj):
-    str_repr = str(cls)
-    return_list.append(str_repr)
-    if 'tensorflow' not in str_repr:
-      break
-
-  return return_list
-
-
-class PythonObjectToProtoVisitor(object):
-  """A visitor that summarizes given python objects as protobufs."""
-
-  def __init__(self):
-    # A dict to store all protocol buffers.
-    # Keyed by "path" to the object.
-    self._protos = {}
-
-  def GetProtos(self):
-    """Return the list of protos stored."""
-    return self._protos
-
-  def __call__(self, path, parent, children):
-    # The path to the object.
-    lib_path = 'tensorflow.%s' % path if path else 'tensorflow'
-
-    # A small helper method to construct members(children) protos.
-    def _AddMember(member_name, member_obj, proto):
-      """Add the child object to the object being constructed."""
-      if member_name == '__init__' or not member_name.startswith('_'):
-        if inspect.isroutine(member_obj):
-          new_method = proto.member_method.add()
-          new_method.name = member_name
-          # If member_obj is a python builtin, there is no way to get its
-          # argspec, because it is implemented on the C side. It also has no
-          # func_code.
-          if getattr(member_obj, 'func_code', None):
-            new_method.argspec = _SanitizedArgSpec(member_obj)
-        else:
-          new_member = proto.member.add()
-          new_member.name = member_name
-          new_member.mtype = str(type(member_obj))
-
-    parent_corner_cases = _CORNER_CASES.get(path, {})
-
-    # Decide if we have a module or a class.
-    if inspect.ismodule(parent):
-      # Create a module object.
-      module_obj = api_objects_pb2.TFAPIModule()
-      for name, child in children:
-        if name in parent_corner_cases:
-          # If we have an empty entry, skip this object.
-          if parent_corner_cases[name]:
-            module_obj.member.add(**(parent_corner_cases[name]))
-        else:
-          _AddMember(name, child, module_obj)
-
-      # Store the constructed module object.
-      self._protos[lib_path] = api_objects_pb2.TFAPIObject(
-          path=lib_path, tf_module=module_obj)
-    elif inspect.isclass(parent):
-      # Construct a class.
-      class_obj = api_objects_pb2.TFAPIClass()
-      class_obj.is_instance.extend(_SanitizedMRO(parent))
-      for name, child in children:
-        if name in parent_corner_cases:
-          # If we have an empty entry, skip this object.
-          if parent_corner_cases[name]:
-            module_obj.member.add(**(parent_corner_cases[name]))
-        else:
-          _AddMember(name, child, class_obj)
-
-      # Store the constructed class object.
-      self._protos[lib_path] = api_objects_pb2.TFAPIObject(
-          path=lib_path, tf_class=class_obj)
-    else:
-      logging.error('Illegal call to ApiProtoDump::_py_obj_to_proto.'
-                    'Object is neither a module nor a class: %s', path)
diff --git a/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt b/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
deleted file mode 100644
index 54b0cfcb3c..0000000000
--- a/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Golden file update requested!
-All test failures have been skipped, see the logs for detected diffs.
-This test is now going to write new golden files.
-Make sure to package the updates together with your change.
-
-You will need an explicit API approval. This may take longer than a normal
-review.
diff --git a/tensorflow/tools/api/tests/BUILD b/tensorflow/tools/api/tests/BUILD
deleted file mode 100644
index bfee211dca..0000000000
--- a/tensorflow/tools/api/tests/BUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# TensorFlow API backwards compatibility tests.
-
-package(
-    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files([
-    "README.txt",
-    "API_UPDATE_WARNING.txt",
-])
-
-py_test(
-    name = "api_compatibility_test",
-    srcs = ["api_compatibility_test.py"],
-    data = [
-        "//tensorflow/tools/api/golden:api_golden",
-        "//tensorflow/tools/api/tests:API_UPDATE_WARNING.txt",
-        "//tensorflow/tools/api/tests:README.txt",
-    ],
-    srcs_version = "PY2AND3",
-    deps = [
-        "//tensorflow:tensorflow_py",
-        "//tensorflow/python:platform",
-        "//tensorflow/tools/api/lib:python_object_to_proto_visitor",
-        "//tensorflow/tools/common:public_api",
-        "//tensorflow/tools/common:traverse",
-        "@protobuf//:protobuf_python",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tools/api/tests/README.txt b/tensorflow/tools/api/tests/README.txt
deleted file mode 100644
index 3463eeec6f..0000000000
--- a/tensorflow/tools/api/tests/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-TensorFlow API backwards compatibility test
-This test ensures all changes to the public API of TensorFlow are intended.
-
-If this test fails, it means a change has been made to the public API. Backwards
-incompatible changes are not allowed. You can run the test as follows to update
-test goldens and package them with your change.
-
-    $ bazel build tensorflow/tools/api/tests:api_compatibility_test
-    $ bazel-bin/tensorflow/tools/api/tests/api_compatibility_test \
-          --update_goldens True
-
-You will need an API approval to make changes to the public TensorFlow API. This
-includes additions to the API.
diff --git a/tensorflow/tools/api/tests/api_compatibility_test.py b/tensorflow/tools/api/tests/api_compatibility_test.py
deleted file mode 100644
index 27865fdc89..0000000000
--- a/tensorflow/tools/api/tests/api_compatibility_test.py
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ==============================================================================
-"""TensorFlow API compatibility tests.
-
-This test ensures all changes to the public API of TensorFlow are intended.
-
-If this test fails, it means a change has been made to the public API. Backwards
-incompatible changes are not allowed. You can run the test with
-"--update_goldens" flag set to "True" to update goldens when making changes to
-the public TF python API.
-"""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import argparse
-import os
-import re
-import sys
-import unittest
-
-import tensorflow as tf
-
-from google.protobuf import text_format
-
-from tensorflow.python.lib.io import file_io
-from tensorflow.python.platform import resource_loader
-from tensorflow.python.platform import test
-from tensorflow.python.platform import tf_logging as logging
-from tensorflow.tools.api.lib import api_objects_pb2
-from tensorflow.tools.api.lib import python_object_to_proto_visitor
-from tensorflow.tools.common import public_api
-from tensorflow.tools.common import traverse
-
-# FLAGS defined at the bottom:
-FLAGS = None
-# DEFINE_boolean, update_goldens, default False:
-_UPDATE_GOLDENS_HELP = """
-     Update stored golden files if API is updated. WARNING: All API changes
-     have to be authorized by TensorFlow leads.
-"""
-
-# DEFINE_boolean, verbose_diffs, default False:
-_VERBOSE_DIFFS_HELP = """
-     If set to true, print line by line diffs on all libraries. If set to
-     false, only print which libraries have differences.
-"""
-
-_API_GOLDEN_FOLDER = 'tensorflow/tools/api/golden'
-_TEST_README_FILE = 'tensorflow/tools/api/tests/README.txt'
-_UPDATE_WARNING_FILE = 'tensorflow/tools/api/tests/API_UPDATE_WARNING.txt'
-
-
-def _KeyToFilePath(key):
-  """From a given key, construct a filepath."""
-  def _ReplaceCapsWithDash(matchobj):
-    match = matchobj.group(0)
-    return '-%s' % (match.lower())
-
-  case_insensitive_key = re.sub('([A-Z]{1})', _ReplaceCapsWithDash, key)
-  return os.path.join(_API_GOLDEN_FOLDER, '%s.pbtxt' % case_insensitive_key)
-
-
-def _FileNameToKey(filename):
-  """From a given filename, construct a key we use for api objects."""
-  def _ReplaceDashWithCaps(matchobj):
-    match = matchobj.group(0)
-    return match[1].upper()
-
-  base_filename = os.path.basename(filename)
-  base_filename_without_ext = os.path.splitext(base_filename)[0]
-  api_object_key = re.sub(
-      '((-[a-z]){1})', _ReplaceDashWithCaps, base_filename_without_ext)
-  return api_object_key
-
-
-class ApiCompatibilityTest(test.TestCase):
-
-  def __init__(self, *args, **kwargs):
-    super(ApiCompatibilityTest, self).__init__(*args, **kwargs)
-
-    golden_update_warning_filename = os.path.join(
-        resource_loader.get_root_dir_with_all_resources(),
-        _UPDATE_WARNING_FILE)
-    self._update_golden_warning = file_io.read_file_to_string(
-        golden_update_warning_filename)
-
-    test_readme_filename = os.path.join(
-        resource_loader.get_root_dir_with_all_resources(),
-        _TEST_README_FILE)
-    self._test_readme_message = file_io.read_file_to_string(
-        test_readme_filename)
-
-  def _AssertProtoDictEquals(self,
-                             expected_dict,
-                             actual_dict,
-                             verbose=False,
-                             update_goldens=False):
-    """Diff given dicts of protobufs and report differences a readable way.
-
-    Args:
-      expected_dict: a dict of TFAPIObject protos constructed from golden
-          files.
-      actual_dict: a ict of TFAPIObject protos constructed by reading from the
-          TF package linked to the test.
-      verbose: Whether to log the full diffs, or simply report which files were
-          different.
-      update_goldens: Whether to update goldens when there are diffs found.
-    """
-    diffs = []
-    verbose_diffs = []
-
-    expected_keys = set(expected_dict.keys())
-    actual_keys = set(actual_dict.keys())
-    only_in_expected = expected_keys - actual_keys
-    only_in_actual = actual_keys - expected_keys
-    all_keys = expected_keys | actual_keys
-
-    # This will be populated below.
-    updated_keys = []
-
-    for key in all_keys:
-      diff_message = ''
-      verbose_diff_message = ''
-      # First check if the key is not found in one or the other.
-      if key in only_in_expected:
-        diff_message = 'Object %s expected but not found (removed).' % key
-        verbose_diff_message = diff_message
-      elif key in only_in_actual:
-        diff_message = 'New object %s found (added).' % key
-        verbose_diff_message = diff_message
-      else:
-        # Now we can run an actual proto diff.
-        try:
-          self.assertProtoEquals(expected_dict[key], actual_dict[key])
-        except AssertionError as e:
-          updated_keys.append(key)
-          diff_message = 'Change detected in python object: %s.' % key
-          verbose_diff_message = str(e)
-
-      # All difference cases covered above. If any difference found, add to the
-      # list.
-      if diff_message:
-        diffs.append(diff_message)
-        verbose_diffs.append(verbose_diff_message)
-
-    # If diffs are found, handle them based on flags.
-    if diffs:
-      diff_count = len(diffs)
-      logging.error(self._test_readme_message)
-      logging.error('%d differences found between API and golden.', diff_count)
-      messages = verbose_diffs if verbose else diffs
-      for i in range(diff_count):
-        logging.error('Issue %d\t: %s', i + 1, messages[i])
-
-      if update_goldens:
-        # Write files if requested.
-        logging.warning(self._update_golden_warning)
-
-        # If the keys are only in expected, some objects are deleted.
-        # Remove files.
-        for key in only_in_expected:
-          filepath = _KeyToFilePath(key)
-          file_io.delete_file(filepath)
-
-        # If the files are only in actual (current library), these are new
-        # modules. Write them to files. Also record all updates in files.
-        for key in only_in_actual | set(updated_keys):
-          filepath = _KeyToFilePath(key)
-          file_io.write_string_to_file(
-              filepath, text_format.MessageToString(actual_dict[key]))
-      else:
-        # Fail if we cannot fix the test by updating goldens.
-        self.fail('%d differences found between API and golden.' % diff_count)
-
-    else:
-      logging.info('No differences found between API and golden.')
-
-  @unittest.skipUnless(
-      sys.version_info.major == 2 and os.uname()[0] == 'Linux',
-      'API compabitility test goldens are generated using python2 on Linux.')
-  def testAPIBackwardsCompatibility(self):
-    # Extract all API stuff.
-    visitor = python_object_to_proto_visitor.PythonObjectToProtoVisitor()
-    traverse.traverse(tf, public_api.PublicAPIVisitor(visitor))
-    proto_dict = visitor.GetProtos()
-
-    # Read all golden files.
-    expression = os.path.join(
-        resource_loader.get_root_dir_with_all_resources(),
-        _KeyToFilePath('*'))
-    golden_file_list = file_io.get_matching_files(expression)
-
-    def _ReadFileToProto(filename):
-      """Read a filename, create a protobuf from its contents."""
-      ret_val = api_objects_pb2.TFAPIObject()
-      text_format.Merge(file_io.read_file_to_string(filename), ret_val)
-      return ret_val
-
-    golden_proto_dict = {
-        _FileNameToKey(filename): _ReadFileToProto(filename)
-        for filename in golden_file_list
-    }
-
-    # Diff them. Do not fail if called with update.
-    # If the test is run to update goldens, only report diffs but do not fail.
-    self._AssertProtoDictEquals(
-        golden_proto_dict,
-        proto_dict,
-        verbose=FLAGS.verbose_diffs,
-        update_goldens=FLAGS.update_goldens)
-
-
-if __name__ == '__main__':
-  parser = argparse.ArgumentParser()
-  parser.add_argument(
-      '--update_goldens', type=bool, default=False, help=_UPDATE_GOLDENS_HELP)
-  parser.add_argument(
-      '--verbose_diffs', type=bool, default=False, help=_VERBOSE_DIFFS_HELP)
-  FLAGS, unparsed = parser.parse_known_args()
-
-  # Now update argv, so that unittest library does not get confused.
-  sys.argv = [sys.argv[0]] + unparsed
-  test.main()
diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 97447a18a7..3364ff6bc9 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -56,7 +56,7 @@ class PublicAPIVisitor(object):
 
       # Everything below here is legitimate.
       'app': ['flags'],  # It'll stay, but it's not officially part of the API.
-      'test': ['mock', 'TestCase'],  # Imported for compatibility between py2/3.
+      'test': ['mock'],  # Imported for compatibility between py2/3.
   }
 
   @property
-- 
GitLab


From c87985b5105712d6268c24390ecb647d17b31378 Mon Sep 17 00:00:00 2001
From: "Gao, Xiang" <qasdfgtyuiop@gmail.com>
Date: Fri, 7 Apr 2017 16:16:48 -0400
Subject: [PATCH 0221/1563] remove unused include

---
 tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc b/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
index 5f53f098aa..f075326ed4 100644
--- a/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
@@ -19,8 +19,6 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/segment_reduction_ops.h"
 
-#include <stdio.h>
-
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/util/cuda_kernel_helper.h"
 
-- 
GitLab


From 8679fc449ba166d88c5d98a75f9ef5787efa0241 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 12:05:56 -0800
Subject: [PATCH 0222/1563] Add an env_var tf_sync_on_finish_bool that block
 until device has finished all queued operations in a step if true. Change:
 152533676

---
 tensorflow/core/BUILD                            |  6 +++++-
 tensorflow/core/common_runtime/direct_session.cc | 12 ++++++++++--
 tensorflow/core/common_runtime/direct_session.h  |  2 ++
 tensorflow/core/distributed_runtime/graph_mgr.cc | 10 +++++++++-
 tensorflow/core/distributed_runtime/graph_mgr.h  |  3 +++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 144bf94f21..afcc7891b6 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -384,6 +384,7 @@ tf_cuda_library(
         "util/bcast.h",
         "util/cuda_kernel_helper.h",
         "util/device_name_utils.h",
+        "util/env_var.h",
         "util/events_writer.h",
         "util/example_proto_fast_parsing.h",
         "util/example_proto_helper.h",
@@ -1536,7 +1537,10 @@ cc_library(
 tf_cuda_library(
     name = "direct_session_internal",
     srcs = ["common_runtime/direct_session.cc"],
-    hdrs = ["common_runtime/direct_session.h"],
+    hdrs = [
+        "common_runtime/direct_session.h",
+        "util/env_var.h",
+    ],
     copts = tf_copts(),
     cuda_deps = [
         ":gpu_tracer",
diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index eda2be3e70..768c2f6f75 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -57,6 +57,7 @@ limitations under the License.
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/util/device_name_utils.h"
+#include "tensorflow/core/util/env_var.h"
 
 #if GOOGLE_CUDA
 #include "tensorflow/core/common_runtime/gpu/gpu_tracer.h"
@@ -242,6 +243,13 @@ DirectSession::DirectSession(const SessionOptions& options,
     thread_pools_.push_back(GlobalThreadPool(options));
     owns_thread_pools_ = false;
   }
+  // The default value of sync_on_finish will be flipped soon and this
+  // environment variable will be removed as well.
+  Status status =
+      ReadBoolFromEnvVar("TF_SYNC_ON_FINISH", true, &sync_on_finish_);
+  if (!status.ok()) {
+    LOG(ERROR) << status.error_message();
+  }
   // NOTE(mrry): We do not need to use a unique string for the session
   // handle, because DirectSession owns its devices. This may change
   // in future versions.
@@ -448,7 +456,7 @@ Status DirectSession::Run(const RunOptions& run_options,
   if (LogMemory::IsEnabled()) {
     LogMemory::RecordStep(args.step_id, run_state_args.handle);
   }
-  args.sync_on_finish = true;
+  args.sync_on_finish = sync_on_finish_;
 
   const bool do_trace = (run_options.trace_level() > RunOptions::NO_TRACE);
 
@@ -632,7 +640,7 @@ Status DirectSession::PRunSetup(const std::vector<string>& input_names,
   if (LogMemory::IsEnabled()) {
     LogMemory::RecordStep(args.step_id, run_state_args.handle);
   }
-  args.sync_on_finish = true;
+  args.sync_on_finish = sync_on_finish_;
 
   if (options_.config.graph_options().build_cost_model()) {
     run_state->collector.reset(new StepStatsCollector(nullptr));
diff --git a/tensorflow/core/common_runtime/direct_session.h b/tensorflow/core/common_runtime/direct_session.h
index 1495648631..b9d22ac522 100644
--- a/tensorflow/core/common_runtime/direct_session.h
+++ b/tensorflow/core/common_runtime/direct_session.h
@@ -247,6 +247,8 @@ class DirectSession : public Session {
   std::vector<thread::ThreadPool*> thread_pools_;
   bool owns_thread_pools_ = false;
 
+  // If true, blocks until device has finished all queued operations in a step.
+  bool sync_on_finish_ = true;
   // Schedules 'c' for execution on pool.
   void SchedClosure(thread::ThreadPool* pool, std::function<void()> c);
 
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index 537d489aae..545ae867f6 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -41,6 +41,7 @@ limitations under the License.
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/protobuf/worker.pb.h"
+#include "tensorflow/core/util/env_var.h"
 
 namespace tensorflow {
 
@@ -48,6 +49,13 @@ GraphMgr::GraphMgr(const WorkerEnv* worker_env,
                    RendezvousMgrInterface* rendezvous_mgr)
     : worker_env_(worker_env), rendezvous_mgr_(rendezvous_mgr), table_(5) {
   CHECK(rendezvous_mgr) << "Rendezvous mgr was null";
+  // The default value of sync_on_finish will be flipped soon and this
+  // environment variable will be removed as well.
+  Status status =
+      ReadBoolFromEnvVar("TF_SYNC_ON_FINISH", true, &sync_on_finish_);
+  if (!status.ok()) {
+    LOG(ERROR) << status.error_message();
+  }
 }
 
 GraphMgr::~GraphMgr() {
@@ -486,7 +494,7 @@ void GraphMgr::StartParallelExecutors(const string& handle, int64 step_id,
   args.cancellation_manager = cancellation_manager;
   args.stats_collector = collector;
   args.step_container = step_container;
-  args.sync_on_finish = true;
+  args.sync_on_finish = sync_on_finish_;
   if (LogMemory::IsEnabled()) {
     LogMemory::RecordStep(args.step_id, handle);
   }
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.h b/tensorflow/core/distributed_runtime/graph_mgr.h
index 4477a2764b..5f51d63857 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.h
+++ b/tensorflow/core/distributed_runtime/graph_mgr.h
@@ -137,6 +137,9 @@ class GraphMgr {
   mutex mu_;
   int64 next_id_ GUARDED_BY(mu_) = 0;
 
+  // If true, blocks until device has finished all queued operations in a step.
+  bool sync_on_finish_ = true;
+
   // Table mapping graph handles to registered graphs.
   //
   // TODO(zhifengc): If the client does not call Deregister, we'll
-- 
GitLab


From c2017a62c7b437335f0fe0ce7945534dce46fc4a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 12:12:49 -0800
Subject: [PATCH 0223/1563] Add more node attributes for HloInstruction on
 Tensorboard e.g. shape and layout etc. Change: 152534472

---
 tensorflow/compiler/xla/tools/BUILD           |  2 +
 .../compiler/xla/tools/hlo_tfgraph_builder.cc | 81 ++++++++++++++++++-
 .../xla/tools/hlo_tfgraph_builder_test.cc     | 47 +++++++++++
 3 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/tensorflow/compiler/xla/tools/BUILD b/tensorflow/compiler/xla/tools/BUILD
index 1c4ca44631..ab598b8edd 100644
--- a/tensorflow/compiler/xla/tools/BUILD
+++ b/tensorflow/compiler/xla/tools/BUILD
@@ -181,6 +181,8 @@ cc_library(
     srcs = ["hlo_tfgraph_builder.cc"],
     hdrs = ["hlo_tfgraph_builder.h"],
     deps = [
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla/service:hlo",
         "//tensorflow/core:core_cpu",
         "//tensorflow/core:framework",
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
index 8e04ea3ae4..fe835a20c4 100644
--- a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
@@ -14,19 +14,27 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/layout_util.h"
+#include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/tensor_shape.pb.h"
+#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 
 using ::tensorflow::GraphDef;
 using ::tensorflow::NodeDef;
+using ::tensorflow::TensorShapeProto;
 using ::tensorflow::strings::StrAppend;
 using ::tensorflow::strings::StrCat;
+using ::tensorflow::str_util::Join;
 
 namespace xla {
 namespace tools {
+namespace {
 
-static string GetOpDefName(const HloInstruction* instruction) {
+string GetOpDefName(const HloInstruction* instruction) {
   string name = StrCat("hlo-", HloOpcodeString(instruction->opcode()));
   tensorflow::str_util::TitlecaseString(&name, "-");
   name.erase(std::remove(name.begin(), name.end(), '-'), name.end());
@@ -38,6 +46,17 @@ static string GetOpDefName(const HloInstruction* instruction) {
   return name;
 }
 
+TensorShapeProto GetTensorShape(const HloInstruction* instruction) {
+  TensorShapeProto tensor_shape;
+  const Shape& shape = instruction->shape();
+  for (auto dim : shape.dimensions()) {
+    tensor_shape.add_dim()->set_size(dim);
+  }
+  return tensor_shape;
+}
+
+}  // namespace
+
 void CleanNodeName(string* name) {
   name->erase(std::remove(name->begin(), name->end(), '%'), name->end());
   const string chars_to_replace = "<>[]";
@@ -87,14 +106,70 @@ const string& HloTfGraphBuilder::GetNodeNameForInstruction(
   return ret.first->second;
 }
 
-// TODO(b/36987876): Add more attribute information e.g. shapes, dimensions etc.
 void HloTfGraphBuilder::SetNodeAttrs(const HloInstruction* instruction,
                                      NodeDef* node_def) const {
+  auto& attrs = *node_def->mutable_attr();
+
   // Set the number of arguments for instructions that have variadic operands.
   if (HloOpcodeIsVariadic(instruction->opcode())) {
     tensorflow::AttrValue attr_value;
     attr_value.set_i(instruction->operands().size());
-    (*node_def->mutable_attr())["ArgNum"] = attr_value;
+    attrs["arg_num"] = attr_value;
+  }
+
+  // Set the node type.
+  attrs["type"].set_s(
+      xla::PrimitiveType_Name(instruction->shape().element_type()));
+
+  // Set the shape of the output tensor. "_output_shapes" is a special attribute
+  // name used by Tensorboard for shapes of output tensors.
+  tensorflow::AttrValue shapes;
+  *shapes.mutable_list()->add_shape() = GetTensorShape(instruction);
+  attrs["_output_shapes"] = shapes;
+
+  // Set the layout.
+  if (LayoutUtil::HasLayout(instruction->shape())) {
+    string layout_string;
+    if (ShapeUtil::IsTuple(instruction->shape())) {
+      // For tuples, emit the full shape because the layout of a tuple is not
+      // represented in a single Layout field.
+      layout_string = ShapeUtil::HumanStringWithLayout(instruction->shape());
+    } else {
+      layout_string = StrCat(
+          "{", Join(instruction->shape().layout().minor_to_major(), ","), "}");
+    }
+    attrs["layout"].set_s(layout_string);
+  }
+
+  // Set op-specific attributes.
+  switch (instruction->opcode()) {
+    case HloOpcode::kConcatenate:
+    case HloOpcode::kBroadcast:
+    case HloOpcode::kReduce:
+    case HloOpcode::kReverse:
+    case HloOpcode::kTranspose:
+      for (auto dim : instruction->dimensions()) {
+        attrs["dims"].mutable_list()->add_i(dim);
+      }
+      break;
+    case HloOpcode::kGetTupleElement:
+      attrs["index"].set_i(instruction->tuple_index());
+      break;
+    case HloOpcode::kRng:
+      attrs["dist"].set_s(
+          RandomDistribution_Name(instruction->random_distribution()));
+      break;
+    case HloOpcode::kConstant:
+      if (ShapeUtil::IsScalar(instruction->shape())) {
+        attrs["value"].set_s(
+            LiteralUtil::GetAsString(instruction->literal(), {}));
+      }
+      break;
+    case HloOpcode::kCustomCall:
+      attrs["custom_call_target"].set_s(instruction->custom_call_target());
+      break;
+    default:
+      break;
   }
 }
 
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
index 57144d0385..626bcc6d85 100644
--- a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
@@ -51,6 +51,53 @@ class HloTfGraphBuilderTest : public HloTestBase {
   Shape r0f32_ = ShapeUtil::MakeShape(F32, {});
 };
 
+TEST_F(HloTfGraphBuilderTest, CheckConcatenateDimsAndShapes) {
+  auto builder = HloComputation::Builder("Concatenate");
+  Shape shape = ShapeUtil::MakeShape(F32, {2, 2});
+  auto param_1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, shape, "param0"));
+  auto param_2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, shape, "param1"));
+  builder.AddInstruction(HloInstruction::CreateConcatenate(
+      ShapeUtil::MakeShape(F32, {2, 4}), {param_1, param_2}, 1));
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 3);
+  const auto &node = graph_def.node(2);
+  EXPECT_EQ(node.name(), "Concatenate/concatenate");
+
+  // Check dimensions.
+  auto dims_value = node.attr().find("dims");
+  CHECK(dims_value != node.attr().end());
+  EXPECT_EQ(dims_value->second.list().i_size(), 1);
+  EXPECT_EQ(dims_value->second.list().i(0), 1);
+
+  // Check shapes.
+  auto shape_value = node.attr().find("_output_shapes");
+  CHECK(shape_value != node.attr().end());
+  EXPECT_EQ(shape_value->second.list().shape_size(), 1);
+  EXPECT_EQ(shape_value->second.list().shape(0).dim_size(), 2);
+  EXPECT_EQ(shape_value->second.list().shape(0).dim(0).size(), 2);
+  EXPECT_EQ(shape_value->second.list().shape(0).dim(1).size(), 4);
+}
+
+TEST_F(HloTfGraphBuilderTest, CheckScalarValue) {
+  auto builder = HloComputation::Builder("Const");
+  builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0(123)));
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 1);
+  const auto &node = graph_def.node(0);
+  auto value = node.attr().find("value");
+  CHECK(value != node.attr().end());
+  EXPECT_EQ(value->second.s(), "123");
+
+  auto type = node.attr().find("type");
+  CHECK(type != node.attr().end());
+  EXPECT_EQ(type->second.s(), "S32");
+}
+
 TEST_F(HloTfGraphBuilderTest, SimpleNegateComputation) {
   auto negate_computation = CreateNegateComputation();
   TF_CHECK_OK(generator_.AddComputation(*negate_computation));
-- 
GitLab


From fd3d1371de9aed6430b881dfdf22faef43af11ac Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Fri, 7 Apr 2017 12:41:18 -0800
Subject: [PATCH 0224/1563] Add tf.complex64 GPU support to tf.gather.

Also add ldg specializations for std::complex.
Change: 152537848
---
 tensorflow/core/kernels/gather_functor.cc     |   1 +
 .../core/kernels/gather_functor_gpu.cu.cc     |   1 +
 tensorflow/core/kernels/gather_op.cc          |   1 +
 tensorflow/core/kernels/gather_op_test.cc     |  34 ++++--
 tensorflow/core/util/cuda_kernel_helper.h     |  22 ++++
 .../python/kernel_tests/gather_op_test.py     | 103 +++++++++++-------
 6 files changed, 112 insertions(+), 50 deletions(-)

diff --git a/tensorflow/core/kernels/gather_functor.cc b/tensorflow/core/kernels/gather_functor.cc
index be220d5c95..8ef027a1dd 100644
--- a/tensorflow/core/kernels/gather_functor.cc
+++ b/tensorflow/core/kernels/gather_functor.cc
@@ -38,6 +38,7 @@ namespace functor {
   DECLARE_GPU_SPECS_INDEX(T, int64)
 
 TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPECS);
+TF_CALL_complex64(DECLARE_GPU_SPECS);
 
 #undef DECLARE_GPU_SPECS
 #undef DECLARE_GPU_SPECS_INDEX
diff --git a/tensorflow/core/kernels/gather_functor_gpu.cu.cc b/tensorflow/core/kernels/gather_functor_gpu.cu.cc
index f1c1025078..456f4023a7 100644
--- a/tensorflow/core/kernels/gather_functor_gpu.cu.cc
+++ b/tensorflow/core/kernels/gather_functor_gpu.cu.cc
@@ -32,6 +32,7 @@ typedef Eigen::GpuDevice GPUDevice;
   DEFINE_GPU_SPECS_INDEX(T, int64);
 
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
+TF_CALL_complex64(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 #undef DEFINE_GPU_SPECS_INDEX
diff --git a/tensorflow/core/kernels/gather_op.cc b/tensorflow/core/kernels/gather_op.cc
index d8182218af..31af37693c 100644
--- a/tensorflow/core/kernels/gather_op.cc
+++ b/tensorflow/core/kernels/gather_op.cc
@@ -114,6 +114,7 @@ TF_CALL_QUANTIZED_TYPES(REGISTER_GATHER_CPU);
 #define REGISTER_GATHER_GPU(type) REGISTER_GATHER_ALL_INDICES(GPU, type)
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GATHER_GPU);
+TF_CALL_complex64(REGISTER_GATHER_GPU);
 
 #undef REGISTER_GATHER_GPU
 
diff --git a/tensorflow/core/kernels/gather_op_test.cc b/tensorflow/core/kernels/gather_op_test.cc
index c340223aa1..23645dafad 100644
--- a/tensorflow/core/kernels/gather_op_test.cc
+++ b/tensorflow/core/kernels/gather_op_test.cc
@@ -40,9 +40,9 @@ namespace {
 
 class GatherOpTest : public OpsTestBase {
  protected:
-  void MakeOp(DataType index_type) {
+  void MakeOp(DataType data_type, DataType index_type) {
     TF_ASSERT_OK(NodeDefBuilder("myop", "Gather")
-                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(data_type))
                      .Input(FakeInput(index_type))
                      .Finalize(node_def()));
     TF_ASSERT_OK(InitOp());
@@ -50,7 +50,7 @@ class GatherOpTest : public OpsTestBase {
 };
 
 TEST_F(GatherOpTest, ScalarIndices) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5}), {0, 1, 2, 3, 4});
@@ -63,8 +63,26 @@ TEST_F(GatherOpTest, ScalarIndices) {
   test::ExpectTensorEqual<float>(expected, *GetOutput(0));
 }
 
+TEST_F(GatherOpTest, ScalarIndices_Complex) {
+  MakeOp(DT_COMPLEX64, DT_INT32);
+
+  // Feed and run
+  AddInputFromArray<std::complex<float>>(
+      TensorShape({5}), {std::complex<float>(0, 10), std::complex<float>(1, 11),
+                         std::complex<float>(2, 12), std::complex<float>(3, 13),
+                         std::complex<float>(4, 14)});
+  AddInputFromArray<int32>(TensorShape({}), {3});
+  TF_ASSERT_OK(RunOpKernel());
+
+  // Check the output.
+  Tensor expected(allocator(), DT_COMPLEX64, TensorShape({}));
+  test::FillValues<std::complex<float>>(&expected,
+                                        {std::complex<float>(3, 13)});
+  test::ExpectTensorEqual<std::complex<float>>(expected, *GetOutput(0));
+}
+
 TEST_F(GatherOpTest, Simple_TwoD32) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 3}),
@@ -79,7 +97,7 @@ TEST_F(GatherOpTest, Simple_TwoD32) {
 }
 
 TEST_F(GatherOpTest, ZeroSize_TwoD32) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 0}), {});
@@ -92,7 +110,7 @@ TEST_F(GatherOpTest, ZeroSize_TwoD32) {
 }
 
 TEST_F(GatherOpTest, Simple_TwoD64) {
-  MakeOp(DT_INT64);
+  MakeOp(DT_FLOAT, DT_INT64);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 3}),
@@ -107,7 +125,7 @@ TEST_F(GatherOpTest, Simple_TwoD64) {
 }
 
 TEST_F(GatherOpTest, HighRank) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({4}), {0, 1, 2, 3});
@@ -121,7 +139,7 @@ TEST_F(GatherOpTest, HighRank) {
 }
 
 TEST_F(GatherOpTest, Error_IndexOutOfRange) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 3}),
diff --git a/tensorflow/core/util/cuda_kernel_helper.h b/tensorflow/core/util/cuda_kernel_helper.h
index 8bb4ca8ff8..8a3f6c587e 100644
--- a/tensorflow/core/util/cuda_kernel_helper.h
+++ b/tensorflow/core/util/cuda_kernel_helper.h
@@ -128,6 +128,28 @@ __device__ __host__ inline T ldg(const T* address) {
 #endif
 }
 
+template <>
+__device__ __host__ inline std::complex<float> ldg(
+    const std::complex<float>* address) {
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 350
+  float2 mem = __ldg(reinterpret_cast<const float2*>(address));
+  return std::complex<float>(mem.x, mem.y);
+#else
+  return *address;
+#endif
+}
+
+template <>
+__device__ __host__ inline std::complex<double> ldg(
+    const std::complex<double>* address) {
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 350
+  double2 mem = __ldg(reinterpret_cast<const double2*>(address));
+  return std::complex<double>(mem.x, mem.y);
+#else
+  return *address;
+#endif
+}
+
 // CUDA provides atomic ops, but not for all types.  We provide wrappers
 // for some ops and provide implementation for all reasonable types.
 #define CUDA_ATOMIC_WRAPPER(op, T) \
diff --git a/tensorflow/python/kernel_tests/gather_op_test.py b/tensorflow/python/kernel_tests/gather_op_test.py
index dac8d58b35..1f161e59cd 100644
--- a/tensorflow/python/kernel_tests/gather_op_test.py
+++ b/tensorflow/python/kernel_tests/gather_op_test.py
@@ -31,61 +31,80 @@ from tensorflow.python.platform import test
 class GatherTest(test.TestCase):
   use_gpu = False
 
+  def _buildParams(self, data, dtype):
+    data = data.astype(dtype.as_numpy_dtype)
+    # For complex types, add an index-dependent imaginary component so we can
+    # tell we got the right value.
+    if dtype.is_complex:
+      return data + 10j * data
+    return data
+
   def testScalar1D(self):
     with self.test_session(use_gpu=self.use_gpu):
-      params = constant_op.constant([0, 1, 2, 3, 7, 5])
-      indices = constant_op.constant(4)
-      gather_t = array_ops.gather(params, indices)
-      gather_val = gather_t.eval()
-    self.assertAllEqual(7, gather_val)
-    self.assertEqual([], gather_t.get_shape())
+      data = np.array([0, 1, 2, 3, 7, 5])
+      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+        params_np = self._buildParams(data, dtype)
+        params = constant_op.constant(params_np)
+        indices = constant_op.constant(4)
+        gather_t = array_ops.gather(params, indices)
+        gather_val = gather_t.eval()
+        self.assertAllEqual(params_np[4], gather_val)
+        self.assertEqual([], gather_t.get_shape())
 
   def testScalar2D(self):
     with self.test_session(use_gpu=self.use_gpu):
-      params = constant_op.constant([[0, 1, 2], [3, 4, 5], [6, 7, 8],
-                                     [9, 10, 11], [12, 13, 14]])
-      indices = constant_op.constant(2)
-      gather_t = array_ops.gather(params, indices)
-      gather_val = gather_t.eval()
-    self.assertAllEqual([6, 7, 8], gather_val)
-    self.assertEqual([3], gather_t.get_shape())
+      data = np.array([[0, 1, 2], [3, 4, 5], [6, 7, 8],
+                       [9, 10, 11], [12, 13, 14]])
+      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+        params_np = self._buildParams(data, dtype)
+        params = constant_op.constant(params_np)
+        indices = constant_op.constant(2)
+        gather_t = array_ops.gather(params, indices)
+        gather_val = gather_t.eval()
+        self.assertAllEqual(params_np[2], gather_val)
+        self.assertEqual([3], gather_t.get_shape())
 
   def testSimpleTwoD32(self):
     with self.test_session(use_gpu=self.use_gpu):
-      params = constant_op.constant([[0, 1, 2], [3, 4, 5], [6, 7, 8],
-                                     [9, 10, 11], [12, 13, 14]])
-      indices = constant_op.constant([0, 4, 0, 2])
-      gather_t = array_ops.gather(params, indices)
-      gather_val = gather_t.eval()
-    self.assertAllEqual([[0, 1, 2], [12, 13, 14], [0, 1, 2], [6, 7, 8]],
-                        gather_val)
-    self.assertEqual([4, 3], gather_t.get_shape())
+      data = np.array([[0, 1, 2], [3, 4, 5], [6, 7, 8],
+                       [9, 10, 11], [12, 13, 14]])
+      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+        params_np = self._buildParams(data, dtype)
+        params = constant_op.constant(params_np)
+        indices = constant_op.constant([0, 4, 0, 2])
+        gather_t = array_ops.gather(params, indices)
+        gather_val = gather_t.eval()
+        self.assertAllEqual(params_np[[0, 4, 0, 2]], gather_val)
+        self.assertEqual([4, 3], gather_t.get_shape())
 
   def testHigherRank(self):
     np.random.seed(1)
     # We check that scalar and empty shapes work as well
     for shape in (7, 0), (4, 3, 2):
       for indices_shape in (), (0,), (3, 0), (3, 5):
-        params = np.random.randn(*shape)
-        indices = np.random.randint(shape[0], size=indices_shape)
-        with self.test_session(use_gpu=self.use_gpu):
-          tf_params = constant_op.constant(params)
-          tf_indices = constant_op.constant(indices)
-          gather = array_ops.gather(tf_params, tf_indices)
-          self.assertAllEqual(params[indices], gather.eval())
-          self.assertEqual(indices.shape + params.shape[1:], gather.get_shape())
-          # Test gradients
-          gather_grad = np.random.randn(*gather.get_shape().as_list())
-          params_grad, indices_grad = gradients_impl.gradients(
-              gather, [tf_params, tf_indices], gather_grad)
-          self.assertEqual(indices_grad, None)
-          self.assertEqual(type(params_grad), ops.IndexedSlices)
-          params_grad = ops.convert_to_tensor(params_grad)
-          correct_params_grad = np.zeros(shape)
-          for i, g in zip(indices.flat,
-                          gather_grad.reshape((indices.size,) + shape[1:])):
-            correct_params_grad[i] += g
-          self.assertAllClose(correct_params_grad, params_grad.eval())
+        for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+          params = self._buildParams(np.random.randn(*shape), dtype)
+          indices = np.random.randint(shape[0], size=indices_shape)
+          with self.test_session(use_gpu=self.use_gpu):
+            tf_params = constant_op.constant(params)
+            tf_indices = constant_op.constant(indices)
+            gather = array_ops.gather(tf_params, tf_indices)
+            self.assertAllEqual(params[indices], gather.eval())
+            self.assertEqual(indices.shape + params.shape[1:],
+                             gather.get_shape())
+            # Test gradients
+            gather_grad = np.random.randn(*gather.get_shape().as_list()).astype(
+                dtype.as_numpy_dtype)
+            params_grad, indices_grad = gradients_impl.gradients(
+                gather, [tf_params, tf_indices], gather_grad)
+            self.assertEqual(indices_grad, None)
+            self.assertEqual(type(params_grad), ops.IndexedSlices)
+            params_grad = ops.convert_to_tensor(params_grad)
+            correct_params_grad = np.zeros(shape).astype(dtype.as_numpy_dtype)
+            for i, g in zip(indices.flat,
+                            gather_grad.reshape((indices.size,) + shape[1:])):
+              correct_params_grad[i] += g
+            self.assertAllClose(correct_params_grad, params_grad.eval())
 
   def testUnknownIndices(self):
     params = constant_op.constant([[0, 1, 2]])
@@ -103,7 +122,7 @@ class GatherTest(test.TestCase):
 
   def testEmptySlices(self):
     with self.test_session(use_gpu=self.use_gpu):
-      for dtype in np.float32, np.float64:
+      for dtype in np.float32, np.float64, np.complex64, np.complex128:
         for itype in np.int32, np.int64:
           params = np.zeros((7, 0), dtype=dtype)
           indices = np.array([3, 4], dtype=itype)
-- 
GitLab


From 82254c06f0e4ea8225216b7518b7339594010955 Mon Sep 17 00:00:00 2001
From: Rohan Jain <rohanj@google.com>
Date: Fri, 7 Apr 2017 13:36:36 -0800
Subject: [PATCH 0225/1563] Formatting changes Change: 152544842

---
 .../kernel_tests/stochastic_tensor_test.py    | 42 +++++++------------
 tensorflow/contrib/distributions/__init__.py  |  7 ++--
 .../kernel_tests/bijectors/affine_test.py     | 20 +++------
 .../kernel_tests/bijectors/chain_test.py      |  3 +-
 .../kernel_tests/bijectors/sigmoid_test.py    | 18 ++++----
 .../python/ops/relaxed_bernoulli.py           | 11 ++---
 .../dataframe/queues/feeding_functions.py     |  1 -
 tensorflow/python/ops/nn_ops.py               |  2 +-
 8 files changed, 42 insertions(+), 62 deletions(-)

diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
index 81e40dbe5e..c7f185aab8 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
@@ -42,12 +42,10 @@ class StochasticTensorTest(test.TestCase):
       sigma2 = constant_op.constant([0.1, 0.2, 0.3])
 
       prior_default = st.StochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma))
+          distributions.Normal(loc=mu, scale=sigma))
       self.assertTrue(isinstance(prior_default.value_type, st.SampleValue))
       prior_0 = st.StochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma),
+          distributions.Normal(loc=mu, scale=sigma),
           dist_value_type=st.SampleValue())
       self.assertTrue(isinstance(prior_0.value_type, st.SampleValue))
 
@@ -55,8 +53,7 @@ class StochasticTensorTest(test.TestCase):
         prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.SampleValue))
         likelihood = st.StochasticTensor(
-            distributions.Normal(
-                loc=prior, scale=sigma2))
+            distributions.Normal(loc=prior, scale=sigma2))
         self.assertTrue(isinstance(likelihood.value_type, st.SampleValue))
 
       coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
@@ -102,8 +99,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue()):
         prior_single = st.StochasticTensor(
-            distributions.Normal(
-                loc=mu, scale=sigma))
+            distributions.Normal(loc=mu, scale=sigma))
 
       prior_single_value = prior_single.value()
       self.assertEqual(prior_single_value.get_shape(), (2, 3))
@@ -113,8 +109,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(1)):
         prior_single = st.StochasticTensor(
-            distributions.Normal(
-                loc=mu, scale=sigma))
+            distributions.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior_single.value_type, st.SampleValue))
 
       prior_single_value = prior_single.value()
@@ -125,8 +120,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(2)):
         prior_double = st.StochasticTensor(
-            distributions.Normal(
-                loc=mu, scale=sigma))
+            distributions.Normal(loc=mu, scale=sigma))
 
       prior_double_value = prior_double.value()
       self.assertEqual(prior_double_value.get_shape(), (2, 2, 3))
@@ -163,8 +157,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With passed-in loss_fn.
       dt = st.StochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma),
+          distributions.Normal(loc=mu, scale=sigma),
           dist_value_type=st.MeanValue(stop_gradient=True),
           loss_fn=sge.get_score_function_with_constant_baseline(
               baseline=constant_op.constant(8.0)))
@@ -199,8 +192,7 @@ class ObservedStochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       obs = array_ops.zeros((2, 3))
       z = st.ObservedStochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma), value=obs)
+          distributions.Normal(loc=mu, scale=sigma), value=obs)
       [obs_val, z_val] = sess.run([obs, z.value()])
       self.assertAllEqual(obs_val, z_val)
 
@@ -212,15 +204,13 @@ class ObservedStochasticTensorTest(test.TestCase):
     sigma = array_ops.placeholder(dtypes.float32)
     obs = array_ops.placeholder(dtypes.float32)
     z = st.ObservedStochasticTensor(
-        distributions.Normal(
-            loc=mu, scale=sigma), value=obs)
+        distributions.Normal(loc=mu, scale=sigma), value=obs)
 
     mu2 = array_ops.placeholder(dtypes.float32, shape=[None])
     sigma2 = array_ops.placeholder(dtypes.float32, shape=[None])
     obs2 = array_ops.placeholder(dtypes.float32, shape=[None, None])
     z2 = st.ObservedStochasticTensor(
-        distributions.Normal(
-            loc=mu2, scale=sigma2), value=obs2)
+        distributions.Normal(loc=mu2, scale=sigma2), value=obs2)
 
     coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
     self.assertEqual(coll, [z, z2])
@@ -231,22 +221,18 @@ class ObservedStochasticTensorTest(test.TestCase):
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
-            loc=mu, scale=sigma),
+        distributions.Normal(loc=mu, scale=sigma),
         value=array_ops.zeros((3,)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
-            loc=mu, scale=sigma),
+        distributions.Normal(loc=mu, scale=sigma),
         value=array_ops.zeros((3, 1)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
-            loc=mu, scale=sigma),
-        value=array_ops.zeros(
-            (1, 2), dtype=dtypes.int32))
+        distributions.Normal(loc=mu, scale=sigma),
+        value=array_ops.zeros((1, 2), dtype=dtypes.int32))
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 470b9edb79..e17197080a 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -135,8 +135,9 @@ from tensorflow.contrib.distributions.python.ops.wishart import *
 
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = ['ConditionalDistribution',
-                    'ConditionalTransformedDistribution',
-                    'FULLY_REPARAMETERIZED', 'NOT_REPARAMETERIZED']
+_allowed_symbols = [
+    'ConditionalDistribution', 'ConditionalTransformedDistribution',
+    'FULLY_REPARAMETERIZED', 'NOT_REPARAMETERIZED'
+]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
index 71460a1769..5d6e4d9197 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
@@ -488,9 +488,7 @@ class AffineBijectorTest(test.TestCase):
             shift=mu,
             scale_identity_multiplier=2.,
             scale_perturb_diag=[2., 1],
-            scale_perturb_factor=[[2., 0],
-                                  [0., 0],
-                                  [0, 1]])
+            scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
         bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 2, 3])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -526,9 +524,7 @@ class AffineBijectorTest(test.TestCase):
             shift=mu,
             scale_diag=[2., 3, 4],
             scale_perturb_diag=[2., 1],
-            scale_perturb_factor=[[2., 0],
-                                  [0., 0],
-                                  [0, 1]])
+            scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
         bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 3, 5])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -561,17 +557,11 @@ class AffineBijectorTest(test.TestCase):
         # Corresponds to scale = [[10, 0, 0], [1, 3, 0], [2, 3, 5]]
         bijector = affine_lib.Affine(
             shift=mu,
-            scale_tril=[[2., 0, 0],
-                        [1, 3, 0],
-                        [2, 3, 4]],
+            scale_tril=[[2., 0, 0], [1, 3, 0], [2, 3, 4]],
             scale_perturb_diag=[2., 1],
-            scale_perturb_factor=[[2., 0],
-                                  [0., 0],
-                                  [0, 1]])
+            scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
         bijector_ref = affine_lib.Affine(
-            shift=mu, scale_tril=[[10., 0, 0],
-                                  [1, 3, 0],
-                                  [2, 3, 5]])
+            shift=mu, scale_tril=[[10., 0, 0], [1, 3, 0], [2, 3, 5]])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
index ecf068bf6b..cb514e625b 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
@@ -70,7 +70,8 @@ class ChainBijectorTest(test.TestCase):
           softmax_centered_lib.SoftmaxCentered(
               event_ndims=1, validate_args=True),
           softmax_centered_lib.SoftmaxCentered(
-              event_ndims=0, validate_args=True)])
+              event_ndims=0, validate_args=True)
+      ])
       x = tensor_shape.TensorShape([])
       y = tensor_shape.TensorShape([2 + 1])
       self.assertAllEqual(y, bijector.forward_event_shape(x))
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
index e16f9dff22..40018de63f 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
@@ -36,17 +36,19 @@ class SigmoidBijectorTest(test.TestCase):
       y = special.expit(x)
       ildj = -np.log(y) - np.log1p(-y)
       self.assertAllClose(
-          y, sigmoid.Sigmoid().forward(x).eval(),
-          atol=0., rtol=1e-2)
+          y, sigmoid.Sigmoid().forward(x).eval(), atol=0., rtol=1e-2)
       self.assertAllClose(
-          x, sigmoid.Sigmoid().inverse(y).eval(),
-          atol=0., rtol=1e-4)
+          x, sigmoid.Sigmoid().inverse(y).eval(), atol=0., rtol=1e-4)
       self.assertAllClose(
-          ildj, sigmoid.Sigmoid().inverse_log_det_jacobian(y).eval(),
-          atol=0., rtol=1e-6)
+          ildj,
+          sigmoid.Sigmoid().inverse_log_det_jacobian(y).eval(),
+          atol=0.,
+          rtol=1e-6)
       self.assertAllClose(
-          -ildj, sigmoid.Sigmoid().forward_log_det_jacobian(x).eval(),
-          atol=0., rtol=1e-4)
+          -ildj,
+          sigmoid.Sigmoid().forward_log_det_jacobian(x).eval(),
+          atol=0.,
+          rtol=1e-4)
 
   def testScalarCongruency(self):
     with self.test_session():
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
index 7fee2e1f3a..e3f6ddd8c0 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
@@ -171,11 +171,12 @@ class RelaxedBernoulli(transformed_distribution.TransformedDistribution):
       self._logits, self._probs = distribution_util.get_logits_and_probs(
           logits=logits, probs=probs, validate_args=validate_args)
       super(RelaxedBernoulli, self).__init__(
-          distribution=logistic.Logistic(self._logits / self._temperature,
-                                         1. / self._temperature,
-                                         validate_args=validate_args,
-                                         allow_nan_stats=allow_nan_stats,
-                                         name=name + "/Logistic"),
+          distribution=logistic.Logistic(
+              self._logits / self._temperature,
+              1. / self._temperature,
+              validate_args=validate_args,
+              allow_nan_stats=allow_nan_stats,
+              name=name + "/Logistic"),
           bijector=sigmoid_lib.Sigmoid(validate_args=validate_args),
           validate_args=validate_args,
           name=name)
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
index dfe08bb863..b891bf2301 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
@@ -25,5 +25,4 @@ from tensorflow.python.estimator.inputs.queues.feeding_functions import _enqueue
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _OrderedDictNumpyFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _PandasFeedFn
-from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 # pylint: enable=unused-import
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 901d6a12f6..66ccedf546 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -2023,7 +2023,7 @@ def top_k(input, k=1, sorted=True, name=None):
 def conv1d(value, filters, stride, padding,
            use_cudnn_on_gpu=None, data_format=None,
            name=None):
-  """Computes a 1-D convolution given 3-D input and filter tensors.
+  r"""Computes a 1-D convolution given 3-D input and filter tensors.
 
   Given an input tensor of shape
     [batch, in_width, in_channels]
-- 
GitLab


From 755d8e87e71f0595c59e18db91a50450372a79ae Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Fri, 7 Apr 2017 13:45:53 -0800
Subject: [PATCH 0226/1563] Upgrade TensorBoard TypeScript to 2.2.1

See also: #8326
Change: 152545950
---
 tensorflow/tensorboard/package.json |  2 +-
 tensorflow/workspace.bzl            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/tensorboard/package.json b/tensorflow/tensorboard/package.json
index ca6a9e89ce..5dcf2f21e9 100644
--- a/tensorflow/tensorboard/package.json
+++ b/tensorflow/tensorboard/package.json
@@ -30,7 +30,7 @@
     "merge2": "~0.3.6",
     "minimist": "~1.2.0",
     "tsify": "^0.14.8",
-    "typescript": "2.1.5",
+    "typescript": "2.2.2",
     "typings": "1.4.0",
     "vinyl-source-stream": "^1.1.0",
     "vulcanize": "^1.14.0",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 93d4605ad8..e5e005fa93 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -610,13 +610,13 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name="com_microsoft_typescript",
       licenses=["notice"],  # Apache 2.0
       sha256_urls={
-          "e3d9e320a2cae99be4aaa37953961a48323cdf16ba9aa2557a44d69571cd9b8d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
-              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
+          "43a7c763fe024d5add8d5365e5a7981f4a359ba5bf86481f545a0db8f60d48cc": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
+              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
           ],
-          "f189cebe96eb76b238c6e364e72d4b0324e699f83eeae5deac23506cb3764fc6": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/lib.es6.d.ts",
-              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/lib.es6.d.ts",
+          "aecec1e47a3b3d872e214cb9adb82b30d6bd0471ea0aad7311ad81428566627c": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/lib.es6.d.ts",
+              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/lib.es6.d.ts",
           ],
       },
       extra_build_file_content="\n".join([
-- 
GitLab


From 9a574dae9eab85ca130e5190ba96d695908ecf75 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Fri, 7 Apr 2017 13:49:19 -0800
Subject: [PATCH 0227/1563] TEST:  Getting reasonable test sizes on linalg
 library, removing need for sharding. Change: 152546409

---
 tensorflow/contrib/linalg/BUILD | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tensorflow/contrib/linalg/BUILD b/tensorflow/contrib/linalg/BUILD
index 9b196e2cf5..34a293f80b 100644
--- a/tensorflow/contrib/linalg/BUILD
+++ b/tensorflow/contrib/linalg/BUILD
@@ -30,7 +30,7 @@ cuda_py_tests(
 
 cuda_py_tests(
     name = "linear_operator_addition_test",
-    size = "medium",
+    size = "small",
     srcs = ["python/kernel_tests/linear_operator_addition_test.py"],
     additional_deps = [
         ":linalg_py",
@@ -43,7 +43,6 @@ cuda_py_tests(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -61,7 +60,6 @@ cuda_py_tests(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -79,7 +77,6 @@ cuda_py_tests(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:random_ops",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -96,7 +93,6 @@ cuda_py_tests(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:random_ops",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -112,7 +108,6 @@ cuda_py_tests(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -128,7 +123,6 @@ cuda_py_tests(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -144,12 +138,11 @@ cuda_py_tests(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
     name = "linear_operator_util_test",
-    size = "small",
+    size = "medium",
     srcs = ["python/kernel_tests/linear_operator_util_test.py"],
     additional_deps = [
         ":linalg_py",
@@ -160,7 +153,6 @@ cuda_py_tests(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 py_library(
-- 
GitLab


From f2d09548722a98278fa9efd1ab33c0c87f9d58bd Mon Sep 17 00:00:00 2001
From: Rohan Jain <rohanj@google.com>
Date: Fri, 7 Apr 2017 14:07:01 -0800
Subject: [PATCH 0228/1563] Disabling _testSourceUtilModuleReturnsTrue as its
 causing opensource issues. Change: 152548721

---
 tensorflow/python/debug/lib/source_utils_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index 6010723d46..138c75de31 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -59,7 +59,7 @@ class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
     self.assertFalse(source_utils._guess_is_tensorflow_py_library(
         self.curr_file_path))
 
-  def testSourceUtilModuleReturnsTrue(self):
+  def _disabledtestSourceUtilModuleReturnsTrue(self):
     self.assertTrue(source_utils._guess_is_tensorflow_py_library(
         source_utils.__file__))
 
-- 
GitLab


From ef2f8891ad409e41f4f9b8e9cfd86b519adb6da6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 14:17:57 -0800
Subject: [PATCH 0229/1563] Fix race due to unsafe buffer forwarding in
 maxpooling second order gradients added in #6664. Re-enable previously flaky
 tests. Clean up a few minor things in maxpooling_op_gpu.cu.cc Change:
 152550050

---
 tensorflow/core/kernels/maxpooling_op.cc           | 4 ++--
 tensorflow/core/kernels/maxpooling_op_gpu.cu.cc    | 9 +++------
 tensorflow/python/kernel_tests/pooling_ops_test.py | 5 ++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/tensorflow/core/kernels/maxpooling_op.cc b/tensorflow/core/kernels/maxpooling_op.cc
index eb590280c9..6cb56797bf 100644
--- a/tensorflow/core/kernels/maxpooling_op.cc
+++ b/tensorflow/core/kernels/maxpooling_op.cc
@@ -587,8 +587,8 @@ class MaxPoolingGradGradOp<Eigen::GpuDevice, T> : public OpKernel {
         errors::InvalidArgument("out_grad_backprop must be 4-dimensional"));
 
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->forward_input_or_allocate_output(
-                                {2}, 0, tensor_out.shape(), &output));
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(0, tensor_out.shape(), &output));
 
     PoolParameters params{context,  ksize_,       stride_,
                           padding_, data_format_, tensor_in.shape()};
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
index 32b210ecb7..e3a57d2f28 100644
--- a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
@@ -70,7 +70,7 @@ __global__ void MaxPoolForwardNCHW(const int nthreads, const dtype* bottom_data,
     int wend = min(wstart + kernel_w, width);
     hstart = max(hstart, 0);
     wstart = max(wstart, 0);
-    dtype maxval = -FLT_MAX;
+    dtype maxval = Eigen::NumTraits<dtype>::lowest();
     int maxidx = -1;
     const dtype* bottom_data_n = bottom_data + n * channels * height * width;
     for (int h = hstart; h < hend; ++h) {
@@ -312,9 +312,6 @@ __global__ void MaxPoolGradBackwardNoMaskNHWC(
 //     bottom_offset: the pre-computed per-image offset of the maxpool output.
 //         This is equal to Hout*Wout*C.
 //     bottom_diff: the gradient of the gradient w.r.t. output.
-// This function relies on CudaAtomicAdd to avoid race conditions. Also, before
-// the kernel is run, you will need to make sure that bottom_diff is filled with
-// zero first.
 template <typename dtype>
 __global__ void MaxPoolGradBackward(const int nthreads, const dtype* top_diff,
                                     const int64* mask, const int top_offset,
@@ -357,12 +354,12 @@ bool MaxPoolBackwardNoMask<T>::operator()(
     const int stride_w, const int pad_t, const int pad_l, const T* top_diff,
     T* bottom_diff, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
-  const int bottom_size = batch * channels * height * width;
-  const int top_size = batch * channels * pooled_height * pooled_width;
 
+  const int bottom_size = batch * channels * height * width;
   SetZero<<<(bottom_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
             kThreadsPerBlock, 0, d.stream()>>>(bottom_size, bottom_diff);
 
+  const int top_size = batch * channels * pooled_height * pooled_width;
   MaxPoolBackwardNoMaskNHWC<<<(top_size + kThreadsPerBlock - 1) /
                                   kThreadsPerBlock,
                               kThreadsPerBlock, 0, d.stream()>>>(
diff --git a/tensorflow/python/kernel_tests/pooling_ops_test.py b/tensorflow/python/kernel_tests/pooling_ops_test.py
index 53a0d7d806..1b6c8bef98 100644
--- a/tensorflow/python/kernel_tests/pooling_ops_test.py
+++ b/tensorflow/python/kernel_tests/pooling_ops_test.py
@@ -1289,10 +1289,9 @@ class PoolingTest(test.TestCase):
       self._testMaxPoolGradGradValidPadding2_1_7(data_format, use_gpu)
       self._testMaxPoolGradGradValidPadding2_2(data_format, use_gpu)
       self._testMaxPoolGradGradSamePadding1_1(data_format, use_gpu)
+      self._testMaxPoolGradGradSamePadding2_1(data_format, use_gpu)
       self._testMaxPoolGradGradSamePadding2_2(data_format, use_gpu)
-      # Disable flaky test case
-      # self._testMaxPoolGradGradSamePadding2_1(data_format, use_gpu)
-      # self._testMaxPoolGradGradSamePadding3_1(data_format, use_gpu)
+      self._testMaxPoolGradGradSamePadding3_1(data_format, use_gpu)
 
   def _MaxPoolGradGrad(self, orig_input, orig_output, grad, window_rows,
                        window_cols, row_stride, col_stride, padding):
-- 
GitLab


From 7ec0b6864d80f86d919bf025299225571a785852 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Fri, 7 Apr 2017 15:54:13 -0800
Subject: [PATCH 0230/1563] LinearOperator:  adjoint_arg kwarg added to all
 operators.  Now, operator.apply(x, adjoint_arg=True) means that the adjoint
 of 'x' is taken before application of operator.  Sometimes this is done more
 efficiently than simply taking adjoint. Change: 152560471

---
 .../kernel_tests/linear_operator_test.py      |  5 +-
 .../linalg/python/ops/linear_operator.py      | 39 ++++++-----
 .../python/ops/linear_operator_composition.py | 14 ++--
 .../linalg/python/ops/linear_operator_diag.py |  6 +-
 .../python/ops/linear_operator_full_matrix.py |  9 ++-
 .../python/ops/linear_operator_identity.py    | 13 ++--
 .../python/ops/linear_operator_test_util.py   | 66 ++++++++++++-------
 .../linalg/python/ops/linear_operator_tril.py |  8 ++-
 .../python/ops/linear_operator_udvh_update.py | 12 ++--
 9 files changed, 104 insertions(+), 68 deletions(-)

diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
index 8b419700db..c5bfc6e1fd 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
@@ -78,8 +78,9 @@ class LinearOperatorApplyOnly(linalg.LinearOperator):
   def _shape_tensor(self):
     return array_ops.shape(self._matrix)
 
-  def _apply(self, x, adjoint=False):
-    return math_ops.matmul(self._matrix, x, adjoint_a=adjoint)
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    return math_ops.matmul(
+        self._matrix, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
 
 class LinearOperatorTest(test.TestCase):
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator.py b/tensorflow/contrib/linalg/python/ops/linear_operator.py
index 5052a0b15c..454411d93c 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator.py
@@ -30,7 +30,6 @@ __all__ = ["LinearOperator"]
 
 
 # TODO(langmore) Use matrix_solve_ls for singular or non-square matrices.
-# TODO(langmore) Add adjoint_x arg to apply, solve.
 class LinearOperator(object):
   """Base class defining a [batch of] linear operator[s].
 
@@ -490,16 +489,18 @@ class LinearOperator(object):
           "Expected argument to have dtype %s.  Found: %s in tensor %s"
           % (self.dtype, arg.dtype, arg))
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     raise NotImplementedError("_apply is not implemented.")
 
-  def apply(self, x, adjoint=False, name="apply"):
+  def apply(self, x, adjoint=False, adjoint_arg=False, name="apply"):
     """Transform `x` with left multiplication:  `x --> Ax`.
 
     Args:
       x: `Tensor` with compatible shape and same `dtype` as `self`.
         See class docstring for definition of compatibility.
-      adjoint: Python `bool`.  If `True`, left multiply by the adjoint.
+      adjoint: Python `bool`.  If `True`, left multiply by the adjoint: `A^H x`.
+      adjoint_arg:  Python `bool`.  If `True`, compute `A x^H` where `x^H` is
+        the hermitian transpose (transposition and complex conjugation).
       name:  A name for this `Op.
 
     Returns:
@@ -508,11 +509,12 @@ class LinearOperator(object):
     with self._name_scope(name, values=[x]):
       x = ops.convert_to_tensor(x, name="x")
       self._check_input_dtype(x)
-      if adjoint:
-        self.shape[-2].assert_is_compatible_with(x.get_shape()[-2])
-      else:
-        self.shape[-1].assert_is_compatible_with(x.get_shape()[-2])
-      return self._apply(x, adjoint=adjoint)
+
+      self_dim = -2 if adjoint else -1
+      arg_dim = -1 if adjoint_arg else -2
+      self.shape[self_dim].assert_is_compatible_with(x.get_shape()[arg_dim])
+
+      return self._apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
   def _determinant(self):
     raise NotImplementedError("_det is not implemented.")
@@ -558,13 +560,13 @@ class LinearOperator(object):
     with self._name_scope(name):
       return self._log_abs_determinant()
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     # Since this is an exact solve method for all rhs, this will only be
     # available for non-singular (batch) operators, in particular the operator
     # must be square.
     raise NotImplementedError("_solve is not implemented.")
 
-  def solve(self, rhs, adjoint=False, name="solve"):
+  def solve(self, rhs, adjoint=False, adjoint_arg=False, name="solve"):
     """Solve `R` (batch) systems of equations exactly: `A X = rhs`.
 
     Examples:
@@ -588,7 +590,9 @@ class LinearOperator(object):
       rhs: `Tensor` with same `dtype` as this operator and compatible shape.
         See class docstring for definition of compatibility.
       adjoint: Python `bool`.  If `True`, solve the system involving the adjoint
-        of this `LinearOperator`.
+        of this `LinearOperator`:  `A^H X = rhs`.
+      adjoint_arg:  Python `bool`.  If `True`, solve `A X = rhs^H` where `rhs^H`
+        is the hermitian transpose (transposition and complex conjugation).
       name:  A name scope to use for ops added by this method.
 
     Returns:
@@ -608,11 +612,12 @@ class LinearOperator(object):
     with self._name_scope(name, values=[rhs]):
       rhs = ops.convert_to_tensor(rhs, name="rhs")
       self._check_input_dtype(rhs)
-      if adjoint:
-        self.shape[-1].assert_is_compatible_with(rhs.get_shape()[-2])
-      else:
-        self.shape[-2].assert_is_compatible_with(rhs.get_shape()[-2])
-      return self._solve(rhs, adjoint=adjoint)
+
+      self_dim = -1 if adjoint else -2
+      arg_dim = -1 if adjoint_arg else -2
+      self.shape[self_dim].assert_is_compatible_with(rhs.get_shape()[arg_dim])
+
+      return self._solve(rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
   def _to_dense(self):
     """Generic and often inefficient implementation.  Override often."""
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
index 9f3a4d230f..b1557769b2 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
@@ -225,7 +225,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
 
     return array_ops.concat((batch_shape, matrix_shape), 0)
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     # If self.operators = [A, B], and not adjoint, then
     # apply_order_list = [B, A].
     # As a result, we return A.apply(B.apply(x))
@@ -234,8 +234,9 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
     else:
       apply_order_list = list(reversed(self.operators))
 
-    result = x
-    for operator in apply_order_list:
+    result = apply_order_list[0].apply(
+        x, adjoint=adjoint, adjoint_arg=adjoint_arg)
+    for operator in apply_order_list[1:]:
       result = operator.apply(result, adjoint=adjoint)
     return result
 
@@ -251,7 +252,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
       result += operator.log_abs_determinant()
     return result
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     # TODO(langmore) Implement solve using solve_ls if some intermediate
     # operator maps to a high dimensional space.
     # In that case, an exact solve may still be possible.
@@ -264,8 +265,9 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
     else:
       solve_order_list = self.operators
 
-    solution = rhs
-    for operator in solve_order_list:
+    solution = solve_order_list[0].solve(
+        rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
+    for operator in solve_order_list[1:]:
       solution = operator.solve(solution, adjoint=adjoint)
     return solution
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
index 0cd7e72a8b..97e52d08a4 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
@@ -206,8 +206,9 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
             "This diagonal operator contained non-zero imaginary values.  "
             " Thus it was not self-adjoint."))
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     diag_term = math_ops.conj(self._diag) if adjoint else self._diag
+    x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     diag_mat = array_ops.expand_dims(diag_term, -1)
     return diag_mat * x
 
@@ -218,8 +219,9 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
     return math_ops.reduce_sum(
         math_ops.log(math_ops.abs(self._diag)), reduction_indices=[-1])
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     diag_term = math_ops.conj(self._diag) if adjoint else self._diag
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     inv_diag_mat = array_ops.expand_dims(1. / diag_term, -1)
     return rhs * inv_diag_mat
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
index f934968221..64ab561457 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.linalg.python.ops import linear_operator
+from tensorflow.contrib.linalg.python.ops import linear_operator_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -172,8 +173,9 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   def _shape_tensor(self):
     return array_ops.shape(self._matrix)
 
-  def _apply(self, x, adjoint=False):
-    return math_ops.matmul(self._matrix, x, adjoint_a=adjoint)
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    return math_ops.matmul(
+        self._matrix, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
   def _determinant(self):
     if self._is_spd:
@@ -187,7 +189,8 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
     abs_det = math_ops.abs(self.determinant())
     return math_ops.log(abs_det)
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     if self._is_spd:
       return linalg_ops.cholesky_solve(self._chol, rhs)
     return linalg_ops.matrix_solve(self._matrix, rhs, adjoint=adjoint)
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
index 60d8b2cdc0..845bf25192 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
@@ -329,8 +329,9 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
     zeros = array_ops.zeros(shape=special_shape, dtype=self.dtype)
     return x + zeros
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     # Note that adjoint has no effect since this matrix is self-adjoint.
+    x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     if self._assert_proper_shapes:
       aps = linear_operator_util.assert_compatible_matrix_dimensions(
           self, x)
@@ -343,8 +344,8 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
   def _log_abs_determinant(self):
     return array_ops.zeros(shape=self.batch_shape_tensor(), dtype=self.dtype)
 
-  def _solve(self, rhs, adjoint=False):
-    return self._apply(rhs)
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    return self._apply(rhs, adjoint_arg=adjoint_arg)
 
   def _diag_part(self):
     return self._ones_diag()
@@ -616,7 +617,8 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
         imag_multiplier,
         message="LinearOperator was not self-adjoint")
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     if adjoint:
       matrix = self._multiplier_matrix_conj
     else:
@@ -634,7 +636,8 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
     return self._num_rows_cast_to_real_dtype * math_ops.log(
         self._abs_multiplier)
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     if adjoint:
       matrix = self._multiplier_matrix_conj
     else:
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py b/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
index 0b7fc3da39..c8bc62eeef 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
@@ -23,6 +23,7 @@ import numpy as np
 import six
 
 from tensorflow.contrib.framework.python.framework import tensor_util as contrib_tensor_util
+from tensorflow.contrib.linalg.python.ops import linear_operator_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import random_seed
@@ -213,18 +214,26 @@ class LinearOperatorDerivedClassTest(test.TestCase):
       for shape in self._shapes_to_test:
         for dtype in self._dtypes_to_test:
           for adjoint in False, True:
-            with self.test_session(graph=ops.Graph()) as sess:
-              sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
-              operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
-                  shape, dtype, use_placeholder=use_placeholder)
-              x = self._make_x(operator, adjoint=adjoint)
-              op_apply = operator.apply(x, adjoint=adjoint)
-              mat_apply = math_ops.matmul(mat, x, adjoint_a=adjoint)
-              if not use_placeholder:
-                self.assertAllEqual(op_apply.get_shape(), mat_apply.get_shape())
-              op_apply_v, mat_apply_v = sess.run([op_apply, mat_apply],
-                                                 feed_dict=feed_dict)
-              self.assertAC(op_apply_v, mat_apply_v)
+            for adjoint_arg in False, True:
+              with self.test_session(graph=ops.Graph()) as sess:
+                sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
+                operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
+                    shape, dtype, use_placeholder=use_placeholder)
+                x = self._make_x(operator, adjoint=adjoint)
+                # If adjoint_arg, compute A X^H^H = A X.
+                if adjoint_arg:
+                  op_apply = operator.apply(
+                      linear_operator_util.matrix_adjoint(x),
+                      adjoint=adjoint, adjoint_arg=adjoint_arg)
+                else:
+                  op_apply = operator.apply(x, adjoint=adjoint)
+                mat_apply = math_ops.matmul(mat, x, adjoint_a=adjoint)
+                if not use_placeholder:
+                  self.assertAllEqual(
+                      op_apply.get_shape(), mat_apply.get_shape())
+                op_apply_v, mat_apply_v = sess.run([op_apply, mat_apply],
+                                                   feed_dict=feed_dict)
+                self.assertAC(op_apply_v, mat_apply_v)
 
   def test_solve(self):
     self._skip_if_tests_to_skip_contains("solve")
@@ -232,18 +241,27 @@ class LinearOperatorDerivedClassTest(test.TestCase):
       for shape in self._shapes_to_test:
         for dtype in self._dtypes_to_test:
           for adjoint in False, True:
-            with self.test_session(graph=ops.Graph()) as sess:
-              sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
-              operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
-                  shape, dtype, use_placeholder=use_placeholder)
-              rhs = self._make_rhs(operator, adjoint=adjoint)
-              op_solve = operator.solve(rhs, adjoint=adjoint)
-              mat_solve = linalg_ops.matrix_solve(mat, rhs, adjoint=adjoint)
-              if not use_placeholder:
-                self.assertAllEqual(op_solve.get_shape(), mat_solve.get_shape())
-              op_solve_v, mat_solve_v = sess.run([op_solve, mat_solve],
-                                                 feed_dict=feed_dict)
-              self.assertAC(op_solve_v, mat_solve_v)
+            for adjoint_arg in False, True:
+              with self.test_session(graph=ops.Graph()) as sess:
+                sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
+                operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
+                    shape, dtype, use_placeholder=use_placeholder)
+                rhs = self._make_rhs(operator, adjoint=adjoint)
+                # If adjoint_arg, solve A X = (rhs^H)^H = rhs.
+                if adjoint_arg:
+                  op_solve = operator.solve(
+                      linear_operator_util.matrix_adjoint(rhs),
+                      adjoint=adjoint, adjoint_arg=adjoint_arg)
+                else:
+                  op_solve = operator.solve(
+                      rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
+                mat_solve = linalg_ops.matrix_solve(mat, rhs, adjoint=adjoint)
+                if not use_placeholder:
+                  self.assertAllEqual(
+                      op_solve.get_shape(), mat_solve.get_shape())
+                op_solve_v, mat_solve_v = sess.run([op_solve, mat_solve],
+                                                   feed_dict=feed_dict)
+                self.assertAC(op_solve_v, mat_solve_v)
 
   def test_add_to_tensor(self):
     self._skip_if_tests_to_skip_contains("add_to_tensor")
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
index 38461ce8a2..756e26cc13 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
@@ -173,8 +173,9 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
         self._diag,
         message="Singular operator:  Diagonal contained zero values.")
 
-  def _apply(self, x, adjoint=False):
-    return math_ops.matmul(self._tril, x, adjoint_a=adjoint)
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    return math_ops.matmul(
+        self._tril, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
   def _determinant(self):
     return math_ops.reduce_prod(self._diag, reduction_indices=[-1])
@@ -183,7 +184,8 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
     return math_ops.reduce_sum(
         math_ops.log(math_ops.abs(self._diag)), reduction_indices=[-1])
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     return linalg_ops.matrix_triangular_solve(
         self._tril, rhs, lower=True, adjoint=adjoint)
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py b/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
index 89b5c1ab1b..4ca77ab147 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
@@ -348,21 +348,21 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
     return array_ops.concat(
         [batch_shape, self.base_operator.shape_tensor()[-2:]], axis=0)
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     u = self.u
     v = self.v
     l = self.base_operator
     d = self.diag_operator
 
-    leading_term = l.apply(x, adjoint=adjoint)
+    leading_term = l.apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
     if adjoint:
-      uh_x = math_ops.matmul(u, x, adjoint_a=True)
+      uh_x = math_ops.matmul(u, x, adjoint_a=True, adjoint_b=adjoint_arg)
       d_uh_x = d.apply(uh_x, adjoint=adjoint)
       v_d_uh_x = math_ops.matmul(v, d_uh_x)
       return leading_term + v_d_uh_x
     else:
-      vh_x = math_ops.matmul(v, x, adjoint_a=True)
+      vh_x = math_ops.matmul(v, x, adjoint_a=True, adjoint_b=adjoint_arg)
       d_vh_x = d.apply(vh_x, adjoint=adjoint)
       u_d_vh_x = math_ops.matmul(u, d_vh_x)
       return leading_term + u_d_vh_x
@@ -398,7 +398,7 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
 
     return log_abs_det_c + log_abs_det_d + log_abs_det_l
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     if self.base_operator.is_non_singular is False:
       raise ValueError(
           "Solve not implemented unless this is a perturbation of a "
@@ -421,7 +421,7 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
       u = self.u
 
     # L^{-1} rhs
-    linv_rhs = l.solve(rhs, adjoint=adjoint)
+    linv_rhs = l.solve(rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
     # V^H L^{-1} rhs
     vh_linv_rhs = math_ops.matmul(v, linv_rhs, adjoint_a=True)
     # C^{-1} V^H L^{-1} rhs
-- 
GitLab


From 372b034492763b6b03a14fc66ee6e712724c0ee3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 16:00:22 -0800
Subject: [PATCH 0231/1563] Adds weighted_average_loss metric key. Change:
 152560999

---
 tensorflow/python/estimator/model_fn.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/python/estimator/model_fn.py b/tensorflow/python/estimator/model_fn.py
index ee5999c78b..a9d044fcfe 100644
--- a/tensorflow/python/estimator/model_fn.py
+++ b/tensorflow/python/estimator/model_fn.py
@@ -51,6 +51,7 @@ class ModeKeys(object):
 class MetricKeys(object):
   """Metric key strings."""
   LOSS = 'loss'
+  AVERAGE_LOSS = 'average_loss'
 
 
 class EstimatorSpec(
-- 
GitLab


From 32c80cd7a4240f7d373325c93e37c6468f1311c4 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Fri, 7 Apr 2017 16:25:10 -0800
Subject: [PATCH 0232/1563] Documentation: Fix bug in manual device placement
 example Change: 152563392

---
 tensorflow/docs_src/tutorials/using_gpu.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tensorflow/docs_src/tutorials/using_gpu.md b/tensorflow/docs_src/tutorials/using_gpu.md
index d64cdafdef..dcec62d274 100644
--- a/tensorflow/docs_src/tutorials/using_gpu.md
+++ b/tensorflow/docs_src/tutorials/using_gpu.md
@@ -57,14 +57,17 @@ have the same device assignment.
 with tf.device('/cpu:0'):
   a = tf.constant([1.0, 2.0, 3.0, 4.0, 5.0, 6.0], shape=[2, 3], name='a')
   b = tf.constant([1.0, 2.0, 3.0, 4.0, 5.0, 6.0], shape=[3, 2], name='b')
-  c = tf.matmul(a, b)
+c = tf.matmul(a, b)
 # Creates a session with log_device_placement set to True.
 sess = tf.Session(config=tf.ConfigProto(log_device_placement=True))
 # Runs the op.
 print(sess.run(c))
 ```
 
-You will see that now `a` and `b` are assigned to `cpu:0`.
+You will see that now `a` and `b` are assigned to `cpu:0`. Since a device was
+not explicitly specified for the `MatMul` operation, the TensorFlow runtime will
+choose one based on the operation and available devices (`gpu:0` in this
+example) and automatically copy tensors between devices if required.
 
 ```
 Device mapping:
-- 
GitLab


From 52dcb2590bb9274262656c958c105cb5e5cc1300 Mon Sep 17 00:00:00 2001
From: Rohan Jain <rohan100jain@gmail.com>
Date: Fri, 7 Apr 2017 18:04:26 -0700
Subject: [PATCH 0233/1563] Branch 152550050 (#9059)

* Improve py_func error handling.

Automatically translate some python errors into corresponding TF errors at runtime.
Change: 152156821

* Update interaction with libpng so that we use the public API instead of
knowledge of the internal libpng data structures.
Change: 152167754

* TensorBoard plugins now contain their own name/route prefix.
Change: 152167807

* Passes trainable flag to separable_conv2d biases.
Change: 152170239

* Saving resource variables with a caching device.
Change: 152171539

* Drop loss from estimator_spec.eval_metric_ops, as required by core Estimator.
Change: 152179924

* sample_stats.percentile DOCFIX.
Change: 152182295

* Added a memory optimizer to grappler.
Change: 152184170

* Change default behavior of the tf runs selector:

- If there are fewer than 41 runs, enable them all by default
- If there are 41 runs or more, disable them all by default

This is in response to user complaints that having it enable only the first ten runs by default was confusing, because it was not obvious to users that some runs had been disabled.
However, it still solves the initial user complaint that having very many runs simultaneously enabled would lag the UI.

I also changed the "toggle all runs" button to try to turn everything off before turning everything on.
Also, I improved the logic for detecting when the runs selection is back in the default state, so that we can avoid generating long URI strings wherever possible.
Change: 152188948

* Autogenerated Change: Change TensorBoard TAG to 52
Change: 152189000

* Remove warning that only happening with config cuda.
Change: 152189205

* Make resource variable shared name consistent with non-resource variables.

Remove colocation constraint from resource variable cached value with the
variable itself.
Change: 152192203

* Add a way to specify the optimization order; refactor and add constant folding to meta optimizer.
Change: 152193646

* Backport fixes and improvements from external Keras.
Change: 152198296

* Merge changes from github.
Change: 152200430

* Go: Update generated wrapper functions for TensorFlow ops.
Change: 152200754

* Update ops-related pbtxt files.
Change: 152203174

* Make ImportGraphDef() work with functions.

In addition to modify graph_constructor.cc, this patch adds some other
functionality to enable importing fucntions:
* Ability to add FunctionDefLibraries to Graphs and
  FunctionLibraryDefinitions (in addition to existing functions)
* FunctionDefsEqual() utility function
Change: 152205258

* Expand contrib test to more than just test targets.
Change: 152206822

* Preserve graph version during optimization
Change: 152213262

* Exclude enter and exit nodes from shape refiner's constant folding.
Change: 152213637

* Allow reshape_mover and algebraic_simplifier to make multiple mutations, by avoiding the short-circuit
std::any_of.
Change: 152232810

* Fix dynamic_rnn transpose bug (can input/output non-3d tensors).

Also a few cleanups to RNN code.
Change: 152267628

* Fix flaky tests
Change: 152272801

* Add an auto parallelization grappler optimization pass.
Change: 152276787

* Change json.decode.JSONDecodeError to ValueError.  JSONDecodeError seems to be
the exception used in the simplejson module, not the json module.
Change: 152278012

* Internal change.
Change: 152281471

* [XLA] Force buffer sharing of separate while instructions.
Change: 152288540

* replica_device_setter should work for resource variables
Change: 152289915

* Fix ./configure script
1. Add %workspace% in .bazelrc file when using import statement
2. Write action_env into bazelrc file for required environment variables for OpenCL support
Change: 152290700

* Pointing a number of Tensorboard graph visualization-related help links to the new locations for the correspondent API documentation.
Change: 152293459

* Restore most of pull request #8606

Pull request #8606 added str(Label(...)) for most dependencies in
tensorflow.bzl, allowing most functions to be used from repositories which
include TensorFlow as a submodule.  Unfortunately, it broke when pulled into
Google and was removed in cl/152200430.  This CL restores the change, except
for two Android-only functions; these were the only problematic bits.
Change: 152297413

* Removed dead code in Estimator.
Change: 152297597

* Assert rank is at least equal to new_rank for `_sparse_inner_flatten`.
Change: 152303319

* Extend quantization ranges to include 0.0f.
Change: 152304380

* Remove Keras config file saving.
Change: 152306552

* API backwards compatibility tests.
Change: 152310869

* [TF:XLA] Add a test for an R3 -> R4 broadcast.
Change: 152313967

* Fix the problem that no enough placeholders for persistent tensor
batch delete

The deleter_key is always a device_name, hence there is only one
of it. Hence, we cannot delete >1 handles at one time.

In the fix, it creates delete placeholder on demand, the max
number of placeholders is _DEAD_HANDLES_THRESHOLD.
Change: 152322770

* [XLA] Add several reduction tests.
Change: 152323510

* Added the memory optimizer to the meta optimizer.
Change: 152323689

* Started a set of utilities to categorize op types
Change: 152329057

* Add AudioSpectrogram op to TensorFlow for audio feature generation
Change: 152332221

* Update ops-related pbtxt files.
Change: 152332812

* Automated rollback of change 152332221
Change: 152333917

* Call Py_CLEAR on dead fields during TF_RESOURCE-to-ndarray conversion
Change: 152338333

* [TF contrib seq2seq] Initial, incomplete implementation of beam search decoder.

**DOES NOT WORK, pushed for collaboration only**
Change: 152343927

* [XLA] Change HloPassPipeline to disallow Add* calls after Run.
Change: 152345578

* Automated rollback of change 152332812
Change: 152349057

* Remove all 64/32 bit compiler warnings from core/ops.
Change: 152353506

* libtensorflow.so: Don't export private symbols.

With this change, libtensorflow.so will only export
functions defined in c_api.h. This also results in
a decreased binary size of libtensorflow.so.

On Linux the decrease was from roughly 150MB to 67MB.
On OS X it was from roughly 101MB to 82MB.

Also fixes #8923
Change: 152366053

* Add Elu ops in XLA.
Change: 152383201

* Fixed test. ('broadcast_dims' has size 1)
Change: 152383633

* Add more detailed error message for rank assertion in _sparse_inner_flatten.
Change: 152397909

* tensor_bundle: propagrates errors related to directory creation.
Change: 152401909

* matrix_adjoint added to contrib/linalg/linear_operator_util
Change: 152404828

* Add an is_active method to plugins

This method determines whether a plugin is active. A plugin may be inactive if say it lacks data. This new is_active method allows us to add a route to TensorBoard noting which plugins are active. The frontend could then avoid querying routes of inactive plugins.
Change: 152406232

* Replace a gather op for shapes by a stack op so dilated convolutions can be
placed on GPU even with strict placing (before the gather went to CPU).
Change: 152411159

* [TF:XLA] Implement BatchToSpace, BatchToSpaceND, SpaceToBatch, SpaceToBatchND.
Fix crashes in core implementations of the same operators for zero-sized blocks.
Change: 152416903

* Estimator saves relative paths in checkpoint.
Change: 152420211

* Fix layers_test exception regex matching.
Change: 152422855

* Unhide bijectors. Correct TransformedDistribution docstring.
Change: 152424418

* Choosing a saner default for min_eval_frequency in the constructor for Experiment for the GCS file system, because the default of 1 causes performance problems.
Change: 152439984

* Inherit use_resource from scope for partitioned variables.
Change: 152442103

* Support quantized reshape in hexagon runtime
Change: 152445539

* tfdbg CLI: add command list_source (ls) + UI fixes and improvements

The new list_source (shorthand: ls) command lists Python source files responsible for constructing the nodes and tensors encountered in the run() call.

It divides the source files into two categories and list them separately.
1) files that are not part of the TensorFlow Python library, and
2) files that are a part of it.

The list contains information about how many nodes, tensors and dumps of tensors the files is responsible for. The file paths contain clickable links to the existing print_source/ps command.

The list_source/ls command supports filtering by file-path and node-name regex patterns.

UI fixes:
* Fixed inconsistent black vs. transparent background color that made the layout look messy on some terminal types. Now using the transparent color for default font color consistently.
* In the print_source command output, add clickable links to expand source lines and graph elements.
Change: 152446002

* tfcompile: Be a little more verbose about missing required flags.

Fixes #9014
Change: 152446338

* Disable failing test cases in pooling_ops_test.
Change: 152447322

* Register more types for tf.image_crop_and_resize(). Resolves #9020.
Change: 152448160

* Automated rollback of change 152439984
Change: 152450929

* Add a route to TensorBoard for fetching plugin names

Specifically, we add a /data/plugins_listing route to the TensorBoard application. This route responds with an object mapping the name of each initialized plugin to whether it is active.

This route could help the frontend avoid issuing requests to inactive plugins.

Ordered the listing of routes within application.py so there is a little more organization.

Refactored the test for application to use a fake plugin.
Change: 152451390

* Added the ability to retrieve the amount of usable gpu memory
Change: 152453470

* Allow to set session ConfigProto in RunConfig and use it in Estimator.
Change: 152454548

* Colocate ResourceVariable reads with their handles.
Change: 152455939

* tfdbg: update doc for new command list_source/ls
Change: 152456128

* Make rnn directions slightly easier to follow.
Change: 152456296

* Internal change
Change: 152458104

* Adds batch renormalization.

NOTE: if you use renormalization, you might want to use faster moving average updates, i.e. lower `decay` values.
Change: 152458872

* When using ImportGraphDef with a passed in ShapeRefiner, use the
producer version of the GraphDef when importing; the ShapeRefiner
may be initialized with a different graph_def_version, so we need
to be able to override it.

The test failed without the change to graph_constructor and passes with it.
The test uses a legacy graph that is supported (reduction shape).
Change: 152459169

* Allow any iterable for `export_strategies` arg.
Change: 152461826

* Log steps/sec every 100 steps in MonitoredSession, as before.
Change: 152465320

* Fixes documentation to note that the in case of ties the identity of the return value of ArgMin and ArgMaxis not guaranteed .
Change: 152465346

* Automated rollback of change 152465346
Change: 152465844

* Fix shape inference fn on _ParallelConcatStart.
Change: 152466076

* Fix getting started guide

Explain numerical differences in loss
fix one example to print
Change: 152466119

* Remove superfluous mode argument.
Change: 152467334

* Add a tool that converts HLO computations to tensorflow GraphDef which can be visualized on Tensorboard.

This CL defines basic tensorflow::OpDef for each HLO instruction/node. More attributes (e.g. shapes, colors) will be added in the future.
Change: 152477918

* [TF:XLA] Increase shard count of //third_party/tensorflow/compiler/tests:spacetobatch_test to reduce flakiness when built under ASAN.
Change: 152496244

* Make projector plugin backend read assets saved via the PluginAssets API.

At the same time, keep backwards compatibility with the old way of looking up assets.
Change: 152504793

* Move MNIST pointers to mirror hosted by the CVDF on Google Cloud.
Fixes: #9031
Change: 152504901

* Merge changes from github.
Change: 152508170

* Update API after changing default step couter frequency before.
Change: 152517535

* Move a few random op helper functions to header files

1. shape_inference::RandomShape
2. OpKernel::MakeShape(Tensor, TensorShape*)
Change: 152522156

* addresses the divide by zero bug
Change: 152522488

* Clarify doc on tf.assign.
Change: 152523909

* Sparse adam for resource variables.
Change: 152525327

* Automated rollback of change 152310869
Change: 152528732

* Add an env_var tf_sync_on_finish_bool that block until device has finished all queued operations in a step if true.
Change: 152533676

* Add more node attributes for HloInstruction on Tensorboard e.g. shape and layout etc.
Change: 152534472

* Add tf.complex64 GPU support to tf.gather.

Also add ldg specializations for std::complex.
Change: 152537848

* Formatting changes
Change: 152544842

* Upgrade TensorBoard TypeScript to 2.2.1

See also: #8326
Change: 152545950

* TEST:  Getting reasonable test sizes on linalg library, removing need for
sharding.
Change: 152546409

* Disabling _testSourceUtilModuleReturnsTrue as its causing opensource issues.
Change: 152548721

* Fix race due to unsafe buffer forwarding in maxpooling second order gradients added in #6664.
Re-enable previously flaky tests.
Clean up a few minor things in maxpooling_op_gpu.cu.cc
Change: 152550050
---
 configure                                     |   6 +-
 tensorflow/BUILD                              |  15 +
 tensorflow/c/BUILD                            |   8 +
 tensorflow/c/exported_symbols.lds             |   1 +
 tensorflow/c/version_script.lds               |   9 +
 tensorflow/compiler/aot/tfcompile_main.cc     |  30 +-
 tensorflow/compiler/tests/BUILD               |  14 +
 tensorflow/compiler/tests/binary_ops_test.py  |   6 +
 tensorflow/compiler/tests/randomized_tests.cc | 179 +++++++++-
 .../compiler/tests/spacetobatch_op_test.py    | 266 ++++++++++++++
 tensorflow/compiler/tests/unary_ops_test.py   |   5 +
 tensorflow/compiler/tf2xla/const_analysis.cc  |   6 +
 tensorflow/compiler/tf2xla/kernels/BUILD      |   3 +
 .../tf2xla/kernels/batchtospace_op.cc         | 186 ++++++++++
 tensorflow/compiler/tf2xla/kernels/elu_op.cc  |  65 ++++
 .../tf2xla/kernels/spacetobatch_op.cc         | 190 ++++++++++
 tensorflow/compiler/tf2xla/xla_op_kernel.cc   |  25 ++
 tensorflow/compiler/tf2xla/xla_op_kernel.h    |   3 +
 tensorflow/compiler/xla/service/BUILD         |   2 +
 .../xla/service/algebraic_simplifier_test.cc  |   2 +-
 .../compiler/xla/service/buffer_assignment.cc | 163 +++++++--
 .../compiler/xla/service/buffer_assignment.h  |  10 +-
 .../xla/service/buffer_assignment_test.cc     | 161 ++++++++-
 tensorflow/compiler/xla/service/hlo_opcode.cc |  13 +
 tensorflow/compiler/xla/service/hlo_opcode.h  |   3 +
 .../compiler/xla/service/hlo_pass_pipeline.cc |   2 +
 .../compiler/xla/service/hlo_pass_pipeline.h  |   3 +
 .../compiler/xla/service/liveness_util.cc     |  11 +-
 .../xla/service/liveness_util_test.cc         |  68 ++++
 .../compiler/xla/tests/broadcast_test.cc      |  31 ++
 tensorflow/compiler/xla/tests/reduce_test.cc  |   5 +-
 tensorflow/compiler/xla/tools/BUILD           |  46 +++
 .../dumped_computation_to_tf_graphdef.cc      | 139 ++++++++
 .../compiler/xla/tools/hlo_tfgraph_builder.cc | 204 +++++++++++
 .../compiler/xla/tools/hlo_tfgraph_builder.h  |  59 ++++
 .../xla/tools/hlo_tfgraph_builder_test.cc     | 154 ++++++++
 .../kernel_tests/stochastic_tensor_test.py    |  42 +--
 tensorflow/contrib/distributions/__init__.py  |   7 +-
 .../kernel_tests/bijectors/affine_test.py     |  20 +-
 .../kernel_tests/bijectors/chain_test.py      |   3 +-
 .../kernel_tests/bijectors/sigmoid_test.py    |  18 +-
 .../python/ops/relaxed_bernoulli.py           |  11 +-
 .../contrib/keras/python/keras/backend.py     |   2 +-
 .../contrib/layers/python/layers/layers.py    |  33 +-
 .../layers/python/layers/layers_test.py       |  24 ++
 .../learn/python/learn/datasets/mnist.py      |   3 +-
 .../python/learn/estimators/estimator.py      |  11 +-
 .../learn/python/learn/estimators/model_fn.py |  18 +-
 .../python/learn/estimators/model_fn_test.py  |  56 +--
 .../python/learn/estimators/run_config.py     |  11 +-
 .../contrib/learn/python/learn/experiment.py  |  26 +-
 .../learn/python/learn/experiment_test.py     |  23 +-
 .../python/learn/learn_io/generator_io.py     |   1 +
 .../learn/learn_io/generator_io_test.py       |   2 +-
 .../learn/python/learn/learn_io/graph_io.py   |   5 +-
 .../python/learn/learn_io/graph_io_test.py    |  14 +-
 .../learn/python/learn/utils/gc_test.py       |   4 -
 tensorflow/contrib/linalg/BUILD               |  12 +-
 .../kernel_tests/linear_operator_util_test.py |  23 ++
 .../linalg/python/ops/linear_operator_util.py |  47 +++
 .../seq2seq/python/ops/beam_search_decoder.py | 236 +++++++++++++
 .../contrib/seq2seq/python/ops/decoder.py     |  30 +-
 tensorflow/contrib/session_bundle/gc_test.py  |   4 -
 tensorflow/core/BUILD                         |   7 +-
 .../core/common_runtime/direct_session.cc     |  12 +-
 .../core/common_runtime/direct_session.h      |   2 +
 .../core/common_runtime/shape_refiner.h       |   6 +-
 .../core/distributed_runtime/graph_mgr.cc     |  10 +-
 .../core/distributed_runtime/graph_mgr.h      |   3 +
 tensorflow/core/framework/common_shape_fns.cc |   7 +
 tensorflow/core/framework/common_shape_fns.h  |   3 +
 tensorflow/core/framework/op_kernel.cc        |  17 +
 tensorflow/core/framework/op_kernel.h         |   4 +
 tensorflow/core/framework/shape_inference.cc  |  22 +-
 tensorflow/core/framework/shape_inference.h   |  14 +-
 tensorflow/core/graph/graph_constructor.cc    |  35 +-
 .../core/graph/graph_constructor_test.cc      | 171 +++++++++
 tensorflow/core/grappler/BUILD                |  11 +
 tensorflow/core/grappler/devices.cc           |  16 +
 tensorflow/core/grappler/devices.h            |   4 +
 .../core/grappler/grappler_item_builder.cc    |   3 +-
 tensorflow/core/grappler/op_types.cc          |  27 ++
 tensorflow/core/grappler/op_types.h           |  29 ++
 tensorflow/core/grappler/optimizers/BUILD     |  35 ++
 .../core/grappler/optimizers/auto_parallel.cc | 260 ++++++++++++++
 .../core/grappler/optimizers/auto_parallel.h  |  63 ++++
 .../grappler/optimizers/auto_parallel_test.cc | 125 +++++++
 .../grappler/optimizers/meta_optimizer.cc     |  12 +-
 tensorflow/core/kernels/batchtospace_op.cc    |   4 +
 tensorflow/core/kernels/crop_and_resize_op.cc |  49 ++-
 .../core/kernels/crop_and_resize_op_gpu.cu.cc |  34 +-
 .../core/kernels/crop_and_resize_op_test.cc   |  51 ++-
 tensorflow/core/kernels/gather_functor.cc     |   1 +
 .../core/kernels/gather_functor_gpu.cu.cc     |   1 +
 tensorflow/core/kernels/gather_op.cc          |   1 +
 tensorflow/core/kernels/gather_op_test.cc     |  34 +-
 .../hexagon/hexagon_graph_execution_test.cc   | 113 ++++--
 .../hexagon/hexagon_ops_definitions.cc        |   1 +
 tensorflow/core/kernels/maxpooling_op.cc      |   4 +-
 .../core/kernels/maxpooling_op_gpu.cu.cc      |   9 +-
 tensorflow/core/kernels/quantize_op.cc        |   1 +
 tensorflow/core/kernels/quantize_op_test.cc   |  44 +++
 tensorflow/core/kernels/random_op.cc          |  30 +-
 tensorflow/core/kernels/random_poisson_op.cc  |  22 +-
 .../core/kernels/save_restore_v2_ops.cc       |   6 +-
 tensorflow/core/kernels/spacetobatch_op.cc    |   4 +
 tensorflow/core/lib/random/philox_random.h    |  14 +-
 tensorflow/core/ops/array_ops.cc              |  21 +-
 tensorflow/core/ops/array_ops_test.cc         |  12 +
 tensorflow/core/ops/data_flow_ops.cc          |   2 +-
 tensorflow/core/ops/random_ops.cc             |  21 +-
 tensorflow/core/ops/set_ops.cc                |   4 +-
 tensorflow/core/platform/cpu_info.cc          |   2 +-
 .../core/protobuf/rewriter_config.proto       |   9 +
 tensorflow/core/util/cuda_kernel_helper.h     |  22 ++
 .../core/util/tensor_bundle/tensor_bundle.cc  |  18 +-
 .../core/util/tensor_bundle/tensor_bundle.h   |   4 +
 .../docs_src/get_started/get_started.md       |   4 +
 .../docs_src/programmers_guide/debugger.md    |   2 +
 tensorflow/docs_src/tutorials/recurrent.md    |  19 +-
 tensorflow/python/client/session.py           |   3 +-
 tensorflow/python/client/tf_session_helper.cc |   2 +
 tensorflow/python/debug/BUILD                 |   2 +
 tensorflow/python/debug/cli/analyzer_cli.py   | 166 ++++++++-
 .../python/debug/cli/analyzer_cli_test.py     |  91 ++++-
 tensorflow/python/debug/cli/cli_shared.py     |  12 +-
 tensorflow/python/debug/cli/curses_ui.py      |  84 +++--
 tensorflow/python/debug/cli/stepper_cli.py    |  20 +-
 tensorflow/python/debug/lib/source_utils.py   | 145 +++++++-
 .../python/debug/lib/source_utils_test.py     | 158 +++++++++
 tensorflow/python/estimator/BUILD             |  16 +-
 tensorflow/python/estimator/estimator.py      |  20 +-
 tensorflow/python/estimator/estimator_test.py |  38 ++
 tensorflow/python/estimator/run_config.py     |   4 +
 .../python/kernel_tests/gather_op_test.py     | 103 +++---
 .../python/kernel_tests/linalg_ops_test.py    |   2 +-
 tensorflow/python/layers/normalization.py     | 273 ++++++++++----
 .../python/layers/normalization_test.py       |  59 ++++
 tensorflow/python/ops/array_ops.py            |  13 +-
 tensorflow/python/ops/nn_ops.py               |   6 +-
 .../python/ops/resource_variable_ops.py       |  16 +-
 tensorflow/python/ops/rnn.py                  |  68 ++--
 tensorflow/python/ops/session_ops.py          |  14 +-
 tensorflow/python/ops/state_ops.py            |   9 +-
 tensorflow/python/ops/variable_scope.py       |   2 +
 tensorflow/python/training/adam.py            |  33 +-
 tensorflow/python/training/adam_test.py       |  16 +-
 tensorflow/python/training/device_setter.py   |   2 +-
 .../python/training/device_setter_test.py     |   7 +
 .../python/training/monitored_session.py      |   2 +-
 tensorflow/tensorboard/backend/application.py |  48 ++-
 .../tensorboard/backend/application_test.py   |  65 +++-
 .../event_processing/event_accumulator.py     |   8 +
 .../event_accumulator_test.py                 |  10 +-
 .../event_processing/event_multiplexer.py     |  15 +
 .../event_multiplexer_test.py                 |  47 ++-
 .../tf-no-data-warning.html                   |   9 +-
 tensorflow/tensorboard/http_api.md            |   7 +
 tensorflow/tensorboard/package.json           |   2 +-
 tensorflow/tensorboard/plugins/base_plugin.py |  12 +
 .../plugins/debugger/debugger_plugin.py       |  15 +
 .../plugins/debugger/debugger_plugin_test.py  |  13 +
 .../plugins/projector/projector_plugin.py     | 107 ++++--
 .../projector/projector_plugin_test.py        | 332 +++++++++++++++++-
 .../tensorboard/plugins/text/text_plugin.py   |  10 +
 .../plugins/text/text_plugin_test.py          |  14 +
 tensorflow/tensorflow.bzl                     | 142 ++++----
 .../tools/dist_test/server/Dockerfile.test    |   8 +-
 .../notebooks/3_mnist_from_scratch.ipynb      |   2 +-
 .../graph_transforms/quantize_weights.cc      |   4 +
 .../graph_transforms/quantize_weights_test.cc | 120 +++++--
 tensorflow/workspace.bzl                      |  37 +-
 third_party/fft2d/BUILD                       |  30 ++
 third_party/fft2d/LICENSE                     |   3 +
 third_party/fft2d/fft.h                       |  36 ++
 third_party/fft2d/fft2d.BUILD                 |  36 ++
 176 files changed, 5879 insertions(+), 879 deletions(-)
 create mode 100644 tensorflow/c/exported_symbols.lds
 create mode 100644 tensorflow/c/version_script.lds
 create mode 100644 tensorflow/compiler/tests/spacetobatch_op_test.py
 create mode 100644 tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc
 create mode 100644 tensorflow/compiler/tf2xla/kernels/elu_op.cc
 create mode 100644 tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc
 create mode 100644 tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
 create mode 100644 tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
 create mode 100644 tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
 create mode 100644 tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
 create mode 100644 tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
 create mode 100644 tensorflow/core/grappler/op_types.cc
 create mode 100644 tensorflow/core/grappler/op_types.h
 create mode 100644 tensorflow/core/grappler/optimizers/auto_parallel.cc
 create mode 100644 tensorflow/core/grappler/optimizers/auto_parallel.h
 create mode 100644 tensorflow/core/grappler/optimizers/auto_parallel_test.cc
 create mode 100644 third_party/fft2d/BUILD
 create mode 100644 third_party/fft2d/LICENSE
 create mode 100644 third_party/fft2d/fft.h
 create mode 100644 third_party/fft2d/fft2d.BUILD

diff --git a/configure b/configure
index 6360641be2..48a4594da6 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,7 @@ rm -f .tf_configure.bazelrc
 touch .tf_configure.bazelrc
 touch .bazelrc
 sed_hyphen_i "/tf_configure/d" .bazelrc
-echo "import .tf_configure.bazelrc" >> .bazelrc
+echo "import %workspace%/.tf_configure.bazelrc" >> .bazelrc
 
 # Delete any leftover BUILD files from the Makefile build, which would interfere
 # with Bazel parsing.
@@ -284,6 +284,7 @@ export TF_NEED_CUDA
 write_action_env_to_bazelrc "TF_NEED_CUDA" "$TF_NEED_CUDA"
 
 export TF_NEED_OPENCL
+write_action_env_to_bazelrc "TF_NEED_OPENCL" "$TF_NEED_OPENCL"
 
 if [ "$TF_NEED_CUDA" == "1" ]; then
 while [[ "$TF_CUDA_CLANG" == "" ]]; do
@@ -547,6 +548,7 @@ while true; do
   fi
   if [ -e "$HOST_CXX_COMPILER" ]; then
     export HOST_CXX_COMPILER
+    write_action_env_to_bazelrc "HOST_CXX_COMPILER" "$HOST_CXX_COMPILER"
     break
   fi
   echo "Invalid C++ compiler path. ${HOST_CXX_COMPILER} cannot be found" 1>&2
@@ -570,6 +572,7 @@ while true; do
   fi
   if [ -e "$HOST_C_COMPILER" ]; then
     export HOST_C_COMPILER
+    write_action_env_to_bazelrc "HOST_C_COMPILER" "$HOST_C_COMPILER"
     break
   fi
   echo "Invalid C compiler path. ${HOST_C_COMPILER} cannot be found" 1>&2
@@ -600,6 +603,7 @@ while true; do
 
   if [ -e "${COMPUTECPP_TOOLKIT_PATH}/${SYCL_RT_LIB_PATH}" ]; then
     export COMPUTECPP_TOOLKIT_PATH
+    write_action_env_to_bazelrc "COMPUTECPP_TOOLKIT_PATH" "$COMPUTECPP_TOOLKIT_PATH"
     break
   fi
   echo "Invalid SYCL $TF_OPENCL_VERSION library path. ${COMPUTECPP_TOOLKIT_PATH}/${SYCL_RT_LIB_PATH} cannot be found"
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index e437987112..b98be57ec0 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -351,9 +351,24 @@ filegroup(
 # -------------------------------------------
 cc_binary(
     name = "libtensorflow.so",
+    linkopts = select({
+        "//tensorflow:darwin": [
+            "-Wl,-exported_symbols_list",  # This line must be directly followed by the exported_symbols.lds file
+            "//tensorflow/c:exported_symbols.lds",
+        ],
+        "//tensorflow:windows": [],
+        "//conditions:default": [
+            "-z defs",
+            "-s",
+            "-Wl,--version-script",  #  This line must be directly followed by the version_script.lds file
+            "//tensorflow/c:version_script.lds",
+        ],
+    }),
     linkshared = 1,
     deps = [
         "//tensorflow/c:c_api",
+        "//tensorflow/c:exported_symbols.lds",
+        "//tensorflow/c:version_script.lds",
         "//tensorflow/core:tensorflow",
     ],
 )
diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index 0019dfeeb1..6e39deee63 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -45,6 +45,14 @@ tf_cuda_library(
     }),
 )
 
+exports_files(
+    [
+        "version_script.lds",
+        "exported_symbols.lds",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 tf_cuda_library(
     name = "tf_status_helper",
     srcs = ["tf_status_helper.cc"],
diff --git a/tensorflow/c/exported_symbols.lds b/tensorflow/c/exported_symbols.lds
new file mode 100644
index 0000000000..a14bdaa48b
--- /dev/null
+++ b/tensorflow/c/exported_symbols.lds
@@ -0,0 +1 @@
+_TF_*
diff --git a/tensorflow/c/version_script.lds b/tensorflow/c/version_script.lds
new file mode 100644
index 0000000000..455bd7362b
--- /dev/null
+++ b/tensorflow/c/version_script.lds
@@ -0,0 +1,9 @@
+VERS_1.0 {
+  # Export symbols in c_api.h.
+  global:
+    TF_*;
+
+  # Hide everything else.
+  local:
+    *;
+};
diff --git a/tensorflow/compiler/aot/tfcompile_main.cc b/tensorflow/compiler/aot/tfcompile_main.cc
index 85ef9560bb..59a45538a7 100644
--- a/tensorflow/compiler/aot/tfcompile_main.cc
+++ b/tensorflow/compiler/aot/tfcompile_main.cc
@@ -52,7 +52,8 @@ const char kUsageHeader[] =
     "header file that gives access to the functionality in the object file.\n"
     "A typical invocation looks like this:\n"
     "\n"
-    "   $ tfcompile --graph=mygraph.pb --config=myfile.pbtxt\n"
+    "   $ tfcompile --graph=mygraph.pb --config=myfile.pbtxt "
+    "--cpp_class=\"mynamespace::MyComputation\"\n"
     "\n";
 
 Status ReadProtoFile(const string& kind, const string& fname,
@@ -73,6 +74,9 @@ void ParseTensorId(const string& name, TensorId* id) {
 Status Main(const MainFlags& flags) {
   // Process config.
   Config config;
+  if (flags.config.empty()) {
+    return errors::InvalidArgument("Must specify --config");
+  }
   TF_RETURN_IF_ERROR(ReadProtoFile("config", flags.config, &config));
   TF_RETURN_IF_ERROR(ValidateConfig(config));
   if (flags.dump_fetch_nodes) {
@@ -85,6 +89,9 @@ Status Main(const MainFlags& flags) {
   }
 
   // Read and initialize the graph.
+  if (flags.graph.empty()) {
+    return errors::InvalidArgument("Must specify --graph");
+  }
   GraphDef graph_def;
   TF_RETURN_IF_ERROR(ReadProtoFile("graph", flags.graph, &graph_def));
   std::unique_ptr<Graph> graph;
@@ -101,6 +108,9 @@ Status Main(const MainFlags& flags) {
   TF_RETURN_IF_ERROR(WriteStringToFile(env, flags.out_object,
                                        StringPiece(obj.data(), obj.size())));
   HeaderOpts header_opts;
+  if (flags.cpp_class.empty()) {
+    return errors::InvalidArgument("Must specify --cpp_class");
+  }
   TF_RETURN_IF_ERROR(ParseCppClass(flags.cpp_class, &header_opts.class_name,
                                    &header_opts.namespaces));
   string header;
@@ -131,12 +141,16 @@ int main(int argc, char** argv) {
   QCHECK(parsed_flags_ok) << "\n" << usage;
 
   tensorflow::port::InitMain(usage.c_str(), &argc, &argv);
-  QCHECK(argc == 1 && !flags.config.empty() &&
-         (flags.dump_fetch_nodes ||
-          (!flags.graph.empty() && !flags.entry_point.empty())))
-      << "\n"
-      << usage;
-
-  TF_QCHECK_OK(tensorflow::tfcompile::Main(flags));
+  QCHECK(argc == 1) << "\nERROR: This command does not take any arguments "
+                       "other than flags\n\n"
+                    << usage;
+  tensorflow::Status status = tensorflow::tfcompile::Main(flags);
+  if (status.code() == tensorflow::error::INVALID_ARGUMENT) {
+    std::cerr << "INVALID ARGUMENTS: " << status.error_message() << "\n\n"
+              << usage;
+    return 1;
+  } else {
+    TF_QCHECK_OK(status);
+  }
   return 0;
 }
diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD
index 03e255e6b8..0592e3d4b1 100644
--- a/tensorflow/compiler/tests/BUILD
+++ b/tensorflow/compiler/tests/BUILD
@@ -305,6 +305,20 @@ tf_xla_py_test(
     ],
 )
 
+tf_xla_py_test(
+    name = "spacetobatch_op_test",
+    size = "medium",
+    srcs = ["spacetobatch_op_test.py"],
+    shard_count = 3,
+    deps = [
+        ":xla_test",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 tf_xla_py_test(
     name = "ternary_ops_test",
     size = "small",
diff --git a/tensorflow/compiler/tests/binary_ops_test.py b/tensorflow/compiler/tests/binary_ops_test.py
index 9efdaee7ab..7221a0a3c7 100644
--- a/tensorflow/compiler/tests/binary_ops_test.py
+++ b/tensorflow/compiler/tests/binary_ops_test.py
@@ -107,6 +107,12 @@ class BinaryOpsTest(XLATestCase):
           np.array([5, 6, 7, 8], dtype=dtype),
           expected=np.array([-75, -48, -21, 0], dtype=dtype))
 
+      self._testBinary(
+          gen_nn_ops._elu_grad,
+          np.array([1, 2, 3, 4, 5, 6], dtype=dtype),
+          np.array([-.6, -.4, -.2, 0, .2, .4], dtype=dtype),
+          expected=np.array([0.4, 1.2, 2.4, 4, 5, 6], dtype=dtype))
+
       self._testBinary(
           gen_nn_ops._relu_grad,
           np.array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], dtype=dtype),
diff --git a/tensorflow/compiler/tests/randomized_tests.cc b/tensorflow/compiler/tests/randomized_tests.cc
index a0cd905f17..7d91594db0 100644
--- a/tensorflow/compiler/tests/randomized_tests.cc
+++ b/tensorflow/compiler/tests/randomized_tests.cc
@@ -218,12 +218,11 @@ class OpTest : public ::testing::Test {
   static constexpr int kDefaultMaxRank = 5;
   static constexpr int64 kDefaultMaxDimensionSize = 20LL;
 
-  // Returns a random dimension size.
+  // Returns a random dimension size, in the range [min, max).
   int64 RandomDim(int64 min = 0, int64 max = kDefaultMaxDimensionSize);
 
   // Returns a random shape. The tensor has rank in the range [min_rank,
-  // max_rank).
-  // Each dimension has size [0, kDefaultMaxDimensionSize].
+  // max_rank). Each dimension has size [min_size, max_size).
   std::vector<int64> RandomDims(int min_rank = 0,
                                 int max_rank = kDefaultMaxRank,
                                 int64 min_size = 0,
@@ -668,6 +667,9 @@ void OpTest::ExpectTfAndXlaOutputsAreClose(const OpTestBuilder& builder,
     VLOG(1) << "Expected graph failed with status: " << s << ". Skipping test";
     return;
   }
+  for (const Tensor& expected : expected_outputs) {
+    VLOG(1) << "Expected: " << expected.DebugString();
+  }
 
   VLOG(1) << "Running test graph";
   TF_ASSERT_OK(session_->Run(test_feeds, test_fetches, {}, &test_outputs));
@@ -877,6 +879,79 @@ TEST_F(OpTest, BatchMatMul) {
   });
 }
 
+TEST_F(OpTest, BatchToSpace) {
+  Repeatedly([this]() {
+    const int num_block_dims = 2;
+    std::vector<int64> block_dims =
+        RandomDims(num_block_dims, num_block_dims, 0, 5);
+    int64 block_size = RandomDim(0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + 1);
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[0] *= block_size;
+      input_dims[1 + i] = block_dims[i];
+    }
+    input_dims[1 + num_block_dims] = RandomDim();
+
+    std::vector<int64> crop_vals;
+    std::uniform_int_distribution<int> distribution(0, 4);
+    for (int i = 0; i < num_block_dims; ++i) {
+      // Chooses crop values; does not always choose legal values.
+      crop_vals.push_back(distribution(generator()));
+      crop_vals.push_back(distribution(generator()));
+    }
+    Tensor crops;
+    CHECK(crops.CopyFrom(AsIntTensor(DT_INT32, crop_vals),
+                         TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(OpTestBuilder("BatchToSpace")
+                                      .Input(RandomTensor(DT_FLOAT, input_dims))
+                                      .Input(crops)
+                                      .Attr("T", DT_FLOAT)
+                                      .Attr("block_size", block_size));
+  });
+}
+
+TEST_F(OpTest, BatchToSpaceND) {
+  Repeatedly([this]() {
+    std::vector<int64> block_dims = RandomDims(1, 3, 0, 5);
+    int num_block_dims = block_dims.size();
+    std::vector<int64> remaining_dims = RandomDims(0, 3);
+    std::vector<int64> block_multipliers =
+        RandomDims(block_dims.size(), block_dims.size(), 0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + remaining_dims.size());
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[0] *= block_dims[i];
+    }
+    std::copy(block_multipliers.begin(), block_multipliers.end(),
+              input_dims.begin() + 1);
+    std::copy(remaining_dims.begin(), remaining_dims.end(),
+              input_dims.begin() + 1 + num_block_dims);
+
+    std::vector<int64> crop_vals;
+    std::uniform_int_distribution<int> distribution(0, 3);
+    for (int i = 0; i < num_block_dims; ++i) {
+      // Chooses crop values; does not always choose legal values.
+      crop_vals.push_back(distribution(generator()));
+      crop_vals.push_back(distribution(generator()));
+    }
+    Tensor crops;
+    CHECK(crops.CopyFrom(AsIntTensor(DT_INT32, crop_vals),
+                         TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(
+        OpTestBuilder("BatchToSpaceND")
+            .Input(RandomTensor(DT_FLOAT, input_dims))
+            .Input(test::AsTensor<int32>(
+                std::vector<int32>(block_dims.begin(), block_dims.end())))
+            .Input(crops)
+            .Attr("T", DT_FLOAT));
+  });
+}
+
 TEST_F(OpTest, BiasAdd) {
   Repeatedly([this]() {
     auto x = RandomTensor(DT_FLOAT, RandomDims(2, kDefaultMaxRank));
@@ -1214,6 +1289,23 @@ TEST_F(OpTest, DynamicStitch) {
   });
 }
 
+TEST_F(OpTest, Elu) {
+  Repeatedly([this]() {
+    ExpectTfAndXlaOutputsAreClose(
+        OpTestBuilder("Elu").Input(RandomTensor(DT_FLOAT)).Attr("T", DT_FLOAT));
+  });
+}
+
+TEST_F(OpTest, EluGrad) {
+  Repeatedly([this]() {
+    auto dims = RandomDims();
+    ExpectTfAndXlaOutputsAreClose(OpTestBuilder("EluGrad")
+                                      .Input(RandomTensor(DT_FLOAT, dims))
+                                      .Input(RandomTensor(DT_FLOAT, dims))
+                                      .Attr("T", DT_FLOAT));
+  });
+}
+
 TEST_F(OpTest, Equal) {
   Repeatedly([this]() {
     DataType type = Choose<DataType>({DT_INT32, DT_FLOAT});
@@ -2019,6 +2111,87 @@ TEST_F(OpTest, SoftplusGrad) {
   });
 }
 
+TEST_F(OpTest, SpaceToBatch) {
+  Repeatedly([this]() {
+    std::vector<int64> block_dims = RandomDims(4, 4, 0, 5);
+    const int num_block_dims = 2;
+    int64 block_size = RandomDim(0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + 1);
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[1 + i] = block_dims[i] * block_size;
+    }
+    input_dims[1 + num_block_dims] = RandomDim();
+
+    std::vector<int64> padding_vals;
+    std::uniform_int_distribution<int> distribution(0, 7);
+    for (int i = 0; i < num_block_dims; ++i) {
+      int64 pad_before;
+      int64 pad_after;
+      do {
+        pad_before = distribution(generator());
+        pad_after = distribution(generator());
+      } while (pad_before + pad_after > input_dims[1 + i]);
+      input_dims[1 + i] -= pad_before + pad_after;
+      padding_vals.push_back(pad_before);
+      padding_vals.push_back(pad_after);
+    }
+    Tensor paddings;
+    CHECK(paddings.CopyFrom(AsIntTensor(DT_INT32, padding_vals),
+                            TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(OpTestBuilder("SpaceToBatch")
+                                      .Input(RandomTensor(DT_FLOAT, input_dims))
+                                      .Input(paddings)
+                                      .Attr("T", DT_FLOAT)
+                                      .Attr("block_size", block_size));
+  });
+}
+
+TEST_F(OpTest, SpaceToBatchND) {
+  Repeatedly([this]() {
+    std::vector<int64> block_dims = RandomDims(1, 3, 0, 5);
+    int num_block_dims = block_dims.size();
+    std::vector<int64> remaining_dims = RandomDims(0, 3);
+    std::vector<int64> block_multipliers =
+        RandomDims(block_dims.size(), block_dims.size(), 0, 4);
+
+    std::vector<int64> input_dims(1 + num_block_dims + remaining_dims.size());
+    input_dims[0] = RandomDim();
+    for (int i = 0; i < num_block_dims; ++i) {
+      input_dims[1 + i] = block_dims[i] * block_multipliers[i];
+    }
+    std::copy(remaining_dims.begin(), remaining_dims.end(),
+              input_dims.begin() + 1 + num_block_dims);
+
+    std::vector<int64> padding_vals;
+    std::uniform_int_distribution<int> distribution(0, 7);
+    for (int i = 0; i < num_block_dims; ++i) {
+      int64 pad_before;
+      int64 pad_after;
+      do {
+        pad_before = distribution(generator());
+        pad_after = distribution(generator());
+      } while (pad_before + pad_after > input_dims[1 + i]);
+      input_dims[1 + i] -= pad_before + pad_after;
+      padding_vals.push_back(pad_before);
+      padding_vals.push_back(pad_after);
+    }
+    Tensor paddings;
+    CHECK(paddings.CopyFrom(AsIntTensor(DT_INT32, padding_vals),
+                            TensorShape({num_block_dims, 2})));
+
+    ExpectTfAndXlaOutputsAreClose(
+        OpTestBuilder("SpaceToBatchND")
+            .Input(RandomTensor(DT_FLOAT, input_dims))
+            .Input(test::AsTensor<int32>(
+                std::vector<int32>(block_dims.begin(), block_dims.end())))
+            .Input(paddings)
+            .Attr("T", DT_FLOAT));
+  });
+}
+
 TEST_F(OpTest, SparseMatMul) {
   Repeatedly([this]() {
     int64 x = RandomDim();
diff --git a/tensorflow/compiler/tests/spacetobatch_op_test.py b/tensorflow/compiler/tests/spacetobatch_op_test.py
new file mode 100644
index 0000000000..9c3b86c84b
--- /dev/null
+++ b/tensorflow/compiler/tests/spacetobatch_op_test.py
@@ -0,0 +1,266 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Functional tests for SpaceToBatch and BatchToSpace ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.compiler.tests.xla_test import XLATestCase
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gen_array_ops
+from tensorflow.python.platform import test
+
+
+def space_to_batch_direct(input_array, block_shape, paddings):
+  """Direct Python implementation of space-to-batch conversion.
+
+  This is used for tests only.
+
+  Args:
+    input_array: N-D array
+    block_shape: 1-D array of shape [num_block_dims].
+    paddings: 2-D array of shape [num_block_dims, 2].
+
+  Returns:
+    Converted tensor.
+  """
+  input_array = np.array(input_array)
+  block_shape = np.array(block_shape)
+  num_block_dims = len(block_shape)
+  paddings = np.array(paddings).reshape((len(block_shape), 2))
+
+  padded = np.pad(input_array,
+                  pad_width=([[0, 0]] + list(paddings) + [[0, 0]] *
+                             (input_array.ndim - 1 - num_block_dims)),
+                  mode="constant")
+  reshaped_padded_shape = [input_array.shape[0]]
+  output_shape = [input_array.shape[0] * np.prod(block_shape)]
+  for block_dim, block_shape_value in enumerate(block_shape):
+    reduced_size = padded.shape[block_dim + 1] // block_shape_value
+    reshaped_padded_shape.append(reduced_size)
+    output_shape.append(reduced_size)
+    reshaped_padded_shape.append(block_shape_value)
+  reshaped_padded_shape.extend(input_array.shape[num_block_dims + 1:])
+  output_shape.extend(input_array.shape[num_block_dims + 1:])
+
+  reshaped_padded = padded.reshape(reshaped_padded_shape)
+  permuted_reshaped_padded = np.transpose(reshaped_padded, (
+      list(np.arange(num_block_dims) * 2 + 2) + [0] +
+      list(np.arange(num_block_dims) * 2 + 1) + list(
+          np.arange(input_array.ndim - num_block_dims - 1) + 1 + num_block_dims
+          * 2)))
+  return permuted_reshaped_padded.reshape(output_shape)
+
+
+class SpaceToBatchTest(XLATestCase):
+  """Tests input-output pairs for the SpaceToBatch and BatchToSpace ops."""
+
+  def _testPad(self, inputs, paddings, block_size, outputs):
+    with self.test_session() as sess, self.test_scope():
+      for dtype in self.float_types:
+        # outputs = space_to_batch(inputs)
+        placeholder = array_ops.placeholder(dtype)
+        x_tf = gen_array_ops._space_to_batch(
+            placeholder, paddings, block_size=block_size)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: inputs}), outputs)
+        # inputs = batch_to_space(outputs)
+        x_tf = gen_array_ops._batch_to_space(
+            placeholder, paddings, block_size=block_size)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: outputs}), inputs)
+
+  def _testOne(self, inputs, block_size, outputs):
+    paddings = np.zeros((2, 2), dtype=np.int32)
+    self._testPad(inputs, paddings, block_size, outputs)
+
+  # [1, 2, 2, 1] <-> [4, 1, 1, 1]
+  def testSmallInput2x2(self):
+    x_np = [[[[1], [2]], [[3], [4]]]]
+    block_size = 2
+    x_out = [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # [1, 2, 2, 1] <-> [1, 3, 3, 1] (padding) <-> [9, 1, 1, 1]
+  def testSmallInput2x2Pad1x0(self):
+    x_np = [[[[1], [2]], [[3], [4]]]]
+    paddings = np.array([[1, 0], [1, 0]], dtype=np.int32)
+    block_size = 3
+    x_out = [[[[0]]], [[[0]]], [[[0]]], [[[0]]], [[[1]]], [[[2]]], [[[0]]],
+             [[[3]]], [[[4]]]]
+    self._testPad(x_np, paddings, block_size, x_out)
+
+  # Test with depth larger than 1.
+  # [1, 2, 2, 3] <-> [4, 1, 1, 3]
+  def testDepthInput2x2(self):
+    x_np = [[[[1, 2, 3], [4, 5, 6]], [[7, 8, 9], [10, 11, 12]]]]
+    block_size = 2
+    x_out = [[[[1, 2, 3]]], [[[4, 5, 6]]], [[[7, 8, 9]]], [[[10, 11, 12]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # Test for larger input dimensions.
+  # [1, 4, 4, 1] <-> [4, 2, 2, 1]
+  def testLargerInput2x2(self):
+    x_np = [[[[1], [2], [3], [4]], [[5], [6], [7], [8]],
+             [[9], [10], [11], [12]], [[13], [14], [15], [16]]]]
+    block_size = 2
+    x_out = [[[[1], [3]], [[9], [11]]], [[[2], [4]], [[10], [12]]],
+             [[[5], [7]], [[13], [15]]], [[[6], [8]], [[14], [16]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # Test with batch larger than 1.
+  # [2, 2, 4, 1] <-> [8, 1, 2, 1]
+  def testBatchInput2x2(self):
+    x_np = [[[[1], [2], [3], [4]], [[5], [6], [7], [8]]],
+            [[[9], [10], [11], [12]], [[13], [14], [15], [16]]]]
+    block_size = 2
+    x_out = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
+             [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
+    self._testOne(x_np, block_size, x_out)
+
+  # Tests for larger input spatial dimensions AND batch larger than 1, to ensure
+  # that elements are correctly laid out spatially and properly interleaved
+  # along the batch dimension.
+  # [2, 4, 4, 1] <-> [8, 2, 2, 1]
+  def testLargerInputBatch2x2(self):
+    x_np = [[[[1], [2], [3], [4]], [[5], [6], [7], [8]],
+             [[9], [10], [11], [12]], [[13], [14], [15], [16]]],
+            [[[17], [18], [19], [20]], [[21], [22], [23], [24]],
+             [[25], [26], [27], [28]], [[29], [30], [31], [32]]]]
+    x_out = [[[[1], [3]], [[9], [11]]], [[[17], [19]], [[25], [27]]],
+             [[[2], [4]], [[10], [12]]], [[[18], [20]], [[26], [28]]],
+             [[[5], [7]], [[13], [15]]], [[[21], [23]], [[29], [31]]],
+             [[[6], [8]], [[14], [16]]], [[[22], [24]], [[30], [32]]]]
+    block_size = 2
+    self._testOne(x_np, block_size, x_out)
+
+
+class SpaceToBatchNDTest(XLATestCase):
+  """Tests input-output pairs for the SpaceToBatchND and BatchToSpaceND ops."""
+
+  def _testPad(self, inputs, block_shape, paddings, outputs):
+    block_shape = np.array(block_shape)
+    paddings = np.array(paddings).reshape((len(block_shape), 2))
+    with self.test_session() as sess, self.test_scope():
+      for dtype in self.float_types:
+        placeholder = array_ops.placeholder(dtype)
+        # outputs = space_to_batch(inputs)
+        x_tf = array_ops.space_to_batch_nd(placeholder, block_shape, paddings)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: inputs}), outputs)
+        # inputs = batch_to_space(outputs)
+        placeholder = array_ops.placeholder(dtype)
+        x_tf = array_ops.batch_to_space_nd(placeholder, block_shape, paddings)
+        self.assertAllEqual(sess.run(x_tf, {placeholder: outputs}), inputs)
+
+  def _testDirect(self, input_shape, block_shape, paddings):
+    inputs = np.arange(np.prod(input_shape), dtype=np.float32)
+    inputs = inputs.reshape(input_shape)
+    self._testPad(inputs, block_shape, paddings,
+                  space_to_batch_direct(inputs, block_shape, paddings))
+
+  def testZeroBlockDimsZeroRemainingDims(self):
+    self._testPad(
+        inputs=[1, 2],
+        block_shape=[],
+        paddings=[],
+        outputs=[1, 2],)
+
+  def testZeroBlockDimsOneRemainingDim(self):
+    self._testPad(
+        inputs=[[1, 2], [3, 4]],
+        block_shape=[],
+        paddings=[],
+        outputs=[[1, 2], [3, 4]])
+
+    # Same thing, but with a no-op block dim.
+    self._testPad(
+        inputs=[[1, 2], [3, 4]],
+        block_shape=[1],
+        paddings=[[0, 0]],
+        outputs=[[1, 2], [3, 4]])
+
+  def testZeroBlockDimsTwoRemainingDims(self):
+    self._testPad(
+        inputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
+        block_shape=[],
+        paddings=[],
+        outputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
+
+    # Same thing, but with a no-op block dim.
+    self._testPad(
+        inputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
+        block_shape=[1],
+        paddings=[[0, 0]],
+        outputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
+
+    # Same thing, but with two no-op block dims.
+    self._testPad(
+        inputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
+        block_shape=[1, 1],
+        paddings=[[0, 0], [0, 0]],
+        outputs=[[[1, 2], [3, 4]], [[5, 6], [7, 8]]])
+
+  def testOneBlockDimZeroRemainingDims(self):
+    self._testPad(
+        inputs=[[1, 2, 3], [4, 5, 6]],
+        block_shape=[2],
+        paddings=[1, 0],
+        outputs=[[0, 2], [0, 5], [1, 3], [4, 6]])
+
+  def testOneBlockDimOneRemainingDim(self):
+    self._testPad(
+        inputs=[[[1, 11], [2, 21], [3, 31]], [[4, 41], [5, 51], [6, 61]]],
+        block_shape=[2],
+        paddings=[1, 0],
+        outputs=[[[0, 0], [2, 21]], [[0, 0], [5, 51]], [[1, 11], [3, 31]],
+                 [[4, 41], [6, 61]]])
+
+  def testDirect(self):
+    # Test with zero-size remaining dimension.
+    self._testDirect(
+        input_shape=[3, 1, 2, 0], block_shape=[3], paddings=[[0, 2]])
+
+    # Test with zero-size blocked dimension.
+    self._testDirect(
+        input_shape=[3, 0, 2, 5], block_shape=[3], paddings=[[0, 0]])
+
+    # Test with padding up from zero size.
+    self._testDirect(
+        input_shape=[3, 0, 2, 5], block_shape=[3], paddings=[[1, 2]])
+
+    self._testDirect(
+        input_shape=[3, 3, 4, 5, 2],
+        block_shape=[3, 4, 2],
+        paddings=[[1, 2], [0, 0], [3, 0]])
+
+    self._testDirect(
+        input_shape=[3, 3, 4, 5, 2],
+        block_shape=[3, 4, 2, 2],
+        paddings=[[1, 2], [0, 0], [3, 0], [0, 0]])
+
+    self._testDirect(
+        input_shape=[3, 2, 2, 3, 4, 5, 2, 5],
+        block_shape=[1, 1, 3, 4, 2, 2],
+        paddings=[[0, 0], [0, 0], [1, 2], [0, 0], [3, 0], [0, 0]])
+
+    self._testDirect(
+        input_shape=[3, 2, 2, 3, 4, 5, 2, 5],
+        block_shape=[1, 1, 3, 4, 2, 2, 1],
+        paddings=[[0, 0], [0, 0], [1, 2], [0, 0], [3, 0], [0, 0], [0, 0]])
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/compiler/tests/unary_ops_test.py b/tensorflow/compiler/tests/unary_ops_test.py
index 1e85d3a2c8..3f324d1071 100644
--- a/tensorflow/compiler/tests/unary_ops_test.py
+++ b/tensorflow/compiler/tests/unary_ops_test.py
@@ -209,6 +209,11 @@ class UnaryOpsTest(XLATestCase):
                [-3.4401896, -2.4401896, -1.4401897, -0.44018969]],
               dtype=dtype))
 
+      self._assertOpOutputMatchesExpected(
+          nn_ops.elu,
+          np.array([[-1, 0, 1]], dtype=dtype),
+          expected=np.array([[-0.63212056, 0, 1]], dtype=dtype))
+
       self._assertOpOutputMatchesExpected(
           nn_ops.relu,
           np.array([[-1, 1]], dtype=dtype),
diff --git a/tensorflow/compiler/tf2xla/const_analysis.cc b/tensorflow/compiler/tf2xla/const_analysis.cc
index 53aa749a0a..44ff13ca34 100644
--- a/tensorflow/compiler/tf2xla/const_analysis.cc
+++ b/tensorflow/compiler/tf2xla/const_analysis.cc
@@ -35,6 +35,9 @@ Status BackwardsConstAnalysis(const Graph& g,
       {"Any", "reduction_indices"},
       {"ArgMax", "dimension"},
       {"AvgPoolGrad", "orig_input_shape"},
+      {"BatchToSpace", "crops"},
+      {"BatchToSpaceND", "block_shape"},
+      {"BatchToSpaceND", "crops"},
       {"BroadcastGradientArgs", "s0"},
       {"BroadcastGradientArgs", "s1"},
       {"Concat", "concat_dim"},
@@ -69,6 +72,9 @@ Status BackwardsConstAnalysis(const Graph& g,
       {"ReverseV2", "axis"},
       {"Slice", "begin"},
       {"Slice", "size"},
+      {"SpaceToBatch", "paddings"},
+      {"SpaceToBatchND", "block_shape"},
+      {"SpaceToBatchND", "paddings"},
       {"Split", "split_dim"},
       {"SplitV", "split_dim"},
       {"SplitV", "size_splits"},
diff --git a/tensorflow/compiler/tf2xla/kernels/BUILD b/tensorflow/compiler/tf2xla/kernels/BUILD
index 2ee80a41e8..14d2a72f7c 100644
--- a/tensorflow/compiler/tf2xla/kernels/BUILD
+++ b/tensorflow/compiler/tf2xla/kernels/BUILD
@@ -15,6 +15,7 @@ tf_kernel_library(
     srcs = [
         "aggregate_ops.cc",
         "batch_matmul_op.cc",
+        "batchtospace_op.cc",
         "bcast_ops.cc",
         "bias_ops.cc",
         "binary_ops.cc",
@@ -26,6 +27,7 @@ tf_kernel_library(
         "depthwise_conv_ops.cc",
         "diag_op.cc",
         "dynamic_stitch_op.cc",
+        "elu_op.cc",
         "fill_op.cc",
         "function_ops.cc",
         "identity_op.cc",
@@ -49,6 +51,7 @@ tf_kernel_library(
         "shape_op.cc",
         "slice_op.cc",
         "softmax_op.cc",
+        "spacetobatch_op.cc",
         "split_op.cc",
         "strided_slice_op.cc",
         "tile_ops.cc",
diff --git a/tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc b/tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc
new file mode 100644
index 0000000000..eb4bd47ee5
--- /dev/null
+++ b/tensorflow/compiler/tf2xla/kernels/batchtospace_op.cc
@@ -0,0 +1,186 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/tf2xla/xla_helpers.h"
+#include "tensorflow/compiler/tf2xla/xla_op_kernel.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+
+namespace tensorflow {
+namespace {
+
+void BatchToSpace(XlaOpKernelContext* ctx,
+                  const xla::ComputationDataHandle& input, DataType input_dtype,
+                  const TensorShape& input_tensor_shape,
+                  gtl::ArraySlice<int64> block_shape,
+                  const xla::Literal& crops) {
+  const int input_rank = input_tensor_shape.dims();
+  const gtl::InlinedVector<int64, 4> input_shape =
+      input_tensor_shape.dim_sizes();
+  const int block_rank = block_shape.size();
+
+  OP_REQUIRES(
+      ctx, input_rank >= 1 + block_rank,
+      errors::InvalidArgument("input rank should be >= ", 1 + block_rank,
+                              " instead of ", input_rank));
+  gtl::ArraySlice<int64> remainder_shape(input_shape);
+  remainder_shape.remove_prefix(1 + block_rank);
+
+  OP_REQUIRES(
+      ctx,
+      xla::ShapeUtil::Rank(crops.shape()) == 2 &&
+          block_rank == xla::ShapeUtil::GetDimension(crops.shape(), 0) &&
+          2 == xla::ShapeUtil::GetDimension(crops.shape(), 1),
+      errors::InvalidArgument("crops should have shape [", block_rank,
+                              ", 2] instead of ",
+                              xla::ShapeUtil::HumanString(crops.shape())));
+
+  xla::ComputationBuilder* b = ctx->builder();
+  const int64 batch_size = input_shape[0];
+
+  // Compute the product of the block_shape values.
+  int64 block_num_elems = 1;
+  for (int i = 0; i < block_rank; ++i) {
+    block_num_elems *= block_shape[i];
+  }
+  OP_REQUIRES(ctx, block_num_elems > 0,
+              errors::InvalidArgument(
+                  "The product of the block dimensions must be positive"));
+
+  // 1. Reshape `input` to `reshaped` of shape:
+  //      [block_shape[0], ..., block_shape[M-1],
+  //       batch / prod(block_shape),
+  //       input_shape[1], ..., input_shape[N-1]]
+
+  OP_REQUIRES(
+      ctx, batch_size % block_num_elems == 0,
+      errors::InvalidArgument("Input batch dimension (", batch_size,
+                              ") is not divisible by product of block sizes (",
+                              block_num_elems, ")"));
+  std::vector<int64> reshaped_shape(input_rank + block_rank);
+  std::copy(block_shape.begin(), block_shape.end(), reshaped_shape.begin());
+  reshaped_shape[block_rank] = batch_size / block_num_elems;
+  std::copy(input_shape.begin() + 1, input_shape.end(),
+            reshaped_shape.begin() + block_rank + 1);
+  xla::ComputationDataHandle reshaped = b->Reshape(input, reshaped_shape);
+
+  // 2. Permute dimensions of `reshaped` to produce `permuted` of shape
+  //      [batch / prod(block_shape),
+  //
+  //       input_shape[1], block_shape[0],
+  //       ...,
+  //       input_shape[M], block_shape[M-1],
+  //
+  //       input_shape[M+1], ..., input_shape[N-1]]
+  std::vector<int64> permutation(reshaped_shape.size());
+  permutation[0] = block_rank;
+  for (int i = 0; i < block_rank; ++i) {
+    permutation[1 + 2 * i] = block_rank + 1 + i;
+    permutation[1 + 2 * i + 1] = i;
+  }
+  std::iota(permutation.begin() + 1 + block_rank * 2, permutation.end(),
+            1 + block_rank * 2);
+  xla::ComputationDataHandle permuted = b->Transpose(reshaped, permutation);
+
+  // 3. Reshape `permuted` to produce `reshaped_permuted` of shape
+  //      [batch / prod(block_shape),
+  //
+  //       input_shape[1] * block_shape[0],
+  //       ...,
+  //       input_shape[M] * block_shape[M-1],
+  //
+  //       input_shape[M+1],
+  //       ...,
+  //       input_shape[N-1]]
+  std::vector<int64> reshaped_permuted_shape(input_rank);
+  reshaped_permuted_shape[0] = batch_size / block_num_elems;
+  for (int i = 0; i < block_rank; ++i) {
+    reshaped_permuted_shape[1 + i] = block_shape[i] * input_shape[1 + i];
+  }
+  std::copy(remainder_shape.begin(), remainder_shape.end(),
+            reshaped_permuted_shape.begin() + 1 + block_rank);
+
+  xla::ComputationDataHandle reshaped_permuted =
+      b->Reshape(permuted, reshaped_permuted_shape);
+
+  // 4. Crop the start and end of dimensions `[1, ..., M]` of
+  //    `reshaped_permuted` according to `crops` to produce the output of shape:
+  //      [batch / prod(block_shape),
+  //
+  //       input_shape[1] * block_shape[0] - crops[0,0] - crops[0,1],
+  //       ...,
+  //       input_shape[M] * block_shape[M-1] - crops[M-1,0] - crops[M-1,1],
+  //
+  //       input_shape[M+1], ..., input_shape[N-1]]
+  std::vector<int64> start_indices(input_rank, 0);
+  std::vector<int64> end_indices = reshaped_permuted_shape;
+  for (int i = 0; i < block_rank; ++i) {
+    int64 crop_start = xla::LiteralUtil::Get<int64>(crops, {i, 0});
+    int64 crop_end = xla::LiteralUtil::Get<int64>(crops, {i, 1});
+    OP_REQUIRES(ctx, crop_start >= 0 && crop_end >= 0,
+                errors::InvalidArgument("Crops must be non-negative"));
+    start_indices[1 + i] = crop_start;
+    end_indices[1 + i] -= crop_end;
+    OP_REQUIRES(
+        ctx, start_indices[1 + i] <= end_indices[1 + i],
+        errors::InvalidArgument(
+            "Cropped size must be non-negative: start: ", crop_start,
+            " end: ", crop_end, " size ", reshaped_permuted_shape[1 + i]));
+  }
+  xla::ComputationDataHandle output =
+      b->Slice(reshaped_permuted, start_indices, end_indices);
+  ctx->SetOutput(0, output);
+}
+
+class BatchToSpaceNDOp : public XlaOpKernel {
+ public:
+  explicit BatchToSpaceNDOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    std::vector<int64> block_shape;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsIntVector(1, &block_shape));
+
+    xla::Literal crops;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(2, &crops));
+
+    BatchToSpace(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 block_shape, crops);
+  }
+};
+REGISTER_XLA_OP(Name("BatchToSpaceND"), BatchToSpaceNDOp);
+
+class BatchToSpaceOp : public XlaOpKernel {
+ public:
+  explicit BatchToSpaceOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("block_size", &block_size_));
+    OP_REQUIRES(
+        ctx, block_size_ > 1,
+        errors::InvalidArgument("Block size should be > 1: ", block_size_));
+  }
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::Literal crops;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(1, &crops));
+
+    BatchToSpace(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 {block_size_, block_size_}, crops);
+  }
+
+ private:
+  int block_size_;
+};
+REGISTER_XLA_OP(Name("BatchToSpace"), BatchToSpaceOp);
+
+}  // namespace
+}  // namespace tensorflow
diff --git a/tensorflow/compiler/tf2xla/kernels/elu_op.cc b/tensorflow/compiler/tf2xla/kernels/elu_op.cc
new file mode 100644
index 0000000000..62a5e1bd42
--- /dev/null
+++ b/tensorflow/compiler/tf2xla/kernels/elu_op.cc
@@ -0,0 +1,65 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Native XLA implementations of XLA Elu Ops
+
+#include "tensorflow/compiler/tf2xla/kernels/cwise_ops.h"
+#include "tensorflow/compiler/tf2xla/xla_helpers.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+#include "tensorflow/compiler/xla/client/computation_builder.h"
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/core/framework/kernel_def_builder.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/no_op.h"
+
+namespace tensorflow {
+namespace {
+
+class EluOp : public XlaOpKernel {
+ public:
+  explicit EluOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+  // Computes the max of the scalar input x and 0.
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::ComputationBuilder* b = ctx->builder();
+    const auto zero = XlaHelpers::Zero(b, input_type(0));
+    const auto one = XlaHelpers::One(b, input_type(0));
+    const auto pred = b->Gt(ctx->Input(0), zero);
+    const auto expm1 = b->Sub(b->Exp(ctx->Input(0)), one);
+    ctx->SetOutput(0, b->Select(pred, ctx->Input(0), expm1));
+  }
+};
+
+class EluGradOp : public XlaOpKernel {
+ public:
+  explicit EluGradOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+  // Return the lhs (incoming gradient) if the rhs (input feature) > 0,
+  // otherwise return lhs * (1 + rhs).
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::ComputationBuilder* b = ctx->builder();
+    const auto zero = XlaHelpers::Zero(b, input_type(0));
+    const auto one = XlaHelpers::One(b, input_type(0));
+    const auto grad = ctx->Input(0);
+    const auto activation = ctx->Input(1);
+    const auto exp_grad = b->Mul(grad, b->Add(activation, one));
+    const auto pred = b->Gt(activation, zero);
+    ctx->SetOutput(0, b->Select(pred, grad, exp_grad));
+  }
+};
+
+REGISTER_XLA_OP(Name("Elu"), EluOp);
+REGISTER_XLA_OP(Name("EluGrad"), EluGradOp);
+
+}  // namespace
+}  // namespace tensorflow
diff --git a/tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc b/tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc
new file mode 100644
index 0000000000..f15b354cb2
--- /dev/null
+++ b/tensorflow/compiler/tf2xla/kernels/spacetobatch_op.cc
@@ -0,0 +1,190 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/tf2xla/xla_helpers.h"
+#include "tensorflow/compiler/tf2xla/xla_op_kernel.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+
+namespace tensorflow {
+namespace {
+
+void SpaceToBatch(XlaOpKernelContext* ctx,
+                  const xla::ComputationDataHandle& input, DataType input_dtype,
+                  const TensorShape& input_tensor_shape,
+                  gtl::ArraySlice<int64> block_shape,
+                  const xla::Literal& paddings) {
+  const int input_rank = input_tensor_shape.dims();
+  const gtl::InlinedVector<int64, 4> input_shape =
+      input_tensor_shape.dim_sizes();
+  const int block_rank = block_shape.size();
+
+  OP_REQUIRES(
+      ctx, input_rank >= 1 + block_rank,
+      errors::InvalidArgument("input rank should be >= ", 1 + block_rank,
+                              " instead of ", input_rank));
+  gtl::ArraySlice<int64> remainder_shape(input_shape);
+  remainder_shape.remove_prefix(1 + block_rank);
+
+  OP_REQUIRES(
+      ctx,
+      xla::ShapeUtil::Rank(paddings.shape()) == 2 &&
+          block_rank == xla::ShapeUtil::GetDimension(paddings.shape(), 0) &&
+          2 == xla::ShapeUtil::GetDimension(paddings.shape(), 1),
+      errors::InvalidArgument("paddings should have shape [", block_rank,
+                              ", 2] instead of ",
+                              xla::ShapeUtil::HumanString(paddings.shape())));
+
+  xla::ComputationBuilder* b = ctx->builder();
+
+  // 1. Zero-pad the start and end of dimensions `[1, ..., M]` of the
+  //  input according to `paddings` to produce `padded` of shape `padded_shape`.
+  xla::PaddingConfig padding_config;
+  std::vector<int64> padded_shape(input_shape.begin(), input_shape.end());
+  int64 block_num_elems = 1LL;
+  padding_config.add_dimensions();  // Don't pad the batch dimension.
+  for (int i = 0; i < block_rank; ++i) {
+    auto* dim = padding_config.add_dimensions();
+    int64 pad_start = xla::LiteralUtil::Get<int64>(paddings, {i, 0});
+    int64 pad_end = xla::LiteralUtil::Get<int64>(paddings, {i, 1});
+    OP_REQUIRES(ctx, pad_start >= 0 && pad_end >= 0,
+                errors::InvalidArgument("Paddings must be non-negative"));
+    dim->set_edge_padding_low(pad_start);
+    dim->set_edge_padding_high(pad_end);
+    padded_shape[1 + i] += pad_start + pad_end;
+    block_num_elems *= block_shape[i];
+  }
+  // Don't pad the remainder dimensions.
+  for (int i = 0; i < remainder_shape.size(); ++i) {
+    padding_config.add_dimensions();
+  }
+  OP_REQUIRES(ctx, block_num_elems > 0,
+              errors::InvalidArgument(
+                  "The product of the block dimensions must be positive"));
+
+  xla::ComputationDataHandle padded =
+      b->Pad(input, XlaHelpers::Zero(b, input_dtype), padding_config);
+
+  // 2. Reshape `padded` to `reshaped_padded` of shape:
+  //
+  //      [batch] +
+  //      [padded_shape[1] / block_shape[0],
+  //        block_shape[0],
+  //       ...,
+  //       padded_shape[M] / block_shape[M-1],
+  //       block_shape[M-1]] +
+  //      remaining_shape
+  const int64 batch_size = input_shape[0];
+  std::vector<int64> reshaped_padded_shape(input_rank + block_rank);
+  reshaped_padded_shape[0] = batch_size;
+  for (int i = 0; i < block_rank; ++i) {
+    OP_REQUIRES(ctx, padded_shape[1 + i] % block_shape[i] == 0,
+                errors::InvalidArgument("padded_shape[", 1 + i,
+                                        "]=", padded_shape[1 + i],
+                                        " is not divisible by block_shape[", i,
+                                        "]=", block_shape[i]));
+
+    reshaped_padded_shape[1 + i * 2] = padded_shape[1 + i] / block_shape[i];
+    reshaped_padded_shape[1 + i * 2 + 1] = block_shape[i];
+  }
+  std::copy(remainder_shape.begin(), remainder_shape.end(),
+            reshaped_padded_shape.begin() + 1 + 2 * block_rank);
+
+  xla::ComputationDataHandle reshaped_padded =
+      b->Reshape(padded, reshaped_padded_shape);
+
+  // 3. Permute dimensions of `reshaped_padded` to produce
+  //    `permuted_reshaped_padded` of shape:
+  //
+  //      block_shape +
+  //      [batch] +
+  //      [padded_shape[1] / block_shape[0],
+  //       ...,
+  //       padded_shape[M] / block_shape[M-1]] +
+  //      remaining_shape
+  std::vector<int64> permutation(reshaped_padded_shape.size());
+  for (int i = 0; i < block_rank; ++i) {
+    permutation[i] = 1 + 2 * i + 1;
+    permutation[block_rank + 1 + i] = 1 + 2 * i;
+  }
+  permutation[block_rank] = 0;
+  std::iota(permutation.begin() + 1 + block_rank * 2, permutation.end(),
+            1 + block_rank * 2);
+  xla::ComputationDataHandle permuted_reshaped_padded =
+      b->Transpose(reshaped_padded, permutation);
+
+  // 4. Reshape `permuted_reshaped_padded` to flatten `block_shape` into the
+  //    batch dimension, producing an output tensor of shape:
+  //
+  //      [batch * prod(block_shape)] +
+  //      [padded_shape[1] / block_shape[0],
+  //       ...,
+  //       padded_shape[M] / block_shape[M-1]] +
+  //      remaining_shape
+  // Determine the length of the prefix of block dims that can be combined
+  // into the batch dimension due to having no padding and block_shape=1.
+  std::vector<int64> output_shape(input_rank);
+  output_shape[0] = batch_size * block_num_elems;
+  for (int i = 0; i < block_rank; ++i) {
+    output_shape[1 + i] = padded_shape[1 + i] / block_shape[i];
+  }
+  std::copy(remainder_shape.begin(), remainder_shape.end(),
+            output_shape.begin() + 1 + block_rank);
+
+  xla::ComputationDataHandle output =
+      b->Reshape(permuted_reshaped_padded, output_shape);
+  ctx->SetOutput(0, output);
+}
+
+class SpaceToBatchNDOp : public XlaOpKernel {
+ public:
+  explicit SpaceToBatchNDOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    std::vector<int64> block_shape;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsIntVector(1, &block_shape));
+
+    xla::Literal paddings;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(2, &paddings));
+
+    SpaceToBatch(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 block_shape, paddings);
+  }
+};
+REGISTER_XLA_OP(Name("SpaceToBatchND"), SpaceToBatchNDOp);
+
+class SpaceToBatchOp : public XlaOpKernel {
+ public:
+  explicit SpaceToBatchOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("block_size", &block_size_));
+    OP_REQUIRES(
+        ctx, block_size_ > 1,
+        errors::InvalidArgument("Block size should be > 1: ", block_size_));
+  }
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    xla::Literal paddings;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInputAsInt64Literal(1, &paddings));
+
+    SpaceToBatch(ctx, ctx->Input(0), input_type(0), ctx->InputShape(0),
+                 {block_size_, block_size_}, paddings);
+  }
+
+ private:
+  int block_size_;
+};
+REGISTER_XLA_OP(Name("SpaceToBatch"), SpaceToBatchOp);
+
+}  // namespace
+}  // namespace tensorflow
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.cc b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
index 53dcdec7a2..a022de36a2 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.cc
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
@@ -186,6 +186,31 @@ Status XlaOpKernelContext::ConstantInputAsIntVector(int index,
   return LiteralToInt64Vector(literal, out);
 }
 
+Status XlaOpKernelContext::ConstantInputAsInt64Literal(int index,
+                                                       xla::Literal* out) {
+  xla::Literal literal;
+  TF_RETURN_IF_ERROR(ConstantInput(index, &literal));
+  switch (literal.shape().element_type()) {
+    case xla::S32:
+      out->Clear();
+      *out->mutable_shape() = literal.shape();
+      out->mutable_shape()->set_element_type(xla::S64);
+      for (int32 x : literal.s32s()) {
+        out->add_s64s(x);
+      }
+      return Status::OK();
+
+    case xla::S64:
+      out->Swap(&literal);
+      return Status::OK();
+
+    default:
+      return errors::InvalidArgument(
+          "Invalid argument to ConstantInputAsInt64Literal: ",
+          xla::ShapeUtil::HumanString(literal.shape()));
+  }
+}
+
 // TODO(phawkins): validate that the dimensions form a valid shape, fail
 // gracefully if they do not.
 Status XlaOpKernelContext::ConstantInputAsShape(int index, TensorShape* shape) {
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.h b/tensorflow/compiler/tf2xla/xla_op_kernel.h
index 60e3b59d32..f97e07bea5 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.h
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.h
@@ -110,6 +110,9 @@ class XlaOpKernelContext {
   // Converts a constant 1D int32 or int64 tensor into a vector of int64s.
   Status ConstantInputAsIntVector(int index, std::vector<int64>* out);
 
+  // Converts a constant int32 or int64 Tensor into an xla int64 Literal.
+  Status ConstantInputAsInt64Literal(int index, xla::Literal* out);
+
   // Converts a constant 1D int32 or int64 tensor into a TensorShape.
   Status ConstantInputAsShape(int index, TensorShape* shape);
 
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index b9118fab25..695e4e7f07 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -594,8 +594,10 @@ cc_test(
     deps = [
         ":buffer_assignment",
         ":computation_tracker",
+        ":copy_insertion",
         ":cpu_plugin",
         ":hlo",
+        ":hlo_ordering",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:types",
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 27a1c0fec8..0969cff39a 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -868,7 +868,7 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_1_3x2x1_6x1x1x1) {
       computation->root_instruction()->dimensions();
   EXPECT_EQ(1, broadcast_dims.size());
   EXPECT_TRUE(broadcast_dims[0] == 1 || broadcast_dims[0] == 2 ||
-              broadcast_dims[3] == 3);
+              broadcast_dims[0] == 3);
 }
 
 TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_4_3x2x4x2_6x8) {
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index e2b550fc02..931f589800 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -41,6 +41,8 @@ limitations under the License.
 
 namespace xla {
 
+using ::tensorflow::gtl::FlatMap;
+using ::tensorflow::gtl::FlatSet;
 using ::tensorflow::strings::Appendf;
 using ::tensorflow::strings::HumanReadableNumBytes;
 
@@ -394,8 +396,8 @@ Status GatherComputationsByAllocationType(
 
   // Sets for quickly checking membership. Computations are returned in vectors
   // for stable iteration.
-  tensorflow::gtl::FlatSet<HloComputation*> thread_local_set;
-  tensorflow::gtl::FlatSet<HloComputation*> global_set;
+  FlatSet<HloComputation*> thread_local_set;
+  FlatSet<HloComputation*> global_set;
 
   while (!worklist.empty()) {
     auto worklist_front = worklist.front();
@@ -554,10 +556,9 @@ bool BufferAssigner::MaybeAssignBuffer(BufferAllocation* allocation,
 
 Status BufferAssigner::AssignBuffersForComputation(
     const HloComputation* computation, bool is_thread_local,
-    const tensorflow::gtl::FlatSet<const HloInstruction*>* hlos_to_allocate,
-    const tensorflow::gtl::FlatSet<const LogicalBuffer*>& colocated_buffers,
-    const tensorflow::gtl::FlatSet<BufferAllocation::Index>&
-        colocated_allocations,
+    const FlatSet<const HloInstruction*>* hlos_to_allocate,
+    const FlatSet<const LogicalBuffer*>& colocated_buffers,
+    const FlatSet<BufferAllocation::Index>& colocated_allocations,
     BufferAssignment* assignment) {
   // Buffers are sorted and assigned to BufferAllocations in decreasing order of
   // size.
@@ -578,7 +579,7 @@ Status BufferAssigner::AssignBuffersForComputation(
 
   // Generate a post order sort of instructions for sorting of the
   // LogicalBuffers.
-  tensorflow::gtl::FlatMap<const HloInstruction*, int> post_order_position;
+  FlatMap<const HloInstruction*, int> post_order_position;
   int position = 0;
   for (auto* instruction : computation->MakeInstructionPostOrder()) {
     post_order_position.emplace(instruction, position);
@@ -590,7 +591,7 @@ Status BufferAssigner::AssignBuffersForComputation(
   const BufferLiveness& liveness = assignment->liveness();
   const std::vector<const HloInstruction*>* sequential_order =
       liveness.hlo_ordering().SequentialOrder(*computation);
-  tensorflow::gtl::FlatSet<const LogicalBuffer*> unassigned_temp_buffers;
+  FlatSet<const LogicalBuffer*> unassigned_temp_buffers;
 
   // Sort the LogicalBuffers first by size. We assign the larger LogicalBuffers
   // first for simplicity. This means any previously created BufferAllocation is
@@ -791,7 +792,7 @@ Status BufferAssigner::AssignBuffersForComputation(
 
 Status BufferAssigner::AssignBuffersWithSequentialOrdering(
     const std::vector<const HloInstruction*>& sequence,
-    const tensorflow::gtl::FlatSet<const LogicalBuffer*>& buffers_to_assign,
+    const FlatSet<const LogicalBuffer*>& buffers_to_assign,
     const HloComputation& computation, BufferAssignment* assignment) {
   // Run the sequence of instructions through the heap simulator.  The heuristic
   // that seems to give the best results is lazy-best-fit, with all runs of
@@ -881,40 +882,137 @@ void BufferAssigner::AddSetToColocatedBufferSets(
   }
 }
 
+// Conceptually the same as AddSetToColocatedBufferSets, but specific to the
+// colocated buffers for while instructions. 'colocated_set' contains the
+// buffers for a single while instruction that must be colocated. The idea here
+// is to apply a memory-saving heuristic for separate while instructions whose
+// buffers are disjoint in liveness, by using the colocation mechanism to force
+// buffer sharing. This often reduces memory for multi-layer RNNs.
+//
+// TODO(b/32491382): We should be able to remove this heuristic after we
+// implement module-level liveness analysis, which would let us directly detect
+// buffer sharing opportunities between the while instruction buffer and the
+// buffers from the predicate and body computation, as well as sharing across
+// different while instructions.
+void BufferAssigner::AddWhileSetToColocatedBufferSets(
+    const std::vector<const LogicalBuffer*>& colocated_set,
+    const LogicalBuffer* while_init_buffer, const HloInstruction* while_hlo,
+    const HloComputation& computation, const BufferLiveness& buffer_liveness,
+    std::vector<ColocatedBufferSet>* colocated_buffer_sets) {
+  CHECK(!colocated_set.empty());
+
+  // Parallel while loops cannot safely share colocated buffer sets.
+  if (buffer_liveness.hlo_ordering().SequentialOrder(computation) == nullptr) {
+    AddSetToColocatedBufferSets(colocated_set, colocated_buffer_sets);
+    return;
+  }
+
+  // Scan 'colocated_buffer_sets' in reverse order for locality; colocated sets
+  // are added in postorder over computations and instructions.
+  const int64 init_buffer_size = buffer_size_(*while_init_buffer);
+  for (int i = colocated_buffer_sets->size() - 1; i >= 0; --i) {
+    const ColocatedBufferSet& predecessor_set = (*colocated_buffer_sets)[i];
+
+    // Skip predecessor sets not associated with while loops.
+    if (std::all_of(predecessor_set.begin(), predecessor_set.end(),
+                    [](const LogicalBuffer* buffer) {
+                      return buffer->instruction()->opcode() !=
+                             HloOpcode::kWhile;
+                    })) {
+      continue;
+    }
+
+    // Skip predecessor sets already associated with 'while_hlo'.
+    if (std::any_of(predecessor_set.begin(), predecessor_set.end(),
+                    [&while_hlo](const LogicalBuffer* buffer) {
+                      return buffer->instruction() == while_hlo;
+                    })) {
+      continue;
+    }
+
+    // Build vector of predecessor while result buffers.
+    std::vector<const LogicalBuffer*> predecessor_while_buffers;
+    for (const LogicalBuffer* buffer : predecessor_set) {
+      if (buffer->instruction()->opcode() == HloOpcode::kWhile &&
+          buffer_size_(*buffer) == init_buffer_size &&
+          buffer->instruction()->parent() == &computation) {
+        predecessor_while_buffers.push_back(buffer);
+      }
+    }
+    if (predecessor_while_buffers.empty()) {
+      continue;
+    }
+
+    // Skip predecessor set if the live range of any predecessor buffers
+    // overlaps with 'while_init_buffer'. Note that tuple element buffer
+    // forwarding can cause the same buffer to appear on both sides of the
+    // interference comparison below.
+    if (std::any_of(
+            predecessor_while_buffers.begin(), predecessor_while_buffers.end(),
+            [while_init_buffer, &buffer_liveness](const LogicalBuffer* buffer) {
+              return while_init_buffer->id() != buffer->id() &&
+                     buffer_liveness.MayInterfere(*while_init_buffer, *buffer);
+            })) {
+      continue;
+    }
+
+    // All our checks have passed; merge 'predecessor_set' with 'colocated_set',
+    // and add the merged set to 'colocated_buffer_sets'. This forces the
+    // colocation of buffers across different while instructions.
+    FlatSet<const LogicalBuffer*> unique;
+    unique.insert(predecessor_set.begin(), predecessor_set.end());
+    unique.insert(colocated_set.begin(), colocated_set.end());
+    std::vector<const LogicalBuffer*> merged_set(unique.begin(), unique.end());
+    AddSetToColocatedBufferSets(merged_set, colocated_buffer_sets);
+    return;
+  }
+
+  // Failed to merge into predecessor set; add 'colocated_set' as-is.
+  AddSetToColocatedBufferSets(colocated_set, colocated_buffer_sets);
+}
+
 namespace {
+
 // Checks that points-to set of 'instruction' is unambiguous and distinct
 // (ensured by CopyInsertion), then adds the buffer from the points-to set at
 // 'index' to 'colocated_set'.
-void AddBufferToColocatedSet(const HloInstruction* instruction,
-                             const ShapeIndex& index,
-                             const TuplePointsToAnalysis& points_to_analysis,
-                             std::vector<const LogicalBuffer*>* colocated_set) {
+const LogicalBuffer* AddBufferToColocatedSet(
+    const HloInstruction* instruction, const ShapeIndex& index,
+    const TuplePointsToAnalysis& points_to_analysis,
+    std::vector<const LogicalBuffer*>* colocated_set) {
   // CopyInsertion ensures root points-to set is unambiguous and distinct.
   const auto& points_to = points_to_analysis.GetPointsToSet(instruction);
   CHECK(!points_to.IsAmbiguous());
   CHECK(points_to.IsDistinct());
   colocated_set->push_back(points_to.element(index)[0]);
+  return colocated_set->back();
 }
+
 }  // namespace
 
 // Builds sets of buffers in 'colocated_buffer_sets' which should be colocated
 // in the same allocation (currently just supports kWhile and kCall).
 void BufferAssigner::BuildColocatedBufferSets(
-    const HloModule* module, const TuplePointsToAnalysis& points_to_analysis,
+    const HloModule* module, const BufferLiveness& buffer_liveness,
     std::vector<ColocatedBufferSet>* colocated_buffer_sets) {
-  for (auto& computation : module->computations()) {
-    for (auto& instruction : computation->instructions()) {
+  const TuplePointsToAnalysis& points_to_analysis =
+      buffer_liveness.points_to_analysis();
+  for (const HloComputation* computation : module->MakeComputationPostOrder()) {
+    for (const HloInstruction* instruction :
+         computation->MakeInstructionPostOrder()) {
       const HloOpcode opcode = instruction->opcode();
       if (opcode == HloOpcode::kWhile) {
-        HloInstruction* while_hlo = instruction.get();
+        const HloInstruction* while_hlo = instruction;
         TF_CHECK_OK(ShapeUtil::ForEachSubshape(
             while_hlo->shape(),
-            [this, while_hlo, &points_to_analysis, colocated_buffer_sets](
-                const Shape& /*subshape*/, const ShapeIndex& index) {
+            [this, while_hlo, &points_to_analysis, &buffer_liveness,
+             computation, colocated_buffer_sets](const Shape& /*subshape*/,
+                                                 const ShapeIndex& index) {
               std::vector<const LogicalBuffer*> colocated_set;
               // Add while.init.
-              AddBufferToColocatedSet(while_hlo->operand(0), index,
-                                      points_to_analysis, &colocated_set);
+              auto* init_buffer =
+                  AddBufferToColocatedSet(while_hlo->operand(0), index,
+                                          points_to_analysis, &colocated_set);
               // Add while.result.
               AddBufferToColocatedSet(while_hlo, index, points_to_analysis,
                                       &colocated_set);
@@ -930,12 +1028,15 @@ void BufferAssigner::BuildColocatedBufferSets(
               AddBufferToColocatedSet(
                   while_hlo->while_body()->root_instruction(), index,
                   points_to_analysis, &colocated_set);
-              AddSetToColocatedBufferSets(colocated_set, colocated_buffer_sets);
+              AddWhileSetToColocatedBufferSets(
+                  colocated_set, init_buffer, while_hlo, *computation,
+                  buffer_liveness, colocated_buffer_sets);
               return Status::OK();
             }));
       } else if (opcode == HloOpcode::kCall) {
-        HloInstruction* call_hlo = instruction.get();
-        HloInstruction* root_hlo = call_hlo->to_apply()->root_instruction();
+        const HloInstruction* call_hlo = instruction;
+        const HloInstruction* root_hlo =
+            call_hlo->to_apply()->root_instruction();
         TF_CHECK_OK(ShapeUtil::ForEachSubshape(
             call_hlo->shape(),
             [this, call_hlo, root_hlo, &points_to_analysis,
@@ -961,8 +1062,8 @@ void BufferAssigner::BuildColocatedBufferSets(
 void BufferAssigner::AssignColocatedBufferSets(
     const std::vector<ColocatedBufferSet>& colocated_buffer_sets,
     BufferAssignment* assignment,
-    tensorflow::gtl::FlatSet<const LogicalBuffer*>* colocated_buffers,
-    tensorflow::gtl::FlatSet<BufferAllocation::Index>* colocated_allocations) {
+    FlatSet<const LogicalBuffer*>* colocated_buffers,
+    FlatSet<BufferAllocation::Index>* colocated_allocations) {
   for (const ColocatedBufferSet& colocated_buffer_set : colocated_buffer_sets) {
     BufferAllocation* allocation = nullptr;
     for (const LogicalBuffer* buffer : colocated_buffer_set) {
@@ -1008,9 +1109,9 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
 
   // Set of HLO's to allocate if hlos_to_allocate is given. Passed as a set to
   // AssignBuffersForComputation for fast membership testing.
-  std::unique_ptr<tensorflow::gtl::FlatSet<const HloInstruction*>> hlo_set;
+  std::unique_ptr<FlatSet<const HloInstruction*>> hlo_set;
   if (hlos_to_allocate != nullptr) {
-    hlo_set = MakeUnique<tensorflow::gtl::FlatSet<const HloInstruction*>>(
+    hlo_set = MakeUnique<FlatSet<const HloInstruction*>>(
         hlos_to_allocate->begin(), hlos_to_allocate->end());
   }
 
@@ -1022,11 +1123,11 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
   // Once b/32491382 enables module-level liveness analysis, we may be able
   // to assign colocated buffers (or at least reuse their allocation for
   // buffers outside of the set) in AssignBuffersForComputation.
-  tensorflow::gtl::FlatSet<const LogicalBuffer*> colocated_buffers;
-  tensorflow::gtl::FlatSet<BufferAllocation::Index> colocated_allocations;
+  FlatSet<const LogicalBuffer*> colocated_buffers;
+  FlatSet<BufferAllocation::Index> colocated_allocations;
   if (colocate_related_buffers_) {
     std::vector<ColocatedBufferSet> colocated_buffer_sets;
-    BuildColocatedBufferSets(module, assignment->points_to_analysis(),
+    BuildColocatedBufferSets(module, assignment->liveness(),
                              &colocated_buffer_sets);
     AssignColocatedBufferSets(colocated_buffer_sets, assignment.get(),
                               &colocated_buffers, &colocated_allocations);
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.h b/tensorflow/compiler/xla/service/buffer_assignment.h
index b82acb19b3..ec1375e24d 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.h
+++ b/tensorflow/compiler/xla/service/buffer_assignment.h
@@ -465,7 +465,7 @@ class BufferAssigner {
   // ColocatedBufferSet aggregates a set of related LogicalBuffers from 'module'
   // which should be colocated in the same buffer allocation.
   void BuildColocatedBufferSets(
-      const HloModule* module, const TuplePointsToAnalysis& points_to_analysis,
+      const HloModule* module, const BufferLiveness& buffer_liveness,
       std::vector<ColocatedBufferSet>* colocated_buffer_sets);
 
   // For each buffer set in 'colocated_buffer_sets', assigns all buffers in the
@@ -482,6 +482,14 @@ class BufferAssigner {
       const std::vector<const LogicalBuffer*>& colocated_set,
       std::vector<ColocatedBufferSet>* colocated_buffer_sets);
 
+  // Conceptually the same as AddSetToColocatedBufferSets, but specific to the
+  // colocated buffers for while instructions.
+  void AddWhileSetToColocatedBufferSets(
+      const std::vector<const LogicalBuffer*>& colocated_set,
+      const LogicalBuffer* while_init_buffer, const HloInstruction* while_hlo,
+      const HloComputation& computation, const BufferLiveness& buffer_liveness,
+      std::vector<ColocatedBufferSet>* colocated_buffer_sets);
+
   const HloModule* module_;
 
   // Function which returns the buffer size for a given logical buffer (shape).
diff --git a/tensorflow/compiler/xla/service/buffer_assignment_test.cc b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
index bb7342d508..f6637d6098 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
@@ -23,10 +23,12 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/computation_tracker.h"
+#include "tensorflow/compiler/xla/service/copy_insertion.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/hlo_ordering.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/types.h"
@@ -1245,6 +1247,163 @@ TEST_F(BufferAssignmentTest, OneTempAllocation) {
   }
 }
 
-}  // namespace
+class WhileBufferAssignmentTest : public HloTestBase {
+ protected:
+  std::unique_ptr<HloComputation> BuildWhileConditionComputation(
+      const string& name) {
+    auto builder = HloComputation::Builder(name);
+    builder.AddInstruction(
+        HloInstruction::CreateParameter(0, loop_state_shape_, "loop_state"));
+    auto zero = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<int>(0)));
+    auto ten = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<int>(10)));
+    builder.AddInstruction(HloInstruction::CreateBinary(
+        ShapeUtil::MakeShape(PRED, {}), HloOpcode::kLt, zero, ten));
+    return builder.Build();
+  }
+
+  std::unique_ptr<HloComputation> BuildWhileBodyComputation(
+      const string& name) {
+    auto builder = HloComputation::Builder(name);
+    auto loop_state = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, loop_state_shape_, "loop_state"));
+    auto input = builder.AddInstruction(
+        HloInstruction::CreateGetTupleElement(data_shape_, loop_state, 0));
+    auto weights = builder.AddInstruction(
+        HloInstruction::CreateGetTupleElement(data_shape_, loop_state, 1));
+    auto output = builder.AddInstruction(HloInstruction::CreateBinary(
+        data_shape_, HloOpcode::kMultiply, input, weights));
+    builder.AddInstruction(
+        HloInstruction::CreateTuple({input, weights, output}));
+    return builder.Build();
+  }
+
+  void RunCopyInsertion(HloModule* module) {
+    CopyInsertion copy_insertion;
+    EXPECT_IS_OK(copy_insertion.Run(module).status());
+  }
+
+  std::unique_ptr<BufferAssignment> RunBufferAssignment(HloModule* module,
+                                                        int64 alignment = 1) {
+    auto sequence =
+        CreateMemoryMinimizingSequence(*module, ByteSizeOf).ConsumeValueOrDie();
+    return BufferAssigner::Run(
+               module, MakeUnique<SequentialHloOrdering>(module, sequence),
+               ByteSizeOf, alignment)
+        .ConsumeValueOrDie();
+  }
+
+  static int64 ByteSizeOf(const LogicalBuffer& buffer) {
+    return ShapeUtil::ByteSizeOf(buffer.shape(), sizeof(void*));
+  }
+
+  Shape data_shape_ = ShapeUtil::MakeShape(F32, {4});
+  Shape loop_state_shape_ =
+      ShapeUtil::MakeTupleShape({data_shape_, data_shape_, data_shape_});
+};
+
+TEST_F(WhileBufferAssignmentTest, TwoForwardWhileLoops) {
+  auto module = MakeUnique<HloModule>(TestName());
+  auto builder = HloComputation::Builder("entry");
+
+  auto input0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape_, "input0"));
+  auto weights0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, data_shape_, "weights0"));
+  auto weights1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(2, data_shape_, "weights1"));
+
+  auto zero = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0.0)));
+  auto output0 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+  auto output1 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+
+  auto cond0 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body0 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+
+  auto tuple0 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input0, weights0, output0}));
+  auto while0 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond0, body0, tuple0));
+
+  auto cond1 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body1 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+  auto input1 = builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(data_shape_, while0, 2));
+  auto tuple1 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input1, weights1, output1}));
+  auto while1 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond1, body1, tuple1));
+
+  module->AddEntryComputation(builder.Build());
+  RunCopyInsertion(module.get());
+  auto assignment = RunBufferAssignment(module.get());
 
+  // While instruction 'while0' has no predecessor while instructions with
+  // which to share allocations.
+
+  // While instruction 'while1' can share allocations with the following
+  // buffers:
+  // *) while0[2], while1[0]
+  // *) while0[1], while1[1]
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {2}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {0}).ConsumeValueOrDie());
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {1}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {1}).ConsumeValueOrDie());
+}
+
+TEST_F(WhileBufferAssignmentTest, OneForwardBackwardWhileLoopSet) {
+  auto module = MakeUnique<HloModule>(TestName());
+  auto builder = HloComputation::Builder("entry");
+
+  auto input0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape_, "input0"));
+  auto weights0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, data_shape_, "weights0"));
+
+  auto zero = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0.0)));
+  auto output0 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+  auto output1 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+
+  auto cond0 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body0 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+
+  auto tuple0 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input0, weights0, output0}));
+  auto while0 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond0, body0, tuple0));
+
+  auto cond1 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body1 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+
+  auto tuple1 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input0, weights0, output1}));
+  auto while1 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond1, body1, tuple1));
+
+  module->AddEntryComputation(builder.Build());
+  RunCopyInsertion(module.get());
+  auto assignment = RunBufferAssignment(module.get());
+
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {2}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {0}).ConsumeValueOrDie());
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {1}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {1}).ConsumeValueOrDie());
+}
+
+}  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_opcode.cc b/tensorflow/compiler/xla/service/hlo_opcode.cc
index 616b239a93..ceb0cdaa31 100644
--- a/tensorflow/compiler/xla/service/hlo_opcode.cc
+++ b/tensorflow/compiler/xla/service/hlo_opcode.cc
@@ -165,4 +165,17 @@ bool HloOpcodeIsComparison(HloOpcode opcode) {
   }
 }
 
+bool HloOpcodeIsVariadic(HloOpcode opcode) {
+  switch (opcode) {
+    case HloOpcode::kCall:
+    case HloOpcode::kConcatenate:
+    case HloOpcode::kFusion:
+    case HloOpcode::kMap:
+    case HloOpcode::kTuple:
+      return true;
+    default:
+      return false;
+  }
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_opcode.h b/tensorflow/compiler/xla/service/hlo_opcode.h
index 978ed5e79b..e2cdbfdfa7 100644
--- a/tensorflow/compiler/xla/service/hlo_opcode.h
+++ b/tensorflow/compiler/xla/service/hlo_opcode.h
@@ -104,6 +104,9 @@ inline std::ostream& operator<<(std::ostream& os, HloOpcode opcode) {
 // Returns true iff the given opcode is a comparison operation.
 bool HloOpcodeIsComparison(HloOpcode opcode);
 
+// Returns true iff the given opcode has variadic operands.
+bool HloOpcodeIsVariadic(HloOpcode opcode);
+
 }  // namespace xla
 
 #endif  // TENSORFLOW_COMPILER_XLA_SERVICE_HLO_OPCODE_H_
diff --git a/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc b/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
index 6e3c983071..eb7fe467b3 100644
--- a/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
+++ b/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
@@ -40,6 +40,8 @@ void DumpModule(const Compiler::HloDumper& dumper_, const HloModule& module,
 }  // namespace
 
 StatusOr<bool> HloPassPipeline::Run(HloModule* module) {
+  run_called_ = true;
+
   legacy_flags::HloPassPipelineFlags* flags =
       legacy_flags::GetHloPassPipelineFlags();
   std::vector<string> tmp =
diff --git a/tensorflow/compiler/xla/service/hlo_pass_pipeline.h b/tensorflow/compiler/xla/service/hlo_pass_pipeline.h
index a8c2d51873..682c4b952d 100644
--- a/tensorflow/compiler/xla/service/hlo_pass_pipeline.h
+++ b/tensorflow/compiler/xla/service/hlo_pass_pipeline.h
@@ -47,6 +47,7 @@ class HloPassPipeline : public HloPassInterface {
   // Returns a reference to the added pass.
   template <typename T, typename... Args>
   T& AddPass(Args&&... args) {
+    CHECK(!run_called_) << "AddPass cannot be called after Run";
     auto pass = new T(std::forward<Args>(args)...);
     passes_.push_back(std::unique_ptr<T>(pass));
     return *pass;
@@ -57,6 +58,7 @@ class HloPassPipeline : public HloPassInterface {
   // (it is required to always return "false" from its Run() method).
   template <typename T, typename... Args>
   T& AddInvariantChecker(Args&&... args) {
+    CHECK(!run_called_) << "AddInvariantChecker cannot be called after Run";
     auto pass = new T(std::forward<Args>(args)...);
     invariant_checkers_.push_back(std::unique_ptr<T>(pass));
     return *pass;
@@ -70,6 +72,7 @@ class HloPassPipeline : public HloPassInterface {
   Compiler::HloDumper dumper_;
   std::vector<std::unique_ptr<HloPassInterface>> passes_;
   std::vector<std::unique_ptr<HloPassInterface>> invariant_checkers_;
+  bool run_called_ = false;
 
   TF_DISALLOW_COPY_AND_ASSIGN(HloPassPipeline);
 };
diff --git a/tensorflow/compiler/xla/service/liveness_util.cc b/tensorflow/compiler/xla/service/liveness_util.cc
index caaf56a551..1f625ae0e2 100644
--- a/tensorflow/compiler/xla/service/liveness_util.cc
+++ b/tensorflow/compiler/xla/service/liveness_util.cc
@@ -101,12 +101,12 @@ std::vector<std::pair<HloInstruction*, int64>> GetAllUsesOfInstructionAtIndex(
 }  // namespace
 
 // User and operand can share buffers iff both instructions emit the same shape
-// and layout, and 'user' meets one of the following two qualifications:
-// *) Is element-wise.
+// and layout, and 'user' meets one of the following qualifications:
+// *) Is element-wise. Or...
 // *) Is a loop fusion instruction where the only use of 'operand' at 'index'
 //    in the set 'user.fused_instructions' is a DynamicUpdateSlice fused root
-//    at operand 0.
-// *) Use of 'operand' is DynamicUpdateSlice at operand index 0.
+//    at operand 0. Or...
+// *) The 'user' of 'operand' is DynamicUpdateSlice or While at operand index 0.
 bool CanShareOperandBufferWithUser(
     HloInstruction* operand, const ShapeIndex& operand_index,
     HloInstruction* user, const ShapeIndex& user_index,
@@ -144,7 +144,8 @@ bool CanShareOperandBufferWithUser(
       break;
     }
     return false;
-  } else if (user->opcode() == HloOpcode::kDynamicUpdateSlice) {
+  } else if (user->opcode() == HloOpcode::kDynamicUpdateSlice ||
+             user->opcode() == HloOpcode::kWhile) {
     // We eliminated other users in BufferLiveness::live_range_strictly_before,
     // so here we just need to check that the use is at operand index 0.
     std::vector<int64> operand_indices = user->OperandIndices(operand);
diff --git a/tensorflow/compiler/xla/service/liveness_util_test.cc b/tensorflow/compiler/xla/service/liveness_util_test.cc
index 2ff71d6f3c..079b59265b 100644
--- a/tensorflow/compiler/xla/service/liveness_util_test.cc
+++ b/tensorflow/compiler/xla/service/liveness_util_test.cc
@@ -185,5 +185,73 @@ TEST_F(CanShareOperandBufferWithUserTest, FusedDynamicUpdateSlice) {
                                             *points_to_analysis_));
 }
 
+TEST_F(CanShareOperandBufferWithUserTest, DynamicUpdateSliceCanShare) {
+  auto builder = HloComputation::Builder(TestName());
+
+  Shape data_shape = ShapeUtil::MakeShape(F32, {8});
+  Shape update_shape = ShapeUtil::MakeShape(F32, {4});
+  Shape starts_shape = ShapeUtil::MakeShape(S32, {1});
+  auto data = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape, "data"));
+  auto update = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, update_shape, "update"));
+  auto starts = builder.AddInstruction(
+      HloInstruction::CreateParameter(2, starts_shape, "starts"));
+  auto dus = builder.AddInstruction(HloInstruction::CreateDynamicUpdateSlice(
+      data_shape, data, update, starts));
+
+  BuildModuleAndRunAnalysis(builder.Build());
+
+  // The DynamicUpdateSlice instruction can share with the data operand, but not
+  // with update or starts.
+  EXPECT_TRUE(
+      CanShareOperandBufferWithUser(data, {}, dus, {}, *points_to_analysis_));
+  EXPECT_FALSE(
+      CanShareOperandBufferWithUser(update, {}, dus, {}, *points_to_analysis_));
+  EXPECT_FALSE(
+      CanShareOperandBufferWithUser(starts, {}, dus, {}, *points_to_analysis_));
+}
+
+TEST_F(CanShareOperandBufferWithUserTest, WhileCanShare) {
+  Shape data_shape = ShapeUtil::MakeShape(F32, {8});
+
+  auto make_cond = [this, &data_shape]() {
+    auto builder = HloComputation::Builder(TestName() + ".Cond");
+    auto data = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, data_shape, "data"));
+    builder.AddInstruction(HloInstruction::CreateBinary(
+        ShapeUtil::MakeShape(PRED, {}), HloOpcode::kEq, data, data));
+    return builder.Build();
+  };
+
+  auto make_body = [this, &data_shape]() {
+    auto builder = HloComputation::Builder(TestName() + ".Body");
+    auto data = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, data_shape, "data"));
+    builder.AddInstruction(
+        HloInstruction::CreateBinary(data_shape, HloOpcode::kAdd, data, data));
+    return builder.Build();
+  };
+
+  module_ = MakeUnique<HloModule>(TestName());
+  HloComputation* cond_computation =
+      module_->AddEmbeddedComputation(make_cond());
+  HloComputation* body_computation =
+      module_->AddEmbeddedComputation(make_body());
+
+  auto builder = HloComputation::Builder(TestName());
+  auto data = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape, "data"));
+  auto whil = builder.AddInstruction(HloInstruction::CreateWhile(
+      data_shape, cond_computation, body_computation, data));
+  computation_ = module_->AddEntryComputation(builder.Build());
+
+  RunAnalysis();
+
+  // The While instruction can share with the data operand.
+  EXPECT_TRUE(
+      CanShareOperandBufferWithUser(data, {}, whil, {}, *points_to_analysis_));
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/tests/broadcast_test.cc b/tensorflow/compiler/xla/tests/broadcast_test.cc
index 1796a732e5..16d4282466 100644
--- a/tensorflow/compiler/xla/tests/broadcast_test.cc
+++ b/tensorflow/compiler/xla/tests/broadcast_test.cc
@@ -265,6 +265,37 @@ TEST_F(BroadcastTest, Broadcast_R2_2x2_To_R4_3x3x2x2) {
       *LiteralUtil::CreateR4FromArray4D<float>(expected), *result, error_spec_);
 }
 
+TEST_F(BroadcastTest, Broadcast_R3_2x3x4_to_R4_2x3x4x5) {
+  auto builder = HloComputation::Builder(TestName());
+  Array3D<float> input_vals(2, 3, 4);
+  input_vals.FillRandom(1.0);
+
+  Array4D<float> expected(2, 3, 4, 5);
+  for (int i = 0; i < 2; ++i) {
+    for (int j = 0; j < 3; ++j) {
+      for (int k = 0; k < 4; ++k) {
+        for (int m = 0; m < 5; ++m) {
+          expected(i, j, k, m) = input_vals(i, j, k);
+        }
+      }
+    }
+  }
+  auto input = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR3FromArray3D<float>(input_vals)));
+
+  // Broadcast vector in dimensions 2 and 3.
+  builder.AddInstruction(HloInstruction::CreateBroadcast(
+      ShapeUtil::MakeShape(F32, {2, 3, 4, 5}), input, {0, 1, 2}));
+
+  // Create HLO module, compile, and execute.
+  auto hlo_module = MakeUnique<HloModule>(TestName());
+  hlo_module->AddEntryComputation(builder.Build());
+  auto result = ExecuteAndTransfer(std::move(hlo_module), {});
+
+  LiteralTestUtil::ExpectNear(
+      *LiteralUtil::CreateR4FromArray4D<float>(expected), *result, error_spec_);
+}
+
 }  // namespace
 }  // namespace xla
 
diff --git a/tensorflow/compiler/xla/tests/reduce_test.cc b/tensorflow/compiler/xla/tests/reduce_test.cc
index 34fce21758..d00a317534 100644
--- a/tensorflow/compiler/xla/tests/reduce_test.cc
+++ b/tensorflow/compiler/xla/tests/reduce_test.cc
@@ -211,9 +211,9 @@ XLA_TEST_F(ReduceTest, ReduceR1_0_F32_To_R0) { RunR1ToR0Test(0); }
 XLA_TEST_F(ReduceTest, ReduceR1_1_F32_To_R0) { RunR1ToR0Test(1); }
 XLA_TEST_F(ReduceTest, ReduceR1_2_F32_To_R0) { RunR1ToR0Test(2); }
 XLA_TEST_F(ReduceTest, ReduceR1_16_F32_To_R0) { RunR1ToR0Test(16); }
-XLA_TEST_F(ReduceTest, ReduceR1_240_F32_To_R0) { RunR1ToR0Test(240); }
 XLA_TEST_F(ReduceTest, ReduceR1_128_F32_To_R0) { RunR1ToR0Test(128); }
 XLA_TEST_F(ReduceTest, ReduceR1_129_F32_To_R0) { RunR1ToR0Test(129); }
+XLA_TEST_F(ReduceTest, ReduceR1_240_F32_To_R0) { RunR1ToR0Test(240); }
 XLA_TEST_F(ReduceTest, ReduceR1_256_F32_To_R0) { RunR1ToR0Test(256); }
 XLA_TEST_F(ReduceTest, ReduceR1_1024_F32_To_R0) { RunR1ToR0Test(1024); }
 XLA_TEST_F(ReduceTest, ReduceR1_2048_F32_To_R0) { RunR1ToR0Test(2048); }
@@ -221,6 +221,9 @@ XLA_TEST_F(ReduceTest, ReduceR1_16K_F32_To_R0) { RunR1ToR0Test(16 * 1024); }
 XLA_TEST_F(ReduceTest, ReduceR1_16KP1_F32_To_R0) {
   RunR1ToR0Test(16 * 1024 + 1);
 }
+XLA_TEST_F(ReduceTest, ReduceR1_64K_F32_To_R0) { RunR1ToR0Test(64 * 1024); }
+XLA_TEST_F(ReduceTest, ReduceR1_1M_F32_To_R0) { RunR1ToR0Test(1024 * 1024); }
+XLA_TEST_F(ReduceTest, ReduceR1_16M_F32_To_R0) { RunR1ToR0Test(4096 * 4096); }
 
 XLA_TEST_F(ReduceTest, ReduceR2_0x0_To_R0) { RunR2ToR0Test(0, 0); }
 XLA_TEST_F(ReduceTest, ReduceR2_0x2_To_R0) { RunR2ToR0Test(0, 2); }
diff --git a/tensorflow/compiler/xla/tools/BUILD b/tensorflow/compiler/xla/tools/BUILD
index 46eab7f02b..ab598b8edd 100644
--- a/tensorflow/compiler/xla/tools/BUILD
+++ b/tensorflow/compiler/xla/tools/BUILD
@@ -176,6 +176,52 @@ cc_binary(
     ],
 )
 
+cc_library(
+    name = "hlo_tfgraph_builder",
+    srcs = ["hlo_tfgraph_builder.cc"],
+    hdrs = ["hlo_tfgraph_builder.h"],
+    deps = [
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla/service:hlo",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
+cc_test(
+    name = "hlo_tfgraph_builder_test",
+    srcs = ["hlo_tfgraph_builder_test.cc"],
+    deps = [
+        ":hlo_tfgraph_builder",
+        "//tensorflow/compiler/xla/client:computation_builder",
+        "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+cc_binary(
+    name = "dumped_computation_to_tf_graphdef",
+    srcs = ["dumped_computation_to_tf_graphdef.cc"],
+    deps = [
+        ":hlo_tfgraph_builder",
+        "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:types",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/client",
+        "//tensorflow/compiler/xla/client:client_library",
+        "//tensorflow/compiler/xla/client:computation",
+        "//tensorflow/compiler/xla/client:local_client",
+        "//tensorflow/compiler/xla/service",
+        "//tensorflow/compiler/xla/service:hlo_graph_dumper",
+        "//tensorflow/compiler/xla/service:session_proto",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
 # -----------------------------------------------------------------------------
 
 filegroup(
diff --git a/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc b/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
new file mode 100644
index 0000000000..1aa769ee5a
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
@@ -0,0 +1,139 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Usage: dumped_computation_to_tf_graph \
+//          --output_dir=/tmp/graphs/ some_binary_snapshot_proto*
+//
+// Dumps a tensorflow GraphDef in text format for a snapshot computation. The
+// dumped graph is an HLO computation with HLO instructions as nodes and can be
+// visualized on Tensorboard. Upload the dumped files on Tensorboard.
+//
+// some_binary_snapshot_proto is obtained by serializing the SessionModule from
+// ServiceInterface::SnapshotComputation to disk.
+
+#include <stdio.h>
+#include <memory>
+#include <string>
+
+#include "tensorflow/compiler/xla/client/client.h"
+#include "tensorflow/compiler/xla/client/client_library.h"
+#include "tensorflow/compiler/xla/client/computation.h"
+#include "tensorflow/compiler/xla/client/local_client.h"
+#include "tensorflow/compiler/xla/service/service.h"
+#include "tensorflow/compiler/xla/service/session.pb.h"
+#include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/types.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/logging.h"
+
+using tensorflow::Env;
+using tensorflow::io::JoinPath;
+using tensorflow::strings::StrAppend;
+
+namespace xla {
+namespace tools {
+namespace {
+
+// Dumps all computations in the module to the given directory.
+void DumpTfGraph(const HloModule& module, const string& directory_path) {
+  Env* env = Env::Default();
+  TF_CHECK_OK(env->RecursivelyCreateDir(directory_path));
+  string fname = module.name();
+  std::replace(fname.begin(), fname.end(), '/', '_');
+  // Since the file name will be used as the top-level scope name, clean it up
+  // to make it a valid scope name.
+  CleanNodeName(&fname);
+  StrAppend(&fname, ".pbtxt");
+  string path = JoinPath(directory_path, fname);
+  HloTfGraphBuilder builder;
+  TF_CHECK_OK(builder.AddComputation(*module.entry_computation()));
+  std::cout << "Dumping " << module.name() << " to " << path << std::endl;
+  TF_CHECK_OK(WriteTextProto(env, path, builder.GetGraphDef()));
+}
+
+}  // namespace
+
+void RealMain(tensorflow::gtl::ArraySlice<char*> args,
+              const string& output_dir) {
+  LocalClient* client = ClientLibrary::LocalClientOrDie();
+  // To avoid adding a new flag, use local service and lower the computations
+  // locally.
+  LocalService* local_service =
+      ClientLibrary::GetXlaService(client->platform());
+  // Build HloModule for each Computation and dump to file.
+  for (char* arg : args) {
+    SessionModule session_module;
+    TF_CHECK_OK(tensorflow::ReadBinaryProto(tensorflow::Env::Default(), arg,
+                                            &session_module));
+    auto computation_status = client->LoadSnapshot(session_module);
+    if (!computation_status.ok()) {
+      fprintf(stderr, "could not load snapshot for %s: %s\n", arg,
+              computation_status.status().ToString().c_str());
+      continue;
+    }
+    Computation computation = computation_status.ConsumeValueOrDie();
+
+    StatusOr<UserComputation*> user_computation_status =
+        local_service->computation_tracker().Resolve(computation.handle());
+    if (!user_computation_status.ok()) {
+      fprintf(stderr,
+              "failed to resolve computation to UserComputation %s: %s\n", arg,
+              user_computation_status.status().ToString().c_str());
+      continue;
+    }
+
+    auto* user_computation = user_computation_status.ValueOrDie();
+    StatusOr<std::unique_ptr<HloModule>> module_status =
+        local_service->computation_tracker().BuildHloModule(
+            user_computation->GetVersionedHandle());
+
+    if (!module_status.ok()) {
+      fprintf(stderr, "failed to build HloModule %s: %s\n", arg,
+              module_status.status().ToString().c_str());
+      continue;
+    }
+
+    DumpTfGraph(*module_status.ValueOrDie(), output_dir);
+  }
+}
+
+}  // namespace tools
+}  // namespace xla
+
+int main(int argc, char** argv) {
+  string output_dir = "";
+  const std::vector<tensorflow::Flag> flag_list = {
+      tensorflow::Flag("output_dir", &output_dir,
+                       "Directory to write GraphDef data to."),
+  };
+
+  string usage = tensorflow::Flags::Usage(argv[0], flag_list);
+  bool parse_ok = tensorflow::Flags::Parse(&argc, argv, flag_list);
+  if (!parse_ok || output_dir.empty()) {
+    LOG(QFATAL) << usage;
+  }
+  tensorflow::port::InitMain(argv[0], &argc, &argv);
+
+  tensorflow::gtl::ArraySlice<char*> args(argv, argc);
+  args.pop_front();  // Pop off the binary name, argv[0]
+  xla::tools::RealMain(args, output_dir);
+  return 0;
+}
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
new file mode 100644
index 0000000000..fe835a20c4
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
@@ -0,0 +1,204 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+LIcensed under the Apache License, Version 2.0 (the "License");
+You may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/layout_util.h"
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/tensor_shape.pb.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+
+using ::tensorflow::GraphDef;
+using ::tensorflow::NodeDef;
+using ::tensorflow::TensorShapeProto;
+using ::tensorflow::strings::StrAppend;
+using ::tensorflow::strings::StrCat;
+using ::tensorflow::str_util::Join;
+
+namespace xla {
+namespace tools {
+namespace {
+
+string GetOpDefName(const HloInstruction* instruction) {
+  string name = StrCat("hlo-", HloOpcodeString(instruction->opcode()));
+  tensorflow::str_util::TitlecaseString(&name, "-");
+  name.erase(std::remove(name.begin(), name.end(), '-'), name.end());
+
+  if (instruction->opcode() == HloOpcode::kFusion) {
+    string fusion_name = ToString(instruction->fusion_kind());
+    StrAppend(&name, tensorflow::StringPiece(fusion_name).substr(1));
+  }
+  return name;
+}
+
+TensorShapeProto GetTensorShape(const HloInstruction* instruction) {
+  TensorShapeProto tensor_shape;
+  const Shape& shape = instruction->shape();
+  for (auto dim : shape.dimensions()) {
+    tensor_shape.add_dim()->set_size(dim);
+  }
+  return tensor_shape;
+}
+
+}  // namespace
+
+void CleanNodeName(string* name) {
+  name->erase(std::remove(name->begin(), name->end(), '%'), name->end());
+  const string chars_to_replace = "<>[]";
+  auto pred = [&](char c) {
+    return std::find(chars_to_replace.begin(), chars_to_replace.end(), c) !=
+           chars_to_replace.end();
+  };
+  std::replace_if(name->begin(), name->end(), pred, '_');
+}
+
+Status HloTfGraphBuilder::AddComputation(const HloComputation& computation) {
+  LOG(INFO) << "Adding computation " << computation.name();
+  for (auto embedded : computation.MakeEmbeddedComputationsList()) {
+    LOG(INFO) << "Adding embedded computation " << embedded->name();
+    for (auto& instruction : embedded->instructions()) {
+      TF_RETURN_IF_ERROR(AddInstruction(instruction.get()));
+    }
+  }
+  for (auto& instruction : computation.instructions()) {
+    TF_RETURN_IF_ERROR(AddInstruction(instruction.get()));
+  }
+  return Status::OK();
+}
+
+const GraphDef& HloTfGraphBuilder::GetGraphDef() const { return graph_def_; }
+
+const string& HloTfGraphBuilder::GetNodeNameForInstruction(
+    const HloInstruction* instruction) {
+  if (ContainsKey(instruction_to_node_name_, instruction)) {
+    return instruction_to_node_name_[instruction];
+  }
+  // If an instruction is fused, put it in the subgraph of the fusion;
+  // otherwise, put it in the computation subgraph.
+  string node_name =
+      instruction->IsFused()
+          ? GetNodeNameForInstruction(instruction->fusion_instruction())
+          : instruction->parent()->name();
+  string instruction_name = instruction->name();
+  if (instruction->opcode() == HloOpcode::kParameter) {
+    StrAppend(&instruction_name, ".", instruction->parameter_number());
+  }
+  StrAppend(&node_name, "/", instruction_name);
+  CleanNodeName(&node_name);
+  auto ret =
+      instruction_to_node_name_.insert(std::make_pair(instruction, node_name));
+  CHECK(ret.second);
+  return ret.first->second;
+}
+
+void HloTfGraphBuilder::SetNodeAttrs(const HloInstruction* instruction,
+                                     NodeDef* node_def) const {
+  auto& attrs = *node_def->mutable_attr();
+
+  // Set the number of arguments for instructions that have variadic operands.
+  if (HloOpcodeIsVariadic(instruction->opcode())) {
+    tensorflow::AttrValue attr_value;
+    attr_value.set_i(instruction->operands().size());
+    attrs["arg_num"] = attr_value;
+  }
+
+  // Set the node type.
+  attrs["type"].set_s(
+      xla::PrimitiveType_Name(instruction->shape().element_type()));
+
+  // Set the shape of the output tensor. "_output_shapes" is a special attribute
+  // name used by Tensorboard for shapes of output tensors.
+  tensorflow::AttrValue shapes;
+  *shapes.mutable_list()->add_shape() = GetTensorShape(instruction);
+  attrs["_output_shapes"] = shapes;
+
+  // Set the layout.
+  if (LayoutUtil::HasLayout(instruction->shape())) {
+    string layout_string;
+    if (ShapeUtil::IsTuple(instruction->shape())) {
+      // For tuples, emit the full shape because the layout of a tuple is not
+      // represented in a single Layout field.
+      layout_string = ShapeUtil::HumanStringWithLayout(instruction->shape());
+    } else {
+      layout_string = StrCat(
+          "{", Join(instruction->shape().layout().minor_to_major(), ","), "}");
+    }
+    attrs["layout"].set_s(layout_string);
+  }
+
+  // Set op-specific attributes.
+  switch (instruction->opcode()) {
+    case HloOpcode::kConcatenate:
+    case HloOpcode::kBroadcast:
+    case HloOpcode::kReduce:
+    case HloOpcode::kReverse:
+    case HloOpcode::kTranspose:
+      for (auto dim : instruction->dimensions()) {
+        attrs["dims"].mutable_list()->add_i(dim);
+      }
+      break;
+    case HloOpcode::kGetTupleElement:
+      attrs["index"].set_i(instruction->tuple_index());
+      break;
+    case HloOpcode::kRng:
+      attrs["dist"].set_s(
+          RandomDistribution_Name(instruction->random_distribution()));
+      break;
+    case HloOpcode::kConstant:
+      if (ShapeUtil::IsScalar(instruction->shape())) {
+        attrs["value"].set_s(
+            LiteralUtil::GetAsString(instruction->literal(), {}));
+      }
+      break;
+    case HloOpcode::kCustomCall:
+      attrs["custom_call_target"].set_s(instruction->custom_call_target());
+      break;
+    default:
+      break;
+  }
+}
+
+Status HloTfGraphBuilder::AddInstruction(const HloInstruction* instruction) {
+  if (!visited_instructions_.insert(instruction).second) {
+    // Skip instructions that have already been added.
+    return Status::OK();
+  }
+
+  NodeDef* node_def = graph_def_.add_node();
+  node_def->set_name(GetNodeNameForInstruction(instruction));
+  node_def->set_op(GetOpDefName(instruction));
+  SetNodeAttrs(instruction, node_def);
+  if (instruction->opcode() == HloOpcode::kFusion) {
+    for (auto& fused_instruction : instruction->fused_instructions()) {
+      TF_RETURN_IF_ERROR(AddInstruction(fused_instruction.get()));
+    }
+  }
+  // Add all edges including control edges.
+  for (unsigned i = 0; i < instruction->operands().size(); ++i) {
+    *node_def->add_input() = GetNodeNameForInstruction(instruction->operand(i));
+  }
+  // Called computations are control dependencies.
+  for (const auto* called_computation : instruction->called_computations()) {
+    *node_def->add_input() = StrCat(
+        "^", GetNodeNameForInstruction(called_computation->root_instruction()));
+  }
+  return Status::OK();
+}
+
+}  // namespace tools
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
new file mode 100644
index 0000000000..3052eae113
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
@@ -0,0 +1,59 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
+#define THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
+
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/graph/graph.h"
+
+namespace xla {
+namespace tools {
+
+// This constructs a tensorflow graph for HLO computations.
+class HloTfGraphBuilder {
+ public:
+  // Adds a computation to the graph.
+  Status AddComputation(const HloComputation& computation);
+
+  const tensorflow::GraphDef& GetGraphDef() const;
+
+ private:
+  // Gets the node name of an instruction. The node name is hierarchical. For
+  // example, if an instruction is fused, it will be put in a subgraph of the
+  // fusion instruction.
+  const string& GetNodeNameForInstruction(const HloInstruction* instruction);
+
+  void SetNodeAttrs(const HloInstruction* instruction,
+                    tensorflow::NodeDef* node_def) const;
+
+  Status AddInstruction(const HloInstruction* instruction);
+
+  tensorflow::GraphDef graph_def_;
+  // This records instructions that have been visited.
+  std::unordered_set<const HloInstruction*> visited_instructions_;
+  // A cache that maps instruction to the node name.
+  std::unordered_map<const HloInstruction*, string> instruction_to_node_name_;
+};
+
+// Cleans the node name to make it a valid name in a tensorflow graph.
+void CleanNodeName(string* name);
+
+}  // namespace tools
+}  // namespace xla
+
+#endif  // THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
new file mode 100644
index 0000000000..626bcc6d85
--- /dev/null
+++ b/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
@@ -0,0 +1,154 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/client/computation_builder.h"
+#include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+
+namespace xla {
+namespace tools {
+namespace {
+
+using ::tensorflow::GraphDef;
+
+class HloTfGraphBuilderTest : public HloTestBase {
+ protected:
+  HloTfGraphBuilderTest() {}
+  HloTfGraphBuilder generator_;
+
+  // Create a computation which takes a scalar and returns its negation.
+  std::unique_ptr<HloComputation> CreateNegateComputation() {
+    auto builder = HloComputation::Builder("Negate");
+    auto param = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, r0f32_, "param0"));
+    builder.AddInstruction(
+        HloInstruction::CreateUnary(r0f32_, HloOpcode::kNegate, param));
+    return builder.Build();
+  }
+
+  // Creates a computation which calls map with the given computation.
+  std::unique_ptr<HloComputation> CreateMapComputation(
+      HloComputation* map_computation) {
+    auto builder = HloComputation::Builder("Map");
+    auto param = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, r0f32_, "param0"));
+    builder.AddInstruction(
+        HloInstruction::CreateMap(r0f32_, {param}, map_computation));
+    return builder.Build();
+  }
+  Shape r0f32_ = ShapeUtil::MakeShape(F32, {});
+};
+
+TEST_F(HloTfGraphBuilderTest, CheckConcatenateDimsAndShapes) {
+  auto builder = HloComputation::Builder("Concatenate");
+  Shape shape = ShapeUtil::MakeShape(F32, {2, 2});
+  auto param_1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, shape, "param0"));
+  auto param_2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, shape, "param1"));
+  builder.AddInstruction(HloInstruction::CreateConcatenate(
+      ShapeUtil::MakeShape(F32, {2, 4}), {param_1, param_2}, 1));
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 3);
+  const auto &node = graph_def.node(2);
+  EXPECT_EQ(node.name(), "Concatenate/concatenate");
+
+  // Check dimensions.
+  auto dims_value = node.attr().find("dims");
+  CHECK(dims_value != node.attr().end());
+  EXPECT_EQ(dims_value->second.list().i_size(), 1);
+  EXPECT_EQ(dims_value->second.list().i(0), 1);
+
+  // Check shapes.
+  auto shape_value = node.attr().find("_output_shapes");
+  CHECK(shape_value != node.attr().end());
+  EXPECT_EQ(shape_value->second.list().shape_size(), 1);
+  EXPECT_EQ(shape_value->second.list().shape(0).dim_size(), 2);
+  EXPECT_EQ(shape_value->second.list().shape(0).dim(0).size(), 2);
+  EXPECT_EQ(shape_value->second.list().shape(0).dim(1).size(), 4);
+}
+
+TEST_F(HloTfGraphBuilderTest, CheckScalarValue) {
+  auto builder = HloComputation::Builder("Const");
+  builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0(123)));
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 1);
+  const auto &node = graph_def.node(0);
+  auto value = node.attr().find("value");
+  CHECK(value != node.attr().end());
+  EXPECT_EQ(value->second.s(), "123");
+
+  auto type = node.attr().find("type");
+  CHECK(type != node.attr().end());
+  EXPECT_EQ(type->second.s(), "S32");
+}
+
+TEST_F(HloTfGraphBuilderTest, SimpleNegateComputation) {
+  auto negate_computation = CreateNegateComputation();
+  TF_CHECK_OK(generator_.AddComputation(*negate_computation));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 2);
+  EXPECT_EQ(graph_def.node(0).name(), "Negate/param0.0");
+  EXPECT_EQ(graph_def.node(0).op(), "HloParameter");
+  EXPECT_EQ(graph_def.node(1).name(), "Negate/negate");
+  EXPECT_EQ(graph_def.node(1).op(), "HloNegate");
+  EXPECT_EQ(graph_def.node(1).input_size(), 1);
+  EXPECT_EQ(graph_def.node(1).input(0), "Negate/param0.0");
+}
+
+TEST_F(HloTfGraphBuilderTest, GreaterThanOrEqualTo) {
+  auto builder = HloComputation::Builder("GE");
+  auto param_1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r0f32_, "param0"));
+  auto param_2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, r0f32_, "param1"));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32_, HloOpcode::kGe, param_1, param_2));
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 3);
+  EXPECT_EQ(graph_def.node(0).name(), "GE/param0.0");
+  EXPECT_EQ(graph_def.node(1).name(), "GE/param1.1");
+  EXPECT_EQ(graph_def.node(2).input_size(), 2);
+  EXPECT_EQ(graph_def.node(2).name(), "GE/greater-than-or-equal-to");
+  EXPECT_EQ(graph_def.node(2).op(), "HloGreaterThanOrEqualTo");
+}
+
+TEST_F(HloTfGraphBuilderTest, EmbeddedComputationsDiamond) {
+  // Create computations with a diamond-shaped callgraph.
+  auto negate_computation = CreateNegateComputation();
+  auto map1_computation = CreateMapComputation(negate_computation.get());
+  auto map2_computation = CreateMapComputation(negate_computation.get());
+
+  auto builder = HloComputation::Builder(TestName());
+  auto param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r0f32_, "param0"));
+  auto map1 = builder.AddInstruction(
+      HloInstruction::CreateMap(r0f32_, {param}, map1_computation.get()));
+  auto map2 = builder.AddInstruction(
+      HloInstruction::CreateMap(r0f32_, {param}, map2_computation.get()));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32_, HloOpcode::kAdd, map1, map2));
+  auto computation = builder.Build();
+  TF_CHECK_OK(generator_.AddComputation(*computation));
+  EXPECT_GT(generator_.GetGraphDef().node_size(), 0);
+}
+
+}  // namespace
+}  // namespace tools
+}  // namespace xla
diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
index 81e40dbe5e..c7f185aab8 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
@@ -42,12 +42,10 @@ class StochasticTensorTest(test.TestCase):
       sigma2 = constant_op.constant([0.1, 0.2, 0.3])
 
       prior_default = st.StochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma))
+          distributions.Normal(loc=mu, scale=sigma))
       self.assertTrue(isinstance(prior_default.value_type, st.SampleValue))
       prior_0 = st.StochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma),
+          distributions.Normal(loc=mu, scale=sigma),
           dist_value_type=st.SampleValue())
       self.assertTrue(isinstance(prior_0.value_type, st.SampleValue))
 
@@ -55,8 +53,7 @@ class StochasticTensorTest(test.TestCase):
         prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.SampleValue))
         likelihood = st.StochasticTensor(
-            distributions.Normal(
-                loc=prior, scale=sigma2))
+            distributions.Normal(loc=prior, scale=sigma2))
         self.assertTrue(isinstance(likelihood.value_type, st.SampleValue))
 
       coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
@@ -102,8 +99,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue()):
         prior_single = st.StochasticTensor(
-            distributions.Normal(
-                loc=mu, scale=sigma))
+            distributions.Normal(loc=mu, scale=sigma))
 
       prior_single_value = prior_single.value()
       self.assertEqual(prior_single_value.get_shape(), (2, 3))
@@ -113,8 +109,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(1)):
         prior_single = st.StochasticTensor(
-            distributions.Normal(
-                loc=mu, scale=sigma))
+            distributions.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior_single.value_type, st.SampleValue))
 
       prior_single_value = prior_single.value()
@@ -125,8 +120,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(2)):
         prior_double = st.StochasticTensor(
-            distributions.Normal(
-                loc=mu, scale=sigma))
+            distributions.Normal(loc=mu, scale=sigma))
 
       prior_double_value = prior_double.value()
       self.assertEqual(prior_double_value.get_shape(), (2, 2, 3))
@@ -163,8 +157,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With passed-in loss_fn.
       dt = st.StochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma),
+          distributions.Normal(loc=mu, scale=sigma),
           dist_value_type=st.MeanValue(stop_gradient=True),
           loss_fn=sge.get_score_function_with_constant_baseline(
               baseline=constant_op.constant(8.0)))
@@ -199,8 +192,7 @@ class ObservedStochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       obs = array_ops.zeros((2, 3))
       z = st.ObservedStochasticTensor(
-          distributions.Normal(
-              loc=mu, scale=sigma), value=obs)
+          distributions.Normal(loc=mu, scale=sigma), value=obs)
       [obs_val, z_val] = sess.run([obs, z.value()])
       self.assertAllEqual(obs_val, z_val)
 
@@ -212,15 +204,13 @@ class ObservedStochasticTensorTest(test.TestCase):
     sigma = array_ops.placeholder(dtypes.float32)
     obs = array_ops.placeholder(dtypes.float32)
     z = st.ObservedStochasticTensor(
-        distributions.Normal(
-            loc=mu, scale=sigma), value=obs)
+        distributions.Normal(loc=mu, scale=sigma), value=obs)
 
     mu2 = array_ops.placeholder(dtypes.float32, shape=[None])
     sigma2 = array_ops.placeholder(dtypes.float32, shape=[None])
     obs2 = array_ops.placeholder(dtypes.float32, shape=[None, None])
     z2 = st.ObservedStochasticTensor(
-        distributions.Normal(
-            loc=mu2, scale=sigma2), value=obs2)
+        distributions.Normal(loc=mu2, scale=sigma2), value=obs2)
 
     coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
     self.assertEqual(coll, [z, z2])
@@ -231,22 +221,18 @@ class ObservedStochasticTensorTest(test.TestCase):
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
-            loc=mu, scale=sigma),
+        distributions.Normal(loc=mu, scale=sigma),
         value=array_ops.zeros((3,)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
-            loc=mu, scale=sigma),
+        distributions.Normal(loc=mu, scale=sigma),
         value=array_ops.zeros((3, 1)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(
-            loc=mu, scale=sigma),
-        value=array_ops.zeros(
-            (1, 2), dtype=dtypes.int32))
+        distributions.Normal(loc=mu, scale=sigma),
+        value=array_ops.zeros((1, 2), dtype=dtypes.int32))
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 470b9edb79..e17197080a 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -135,8 +135,9 @@ from tensorflow.contrib.distributions.python.ops.wishart import *
 
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = ['ConditionalDistribution',
-                    'ConditionalTransformedDistribution',
-                    'FULLY_REPARAMETERIZED', 'NOT_REPARAMETERIZED']
+_allowed_symbols = [
+    'ConditionalDistribution', 'ConditionalTransformedDistribution',
+    'FULLY_REPARAMETERIZED', 'NOT_REPARAMETERIZED'
+]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
index 71460a1769..5d6e4d9197 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
@@ -488,9 +488,7 @@ class AffineBijectorTest(test.TestCase):
             shift=mu,
             scale_identity_multiplier=2.,
             scale_perturb_diag=[2., 1],
-            scale_perturb_factor=[[2., 0],
-                                  [0., 0],
-                                  [0, 1]])
+            scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
         bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 2, 3])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -526,9 +524,7 @@ class AffineBijectorTest(test.TestCase):
             shift=mu,
             scale_diag=[2., 3, 4],
             scale_perturb_diag=[2., 1],
-            scale_perturb_factor=[[2., 0],
-                                  [0., 0],
-                                  [0, 1]])
+            scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
         bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 3, 5])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -561,17 +557,11 @@ class AffineBijectorTest(test.TestCase):
         # Corresponds to scale = [[10, 0, 0], [1, 3, 0], [2, 3, 5]]
         bijector = affine_lib.Affine(
             shift=mu,
-            scale_tril=[[2., 0, 0],
-                        [1, 3, 0],
-                        [2, 3, 4]],
+            scale_tril=[[2., 0, 0], [1, 3, 0], [2, 3, 4]],
             scale_perturb_diag=[2., 1],
-            scale_perturb_factor=[[2., 0],
-                                  [0., 0],
-                                  [0, 1]])
+            scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
         bijector_ref = affine_lib.Affine(
-            shift=mu, scale_tril=[[10., 0, 0],
-                                  [1, 3, 0],
-                                  [2, 3, 5]])
+            shift=mu, scale_tril=[[10., 0, 0], [1, 3, 0], [2, 3, 5]])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
index ecf068bf6b..cb514e625b 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
@@ -70,7 +70,8 @@ class ChainBijectorTest(test.TestCase):
           softmax_centered_lib.SoftmaxCentered(
               event_ndims=1, validate_args=True),
           softmax_centered_lib.SoftmaxCentered(
-              event_ndims=0, validate_args=True)])
+              event_ndims=0, validate_args=True)
+      ])
       x = tensor_shape.TensorShape([])
       y = tensor_shape.TensorShape([2 + 1])
       self.assertAllEqual(y, bijector.forward_event_shape(x))
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
index e16f9dff22..40018de63f 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
@@ -36,17 +36,19 @@ class SigmoidBijectorTest(test.TestCase):
       y = special.expit(x)
       ildj = -np.log(y) - np.log1p(-y)
       self.assertAllClose(
-          y, sigmoid.Sigmoid().forward(x).eval(),
-          atol=0., rtol=1e-2)
+          y, sigmoid.Sigmoid().forward(x).eval(), atol=0., rtol=1e-2)
       self.assertAllClose(
-          x, sigmoid.Sigmoid().inverse(y).eval(),
-          atol=0., rtol=1e-4)
+          x, sigmoid.Sigmoid().inverse(y).eval(), atol=0., rtol=1e-4)
       self.assertAllClose(
-          ildj, sigmoid.Sigmoid().inverse_log_det_jacobian(y).eval(),
-          atol=0., rtol=1e-6)
+          ildj,
+          sigmoid.Sigmoid().inverse_log_det_jacobian(y).eval(),
+          atol=0.,
+          rtol=1e-6)
       self.assertAllClose(
-          -ildj, sigmoid.Sigmoid().forward_log_det_jacobian(x).eval(),
-          atol=0., rtol=1e-4)
+          -ildj,
+          sigmoid.Sigmoid().forward_log_det_jacobian(x).eval(),
+          atol=0.,
+          rtol=1e-4)
 
   def testScalarCongruency(self):
     with self.test_session():
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
index 7fee2e1f3a..e3f6ddd8c0 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
@@ -171,11 +171,12 @@ class RelaxedBernoulli(transformed_distribution.TransformedDistribution):
       self._logits, self._probs = distribution_util.get_logits_and_probs(
           logits=logits, probs=probs, validate_args=validate_args)
       super(RelaxedBernoulli, self).__init__(
-          distribution=logistic.Logistic(self._logits / self._temperature,
-                                         1. / self._temperature,
-                                         validate_args=validate_args,
-                                         allow_nan_stats=allow_nan_stats,
-                                         name=name + "/Logistic"),
+          distribution=logistic.Logistic(
+              self._logits / self._temperature,
+              1. / self._temperature,
+              validate_args=validate_args,
+              allow_nan_stats=allow_nan_stats,
+              name=name + "/Logistic"),
           bijector=sigmoid_lib.Sigmoid(validate_args=validate_args),
           validate_args=validate_args,
           name=name)
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index d7c646c19a..d149138796 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -3614,7 +3614,7 @@ _config_path = os.path.expanduser(os.path.join(_keras_dir, 'keras.json'))
 if os.path.exists(_config_path):
   try:
     _config = json.load(open(_config_path))
-  except json.decoder.JSONDecodeError:
+  except ValueError:
     _config = {}
   _floatx = _config.get('floatx', floatx())
   assert _floatx in {'float16', 'float32', 'float64'}
diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 0140f6d0d3..13cabe6e04 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -379,7 +379,10 @@ def batch_norm(inputs,
                fused=False,
                data_format=DATA_FORMAT_NHWC,
                zero_debias_moving_mean=False,
-               scope=None):
+               scope=None,
+               renorm=False,
+               renorm_clipping=None,
+               renorm_decay=0.99):
   """Adds a Batch Normalization layer from http://arxiv.org/abs/1502.03167.
 
     "Batch Normalization: Accelerating Deep Network Training by Reducing
@@ -446,6 +449,19 @@ def batch_norm(inputs,
     zero_debias_moving_mean: Use zero_debias for moving_mean. It creates a new
       pair of variables 'moving_mean/biased' and 'moving_mean/local_step'.
     scope: Optional scope for `variable_scope`.
+    renorm: Whether to use Batch Renormalization
+      (https://arxiv.org/abs/1702.03275). This adds extra variables during
+      training. The inference is the same for either value of this parameter.
+    renorm_clipping: A dictionary that may map keys 'rmax', 'rmin', 'dmax' to
+      scalar `Tensors` used to clip the renorm correction. The correction
+      `(r, d)` is used as `corrected_value = normalized_value * r + d`, with
+      `r` clipped to [rmin, rmax], and `d` to [-dmax, dmax]. Missing rmax, rmin,
+      dmax are set to inf, 0, inf, respectively.
+    renorm_decay: Momentum used to update the moving means and standard
+      deviations with renorm. Unlike `momentum`, this affects training
+      and should be neither too small (which would add noise) nor too large
+      (which would give stale estimates). Note that `decay` is still applied
+      to get the means and variances for inference.
 
   Returns:
     A `Tensor` representing the output of the operation.
@@ -464,6 +480,8 @@ def batch_norm(inputs,
     if param_regularizers is not None:
       raise ValueError('Regularizers are not currently '
                        'supported for fused batch norm.')
+    if renorm:
+      raise ValueError('Renorm is not supported for fused batch norm.')
     return _fused_batch_norm(
         inputs,
         decay=decay,
@@ -524,6 +542,9 @@ def batch_norm(inputs,
           beta_regularizer=beta_regularizer,
           gamma_regularizer=gamma_regularizer,
           trainable=trainable,
+          renorm=renorm,
+          renorm_clipping=renorm_clipping,
+          renorm_momentum=renorm_decay,
           name=sc.name,
           _scope=sc,
           _reuse=reuse)
@@ -551,6 +572,9 @@ def batch_norm(inputs,
     # Custom updates collections are not supported because the update logic
     # is different in this case, in particular w.r.t. "forced updates" and
     # update op reuse.
+    if renorm:
+      raise ValueError('renorm is not supported with batch_weights, '
+                       'updates_collections or zero_debias_moving_mean')
     inputs_shape = inputs.get_shape()
     inputs_rank = inputs_shape.ndims
     if inputs_rank is None:
@@ -1241,6 +1265,13 @@ def flatten(inputs,
 
 def _sparse_inner_flatten(inputs, new_rank):
   """Helper function for `inner_flatten`."""
+  inputs_rank = inputs.dense_shape.get_shape().as_list()[0]
+  if inputs_rank < new_rank:
+    raise ValueError(
+        'Inputs has rank less than new_rank. {} must have rank at least'
+        ' {}. Received rank {}, shape {}'.format(inputs, new_rank, inputs_rank,
+                                                 inputs.get_shape()))
+
   outer_dimensions = inputs.dense_shape[:new_rank - 1]
   inner_dimensions = inputs.dense_shape[new_rank - 1:]
   new_shape = array_ops.concat((outer_dimensions,
diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index 2b170e92ba..ee4ebf2c43 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -1465,6 +1465,30 @@ class PartialFlattenTest(test.TestCase):
     flattened5 = _layers._inner_flatten(inputs, 5)
     self.assertEqual([2, None, 4, None, 30], flattened5.get_shape().as_list())
 
+  def testDenseFlattenRankAssertion(self):
+    """Test `_inner_flatten` rank assertion for dense tensors."""
+    shape = [2, 3]
+    new_rank = 3
+    inputs = array_ops.placeholder(dtypes.int32)
+    inputs.set_shape(shape)
+
+    with self.assertRaisesRegexp(ValueError,
+                                 'inputs has rank less than new_rank'):
+      _layers._inner_flatten(inputs, new_rank)
+
+  def testSparseFlattenRankAssertion(self):
+    """Test `_inner_flatten` rank assertion for sparse tensors."""
+    shape = [2, 3]
+    new_rank = 3
+    np.random.seed(10301)
+    random_ = np.random.rand(*shape)
+    indices, values, _ = _sparsify(random_)
+    inputs = sparse_tensor.SparseTensor(indices, values, shape)
+
+    with self.assertRaisesRegexp(ValueError,
+                                 'Inputs has rank less than new_rank'):
+      _layers._inner_flatten(inputs, new_rank)
+
 
 class FCTest(test.TestCase):
 
diff --git a/tensorflow/contrib/learn/python/learn/datasets/mnist.py b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
index 01262ff5f8..fd50070dac 100644
--- a/tensorflow/contrib/learn/python/learn/datasets/mnist.py
+++ b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
@@ -27,7 +27,8 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensorflow.contrib.learn.python.learn.datasets import base
 from tensorflow.python.framework import dtypes
 
-SOURCE_URL = 'http://yann.lecun.com/exdb/mnist/'
+# CVDF mirror of http://yann.lecun.com/exdb/mnist/
+SOURCE_URL = 'https://storage.googleapis.com/cvdf-datasets/mnist/'
 
 
 def _read32(bytestream):
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 107454dca1..29ea692f8f 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -362,6 +362,11 @@ class BaseEstimator(
       self._config = config
     logging.info('Using config: %s', str(vars(self._config)))
 
+    if self._config.session_config is None:
+      self._session_config = config_pb2.ConfigProto(allow_soft_placement=True)
+    else:
+      self._session_config = self._config.session_config
+
     # Model directory.
     if (model_dir is not None) and (self._config.model_dir is not None):
       if model_dir != self._config.model_dir:
@@ -829,7 +834,7 @@ class BaseEstimator(
           eval_ops=update_op,
           final_ops=eval_dict,
           hooks=hooks,
-          config=config_pb2.ConfigProto(allow_soft_placement=True))
+          config=self._session_config)
       current_global_step = eval_results[global_step_key]
 
       _write_dict_to_summary(eval_dir, eval_results, current_global_step)
@@ -864,7 +869,7 @@ class BaseEstimator(
           session_creator=monitored_session.ChiefSessionCreator(
               checkpoint_filename_with_path=checkpoint_path,
               scaffold=infer_ops.scaffold,
-              config=config_pb2.ConfigProto(allow_soft_placement=True)))
+              config=self._session_config))
       if not as_iterable:
         with mon_sess:
           if not mon_sess.should_stop():
@@ -976,7 +981,7 @@ class BaseEstimator(
           chief_only_hooks=chief_hooks + model_fn_ops.training_chief_hooks,
           save_checkpoint_secs=0,  # Saving is handled by a hook.
           save_summaries_steps=self._config.save_summary_steps,
-          config=config_pb2.ConfigProto(allow_soft_placement=True)
+          config=self._session_config
       ) as mon_sess:
         loss = None
         while not mon_sess.should_stop():
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
index c0a3918549..c56741a4d1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
@@ -53,12 +53,17 @@ class ModeKeys(object):
   EVAL = 'eval'
   INFER = 'infer'
 
+  @classmethod
+  def validate(cls, key):
+    if key not in (cls.TRAIN, cls.EVAL, cls.INFER):
+      raise ValueError('Invalid mode %s.' % key)
+
 
 class ModelFnOps(
     collections.namedtuple('ModelFnOps', [
         'predictions', 'loss', 'train_op', 'eval_metric_ops',
         'output_alternatives', 'training_chief_hooks', 'training_hooks',
-        'scaffold'
+        'scaffold', 'mode'
     ])):
   """Ops returned from a model_fn."""
 
@@ -119,6 +124,8 @@ class ModelFnOps(
     Raises:
       ValueError: If validation fails.
     """
+    ModeKeys.validate(mode)
+
     # Assert all ops are from the same graph.
     get_graph_from_inputs((predictions, loss, train_op))
 
@@ -183,14 +190,13 @@ class ModelFnOps(
         output_alternatives=output_alternatives,
         training_chief_hooks=training_chief_hooks,
         training_hooks=training_hooks,
-        scaffold=scaffold)
+        scaffold=scaffold,
+        mode=mode)
 
-  def estimator_spec(self, mode, default_serving_output_alternative_key=None):
+  def estimator_spec(self, default_serving_output_alternative_key=None):
     """Creates an equivalent `EstimatorSpec`.
 
     Args:
-      mode: One of `ModeKeys`. Specifies if this training, evaluation or
-        prediction.
       default_serving_output_alternative_key: Required for multiple heads. If
         you have multiple entries in `output_alternatives` dict (comparable to
         multiple heads), `EstimatorSpec` requires a default head that will be
@@ -265,7 +271,7 @@ class ModelFnOps(
       return result
 
     return core_model_fn_lib.EstimatorSpec(
-        mode=mode,
+        mode=self.mode,
         predictions=self.predictions,
         loss=self.loss,
         train_op=self.train_op,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
index 51b32359a3..4f76013a2a 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
@@ -80,18 +80,20 @@ class ModelFnopsTest(test.TestCase):
 
   def testEstimatorSpec_except_export(self):
     predictions = self.create_predictions()
-    model_fn_ops = self.create_model_fn_ops(predictions, None)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, None, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
   def testEstimatorSpec_export_regression_with_scores(self):
     predictions = self.create_predictions()
     output_alternatives = {"regression_head": (
         constants.ProblemType.LINEAR_REGRESSION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -108,9 +110,10 @@ class ModelFnopsTest(test.TestCase):
     output_alternatives = {"regression_head": (
         constants.ProblemType.LINEAR_REGRESSION,
         output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -124,9 +127,10 @@ class ModelFnopsTest(test.TestCase):
     predictions = self.create_predictions()
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -145,9 +149,10 @@ class ModelFnopsTest(test.TestCase):
     del output_alternatives_predictions["scores"]
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -167,9 +172,10 @@ class ModelFnopsTest(test.TestCase):
     del output_alternatives_predictions["probabilities"]
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -187,9 +193,10 @@ class ModelFnopsTest(test.TestCase):
     del output_alternatives_predictions["classes"]
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -208,9 +215,10 @@ class ModelFnopsTest(test.TestCase):
         [1, 2, 3])
     output_alternatives = {"classification_head": (
         constants.ProblemType.CLASSIFICATION, output_alternatives_predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -226,9 +234,10 @@ class ModelFnopsTest(test.TestCase):
     predictions = self.create_predictions()
     output_alternatives = {"logistic_head": (
         constants.ProblemType.LOGISTIC_REGRESSION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -245,9 +254,10 @@ class ModelFnopsTest(test.TestCase):
     output_alternatives = {"unspecified_head": (
         constants.ProblemType.UNSPECIFIED, predictions)}
 
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER)
+    estimator_spec = model_fn_ops.estimator_spec()
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
@@ -263,10 +273,10 @@ class ModelFnopsTest(test.TestCase):
             constants.ProblemType.LINEAR_REGRESSION, predictions),
         "classification_head": (
             constants.ProblemType.CLASSIFICATION, predictions)}
-    model_fn_ops = self.create_model_fn_ops(predictions, output_alternatives)
+    model_fn_ops = self.create_model_fn_ops(
+        predictions, output_alternatives, mode=model_fn.ModeKeys.INFER)
 
-    estimator_spec = model_fn_ops.estimator_spec(model_fn.ModeKeys.INFER,
-                                                 "regression_head")
+    estimator_spec = model_fn_ops.estimator_spec("regression_head")
     self.assertEquals_except_export_and_eval_loss(model_fn_ops, estimator_spec)
 
     with session.Session():
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index bc7465bbc2..37ee814b62 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -214,7 +214,8 @@ class RunConfig(ClusterConfig):
                keep_checkpoint_max=5,
                keep_checkpoint_every_n_hours=10000,
                evaluation_master='',
-               model_dir=None):
+               model_dir=None,
+               session_config=None):
     """Constructor.
 
     Note that the superclass `ClusterConfig` may set properties like
@@ -246,6 +247,9 @@ class RunConfig(ClusterConfig):
       evaluation_master: the master on which to perform evaluation.
       model_dir: directory where model parameters, graph etc are saved. If
         `None`, see `Estimator` about where the model will be saved.
+      session_config: a ConfigProto used to set session parameters, or None.
+         Note - using this argument, it is easy to provide settings which break
+         otherwise perfectly good models. Use with care.
     """
     super(RunConfig, self).__init__(
         master=master, evaluation_master=evaluation_master)
@@ -261,6 +265,7 @@ class RunConfig(ClusterConfig):
     self._tf_random_seed = tf_random_seed
     self._save_summary_steps = save_summary_steps
     self._save_checkpoints_secs = save_checkpoints_secs
+    self._session_config = session_config
     if save_checkpoints_secs == RunConfig._USE_DEFAULT:
       if save_checkpoints_steps is None:
         self._save_checkpoints_secs = 600
@@ -345,6 +350,10 @@ class RunConfig(ClusterConfig):
   def save_checkpoints_steps(self):
     return self._save_checkpoints_steps
 
+  @property
+  def session_config(self):
+    return self._session_config
+
   @property
   def keep_checkpoint_max(self):
     return self._keep_checkpoint_max
diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index cecc24c17d..4f7c72c9dd 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -118,7 +118,8 @@ class Experiment(object):
         occur if no new snapshot is available, hence, this is the minimum.
       delay_workers_by_global_step: if `True` delays training workers
         based on global step instead of time.
-      export_strategies: A list of `ExportStrategy`s, or a single one, or None.
+      export_strategies: Iterable of `ExportStrategy`s, or a single one, or
+        `None`.
       train_steps_per_iteration: (applies only to continuous_train_and_eval).
         Perform this many (integer) number of train steps for each
         training-evaluation iteration. With a small value, the model will be
@@ -184,16 +185,19 @@ class Experiment(object):
   def eval_steps(self):
     return self._eval_steps
 
-  def _set_export_strategies(self, value):
-    if value is None:
-      self._export_strategies = []
-    elif isinstance(value, list):
-      self._export_strategies = value[:]
-    elif isinstance(value, export_strategy.ExportStrategy):
-      self._export_strategies = [value]
-    else:
-      raise ValueError("`export_strategies` must be an ExportStrategy, "
-                       "a list of ExportStrategies, or None.")
+  def _set_export_strategies(self, values):  # pylint: disable=missing-docstring
+    export_strategies = []
+    if values:
+      if isinstance(values, export_strategy.ExportStrategy):
+        export_strategies.append(values)
+      else:
+        for value in values:
+          if not isinstance(value, export_strategy.ExportStrategy):
+            raise ValueError("`export_strategies` must be an ExportStrategy,"
+                             " an iterable of ExportStrategy, or `None`,"
+                             " found %s." % value)
+          export_strategies.append(value)
+    self._export_strategies = tuple(export_strategies)
 
   def extend_train_hooks(self, additional_hooks):
     """Extends the hooks for training."""
diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index 00ed062b0a..f9f95f8e67 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -484,6 +484,25 @@ class ExperimentTest(test.TestCase):
       self.assertAllEqual([noop_hook, another_noop_hook], ex._train_monitors)
       self.assertAllEqual([noop_hook], input_hooks)
 
+  def test_invalid_export_strategies(self):
+    for est in self._estimators_for_tests():
+      with self.assertRaisesRegexp(ValueError, 'ExportStrategy'):
+        experiment.Experiment(
+            est,
+            train_input_fn='train_input',
+            eval_input_fn='eval_input',
+            train_steps=100,
+            eval_steps=100,
+            export_strategies='not_an_export_strategy')
+      with self.assertRaisesRegexp(ValueError, 'ExportStrategy'):
+        experiment.Experiment(
+            est,
+            train_input_fn='train_input',
+            eval_input_fn='eval_input',
+            train_steps=100,
+            eval_steps=100,
+            export_strategies=['not_an_export_srategy'])
+
   def test_export_strategies_reset(self):
     for est in self._estimators_for_tests():
       eval_metrics = 'eval_metrics' if not isinstance(
@@ -498,7 +517,7 @@ class ExperimentTest(test.TestCase):
           eval_metrics=eval_metrics,
           train_steps=100,
           eval_steps=100,
-          export_strategies=[export_strategy_1])
+          export_strategies=(export_strategy_1,))
       ex.train_and_evaluate()
       self.assertEqual(1, est.export_count)
 
@@ -728,7 +747,7 @@ class ExperimentTest(test.TestCase):
           est,
           train_input_fn='train_input',
           eval_input_fn='eval_input',
-          export_strategies=[exp_strategy])
+          export_strategies=(exp_strategy,))
       ex.test()
       self.assertEqual(1, est.fit_count)
       self.assertEqual(1, est.eval_count)
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
index 4a70f00407..c302c7725a 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/generator_io.py
@@ -131,4 +131,5 @@ def generator_input_fn(x,
         target = features.pop(target_key[0])
       return features, target
     return features
+
   return _generator_input_fn
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py b/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
index ae68e35c21..bc767ec18b 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/generator_io_test.py
@@ -35,7 +35,7 @@ from tensorflow.python.training import queue_runner_impl
 
 
 class GeneratorIoTest(test.TestCase):
- 
+
   def testGeneratorInputFn(self):
 
     def generator():
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
index 0f317b7bb0..9bdd3206b2 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
@@ -359,8 +359,9 @@ def _read_keyed_batch_examples_helper(file_pattern,
   # Check input parameters are given and reasonable.
   if (not queue_capacity) or (queue_capacity <= 0):
     raise ValueError('Invalid queue_capacity %s.' % queue_capacity)
-  if (batch_size is None) or ((not isinstance(batch_size, ops.Tensor)) and
-                              (batch_size <= 0 or batch_size > queue_capacity)):
+  if (batch_size is None) or (
+      (not isinstance(batch_size, ops.Tensor)) and
+      (batch_size <= 0 or batch_size >= queue_capacity)):
     raise ValueError('Invalid batch_size %s, with queue_capacity %s.' %
                      (batch_size, queue_capacity))
   if (read_batch_size is None) or (
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
index 83643689e1..542aaabc95 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
@@ -112,6 +112,18 @@ class GraphIOTest(test.TestCase):
         queue_capacity=queue_capacity,
         num_threads=num_threads,
         name=name)
+    self.assertRaisesRegexp(
+        ValueError,
+        "Invalid batch_size",
+        graph_io.read_batch_examples,
+        _VALID_FILE_PATTERN,
+        default_batch_size,
+        io_ops.TFRecordReader,
+        False,
+        num_epochs=None,
+        queue_capacity=default_batch_size,
+        num_threads=num_threads,
+        name=name)
     self.assertRaisesRegexp(
         ValueError,
         "Invalid queue_capacity",
@@ -356,7 +368,7 @@ class GraphIOTest(test.TestCase):
     ]
     filename = self._create_temp_file("".join(json_lines))
     batch_size = 10000
-    queue_capacity = 10000
+    queue_capacity = 100000
     name = "my_large_batch"
 
     features = {"sequence": parsing_ops.FixedLenFeature([], dtypes_lib.string)}
diff --git a/tensorflow/contrib/learn/python/learn/utils/gc_test.py b/tensorflow/contrib/learn/python/learn/utils/gc_test.py
index d3270dcc16..9c63096d0e 100644
--- a/tensorflow/contrib/learn/python/learn/utils/gc_test.py
+++ b/tensorflow/contrib/learn/python/learn/utils/gc_test.py
@@ -29,10 +29,6 @@ from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 
 
-def tearDownModule():
-  gfile.DeleteRecursively(test.get_temp_dir())
-
-
 class GcTest(test_util.TensorFlowTestCase):
 
   def testLargestExportVersions(self):
diff --git a/tensorflow/contrib/linalg/BUILD b/tensorflow/contrib/linalg/BUILD
index 9b196e2cf5..34a293f80b 100644
--- a/tensorflow/contrib/linalg/BUILD
+++ b/tensorflow/contrib/linalg/BUILD
@@ -30,7 +30,7 @@ cuda_py_tests(
 
 cuda_py_tests(
     name = "linear_operator_addition_test",
-    size = "medium",
+    size = "small",
     srcs = ["python/kernel_tests/linear_operator_addition_test.py"],
     additional_deps = [
         ":linalg_py",
@@ -43,7 +43,6 @@ cuda_py_tests(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -61,7 +60,6 @@ cuda_py_tests(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -79,7 +77,6 @@ cuda_py_tests(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:random_ops",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -96,7 +93,6 @@ cuda_py_tests(
         "//tensorflow/python:platform_test",
         "//tensorflow/python:random_ops",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -112,7 +108,6 @@ cuda_py_tests(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -128,7 +123,6 @@ cuda_py_tests(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
@@ -144,12 +138,11 @@ cuda_py_tests(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 cuda_py_tests(
     name = "linear_operator_util_test",
-    size = "small",
+    size = "medium",
     srcs = ["python/kernel_tests/linear_operator_util_test.py"],
     additional_deps = [
         ":linalg_py",
@@ -160,7 +153,6 @@ cuda_py_tests(
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
     ],
-    shard_count = 5,
 )
 
 py_library(
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py
index a06af336e7..f047f4b978 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_util_test.py
@@ -229,6 +229,29 @@ class MatmulWithBroadcastTest(test.TestCase):
       self.assertAllEqual(expected, result)
 
 
+class MatrixAdjointTest(test.TestCase):
+
+  def testNonBatchMatrix(self):
+    a = [[1, 2, 3j], [4, 5, -6j]]  # Shape (2, 3)
+    expected = [[1, 4], [2, 5], [-3j, 6j]]  # Shape (3, 2)
+    with self.test_session():
+      a_adj = linear_operator_util.matrix_adjoint(a)
+      self.assertEqual((3, 2), a_adj.get_shape())
+      self.assertAllClose(expected, a_adj.eval())
+
+  def testBatchMatrix(self):
+    matrix_0 = [[1j, 2, 3], [4, 5, 6]]
+    matrix_0_a = [[-1j, 4], [2, 5], [3, 6]]
+    matrix_1 = [[11, 22, 33], [44, 55, 66j]]
+    matrix_1_a = [[11, 44], [22, 55], [33, -66j]]
+    batch_matrix = [matrix_0, matrix_1]  # Shape (2, 2, 3)
+    expected_adj = [matrix_0_a, matrix_1_a]  # Shape (2, 3, 2)
+    with self.test_session():
+      matrix_adj = linear_operator_util.matrix_adjoint(batch_matrix)
+      self.assertEqual((2, 3, 2), matrix_adj.get_shape())
+      self.assertAllEqual(expected_adj, matrix_adj.eval())
+
+
 class DomainDimensionStubOperator(object):
 
   def __init__(self, domain_dimension):
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_util.py b/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
index a52a235677..9f8cb23169 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
@@ -289,6 +289,53 @@ def matmul_with_broadcast(a,
         b_is_sparse=b_is_sparse)
 
 
+def matrix_adjoint(a, name="matrix_adjoint"):
+  """Transposes last two dimensions of tensor `a`, and takes complex conjugate.
+
+  If `a` is real valued, the result is equivalent to `matrix_transpose`.
+
+  For example:
+
+  ```python
+  # Matrix with no batch dimension.
+  # 'x' is [[1 2 3j]
+  #         [4 5 -6j]]
+  tf.matrix_adjoint(x) ==> [[1 4]
+                            [2 5]
+                            [-3j 6j]]
+
+  # Matrix with two batch dimensions.
+  # x.shape is [1, 2, 3, 4]
+  # tf.matrix_adjoint(x) is shape [1, 2, 4, 3]
+  ```
+
+  Note that `tf.matmul` provides kwargs allowing for adjoint of arguments.  This
+  is done with minimal cost, and is preferable to using this function. E.g.
+
+  ```
+  # Good!  Adjoint is taken at minimal additional cost.
+  tf.matmul(matrix, b, adjoint_b=True)
+
+  # Inefficient!
+  tf.matmul(matrix, tf.matrix_adjoint(b))
+  ```
+
+  Args:
+    a: A `Tensor` with `rank >= 2`.
+    name: A name for the operation (optional).
+
+  Returns:
+    A batch matrix `Tensor` with same `dtype` as `a`.
+
+  Raises:
+    ValueError:  If `a` is determined statically to have `rank < 2`.
+  """
+  with ops.name_scope(name, values=[a]):
+    a = ops.convert_to_tensor(a, name="a")
+    a_transpose = array_ops.matrix_transpose(a)
+    return math_ops.conj(a_transpose)
+
+
 def shape_tensor(shape, name=None):
   """Convert Tensor using default type, unless empty list or tuple."""
   # Works just like random_ops._ShapeTensor.
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
new file mode 100644
index 0000000000..2ad0fd5310
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -0,0 +1,236 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""A decoder that performs beam search.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import collections
+
+from tensorflow.contrib.rnn import core_rnn_cell
+from tensorflow.contrib.seq2seq.python.ops import decoder
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.framework import tensor_util
+from tensorflow.python.layers import base as layers_base
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import embedding_ops
+from tensorflow.python.ops import tensor_array_ops
+from tensorflow.python.util import nest
+
+
+__all__ = [
+    "BeamSearchDecoderOutput",
+    "BeamSearchDecoderState",
+    "BeamSearchDecoder",
+]
+
+
+class BeamSearchDecoderOutput(
+    collections.namedtuple("BeamSearchDecoderOutput", ("rnn_output",))):
+  pass
+
+
+class BeamSearchDecoderState(
+    collections.namedtuple("BeamSearchDecoderState",
+                           ("cell_state", "log_prob", "beam_ids"))):
+  pass
+
+
+class BeamSearchDecoder(decoder.Decoder):
+  """BeamSearch sampling decoder."""
+
+  def __init__(self, cell, embedding, start_tokens, end_token,
+               initial_state, beam_width, output_layer=None):
+    """Initialize BeamSearchDecoder.
+
+    Args:
+      cell: An `RNNCell` instance.
+      embedding: A callable that takes a vector tensor of `ids` (argmax ids),
+        or the `params` argument for `embedding_lookup`.
+      start_tokens: `int32` vector shaped `[batch_size]`, the start tokens.
+      end_token: `int32` scalar, the token that marks end of decoding.
+      initial_state: A (possibly nested tuple of...) tensors and TensorArrays.
+      beam_width:  Python integer, the number of beams
+      output_layer: (Optional) An instance of `tf.layers.Layer`, i.e.,
+        `tf.layers.Dense`.  Optional layer to apply to the RNN output prior
+        to storing the result or sampling.
+
+    Raises:
+      TypeError: if `cell` is not an instance of `RNNCell`,
+        or `output_layer` is not an instance of `tf.layers.Layer`.
+      ValueError: If `start_tokens` is not a vector or
+        `end_token` is not a scalar.
+    """
+    if not isinstance(cell, core_rnn_cell.RNNCell):
+      raise TypeError("cell must be an RNNCell, received: %s" % type(cell))
+    if (output_layer is not None
+        and not isinstance(output_layer, layers_base._Layer)):  # pylint: disable=protected-access
+      raise TypeError(
+          "output_layer must be a Layer, received: %s" % type(output_layer))
+    self._cell = cell
+    self._initial_cell_state = initial_state
+    self._output_layer = output_layer
+
+    if callable(embedding):
+      self._embedding_fn = embedding
+    else:
+      self._embedding_fn = (
+          lambda ids: embedding_ops.embedding_lookup(embedding, ids))
+
+    self._start_tokens = ops.convert_to_tensor(
+        start_tokens, dtype=dtypes.int32, name="start_tokens")
+    self._end_token = ops.convert_to_tensor(
+        end_token, dtype=dtypes.int32, name="end_token")
+    if self._start_tokens.get_shape().ndims != 1:
+      raise ValueError("start_tokens must be a vector")
+    self._batch_size = array_ops.size(start_tokens)
+    self._beam_width = beam_width
+    if self._end_token.get_shape().ndims != 0:
+      raise ValueError("end_token must be a scalar")
+    self._start_inputs = self._embedding_fn(self._start_tokens)
+
+  @property
+  def batch_size(self):
+    return self._batch_size
+
+  def _rnn_output_size(self):
+    size = self._cell.output_size
+    if self._output_layer is None:
+      return size
+    else:
+      # To use layer's compute_output_shape, we need to convert the
+      # RNNCell's output_size entries into shapes with an unknown
+      # batch size.  We then pass this through the layer's
+      # compute_output_shape and read off all but the first (batch)
+      # dimensions to get the output size of the rnn with the layer
+      # applied to the top.
+      output_shape_with_unknown_batch = nest.map_structure(
+          lambda s: tensor_shape.TensorShape([None]).concatenate(s),
+          size)
+      layer_output_shape = self._output_layer._compute_output_shape(  # pylint: disable=protected-access
+          output_shape_with_unknown_batch)
+      return nest.map_structure(lambda s: s[1:], layer_output_shape)
+
+  @property
+  def output_size(self):
+    # Return the cell output and the id
+    prepend_beam_width = (
+        lambda s: tensor_shape.TensorShape([self._beam_width]).concatenate(s))
+    return BeamSearchDecoderOutput(
+        rnn_output=nest.map_structure(
+            prepend_beam_width, self._rnn_output_size()))
+
+  @property
+  def output_dtype(self):
+    # Assume the dtype of the cell is the output_size structure
+    # containing the input_state's first component's dtype.
+    # Return that structure and int32 (the id)
+    dtype = nest.flatten(self._initial_cell_state)[0].dtype
+    return BeamSearchDecoderOutput(
+        rnn_output=nest.map_structure(lambda _: dtype, self._rnn_output_size()))
+
+  def initialize(self, name=None):
+    """Initialize the decoder.
+
+    Args:
+      name: Name scope for any created operations.
+
+    Returns:
+      `(finished, first_inputs, initial_state)`.
+    """
+    finished, first_inputs = self._finished, self._first_inputs
+
+    initial_state = BeamSearchDecoderState(
+        cell_state=self._initial_cell_state,
+        log_probs=array_ops.zeros(
+            [self.batch_size, self.beam_width],
+            dtype=nest.flatten(self._initial_cell_state)[0].dtype),
+        beam_ids=tensor_array_ops.TensorArray(
+            size=0, dynamic_size=True, dtype=dtypes.int32,
+            clear_after_read=False))
+
+    return (finished, first_inputs, initial_state)
+
+  def _merge_batch_beams(self, t):
+    t_static_shape = t.shape
+    t_shape = array_ops.shape(t)
+    static_batch_size = tensor_util.constant_value(self._batch_size)
+    batch_size_beam_width = (
+        None if static_batch_size is None
+        else static_batch_size * self._beam_width)
+    reshaped_t = array_ops.reshape(
+        t, array_ops.concat(
+            ([self._batch_size * self._beam_width], t_shape[2:]), 0))
+    reshaped_t.set_shape(
+        (tensor_shape.TensorShape([batch_size_beam_width])
+         .concatenate(t_static_shape[2:])))
+    return reshaped_t
+
+  def _split_batch_beams(self, t):
+    t_static_shape = t.shape
+    t_shape = array_ops.shape(t)
+    reshaped_t = array_ops.reshape(
+        t, array_ops.concat(
+            ([self._batch_size, self._beam_width], t_shape[1:]), 0))
+    static_batch_size = tensor_util.constant_value(self._batch_size)
+    reshaped_t.set_shape(
+        (tensor_shape.TensorShape([static_batch_size, self._beam_width])
+         .concatenate(t_static_shape[1:])))
+    return reshaped_t
+
+  def step(self, time, inputs, state, name=None):
+    """Perform a decoding step.
+
+    Args:
+      time: scalar `int32` tensor.
+      inputs: A (structure of) input tensors.
+      state: A (structure of) state tensors and TensorArrays.
+      name: Name scope for any created operations.
+
+    Returns:
+      `(outputs, next_state, next_inputs, finished)`.
+    """
+    with ops.name_scope(name, "BeamSearchDecoderStep", (time, inputs, state)):
+      cell_state = state.cell_state
+      inputs = nest.map_structure(self._merge_batch_beams, inputs)
+      cell_state = nest.map_structure(self._merge_batch_beams, cell_state)
+      cell_outputs, next_cell_state = self._cell(inputs, cell_state)
+      cell_outputs = nest.map_structure(self._split_batch_beams, cell_outputs)
+      next_cell_state = nest.map_structure(self._split_batch_beams,
+                                           next_cell_state)
+
+      if self._output_layer is not None:
+        cell_outputs = self._output_layer(cell_outputs)
+
+      # TODO(cinjon): Calculate next_log_probs, next_beam_ids,
+      #   finished, next_inputs, final_cell_state via beam search
+      #   via self._embedding
+      # ....
+      next_beam_ids, next_log_probs, final_cell_state, next_inputs, finished = (
+          None, None, None, None, None)
+
+      beam_ids = state.beam_ids.write(time, next_beam_ids)
+
+      outputs = BeamSearchDecoderOutput(cell_outputs)
+      next_state = BeamSearchDecoderState(
+          log_probs=next_log_probs,
+          beam_ids=beam_ids,
+          cell_state=final_cell_state)
+
+    return (outputs, next_state, next_inputs, finished)
diff --git a/tensorflow/contrib/seq2seq/python/ops/decoder.py b/tensorflow/contrib/seq2seq/python/ops/decoder.py
index 1d2674af30..6338eb152e 100644
--- a/tensorflow/contrib/seq2seq/python/ops/decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/decoder.py
@@ -31,6 +31,7 @@ from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import rnn
 from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.util import nest
@@ -38,34 +39,7 @@ from tensorflow.python.util import nest
 __all__ = ["Decoder", "dynamic_decode"]
 
 
-def _transpose_batch_time(x):
-  """Transpose the batch and time dimensions of a Tensor.
-
-  Retains as much of the static shape information as possible.
-
-  Args:
-    x: A tensor of rank 2 or higher.
-
-  Returns:
-    x transposed along the first two dimensions.
-
-  Raises:
-    ValueError: if `x` is rank 1 or lower.
-  """
-  x_static_shape = x.get_shape()
-  if x_static_shape.ndims is not None and x_static_shape.ndims < 2:
-    raise ValueError(
-        "Expected input tensor %s to have rank at least 2, but saw shape: %s" %
-        (x, x_static_shape))
-  x_rank = array_ops.rank(x)
-  x_t = array_ops.transpose(
-      x, array_ops.concat(
-          ([1, 0], math_ops.range(2, x_rank)), axis=0))
-  x_t.set_shape(
-      tensor_shape.TensorShape([
-          x_static_shape[1].value, x_static_shape[0].value
-      ]).concatenate(x_static_shape[2:]))
-  return x_t
+_transpose_batch_time = rnn._transpose_batch_time  # pylint: disable=protected-access
 
 
 @six.add_metaclass(abc.ABCMeta)
diff --git a/tensorflow/contrib/session_bundle/gc_test.py b/tensorflow/contrib/session_bundle/gc_test.py
index 1a8ee93cca..8faf3ef3d4 100644
--- a/tensorflow/contrib/session_bundle/gc_test.py
+++ b/tensorflow/contrib/session_bundle/gc_test.py
@@ -29,10 +29,6 @@ from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 
 
-def tearDownModule():
-  gfile.DeleteRecursively(test.get_temp_dir())
-
-
 class GcTest(test_util.TensorFlowTestCase):
 
   def testLargestExportVersions(self):
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index ba761cd7c6..afcc7891b6 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -272,6 +272,7 @@ cc_library(
         "lib/monitoring/sampler.h",
         "lib/random/distribution_sampler.h",
         "lib/random/philox_random.h",
+        "lib/random/random_distributions.h",
         "lib/random/simple_philox.h",
         "lib/strings/numbers.h",
         "lib/strings/str_util.h",
@@ -383,6 +384,7 @@ tf_cuda_library(
         "util/bcast.h",
         "util/cuda_kernel_helper.h",
         "util/device_name_utils.h",
+        "util/env_var.h",
         "util/events_writer.h",
         "util/example_proto_fast_parsing.h",
         "util/example_proto_helper.h",
@@ -1535,7 +1537,10 @@ cc_library(
 tf_cuda_library(
     name = "direct_session_internal",
     srcs = ["common_runtime/direct_session.cc"],
-    hdrs = ["common_runtime/direct_session.h"],
+    hdrs = [
+        "common_runtime/direct_session.h",
+        "util/env_var.h",
+    ],
     copts = tf_copts(),
     cuda_deps = [
         ":gpu_tracer",
diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index eda2be3e70..768c2f6f75 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -57,6 +57,7 @@ limitations under the License.
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/util/device_name_utils.h"
+#include "tensorflow/core/util/env_var.h"
 
 #if GOOGLE_CUDA
 #include "tensorflow/core/common_runtime/gpu/gpu_tracer.h"
@@ -242,6 +243,13 @@ DirectSession::DirectSession(const SessionOptions& options,
     thread_pools_.push_back(GlobalThreadPool(options));
     owns_thread_pools_ = false;
   }
+  // The default value of sync_on_finish will be flipped soon and this
+  // environment variable will be removed as well.
+  Status status =
+      ReadBoolFromEnvVar("TF_SYNC_ON_FINISH", true, &sync_on_finish_);
+  if (!status.ok()) {
+    LOG(ERROR) << status.error_message();
+  }
   // NOTE(mrry): We do not need to use a unique string for the session
   // handle, because DirectSession owns its devices. This may change
   // in future versions.
@@ -448,7 +456,7 @@ Status DirectSession::Run(const RunOptions& run_options,
   if (LogMemory::IsEnabled()) {
     LogMemory::RecordStep(args.step_id, run_state_args.handle);
   }
-  args.sync_on_finish = true;
+  args.sync_on_finish = sync_on_finish_;
 
   const bool do_trace = (run_options.trace_level() > RunOptions::NO_TRACE);
 
@@ -632,7 +640,7 @@ Status DirectSession::PRunSetup(const std::vector<string>& input_names,
   if (LogMemory::IsEnabled()) {
     LogMemory::RecordStep(args.step_id, run_state_args.handle);
   }
-  args.sync_on_finish = true;
+  args.sync_on_finish = sync_on_finish_;
 
   if (options_.config.graph_options().build_cost_model()) {
     run_state->collector.reset(new StepStatsCollector(nullptr));
diff --git a/tensorflow/core/common_runtime/direct_session.h b/tensorflow/core/common_runtime/direct_session.h
index 1495648631..b9d22ac522 100644
--- a/tensorflow/core/common_runtime/direct_session.h
+++ b/tensorflow/core/common_runtime/direct_session.h
@@ -247,6 +247,8 @@ class DirectSession : public Session {
   std::vector<thread::ThreadPool*> thread_pools_;
   bool owns_thread_pools_ = false;
 
+  // If true, blocks until device has finished all queued operations in a step.
+  bool sync_on_finish_ = true;
   // Schedules 'c' for execution on pool.
   void SchedClosure(thread::ThreadPool* pool, std::function<void()> c);
 
diff --git a/tensorflow/core/common_runtime/shape_refiner.h b/tensorflow/core/common_runtime/shape_refiner.h
index bbde0924c7..f23f9361eb 100644
--- a/tensorflow/core/common_runtime/shape_refiner.h
+++ b/tensorflow/core/common_runtime/shape_refiner.h
@@ -64,6 +64,10 @@ class ShapeRefiner {
     return it->second.get();
   }
 
+  // Getters and setters for graph_def_version_.
+  int32 graph_def_version() { return graph_def_version_; }
+  void set_graph_def_version(int32 version) { graph_def_version_ = version; }
+
  private:
   // Extracts the subgraph ending at 'node' that is statically
   // computable and inserts into 'out_graph'. If statically computable,
@@ -100,7 +104,7 @@ class ShapeRefiner {
                               const Node* node, int dst_idx,
                               shape_inference::ShapeHandle* result);
 
-  const int graph_def_version_;
+  int32 graph_def_version_;
   const OpRegistryInterface* const ops_registry_;
 
   // The lifetime of the tensors are bound to the runner, so it should be the
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index 537d489aae..545ae867f6 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -41,6 +41,7 @@ limitations under the License.
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/protobuf/worker.pb.h"
+#include "tensorflow/core/util/env_var.h"
 
 namespace tensorflow {
 
@@ -48,6 +49,13 @@ GraphMgr::GraphMgr(const WorkerEnv* worker_env,
                    RendezvousMgrInterface* rendezvous_mgr)
     : worker_env_(worker_env), rendezvous_mgr_(rendezvous_mgr), table_(5) {
   CHECK(rendezvous_mgr) << "Rendezvous mgr was null";
+  // The default value of sync_on_finish will be flipped soon and this
+  // environment variable will be removed as well.
+  Status status =
+      ReadBoolFromEnvVar("TF_SYNC_ON_FINISH", true, &sync_on_finish_);
+  if (!status.ok()) {
+    LOG(ERROR) << status.error_message();
+  }
 }
 
 GraphMgr::~GraphMgr() {
@@ -486,7 +494,7 @@ void GraphMgr::StartParallelExecutors(const string& handle, int64 step_id,
   args.cancellation_manager = cancellation_manager;
   args.stats_collector = collector;
   args.step_container = step_container;
-  args.sync_on_finish = true;
+  args.sync_on_finish = sync_on_finish_;
   if (LogMemory::IsEnabled()) {
     LogMemory::RecordStep(args.step_id, handle);
   }
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.h b/tensorflow/core/distributed_runtime/graph_mgr.h
index 4477a2764b..5f51d63857 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.h
+++ b/tensorflow/core/distributed_runtime/graph_mgr.h
@@ -137,6 +137,9 @@ class GraphMgr {
   mutex mu_;
   int64 next_id_ GUARDED_BY(mu_) = 0;
 
+  // If true, blocks until device has finished all queued operations in a step.
+  bool sync_on_finish_ = true;
+
   // Table mapping graph handles to registered graphs.
   //
   // TODO(zhifengc): If the client does not call Deregister, we'll
diff --git a/tensorflow/core/framework/common_shape_fns.cc b/tensorflow/core/framework/common_shape_fns.cc
index 4c87a453e2..d5e6e293d6 100644
--- a/tensorflow/core/framework/common_shape_fns.cc
+++ b/tensorflow/core/framework/common_shape_fns.cc
@@ -873,6 +873,13 @@ Status BroadcastBinaryOpShapeFn(InferenceContext* c) {
   return Status::OK();
 }
 
+Status RandomShape(shape_inference::InferenceContext* c) {
+  shape_inference::ShapeHandle out;
+  TF_RETURN_IF_ERROR(c->MakeShapeFromShapeTensor(0, &out));
+  c->set_output(0, out);
+  return Status::OK();
+}
+
 Status ValidateSparseTensor(InferenceContext* c, ShapeHandle indices_shape,
                             ShapeHandle values_shape, ShapeHandle shape_shape) {
   // Validate ranks.
diff --git a/tensorflow/core/framework/common_shape_fns.h b/tensorflow/core/framework/common_shape_fns.h
index 73509fb7fb..dc99e48adb 100644
--- a/tensorflow/core/framework/common_shape_fns.h
+++ b/tensorflow/core/framework/common_shape_fns.h
@@ -199,6 +199,9 @@ Status ConcatV2Shape(shape_inference::InferenceContext* c);
 // Tested by ops/math_ops_test.cc.
 Status BroadcastBinaryOpShapeFn(InferenceContext* c);
 
+// Shape function for random operations.
+Status RandomShape(shape_inference::InferenceContext* c);
+
 // Validates the 3 component tensors of a sparse tensor have the proper
 // shapes. This mimics SparseTensor.__init__ in python/framework/ops.py.
 Status ValidateSparseTensor(InferenceContext* c, ShapeHandle indices_shape,
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 3626de58d6..3d913cdaf0 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -125,6 +125,23 @@ Status OpKernel::OutputRange(StringPiece output_name, int* start,
   }
 }
 
+Status OpKernel::MakeShape(const Tensor& shape, TensorShape* out) const {
+  if (!IsLegacyVector(shape.shape())) {
+    return errors::InvalidArgument(
+        "shape must be a vector of {int32,int64}, got shape ",
+        shape.shape().DebugString());
+  }
+  if (shape.dtype() == DataType::DT_INT32) {
+    auto vec = shape.flat<int32>();
+    return TensorShapeUtils::MakeShape(vec.data(), vec.size(), out);
+  } else if (shape.dtype() == DataType::DT_INT64) {
+    auto vec = shape.flat<int64>();
+    return TensorShapeUtils::MakeShape(vec.data(), vec.size(), out);
+  } else {
+    return errors::InvalidArgument("shape must be a vector of {int32,int64}.");
+  }
+}
+
 void AsyncOpKernel::Compute(OpKernelContext* context) {
   Notification n;
   ComputeAsync(context, [&n]() { n.Notify(); });
diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index d874b9087f..91e6a98304 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -151,6 +151,10 @@ class OpKernel {
     return shape.dims() == 1 || (allow_legacy_scalars() && shape.dims() == 0);
   }
 
+  // Turn a shape Tensor into a TensorShape
+  // TODO(irving): Move to TensorShapeUtils once !allow_legacy_scalars
+  Status MakeShape(const Tensor& shape, TensorShape* out) const;
+
  private:
   const NodeDef def_;
   const DataTypeVector input_types_;
diff --git a/tensorflow/core/framework/shape_inference.cc b/tensorflow/core/framework/shape_inference.cc
index 449d8f55f5..a990dc2f04 100644
--- a/tensorflow/core/framework/shape_inference.cc
+++ b/tensorflow/core/framework/shape_inference.cc
@@ -239,8 +239,11 @@ string InferenceContext::DebugString() const {
                          ProtoDebugString(node_def_));
 }
 
-Status InferenceContext::WithRank(ShapeHandle shape, int32 rank,
+Status InferenceContext::WithRank(ShapeHandle shape, int64 rank,
                                   ShapeHandle* out) {
+  if (rank > kint32max) {
+    return errors::InvalidArgument("Rank cannot exceed kint32max");
+  }
   const int32 existing = Rank(shape);
   if (existing == rank) {
     *out = shape;
@@ -261,8 +264,11 @@ Status InferenceContext::WithRank(ShapeHandle shape, int32 rank,
                                  existing);
 }
 
-Status InferenceContext::WithRankAtLeast(ShapeHandle shape, int32 rank,
+Status InferenceContext::WithRankAtLeast(ShapeHandle shape, int64 rank,
                                          ShapeHandle* out) {
+  if (rank > kint32max) {
+    return errors::InvalidArgument("Rank cannot exceed kint32max");
+  }
   const int32 existing = Rank(shape);
   if (existing >= rank) {
     *out = shape;
@@ -276,8 +282,11 @@ Status InferenceContext::WithRankAtLeast(ShapeHandle shape, int32 rank,
                                  " but is rank ", existing);
 }
 
-Status InferenceContext::WithRankAtMost(ShapeHandle shape, int32 rank,
+Status InferenceContext::WithRankAtMost(ShapeHandle shape, int64 rank,
                                         ShapeHandle* out) {
+  if (rank > kint32max) {
+    return errors::InvalidArgument("Rank cannot exceed kint32max");
+  }
   const int32 existing = Rank(shape);
   if (existing == kUnknownRank) {
     return ReturnUnknownShape(out);
@@ -470,12 +479,12 @@ Status InferenceContext::Concatenate(ShapeHandle s1, ShapeHandle s2,
   return ReturnCreatedShape(dims, out);
 }
 
-Status InferenceContext::ReplaceDim(ShapeHandle s, int dim_index_in,
+Status InferenceContext::ReplaceDim(ShapeHandle s, int64 dim_index_in,
                                     DimensionHandle new_dim, ShapeHandle* out) {
   if (!RankKnown(s)) {
     return ReturnUnknownShape(out);
   }
-  int dim_index = dim_index_in;
+  int64 dim_index = dim_index_in;
   if (dim_index < 0) {
     dim_index = s->dims_.size() + dim_index;
   }
@@ -510,7 +519,8 @@ ShapeHandle InferenceContext::UnknownShape() {
   return shape_manager_.UnknownShape();
 }
 
-ShapeHandle InferenceContext::UnknownShapeOfRank(int32 rank) {
+ShapeHandle InferenceContext::UnknownShapeOfRank(int64 rank) {
+  CHECK_LE(rank, kint32max) << "rank must be less than kint32max";
   std::vector<DimensionHandle> dims(rank);
   for (int32 i = 0; i < rank; ++i) {
     dims[i] = UnknownDim();
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index b7f1725c5f..5e116884c6 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -194,7 +194,7 @@ class InferenceContext {
     return s;
   }
 
-  ShapeHandle input(int idx) const { return inputs_[idx]; }
+  ShapeHandle input(int64 idx) const { return inputs_[idx]; }
   Status input(StringPiece input_name, std::vector<ShapeHandle>* output) const;
   int num_inputs() const { return inputs_.size(); }
 
@@ -237,7 +237,7 @@ class InferenceContext {
 
   // idx can be negative for an offset from end of dimensions.
   // idx must be in the range [-1 * s.rank, s.rank).
-  DimensionHandle Dim(ShapeHandle s, int32 idx) {
+  DimensionHandle Dim(ShapeHandle s, int64 idx) {
     if (s->rank_ == kUnknownRank) {
       return UnknownDim();
     }
@@ -277,11 +277,11 @@ class InferenceContext {
   // the shape with asserted rank in <*out>. Otherwise return an error.
   //
   // Note that <*out> may be set to <shape>.
-  Status WithRank(ShapeHandle shape, int32 rank,
+  Status WithRank(ShapeHandle shape, int64 rank,
                   ShapeHandle* out) TF_MUST_USE_RESULT;
-  Status WithRankAtLeast(ShapeHandle shape, int32 rank,
+  Status WithRankAtLeast(ShapeHandle shape, int64 rank,
                          ShapeHandle* out) TF_MUST_USE_RESULT;
-  Status WithRankAtMost(ShapeHandle shape, int32 rank,
+  Status WithRankAtMost(ShapeHandle shape, int64 rank,
                         ShapeHandle* out) TF_MUST_USE_RESULT;
 
   // If <dim> has value <value>, or its value is unknown, returns OK and returns
@@ -332,7 +332,7 @@ class InferenceContext {
 
   // Returns in <out> the shape from replacing <s.dim[dim_index]> with
   // <new_dim>.
-  Status ReplaceDim(ShapeHandle s, int dim_index, DimensionHandle new_dim,
+  Status ReplaceDim(ShapeHandle s, int64 dim_index, DimensionHandle new_dim,
                     ShapeHandle* out) TF_MUST_USE_RESULT;
 
   // Returns a new shape with the given dims. The returned value is owned by
@@ -344,7 +344,7 @@ class InferenceContext {
   ShapeHandle UnknownShape();
 
   // Returns a shape with specified rank but unknown dims.
-  ShapeHandle UnknownShapeOfRank(int32 rank);
+  ShapeHandle UnknownShapeOfRank(int64 rank);
 
   // Returns a new shape of zero dimensions.
   ShapeHandle Scalar();
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
index 6b3b5d3604..9d4a0a52f7 100644
--- a/tensorflow/core/graph/graph_constructor.cc
+++ b/tensorflow/core/graph/graph_constructor.cc
@@ -839,11 +839,6 @@ Status ConvertGraphDefToGraph(const GraphConstructorOptions& opts,
 Status ImportGraphDef(const ImportGraphDefOptions& opts, const GraphDef& gdef,
                       Graph* g, ShapeRefiner* refiner,
                       std::vector<std::pair<Node*, int>>* return_tensors) {
-  ShapeRefiner default_refiner(gdef.versions().producer(), g->op_registry());
-  if (refiner == nullptr) {
-    refiner = &default_refiner;
-  }
-
   if (!opts.return_tensors.empty()) {
     if (return_tensors == nullptr) {
       return errors::InvalidArgument(
@@ -857,6 +852,36 @@ Status ImportGraphDef(const ImportGraphDefOptions& opts, const GraphDef& gdef,
           return_tensors->size(), ")");
     }
   }
+
+  ShapeRefiner default_refiner(gdef.versions().producer(), g->op_registry());
+  if (refiner == nullptr) {
+    refiner = &default_refiner;
+  } else {
+    // Log a warning if we are importing a GraphDef at an older
+    // producer version after already having added non-source/sink
+    // nodes to the graph in the past.
+    if (gdef.versions().producer() > 0 &&
+        gdef.versions().producer() < refiner->graph_def_version() &&
+        g->num_nodes() > 2) {
+      LOG(WARNING) << "Importing a graph with a lower producer version "
+                   << gdef.versions().producer()
+                   << " into an existing graph with producer version "
+                   << refiner->graph_def_version() << ". Shape inference will "
+                   << "have run different parts of the graph with different "
+                   << "producer versions.";
+    }
+  }
+
+  // Set the graph def version of the refiner as the min of the
+  // current value and the version from the graph we are about to
+  // import.
+  //
+  // Note: to match Run() semantics, we should re-run shape inference
+  // on the entire graph if the producer version has changed.  For now
+  // we log the warning above.
+  refiner->set_graph_def_version(
+      std::min(refiner->graph_def_version(), gdef.versions().producer()));
+
   return GraphConstructor::Construct(opts, &gdef, g, refiner, return_tensors);
 }
 
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index e20dabc891..e3b7f322cb 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -2271,5 +2271,176 @@ TEST_F(GraphConstructorTest, GraphDefVersionMergingDuringImport) {
   EXPECT_EQ(3, graph_.versions().bad_consumers(2));
 }
 
+TEST_F(GraphConstructorTest, ImportGraphDefProvidedShapeRefinerVersions) {
+  ImportGraphDefOptions opts;
+  // A valid graph at producer version 20, but one
+  // that would not import if the graph_def_version were 21.
+  string gdef_ascii = strings::StrCat(R"EOF(
+node {
+  name: "Sum/input"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\001\000\000\000\002\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Sum/reduction_indices"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\000\000\000\000\001\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Sum"
+  op: "Sum"
+  input: "Sum/input"
+  input: "Sum/reduction_indices"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+versions {
+  producer: 20
+})EOF");
+
+  // Create a shape refiner with the latest TF_GRAPH_DEF_VERSION.
+  // Importing the graphdef with an existing refiner should
+  // make the refiner inherit the graphdef version from the
+  // passed in graphdef since it has a lower producer.
+  ShapeRefiner refiner(TF_GRAPH_DEF_VERSION, graph_.op_registry());
+  ExpectOK(gdef_ascii, opts, &refiner);
+
+  // Add another node with a higher producer
+  gdef_ascii = strings::StrCat(R"EOF(
+node {
+  name: "RandomConst"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\001\000\000\000\002\000\000\000"
+      }
+    }
+  }
+}
+versions {
+  producer: 21
+})EOF");
+
+  ExpectOK(gdef_ascii, opts, &refiner);
+  // Check that the refiner's graph def version is the lowest of
+  // the graph defs we have seen so far.
+  EXPECT_EQ(20, refiner.graph_def_version());
+
+  // Add another node with a lower producer
+  gdef_ascii = strings::StrCat(R"EOF(
+node {
+  name: "RandomConst2"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+          dim {
+            size: 1
+          }
+        }
+        tensor_content: "\001\000\000\000\002\000\000\000"
+      }
+    }
+  }
+}
+versions {
+  producer: 17
+})EOF");
+  ExpectOK(gdef_ascii, opts, &refiner);
+
+  // Check that the refiner's graph def version is the lowest of
+  // the graph defs we have seen so far.
+  EXPECT_EQ(17, refiner.graph_def_version());
+}
+
 }  // namespace
 }  // namespace tensorflow
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index c42eebae53..5d74d3d3b1 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -29,6 +29,16 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+cc_library(
+    name = "op_types",
+    srcs = ["op_types.cc"],
+    hdrs = ["op_types.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "utils",
     srcs = ["utils.cc"],
@@ -88,6 +98,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":grappler_item",
+        ":op_types",
         ":utils",
         "//tensorflow/core:framework_internal",
         "//tensorflow/core:lib_internal",
diff --git a/tensorflow/core/grappler/devices.cc b/tensorflow/core/grappler/devices.cc
index d3fc9044d3..b318ac22d4 100644
--- a/tensorflow/core/grappler/devices.cc
+++ b/tensorflow/core/grappler/devices.cc
@@ -53,6 +53,22 @@ int GetNumAvailableGPUs() {
   return num_eligible_gpus;
 }
 
+int64 AvailableGPUMemory(int gpu_id) {
+#if GOOGLE_CUDA
+  // Look up the device, to see its attributes.
+  perftools::gputools::Platform* gpu_platform = GPUMachineManager();
+  CHECK_LT(gpu_id, gpu_platform->VisibleDeviceCount());
+  perftools::gputools::StreamExecutor* se =
+      gpu_platform->ExecutorForDevice(gpu_id).ValueOrDie();
+  int64 total_memory, available_memory;
+  CHECK(se->DeviceMemoryUsage(&available_memory, &total_memory));
+
+  return available_memory;
+#else
+  return 0;
+#endif
+}
+
 int GetNumAvailableLogicalCPUCores() { return port::NumSchedulableCPUs(); }
 
 }  // end namespace grappler
diff --git a/tensorflow/core/grappler/devices.h b/tensorflow/core/grappler/devices.h
index 329e8e2e65..2d6c41888d 100644
--- a/tensorflow/core/grappler/devices.h
+++ b/tensorflow/core/grappler/devices.h
@@ -29,6 +29,10 @@ namespace grappler {
 // than 8.
 int GetNumAvailableGPUs();
 
+// Maximum amount of gpu memory available per gpu. gpu_id must be in the range
+// [0, num_available_gpu)
+int64 AvailableGPUMemory(int gpu_id);
+
 // Get the number of logical CPU cores (aka hyperthreads) available.
 int GetNumAvailableLogicalCPUCores();
 
diff --git a/tensorflow/core/grappler/grappler_item_builder.cc b/tensorflow/core/grappler/grappler_item_builder.cc
index 7889b0e025..e37b908fc6 100644
--- a/tensorflow/core/grappler/grappler_item_builder.cc
+++ b/tensorflow/core/grappler/grappler_item_builder.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/core/framework/types.pb.h"
 #include "tensorflow/core/framework/variable.pb.h"
 #include "tensorflow/core/grappler/inputs/utils.h"
+#include "tensorflow/core/grappler/op_types.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/protobuf/meta_graph.pb.h"
 
@@ -90,7 +91,7 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
       node.clear_device();
     }
 
-    if (node.op() == "Placeholder" || node.op() == "PlaceholderV2") {
+    if (IsPlaceholder(node)) {
       if (node.attr().count("dtype") == 0) {
         LOG(ERROR) << "Unknown type for placeholder " << node.name()
                    << ", skipping this input";
diff --git a/tensorflow/core/grappler/op_types.cc b/tensorflow/core/grappler/op_types.cc
new file mode 100644
index 0000000000..33ef498db0
--- /dev/null
+++ b/tensorflow/core/grappler/op_types.cc
@@ -0,0 +1,27 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/op_types.h"
+
+namespace tensorflow {
+namespace grappler {
+
+bool IsPlaceholder(const NodeDef& node) {
+  const auto op = node.op();
+  return op == "Placeholder" || op == "PlaceholderV2";
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/op_types.h b/tensorflow/core/grappler/op_types.h
new file mode 100644
index 0000000000..30a3c91411
--- /dev/null
+++ b/tensorflow/core/grappler/op_types.h
@@ -0,0 +1,29 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_OP_TYPES_H_
+#define TENSORFLOW_GRAPPLER_OP_TYPES_H_
+
+#include "tensorflow/core/framework/node_def.pb.h"
+
+namespace tensorflow {
+namespace grappler {
+
+bool IsPlaceholder(const NodeDef& node);
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_OP_TYPES_H_
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index bd96e2b33c..2ea150ce18 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -25,6 +25,40 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+cc_library(
+    name = "auto_parallel",
+    srcs = ["auto_parallel.cc"],
+    hdrs = [
+        "auto_parallel.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":graph_optimizer",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:devices",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/clusters:cluster",
+    ],
+)
+
+cc_test(
+    name = "auto_parallel_test",
+    srcs = ["auto_parallel_test.cc"],
+    deps = [
+        ":auto_parallel",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+    ],
+)
+
 cc_library(
     name = "constant_folding",
     srcs = ["constant_folding.cc"],
@@ -179,6 +213,7 @@ cc_library(
         ":constant_folding",
         ":graph_optimizer",
         ":layout_optimizer",
+        ":memory_optimizer",
         ":model_pruner",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.cc b/tensorflow/core/grappler/optimizers/auto_parallel.cc
new file mode 100644
index 0000000000..77ab178653
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.cc
@@ -0,0 +1,260 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/auto_parallel.h"
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/clusters/cluster.h"
+#include "tensorflow/core/grappler/devices.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+
+namespace tensorflow {
+namespace grappler {
+const char kAutoParallelPrefix[] = "AutoParallel";
+
+NodeDef* AutoParallel::AddNodeDivConst() {
+  NodeDef* node = graph_.add_node();
+  node->set_name(strings::StrCat(kAutoParallelPrefix, "-Div-Const"));
+  node->set_op("Const");
+
+  AttrValue attr_data_type;
+  attr_data_type.set_type(DT_FLOAT);
+  node->mutable_attr()->insert({"dtype", attr_data_type});
+
+  AttrValue attr_tensor;
+  auto tensor = attr_tensor.mutable_tensor();
+  tensor->add_float_val(static_cast<float>(num_replicas_));
+  tensor->set_dtype(DT_FLOAT);
+  node->mutable_attr()->insert({"value", attr_tensor});
+  return node;
+}
+
+NodeDef* AutoParallel::AddNodeDiv(const string& name, const string& input_a,
+                                  const string& input_b) {
+  NodeDef* node = graph_.add_node();
+  node->set_name(strings::StrCat(kAutoParallelPrefix, "-Div-", name));
+  node->set_op("RealDiv");
+  node->add_input(input_a);
+  node->add_input(input_b);
+  AttrValue attr_type;
+  attr_type.set_type(DT_FLOAT);
+  node->mutable_attr()->insert({"T", attr_type});
+  return node;
+}
+
+NodeDef* AutoParallel::AddNodeControl(const string& name,
+                                      const std::set<string>& deps,
+                                      GraphDef* graph) {
+  NodeDef* node = graph->add_node();
+  node->set_name(name);
+  node->set_op("NoOp");
+  for (const auto& dep : deps) {
+    node->add_input(strings::StrCat("^", dep));
+  }
+  return node;
+}
+
+Status AutoParallel::Initialize(const GrapplerItem& item) {
+  num_gpus_ = GetNumAvailableGPUs();
+  LOG(INFO) << "Number of GPUs: " << num_gpus_;
+  item_ = &item;
+  graph_ = item.graph;
+  LOG(INFO) << "Original graph size: " << graph_.node_size();
+  if (item.fetch.empty()) {
+    return Status(error::INVALID_ARGUMENT, "No fetch nodes provided.");
+  }
+
+  if (item.MainVariables().empty()) {
+    return Status(error::INVALID_ARGUMENT, "No variables provided.");
+  }
+
+  for (const auto& init : item.init_ops) {
+    VLOG(1) << "Init node: " << init;
+  }
+
+  for (const auto& fetch : item.fetch) {
+    VLOG(1) << "Fetch node: " << fetch;
+  }
+
+  for (const auto& var : item.MainVariables()) {
+    VLOG(2) << "Variable: " << var->name();
+  }
+
+  std::set<string> apply_gradients_ops = {"ApplyGradientDescent",
+                                          "ApplyProximalGradientDescent",
+                                          "ApplyAdadelta",
+                                          "ApplyAdagrad",
+                                          "ApplyProximalAdagrad",
+                                          "ApplyAdagradDA",
+                                          "ApplyFtrl",
+                                          "ApplyMomentum",
+                                          "ApplyAdam",
+                                          "ApplyRMSProp",
+                                          "ApplyCenteredRMSProp"};
+  const NodeDef* dequeue_node = nullptr;
+  for (int i = 0; i < graph_.node_size(); i++) {
+    all_nodes_.insert(
+        std::make_pair(graph_.node(i).name(), graph_.mutable_node(i)));
+    if (graph_.node(i).op() == "QueueDequeueManyV2") {
+      dequeue_node = graph_.mutable_node(i);
+    }
+    if (apply_gradients_ops.find(graph_.node(i).op()) !=
+        apply_gradients_ops.end()) {
+      apply_gradients_nodes_.insert(graph_.node(i).name());
+      VLOG(2) << "Apply gradients node: " << graph_.node(i).name();
+    }
+  }
+
+  auto div_const_node = AddNodeDivConst();
+  all_nodes_.insert(std::make_pair(div_const_node->name(), div_const_node));
+  std::map<string, int> gradient_pos = {{"ApplyGradientDescent", 2},
+                                        {"ApplyProximalGradientDescent", 4},
+                                        {"ApplyAdadelta", 6},
+                                        {"ApplyAdagrad", 3},
+                                        {"ApplyProximalAdagrad", 5},
+                                        {"ApplyAdagradDA", 3},
+                                        {"ApplyFtrl", 3},
+                                        {"ApplyMomentum", 3},
+                                        {"ApplyAdam", 9},
+                                        {"ApplyRMSProp", 7},
+                                        {"ApplyCenteredRMSProp", 8}};
+  for (const auto& apply_gradient_node_name : apply_gradients_nodes_) {
+    auto apply_gradients_op = all_nodes_[apply_gradient_node_name]->op();
+    auto apply_gradients_node = all_nodes_[apply_gradient_node_name];
+
+    auto div_node = AddNodeDiv(
+        apply_gradient_node_name,
+        apply_gradients_node->input(gradient_pos[apply_gradients_op]),
+        div_const_node->name());
+    all_nodes_.insert(std::make_pair(div_node->name(), div_node));
+    *apply_gradients_node->mutable_input(gradient_pos[apply_gradients_op]) =
+        div_node->name();
+  }
+  LOG(INFO) << "Graph size after adding div nodes: " << all_nodes_.size();
+
+  auto train_nodes = ComputeTransitiveFanin(graph_, item.fetch);
+  LOG(INFO) << "Number of training nodes: " << train_nodes.size();
+
+  std::vector<const NodeDef*> input_nodes;
+  if (dequeue_node) {
+    LOG(INFO) << "Dequeue node: " << dequeue_node->name();
+    input_nodes = ComputeTransitiveFanin(graph_, {dequeue_node->name()});
+  }
+  LOG(INFO) << "Number of input nodes: " << input_nodes.size();
+
+  std::set<string> dont_replicate_nodes;
+  for (const auto& variable : item.MainVariables()) {
+    dont_replicate_nodes.insert(variable->name());
+  }
+  // Don't replicate all input nodes, except the dequeue node.
+  for (const auto& input_node : input_nodes) {
+    if (input_node->name() != dequeue_node->name()) {
+      dont_replicate_nodes.insert(input_node->name());
+    }
+  }
+
+  for (const auto& node : train_nodes) {
+    if (dont_replicate_nodes.find(node->name()) == dont_replicate_nodes.end()) {
+      replica_nodes_.insert(node->name());
+    }
+  }
+  LOG(INFO) << "Number of replica nodes: " << replica_nodes_.size();
+
+  for (const auto& node : all_nodes_) {
+    if (replica_nodes_.find(node.first) == replica_nodes_.end()) {
+      shared_nodes_.insert(node.first);
+    }
+  }
+  LOG(INFO) << "Number of shared nodes: " << shared_nodes_.size();
+  return Status::OK();
+}
+
+bool AutoParallel::NotSharedNode(const string& name) {
+  return shared_nodes_.find(name) == shared_nodes_.end();
+}
+
+void AutoParallel::AddSharedNodes(GraphDef* graph) {
+  string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", 0);
+  for (const auto& node : shared_nodes_) {
+    auto new_node = graph->add_node();
+    *new_node = *all_nodes_[node];
+    for (int i = 0; i < new_node->input_size(); i++) {
+      if (NotSharedNode(NodeName(new_node->input(i)))) {
+        string new_name = AddPrefixToNodeName(new_node->input(i), prefix);
+        *new_node->mutable_input(i) = new_name;
+      }
+    }
+  }
+}
+
+void AutoParallel::AddOneReplica(GraphDef* graph, int number) {
+  string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", number);
+  for (const auto& node : replica_nodes_) {
+    auto new_node = graph->add_node();
+    *new_node = *all_nodes_[node];
+    if (NotSharedNode(new_node->name())) {
+      new_node->set_name(AddPrefixToNodeName(new_node->name(), prefix));
+      if (num_gpus_ > 0) {
+        new_node->set_device(strings::StrCat("/gpu:", number % num_gpus_));
+      }
+      for (int i = 0; i < new_node->input_size(); i++) {
+        if (NotSharedNode(NodeName(new_node->input(i)))) {
+          string new_name = AddPrefixToNodeName(new_node->input(i), prefix);
+          *new_node->mutable_input(i) = new_name;
+        }
+      }
+    }
+  }
+}
+
+void AutoParallel::BuildGraph(GraphDef* graph) {
+  AddSharedNodes(graph);
+  for (int i = 0; i < num_replicas_; i++) {
+    AddOneReplica(graph, i);
+  }
+  std::set<string> fetches;
+  for (int i = 0; i < item_->fetch.size(); i++) {
+    for (int j = 0; j < num_replicas_; j++) {
+      string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", j);
+      string fetch = AddPrefixToNodeName(item_->fetch[i], prefix);
+      fetches.insert(fetch);
+    }
+  }
+  string name_control =
+      strings::StrCat(kAutoParallelPrefix, "-Control-", "Fetch");
+  auto control = AddNodeControl(name_control, fetches, graph);
+
+  for (const auto& fetch : item_->fetch) {
+    AddNodeControl(fetch, {control->name()}, graph);
+  }
+  LOG(INFO) << "Parallelized graph size: " << graph->node_size();
+}
+
+Status AutoParallel::Optimize(Cluster* cluster, const GrapplerItem& item,
+                              GraphDef* output) {
+  TF_RETURN_IF_ERROR(Initialize(item));
+  BuildGraph(output);
+  return Status::OK();
+}
+
+void AutoParallel::Feedback(Cluster* cluster, const GrapplerItem& item,
+                            const GraphDef& optimize_output, double result) {
+  // TODO(yaozhang): Add feedback.
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.h b/tensorflow/core/grappler/optimizers/auto_parallel.h
new file mode 100644
index 0000000000..cac0db2c23
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.h
@@ -0,0 +1,63 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_OPTIMIZERS_AUTO_PARALLEL_H_
+#define TENSORFLOW_GRAPPLER_OPTIMIZERS_AUTO_PARALLEL_H_
+
+#include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Automatically parallelize a graph by splitting in the batch dimension.
+class AutoParallel : public GraphOptimizer {
+ public:
+  AutoParallel(int num_replicas) : num_replicas_(num_replicas) {}
+  ~AutoParallel() override {}
+
+  string name() const override { return "autoparallel"; };
+
+  Status Optimize(Cluster* cluster, const GrapplerItem& item,
+                  GraphDef* output) override;
+
+  void Feedback(Cluster* cluster, const GrapplerItem& item,
+                const GraphDef& optimize_output, double result) override;
+
+ private:
+  GraphDef graph_;
+  std::map<string, NodeDef*> all_nodes_;
+  std::set<string> apply_gradients_nodes_;
+  std::set<string> replica_nodes_;
+  std::set<string> shared_nodes_;
+  const GrapplerItem* item_;
+  int num_replicas_;
+  int num_gpus_;
+  Status Initialize(const GrapplerItem& item);
+  NodeDef* AddNodeDivConst();
+  NodeDef* AddNodeDiv(const string& name, const string& input_a,
+                      const string& input_b);
+  NodeDef* AddNodeControl(const string& name, const std::set<string>& deps,
+                          GraphDef* graph);
+  bool NotSharedNode(const string& name);
+  void AddSharedNodes(GraphDef* graph);
+  void AddOneReplica(GraphDef* graph, int number);
+  void BuildGraph(GraphDef* graph);
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_OPTIMIZERS_AUTO_PARALLEL_H_
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel_test.cc b/tensorflow/core/grappler/optimizers/auto_parallel_test.cc
new file mode 100644
index 0000000000..b7786ccd14
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/auto_parallel_test.cc
@@ -0,0 +1,125 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/auto_parallel.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class AutoParallelTest : public ::testing::Test {};
+
+TEST_F(AutoParallelTest, SimpleParallel) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  Output constant_a = ops::Const(s.WithOpName("constant_a"), 1.0f, {1});
+  Output constant_b = ops::Const(s.WithOpName("constant_b"), 1, {1});
+  Output var = ops::Variable(s.WithOpName("var"), {1}, DT_FLOAT);
+  Output assign = ops::Assign(s.WithOpName("assign"), {var}, {constant_a});
+  Output fifo_queue = ops::FIFOQueue(s.WithOpName("fifo_queue"), {DT_FLOAT});
+  auto dequeue = ops::QueueDequeueMany(s.WithOpName("dequeue"), {fifo_queue},
+                                       {constant_b}, {DT_FLOAT});
+  Output add = ops::AddN(s.WithOpName("add"), {constant_a, dequeue[0]});
+  Output learning_rate = ops::Const(s.WithOpName("learning_rate"), 0.01f, {1});
+  Output apply_gradient = ops::ApplyGradientDescent(
+      s.WithOpName("apply_gradient"), {var}, {learning_rate}, {add});
+
+  GrapplerItem item;
+  item.init_ops.push_back("assign");
+  item.fetch.push_back("apply_gradient");
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+
+  AutoParallel parallel(2);
+  GraphDef output;
+  Status status = parallel.Optimize(nullptr, item, &output);
+  TF_EXPECT_OK(status);
+  EXPECT_EQ(20, output.node_size());
+
+  const NodeDef& node_assign = output.node(0);
+  EXPECT_EQ("assign", node_assign.name());
+  EXPECT_EQ("AutoParallel-Replica-0-constant_a", node_assign.input(1));
+
+  const NodeDef& node_constant_b = output.node(1);
+  EXPECT_EQ("constant_b", node_constant_b.name());
+
+  const NodeDef& node_fifo_queue = output.node(2);
+  EXPECT_EQ("fifo_queue", node_fifo_queue.name());
+
+  const NodeDef& node_var = output.node(3);
+  EXPECT_EQ("var", node_var.name());
+
+  const NodeDef& node_div_const0 = output.node(4);
+  EXPECT_EQ("AutoParallel-Replica-0-AutoParallel-Div-Const",
+            node_div_const0.name());
+
+  const NodeDef& node_div0 = output.node(5);
+  EXPECT_EQ("AutoParallel-Replica-0-AutoParallel-Div-apply_gradient",
+            node_div0.name());
+  const NodeDef& node_add0 = output.node(6);
+  EXPECT_EQ("AutoParallel-Replica-0-add", node_add0.name());
+
+  const NodeDef& node_gradient0 = output.node(7);
+  EXPECT_EQ("AutoParallel-Replica-0-apply_gradient", node_gradient0.name());
+
+  const NodeDef& node_constant_a0 = output.node(8);
+  EXPECT_EQ("AutoParallel-Replica-0-constant_a", node_constant_a0.name());
+
+  const NodeDef& node_dequeue0 = output.node(9);
+  EXPECT_EQ("AutoParallel-Replica-0-dequeue", node_dequeue0.name());
+
+  const NodeDef& node_learning_rate0 = output.node(10);
+  EXPECT_EQ("AutoParallel-Replica-0-learning_rate", node_learning_rate0.name());
+
+  const NodeDef& node_div_const1 = output.node(11);
+  EXPECT_EQ("AutoParallel-Replica-1-AutoParallel-Div-Const",
+            node_div_const1.name());
+
+  const NodeDef& node_div1 = output.node(12);
+  EXPECT_EQ("AutoParallel-Replica-1-AutoParallel-Div-apply_gradient",
+            node_div1.name());
+
+  const NodeDef& node_add1 = output.node(13);
+  EXPECT_EQ("AutoParallel-Replica-1-add", node_add1.name());
+
+  const NodeDef& node_gradient1 = output.node(14);
+  EXPECT_EQ("AutoParallel-Replica-1-apply_gradient", node_gradient1.name());
+
+  const NodeDef& node_constant_a1 = output.node(15);
+  EXPECT_EQ("AutoParallel-Replica-1-constant_a", node_constant_a1.name());
+
+  const NodeDef& node_dequeue1 = output.node(16);
+  EXPECT_EQ("AutoParallel-Replica-1-dequeue", node_dequeue1.name());
+
+  const NodeDef& node_learning_rate1 = output.node(17);
+  EXPECT_EQ("AutoParallel-Replica-1-learning_rate", node_learning_rate1.name());
+
+  const NodeDef& node_fetch = output.node(18);
+  EXPECT_EQ("AutoParallel-Control-Fetch", node_fetch.name());
+  EXPECT_EQ("^AutoParallel-Replica-0-apply_gradient", node_fetch.input(0));
+  EXPECT_EQ("^AutoParallel-Replica-1-apply_gradient", node_fetch.input(1));
+
+  const NodeDef& node_gradient = output.node(19);
+  EXPECT_EQ("apply_gradient", node_gradient.name());
+  EXPECT_EQ("^AutoParallel-Control-Fetch", node_gradient.input(0));
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 67ffa7a4b6..0fe9359b75 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "tensorflow/core/grappler/optimizers/constant_folding.h"
 #include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
+#include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/model_pruner.h"
 #include "tensorflow/core/lib/core/status.h"
 
@@ -37,6 +38,9 @@ std::unique_ptr<GraphOptimizer> MetaOptimizer::NewOptimizer(
   if (optimizer == "layout") {
     graph_optimizer.reset(new LayoutOptimizer());
   }
+  if (optimizer == "memory") {
+    graph_optimizer.reset(new MemoryOptimizer());
+  }
   return graph_optimizer;
 }
 
@@ -55,8 +59,13 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
       optimizers.push_back(
           std::unique_ptr<GraphOptimizer>(new LayoutOptimizer()));
     }
+    if (cfg_.memory_optimization() > 0) {
+      optimizers.push_back(
+          std::unique_ptr<GraphOptimizer>(new MemoryOptimizer()));
+    }
   } else {
-    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout"};
+    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout",
+                                             "memory"};
     for (const auto& optimizer : cfg_.optimizers()) {
       if (avaliable_optimizers.find(optimizer) != avaliable_optimizers.end()) {
         optimizers.push_back(NewOptimizer(optimizer));
@@ -81,7 +90,6 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
           optimizer->Optimize(nullptr, optimized_item, optimized_graph));
     }
   }
-
   // Copy the graph version.
   *optimized_graph->mutable_versions() = item.graph.versions();
 
diff --git a/tensorflow/core/kernels/batchtospace_op.cc b/tensorflow/core/kernels/batchtospace_op.cc
index b24a834083..99b5d3daaa 100644
--- a/tensorflow/core/kernels/batchtospace_op.cc
+++ b/tensorflow/core/kernels/batchtospace_op.cc
@@ -97,6 +97,10 @@ static void BatchToSpaceOpCompute(OpKernelContext* context,
   for (int block_dim = 0; block_dim < block_dims; ++block_dim) {
     block_shape_product *= block_shape[block_dim];
   }
+  OP_REQUIRES(
+      context, block_shape_product > 0,
+      errors::InvalidArgument("Product of block sizes must be positive, got ",
+                              block_shape_product));
 
   const int64 orig_input_batch_size = orig_input_tensor.dim_size(0);
   OP_REQUIRES(
diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index caf73420ba..746fe63e2a 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -216,12 +216,14 @@ struct CropAndResize<CPUDevice, T> {
           const float x_lerp = in_x - left_x_index;
 
           for (int d = 0; d < depth; ++d) {
-            const float top_left(image(b_in, top_y_index, left_x_index, d));
-            const float top_right(image(b_in, top_y_index, right_x_index, d));
-            const float bottom_left(
-                image(b_in, bottom_y_index, left_x_index, d));
-            const float bottom_right(
-                image(b_in, bottom_y_index, right_x_index, d));
+            const float top_left(
+                static_cast<float>(image(b_in, top_y_index, left_x_index, d)));
+            const float top_right(
+                static_cast<float>(image(b_in, top_y_index, right_x_index, d)));
+            const float bottom_left(static_cast<float>(
+                image(b_in, bottom_y_index, left_x_index, d)));
+            const float bottom_right(static_cast<float>(
+                image(b_in, bottom_y_index, right_x_index, d)));
             const float top = top_left + (top_right - top_left) * x_lerp;
             const float bottom =
                 bottom_left + (bottom_right - bottom_left) * x_lerp;
@@ -545,12 +547,14 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
           const float x_lerp = in_x - left_x_index;
 
           for (int d = 0; d < depth; ++d) {
-            const float top_left(image(b_in, top_y_index, left_x_index, d));
-            const float top_right(image(b_in, top_y_index, right_x_index, d));
-            const float bottom_left(
-                image(b_in, bottom_y_index, left_x_index, d));
-            const float bottom_right(
-                image(b_in, bottom_y_index, right_x_index, d));
+            const float top_left(
+                static_cast<float>(image(b_in, top_y_index, left_x_index, d)));
+            const float top_right(
+                static_cast<float>(image(b_in, top_y_index, right_x_index, d)));
+            const float bottom_left(static_cast<float>(
+                image(b_in, bottom_y_index, left_x_index, d)));
+            const float bottom_right(static_cast<float>(
+                image(b_in, bottom_y_index, right_x_index, d)));
             // Compute the image gradient.
             float image_grad_y = (1 - x_lerp) * (bottom_left - top_left) +
                                  x_lerp * (bottom_right - top_right);
@@ -606,18 +610,25 @@ inline void CheckValidBoxInd<CPUDevice>(
                               .HostMemory("crop_size"),            \
                           CropAndResizeOp<CPUDevice, T>);          \
                                                                    \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradImage")           \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T")              \
-                              .HostMemory("image_size"),           \
-                          CropAndResizeGradImageOp<CPUDevice, T>); \
-                                                                   \
   REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")           \
                               .Device(DEVICE_CPU)                  \
                               .TypeConstraint<T>("T"),             \
                           CropAndResizeGradBoxesOp<CPUDevice, T>);
 
+TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNEL);
+
+#undef REGISTER_KERNEL
+
+#define REGISTER_KERNEL(T)                               \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradImage") \
+                              .Device(DEVICE_CPU)        \
+                              .TypeConstraint<T>("T")    \
+                              .HostMemory("image_size"), \
+                          CropAndResizeGradImageOp<CPUDevice, T>);
+
+TF_CALL_half(REGISTER_KERNEL);
 TF_CALL_float(REGISTER_KERNEL);
+TF_CALL_double(REGISTER_KERNEL);
 
 #undef REGISTER_KERNEL
 
@@ -685,7 +696,7 @@ inline void CheckValidBoxInd<GPUDevice>(
                               .TypeConstraint<T>("T"),             \
                           CropAndResizeGradBoxesOp<GPUDevice, T>);
 
-TF_CALL_float(REGISTER_KERNEL);
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_KERNEL);
 
 #undef REGISTER_KERNEL
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
index 75146b28e6..254475db46 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
@@ -88,26 +88,26 @@ __global__ void CropAndResizeKernel(
     const int right_x_index = ceilf(in_x);
     const float x_lerp = in_x - left_x_index;
 
-    const float top_left(
+    const float top_left(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d]);
-    const float top_right(
+                  d]));
+    const float top_right(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d]);
-    const float bottom_left(
+                  d]));
+    const float bottom_left(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d]);
-    const float bottom_right(
+                  d]));
+    const float bottom_right(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d]);
+                  d]));
     const float top = top_left + (top_right - top_left) * x_lerp;
     const float bottom = bottom_left + (bottom_right - bottom_left) * x_lerp;
     crops_ptr[out_idx] = top + (bottom - top) * y_lerp;
@@ -258,26 +258,26 @@ __global__ void CropAndResizeBackpropBoxesKernel(
     const int right_x_index = ceilf(in_x);
     const float x_lerp = in_x - left_x_index;
 
-    const float top_left =
+    const float top_left(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d];
-    const float top_right =
+                  d]));
+    const float top_right(static_cast<float>(
         image_ptr[((b_in * image_height + top_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d];
-    const float bottom_left =
+                  d]));
+    const float bottom_left(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    left_x_index) *
                       depth +
-                  d];
-    const float bottom_right =
+                  d]));
+    const float bottom_right(static_cast<float>(
         image_ptr[((b_in * image_height + bottom_y_index) * image_width +
                    right_x_index) *
                       depth +
-                  d];
+                  d]));
 
     // Compute the image gradient.
     float image_grad_y = (1 - x_lerp) * (bottom_left - top_left) +
@@ -436,7 +436,7 @@ struct CropAndResizeBackpropBoxes<GPUDevice, T> {
   template struct CropAndResizeBackpropImage<GPUDevice, T>; \
   template struct CropAndResizeBackpropBoxes<GPUDevice, T>;
 
-TF_CALL_float(DEFINE_GPU_SPECS);
+TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_test.cc b/tensorflow/core/kernels/crop_and_resize_op_test.cc
index 68e077e44d..3a7f180598 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_test.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_test.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def_builder.h"
 #include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/framework/types.h"
@@ -31,9 +32,10 @@ namespace tensorflow {
 
 class CropAndResizeOpTest : public OpsTestBase {
  protected:
+  template <typename T>
   void MakeOp(float extrapolation_value) {
     TF_EXPECT_OK(NodeDefBuilder("crop_and_resize_op", "CropAndResize")
-                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(DataTypeToEnum<T>::value))
                      .Input(FakeInput(DT_FLOAT))
                      .Input(FakeInput(DT_INT32))
                      .Input(FakeInput(DT_INT32))
@@ -43,12 +45,33 @@ class CropAndResizeOpTest : public OpsTestBase {
   }
 };
 
-TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1) {
-  MakeOp(0);
+#define REGISTER_TEST(T)                                               \
+  TEST_F(CropAndResizeOpTest, TestCropAndResize##T) {                  \
+    MakeOp<T>(0);                                                      \
+    AddInputFromArray<T>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});     \
+    AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});       \
+    AddInputFromArray<int32>(TensorShape({1}), {0});                   \
+    AddInputFromArray<int32>(TensorShape({2}), {1, 1});                \
+    TF_ASSERT_OK(RunOpKernel());                                       \
+                                                                       \
+    Tensor expected(allocator(), DT_FLOAT, TensorShape({1, 1, 1, 1})); \
+    test::FillValues<float>(&expected, {2.5});                         \
+    test::ExpectTensorEqual<float>(expected, *GetOutput(0));           \
+  }
+
+REGISTER_TEST(float)
+REGISTER_TEST(double)
+REGISTER_TEST(int8)
+REGISTER_TEST(uint8)
+
+#undef REGISTER_TEST
+
+TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1Uint8) {
+  MakeOp<uint8>(0);
   // Input:
   //  1, 2
   //  3, 4
-  AddInputFromArray<float>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
+  AddInputFromArray<uint8>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({1}), {0});
   AddInputFromArray<int32>(TensorShape({2}), {1, 1});
@@ -60,7 +83,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1Flipped) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -76,7 +99,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To1x1Flipped) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -97,7 +120,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Flipped) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -118,7 +141,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Flipped) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2, 3
   //  4, 5, 6
@@ -143,7 +166,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2Flipped) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2, 3
   //  4, 5, 6
@@ -169,7 +192,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize3x3To2x2Flipped) {
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Extrapolated) {
   const float v = -1;
-  MakeOp(v);
+  MakeOp<float>(v);
   // Input:
   //  1, 2
   //  3, 4
@@ -190,7 +213,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3Extrapolated) {
 }
 
 TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3NoCrop) {
-  MakeOp(0);
+  MakeOp<float>(0);
   // Input:
   //  1, 2
   //  3, 4
@@ -208,7 +231,7 @@ TEST_F(CropAndResizeOpTest, TestCropAndResize2x2To3x3NoCrop) {
 }
 
 TEST_F(CropAndResizeOpTest, TestInvalidInputShape) {
-  MakeOp(0);
+  MakeOp<float>(0);
   AddInputFromArray<float>(TensorShape({2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({1}), {0});
@@ -220,7 +243,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidInputShape) {
 }
 
 TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
-  MakeOp(0);
+  MakeOp<float>(0);
   AddInputFromArray<float>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({2}), {0, 0});
@@ -233,7 +256,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
 }
 
 TEST_F(CropAndResizeOpTest, TestInvalidBoxIndex) {
-  MakeOp(0);
+  MakeOp<float>(0);
   AddInputFromArray<float>(TensorShape({1, 2, 2, 1}), {1, 2, 3, 4});
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<int32>(TensorShape({1}), {1});
diff --git a/tensorflow/core/kernels/gather_functor.cc b/tensorflow/core/kernels/gather_functor.cc
index be220d5c95..8ef027a1dd 100644
--- a/tensorflow/core/kernels/gather_functor.cc
+++ b/tensorflow/core/kernels/gather_functor.cc
@@ -38,6 +38,7 @@ namespace functor {
   DECLARE_GPU_SPECS_INDEX(T, int64)
 
 TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPECS);
+TF_CALL_complex64(DECLARE_GPU_SPECS);
 
 #undef DECLARE_GPU_SPECS
 #undef DECLARE_GPU_SPECS_INDEX
diff --git a/tensorflow/core/kernels/gather_functor_gpu.cu.cc b/tensorflow/core/kernels/gather_functor_gpu.cu.cc
index f1c1025078..456f4023a7 100644
--- a/tensorflow/core/kernels/gather_functor_gpu.cu.cc
+++ b/tensorflow/core/kernels/gather_functor_gpu.cu.cc
@@ -32,6 +32,7 @@ typedef Eigen::GpuDevice GPUDevice;
   DEFINE_GPU_SPECS_INDEX(T, int64);
 
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
+TF_CALL_complex64(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 #undef DEFINE_GPU_SPECS_INDEX
diff --git a/tensorflow/core/kernels/gather_op.cc b/tensorflow/core/kernels/gather_op.cc
index d8182218af..31af37693c 100644
--- a/tensorflow/core/kernels/gather_op.cc
+++ b/tensorflow/core/kernels/gather_op.cc
@@ -114,6 +114,7 @@ TF_CALL_QUANTIZED_TYPES(REGISTER_GATHER_CPU);
 #define REGISTER_GATHER_GPU(type) REGISTER_GATHER_ALL_INDICES(GPU, type)
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GATHER_GPU);
+TF_CALL_complex64(REGISTER_GATHER_GPU);
 
 #undef REGISTER_GATHER_GPU
 
diff --git a/tensorflow/core/kernels/gather_op_test.cc b/tensorflow/core/kernels/gather_op_test.cc
index c340223aa1..23645dafad 100644
--- a/tensorflow/core/kernels/gather_op_test.cc
+++ b/tensorflow/core/kernels/gather_op_test.cc
@@ -40,9 +40,9 @@ namespace {
 
 class GatherOpTest : public OpsTestBase {
  protected:
-  void MakeOp(DataType index_type) {
+  void MakeOp(DataType data_type, DataType index_type) {
     TF_ASSERT_OK(NodeDefBuilder("myop", "Gather")
-                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(data_type))
                      .Input(FakeInput(index_type))
                      .Finalize(node_def()));
     TF_ASSERT_OK(InitOp());
@@ -50,7 +50,7 @@ class GatherOpTest : public OpsTestBase {
 };
 
 TEST_F(GatherOpTest, ScalarIndices) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5}), {0, 1, 2, 3, 4});
@@ -63,8 +63,26 @@ TEST_F(GatherOpTest, ScalarIndices) {
   test::ExpectTensorEqual<float>(expected, *GetOutput(0));
 }
 
+TEST_F(GatherOpTest, ScalarIndices_Complex) {
+  MakeOp(DT_COMPLEX64, DT_INT32);
+
+  // Feed and run
+  AddInputFromArray<std::complex<float>>(
+      TensorShape({5}), {std::complex<float>(0, 10), std::complex<float>(1, 11),
+                         std::complex<float>(2, 12), std::complex<float>(3, 13),
+                         std::complex<float>(4, 14)});
+  AddInputFromArray<int32>(TensorShape({}), {3});
+  TF_ASSERT_OK(RunOpKernel());
+
+  // Check the output.
+  Tensor expected(allocator(), DT_COMPLEX64, TensorShape({}));
+  test::FillValues<std::complex<float>>(&expected,
+                                        {std::complex<float>(3, 13)});
+  test::ExpectTensorEqual<std::complex<float>>(expected, *GetOutput(0));
+}
+
 TEST_F(GatherOpTest, Simple_TwoD32) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 3}),
@@ -79,7 +97,7 @@ TEST_F(GatherOpTest, Simple_TwoD32) {
 }
 
 TEST_F(GatherOpTest, ZeroSize_TwoD32) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 0}), {});
@@ -92,7 +110,7 @@ TEST_F(GatherOpTest, ZeroSize_TwoD32) {
 }
 
 TEST_F(GatherOpTest, Simple_TwoD64) {
-  MakeOp(DT_INT64);
+  MakeOp(DT_FLOAT, DT_INT64);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 3}),
@@ -107,7 +125,7 @@ TEST_F(GatherOpTest, Simple_TwoD64) {
 }
 
 TEST_F(GatherOpTest, HighRank) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({4}), {0, 1, 2, 3});
@@ -121,7 +139,7 @@ TEST_F(GatherOpTest, HighRank) {
 }
 
 TEST_F(GatherOpTest, Error_IndexOutOfRange) {
-  MakeOp(DT_INT32);
+  MakeOp(DT_FLOAT, DT_INT32);
 
   // Feed and run
   AddInputFromArray<float>(TensorShape({5, 3}),
diff --git a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
index c5d5657492..a383cc8199 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
@@ -295,6 +295,83 @@ static void RunFusedGraph(const GraphDef& fused_graph_def) {
       reinterpret_cast<const float*>(output_tensor.flat<float>().data()));
 }
 
+static void CompareGraphTransferInfo(const GraphTransferInfo& gfi0,
+                                     const GraphTransferInfo& gfi1) {
+  LOG(INFO) << "(1) node count: " << gfi1.node_info_size() << ", "
+            << gfi1.const_node_info_size();
+
+  // 1. check node_info
+  ASSERT_EQ(gfi0.node_info_size(), gfi1.node_info_size());
+  for (int i = 0; i < gfi0.node_info_size(); ++i) {
+    const GraphTransferInfo::NodeInfo& ni0 = gfi0.node_info(i);
+    const GraphTransferInfo::NodeInfo& ni1 = gfi1.node_info(i);
+    EXPECT_EQ(ni0.DebugString(), ni1.DebugString());
+    EXPECT_EQ(ni0.ByteSize(), ni1.ByteSize());
+  }
+
+  // 2. check const_node_info
+  ASSERT_EQ(gfi0.const_node_info_size(), gfi1.const_node_info_size());
+  for (int i = 0; i < gfi0.const_node_info_size(); ++i) {
+    const GraphTransferInfo::ConstNodeInfo& cni0 = gfi0.const_node_info(i);
+    const GraphTransferInfo::ConstNodeInfo& cni1 = gfi1.const_node_info(i);
+    ASSERT_EQ(cni0.shape_size(), cni1.shape_size());
+    for (int j = 0; j < cni0.shape_size(); ++j) {
+      EXPECT_EQ(cni0.shape(j), cni1.shape(j));
+    }
+    EXPECT_EQ(cni0.ByteSize(), cni1.ByteSize());
+    EXPECT_EQ(cni0.DebugString(), cni1.DebugString());
+  }
+
+  // 3. check node_input_info
+  ASSERT_EQ(gfi0.node_input_info_size(), gfi1.node_input_info_size());
+  for (int i = 0; i < gfi0.node_input_info_size(); ++i) {
+    const GraphTransferInfo::NodeInputInfo& nii0 = gfi0.node_input_info(i);
+    const GraphTransferInfo::NodeInputInfo& nii1 = gfi1.node_input_info(i);
+    EXPECT_EQ(nii0.ByteSize(), nii1.ByteSize());
+    EXPECT_EQ(nii0.DebugString(), nii1.DebugString());
+  }
+
+  // 4. check node_output_info
+  ASSERT_EQ(gfi0.node_output_info_size(), gfi1.node_output_info_size());
+  for (int i = 0; i < gfi0.node_output_info_size(); ++i) {
+    const GraphTransferInfo::NodeOutputInfo& noi0 = gfi0.node_output_info(i);
+    const GraphTransferInfo::NodeOutputInfo& noi1 = gfi1.node_output_info(i);
+    ASSERT_EQ(noi0.max_byte_size_size(), noi1.max_byte_size_size());
+    for (int j = 0; j < noi0.max_byte_size_size(); ++j) {
+      EXPECT_EQ(noi0.max_byte_size(j), noi1.max_byte_size(j));
+    }
+    EXPECT_EQ(noi0.ByteSize(), noi1.ByteSize());
+    EXPECT_EQ(noi0.DebugString(), noi1.DebugString());
+  }
+
+  // 5. check graph_input_node_info
+  ASSERT_EQ(gfi0.graph_input_node_info_size(),
+            gfi1.graph_input_node_info_size());
+  for (int i = 0; i < gfi0.graph_input_node_info_size(); ++i) {
+    const GraphTransferInfo::GraphInputNodeInfo& gini0 =
+        gfi0.graph_input_node_info(i);
+    const GraphTransferInfo::GraphInputNodeInfo& gini1 =
+        gfi0.graph_input_node_info(i);
+    EXPECT_EQ(gini0.ByteSize(), gini1.ByteSize());
+    EXPECT_EQ(gini0.DebugString(), gini1.DebugString());
+  }
+
+  // 6. check graph_output_node_info
+  ASSERT_EQ(gfi0.graph_output_node_info_size(),
+            gfi1.graph_output_node_info_size());
+  for (int i = 0; i < gfi0.graph_output_node_info_size(); ++i) {
+    const GraphTransferInfo::GraphOutputNodeInfo& goni0 =
+        gfi0.graph_output_node_info(i);
+    const GraphTransferInfo::GraphOutputNodeInfo& goni1 =
+        gfi0.graph_output_node_info(i);
+    EXPECT_EQ(goni0.ByteSize(), goni1.ByteSize());
+    EXPECT_EQ(goni0.DebugString(), goni1.DebugString());
+  }
+
+  // 7. check destination
+  EXPECT_EQ(gfi0.destination(), gfi1.destination());
+}
+
 // CAVEAT: This test only runs when you specify hexagon library using
 // makefile.
 // CAVEAT: This test is disabled by default because hexagon can keep only
@@ -450,34 +527,22 @@ TEST(GraphTransferer, DISABLED_CheckShapeInferencePerformance) {
   prof1.Stop();
   prof1.DumpStatistics("Estiame shape by shape inference");
 
-  LOG(INFO) << "(1) node count: " << gfi1.node_info_size() << ", "
-            << gfi1.const_node_info_size();
+  CompareGraphTransferInfo(gfi0, gfi1);
 
-  ASSERT_EQ(gfi0.node_info_size(), gfi1.node_info_size());
+  const RemoteFusedGraphExecuteInfo ei0 =
+      BuildRemoteFusedGraphExecuteInfoWithGraphTransferInfo(gfi0);
+  const RemoteFusedGraphExecuteInfo ei1 =
+      BuildRemoteFusedGraphExecuteInfoWithGraphTransferInfo(gfi1);
 
-  ASSERT_EQ(gt0.GetGraphTransferInfo().const_node_info_size(),
-            gt1.GetGraphTransferInfo().const_node_info_size());
+  GraphTransferInfo rgfi0;
+  rgfi0.ParseFromString(ei0.serialized_executor_parameters());
+  GraphTransferInfo rgfi1;
+  rgfi1.ParseFromString(ei1.serialized_executor_parameters());
 
-  for (int i = 0; i < gfi0.const_node_info_size(); ++i) {
-    const GraphTransferInfo::ConstNodeInfo& ni0 = gfi0.const_node_info(i);
-    const GraphTransferInfo::ConstNodeInfo& ni1 = gfi1.const_node_info(i);
-    ASSERT_EQ(ni0.shape_size(), ni1.shape_size());
-    for (int j = 0; j < ni0.shape_size(); ++j) {
-      EXPECT_EQ(ni0.shape(j), ni1.shape(j));
-    }
-  }
-
-  ASSERT_EQ(gfi0.node_output_info_size(), gfi1.node_output_info_size());
-  for (int i = 0; i < gfi0.node_output_info_size(); ++i) {
-    const GraphTransferInfo::NodeOutputInfo& no0 = gfi0.node_output_info(i);
-    const GraphTransferInfo::NodeOutputInfo& no1 = gfi1.node_output_info(i);
-    ASSERT_EQ(no0.max_byte_size_size(), no1.max_byte_size_size());
-    for (int j = 0; j < no0.max_byte_size_size(); ++j) {
-      EXPECT_EQ(no0.max_byte_size(j), no1.max_byte_size(j));
-    }
-  }
+  CompareGraphTransferInfo(rgfi0, rgfi1);
+  CompareGraphTransferInfo(gfi0, rgfi0);
+  CompareGraphTransferInfo(gfi1, rgfi1);
 }
-
 #endif
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
index 851d87b15b..ad9200e948 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
@@ -174,6 +174,7 @@ const std::unordered_map<string, SupportedOpType> OP_NAME_TO_SOC_OP_TYPE_MAP{
     {"Placeholder", SupportedOpType::NOP},
     {"RequantizationRange", SupportedOpType::REQUANTIZATION_RANGE_32},
     {"Requantize", SupportedOpType::REQUANTIZE_32_TO_8},
+    {"QuantizedReshape", SupportedOpType::QUANTIZED_RESHAPE},
 };
 
 /* static */ const IGraphTransferOpsDefinitions&
diff --git a/tensorflow/core/kernels/maxpooling_op.cc b/tensorflow/core/kernels/maxpooling_op.cc
index eb590280c9..6cb56797bf 100644
--- a/tensorflow/core/kernels/maxpooling_op.cc
+++ b/tensorflow/core/kernels/maxpooling_op.cc
@@ -587,8 +587,8 @@ class MaxPoolingGradGradOp<Eigen::GpuDevice, T> : public OpKernel {
         errors::InvalidArgument("out_grad_backprop must be 4-dimensional"));
 
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->forward_input_or_allocate_output(
-                                {2}, 0, tensor_out.shape(), &output));
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(0, tensor_out.shape(), &output));
 
     PoolParameters params{context,  ksize_,       stride_,
                           padding_, data_format_, tensor_in.shape()};
diff --git a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
index 32b210ecb7..e3a57d2f28 100644
--- a/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/maxpooling_op_gpu.cu.cc
@@ -70,7 +70,7 @@ __global__ void MaxPoolForwardNCHW(const int nthreads, const dtype* bottom_data,
     int wend = min(wstart + kernel_w, width);
     hstart = max(hstart, 0);
     wstart = max(wstart, 0);
-    dtype maxval = -FLT_MAX;
+    dtype maxval = Eigen::NumTraits<dtype>::lowest();
     int maxidx = -1;
     const dtype* bottom_data_n = bottom_data + n * channels * height * width;
     for (int h = hstart; h < hend; ++h) {
@@ -312,9 +312,6 @@ __global__ void MaxPoolGradBackwardNoMaskNHWC(
 //     bottom_offset: the pre-computed per-image offset of the maxpool output.
 //         This is equal to Hout*Wout*C.
 //     bottom_diff: the gradient of the gradient w.r.t. output.
-// This function relies on CudaAtomicAdd to avoid race conditions. Also, before
-// the kernel is run, you will need to make sure that bottom_diff is filled with
-// zero first.
 template <typename dtype>
 __global__ void MaxPoolGradBackward(const int nthreads, const dtype* top_diff,
                                     const int64* mask, const int top_offset,
@@ -357,12 +354,12 @@ bool MaxPoolBackwardNoMask<T>::operator()(
     const int stride_w, const int pad_t, const int pad_l, const T* top_diff,
     T* bottom_diff, const Eigen::GpuDevice& d) {
   const int kThreadsPerBlock = 1024;
-  const int bottom_size = batch * channels * height * width;
-  const int top_size = batch * channels * pooled_height * pooled_width;
 
+  const int bottom_size = batch * channels * height * width;
   SetZero<<<(bottom_size + kThreadsPerBlock - 1) / kThreadsPerBlock,
             kThreadsPerBlock, 0, d.stream()>>>(bottom_size, bottom_diff);
 
+  const int top_size = batch * channels * pooled_height * pooled_width;
   MaxPoolBackwardNoMaskNHWC<<<(top_size + kThreadsPerBlock - 1) /
                                   kThreadsPerBlock,
                               kThreadsPerBlock, 0, d.stream()>>>(
diff --git a/tensorflow/core/kernels/quantize_op.cc b/tensorflow/core/kernels/quantize_op.cc
index 7b34c32ceb..f649287fc1 100644
--- a/tensorflow/core/kernels/quantize_op.cc
+++ b/tensorflow/core/kernels/quantize_op.cc
@@ -86,6 +86,7 @@ class QuantizeV2Op : public OpKernel {
                                                   fabsf(input_max_range))) /
                           100.0f;
     max_range = std::max(input_max_range, min_range + epsilon);
+    max_range = std::max(0.0f, max_range);
 
     Tensor* output = nullptr;
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, input.shape(), &output));
diff --git a/tensorflow/core/kernels/quantize_op_test.cc b/tensorflow/core/kernels/quantize_op_test.cc
index 41996852f1..48bde3b497 100644
--- a/tensorflow/core/kernels/quantize_op_test.cc
+++ b/tensorflow/core/kernels/quantize_op_test.cc
@@ -132,6 +132,50 @@ TEST_F(QuantizedOpTest, QuantizeV2EqualRange) {
   EXPECT_LT(0.0f, output_max);
 }
 
+TEST_F(QuantizedOpTest, QuantizeV2MovesMinToIncludeZero) {
+  TF_ASSERT_OK(NodeDefBuilder("quantize_op", "QuantizeV2")
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Attr("T", DataTypeToEnum<quint8>::v())
+                   .Attr("mode", "MIN_FIRST")
+                   .Finalize(node_def()));
+  TF_ASSERT_OK(InitOp());
+  AddInputFromArray<float>(TensorShape({3}), {0.1, 0.2, 0.3});
+  AddInputFromArray<float>(TensorShape({1}), {0.1});
+  AddInputFromArray<float>(TensorShape({1}), {0.3});
+  TF_ASSERT_OK(RunOpKernel());
+  Tensor expected(allocator(), DT_QUINT8, TensorShape({3}));
+  test::FillValues<quint8>(&expected, {85, 170, 255});
+  test::ExpectTensorEqual<quint8>(expected, *GetOutput(0));
+  const float output_min = GetOutput(1)->flat<float>()(0);
+  const float output_max = GetOutput(2)->flat<float>()(0);
+  EXPECT_NEAR(0.0f, output_min, 1e-5f);
+  EXPECT_NEAR(0.3f, output_max, 1e-5f);
+}
+
+TEST_F(QuantizedOpTest, QuantizeV2MovesMaxToIncludeZero) {
+  TF_ASSERT_OK(NodeDefBuilder("quantize_op", "QuantizeV2")
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Input(FakeInput(DT_FLOAT))
+                   .Attr("T", DataTypeToEnum<quint8>::v())
+                   .Attr("mode", "MIN_FIRST")
+                   .Finalize(node_def()));
+  TF_ASSERT_OK(InitOp());
+  AddInputFromArray<float>(TensorShape({3}), {-0.1, -0.2, -0.3});
+  AddInputFromArray<float>(TensorShape({1}), {-0.3});
+  AddInputFromArray<float>(TensorShape({1}), {-0.1});
+  TF_ASSERT_OK(RunOpKernel());
+  Tensor expected(allocator(), DT_QUINT8, TensorShape({3}));
+  test::FillValues<quint8>(&expected, {170, 85, 0});
+  test::ExpectTensorEqual<quint8>(expected, *GetOutput(0));
+  const float output_min = GetOutput(1)->flat<float>()(0);
+  const float output_max = GetOutput(2)->flat<float>()(0);
+  EXPECT_NEAR(-0.3f, output_min, 1e-5f);
+  EXPECT_NEAR(0.0f, output_max, 1e-5f);
+}
+
 TEST_F(QuantizedOpTest, Dequantize) {
   TF_ASSERT_OK(NodeDefBuilder("dequantize_op", "Dequantize")
                    .Input(FakeInput(DT_QUINT8))
diff --git a/tensorflow/core/kernels/random_op.cc b/tensorflow/core/kernels/random_op.cc
index 3063fedac8..80b1be8d4c 100644
--- a/tensorflow/core/kernels/random_op.cc
+++ b/tensorflow/core/kernels/random_op.cc
@@ -178,27 +178,9 @@ namespace {
 
 static Status AllocateOutputWithShape(OpKernelContext* ctx, const Tensor& shape,
                                       int index, Tensor** output) {
-  if (!ctx->op_kernel().IsLegacyVector(shape.shape())) {
-    return errors::InvalidArgument(
-        "shape must be a vector of {int32,int64}, got shape ",
-        shape.shape().DebugString());
-  }
-  if (shape.dtype() == DataType::DT_INT32) {
-    auto vec = shape.flat<int32>();
-    TensorShape tensor_shape;
-    TF_RETURN_IF_ERROR(
-        TensorShapeUtils::MakeShape(vec.data(), vec.size(), &tensor_shape));
-    TF_RETURN_IF_ERROR(ctx->allocate_output(index, tensor_shape, output));
-  } else if (shape.dtype() == DataType::DT_INT64) {
-    auto vec = shape.flat<int64>();
-    TensorShape tensor_shape;
-    TF_RETURN_IF_ERROR(
-        TensorShapeUtils::MakeShape(vec.data(), vec.size(), &tensor_shape));
-    TF_RETURN_IF_ERROR(ctx->allocate_output(index, tensor_shape, output));
-  } else {
-    return errors::InvalidArgument("shape must be a vector of {int32,int64}.");
-  }
-  return Status::OK();
+  TensorShape tensor_shape;
+  TF_RETURN_IF_ERROR(ctx->op_kernel().MakeShape(shape, &tensor_shape));
+  return ctx->allocate_output(index, tensor_shape, output);
 }
 
 // For now, use the same interface as RandomOp, so we can choose either one
@@ -465,6 +447,12 @@ class RandomGammaOp : public OpKernel {
 #define REGISTER(TYPE)                                                      \
   template struct functor::FillPhiloxRandom<                                \
       CPUDevice, random::UniformDistribution<random::PhiloxRandom, TYPE> >; \
+  template struct functor::FillPhiloxRandom<                                \
+      CPUDevice, random::NormalDistribution<random::PhiloxRandom, TYPE> >;  \
+  template struct functor::FillPhiloxRandom<                                \
+      CPUDevice,                                                            \
+      random::TruncatedNormalDistribution<                                  \
+          random::SingleSampleAdapter<random::PhiloxRandom>, TYPE> >;       \
   REGISTER_KERNEL_BUILDER(                                                  \
       Name("RandomUniform")                                                 \
           .Device(DEVICE_CPU)                                               \
diff --git a/tensorflow/core/kernels/random_poisson_op.cc b/tensorflow/core/kernels/random_poisson_op.cc
index 553a4a7f93..66123e47c6 100644
--- a/tensorflow/core/kernels/random_poisson_op.cc
+++ b/tensorflow/core/kernels/random_poisson_op.cc
@@ -291,33 +291,15 @@ class RandomPoissonOp : public OpKernel {
     const Tensor& shape_t = ctx->input(0);
     const Tensor& rate_t = ctx->input(1);
 
-    OP_REQUIRES(ctx,
-                TensorShapeUtils::IsVector(shape_t.shape()) &&
-                    (shape_t.dtype() == DataType::DT_INT32 ||
-                     shape_t.dtype() == DataType::DT_INT64),
-                errors::InvalidArgument(
-                    "shape must be a vector of {int32,int64}, got shape: ",
-                    shape_t.DebugString()));
     TensorShape samples_shape;
-    if (shape_t.dtype() == DataType::DT_INT32) {
-      auto vec = shape_t.flat<int32>();
-      OP_REQUIRES_OK(ctx, TensorShapeUtils::MakeShape(vec.data(), vec.size(),
-                                                      &samples_shape));
-    } else if (shape_t.dtype() == DataType::DT_INT64) {
-      auto vec = shape_t.flat<int64>();
-      OP_REQUIRES_OK(ctx, TensorShapeUtils::MakeShape(vec.data(), vec.size(),
-                                                      &samples_shape));
-    }
+    OP_REQUIRES_OK(ctx, MakeShape(shape_t, &samples_shape));
     const int64 num_samples = samples_shape.num_elements();
-    OP_REQUIRES(ctx, num_samples > 0,
-                errors::InvalidArgument(
-                    "Input shape should have non-zero element count, got: ",
-                    num_samples));
 
     samples_shape.AppendShape(rate_t.shape());
     // Allocate output samples.
     Tensor* samples_t = nullptr;
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, samples_shape, &samples_t));
+    if (num_samples == 0) return;
 
     const auto rate_flat = rate_t.flat<T>().data();
     const int64 num_rate = rate_t.NumElements();
diff --git a/tensorflow/core/kernels/save_restore_v2_ops.cc b/tensorflow/core/kernels/save_restore_v2_ops.cc
index 2e09956578..c665bc5b03 100644
--- a/tensorflow/core/kernels/save_restore_v2_ops.cc
+++ b/tensorflow/core/kernels/save_restore_v2_ops.cc
@@ -47,8 +47,9 @@ void ValidateInputs(bool is_save_op, OpKernelContext* context,
       context, prefix.NumElements() == 1,
       errors::InvalidArgument("Input prefix should have a single element, got ",
                               prefix.NumElements(), " instead."));
-  OP_REQUIRES(context, TensorShapeUtils::IsVector(tensor_names.shape()) &&
-                           TensorShapeUtils::IsVector(shape_and_slices.shape()),
+  OP_REQUIRES(context,
+              TensorShapeUtils::IsVector(tensor_names.shape()) &&
+                  TensorShapeUtils::IsVector(shape_and_slices.shape()),
               errors::InvalidArgument(
                   "Input tensor_names and shape_and_slices "
                   "should be an 1-D tensors, got ",
@@ -105,6 +106,7 @@ class SaveV2 : public OpKernel {
     const auto& shape_and_slices_flat = shape_and_slices.flat<string>();
 
     BundleWriter writer(Env::Default(), prefix_string);
+    OP_REQUIRES_OK(context, writer.status());
     VLOG(1) << "BundleWriter, prefix_string: " << prefix_string;
 
     for (int i = 0; i < num_tensors; ++i) {
diff --git a/tensorflow/core/kernels/spacetobatch_op.cc b/tensorflow/core/kernels/spacetobatch_op.cc
index 3815716ccd..c513683918 100644
--- a/tensorflow/core/kernels/spacetobatch_op.cc
+++ b/tensorflow/core/kernels/spacetobatch_op.cc
@@ -100,6 +100,10 @@ void SpaceToBatchOpCompute(OpKernelContext* context,
   for (int block_dim = 0; block_dim < block_dims; ++block_dim) {
     block_shape_product *= block_shape[block_dim];
   }
+  OP_REQUIRES(
+      context, block_shape_product > 0,
+      errors::InvalidArgument("Product of block sizes must be positive, got ",
+                              block_shape_product));
 
   const int internal_block_dims =
       block_dims - removed_prefix_block_dims - removed_suffix_block_dims;
diff --git a/tensorflow/core/lib/random/philox_random.h b/tensorflow/core/lib/random/philox_random.h
index 1fec5a3b44..b2adb4462b 100644
--- a/tensorflow/core/lib/random/philox_random.h
+++ b/tensorflow/core/lib/random/philox_random.h
@@ -101,12 +101,15 @@ class Array {
 // 2. PhiloxRandom is compilable by gcc and nvcc.
 class PhiloxRandom {
  public:
-  typedef Array<uint32, 4> ResultType;
-  typedef uint32 ResultElementType;
+  using ResultType = Array<uint32, 4>;
+  using ResultElementType = uint32;
   // The number of elements that will be returned.
   static const int kResultElementCount = 4;
   // Cost of generation of a single element (in cycles).
   static const int kElementCost = 10;
+  // The type for the 64-bit key stored in the form of two 32-bit uint
+  // that are used in the diffusion process.
+  using Key = Array<uint32, 2>;
 
   PHILOX_DEVICE_INLINE
   PhiloxRandom() {}
@@ -125,6 +128,9 @@ class PhiloxRandom {
     counter_[3] = static_cast<uint32>(seed_hi >> 32);
   }
 
+  PHILOX_DEVICE_INLINE
+  PhiloxRandom(ResultType counter, Key key) : counter_(counter), key_(key) {}
+
   // Skip the specified number of samples of 128-bits in the current stream.
   PHILOX_DEVICE_INLINE
   void Skip(uint64 count) {
@@ -178,10 +184,6 @@ class PhiloxRandom {
   }
 
  private:
-  // The type for the 64-bit key stored in the form of two 32-bit uint
-  // that are used in the diffusion process.
-  typedef Array<uint32, 2> Key;
-
   // We use the same constants as recommended by the original paper.
   static const uint32 kPhiloxW32A = 0x9E3779B9;
   static const uint32 kPhiloxW32B = 0xBB67AE85;
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e81490c498..e2e07a4bf1 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -41,10 +41,10 @@ Status GetAxisForPackAndUnpack(InferenceContext* c, int32 rank_after_pack,
 }
 
 template <typename T>
-std::vector<int64> AsInt64(const Tensor* tensor, int num_elements) {
+std::vector<int64> AsInt64(const Tensor* tensor, int64 num_elements) {
   std::vector<int64> ret(num_elements);
   auto data = tensor->vec<T>();
-  for (int i = 0; i < num_elements; ++i) {
+  for (int64 i = 0; i < num_elements; ++i) {
     ret[i] = data(i);
   }
   return ret;
@@ -52,11 +52,11 @@ std::vector<int64> AsInt64(const Tensor* tensor, int num_elements) {
 
 template <typename T>
 Status PadKnown(InferenceContext* c, ShapeHandle input,
-                const Tensor* paddings_t, int32 num_dims) {
+                const Tensor* paddings_t, int64 num_dims) {
   // paddings_t is known.
   std::vector<DimensionHandle> dims(num_dims);
   auto paddings_data = paddings_t->matrix<T>();
-  for (int i = 0; i < num_dims; ++i) {
+  for (int64 i = 0; i < num_dims; ++i) {
     const T pad0 = paddings_data(i, 0);
     const T pad1 = paddings_data(i, 1);
     if (pad0 < 0 || pad1 < 0) {
@@ -1244,9 +1244,12 @@ REGISTER_OP("_ParallelConcatStart")
     .Attr("dtype: type")
     .SetIsStateful()
     .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle out;
-      TF_RETURN_IF_ERROR(c->MakeShapeFromShapeTensor(0, &out));
-      c->set_output(0, out);
+      TensorShapeProto shape_proto;
+      TF_RETURN_IF_ERROR(c->GetAttr("shape", &shape_proto));
+      ShapeHandle output_shape;
+      TF_RETURN_IF_ERROR(
+          c->MakeShapeFromShapeProto(shape_proto, &output_shape));
+      c->set_output(0, output_shape);
       return Status::OK();
     })
     .Doc(R"doc(
@@ -2644,10 +2647,10 @@ output: The padded tensor.
 namespace {
 template <typename T>
 Status MirrorPadKnown(InferenceContext* c, ShapeHandle input,
-                      const Tensor* paddings_t, int32 input_rank) {
+                      const Tensor* paddings_t, int64 input_rank) {
   auto paddings_data = paddings_t->matrix<T>();
   std::vector<DimensionHandle> dims(input_rank);
-  for (int i = 0; i < input_rank; ++i) {
+  for (int64 i = 0; i < input_rank; ++i) {
     const int64 pad0 = static_cast<int64>(paddings_data(i, 0));
     const int64 pad1 = static_cast<int64>(paddings_data(i, 1));
     if (pad0 < 0 || pad1 < 0) {
diff --git a/tensorflow/core/ops/array_ops_test.cc b/tensorflow/core/ops/array_ops_test.cc
index bc99fb09e5..adb1320fc7 100644
--- a/tensorflow/core/ops/array_ops_test.cc
+++ b/tensorflow/core/ops/array_ops_test.cc
@@ -1626,4 +1626,16 @@ TEST(ArrayOpsTest, QuantizedConcat_ShapeFn) {
   // Note that other cases of concat are covered in the Concat tests.
 }
 
+TEST(StateOpsTest, _ParallelConcatStart_ShapeFn) {
+  ShapeInferenceTestOp op("_ParallelConcatStart");
+  TensorShape shape({1, 2, 3});
+  TensorShapeProto shape_proto;
+  shape.AsProto(&shape_proto);
+  TF_ASSERT_OK(NodeDefBuilder("test", "_ParallelConcatStart")
+                   .Attr("shape", shape_proto)
+                   .Attr("dtype", DT_FLOAT)
+                   .Finalize(&op.node_def));
+  INFER_OK(op, "", "[1,2,3]");
+}
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index 10b5df91f1..7e7d499f88 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -120,7 +120,7 @@ REGISTER_OP("DynamicStitch")
       TF_RETURN_IF_ERROR(c->GetAttr("N", &num_partitions));
 
       ShapeHandle extra_shape = c->UnknownShape();
-      for (int i = 0; i < num_partitions; ++i) {
+      for (int64 i = 0; i < num_partitions; ++i) {
         ShapeHandle indices_shape = c->input(i);
         ShapeHandle data_shape = c->input(i + num_partitions);
         if (!c->RankKnown(indices_shape)) {
diff --git a/tensorflow/core/ops/random_ops.cc b/tensorflow/core/ops/random_ops.cc
index 7b2da9d8e6..392ac32010 100644
--- a/tensorflow/core/ops/random_ops.cc
+++ b/tensorflow/core/ops/random_ops.cc
@@ -23,17 +23,6 @@ using shape_inference::DimensionHandle;
 using shape_inference::InferenceContext;
 using shape_inference::ShapeHandle;
 
-namespace {
-
-Status RandomShape(InferenceContext* c) {
-  ShapeHandle out;
-  TF_RETURN_IF_ERROR(c->MakeShapeFromShapeTensor(0, &out));
-  c->set_output(0, out);
-  return Status::OK();
-}
-
-}  // namepsace
-
 REGISTER_OP("RandomUniform")
     .Input("shape: T")
     .SetIsStateful()
@@ -42,7 +31,7 @@ REGISTER_OP("RandomUniform")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a uniform distribution.
 
@@ -69,7 +58,7 @@ REGISTER_OP("RandomUniformInt")
     .Attr("seed2: int = 0")
     .Attr("Tout: {int32, int64}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random integers from a uniform distribution.
 
@@ -100,7 +89,7 @@ REGISTER_OP("RandomStandardNormal")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a normal distribution.
 
@@ -128,7 +117,7 @@ REGISTER_OP("ParameterizedTruncatedNormal")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a normal distribution. The parameters may each be a
 scalar which applies to the entire output, or a vector of length shape[0] which
@@ -158,7 +147,7 @@ REGISTER_OP("TruncatedNormal")
     .Attr("seed2: int = 0")
     .Attr("dtype: {half,float,double}")
     .Attr("T: {int32, int64}")
-    .SetShapeFn(RandomShape)
+    .SetShapeFn(shape_inference::RandomShape)
     .Doc(R"doc(
 Outputs random values from a truncated normal distribution.
 
diff --git a/tensorflow/core/ops/set_ops.cc b/tensorflow/core/ops/set_ops.cc
index fad7007207..85d1335dcf 100644
--- a/tensorflow/core/ops/set_ops.cc
+++ b/tensorflow/core/ops/set_ops.cc
@@ -235,7 +235,7 @@ REGISTER_OP("SparseToSparseSetOperation")
       DimensionHandle input1_rank_dim = c->Dim(input1_shape_shape, 0);
       DimensionHandle output_rank_dim;
       if (c->ValueKnown(input0_rank_dim)) {
-        const int32 input0_rank = c->Value(input0_rank_dim);
+        const int64 input0_rank = c->Value(input0_rank_dim);
         if (input0_rank < 2) {
           return errors::InvalidArgument("Input 0, expected rank >= 2, got ",
                                          input0_rank, ".");
@@ -244,7 +244,7 @@ REGISTER_OP("SparseToSparseSetOperation")
             c->WithValue(input1_rank_dim, input0_rank, &input1_rank_dim));
         output_rank_dim = input0_rank_dim;
       } else if (c->ValueKnown(input1_rank_dim)) {
-        const int32 input1_rank = c->Value(input1_rank_dim);
+        const int64 input1_rank = c->Value(input1_rank_dim);
         if (input1_rank < 2) {
           return errors::InvalidArgument("Input 1, expected rank >= 2, got ",
                                          input1_rank, ".");
diff --git a/tensorflow/core/platform/cpu_info.cc b/tensorflow/core/platform/cpu_info.cc
index 9edf2de64c..906826e6f8 100644
--- a/tensorflow/core/platform/cpu_info.cc
+++ b/tensorflow/core/platform/cpu_info.cc
@@ -68,7 +68,7 @@ int GetXCR0EAX() {
 
 // Structure for basic CPUID info
 class CPUIDInfo {
-public:
+ public:
   CPUIDInfo()
       : have_adx_(0),
         have_aes_(0),
diff --git a/tensorflow/core/protobuf/rewriter_config.proto b/tensorflow/core/protobuf/rewriter_config.proto
index 6e9eff6225..63821cb55e 100644
--- a/tensorflow/core/protobuf/rewriter_config.proto
+++ b/tensorflow/core/protobuf/rewriter_config.proto
@@ -10,6 +10,15 @@ message RewriterConfig {
   bool optimize_tensor_layout = 1;
   bool disable_model_pruning = 2;
   bool constant_folding = 3;
+
+  enum MemOptType {
+    // Fully disabled
+    NO_MEM_OPT = 0;
+    // Driven by manual annotations
+    MANUAL = 1;
+  }
+  MemOptType memory_optimization = 4;
+
   // If non-empty, will use this as an alternative way to specify a list of
   // optimizations to turn on and the order of the optimizations.
   repeated string optimizers = 100;
diff --git a/tensorflow/core/util/cuda_kernel_helper.h b/tensorflow/core/util/cuda_kernel_helper.h
index 8bb4ca8ff8..8a3f6c587e 100644
--- a/tensorflow/core/util/cuda_kernel_helper.h
+++ b/tensorflow/core/util/cuda_kernel_helper.h
@@ -128,6 +128,28 @@ __device__ __host__ inline T ldg(const T* address) {
 #endif
 }
 
+template <>
+__device__ __host__ inline std::complex<float> ldg(
+    const std::complex<float>* address) {
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 350
+  float2 mem = __ldg(reinterpret_cast<const float2*>(address));
+  return std::complex<float>(mem.x, mem.y);
+#else
+  return *address;
+#endif
+}
+
+template <>
+__device__ __host__ inline std::complex<double> ldg(
+    const std::complex<double>* address) {
+#if defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 350
+  double2 mem = __ldg(reinterpret_cast<const double2*>(address));
+  return std::complex<double>(mem.x, mem.y);
+#else
+  return *address;
+#endif
+}
+
 // CUDA provides atomic ops, but not for all types.  We provide wrappers
 // for some ops and provide implementation for all reasonable types.
 #define CUDA_ATOMIC_WRAPPER(op, T) \
diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
index b8989b2c3e..80a910e689 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
@@ -249,8 +249,10 @@ BundleWriter::BundleWriter(Env* env, StringPiece prefix)
                                      random::New64())),
       out_(nullptr),
       size_(0) {
-  status_ =
-      env_->CreateDir(io::Dirname(prefix_).ToString());  // Ignores errors.
+  status_ = env_->CreateDir(io::Dirname(prefix_).ToString());
+  if (!status_.ok() && !errors::IsAlreadyExists(status_)) {
+    return;
+  }
   const string filename = DataFilename(prefix_, 0, 1);
   std::unique_ptr<WritableFile> wrapper;
   status_ = env_->NewWritableFile(tmp_data_path_, &wrapper);
@@ -264,9 +266,9 @@ BundleWriter::BundleWriter(Env* env, StringPiece prefix)
 BundleWriter::~BundleWriter() { CHECK(out_ == nullptr); }
 
 Status BundleWriter::Add(StringPiece key, const Tensor& val) {
+  if (!status_.ok()) return status_;
   CHECK_NE(key, kHeaderEntryKey);
   const string key_string = key.ToString();
-  if (!status_.ok()) return status_;
   if (entries_.find(key_string) != entries_.end()) {
     status_ = errors::InvalidArgument("Adding duplicate key: ", key);
     return status_;
@@ -301,14 +303,14 @@ Status BundleWriter::AddSlice(StringPiece full_tensor_key,
                               const TensorShape& full_tensor_shape,
                               const TensorSlice& slice_spec,
                               const Tensor& slice_tensor) {
+  if (!status_.ok()) return status_;
+  CHECK_NE(full_tensor_key, kHeaderEntryKey);
+
   // If just a singleton full slice, use the regular Add() to be more efficient.
   if (IsFullSlice(slice_spec, full_tensor_shape)) {
     return Add(full_tensor_key, slice_tensor);
   }
 
-  CHECK_NE(full_tensor_key, kHeaderEntryKey);
-  if (!status_.ok()) return status_;
-
   // Inserts/updates the full tensor's metadata entry.
   //
   // In the case of a sharded save, MergeBundles() is responsible for merging
@@ -516,7 +518,8 @@ Status MergeBundles(Env* env, gtl::ArraySlice<string> prefixes,
   // Merges all metadata tables.
   // TODO(zhifengc): KeyValue sorter if it becomes too big.
   MergeState merge;
-  env->CreateDir(io::Dirname(merged_prefix).ToString()).IgnoreError();
+  Status status = env->CreateDir(io::Dirname(merged_prefix).ToString());
+  if (!status.ok() && !errors::IsAlreadyExists(status)) return status;
   for (int i = 0; i < prefixes.size(); ++i) {
     TF_RETURN_IF_ERROR(MergeOneBundle(env, prefixes[i], &merge));
   }
@@ -534,7 +537,6 @@ Status MergeBundles(Env* env, gtl::ArraySlice<string> prefixes,
   std::unique_ptr<WritableFile> merged_metadata;
   TF_RETURN_IF_ERROR(
       env->NewWritableFile(MetaFilename(merged_prefix), &merged_metadata));
-  Status status;
   {
     table::TableBuilder builder(table::Options(), merged_metadata.get());
     // Header entry.
diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.h b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
index bca3910f59..676bfe4df6 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.h
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
@@ -100,6 +100,10 @@ extern const int kTensorBundleVersion;
 extern const char* const kHeaderEntryKey;
 
 // Builds a string-string table of tensor names to BundleEntryProto (metadata).
+//
+// On construction, attempts to create a directory given by the dirname of
+// "prefix", so "status()" must be checked before calling any member functions.
+//
 // All threads accessing the same BundleWriter must synchronize.
 class BundleWriter {
  public:
diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 6ae61b43a0..6116c7d87f 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -323,6 +323,10 @@ When run, it produces
 W: [-0.9999969] b: [ 0.99999082] loss: 5.69997e-11
 ```
 
+Notice that the loss is a very small number (close to zero). If you run this
+program your loss will not be exactly the same, because the model is initialized
+with random values.
+
 This more complicated program can still be visualized in TensorBoard
 ![TensorBoard final model visualization](../images/getting_started_final.png)
 
diff --git a/tensorflow/docs_src/programmers_guide/debugger.md b/tensorflow/docs_src/programmers_guide/debugger.md
index 6f442e6e0c..10eebf6f42 100644
--- a/tensorflow/docs_src/programmers_guide/debugger.md
+++ b/tensorflow/docs_src/programmers_guide/debugger.md
@@ -130,6 +130,8 @@ Try the following commands at the `tfdbg>` prompt (referencing the code at
 | `lo -r hidden/Relu:0` | List the recipients of the output of the node `hidden/Relu`, recursively—i.e., the output recipient tree. |
 | `lt -n softmax.*` | List all dumped tensors whose names match the regular-expression pattern `softmax.*`. |
 | `lt -t MatMul` | List all dumped tensors whose node type is `MatMul`. |
+| `ls` | List all Python source files responsible for constructing the nodes (and tensors) in the current graph. |
+| `ls -n softmax.*` | List Python source files responsible for constructing the nodes whose names match the pattern `softmax.*`. |
 | `ps /path/to/source.py` | Print the Python source file source.py, with the lines annotated with the ops created at each of them, respectively. |
 | `ps -t /path/to/source.py` | Same as the command above, but perform annotation using dumped Tensors, instead of ops. |
 | `ps -b 30 /path/to/source.py` | Annotate source.py beginning at line 30. |
diff --git a/tensorflow/docs_src/tutorials/recurrent.md b/tensorflow/docs_src/tutorials/recurrent.md
index a1c0532f5a..8cc6cf15ef 100644
--- a/tensorflow/docs_src/tutorials/recurrent.md
+++ b/tensorflow/docs_src/tutorials/recurrent.md
@@ -173,15 +173,22 @@ final_state = state
 
 ## Run the Code
 
-Start by cloning the [TensorFlow models repo](https://github.com/tensorflow/models) from GitHub.
-You'll also need to download the PTB dataset, as discussed at the beginning of
-this tutorial; we'll assume the dataset is located in `/tmp/simple-examples/data`.
+Before running the code, download the PTB dataset, as discussed at the beginning
+of this tutorial.  Then, extract the PTB dataset underneath your home directory
+as follows:
 
-Run the following commands:
+```bsh
+tar xvfz simple-examples.tgz -C $HOME
+```
+_(Note: On Windows, you may need to use
+[other tools](https://wiki.haskell.org/How_to_unpack_a_tar_file_in_Windows).)_
+
+Now, clone the [TensorFlow models repo](https://github.com/tensorflow/models)
+from GitHub. Run the following commands:
 
-```bash
+```bsh
 cd models/tutorials/rnn/ptb
-python ptb_word_lm.py --data_path=/tmp/simple-examples/data/ --model=small
+python ptb_word_lm.py --data_path=$HOME/simple-examples/data/ --model=small
 ```
 
 There are 3 supported model configurations in the tutorial code: "small",
diff --git a/tensorflow/python/client/session.py b/tensorflow/python/client/session.py
index 6900ac9a4f..5b50df3ed3 100644
--- a/tensorflow/python/client/session.py
+++ b/tensorflow/python/client/session.py
@@ -1094,8 +1094,9 @@ class BaseSession(SessionInterface):
     if tensors_to_delete:
       feeds = {}
       fetches = []
-      for tensor_handle in tensors_to_delete:
+      for deleter_key, tensor_handle in enumerate(tensors_to_delete):
         holder, deleter = session_ops._get_handle_deleter(self.graph,
+                                                          deleter_key,
                                                           tensor_handle)
         feeds[holder] = tensor_handle
         fetches.append(deleter)
diff --git a/tensorflow/python/client/tf_session_helper.cc b/tensorflow/python/client/tf_session_helper.cc
index 99c154bd99..930eb5f283 100644
--- a/tensorflow/python/client/tf_session_helper.cc
+++ b/tensorflow/python/client/tf_session_helper.cc
@@ -375,6 +375,8 @@ Status GetPyArrayDescrForTensor(const TF_Tensor* tensor,
     PyObject* fields = PyList_New(1);
     PyList_SetItem(fields, 0, field);
     int convert_result = PyArray_DescrConverter(fields, descr);
+    Py_CLEAR(field);
+    Py_CLEAR(fields);
     if (convert_result != 1) {
       return errors::Internal("Failed to create numpy array description for ",
                               "TF_RESOURCE-type tensor");
diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 56dd7ceba5..0b87660e5d 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -185,6 +185,7 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":base_ui",
+        ":cli_shared",
         ":command_parser",
         ":curses_widgets",
         ":debugger_cli_common",
@@ -375,6 +376,7 @@ py_test(
         ":debug_utils",
         ":source_utils",
         "//tensorflow/python:client",
+        "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
diff --git a/tensorflow/python/debug/cli/analyzer_cli.py b/tensorflow/python/debug/cli/analyzer_cli.py
index 0c8004e254..95d3f3f249 100644
--- a/tensorflow/python/debug/cli/analyzer_cli.py
+++ b/tensorflow/python/debug/cli/analyzer_cli.py
@@ -345,6 +345,25 @@ class DebugAnalyzer(object):
         help="Print source beginning at line number (1-based.)")
     self._arg_parsers["print_source"] = ap
 
+    # Parser for list_source.
+    ap = argparse.ArgumentParser(
+        description="List source files responsible for constructing nodes and "
+        "tensors present in the run().",
+        usage=argparse.SUPPRESS)
+    ap.add_argument(
+        "-p",
+        "--path_filter",
+        type=str,
+        default="",
+        help="Regular expression filter for file path.")
+    ap.add_argument(
+        "-n",
+        "--node_name_filter",
+        type=str,
+        default="",
+        help="Regular expression filter for node name.")
+    self._arg_parsers["list_source"] = ap
+
     # TODO(cais): Implement list_nodes.
 
   def add_tensor_filter(self, filter_name, filter_callable):
@@ -979,6 +998,15 @@ class DebugAnalyzer(object):
 
     return output
 
+  def _reconstruct_print_source_command(self,
+                                        parsed,
+                                        line_begin_decrease=0,
+                                        max_elements_per_line_increase=0):
+    return "ps %s %s -b %d -m %d" % (
+        parsed.source_file_path, "-t" if parsed.tensors else "",
+        max(parsed.line_begin - line_begin_decrease, 1),
+        parsed.max_elements_per_line + max_elements_per_line_increase)
+
   def print_source(self, args, screen_info=None):
     """Print the content of a source file."""
     del screen_info  # Unused.
@@ -1000,12 +1028,20 @@ class DebugAnalyzer(object):
 
     labeled_source_lines = []
     if parsed.line_begin > 1:
-      labeled_source_lines.append(
-          RL("(... Omitted %d source lines ...)" % (parsed.line_begin - 1),
-             "bold"))
+      omitted_info_line = RL(
+          "(... Omitted %d source lines ...) " % (parsed.line_begin - 1),
+          "bold")
+      omitted_info_line += RL(
+          "+5",
+          debugger_cli_common.MenuItem(
+              None,
+              self._reconstruct_print_source_command(
+                  parsed, line_begin_decrease=5)))
+      labeled_source_lines.append(omitted_info_line)
 
     for i, line in enumerate(source_lines[parsed.line_begin - 1:]):
-      annotated_line = RL("L%d" % (i + parsed.line_begin), "yellow")
+      annotated_line = RL("L%d" % (i + parsed.line_begin),
+                          cli_shared.COLOR_YELLOW)
       annotated_line += " " * (line_num_width - len(annotated_line))
       annotated_line += line
       labeled_source_lines.append(annotated_line)
@@ -1014,11 +1050,17 @@ class DebugAnalyzer(object):
         sorted_elements = sorted(source_annotation[i + parsed.line_begin])
         for k, element in enumerate(sorted_elements):
           if k >= parsed.max_elements_per_line:
-            labeled_source_lines.append(
-                "    (... Omitted %d of %d %s ...)" % (
-                    len(sorted_elements) - parsed.max_elements_per_line,
-                    len(sorted_elements),
-                    "tensor(s)" if parsed.tensors else "op(s)"))
+            omitted_info_line = RL("    (... Omitted %d of %d %s ...) " % (
+                len(sorted_elements) - parsed.max_elements_per_line,
+                len(sorted_elements),
+                "tensor(s)" if parsed.tensors else "op(s)"))
+            omitted_info_line += RL(
+                "+5",
+                debugger_cli_common.MenuItem(
+                    None,
+                    self._reconstruct_print_source_command(
+                        parsed, max_elements_per_line_increase=5)))
+            labeled_source_lines.append(omitted_info_line)
             break
 
           label = RL(" " * 4)
@@ -1026,7 +1068,7 @@ class DebugAnalyzer(object):
               debug_data.get_node_name(element)):
             attribute = debugger_cli_common.MenuItem("", "pt %s" % element)
           else:
-            attribute = "blue"
+            attribute = cli_shared.COLOR_BLUE
 
           label += RL(element, attribute)
           labeled_source_lines.append(label)
@@ -1036,6 +1078,105 @@ class DebugAnalyzer(object):
     _add_main_menu(output, node_name=None)
     return output
 
+  def _make_source_table(self, source_list, is_tf_py_library):
+    """Make a table summarizing the source files that create nodes and tensors.
+
+    Args:
+      source_list: List of source files and related information as a list of
+        tuples (file_path, is_tf_library, num_nodes, num_tensors, num_dumps,
+        first_line).
+      is_tf_py_library: (`bool`) whether this table is for files that belong
+        to the TensorFlow Python library.
+
+    Returns:
+      The table as a `debugger_cli_common.RichTextLines` object.
+    """
+    path_head = "Source file path"
+    num_nodes_head = "#(nodes)"
+    num_tensors_head = "#(tensors)"
+    num_dumps_head = "#(tensor dumps)"
+
+    if is_tf_py_library:
+      # Use color to mark files that are guessed to belong to TensorFlow Python
+      # library.
+      color = cli_shared.COLOR_GRAY
+      lines = [RL("TensorFlow Python library file(s):", color)]
+    else:
+      color = cli_shared.COLOR_WHITE
+      lines = [RL("File(s) outside TensorFlow Python library:", color)]
+
+    if not source_list:
+      lines.append(RL("[No files.]"))
+      lines.append(RL())
+      return debugger_cli_common.rich_text_lines_from_rich_line_list(lines)
+
+    path_column_width = max(
+        max([len(item[0]) for item in source_list]), len(path_head)) + 1
+    num_nodes_column_width = max(
+        max([len(str(item[2])) for item in source_list]),
+        len(num_nodes_head)) + 1
+    num_tensors_column_width = max(
+        max([len(str(item[3])) for item in source_list]),
+        len(num_tensors_head)) + 1
+
+    head = RL(path_head + " " * (path_column_width - len(path_head)), color)
+    head += RL(num_nodes_head + " " * (
+        num_nodes_column_width - len(num_nodes_head)), color)
+    head += RL(num_tensors_head + " " * (
+        num_tensors_column_width - len(num_tensors_head)), color)
+    head += RL(num_dumps_head, color)
+
+    lines.append(head)
+
+    for item in source_list:
+      path_attributes = [debugger_cli_common.MenuItem(
+          None, "ps %s -b %d" % (item[0], item[5])), color]
+
+      line = RL(item[0], path_attributes)
+      line += " " * (path_column_width - len(line))
+      line += RL(
+          str(item[2]) + " " * (num_nodes_column_width - len(str(item[2]))),
+          color)
+      line += RL(
+          str(item[3]) + " " * (num_tensors_column_width - len(str(item[3]))),
+          color)
+      line += RL(str(item[4]), color)
+      lines.append(line)
+    lines.append(RL())
+
+    return debugger_cli_common.rich_text_lines_from_rich_line_list(lines)
+
+  def list_source(self, args, screen_info=None):
+    """List Python source files that constructed nodes and tensors."""
+    del screen_info  # Unused.
+
+    parsed = self._arg_parsers["list_source"].parse_args(args)
+    source_list = source_utils.list_source_files_against_dump(
+        self._debug_dump,
+        path_regex_whitelist=parsed.path_filter,
+        node_name_regex_whitelist=parsed.node_name_filter)
+
+    top_lines = [
+        RL("List of source files that created nodes in this run", "bold")]
+    if parsed.path_filter:
+      top_lines.append(
+          RL("File path regex filter: \"%s\"" % parsed.path_filter))
+    if parsed.node_name_filter:
+      top_lines.append(
+          RL("Node name regex filter: \"%s\"" % parsed.node_name_filter))
+    top_lines.append(RL())
+    output = debugger_cli_common.rich_text_lines_from_rich_line_list(top_lines)
+    if not source_list:
+      output.append("[No source file information.]")
+      return output
+
+    output.extend(self._make_source_table(
+        [item for item in source_list if not item[1]], False))
+    output.extend(self._make_source_table(
+        [item for item in source_list if item[1]], True))
+    _add_main_menu(output, node_name=None)
+    return output
+
   def _list_inputs_or_outputs(self,
                               recursive,
                               node_name,
@@ -1395,6 +1536,11 @@ def create_analyzer_ui(debug_dump,
       analyzer.print_source,
       analyzer.get_help("print_source"),
       prefix_aliases=["ps"])
+  cli.register_command_handler(
+      "list_source",
+      analyzer.list_source,
+      analyzer.get_help("list_source"),
+      prefix_aliases=["ls"])
 
   dumped_tensor_names = []
   for datum in debug_dump.dumped_tensor_data:
diff --git a/tensorflow/python/debug/cli/analyzer_cli_test.py b/tensorflow/python/debug/cli/analyzer_cli_test.py
index bb2d72e2e4..185d395126 100644
--- a/tensorflow/python/debug/cli/analyzer_cli_test.py
+++ b/tensorflow/python/debug/cli/analyzer_cli_test.py
@@ -28,6 +28,7 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.debug.cli import analyzer_cli
+from tensorflow.python.debug.cli import cli_shared
 from tensorflow.python.debug.cli import command_parser
 from tensorflow.python.debug.cli import debugger_cli_common
 from tensorflow.python.debug.lib import debug_data
@@ -569,6 +570,11 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         cls._analyzer.print_source,
         cls._analyzer.get_help("print_source"),
         prefix_aliases=["ps"])
+    cls._registry.register_command_handler(
+        "list_source",
+        cls._analyzer.list_source,
+        cls._analyzer.get_help("list_source"),
+        prefix_aliases=["ls"])
 
   @classmethod
   def tearDownClass(cls):
@@ -906,7 +912,7 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         ["ERROR: There is no node named \"bar\" in the partition graphs"],
         out.lines)
     # Check color indicating error.
-    self.assertEqual({0: [(0, 59, "red")]}, out.font_attr_segs)
+    self.assertEqual({0: [(0, 59, cli_shared.COLOR_RED)]}, out.font_attr_segs)
     check_main_menu(self, out, list_tensors_enabled=True)
 
   def testPrintTensor(self):
@@ -1172,7 +1178,7 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
                      out.font_attr_segs[index + 1][0][2].content)
     # simple_mul_add/u/Assign is not used in this run because the Variable has
     # already been initialized.
-    self.assertEqual("blue", out.font_attr_segs[index + 2][0][2])
+    self.assertEqual(cli_shared.COLOR_BLUE, out.font_attr_segs[index + 2][0][2])
     self.assertEqual("pt simple_mul_add/u/read",
                      out.font_attr_segs[index + 3][0][2].content)
 
@@ -1234,6 +1240,12 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         screen_info={"cols": 80})
 
     self.assertIn("Omitted 2 source lines", out.lines[0])
+    self.assertTrue(out.lines[0].endswith("+5"))
+    expand_lines_command = out.font_attr_segs[0][-1][2].content
+    self.assertStartsWith(expand_lines_command,
+                          "ps %s " % self._curr_file_path)
+    self.assertIn("-b 1", expand_lines_command)
+
     self.assertIsNone(self._findSourceLine(out, 1))
     self.assertIsNone(self._findSourceLine(out, 2))
     self.assertIsNotNone(self._findSourceLine(out, 3))
@@ -1250,7 +1262,7 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
                      out.font_attr_segs[index + 1][0][2].content)
     # simple_mul_add/u/Assign is not used in this run because the Variable has
     # already been initialized.
-    self.assertEqual("blue", out.font_attr_segs[index + 2][0][2])
+    self.assertEqual(cli_shared.COLOR_BLUE, out.font_attr_segs[index + 2][0][2])
     self.assertEqual("pt simple_mul_add/u/read",
                      out.font_attr_segs[index + 3][0][2].content)
 
@@ -1266,10 +1278,81 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         ["L%d         u = variables.Variable(u_init, name=u_name)" %
          self._u_line_number,
          "    simple_mul_add/u",
-         "    (... Omitted 2 of 3 op(s) ...)"],
+         "    (... Omitted 2 of 3 op(s) ...) +5"],
         out.lines[index : index + 3])
     self.assertEqual("pt simple_mul_add/u",
                      out.font_attr_segs[index + 1][0][2].content)
+    more_elements_command = out.font_attr_segs[index + 2][-1][2].content
+    self.assertStartsWith(more_elements_command,
+                          "ps %s " % self._curr_file_path)
+    self.assertIn(" -m 6", more_elements_command)
+
+  def testListSourceWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command("list_source", [])
+
+    non_tf_lib_files_start = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("Source file path")][0] + 1
+    non_tf_lib_files_end = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("TensorFlow Python library file(s):")][0] - 1
+    non_tf_lib_files = [
+        line.split(" ")[0] for line
+        in out.lines[non_tf_lib_files_start : non_tf_lib_files_end]]
+    self.assertIn(self._curr_file_path, non_tf_lib_files)
+
+    # Check that the TF library files are marked with special color attribute.
+    for i in xrange(non_tf_lib_files_end + 1, len(out.lines)):
+      if not out.lines[i]:
+        continue
+      for attr_seg in  out.font_attr_segs[i]:
+        self.assertTrue(cli_shared.COLOR_GRAY in attr_seg[2] or
+                        attr_seg[2] == cli_shared.COLOR_GRAY)
+
+  def testListSourceWithNodeNameFilterWithMatchesWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command("list_source", ["-n", ".*/read"])
+
+    self.assertStartsWith(out.lines[1], "Node name regex filter: \".*/read\"")
+
+    non_tf_lib_files_start = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("Source file path")][0] + 1
+    non_tf_lib_files_end = [
+        i for i in xrange(len(out.lines))
+        if out.lines[i].startswith("TensorFlow Python library file(s):")][0] - 1
+    non_tf_lib_files = [
+        line.split(" ")[0] for line
+        in out.lines[non_tf_lib_files_start : non_tf_lib_files_end]]
+    self.assertIn(self._curr_file_path, non_tf_lib_files)
+
+    # Check that the TF library files are marked with special color attribute.
+    for i in xrange(non_tf_lib_files_end + 1, len(out.lines)):
+      if not out.lines[i]:
+        continue
+      for attr_seg in  out.font_attr_segs[i]:
+        self.assertTrue(cli_shared.COLOR_GRAY in attr_seg[2] or
+                        attr_seg[2] == cli_shared.COLOR_GRAY)
+
+  def testListSourceWithNodeNameFilterWithNoMatchesWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command("list_source", ["-n", "^$"])
+
+    self.assertEqual([
+        "List of source files that created nodes in this run",
+        "Node name regex filter: \"^$\"", "",
+        "[No source file information.]"], out.lines)
+
+  def testListSourceWithPathAndNodeNameFiltersWorks(self):
+    self._debug_dump.set_python_graph(self._sess.graph)
+    out = self._registry.dispatch_command(
+        "list_source", ["-p", self._curr_file_path, "-n", ".*read"])
+
+    self.assertEqual([
+        "List of source files that created nodes in this run",
+        "File path regex filter: \"%s\"" % self._curr_file_path,
+        "Node name regex filter: \".*read\"", ""], out.lines[:4])
 
 
 class AnalyzerCLIPrintLargeTensorTest(test_util.TensorFlowTestCase):
diff --git a/tensorflow/python/debug/cli/cli_shared.py b/tensorflow/python/debug/cli/cli_shared.py
index b195347950..8ff0916761 100644
--- a/tensorflow/python/debug/cli/cli_shared.py
+++ b/tensorflow/python/debug/cli/cli_shared.py
@@ -32,6 +32,16 @@ RL = debugger_cli_common.RichLine
 # when printing the value of the tensor.
 DEFAULT_NDARRAY_DISPLAY_THRESHOLD = 2000
 
+COLOR_BLACK = "black"
+COLOR_BLUE = "blue"
+COLOR_CYAN = "cyan"
+COLOR_GRAY = "gray"
+COLOR_GREEN = "green"
+COLOR_MAGENTA = "magenta"
+COLOR_RED = "red"
+COLOR_WHITE = "white"
+COLOR_YELLOW = "yellow"
+
 
 def bytes_to_readable_str(num_bytes, include_b=False):
   """Generate a human-readable string representing number of bytes.
@@ -154,7 +164,7 @@ def error(msg):
   """
 
   return debugger_cli_common.rich_text_lines_from_rich_line_list([
-      RL("ERROR: " + msg, "red")])
+      RL("ERROR: " + msg, COLOR_RED)])
 
 
 def _get_fetch_name(fetch):
diff --git a/tensorflow/python/debug/cli/curses_ui.py b/tensorflow/python/debug/cli/curses_ui.py
index d8d3bce3de..b7549b406b 100644
--- a/tensorflow/python/debug/cli/curses_ui.py
+++ b/tensorflow/python/debug/cli/curses_ui.py
@@ -20,6 +20,7 @@ from __future__ import print_function
 import collections
 import curses
 from curses import textpad
+import os
 import signal
 import sys
 import threading
@@ -27,6 +28,7 @@ import threading
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.python.debug.cli import base_ui
+from tensorflow.python.debug.cli import cli_shared
 from tensorflow.python.debug.cli import command_parser
 from tensorflow.python.debug.cli import curses_widgets
 from tensorflow.python.debug.cli import debugger_cli_common
@@ -42,6 +44,9 @@ _SCROLL_HOME = "home"
 _SCROLL_END = "end"
 _SCROLL_TO_LINE_INDEX = "scroll_to_line_index"
 
+_COLOR_READY_COLORTERMS = ["gnome-terminal", "xfce4-terminal"]
+_COLOR_ENABLED_TERM = "xterm-256color"
+
 
 def _get_command_from_line_attr_segs(mouse_x, attr_segs):
   """Attempt to extract command from the attribute segments of a line.
@@ -77,7 +82,7 @@ class ScrollBar(object):
   event in the screen region it occupies.
   """
 
-  BASE_ATTR = "black_on_white"
+  BASE_ATTR = cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE
 
   def __init__(self,
                min_x,
@@ -225,27 +230,36 @@ class CursesUI(base_ui.BaseUI):
   }
 
   _FOREGROUND_COLORS = {
-      "white": curses.COLOR_WHITE,
-      "red": curses.COLOR_RED,
-      "green": curses.COLOR_GREEN,
-      "yellow": curses.COLOR_YELLOW,
-      "blue": curses.COLOR_BLUE,
-      "cyan": curses.COLOR_CYAN,
-      "magenta": curses.COLOR_MAGENTA,
-      "black": curses.COLOR_BLACK,
+      cli_shared.COLOR_WHITE: curses.COLOR_WHITE,
+      cli_shared.COLOR_RED: curses.COLOR_RED,
+      cli_shared.COLOR_GREEN: curses.COLOR_GREEN,
+      cli_shared.COLOR_YELLOW: curses.COLOR_YELLOW,
+      cli_shared.COLOR_BLUE: curses.COLOR_BLUE,
+      cli_shared.COLOR_CYAN: curses.COLOR_CYAN,
+      cli_shared.COLOR_MAGENTA: curses.COLOR_MAGENTA,
+      cli_shared.COLOR_BLACK: curses.COLOR_BLACK,
   }
   _BACKGROUND_COLORS = {
-      "white": curses.COLOR_WHITE,
-      "black": curses.COLOR_BLACK,
+      "transparent": -1,
+      cli_shared.COLOR_WHITE: curses.COLOR_WHITE,
+      cli_shared.COLOR_BLACK: curses.COLOR_BLACK,
   }
 
   # Font attribute for search and highlighting.
-  _SEARCH_HIGHLIGHT_FONT_ATTR = "black_on_white"
-  _ARRAY_INDICES_COLOR_PAIR = "black_on_white"
-  _ERROR_TOAST_COLOR_PAIR = "red_on_white"
-  _INFO_TOAST_COLOR_PAIR = "blue_on_white"
-  _STATUS_BAR_COLOR_PAIR = "black_on_white"
-  _UI_WAIT_COLOR_PAIR = "magenta_on_white"
+  _SEARCH_HIGHLIGHT_FONT_ATTR = (
+      cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE)
+  _ARRAY_INDICES_COLOR_PAIR = (
+      cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE)
+  _ERROR_TOAST_COLOR_PAIR = (
+      cli_shared.COLOR_RED + "_on_" + cli_shared.COLOR_WHITE)
+  _INFO_TOAST_COLOR_PAIR = (
+      cli_shared.COLOR_BLUE + "_on_" + cli_shared.COLOR_WHITE)
+  _STATUS_BAR_COLOR_PAIR = (
+      cli_shared.COLOR_BLACK + "_on_" + cli_shared.COLOR_WHITE)
+  _UI_WAIT_COLOR_PAIR = (
+      cli_shared.COLOR_MAGENTA + "_on_" + cli_shared.COLOR_WHITE)
+  _NAVIGATION_WARNING_COLOR_PAIR = (
+      cli_shared.COLOR_RED + "_on_" + cli_shared.COLOR_WHITE)
 
   _UI_WAIT_MESSAGE = "Processing..."
 
@@ -370,29 +384,43 @@ class CursesUI(base_ui.BaseUI):
 
     Creates curses stdscr and initialize the color pairs for display.
     """
-
+    # If the terminal type is color-ready, enable it.
+    if os.getenv("COLORTERM") in _COLOR_READY_COLORTERMS:
+      os.environ["TERM"] = _COLOR_ENABLED_TERM
     self._stdscr = curses.initscr()
     self._command_window = None
+    self._screen_color_init()
 
-    # Prepare color pairs.
+  def _screen_color_init(self):
+    """Initialization of screen colors."""
     curses.start_color()
-
+    curses.use_default_colors()
     self._color_pairs = {}
     color_index = 0
 
+    # Prepare color pairs.
     for fg_color in self._FOREGROUND_COLORS:
       for bg_color in self._BACKGROUND_COLORS:
-
         color_index += 1
         curses.init_pair(color_index, self._FOREGROUND_COLORS[fg_color],
                          self._BACKGROUND_COLORS[bg_color])
 
         color_name = fg_color
-        if bg_color != "black":
+        if bg_color != "transparent":
           color_name += "_on_" + bg_color
 
         self._color_pairs[color_name] = curses.color_pair(color_index)
 
+    # Try getting color(s) available only under 256-color support.
+    try:
+      color_index += 1
+      curses.init_pair(color_index, 245, -1)
+      self._color_pairs[cli_shared.COLOR_GRAY] = curses.color_pair(color_index)
+    except curses.error:
+      # Use fall-back color(s):
+      self._color_pairs[cli_shared.COLOR_GRAY] = (
+          self._color_pairs[cli_shared.COLOR_GREEN])
+
     # A_BOLD or A_BLINK is not really a "color". But place it here for
     # convenience.
     self._color_pairs["bold"] = curses.A_BOLD
@@ -400,7 +428,7 @@ class CursesUI(base_ui.BaseUI):
     self._color_pairs["underline"] = curses.A_UNDERLINE
 
     # Default color pair to use when a specified color pair does not exist.
-    self._default_color_pair = self._color_pairs["white"]
+    self._default_color_pair = self._color_pairs[cli_shared.COLOR_WHITE]
 
   def _screen_launch(self, enable_mouse_on_start):
     """Launch the curses screen."""
@@ -588,7 +616,7 @@ class CursesUI(base_ui.BaseUI):
         scroll_position = item.scroll_position
       else:
         self._toast("At the LATEST in navigation history!",
-                    color="red_on_white")
+                    color=self._NAVIGATION_WARNING_COLOR_PAIR)
         return
     else:
       if self._nav_history.can_go_back():
@@ -596,7 +624,7 @@ class CursesUI(base_ui.BaseUI):
         scroll_position = item.scroll_position
       else:
         self._toast("At the OLDEST in navigation history!",
-                    color="red_on_white")
+                    color=self._NAVIGATION_WARNING_COLOR_PAIR)
         return
 
     self._display_output(item.screen_output)
@@ -959,7 +987,7 @@ class CursesUI(base_ui.BaseUI):
       self._curr_wrapped_output.lines.append("Output cut off at %d lines!" %
                                              self.max_output_lines)
       self._curr_wrapped_output.font_attr_segs[self.max_output_lines] = [
-          (0, len(output.lines[-1]), "magenta")
+          (0, len(output.lines[-1]), cli_shared.COLOR_MAGENTA)
       ]
 
     self._display_nav_bar()
@@ -1518,7 +1546,9 @@ class CursesUI(base_ui.BaseUI):
 
     pad, _, _ = self._display_lines(
         debugger_cli_common.RichTextLines(
-            message, font_attr_segs={0: [(0, len(message), color or "white")]}),
+            message,
+            font_attr_segs={
+                0: [(0, len(message), color or cli_shared.COLOR_WHITE)]}),
         0)
 
     right_end = min(len(message), self._max_x - 2)
diff --git a/tensorflow/python/debug/cli/stepper_cli.py b/tensorflow/python/debug/cli/stepper_cli.py
index aee0849832..94eb2754da 100644
--- a/tensorflow/python/debug/cli/stepper_cli.py
+++ b/tensorflow/python/debug/cli/stepper_cli.py
@@ -68,19 +68,19 @@ class NodeStepperCLI(object):
   _UPDATED_ATTRIBUTE = "bold"
 
   _STATE_COLORS = {
-      STATE_CONT: "green",
-      STATE_DIRTY_VARIABLE: "magenta",
-      STATE_DUMPED_INTERMEDIATE: "blue",
-      STATE_OVERRIDDEN: "yellow",
-      STATE_IS_PLACEHOLDER: "cyan",
-      STATE_UNFEEDABLE: "red",
+      STATE_CONT: cli_shared.COLOR_GREEN,
+      STATE_DIRTY_VARIABLE: cli_shared.COLOR_MAGENTA,
+      STATE_DUMPED_INTERMEDIATE: cli_shared.COLOR_BLUE,
+      STATE_OVERRIDDEN: cli_shared.COLOR_YELLOW,
+      STATE_IS_PLACEHOLDER: cli_shared.COLOR_CYAN,
+      STATE_UNFEEDABLE: cli_shared.COLOR_RED,
   }
 
   _FEED_COLORS = {
-      stepper.NodeStepper.FEED_TYPE_CLIENT: "white",
-      stepper.NodeStepper.FEED_TYPE_HANDLE: "green",
-      stepper.NodeStepper.FEED_TYPE_OVERRIDE: "yellow",
-      stepper.NodeStepper.FEED_TYPE_DUMPED_INTERMEDIATE: "blue",
+      stepper.NodeStepper.FEED_TYPE_CLIENT: cli_shared.COLOR_WHITE,
+      stepper.NodeStepper.FEED_TYPE_HANDLE: cli_shared.COLOR_GREEN,
+      stepper.NodeStepper.FEED_TYPE_OVERRIDE: cli_shared.COLOR_YELLOW,
+      stepper.NodeStepper.FEED_TYPE_DUMPED_INTERMEDIATE: cli_shared.COLOR_BLUE,
   }
 
   def __init__(self, node_stepper):
diff --git a/tensorflow/python/debug/lib/source_utils.py b/tensorflow/python/debug/lib/source_utils.py
index cc949932cb..b8a5daf860 100644
--- a/tensorflow/python/debug/lib/source_utils.py
+++ b/tensorflow/python/debug/lib/source_utils.py
@@ -18,13 +18,47 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
 import os
+import re
+
+_TENSORFLOW_BASEDIR = os.path.dirname(
+    os.path.dirname(os.path.dirname(os.path.dirname(
+        os.path.normpath(os.path.abspath(__file__))))))
 
 
 def _convert_watch_key_to_tensor_name(watch_key):
   return watch_key[:watch_key.rfind(":")]
 
 
+def _guess_is_tensorflow_py_library(py_file_path):
+  """Guess whether a Python source file is a part of the tensorflow library.
+
+  Special cases:
+    1) Returns False for unit-test files in the library (*_test.py),
+    2) Returns False for files under python/debug/examples.
+
+  Args:
+    py_file_path: full path of the Python source file in question.
+
+  Returns:
+    (`bool`) Whether the file is a part of the tensorflow library.
+
+  Raises:
+    ValueError: if py_file_path does not end with ".py".
+  """
+
+  if not py_file_path.endswith(".py"):
+    raise ValueError(
+        "Input file path (%s) is not a Python source file." % py_file_path)
+  py_file_path = os.path.normpath(os.path.abspath(py_file_path))
+
+  return (py_file_path.startswith(_TENSORFLOW_BASEDIR) and
+          not py_file_path.endswith("_test.py") and
+          not os.path.dirname(py_file_path).endswith(
+              os.path.normpath("python/debug/examples")))
+
+
 def annotate_source(dump,
                     source_file_path,
                     do_dumped_tensors=False,
@@ -61,21 +95,16 @@ def annotate_source(dump,
     raise ValueError("Cannot perform source annotation due to a lack of set "
                      "Python graph in the dump object")
 
-  source_file_path = os.path.normpath(source_file_path)
+  source_file_path = os.path.normpath(os.path.abspath(source_file_path))
 
   line_to_op_names = {}
   for op in py_graph.get_operations():
-    try:
-      traceback = dump.node_traceback(op.name)
-    except KeyError:
-      pass
-
-    for file_path, line_number, _, _ in reversed(traceback):
+    for file_path, line_number, _, _ in reversed(dump.node_traceback(op.name)):
       if (min_line is not None and line_number < min_line or
           max_line is not None and line_number >= max_line):
         continue
 
-      if os.path.normpath(file_path) != source_file_path:
+      if os.path.normpath(os.path.abspath(file_path)) != source_file_path:
         continue
 
       if do_dumped_tensors:
@@ -95,3 +124,103 @@ def annotate_source(dump,
         break
 
   return line_to_op_names
+
+
+def list_source_files_against_dump(dump,
+                                   path_regex_whitelist=None,
+                                   node_name_regex_whitelist=None):
+  """Generate a list of source files with information regarding ops and tensors.
+
+  Args:
+    dump: (`DebugDumpDir`) A `DebugDumpDir` object of which the Python graph
+      has been loaded.
+    path_regex_whitelist: A regular-expression filter for source file path.
+    node_name_regex_whitelist: A regular-expression filter for node names.
+
+  Returns:
+    A list of tuples regarding the Python source files involved in constructing
+    the ops and tensors contained in `dump`. Each tuple is:
+      (source_file_path, is_tf_library, num_nodes, num_tensors, num_dumps,
+       first_line)
+
+      is_tf_library: (`bool`) A guess of whether the file belongs to the
+        TensorFlow Python library.
+      num_nodes: How many nodes were created by lines of this source file.
+        These include nodes with dumps and those without.
+      num_tensors: How many Tensors were created by lines of this source file.
+        These include Tensors with dumps and those without.
+      num_dumps: How many debug Tensor dumps were from nodes (and Tensors)
+        that were created by this source file.
+      first_line: The first line number (1-based) that created any nodes or
+        Tensors in this source file.
+
+    The list is sorted by ascending order of source_file_path.
+
+  Raises:
+    ValueError: If the dump object does not have a Python graph set.
+  """
+
+  py_graph = dump.python_graph
+  if not py_graph:
+    raise ValueError("Cannot generate source list due to a lack of set "
+                     "Python graph in the dump object")
+
+  path_to_node_names = collections.defaultdict(set)
+  path_to_tensor_names = collections.defaultdict(set)
+  path_to_first_line = {}
+  tensor_name_to_num_dumps = {}
+
+  path_regex = (re.compile(path_regex_whitelist)
+                if path_regex_whitelist else None)
+  node_name_regex = (re.compile(node_name_regex_whitelist)
+                     if node_name_regex_whitelist else None)
+
+  to_skip_file_paths = set()
+  for op in py_graph.get_operations():
+    if node_name_regex and not node_name_regex.match(op.name):
+      continue
+
+    for file_path, line_number, _, _ in dump.node_traceback(op.name):
+      file_path = os.path.normpath(os.path.abspath(file_path))
+      if (file_path in to_skip_file_paths or
+          path_regex and not path_regex.match(file_path) or
+          not os.path.isfile(file_path)):
+        to_skip_file_paths.add(file_path)
+        continue
+
+      path_to_node_names[file_path].add(op.name)
+      if file_path in path_to_first_line:
+        if path_to_first_line[file_path] > line_number:
+          path_to_first_line[file_path] = line_number
+      else:
+        path_to_first_line[file_path] = line_number
+
+      for output_tensor in op.outputs:
+        tensor_name = output_tensor.name
+        path_to_tensor_names[file_path].add(tensor_name)
+
+      watch_keys = dump.debug_watch_keys(op.name)
+      for watch_key in watch_keys:
+        node_name, output_slot, debug_op = watch_key.split(":")
+        tensor_name = "%s:%s" % (node_name, output_slot)
+        if tensor_name not in tensor_name_to_num_dumps:
+          tensor_name_to_num_dumps[tensor_name] = len(
+              dump.get_tensors(node_name, int(output_slot), debug_op))
+
+  path_to_num_dumps = {}
+  for path in path_to_tensor_names:
+    path_to_num_dumps[path] = sum(
+        tensor_name_to_num_dumps.get(tensor_name, 0)
+        for tensor_name in path_to_tensor_names[path])
+
+  output = []
+  for file_path in path_to_node_names:
+    output.append((
+        file_path,
+        _guess_is_tensorflow_py_library(file_path),
+        len(path_to_node_names.get(file_path, {})),
+        len(path_to_tensor_names.get(file_path, {})),
+        path_to_num_dumps.get(file_path, 0),
+        path_to_first_line[file_path]))
+
+  return sorted(output, key=lambda x: x[0])
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index 5d28bff207..138c75de31 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -33,6 +33,7 @@ from tensorflow.python.debug.lib import source_utils
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_util
+from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
@@ -42,6 +43,37 @@ def line_number_above():
   return inspect.stack()[1][2] - 1
 
 
+class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
+
+  def setUp(self):
+    self.curr_file_path = os.path.normpath(os.path.abspath(__file__))
+
+  def tearDown(self):
+    ops.reset_default_graph()
+
+  def testGuessedBaseDirIsProbablyCorrect(self):
+    self.assertEqual(
+        "tensorflow", os.path.basename(source_utils._TENSORFLOW_BASEDIR))
+
+  def testUnitTestFileReturnsFalse(self):
+    self.assertFalse(source_utils._guess_is_tensorflow_py_library(
+        self.curr_file_path))
+
+  def _disabledtestSourceUtilModuleReturnsTrue(self):
+    self.assertTrue(source_utils._guess_is_tensorflow_py_library(
+        source_utils.__file__))
+
+  def testFileInPythonKernelsPathReturnsTrue(self):
+    x = constant_op.constant(42.0, name="x")
+    self.assertTrue(source_utils._guess_is_tensorflow_py_library(
+        x.op.traceback[-1][0]))
+
+  def testNonPythonFileRaisesException(self):
+    with self.assertRaisesRegexp(ValueError, r"is not a Python source file"):
+      source_utils._guess_is_tensorflow_py_library(
+          os.path.join(os.path.dirname(self.curr_file_path), "foo.cc"))
+
+
 class SourceHelperTest(test_util.TensorFlowTestCase):
 
   def createAndRunGraphHelper(self):
@@ -199,5 +231,131 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
     os.remove(unrelated_source_path)
 
 
+class ListSourceAgainstDumpTest(test_util.TensorFlowTestCase):
+
+  def createAndRunGraphWithWhileLoop(self):
+    """Create and run a TensorFlow Graph with a while loop to generate dumps."""
+
+    self.dump_root = self.get_temp_dir()
+    self.curr_file_path = os.path.abspath(
+        inspect.getfile(inspect.currentframe()))
+
+    # Run a simple TF graph to generate some debug dumps that can be used in
+    # source annotation.
+    with session.Session() as sess:
+      loop_body = lambda i: math_ops.add(i, 2)
+      self.traceback_first_line = line_number_above()
+
+      loop_cond = lambda i: math_ops.less(i, 16)
+
+      i = constant_op.constant(10, name="i")
+      loop = control_flow_ops.while_loop(loop_cond, loop_body, [i])
+
+      run_options = config_pb2.RunOptions(output_partition_graphs=True)
+      debug_utils.watch_graph(
+          run_options, sess.graph, debug_urls=["file://%s" % self.dump_root])
+      run_metadata = config_pb2.RunMetadata()
+      sess.run(loop, options=run_options, run_metadata=run_metadata)
+
+      self.dump = debug_data.DebugDumpDir(
+          self.dump_root, partition_graphs=run_metadata.partition_graphs)
+      self.dump.set_python_graph(sess.graph)
+
+  def setUp(self):
+    self.createAndRunGraphWithWhileLoop()
+
+  def tearDown(self):
+    if os.path.isdir(self.dump_root):
+      shutil.rmtree(self.dump_root)
+    ops.reset_default_graph()
+
+  def testGenerateSourceList(self):
+    source_list = source_utils.list_source_files_against_dump(self.dump)
+
+    # Assert that the file paths are sorted and unique.
+    file_paths = [item[0] for item in source_list]
+    self.assertEqual(sorted(file_paths), file_paths)
+    self.assertEqual(len(set(file_paths)), len(file_paths))
+
+    # Assert that each item of source_list has length 6.
+    for item in source_list:
+      self.assertTrue(isinstance(item, tuple))
+      self.assertEqual(6, len(item))
+
+    # The while loop body should have executed 3 times. The following table
+    # lists the tensors and how many times each of them is dumped.
+    #   Tensor name            # of times dumped:
+    #   i:0                    1
+    #   while/Enter:0          1
+    #   while/Merge:0          4
+    #   while/Merge:1          4
+    #   while/Less/y:0         4
+    #   while/Less:0           4
+    #   while/LoopCond:0       4
+    #   while/Switch:0         1
+    #   while/Swtich:1         3
+    #   while/Identity:0       3
+    #   while/Add/y:0          3
+    #   while/Add:0            3
+    #   while/NextIteration:0  3
+    #   while/Exit:0           1
+    # ----------------------------
+    #   (Total)                39
+    #
+    # The total number of nodes is 12.
+    # The total number of tensors is 14 (2 of the nodes have 2 outputs:
+    #   while/Merge, while/Switch).
+
+    _, is_tf_py_library, num_nodes, num_tensors, num_dumps, first_line = (
+        source_list[file_paths.index(self.curr_file_path)])
+    self.assertFalse(is_tf_py_library)
+    self.assertEqual(12, num_nodes)
+    self.assertEqual(14, num_tensors)
+    self.assertEqual(39, num_dumps)
+    self.assertEqual(self.traceback_first_line, first_line)
+
+  def testGenerateSourceListWithNodeNameFilter(self):
+    source_list = source_utils.list_source_files_against_dump(
+        self.dump, node_name_regex_whitelist=r"while/Add.*")
+
+    # Assert that the file paths are sorted.
+    file_paths = [item[0] for item in source_list]
+    self.assertEqual(sorted(file_paths), file_paths)
+    self.assertEqual(len(set(file_paths)), len(file_paths))
+
+    # Assert that each item of source_list has length 4.
+    for item in source_list:
+      self.assertTrue(isinstance(item, tuple))
+      self.assertEqual(6, len(item))
+
+    # Due to the node-name filtering the result should only contain 2 nodes
+    # and 2 tensors. The total number of dumped tensors should be 6:
+    #   while/Add/y:0          3
+    #   while/Add:0            3
+    _, is_tf_py_library, num_nodes, num_tensors, num_dumps, _ = (
+        source_list[file_paths.index(self.curr_file_path)])
+    self.assertFalse(is_tf_py_library)
+    self.assertEqual(2, num_nodes)
+    self.assertEqual(2, num_tensors)
+    self.assertEqual(6, num_dumps)
+
+  def testGenerateSourceListWithPathRegexFilter(self):
+    curr_file_basename = os.path.basename(self.curr_file_path)
+    source_list = source_utils.list_source_files_against_dump(
+        self.dump,
+        path_regex_whitelist=(
+            ".*" + curr_file_basename.replace(".", "\\.") + "$"))
+
+    self.assertEqual(1, len(source_list))
+    (file_path, is_tf_py_library, num_nodes, num_tensors, num_dumps,
+     first_line) = source_list[0]
+    self.assertEqual(self.curr_file_path, file_path)
+    self.assertFalse(is_tf_py_library)
+    self.assertEqual(12, num_nodes)
+    self.assertEqual(14, num_tensors)
+    self.assertEqual(39, num_dumps)
+    self.assertEqual(self.traceback_first_line, first_line)
+
+
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/python/estimator/BUILD b/tensorflow/python/estimator/BUILD
index 616b7ae49b..f1471a515f 100644
--- a/tensorflow/python/estimator/BUILD
+++ b/tensorflow/python/estimator/BUILD
@@ -108,18 +108,19 @@ py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
-        ":checkpoint_utils",
         ":export",
         ":model_fn",
         ":run_config",
         "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:client",
         "//tensorflow/python:control_flow_ops",
-        "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:metrics",
         "//tensorflow/python:platform",
+        "//tensorflow/python:random_seed",
         "//tensorflow/python:summary",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
         "//tensorflow/python/saved_model:builder",
         "//tensorflow/python/saved_model:tag_constants",
     ],
@@ -131,20 +132,31 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":estimator",
+        ":export",
         ":model_fn",
         ":numpy_io",
         ":run_config",
+        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:init_ops",
         "//tensorflow/python:layers",
+        "//tensorflow/python:lib",
+        "//tensorflow/python:metrics",
+        "//tensorflow/python:parsing_ops",
+        "//tensorflow/python:platform",
         "//tensorflow/python:saver_test_utils",
         "//tensorflow/python:session",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
+        "//tensorflow/python:variables",
         "//tensorflow/python/ops/losses",
         "//tensorflow/python/saved_model:loader",
+        "//tensorflow/python/saved_model:tag_constants",
     ],
 )
 
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 36918af552..80c5bbf684 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -141,6 +141,11 @@ class Estimator(object):
 
     logging.info('Using config: %s', str(vars(self._config)))
 
+    if self._config.session_config is None:
+      self._session_config = config_pb2.ConfigProto(allow_soft_placement=True)
+    else:
+      self._session_config = self._config.session_config
+
     self._device_fn = _get_replica_device_setter(self._config)
 
     if model_fn is None:
@@ -317,7 +322,7 @@ class Estimator(object):
           session_creator=training.ChiefSessionCreator(
               checkpoint_filename_with_path=checkpoint_path,
               scaffold=estimator_spec.scaffold,
-              config=config_pb2.ConfigProto(allow_soft_placement=True)),
+              config=self._session_config),
           hooks=hooks) as mon_sess:
         while not mon_sess.should_stop():
           preds_evaluated = mon_sess.run(predictions)
@@ -552,7 +557,8 @@ class Estimator(object):
                               training.Saver(
                                   sharded=True,
                                   max_to_keep=self._config.keep_checkpoint_max,
-                                  defer_build=True))
+                                  defer_build=True,
+                                  save_relative_paths=True))
 
       chief_hooks = []
       if (self._config.save_checkpoints_secs or
@@ -579,7 +585,7 @@ class Estimator(object):
           chief_only_hooks=chief_hooks + estimator_spec.training_chief_hooks,
           save_checkpoint_secs=0,  # Saving is handled by a hook.
           save_summaries_steps=self._config.save_summary_steps,
-          config=config_pb2.ConfigProto(allow_soft_placement=True)) as mon_sess:
+          config=self._session_config) as mon_sess:
         loss = None
         while not mon_sess.should_stop():
           _, loss = mon_sess.run([estimator_spec.train_op, estimator_spec.loss])
@@ -634,7 +640,7 @@ class Estimator(object):
           eval_ops=update_op,
           final_ops=eval_dict,
           hooks=hooks,
-          config=config_pb2.ConfigProto(allow_soft_placement=True))
+          config=self._session_config)
 
       _write_dict_to_summary(
           output_dir=eval_dir,
@@ -643,12 +649,6 @@ class Estimator(object):
 
     return eval_results
 
-  def _verify_default_metric_key(self, metric_key, eval_dict):
-    if metric_key in six.iterkeys(eval_dict):
-      raise ValueError(
-          'Metric with name `%s` is not allowed, because Estimator '
-          'already defines a default metric with the same name.' % metric_key)
-
 
 def _check_hooks_type(hooks):
   """Returns hooks if all are SessionRunHook, raises TypeError otherwise."""
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index a1659156a6..84813073d3 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -23,6 +23,8 @@ import tempfile
 
 import numpy as np
 
+from google.protobuf import text_format
+
 from tensorflow.python.client import session
 from tensorflow.python.estimator import estimator
 from tensorflow.python.estimator import model_fn as model_fn_lib
@@ -34,6 +36,7 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.layers import layers
+from tensorflow.python.lib.io import file_io
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
@@ -48,6 +51,7 @@ from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.saved_model import loader
 from tensorflow.python.saved_model import tag_constants
+from tensorflow.python.training import checkpoint_state_pb2
 from tensorflow.python.training import saver
 from tensorflow.python.training import saver_test_utils
 from tensorflow.python.training import session_run_hook
@@ -236,6 +240,40 @@ class EstimatorTrainTest(test.TestCase):
     self.assertEqual(
         5, estimator._load_global_step_from_checkpoint_dir(est.model_dir))
 
+  def test_checkpoint_contains_relative_paths(self):
+    tmpdir = tempfile.mkdtemp()
+    est = estimator.Estimator(
+        model_dir=tmpdir,
+        model_fn=model_fn_global_step_incrementer)
+    est.train(dummy_input_fn, steps=5)
+
+    checkpoint_file_content = file_io.read_file_to_string(
+        os.path.join(tmpdir, 'checkpoint'))
+    ckpt = checkpoint_state_pb2.CheckpointState()
+    text_format.Merge(checkpoint_file_content, ckpt)
+    self.assertEqual(ckpt.model_checkpoint_path, 'model.ckpt-5')
+    self.assertAllEqual(
+        ['model.ckpt-1', 'model.ckpt-5'], ckpt.all_model_checkpoint_paths)
+
+  def test_train_save_copy_reload(self):
+    tmpdir = tempfile.mkdtemp()
+    model_dir1 = os.path.join(tmpdir, 'model_dir1')
+    est1 = estimator.Estimator(
+        model_dir=model_dir1,
+        model_fn=model_fn_global_step_incrementer)
+    est1.train(dummy_input_fn, steps=5)
+
+    model_dir2 = os.path.join(tmpdir, 'model_dir2')
+    os.renames(model_dir1, model_dir2)
+    est2 = estimator.Estimator(
+        model_dir=model_dir2,
+        model_fn=model_fn_global_step_incrementer)
+    self.assertEqual(
+        5, estimator._load_global_step_from_checkpoint_dir(est2.model_dir))
+    est2.train(dummy_input_fn, steps=5)
+    self.assertEqual(
+        10, estimator._load_global_step_from_checkpoint_dir(est2.model_dir))
+
   def test_steps0_raises_error(self):
     est = estimator.Estimator(
         model_fn=_model_fn_with_eval_metric_ops)
diff --git a/tensorflow/python/estimator/run_config.py b/tensorflow/python/estimator/run_config.py
index c6e6c60991..79b55c6853 100644
--- a/tensorflow/python/estimator/run_config.py
+++ b/tensorflow/python/estimator/run_config.py
@@ -72,6 +72,10 @@ class RunConfig(object):
   def save_checkpoints_secs(self):
     return 600
 
+  @property
+  def session_config(self):
+    return None
+
   @property
   def save_checkpoints_steps(self):
     return None
diff --git a/tensorflow/python/kernel_tests/gather_op_test.py b/tensorflow/python/kernel_tests/gather_op_test.py
index dac8d58b35..1f161e59cd 100644
--- a/tensorflow/python/kernel_tests/gather_op_test.py
+++ b/tensorflow/python/kernel_tests/gather_op_test.py
@@ -31,61 +31,80 @@ from tensorflow.python.platform import test
 class GatherTest(test.TestCase):
   use_gpu = False
 
+  def _buildParams(self, data, dtype):
+    data = data.astype(dtype.as_numpy_dtype)
+    # For complex types, add an index-dependent imaginary component so we can
+    # tell we got the right value.
+    if dtype.is_complex:
+      return data + 10j * data
+    return data
+
   def testScalar1D(self):
     with self.test_session(use_gpu=self.use_gpu):
-      params = constant_op.constant([0, 1, 2, 3, 7, 5])
-      indices = constant_op.constant(4)
-      gather_t = array_ops.gather(params, indices)
-      gather_val = gather_t.eval()
-    self.assertAllEqual(7, gather_val)
-    self.assertEqual([], gather_t.get_shape())
+      data = np.array([0, 1, 2, 3, 7, 5])
+      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+        params_np = self._buildParams(data, dtype)
+        params = constant_op.constant(params_np)
+        indices = constant_op.constant(4)
+        gather_t = array_ops.gather(params, indices)
+        gather_val = gather_t.eval()
+        self.assertAllEqual(params_np[4], gather_val)
+        self.assertEqual([], gather_t.get_shape())
 
   def testScalar2D(self):
     with self.test_session(use_gpu=self.use_gpu):
-      params = constant_op.constant([[0, 1, 2], [3, 4, 5], [6, 7, 8],
-                                     [9, 10, 11], [12, 13, 14]])
-      indices = constant_op.constant(2)
-      gather_t = array_ops.gather(params, indices)
-      gather_val = gather_t.eval()
-    self.assertAllEqual([6, 7, 8], gather_val)
-    self.assertEqual([3], gather_t.get_shape())
+      data = np.array([[0, 1, 2], [3, 4, 5], [6, 7, 8],
+                       [9, 10, 11], [12, 13, 14]])
+      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+        params_np = self._buildParams(data, dtype)
+        params = constant_op.constant(params_np)
+        indices = constant_op.constant(2)
+        gather_t = array_ops.gather(params, indices)
+        gather_val = gather_t.eval()
+        self.assertAllEqual(params_np[2], gather_val)
+        self.assertEqual([3], gather_t.get_shape())
 
   def testSimpleTwoD32(self):
     with self.test_session(use_gpu=self.use_gpu):
-      params = constant_op.constant([[0, 1, 2], [3, 4, 5], [6, 7, 8],
-                                     [9, 10, 11], [12, 13, 14]])
-      indices = constant_op.constant([0, 4, 0, 2])
-      gather_t = array_ops.gather(params, indices)
-      gather_val = gather_t.eval()
-    self.assertAllEqual([[0, 1, 2], [12, 13, 14], [0, 1, 2], [6, 7, 8]],
-                        gather_val)
-    self.assertEqual([4, 3], gather_t.get_shape())
+      data = np.array([[0, 1, 2], [3, 4, 5], [6, 7, 8],
+                       [9, 10, 11], [12, 13, 14]])
+      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+        params_np = self._buildParams(data, dtype)
+        params = constant_op.constant(params_np)
+        indices = constant_op.constant([0, 4, 0, 2])
+        gather_t = array_ops.gather(params, indices)
+        gather_val = gather_t.eval()
+        self.assertAllEqual(params_np[[0, 4, 0, 2]], gather_val)
+        self.assertEqual([4, 3], gather_t.get_shape())
 
   def testHigherRank(self):
     np.random.seed(1)
     # We check that scalar and empty shapes work as well
     for shape in (7, 0), (4, 3, 2):
       for indices_shape in (), (0,), (3, 0), (3, 5):
-        params = np.random.randn(*shape)
-        indices = np.random.randint(shape[0], size=indices_shape)
-        with self.test_session(use_gpu=self.use_gpu):
-          tf_params = constant_op.constant(params)
-          tf_indices = constant_op.constant(indices)
-          gather = array_ops.gather(tf_params, tf_indices)
-          self.assertAllEqual(params[indices], gather.eval())
-          self.assertEqual(indices.shape + params.shape[1:], gather.get_shape())
-          # Test gradients
-          gather_grad = np.random.randn(*gather.get_shape().as_list())
-          params_grad, indices_grad = gradients_impl.gradients(
-              gather, [tf_params, tf_indices], gather_grad)
-          self.assertEqual(indices_grad, None)
-          self.assertEqual(type(params_grad), ops.IndexedSlices)
-          params_grad = ops.convert_to_tensor(params_grad)
-          correct_params_grad = np.zeros(shape)
-          for i, g in zip(indices.flat,
-                          gather_grad.reshape((indices.size,) + shape[1:])):
-            correct_params_grad[i] += g
-          self.assertAllClose(correct_params_grad, params_grad.eval())
+        for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+          params = self._buildParams(np.random.randn(*shape), dtype)
+          indices = np.random.randint(shape[0], size=indices_shape)
+          with self.test_session(use_gpu=self.use_gpu):
+            tf_params = constant_op.constant(params)
+            tf_indices = constant_op.constant(indices)
+            gather = array_ops.gather(tf_params, tf_indices)
+            self.assertAllEqual(params[indices], gather.eval())
+            self.assertEqual(indices.shape + params.shape[1:],
+                             gather.get_shape())
+            # Test gradients
+            gather_grad = np.random.randn(*gather.get_shape().as_list()).astype(
+                dtype.as_numpy_dtype)
+            params_grad, indices_grad = gradients_impl.gradients(
+                gather, [tf_params, tf_indices], gather_grad)
+            self.assertEqual(indices_grad, None)
+            self.assertEqual(type(params_grad), ops.IndexedSlices)
+            params_grad = ops.convert_to_tensor(params_grad)
+            correct_params_grad = np.zeros(shape).astype(dtype.as_numpy_dtype)
+            for i, g in zip(indices.flat,
+                            gather_grad.reshape((indices.size,) + shape[1:])):
+              correct_params_grad[i] += g
+            self.assertAllClose(correct_params_grad, params_grad.eval())
 
   def testUnknownIndices(self):
     params = constant_op.constant([[0, 1, 2]])
@@ -103,7 +122,7 @@ class GatherTest(test.TestCase):
 
   def testEmptySlices(self):
     with self.test_session(use_gpu=self.use_gpu):
-      for dtype in np.float32, np.float64:
+      for dtype in np.float32, np.float64, np.complex64, np.complex128:
         for itype in np.int32, np.int64:
           params = np.zeros((7, 0), dtype=dtype)
           indices = np.array([3, 4], dtype=itype)
diff --git a/tensorflow/python/kernel_tests/linalg_ops_test.py b/tensorflow/python/kernel_tests/linalg_ops_test.py
index ff299e6511..153d4ab662 100644
--- a/tensorflow/python/kernel_tests/linalg_ops_test.py
+++ b/tensorflow/python/kernel_tests/linalg_ops_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tensorflow.python.ops.special_math_ops."""
+"""Tests for tensorflow.python.ops.linalg_ops."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 8659382834..c998f57da7 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -69,6 +69,19 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
     trainable: Boolean, if `True` also add variables to the graph collection
       `GraphKeys.TRAINABLE_VARIABLES` (see tf.Variable).
     name: A string, the name of the layer.
+    renorm: Whether to use Batch Renormalization
+      (https://arxiv.org/abs/1702.03275). This adds extra variables during
+      training. The inference is the same for either value of this parameter.
+    renorm_clipping: A dictionary that may map keys 'rmax', 'rmin', 'dmax' to
+      scalar `Tensors` used to clip the renorm correction. The correction
+      `(r, d)` is used as `corrected_value = normalized_value * r + d`, with
+      `r` clipped to [rmin, rmax], and `d` to [-dmax, dmax]. Missing rmax, rmin,
+      dmax are set to inf, 0, inf, respectively.
+    renorm_momentum: Momentum used to update the moving means and standard
+      deviations with renorm. Unlike `momentum`, this affects training
+      and should be neither too small (which would add noise) nor too large
+      (which would give stale estimates). Note that `momentum` is still applied
+      to get the means and variances for inference.
   """
 
   def __init__(self,
@@ -85,6 +98,9 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
                gamma_regularizer=None,
                trainable=True,
                name=None,
+               renorm=False,
+               renorm_clipping=None,
+               renorm_momentum=0.99,
                **kwargs):
     super(BatchNormalization, self).__init__(
         name=name, trainable=trainable, **kwargs)
@@ -99,6 +115,15 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
     self.moving_variance_initializer = moving_variance_initializer
     self.beta_regularizer = beta_regularizer
     self.gamma_regularizer = gamma_regularizer
+    self.renorm = renorm
+    if renorm:
+      renorm_clipping = renorm_clipping or {}
+      keys = ['rmax', 'rmin', 'dmax']
+      if set(renorm_clipping) - set(keys):
+        raise ValueError('renorm_clipping %s contains keys not in %s' %
+                         (renorm_clipping, keys))
+      self.renorm_clipping = renorm_clipping
+      self.renorm_momentum = renorm_momentum
 
   def build(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape)
@@ -148,9 +173,90 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
           shape=(param_dim,),
           initializer=self.moving_variance_initializer,
           trainable=False)
+      if self.renorm:
+        # Create variables to maintain the moving mean and standard deviation.
+        # These are used in training and thus are different from the moving
+        # averages above. The renorm variables are colocated with moving_mean
+        # and moving_variance.
+        # NOTE: below, the outer `with device` block causes the current device
+        # stack to be cleared. The nested ones use a `lambda` to set the desired
+        # device and ignore any devices that may be set by the custom getter.
+        def _renorm_variable(name, shape):
+          var = vs.get_variable(name,
+                                shape=shape,
+                                initializer=init_ops.zeros_initializer(),
+                                trainable=False)
+          return var
+        with ops.device(None):
+          with ops.device(lambda _: self.moving_mean.device):
+            self.renorm_mean = _renorm_variable('renorm_mean', (param_dim,))
+            self.renorm_mean_weight = _renorm_variable('renorm_mean_weight', ())
+          # We initialize renorm_stddev to 0, and maintain the (0-initialized)
+          # renorm_stddev_weight. This allows us to (1) mix the average
+          # stddev with the minibatch stddev early in training, and (2) compute
+          # the unbiased average stddev by dividing renorm_stddev by the weight.
+          with ops.device(lambda _: self.moving_variance.device):
+            self.renorm_stddev = _renorm_variable('renorm_stddev', (param_dim,))
+            self.renorm_stddev_weight = _renorm_variable(
+                'renorm_stddev_weight', ())
     finally:
       vs.get_variable_scope().set_partitioner(partitioner)
 
+  def _renorm_correction_and_moments(self, mean, variance, training):
+    """Returns the correction and update values for renorm."""
+    stddev = math_ops.sqrt(variance + self.epsilon)
+    # Compute the average mean and standard deviation, as if they were
+    # initialized with this batch's moments.
+    mixed_renorm_mean = (self.renorm_mean +
+                         (1. - self.renorm_mean_weight) * mean)
+    mixed_renorm_stddev = (self.renorm_stddev +
+                           (1. - self.renorm_stddev_weight) * stddev)
+    # Compute the corrections for batch renorm.
+    r = stddev / mixed_renorm_stddev
+    d = (mean - mixed_renorm_mean) / mixed_renorm_stddev
+    # Ensure the corrections use pre-update moving averages.
+    with ops.control_dependencies([r, d]):
+      mean = array_ops.identity(mean)
+      stddev = array_ops.identity(stddev)
+    rmin, rmax, dmax = [self.renorm_clipping.get(key)
+                        for key in ['rmin', 'rmax', 'dmax']]
+    if rmin is not None:
+      r = math_ops.maximum(r, rmin)
+    if rmax is not None:
+      r = math_ops.minimum(r, rmax)
+    if dmax is not None:
+      d = math_ops.maximum(d, -dmax)
+      d = math_ops.minimum(d, dmax)
+    # When not training, use r=1, d=0, and decay=1 meaning no updates.
+    r = _smart_select(training, lambda: r, lambda: array_ops.ones_like(r))
+    d = _smart_select(training, lambda: d, lambda: array_ops.zeros_like(d))
+    decay = _smart_select(training, lambda: self.renorm_momentum, lambda: 1.)
+    def _update_renorm_variable(var, weight, value):
+      """Updates a moving average and weight, returns the unbiased value."""
+      # Update the variables without zero debiasing. The debiasing will be
+      # accomplished by dividing the exponential moving average by the weight.
+      # For example, after a single update, the moving average would be
+      # (1-decay) * value. and the weight will be 1-decay, with their ratio
+      # giving value.
+      new_var = moving_averages.assign_moving_average(
+          var, value, decay, zero_debias=False)
+      new_weight = moving_averages.assign_moving_average(
+          weight, 1., decay, zero_debias=False)
+      return new_var / new_weight
+
+    with ops.colocate_with(self.moving_mean):
+      new_mean = _update_renorm_variable(self.renorm_mean,
+                                         self.renorm_mean_weight,
+                                         mean)
+    with ops.colocate_with(self.moving_variance):
+      new_stddev = _update_renorm_variable(self.renorm_stddev,
+                                           self.renorm_stddev_weight,
+                                           stddev)
+      # Make sqrt(moving_variance + epsilon) = new_stddev.
+      new_variance = math_ops.square(new_stddev) - self.epsilon
+
+    return (r, d, new_mean, new_variance)
+
   def call(self, inputs, training=False):
     # First, compute the axes along which to reduce the mean / variance,
     # as well as the broadcast shape to be used for all parameters.
@@ -164,82 +270,66 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
     # Determines whether broadcasting is needed.
     needs_broadcasting = (sorted(reduction_axes) != list(range(ndim))[:-1])
 
+    scale, offset = self.gamma, self.beta
+
     # Determine a boolean value for `training`: could be True, False, or None.
     training_value = utils.constant_value(training)
-
-    if needs_broadcasting:
-      # In this case we must explictly broadcast all parameters.
-      if self.center:
-        broadcast_beta = array_ops.reshape(self.beta, broadcast_shape)
-      else:
-        broadcast_beta = None
-      if self.scale:
-        broadcast_gamma = array_ops.reshape(self.gamma, broadcast_shape)
-      else:
-        broadcast_gamma = None
-
     if training_value is not False:
-      if needs_broadcasting:
-        broadcast_mean, broadcast_variance = nn.moments(
-            inputs, reduction_axes, keep_dims=True)
-        mean = array_ops.reshape(broadcast_mean, [-1])
-        variance = array_ops.reshape(broadcast_variance, [-1])
+      # Some of the computations here are not necessary when training==False
+      # but not a constant. However, this makes the code simpler.
+      mean, variance = nn.moments(inputs, reduction_axes)
+      if self.renorm:
+        r, d, new_mean, new_variance = self._renorm_correction_and_moments(
+            mean, variance, training)
+        # When training, the normalized values (say, x) will be transformed as
+        # x * gamma + beta without renorm, and (x * r + d) * gamma + beta
+        # = x * (r * gamma) + (d * gamma + beta) with renorm.
+        scale = array_ops.stop_gradient(r, name='renorm_r')
+        offset = array_ops.stop_gradient(d, name='renorm_d')
+        if self.gamma is not None:
+          scale *= self.gamma
+          offset *= self.gamma
+        if self.beta is not None:
+          offset += self.beta
       else:
-        mean, variance = nn.moments(inputs, reduction_axes)
+        new_mean, new_variance = mean, variance
+
+      # Update moving averages when training, and prevent updates otherwise.
+      decay = _smart_select(training, lambda: self.momentum, lambda: 1.)
+      mean_update = moving_averages.assign_moving_average(
+          self.moving_mean, new_mean, decay, zero_debias=False)
+      variance_update = moving_averages.assign_moving_average(
+          self.moving_variance, new_variance, decay, zero_debias=False)
 
-      # Prepare updates if necessary.
       if not self.updates:
-        mean_update = moving_averages.assign_moving_average(
-            self.moving_mean, mean, self.momentum, zero_debias=False)
-        variance_update = moving_averages.assign_moving_average(
-            self.moving_variance, variance, self.momentum, zero_debias=False)
         # In the future this should be refactored into a self.add_update
         # methods in order to allow for instance-based BN layer sharing
         # across unrelated input streams (e.g. like in Keras).
         self.updates.append(mean_update)
         self.updates.append(variance_update)
 
-    # Normalize batch. We do this inside separate functions for training
-    # and inference so as to avoid evaluating both branches.
-    def normalize_in_test():
-      if needs_broadcasting:
-        broadcast_moving_mean = array_ops.reshape(self.moving_mean,
-                                                  broadcast_shape)
-        broadcast_moving_variance = array_ops.reshape(self.moving_variance,
-                                                      broadcast_shape)
-        return nn.batch_normalization(inputs,
-                                      broadcast_moving_mean,
-                                      broadcast_moving_variance,
-                                      broadcast_beta,
-                                      broadcast_gamma,
-                                      self.epsilon)
-      else:
-        return nn.batch_normalization(inputs,
-                                      self.moving_mean,
-                                      self.moving_variance,
-                                      self.beta if self.center else None,
-                                      self.gamma if self.scale else None,
-                                      self.epsilon)
-
-    def normalize_in_training():
-      if needs_broadcasting:
-        return nn.batch_normalization(inputs,
-                                      broadcast_mean,
-                                      broadcast_variance,
-                                      broadcast_beta,
-                                      broadcast_gamma,
-                                      self.epsilon)
-      else:
-        return nn.batch_normalization(inputs,
-                                      mean,
-                                      variance,
-                                      self.beta if self.center else None,
-                                      self.gamma if self.scale else None,
-                                      self.epsilon)
+      mean = _smart_select(training,
+                           lambda: mean,
+                           lambda: self.moving_mean)
+      variance = _smart_select(training,
+                               lambda: variance,
+                               lambda: self.moving_variance)
+
+    else:
+      mean, variance = self.moving_mean, self.moving_variance
 
-    return utils.smart_cond(training,
-                            normalize_in_training,
-                            normalize_in_test)
+    def _broadcast(v):
+      if needs_broadcasting and v is not None:
+        # In this case we must explictly broadcast all parameters.
+        return array_ops.reshape(v, broadcast_shape)
+      return v
+
+    return nn.batch_normalization(inputs,
+                                  _broadcast(mean),
+                                  _broadcast(variance),
+                                  _broadcast(offset),
+                                  _broadcast(scale),
+                                  self.epsilon)
 
 
 def batch_normalization(inputs,
@@ -257,7 +347,10 @@ def batch_normalization(inputs,
                         training=False,
                         trainable=True,
                         name=None,
-                        reuse=None):
+                        reuse=None,
+                        renorm=False,
+                        renorm_clipping=None,
+                        renorm_momentum=0.99):
   """Functional interface for the batch normalization layer.
 
   Reference: http://arxiv.org/abs/1502.03167
@@ -294,6 +387,19 @@ def batch_normalization(inputs,
     name: String, the name of the layer.
     reuse: Boolean, whether to reuse the weights of a previous layer
       by the same name.
+    renorm: Whether to use Batch Renormalization
+      (https://arxiv.org/abs/1702.03275). This adds extra variables during
+      training. The inference is the same for either value of this parameter.
+    renorm_clipping: A dictionary that may map keys 'rmax', 'rmin', 'dmax' to
+      scalar `Tensors` used to clip the renorm correction. The correction
+      `(r, d)` is used as `corrected_value = normalized_value * r + d`, with
+      `r` clipped to [rmin, rmax], and `d` to [-dmax, dmax]. Missing rmax, rmin,
+      dmax are set to inf, 0, inf, respectively.
+    renorm_momentum: Momentum used to update the moving means and standard
+      deviations with renorm. Unlike `momentum`, this affects training
+      and should be neither too small (which would add noise) nor too large
+      (which would give stale estimates). Note that `momentum` is still applied
+      to get the means and variances for inference.
 
   Returns:
     Output tensor.
@@ -311,6 +417,9 @@ def batch_normalization(inputs,
       beta_regularizer=beta_regularizer,
       gamma_regularizer=gamma_regularizer,
       trainable=trainable,
+      renorm=renorm,
+      renorm_clipping=renorm_clipping,
+      renorm_momentum=renorm_momentum,
       name=name,
       _reuse=reuse,
       _scope=name)
@@ -321,3 +430,39 @@ def batch_normalization(inputs,
 
 BatchNorm = BatchNormalization
 batch_norm = batch_normalization
+
+
+# Helper function
+
+
+def _smart_select(pred, fn_then, fn_else):
+  """Selects fn_then() or fn_else() based on the value of pred.
+
+  The purpose of this function is the same as `utils.smart_cond`. However, at
+  the moment there is a bug (b/36297356) that seems to kick in only when
+  `smart_cond` delegates to `tf.cond`, which sometimes results in the training
+  hanging when using parameter servers. This function will output the result
+  of `fn_then` or `fn_else` if `pred` is known at graph construction time.
+  Otherwise, it will use `tf.where` which will result in some redundant work
+  (both branches will be computed but only one selected). However, the tensors
+  involved will usually be small (means and variances in batchnorm), so the
+  cost will be small and will not be incurred at all if `pred` is a constant.
+
+  Args:
+    pred: A boolean scalar `Tensor`.
+    fn_then: A callable to use when pred==True.
+    fn_else: A callable to use when pred==False.
+
+  Returns:
+    A `Tensor` whose value is fn_then() or fn_else() based on the value of pred.
+  """
+  pred_value = utils.constant_value(pred)
+  if pred_value:
+    return fn_then()
+  elif pred_value is False:
+    return fn_else()
+  t_then = array_ops.expand_dims(fn_then(), 0)
+  t_else = array_ops.expand_dims(fn_else(), 0)
+  pred = array_ops.reshape(pred, [1])
+  result = array_ops.where(pred, t_then, t_else)
+  return array_ops.squeeze(result, [0])
diff --git a/tensorflow/python/layers/normalization_test.py b/tensorflow/python/layers/normalization_test.py
index 91b7cb6f48..0f82f73ea4 100644
--- a/tensorflow/python/layers/normalization_test.py
+++ b/tensorflow/python/layers/normalization_test.py
@@ -24,6 +24,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.layers import normalization as normalization_layers
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import variable_scope
@@ -513,6 +514,64 @@ class BNTest(test.TestCase):
     _ = bn.apply(inputs, training=training)
     self.assertEqual(len(bn.losses), 1)
 
+  def testRenorm(self):
+    shape = (4, 3)
+    xt = array_ops.placeholder(dtypes.float32, shape)
+    momentum = 0.99
+    renorm_momentum = 0.8
+    rmax = 1.1
+    rmin = 0.9
+    dmax = 0.1
+    gamma = 2.
+    beta = 3.
+    epsilon = 0.001
+    bn = normalization_layers.BatchNormalization(
+        axis=1,
+        gamma_initializer=init_ops.constant_initializer(gamma),
+        beta_initializer=init_ops.constant_initializer(beta),
+        epsilon=epsilon,
+        momentum=momentum,
+        renorm=True,
+        renorm_clipping={'rmax': rmax, 'rmin': rmin, 'dmax': dmax},
+        renorm_momentum=renorm_momentum)
+    training = array_ops.placeholder(dtypes.bool)
+    yt = bn.apply(xt, training=training)
+
+    moving_mean = 0.
+    moving_variance = 1.
+    renorm_mean = renorm_stddev = 0.
+    renorm_weight = 0.
+    with self.test_session(use_gpu=True) as sess:
+      sess.run(variables.global_variables_initializer())
+      for _ in range(5):
+        x = np.random.random(shape)
+
+        mean = x.mean(0)
+        stddev = np.sqrt(x.var(0) + epsilon)
+        adj_mean = renorm_mean + (1. - renorm_weight) * mean
+        adj_stddev = renorm_stddev + (1. - renorm_weight) * stddev
+        r = (stddev / adj_stddev).clip(rmin, rmax)
+        d = ((mean - adj_mean) / adj_stddev).clip(-dmax, dmax)
+        y_train = ((x - mean) / stddev * r + d) * gamma + beta
+        renorm_mean += (mean - renorm_mean) * (1. - renorm_momentum)
+        renorm_stddev += (stddev - renorm_stddev) * (1. - renorm_momentum)
+        renorm_weight += (1. - renorm_weight) * (1. - renorm_momentum)
+        moving_mean += (renorm_mean / renorm_weight -
+                        moving_mean) * (1. - momentum)
+        moving_variance += ((renorm_stddev / renorm_weight) ** 2 - epsilon -
+                            moving_variance) * (1. - momentum)
+
+        y_test = ((x - moving_mean) / (moving_variance + epsilon) ** 0.5 *
+                  gamma) + beta
+
+        yt_val_train, _, _ = sess.run([yt] + bn.updates,
+                                      feed_dict={xt: x, training: True})
+        yt_val_test, _, _ = sess.run([yt] + bn.updates,
+                                     feed_dict={xt: x, training: False})
+
+        self.assertAllClose(y_train, yt_val_train, atol=1e-5)
+        self.assertAllClose(y_test, yt_val_test, atol=1e-5)
+
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 60057b9ab1..45efc51d5c 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -196,7 +196,7 @@ def broadcast_dynamic_shape(shape_x, shape_y):
 
   Args:
     shape_x: A rank 1 integer `Tensor`, representing the shape of x.
-    shape_y: A rank 1 integer `Tensor`, representing the shape of x.
+    shape_y: A rank 1 integer `Tensor`, representing the shape of y.
   Returns:
     A rank 1 integer `Tensor` representing the broadcasted shape.
   """
@@ -1292,6 +1292,17 @@ def matrix_transpose(a, name="matrix_transpose"):
   # tf.matrix_transpose(x) is shape [1, 2, 4, 3]
   ```
 
+  Note that `tf.matmul` provides kwargs allowing for transpose of arguments.
+  This is done with minimal cost, and is preferable to using this function. E.g.
+
+  ```
+  # Good!  Transpose is taken at minimal additional cost.
+  tf.matmul(matrix, b, transpose_b=True)
+
+  # Inefficient!
+  tf.matmul(matrix, tf.matrix_transpose(b))
+  ```
+
   Args:
     a: A `Tensor` with `rank >= 2`.
     name: A name for the operation (optional).
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 99d29a3719..66ccedf546 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -375,7 +375,9 @@ def with_space_to_batch(
     input_shape_list = input.get_shape().as_list()
     input_spatial_shape = [input_shape_list[i] for i in spatial_dims]
   if input_spatial_shape is None or None in input_spatial_shape:
-    input_spatial_shape = array_ops.gather(array_ops.shape(input), spatial_dims)
+    input_shape_tensor = array_ops.shape(input)
+    input_spatial_shape = array_ops.stack(
+        [input_shape_tensor[i] for i in spatial_dims])
 
   paddings, crops = array_ops.required_space_to_batch_paddings(
       input_shape=input_spatial_shape,
@@ -2021,7 +2023,7 @@ def top_k(input, k=1, sorted=True, name=None):
 def conv1d(value, filters, stride, padding,
            use_cudnn_on_gpu=None, data_format=None,
            name=None):
-  """Computes a 1-D convolution given 3-D input and filter tensors.
+  r"""Computes a 1-D convolution given 3-D input and filter tensors.
 
   Given an input tensor of shape
     [batch, in_width, in_channels]
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 86e0cae27a..77f0468c01 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -197,8 +197,10 @@ class ResourceVariable(object):
             self._initialize_op = gen_resource_variable_ops.assign_variable_op(
                 self._handle, self._initial_value, name=n)
         with ops.name_scope("Read"), ops.colocate_with(self._handle):
-          value = gen_resource_variable_ops.read_variable_op(
-              self._handle, dtype=self._dtype)
+          # Manually assign reads to the handle's device to avoid log messages.
+          with ops.device(self._handle.device):
+            value = gen_resource_variable_ops.read_variable_op(
+                self._handle, dtype=self._dtype)
           self._graph_element = value
           if caching_device is not None:
             # Variables may be created in a tf.device() or ops.colocate_with()
@@ -276,8 +278,9 @@ class ResourceVariable(object):
     """A cached operation which reads the value of this variable."""
     if self._cached_value is not None:
       return self._cached_value
-    return gen_resource_variable_ops.read_variable_op(
-        self._handle, dtype=self._dtype)
+    with ops.device(self._handle.device):
+      return gen_resource_variable_ops.read_variable_op(
+          self._handle, dtype=self._dtype)
 
   def _as_graph_element(self):
     """Conversion function for Graph.as_graph_element()."""
@@ -318,8 +321,9 @@ class ResourceVariable(object):
      the read operation.
     """
     with ops.name_scope("Read"):
-      value = gen_resource_variable_ops.read_variable_op(
-          self._handle, dtype=self._dtype)
+      with ops.device(self._handle.device):
+        value = gen_resource_variable_ops.read_variable_op(
+            self._handle, dtype=self._dtype)
     # Return an identity so it can get placed on whatever device the context
     # specifies instead of the device where the variable is.
     return array_ops.identity(value)
diff --git a/tensorflow/python/ops/rnn.py b/tensorflow/python/ops/rnn.py
index 162b13ec21..1051478a7f 100644
--- a/tensorflow/python/ops/rnn.py
+++ b/tensorflow/python/ops/rnn.py
@@ -37,6 +37,36 @@ _state_size_with_prefix = rnn_cell_impl._state_size_with_prefix
 # pylint: enable=protected-access
 
 
+def _transpose_batch_time(x):
+  """Transpose the batch and time dimensions of a Tensor.
+
+  Retains as much of the static shape information as possible.
+
+  Args:
+    x: A tensor of rank 2 or higher.
+
+  Returns:
+    x transposed along the first two dimensions.
+
+  Raises:
+    ValueError: if `x` is rank 1 or lower.
+  """
+  x_static_shape = x.get_shape()
+  if x_static_shape.ndims is not None and x_static_shape.ndims < 2:
+    raise ValueError(
+        "Expected input tensor %s to have rank at least 2, but saw shape: %s" %
+        (x, x_static_shape))
+  x_rank = array_ops.rank(x)
+  x_t = array_ops.transpose(
+      x, array_ops.concat(
+          ([1, 0], math_ops.range(2, x_rank)), axis=0))
+  x_t.set_shape(
+      tensor_shape.TensorShape([
+          x_static_shape[1].value, x_static_shape[0].value
+      ]).concatenate(x_static_shape[2:]))
+  return x_t
+
+
 def _infer_state_dtype(explicit_dtype, state):
   """Infer the dtype of an RNN state.
 
@@ -492,8 +522,8 @@ def dynamic_rnn(cell, inputs, sequence_length=None, initial_state=None,
 
   if not time_major:
     # (B,T,D) => (T,B,D)
-    flat_input = tuple(array_ops.transpose(input_, [1, 0, 2])
-                       for input_ in flat_input)
+    flat_input = [ops.convert_to_tensor(input_) for input_ in flat_input]
+    flat_input = tuple(_transpose_batch_time(input_) for input_ in flat_input)
 
   parallel_iterations = parallel_iterations or 32
   if sequence_length is not None:
@@ -556,11 +586,7 @@ def dynamic_rnn(cell, inputs, sequence_length=None, initial_state=None,
     # to shape [batch, time, depth]
     if not time_major:
       # (T,B,D) => (B,T,D)
-      flat_output = nest.flatten(outputs)
-      flat_output = [array_ops.transpose(output, [1, 0, 2])
-                     for output in flat_output]
-      outputs = nest.pack_sequence_as(
-          structure=outputs, flat_sequence=flat_output)
+      outputs = nest.map_structure(_transpose_batch_time, outputs)
 
     return (outputs, final_state)
 
@@ -1003,34 +1029,20 @@ def raw_rnn(cell, loop_fn,
 
       def _copy_some_through(current, candidate):
         """Copy some tensors through via array_ops.where."""
-        current_flat = nest.flatten(current)
-        candidate_flat = nest.flatten(candidate)
-        # pylint: disable=g-long-lambda,cell-var-from-loop
-        result_flat = [
-            _on_device(
-                lambda: array_ops.where(
-                    elements_finished, current_i, candidate_i),
-                device=candidate_i.op.device)
-            for (current_i, candidate_i) in zip(current_flat, candidate_flat)]
-        # pylint: enable=g-long-lambda,cell-var-from-loop
-        return nest.pack_sequence_as(
-            structure=current, flat_sequence=result_flat)
+        def copy_fn(cur_i, cand_i):
+          return _on_device(
+              lambda: array_ops.where(elements_finished, cur_i, cand_i),
+              device=cand_i.op.device)
+        return nest.map_structure(copy_fn, current, candidate)
 
       emit_output = _copy_some_through(zero_emit, emit_output)
       next_state = _copy_some_through(state, next_state)
 
-      emit_output_flat = nest.flatten(emit_output)
-      emit_ta_flat = nest.flatten(emit_ta)
+      emit_ta = nest.map_structure(
+          lambda ta, emit: ta.write(time, emit), emit_ta, emit_output)
 
       elements_finished = math_ops.logical_or(elements_finished, next_finished)
 
-      emit_ta_flat = [
-          ta.write(time, emit)
-          for (ta, emit) in zip(emit_ta_flat, emit_output_flat)]
-
-      emit_ta = nest.pack_sequence_as(
-          structure=emit_structure, flat_sequence=emit_ta_flat)
-
       return (next_time, elements_finished, next_input,
               emit_ta, next_state, loop_state)
 
diff --git a/tensorflow/python/ops/session_ops.py b/tensorflow/python/ops/session_ops.py
index 0a06982ad7..3d038cfd8a 100644
--- a/tensorflow/python/ops/session_ops.py
+++ b/tensorflow/python/ops/session_ops.py
@@ -116,7 +116,7 @@ class TensorHandle(object):
       raise TypeError("Persistent tensor %s may have already been deleted."
                       % self.handle)
     self._auto_gc_enabled = False
-    holder, deleter = _get_handle_deleter(self._session.graph, self._handle)
+    holder, deleter = _get_handle_deleter(self._session.graph, 0, self._handle)
     self._session.run(deleter, feed_dict={holder: self.handle})
 
   def get_raw_handle(self):
@@ -141,11 +141,6 @@ class TensorHandle(object):
     handle_parts = str(handle).split(";")
     return handle_parts[0] + ";" + handle_parts[-1]
 
-  @staticmethod
-  def _get_deleter_key(handle):
-    """The graph key for deleter."""
-    return str(handle).split(";")[-1]
-
   @staticmethod
   def _get_mover_key(feeder, handle):
     """The graph key for mover."""
@@ -302,10 +297,9 @@ def _get_handle_mover(graph, feeder, handle):
   return result
 
 
-def _get_handle_deleter(graph, handle):
+def _get_handle_deleter(graph, deleter_key, handle):
   """Return a deletion subgraph for this handle."""
-  graph_key = TensorHandle._get_deleter_key(handle)
-  result = graph._handle_deleters.get(graph_key)
+  result = graph._handle_deleters.get(deleter_key)
   if result is None:
     # Create deleter if we haven't done it.
     handle_device = TensorHandle._get_device_name(handle)
@@ -313,5 +307,5 @@ def _get_handle_deleter(graph, handle):
       holder = array_ops.placeholder(dtypes.string)
       deleter = gen_data_flow_ops._delete_session_tensor(holder)
     result = (holder, deleter)
-    graph._handle_deleters[graph_key] = result
+    graph._handle_deleters[deleter_key] = result
   return result
diff --git a/tensorflow/python/ops/state_ops.py b/tensorflow/python/ops/state_ops.py
index 2a64cb7b70..f46f56cbb7 100644
--- a/tensorflow/python/ops/state_ops.py
+++ b/tensorflow/python/ops/state_ops.py
@@ -243,8 +243,9 @@ def assign_add(ref, value, use_locking=None, name=None):
 def assign(ref, value, validate_shape=None, use_locking=None, name=None):
   """Update 'ref' by assigning 'value' to it.
 
-  This operation outputs "ref" after the assignment is done.
-  This makes it easier to chain operations that need to use the reset value.
+  This operation outputs a Tensor that holds the new value of 'ref' after
+    the value has been assigned. This makes it easier to chain operations
+    that need to use the reset value.
 
   Args:
     ref: A mutable `Tensor`.
@@ -261,8 +262,8 @@ def assign(ref, value, validate_shape=None, use_locking=None, name=None):
     name: A name for the operation (optional).
 
   Returns:
-    Same as "ref".  Returned as a convenience for operations that want
-    to use the new value after the variable has been reset.
+    A `Tensor` that will hold the new value of 'ref' after
+      the assignment has completed.
   """
   if ref.dtype._is_ref_dtype:
     return gen_state_ops.assign(
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index 19c5d3c3ea..b3745fa4e6 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -974,6 +974,8 @@ class VariableScope(object):
       partitioner = self._partitioner
     if dtype is None:
       dtype = self._dtype
+    if use_resource is None:
+      use_resource = self._use_resource
 
     if self._custom_getter is not None:
       raise ValueError(
diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index 111461f784..4b0ef50df5 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -21,6 +21,7 @@ from __future__ import print_function
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.training import optimizer
@@ -154,7 +155,7 @@ class AdamOptimizer(optimizer.Optimizer):
         math_ops.cast(self._epsilon_t, grad.dtype.base_dtype),
         grad, use_locking=self._use_locking)
 
-  def _apply_sparse(self, grad, var):
+  def _apply_sparse_shared(self, grad, var, indices, scatter_add):
     beta1_power = math_ops.cast(self._beta1_power, var.dtype.base_dtype)
     beta2_power = math_ops.cast(self._beta2_power, var.dtype.base_dtype)
     lr_t = math_ops.cast(self._lr_t, var.dtype.base_dtype)
@@ -164,23 +165,39 @@ class AdamOptimizer(optimizer.Optimizer):
     lr = (lr_t * math_ops.sqrt(1 - beta2_power) / (1 - beta1_power))
     # m_t = beta1 * m + (1 - beta1) * g_t
     m = self.get_slot(var, "m")
-    m_scaled_g_values = grad.values * (1 - beta1_t)
+    m_scaled_g_values = grad * (1 - beta1_t)
     m_t = state_ops.assign(m, m * beta1_t,
                            use_locking=self._use_locking)
-    m_t = state_ops.scatter_add(m_t, grad.indices, m_scaled_g_values,
-                                use_locking=self._use_locking)
+    with ops.control_dependencies([m_t]):
+      m_t = scatter_add(m, indices, m_scaled_g_values)
     # v_t = beta2 * v + (1 - beta2) * (g_t * g_t)
     v = self.get_slot(var, "v")
-    v_scaled_g_values = (grad.values * grad.values) * (1 - beta2_t)
-    v_t = state_ops.assign(v, v * beta2_t, use_locking=self._use_locking)
-    v_t = state_ops.scatter_add(v_t, grad.indices, v_scaled_g_values,
-                                use_locking=self._use_locking)
+    v_scaled_g_values = (grad * grad) * (1 - beta2_t)
+    v_t = state_ops.assign(v, v * beta2_t)
+    with ops.control_dependencies([v_t]):
+      v_t = scatter_add(v, indices, v_scaled_g_values)
     v_sqrt = math_ops.sqrt(v_t)
     var_update = state_ops.assign_sub(var,
                                       lr * m_t / (v_sqrt + epsilon_t),
                                       use_locking=self._use_locking)
     return control_flow_ops.group(*[var_update, m_t, v_t])
 
+  def _apply_sparse(self, grad, var):
+    return self._apply_sparse_shared(
+        grad.values, var, grad.indices,
+        lambda x, i, v: state_ops.scatter_add(  # pylint: disable=g-long-lambda
+            x, i, v, use_locking=self._use_locking))
+
+  def _resource_scatter_add(self, x, i, v):
+    with ops.control_dependencies(
+        [resource_variable_ops.resource_scatter_add(
+            x.handle, i, v)]):
+      return x.value()
+
+  def _resource_apply_sparse(self, grad, var, indices):
+    return self._apply_sparse_shared(
+        grad, var, indices, self._resource_scatter_add)
+
   def _finish(self, update_ops, name_scope):
     # Update the power accumulators.
     with ops.control_dependencies(update_ops):
diff --git a/tensorflow/python/training/adam_test.py b/tensorflow/python/training/adam_test.py
index 00ff5d9b9d..62b171e234 100644
--- a/tensorflow/python/training/adam_test.py
+++ b/tensorflow/python/training/adam_test.py
@@ -52,7 +52,7 @@ def adam_update_numpy(param,
 
 class AdamOptimizerTest(test.TestCase):
 
-  def testSparse(self):
+  def doTestSparse(self, use_resource=False):
     for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
       with self.test_session():
         # Initialize variables for numpy implementation.
@@ -62,8 +62,12 @@ class AdamOptimizerTest(test.TestCase):
         var1_np = np.array([3.0, 4.0], dtype=dtype.as_numpy_dtype)
         grads1_np = np.array([0.01, 0.01], dtype=dtype.as_numpy_dtype)
 
-        var0 = variables.Variable(var0_np)
-        var1 = variables.Variable(var1_np)
+        if use_resource:
+          var0 = resource_variable_ops.ResourceVariable(var0_np)
+          var1 = resource_variable_ops.ResourceVariable(var1_np)
+        else:
+          var0 = variables.Variable(var0_np)
+          var1 = variables.Variable(var1_np)
         grads0_np_indices = np.array([0, 1], dtype=np.int32)
         grads0 = ops.IndexedSlices(
             constant_op.constant(grads0_np),
@@ -95,6 +99,12 @@ class AdamOptimizerTest(test.TestCase):
           self.assertAllCloseAccordingToType(var0_np, var0.eval())
           self.assertAllCloseAccordingToType(var1_np, var1.eval())
 
+  def testSparse(self):
+    self.doTestSparse(use_resource=False)
+
+  def testResourceSparse(self):
+    self.doTestSparse(use_resource=True)
+
   def testSparseDevicePlacement(self):
     for index_dtype in [dtypes.int32, dtypes.int64]:
       with self.test_session(force_gpu=test.is_gpu_available()):
diff --git a/tensorflow/python/training/device_setter.py b/tensorflow/python/training/device_setter.py
index 7f403f4927..85ee10379a 100644
--- a/tensorflow/python/training/device_setter.py
+++ b/tensorflow/python/training/device_setter.py
@@ -198,7 +198,7 @@ def replica_device_setter(ps_tasks=0, ps_device="/job:ps",
   if ps_ops is None:
     # TODO(sherrym): Variables in the LOCAL_VARIABLES collection should not be
     # placed in the parameter server.
-    ps_ops = ["Variable", "VariableV2"]
+    ps_ops = ["Variable", "VariableV2", "VarHandleOp"]
 
   if not merge_devices:
     logging.warning(
diff --git a/tensorflow/python/training/device_setter_test.py b/tensorflow/python/training/device_setter_test.py
index e05f0f6a1c..bc29e0d21c 100644
--- a/tensorflow/python/training/device_setter_test.py
+++ b/tensorflow/python/training/device_setter_test.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.python.framework import ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 from tensorflow.python.training import device_setter
@@ -46,6 +47,12 @@ class DeviceSetterTest(test.TestCase):
       self.assertDeviceEqual("/job:ps/task:1", w.initializer.device)
       self.assertDeviceEqual("/job:worker/cpu:0", a.device)
 
+  def testResource(self):
+    with ops.device(
+        device_setter.replica_device_setter(cluster=self._cluster_spec)):
+      v = resource_variable_ops.ResourceVariable([1, 2])
+      self.assertDeviceEqual("/job:ps/task:0", v.device)
+
   def testPS2TasksWithClusterSpecClass(self):
     with ops.device(
         device_setter.replica_device_setter(cluster=self._cluster_spec)):
diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index cf8692eda1..6d6128d207 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -252,7 +252,7 @@ def MonitoredTrainingSession(master='',  # pylint: disable=invalid-name
                              save_summaries_secs=None,
                              config=None,
                              stop_grace_period_secs=120,
-                             log_step_count_steps=10000):
+                             log_step_count_steps=100):
   """Creates a `MonitoredSession` for training.
 
   For a chief, this utility sets proper session initializer/restorer. It also
diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index 005d183039..974762822f 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -61,6 +61,7 @@ DATA_PREFIX = '/data'
 LOGDIR_ROUTE = '/logdir'
 RUNS_ROUTE = '/runs'
 PLUGIN_PREFIX = '/plugin'
+PLUGINS_LISTING_ROUTE = '/plugins_listing'
 SCALARS_ROUTE = '/' + event_accumulator.SCALARS
 IMAGES_ROUTE = '/' + event_accumulator.IMAGES
 AUDIO_ROUTE = '/' + event_accumulator.AUDIO
@@ -152,30 +153,34 @@ class TensorBoardWSGIApp(object):
       reload_multiplexer(self._multiplexer, path_to_run)
 
     self.data_applications = {
-        DATA_PREFIX + LOGDIR_ROUTE:
-            self._serve_logdir,
-        DATA_PREFIX + SCALARS_ROUTE:
-            self._serve_scalars,
+        '/app.js':
+            self._serve_js,
+        DATA_PREFIX + AUDIO_ROUTE:
+            self._serve_audio,
+        DATA_PREFIX + COMPRESSED_HISTOGRAMS_ROUTE:
+            self._serve_compressed_histograms,
         DATA_PREFIX + GRAPH_ROUTE:
             self._serve_graph,
-        DATA_PREFIX + RUN_METADATA_ROUTE:
-            self._serve_run_metadata,
         DATA_PREFIX + HISTOGRAMS_ROUTE:
             self._serve_histograms,
-        DATA_PREFIX + COMPRESSED_HISTOGRAMS_ROUTE:
-            self._serve_compressed_histograms,
         DATA_PREFIX + IMAGES_ROUTE:
             self._serve_images,
-        DATA_PREFIX + INDIVIDUAL_IMAGE_ROUTE:
-            self._serve_image,
-        DATA_PREFIX + AUDIO_ROUTE:
-            self._serve_audio,
         DATA_PREFIX + INDIVIDUAL_AUDIO_ROUTE:
             self._serve_individual_audio,
+        DATA_PREFIX + INDIVIDUAL_IMAGE_ROUTE:
+            self._serve_image,
+        DATA_PREFIX + LOGDIR_ROUTE:
+            self._serve_logdir,
+        # TODO(chizeng): Delete this RPC once we have skylark rules that obviate
+        # the need for the frontend to determine which plugins are active.
+        DATA_PREFIX + PLUGINS_LISTING_ROUTE:
+            self._serve_plugins_listing,
+        DATA_PREFIX + RUN_METADATA_ROUTE:
+            self._serve_run_metadata,
         DATA_PREFIX + RUNS_ROUTE:
             self._serve_runs,
-        '/app.js':
-            self._serve_js
+        DATA_PREFIX + SCALARS_ROUTE:
+            self._serve_scalars,
     }
 
     # Serve the routes from the registered plugins using their name as the route
@@ -488,6 +493,21 @@ class TensorBoardWSGIApp(object):
     })
     return query_string
 
+  @wrappers.Request.application
+  def _serve_plugins_listing(self, request):
+    """Serves an object mapping plugin name to whether it is enabled.
+
+    Args:
+      request: The werkzeug.Request object.
+
+    Returns:
+      A werkzeug.Response object.
+    """
+    return http_util.Respond(
+        request,
+        {plugin.plugin_name: plugin.is_active() for plugin in self._plugins},
+        'application/json')
+
   @wrappers.Request.application
   def _serve_runs(self, request):
     """WSGI app serving a JSON object about runs and tags.
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 454ba63e75..002709cd5b 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -51,6 +51,40 @@ from tensorflow.tensorboard.backend.event_processing import event_multiplexer
 from tensorflow.tensorboard.plugins import base_plugin
 
 
+class FakePlugin(base_plugin.TBPlugin):
+  """A plugin with no functionality."""
+
+  def __init__(self, plugin_name, is_active_value):
+    """Constructs a fake plugin.
+
+    Args:
+      plugin_name: The name of this plugin.
+      is_active_value: Whether the plugin is active.
+    """
+    self.plugin_name = plugin_name
+    self._is_active_value = is_active_value
+
+  def get_plugin_apps(self, multiplexer, logdir):
+    """Returns a mapping from routes to handlers offered by this plugin.
+
+    Args:
+      multiplexer: The event multiplexer.
+      logdir: The path to the directory containing logs.
+
+    Returns:
+      An empty dict. This plugin offers no routes.
+    """
+    return {}
+
+  def is_active(self):
+    """Returns whether this plugin is active.
+
+    Returns:
+      A boolean. Whether this plugin is active.
+    """
+    return self._is_active_value
+
+
 class TensorboardServerTest(test.TestCase):
   _only_use_meta_graph = False  # Server data contains only a GraphDef
 
@@ -62,7 +96,10 @@ class TensorboardServerTest(test.TestCase):
     multiplexer = event_multiplexer.EventMultiplexer(
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
-    plugins = []
+    plugins = [
+        FakePlugin(plugin_name='foo', is_active_value=True),
+        FakePlugin(plugin_name='bar', is_active_value=False)
+    ]
     app = application.TensorBoardWSGIApp(
         self.temp_dir, plugins, multiplexer, reload_interval=0)
     try:
@@ -124,6 +161,12 @@ class TensorboardServerTest(test.TestCase):
     parsed_object = self._getJson('/data/logdir')
     self.assertEqual(parsed_object, {'logdir': self.temp_dir})
 
+  def testPluginsListing(self):
+    """Test the format of the data/plugins_listing endpoint."""
+    parsed_object = self._getJson('/data/plugins_listing')
+    # Plugin foo is active. Plugin bar is not.
+    self.assertEqual(parsed_object, {'foo': True, 'bar': False})
+
   def testRuns(self):
     """Test the format of the /data/runs endpoint."""
     run_json = self._getJson('/data/runs')
@@ -484,29 +527,21 @@ class TensorboardSimpleServerConstructionTest(test.TestCase):
 class TensorBoardApplcationConstructionTest(test.TestCase):
 
   def testExceptions(self):
-
-    class UnnamedPlugin(base_plugin.TBPlugin):
-
-      def get_plugin_apps(self):
-        pass
-
-    class MockPlugin(UnnamedPlugin):
-      plugin_name = 'mock'
-
-    class OtherMockPlugin(UnnamedPlugin):
-      plugin_name = 'mock'
-
     logdir = '/fake/foo'
     multiplexer = event_multiplexer.EventMultiplexer()
 
     # Fails if there is an unnamed plugin
     with self.assertRaises(ValueError):
-      plugins = [UnnamedPlugin()]
+      # This plugin lacks a name.
+      plugins = [FakePlugin(plugin_name=None, is_active_value=True)]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
     # Fails if there are two plugins with same name
     with self.assertRaises(ValueError):
-      plugins = [MockPlugin(), OtherMockPlugin()]
+      plugins = [
+          FakePlugin(plugin_name='foo', is_active_value=True),
+          FakePlugin(plugin_name='foo', is_active_value=True),
+      ]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
 
diff --git a/tensorflow/tensorboard/backend/event_processing/event_accumulator.py b/tensorflow/tensorboard/backend/event_processing/event_accumulator.py
index beba28da06..d5a91bbb6a 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_accumulator.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_accumulator.py
@@ -438,6 +438,14 @@ class EventAccumulator(object):
     """
     return self._health_pills.Items(node_name)
 
+  def GetOpsWithHealthPills(self):
+    """Determines which ops have at least 1 health pill event.
+
+    Returns:
+      A list of names of ops with at least 1 health pill event.
+    """
+    return self._health_pills.Keys()
+
   def Graph(self):
     """Return the graph definition, if there is one.
 
diff --git a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
index 38a8cd915f..3734e470b6 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
@@ -297,8 +297,6 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     acc = ea.EventAccumulator(gen)
     gen.AddHealthPill(13371337, 41, 'Add', 0, range(1, 13))
     gen.AddHealthPill(13381338, 42, 'Add', 1, range(42, 54))
-
-    acc = ea.EventAccumulator(gen)
     acc.Reload()
 
     # Retrieve the health pills for each node name.
@@ -321,6 +319,14 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
             value=range(42, 54)),
         gotten_events[1])
 
+  def testGetOpsWithHealthPills(self):
+    gen = _EventGenerator(self)
+    acc = ea.EventAccumulator(gen)
+    gen.AddHealthPill(13371337, 41, 'Add', 0, range(1, 13))
+    gen.AddHealthPill(13381338, 42, 'MatMul', 1, range(42, 54))
+    acc.Reload()
+    self.assertItemsEqual(['Add', 'MatMul'], acc.GetOpsWithHealthPills())
+
   def testHistograms(self):
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
diff --git a/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py b/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py
index bbf958820a..08e6dbb57d 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_multiplexer.py
@@ -287,6 +287,21 @@ class EventMultiplexer(object):
     accumulator = self._GetAccumulator(run)
     return accumulator.HealthPills(node_name)
 
+  def GetOpsWithHealthPills(self, run):
+    """Determines which ops have at least 1 health pill event for a given run.
+
+    Args:
+      run: The name of the run.
+
+    Raises:
+      KeyError: If the run is not found, or the node name is not available for
+        the given run.
+
+    Returns:
+      The list of names of ops with health pill events.
+    """
+    return self._GetAccumulator(run).GetOpsWithHealthPills()
+
   def Graph(self, run):
     """Retrieve the graph associated with the provided run.
 
diff --git a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
index ed5cac4014..ded1856d7e 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
@@ -17,6 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import functools
 import os
 import os.path
 import shutil
@@ -45,10 +46,16 @@ def _CreateCleanDirectory(path):
 
 class _FakeAccumulator(object):
 
-  def __init__(self, path):
+  def __init__(self, path, health_pill_mapping=None):
+    """Constructs a fake accumulator with some fake events.
+
+    Args:
+      path: The path for the run that this accumulator is for.
+      health_pill_mapping: An optional mapping from Op to health pill strings.
+    """
     self._path = path
     self.reload_called = False
-    self._node_names_to_health_pills = {'Add': ['hp1', 'hp2']}
+    self._node_names_to_health_pills = health_pill_mapping or {}
 
   def Tags(self):
     return {event_accumulator.IMAGES: ['im1', 'im2'],
@@ -74,6 +81,9 @@ class _FakeAccumulator(object):
     health_pills = self._node_names_to_health_pills[node_name]
     return [self._path + '/' + health_pill for health_pill in health_pills]
 
+  def GetOpsWithHealthPills(self):
+    return self._node_names_to_health_pills.keys()
+
   def Histograms(self, tag_name):
     return self._TagHelper(tag_name, event_accumulator.HISTOGRAMS)
 
@@ -93,14 +103,13 @@ class _FakeAccumulator(object):
     self.reload_called = True
 
 
-# pylint: disable=unused-argument
-def _GetFakeAccumulator(
-    path,
-    size_guidance=None,
-    compression_bps=None,
-    purge_orphaned_data=None):
-  return _FakeAccumulator(path)
-# pylint: enable=unused-argument
+def _GetFakeAccumulator(path,
+                        size_guidance=None,
+                        compression_bps=None,
+                        purge_orphaned_data=None,
+                        health_pill_mapping=None):
+  del size_guidance, compression_bps, purge_orphaned_data  # Unused.
+  return _FakeAccumulator(path, health_pill_mapping=health_pill_mapping)
 
 
 class EventMultiplexerTest(test_util.TensorFlowTestCase):
@@ -141,9 +150,27 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertEqual(run1_expected, run1_actual)
 
   def testHealthPills(self):
+    self.stubs.Set(event_accumulator, 'EventAccumulator',
+                   functools.partial(
+                       _GetFakeAccumulator,
+                       health_pill_mapping={'Add': ['hp1', 'hp2']}))
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     self.assertEqual(['path1/hp1', 'path1/hp2'], x.HealthPills('run1', 'Add'))
 
+  def testGetOpsWithHealthPillsWhenHealthPillsAreNotAvailable(self):
+    # The event accumulator lacks health pills for the run.
+    x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
+    self.assertItemsEqual([], x.GetOpsWithHealthPills('run1'))
+
+  def testGetOpsWithHealthPillsWhenHealthPillsAreAvailable(self):
+    # The event accumulator has health pills for the run.
+    self.stubs.Set(event_accumulator, 'EventAccumulator',
+                   functools.partial(
+                       _GetFakeAccumulator,
+                       health_pill_mapping={'Add': ['hp1', 'hp2']}))
+    x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
+    self.assertItemsEqual(['Add'], x.GetOpsWithHealthPills('run1'))
+
   def testExceptions(self):
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     with self.assertRaises(KeyError):
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html
index dbc1dc5c5f..c90efac1d6 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-no-data-warning.html
@@ -34,10 +34,9 @@ Display a warning when there is no data found.
             and pass the graph either via the constructor, or by calling its
             <code>add_graph()</code> method.
             You may want to check out the
-            <a href="https://www.tensorflow.org/versions/master/how_tos/graph_viz/index.html">
+            <a href="https://www.tensorflow.org/get_started/graph_viz">
               graph visualizer tutorial
-            </a>
-            .
+            </a>.
           </p>
         </template>
         <template is="dom-if" if="[[_isProjector(dataType)]]">
@@ -53,7 +52,7 @@ Display a warning when there is no data found.
               <li>
                 You are not saving any checkpoint. To save your model,
                 create a
-                <a href="https://www.tensorflow.org/versions/master/api_docs/python/state_ops.html#Saver">
+                <a href="https://www.tensorflow.org/api_docs/python/tf/train/Saver">
                   <code>tf.train.Saver</code>
                 </a>
                 and save your model periodically
@@ -86,7 +85,7 @@ Display a warning when there is no data found.
             README
           </a>
           and perhaps the
-          <a href="https://www.tensorflow.org/versions/master/how_tos/summaries_and_tensorboard/index.html">
+          <a href="https://www.tensorflow.org/get_started/summaries_and_tensorboard">
             TensorBoard tutorial
           </a>.
         </p>
diff --git a/tensorflow/tensorboard/http_api.md b/tensorflow/tensorboard/http_api.md
index 16c2f95ae1..00aeb6353e 100644
--- a/tensorflow/tensorboard/http_api.md
+++ b/tensorflow/tensorboard/http_api.md
@@ -36,6 +36,13 @@ Returns a JSON object with a key "logdir" that maps to the `logdir` argument
 
 The `logdir` argument is the path of the directory that contains events files.
 
+## `data/plugins_listing`
+
+Returns a dict mapping from plugin name to a boolean indicating whether the
+plugin is active. A plugin might be inactive, for instance, if it lacks relevant
+data. Every plugin has a key. This route helps the frontend avoid issuing
+requests to an inactive plugin - the routes of an inactive plugin do not work.
+
 ## `data/runs`
 
 Returns a dictionary mapping from `run name` (quoted string) to dictionaries
diff --git a/tensorflow/tensorboard/package.json b/tensorflow/tensorboard/package.json
index ca6a9e89ce..5dcf2f21e9 100644
--- a/tensorflow/tensorboard/package.json
+++ b/tensorflow/tensorboard/package.json
@@ -30,7 +30,7 @@
     "merge2": "~0.3.6",
     "minimist": "~1.2.0",
     "tsify": "^0.14.8",
-    "typescript": "2.1.5",
+    "typescript": "2.2.2",
     "typings": "1.4.0",
     "vinyl-source-stream": "^1.1.0",
     "vulcanize": "^1.14.0",
diff --git a/tensorflow/tensorboard/plugins/base_plugin.py b/tensorflow/tensorboard/plugins/base_plugin.py
index 8b1560cf8a..259046dfb4 100644
--- a/tensorflow/tensorboard/plugins/base_plugin.py
+++ b/tensorflow/tensorboard/plugins/base_plugin.py
@@ -51,3 +51,15 @@ class TBPlugin(object):
       A dict mapping route paths to WSGI applications.
     """
     raise NotImplementedError()
+
+  @abstractmethod
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    A plugin may not be active for instance if it lacks relevant data. If a
+    plugin is inactive, the frontend may avoid issuing requests to its routes.
+
+    Returns:
+      A boolean value. Whether this plugin is active.
+    """
+    raise NotImplementedError()
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
index cfa8f68187..5d34bb91db 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
@@ -82,6 +82,21 @@ class DebuggerPlugin(base_plugin.TBPlugin):
         _HEALTH_PILLS_ROUTE: self._serve_health_pills_handler,
     }
 
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    This plugin is active if any health pills information is present for any
+    run. This method must be called only after get_plugin_apps has been called.
+
+    Returns:
+      A boolean. Whether this plugin is active.
+    """
+    for run_name in self._event_multiplexer.Runs():
+      if self._event_multiplexer.GetOpsWithHealthPills(run_name):
+        return True
+
+    return False
+
   @wrappers.Request.application
   def _serve_health_pills_handler(self, request):
     """A (wrapped) werkzeug handler for serving health pills.
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
index 2c9135fd27..f1cc2e06da 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
@@ -146,6 +146,19 @@ class DebuggerPluginTest(test.TestCase):
     self.assertIn('/health_pills', apps)
     self.assertIsInstance(apps['/health_pills'], collections.Callable)
 
+  def testHealthPillsPluginIsActive(self):
+    self.plugin.get_plugin_apps(self.multiplexer, self.log_dir)
+
+    # The multiplexer has sampled health pills.
+    self.assertTrue(self.plugin.is_active())
+
+  def testHealthPillsPluginIsInactive(self):
+    self.plugin.get_plugin_apps(
+        event_multiplexer.EventMultiplexer({}), self.log_dir)
+
+    # The multiplexer lacks sampled health pills.
+    self.assertFalse(self.plugin.is_active())
+
   def testRequestHealthPillsForRunFoo(self):
     """Tests that the plugin produces health pills for a specified run."""
     response = self.server.post(
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 32ebb78e42..001c6e1e35 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -45,6 +45,8 @@ from tensorflow.tensorboard.plugins.projector import projector_config_pb2
 _PLUGIN_PREFIX_ROUTE = 'projector'
 
 PROJECTOR_FILENAME = 'projector_config.pbtxt'
+_PLUGIN_NAME = 'org_tensorflow_tensorboard_projector'
+_PLUGINS_DIR = 'plugins'
 
 # HTTP routes.
 CONFIG_ROUTE = '/info'
@@ -112,7 +114,7 @@ class EmbeddingMetadata(object):
 
 class ProjectorPluginAsset(plugin_asset.PluginAsset):
   """Provides a registry for assets needed by the Projector plugin."""
-  plugin_name = 'org_tensorflow_tensorboard_projector'
+  plugin_name = _PLUGIN_NAME
 
   def __init__(self):
     self._config = projector_config_pb2.ProjectorConfig()
@@ -259,12 +261,20 @@ def _read_tensor_file(fpath):
   return np.array(tensor, dtype='float32')
 
 
+def _assets_dir_to_logdir(assets_dir):
+  sub_path = os.path.sep + _PLUGINS_DIR + os.path.sep
+  if sub_path in assets_dir:
+    two_parents_up = os.pardir + os.path.sep + os.pardir
+    return os.path.abspath(os.path.join(assets_dir, two_parents_up))
+  return assets_dir
+
+
 def _latest_checkpoints_changed(configs, run_path_pairs):
   """Returns true if the latest checkpoint has changed in any of the runs."""
-  for run_name, logdir in run_path_pairs:
+  for run_name, assets_dir in run_path_pairs:
     if run_name not in configs:
       config = projector_config_pb2.ProjectorConfig()
-      config_fpath = os.path.join(logdir, PROJECTOR_FILENAME)
+      config_fpath = os.path.join(assets_dir, PROJECTOR_FILENAME)
       if file_io.file_exists(config_fpath):
         file_content = file_io.read_file_to_string(config_fpath)
         text_format.Merge(file_content, config)
@@ -272,6 +282,7 @@ def _latest_checkpoints_changed(configs, run_path_pairs):
       config = configs[run_name]
 
     # See if you can find a checkpoint file in the logdir.
+    logdir = _assets_dir_to_logdir(assets_dir)
     ckpt_path = _find_latest_checkpoint(logdir)
     if not ckpt_path:
       continue
@@ -302,6 +313,12 @@ def _parse_positive_int_param(request, param_name):
     return -1
 
 
+def _rel_to_abs_asset_path(fpath, config_fpath):
+  if not os.path.isabs(fpath):
+    return os.path.join(os.path.dirname(config_fpath), fpath)
+  return fpath
+
+
 class ProjectorPlugin(TBPlugin):
   """Embedding projector."""
 
@@ -314,8 +331,10 @@ class ProjectorPlugin(TBPlugin):
     self.logdir = None
     self._configs = None
     self.old_num_run_paths = None
+    self.multiplexer = None
 
   def get_plugin_apps(self, multiplexer, logdir):
+    self.multiplexer = multiplexer
     self.run_paths = multiplexer.RunPaths()
     self.logdir = logdir
     self._handlers = {
@@ -328,10 +347,21 @@ class ProjectorPlugin(TBPlugin):
     }
     return self._handlers
 
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    This plugin is only active if any run has an embedding.
+
+    Returns:
+      A boolean. Whether this plugin is active.
+    """
+    return bool(self.configs)
+
   @property
   def configs(self):
     """Returns a map of run paths to `ProjectorConfig` protos."""
     run_path_pairs = list(self.run_paths.items())
+    self._append_plugin_asset_directories(run_path_pairs)
     # If there are no summary event files, the projector should still work,
     # treating the `logdir` as the model checkpoint directory.
     if not run_path_pairs:
@@ -359,7 +389,9 @@ class ProjectorPlugin(TBPlugin):
           embedding.tensor_name = embedding.tensor_name[:-2]
         # Find the size of embeddings associated with a tensors file.
         if embedding.tensor_path and not embedding.tensor_shape:
-          tensor = _read_tensor_file(embedding.tensor_path)
+          fpath = _rel_to_abs_asset_path(embedding.tensor_path,
+                                         self.config_fpaths[run])
+          tensor = _read_tensor_file(fpath)
           embedding.tensor_shape.extend([len(tensor), len(tensor[0])])
 
       reader = self._get_reader_for_run(run)
@@ -397,13 +429,12 @@ class ProjectorPlugin(TBPlugin):
     """Reads and returns the projector config files in every run directory."""
     configs = {}
     config_fpaths = {}
-    for run_name, logdir in run_path_pairs:
+    for run_name, assets_dir in run_path_pairs:
       config = projector_config_pb2.ProjectorConfig()
-      config_fpath = os.path.join(logdir, PROJECTOR_FILENAME)
+      config_fpath = os.path.join(assets_dir, PROJECTOR_FILENAME)
       if file_io.file_exists(config_fpath):
         file_content = file_io.read_file_to_string(config_fpath)
         text_format.Merge(file_content, config)
-
       has_tensor_files = False
       for embedding in config.embeddings:
         if embedding.tensor_path:
@@ -412,6 +443,7 @@ class ProjectorPlugin(TBPlugin):
 
       if not config.model_checkpoint_path:
         # See if you can find a checkpoint file in the logdir.
+        logdir = _assets_dir_to_logdir(assets_dir)
         ckpt_path = _find_latest_checkpoint(logdir)
         if not ckpt_path and not has_tensor_files:
           continue
@@ -421,7 +453,7 @@ class ProjectorPlugin(TBPlugin):
       # Sanity check for the checkpoint file.
       if (config.model_checkpoint_path and
           not checkpoint_exists(config.model_checkpoint_path)):
-        logging.warning('Checkpoint file %s not found',
+        logging.warning('Checkpoint file "%s" not found',
                         config.model_checkpoint_path)
         continue
       configs[run_name] = config
@@ -438,7 +470,7 @@ class ProjectorPlugin(TBPlugin):
       try:
         reader = NewCheckpointReader(config.model_checkpoint_path)
       except Exception:  # pylint: disable=broad-except
-        logging.warning('Failed reading %s', config.model_checkpoint_path)
+        logging.warning('Failed reading "%s"', config.model_checkpoint_path)
     self.readers[run] = reader
     return reader
 
@@ -469,6 +501,12 @@ class ProjectorPlugin(TBPlugin):
         return info
     return None
 
+  def _append_plugin_asset_directories(self, run_path_pairs):
+    for run in self.multiplexer.PluginAssets(_PLUGIN_NAME):
+      assets_dir = os.path.join(self.run_paths[run], _PLUGINS_DIR, _PLUGIN_NAME)
+      assets_path_pair = (run, os.path.abspath(assets_dir))
+      run_path_pairs.append(assets_path_pair)
+
   @wrappers.Request.application
   def _serve_runs(self, request):
     """Returns a list of runs that have embeddings."""
@@ -481,7 +519,7 @@ class ProjectorPlugin(TBPlugin):
       return Respond(request, 'query parameter "run" is required', 'text/plain',
                      400)
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     return Respond(request,
@@ -505,17 +543,19 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     fpath = self._get_metadata_file_for_tensor(name, config)
     if not fpath:
       return Respond(
           request,
-          'No metadata file found for tensor %s in the config file %s' %
+          'No metadata file found for tensor "%s" in the config file "%s"' %
           (name, self.config_fpaths[run]), 'text/plain', 400)
+    fpath = _rel_to_abs_asset_path(fpath, self.config_fpaths[run])
     if not file_io.file_exists(fpath) or file_io.is_directory(fpath):
-      return Respond(request, '%s is not a file' % fpath, 'text/plain', 400)
+      return Respond(request, '"%s" not found, or is not a file' % fpath,
+                     'text/plain', 400)
 
     num_header_rows = 0
     with file_io.FileIO(fpath, 'r') as f:
@@ -548,26 +588,24 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
-    reader = self._get_reader_for_run(run)
     config = self.configs[run]
 
-    if reader is None:
-      # See if there is a tensor file in the config.
-      embedding = self._get_embedding(name, config)
-      if not embedding or not embedding.tensor_path:
+    # See if there is a tensor file in the config.
+    embedding = self._get_embedding(name, config)
+    if embedding and embedding.tensor_path:
+      fpath = _rel_to_abs_asset_path(embedding.tensor_path,
+                                     self.config_fpaths[run])
+      if not file_io.file_exists(fpath):
         return Respond(request,
-                       'Tensor %s has no tensor_path in the config' % name,
+                       'Tensor file "%s" does not exist' % fpath,
                        'text/plain', 400)
-      if not file_io.file_exists(embedding.tensor_path):
-        return Respond(request,
-                       'Tensor file %s does not exist' % embedding.tensor_path,
-                       'text/plain', 400)
-      tensor = _read_tensor_file(embedding.tensor_path)
+      tensor = _read_tensor_file(fpath)
     else:
-      if not reader.has_tensor(name):
-        return Respond(request, 'Tensor %s not found in checkpoint dir %s' %
+      reader = self._get_reader_for_run(run)
+      if not reader or not reader.has_tensor(name):
+        return Respond(request, 'Tensor "%s" not found in checkpoint dir "%s"' %
                        (name, config.model_checkpoint_path), 'text/plain', 400)
       try:
         tensor = reader.get_tensor(name)
@@ -595,17 +633,19 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     fpath = self._get_bookmarks_file_for_tensor(name, config)
     if not fpath:
       return Respond(
           request,
-          'No bookmarks file found for tensor %s in the config file %s' %
+          'No bookmarks file found for tensor "%s" in the config file "%s"' %
           (name, self.config_fpaths[run]), 'text/plain', 400)
+    fpath = _rel_to_abs_asset_path(fpath, self.config_fpaths[run])
     if not file_io.file_exists(fpath) or file_io.is_directory(fpath):
-      return Respond(request, '%s is not a file' % fpath, 'text/plain', 400)
+      return Respond(request, '"%s" not found, or is not a file' % fpath,
+                     'text/plain', 400)
 
     bookmarks_json = None
     with file_io.FileIO(fpath, 'rb') as f:
@@ -625,7 +665,7 @@ class ProjectorPlugin(TBPlugin):
                      'text/plain', 400)
 
     if run not in self.configs:
-      return Respond(request, 'Unknown run: %s' % run, 'text/plain', 400)
+      return Respond(request, 'Unknown run: "%s"' % run, 'text/plain', 400)
 
     config = self.configs[run]
     embedding_info = self._get_embedding(name, config)
@@ -633,12 +673,13 @@ class ProjectorPlugin(TBPlugin):
     if not embedding_info or not embedding_info.sprite.image_path:
       return Respond(
           request,
-          'No sprite image file found for tensor %s in the config file %s' %
+          'No sprite image file found for tensor "%s" in the config file "%s"' %
           (name, self.config_fpaths[run]), 'text/plain', 400)
 
     fpath = os.path.expanduser(embedding_info.sprite.image_path)
+    fpath = _rel_to_abs_asset_path(fpath, self.config_fpaths[run])
     if not file_io.file_exists(fpath) or file_io.is_directory(fpath):
-      return Respond(request, '%s does not exist or is directory' % fpath,
+      return Respond(request, '"%s" does not exist or is directory' % fpath,
                      'text/plain', 400)
     f = file_io.FileIO(fpath, 'rb')
     encoded_image_string = f.read()
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index 5679eff4a3..9e2e7159d8 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -55,7 +55,7 @@ class ProjectorAppTest(test.TestCase):
     self._GenerateProjectorTestData()
     self._SetupWSGIApp()
     run_json = self._GetJson('/data/plugin/projector/runs')
-    self.assertEqual(run_json, ['.'])
+    self.assertTrue(run_json)
 
   def testRunsWithNoCheckpoint(self):
     self._SetupWSGIApp()
@@ -73,6 +73,19 @@ class ProjectorAppTest(test.TestCase):
     run_json = self._GetJson('/data/plugin/projector/runs')
     self.assertEqual(run_json, [])
 
+  def testRunsWithInvalidModelCheckpointPathInConfig(self):
+    config_path = os.path.join(self.log_dir, 'projector_config.pbtxt')
+    config = projector_config_pb2.ProjectorConfig()
+    config.model_checkpoint_path = 'does_not_exist'
+    embedding = config.embeddings.add()
+    embedding.tensor_name = 'var1'
+    with gfile.GFile(config_path, 'w') as f:
+      f.write(text_format.MessageToString(config))
+    self._SetupWSGIApp()
+
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertEqual(run_json, [])
+
   def testInfoWithValidCheckpoint(self):
     self._GenerateProjectorTestData()
     self._SetupWSGIApp()
@@ -80,7 +93,8 @@ class ProjectorAppTest(test.TestCase):
     info_json = self._GetJson('/data/plugin/projector/info?run=.')
     self.assertItemsEqual(info_json['embeddings'], [{
         'tensorShape': [1, 2],
-        'tensorName': 'var1'
+        'tensorName': 'var1',
+        'bookmarksPath': 'bookmarks.json'
     }, {
         'tensorShape': [10, 10],
         'tensorName': 'var2'
@@ -95,17 +109,286 @@ class ProjectorAppTest(test.TestCase):
 
     url = '/data/plugin/projector/tensor?run=.&name=var1'
     tensor_bytes = self._Get(url).data
-    tensor = np.reshape(np.fromstring(tensor_bytes, dtype='float32'), [1, 2])
-    expected_tensor = np.array([[6, 6]], dtype='float32')
+    expected_tensor = np.array([[6, 6]], dtype=np.float32)
+    self._AssertTensorResponse(tensor_bytes, expected_tensor)
+
+  def testBookmarksRequestMissingRunAndName(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksRequestMissingName(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=.'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksRequestMissingRun(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?name=var1'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksUnknownRun(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=unknown&name=var1'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarksUnknownName(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=.&name=unknown'
+    self.assertEqual(self._Get(url).status_code, 400)
+
+  def testBookmarks(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    url = '/data/plugin/projector/bookmarks?run=.&name=var1'
+    bookmark = self._GetJson(url)
+    self.assertEqual(bookmark, {'a': 'b'})
+
+  def testEndpointsNoAssets(self):
+    g = ops.Graph()
+    with g.as_default():
+      plugin_asset.get_plugin_asset(projector_plugin.ProjectorPluginAsset)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertEqual(run_json, [])
+
+  def testEndpointsMetadataForVariableAssets(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('test', metadata)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertTrue(run_json)
+
+    run = run_json[0]
+    metedata_query = '/data/plugin/projector/metadata?run=%s&name=test' % run
+    metadata_tsv = self._Get(metedata_query).data
+    self.assertEqual(metadata_tsv, b'a\nb\nc\n')
+
+    unk_tensor_query = '/data/plugin/projector/tensor?run=%s&name=test' % run
+    response = self._Get(unk_tensor_query)
+    self.assertEqual(response.status_code, 400)
+
+    expected_tensor = np.array([[6, 6]], dtype=np.float32)
+    tensor_query = '/data/plugin/projector/tensor?run=%s&name=var1' % run
+    tensor_bytes = self._Get(tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, expected_tensor)
+
+  def testEndpointsMetadataForVariableAssetsButNoCheckpoint(self):
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('test', metadata)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertEqual(run_json, [])
+
+  def testEndpointsTensorAndMetadataAssets(self):
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('test', metadata)
+    expected_tensor = np.array([[1, 2], [3, 4], [5, 6]])
+    image1 = np.array([[[1, 2, 3], [4, 5, 6]],
+                       [[7, 8, 9], [10, 11, 12]]])
+    image2 = np.array([[[10, 20, 30], [40, 50, 60]],
+                       [[70, 80, 90], [100, 110, 120]]])
+    manager.add_embedding('emb', expected_tensor, metadata, [image1, image2],
+                          [2, 2])
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertTrue(run_json)
+
+    run = run_json[0]
+    metadata_query = '/data/plugin/projector/metadata?run=%s&name=emb' % run
+    metadata_tsv = self._Get(metadata_query).data
+    self.assertEqual(metadata_tsv, b'a\nb\nc\n')
+
+    unk_metadata_query = '/data/plugin/projector/metadata?run=%s&name=q' % run
+    response = self._Get(unk_metadata_query)
+    self.assertEqual(response.status_code, 400)
+
+    tensor_query = '/data/plugin/projector/tensor?run=%s&name=emb' % run
+    tensor_bytes = self._Get(tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, expected_tensor)
+
+    unk_tensor_query = '/data/plugin/projector/tensor?run=%s&name=var1' % run
+    response = self._Get(unk_tensor_query)
+    self.assertEqual(response.status_code, 400)
+
+    image_query = '/data/plugin/projector/sprite_image?run=%s&name=emb' % run
+    image_bytes = self._Get(image_query).data
+    with ops.Graph().as_default():
+      s = session.Session()
+      image_array = image_ops.decode_png(image_bytes).eval(session=s).tolist()
+    expected_sprite_image = [
+        [[1, 2, 3], [4, 5, 6], [10, 20, 30], [40, 50, 60]],
+        [[7, 8, 9], [10, 11, 12], [70, 80, 90], [100, 110, 120]],
+        [[0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0]],
+        [[0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0]]
+    ]
+    self.assertEqual(image_array, expected_sprite_image)
+
+  def testSpriteImageRequestMissingRunAndName(self):
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageRequestMissingName(self):
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image?run=.'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageRequestMissingRun(self):
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image?name=emb'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageUnknownRun(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+    image1 = np.array([[[1, 2, 3], [4, 5, 6]],
+                       [[7, 8, 9], [10, 11, 12]]])
+    image2 = np.array([[[10, 20, 30], [40, 50, 60]],
+                       [[70, 80, 90], [100, 110, 120]]])
+    manager.add_metadata_for_embedding_variable('var1',
+                                                thumbnails=[image1, image2],
+                                                thumbnail_dim=[2, 2])
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+    self._SetupWSGIApp()
+
+    q = '/data/plugin/projector/sprite_image?run=unknown&name=var1'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testSpriteImageUnknownName(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+    image1 = np.array([[[1, 2, 3], [4, 5, 6]],
+                       [[7, 8, 9], [10, 11, 12]]])
+    image2 = np.array([[[10, 20, 30], [40, 50, 60]],
+                       [[70, 80, 90], [100, 110, 120]]])
+    manager.add_metadata_for_embedding_variable('var1',
+                                                thumbnails=[image1, image2],
+                                                thumbnail_dim=[2, 2])
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+    self._SetupWSGIApp()
+    q = '/data/plugin/projector/sprite_image?run=.&name=unknown'
+    response = self._Get(q)
+    self.assertEqual(response.status_code, 400)
+
+  def testEndpointsComboTensorAssetsAndCheckpoint(self):
+    self._GenerateProjectorTestData()
+    g = ops.Graph()
+    with g.as_default():
+      manager = plugin_asset.get_plugin_asset(
+          projector_plugin.ProjectorPluginAsset)
+
+    metadata = projector_plugin.EmbeddingMetadata(3)
+    metadata.add_column('labels', ['a', 'b', 'c'])
+    manager.add_metadata_for_embedding_variable('var1', metadata)
+
+    new_tensor_values = np.array([[1, 2], [3, 4], [5, 6]])
+    manager.add_embedding('new_tensor', new_tensor_values)
+
+    fw = writer.FileWriter(self.log_dir, graph=g)
+    fw.close()
+
+    self._SetupWSGIApp()
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertTrue(run_json)
+
+    run = run_json[0]
+    var1_values = np.array([[6, 6]], dtype=np.float32)
+    var1_tensor_query = '/data/plugin/projector/tensor?run=%s&name=var1' % run
+    tensor_bytes = self._Get(var1_tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, var1_values)
+
+    metadata_query = '/data/plugin/projector/metadata?run=%s&name=var1' % run
+    metadata_tsv = self._Get(metadata_query).data
+    self.assertEqual(metadata_tsv, b'a\nb\nc\n')
+
+    tensor_query = '/data/plugin/projector/tensor?run=%s&name=new_tensor' % run
+    tensor_bytes = self._Get(tensor_query).data
+    self._AssertTensorResponse(tensor_bytes, new_tensor_values)
+
+  def _AssertTensorResponse(self, tensor_bytes, expected_tensor):
+    tensor = np.reshape(np.fromstring(tensor_bytes, dtype=np.float32),
+                        expected_tensor.shape)
     self.assertTrue(np.array_equal(tensor, expected_tensor))
 
+  def testPluginIsActive(self):
+    self._GenerateProjectorTestData()
+    self._SetupWSGIApp()
+
+    # Embedding data is available.
+    self.assertTrue(self.plugin.is_active())
+
+  def testPluginIsNotActive(self):
+    self._SetupWSGIApp()
+
+    # Embedding data is not available.
+    self.assertFalse(self.plugin.is_active())
+
   def _SetupWSGIApp(self):
     multiplexer = event_multiplexer.EventMultiplexer(
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
-    plugin = projector_plugin.ProjectorPlugin()
+    self.plugin = projector_plugin.ProjectorPlugin()
     wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [plugin], multiplexer, reload_interval=0)
+        self.log_dir, [self.plugin], multiplexer, reload_interval=0)
     self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
 
   def _Get(self, path):
@@ -124,6 +407,11 @@ class ProjectorAppTest(test.TestCase):
     embedding = config.embeddings.add()
     # Add an embedding by its canonical tensor name.
     embedding.tensor_name = 'var1:0'
+
+    with gfile.GFile(os.path.join(self.log_dir, 'bookmarks.json'), 'w') as f:
+      f.write('{"a": "b"}')
+    embedding.bookmarks_path = 'bookmarks.json'
+
     config_pbtxt = text_format.MessageToString(config)
     with gfile.GFile(config_path, 'w') as f:
       f.write(config_pbtxt)
@@ -342,6 +630,30 @@ class ProjectorPluginAssetTest(test.TestCase):
           'test', np.array([[1], [2], [3]]), thumbnails=thumbnails,
           thumbnail_dim=[4])
 
+  def testAddEmbeddingThumbnailListHasNoEntries(self):
+    manager = plugin_asset.get_plugin_asset(
+        projector_plugin.ProjectorPluginAsset)
+
+    with self.assertRaises(ValueError):
+      manager.add_embedding('test', np.array([[1]]), thumbnails=[],
+                            thumbnail_dim=[1, 1])
+
+  def testAddEmbeddingThumbnailListNotOfRank4(self):
+    manager = plugin_asset.get_plugin_asset(
+        projector_plugin.ProjectorPluginAsset)
+
+    with self.assertRaises(ValueError):
+      manager.add_embedding('test2', np.array([[1]]),
+                            thumbnails=np.array([[1]]), thumbnail_dim=[1, 1])
+
+  def testAddEmbeddingThumbnailListEntriesNot3DTensors(self):
+    manager = plugin_asset.get_plugin_asset(
+        projector_plugin.ProjectorPluginAsset)
+
+    with self.assertRaises(ValueError):
+      manager.add_embedding('test3', np.array([[1]]), thumbnails=[[1, 2, 3]],
+                            thumbnail_dim=[1, 1])
+
   def testAddEmbeddingWithMetadataOfIncorrectLength(self):
     manager = plugin_asset.get_plugin_asset(
         projector_plugin.ProjectorPluginAsset)
@@ -392,8 +704,8 @@ class ProjectorPluginAssetTest(test.TestCase):
 
     with ops.Graph().as_default() as g:
       plugin_asset.get_plugin_asset(projector_plugin.ProjectorPluginAsset)
-      fw = writer.FileWriter(logdir)
-      fw.add_graph(g)
+      fw = writer.FileWriter(logdir, graph=g)
+      fw.close()
 
     with gfile.Open(os.path.join(plugin_dir, 'projector_config.pbtxt')) as f:
       content = f.read()
@@ -405,8 +717,8 @@ class ProjectorPluginAssetTest(test.TestCase):
                               projector_plugin.ProjectorPluginAsset.plugin_name)
 
     with ops.Graph().as_default() as g:
-      fw = writer.FileWriter(logdir)
-      fw.add_graph(g)
+      fw = writer.FileWriter(logdir, graph=g)
+      fw.close()
 
     self.assertFalse(
         gfile.Exists(plugin_dir),
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin.py b/tensorflow/tensorboard/plugins/text/text_plugin.py
index b337ce2ad0..427a761d1e 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin.py
@@ -292,3 +292,13 @@ class TextPlugin(base_plugin.TBPlugin):
         RUNS_ROUTE: self.runs_route,
         TEXT_ROUTE: self.text_route,
     }
+
+  def is_active(self):
+    """Determines whether this plugin is active.
+
+    This plugin is only active if TensorBoard sampled any text summaries.
+
+    Returns:
+      Whether this plugin is active.
+    """
+    return bool(self.index_impl())
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin_test.py b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
index 846995b9a9..91dca289ce 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
@@ -390,6 +390,20 @@ class TextPluginTest(test.TestCase):
       </table>""")
     self.assertEqual(convert(d3), d3_expected)
 
+  def testPluginIsActive(self):
+    plugin = text_plugin.TextPlugin()
+    multiplexer = event_multiplexer.EventMultiplexer()
+    plugin.get_plugin_apps(event_multiplexer.EventMultiplexer(), None)
+
+    # The plugin is inactive because text summaries are not available.
+    self.assertFalse(plugin.is_active())
+
+    multiplexer.AddRunsFromDirectory(self.logdir)
+    multiplexer.Reload()
+
+    # The plugin is active because text summaries are available.
+    self.assertTrue(self.plugin.is_active())
+
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 156f7b13bd..ddffabd8cb 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -41,76 +41,82 @@ def tf_android_core_proto_headers(core_proto_sources_relative):
   ])
 
 
+# Sanitize a dependency so that it works correctly from code that includes
+# TensorFlow as a submodule.
+def clean_dep(dep):
+  return str(Label(dep))
+
+
 def if_android_x86(a):
   return select({
-      str(Label("//tensorflow:android_x86")): a,
-      str(Label("//tensorflow:android_x86_64")): a,
+      clean_dep("//tensorflow:android_x86"): a,
+      clean_dep("//tensorflow:android_x86_64"): a,
       "//conditions:default": [],
   })
 
 
 def if_android_arm(a):
   return select({
-      str(Label("//tensorflow:android_arm")): a,
+      clean_dep("//tensorflow:android_arm"): a,
       "//conditions:default": [],
   })
 
 
 def if_android_arm64(a):
   return select({
-      str(Label("//tensorflow:android_arm64")): a,
+      clean_dep("//tensorflow:android_arm64"): a,
       "//conditions:default": [],
   })
 
 
 def if_not_android(a):
   return select({
-      str(Label("//tensorflow:android")): [],
+      clean_dep("//tensorflow:android"): [],
       "//conditions:default": a,
   })
 
 
 def if_android(a):
   return select({
-      str(Label("//tensorflow:android")): a,
+      clean_dep("//tensorflow:android"): a,
       "//conditions:default": [],
   })
 
 
 def if_ios(a):
   return select({
-      str(Label("//tensorflow:ios")): a,
+      clean_dep("//tensorflow:ios"): a,
       "//conditions:default": [],
   })
 
 
 def if_mobile(a):
   return select({
-      str(Label("//tensorflow:android")): a,
-      str(Label("//tensorflow:ios")): a,
+      clean_dep("//tensorflow:android"): a,
+      clean_dep("//tensorflow:ios"): a,
       "//conditions:default": [],
   })
 
 
 def if_not_mobile(a):
   return select({
-      str(Label("//tensorflow:android")): [],
-      str(Label("//tensorflow:ios")): [],
+      clean_dep("//tensorflow:android"): [],
+      clean_dep("//tensorflow:ios"): [],
       "//conditions:default": a,
   })
 
 
 def if_not_windows(a):
   return select({
-      str(Label("//tensorflow:windows")): [],
+      clean_dep("//tensorflow:windows"): [],
       "//conditions:default": a,
   })
 
 
 def if_x86(a):
   return select({
-      str(Label("//tensorflow:linux_x86_64")): a,
-      str(Label("//tensorflow:windows")): a,
+      clean_dep("//tensorflow:linux_x86_64"): a,
+      clean_dep("//tensorflow:windows"): a,
       "//conditions:default": [],
   })
 
@@ -124,13 +130,13 @@ def tf_copts():
       "-fno-exceptions",
   ] + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]) + if_android_arm(
       ["-mfpu=neon"]) + if_x86(["-msse3"]) + select({
-          "//tensorflow:android": [
+          clean_dep("//tensorflow:android"): [
               "-std=c++11",
               "-DTF_LEAN_BINARY",
               "-O2",
           ],
-          "//tensorflow:darwin": [],
-          "//tensorflow:windows": [
+          clean_dep("//tensorflow:darwin"): [],
+          clean_dep("//tensorflow:windows"): [
               "/DLANG_CXX11",
               "/D__VERSION__=\\\"MSVC\\\"",
               "/DPLATFORM_WINDOWS",
@@ -138,7 +144,7 @@ def tf_copts():
               "/DEIGEN_HAS_C99_MATH",
               "/DTENSORFLOW_USE_EIGEN_THREADPOOL",
           ],
-          "//tensorflow:ios": ["-std=c++11"],
+          clean_dep("//tensorflow:ios"): ["-std=c++11"],
           "//conditions:default": ["-pthread"]
       }))
 
@@ -166,7 +172,7 @@ def tf_gen_op_libs(op_lib_names, deps=None):
         name=n + "_op_lib",
         copts=tf_copts(),
         srcs=["ops/" + n + ".cc"],
-        deps=deps + ["//tensorflow/core:framework"],
+        deps=deps + [clean_dep("//tensorflow/core:framework")],
         visibility=["//visibility:public"],
         alwayslink=1,
         linkstatic=1,)
@@ -175,7 +181,7 @@ def tf_gen_op_libs(op_lib_names, deps=None):
 def tf_gen_op_wrapper_cc(name,
                          out_ops_file,
                          pkg="",
-                         op_gen="//tensorflow/cc:cc_op_gen_main",
+                         op_gen=clean_dep("//tensorflow/cc:cc_op_gen_main"),
                          deps=None,
                          override_file=None,
                          include_internal_ops=0):
@@ -242,11 +248,11 @@ def tf_gen_op_wrappers_cc(name,
                           other_hdrs=[],
                           pkg="",
                           deps=[
-                              str(Label("//tensorflow/cc:ops")),
-                              str(Label("//tensorflow/cc:scope")),
-                              str(Label("//tensorflow/cc:const_op")),
+                              clean_dep("//tensorflow/cc:ops"),
+                              clean_dep("//tensorflow/cc:scope"),
+                              clean_dep("//tensorflow/cc:const_op"),
                           ],
-                          op_gen=str(Label("//tensorflow/cc:cc_op_gen_main")),
+                          op_gen=clean_dep("//tensorflow/cc:cc_op_gen_main"),
                           override_file=None,
                           include_internal_ops=0,
                           visibility=None):
@@ -272,12 +278,12 @@ def tf_gen_op_wrappers_cc(name,
       srcs=subsrcs,
       hdrs=subhdrs,
       deps=deps + if_not_android([
-          "//tensorflow/core:core_cpu",
-          "//tensorflow/core:framework",
-          "//tensorflow/core:lib",
-          "//tensorflow/core:protos_all_cc",
+          clean_dep("//tensorflow/core:core_cpu"),
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/core:lib"),
+          clean_dep("//tensorflow/core:protos_all_cc"),
       ]) + if_android([
-          "//tensorflow/core:android_tensorflow_lib",
+          clean_dep("//tensorflow/core:android_tensorflow_lib"),
       ]),
       copts=tf_copts(),
       alwayslink=1,
@@ -287,16 +293,16 @@ def tf_gen_op_wrappers_cc(name,
       srcs=internalsrcs,
       hdrs=internalhdrs,
       deps=deps + if_not_android([
-          "//tensorflow/core:core_cpu",
-          "//tensorflow/core:framework",
-          "//tensorflow/core:lib",
-          "//tensorflow/core:protos_all_cc",
+          clean_dep("//tensorflow/core:core_cpu"),
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/core:lib"),
+          clean_dep("//tensorflow/core:protos_all_cc"),
       ]) + if_android([
-          "//tensorflow/core:android_tensorflow_lib",
+          clean_dep("//tensorflow/core:android_tensorflow_lib"),
       ]),
       copts=tf_copts(),
       alwayslink=1,
-      visibility=["//tensorflow:internal"])
+      visibility=[clean_dep("//tensorflow:internal")])
 
 
 # Invoke this rule in .../tensorflow/python to build the wrapper library.
@@ -318,10 +324,10 @@ def tf_gen_op_wrapper_py(name,
       copts=tf_copts(),
       linkstatic=1,  # Faster to link this one-time-use binary dynamically
       deps=([
-          "//tensorflow/core:framework",
-          "//tensorflow/python:python_op_gen_main"
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/python:python_op_gen_main")
       ] + deps),
-      visibility=["//tensorflow:internal"],)
+      visibility=[clean_dep("//tensorflow:internal")],)
 
   # Invoke the previous cc_binary to generate a python file.
   if not out:
@@ -363,7 +369,7 @@ def tf_gen_op_wrapper_py(name,
       srcs_version="PY2AND3",
       visibility=visibility,
       deps=[
-          "//tensorflow/python:framework_for_generated_wrappers_v2",
+          clean_dep("//tensorflow/python:framework_for_generated_wrappers_v2"),
       ],)
 
 
@@ -439,7 +445,7 @@ def tf_cuda_cc_test(name,
       name=name,
       srcs=srcs,
       suffix="_gpu",
-      deps=deps + if_cuda(["//tensorflow/core:gpu_runtime"]),
+      deps=deps + if_cuda([clean_dep("//tensorflow/core:gpu_runtime")]),
       linkstatic=if_cuda(1, 0),
       tags=tags + tf_cuda_tests_tags(),
       data=data,
@@ -547,8 +553,8 @@ def tf_gpu_kernel_library(srcs,
       hdrs=hdrs,
       copts=copts,
       deps=deps + if_cuda([
-          "//tensorflow/core:cuda",
-          "//tensorflow/core:gpu_lib",
+          clean_dep("//tensorflow/core:cuda"),
+          clean_dep("//tensorflow/core:gpu_lib"),
       ]),
       alwayslink=1,
       **kwargs)
@@ -579,7 +585,7 @@ def tf_cuda_library(deps=None, cuda_deps=None, copts=None, **kwargs):
 
   native.cc_library(
       deps=deps + if_cuda(cuda_deps + [
-          "//tensorflow/core:cuda",
+          clean_dep("//tensorflow/core:cuda"),
           "@local_config_cuda//cuda:cuda_headers"
       ]),
       copts=copts + if_cuda(["-DGOOGLE_CUDA=1"]) + if_mkl(["-DINTEL_MKL=1"]),
@@ -634,7 +640,7 @@ def tf_kernel_library(name,
     hdrs = hdrs + native.glob(
         [prefix + "*.h"], exclude=[prefix + "*test*", prefix + "*.cu.h"])
 
-  cuda_deps = [str(Label("//tensorflow/core:gpu_lib"))]
+  cuda_deps = [clean_dep("//tensorflow/core:gpu_lib")]
   if gpu_srcs:
     for gpu_src in gpu_srcs:
       if gpu_src.endswith(".cc") and not gpu_src.endswith(".cu.cc"):
@@ -810,8 +816,8 @@ def cc_header_only_library(name, deps=[], **kwargs):
 def tf_custom_op_library_additional_deps():
   return [
       "@protobuf//:protobuf_headers",
-      str(Label("//third_party/eigen3")),
-      str(Label("//tensorflow/core:framework_headers_lib")),
+      clean_dep("//third_party/eigen3"),
+      clean_dep("//tensorflow/core:framework_headers_lib"),
   ]
 
 
@@ -871,7 +877,7 @@ check_deps = rule(
 # implementations of custom ops and kernels.
 def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
   cuda_deps = [
-      str(Label("//tensorflow/core:stream_executor_headers_lib")),
+      clean_dep("//tensorflow/core:stream_executor_headers_lib"),
       "@local_config_cuda//cuda:cudart_static",
   ]
   deps = deps + tf_custom_op_library_additional_deps()
@@ -888,8 +894,8 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
       name=name + "_check_deps",
       deps=deps + if_cuda(cuda_deps),
       disallowed_deps=[
-          "//tensorflow/core:framework",
-          "//tensorflow/core:lib"
+          clean_dep("//tensorflow/core:framework"),
+          clean_dep("//tensorflow/core:lib")
       ])
 
   native.cc_binary(
@@ -903,7 +909,7 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[]):
           "//conditions:default": [
               "-lm",
           ],
-          "//tensorflow:darwin": [],
+          clean_dep("//tensorflow:darwin"): [],
       }),)
 
 
@@ -956,21 +962,21 @@ def tf_py_wrap_cc(name,
   extra_linkopts = select({
       "@local_config_cuda//cuda:darwin": [
           "-Wl,-exported_symbols_list",
-          str(Label("//tensorflow:tf_exported_symbols.lds"))
+          clean_dep("//tensorflow:tf_exported_symbols.lds")
       ],
-      str(Label("//tensorflow:windows")): [],
+      clean_dep("//tensorflow:windows"): [],
       "//conditions:default": [
           "-Wl,--version-script",
-          "//tensorflow:tf_version_script.lds"
+          clean_dep("//tensorflow:tf_version_script.lds")
       ]
   })
   extra_deps += select({
       "@local_config_cuda//cuda:darwin": [
-          "//tensorflow:tf_exported_symbols.lds"
+          clean_dep("//tensorflow:tf_exported_symbols.lds")
       ],
-      "//tensorflow:windows": [],
+      clean_dep("//tensorflow:windows"): [],
       "//conditions:default": [
-          "//tensorflow:tf_version_script.lds"
+          clean_dep("//tensorflow:tf_version_script.lds")
       ]
   })
 
@@ -994,7 +1000,7 @@ def tf_py_wrap_cc(name,
       srcs=[":" + name + ".py"],
       srcs_version="PY2AND3",
       data=select({
-          "//tensorflow:windows": [":" + cc_library_pyd_name],
+          clean_dep("//tensorflow:windows"): [":" + cc_library_pyd_name],
           "//conditions:default": [":" + cc_library_name],
       }))
 
@@ -1003,7 +1009,7 @@ def py_test(deps=[], **kwargs):
   native.py_test(
       deps=select({
           "//conditions:default": deps,
-          "//tensorflow:no_tensorflow_py_deps": []
+          clean_dep("//tensorflow:no_tensorflow_py_deps"): []
       }),
       **kwargs)
 
@@ -1028,15 +1034,15 @@ def tf_py_test(name,
       main=main,
       args=args,
       tags=tags,
-      visibility=[str(Label("//tensorflow:internal"))],
+      visibility=[clean_dep("//tensorflow:internal")],
       shard_count=shard_count,
       data=data,
       deps=select({
           "//conditions:default": [
-              "//tensorflow/python:extra_py_tests_deps",
-              "//tensorflow/python:gradient_checker",
+              clean_dep("//tensorflow/python:extra_py_tests_deps"),
+              clean_dep("//tensorflow/python:gradient_checker"),
           ] + additional_deps,
-          "//tensorflow:no_tensorflow_py_deps": []
+          clean_dep("//tensorflow:no_tensorflow_py_deps"): []
       }),
       flaky=flaky,
       srcs_version="PY2AND3")
@@ -1153,13 +1159,13 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs):
   out_srcs = [p.replace(".proto", ".pb_text.cc") for p in srcs]
   native.genrule(
       name=name,
-      srcs=srcs + ["//tensorflow/tools/proto_text:placeholder.txt"],
+      srcs=srcs + [clean_dep("//tensorflow/tools/proto_text:placeholder.txt")],
       outs=out_hdrs + out_srcs,
       cmd=
       "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) "
       + "$(@D) " + srcs_relative_dir + " $(SRCS)",
       tools=[
-          "//tensorflow/tools/proto_text:gen_proto_text_functions"
+          clean_dep("//tensorflow/tools/proto_text:gen_proto_text_functions")
       ],)
   return struct(hdrs=out_hdrs, srcs=out_srcs)
 
@@ -1173,15 +1179,15 @@ def tf_version_info_genrule():
   native.genrule(
       name="version_info_gen",
       srcs=[
-          "//tensorflow/tools/git:gen/spec.json",
-          "//tensorflow/tools/git:gen/head",
-          "//tensorflow/tools/git:gen/branch_ref",
+          clean_dep("//tensorflow/tools/git:gen/spec.json"),
+          clean_dep("//tensorflow/tools/git:gen/head"),
+          clean_dep("//tensorflow/tools/git:gen/branch_ref"),
       ],
       outs=["util/version_info.cc"],
       cmd=
       "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
       local=1,
-      tools=["//tensorflow/tools/git:gen_git_source.py"],)
+      tools=[clean_dep("//tensorflow/tools/git:gen_git_source.py")],)
 
 
 def cc_library_with_android_deps(deps,
diff --git a/tensorflow/tools/dist_test/server/Dockerfile.test b/tensorflow/tools/dist_test/server/Dockerfile.test
index 3cd3d5206d..908af8af9b 100644
--- a/tensorflow/tools/dist_test/server/Dockerfile.test
+++ b/tensorflow/tools/dist_test/server/Dockerfile.test
@@ -52,13 +52,13 @@ ADD . /var/tf-k8s
 # Download MNIST data for tests
 RUN mkdir -p /tmp/mnist-data
 RUN curl -o /tmp/mnist-data/train-labels-idx1-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/train-labels-idx1-ubyte.gz
 RUN curl -o /tmp/mnist-data/train-images-idx3-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/train-images-idx3-ubyte.gz
 RUN curl -o /tmp/mnist-data/t10k-labels-idx1-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/t10k-labels-idx1-ubyte.gz
 RUN curl -o /tmp/mnist-data/t10k-images-idx3-ubyte.gz \
-    http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz
+    https://storage.googleapis.com/cvdf-datasets/mnist/t10k-images-idx3-ubyte.gz
 
 # Download Census data for Wide & Deep test
 RUN mkdir -p /tmp/census-data
diff --git a/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb b/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb
index b35b14df1f..c9f2b1ab9e 100644
--- a/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb
+++ b/tensorflow/tools/docker/notebooks/3_mnist_from_scratch.ipynb
@@ -134,7 +134,7 @@
     "import os\n",
     "from six.moves.urllib.request import urlretrieve\n",
     "\n",
-    "SOURCE_URL = 'http://yann.lecun.com/exdb/mnist/'\n",
+    "SOURCE_URL = 'https://storage.googleapis.com/cvdf-datasets/mnist/'\n",
     "WORK_DIRECTORY = \"/tmp/mnist-data\"\n",
     "\n",
     "def maybe_download(filename):\n",
diff --git a/tensorflow/tools/graph_transforms/quantize_weights.cc b/tensorflow/tools/graph_transforms/quantize_weights.cc
index e6f1498224..66d800f0da 100644
--- a/tensorflow/tools/graph_transforms/quantize_weights.cc
+++ b/tensorflow/tools/graph_transforms/quantize_weights.cc
@@ -70,6 +70,10 @@ Status QuantizeWeights(const GraphDef& input_graph_def,
           min = std::min(min, value);
           max = std::max(max, value);
         }
+        // Make sure the quantization range includes 0.0f. Not all quantized
+        // Ops behave properly if 0.0f is not in the range.
+        min = std::min(min, 0.0f);
+        max = std::max(0.0f, max);
         // min_value == max_value is a tricky case. It can occur for general
         // tensors, and of course for scalars. The quantized ops cannot deal
         // with this case, so we set max_value to something else.
diff --git a/tensorflow/tools/graph_transforms/quantize_weights_test.cc b/tensorflow/tools/graph_transforms/quantize_weights_test.cc
index cd5feed358..e1a105bdd3 100644
--- a/tensorflow/tools/graph_transforms/quantize_weights_test.cc
+++ b/tensorflow/tools/graph_transforms/quantize_weights_test.cc
@@ -35,51 +35,46 @@ Status QuantizeWeights(const GraphDef& input_graph_def,
 
 class QuantizeWeightsTest : public ::testing::Test {
  protected:
-  void TestQuantizeWeights() {
+  void BuildGraphDef(const TensorShape& input_shape,
+                     std::initializer_list<float> input_values,
+                     const TensorShape& weight_shape,
+                     std::initializer_list<float> weight_values,
+                     GraphDef* original_graph_def) {
     auto root = tensorflow::Scope::NewRootScope();
-    using namespace ::tensorflow::ops;  // NOLINT(build/namespaces)
 
-    Tensor input_data(DT_FLOAT, TensorShape({1, 1, 6, 2}));
-    test::FillValues<float>(
-        &input_data, {1.0f, 4.0f, 2.0f, 5.0f, 3.0f, 6.0f, -1.0f, -4.0f, -2.0f,
-                      -5.0f, -3.0f, -6.0f});
+    Tensor input_data(DT_FLOAT, input_shape);
+    test::FillValues<float>(&input_data, input_values);
     Output input_op =
-        Const(root.WithOpName("input_op"), Input::Initializer(input_data));
+        ops::Const(root.WithOpName("input_op"), Input::Initializer(input_data));
 
-    Tensor weights_data(DT_FLOAT, TensorShape({1, 2, 2, 10}));
-    test::FillValues<float>(
-        &weights_data,
-        {1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f,
-         3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f,
-         0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f,
-         0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f});
-    Output weights_op =
-        Const(root.WithOpName("weights_op"), Input::Initializer(weights_data));
+    Tensor weights_data(DT_FLOAT, weight_shape);
+    test::FillValues<float>(&weights_data, weight_values);
+    Output weights_op = ops::Const(root.WithOpName("weights_op"),
+                                   Input::Initializer(weights_data));
 
-    Output conv_op = Conv2D(root.WithOpName("output"), input_op, weights_op,
-                            {1, 1, 1, 1}, "VALID");
+    Output conv_op = ops::Conv2D(root.WithOpName("output"), input_op,
+                                 weights_op, {1, 1, 1, 1}, "VALID");
 
-    GraphDef original_graph_def;
-    TF_ASSERT_OK(root.ToGraphDef(&original_graph_def));
+    TF_ASSERT_OK(root.ToGraphDef(original_graph_def));
+  }
 
-    std::unique_ptr<Session> original_session(NewSession(SessionOptions()));
-    TF_ASSERT_OK(original_session->Create(original_graph_def));
-    std::vector<Tensor> original_outputs;
-    TF_ASSERT_OK(original_session->Run({}, {"output"}, {}, &original_outputs));
+  void TestQuantizeWeights() {
+    GraphDef original_graph_def;
+    BuildGraphDef({1, 1, 6, 2},
+                  {1.0f, 4.0f, 2.0f, 5.0f, 3.0f, 6.0f, -1.0f, -4.0f, -2.0f,
+                   -5.0f, -3.0f, -6.0f},
+                  {1, 2, 2, 10},
+                  {1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f,
+                   3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f,
+                   0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f,
+                   0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f},
+                  &original_graph_def);
 
     GraphDef quantized_graph_def;
     TF_ASSERT_OK(QuantizeWeights(original_graph_def, {{}, {"output"}},
                                  &quantized_graph_def));
 
-    std::unique_ptr<Session> quantized_session(NewSession(SessionOptions()));
-    TF_ASSERT_OK(quantized_session->Create(quantized_graph_def));
-    std::vector<Tensor> quantized_outputs;
-    TF_ASSERT_OK(
-        quantized_session->Run({}, {"output"}, {}, &quantized_outputs));
-
-    test::ExpectTensorNear<float>(original_outputs[0], quantized_outputs[0],
-                                  0.5);
-
+    // Verify the structure of the quantized graph.
     std::map<string, const NodeDef*> node_lookup;
     MapNamesToNodes(quantized_graph_def, &node_lookup);
     EXPECT_EQ(1, node_lookup.count("input_op"));
@@ -94,10 +89,69 @@ class QuantizeWeightsTest : public ::testing::Test {
     const NodeDef* q_weights_const = node_lookup.at(weights_const_name);
     EXPECT_EQ("Const", q_weights_const->op());
     EXPECT_EQ(DT_QUINT8, q_weights_const->attr().at("dtype").type());
+
+    // Run the the original graph.
+    std::unique_ptr<Session> original_session(NewSession(SessionOptions()));
+    TF_ASSERT_OK(original_session->Create(original_graph_def));
+    std::vector<Tensor> original_outputs;
+    TF_ASSERT_OK(original_session->Run({}, {"output"}, {}, &original_outputs));
+
+    // Run the the quantized graph.
+    std::unique_ptr<Session> quantized_session(NewSession(SessionOptions()));
+    TF_ASSERT_OK(quantized_session->Create(quantized_graph_def));
+    std::vector<Tensor> quantized_outputs;
+    TF_ASSERT_OK(
+        quantized_session->Run({}, {"output"}, {}, &quantized_outputs));
+
+    // Compare the results
+    test::ExpectTensorNear<float>(original_outputs[0], quantized_outputs[0],
+                                  0.5);
   }
 };
 
 TEST_F(QuantizeWeightsTest, TestQuantizeWeights) { TestQuantizeWeights(); }
 
+TEST_F(QuantizeWeightsTest, RangesAlwaysIncludeZero) {
+  GraphDef original_graph_def;
+  BuildGraphDef({1, 1, 4, 4},
+                {-1.0f, -4.0f, -2.0f, -5.0f, -1.0f, -4.0f, -2.0f, -5.0f, -1.0f,
+                 -4.0f, -2.0f, -5.0f, -1.0f, -4.0f, -2.0f, -5.0f},
+                {1, 2, 2, 10},
+                {1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f,
+                 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f,
+                 0.1f, 0.2f, 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f,
+                 0.3f, 0.4f, 1.0f, 2.0f, 3.0f, 4.0f, 0.1f, 0.2f, 0.3f, 0.4f},
+                &original_graph_def);
+  GraphDef quantized_graph_def;
+  TF_ASSERT_OK(QuantizeWeights(original_graph_def, {{}, {"output"}},
+                               &quantized_graph_def));
+
+  std::map<string, const NodeDef*> node_lookup;
+  MapNamesToNodes(quantized_graph_def, &node_lookup);
+
+  auto expected_tensor = [](float value) {
+    Tensor tensor(DT_FLOAT, TensorShape({}));
+    test::FillValues<float>(&tensor, {value});
+    return tensor;
+  };
+  auto existing_tensor = [&node_lookup](string op) {
+    const NodeDef* node_def = node_lookup.at(op);
+    CHECK(node_def);
+    return GetNodeTensorAttr(*node_def, "value");
+  };
+
+  // The max of input_op is moved from -1.0 to 0.0.
+  test::ExpectTensorNear<float>(
+      expected_tensor(-5.0), existing_tensor("input_op_quantized_min"), 1e-5);
+  test::ExpectTensorNear<float>(
+      expected_tensor(0.0), existing_tensor("input_op_quantized_max"), 1e-5);
+
+  // The min of weights_op is moved from 0.1 to 0.0.
+  test::ExpectTensorNear<float>(
+      expected_tensor(0.0), existing_tensor("weights_op_quantized_min"), 1e-5);
+  test::ExpectTensorNear<float>(
+      expected_tensor(4.0), existing_tensor("weights_op_quantized_max"), 1e-5);
+}
+
 }  // namespace graph_transforms
 }  // namespace tensorflow
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index d0ef1d32fc..e5e005fa93 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -320,24 +320,22 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   # and com_google_protobuf_cc to enable proto_library support in bazel.
   # Unfortunately there is no way to alias http_archives at the moment.
   native.http_archive(
-      name = "com_google_protobuf",
-      urls = [
+      name="com_google_protobuf",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
-      sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
-      strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
-  )
+      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",)
 
   native.http_archive(
-      name = "com_google_protobuf_cc",
-      urls = [
+      name="com_google_protobuf_cc",
+      urls=[
           "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
-      sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
-      strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
-  )
+      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",)
 
   native.new_http_archive(
       name="gmock_archive",
@@ -358,10 +356,9 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       actual="@gmock_archive//:gtest_main",)
 
   native.git_repository(
-    name   = "com_github_gflags_gflags",
-    commit = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88",
-    remote = "https://github.com/gflags/gflags.git",
-  )
+      name="com_github_gflags_gflags",
+      commit="f8a0efe03aa69b3336d8e228b37d4ccb17324b88",
+      remote="https://github.com/gflags/gflags.git",)
 
   native.bind(
       name="python_headers",
@@ -613,13 +610,13 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name="com_microsoft_typescript",
       licenses=["notice"],  # Apache 2.0
       sha256_urls={
-          "e3d9e320a2cae99be4aaa37953961a48323cdf16ba9aa2557a44d69571cd9b8d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
-              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/tsc.js",
+          "43a7c763fe024d5add8d5365e5a7981f4a359ba5bf86481f545a0db8f60d48cc": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
+              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
           ],
-          "f189cebe96eb76b238c6e364e72d4b0324e699f83eeae5deac23506cb3764fc6": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/lib.es6.d.ts",
-              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.1.6/lib/lib.es6.d.ts",
+          "aecec1e47a3b3d872e214cb9adb82b30d6bd0471ea0aad7311ad81428566627c": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/lib.es6.d.ts",
+              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/lib.es6.d.ts",
           ],
       },
       extra_build_file_content="\n".join([
diff --git a/third_party/fft2d/BUILD b/third_party/fft2d/BUILD
new file mode 100644
index 0000000000..93ea06e81b
--- /dev/null
+++ b/third_party/fft2d/BUILD
@@ -0,0 +1,30 @@
+# Headers for 2D Fast Fourier Transform package
+# from http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html
+# This is a separate package because the original downloaded archive doesn't
+# contain any header files.
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+# Unrestricted use; can only distribute original package.
+# See fft/readme.txt
+licenses(["notice"])
+
+exports_files(["LICENSE"])
+
+cc_library(
+    name = "fft2d_headers",
+    srcs = ["fft.h"],
+)
+
+objc_library(
+    name = "fft2d_headersd_ios",
+    srcs = ["fft.h"],
+)
+
+# Export the source code so that it could be compiled for Andoid native apps.
+filegroup(
+    name = "fft2d_headers_srcs",
+    srcs = ["fft.h"],
+)
diff --git a/third_party/fft2d/LICENSE b/third_party/fft2d/LICENSE
new file mode 100644
index 0000000000..2bd85506a8
--- /dev/null
+++ b/third_party/fft2d/LICENSE
@@ -0,0 +1,3 @@
+Copyright(C) 1997,2001 Takuya OOURA (email: ooura@kurims.kyoto-u.ac.jp).
+You may use, copy, modify this code for any purpose and 
+without fee. You may distribute this ORIGINAL package.
diff --git a/third_party/fft2d/fft.h b/third_party/fft2d/fft.h
new file mode 100644
index 0000000000..252cc01fec
--- /dev/null
+++ b/third_party/fft2d/fft.h
@@ -0,0 +1,36 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Declarations for 1D FFT routines in third_party/fft2d/fft.
+
+#ifndef THIRD_PARTY_FFT2D_FFT_H__
+#define THIRD_PARTY_FFT2D_FFT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void cdft(int, int, double *, int *, double *);
+extern void rdft(int, int, double *, int *, double *);
+extern void ddct(int, int, double *, int *, double *);
+extern void ddst(int, int, double *, int *, double *);
+extern void dfct(int, double *, double *, int *, double *);
+extern void dfst(int, double *, double *, int *, double *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // THIRD_PARTY_FFT2D_FFT_H__
diff --git a/third_party/fft2d/fft2d.BUILD b/third_party/fft2d/fft2d.BUILD
new file mode 100644
index 0000000000..3dbd36aec0
--- /dev/null
+++ b/third_party/fft2d/fft2d.BUILD
@@ -0,0 +1,36 @@
+# 2D Fast Fourier Transform package
+# from http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+# Unrestricted use; can only distribute original package.
+licenses(["notice"])
+
+exports_files(["fft/readme.txt"])
+
+FFT2D_SRCS = [
+    "fft/fftsg.c",
+]
+
+# This is the main 2D FFT library.  The 2D FFTs in this library call
+# 1D FFTs.  In addition, fast DCTs are provided for the special case
+# of 8x8 and 16x16.  This code in this library is referred to as
+# "Version II" on http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html.
+cc_library(
+    name = "fft2d",
+    srcs = FFT2D_SRCS,
+    linkopts = ["-lm"],
+)
+
+objc_library(
+    name = "fft2d_ios",
+    srcs = FFT2D_SRCS,
+)
+
+# Export the source code so that it could be compiled for Andoid native apps.
+filegroup(
+    name = "fft2d_srcs",
+    srcs = FFT2D_SRCS,
+)
-- 
GitLab


From 9f6a16a7bbd054fa5a0a6930e273163f305b020a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 17:26:32 -0800
Subject: [PATCH 0234/1563] Change for internal compatibility.

---
 tensorflow/python/tools/inspect_checkpoint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/tools/inspect_checkpoint.py b/tensorflow/python/tools/inspect_checkpoint.py
index 6faf570de7..9942a5d908 100644
--- a/tensorflow/python/tools/inspect_checkpoint.py
+++ b/tensorflow/python/tools/inspect_checkpoint.py
@@ -95,7 +95,7 @@ def parse_numpy_printoption(kv_str):
         "Setting '%s' from the command line is not supported." % k)
   try:
     v = (v_type(v_str) if v_type is not bool
-         else flags.BooleanParser().Parse(v_str))
+         else flags.BooleanParser().parse(v_str))
   except ValueError as e:
     raise argparse.ArgumentTypeError(e.message)
   np.set_printoptions(**{k: v})
-- 
GitLab


From 3e8f868135b67c7e532003b22ebb7c90f67ca3d9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 21:11:00 -0800
Subject: [PATCH 0235/1563] Use std::vector for storage instead of map. Do the
 sorting inplace and return the same vector to avoid any copies. On larger
 streams it is about 50% faster. Change: 152576112

---
 .../lib/quantiles/weighted_quantiles_buffer.h | 50 +++++++++--------
 .../weighted_quantiles_buffer_test.cc         | 55 +++++++------------
 .../lib/quantiles/weighted_quantiles_stream.h |  4 +-
 .../weighted_quantiles_summary_test.cc        | 11 ++--
 4 files changed, 56 insertions(+), 64 deletions(-)

diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h
index 22ec5349f8..5e316538ce 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h
@@ -55,7 +55,7 @@ class WeightedQuantilesBuffer {
       : max_size_(std::min(block_size << 1, max_elements)) {
     QCHECK(max_size_ > 0) << "Invalid buffer specification: (" << block_size
                           << ", " << max_elements << ")";
-    map_.reserve(max_size_);
+    vec_.reserve(max_size_);
   }
 
   // Disallow copying as it's semantically non-sensical in the Squawd algorithm
@@ -77,42 +77,48 @@ class WeightedQuantilesBuffer {
       return;
     }
 
-    // Insert entry to map if not already present else
-    // accumulate the new weight.
-    auto result = map_.insert(BufferMapEntry(value, weight));
-    if (!result.second) {
-      result.first->second += weight;
-    }
+    // Push back the entry to the buffer.
+    vec_.push_back(BufferEntry(value, weight));
   }
 
-  // Returns a sorted vector view of the base buffer. Callers should
-  // minimize how often this is called, ideally only right after the buffer
-  // becomes full.
-  std::vector<BufferEntry> GenerateEntryList() const {
+  // Returns a sorted vector view of the base buffer and clears the buffer.
+  // Callers should minimize how often this is called, ideally only right after
+  // the buffer becomes full.
+  std::vector<BufferEntry> GenerateEntryList() {
     std::vector<BufferEntry> ret;
-    ret.reserve(map_.size());
-    std::transform(map_.begin(), map_.end(), std::back_inserter(ret),
-                   [](const BufferMapEntry& map_entry) {
-                     return BufferEntry(map_entry.first, map_entry.second);
-                   });
+    if (vec_.size() == 0) {
+      return ret;
+    }
+    ret.swap(vec_);
+    vec_.reserve(max_size_);
     std::sort(ret.begin(), ret.end());
+    size_t num_entries = 0;
+    for (size_t i = 1; i < ret.size(); ++i) {
+      if (ret[i].value != ret[i - 1].value) {
+        BufferEntry tmp = ret[i];
+        ++num_entries;
+        ret[num_entries] = tmp;
+      } else {
+        ret[num_entries].weight += ret[i].weight;
+      }
+    }
+    ret.resize(num_entries + 1);
     return ret;
   }
 
-  int64 Size() const { return map_.size(); }
-  bool IsFull() const { return map_.size() >= max_size_; }
-  void Clear() { map_.clear(); }
+  int64 Size() const { return vec_.size(); }
+  bool IsFull() const { return vec_.size() >= max_size_; }
+  void Clear() { vec_.clear(); }
 
  private:
-  using BufferMap = typename std::unordered_map<ValueType, WeightType>;
-  using BufferMapEntry = typename BufferMap::value_type;
+  using BufferVector = typename std::vector<BufferEntry>;
 
   // Comparison function.
   static constexpr decltype(CompareFn()) kCompFn = CompareFn();
 
   // Base buffer.
   size_t max_size_;
-  BufferMap map_;
+  BufferVector vec_;
 };
 
 template <typename ValueType, typename WeightType, typename CompareFn>
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc
index 02696fb4f1..8e40318665 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc
@@ -69,46 +69,31 @@ TEST_F(WeightedQuantilesBufferTest, PushEntryFull) {
   expected.emplace_back(2, 4);
   expected.emplace_back(5, 9);
 
-  // At this point, we have a compaction and duplicate entry 2 is merged.
-  EXPECT_FALSE(buffer.IsFull());
-  EXPECT_EQ(buffer.GenerateEntryList(), expected);
-
-  // Push another unique entry.
-  buffer.PushEntry(3, 2);
+  // At this point, we have pushed 4 entries and we expect the buffer to be
+  // full.
   EXPECT_TRUE(buffer.IsFull());
-
-  // Can't push any more entries before clearing.
-  EXPECT_DEATH(({ buffer.PushEntry(6, 6); }), "Buffer already full");
+  EXPECT_EQ(buffer.GenerateEntryList(), expected);
+  EXPECT_FALSE(buffer.IsFull());
 }
 
-TEST_F(WeightedQuantilesBufferTest, RandomizedPush) {
-  // buffer capacity is 6.
-  Buffer buffer(3, 100);
-  std::array<double, 5> elements = {{1.1, 2.3, 5.1, 8.0, 12.6}};
-  std::array<double, elements.size()> counts;
-  counts.fill(0.0);
-
-  random::PhiloxRandom philox(13);
-  random::SimplePhilox rand(&philox);
-
-  for (int iters = 10000; iters-- > 0; --iters) {
-    // Add entry.
-    int32 picked_idx = rand.Uniform(elements.size());
-    buffer.PushEntry(elements[picked_idx], 1.0);
-    ++counts[picked_idx];
-
-    // We can't fill buffer with a number of unique elements < capacity.
-    EXPECT_FALSE(buffer.IsFull());
-  }
+TEST_F(WeightedQuantilesBufferTest, PushEntryFullDeath) {
+  // buffer capacity is 4.
+  Buffer buffer(2, 100);
+  buffer.PushEntry(5, 9);
+  buffer.PushEntry(2, 3);
+  buffer.PushEntry(-1, 7);
+  buffer.PushEntry(2, 1);
 
-  // Ensure we didn't lose any information.
   std::vector<BufferEntry> expected;
-  for (int i = 0; i < elements.size(); ++i) {
-    if (counts[i] > 0) {
-      expected.emplace_back(elements[i], counts[i]);
-    }
-  }
-  EXPECT_EQ(buffer.GenerateEntryList(), expected);
+  expected.emplace_back(-1, 7);
+  expected.emplace_back(2, 4);
+  expected.emplace_back(5, 9);
+
+  // At this point, we have pushed 4 entries and we expect the buffer to be
+  // full.
+  EXPECT_TRUE(buffer.IsFull());
+  // Can't push any more entries before clearing.
+  EXPECT_DEATH(({ buffer.PushEntry(6, 6); }), "Buffer already full");
 }
 
 }  // namespace
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
index ad2358e4c4..daf0e48000 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
@@ -91,12 +91,11 @@ class WeightedQuantilesStream {
     // and push weighted quantile summary up the level chain.
     if (buffer_.IsFull()) {
       PushBuffer(buffer_);
-      buffer_.Clear();
     }
   }
 
   // Pushes full buffer while maintaining approximation error invariants.
-  void PushBuffer(const Buffer& buffer) {
+  void PushBuffer(Buffer& buffer) {
     // Validate state.
     QCHECK(!finalized_) << "Finalize() already called.";
 
@@ -124,7 +123,6 @@ class WeightedQuantilesStream {
 
     // Flush any remaining buffer elements.
     PushBuffer(buffer_);
-    buffer_.Clear();
 
     // Create final merged summary.
     local_summary_.Clear();
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
index e6d10bf08b..0bdfb40664 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
@@ -91,9 +91,10 @@ TEST_F(WeightedQuantilesSummaryTest, BuildFromBuffer) {
 }
 
 TEST_F(WeightedQuantilesSummaryTest, CompressSeparately) {
+  const auto entry_list = buffer1_->GenerateEntryList();
   for (int new_size = 9; new_size >= 2; --new_size) {
     Summary summary;
-    summary.BuildFromBufferEntries(buffer1_->GenerateEntryList());
+    summary.BuildFromBufferEntries(entry_list);
     summary.Compress(new_size);
 
     // Expect a max approximation error of 1 / n
@@ -161,10 +162,12 @@ TEST_F(WeightedQuantilesSummaryTest, CompressRandomized) {
 
 TEST_F(WeightedQuantilesSummaryTest, MergeSymmetry) {
   // Create two separate summaries and merge.
+  const auto list_1 = buffer1_->GenerateEntryList();
+  const auto list_2 = buffer2_->GenerateEntryList();
   Summary summary1;
-  summary1.BuildFromBufferEntries(buffer1_->GenerateEntryList());
+  summary1.BuildFromBufferEntries(list_1);
   Summary summary2;
-  summary2.BuildFromBufferEntries(buffer2_->GenerateEntryList());
+  summary2.BuildFromBufferEntries(list_2);
 
   // Merge summary 2 into 1 and verify.
   summary1.Merge(summary2);
@@ -178,7 +181,7 @@ TEST_F(WeightedQuantilesSummaryTest, MergeSymmetry) {
   EXPECT_EQ(summary1.Size(), 14);  // 14 unique values.
 
   // Merge summary 1 into 2 and verify same result.
-  summary1.BuildFromBufferEntries(buffer1_->GenerateEntryList());
+  summary1.BuildFromBufferEntries(list_1);
   summary2.Merge(summary1);
   EXPECT_EQ(summary2.ApproximationError(), 0.0);
   EXPECT_EQ(summary2.MinValue(),
-- 
GitLab


From 8b7bd19ff0883152bb7f4573176fad8fa20e0e35 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Fri, 7 Apr 2017 21:45:49 -0800
Subject: [PATCH 0236/1563] Add tf.add_n GPU support for complex64/complex128.

Also adds a unit test for tf.add_n.
Change: 152577190
---
 tensorflow/core/kernels/aggregate_ops.cc      |  8 +-
 .../core/kernels/aggregate_ops_gpu.cu.cc      |  2 +
 tensorflow/python/kernel_tests/BUILD          | 13 +++
 .../python/kernel_tests/aggregate_ops_test.py | 79 +++++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 tensorflow/python/kernel_tests/aggregate_ops_test.py

diff --git a/tensorflow/core/kernels/aggregate_ops.cc b/tensorflow/core/kernels/aggregate_ops.cc
index cbc0537b45..0aa65729de 100644
--- a/tensorflow/core/kernels/aggregate_ops.cc
+++ b/tensorflow/core/kernels/aggregate_ops.cc
@@ -161,9 +161,11 @@ TF_CALL_NUMBER_TYPES(REGISTER_ADDN_CPU);
 #undef REGISTER_ADDN_CPU
 
 #if GOOGLE_CUDA
-REGISTER_ADDN(Eigen::half, GPU);
-REGISTER_ADDN(float, GPU);
-REGISTER_ADDN(double, GPU);
+#define REGISTER_ADDN_GPU(type) REGISTER_ADDN(type, GPU)
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_ADDN_GPU);
+TF_CALL_complex64(REGISTER_ADDN_GPU);
+TF_CALL_complex128(REGISTER_ADDN_GPU);
+#undef REGISTER_ADDN_GPU
 
 // A special GPU kernel for int32.
 // TODO(b/25387198): Also enable int32 in device memory. This kernel
diff --git a/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc b/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc
index 51393787ac..3f449be754 100644
--- a/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc
@@ -154,6 +154,8 @@ struct Add9Functor<GPUDevice, T> {
   template struct functor::Add9Functor<GPUDevice, type>;
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_FUNCTORS);
+TF_CALL_complex64(REGISTER_FUNCTORS);
+TF_CALL_complex128(REGISTER_FUNCTORS);
 
 #undef REGISTER_FUNCTORS
 
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index f21402652f..ad455babbc 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -941,6 +941,19 @@ tf_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "aggregate_ops_test",
+    size = "small",
+    srcs = ["aggregate_ops_test.py"],
+    additional_deps = [
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+    ],
+)
+
 cuda_py_test(
     name = "argmax_op_test",
     size = "small",
diff --git a/tensorflow/python/kernel_tests/aggregate_ops_test.py b/tensorflow/python/kernel_tests/aggregate_ops_test.py
new file mode 100644
index 0000000000..f56917f7e9
--- /dev/null
+++ b/tensorflow/python/kernel_tests/aggregate_ops_test.py
@@ -0,0 +1,79 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for aggregate_ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class AddNTest(test.TestCase):
+  # AddN special-cases adding the first M inputs to make (N - M) divisible by 8,
+  # after which it adds the remaining (N - M) tensors 8 at a time in a loop.
+  # Test N in [1, 10] so we check each special-case from 1 to 9 and one
+  # iteration of the loop.
+  _MAX_N = 10
+
+  def _supported_types(self):
+    if test.is_gpu_available():
+      return [dtypes.float16, dtypes.float32, dtypes.float64, dtypes.complex64,
+              dtypes.complex128]
+    return [dtypes.int8, dtypes.int16, dtypes.int32, dtypes.int64,
+            dtypes.float16, dtypes.float32, dtypes.float64, dtypes.complex64,
+            dtypes.complex128]
+
+  def _buildData(self, shape, dtype):
+    data = np.random.randn(*shape).astype(dtype.as_numpy_dtype)
+    # For complex types, add an index-dependent imaginary component so we can
+    # tell we got the right value.
+    if dtype.is_complex:
+      return data + 10j * data
+    return data
+
+  def testAddN(self):
+    np.random.seed(12345)
+    with self.test_session(use_gpu=True) as sess:
+      for dtype in self._supported_types():
+        for count in range(1, self._MAX_N + 1):
+          data = [self._buildData((2, 2), dtype) for _ in range(count)]
+          actual = sess.run(math_ops.add_n(data))
+          expected = np.sum(np.vstack(
+              [np.expand_dims(d, 0) for d in data]), axis=0)
+          tol = 5e-3 if dtype == dtypes.float16 else 5e-7
+          self.assertAllClose(expected, actual, rtol=tol, atol=tol)
+
+  def testUnknownShapes(self):
+    np.random.seed(12345)
+    with self.test_session(use_gpu=True) as sess:
+      for dtype in self._supported_types():
+        data = self._buildData((2, 2), dtype)
+        for count in range(1, self._MAX_N + 1):
+          data_ph = array_ops.placeholder(dtype=dtype)
+          actual = sess.run(math_ops.add_n([data_ph] * count), {data_ph: data})
+          expected = np.sum(np.vstack([np.expand_dims(data, 0)] * count),
+                            axis=0)
+          tol = 5e-3 if dtype == dtypes.float16 else 5e-7
+          self.assertAllClose(expected, actual, rtol=tol, atol=tol)
+
+
+if __name__ == "__main__":
+  test.main()
-- 
GitLab


From 3aaf220fef04c1ab71301c4fc76739c6a4df605e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 7 Apr 2017 23:42:23 -0800
Subject: [PATCH 0237/1563] - Adds support for nested types in tf.case and
 tf.cond. - Adds a "strict" mode which disables silent unpacking of singleton
 lists. - Adds shape inference to tf.case. - Adds a lot of unit tests. Change:
 152581097

---
 tensorflow/python/ops/control_flow_ops.py     | 188 ++++++----
 .../python/ops/control_flow_ops_test.py       | 345 ++++++++++++++++++
 2 files changed, 469 insertions(+), 64 deletions(-)

diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index c4a27009c3..dea2180069 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -50,8 +50,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import collections
-
 import six
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
@@ -426,10 +424,11 @@ def merge(inputs, name=None):
 # pylint: enable=protected-access
 
 
-def _convert_tensorarrays_to_flows(tensors_or_tensor_arrays):
-  return [ta.flow if isinstance(ta, tensor_array_ops.TensorArray)
-          else ta
-          for ta in tensors_or_tensor_arrays]
+def _convert_tensorarray_to_flow(tensor_or_tensor_array):
+  if isinstance(tensor_or_tensor_array, tensor_array_ops.TensorArray):
+    return tensor_or_tensor_array.flow
+  else:
+    return tensor_or_tensor_array
 
 
 def _make_tensor_array(ta, t_or_flow):
@@ -1637,63 +1636,77 @@ class CondContext(ControlFlowContext):
         real_val = external_val
     return real_val
 
+  def _BuildCondTensor(self, v):
+    if isinstance(v, ops.Operation):
+      # Use pivot as the proxy for this op.
+      return with_dependencies([v], self._pivot)
+    elif isinstance(v, (ops.IndexedSlices, sparse_tensor.SparseTensor)):
+      values = self._ProcessOutputTensor(v.values)
+      indices = self._ProcessOutputTensor(v.indices)
+      if isinstance(v, ops.IndexedSlices):
+        dense_shape = v.dense_shape
+        if dense_shape is not None:
+          dense_shape = self._ProcessOutputTensor(dense_shape)
+        return ops.IndexedSlices(values, indices, dense_shape)
+      else:
+        dense_shape = self._ProcessOutputTensor(v.dense_shape)
+        return sparse_tensor.SparseTensor(indices, values, dense_shape)
+    else:
+      v = nest.map_structure(_convert_tensorarray_to_flow, v)
+      return self._ProcessOutputTensor(ops.convert_to_tensor(v))
+
   def BuildCondBranch(self, fn):
     """Add the subgraph defined by fn() to the graph."""
-    r = fn()
-    original_r = r
-    result = []
-    if r is not None:
-      if not isinstance(r, list) and not isinstance(r, _basetuple):
-        r = [r]
-        original_r = [original_r]
-      r = _convert_tensorarrays_to_flows(r)
-      for v in r:
-        real_v = v
-        if isinstance(v, ops.Operation):
-          # Use pivot as the proxy for this op.
-          real_v = with_dependencies([v], self._pivot)
-        else:
-          if isinstance(v, (ops.IndexedSlices, sparse_tensor.SparseTensor)):
-            values = self._ProcessOutputTensor(v.values)
-            indices = self._ProcessOutputTensor(v.indices)
-            if isinstance(v, ops.IndexedSlices):
-              dense_shape = v.dense_shape
-              if dense_shape is not None:
-                dense_shape = self._ProcessOutputTensor(dense_shape)
-              real_v = ops.IndexedSlices(values, indices, dense_shape)
-            else:
-              dense_shape = self._ProcessOutputTensor(v.dense_shape)
-              real_v = sparse_tensor.SparseTensor(indices, values, dense_shape)
-          else:
-            real_v = self._ProcessOutputTensor(v)
-        result.append(real_v)
-    return original_r, result
+    original_result = fn()
+    if original_result is None:
+      return None, None
+
+    result = nest.map_structure(self._BuildCondTensor, original_result)
+    if not isinstance(result, (list, _basetuple)):
+      result = [result]
+    return original_result, result
+
+
+def _UnpackIfSingleton(res):
+  if isinstance(res, (list, _basetuple)) and len(res) == 1:
+    return res[0]
+  else:
+    return res
 
 
-def cond(pred, fn1, fn2, name=None):
-  """Return either fn1() or fn2() based on the boolean predicate `pred`.
+def cond(pred, fn1, fn2, strict=False, name=None):
+  """Return either `fn1()` or `fn2()` based on the boolean predicate `pred`.
 
   `fn1` and `fn2` both return lists of output tensors. `fn1` and `fn2` must have
   the same non-zero number and type of outputs.
 
   Note that the conditional execution applies only to the operations defined in
-  fn1 and fn2. Consider the following simple program:
+  `fn1` and `fn2`. Consider the following simple program:
 
   ```python
   z = tf.multiply(a, b)
   result = tf.cond(x < y, lambda: tf.add(x, z), lambda: tf.square(y))
   ```
 
-  If x < y, the `tf.add` operation will be executed and `tf.square`
-  operation will not be executed. Since z is needed for at least one
-  branch of the cond, the `tf.multiply` operation is always executed, unconditionally.
+  If `x < y`, the `tf.add` operation will be executed and `tf.square`
+  operation will not be executed. Since `z` is needed for at least one
+  branch of the `cond`, the `tf.multiply` operation is always executed,
+  unconditionally.
   Although this behavior is consistent with the dataflow model of TensorFlow,
   it has occasionally surprised some users who expected a lazier semantics.
 
+  `tf.cond` supports nested structures as implemented in
+  `tensorflow.python.util.nest`. Both `fn1` and `fn2` must return the same
+  (possibly nested) value structure of lists, tuples, and/or named tuples.
+  Singleton lists and tuples form the only exceptions to this: when returned by
+  `fn1` and/or `fn2`, they are implicitly unpacked to single values. This
+  behavior is disabled by passing `strict=True`.
+
   Args:
     pred: A scalar determining whether to return the result of `fn1` or `fn2`.
     fn1: The callable to be performed if pred is true.
     fn2: The callable to be performed if pred is false.
+    strict: A boolean that enables/disables 'strict' mode; see above.
     name: Optional name prefix for the returned tensors.
 
   Returns:
@@ -1738,23 +1751,43 @@ def cond(pred, fn1, fn2, name=None):
     # Build the graph for the true branch in a new context.
     context_t = CondContext(pred, pivot_1, branch=1)
     context_t.Enter()
-    orig_res, res_t = context_t.BuildCondBranch(fn1)
+    orig_res_t, res_t = context_t.BuildCondBranch(fn1)
+    if orig_res_t is None:
+      raise ValueError("fn1 must have a return value.")
     context_t.ExitResult(res_t)
     context_t.Exit()
 
     # Build the graph for the false branch in a new context.
     context_f = CondContext(pred, pivot_2, branch=0)
     context_f.Enter()
-    _, res_f = context_f.BuildCondBranch(fn2)
+    orig_res_f, res_f = context_f.BuildCondBranch(fn2)
+    if orig_res_f is None:
+      raise ValueError("fn2 must have a return value.")
     context_f.ExitResult(res_f)
     context_f.Exit()
 
+    if not strict:
+      orig_res_t = _UnpackIfSingleton(orig_res_t)
+      orig_res_f = _UnpackIfSingleton(orig_res_f)
+
+    # Check that the return values of the two branches have the same structure.
+    try:
+      nest.assert_same_structure(orig_res_t, orig_res_f)
+    except TypeError as e:
+      raise TypeError(
+          "Incompatible return types of fn1 and fn2: {}".format(e))
+    except ValueError as e:
+      raise ValueError(
+          "Incompatible return values of fn1 and fn2: {}".format(e))
+
     # Add the final merge to the graph.
-    if len(res_t) != len(res_f):
-      raise ValueError("fn1 and fn2 must return the same number of results.")
     if not res_t:
       raise ValueError("fn1 and fn2 must return at least one result.")
-    for x, y in zip(res_t, res_f):
+
+    res_t_flat = nest.flatten(res_t)
+    res_f_flat = nest.flatten(res_f)
+
+    for x, y in zip(res_t_flat, res_f_flat):
       assert ((isinstance(x, ops.IndexedSlices) and
                isinstance(y, ops.IndexedSlices)) or
               (isinstance(x, sparse_tensor.SparseTensor) and
@@ -1765,14 +1798,20 @@ def cond(pred, fn1, fn2, name=None):
       if val_x.dtype.base_dtype != val_y.dtype.base_dtype:
         raise ValueError("Outputs of fn1 and fn2 must have the same type: "
                          "%s, %s" % (val_x.dtype.name, val_y.dtype.name))
-    merges = [merge([x[0], x[1]])[0] for x in zip(res_f, res_t)]
-    merges = _convert_flows_to_tensorarrays(orig_res, merges)
+
+    merges = [merge(pair)[0] for pair in zip(res_f_flat, res_t_flat)]
+    merges = _convert_flows_to_tensorarrays(nest.flatten(orig_res_t), merges)
 
     # Add to collections
     ops.add_to_collection(ops.GraphKeys.COND_CONTEXT, context_t)
     ops.add_to_collection(ops.GraphKeys.COND_CONTEXT, context_f)
 
-    return merges[0] if len(merges) == 1 else merges
+    merges = nest.pack_sequence_as(structure=orig_res_t, flat_sequence=merges)
+
+    # Singleton lists and tuples are automatically unpacked if strict == False.
+    if not strict:
+      merges = _UnpackIfSingleton(merges)
+    return merges
 
 
 def _resource_safe_shape(t):
@@ -2415,8 +2454,8 @@ class WhileContext(ControlFlowContext):
     # Store body_result to keep track of TensorArrays returned by body
     original_body_result = body_result
     # Convert TensorArrays returned by body into their flow variables
-    flat_result = nest.flatten(body_result)
-    result = _convert_tensorarrays_to_flows(flat_result)
+    result = nest.map_structure(_convert_tensorarray_to_flow,
+                                nest.flatten(body_result))
     result = ops.convert_n_to_tensor_or_indexed_slices(result)
 
     # Add NextIteration and the back edges to complete the loop.
@@ -2446,9 +2485,9 @@ class WhileContext(ControlFlowContext):
 
     # Keep original_loop_vars to identify which are TensorArrays
     original_loop_vars = loop_vars
-    flat_loop_vars = nest.flatten(loop_vars)
     # Convert TensorArrays to their flow variables
-    loop_vars = _convert_tensorarrays_to_flows(flat_loop_vars)
+    loop_vars = nest.map_structure(_convert_tensorarray_to_flow,
+                                   nest.flatten(loop_vars))
     loop_vars = ops.convert_n_to_tensor_or_indexed_slices(loop_vars)
     try:
       self.Enter()
@@ -2820,7 +2859,7 @@ def tuple(tensors, name=None, control_inputs=None):
     return tpl
 
 
-def case(pred_fn_pairs, default, exclusive=False, name="case"):
+def case(pred_fn_pairs, default, exclusive=False, strict=False, name="case"):
   """Create a case operation.
 
   The `pred_fn_pairs` parameter is a dict or list of pairs of size N.
@@ -2837,6 +2876,13 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
   are returned immediately. If none of the predicates evaluate to True, this
   operation returns the tensors generated by `default`.
 
+  `tf.case` supports nested structures as implemented in
+  `tensorflow.python.util.nest`. Both `fn1` and `fn2` must return the same
+  (possibly nested) value structure of lists, tuples, and/or named tuples.
+  Singleton lists and tuples form the only exceptions to this: when returned by
+  `fn1` and/or `fn2`, they are implicitly unpacked to single values. This
+  behavior is disabled by passing `strict=True`.
+
   Example 1:
     Pseudocode:
     ```
@@ -2877,6 +2923,7 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
                    callable which returns a list of tensors.
     default: A callable that returns a list of tensors.
     exclusive: True iff at most one predicate is allowed to evaluate to `True`.
+    strict: A boolean that enables/disables 'strict' mode; see above.
     name: A name for this operation (optional).
 
   Returns:
@@ -2941,20 +2988,31 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
 
     # Create an empty tensor, or list, with the right type and shape
     with ops.name_scope("case_create_empty"):
-      dummy_value = default()
+      def _create_empty_constant(dtype, shape):
+        value = ("" if dtype == dtypes.string else dtype.as_numpy_dtype())
+        if shape.ndims is None:
+          return array_ops.constant(value, dtype=dtype)
+        else:
+          temp_shape = [1 if x.value is None else x.value for x in shape]
+          result = array_ops.constant(value, shape=temp_shape, dtype=dtype)
+          result._shape = shape  # pylint: disable=protected-access
+          return result
+
       def _correct_empty(v):
         if isinstance(v, ops.Operation):
           return no_op()
-        elif v.dtype == dtypes.string:
-          return array_ops.constant("")
+        elif isinstance(v, tensor_array_ops.TensorArray):
+          return v
+        elif not hasattr(v, "dtype"):
+          return ops.convert_to_tensor(v)
+        elif isinstance(v, sparse_tensor.SparseTensor):
+          return sparse_tensor.SparseTensor(indices=[[0] * len(v.get_shape())],
+                                            values=[v.dtype.as_numpy_dtype()],
+                                            dense_shape=v.get_shape())
         else:
-          return array_ops.constant(v.dtype.as_numpy_dtype())
+          return _create_empty_constant(v.dtype, v.get_shape())
 
-      if isinstance(dummy_value, collections.Sequence):
-        dummy_type = type(dummy_value)
-        empty = lambda: dummy_type(_correct_empty(v) for v in dummy_value)
-      else:
-        empty = lambda: _correct_empty(dummy_value)
+      empty = lambda: nest.map_structure(_correct_empty, default())
 
     # case_sequence = [
     #   cond(~p3 & ~p2 & ~p1, default, empty),
@@ -2972,7 +3030,7 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
         prev_case = cond(
             cp, fn,
             empty if i == 0 else lambda: prev_case,
-            name="If_%d" % i)
+            strict=strict, name="If_%d" % i)
       return prev_case
 
     if exclusive:
@@ -2994,6 +3052,8 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
     else:
       case_seq = _build_case()
 
+    if not strict:
+      case_seq = _UnpackIfSingleton(case_seq)
     return case_seq
 
 
diff --git a/tensorflow/python/ops/control_flow_ops_test.py b/tensorflow/python/ops/control_flow_ops_test.py
index 9037dd042d..a88143224f 100644
--- a/tensorflow/python/ops/control_flow_ops_test.py
+++ b/tensorflow/python/ops/control_flow_ops_test.py
@@ -18,11 +18,16 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
+import numpy as np
+
 from tensorflow.core.framework import graph_pb2
 from tensorflow.core.framework import node_def_pb2
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework.test_util import TensorFlowTestCase
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
@@ -37,9 +42,14 @@ from tensorflow.python.ops import variables
 import tensorflow.python.ops.tensor_array_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import googletest
 from tensorflow.python.training import momentum
+from tensorflow.python.util import nest
 from tensorflow.python.util.protobuf import compare
 
 
+TestTuple = collections.namedtuple("TestTuple", "a b")
+SingletonTestTuple = collections.namedtuple("SingletonTestTuple", "a")
+
+
 class GroupTestCase(TensorFlowTestCase):
 
   def _StripNode(self, nd):
@@ -334,5 +344,340 @@ class ContextTest(TensorFlowTestCase):
               control_flow_ops.WhileContext.from_proto(c.to_proto()).to_proto())
 
 
+def _GetNestedShape(nested):
+  def _GetShape(tensor):
+    if isinstance(tensor, tensor_array_ops.TensorArray):
+      return tensor_array_ops.TensorArray
+    elif isinstance(tensor, ops.IndexedSlices):
+      return tensor.dense_shape
+    else:
+      return tensor.get_shape()
+
+  return nest.map_structure(_GetShape, nested)
+
+
+def _CreateTensorArray(size, shape):
+  ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=size,
+                                    clear_after_read=False)
+  for i in range(size):
+    ta = ta.write(i, array_ops.zeros(shape))
+  return ta
+
+
+def _RawNestedShape(nested_shape):
+  def _RawShape(shape):
+    if isinstance(shape, tensor_shape.TensorShape) and shape.ndims is not None:
+      return [x.value for x in shape]
+    else:
+      return None
+  return nest.map_structure(_RawShape, nested_shape)
+
+
+# TODO(yori): Add tests for indexed slices.
+class DataTypesTest(TensorFlowTestCase):
+
+  def assertAllEqualNested(self, a, b):
+    if isinstance(a, (list, tuple)):
+      for entry_a, entry_b in zip(a, b):
+        self.assertAllEqualNested(entry_a, entry_b)
+    else:
+      self.assertAllEqual(a, b)
+
+  def _testShape(self, fn_true, fn_false, expected_shape,
+                 strict=False):
+    condition = array_ops.placeholder(dtypes.bool)
+    output_cond = control_flow_ops.cond(condition, fn_true, fn_false,
+                                        strict=strict)
+    self.assertEqual(_RawNestedShape(_GetNestedShape(output_cond)),
+                     _RawNestedShape(expected_shape))
+
+    output_case = control_flow_ops.case([(condition, fn_true)], fn_false,
+                                        strict=strict)
+    self.assertEqual(_RawNestedShape(_GetNestedShape(output_case)),
+                     _RawNestedShape(expected_shape))
+
+  def _testReturnValues(self, fn_true, fn_false, expected_value_true,
+                        expected_value_false, strict=False,
+                        check_cond=True):
+    condition = array_ops.placeholder(dtypes.bool)
+    output_cond = control_flow_ops.cond(condition, fn_true, fn_false,
+                                        strict=strict)
+    output_case = control_flow_ops.case([(condition, fn_true)], fn_false,
+                                        strict=strict)
+
+    with self.test_session() as sess:
+      variables.global_variables_initializer().run()
+      result_cond, result_case = sess.run([output_cond, output_case],
+                                          feed_dict={condition: True})
+      self.assertAllEqualNested(result_cond, expected_value_true)
+      if check_cond:
+        self.assertAllEqualNested(result_case, expected_value_true)
+      result_cond, result_case = sess.run([output_cond, output_case],
+                                          feed_dict={condition: False})
+      self.assertAllEqualNested(result_cond, expected_value_false)
+      if check_cond:
+        self.assertAllEqualNested(result_case, expected_value_false)
+
+  def test_int(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: 1
+    fn_false = lambda: 2
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 2)
+    self._testShape(fn_true, fn_false, shape, strict=True)
+    self._testReturnValues(fn_true, fn_false, 1, 2, strict=True)
+
+  def test_float(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: 1.0
+    fn_false = lambda: 2.0
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1.0, 2.0)
+
+  def test_noop(self):
+    shape = tensor_shape.TensorShape(None)
+    self._testShape(control_flow_ops.no_op, control_flow_ops.no_op, shape)
+    self._testReturnValues(control_flow_ops.no_op, control_flow_ops.no_op,
+                           True, False, check_cond=False)
+
+  def test_string(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: "abc"
+    fn_false = lambda: "xyz"
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, b"abc", b"xyz")
+
+  def test_variable(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: variables.Variable(3.0)
+    fn_false = lambda: variables.Variable(4.0)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 3.0, 4.0)
+
+  def test_none(self):
+    fn_none = lambda: None
+    fn_tensor = lambda: constant_op.constant(1)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.cond(constant_op.constant(True), fn_none, fn_tensor)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.cond(constant_op.constant(True), fn_tensor, fn_none)
+
+  def test_tensors(self):
+    def _BuildTrueBranch(dtype):
+      def _Build():
+        return (array_ops.zeros([2, 2], dtype=dtype),
+                array_ops.ones([3, 3], dtype=dtype))
+      return _Build
+
+    def _BuildFalseBranch(dtype):
+      def _Build():
+        return (array_ops.ones([2, 2], dtype=dtype),
+                array_ops.zeros([3, 3], dtype=dtype))
+      return _Build
+
+    for dtype in (dtypes.float16, dtypes.int8, dtypes.int32, dtypes.uint8):
+      shape = (tensor_shape.TensorShape([2, 2]),
+               tensor_shape.TensorShape([3, 3]))
+      fn_true = _BuildTrueBranch(dtype)
+      fn_false = _BuildFalseBranch(dtype)
+      self._testShape(fn_true, fn_false, shape)
+      self._testReturnValues(fn_true, fn_false,
+                             (np.zeros([2, 2]), np.ones([3, 3])),
+                             (np.ones([2, 2]), np.zeros([3, 3])))
+
+  def test_tensors_unknown_shape(self):
+    def _BuildTrueBranch(dtype):
+      def _Build():
+        tensor = array_ops.zeros([2, 2], dtype=dtype)
+        tensor._shape = tensor_shape.TensorShape(None)
+        return tensor
+      return _Build
+
+    def _BuildFalseBranch(dtype):
+      def _Build():
+        tensor = array_ops.ones([2, 2], dtype=dtype)
+        tensor._shape = tensor_shape.TensorShape(None)
+        return tensor
+      return _Build
+
+    for dtype in (dtypes.float16, dtypes.int8, dtypes.int32, dtypes.uint8):
+      shape = tensor_shape.TensorShape(None)
+      fn_true = _BuildTrueBranch(dtype)
+      fn_false = _BuildFalseBranch(dtype)
+      self._testShape(fn_true, fn_false, shape)
+      self._testReturnValues(fn_true, fn_false,
+                             np.zeros([2, 2]), np.ones([2, 2]))
+
+  def test_sparse_tensors(self):
+    shape = tensor_shape.TensorShape([None, None])
+
+    def FnTrue():
+      return [sparse_tensor.SparseTensor(indices=[[0, 0], [1, 2]],
+                                         values=[1, 2], dense_shape=[3, 4])]
+
+    def FnFalse():
+      return [sparse_tensor.SparseTensor(indices=[[0, 0], [2, 1]],
+                                         values=[3, 4], dense_shape=[3, 4])]
+
+    value1 = sparse_tensor.SparseTensorValue(indices=[[0, 0], [1, 2]],
+                                             values=[1, 2], dense_shape=[3, 4])
+    value2 = sparse_tensor.SparseTensorValue(indices=[[0, 0], [2, 1]],
+                                             values=[3, 4], dense_shape=[3, 4])
+    self._testShape(FnTrue, FnFalse, shape)
+    self._testReturnValues(FnTrue, FnFalse, value1, value2)
+    self._testShape(FnTrue, FnFalse, [shape], strict=True)
+    self._testReturnValues(FnTrue, FnFalse, [value1], [value2], strict=True)
+
+  def test_tensors_with_partially_specified_shapes(self):
+    def _BuildBranch(dtype, shape):
+      def _Build():
+        a = array_ops.zeros([2, 2], dtype=dtype)
+        b = array_ops.zeros([5], dtype=dtype)
+        c = array_ops.ones([3, 3], dtype=dtype)
+        a._shape = tensor_shape.TensorShape(shape[0])
+        b._shape = tensor_shape.TensorShape(shape[1])
+        c._shape = tensor_shape.TensorShape(shape[2])
+        return a, b, c
+      return _Build
+
+    for dtype in (dtypes.float16, dtypes.int8, dtypes.int32, dtypes.uint8):
+      shape = (tensor_shape.TensorShape([None, 2]),
+               tensor_shape.TensorShape([None]),
+               tensor_shape.TensorShape([3, None]))
+      fn_true = _BuildBranch(dtype, shape)
+      fn_false = _BuildBranch(dtype, shape)
+      self._testShape(fn_true, fn_false, shape)
+      self._testReturnValues(fn_true, fn_false,
+                             (np.zeros([2, 2]), np.zeros(5), np.ones([3, 3])),
+                             (np.zeros([2, 2]), np.zeros(5), np.ones([3, 3])))
+
+  def test_tensor_arrays(self):
+    element_shape = tensor_shape.TensorShape([2])
+    ta1 = _CreateTensorArray(4, element_shape)
+    ta2 = _CreateTensorArray(4, element_shape)
+    shape = tensor_array_ops.TensorArray
+    fn_true = lambda: ta1
+    fn_false = lambda: ta2
+    self._testShape(fn_true, fn_false, shape)
+
+  def test_tensor_array_reads(self):
+    shape = tensor_shape.TensorShape([2])
+    ta = _CreateTensorArray(4, shape)
+    fn_true = lambda: ta.read(0)
+    fn_false = lambda: ta.read(1)
+    self._testShape(fn_true, fn_false, shape)
+
+  def test_list(self):
+    shape = [tensor_shape.TensorShape([]), tensor_shape.TensorShape([]),
+             tensor_shape.TensorShape([])]
+    fn_true = lambda: [constant_op.constant(1), 2, variables.Variable(3.0)]
+    fn_false = lambda: [constant_op.constant(3), 4, variables.Variable(5.0)]
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, [1, 2, 3.0], [3, 4, 5.0])
+
+  def test_non_strict(self):
+    shape = tensor_shape.TensorShape([])
+    fn_tensor = lambda: constant_op.constant(1)
+    fn_list = lambda: [constant_op.constant(2)]
+    fn_tuple = lambda: (constant_op.constant(3),)
+    self._testShape(fn_tensor, fn_list, shape)
+    self._testShape(fn_tensor, fn_tuple, shape)
+    self._testShape(fn_list, fn_tuple, shape)
+    self._testReturnValues(fn_tensor, fn_list, 1, 2)
+    self._testReturnValues(fn_tensor, fn_tuple, 1, 3)
+    self._testReturnValues(fn_list, fn_tuple, 2, 3)
+
+  def test_singleton_strict(self):
+    fn_tensor = lambda: constant_op.constant(1)
+    fn_list = lambda: [constant_op.constant(2)]
+    fn_tuple = lambda: (constant_op.constant(3),)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.cond(constant_op.constant(True), fn_tensor, fn_list,
+                            strict=True)
+
+    with self.assertRaises(TypeError):
+      control_flow_ops.cond(constant_op.constant(True), fn_list, fn_tuple,
+                            strict=True)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.case([(constant_op.constant(True), fn_tensor)], fn_list,
+                            strict=True)
+
+    with self.assertRaises(TypeError):
+      control_flow_ops.case([(constant_op.constant(True), fn_list)], fn_tuple,
+                            strict=True)
+
+  def test_singleton_list(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: [constant_op.constant(1)]
+    fn_false = lambda: [constant_op.constant(3)]
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 3)
+    self._testShape(fn_true, fn_false, [shape], strict=True)
+    self._testReturnValues(fn_true, fn_false, [1], [3], strict=True)
+
+  def test_singleton_tuple(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: (constant_op.constant(1),)
+    fn_false = lambda: (constant_op.constant(3),)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 3)
+    self._testShape(fn_true, fn_false, (shape,), strict=True)
+    self._testReturnValues(fn_true, fn_false, (1,), (3,),
+                           strict=True)
+
+  def test_singleton_namedtuple(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: SingletonTestTuple(constant_op.constant(1))
+    fn_false = lambda: SingletonTestTuple(constant_op.constant(3))
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 3)
+    self._testShape(fn_true, fn_false, SingletonTestTuple(shape),
+                    strict=True)
+    self._testReturnValues(fn_true, fn_false, SingletonTestTuple(1),
+                           SingletonTestTuple(3), strict=True)
+
+  def test_tuple(self):
+    shape = (tensor_shape.TensorShape([]), tensor_shape.TensorShape([]))
+    fn_true = lambda: (constant_op.constant(1), 2)
+    fn_false = lambda: (constant_op.constant(3), 4)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, (1, 2), (3, 4))
+
+  def test_namedtuple(self):
+    shape = TestTuple(tensor_shape.TensorShape([]),
+                      tensor_shape.TensorShape([]))
+    fn_true = lambda: TestTuple(constant_op.constant(1), 2)
+    fn_false = lambda: TestTuple(constant_op.constant(3), 4)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, TestTuple(1, 2), TestTuple(3, 4))
+
+  def test_nested(self):
+    shape = [tensor_shape.TensorShape([]),
+             TestTuple(tensor_shape.TensorShape([]),
+                       [tensor_shape.TensorShape([]),
+                        tensor_shape.TensorShape([])]),
+             tensor_shape.TensorShape([5, 5]),
+             tensor_shape.TensorShape([])]
+
+    def FnTrue():
+      return [constant_op.constant(1),
+              TestTuple(constant_op.constant(2), [3, 4]),
+              array_ops.zeros([5, 5]), 6]
+
+    def FnFalse():
+      return [constant_op.constant(11),
+              TestTuple(constant_op.constant(12), [13, 14]),
+              array_ops.ones([5, 5]), 16]
+
+    self._testShape(FnTrue, FnFalse, shape)
+    self._testReturnValues(FnTrue, FnFalse,
+                           [1, TestTuple(2, [3, 4]), np.zeros([5, 5]), 6],
+                           [11, TestTuple(12, [13, 14]), np.ones([5, 5]), 16])
+
+
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From 40961d826a1509f9f3898ac6d572337dc8d076ba Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Fri, 7 Apr 2017 23:49:47 -0800
Subject: [PATCH 0238/1563] [XLA] Add support for folding transpose into
 convolution Change: 152581336

---
 tensorflow/compiler/xla/service/BUILD         |   4 +
 .../compiler/xla/service/cpu/cpu_compiler.cc  |   9 +-
 .../compiler/xla/service/gpu/gpu_compiler.cc  |   8 +-
 .../xla/service/gpu/ir_emission_utils.h       |  11 +-
 .../compiler/xla/service/transpose_folding.cc | 146 +++++++++++---
 .../compiler/xla/service/transpose_folding.h  |  31 ++-
 .../xla/service/transpose_folding_test.cc     | 188 +++++++++++++++++-
 7 files changed, 342 insertions(+), 55 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 695e4e7f07..fc69d8eb3a 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1431,7 +1431,9 @@ cc_library(
     deps = [
         ":hlo",
         ":hlo_pass",
+        "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla/service/gpu:ir_emission_utils",
         "//tensorflow/core:lib",
     ],
@@ -1442,11 +1444,13 @@ cc_test(
     srcs = ["transpose_folding_test.cc"],
     deps = [
         ":hlo",
+        ":shape_inference",
         ":transpose_folding",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/client:computation_builder",
         "//tensorflow/compiler/xla/service/gpu:ir_emission_utils",
         "//tensorflow/core:lib",
         "//tensorflow/core:test_main",
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
index c5433d4b89..4fbdb15e70 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
@@ -232,7 +232,14 @@ Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
     pass.AddPass<ReshapeMover>();
     pass.AddPass<HloConstantFolding>();
   }
-  pipeline.AddPass<TransposeFolding>(PotentiallyImplementedAsEigenDot);
+  pipeline.AddPass<TransposeFolding>(
+      [](const HloInstruction& dot,
+         const TransposeFolding::OperandIndices& candidate_operands) {
+        return PotentiallyImplementedAsEigenDot(dot)
+                   ? candidate_operands
+                   : TransposeFolding::OperandIndices{};
+      },
+      TransposeFolding::NeverFoldTranspose);
   pipeline.AddPass<HloSubcomputationUnification>();
   pipeline.AddPass<HloCSE>(/*is_layout_sensitive=*/false);
   pipeline.AddPass<CpuInstructionFusion>();
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index f692f28bd9..1d2111c427 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -133,7 +133,13 @@ tensorflow::Status OptimizeHloModule(HloModule* hlo_module,
       pass.AddPass<HloConstantFolding>();
     }
     pipeline.AddPass<ConvolutionFolding>();
-    pipeline.AddPass<TransposeFolding>(ImplementedAsGemm);
+    pipeline.AddPass<TransposeFolding>(
+        [](const HloInstruction& dot,
+           const TransposeFolding::OperandIndices& candidate_operands) {
+          return ImplementedAsGemm(dot) ? candidate_operands
+                                        : TransposeFolding::OperandIndices{};
+        },
+        TransposeFolding::NeverFoldTranspose);
     pipeline.AddPass<HloSubcomputationUnification>();
     pipeline.AddPass<HloCSE>(/*is_layout_sensitive=*/false);
     pipeline.AddPass<HloDCE>();
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h b/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h
index 4d3e9b10b2..e8c68a6ef7 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h
+++ b/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h
@@ -25,16 +25,7 @@ limitations under the License.
 namespace xla {
 namespace gpu {
 
-const int64 kWarpSize = 32;
-
-// Precondition: "hlo" is an operand of a Dot instruction.
-//
-// Returns whether "hlo" is foldable to its user.
-bool IsOperandFoldableToDot(const HloInstruction& hlo);
-
-// Returns true if GpuCompiler can fold any operands of "dot" into "dot" for
-// better performance.
-bool CanFoldOperandsIntoDot(const HloInstruction& dot);
+constexpr int64 kWarpSize = 32;
 
 // Returns true if `hlo` will be implemented as a call to BLAS gemm.
 bool ImplementedAsGemm(const HloInstruction& hlo);
diff --git a/tensorflow/compiler/xla/service/transpose_folding.cc b/tensorflow/compiler/xla/service/transpose_folding.cc
index 07e0ce89f6..cfb90e6e1d 100644
--- a/tensorflow/compiler/xla/service/transpose_folding.cc
+++ b/tensorflow/compiler/xla/service/transpose_folding.cc
@@ -21,7 +21,9 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/gpu/ir_emission_utils.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
@@ -30,43 +32,56 @@ namespace xla {
 
 namespace {
 
-bool IsOperandFoldableToDot(const HloInstruction& hlo) {
-  return hlo.IsRank2Transpose() &&
-         hlo.user_count() == 1;  // The dot is its only user.
-}
-
-bool CanFoldOperandsIntoDot(
+TransposeFolding::OperandIndices CanFoldOperandsIntoDot(
     const HloInstruction& dot,
-    const TransposeFolding::IsTransposableGemmFn& is_transposable_gemm) {
+    const TransposeFolding::TransposableGemmOperandsFn&
+        transposable_gemm_operands) {
   if (HloOpcode::kDot != dot.opcode()) {
-    return false;
+    return {};
   }
 
-  if (!is_transposable_gemm(dot)) {
-    return false;
+  TransposeFolding::OperandIndices operand_set;
+  for (int64 i = 0; i < dot.operand_count(); ++i) {
+    auto& operand = *dot.operand(i);
+    if (operand.IsRank2Transpose() && operand.user_count() == 1) {
+      operand_set.push_back(i);
+    }
   }
 
-  const HloInstruction* lhs = dot.operand(0);
-  const HloInstruction* rhs = dot.operand(1);
-  bool lhs_foldable = IsOperandFoldableToDot(*lhs);
-  bool rhs_foldable = IsOperandFoldableToDot(*rhs);
-  if (!lhs_foldable && !rhs_foldable) {
-    return false;
+  return transposable_gemm_operands(dot, operand_set);
+}
+
+TransposeFolding::OperandIndices CanFoldOperandsIntoConvolution(
+    const HloInstruction& convolution,
+    const TransposeFolding::TransposableConvOperandsFn&
+        transposable_conv_operands) {
+  if (HloOpcode::kConvolution != convolution.opcode()) {
+    return {};
   }
-  return true;
+
+  // We only support folding the RHS.
+  const int64 kRhsOperandIndex = 1;
+  auto& operand = *convolution.operand(kRhsOperandIndex);
+  if (operand.opcode() == HloOpcode::kTranspose && operand.user_count() == 1) {
+    return transposable_conv_operands(convolution, {kRhsOperandIndex});
+  }
+
+  return {};
 }
 
+using InstructionOperandsPair =
+    std::pair<HloInstruction*, TransposeFolding::OperandIndices>;
+
 // Folds the operands of `dot` that are foldable transposes. `computation` is
-// the parent HLO computation of `dot`. `module` is the parent HloModule of
-// `computation`.
+// the parent HLO computation of `dot`.
 //
 // Returns whether the module is changed.
-bool FoldTransposeIntoDot(HloInstruction* dot, HloComputation* computation) {
+bool FoldTransposeIntoDot(InstructionOperandsPair pair,
+                          HloComputation* computation) {
+  auto* dot = pair.first;
   std::vector<HloInstruction*> instructions_to_fuse(1, dot);
-  for (HloInstruction* operand : dot->operands()) {
-    if (IsOperandFoldableToDot(*operand)) {
-      instructions_to_fuse.push_back(operand);
-    }
+  for (const int64 operand_index : pair.second) {
+    instructions_to_fuse.push_back(dot->mutable_operand(operand_index));
   }
 
   // Early-exit if no operands are foldable.
@@ -79,28 +94,95 @@ bool FoldTransposeIntoDot(HloInstruction* dot, HloComputation* computation) {
   return true;
 }
 
+// Folds the operands of `convolution` that are foldable transposes.
+// `computation` is the parent HLO computation of `convolution`.
+//
+// Returns whether the module is changed.
+bool FoldTransposeIntoConvolution(InstructionOperandsPair pair,
+                                  HloComputation* computation) {
+  auto& convolution = *pair.first;
+
+  // We only support fusing the RHS transpose into convolution.
+  //
+  // ConvolutionDimensionNumbers doesn't make enough of a distinction between
+  // the output and the activations.
+  //
+  // TODO(b/37125184): Support transposing the LHS too.
+  if (pair.second.size() != 1 || pair.second.front() != 1) {
+    return false;
+  }
+
+  const ConvolutionDimensionNumbers& dnums =
+      convolution.convolution_dimension_numbers();
+  HloInstruction& transpose = *convolution.mutable_operand(1);
+  CHECK_EQ(transpose.opcode(), HloOpcode::kTranspose);
+  const auto& transpose_dimensions = transpose.dimensions();
+  HloInstruction& transpose_operand = *transpose.mutable_operand(0);
+
+  // Everything remains the same except for the kernel dimension numbers. We
+  // need to apply the transpose permutation to the original shape to figure out
+  // what the new logical dimensions are.
+  ConvolutionDimensionNumbers new_dnums = dnums;
+  new_dnums.set_kernel_input_feature_dimension(
+      transpose_dimensions[dnums.kernel_input_feature_dimension()]);
+  new_dnums.set_kernel_output_feature_dimension(
+      transpose_dimensions[dnums.kernel_output_feature_dimension()]);
+  for (auto& kernel_spatial_dimension :
+       *new_dnums.mutable_kernel_spatial_dimensions()) {
+    kernel_spatial_dimension = transpose_dimensions[kernel_spatial_dimension];
+  }
+
+  auto new_conv = HloInstruction::CreateConvolve(
+      convolution.shape(), convolution.mutable_operand(0), &transpose_operand,
+      convolution.window(), new_dnums);
+  TF_CHECK_OK(computation->ReplaceWithNewInstruction(&convolution,
+                                                     std::move(new_conv)));
+
+  return true;
+}
+
 }  // namespace
 
-TransposeFolding::TransposeFolding(IsTransposableGemmFn is_transposable_gemm)
-    : is_transposable_gemm_(std::move(is_transposable_gemm)) {}
+TransposeFolding::TransposeFolding(
+    TransposableGemmOperandsFn transposable_gemm_operands,
+    TransposableConvOperandsFn transposable_conv_operands)
+    : transposable_gemm_operands_(std::move(transposable_gemm_operands)),
+      transposable_conv_operands_(std::move(transposable_conv_operands)) {}
 
 StatusOr<bool> TransposeFolding::Run(HloModule* module) {
   // Modifying the graph while traversing is dangerous, so we find all folding
   // opportunities before actually folding them.
   HloComputation* entry_computation = module->entry_computation();
 
-  std::vector<HloInstruction*> foldable_dots;
-  auto visit_fn = [this, &foldable_dots](HloInstruction* instruction) {
-    if (CanFoldOperandsIntoDot(*instruction, is_transposable_gemm_)) {
-      foldable_dots.emplace_back(instruction);
+  std::vector<std::pair<HloInstruction*, OperandIndices>> foldable_dots;
+  std::vector<std::pair<HloInstruction*, OperandIndices>> foldable_convolutions;
+  auto visit_fn = [this, &foldable_dots,
+                   &foldable_convolutions](HloInstruction* instruction) {
+    {
+      OperandIndices operand_indices =
+          CanFoldOperandsIntoDot(*instruction, transposable_gemm_operands_);
+      if (!operand_indices.empty()) {
+        foldable_dots.emplace_back(instruction, operand_indices);
+      }
+    }
+    {
+      OperandIndices operand_indices = CanFoldOperandsIntoConvolution(
+          *instruction, transposable_conv_operands_);
+      if (!operand_indices.empty()) {
+        foldable_convolutions.emplace_back(
+            std::make_pair(instruction, operand_indices));
+      }
     }
     return tensorflow::Status::OK();
   };
   TF_RETURN_IF_ERROR(entry_computation->root_instruction()->Accept(visit_fn));
 
   bool changed = false;
-  for (HloInstruction* dot : foldable_dots) {
-    changed |= FoldTransposeIntoDot(dot, entry_computation);
+  for (InstructionOperandsPair& pair : foldable_dots) {
+    changed |= FoldTransposeIntoDot(pair, entry_computation);
+  }
+  for (InstructionOperandsPair& pair : foldable_convolutions) {
+    changed |= FoldTransposeIntoConvolution(pair, entry_computation);
   }
   return changed;
 }
diff --git a/tensorflow/compiler/xla/service/transpose_folding.h b/tensorflow/compiler/xla/service/transpose_folding.h
index d857c04ed8..71e8446452 100644
--- a/tensorflow/compiler/xla/service/transpose_folding.h
+++ b/tensorflow/compiler/xla/service/transpose_folding.h
@@ -25,16 +25,37 @@ namespace xla {
 // operator is implemented by a GEMM kernel that can transpose its inputs.
 class TransposeFolding : public HloPassInterface {
  public:
-  // IsTransposableGemmFn should return true iff the instruction argument is
-  // implemented as a GEMM kernel that supports transposing its arguments.
-  typedef std::function<bool(const HloInstruction&)> IsTransposableGemmFn;
-  explicit TransposeFolding(IsTransposableGemmFn is_transposable_gemm);
+  using OperandIndices = std::vector<int64>;
+
+  // Returns the set of foldable operands for a given HLO and some candidate
+  // operands.
+  using FoldableOperands = std::function<OperandIndices(const HloInstruction&,
+                                                        const OperandIndices&)>;
+  using TransposableGemmOperandsFn = FoldableOperands;
+  using TransposableConvOperandsFn = FoldableOperands;
+
+  // Helper function to explicitly not fold transposes.
+  static OperandIndices NeverFoldTranspose(const HloInstruction&,
+                                           const OperandIndices&) {
+    return {};
+  }
+  // transposable_gemm_operands returns the set of operands it wants to fold if
+  // the instruction argument is implemented as a GEMM kernel that supports
+  // transposing its arguments.
+  //
+  // transposable_conv_operands returns the set of operands it wants to fold if
+  // the instruction argument is implemented as a convolution that supports
+  // transposing its arguments.
+  explicit TransposeFolding(
+      TransposableGemmOperandsFn transposable_gemm_operands,
+      TransposableConvOperandsFn transposable_conv_operands);
   tensorflow::StringPiece name() const override { return "transpose-folding"; }
 
   StatusOr<bool> Run(HloModule* module) override;
 
  private:
-  IsTransposableGemmFn is_transposable_gemm_;
+  TransposableGemmOperandsFn transposable_gemm_operands_;
+  TransposableConvOperandsFn transposable_conv_operands_;
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/transpose_folding_test.cc b/tensorflow/compiler/xla/service/transpose_folding_test.cc
index 09f932e29e..ea5ab2b917 100644
--- a/tensorflow/compiler/xla/service/transpose_folding_test.cc
+++ b/tensorflow/compiler/xla/service/transpose_folding_test.cc
@@ -16,15 +16,17 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/transpose_folding.h"
 
 #include <memory>
-#include <set>
+#include <unordered_set>
 #include <vector>
 
+#include "tensorflow/compiler/xla/client/computation_builder.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/gpu/ir_emission_utils.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/shape_inference.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
@@ -35,12 +37,22 @@ namespace xla {
 class TransposeFoldingTest : public ::testing::Test {
  protected:
   void FoldTranspose(HloModule* module) {
-    TransposeFolding transpose_folding(gpu::ImplementedAsGemm);
+    TransposeFolding transpose_folding(
+        [](const HloInstruction& dot,
+           const TransposeFolding::OperandIndices& candidate_operands) {
+          return gpu::ImplementedAsGemm(dot)
+                     ? candidate_operands
+                     : TransposeFolding::OperandIndices{};
+        },
+        [](const HloInstruction& convolution,
+           const TransposeFolding::OperandIndices& candidate_operands) {
+          return candidate_operands;
+        });
     EXPECT_IS_OK(transpose_folding.Run(module).status());
   }
 };
 
-TEST_F(TransposeFoldingTest, FoldTranspose) {
+TEST_F(TransposeFoldingTest, FoldDotTranspose) {
   auto builder = HloComputation::Builder("entry_computation");
   HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
       /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {2, 3}),
@@ -61,7 +73,7 @@ TEST_F(TransposeFoldingTest, FoldTranspose) {
   FoldTranspose(&module);
 
   // Instructions after folding: x, y, and the fusion.
-  std::set<HloInstruction*> instruction_set;
+  std::unordered_set<HloInstruction*> instruction_set;
   for (auto& instruction : entry_computation->instructions()) {
     instruction_set.insert(instruction.get());
   }
@@ -77,7 +89,7 @@ TEST_F(TransposeFoldingTest, FoldTranspose) {
   EXPECT_EQ(4, fusion->fused_instructions().size());
 }
 
-TEST_F(TransposeFoldingTest, FoldTransposeConstant) {
+TEST_F(TransposeFoldingTest, FoldDotTransposeConstant) {
   auto builder = HloComputation::Builder("entry_computation");
   // 2x1
   HloInstruction* const0 = builder.AddInstruction(
@@ -115,7 +127,7 @@ TEST_F(TransposeFoldingTest, FoldTransposeConstant) {
             entry_computation->root_instruction()->fused_instructions().size());
 }
 
-TEST_F(TransposeFoldingTest, FuseWithConstantOperands) {
+TEST_F(TransposeFoldingTest, FuseDotWithConstantOperands) {
   auto builder = HloComputation::Builder("entry");
   // (1.0 + 2.0) * (2.0 - 3.0)
   HloInstruction* const1 = builder.AddInstruction(
@@ -146,4 +158,168 @@ TEST_F(TransposeFoldingTest, FuseWithConstantOperands) {
   EXPECT_EQ(6, callee_computation->instructions().size());
 }
 
+// Test that a two dimension swap of the kernel gets folded into convolution.
+TEST_F(TransposeFoldingTest, FoldConvDimSwapTransposeRhs) {
+  auto builder = HloComputation::Builder("entry_computation");
+  HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {2, 3, 1, 1}),
+      /*name=*/"x"));
+  HloInstruction* y = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/1, ShapeUtil::MakeShape(F32, {3, 2, 1, 1}),
+      /*name=*/"y"));
+  HloInstruction* transpose_y =
+      builder.AddInstruction(HloInstruction::CreateTranspose(
+          ShapeUtil::MakeShape(F32, {2, 3, 1, 1}), y, {1, 0, 2, 3}));
+  auto dnums = ComputationBuilder::CreateDefaultConvDimensionNumbers();
+  Window window;
+  for (int i = 0; i < 2; ++i) {
+    WindowDimension* dim = window.add_dimensions();
+    dim->set_padding_low(0);
+    dim->set_padding_high(0);
+    dim->set_base_dilation(1);
+    dim->set_window_dilation(1);
+    dim->set_stride(1);
+    dim->set_size(
+        transpose_y->shape().dimensions(dnums.kernel_spatial_dimensions(i)));
+  }
+  StatusOr<Shape> conv_shape = ShapeInference::InferConvolveShape(
+      x->shape(), transpose_y->shape(), window, dnums);
+  EXPECT_IS_OK(conv_shape);
+  HloInstruction* conv = builder.AddInstruction(HloInstruction::CreateConvolve(
+      conv_shape.ValueOrDie(), x, transpose_y, window, dnums));
+
+  HloModule module("test_module");
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build(conv));
+  FoldTranspose(&module);
+
+  // Instructions after folding: x, y, and the convolution.
+  std::unordered_set<HloInstruction*> instruction_set;
+  for (auto& instruction : entry_computation->instructions()) {
+    instruction_set.insert(instruction.get());
+  }
+  CHECK_EQ(1, instruction_set.erase(x)) << "x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(y)) << "y is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.size())
+      << "entry_computation should contain exactly 3 instructions.";
+  HloInstruction* new_conv = *instruction_set.begin();
+  EXPECT_EQ(HloOpcode::kConvolution, new_conv->opcode());
+  EXPECT_EQ(dnums.kernel_input_feature_dimension(),
+            new_conv->convolution_dimension_numbers()
+                .kernel_output_feature_dimension());
+  EXPECT_EQ(dnums.kernel_output_feature_dimension(),
+            new_conv->convolution_dimension_numbers()
+                .kernel_input_feature_dimension());
+}
+
+// Test that a complex transpose of the kernel gets folded into convolution.
+TEST_F(TransposeFoldingTest, FoldConvComplexTransposeRhs) {
+  auto builder = HloComputation::Builder("entry_computation");
+  HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {2, 3, 1, 1}),
+      /*name=*/"x"));
+  HloInstruction* y = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/1, ShapeUtil::MakeShape(F32, {1, 2, 1, 3}),
+      /*name=*/"y"));
+  HloInstruction* transpose_y =
+      builder.AddInstruction(HloInstruction::CreateTranspose(
+          ShapeUtil::MakeShape(F32, {2, 3, 1, 1}), y, {1, 3, 0, 2}));
+  auto dnums = ComputationBuilder::CreateDefaultConvDimensionNumbers();
+  Window window;
+  for (int i = 0; i < 2; ++i) {
+    WindowDimension* dim = window.add_dimensions();
+    dim->set_padding_low(0);
+    dim->set_padding_high(0);
+    dim->set_base_dilation(1);
+    dim->set_window_dilation(1);
+    dim->set_stride(1);
+    dim->set_size(
+        transpose_y->shape().dimensions(dnums.kernel_spatial_dimensions(i)));
+  }
+  StatusOr<Shape> conv_shape = ShapeInference::InferConvolveShape(
+      x->shape(), transpose_y->shape(), window, dnums);
+  EXPECT_IS_OK(conv_shape);
+  HloInstruction* conv = builder.AddInstruction(HloInstruction::CreateConvolve(
+      conv_shape.ValueOrDie(), x, transpose_y, window, dnums));
+
+  HloModule module("test_module");
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build(conv));
+  FoldTranspose(&module);
+
+  // Instructions after folding: x, y, and the convolution.
+  std::unordered_set<HloInstruction*> instruction_set;
+  for (auto& instruction : entry_computation->instructions()) {
+    instruction_set.insert(instruction.get());
+  }
+  CHECK_EQ(1, instruction_set.erase(x)) << "x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(y)) << "y is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.size())
+      << "entry_computation should contain exactly 3 instructions.";
+  HloInstruction* new_conv = *instruction_set.begin();
+  EXPECT_EQ(HloOpcode::kConvolution, new_conv->opcode());
+  EXPECT_EQ(dnums.kernel_input_feature_dimension(),
+            new_conv->convolution_dimension_numbers()
+                .kernel_output_feature_dimension());
+  EXPECT_EQ(dnums.kernel_spatial_dimensions(1),
+            new_conv->convolution_dimension_numbers()
+                .kernel_input_feature_dimension());
+  EXPECT_EQ(
+      dnums.kernel_output_feature_dimension(),
+      new_conv->convolution_dimension_numbers().kernel_spatial_dimensions(0));
+  EXPECT_EQ(
+      dnums.kernel_spatial_dimensions(0),
+      new_conv->convolution_dimension_numbers().kernel_spatial_dimensions(1));
+}
+
+// Test that a transpose of the activations does not get folded into
+// convolution.
+TEST_F(TransposeFoldingTest, FoldConvTransposeLhs) {
+  auto builder = HloComputation::Builder("entry_computation");
+  HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {3, 2, 1, 1}),
+      /*name=*/"x"));
+  HloInstruction* y = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/1, ShapeUtil::MakeShape(F32, {2, 3, 1, 1}),
+      /*name=*/"y"));
+  HloInstruction* transpose_x =
+      builder.AddInstruction(HloInstruction::CreateTranspose(
+          ShapeUtil::MakeShape(F32, {2, 3, 1, 1}), x, {1, 0, 2, 3}));
+  auto dnums = ComputationBuilder::CreateDefaultConvDimensionNumbers();
+  Window window;
+  for (int i = 0; i < 2; ++i) {
+    WindowDimension* dim = window.add_dimensions();
+    dim->set_padding_low(0);
+    dim->set_padding_high(0);
+    dim->set_base_dilation(1);
+    dim->set_window_dilation(1);
+    dim->set_stride(1);
+    dim->set_size(y->shape().dimensions(dnums.kernel_spatial_dimensions(i)));
+  }
+  StatusOr<Shape> conv_shape = ShapeInference::InferConvolveShape(
+      transpose_x->shape(), y->shape(), window, dnums);
+  EXPECT_IS_OK(conv_shape);
+  HloInstruction* conv = builder.AddInstruction(HloInstruction::CreateConvolve(
+      conv_shape.ValueOrDie(), transpose_x, y, window, dnums));
+
+  HloModule module("test_module");
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build(conv));
+  FoldTranspose(&module);
+
+  // Instructions after folding: transpose_x, y, and the convolution.
+  std::unordered_set<HloInstruction*> instruction_set;
+  for (auto& instruction : entry_computation->instructions()) {
+    instruction_set.insert(instruction.get());
+  }
+  CHECK_EQ(1, instruction_set.erase(x)) << "x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(y)) << "y is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(transpose_x))
+      << "transpose_x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(conv))
+      << "transpose_x is not in entry_computation.";
+  CHECK_EQ(0, instruction_set.size())
+      << "entry_computation should contain exactly 4 instructions.";
+}
+
 }  // namespace xla
-- 
GitLab


From 79f50de906fb680a1c9c45b61d9d5dc8f74f7e7a Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Sat, 8 Apr 2017 06:27:26 -0800
Subject: [PATCH 0239/1563] Add a smoke test to ensure that the doc generator
 runs. Change: 152592164

---
 tensorflow/BUILD                         |  5 +++
 tensorflow/tools/docs/BUILD              | 14 +++++++
 tensorflow/tools/docs/build_docs_test.py | 52 ++++++++++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 tensorflow/tools/docs/build_docs_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 365468540d..a73934a004 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -338,6 +338,11 @@ filegroup(
     ),
 )
 
+filegroup(
+    name = "docs_src",
+    data = glob(["docs_src/**/*.md"]),
+)
+
 # -------------------------------------------
 # New rules should be added above this target.
 # -------------------------------------------
diff --git a/tensorflow/tools/docs/BUILD b/tensorflow/tools/docs/BUILD
index b425e93aa1..8e27b133c2 100644
--- a/tensorflow/tools/docs/BUILD
+++ b/tensorflow/tools/docs/BUILD
@@ -99,6 +99,20 @@ py_binary(
     ],
 )
 
+py_test(
+    name = "build_docs_test",
+    size = "small",
+    srcs = ["build_docs_test.py"],
+    data = ["//tensorflow:docs_src"],
+    srcs_version = "PY2AND3",
+    tags = ["manual"],
+    deps = [
+        ":generate_lib",
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/debug:debug_py",
+    ],
+)
+
 py_binary(
     name = "generate_1_0",
     srcs = ["generate_1_0.py"],
diff --git a/tensorflow/tools/docs/build_docs_test.py b/tensorflow/tools/docs/build_docs_test.py
new file mode 100644
index 0000000000..08c27729a7
--- /dev/null
+++ b/tensorflow/tools/docs/build_docs_test.py
@@ -0,0 +1,52 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Run the python doc generator and fail if there are any broken links."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+
+import tensorflow as tf
+from tensorflow.python import debug as tf_debug
+from tensorflow.python.platform import googletest
+from tensorflow.python.platform import resource_loader
+from tensorflow.tools.docs import generate_lib
+
+
+class Flags(object):
+  resource_root = resource_loader.get_root_dir_with_all_resources()
+  src_dir = os.path.join(resource_root, 'third_party/tensorflow/docs_src')
+  base_dir = os.path.join(resource_root, 'third_party/tensorflow/')
+  output_dir = googletest.GetTempDir()
+
+
+class BuildDocsTest(googletest.TestCase):
+
+  def testBuildDocs(self):
+    doc_generator = generate_lib.DocGenerator()
+
+    doc_generator.set_py_modules([('tf', tf), ('tfdbg', tf_debug)])
+    doc_generator.load_contrib()
+
+    status = doc_generator.build(Flags())
+
+    if status:
+      self.fail('Found %s Errors!' % status)
+
+
+if __name__ == '__main__':
+  googletest.main()
-- 
GitLab


From b76f02855f88873a82348e60c20e0bed2f19b07d Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Sat, 8 Apr 2017 06:33:09 -0800
Subject: [PATCH 0240/1563] Add tensorboard to the _do_not_descend_map of the
 PublicAPIVisitor. Change: 152592268

---
 tensorflow/tools/common/public_api.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 3364ff6bc9..173b39c538 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -48,7 +48,8 @@ class PublicAPIVisitor(object):
           'pywrap_tensorflow',  # TODO(drpng): This can be removed once sealed.
           'user_ops',  # TODO(drpng): This can be removed once sealed.
           'python',
-          'tools'
+          'tools',
+          'tensorboard',
       ],
 
       # Some implementations have this internal module that we shouldn't expose.
-- 
GitLab


From 41a9fd1f7ee218a3deb59bba5972507b6bb05e48 Mon Sep 17 00:00:00 2001
From: Ziming Dong <dzm1016397507@gmail.com>
Date: Sat, 8 Apr 2017 23:47:03 +0800
Subject: [PATCH 0241/1563] fix summary writer thread leak (#8981)

* fix summary writer thread leak

* use a sentinel event to terminate daemon thread
---
 .../summary/writer/event_file_writer.py       | 22 +++++++++++++++++--
 .../python/summary/writer/writer_test.py      |  9 ++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/summary/writer/event_file_writer.py b/tensorflow/python/summary/writer/event_file_writer.py
index 7142998ce7..f920ae0143 100644
--- a/tensorflow/python/summary/writer/event_file_writer.py
+++ b/tensorflow/python/summary/writer/event_file_writer.py
@@ -24,6 +24,7 @@ import time
 
 import six
 
+from tensorflow.core.util import event_pb2
 from tensorflow.python import pywrap_tensorflow
 from tensorflow.python.platform import gfile
 from tensorflow.python.util import compat
@@ -64,12 +65,18 @@ class EventFileWriter(object):
     self._event_queue = six.moves.queue.Queue(max_queue)
     self._ev_writer = pywrap_tensorflow.EventsWriter(
         compat.as_bytes(os.path.join(self._logdir, "events")))
+    self._flush_secs = flush_secs
+    self._sentinel_event = self._get_sentinel_event()
     self._closed = False
     self._worker = _EventLoggerThread(self._event_queue, self._ev_writer,
-                                      flush_secs)
+                                      self._flush_secs, self._sentinel_event)
 
     self._worker.start()
 
+  def _get_sentinel_event(self):
+    """Generate a sentinel event for terminating worker."""
+    return event_pb2.Event()
+
   def get_logdir(self):
     """Returns the directory where event file will be written."""
     return self._logdir
@@ -83,6 +90,9 @@ class EventFileWriter(object):
     Does nothing if the EventFileWriter was not closed.
     """
     if self._closed:
+      self._worker = _EventLoggerThread(self._event_queue, self._ev_writer,
+                                        self._flush_secs, self._sentinel_event)
+      self._worker.start()
       self._closed = False
 
   def add_event(self, event):
@@ -108,7 +118,9 @@ class EventFileWriter(object):
 
     Call this method when you do not need the summary writer anymore.
     """
+    self.add_event(self._sentinel_event)
     self.flush()
+    self._worker.join()
     self._ev_writer.Close()
     self._closed = True
 
@@ -116,7 +128,7 @@ class EventFileWriter(object):
 class _EventLoggerThread(threading.Thread):
   """Thread that logs events."""
 
-  def __init__(self, queue, ev_writer, flush_secs):
+  def __init__(self, queue, ev_writer, flush_secs, sentinel_event):
     """Creates an _EventLoggerThread.
 
     Args:
@@ -125,6 +137,8 @@ class _EventLoggerThread(threading.Thread):
        the visualizer.
       flush_secs: How often, in seconds, to flush the
         pending file to disk.
+      sentinel_event: A sentinel element in queue that tells this thread to
+        terminate.
     """
     threading.Thread.__init__(self)
     self.daemon = True
@@ -133,10 +147,14 @@ class _EventLoggerThread(threading.Thread):
     self._flush_secs = flush_secs
     # The first event will be flushed immediately.
     self._next_event_flush_time = 0
+    self._sentinel_event = sentinel_event
 
   def run(self):
     while True:
       event = self._queue.get()
+      if event is self._sentinel_event:
+        self._queue.task_done()
+        break
       try:
         self._ev_writer.WriteEvent(event)
         # Flush the event writer every so often.
diff --git a/tensorflow/python/summary/writer/writer_test.py b/tensorflow/python/summary/writer/writer_test.py
index 50797483ee..65bb5ab00f 100644
--- a/tensorflow/python/summary/writer/writer_test.py
+++ b/tensorflow/python/summary/writer/writer_test.py
@@ -258,6 +258,15 @@ class SummaryWriterTestCase(test.TestCase):
     # We should be done.
     self.assertRaises(StopIteration, lambda: next(rr))
 
+  def testNonBlockingClose(self):
+    test_dir = self._CleanTestDir("non_blocking_close")
+    sw = writer.FileWriter(test_dir)
+    # Sleep 1.2 seconds to make sure event queue is empty.
+    time.sleep(1.2)
+    time_before_close = time.time()
+    sw.close()
+    self._assertRecent(time_before_close)
+
   # Checks that values returned from session Run() calls are added correctly to
   # summaries.  These are numpy types so we need to check they fit in the
   # protocol buffers correctly.
-- 
GitLab


From 45115c0a985815feef3a97a13d6b082997b38e5d Mon Sep 17 00:00:00 2001
From: Alan Mosca <nitbix@nitbix.com>
Date: Sat, 8 Apr 2017 16:49:52 +0100
Subject: [PATCH 0242/1563] Change scalar_summary to summary.scalar (#8883)

* Change scalar_summary to summary.scalar

scalar_summary is deprecated and issues a warning. This was reported in bug #8878

* Fix head_test to reflect new naming
---
 .../learn/python/learn/estimators/head.py     |  2 +-
 .../python/learn/estimators/head_test.py      | 80 ++++++++++---------
 2 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 14f7666b3d..0e0ed64286 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -612,7 +612,7 @@ def _create_model_fn_ops(features,
   if (mode != model_fn.ModeKeys.INFER) and (labels is not None):
     weight_tensor = _weight_tensor(features, weight_column_name)
     loss, weighted_average_loss = loss_fn(labels, logits, weight_tensor)
-    logging_ops.scalar_summary(
+    summary.scalar(
         _summary_key(head_name, mkey.LOSS), weighted_average_loss)
 
     if mode == model_fn.ModeKeys.TRAIN:
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index 9b8cba1526..abaf3a61a1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -124,7 +124,7 @@ class PoissonHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=logits)
       self._assert_output_alternatives(model_fn_ops)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_no_variables(self)
       loss = self._log_poisson_loss(logits, labels)
       _assert_metrics(self, loss, {"loss": loss}, model_fn_ops)
@@ -150,7 +150,7 @@ class RegressionHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_no_variables(self)
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
@@ -180,7 +180,7 @@ class RegressionHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 2. / 3, {"loss": 2. / 3}, model_fn_ops)
 
   def testRegressionWithLogitsAndLogitsInput(self):
@@ -208,7 +208,7 @@ class RegressionHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionWithLabelName(self):
@@ -223,7 +223,7 @@ class RegressionHeadTest(test.TestCase):
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionWithWeights(self):
@@ -238,7 +238,7 @@ class RegressionHeadTest(test.TestCase):
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 2. / len(weights), {"loss": 2. / np.sum(weights)},
                       model_fn_ops)
 
@@ -261,7 +261,7 @@ class RegressionHeadTest(test.TestCase):
           expected_trainable=("regression_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(
-          self, ["loss", "regression_head/centered_bias/bias_0"])
+          self, ["regression_head/loss", "regression_head/centered_bias/bias_0"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionErrorInSparseTensorLabels(self):
@@ -330,7 +330,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -347,7 +347,7 @@ class MultiLabelHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn, logits=logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = 1.00320443
       _assert_metrics(self, expected_loss, {
           "accuracy": 0.,
@@ -387,7 +387,7 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .69314718
       _assert_metrics(self, expected_loss, {
           "accuracy": 2. / 3,
@@ -432,7 +432,7 @@ class MultiLabelHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -451,7 +451,7 @@ class MultiLabelHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = 1.377779
       expected_eval_metrics = {
           "accuracy": 1. / 3,
@@ -519,7 +519,7 @@ class MultiLabelHeadTest(test.TestCase):
           head_lib.no_op_train_fn, logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -539,7 +539,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       _assert_metrics(self, .089985214,
                       self._expected_eval_metrics(2.69956), model_fn_ops)
 
@@ -559,7 +559,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       _assert_metrics(self, 0.089985214,
                       self._expected_eval_metrics(0.089985214), model_fn_ops)
 
@@ -583,7 +583,7 @@ class MultiLabelHeadTest(test.TestCase):
           expected_trainable=("multi_label_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self, (
-          "loss",
+          "multi_label_head/loss",
           "multi_label_head/centered_bias/bias_0",
           "multi_label_head/centered_bias/bias_1",
           "multi_label_head/centered_bias/bias_2"
@@ -608,7 +608,7 @@ class MultiLabelHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=self._logits)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -674,7 +674,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -702,7 +702,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .69314718
       label_mean = np.mean(self._labels)
       _assert_metrics(self, expected_loss, {
@@ -738,7 +738,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -817,7 +817,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -838,7 +838,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_total_loss = .31326166
       _assert_metrics(
           self,
@@ -871,7 +871,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       # logloss: z:label, x:logit
       # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
       # expected_loss is (total_weighted_loss)/1 since htere is 1 nonzero
@@ -911,7 +911,8 @@ class BinaryClassificationHeadTest(test.TestCase):
           expected_trainable=("binary_logistic_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(
-          self, ["loss", "binary_logistic_head/centered_bias/bias_0"])
+          self, ["binary_logistic_head/loss",
+		 "binary_logistic_head/centered_bias/bias_0"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -960,7 +961,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -999,7 +1000,7 @@ class MultiClassHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.0986123
       _assert_metrics(self, expected_loss, {
           "accuracy": 0.,
@@ -1050,7 +1051,7 @@ class MultiClassHeadTest(test.TestCase):
           expected_trainable=("multi_class_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self,
-                           ["loss",
+                           ["multi_class_head/loss",
                             "multi_class_head/centered_bias/bias_0",
                             "multi_class_head/centered_bias/bias_1",
                             "multi_class_head/centered_bias/bias_2"])
@@ -1068,7 +1069,7 @@ class MultiClassHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1087,7 +1088,7 @@ class MultiClassHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 3.1698461
       expected_eval_metrics = {
           "accuracy": 0.,
@@ -1126,7 +1127,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss * weight,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1150,7 +1151,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447 * weight
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1257,7 +1258,7 @@ class MultiClassHeadTest(test.TestCase):
         data_flow_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
-        _assert_summary_tags(self, ["loss"])
+        _assert_summary_tags(self, ["multi_class_head/loss"])
         expected_loss = 1.5514447
         expected_eval_metrics = {
             "accuracy": 0.,
@@ -1283,7 +1284,7 @@ class MultiClassHeadTest(test.TestCase):
         data_flow_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
-        _assert_summary_tags(self, ["loss"])
+        _assert_summary_tags(self, ["multi_class_head/loss"])
         expected_loss = 0.5514447
         expected_eval_metrics = {
             "accuracy": 1.,
@@ -1322,7 +1323,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1352,7 +1353,7 @@ class BinarySvmHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = 1.
       _assert_metrics(self, expected_loss, {
           "accuracy": .5,
@@ -1384,7 +1385,7 @@ class BinarySvmHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1403,7 +1404,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1422,7 +1423,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_weighted_sum = np.sum(
           np.multiply(weights, self._expected_losses))
       _assert_metrics(self, expected_weighted_sum / len(weights), {
@@ -1450,7 +1451,8 @@ class BinarySvmHeadTest(test.TestCase):
           expected_trainable=("binary_svm_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(
-          self, ["loss", "binary_svm_head/centered_bias/bias_0"])
+          self, ["binary_svm_head/loss",
+		 "binary_svm_head/centered_bias/bias_0"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
-- 
GitLab


From df7f248aba2ab38862ce4790bdacd7860989ed87 Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Sat, 8 Apr 2017 10:46:38 -0800
Subject: [PATCH 0243/1563] Add auto parallelization to meta optimizer. Enable
 MetaOptimizer if any one of the optimizers is on. Change: 152598517

---
 tensorflow/core/grappler/BUILD                 |  1 +
 tensorflow/core/grappler/optimizers/BUILD      |  2 ++
 .../core/grappler/optimizers/auto_parallel.h   |  4 +++-
 .../core/grappler/optimizers/meta_optimizer.cc | 18 ++++++++++++++----
 tensorflow/core/protobuf/rewriter_config.proto |  7 +++++++
 tensorflow/python/__init__.py                  |  1 +
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index 5d74d3d3b1..476a9ac52a 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -19,6 +19,7 @@ filegroup(
     srcs = [
         "devices.cc",
         "devices.h",
+        "grappler_item.cc",
         "grappler_item.h",
         "utils.cc",
         "utils.h",
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 2ea150ce18..64d5815bf7 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -17,6 +17,7 @@ filegroup(
     srcs = glob(
         [
             "*_optimizer.*",
+            "auto_parallel.*",
             "constant_folding.*",
             "model_pruner.*",
             "graph_rewriter.*",
@@ -210,6 +211,7 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        ":auto_parallel",
         ":constant_folding",
         ":graph_optimizer",
         ":layout_optimizer",
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.h b/tensorflow/core/grappler/optimizers/auto_parallel.h
index cac0db2c23..ad90bbe028 100644
--- a/tensorflow/core/grappler/optimizers/auto_parallel.h
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.h
@@ -25,7 +25,9 @@ namespace grappler {
 // Automatically parallelize a graph by splitting in the batch dimension.
 class AutoParallel : public GraphOptimizer {
  public:
-  AutoParallel(int num_replicas) : num_replicas_(num_replicas) {}
+  AutoParallel(int num_replicas) : num_replicas_(num_replicas) {
+    CHECK(num_replicas_ >= 2);
+  }
   ~AutoParallel() override {}
 
   string name() const override { return "autoparallel"; };
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 0fe9359b75..2ea5adffeb 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
 #include "tensorflow/core/framework/versions.pb.h"
+#include "tensorflow/core/grappler/optimizers/auto_parallel.h"
 #include "tensorflow/core/grappler/optimizers/constant_folding.h"
 #include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
@@ -41,6 +42,10 @@ std::unique_ptr<GraphOptimizer> MetaOptimizer::NewOptimizer(
   if (optimizer == "memory") {
     graph_optimizer.reset(new MemoryOptimizer());
   }
+  if (optimizer == "autoparallel") {
+    graph_optimizer.reset(
+        new AutoParallel(cfg_.auto_parallel().num_replicas()));
+  }
   return graph_optimizer;
 }
 
@@ -63,11 +68,15 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
       optimizers.push_back(
           std::unique_ptr<GraphOptimizer>(new MemoryOptimizer()));
     }
+    if (cfg_.auto_parallel().enable()) {
+      optimizers.push_back(std::unique_ptr<GraphOptimizer>(
+          new AutoParallel(cfg_.auto_parallel().num_replicas())));
+    }
   } else {
-    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout",
-                                             "memory"};
+    std::set<string> available_optimizers = {"pruning", "constfold", "layout",
+                                             "memory", "autoparallel"};
     for (const auto& optimizer : cfg_.optimizers()) {
-      if (avaliable_optimizers.find(optimizer) != avaliable_optimizers.end()) {
+      if (available_optimizers.find(optimizer) != available_optimizers.end()) {
         optimizers.push_back(NewOptimizer(optimizer));
       }
     }
@@ -102,7 +111,8 @@ void MetaOptimizer::Feedback(Cluster* cluster, const GrapplerItem& item,
 }
 
 bool MetaOptimizerEnabled(const RewriterConfig& cfg) {
-  return cfg.optimize_tensor_layout();
+  return cfg.optimize_tensor_layout() || cfg.constant_folding() ||
+         cfg.auto_parallel().enable() || !cfg.optimizers().empty();
 }
 
 Status RunMetaOptimizer(const GrapplerItem& item, const RewriterConfig& cfg,
diff --git a/tensorflow/core/protobuf/rewriter_config.proto b/tensorflow/core/protobuf/rewriter_config.proto
index 63821cb55e..753edba4b8 100644
--- a/tensorflow/core/protobuf/rewriter_config.proto
+++ b/tensorflow/core/protobuf/rewriter_config.proto
@@ -6,6 +6,11 @@ option java_outer_classname = "RewriterConfigProtos";
 option java_multiple_files = true;
 option java_package = "org.tensorflow.framework";
 
+message AutoParallelOptions {
+  bool enable = 1;
+  int32 num_replicas = 2;
+}
+
 message RewriterConfig {
   bool optimize_tensor_layout = 1;
   bool disable_model_pruning = 2;
@@ -19,6 +24,8 @@ message RewriterConfig {
   }
   MemOptType memory_optimization = 4;
 
+  AutoParallelOptions auto_parallel = 5;
+
   // If non-empty, will use this as an alternative way to specify a list of
   // optimizations to turn on and the order of the optimizations.
   repeated string optimizers = 100;
diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py
index 3663d8af7a..5f59836427 100644
--- a/tensorflow/python/__init__.py
+++ b/tensorflow/python/__init__.py
@@ -132,6 +132,7 @@ from tensorflow.python.ops import tensor_array_ops
 # documentation, or remove.
 _allowed_symbols = [
     'AttrValue',
+    'AutoParallelOptions',
     'ConfigProto',
     'DeviceSpec',
     'Event',
-- 
GitLab


From bb08eef695c5d8a8a3c21564be11651745eb3ad1 Mon Sep 17 00:00:00 2001
From: Aaron Schumacher <ajschumacher@gmail.com>
Date: Sat, 8 Apr 2017 15:26:07 -0400
Subject: [PATCH 0244/1563] fix example typo (too many brackets)

The example was like `json.dumps({{}})`, which fails because `{{}}` is not a valid data structure.

Also, just below this, there is `assert config.master == 'host4:2222'`, which I believe would fail since that value comes back as `'grpc://host4:2222'`, but I'm less sure about recommending this change.
---
 .../contrib/learn/python/learn/estimators/run_config.py       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 37ee814b62..ce306f056a 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -88,9 +88,9 @@ class ClusterConfig(object):
     ```
       cluster = {'ps': ['host1:2222', 'host2:2222'],
                  'worker': ['host3:2222', 'host4:2222', 'host5:2222']}
-      os.environ['TF_CONFIG'] = json.dumps({
+      os.environ['TF_CONFIG'] = json.dumps(
           {'cluster': cluster,
-           'task': {'type': 'worker', 'index': 1}}})
+           'task': {'type': 'worker', 'index': 1}})
       config = ClusterConfig()
       assert config.master == 'host4:2222'
       assert config.task_id == 1
-- 
GitLab


From 5de04c8ec62aae1944328d0fc220c0b60b4cd1d9 Mon Sep 17 00:00:00 2001
From: zhengjiajin <393926893@qq.com>
Date: Sun, 9 Apr 2017 21:14:00 +0800
Subject: [PATCH 0245/1563] delete null and relu to ReLU

---
 tensorflow/examples/tutorials/mnist/mnist_with_summaries.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
index 75ea0b9c67..698c97ca1d 100644
--- a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
+++ b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
@@ -14,7 +14,7 @@
 # ==============================================================================
 """A simple MNIST classifier which displays summaries in TensorBoard.
 
- This is an unimpressive MNIST model, but it is a good example of using
+This is an unimpressive MNIST model, but it is a good example of using
 tf.name_scope to make a graph legible in the TensorBoard graph explorer, and of
 naming summary tags so that they are grouped meaningfully in TensorBoard.
 
@@ -78,7 +78,7 @@ def train():
   def nn_layer(input_tensor, input_dim, output_dim, layer_name, act=tf.nn.relu):
     """Reusable code for making a simple neural net layer.
 
-    It does a matrix multiply, bias add, and then uses relu to nonlinearize.
+    It does a matrix multiply, bias add, and then uses ReLU to nonlinearize.
     It also sets up name scoping so that the resultant graph is easy to read,
     and adds a number of summary ops.
     """
-- 
GitLab


From 65755b124816be97cbf353be2d0528a4e9b2d056 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 9 Apr 2017 06:33:02 -0800
Subject: [PATCH 0246/1563] Update ops-related pbtxt files. Change: 152629248

---
 tensorflow/core/ops/ops.pbtxt | 53 -----------------------------------
 1 file changed, 53 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 4a644b55e6..172bdf02e2 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -26140,59 +26140,6 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
-op {
-  name: "UnsortedSegmentSum"
-  input_arg {
-    name: "data"
-    type_attr: "T"
-  }
-  input_arg {
-    name: "segment_ids"
-    description: "A tensor whose shape is a prefix of `data.shape`."
-    type_attr: "Tindices"
-  }
-  input_arg {
-    name: "num_segments"
-    type: DT_INT32
-  }
-  output_arg {
-    name: "output"
-    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
-    type_attr: "T"
-  }
-  attr {
-    name: "T"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
-      }
-    }
-  }
-  attr {
-    name: "Tindices"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_INT32
-        type: DT_INT64
-      }
-    }
-  }
-  summary: "Computes the max along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
-}
 op {
   name: "Unstage"
   output_arg {
-- 
GitLab


From a61cff67c783101b5b48ba56fd6d12ca5ae10ccb Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 9 Apr 2017 08:03:32 -0800
Subject: [PATCH 0247/1563] Prevent the renorm_weight from being updated too
 early. Change: 152631776

---
 tensorflow/python/layers/normalization.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index c998f57da7..5fd20259be 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -238,10 +238,14 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
       # For example, after a single update, the moving average would be
       # (1-decay) * value. and the weight will be 1-decay, with their ratio
       # giving value.
+      # Make sure the weight is not updated until before r and d computation.
+      value = array_ops.identity(value)
+      with ops.control_dependencies([value]):
+        weight_value = array_ops.constant(1., dtype=weight.dtype)
       new_var = moving_averages.assign_moving_average(
           var, value, decay, zero_debias=False)
       new_weight = moving_averages.assign_moving_average(
-          weight, 1., decay, zero_debias=False)
+          weight, weight_value, decay, zero_debias=False)
       return new_var / new_weight
 
     with ops.colocate_with(self.moving_mean):
-- 
GitLab


From cc97ef9c360082ba68b86328c8921e479b494b73 Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Sun, 9 Apr 2017 20:20:25 -0800
Subject: [PATCH 0248/1563] Automated rollback of change 152528732 Change:
 152652473

---
 tensorflow/BUILD                              |    3 +
 tensorflow/tools/api/golden/BUILD             |   24 +
 .../tensorflow.-aggregation-method.pbtxt      |   24 +
 .../tensorflow.-attr-value.-list-value.pbtxt  |  108 +
 .../api/golden/tensorflow.-attr-value.pbtxt   |  120 +
 .../tensorflow.-auto-parallel-options.pbtxt   |   84 +
 ...orflow.-conditional-accumulator-base.pbtxt |   29 +
 .../tensorflow.-conditional-accumulator.pbtxt |   38 +
 ...ow.-config-proto.-device-count-entry.pbtxt |   84 +
 .../api/golden/tensorflow.-config-proto.pbtxt |  132 ++
 .../tools/api/golden/tensorflow.-d-type.pbtxt |   77 +
 .../api/golden/tensorflow.-device-spec.pbtxt  |   37 +
 .../api/golden/tensorflow.-dimension.pbtxt    |   25 +
 .../tools/api/golden/tensorflow.-event.pbtxt  |  112 +
 .../golden/tensorflow.-f-i-f-o-queue.pbtxt    |   62 +
 .../tensorflow.-fixed-len-feature.pbtxt       |   27 +
 ...nsorflow.-fixed-len-sequence-feature.pbtxt |   31 +
 ...nsorflow.-fixed-length-record-reader.pbtxt |   46 +
 .../golden/tensorflow.-g-p-u-options.pbtxt    |  104 +
 .../api/golden/tensorflow.-graph-def.pbtxt    |   92 +
 .../api/golden/tensorflow.-graph-keys.pbtxt   |  136 ++
 .../golden/tensorflow.-graph-options.pbtxt    |  112 +
 .../tools/api/golden/tensorflow.-graph.pbtxt  |  129 ++
 .../golden/tensorflow.-histogram-proto.pbtxt  |  104 +
 .../golden/tensorflow.-identity-reader.pbtxt  |   46 +
 .../golden/tensorflow.-indexed-slices.pbtxt   |   42 +
 .../tensorflow.-interactive-session.pbtxt     |   43 +
 .../api/golden/tensorflow.-log-message.pbtxt  |  112 +
 ...nsorflow.-name-attr-list.-attr-entry.pbtxt |   84 +
 .../golden/tensorflow.-name-attr-list.pbtxt   |   88 +
 .../tensorflow.-node-def.-attr-entry.pbtxt    |   84 +
 .../api/golden/tensorflow.-node-def.pbtxt     |  100 +
 .../api/golden/tensorflow.-op-error.pbtxt     |   29 +
 .../api/golden/tensorflow.-operation.pbtxt    |   65 +
 .../tensorflow.-optimizer-options.pbtxt       |  128 ++
 .../tensorflow.-padding-f-i-f-o-queue.pbtxt   |   62 +
 .../golden/tensorflow.-priority-queue.pbtxt   |   62 +
 .../api/golden/tensorflow.-queue-base.pbtxt   |   61 +
 .../tensorflow.-random-shuffle-queue.pbtxt    |   62 +
 .../api/golden/tensorflow.-reader-base.pbtxt  |   45 +
 .../tensorflow.-register-gradient.pbtxt       |    9 +
 .../golden/tensorflow.-rewriter-config.pbtxt  |  112 +
 .../api/golden/tensorflow.-run-metadata.pbtxt |   88 +
 .../api/golden/tensorflow.-run-options.pbtxt  |  116 +
 .../api/golden/tensorflow.-session-log.pbtxt  |  108 +
 .../api/golden/tensorflow.-session.pbtxt      |   47 +
 ...flow.-sparse-conditional-accumulator.pbtxt |   46 +
 .../golden/tensorflow.-sparse-feature.pbtxt   |   35 +
 .../tensorflow.-sparse-tensor-value.pbtxt     |   26 +
 .../golden/tensorflow.-sparse-tensor.pbtxt    |   46 +
 .../golden/tensorflow.-summary.-audio.pbtxt   |   96 +
 .../golden/tensorflow.-summary.-image.pbtxt   |   92 +
 .../golden/tensorflow.-summary.-value.pbtxt   |  108 +
 .../api/golden/tensorflow.-summary.pbtxt      |   92 +
 .../tensorflow.-t-f-record-reader.pbtxt       |   46 +
 .../api/golden/tensorflow.-tensor-array.pbtxt |   69 +
 .../api/golden/tensorflow.-tensor-info.pbtxt  |   88 +
 .../api/golden/tensorflow.-tensor-shape.pbtxt |   73 +
 .../tools/api/golden/tensorflow.-tensor.pbtxt |   58 +
 .../golden/tensorflow.-text-line-reader.pbtxt |   46 +
 .../golden/tensorflow.-var-len-feature.pbtxt  |   19 +
 .../golden/tensorflow.-variable-scope.pbtxt   |   97 +
 ...ensorflow.-variable.-save-slice-info.pbtxt |   17 +
 .../api/golden/tensorflow.-variable.pbtxt     |  101 +
 .../tensorflow.-whole-file-reader.pbtxt       |   46 +
 .../tools/api/golden/tensorflow.app.pbtxt     |   11 +
 .../tools/api/golden/tensorflow.compat.pbtxt  |   35 +
 .../tensorflow.constant_initializer.pbtxt     |   10 +
 .../tensorflow.errors.-aborted-error.pbtxt    |   30 +
 ...sorflow.errors.-already-exists-error.pbtxt |   30 +
 .../tensorflow.errors.-cancelled-error.pbtxt  |   30 +
 .../tensorflow.errors.-data-loss-error.pbtxt  |   30 +
 ...flow.errors.-deadline-exceeded-error.pbtxt |   30 +
 ...ow.errors.-failed-precondition-error.pbtxt |   30 +
 .../tensorflow.errors.-internal-error.pbtxt   |   30 +
 ...rflow.errors.-invalid-argument-error.pbtxt |   30 +
 .../tensorflow.errors.-not-found-error.pbtxt  |   30 +
 .../golden/tensorflow.errors.-op-error.pbtxt  |   29 +
 ...ensorflow.errors.-out-of-range-error.pbtxt |   30 +
 ...flow.errors.-permission-denied-error.pbtxt |   30 +
 ...low.errors.-resource-exhausted-error.pbtxt |   30 +
 ...orflow.errors.-unauthenticated-error.pbtxt |   30 +
 ...tensorflow.errors.-unavailable-error.pbtxt |   30 +
 ...nsorflow.errors.-unimplemented-error.pbtxt |   30 +
 .../tensorflow.errors.-unknown-error.pbtxt    |   30 +
 .../tools/api/golden/tensorflow.errors.pbtxt  |  151 ++
 ...tensorflow.estimator.-estimator-spec.pbtxt |   47 +
 .../tensorflow.estimator.-estimator.pbtxt     |   37 +
 .../tensorflow.estimator.-mode-keys.pbtxt     |   20 +
 .../tensorflow.estimator.-run-config.pbtxt    |   68 +
 ...-classification-output.__metaclass__.pbtxt |   14 +
 ...imator.export.-classification-output.pbtxt |   22 +
 ....export.-export-output.__metaclass__.pbtxt |   14 +
 ...flow.estimator.export.-export-output.pbtxt |   12 +
 ...export.-predict-output.__metaclass__.pbtxt |   14 +
 ...low.estimator.export.-predict-output.pbtxt |   18 +
 ...ort.-regression-output.__metaclass__.pbtxt |   14 +
 ....estimator.export.-regression-output.pbtxt |   18 +
 ...mator.export.-serving-input-receiver.pbtxt |   23 +
 .../golden/tensorflow.estimator.export.pbtxt  |   31 +
 .../golden/tensorflow.estimator.inputs.pbtxt  |   11 +
 .../api/golden/tensorflow.estimator.pbtxt     |   27 +
 .../tensorflow.gfile.-fast-g-file.pbtxt       |   58 +
 .../api/golden/tensorflow.gfile.-g-file.pbtxt |   58 +
 .../api/golden/tensorflow.gfile.-open.pbtxt   |   58 +
 .../tools/api/golden/tensorflow.gfile.pbtxt   |   63 +
 .../api/golden/tensorflow.graph_util.pbtxt    |   23 +
 .../tensorflow.image.-resize-method.pbtxt     |   24 +
 .../tools/api/golden/tensorflow.image.pbtxt   |  175 ++
 .../tools/api/golden/tensorflow.layers.pbtxt  |   59 +
 .../tools/api/golden/tensorflow.logging.pbtxt |   83 +
 .../tools/api/golden/tensorflow.losses.pbtxt  |   63 +
 .../tools/api/golden/tensorflow.metrics.pbtxt |   99 +
 .../tools/api/golden/tensorflow.nn.pbtxt      |  323 +++
 .../golden/tensorflow.ones_initializer.pbtxt  |   10 +
 .../tensorflow.orthogonal_initializer.pbtxt   |   10 +
 tensorflow/tools/api/golden/tensorflow.pbtxt  | 1947 +++++++++++++++++
 ...thon_io.-t-f-record-compression-type.pbtxt |   20 +
 ...orflow.python_io.-t-f-record-options.pbtxt |   17 +
 ...sorflow.python_io.-t-f-record-writer.pbtxt |   17 +
 .../api/golden/tensorflow.python_io.pbtxt     |   19 +
 ...tensorflow.random_normal_initializer.pbtxt |   10 +
 ...ensorflow.random_uniform_initializer.pbtxt |   10 +
 .../golden/tensorflow.resource_loader.pbtxt   |   23 +
 ...d_model.builder.-saved-model-builder.pbtxt |   21 +
 .../tensorflow.saved_model.builder.pbtxt      |    7 +
 .../tensorflow.saved_model.constants.pbtxt    |   39 +
 .../tensorflow.saved_model.loader.pbtxt       |   11 +
 .../tensorflow.saved_model.main_op.pbtxt      |   11 +
 .../api/golden/tensorflow.saved_model.pbtxt   |   35 +
 ...flow.saved_model.signature_constants.pbtxt |   47 +
 ...flow.saved_model.signature_def_utils.pbtxt |   19 +
 ...tensorflow.saved_model.tag_constants.pbtxt |   11 +
 .../golden/tensorflow.saved_model.utils.pbtxt |    7 +
 .../tools/api/golden/tensorflow.sdca.pbtxt    |    3 +
 .../tools/api/golden/tensorflow.sets.pbtxt    |   19 +
 .../api/golden/tensorflow.spectral.pbtxt      |   51 +
 .../golden/tensorflow.summary.-event.pbtxt    |  112 +
 ...ensorflow.summary.-file-writer-cache.pbtxt |   16 +
 .../tensorflow.summary.-file-writer.pbtxt     |   50 +
 .../tensorflow.summary.-session-log.pbtxt     |  108 +
 ...sorflow.summary.-summary-description.pbtxt |   80 +
 .../tensorflow.summary.-summary.-audio.pbtxt  |   96 +
 .../tensorflow.summary.-summary.-image.pbtxt  |   92 +
 .../tensorflow.summary.-summary.-value.pbtxt  |  108 +
 .../golden/tensorflow.summary.-summary.pbtxt  |   92 +
 ...sorflow.summary.-tagged-run-metadata.pbtxt |   84 +
 .../tools/api/golden/tensorflow.summary.pbtxt |   67 +
 .../api/golden/tensorflow.sysconfig.pbtxt     |   11 +
 .../golden/tensorflow.test.-benchmark.pbtxt   |   21 +
 .../tools/api/golden/tensorflow.test.pbtxt    |   51 +
 ...tensorflow.train.-adadelta-optimizer.pbtxt |   46 +
 ...sorflow.train.-adagrad-d-a-optimizer.pbtxt |   46 +
 .../tensorflow.train.-adagrad-optimizer.pbtxt |   46 +
 .../tensorflow.train.-adam-optimizer.pbtxt    |   46 +
 .../golden/tensorflow.train.-bytes-list.pbtxt |   80 +
 ...sorflow.train.-checkpoint-saver-hook.pbtxt |   30 +
 ...sorflow.train.-chief-session-creator.pbtxt |   14 +
 .../tensorflow.train.-cluster-def.pbtxt       |   80 +
 .../tensorflow.train.-cluster-spec.pbtxt      |   37 +
 .../tensorflow.train.-coordinator.pbtxt       |   45 +
 .../golden/tensorflow.train.-example.pbtxt    |   80 +
 ...ow.train.-exponential-moving-average.pbtxt |   25 +
 .../tensorflow.train.-feature-list.pbtxt      |   80 +
 ...n.-feature-lists.-feature-list-entry.pbtxt |   84 +
 .../tensorflow.train.-feature-lists.pbtxt     |   84 +
 .../golden/tensorflow.train.-feature.pbtxt    |   88 +
 ...rflow.train.-features.-feature-entry.pbtxt |   84 +
 .../golden/tensorflow.train.-features.pbtxt   |   84 +
 .../tensorflow.train.-feed-fn-hook.pbtxt      |   30 +
 .../tensorflow.train.-final-ops-hook.pbtxt    |   34 +
 .../golden/tensorflow.train.-float-list.pbtxt |   80 +
 .../tensorflow.train.-ftrl-optimizer.pbtxt    |   46 +
 ...rflow.train.-global-step-waiter-hook.pbtxt |   30 +
 ...ow.train.-gradient-descent-optimizer.pbtxt |   46 +
 .../golden/tensorflow.train.-int64-list.pbtxt |   80 +
 ...nsorflow.train.-job-def.-tasks-entry.pbtxt |   84 +
 .../golden/tensorflow.train.-job-def.pbtxt    |   88 +
 ...ensorflow.train.-logging-tensor-hook.pbtxt |   30 +
 .../tensorflow.train.-looper-thread.pbtxt     |   73 +
 ...tensorflow.train.-momentum-optimizer.pbtxt |   46 +
 .../tensorflow.train.-monitored-session.pbtxt |   26 +
 ...rain.-nan-loss-during-training-error.pbtxt |   16 +
 .../tensorflow.train.-nan-tensor-hook.pbtxt   |   30 +
 .../golden/tensorflow.train.-optimizer.pbtxt  |   45 +
 ...ow.train.-proximal-adagrad-optimizer.pbtxt |   46 +
 ...-proximal-gradient-descent-optimizer.pbtxt |   46 +
 .../tensorflow.train.-queue-runner.pbtxt      |   49 +
 ...nsorflow.train.-r-m-s-prop-optimizer.pbtxt |   46 +
 .../golden/tensorflow.train.-saver-def.pbtxt  |  120 +
 .../api/golden/tensorflow.train.-saver.pbtxt  |   53 +
 .../golden/tensorflow.train.-scaffold.pbtxt   |   49 +
 ...nsorflow.train.-second-or-step-timer.pbtxt |   21 +
 .../tensorflow.train.-sequence-example.pbtxt  |   84 +
 .../golden/tensorflow.train.-server-def.pbtxt |   96 +
 .../api/golden/tensorflow.train.-server.pbtxt |   29 +
 .../tensorflow.train.-session-creator.pbtxt   |   12 +
 .../tensorflow.train.-session-manager.pbtxt   |   21 +
 .../tensorflow.train.-session-run-args.pbtxt  |   27 +
 ...ensorflow.train.-session-run-context.pbtxt |   25 +
 .../tensorflow.train.-session-run-hook.pbtxt  |   28 +
 ...tensorflow.train.-session-run-values.pbtxt |   27 +
 ...ow.train.-singular-monitored-session.pbtxt |   30 +
 .../tensorflow.train.-step-counter-hook.pbtxt |   30 +
 .../tensorflow.train.-stop-at-step-hook.pbtxt |   30 +
 ...tensorflow.train.-summary-saver-hook.pbtxt |   30 +
 .../golden/tensorflow.train.-supervisor.pbtxt |  153 ++
 ...rflow.train.-sync-replicas-optimizer.pbtxt |   58 +
 ...orflow.train.-worker-session-creator.pbtxt |   14 +
 .../tools/api/golden/tensorflow.train.pbtxt   |  391 ++++
 ...low.train.queue_runner.-queue-runner.pbtxt |   49 +
 .../tensorflow.train.queue_runner.pbtxt       |   15 +
 ...sorflow.truncated_normal_initializer.pbtxt |   10 +
 ...low.uniform_unit_scaling_initializer.pbtxt |   10 +
 .../golden/tensorflow.zeros_initializer.pbtxt |   10 +
 tensorflow/tools/api/lib/BUILD                |   39 +
 tensorflow/tools/api/lib/api_objects.proto    |   31 +
 .../api/lib/python_object_to_proto_visitor.py |  168 ++
 .../tools/api/tests/API_UPDATE_WARNING.txt    |    7 +
 tensorflow/tools/api/tests/BUILD              |   43 +
 tensorflow/tools/api/tests/README.txt         |   13 +
 .../tools/api/tests/api_compatibility_test.py |  238 ++
 222 files changed, 14089 insertions(+)
 create mode 100644 tensorflow/tools/api/golden/BUILD
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-event.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.app.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.compat.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.layers.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.logging.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.losses.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.nn.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sets.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.test.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/lib/BUILD
 create mode 100644 tensorflow/tools/api/lib/api_objects.proto
 create mode 100644 tensorflow/tools/api/lib/python_object_to_proto_visitor.py
 create mode 100644 tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
 create mode 100644 tensorflow/tools/api/tests/BUILD
 create mode 100644 tensorflow/tools/api/tests/README.txt
 create mode 100644 tensorflow/tools/api/tests/api_compatibility_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index a73934a004..446d5431ec 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -304,6 +304,9 @@ filegroup(
         "//tensorflow/tensorboard/plugins/projector:all_files",
         "//tensorflow/tensorboard/plugins/text:all_files",
         "//tensorflow/tensorboard/scripts:all_files",
+        "//tensorflow/tools/api/golden:all_files",
+        "//tensorflow/tools/api/lib:all_files",
+        "//tensorflow/tools/api/tests:all_files",
         "//tensorflow/tools/common:all_files",
         "//tensorflow/tools/compatibility:all_files",
         "//tensorflow/tools/dist_test/server:all_files",
diff --git a/tensorflow/tools/api/golden/BUILD b/tensorflow/tools/api/golden/BUILD
new file mode 100644
index 0000000000..08436396a6
--- /dev/null
+++ b/tensorflow/tools/api/golden/BUILD
@@ -0,0 +1,24 @@
+# TensorFlow API backwards compatibility test goldens.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "api_golden",
+    srcs = glob(["*.pbtxt"]),
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
new file mode 100644
index 0000000000..f79029d3fe
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.AggregationMethod"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.gradients_impl.AggregationMethod\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "ADD_N"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "EXPERIMENTAL_ACCUMULATE_N"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "EXPERIMENTAL_TREE"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
new file mode 100644
index 0000000000..0fb1aaba28
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.AttrValue.ListValue"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.ListValue\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
new file mode 100644
index 0000000000..e7a3a1f02f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
@@ -0,0 +1,120 @@
+path: "tensorflow.AttrValue"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrValue\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ListValue"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "PLACEHOLDER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt
new file mode 100644
index 0000000000..c8f3e8fb15
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.AutoParallelOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.rewriter_config_pb2.AutoParallelOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENABLE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NUM_REPLICAS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
new file mode 100644
index 0000000000..c9a32c16b3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.ConditionalAccumulatorBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'accumulator_ref\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
new file mode 100644
index 0000000000..d23b3bd0ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
@@ -0,0 +1,38 @@
+path: "tensorflow.ConditionalAccumulator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulator\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'conditional_accumulator\'], "
+  }
+  member_method {
+    name: "apply_grad"
+    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
new file mode 100644
index 0000000000..29bb3be35c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.ConfigProto.DeviceCountEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.DeviceCountEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
new file mode 100644
index 0000000000..805a9bdd4f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
@@ -0,0 +1,132 @@
+path: "tensorflow.ConfigProto"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.ConfigProto\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ALLOW_SOFT_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DEVICE_COUNT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEVICE_FILTERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DeviceCountEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "GPU_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTER_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTRA_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_DEVICE_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPERATION_TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PLACEMENT_PERIOD_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "RPC_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_INTER_OP_THREAD_POOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "USE_PER_SESSION_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
new file mode 100644
index 0000000000..0b5b88bba8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
@@ -0,0 +1,77 @@
+path: "tensorflow.DType"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "as_datatype_enum"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "as_numpy_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "base_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_bool"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_complex"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_floating"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_integer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_numpy_compatible"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_quantized"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_unsigned"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "limits"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "max"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "min"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "real_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "size"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'type_enum\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
new file mode 100644
index 0000000000..92e535c341
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.DeviceSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.device.DeviceSpec\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "job"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "replica"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'job\', \'replica\', \'task\', \'device_type\', \'device_index\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "from_string"
+    argspec: "args=[\'spec\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_from"
+    argspec: "args=[\'self\', \'dev\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "parse_from_string"
+    argspec: "args=[\'self\', \'spec\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_string"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt b/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
new file mode 100644
index 0000000000..a9ab27719b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.Dimension"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.tensor_shape.Dimension\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "value"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
new file mode 100644
index 0000000000..9bf8c12428
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.Event"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
new file mode 100644
index 0000000000..72cc532447
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.FIFOQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.FIFOQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'fifo_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
new file mode 100644
index 0000000000..6933814a7b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.FixedLenFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "default_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
new file mode 100644
index 0000000000..c538787951
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
@@ -0,0 +1,31 @@
+path: "tensorflow.FixedLenSequenceFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "allow_missing"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "default_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
new file mode 100644
index 0000000000..e7e36e2bb3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.FixedLengthRecordReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.FixedLengthRecordReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'record_bytes\', \'header_bytes\', \'footer_bytes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
new file mode 100644
index 0000000000..48cda623f7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
@@ -0,0 +1,104 @@
+path: "tensorflow.GPUOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GPUOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ALLOCATOR_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ALLOW_GROWTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFERRED_DELETION_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "POLLING_ACTIVE_DELAY_USECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "POLLING_INACTIVE_DELAY_MSECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VISIBLE_DEVICE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
new file mode 100644
index 0000000000..1495e847cb
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.GraphDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.graph_pb2.GraphDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LIBRARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
new file mode 100644
index 0000000000..ef2cfe3787
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
@@ -0,0 +1,136 @@
+path: "tensorflow.GraphKeys"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.GraphKeys\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "ACTIVATIONS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ASSET_FILEPATHS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "BIASES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CONCATENATED_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "COND_CONTEXT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "EVAL_STEP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GLOBAL_STEP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GLOBAL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_RESOURCES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOSSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MODEL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MOVING_AVERAGE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "QUEUE_RUNNERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "READY_FOR_LOCAL_INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "READY_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGULARIZATION_LOSSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "RESOURCES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVEABLE_OBJECTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUMMARIES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUMMARY_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TABLE_INITIALIZERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINABLE_RESOURCE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINABLE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAIN_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "UPDATE_OPS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "WEIGHTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "WHILE_CONTEXT"
+    mtype: "<type \'str\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
new file mode 100644
index 0000000000..0844f891ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.GraphOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GraphOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BUILD_COST_MODEL_AFTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BUILD_COST_MODEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENABLE_BFLOAT16_SENDRECV_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ENABLE_RECV_SCHEDULING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "INFER_SHAPES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZER_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PLACE_PRUNED_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "REWRITE_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TIMELINE_STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
new file mode 100644
index 0000000000..566456a255
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
@@ -0,0 +1,129 @@
+path: "tensorflow.Graph"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Graph\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "building_function"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "finalized"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def_versions"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "seed"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "version"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_to_collection"
+    argspec: "args=[\'self\', \'name\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_to_collections"
+    argspec: "args=[\'self\', \'names\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_graph_def"
+    argspec: "args=[\'self\', \'from_version\', \'add_shapes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "as_graph_element"
+    argspec: "args=[\'self\', \'obj\', \'allow_tensor\', \'allow_operation\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
+  }
+  member_method {
+    name: "clear_collection"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "colocate_with"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "container"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "control_dependencies"
+    argspec: "args=[\'self\', \'control_inputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "create_op"
+    argspec: "args=[\'self\', \'op_type\', \'inputs\', \'dtypes\', \'input_types\', \'name\', \'attrs\', \'op_def\', \'compute_shapes\', \'compute_device\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "device"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "finalize"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_all_collection_keys"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'self\', \'name\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection_ref"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_operation_by_name"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_operations"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_tensor_by_name"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gradient_override_map"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "is_feedable"
+    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_fetchable"
+    argspec: "args=[\'self\', \'tensor_or_op\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "name_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "prevent_feeding"
+    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "prevent_fetching"
+    argspec: "args=[\'self\', \'op\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "unique_name"
+    argspec: "args=[\'self\', \'name\', \'mark_as_used\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
new file mode 100644
index 0000000000..2567d2fe60
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
@@ -0,0 +1,104 @@
+path: "tensorflow.HistogramProto"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.HistogramProto\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BUCKET_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BUCKET_LIMIT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MAX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MIN_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUM_SQUARES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
new file mode 100644
index 0000000000..2eda320d63
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.IdentityReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.IdentityReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt b/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
new file mode 100644
index 0000000000..fee84d8530
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
@@ -0,0 +1,42 @@
+path: "tensorflow.IndexedSlices"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.IndexedSlices\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'values\', \'indices\', \'dense_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
new file mode 100644
index 0000000000..623f4b1a27
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
@@ -0,0 +1,43 @@
+path: "tensorflow.InteractiveSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.client.session.InteractiveSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "sess_str"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "partial_run"
+    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "partial_run_setup"
+    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
new file mode 100644
index 0000000000..a43c5eb7e3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.LogMessage"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.LogMessage\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEBUGGING"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ERROR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FATAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INFO"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Level"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNKNOWN"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WARN"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
new file mode 100644
index 0000000000..2750bd780c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.NameAttrList.AttrEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
new file mode 100644
index 0000000000..d10faf67d0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.NameAttrList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.NameAttrList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AttrEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
new file mode 100644
index 0000000000..b1b62d60f1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.NodeDef.AttrEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.AttrEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
new file mode 100644
index 0000000000..b812b4df2b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
@@ -0,0 +1,100 @@
+path: "tensorflow.NodeDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.NodeDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AttrEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DEVICE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "INPUT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
new file mode 100644
index 0000000000..7e59615534
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.OpError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
new file mode 100644
index 0000000000..0f43a49ee9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
@@ -0,0 +1,65 @@
+path: "tensorflow.Operation"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Operation\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "control_inputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "inputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "outputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "traceback"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "type"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'g\', \'inputs\', \'output_types\', \'control_inputs\', \'input_types\', \'original_op\', \'op_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "colocation_groups"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_attr"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "values"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
new file mode 100644
index 0000000000..5dd1ee47c9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
@@ -0,0 +1,128 @@
+path: "tensorflow.OptimizerOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.OptimizerOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DO_COMMON_SUBEXPRESSION_ELIMINATION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_CONSTANT_FOLDING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_FUNCTION_INLINING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "GLOBAL_JIT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GlobalJitLevel"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "L0"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "L1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Level"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "OFF"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ON_1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ON_2"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
new file mode 100644
index 0000000000..1bfe723ce7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.PaddingFIFOQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PaddingFIFOQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'padding_fifo_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
new file mode 100644
index 0000000000..dbe25f3a5b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.PriorityQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PriorityQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'types\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'priority_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
new file mode 100644
index 0000000000..9263d73a51
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
@@ -0,0 +1,61 @@
+path: "tensorflow.QueueBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtypes\', \'shapes\', \'names\', \'queue_ref\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
new file mode 100644
index 0000000000..ec783ffe5a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.RandomShuffleQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.RandomShuffleQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'min_after_dequeue\', \'dtypes\', \'shapes\', \'names\', \'seed\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'random_shuffle_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
new file mode 100644
index 0000000000..f6a3ce76a1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.ReaderBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'reader_ref\', \'supports_serialize\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt b/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
new file mode 100644
index 0000000000..4d6e4137d1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
@@ -0,0 +1,9 @@
+path: "tensorflow.RegisterGradient"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.RegisterGradient\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
new file mode 100644
index 0000000000..34d2e17612
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.RewriterConfig"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.rewriter_config_pb2.RewriterConfig\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUTO_PARALLEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CONSTANT_FOLDING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DISABLE_MODEL_PRUNING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MANUAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MEMORY_OPTIMIZATION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MemOptType"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "NO_MEM_OPT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZE_TENSOR_LAYOUT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
new file mode 100644
index 0000000000..808fa0fa21
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.RunMetadata"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunMetadata\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COST_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_STATS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
new file mode 100644
index 0000000000..5ad6804a78
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
@@ -0,0 +1,116 @@
+path: "tensorflow.RunOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEBUG_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FULL_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "HARDWARE_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTER_OP_THREAD_POOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NO_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OUTPUT_PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SOFTWARE_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TRACE_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TraceLevel"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
new file mode 100644
index 0000000000..ec66d7f335
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.SessionLog"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CHECKPOINT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "START"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_UNSPECIFIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STOP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SessionStatus"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
new file mode 100644
index 0000000000..f5c597548f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.Session"
+tf_class {
+  is_instance: "<class \'tensorflow.python.client.session.Session\'>"
+  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "sess_str"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "partial_run"
+    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "partial_run_setup"
+    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'target\', \'containers\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
new file mode 100644
index 0000000000..2260279ad2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.SparseConditionalAccumulator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.SparseConditionalAccumulator\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'sparse_conditional_accumulator\'], "
+  }
+  member_method {
+    name: "apply_grad"
+    argspec: "args=[\'self\', \'grad_indices\', \'grad_values\', \'grad_shape\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
+  }
+  member_method {
+    name: "apply_indexed_slices_grad"
+    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_indexed_slices_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
new file mode 100644
index 0000000000..d875394fb5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.SparseFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "already_sorted"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "index_key"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "size"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "value_key"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
new file mode 100644
index 0000000000..d33fd4d5d7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
@@ -0,0 +1,26 @@
+path: "tensorflow.SparseTensorValue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensorValue\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
new file mode 100644
index 0000000000..eac236d498
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.SparseTensor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensor\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'indices\', \'values\', \'dense_shape\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "from_value"
+    argspec: "args=[\'cls\', \'sparse_tensor_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
new file mode 100644
index 0000000000..781010d75e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.Summary.Audio"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
new file mode 100644
index 0000000000..feb9c7ee92
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.Summary.Image"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
new file mode 100644
index 0000000000..d02fb9ecd4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.Summary.Value"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
new file mode 100644
index 0000000000..38de17fa9e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.Summary"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "Audio"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "Image"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
new file mode 100644
index 0000000000..cdf7937391
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.TFRecordReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.TFRecordReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'options\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
new file mode 100644
index 0000000000..a0fad4df52
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
@@ -0,0 +1,69 @@
+path: "tensorflow.TensorArray"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.tensor_array_ops.TensorArray\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "flow"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "handle"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'size\', \'dynamic_size\', \'clear_after_read\', \'tensor_array_name\', \'handle\', \'flow\', \'infer_shape\', \'element_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "concat"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "gather"
+    argspec: "args=[\'self\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "grad"
+    argspec: "args=[\'self\', \'source\', \'flow\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "identity"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'index\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scatter"
+    argspec: "args=[\'self\', \'indices\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "split"
+    argspec: "args=[\'self\', \'value\', \'lengths\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "stack"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unstack"
+    argspec: "args=[\'self\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'index\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
new file mode 100644
index 0000000000..87632fb7b9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.TensorInfo"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.TensorInfo\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DTYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
new file mode 100644
index 0000000000..d5b9cb8f5e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
@@ -0,0 +1,73 @@
+path: "tensorflow.TensorShape"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.tensor_shape.TensorShape\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dims"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ndims"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dims\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_list"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_proto"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_has_rank"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_fully_defined"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_same_rank"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "concatenate"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_fully_defined"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_elements"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank_at_least"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank_at_most"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
new file mode 100644
index 0000000000..38d19bb537
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.Tensor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Tensor\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "OVERLOADABLE_OPERATORS"
+    mtype: "<type \'set\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "value_index"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'op\', \'value_index\', \'dtype\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "consumers"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_shape"
+    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
new file mode 100644
index 0000000000..e9779f0762
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.TextLineReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.TextLineReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'skip_header_lines\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
new file mode 100644
index 0000000000..54b66f43f8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.VarLenFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
new file mode 100644
index 0000000000..c9b2dfd677
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
@@ -0,0 +1,97 @@
+path: "tensorflow.VariableScope"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variable_scope.VariableScope\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "caching_device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "custom_getter"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initializer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "original_name_scope"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "partitioner"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "regularizer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "reuse"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "use_resource"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'reuse\', \'name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'name_scope\', \'dtype\', \'use_resource\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\', \'None\', \'None\', \'None\', \'\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_variable"
+    argspec: "args=[\'self\', \'var_store\', \'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'reuse\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "global_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reuse_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_caching_device"
+    argspec: "args=[\'self\', \'caching_device\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_custom_getter"
+    argspec: "args=[\'self\', \'custom_getter\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_dtype"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_initializer"
+    argspec: "args=[\'self\', \'initializer\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_partitioner"
+    argspec: "args=[\'self\', \'partitioner\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_regularizer"
+    argspec: "args=[\'self\', \'regularizer\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_use_resource"
+    argspec: "args=[\'self\', \'use_resource\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "trainable_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
new file mode 100644
index 0000000000..ac3ccd468b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.Variable.SaveSliceInfo"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variables.SaveSliceInfo\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "spec"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'full_name\', \'full_shape\', \'var_offset\', \'var_shape\', \'save_slice_info_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
new file mode 100644
index 0000000000..d67a2713f7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
@@ -0,0 +1,101 @@
+path: "tensorflow.Variable"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variables.Variable\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "SaveSliceInfo"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initial_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initializer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'initial_value\', \'trainable\', \'collections\', \'validate_shape\', \'caching_device\', \'name\', \'variable_def\', \'dtype\', \'expected_shape\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'True\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign"
+    argspec: "args=[\'self\', \'value\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "assign_add"
+    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "assign_sub"
+    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "count_up_to"
+    argspec: "args=[\'self\', \'limit\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'variable_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "initialized_value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load"
+    argspec: "args=[\'self\', \'value\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "scatter_sub"
+    argspec: "args=[\'self\', \'sparse_delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "set_shape"
+    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
new file mode 100644
index 0000000000..4ac759891c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.WholeFileReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.WholeFileReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.app.pbtxt b/tensorflow/tools/api/golden/tensorflow.app.pbtxt
new file mode 100644
index 0000000000..85044a8987
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.app.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.app"
+tf_module {
+  member {
+    name: "flags"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'main\', \'argv\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.compat.pbtxt b/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
new file mode 100644
index 0000000000..ccc6031400
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.compat"
+tf_module {
+  member {
+    name: "bytes_or_text_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "complex_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "integral_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "real_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member_method {
+    name: "as_bytes"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+  member_method {
+    name: "as_str"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+  member_method {
+    name: "as_str_any"
+    argspec: "args=[\'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_text"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
new file mode 100644
index 0000000000..d34bfe5147
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.constant_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Constant\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\', \'dtype\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'0\', \"<dtype: \'float32\'>\", \'False\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
new file mode 100644
index 0000000000..ea9186b0b9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.AbortedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.AbortedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
new file mode 100644
index 0000000000..4e155081dd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.AlreadyExistsError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.AlreadyExistsError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
new file mode 100644
index 0000000000..b02a0e023a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.CancelledError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.CancelledError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
new file mode 100644
index 0000000000..c1fa66342a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.DataLossError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.DataLossError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
new file mode 100644
index 0000000000..8e03793619
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.DeadlineExceededError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.DeadlineExceededError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
new file mode 100644
index 0000000000..384d4b534c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.FailedPreconditionError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.FailedPreconditionError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
new file mode 100644
index 0000000000..ac5c4d7879
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.InternalError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.InternalError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
new file mode 100644
index 0000000000..161edd4a7c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.InvalidArgumentError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.InvalidArgumentError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
new file mode 100644
index 0000000000..1e64730ac6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.NotFoundError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.NotFoundError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
new file mode 100644
index 0000000000..b1f14c0457
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.errors.OpError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
new file mode 100644
index 0000000000..6365e47286
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.OutOfRangeError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OutOfRangeError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
new file mode 100644
index 0000000000..dc8a66f9ea
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.PermissionDeniedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.PermissionDeniedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
new file mode 100644
index 0000000000..85bb384b46
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.ResourceExhaustedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.ResourceExhaustedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
new file mode 100644
index 0000000000..d57d7ac2f2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnauthenticatedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnauthenticatedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
new file mode 100644
index 0000000000..cc33e6ed8d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnavailableError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnavailableError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
new file mode 100644
index 0000000000..b8c2e22dbd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnimplementedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnimplementedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
new file mode 100644
index 0000000000..8ffcfae95b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnknownError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnknownError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=[\'2\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
new file mode 100644
index 0000000000..0ad1c19603
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
@@ -0,0 +1,151 @@
+path: "tensorflow.errors"
+tf_module {
+  member {
+    name: "ABORTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ALREADY_EXISTS"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AbortedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AlreadyExistsError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "CANCELLED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CancelledError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DATA_LOSS"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEADLINE_EXCEEDED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DataLossError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DeadlineExceededError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FAILED_PRECONDITION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FailedPreconditionError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "INTERNAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INVALID_ARGUMENT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "InternalError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "InvalidArgumentError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NOT_FOUND"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NotFoundError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OK"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OUT_OF_RANGE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OpError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OutOfRangeError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "PERMISSION_DENIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PermissionDeniedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RESOURCE_EXHAUSTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ResourceExhaustedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UNAUTHENTICATED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNAVAILABLE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNIMPLEMENTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNKNOWN"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UnauthenticatedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnavailableError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnimplementedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnknownError"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "error_code_from_exception_type"
+    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "exception_type_from_error_code"
+    argspec: "args=[\'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "raise_exception_on_not_ok_status"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
new file mode 100644
index 0000000000..5dbfe21726
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.estimator.EstimatorSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "eval_metric_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "export_outputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "loss"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "predictions"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "scaffold"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "train_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "training_chief_hooks"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "training_hooks"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
new file mode 100644
index 0000000000..7a769fd546
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.estimator.Estimator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.estimator.Estimator\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "config"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "model_dir"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "params"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'model_fn\', \'model_dir\', \'config\', \'params\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "evaluate"
+    argspec: "args=[\'self\', \'input_fn\', \'steps\', \'hooks\', \'checkpoint_path\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "export_savedmodel"
+    argspec: "args=[\'self\', \'export_dir_base\', \'serving_input_receiver_fn\', \'assets_extra\', \'as_text\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "predict"
+    argspec: "args=[\'self\', \'input_fn\', \'predict_keys\', \'hooks\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "train"
+    argspec: "args=[\'self\', \'input_fn\', \'hooks\', \'steps\', \'max_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
new file mode 100644
index 0000000000..6a1c24fa63
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
@@ -0,0 +1,20 @@
+path: "tensorflow.estimator.ModeKeys"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.ModeKeys\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "EVAL"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAIN"
+    mtype: "<type \'str\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
new file mode 100644
index 0000000000..8fd991a317
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
@@ -0,0 +1,68 @@
+path: "tensorflow.estimator.RunConfig"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.run_config.RunConfig\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cluster_spec"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "evaluation_master"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_chief"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "keep_checkpoint_every_n_hours"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "keep_checkpoint_max"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "master"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "num_ps_replicas"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "num_worker_replicas"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_checkpoints_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_checkpoints_steps"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_summary_steps"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session_config"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task_id"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task_type"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "tf_random_seed"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..3cf7af8da9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.ClassificationOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
new file mode 100644
index 0000000000..2df1840c4a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
@@ -0,0 +1,22 @@
+path: "tensorflow.estimator.export.ClassificationOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ClassificationOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "classes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "scores"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scores\', \'classes\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..5d165ccbf9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.ExportOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
new file mode 100644
index 0000000000..fa62e8ced8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
@@ -0,0 +1,12 @@
+path: "tensorflow.estimator.export.ExportOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..743495ba98
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.PredictOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
new file mode 100644
index 0000000000..e0160b10ce
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
@@ -0,0 +1,18 @@
+path: "tensorflow.estimator.export.PredictOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.PredictOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "outputs"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'outputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..dbf4e3dec8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.RegressionOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
new file mode 100644
index 0000000000..905f0e0553
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
@@ -0,0 +1,18 @@
+path: "tensorflow.estimator.export.RegressionOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.RegressionOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "value"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
new file mode 100644
index 0000000000..0d9e044308
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.estimator.export.ServingInputReceiver"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "features"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "receiver_tensors"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
new file mode 100644
index 0000000000..4d0dddb3bc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
@@ -0,0 +1,31 @@
+path: "tensorflow.estimator.export"
+tf_module {
+  member {
+    name: "ClassificationOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "ExportOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "PredictOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "RegressionOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "ServingInputReceiver"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "build_parsing_serving_input_receiver_fn"
+    argspec: "args=[\'feature_spec\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "build_raw_serving_input_receiver_fn"
+    argspec: "args=[\'features\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
new file mode 100644
index 0000000000..b318fea1f8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.estimator.inputs"
+tf_module {
+  member_method {
+    name: "numpy_input_fn"
+    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\'], "
+  }
+  member_method {
+    name: "pandas_input_fn"
+    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\', \'target_column\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\', \'target\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
new file mode 100644
index 0000000000..0d5dc73271
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.estimator"
+tf_module {
+  member {
+    name: "Estimator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "EstimatorSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ModeKeys"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RunConfig"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "export"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "inputs"
+    mtype: "<type \'module\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
new file mode 100644
index 0000000000..41497dc869
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.FastGFile"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.FastGFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
new file mode 100644
index 0000000000..bab0f279b2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.GFile"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
new file mode 100644
index 0000000000..86e577c19a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.Open"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
new file mode 100644
index 0000000000..65b55a8b7c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
@@ -0,0 +1,63 @@
+path: "tensorflow.gfile"
+tf_module {
+  member {
+    name: "FastGFile"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GFile"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Open"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "Copy"
+    argspec: "args=[\'oldpath\', \'newpath\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "DeleteRecursively"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Exists"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Glob"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "IsDirectory"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "ListDirectory"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "MakeDirs"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "MkDir"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Remove"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Rename"
+    argspec: "args=[\'oldname\', \'newname\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "Stat"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Walk"
+    argspec: "args=[\'top\', \'in_order\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt b/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
new file mode 100644
index 0000000000..76a2df757e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.graph_util"
+tf_module {
+  member_method {
+    name: "convert_variables_to_constants"
+    argspec: "args=[\'sess\', \'input_graph_def\', \'output_node_names\', \'variable_names_whitelist\', \'variable_names_blacklist\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "extract_sub_graph"
+    argspec: "args=[\'graph_def\', \'dest_nodes\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "must_run_on_cpu"
+    argspec: "args=[\'node\', \'pin_variables_on_cpu\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "remove_training_nodes"
+    argspec: "args=[\'input_graph\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tensor_shape_from_node_def_name"
+    argspec: "args=[\'graph\', \'input_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
new file mode 100644
index 0000000000..dbc360b13e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.image.ResizeMethod"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.image_ops_impl.ResizeMethod\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "AREA"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BICUBIC"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BILINEAR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NEAREST_NEIGHBOR"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
new file mode 100644
index 0000000000..6002f36bac
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
@@ -0,0 +1,175 @@
+path: "tensorflow.image"
+tf_module {
+  member {
+    name: "ResizeMethod"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "adjust_brightness"
+    argspec: "args=[\'image\', \'delta\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "adjust_contrast"
+    argspec: "args=[\'images\', \'contrast_factor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "adjust_gamma"
+    argspec: "args=[\'image\', \'gamma\', \'gain\'], varargs=None, keywords=None, defaults=[\'1\', \'1\'], "
+  }
+  member_method {
+    name: "adjust_hue"
+    argspec: "args=[\'image\', \'delta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "adjust_saturation"
+    argspec: "args=[\'image\', \'saturation_factor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "central_crop"
+    argspec: "args=[\'image\', \'central_fraction\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "convert_image_dtype"
+    argspec: "args=[\'image\', \'dtype\', \'saturate\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "crop_and_resize"
+    argspec: "args=[\'image\', \'boxes\', \'box_ind\', \'crop_size\', \'method\', \'extrapolation_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "crop_to_bounding_box"
+    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "decode_gif"
+    argspec: "args=[\'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_image"
+    argspec: "args=[\'contents\', \'channels\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_jpeg"
+    argspec: "args=[\'contents\', \'channels\', \'ratio\', \'fancy_upscaling\', \'try_recover_truncated\', \'acceptable_fraction\', \'dct_method\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_png"
+    argspec: "args=[\'contents\', \'channels\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "draw_bounding_boxes"
+    argspec: "args=[\'images\', \'boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "encode_jpeg"
+    argspec: "args=[\'image\', \'format\', \'quality\', \'progressive\', \'optimize_size\', \'chroma_downsampling\', \'density_unit\', \'x_density\', \'y_density\', \'xmp_metadata\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "encode_png"
+    argspec: "args=[\'image\', \'compression\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "extract_glimpse"
+    argspec: "args=[\'input\', \'size\', \'offsets\', \'centered\', \'normalized\', \'uniform_noise\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "flip_left_right"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flip_up_down"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "grayscale_to_rgb"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "hsv_to_rgb"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "non_max_suppression"
+    argspec: "args=[\'boxes\', \'scores\', \'max_output_size\', \'iou_threshold\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "pad_to_bounding_box"
+    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "per_image_standardization"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "random_brightness"
+    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_contrast"
+    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_flip_left_right"
+    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_flip_up_down"
+    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_hue"
+    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_saturation"
+    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "resize_area"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_bicubic"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_bilinear"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_image_with_crop_or_pad"
+    argspec: "args=[\'image\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "resize_images"
+    argspec: "args=[\'images\', \'size\', \'method\', \'align_corners\'], varargs=None, keywords=None, defaults=[\'0\', \'False\'], "
+  }
+  member_method {
+    name: "resize_nearest_neighbor"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rgb_to_grayscale"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rgb_to_hsv"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rot90"
+    argspec: "args=[\'image\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\'], "
+  }
+  member_method {
+    name: "sample_distorted_bounding_box"
+    argspec: "args=[\'image_size\', \'bounding_boxes\', \'seed\', \'seed2\', \'min_object_covered\', \'aspect_ratio_range\', \'area_range\', \'max_attempts\', \'use_image_if_no_bounding_boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "total_variation"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "transpose_image"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
new file mode 100644
index 0000000000..6ca38e259b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
@@ -0,0 +1,59 @@
+path: "tensorflow.layers"
+tf_module {
+  member_method {
+    name: "average_pooling1d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "average_pooling2d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "average_pooling3d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "batch_normalization"
+    argspec: "args=[\'inputs\', \'axis\', \'momentum\', \'epsilon\', \'center\', \'scale\', \'beta_initializer\', \'gamma_initializer\', \'moving_mean_initializer\', \'moving_variance_initializer\', \'beta_regularizer\', \'gamma_regularizer\', \'training\', \'trainable\', \'name\', \'reuse\', \'renorm\', \'renorm_clipping\', \'renorm_momentum\'], varargs=None, keywords=None, defaults=[\'-1\', \'0.99\', \'0.001\', \'True\', \'True\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'None\', \'None\', \'False\', \'True\', \'None\', \'None\', \'False\', \'None\', \'0.99\'], "
+  }
+  member_method {
+    name: "conv1d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'1\', \'valid\', \'channels_last\', \'1\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_transpose"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1, 1)\', \'valid\', \'channels_last\', \'(1, 1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dense"
+    argspec: "args=[\'inputs\', \'units\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dropout"
+    argspec: "args=[\'inputs\', \'rate\', \'noise_shape\', \'seed\', \'training\', \'name\'], varargs=None, keywords=None, defaults=[\'0.5\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling1d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling2d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling3d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "separable_conv2d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'depth_multiplier\', \'activation\', \'use_bias\', \'depthwise_initializer\', \'pointwise_initializer\', \'bias_initializer\', \'depthwise_regularizer\', \'pointwise_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'1\', \'None\', \'True\', \'None\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.logging.pbtxt b/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
new file mode 100644
index 0000000000..85bb15455d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
@@ -0,0 +1,83 @@
+path: "tensorflow.logging"
+tf_module {
+  member {
+    name: "DEBUG"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ERROR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FATAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INFO"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WARN"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "TaskLevelStatusMessage"
+    argspec: "args=[\'msg\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "debug"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "error"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "fatal"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_verbosity"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "info"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "log"
+    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "log_every_n"
+    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log_first_n"
+    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log_if"
+    argspec: "args=[\'level\', \'msg\', \'condition\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_verbosity"
+    argspec: "args=[\'v\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "vlog"
+    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "warn"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "warning"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
new file mode 100644
index 0000000000..5477ac5817
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
@@ -0,0 +1,63 @@
+path: "tensorflow.losses"
+tf_module {
+  member_method {
+    name: "absolute_difference"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "add_loss"
+    argspec: "args=[\'loss\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'losses\'], "
+  }
+  member_method {
+    name: "compute_weighted_loss"
+    argspec: "args=[\'losses\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "cosine_distance"
+    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "get_losses"
+    argspec: "args=[\'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'losses\'], "
+  }
+  member_method {
+    name: "get_regularization_loss"
+    argspec: "args=[\'scope\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'total_regularization_loss\'], "
+  }
+  member_method {
+    name: "get_regularization_losses"
+    argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_total_loss"
+    argspec: "args=[\'add_regularization_losses\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'total_loss\'], "
+  }
+  member_method {
+    name: "hinge_loss"
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "log_loss"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'epsilon\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1e-07\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "mean_pairwise_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "sigmoid_cross_entropy"
+    argspec: "args=[\'multi_class_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "softmax_cross_entropy"
+    argspec: "args=[\'onehot_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "sparse_softmax_cross_entropy"
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt b/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
new file mode 100644
index 0000000000..262d11c38e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
@@ -0,0 +1,99 @@
+path: "tensorflow.metrics"
+tf_module {
+  member_method {
+    name: "accuracy"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "auc"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'curve\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'ROC\', \'None\'], "
+  }
+  member_method {
+    name: "false_negatives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "false_positives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean"
+    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_absolute_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_cosine_distance"
+    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_iou"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_per_class_accuracy"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_relative_error"
+    argspec: "args=[\'labels\', \'predictions\', \'normalizer\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_tensor"
+    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "percentage_below"
+    argspec: "args=[\'values\', \'threshold\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "precision"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "precision_at_thresholds"
+    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall_at_thresholds"
+    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "root_mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sensitivity_at_specificity"
+    argspec: "args=[\'labels\', \'predictions\', \'specificity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_average_precision_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_precision_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "specificity_at_sensitivity"
+    argspec: "args=[\'labels\', \'predictions\', \'sensitivity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "true_positives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
new file mode 100644
index 0000000000..192ceac2dd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
@@ -0,0 +1,323 @@
+path: "tensorflow.nn"
+tf_module {
+  member_method {
+    name: "all_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "atrous_conv2d"
+    argspec: "args=[\'value\', \'filters\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "atrous_conv2d_transpose"
+    argspec: "args=[\'value\', \'filters\', \'output_shape\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "avg_pool"
+    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "avg_pool3d"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "batch_norm_with_global_normalization"
+    argspec: "args=[\'t\', \'m\', \'v\', \'beta\', \'gamma\', \'variance_epsilon\', \'scale_after_normalization\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_normalization"
+    argspec: "args=[\'x\', \'mean\', \'variance\', \'offset\', \'scale\', \'variance_epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "bias_add"
+    argspec: "args=[\'value\', \'bias\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "bidirectional_dynamic_rnn"
+    argspec: "args=[\'cell_fw\', \'cell_bw\', \'inputs\', \'sequence_length\', \'initial_state_fw\', \'initial_state_bw\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "compute_accidental_hits"
+    argspec: "args=[\'true_classes\', \'sampled_candidates\', \'num_true\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv1d"
+    argspec: "args=[\'value\', \'filters\', \'stride\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_backprop_filter"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_backprop_input"
+    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_transpose"
+    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d_backprop_filter_v2"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d_transpose"
+    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "convolution"
+    argspec: "args=[\'input\', \'filter\', \'padding\', \'strides\', \'dilation_rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "crelu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ctc_beam_search_decoder"
+    argspec: "args=[\'inputs\', \'sequence_length\', \'beam_width\', \'top_paths\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'100\', \'1\', \'True\'], "
+  }
+  member_method {
+    name: "ctc_greedy_decoder"
+    argspec: "args=[\'inputs\', \'sequence_length\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "ctc_loss"
+    argspec: "args=[\'labels\', \'inputs\', \'sequence_length\', \'preprocess_collapse_repeated\', \'ctc_merge_repeated\', \'time_major\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native_backprop_filter"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native_backprop_input"
+    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "dilation2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dropout"
+    argspec: "args=[\'x\', \'keep_prob\', \'noise_shape\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dynamic_rnn"
+    argspec: "args=[\'cell\', \'inputs\', \'sequence_length\', \'initial_state\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "elu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "embedding_lookup"
+    argspec: "args=[\'params\', \'ids\', \'partition_strategy\', \'name\', \'validate_indices\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "embedding_lookup_sparse"
+    argspec: "args=[\'params\', \'sp_ids\', \'sp_weights\', \'partition_strategy\', \'name\', \'combiner\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "erosion2d"
+    argspec: "args=[\'value\', \'kernel\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fixed_unigram_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'vocab_file\', \'distortion\', \'num_reserved_ids\', \'num_shards\', \'shard\', \'unigrams\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'\', \'1.0\', \'0\', \'1\', \'0\', \'()\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fractional_avg_pool"
+    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fractional_max_pool"
+    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fused_batch_norm"
+    argspec: "args=[\'x\', \'scale\', \'offset\', \'mean\', \'variance\', \'epsilon\', \'data_format\', \'is_training\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'0.001\', \'NHWC\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "in_top_k"
+    argspec: "args=[\'predictions\', \'targets\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "l2_loss"
+    argspec: "args=[\'t\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "l2_normalize"
+    argspec: "args=[\'x\', \'dim\', \'epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'1e-12\', \'None\'], "
+  }
+  member_method {
+    name: "learned_unigram_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "local_response_normalization"
+    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "log_poisson_loss"
+    argspec: "args=[\'targets\', \'log_input\', \'compute_full_loss\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "log_softmax"
+    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
+  }
+  member_method {
+    name: "log_uniform_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "lrn"
+    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool"
+    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool3d"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool_with_argmax"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'Targmax\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "moments"
+    argspec: "args=[\'x\', \'axes\', \'shift\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "nce_loss"
+    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'mod\', \'nce_loss\'], "
+  }
+  member_method {
+    name: "normalize_moments"
+    argspec: "args=[\'counts\', \'mean_ss\', \'variance_ss\', \'shift\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "pool"
+    argspec: "args=[\'input\', \'window_shape\', \'pooling_type\', \'padding\', \'dilation_rate\', \'strides\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_avg_pool"
+    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "quantized_conv2d"
+    argspec: "args=[\'input\', \'filter\', \'min_input\', \'max_input\', \'min_filter\', \'max_filter\', \'strides\', \'padding\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_max_pool"
+    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "quantized_relu_x"
+    argspec: "args=[\'features\', \'max_value\', \'min_features\', \'max_features\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "raw_rnn"
+    argspec: "args=[\'cell\', \'loop_fn\', \'parallel_iterations\', \'swap_memory\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "relu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "relu6"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "relu_layer"
+    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sampled_softmax_loss"
+    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'True\', \'mod\', \'sampled_softmax_loss\'], "
+  }
+  member_method {
+    name: "separable_conv2d"
+    argspec: "args=[\'input\', \'depthwise_filter\', \'pointwise_filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sigmoid_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "softmax"
+    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
+  }
+  member_method {
+    name: "softmax_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'-1\', \'None\'], "
+  }
+  member_method {
+    name: "softplus"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "softsign"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_softmax_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sufficient_statistics"
+    argspec: "args=[\'x\', \'axes\', \'shift\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "tanh"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "top_k"
+    argspec: "args=[\'input\', \'k\', \'sorted\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "uniform_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "weighted_cross_entropy_with_logits"
+    argspec: "args=[\'targets\', \'logits\', \'pos_weight\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "weighted_moments"
+    argspec: "args=[\'x\', \'axes\', \'frequency_weights\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "with_space_to_batch"
+    argspec: "args=[\'input\', \'dilation_rate\', \'padding\', \'op\', \'filter_shape\', \'spatial_dims\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "xw_plus_b"
+    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "zero_fraction"
+    argspec: "args=[\'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
new file mode 100644
index 0000000000..d84ddc6eb0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.ones_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Ones\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
new file mode 100644
index 0000000000..c8e266e70c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.orthogonal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Orthogonal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'gain\', \'dtype\', \'seed\'], varargs=None, keywords=None, defaults=[\'1.0\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
new file mode 100644
index 0000000000..7a1a7e7949
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -0,0 +1,1947 @@
+path: "tensorflow"
+tf_module {
+  member {
+    name: "AggregationMethod"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AttrValue"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "AutoParallelOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "COMPILER_VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ConditionalAccumulator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ConditionalAccumulatorBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ConfigProto"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DType"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DeviceSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Dimension"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Event"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FIFOQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLenFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLenSequenceFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLengthRecordReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GIT_VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GPUOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION_MIN_CONSUMER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION_MIN_PRODUCER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Graph"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GraphDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "GraphKeys"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GraphOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "HistogramProto"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "IdentityReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "IndexedSlices"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "InteractiveSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "LogMessage"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "NameAttrList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "NodeDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "OpError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Operation"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OptimizerOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "PaddingFIFOQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "PriorityQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "QUANTIZED_DTYPES"
+    mtype: "<type \'frozenset\'>"
+  }
+  member {
+    name: "QueueBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RandomShuffleQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ReaderBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RegisterGradient"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RewriterConfig"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "RunMetadata"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "RunOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Session"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionLog"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SparseConditionalAccumulator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseTensor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseTensorValue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Summary"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TFRecordReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Tensor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TensorArray"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TensorInfo"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TensorShape"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TextLineReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VarLenFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Variable"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "VariableScope"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "WholeFileReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "app"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "bfloat16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "bool"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "compat"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "complex128"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "complex64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "constant_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "contrib"
+    mtype: "<class \'_LazyContribLoader\'>"
+  }
+  member {
+    name: "double"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "errors"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "estimator"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "flags"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "float16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "float32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "float64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "gfile"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "graph_util"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "half"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "image"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "int16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "layers"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "logging"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "losses"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "metrics"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "newaxis"
+    mtype: "<type \'NoneType\'>"
+  }
+  member {
+    name: "nn"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "ones_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "orthogonal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "python_io"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "pywrap_tensorflow"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "qint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "qint32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "qint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "quint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "quint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "random_normal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "random_uniform_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "resource"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "resource_loader"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "saved_model"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sdca"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sets"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "spectral"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "string"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "summary"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sysconfig"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "test"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "train"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "truncated_normal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "uint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "uint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "uniform_unit_scaling_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "user_ops"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "zeros_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "Assert"
+    argspec: "args=[\'condition\', \'data\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "NoGradient"
+    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "NotDifferentiable"
+    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Print"
+    argspec: "args=[\'input_\', \'data\', \'message\', \'first_n\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "abs"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "accumulate_n"
+    argspec: "args=[\'inputs\', \'shape\', \'tensor_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "acos"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_check_numerics_ops"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_n"
+    argspec: "args=[\'inputs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_to_collection"
+    argspec: "args=[\'name\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "all_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "arg_max"
+    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "arg_min"
+    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "argmax"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "argmin"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_dtype"
+    argspec: "args=[\'type_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_string"
+    argspec: "args=[\'input\', \'precision\', \'scientific\', \'shortest\', \'width\', \'fill\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "asin"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assert_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_greater"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_greater_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_integer"
+    argspec: "args=[\'x\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_less"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_less_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_negative"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_non_negative"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_non_positive"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_none_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_positive"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_proper_iterable"
+    argspec: "args=[\'values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_rank"
+    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_rank_at_least"
+    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_same_float_dtype"
+    argspec: "args=[\'tensors\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_scalar"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assert_type"
+    argspec: "args=[\'tensor\', \'tf_type\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_variables_initialized"
+    argspec: "args=[\'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assign"
+    argspec: "args=[\'ref\', \'value\', \'validate_shape\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign_add"
+    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign_sub"
+    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "atan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_to_space"
+    argspec: "args=[\'input\', \'crops\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_to_space_nd"
+    argspec: "args=[\'input\', \'block_shape\', \'crops\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "betainc"
+    argspec: "args=[\'a\', \'b\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "bincount"
+    argspec: "args=[\'arr\', \'minlength\', \'maxlength\', \'weights\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "bitcast"
+    argspec: "args=[\'input\', \'type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "boolean_mask"
+    argspec: "args=[\'tensor\', \'mask\', \'name\'], varargs=None, keywords=None, defaults=[\'boolean_mask\'], "
+  }
+  member_method {
+    name: "broadcast_dynamic_shape"
+    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "broadcast_static_shape"
+    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "case"
+    argspec: "args=[\'pred_fn_pairs\', \'default\', \'exclusive\', \'strict\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'case\'], "
+  }
+  member_method {
+    name: "cast"
+    argspec: "args=[\'x\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ceil"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "check_numerics"
+    argspec: "args=[\'tensor\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cholesky"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cholesky_solve"
+    argspec: "args=[\'chol\', \'rhs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clip_by_average_norm"
+    argspec: "args=[\'t\', \'clip_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clip_by_global_norm"
+    argspec: "args=[\'t_list\', \'clip_norm\', \'use_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "clip_by_norm"
+    argspec: "args=[\'t\', \'clip_norm\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "clip_by_value"
+    argspec: "args=[\'t\', \'clip_value_min\', \'clip_value_max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "complex"
+    argspec: "args=[\'real\', \'imag\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "concat"
+    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'concat\'], "
+  }
+  member_method {
+    name: "cond"
+    argspec: "args=[\'pred\', \'fn1\', \'fn2\', \'strict\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "confusion_matrix"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'dtype\', \'name\', \'weights\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conj"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "constant"
+    argspec: "args=[\'value\', \'dtype\', \'shape\', \'name\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'Const\', \'False\'], "
+  }
+  member_method {
+    name: "container"
+    argspec: "args=[\'container_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "control_dependencies"
+    argspec: "args=[\'control_inputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "convert_to_tensor"
+    argspec: "args=[\'value\', \'dtype\', \'name\', \'preferred_dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "convert_to_tensor_or_indexed_slices"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "convert_to_tensor_or_sparse_tensor"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "cos"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "count_nonzero"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'dtype\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \"<dtype: \'int64\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "count_up_to"
+    argspec: "args=[\'ref\', \'limit\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "create_partitioned_variables"
+    argspec: "args=[\'shape\', \'slicing\', \'initializer\', \'dtype\', \'trainable\', \'collections\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'True\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "cross"
+    argspec: "args=[\'a\', \'b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cumprod"
+    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "cumsum"
+    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "decode_base64"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_csv"
+    argspec: "args=[\'records\', \'record_defaults\', \'field_delim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_json_example"
+    argspec: "args=[\'json_examples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_raw"
+    argspec: "args=[\'bytes\', \'out_type\', \'little_endian\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "delete_session_tensor"
+    argspec: "args=[\'handle\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "depth_to_space"
+    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequantize"
+    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "deserialize_many_sparse"
+    argspec: "args=[\'serialized_sparse\', \'dtype\', \'rank\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "device"
+    argspec: "args=[\'device_name_or_function\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "diag"
+    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "diag_part"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "digamma"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "div"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "divide"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dynamic_partition"
+    argspec: "args=[\'data\', \'partitions\', \'num_partitions\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dynamic_stitch"
+    argspec: "args=[\'indices\', \'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "edit_distance"
+    argspec: "args=[\'hypothesis\', \'truth\', \'normalize\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'edit_distance\'], "
+  }
+  member_method {
+    name: "einsum"
+    argspec: "args=[\'equation\'], varargs=inputs, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "encode_base64"
+    argspec: "args=[\'input\', \'pad\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "erf"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "erfc"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "exp"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "expand_dims"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "expm1"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "extract_image_patches"
+    argspec: "args=[\'images\', \'ksizes\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "eye"
+    argspec: "args=[\'num_rows\', \'num_columns\', \'batch_shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_args"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_args_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_per_channel"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_per_channel_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fill"
+    argspec: "args=[\'dims\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fixed_size_partitioner"
+    argspec: "args=[\'num_shards\', \'axis\'], varargs=None, keywords=None, defaults=[\'0\'], "
+  }
+  member_method {
+    name: "floor"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floor_div"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floordiv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floormod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "foldl"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "foldr"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "gather"
+    argspec: "args=[\'params\', \'indices\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "gather_nd"
+    argspec: "args=[\'params\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'key\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection_ref"
+    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_default_graph"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_default_session"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_local_variable"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_seed"
+    argspec: "args=[\'op_seed\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_session_handle"
+    argspec: "args=[\'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_session_tensor"
+    argspec: "args=[\'handle\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_variable"
+    argspec: "args=[\'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_variable_scope"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "global_norm"
+    argspec: "args=[\'t_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "global_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "global_variables_initializer"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gradients"
+    argspec: "args=[\'ys\', \'xs\', \'grad_ys\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'None\', \'gradients\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "greater"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "greater_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "group"
+    argspec: "args=[], varargs=inputs, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "hessians"
+    argspec: "args=[\'ys\', \'xs\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'hessians\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "histogram_fixed_width"
+    argspec: "args=[\'values\', \'value_range\', \'nbins\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'100\', \"<dtype: \'int32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "identity"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "igamma"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "igammac"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "imag"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "import_graph_def"
+    argspec: "args=[\'graph_def\', \'input_map\', \'return_elements\', \'name\', \'op_dict\', \'producer_op_list\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "initialize_all_tables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_all_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_local_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "invert_permutation"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_finite"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_inf"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_nan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_non_decreasing"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_numeric_tensor"
+    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_strictly_increasing"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_variable_initialized"
+    argspec: "args=[\'variable\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "lbeta"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'lbeta\'], "
+  }
+  member_method {
+    name: "less"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "less_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "lgamma"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "lin_space"
+    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "linspace"
+    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "load_file_system_library"
+    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load_op_library"
+    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "local_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "local_variables_initializer"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "log1p"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_and"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_not"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_or"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_xor"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'LogicalXor\'], "
+  }
+  member_method {
+    name: "make_template"
+    argspec: "args=[\'name_\', \'func_\', \'create_scope_now_\', \'unique_name_\', \'custom_getter_\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "map_fn"
+    argspec: "args=[\'fn\', \'elems\', \'dtype\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "matching_files"
+    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matmul"
+    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'adjoint_a\', \'adjoint_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'False\', \'False\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_band_part"
+    argspec: "args=[\'input\', \'num_lower\', \'num_upper\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_determinant"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_diag"
+    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_diag_part"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_inverse"
+    argspec: "args=[\'input\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_set_diag"
+    argspec: "args=[\'input\', \'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_solve"
+    argspec: "args=[\'matrix\', \'rhs\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_solve_ls"
+    argspec: "args=[\'matrix\', \'rhs\', \'l2_regularizer\', \'fast\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_transpose"
+    argspec: "args=[\'a\', \'name\'], varargs=None, keywords=None, defaults=[\'matrix_transpose\'], "
+  }
+  member_method {
+    name: "matrix_triangular_solve"
+    argspec: "args=[\'matrix\', \'rhs\', \'lower\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maximum"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "meshgrid"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "min_max_variable_partitioner"
+    argspec: "args=[\'max_partitions\', \'axis\', \'min_slice_size\', \'bytes_per_string_element\'], varargs=None, keywords=None, defaults=[\'1\', \'0\', \'262144\', \'16\'], "
+  }
+  member_method {
+    name: "minimum"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "mod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "model_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "moving_average_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "multinomial"
+    argspec: "args=[\'logits\', \'num_samples\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "multiply"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "name_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "negative"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "no_op"
+    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "no_regularizer"
+    argspec: "args=[\'_\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "norm"
+    argspec: "args=[\'tensor\', \'ord\', \'axis\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'euclidean\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "not_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "one_hot"
+    argspec: "args=[\'indices\', \'depth\', \'on_value\', \'off_value\', \'axis\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "ones"
+    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "ones_like"
+    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "op_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "pad"
+    argspec: "args=[\'tensor\', \'paddings\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'CONSTANT\', \'None\'], "
+  }
+  member_method {
+    name: "parallel_stack"
+    argspec: "args=[\'values\', \'name\'], varargs=None, keywords=None, defaults=[\'parallel_stack\'], "
+  }
+  member_method {
+    name: "parse_example"
+    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_single_example"
+    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_single_sequence_example"
+    argspec: "args=[\'serialized\', \'context_features\', \'sequence_features\', \'example_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_tensor"
+    argspec: "args=[\'serialized\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "placeholder"
+    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "placeholder_with_default"
+    argspec: "args=[\'input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "polygamma"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "pow"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "py_func"
+    argspec: "args=[\'func\', \'inp\', \'Tout\', \'stateful\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'None\'], "
+  }
+  member_method {
+    name: "qr"
+    argspec: "args=[\'input\', \'full_matrices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantize_v2"
+    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'T\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_concat"
+    argspec: "args=[\'concat_dim\', \'values\', \'input_mins\', \'input_maxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_crop"
+    argspec: "args=[\'value\', \'size\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_gamma"
+    argspec: "args=[\'shape\', \'alpha\', \'beta\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_normal"
+    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_poisson"
+    argspec: "args=[\'lam\', \'shape\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_shuffle"
+    argspec: "args=[\'value\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_uniform"
+    argspec: "args=[\'shape\', \'minval\', \'maxval\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "range"
+    argspec: "args=[\'start\', \'limit\', \'delta\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'range\'], "
+  }
+  member_method {
+    name: "rank"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_file"
+    argspec: "args=[\'filename\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "real"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "realdiv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reciprocal"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reduce_all"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_any"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_join"
+    argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_logsumexp"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_max"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_mean"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_min"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_prod"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_sum"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "register_tensor_conversion_function"
+    argspec: "args=[\'base_type\', \'conversion_func\', \'priority\'], varargs=None, keywords=None, defaults=[\'100\'], "
+  }
+  member_method {
+    name: "report_uninitialized_variables"
+    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'report_uninitialized_variables\'], "
+  }
+  member_method {
+    name: "required_space_to_batch_paddings"
+    argspec: "args=[\'input_shape\', \'block_shape\', \'base_paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "reset_default_graph"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reshape"
+    argspec: "args=[\'tensor\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reverse"
+    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reverse_sequence"
+    argspec: "args=[\'input\', \'seq_lengths\', \'seq_axis\', \'batch_axis\', \'name\', \'seq_dim\', \'batch_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reverse_v2"
+    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rint"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "round"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rsqrt"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "saturate_cast"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scalar_mul"
+    argspec: "args=[\'scalar\', \'x\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "scan"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_add"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_div"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_mul"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd"
+    argspec: "args=[\'indices\', \'updates\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_add"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_sub"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_update"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_sub"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_update"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "segment_max"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_mean"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_min"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_prod"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_sum"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "self_adjoint_eig"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "self_adjoint_eigvals"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sequence_mask"
+    argspec: "args=[\'lengths\', \'maxlen\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'bool\'>\", \'None\'], "
+  }
+  member_method {
+    name: "serialize_many_sparse"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_sparse"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_random_seed"
+    argspec: "args=[\'seed\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setdiff1d"
+    argspec: "args=[\'x\', \'y\', \'index_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'int32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "shape"
+    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "shape_n"
+    argspec: "args=[\'input\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sign"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sin"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "slice"
+    argspec: "args=[\'input_\', \'begin\', \'size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_batch"
+    argspec: "args=[\'input\', \'paddings\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_batch_nd"
+    argspec: "args=[\'input\', \'block_shape\', \'paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_depth"
+    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_add"
+    argspec: "args=[\'a\', \'b\', \'thresh\'], varargs=None, keywords=None, defaults=[\'0\'], "
+  }
+  member_method {
+    name: "sparse_concat"
+    argspec: "args=[\'axis\', \'sp_inputs\', \'name\', \'expand_nonconcat_dim\', \'concat_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_fill_empty_rows"
+    argspec: "args=[\'sp_input\', \'default_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_mask"
+    argspec: "args=[\'a\', \'mask_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_matmul"
+    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_maximum"
+    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_merge"
+    argspec: "args=[\'sp_ids\', \'sp_values\', \'vocab_size\', \'name\', \'already_sorted\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "sparse_minimum"
+    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_placeholder"
+    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reduce_sum"
+    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reduce_sum_sparse"
+    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reorder"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_reset_shape"
+    argspec: "args=[\'sp_input\', \'new_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_reshape"
+    argspec: "args=[\'sp_input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_retain"
+    argspec: "args=[\'sp_input\', \'to_retain\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "sparse_segment_mean"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_segment_sqrt_n"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_segment_sum"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_softmax"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_split"
+    argspec: "args=[\'keyword_required\', \'sp_input\', \'num_split\', \'axis\', \'name\', \'split_dim\'], varargs=None, keywords=None, defaults=[\'KeywordRequired()\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_tensor_dense_matmul"
+    argspec: "args=[\'sp_a\', \'b\', \'adjoint_a\', \'adjoint_b\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_tensor_to_dense"
+    argspec: "args=[\'sp_input\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_to_dense"
+    argspec: "args=[\'sparse_indices\', \'output_shape\', \'sparse_values\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_to_indicator"
+    argspec: "args=[\'sp_input\', \'vocab_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_transpose"
+    argspec: "args=[\'sp_input\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "split"
+    argspec: "args=[\'value\', \'num_or_size_splits\', \'axis\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'split\'], "
+  }
+  member_method {
+    name: "sqrt"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "square"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "squared_difference"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "squeeze"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'squeeze_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "stack"
+    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'stack\'], "
+  }
+  member_method {
+    name: "stop_gradient"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "strided_slice"
+    argspec: "args=[\'input_\', \'begin\', \'end\', \'strides\', \'begin_mask\', \'end_mask\', \'ellipsis_mask\', \'new_axis_mask\', \'shrink_axis_mask\', \'var\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'0\', \'0\', \'0\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "string_join"
+    argspec: "args=[\'inputs\', \'separator\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "string_split"
+    argspec: "args=[\'source\', \'delimiter\'], varargs=None, keywords=None, defaults=[\' \'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket"
+    argspec: "args=[\'string_tensor\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket_fast"
+    argspec: "args=[\'input\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket_strong"
+    argspec: "args=[\'input\', \'num_buckets\', \'key\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_number"
+    argspec: "args=[\'string_tensor\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "substr"
+    argspec: "args=[\'input\', \'pos\', \'len\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "subtract"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "svd"
+    argspec: "args=[\'tensor\', \'full_matrices\', \'compute_uv\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "tables_initializer"
+    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'init_all_tables\'], "
+  }
+  member_method {
+    name: "tan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tanh"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tensordot"
+    argspec: "args=[\'a\', \'b\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tile"
+    argspec: "args=[\'input\', \'multiples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_bfloat16"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToBFloat16\'], "
+  }
+  member_method {
+    name: "to_double"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToDouble\'], "
+  }
+  member_method {
+    name: "to_float"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToFloat\'], "
+  }
+  member_method {
+    name: "to_int32"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt32\'], "
+  }
+  member_method {
+    name: "to_int64"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt64\'], "
+  }
+  member_method {
+    name: "trace"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "trainable_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "transpose"
+    argspec: "args=[\'a\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'transpose\'], "
+  }
+  member_method {
+    name: "truediv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "truncated_normal"
+    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "truncatediv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "truncatemod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tuple"
+    argspec: "args=[\'tensors\', \'name\', \'control_inputs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unique"
+    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unique_with_counts"
+    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unsorted_segment_max"
+    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unsorted_segment_sum"
+    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unstack"
+    argspec: "args=[\'value\', \'num\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'unstack\'], "
+  }
+  member_method {
+    name: "variable_axis_size_partitioner"
+    argspec: "args=[\'max_shard_bytes\', \'axis\', \'bytes_per_string_element\', \'max_shards\'], varargs=None, keywords=None, defaults=[\'0\', \'16\', \'None\'], "
+  }
+  member_method {
+    name: "variable_op_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "variable_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "variables_initializer"
+    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], "
+  }
+  member_method {
+    name: "verify_tensor_all_finite"
+    argspec: "args=[\'t\', \'msg\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "where"
+    argspec: "args=[\'condition\', \'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "while_loop"
+    argspec: "args=[\'cond\', \'body\', \'loop_vars\', \'shape_invariants\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "write_file"
+    argspec: "args=[\'filename\', \'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "zeros"
+    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "zeros_like"
+    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "zeta"
+    argspec: "args=[\'x\', \'q\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
new file mode 100644
index 0000000000..4941dda50e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
@@ -0,0 +1,20 @@
+path: "tensorflow.python_io.TFRecordCompressionType"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordCompressionType\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GZIP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ZLIB"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
new file mode 100644
index 0000000000..0853716023
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.python_io.TFRecordOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordOptions\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "compression_type_map"
+    mtype: "<type \'dict\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'compression_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_compression_type_string"
+    argspec: "args=[\'cls\', \'options\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
new file mode 100644
index 0000000000..af0c11ca14
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.python_io.TFRecordWriter"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordWriter\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'record\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
new file mode 100644
index 0000000000..7c9953e5fe
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.python_io"
+tf_module {
+  member {
+    name: "TFRecordCompressionType"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TFRecordOptions"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TFRecordWriter"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "tf_record_iterator"
+    argspec: "args=[\'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
new file mode 100644
index 0000000000..70308bc601
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.random_normal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomNormal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
new file mode 100644
index 0000000000..37bb1956e8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.random_uniform_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomUniform\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'minval\', \'maxval\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
new file mode 100644
index 0000000000..288b78b4cd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.resource_loader"
+tf_module {
+  member_method {
+    name: "get_data_files_path"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_path_to_datafile"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_root_dir_with_all_resources"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load_resource"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readahead_file_path"
+    argspec: "args=[\'path\', \'readahead\'], varargs=None, keywords=None, defaults=[\'128M\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
new file mode 100644
index 0000000000..56d76902fd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.saved_model.builder.SavedModelBuilder"
+tf_class {
+  is_instance: "<class \'tensorflow.python.saved_model.builder_impl.SavedModelBuilder\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'export_dir\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_meta_graph"
+    argspec: "args=[\'self\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "add_meta_graph_and_variables"
+    argspec: "args=[\'self\', \'sess\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "save"
+    argspec: "args=[\'self\', \'as_text\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
new file mode 100644
index 0000000000..adc697ad1c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
@@ -0,0 +1,7 @@
+path: "tensorflow.saved_model.builder"
+tf_module {
+  member {
+    name: "SavedModelBuilder"
+    mtype: "<type \'type\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
new file mode 100644
index 0000000000..20e10aa094
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
@@ -0,0 +1,39 @@
+path: "tensorflow.saved_model.constants"
+tf_module {
+  member {
+    name: "ASSETS_DIRECTORY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ASSETS_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LEGACY_INIT_OP_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MAIN_OP_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_FILENAME_PB"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_FILENAME_PBTXT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_SCHEMA_VERSION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VARIABLES_DIRECTORY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VARIABLES_FILENAME"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
new file mode 100644
index 0000000000..896e2160c6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.loader"
+tf_module {
+  member_method {
+    name: "load"
+    argspec: "args=[\'sess\', \'tags\', \'export_dir\'], varargs=None, keywords=saver_kwargs, defaults=None"
+  }
+  member_method {
+    name: "maybe_saved_model_directory"
+    argspec: "args=[\'export_dir\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
new file mode 100644
index 0000000000..176cb788c2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.main_op"
+tf_module {
+  member_method {
+    name: "main_op"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "main_op_with_restore"
+    argspec: "args=[\'restore_op_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
new file mode 100644
index 0000000000..5683766b28
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.saved_model"
+tf_module {
+  member {
+    name: "builder"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "loader"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "main_op"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "signature_constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "signature_def_utils"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "tag_constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "utils"
+    mtype: "<type \'module\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
new file mode 100644
index 0000000000..478d410e06
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.saved_model.signature_constants"
+tf_module {
+  member {
+    name: "CLASSIFY_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_OUTPUT_CLASSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_OUTPUT_SCORES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "DEFAULT_SERVING_SIGNATURE_DEF_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_OUTPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_OUTPUTS"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
new file mode 100644
index 0000000000..e9867d84c3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.saved_model.signature_def_utils"
+tf_module {
+  member_method {
+    name: "build_signature_def"
+    argspec: "args=[\'inputs\', \'outputs\', \'method_name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "classification_signature_def"
+    argspec: "args=[\'examples\', \'classes\', \'scores\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "predict_signature_def"
+    argspec: "args=[\'inputs\', \'outputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "regression_signature_def"
+    argspec: "args=[\'examples\', \'predictions\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
new file mode 100644
index 0000000000..7c24b7ad3c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.tag_constants"
+tf_module {
+  member {
+    name: "SERVING"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINING"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
new file mode 100644
index 0000000000..bc150e56a3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
@@ -0,0 +1,7 @@
+path: "tensorflow.saved_model.utils"
+tf_module {
+  member_method {
+    name: "build_tensor_info"
+    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
new file mode 100644
index 0000000000..7c9e6a25c7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
@@ -0,0 +1,3 @@
+path: "tensorflow.sdca"
+tf_module {
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sets.pbtxt b/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
new file mode 100644
index 0000000000..8a196b1a55
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.sets"
+tf_module {
+  member_method {
+    name: "set_difference"
+    argspec: "args=[\'a\', \'b\', \'aminusb\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
+  }
+  member_method {
+    name: "set_intersection"
+    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "set_size"
+    argspec: "args=[\'a\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "set_union"
+    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt b/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
new file mode 100644
index 0000000000..84883c1a39
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
@@ -0,0 +1,51 @@
+path: "tensorflow.spectral"
+tf_module {
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "irfft"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "irfft2d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "irfft3d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft2d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft3d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
new file mode 100644
index 0000000000..ab3449d80f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.summary.Event"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
new file mode 100644
index 0000000000..2a5b63dcea
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
@@ -0,0 +1,16 @@
+path: "tensorflow.summary.FileWriterCache"
+tf_class {
+  is_instance: "<class \'tensorflow.python.summary.writer.writer_cache.FileWriterCache\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "clear"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get"
+    argspec: "args=[\'logdir\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
new file mode 100644
index 0000000000..502c35ee7b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
@@ -0,0 +1,50 @@
+path: "tensorflow.summary.FileWriter"
+tf_class {
+  is_instance: "<class \'tensorflow.python.summary.writer.writer.FileWriter\'>"
+  is_instance: "<class \'tensorflow.python.summary.writer.writer.SummaryToEventTransformer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'logdir\', \'graph\', \'max_queue\', \'flush_secs\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'120\', \'None\'], "
+  }
+  member_method {
+    name: "add_event"
+    argspec: "args=[\'self\', \'event\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_graph"
+    argspec: "args=[\'self\', \'graph\', \'global_step\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "add_meta_graph"
+    argspec: "args=[\'self\', \'meta_graph_def\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_run_metadata"
+    argspec: "args=[\'self\', \'run_metadata\', \'tag\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_session_log"
+    argspec: "args=[\'self\', \'session_log\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_summary"
+    argspec: "args=[\'self\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_logdir"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reopen"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
new file mode 100644
index 0000000000..92ca4872ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.summary.SessionLog"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CHECKPOINT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "START"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_UNSPECIFIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STOP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SessionStatus"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
new file mode 100644
index 0000000000..f93da2196a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.summary.SummaryDescription"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.SummaryDescription\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "TYPE_HINT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
new file mode 100644
index 0000000000..605e305e82
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.summary.Summary.Audio"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
new file mode 100644
index 0000000000..0646972196
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.summary.Summary.Image"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
new file mode 100644
index 0000000000..5294b37f57
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.summary.Summary.Value"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
new file mode 100644
index 0000000000..132ef1b7d2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.summary.Summary"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "Audio"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "Image"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
new file mode 100644
index 0000000000..4dce20819d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.summary.TaggedRunMetadata"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.TaggedRunMetadata\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
new file mode 100644
index 0000000000..c3d0bea10c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
@@ -0,0 +1,67 @@
+path: "tensorflow.summary"
+tf_module {
+  member {
+    name: "Event"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FileWriter"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FileWriterCache"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionLog"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Summary"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SummaryDescription"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TaggedRunMetadata"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "audio"
+    argspec: "args=[\'name\', \'tensor\', \'sample_rate\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
+  }
+  member_method {
+    name: "get_summary_description"
+    argspec: "args=[\'node_def\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "histogram"
+    argspec: "args=[\'name\', \'values\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "image"
+    argspec: "args=[\'name\', \'tensor\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
+  }
+  member_method {
+    name: "merge"
+    argspec: "args=[\'inputs\', \'collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "merge_all"
+    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=[\'summaries\'], "
+  }
+  member_method {
+    name: "scalar"
+    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tensor_summary"
+    argspec: "args=[\'name\', \'tensor\', \'summary_description\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "text"
+    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
new file mode 100644
index 0000000000..02dec04b9c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.sysconfig"
+tf_module {
+  member_method {
+    name: "get_include"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_lib"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
new file mode 100644
index 0000000000..df528e26b6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.test.Benchmark"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.benchmark.TensorFlowBenchmark\'>"
+  is_instance: "<class \'tensorflow.python.platform.benchmark.Benchmark\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "is_abstract"
+    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "report_benchmark"
+    argspec: "args=[\'self\', \'iters\', \'cpu_time\', \'wall_time\', \'throughput\', \'extras\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "run_op_benchmark"
+    argspec: "args=[\'self\', \'sess\', \'op_or_tensor\', \'feed_dict\', \'burn_iters\', \'min_iters\', \'store_trace\', \'store_memory_usage\', \'name\', \'extras\', \'mbs\'], varargs=None, keywords=None, defaults=[\'None\', \'2\', \'10\', \'False\', \'True\', \'None\', \'None\', \'0\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
new file mode 100644
index 0000000000..c4768a68bf
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
@@ -0,0 +1,51 @@
+path: "tensorflow.test"
+tf_module {
+  member {
+    name: "Benchmark"
+    mtype: "<class \'tensorflow.python.platform.benchmark._BenchmarkRegistrar\'>"
+  }
+  member {
+    name: "TestCase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "mock"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "assert_equal_graph_def"
+    argspec: "args=[\'actual\', \'expected\', \'checkpoint_v2\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "compute_gradient"
+    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradient_error"
+    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_temp_dir"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gpu_device_name"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_built_with_cuda"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_gpu_available"
+    argspec: "args=[\'cuda_only\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "main"
+    argspec: "args=[\'argv\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "test_src_dir_path"
+    argspec: "args=[\'relative_path\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
new file mode 100644
index 0000000000..8c91c5b4d9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdadeltaOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adadelta.AdadeltaOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'rho\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.95\', \'1e-08\', \'False\', \'Adadelta\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
new file mode 100644
index 0000000000..05d38d62cc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdagradDAOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adagrad_da.AdagradDAOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'global_step\', \'initial_gradient_squared_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'AdagradDA\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
new file mode 100644
index 0000000000..19ca9f5763
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdagradOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adagrad.AdagradOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'False\', \'Adagrad\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
new file mode 100644
index 0000000000..c8144e2db7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdamOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adam.AdamOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'beta1\', \'beta2\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.9\', \'0.999\', \'1e-08\', \'False\', \'Adam\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
new file mode 100644
index 0000000000..8cf52b817f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.BytesList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.BytesList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
new file mode 100644
index 0000000000..c3037baa8c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.CheckpointSaverHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.CheckpointSaverHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'checkpoint_dir\', \'save_secs\', \'save_steps\', \'saver\', \'checkpoint_basename\', \'scaffold\', \'listeners\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'model.ckpt\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
new file mode 100644
index 0000000000..abbe273be3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.train.ChiefSessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.ChiefSessionCreator\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'checkpoint_filename_with_path\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
new file mode 100644
index 0000000000..feb73bd7d4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.ClusterDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ClusterDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "JOB_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
new file mode 100644
index 0000000000..1658b15a5f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.train.ClusterSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.server_lib.ClusterSpec\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "jobs"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'cluster\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_cluster_def"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_dict"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "job_tasks"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_tasks"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "task_address"
+    argspec: "args=[\'self\', \'job_name\', \'task_index\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "task_indices"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
new file mode 100644
index 0000000000..11277f077e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.train.Coordinator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.coordinator.Coordinator\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "joined"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'clean_stop_exception_types\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clear_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\', \'threads\', \'stop_grace_period_secs\', \'ignore_live_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'120\', \'False\'], "
+  }
+  member_method {
+    name: "raise_requested_exception"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "register_thread"
+    argspec: "args=[\'self\', \'thread\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop_on_exception"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "wait_for_stop"
+    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
new file mode 100644
index 0000000000..f7215a2037
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.Example"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.example_pb2.Example\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
new file mode 100644
index 0000000000..737acbe07c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.train.ExponentialMovingAverage"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.moving_averages.ExponentialMovingAverage\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'decay\', \'num_updates\', \'zero_debias\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'ExponentialMovingAverage\'], "
+  }
+  member_method {
+    name: "apply"
+    argspec: "args=[\'self\', \'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "average"
+    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "average_name"
+    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "variables_to_restore"
+    argspec: "args=[\'self\', \'moving_avg_variables\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
new file mode 100644
index 0000000000..3ad98354d6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.FeatureList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
new file mode 100644
index 0000000000..cd171f4ca3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.FeatureLists.FeatureListEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureListEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
new file mode 100644
index 0000000000..3d95017d58
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.FeatureLists"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureLists\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FeatureListEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
new file mode 100644
index 0000000000..9cca132bba
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.train.Feature"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Feature\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BYTES_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FLOAT_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INT64_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
new file mode 100644
index 0000000000..858aee0341
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.Features.FeatureEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
new file mode 100644
index 0000000000..49cd12153b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.Features"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Features\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FeatureEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
new file mode 100644
index 0000000000..7bec4d032c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.FeedFnHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FeedFnHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'feed_fn\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
new file mode 100644
index 0000000000..31cf9aaeb2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
@@ -0,0 +1,34 @@
+path: "tensorflow.train.FinalOpsHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FinalOpsHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "final_ops_values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'final_ops\', \'final_ops_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
new file mode 100644
index 0000000000..e3f01334b5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.FloatList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FloatList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
new file mode 100644
index 0000000000..0252474a1d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.FtrlOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.ftrl.FtrlOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'learning_rate_power\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'-0.5\', \'0.1\', \'0.0\', \'0.0\', \'False\', \'Ftrl\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
new file mode 100644
index 0000000000..147448618e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.GlobalStepWaiterHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.GlobalStepWaiterHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'wait_until_step\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
new file mode 100644
index 0000000000..bdd4c52568
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.GradientDescentOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.gradient_descent.GradientDescentOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'GradientDescent\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
new file mode 100644
index 0000000000..8917dc122c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.Int64List"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Int64List\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
new file mode 100644
index 0000000000..2d7fcbe545
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.JobDef.TasksEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.TasksEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
new file mode 100644
index 0000000000..fc5b76341d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.train.JobDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.JobDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TASKS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TasksEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
new file mode 100644
index 0000000000..e55c47b356
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.LoggingTensorHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.LoggingTensorHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'tensors\', \'every_n_iter\', \'every_n_secs\', \'formatter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
new file mode 100644
index 0000000000..c61859004e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
@@ -0,0 +1,73 @@
+path: "tensorflow.train.LooperThread"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.coordinator.LooperThread\'>"
+  is_instance: "<class \'threading.Thread\'>"
+  member {
+    name: "daemon"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ident"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "getName"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "isAlive"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "isDaemon"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_alive"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "loop"
+    argspec: "args=[\'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setDaemon"
+    argspec: "args=[\'self\', \'daemonic\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setName"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
new file mode 100644
index 0000000000..7cf5488a15
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.MomentumOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.momentum.MomentumOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'momentum\', \'use_locking\', \'name\', \'use_nesterov\'], varargs=None, keywords=None, defaults=[\'False\', \'Momentum\', \'False\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
new file mode 100644
index 0000000000..3a5cc015b4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
@@ -0,0 +1,26 @@
+path: "tensorflow.train.MonitoredSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.MonitoredSession\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'session_creator\', \'hooks\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'120\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
new file mode 100644
index 0000000000..25fd5e75a7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
@@ -0,0 +1,16 @@
+path: "tensorflow.train.NanLossDuringTrainingError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanLossDuringTrainingError\'>"
+  is_instance: "<type \'exceptions.RuntimeError\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
new file mode 100644
index 0000000000..7d1c89f9b3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.NanTensorHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanTensorHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'loss_tensor\', \'fail_on_nan_loss\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
new file mode 100644
index 0000000000..20b0c4d1b5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.train.Optimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
new file mode 100644
index 0000000000..571d846b6c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.ProximalAdagradOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.proximal_adagrad.ProximalAdagradOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'ProximalAdagrad\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
new file mode 100644
index 0000000000..1feb136e7f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.ProximalGradientDescentOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.proximal_gradient_descent.ProximalGradientDescentOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'0.0\', \'False\', \'ProximalGradientDescent\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
new file mode 100644
index 0000000000..d84d0058ee
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.QueueRunner"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cancel_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "close_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "enqueue_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "exceptions_raised"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_closed_exception_types"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_threads"
+    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
new file mode 100644
index 0000000000..2aa4ae6d2d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.RMSPropOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.rmsprop.RMSPropOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'decay\', \'momentum\', \'epsilon\', \'use_locking\', \'centered\', \'name\'], varargs=None, keywords=None, defaults=[\'0.9\', \'0.0\', \'1e-10\', \'False\', \'False\', \'RMSProp\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
new file mode 100644
index 0000000000..84498a64f5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
@@ -0,0 +1,120 @@
+path: "tensorflow.train.SaverDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.saver_pb2.SaverDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CheckpointFormatVersion"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILENAME_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "KEEP_CHECKPOINT_EVERY_N_HOURS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LEGACY"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MAX_TO_KEEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "RESTORE_OP_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAVE_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHARDED_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "V1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "V2"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
new file mode 100644
index 0000000000..7494fe1cc8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
@@ -0,0 +1,53 @@
+path: "tensorflow.train.Saver"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.saver.Saver\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "last_checkpoints"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'var_list\', \'reshape\', \'sharded\', \'max_to_keep\', \'keep_checkpoint_every_n_hours\', \'name\', \'restore_sequentially\', \'saver_def\', \'builder\', \'defer_build\', \'allow_empty\', \'write_version\', \'pad_step_number\', \'save_relative_paths\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\', \'5\', \'10000.0\', \'None\', \'False\', \'None\', \'None\', \'False\', \'False\', \'2\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "as_saver_def"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "build"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "export_meta_graph"
+    argspec: "args=[\'self\', \'filename\', \'collection_list\', \'as_text\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'saver_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "recover_last_checkpoints"
+    argspec: "args=[\'self\', \'checkpoint_paths\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "restore"
+    argspec: "args=[\'self\', \'sess\', \'save_path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "save"
+    argspec: "args=[\'self\', \'sess\', \'save_path\', \'global_step\', \'latest_filename\', \'meta_graph_suffix\', \'write_meta_graph\', \'write_state\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'meta\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "set_last_checkpoints"
+    argspec: "args=[\'self\', \'last_checkpoints\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_last_checkpoints_with_time"
+    argspec: "args=[\'self\', \'last_checkpoints_with_time\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
new file mode 100644
index 0000000000..21234fe739
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.Scaffold"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.Scaffold\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "init_feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_fn"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_for_local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "saver"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'init_op\', \'init_feed_dict\', \'init_fn\', \'ready_op\', \'ready_for_local_init_op\', \'local_init_op\', \'summary_op\', \'saver\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "finalize"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_or_default"
+    argspec: "args=[\'arg_name\', \'collection_key\', \'default_constructor\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
new file mode 100644
index 0000000000..45528d4e87
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.train.SecondOrStepTimer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SecondOrStepTimer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'every_secs\', \'every_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "last_triggered_step"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "should_trigger_for_step"
+    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "update_last_triggered_step"
+    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
new file mode 100644
index 0000000000..9ab9553702
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.SequenceExample"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.example_pb2.SequenceExample\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTEXT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_LISTS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
new file mode 100644
index 0000000000..af0a3b73cc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.train.ServerDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ServerDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CLUSTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFAULT_SESSION_CONFIG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "JOB_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PROTOCOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TASK_INDEX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
new file mode 100644
index 0000000000..9b8f185f5b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.train.Server"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.server_lib.Server\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "server_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "target"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'server_or_cluster_def\', \'job_name\', \'task_index\', \'protocol\', \'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "create_local_server"
+    argspec: "args=[\'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
new file mode 100644
index 0000000000..beb232715f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
@@ -0,0 +1,12 @@
+path: "tensorflow.train.SessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
new file mode 100644
index 0000000000..cc31bb4e4b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.train.SessionManager"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_manager.SessionManager\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'local_init_op\', \'ready_op\', \'ready_for_local_init_op\', \'graph\', \'recovery_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'30\'], "
+  }
+  member_method {
+    name: "prepare_session"
+    argspec: "args=[\'self\', \'master\', \'init_op\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\', \'init_feed_dict\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'7200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recover_session"
+    argspec: "args=[\'self\', \'master\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'7200\', \'None\'], "
+  }
+  member_method {
+    name: "wait_for_session"
+    argspec: "args=[\'self\', \'master\', \'config\', \'max_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'inf\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
new file mode 100644
index 0000000000..442990893e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.train.SessionRunArgs"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "fetches"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "options"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
new file mode 100644
index 0000000000..d5adb15c95
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.train.SessionRunContext"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunContext\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "original_args"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "stop_requested"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'original_args\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
new file mode 100644
index 0000000000..db1aa24acf
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
@@ -0,0 +1,28 @@
+path: "tensorflow.train.SessionRunHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
new file mode 100644
index 0000000000..0b401d59c4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.train.SessionRunValues"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "options"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "results"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "run_metadata"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
new file mode 100644
index 0000000000..62bfdab40b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.SingularMonitoredSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SingularMonitoredSession\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'hooks\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\', \'None\', \'None\', \'120\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "raw_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
new file mode 100644
index 0000000000..13261f6dde
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.StepCounterHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StepCounterHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'every_n_steps\', \'every_n_secs\', \'output_dir\', \'summary_writer\'], varargs=None, keywords=None, defaults=[\'100\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
new file mode 100644
index 0000000000..e388599b0b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.StopAtStepHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StopAtStepHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'num_steps\', \'last_step\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
new file mode 100644
index 0000000000..697c3667b0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.SummarySaverHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SummarySaverHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'save_steps\', \'save_secs\', \'output_dir\', \'summary_writer\', \'scaffold\', \'summary_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
new file mode 100644
index 0000000000..cc9bd5c136
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
@@ -0,0 +1,153 @@
+path: "tensorflow.train.Supervisor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.supervisor.Supervisor\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "USE_DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "coord"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "global_step"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_chief"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_for_local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_model_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_path"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_summaries_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "saver"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session_manager"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_writer"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "Loop"
+    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "PrepareSession"
+    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
+  }
+  member_method {
+    name: "RequestStop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ShouldStop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "StartQueueRunners"
+    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "StartStandardServices"
+    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Stop"
+    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "StopOnException"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "SummaryComputed"
+    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "WaitForStop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'graph\', \'ready_op\', \'ready_for_local_init_op\', \'is_chief\', \'init_op\', \'init_feed_dict\', \'local_init_op\', \'logdir\', \'summary_op\', \'saver\', \'global_step\', \'save_summaries_secs\', \'save_model_secs\', \'recovery_wait_secs\', \'stop_grace_secs\', \'checkpoint_basename\', \'session_manager\', \'summary_writer\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'True\', \'0\', \'None\', \'0\', \'None\', \'0\', \'0\', \'0\', \'120\', \'600\', \'30\', \'120\', \'model.ckpt\', \'None\', \'0\', \'None\'], "
+  }
+  member_method {
+    name: "loop"
+    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "managed_session"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "prepare_or_wait_for_session"
+    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "start_standard_services"
+    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop"
+    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "stop_on_exception"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "summary_computed"
+    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "wait_for_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
new file mode 100644
index 0000000000..915d8501af
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.train.SyncReplicasOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.sync_replicas_optimizer.SyncReplicasOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'opt\', \'replicas_to_aggregate\', \'total_num_replicas\', \'variable_averages\', \'variables_to_average\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'sync_replicas\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_chief_queue_runner"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_init_tokens_op"
+    argspec: "args=[\'self\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "make_session_run_hook"
+    argspec: "args=[\'self\', \'is_chief\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
new file mode 100644
index 0000000000..140407651a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.train.WorkerSessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.WorkerSessionCreator\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\'], "
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
new file mode 100644
index 0000000000..86af18f824
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
@@ -0,0 +1,391 @@
+path: "tensorflow.train"
+tf_module {
+  member {
+    name: "AdadeltaOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdagradDAOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdagradOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdamOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "BytesList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "CheckpointSaverHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ChiefSessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ClusterDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "ClusterSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Coordinator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Example"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "ExponentialMovingAverage"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Feature"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeatureList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeatureLists"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Features"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeedFnHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FinalOpsHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FloatList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FtrlOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GlobalStepWaiterHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GradientDescentOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Int64List"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "JobDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "LoggingTensorHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "LooperThread"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "MomentumOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "MonitoredSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NanLossDuringTrainingError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NanTensorHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Optimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ProximalAdagradOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ProximalGradientDescentOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "QueueRunner"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RMSPropOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Saver"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SaverDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Scaffold"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SecondOrStepTimer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SequenceExample"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Server"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ServerDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionManager"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunArgs"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunContext"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunValues"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SingularMonitoredSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "StepCounterHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "StopAtStepHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SummarySaverHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Supervisor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SyncReplicasOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "WorkerSessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "queue_runner"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "MonitoredTrainingSession"
+    argspec: "args=[\'master\', \'is_chief\', \'checkpoint_dir\', \'scaffold\', \'hooks\', \'chief_only_hooks\', \'save_checkpoint_secs\', \'save_summaries_steps\', \'save_summaries_secs\', \'config\', \'stop_grace_period_secs\', \'log_step_count_steps\'], varargs=None, keywords=None, defaults=[\'\', \'True\', \'None\', \'None\', \'None\', \'None\', \'600\', \'100\', \'None\', \'None\', \'120\', \'100\'], "
+  }
+  member_method {
+    name: "NewCheckpointReader"
+    argspec: "args=[\'filepattern\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_queue_runner"
+    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
+  }
+  member_method {
+    name: "assert_global_step"
+    argspec: "args=[\'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "basic_train_loop"
+    argspec: "args=[\'supervisor\', \'train_step_fn\', \'args\', \'kwargs\', \'master\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\'], "
+  }
+  member_method {
+    name: "batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "checkpoint_exists"
+    argspec: "args=[\'checkpoint_prefix\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "create_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "do_quantize_training_on_graphdef"
+    argspec: "args=[\'input_graph\', \'num_bits\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "exponential_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "export_meta_graph"
+    argspec: "args=[\'filename\', \'meta_info_def\', \'graph_def\', \'saver_def\', \'collection_list\', \'as_text\', \'graph\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'None\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "generate_checkpoint_state_proto"
+    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_checkpoint_mtimes"
+    argspec: "args=[\'checkpoint_prefixes\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_checkpoint_state"
+    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_or_create_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "global_step"
+    argspec: "args=[\'sess\', \'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "import_meta_graph"
+    argspec: "args=[\'meta_graph_or_file\', \'clear_devices\', \'import_scope\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "input_producer"
+    argspec: "args=[\'input_tensor\', \'element_shape\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'summary_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "inverse_time_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "latest_checkpoint"
+    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "limit_epochs"
+    argspec: "args=[\'tensor\', \'num_epochs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "match_filenames_once"
+    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "maybe_batch"
+    argspec: "args=[\'tensors\', \'keep_input\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_batch_join"
+    argspec: "args=[\'tensors_list\', \'keep_input\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_shuffle_batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_shuffle_batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "natural_exp_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "piecewise_constant"
+    argspec: "args=[\'x\', \'boundaries\', \'values\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "polynomial_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'end_learning_rate\', \'power\', \'cycle\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0001\', \'1.0\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "range_input_producer"
+    argspec: "args=[\'limit\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "replica_device_setter"
+    argspec: "args=[\'ps_tasks\', \'ps_device\', \'worker_device\', \'merge_devices\', \'cluster\', \'ps_ops\', \'ps_strategy\'], varargs=None, keywords=None, defaults=[\'0\', \'/job:ps\', \'/job:worker\', \'True\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "shuffle_batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "shuffle_batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "slice_input_producer"
+    argspec: "args=[\'tensor_list\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
+  }
+  member_method {
+    name: "string_input_producer"
+    argspec: "args=[\'string_tensor\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "summary_iterator"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "update_checkpoint_state"
+    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "write_graph"
+    argspec: "args=[\'graph_or_graph_def\', \'logdir\', \'name\', \'as_text\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
new file mode 100644
index 0000000000..23d402de30
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.queue_runner.QueueRunner"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cancel_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "close_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "enqueue_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "exceptions_raised"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_closed_exception_types"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_threads"
+    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
new file mode 100644
index 0000000000..6e2d043049
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
@@ -0,0 +1,15 @@
+path: "tensorflow.train.queue_runner"
+tf_module {
+  member {
+    name: "QueueRunner"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "add_queue_runner"
+    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
new file mode 100644
index 0000000000..7c48f4af07
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.truncated_normal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.TruncatedNormal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
new file mode 100644
index 0000000000..4558db619e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.uniform_unit_scaling_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.UniformUnitScaling\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'factor\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
new file mode 100644
index 0000000000..8313009a68
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.zeros_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Zeros\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/lib/BUILD b/tensorflow/tools/api/lib/BUILD
new file mode 100644
index 0000000000..cdfa0e7be5
--- /dev/null
+++ b/tensorflow/tools/api/lib/BUILD
@@ -0,0 +1,39 @@
+# Helper libraries for TensorFlow API compatibility test.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load(
+    "//tensorflow/core:platform/default/build_config.bzl",
+    "tf_proto_library",
+)
+
+tf_proto_library(
+    name = "api_objects_proto",
+    srcs = ["api_objects.proto"],
+)
+
+py_library(
+    name = "python_object_to_proto_visitor",
+    srcs = ["python_object_to_proto_visitor.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":api_objects_proto_py",
+        "//tensorflow/tools/common:traverse",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/lib/api_objects.proto b/tensorflow/tools/api/lib/api_objects.proto
new file mode 100644
index 0000000000..0966a5f1d5
--- /dev/null
+++ b/tensorflow/tools/api/lib/api_objects.proto
@@ -0,0 +1,31 @@
+syntax = "proto2";
+
+package third_party.tensorflow.tools.api;
+
+message TFAPIMember {
+  optional string name = 1;
+  optional string mtype = 2;
+};
+
+message TFAPIMethod {
+  optional string name = 1;
+  optional string path = 2;
+  optional string argspec = 3;
+};
+
+message TFAPIModule {
+  repeated TFAPIMember member = 1;
+  repeated TFAPIMethod member_method = 2;
+};
+
+message TFAPIClass {
+  repeated string is_instance = 1;
+  repeated TFAPIMember member = 2;
+  repeated TFAPIMethod member_method = 3;
+};
+
+message TFAPIObject {
+  optional string path = 1;
+  optional TFAPIModule tf_module = 2;
+  optional TFAPIClass tf_class = 3;
+};
diff --git a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
new file mode 100644
index 0000000000..64092a6441
--- /dev/null
+++ b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
@@ -0,0 +1,168 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ==============================================================================
+"""A visitor class that generates protobufs for each pyton object."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import inspect
+
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.tools.api.lib import api_objects_pb2
+
+
+# Following object need to be handled individually.
+_CORNER_CASES = {
+    '': {'contrib': {'name': 'contrib',
+                     'mtype': '<class \'_LazyContribLoader\'>'},
+         'tools': {}},
+    'test.TestCase': {},
+    'test.TestCase.failureException': {},
+}
+
+
+def _SanitizedArgSpec(obj):
+  """Get an ArgSpec string that is free of addresses.
+
+  We have callables as function arg defaults. This results in addresses in
+  getargspec output. This function returns a sanitized string list of base
+  classes.
+
+  Args:
+    obj: A python routine for us the create the sanitized arspec of.
+
+  Returns:
+    string, a string representation of the argspec.
+  """
+  output_string = ''
+  unsanitized_arg_spec = inspect.getargspec(obj)
+
+  for clean_attr in ('args', 'varargs', 'keywords'):
+    output_string += '%s=%s, ' % (clean_attr,
+                                  getattr(unsanitized_arg_spec, clean_attr))
+
+  if unsanitized_arg_spec.defaults:
+    sanitized_defaults = []
+    for val in unsanitized_arg_spec.defaults:
+      str_val = str(val)
+      if ' object at 0x' in str_val:
+        sanitized_defaults.append('%s instance>' % str_val.split(' at ')[0])
+      else:
+        sanitized_defaults.append(str_val)
+
+    output_string += 'defaults=%s, ' % sanitized_defaults
+
+  else:
+    output_string += 'defaults=None'
+
+  return output_string
+
+
+def _SanitizedMRO(obj):
+  """Get a list of superclasses with minimal amount of non-TF classes.
+
+  Based on many parameters like python version, OS, protobuf implementation
+  or changes in google core libraries the list of superclasses of a class
+  can change. We only return the first non-TF class to be robust to non API
+  affecting changes. The Method Resolution Order returned by inspect.getmro
+  is still maintained in the return value.
+
+  Args:
+    obj: A python routine for us the create the sanitized arspec of.
+
+  Returns:
+    list of strings, string representation of the class names.
+  """
+  return_list = []
+  for cls in inspect.getmro(obj):
+    str_repr = str(cls)
+    return_list.append(str_repr)
+    if 'tensorflow' not in str_repr:
+      break
+
+  return return_list
+
+
+class PythonObjectToProtoVisitor(object):
+  """A visitor that summarizes given python objects as protobufs."""
+
+  def __init__(self):
+    # A dict to store all protocol buffers.
+    # Keyed by "path" to the object.
+    self._protos = {}
+
+  def GetProtos(self):
+    """Return the list of protos stored."""
+    return self._protos
+
+  def __call__(self, path, parent, children):
+    # The path to the object.
+    lib_path = 'tensorflow.%s' % path if path else 'tensorflow'
+
+    # A small helper method to construct members(children) protos.
+    def _AddMember(member_name, member_obj, proto):
+      """Add the child object to the object being constructed."""
+      if member_name == '__init__' or not member_name.startswith('_'):
+        if inspect.isroutine(member_obj):
+          new_method = proto.member_method.add()
+          new_method.name = member_name
+          # If member_obj is a python builtin, there is no way to get its
+          # argspec, because it is implemented on the C side. It also has no
+          # func_code.
+          if getattr(member_obj, 'func_code', None):
+            new_method.argspec = _SanitizedArgSpec(member_obj)
+        else:
+          new_member = proto.member.add()
+          new_member.name = member_name
+          new_member.mtype = str(type(member_obj))
+
+    parent_corner_cases = _CORNER_CASES.get(path, {})
+
+    if path not in _CORNER_CASES or parent_corner_cases:
+      # Decide if we have a module or a class.
+      if inspect.ismodule(parent):
+        # Create a module object.
+        module_obj = api_objects_pb2.TFAPIModule()
+        for name, child in children:
+          if name in parent_corner_cases:
+            # If we have an empty entry, skip this object.
+            if parent_corner_cases[name]:
+              module_obj.member.add(**(parent_corner_cases[name]))
+          else:
+            _AddMember(name, child, module_obj)
+
+        # Store the constructed module object.
+        self._protos[lib_path] = api_objects_pb2.TFAPIObject(
+            path=lib_path, tf_module=module_obj)
+      elif inspect.isclass(parent):
+        # Construct a class.
+        class_obj = api_objects_pb2.TFAPIClass()
+        class_obj.is_instance.extend(_SanitizedMRO(parent))
+        for name, child in children:
+          if name in parent_corner_cases:
+            # If we have an empty entry, skip this object.
+            if parent_corner_cases[name]:
+              module_obj.member.add(**(parent_corner_cases[name]))
+          else:
+            _AddMember(name, child, class_obj)
+
+        # Store the constructed class object.
+        self._protos[lib_path] = api_objects_pb2.TFAPIObject(
+            path=lib_path, tf_class=class_obj)
+      else:
+        logging.error('Illegal call to ApiProtoDump::_py_obj_to_proto.'
+                      'Object is neither a module nor a class: %s', path)
diff --git a/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt b/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
new file mode 100644
index 0000000000..54b0cfcb3c
--- /dev/null
+++ b/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
@@ -0,0 +1,7 @@
+Golden file update requested!
+All test failures have been skipped, see the logs for detected diffs.
+This test is now going to write new golden files.
+Make sure to package the updates together with your change.
+
+You will need an explicit API approval. This may take longer than a normal
+review.
diff --git a/tensorflow/tools/api/tests/BUILD b/tensorflow/tools/api/tests/BUILD
new file mode 100644
index 0000000000..bfee211dca
--- /dev/null
+++ b/tensorflow/tools/api/tests/BUILD
@@ -0,0 +1,43 @@
+# TensorFlow API backwards compatibility tests.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files([
+    "README.txt",
+    "API_UPDATE_WARNING.txt",
+])
+
+py_test(
+    name = "api_compatibility_test",
+    srcs = ["api_compatibility_test.py"],
+    data = [
+        "//tensorflow/tools/api/golden:api_golden",
+        "//tensorflow/tools/api/tests:API_UPDATE_WARNING.txt",
+        "//tensorflow/tools/api/tests:README.txt",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python:platform",
+        "//tensorflow/tools/api/lib:python_object_to_proto_visitor",
+        "//tensorflow/tools/common:public_api",
+        "//tensorflow/tools/common:traverse",
+        "@protobuf//:protobuf_python",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/tests/README.txt b/tensorflow/tools/api/tests/README.txt
new file mode 100644
index 0000000000..3463eeec6f
--- /dev/null
+++ b/tensorflow/tools/api/tests/README.txt
@@ -0,0 +1,13 @@
+TensorFlow API backwards compatibility test
+This test ensures all changes to the public API of TensorFlow are intended.
+
+If this test fails, it means a change has been made to the public API. Backwards
+incompatible changes are not allowed. You can run the test as follows to update
+test goldens and package them with your change.
+
+    $ bazel build tensorflow/tools/api/tests:api_compatibility_test
+    $ bazel-bin/tensorflow/tools/api/tests/api_compatibility_test \
+          --update_goldens True
+
+You will need an API approval to make changes to the public TensorFlow API. This
+includes additions to the API.
diff --git a/tensorflow/tools/api/tests/api_compatibility_test.py b/tensorflow/tools/api/tests/api_compatibility_test.py
new file mode 100644
index 0000000000..27865fdc89
--- /dev/null
+++ b/tensorflow/tools/api/tests/api_compatibility_test.py
@@ -0,0 +1,238 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ==============================================================================
+"""TensorFlow API compatibility tests.
+
+This test ensures all changes to the public API of TensorFlow are intended.
+
+If this test fails, it means a change has been made to the public API. Backwards
+incompatible changes are not allowed. You can run the test with
+"--update_goldens" flag set to "True" to update goldens when making changes to
+the public TF python API.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import os
+import re
+import sys
+import unittest
+
+import tensorflow as tf
+
+from google.protobuf import text_format
+
+from tensorflow.python.lib.io import file_io
+from tensorflow.python.platform import resource_loader
+from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.tools.api.lib import api_objects_pb2
+from tensorflow.tools.api.lib import python_object_to_proto_visitor
+from tensorflow.tools.common import public_api
+from tensorflow.tools.common import traverse
+
+# FLAGS defined at the bottom:
+FLAGS = None
+# DEFINE_boolean, update_goldens, default False:
+_UPDATE_GOLDENS_HELP = """
+     Update stored golden files if API is updated. WARNING: All API changes
+     have to be authorized by TensorFlow leads.
+"""
+
+# DEFINE_boolean, verbose_diffs, default False:
+_VERBOSE_DIFFS_HELP = """
+     If set to true, print line by line diffs on all libraries. If set to
+     false, only print which libraries have differences.
+"""
+
+_API_GOLDEN_FOLDER = 'tensorflow/tools/api/golden'
+_TEST_README_FILE = 'tensorflow/tools/api/tests/README.txt'
+_UPDATE_WARNING_FILE = 'tensorflow/tools/api/tests/API_UPDATE_WARNING.txt'
+
+
+def _KeyToFilePath(key):
+  """From a given key, construct a filepath."""
+  def _ReplaceCapsWithDash(matchobj):
+    match = matchobj.group(0)
+    return '-%s' % (match.lower())
+
+  case_insensitive_key = re.sub('([A-Z]{1})', _ReplaceCapsWithDash, key)
+  return os.path.join(_API_GOLDEN_FOLDER, '%s.pbtxt' % case_insensitive_key)
+
+
+def _FileNameToKey(filename):
+  """From a given filename, construct a key we use for api objects."""
+  def _ReplaceDashWithCaps(matchobj):
+    match = matchobj.group(0)
+    return match[1].upper()
+
+  base_filename = os.path.basename(filename)
+  base_filename_without_ext = os.path.splitext(base_filename)[0]
+  api_object_key = re.sub(
+      '((-[a-z]){1})', _ReplaceDashWithCaps, base_filename_without_ext)
+  return api_object_key
+
+
+class ApiCompatibilityTest(test.TestCase):
+
+  def __init__(self, *args, **kwargs):
+    super(ApiCompatibilityTest, self).__init__(*args, **kwargs)
+
+    golden_update_warning_filename = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _UPDATE_WARNING_FILE)
+    self._update_golden_warning = file_io.read_file_to_string(
+        golden_update_warning_filename)
+
+    test_readme_filename = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _TEST_README_FILE)
+    self._test_readme_message = file_io.read_file_to_string(
+        test_readme_filename)
+
+  def _AssertProtoDictEquals(self,
+                             expected_dict,
+                             actual_dict,
+                             verbose=False,
+                             update_goldens=False):
+    """Diff given dicts of protobufs and report differences a readable way.
+
+    Args:
+      expected_dict: a dict of TFAPIObject protos constructed from golden
+          files.
+      actual_dict: a ict of TFAPIObject protos constructed by reading from the
+          TF package linked to the test.
+      verbose: Whether to log the full diffs, or simply report which files were
+          different.
+      update_goldens: Whether to update goldens when there are diffs found.
+    """
+    diffs = []
+    verbose_diffs = []
+
+    expected_keys = set(expected_dict.keys())
+    actual_keys = set(actual_dict.keys())
+    only_in_expected = expected_keys - actual_keys
+    only_in_actual = actual_keys - expected_keys
+    all_keys = expected_keys | actual_keys
+
+    # This will be populated below.
+    updated_keys = []
+
+    for key in all_keys:
+      diff_message = ''
+      verbose_diff_message = ''
+      # First check if the key is not found in one or the other.
+      if key in only_in_expected:
+        diff_message = 'Object %s expected but not found (removed).' % key
+        verbose_diff_message = diff_message
+      elif key in only_in_actual:
+        diff_message = 'New object %s found (added).' % key
+        verbose_diff_message = diff_message
+      else:
+        # Now we can run an actual proto diff.
+        try:
+          self.assertProtoEquals(expected_dict[key], actual_dict[key])
+        except AssertionError as e:
+          updated_keys.append(key)
+          diff_message = 'Change detected in python object: %s.' % key
+          verbose_diff_message = str(e)
+
+      # All difference cases covered above. If any difference found, add to the
+      # list.
+      if diff_message:
+        diffs.append(diff_message)
+        verbose_diffs.append(verbose_diff_message)
+
+    # If diffs are found, handle them based on flags.
+    if diffs:
+      diff_count = len(diffs)
+      logging.error(self._test_readme_message)
+      logging.error('%d differences found between API and golden.', diff_count)
+      messages = verbose_diffs if verbose else diffs
+      for i in range(diff_count):
+        logging.error('Issue %d\t: %s', i + 1, messages[i])
+
+      if update_goldens:
+        # Write files if requested.
+        logging.warning(self._update_golden_warning)
+
+        # If the keys are only in expected, some objects are deleted.
+        # Remove files.
+        for key in only_in_expected:
+          filepath = _KeyToFilePath(key)
+          file_io.delete_file(filepath)
+
+        # If the files are only in actual (current library), these are new
+        # modules. Write them to files. Also record all updates in files.
+        for key in only_in_actual | set(updated_keys):
+          filepath = _KeyToFilePath(key)
+          file_io.write_string_to_file(
+              filepath, text_format.MessageToString(actual_dict[key]))
+      else:
+        # Fail if we cannot fix the test by updating goldens.
+        self.fail('%d differences found between API and golden.' % diff_count)
+
+    else:
+      logging.info('No differences found between API and golden.')
+
+  @unittest.skipUnless(
+      sys.version_info.major == 2 and os.uname()[0] == 'Linux',
+      'API compabitility test goldens are generated using python2 on Linux.')
+  def testAPIBackwardsCompatibility(self):
+    # Extract all API stuff.
+    visitor = python_object_to_proto_visitor.PythonObjectToProtoVisitor()
+    traverse.traverse(tf, public_api.PublicAPIVisitor(visitor))
+    proto_dict = visitor.GetProtos()
+
+    # Read all golden files.
+    expression = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _KeyToFilePath('*'))
+    golden_file_list = file_io.get_matching_files(expression)
+
+    def _ReadFileToProto(filename):
+      """Read a filename, create a protobuf from its contents."""
+      ret_val = api_objects_pb2.TFAPIObject()
+      text_format.Merge(file_io.read_file_to_string(filename), ret_val)
+      return ret_val
+
+    golden_proto_dict = {
+        _FileNameToKey(filename): _ReadFileToProto(filename)
+        for filename in golden_file_list
+    }
+
+    # Diff them. Do not fail if called with update.
+    # If the test is run to update goldens, only report diffs but do not fail.
+    self._AssertProtoDictEquals(
+        golden_proto_dict,
+        proto_dict,
+        verbose=FLAGS.verbose_diffs,
+        update_goldens=FLAGS.update_goldens)
+
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.add_argument(
+      '--update_goldens', type=bool, default=False, help=_UPDATE_GOLDENS_HELP)
+  parser.add_argument(
+      '--verbose_diffs', type=bool, default=False, help=_VERBOSE_DIFFS_HELP)
+  FLAGS, unparsed = parser.parse_known_args()
+
+  # Now update argv, so that unittest library does not get confused.
+  sys.argv = [sys.argv[0]] + unparsed
+  test.main()
-- 
GitLab


From ad89f84b6a71f1a667ef34951aeb1f8b4e32e341 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 9 Apr 2017 22:59:23 -0800
Subject: [PATCH 0249/1563] Construct TensorBoard dashboards in a JS list

Previously, adding a dashboard to TensorBoard involved changing logic in several places.

As part of this effort, added constructors to dashboards. Tweaked logic in various dashboards to preserve original behavior. For instance, the graph dashboard can only perform fitting after the dashboard is attached to the DOM.
Change: 152658532
---
 .../tf-audio-dashboard.html                   |   6 +-
 .../components/tf_dashboard_common/BUILD      |   2 +
 .../tf_dashboard_common/dashboard-behavior.ts |  40 +++++
 .../tf_dashboard_common/tf-dashboard.html     |   1 +
 .../tf_dashboard_common/tf-run-selector.html  |  25 +--
 .../tf-distribution-dashboard.html            |   6 +-
 .../components/tf_graph/tf-graph-scene.html   |  35 +++-
 .../tf-graph-dashboard.html                   |   7 +-
 .../tf-histogram-dashboard.html               |   6 +-
 .../tf-image-dashboard.html                   |  10 +-
 .../tf-scalar-dashboard.html                  |   7 +-
 .../tf_tensorboard/tf-tensorboard.html        | 170 +++++++-----------
 .../tf_text_dashboard/tf-text-dashboard.html  |  11 +-
 .../vz_projector/vz-projector-dashboard.html  |  28 ++-
 14 files changed, 221 insertions(+), 133 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
index ad879210d6..2088cde278 100644
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
@@ -59,12 +59,16 @@ tf-audio-dashboard displays a dashboard that loads audio from a TensorFlow run.
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfAudioDashboard = Polymer({
       is: "tf-audio-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         dataType: {value: "audio"},
       },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("audio"),
         TF.Dashboard.ReloadBehavior("tf-audio-loader"),
         TF.Backend.Behavior
       ],
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
index 0fb9f70eb9..fd43970fc0 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
@@ -41,6 +41,7 @@ tensorboard_typescript_genrule(
     name = "ts",
     srcs = [
         "categorizer.ts",
+        "dashboard-behavior.ts",
         "reload-behavior.ts",
     ],
     typings = [
@@ -89,6 +90,7 @@ tensorboard_ts_library(
     name = "legacy_ts",
     srcs = [
         "categorizer.ts",
+        "dashboard-behavior.ts",
         "reload-behavior.ts",
     ],
     deps = [
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts b/tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts
new file mode 100644
index 0000000000..269a62ccf9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts
@@ -0,0 +1,40 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+module TF.Dashboard {
+  /**
+   * A behavior that TensorBoard dashboards must implement. This behavior serves
+   * the purpose of an interface.
+   */
+  export function DashboardBehavior(dashboardName) {
+    return {
+      properties: {
+        name: {
+          type: String,
+          value: dashboardName,
+          readOnly: true,
+        },
+      },
+      // This method is called when the dashboard reloads, either when the
+      // dashboard is first visited, periodically reloaded, or manually reloaded
+      // via the user clicking the button. Note that dashboard custom elements
+      // that use TF.Dashboard.ReloadBehavior already implement a reload method.
+      reload() {
+        throw Error(
+            'The ' + dashboardName + ' dashboard does not implement reload.');
+      },
+    };
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html
index 4c7c91d171..9e2f6b9589 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html
@@ -22,4 +22,5 @@ limitations under the License.
 <link rel="import" href="tf-downloader.html">
 <link rel="import" href="tf-no-data-warning.html">
 
+<script src="dashboard-behavior.js"></script>
 <script src="reload-behavior.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html
index 8f2ea402e8..81a72793b9 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html
@@ -139,17 +139,9 @@ Properties out:
       },
     },
     observers: [
+      "_onBackendUpdate(backend)",
       "_logdirSet(logdir)",
     ],
-    ready: function() {
-      // Populate the logdir.
-      this.backend.logdir().then(logdirObject => {
-        this.set('logdir', logdirObject.logdir);
-      }).catch(e => {
-        // Fetching the logdir failed. Prevent the exception from logging to
-        // console. The console already logs a 404 network event.
-      });
-    },
     _toggleAll: function() {
       this.$.multiCheckbox.toggleAll();
     },
@@ -157,8 +149,21 @@ Properties out:
     _breakString: function(originalString) {
       return originalString.replace(/([\/=\-_,])/g, "$1<wbr>");
     },
+    _onBackendUpdate: function(backend) {
+      if (backend === undefined) {
+        return;
+      }
+
+      // When the backend is set, the selector can request the logdir.
+      backend.logdir().then(logdirObject => {
+        this.set('logdir', logdirObject.logdir);
+      }).catch(e => {
+        // Fetching the logdir failed. Prevent the exception from logging to
+        // console. The console already logs a 404 network event.
+      });
+    },
     _logdirSet: function(logdir) {
-      if (!logdir) {
+      if (logdir === undefined) {
         // The logdir has not been set yet.
         return;
       }
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html b/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
index 2da848bd99..58ae396cb4 100644
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
@@ -101,9 +101,13 @@ contains vz-distribution-charts embedded inside tf-panes-helper's.
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfDistributionDashboard = Polymer({
       is: "tf-distribution-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("distributions"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
index 09513699c3..9dc2a361e2 100644
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
+++ b/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
@@ -619,6 +619,18 @@ Polymer({
     renderHierarchy: Object,
     name: String,
     colorBy: String,
+
+    // For each render hierarchy, we only fit it to the viewport once (when the scene is attached to
+    // the DOM). We do not fit the hierarchy again (unless the user clicks the reset button). For
+    // instance, if the user enters a certain view in the graph, switches to another dashboard, and
+    // returns to the graph dashboard, the user expects the previous view. These properties enable
+    // that behavior.
+
+    /** Whether the scene has fit the current render hierarchy (to the viewport) at least once. */
+    _hasRenderHierarchyBeenFitOnce: Boolean,
+    /** Whether this scene element is currently attached to a parent element. */
+    _isAttached: Boolean,
+
     /** @type {d3_zoom} d3 zoom object */
     _zoom: Object,
     highlightedNode: {
@@ -723,7 +735,10 @@ Polymer({
   },
   observers: [
     '_colorByChanged(colorBy)',
-    '_buildAndFit(renderHierarchy)',
+    '_renderHierarchyChanged(renderHierarchy)',
+    // Animation and fitting must come after the observer for the hierarchy changing because we must
+    // first build the render hierarchy.
+    '_animateAndFit(_isAttached, renderHierarchy)',
     '_updateHealthPills(nodeNamesToHealthPills, healthPillStepIndex)',
   ],
   getNode: function(nodeName) {
@@ -826,9 +841,24 @@ Polymer({
         tf.graph.layout.PARAMS.minimap.size,
         tf.graph.layout.PARAMS.subscene.meta.labelHeight);
   },
-  _buildAndFit: function(renderHierarchy) {
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
+  _renderHierarchyChanged: function(renderHierarchy) {
+    this._hasRenderHierarchyBeenFitOnce = false;
     this._resetState();
     this._build(renderHierarchy);
+  },
+  _animateAndFit: function(isAttached, renderHierarchy) {
+    if (this._hasRenderHierarchyBeenFitOnce || !isAttached) {
+      // Do not animate and fit if the scene has already fitted this render hierarchy once. Or if
+      // the graph dashboard is not attached (in which case the scene lacks DOM info for fitting).
+      return;
+    }
+
     // Fit to screen after the graph is done animating.
     setTimeout(this.fit.bind(this), tf.graph.layout.PARAMS.animation.duration);
   },
@@ -881,6 +911,7 @@ Polymer({
     }
   },
   fit: function() {
+    this._hasRenderHierarchyBeenFitOnce = true;
     tf.graph.scene.fit(this.$.svg, this.$.root, this._zoom, function() {
       this._zoomed = false;
     }.bind(this));
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
index d62e4ccedc..12f3d948d2 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
@@ -104,9 +104,14 @@ out-hierarchy-params="{{_hierarchyParams}}"
 
 <script>
 (function() {
-Polymer({
+TF.Dashboard.TfGraphDashboard = Polymer({
   is: 'tf-graph-dashboard',
+  factoryImpl: function(backend, debuggerDataEnabled) {
+    this.backend = backend;
+    this.debuggerDataEnabled = debuggerDataEnabled;
+  },
   behaviors: [
+    TF.Dashboard.DashboardBehavior("graphs"),
     TF.Dashboard.ReloadBehavior("tf-graph-dashboard"),
     TF.Backend.Behavior,
   ],
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html b/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
index f8c9cc4537..dd433982d1 100644
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
@@ -121,9 +121,13 @@ contains vz-histogram-timeseries embedded inside tf-panes-helper's.
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfHistogramDashboard = Polymer({
       is: "tf-histogram-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("histograms"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
index 19c272a468..0200b65030 100644
--- a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
@@ -106,8 +106,11 @@ tf-image-dashboard displays a dashboard that loads images from a TensorFlow run.
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfImageDashboard = Polymer({
       is: "tf-image-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         backend: Object,
         dataType: {
@@ -116,8 +119,9 @@ tf-image-dashboard displays a dashboard that loads images from a TensorFlow run.
         },
       },
       behaviors: [
-          TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-          TF.Backend.Behavior,
+        TF.Dashboard.DashboardBehavior("images"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
       ],
       attached: function() {
         this.async(function() {
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html b/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
index 641573366a..723a01d0e6 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
@@ -190,9 +190,14 @@ contains vz-line-charts embedded inside tf-panes-helper's.
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfScalarDashboard = Polymer({
       is: "tf-scalar-dashboard",
+      factoryImpl: function(backend, router) {
+        this.backend = backend;
+        this.router = router;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("scalars"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
index b5b2e2d5a8..a1925c1f6b 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
@@ -57,9 +57,9 @@ allows the user to toggle between various dashboards.
         <div id="toolbar-content">
           <div class="toolbar-title">TensorBoard</div>
           <paper-tabs selected="{{modeIndex}}" noink class="tabs" id="tabs">
-            <template is="dom-repeat" items="[[tabs]]">
-              <template is="dom-if" if="[[_isTabEnabled(item)]]">
-                <paper-tab data-mode="[[item]]">[[item]]</paper-tab>
+            <template is="dom-repeat" items="[[_dashboards]]">
+              <template is="dom-if" if="[[_isTabEnabled(item.name)]]">
+                <paper-tab data-mode="[[item.name]]">[[item.name]]</paper-tab>
               </template>
             </template>
           </paper-tabs>
@@ -82,67 +82,7 @@ allows the user to toggle between various dashboards.
         </div>
       </paper-toolbar>
 
-      <div id="content" class="fit">
-        <content id="injected-overview"></content>
-
-        <template is="dom-if" if="[[_modeIsScalars(mode)]]">
-          <tf-scalar-dashboard
-            id="scalars"
-            backend="[[_backend]]"
-            router="[[router]]"
-          ></tf-scalar-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsImages(mode)]]">
-          <tf-image-dashboard
-            id="images"
-            backend="[[_backend]]"
-          ></tf-image-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsAudio(mode)]]">
-          <tf-audio-dashboard
-            id="audio"
-            backend="[[_backend]]"
-          ></tf-audio-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsGraphs(mode)]]">
-          <tf-graph-dashboard
-            id="graphs"
-            backend="[[_backend]]"
-            debugger-data-enabled="[[_debuggerDataEnabled]]"
-          ></tf-graph-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsDistributions(mode)]]">
-          <tf-distribution-dashboard
-            id="distributions"
-            backend="[[_backend]]"
-          ></tf-distribution-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsHistograms(mode)]]">
-          <tf-histogram-dashboard
-            id="histograms"
-            backend="[[_backend]]"
-          ></tf-histogram-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsEmbeddings(mode)]]">
-          <vz-projector-dashboard
-            id="projector"
-            route-prefix="/data/plugin/projector">
-          </vz-projector-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsText(mode)]]">
-          <tf-text-dashboard
-            id="text"
-            backend="[[_backend]]">
-          </tf-text-dashboard>
-        </template>
-      </div>
+      <div id="content" class="fit"></div>
     </paper-header-panel>
 
     <style>
@@ -233,16 +173,21 @@ allows the user to toggle between various dashboards.
             return match && match.length == 1;
           },
         },
+        _dashboards: {
+          type: Array,
+          computed: "_makeDashboardList(_backend, router, _debuggerDataEnabled)",
+        },
+        // Maps dashboard name to dashboard object.
+        _dashboardMapping: {
+          type: Object,
+          computed: "_makeDashboardMapping(_dashboards)",
+        },
         // Which tab is selected (scalars, graph, images etc).
         mode: {
           type: String,
           computed: '_getModeFromIndex(modeIndex)',
           notify: true,
-        },
-        tabs: {
-          type: Array,
-          readOnly: true,
-          value: TF.Globals.TABS,
+          observer: '_modeChanged',
         },
         // If this is set to a string, TensorBoard will switch to "demo mode"
         // and attempt to load serialized json data from that directory. You can
@@ -267,7 +212,7 @@ allows the user to toggle between various dashboards.
         return true;
       },
       _getModeFromIndex: function(modeIndex) {
-        var mode = this.tabs[modeIndex];
+        var mode = this._dashboards[modeIndex].name;
         TF.URIStorage.setString(TF.URIStorage.TAB, mode);
         return mode;
       },
@@ -279,34 +224,10 @@ allows the user to toggle between various dashboards.
         return new TF.Backend.Backend(router);
       },
       _isReloadDisabled: function(mode) {
-        return !this._debuggerDataEnabled && this._modeIsGraphs(mode);
-      },
-      _modeIsScalars: function(mode) {
-        return mode === "scalars";
-      },
-      _modeIsImages: function(mode) {
-        return mode === "images";
-      },
-      _modeIsAudio: function(mode) {
-        return mode === "audio";
-      },
-      _modeIsGraphs: function(mode) {
-        return mode === "graphs";
-      },
-      _modeIsEmbeddings: function(mode) {
-        return mode === "embeddings";
-      },
-      _modeIsDistributions: function(mode) {
-        return mode === "distributions";
-      },
-      _modeIsHistograms: function(mode) {
-        return mode === "histograms";
-      },
-      _modeIsText: function(mode) {
-        return mode === "text";
+        return !this._debuggerDataEnabled && mode == 'graphs';
       },
       selectedDashboard: function() {
-        var dashboard = this.$$("#" + this.mode);
+        var dashboard = this._dashboardMapping[this.mode];
         if (dashboard == null) {
           throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
         }
@@ -320,24 +241,67 @@ allows the user to toggle between various dashboards.
           this._getModeFromHash();
         }.bind(this));
       },
+      _makeDashboardList: function(backend, router, debuggerDataEnabled) {
+        if (!backend || !router) {
+          // The dashboards require these entities. We are not ready to construct dashboards.
+          return null;
+        }
+
+        return [
+          new TF.Dashboard.TfScalarDashboard(backend, router),
+          new TF.Dashboard.TfImageDashboard(backend),
+          new TF.Dashboard.TfAudioDashboard(backend),
+          new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
+          new TF.Dashboard.TfDistributionDashboard(backend),
+          new TF.Dashboard.TfHistogramDashboard(backend),
+          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
+          new TF.Dashboard.TfTextDashboard(backend),
+        ];
+      },
+      _makeDashboardMapping: function(dashboards) {
+        if (!dashboards) {
+          return null;
+        }
+
+        let mapping = {};
+        dashboards.forEach(function(dashboard) {
+          mapping[dashboard.name] = dashboard;
+        });
+        return mapping;
+      },
       _getModeFromHash: function() {
         var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
-        var modeIndex = this.tabs.indexOf(tabName);
-        if (modeIndex == -1 && this.modeIndex == null) {
+        var modeIndex;
+        for (var i = 0; i < this._dashboards.length; i++) {
+          if (this._dashboards[i].name == tabName) {
+            modeIndex = i;
+            break;
+          }
+        }
+
+        if (modeIndex === undefined && this.modeIndex == null) {
           // Select the first tab as default.
           this.set('modeIndex', 0);
         }
-        if (modeIndex != -1 && modeIndex != this.modeIndex) {
+        if (modeIndex !== undefined && modeIndex != this.modeIndex) {
           this.set('modeIndex', modeIndex);
         }
       },
-      reload: function() {
-        if (this._modeIsEmbeddings(this.mode)) {
-          return;
+      _modeChanged: function(mode) {
+        let currentDashboard = this.$.content.firstChild;
+        if (currentDashboard) {
+          this.$.content.removeChild(currentDashboard);
         }
-        if (!this._debuggerDataEnabled && this._modeIsGraphs(this.mode)) {
+
+        if (!mode || !this._dashboardMapping) {
           return;
         }
+
+        // Append the new dashboard.
+        const newDashboard = this.selectedDashboard();
+        this.$.content.appendChild(newDashboard);
+      },
+      reload: function() {
         this.selectedDashboard().reload();
       },
       openSettings: function() {
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html b/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
index d39c890a7a..d771c9821c 100644
--- a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
@@ -82,8 +82,11 @@ tf-text-dashboard displays a dashboard that loads texts from a TensorFlow run.
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfTextDashboard = Polymer({
       is: "tf-text-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         backend: Object,
         dataType: {
@@ -92,15 +95,15 @@ tf-text-dashboard displays a dashboard that loads texts from a TensorFlow run.
         },
       },
       behaviors: [
-          TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-          TF.Backend.Behavior,
+        TF.Dashboard.DashboardBehavior("text"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
       ],
       attached: function() {
         this.async(function() {
           this.fire("rendered");
         });
       },
-
     });
   </script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
index b641bb0f29..a641a54e41 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
@@ -16,6 +16,7 @@ limitations under the License.
 -->
 
 <link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
 <link rel="import" href="../tf-dashboard-common/tf-no-data-warning.html">
 <link rel="import" href="vz-projector.html">
 
@@ -37,18 +38,33 @@ limitations under the License.
 </template>
 <script>
 (function() {
-Polymer({
+TF.Dashboard.VzProjectorDashboard = Polymer({
   is: 'vz-projector-dashboard',
+  factoryImpl: function(routePrefix) {
+    this.routePrefix = routePrefix;
+  },
   properties: {
     dataNotFound: Boolean,
     routePrefix: String
   },
-  ready() {
-    var self = this;
-    d3.json(this.routePrefix + '/runs', function(err, runs) {
-      self.dataNotFound = (runs.length === 0);
+  behaviors: [
+    TF.Dashboard.DashboardBehavior("embeddings"),
+  ],
+  observers: [
+    "_routePrefixSet(routePrefix)",
+  ],
+  reload: function() {
+    // Do not reload the embedding projector. Reloading could take a long time.
+  },
+  _routePrefixSet: function(routePrefix) {
+    if (routePrefix === undefined) {
+      // The route prefix has not been set yet.
+      return;
+    }
+    d3.json(routePrefix + '/runs', (err, runs) => {
+      this.set('dataNotFound', runs.length === 0);
     });
-  }
+  },
 });
 })();
 </script>
-- 
GitLab


From 30e28d119b5d7b08a2d3ced84cac4ebd446d9d19 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 00:21:56 -0800
Subject: [PATCH 0250/1563] Make CheckpointSaverListener visible next to
 CheckpointSaverHook. Change: 152662945

---
 tensorflow/python/training/training.py        |  2 ++
 ...low.train.-checkpoint-saver-listener.pbtxt | 24 +++++++++++++++++++
 .../tools/api/golden/tensorflow.train.pbtxt   |  4 ++++
 3 files changed, 30 insertions(+)
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt

diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index 28c0668d24..f2bcc56175 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -68,6 +68,7 @@ See the @{$python/train} guide.
 @@LoggingTensorHook
 @@StopAtStepHook
 @@CheckpointSaverHook
+@@CheckpointSaverListener
 @@NewCheckpointReader
 @@StepCounterHook
 @@NanLossDuringTrainingError
@@ -128,6 +129,7 @@ from tensorflow.python.training.basic_session_run_hooks import SecondOrStepTimer
 from tensorflow.python.training.basic_session_run_hooks import LoggingTensorHook
 from tensorflow.python.training.basic_session_run_hooks import StopAtStepHook
 from tensorflow.python.training.basic_session_run_hooks import CheckpointSaverHook
+from tensorflow.python.training.basic_session_run_hooks import CheckpointSaverListener
 from tensorflow.python.training.basic_session_run_hooks import StepCounterHook
 from tensorflow.python.training.basic_session_run_hooks import NanLossDuringTrainingError
 from tensorflow.python.training.basic_session_run_hooks import NanTensorHook
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt
new file mode 100644
index 0000000000..9d3688e565
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.train.CheckpointSaverListener"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.CheckpointSaverListener\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "after_save"
+    argspec: "args=[\'self\', \'session\', \'global_step_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_save"
+    argspec: "args=[\'self\', \'session\', \'global_step_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\', \'global_step_value\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
index 86af18f824..79fd49d0ad 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
@@ -24,6 +24,10 @@ tf_module {
     name: "CheckpointSaverHook"
     mtype: "<type \'type\'>"
   }
+  member {
+    name: "CheckpointSaverListener"
+    mtype: "<type \'type\'>"
+  }
   member {
     name: "ChiefSessionCreator"
     mtype: "<type \'type\'>"
-- 
GitLab


From 901ab86f35bc24461bad6d3145e62874d105038f Mon Sep 17 00:00:00 2001
From: Matthew Rahtz <matthew.rahtz@gmail.com>
Date: Mon, 10 Apr 2017 15:15:06 +0200
Subject: [PATCH 0251/1563] Add documentation about extra update ops to
 tf.layers.batch_normalization (#9048)

* Add documentation about batch normalization's extra ops

* Add backticks around code keywords
---
 tensorflow/python/layers/normalization.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index c998f57da7..e143decdb3 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -360,6 +360,23 @@ def batch_normalization(inputs,
 
   Sergey Ioffe, Christian Szegedy
 
+  Note: the operations which update the `moving_mean` and `moving_variance`
+  variables will not be added as dependencies of your training operation and so
+  must be run separately. For example:
+  ```
+  extra_update_ops = tf.get_collection(tf.GraphKeys.UPDATE_OPS)
+  sess.run([train_op, extra_update_ops], ...)
+  ```
+  Alternatively, add the operations as a dependency to your training operation
+  manually, and then just run your training operation as normal:
+  ```
+  extra_update_ops = tf.get_collection(tf.GraphKeys.UPDATE_OPS)
+  with tf.control_dependencies(extra_update_ops):
+    train_op = optimizer.minimize(loss)
+  ...
+  sess.run([train_op], ...)
+  ```
+
   Arguments:
     inputs: Tensor input.
     axis: Integer, the axis that should be normalized (typically the features
-- 
GitLab


From 984e8c586799a999128f3e74efa2fc339c0d2dc7 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 10 Apr 2017 06:18:26 -0800
Subject: [PATCH 0252/1563] tfdbg CLI: minor bug fixes

1: The calculation of the scroll command in the scroll bar didn't take into account that the y-coordinate of the scroll block is in the ScrollBar coordinate system, while the mouse click y-coordinate is in the screen coordinate system.

2: The y position of the ScrollBar was off by one.

3: The command box is not re-created after mouse-triggered commands, leading to strange-looking cursor position.
Change: 152684294
---
 tensorflow/python/debug/cli/curses_ui.py      | 30 ++++++++++++-------
 tensorflow/python/debug/cli/curses_ui_test.py | 21 ++++++++++++-
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/debug/cli/curses_ui.py b/tensorflow/python/debug/cli/curses_ui.py
index b7549b406b..d665627a93 100644
--- a/tensorflow/python/debug/cli/curses_ui.py
+++ b/tensorflow/python/debug/cli/curses_ui.py
@@ -124,7 +124,7 @@ class ScrollBar(object):
       raise ValueError("Insufficient height for ScrollBar (%d)" %
                        (self._max_y - self._min_y + 1))
 
-  def _block_y(self):
+  def _block_y(self, screen_coord_sys=False):
     """Get the 0-based y coordinate of the scroll block.
 
     This y coordinate takes into account the presence of the UP and DN buttons
@@ -132,9 +132,13 @@ class ScrollBar(object):
     location, the return value will be 1; at the bottom location, the return
     value will be self._scroll_bar_height - 2.
 
+    Args:
+      screen_coord_sys: (`bool`) whether the return value will be in the
+        screen coordinate system.
+
     Returns:
       (int) 0-based y coordinate of the scroll block, in the ScrollBar
-        coordinate system, i.e., not the screen coordinate system. For example,
+        coordinate system by default. For example,
         when scroll position is at the top, this return value will be 1 (not 0,
         because of the presence of the UP button). When scroll position is at
         the bottom, this return value will be self._scroll_bar_height - 2
@@ -142,8 +146,10 @@ class ScrollBar(object):
         button).
     """
 
-    return int(float(self._scroll_position) / (self._output_num_rows - 1) *
-               (self._scroll_bar_height - 3)) + 1
+    rel_block_y = int(
+        float(self._scroll_position) / (self._output_num_rows - 1) *
+        (self._scroll_bar_height - 3)) + 1
+    return rel_block_y + self._min_y if screen_coord_sys else rel_block_y
 
   def layout(self):
     """Get the RichTextLines layout of the scroll bar.
@@ -192,9 +198,11 @@ class ScrollBar(object):
       return _SCROLL_UP_A_LINE
     elif mouse_y == self._max_y:
       return _SCROLL_DOWN_A_LINE
-    elif mouse_y > self._block_y() and mouse_y < self._max_y:
+    elif (mouse_y > self._block_y(screen_coord_sys=True) and
+          mouse_y < self._max_y):
       return _SCROLL_DOWN
-    elif mouse_y < self._block_y() and mouse_y > self._min_y:
+    elif (mouse_y < self._block_y(screen_coord_sys=True) and
+          mouse_y > self._min_y):
       return _SCROLL_UP
     else:
       return None
@@ -505,7 +513,7 @@ class CursesUI(base_ui.BaseUI):
   def get_help(self):
     return self._command_handler_registry.get_help()
 
-  def _screen_create_command_textbox(self, existing_command):
+  def _screen_create_command_textbox(self, existing_command=None):
     """Create command textbox on screen.
 
     Args:
@@ -839,6 +847,7 @@ class CursesUI(base_ui.BaseUI):
         else:
           command = self._fetch_hyperlink_command(mouse_x, mouse_y)
           if command:
+            self._screen_create_command_textbox()
             exit_token = self._dispatch_command(command)
             if exit_token is not None:
               raise debugger_cli_common.CommandLineExit(exit_token=exit_token)
@@ -898,13 +907,14 @@ class CursesUI(base_ui.BaseUI):
     """Automatically key in a command to the command Textbox.
 
     Args:
-      command: The command, as a string.
+      command: The command, as a string or None.
       erase_existing: (bool) whether existing text (if any) is to be erased
           first.
     """
     if erase_existing:
       self._erase_existing_command()
 
+    command = command or ""
     for c in command:
       self._command_textbox.do_command(ord(c))
 
@@ -1227,9 +1237,9 @@ class CursesUI(base_ui.BaseUI):
 
     self._scroll_bar = ScrollBar(
         self._max_x - 2,
-        2,
+        3,
         self._max_x - 1,
-        self._output_num_rows,
+        self._output_num_rows + 1,
         self._output_pad_row,
         self._output_pad_height - self._output_pad_screen_height)
 
diff --git a/tensorflow/python/debug/cli/curses_ui_test.py b/tensorflow/python/debug/cli/curses_ui_test.py
index 8219f47ef3..15e1356d29 100644
--- a/tensorflow/python/debug/cli/curses_ui_test.py
+++ b/tensorflow/python/debug/cli/curses_ui_test.py
@@ -113,7 +113,7 @@ class MockCursesUI(curses_ui.CursesUI):
   def _screen_create_command_window(self):
     pass
 
-  def _screen_create_command_textbox(self, existing_command):
+  def _screen_create_command_textbox(self, existing_command=None):
     """Override to insert observer of existing commands.
 
     Used in testing of history navigation and tab completion.
@@ -1646,6 +1646,25 @@ class ScrollBarTest(test_util.TensorFlowTestCase):
                      scroll_bar.get_click_command(7))
     self.assertIsNone(scroll_bar.get_click_command(8))
 
+  def testClickCommandsAreCorrectForScrollBarNotAtZeroMinY(self):
+    scroll_bar = curses_ui.ScrollBar(0, 5, 1, 12, 10, 20)
+    self.assertIsNone(scroll_bar.get_click_command(0))
+    self.assertIsNone(scroll_bar.get_click_command(4))
+    self.assertEqual(curses_ui._SCROLL_UP_A_LINE,
+                     scroll_bar.get_click_command(5))
+    self.assertEqual(curses_ui._SCROLL_UP,
+                     scroll_bar.get_click_command(6))
+    self.assertEqual(curses_ui._SCROLL_UP,
+                     scroll_bar.get_click_command(7))
+    self.assertIsNone(scroll_bar.get_click_command(8))
+    self.assertEqual(curses_ui._SCROLL_DOWN,
+                     scroll_bar.get_click_command(10))
+    self.assertEqual(curses_ui._SCROLL_DOWN,
+                     scroll_bar.get_click_command(11))
+    self.assertEqual(curses_ui._SCROLL_DOWN_A_LINE,
+                     scroll_bar.get_click_command(12))
+    self.assertIsNone(scroll_bar.get_click_command(13))
+
 
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From 88289f3046f6a2bfbd352e02f8407402c0498d82 Mon Sep 17 00:00:00 2001
From: Derek Murray <derek.murray@gmail.com>
Date: Mon, 10 Apr 2017 08:29:32 -0700
Subject: [PATCH 0253/1563] Add Windows link to "Common installation problems"

The link we provide our users when `import tensorflow` fails only points to Linux and Mac OS. Add a link to the Windows instructions to match.
---
 tensorflow/docs_src/install/install_sources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 7d452feafa..16c410ef29 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -367,6 +367,7 @@ of one of the following guides:
 
   * @{$install_linux#CommonInstallationProblems$Installing TensorFlow on Linux}
   * @{$install_mac#CommonInstallationProblems$Installing TensorFlow on Mac OS}
+  * @{$install_windows#CommonInstallationProblems$Installing TensorFlow on Windows}
 
 Beyond the errors documented in those two guides, the following table
 notes additional errors specific to building TensorFlow.  Note that we
-- 
GitLab


From 1d3908c00fc3e1f8889cd0eeb021e276714232b0 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Mon, 10 Apr 2017 07:49:19 -0800
Subject: [PATCH 0254/1563] Remove obsolete use of validate_indices from
 embedding_ops.py

validate_indices is ignored, so it shouldn't appear in new code.
Change: 152691948
---
 .../layers/python/layers/embedding_ops.py     | 15 ++++--------
 tensorflow/core/ops/array_ops.cc              |  7 +++---
 tensorflow/python/ops/embedding_ops.py        | 23 +++++++++----------
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/embedding_ops.py b/tensorflow/contrib/layers/python/layers/embedding_ops.py
index b1a7f7ee59..f231ee3859 100644
--- a/tensorflow/contrib/layers/python/layers/embedding_ops.py
+++ b/tensorflow/contrib/layers/python/layers/embedding_ops.py
@@ -351,7 +351,7 @@ def _sampled_scattered_embedding_lookup(
     # No need to validate the indices since we have checked the params
     # dimensions and we know the largest id.
     result = embedding_ops.embedding_lookup(
-        params, ids, partition_strategy="div", validate_indices=False)
+        params, ids, partition_strategy="div")
 
     return array_ops.reshape(result,
                              array_ops.concat([values_shape, [dimension]], 0))
@@ -681,19 +681,17 @@ def embedding_lookup_sparse_with_distributed_aggregation(
     return embeddings
 
 
-def _do_gather(params, ids, validate_indices=True, name=None):
+def _do_gather(params, ids, name=None):
   """Deals with doing gather differently for resource variables."""
   if isinstance(params, resource_variable_ops.ResourceVariable):
     return params.sparse_read(ids, name=name)
-  return array_ops.gather(
-      params, ids, name=name, validate_indices=validate_indices)
+  return array_ops.gather(params, ids, name=name)
 
 
 def _embedding_lookup_with_distributed_aggregation(params,
                                                    ids,
                                                    partition_strategy="mod",
                                                    name=None,
-                                                   validate_indices=True,
                                                    max_norm=None,
                                                    weights=None,
                                                    idx=None,
@@ -724,8 +722,7 @@ def _embedding_lookup_with_distributed_aggregation(params,
       params = ops.convert_n_to_tensor_or_indexed_slices(params, name="params")
     if np == 1:
       with ops.colocate_with(params[0]):
-        ret = maybe_normalize(
-            _do_gather(params[0], ids, validate_indices=validate_indices))
+        ret = maybe_normalize(_do_gather(params[0], ids))
         ignore_weights = weights is None
         if not ignore_weights:
           if weights.dtype != ret.dtype:
@@ -803,9 +800,7 @@ def _embedding_lookup_with_distributed_aggregation(params,
       partitioned_result = []
       for p in xrange(np):
         with ops.colocate_with(params[p]):
-          partitioned_result.append(
-              _do_gather(
-                  params[p], gather_ids[p], validate_indices=validate_indices))
+          partitioned_result.append(_do_gather(params[p], gather_ids[p]))
 
       ignore_weights = weights is None
       if not ignore_weights:
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e2e07a4bf1..7f6afca5b6 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -488,7 +488,7 @@ REGISTER_OP("SplitV")
       ShapeHandle output_shape;
       const Tensor* size_splits = c->input_tensor(1);
       if (rank == InferenceContext::kUnknownRank) {
-        // If the rank of input tensor is unknown, then return unkown shapes.
+        // If the rank of input tensor is unknown, then return unknown shapes.
         output_shape = c->UnknownShape();
         for (int i = 0; i < num_outputs; ++i) {
           c->set_output(i, output_shape);
@@ -497,7 +497,7 @@ REGISTER_OP("SplitV")
         // Throw error if input is a scalar.
         return errors::InvalidArgument("Can't split scalars");
       } else if (size_splits == nullptr || !c->ValueKnown(split_dimension)) {
-        // If split dimension or tensor containing the split sizes is unkown,
+        // If split dimension or tensor containing the split sizes is unknown,
         // then return unknown shapes of same rank as input.
         output_shape = c->UnknownShapeOfRank(rank);
         for (int i = 0; i < num_outputs; ++i) {
@@ -1328,7 +1328,8 @@ this operation will permute `params` accordingly.
 
 `validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
 `indices` are always validated to be within range. If assigned to GPU,
-out-of-bound indices result in unspecified behavior (currently the result is
+out-of-bound indices result in safe but unspecified behavior, which may include
+raising an error.
 `0`, but this may become an error in the future).
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
diff --git a/tensorflow/python/ops/embedding_ops.py b/tensorflow/python/ops/embedding_ops.py
index 2aeb9ce14d..168ca7fefc 100644
--- a/tensorflow/python/ops/embedding_ops.py
+++ b/tensorflow/python/ops/embedding_ops.py
@@ -33,16 +33,16 @@ from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 
 
-def _do_gather(params, ids, validate_indices=True, name=None):
+def _do_gather(params, ids, name=None):
   """Deals with doing gather differently for resource variables."""
   if isinstance(params, resource_variable_ops.ResourceVariable):
     return params.sparse_read(ids, name=name)
-  return array_ops.gather(
-      params, ids, name=name, validate_indices=validate_indices)
+  return array_ops.gather(params, ids, name=name)
 
 
 def embedding_lookup(params, ids, partition_strategy="mod", name=None,
-                     validate_indices=True, max_norm=None):
+                     validate_indices=True,  # pylint: disable=unused-argument
+                     max_norm=None):
   """Looks up `ids` in a list of embedding tensors.
 
   This function is used to perform parallel lookups on the list of
@@ -82,7 +82,10 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
       if `len(params) > 1`. Currently `"div"` and `"mod"` are supported. Default
       is `"mod"`.
     name: A name for the operation (optional).
-    validate_indices: Whether or not to validate gather indices.
+    validate_indices: DEPRECATED. If this operation is assigned to CPU, values
+      in `indices` are always validated to be within range.  If assigned to GPU,
+      out-of-bound indices result in safe but unspecified behavior, which may
+      include raising an error.
     max_norm: If not None, embedding values are l2-normalized to the value of
      max_norm.
 
@@ -92,7 +95,7 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
   Raises:
     ValueError: If `params` is empty.
   """
-  if params is None or params == []:  # pylint: disable=g-explicit-bool-comparison
+  if params in (None, (), []):
     raise ValueError("Need at least one param")
   if isinstance(params, variables.PartitionedVariable):
     params = list(params)  # Iterate to get the underlying Variables.
@@ -114,9 +117,7 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
       params = ops.convert_n_to_tensor_or_indexed_slices(params, name="params")
     if np == 1:
       with ops.colocate_with(params[0]):
-        return maybe_normalize(
-            _do_gather(
-                params[0], ids, validate_indices=validate_indices, name=name))
+        return maybe_normalize(_do_gather(params[0], ids, name=name))
     else:
       ids = ops.convert_to_tensor(ids, name="ids")
       flat_ids = array_ops.reshape(ids, [-1])
@@ -176,9 +177,7 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
       partitioned_result = []
       for p in xrange(np):
         with ops.colocate_with(params[p]):
-          partitioned_result.append(
-              _do_gather(params[p], gather_ids[p],
-                         validate_indices=validate_indices))
+          partitioned_result.append(_do_gather(params[p], gather_ids[p]))
       # Stitch these back together
       ret = data_flow_ops.dynamic_stitch(pindices, partitioned_result,
                                          name=name)
-- 
GitLab


From eee5e79d14442ca741d7c90381b9922269337614 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 07:49:34 -0800
Subject: [PATCH 0255/1563] Preparation of using GMock matchers in XLA tests.
 Change: 152691970

---
 tensorflow/compiler/xla/BUILD                | 14 +++++-
 tensorflow/compiler/xla/literal_util_test.cc | 48 ++++++++------------
 tensorflow/compiler/xla/test.h               | 48 ++++++++++++++++++++
 3 files changed, 80 insertions(+), 30 deletions(-)
 create mode 100644 tensorflow/compiler/xla/test.h

diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index 35c0efb8f0..26ad8ac5f8 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -44,6 +44,17 @@ xla_proto_library(
     ],
 )
 
+cc_library(
+    name = "test",
+    testonly = 1,
+    hdrs = ["test.h"],
+    visibility = [":friends"],
+    deps = [
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:test",
+    ],
+)
+
 cc_library(
     name = "types",
     hdrs = ["types.h"],
@@ -256,10 +267,9 @@ cc_test(
         ":array4d",
         ":literal_util",
         ":shape_util",
-        ":test_helpers",
+        ":test",
         ":types",
         "//tensorflow/core:lib",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/literal_util_test.cc b/tensorflow/compiler/xla/literal_util_test.cc
index e53763376b..91971c3e24 100644
--- a/tensorflow/compiler/xla/literal_util_test.cc
+++ b/tensorflow/compiler/xla/literal_util_test.cc
@@ -21,14 +21,16 @@ limitations under the License.
 #include "tensorflow/compiler/xla/array4d.h"
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
 namespace {
 
+using ::testing::ElementsAre;
+using ::testing::ElementsAreArray;
+
 class LiteralUtilTest : public ::testing::Test {
  protected:
   LiteralUtilTest() {
@@ -159,9 +161,7 @@ TEST_F(LiteralUtilTest, CreateR3FromArray3d) {
   // clang-format on
 
   auto literal = LiteralUtil::CreateR3FromArray3D(array_3d);
-  EXPECT_MATCH(testing::PBToVec<tensorflow::protobuf_int64>(
-                   literal->shape().dimensions()),
-               testing::VectorMatcher<tensorflow::protobuf_int64>({2, 3, 2}));
+  EXPECT_THAT(literal->shape().dimensions(), ElementsAre(2, 3, 2));
   string result = LiteralUtil::ToString(*literal);
   const string expected = R"(f32[2,3,2] {
 { { 1, 2 },
@@ -182,9 +182,7 @@ TEST_F(LiteralUtilTest, LiteralR4F32ProjectedStringifies) {
     {2001, 2002},
   }, /*projection_p=*/1, /*projection_z=*/2);
   // clang-format on
-  EXPECT_MATCH(
-      testing::PBToVec(literal->shape().dimensions()),
-      testing::VectorMatcher<tensorflow::protobuf_int64>({1, 2, 3, 2}));
+  EXPECT_THAT(literal->shape().dimensions(), ElementsAre(1, 2, 3, 2));
   string result = LiteralUtil::ToString(*literal);
   const string expected = R"(f32[1,2,3,2] {
   {  // i0=0
@@ -204,10 +202,8 @@ TEST_F(LiteralUtilTest, LiteralR4F32ProjectedStringifies) {
 }
 
 TEST_F(LiteralUtilTest, LiteralR4F32Stringifies) {
-  EXPECT_MATCH(
-      testing::PBToVec<tensorflow::protobuf_int64>(
-          literal_r4_2x2x3x3_dim0major_->shape().dimensions()),
-      testing::VectorMatcher<tensorflow::protobuf_int64>({2, 2, 3, 3}));
+  EXPECT_THAT(literal_r4_2x2x3x3_dim0major_->shape().dimensions(),
+              ElementsAre(2, 2, 3, 3));
   string result = LiteralUtil::ToString(*literal_r4_2x2x3x3_dim0major_);
   const string expected = R"(f32[2,2,3,3] {
   {  // i0=0
@@ -516,27 +512,23 @@ TEST_F(LiteralUtilTest, TestR2LinearLayout) {
   auto mat_dim0minor = LiteralUtil::CreateR2WithLayout<int>(
       {{1, 2, 3}, {4, 5, 6}}, layout_r2_dim0minor_);
   EXPECT_EQ(mat_dim0minor->s32s_size(), 6);
-  EXPECT_MATCH(testing::PBToVec<int32>(mat_dim0minor->s32s()),
-               testing::VectorMatcher<int32>({1, 4, 2, 5, 3, 6}));
+  EXPECT_THAT(mat_dim0minor->s32s(), ElementsAre(1, 4, 2, 5, 3, 6));
 
   // Test expected memory layout when using Relayout to row major.
   auto relaid_mat_to_dim0major =
       LiteralUtil::Relayout(*mat_dim0minor, layout_r2_dim0major_);
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_mat_to_dim0major->s32s()),
-               testing::VectorMatcher<int32>({1, 2, 3, 4, 5, 6}));
+  EXPECT_THAT(relaid_mat_to_dim0major->s32s(), ElementsAre(1, 2, 3, 4, 5, 6));
 
   // Test expected memory layout of R2 created with dim0-major (row-major).
   auto mat_dim0major = LiteralUtil::CreateR2WithLayout<int>(
       {{1, 2, 3}, {4, 5, 6}}, layout_r2_dim0major_);
   EXPECT_EQ(mat_dim0major->s32s_size(), 6);
-  EXPECT_MATCH(testing::PBToVec<int32>(mat_dim0major->s32s()),
-               testing::VectorMatcher<int32>({1, 2, 3, 4, 5, 6}));
+  EXPECT_THAT(mat_dim0major->s32s(), ElementsAre(1, 2, 3, 4, 5, 6));
 
   // Test expected memory layout when using Relayout to column major.
   auto relaid_mat_to_dim0minor =
       LiteralUtil::Relayout(*mat_dim0major, layout_r2_dim0minor_);
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_mat_to_dim0minor->s32s()),
-               testing::VectorMatcher<int32>({1, 4, 2, 5, 3, 6}));
+  EXPECT_THAT(relaid_mat_to_dim0minor->s32s(), ElementsAre(1, 4, 2, 5, 3, 6));
 }
 
 TEST_F(LiteralUtilTest, TestR3LinearLayout) {
@@ -558,28 +550,28 @@ TEST_F(LiteralUtilTest, TestR3LinearLayout) {
 
   EXPECT_EQ(lit_dim0minor->s32s_size(), 12);
   std::vector<int> expected_dim0minor{1, 7, 4, 10, 2, 8, 5, 11, 3, 9, 6, 12};
-  EXPECT_MATCH(testing::PBToVec<int32>(lit_dim0minor->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0minor));
+  EXPECT_THAT(lit_dim0minor->s32s(),
+              testing::ElementsAreArray(expected_dim0minor));
 
   // Test expected memory layout when using Relayout to row major.
   auto relaid_lit_to_dim0major =
       LiteralUtil::Relayout(*lit_dim0minor, layout_r3_dim0major_);
   std::vector<int> expected_dim0major{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_lit_to_dim0major->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0major));
+  EXPECT_THAT(relaid_lit_to_dim0major->s32s(),
+              testing::ElementsAreArray(expected_dim0major));
 
   // Test expected memory layout of R3 created with dim0-major (row-major).
   auto lit_dim0major = LiteralUtil::CreateR3FromArray3DWithLayout<int>(
       arr3d, layout_r3_dim0major_);
   EXPECT_EQ(lit_dim0major->s32s_size(), 12);
-  EXPECT_MATCH(testing::PBToVec<int32>(lit_dim0major->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0major));
+  EXPECT_THAT(lit_dim0major->s32s(),
+              testing::ElementsAreArray(expected_dim0major));
 
   // Test expected memory layout when using Relayout to column major.
   auto relaid_lit_to_dim0minor =
       LiteralUtil::Relayout(*lit_dim0major, layout_r3_dim0minor_);
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_lit_to_dim0minor->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0minor));
+  EXPECT_THAT(relaid_lit_to_dim0minor->s32s(),
+              testing::ElementsAreArray(expected_dim0minor));
 }
 
 TEST_F(LiteralUtilTest, SliceR0S32) {
diff --git a/tensorflow/compiler/xla/test.h b/tensorflow/compiler/xla/test.h
new file mode 100644
index 0000000000..87a8c5f3a5
--- /dev/null
+++ b/tensorflow/compiler/xla/test.h
@@ -0,0 +1,48 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_COMPLIER_XLA_TEST_H_
+#define TENSORFLOW_COMPLIER_XLA_TEST_H_
+
+// This header includes gmock.h and enables the use of gmock matchers in tests
+// in third_party/tensorflow/compiler/xla.
+//
+// Test including this header can use the macros EXPECT_THAT(...) and
+// ASSERT_THAT(...) in combination with gmock matchers.
+// Example:
+//  std::vector<int> vec = Foo();
+//  EXPECT_THAT(vec, ::testing::ElementsAre(1,2,3));
+//
+// For more details on gmock matchers see:
+// https://github.com/google/googletest/blob/master/googlemock/docs/CheatSheet.md#matchers
+//
+// The advantages of using gmock matchers instead of self defined matchers are
+// better error messages, more maintainable tests and more test coverage.
+//
+// Note that while the use of gmock matchers is allowed in the xla project, the
+// use of mocks is disallowed in the whole tensorflow project!
+
+#include "tensorflow/core/platform/platform.h"
+
+#if defined(PLATFORM_GOOGLE) || defined(PLATFORM_GOOGLE_ANDROID)
+#include "testing/base/public/gmock.h"
+#else
+#include <gmock/gmock-generated-matchers.h>
+#include <gmock/gmock-matchers.h>
+#endif
+
+#include "tensorflow/core/platform/test.h"
+
+#endif  // TENSORFLOW_COMPLIER_XLA_TEST_H_
-- 
GitLab


From 2ec3e137898d05cc3013b61241b16ee93e66beca Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 08:46:05 -0800
Subject: [PATCH 0256/1563] Replace RuntimeException by RuntimeError in
 coordinator documentation. Change: 152697758

---
 tensorflow/python/training/coordinator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/training/coordinator.py b/tensorflow/python/training/coordinator.py
index 2863afb21e..fea2f8240e 100644
--- a/tensorflow/python/training/coordinator.py
+++ b/tensorflow/python/training/coordinator.py
@@ -106,7 +106,7 @@ class Coordinator(object):
   After a thread has called `coord.request_stop()` the other threads have a
   fixed time to stop, this is called the 'stop grace period' and defaults to 2
   minutes.  If any of the threads is still alive after the grace period expires
-  `coord.join()` raises a RuntimeException reporting the laggards.
+  `coord.join()` raises a RuntimeError reporting the laggards.
 
   ```python
   try:
@@ -117,7 +117,7 @@ class Coordinator(object):
     ...start thread N...(coord, ...)
     # Wait for all the threads to terminate, give them 10s grace period
     coord.join(threads, stop_grace_period_secs=10)
-  except RuntimeException:
+  except RuntimeError:
     ...one of the threads took more than 10s to stop after request_stop()
     ...was called.
   except Exception:
-- 
GitLab


From 9e940ec9f130065027796de3765f14d2dd863a13 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 09:05:22 -0800
Subject: [PATCH 0257/1563] Move the TensorBoard debugger plugin to be
 internal.

This feature is currently not open-source anyway.
Change: 152700267
---
 tensorflow/BUILD                              |   1 -
 tensorflow/contrib/cmake/tf_python.cmake      |   1 -
 tensorflow/tensorboard/BUILD                  |   2 +
 tensorflow/tensorboard/backend/BUILD          |   3 -
 tensorflow/tensorboard/backend/application.py |  28 +-
 .../tensorboard/backend/application_test.py   |  56 ++-
 tensorflow/tensorboard/plugins/debugger/BUILD |  55 ---
 .../plugins/debugger/debugger_plugin.py       | 355 ------------------
 .../plugins/debugger/debugger_plugin_test.py  | 300 ---------------
 tensorflow/tensorboard/tensorboard.py         |  26 +-
 10 files changed, 87 insertions(+), 740 deletions(-)
 delete mode 100644 tensorflow/tensorboard/plugins/debugger/BUILD
 delete mode 100644 tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
 delete mode 100644 tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 446d5431ec..a943b871bb 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -300,7 +300,6 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
-        "//tensorflow/tensorboard/plugins/debugger:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
         "//tensorflow/tensorboard/plugins/text:all_files",
         "//tensorflow/tensorboard/scripts:all_files",
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 39fbf603f0..178e03c222 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -212,7 +212,6 @@ add_python_module("tensorflow/tensorboard")
 add_python_module("tensorflow/tensorboard/backend")
 add_python_module("tensorflow/tensorboard/backend/event_processing")
 add_python_module("tensorflow/tensorboard/plugins")
-add_python_module("tensorflow/tensorboard/plugins/debugger")
 add_python_module("tensorflow/tensorboard/plugins/projector")
 add_python_module("tensorflow/tensorboard/plugins/text")
 add_python_module("tensorflow/tensorboard/scripts")
diff --git a/tensorflow/tensorboard/BUILD b/tensorflow/tensorboard/BUILD
index ea409a9312..9772538524 100644
--- a/tensorflow/tensorboard/BUILD
+++ b/tensorflow/tensorboard/BUILD
@@ -39,6 +39,8 @@ py_binary(
         "//tensorflow/python:platform",
         "//tensorflow/tensorboard/backend:application",
         "//tensorflow/tensorboard/backend/event_processing:event_file_inspector",
+        "//tensorflow/tensorboard/plugins/projector:projector_plugin",
+        "//tensorflow/tensorboard/plugins/text:text_plugin",
         "@org_pocoo_werkzeug//:werkzeug",
     ],
 )
diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD
index 4e1db85374..d27a22a82b 100644
--- a/tensorflow/tensorboard/backend/BUILD
+++ b/tensorflow/tensorboard/backend/BUILD
@@ -65,9 +65,6 @@ py_library(
         "//tensorflow/python:platform",
         "//tensorflow/tensorboard/backend/event_processing:event_accumulator",
         "//tensorflow/tensorboard/backend/event_processing:event_multiplexer",
-        "//tensorflow/tensorboard/plugins/debugger:debugger_plugin",
-        "//tensorflow/tensorboard/plugins/projector:projector_plugin",
-        "//tensorflow/tensorboard/plugins/text:text_plugin",
         "@org_pocoo_werkzeug//:werkzeug",
         "@six_archive//:six",
     ],
diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index 974762822f..3c8963e302 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -43,9 +43,6 @@ from tensorflow.tensorboard.backend import http_util
 from tensorflow.tensorboard.backend import process_graph
 from tensorflow.tensorboard.backend.event_processing import event_accumulator
 from tensorflow.tensorboard.backend.event_processing import event_multiplexer
-from tensorflow.tensorboard.plugins.debugger import debugger_plugin
-from tensorflow.tensorboard.plugins.projector import projector_plugin
-from tensorflow.tensorboard.plugins.text import text_plugin
 
 
 DEFAULT_SIZE_GUIDANCE = {
@@ -97,18 +94,27 @@ class _OutputFormat(object):
   CSV = 'csv'
 
 
-def standard_tensorboard_wsgi(logdir, purge_orphaned_data, reload_interval):
-  """Construct a TensorBoardWSGIApp with standard plugins and multiplexer."""
+def standard_tensorboard_wsgi(
+    logdir,
+    purge_orphaned_data,
+    reload_interval,
+    plugins):
+  """Construct a TensorBoardWSGIApp with standard plugins and multiplexer.
+
+  Args:
+    logdir: The path to the directory containing events files.
+    purge_orphaned_data: Whether to purge orphaned data.
+    reload_interval: The interval at which the backend reloads more data in
+        seconds.
+    plugins: A list of plugins for TensorBoard to initialize.
+
+  Returns:
+    The new TensorBoard WSGI application.
+  """
   multiplexer = event_multiplexer.EventMultiplexer(
       size_guidance=DEFAULT_SIZE_GUIDANCE,
       purge_orphaned_data=purge_orphaned_data)
 
-  plugins = [
-      debugger_plugin.DebuggerPlugin(),
-      projector_plugin.ProjectorPlugin(),
-      text_plugin.TextPlugin(),
-  ]
-
   return TensorBoardWSGIApp(logdir, plugins, multiplexer, reload_interval)
 
 
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 002709cd5b..a5181401fa 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -54,15 +54,18 @@ from tensorflow.tensorboard.plugins import base_plugin
 class FakePlugin(base_plugin.TBPlugin):
   """A plugin with no functionality."""
 
-  def __init__(self, plugin_name, is_active_value):
+  def __init__(self, plugin_name, is_active_value, routes_mapping):
     """Constructs a fake plugin.
 
     Args:
       plugin_name: The name of this plugin.
       is_active_value: Whether the plugin is active.
+      routes_mapping: A dictionary mapping from route (string URL path) to the
+        method called when a user issues a request to that route.
     """
     self.plugin_name = plugin_name
     self._is_active_value = is_active_value
+    self._routes_mapping = routes_mapping
 
   def get_plugin_apps(self, multiplexer, logdir):
     """Returns a mapping from routes to handlers offered by this plugin.
@@ -72,9 +75,9 @@ class FakePlugin(base_plugin.TBPlugin):
       logdir: The path to the directory containing logs.
 
     Returns:
-      An empty dict. This plugin offers no routes.
+      A dictionary mapping from routes to handlers offered by this plugin.
     """
-    return {}
+    return self._routes_mapping
 
   def is_active(self):
     """Returns whether this plugin is active.
@@ -97,8 +100,8 @@ class TensorboardServerTest(test.TestCase):
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
     plugins = [
-        FakePlugin(plugin_name='foo', is_active_value=True),
-        FakePlugin(plugin_name='bar', is_active_value=False)
+        FakePlugin(plugin_name='foo', is_active_value=True, routes_mapping={}),
+        FakePlugin(plugin_name='bar', is_active_value=False, routes_mapping={})
     ]
     app = application.TensorBoardWSGIApp(
         self.temp_dir, plugins, multiplexer, reload_interval=0)
@@ -476,10 +479,41 @@ class TensorBoardAssetsTest(test.TestCase):
   def testTagFound(self):
     tag = application.get_tensorboard_tag()
     self.assertTrue(tag)
-    app = application.standard_tensorboard_wsgi('', True, 60)
+    app = application.standard_tensorboard_wsgi('', True, 60, [])
     self.assertEqual(app.tag, tag)
 
 
+class TensorBoardPluginsTest(test.TestCase):
+
+  def testPluginsAdded(self):
+
+    def foo_handler():
+      pass
+
+    def bar_handler():
+      pass
+
+    plugins = [
+        FakePlugin(
+            plugin_name='foo',
+            is_active_value=True,
+            routes_mapping={'/foo_route': foo_handler}),
+        FakePlugin(
+            plugin_name='bar',
+            is_active_value=True,
+            routes_mapping={'/bar_route': bar_handler}),
+    ]
+
+    # The application should have added routes for both plugins.
+    app = application.standard_tensorboard_wsgi('', True, 60, plugins)
+
+    # The routes are prefixed with /data/plugin/[plugin name].
+    self.assertDictContainsSubset({
+        '/data/plugin/foo/foo_route': foo_handler,
+        '/data/plugin/bar/bar_route': bar_handler,
+    }, app.data_applications)
+
+
 class TensorboardSimpleServerConstructionTest(test.TestCase):
   """Tests that the default HTTP server is constructed without error.
 
@@ -533,14 +567,18 @@ class TensorBoardApplcationConstructionTest(test.TestCase):
     # Fails if there is an unnamed plugin
     with self.assertRaises(ValueError):
       # This plugin lacks a name.
-      plugins = [FakePlugin(plugin_name=None, is_active_value=True)]
+      plugins = [
+          FakePlugin(plugin_name=None, is_active_value=True, routes_mapping={})
+      ]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
     # Fails if there are two plugins with same name
     with self.assertRaises(ValueError):
       plugins = [
-          FakePlugin(plugin_name='foo', is_active_value=True),
-          FakePlugin(plugin_name='foo', is_active_value=True),
+          FakePlugin(
+              plugin_name='foo', is_active_value=True, routes_mapping={}),
+          FakePlugin(
+              plugin_name='foo', is_active_value=True, routes_mapping={}),
       ]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
diff --git a/tensorflow/tensorboard/plugins/debugger/BUILD b/tensorflow/tensorboard/plugins/debugger/BUILD
deleted file mode 100644
index 38aa719b9b..0000000000
--- a/tensorflow/tensorboard/plugins/debugger/BUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Description:
-# TensorBoard plugin for interacting with tfdbg, the TensorFlow debugger
-
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-load("//tensorflow:tensorflow.bzl", "py_test")
-
-## TensorFlow Debugger Plugiin ##
-py_library(
-    name = "debugger_plugin",
-    srcs = ["debugger_plugin.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        "//tensorflow/python:framework",
-        "//tensorflow/python:platform",
-        "//tensorflow/tensorboard/backend:http_util",
-        "//tensorflow/tensorboard/backend/event_processing:event_accumulator",
-        "//tensorflow/tensorboard/backend/event_processing:event_file_loader",
-        "//tensorflow/tensorboard/plugins:base_plugin",
-    ],
-)
-
-py_test(
-    name = "debugger_plugin_test",
-    size = "small",
-    srcs = ["debugger_plugin_test.py"],
-    main = "debugger_plugin_test.py",
-    srcs_version = "PY2AND3",
-    tags = ["no_pip"],
-    deps = [
-        ":debugger_plugin",
-        "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:pywrap_tensorflow",
-        "//tensorflow/python:util",
-        "//tensorflow/tensorboard/backend:application",
-        "//tensorflow/tensorboard/backend/event_processing:event_multiplexer",
-        "//third_party/py/numpy",
-        "@org_pocoo_werkzeug//:werkzeug",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        [
-            "*",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
deleted file mode 100644
index 5d34bb91db..0000000000
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""The plugin for serving data from a TensorFlow debugger."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import collections
-import glob
-import json
-import os
-import re
-
-from werkzeug import wrappers
-
-from tensorflow.python.framework import tensor_util
-from tensorflow.python.platform import tf_logging as logging
-from tensorflow.tensorboard.backend import http_util
-from tensorflow.tensorboard.backend.event_processing import event_accumulator
-from tensorflow.tensorboard.backend.event_processing import event_file_loader
-from tensorflow.tensorboard.plugins import base_plugin
-
-# The prefix of routes provided by this plugin.
-_PLUGIN_PREFIX_ROUTE = 'debugger'
-
-# HTTP routes.
-_HEALTH_PILLS_ROUTE = '/health_pills'
-
-# The POST key of HEALTH_PILLS_ROUTE for a JSON list of node names.
-_NODE_NAMES_POST_KEY = 'node_names'
-
-# The POST key of HEALTH_PILLS_ROUTE for the run to retrieve health pills for.
-_RUN_POST_KEY = 'run'
-
-# The default run to retrieve health pills for.
-_DEFAULT_RUN = '.'
-
-# The POST key of HEALTH_PILLS_ROUTE for the specific step to retrieve health
-# pills for.
-_STEP_POST_KEY = 'step'
-
-# A glob pattern for files containing debugger-related events.
-_DEBUGGER_EVENTS_GLOB_PATTERN = 'events.debugger*'
-
-
-class DebuggerPlugin(base_plugin.TBPlugin):
-  """TensorFlow Debugger plugin. Receives requests for debugger-related data.
-
-  That data could include health pills, which unveil the status of tensor
-  values.
-  """
-
-  plugin_name = _PLUGIN_PREFIX_ROUTE
-
-  def get_plugin_apps(self, multiplexer, logdir):
-    """Obtains a mapping between routes and handlers. Stores the logdir.
-
-    Args:
-      multiplexer: The EventMultiplexer that provides TB data.
-      logdir: The logdir string - the directory of events files.
-
-    Returns:
-      A mapping between routes and handlers (functions that respond to
-      requests).
-    """
-    self._event_multiplexer = multiplexer
-    self._logdir = logdir
-    return {
-        _HEALTH_PILLS_ROUTE: self._serve_health_pills_handler,
-    }
-
-  def is_active(self):
-    """Determines whether this plugin is active.
-
-    This plugin is active if any health pills information is present for any
-    run. This method must be called only after get_plugin_apps has been called.
-
-    Returns:
-      A boolean. Whether this plugin is active.
-    """
-    for run_name in self._event_multiplexer.Runs():
-      if self._event_multiplexer.GetOpsWithHealthPills(run_name):
-        return True
-
-    return False
-
-  @wrappers.Request.application
-  def _serve_health_pills_handler(self, request):
-    """A (wrapped) werkzeug handler for serving health pills.
-
-    Accepts POST requests and responds with health pills. The request accepts
-    several POST parameters:
-
-      node_names: (required string) A JSON-ified list of node names for which
-          the client would like to request health pills.
-      run: (optional string) The run to retrieve health pills for. Defaults to
-          '.'. This data is sent via POST (not GET) since URL length is limited.
-      step: (optional integer): The session run step for which to
-          retrieve health pills. If provided, the handler reads the health pills
-          of that step from disk (which is slow) and produces a response with
-          only health pills at that step. If not provided, the handler returns a
-          response with health pills at all steps sampled by the event
-          multiplexer (the fast path). The motivation here is that, sometimes,
-          one desires to examine health pills at a specific step (to say find
-          the first step that causes a model to blow up with NaNs).
-          get_plugin_apps must be called before this slower feature is used
-          because that method passes the logdir (directory path) to this plugin.
-
-    This handler responds with a JSON-ified object mapping from node names to a
-    list (of size 1) of health pill event objects, each of which has these
-    properties.
-
-    {
-        'wall_time': float,
-        'step': int,
-        'node_name': string,
-        'output_slot': int,
-        # A list of 12 floats that summarizes the elements of the tensor.
-        'value': float[],
-    }
-
-    Node names for which there are no health pills to be found are excluded from
-    the mapping.
-
-    Args:
-      request: The request issued by the client for health pills.
-
-    Returns:
-      A werkzeug BaseResponse object.
-    """
-    if request.method != 'POST':
-      logging.error(
-          '%s requests are forbidden by the debugger plugin.', request.method)
-      return wrappers.Response(status=405)
-
-    if _NODE_NAMES_POST_KEY not in request.form:
-      logging.error(
-          'The %r POST key was not found in the request for health pills.',
-          _NODE_NAMES_POST_KEY)
-      return wrappers.Response(status=400)
-
-    jsonified_node_names = request.form[_NODE_NAMES_POST_KEY]
-    try:
-      node_names = json.loads(jsonified_node_names)
-    except Exception as e:  # pylint: disable=broad-except
-      # Different JSON libs raise different exceptions, so we just do a
-      # catch-all here. This problem is complicated by how Tensorboard might be
-      # run in many different environments, as it is open-source.
-      logging.error('Could not decode node name JSON string %r: %s',
-                    jsonified_node_names, e)
-      return wrappers.Response(status=400)
-
-    if not isinstance(node_names, list):
-      logging.error('%r is not a JSON list of node names:',
-                    jsonified_node_names)
-      return wrappers.Response(status=400)
-
-    run = request.form.get(_RUN_POST_KEY, _DEFAULT_RUN)
-    step_string = request.form.get(_STEP_POST_KEY, None)
-    if step_string is None:
-      # Use all steps sampled by the event multiplexer (Relatively fast).
-      mapping = self._obtain_sampled_health_pills(run, node_names)
-    else:
-      # Read disk to obtain the health pills for that step (Relatively slow).
-      # Make sure that the directory for the run exists.
-      # Determine the directory of events file to read.
-      events_directory = self._logdir
-      if run != _DEFAULT_RUN:
-        # Use the directory for the specific run.
-        events_directory = os.path.join(events_directory, run)
-
-      step = int(step_string)
-      try:
-        mapping = self._obtain_health_pills_at_step(
-            events_directory, node_names, step)
-      except IOError as error:
-        logging.error(
-            'Error retrieving health pills for step %d: %s', step, error)
-        return wrappers.Response(status=404)
-
-    # Convert event_accumulator.HealthPillEvents to JSON-able dicts.
-    jsonable_mapping = {}
-    for node_name, events in mapping.items():
-      jsonable_mapping[node_name] = [e._asdict() for e in events]
-    return http_util.Respond(request, jsonable_mapping, 'application/json')
-
-  def _obtain_sampled_health_pills(self, run, node_names):
-    """Obtains the health pills for a run sampled by the event multiplexer.
-
-    This is much faster than the alternative path of reading health pills from
-    disk.
-
-    Args:
-      run: The run to fetch health pills for.
-      node_names: A list of node names for which to retrieve health pills.
-
-    Returns:
-      A dictionary mapping from node name to a list of
-      event_accumulator.HealthPillEvents.
-    """
-    mapping = {}
-    for node_name in node_names:
-      try:
-        mapping[node_name] = self._event_multiplexer.HealthPills(run, node_name)
-      except KeyError:
-        logging.info('No health pills found for node %r.', node_name)
-        continue
-
-    return mapping
-
-  def _obtain_health_pills_at_step(self, events_directory, node_names, step):
-    """Reads disk to obtain the health pills for a run at a specific step.
-
-    This could be much slower than the alternative path of just returning all
-    health pills sampled by the event multiplexer. It could take tens of minutes
-    to complete this call for large graphs for big step values (in the
-    thousands).
-
-    Args:
-      events_directory: The directory containing events for the desired run.
-      node_names: A list of node names for which to retrieve health pills.
-      step: The step to obtain health pills for.
-
-    Returns:
-      A dictionary mapping from node name to a list of health pill objects (see
-      docs for _serve_health_pills_handler for properties of those objects).
-
-    Raises:
-      IOError: If no files with health pill events could be found.
-    """
-    # Obtain all files with debugger-related events.
-    pattern = os.path.join(events_directory, _DEBUGGER_EVENTS_GLOB_PATTERN)
-    file_paths = glob.glob(pattern)
-
-    if not file_paths:
-      raise IOError(
-          'No events files found that matches the pattern %r.', pattern)
-
-    # Sort by name (and thus by timestamp).
-    file_paths.sort()
-
-    mapping = collections.defaultdict(list)
-    node_name_set = frozenset(node_names)
-
-    for file_path in file_paths:
-      should_stop = self._process_health_pill_event(
-          node_name_set, mapping, step, file_path)
-      if should_stop:
-        break
-
-    return mapping
-
-  def _process_health_pill_event(self, node_name_set, mapping, target_step,
-                                 file_path):
-    """Creates health pills out of data in an event.
-
-    Creates health pills out of the event and adds them to the mapping.
-
-    Args:
-      node_name_set: A set of node names that are relevant.
-      mapping: The mapping from node name to event_accumulator.HealthPillEvents.
-          This object may be destructively modified.
-      target_step: The target step at which to obtain health pills.
-      file_path: The path to the file with health pill events.
-
-    Returns:
-      Whether we should stop reading events because future events are no longer
-      relevant.
-    """
-    events_loader = event_file_loader.EventFileLoader(file_path)
-    for event in events_loader.Load():
-      if not event.HasField('summary'):
-        logging.warning('An event in a debugger events file lacks a summary.')
-        continue
-
-      if event.step < target_step:
-        # This event is not of the relevant step. We perform this check
-        # first because the majority of events will be eliminated from
-        # consideration by this check.
-        continue
-
-      if event.step > target_step:
-        # We have passed the relevant step. No need to read more events.
-        return True
-
-      for value in event.summary.value:
-        # Since we seek health pills for a specific step, this function
-        # returns 1 health pill per node per step. The wall time is the
-        # seconds since the epoch.
-        health_pill = self._process_health_pill_value(
-            node_name_set, event.wall_time, event.step, value)
-        if not health_pill:
-          continue
-        mapping[health_pill.node_name].append(health_pill)
-
-    # Keep reading events.
-    return False
-
-  def _process_health_pill_value(self, node_name_set, wall_time, step, value):
-    """Creates a dict containing various properties of a health pill.
-
-    Args:
-      node_name_set: A set of node names that are relevant.
-      wall_time: The wall time in seconds.
-      step: The session run step of the event.
-      value: The health pill value.
-
-    Returns:
-      An event_accumulator.HealthPillEvent. Or None if one could not be created.
-    """
-    if not value.HasField('tensor'):
-      logging.warning(
-          'An event in a debugger events file lacks a tensor value.')
-      return None
-
-    if value.tag != event_accumulator.HEALTH_PILL_EVENT_TAG:
-      logging.warning(
-          ('A debugger-related event lacks the %r tag. It instead has '
-           'the %r tag.'), event_accumulator.HEALTH_PILL_EVENT_TAG, value.tag)
-      return None
-
-    match = re.match(r'^(.*):(\d+):DebugNumericSummary$', value.node_name)
-    if not match:
-      logging.warning(
-          ('A event with a health pill has an invalid watch, (i.e., an '
-           'unexpected debug op): %r'), value.node_name)
-      return None
-
-    node_name = match.group(1)
-    if node_name not in node_name_set:
-      # This event is not relevant.
-      return None
-
-    # Since we seek health pills for a specific step, this function
-    # returns 1 health pill per node per step. The wall time is the
-    # seconds since the epoch.
-    return event_accumulator.HealthPillEvent(
-        wall_time=wall_time,
-        step=step,
-        node_name=node_name,
-        output_slot=int(match.group(2)),
-        value=list(tensor_util.MakeNdarray(value.tensor)))
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
deleted file mode 100644
index f1cc2e06da..0000000000
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Tests the Tensorboard debugger data plugin."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import collections
-import json
-import os
-import shutil
-
-import numpy as np
-from werkzeug import test as werkzeug_test
-from werkzeug import wrappers
-
-from tensorflow.core.framework import types_pb2
-from tensorflow.core.util import event_pb2
-from tensorflow.python import pywrap_tensorflow
-from tensorflow.python.platform import test
-from tensorflow.python.util import compat
-from tensorflow.tensorboard.backend import application
-from tensorflow.tensorboard.backend.event_processing import event_multiplexer
-from tensorflow.tensorboard.plugins.debugger import debugger_plugin
-
-
-class DebuggerPluginTest(test.TestCase):
-
-  def setUp(self):
-    # Populate the log directory with debugger event for run '.'.
-    self.log_dir = self.get_temp_dir()
-    file_prefix = compat.as_bytes(os.path.join(self.log_dir, 'events.debugger'))
-    writer = pywrap_tensorflow.EventsWriter(file_prefix)
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='layers/Matmul',
-            output_slot=0,
-            wall_time=42,
-            step=2,
-            list_of_values=[1, 2, 3]))
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='layers/Matmul',
-            output_slot=1,
-            wall_time=43,
-            step=7,
-            list_of_values=[4, 5, 6]))
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='logits/Add',
-            output_slot=0,
-            wall_time=1337,
-            step=7,
-            list_of_values=[7, 8, 9]))
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='logits/Add',
-            output_slot=0,
-            wall_time=1338,
-            step=8,
-            list_of_values=[10, 11, 12]))
-    writer.Close()
-
-    # Populate the log directory with debugger event for run 'run_foo'.
-    run_foo_directory = os.path.join(self.log_dir, 'run_foo')
-    os.mkdir(run_foo_directory)
-    file_prefix = compat.as_bytes(
-        os.path.join(run_foo_directory, 'events.debugger'))
-    writer = pywrap_tensorflow.EventsWriter(file_prefix)
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='layers/Variable',
-            output_slot=0,
-            wall_time=4242,
-            step=42,
-            list_of_values=[13, 14, 15]))
-    writer.Close()
-
-    # Start a server that will receive requests and respond with health pills.
-    self.multiplexer = event_multiplexer.EventMultiplexer({
-        '.': self.log_dir,
-        'run_foo': run_foo_directory,
-    })
-    self.plugin = debugger_plugin.DebuggerPlugin()
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [self.plugin],
-        self.multiplexer,
-        reload_interval=0)
-    self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
-
-  def tearDown(self):
-    # Remove the directory with debugger-related events files.
-    shutil.rmtree(self.log_dir, ignore_errors=True)
-
-  def _CreateEventWithDebugNumericSummary(
-      self, op_name, output_slot, wall_time, step, list_of_values):
-    """Creates event with a health pill summary.
-
-    Args:
-      op_name: The name of the op to which a DebugNumericSummary was attached.
-      output_slot: The numeric output slot for the tensor.
-      wall_time: The numeric wall time of the event.
-      step: The step of the event.
-      list_of_values: A python list of values within the tensor.
-
-    Returns:
-      A event_pb2.Event with a health pill summary.
-    """
-    event = event_pb2.Event(step=step, wall_time=wall_time)
-    value = event.summary.value.add(
-        tag='__health_pill__',
-        node_name='%s:%d:DebugNumericSummary' % (op_name, output_slot))
-    value.tensor.tensor_shape.dim.add(size=len(list_of_values))
-    value.tensor.dtype = types_pb2.DT_DOUBLE
-    value.tensor.tensor_content = np.array(
-        list_of_values, dtype=np.float64).tobytes()
-    return event
-
-  def _DeserializeResponse(self, byte_content):
-    """Deserializes byte content that is a JSON encoding.
-
-    Args:
-      byte_content: The byte content of a JSON response.
-
-    Returns:
-      The deserialized python object decoded from JSON.
-    """
-    return json.loads(byte_content.decode('utf-8'))
-
-  def testHealthPillsRouteProvided(self):
-    """Tests that the plugin offers the route for requesting health pills."""
-    apps = self.plugin.get_plugin_apps(self.multiplexer, self.log_dir)
-    self.assertIn('/health_pills', apps)
-    self.assertIsInstance(apps['/health_pills'], collections.Callable)
-
-  def testHealthPillsPluginIsActive(self):
-    self.plugin.get_plugin_apps(self.multiplexer, self.log_dir)
-
-    # The multiplexer has sampled health pills.
-    self.assertTrue(self.plugin.is_active())
-
-  def testHealthPillsPluginIsInactive(self):
-    self.plugin.get_plugin_apps(
-        event_multiplexer.EventMultiplexer({}), self.log_dir)
-
-    # The multiplexer lacks sampled health pills.
-    self.assertFalse(self.plugin.is_active())
-
-  def testRequestHealthPillsForRunFoo(self):
-    """Tests that the plugin produces health pills for a specified run."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['layers/Variable', 'unavailable_node']),
-            'run': 'run_foo',
-        })
-    self.assertEqual(200, response.status_code)
-    self.assertDictEqual({
-        'layers/Variable': [{
-            'wall_time': 4242,
-            'step': 42,
-            'node_name': 'layers/Variable',
-            'output_slot': 0,
-            'value': [13, 14, 15],
-        }],
-    }, self._DeserializeResponse(response.get_data()))
-
-  def testRequestHealthPillsForDefaultRun(self):
-    """Tests that the plugin produces health pills for the default '.' run."""
-    # Do not provide a 'run' parameter in POST data.
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['logits/Add', 'unavailable_node']),
-        })
-    self.assertEqual(200, response.status_code)
-    # The health pills for 'layers/Matmul' should not be included since the
-    # request excluded that node name.
-    self.assertDictEqual({
-        'logits/Add': [
-            {
-                'wall_time': 1337,
-                'step': 7,
-                'node_name': 'logits/Add',
-                'output_slot': 0,
-                'value': [7, 8, 9],
-            },
-            {
-                'wall_time': 1338,
-                'step': 8,
-                'node_name': 'logits/Add',
-                'output_slot': 0,
-                'value': [10, 11, 12],
-            },
-        ],
-    }, self._DeserializeResponse(response.get_data()))
-
-  def testGetRequestsUnsupported(self):
-    """Tests that GET requests are unsupported."""
-    response = self.server.get('/data/plugin/debugger/health_pills')
-    self.assertEqual(405, response.status_code)
-
-  def testRequestsWithoutProperPostKeyUnsupported(self):
-    """Tests that requests lacking the node_names POST key are unsupported."""
-    response = self.server.post('/data/plugin/debugger/health_pills')
-    self.assertEqual(400, response.status_code)
-
-  def testRequestsWithBadJsonUnsupported(self):
-    """Tests that requests with undecodable JSON are unsupported."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': 'some obviously non JSON text',
-        })
-    self.assertEqual(400, response.status_code)
-
-  def testRequestsWithNonListPostDataUnsupported(self):
-    """Tests that requests with loads lacking lists of ops are unsupported."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps({
-                'this is a dict': 'and not a list.'
-            }),
-        })
-    self.assertEqual(400, response.status_code)
-
-  def testFetchHealthPillsForSpecificStep(self):
-    """Tests that requesting health pills at a specific steps works.
-
-    This path may be slow in real life because it reads from disk.
-    """
-    # Request health pills for these nodes at step 7 specifically.
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['logits/Add', 'layers/Matmul']),
-            'step': 7
-        })
-    self.assertEqual(200, response.status_code)
-    # The response should only include health pills at step 7.
-    self.assertDictEqual({
-        'logits/Add': [
-            {
-                'wall_time': 1337,
-                'step': 7,
-                'node_name': 'logits/Add',
-                'output_slot': 0,
-                'value': [7, 8, 9],
-            },
-        ],
-        'layers/Matmul': [
-            {
-                'wall_time': 43,
-                'step': 7,
-                'node_name': 'layers/Matmul',
-                'output_slot': 1,
-                'value': [4, 5, 6],
-            },
-        ],
-    }, self._DeserializeResponse(response.get_data()))
-
-  def testNoHealthPillsForSpecificStep(self):
-    """Tests that an empty mapping is returned for no health pills at a step."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['some/clearly/non-existent/op']),
-            'step': 7
-        })
-    self.assertEqual(200, response.status_code)
-    self.assertDictEqual({}, self._DeserializeResponse(response.get_data()))
-
-  def testNoHealthPillsForOutOfRangeStep(self):
-    """Tests that an empty mapping is returned for an out of range step."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['logits/Add', 'layers/Matmul']),
-            # This step higher than that of any event written to disk.
-            'step': 42424242
-        })
-    self.assertEqual(200, response.status_code)
-    self.assertDictEqual({}, self._DeserializeResponse(response.get_data()))
-
-if __name__ == '__main__':
-  test.main()
diff --git a/tensorflow/tensorboard/tensorboard.py b/tensorflow/tensorboard/tensorboard.py
index f3900d1e5d..f371a01f35 100644
--- a/tensorflow/tensorboard/tensorboard.py
+++ b/tensorflow/tensorboard/tensorboard.py
@@ -32,7 +32,8 @@ from tensorflow.python.platform import flags
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.tensorboard.backend import application
 from tensorflow.tensorboard.backend.event_processing import event_file_inspector as efi
-
+from tensorflow.tensorboard.plugins.projector import projector_plugin
+from tensorflow.tensorboard.plugins.text import text_plugin
 
 # TensorBoard flags
 
@@ -88,8 +89,18 @@ flags.DEFINE_string(
 FLAGS = flags.FLAGS
 
 
-def create_tb_app():
-  """Read the flags, and create a TensorBoard WSGI application."""
+def create_tb_app(plugins):
+  """Read the flags, and create a TensorBoard WSGI application.
+
+  Args:
+    plugins: A list of plugins for TensorBoard to initialize.
+
+  Raises:
+    ValueError: if a logdir is not specified.
+
+  Returns:
+    A new TensorBoard WSGI application.
+  """
   if not FLAGS.logdir:
     raise ValueError('A logdir must be specified. Run `tensorboard --help` for '
                      'details and examples.')
@@ -98,7 +109,8 @@ def create_tb_app():
   return application.standard_tensorboard_wsgi(
       logdir=logdir,
       purge_orphaned_data=FLAGS.purge_orphaned_data,
-      reload_interval=FLAGS.reload_interval)
+      reload_interval=FLAGS.reload_interval,
+      plugins=plugins)
 
 
 def make_simple_server(tb_app, host, port):
@@ -184,7 +196,11 @@ def main(unused_argv=None):
     efi.inspect(FLAGS.logdir, event_file, FLAGS.tag)
     return 0
   else:
-    tb = create_tb_app()
+    plugins = [
+        projector_plugin.ProjectorPlugin(),
+        text_plugin.TextPlugin(),
+    ]
+    tb = create_tb_app(plugins)
     run_simple_server(tb)
 
 if __name__ == '__main__':
-- 
GitLab


From ff2ff28c959c9b1af8d412775abdb7fc86d073fa Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 09:10:59 -0800
Subject: [PATCH 0258/1563] Add a single-machine tf.learn Estimator
 implementation for the WALS solver. Change: 152700915

---
 tensorflow/contrib/factorization/BUILD        |   1 +
 .../python/ops/factorization_ops.py           |  27 +-
 .../contrib/factorization/python/ops/wals.py  | 321 ++++++++++++++++++
 .../factorization/python/ops/wals_test.py     | 305 ++++++++++++++++-
 4 files changed, 640 insertions(+), 14 deletions(-)

diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index 7f359bea51..8dc78da6ba 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -202,6 +202,7 @@ tf_py_test(
     additional_deps = [
         ":factorization_py",
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
+        ":factorization_ops_test_utils_py",
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
diff --git a/tensorflow/contrib/factorization/python/ops/factorization_ops.py b/tensorflow/contrib/factorization/python/ops/factorization_ops.py
index b853652629..8fb33dad6f 100644
--- a/tensorflow/contrib/factorization/python/ops/factorization_ops.py
+++ b/tensorflow/contrib/factorization/python/ops/factorization_ops.py
@@ -190,7 +190,8 @@ class WALSModel(object):
                num_col_shards=1,
                row_weights=1,
                col_weights=1,
-               use_factors_weights_cache=True):
+               use_factors_weights_cache=True,
+               use_gramian_cache=True):
     """Creates model for WALS matrix factorization.
 
     Args:
@@ -224,6 +225,8 @@ class WALSModel(object):
       col_weights: See row_weights.
       use_factors_weights_cache: When True, the factors and weights will be
         cached on the workers before the updates start. Defaults to True.
+      use_gramian_cache: When True, the Gramians will be cached on the workers
+        before the updates start. Defaults to True.
     """
     self._input_rows = input_rows
     self._input_cols = input_cols
@@ -243,6 +246,7 @@ class WALSModel(object):
                                                   self._num_col_shards,
                                                   "col_weights")
     self._use_factors_weights_cache = use_factors_weights_cache
+    self._use_gramian_cache = use_gramian_cache
     self._row_factors = self._create_factors(self._input_rows,
                                              self._n_components,
                                              self._num_row_shards, row_init,
@@ -495,10 +499,13 @@ class WALSModel(object):
     """Creates local cache of factors, weights and gramian for rows and columns.
 
     Note that currently the caching strategy is as follows:
-    When initiating a row(column) update, the column(row) gramian is computed
-    and cached while the row gramian is reset; optionally, column(row) factors
-    and weights are cached and row(column) factors and weights are reset when
-    use_factors_weights_cache is True.
+    When initiating a row (resp. column) update:
+      - The column (resp. row) gramian is computed.
+      - Optionally, if use_gramian_cache is True, the column (resp. row) Gramian
+        is cached, while the row (resp. column) gramian is reset.
+      - Optionally, if use_factors_weights_cache is True, the column (resp. row)
+        factors and weights are cached, while the row (resp. column) factors and
+        weights are reset.
     """
 
     (self._row_factors_cache, row_factors_cache_init,
@@ -515,18 +522,20 @@ class WALSModel(object):
         self._row_weights,
         "row_wt_cache",
         pass_through=not self._use_factors_weights_cache)
-
     (self._col_wt_cache, col_wt_cache_init, _) = self._cached_copy(
         self._col_weights,
         "col_wt_cache",
         pass_through=not self._use_factors_weights_cache)
-
     (self._row_gramian_cache, row_gramian_cache_init,
      row_gramian_cache_reset) = self._cached_copy(
-         self._row_gramian, "row_gramian_cache", pass_through=False)
+         self._row_gramian,
+         "row_gramian_cache",
+         pass_through=not self._use_gramian_cache)
     (self._col_gramian_cache, col_gramian_cache_init,
      col_gramian_cache_reset) = self._cached_copy(
-         self._col_gramian, "col_gramian_cache", pass_through=False)
+         self._col_gramian,
+         "col_gramian_cache",
+         pass_through=not self._use_gramian_cache)
 
     self._row_updates_init = control_flow_ops.group(col_factors_cache_init,
                                                     row_factors_cache_reset,
diff --git a/tensorflow/contrib/factorization/python/ops/wals.py b/tensorflow/contrib/factorization/python/ops/wals.py
index 3fd2cbbec2..41211859f1 100644
--- a/tensorflow/contrib/factorization/python/ops/wals.py
+++ b/tensorflow/contrib/factorization/python/ops/wals.py
@@ -18,7 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.contrib.factorization.python.ops import factorization_ops
 from tensorflow.contrib.framework.python.ops import variables as framework_variables
+from tensorflow.contrib.learn.python.learn.estimators import estimator
+from tensorflow.contrib.learn.python.learn.estimators import model_fn
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -221,3 +224,321 @@ class _SweepHook(session_run_hook.SessionRunHook):
     self._is_sweep_done = run_values.results[0]
     logging.info("Partial fit done.")
 
+
+def _wals_factorization_model_function(features, labels, mode, params):
+  """Model function for the WALSFactorization estimator.
+
+  Args:
+    features: Dictionary of features. See WALSMatrixFactorization.
+    labels: Must be None.
+    mode: A model_fn.ModeKeys object.
+    params: Dictionary of parameters containing arguments passed to the
+      WALSMatrixFactorization constructor.
+
+  Returns:
+    A ModelFnOps object.
+  """
+  assert labels is None
+  use_factors_weights_cache = (
+      params["use_factors_weights_cache_for_training"]
+      and mode == model_fn.ModeKeys.TRAIN)
+  use_gramian_cache = (
+      params["use_gramian_cache_for_training"]
+      and mode == model_fn.ModeKeys.TRAIN)
+  model = factorization_ops.WALSModel(
+      params["num_rows"],
+      params["num_cols"],
+      params["embedding_dimension"],
+      unobserved_weight=params["unobserved_weight"],
+      regularization=params["regularization_coeff"],
+      row_init=params["row_init"],
+      col_init=params["col_init"],
+      num_row_shards=params["num_row_shards"],
+      num_col_shards=params["num_col_shards"],
+      row_weights=params["row_weights"],
+      col_weights=params["col_weights"],
+      use_factors_weights_cache=use_factors_weights_cache,
+      use_gramian_cache=use_gramian_cache)
+
+  # Get input rows and cols. We either update rows or columns depending on
+  # the value of row_sweep, which is maintained using a session hook
+  input_rows = features[WALSMatrixFactorization.INPUT_ROWS]
+  input_cols = features[WALSMatrixFactorization.INPUT_COLS]
+  input_row_indices, _ = array_ops.unique(input_rows.indices[:, 0])
+  input_col_indices, _ = array_ops.unique(input_cols.indices[:, 0])
+
+  # Train ops, controlled using the SweepHook
+  # We need to run the following ops:
+  # Before a row sweep:
+  #   row_update_prep_gramian_op
+  #   initialize_row_update_op
+  # During a row sweep:
+  #   update_row_factors_op
+  # Before a col sweep:
+  #   col_update_prep_gramian_op
+  #   initialize_col_update_op
+  # During a col sweep:
+  #   update_col_factors_op
+
+  is_row_sweep_var = variables.Variable(
+      True, "is_row_sweep",
+      collections=[ops.GraphKeys.GLOBAL_VARIABLES])
+  # The row sweep is determined by is_row_sweep_var (controlled by the
+  # sweep_hook) in TRAIN mode, and manually in EVAL mode.
+  is_row_sweep = (features[WALSMatrixFactorization.PROJECT_ROW]
+                  if mode == model_fn.ModeKeys.EVAL else is_row_sweep_var)
+
+  def update_row_factors():
+    return model.update_row_factors(sp_input=input_rows, transpose_input=False)
+  def update_col_factors():
+    return model.update_col_factors(sp_input=input_cols, transpose_input=True)
+  _, train_op, loss = control_flow_ops.cond(
+      is_row_sweep, update_row_factors, update_col_factors)
+
+  row_prep_ops = [model.row_update_prep_gramian_op,
+                  model.initialize_row_update_op]
+  col_prep_ops = [model.col_update_prep_gramian_op,
+                  model.initialize_col_update_op]
+  cache_init_ops = [model.worker_init]
+
+  sweep_hook = _SweepHook(
+      is_row_sweep_var,
+      train_op,
+      params["num_rows"],
+      params["num_cols"],
+      input_row_indices,
+      input_col_indices,
+      row_prep_ops,
+      col_prep_ops,
+      cache_init_ops,
+  )
+
+  # Prediction ops (only return predictions in INFER mode)
+  predictions = {}
+  if mode == model_fn.ModeKeys.INFER:
+    project_row = features[WALSMatrixFactorization.PROJECT_ROW]
+    projection_weights = features.get(
+        WALSMatrixFactorization.PROJECTION_WEIGHTS)
+    def get_row_projection():
+      return model.project_row_factors(
+          sp_input=input_rows,
+          projection_weights=projection_weights,
+          transpose_input=False)
+    def get_col_projection():
+      return model.project_col_factors(
+          sp_input=input_cols,
+          projection_weights=projection_weights,
+          transpose_input=True)
+
+    predictions[WALSMatrixFactorization.PROJECTION_RESULT] = (
+        control_flow_ops.cond(
+            project_row, get_row_projection, get_col_projection))
+
+  return model_fn.ModelFnOps(
+      mode=mode,
+      predictions=predictions,
+      loss=loss,
+      eval_metric_ops={},
+      train_op=train_op,
+      training_hooks=[sweep_hook])
+
+
+class WALSMatrixFactorization(estimator.Estimator):
+  """An Estimator for Weighted Matrix Factorization, using the WALS method.
+
+  WALS (Weighted Alternating Least Squares) is an algorithm for weighted matrix
+  factorization. It computes a low-rank approximation of a given sparse (n x m)
+  matrix A, by a product of two matrices, U * V^T, where U is a (n x k) matrix
+  and V is a (m x k) matrix. Here k is the rank of the approximation, also
+  called the embedding dimension. We refer to U as the row factors, and V as the
+  column factors.
+  See tensorflow/contrib/factorization/g3doc/wals.md for the precise problem
+  formulation.
+
+  The training proceeds in sweeps: during a row_sweep, we fix V and solve for U.
+  During a column sweep, we fix U and solve for V. Each one of these problems is
+  an unconstrained quadratic minimization problem and can be solved exactly (it
+  can also be solved in mini-batches, since the solution decouples nicely).
+  The alternating between sweeps is achieved by using a hook during training,
+  which is responsible for keeping track of the sweeps and running preparation
+  ops at the beginning of each sweep. It also updates the global_step variable,
+  which keeps track of the number of batches processed since the beginning of
+  training.
+  The current implementation assumes that the training is run on a single
+  machine, and will fail if config.num_worker_replicas is not equal to one.
+  Training is done by calling self.fit(input_fn=input_fn), where input_fn
+  provides two queues: one for rows of the input matrix, and one for rows of the
+  transposed input matrix (i.e. columns of the original matrix). Note that
+  during a row sweep, only row batches are processed (ignoring column batches)
+  and vice-versa.
+
+  For prediction, given a new set of input rows A' (e.g. new rows of the A
+  matrix), we compute a corresponding set of row factors U', such that U' * V^T
+  is a good approximation of A'. We call this operation a row projection. A
+  similar operation is defined for columns.
+  Projection is done by calling self.get_projections(input_fn=input_fn), where
+  input_fn satisfies the constraints given below.
+
+  The input functions must satisfy the following constraints: Calling input_fn
+  must return a tuple (features, labels) where labels is None, and features is
+  a dict containing the following keys:
+  TRAIN:
+    - WALSMatrixFactorization.INPUT_ROWS: float32 SparseTensor (matrix).
+      Rows of the input matrix to process (or to project).
+    - WALSMatrixFactorization.INPUT_COLS: float32 SparseTensor (matrix).
+      Columns of the input matrix to process (or to project), transposed.
+  INFER:
+    - WALSMatrixFactorization.INPUT_ROWS: float32 SparseTensor (matrix).
+      Rows to project.
+    - WALSMatrixFactorization.INPUT_COLS: float32 SparseTensor (matrix).
+      Columns to project.
+    - WALSMatrixFactorization.PROJECT_ROW: Boolean Tensor. Whether to project
+      the rows or columns.
+    - WALSMatrixFactorization.PROJECTION_WEIGHTS (Optional): float32 Tensor
+      (vector). The weights to use in the projection.
+  EVAL:
+    - WALSMatrixFactorization.INPUT_ROWS: float32 SparseTensor (matrix).
+      Rows to project.
+    - WALSMatrixFactorization.INPUT_COLS: float32 SparseTensor (matrix).
+      Columns to project.
+    - WALSMatrixFactorization.PROJECT_ROW: Boolean Tensor. Whether to project
+      the rows or columns.
+  """
+  # Keys to be used in model_fn
+  # Features keys
+  INPUT_ROWS = "input_rows"
+  INPUT_COLS = "input_cols"
+  PROJECT_ROW = "project_row"
+  PROJECTION_WEIGHTS = "projection_weights"
+  # Predictions key
+  PROJECTION_RESULT = "projection"
+
+  def __init__(self,
+               num_rows,
+               num_cols,
+               embedding_dimension,
+               unobserved_weight=0.1,
+               regularization_coeff=None,
+               row_init="random",
+               col_init="random",
+               num_row_shards=1,
+               num_col_shards=1,
+               row_weights=1,
+               col_weights=1,
+               use_factors_weights_cache_for_training=True,
+               use_gramian_cache_for_training=True,
+               model_dir=None,
+               config=None):
+    """Creates a model for matrix factorization using the WALS method.
+
+    Args:
+      num_rows: Total number of rows for input matrix.
+      num_cols: Total number of cols for input matrix.
+      embedding_dimension: Dimension to use for the factors.
+      unobserved_weight: Weight of the unobserved entries of matrix.
+      regularization_coeff: Weight of the L2 regularization term. Defaults to
+        None, in which case the problem is not regularized.
+      row_init: Initializer for row factor. Must be either:
+        - A tensor: The row factor matrix is initialized to this tensor,
+        - A numpy constant,
+        - "random": The rows are initialized using a normal distribution.
+      col_init: Initializer for column factor. See row_init.
+      num_row_shards: Number of shards to use for the row factors.
+      num_col_shards: Number of shards to use for the column factors.
+      row_weights: Must be in one of the following three formats:
+        - None: In this case, the weight of every entry is the unobserved_weight
+          and the problem simplifies to ALS. Note that, in this case,
+          col_weights must also be set to "None".
+        - List of lists of non-negative scalars, of the form
+          [[w_0, w_1, ...], [w_k, ... ], [...]],
+          where the number of inner lists equal to the number of row factor
+          shards and the elements in each inner list are the weights for the
+          rows of that shard. In this case,
+          w_ij = unonbserved_weight + row_weights[i] * col_weights[j].
+        - A non-negative scalar: This value is used for all row weights.
+          Note that it is allowed to have row_weights as a list and col_weights
+          as a scalar, or vice-versa.
+      col_weights: See row_weights.
+      use_factors_weights_cache_for_training: Boolean, whether the factors and
+        weights will be cached on the workers before the updates start, during
+        training. Defaults to True.
+        Note that caching is disabled during prediction.
+      use_gramian_cache_for_training: Boolean, whether the Gramians will be
+        cached on the workers before the updates start, during training.
+        Defaults to True. Note that caching is disabled during prediction.
+      model_dir: The directory to save the model results and log files.
+      config: A Configuration object. See Estimator.
+
+    Raises:
+      ValueError: If config.num_worker_replicas is strictly greater than one.
+        The current implementation only supports running on a single worker.
+    """
+    # TODO(walidk): Support distributed training.
+    # TODO(walidk): Support power-law based weight computation.
+    # TODO(walidk): Add factor lookup by indices, with caching.
+    # TODO(walidk): Support caching during prediction.
+
+    params = {
+        "num_rows": num_rows,
+        "num_cols": num_cols,
+        "embedding_dimension": embedding_dimension,
+        "unobserved_weight": unobserved_weight,
+        "regularization_coeff": regularization_coeff,
+        "row_init": row_init,
+        "col_init": col_init,
+        "num_row_shards": num_row_shards,
+        "num_col_shards": num_col_shards,
+        "row_weights": row_weights,
+        "col_weights": col_weights,
+        "use_factors_weights_cache_for_training":
+            use_factors_weights_cache_for_training,
+        "use_gramian_cache_for_training": use_gramian_cache_for_training
+    }
+    self._row_factors_names = ["row_factors_shard_%d" % i
+                               for i in range(num_row_shards)]
+    self._col_factors_names = ["col_factors_shard_%d" % i
+                               for i in range(num_col_shards)]
+
+    super(WALSMatrixFactorization, self).__init__(
+        model_fn=_wals_factorization_model_function,
+        params=params,
+        model_dir=model_dir,
+        config=config)
+
+    if self._config is not None and self._config.num_worker_replicas > 1:
+      raise ValueError("WALSMatrixFactorization must be run on a single worker "
+                       "replica.")
+
+  def get_row_factors(self):
+    """Returns the row factors of the model, loading them from checkpoint.
+
+    Should only be run after training.
+
+    Returns:
+      A list of the row factors of the model.
+    """
+    return [self.get_variable_value(name) for name in self._row_factors_names]
+
+  def get_col_factors(self):
+    """Returns the column factors of the model, loading them from checkpoint.
+
+    Should only be run after training.
+
+    Returns:
+      A list of the column factors of the model.
+    """
+    return [self.get_variable_value(name) for name in self._col_factors_names]
+
+  def get_projections(self, input_fn):
+    """Computes the projections of the rows or columns given in input_fn.
+
+    Runs predict() with the given input_fn, and returns the results. Should only
+    be run after training.
+
+    Args:
+      input_fn: Input function which specifies the rows or columns to project.
+    Returns:
+      A generator of the projected factors.
+    """
+    return (result[WALSMatrixFactorization.PROJECTION_RESULT]
+            for result in self.predict(input_fn=input_fn))
diff --git a/tensorflow/contrib/factorization/python/ops/wals_test.py b/tensorflow/contrib/factorization/python/ops/wals_test.py
index 2ae2d3ab05..3f5787ea87 100644
--- a/tensorflow/contrib/factorization/python/ops/wals_test.py
+++ b/tensorflow/contrib/factorization/python/ops/wals_test.py
@@ -18,16 +18,311 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import itertools
+import json
+import numpy as np
+
+from tensorflow.contrib.factorization.python.ops import factorization_ops_test_utils
 from tensorflow.contrib.factorization.python.ops import wals as wals_lib
+from tensorflow.contrib.learn.python.learn import run_config
+from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
+from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import embedding_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
+from tensorflow.python.training import input as input_lib
 from tensorflow.python.training import session_run_hook
 
 
+class WALSMatrixFactorizationTest(test.TestCase):
+  INPUT_MATRIX = factorization_ops_test_utils.INPUT_MATRIX
+
+  def np_array_to_sparse(self, np_array):
+    """Transforms an np.array to a tf.SparseTensor."""
+    return factorization_ops_test_utils.np_matrix_to_tf_sparse(np_array)
+
+  def calculate_loss(self):
+    """Calculates the loss of the current (trained) model."""
+    current_rows = embedding_ops.embedding_lookup(
+        self._model.get_row_factors(), math_ops.range(self._num_rows),
+        partition_strategy='div')
+    current_cols = embedding_ops.embedding_lookup(
+        self._model.get_col_factors(), math_ops.range(self._num_cols),
+        partition_strategy='div')
+    row_wts = embedding_ops.embedding_lookup(
+        self._row_weights, math_ops.range(self._num_rows),
+        partition_strategy='div')
+    col_wts = embedding_ops.embedding_lookup(
+        self._col_weights, math_ops.range(self._num_cols),
+        partition_strategy='div')
+    sp_inputs = self.np_array_to_sparse(self.INPUT_MATRIX)
+    return factorization_ops_test_utils.calculate_loss(
+        sp_inputs, current_rows, current_cols, self._regularization_coeff,
+        self._unobserved_weight, row_wts, col_wts)
+
+  # TODO(walidk): Replace with input_reader_utils functions once open sourced.
+  def remap_sparse_tensor_rows(self, sp_x, row_ids, shape):
+    """Remaps the row ids of a tf.SparseTensor."""
+    old_row_ids, old_col_ids = array_ops.split(
+        value=sp_x.indices, num_or_size_splits=2, axis=1)
+    new_row_ids = array_ops.gather(row_ids, old_row_ids)
+    new_indices = array_ops.concat([new_row_ids, old_col_ids], 1)
+    return sparse_tensor.SparseTensor(
+        indices=new_indices, values=sp_x.values, dense_shape=shape)
+
+  # TODO(walidk): Add an option to randomize inputs.
+  def input_fn(self, np_matrix, batch_size, project_row=None,
+               projection_weights=None, col_ids=None):
+    """Returns an input_fn that selects row and col batches from np_matrix."""
+    def extract_features(row_batch, col_batch, shape):
+      row_ids = row_batch[0]
+      col_ids = col_batch[0]
+      rows = self.remap_sparse_tensor_rows(row_batch[1], row_ids, shape)
+      cols = self.remap_sparse_tensor_rows(col_batch[1], col_ids, shape)
+      features = {
+          wals_lib.WALSMatrixFactorization.INPUT_ROWS: rows,
+          wals_lib.WALSMatrixFactorization.INPUT_COLS: cols,
+      }
+      return features
+
+    def _fn():
+      num_rows = np.shape(np_matrix)[0]
+      num_cols = np.shape(np_matrix)[1]
+      row_ids = math_ops.range(num_rows, dtype=dtypes.int64)
+      col_ids = math_ops.range(num_cols, dtype=dtypes.int64)
+      sp_mat = self.np_array_to_sparse(np_matrix)
+      sp_mat_t = sparse_ops.sparse_transpose(sp_mat)
+      row_batch = input_lib.batch(
+          [row_ids, sp_mat],
+          batch_size=min(batch_size, num_rows),
+          capacity=10,
+          enqueue_many=True)
+      col_batch = input_lib.batch(
+          [col_ids, sp_mat_t],
+          batch_size=min(batch_size, num_cols),
+          capacity=10,
+          enqueue_many=True)
+
+      features = extract_features(row_batch, col_batch, sp_mat.dense_shape)
+      if projection_weights is not None:
+        weights_batch = input_lib.batch(
+            projection_weights,
+            batch_size=batch_size,
+            capacity=10,
+            enqueue_many=True)
+        features[wals_lib.WALSMatrixFactorization.PROJECTION_WEIGHTS] = (
+            weights_batch)
+      if project_row is not None:
+        features[wals_lib.WALSMatrixFactorization.PROJECT_ROW] = (
+            constant_op.constant(project_row))
+
+      labels = None
+      return features, labels
+
+    return _fn
+
+  @property
+  def row_steps(self):
+    return np.ceil(self._num_rows / self.batch_size)
+
+  @property
+  def col_steps(self):
+    return np.ceil(self._num_cols / self.batch_size)
+
+  @property
+  def batch_size(self):
+    return 2
+
+  @property
+  def use_cache(self):
+    return False
+
+  def setUp(self):
+    self._num_rows = 5
+    self._num_cols = 7
+    self._embedding_dimension = 3
+    self._unobserved_weight = 0.1
+    self._num_row_shards = 2
+    self._num_col_shards = 3
+    self._regularization_coeff = 0.01
+    self._col_init = [
+        # Shard 0.
+        [[-0.36444709, -0.39077035, -0.32528427],
+         [1.19056475, 0.07231052, 2.11834812],
+         [0.93468881, -0.71099287, 1.91826844]],
+        # Shard 1.
+        [[1.18160152, 1.52490723, -0.50015002],
+         [1.82574749, -0.57515913, -1.32810032]],
+        # Shard 2.
+        [[-0.15515432, -0.84675711, 0.13097958],
+         [-0.9246484, 0.69117504, 1.2036494]],
+    ]
+    self._row_weights = [[0.1, 0.2, 0.3], [0.4, 0.5]]
+    self._col_weights = [[0.1, 0.2, 0.3], [0.4, 0.5], [0.6, 0.7]]
+
+    # Values of row and column factors after running one iteration or factor
+    # updates.
+    self._row_factors_0 = [[0.097689, -0.219293, -0.020780],
+                           [0.50842, 0.64626, 0.22364],
+                           [0.401159, -0.046558, -0.192854]]
+    self._row_factors_1 = [[1.20597, -0.48025, 0.35582],
+                           [1.5564, 1.2528, 1.0528]]
+    self._col_factors_0 = [[2.4725, -1.2950, -1.9980],
+                           [0.44625, 1.50771, 1.27118],
+                           [1.39801, -2.10134, 0.73572]]
+    self._col_factors_1 = [[3.36509, -0.66595, -3.51208],
+                           [0.57191, 1.59407, 1.33020]]
+    self._col_factors_2 = [[3.3459, -1.3341, -3.3008],
+                           [0.57366, 1.83729, 1.26798]]
+    self._model = wals_lib.WALSMatrixFactorization(
+        self._num_rows,
+        self._num_cols,
+        self._embedding_dimension,
+        self._unobserved_weight,
+        col_init=self._col_init,
+        regularization_coeff=self._regularization_coeff,
+        num_row_shards=self._num_row_shards,
+        num_col_shards=self._num_col_shards,
+        row_weights=self._row_weights,
+        col_weights=self._col_weights,
+        use_factors_weights_cache_for_training=self.use_cache,
+        use_gramian_cache_for_training=self.use_cache)
+
+  def test_fit(self):
+    # Row sweep.
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    self._model.fit(input_fn=input_fn, steps=self.row_steps)
+    row_factors = self._model.get_row_factors()
+    self.assertAllClose(row_factors[0], self._row_factors_0, atol=1e-3)
+    self.assertAllClose(row_factors[1], self._row_factors_1, atol=1e-3)
+
+    # Col sweep.
+    # Running fit a second time will resume training from the checkpoint.
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    self._model.fit(input_fn=input_fn, steps=self.col_steps)
+    col_factors = self._model.get_col_factors()
+    self.assertAllClose(col_factors[0], self._col_factors_0, atol=1e-3)
+    self.assertAllClose(col_factors[1], self._col_factors_1, atol=1e-3)
+    self.assertAllClose(col_factors[2], self._col_factors_2, atol=1e-3)
+
+  def test_predict(self):
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    # Project rows 1 and 4 from the input matrix.
+    proj_input_fn = self.input_fn(
+        np_matrix=self.INPUT_MATRIX[[1, 4], :],
+        batch_size=2,
+        project_row=True,
+        projection_weights=[[0.2, 0.5]])
+
+    self._model.fit(input_fn=input_fn, steps=self.row_steps)
+    projections = self._model.get_projections(proj_input_fn)
+    projected_rows = list(itertools.islice(projections, 2))
+
+    self.assertAllClose(
+        projected_rows,
+        [self._row_factors_0[1], self._row_factors_1[1]],
+        atol=1e-3)
+
+    # Project columns 5, 3, 1 from the input matrix.
+    proj_input_fn = self.input_fn(
+        np_matrix=self.INPUT_MATRIX[:, [5, 3, 1]],
+        batch_size=3,
+        project_row=False,
+        projection_weights=[[0.6, 0.4, 0.2]])
+
+    self._model.fit(input_fn=input_fn, steps=self.col_steps)
+    projections = self._model.get_projections(proj_input_fn)
+    projected_cols = list(itertools.islice(projections, 3))
+    self.assertAllClose(
+        projected_cols,
+        [self._col_factors_2[0], self._col_factors_1[0],
+         self._col_factors_0[1]],
+        atol=1e-3)
+
+  def test_eval(self):
+    # Do a row sweep then evaluate the model on row inputs.
+    # The evaluate function returns the loss of the projected rows, but since
+    # projection is idempotent, the eval loss must match the model loss.
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    self._model.fit(input_fn=input_fn, steps=self.row_steps)
+    eval_input_fn_row = self.input_fn(np_matrix=self.INPUT_MATRIX, batch_size=1,
+                                      project_row=True)
+    loss = self._model.evaluate(
+        input_fn=eval_input_fn_row, steps=self._num_rows)['loss']
+
+    with self.test_session():
+      true_loss = self.calculate_loss()
+
+    self.assertNear(
+        loss, true_loss, err=.001,
+        msg="""After row update, eval loss = {}, does not match the true
+        loss = {}.""".format(loss, true_loss))
+
+    # Do a col sweep then evaluate the model on col inputs.
+    self._model.fit(input_fn=input_fn, steps=self.col_steps)
+    eval_input_fn_col = self.input_fn(np_matrix=self.INPUT_MATRIX, batch_size=1,
+                                      project_row=False)
+    loss = self._model.evaluate(
+        input_fn=eval_input_fn_col, steps=self._num_cols)['loss']
+
+    with self.test_session():
+      true_loss = self.calculate_loss()
+
+    self.assertNear(
+        loss, true_loss, err=.001,
+        msg="""After row update, eval loss = {}, does not match the true
+        loss = {}.""".format(loss, true_loss))
+
+
+class WALSMatrixFactorizationTestCached(WALSMatrixFactorizationTest):
+
+  @property
+  def use_cache(self):
+    return True
+
+
+class WALSMatrixFactorizationTestFullBatch(WALSMatrixFactorizationTest):
+
+  @property
+  def batch_size(self):
+    return 100
+
+
+class WALSMatrixFactorizationUnsupportedTest(test.TestCase):
+
+  def setUp(self):
+    pass
+
+  def testDistributedWALSUnsupported(self):
+    tf_config = {
+        'cluster': {
+            run_config_lib.TaskType.PS: ['host1:1', 'host2:2'],
+            run_config_lib.TaskType.WORKER: ['host3:3', 'host4:4']
+        },
+        'task': {
+            'type': run_config_lib.TaskType.WORKER,
+            'index': 1
+        }
+    }
+    with test.mock.patch.dict('os.environ',
+                              {'TF_CONFIG': json.dumps(tf_config)}):
+      config = run_config.RunConfig()
+    self.assertEqual(config.num_worker_replicas, 2)
+    with self.assertRaises(ValueError):
+      self._model = wals_lib.WALSMatrixFactorization(1, 1, 1, config=config)
+
+
 class SweepHookTest(test.TestCase):
 
   def setUp(self):
@@ -45,7 +340,7 @@ class SweepHookTest(test.TestCase):
 
   def run_hook_with_indices(self, sweep_hook, row_indices, col_indices):
     with self.test_session() as sess:
-      # Before run
+      # Before run.
       run_context = session_run_hook.SessionRunContext(
           original_args=None, session=sess)
       sess_run_args = sweep_hook.before_run(run_context)
@@ -53,11 +348,11 @@ class SweepHookTest(test.TestCase):
           self._input_row_indices_ph: row_indices,
           self._input_col_indices_ph: col_indices
       }
-      # Run
+      # Run.
       run_results = sess.run(sess_run_args.fetches, feed_dict=feed_dict)
       run_values = session_run_hook.SessionRunValues(
           results=run_results, options=None, run_metadata=None)
-      # After run
+      # After run.
       sweep_hook.after_run(run_context, run_values)
 
   def test_row_sweep(self):
@@ -74,9 +369,9 @@ class SweepHookTest(test.TestCase):
           self._col_prep_ops,
           self._init_ops)
 
-      # Initialize variables
+      # Initialize variables.
       sess.run([variables.global_variables_initializer()])
-      # Row sweep
+      # Row sweep.
       self.run_hook_with_indices(sweep_hook, [], [])
       self.assertTrue(sess.run(self._init_done),
                       msg='init ops not run by the sweep_hook')
-- 
GitLab


From 6d037e04d91ce6046602ad1d342ae33fb3c2617e Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 10 Apr 2017 09:16:14 -0800
Subject: [PATCH 0259/1563] Add tf.contrib.training.python_input -- making it
 easy to feed data into TensorFlow from python coroutines. Change: 152701623

---
 tensorflow/contrib/training/BUILD             |  23 +++
 tensorflow/contrib/training/__init__.py       |   2 +
 .../training/python/training/bucket_ops.py    |  12 +-
 .../training/python/training/python_input.py  | 178 ++++++++++++++++
 .../python/training/python_input_test.py      | 191 ++++++++++++++++++
 5 files changed, 404 insertions(+), 2 deletions(-)
 create mode 100644 tensorflow/contrib/training/python/training/python_input.py
 create mode 100644 tensorflow/contrib/training/python/training/python_input_test.py

diff --git a/tensorflow/contrib/training/BUILD b/tensorflow/contrib/training/BUILD
index a781f0cbfc..a8d8bda060 100644
--- a/tensorflow/contrib/training/BUILD
+++ b/tensorflow/contrib/training/BUILD
@@ -24,6 +24,7 @@ py_library(
         "python/training/failure_tolerator.py",
         "python/training/feeder.py",
         "python/training/hparam.py",
+        "python/training/python_input.py",
         "python/training/resample.py",
         "python/training/sampling_ops.py",
         "python/training/sequence_queueing_state_saver.py",
@@ -46,8 +47,10 @@ py_library(
         "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:ops",
+        "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_ops",
+        "//tensorflow/python:script_ops",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:string_ops",
         "//tensorflow/python:summary",
@@ -243,6 +246,26 @@ py_test(
     ],
 )
 
+py_test(
+    name = "python_input_test",
+    size = "medium",
+    srcs = ["python/training/python_input_test.py"],
+    srcs_version = "PY2AND3",
+    tags = ["manual"],
+    deps = [
+        ":training_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:data_flow_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:parsing_ops",
+        "//tensorflow/python:training",
+        "//third_party/py/numpy",
+    ],
+)
+
 py_test(
     name = "evaluation_test",
     size = "small",
diff --git a/tensorflow/contrib/training/__init__.py b/tensorflow/contrib/training/__init__.py
index be097fd9fc..b8d4629ac4 100644
--- a/tensorflow/contrib/training/__init__.py
+++ b/tensorflow/contrib/training/__init__.py
@@ -35,6 +35,7 @@ See @{$python/contrib.training} guide.
 @@HParams
 @@HParamDef
 @@parse_values
+@@python_input
 """
 
 from __future__ import absolute_import
@@ -54,6 +55,7 @@ from tensorflow.contrib.training.python.training.evaluation import wait_for_new_
 from tensorflow.contrib.training.python.training.failure_tolerator import *
 from tensorflow.contrib.training.python.training.feeder import *
 from tensorflow.contrib.training.python.training.hparam import *
+from tensorflow.contrib.training.python.training.python_input import python_input
 from tensorflow.contrib.training.python.training.resample import *
 from tensorflow.contrib.training.python.training.sampling_ops import *
 from tensorflow.contrib.training.python.training.sequence_queueing_state_saver import *
diff --git a/tensorflow/contrib/training/python/training/bucket_ops.py b/tensorflow/contrib/training/python/training/bucket_ops.py
index 7c50f43b79..7e293da551 100644
--- a/tensorflow/contrib/training/python/training/bucket_ops.py
+++ b/tensorflow/contrib/training/python/training/bucket_ops.py
@@ -251,10 +251,16 @@ def bucket(tensors,
     else:
       which_dequeue = lambda q: q.dequeue_many
 
+    def make_list(t):
+      if isinstance(t, (list, tuple)):
+        return t
+      else:
+        return [t]
+
     enqueues_to_top = [
         top_queue.enqueue(
-            [constant_op.constant(i)] + which_dequeue(q)(
-                bs, name="read_bucket_%d" % i),
+            [constant_op.constant(i)] + make_list(which_dequeue(q)(
+                bs, name="read_bucket_%d" % i)),
             name="enqueue_from_bucket_%d" % i)
         for i, (q, bs) in enumerate(zip(bucket_queues, batch_size))
     ]
@@ -282,6 +288,8 @@ def bucket(tensors,
     dequeued = top_queue.dequeue(name="dequeue_top")
     which_bucket_dequeued = dequeued[0]
     dequeued = dequeued[1:]
+    if len(dequeued) == 1:
+      dequeued = dequeued[0]
     dequeued = _restore_sparse_tensors(dequeued, sparse_info)
     return (which_bucket_dequeued, _as_original_type(tensors, dequeued))
 
diff --git a/tensorflow/contrib/training/python/training/python_input.py b/tensorflow/contrib/training/python/training/python_input.py
new file mode 100644
index 0000000000..7f5420a98a
--- /dev/null
+++ b/tensorflow/contrib/training/python/training/python_input.py
@@ -0,0 +1,178 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Operations for asynchronously reading data from python into queues.
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import threading
+
+import numpy as np
+
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import script_ops
+
+
+def _process_yielded_dict(feature_values, keys, features, dtypes, shapes):
+  """Read feature_values from the generator and emit a proper output dict."""
+  if not isinstance(feature_values, dict):
+    raise TypeError("generator must return dict, saw: %s" % feature_values)
+
+  processed_values = {}
+  for pk in keys:
+    if feature_values.get(pk, None) is not None:
+      processed_values[pk] = np.asarray(
+          feature_values[pk], dtype=dtypes[pk].as_numpy_dtype)
+      check_shape = tensor_shape.TensorShape(processed_values[pk].shape)
+      if not shapes[pk].is_compatible_with(check_shape):
+        raise ValueError(
+            "Feature '%s' has shape %s that is incompatible with declared "
+            "shape: %s" % (pk, shapes[pk], check_shape))
+      continue
+    if isinstance(features[pk], parsing_ops.FixedLenFeature):
+      if features[pk].default_value is not None:
+        processed_values[pk] = np.asarray(
+            features[pk].default_value, dtype=dtypes[pk].as_numpy_dtype)
+    elif isinstance(features[pk], parsing_ops.FixedLenSequenceFeature):
+      processed_values[pk] = np.empty(
+          [0] + features[pk].shape.aslist(), dtype=dtypes[pk].as_numpy_dtype)
+    else:
+      raise ValueError(
+          "Expected generator to return key '%s' with non-empty value" % pk)
+
+  return processed_values
+
+
+def python_input(generator, features, name=None):
+  """Easily feed data from a python generator into TensorFlow queues.
+
+  Example usage:
+
+  ```python
+  def generator():
+    for i in range(3):
+      yield {"value": i}
+
+  features = {
+    "value": tf.FixedLenFeature(shape=[], dtype=dtypes.int32)
+  }
+
+  tensor_dict = tf.contrib.training.python_input(generator, features)
+  batched_dict = tf.train.batch(
+    tensor_dict, batch_size=2, allow_smaller_final_batch=True)
+
+  s = tf.Session()
+  tf.train.start_queue_runners()
+
+  batch1 = s.run(batched_dict)  # returns {"value": np.array([0, 1])}
+  batch2 = s.run(batched_dict)  # returns {"value": np.array([2])}
+  s.run(batched_dict)  # error: Queue is closed (generator finished at i==3)
+  ```
+
+  Args:
+    generator: A python generator that takes no arguments, and yields dicts
+      containing a single minibatch entry one at a time.
+    features: A python `dict` mapping keys expected from the generator to
+      instances of `tf.FixedLenFeature`, or `tf.FixedLenSequenceFeature`.
+    name: (Optional) A name for the operations.
+
+  Returns:
+    A dict mapping keys of the `features` dict to `Tensor` objects.
+    These `Tensor` objects are outputs of a queue that is fed by `generator`.
+
+  Raises:
+    TypeError: If generator is not callable or features is not a dict.
+    TypeError: If any of features' values are not a Feature object.
+    NotImplementedError: If any of features' values are instances of
+      `SparseFeature` or `VarLenFeature`  (these are not currently supported).
+    ValueError: If any FixedLenSequenceFeatures contain a default value
+      (this field is not supported).
+    ValueError: if any FixedLenSequenceFeatures have allow_missing=False
+      (this field is not supported).
+  """
+  if not callable(generator):
+    raise TypeError("generator must be callable, saw: %s" % generator)
+  if not isinstance(features, dict):
+    raise TypeError("features must be a dict, saw: %s"
+                    % type(features).__name__)
+
+  with ops.name_scope(name, "python_input"):
+    shapes = {}
+    dtypes = {}
+    for k, v in features.items():
+      if isinstance(v, parsing_ops.FixedLenFeature):
+        if v.default_value is not None:
+          value = ops.convert_to_tensor(v.default_value, dtype=v.dtype, name=k)
+          shapes[k] = value.shape
+          dtypes[k] = value.dtype
+        else:
+          tensor_shape.TensorShape(v.shape).assert_is_fully_defined()
+          shapes[k] = tensor_shape.TensorShape(v.shape)
+          dtypes[k] = v.dtype
+      elif isinstance(v, parsing_ops.VarLenFeature):
+        raise NotImplementedError("VarLenFeature not supported")
+      elif isinstance(v, parsing_ops.SparseFeature):
+        raise NotImplementedError("SparseFeature not supported")
+      elif isinstance(v, parsing_ops.FixedLenSequenceFeature):
+        if v.default_value is not None:
+          raise ValueError("FixedLenSequenceFeature with default value not "
+                           "supported")
+        if not v.allow_missing:
+          raise ValueError("FixedLenSequenceFeature with allow_missing=False "
+                           "not supported")
+        tensor_shape.TensorShape(v.shape).assert_is_fully_defined()
+        shapes[k] = tensor_shape.TensorShape([None]).concatenate(v.shape)
+        dtypes[k] = v.dtype
+      else:
+        raise TypeError(
+            "Expected value for features key '%s' to be one of "
+            "FixedLenFeature, VarLenFeature, SparseFeature, or "
+            "FixedLenSequenceFeature.  Got: %s" % (k, v))
+
+    keys = list(shapes.keys())
+    dtypes_list = [dtypes[pk] for pk in keys]
+
+    counter = [0]
+    lock = threading.Lock()
+    iterator = iter(generator())
+
+    def generator_iter():
+      """Iterate through generator output and return np.arrays to py_func."""
+      with lock:
+        try:
+          feature_values = next(iterator)
+          counter[0] += 1
+        except StopIteration as e:
+          raise StopIteration("Iteration finished.  Processed %d entries (%s)"
+                              % (counter[0], e))
+
+      processed_dict = _process_yielded_dict(
+          feature_values, keys, features, dtypes, shapes)
+      return [processed_dict[pk] for pk in keys]
+
+    generator_pyfunc_values = script_ops.py_func(
+        generator_iter, inp=[], Tout=dtypes_list, stateful=True)
+
+    pyfunc_input = {k: v for (k, v) in zip(keys, generator_pyfunc_values)}
+    for k, v in shapes.items():
+      pyfunc_input[k].set_shape(v)
+
+  return pyfunc_input
+
+
+__all__ = ["python_input"]
diff --git a/tensorflow/contrib/training/python/training/python_input_test.py b/tensorflow/contrib/training/python/training/python_input_test.py
new file mode 100644
index 0000000000..afd0f38c2c
--- /dev/null
+++ b/tensorflow/contrib/training/python/training/python_input_test.py
@@ -0,0 +1,191 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for tf.contrib.training.python_input."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+from tensorflow.contrib.training.python.training import bucket_ops
+from tensorflow.contrib.training.python.training import python_input
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.platform import test
+from tensorflow.python.training import coordinator
+from tensorflow.python.training import input as core_input
+from tensorflow.python.training import queue_runner_impl
+
+
+class PythonInputTest(test.TestCase):
+
+  def testGenerator(self):
+    def simple_generator():
+      for i in range(2):
+        yield {"value": i, "ignored": 3}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+    self.assertEqual(["value"], tensors.keys())
+    self.assertEqual(dtypes.int32, tensors["value"].dtype)
+    self.assertEqual((), tensors["value"].shape)
+
+    with self.test_session() as sess:
+      self.assertEqual({"value": 0}, sess.run(tensors))
+      self.assertEqual({"value": 1}, sess.run(tensors))
+      with self.assertRaisesOpError("Iteration finished"):
+        sess.run(tensors)
+
+  def testInvalidGenerator(self):
+    generator1 = lambda: iter([{"value": "a"}])
+    int_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors1 = python_input.python_input(generator1, int_features)
+
+    with self.test_session() as sess:
+      with self.assertRaisesOpError("invalid literal"):
+        # Can't convert a string to an integer
+        sess.run(tensors1)
+
+    generator2 = lambda: iter([None])
+    tensors2 = python_input.python_input(generator2, int_features)
+
+    with self.test_session() as sess:
+      with self.assertRaisesOpError("generator must return dict"):
+        sess.run(tensors2)
+
+    generator3 = lambda: iter([{"value": [1, 2]}])
+    tensors3 = python_input.python_input(generator3, int_features)
+
+    with self.test_session() as sess:
+      with self.assertRaisesOpError("incompatible with declared shape"):
+        sess.run(tensors3)
+
+  def testGeneratorWorksWithBatching(self):
+    def simple_generator():
+      for i in range(5):
+        yield {"value": i, "ignored": 3}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+
+    # Request batches of size 4 at a time, the final batch may be smaller.
+    batched_tensors = core_input.batch(tensors, batch_size=4,
+                                       allow_smaller_final_batch=True)
+
+    self.assertEqual(["value"], batched_tensors.keys())
+    self.assertEqual(dtypes.int32, batched_tensors["value"].dtype)
+    self.assertEqual([None], batched_tensors["value"].shape.as_list())
+
+    with self.test_session() as sess:
+      # The generator emits 5 items total.  The first 4 are returned in
+      # the first session run; the final one is returned in the
+      # second.  This works because allow_smaller_final_batch=True.
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(sess=sess, coord=coord)
+      r1 = sess.run(batched_tensors)
+      r2 = sess.run(batched_tensors)
+      self.assertAllEqual([0, 1, 2, 3], r1["value"])
+      self.assertEqual([4], r2["value"])
+      with self.assertRaisesOpError("Iteration finished"):
+        sess.run(tensors)
+      coord.request_stop()
+      for thread in threads:
+        thread.join()
+
+  def testGeneratorWorksWithManyBatchingThreads(self):
+    def simple_generator():
+      for i in range(5000):
+        yield {"value": i, "ignored": 3}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+
+    # Request batches of size 20 at a time, the final batch may be smaller.
+    _, batched_tensors = bucket_ops.bucket(
+        tensors, which_bucket=tensors["value"] % 5,
+        batch_size=20, num_buckets=5, num_threads=7, capacity=17,
+        allow_smaller_final_batch=True)
+
+    self.assertEqual(["value"], batched_tensors.keys())
+    self.assertEqual(dtypes.int32, batched_tensors["value"].dtype)
+    self.assertEqual([None], batched_tensors["value"].shape.as_list())
+
+    with self.test_session() as sess:
+      # The generator emits 5 items total.  The first 4 are returned in
+      # the first session run; the final one is returned in the
+      # second.  This works because allow_smaller_final_batch=True.
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(sess=sess, coord=coord)
+      results = []
+      while True:
+        try:
+          r = sess.run(batched_tensors)
+          results.extend(r["value"].tolist())
+        except errors.OutOfRangeError:
+          break
+      coord.request_stop()
+      for thread in threads:
+        thread.join()
+    self.assertEqual(sorted(results),
+                     list(range(5000)))
+
+  def testVaryingFieldsInGenerator(self):
+    def simple_generator():
+      for i in range(2):
+        yield {"value": i,
+               "seqlen_value": np.ones((i, 1))}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32),
+        "seqlen_value": parsing_ops.FixedLenSequenceFeature(
+            shape=[1], dtype=dtypes.float32, allow_missing=True),
+        "empty_value": parsing_ops.FixedLenFeature(
+            default_value=[-1, -2], dtype=dtypes.int32, shape=[2])
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+    self.assertEqual(
+        set(["value", "seqlen_value", "empty_value"]), set(tensors.keys()))
+    self.assertEqual(dtypes.int32, tensors["value"].dtype)
+    self.assertEqual((), tensors["value"].shape)
+    self.assertEqual(dtypes.float32, tensors["seqlen_value"].dtype)
+    self.assertEqual([None, 1], tensors["seqlen_value"].shape.as_list())
+    self.assertEqual(dtypes.int32, tensors["empty_value"].dtype)
+    self.assertEqual([2], tensors["empty_value"].shape)
+
+    with self.test_session() as sess:
+      r1 = sess.run(tensors)
+      self.assertAllEqual(0, r1["value"])
+      self.assertAllEqual(np.ones((0, 1)), r1["seqlen_value"])
+      self.assertAllEqual([-1, -2], r1["empty_value"])
+
+      r2 = sess.run(tensors)
+      self.assertAllEqual(1, r2["value"])
+      self.assertAllEqual([[1]], r2["seqlen_value"])
+      self.assertAllEqual([-1, -2], r2["empty_value"])
+
+      with self.assertRaisesOpError("Iteration finished"):
+        sess.run(tensors)
+
+
+if __name__ == "__main__":
+  test.main()
-- 
GitLab


From 3a64a5892bd495f079278800c380c0c4f2514053 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 09:19:22 -0800
Subject: [PATCH 0260/1563] Show that QuantizeToFloat consistently introduces a
 small error. The error is equal to   range_min - round(range_min /
 range_scale) * range_scale Change: 152702015

---
 .../core/kernels/quantization_utils_test.cc    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tensorflow/core/kernels/quantization_utils_test.cc b/tensorflow/core/kernels/quantization_utils_test.cc
index 8456604740..c7dbc0e5d1 100644
--- a/tensorflow/core/kernels/quantization_utils_test.cc
+++ b/tensorflow/core/kernels/quantization_utils_test.cc
@@ -355,6 +355,24 @@ TEST_F(QuantizationUtilsTest, AvoidBias) {
     const int back_to_int = FloatToQuantized<quint8>(as_float, 0.0f, 2.0f);
     EXPECT_EQ(i, back_to_int);
   }
+
+  // All perfectly representable floats should survive quantization, even
+  // if we pick a range where min is not itself perfectly representable.
+  const float min = -0.1375f;
+  const float max = 1.1385f;
+  const float step_size = (max - min) / 255.0f;
+  const float tolerance = step_size / 1000.0f;
+  // This is the smallest perfectly representable float in the range.
+  float first_float = ceil(min / step_size) * step_size;
+  // TODO(ahentz): The current version always incur a small error, which we
+  // need to account for. We should fix QuantizedToFloat<> to remove this bias.
+  const float expected_error = first_float - min;
+  ASSERT_GT(expected_error, tolerance);
+  for (float f = first_float; f <= max; f += step_size) {
+    const int as_int = FloatToQuantized<quint8>(f, min, max);
+    const float back_to_float = QuantizedToFloat<quint8>(as_int, min, max);
+    EXPECT_NEAR(f, back_to_float + expected_error, tolerance);
+  }
 }
 
 TEST_F(QuantizationUtilsTest, RequantizeInNewRange) {
-- 
GitLab


From 8682f1f878fc47788ae226d2352a805e5c1e71b3 Mon Sep 17 00:00:00 2001
From: Androbin <robin.richtsfeld@gmail.com>
Date: Mon, 10 Apr 2017 20:00:23 +0200
Subject: [PATCH 0261/1563] corrected "check_graph" to "summarize_graph"
 (#8896)

* corrected "check_graph" to "summarize_graph"

"check_graph" may have been the previous name for "summarize_graph"
the surrounding text suggests that both refer to the same tool

* Update README.md
---
 tensorflow/tools/graph_transforms/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index 06ae78ef5d..df9191fb96 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -103,7 +103,7 @@ output layers of the model are. The best source for these is the model training
 process, where for a classifier the inputs will be the nodes that receive the
 data from the training set, and the output will be the predictions. If you're
 unsure, the
-[summarize_graph](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/graph_transforms/summarize_graph_main.cc)
+[`summarize_graph`](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/graph_transforms/summarize_graph_main.cc)
 tool can inspect the model and provide guesses about likely input and output nodes,
 as well as other information that's useful for debugging. Here's an example of
 how to use it on the [Inception V3
@@ -315,7 +315,7 @@ themselves contain commas (for example shape definitions).
 The --inputs and --outputs are shared across all transforms, since it's common
 to need to know what the ingoing and outgoing nodes in the graph are. You should
 make sure you set these correctly before calling the graph transform tool, and
-if you're in doubt check with the model's author, or use the `check_graph` tool
+if you're in doubt check with the model's author, or use the [`summarize_graph`](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/tools/graph_transforms#inspecting-graphs) tool
 to examine likely inputs and outputs.
 
 All transforms can be passed the `ignore_errors` flag, with the value set to
-- 
GitLab


From 0ac2d9bcf3928e1df620c0779c1c7c8ae8d2f5dc Mon Sep 17 00:00:00 2001
From: Charles Nicholson <nicholsonc@google.com>
Date: Mon, 10 Apr 2017 09:29:49 -0800
Subject: [PATCH 0262/1563] Internal Changes Change: 152703253

---
 tensorflow/tools/ci_build/pylintrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/ci_build/pylintrc b/tensorflow/tools/ci_build/pylintrc
index 0779ed91bc..e71017e621 100644
--- a/tensorflow/tools/ci_build/pylintrc
+++ b/tensorflow/tools/ci_build/pylintrc
@@ -38,7 +38,7 @@ enable=indexing-exception,old-raise-syntax
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,no-member,no-name-in-module,import-error,unsubscriptable-object,unbalanced-tuple-unpacking,undefined-variable
+disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,no-member,no-name-in-module,import-error,unsubscriptable-object,unbalanced-tuple-unpacking,undefined-variable,not-context-manager
 
 
 # Set the cache size for astng objects.
@@ -322,4 +322,4 @@ indent-after-paren=4
 [GOOGLE LINES]
 
 # Regexp for a proper copyright notice.
-copyright=Copyright \d{4} The TensorFlow Authors\. +All [Rr]ights [Rr]eserved\.
\ No newline at end of file
+copyright=Copyright \d{4} The TensorFlow Authors\. +All [Rr]ights [Rr]eserved\.
-- 
GitLab


From bb83ceb3ea9dff1a391014a0bfb4f22a8f881410 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Mon, 10 Apr 2017 10:56:51 -0800
Subject: [PATCH 0263/1563] Reverting unintentional locking change in adam
 sparse. Change: 152715175

---
 tensorflow/python/training/adam.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index 4b0ef50df5..e611b0c0ec 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -173,7 +173,7 @@ class AdamOptimizer(optimizer.Optimizer):
     # v_t = beta2 * v + (1 - beta2) * (g_t * g_t)
     v = self.get_slot(var, "v")
     v_scaled_g_values = (grad * grad) * (1 - beta2_t)
-    v_t = state_ops.assign(v, v * beta2_t)
+    v_t = state_ops.assign(v, v * beta2_t, use_locking=self._use_locking)
     with ops.control_dependencies([v_t]):
       v_t = scatter_add(v, indices, v_scaled_g_values)
     v_sqrt = math_ops.sqrt(v_t)
-- 
GitLab


From 9e7bf403817a3acd4e8d865b041f37609564076e Mon Sep 17 00:00:00 2001
From: drpngx <drpngx@users.noreply.github.com>
Date: Mon, 10 Apr 2017 13:55:56 -0700
Subject: [PATCH 0264/1563] Branch 152703253 (#9112)

* Improve py_func error handling.

Automatically translate some python errors into corresponding TF errors at runtime.
Change: 152156821

* Update interaction with libpng so that we use the public API instead of
knowledge of the internal libpng data structures.
Change: 152167754

* TensorBoard plugins now contain their own name/route prefix.
Change: 152167807

* Passes trainable flag to separable_conv2d biases.
Change: 152170239

* Saving resource variables with a caching device.
Change: 152171539

* Drop loss from estimator_spec.eval_metric_ops, as required by core Estimator.
Change: 152179924

* sample_stats.percentile DOCFIX.
Change: 152182295

* Added a memory optimizer to grappler.
Change: 152184170

* Change default behavior of the tf runs selector:

- If there are fewer than 41 runs, enable them all by default
- If there are 41 runs or more, disable them all by default

This is in response to user complaints that having it enable only the first ten runs by default was confusing, because it was not obvious to users that some runs had been disabled.
However, it still solves the initial user complaint that having very many runs simultaneously enabled would lag the UI.

I also changed the "toggle all runs" button to try to turn everything off before turning everything on.
Also, I improved the logic for detecting when the runs selection is back in the default state, so that we can avoid generating long URI strings wherever possible.
Change: 152188948

* Autogenerated Change: Change TensorBoard TAG to 52
Change: 152189000

* Remove warning that only happening with config cuda.
Change: 152189205

* Make resource variable shared name consistent with non-resource variables.

Remove colocation constraint from resource variable cached value with the
variable itself.
Change: 152192203

* Add a way to specify the optimization order; refactor and add constant folding to meta optimizer.
Change: 152193646

* Backport fixes and improvements from external Keras.
Change: 152198296

* Merge changes from github.
Change: 152200430

* Go: Update generated wrapper functions for TensorFlow ops.
Change: 152200754

* Update ops-related pbtxt files.
Change: 152203174

* Make ImportGraphDef() work with functions.

In addition to modify graph_constructor.cc, this patch adds some other
functionality to enable importing fucntions:
* Ability to add FunctionDefLibraries to Graphs and
  FunctionLibraryDefinitions (in addition to existing functions)
* FunctionDefsEqual() utility function
Change: 152205258

* Expand contrib test to more than just test targets.
Change: 152206822

* Preserve graph version during optimization
Change: 152213262

* Exclude enter and exit nodes from shape refiner's constant folding.
Change: 152213637

* Allow reshape_mover and algebraic_simplifier to make multiple mutations, by avoiding the short-circuit
std::any_of.
Change: 152232810

* Fix dynamic_rnn transpose bug (can input/output non-3d tensors).

Also a few cleanups to RNN code.
Change: 152267628

* Fix flaky tests
Change: 152272801

* Add an auto parallelization grappler optimization pass.
Change: 152276787

* Change json.decode.JSONDecodeError to ValueError.  JSONDecodeError seems to be
the exception used in the simplejson module, not the json module.
Change: 152278012

* Internal change.
Change: 152281471

* [XLA] Force buffer sharing of separate while instructions.
Change: 152288540

* replica_device_setter should work for resource variables
Change: 152289915

* Fix ./configure script
1. Add %workspace% in .bazelrc file when using import statement
2. Write action_env into bazelrc file for required environment variables for OpenCL support
Change: 152290700

* Pointing a number of Tensorboard graph visualization-related help links to the new locations for the correspondent API documentation.
Change: 152293459

* Restore most of pull request #8606

Pull request #8606 added str(Label(...)) for most dependencies in
tensorflow.bzl, allowing most functions to be used from repositories which
include TensorFlow as a submodule.  Unfortunately, it broke when pulled into
Google and was removed in cl/152200430.  This CL restores the change, except
for two Android-only functions; these were the only problematic bits.
Change: 152297413

* Removed dead code in Estimator.
Change: 152297597

* Assert rank is at least equal to new_rank for `_sparse_inner_flatten`.
Change: 152303319

* Extend quantization ranges to include 0.0f.
Change: 152304380

* Remove Keras config file saving.
Change: 152306552

* API backwards compatibility tests.
Change: 152310869

* [TF:XLA] Add a test for an R3 -> R4 broadcast.
Change: 152313967

* Fix the problem that no enough placeholders for persistent tensor
batch delete

The deleter_key is always a device_name, hence there is only one
of it. Hence, we cannot delete >1 handles at one time.

In the fix, it creates delete placeholder on demand, the max
number of placeholders is _DEAD_HANDLES_THRESHOLD.
Change: 152322770

* [XLA] Add several reduction tests.
Change: 152323510

* Added the memory optimizer to the meta optimizer.
Change: 152323689

* Started a set of utilities to categorize op types
Change: 152329057

* Add AudioSpectrogram op to TensorFlow for audio feature generation
Change: 152332221

* Update ops-related pbtxt files.
Change: 152332812

* Automated rollback of change 152332221
Change: 152333917

* Call Py_CLEAR on dead fields during TF_RESOURCE-to-ndarray conversion
Change: 152338333

* [TF contrib seq2seq] Initial, incomplete implementation of beam search decoder.

**DOES NOT WORK, pushed for collaboration only**
Change: 152343927

* [XLA] Change HloPassPipeline to disallow Add* calls after Run.
Change: 152345578

* Automated rollback of change 152332812
Change: 152349057

* Remove all 64/32 bit compiler warnings from core/ops.
Change: 152353506

* libtensorflow.so: Don't export private symbols.

With this change, libtensorflow.so will only export
functions defined in c_api.h. This also results in
a decreased binary size of libtensorflow.so.

On Linux the decrease was from roughly 150MB to 67MB.
On OS X it was from roughly 101MB to 82MB.

Also fixes #8923
Change: 152366053

* Add Elu ops in XLA.
Change: 152383201

* Fixed test. ('broadcast_dims' has size 1)
Change: 152383633

* Add more detailed error message for rank assertion in _sparse_inner_flatten.
Change: 152397909

* tensor_bundle: propagrates errors related to directory creation.
Change: 152401909

* matrix_adjoint added to contrib/linalg/linear_operator_util
Change: 152404828

* Add an is_active method to plugins

This method determines whether a plugin is active. A plugin may be inactive if say it lacks data. This new is_active method allows us to add a route to TensorBoard noting which plugins are active. The frontend could then avoid querying routes of inactive plugins.
Change: 152406232

* Replace a gather op for shapes by a stack op so dilated convolutions can be
placed on GPU even with strict placing (before the gather went to CPU).
Change: 152411159

* [TF:XLA] Implement BatchToSpace, BatchToSpaceND, SpaceToBatch, SpaceToBatchND.
Fix crashes in core implementations of the same operators for zero-sized blocks.
Change: 152416903

* Estimator saves relative paths in checkpoint.
Change: 152420211

* Fix layers_test exception regex matching.
Change: 152422855

* Unhide bijectors. Correct TransformedDistribution docstring.
Change: 152424418

* Choosing a saner default for min_eval_frequency in the constructor for Experiment for the GCS file system, because the default of 1 causes performance problems.
Change: 152439984

* Inherit use_resource from scope for partitioned variables.
Change: 152442103

* Support quantized reshape in hexagon runtime
Change: 152445539

* tfdbg CLI: add command list_source (ls) + UI fixes and improvements

The new list_source (shorthand: ls) command lists Python source files responsible for constructing the nodes and tensors encountered in the run() call.

It divides the source files into two categories and list them separately.
1) files that are not part of the TensorFlow Python library, and
2) files that are a part of it.

The list contains information about how many nodes, tensors and dumps of tensors the files is responsible for. The file paths contain clickable links to the existing print_source/ps command.

The list_source/ls command supports filtering by file-path and node-name regex patterns.

UI fixes:
* Fixed inconsistent black vs. transparent background color that made the layout look messy on some terminal types. Now using the transparent color for default font color consistently.
* In the print_source command output, add clickable links to expand source lines and graph elements.
Change: 152446002

* tfcompile: Be a little more verbose about missing required flags.

Fixes #9014
Change: 152446338

* Disable failing test cases in pooling_ops_test.
Change: 152447322

* Register more types for tf.image_crop_and_resize(). Resolves #9020.
Change: 152448160

* Automated rollback of change 152439984
Change: 152450929

* Add a route to TensorBoard for fetching plugin names

Specifically, we add a /data/plugins_listing route to the TensorBoard application. This route responds with an object mapping the name of each initialized plugin to whether it is active.

This route could help the frontend avoid issuing requests to inactive plugins.

Ordered the listing of routes within application.py so there is a little more organization.

Refactored the test for application to use a fake plugin.
Change: 152451390

* Added the ability to retrieve the amount of usable gpu memory
Change: 152453470

* Allow to set session ConfigProto in RunConfig and use it in Estimator.
Change: 152454548

* Colocate ResourceVariable reads with their handles.
Change: 152455939

* tfdbg: update doc for new command list_source/ls
Change: 152456128

* Make rnn directions slightly easier to follow.
Change: 152456296

* Internal change
Change: 152458104

* Adds batch renormalization.

NOTE: if you use renormalization, you might want to use faster moving average updates, i.e. lower `decay` values.
Change: 152458872

* When using ImportGraphDef with a passed in ShapeRefiner, use the
producer version of the GraphDef when importing; the ShapeRefiner
may be initialized with a different graph_def_version, so we need
to be able to override it.

The test failed without the change to graph_constructor and passes with it.
The test uses a legacy graph that is supported (reduction shape).
Change: 152459169

* Allow any iterable for `export_strategies` arg.
Change: 152461826

* Log steps/sec every 100 steps in MonitoredSession, as before.
Change: 152465320

* Fixes documentation to note that the in case of ties the identity of the return value of ArgMin and ArgMaxis not guaranteed .
Change: 152465346

* Automated rollback of change 152465346
Change: 152465844

* Fix shape inference fn on _ParallelConcatStart.
Change: 152466076

* Fix getting started guide

Explain numerical differences in loss
fix one example to print
Change: 152466119

* Remove superfluous mode argument.
Change: 152467334

* Add a tool that converts HLO computations to tensorflow GraphDef which can be visualized on Tensorboard.

This CL defines basic tensorflow::OpDef for each HLO instruction/node. More attributes (e.g. shapes, colors) will be added in the future.
Change: 152477918

* [TF:XLA] Increase shard count of //third_party/tensorflow/compiler/tests:spacetobatch_test to reduce flakiness when built under ASAN.
Change: 152496244

* Make projector plugin backend read assets saved via the PluginAssets API.

At the same time, keep backwards compatibility with the old way of looking up assets.
Change: 152504793

* Move MNIST pointers to mirror hosted by the CVDF on Google Cloud.
Fixes: #9031
Change: 152504901

* Merge changes from github.
Change: 152508170

* Update API after changing default step couter frequency before.
Change: 152517535

* Move a few random op helper functions to header files

1. shape_inference::RandomShape
2. OpKernel::MakeShape(Tensor, TensorShape*)
Change: 152522156

* addresses the divide by zero bug
Change: 152522488

* Clarify doc on tf.assign.
Change: 152523909

* Sparse adam for resource variables.
Change: 152525327

* Automated rollback of change 152310869
Change: 152528732

* Add an env_var tf_sync_on_finish_bool that block until device has finished all queued operations in a step if true.
Change: 152533676

* Add more node attributes for HloInstruction on Tensorboard e.g. shape and layout etc.
Change: 152534472

* Add tf.complex64 GPU support to tf.gather.

Also add ldg specializations for std::complex.
Change: 152537848

* Formatting changes
Change: 152544842

* Upgrade TensorBoard TypeScript to 2.2.1

See also: #8326
Change: 152545950

* TEST:  Getting reasonable test sizes on linalg library, removing need for
sharding.
Change: 152546409

* Disabling _testSourceUtilModuleReturnsTrue as its causing opensource issues.
Change: 152548721

* Fix race due to unsafe buffer forwarding in maxpooling second order gradients added in #6664.
Re-enable previously flaky tests.
Clean up a few minor things in maxpooling_op_gpu.cu.cc
Change: 152550050

* LinearOperator:  adjoint_arg kwarg added to all operators.  Now,
operator.apply(x, adjoint_arg=True) means that the adjoint of 'x' is taken
before application of operator.  Sometimes this is done more efficiently than
simply taking adjoint.
Change: 152560471

* Adds weighted_average_loss metric key.
Change: 152560999

* Documentation: Fix bug in manual device placement example
Change: 152563392

* Change for internal compatibility.

* Use std::vector for storage instead of map.
Do the sorting inplace and return the same vector to avoid any copies.
On larger streams it is about 50% faster.
Change: 152576112

* Add tf.add_n GPU support for complex64/complex128.

Also adds a unit test for tf.add_n.
Change: 152577190

* - Adds support for nested types in tf.case and tf.cond.
- Adds a "strict" mode which disables silent unpacking of singleton lists.
- Adds shape inference to tf.case.
- Adds a lot of unit tests.
Change: 152581097

* [XLA] Add support for folding transpose into convolution
Change: 152581336

* Add a smoke test to ensure that the doc generator runs.
Change: 152592164

* Add tensorboard to the _do_not_descend_map of the PublicAPIVisitor.
Change: 152592268

* Add auto parallelization to meta optimizer. Enable MetaOptimizer if any one of the optimizers is on.
Change: 152598517

* Update ops-related pbtxt files.
Change: 152629248

* Prevent the renorm_weight from being updated too early.
Change: 152631776

* Automated rollback of change 152528732
Change: 152652473

* Construct TensorBoard dashboards in a JS list

Previously, adding a dashboard to TensorBoard involved changing logic in several places.

As part of this effort, added constructors to dashboards. Tweaked logic in various dashboards to preserve original behavior. For instance, the graph dashboard can only perform fitting after the dashboard is attached to the DOM.
Change: 152658532

* Make CheckpointSaverListener visible next to CheckpointSaverHook.
Change: 152662945

* tfdbg CLI: minor bug fixes

1: The calculation of the scroll command in the scroll bar didn't take into account that the y-coordinate of the scroll block is in the ScrollBar coordinate system, while the mouse click y-coordinate is in the screen coordinate system.

2: The y position of the ScrollBar was off by one.

3: The command box is not re-created after mouse-triggered commands, leading to strange-looking cursor position.
Change: 152684294

* Remove obsolete use of validate_indices from embedding_ops.py

validate_indices is ignored, so it shouldn't appear in new code.
Change: 152691948

* Preparation of using GMock matchers in XLA tests.
Change: 152691970

* Replace RuntimeException by RuntimeError in coordinator documentation.
Change: 152697758

* Move the TensorBoard debugger plugin to be internal.

This feature is currently not open-source anyway.
Change: 152700267

* Add a single-machine tf.learn Estimator implementation for the WALS solver.
Change: 152700915

* Add tf.contrib.training.python_input -- making it easy to feed data into
TensorFlow from python coroutines.
Change: 152701623

* Show that QuantizeToFloat consistently introduces a small error. The
error is equal to
  range_min - round(range_min / range_scale) * range_scale
Change: 152702015

* Internal Changes
Change: 152703253

* Remove tensorflow/tensorboard/plugins/debugger, as part of merge resolution.
---
 tensorflow/BUILD                              |    9 +-
 tensorflow/compiler/xla/BUILD                 |   14 +-
 tensorflow/compiler/xla/literal_util_test.cc  |   48 +-
 tensorflow/compiler/xla/service/BUILD         |    4 +
 .../compiler/xla/service/cpu/cpu_compiler.cc  |    9 +-
 .../compiler/xla/service/gpu/gpu_compiler.cc  |    8 +-
 .../xla/service/gpu/ir_emission_utils.h       |   11 +-
 .../compiler/xla/service/transpose_folding.cc |  146 +-
 .../compiler/xla/service/transpose_folding.h  |   31 +-
 .../xla/service/transpose_folding_test.cc     |  188 +-
 tensorflow/compiler/xla/test.h                |   48 +
 .../lib/quantiles/weighted_quantiles_buffer.h |   50 +-
 .../weighted_quantiles_buffer_test.cc         |   55 +-
 .../lib/quantiles/weighted_quantiles_stream.h |    4 +-
 .../weighted_quantiles_summary_test.cc        |   11 +-
 tensorflow/contrib/cmake/tf_python.cmake      |    1 -
 tensorflow/contrib/factorization/BUILD        |    1 +
 .../python/ops/factorization_ops.py           |   27 +-
 .../contrib/factorization/python/ops/wals.py  |  321 +++
 .../factorization/python/ops/wals_test.py     |  305 ++-
 .../layers/python/layers/embedding_ops.py     |   15 +-
 .../kernel_tests/linear_operator_test.py      |    5 +-
 .../linalg/python/ops/linear_operator.py      |   39 +-
 .../python/ops/linear_operator_composition.py |   14 +-
 .../linalg/python/ops/linear_operator_diag.py |    6 +-
 .../python/ops/linear_operator_full_matrix.py |    9 +-
 .../python/ops/linear_operator_identity.py    |   13 +-
 .../python/ops/linear_operator_test_util.py   |   66 +-
 .../linalg/python/ops/linear_operator_tril.py |    8 +-
 .../python/ops/linear_operator_udvh_update.py |   12 +-
 tensorflow/contrib/training/BUILD             |   23 +
 tensorflow/contrib/training/__init__.py       |    2 +
 .../training/python/training/bucket_ops.py    |   12 +-
 .../training/python/training/python_input.py  |  178 ++
 .../python/training/python_input_test.py      |  191 ++
 tensorflow/core/grappler/BUILD                |    1 +
 tensorflow/core/grappler/optimizers/BUILD     |    2 +
 .../core/grappler/optimizers/auto_parallel.h  |    4 +-
 .../grappler/optimizers/meta_optimizer.cc     |   18 +-
 tensorflow/core/kernels/aggregate_ops.cc      |    8 +-
 .../core/kernels/aggregate_ops_gpu.cu.cc      |    2 +
 .../core/kernels/quantization_utils_test.cc   |   18 +
 tensorflow/core/ops/array_ops.cc              |    8 +-
 .../core/protobuf/rewriter_config.proto       |    7 +
 tensorflow/docs_src/tutorials/using_gpu.md    |    7 +-
 tensorflow/python/__init__.py                 |    1 +
 tensorflow/python/debug/cli/curses_ui.py      |   30 +-
 tensorflow/python/debug/cli/curses_ui_test.py |   21 +-
 tensorflow/python/estimator/model_fn.py       |    1 +
 tensorflow/python/kernel_tests/BUILD          |   13 +
 .../python/kernel_tests/aggregate_ops_test.py |   79 +
 tensorflow/python/ops/control_flow_ops.py     |  188 +-
 .../python/ops/control_flow_ops_test.py       |  345 +++
 tensorflow/python/ops/embedding_ops.py        |   23 +-
 tensorflow/python/tools/inspect_checkpoint.py |    2 +-
 tensorflow/python/training/coordinator.py     |    4 +-
 tensorflow/python/training/training.py        |    2 +
 tensorflow/tensorboard/BUILD                  |    2 +
 tensorflow/tensorboard/backend/BUILD          |    3 -
 tensorflow/tensorboard/backend/application.py |   28 +-
 .../tensorboard/backend/application_test.py   |   56 +-
 .../tf-audio-dashboard.html                   |    6 +-
 .../components/tf_dashboard_common/BUILD      |    2 +
 .../tf_dashboard_common/dashboard-behavior.ts |   40 +
 .../tf_dashboard_common/tf-dashboard.html     |    1 +
 .../tf_dashboard_common/tf-run-selector.html  |   25 +-
 .../tf-distribution-dashboard.html            |    6 +-
 .../components/tf_graph/tf-graph-scene.html   |   35 +-
 .../tf-graph-dashboard.html                   |    7 +-
 .../tf-histogram-dashboard.html               |    6 +-
 .../tf-image-dashboard.html                   |   10 +-
 .../tf-scalar-dashboard.html                  |    7 +-
 .../tf_tensorboard/tf-tensorboard.html        |  170 +-
 .../tf_text_dashboard/tf-text-dashboard.html  |   11 +-
 .../vz_projector/vz-projector-dashboard.html  |   28 +-
 tensorflow/tensorboard/plugins/debugger/BUILD |   55 -
 .../plugins/debugger/debugger_plugin.py       |  355 ---
 .../plugins/debugger/debugger_plugin_test.py  |  300 ---
 tensorflow/tensorboard/tensorboard.py         |   26 +-
 tensorflow/tools/api/golden/BUILD             |   24 +
 .../tensorflow.-aggregation-method.pbtxt      |   24 +
 .../tensorflow.-attr-value.-list-value.pbtxt  |  108 +
 .../api/golden/tensorflow.-attr-value.pbtxt   |  120 +
 .../tensorflow.-auto-parallel-options.pbtxt   |   84 +
 ...orflow.-conditional-accumulator-base.pbtxt |   29 +
 .../tensorflow.-conditional-accumulator.pbtxt |   38 +
 ...ow.-config-proto.-device-count-entry.pbtxt |   84 +
 .../api/golden/tensorflow.-config-proto.pbtxt |  132 ++
 .../tools/api/golden/tensorflow.-d-type.pbtxt |   77 +
 .../api/golden/tensorflow.-device-spec.pbtxt  |   37 +
 .../api/golden/tensorflow.-dimension.pbtxt    |   25 +
 .../tools/api/golden/tensorflow.-event.pbtxt  |  112 +
 .../golden/tensorflow.-f-i-f-o-queue.pbtxt    |   62 +
 .../tensorflow.-fixed-len-feature.pbtxt       |   27 +
 ...nsorflow.-fixed-len-sequence-feature.pbtxt |   31 +
 ...nsorflow.-fixed-length-record-reader.pbtxt |   46 +
 .../golden/tensorflow.-g-p-u-options.pbtxt    |  104 +
 .../api/golden/tensorflow.-graph-def.pbtxt    |   92 +
 .../api/golden/tensorflow.-graph-keys.pbtxt   |  136 ++
 .../golden/tensorflow.-graph-options.pbtxt    |  112 +
 .../tools/api/golden/tensorflow.-graph.pbtxt  |  129 ++
 .../golden/tensorflow.-histogram-proto.pbtxt  |  104 +
 .../golden/tensorflow.-identity-reader.pbtxt  |   46 +
 .../golden/tensorflow.-indexed-slices.pbtxt   |   42 +
 .../tensorflow.-interactive-session.pbtxt     |   43 +
 .../api/golden/tensorflow.-log-message.pbtxt  |  112 +
 ...nsorflow.-name-attr-list.-attr-entry.pbtxt |   84 +
 .../golden/tensorflow.-name-attr-list.pbtxt   |   88 +
 .../tensorflow.-node-def.-attr-entry.pbtxt    |   84 +
 .../api/golden/tensorflow.-node-def.pbtxt     |  100 +
 .../api/golden/tensorflow.-op-error.pbtxt     |   29 +
 .../api/golden/tensorflow.-operation.pbtxt    |   65 +
 .../tensorflow.-optimizer-options.pbtxt       |  128 ++
 .../tensorflow.-padding-f-i-f-o-queue.pbtxt   |   62 +
 .../golden/tensorflow.-priority-queue.pbtxt   |   62 +
 .../api/golden/tensorflow.-queue-base.pbtxt   |   61 +
 .../tensorflow.-random-shuffle-queue.pbtxt    |   62 +
 .../api/golden/tensorflow.-reader-base.pbtxt  |   45 +
 .../tensorflow.-register-gradient.pbtxt       |    9 +
 .../golden/tensorflow.-rewriter-config.pbtxt  |  112 +
 .../api/golden/tensorflow.-run-metadata.pbtxt |   88 +
 .../api/golden/tensorflow.-run-options.pbtxt  |  116 +
 .../api/golden/tensorflow.-session-log.pbtxt  |  108 +
 .../api/golden/tensorflow.-session.pbtxt      |   47 +
 ...flow.-sparse-conditional-accumulator.pbtxt |   46 +
 .../golden/tensorflow.-sparse-feature.pbtxt   |   35 +
 .../tensorflow.-sparse-tensor-value.pbtxt     |   26 +
 .../golden/tensorflow.-sparse-tensor.pbtxt    |   46 +
 .../golden/tensorflow.-summary.-audio.pbtxt   |   96 +
 .../golden/tensorflow.-summary.-image.pbtxt   |   92 +
 .../golden/tensorflow.-summary.-value.pbtxt   |  108 +
 .../api/golden/tensorflow.-summary.pbtxt      |   92 +
 .../tensorflow.-t-f-record-reader.pbtxt       |   46 +
 .../api/golden/tensorflow.-tensor-array.pbtxt |   69 +
 .../api/golden/tensorflow.-tensor-info.pbtxt  |   88 +
 .../api/golden/tensorflow.-tensor-shape.pbtxt |   73 +
 .../tools/api/golden/tensorflow.-tensor.pbtxt |   58 +
 .../golden/tensorflow.-text-line-reader.pbtxt |   46 +
 .../golden/tensorflow.-var-len-feature.pbtxt  |   19 +
 .../golden/tensorflow.-variable-scope.pbtxt   |   97 +
 ...ensorflow.-variable.-save-slice-info.pbtxt |   17 +
 .../api/golden/tensorflow.-variable.pbtxt     |  101 +
 .../tensorflow.-whole-file-reader.pbtxt       |   46 +
 .../tools/api/golden/tensorflow.app.pbtxt     |   11 +
 .../tools/api/golden/tensorflow.compat.pbtxt  |   35 +
 .../tensorflow.constant_initializer.pbtxt     |   10 +
 .../tensorflow.errors.-aborted-error.pbtxt    |   30 +
 ...sorflow.errors.-already-exists-error.pbtxt |   30 +
 .../tensorflow.errors.-cancelled-error.pbtxt  |   30 +
 .../tensorflow.errors.-data-loss-error.pbtxt  |   30 +
 ...flow.errors.-deadline-exceeded-error.pbtxt |   30 +
 ...ow.errors.-failed-precondition-error.pbtxt |   30 +
 .../tensorflow.errors.-internal-error.pbtxt   |   30 +
 ...rflow.errors.-invalid-argument-error.pbtxt |   30 +
 .../tensorflow.errors.-not-found-error.pbtxt  |   30 +
 .../golden/tensorflow.errors.-op-error.pbtxt  |   29 +
 ...ensorflow.errors.-out-of-range-error.pbtxt |   30 +
 ...flow.errors.-permission-denied-error.pbtxt |   30 +
 ...low.errors.-resource-exhausted-error.pbtxt |   30 +
 ...orflow.errors.-unauthenticated-error.pbtxt |   30 +
 ...tensorflow.errors.-unavailable-error.pbtxt |   30 +
 ...nsorflow.errors.-unimplemented-error.pbtxt |   30 +
 .../tensorflow.errors.-unknown-error.pbtxt    |   30 +
 .../tools/api/golden/tensorflow.errors.pbtxt  |  151 ++
 ...tensorflow.estimator.-estimator-spec.pbtxt |   47 +
 .../tensorflow.estimator.-estimator.pbtxt     |   37 +
 .../tensorflow.estimator.-mode-keys.pbtxt     |   20 +
 .../tensorflow.estimator.-run-config.pbtxt    |   68 +
 ...-classification-output.__metaclass__.pbtxt |   14 +
 ...imator.export.-classification-output.pbtxt |   22 +
 ....export.-export-output.__metaclass__.pbtxt |   14 +
 ...flow.estimator.export.-export-output.pbtxt |   12 +
 ...export.-predict-output.__metaclass__.pbtxt |   14 +
 ...low.estimator.export.-predict-output.pbtxt |   18 +
 ...ort.-regression-output.__metaclass__.pbtxt |   14 +
 ....estimator.export.-regression-output.pbtxt |   18 +
 ...mator.export.-serving-input-receiver.pbtxt |   23 +
 .../golden/tensorflow.estimator.export.pbtxt  |   31 +
 .../golden/tensorflow.estimator.inputs.pbtxt  |   11 +
 .../api/golden/tensorflow.estimator.pbtxt     |   27 +
 .../tensorflow.gfile.-fast-g-file.pbtxt       |   58 +
 .../api/golden/tensorflow.gfile.-g-file.pbtxt |   58 +
 .../api/golden/tensorflow.gfile.-open.pbtxt   |   58 +
 .../tools/api/golden/tensorflow.gfile.pbtxt   |   63 +
 .../api/golden/tensorflow.graph_util.pbtxt    |   23 +
 .../tensorflow.image.-resize-method.pbtxt     |   24 +
 .../tools/api/golden/tensorflow.image.pbtxt   |  175 ++
 .../tools/api/golden/tensorflow.layers.pbtxt  |   59 +
 .../tools/api/golden/tensorflow.logging.pbtxt |   83 +
 .../tools/api/golden/tensorflow.losses.pbtxt  |   63 +
 .../tools/api/golden/tensorflow.metrics.pbtxt |   99 +
 .../tools/api/golden/tensorflow.nn.pbtxt      |  323 +++
 .../golden/tensorflow.ones_initializer.pbtxt  |   10 +
 .../tensorflow.orthogonal_initializer.pbtxt   |   10 +
 tensorflow/tools/api/golden/tensorflow.pbtxt  | 1947 +++++++++++++++++
 ...thon_io.-t-f-record-compression-type.pbtxt |   20 +
 ...orflow.python_io.-t-f-record-options.pbtxt |   17 +
 ...sorflow.python_io.-t-f-record-writer.pbtxt |   17 +
 .../api/golden/tensorflow.python_io.pbtxt     |   19 +
 ...tensorflow.random_normal_initializer.pbtxt |   10 +
 ...ensorflow.random_uniform_initializer.pbtxt |   10 +
 .../golden/tensorflow.resource_loader.pbtxt   |   23 +
 ...d_model.builder.-saved-model-builder.pbtxt |   21 +
 .../tensorflow.saved_model.builder.pbtxt      |    7 +
 .../tensorflow.saved_model.constants.pbtxt    |   39 +
 .../tensorflow.saved_model.loader.pbtxt       |   11 +
 .../tensorflow.saved_model.main_op.pbtxt      |   11 +
 .../api/golden/tensorflow.saved_model.pbtxt   |   35 +
 ...flow.saved_model.signature_constants.pbtxt |   47 +
 ...flow.saved_model.signature_def_utils.pbtxt |   19 +
 ...tensorflow.saved_model.tag_constants.pbtxt |   11 +
 .../golden/tensorflow.saved_model.utils.pbtxt |    7 +
 .../tools/api/golden/tensorflow.sdca.pbtxt    |    3 +
 .../tools/api/golden/tensorflow.sets.pbtxt    |   19 +
 .../api/golden/tensorflow.spectral.pbtxt      |   51 +
 .../golden/tensorflow.summary.-event.pbtxt    |  112 +
 ...ensorflow.summary.-file-writer-cache.pbtxt |   16 +
 .../tensorflow.summary.-file-writer.pbtxt     |   50 +
 .../tensorflow.summary.-session-log.pbtxt     |  108 +
 ...sorflow.summary.-summary-description.pbtxt |   80 +
 .../tensorflow.summary.-summary.-audio.pbtxt  |   96 +
 .../tensorflow.summary.-summary.-image.pbtxt  |   92 +
 .../tensorflow.summary.-summary.-value.pbtxt  |  108 +
 .../golden/tensorflow.summary.-summary.pbtxt  |   92 +
 ...sorflow.summary.-tagged-run-metadata.pbtxt |   84 +
 .../tools/api/golden/tensorflow.summary.pbtxt |   67 +
 .../api/golden/tensorflow.sysconfig.pbtxt     |   11 +
 .../golden/tensorflow.test.-benchmark.pbtxt   |   21 +
 .../tools/api/golden/tensorflow.test.pbtxt    |   51 +
 ...tensorflow.train.-adadelta-optimizer.pbtxt |   46 +
 ...sorflow.train.-adagrad-d-a-optimizer.pbtxt |   46 +
 .../tensorflow.train.-adagrad-optimizer.pbtxt |   46 +
 .../tensorflow.train.-adam-optimizer.pbtxt    |   46 +
 .../golden/tensorflow.train.-bytes-list.pbtxt |   80 +
 ...sorflow.train.-checkpoint-saver-hook.pbtxt |   30 +
 ...low.train.-checkpoint-saver-listener.pbtxt |   24 +
 ...sorflow.train.-chief-session-creator.pbtxt |   14 +
 .../tensorflow.train.-cluster-def.pbtxt       |   80 +
 .../tensorflow.train.-cluster-spec.pbtxt      |   37 +
 .../tensorflow.train.-coordinator.pbtxt       |   45 +
 .../golden/tensorflow.train.-example.pbtxt    |   80 +
 ...ow.train.-exponential-moving-average.pbtxt |   25 +
 .../tensorflow.train.-feature-list.pbtxt      |   80 +
 ...n.-feature-lists.-feature-list-entry.pbtxt |   84 +
 .../tensorflow.train.-feature-lists.pbtxt     |   84 +
 .../golden/tensorflow.train.-feature.pbtxt    |   88 +
 ...rflow.train.-features.-feature-entry.pbtxt |   84 +
 .../golden/tensorflow.train.-features.pbtxt   |   84 +
 .../tensorflow.train.-feed-fn-hook.pbtxt      |   30 +
 .../tensorflow.train.-final-ops-hook.pbtxt    |   34 +
 .../golden/tensorflow.train.-float-list.pbtxt |   80 +
 .../tensorflow.train.-ftrl-optimizer.pbtxt    |   46 +
 ...rflow.train.-global-step-waiter-hook.pbtxt |   30 +
 ...ow.train.-gradient-descent-optimizer.pbtxt |   46 +
 .../golden/tensorflow.train.-int64-list.pbtxt |   80 +
 ...nsorflow.train.-job-def.-tasks-entry.pbtxt |   84 +
 .../golden/tensorflow.train.-job-def.pbtxt    |   88 +
 ...ensorflow.train.-logging-tensor-hook.pbtxt |   30 +
 .../tensorflow.train.-looper-thread.pbtxt     |   73 +
 ...tensorflow.train.-momentum-optimizer.pbtxt |   46 +
 .../tensorflow.train.-monitored-session.pbtxt |   26 +
 ...rain.-nan-loss-during-training-error.pbtxt |   16 +
 .../tensorflow.train.-nan-tensor-hook.pbtxt   |   30 +
 .../golden/tensorflow.train.-optimizer.pbtxt  |   45 +
 ...ow.train.-proximal-adagrad-optimizer.pbtxt |   46 +
 ...-proximal-gradient-descent-optimizer.pbtxt |   46 +
 .../tensorflow.train.-queue-runner.pbtxt      |   49 +
 ...nsorflow.train.-r-m-s-prop-optimizer.pbtxt |   46 +
 .../golden/tensorflow.train.-saver-def.pbtxt  |  120 +
 .../api/golden/tensorflow.train.-saver.pbtxt  |   53 +
 .../golden/tensorflow.train.-scaffold.pbtxt   |   49 +
 ...nsorflow.train.-second-or-step-timer.pbtxt |   21 +
 .../tensorflow.train.-sequence-example.pbtxt  |   84 +
 .../golden/tensorflow.train.-server-def.pbtxt |   96 +
 .../api/golden/tensorflow.train.-server.pbtxt |   29 +
 .../tensorflow.train.-session-creator.pbtxt   |   12 +
 .../tensorflow.train.-session-manager.pbtxt   |   21 +
 .../tensorflow.train.-session-run-args.pbtxt  |   27 +
 ...ensorflow.train.-session-run-context.pbtxt |   25 +
 .../tensorflow.train.-session-run-hook.pbtxt  |   28 +
 ...tensorflow.train.-session-run-values.pbtxt |   27 +
 ...ow.train.-singular-monitored-session.pbtxt |   30 +
 .../tensorflow.train.-step-counter-hook.pbtxt |   30 +
 .../tensorflow.train.-stop-at-step-hook.pbtxt |   30 +
 ...tensorflow.train.-summary-saver-hook.pbtxt |   30 +
 .../golden/tensorflow.train.-supervisor.pbtxt |  153 ++
 ...rflow.train.-sync-replicas-optimizer.pbtxt |   58 +
 ...orflow.train.-worker-session-creator.pbtxt |   14 +
 .../tools/api/golden/tensorflow.train.pbtxt   |  395 ++++
 ...low.train.queue_runner.-queue-runner.pbtxt |   49 +
 .../tensorflow.train.queue_runner.pbtxt       |   15 +
 ...sorflow.truncated_normal_initializer.pbtxt |   10 +
 ...low.uniform_unit_scaling_initializer.pbtxt |   10 +
 .../golden/tensorflow.zeros_initializer.pbtxt |   10 +
 tensorflow/tools/api/lib/BUILD                |   39 +
 tensorflow/tools/api/lib/api_objects.proto    |   31 +
 .../api/lib/python_object_to_proto_visitor.py |  168 ++
 .../tools/api/tests/API_UPDATE_WARNING.txt    |    7 +
 tensorflow/tools/api/tests/BUILD              |   43 +
 tensorflow/tools/api/tests/README.txt         |   13 +
 .../tools/api/tests/api_compatibility_test.py |  238 ++
 tensorflow/tools/ci_build/pylintrc            |    4 +-
 tensorflow/tools/common/public_api.py         |    3 +-
 tensorflow/tools/docs/BUILD                   |   14 +
 tensorflow/tools/docs/build_docs_test.py      |   52 +
 305 files changed, 16811 insertions(+), 1223 deletions(-)
 create mode 100644 tensorflow/compiler/xla/test.h
 create mode 100644 tensorflow/contrib/training/python/training/python_input.py
 create mode 100644 tensorflow/contrib/training/python/training/python_input_test.py
 create mode 100644 tensorflow/python/kernel_tests/aggregate_ops_test.py
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts
 delete mode 100644 tensorflow/tensorboard/plugins/debugger/BUILD
 delete mode 100644 tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
 delete mode 100644 tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
 create mode 100644 tensorflow/tools/api/golden/BUILD
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-event.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.app.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.compat.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.errors.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.layers.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.logging.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.losses.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.nn.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sets.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.summary.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.test.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
 create mode 100644 tensorflow/tools/api/lib/BUILD
 create mode 100644 tensorflow/tools/api/lib/api_objects.proto
 create mode 100644 tensorflow/tools/api/lib/python_object_to_proto_visitor.py
 create mode 100644 tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
 create mode 100644 tensorflow/tools/api/tests/BUILD
 create mode 100644 tensorflow/tools/api/tests/README.txt
 create mode 100644 tensorflow/tools/api/tests/api_compatibility_test.py
 create mode 100644 tensorflow/tools/docs/build_docs_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index b98be57ec0..1ab6ee2dc0 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -308,10 +308,12 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
-        "//tensorflow/tensorboard/plugins/debugger:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
         "//tensorflow/tensorboard/plugins/text:all_files",
         "//tensorflow/tensorboard/scripts:all_files",
+        "//tensorflow/tools/api/golden:all_files",
+        "//tensorflow/tools/api/lib:all_files",
+        "//tensorflow/tools/api/tests:all_files",
         "//tensorflow/tools/common:all_files",
         "//tensorflow/tools/compatibility:all_files",
         "//tensorflow/tools/dist_test/server:all_files",
@@ -346,6 +348,11 @@ filegroup(
     ),
 )
 
+filegroup(
+    name = "docs_src",
+    data = glob(["docs_src/**/*.md"]),
+)
+
 # -------------------------------------------
 # New rules should be added above this target.
 # -------------------------------------------
diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index 35c0efb8f0..26ad8ac5f8 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -44,6 +44,17 @@ xla_proto_library(
     ],
 )
 
+cc_library(
+    name = "test",
+    testonly = 1,
+    hdrs = ["test.h"],
+    visibility = [":friends"],
+    deps = [
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:test",
+    ],
+)
+
 cc_library(
     name = "types",
     hdrs = ["types.h"],
@@ -256,10 +267,9 @@ cc_test(
         ":array4d",
         ":literal_util",
         ":shape_util",
-        ":test_helpers",
+        ":test",
         ":types",
         "//tensorflow/core:lib",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/literal_util_test.cc b/tensorflow/compiler/xla/literal_util_test.cc
index e53763376b..91971c3e24 100644
--- a/tensorflow/compiler/xla/literal_util_test.cc
+++ b/tensorflow/compiler/xla/literal_util_test.cc
@@ -21,14 +21,16 @@ limitations under the License.
 #include "tensorflow/compiler/xla/array4d.h"
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
 namespace {
 
+using ::testing::ElementsAre;
+using ::testing::ElementsAreArray;
+
 class LiteralUtilTest : public ::testing::Test {
  protected:
   LiteralUtilTest() {
@@ -159,9 +161,7 @@ TEST_F(LiteralUtilTest, CreateR3FromArray3d) {
   // clang-format on
 
   auto literal = LiteralUtil::CreateR3FromArray3D(array_3d);
-  EXPECT_MATCH(testing::PBToVec<tensorflow::protobuf_int64>(
-                   literal->shape().dimensions()),
-               testing::VectorMatcher<tensorflow::protobuf_int64>({2, 3, 2}));
+  EXPECT_THAT(literal->shape().dimensions(), ElementsAre(2, 3, 2));
   string result = LiteralUtil::ToString(*literal);
   const string expected = R"(f32[2,3,2] {
 { { 1, 2 },
@@ -182,9 +182,7 @@ TEST_F(LiteralUtilTest, LiteralR4F32ProjectedStringifies) {
     {2001, 2002},
   }, /*projection_p=*/1, /*projection_z=*/2);
   // clang-format on
-  EXPECT_MATCH(
-      testing::PBToVec(literal->shape().dimensions()),
-      testing::VectorMatcher<tensorflow::protobuf_int64>({1, 2, 3, 2}));
+  EXPECT_THAT(literal->shape().dimensions(), ElementsAre(1, 2, 3, 2));
   string result = LiteralUtil::ToString(*literal);
   const string expected = R"(f32[1,2,3,2] {
   {  // i0=0
@@ -204,10 +202,8 @@ TEST_F(LiteralUtilTest, LiteralR4F32ProjectedStringifies) {
 }
 
 TEST_F(LiteralUtilTest, LiteralR4F32Stringifies) {
-  EXPECT_MATCH(
-      testing::PBToVec<tensorflow::protobuf_int64>(
-          literal_r4_2x2x3x3_dim0major_->shape().dimensions()),
-      testing::VectorMatcher<tensorflow::protobuf_int64>({2, 2, 3, 3}));
+  EXPECT_THAT(literal_r4_2x2x3x3_dim0major_->shape().dimensions(),
+              ElementsAre(2, 2, 3, 3));
   string result = LiteralUtil::ToString(*literal_r4_2x2x3x3_dim0major_);
   const string expected = R"(f32[2,2,3,3] {
   {  // i0=0
@@ -516,27 +512,23 @@ TEST_F(LiteralUtilTest, TestR2LinearLayout) {
   auto mat_dim0minor = LiteralUtil::CreateR2WithLayout<int>(
       {{1, 2, 3}, {4, 5, 6}}, layout_r2_dim0minor_);
   EXPECT_EQ(mat_dim0minor->s32s_size(), 6);
-  EXPECT_MATCH(testing::PBToVec<int32>(mat_dim0minor->s32s()),
-               testing::VectorMatcher<int32>({1, 4, 2, 5, 3, 6}));
+  EXPECT_THAT(mat_dim0minor->s32s(), ElementsAre(1, 4, 2, 5, 3, 6));
 
   // Test expected memory layout when using Relayout to row major.
   auto relaid_mat_to_dim0major =
       LiteralUtil::Relayout(*mat_dim0minor, layout_r2_dim0major_);
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_mat_to_dim0major->s32s()),
-               testing::VectorMatcher<int32>({1, 2, 3, 4, 5, 6}));
+  EXPECT_THAT(relaid_mat_to_dim0major->s32s(), ElementsAre(1, 2, 3, 4, 5, 6));
 
   // Test expected memory layout of R2 created with dim0-major (row-major).
   auto mat_dim0major = LiteralUtil::CreateR2WithLayout<int>(
       {{1, 2, 3}, {4, 5, 6}}, layout_r2_dim0major_);
   EXPECT_EQ(mat_dim0major->s32s_size(), 6);
-  EXPECT_MATCH(testing::PBToVec<int32>(mat_dim0major->s32s()),
-               testing::VectorMatcher<int32>({1, 2, 3, 4, 5, 6}));
+  EXPECT_THAT(mat_dim0major->s32s(), ElementsAre(1, 2, 3, 4, 5, 6));
 
   // Test expected memory layout when using Relayout to column major.
   auto relaid_mat_to_dim0minor =
       LiteralUtil::Relayout(*mat_dim0major, layout_r2_dim0minor_);
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_mat_to_dim0minor->s32s()),
-               testing::VectorMatcher<int32>({1, 4, 2, 5, 3, 6}));
+  EXPECT_THAT(relaid_mat_to_dim0minor->s32s(), ElementsAre(1, 4, 2, 5, 3, 6));
 }
 
 TEST_F(LiteralUtilTest, TestR3LinearLayout) {
@@ -558,28 +550,28 @@ TEST_F(LiteralUtilTest, TestR3LinearLayout) {
 
   EXPECT_EQ(lit_dim0minor->s32s_size(), 12);
   std::vector<int> expected_dim0minor{1, 7, 4, 10, 2, 8, 5, 11, 3, 9, 6, 12};
-  EXPECT_MATCH(testing::PBToVec<int32>(lit_dim0minor->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0minor));
+  EXPECT_THAT(lit_dim0minor->s32s(),
+              testing::ElementsAreArray(expected_dim0minor));
 
   // Test expected memory layout when using Relayout to row major.
   auto relaid_lit_to_dim0major =
       LiteralUtil::Relayout(*lit_dim0minor, layout_r3_dim0major_);
   std::vector<int> expected_dim0major{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_lit_to_dim0major->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0major));
+  EXPECT_THAT(relaid_lit_to_dim0major->s32s(),
+              testing::ElementsAreArray(expected_dim0major));
 
   // Test expected memory layout of R3 created with dim0-major (row-major).
   auto lit_dim0major = LiteralUtil::CreateR3FromArray3DWithLayout<int>(
       arr3d, layout_r3_dim0major_);
   EXPECT_EQ(lit_dim0major->s32s_size(), 12);
-  EXPECT_MATCH(testing::PBToVec<int32>(lit_dim0major->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0major));
+  EXPECT_THAT(lit_dim0major->s32s(),
+              testing::ElementsAreArray(expected_dim0major));
 
   // Test expected memory layout when using Relayout to column major.
   auto relaid_lit_to_dim0minor =
       LiteralUtil::Relayout(*lit_dim0major, layout_r3_dim0minor_);
-  EXPECT_MATCH(testing::PBToVec<int32>(relaid_lit_to_dim0minor->s32s()),
-               testing::VectorMatcher<int32>(expected_dim0minor));
+  EXPECT_THAT(relaid_lit_to_dim0minor->s32s(),
+              testing::ElementsAreArray(expected_dim0minor));
 }
 
 TEST_F(LiteralUtilTest, SliceR0S32) {
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 695e4e7f07..fc69d8eb3a 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1431,7 +1431,9 @@ cc_library(
     deps = [
         ":hlo",
         ":hlo_pass",
+        "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla/service/gpu:ir_emission_utils",
         "//tensorflow/core:lib",
     ],
@@ -1442,11 +1444,13 @@ cc_test(
     srcs = ["transpose_folding_test.cc"],
     deps = [
         ":hlo",
+        ":shape_inference",
         ":transpose_folding",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/client:computation_builder",
         "//tensorflow/compiler/xla/service/gpu:ir_emission_utils",
         "//tensorflow/core:lib",
         "//tensorflow/core:test_main",
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
index c5433d4b89..4fbdb15e70 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
@@ -232,7 +232,14 @@ Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
     pass.AddPass<ReshapeMover>();
     pass.AddPass<HloConstantFolding>();
   }
-  pipeline.AddPass<TransposeFolding>(PotentiallyImplementedAsEigenDot);
+  pipeline.AddPass<TransposeFolding>(
+      [](const HloInstruction& dot,
+         const TransposeFolding::OperandIndices& candidate_operands) {
+        return PotentiallyImplementedAsEigenDot(dot)
+                   ? candidate_operands
+                   : TransposeFolding::OperandIndices{};
+      },
+      TransposeFolding::NeverFoldTranspose);
   pipeline.AddPass<HloSubcomputationUnification>();
   pipeline.AddPass<HloCSE>(/*is_layout_sensitive=*/false);
   pipeline.AddPass<CpuInstructionFusion>();
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index f692f28bd9..1d2111c427 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -133,7 +133,13 @@ tensorflow::Status OptimizeHloModule(HloModule* hlo_module,
       pass.AddPass<HloConstantFolding>();
     }
     pipeline.AddPass<ConvolutionFolding>();
-    pipeline.AddPass<TransposeFolding>(ImplementedAsGemm);
+    pipeline.AddPass<TransposeFolding>(
+        [](const HloInstruction& dot,
+           const TransposeFolding::OperandIndices& candidate_operands) {
+          return ImplementedAsGemm(dot) ? candidate_operands
+                                        : TransposeFolding::OperandIndices{};
+        },
+        TransposeFolding::NeverFoldTranspose);
     pipeline.AddPass<HloSubcomputationUnification>();
     pipeline.AddPass<HloCSE>(/*is_layout_sensitive=*/false);
     pipeline.AddPass<HloDCE>();
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h b/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h
index 4d3e9b10b2..e8c68a6ef7 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h
+++ b/tensorflow/compiler/xla/service/gpu/ir_emission_utils.h
@@ -25,16 +25,7 @@ limitations under the License.
 namespace xla {
 namespace gpu {
 
-const int64 kWarpSize = 32;
-
-// Precondition: "hlo" is an operand of a Dot instruction.
-//
-// Returns whether "hlo" is foldable to its user.
-bool IsOperandFoldableToDot(const HloInstruction& hlo);
-
-// Returns true if GpuCompiler can fold any operands of "dot" into "dot" for
-// better performance.
-bool CanFoldOperandsIntoDot(const HloInstruction& dot);
+constexpr int64 kWarpSize = 32;
 
 // Returns true if `hlo` will be implemented as a call to BLAS gemm.
 bool ImplementedAsGemm(const HloInstruction& hlo);
diff --git a/tensorflow/compiler/xla/service/transpose_folding.cc b/tensorflow/compiler/xla/service/transpose_folding.cc
index 07e0ce89f6..cfb90e6e1d 100644
--- a/tensorflow/compiler/xla/service/transpose_folding.cc
+++ b/tensorflow/compiler/xla/service/transpose_folding.cc
@@ -21,7 +21,9 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/gpu/ir_emission_utils.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
@@ -30,43 +32,56 @@ namespace xla {
 
 namespace {
 
-bool IsOperandFoldableToDot(const HloInstruction& hlo) {
-  return hlo.IsRank2Transpose() &&
-         hlo.user_count() == 1;  // The dot is its only user.
-}
-
-bool CanFoldOperandsIntoDot(
+TransposeFolding::OperandIndices CanFoldOperandsIntoDot(
     const HloInstruction& dot,
-    const TransposeFolding::IsTransposableGemmFn& is_transposable_gemm) {
+    const TransposeFolding::TransposableGemmOperandsFn&
+        transposable_gemm_operands) {
   if (HloOpcode::kDot != dot.opcode()) {
-    return false;
+    return {};
   }
 
-  if (!is_transposable_gemm(dot)) {
-    return false;
+  TransposeFolding::OperandIndices operand_set;
+  for (int64 i = 0; i < dot.operand_count(); ++i) {
+    auto& operand = *dot.operand(i);
+    if (operand.IsRank2Transpose() && operand.user_count() == 1) {
+      operand_set.push_back(i);
+    }
   }
 
-  const HloInstruction* lhs = dot.operand(0);
-  const HloInstruction* rhs = dot.operand(1);
-  bool lhs_foldable = IsOperandFoldableToDot(*lhs);
-  bool rhs_foldable = IsOperandFoldableToDot(*rhs);
-  if (!lhs_foldable && !rhs_foldable) {
-    return false;
+  return transposable_gemm_operands(dot, operand_set);
+}
+
+TransposeFolding::OperandIndices CanFoldOperandsIntoConvolution(
+    const HloInstruction& convolution,
+    const TransposeFolding::TransposableConvOperandsFn&
+        transposable_conv_operands) {
+  if (HloOpcode::kConvolution != convolution.opcode()) {
+    return {};
   }
-  return true;
+
+  // We only support folding the RHS.
+  const int64 kRhsOperandIndex = 1;
+  auto& operand = *convolution.operand(kRhsOperandIndex);
+  if (operand.opcode() == HloOpcode::kTranspose && operand.user_count() == 1) {
+    return transposable_conv_operands(convolution, {kRhsOperandIndex});
+  }
+
+  return {};
 }
 
+using InstructionOperandsPair =
+    std::pair<HloInstruction*, TransposeFolding::OperandIndices>;
+
 // Folds the operands of `dot` that are foldable transposes. `computation` is
-// the parent HLO computation of `dot`. `module` is the parent HloModule of
-// `computation`.
+// the parent HLO computation of `dot`.
 //
 // Returns whether the module is changed.
-bool FoldTransposeIntoDot(HloInstruction* dot, HloComputation* computation) {
+bool FoldTransposeIntoDot(InstructionOperandsPair pair,
+                          HloComputation* computation) {
+  auto* dot = pair.first;
   std::vector<HloInstruction*> instructions_to_fuse(1, dot);
-  for (HloInstruction* operand : dot->operands()) {
-    if (IsOperandFoldableToDot(*operand)) {
-      instructions_to_fuse.push_back(operand);
-    }
+  for (const int64 operand_index : pair.second) {
+    instructions_to_fuse.push_back(dot->mutable_operand(operand_index));
   }
 
   // Early-exit if no operands are foldable.
@@ -79,28 +94,95 @@ bool FoldTransposeIntoDot(HloInstruction* dot, HloComputation* computation) {
   return true;
 }
 
+// Folds the operands of `convolution` that are foldable transposes.
+// `computation` is the parent HLO computation of `convolution`.
+//
+// Returns whether the module is changed.
+bool FoldTransposeIntoConvolution(InstructionOperandsPair pair,
+                                  HloComputation* computation) {
+  auto& convolution = *pair.first;
+
+  // We only support fusing the RHS transpose into convolution.
+  //
+  // ConvolutionDimensionNumbers doesn't make enough of a distinction between
+  // the output and the activations.
+  //
+  // TODO(b/37125184): Support transposing the LHS too.
+  if (pair.second.size() != 1 || pair.second.front() != 1) {
+    return false;
+  }
+
+  const ConvolutionDimensionNumbers& dnums =
+      convolution.convolution_dimension_numbers();
+  HloInstruction& transpose = *convolution.mutable_operand(1);
+  CHECK_EQ(transpose.opcode(), HloOpcode::kTranspose);
+  const auto& transpose_dimensions = transpose.dimensions();
+  HloInstruction& transpose_operand = *transpose.mutable_operand(0);
+
+  // Everything remains the same except for the kernel dimension numbers. We
+  // need to apply the transpose permutation to the original shape to figure out
+  // what the new logical dimensions are.
+  ConvolutionDimensionNumbers new_dnums = dnums;
+  new_dnums.set_kernel_input_feature_dimension(
+      transpose_dimensions[dnums.kernel_input_feature_dimension()]);
+  new_dnums.set_kernel_output_feature_dimension(
+      transpose_dimensions[dnums.kernel_output_feature_dimension()]);
+  for (auto& kernel_spatial_dimension :
+       *new_dnums.mutable_kernel_spatial_dimensions()) {
+    kernel_spatial_dimension = transpose_dimensions[kernel_spatial_dimension];
+  }
+
+  auto new_conv = HloInstruction::CreateConvolve(
+      convolution.shape(), convolution.mutable_operand(0), &transpose_operand,
+      convolution.window(), new_dnums);
+  TF_CHECK_OK(computation->ReplaceWithNewInstruction(&convolution,
+                                                     std::move(new_conv)));
+
+  return true;
+}
+
 }  // namespace
 
-TransposeFolding::TransposeFolding(IsTransposableGemmFn is_transposable_gemm)
-    : is_transposable_gemm_(std::move(is_transposable_gemm)) {}
+TransposeFolding::TransposeFolding(
+    TransposableGemmOperandsFn transposable_gemm_operands,
+    TransposableConvOperandsFn transposable_conv_operands)
+    : transposable_gemm_operands_(std::move(transposable_gemm_operands)),
+      transposable_conv_operands_(std::move(transposable_conv_operands)) {}
 
 StatusOr<bool> TransposeFolding::Run(HloModule* module) {
   // Modifying the graph while traversing is dangerous, so we find all folding
   // opportunities before actually folding them.
   HloComputation* entry_computation = module->entry_computation();
 
-  std::vector<HloInstruction*> foldable_dots;
-  auto visit_fn = [this, &foldable_dots](HloInstruction* instruction) {
-    if (CanFoldOperandsIntoDot(*instruction, is_transposable_gemm_)) {
-      foldable_dots.emplace_back(instruction);
+  std::vector<std::pair<HloInstruction*, OperandIndices>> foldable_dots;
+  std::vector<std::pair<HloInstruction*, OperandIndices>> foldable_convolutions;
+  auto visit_fn = [this, &foldable_dots,
+                   &foldable_convolutions](HloInstruction* instruction) {
+    {
+      OperandIndices operand_indices =
+          CanFoldOperandsIntoDot(*instruction, transposable_gemm_operands_);
+      if (!operand_indices.empty()) {
+        foldable_dots.emplace_back(instruction, operand_indices);
+      }
+    }
+    {
+      OperandIndices operand_indices = CanFoldOperandsIntoConvolution(
+          *instruction, transposable_conv_operands_);
+      if (!operand_indices.empty()) {
+        foldable_convolutions.emplace_back(
+            std::make_pair(instruction, operand_indices));
+      }
     }
     return tensorflow::Status::OK();
   };
   TF_RETURN_IF_ERROR(entry_computation->root_instruction()->Accept(visit_fn));
 
   bool changed = false;
-  for (HloInstruction* dot : foldable_dots) {
-    changed |= FoldTransposeIntoDot(dot, entry_computation);
+  for (InstructionOperandsPair& pair : foldable_dots) {
+    changed |= FoldTransposeIntoDot(pair, entry_computation);
+  }
+  for (InstructionOperandsPair& pair : foldable_convolutions) {
+    changed |= FoldTransposeIntoConvolution(pair, entry_computation);
   }
   return changed;
 }
diff --git a/tensorflow/compiler/xla/service/transpose_folding.h b/tensorflow/compiler/xla/service/transpose_folding.h
index d857c04ed8..71e8446452 100644
--- a/tensorflow/compiler/xla/service/transpose_folding.h
+++ b/tensorflow/compiler/xla/service/transpose_folding.h
@@ -25,16 +25,37 @@ namespace xla {
 // operator is implemented by a GEMM kernel that can transpose its inputs.
 class TransposeFolding : public HloPassInterface {
  public:
-  // IsTransposableGemmFn should return true iff the instruction argument is
-  // implemented as a GEMM kernel that supports transposing its arguments.
-  typedef std::function<bool(const HloInstruction&)> IsTransposableGemmFn;
-  explicit TransposeFolding(IsTransposableGemmFn is_transposable_gemm);
+  using OperandIndices = std::vector<int64>;
+
+  // Returns the set of foldable operands for a given HLO and some candidate
+  // operands.
+  using FoldableOperands = std::function<OperandIndices(const HloInstruction&,
+                                                        const OperandIndices&)>;
+  using TransposableGemmOperandsFn = FoldableOperands;
+  using TransposableConvOperandsFn = FoldableOperands;
+
+  // Helper function to explicitly not fold transposes.
+  static OperandIndices NeverFoldTranspose(const HloInstruction&,
+                                           const OperandIndices&) {
+    return {};
+  }
+  // transposable_gemm_operands returns the set of operands it wants to fold if
+  // the instruction argument is implemented as a GEMM kernel that supports
+  // transposing its arguments.
+  //
+  // transposable_conv_operands returns the set of operands it wants to fold if
+  // the instruction argument is implemented as a convolution that supports
+  // transposing its arguments.
+  explicit TransposeFolding(
+      TransposableGemmOperandsFn transposable_gemm_operands,
+      TransposableConvOperandsFn transposable_conv_operands);
   tensorflow::StringPiece name() const override { return "transpose-folding"; }
 
   StatusOr<bool> Run(HloModule* module) override;
 
  private:
-  IsTransposableGemmFn is_transposable_gemm_;
+  TransposableGemmOperandsFn transposable_gemm_operands_;
+  TransposableConvOperandsFn transposable_conv_operands_;
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/transpose_folding_test.cc b/tensorflow/compiler/xla/service/transpose_folding_test.cc
index 09f932e29e..ea5ab2b917 100644
--- a/tensorflow/compiler/xla/service/transpose_folding_test.cc
+++ b/tensorflow/compiler/xla/service/transpose_folding_test.cc
@@ -16,15 +16,17 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/transpose_folding.h"
 
 #include <memory>
-#include <set>
+#include <unordered_set>
 #include <vector>
 
+#include "tensorflow/compiler/xla/client/computation_builder.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/gpu/ir_emission_utils.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/shape_inference.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
@@ -35,12 +37,22 @@ namespace xla {
 class TransposeFoldingTest : public ::testing::Test {
  protected:
   void FoldTranspose(HloModule* module) {
-    TransposeFolding transpose_folding(gpu::ImplementedAsGemm);
+    TransposeFolding transpose_folding(
+        [](const HloInstruction& dot,
+           const TransposeFolding::OperandIndices& candidate_operands) {
+          return gpu::ImplementedAsGemm(dot)
+                     ? candidate_operands
+                     : TransposeFolding::OperandIndices{};
+        },
+        [](const HloInstruction& convolution,
+           const TransposeFolding::OperandIndices& candidate_operands) {
+          return candidate_operands;
+        });
     EXPECT_IS_OK(transpose_folding.Run(module).status());
   }
 };
 
-TEST_F(TransposeFoldingTest, FoldTranspose) {
+TEST_F(TransposeFoldingTest, FoldDotTranspose) {
   auto builder = HloComputation::Builder("entry_computation");
   HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
       /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {2, 3}),
@@ -61,7 +73,7 @@ TEST_F(TransposeFoldingTest, FoldTranspose) {
   FoldTranspose(&module);
 
   // Instructions after folding: x, y, and the fusion.
-  std::set<HloInstruction*> instruction_set;
+  std::unordered_set<HloInstruction*> instruction_set;
   for (auto& instruction : entry_computation->instructions()) {
     instruction_set.insert(instruction.get());
   }
@@ -77,7 +89,7 @@ TEST_F(TransposeFoldingTest, FoldTranspose) {
   EXPECT_EQ(4, fusion->fused_instructions().size());
 }
 
-TEST_F(TransposeFoldingTest, FoldTransposeConstant) {
+TEST_F(TransposeFoldingTest, FoldDotTransposeConstant) {
   auto builder = HloComputation::Builder("entry_computation");
   // 2x1
   HloInstruction* const0 = builder.AddInstruction(
@@ -115,7 +127,7 @@ TEST_F(TransposeFoldingTest, FoldTransposeConstant) {
             entry_computation->root_instruction()->fused_instructions().size());
 }
 
-TEST_F(TransposeFoldingTest, FuseWithConstantOperands) {
+TEST_F(TransposeFoldingTest, FuseDotWithConstantOperands) {
   auto builder = HloComputation::Builder("entry");
   // (1.0 + 2.0) * (2.0 - 3.0)
   HloInstruction* const1 = builder.AddInstruction(
@@ -146,4 +158,168 @@ TEST_F(TransposeFoldingTest, FuseWithConstantOperands) {
   EXPECT_EQ(6, callee_computation->instructions().size());
 }
 
+// Test that a two dimension swap of the kernel gets folded into convolution.
+TEST_F(TransposeFoldingTest, FoldConvDimSwapTransposeRhs) {
+  auto builder = HloComputation::Builder("entry_computation");
+  HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {2, 3, 1, 1}),
+      /*name=*/"x"));
+  HloInstruction* y = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/1, ShapeUtil::MakeShape(F32, {3, 2, 1, 1}),
+      /*name=*/"y"));
+  HloInstruction* transpose_y =
+      builder.AddInstruction(HloInstruction::CreateTranspose(
+          ShapeUtil::MakeShape(F32, {2, 3, 1, 1}), y, {1, 0, 2, 3}));
+  auto dnums = ComputationBuilder::CreateDefaultConvDimensionNumbers();
+  Window window;
+  for (int i = 0; i < 2; ++i) {
+    WindowDimension* dim = window.add_dimensions();
+    dim->set_padding_low(0);
+    dim->set_padding_high(0);
+    dim->set_base_dilation(1);
+    dim->set_window_dilation(1);
+    dim->set_stride(1);
+    dim->set_size(
+        transpose_y->shape().dimensions(dnums.kernel_spatial_dimensions(i)));
+  }
+  StatusOr<Shape> conv_shape = ShapeInference::InferConvolveShape(
+      x->shape(), transpose_y->shape(), window, dnums);
+  EXPECT_IS_OK(conv_shape);
+  HloInstruction* conv = builder.AddInstruction(HloInstruction::CreateConvolve(
+      conv_shape.ValueOrDie(), x, transpose_y, window, dnums));
+
+  HloModule module("test_module");
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build(conv));
+  FoldTranspose(&module);
+
+  // Instructions after folding: x, y, and the convolution.
+  std::unordered_set<HloInstruction*> instruction_set;
+  for (auto& instruction : entry_computation->instructions()) {
+    instruction_set.insert(instruction.get());
+  }
+  CHECK_EQ(1, instruction_set.erase(x)) << "x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(y)) << "y is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.size())
+      << "entry_computation should contain exactly 3 instructions.";
+  HloInstruction* new_conv = *instruction_set.begin();
+  EXPECT_EQ(HloOpcode::kConvolution, new_conv->opcode());
+  EXPECT_EQ(dnums.kernel_input_feature_dimension(),
+            new_conv->convolution_dimension_numbers()
+                .kernel_output_feature_dimension());
+  EXPECT_EQ(dnums.kernel_output_feature_dimension(),
+            new_conv->convolution_dimension_numbers()
+                .kernel_input_feature_dimension());
+}
+
+// Test that a complex transpose of the kernel gets folded into convolution.
+TEST_F(TransposeFoldingTest, FoldConvComplexTransposeRhs) {
+  auto builder = HloComputation::Builder("entry_computation");
+  HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {2, 3, 1, 1}),
+      /*name=*/"x"));
+  HloInstruction* y = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/1, ShapeUtil::MakeShape(F32, {1, 2, 1, 3}),
+      /*name=*/"y"));
+  HloInstruction* transpose_y =
+      builder.AddInstruction(HloInstruction::CreateTranspose(
+          ShapeUtil::MakeShape(F32, {2, 3, 1, 1}), y, {1, 3, 0, 2}));
+  auto dnums = ComputationBuilder::CreateDefaultConvDimensionNumbers();
+  Window window;
+  for (int i = 0; i < 2; ++i) {
+    WindowDimension* dim = window.add_dimensions();
+    dim->set_padding_low(0);
+    dim->set_padding_high(0);
+    dim->set_base_dilation(1);
+    dim->set_window_dilation(1);
+    dim->set_stride(1);
+    dim->set_size(
+        transpose_y->shape().dimensions(dnums.kernel_spatial_dimensions(i)));
+  }
+  StatusOr<Shape> conv_shape = ShapeInference::InferConvolveShape(
+      x->shape(), transpose_y->shape(), window, dnums);
+  EXPECT_IS_OK(conv_shape);
+  HloInstruction* conv = builder.AddInstruction(HloInstruction::CreateConvolve(
+      conv_shape.ValueOrDie(), x, transpose_y, window, dnums));
+
+  HloModule module("test_module");
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build(conv));
+  FoldTranspose(&module);
+
+  // Instructions after folding: x, y, and the convolution.
+  std::unordered_set<HloInstruction*> instruction_set;
+  for (auto& instruction : entry_computation->instructions()) {
+    instruction_set.insert(instruction.get());
+  }
+  CHECK_EQ(1, instruction_set.erase(x)) << "x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(y)) << "y is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.size())
+      << "entry_computation should contain exactly 3 instructions.";
+  HloInstruction* new_conv = *instruction_set.begin();
+  EXPECT_EQ(HloOpcode::kConvolution, new_conv->opcode());
+  EXPECT_EQ(dnums.kernel_input_feature_dimension(),
+            new_conv->convolution_dimension_numbers()
+                .kernel_output_feature_dimension());
+  EXPECT_EQ(dnums.kernel_spatial_dimensions(1),
+            new_conv->convolution_dimension_numbers()
+                .kernel_input_feature_dimension());
+  EXPECT_EQ(
+      dnums.kernel_output_feature_dimension(),
+      new_conv->convolution_dimension_numbers().kernel_spatial_dimensions(0));
+  EXPECT_EQ(
+      dnums.kernel_spatial_dimensions(0),
+      new_conv->convolution_dimension_numbers().kernel_spatial_dimensions(1));
+}
+
+// Test that a transpose of the activations does not get folded into
+// convolution.
+TEST_F(TransposeFoldingTest, FoldConvTransposeLhs) {
+  auto builder = HloComputation::Builder("entry_computation");
+  HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {3, 2, 1, 1}),
+      /*name=*/"x"));
+  HloInstruction* y = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/1, ShapeUtil::MakeShape(F32, {2, 3, 1, 1}),
+      /*name=*/"y"));
+  HloInstruction* transpose_x =
+      builder.AddInstruction(HloInstruction::CreateTranspose(
+          ShapeUtil::MakeShape(F32, {2, 3, 1, 1}), x, {1, 0, 2, 3}));
+  auto dnums = ComputationBuilder::CreateDefaultConvDimensionNumbers();
+  Window window;
+  for (int i = 0; i < 2; ++i) {
+    WindowDimension* dim = window.add_dimensions();
+    dim->set_padding_low(0);
+    dim->set_padding_high(0);
+    dim->set_base_dilation(1);
+    dim->set_window_dilation(1);
+    dim->set_stride(1);
+    dim->set_size(y->shape().dimensions(dnums.kernel_spatial_dimensions(i)));
+  }
+  StatusOr<Shape> conv_shape = ShapeInference::InferConvolveShape(
+      transpose_x->shape(), y->shape(), window, dnums);
+  EXPECT_IS_OK(conv_shape);
+  HloInstruction* conv = builder.AddInstruction(HloInstruction::CreateConvolve(
+      conv_shape.ValueOrDie(), transpose_x, y, window, dnums));
+
+  HloModule module("test_module");
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build(conv));
+  FoldTranspose(&module);
+
+  // Instructions after folding: transpose_x, y, and the convolution.
+  std::unordered_set<HloInstruction*> instruction_set;
+  for (auto& instruction : entry_computation->instructions()) {
+    instruction_set.insert(instruction.get());
+  }
+  CHECK_EQ(1, instruction_set.erase(x)) << "x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(y)) << "y is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(transpose_x))
+      << "transpose_x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(conv))
+      << "transpose_x is not in entry_computation.";
+  CHECK_EQ(0, instruction_set.size())
+      << "entry_computation should contain exactly 4 instructions.";
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/test.h b/tensorflow/compiler/xla/test.h
new file mode 100644
index 0000000000..87a8c5f3a5
--- /dev/null
+++ b/tensorflow/compiler/xla/test.h
@@ -0,0 +1,48 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_COMPLIER_XLA_TEST_H_
+#define TENSORFLOW_COMPLIER_XLA_TEST_H_
+
+// This header includes gmock.h and enables the use of gmock matchers in tests
+// in third_party/tensorflow/compiler/xla.
+//
+// Test including this header can use the macros EXPECT_THAT(...) and
+// ASSERT_THAT(...) in combination with gmock matchers.
+// Example:
+//  std::vector<int> vec = Foo();
+//  EXPECT_THAT(vec, ::testing::ElementsAre(1,2,3));
+//
+// For more details on gmock matchers see:
+// https://github.com/google/googletest/blob/master/googlemock/docs/CheatSheet.md#matchers
+//
+// The advantages of using gmock matchers instead of self defined matchers are
+// better error messages, more maintainable tests and more test coverage.
+//
+// Note that while the use of gmock matchers is allowed in the xla project, the
+// use of mocks is disallowed in the whole tensorflow project!
+
+#include "tensorflow/core/platform/platform.h"
+
+#if defined(PLATFORM_GOOGLE) || defined(PLATFORM_GOOGLE_ANDROID)
+#include "testing/base/public/gmock.h"
+#else
+#include <gmock/gmock-generated-matchers.h>
+#include <gmock/gmock-matchers.h>
+#endif
+
+#include "tensorflow/core/platform/test.h"
+
+#endif  // TENSORFLOW_COMPLIER_XLA_TEST_H_
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h
index 22ec5349f8..5e316538ce 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h
@@ -55,7 +55,7 @@ class WeightedQuantilesBuffer {
       : max_size_(std::min(block_size << 1, max_elements)) {
     QCHECK(max_size_ > 0) << "Invalid buffer specification: (" << block_size
                           << ", " << max_elements << ")";
-    map_.reserve(max_size_);
+    vec_.reserve(max_size_);
   }
 
   // Disallow copying as it's semantically non-sensical in the Squawd algorithm
@@ -77,42 +77,48 @@ class WeightedQuantilesBuffer {
       return;
     }
 
-    // Insert entry to map if not already present else
-    // accumulate the new weight.
-    auto result = map_.insert(BufferMapEntry(value, weight));
-    if (!result.second) {
-      result.first->second += weight;
-    }
+    // Push back the entry to the buffer.
+    vec_.push_back(BufferEntry(value, weight));
   }
 
-  // Returns a sorted vector view of the base buffer. Callers should
-  // minimize how often this is called, ideally only right after the buffer
-  // becomes full.
-  std::vector<BufferEntry> GenerateEntryList() const {
+  // Returns a sorted vector view of the base buffer and clears the buffer.
+  // Callers should minimize how often this is called, ideally only right after
+  // the buffer becomes full.
+  std::vector<BufferEntry> GenerateEntryList() {
     std::vector<BufferEntry> ret;
-    ret.reserve(map_.size());
-    std::transform(map_.begin(), map_.end(), std::back_inserter(ret),
-                   [](const BufferMapEntry& map_entry) {
-                     return BufferEntry(map_entry.first, map_entry.second);
-                   });
+    if (vec_.size() == 0) {
+      return ret;
+    }
+    ret.swap(vec_);
+    vec_.reserve(max_size_);
     std::sort(ret.begin(), ret.end());
+    size_t num_entries = 0;
+    for (size_t i = 1; i < ret.size(); ++i) {
+      if (ret[i].value != ret[i - 1].value) {
+        BufferEntry tmp = ret[i];
+        ++num_entries;
+        ret[num_entries] = tmp;
+      } else {
+        ret[num_entries].weight += ret[i].weight;
+      }
+    }
+    ret.resize(num_entries + 1);
     return ret;
   }
 
-  int64 Size() const { return map_.size(); }
-  bool IsFull() const { return map_.size() >= max_size_; }
-  void Clear() { map_.clear(); }
+  int64 Size() const { return vec_.size(); }
+  bool IsFull() const { return vec_.size() >= max_size_; }
+  void Clear() { vec_.clear(); }
 
  private:
-  using BufferMap = typename std::unordered_map<ValueType, WeightType>;
-  using BufferMapEntry = typename BufferMap::value_type;
+  using BufferVector = typename std::vector<BufferEntry>;
 
   // Comparison function.
   static constexpr decltype(CompareFn()) kCompFn = CompareFn();
 
   // Base buffer.
   size_t max_size_;
-  BufferMap map_;
+  BufferVector vec_;
 };
 
 template <typename ValueType, typename WeightType, typename CompareFn>
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc
index 02696fb4f1..8e40318665 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer_test.cc
@@ -69,46 +69,31 @@ TEST_F(WeightedQuantilesBufferTest, PushEntryFull) {
   expected.emplace_back(2, 4);
   expected.emplace_back(5, 9);
 
-  // At this point, we have a compaction and duplicate entry 2 is merged.
-  EXPECT_FALSE(buffer.IsFull());
-  EXPECT_EQ(buffer.GenerateEntryList(), expected);
-
-  // Push another unique entry.
-  buffer.PushEntry(3, 2);
+  // At this point, we have pushed 4 entries and we expect the buffer to be
+  // full.
   EXPECT_TRUE(buffer.IsFull());
-
-  // Can't push any more entries before clearing.
-  EXPECT_DEATH(({ buffer.PushEntry(6, 6); }), "Buffer already full");
+  EXPECT_EQ(buffer.GenerateEntryList(), expected);
+  EXPECT_FALSE(buffer.IsFull());
 }
 
-TEST_F(WeightedQuantilesBufferTest, RandomizedPush) {
-  // buffer capacity is 6.
-  Buffer buffer(3, 100);
-  std::array<double, 5> elements = {{1.1, 2.3, 5.1, 8.0, 12.6}};
-  std::array<double, elements.size()> counts;
-  counts.fill(0.0);
-
-  random::PhiloxRandom philox(13);
-  random::SimplePhilox rand(&philox);
-
-  for (int iters = 10000; iters-- > 0; --iters) {
-    // Add entry.
-    int32 picked_idx = rand.Uniform(elements.size());
-    buffer.PushEntry(elements[picked_idx], 1.0);
-    ++counts[picked_idx];
-
-    // We can't fill buffer with a number of unique elements < capacity.
-    EXPECT_FALSE(buffer.IsFull());
-  }
+TEST_F(WeightedQuantilesBufferTest, PushEntryFullDeath) {
+  // buffer capacity is 4.
+  Buffer buffer(2, 100);
+  buffer.PushEntry(5, 9);
+  buffer.PushEntry(2, 3);
+  buffer.PushEntry(-1, 7);
+  buffer.PushEntry(2, 1);
 
-  // Ensure we didn't lose any information.
   std::vector<BufferEntry> expected;
-  for (int i = 0; i < elements.size(); ++i) {
-    if (counts[i] > 0) {
-      expected.emplace_back(elements[i], counts[i]);
-    }
-  }
-  EXPECT_EQ(buffer.GenerateEntryList(), expected);
+  expected.emplace_back(-1, 7);
+  expected.emplace_back(2, 4);
+  expected.emplace_back(5, 9);
+
+  // At this point, we have pushed 4 entries and we expect the buffer to be
+  // full.
+  EXPECT_TRUE(buffer.IsFull());
+  // Can't push any more entries before clearing.
+  EXPECT_DEATH(({ buffer.PushEntry(6, 6); }), "Buffer already full");
 }
 
 }  // namespace
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
index ad2358e4c4..daf0e48000 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
@@ -91,12 +91,11 @@ class WeightedQuantilesStream {
     // and push weighted quantile summary up the level chain.
     if (buffer_.IsFull()) {
       PushBuffer(buffer_);
-      buffer_.Clear();
     }
   }
 
   // Pushes full buffer while maintaining approximation error invariants.
-  void PushBuffer(const Buffer& buffer) {
+  void PushBuffer(Buffer& buffer) {
     // Validate state.
     QCHECK(!finalized_) << "Finalize() already called.";
 
@@ -124,7 +123,6 @@ class WeightedQuantilesStream {
 
     // Flush any remaining buffer elements.
     PushBuffer(buffer_);
-    buffer_.Clear();
 
     // Create final merged summary.
     local_summary_.Clear();
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
index e6d10bf08b..0bdfb40664 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
@@ -91,9 +91,10 @@ TEST_F(WeightedQuantilesSummaryTest, BuildFromBuffer) {
 }
 
 TEST_F(WeightedQuantilesSummaryTest, CompressSeparately) {
+  const auto entry_list = buffer1_->GenerateEntryList();
   for (int new_size = 9; new_size >= 2; --new_size) {
     Summary summary;
-    summary.BuildFromBufferEntries(buffer1_->GenerateEntryList());
+    summary.BuildFromBufferEntries(entry_list);
     summary.Compress(new_size);
 
     // Expect a max approximation error of 1 / n
@@ -161,10 +162,12 @@ TEST_F(WeightedQuantilesSummaryTest, CompressRandomized) {
 
 TEST_F(WeightedQuantilesSummaryTest, MergeSymmetry) {
   // Create two separate summaries and merge.
+  const auto list_1 = buffer1_->GenerateEntryList();
+  const auto list_2 = buffer2_->GenerateEntryList();
   Summary summary1;
-  summary1.BuildFromBufferEntries(buffer1_->GenerateEntryList());
+  summary1.BuildFromBufferEntries(list_1);
   Summary summary2;
-  summary2.BuildFromBufferEntries(buffer2_->GenerateEntryList());
+  summary2.BuildFromBufferEntries(list_2);
 
   // Merge summary 2 into 1 and verify.
   summary1.Merge(summary2);
@@ -178,7 +181,7 @@ TEST_F(WeightedQuantilesSummaryTest, MergeSymmetry) {
   EXPECT_EQ(summary1.Size(), 14);  // 14 unique values.
 
   // Merge summary 1 into 2 and verify same result.
-  summary1.BuildFromBufferEntries(buffer1_->GenerateEntryList());
+  summary1.BuildFromBufferEntries(list_1);
   summary2.Merge(summary1);
   EXPECT_EQ(summary2.ApproximationError(), 0.0);
   EXPECT_EQ(summary2.MinValue(),
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 39fbf603f0..178e03c222 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -212,7 +212,6 @@ add_python_module("tensorflow/tensorboard")
 add_python_module("tensorflow/tensorboard/backend")
 add_python_module("tensorflow/tensorboard/backend/event_processing")
 add_python_module("tensorflow/tensorboard/plugins")
-add_python_module("tensorflow/tensorboard/plugins/debugger")
 add_python_module("tensorflow/tensorboard/plugins/projector")
 add_python_module("tensorflow/tensorboard/plugins/text")
 add_python_module("tensorflow/tensorboard/scripts")
diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index 7f359bea51..8dc78da6ba 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -202,6 +202,7 @@ tf_py_test(
     additional_deps = [
         ":factorization_py",
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
+        ":factorization_ops_test_utils_py",
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
diff --git a/tensorflow/contrib/factorization/python/ops/factorization_ops.py b/tensorflow/contrib/factorization/python/ops/factorization_ops.py
index b853652629..8fb33dad6f 100644
--- a/tensorflow/contrib/factorization/python/ops/factorization_ops.py
+++ b/tensorflow/contrib/factorization/python/ops/factorization_ops.py
@@ -190,7 +190,8 @@ class WALSModel(object):
                num_col_shards=1,
                row_weights=1,
                col_weights=1,
-               use_factors_weights_cache=True):
+               use_factors_weights_cache=True,
+               use_gramian_cache=True):
     """Creates model for WALS matrix factorization.
 
     Args:
@@ -224,6 +225,8 @@ class WALSModel(object):
       col_weights: See row_weights.
       use_factors_weights_cache: When True, the factors and weights will be
         cached on the workers before the updates start. Defaults to True.
+      use_gramian_cache: When True, the Gramians will be cached on the workers
+        before the updates start. Defaults to True.
     """
     self._input_rows = input_rows
     self._input_cols = input_cols
@@ -243,6 +246,7 @@ class WALSModel(object):
                                                   self._num_col_shards,
                                                   "col_weights")
     self._use_factors_weights_cache = use_factors_weights_cache
+    self._use_gramian_cache = use_gramian_cache
     self._row_factors = self._create_factors(self._input_rows,
                                              self._n_components,
                                              self._num_row_shards, row_init,
@@ -495,10 +499,13 @@ class WALSModel(object):
     """Creates local cache of factors, weights and gramian for rows and columns.
 
     Note that currently the caching strategy is as follows:
-    When initiating a row(column) update, the column(row) gramian is computed
-    and cached while the row gramian is reset; optionally, column(row) factors
-    and weights are cached and row(column) factors and weights are reset when
-    use_factors_weights_cache is True.
+    When initiating a row (resp. column) update:
+      - The column (resp. row) gramian is computed.
+      - Optionally, if use_gramian_cache is True, the column (resp. row) Gramian
+        is cached, while the row (resp. column) gramian is reset.
+      - Optionally, if use_factors_weights_cache is True, the column (resp. row)
+        factors and weights are cached, while the row (resp. column) factors and
+        weights are reset.
     """
 
     (self._row_factors_cache, row_factors_cache_init,
@@ -515,18 +522,20 @@ class WALSModel(object):
         self._row_weights,
         "row_wt_cache",
         pass_through=not self._use_factors_weights_cache)
-
     (self._col_wt_cache, col_wt_cache_init, _) = self._cached_copy(
         self._col_weights,
         "col_wt_cache",
         pass_through=not self._use_factors_weights_cache)
-
     (self._row_gramian_cache, row_gramian_cache_init,
      row_gramian_cache_reset) = self._cached_copy(
-         self._row_gramian, "row_gramian_cache", pass_through=False)
+         self._row_gramian,
+         "row_gramian_cache",
+         pass_through=not self._use_gramian_cache)
     (self._col_gramian_cache, col_gramian_cache_init,
      col_gramian_cache_reset) = self._cached_copy(
-         self._col_gramian, "col_gramian_cache", pass_through=False)
+         self._col_gramian,
+         "col_gramian_cache",
+         pass_through=not self._use_gramian_cache)
 
     self._row_updates_init = control_flow_ops.group(col_factors_cache_init,
                                                     row_factors_cache_reset,
diff --git a/tensorflow/contrib/factorization/python/ops/wals.py b/tensorflow/contrib/factorization/python/ops/wals.py
index 3fd2cbbec2..41211859f1 100644
--- a/tensorflow/contrib/factorization/python/ops/wals.py
+++ b/tensorflow/contrib/factorization/python/ops/wals.py
@@ -18,7 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.contrib.factorization.python.ops import factorization_ops
 from tensorflow.contrib.framework.python.ops import variables as framework_variables
+from tensorflow.contrib.learn.python.learn.estimators import estimator
+from tensorflow.contrib.learn.python.learn.estimators import model_fn
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -221,3 +224,321 @@ class _SweepHook(session_run_hook.SessionRunHook):
     self._is_sweep_done = run_values.results[0]
     logging.info("Partial fit done.")
 
+
+def _wals_factorization_model_function(features, labels, mode, params):
+  """Model function for the WALSFactorization estimator.
+
+  Args:
+    features: Dictionary of features. See WALSMatrixFactorization.
+    labels: Must be None.
+    mode: A model_fn.ModeKeys object.
+    params: Dictionary of parameters containing arguments passed to the
+      WALSMatrixFactorization constructor.
+
+  Returns:
+    A ModelFnOps object.
+  """
+  assert labels is None
+  use_factors_weights_cache = (
+      params["use_factors_weights_cache_for_training"]
+      and mode == model_fn.ModeKeys.TRAIN)
+  use_gramian_cache = (
+      params["use_gramian_cache_for_training"]
+      and mode == model_fn.ModeKeys.TRAIN)
+  model = factorization_ops.WALSModel(
+      params["num_rows"],
+      params["num_cols"],
+      params["embedding_dimension"],
+      unobserved_weight=params["unobserved_weight"],
+      regularization=params["regularization_coeff"],
+      row_init=params["row_init"],
+      col_init=params["col_init"],
+      num_row_shards=params["num_row_shards"],
+      num_col_shards=params["num_col_shards"],
+      row_weights=params["row_weights"],
+      col_weights=params["col_weights"],
+      use_factors_weights_cache=use_factors_weights_cache,
+      use_gramian_cache=use_gramian_cache)
+
+  # Get input rows and cols. We either update rows or columns depending on
+  # the value of row_sweep, which is maintained using a session hook
+  input_rows = features[WALSMatrixFactorization.INPUT_ROWS]
+  input_cols = features[WALSMatrixFactorization.INPUT_COLS]
+  input_row_indices, _ = array_ops.unique(input_rows.indices[:, 0])
+  input_col_indices, _ = array_ops.unique(input_cols.indices[:, 0])
+
+  # Train ops, controlled using the SweepHook
+  # We need to run the following ops:
+  # Before a row sweep:
+  #   row_update_prep_gramian_op
+  #   initialize_row_update_op
+  # During a row sweep:
+  #   update_row_factors_op
+  # Before a col sweep:
+  #   col_update_prep_gramian_op
+  #   initialize_col_update_op
+  # During a col sweep:
+  #   update_col_factors_op
+
+  is_row_sweep_var = variables.Variable(
+      True, "is_row_sweep",
+      collections=[ops.GraphKeys.GLOBAL_VARIABLES])
+  # The row sweep is determined by is_row_sweep_var (controlled by the
+  # sweep_hook) in TRAIN mode, and manually in EVAL mode.
+  is_row_sweep = (features[WALSMatrixFactorization.PROJECT_ROW]
+                  if mode == model_fn.ModeKeys.EVAL else is_row_sweep_var)
+
+  def update_row_factors():
+    return model.update_row_factors(sp_input=input_rows, transpose_input=False)
+  def update_col_factors():
+    return model.update_col_factors(sp_input=input_cols, transpose_input=True)
+  _, train_op, loss = control_flow_ops.cond(
+      is_row_sweep, update_row_factors, update_col_factors)
+
+  row_prep_ops = [model.row_update_prep_gramian_op,
+                  model.initialize_row_update_op]
+  col_prep_ops = [model.col_update_prep_gramian_op,
+                  model.initialize_col_update_op]
+  cache_init_ops = [model.worker_init]
+
+  sweep_hook = _SweepHook(
+      is_row_sweep_var,
+      train_op,
+      params["num_rows"],
+      params["num_cols"],
+      input_row_indices,
+      input_col_indices,
+      row_prep_ops,
+      col_prep_ops,
+      cache_init_ops,
+  )
+
+  # Prediction ops (only return predictions in INFER mode)
+  predictions = {}
+  if mode == model_fn.ModeKeys.INFER:
+    project_row = features[WALSMatrixFactorization.PROJECT_ROW]
+    projection_weights = features.get(
+        WALSMatrixFactorization.PROJECTION_WEIGHTS)
+    def get_row_projection():
+      return model.project_row_factors(
+          sp_input=input_rows,
+          projection_weights=projection_weights,
+          transpose_input=False)
+    def get_col_projection():
+      return model.project_col_factors(
+          sp_input=input_cols,
+          projection_weights=projection_weights,
+          transpose_input=True)
+
+    predictions[WALSMatrixFactorization.PROJECTION_RESULT] = (
+        control_flow_ops.cond(
+            project_row, get_row_projection, get_col_projection))
+
+  return model_fn.ModelFnOps(
+      mode=mode,
+      predictions=predictions,
+      loss=loss,
+      eval_metric_ops={},
+      train_op=train_op,
+      training_hooks=[sweep_hook])
+
+
+class WALSMatrixFactorization(estimator.Estimator):
+  """An Estimator for Weighted Matrix Factorization, using the WALS method.
+
+  WALS (Weighted Alternating Least Squares) is an algorithm for weighted matrix
+  factorization. It computes a low-rank approximation of a given sparse (n x m)
+  matrix A, by a product of two matrices, U * V^T, where U is a (n x k) matrix
+  and V is a (m x k) matrix. Here k is the rank of the approximation, also
+  called the embedding dimension. We refer to U as the row factors, and V as the
+  column factors.
+  See tensorflow/contrib/factorization/g3doc/wals.md for the precise problem
+  formulation.
+
+  The training proceeds in sweeps: during a row_sweep, we fix V and solve for U.
+  During a column sweep, we fix U and solve for V. Each one of these problems is
+  an unconstrained quadratic minimization problem and can be solved exactly (it
+  can also be solved in mini-batches, since the solution decouples nicely).
+  The alternating between sweeps is achieved by using a hook during training,
+  which is responsible for keeping track of the sweeps and running preparation
+  ops at the beginning of each sweep. It also updates the global_step variable,
+  which keeps track of the number of batches processed since the beginning of
+  training.
+  The current implementation assumes that the training is run on a single
+  machine, and will fail if config.num_worker_replicas is not equal to one.
+  Training is done by calling self.fit(input_fn=input_fn), where input_fn
+  provides two queues: one for rows of the input matrix, and one for rows of the
+  transposed input matrix (i.e. columns of the original matrix). Note that
+  during a row sweep, only row batches are processed (ignoring column batches)
+  and vice-versa.
+
+  For prediction, given a new set of input rows A' (e.g. new rows of the A
+  matrix), we compute a corresponding set of row factors U', such that U' * V^T
+  is a good approximation of A'. We call this operation a row projection. A
+  similar operation is defined for columns.
+  Projection is done by calling self.get_projections(input_fn=input_fn), where
+  input_fn satisfies the constraints given below.
+
+  The input functions must satisfy the following constraints: Calling input_fn
+  must return a tuple (features, labels) where labels is None, and features is
+  a dict containing the following keys:
+  TRAIN:
+    - WALSMatrixFactorization.INPUT_ROWS: float32 SparseTensor (matrix).
+      Rows of the input matrix to process (or to project).
+    - WALSMatrixFactorization.INPUT_COLS: float32 SparseTensor (matrix).
+      Columns of the input matrix to process (or to project), transposed.
+  INFER:
+    - WALSMatrixFactorization.INPUT_ROWS: float32 SparseTensor (matrix).
+      Rows to project.
+    - WALSMatrixFactorization.INPUT_COLS: float32 SparseTensor (matrix).
+      Columns to project.
+    - WALSMatrixFactorization.PROJECT_ROW: Boolean Tensor. Whether to project
+      the rows or columns.
+    - WALSMatrixFactorization.PROJECTION_WEIGHTS (Optional): float32 Tensor
+      (vector). The weights to use in the projection.
+  EVAL:
+    - WALSMatrixFactorization.INPUT_ROWS: float32 SparseTensor (matrix).
+      Rows to project.
+    - WALSMatrixFactorization.INPUT_COLS: float32 SparseTensor (matrix).
+      Columns to project.
+    - WALSMatrixFactorization.PROJECT_ROW: Boolean Tensor. Whether to project
+      the rows or columns.
+  """
+  # Keys to be used in model_fn
+  # Features keys
+  INPUT_ROWS = "input_rows"
+  INPUT_COLS = "input_cols"
+  PROJECT_ROW = "project_row"
+  PROJECTION_WEIGHTS = "projection_weights"
+  # Predictions key
+  PROJECTION_RESULT = "projection"
+
+  def __init__(self,
+               num_rows,
+               num_cols,
+               embedding_dimension,
+               unobserved_weight=0.1,
+               regularization_coeff=None,
+               row_init="random",
+               col_init="random",
+               num_row_shards=1,
+               num_col_shards=1,
+               row_weights=1,
+               col_weights=1,
+               use_factors_weights_cache_for_training=True,
+               use_gramian_cache_for_training=True,
+               model_dir=None,
+               config=None):
+    """Creates a model for matrix factorization using the WALS method.
+
+    Args:
+      num_rows: Total number of rows for input matrix.
+      num_cols: Total number of cols for input matrix.
+      embedding_dimension: Dimension to use for the factors.
+      unobserved_weight: Weight of the unobserved entries of matrix.
+      regularization_coeff: Weight of the L2 regularization term. Defaults to
+        None, in which case the problem is not regularized.
+      row_init: Initializer for row factor. Must be either:
+        - A tensor: The row factor matrix is initialized to this tensor,
+        - A numpy constant,
+        - "random": The rows are initialized using a normal distribution.
+      col_init: Initializer for column factor. See row_init.
+      num_row_shards: Number of shards to use for the row factors.
+      num_col_shards: Number of shards to use for the column factors.
+      row_weights: Must be in one of the following three formats:
+        - None: In this case, the weight of every entry is the unobserved_weight
+          and the problem simplifies to ALS. Note that, in this case,
+          col_weights must also be set to "None".
+        - List of lists of non-negative scalars, of the form
+          [[w_0, w_1, ...], [w_k, ... ], [...]],
+          where the number of inner lists equal to the number of row factor
+          shards and the elements in each inner list are the weights for the
+          rows of that shard. In this case,
+          w_ij = unonbserved_weight + row_weights[i] * col_weights[j].
+        - A non-negative scalar: This value is used for all row weights.
+          Note that it is allowed to have row_weights as a list and col_weights
+          as a scalar, or vice-versa.
+      col_weights: See row_weights.
+      use_factors_weights_cache_for_training: Boolean, whether the factors and
+        weights will be cached on the workers before the updates start, during
+        training. Defaults to True.
+        Note that caching is disabled during prediction.
+      use_gramian_cache_for_training: Boolean, whether the Gramians will be
+        cached on the workers before the updates start, during training.
+        Defaults to True. Note that caching is disabled during prediction.
+      model_dir: The directory to save the model results and log files.
+      config: A Configuration object. See Estimator.
+
+    Raises:
+      ValueError: If config.num_worker_replicas is strictly greater than one.
+        The current implementation only supports running on a single worker.
+    """
+    # TODO(walidk): Support distributed training.
+    # TODO(walidk): Support power-law based weight computation.
+    # TODO(walidk): Add factor lookup by indices, with caching.
+    # TODO(walidk): Support caching during prediction.
+
+    params = {
+        "num_rows": num_rows,
+        "num_cols": num_cols,
+        "embedding_dimension": embedding_dimension,
+        "unobserved_weight": unobserved_weight,
+        "regularization_coeff": regularization_coeff,
+        "row_init": row_init,
+        "col_init": col_init,
+        "num_row_shards": num_row_shards,
+        "num_col_shards": num_col_shards,
+        "row_weights": row_weights,
+        "col_weights": col_weights,
+        "use_factors_weights_cache_for_training":
+            use_factors_weights_cache_for_training,
+        "use_gramian_cache_for_training": use_gramian_cache_for_training
+    }
+    self._row_factors_names = ["row_factors_shard_%d" % i
+                               for i in range(num_row_shards)]
+    self._col_factors_names = ["col_factors_shard_%d" % i
+                               for i in range(num_col_shards)]
+
+    super(WALSMatrixFactorization, self).__init__(
+        model_fn=_wals_factorization_model_function,
+        params=params,
+        model_dir=model_dir,
+        config=config)
+
+    if self._config is not None and self._config.num_worker_replicas > 1:
+      raise ValueError("WALSMatrixFactorization must be run on a single worker "
+                       "replica.")
+
+  def get_row_factors(self):
+    """Returns the row factors of the model, loading them from checkpoint.
+
+    Should only be run after training.
+
+    Returns:
+      A list of the row factors of the model.
+    """
+    return [self.get_variable_value(name) for name in self._row_factors_names]
+
+  def get_col_factors(self):
+    """Returns the column factors of the model, loading them from checkpoint.
+
+    Should only be run after training.
+
+    Returns:
+      A list of the column factors of the model.
+    """
+    return [self.get_variable_value(name) for name in self._col_factors_names]
+
+  def get_projections(self, input_fn):
+    """Computes the projections of the rows or columns given in input_fn.
+
+    Runs predict() with the given input_fn, and returns the results. Should only
+    be run after training.
+
+    Args:
+      input_fn: Input function which specifies the rows or columns to project.
+    Returns:
+      A generator of the projected factors.
+    """
+    return (result[WALSMatrixFactorization.PROJECTION_RESULT]
+            for result in self.predict(input_fn=input_fn))
diff --git a/tensorflow/contrib/factorization/python/ops/wals_test.py b/tensorflow/contrib/factorization/python/ops/wals_test.py
index 2ae2d3ab05..3f5787ea87 100644
--- a/tensorflow/contrib/factorization/python/ops/wals_test.py
+++ b/tensorflow/contrib/factorization/python/ops/wals_test.py
@@ -18,16 +18,311 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import itertools
+import json
+import numpy as np
+
+from tensorflow.contrib.factorization.python.ops import factorization_ops_test_utils
 from tensorflow.contrib.factorization.python.ops import wals as wals_lib
+from tensorflow.contrib.learn.python.learn import run_config
+from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
+from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import embedding_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
+from tensorflow.python.training import input as input_lib
 from tensorflow.python.training import session_run_hook
 
 
+class WALSMatrixFactorizationTest(test.TestCase):
+  INPUT_MATRIX = factorization_ops_test_utils.INPUT_MATRIX
+
+  def np_array_to_sparse(self, np_array):
+    """Transforms an np.array to a tf.SparseTensor."""
+    return factorization_ops_test_utils.np_matrix_to_tf_sparse(np_array)
+
+  def calculate_loss(self):
+    """Calculates the loss of the current (trained) model."""
+    current_rows = embedding_ops.embedding_lookup(
+        self._model.get_row_factors(), math_ops.range(self._num_rows),
+        partition_strategy='div')
+    current_cols = embedding_ops.embedding_lookup(
+        self._model.get_col_factors(), math_ops.range(self._num_cols),
+        partition_strategy='div')
+    row_wts = embedding_ops.embedding_lookup(
+        self._row_weights, math_ops.range(self._num_rows),
+        partition_strategy='div')
+    col_wts = embedding_ops.embedding_lookup(
+        self._col_weights, math_ops.range(self._num_cols),
+        partition_strategy='div')
+    sp_inputs = self.np_array_to_sparse(self.INPUT_MATRIX)
+    return factorization_ops_test_utils.calculate_loss(
+        sp_inputs, current_rows, current_cols, self._regularization_coeff,
+        self._unobserved_weight, row_wts, col_wts)
+
+  # TODO(walidk): Replace with input_reader_utils functions once open sourced.
+  def remap_sparse_tensor_rows(self, sp_x, row_ids, shape):
+    """Remaps the row ids of a tf.SparseTensor."""
+    old_row_ids, old_col_ids = array_ops.split(
+        value=sp_x.indices, num_or_size_splits=2, axis=1)
+    new_row_ids = array_ops.gather(row_ids, old_row_ids)
+    new_indices = array_ops.concat([new_row_ids, old_col_ids], 1)
+    return sparse_tensor.SparseTensor(
+        indices=new_indices, values=sp_x.values, dense_shape=shape)
+
+  # TODO(walidk): Add an option to randomize inputs.
+  def input_fn(self, np_matrix, batch_size, project_row=None,
+               projection_weights=None, col_ids=None):
+    """Returns an input_fn that selects row and col batches from np_matrix."""
+    def extract_features(row_batch, col_batch, shape):
+      row_ids = row_batch[0]
+      col_ids = col_batch[0]
+      rows = self.remap_sparse_tensor_rows(row_batch[1], row_ids, shape)
+      cols = self.remap_sparse_tensor_rows(col_batch[1], col_ids, shape)
+      features = {
+          wals_lib.WALSMatrixFactorization.INPUT_ROWS: rows,
+          wals_lib.WALSMatrixFactorization.INPUT_COLS: cols,
+      }
+      return features
+
+    def _fn():
+      num_rows = np.shape(np_matrix)[0]
+      num_cols = np.shape(np_matrix)[1]
+      row_ids = math_ops.range(num_rows, dtype=dtypes.int64)
+      col_ids = math_ops.range(num_cols, dtype=dtypes.int64)
+      sp_mat = self.np_array_to_sparse(np_matrix)
+      sp_mat_t = sparse_ops.sparse_transpose(sp_mat)
+      row_batch = input_lib.batch(
+          [row_ids, sp_mat],
+          batch_size=min(batch_size, num_rows),
+          capacity=10,
+          enqueue_many=True)
+      col_batch = input_lib.batch(
+          [col_ids, sp_mat_t],
+          batch_size=min(batch_size, num_cols),
+          capacity=10,
+          enqueue_many=True)
+
+      features = extract_features(row_batch, col_batch, sp_mat.dense_shape)
+      if projection_weights is not None:
+        weights_batch = input_lib.batch(
+            projection_weights,
+            batch_size=batch_size,
+            capacity=10,
+            enqueue_many=True)
+        features[wals_lib.WALSMatrixFactorization.PROJECTION_WEIGHTS] = (
+            weights_batch)
+      if project_row is not None:
+        features[wals_lib.WALSMatrixFactorization.PROJECT_ROW] = (
+            constant_op.constant(project_row))
+
+      labels = None
+      return features, labels
+
+    return _fn
+
+  @property
+  def row_steps(self):
+    return np.ceil(self._num_rows / self.batch_size)
+
+  @property
+  def col_steps(self):
+    return np.ceil(self._num_cols / self.batch_size)
+
+  @property
+  def batch_size(self):
+    return 2
+
+  @property
+  def use_cache(self):
+    return False
+
+  def setUp(self):
+    self._num_rows = 5
+    self._num_cols = 7
+    self._embedding_dimension = 3
+    self._unobserved_weight = 0.1
+    self._num_row_shards = 2
+    self._num_col_shards = 3
+    self._regularization_coeff = 0.01
+    self._col_init = [
+        # Shard 0.
+        [[-0.36444709, -0.39077035, -0.32528427],
+         [1.19056475, 0.07231052, 2.11834812],
+         [0.93468881, -0.71099287, 1.91826844]],
+        # Shard 1.
+        [[1.18160152, 1.52490723, -0.50015002],
+         [1.82574749, -0.57515913, -1.32810032]],
+        # Shard 2.
+        [[-0.15515432, -0.84675711, 0.13097958],
+         [-0.9246484, 0.69117504, 1.2036494]],
+    ]
+    self._row_weights = [[0.1, 0.2, 0.3], [0.4, 0.5]]
+    self._col_weights = [[0.1, 0.2, 0.3], [0.4, 0.5], [0.6, 0.7]]
+
+    # Values of row and column factors after running one iteration or factor
+    # updates.
+    self._row_factors_0 = [[0.097689, -0.219293, -0.020780],
+                           [0.50842, 0.64626, 0.22364],
+                           [0.401159, -0.046558, -0.192854]]
+    self._row_factors_1 = [[1.20597, -0.48025, 0.35582],
+                           [1.5564, 1.2528, 1.0528]]
+    self._col_factors_0 = [[2.4725, -1.2950, -1.9980],
+                           [0.44625, 1.50771, 1.27118],
+                           [1.39801, -2.10134, 0.73572]]
+    self._col_factors_1 = [[3.36509, -0.66595, -3.51208],
+                           [0.57191, 1.59407, 1.33020]]
+    self._col_factors_2 = [[3.3459, -1.3341, -3.3008],
+                           [0.57366, 1.83729, 1.26798]]
+    self._model = wals_lib.WALSMatrixFactorization(
+        self._num_rows,
+        self._num_cols,
+        self._embedding_dimension,
+        self._unobserved_weight,
+        col_init=self._col_init,
+        regularization_coeff=self._regularization_coeff,
+        num_row_shards=self._num_row_shards,
+        num_col_shards=self._num_col_shards,
+        row_weights=self._row_weights,
+        col_weights=self._col_weights,
+        use_factors_weights_cache_for_training=self.use_cache,
+        use_gramian_cache_for_training=self.use_cache)
+
+  def test_fit(self):
+    # Row sweep.
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    self._model.fit(input_fn=input_fn, steps=self.row_steps)
+    row_factors = self._model.get_row_factors()
+    self.assertAllClose(row_factors[0], self._row_factors_0, atol=1e-3)
+    self.assertAllClose(row_factors[1], self._row_factors_1, atol=1e-3)
+
+    # Col sweep.
+    # Running fit a second time will resume training from the checkpoint.
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    self._model.fit(input_fn=input_fn, steps=self.col_steps)
+    col_factors = self._model.get_col_factors()
+    self.assertAllClose(col_factors[0], self._col_factors_0, atol=1e-3)
+    self.assertAllClose(col_factors[1], self._col_factors_1, atol=1e-3)
+    self.assertAllClose(col_factors[2], self._col_factors_2, atol=1e-3)
+
+  def test_predict(self):
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    # Project rows 1 and 4 from the input matrix.
+    proj_input_fn = self.input_fn(
+        np_matrix=self.INPUT_MATRIX[[1, 4], :],
+        batch_size=2,
+        project_row=True,
+        projection_weights=[[0.2, 0.5]])
+
+    self._model.fit(input_fn=input_fn, steps=self.row_steps)
+    projections = self._model.get_projections(proj_input_fn)
+    projected_rows = list(itertools.islice(projections, 2))
+
+    self.assertAllClose(
+        projected_rows,
+        [self._row_factors_0[1], self._row_factors_1[1]],
+        atol=1e-3)
+
+    # Project columns 5, 3, 1 from the input matrix.
+    proj_input_fn = self.input_fn(
+        np_matrix=self.INPUT_MATRIX[:, [5, 3, 1]],
+        batch_size=3,
+        project_row=False,
+        projection_weights=[[0.6, 0.4, 0.2]])
+
+    self._model.fit(input_fn=input_fn, steps=self.col_steps)
+    projections = self._model.get_projections(proj_input_fn)
+    projected_cols = list(itertools.islice(projections, 3))
+    self.assertAllClose(
+        projected_cols,
+        [self._col_factors_2[0], self._col_factors_1[0],
+         self._col_factors_0[1]],
+        atol=1e-3)
+
+  def test_eval(self):
+    # Do a row sweep then evaluate the model on row inputs.
+    # The evaluate function returns the loss of the projected rows, but since
+    # projection is idempotent, the eval loss must match the model loss.
+    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
+                             batch_size=self.batch_size)
+    self._model.fit(input_fn=input_fn, steps=self.row_steps)
+    eval_input_fn_row = self.input_fn(np_matrix=self.INPUT_MATRIX, batch_size=1,
+                                      project_row=True)
+    loss = self._model.evaluate(
+        input_fn=eval_input_fn_row, steps=self._num_rows)['loss']
+
+    with self.test_session():
+      true_loss = self.calculate_loss()
+
+    self.assertNear(
+        loss, true_loss, err=.001,
+        msg="""After row update, eval loss = {}, does not match the true
+        loss = {}.""".format(loss, true_loss))
+
+    # Do a col sweep then evaluate the model on col inputs.
+    self._model.fit(input_fn=input_fn, steps=self.col_steps)
+    eval_input_fn_col = self.input_fn(np_matrix=self.INPUT_MATRIX, batch_size=1,
+                                      project_row=False)
+    loss = self._model.evaluate(
+        input_fn=eval_input_fn_col, steps=self._num_cols)['loss']
+
+    with self.test_session():
+      true_loss = self.calculate_loss()
+
+    self.assertNear(
+        loss, true_loss, err=.001,
+        msg="""After row update, eval loss = {}, does not match the true
+        loss = {}.""".format(loss, true_loss))
+
+
+class WALSMatrixFactorizationTestCached(WALSMatrixFactorizationTest):
+
+  @property
+  def use_cache(self):
+    return True
+
+
+class WALSMatrixFactorizationTestFullBatch(WALSMatrixFactorizationTest):
+
+  @property
+  def batch_size(self):
+    return 100
+
+
+class WALSMatrixFactorizationUnsupportedTest(test.TestCase):
+
+  def setUp(self):
+    pass
+
+  def testDistributedWALSUnsupported(self):
+    tf_config = {
+        'cluster': {
+            run_config_lib.TaskType.PS: ['host1:1', 'host2:2'],
+            run_config_lib.TaskType.WORKER: ['host3:3', 'host4:4']
+        },
+        'task': {
+            'type': run_config_lib.TaskType.WORKER,
+            'index': 1
+        }
+    }
+    with test.mock.patch.dict('os.environ',
+                              {'TF_CONFIG': json.dumps(tf_config)}):
+      config = run_config.RunConfig()
+    self.assertEqual(config.num_worker_replicas, 2)
+    with self.assertRaises(ValueError):
+      self._model = wals_lib.WALSMatrixFactorization(1, 1, 1, config=config)
+
+
 class SweepHookTest(test.TestCase):
 
   def setUp(self):
@@ -45,7 +340,7 @@ class SweepHookTest(test.TestCase):
 
   def run_hook_with_indices(self, sweep_hook, row_indices, col_indices):
     with self.test_session() as sess:
-      # Before run
+      # Before run.
       run_context = session_run_hook.SessionRunContext(
           original_args=None, session=sess)
       sess_run_args = sweep_hook.before_run(run_context)
@@ -53,11 +348,11 @@ class SweepHookTest(test.TestCase):
           self._input_row_indices_ph: row_indices,
           self._input_col_indices_ph: col_indices
       }
-      # Run
+      # Run.
       run_results = sess.run(sess_run_args.fetches, feed_dict=feed_dict)
       run_values = session_run_hook.SessionRunValues(
           results=run_results, options=None, run_metadata=None)
-      # After run
+      # After run.
       sweep_hook.after_run(run_context, run_values)
 
   def test_row_sweep(self):
@@ -74,9 +369,9 @@ class SweepHookTest(test.TestCase):
           self._col_prep_ops,
           self._init_ops)
 
-      # Initialize variables
+      # Initialize variables.
       sess.run([variables.global_variables_initializer()])
-      # Row sweep
+      # Row sweep.
       self.run_hook_with_indices(sweep_hook, [], [])
       self.assertTrue(sess.run(self._init_done),
                       msg='init ops not run by the sweep_hook')
diff --git a/tensorflow/contrib/layers/python/layers/embedding_ops.py b/tensorflow/contrib/layers/python/layers/embedding_ops.py
index b1a7f7ee59..f231ee3859 100644
--- a/tensorflow/contrib/layers/python/layers/embedding_ops.py
+++ b/tensorflow/contrib/layers/python/layers/embedding_ops.py
@@ -351,7 +351,7 @@ def _sampled_scattered_embedding_lookup(
     # No need to validate the indices since we have checked the params
     # dimensions and we know the largest id.
     result = embedding_ops.embedding_lookup(
-        params, ids, partition_strategy="div", validate_indices=False)
+        params, ids, partition_strategy="div")
 
     return array_ops.reshape(result,
                              array_ops.concat([values_shape, [dimension]], 0))
@@ -681,19 +681,17 @@ def embedding_lookup_sparse_with_distributed_aggregation(
     return embeddings
 
 
-def _do_gather(params, ids, validate_indices=True, name=None):
+def _do_gather(params, ids, name=None):
   """Deals with doing gather differently for resource variables."""
   if isinstance(params, resource_variable_ops.ResourceVariable):
     return params.sparse_read(ids, name=name)
-  return array_ops.gather(
-      params, ids, name=name, validate_indices=validate_indices)
+  return array_ops.gather(params, ids, name=name)
 
 
 def _embedding_lookup_with_distributed_aggregation(params,
                                                    ids,
                                                    partition_strategy="mod",
                                                    name=None,
-                                                   validate_indices=True,
                                                    max_norm=None,
                                                    weights=None,
                                                    idx=None,
@@ -724,8 +722,7 @@ def _embedding_lookup_with_distributed_aggregation(params,
       params = ops.convert_n_to_tensor_or_indexed_slices(params, name="params")
     if np == 1:
       with ops.colocate_with(params[0]):
-        ret = maybe_normalize(
-            _do_gather(params[0], ids, validate_indices=validate_indices))
+        ret = maybe_normalize(_do_gather(params[0], ids))
         ignore_weights = weights is None
         if not ignore_weights:
           if weights.dtype != ret.dtype:
@@ -803,9 +800,7 @@ def _embedding_lookup_with_distributed_aggregation(params,
       partitioned_result = []
       for p in xrange(np):
         with ops.colocate_with(params[p]):
-          partitioned_result.append(
-              _do_gather(
-                  params[p], gather_ids[p], validate_indices=validate_indices))
+          partitioned_result.append(_do_gather(params[p], gather_ids[p]))
 
       ignore_weights = weights is None
       if not ignore_weights:
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
index 8b419700db..c5bfc6e1fd 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
@@ -78,8 +78,9 @@ class LinearOperatorApplyOnly(linalg.LinearOperator):
   def _shape_tensor(self):
     return array_ops.shape(self._matrix)
 
-  def _apply(self, x, adjoint=False):
-    return math_ops.matmul(self._matrix, x, adjoint_a=adjoint)
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    return math_ops.matmul(
+        self._matrix, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
 
 class LinearOperatorTest(test.TestCase):
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator.py b/tensorflow/contrib/linalg/python/ops/linear_operator.py
index 5052a0b15c..454411d93c 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator.py
@@ -30,7 +30,6 @@ __all__ = ["LinearOperator"]
 
 
 # TODO(langmore) Use matrix_solve_ls for singular or non-square matrices.
-# TODO(langmore) Add adjoint_x arg to apply, solve.
 class LinearOperator(object):
   """Base class defining a [batch of] linear operator[s].
 
@@ -490,16 +489,18 @@ class LinearOperator(object):
           "Expected argument to have dtype %s.  Found: %s in tensor %s"
           % (self.dtype, arg.dtype, arg))
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     raise NotImplementedError("_apply is not implemented.")
 
-  def apply(self, x, adjoint=False, name="apply"):
+  def apply(self, x, adjoint=False, adjoint_arg=False, name="apply"):
     """Transform `x` with left multiplication:  `x --> Ax`.
 
     Args:
       x: `Tensor` with compatible shape and same `dtype` as `self`.
         See class docstring for definition of compatibility.
-      adjoint: Python `bool`.  If `True`, left multiply by the adjoint.
+      adjoint: Python `bool`.  If `True`, left multiply by the adjoint: `A^H x`.
+      adjoint_arg:  Python `bool`.  If `True`, compute `A x^H` where `x^H` is
+        the hermitian transpose (transposition and complex conjugation).
       name:  A name for this `Op.
 
     Returns:
@@ -508,11 +509,12 @@ class LinearOperator(object):
     with self._name_scope(name, values=[x]):
       x = ops.convert_to_tensor(x, name="x")
       self._check_input_dtype(x)
-      if adjoint:
-        self.shape[-2].assert_is_compatible_with(x.get_shape()[-2])
-      else:
-        self.shape[-1].assert_is_compatible_with(x.get_shape()[-2])
-      return self._apply(x, adjoint=adjoint)
+
+      self_dim = -2 if adjoint else -1
+      arg_dim = -1 if adjoint_arg else -2
+      self.shape[self_dim].assert_is_compatible_with(x.get_shape()[arg_dim])
+
+      return self._apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
   def _determinant(self):
     raise NotImplementedError("_det is not implemented.")
@@ -558,13 +560,13 @@ class LinearOperator(object):
     with self._name_scope(name):
       return self._log_abs_determinant()
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     # Since this is an exact solve method for all rhs, this will only be
     # available for non-singular (batch) operators, in particular the operator
     # must be square.
     raise NotImplementedError("_solve is not implemented.")
 
-  def solve(self, rhs, adjoint=False, name="solve"):
+  def solve(self, rhs, adjoint=False, adjoint_arg=False, name="solve"):
     """Solve `R` (batch) systems of equations exactly: `A X = rhs`.
 
     Examples:
@@ -588,7 +590,9 @@ class LinearOperator(object):
       rhs: `Tensor` with same `dtype` as this operator and compatible shape.
         See class docstring for definition of compatibility.
       adjoint: Python `bool`.  If `True`, solve the system involving the adjoint
-        of this `LinearOperator`.
+        of this `LinearOperator`:  `A^H X = rhs`.
+      adjoint_arg:  Python `bool`.  If `True`, solve `A X = rhs^H` where `rhs^H`
+        is the hermitian transpose (transposition and complex conjugation).
       name:  A name scope to use for ops added by this method.
 
     Returns:
@@ -608,11 +612,12 @@ class LinearOperator(object):
     with self._name_scope(name, values=[rhs]):
       rhs = ops.convert_to_tensor(rhs, name="rhs")
       self._check_input_dtype(rhs)
-      if adjoint:
-        self.shape[-1].assert_is_compatible_with(rhs.get_shape()[-2])
-      else:
-        self.shape[-2].assert_is_compatible_with(rhs.get_shape()[-2])
-      return self._solve(rhs, adjoint=adjoint)
+
+      self_dim = -1 if adjoint else -2
+      arg_dim = -1 if adjoint_arg else -2
+      self.shape[self_dim].assert_is_compatible_with(rhs.get_shape()[arg_dim])
+
+      return self._solve(rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
   def _to_dense(self):
     """Generic and often inefficient implementation.  Override often."""
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
index 9f3a4d230f..b1557769b2 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
@@ -225,7 +225,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
 
     return array_ops.concat((batch_shape, matrix_shape), 0)
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     # If self.operators = [A, B], and not adjoint, then
     # apply_order_list = [B, A].
     # As a result, we return A.apply(B.apply(x))
@@ -234,8 +234,9 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
     else:
       apply_order_list = list(reversed(self.operators))
 
-    result = x
-    for operator in apply_order_list:
+    result = apply_order_list[0].apply(
+        x, adjoint=adjoint, adjoint_arg=adjoint_arg)
+    for operator in apply_order_list[1:]:
       result = operator.apply(result, adjoint=adjoint)
     return result
 
@@ -251,7 +252,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
       result += operator.log_abs_determinant()
     return result
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     # TODO(langmore) Implement solve using solve_ls if some intermediate
     # operator maps to a high dimensional space.
     # In that case, an exact solve may still be possible.
@@ -264,8 +265,9 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
     else:
       solve_order_list = self.operators
 
-    solution = rhs
-    for operator in solve_order_list:
+    solution = solve_order_list[0].solve(
+        rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
+    for operator in solve_order_list[1:]:
       solution = operator.solve(solution, adjoint=adjoint)
     return solution
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
index 0cd7e72a8b..97e52d08a4 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
@@ -206,8 +206,9 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
             "This diagonal operator contained non-zero imaginary values.  "
             " Thus it was not self-adjoint."))
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     diag_term = math_ops.conj(self._diag) if adjoint else self._diag
+    x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     diag_mat = array_ops.expand_dims(diag_term, -1)
     return diag_mat * x
 
@@ -218,8 +219,9 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
     return math_ops.reduce_sum(
         math_ops.log(math_ops.abs(self._diag)), reduction_indices=[-1])
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     diag_term = math_ops.conj(self._diag) if adjoint else self._diag
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     inv_diag_mat = array_ops.expand_dims(1. / diag_term, -1)
     return rhs * inv_diag_mat
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
index f934968221..64ab561457 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.linalg.python.ops import linear_operator
+from tensorflow.contrib.linalg.python.ops import linear_operator_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -172,8 +173,9 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   def _shape_tensor(self):
     return array_ops.shape(self._matrix)
 
-  def _apply(self, x, adjoint=False):
-    return math_ops.matmul(self._matrix, x, adjoint_a=adjoint)
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    return math_ops.matmul(
+        self._matrix, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
   def _determinant(self):
     if self._is_spd:
@@ -187,7 +189,8 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
     abs_det = math_ops.abs(self.determinant())
     return math_ops.log(abs_det)
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     if self._is_spd:
       return linalg_ops.cholesky_solve(self._chol, rhs)
     return linalg_ops.matrix_solve(self._matrix, rhs, adjoint=adjoint)
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
index 60d8b2cdc0..845bf25192 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
@@ -329,8 +329,9 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
     zeros = array_ops.zeros(shape=special_shape, dtype=self.dtype)
     return x + zeros
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     # Note that adjoint has no effect since this matrix is self-adjoint.
+    x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     if self._assert_proper_shapes:
       aps = linear_operator_util.assert_compatible_matrix_dimensions(
           self, x)
@@ -343,8 +344,8 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
   def _log_abs_determinant(self):
     return array_ops.zeros(shape=self.batch_shape_tensor(), dtype=self.dtype)
 
-  def _solve(self, rhs, adjoint=False):
-    return self._apply(rhs)
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    return self._apply(rhs, adjoint_arg=adjoint_arg)
 
   def _diag_part(self):
     return self._ones_diag()
@@ -616,7 +617,8 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
         imag_multiplier,
         message="LinearOperator was not self-adjoint")
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     if adjoint:
       matrix = self._multiplier_matrix_conj
     else:
@@ -634,7 +636,8 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
     return self._num_rows_cast_to_real_dtype * math_ops.log(
         self._abs_multiplier)
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     if adjoint:
       matrix = self._multiplier_matrix_conj
     else:
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py b/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
index 0b7fc3da39..c8bc62eeef 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
@@ -23,6 +23,7 @@ import numpy as np
 import six
 
 from tensorflow.contrib.framework.python.framework import tensor_util as contrib_tensor_util
+from tensorflow.contrib.linalg.python.ops import linear_operator_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import random_seed
@@ -213,18 +214,26 @@ class LinearOperatorDerivedClassTest(test.TestCase):
       for shape in self._shapes_to_test:
         for dtype in self._dtypes_to_test:
           for adjoint in False, True:
-            with self.test_session(graph=ops.Graph()) as sess:
-              sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
-              operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
-                  shape, dtype, use_placeholder=use_placeholder)
-              x = self._make_x(operator, adjoint=adjoint)
-              op_apply = operator.apply(x, adjoint=adjoint)
-              mat_apply = math_ops.matmul(mat, x, adjoint_a=adjoint)
-              if not use_placeholder:
-                self.assertAllEqual(op_apply.get_shape(), mat_apply.get_shape())
-              op_apply_v, mat_apply_v = sess.run([op_apply, mat_apply],
-                                                 feed_dict=feed_dict)
-              self.assertAC(op_apply_v, mat_apply_v)
+            for adjoint_arg in False, True:
+              with self.test_session(graph=ops.Graph()) as sess:
+                sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
+                operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
+                    shape, dtype, use_placeholder=use_placeholder)
+                x = self._make_x(operator, adjoint=adjoint)
+                # If adjoint_arg, compute A X^H^H = A X.
+                if adjoint_arg:
+                  op_apply = operator.apply(
+                      linear_operator_util.matrix_adjoint(x),
+                      adjoint=adjoint, adjoint_arg=adjoint_arg)
+                else:
+                  op_apply = operator.apply(x, adjoint=adjoint)
+                mat_apply = math_ops.matmul(mat, x, adjoint_a=adjoint)
+                if not use_placeholder:
+                  self.assertAllEqual(
+                      op_apply.get_shape(), mat_apply.get_shape())
+                op_apply_v, mat_apply_v = sess.run([op_apply, mat_apply],
+                                                   feed_dict=feed_dict)
+                self.assertAC(op_apply_v, mat_apply_v)
 
   def test_solve(self):
     self._skip_if_tests_to_skip_contains("solve")
@@ -232,18 +241,27 @@ class LinearOperatorDerivedClassTest(test.TestCase):
       for shape in self._shapes_to_test:
         for dtype in self._dtypes_to_test:
           for adjoint in False, True:
-            with self.test_session(graph=ops.Graph()) as sess:
-              sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
-              operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
-                  shape, dtype, use_placeholder=use_placeholder)
-              rhs = self._make_rhs(operator, adjoint=adjoint)
-              op_solve = operator.solve(rhs, adjoint=adjoint)
-              mat_solve = linalg_ops.matrix_solve(mat, rhs, adjoint=adjoint)
-              if not use_placeholder:
-                self.assertAllEqual(op_solve.get_shape(), mat_solve.get_shape())
-              op_solve_v, mat_solve_v = sess.run([op_solve, mat_solve],
-                                                 feed_dict=feed_dict)
-              self.assertAC(op_solve_v, mat_solve_v)
+            for adjoint_arg in False, True:
+              with self.test_session(graph=ops.Graph()) as sess:
+                sess.graph.seed = random_seed.DEFAULT_GRAPH_SEED
+                operator, mat, feed_dict = self._operator_and_mat_and_feed_dict(
+                    shape, dtype, use_placeholder=use_placeholder)
+                rhs = self._make_rhs(operator, adjoint=adjoint)
+                # If adjoint_arg, solve A X = (rhs^H)^H = rhs.
+                if adjoint_arg:
+                  op_solve = operator.solve(
+                      linear_operator_util.matrix_adjoint(rhs),
+                      adjoint=adjoint, adjoint_arg=adjoint_arg)
+                else:
+                  op_solve = operator.solve(
+                      rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
+                mat_solve = linalg_ops.matrix_solve(mat, rhs, adjoint=adjoint)
+                if not use_placeholder:
+                  self.assertAllEqual(
+                      op_solve.get_shape(), mat_solve.get_shape())
+                op_solve_v, mat_solve_v = sess.run([op_solve, mat_solve],
+                                                   feed_dict=feed_dict)
+                self.assertAC(op_solve_v, mat_solve_v)
 
   def test_add_to_tensor(self):
     self._skip_if_tests_to_skip_contains("add_to_tensor")
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
index 38461ce8a2..756e26cc13 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
@@ -173,8 +173,9 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
         self._diag,
         message="Singular operator:  Diagonal contained zero values.")
 
-  def _apply(self, x, adjoint=False):
-    return math_ops.matmul(self._tril, x, adjoint_a=adjoint)
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
+    return math_ops.matmul(
+        self._tril, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
   def _determinant(self):
     return math_ops.reduce_prod(self._diag, reduction_indices=[-1])
@@ -183,7 +184,8 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
     return math_ops.reduce_sum(
         math_ops.log(math_ops.abs(self._diag)), reduction_indices=[-1])
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     return linalg_ops.matrix_triangular_solve(
         self._tril, rhs, lower=True, adjoint=adjoint)
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py b/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
index 89b5c1ab1b..4ca77ab147 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
@@ -348,21 +348,21 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
     return array_ops.concat(
         [batch_shape, self.base_operator.shape_tensor()[-2:]], axis=0)
 
-  def _apply(self, x, adjoint=False):
+  def _apply(self, x, adjoint=False, adjoint_arg=False):
     u = self.u
     v = self.v
     l = self.base_operator
     d = self.diag_operator
 
-    leading_term = l.apply(x, adjoint=adjoint)
+    leading_term = l.apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
     if adjoint:
-      uh_x = math_ops.matmul(u, x, adjoint_a=True)
+      uh_x = math_ops.matmul(u, x, adjoint_a=True, adjoint_b=adjoint_arg)
       d_uh_x = d.apply(uh_x, adjoint=adjoint)
       v_d_uh_x = math_ops.matmul(v, d_uh_x)
       return leading_term + v_d_uh_x
     else:
-      vh_x = math_ops.matmul(v, x, adjoint_a=True)
+      vh_x = math_ops.matmul(v, x, adjoint_a=True, adjoint_b=adjoint_arg)
       d_vh_x = d.apply(vh_x, adjoint=adjoint)
       u_d_vh_x = math_ops.matmul(u, d_vh_x)
       return leading_term + u_d_vh_x
@@ -398,7 +398,7 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
 
     return log_abs_det_c + log_abs_det_d + log_abs_det_l
 
-  def _solve(self, rhs, adjoint=False):
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
     if self.base_operator.is_non_singular is False:
       raise ValueError(
           "Solve not implemented unless this is a perturbation of a "
@@ -421,7 +421,7 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
       u = self.u
 
     # L^{-1} rhs
-    linv_rhs = l.solve(rhs, adjoint=adjoint)
+    linv_rhs = l.solve(rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
     # V^H L^{-1} rhs
     vh_linv_rhs = math_ops.matmul(v, linv_rhs, adjoint_a=True)
     # C^{-1} V^H L^{-1} rhs
diff --git a/tensorflow/contrib/training/BUILD b/tensorflow/contrib/training/BUILD
index a781f0cbfc..a8d8bda060 100644
--- a/tensorflow/contrib/training/BUILD
+++ b/tensorflow/contrib/training/BUILD
@@ -24,6 +24,7 @@ py_library(
         "python/training/failure_tolerator.py",
         "python/training/feeder.py",
         "python/training/hparam.py",
+        "python/training/python_input.py",
         "python/training/resample.py",
         "python/training/sampling_ops.py",
         "python/training/sequence_queueing_state_saver.py",
@@ -46,8 +47,10 @@ py_library(
         "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:ops",
+        "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_ops",
+        "//tensorflow/python:script_ops",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:string_ops",
         "//tensorflow/python:summary",
@@ -243,6 +246,26 @@ py_test(
     ],
 )
 
+py_test(
+    name = "python_input_test",
+    size = "medium",
+    srcs = ["python/training/python_input_test.py"],
+    srcs_version = "PY2AND3",
+    tags = ["manual"],
+    deps = [
+        ":training_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:data_flow_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:parsing_ops",
+        "//tensorflow/python:training",
+        "//third_party/py/numpy",
+    ],
+)
+
 py_test(
     name = "evaluation_test",
     size = "small",
diff --git a/tensorflow/contrib/training/__init__.py b/tensorflow/contrib/training/__init__.py
index be097fd9fc..b8d4629ac4 100644
--- a/tensorflow/contrib/training/__init__.py
+++ b/tensorflow/contrib/training/__init__.py
@@ -35,6 +35,7 @@ See @{$python/contrib.training} guide.
 @@HParams
 @@HParamDef
 @@parse_values
+@@python_input
 """
 
 from __future__ import absolute_import
@@ -54,6 +55,7 @@ from tensorflow.contrib.training.python.training.evaluation import wait_for_new_
 from tensorflow.contrib.training.python.training.failure_tolerator import *
 from tensorflow.contrib.training.python.training.feeder import *
 from tensorflow.contrib.training.python.training.hparam import *
+from tensorflow.contrib.training.python.training.python_input import python_input
 from tensorflow.contrib.training.python.training.resample import *
 from tensorflow.contrib.training.python.training.sampling_ops import *
 from tensorflow.contrib.training.python.training.sequence_queueing_state_saver import *
diff --git a/tensorflow/contrib/training/python/training/bucket_ops.py b/tensorflow/contrib/training/python/training/bucket_ops.py
index 7c50f43b79..7e293da551 100644
--- a/tensorflow/contrib/training/python/training/bucket_ops.py
+++ b/tensorflow/contrib/training/python/training/bucket_ops.py
@@ -251,10 +251,16 @@ def bucket(tensors,
     else:
       which_dequeue = lambda q: q.dequeue_many
 
+    def make_list(t):
+      if isinstance(t, (list, tuple)):
+        return t
+      else:
+        return [t]
+
     enqueues_to_top = [
         top_queue.enqueue(
-            [constant_op.constant(i)] + which_dequeue(q)(
-                bs, name="read_bucket_%d" % i),
+            [constant_op.constant(i)] + make_list(which_dequeue(q)(
+                bs, name="read_bucket_%d" % i)),
             name="enqueue_from_bucket_%d" % i)
         for i, (q, bs) in enumerate(zip(bucket_queues, batch_size))
     ]
@@ -282,6 +288,8 @@ def bucket(tensors,
     dequeued = top_queue.dequeue(name="dequeue_top")
     which_bucket_dequeued = dequeued[0]
     dequeued = dequeued[1:]
+    if len(dequeued) == 1:
+      dequeued = dequeued[0]
     dequeued = _restore_sparse_tensors(dequeued, sparse_info)
     return (which_bucket_dequeued, _as_original_type(tensors, dequeued))
 
diff --git a/tensorflow/contrib/training/python/training/python_input.py b/tensorflow/contrib/training/python/training/python_input.py
new file mode 100644
index 0000000000..7f5420a98a
--- /dev/null
+++ b/tensorflow/contrib/training/python/training/python_input.py
@@ -0,0 +1,178 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Operations for asynchronously reading data from python into queues.
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import threading
+
+import numpy as np
+
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import script_ops
+
+
+def _process_yielded_dict(feature_values, keys, features, dtypes, shapes):
+  """Read feature_values from the generator and emit a proper output dict."""
+  if not isinstance(feature_values, dict):
+    raise TypeError("generator must return dict, saw: %s" % feature_values)
+
+  processed_values = {}
+  for pk in keys:
+    if feature_values.get(pk, None) is not None:
+      processed_values[pk] = np.asarray(
+          feature_values[pk], dtype=dtypes[pk].as_numpy_dtype)
+      check_shape = tensor_shape.TensorShape(processed_values[pk].shape)
+      if not shapes[pk].is_compatible_with(check_shape):
+        raise ValueError(
+            "Feature '%s' has shape %s that is incompatible with declared "
+            "shape: %s" % (pk, shapes[pk], check_shape))
+      continue
+    if isinstance(features[pk], parsing_ops.FixedLenFeature):
+      if features[pk].default_value is not None:
+        processed_values[pk] = np.asarray(
+            features[pk].default_value, dtype=dtypes[pk].as_numpy_dtype)
+    elif isinstance(features[pk], parsing_ops.FixedLenSequenceFeature):
+      processed_values[pk] = np.empty(
+          [0] + features[pk].shape.aslist(), dtype=dtypes[pk].as_numpy_dtype)
+    else:
+      raise ValueError(
+          "Expected generator to return key '%s' with non-empty value" % pk)
+
+  return processed_values
+
+
+def python_input(generator, features, name=None):
+  """Easily feed data from a python generator into TensorFlow queues.
+
+  Example usage:
+
+  ```python
+  def generator():
+    for i in range(3):
+      yield {"value": i}
+
+  features = {
+    "value": tf.FixedLenFeature(shape=[], dtype=dtypes.int32)
+  }
+
+  tensor_dict = tf.contrib.training.python_input(generator, features)
+  batched_dict = tf.train.batch(
+    tensor_dict, batch_size=2, allow_smaller_final_batch=True)
+
+  s = tf.Session()
+  tf.train.start_queue_runners()
+
+  batch1 = s.run(batched_dict)  # returns {"value": np.array([0, 1])}
+  batch2 = s.run(batched_dict)  # returns {"value": np.array([2])}
+  s.run(batched_dict)  # error: Queue is closed (generator finished at i==3)
+  ```
+
+  Args:
+    generator: A python generator that takes no arguments, and yields dicts
+      containing a single minibatch entry one at a time.
+    features: A python `dict` mapping keys expected from the generator to
+      instances of `tf.FixedLenFeature`, or `tf.FixedLenSequenceFeature`.
+    name: (Optional) A name for the operations.
+
+  Returns:
+    A dict mapping keys of the `features` dict to `Tensor` objects.
+    These `Tensor` objects are outputs of a queue that is fed by `generator`.
+
+  Raises:
+    TypeError: If generator is not callable or features is not a dict.
+    TypeError: If any of features' values are not a Feature object.
+    NotImplementedError: If any of features' values are instances of
+      `SparseFeature` or `VarLenFeature`  (these are not currently supported).
+    ValueError: If any FixedLenSequenceFeatures contain a default value
+      (this field is not supported).
+    ValueError: if any FixedLenSequenceFeatures have allow_missing=False
+      (this field is not supported).
+  """
+  if not callable(generator):
+    raise TypeError("generator must be callable, saw: %s" % generator)
+  if not isinstance(features, dict):
+    raise TypeError("features must be a dict, saw: %s"
+                    % type(features).__name__)
+
+  with ops.name_scope(name, "python_input"):
+    shapes = {}
+    dtypes = {}
+    for k, v in features.items():
+      if isinstance(v, parsing_ops.FixedLenFeature):
+        if v.default_value is not None:
+          value = ops.convert_to_tensor(v.default_value, dtype=v.dtype, name=k)
+          shapes[k] = value.shape
+          dtypes[k] = value.dtype
+        else:
+          tensor_shape.TensorShape(v.shape).assert_is_fully_defined()
+          shapes[k] = tensor_shape.TensorShape(v.shape)
+          dtypes[k] = v.dtype
+      elif isinstance(v, parsing_ops.VarLenFeature):
+        raise NotImplementedError("VarLenFeature not supported")
+      elif isinstance(v, parsing_ops.SparseFeature):
+        raise NotImplementedError("SparseFeature not supported")
+      elif isinstance(v, parsing_ops.FixedLenSequenceFeature):
+        if v.default_value is not None:
+          raise ValueError("FixedLenSequenceFeature with default value not "
+                           "supported")
+        if not v.allow_missing:
+          raise ValueError("FixedLenSequenceFeature with allow_missing=False "
+                           "not supported")
+        tensor_shape.TensorShape(v.shape).assert_is_fully_defined()
+        shapes[k] = tensor_shape.TensorShape([None]).concatenate(v.shape)
+        dtypes[k] = v.dtype
+      else:
+        raise TypeError(
+            "Expected value for features key '%s' to be one of "
+            "FixedLenFeature, VarLenFeature, SparseFeature, or "
+            "FixedLenSequenceFeature.  Got: %s" % (k, v))
+
+    keys = list(shapes.keys())
+    dtypes_list = [dtypes[pk] for pk in keys]
+
+    counter = [0]
+    lock = threading.Lock()
+    iterator = iter(generator())
+
+    def generator_iter():
+      """Iterate through generator output and return np.arrays to py_func."""
+      with lock:
+        try:
+          feature_values = next(iterator)
+          counter[0] += 1
+        except StopIteration as e:
+          raise StopIteration("Iteration finished.  Processed %d entries (%s)"
+                              % (counter[0], e))
+
+      processed_dict = _process_yielded_dict(
+          feature_values, keys, features, dtypes, shapes)
+      return [processed_dict[pk] for pk in keys]
+
+    generator_pyfunc_values = script_ops.py_func(
+        generator_iter, inp=[], Tout=dtypes_list, stateful=True)
+
+    pyfunc_input = {k: v for (k, v) in zip(keys, generator_pyfunc_values)}
+    for k, v in shapes.items():
+      pyfunc_input[k].set_shape(v)
+
+  return pyfunc_input
+
+
+__all__ = ["python_input"]
diff --git a/tensorflow/contrib/training/python/training/python_input_test.py b/tensorflow/contrib/training/python/training/python_input_test.py
new file mode 100644
index 0000000000..afd0f38c2c
--- /dev/null
+++ b/tensorflow/contrib/training/python/training/python_input_test.py
@@ -0,0 +1,191 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for tf.contrib.training.python_input."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+from tensorflow.contrib.training.python.training import bucket_ops
+from tensorflow.contrib.training.python.training import python_input
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.platform import test
+from tensorflow.python.training import coordinator
+from tensorflow.python.training import input as core_input
+from tensorflow.python.training import queue_runner_impl
+
+
+class PythonInputTest(test.TestCase):
+
+  def testGenerator(self):
+    def simple_generator():
+      for i in range(2):
+        yield {"value": i, "ignored": 3}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+    self.assertEqual(["value"], tensors.keys())
+    self.assertEqual(dtypes.int32, tensors["value"].dtype)
+    self.assertEqual((), tensors["value"].shape)
+
+    with self.test_session() as sess:
+      self.assertEqual({"value": 0}, sess.run(tensors))
+      self.assertEqual({"value": 1}, sess.run(tensors))
+      with self.assertRaisesOpError("Iteration finished"):
+        sess.run(tensors)
+
+  def testInvalidGenerator(self):
+    generator1 = lambda: iter([{"value": "a"}])
+    int_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors1 = python_input.python_input(generator1, int_features)
+
+    with self.test_session() as sess:
+      with self.assertRaisesOpError("invalid literal"):
+        # Can't convert a string to an integer
+        sess.run(tensors1)
+
+    generator2 = lambda: iter([None])
+    tensors2 = python_input.python_input(generator2, int_features)
+
+    with self.test_session() as sess:
+      with self.assertRaisesOpError("generator must return dict"):
+        sess.run(tensors2)
+
+    generator3 = lambda: iter([{"value": [1, 2]}])
+    tensors3 = python_input.python_input(generator3, int_features)
+
+    with self.test_session() as sess:
+      with self.assertRaisesOpError("incompatible with declared shape"):
+        sess.run(tensors3)
+
+  def testGeneratorWorksWithBatching(self):
+    def simple_generator():
+      for i in range(5):
+        yield {"value": i, "ignored": 3}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+
+    # Request batches of size 4 at a time, the final batch may be smaller.
+    batched_tensors = core_input.batch(tensors, batch_size=4,
+                                       allow_smaller_final_batch=True)
+
+    self.assertEqual(["value"], batched_tensors.keys())
+    self.assertEqual(dtypes.int32, batched_tensors["value"].dtype)
+    self.assertEqual([None], batched_tensors["value"].shape.as_list())
+
+    with self.test_session() as sess:
+      # The generator emits 5 items total.  The first 4 are returned in
+      # the first session run; the final one is returned in the
+      # second.  This works because allow_smaller_final_batch=True.
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(sess=sess, coord=coord)
+      r1 = sess.run(batched_tensors)
+      r2 = sess.run(batched_tensors)
+      self.assertAllEqual([0, 1, 2, 3], r1["value"])
+      self.assertEqual([4], r2["value"])
+      with self.assertRaisesOpError("Iteration finished"):
+        sess.run(tensors)
+      coord.request_stop()
+      for thread in threads:
+        thread.join()
+
+  def testGeneratorWorksWithManyBatchingThreads(self):
+    def simple_generator():
+      for i in range(5000):
+        yield {"value": i, "ignored": 3}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32)
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+
+    # Request batches of size 20 at a time, the final batch may be smaller.
+    _, batched_tensors = bucket_ops.bucket(
+        tensors, which_bucket=tensors["value"] % 5,
+        batch_size=20, num_buckets=5, num_threads=7, capacity=17,
+        allow_smaller_final_batch=True)
+
+    self.assertEqual(["value"], batched_tensors.keys())
+    self.assertEqual(dtypes.int32, batched_tensors["value"].dtype)
+    self.assertEqual([None], batched_tensors["value"].shape.as_list())
+
+    with self.test_session() as sess:
+      # The generator emits 5 items total.  The first 4 are returned in
+      # the first session run; the final one is returned in the
+      # second.  This works because allow_smaller_final_batch=True.
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(sess=sess, coord=coord)
+      results = []
+      while True:
+        try:
+          r = sess.run(batched_tensors)
+          results.extend(r["value"].tolist())
+        except errors.OutOfRangeError:
+          break
+      coord.request_stop()
+      for thread in threads:
+        thread.join()
+    self.assertEqual(sorted(results),
+                     list(range(5000)))
+
+  def testVaryingFieldsInGenerator(self):
+    def simple_generator():
+      for i in range(2):
+        yield {"value": i,
+               "seqlen_value": np.ones((i, 1))}
+
+    simple_features = {
+        "value": parsing_ops.FixedLenFeature(shape=[], dtype=dtypes.int32),
+        "seqlen_value": parsing_ops.FixedLenSequenceFeature(
+            shape=[1], dtype=dtypes.float32, allow_missing=True),
+        "empty_value": parsing_ops.FixedLenFeature(
+            default_value=[-1, -2], dtype=dtypes.int32, shape=[2])
+    }
+    tensors = python_input.python_input(simple_generator, simple_features)
+    self.assertEqual(
+        set(["value", "seqlen_value", "empty_value"]), set(tensors.keys()))
+    self.assertEqual(dtypes.int32, tensors["value"].dtype)
+    self.assertEqual((), tensors["value"].shape)
+    self.assertEqual(dtypes.float32, tensors["seqlen_value"].dtype)
+    self.assertEqual([None, 1], tensors["seqlen_value"].shape.as_list())
+    self.assertEqual(dtypes.int32, tensors["empty_value"].dtype)
+    self.assertEqual([2], tensors["empty_value"].shape)
+
+    with self.test_session() as sess:
+      r1 = sess.run(tensors)
+      self.assertAllEqual(0, r1["value"])
+      self.assertAllEqual(np.ones((0, 1)), r1["seqlen_value"])
+      self.assertAllEqual([-1, -2], r1["empty_value"])
+
+      r2 = sess.run(tensors)
+      self.assertAllEqual(1, r2["value"])
+      self.assertAllEqual([[1]], r2["seqlen_value"])
+      self.assertAllEqual([-1, -2], r2["empty_value"])
+
+      with self.assertRaisesOpError("Iteration finished"):
+        sess.run(tensors)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index 5d74d3d3b1..476a9ac52a 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -19,6 +19,7 @@ filegroup(
     srcs = [
         "devices.cc",
         "devices.h",
+        "grappler_item.cc",
         "grappler_item.h",
         "utils.cc",
         "utils.h",
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 2ea150ce18..64d5815bf7 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -17,6 +17,7 @@ filegroup(
     srcs = glob(
         [
             "*_optimizer.*",
+            "auto_parallel.*",
             "constant_folding.*",
             "model_pruner.*",
             "graph_rewriter.*",
@@ -210,6 +211,7 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        ":auto_parallel",
         ":constant_folding",
         ":graph_optimizer",
         ":layout_optimizer",
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.h b/tensorflow/core/grappler/optimizers/auto_parallel.h
index cac0db2c23..ad90bbe028 100644
--- a/tensorflow/core/grappler/optimizers/auto_parallel.h
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.h
@@ -25,7 +25,9 @@ namespace grappler {
 // Automatically parallelize a graph by splitting in the batch dimension.
 class AutoParallel : public GraphOptimizer {
  public:
-  AutoParallel(int num_replicas) : num_replicas_(num_replicas) {}
+  AutoParallel(int num_replicas) : num_replicas_(num_replicas) {
+    CHECK(num_replicas_ >= 2);
+  }
   ~AutoParallel() override {}
 
   string name() const override { return "autoparallel"; };
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 0fe9359b75..2ea5adffeb 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
 #include "tensorflow/core/framework/versions.pb.h"
+#include "tensorflow/core/grappler/optimizers/auto_parallel.h"
 #include "tensorflow/core/grappler/optimizers/constant_folding.h"
 #include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
@@ -41,6 +42,10 @@ std::unique_ptr<GraphOptimizer> MetaOptimizer::NewOptimizer(
   if (optimizer == "memory") {
     graph_optimizer.reset(new MemoryOptimizer());
   }
+  if (optimizer == "autoparallel") {
+    graph_optimizer.reset(
+        new AutoParallel(cfg_.auto_parallel().num_replicas()));
+  }
   return graph_optimizer;
 }
 
@@ -63,11 +68,15 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
       optimizers.push_back(
           std::unique_ptr<GraphOptimizer>(new MemoryOptimizer()));
     }
+    if (cfg_.auto_parallel().enable()) {
+      optimizers.push_back(std::unique_ptr<GraphOptimizer>(
+          new AutoParallel(cfg_.auto_parallel().num_replicas())));
+    }
   } else {
-    std::set<string> avaliable_optimizers = {"pruning", "constfold", "layout",
-                                             "memory"};
+    std::set<string> available_optimizers = {"pruning", "constfold", "layout",
+                                             "memory", "autoparallel"};
     for (const auto& optimizer : cfg_.optimizers()) {
-      if (avaliable_optimizers.find(optimizer) != avaliable_optimizers.end()) {
+      if (available_optimizers.find(optimizer) != available_optimizers.end()) {
         optimizers.push_back(NewOptimizer(optimizer));
       }
     }
@@ -102,7 +111,8 @@ void MetaOptimizer::Feedback(Cluster* cluster, const GrapplerItem& item,
 }
 
 bool MetaOptimizerEnabled(const RewriterConfig& cfg) {
-  return cfg.optimize_tensor_layout();
+  return cfg.optimize_tensor_layout() || cfg.constant_folding() ||
+         cfg.auto_parallel().enable() || !cfg.optimizers().empty();
 }
 
 Status RunMetaOptimizer(const GrapplerItem& item, const RewriterConfig& cfg,
diff --git a/tensorflow/core/kernels/aggregate_ops.cc b/tensorflow/core/kernels/aggregate_ops.cc
index cbc0537b45..0aa65729de 100644
--- a/tensorflow/core/kernels/aggregate_ops.cc
+++ b/tensorflow/core/kernels/aggregate_ops.cc
@@ -161,9 +161,11 @@ TF_CALL_NUMBER_TYPES(REGISTER_ADDN_CPU);
 #undef REGISTER_ADDN_CPU
 
 #if GOOGLE_CUDA
-REGISTER_ADDN(Eigen::half, GPU);
-REGISTER_ADDN(float, GPU);
-REGISTER_ADDN(double, GPU);
+#define REGISTER_ADDN_GPU(type) REGISTER_ADDN(type, GPU)
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_ADDN_GPU);
+TF_CALL_complex64(REGISTER_ADDN_GPU);
+TF_CALL_complex128(REGISTER_ADDN_GPU);
+#undef REGISTER_ADDN_GPU
 
 // A special GPU kernel for int32.
 // TODO(b/25387198): Also enable int32 in device memory. This kernel
diff --git a/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc b/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc
index 51393787ac..3f449be754 100644
--- a/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/aggregate_ops_gpu.cu.cc
@@ -154,6 +154,8 @@ struct Add9Functor<GPUDevice, T> {
   template struct functor::Add9Functor<GPUDevice, type>;
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_FUNCTORS);
+TF_CALL_complex64(REGISTER_FUNCTORS);
+TF_CALL_complex128(REGISTER_FUNCTORS);
 
 #undef REGISTER_FUNCTORS
 
diff --git a/tensorflow/core/kernels/quantization_utils_test.cc b/tensorflow/core/kernels/quantization_utils_test.cc
index 8456604740..c7dbc0e5d1 100644
--- a/tensorflow/core/kernels/quantization_utils_test.cc
+++ b/tensorflow/core/kernels/quantization_utils_test.cc
@@ -355,6 +355,24 @@ TEST_F(QuantizationUtilsTest, AvoidBias) {
     const int back_to_int = FloatToQuantized<quint8>(as_float, 0.0f, 2.0f);
     EXPECT_EQ(i, back_to_int);
   }
+
+  // All perfectly representable floats should survive quantization, even
+  // if we pick a range where min is not itself perfectly representable.
+  const float min = -0.1375f;
+  const float max = 1.1385f;
+  const float step_size = (max - min) / 255.0f;
+  const float tolerance = step_size / 1000.0f;
+  // This is the smallest perfectly representable float in the range.
+  float first_float = ceil(min / step_size) * step_size;
+  // TODO(ahentz): The current version always incur a small error, which we
+  // need to account for. We should fix QuantizedToFloat<> to remove this bias.
+  const float expected_error = first_float - min;
+  ASSERT_GT(expected_error, tolerance);
+  for (float f = first_float; f <= max; f += step_size) {
+    const int as_int = FloatToQuantized<quint8>(f, min, max);
+    const float back_to_float = QuantizedToFloat<quint8>(as_int, min, max);
+    EXPECT_NEAR(f, back_to_float + expected_error, tolerance);
+  }
 }
 
 TEST_F(QuantizationUtilsTest, RequantizeInNewRange) {
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e2e07a4bf1..8761c400b1 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -488,7 +488,7 @@ REGISTER_OP("SplitV")
       ShapeHandle output_shape;
       const Tensor* size_splits = c->input_tensor(1);
       if (rank == InferenceContext::kUnknownRank) {
-        // If the rank of input tensor is unknown, then return unkown shapes.
+        // If the rank of input tensor is unknown, then return unknown shapes.
         output_shape = c->UnknownShape();
         for (int i = 0; i < num_outputs; ++i) {
           c->set_output(i, output_shape);
@@ -497,7 +497,7 @@ REGISTER_OP("SplitV")
         // Throw error if input is a scalar.
         return errors::InvalidArgument("Can't split scalars");
       } else if (size_splits == nullptr || !c->ValueKnown(split_dimension)) {
-        // If split dimension or tensor containing the split sizes is unkown,
+        // If split dimension or tensor containing the split sizes is unknown,
         // then return unknown shapes of same rank as input.
         output_shape = c->UnknownShapeOfRank(rank);
         for (int i = 0; i < num_outputs; ++i) {
@@ -1328,8 +1328,8 @@ this operation will permute `params` accordingly.
 
 `validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
 `indices` are always validated to be within range. If assigned to GPU,
-out-of-bound indices result in unspecified behavior (currently the result is
-`0`, but this may become an error in the future).
+out-of-bound indices result in safe but unspecified behavior, which may include
+raising an error.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 <img style="width:100%" src="../../images/Gather.png" alt>
diff --git a/tensorflow/core/protobuf/rewriter_config.proto b/tensorflow/core/protobuf/rewriter_config.proto
index 63821cb55e..753edba4b8 100644
--- a/tensorflow/core/protobuf/rewriter_config.proto
+++ b/tensorflow/core/protobuf/rewriter_config.proto
@@ -6,6 +6,11 @@ option java_outer_classname = "RewriterConfigProtos";
 option java_multiple_files = true;
 option java_package = "org.tensorflow.framework";
 
+message AutoParallelOptions {
+  bool enable = 1;
+  int32 num_replicas = 2;
+}
+
 message RewriterConfig {
   bool optimize_tensor_layout = 1;
   bool disable_model_pruning = 2;
@@ -19,6 +24,8 @@ message RewriterConfig {
   }
   MemOptType memory_optimization = 4;
 
+  AutoParallelOptions auto_parallel = 5;
+
   // If non-empty, will use this as an alternative way to specify a list of
   // optimizations to turn on and the order of the optimizations.
   repeated string optimizers = 100;
diff --git a/tensorflow/docs_src/tutorials/using_gpu.md b/tensorflow/docs_src/tutorials/using_gpu.md
index d64cdafdef..dcec62d274 100644
--- a/tensorflow/docs_src/tutorials/using_gpu.md
+++ b/tensorflow/docs_src/tutorials/using_gpu.md
@@ -57,14 +57,17 @@ have the same device assignment.
 with tf.device('/cpu:0'):
   a = tf.constant([1.0, 2.0, 3.0, 4.0, 5.0, 6.0], shape=[2, 3], name='a')
   b = tf.constant([1.0, 2.0, 3.0, 4.0, 5.0, 6.0], shape=[3, 2], name='b')
-  c = tf.matmul(a, b)
+c = tf.matmul(a, b)
 # Creates a session with log_device_placement set to True.
 sess = tf.Session(config=tf.ConfigProto(log_device_placement=True))
 # Runs the op.
 print(sess.run(c))
 ```
 
-You will see that now `a` and `b` are assigned to `cpu:0`.
+You will see that now `a` and `b` are assigned to `cpu:0`. Since a device was
+not explicitly specified for the `MatMul` operation, the TensorFlow runtime will
+choose one based on the operation and available devices (`gpu:0` in this
+example) and automatically copy tensors between devices if required.
 
 ```
 Device mapping:
diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py
index 3663d8af7a..5f59836427 100644
--- a/tensorflow/python/__init__.py
+++ b/tensorflow/python/__init__.py
@@ -132,6 +132,7 @@ from tensorflow.python.ops import tensor_array_ops
 # documentation, or remove.
 _allowed_symbols = [
     'AttrValue',
+    'AutoParallelOptions',
     'ConfigProto',
     'DeviceSpec',
     'Event',
diff --git a/tensorflow/python/debug/cli/curses_ui.py b/tensorflow/python/debug/cli/curses_ui.py
index b7549b406b..d665627a93 100644
--- a/tensorflow/python/debug/cli/curses_ui.py
+++ b/tensorflow/python/debug/cli/curses_ui.py
@@ -124,7 +124,7 @@ class ScrollBar(object):
       raise ValueError("Insufficient height for ScrollBar (%d)" %
                        (self._max_y - self._min_y + 1))
 
-  def _block_y(self):
+  def _block_y(self, screen_coord_sys=False):
     """Get the 0-based y coordinate of the scroll block.
 
     This y coordinate takes into account the presence of the UP and DN buttons
@@ -132,9 +132,13 @@ class ScrollBar(object):
     location, the return value will be 1; at the bottom location, the return
     value will be self._scroll_bar_height - 2.
 
+    Args:
+      screen_coord_sys: (`bool`) whether the return value will be in the
+        screen coordinate system.
+
     Returns:
       (int) 0-based y coordinate of the scroll block, in the ScrollBar
-        coordinate system, i.e., not the screen coordinate system. For example,
+        coordinate system by default. For example,
         when scroll position is at the top, this return value will be 1 (not 0,
         because of the presence of the UP button). When scroll position is at
         the bottom, this return value will be self._scroll_bar_height - 2
@@ -142,8 +146,10 @@ class ScrollBar(object):
         button).
     """
 
-    return int(float(self._scroll_position) / (self._output_num_rows - 1) *
-               (self._scroll_bar_height - 3)) + 1
+    rel_block_y = int(
+        float(self._scroll_position) / (self._output_num_rows - 1) *
+        (self._scroll_bar_height - 3)) + 1
+    return rel_block_y + self._min_y if screen_coord_sys else rel_block_y
 
   def layout(self):
     """Get the RichTextLines layout of the scroll bar.
@@ -192,9 +198,11 @@ class ScrollBar(object):
       return _SCROLL_UP_A_LINE
     elif mouse_y == self._max_y:
       return _SCROLL_DOWN_A_LINE
-    elif mouse_y > self._block_y() and mouse_y < self._max_y:
+    elif (mouse_y > self._block_y(screen_coord_sys=True) and
+          mouse_y < self._max_y):
       return _SCROLL_DOWN
-    elif mouse_y < self._block_y() and mouse_y > self._min_y:
+    elif (mouse_y < self._block_y(screen_coord_sys=True) and
+          mouse_y > self._min_y):
       return _SCROLL_UP
     else:
       return None
@@ -505,7 +513,7 @@ class CursesUI(base_ui.BaseUI):
   def get_help(self):
     return self._command_handler_registry.get_help()
 
-  def _screen_create_command_textbox(self, existing_command):
+  def _screen_create_command_textbox(self, existing_command=None):
     """Create command textbox on screen.
 
     Args:
@@ -839,6 +847,7 @@ class CursesUI(base_ui.BaseUI):
         else:
           command = self._fetch_hyperlink_command(mouse_x, mouse_y)
           if command:
+            self._screen_create_command_textbox()
             exit_token = self._dispatch_command(command)
             if exit_token is not None:
               raise debugger_cli_common.CommandLineExit(exit_token=exit_token)
@@ -898,13 +907,14 @@ class CursesUI(base_ui.BaseUI):
     """Automatically key in a command to the command Textbox.
 
     Args:
-      command: The command, as a string.
+      command: The command, as a string or None.
       erase_existing: (bool) whether existing text (if any) is to be erased
           first.
     """
     if erase_existing:
       self._erase_existing_command()
 
+    command = command or ""
     for c in command:
       self._command_textbox.do_command(ord(c))
 
@@ -1227,9 +1237,9 @@ class CursesUI(base_ui.BaseUI):
 
     self._scroll_bar = ScrollBar(
         self._max_x - 2,
-        2,
+        3,
         self._max_x - 1,
-        self._output_num_rows,
+        self._output_num_rows + 1,
         self._output_pad_row,
         self._output_pad_height - self._output_pad_screen_height)
 
diff --git a/tensorflow/python/debug/cli/curses_ui_test.py b/tensorflow/python/debug/cli/curses_ui_test.py
index 8219f47ef3..15e1356d29 100644
--- a/tensorflow/python/debug/cli/curses_ui_test.py
+++ b/tensorflow/python/debug/cli/curses_ui_test.py
@@ -113,7 +113,7 @@ class MockCursesUI(curses_ui.CursesUI):
   def _screen_create_command_window(self):
     pass
 
-  def _screen_create_command_textbox(self, existing_command):
+  def _screen_create_command_textbox(self, existing_command=None):
     """Override to insert observer of existing commands.
 
     Used in testing of history navigation and tab completion.
@@ -1646,6 +1646,25 @@ class ScrollBarTest(test_util.TensorFlowTestCase):
                      scroll_bar.get_click_command(7))
     self.assertIsNone(scroll_bar.get_click_command(8))
 
+  def testClickCommandsAreCorrectForScrollBarNotAtZeroMinY(self):
+    scroll_bar = curses_ui.ScrollBar(0, 5, 1, 12, 10, 20)
+    self.assertIsNone(scroll_bar.get_click_command(0))
+    self.assertIsNone(scroll_bar.get_click_command(4))
+    self.assertEqual(curses_ui._SCROLL_UP_A_LINE,
+                     scroll_bar.get_click_command(5))
+    self.assertEqual(curses_ui._SCROLL_UP,
+                     scroll_bar.get_click_command(6))
+    self.assertEqual(curses_ui._SCROLL_UP,
+                     scroll_bar.get_click_command(7))
+    self.assertIsNone(scroll_bar.get_click_command(8))
+    self.assertEqual(curses_ui._SCROLL_DOWN,
+                     scroll_bar.get_click_command(10))
+    self.assertEqual(curses_ui._SCROLL_DOWN,
+                     scroll_bar.get_click_command(11))
+    self.assertEqual(curses_ui._SCROLL_DOWN_A_LINE,
+                     scroll_bar.get_click_command(12))
+    self.assertIsNone(scroll_bar.get_click_command(13))
+
 
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/python/estimator/model_fn.py b/tensorflow/python/estimator/model_fn.py
index ee5999c78b..a9d044fcfe 100644
--- a/tensorflow/python/estimator/model_fn.py
+++ b/tensorflow/python/estimator/model_fn.py
@@ -51,6 +51,7 @@ class ModeKeys(object):
 class MetricKeys(object):
   """Metric key strings."""
   LOSS = 'loss'
+  AVERAGE_LOSS = 'average_loss'
 
 
 class EstimatorSpec(
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index f21402652f..ad455babbc 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -941,6 +941,19 @@ tf_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "aggregate_ops_test",
+    size = "small",
+    srcs = ["aggregate_ops_test.py"],
+    additional_deps = [
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+    ],
+)
+
 cuda_py_test(
     name = "argmax_op_test",
     size = "small",
diff --git a/tensorflow/python/kernel_tests/aggregate_ops_test.py b/tensorflow/python/kernel_tests/aggregate_ops_test.py
new file mode 100644
index 0000000000..f56917f7e9
--- /dev/null
+++ b/tensorflow/python/kernel_tests/aggregate_ops_test.py
@@ -0,0 +1,79 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for aggregate_ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class AddNTest(test.TestCase):
+  # AddN special-cases adding the first M inputs to make (N - M) divisible by 8,
+  # after which it adds the remaining (N - M) tensors 8 at a time in a loop.
+  # Test N in [1, 10] so we check each special-case from 1 to 9 and one
+  # iteration of the loop.
+  _MAX_N = 10
+
+  def _supported_types(self):
+    if test.is_gpu_available():
+      return [dtypes.float16, dtypes.float32, dtypes.float64, dtypes.complex64,
+              dtypes.complex128]
+    return [dtypes.int8, dtypes.int16, dtypes.int32, dtypes.int64,
+            dtypes.float16, dtypes.float32, dtypes.float64, dtypes.complex64,
+            dtypes.complex128]
+
+  def _buildData(self, shape, dtype):
+    data = np.random.randn(*shape).astype(dtype.as_numpy_dtype)
+    # For complex types, add an index-dependent imaginary component so we can
+    # tell we got the right value.
+    if dtype.is_complex:
+      return data + 10j * data
+    return data
+
+  def testAddN(self):
+    np.random.seed(12345)
+    with self.test_session(use_gpu=True) as sess:
+      for dtype in self._supported_types():
+        for count in range(1, self._MAX_N + 1):
+          data = [self._buildData((2, 2), dtype) for _ in range(count)]
+          actual = sess.run(math_ops.add_n(data))
+          expected = np.sum(np.vstack(
+              [np.expand_dims(d, 0) for d in data]), axis=0)
+          tol = 5e-3 if dtype == dtypes.float16 else 5e-7
+          self.assertAllClose(expected, actual, rtol=tol, atol=tol)
+
+  def testUnknownShapes(self):
+    np.random.seed(12345)
+    with self.test_session(use_gpu=True) as sess:
+      for dtype in self._supported_types():
+        data = self._buildData((2, 2), dtype)
+        for count in range(1, self._MAX_N + 1):
+          data_ph = array_ops.placeholder(dtype=dtype)
+          actual = sess.run(math_ops.add_n([data_ph] * count), {data_ph: data})
+          expected = np.sum(np.vstack([np.expand_dims(data, 0)] * count),
+                            axis=0)
+          tol = 5e-3 if dtype == dtypes.float16 else 5e-7
+          self.assertAllClose(expected, actual, rtol=tol, atol=tol)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index c4a27009c3..dea2180069 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -50,8 +50,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import collections
-
 import six
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
@@ -426,10 +424,11 @@ def merge(inputs, name=None):
 # pylint: enable=protected-access
 
 
-def _convert_tensorarrays_to_flows(tensors_or_tensor_arrays):
-  return [ta.flow if isinstance(ta, tensor_array_ops.TensorArray)
-          else ta
-          for ta in tensors_or_tensor_arrays]
+def _convert_tensorarray_to_flow(tensor_or_tensor_array):
+  if isinstance(tensor_or_tensor_array, tensor_array_ops.TensorArray):
+    return tensor_or_tensor_array.flow
+  else:
+    return tensor_or_tensor_array
 
 
 def _make_tensor_array(ta, t_or_flow):
@@ -1637,63 +1636,77 @@ class CondContext(ControlFlowContext):
         real_val = external_val
     return real_val
 
+  def _BuildCondTensor(self, v):
+    if isinstance(v, ops.Operation):
+      # Use pivot as the proxy for this op.
+      return with_dependencies([v], self._pivot)
+    elif isinstance(v, (ops.IndexedSlices, sparse_tensor.SparseTensor)):
+      values = self._ProcessOutputTensor(v.values)
+      indices = self._ProcessOutputTensor(v.indices)
+      if isinstance(v, ops.IndexedSlices):
+        dense_shape = v.dense_shape
+        if dense_shape is not None:
+          dense_shape = self._ProcessOutputTensor(dense_shape)
+        return ops.IndexedSlices(values, indices, dense_shape)
+      else:
+        dense_shape = self._ProcessOutputTensor(v.dense_shape)
+        return sparse_tensor.SparseTensor(indices, values, dense_shape)
+    else:
+      v = nest.map_structure(_convert_tensorarray_to_flow, v)
+      return self._ProcessOutputTensor(ops.convert_to_tensor(v))
+
   def BuildCondBranch(self, fn):
     """Add the subgraph defined by fn() to the graph."""
-    r = fn()
-    original_r = r
-    result = []
-    if r is not None:
-      if not isinstance(r, list) and not isinstance(r, _basetuple):
-        r = [r]
-        original_r = [original_r]
-      r = _convert_tensorarrays_to_flows(r)
-      for v in r:
-        real_v = v
-        if isinstance(v, ops.Operation):
-          # Use pivot as the proxy for this op.
-          real_v = with_dependencies([v], self._pivot)
-        else:
-          if isinstance(v, (ops.IndexedSlices, sparse_tensor.SparseTensor)):
-            values = self._ProcessOutputTensor(v.values)
-            indices = self._ProcessOutputTensor(v.indices)
-            if isinstance(v, ops.IndexedSlices):
-              dense_shape = v.dense_shape
-              if dense_shape is not None:
-                dense_shape = self._ProcessOutputTensor(dense_shape)
-              real_v = ops.IndexedSlices(values, indices, dense_shape)
-            else:
-              dense_shape = self._ProcessOutputTensor(v.dense_shape)
-              real_v = sparse_tensor.SparseTensor(indices, values, dense_shape)
-          else:
-            real_v = self._ProcessOutputTensor(v)
-        result.append(real_v)
-    return original_r, result
+    original_result = fn()
+    if original_result is None:
+      return None, None
+
+    result = nest.map_structure(self._BuildCondTensor, original_result)
+    if not isinstance(result, (list, _basetuple)):
+      result = [result]
+    return original_result, result
+
+
+def _UnpackIfSingleton(res):
+  if isinstance(res, (list, _basetuple)) and len(res) == 1:
+    return res[0]
+  else:
+    return res
 
 
-def cond(pred, fn1, fn2, name=None):
-  """Return either fn1() or fn2() based on the boolean predicate `pred`.
+def cond(pred, fn1, fn2, strict=False, name=None):
+  """Return either `fn1()` or `fn2()` based on the boolean predicate `pred`.
 
   `fn1` and `fn2` both return lists of output tensors. `fn1` and `fn2` must have
   the same non-zero number and type of outputs.
 
   Note that the conditional execution applies only to the operations defined in
-  fn1 and fn2. Consider the following simple program:
+  `fn1` and `fn2`. Consider the following simple program:
 
   ```python
   z = tf.multiply(a, b)
   result = tf.cond(x < y, lambda: tf.add(x, z), lambda: tf.square(y))
   ```
 
-  If x < y, the `tf.add` operation will be executed and `tf.square`
-  operation will not be executed. Since z is needed for at least one
-  branch of the cond, the `tf.multiply` operation is always executed, unconditionally.
+  If `x < y`, the `tf.add` operation will be executed and `tf.square`
+  operation will not be executed. Since `z` is needed for at least one
+  branch of the `cond`, the `tf.multiply` operation is always executed,
+  unconditionally.
   Although this behavior is consistent with the dataflow model of TensorFlow,
   it has occasionally surprised some users who expected a lazier semantics.
 
+  `tf.cond` supports nested structures as implemented in
+  `tensorflow.python.util.nest`. Both `fn1` and `fn2` must return the same
+  (possibly nested) value structure of lists, tuples, and/or named tuples.
+  Singleton lists and tuples form the only exceptions to this: when returned by
+  `fn1` and/or `fn2`, they are implicitly unpacked to single values. This
+  behavior is disabled by passing `strict=True`.
+
   Args:
     pred: A scalar determining whether to return the result of `fn1` or `fn2`.
     fn1: The callable to be performed if pred is true.
     fn2: The callable to be performed if pred is false.
+    strict: A boolean that enables/disables 'strict' mode; see above.
     name: Optional name prefix for the returned tensors.
 
   Returns:
@@ -1738,23 +1751,43 @@ def cond(pred, fn1, fn2, name=None):
     # Build the graph for the true branch in a new context.
     context_t = CondContext(pred, pivot_1, branch=1)
     context_t.Enter()
-    orig_res, res_t = context_t.BuildCondBranch(fn1)
+    orig_res_t, res_t = context_t.BuildCondBranch(fn1)
+    if orig_res_t is None:
+      raise ValueError("fn1 must have a return value.")
     context_t.ExitResult(res_t)
     context_t.Exit()
 
     # Build the graph for the false branch in a new context.
     context_f = CondContext(pred, pivot_2, branch=0)
     context_f.Enter()
-    _, res_f = context_f.BuildCondBranch(fn2)
+    orig_res_f, res_f = context_f.BuildCondBranch(fn2)
+    if orig_res_f is None:
+      raise ValueError("fn2 must have a return value.")
     context_f.ExitResult(res_f)
     context_f.Exit()
 
+    if not strict:
+      orig_res_t = _UnpackIfSingleton(orig_res_t)
+      orig_res_f = _UnpackIfSingleton(orig_res_f)
+
+    # Check that the return values of the two branches have the same structure.
+    try:
+      nest.assert_same_structure(orig_res_t, orig_res_f)
+    except TypeError as e:
+      raise TypeError(
+          "Incompatible return types of fn1 and fn2: {}".format(e))
+    except ValueError as e:
+      raise ValueError(
+          "Incompatible return values of fn1 and fn2: {}".format(e))
+
     # Add the final merge to the graph.
-    if len(res_t) != len(res_f):
-      raise ValueError("fn1 and fn2 must return the same number of results.")
     if not res_t:
       raise ValueError("fn1 and fn2 must return at least one result.")
-    for x, y in zip(res_t, res_f):
+
+    res_t_flat = nest.flatten(res_t)
+    res_f_flat = nest.flatten(res_f)
+
+    for x, y in zip(res_t_flat, res_f_flat):
       assert ((isinstance(x, ops.IndexedSlices) and
                isinstance(y, ops.IndexedSlices)) or
               (isinstance(x, sparse_tensor.SparseTensor) and
@@ -1765,14 +1798,20 @@ def cond(pred, fn1, fn2, name=None):
       if val_x.dtype.base_dtype != val_y.dtype.base_dtype:
         raise ValueError("Outputs of fn1 and fn2 must have the same type: "
                          "%s, %s" % (val_x.dtype.name, val_y.dtype.name))
-    merges = [merge([x[0], x[1]])[0] for x in zip(res_f, res_t)]
-    merges = _convert_flows_to_tensorarrays(orig_res, merges)
+
+    merges = [merge(pair)[0] for pair in zip(res_f_flat, res_t_flat)]
+    merges = _convert_flows_to_tensorarrays(nest.flatten(orig_res_t), merges)
 
     # Add to collections
     ops.add_to_collection(ops.GraphKeys.COND_CONTEXT, context_t)
     ops.add_to_collection(ops.GraphKeys.COND_CONTEXT, context_f)
 
-    return merges[0] if len(merges) == 1 else merges
+    merges = nest.pack_sequence_as(structure=orig_res_t, flat_sequence=merges)
+
+    # Singleton lists and tuples are automatically unpacked if strict == False.
+    if not strict:
+      merges = _UnpackIfSingleton(merges)
+    return merges
 
 
 def _resource_safe_shape(t):
@@ -2415,8 +2454,8 @@ class WhileContext(ControlFlowContext):
     # Store body_result to keep track of TensorArrays returned by body
     original_body_result = body_result
     # Convert TensorArrays returned by body into their flow variables
-    flat_result = nest.flatten(body_result)
-    result = _convert_tensorarrays_to_flows(flat_result)
+    result = nest.map_structure(_convert_tensorarray_to_flow,
+                                nest.flatten(body_result))
     result = ops.convert_n_to_tensor_or_indexed_slices(result)
 
     # Add NextIteration and the back edges to complete the loop.
@@ -2446,9 +2485,9 @@ class WhileContext(ControlFlowContext):
 
     # Keep original_loop_vars to identify which are TensorArrays
     original_loop_vars = loop_vars
-    flat_loop_vars = nest.flatten(loop_vars)
     # Convert TensorArrays to their flow variables
-    loop_vars = _convert_tensorarrays_to_flows(flat_loop_vars)
+    loop_vars = nest.map_structure(_convert_tensorarray_to_flow,
+                                   nest.flatten(loop_vars))
     loop_vars = ops.convert_n_to_tensor_or_indexed_slices(loop_vars)
     try:
       self.Enter()
@@ -2820,7 +2859,7 @@ def tuple(tensors, name=None, control_inputs=None):
     return tpl
 
 
-def case(pred_fn_pairs, default, exclusive=False, name="case"):
+def case(pred_fn_pairs, default, exclusive=False, strict=False, name="case"):
   """Create a case operation.
 
   The `pred_fn_pairs` parameter is a dict or list of pairs of size N.
@@ -2837,6 +2876,13 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
   are returned immediately. If none of the predicates evaluate to True, this
   operation returns the tensors generated by `default`.
 
+  `tf.case` supports nested structures as implemented in
+  `tensorflow.python.util.nest`. Both `fn1` and `fn2` must return the same
+  (possibly nested) value structure of lists, tuples, and/or named tuples.
+  Singleton lists and tuples form the only exceptions to this: when returned by
+  `fn1` and/or `fn2`, they are implicitly unpacked to single values. This
+  behavior is disabled by passing `strict=True`.
+
   Example 1:
     Pseudocode:
     ```
@@ -2877,6 +2923,7 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
                    callable which returns a list of tensors.
     default: A callable that returns a list of tensors.
     exclusive: True iff at most one predicate is allowed to evaluate to `True`.
+    strict: A boolean that enables/disables 'strict' mode; see above.
     name: A name for this operation (optional).
 
   Returns:
@@ -2941,20 +2988,31 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
 
     # Create an empty tensor, or list, with the right type and shape
     with ops.name_scope("case_create_empty"):
-      dummy_value = default()
+      def _create_empty_constant(dtype, shape):
+        value = ("" if dtype == dtypes.string else dtype.as_numpy_dtype())
+        if shape.ndims is None:
+          return array_ops.constant(value, dtype=dtype)
+        else:
+          temp_shape = [1 if x.value is None else x.value for x in shape]
+          result = array_ops.constant(value, shape=temp_shape, dtype=dtype)
+          result._shape = shape  # pylint: disable=protected-access
+          return result
+
       def _correct_empty(v):
         if isinstance(v, ops.Operation):
           return no_op()
-        elif v.dtype == dtypes.string:
-          return array_ops.constant("")
+        elif isinstance(v, tensor_array_ops.TensorArray):
+          return v
+        elif not hasattr(v, "dtype"):
+          return ops.convert_to_tensor(v)
+        elif isinstance(v, sparse_tensor.SparseTensor):
+          return sparse_tensor.SparseTensor(indices=[[0] * len(v.get_shape())],
+                                            values=[v.dtype.as_numpy_dtype()],
+                                            dense_shape=v.get_shape())
         else:
-          return array_ops.constant(v.dtype.as_numpy_dtype())
+          return _create_empty_constant(v.dtype, v.get_shape())
 
-      if isinstance(dummy_value, collections.Sequence):
-        dummy_type = type(dummy_value)
-        empty = lambda: dummy_type(_correct_empty(v) for v in dummy_value)
-      else:
-        empty = lambda: _correct_empty(dummy_value)
+      empty = lambda: nest.map_structure(_correct_empty, default())
 
     # case_sequence = [
     #   cond(~p3 & ~p2 & ~p1, default, empty),
@@ -2972,7 +3030,7 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
         prev_case = cond(
             cp, fn,
             empty if i == 0 else lambda: prev_case,
-            name="If_%d" % i)
+            strict=strict, name="If_%d" % i)
       return prev_case
 
     if exclusive:
@@ -2994,6 +3052,8 @@ def case(pred_fn_pairs, default, exclusive=False, name="case"):
     else:
       case_seq = _build_case()
 
+    if not strict:
+      case_seq = _UnpackIfSingleton(case_seq)
     return case_seq
 
 
diff --git a/tensorflow/python/ops/control_flow_ops_test.py b/tensorflow/python/ops/control_flow_ops_test.py
index 9037dd042d..a88143224f 100644
--- a/tensorflow/python/ops/control_flow_ops_test.py
+++ b/tensorflow/python/ops/control_flow_ops_test.py
@@ -18,11 +18,16 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
+import numpy as np
+
 from tensorflow.core.framework import graph_pb2
 from tensorflow.core.framework import node_def_pb2
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework.test_util import TensorFlowTestCase
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
@@ -37,9 +42,14 @@ from tensorflow.python.ops import variables
 import tensorflow.python.ops.tensor_array_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import googletest
 from tensorflow.python.training import momentum
+from tensorflow.python.util import nest
 from tensorflow.python.util.protobuf import compare
 
 
+TestTuple = collections.namedtuple("TestTuple", "a b")
+SingletonTestTuple = collections.namedtuple("SingletonTestTuple", "a")
+
+
 class GroupTestCase(TensorFlowTestCase):
 
   def _StripNode(self, nd):
@@ -334,5 +344,340 @@ class ContextTest(TensorFlowTestCase):
               control_flow_ops.WhileContext.from_proto(c.to_proto()).to_proto())
 
 
+def _GetNestedShape(nested):
+  def _GetShape(tensor):
+    if isinstance(tensor, tensor_array_ops.TensorArray):
+      return tensor_array_ops.TensorArray
+    elif isinstance(tensor, ops.IndexedSlices):
+      return tensor.dense_shape
+    else:
+      return tensor.get_shape()
+
+  return nest.map_structure(_GetShape, nested)
+
+
+def _CreateTensorArray(size, shape):
+  ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=size,
+                                    clear_after_read=False)
+  for i in range(size):
+    ta = ta.write(i, array_ops.zeros(shape))
+  return ta
+
+
+def _RawNestedShape(nested_shape):
+  def _RawShape(shape):
+    if isinstance(shape, tensor_shape.TensorShape) and shape.ndims is not None:
+      return [x.value for x in shape]
+    else:
+      return None
+  return nest.map_structure(_RawShape, nested_shape)
+
+
+# TODO(yori): Add tests for indexed slices.
+class DataTypesTest(TensorFlowTestCase):
+
+  def assertAllEqualNested(self, a, b):
+    if isinstance(a, (list, tuple)):
+      for entry_a, entry_b in zip(a, b):
+        self.assertAllEqualNested(entry_a, entry_b)
+    else:
+      self.assertAllEqual(a, b)
+
+  def _testShape(self, fn_true, fn_false, expected_shape,
+                 strict=False):
+    condition = array_ops.placeholder(dtypes.bool)
+    output_cond = control_flow_ops.cond(condition, fn_true, fn_false,
+                                        strict=strict)
+    self.assertEqual(_RawNestedShape(_GetNestedShape(output_cond)),
+                     _RawNestedShape(expected_shape))
+
+    output_case = control_flow_ops.case([(condition, fn_true)], fn_false,
+                                        strict=strict)
+    self.assertEqual(_RawNestedShape(_GetNestedShape(output_case)),
+                     _RawNestedShape(expected_shape))
+
+  def _testReturnValues(self, fn_true, fn_false, expected_value_true,
+                        expected_value_false, strict=False,
+                        check_cond=True):
+    condition = array_ops.placeholder(dtypes.bool)
+    output_cond = control_flow_ops.cond(condition, fn_true, fn_false,
+                                        strict=strict)
+    output_case = control_flow_ops.case([(condition, fn_true)], fn_false,
+                                        strict=strict)
+
+    with self.test_session() as sess:
+      variables.global_variables_initializer().run()
+      result_cond, result_case = sess.run([output_cond, output_case],
+                                          feed_dict={condition: True})
+      self.assertAllEqualNested(result_cond, expected_value_true)
+      if check_cond:
+        self.assertAllEqualNested(result_case, expected_value_true)
+      result_cond, result_case = sess.run([output_cond, output_case],
+                                          feed_dict={condition: False})
+      self.assertAllEqualNested(result_cond, expected_value_false)
+      if check_cond:
+        self.assertAllEqualNested(result_case, expected_value_false)
+
+  def test_int(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: 1
+    fn_false = lambda: 2
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 2)
+    self._testShape(fn_true, fn_false, shape, strict=True)
+    self._testReturnValues(fn_true, fn_false, 1, 2, strict=True)
+
+  def test_float(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: 1.0
+    fn_false = lambda: 2.0
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1.0, 2.0)
+
+  def test_noop(self):
+    shape = tensor_shape.TensorShape(None)
+    self._testShape(control_flow_ops.no_op, control_flow_ops.no_op, shape)
+    self._testReturnValues(control_flow_ops.no_op, control_flow_ops.no_op,
+                           True, False, check_cond=False)
+
+  def test_string(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: "abc"
+    fn_false = lambda: "xyz"
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, b"abc", b"xyz")
+
+  def test_variable(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: variables.Variable(3.0)
+    fn_false = lambda: variables.Variable(4.0)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 3.0, 4.0)
+
+  def test_none(self):
+    fn_none = lambda: None
+    fn_tensor = lambda: constant_op.constant(1)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.cond(constant_op.constant(True), fn_none, fn_tensor)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.cond(constant_op.constant(True), fn_tensor, fn_none)
+
+  def test_tensors(self):
+    def _BuildTrueBranch(dtype):
+      def _Build():
+        return (array_ops.zeros([2, 2], dtype=dtype),
+                array_ops.ones([3, 3], dtype=dtype))
+      return _Build
+
+    def _BuildFalseBranch(dtype):
+      def _Build():
+        return (array_ops.ones([2, 2], dtype=dtype),
+                array_ops.zeros([3, 3], dtype=dtype))
+      return _Build
+
+    for dtype in (dtypes.float16, dtypes.int8, dtypes.int32, dtypes.uint8):
+      shape = (tensor_shape.TensorShape([2, 2]),
+               tensor_shape.TensorShape([3, 3]))
+      fn_true = _BuildTrueBranch(dtype)
+      fn_false = _BuildFalseBranch(dtype)
+      self._testShape(fn_true, fn_false, shape)
+      self._testReturnValues(fn_true, fn_false,
+                             (np.zeros([2, 2]), np.ones([3, 3])),
+                             (np.ones([2, 2]), np.zeros([3, 3])))
+
+  def test_tensors_unknown_shape(self):
+    def _BuildTrueBranch(dtype):
+      def _Build():
+        tensor = array_ops.zeros([2, 2], dtype=dtype)
+        tensor._shape = tensor_shape.TensorShape(None)
+        return tensor
+      return _Build
+
+    def _BuildFalseBranch(dtype):
+      def _Build():
+        tensor = array_ops.ones([2, 2], dtype=dtype)
+        tensor._shape = tensor_shape.TensorShape(None)
+        return tensor
+      return _Build
+
+    for dtype in (dtypes.float16, dtypes.int8, dtypes.int32, dtypes.uint8):
+      shape = tensor_shape.TensorShape(None)
+      fn_true = _BuildTrueBranch(dtype)
+      fn_false = _BuildFalseBranch(dtype)
+      self._testShape(fn_true, fn_false, shape)
+      self._testReturnValues(fn_true, fn_false,
+                             np.zeros([2, 2]), np.ones([2, 2]))
+
+  def test_sparse_tensors(self):
+    shape = tensor_shape.TensorShape([None, None])
+
+    def FnTrue():
+      return [sparse_tensor.SparseTensor(indices=[[0, 0], [1, 2]],
+                                         values=[1, 2], dense_shape=[3, 4])]
+
+    def FnFalse():
+      return [sparse_tensor.SparseTensor(indices=[[0, 0], [2, 1]],
+                                         values=[3, 4], dense_shape=[3, 4])]
+
+    value1 = sparse_tensor.SparseTensorValue(indices=[[0, 0], [1, 2]],
+                                             values=[1, 2], dense_shape=[3, 4])
+    value2 = sparse_tensor.SparseTensorValue(indices=[[0, 0], [2, 1]],
+                                             values=[3, 4], dense_shape=[3, 4])
+    self._testShape(FnTrue, FnFalse, shape)
+    self._testReturnValues(FnTrue, FnFalse, value1, value2)
+    self._testShape(FnTrue, FnFalse, [shape], strict=True)
+    self._testReturnValues(FnTrue, FnFalse, [value1], [value2], strict=True)
+
+  def test_tensors_with_partially_specified_shapes(self):
+    def _BuildBranch(dtype, shape):
+      def _Build():
+        a = array_ops.zeros([2, 2], dtype=dtype)
+        b = array_ops.zeros([5], dtype=dtype)
+        c = array_ops.ones([3, 3], dtype=dtype)
+        a._shape = tensor_shape.TensorShape(shape[0])
+        b._shape = tensor_shape.TensorShape(shape[1])
+        c._shape = tensor_shape.TensorShape(shape[2])
+        return a, b, c
+      return _Build
+
+    for dtype in (dtypes.float16, dtypes.int8, dtypes.int32, dtypes.uint8):
+      shape = (tensor_shape.TensorShape([None, 2]),
+               tensor_shape.TensorShape([None]),
+               tensor_shape.TensorShape([3, None]))
+      fn_true = _BuildBranch(dtype, shape)
+      fn_false = _BuildBranch(dtype, shape)
+      self._testShape(fn_true, fn_false, shape)
+      self._testReturnValues(fn_true, fn_false,
+                             (np.zeros([2, 2]), np.zeros(5), np.ones([3, 3])),
+                             (np.zeros([2, 2]), np.zeros(5), np.ones([3, 3])))
+
+  def test_tensor_arrays(self):
+    element_shape = tensor_shape.TensorShape([2])
+    ta1 = _CreateTensorArray(4, element_shape)
+    ta2 = _CreateTensorArray(4, element_shape)
+    shape = tensor_array_ops.TensorArray
+    fn_true = lambda: ta1
+    fn_false = lambda: ta2
+    self._testShape(fn_true, fn_false, shape)
+
+  def test_tensor_array_reads(self):
+    shape = tensor_shape.TensorShape([2])
+    ta = _CreateTensorArray(4, shape)
+    fn_true = lambda: ta.read(0)
+    fn_false = lambda: ta.read(1)
+    self._testShape(fn_true, fn_false, shape)
+
+  def test_list(self):
+    shape = [tensor_shape.TensorShape([]), tensor_shape.TensorShape([]),
+             tensor_shape.TensorShape([])]
+    fn_true = lambda: [constant_op.constant(1), 2, variables.Variable(3.0)]
+    fn_false = lambda: [constant_op.constant(3), 4, variables.Variable(5.0)]
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, [1, 2, 3.0], [3, 4, 5.0])
+
+  def test_non_strict(self):
+    shape = tensor_shape.TensorShape([])
+    fn_tensor = lambda: constant_op.constant(1)
+    fn_list = lambda: [constant_op.constant(2)]
+    fn_tuple = lambda: (constant_op.constant(3),)
+    self._testShape(fn_tensor, fn_list, shape)
+    self._testShape(fn_tensor, fn_tuple, shape)
+    self._testShape(fn_list, fn_tuple, shape)
+    self._testReturnValues(fn_tensor, fn_list, 1, 2)
+    self._testReturnValues(fn_tensor, fn_tuple, 1, 3)
+    self._testReturnValues(fn_list, fn_tuple, 2, 3)
+
+  def test_singleton_strict(self):
+    fn_tensor = lambda: constant_op.constant(1)
+    fn_list = lambda: [constant_op.constant(2)]
+    fn_tuple = lambda: (constant_op.constant(3),)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.cond(constant_op.constant(True), fn_tensor, fn_list,
+                            strict=True)
+
+    with self.assertRaises(TypeError):
+      control_flow_ops.cond(constant_op.constant(True), fn_list, fn_tuple,
+                            strict=True)
+
+    with self.assertRaises(ValueError):
+      control_flow_ops.case([(constant_op.constant(True), fn_tensor)], fn_list,
+                            strict=True)
+
+    with self.assertRaises(TypeError):
+      control_flow_ops.case([(constant_op.constant(True), fn_list)], fn_tuple,
+                            strict=True)
+
+  def test_singleton_list(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: [constant_op.constant(1)]
+    fn_false = lambda: [constant_op.constant(3)]
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 3)
+    self._testShape(fn_true, fn_false, [shape], strict=True)
+    self._testReturnValues(fn_true, fn_false, [1], [3], strict=True)
+
+  def test_singleton_tuple(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: (constant_op.constant(1),)
+    fn_false = lambda: (constant_op.constant(3),)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 3)
+    self._testShape(fn_true, fn_false, (shape,), strict=True)
+    self._testReturnValues(fn_true, fn_false, (1,), (3,),
+                           strict=True)
+
+  def test_singleton_namedtuple(self):
+    shape = tensor_shape.TensorShape([])
+    fn_true = lambda: SingletonTestTuple(constant_op.constant(1))
+    fn_false = lambda: SingletonTestTuple(constant_op.constant(3))
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, 1, 3)
+    self._testShape(fn_true, fn_false, SingletonTestTuple(shape),
+                    strict=True)
+    self._testReturnValues(fn_true, fn_false, SingletonTestTuple(1),
+                           SingletonTestTuple(3), strict=True)
+
+  def test_tuple(self):
+    shape = (tensor_shape.TensorShape([]), tensor_shape.TensorShape([]))
+    fn_true = lambda: (constant_op.constant(1), 2)
+    fn_false = lambda: (constant_op.constant(3), 4)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, (1, 2), (3, 4))
+
+  def test_namedtuple(self):
+    shape = TestTuple(tensor_shape.TensorShape([]),
+                      tensor_shape.TensorShape([]))
+    fn_true = lambda: TestTuple(constant_op.constant(1), 2)
+    fn_false = lambda: TestTuple(constant_op.constant(3), 4)
+    self._testShape(fn_true, fn_false, shape)
+    self._testReturnValues(fn_true, fn_false, TestTuple(1, 2), TestTuple(3, 4))
+
+  def test_nested(self):
+    shape = [tensor_shape.TensorShape([]),
+             TestTuple(tensor_shape.TensorShape([]),
+                       [tensor_shape.TensorShape([]),
+                        tensor_shape.TensorShape([])]),
+             tensor_shape.TensorShape([5, 5]),
+             tensor_shape.TensorShape([])]
+
+    def FnTrue():
+      return [constant_op.constant(1),
+              TestTuple(constant_op.constant(2), [3, 4]),
+              array_ops.zeros([5, 5]), 6]
+
+    def FnFalse():
+      return [constant_op.constant(11),
+              TestTuple(constant_op.constant(12), [13, 14]),
+              array_ops.ones([5, 5]), 16]
+
+    self._testShape(FnTrue, FnFalse, shape)
+    self._testReturnValues(FnTrue, FnFalse,
+                           [1, TestTuple(2, [3, 4]), np.zeros([5, 5]), 6],
+                           [11, TestTuple(12, [13, 14]), np.ones([5, 5]), 16])
+
+
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/python/ops/embedding_ops.py b/tensorflow/python/ops/embedding_ops.py
index 2aeb9ce14d..168ca7fefc 100644
--- a/tensorflow/python/ops/embedding_ops.py
+++ b/tensorflow/python/ops/embedding_ops.py
@@ -33,16 +33,16 @@ from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 
 
-def _do_gather(params, ids, validate_indices=True, name=None):
+def _do_gather(params, ids, name=None):
   """Deals with doing gather differently for resource variables."""
   if isinstance(params, resource_variable_ops.ResourceVariable):
     return params.sparse_read(ids, name=name)
-  return array_ops.gather(
-      params, ids, name=name, validate_indices=validate_indices)
+  return array_ops.gather(params, ids, name=name)
 
 
 def embedding_lookup(params, ids, partition_strategy="mod", name=None,
-                     validate_indices=True, max_norm=None):
+                     validate_indices=True,  # pylint: disable=unused-argument
+                     max_norm=None):
   """Looks up `ids` in a list of embedding tensors.
 
   This function is used to perform parallel lookups on the list of
@@ -82,7 +82,10 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
       if `len(params) > 1`. Currently `"div"` and `"mod"` are supported. Default
       is `"mod"`.
     name: A name for the operation (optional).
-    validate_indices: Whether or not to validate gather indices.
+    validate_indices: DEPRECATED. If this operation is assigned to CPU, values
+      in `indices` are always validated to be within range.  If assigned to GPU,
+      out-of-bound indices result in safe but unspecified behavior, which may
+      include raising an error.
     max_norm: If not None, embedding values are l2-normalized to the value of
      max_norm.
 
@@ -92,7 +95,7 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
   Raises:
     ValueError: If `params` is empty.
   """
-  if params is None or params == []:  # pylint: disable=g-explicit-bool-comparison
+  if params in (None, (), []):
     raise ValueError("Need at least one param")
   if isinstance(params, variables.PartitionedVariable):
     params = list(params)  # Iterate to get the underlying Variables.
@@ -114,9 +117,7 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
       params = ops.convert_n_to_tensor_or_indexed_slices(params, name="params")
     if np == 1:
       with ops.colocate_with(params[0]):
-        return maybe_normalize(
-            _do_gather(
-                params[0], ids, validate_indices=validate_indices, name=name))
+        return maybe_normalize(_do_gather(params[0], ids, name=name))
     else:
       ids = ops.convert_to_tensor(ids, name="ids")
       flat_ids = array_ops.reshape(ids, [-1])
@@ -176,9 +177,7 @@ def embedding_lookup(params, ids, partition_strategy="mod", name=None,
       partitioned_result = []
       for p in xrange(np):
         with ops.colocate_with(params[p]):
-          partitioned_result.append(
-              _do_gather(params[p], gather_ids[p],
-                         validate_indices=validate_indices))
+          partitioned_result.append(_do_gather(params[p], gather_ids[p]))
       # Stitch these back together
       ret = data_flow_ops.dynamic_stitch(pindices, partitioned_result,
                                          name=name)
diff --git a/tensorflow/python/tools/inspect_checkpoint.py b/tensorflow/python/tools/inspect_checkpoint.py
index 6faf570de7..9942a5d908 100644
--- a/tensorflow/python/tools/inspect_checkpoint.py
+++ b/tensorflow/python/tools/inspect_checkpoint.py
@@ -95,7 +95,7 @@ def parse_numpy_printoption(kv_str):
         "Setting '%s' from the command line is not supported." % k)
   try:
     v = (v_type(v_str) if v_type is not bool
-         else flags.BooleanParser().Parse(v_str))
+         else flags.BooleanParser().parse(v_str))
   except ValueError as e:
     raise argparse.ArgumentTypeError(e.message)
   np.set_printoptions(**{k: v})
diff --git a/tensorflow/python/training/coordinator.py b/tensorflow/python/training/coordinator.py
index 2863afb21e..fea2f8240e 100644
--- a/tensorflow/python/training/coordinator.py
+++ b/tensorflow/python/training/coordinator.py
@@ -106,7 +106,7 @@ class Coordinator(object):
   After a thread has called `coord.request_stop()` the other threads have a
   fixed time to stop, this is called the 'stop grace period' and defaults to 2
   minutes.  If any of the threads is still alive after the grace period expires
-  `coord.join()` raises a RuntimeException reporting the laggards.
+  `coord.join()` raises a RuntimeError reporting the laggards.
 
   ```python
   try:
@@ -117,7 +117,7 @@ class Coordinator(object):
     ...start thread N...(coord, ...)
     # Wait for all the threads to terminate, give them 10s grace period
     coord.join(threads, stop_grace_period_secs=10)
-  except RuntimeException:
+  except RuntimeError:
     ...one of the threads took more than 10s to stop after request_stop()
     ...was called.
   except Exception:
diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index 28c0668d24..f2bcc56175 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -68,6 +68,7 @@ See the @{$python/train} guide.
 @@LoggingTensorHook
 @@StopAtStepHook
 @@CheckpointSaverHook
+@@CheckpointSaverListener
 @@NewCheckpointReader
 @@StepCounterHook
 @@NanLossDuringTrainingError
@@ -128,6 +129,7 @@ from tensorflow.python.training.basic_session_run_hooks import SecondOrStepTimer
 from tensorflow.python.training.basic_session_run_hooks import LoggingTensorHook
 from tensorflow.python.training.basic_session_run_hooks import StopAtStepHook
 from tensorflow.python.training.basic_session_run_hooks import CheckpointSaverHook
+from tensorflow.python.training.basic_session_run_hooks import CheckpointSaverListener
 from tensorflow.python.training.basic_session_run_hooks import StepCounterHook
 from tensorflow.python.training.basic_session_run_hooks import NanLossDuringTrainingError
 from tensorflow.python.training.basic_session_run_hooks import NanTensorHook
diff --git a/tensorflow/tensorboard/BUILD b/tensorflow/tensorboard/BUILD
index ea409a9312..9772538524 100644
--- a/tensorflow/tensorboard/BUILD
+++ b/tensorflow/tensorboard/BUILD
@@ -39,6 +39,8 @@ py_binary(
         "//tensorflow/python:platform",
         "//tensorflow/tensorboard/backend:application",
         "//tensorflow/tensorboard/backend/event_processing:event_file_inspector",
+        "//tensorflow/tensorboard/plugins/projector:projector_plugin",
+        "//tensorflow/tensorboard/plugins/text:text_plugin",
         "@org_pocoo_werkzeug//:werkzeug",
     ],
 )
diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD
index 4e1db85374..d27a22a82b 100644
--- a/tensorflow/tensorboard/backend/BUILD
+++ b/tensorflow/tensorboard/backend/BUILD
@@ -65,9 +65,6 @@ py_library(
         "//tensorflow/python:platform",
         "//tensorflow/tensorboard/backend/event_processing:event_accumulator",
         "//tensorflow/tensorboard/backend/event_processing:event_multiplexer",
-        "//tensorflow/tensorboard/plugins/debugger:debugger_plugin",
-        "//tensorflow/tensorboard/plugins/projector:projector_plugin",
-        "//tensorflow/tensorboard/plugins/text:text_plugin",
         "@org_pocoo_werkzeug//:werkzeug",
         "@six_archive//:six",
     ],
diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index 974762822f..3c8963e302 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -43,9 +43,6 @@ from tensorflow.tensorboard.backend import http_util
 from tensorflow.tensorboard.backend import process_graph
 from tensorflow.tensorboard.backend.event_processing import event_accumulator
 from tensorflow.tensorboard.backend.event_processing import event_multiplexer
-from tensorflow.tensorboard.plugins.debugger import debugger_plugin
-from tensorflow.tensorboard.plugins.projector import projector_plugin
-from tensorflow.tensorboard.plugins.text import text_plugin
 
 
 DEFAULT_SIZE_GUIDANCE = {
@@ -97,18 +94,27 @@ class _OutputFormat(object):
   CSV = 'csv'
 
 
-def standard_tensorboard_wsgi(logdir, purge_orphaned_data, reload_interval):
-  """Construct a TensorBoardWSGIApp with standard plugins and multiplexer."""
+def standard_tensorboard_wsgi(
+    logdir,
+    purge_orphaned_data,
+    reload_interval,
+    plugins):
+  """Construct a TensorBoardWSGIApp with standard plugins and multiplexer.
+
+  Args:
+    logdir: The path to the directory containing events files.
+    purge_orphaned_data: Whether to purge orphaned data.
+    reload_interval: The interval at which the backend reloads more data in
+        seconds.
+    plugins: A list of plugins for TensorBoard to initialize.
+
+  Returns:
+    The new TensorBoard WSGI application.
+  """
   multiplexer = event_multiplexer.EventMultiplexer(
       size_guidance=DEFAULT_SIZE_GUIDANCE,
       purge_orphaned_data=purge_orphaned_data)
 
-  plugins = [
-      debugger_plugin.DebuggerPlugin(),
-      projector_plugin.ProjectorPlugin(),
-      text_plugin.TextPlugin(),
-  ]
-
   return TensorBoardWSGIApp(logdir, plugins, multiplexer, reload_interval)
 
 
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 002709cd5b..a5181401fa 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -54,15 +54,18 @@ from tensorflow.tensorboard.plugins import base_plugin
 class FakePlugin(base_plugin.TBPlugin):
   """A plugin with no functionality."""
 
-  def __init__(self, plugin_name, is_active_value):
+  def __init__(self, plugin_name, is_active_value, routes_mapping):
     """Constructs a fake plugin.
 
     Args:
       plugin_name: The name of this plugin.
       is_active_value: Whether the plugin is active.
+      routes_mapping: A dictionary mapping from route (string URL path) to the
+        method called when a user issues a request to that route.
     """
     self.plugin_name = plugin_name
     self._is_active_value = is_active_value
+    self._routes_mapping = routes_mapping
 
   def get_plugin_apps(self, multiplexer, logdir):
     """Returns a mapping from routes to handlers offered by this plugin.
@@ -72,9 +75,9 @@ class FakePlugin(base_plugin.TBPlugin):
       logdir: The path to the directory containing logs.
 
     Returns:
-      An empty dict. This plugin offers no routes.
+      A dictionary mapping from routes to handlers offered by this plugin.
     """
-    return {}
+    return self._routes_mapping
 
   def is_active(self):
     """Returns whether this plugin is active.
@@ -97,8 +100,8 @@ class TensorboardServerTest(test.TestCase):
         size_guidance=application.DEFAULT_SIZE_GUIDANCE,
         purge_orphaned_data=True)
     plugins = [
-        FakePlugin(plugin_name='foo', is_active_value=True),
-        FakePlugin(plugin_name='bar', is_active_value=False)
+        FakePlugin(plugin_name='foo', is_active_value=True, routes_mapping={}),
+        FakePlugin(plugin_name='bar', is_active_value=False, routes_mapping={})
     ]
     app = application.TensorBoardWSGIApp(
         self.temp_dir, plugins, multiplexer, reload_interval=0)
@@ -476,10 +479,41 @@ class TensorBoardAssetsTest(test.TestCase):
   def testTagFound(self):
     tag = application.get_tensorboard_tag()
     self.assertTrue(tag)
-    app = application.standard_tensorboard_wsgi('', True, 60)
+    app = application.standard_tensorboard_wsgi('', True, 60, [])
     self.assertEqual(app.tag, tag)
 
 
+class TensorBoardPluginsTest(test.TestCase):
+
+  def testPluginsAdded(self):
+
+    def foo_handler():
+      pass
+
+    def bar_handler():
+      pass
+
+    plugins = [
+        FakePlugin(
+            plugin_name='foo',
+            is_active_value=True,
+            routes_mapping={'/foo_route': foo_handler}),
+        FakePlugin(
+            plugin_name='bar',
+            is_active_value=True,
+            routes_mapping={'/bar_route': bar_handler}),
+    ]
+
+    # The application should have added routes for both plugins.
+    app = application.standard_tensorboard_wsgi('', True, 60, plugins)
+
+    # The routes are prefixed with /data/plugin/[plugin name].
+    self.assertDictContainsSubset({
+        '/data/plugin/foo/foo_route': foo_handler,
+        '/data/plugin/bar/bar_route': bar_handler,
+    }, app.data_applications)
+
+
 class TensorboardSimpleServerConstructionTest(test.TestCase):
   """Tests that the default HTTP server is constructed without error.
 
@@ -533,14 +567,18 @@ class TensorBoardApplcationConstructionTest(test.TestCase):
     # Fails if there is an unnamed plugin
     with self.assertRaises(ValueError):
       # This plugin lacks a name.
-      plugins = [FakePlugin(plugin_name=None, is_active_value=True)]
+      plugins = [
+          FakePlugin(plugin_name=None, is_active_value=True, routes_mapping={})
+      ]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
     # Fails if there are two plugins with same name
     with self.assertRaises(ValueError):
       plugins = [
-          FakePlugin(plugin_name='foo', is_active_value=True),
-          FakePlugin(plugin_name='foo', is_active_value=True),
+          FakePlugin(
+              plugin_name='foo', is_active_value=True, routes_mapping={}),
+          FakePlugin(
+              plugin_name='foo', is_active_value=True, routes_mapping={}),
       ]
       application.TensorBoardWSGIApp(logdir, plugins, multiplexer, 0)
 
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
index ad879210d6..2088cde278 100644
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
@@ -59,12 +59,16 @@ tf-audio-dashboard displays a dashboard that loads audio from a TensorFlow run.
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfAudioDashboard = Polymer({
       is: "tf-audio-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         dataType: {value: "audio"},
       },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("audio"),
         TF.Dashboard.ReloadBehavior("tf-audio-loader"),
         TF.Backend.Behavior
       ],
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
index 0fb9f70eb9..fd43970fc0 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
@@ -41,6 +41,7 @@ tensorboard_typescript_genrule(
     name = "ts",
     srcs = [
         "categorizer.ts",
+        "dashboard-behavior.ts",
         "reload-behavior.ts",
     ],
     typings = [
@@ -89,6 +90,7 @@ tensorboard_ts_library(
     name = "legacy_ts",
     srcs = [
         "categorizer.ts",
+        "dashboard-behavior.ts",
         "reload-behavior.ts",
     ],
     deps = [
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts b/tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts
new file mode 100644
index 0000000000..269a62ccf9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/dashboard-behavior.ts
@@ -0,0 +1,40 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+module TF.Dashboard {
+  /**
+   * A behavior that TensorBoard dashboards must implement. This behavior serves
+   * the purpose of an interface.
+   */
+  export function DashboardBehavior(dashboardName) {
+    return {
+      properties: {
+        name: {
+          type: String,
+          value: dashboardName,
+          readOnly: true,
+        },
+      },
+      // This method is called when the dashboard reloads, either when the
+      // dashboard is first visited, periodically reloaded, or manually reloaded
+      // via the user clicking the button. Note that dashboard custom elements
+      // that use TF.Dashboard.ReloadBehavior already implement a reload method.
+      reload() {
+        throw Error(
+            'The ' + dashboardName + ' dashboard does not implement reload.');
+      },
+    };
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html
index 4c7c91d171..9e2f6b9589 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-dashboard.html
@@ -22,4 +22,5 @@ limitations under the License.
 <link rel="import" href="tf-downloader.html">
 <link rel="import" href="tf-no-data-warning.html">
 
+<script src="dashboard-behavior.js"></script>
 <script src="reload-behavior.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html
index 8f2ea402e8..81a72793b9 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-run-selector.html
@@ -139,17 +139,9 @@ Properties out:
       },
     },
     observers: [
+      "_onBackendUpdate(backend)",
       "_logdirSet(logdir)",
     ],
-    ready: function() {
-      // Populate the logdir.
-      this.backend.logdir().then(logdirObject => {
-        this.set('logdir', logdirObject.logdir);
-      }).catch(e => {
-        // Fetching the logdir failed. Prevent the exception from logging to
-        // console. The console already logs a 404 network event.
-      });
-    },
     _toggleAll: function() {
       this.$.multiCheckbox.toggleAll();
     },
@@ -157,8 +149,21 @@ Properties out:
     _breakString: function(originalString) {
       return originalString.replace(/([\/=\-_,])/g, "$1<wbr>");
     },
+    _onBackendUpdate: function(backend) {
+      if (backend === undefined) {
+        return;
+      }
+
+      // When the backend is set, the selector can request the logdir.
+      backend.logdir().then(logdirObject => {
+        this.set('logdir', logdirObject.logdir);
+      }).catch(e => {
+        // Fetching the logdir failed. Prevent the exception from logging to
+        // console. The console already logs a 404 network event.
+      });
+    },
     _logdirSet: function(logdir) {
-      if (!logdir) {
+      if (logdir === undefined) {
         // The logdir has not been set yet.
         return;
       }
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html b/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
index 2da848bd99..58ae396cb4 100644
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
@@ -101,9 +101,13 @@ contains vz-distribution-charts embedded inside tf-panes-helper's.
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfDistributionDashboard = Polymer({
       is: "tf-distribution-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("distributions"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
index 09513699c3..9dc2a361e2 100644
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
+++ b/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
@@ -619,6 +619,18 @@ Polymer({
     renderHierarchy: Object,
     name: String,
     colorBy: String,
+
+    // For each render hierarchy, we only fit it to the viewport once (when the scene is attached to
+    // the DOM). We do not fit the hierarchy again (unless the user clicks the reset button). For
+    // instance, if the user enters a certain view in the graph, switches to another dashboard, and
+    // returns to the graph dashboard, the user expects the previous view. These properties enable
+    // that behavior.
+
+    /** Whether the scene has fit the current render hierarchy (to the viewport) at least once. */
+    _hasRenderHierarchyBeenFitOnce: Boolean,
+    /** Whether this scene element is currently attached to a parent element. */
+    _isAttached: Boolean,
+
     /** @type {d3_zoom} d3 zoom object */
     _zoom: Object,
     highlightedNode: {
@@ -723,7 +735,10 @@ Polymer({
   },
   observers: [
     '_colorByChanged(colorBy)',
-    '_buildAndFit(renderHierarchy)',
+    '_renderHierarchyChanged(renderHierarchy)',
+    // Animation and fitting must come after the observer for the hierarchy changing because we must
+    // first build the render hierarchy.
+    '_animateAndFit(_isAttached, renderHierarchy)',
     '_updateHealthPills(nodeNamesToHealthPills, healthPillStepIndex)',
   ],
   getNode: function(nodeName) {
@@ -826,9 +841,24 @@ Polymer({
         tf.graph.layout.PARAMS.minimap.size,
         tf.graph.layout.PARAMS.subscene.meta.labelHeight);
   },
-  _buildAndFit: function(renderHierarchy) {
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
+  _renderHierarchyChanged: function(renderHierarchy) {
+    this._hasRenderHierarchyBeenFitOnce = false;
     this._resetState();
     this._build(renderHierarchy);
+  },
+  _animateAndFit: function(isAttached, renderHierarchy) {
+    if (this._hasRenderHierarchyBeenFitOnce || !isAttached) {
+      // Do not animate and fit if the scene has already fitted this render hierarchy once. Or if
+      // the graph dashboard is not attached (in which case the scene lacks DOM info for fitting).
+      return;
+    }
+
     // Fit to screen after the graph is done animating.
     setTimeout(this.fit.bind(this), tf.graph.layout.PARAMS.animation.duration);
   },
@@ -881,6 +911,7 @@ Polymer({
     }
   },
   fit: function() {
+    this._hasRenderHierarchyBeenFitOnce = true;
     tf.graph.scene.fit(this.$.svg, this.$.root, this._zoom, function() {
       this._zoomed = false;
     }.bind(this));
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
index d62e4ccedc..12f3d948d2 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
@@ -104,9 +104,14 @@ out-hierarchy-params="{{_hierarchyParams}}"
 
 <script>
 (function() {
-Polymer({
+TF.Dashboard.TfGraphDashboard = Polymer({
   is: 'tf-graph-dashboard',
+  factoryImpl: function(backend, debuggerDataEnabled) {
+    this.backend = backend;
+    this.debuggerDataEnabled = debuggerDataEnabled;
+  },
   behaviors: [
+    TF.Dashboard.DashboardBehavior("graphs"),
     TF.Dashboard.ReloadBehavior("tf-graph-dashboard"),
     TF.Backend.Behavior,
   ],
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html b/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
index f8c9cc4537..dd433982d1 100644
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
@@ -121,9 +121,13 @@ contains vz-histogram-timeseries embedded inside tf-panes-helper's.
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfHistogramDashboard = Polymer({
       is: "tf-histogram-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("histograms"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
index 19c272a468..0200b65030 100644
--- a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
@@ -106,8 +106,11 @@ tf-image-dashboard displays a dashboard that loads images from a TensorFlow run.
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfImageDashboard = Polymer({
       is: "tf-image-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         backend: Object,
         dataType: {
@@ -116,8 +119,9 @@ tf-image-dashboard displays a dashboard that loads images from a TensorFlow run.
         },
       },
       behaviors: [
-          TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-          TF.Backend.Behavior,
+        TF.Dashboard.DashboardBehavior("images"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
       ],
       attached: function() {
         this.async(function() {
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html b/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
index 641573366a..723a01d0e6 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
@@ -190,9 +190,14 @@ contains vz-line-charts embedded inside tf-panes-helper's.
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfScalarDashboard = Polymer({
       is: "tf-scalar-dashboard",
+      factoryImpl: function(backend, router) {
+        this.backend = backend;
+        this.router = router;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("scalars"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
index b5b2e2d5a8..a1925c1f6b 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
@@ -57,9 +57,9 @@ allows the user to toggle between various dashboards.
         <div id="toolbar-content">
           <div class="toolbar-title">TensorBoard</div>
           <paper-tabs selected="{{modeIndex}}" noink class="tabs" id="tabs">
-            <template is="dom-repeat" items="[[tabs]]">
-              <template is="dom-if" if="[[_isTabEnabled(item)]]">
-                <paper-tab data-mode="[[item]]">[[item]]</paper-tab>
+            <template is="dom-repeat" items="[[_dashboards]]">
+              <template is="dom-if" if="[[_isTabEnabled(item.name)]]">
+                <paper-tab data-mode="[[item.name]]">[[item.name]]</paper-tab>
               </template>
             </template>
           </paper-tabs>
@@ -82,67 +82,7 @@ allows the user to toggle between various dashboards.
         </div>
       </paper-toolbar>
 
-      <div id="content" class="fit">
-        <content id="injected-overview"></content>
-
-        <template is="dom-if" if="[[_modeIsScalars(mode)]]">
-          <tf-scalar-dashboard
-            id="scalars"
-            backend="[[_backend]]"
-            router="[[router]]"
-          ></tf-scalar-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsImages(mode)]]">
-          <tf-image-dashboard
-            id="images"
-            backend="[[_backend]]"
-          ></tf-image-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsAudio(mode)]]">
-          <tf-audio-dashboard
-            id="audio"
-            backend="[[_backend]]"
-          ></tf-audio-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsGraphs(mode)]]">
-          <tf-graph-dashboard
-            id="graphs"
-            backend="[[_backend]]"
-            debugger-data-enabled="[[_debuggerDataEnabled]]"
-          ></tf-graph-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsDistributions(mode)]]">
-          <tf-distribution-dashboard
-            id="distributions"
-            backend="[[_backend]]"
-          ></tf-distribution-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsHistograms(mode)]]">
-          <tf-histogram-dashboard
-            id="histograms"
-            backend="[[_backend]]"
-          ></tf-histogram-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsEmbeddings(mode)]]">
-          <vz-projector-dashboard
-            id="projector"
-            route-prefix="/data/plugin/projector">
-          </vz-projector-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsText(mode)]]">
-          <tf-text-dashboard
-            id="text"
-            backend="[[_backend]]">
-          </tf-text-dashboard>
-        </template>
-      </div>
+      <div id="content" class="fit"></div>
     </paper-header-panel>
 
     <style>
@@ -233,16 +173,21 @@ allows the user to toggle between various dashboards.
             return match && match.length == 1;
           },
         },
+        _dashboards: {
+          type: Array,
+          computed: "_makeDashboardList(_backend, router, _debuggerDataEnabled)",
+        },
+        // Maps dashboard name to dashboard object.
+        _dashboardMapping: {
+          type: Object,
+          computed: "_makeDashboardMapping(_dashboards)",
+        },
         // Which tab is selected (scalars, graph, images etc).
         mode: {
           type: String,
           computed: '_getModeFromIndex(modeIndex)',
           notify: true,
-        },
-        tabs: {
-          type: Array,
-          readOnly: true,
-          value: TF.Globals.TABS,
+          observer: '_modeChanged',
         },
         // If this is set to a string, TensorBoard will switch to "demo mode"
         // and attempt to load serialized json data from that directory. You can
@@ -267,7 +212,7 @@ allows the user to toggle between various dashboards.
         return true;
       },
       _getModeFromIndex: function(modeIndex) {
-        var mode = this.tabs[modeIndex];
+        var mode = this._dashboards[modeIndex].name;
         TF.URIStorage.setString(TF.URIStorage.TAB, mode);
         return mode;
       },
@@ -279,34 +224,10 @@ allows the user to toggle between various dashboards.
         return new TF.Backend.Backend(router);
       },
       _isReloadDisabled: function(mode) {
-        return !this._debuggerDataEnabled && this._modeIsGraphs(mode);
-      },
-      _modeIsScalars: function(mode) {
-        return mode === "scalars";
-      },
-      _modeIsImages: function(mode) {
-        return mode === "images";
-      },
-      _modeIsAudio: function(mode) {
-        return mode === "audio";
-      },
-      _modeIsGraphs: function(mode) {
-        return mode === "graphs";
-      },
-      _modeIsEmbeddings: function(mode) {
-        return mode === "embeddings";
-      },
-      _modeIsDistributions: function(mode) {
-        return mode === "distributions";
-      },
-      _modeIsHistograms: function(mode) {
-        return mode === "histograms";
-      },
-      _modeIsText: function(mode) {
-        return mode === "text";
+        return !this._debuggerDataEnabled && mode == 'graphs';
       },
       selectedDashboard: function() {
-        var dashboard = this.$$("#" + this.mode);
+        var dashboard = this._dashboardMapping[this.mode];
         if (dashboard == null) {
           throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
         }
@@ -320,24 +241,67 @@ allows the user to toggle between various dashboards.
           this._getModeFromHash();
         }.bind(this));
       },
+      _makeDashboardList: function(backend, router, debuggerDataEnabled) {
+        if (!backend || !router) {
+          // The dashboards require these entities. We are not ready to construct dashboards.
+          return null;
+        }
+
+        return [
+          new TF.Dashboard.TfScalarDashboard(backend, router),
+          new TF.Dashboard.TfImageDashboard(backend),
+          new TF.Dashboard.TfAudioDashboard(backend),
+          new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
+          new TF.Dashboard.TfDistributionDashboard(backend),
+          new TF.Dashboard.TfHistogramDashboard(backend),
+          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
+          new TF.Dashboard.TfTextDashboard(backend),
+        ];
+      },
+      _makeDashboardMapping: function(dashboards) {
+        if (!dashboards) {
+          return null;
+        }
+
+        let mapping = {};
+        dashboards.forEach(function(dashboard) {
+          mapping[dashboard.name] = dashboard;
+        });
+        return mapping;
+      },
       _getModeFromHash: function() {
         var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
-        var modeIndex = this.tabs.indexOf(tabName);
-        if (modeIndex == -1 && this.modeIndex == null) {
+        var modeIndex;
+        for (var i = 0; i < this._dashboards.length; i++) {
+          if (this._dashboards[i].name == tabName) {
+            modeIndex = i;
+            break;
+          }
+        }
+
+        if (modeIndex === undefined && this.modeIndex == null) {
           // Select the first tab as default.
           this.set('modeIndex', 0);
         }
-        if (modeIndex != -1 && modeIndex != this.modeIndex) {
+        if (modeIndex !== undefined && modeIndex != this.modeIndex) {
           this.set('modeIndex', modeIndex);
         }
       },
-      reload: function() {
-        if (this._modeIsEmbeddings(this.mode)) {
-          return;
+      _modeChanged: function(mode) {
+        let currentDashboard = this.$.content.firstChild;
+        if (currentDashboard) {
+          this.$.content.removeChild(currentDashboard);
         }
-        if (!this._debuggerDataEnabled && this._modeIsGraphs(this.mode)) {
+
+        if (!mode || !this._dashboardMapping) {
           return;
         }
+
+        // Append the new dashboard.
+        const newDashboard = this.selectedDashboard();
+        this.$.content.appendChild(newDashboard);
+      },
+      reload: function() {
         this.selectedDashboard().reload();
       },
       openSettings: function() {
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html b/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
index d39c890a7a..d771c9821c 100644
--- a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
@@ -82,8 +82,11 @@ tf-text-dashboard displays a dashboard that loads texts from a TensorFlow run.
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfTextDashboard = Polymer({
       is: "tf-text-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         backend: Object,
         dataType: {
@@ -92,15 +95,15 @@ tf-text-dashboard displays a dashboard that loads texts from a TensorFlow run.
         },
       },
       behaviors: [
-          TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-          TF.Backend.Behavior,
+        TF.Dashboard.DashboardBehavior("text"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
       ],
       attached: function() {
         this.async(function() {
           this.fire("rendered");
         });
       },
-
     });
   </script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
index b641bb0f29..a641a54e41 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
@@ -16,6 +16,7 @@ limitations under the License.
 -->
 
 <link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
 <link rel="import" href="../tf-dashboard-common/tf-no-data-warning.html">
 <link rel="import" href="vz-projector.html">
 
@@ -37,18 +38,33 @@ limitations under the License.
 </template>
 <script>
 (function() {
-Polymer({
+TF.Dashboard.VzProjectorDashboard = Polymer({
   is: 'vz-projector-dashboard',
+  factoryImpl: function(routePrefix) {
+    this.routePrefix = routePrefix;
+  },
   properties: {
     dataNotFound: Boolean,
     routePrefix: String
   },
-  ready() {
-    var self = this;
-    d3.json(this.routePrefix + '/runs', function(err, runs) {
-      self.dataNotFound = (runs.length === 0);
+  behaviors: [
+    TF.Dashboard.DashboardBehavior("embeddings"),
+  ],
+  observers: [
+    "_routePrefixSet(routePrefix)",
+  ],
+  reload: function() {
+    // Do not reload the embedding projector. Reloading could take a long time.
+  },
+  _routePrefixSet: function(routePrefix) {
+    if (routePrefix === undefined) {
+      // The route prefix has not been set yet.
+      return;
+    }
+    d3.json(routePrefix + '/runs', (err, runs) => {
+      this.set('dataNotFound', runs.length === 0);
     });
-  }
+  },
 });
 })();
 </script>
diff --git a/tensorflow/tensorboard/plugins/debugger/BUILD b/tensorflow/tensorboard/plugins/debugger/BUILD
deleted file mode 100644
index 38aa719b9b..0000000000
--- a/tensorflow/tensorboard/plugins/debugger/BUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Description:
-# TensorBoard plugin for interacting with tfdbg, the TensorFlow debugger
-
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-load("//tensorflow:tensorflow.bzl", "py_test")
-
-## TensorFlow Debugger Plugiin ##
-py_library(
-    name = "debugger_plugin",
-    srcs = ["debugger_plugin.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        "//tensorflow/python:framework",
-        "//tensorflow/python:platform",
-        "//tensorflow/tensorboard/backend:http_util",
-        "//tensorflow/tensorboard/backend/event_processing:event_accumulator",
-        "//tensorflow/tensorboard/backend/event_processing:event_file_loader",
-        "//tensorflow/tensorboard/plugins:base_plugin",
-    ],
-)
-
-py_test(
-    name = "debugger_plugin_test",
-    size = "small",
-    srcs = ["debugger_plugin_test.py"],
-    main = "debugger_plugin_test.py",
-    srcs_version = "PY2AND3",
-    tags = ["no_pip"],
-    deps = [
-        ":debugger_plugin",
-        "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:pywrap_tensorflow",
-        "//tensorflow/python:util",
-        "//tensorflow/tensorboard/backend:application",
-        "//tensorflow/tensorboard/backend/event_processing:event_multiplexer",
-        "//third_party/py/numpy",
-        "@org_pocoo_werkzeug//:werkzeug",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        [
-            "*",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
deleted file mode 100644
index 5d34bb91db..0000000000
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""The plugin for serving data from a TensorFlow debugger."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import collections
-import glob
-import json
-import os
-import re
-
-from werkzeug import wrappers
-
-from tensorflow.python.framework import tensor_util
-from tensorflow.python.platform import tf_logging as logging
-from tensorflow.tensorboard.backend import http_util
-from tensorflow.tensorboard.backend.event_processing import event_accumulator
-from tensorflow.tensorboard.backend.event_processing import event_file_loader
-from tensorflow.tensorboard.plugins import base_plugin
-
-# The prefix of routes provided by this plugin.
-_PLUGIN_PREFIX_ROUTE = 'debugger'
-
-# HTTP routes.
-_HEALTH_PILLS_ROUTE = '/health_pills'
-
-# The POST key of HEALTH_PILLS_ROUTE for a JSON list of node names.
-_NODE_NAMES_POST_KEY = 'node_names'
-
-# The POST key of HEALTH_PILLS_ROUTE for the run to retrieve health pills for.
-_RUN_POST_KEY = 'run'
-
-# The default run to retrieve health pills for.
-_DEFAULT_RUN = '.'
-
-# The POST key of HEALTH_PILLS_ROUTE for the specific step to retrieve health
-# pills for.
-_STEP_POST_KEY = 'step'
-
-# A glob pattern for files containing debugger-related events.
-_DEBUGGER_EVENTS_GLOB_PATTERN = 'events.debugger*'
-
-
-class DebuggerPlugin(base_plugin.TBPlugin):
-  """TensorFlow Debugger plugin. Receives requests for debugger-related data.
-
-  That data could include health pills, which unveil the status of tensor
-  values.
-  """
-
-  plugin_name = _PLUGIN_PREFIX_ROUTE
-
-  def get_plugin_apps(self, multiplexer, logdir):
-    """Obtains a mapping between routes and handlers. Stores the logdir.
-
-    Args:
-      multiplexer: The EventMultiplexer that provides TB data.
-      logdir: The logdir string - the directory of events files.
-
-    Returns:
-      A mapping between routes and handlers (functions that respond to
-      requests).
-    """
-    self._event_multiplexer = multiplexer
-    self._logdir = logdir
-    return {
-        _HEALTH_PILLS_ROUTE: self._serve_health_pills_handler,
-    }
-
-  def is_active(self):
-    """Determines whether this plugin is active.
-
-    This plugin is active if any health pills information is present for any
-    run. This method must be called only after get_plugin_apps has been called.
-
-    Returns:
-      A boolean. Whether this plugin is active.
-    """
-    for run_name in self._event_multiplexer.Runs():
-      if self._event_multiplexer.GetOpsWithHealthPills(run_name):
-        return True
-
-    return False
-
-  @wrappers.Request.application
-  def _serve_health_pills_handler(self, request):
-    """A (wrapped) werkzeug handler for serving health pills.
-
-    Accepts POST requests and responds with health pills. The request accepts
-    several POST parameters:
-
-      node_names: (required string) A JSON-ified list of node names for which
-          the client would like to request health pills.
-      run: (optional string) The run to retrieve health pills for. Defaults to
-          '.'. This data is sent via POST (not GET) since URL length is limited.
-      step: (optional integer): The session run step for which to
-          retrieve health pills. If provided, the handler reads the health pills
-          of that step from disk (which is slow) and produces a response with
-          only health pills at that step. If not provided, the handler returns a
-          response with health pills at all steps sampled by the event
-          multiplexer (the fast path). The motivation here is that, sometimes,
-          one desires to examine health pills at a specific step (to say find
-          the first step that causes a model to blow up with NaNs).
-          get_plugin_apps must be called before this slower feature is used
-          because that method passes the logdir (directory path) to this plugin.
-
-    This handler responds with a JSON-ified object mapping from node names to a
-    list (of size 1) of health pill event objects, each of which has these
-    properties.
-
-    {
-        'wall_time': float,
-        'step': int,
-        'node_name': string,
-        'output_slot': int,
-        # A list of 12 floats that summarizes the elements of the tensor.
-        'value': float[],
-    }
-
-    Node names for which there are no health pills to be found are excluded from
-    the mapping.
-
-    Args:
-      request: The request issued by the client for health pills.
-
-    Returns:
-      A werkzeug BaseResponse object.
-    """
-    if request.method != 'POST':
-      logging.error(
-          '%s requests are forbidden by the debugger plugin.', request.method)
-      return wrappers.Response(status=405)
-
-    if _NODE_NAMES_POST_KEY not in request.form:
-      logging.error(
-          'The %r POST key was not found in the request for health pills.',
-          _NODE_NAMES_POST_KEY)
-      return wrappers.Response(status=400)
-
-    jsonified_node_names = request.form[_NODE_NAMES_POST_KEY]
-    try:
-      node_names = json.loads(jsonified_node_names)
-    except Exception as e:  # pylint: disable=broad-except
-      # Different JSON libs raise different exceptions, so we just do a
-      # catch-all here. This problem is complicated by how Tensorboard might be
-      # run in many different environments, as it is open-source.
-      logging.error('Could not decode node name JSON string %r: %s',
-                    jsonified_node_names, e)
-      return wrappers.Response(status=400)
-
-    if not isinstance(node_names, list):
-      logging.error('%r is not a JSON list of node names:',
-                    jsonified_node_names)
-      return wrappers.Response(status=400)
-
-    run = request.form.get(_RUN_POST_KEY, _DEFAULT_RUN)
-    step_string = request.form.get(_STEP_POST_KEY, None)
-    if step_string is None:
-      # Use all steps sampled by the event multiplexer (Relatively fast).
-      mapping = self._obtain_sampled_health_pills(run, node_names)
-    else:
-      # Read disk to obtain the health pills for that step (Relatively slow).
-      # Make sure that the directory for the run exists.
-      # Determine the directory of events file to read.
-      events_directory = self._logdir
-      if run != _DEFAULT_RUN:
-        # Use the directory for the specific run.
-        events_directory = os.path.join(events_directory, run)
-
-      step = int(step_string)
-      try:
-        mapping = self._obtain_health_pills_at_step(
-            events_directory, node_names, step)
-      except IOError as error:
-        logging.error(
-            'Error retrieving health pills for step %d: %s', step, error)
-        return wrappers.Response(status=404)
-
-    # Convert event_accumulator.HealthPillEvents to JSON-able dicts.
-    jsonable_mapping = {}
-    for node_name, events in mapping.items():
-      jsonable_mapping[node_name] = [e._asdict() for e in events]
-    return http_util.Respond(request, jsonable_mapping, 'application/json')
-
-  def _obtain_sampled_health_pills(self, run, node_names):
-    """Obtains the health pills for a run sampled by the event multiplexer.
-
-    This is much faster than the alternative path of reading health pills from
-    disk.
-
-    Args:
-      run: The run to fetch health pills for.
-      node_names: A list of node names for which to retrieve health pills.
-
-    Returns:
-      A dictionary mapping from node name to a list of
-      event_accumulator.HealthPillEvents.
-    """
-    mapping = {}
-    for node_name in node_names:
-      try:
-        mapping[node_name] = self._event_multiplexer.HealthPills(run, node_name)
-      except KeyError:
-        logging.info('No health pills found for node %r.', node_name)
-        continue
-
-    return mapping
-
-  def _obtain_health_pills_at_step(self, events_directory, node_names, step):
-    """Reads disk to obtain the health pills for a run at a specific step.
-
-    This could be much slower than the alternative path of just returning all
-    health pills sampled by the event multiplexer. It could take tens of minutes
-    to complete this call for large graphs for big step values (in the
-    thousands).
-
-    Args:
-      events_directory: The directory containing events for the desired run.
-      node_names: A list of node names for which to retrieve health pills.
-      step: The step to obtain health pills for.
-
-    Returns:
-      A dictionary mapping from node name to a list of health pill objects (see
-      docs for _serve_health_pills_handler for properties of those objects).
-
-    Raises:
-      IOError: If no files with health pill events could be found.
-    """
-    # Obtain all files with debugger-related events.
-    pattern = os.path.join(events_directory, _DEBUGGER_EVENTS_GLOB_PATTERN)
-    file_paths = glob.glob(pattern)
-
-    if not file_paths:
-      raise IOError(
-          'No events files found that matches the pattern %r.', pattern)
-
-    # Sort by name (and thus by timestamp).
-    file_paths.sort()
-
-    mapping = collections.defaultdict(list)
-    node_name_set = frozenset(node_names)
-
-    for file_path in file_paths:
-      should_stop = self._process_health_pill_event(
-          node_name_set, mapping, step, file_path)
-      if should_stop:
-        break
-
-    return mapping
-
-  def _process_health_pill_event(self, node_name_set, mapping, target_step,
-                                 file_path):
-    """Creates health pills out of data in an event.
-
-    Creates health pills out of the event and adds them to the mapping.
-
-    Args:
-      node_name_set: A set of node names that are relevant.
-      mapping: The mapping from node name to event_accumulator.HealthPillEvents.
-          This object may be destructively modified.
-      target_step: The target step at which to obtain health pills.
-      file_path: The path to the file with health pill events.
-
-    Returns:
-      Whether we should stop reading events because future events are no longer
-      relevant.
-    """
-    events_loader = event_file_loader.EventFileLoader(file_path)
-    for event in events_loader.Load():
-      if not event.HasField('summary'):
-        logging.warning('An event in a debugger events file lacks a summary.')
-        continue
-
-      if event.step < target_step:
-        # This event is not of the relevant step. We perform this check
-        # first because the majority of events will be eliminated from
-        # consideration by this check.
-        continue
-
-      if event.step > target_step:
-        # We have passed the relevant step. No need to read more events.
-        return True
-
-      for value in event.summary.value:
-        # Since we seek health pills for a specific step, this function
-        # returns 1 health pill per node per step. The wall time is the
-        # seconds since the epoch.
-        health_pill = self._process_health_pill_value(
-            node_name_set, event.wall_time, event.step, value)
-        if not health_pill:
-          continue
-        mapping[health_pill.node_name].append(health_pill)
-
-    # Keep reading events.
-    return False
-
-  def _process_health_pill_value(self, node_name_set, wall_time, step, value):
-    """Creates a dict containing various properties of a health pill.
-
-    Args:
-      node_name_set: A set of node names that are relevant.
-      wall_time: The wall time in seconds.
-      step: The session run step of the event.
-      value: The health pill value.
-
-    Returns:
-      An event_accumulator.HealthPillEvent. Or None if one could not be created.
-    """
-    if not value.HasField('tensor'):
-      logging.warning(
-          'An event in a debugger events file lacks a tensor value.')
-      return None
-
-    if value.tag != event_accumulator.HEALTH_PILL_EVENT_TAG:
-      logging.warning(
-          ('A debugger-related event lacks the %r tag. It instead has '
-           'the %r tag.'), event_accumulator.HEALTH_PILL_EVENT_TAG, value.tag)
-      return None
-
-    match = re.match(r'^(.*):(\d+):DebugNumericSummary$', value.node_name)
-    if not match:
-      logging.warning(
-          ('A event with a health pill has an invalid watch, (i.e., an '
-           'unexpected debug op): %r'), value.node_name)
-      return None
-
-    node_name = match.group(1)
-    if node_name not in node_name_set:
-      # This event is not relevant.
-      return None
-
-    # Since we seek health pills for a specific step, this function
-    # returns 1 health pill per node per step. The wall time is the
-    # seconds since the epoch.
-    return event_accumulator.HealthPillEvent(
-        wall_time=wall_time,
-        step=step,
-        node_name=node_name,
-        output_slot=int(match.group(2)),
-        value=list(tensor_util.MakeNdarray(value.tensor)))
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
deleted file mode 100644
index f1cc2e06da..0000000000
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin_test.py
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Tests the Tensorboard debugger data plugin."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import collections
-import json
-import os
-import shutil
-
-import numpy as np
-from werkzeug import test as werkzeug_test
-from werkzeug import wrappers
-
-from tensorflow.core.framework import types_pb2
-from tensorflow.core.util import event_pb2
-from tensorflow.python import pywrap_tensorflow
-from tensorflow.python.platform import test
-from tensorflow.python.util import compat
-from tensorflow.tensorboard.backend import application
-from tensorflow.tensorboard.backend.event_processing import event_multiplexer
-from tensorflow.tensorboard.plugins.debugger import debugger_plugin
-
-
-class DebuggerPluginTest(test.TestCase):
-
-  def setUp(self):
-    # Populate the log directory with debugger event for run '.'.
-    self.log_dir = self.get_temp_dir()
-    file_prefix = compat.as_bytes(os.path.join(self.log_dir, 'events.debugger'))
-    writer = pywrap_tensorflow.EventsWriter(file_prefix)
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='layers/Matmul',
-            output_slot=0,
-            wall_time=42,
-            step=2,
-            list_of_values=[1, 2, 3]))
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='layers/Matmul',
-            output_slot=1,
-            wall_time=43,
-            step=7,
-            list_of_values=[4, 5, 6]))
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='logits/Add',
-            output_slot=0,
-            wall_time=1337,
-            step=7,
-            list_of_values=[7, 8, 9]))
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='logits/Add',
-            output_slot=0,
-            wall_time=1338,
-            step=8,
-            list_of_values=[10, 11, 12]))
-    writer.Close()
-
-    # Populate the log directory with debugger event for run 'run_foo'.
-    run_foo_directory = os.path.join(self.log_dir, 'run_foo')
-    os.mkdir(run_foo_directory)
-    file_prefix = compat.as_bytes(
-        os.path.join(run_foo_directory, 'events.debugger'))
-    writer = pywrap_tensorflow.EventsWriter(file_prefix)
-    writer.WriteEvent(
-        self._CreateEventWithDebugNumericSummary(
-            op_name='layers/Variable',
-            output_slot=0,
-            wall_time=4242,
-            step=42,
-            list_of_values=[13, 14, 15]))
-    writer.Close()
-
-    # Start a server that will receive requests and respond with health pills.
-    self.multiplexer = event_multiplexer.EventMultiplexer({
-        '.': self.log_dir,
-        'run_foo': run_foo_directory,
-    })
-    self.plugin = debugger_plugin.DebuggerPlugin()
-    wsgi_app = application.TensorBoardWSGIApp(
-        self.log_dir, [self.plugin],
-        self.multiplexer,
-        reload_interval=0)
-    self.server = werkzeug_test.Client(wsgi_app, wrappers.BaseResponse)
-
-  def tearDown(self):
-    # Remove the directory with debugger-related events files.
-    shutil.rmtree(self.log_dir, ignore_errors=True)
-
-  def _CreateEventWithDebugNumericSummary(
-      self, op_name, output_slot, wall_time, step, list_of_values):
-    """Creates event with a health pill summary.
-
-    Args:
-      op_name: The name of the op to which a DebugNumericSummary was attached.
-      output_slot: The numeric output slot for the tensor.
-      wall_time: The numeric wall time of the event.
-      step: The step of the event.
-      list_of_values: A python list of values within the tensor.
-
-    Returns:
-      A event_pb2.Event with a health pill summary.
-    """
-    event = event_pb2.Event(step=step, wall_time=wall_time)
-    value = event.summary.value.add(
-        tag='__health_pill__',
-        node_name='%s:%d:DebugNumericSummary' % (op_name, output_slot))
-    value.tensor.tensor_shape.dim.add(size=len(list_of_values))
-    value.tensor.dtype = types_pb2.DT_DOUBLE
-    value.tensor.tensor_content = np.array(
-        list_of_values, dtype=np.float64).tobytes()
-    return event
-
-  def _DeserializeResponse(self, byte_content):
-    """Deserializes byte content that is a JSON encoding.
-
-    Args:
-      byte_content: The byte content of a JSON response.
-
-    Returns:
-      The deserialized python object decoded from JSON.
-    """
-    return json.loads(byte_content.decode('utf-8'))
-
-  def testHealthPillsRouteProvided(self):
-    """Tests that the plugin offers the route for requesting health pills."""
-    apps = self.plugin.get_plugin_apps(self.multiplexer, self.log_dir)
-    self.assertIn('/health_pills', apps)
-    self.assertIsInstance(apps['/health_pills'], collections.Callable)
-
-  def testHealthPillsPluginIsActive(self):
-    self.plugin.get_plugin_apps(self.multiplexer, self.log_dir)
-
-    # The multiplexer has sampled health pills.
-    self.assertTrue(self.plugin.is_active())
-
-  def testHealthPillsPluginIsInactive(self):
-    self.plugin.get_plugin_apps(
-        event_multiplexer.EventMultiplexer({}), self.log_dir)
-
-    # The multiplexer lacks sampled health pills.
-    self.assertFalse(self.plugin.is_active())
-
-  def testRequestHealthPillsForRunFoo(self):
-    """Tests that the plugin produces health pills for a specified run."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['layers/Variable', 'unavailable_node']),
-            'run': 'run_foo',
-        })
-    self.assertEqual(200, response.status_code)
-    self.assertDictEqual({
-        'layers/Variable': [{
-            'wall_time': 4242,
-            'step': 42,
-            'node_name': 'layers/Variable',
-            'output_slot': 0,
-            'value': [13, 14, 15],
-        }],
-    }, self._DeserializeResponse(response.get_data()))
-
-  def testRequestHealthPillsForDefaultRun(self):
-    """Tests that the plugin produces health pills for the default '.' run."""
-    # Do not provide a 'run' parameter in POST data.
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['logits/Add', 'unavailable_node']),
-        })
-    self.assertEqual(200, response.status_code)
-    # The health pills for 'layers/Matmul' should not be included since the
-    # request excluded that node name.
-    self.assertDictEqual({
-        'logits/Add': [
-            {
-                'wall_time': 1337,
-                'step': 7,
-                'node_name': 'logits/Add',
-                'output_slot': 0,
-                'value': [7, 8, 9],
-            },
-            {
-                'wall_time': 1338,
-                'step': 8,
-                'node_name': 'logits/Add',
-                'output_slot': 0,
-                'value': [10, 11, 12],
-            },
-        ],
-    }, self._DeserializeResponse(response.get_data()))
-
-  def testGetRequestsUnsupported(self):
-    """Tests that GET requests are unsupported."""
-    response = self.server.get('/data/plugin/debugger/health_pills')
-    self.assertEqual(405, response.status_code)
-
-  def testRequestsWithoutProperPostKeyUnsupported(self):
-    """Tests that requests lacking the node_names POST key are unsupported."""
-    response = self.server.post('/data/plugin/debugger/health_pills')
-    self.assertEqual(400, response.status_code)
-
-  def testRequestsWithBadJsonUnsupported(self):
-    """Tests that requests with undecodable JSON are unsupported."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': 'some obviously non JSON text',
-        })
-    self.assertEqual(400, response.status_code)
-
-  def testRequestsWithNonListPostDataUnsupported(self):
-    """Tests that requests with loads lacking lists of ops are unsupported."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps({
-                'this is a dict': 'and not a list.'
-            }),
-        })
-    self.assertEqual(400, response.status_code)
-
-  def testFetchHealthPillsForSpecificStep(self):
-    """Tests that requesting health pills at a specific steps works.
-
-    This path may be slow in real life because it reads from disk.
-    """
-    # Request health pills for these nodes at step 7 specifically.
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['logits/Add', 'layers/Matmul']),
-            'step': 7
-        })
-    self.assertEqual(200, response.status_code)
-    # The response should only include health pills at step 7.
-    self.assertDictEqual({
-        'logits/Add': [
-            {
-                'wall_time': 1337,
-                'step': 7,
-                'node_name': 'logits/Add',
-                'output_slot': 0,
-                'value': [7, 8, 9],
-            },
-        ],
-        'layers/Matmul': [
-            {
-                'wall_time': 43,
-                'step': 7,
-                'node_name': 'layers/Matmul',
-                'output_slot': 1,
-                'value': [4, 5, 6],
-            },
-        ],
-    }, self._DeserializeResponse(response.get_data()))
-
-  def testNoHealthPillsForSpecificStep(self):
-    """Tests that an empty mapping is returned for no health pills at a step."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['some/clearly/non-existent/op']),
-            'step': 7
-        })
-    self.assertEqual(200, response.status_code)
-    self.assertDictEqual({}, self._DeserializeResponse(response.get_data()))
-
-  def testNoHealthPillsForOutOfRangeStep(self):
-    """Tests that an empty mapping is returned for an out of range step."""
-    response = self.server.post(
-        '/data/plugin/debugger/health_pills',
-        data={
-            'node_names': json.dumps(['logits/Add', 'layers/Matmul']),
-            # This step higher than that of any event written to disk.
-            'step': 42424242
-        })
-    self.assertEqual(200, response.status_code)
-    self.assertDictEqual({}, self._DeserializeResponse(response.get_data()))
-
-if __name__ == '__main__':
-  test.main()
diff --git a/tensorflow/tensorboard/tensorboard.py b/tensorflow/tensorboard/tensorboard.py
index f3900d1e5d..f371a01f35 100644
--- a/tensorflow/tensorboard/tensorboard.py
+++ b/tensorflow/tensorboard/tensorboard.py
@@ -32,7 +32,8 @@ from tensorflow.python.platform import flags
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.tensorboard.backend import application
 from tensorflow.tensorboard.backend.event_processing import event_file_inspector as efi
-
+from tensorflow.tensorboard.plugins.projector import projector_plugin
+from tensorflow.tensorboard.plugins.text import text_plugin
 
 # TensorBoard flags
 
@@ -88,8 +89,18 @@ flags.DEFINE_string(
 FLAGS = flags.FLAGS
 
 
-def create_tb_app():
-  """Read the flags, and create a TensorBoard WSGI application."""
+def create_tb_app(plugins):
+  """Read the flags, and create a TensorBoard WSGI application.
+
+  Args:
+    plugins: A list of plugins for TensorBoard to initialize.
+
+  Raises:
+    ValueError: if a logdir is not specified.
+
+  Returns:
+    A new TensorBoard WSGI application.
+  """
   if not FLAGS.logdir:
     raise ValueError('A logdir must be specified. Run `tensorboard --help` for '
                      'details and examples.')
@@ -98,7 +109,8 @@ def create_tb_app():
   return application.standard_tensorboard_wsgi(
       logdir=logdir,
       purge_orphaned_data=FLAGS.purge_orphaned_data,
-      reload_interval=FLAGS.reload_interval)
+      reload_interval=FLAGS.reload_interval,
+      plugins=plugins)
 
 
 def make_simple_server(tb_app, host, port):
@@ -184,7 +196,11 @@ def main(unused_argv=None):
     efi.inspect(FLAGS.logdir, event_file, FLAGS.tag)
     return 0
   else:
-    tb = create_tb_app()
+    plugins = [
+        projector_plugin.ProjectorPlugin(),
+        text_plugin.TextPlugin(),
+    ]
+    tb = create_tb_app(plugins)
     run_simple_server(tb)
 
 if __name__ == '__main__':
diff --git a/tensorflow/tools/api/golden/BUILD b/tensorflow/tools/api/golden/BUILD
new file mode 100644
index 0000000000..08436396a6
--- /dev/null
+++ b/tensorflow/tools/api/golden/BUILD
@@ -0,0 +1,24 @@
+# TensorFlow API backwards compatibility test goldens.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "api_golden",
+    srcs = glob(["*.pbtxt"]),
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
new file mode 100644
index 0000000000..f79029d3fe
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-aggregation-method.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.AggregationMethod"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.gradients_impl.AggregationMethod\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "ADD_N"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "EXPERIMENTAL_ACCUMULATE_N"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "EXPERIMENTAL_TREE"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
new file mode 100644
index 0000000000..0fb1aaba28
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.AttrValue.ListValue"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.ListValue\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
new file mode 100644
index 0000000000..e7a3a1f02f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
@@ -0,0 +1,120 @@
+path: "tensorflow.AttrValue"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrValue\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ListValue"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "PLACEHOLDER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt
new file mode 100644
index 0000000000..c8f3e8fb15
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-auto-parallel-options.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.AutoParallelOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.rewriter_config_pb2.AutoParallelOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENABLE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NUM_REPLICAS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
new file mode 100644
index 0000000000..c9a32c16b3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator-base.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.ConditionalAccumulatorBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'accumulator_ref\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
new file mode 100644
index 0000000000..d23b3bd0ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-conditional-accumulator.pbtxt
@@ -0,0 +1,38 @@
+path: "tensorflow.ConditionalAccumulator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulator\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'conditional_accumulator\'], "
+  }
+  member_method {
+    name: "apply_grad"
+    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
new file mode 100644
index 0000000000..29bb3be35c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.ConfigProto.DeviceCountEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.DeviceCountEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
new file mode 100644
index 0000000000..805a9bdd4f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
@@ -0,0 +1,132 @@
+path: "tensorflow.ConfigProto"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.ConfigProto\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ALLOW_SOFT_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DEVICE_COUNT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEVICE_FILTERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DeviceCountEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "GPU_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTER_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTRA_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_DEVICE_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPERATION_TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PLACEMENT_PERIOD_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "RPC_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_INTER_OP_THREAD_POOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "USE_PER_SESSION_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
new file mode 100644
index 0000000000..0b5b88bba8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-d-type.pbtxt
@@ -0,0 +1,77 @@
+path: "tensorflow.DType"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "as_datatype_enum"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "as_numpy_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "base_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_bool"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_complex"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_floating"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_integer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_numpy_compatible"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_quantized"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_unsigned"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "limits"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "max"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "min"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "real_dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "size"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'type_enum\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
new file mode 100644
index 0000000000..92e535c341
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-device-spec.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.DeviceSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.device.DeviceSpec\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "job"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "replica"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'job\', \'replica\', \'task\', \'device_type\', \'device_index\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "from_string"
+    argspec: "args=[\'spec\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_from"
+    argspec: "args=[\'self\', \'dev\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "parse_from_string"
+    argspec: "args=[\'self\', \'spec\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_string"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt b/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
new file mode 100644
index 0000000000..a9ab27719b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-dimension.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.Dimension"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.tensor_shape.Dimension\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "value"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
new file mode 100644
index 0000000000..9bf8c12428
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.Event"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
new file mode 100644
index 0000000000..72cc532447
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-f-i-f-o-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.FIFOQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.FIFOQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'fifo_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
new file mode 100644
index 0000000000..6933814a7b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-len-feature.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.FixedLenFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "default_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
new file mode 100644
index 0000000000..c538787951
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-len-sequence-feature.pbtxt
@@ -0,0 +1,31 @@
+path: "tensorflow.FixedLenSequenceFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.FixedLenSequenceFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "allow_missing"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "default_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
new file mode 100644
index 0000000000..e7e36e2bb3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.FixedLengthRecordReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.FixedLengthRecordReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'record_bytes\', \'header_bytes\', \'footer_bytes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
new file mode 100644
index 0000000000..48cda623f7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
@@ -0,0 +1,104 @@
+path: "tensorflow.GPUOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GPUOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ALLOCATOR_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ALLOW_GROWTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFERRED_DELETION_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "POLLING_ACTIVE_DELAY_USECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "POLLING_INACTIVE_DELAY_MSECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VISIBLE_DEVICE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
new file mode 100644
index 0000000000..1495e847cb
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.GraphDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.graph_pb2.GraphDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LIBRARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
new file mode 100644
index 0000000000..ef2cfe3787
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-keys.pbtxt
@@ -0,0 +1,136 @@
+path: "tensorflow.GraphKeys"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.GraphKeys\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "ACTIVATIONS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ASSET_FILEPATHS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "BIASES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CONCATENATED_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "COND_CONTEXT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "EVAL_STEP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GLOBAL_STEP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GLOBAL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_RESOURCES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOCAL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LOSSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MODEL_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MOVING_AVERAGE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "QUEUE_RUNNERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "READY_FOR_LOCAL_INIT_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "READY_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGULARIZATION_LOSSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "RESOURCES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVEABLE_OBJECTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUMMARIES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUMMARY_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TABLE_INITIALIZERS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINABLE_RESOURCE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINABLE_VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAIN_OP"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "UPDATE_OPS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VARIABLES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "WEIGHTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "WHILE_CONTEXT"
+    mtype: "<type \'str\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
new file mode 100644
index 0000000000..0844f891ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.GraphOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GraphOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BUILD_COST_MODEL_AFTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BUILD_COST_MODEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENABLE_BFLOAT16_SENDRECV_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ENABLE_RECV_SCHEDULING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "INFER_SHAPES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZER_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PLACE_PRUNED_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "REWRITE_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TIMELINE_STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
new file mode 100644
index 0000000000..566456a255
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
@@ -0,0 +1,129 @@
+path: "tensorflow.Graph"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Graph\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "building_function"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "finalized"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def_versions"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "seed"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "version"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_to_collection"
+    argspec: "args=[\'self\', \'name\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_to_collections"
+    argspec: "args=[\'self\', \'names\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_graph_def"
+    argspec: "args=[\'self\', \'from_version\', \'add_shapes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "as_graph_element"
+    argspec: "args=[\'self\', \'obj\', \'allow_tensor\', \'allow_operation\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
+  }
+  member_method {
+    name: "clear_collection"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "colocate_with"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "container"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "control_dependencies"
+    argspec: "args=[\'self\', \'control_inputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "create_op"
+    argspec: "args=[\'self\', \'op_type\', \'inputs\', \'dtypes\', \'input_types\', \'name\', \'attrs\', \'op_def\', \'compute_shapes\', \'compute_device\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "device"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "finalize"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_all_collection_keys"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'self\', \'name\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection_ref"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_operation_by_name"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_operations"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_tensor_by_name"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gradient_override_map"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "is_feedable"
+    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_fetchable"
+    argspec: "args=[\'self\', \'tensor_or_op\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "name_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "prevent_feeding"
+    argspec: "args=[\'self\', \'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "prevent_fetching"
+    argspec: "args=[\'self\', \'op\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "unique_name"
+    argspec: "args=[\'self\', \'name\', \'mark_as_used\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
new file mode 100644
index 0000000000..2567d2fe60
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
@@ -0,0 +1,104 @@
+path: "tensorflow.HistogramProto"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.HistogramProto\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BUCKET_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BUCKET_LIMIT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MAX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MIN_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUM_SQUARES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
new file mode 100644
index 0000000000..2eda320d63
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-identity-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.IdentityReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.IdentityReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt b/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
new file mode 100644
index 0000000000..fee84d8530
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-indexed-slices.pbtxt
@@ -0,0 +1,42 @@
+path: "tensorflow.IndexedSlices"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.IndexedSlices\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'values\', \'indices\', \'dense_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
new file mode 100644
index 0000000000..623f4b1a27
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
@@ -0,0 +1,43 @@
+path: "tensorflow.InteractiveSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.client.session.InteractiveSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "sess_str"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "partial_run"
+    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "partial_run_setup"
+    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
new file mode 100644
index 0000000000..a43c5eb7e3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.LogMessage"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.LogMessage\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEBUGGING"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ERROR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FATAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INFO"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Level"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNKNOWN"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WARN"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
new file mode 100644
index 0000000000..2750bd780c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.NameAttrList.AttrEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
new file mode 100644
index 0000000000..d10faf67d0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.NameAttrList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.NameAttrList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AttrEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
new file mode 100644
index 0000000000..b1b62d60f1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.NodeDef.AttrEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.AttrEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
new file mode 100644
index 0000000000..b812b4df2b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
@@ -0,0 +1,100 @@
+path: "tensorflow.NodeDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.node_def_pb2.NodeDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AttrEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DEVICE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "INPUT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
new file mode 100644
index 0000000000..7e59615534
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-op-error.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.OpError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
new file mode 100644
index 0000000000..0f43a49ee9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
@@ -0,0 +1,65 @@
+path: "tensorflow.Operation"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Operation\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "control_inputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "inputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "outputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "traceback"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "type"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'g\', \'inputs\', \'output_types\', \'control_inputs\', \'input_types\', \'original_op\', \'op_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "colocation_groups"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_attr"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "values"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
new file mode 100644
index 0000000000..5dd1ee47c9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
@@ -0,0 +1,128 @@
+path: "tensorflow.OptimizerOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.OptimizerOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DO_COMMON_SUBEXPRESSION_ELIMINATION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_CONSTANT_FOLDING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_FUNCTION_INLINING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "GLOBAL_JIT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GlobalJitLevel"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "L0"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "L1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Level"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "OFF"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ON_1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ON_2"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
new file mode 100644
index 0000000000..1bfe723ce7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-padding-f-i-f-o-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.PaddingFIFOQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PaddingFIFOQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'dtypes\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'padding_fifo_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
new file mode 100644
index 0000000000..dbe25f3a5b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-priority-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.PriorityQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.PriorityQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'types\', \'shapes\', \'names\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'priority_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
new file mode 100644
index 0000000000..9263d73a51
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-queue-base.pbtxt
@@ -0,0 +1,61 @@
+path: "tensorflow.QueueBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtypes\', \'shapes\', \'names\', \'queue_ref\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt b/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
new file mode 100644
index 0000000000..ec783ffe5a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-random-shuffle-queue.pbtxt
@@ -0,0 +1,62 @@
+path: "tensorflow.RandomShuffleQueue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.RandomShuffleQueue\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.QueueBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtypes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "names"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shapes"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'capacity\', \'min_after_dequeue\', \'dtypes\', \'shapes\', \'names\', \'seed\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'random_shuffle_queue\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'cancel_pending_enqueues\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "dequeue"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_many"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequeue_up_to"
+    argspec: "args=[\'self\', \'n\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "enqueue_many"
+    argspec: "args=[\'self\', \'vals\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_list"
+    argspec: "args=[\'index\', \'queues\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt b/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
new file mode 100644
index 0000000000..f6a3ce76a1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-reader-base.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.ReaderBase"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'reader_ref\', \'supports_serialize\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt b/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
new file mode 100644
index 0000000000..4d6e4137d1
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-register-gradient.pbtxt
@@ -0,0 +1,9 @@
+path: "tensorflow.RegisterGradient"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.RegisterGradient\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
new file mode 100644
index 0000000000..34d2e17612
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-rewriter-config.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.RewriterConfig"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.rewriter_config_pb2.RewriterConfig\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUTO_PARALLEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CONSTANT_FOLDING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DISABLE_MODEL_PRUNING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MANUAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MEMORY_OPTIMIZATION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MemOptType"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "NO_MEM_OPT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OPTIMIZE_TENSOR_LAYOUT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
new file mode 100644
index 0000000000..808fa0fa21
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.RunMetadata"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunMetadata\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COST_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_STATS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
new file mode 100644
index 0000000000..5ad6804a78
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
@@ -0,0 +1,116 @@
+path: "tensorflow.RunOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunOptions\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DEBUG_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FULL_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "HARDWARE_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INTER_OP_THREAD_POOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NO_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OUTPUT_PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SOFTWARE_TRACE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TRACE_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TraceLevel"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
new file mode 100644
index 0000000000..ec66d7f335
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.SessionLog"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CHECKPOINT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "START"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_UNSPECIFIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STOP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SessionStatus"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
new file mode 100644
index 0000000000..f5c597548f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.Session"
+tf_class {
+  is_instance: "<class \'tensorflow.python.client.session.Session\'>"
+  is_instance: "<class \'tensorflow.python.client.session.BaseSession\'>"
+  is_instance: "<class \'tensorflow.python.client.session.SessionInterface\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "sess_str"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'target\', \'graph\', \'config\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_default"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "partial_run"
+    argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "partial_run_setup"
+    argspec: "args=[\'self\', \'fetches\', \'feeds\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'target\', \'containers\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
new file mode 100644
index 0000000000..2260279ad2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-conditional-accumulator.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.SparseConditionalAccumulator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.SparseConditionalAccumulator\'>"
+  is_instance: "<class \'tensorflow.python.ops.data_flow_ops.ConditionalAccumulatorBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "accumulator_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'shape\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'sparse_conditional_accumulator\'], "
+  }
+  member_method {
+    name: "apply_grad"
+    argspec: "args=[\'self\', \'grad_indices\', \'grad_values\', \'grad_shape\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
+  }
+  member_method {
+    name: "apply_indexed_slices_grad"
+    argspec: "args=[\'self\', \'grad\', \'local_step\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\'], "
+  }
+  member_method {
+    name: "num_accumulated"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_global_step"
+    argspec: "args=[\'self\', \'new_global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "take_indexed_slices_grad"
+    argspec: "args=[\'self\', \'num_required\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
new file mode 100644
index 0000000000..d875394fb5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-feature.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.SparseFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.SparseFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "already_sorted"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "index_key"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "size"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "value_key"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
new file mode 100644
index 0000000000..d33fd4d5d7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor-value.pbtxt
@@ -0,0 +1,26 @@
+path: "tensorflow.SparseTensorValue"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensorValue\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
new file mode 100644
index 0000000000..eac236d498
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-sparse-tensor.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.SparseTensor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.sparse_tensor.SparseTensor\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dense_shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "indices"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'indices\', \'values\', \'dense_shape\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "from_value"
+    argspec: "args=[\'cls\', \'sparse_tensor_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
new file mode 100644
index 0000000000..781010d75e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.Summary.Audio"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
new file mode 100644
index 0000000000..feb9c7ee92
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.Summary.Image"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
new file mode 100644
index 0000000000..d02fb9ecd4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.Summary.Value"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
new file mode 100644
index 0000000000..38de17fa9e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.Summary"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "Audio"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "Image"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
new file mode 100644
index 0000000000..cdf7937391
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-t-f-record-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.TFRecordReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.TFRecordReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'options\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
new file mode 100644
index 0000000000..a0fad4df52
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-array.pbtxt
@@ -0,0 +1,69 @@
+path: "tensorflow.TensorArray"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.tensor_array_ops.TensorArray\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "flow"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "handle"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\', \'size\', \'dynamic_size\', \'clear_after_read\', \'tensor_array_name\', \'handle\', \'flow\', \'infer_shape\', \'element_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "concat"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "gather"
+    argspec: "args=[\'self\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "grad"
+    argspec: "args=[\'self\', \'source\', \'flow\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "identity"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'index\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scatter"
+    argspec: "args=[\'self\', \'indices\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "split"
+    argspec: "args=[\'self\', \'value\', \'lengths\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "stack"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unstack"
+    argspec: "args=[\'self\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'index\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
new file mode 100644
index 0000000000..87632fb7b9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.TensorInfo"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.TensorInfo\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "DTYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
new file mode 100644
index 0000000000..d5b9cb8f5e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-shape.pbtxt
@@ -0,0 +1,73 @@
+path: "tensorflow.TensorShape"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.tensor_shape.TensorShape\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "dims"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ndims"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dims\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_list"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_proto"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_has_rank"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_is_fully_defined"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_same_rank"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "concatenate"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_compatible_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_fully_defined"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "merge_with"
+    argspec: "args=[\'self\', \'other\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_elements"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank_at_least"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "with_rank_at_most"
+    argspec: "args=[\'self\', \'rank\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
new file mode 100644
index 0000000000..38d19bb537
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.Tensor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.ops.Tensor\'>"
+  is_instance: "<class \'tensorflow.python.framework.ops._TensorLike\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "OVERLOADABLE_OPERATORS"
+    mtype: "<type \'set\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "value_index"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'op\', \'value_index\', \'dtype\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "consumers"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'feed_dict\', \'session\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_shape"
+    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
new file mode 100644
index 0000000000..e9779f0762
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-text-line-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.TextLineReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.TextLineReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'skip_header_lines\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
new file mode 100644
index 0000000000..54b66f43f8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-var-len-feature.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.VarLenFeature"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
+  is_instance: "<class \'tensorflow.python.ops.parsing_ops.VarLenFeature\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
new file mode 100644
index 0000000000..c9b2dfd677
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable-scope.pbtxt
@@ -0,0 +1,97 @@
+path: "tensorflow.VariableScope"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variable_scope.VariableScope\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "caching_device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "custom_getter"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initializer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "original_name_scope"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "partitioner"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "regularizer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "reuse"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "use_resource"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'reuse\', \'name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'name_scope\', \'dtype\', \'use_resource\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'None\', \'None\', \'None\', \'None\', \'\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_variable"
+    argspec: "args=[\'self\', \'var_store\', \'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'reuse\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "global_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reuse_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_caching_device"
+    argspec: "args=[\'self\', \'caching_device\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_custom_getter"
+    argspec: "args=[\'self\', \'custom_getter\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_dtype"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_initializer"
+    argspec: "args=[\'self\', \'initializer\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_partitioner"
+    argspec: "args=[\'self\', \'partitioner\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_regularizer"
+    argspec: "args=[\'self\', \'regularizer\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_use_resource"
+    argspec: "args=[\'self\', \'use_resource\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "trainable_variables"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
new file mode 100644
index 0000000000..ac3ccd468b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable.-save-slice-info.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.Variable.SaveSliceInfo"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variables.SaveSliceInfo\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "spec"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'full_name\', \'full_shape\', \'var_offset\', \'var_shape\', \'save_slice_info_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt b/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
new file mode 100644
index 0000000000..d67a2713f7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-variable.pbtxt
@@ -0,0 +1,101 @@
+path: "tensorflow.Variable"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.variables.Variable\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "SaveSliceInfo"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "device"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "dtype"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initial_value"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "initializer"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "shape"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'initial_value\', \'trainable\', \'collections\', \'validate_shape\', \'caching_device\', \'name\', \'variable_def\', \'dtype\', \'expected_shape\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'True\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign"
+    argspec: "args=[\'self\', \'value\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "assign_add"
+    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "assign_sub"
+    argspec: "args=[\'self\', \'delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "count_up_to"
+    argspec: "args=[\'self\', \'limit\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "eval"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'variable_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_shape"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "initialized_value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load"
+    argspec: "args=[\'self\', \'value\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "scatter_sub"
+    argspec: "args=[\'self\', \'sparse_delta\', \'use_locking\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "set_shape"
+    argspec: "args=[\'self\', \'shape\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "value"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
new file mode 100644
index 0000000000..4ac759891c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.-whole-file-reader.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.WholeFileReader"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.io_ops.WholeFileReader\'>"
+  is_instance: "<class \'tensorflow.python.ops.io_ops.ReaderBase\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "reader_ref"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "supports_serialize"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_records_produced"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "num_work_units_completed"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'queue\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_up_to"
+    argspec: "args=[\'self\', \'queue\', \'num_records\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reset"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "restore_state"
+    argspec: "args=[\'self\', \'state\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_state"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.app.pbtxt b/tensorflow/tools/api/golden/tensorflow.app.pbtxt
new file mode 100644
index 0000000000..85044a8987
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.app.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.app"
+tf_module {
+  member {
+    name: "flags"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'main\', \'argv\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.compat.pbtxt b/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
new file mode 100644
index 0000000000..ccc6031400
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.compat.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.compat"
+tf_module {
+  member {
+    name: "bytes_or_text_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "complex_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "integral_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member {
+    name: "real_types"
+    mtype: "<type \'tuple\'>"
+  }
+  member_method {
+    name: "as_bytes"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+  member_method {
+    name: "as_str"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+  member_method {
+    name: "as_str_any"
+    argspec: "args=[\'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_text"
+    argspec: "args=[\'bytes_or_text\', \'encoding\'], varargs=None, keywords=None, defaults=[\'utf-8\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
new file mode 100644
index 0000000000..d34bfe5147
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.constant_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Constant\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\', \'dtype\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'0\', \"<dtype: \'float32\'>\", \'False\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
new file mode 100644
index 0000000000..ea9186b0b9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-aborted-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.AbortedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.AbortedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
new file mode 100644
index 0000000000..4e155081dd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-already-exists-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.AlreadyExistsError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.AlreadyExistsError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
new file mode 100644
index 0000000000..b02a0e023a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-cancelled-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.CancelledError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.CancelledError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
new file mode 100644
index 0000000000..c1fa66342a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-data-loss-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.DataLossError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.DataLossError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
new file mode 100644
index 0000000000..8e03793619
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-deadline-exceeded-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.DeadlineExceededError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.DeadlineExceededError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
new file mode 100644
index 0000000000..384d4b534c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-failed-precondition-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.FailedPreconditionError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.FailedPreconditionError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
new file mode 100644
index 0000000000..ac5c4d7879
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-internal-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.InternalError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.InternalError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
new file mode 100644
index 0000000000..161edd4a7c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-invalid-argument-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.InvalidArgumentError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.InvalidArgumentError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
new file mode 100644
index 0000000000..1e64730ac6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-not-found-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.NotFoundError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.NotFoundError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
new file mode 100644
index 0000000000..b1f14c0457
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-op-error.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.errors.OpError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
new file mode 100644
index 0000000000..6365e47286
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-out-of-range-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.OutOfRangeError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OutOfRangeError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
new file mode 100644
index 0000000000..dc8a66f9ea
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-permission-denied-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.PermissionDeniedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.PermissionDeniedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
new file mode 100644
index 0000000000..85bb384b46
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-resource-exhausted-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.ResourceExhaustedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.ResourceExhaustedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
new file mode 100644
index 0000000000..d57d7ac2f2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unauthenticated-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnauthenticatedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnauthenticatedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
new file mode 100644
index 0000000000..cc33e6ed8d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unavailable-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnavailableError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnavailableError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
new file mode 100644
index 0000000000..b8c2e22dbd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unimplemented-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnimplementedError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnimplementedError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
new file mode 100644
index 0000000000..8ffcfae95b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.-unknown-error.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.errors.UnknownError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.UnknownError\'>"
+  is_instance: "<class \'tensorflow.python.framework.errors_impl.OpError\'>"
+  is_instance: "<type \'exceptions.Exception\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "error_code"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "node_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'node_def\', \'op\', \'message\', \'error_code\'], varargs=None, keywords=None, defaults=[\'2\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.errors.pbtxt b/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
new file mode 100644
index 0000000000..0ad1c19603
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.errors.pbtxt
@@ -0,0 +1,151 @@
+path: "tensorflow.errors"
+tf_module {
+  member {
+    name: "ABORTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ALREADY_EXISTS"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "AbortedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AlreadyExistsError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "CANCELLED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CancelledError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DATA_LOSS"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEADLINE_EXCEEDED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DataLossError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DeadlineExceededError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FAILED_PRECONDITION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FailedPreconditionError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "INTERNAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INVALID_ARGUMENT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "InternalError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "InvalidArgumentError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NOT_FOUND"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NotFoundError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OK"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OUT_OF_RANGE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OpError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OutOfRangeError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "PERMISSION_DENIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PermissionDeniedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RESOURCE_EXHAUSTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ResourceExhaustedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UNAUTHENTICATED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNAVAILABLE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNIMPLEMENTED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UNKNOWN"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "UnauthenticatedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnavailableError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnimplementedError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "UnknownError"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "error_code_from_exception_type"
+    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "exception_type_from_error_code"
+    argspec: "args=[\'error_code\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "raise_exception_on_not_ok_status"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
new file mode 100644
index 0000000000..5dbfe21726
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator-spec.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.estimator.EstimatorSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.EstimatorSpec\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "eval_metric_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "export_outputs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "loss"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "predictions"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "scaffold"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "train_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "training_chief_hooks"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "training_hooks"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
new file mode 100644
index 0000000000..7a769fd546
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-estimator.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.estimator.Estimator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.estimator.Estimator\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "config"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "model_dir"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "params"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'model_fn\', \'model_dir\', \'config\', \'params\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "evaluate"
+    argspec: "args=[\'self\', \'input_fn\', \'steps\', \'hooks\', \'checkpoint_path\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "export_savedmodel"
+    argspec: "args=[\'self\', \'export_dir_base\', \'serving_input_receiver_fn\', \'assets_extra\', \'as_text\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "predict"
+    argspec: "args=[\'self\', \'input_fn\', \'predict_keys\', \'hooks\', \'checkpoint_path\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "train"
+    argspec: "args=[\'self\', \'input_fn\', \'hooks\', \'steps\', \'max_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
new file mode 100644
index 0000000000..6a1c24fa63
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-mode-keys.pbtxt
@@ -0,0 +1,20 @@
+path: "tensorflow.estimator.ModeKeys"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.model_fn.ModeKeys\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "EVAL"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAIN"
+    mtype: "<type \'str\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
new file mode 100644
index 0000000000..8fd991a317
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
@@ -0,0 +1,68 @@
+path: "tensorflow.estimator.RunConfig"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.run_config.RunConfig\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cluster_spec"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "evaluation_master"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_chief"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "keep_checkpoint_every_n_hours"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "keep_checkpoint_max"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "master"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "num_ps_replicas"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "num_worker_replicas"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_checkpoints_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_checkpoints_steps"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_summary_steps"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session_config"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task_id"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "task_type"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "tf_random_seed"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..3cf7af8da9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.ClassificationOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
new file mode 100644
index 0000000000..2df1840c4a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-classification-output.pbtxt
@@ -0,0 +1,22 @@
+path: "tensorflow.estimator.export.ClassificationOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ClassificationOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "classes"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "scores"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scores\', \'classes\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..5d165ccbf9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.ExportOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
new file mode 100644
index 0000000000..fa62e8ced8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-export-output.pbtxt
@@ -0,0 +1,12 @@
+path: "tensorflow.estimator.export.ExportOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..743495ba98
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.PredictOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
new file mode 100644
index 0000000000..e0160b10ce
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-predict-output.pbtxt
@@ -0,0 +1,18 @@
+path: "tensorflow.estimator.export.PredictOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.PredictOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "outputs"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'outputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
new file mode 100644
index 0000000000..dbf4e3dec8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.__metaclass__.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.estimator.export.RegressionOutput.__metaclass__"
+tf_class {
+  is_instance: "<class \'abc.ABCMeta\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "mro"
+  }
+  member_method {
+    name: "register"
+    argspec: "args=[\'cls\', \'subclass\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
new file mode 100644
index 0000000000..905f0e0553
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-regression-output.pbtxt
@@ -0,0 +1,18 @@
+path: "tensorflow.estimator.export.RegressionOutput"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.RegressionOutput\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export_output.ExportOutput\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "value"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_signature_def"
+    argspec: "args=[\'self\', \'receiver_tensors\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
new file mode 100644
index 0000000000..0d9e044308
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.-serving-input-receiver.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.estimator.export.ServingInputReceiver"
+tf_class {
+  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
+  is_instance: "<class \'tensorflow.python.estimator.export.export.ServingInputReceiver\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "features"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "receiver_tensors"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
new file mode 100644
index 0000000000..4d0dddb3bc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.export.pbtxt
@@ -0,0 +1,31 @@
+path: "tensorflow.estimator.export"
+tf_module {
+  member {
+    name: "ClassificationOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "ExportOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "PredictOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "RegressionOutput"
+    mtype: "<class \'abc.ABCMeta\'>"
+  }
+  member {
+    name: "ServingInputReceiver"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "build_parsing_serving_input_receiver_fn"
+    argspec: "args=[\'feature_spec\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "build_raw_serving_input_receiver_fn"
+    argspec: "args=[\'features\', \'default_batch_size\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
new file mode 100644
index 0000000000..b318fea1f8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.inputs.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.estimator.inputs"
+tf_module {
+  member_method {
+    name: "numpy_input_fn"
+    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\'], "
+  }
+  member_method {
+    name: "pandas_input_fn"
+    argspec: "args=[\'x\', \'y\', \'batch_size\', \'num_epochs\', \'shuffle\', \'queue_capacity\', \'num_threads\', \'target_column\'], varargs=None, keywords=None, defaults=[\'None\', \'128\', \'1\', \'None\', \'1000\', \'1\', \'target\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
new file mode 100644
index 0000000000..0d5dc73271
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.estimator"
+tf_module {
+  member {
+    name: "Estimator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "EstimatorSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ModeKeys"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RunConfig"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "export"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "inputs"
+    mtype: "<type \'module\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
new file mode 100644
index 0000000000..41497dc869
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.FastGFile"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.FastGFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
new file mode 100644
index 0000000000..bab0f279b2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.GFile"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
new file mode 100644
index 0000000000..86e577c19a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.gfile.Open"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.gfile.GFile\'>"
+  is_instance: "<class \'tensorflow.python.lib.io.file_io.FileIO\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "mode"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'mode\'], varargs=None, keywords=None, defaults=[\'r\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "next"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "read"
+    argspec: "args=[\'self\', \'n\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "readline"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readlines"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "seek"
+    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tell"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'file_content\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
new file mode 100644
index 0000000000..65b55a8b7c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.pbtxt
@@ -0,0 +1,63 @@
+path: "tensorflow.gfile"
+tf_module {
+  member {
+    name: "FastGFile"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GFile"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Open"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "Copy"
+    argspec: "args=[\'oldpath\', \'newpath\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "DeleteRecursively"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Exists"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Glob"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "IsDirectory"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "ListDirectory"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "MakeDirs"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "MkDir"
+    argspec: "args=[\'dirname\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Remove"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Rename"
+    argspec: "args=[\'oldname\', \'newname\', \'overwrite\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "Stat"
+    argspec: "args=[\'filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Walk"
+    argspec: "args=[\'top\', \'in_order\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt b/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
new file mode 100644
index 0000000000..76a2df757e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.graph_util.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.graph_util"
+tf_module {
+  member_method {
+    name: "convert_variables_to_constants"
+    argspec: "args=[\'sess\', \'input_graph_def\', \'output_node_names\', \'variable_names_whitelist\', \'variable_names_blacklist\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "extract_sub_graph"
+    argspec: "args=[\'graph_def\', \'dest_nodes\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "must_run_on_cpu"
+    argspec: "args=[\'node\', \'pin_variables_on_cpu\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "remove_training_nodes"
+    argspec: "args=[\'input_graph\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "tensor_shape_from_node_def_name"
+    argspec: "args=[\'graph\', \'input_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
new file mode 100644
index 0000000000..dbc360b13e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.image.-resize-method.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.image.ResizeMethod"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.image_ops_impl.ResizeMethod\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "AREA"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BICUBIC"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "BILINEAR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NEAREST_NEIGHBOR"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.image.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
new file mode 100644
index 0000000000..6002f36bac
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
@@ -0,0 +1,175 @@
+path: "tensorflow.image"
+tf_module {
+  member {
+    name: "ResizeMethod"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "adjust_brightness"
+    argspec: "args=[\'image\', \'delta\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "adjust_contrast"
+    argspec: "args=[\'images\', \'contrast_factor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "adjust_gamma"
+    argspec: "args=[\'image\', \'gamma\', \'gain\'], varargs=None, keywords=None, defaults=[\'1\', \'1\'], "
+  }
+  member_method {
+    name: "adjust_hue"
+    argspec: "args=[\'image\', \'delta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "adjust_saturation"
+    argspec: "args=[\'image\', \'saturation_factor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "central_crop"
+    argspec: "args=[\'image\', \'central_fraction\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "convert_image_dtype"
+    argspec: "args=[\'image\', \'dtype\', \'saturate\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "crop_and_resize"
+    argspec: "args=[\'image\', \'boxes\', \'box_ind\', \'crop_size\', \'method\', \'extrapolation_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "crop_to_bounding_box"
+    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "decode_gif"
+    argspec: "args=[\'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_image"
+    argspec: "args=[\'contents\', \'channels\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_jpeg"
+    argspec: "args=[\'contents\', \'channels\', \'ratio\', \'fancy_upscaling\', \'try_recover_truncated\', \'acceptable_fraction\', \'dct_method\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_png"
+    argspec: "args=[\'contents\', \'channels\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "draw_bounding_boxes"
+    argspec: "args=[\'images\', \'boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "encode_jpeg"
+    argspec: "args=[\'image\', \'format\', \'quality\', \'progressive\', \'optimize_size\', \'chroma_downsampling\', \'density_unit\', \'x_density\', \'y_density\', \'xmp_metadata\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "encode_png"
+    argspec: "args=[\'image\', \'compression\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "extract_glimpse"
+    argspec: "args=[\'input\', \'size\', \'offsets\', \'centered\', \'normalized\', \'uniform_noise\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "flip_left_right"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flip_up_down"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "grayscale_to_rgb"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "hsv_to_rgb"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "non_max_suppression"
+    argspec: "args=[\'boxes\', \'scores\', \'max_output_size\', \'iou_threshold\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "pad_to_bounding_box"
+    argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "per_image_standardization"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "random_brightness"
+    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_contrast"
+    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_flip_left_right"
+    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_flip_up_down"
+    argspec: "args=[\'image\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_hue"
+    argspec: "args=[\'image\', \'max_delta\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_saturation"
+    argspec: "args=[\'image\', \'lower\', \'upper\', \'seed\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "resize_area"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_bicubic"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_bilinear"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "resize_image_with_crop_or_pad"
+    argspec: "args=[\'image\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "resize_images"
+    argspec: "args=[\'images\', \'size\', \'method\', \'align_corners\'], varargs=None, keywords=None, defaults=[\'0\', \'False\'], "
+  }
+  member_method {
+    name: "resize_nearest_neighbor"
+    argspec: "args=[\'images\', \'size\', \'align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rgb_to_grayscale"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rgb_to_hsv"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rot90"
+    argspec: "args=[\'image\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\'], "
+  }
+  member_method {
+    name: "sample_distorted_bounding_box"
+    argspec: "args=[\'image_size\', \'bounding_boxes\', \'seed\', \'seed2\', \'min_object_covered\', \'aspect_ratio_range\', \'area_range\', \'max_attempts\', \'use_image_if_no_bounding_boxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "total_variation"
+    argspec: "args=[\'images\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "transpose_image"
+    argspec: "args=[\'image\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
new file mode 100644
index 0000000000..6ca38e259b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
@@ -0,0 +1,59 @@
+path: "tensorflow.layers"
+tf_module {
+  member_method {
+    name: "average_pooling1d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "average_pooling2d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "average_pooling3d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "batch_normalization"
+    argspec: "args=[\'inputs\', \'axis\', \'momentum\', \'epsilon\', \'center\', \'scale\', \'beta_initializer\', \'gamma_initializer\', \'moving_mean_initializer\', \'moving_variance_initializer\', \'beta_regularizer\', \'gamma_regularizer\', \'training\', \'trainable\', \'name\', \'reuse\', \'renorm\', \'renorm_clipping\', \'renorm_momentum\'], varargs=None, keywords=None, defaults=[\'-1\', \'0.99\', \'0.001\', \'True\', \'True\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'<tensorflow.python.ops.init_ops.Ones object instance>\', \'None\', \'None\', \'False\', \'True\', \'None\', \'None\', \'False\', \'None\', \'0.99\'], "
+  }
+  member_method {
+    name: "conv1d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'1\', \'valid\', \'channels_last\', \'1\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_transpose"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1, 1)\', \'valid\', \'channels_last\', \'(1, 1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dense"
+    argspec: "args=[\'inputs\', \'units\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dropout"
+    argspec: "args=[\'inputs\', \'rate\', \'noise_shape\', \'seed\', \'training\', \'name\'], varargs=None, keywords=None, defaults=[\'0.5\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling1d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling2d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "max_pooling3d"
+    argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], "
+  }
+  member_method {
+    name: "separable_conv2d"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'depth_multiplier\', \'activation\', \'use_bias\', \'depthwise_initializer\', \'pointwise_initializer\', \'bias_initializer\', \'depthwise_regularizer\', \'pointwise_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1)\', \'valid\', \'channels_last\', \'(1, 1)\', \'1\', \'None\', \'True\', \'None\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.logging.pbtxt b/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
new file mode 100644
index 0000000000..85bb15455d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.logging.pbtxt
@@ -0,0 +1,83 @@
+path: "tensorflow.logging"
+tf_module {
+  member {
+    name: "DEBUG"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ERROR"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FATAL"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INFO"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WARN"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "TaskLevelStatusMessage"
+    argspec: "args=[\'msg\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "debug"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "error"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "fatal"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_verbosity"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "info"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "log"
+    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "log_every_n"
+    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log_first_n"
+    argspec: "args=[\'level\', \'msg\', \'n\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log_if"
+    argspec: "args=[\'level\', \'msg\', \'condition\'], varargs=args, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_verbosity"
+    argspec: "args=[\'v\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "vlog"
+    argspec: "args=[\'level\', \'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "warn"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "warning"
+    argspec: "args=[\'msg\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
new file mode 100644
index 0000000000..5477ac5817
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
@@ -0,0 +1,63 @@
+path: "tensorflow.losses"
+tf_module {
+  member_method {
+    name: "absolute_difference"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "add_loss"
+    argspec: "args=[\'loss\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'losses\'], "
+  }
+  member_method {
+    name: "compute_weighted_loss"
+    argspec: "args=[\'losses\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "cosine_distance"
+    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "get_losses"
+    argspec: "args=[\'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'losses\'], "
+  }
+  member_method {
+    name: "get_regularization_loss"
+    argspec: "args=[\'scope\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'total_regularization_loss\'], "
+  }
+  member_method {
+    name: "get_regularization_losses"
+    argspec: "args=[\'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_total_loss"
+    argspec: "args=[\'add_regularization_losses\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'total_loss\'], "
+  }
+  member_method {
+    name: "hinge_loss"
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "log_loss"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'epsilon\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1e-07\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "mean_pairwise_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "sigmoid_cross_entropy"
+    argspec: "args=[\'multi_class_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "softmax_cross_entropy"
+    argspec: "args=[\'onehot_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+  }
+  member_method {
+    name: "sparse_softmax_cross_entropy"
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt b/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
new file mode 100644
index 0000000000..262d11c38e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.metrics.pbtxt
@@ -0,0 +1,99 @@
+path: "tensorflow.metrics"
+tf_module {
+  member_method {
+    name: "accuracy"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "auc"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'curve\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'ROC\', \'None\'], "
+  }
+  member_method {
+    name: "false_negatives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "false_positives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean"
+    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_absolute_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_cosine_distance"
+    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_iou"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_per_class_accuracy"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_relative_error"
+    argspec: "args=[\'labels\', \'predictions\', \'normalizer\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "mean_tensor"
+    argspec: "args=[\'values\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "percentage_below"
+    argspec: "args=[\'values\', \'threshold\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "precision"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "precision_at_thresholds"
+    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recall_at_thresholds"
+    argspec: "args=[\'labels\', \'predictions\', \'thresholds\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "root_mean_squared_error"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sensitivity_at_specificity"
+    argspec: "args=[\'labels\', \'predictions\', \'specificity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_average_precision_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_precision_at_k"
+    argspec: "args=[\'labels\', \'predictions\', \'k\', \'class_id\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "specificity_at_sensitivity"
+    argspec: "args=[\'labels\', \'predictions\', \'sensitivity\', \'weights\', \'num_thresholds\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "true_positives"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'metrics_collections\', \'updates_collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
new file mode 100644
index 0000000000..192ceac2dd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
@@ -0,0 +1,323 @@
+path: "tensorflow.nn"
+tf_module {
+  member_method {
+    name: "all_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "atrous_conv2d"
+    argspec: "args=[\'value\', \'filters\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "atrous_conv2d_transpose"
+    argspec: "args=[\'value\', \'filters\', \'output_shape\', \'rate\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "avg_pool"
+    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "avg_pool3d"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "batch_norm_with_global_normalization"
+    argspec: "args=[\'t\', \'m\', \'v\', \'beta\', \'gamma\', \'variance_epsilon\', \'scale_after_normalization\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_normalization"
+    argspec: "args=[\'x\', \'mean\', \'variance\', \'offset\', \'scale\', \'variance_epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "bias_add"
+    argspec: "args=[\'value\', \'bias\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "bidirectional_dynamic_rnn"
+    argspec: "args=[\'cell_fw\', \'cell_bw\', \'inputs\', \'sequence_length\', \'initial_state_fw\', \'initial_state_bw\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "compute_accidental_hits"
+    argspec: "args=[\'true_classes\', \'sampled_candidates\', \'num_true\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv1d"
+    argspec: "args=[\'value\', \'filters\', \'stride\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_backprop_filter"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_backprop_input"
+    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'use_cudnn_on_gpu\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv2d_transpose"
+    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d_backprop_filter_v2"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "conv3d_transpose"
+    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "convolution"
+    argspec: "args=[\'input\', \'filter\', \'padding\', \'strides\', \'dilation_rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "crelu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ctc_beam_search_decoder"
+    argspec: "args=[\'inputs\', \'sequence_length\', \'beam_width\', \'top_paths\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'100\', \'1\', \'True\'], "
+  }
+  member_method {
+    name: "ctc_greedy_decoder"
+    argspec: "args=[\'inputs\', \'sequence_length\', \'merge_repeated\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "ctc_loss"
+    argspec: "args=[\'labels\', \'inputs\', \'sequence_length\', \'preprocess_collapse_repeated\', \'ctc_merge_repeated\', \'time_major\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native_backprop_filter"
+    argspec: "args=[\'input\', \'filter_sizes\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "depthwise_conv2d_native_backprop_input"
+    argspec: "args=[\'input_sizes\', \'filter\', \'out_backprop\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "dilation2d"
+    argspec: "args=[\'input\', \'filter\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dropout"
+    argspec: "args=[\'x\', \'keep_prob\', \'noise_shape\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "dynamic_rnn"
+    argspec: "args=[\'cell\', \'inputs\', \'sequence_length\', \'initial_state\', \'dtype\', \'parallel_iterations\', \'swap_memory\', \'time_major\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "elu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "embedding_lookup"
+    argspec: "args=[\'params\', \'ids\', \'partition_strategy\', \'name\', \'validate_indices\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "embedding_lookup_sparse"
+    argspec: "args=[\'params\', \'sp_ids\', \'sp_weights\', \'partition_strategy\', \'name\', \'combiner\', \'max_norm\'], varargs=None, keywords=None, defaults=[\'mod\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "erosion2d"
+    argspec: "args=[\'value\', \'kernel\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fixed_unigram_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'vocab_file\', \'distortion\', \'num_reserved_ids\', \'num_shards\', \'shard\', \'unigrams\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'\', \'1.0\', \'0\', \'1\', \'0\', \'()\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fractional_avg_pool"
+    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fractional_max_pool"
+    argspec: "args=[\'value\', \'pooling_ratio\', \'pseudo_random\', \'overlapping\', \'deterministic\', \'seed\', \'seed2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fused_batch_norm"
+    argspec: "args=[\'x\', \'scale\', \'offset\', \'mean\', \'variance\', \'epsilon\', \'data_format\', \'is_training\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'0.001\', \'NHWC\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "in_top_k"
+    argspec: "args=[\'predictions\', \'targets\', \'k\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "l2_loss"
+    argspec: "args=[\'t\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "l2_normalize"
+    argspec: "args=[\'x\', \'dim\', \'epsilon\', \'name\'], varargs=None, keywords=None, defaults=[\'1e-12\', \'None\'], "
+  }
+  member_method {
+    name: "learned_unigram_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "local_response_normalization"
+    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "log_poisson_loss"
+    argspec: "args=[\'targets\', \'log_input\', \'compute_full_loss\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "log_softmax"
+    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
+  }
+  member_method {
+    name: "log_uniform_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "lrn"
+    argspec: "args=[\'input\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool"
+    argspec: "args=[\'value\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'NHWC\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool3d"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "max_pool_with_argmax"
+    argspec: "args=[\'input\', \'ksize\', \'strides\', \'padding\', \'Targmax\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "moments"
+    argspec: "args=[\'x\', \'axes\', \'shift\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "nce_loss"
+    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'mod\', \'nce_loss\'], "
+  }
+  member_method {
+    name: "normalize_moments"
+    argspec: "args=[\'counts\', \'mean_ss\', \'variance_ss\', \'shift\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "pool"
+    argspec: "args=[\'input\', \'window_shape\', \'pooling_type\', \'padding\', \'dilation_rate\', \'strides\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_avg_pool"
+    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "quantized_conv2d"
+    argspec: "args=[\'input\', \'filter\', \'min_input\', \'max_input\', \'min_filter\', \'max_filter\', \'strides\', \'padding\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_max_pool"
+    argspec: "args=[\'input\', \'min_input\', \'max_input\', \'ksize\', \'strides\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "quantized_relu_x"
+    argspec: "args=[\'features\', \'max_value\', \'min_features\', \'max_features\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "raw_rnn"
+    argspec: "args=[\'cell\', \'loop_fn\', \'parallel_iterations\', \'swap_memory\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "relu"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "relu6"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "relu_layer"
+    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sampled_softmax_loss"
+    argspec: "args=[\'weights\', \'biases\', \'labels\', \'inputs\', \'num_sampled\', \'num_classes\', \'num_true\', \'sampled_values\', \'remove_accidental_hits\', \'partition_strategy\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'True\', \'mod\', \'sampled_softmax_loss\'], "
+  }
+  member_method {
+    name: "separable_conv2d"
+    argspec: "args=[\'input\', \'depthwise_filter\', \'pointwise_filter\', \'strides\', \'padding\', \'rate\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sigmoid_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "softmax"
+    argspec: "args=[\'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'-1\', \'None\'], "
+  }
+  member_method {
+    name: "softmax_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'dim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'-1\', \'None\'], "
+  }
+  member_method {
+    name: "softplus"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "softsign"
+    argspec: "args=[\'features\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_softmax_cross_entropy_with_logits"
+    argspec: "args=[\'_sentinel\', \'labels\', \'logits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sufficient_statistics"
+    argspec: "args=[\'x\', \'axes\', \'shift\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "tanh"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "top_k"
+    argspec: "args=[\'input\', \'k\', \'sorted\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "uniform_candidate_sampler"
+    argspec: "args=[\'true_classes\', \'num_true\', \'num_sampled\', \'unique\', \'range_max\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "weighted_cross_entropy_with_logits"
+    argspec: "args=[\'targets\', \'logits\', \'pos_weight\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "weighted_moments"
+    argspec: "args=[\'x\', \'axes\', \'frequency_weights\', \'name\', \'keep_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "with_space_to_batch"
+    argspec: "args=[\'input\', \'dilation_rate\', \'padding\', \'op\', \'filter_shape\', \'spatial_dims\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "xw_plus_b"
+    argspec: "args=[\'x\', \'weights\', \'biases\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "zero_fraction"
+    argspec: "args=[\'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
new file mode 100644
index 0000000000..d84ddc6eb0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.ones_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Ones\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
new file mode 100644
index 0000000000..c8e266e70c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.orthogonal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Orthogonal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'gain\', \'dtype\', \'seed\'], varargs=None, keywords=None, defaults=[\'1.0\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
new file mode 100644
index 0000000000..7a1a7e7949
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -0,0 +1,1947 @@
+path: "tensorflow"
+tf_module {
+  member {
+    name: "AggregationMethod"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AttrValue"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "AutoParallelOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "COMPILER_VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ConditionalAccumulator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ConditionalAccumulatorBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ConfigProto"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DType"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "DeviceSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Dimension"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Event"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FIFOQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLenFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLenSequenceFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FixedLengthRecordReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GIT_VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "GPUOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION_MIN_CONSUMER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_VERSION_MIN_PRODUCER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Graph"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GraphDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "GraphKeys"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GraphOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "HistogramProto"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "IdentityReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "IndexedSlices"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "InteractiveSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "LogMessage"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "NameAttrList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "NodeDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "OpError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Operation"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "OptimizerOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "PaddingFIFOQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "PriorityQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "QUANTIZED_DTYPES"
+    mtype: "<type \'frozenset\'>"
+  }
+  member {
+    name: "QueueBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RandomShuffleQueue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ReaderBase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RegisterGradient"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RewriterConfig"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "RunMetadata"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "RunOptions"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Session"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionLog"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SparseConditionalAccumulator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseTensor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SparseTensorValue"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Summary"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TFRecordReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Tensor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TensorArray"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TensorInfo"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TensorShape"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TextLineReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "VERSION"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VarLenFeature"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Variable"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "VariableScope"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "WholeFileReader"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "app"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "bfloat16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "bool"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "compat"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "complex128"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "complex64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "constant_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "contrib"
+    mtype: "<class \'_LazyContribLoader\'>"
+  }
+  member {
+    name: "double"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "errors"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "estimator"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "flags"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "float16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "float32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "float64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "gfile"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "graph_util"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "half"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "image"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "int16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int64"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "int8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "layers"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "logging"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "losses"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "metrics"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "newaxis"
+    mtype: "<type \'NoneType\'>"
+  }
+  member {
+    name: "nn"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "ones_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "orthogonal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "python_io"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "pywrap_tensorflow"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "qint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "qint32"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "qint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "quint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "quint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "random_normal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "random_uniform_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "resource"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "resource_loader"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "saved_model"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sdca"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sets"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "spectral"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "string"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "summary"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "sysconfig"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "test"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "train"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "truncated_normal_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "uint16"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "uint8"
+    mtype: "<class \'tensorflow.python.framework.dtypes.DType\'>"
+  }
+  member {
+    name: "uniform_unit_scaling_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "user_ops"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "zeros_initializer"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "Assert"
+    argspec: "args=[\'condition\', \'data\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "NoGradient"
+    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "NotDifferentiable"
+    argspec: "args=[\'op_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Print"
+    argspec: "args=[\'input_\', \'data\', \'message\', \'first_n\', \'summarize\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "abs"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "accumulate_n"
+    argspec: "args=[\'inputs\', \'shape\', \'tensor_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "acos"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_check_numerics_ops"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_n"
+    argspec: "args=[\'inputs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_to_collection"
+    argspec: "args=[\'name\', \'value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "all_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "arg_max"
+    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "arg_min"
+    argspec: "args=[\'input\', \'dimension\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "argmax"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "argmin"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dimension\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "as_dtype"
+    argspec: "args=[\'type_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_string"
+    argspec: "args=[\'input\', \'precision\', \'scientific\', \'shortest\', \'width\', \'fill\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "asin"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assert_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_greater"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_greater_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_integer"
+    argspec: "args=[\'x\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_less"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_less_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_negative"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_non_negative"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_non_positive"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_none_equal"
+    argspec: "args=[\'x\', \'y\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_positive"
+    argspec: "args=[\'x\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_proper_iterable"
+    argspec: "args=[\'values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "assert_rank"
+    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_rank_at_least"
+    argspec: "args=[\'x\', \'rank\', \'data\', \'summarize\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_same_float_dtype"
+    argspec: "args=[\'tensors\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_scalar"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assert_type"
+    argspec: "args=[\'tensor\', \'tf_type\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assert_variables_initialized"
+    argspec: "args=[\'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "assign"
+    argspec: "args=[\'ref\', \'value\', \'validate_shape\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign_add"
+    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "assign_sub"
+    argspec: "args=[\'ref\', \'value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "atan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_to_space"
+    argspec: "args=[\'input\', \'crops\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "batch_to_space_nd"
+    argspec: "args=[\'input\', \'block_shape\', \'crops\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "betainc"
+    argspec: "args=[\'a\', \'b\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "bincount"
+    argspec: "args=[\'arr\', \'minlength\', \'maxlength\', \'weights\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "bitcast"
+    argspec: "args=[\'input\', \'type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "boolean_mask"
+    argspec: "args=[\'tensor\', \'mask\', \'name\'], varargs=None, keywords=None, defaults=[\'boolean_mask\'], "
+  }
+  member_method {
+    name: "broadcast_dynamic_shape"
+    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "broadcast_static_shape"
+    argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "case"
+    argspec: "args=[\'pred_fn_pairs\', \'default\', \'exclusive\', \'strict\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'case\'], "
+  }
+  member_method {
+    name: "cast"
+    argspec: "args=[\'x\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ceil"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "check_numerics"
+    argspec: "args=[\'tensor\', \'message\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cholesky"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cholesky_solve"
+    argspec: "args=[\'chol\', \'rhs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clip_by_average_norm"
+    argspec: "args=[\'t\', \'clip_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clip_by_global_norm"
+    argspec: "args=[\'t_list\', \'clip_norm\', \'use_norm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "clip_by_norm"
+    argspec: "args=[\'t\', \'clip_norm\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "clip_by_value"
+    argspec: "args=[\'t\', \'clip_value_min\', \'clip_value_max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "complex"
+    argspec: "args=[\'real\', \'imag\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "concat"
+    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'concat\'], "
+  }
+  member_method {
+    name: "cond"
+    argspec: "args=[\'pred\', \'fn1\', \'fn2\', \'strict\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "confusion_matrix"
+    argspec: "args=[\'labels\', \'predictions\', \'num_classes\', \'dtype\', \'name\', \'weights\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "conj"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "constant"
+    argspec: "args=[\'value\', \'dtype\', \'shape\', \'name\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'Const\', \'False\'], "
+  }
+  member_method {
+    name: "container"
+    argspec: "args=[\'container_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "control_dependencies"
+    argspec: "args=[\'control_inputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "convert_to_tensor"
+    argspec: "args=[\'value\', \'dtype\', \'name\', \'preferred_dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "convert_to_tensor_or_indexed_slices"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "convert_to_tensor_or_sparse_tensor"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "cos"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "count_nonzero"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'dtype\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \"<dtype: \'int64\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "count_up_to"
+    argspec: "args=[\'ref\', \'limit\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "create_partitioned_variables"
+    argspec: "args=[\'shape\', \'slicing\', \'initializer\', \'dtype\', \'trainable\', \'collections\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'True\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "cross"
+    argspec: "args=[\'a\', \'b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "cumprod"
+    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "cumsum"
+    argspec: "args=[\'x\', \'axis\', \'exclusive\', \'reverse\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "decode_base64"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_csv"
+    argspec: "args=[\'records\', \'record_defaults\', \'field_delim\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "decode_json_example"
+    argspec: "args=[\'json_examples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "decode_raw"
+    argspec: "args=[\'bytes\', \'out_type\', \'little_endian\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "delete_session_tensor"
+    argspec: "args=[\'handle\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "depth_to_space"
+    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dequantize"
+    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "deserialize_many_sparse"
+    argspec: "args=[\'serialized_sparse\', \'dtype\', \'rank\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "device"
+    argspec: "args=[\'device_name_or_function\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "diag"
+    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "diag_part"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "digamma"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "div"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "divide"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dynamic_partition"
+    argspec: "args=[\'data\', \'partitions\', \'num_partitions\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "dynamic_stitch"
+    argspec: "args=[\'indices\', \'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "edit_distance"
+    argspec: "args=[\'hypothesis\', \'truth\', \'normalize\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'edit_distance\'], "
+  }
+  member_method {
+    name: "einsum"
+    argspec: "args=[\'equation\'], varargs=inputs, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "encode_base64"
+    argspec: "args=[\'input\', \'pad\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "erf"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "erfc"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "exp"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "expand_dims"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "expm1"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "extract_image_patches"
+    argspec: "args=[\'images\', \'ksizes\', \'strides\', \'rates\', \'padding\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "eye"
+    argspec: "args=[\'num_rows\', \'num_columns\', \'batch_shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_args"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_args_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_per_channel"
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fake_quant_with_min_max_vars_per_channel_gradient"
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fill"
+    argspec: "args=[\'dims\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fixed_size_partitioner"
+    argspec: "args=[\'num_shards\', \'axis\'], varargs=None, keywords=None, defaults=[\'0\'], "
+  }
+  member_method {
+    name: "floor"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floor_div"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floordiv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "floormod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "foldl"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "foldr"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "gather"
+    argspec: "args=[\'params\', \'indices\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "gather_nd"
+    argspec: "args=[\'params\', \'indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection"
+    argspec: "args=[\'key\', \'scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_collection_ref"
+    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_default_graph"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_default_session"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_local_variable"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_seed"
+    argspec: "args=[\'op_seed\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_session_handle"
+    argspec: "args=[\'data\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_session_tensor"
+    argspec: "args=[\'handle\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_variable"
+    argspec: "args=[\'name\', \'shape\', \'dtype\', \'initializer\', \'regularizer\', \'trainable\', \'collections\', \'caching_device\', \'partitioner\', \'validate_shape\', \'use_resource\', \'custom_getter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_variable_scope"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "global_norm"
+    argspec: "args=[\'t_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "global_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "global_variables_initializer"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gradients"
+    argspec: "args=[\'ys\', \'xs\', \'grad_ys\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'None\', \'gradients\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "greater"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "greater_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "group"
+    argspec: "args=[], varargs=inputs, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "hessians"
+    argspec: "args=[\'ys\', \'xs\', \'name\', \'colocate_gradients_with_ops\', \'gate_gradients\', \'aggregation_method\'], varargs=None, keywords=None, defaults=[\'hessians\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "histogram_fixed_width"
+    argspec: "args=[\'values\', \'value_range\', \'nbins\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'100\', \"<dtype: \'int32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "identity"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "igamma"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "igammac"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "imag"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "import_graph_def"
+    argspec: "args=[\'graph_def\', \'input_map\', \'return_elements\', \'name\', \'op_dict\', \'producer_op_list\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "initialize_all_tables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_all_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_local_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "initialize_variables"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "invert_permutation"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_finite"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_inf"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_nan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_non_decreasing"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_numeric_tensor"
+    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_strictly_increasing"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "is_variable_initialized"
+    argspec: "args=[\'variable\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "lbeta"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'lbeta\'], "
+  }
+  member_method {
+    name: "less"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "less_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "lgamma"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "lin_space"
+    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "linspace"
+    argspec: "args=[\'start\', \'stop\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "load_file_system_library"
+    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load_op_library"
+    argspec: "args=[\'library_filename\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "local_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "local_variables_initializer"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "log"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "log1p"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_and"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_not"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_or"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "logical_xor"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'LogicalXor\'], "
+  }
+  member_method {
+    name: "make_template"
+    argspec: "args=[\'name_\', \'func_\', \'create_scope_now_\', \'unique_name_\', \'custom_getter_\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "map_fn"
+    argspec: "args=[\'fn\', \'elems\', \'dtype\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "matching_files"
+    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matmul"
+    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'adjoint_a\', \'adjoint_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'False\', \'False\', \'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_band_part"
+    argspec: "args=[\'input\', \'num_lower\', \'num_upper\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_determinant"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_diag"
+    argspec: "args=[\'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_diag_part"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_inverse"
+    argspec: "args=[\'input\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_set_diag"
+    argspec: "args=[\'input\', \'diagonal\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "matrix_solve"
+    argspec: "args=[\'matrix\', \'rhs\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_solve_ls"
+    argspec: "args=[\'matrix\', \'rhs\', \'l2_regularizer\', \'fast\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "matrix_transpose"
+    argspec: "args=[\'a\', \'name\'], varargs=None, keywords=None, defaults=[\'matrix_transpose\'], "
+  }
+  member_method {
+    name: "matrix_triangular_solve"
+    argspec: "args=[\'matrix\', \'rhs\', \'lower\', \'adjoint\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maximum"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "meshgrid"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "min_max_variable_partitioner"
+    argspec: "args=[\'max_partitions\', \'axis\', \'min_slice_size\', \'bytes_per_string_element\'], varargs=None, keywords=None, defaults=[\'1\', \'0\', \'262144\', \'16\'], "
+  }
+  member_method {
+    name: "minimum"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "mod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "model_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "moving_average_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "multinomial"
+    argspec: "args=[\'logits\', \'num_samples\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "multiply"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "name_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "negative"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "no_op"
+    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "no_regularizer"
+    argspec: "args=[\'_\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "norm"
+    argspec: "args=[\'tensor\', \'ord\', \'axis\', \'keep_dims\', \'name\'], varargs=None, keywords=None, defaults=[\'euclidean\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "not_equal"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "one_hot"
+    argspec: "args=[\'indices\', \'depth\', \'on_value\', \'off_value\', \'axis\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "ones"
+    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "ones_like"
+    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "op_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "pad"
+    argspec: "args=[\'tensor\', \'paddings\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'CONSTANT\', \'None\'], "
+  }
+  member_method {
+    name: "parallel_stack"
+    argspec: "args=[\'values\', \'name\'], varargs=None, keywords=None, defaults=[\'parallel_stack\'], "
+  }
+  member_method {
+    name: "parse_example"
+    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_single_example"
+    argspec: "args=[\'serialized\', \'features\', \'name\', \'example_names\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_single_sequence_example"
+    argspec: "args=[\'serialized\', \'context_features\', \'sequence_features\', \'example_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "parse_tensor"
+    argspec: "args=[\'serialized\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "placeholder"
+    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "placeholder_with_default"
+    argspec: "args=[\'input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "polygamma"
+    argspec: "args=[\'a\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "pow"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "py_func"
+    argspec: "args=[\'func\', \'inp\', \'Tout\', \'stateful\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'None\'], "
+  }
+  member_method {
+    name: "qr"
+    argspec: "args=[\'input\', \'full_matrices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantize_v2"
+    argspec: "args=[\'input\', \'min_range\', \'max_range\', \'T\', \'mode\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "quantized_concat"
+    argspec: "args=[\'concat_dim\', \'values\', \'input_mins\', \'input_maxes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "random_crop"
+    argspec: "args=[\'value\', \'size\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_gamma"
+    argspec: "args=[\'shape\', \'alpha\', \'beta\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_normal"
+    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_poisson"
+    argspec: "args=[\'lam\', \'shape\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_shuffle"
+    argspec: "args=[\'value\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "random_uniform"
+    argspec: "args=[\'shape\', \'minval\', \'maxval\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "range"
+    argspec: "args=[\'start\', \'limit\', \'delta\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'range\'], "
+  }
+  member_method {
+    name: "rank"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "read_file"
+    argspec: "args=[\'filename\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "real"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "realdiv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reciprocal"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reduce_all"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_any"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_join"
+    argspec: "args=[\'inputs\', \'axis\', \'keep_dims\', \'separator\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_logsumexp"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_max"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_mean"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_min"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_prod"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reduce_sum"
+    argspec: "args=[\'input_tensor\', \'axis\', \'keep_dims\', \'name\', \'reduction_indices\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "register_tensor_conversion_function"
+    argspec: "args=[\'base_type\', \'conversion_func\', \'priority\'], varargs=None, keywords=None, defaults=[\'100\'], "
+  }
+  member_method {
+    name: "report_uninitialized_variables"
+    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'report_uninitialized_variables\'], "
+  }
+  member_method {
+    name: "required_space_to_batch_paddings"
+    argspec: "args=[\'input_shape\', \'block_shape\', \'base_paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "reset_default_graph"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reshape"
+    argspec: "args=[\'tensor\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reverse"
+    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "reverse_sequence"
+    argspec: "args=[\'input\', \'seq_lengths\', \'seq_axis\', \'batch_axis\', \'name\', \'seq_dim\', \'batch_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "reverse_v2"
+    argspec: "args=[\'tensor\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rint"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "round"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "rsqrt"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "saturate_cast"
+    argspec: "args=[\'value\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scalar_mul"
+    argspec: "args=[\'scalar\', \'x\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "scan"
+    argspec: "args=[\'fn\', \'elems\', \'initializer\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'infer_shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_add"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_div"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_mul"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd"
+    argspec: "args=[\'indices\', \'updates\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_add"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_sub"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_nd_update"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_sub"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "scatter_update"
+    argspec: "args=[\'ref\', \'indices\', \'updates\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "segment_max"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_mean"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_min"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_prod"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "segment_sum"
+    argspec: "args=[\'data\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "self_adjoint_eig"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "self_adjoint_eigvals"
+    argspec: "args=[\'tensor\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sequence_mask"
+    argspec: "args=[\'lengths\', \'maxlen\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'bool\'>\", \'None\'], "
+  }
+  member_method {
+    name: "serialize_many_sparse"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "serialize_sparse"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "set_random_seed"
+    argspec: "args=[\'seed\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setdiff1d"
+    argspec: "args=[\'x\', \'y\', \'index_dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'int32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "shape"
+    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "shape_n"
+    argspec: "args=[\'input\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sign"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sin"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "size"
+    argspec: "args=[\'input\', \'name\', \'out_type\'], varargs=None, keywords=None, defaults=[\'None\', \"<dtype: \'int32\'>\"], "
+  }
+  member_method {
+    name: "slice"
+    argspec: "args=[\'input_\', \'begin\', \'size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_batch"
+    argspec: "args=[\'input\', \'paddings\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_batch_nd"
+    argspec: "args=[\'input\', \'block_shape\', \'paddings\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "space_to_depth"
+    argspec: "args=[\'input\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_add"
+    argspec: "args=[\'a\', \'b\', \'thresh\'], varargs=None, keywords=None, defaults=[\'0\'], "
+  }
+  member_method {
+    name: "sparse_concat"
+    argspec: "args=[\'axis\', \'sp_inputs\', \'name\', \'expand_nonconcat_dim\', \'concat_dim\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_fill_empty_rows"
+    argspec: "args=[\'sp_input\', \'default_value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_mask"
+    argspec: "args=[\'a\', \'mask_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_matmul"
+    argspec: "args=[\'a\', \'b\', \'transpose_a\', \'transpose_b\', \'a_is_sparse\', \'b_is_sparse\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_maximum"
+    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_merge"
+    argspec: "args=[\'sp_ids\', \'sp_values\', \'vocab_size\', \'name\', \'already_sorted\'], varargs=None, keywords=None, defaults=[\'None\', \'False\'], "
+  }
+  member_method {
+    name: "sparse_minimum"
+    argspec: "args=[\'sp_a\', \'sp_b\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_placeholder"
+    argspec: "args=[\'dtype\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reduce_sum"
+    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reduce_sum_sparse"
+    argspec: "args=[\'sp_input\', \'axis\', \'keep_dims\', \'reduction_axes\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_reorder"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_reset_shape"
+    argspec: "args=[\'sp_input\', \'new_shape\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_reshape"
+    argspec: "args=[\'sp_input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_retain"
+    argspec: "args=[\'sp_input\', \'to_retain\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "sparse_segment_mean"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_segment_sqrt_n"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_segment_sum"
+    argspec: "args=[\'data\', \'indices\', \'segment_ids\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_softmax"
+    argspec: "args=[\'sp_input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_split"
+    argspec: "args=[\'keyword_required\', \'sp_input\', \'num_split\', \'axis\', \'name\', \'split_dim\'], varargs=None, keywords=None, defaults=[\'KeywordRequired()\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_tensor_dense_matmul"
+    argspec: "args=[\'sp_a\', \'b\', \'adjoint_a\', \'adjoint_b\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_tensor_to_dense"
+    argspec: "args=[\'sp_input\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_to_dense"
+    argspec: "args=[\'sparse_indices\', \'output_shape\', \'sparse_values\', \'default_value\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "sparse_to_indicator"
+    argspec: "args=[\'sp_input\', \'vocab_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sparse_transpose"
+    argspec: "args=[\'sp_input\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "split"
+    argspec: "args=[\'value\', \'num_or_size_splits\', \'axis\', \'num\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'split\'], "
+  }
+  member_method {
+    name: "sqrt"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "square"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "squared_difference"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "squeeze"
+    argspec: "args=[\'input\', \'axis\', \'name\', \'squeeze_dims\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "stack"
+    argspec: "args=[\'values\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'0\', \'stack\'], "
+  }
+  member_method {
+    name: "stop_gradient"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "strided_slice"
+    argspec: "args=[\'input_\', \'begin\', \'end\', \'strides\', \'begin_mask\', \'end_mask\', \'ellipsis_mask\', \'new_axis_mask\', \'shrink_axis_mask\', \'var\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'0\', \'0\', \'0\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "string_join"
+    argspec: "args=[\'inputs\', \'separator\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "string_split"
+    argspec: "args=[\'source\', \'delimiter\'], varargs=None, keywords=None, defaults=[\' \'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket"
+    argspec: "args=[\'string_tensor\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket_fast"
+    argspec: "args=[\'input\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_hash_bucket_strong"
+    argspec: "args=[\'input\', \'num_buckets\', \'key\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "string_to_number"
+    argspec: "args=[\'string_tensor\', \'out_type\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "substr"
+    argspec: "args=[\'input\', \'pos\', \'len\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "subtract"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "svd"
+    argspec: "args=[\'tensor\', \'full_matrices\', \'compute_uv\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'None\'], "
+  }
+  member_method {
+    name: "tables_initializer"
+    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'init_all_tables\'], "
+  }
+  member_method {
+    name: "tan"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tanh"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tensordot"
+    argspec: "args=[\'a\', \'b\', \'axes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tile"
+    argspec: "args=[\'input\', \'multiples\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_bfloat16"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToBFloat16\'], "
+  }
+  member_method {
+    name: "to_double"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToDouble\'], "
+  }
+  member_method {
+    name: "to_float"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToFloat\'], "
+  }
+  member_method {
+    name: "to_int32"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt32\'], "
+  }
+  member_method {
+    name: "to_int64"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'ToInt64\'], "
+  }
+  member_method {
+    name: "trace"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "trainable_variables"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "transpose"
+    argspec: "args=[\'a\', \'perm\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'transpose\'], "
+  }
+  member_method {
+    name: "truediv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "truncated_normal"
+    argspec: "args=[\'shape\', \'mean\', \'stddev\', \'dtype\', \'seed\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \"<dtype: \'float32\'>\", \'None\', \'None\'], "
+  }
+  member_method {
+    name: "truncatediv"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "truncatemod"
+    argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tuple"
+    argspec: "args=[\'tensors\', \'name\', \'control_inputs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unique"
+    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unique_with_counts"
+    argspec: "args=[\'x\', \'out_idx\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "unsorted_segment_max"
+    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unsorted_segment_sum"
+    argspec: "args=[\'data\', \'segment_ids\', \'num_segments\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "unstack"
+    argspec: "args=[\'value\', \'num\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'unstack\'], "
+  }
+  member_method {
+    name: "variable_axis_size_partitioner"
+    argspec: "args=[\'max_shard_bytes\', \'axis\', \'bytes_per_string_element\', \'max_shards\'], varargs=None, keywords=None, defaults=[\'0\', \'16\', \'None\'], "
+  }
+  member_method {
+    name: "variable_op_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "variable_scope"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "variables_initializer"
+    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], "
+  }
+  member_method {
+    name: "verify_tensor_all_finite"
+    argspec: "args=[\'t\', \'msg\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "where"
+    argspec: "args=[\'condition\', \'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "while_loop"
+    argspec: "args=[\'cond\', \'body\', \'loop_vars\', \'shape_invariants\', \'parallel_iterations\', \'back_prop\', \'swap_memory\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'True\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "write_file"
+    argspec: "args=[\'filename\', \'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "zeros"
+    argspec: "args=[\'shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "zeros_like"
+    argspec: "args=[\'tensor\', \'dtype\', \'name\', \'optimize\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "zeta"
+    argspec: "args=[\'x\', \'q\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
new file mode 100644
index 0000000000..4941dda50e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-compression-type.pbtxt
@@ -0,0 +1,20 @@
+path: "tensorflow.python_io.TFRecordCompressionType"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordCompressionType\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GZIP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "ZLIB"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
new file mode 100644
index 0000000000..0853716023
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-options.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.python_io.TFRecordOptions"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordOptions\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "compression_type_map"
+    mtype: "<type \'dict\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'compression_type\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_compression_type_string"
+    argspec: "args=[\'cls\', \'options\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
new file mode 100644
index 0000000000..af0c11ca14
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.-t-f-record-writer.pbtxt
@@ -0,0 +1,17 @@
+path: "tensorflow.python_io.TFRecordWriter"
+tf_class {
+  is_instance: "<class \'tensorflow.python.lib.io.tf_record.TFRecordWriter\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "write"
+    argspec: "args=[\'self\', \'record\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt b/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
new file mode 100644
index 0000000000..7c9953e5fe
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.python_io.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.python_io"
+tf_module {
+  member {
+    name: "TFRecordCompressionType"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TFRecordOptions"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TFRecordWriter"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "tf_record_iterator"
+    argspec: "args=[\'path\', \'options\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
new file mode 100644
index 0000000000..70308bc601
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.random_normal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomNormal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
new file mode 100644
index 0000000000..37bb1956e8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.random_uniform_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.RandomUniform\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'minval\', \'maxval\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
new file mode 100644
index 0000000000..288b78b4cd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.resource_loader.pbtxt
@@ -0,0 +1,23 @@
+path: "tensorflow.resource_loader"
+tf_module {
+  member_method {
+    name: "get_data_files_path"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_path_to_datafile"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_root_dir_with_all_resources"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "load_resource"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "readahead_file_path"
+    argspec: "args=[\'path\', \'readahead\'], varargs=None, keywords=None, defaults=[\'128M\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
new file mode 100644
index 0000000000..56d76902fd
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.-saved-model-builder.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.saved_model.builder.SavedModelBuilder"
+tf_class {
+  is_instance: "<class \'tensorflow.python.saved_model.builder_impl.SavedModelBuilder\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'export_dir\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_meta_graph"
+    argspec: "args=[\'self\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "add_meta_graph_and_variables"
+    argspec: "args=[\'self\', \'sess\', \'tags\', \'signature_def_map\', \'assets_collection\', \'legacy_init_op\', \'clear_devices\', \'main_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "save"
+    argspec: "args=[\'self\', \'as_text\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
new file mode 100644
index 0000000000..adc697ad1c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.builder.pbtxt
@@ -0,0 +1,7 @@
+path: "tensorflow.saved_model.builder"
+tf_module {
+  member {
+    name: "SavedModelBuilder"
+    mtype: "<type \'type\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
new file mode 100644
index 0000000000..20e10aa094
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.constants.pbtxt
@@ -0,0 +1,39 @@
+path: "tensorflow.saved_model.constants"
+tf_module {
+  member {
+    name: "ASSETS_DIRECTORY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "ASSETS_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "LEGACY_INIT_OP_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "MAIN_OP_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_FILENAME_PB"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_FILENAME_PBTXT"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SAVED_MODEL_SCHEMA_VERSION"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VARIABLES_DIRECTORY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "VARIABLES_FILENAME"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
new file mode 100644
index 0000000000..896e2160c6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.loader.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.loader"
+tf_module {
+  member_method {
+    name: "load"
+    argspec: "args=[\'sess\', \'tags\', \'export_dir\'], varargs=None, keywords=saver_kwargs, defaults=None"
+  }
+  member_method {
+    name: "maybe_saved_model_directory"
+    argspec: "args=[\'export_dir\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
new file mode 100644
index 0000000000..176cb788c2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.main_op.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.main_op"
+tf_module {
+  member_method {
+    name: "main_op"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "main_op_with_restore"
+    argspec: "args=[\'restore_op_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
new file mode 100644
index 0000000000..5683766b28
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.pbtxt
@@ -0,0 +1,35 @@
+path: "tensorflow.saved_model"
+tf_module {
+  member {
+    name: "builder"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "loader"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "main_op"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "signature_constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "signature_def_utils"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "tag_constants"
+    mtype: "<type \'module\'>"
+  }
+  member {
+    name: "utils"
+    mtype: "<type \'module\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
new file mode 100644
index 0000000000..478d410e06
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_constants.pbtxt
@@ -0,0 +1,47 @@
+path: "tensorflow.saved_model.signature_constants"
+tf_module {
+  member {
+    name: "CLASSIFY_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_OUTPUT_CLASSES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "CLASSIFY_OUTPUT_SCORES"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "DEFAULT_SERVING_SIGNATURE_DEF_KEY"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "PREDICT_OUTPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_INPUTS"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_METHOD_NAME"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "REGRESS_OUTPUTS"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
new file mode 100644
index 0000000000..e9867d84c3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.signature_def_utils.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.saved_model.signature_def_utils"
+tf_module {
+  member_method {
+    name: "build_signature_def"
+    argspec: "args=[\'inputs\', \'outputs\', \'method_name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "classification_signature_def"
+    argspec: "args=[\'examples\', \'classes\', \'scores\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "predict_signature_def"
+    argspec: "args=[\'inputs\', \'outputs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "regression_signature_def"
+    argspec: "args=[\'examples\', \'predictions\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
new file mode 100644
index 0000000000..7c24b7ad3c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.tag_constants.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.saved_model.tag_constants"
+tf_module {
+  member {
+    name: "SERVING"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "TRAINING"
+    mtype: "<type \'str\'>"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt b/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
new file mode 100644
index 0000000000..bc150e56a3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.saved_model.utils.pbtxt
@@ -0,0 +1,7 @@
+path: "tensorflow.saved_model.utils"
+tf_module {
+  member_method {
+    name: "build_tensor_info"
+    argspec: "args=[\'tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
new file mode 100644
index 0000000000..7c9e6a25c7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
@@ -0,0 +1,3 @@
+path: "tensorflow.sdca"
+tf_module {
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sets.pbtxt b/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
new file mode 100644
index 0000000000..8a196b1a55
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sets.pbtxt
@@ -0,0 +1,19 @@
+path: "tensorflow.sets"
+tf_module {
+  member_method {
+    name: "set_difference"
+    argspec: "args=[\'a\', \'b\', \'aminusb\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\', \'True\'], "
+  }
+  member_method {
+    name: "set_intersection"
+    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "set_size"
+    argspec: "args=[\'a\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "set_union"
+    argspec: "args=[\'a\', \'b\', \'validate_indices\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt b/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
new file mode 100644
index 0000000000..84883c1a39
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.spectral.pbtxt
@@ -0,0 +1,51 @@
+path: "tensorflow.spectral"
+tf_module {
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "irfft"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "irfft2d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "irfft3d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft2d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "rfft3d"
+    argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
new file mode 100644
index 0000000000..ab3449d80f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
@@ -0,0 +1,112 @@
+path: "tensorflow.summary.Event"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.Event\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
new file mode 100644
index 0000000000..2a5b63dcea
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer-cache.pbtxt
@@ -0,0 +1,16 @@
+path: "tensorflow.summary.FileWriterCache"
+tf_class {
+  is_instance: "<class \'tensorflow.python.summary.writer.writer_cache.FileWriterCache\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "clear"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get"
+    argspec: "args=[\'logdir\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
new file mode 100644
index 0000000000..502c35ee7b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
@@ -0,0 +1,50 @@
+path: "tensorflow.summary.FileWriter"
+tf_class {
+  is_instance: "<class \'tensorflow.python.summary.writer.writer.FileWriter\'>"
+  is_instance: "<class \'tensorflow.python.summary.writer.writer.SummaryToEventTransformer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'logdir\', \'graph\', \'max_queue\', \'flush_secs\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'120\', \'None\'], "
+  }
+  member_method {
+    name: "add_event"
+    argspec: "args=[\'self\', \'event\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_graph"
+    argspec: "args=[\'self\', \'graph\', \'global_step\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "add_meta_graph"
+    argspec: "args=[\'self\', \'meta_graph_def\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_run_metadata"
+    argspec: "args=[\'self\', \'run_metadata\', \'tag\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_session_log"
+    argspec: "args=[\'self\', \'session_log\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "add_summary"
+    argspec: "args=[\'self\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "flush"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_logdir"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "reopen"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
new file mode 100644
index 0000000000..92ca4872ca
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.summary.SessionLog"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.SessionLog\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CHECKPOINT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "START"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STATUS_UNSPECIFIED"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "STOP"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SessionStatus"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
new file mode 100644
index 0000000000..f93da2196a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.summary.SummaryDescription"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.SummaryDescription\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "TYPE_HINT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
new file mode 100644
index 0000000000..605e305e82
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.summary.Summary.Audio"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
new file mode 100644
index 0000000000..0646972196
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.summary.Summary.Image"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
new file mode 100644
index 0000000000..5294b37f57
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
@@ -0,0 +1,108 @@
+path: "tensorflow.summary.Summary.Value"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
new file mode 100644
index 0000000000..132ef1b7d2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
@@ -0,0 +1,92 @@
+path: "tensorflow.summary.Summary"
+tf_class {
+  is_instance: "<class \'tensorflow.core.framework.summary_pb2.Summary\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "Audio"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "Image"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
new file mode 100644
index 0000000000..4dce20819d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.summary.TaggedRunMetadata"
+tf_class {
+  is_instance: "<class \'tensorflow.core.util.event_pb2.TaggedRunMetadata\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
new file mode 100644
index 0000000000..c3d0bea10c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.summary.pbtxt
@@ -0,0 +1,67 @@
+path: "tensorflow.summary"
+tf_module {
+  member {
+    name: "Event"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FileWriter"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FileWriterCache"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionLog"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Summary"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SummaryDescription"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "TaggedRunMetadata"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "audio"
+    argspec: "args=[\'name\', \'tensor\', \'sample_rate\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
+  }
+  member_method {
+    name: "get_summary_description"
+    argspec: "args=[\'node_def\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "histogram"
+    argspec: "args=[\'name\', \'values\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "image"
+    argspec: "args=[\'name\', \'tensor\', \'max_outputs\', \'collections\'], varargs=None, keywords=None, defaults=[\'3\', \'None\'], "
+  }
+  member_method {
+    name: "merge"
+    argspec: "args=[\'inputs\', \'collections\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "merge_all"
+    argspec: "args=[\'key\'], varargs=None, keywords=None, defaults=[\'summaries\'], "
+  }
+  member_method {
+    name: "scalar"
+    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "tensor_summary"
+    argspec: "args=[\'name\', \'tensor\', \'summary_description\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "text"
+    argspec: "args=[\'name\', \'tensor\', \'collections\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
new file mode 100644
index 0000000000..02dec04b9c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.sysconfig.pbtxt
@@ -0,0 +1,11 @@
+path: "tensorflow.sysconfig"
+tf_module {
+  member_method {
+    name: "get_include"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_lib"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
new file mode 100644
index 0000000000..df528e26b6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.test.-benchmark.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.test.Benchmark"
+tf_class {
+  is_instance: "<class \'tensorflow.python.platform.benchmark.TensorFlowBenchmark\'>"
+  is_instance: "<class \'tensorflow.python.platform.benchmark.Benchmark\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "is_abstract"
+    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "report_benchmark"
+    argspec: "args=[\'self\', \'iters\', \'cpu_time\', \'wall_time\', \'throughput\', \'extras\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "run_op_benchmark"
+    argspec: "args=[\'self\', \'sess\', \'op_or_tensor\', \'feed_dict\', \'burn_iters\', \'min_iters\', \'store_trace\', \'store_memory_usage\', \'name\', \'extras\', \'mbs\'], varargs=None, keywords=None, defaults=[\'None\', \'2\', \'10\', \'False\', \'True\', \'None\', \'None\', \'0\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.test.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
new file mode 100644
index 0000000000..c4768a68bf
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
@@ -0,0 +1,51 @@
+path: "tensorflow.test"
+tf_module {
+  member {
+    name: "Benchmark"
+    mtype: "<class \'tensorflow.python.platform.benchmark._BenchmarkRegistrar\'>"
+  }
+  member {
+    name: "TestCase"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "mock"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "assert_equal_graph_def"
+    argspec: "args=[\'actual\', \'expected\', \'checkpoint_v2\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "compute_gradient"
+    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradient_error"
+    argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "get_temp_dir"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "gpu_device_name"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_built_with_cuda"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_gpu_available"
+    argspec: "args=[\'cuda_only\'], varargs=None, keywords=None, defaults=[\'False\'], "
+  }
+  member_method {
+    name: "main"
+    argspec: "args=[\'argv\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "test_src_dir_path"
+    argspec: "args=[\'relative_path\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
new file mode 100644
index 0000000000..8c91c5b4d9
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adadelta-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdadeltaOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adadelta.AdadeltaOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'rho\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.95\', \'1e-08\', \'False\', \'Adadelta\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
new file mode 100644
index 0000000000..05d38d62cc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-d-a-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdagradDAOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adagrad_da.AdagradDAOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'global_step\', \'initial_gradient_squared_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'AdagradDA\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
new file mode 100644
index 0000000000..19ca9f5763
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adagrad-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdagradOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adagrad.AdagradOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'False\', \'Adagrad\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
new file mode 100644
index 0000000000..c8144e2db7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-adam-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.AdamOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.adam.AdamOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'beta1\', \'beta2\', \'epsilon\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.001\', \'0.9\', \'0.999\', \'1e-08\', \'False\', \'Adam\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
new file mode 100644
index 0000000000..8cf52b817f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.BytesList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.BytesList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
new file mode 100644
index 0000000000..c3037baa8c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.CheckpointSaverHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.CheckpointSaverHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'checkpoint_dir\', \'save_secs\', \'save_steps\', \'saver\', \'checkpoint_basename\', \'scaffold\', \'listeners\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'model.ckpt\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt
new file mode 100644
index 0000000000..9d3688e565
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-checkpoint-saver-listener.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.train.CheckpointSaverListener"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.CheckpointSaverListener\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "after_save"
+    argspec: "args=[\'self\', \'session\', \'global_step_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_save"
+    argspec: "args=[\'self\', \'session\', \'global_step_value\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\', \'global_step_value\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
new file mode 100644
index 0000000000..abbe273be3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-chief-session-creator.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.train.ChiefSessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.ChiefSessionCreator\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'checkpoint_filename_with_path\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
new file mode 100644
index 0000000000..feb73bd7d4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.ClusterDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ClusterDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "JOB_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
new file mode 100644
index 0000000000..1658b15a5f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-spec.pbtxt
@@ -0,0 +1,37 @@
+path: "tensorflow.train.ClusterSpec"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.server_lib.ClusterSpec\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "jobs"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'cluster\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_cluster_def"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "as_dict"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "job_tasks"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "num_tasks"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "task_address"
+    argspec: "args=[\'self\', \'job_name\', \'task_index\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "task_indices"
+    argspec: "args=[\'self\', \'job_name\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
new file mode 100644
index 0000000000..11277f077e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-coordinator.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.train.Coordinator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.coordinator.Coordinator\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "joined"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'clean_stop_exception_types\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "clear_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\', \'threads\', \'stop_grace_period_secs\', \'ignore_live_threads\'], varargs=None, keywords=None, defaults=[\'None\', \'120\', \'False\'], "
+  }
+  member_method {
+    name: "raise_requested_exception"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "register_thread"
+    argspec: "args=[\'self\', \'thread\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop_on_exception"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "wait_for_stop"
+    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
new file mode 100644
index 0000000000..f7215a2037
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.Example"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.example_pb2.Example\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
new file mode 100644
index 0000000000..737acbe07c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-exponential-moving-average.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.train.ExponentialMovingAverage"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.moving_averages.ExponentialMovingAverage\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'decay\', \'num_updates\', \'zero_debias\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'ExponentialMovingAverage\'], "
+  }
+  member_method {
+    name: "apply"
+    argspec: "args=[\'self\', \'var_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "average"
+    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "average_name"
+    argspec: "args=[\'self\', \'var\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "variables_to_restore"
+    argspec: "args=[\'self\', \'moving_avg_variables\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
new file mode 100644
index 0000000000..3ad98354d6
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.FeatureList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
new file mode 100644
index 0000000000..cd171f4ca3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.FeatureLists.FeatureListEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureListEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
new file mode 100644
index 0000000000..3d95017d58
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.FeatureLists"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureLists\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FeatureListEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
new file mode 100644
index 0000000000..9cca132bba
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.train.Feature"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Feature\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "BYTES_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FLOAT_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "INT64_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
new file mode 100644
index 0000000000..858aee0341
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.Features.FeatureEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FeatureEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
new file mode 100644
index 0000000000..49cd12153b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.Features"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Features\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "FeatureEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
new file mode 100644
index 0000000000..7bec4d032c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feed-fn-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.FeedFnHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FeedFnHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'feed_fn\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
new file mode 100644
index 0000000000..31cf9aaeb2
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-final-ops-hook.pbtxt
@@ -0,0 +1,34 @@
+path: "tensorflow.train.FinalOpsHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.FinalOpsHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "final_ops_values"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'final_ops\', \'final_ops_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
new file mode 100644
index 0000000000..e3f01334b5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.FloatList"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.FloatList\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
new file mode 100644
index 0000000000..0252474a1d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.FtrlOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.ftrl.FtrlOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'learning_rate_power\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'-0.5\', \'0.1\', \'0.0\', \'0.0\', \'False\', \'Ftrl\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
new file mode 100644
index 0000000000..147448618e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-global-step-waiter-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.GlobalStepWaiterHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.GlobalStepWaiterHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'wait_until_step\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
new file mode 100644
index 0000000000..bdd4c52568
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-gradient-descent-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.GradientDescentOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.gradient_descent.GradientDescentOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'GradientDescent\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
new file mode 100644
index 0000000000..8917dc122c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
@@ -0,0 +1,80 @@
+path: "tensorflow.train.Int64List"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.feature_pb2.Int64List\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
new file mode 100644
index 0000000000..2d7fcbe545
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.JobDef.TasksEntry"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.TasksEntry\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
new file mode 100644
index 0000000000..fc5b76341d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
@@ -0,0 +1,88 @@
+path: "tensorflow.train.JobDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.JobDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TASKS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TasksEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
new file mode 100644
index 0000000000..e55c47b356
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-logging-tensor-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.LoggingTensorHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.LoggingTensorHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'tensors\', \'every_n_iter\', \'every_n_secs\', \'formatter\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
new file mode 100644
index 0000000000..c61859004e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-looper-thread.pbtxt
@@ -0,0 +1,73 @@
+path: "tensorflow.train.LooperThread"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.coordinator.LooperThread\'>"
+  is_instance: "<class \'threading.Thread\'>"
+  member {
+    name: "daemon"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ident"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "getName"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "isAlive"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "isDaemon"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "is_alive"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\', \'timeout\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "loop"
+    argspec: "args=[\'coord\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setDaemon"
+    argspec: "args=[\'self\', \'daemonic\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "setName"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop_loop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
new file mode 100644
index 0000000000..7cf5488a15
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-momentum-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.MomentumOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.momentum.MomentumOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'momentum\', \'use_locking\', \'name\', \'use_nesterov\'], varargs=None, keywords=None, defaults=[\'False\', \'Momentum\', \'False\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
new file mode 100644
index 0000000000..3a5cc015b4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-monitored-session.pbtxt
@@ -0,0 +1,26 @@
+path: "tensorflow.train.MonitoredSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.MonitoredSession\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'session_creator\', \'hooks\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'120\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
new file mode 100644
index 0000000000..25fd5e75a7
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-nan-loss-during-training-error.pbtxt
@@ -0,0 +1,16 @@
+path: "tensorflow.train.NanLossDuringTrainingError"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanLossDuringTrainingError\'>"
+  is_instance: "<type \'exceptions.RuntimeError\'>"
+  member {
+    name: "args"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "message"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
new file mode 100644
index 0000000000..7d1c89f9b3
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-nan-tensor-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.NanTensorHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.NanTensorHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'loss_tensor\', \'fail_on_nan_loss\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
new file mode 100644
index 0000000000..20b0c4d1b5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-optimizer.pbtxt
@@ -0,0 +1,45 @@
+path: "tensorflow.train.Optimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
new file mode 100644
index 0000000000..571d846b6c
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-proximal-adagrad-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.ProximalAdagradOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.proximal_adagrad.ProximalAdagradOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.1\', \'0.0\', \'0.0\', \'False\', \'ProximalAdagrad\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
new file mode 100644
index 0000000000..1feb136e7f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-proximal-gradient-descent-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.ProximalGradientDescentOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.proximal_gradient_descent.ProximalGradientDescentOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0\', \'0.0\', \'False\', \'ProximalGradientDescent\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
new file mode 100644
index 0000000000..d84d0058ee
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-queue-runner.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.QueueRunner"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cancel_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "close_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "enqueue_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "exceptions_raised"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_closed_exception_types"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_threads"
+    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
new file mode 100644
index 0000000000..2aa4ae6d2d
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-r-m-s-prop-optimizer.pbtxt
@@ -0,0 +1,46 @@
+path: "tensorflow.train.RMSPropOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.rmsprop.RMSPropOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'learning_rate\', \'decay\', \'momentum\', \'epsilon\', \'use_locking\', \'centered\', \'name\'], varargs=None, keywords=None, defaults=[\'0.9\', \'0.0\', \'1e-10\', \'False\', \'False\', \'RMSProp\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\', \'loss\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'1\', \'None\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\', \'var\', \'name\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
new file mode 100644
index 0000000000..84498a64f5
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
@@ -0,0 +1,120 @@
+path: "tensorflow.train.SaverDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.saver_pb2.SaverDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CheckpointFormatVersion"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FILENAME_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "KEEP_CHECKPOINT_EVERY_N_HOURS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "LEGACY"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "MAX_TO_KEEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "RESTORE_OP_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SAVE_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "SHARDED_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "V1"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "V2"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
new file mode 100644
index 0000000000..7494fe1cc8
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-saver.pbtxt
@@ -0,0 +1,53 @@
+path: "tensorflow.train.Saver"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.saver.Saver\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "last_checkpoints"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'var_list\', \'reshape\', \'sharded\', \'max_to_keep\', \'keep_checkpoint_every_n_hours\', \'name\', \'restore_sequentially\', \'saver_def\', \'builder\', \'defer_build\', \'allow_empty\', \'write_version\', \'pad_step_number\', \'save_relative_paths\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\', \'5\', \'10000.0\', \'None\', \'False\', \'None\', \'None\', \'False\', \'False\', \'2\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "as_saver_def"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "build"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "export_meta_graph"
+    argspec: "args=[\'self\', \'filename\', \'collection_list\', \'as_text\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'saver_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "recover_last_checkpoints"
+    argspec: "args=[\'self\', \'checkpoint_paths\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "restore"
+    argspec: "args=[\'self\', \'sess\', \'save_path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "save"
+    argspec: "args=[\'self\', \'sess\', \'save_path\', \'global_step\', \'latest_filename\', \'meta_graph_suffix\', \'write_meta_graph\', \'write_state\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'meta\', \'True\', \'True\'], "
+  }
+  member_method {
+    name: "set_last_checkpoints"
+    argspec: "args=[\'self\', \'last_checkpoints\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "set_last_checkpoints_with_time"
+    argspec: "args=[\'self\', \'last_checkpoints_with_time\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
new file mode 100644
index 0000000000..21234fe739
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.Scaffold"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.Scaffold\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "init_feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_fn"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_for_local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "saver"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_op"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'init_op\', \'init_feed_dict\', \'init_fn\', \'ready_op\', \'ready_for_local_init_op\', \'local_init_op\', \'summary_op\', \'saver\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "finalize"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_or_default"
+    argspec: "args=[\'arg_name\', \'collection_key\', \'default_constructor\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
new file mode 100644
index 0000000000..45528d4e87
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-second-or-step-timer.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.train.SecondOrStepTimer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SecondOrStepTimer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'every_secs\', \'every_steps\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "last_triggered_step"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "should_trigger_for_step"
+    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "update_last_triggered_step"
+    argspec: "args=[\'self\', \'step\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
new file mode 100644
index 0000000000..9ab9553702
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
@@ -0,0 +1,84 @@
+path: "tensorflow.train.SequenceExample"
+tf_class {
+  is_instance: "<class \'tensorflow.core.example.example_pb2.SequenceExample\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CONTEXT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "FEATURE_LISTS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
new file mode 100644
index 0000000000..af0a3b73cc
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
@@ -0,0 +1,96 @@
+path: "tensorflow.train.ServerDef"
+tf_class {
+  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ServerDef\'>"
+  is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
+  member {
+    name: "CLUSTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DEFAULT_SESSION_CONFIG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+  }
+  member {
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
+  }
+  member {
+    name: "JOB_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "PROTOCOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "TASK_INDEX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "ByteSize"
+  }
+  member_method {
+    name: "Clear"
+  }
+  member_method {
+    name: "ClearExtension"
+  }
+  member_method {
+    name: "ClearField"
+  }
+  member_method {
+    name: "CopyFrom"
+  }
+  member_method {
+    name: "DiscardUnknownFields"
+  }
+  member_method {
+    name: "FindInitializationErrors"
+  }
+  member_method {
+    name: "FromString"
+  }
+  member_method {
+    name: "HasExtension"
+  }
+  member_method {
+    name: "HasField"
+  }
+  member_method {
+    name: "IsInitialized"
+  }
+  member_method {
+    name: "ListFields"
+  }
+  member_method {
+    name: "MergeFrom"
+  }
+  member_method {
+    name: "MergeFromString"
+  }
+  member_method {
+    name: "ParseFromString"
+  }
+  member_method {
+    name: "RegisterExtension"
+  }
+  member_method {
+    name: "SerializePartialToString"
+  }
+  member_method {
+    name: "SerializeToString"
+  }
+  member_method {
+    name: "SetInParent"
+  }
+  member_method {
+    name: "WhichOneof"
+  }
+  member_method {
+    name: "__init__"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
new file mode 100644
index 0000000000..9b8f185f5b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-server.pbtxt
@@ -0,0 +1,29 @@
+path: "tensorflow.train.Server"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.server_lib.Server\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "server_def"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "target"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'server_or_cluster_def\', \'job_name\', \'task_index\', \'protocol\', \'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "create_local_server"
+    argspec: "args=[\'config\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "join"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
new file mode 100644
index 0000000000..beb232715f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-creator.pbtxt
@@ -0,0 +1,12 @@
+path: "tensorflow.train.SessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
new file mode 100644
index 0000000000..cc31bb4e4b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-manager.pbtxt
@@ -0,0 +1,21 @@
+path: "tensorflow.train.SessionManager"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_manager.SessionManager\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'local_init_op\', \'ready_op\', \'ready_for_local_init_op\', \'graph\', \'recovery_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'30\'], "
+  }
+  member_method {
+    name: "prepare_session"
+    argspec: "args=[\'self\', \'master\', \'init_op\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\', \'init_feed_dict\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'False\', \'7200\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "recover_session"
+    argspec: "args=[\'self\', \'master\', \'saver\', \'checkpoint_dir\', \'checkpoint_filename_with_path\', \'wait_for_checkpoint\', \'max_wait_secs\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'7200\', \'None\'], "
+  }
+  member_method {
+    name: "wait_for_session"
+    argspec: "args=[\'self\', \'master\', \'config\', \'max_wait_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'inf\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
new file mode 100644
index 0000000000..442990893e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-args.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.train.SessionRunArgs"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunArgs\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "fetches"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "options"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
new file mode 100644
index 0000000000..d5adb15c95
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-context.pbtxt
@@ -0,0 +1,25 @@
+path: "tensorflow.train.SessionRunContext"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunContext\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "original_args"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "stop_requested"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'original_args\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
new file mode 100644
index 0000000000..db1aa24acf
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-hook.pbtxt
@@ -0,0 +1,28 @@
+path: "tensorflow.train.SessionRunHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
new file mode 100644
index 0000000000..0b401d59c4
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-session-run-values.pbtxt
@@ -0,0 +1,27 @@
+path: "tensorflow.train.SessionRunValues"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunValues\'>"
+  is_instance: "<type \'tuple\'>"
+  member {
+    name: "options"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "results"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "run_metadata"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "count"
+  }
+  member_method {
+    name: "index"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
new file mode 100644
index 0000000000..62bfdab40b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-singular-monitored-session.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.SingularMonitoredSession"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SingularMonitoredSession\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session._MonitoredSession\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "graph"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'hooks\', \'scaffold\', \'master\', \'config\', \'checkpoint_dir\', \'stop_grace_period_secs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\', \'None\', \'None\', \'120\'], "
+  }
+  member_method {
+    name: "close"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "raw_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "run"
+    argspec: "args=[\'self\', \'fetches\', \'feed_dict\', \'options\', \'run_metadata\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
new file mode 100644
index 0000000000..13261f6dde
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-step-counter-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.StepCounterHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StepCounterHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'every_n_steps\', \'every_n_secs\', \'output_dir\', \'summary_writer\'], varargs=None, keywords=None, defaults=[\'100\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
new file mode 100644
index 0000000000..e388599b0b
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-stop-at-step-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.StopAtStepHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.StopAtStepHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'num_steps\', \'last_step\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
new file mode 100644
index 0000000000..697c3667b0
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-summary-saver-hook.pbtxt
@@ -0,0 +1,30 @@
+path: "tensorflow.train.SummarySaverHook"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.basic_session_run_hooks.SummarySaverHook\'>"
+  is_instance: "<class \'tensorflow.python.training.session_run_hook.SessionRunHook\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'save_steps\', \'save_secs\', \'output_dir\', \'summary_writer\', \'scaffold\', \'summary_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "after_create_session"
+    argspec: "args=[\'self\', \'session\', \'coord\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "after_run"
+    argspec: "args=[\'self\', \'run_context\', \'run_values\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "before_run"
+    argspec: "args=[\'self\', \'run_context\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "begin"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "end"
+    argspec: "args=[\'self\', \'session\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
new file mode 100644
index 0000000000..cc9bd5c136
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-supervisor.pbtxt
@@ -0,0 +1,153 @@
+path: "tensorflow.train.Supervisor"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.supervisor.Supervisor\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "USE_DEFAULT"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "coord"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "global_step"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_feed_dict"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "is_chief"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_for_local_init_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "ready_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_model_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_path"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "save_summaries_secs"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "saver"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "session_manager"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "summary_writer"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "Loop"
+    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "PrepareSession"
+    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
+  }
+  member_method {
+    name: "RequestStop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ShouldStop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "StartQueueRunners"
+    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "StartStandardServices"
+    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "Stop"
+    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "StopOnException"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "SummaryComputed"
+    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "WaitForStop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'graph\', \'ready_op\', \'ready_for_local_init_op\', \'is_chief\', \'init_op\', \'init_feed_dict\', \'local_init_op\', \'logdir\', \'summary_op\', \'saver\', \'global_step\', \'save_summaries_secs\', \'save_model_secs\', \'recovery_wait_secs\', \'stop_grace_secs\', \'checkpoint_basename\', \'session_manager\', \'summary_writer\', \'init_fn\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'0\', \'True\', \'0\', \'None\', \'0\', \'None\', \'0\', \'0\', \'0\', \'120\', \'600\', \'30\', \'120\', \'model.ckpt\', \'None\', \'0\', \'None\'], "
+  }
+  member_method {
+    name: "loop"
+    argspec: "args=[\'self\', \'timer_interval_secs\', \'target\', \'args\', \'kwargs\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "managed_session"
+    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+  }
+  member_method {
+    name: "prepare_or_wait_for_session"
+    argspec: "args=[\'self\', \'master\', \'config\', \'wait_for_checkpoint\', \'max_wait_secs\', \'start_standard_services\'], varargs=None, keywords=None, defaults=[\'\', \'None\', \'False\', \'7200\', \'True\'], "
+  }
+  member_method {
+    name: "request_stop"
+    argspec: "args=[\'self\', \'ex\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "should_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'self\', \'sess\', \'queue_runners\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "start_standard_services"
+    argspec: "args=[\'self\', \'sess\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "stop"
+    argspec: "args=[\'self\', \'threads\', \'close_summary_writer\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "stop_on_exception"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "summary_computed"
+    argspec: "args=[\'self\', \'sess\', \'summary\', \'global_step\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "wait_for_stop"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
new file mode 100644
index 0000000000..915d8501af
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-sync-replicas-optimizer.pbtxt
@@ -0,0 +1,58 @@
+path: "tensorflow.train.SyncReplicasOptimizer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.sync_replicas_optimizer.SyncReplicasOptimizer\'>"
+  is_instance: "<class \'tensorflow.python.training.optimizer.Optimizer\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "GATE_GRAPH"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_NONE"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "GATE_OP"
+    mtype: "<type \'int\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'opt\', \'replicas_to_aggregate\', \'total_num_replicas\', \'variable_averages\', \'variables_to_average\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'False\', \'sync_replicas\'], "
+  }
+  member_method {
+    name: "apply_gradients"
+    argspec: "args=[\'self\', \'grads_and_vars\', \'global_step\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "compute_gradients"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_chief_queue_runner"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_init_tokens_op"
+    argspec: "args=[\'self\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "get_name"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_slot"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "get_slot_names"
+    argspec: "args=[\'self\'], varargs=args, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "make_session_run_hook"
+    argspec: "args=[\'self\', \'is_chief\', \'num_tokens\'], varargs=None, keywords=None, defaults=[\'-1\'], "
+  }
+  member_method {
+    name: "minimize"
+    argspec: "args=[\'self\', \'loss\', \'global_step\', \'var_list\', \'gate_gradients\', \'aggregation_method\', \'colocate_gradients_with_ops\', \'name\', \'grad_loss\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'1\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
new file mode 100644
index 0000000000..140407651a
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.-worker-session-creator.pbtxt
@@ -0,0 +1,14 @@
+path: "tensorflow.train.WorkerSessionCreator"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.monitored_session.WorkerSessionCreator\'>"
+  is_instance: "<class \'tensorflow.python.training.monitored_session.SessionCreator\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'scaffold\', \'master\', \'config\'], varargs=None, keywords=None, defaults=[\'None\', \'\', \'None\'], "
+  }
+  member_method {
+    name: "create_session"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
new file mode 100644
index 0000000000..79fd49d0ad
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
@@ -0,0 +1,395 @@
+path: "tensorflow.train"
+tf_module {
+  member {
+    name: "AdadeltaOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdagradDAOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdagradOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "AdamOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "BytesList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "CheckpointSaverHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "CheckpointSaverListener"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ChiefSessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ClusterDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "ClusterSpec"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Coordinator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Example"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "ExponentialMovingAverage"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Feature"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeatureList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeatureLists"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Features"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FeedFnHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FinalOpsHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "FloatList"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "FtrlOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GlobalStepWaiterHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "GradientDescentOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Int64List"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "JobDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "LoggingTensorHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "LooperThread"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "MomentumOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "MonitoredSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NanLossDuringTrainingError"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "NanTensorHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Optimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ProximalAdagradOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ProximalGradientDescentOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "QueueRunner"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "RMSPropOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Saver"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SaverDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Scaffold"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SecondOrStepTimer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SequenceExample"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "Server"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "ServerDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+  }
+  member {
+    name: "SessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionManager"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunArgs"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunContext"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SessionRunValues"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SingularMonitoredSession"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "StepCounterHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "StopAtStepHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SummarySaverHook"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "Supervisor"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "SyncReplicasOptimizer"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "WorkerSessionCreator"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "queue_runner"
+    mtype: "<type \'module\'>"
+  }
+  member_method {
+    name: "MonitoredTrainingSession"
+    argspec: "args=[\'master\', \'is_chief\', \'checkpoint_dir\', \'scaffold\', \'hooks\', \'chief_only_hooks\', \'save_checkpoint_secs\', \'save_summaries_steps\', \'save_summaries_secs\', \'config\', \'stop_grace_period_secs\', \'log_step_count_steps\'], varargs=None, keywords=None, defaults=[\'\', \'True\', \'None\', \'None\', \'None\', \'None\', \'600\', \'100\', \'None\', \'None\', \'120\', \'100\'], "
+  }
+  member_method {
+    name: "NewCheckpointReader"
+    argspec: "args=[\'filepattern\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "add_queue_runner"
+    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
+  }
+  member_method {
+    name: "assert_global_step"
+    argspec: "args=[\'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "basic_train_loop"
+    argspec: "args=[\'supervisor\', \'train_step_fn\', \'args\', \'kwargs\', \'master\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'\'], "
+  }
+  member_method {
+    name: "batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "checkpoint_exists"
+    argspec: "args=[\'checkpoint_prefix\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "create_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "do_quantize_training_on_graphdef"
+    argspec: "args=[\'input_graph\', \'num_bits\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "exponential_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "export_meta_graph"
+    argspec: "args=[\'filename\', \'meta_info_def\', \'graph_def\', \'saver_def\', \'collection_list\', \'as_text\', \'graph\', \'export_scope\', \'clear_devices\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'False\', \'None\', \'None\', \'False\'], "
+  }
+  member_method {
+    name: "generate_checkpoint_state_proto"
+    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_checkpoint_mtimes"
+    argspec: "args=[\'checkpoint_prefixes\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_checkpoint_state"
+    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "get_or_create_global_step"
+    argspec: "args=[\'graph\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "global_step"
+    argspec: "args=[\'sess\', \'global_step_tensor\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "import_meta_graph"
+    argspec: "args=[\'meta_graph_or_file\', \'clear_devices\', \'import_scope\'], varargs=None, keywords=kwargs, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "input_producer"
+    argspec: "args=[\'input_tensor\', \'element_shape\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'summary_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "inverse_time_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "latest_checkpoint"
+    argspec: "args=[\'checkpoint_dir\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "limit_epochs"
+    argspec: "args=[\'tensor\', \'num_epochs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "match_filenames_once"
+    argspec: "args=[\'pattern\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "maybe_batch"
+    argspec: "args=[\'tensors\', \'keep_input\', \'batch_size\', \'num_threads\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_batch_join"
+    argspec: "args=[\'tensors_list\', \'keep_input\', \'batch_size\', \'capacity\', \'enqueue_many\', \'shapes\', \'dynamic_pad\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'32\', \'False\', \'None\', \'False\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_shuffle_batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "maybe_shuffle_batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'keep_input\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "natural_exp_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'decay_rate\', \'staircase\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+  }
+  member_method {
+    name: "piecewise_constant"
+    argspec: "args=[\'x\', \'boundaries\', \'values\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "polynomial_decay"
+    argspec: "args=[\'learning_rate\', \'global_step\', \'decay_steps\', \'end_learning_rate\', \'power\', \'cycle\', \'name\'], varargs=None, keywords=None, defaults=[\'0.0001\', \'1.0\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "range_input_producer"
+    argspec: "args=[\'limit\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "replica_device_setter"
+    argspec: "args=[\'ps_tasks\', \'ps_device\', \'worker_device\', \'merge_devices\', \'cluster\', \'ps_ops\', \'ps_strategy\'], varargs=None, keywords=None, defaults=[\'0\', \'/job:ps\', \'/job:worker\', \'True\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "shuffle_batch"
+    argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "shuffle_batch_join"
+    argspec: "args=[\'tensors_list\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "slice_input_producer"
+    argspec: "args=[\'tensor_list\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
+  }
+  member_method {
+    name: "string_input_producer"
+    argspec: "args=[\'string_tensor\', \'num_epochs\', \'shuffle\', \'seed\', \'capacity\', \'shared_name\', \'name\', \'cancel_op\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'32\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "summary_iterator"
+    argspec: "args=[\'path\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "update_checkpoint_state"
+    argspec: "args=[\'save_dir\', \'model_checkpoint_path\', \'all_model_checkpoint_paths\', \'latest_filename\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "write_graph"
+    argspec: "args=[\'graph_or_graph_def\', \'logdir\', \'name\', \'as_text\'], varargs=None, keywords=None, defaults=[\'True\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
new file mode 100644
index 0000000000..23d402de30
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.-queue-runner.pbtxt
@@ -0,0 +1,49 @@
+path: "tensorflow.train.queue_runner.QueueRunner"
+tf_class {
+  is_instance: "<class \'tensorflow.python.training.queue_runner_impl.QueueRunner\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "cancel_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "close_op"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "enqueue_ops"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "exceptions_raised"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "name"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue"
+    mtype: "<type \'property\'>"
+  }
+  member {
+    name: "queue_closed_exception_types"
+    mtype: "<type \'property\'>"
+  }
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'queue\', \'enqueue_ops\', \'close_op\', \'cancel_op\', \'queue_closed_exception_types\', \'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+  }
+  member_method {
+    name: "create_threads"
+    argspec: "args=[\'self\', \'sess\', \'coord\', \'daemon\', \'start\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\'], "
+  }
+  member_method {
+    name: "from_proto"
+    argspec: "args=[\'queue_runner_def\', \'import_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "to_proto"
+    argspec: "args=[\'self\', \'export_scope\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
new file mode 100644
index 0000000000..6e2d043049
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.train.queue_runner.pbtxt
@@ -0,0 +1,15 @@
+path: "tensorflow.train.queue_runner"
+tf_module {
+  member {
+    name: "QueueRunner"
+    mtype: "<type \'type\'>"
+  }
+  member_method {
+    name: "add_queue_runner"
+    argspec: "args=[\'qr\', \'collection\'], varargs=None, keywords=None, defaults=[\'queue_runners\'], "
+  }
+  member_method {
+    name: "start_queue_runners"
+    argspec: "args=[\'sess\', \'coord\', \'daemon\', \'start\', \'collection\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'True\', \'queue_runners\'], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
new file mode 100644
index 0000000000..7c48f4af07
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.truncated_normal_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.TruncatedNormal\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
new file mode 100644
index 0000000000..4558db619e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.uniform_unit_scaling_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.UniformUnitScaling\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'factor\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
new file mode 100644
index 0000000000..8313009a68
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
@@ -0,0 +1,10 @@
+path: "tensorflow.zeros_initializer"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Zeros\'>"
+  is_instance: "<class \'tensorflow.python.ops.init_ops.Initializer\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/lib/BUILD b/tensorflow/tools/api/lib/BUILD
new file mode 100644
index 0000000000..cdfa0e7be5
--- /dev/null
+++ b/tensorflow/tools/api/lib/BUILD
@@ -0,0 +1,39 @@
+# Helper libraries for TensorFlow API compatibility test.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load(
+    "//tensorflow/core:platform/default/build_config.bzl",
+    "tf_proto_library",
+)
+
+tf_proto_library(
+    name = "api_objects_proto",
+    srcs = ["api_objects.proto"],
+)
+
+py_library(
+    name = "python_object_to_proto_visitor",
+    srcs = ["python_object_to_proto_visitor.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":api_objects_proto_py",
+        "//tensorflow/tools/common:traverse",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/lib/api_objects.proto b/tensorflow/tools/api/lib/api_objects.proto
new file mode 100644
index 0000000000..0966a5f1d5
--- /dev/null
+++ b/tensorflow/tools/api/lib/api_objects.proto
@@ -0,0 +1,31 @@
+syntax = "proto2";
+
+package third_party.tensorflow.tools.api;
+
+message TFAPIMember {
+  optional string name = 1;
+  optional string mtype = 2;
+};
+
+message TFAPIMethod {
+  optional string name = 1;
+  optional string path = 2;
+  optional string argspec = 3;
+};
+
+message TFAPIModule {
+  repeated TFAPIMember member = 1;
+  repeated TFAPIMethod member_method = 2;
+};
+
+message TFAPIClass {
+  repeated string is_instance = 1;
+  repeated TFAPIMember member = 2;
+  repeated TFAPIMethod member_method = 3;
+};
+
+message TFAPIObject {
+  optional string path = 1;
+  optional TFAPIModule tf_module = 2;
+  optional TFAPIClass tf_class = 3;
+};
diff --git a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
new file mode 100644
index 0000000000..64092a6441
--- /dev/null
+++ b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
@@ -0,0 +1,168 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ==============================================================================
+"""A visitor class that generates protobufs for each pyton object."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import inspect
+
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.tools.api.lib import api_objects_pb2
+
+
+# Following object need to be handled individually.
+_CORNER_CASES = {
+    '': {'contrib': {'name': 'contrib',
+                     'mtype': '<class \'_LazyContribLoader\'>'},
+         'tools': {}},
+    'test.TestCase': {},
+    'test.TestCase.failureException': {},
+}
+
+
+def _SanitizedArgSpec(obj):
+  """Get an ArgSpec string that is free of addresses.
+
+  We have callables as function arg defaults. This results in addresses in
+  getargspec output. This function returns a sanitized string list of base
+  classes.
+
+  Args:
+    obj: A python routine for us the create the sanitized arspec of.
+
+  Returns:
+    string, a string representation of the argspec.
+  """
+  output_string = ''
+  unsanitized_arg_spec = inspect.getargspec(obj)
+
+  for clean_attr in ('args', 'varargs', 'keywords'):
+    output_string += '%s=%s, ' % (clean_attr,
+                                  getattr(unsanitized_arg_spec, clean_attr))
+
+  if unsanitized_arg_spec.defaults:
+    sanitized_defaults = []
+    for val in unsanitized_arg_spec.defaults:
+      str_val = str(val)
+      if ' object at 0x' in str_val:
+        sanitized_defaults.append('%s instance>' % str_val.split(' at ')[0])
+      else:
+        sanitized_defaults.append(str_val)
+
+    output_string += 'defaults=%s, ' % sanitized_defaults
+
+  else:
+    output_string += 'defaults=None'
+
+  return output_string
+
+
+def _SanitizedMRO(obj):
+  """Get a list of superclasses with minimal amount of non-TF classes.
+
+  Based on many parameters like python version, OS, protobuf implementation
+  or changes in google core libraries the list of superclasses of a class
+  can change. We only return the first non-TF class to be robust to non API
+  affecting changes. The Method Resolution Order returned by inspect.getmro
+  is still maintained in the return value.
+
+  Args:
+    obj: A python routine for us the create the sanitized arspec of.
+
+  Returns:
+    list of strings, string representation of the class names.
+  """
+  return_list = []
+  for cls in inspect.getmro(obj):
+    str_repr = str(cls)
+    return_list.append(str_repr)
+    if 'tensorflow' not in str_repr:
+      break
+
+  return return_list
+
+
+class PythonObjectToProtoVisitor(object):
+  """A visitor that summarizes given python objects as protobufs."""
+
+  def __init__(self):
+    # A dict to store all protocol buffers.
+    # Keyed by "path" to the object.
+    self._protos = {}
+
+  def GetProtos(self):
+    """Return the list of protos stored."""
+    return self._protos
+
+  def __call__(self, path, parent, children):
+    # The path to the object.
+    lib_path = 'tensorflow.%s' % path if path else 'tensorflow'
+
+    # A small helper method to construct members(children) protos.
+    def _AddMember(member_name, member_obj, proto):
+      """Add the child object to the object being constructed."""
+      if member_name == '__init__' or not member_name.startswith('_'):
+        if inspect.isroutine(member_obj):
+          new_method = proto.member_method.add()
+          new_method.name = member_name
+          # If member_obj is a python builtin, there is no way to get its
+          # argspec, because it is implemented on the C side. It also has no
+          # func_code.
+          if getattr(member_obj, 'func_code', None):
+            new_method.argspec = _SanitizedArgSpec(member_obj)
+        else:
+          new_member = proto.member.add()
+          new_member.name = member_name
+          new_member.mtype = str(type(member_obj))
+
+    parent_corner_cases = _CORNER_CASES.get(path, {})
+
+    if path not in _CORNER_CASES or parent_corner_cases:
+      # Decide if we have a module or a class.
+      if inspect.ismodule(parent):
+        # Create a module object.
+        module_obj = api_objects_pb2.TFAPIModule()
+        for name, child in children:
+          if name in parent_corner_cases:
+            # If we have an empty entry, skip this object.
+            if parent_corner_cases[name]:
+              module_obj.member.add(**(parent_corner_cases[name]))
+          else:
+            _AddMember(name, child, module_obj)
+
+        # Store the constructed module object.
+        self._protos[lib_path] = api_objects_pb2.TFAPIObject(
+            path=lib_path, tf_module=module_obj)
+      elif inspect.isclass(parent):
+        # Construct a class.
+        class_obj = api_objects_pb2.TFAPIClass()
+        class_obj.is_instance.extend(_SanitizedMRO(parent))
+        for name, child in children:
+          if name in parent_corner_cases:
+            # If we have an empty entry, skip this object.
+            if parent_corner_cases[name]:
+              module_obj.member.add(**(parent_corner_cases[name]))
+          else:
+            _AddMember(name, child, class_obj)
+
+        # Store the constructed class object.
+        self._protos[lib_path] = api_objects_pb2.TFAPIObject(
+            path=lib_path, tf_class=class_obj)
+      else:
+        logging.error('Illegal call to ApiProtoDump::_py_obj_to_proto.'
+                      'Object is neither a module nor a class: %s', path)
diff --git a/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt b/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
new file mode 100644
index 0000000000..54b0cfcb3c
--- /dev/null
+++ b/tensorflow/tools/api/tests/API_UPDATE_WARNING.txt
@@ -0,0 +1,7 @@
+Golden file update requested!
+All test failures have been skipped, see the logs for detected diffs.
+This test is now going to write new golden files.
+Make sure to package the updates together with your change.
+
+You will need an explicit API approval. This may take longer than a normal
+review.
diff --git a/tensorflow/tools/api/tests/BUILD b/tensorflow/tools/api/tests/BUILD
new file mode 100644
index 0000000000..bfee211dca
--- /dev/null
+++ b/tensorflow/tools/api/tests/BUILD
@@ -0,0 +1,43 @@
+# TensorFlow API backwards compatibility tests.
+
+package(
+    default_visibility = ["//tensorflow/tools/api:__subpackages__"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files([
+    "README.txt",
+    "API_UPDATE_WARNING.txt",
+])
+
+py_test(
+    name = "api_compatibility_test",
+    srcs = ["api_compatibility_test.py"],
+    data = [
+        "//tensorflow/tools/api/golden:api_golden",
+        "//tensorflow/tools/api/tests:API_UPDATE_WARNING.txt",
+        "//tensorflow/tools/api/tests:README.txt",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python:platform",
+        "//tensorflow/tools/api/lib:python_object_to_proto_visitor",
+        "//tensorflow/tools/common:public_api",
+        "//tensorflow/tools/common:traverse",
+        "@protobuf//:protobuf_python",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tools/api/tests/README.txt b/tensorflow/tools/api/tests/README.txt
new file mode 100644
index 0000000000..3463eeec6f
--- /dev/null
+++ b/tensorflow/tools/api/tests/README.txt
@@ -0,0 +1,13 @@
+TensorFlow API backwards compatibility test
+This test ensures all changes to the public API of TensorFlow are intended.
+
+If this test fails, it means a change has been made to the public API. Backwards
+incompatible changes are not allowed. You can run the test as follows to update
+test goldens and package them with your change.
+
+    $ bazel build tensorflow/tools/api/tests:api_compatibility_test
+    $ bazel-bin/tensorflow/tools/api/tests/api_compatibility_test \
+          --update_goldens True
+
+You will need an API approval to make changes to the public TensorFlow API. This
+includes additions to the API.
diff --git a/tensorflow/tools/api/tests/api_compatibility_test.py b/tensorflow/tools/api/tests/api_compatibility_test.py
new file mode 100644
index 0000000000..27865fdc89
--- /dev/null
+++ b/tensorflow/tools/api/tests/api_compatibility_test.py
@@ -0,0 +1,238 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ==============================================================================
+"""TensorFlow API compatibility tests.
+
+This test ensures all changes to the public API of TensorFlow are intended.
+
+If this test fails, it means a change has been made to the public API. Backwards
+incompatible changes are not allowed. You can run the test with
+"--update_goldens" flag set to "True" to update goldens when making changes to
+the public TF python API.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import os
+import re
+import sys
+import unittest
+
+import tensorflow as tf
+
+from google.protobuf import text_format
+
+from tensorflow.python.lib.io import file_io
+from tensorflow.python.platform import resource_loader
+from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.tools.api.lib import api_objects_pb2
+from tensorflow.tools.api.lib import python_object_to_proto_visitor
+from tensorflow.tools.common import public_api
+from tensorflow.tools.common import traverse
+
+# FLAGS defined at the bottom:
+FLAGS = None
+# DEFINE_boolean, update_goldens, default False:
+_UPDATE_GOLDENS_HELP = """
+     Update stored golden files if API is updated. WARNING: All API changes
+     have to be authorized by TensorFlow leads.
+"""
+
+# DEFINE_boolean, verbose_diffs, default False:
+_VERBOSE_DIFFS_HELP = """
+     If set to true, print line by line diffs on all libraries. If set to
+     false, only print which libraries have differences.
+"""
+
+_API_GOLDEN_FOLDER = 'tensorflow/tools/api/golden'
+_TEST_README_FILE = 'tensorflow/tools/api/tests/README.txt'
+_UPDATE_WARNING_FILE = 'tensorflow/tools/api/tests/API_UPDATE_WARNING.txt'
+
+
+def _KeyToFilePath(key):
+  """From a given key, construct a filepath."""
+  def _ReplaceCapsWithDash(matchobj):
+    match = matchobj.group(0)
+    return '-%s' % (match.lower())
+
+  case_insensitive_key = re.sub('([A-Z]{1})', _ReplaceCapsWithDash, key)
+  return os.path.join(_API_GOLDEN_FOLDER, '%s.pbtxt' % case_insensitive_key)
+
+
+def _FileNameToKey(filename):
+  """From a given filename, construct a key we use for api objects."""
+  def _ReplaceDashWithCaps(matchobj):
+    match = matchobj.group(0)
+    return match[1].upper()
+
+  base_filename = os.path.basename(filename)
+  base_filename_without_ext = os.path.splitext(base_filename)[0]
+  api_object_key = re.sub(
+      '((-[a-z]){1})', _ReplaceDashWithCaps, base_filename_without_ext)
+  return api_object_key
+
+
+class ApiCompatibilityTest(test.TestCase):
+
+  def __init__(self, *args, **kwargs):
+    super(ApiCompatibilityTest, self).__init__(*args, **kwargs)
+
+    golden_update_warning_filename = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _UPDATE_WARNING_FILE)
+    self._update_golden_warning = file_io.read_file_to_string(
+        golden_update_warning_filename)
+
+    test_readme_filename = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _TEST_README_FILE)
+    self._test_readme_message = file_io.read_file_to_string(
+        test_readme_filename)
+
+  def _AssertProtoDictEquals(self,
+                             expected_dict,
+                             actual_dict,
+                             verbose=False,
+                             update_goldens=False):
+    """Diff given dicts of protobufs and report differences a readable way.
+
+    Args:
+      expected_dict: a dict of TFAPIObject protos constructed from golden
+          files.
+      actual_dict: a ict of TFAPIObject protos constructed by reading from the
+          TF package linked to the test.
+      verbose: Whether to log the full diffs, or simply report which files were
+          different.
+      update_goldens: Whether to update goldens when there are diffs found.
+    """
+    diffs = []
+    verbose_diffs = []
+
+    expected_keys = set(expected_dict.keys())
+    actual_keys = set(actual_dict.keys())
+    only_in_expected = expected_keys - actual_keys
+    only_in_actual = actual_keys - expected_keys
+    all_keys = expected_keys | actual_keys
+
+    # This will be populated below.
+    updated_keys = []
+
+    for key in all_keys:
+      diff_message = ''
+      verbose_diff_message = ''
+      # First check if the key is not found in one or the other.
+      if key in only_in_expected:
+        diff_message = 'Object %s expected but not found (removed).' % key
+        verbose_diff_message = diff_message
+      elif key in only_in_actual:
+        diff_message = 'New object %s found (added).' % key
+        verbose_diff_message = diff_message
+      else:
+        # Now we can run an actual proto diff.
+        try:
+          self.assertProtoEquals(expected_dict[key], actual_dict[key])
+        except AssertionError as e:
+          updated_keys.append(key)
+          diff_message = 'Change detected in python object: %s.' % key
+          verbose_diff_message = str(e)
+
+      # All difference cases covered above. If any difference found, add to the
+      # list.
+      if diff_message:
+        diffs.append(diff_message)
+        verbose_diffs.append(verbose_diff_message)
+
+    # If diffs are found, handle them based on flags.
+    if diffs:
+      diff_count = len(diffs)
+      logging.error(self._test_readme_message)
+      logging.error('%d differences found between API and golden.', diff_count)
+      messages = verbose_diffs if verbose else diffs
+      for i in range(diff_count):
+        logging.error('Issue %d\t: %s', i + 1, messages[i])
+
+      if update_goldens:
+        # Write files if requested.
+        logging.warning(self._update_golden_warning)
+
+        # If the keys are only in expected, some objects are deleted.
+        # Remove files.
+        for key in only_in_expected:
+          filepath = _KeyToFilePath(key)
+          file_io.delete_file(filepath)
+
+        # If the files are only in actual (current library), these are new
+        # modules. Write them to files. Also record all updates in files.
+        for key in only_in_actual | set(updated_keys):
+          filepath = _KeyToFilePath(key)
+          file_io.write_string_to_file(
+              filepath, text_format.MessageToString(actual_dict[key]))
+      else:
+        # Fail if we cannot fix the test by updating goldens.
+        self.fail('%d differences found between API and golden.' % diff_count)
+
+    else:
+      logging.info('No differences found between API and golden.')
+
+  @unittest.skipUnless(
+      sys.version_info.major == 2 and os.uname()[0] == 'Linux',
+      'API compabitility test goldens are generated using python2 on Linux.')
+  def testAPIBackwardsCompatibility(self):
+    # Extract all API stuff.
+    visitor = python_object_to_proto_visitor.PythonObjectToProtoVisitor()
+    traverse.traverse(tf, public_api.PublicAPIVisitor(visitor))
+    proto_dict = visitor.GetProtos()
+
+    # Read all golden files.
+    expression = os.path.join(
+        resource_loader.get_root_dir_with_all_resources(),
+        _KeyToFilePath('*'))
+    golden_file_list = file_io.get_matching_files(expression)
+
+    def _ReadFileToProto(filename):
+      """Read a filename, create a protobuf from its contents."""
+      ret_val = api_objects_pb2.TFAPIObject()
+      text_format.Merge(file_io.read_file_to_string(filename), ret_val)
+      return ret_val
+
+    golden_proto_dict = {
+        _FileNameToKey(filename): _ReadFileToProto(filename)
+        for filename in golden_file_list
+    }
+
+    # Diff them. Do not fail if called with update.
+    # If the test is run to update goldens, only report diffs but do not fail.
+    self._AssertProtoDictEquals(
+        golden_proto_dict,
+        proto_dict,
+        verbose=FLAGS.verbose_diffs,
+        update_goldens=FLAGS.update_goldens)
+
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.add_argument(
+      '--update_goldens', type=bool, default=False, help=_UPDATE_GOLDENS_HELP)
+  parser.add_argument(
+      '--verbose_diffs', type=bool, default=False, help=_VERBOSE_DIFFS_HELP)
+  FLAGS, unparsed = parser.parse_known_args()
+
+  # Now update argv, so that unittest library does not get confused.
+  sys.argv = [sys.argv[0]] + unparsed
+  test.main()
diff --git a/tensorflow/tools/ci_build/pylintrc b/tensorflow/tools/ci_build/pylintrc
index 0779ed91bc..e71017e621 100644
--- a/tensorflow/tools/ci_build/pylintrc
+++ b/tensorflow/tools/ci_build/pylintrc
@@ -38,7 +38,7 @@ enable=indexing-exception,old-raise-syntax
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,no-member,no-name-in-module,import-error,unsubscriptable-object,unbalanced-tuple-unpacking,undefined-variable
+disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,no-member,no-name-in-module,import-error,unsubscriptable-object,unbalanced-tuple-unpacking,undefined-variable,not-context-manager
 
 
 # Set the cache size for astng objects.
@@ -322,4 +322,4 @@ indent-after-paren=4
 [GOOGLE LINES]
 
 # Regexp for a proper copyright notice.
-copyright=Copyright \d{4} The TensorFlow Authors\. +All [Rr]ights [Rr]eserved\.
\ No newline at end of file
+copyright=Copyright \d{4} The TensorFlow Authors\. +All [Rr]ights [Rr]eserved\.
diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 3364ff6bc9..173b39c538 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -48,7 +48,8 @@ class PublicAPIVisitor(object):
           'pywrap_tensorflow',  # TODO(drpng): This can be removed once sealed.
           'user_ops',  # TODO(drpng): This can be removed once sealed.
           'python',
-          'tools'
+          'tools',
+          'tensorboard',
       ],
 
       # Some implementations have this internal module that we shouldn't expose.
diff --git a/tensorflow/tools/docs/BUILD b/tensorflow/tools/docs/BUILD
index b425e93aa1..8e27b133c2 100644
--- a/tensorflow/tools/docs/BUILD
+++ b/tensorflow/tools/docs/BUILD
@@ -99,6 +99,20 @@ py_binary(
     ],
 )
 
+py_test(
+    name = "build_docs_test",
+    size = "small",
+    srcs = ["build_docs_test.py"],
+    data = ["//tensorflow:docs_src"],
+    srcs_version = "PY2AND3",
+    tags = ["manual"],
+    deps = [
+        ":generate_lib",
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/debug:debug_py",
+    ],
+)
+
 py_binary(
     name = "generate_1_0",
     srcs = ["generate_1_0.py"],
diff --git a/tensorflow/tools/docs/build_docs_test.py b/tensorflow/tools/docs/build_docs_test.py
new file mode 100644
index 0000000000..08c27729a7
--- /dev/null
+++ b/tensorflow/tools/docs/build_docs_test.py
@@ -0,0 +1,52 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Run the python doc generator and fail if there are any broken links."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+
+import tensorflow as tf
+from tensorflow.python import debug as tf_debug
+from tensorflow.python.platform import googletest
+from tensorflow.python.platform import resource_loader
+from tensorflow.tools.docs import generate_lib
+
+
+class Flags(object):
+  resource_root = resource_loader.get_root_dir_with_all_resources()
+  src_dir = os.path.join(resource_root, 'third_party/tensorflow/docs_src')
+  base_dir = os.path.join(resource_root, 'third_party/tensorflow/')
+  output_dir = googletest.GetTempDir()
+
+
+class BuildDocsTest(googletest.TestCase):
+
+  def testBuildDocs(self):
+    doc_generator = generate_lib.DocGenerator()
+
+    doc_generator.set_py_modules([('tf', tf), ('tfdbg', tf_debug)])
+    doc_generator.load_contrib()
+
+    status = doc_generator.build(Flags())
+
+    if status:
+      self.fail('Found %s Errors!' % status)
+
+
+if __name__ == '__main__':
+  googletest.main()
-- 
GitLab


From d34efc50167737792b9db6953995727f64bba897 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 12:46:13 -0800
Subject: [PATCH 0265/1563] Updating update_version to update the suffix in
 core.h Change: 152729057

---
 tensorflow/tools/ci_build/update_version.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index 429437f807..e0ca8c3259 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -61,7 +61,9 @@ fi
 MAJOR=$(echo "${NEW_VER}" | cut -d \. -f 1)
 MINOR=$(echo "${NEW_VER}" | cut -d \. -f 2)
 PATCH=$(echo "${NEW_VER}" | cut -d \. -f 3)
+PATCH_NUM=$(echo "$PATCH" | cut -d \- -f 1)
 PIP_PATCH="${PATCH//-}"
+SUFFIX=$(echo $NEW_VER | sed "s/${MAJOR}.${MINOR}.${PATCH%-*}//g")
 
 # Update tensorflow/core/public/version.h
 VERSION_H="${TF_SRC_DIR}/core/public/version.h"
@@ -77,8 +79,8 @@ OLD_PIP_PATCH="${OLD_PATCH//-}"
 
 sed -i -e "s/^#define TF_MAJOR_VERSION ${OLD_MAJOR}/#define TF_MAJOR_VERSION ${MAJOR}/g" ${VERSION_H}
 sed -i -e "s/^#define TF_MINOR_VERSION ${OLD_MINOR}/#define TF_MINOR_VERSION ${MINOR}/g" ${VERSION_H}
-sed -i -e "s/^#define TF_PATCH_VERSION ${OLD_PATCH}/#define TF_PATCH_VERSION ${PATCH}/g" "${VERSION_H}"
-
+sed -i -e "s/^#define TF_PATCH_VERSION ${OLD_PATCH}/#define TF_PATCH_VERSION ${PATCH_NUM}/g" "${VERSION_H}"
+sed -i -e "s/^#define TF_VERSION_SUFFIX \".*\"/#define TF_VERSION_SUFFIX \"${SUFFIX}\"/g" "${VERSION_H}"
 
 # Update setup.py
 SETUP_PY="${TF_SRC_DIR}/tools/pip_package/setup.py"
-- 
GitLab


From a99694277e33fe8e64fb1a87522704f263a6fb5a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 12:56:55 -0800
Subject: [PATCH 0266/1563] Support partitioned bias variable in
 sampled_softmax_loss. Change: 152730499

---
 tensorflow/python/BUILD          |  4 ++
 tensorflow/python/ops/nn_impl.py |  6 ++-
 tensorflow/python/ops/nn_test.py | 84 +++++++++++++++++++++-----------
 3 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 4f7d259045..a62bde0fcd 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -1555,6 +1555,7 @@ py_library(
         ":rnn",
         ":sparse_ops",
         ":util",
+        ":variables",
     ],
 )
 
@@ -2204,6 +2205,9 @@ cuda_py_test(
         ":nn",
         ":nn_grad",
         ":nn_ops",
+        ":partitioned_variables",
+        ":variable_scope",
+        ":variables",
         "//third_party/py/numpy",
     ],
 )
diff --git a/tensorflow/python/ops/nn_impl.py b/tensorflow/python/ops/nn_impl.py
index dc044a2921..118ade45ec 100644
--- a/tensorflow/python/ops/nn_impl.py
+++ b/tensorflow/python/ops/nn_impl.py
@@ -920,7 +920,8 @@ def _compute_sampled_logits(weights,
     weights: A `Tensor` of shape `[num_classes, dim]`, or a list of `Tensor`
         objects whose concatenation along dimension 0 has shape
         `[num_classes, dim]`.  The (possibly-partitioned) class embeddings.
-    biases: A `Tensor` of shape `[num_classes]`.  The class biases.
+    biases: A `Tensor` of shape `[num_classes]`.  The (possibly-partitioned)
+        class biases.
     labels: A `Tensor` of type `int64` and shape `[batch_size,
         num_true]`. The target classes.  Note that this format differs from
         the `labels` argument of `nn.softmax_cross_entropy_with_logits`.
@@ -985,7 +986,8 @@ def _compute_sampled_logits(weights,
     # weights shape is [num_classes, dim]
     all_w = embedding_ops.embedding_lookup(
         weights, all_ids, partition_strategy=partition_strategy)
-    all_b = embedding_ops.embedding_lookup(biases, all_ids)
+    all_b = embedding_ops.embedding_lookup(
+        biases, all_ids, partition_strategy=partition_strategy)
     # true_w shape is [batch_size * num_true, dim]
     # true_b is a [batch_size * num_true] tensor
     true_w = array_ops.slice(
diff --git a/tensorflow/python/ops/nn_test.py b/tensorflow/python/ops/nn_test.py
index fdb036ebfd..5cf8c3291c 100644
--- a/tensorflow/python/ops/nn_test.py
+++ b/tensorflow/python/ops/nn_test.py
@@ -30,6 +30,9 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import nn_impl
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import partitioned_variables
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import variables
 import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
 from tensorflow.python.ops.nn_impl import _compute_sampled_logits
 from tensorflow.python.platform import test as test_lib
@@ -412,13 +415,25 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
     biases = np.random.randn(self._num_classes).astype(np.float32)
     hidden_acts = np.random.randn(self._batch_size,
                                   self._dim).astype(np.float32)
-    sharded_weights = [
-        weights[[
-            row for row in range(self._num_classes)
-            if row % self._num_shards == shard
-        ]] for shard in range(self._num_shards)
-    ]
-    return weights, biases, hidden_acts, sharded_weights
+
+    with ops.Graph().as_default() as g:
+      sharded_weights = variable_scope.get_variable(
+          "w",
+          partitioner=partitioned_variables.fixed_size_partitioner(
+              self._num_shards),
+          initializer=constant_op.constant(weights))
+      sharded_biases = variable_scope.get_variable(
+          "b",
+          partitioner=partitioned_variables.fixed_size_partitioner(
+              self._num_shards),
+          initializer=constant_op.constant(biases))
+      with self.test_session(graph=g) as sess:
+        variables.global_variables_initializer().run()
+
+        sharded_weights_v, sharded_biases_v = sess.run(
+            [list(sharded_weights), list(sharded_biases)])
+
+    return weights, biases, hidden_acts, sharded_weights_v, sharded_biases_v
 
   def _ComputeSampledLogitsNP(self,
                               true_w,
@@ -466,7 +481,10 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
       weights_tf = [constant_op.constant(shard) for shard in weights]
     else:
       weights_tf = constant_op.constant(weights)
-    biases_tf = constant_op.constant(biases)
+    if isinstance(biases, list):
+      biases_tf = [constant_op.constant(shard) for shard in biases]
+    else:
+      biases_tf = constant_op.constant(biases)
     hidden_acts_tf = constant_op.constant(
         hidden_acts, shape=(self._batch_size, self._dim))
     labels_tf = constant_op.constant(
@@ -483,12 +501,13 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
         sampled_vals,
         subtract_log_q=subtract_log_q,
         remove_accidental_hits=remove_accidental_hits,
-        name=name)
+        name=name,
+        partition_strategy="div")
     return pred_logits_tf, pred_labels_tf
 
   def testComputeSampledLogitsShapes(self):
     # We just check that the shapes of the returned values are correct.
-    weights, biases, hidden_acts, _ = self._GenerateTestInputs()
+    weights, biases, hidden_acts, _, _ = self._GenerateTestInputs()
     sampled = [1, 0, 2, 3]
     num_sampled = len(sampled)
     true_exp = sampled_exp = [1., 1., 1., 1.]
@@ -529,7 +548,8 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
 
   def testComputeSampledLogitsValues(self):
     # Here we check the actual numerics.
-    weights, biases, hidden_acts, sharded_weights = self._GenerateTestInputs()
+    weights, biases, hidden_acts, sharded_weights, sharded_biases = (
+        self._GenerateTestInputs())
     eps = 1e-3
     sampled = [1, 0, 2, 3]
     num_sampled = len(sampled)
@@ -627,7 +647,7 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
         self.assertAllClose(logits_np, logits_tf_val, eps)
         self.assertAllClose(labels_np, labels_tf_val, eps)
 
-        # Test 4: Test 1, with sharded weights
+        # Test 4: Test 1, with sharded weights and sharded biases.
         logits_np, labels_np = self._ComputeSampledLogitsNP(
             true_w,
             true_b,
@@ -637,7 +657,7 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
             num_true=num_true_test)
         logits_tf, labels_tf = self._ComputeSampledLogitsTF(
             sharded_weights,
-            biases,
+            sharded_biases,
             hidden_acts,
             labels,
             num_sampled,
@@ -663,7 +683,8 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
       pred = np.minimum(np.maximum(pred, eps), 1 - eps)
       return -targets * np.log(pred) - (1. - targets) * np.log(1. - pred)
 
-    weights, biases, hidden_acts, sharded_weights = self._GenerateTestInputs()
+    weights, biases, hidden_acts, sharded_weights, sharded_biases = (
+        self._GenerateTestInputs())
     labels = [0, 1, 2]
     true_w, true_b = weights[labels], biases[labels]
     sampled = [1, 0, 2, 3]
@@ -697,23 +718,25 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
           biases_tf,
           labels_tf,
           inputs_tf,
-          num_sampled=1,
+          num_sampled=num_sampled,
           num_classes=self._num_classes,
           num_true=1,
-          sampled_values=test_sampled_vals)
+          sampled_values=test_sampled_vals,
+          partition_strategy="div")
 
       self.assertAllClose(nce_loss_np, nce_loss_tf.eval(), 1e-4)
 
-      # Test with sharded weights
+      # Test with sharded weights and sharded biases.
       nce_loss_tf = nn_impl.nce_loss(
-          [constant_op.constant(shard) for shard in sharded_weights],
-          biases_tf,
+          sharded_weights,
+          sharded_biases,
           labels_tf,
           inputs_tf,
-          num_sampled=1,
+          num_sampled=num_sampled,
           num_classes=self._num_classes,
           num_true=1,
-          sampled_values=test_sampled_vals)
+          sampled_values=test_sampled_vals,
+          partition_strategy="div")
 
       self.assertAllClose(nce_loss_np, nce_loss_tf.eval(), 1e-4)
 
@@ -728,7 +751,8 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
       pred = stable_exp_logits / np.sum(stable_exp_logits, 1, keepdims=True)
       return -np.sum(targets * np.log(pred + 1.0e-20), axis=1)
 
-    weights, biases, hidden_acts, sharded_weights = self._GenerateTestInputs()
+    weights, biases, hidden_acts, sharded_weights, sharded_biases = (
+        self._GenerateTestInputs())
     labels = [0, 1, 2]
     true_w, true_b = weights[labels], biases[labels]
     sampled = [1, 0, 2, 3]
@@ -760,26 +784,28 @@ class ComputeSampledLogitsTest(test_lib.TestCase):
           biases=biases_tf,
           labels=labels_tf,
           inputs=inputs_tf,
-          num_sampled=1,
+          num_sampled=num_sampled,
           num_classes=self._num_classes,
           num_true=1,
           sampled_values=test_sampled_vals,
-          remove_accidental_hits=False)
+          remove_accidental_hits=False,
+          partition_strategy="div")
 
       self.assertAllClose(sampled_softmax_loss_np,
                           sampled_softmax_loss_tf.eval(), 1e-4)
 
-      # Test with sharded weights
+      # Test with sharded weights and sharded biases.
       sampled_softmax_loss_tf = nn_impl.sampled_softmax_loss(
-          weights=[constant_op.constant(shard) for shard in sharded_weights],
-          biases=biases_tf,
+          weights=sharded_weights,
+          biases=sharded_biases,
           labels=labels_tf,
           inputs=inputs_tf,
-          num_sampled=1,
+          num_sampled=num_sampled,
           num_classes=self._num_classes,
           num_true=1,
           sampled_values=test_sampled_vals,
-          remove_accidental_hits=False)
+          remove_accidental_hits=False,
+          partition_strategy="div")
 
       self.assertAllClose(sampled_softmax_loss_np,
                           sampled_softmax_loss_tf.eval(), 1e-4)
-- 
GitLab


From fba114e13dbb8d93c1ed10f50c8a6da5fefecf4b Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Mon, 10 Apr 2017 12:58:51 -0800
Subject: [PATCH 0267/1563] [TF:XLA] Don't clear the device name on nodes in
 graph_to_functiondef.cc. Change: 152730792

---
 tensorflow/compiler/jit/graph_to_functiondef.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tensorflow/compiler/jit/graph_to_functiondef.cc b/tensorflow/compiler/jit/graph_to_functiondef.cc
index ce943471fb..88e292a2c1 100644
--- a/tensorflow/compiler/jit/graph_to_functiondef.cc
+++ b/tensorflow/compiler/jit/graph_to_functiondef.cc
@@ -163,7 +163,6 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     NodeDef* node_def = fdef->add_node_def();
     node_def->CopyFrom(node->def());
     node_def->set_name(node_names.Uniquify(node->name()));
-    node_def->clear_device();
 
     // Reset input names based on graph rather than the NodeDef.
     node_def->clear_input();
-- 
GitLab


From 8940a4926befaadb5a8cc6a206828ce132952b02 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 13:05:34 -0800
Subject: [PATCH 0268/1563] Choosing a saner default for min_eval_frequency in
 the constructor for Experiment for the GCS file system, because the default
 of 1 causes performance problems. Change: 152731761

---
 .../contrib/learn/python/learn/experiment.py  | 15 +++++++++--
 .../learn/python/learn/experiment_test.py     | 25 +++++++++++++++++++
 .../learn/python/learn/learn_runner_test.py   |  5 ++--
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index 4f7c72c9dd..c363a1c947 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -76,7 +76,7 @@ class Experiment(object):
                local_eval_frequency=None,
                eval_delay_secs=120,
                continuous_eval_throttle_secs=60,
-               min_eval_frequency=1,
+               min_eval_frequency=None,
                delay_workers_by_global_step=False,
                export_strategies=None,
                train_steps_per_iteration=None):
@@ -116,6 +116,8 @@ class Experiment(object):
       min_eval_frequency: (applies only to train_and_evaluate). the minimum
         number of steps between evaluations. Of course, evaluation does not
         occur if no new snapshot is available, hence, this is the minimum.
+        If None, defaults to 1, unless model_dir is on GCS, in which case the
+        default is 1000.
       delay_workers_by_global_step: if `True` delays training workers
         based on global step instead of time.
       export_strategies: Iterable of `ExportStrategy`s, or a single one, or
@@ -157,7 +159,12 @@ class Experiment(object):
     self._local_eval_frequency = local_eval_frequency
     self._eval_delay_secs = eval_delay_secs
     self._continuous_eval_throttle_secs = continuous_eval_throttle_secs
-    self._min_eval_frequency = min_eval_frequency
+    # Using 1 on a non-cached file system requires a lot of overhead to
+    # read the checkpoint state file. This is particular bad on GCS, so
+    # we use a different default. This is a temporary band-aid, to be
+    # fixed holistically later (b/36498507).
+    default_min_eval_frequency = 1000 if _is_gcs(estimator.model_dir) else 1
+    self._min_eval_frequency = min_eval_frequency or default_min_eval_frequency
     self._delay_workers_by_global_step = delay_workers_by_global_step
     self._train_monitors = train_monitors[:] if train_monitors else []
     self._eval_hooks = eval_hooks[:] if eval_hooks else []
@@ -699,3 +706,7 @@ def _new_attr_context(obj, attr):
     yield
   finally:
     setattr(obj, attr, saved)
+
+
+def _is_gcs(model_dir):
+  return model_dir and model_dir.startswith("gs://")
diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index f9f95f8e67..c8ad58336b 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -565,6 +565,31 @@ class ExperimentTest(test.TestCase):
       self.assertEqual([noop_hook], est.eval_hooks)
       self.assertTrue(isinstance(est.monitors[0], monitors.ValidationMonitor))
 
+  def test_min_eval_frequency_defaults(self):
+    def dummy_model_fn(features, labels):  # pylint: disable=unused-argument
+      pass
+
+    # The default value when model_dir is on GCS is 1000
+    estimator = core_estimator.Estimator(dummy_model_fn, 'gs://dummy_bucket')
+    ex = experiment.Experiment(
+        estimator, train_input_fn=None, eval_input_fn=None)
+    self.assertEquals(ex._min_eval_frequency, 1000)
+
+    # The default value when model_dir is not on GCS is 1
+    estimator = core_estimator.Estimator(dummy_model_fn, '/tmp/dummy')
+    ex = experiment.Experiment(
+        estimator, train_input_fn=None, eval_input_fn=None)
+    self.assertEquals(ex._min_eval_frequency, 1)
+
+    # Make sure default not used when explicitly set
+    estimator = core_estimator.Estimator(dummy_model_fn, 'gs://dummy_bucket')
+    ex = experiment.Experiment(
+        estimator,
+        min_eval_frequency=123,
+        train_input_fn=None,
+        eval_input_fn=None)
+    self.assertEquals(ex._min_eval_frequency, 123)
+
   def test_continuous_train_and_eval(self):
     for est in self._estimators_for_tests(eval_dict={'global_step': 100}):
       eval_metrics = 'eval_metrics' if not isinstance(
diff --git a/tensorflow/contrib/learn/python/learn/learn_runner_test.py b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
index 1afd6a5c82..400ea5e9e0 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
@@ -35,15 +35,16 @@ patch = test.mock.patch
 
 class TestExperiment(experiment.Experiment):
 
-  def __init__(self, default=None, config=None):
+  def __init__(self, default=None, config=None, model_dir=None):
     self.default = default
     self.config = config
 
     class Estimator(evaluable.Evaluable, trainable.Trainable):
       config = self.config
 
+      @property
       def model_dir(self):
-        raise NotImplementedError
+        return model_dir
 
       def fit(self, x=None, y=None, input_fn=None, steps=None, batch_size=None,
               monitors=None, max_steps=None):
-- 
GitLab


From 3dc4907a0d7ae113547fcf716f618e3c8e1b9c77 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Mon, 10 Apr 2017 13:13:45 -0800
Subject: [PATCH 0269/1563] Fix mac protobuf links.

Fixes #9089
Change: 152732901
---
 tensorflow/docs_src/install/install_mac.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index c989b31ca4..ccfe9ada6d 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -659,12 +659,12 @@ the custom binary protobuf pip package, invoke one of the following commands:
   * for Python 2.7:
 
     <pre>$ <b>pip install --upgrade \
-    https://storage.googleapis.com/tensorflow/linux/cpu/protobuf-3.1.0-cp27-none-linux_x86_64.whl</b></pre>
+    https://storage.googleapis.com/tensorflow/mac/cpu/protobuf-3.1.0-cp27-none-macosx_10_11_x86_64.whl</b></pre>
 
   * for Python 3.n:
 
     <pre>$ <b>pip3 install --upgrade \
-    https://storage.googleapis.com/tensorflow/linux/cpu/protobuf-3.1.0-cp35-none-linux_x86_64.whl</b> </pre>
+    https://storage.googleapis.com/tensorflow/mac/cpu/protobuf-3.1.0-cp35-none-macosx_10_11_x86_64.whl</b></pre>
 
 Installing this protobuf package will overwrite the existing protobuf package.
 Note that the binary pip package already has support for protobufs
-- 
GitLab


From 1792a0af641f15c9442a5d461a34dd9bc8bd8616 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Mon, 10 Apr 2017 13:18:36 -0800
Subject: [PATCH 0270/1563] xla: Add filename to failure message in
 LoadIRModule

Will help with issues like #8947
Change: 152733558
---
 tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/utils.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/utils.cc b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/utils.cc
index c10346bbc2..72f6cfd2d6 100644
--- a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/utils.cc
+++ b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/utils.cc
@@ -28,7 +28,8 @@ limitations under the License.
 namespace {
 
 static void DieWithSMDiagnosticError(llvm::SMDiagnostic* diagnostic) {
-  LOG(FATAL) << diagnostic->getLineNo() << ":" << diagnostic->getColumnNo()
+  LOG(FATAL) << diagnostic->getFilename().str() << ":"
+             << diagnostic->getLineNo() << ":" << diagnostic->getColumnNo()
              << ": " << diagnostic->getMessage().str();
 }
 
-- 
GitLab


From ecb5266e4791639781e4789a91cca8d3e00c4da7 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 10 Apr 2017 13:20:12 -0800
Subject: [PATCH 0271/1563] tfdbg core: allow gRPC debug server to remotely
 disable/enable debug ops

Synopsis of changes:
* The EventReply protobuf is expanded: a new field called "debug_op_state_change" is added to allow the debug server to remotely enable and disable debug ops.

* At the end of every debug gRPC stream, the server sends all the queued EventReply protos to the client. The client (i.e., the debugged TF runtime) receives them and toggle the enabled status of the debug ops accordingly.

* Added gated_grpc attribute to existing debug ops. This new boolean attribute is set to False by default, ensuring backward compatibility in behavior. If set to True, the debug ops will send the output tensors through grpc:// streams if and only if they are currently enabled. Otherwise we say that the debug op is "gated off" at the grpc:// URL.

* If a debug op is gated off at all URLs it possesses, it will perform no expensive computation and instead just emit an empty (size {0}) output tensor.

Other detailed change descriptions:
* All debug ops now share the same base class "BaseDebugOp" to reduce the amount of boilerplate, which has grown in size due to the new gRPC gating logic.
Change: 152733779
---
 tensorflow/core/debug/BUILD                   |  15 --
 tensorflow/core/debug/debug_graph_utils.h     |   2 +-
 tensorflow/core/debug/debug_grpc_testlib.cc   |  94 +++++----
 tensorflow/core/debug/debug_grpc_testlib.h    |  47 +++--
 tensorflow/core/debug/debug_io_utils.cc       | 194 +++++++++++++++---
 tensorflow/core/debug/debug_io_utils.h        |  96 ++++++++-
 tensorflow/core/debug/debug_service.proto     |  13 ++
 .../core/debug/debug_test_server_main.cc      |  49 -----
 tensorflow/core/kernels/BUILD                 |   1 +
 tensorflow/core/kernels/debug_ops.h           | 139 ++++++++-----
 tensorflow/core/kernels/debug_ops_test.cc     |  50 ++++-
 tensorflow/core/ops/debug_ops.cc              |  25 ++-
 12 files changed, 508 insertions(+), 217 deletions(-)
 delete mode 100644 tensorflow/core/debug/debug_test_server_main.cc

diff --git a/tensorflow/core/debug/BUILD b/tensorflow/core/debug/BUILD
index 65cbd14f14..372ddb168a 100644
--- a/tensorflow/core/debug/BUILD
+++ b/tensorflow/core/debug/BUILD
@@ -140,21 +140,6 @@ tf_cuda_library(
     alwayslink = 1,
 )
 
-cc_binary(
-    name = "debug_test_server_main",
-    srcs = [
-        "debug_test_server_main.cc",
-    ],
-    deps = [
-        ":debug_grpc_testlib",
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-        "@grpc//:grpc++_unsecure",
-    ],
-)
-
 # TODO(cais): Fix flakiness on GPU and change this back to a tf_cc_test_gpu.
 #   See b/34081273.
 tf_cc_test(
diff --git a/tensorflow/core/debug/debug_graph_utils.h b/tensorflow/core/debug/debug_graph_utils.h
index 23bf0afc1a..5cfe95c12b 100644
--- a/tensorflow/core/debug/debug_graph_utils.h
+++ b/tensorflow/core/debug/debug_graph_utils.h
@@ -52,7 +52,7 @@ class DebuggerState : public DebuggerStateInterface {
                               const int64 executor_step_count,
                               const std::vector<string>& input_names,
                               const std::vector<string>& output_names,
-                              const std::vector<string>& target_names);
+                              const std::vector<string>& target_names) override;
 
  private:
   std::unordered_set<string> debug_urls_;
diff --git a/tensorflow/core/debug/debug_grpc_testlib.cc b/tensorflow/core/debug/debug_grpc_testlib.cc
index 15ad081996..e746192a55 100644
--- a/tensorflow/core/debug/debug_grpc_testlib.cc
+++ b/tensorflow/core/debug/debug_grpc_testlib.cc
@@ -49,57 +49,71 @@ namespace test {
       return ::grpc::Status::CANCELLED;
     }
 
-    string dump_path;
-    DebugFileIO::DumpTensorToDir(node_name, output_slot, debug_op, tensor,
-                                 event.wall_time(), dump_root, &dump_path)
-        .IgnoreError();
+    node_names.push_back(node_name);
+    output_slots.push_back(output_slot);
+    debug_ops.push_back(debug_op);
+    debug_tensors.push_back(tensor);
+  }
+
+  {
+    mutex_lock l(changes_mu_);
+    for (size_t i = 0; i < changes_to_enable_.size(); ++i) {
+      EventReply event_reply;
+      EventReply::DebugOpStateChange* change =
+          event_reply.add_debug_op_state_changes();
+      change->set_change(changes_to_enable_[i]
+                             ? EventReply::DebugOpStateChange::ENABLE
+                             : EventReply::DebugOpStateChange::DISABLE);
+      change->set_node_name(changes_node_names_[i]);
+      change->set_output_slot(changes_output_slots_[i]);
+      change->set_debug_op(changes_debug_ops_[i]);
+      stream->Write(event_reply);
+    }
+    changes_to_enable_.clear();
+    changes_node_names_.clear();
+    changes_output_slots_.clear();
+    changes_debug_ops_.clear();
   }
 
   return ::grpc::Status::OK;
 }
 
-GrpcTestServerClientPair::GrpcTestServerClientPair(const int server_port)
-    : server_port(server_port) {
-  const int kTensorSize = 2;
-  prep_tensor_.reset(
-      new Tensor(DT_FLOAT, TensorShape({kTensorSize, kTensorSize})));
-  for (int i = 0; i < kTensorSize * kTensorSize; ++i) {
-    prep_tensor_->flat<float>()(i) = static_cast<float>(i);
-  }
+void TestEventListenerImpl::ClearReceivedDebugData() {
+  node_names.clear();
+  output_slots.clear();
+  debug_ops.clear();
+  debug_tensors.clear();
+}
 
-  // Obtain server's gRPC url.
-  test_server_url = strings::StrCat("grpc://localhost:", server_port);
+void TestEventListenerImpl::RequestDebugOpStateChangeAtNextStream(
+    bool to_enable, const string& node_name, const int32 output_slot,
+    const string& debug_op) {
+  mutex_lock l(changes_mu_);
 
-  // Obtain dump directory for the stream server.
-  string tmp_dir = port::Tracing::LogDir();
-  dump_root =
-      io::JoinPath(tmp_dir, strings::StrCat("tfdbg_dump_port", server_port, "_",
-                                            Env::Default()->NowMicros()));
+  changes_to_enable_.push_back(to_enable);
+  changes_node_names_.push_back(node_name);
+  changes_output_slots_.push_back(output_slot);
+  changes_debug_ops_.push_back(debug_op);
 }
 
-bool GrpcTestServerClientPair::PollTillFirstRequestSucceeds() {
-  const std::vector<string> urls({test_server_url});
-  int n_attempts = 0;
-  bool success = false;
-
-  // Try a number of times to send the Event proto to the server, as it may
-  // take the server a few seconds to start up and become responsive.
-  while (n_attempts++ < kMaxAttempts) {
-    const uint64 wall_time = Env::Default()->NowMicros();
-
-    Status publish_s = DebugIO::PublishDebugTensor(
-        "prep_node:0", "DebugIdentity", *prep_tensor_, wall_time, urls);
-    Status close_s = DebugIO::CloseDebugURL(test_server_url);
-
-    if (publish_s.ok() && close_s.ok()) {
-      success = true;
-      break;
-    } else {
-      Env::Default()->SleepForMicroseconds(kSleepDurationMicros);
-    }
+void TestEventListenerImpl::RunServer(const int server_port) {
+  ::grpc::ServerBuilder builder;
+  builder.AddListeningPort(strings::StrCat("localhost:", server_port),
+                           ::grpc::InsecureServerCredentials());
+  builder.RegisterService(this);
+  std::unique_ptr<::grpc::Server> server = builder.BuildAndStart();
+
+  while (!stop_requested_.load()) {
+    Env::Default()->SleepForMicroseconds(200 * 1000);
   }
+  server->Shutdown();
+  stopped_.store(true);
+}
 
-  return success;
+void TestEventListenerImpl::StopServer() {
+  stop_requested_.store(true);
+  while (!stopped_.load()) {
+  }
 }
 
 }  // namespace test
diff --git a/tensorflow/core/debug/debug_grpc_testlib.h b/tensorflow/core/debug/debug_grpc_testlib.h
index 0e7a78e385..ee9b3bdec6 100644
--- a/tensorflow/core/debug/debug_grpc_testlib.h
+++ b/tensorflow/core/debug/debug_grpc_testlib.h
@@ -16,9 +16,12 @@ limitations under the License.
 #ifndef TENSORFLOW_DEBUG_GRPC_TESTLIB_H_
 #define TENSORFLOW_DEBUG_GRPC_TESTLIB_H_
 
+#include <atomic>
+
 #include "grpc++/grpc++.h"
 #include "tensorflow/core/debug/debug_service.grpc.pb.h"
 #include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/platform/mutex.h"
 
 namespace tensorflow {
 
@@ -26,39 +29,39 @@ namespace test {
 
 class TestEventListenerImpl final : public EventListener::Service {
  public:
-  TestEventListenerImpl(const string& dump_root) : dump_root(dump_root) {}
+  TestEventListenerImpl() : stop_requested_(false), stopped_(false) {}
+
+  void RunServer(const int server_port);
+  void StopServer();
 
   ::grpc::Status SendEvents(
       ::grpc::ServerContext* context,
       ::grpc::ServerReaderWriter< ::tensorflow::EventReply,
                                   ::tensorflow::Event>* stream);
 
-  string dump_root;
-};
+  // Clear debug data (e.g., Tensors) received so far.
+  void ClearReceivedDebugData();
 
-class GrpcTestServerClientPair {
- public:
-  GrpcTestServerClientPair(const int server_port);
-  virtual ~GrpcTestServerClientPair() {}
+  void RequestDebugOpStateChangeAtNextStream(bool to_enable,
+                                             const string& node_name,
+                                             const int32 output_slot,
+                                             const string& debug_op);
 
-  // Keep sending requests to the test server until the first success.
-  // This is necessary because the server may take a certain amount of time
-  // to start up and become responsive.
-  //
-  // Returns: A boolean indicating whether a successful response is obtained
-  //   within the limit of maximum number of attempts.
-  bool PollTillFirstRequestSucceeds();
-
-  string dump_root;
-
-  int server_port;
-  string test_server_url;
+  std::vector<string> node_names;
+  std::vector<int32> output_slots;
+  std::vector<string> debug_ops;
+  std::vector<Tensor> debug_tensors;
 
  private:
-  std::unique_ptr<Tensor> prep_tensor_;
+  std::atomic_bool stop_requested_;
+  std::atomic_bool stopped_;
+
+  std::vector<bool> changes_to_enable_ GUARDED_BY(changes_mu_);
+  std::vector<string> changes_node_names_ GUARDED_BY(changes_mu_);
+  std::vector<int32> changes_output_slots_ GUARDED_BY(changes_mu_);
+  std::vector<string> changes_debug_ops_ GUARDED_BY(changes_mu_);
 
-  const int kMaxAttempts = 100;
-  const int kSleepDurationMicros = 100 * 1000;
+  mutex changes_mu_;
 };
 
 }  // namespace test
diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc
index da68d1c247..aa14065657 100644
--- a/tensorflow/core/debug/debug_io_utils.cc
+++ b/tensorflow/core/debug/debug_io_utils.cc
@@ -210,7 +210,8 @@ Status DebugIO::PublishDebugMetadata(
 Status DebugIO::PublishDebugTensor(const string& tensor_name,
                                    const string& debug_op, const Tensor& tensor,
                                    const uint64 wall_time_us,
-                                   const gtl::ArraySlice<string>& debug_urls) {
+                                   const gtl::ArraySlice<string>& debug_urls,
+                                   const bool gated_grpc) {
   // Split the tensor_name into node name and output slot index.
   std::vector<string> name_items = str_util::Split(tensor_name, ':');
   string node_name;
@@ -246,7 +247,8 @@ Status DebugIO::PublishDebugTensor(const string& tensor_name,
     } else if (str_util::Lowercase(url).find(kGrpcURLScheme) == 0) {
 #if defined(PLATFORM_GOOGLE)
       Status s = DebugGrpcIO::SendTensorThroughGrpcStream(
-          node_name, output_slot, debug_op, tensor, wall_time_us, url);
+          node_name, output_slot, debug_op, tensor, wall_time_us, url,
+          gated_grpc);
 
       if (!s.ok()) {
         num_failed_urls++;
@@ -276,6 +278,15 @@ Status DebugIO::PublishDebugTensor(const string& tensor_name,
   }
 }
 
+// static
+Status DebugIO::PublishDebugTensor(const string& tensor_name,
+                                   const string& debug_op, const Tensor& tensor,
+                                   const uint64 wall_time_us,
+                                   const gtl::ArraySlice<string>& debug_urls) {
+  return PublishDebugTensor(tensor_name, debug_op, tensor, wall_time_us,
+                            debug_urls, false);
+}
+
 // static
 Status DebugIO::PublishGraph(const Graph& graph,
                              const std::unordered_set<string>& debug_urls) {
@@ -311,6 +322,39 @@ Status DebugIO::PublishGraph(const Graph& graph,
   return status;
 }
 
+// static
+bool DebugIO::IsDebugNodeGateOpen(const string& watch_key,
+                                  const std::vector<string>& debug_urls) {
+#if defined(PLATFORM_GOOGLE)
+  for (const string& debug_url : debug_urls) {
+    if (debug_url.find(DebugIO::kGrpcURLScheme) != 0) {
+      return true;
+    } else {
+      if (DebugGrpcIO::IsGateOpen(watch_key, debug_url)) {
+        return true;
+      }
+    }
+  }
+  return false;
+#else
+  return true;
+#endif
+}
+
+// static
+bool DebugIO::IsDebugURLGateOpen(const string& watch_key,
+                                 const string& debug_url) {
+#if defined(PLATFORM_GOOGLE)
+  if (debug_url.find(kGrpcURLScheme) != 0) {
+    return true;
+  } else {
+    return DebugGrpcIO::IsGateOpen(watch_key, debug_url);
+  }
+#else
+  return true;
+#endif
+}
+
 // static
 Status DebugIO::CloseDebugURL(const string& debug_url) {
   if (debug_url.find(DebugIO::kGrpcURLScheme) == 0) {
@@ -430,7 +474,8 @@ Status DebugFileIO::RecursiveCreateDir(Env* env, const string& dir) {
 
 #if defined(PLATFORM_GOOGLE)
 DebugGrpcChannel::DebugGrpcChannel(const string& server_stream_addr)
-    : ctx_(),
+    : url_(strings::StrCat(DebugIO::kGrpcURLScheme, server_stream_addr)),
+      ctx_(),
       channel_(::grpc::CreateCustomChannel(server_stream_addr,
                                            ::grpc::InsecureChannelCredentials(),
                                            ::grpc::ChannelArguments())),
@@ -449,10 +494,29 @@ bool DebugGrpcChannel::WriteEvent(const Event& event) {
   return reader_writer_->Write(event);
 }
 
-Status DebugGrpcChannel::Close() {
+Status DebugGrpcChannel::ReceiveServerRepliesAndClose() {
   mutex_lock l(mu_);
 
   reader_writer_->WritesDone();
+
+  // Read all EventReply messages (if any) from the server.
+  EventReply event_reply;
+  while (reader_writer_->Read(&event_reply)) {
+    for (const EventReply::DebugOpStateChange& debug_op_state_change :
+         event_reply.debug_op_state_changes()) {
+      string watch_key = strings::StrCat(debug_op_state_change.node_name(), ":",
+                                         debug_op_state_change.output_slot(),
+                                         ":", debug_op_state_change.debug_op());
+      if (debug_op_state_change.change() ==
+          EventReply::DebugOpStateChange::ENABLE) {
+        DebugGrpcIO::EnableWatchKey(url_, watch_key);
+      } else if (debug_op_state_change.change() ==
+                 EventReply::DebugOpStateChange::DISABLE) {
+        DebugGrpcIO::DisableWatchKey(url_, watch_key);
+      }
+    }
+  }
+
   if (reader_writer_->Finish().ok()) {
     return Status::OK();
   } else {
@@ -463,22 +527,31 @@ Status DebugGrpcChannel::Close() {
 
 // static
 mutex DebugGrpcIO::streams_mu;
-std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>
-    DebugGrpcIO::stream_channels;
-
-// static
-Status DebugGrpcIO::SendTensorThroughGrpcStream(const string& node_name,
-                                                const int32 output_slot,
-                                                const string& debug_op,
-                                                const Tensor& tensor,
-                                                const uint64 wall_time_us,
-                                                const string& grpc_stream_url) {
-  const string tensor_name = strings::StrCat(node_name, ":", output_slot);
 
-  // Prepare tensor Event data to be sent.
-  Event event = WrapTensorAsEvent(tensor_name, debug_op, tensor, wall_time_us);
+// Static
+std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>*
+DebugGrpcIO::GetStreamChannels() {
+  static std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>*
+      stream_channels =
+          new std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>();
+  return stream_channels;
+}
 
-  return SendEventProtoThroughGrpcStream(event, grpc_stream_url);
+// static
+Status DebugGrpcIO::SendTensorThroughGrpcStream(
+    const string& node_name, const int32 output_slot, const string& debug_op,
+    const Tensor& tensor, const uint64 wall_time_us,
+    const string& grpc_stream_url, const bool gated) {
+  if (gated &&
+      !IsGateOpen(strings::StrCat(node_name, ":", output_slot, ":", debug_op),
+                  grpc_stream_url)) {
+    return Status::OK();
+  } else {
+    const string tensor_name = strings::StrCat(node_name, ":", output_slot);
+    return SendEventProtoThroughGrpcStream(
+        WrapTensorAsEvent(tensor_name, debug_op, tensor, wall_time_us),
+        grpc_stream_url);
+  }
 }
 
 // static
@@ -492,7 +565,9 @@ Status DebugGrpcIO::SendEventProtoThroughGrpcStream(
   std::shared_ptr<DebugGrpcChannel> debug_grpc_channel;
   {
     mutex_lock l(streams_mu);
-    if (stream_channels.find(grpc_stream_url) == stream_channels.end()) {
+    std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>*
+        stream_channels = GetStreamChannels();
+    if (stream_channels->find(grpc_stream_url) == stream_channels->end()) {
       debug_grpc_channel.reset(new DebugGrpcChannel(server_stream_addr));
 
       if (!debug_grpc_channel->is_channel_ready()) {
@@ -501,9 +576,10 @@ Status DebugGrpcIO::SendEventProtoThroughGrpcStream(
                             "not ready: ", grpc_stream_url));
       }
 
-      stream_channels[grpc_stream_url] = debug_grpc_channel;
+      (*stream_channels)[grpc_stream_url] = debug_grpc_channel;
+      CreateEmptyEnabledSet(grpc_stream_url);
     } else {
-      debug_grpc_channel = stream_channels[grpc_stream_url];
+      debug_grpc_channel = (*stream_channels)[grpc_stream_url];
     }
   }
 
@@ -516,21 +592,91 @@ Status DebugGrpcIO::SendEventProtoThroughGrpcStream(
   return Status::OK();
 }
 
+// static
+bool DebugGrpcIO::IsGateOpen(const string& watch_key,
+                             const string& grpc_debug_url) {
+  std::unordered_map<string, std::unordered_set<string>>* enabled_watch_keys =
+      GetEnabledWatchKeys();
+  if (enabled_watch_keys->find(grpc_debug_url) == enabled_watch_keys->end()) {
+    return false;
+  } else {
+    const auto& url_enabled = (*enabled_watch_keys)[grpc_debug_url];
+    return url_enabled.find(watch_key) != url_enabled.end();
+  }
+}
+
+// static
 Status DebugGrpcIO::CloseGrpcStream(const string& grpc_stream_url) {
   mutex_lock l(streams_mu);
 
-  if (stream_channels.find(grpc_stream_url) != stream_channels.end()) {
+  std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>*
+      stream_channels = GetStreamChannels();
+  if (stream_channels->find(grpc_stream_url) != stream_channels->end()) {
     // Stream of the specified address exists. Close it and remove it from
     // record.
     Status s;
-    s = stream_channels[grpc_stream_url]->Close();
-    stream_channels.erase(grpc_stream_url);
+    s = (*stream_channels)[grpc_stream_url]->ReceiveServerRepliesAndClose();
+    (*stream_channels).erase(grpc_stream_url);
     return s;
   } else {
     // Stream of the specified address does not exist. No action.
     return Status::OK();
   }
 }
+
+// static
+std::unordered_map<string, std::unordered_set<string>>*
+DebugGrpcIO::GetEnabledWatchKeys() {
+  static std::unordered_map<string, std::unordered_set<string>>*
+      enabled_watch_keys =
+          new std::unordered_map<string, std::unordered_set<string>>();
+  return enabled_watch_keys;
+}
+
+// static
+void DebugGrpcIO::EnableWatchKey(const string& grpc_debug_url,
+                                 const string& watch_key) {
+  std::unordered_map<string, std::unordered_set<string>>* enabled_watch_keys =
+      GetEnabledWatchKeys();
+  if (enabled_watch_keys->find(grpc_debug_url) == enabled_watch_keys->end()) {
+    CreateEmptyEnabledSet(grpc_debug_url);
+  }
+  (*enabled_watch_keys)[grpc_debug_url].insert(watch_key);
+}
+
+// static
+void DebugGrpcIO::DisableWatchKey(const string& grpc_debug_url,
+                                  const string& watch_key) {
+  std::unordered_map<string, std::unordered_set<string>>* enabled_watch_keys =
+      GetEnabledWatchKeys();
+  if (enabled_watch_keys->find(grpc_debug_url) == enabled_watch_keys->end()) {
+    LOG(WARNING) << "Attempt to disable a watch key for an unregistered gRPC "
+                 << "debug URL: " << grpc_debug_url;
+  } else {
+    std::unordered_set<string>& url_enabled =
+        (*enabled_watch_keys)[grpc_debug_url];
+    if (url_enabled.find(watch_key) == url_enabled.end()) {
+      LOG(WARNING) << "Attempt to disable a watch key that is not currently "
+                   << "enabled at " << grpc_debug_url << ": " << watch_key;
+    } else {
+      url_enabled.erase(watch_key);
+    }
+  }
+}
+
+// static
+void DebugGrpcIO::ClearEnabledWatchKeys() { GetEnabledWatchKeys()->clear(); }
+
+// static
+void DebugGrpcIO::CreateEmptyEnabledSet(const string& grpc_debug_url) {
+  std::unordered_map<string, std::unordered_set<string>>* enabled_watch_keys =
+      GetEnabledWatchKeys();
+  if (enabled_watch_keys->find(grpc_debug_url) == enabled_watch_keys->end()) {
+    std::unordered_set<string> empty_watch_keys;
+    (*enabled_watch_keys)[grpc_debug_url] = empty_watch_keys;
+  }
+}
+
 #endif  // #if defined(PLATFORM_GOOGLE)
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/debug/debug_io_utils.h b/tensorflow/core/debug/debug_io_utils.h
index cd4462b6ae..448c9950c0 100644
--- a/tensorflow/core/debug/debug_io_utils.h
+++ b/tensorflow/core/debug/debug_io_utils.h
@@ -51,6 +51,14 @@ class DebugIO {
   //   wall_time_us: Time stamp for the Tensor. Unit: microseconds (us).
   //   debug_urls: An array of debug target URLs, e.g.,
   //     "file:///foo/tfdbg_dump", "grpc://localhost:11011"
+  //   gated_grpc: Whether this call is subject to gRPC gating.
+  static Status PublishDebugTensor(const string& tensor_name,
+                                   const string& debug_op, const Tensor& tensor,
+                                   const uint64 wall_time_us,
+                                   const gtl::ArraySlice<string>& debug_urls,
+                                   const bool gated_grpc);
+
+  // Convenience overload of the method above for no gated_grpc by default.
   static Status PublishDebugTensor(const string& tensor_name,
                                    const string& debug_op, const Tensor& tensor,
                                    const uint64 wall_time_us,
@@ -64,6 +72,36 @@ class DebugIO {
   static Status PublishGraph(const Graph& graph,
                              const std::unordered_set<string>& debug_urls);
 
+  // TODO(cais): (b/37150755) Implement IsCopyNodeGateOpen.
+
+  // Determine whether a debug node needs to proceed given the current gRPC
+  // gating status.
+  //
+  // Args:
+  //   watch_key: debug tensor watch key, in the format of
+  //     tensor_name:debug_op, e.g., "Weights:0:DebugIdentity".
+  //   debug_urls: the debug URLs of the debug node.
+  //
+  // Returns:
+  //   Whether this debug op should proceed.
+  static bool IsDebugNodeGateOpen(const string& watch_key,
+                                  const std::vector<string>& debug_urls);
+
+  // Determine whether debug information should be sent through a grpc://
+  // debug URL given the current gRPC gating status.
+  //
+  // Args:
+  //   watch_key: debug tensor watch key, in the format of
+  //     tensor_name:debug_op, e.g., "Weights:0:DebugIdentity".
+  //   debug_url: the debug URL, e.g., "grpc://localhost:3333",
+  //     "file:///tmp/tfdbg_1".
+  //
+  // Returns:
+  //   Whether the sending of debug data to the debug_url should
+  //     proceed.
+  static bool IsDebugURLGateOpen(const string& watch_key,
+                                 const string& debug_url);
+
   static Status CloseDebugURL(const string& debug_url);
 
   static const char* const kFileURLScheme;
@@ -166,10 +204,12 @@ class DebugGrpcChannel {
   //   True iff the write is successful.
   bool WriteEvent(const Event& event);
 
-  // Close the stream and the channel.
-  Status Close();
+  // Receive EventReplies from server (if any) and close the stream and the
+  // channel.
+  Status ReceiveServerRepliesAndClose();
 
  private:
+  string url_;
   ::grpc::ClientContext ctx_;
   std::shared_ptr<::grpc::Channel> channel_;
   std::unique_ptr<EventListener::Stub> stub_;
@@ -182,12 +222,10 @@ class DebugGrpcChannel {
 class DebugGrpcIO {
  public:
   // Send a tensor through a debug gRPC stream.
-  static Status SendTensorThroughGrpcStream(const string& node_name,
-                                            const int32 output_slot,
-                                            const string& debug_op,
-                                            const Tensor& tensor,
-                                            const uint64 wall_time_us,
-                                            const string& grpc_stream_url);
+  static Status SendTensorThroughGrpcStream(
+      const string& node_name, const int32 output_slot, const string& debug_op,
+      const Tensor& tensor, const uint64 wall_time_us,
+      const string& grpc_stream_url, const bool gated);
 
   // Send an Event proto through a debug gRPC stream.
   // Thread-safety: Safe with respect to other calls to the same method and
@@ -195,15 +233,53 @@ class DebugGrpcIO {
   static Status SendEventProtoThroughGrpcStream(const Event& event_proto,
                                                 const string& grpc_stream_url);
 
+  // Check whether a debug watch key is allowed to send data to a given grpc://
+  // debug URL given the current gating status.
+  //
+  // Args:
+  //   watch_key: debug tensor watch key, in the format of
+  //     tensor_name:debug_op, e.g., "Weights:0:DebugIdentity".
+  //   grpc_debug_url: the debug URL, e.g., "grpc://localhost:3333",
+  //
+  // Returns:
+  //   Whether the sending of debug data to grpc_debug_url should
+  //     proceed.
+  static bool IsGateOpen(const string& watch_key, const string& grpc_debug_url);
+
   // Close a gRPC stream to the given address, if it exists.
   // Thread-safety: Safe with respect to other calls to the same method and
   // calls to SendTensorThroughGrpcStream().
   static Status CloseGrpcStream(const string& grpc_stream_url);
 
+  // Enable a debug watch key at a grpc:// debug URL.
+  static void EnableWatchKey(const string& grpc_debug_url,
+                             const string& watch_key);
+
+  // Disable a debug watch key at a grpc:// debug URL.
+  static void DisableWatchKey(const string& grpc_debug_url,
+                              const string& watch_key);
+
  private:
+  // Returns a global map from grpc debug URLs to the corresponding
+  // DebugGrpcChannels.
+  static std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>*
+  GetStreamChannels();
+
+  // Returns a global map from grpc debug URLs to the enabled gated debug nodes.
+  // The keys are grpc:// URLs of the debug servers, e.g., "grpc://foo:3333".
+  // Each value element of the value has the format
+  // <node_name>:<output_slot>:<debug_op>", e.g.,
+  // "Weights_1:0:DebugNumericSummary".
+  static std::unordered_map<string, std::unordered_set<string>>*
+  GetEnabledWatchKeys();
+
+  static void ClearEnabledWatchKeys();
+  static void CreateEmptyEnabledSet(const string& grpc_debug_url);
+
   static mutex streams_mu;
-  static std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>
-      stream_channels GUARDED_BY(streams_mu);
+
+  friend class GrpcDebugTest;
+  friend class DebugNumericSummaryOpTest;
 };
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/debug/debug_service.proto b/tensorflow/core/debug/debug_service.proto
index 967c99c108..1adba5d653 100644
--- a/tensorflow/core/debug/debug_service.proto
+++ b/tensorflow/core/debug/debug_service.proto
@@ -23,6 +23,19 @@ import "tensorflow/core/util/event.proto";
 // Event protocal buffers, e.g., debug ops inserted by a debugged runtime to a
 // TensorFlow graph being executed.
 message EventReply {
+  message DebugOpStateChange {
+    enum Change {
+      DISABLE = 0;
+      ENABLE = 1;
+    }
+
+    Change change = 1;
+    string node_name = 2;
+    int32 output_slot = 3;
+    string debug_op = 4;
+  }
+
+  repeated DebugOpStateChange debug_op_state_changes = 1;
 }
 
 // EventListener: Receives Event protos, e.g., from debugged TensorFlow
diff --git a/tensorflow/core/debug/debug_test_server_main.cc b/tensorflow/core/debug/debug_test_server_main.cc
deleted file mode 100644
index 578563be09..0000000000
--- a/tensorflow/core/debug/debug_test_server_main.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "grpc++/grpc++.h"
-#include "tensorflow/core/debug/debug_grpc_testlib.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/strcat.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-#include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/init_main.h"
-
-// Usage: debug_test_server_main <port> <dump_root>
-int main(int argc, char* argv[]) {
-  if (argc != 3) {
-    std::cerr << "Usage: debug_test_server_main <port> <dump_root>"
-              << std::endl;
-    return 1;
-  }
-
-  tensorflow::port::InitMain(argv[0], &argc, &argv);
-
-  int port = 0;
-  tensorflow::strings::safe_strto32(argv[1], &port);
-  std::string test_server_addr = tensorflow::strings::StrCat("0.0.0.0:", port);
-
-  tensorflow::test::TestEventListenerImpl debug_test_server(argv[2]);
-
-  ::grpc::ServerBuilder builder;
-  builder.AddListeningPort(test_server_addr,
-                           ::grpc::InsecureServerCredentials());
-  builder.RegisterService(&debug_test_server);
-  std::unique_ptr<::grpc::Server> test_server = builder.BuildAndStart();
-
-  test_server->Wait();
-
-  return 0;
-}
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 9c47d520d9..0778821cc8 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -1028,6 +1028,7 @@ tf_cc_test(
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
         "//tensorflow/core:testlib",
+        "//tensorflow/core/debug:debug_io_utils",
     ],
 )
 
diff --git a/tensorflow/core/kernels/debug_ops.h b/tensorflow/core/kernels/debug_ops.h
index 5437bc5a33..8735bcab47 100644
--- a/tensorflow/core/kernels/debug_ops.h
+++ b/tensorflow/core/kernels/debug_ops.h
@@ -38,6 +38,10 @@ class CopyOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* context) override {
+    // TODO(cais): (b/37150755) Copy ops need to be gated in a similar way to
+    // Debug* ops, so that unnecessary mem-copying can be avoided when all the
+    // downstream Debug* ops are gated off.
+
     const Tensor& src_tensor = context->input(0);
 
     if (src_tensor.IsInitialized() &&
@@ -81,46 +85,98 @@ class CopyOp : public OpKernel {
   string tensor_name_;
 };
 
-// Identity op for debugging.
-//   Output slot 0 carries the debug signal and is always allocated on the
-//   host (CPU) as a non-Ref tensor. In the case of DebugIdentityOp,
-//   the debug signal is equal to the input tensor.
-class DebugIdentityOp : public OpKernel {
+// Base class of all debug ops.
+class BaseDebugOp : public OpKernel {
  public:
-  explicit DebugIdentityOp(OpKernelConstruction* context) : OpKernel(context) {
+  explicit BaseDebugOp(const string& debug_op_name,
+                       OpKernelConstruction* context)
+      : OpKernel(context), debug_op_name_(debug_op_name) {
+    watch_key_ = strings::StrCat(tensor_name_, ":", debug_op_name_);
     OP_REQUIRES_OK(context, context->GetAttr("tensor_name", &tensor_name_));
     OP_REQUIRES_OK(context, context->GetAttr("debug_urls", &debug_urls_));
+    OP_REQUIRES_OK(context, context->GetAttr("gated_grpc", &gated_grpc_));
   }
 
-  void Compute(OpKernelContext* context) override {
-    if (!debug_urls_.empty()) {
-      // TODO(b/32704451): Don't just ignore the ::tensorflow::Status object!
-      DebugIO::PublishDebugTensor(tensor_name_, "DebugIdentity",
-                                  context->input(0),
-                                  Env::Default()->NowMicros(), debug_urls_)
-          .IgnoreError();
-    }
+  bool IsExpensive() override { return false; }
 
-    context->set_output(0, context->input(0));
+ protected:
+  // Apply gRPC gating (if gated_grpc_ attribute is true).
+  //
+  // Returns false if and only if all grpc:// debug URLs of the debug op are
+  // disabled currently (i.e., gated off), in which case the debug op will emit
+  // an empty (size {0}) tensor of undefined data type.
+  bool ApplyGrpcGating(OpKernelContext* context) {
+    if (gated_grpc_ && !DebugIO::IsDebugNodeGateOpen(watch_key_, debug_urls_)) {
+      // The entire node is gated off: Output an empty tensor and avoid
+      // expensive computation.
+      Tensor* output_tensor;
+      TensorShape shape({0});
+      if (!context->allocate_output(0, shape, &output_tensor).ok()) {
+        LOG(ERROR) << "Debug node of watch key " << watch_key_
+                   << "failed to allocate empty tensor under gated-off state.";
+      }
+      return false;
+    } else {
+      return true;
+    }
   }
 
-  bool IsExpensive() override { return false; }
+  // Publish a tensor to all debug URLs of the debug op.
+  // Log an error if the publishing failed.
+  void PublishTensor(const Tensor& tensor) {
+    if (!debug_urls_.empty()) {
+      Status status = DebugIO::PublishDebugTensor(
+          tensor_name_, debug_op_name_, tensor, Env::Default()->NowMicros(),
+          debug_urls_, gated_grpc_);
+      if (!status.ok()) {
+        LOG(ERROR) << "Debug node of watch key " << watch_key_
+                   << "failed to publish debug tensor data to all URLs "
+                   << str_util::Join(debug_urls_, ", ")
+                   << ", due to: " << status.error_message();
+      }
+    }
+  }
 
  private:
+  string debug_op_name_;
   string tensor_name_;
+  string watch_key_;
   std::vector<string> debug_urls_;
+  bool gated_grpc_;
+};
+
+// Identity op for debugging.
+//   Output slot 0 carries the debug signal and is always allocated on the
+//   host (CPU) as a non-Ref tensor. In the case of DebugIdentityOp,
+//   the debug signal is equal to the input tensor.
+class DebugIdentityOp : public BaseDebugOp {
+ public:
+  explicit DebugIdentityOp(OpKernelConstruction* context)
+      : BaseDebugOp("DebugIdentity", context) {}
+
+  void Compute(OpKernelContext* context) override {
+    if (!ApplyGrpcGating(context)) {
+      return;
+    }
+
+    PublishTensor(context->input(0));
+    context->set_output(0, context->input(0));
+  }
 };
 
 // NaN-counter op for debugging.
 template <typename T>
-class DebugNanCountOp : public OpKernel {
+class DebugNanCountOp : public BaseDebugOp {
  public:
-  explicit DebugNanCountOp(OpKernelConstruction* context) : OpKernel(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("tensor_name", &tensor_name_));
-    OP_REQUIRES_OK(context, context->GetAttr("debug_urls", &debug_urls_));
-  }
+  explicit DebugNanCountOp(OpKernelConstruction* context)
+      : BaseDebugOp("DebugNanCount", context) {}
 
   void Compute(OpKernelContext* context) override {
+    if (!ApplyGrpcGating(context)) {
+      return;
+    }
+
+    Tensor* output_tensor;
     const Tensor& input = context->input(0);
 
     // Use DT_INT64/int64 to be consistent with TensorShape::num_elements().
@@ -140,34 +196,18 @@ class DebugNanCountOp : public OpKernel {
     }
 
     TensorShape shape({1});
-
-    Tensor* output_tensor;
     OP_REQUIRES_OK(context, context->allocate_output(0, shape, &output_tensor));
     output_tensor->vec<int64>()(0) = nan_count;
-
-    if (!debug_urls_.empty()) {
-      // TODO(b/32704451): Don't just ignore the ::tensorflow::Status object!
-      DebugIO::PublishDebugTensor(tensor_name_, "DebugNanCount", *output_tensor,
-                                  Env::Default()->NowMicros(), debug_urls_)
-          .IgnoreError();
-    }
+    PublishTensor(*output_tensor);
   }
-
-  bool IsExpensive() override { return false; }
-
- private:
-  string tensor_name_;
-  std::vector<string> debug_urls_;
 };
 
 // Numeric summary op for debugging.
 template <typename T>
-class DebugNumericSummaryOp : public OpKernel {
+class DebugNumericSummaryOp : public BaseDebugOp {
  public:
   explicit DebugNumericSummaryOp(OpKernelConstruction* context)
-      : OpKernel(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("tensor_name", &tensor_name_));
-    OP_REQUIRES_OK(context, context->GetAttr("debug_urls", &debug_urls_));
+      : BaseDebugOp("DebugNumericSummary", context) {
     OP_REQUIRES_OK(context, context->GetAttr("lower_bound", &lower_bound_));
     OP_REQUIRES_OK(context, context->GetAttr("upper_bound", &upper_bound_));
     OP_REQUIRES_OK(context,
@@ -175,6 +215,11 @@ class DebugNumericSummaryOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* context) override {
+    if (!ApplyGrpcGating(context)) {
+      return;
+    }
+
+    Tensor* output_tensor;
     const Tensor& input = context->input(0);
 
     int64 is_initialized = 0;
@@ -254,8 +299,6 @@ class DebugNumericSummaryOp : public OpKernel {
     }
 
     TensorShape shape({12});
-
-    Tensor* output_tensor;
     OP_REQUIRES_OK(context, context->allocate_output(0, shape, &output_tensor));
     output_tensor->vec<double>()(0) = static_cast<double>(is_initialized);
     output_tensor->vec<double>()(1) = static_cast<double>(element_count);
@@ -272,20 +315,12 @@ class DebugNumericSummaryOp : public OpKernel {
 
     bool mute = mute_if_healthy_ && nan_count == 0 && negative_inf_count == 0 &&
                 positive_inf_count == 0;
-    if (!mute && !debug_urls_.empty()) {
-      // TODO(b/32704451): Don't just ignore the ::tensorflow::Status object!
-      DebugIO::PublishDebugTensor(tensor_name_, "DebugNumericSummary",
-                                  *output_tensor, Env::Default()->NowMicros(),
-                                  debug_urls_)
-          .IgnoreError();
+    if (!mute) {
+      PublishTensor(*output_tensor);
     }
   }
 
-  bool IsExpensive() override { return false; }
-
  private:
-  string tensor_name_;
-  std::vector<string> debug_urls_;
   float lower_bound_;
   float upper_bound_;
   bool mute_if_healthy_;
diff --git a/tensorflow/core/kernels/debug_ops_test.cc b/tensorflow/core/kernels/debug_ops_test.cc
index 917d4c5299..495db92ef6 100644
--- a/tensorflow/core/kernels/debug_ops_test.cc
+++ b/tensorflow/core/kernels/debug_ops_test.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include <fstream>
 #include <vector>
 
+#include "tensorflow/core/debug/debug_io_utils.h"
 #include "tensorflow/core/framework/fake_input.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def_builder.h"
@@ -32,7 +33,6 @@ limitations under the License.
 #include "tensorflow/core/util/event.pb.h"
 
 namespace tensorflow {
-namespace {
 
 class DebugIdentityOpTest : public OpsTestBase {
  protected:
@@ -230,6 +230,24 @@ class DebugNumericSummaryOpTest : public OpsTestBase {
                     .Finalize(node_def()));
     return InitOp();
   }
+
+  Status InitGated(DataType input_type, const std::vector<string>& debug_urls) {
+    TF_CHECK_OK(NodeDefBuilder("op", "DebugNumericSummary")
+                    .Input(FakeInput(input_type))
+                    .Attr("tensor_name", "FakeTensor:0")
+                    .Attr("gated_grpc", true)
+                    .Attr("debug_urls", debug_urls)
+                    .Finalize(node_def()));
+    return InitOp();
+  }
+
+#if defined(PLATFORM_GOOGLE)
+  void ClearEnabledWatchKeys() { DebugGrpcIO::ClearEnabledWatchKeys(); }
+
+  void CreateEmptyEnabledSet(const string& grpc_debug_url) {
+    DebugGrpcIO::CreateEmptyEnabledSet(grpc_debug_url);
+  }
+#endif
 };
 
 TEST_F(DebugNumericSummaryOpTest, Float_full_house) {
@@ -485,6 +503,35 @@ TEST_F(DebugNumericSummaryOpTest, BoolSuccess) {
   test::ExpectTensorNear<double>(expected, *GetOutput(0), 1e-8);
 }
 
+#if defined(PLATFORM_GOOGLE)
+TEST_F(DebugNumericSummaryOpTest, DisabledDueToEmptyEnabledSet) {
+  ClearEnabledWatchKeys();
+  CreateEmptyEnabledSet("grpc://server:3333");
+
+  std::vector<string> debug_urls({"grpc://server:3333"});
+  TF_ASSERT_OK(InitGated(DT_FLOAT, debug_urls));
+  AddInputFromArray<float>(TensorShape({2, 2}), {1.0, 3.0, 3.0, 7.0});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected_disabled(allocator(), DT_DOUBLE, TensorShape({0}));
+  test::ExpectTensorNear<double>(expected_disabled, *GetOutput(0), 1e-8);
+}
+
+TEST_F(DebugNumericSummaryOpTest, DisabledDueToNonMatchingWatchKey) {
+  ClearEnabledWatchKeys();
+  DebugGrpcIO::EnableWatchKey("grpc://server:3333",
+                              "FakeTensor:1:DebugNumeriSummary");
+
+  std::vector<string> debug_urls({"grpc://server:3333"});
+  TF_ASSERT_OK(InitGated(DT_FLOAT, debug_urls));
+  AddInputFromArray<float>(TensorShape({2, 2}), {1.0, 3.0, 3.0, 7.0});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected_disabled(allocator(), DT_DOUBLE, TensorShape({0}));
+  test::ExpectTensorNear<double>(expected_disabled, *GetOutput(0), 1e-8);
+}
+#endif
+
 // Tests for DebugNumericSummaryOp
 class DebugNumericSummaryOpCustomLowerBoundTest : public OpsTestBase {
  protected:
@@ -572,5 +619,4 @@ TEST_F(DebugNumericSummaryOpCustomLowerUpperBoundsTest, Int32Success) {
   test::ExpectTensorNear<double>(expected, *GetOutput(0), 1e-8);
 }
 
-}  // namespace
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/debug_ops.cc b/tensorflow/core/ops/debug_ops.cc
index 63f6b60584..e4b9875c91 100644
--- a/tensorflow/core/ops/debug_ops.cc
+++ b/tensorflow/core/ops/debug_ops.cc
@@ -63,6 +63,7 @@ REGISTER_OP("DebugIdentity")
     .Attr("T: type")
     .Attr("tensor_name: string = ''")
     .Attr("debug_urls: list(string) = []")
+    .Attr("gated_grpc: bool = false")
     .SetAllowsUninitializedInput()
     .Doc(R"doc(
 Debug Identity Op.
@@ -73,7 +74,13 @@ input: Input tensor, non-Reference type.
 output: Output tensor that equals the input tensor.
 tensor_name: Name of the input tensor.
 debug_urls: List of URLs to debug targets, e.g.,
-            file:///foo/tfdbg_dump, grpc:://localhost:11011
+  file:///foo/tfdbg_dump, grpc:://localhost:11011
+gated_grpc: Whether this op will be gated. If any of the debug_urls of this
+  debug node is of the grpc:// scheme, when the value of this attribute is set
+  to True, the data will not actually be sent via the grpc stream unless this
+  debug op has been enabled at the debug_url. If all of the debug_urls of this
+  debug node are of the grpc:// scheme and the debug op is enabled at none of
+  them, the output will be an empty Tensor.
 )doc");
 
 REGISTER_OP("DebugNanCount")
@@ -82,6 +89,7 @@ REGISTER_OP("DebugNanCount")
     .Attr("T: type")
     .Attr("tensor_name: string = ''")
     .Attr("debug_urls: list(string) = []")
+    .Attr("gated_grpc: bool = false")
     .SetAllowsUninitializedInput()
     .Doc(R"doc(
 Debug NaN Value Counter Op
@@ -92,7 +100,13 @@ input: Input tensor, non-Reference type.
 output: An integer output tensor that is the number of NaNs in the input.
 tensor_name: Name of the input tensor.
 debug_urls: List of URLs to debug targets, e.g.,
-            file:///foo/tfdbg_dump, grpc:://localhost:11011
+  file:///foo/tfdbg_dump, grpc:://localhost:11011.
+gated_grpc: Whether this op will be gated. If any of the debug_urls of this
+  debug node is of the grpc:// scheme, when the value of this attribute is set
+  to True, the data will not actually be sent via the grpc stream unless this
+  debug op has been enabled at the debug_url. If all of the debug_urls of this
+  debug node are of the grpc:// scheme and the debug op is enabled at none of
+  them, the output will be an empty Tensor.
 )doc");
 
 REGISTER_OP("DebugNumericSummary")
@@ -104,6 +118,7 @@ REGISTER_OP("DebugNumericSummary")
     .Attr("lower_bound: float = -inf")
     .Attr("upper_bound: float = inf")
     .Attr("mute_if_healthy: bool = false")
+    .Attr("gated_grpc: bool = false")
     .SetAllowsUninitializedInput()
     .Doc(R"doc(
 Debug Numeric Summary Op.
@@ -144,6 +159,12 @@ upper_bound: (float) The upper bound >= which values will be included in the
 mute_if_healthy: (bool) Do not send data to the debug URLs unless at least one
   of elements [2], [3] and [7] (i.e., the nan count and the generalized -inf and
   inf counts) is non-zero.
+gated_grpc: Whether this op will be gated. If any of the debug_urls of this
+  debug node is of the grpc:// scheme, when the value of this attribute is set
+  to True, the data will not actually be sent via the grpc stream unless this
+  debug op has been enabled at the debug_url. If all of the debug_urls of this
+  debug node are of the grpc:// scheme and the debug op is enabled at none of
+  them, the output will be an empty Tensor.
 
 )doc");
 
-- 
GitLab


From 5720f05489b247b7503640d4d1f70a5f5766e887 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 10 Apr 2017 13:30:34 -0800
Subject: [PATCH 0272/1563] tfdbg: disable problematic watched nodes under
 file:// debug URL in testDebugTrainingDynamicRNNWorks Change: 152735279

---
 .../python/debug/lib/session_debug_testlib.py | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/tensorflow/python/debug/lib/session_debug_testlib.py b/tensorflow/python/debug/lib/session_debug_testlib.py
index 5acc1962cb..97a79eda1a 100644
--- a/tensorflow/python/debug/lib/session_debug_testlib.py
+++ b/tensorflow/python/debug/lib/session_debug_testlib.py
@@ -484,18 +484,14 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
       sess.run(variables.global_variables_initializer())
 
       run_options = config_pb2.RunOptions(output_partition_graphs=True)
-      if any(url.startswith("grpc://") for url in self._debug_urls()):
-        debug_utils.watch_graph_with_blacklists(
-            run_options,
-            sess.graph,
-            node_name_regex_blacklist="(.*rnn/while/.*|.*TensorArray.*)",
-            debug_urls=self._debug_urls())
-        # b/36870549: Nodes with these name patterns need to be excluded from
-        # tfdbg in order to prevent MSAN warnings of uninitialized Tensors
-        # under the grpc:// debug URL scheme.
-      else:
-        debug_utils.watch_graph(
-            run_options, sess.graph, debug_urls=self._debug_urls())
+      debug_utils.watch_graph_with_blacklists(
+          run_options,
+          sess.graph,
+          node_name_regex_blacklist="(.*rnn/while/.*|.*TensorArray.*)",
+          debug_urls=self._debug_urls())
+      # b/36870549: Nodes with these name patterns need to be excluded from
+      # tfdbg in order to prevent MSAN warnings of uninitialized Tensors
+      # under both file:// and grpc:// debug URL schemes.
 
       run_metadata = config_pb2.RunMetadata()
       sess.run(train_op, feed_dict={concat_inputs: input_values},
-- 
GitLab


From 3bbdff02504e9520c540d219140bd38c623a2478 Mon Sep 17 00:00:00 2001
From: Niranjan Hasabnis <niranjan.hasabnis@intel.com>
Date: Tue, 4 Apr 2017 21:36:33 -0700
Subject: [PATCH 0273/1563] Intel Mkl kernels for Concat, LRN and
 FusedBatchNorm

This commit implements following changes:

1) MKL kernels for LRN, Concat, ConcatV2 and FusedBatchNorm and applicable gradient ops
2) Graph layout pass change to support new ops
3) Removes Mkl graph node merge pass as a separate pass
4) Changes MKL-TF tensor ordering from interleaved to contiguous
---
 tensorflow/core/BUILD                         |   7 +-
 tensorflow/core/graph/mkl_layout_pass.cc      | 759 ++++++++++++++---
 tensorflow/core/graph/mkl_layout_pass_test.cc | 484 ++++++++++-
 tensorflow/core/graph/mkl_optimizer_merge.cc  | 651 ---------------
 tensorflow/core/graph/mkl_optimizer_merge.h   |  36 -
 .../core/graph/mkl_optimizer_merge_test.cc    | 470 -----------
 .../core/graph/mkl_tfconversion_pass.cc       |  31 +-
 .../core/graph/mkl_tfconversion_pass_test.cc  |  69 +-
 tensorflow/core/kernels/BUILD                 |  24 +
 tensorflow/core/kernels/mkl_concat_op.cc      | 455 ++++++++++
 .../core/kernels/mkl_fused_batch_norm_op.cc   | 688 ++++++++++++++++
 tensorflow/core/kernels/mkl_lrn_op.cc         | 775 ++++++++++++++++++
 tensorflow/core/ops/array_ops.cc              |  41 +
 tensorflow/core/ops/nn_ops.cc                 | 233 +++++-
 tensorflow/core/util/mkl_util.h               | 199 ++++-
 15 files changed, 3559 insertions(+), 1363 deletions(-)
 delete mode 100644 tensorflow/core/graph/mkl_optimizer_merge.cc
 delete mode 100644 tensorflow/core/graph/mkl_optimizer_merge.h
 delete mode 100644 tensorflow/core/graph/mkl_optimizer_merge_test.cc
 create mode 100644 tensorflow/core/kernels/mkl_concat_op.cc
 create mode 100644 tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
 create mode 100644 tensorflow/core/kernels/mkl_lrn_op.cc

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index ba761cd7c6..b0d7a65053 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -724,6 +724,9 @@ cc_library(
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
+        "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_lrn_op",
+        "//tensorflow/core/kernels:mkl_concat_op",
     ]),
 )
 
@@ -2073,7 +2076,6 @@ tf_cc_test_mkl(
     size = "small",
     srcs = [
         "graph/mkl_layout_pass_test.cc",
-        "graph/mkl_optimizer_merge_test.cc",
         "graph/mkl_tfconversion_pass_test.cc",
     ],
     linkstatic = tf_kernel_tests_linkstatic(),
@@ -2094,7 +2096,10 @@ tf_cc_test_mkl(
         "//tensorflow/cc:cc_ops",
         "//tensorflow/cc:scope",
         "//tensorflow/cc:sendrecv_ops",
+        "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
+        "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 309c4cd774..82f2d85335 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -118,10 +118,14 @@ namespace tensorflow {
 //      take (A, B, A_m, B_m) as input. Among N inputs one can get N!
 //      permutations.
 //
-//      So the question is: which one do we follow? Currently, we follow an
-//      intuitive order where Mkl tensor follows a corresponding Tensorflow
-//      tensor immediately. In the context of above example, it will be: (A,
-//      A_m, B, B_m). We follow same ordering rule for output tensors.
+//      So the question is: which one do we follow? We support 2 types of
+//      orderings: (1) interleaved, and (2) contiguous. Interleaved ordering
+//      follows an intuitive order where Mkl tensor follows a corresponding
+//      Tensorflow tensor immediately. In the context of above example, it
+//      will be: (A, A_m, B, B_m). We follow same ordering rule for output
+//      tensors. Contiguous ordering means all Tensorflow tensors are
+//      contiguous followd by all contiguous Mkl tensors. As a default
+//      ordering, we use Contiguous one.
 //
 // NOTE: Current rewriting approach rewrites an op to Mkl op without any
 //      conditions. But in the future, it may be possible to consider
@@ -191,9 +195,10 @@ namespace tensorflow {
 //        B = MaxPoolGrad(X, A, Y)
 //
 //        We will transform this graph to propagate workspace as:
+//        (with contiguous ordering)
 //
-//        A, A_m, W, W_m = MklMaxPool(T, T_m)
-//        B, B_m = MklMaxPoolGrad(X, X_m, A, A_m, Y, Y_m, W, W_m)
+//        A, W, A_m, W_m = MklMaxPool(T, T_m)
+//        B, B_m = MklMaxPoolGrad(X, A, Y, W, X_m, A_m, Y_m, W_m)
 //
 //        Here W is the workspace tensor. Transformed tensors with name
 //        suffix _m are Mkl tensors and this transformation has been done
@@ -208,8 +213,8 @@ namespace tensorflow {
 //        Backward op name = name of the op in the backward pass that receives
 //          workspace from forward op (MaxPoolGrad in the example)
 //        Slot = Number of the output or input slot that will be
-//               used by the workspace (2 for MklMaxPool as W is 3rd
-//               output of MaxPool (0 is 1st); 6 for MklMaxPoolGrad)
+//               used by the workspace (1 for MklMaxPool as W is 2nd
+//               output of MaxPool (0 is 1st); 3 for MklMaxPoolGrad)
 //
 //        Question:
 //
@@ -234,7 +239,7 @@ namespace tensorflow {
 // -------------------------------------------
 // Consider BiasAddGrad op as:
 //
-//           O = MklConv2D(A, A_m, B, B_m, C, C_m)
+//           O = MklConv2D(A, B, C, A_m, B_m, C_m)
 //           P = BiasAddGrad(O)
 //
 // Then we rewrite is as:
@@ -259,20 +264,28 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     csinfo_.mklconv2d = "MklConv2D";
     csinfo_.mklconv2dwithbias = "MklConv2DWithBias";
     csinfo_.mklconv2dwithbiasbackpropbias = "MklConv2DWithBiasBackpropBias";
-    csinfo_.biasadd = "BiasAdd";
-    csinfo_.matmul = "MatMul";
-    csinfo_.biasaddgrad = "BiasAddGrad";
-    csinfo_.relu = "Relu";
-    csinfo_.relugrad = "ReluGrad";
-    csinfo_.maxpool = "MaxPool";
-    csinfo_.maxpoolgrad = "MaxPoolGrad";
-    csinfo_.avgpool = "AvgPool";
-    csinfo_.avgpoolgrad = "AvgPoolGrad";
-    csinfo_.conv2dgradinput = "Conv2DBackpropInput";
-    csinfo_.conv2dgradfilter = "Conv2DBackpropFilter";
-
-    rinfo_.push_back(
-        {csinfo_.conv2d, csinfo_.mklconv2d, 2, CopyAttrsConv2D, AlwaysRewrite});
+    csinfo_.biasadd           = "BiasAdd";
+    csinfo_.matmul            = "MatMul";
+    csinfo_.biasaddgrad       = "BiasAddGrad";
+
+    csinfo_.concat            = "Concat";
+    csinfo_.concatv2          = "ConcatV2";
+    csinfo_.split             = "Split";
+    csinfo_.relu              = "Relu";
+    csinfo_.relugrad          = "ReluGrad";
+    csinfo_.maxpool           = "MaxPool";
+    csinfo_.maxpoolgrad       = "MaxPoolGrad";
+    csinfo_.avgpool           = "AvgPool";
+    csinfo_.avgpoolgrad       = "AvgPoolGrad";
+    csinfo_.conv2dgradinput   = "Conv2DBackpropInput";
+    csinfo_.conv2dgradfilter  = "Conv2DBackpropFilter";
+    csinfo_.lrn               = "LRN";
+    csinfo_.lrngrad           = "LRNGrad";
+    csinfo_.fused_batch_norm = "FusedBatchNorm";
+    csinfo_.fused_batch_norm_grad = "FusedBatchNormGrad";
+
+    rinfo_.push_back({csinfo_.conv2d,   csinfo_.mklconv2d,
+                      2, CopyAttrsConv2D, AlwaysRewrite});
     rinfo_.push_back({csinfo_.conv2dgradfilter,
                       GetMklOpName(csinfo_.conv2dgradfilter), 3,
                       CopyAttrsConv2D, AlwaysRewrite});
@@ -281,17 +294,34 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
                       AlwaysRewrite});
     rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu), 1,
                       CopyAttrsRelu, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.lrn, GetMklOpName(csinfo_.lrn),
+                      1, CopyAttrsLRN, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.lrngrad, GetMklOpName(csinfo_.lrngrad),
+                      3, CopyAttrsLRN, AlwaysRewrite});
     rinfo_.push_back({csinfo_.maxpool, GetMklOpName(csinfo_.maxpool), 1,
                       CopyAttrsPooling, AlwaysRewrite});
     rinfo_.push_back({csinfo_.maxpoolgrad, GetMklOpName(csinfo_.maxpoolgrad), 3,
                       CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpool, GetMklOpName(csinfo_.avgpool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpoolgrad, GetMklOpName(csinfo_.avgpoolgrad), 2,
-                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avgpool, GetMklOpName(csinfo_.avgpool),
+                      1, CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avgpoolgrad, GetMklOpName(csinfo_.avgpoolgrad),
+                      2, CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.concat, GetMklOpName(csinfo_.concat),
+                      0, CopyAttrsConcat, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.concatv2, GetMklOpName(csinfo_.concatv2),
+                      0, CopyAttrsConcatV2, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.fused_batch_norm,
+                      GetMklOpName(csinfo_.fused_batch_norm), 5,
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.fused_batch_norm_grad,
+                      GetMklOpName(csinfo_.fused_batch_norm_grad), 5,
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+
+    // TODO(inteltf): we do not support ReluGrad and BiasAddGrad yet.
 
     // Add info about which ops to add workspace edge to and the slots.
-    wsinfo_.push_back({csinfo_.maxpool, csinfo_.maxpoolgrad, 0, 1, 2, 6});
+    wsinfo_.push_back({csinfo_.maxpool, csinfo_.maxpoolgrad, 0, 1, 1, 3});
+    wsinfo_.push_back({csinfo_.lrn, csinfo_.lrngrad, 0, 2, 1, 3});
 
     // Add a rule for merging nodes
     minfo_.push_back(
@@ -367,6 +397,9 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
 
   /// Structure to store all constant strings
   struct {
+    string concat;
+    string concatv2;
+    string split;
     string relu;
     string relugrad;
     // Conv ops
@@ -376,6 +409,8 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string conv2dgradfilter;
     string mklconv2dwithbias;
     string mklconv2dwithbiasbackpropbias;
+    string lrn;
+    string lrngrad;
     // Pooling ops
     string maxpool;
     string maxpoolgrad;
@@ -385,6 +420,8 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string biasadd;
     string matmul;
     string biasaddgrad;
+    string fused_batch_norm;
+    string fused_batch_norm_grad;
   } csinfo_;
 
   /// Maintain info about nodes to rewrite
@@ -420,6 +457,43 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // Clear all visited nodes
   inline void UnMarkRewrittenNodes() { visited_nodes_.clear(); }
 
+  // Is this a graph node that can accept variable number of inputs?
+  // Return true if yes, false otherwise.
+  //
+  // Concat, Split are vararg nodes.
+  inline bool IsVarArgNode(Node* n) {
+    if (n->type_string() == csinfo_.concat ||
+        n->type_string() == csinfo_.split  ||
+       n->type_string() == csinfo_.concatv2) {
+      return true;
+    }
+    return false;
+  }
+
+  // Is OpDef::ArgDef a list type? It could be N * T or list(type).
+  // Refer to opdef.proto for details of list type.
+  inline bool ArgIsList(const OpDef::ArgDef& arg) const {
+    return !arg.type_list_attr().empty() || !arg.number_attr().empty();
+  }
+
+  // Get length of a list in 'n' if 'arg' is of list type. Refer to
+  // description of ArgIsList for definitio of list type.
+  inline int GetTensorListLength(const OpDef::ArgDef& arg, Node* n) {
+    CHECK_EQ(ArgIsList(arg), true);
+    int N = 0;
+    const string attr_name = !arg.type_list_attr().empty() ?
+                              arg.type_list_attr() :
+                              arg.number_attr();
+    if (!arg.type_list_attr().empty()) {
+      std::vector<DataType> value;
+      TF_CHECK_OK(GetNodeAttr(n->def(), attr_name, &value));
+      N = value.size();
+    } else {
+      TF_CHECK_OK(GetNodeAttr(n->def(), attr_name, &N));
+    }
+    return N;
+  }
+
   // Get the name of Mkl op from original TensorFlow op
   // We prefix 'Mkl' to the original op to get Mkl op.
   // TODO(nhasabni) We should move this to mkl_util.h.
@@ -494,23 +568,115 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //         Otherwise, it is not updated.
   Status RewriteNode(std::unique_ptr<Graph>* g, Node* n, const RewriteInfo* ri);
 
+  // Create a node that will feed a list of TF tensors to the new
+  // node that we are constructing.
+  //
+  // @input g - input graph,
+  // @input inputs - inputs to old node that we are using for constructing
+  //                 new inputs,
+  // @input input_idx - the index in the 'inputs' vector pointing to the
+  //                    current input that we have processed so far
+  // @output input_idx - index will be incremented by the number of nodes
+  //                     from 'inputs' that are processed
+  // @input list_length - The expected length of list of TF tensors
+  // @output output_nodes - the list of new nodes creating TF tensors
+  //
+  // @return None
+  void GetNodesProducingTFTensorList(
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes);
+
+  // Create a node that will feed a list of Mkl tensors to the new
+  // node that we are constructing.
+  //
+  // @input g - input graph,
+  // @input inputs - inputs to old node that we are using for constructing
+  //                 new inputs,
+  // @input input_idx - the index in the 'inputs' vector pointing to the
+  //                    current input that we have processed so far
+  // @output input_idx - index will be incremented by the number of nodes
+  //                     from 'inputs' that are processed
+  // @input list_length - The expected length of list of Mkl tensors
+  // @output output_nodes - the list of new nodes creating Mkl tensors
+  //
+  // @return None
+  void GetNodesProducingMklTensorList(std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes);
+
+  // Create a node that will feed an Mkl tensor to the new
+  // node that we are constructing. The output node could be (1) 'n'
+  // if it is Mkl layer, or (2) a dummy node producing dummy Mkl tensor
+  // if 'n' is not an Mkl layer.
+  //
+  // @input g - input graph,
+  // @input n - Node based on which we are creating Mkl node,
+  // @input n_output_slot - the output slot of node 'n'
+  //            which is feeding to the node that we are constructing
+  // @output mkl_node - the new node that will feed Mkl tensor
+  // @output mkl_node_output_slot - the slot number of mkl_node that
+  //                                will feed the tensor
+  // @return None
+  void GetNodeProducingMklTensor(std::unique_ptr<Graph>* g, Node* n,
+    int n_output_slot, Node** mkl_node, int* mkl_node_output_slot);
+
   // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
-  // in graph 'g'. Original node is input in 'orign'.
+  // in graph 'g'. Original node is input in 'old_node'. Inputs to 'nb' are
+  // set up in contiguous fashion. 'workspace_tensors' carry graph nodes
+  // producing workspace edges if 'are_workspace_tensors_available' is true.
+  // Otherwise, 'workspace_tensors' is empty vector.
   //
-  // For details, refer to 'Number of inputs after rewriting' section in the
+  // For details, refer to 'Ordering of inputs after rewriting' section in the
   // documentation above.
   //
   // Returns Status::OK() if setting up inputs is successful, otherwise
   // returns appropriate status code.
+  int SetUpContiguousInputs(std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
+    NodeBuilder* nb, Node* old_node,
+    std::vector<NodeBuilder::NodeOut>* workspace_tensors,
+    bool are_workspace_tensors_available);
+
+#if 0
+  // TODO(nhasabni): enable it.
+  // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
+  // in graph 'g'. Original node is input in 'old_node'. Inputs to 'nb' are
+  // set up in interleaved fashion. 'workspace_tensors' carry graph nodes
+  // producing workspace edges if 'are_workspace_tensors_available' is true.
+  // Otherwise, 'workspace_tensors' is empty vector.
+  //
+  // For details, refer to 'Ordering of Tensorflow tensors and Mkl tensors'
+  // section in the documentation above.
+  //
+  // Returns Status::OK() if setting up inputs is successful, otherwise
+  // returns appropriate status code.
+  int SetUpInputsInterleaved(std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
+    NodeBuilder* nb, Node* old_node);
+#endif
+
+  // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
+  // in graph 'g'. Original node is input in 'orign'.
+  //
+  // For details, refer to 'Ordering of Tensorflow tensors and Mkl tensors'
+  // section in the documentation above.
+  //
+  // Returns Status::OK() if setting up inputs is successful, otherwise
+  // returns appropriate status code.
   Status SetUpInputs(std::unique_ptr<Graph>* g,
                      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
                      NodeBuilder* nb, Node* orign);
 
   // Add workspace edge on the input or output side of Node 'orign' by using
   // NodeBuilder 'nb' for the new node provided. If 'orign' does not dictate
-  // adding workspace edge then do not add it.
+  // adding workspace edge then do not add it. Workspace Tensorflow and Mkl
+  // tensors, if they need to be added, will be set into these tensors.
+  // If we set workspace tensors, then are_ws_tensors_added should be true.
   void AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g, Node* orign,
-                                NodeBuilder* nb);
+      NodeBuilder* nb, std::vector<NodeBuilder::NodeOut>* ws_tensors,
+      bool* are_ws_tensors_added);
 
   // Functions specific to operators to copy attributes
   // We need operator-specific function to copy attributes because the framework
@@ -519,6 +685,11 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   static void CopyAttrsBiasAddGrad(const Node* orign, NodeBuilder* nb);
   static void CopyAttrsPooling(const Node* orign, NodeBuilder* nb);
   static void CopyAttrsRelu(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsConcat(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsConcatV2(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsSplit(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsLRN(const Node* orign, NodeBuilder* nb);
+  static void CopyAttrsFusedBatchNorm(const Node* orign, NodeBuilder* nb);
 
   // Generate a graph node in graph 'g' representing a dummy Mkl tensor node,
   // using node for original node 'orign' and return it in '*out'.
@@ -531,9 +702,10 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
 
 std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
 
-// We register Mkl rewrite pass for phase 1 in pre-placement group.
-// Do not change the ordering of the Mkl passes.
-REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 1,
+// We register Mkl rewrite pass for phase 1 in post rewrite group.
+// We register it here so that we get a complete picture of all users of Mkl
+// nodes. Do not change the ordering of the Mkl passes.
+REGISTER_OPTIMIZATION(OptimizationPassRegistry::POST_REWRITE_FOR_EXEC, 1,
                       MklLayoutRewritePass);
 
 //////////////////////////////////////////////////////////////////////////
@@ -543,7 +715,6 @@ REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 1,
 static void FillInputs(const Node* n,
                        gtl::InlinedVector<Node*, 4>* control_edges,
                        gtl::InlinedVector<std::pair<Node*, int>, 4>* in) {
-  DCHECK_EQ(in->size(), n->num_inputs());
   control_edges->clear();
   for (const Edge* e : n->in_edges()) {
     if (e->IsControlEdge()) {
@@ -561,41 +732,21 @@ static void FillInputs(const Node* n,
   }
 }
 
-// TODO(nhasabni) We should move this to mkl_util.h.
-void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
-                                                 Node** out, Node* orign) {
-  // We use a tensor of shape {8} and value 0,0,0,0,0,0,0,0 to represent
-  // dummy Mkl tensor. 8 = 2*size_t.
-  const DataType dt = DataTypeToEnum<uint8>::v();
-  TensorProto proto;
-  proto.set_dtype(dt);
-  uint8 zero[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-  proto.set_tensor_content(const_cast<const void*>(static_cast<void*>(&zero)),
-                           8);
-  TensorShape dummy_shape({8});
-  dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(
-      NodeBuilder((*g)->NewName("DMT"), "Const")
-          .Attr("value", proto)
-          .Attr("dtype", dt)
-          .Device(orign->def().device())  // We place this node on same
-                                          // device as device of original
-                                          // node.
-          .Finalize(&**g, out));
-  (*out)->set_assigned_device_name(orign->assigned_device_name());
-}
-
-Status MklLayoutRewritePass::SetUpInputs(
-    std::unique_ptr<Graph>* g,
-    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs, NodeBuilder* nb,
-    Node* orign) {
-  std::vector<NodeBuilder::NodeOut> new_inputs;
+#if 0
+// TODO(nhasabni): although, we are not using it right now. We can implement
+// it for sake of completion.
+int MklLayoutRewritePass::SetUpInputsInterleaved(std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    NodeBuilder* nb, Node* orign) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_INTERLEAVED);
 
   // 1. Let's setup inputs for the new node.
   for (int i = 0; i < inputs.size(); i++) {
     Node* n = inputs[i].first;
+    CHECK_NOTNULL(n);
     // First let's copy original TF tensor input as it is.
-    new_inputs.push_back(NodeBuilder::NodeOut(n, inputs[i].second));
+    nb->Input(n, inputs[i].second);
+    new_inputs++;
 
     // Second, let's add edge to propagate Mkl tensors from input Mkl layers,
     // or generate a dummy Mkl tensor representing not-mkl-tensor case.
@@ -610,7 +761,8 @@ Status MklLayoutRewritePass::SetUpInputs(
       CHECK_EQ(mkl_layer_registry::IsMklLayer(n->type_string(), T), true);
       // src slot number for Mkl tensor would be the one next to TF tensor
       // slot number.
-      new_inputs.push_back(NodeBuilder::NodeOut(n, inputs[i].second + 1));
+      nb->Input(n, inputs[i].second+1);
+      new_inputs++;
     } else {
       // If we have not visited the node and rewritten it, then we need
       // to create a dummy node that will feed a non-Mkl tensor to this node.
@@ -619,18 +771,291 @@ Status MklLayoutRewritePass::SetUpInputs(
       Node* dmt = nullptr;
       GetDummyMklTensorNode(g, &dmt, orign);
       CHECK_NOTNULL(dmt);
-      new_inputs.push_back(NodeBuilder::NodeOut(dmt, 0));
+      nb->Input(dmt, 0);
+      new_inputs++;
     }
   }
 
-  // The total number of inputs to new node _must_ be 2 times the number
-  // of inputs to the original node: N original Tensorflow tensors and
-  // N for Mkl tensors corresponding to each Tensorflow tensors.
-  CHECK_EQ(new_inputs.size(), inputs.size() * 2);
+  // If workspace tensors need to be added and we are interleaving the
+  // ordering, then we need to add them here because workspace tensors
+  // would be last tensors in the inputs.
+  if (are_workspace_tensors_available) {
+    CHECK_EQ(workspace_tensors.size(), 2);
+    // Tensorflow tensor
+    nb->Input(workspace_tensors[0].node, workspace_tensors[0].index);
+    new_inputs++;
+      nb->Input(workspace_tensors[1].node, workspace_tensors[1].index);
+      new_inputs++;
+  }
+}
+#endif
 
-  // 2. Let's add the new inputs.
-  for (auto ni : new_inputs) {
-    nb->Input(ni.node, ni.index);
+void MklLayoutRewritePass::GetNodesProducingTFTensorList(
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes) {
+  CHECK_LT(*input_idx, inputs.size());
+  CHECK_GT(list_length, 0);
+  CHECK_NOTNULL(output_nodes);
+  output_nodes->reserve(list_length);
+
+  while (list_length != 0) {
+    CHECK_GT(list_length, 0);
+    CHECK_LE(*input_idx, inputs.size());
+    Node* n = inputs[*input_idx].first;
+    int slot = inputs[*input_idx].second;
+    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
+    // If input node 'n' is producing a list/array output at output
+    // slot 'slot' then we need to find out the length of that list/array.
+    if (ArgIsList(arg)) {
+      int N = GetTensorListLength(arg, n);
+      CHECK_LE(N, list_length);
+      for (int j = 0; j < N; j++) {
+        output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
+      }
+      (*input_idx)++;
+      list_length -= N;
+    } else {
+      // But if input node 'n' is just producing a single tensor at
+      // output slot 'slot' then we just add that single node.
+      output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
+      (*input_idx)++;
+      list_length--;
+    }
+  }
+}
+
+// TODO(nhasabni) We should move this to mkl_util.h.
+void MklLayoutRewritePass::GetDummyMklTensorNode(
+    std::unique_ptr<Graph>* g, Node** out, Node* orign) {
+  // We use a tensor of shape {8} and value 0,0,0,0,0,0,0,0 to represent
+  // dummy Mkl tensor. 8 = 2*size_t.
+  const DataType dt = DataTypeToEnum<uint8>::v();
+  TensorProto proto;
+  proto.set_dtype(dt);
+  uint8 zero[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+  proto.set_tensor_content(const_cast<const void*>(
+      static_cast<void*>(&zero)), 8);
+  TensorShape dummy_shape({8});
+  dummy_shape.AsProto(proto.mutable_tensor_shape());
+  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
+                 .Attr("value", proto)
+                 .Attr("dtype", dt)
+                 .Device(orign->def().device())  // We place this node on same
+                                             // device as device of original
+                                             // node.
+                 .Finalize(&**g, out));
+  (*out)->set_assigned_device_name(orign->assigned_device_name());
+}
+
+void MklLayoutRewritePass::GetNodesProducingMklTensorList(
+    std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes) {
+  CHECK_LT(*input_idx, inputs.size());
+  CHECK_GT(list_length, 0);
+  CHECK_NOTNULL(output_nodes);
+  output_nodes->reserve(list_length);
+
+  while (list_length != 0) {
+    CHECK_GT(list_length, 0);
+    CHECK_LE(*input_idx, inputs.size());
+    Node* n = inputs[*input_idx].first;
+    int slot = inputs[*input_idx].second;
+    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
+    // We need to check first if the input edge is going to carry a
+    // single tensor or a list of tensors. If it is a list of tensors,
+    // then we need to create list of Mkl dummy nodes.
+    if (ArgIsList(arg)) {
+      // If input node 'n' is producing a list/array output at output
+      // slot 'slot' then we need to find out the length of that list/array.
+      int N = GetTensorListLength(arg, n);
+      CHECK_LE(N, list_length);
+      Node* mkl_node = nullptr;
+      int mkl_node_output_slot = 0;
+      // If it is a list, then create a list of Mkl dummy nodes.
+      for (int j = 0; j < N; j++) {
+        GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
+        output_nodes->push_back(NodeBuilder::NodeOut(mkl_node,
+                                                    mkl_node_output_slot));
+      }
+      (*input_idx)++;
+      list_length -= N;
+    } else {
+      // If it is not a list, then create a single Mkl tensor node.
+      Node* mkl_node = nullptr;
+      int mkl_node_output_slot = 0;
+      GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
+      output_nodes->push_back(NodeBuilder::NodeOut(mkl_node,
+                                                  mkl_node_output_slot));
+      (*input_idx)++;
+      list_length--;
+    }
+  }
+}
+
+// Get an input node that will feed Mkl tensor to the new
+// node that we are constructing. An input node could be (1) 'n'
+// if it is Mkl layer, or (2) a dummy node producing dummy Mkl tensor
+// if 'n' is not an Mkl layer.
+void MklLayoutRewritePass::GetNodeProducingMklTensor(std::unique_ptr<Graph>* g,
+    Node* n,
+    int n_output_slot, Node** mkl_node, int* mkl_node_output_slot) {
+  CHECK_NOTNULL(n);
+  CHECK_NOTNULL(mkl_node);
+  CHECK_NOTNULL(mkl_node_output_slot);
+  if (IsRewrittenNode(n)) {
+    // If we have visited this node and rewritten it, then it will generate
+    // an edge that will receive Mkl tensor from a node.
+    // First, let's assert that this op is Mkl layer.
+    DataType T;
+    TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
+    // If this op has been rewritten, then its name must have been same as
+    // Mkl op.
+    CHECK_EQ(mkl_layer_registry::IsMklLayer(n->type_string(), T), true);
+    // output slot number for Mkl tensor would be N+slot number of TensorFlow
+    // tensor, where N is total number of TensorFlow tensors.
+    *mkl_node = n;
+    *mkl_node_output_slot = GetTensorMetaDataIndex(n_output_slot,
+                                                  n->num_outputs());
+  } else {
+    // If we have not visited the node and rewritten it, then we need
+    // to create a dummy node that will feed a dummy Mkl tensor to this node.
+    // DummyMklTensor node has no input and generates only 1 output
+    // (dummy Mkl tensor) as output slot number 0.
+    GetDummyMklTensorNode(g, mkl_node, n);
+    CHECK_NOTNULL(*mkl_node);
+    *mkl_node_output_slot = 0;
+  }
+}
+
+int MklLayoutRewritePass::SetUpContiguousInputs(std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
+    NodeBuilder* nb, Node* old_node,
+    std::vector<NodeBuilder::NodeOut>* workspace_tensors,
+    bool are_workspace_tensors_available) {
+  CHECK_NOTNULL(workspace_tensors);
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+
+  // Number of input slots to original op
+  // Input slots are represented by .Input() calls in REGISTER_OP.
+  int old_node_input_slots = old_node->op_def().input_arg_size();
+  // Actual number of inputs can be greater than or equal to number
+  // of Input slots because inputs of type list could be unfolded.
+  CHECK_GE(old_node_inputs.size(), old_node_input_slots);
+  int nnsidx = 0;  // slot index for inputs of new node
+
+  // Let's copy all inputs (TF tensors) of original node to new node.
+  int iidx = 0;
+  for (int onsidx = 0; onsidx < old_node_input_slots; onsidx++) {
+    // An input slot could be a single tensor or a list. We need
+    // to handle this case accordingly.
+    CHECK_LT(iidx, old_node_inputs.size());
+    const OpDef::ArgDef& arg = old_node->op_def().input_arg(onsidx);
+    if (ArgIsList(arg)) {
+      std::vector<NodeBuilder::NodeOut> new_node_inputs;
+      int N = GetTensorListLength(arg, old_node);
+      GetNodesProducingTFTensorList(old_node_inputs, &iidx, N,
+                                    &new_node_inputs);
+      nb->Input(new_node_inputs);
+      nnsidx++;
+    } else {
+      nb->Input(old_node_inputs[iidx].first, old_node_inputs[iidx].second);
+      iidx++;
+      nnsidx++;
+    }
+  }
+
+  // If workspace tensors are available for this op and we are using
+  // contiguous ordering then we need to add Tensorflow tensor for
+  // workspace here because Tensorflow tensor for workspace is the
+  // last tensor in the list of Tensorflow tensors.
+  if (are_workspace_tensors_available) {
+    CHECK_EQ(workspace_tensors->size(), 2);
+    // Tensorflow tensor
+    nb->Input((*workspace_tensors)[0].node, (*workspace_tensors)[0].index);
+    nnsidx++;
+  }
+
+  // Let's now setup all Mkl inputs to new node.
+  // Number of Mkl inputs must be same as number of TF inputs.
+  iidx = 0;
+  for (int onsidx = 0; onsidx < old_node_input_slots; onsidx++) {
+    // An input slot could be a single tensor or a list. We need
+    // to handle this case accordingly.
+    CHECK_LT(iidx, old_node_inputs.size());
+    const OpDef::ArgDef& arg = old_node->op_def().input_arg(onsidx);
+    if (ArgIsList(arg)) {
+      std::vector<NodeBuilder::NodeOut> new_node_inputs;
+      int N = GetTensorListLength(arg, old_node);
+      GetNodesProducingMklTensorList(g, old_node_inputs, &iidx,
+                                     N, &new_node_inputs);
+      nb->Input(new_node_inputs);
+      nnsidx++;
+    } else {
+      Node* mkl_node = nullptr;
+      int mkl_node_output_slot = 0;
+      GetNodeProducingMklTensor(g, old_node_inputs[iidx].first,
+                                old_node_inputs[iidx].second,
+                                &mkl_node, &mkl_node_output_slot);
+      nb->Input(mkl_node, mkl_node_output_slot);
+      iidx++;
+      nnsidx++;
+    }
+  }
+
+  // If workspace tensors are available for this op and we are using
+  // contiguous ordering then we need to add Mkl tensor for
+  // workspace here because Mkl tensor for workspace is the
+  // last tensor in the list of Mkl tensors.
+  if (are_workspace_tensors_available) {
+    CHECK_EQ(workspace_tensors->size(), 2);
+    // Mkl tensor
+    nb->Input((*workspace_tensors)[1].node, (*workspace_tensors)[1].index);
+    nnsidx++;
+  }
+
+  return nnsidx;
+}
+
+Status MklLayoutRewritePass::SetUpInputs(std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
+    NodeBuilder* nb, Node* old_node) {
+  // Let's check if we need to add workspace tensors for this node.
+  // We add workspace edge only for MaxPool, LRN and BatchNorm.
+  std::vector<NodeBuilder::NodeOut> workspace_tensors;
+  bool are_workspace_tensors_available = false;
+  AddWorkSpaceEdgeIfNeeded(g, old_node, nb, &workspace_tensors,
+                           &are_workspace_tensors_available);
+
+  int new_node_input_slots = 0;
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    // TODO(nhasabni): implement this function just for same of completion.
+    // We do not use interleaved ordering right now.
+    // new_input_slots = SetUpInputsInterleaved();
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    new_node_input_slots = SetUpContiguousInputs(g, old_node_inputs, nb,
+                                                old_node, &workspace_tensors,
+                                              are_workspace_tensors_available);
+  }
+
+  // Sanity check
+  int old_node_input_slots = old_node->op_def().input_arg_size();
+  if (!are_workspace_tensors_available) {
+    // If we are not adding workspace tensors for this op, then the total
+    // number of input slots to the new node _must_ be 2 times the number
+    // of input slots to the original node: N original Tensorflow tensors and
+    // N for Mkl tensors corresponding to each Tensorflow tensors.
+    CHECK_EQ(new_node_input_slots, old_node_input_slots * 2);
+  } else {
+    // If we are adding workspace tensors for this op, then the total
+    // The total number of input slots to new node _must_ be 2 times the number
+    // of input slots to the original node: N original Tensorflow tensors and
+    // N for Mkl tensors corresponding to each Tensorflow tensors plus 2
+    // (for workspace Tensorflow tensor and workspace Mkl tensor).
+    CHECK_EQ(new_node_input_slots, old_node_input_slots * 2 + 2);
   }
 
   return Status::OK();
@@ -654,21 +1079,24 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
                            4);
   TensorShape dummy_shape({1});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(
-      NodeBuilder((*g)->NewName("DMT"), "Const")
-          .Attr("value", proto)
-          .Attr("dtype", dt)
-          .Device(orign->def().device())  // We place this node on same
-                                          // device as device of original
-                                          // node.
-          .Finalize(&**g, out));
+  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
+                  .Attr("value", proto)
+                  .Attr("dtype", dt)
+                  .Device(orign->def().device())  // We place this node on same
+                  // device as device of original
+                  // node.
+                  .Finalize(&**g, out));
   (*out)->set_assigned_device_name(orign->assigned_device_name());
 }
 
 void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
-                                                    Node* orign,
-                                                    NodeBuilder* nb) {
-  bool workspace_edge_added = false;
+    Node* orign, NodeBuilder* nb,
+    std::vector<NodeBuilder::NodeOut>* ws_tensors,
+    bool* are_ws_tensors_added) {
+  bool workspace_edge_added = false;  // Default initializer
+  CHECK_NOTNULL(are_ws_tensors_added);
+  *are_ws_tensors_added = false;  // Default initializer
+
   DataType T;
   TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
   for (auto ws : wsinfo_) {
@@ -707,8 +1135,10 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
       // workspace info. fwdslot and bwdslot in workspace info specify
       // an edge between which slots connect forward and backward op.
       // Once all these criteria match, we add a workspace edge between
-      // wsfwdslot and wsbwdslot. It's corresponding Mkl tensor is added
-      // in wsfwdslot+1 and wsbwdslot+1.
+      // wsfwdslot and wsbwdslot. It's corresponding Mkl tensor is
+      // determined by interleaved/contiguous ordering. Function
+      // DataIndexToMetaDataIndex tells us the location of Mkl tensor
+      // from the location of the Tensorflow tensor.
       for (const Edge* e : orign->in_edges()) {
         if (e->src_output() == ws.fwdslot &&
             // We would have rewritten the forward op, so we need to use
@@ -716,10 +1146,13 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
             e->src()->type_string() == GetMklOpName(ws.fwdop) &&
             e->dst_input() == ws.bwdslot) {
           nb->Attr("workspace_enabled", true);
+          CHECK_NOTNULL(ws_tensors);
           // Add workspace edge between fwd op and bwd op.
-          nb->Input(e->src(), ws.wsfwdslot);
+          ws_tensors->push_back(NodeBuilder::NodeOut(e->src(), ws.wsfwdslot));
           // Add Mkl tensor edge for workspace edge between fwd op and bwd op.
-          nb->Input(e->src(), ws.wsfwdslot + 1);
+          ws_tensors->push_back(NodeBuilder::NodeOut(e->src(),
+            DataIndexToMetaDataIndex(ws.wsfwdslot, e->src()->num_outputs())));
+          *are_ws_tensors_added = true;
           // In terms of input ordering, we add these calls to add Input
           // here because workspace edge (and its Mkl tensor) is the last
           // edge in the fwdop and bwdop. So all inputs before workspace
@@ -744,9 +1177,12 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         GetDummyMklTensorNode(g, &dmt_mkl_ws, orign);
         CHECK_NOTNULL(dmt_ws);
         CHECK_NOTNULL(dmt_mkl_ws);
-        nb->Input(dmt_ws, 0);      // We add dummy tensor as workspace tensor.
-        nb->Input(dmt_mkl_ws, 0);  // We add dummy tensor as Mkl
-                                   // tensor for workspace tensor.
+        CHECK_NOTNULL(ws_tensors);
+        // We add dummy tensor as workspace tensor.
+        ws_tensors->push_back(NodeBuilder::NodeOut(dmt_ws, 0));
+        // We add dummy tensor as Mkl tensor for workspace tensor.
+        ws_tensors->push_back(NodeBuilder::NodeOut(dmt_mkl_ws, 0));
+        *are_ws_tensors_added = true;
         VLOG(1) << "MklLayoutRewritePass: dummy workspace_enabled for "
                 << orign->type_string();
       }
@@ -800,6 +1236,28 @@ void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
   nb->Attr("data_format", data_format);
 }
 
+void MklLayoutRewritePass::CopyAttrsLRN(const Node* orign, NodeBuilder* nb) {
+  DataType T;
+  int depth_radius;
+  float bias;
+  float alpha;
+  float beta;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "depth_radius", &depth_radius));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "bias", &bias));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "alpha", &alpha));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "beta", &beta));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("depth_radius", depth_radius);
+  nb->Attr("bias", bias);
+  nb->Attr("alpha", alpha);
+  nb->Attr("beta", beta);
+}
+
 void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
                                             NodeBuilder* nb) {
   DataType T;
@@ -832,6 +1290,72 @@ void MklLayoutRewritePass::CopyAttrsRelu(const Node* orign, NodeBuilder* nb) {
   nb->Attr("T", T);
 }
 
+void MklLayoutRewritePass::CopyAttrsSplit(const Node* orign, NodeBuilder* nb) {
+  DataType T;
+  string data_format;
+  int num_split;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "num_split", &num_split));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("num_split", num_split);
+  nb->Attr("data_format", data_format);
+}
+
+void MklLayoutRewritePass::CopyAttrsConcat(const Node* orign, NodeBuilder* nb) {
+  DataType T;
+  int N;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "N", &N));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("N", N);
+}
+
+void MklLayoutRewritePass::CopyAttrsConcatV2(const Node* orign,
+                                             NodeBuilder* nb) {
+  DataType T;
+  int N;
+  DataType tidx;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "N", &N));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "Tidx", &tidx));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("N", N);
+  nb->Attr("Tidx", tidx);
+}
+
+void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orign,
+                                                   NodeBuilder* nb) {
+  DataType T;
+  float epsilon;
+  string data_format;
+  bool is_training;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "epsilon", &epsilon));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orign->def(), "is_training", &is_training));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("epsilon", epsilon);
+  nb->Attr("data_format", data_format);
+  nb->Attr("is_training", is_training);
+}
+
 //////////////////////////////////////////////////////////////////////////
 //           Helper functions related to node merge pass
 //////////////////////////////////////////////////////////////////////////
@@ -961,12 +1485,28 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     // Build new node. We use same name as original node, but change the op
     // name.
     NodeBuilder nb(succ->name(), csinfo_.mklconv2dwithbias);
-    nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
-    nb.Input(pred_in[1].first, pred_in[1].second);  // Mkl for In1
-    nb.Input(pred_in[2].first, pred_in[2].second);  // In2 of Conv2D
-    nb.Input(pred_in[3].first, pred_in[3].second);  // Mkl for In2
-    nb.Input(succ_in[1].first, succ_in[1].second);  // In2 of BiasAdd
-    nb.Input(oper3_mkl, oper3_mkl_slot);            // Mkl for In2 of BiasAdd
+    if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+      nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
+      // pred_in[1] will be Mkl tensor for In1 if we follow interleaved
+      // ordering, and it will be 2nd Tensorflow tensor for Conv2D if
+      // we follow contiguous ordering.
+      nb.Input(pred_in[1].first, pred_in[1].second);  // Mkl for In1
+      nb.Input(pred_in[2].first, pred_in[2].second);  // In2 of Conv2D
+      nb.Input(pred_in[3].first, pred_in[3].second);  // Mkl for In2
+      nb.Input(succ_in[1].first, succ_in[1].second);  // In2 of BiasAdd
+      nb.Input(oper3_mkl, oper3_mkl_slot);            // Mkl for In2 of BiasAdd
+    } else {
+      CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+      nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
+      // pred_in[1] will be Mkl tensor for In1 if we follow interleaved
+      // ordering, and it will be 2nd Tensorflow tensor for Conv2D if
+      // we follow contiguous ordering.
+      nb.Input(pred_in[1].first, pred_in[1].second);  // In2 of Conv2D
+      nb.Input(succ_in[1].first, succ_in[1].second);  // In2 of BiasAdd
+      nb.Input(pred_in[2].first, pred_in[2].second);  // Mkl for In1 of Conv2D
+      nb.Input(pred_in[3].first, pred_in[3].second);  // Mkl for In2 of Conv2D
+      nb.Input(oper3_mkl, oper3_mkl_slot);            // Mkl for In2 of BiasAdd
+    }
 
     // Copy attributes from Conv2D to Conv2DWithBias.
     CopyAttrsConv2D(const_cast<const Node*>(pred), &nb);
@@ -1049,8 +1589,12 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   }
 
   // Get all inputs.
-  const int num = orign->num_inputs();
-  CHECK_EQ(num, ri->numins);
+  const int num = orign->in_edges().size();
+  // Check the number of inputs against the user-specified value for non-vararg
+  // nodes.
+  if (!IsVarArgNode(orign)) {
+    CHECK_EQ(num, ri->numins);
+  }
   gtl::InlinedVector<Node*, 4> control_edges;
   gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num);
   FillInputs(orign, &control_edges, &inputs);
@@ -1082,10 +1626,6 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   // Set the Mkl layer label for this op.
   nb.Attr("_kernel", mkl_layer_registry::kMklLayerLabel);
 
-  // Add workspace edge to this node if needed.
-  // We add workspace edge only for MaxPool, LRN and BatchNorm.
-  AddWorkSpaceEdgeIfNeeded(g, orign, &nb);
-
   // Finalize graph and get new node.
   Node* newn = nullptr;
   TF_CHECK_OK(nb.Finalize(&**g, &newn));
@@ -1096,15 +1636,17 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   // Since the output also follows same ordering among Tensorflow tensors and
   // Mkl tensors. We need to connect Tensorflow tensors appropriately.
   // Specifically, nth output of original node will become 2*nth output of
-  // Mkl node. GetTensorDataIndex provides this mapping function.
+  // Mkl node for interleaved ordering of tensors. For contiguous ordering of
+  // tensors it will be n. GetTensorDataIndex provides this mapping function.
   for (const Edge* e : orign->out_edges()) {
     // We need to handle control-edges by using their original slot number.
     // Generally, -1 is reserved for control slot.
     if (e->src_output() < 0) {
       (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
     } else {
-      (*g)->AddEdge(newn, GetTensorDataIndex(e->src_output()), e->dst(),
-                    e->dst_input());
+      (*g)->AddEdge(newn, GetTensorDataIndex(e->src_output(),
+                            e->src()->num_outputs()),
+                    e->dst(), e->dst_input());
     }
   }
 
@@ -1208,6 +1750,7 @@ MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
   if (!GetNodeAttr(n->def(), "T", &T).ok()) {
     return nullptr;
   }
+
   if (!mkl_layer_registry::IsMklLayer(GetMklOpName(n->type_string()), T)) {
     return nullptr;
   }
diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc
index 142d60d611..5b9201939d 100644
--- a/tensorflow/core/graph/mkl_layout_pass_test.cc
+++ b/tensorflow/core/graph/mkl_layout_pass_test.cc
@@ -110,7 +110,11 @@ class MklLayoutPassTest : public ::testing::Test {
 };
 
 REGISTER_OP("Input").Output("o: float").SetIsStateful();
+REGISTER_OP("InputList").Output("o: N * float")
+                         .Attr("N: int")
+                         .SetIsStateful();
 REGISTER_OP("HalfInput").Output("o: half").SetIsStateful();
+REGISTER_OP("Int32Input").Output("o: int32").SetIsStateful();
 REGISTER_OP("MklInput").Output("o: uint8").SetIsStateful();
 REGISTER_OP("MklInput2").Output("o: uint8").Output("o1: uint8").SetIsStateful();
 
@@ -133,12 +137,14 @@ TEST_F(MklLayoutPassTest, Basic) {
 
 // Test set 1: Conv2D + AddBias
 
-// C=MklConv2D(A,M,B,N); E=BiasAdd(C,D); Z=Sub(E,Y)
+// C=MklConv2D(A,M,B,N); E=BiasAdd(C,D); Z=Sub(E,Y) (for interleaved ordering)
+// C=MklConv2D(A,B,M,N); E=BiasAdd(C,D); Z=Sub(E,Y) (for contiguous ordering)
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'N' op: 'MklInput'}"
       "node { name: 'C' op: 'MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -146,7 +152,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'BiasAdd'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -158,17 +164,19 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
-            "M(MklInput);N(MklInput);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
-            "DMT/_0->E:5;E->Z;M->E:1;N->E:3;Y->Z:1");
+            "M(MklInput);N(MklInput);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
+            "DMT/_0->E:5;E->Z;M->E:3;N->E:4;Y->Z:1");
 }
 
-// C=MklConv2D(A,M:1,B,N:1); E=BiasAdd(C,D); Z=Sub(E,Y)
+// C=MklConv2D(A,M:1,B,N:1); E=BiasAdd(C,D); Z=Sub(E,Y) (for interleaved)
+// C=MklConv2D(A,B,M:1,N:1); E=BiasAdd(C,D); Z=Sub(E,Y) (for contiguous)
 // Test for correct output slots selected
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput2'}"
       "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput2'}"
       "node { name: 'N' op: 'MklInput2'}"
       "node { name: 'C' op: 'MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -176,7 +184,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M:1', 'B', 'N:1']}"
+      " input: ['A', 'B', 'M:1', 'N:1']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'BiasAdd'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -188,8 +196,8 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
-            "M(MklInput2);N(MklInput2);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
-            "DMT/_0->E:5;E->Z;M:1->E:1;N:1->E:3;Y->Z:1");
+            "M(MklInput2);N(MklInput2);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
+            "DMT/_0->E:5;E->Z;M:1->E:3;N:1->E:4;Y->Z:1");
 }
 
 // C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
@@ -197,6 +205,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
 // We will first rewrite Conv2D to MklConv2D, and then merge MklConv2D
 // with BiasAdd to produce MklConv2DWithBias.
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
   InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'B' op: 'Input'}"
@@ -219,7 +228,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);E(MklConv2DWithBias);Y(Input);Z(Sub)|"
-            "A->E;B->E:2;D->E:4;DMT/_0->E:1;DMT/_1->E:3;DMT/_2->E:5;"
+            "A->E;B->E:1;D->E:2;DMT/_0->E:3;DMT/_1->E:4;DMT/_2->E:5;"
             "E->Z;Y->Z:1");
 }
 
@@ -227,8 +236,8 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_NoAddBias) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'N' op: 'MklInput'}"
       "node { name: 'C' op: 'MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -236,18 +245,18 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_NoAddBias) {
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}");
+      " input: ['A', 'B', 'M', 'N']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);M(MklInput);N(MklInput)|"
-            "A->C;B->C:2;M->C:1;N->C:3");
+             "A->C;B->C:1;M->C:2;N->C:3");
 }
 
 // MklConv2D output does not go to BiasAdd.
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow1) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'N' op: 'MklInput'}"
       "node { name: 'C' op: 'MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -255,7 +264,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow1) {
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'Input'}"
       "node { name: 'F' op: 'BiasAdd'"
@@ -264,7 +273,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow1) {
       " input: ['D', 'E'] }");  // Output of MklConv2D does not go to BiasAdd.
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "M(MklInput);N(MklInput)|A->C;B->C:2;D->F;E->F:1;M->C:1;N->C:3");
+            "M(MklInput);N(MklInput)|A->C;B->C:1;D->F;E->F:1;M->C:2;N->C:3");
 }
 
 // MklConv2D has two outgoing edges: BiasAdd and some other dummy node (Add).
@@ -272,8 +281,8 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow1) {
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'N' op: 'MklInput'}"
       "node { name: 'C' op: 'MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -281,7 +290,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'Input'}"
       "node { name: 'F' op: 'BiasAdd'"
@@ -294,8 +303,8 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
       " input: ['C', 'E'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "G(Add);M(MklInput);N(MklInput)|A->C;B->C:2;C->G;D->F;"
-            "E->F:1;E->G:1;M->C:1;N->C:3");
+            "G(Add);M(MklInput);N(MklInput)|A->C;B->C:1;C->G;D->F;"
+            "E->F:1;E->G:1;M->C:2;N->C:3");
 }
 
 // data_format attribute value mismatch. Merge should not be done
@@ -303,8 +312,8 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_AttrMismatch) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'N' op: 'MklInput'}"
       "node { name: 'C' op: 'MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -312,7 +321,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_AttrMismatch) {
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'BiasAdd'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -320,18 +329,56 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_AttrMismatch) {
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);D(Input);E(BiasAdd);M(MklInput);"
-            "N(MklInput)|A->C;B->C:2;C->E;D->E:1;M->C:1;N->C:3");
+            "N(MklInput)|A->C;B->C:1;C->E;D->E:1;M->C:2;N->C:3");
 }
 
+// Disabling Conv2DBackpropBias test for now as we have disabled rewrite
+// of BiasAddGrad into BackpropBias
+#if 0
+// Test set 2: MklConv2D..BiasAddGrad -> MklConv2DWithBiasBackpropBias
+// rewrite tests
+
+// D=MklConv2D(A,M,B,N,C,O); E=Sub(D,A); F=BiasAddGrad(E)
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'O' op: 'MklInput'}"
+      "node { name: 'D' op: 'MklConv2DWithBias'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C', 'M', 'N', 'O']}"
+      "node { name: 'E' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['D', 'A']}"
+      "node { name: 'F' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['E'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(MklConv2DWithBias);DMT/_0(Const);"
+            "E(Sub);F(MklConv2DWithBiasBackpropBias);M(MklInput);N(MklInput);"
+            "O(MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;DMT/_0->F:1;E->F;"
+            "M->D:3;N->D:4;O->D:5");
+}
+#endif
+
 // No MklConv2D in context, but Conv2D in context.
 // Only Conv2D would be rewritten to MklConv2D, but no rewrite
 // for BiasAddGrad should happen.
-// C=MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D)
+// C=MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D) (for interleaved)
+// C=MklConv2D(A,B,M,N); D=Sub(C,A); E=BiasAddGrad(D) (for contiguous)
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'N' op: 'MklInput'}"
       "node { name: 'C' op: 'MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -339,7 +386,7 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Sub'"
       " attr {key: 'T'                 value { type: DT_FLOAT } }"
       " input: ['C', 'A']}"
@@ -349,8 +396,8 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
       " input: ['D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);D(Sub);E(BiasAddGrad);"
-            "M(MklInput);N(MklInput)|A->C;A->D:1;B->C:2;C->D;D->E;"
-            "M->C:1;N->C:3");
+            "M(MklInput);N(MklInput)|A->C;A->D:1;B->C:1;C->D;D->E;"
+            "M->C:2;N->C:3");
 }
 
 // No Conv2D in the context for BiasAddGrad. No rewrite should happen.
@@ -463,7 +510,7 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Basic) {
       " input: ['B', 'C'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);D(Mul);DMT/_0(Const);DMT/_1(Const)|"
-            "A->C;B->C:2;B->D;C->D:1;DMT/_0->C:1;DMT/_1->C:3");
+            "A->C;B->C:1;B->D;C->D:1;DMT/_0->C:2;DMT/_1->C:3");
 }
 
 // 2 Conv2D Ops in sequence. Both should get transformed and 1st Conv2D will
@@ -490,8 +537,8 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Positive1) {
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(MklConv2D);D(MklConv2D);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;B->C:2;C->D:2;C->E;"
-            "C:1->D:3;D->E:1;DMT/_0->C:1;DMT/_1->C:3;DMT/_2->D:1");
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;B->C:1;C->D:1;C->E;"
+            "C:1->D:3;D->E:1;DMT/_0->C:2;DMT/_1->C:3;DMT/_2->D:2");
 }
 
 // Conv2D with INT32 which is not supported by Mkl
@@ -513,10 +560,373 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Negative_UnsupportedType) {
             "A->C;B->C:1;B->D;C->D:1");
 }
 
+// Concat Op test: Concat with no Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Basic) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['A', 'B']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(MklConcat);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D;B->D:1;B->D:2;C->E;"
+            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+}
+
+// Concat with 2 Mkl layers feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_Mkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['G', 'E', 'F']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(MklConv2D);"
+            "F(MklConv2D);G(Const);H(MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
+            "DMT/_4->H:3;E->H:1;E:1->H:4;F->H:2;F:1->H:5;G->H;H->I:1");
+}
+
+// Concat with 1 Mkl and 1 non-Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_MixedMkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['G', 'E', 'F']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);E(MklConv2D);F(Mul);G(Const);"
+            "H(MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "DMT/_1->E:3;DMT/_2->H:3;DMT/_3->H:5;E->H:1;E:1->H:4;F->H:2;"
+            "G->H;H->I:1");
+}
+
+#if 0
+// ConcatV2 Op test: ConcatV2 with no Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Basic) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['B:0', 'B:1', 'A']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(MklConcat);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D:2;B->D;B:1->D:1;C->E;"
+            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+}
+#endif
+
+// ConcatV2 with 2 Mkl layers feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_Mkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['E', 'F', 'G']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(MklConv2D);"
+            "F(MklConv2D);G(Const);H(MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
+            "DMT/_4->H:5;E->H;E:1->H:3;F->H:1;F:1->H:4;G->H:2;H->I:1");
+}
+
+// ConcatV2 with 1 Mkl and 1 non-Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_MixedMkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['E', 'F', 'G']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);E(MklConv2D);F(Mul);G(Const);"
+            "H(MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "DMT/_1->E:3;DMT/_2->H:4;DMT/_3->H:5;E->H;E:1->H:3;F->H:1;"
+            "G->H:2;H->I:1");
+}
+
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to rewriting node for workspace edges
 /////////////////////////////////////////////////////////////////////
 
+/* Test LRN->MaxPool->MaxPoolGrad->LRNGrad replacement by workspace nodes. */
+TEST_F(MklLayoutPassTest, MaxPoolLRN_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['B'] }"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'MaxPoolGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['B', 'C', 'D'] }"
+      "node { name: 'F' op: 'Input'}"
+      "node { name: 'G' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['E', 'F', 'B'] }"
+      "node { name: 'H' op: 'Input'}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['H', 'G'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+      "A(Input);B(MklLRN);C(MklMaxPool);D(Input);DMT/_0(Const);DMT/_1(Const);"
+      "DMT/_2(Const);E(MklMaxPoolGrad);F(Input);G(MklLRNGrad);H(Input);I(Mul)|"
+      "A->B;B->C;B->E;B->G:2;B:1->G:3;B:2->C:1;B:2->E:4;B:2->G:6;B:3->G:7;"
+      "C->E:1;C:1->E:3;C:2->E:5;C:3->E:7;D->E:2;DMT/_0->B:1;DMT/_1->E:6;"
+      "DMT/_2->G:5;E->G;E:1->G:4;F->G:1;G->I:1;H->I");
+}
+
+/* Test LRN->LRNGrad replacement by workspace nodes. */
+TEST_F(MklLayoutPassTest, LRN_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['C', 'D', 'B'] }"
+      "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'E'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);E(MklLRNGrad);F(Mul)|"
+            "A->B;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;C->E;C->F;D->E:1;"
+            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:5;E->F:1");
+}
+
+/* Test LRN->LRNGrad replacement when only one of them is present. */
+TEST_F(MklLayoutPassTest, LRN_Negative1) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MklLRN);C(Mul);DMT/_0(Const)|"
+            "A->B;A->C;B->C:1;DMT/_0->B:1");
+}
+
+/* Test LRN->LRNGrad replacement when only one of them is present. */
+TEST_F(MklLayoutPassTest, LRN_Negative2) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A', 'B', 'C'] }"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(MklLRNGrad);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
+            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
+            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+}
+
+/* Test LRN->LRNGrad negative case, where single LRN feeds
+   2 LRNGrad nodes at different slots. */
+TEST_F(MklLayoutPassTest, LRN_Negative3) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['C', 'D', 'B'] }"
+      "node { name: 'F' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['C', 'B', 'D'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['E', 'F'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);DMT/_5(Const);"
+            "DMT/_6(Const);E(MklLRNGrad);F(MklLRNGrad);G(Mul)|A->B;B->E:2;"
+            "B->F:1;B:1->E:3;B:2->E:6;B:2->F:5;B:3->E:7;C->E;C->F;D->E:1;"
+            "D->F:2;DMT/_0->B:1;DMT/_1->F:3;DMT/_2->F:7;DMT/_3->F:4;"
+            "DMT/_4->F:6;DMT/_5->E:4;DMT/_6->E:5;E->G;F->G:1");
+}
+
 /* Test MaxPool->MaxPoolGrad replacement by workspace+rewrite nodes. */
 TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Positive) {
   InitGraph(
@@ -542,8 +952,8 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Positive) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(MklMaxPool);C(Input);D(Input);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);E(MklMaxPoolGrad);F(Mul)|"
-            "A->B;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;C->E;C->F;D->E:4;"
-            "DMT/_0->B:1;DMT/_1->E:1;DMT/_2->E:5;E->F:1");
+            "A->B;B->E:1;B:1->E:3;B:2->E:5;B:3->E:7;C->E;C->F;D->E:2;"
+            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:6;E->F:1");
 }
 
 // Test MaxPool>MaxPoolGrad replacement when only one of them is present.
@@ -566,7 +976,7 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative1) {
             "A->B;A->C;B->C:1;DMT/_0->B:1");
 }
 
-// Test MaxPool->MaxPoolGrad replacement when only one of them is present.
+// Test MaxPoolGrad replacement when only one of them is present.
 // In this case, we will rewrite MaxPoolGrad and for workspace tensor and
 // its Mkl part, we will generate dummy tensor.
 TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) {
@@ -586,8 +996,8 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(MklMaxPoolGrad);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
-            "A->D;A->E;B->D:2;C->D:4;D->E:1;DMT/_0->D:1;DMT/_1->D:3;"
-            "DMT/_2->D:5;DMT/_3->D:6;DMT/_4->D:7");
+            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
+            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
 }
 
 /////////////////////////////////////////////////////////////////////
diff --git a/tensorflow/core/graph/mkl_optimizer_merge.cc b/tensorflow/core/graph/mkl_optimizer_merge.cc
deleted file mode 100644
index a171a27d8f..0000000000
--- a/tensorflow/core/graph/mkl_optimizer_merge.cc
+++ /dev/null
@@ -1,651 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifdef INTEL_MKL
-// This module implements node merging optimization on the graph.
-// We process the nodes in the graph in reverse postorder
-// (i.e. inputs before their downstream dependencies).
-//
-#include <memory>
-#include <queue>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "tensorflow/core/graph/mkl_optimizer_merge.h"
-
-#include "tensorflow/core/common_runtime/function.h"
-#include "tensorflow/core/common_runtime/optimization_registry.h"
-#include "tensorflow/core/framework/node_def_util.h"
-#include "tensorflow/core/graph/algorithm.h"
-#include "tensorflow/core/graph/graph.h"
-#include "tensorflow/core/graph/node_builder.h"
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/lib/gtl/map_util.h"
-#include "tensorflow/core/lib/hash/hash.h"
-#include "tensorflow/core/platform/logging.h"
-
-namespace tensorflow {
-
-// How many hops do we search for matching node in the backward dataflow graph?
-// We use maxhop of 10 based on empirical observations. Also, these are
-// maxhops in backward data-flow graph. Since input of forward nodes (Conv2D)
-// directly goes to backward nodes, we do not expect the hop-distance
-// would be more than few nodes.
-static size_t kNodeMergeContextMaxDepth = 10;
-
-// This optimization pass performs two tasks: merge
-// nodes in the forward pass, and rewrite the gradient ops
-// corresponding to merged forward ops.
-//
-// Merging nodes in the graph: Currently, it merges Conv2D+AddBias together.
-//
-// Rewriting nodes in the graph: This is neded in order to optimize
-// gradient ops of Conv2D+AddBias. Gradient op of both the Conv2D and
-// MatMul is BiasAddGrad, and we need to rewrite BiasAddGrad into
-// Conv2D-specific BiasAddGrad, and MatMul-specific BiasAddGrad.
-// This is context-specific optimization, where the context is the
-// forward operator that the BiasAddGrad corresponds to.
-class NodeMergeRewritePass : public GraphOptimizationPass {
- public:
-  NodeMergeRewritePass() {
-    csinfo_.conv2d = "MklConv2D";
-    csinfo_.conv2dwithbias = "MklConv2DWithBias";
-    csinfo_.conv2dwithbiasbackpropbias = "Conv2DWithBiasBackpropBias";
-    csinfo_.biasadd = "BiasAdd";
-    csinfo_.matmul = "MatMul";
-    csinfo_.biasaddgrad = "BiasAddGrad";
-
-    minfo_.push_back(
-        {csinfo_.conv2d, csinfo_.biasadd, 0, csinfo_.conv2dwithbias});
-
-// We use maxhop of 10 based on emperical observations. Also, these are
-// maxhops in backward data-flow graph. Since input of forward nodes
-// (Conv2D) directly goes to backward nodes, we do not expect the
-// hop-distance would be more than few nodes.
-// TODO(nhasabni) Temporarily disabling rewrite of BiasAddGrad.
-// Will enable it once we support Conv2DWithBiasBackpropBias op.
-#if 0
-    rinfo_.push_back({csinfo_.biasaddgrad, csinfo_.conv2dwithbiasbackpropbias,
-                  {csinfo_.conv2dwithbias, kNodeMergeContextMaxDepth}});
-    rinfo_.push_back({csinfo_.biasaddgrad, csinfo_.conv2dwithbiasbackpropbias,
-                  {csinfo_.conv2d, kNodeMergeContextMaxDepth}});
-    // For now, we are rewriting BiasAddGrad to BiasAddGrad for MatMul. This is
-    // because we do not have a separate Op for MatMulwithBias.
-    rinfo_.push_back({csinfo_.biasaddgrad, csinfo_.biasaddgrad,
-                      {csinfo_.matmul, kNodeMergeContextMaxDepth}});
-#endif
-  }
-
-  // Standard interface to run optimization pass
-  Status Run(const GraphOptimizationPassOptions& options);
-
-  // Helper function which does most of heavy lifting for node merge
-  //
-  // Extracts common functionality between Run public interface and
-  // test interface.
-  //
-  // @return true, if and only if graph is mutated; false otherwise.
-  bool RunPass(std::unique_ptr<Graph>* g);
-
- private:
-  /// Structure to specify information used in node merge
-  typedef struct {
-    string pred;     // Predecessor node string
-    string succ;     // Successor node string
-    int op;          // What operand no the predecessor node corresponds
-                     // to successor node?
-    string newnode;  // Name of the node after merge
-  } MergeInfo;
-
-  /// Structure to specify information used in node rewrite
-  typedef struct {
-    string node;     // Name of the node to be rewritten
-    string rewrite;  // New name of the node after rewrite
-    typedef struct {
-      string fwd;     // Node name in forward pass that this node
-                      // corresponds to
-      size_t maxhop;  // Maximum number of hops the mfwd_ is located
-                      // from this node. If mfwd_ is farther than mmaxhop_
-                      // then we do not rewrite the node.
-    } ContextInfo;
-    ContextInfo cinfo;  // Context for rewrite
-  } RewriteInfo;
-
-  /// Structure to store all constant strings
-  typedef struct {
-    string conv2d;
-    string conv2dwithbias;
-    string conv2dwithbiasbackpropbias;
-    string biasadd;
-    string matmul;
-    string biasaddgrad;
-  } ConstStringInfo;
-
-  ConstStringInfo csinfo_;
-  std::vector<MergeInfo> minfo_;
-  std::vector<RewriteInfo> rinfo_;
-
- private:
-  // Return a node that can be merged with input node
-  //
-  // @return pointer to the node if we can find such a
-  // node. Otherwise, it returns nullptr.
-  Node* FindNodeForMerge(const Node* a) const;
-
-  // Merge predecessor node with its successor.
-  // Currently, we merge Conv2D with AddBias only.
-  //
-  // Input nodes succ and pred may be deleted if the call to
-  // this function is successful. Attempt to use the pointers
-  // after the call to function may result is undefined behaviors.
-  //
-  // @input g - input graph, succ - successor node, pred - predecessor node
-  // @return Status::OK(), if merging is successful and supported.
-  //         Returns appropriate Status error code otherwise.
-  //         Graph is updated in case nodes are merged. Otherwise, it is
-  //         not updated.
-  Status MergeNode(std::unique_ptr<Graph>* g, Node* succ, Node* pred);
-
-  // Is input node (n) a candidate for rewrite?
-  //
-  // @return true, if it can be rewritten; false, otherwise.
-  bool IsApplicableRewriteNode(const Node* n) const;
-
-  // Rewrites input node to a new node specified by its matching rewrite info.
-  //
-  // Method first searches matching rewrite info for input node and then
-  // uses that info to rewrite.
-  //
-  // Input node may be deleted in case of rewrite. Attempt to use the node
-  // after the call can result in undefined behaviors.
-  //
-  // @input  g - input graph, n - Node to be rewritten
-  // @return Status::OK(), if the input node is rewritten;
-  //         Returns appropriate Status error code otherwise.
-  //         Graph is updated in case the input node is rewritten.
-  //         Otherwise, it is not updated.
-  Status RewriteNode(std::unique_ptr<Graph>* g, Node* n);
-
-  // Helper function that searches the matching rewriteinfo for the node.
-  // Implements depth-first search in the data dependence graph for the
-  // gradient op in backward direction.
-  //
-  // @input n - Node (gradient op) whose rewriteinfo is to be searched,
-  //        fwdn - pointer to node from the forward pass that this node
-  //        belongs to
-  // @return Matching rewriteinfo in case a match is found; null otherwise.
-  const RewriteInfo* FindMatchingRewriteInfo(const Node* n,
-                                             const Node** fwdn) const;
-
-  // Generate a graph node in graph 'g' representing a dummy Mkl tensor node,
-  // and return it in '*out'.
-  // TODO(nhasabni) We should move this to mkl_util.h
-  void GetDummyMklTensorNode(std::unique_ptr<Graph>* g, Node** out);
-};
-
-// We register merge optimizer for phase 2 in pre-placement group.
-// Do not change the ordering of the Mkl passes.
-REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 2,
-                      NodeMergeRewritePass);
-
-static void FillInputs(const Node* n,
-                       gtl::InlinedVector<Node*, 4>* control_edges,
-                       gtl::InlinedVector<std::pair<Node*, int>, 4>* in) {
-  DCHECK_EQ(in->size(), n->num_inputs());
-  control_edges->clear();
-  for (const Edge* e : n->in_edges()) {
-    if (e->IsControlEdge()) {
-      control_edges->push_back(e->src());
-    } else {
-      (*in)[e->dst_input()] = std::make_pair(e->src(), e->src_output());
-    }
-  }
-  std::sort(control_edges->begin(), control_edges->end());
-  if (n->op_def().is_commutative()) {
-    // For commutative inputs, we sort the input by the input Node*
-    // to get a canonical ordering (so that add(a,b) and add(b, a) will
-    // hash to the same value if is_commutative is true for 'add').
-    std::sort(in->begin(), in->end());
-  }
-}
-
-Node* NodeMergeRewritePass::FindNodeForMerge(const Node* a) const {
-  // Search for all matching mergeinfo.
-  // We allow more than one match for extensibility.
-  std::vector<const MergeInfo*> matching_mi;
-  for (auto mi = minfo_.cbegin(); mi != minfo_.cend(); ++mi) {
-    if (a->type_string() == mi->succ) {
-      matching_mi.push_back(&*mi);
-    }
-  }
-
-  for (const MergeInfo* mi : matching_mi) {
-    const int N_in = a->num_inputs();
-    if (mi->op >= N_in) {
-      continue;
-    }
-
-    // Get the control edges and input of node
-    gtl::InlinedVector<Node*, 4> a_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> a_in(N_in);
-    FillInputs(a, &a_control_edges, &a_in);
-
-    // Get operand op of the operator
-    Node* b = nullptr;
-    b = a_in[mi->op].first;
-    if (b == nullptr || (b->type_string() != mi->pred)) {
-      // NOTE: Should the first check be assert?
-      continue;
-    }
-
-    gtl::InlinedVector<Node*, 4> b_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> b_in(N_in);
-    FillInputs(b, &b_control_edges, &b_in);
-
-    // Shouldn't merge if a and b have different control edges.
-    if (a_control_edges != b_control_edges) {
-      continue;
-    } else {
-      // We found a match.
-      return b;
-    }
-  }
-
-  return nullptr;
-}
-
-void NodeMergeRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
-                                                 Node** out) {
-  const DataType dt = DataTypeToEnum<uint8>::v();
-  TensorProto proto;
-  proto.set_dtype(dt);
-  uint8 zero[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-  proto.set_tensor_content(const_cast<const void*>(static_cast<void*>(&zero)),
-                           8);
-  TensorShape dummy_shape({8});
-  dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                  .Attr("value", proto)
-                  .Attr("dtype", dt)
-                  .Finalize(&**g, out));
-}
-
-Status NodeMergeRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
-                                       Node* pred) {
-  CHECK_NOTNULL(succ);
-  CHECK_NOTNULL(pred);
-
-  if (succ->type_string() == csinfo_.biasadd &&
-      pred->type_string() == csinfo_.conv2d) {
-    // 1. Get all attributes from input nodes.
-    DataType T_pred, T_succ;
-    string padding;
-    std::vector<int32> strides;
-    string data_format_pred, data_format_succ;
-    bool use_cudnn_on_gnu;
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "T", &T_pred));
-    TF_CHECK_OK(GetNodeAttr(succ->def(), "T", &T_succ));
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "padding", &padding));
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "strides", &strides));
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "data_format", &data_format_pred));
-    TF_CHECK_OK(GetNodeAttr(succ->def(), "data_format", &data_format_succ));
-    TF_CHECK_OK(
-        GetNodeAttr(pred->def(), "use_cudnn_on_gpu", &use_cudnn_on_gnu));
-    // We check to ensure that data formats of both succ and pred are same.
-    // We expect them to be same, so we can enforce this as assert.
-    // But assert can be too strict, so we enforce this as a check.
-    // If the check fails, then we do not merge two nodes.
-    // We also do same check for devices.
-    if (data_format_pred != data_format_succ || T_pred != T_succ ||
-        pred->assigned_device_name() != succ->assigned_device_name() ||
-        pred->def().device() != succ->def().device()) {
-      return Status(error::Code::INVALID_ARGUMENT,
-                    "data_format or T attribute or devices of Conv2D and "
-                    "BiasAdd do not match. Will skip node merge optimization");
-    }
-
-    // 2. Get inputs from both the nodes.
-    // Find the 2 inputs from the conv and the bias from the add Bias.
-    Node* oper1 = nullptr;
-    Node* oper1_mkl = nullptr;  // Mkl tensor corresponding to oper1
-    Node* oper2 = nullptr;
-    Node* oper2_mkl = nullptr;  // Mkl tensor corresponding to oper2
-    Node* oper3 = nullptr;
-    Node* oper3_mkl = nullptr;  // Mkl tensor corresponding to oper3
-
-    const int succ_num = succ->num_inputs();
-    gtl::InlinedVector<Node*, 4> succ_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> succ_in(succ_num);
-    FillInputs(succ, &succ_control_edges, &succ_in);
-
-    const int pred_num = pred->num_inputs();
-    gtl::InlinedVector<Node*, 4> pred_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> pred_in(pred_num);
-    FillInputs(pred, &pred_control_edges, &pred_in);
-
-    // We need to ensure that there is only 1 edge between Conv2D and AddBias.
-    // Otherwise, merging is semantically incorrect.
-    if (pred->out_edges().size() != 1) {
-      return Status(error::Code::INVALID_ARGUMENT,
-                    "Conv2D has multiple outputs."
-                    "Will skip node merge optimization");
-    }
-
-    for (const Edge* e : pred->out_edges()) {
-      if (e->dst() != succ) {
-        return Status(error::Code::INVALID_ARGUMENT,
-                      "Conv2D does not feed to BiasAdd."
-                      "Will skip node merge optimization");
-      }
-    }
-
-    // Get operand 0, 1 of conv2D and their Mkl tensors.
-    CHECK_EQ(pred->in_edges().size(), 4);  // MklConv2D must have 4 inputs.
-    oper1 = pred_in[0].first;
-    oper1_mkl = pred_in[1].first;
-    oper2 = pred_in[2].first;
-    oper2_mkl = pred_in[3].first;
-    // Get operand 1 of add_bias
-    // BiasAdd must have 2 inputs: Conv, bias
-    CHECK_EQ(succ->in_edges().size(), 2);
-    oper3 = succ_in[1].first;
-    GetDummyMklTensorNode(g, &oper3_mkl);  // Get dummy Mkl tensor node
-    // as BiasAdd does not have Mkl tensor as input.
-    CHECK_NOTNULL(oper3_mkl);
-
-    Node* ret;
-    // We will use the node name of BiasAdd as the name of new node
-    TF_CHECK_OK(NodeBuilder(succ->name(), csinfo_.conv2dwithbias)
-                    .Input(oper1)
-                    .Input(oper1_mkl)
-                    .Input(oper2)
-                    .Input(oper2_mkl)
-                    .Input(oper3)
-                    .Input(oper3_mkl)
-                    .Attr("T", T_pred)
-                    .Attr("strides", strides)
-                    .Attr("padding", padding)
-                    .Attr("data_format", data_format_pred)
-                    .Attr("use_cudnn_on_gpu", use_cudnn_on_gnu)
-                    .Device(succ->def().device())
-                    .Finalize(&**g, &ret));
-    CHECK_NOTNULL(ret);
-
-    // Incoming edges are fixed, we will fix the outgoing edges now.
-    for (const Edge* e : succ->out_edges()) {
-      (*g)->AddEdge(ret, e->src_output(), e->dst(), e->dst_input());
-    }
-
-    // Copy device assigned to old node to new node.
-    // It's ok to use pred or succ as we have enforced a check that
-    // both have same device assigned.
-    ret->set_assigned_device_name(pred->assigned_device_name());
-
-    VLOG(1) << "NodeMergeRewritePass: Merged old node:" << pred->DebugString()
-            << ", and node: " << succ->DebugString()
-            << ", into node:" << ret->DebugString();
-
-    (*g)->RemoveNode(succ);
-    (*g)->RemoveNode(pred);
-
-    return Status::OK();
-  }
-
-  return Status(error::Code::UNIMPLEMENTED,
-                "Unimplemented case for node merge optimization.");
-}
-
-Status NodeMergeRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* n) {
-  CHECK_NOTNULL(n);
-
-  // Get the matching rewriteinfo for the node
-  const Node* fwdn = nullptr;
-  const RewriteInfo* ri = FindMatchingRewriteInfo(n, &fwdn);
-  if (ri == nullptr || fwdn == nullptr) {
-    VLOG(2) << "NodeMergeRewritePass: Rewriteinfo not found for: "
-            << n->type_string();
-    return Status(error::Code::INVALID_ARGUMENT,
-                  "Rewrite info not found for the node."
-                  "Will skip node rewrite optimization");
-  }
-
-  VLOG(1) << "NodeMergeRewritePass: Rewrite called for: " << n->type_string();
-
-  if (n->type_string() == csinfo_.biasaddgrad &&
-      ri->node == csinfo_.biasaddgrad &&
-      (ri->rewrite == csinfo_.conv2dwithbiasbackpropbias ||
-       ri->rewrite == csinfo_.biasaddgrad)) {
-    DataType T;
-    string data_format;
-    TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
-    TF_CHECK_OK(GetNodeAttr(n->def(), "data_format", &data_format));
-
-    int n_num = n->num_inputs();  // this must be 1.
-    CHECK_EQ(n_num, 1);
-
-    gtl::InlinedVector<Node*, 4> n_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> n_in(n_num);
-    FillInputs(n, &n_control_edges, &n_in);
-
-    Node *ret = nullptr, *op = n_in[0].first;
-
-    if (ri->rewrite == csinfo_.conv2dwithbiasbackpropbias) {
-      // Get strides info from Conv2D (node in the forward pass that this
-      // node corresponds to).
-      std::vector<int32> strides;
-      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "strides", &strides));
-
-      // We use same name as original node name as there may be fetchoutputs
-      // associated with it.
-      TF_CHECK_OK(NodeBuilder(n->name(), ri->rewrite)
-                      .Input(op)
-                      .Attr("T", T)
-                      .Attr("data_format", data_format)
-                      .Attr("strides", strides)
-                      .Device(n->def().device())
-                      .Finalize(&**g, &ret));
-    } else {
-      CHECK_EQ(ri->rewrite, csinfo_.biasaddgrad);
-      TF_CHECK_OK(NodeBuilder(n->name(), ri->rewrite)
-                      .Input(op)
-                      .Attr("T", T)
-                      .Attr("data_format", data_format)
-                      .Device(n->def().device())
-                      .Finalize(&**g, &ret));
-    }
-
-    CHECK_NOTNULL(ret);
-
-    // Incoming edges are fixed, we will fix the outgoing edges now.
-    for (const Edge* e : n->out_edges()) {
-      (*g)->AddEdge(ret, e->src_output(), e->dst(), e->dst_input());
-    }
-
-    // Copy device assigned to old node to new node.
-    ret->set_assigned_device_name(n->assigned_device_name());
-
-    VLOG(1) << "MKLOptimizerMergePass: Rewrote old node:" << n->DebugString()
-            << ", into node:" << ret->DebugString();
-    (*g)->RemoveNode(n);
-
-    return Status::OK();
-  }
-
-  return Status(error::Code::UNIMPLEMENTED,
-                "Unimplemented case for node rewrite optimization.");
-}
-
-const NodeMergeRewritePass::RewriteInfo*
-NodeMergeRewritePass::FindMatchingRewriteInfo(const Node* n,
-                                              const Node** fwdn) const {
-  CHECK_NOTNULL(n);
-  CHECK_NOTNULL(fwdn);
-  *fwdn = nullptr;
-
-  // Search for matching rewriteinfo based on node name.
-  // There could be more than one matching rewriteinfos.
-  std::vector<const RewriteInfo*> matching_ri;
-  for (auto ri = rinfo_.cbegin(); ri != rinfo_.cend(); ++ri) {
-    if (n->type_string() == ri->node) {
-      matching_ri.push_back(&*ri);
-    }
-  }
-
-  VLOG(1) << "NodeMergeRewritePass: Searching graph for: " << n->type_string()
-          << " in backwards.";
-
-  // Now we will check for forward op name for rewrite info in data
-  // flow graph. Get the max hops we should search for the fwd node
-  // We are now going to search (breadth-first) backwards in data
-  // dependence graph (for up to max hops) from n for the node
-  // specified in fwd.
-  // queue to maintain nodes to be visited and depth info for
-  // breadth-first search
-  std::queue<std::pair<const Node*, int>> nqueue;
-  const Node* curr_node = n;
-  size_t curr_depth = 0;
-  nqueue.push(std::make_pair(curr_node, curr_depth));
-
-  while (curr_depth < kNodeMergeContextMaxDepth && !nqueue.empty()) {
-    std::pair<const Node*, int> curr_pair = nqueue.front();
-    nqueue.pop();
-
-    std::set<const Node*> visited_nodes;
-    curr_node = curr_pair.first;
-    curr_depth = curr_pair.second;
-    CHECK_NOTNULL(curr_node);
-
-    VLOG(1) << "NodeMergeRewritePass: Visiting node: "
-            << curr_node->type_string() << " at depth: " << curr_depth
-            << " for node: " << n->type_string();
-
-    // If we find a match, we return immediately with the matching rewrite
-    // info.
-    for (const RewriteInfo* ri : matching_ri) {
-      if (curr_node->type_string() == ri->cinfo.fwd) {
-        *fwdn = curr_node;
-        return ri;
-      }
-    }
-
-    // Else we explore backward edges from current node.
-    // Add the source nodes of all incoming edges of the node to the queue.
-    for (const Edge* e : curr_node->in_edges()) {
-      // We do not visit already visited node.
-      if (visited_nodes.find(e->src()) == visited_nodes.end()) {
-        // Depth of these nodes is 1 more than the depth of current node.
-        nqueue.push(std::make_pair(e->src(), curr_depth + 1));
-        visited_nodes.insert(e->src());
-      }
-    }
-  } /* while */
-
-  return nullptr;
-}
-
-bool NodeMergeRewritePass::IsApplicableRewriteNode(const Node* n) const {
-  CHECK_NOTNULL(n);
-
-  // Search for matching rewriteinfo
-  // Even if we find one match, we return true.
-  bool match_found = false;
-  for (const RewriteInfo& ri : rinfo_) {
-    if (n->type_string() == ri.node) {
-      match_found = true;
-      break;
-    }
-  }
-
-  return match_found;
-}
-
-bool NodeMergeRewritePass::RunPass(std::unique_ptr<Graph>* g) {
-  bool result = false;
-  CHECK_NOTNULL(g);
-
-  DumpGraph("Before OptimizeMerge", &**g);
-
-  std::vector<Node*> order;
-  GetReversePostOrder(**g, &order);
-  std::vector<std::pair<Node*, Node*>> nodes_to_be_merged;
-  std::vector<Node*> nodes_to_be_rewritten;
-
-  for (Node* n : order) {
-    if (!n->IsOp()) continue;
-    Node* n1 = nullptr;
-    if ((n1 = FindNodeForMerge(n)) != nullptr) {
-      VLOG(1) << "NodeMergeRewritePass: Scheduled nodes " << n->name()
-              << " and " << n1->name() << " for merging";
-      nodes_to_be_merged.push_back(std::make_pair(n, n1));
-    } else if (IsApplicableRewriteNode(n)) {
-      VLOG(1) << "NodeMergeRewritePass: Scheduled node " << n->name()
-              << " for rewrite";
-      nodes_to_be_rewritten.push_back(n);
-    }
-  }
-
-  for (std::pair<Node*, Node*> i : nodes_to_be_merged) {
-    // Even if MergeNode merges single pair of nodes, we
-    // need to return true.
-    string n1_name = i.first->name();
-    string n2_name = i.second->name();
-    if (MergeNode(g, i.first, i.second) == Status::OK()) {
-      VLOG(1) << "NodeMergeRewritePass: Merged nodes " << n1_name << " and "
-              << n2_name;
-      result = true;
-    }
-  }
-
-  DumpGraph("After OptimizeMerge(nodemerge)", &**g);
-
-  for (Node* i : nodes_to_be_rewritten) {
-    string name = i->name();
-    if (RewriteNode(g, i) == Status::OK()) {
-      VLOG(1) << "NodeMergeRewritePass: Rewrite node: " << name
-              << " successful.";
-      result = true;
-    }
-  }
-
-  DumpGraph("After OptimizeMerge(noderewrite)", &**g);
-
-  return result;
-}
-
-bool OptimizeNodeMerge(std::unique_ptr<Graph>* g) {
-  return NodeMergeRewritePass().RunPass(g);
-}
-
-Status NodeMergeRewritePass::Run(const GraphOptimizationPassOptions& options) {
-  if (options.graph == nullptr) {
-    return Status::OK();
-  }
-
-  // Get the ownership of graph
-  std::unique_ptr<Graph>* g = std::move(options.graph);
-
-  RunPass(g);
-
-  // Return the ownership of graph back
-  options.graph->reset(g->release());
-
-  return Status::OK();
-}
-
-}  // namespace tensorflow
-
-#endif
diff --git a/tensorflow/core/graph/mkl_optimizer_merge.h b/tensorflow/core/graph/mkl_optimizer_merge.h
deleted file mode 100644
index b2caec58af..0000000000
--- a/tensorflow/core/graph/mkl_optimizer_merge.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// An optimization pass that performs node merging and rewrite on graph nodes
-
-#ifndef TENSORFLOW_GRAPH_MKL_OPTIMIZER_MERGE_H_
-#define TENSORFLOW_GRAPH_MKL_OPTIMIZER_MERGE_H_
-
-#ifdef INTEL_MKL
-
-#include <sys/types.h>
-#include <memory>
-#include "tensorflow/core/graph/graph.h"
-
-namespace tensorflow {
-// Interface to invoke the pass for unit test
-//
-// Returns true if and only if 'g' is mutated.
-extern bool OptimizeNodeMerge(std::unique_ptr<Graph>* g);
-}  // namespace tensorflow
-
-#endif  // INTEL_MKL
-
-#endif  // TENSORFLOW_GRAPH_MKL_OPTIMIZER_MERGE_H_
diff --git a/tensorflow/core/graph/mkl_optimizer_merge_test.cc b/tensorflow/core/graph/mkl_optimizer_merge_test.cc
deleted file mode 100644
index f752721d6e..0000000000
--- a/tensorflow/core/graph/mkl_optimizer_merge_test.cc
+++ /dev/null
@@ -1,470 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifdef INTEL_MKL
-
-#include "tensorflow/core/graph/mkl_optimizer_merge.h"
-
-#include <vector>
-#include "tensorflow/core/framework/op.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/graph/graph.h"
-#include "tensorflow/core/graph/graph_constructor.h"
-#include "tensorflow/core/graph/testlib.h"
-#include "tensorflow/core/kernels/ops_util.h"
-#include "tensorflow/core/lib/random/simple_philox.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-#include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/protobuf.h"
-#include "tensorflow/core/platform/test.h"
-#include "tensorflow/core/platform/test_benchmark.h"
-
-namespace tensorflow {
-namespace {
-
-class OptimizerMergeTest : public ::testing::Test {
- public:
-  OptimizerMergeTest() : graph_(OpRegistry::Global()) {}
-
-  static void InitGraph(const string& s, Graph* graph) {
-    GraphDef graph_def;
-
-    auto parser = protobuf::TextFormat::Parser();
-    CHECK(parser.MergeFromString(s, &graph_def)) << s;
-    GraphConstructorOptions opts;
-    TF_CHECK_OK(ConvertGraphDefToGraph(opts, graph_def, graph));
-  }
-
-  void InitGraph(const string& s) {
-    InitGraph(s, &graph_);
-    original_ = CanonicalGraphString(&graph_);
-  }
-
-  static bool IncludeNode(const Node* n) { return n->IsOp(); }
-
-  static string EdgeId(const Node* n, int index) {
-    if (index == 0) {
-      return n->name();
-    } else if (index == Graph::kControlSlot) {
-      return strings::StrCat(n->name(), ":control");
-    } else {
-      return strings::StrCat(n->name(), ":", index);
-    }
-  }
-
-  string CanonicalGraphString(Graph* g) {
-    std::vector<string> nodes;
-    std::vector<string> edges;
-    for (const Node* n : g->nodes()) {
-      if (IncludeNode(n)) {
-        nodes.push_back(strings::StrCat(n->name(), "(", n->type_string(), ")"));
-      }
-    }
-    for (const Edge* e : g->edges()) {
-      if (IncludeNode(e->src()) && IncludeNode(e->dst())) {
-        edges.push_back(strings::StrCat(EdgeId(e->src(), e->src_output()), "->",
-                                        EdgeId(e->dst(), e->dst_input())));
-      }
-    }
-    // Canonicalize
-    std::sort(nodes.begin(), nodes.end());
-    std::sort(edges.begin(), edges.end());
-    return strings::StrCat(str_util::Join(nodes, ";"), "|",
-                           str_util::Join(edges, ";"));
-  }
-
-  string DoNodeMerge() {
-    string before = CanonicalGraphString(&graph_);
-    LOG(ERROR) << "Before node merge optimize: " << before;
-
-    std::unique_ptr<Graph>* ug = new std::unique_ptr<Graph>(&graph_);
-    OptimizeNodeMerge(ug);
-
-    string result = CanonicalGraphString(&graph_);
-    LOG(ERROR) << "After node merge optimize:  " << result;
-    return result;
-  }
-
-  const string& OriginalGraph() const { return original_; }
-
-  Graph graph_;
-  string original_;
-};
-
-REGISTER_OP("Input").Output("o: float").SetIsStateful();
-REGISTER_OP("MklInput").Output("o: uint8").SetIsStateful();
-
-TEST_F(OptimizerMergeTest, Basic) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
-      " input: ['A', 'B'] }"
-      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
-      " input: ['A', 'B'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Mul);D(Mul)|"
-            "A->C;A->D;B->C:1;B->D:1");
-}
-
-// Test set 1: Conv2D + AddBias
-
-// C=MklConv2D(A,M,B,N); E=BiasAdd(C,D); Z=Sub(E,Y)
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Positive) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['C', 'D'] }"
-      "node { name: 'Y' op: 'Input'}"
-      "node { name: 'Z' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['E', 'Y']}");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
-            "M(MklInput);N(MklInput);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
-            "DMT/_0->E:5;E->Z;M->E:1;N->E:3;Y->Z:1");
-}
-
-// C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
-// We do not merge in this case as op is Conv2D and not MklConv2D.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_NoMklConv2D) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Conv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['C', 'D'] }"
-      "node { name: 'Y' op: 'Input'}"
-      "node { name: 'Z' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['E', 'Y']}");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Conv2D);D(Input);E(BiasAdd);Y(Input);Z(Sub)|"
-            "A->C;B->C:1;C->E;D->E:1;E->Z;Y->Z:1");
-}
-
-// Graph contains only MklConv2D, no AddBias.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_NoAddBias) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);M(MklInput);N(MklInput)|"
-            "A->C;B->C:2;M->C:1;N->C:3");
-}
-
-// MklConv2D output does not go to BiasAdd.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_Dataflow1) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'Input'}"
-      "node { name: 'F' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D', 'E'] }");  // Output of MklConv2D does not go to BiasAdd.
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "M(MklInput);N(MklInput)|A->C;B->C:2;D->F;E->F:1;M->C:1;N->C:3");
-}
-
-// MklConv2D has two outgoing edges: BiasAdd and some other dummy node (Add).
-// Merge should not be done in such case.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_Dataflow2) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'Input'}"
-      "node { name: 'F' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D', 'E'] }"  // Conv2D has two outputs.
-                              // No merge should happen.
-      "node { name: 'G' op: 'Add'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " input: ['C', 'E'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "G(Add);M(MklInput);N(MklInput)|A->C;B->C:2;C->G;D->F;"
-            "E->F:1;E->G:1;M->C:1;N->C:3");
-}
-
-// data_format attribute value mismatch. Merge should not be done
-// in such case.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_AttrMismatch) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NHCW' } }"
-      " input: ['C', 'D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(BiasAdd);M(MklInput);"
-            "N(MklInput)|A->C;B->C:2;C->E;D->E:1;M->C:1;N->C:3");
-}
-
-#if 0
-// This test set is disabled temporarily as we do not enable node rewrite.
-// This test set will be enabled when we support Mkl-specific kernels for
-// backward bias.
-//
-// Test set 2: MklConv2D..BiasAddGrad -> Conv2DWithBiasBackpropBias
-// rewrite tests
-
-// C=MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Positive) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Sub);E(Conv2DWithBiasBackpropBias);"
-            "M(MklInput);N(MklInput)|A->C;A->D:1;B->C:2;C->D;D->E;M->C:1;N->C:3");
-}
-
-// No MklConv2D in context, but Conv2D in context. No rewrite should happen.
-// C=Conv2D(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Negative_NoMklConv2D) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Conv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Conv2D);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// No Conv2D in the context for BiasAddGrad. No rewrite should happen.
-// C=Add(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Negative_NoConv2D) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Add'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// No Conv2D in the context for BiasAddGrad, but MatMul in context.
-// Rewrite should happen, but name of BiasAddGrad does not change.
-// C=MatMul(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Negative_NoConv2D_MatMul) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'MatMul'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'transpose_a'      value { b: false } }"
-      " attr { key: 'transpose_b'      value { b: false } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// Test set 3: MatMul..BiasAddGrad -> BiasAddGrad rewrite tests
-// C=MatMul(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, MatMulBiasAddGrad_Positive) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'MatMul'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'transpose_a'      value { b: false } }"
-      " attr { key: 'transpose_b'      value { b: false } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// No MatMul in the context for BiasAddGrad. No rewrite should happen.
-// C=Add(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, MatMulBiasAddGrad_Negative_NoMatMul) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Add'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-#endif
-
-static void BM_NodeMerge(int iters, int op_nodes) {
-  testing::StopTiming();
-  string s;
-  for (int in = 0; in < 10; in++) {
-    s += strings::Printf("node { name: 'in%04d' op: 'Input'}", in);
-  }
-  random::PhiloxRandom philox(301, 17);
-  random::SimplePhilox rnd(&philox);
-  for (int op = 0; op < op_nodes; op++) {
-    s += strings::Printf(
-        "node { name: 'op%04d' op: 'Mul' attr { key: 'T' value { "
-        "type: DT_FLOAT } } input: ['in%04d', 'in%04d' ] }",
-        op, rnd.Uniform(10), rnd.Uniform(10));
-  }
-
-  bool first = true;
-  while (iters > 0) {
-    Graph* graph = new Graph(OpRegistry::Global());
-    OptimizerMergeTest::InitGraph(s, graph);
-    int N = graph->num_node_ids();
-    if (first) {
-      testing::SetLabel(strings::StrCat("Per graph node.  Nodes: ", N));
-      first = false;
-    }
-    {
-      testing::StartTiming();
-      std::unique_ptr<Graph> ug(graph);
-      OptimizeNodeMerge(&ug);
-      testing::StopTiming();
-    }
-    iters -= N;  // Our benchmark units are individual graph nodes,
-                 // not whole graphs
-    // delete graph;
-  }
-}
-BENCHMARK(BM_NodeMerge)->Arg(1000)->Arg(10000);
-
-}  // namespace
-}  // namespace tensorflow
-
-#endif /* INTEL_MKL */
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 7c3836b308..09775484c4 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -77,6 +77,7 @@ class MklToTfConversionPass : public GraphOptimizationPass {
   // false, otherwise.
   bool RunPass(std::unique_ptr<Graph>* g);
 
+
  private:
   // Is the input Op supported by Mkl-specific layout?
   //
@@ -106,7 +107,7 @@ const OptimizationPassRegistry::Grouping kMklTfConvPassGroup =
 REGISTER_OPTIMIZATION(kMklTfConvPassGroup, 1, MklToTfConversionPass);
 
 Status MklToTfConversionPass::InsertConversionNodeOnEdge(
-    std::unique_ptr<Graph>* g, Edge* e) {
+    std::unique_ptr<Graph>* g, Edge *e) {
   CHECK_NOTNULL(e);
 
   Node* src = e->src();
@@ -123,22 +124,22 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
   TF_CHECK_OK(GetNodeAttr(src->def(), "T", &src_datatype));
   TF_CHECK_OK(GetNodeAttr(dst->def(), "T", &dst_datatype));
   if (src_datatype != dst_datatype) {
-    string err_msg = "T attribute of " + src->name() + " and " + dst->name() +
-                     " do not match. Will not insert" +
+    string err_msg = "T attribute of " + src->name() + " and " +
+                      dst->name() + " do not match. Will not insert" +
                      " MklToTf node in such case.";
     return Status(error::Code::INVALID_ARGUMENT, err_msg.c_str());
   }
 
   // Lets build the conversion node and specify src as input.
-  TF_CHECK_OK(
-      NodeBuilder((*g)->NewName("Mkl2Tf"), "MklToTf")
-          .Input(src, e->src_output())
-          .Input(src, e->src_output() + 1)  // Mkl tensor immediately
-                                            // follows Tf tensor.
-          .Device(src->def().device())      // We want to get conversion node
-                                            // on same device as source node.
-          .Attr("T", src_datatype)
-          .Finalize(&**g, &conversion_node));
+  TF_CHECK_OK(NodeBuilder((*g)->NewName("Mkl2Tf"), "MklToTf")
+        .Input(src, e->src_output())
+        .Input(src, DataIndexToMetaDataIndex(
+            e->src_output(), src->num_outputs()))  // Get Mkl tensor slot
+                                        // from Tf tensor slot.
+        .Device(src->def().device())  // We want to get conversion node
+                                      // on same device as source node.
+        .Attr("T", src_datatype)
+        .Finalize(&**g, &conversion_node));
 
   CHECK_NOTNULL(conversion_node);
   if (GetNodeAttr(src->def(), "data_format", &data_format) == Status::OK()) {
@@ -180,7 +181,7 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
   // are candidate for inserting conversion node
   std::vector<Edge*> candidate_edges;
 
-  for (const Edge* e : (*g)->edges()) {
+  for (const Edge *e : (*g)->edges()) {
     Node* src = e->src();
     Node* dst = e->dst();
 
@@ -210,7 +211,6 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
     GetNodeAttr(dst->def(), "T", &dst_datatype);
 
     // Check if src with is Mkl-compliant, while dst is not Mkl-compliant.
-
     if (IsMklSupportedOp(src->type_string(), src_datatype) &&
         !IsMklSupportedOp(dst->type_string(), dst_datatype)) {
       VLOG(1) << "MklToTfConversionPass: Scheduled nodes " << src->name()
@@ -247,7 +247,8 @@ bool InsertMklToTfConversionNodes(std::unique_ptr<Graph>* g) {
   return MklToTfConversionPass().RunPass(g);
 }
 
-Status MklToTfConversionPass::Run(const GraphOptimizationPassOptions& options) {
+Status MklToTfConversionPass::Run(
+  const GraphOptimizationPassOptions& options) {
   if (options.graph == nullptr && options.partition_graphs == nullptr) {
     return Status::OK();
   }
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
index 7d9237f845..2fce0fbfc7 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #ifdef INTEL_MKL
 
+#include "tensorflow/core/util/mkl_util.h"
 #include "tensorflow/core/graph/mkl_tfconversion_pass.h"
 
 #include <algorithm>
@@ -125,9 +126,11 @@ TEST_F(MklToTfConversionPass, Basic) {
 }
 
 // MklConv2D followed by Non-Mkl layer
-// C=MklConv2D(A,M,B,N); E=Sub(C,D)
+// C=MklConv2D(A,M,B,N); E=Sub(C,D) (for interleaved ordering)
+// C=MklConv2D(A,B,M,N); E=Sub(C,D) (for contiguous ordering)
 TEST_F(MklToTfConversionPass, Positive) {
-  InitGraph(
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
@@ -143,17 +146,42 @@ TEST_F(MklToTfConversionPass, Positive) {
       "node { name: 'E' op: 'Sub'"
       " attr {key: 'T'                 value { type: DT_FLOAT } }"
       " input: ['C', 'D']}");
-  EXPECT_EQ(DoRunMklToTfConversionPass(),
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
             "A(Input);B(Input);C(MklConv2D);D(Input);E(Sub);M(MklInput);"
             "Mkl2Tf/_0(MklToTf);N(MklInput)|A->C;B->C:2;C->Mkl2Tf/_0;"
             "C:1->Mkl2Tf/_0:1;D->E:1;M->C:1;Mkl2Tf/_0->E;N->C:3");
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'M', 'N']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['C', 'D']}");
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
+            "A(Input);B(Input);C(MklConv2D);D(Input);E(Sub);M(MklInput);"
+            "Mkl2Tf/_0(MklToTf);N(MklInput)|A->C;B->C:1;C->Mkl2Tf/_0;"
+            "C:1->Mkl2Tf/_0:1;D->E:1;M->C:2;Mkl2Tf/_0->E;N->C:3");
+  }
 }
 
 // MklConv2D followed by MklToTf op followed by Non-Mkl layer.
-// C=MklConv2D(A,M,B,N); D=MklToTf(C:0, C:1) F=Sub(D,E)
+// C=MklConv2D(A,M,B,N); D=MklToTf(C:0, C:1) F=Sub(D,E) (for interleaved)
+// C=MklConv2D(A,B,M,N); D=MklToTf(C:0, C:1) F=Sub(D,E) (for contiguous)
 // MklToTf node should not be inserted again.
 TEST_F(MklToTfConversionPass, Negative_DoubleInsert) {
-  InitGraph(
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
@@ -173,10 +201,37 @@ TEST_F(MklToTfConversionPass, Negative_DoubleInsert) {
       "node { name: 'F' op: 'Sub'"
       " attr {key: 'T'                 value { type: DT_FLOAT } }"
       " input: ['D', 'E']}");
-  EXPECT_EQ(DoRunMklToTfConversionPass(),
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
             "A(Input);B(Input);C(MklConv2D);D(MklToTf);E(Input);"
             "F(Sub);M(MklInput);N(MklInput)|"
             "A->C;B->C:2;C->D;C:1->D:1;D->F;E->F:1;M->C:1;N->C:3");
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: 'MklInput'}"
+      "node { name: 'N' op: 'MklInput'}"
+      "node { name: 'C' op: 'MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'M', 'N']}"
+      "node { name: 'D' op: 'MklToTf'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['C:0', 'C:1']}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['D', 'E']}");
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
+            "A(Input);B(Input);C(MklConv2D);D(MklToTf);E(Input);"
+            "F(Sub);M(MklInput);N(MklInput)|"
+            "A->C;B->C:1;C->D;C:1->D:1;D->F;E->F:1;M->C:2;N->C:3");
+  }
 }
 
 // C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
@@ -203,7 +258,7 @@ TEST_F(MklToTfConversionPass, Negative_NoMklLayer) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoRunMklToTfConversionPass(),
             "A(Input);B(Input);C(Conv2D);D(Input);E(BiasAdd);Y(Input);Z(Sub)|"
-            "A->C;B->C:1;C->E;D->E:1;E->Z;Y->Z:1");
+             "A->C;B->C:1;C->E;D->E:1;E->Z;Y->Z:1");
 }
 
 static void BM_RunMklToTfConversionPass(int iters, int op_nodes) {
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 9c47d520d9..fa9f300194 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4544,6 +4544,30 @@ tf_mkl_kernel_library(
     ],
 )
 
+tf_mkl_kernel_library(
+    name = "mkl_fused_batch_norm_op",
+    srcs = ["mkl_fused_batch_norm_op.cc"],
+    deps = NN_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
+tf_mkl_kernel_library(
+    name = "mkl_concat_op",
+    prefix = "mkl_concat_op",
+    deps = ARRAY_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
+tf_mkl_kernel_library(
+    name = "mkl_lrn_op",
+    prefix = "mkl_lrn_op",
+    deps = NN_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
 # -----------------------------------------------------------------------------
 # Google-internal targets.  These must be at the end for syncrepo.
 
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
new file mode 100644
index 0000000000..08fad4daef
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -0,0 +1,455 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef INTEL_MKL
+
+#include <limits>
+#include <vector>
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/kernels/concat_lib.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/types.h"
+
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+namespace tensorflow {
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+enum AxisArgumentName { NAME_IS_AXIS, NAME_IS_CONCAT_DIM };
+
+// --------------------------------------------------------------------------
+//                      Eigen Concat Op
+// --------------------------------------------------------------------------
+template <typename Device, typename T, AxisArgumentName AxisArgName>
+class EigenConcatBaseOp : public OpKernel {
+ public:
+  typedef std::vector<std::unique_ptr<typename TTypes<T, 2>::ConstMatrix>>
+      ConstMatrixVector;
+
+  explicit EigenConcatBaseOp(OpKernelConstruction* c) : OpKernel(c) {}
+
+  // Although, we modify Compute for this call to accept one extra param,
+  // we need to have empty Compute because Compute is pure virtual function.
+  void Compute(OpKernelContext* c) {}
+
+  void Compute(OpKernelContext* c, const std::vector<Tensor>& values) {
+    const Tensor* concat_dim_tensor;
+    const char* axis_attribute_name =
+        AxisArgName == NAME_IS_AXIS
+            ? "axis"
+            : AxisArgName == NAME_IS_CONCAT_DIM ? "concat_dim" : "<invalid>";
+    OP_REQUIRES_OK(c, c->input(axis_attribute_name, &concat_dim_tensor));
+    OP_REQUIRES(c, IsLegacyScalar(concat_dim_tensor->shape()),
+                errors::InvalidArgument(
+                    axis_attribute_name,
+                    " tensor should be a scalar integer, but got shape ",
+                    concat_dim_tensor->shape().DebugString()));
+    const int32 concat_dim =
+        internal::SubtleMustCopy(concat_dim_tensor->scalar<int32>()());
+    // Instead of accessing values from context, we use input to Compute.
+    const int N = values.size();
+    const int input_dims = values[0].dims();
+    const TensorShape& input_shape = values[0].shape();
+
+    int32 axis = concat_dim < 0 ? concat_dim + input_dims : concat_dim;
+    OP_REQUIRES(c, (0 <= axis && axis < input_dims) ||
+                       (allow_legacy_scalars() && concat_dim == 0),
+                errors::InvalidArgument(
+                    "ConcatOp : Expected concatenating dimensions in the range "
+                    "[",
+                    -input_dims, ", ", input_dims, "), but got ", concat_dim));
+    // Note that we reduce the concat of n-dimensional tensors into a two
+    // dimensional concat. Assuming the dimensions of any input/output
+    // tensor are {x0, x1,...,xn-1, y0, y1,...,ym-1}, where the concat is along
+    // the dimension indicated with size y0, we flatten it to {x, y}, where y =
+    // Prod_i(yi) and x = ((n > 0) ? Prod_i(xi) : 1).
+    ConstMatrixVector inputs_flat;
+    inputs_flat.reserve(N);
+    int64 inputs_flat_dim0 = 1;
+    for (int d = 0; d < axis; ++d) {
+      inputs_flat_dim0 *= input_shape.dim_size(d);
+    }
+    int64 output_concat_dim = 0;
+    const bool input_is_scalar = IsLegacyScalar(input_shape);
+    for (int i = 0; i < N; ++i) {
+      const auto in = values[i];
+      const bool in_is_scalar = IsLegacyScalar(in.shape());
+      OP_REQUIRES(
+          c, in.dims() == input_dims || (input_is_scalar && in_is_scalar),
+          errors::InvalidArgument(
+              "ConcatOp : Ranks of all input tensors should match: shape[0] = ",
+              input_shape.DebugString(), " vs. shape[", i, "] = ",
+              in.shape().DebugString()));
+      for (int j = 0; j < input_dims; ++j) {
+        if (j == axis) {
+          continue;
+        }
+        OP_REQUIRES(
+            c, in.dim_size(j) == input_shape.dim_size(j),
+            errors::InvalidArgument(
+                "ConcatOp : Dimensions of inputs should match: shape[0] = ",
+                input_shape.DebugString(), " vs. shape[", i, "] = ",
+                in.shape().DebugString()));
+      }
+      if (in.NumElements() > 0) {
+        int64 inputs_flat_dim1 = in.NumElements() / inputs_flat_dim0;
+        inputs_flat.emplace_back(new typename TTypes<T, 2>::ConstMatrix(
+            in.shaped<T, 2>({inputs_flat_dim0, inputs_flat_dim1})));
+      }
+      // TODO(irving): Remove check once !allow_legacy_scalars().
+      output_concat_dim += in.dims() > 0 ? in.dim_size(axis) : 1;
+    }
+
+    TensorShape output_shape(input_shape);
+    // TODO(irving): Remove rank 0 case once !allow_legacy_scalars().
+    if (output_shape.dims() == 0) {
+      output_shape.AddDim(output_concat_dim);
+    } else {
+      output_shape.set_dim(axis, output_concat_dim);
+    }
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(c, c->allocate_output(0, output_shape, &output));
+    if (output->NumElements() > 0) {
+      int64 output_dim1 = output->NumElements() / inputs_flat_dim0;
+      auto output_flat = output->shaped<T, 2>({inputs_flat_dim0, output_dim1});
+      ConcatCPU<T>(c->device(), inputs_flat, &output_flat);
+    }
+  }
+};
+
+// --------------------------------------------------------------------------
+//                      Mkl Concat Op
+// --------------------------------------------------------------------------
+
+template <typename Device, typename T, AxisArgumentName AxisArgName>
+class MklConcatOp : public OpKernel {
+ private:
+  TensorFormat data_format_;
+  EigenConcatBaseOp<Device, T, AxisArgName> eigen_concat_op_;
+
+ public:
+  typedef std::vector<std::unique_ptr<typename TTypes<T, 2>::ConstMatrix>>
+    ConstMatrixVector;
+
+  explicit MklConcatOp(OpKernelConstruction* c) : OpKernel(c),
+                                                  eigen_concat_op_(c) {}
+
+  void Compute(OpKernelContext* context) override {
+    MklConcatOpContext mkl_context;
+
+    // Get input tensors.
+    OpInputList input_tensors;
+    MklGetInputList(context, "values", &input_tensors);
+    const int N = input_tensors.size();
+    // Get MKL shapes.
+    MklShapeList input_shapes(N);
+    GetMklShapeList(context, "values", &input_shapes);
+
+    // If this is Concat, then concat_dim is 0th input.
+    // If this is ConcatV2, then axis is Nth input.
+    const Tensor& concat_dim_tensor = AxisArgName == NAME_IS_CONCAT_DIM ?
+                                      MklGetInput(context, 0) :
+                                      MklGetInput(context, N);
+
+    // Sanity checks
+    OP_REQUIRES(
+      context, IsLegacyScalar(concat_dim_tensor.shape()),
+      errors::InvalidArgument(
+        "Concat dim tensor should be a scalar integer, but got shape ",
+        concat_dim_tensor.shape().DebugString()));
+    int32 concat_dim =
+      internal::SubtleMustCopy(concat_dim_tensor.scalar<int32>()());
+
+    MklShape& inpshape0 = input_shapes[0];
+
+    // Check that all tensors are Mkl, if not we call Eigen version.
+    bool invoke_eigen = false;
+    bool is_concat_dim_channel = true;
+    if (!AreAllMklTensors(input_shapes)) {
+      invoke_eigen = true;
+    }
+
+    // Check that total number of dimensions is 4, if not call Eigen.
+    if (!invoke_eigen) {
+      for (auto& s : input_shapes) {
+        if (s.GetDimension() != 4) {
+          invoke_eigen = true;
+          break;
+        }
+      }
+    }
+
+    // check that concat_dim is channel, if not call Eigen version.
+    if (!invoke_eigen) {
+      for (auto& s : input_shapes) {
+        if (!s.IsMklChannelDim(concat_dim)) {
+          invoke_eigen = true;
+          is_concat_dim_channel = false;
+          break;
+        }
+      }
+    }
+
+    if (invoke_eigen) {
+      string msg = std::string("Invoking Eigen version of Concat. Reason:") +
+                    (!is_concat_dim_channel ?
+                      std::string("Concat dimension is not channel") :
+                      std::string("Not all tensors are in Mkl layout"));
+      VLOG(1) << "MklConcatOp: " << msg;
+      CallEigenVersion(context, input_tensors, input_shapes);
+      return;
+    }
+
+    // For MKL format, the channel is dimension number 2.
+    // So if we are concating over channel and _all_ inputs are in MKL
+    // format, then we set concat_dim to 2.
+    // Since we have reached till here, it means we are concating
+    // over channel.
+    concat_dim = MklDims::C;
+
+    // One more sanity check: check that ranks of all tensors match
+    // and that their shapes match except for concat_dim.
+    int i = 0;
+    for (auto& s : input_shapes) {
+      size_t exp_dims = inpshape0.GetDimension();
+      OP_REQUIRES(
+        context, s.GetDimension() == exp_dims,
+        errors::InvalidArgument(
+          "MklConcatOp : Ranks of all input tensors should match:"
+          " input dimensions = ", s.GetDimension(),
+          " vs. expected rank = ", exp_dims));
+
+      for (int d = 0; d < exp_dims; ++d) {
+        if (d == concat_dim) {
+          continue;
+        }
+
+        size_t exp_size = inpshape0.GetSizes()[d];
+        OP_REQUIRES(context, exp_size == s.GetSizes()[d],
+          errors::InvalidArgument("MklConcatOp : Dimensions of inputs"
+          "should match: shape[0][", d, "]= ", exp_size, " vs. shape[",
+          i, "][", d, "] = ", s.GetSizes()[d]));
+      }
+      ++i;
+    }
+
+    // Use input MKL layout instead of creating new layouts.
+    int64 output_concat_dim_size = 0;
+    for (auto& s : input_shapes) {
+      output_concat_dim_size += s.GetDimension() > 0 ?
+                                s.GetSizes()[concat_dim] : 1;
+    }
+    mkl_context.MklCreateInputLayouts(context, input_shapes);
+
+    CHECK_EQ(dnnConcatCreate_F32(&mkl_context.prim_concat, NULL, N,
+                                 &mkl_context.lt_inputs[0]),
+             E_SUCCESS);
+
+    // Calculate output sizes and strides
+    TensorFormat data_format;
+    if (inpshape0.IsTensorInNHWCFormat()) {
+      data_format = FORMAT_NHWC;
+    } else {
+      OP_REQUIRES(context, inpshape0.IsTensorInNCHWFormat(),
+        errors::InvalidArgument(
+        "MklConcat only supports all inputs in NCHW or NHWC format "));
+      data_format = FORMAT_NCHW;
+    }
+
+    // Since all tensors are in Mkl layout, we copy sizes from input tensor.
+    mkl_context.out_sizes[MklDims::W] = inpshape0.GetSizes()[MklDims::W];
+    mkl_context.out_sizes[MklDims::H] = inpshape0.GetSizes()[MklDims::H];
+    mkl_context.out_sizes[MklDims::C] = output_concat_dim_size;
+    mkl_context.out_sizes[MklDims::N] = inpshape0.GetSizes()[MklDims::N];
+    GetStridesFromSizes(data_format, mkl_context.out_strides,
+                        mkl_context.out_sizes);
+
+    // Set output Mkl shape.
+    int64 dim = 4;
+    MklShape mkl_output_mkl_shape;
+    mkl_output_mkl_shape.SetMklTensor(true);
+    mkl_output_mkl_shape.SetMklLayout(mkl_context.prim_concat, dnnResourceDst);
+    mkl_output_mkl_shape.SetTfLayout(dim, mkl_context.out_sizes,
+                                     mkl_context.out_strides);
+    mkl_output_mkl_shape.SetTfDimOrder(dim, inpshape0.GetTfToMklDimMap());
+
+    TensorShape mkl_output_tf_shape;
+    mkl_output_tf_shape.AddDim(1);
+    mkl_output_tf_shape.AddDim(dnnLayoutGetMemorySize_F32(
+      static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout()))/sizeof(T));
+
+    Tensor* output = nullptr;
+    AllocateOutputSetMklshape(context, 0, &output, mkl_output_tf_shape,
+                              mkl_output_mkl_shape);
+
+    // Set destination resource.
+    mkl_context.concat_res[dnnResourceDst] = const_cast<void*>(
+        static_cast<const void*>(output->flat<T>().data()));
+
+    mkl_context.mkl_tmp_tensors.resize(N);
+    mkl_context.MklPrepareConcatInputs(context, input_tensors);
+
+    // Execute primitive.
+    CHECK_EQ(dnnExecute_F32(mkl_context.prim_concat, mkl_context.concat_res),
+             E_SUCCESS);
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    TensorFormat data_format;
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    dnnPrimitive_t prim_concat;
+    void *concat_res[dnnResourceNumber];
+    std::vector<dnnLayout_t> lt_inputs;
+    std::vector<Tensor> mkl_tmp_tensors;
+
+    // Create MKL dnnLayout_t objects for tensors coming into the layer
+    // We only support case where input tensors are all in Mkl layout.
+    void MklCreateInputLayouts(OpKernelContext* context,
+                               MklShapeList& input_shapes) {
+      for (auto& is : input_shapes) {
+        CHECK_EQ(is.IsMklTensor(), true);
+        lt_inputs.push_back((dnnLayout_t) is.GetCurLayout());
+      }
+    }
+
+    void MklPrepareConcatInputs(OpKernelContext* context,
+                                OpInputList& input_tensors) {
+      CHECK_EQ(lt_inputs.size(), mkl_tmp_tensors.size());
+
+      for (int i = 0; i < lt_inputs.size(); ++i) {
+        dnnPrimitive_t mkl_prim_convert_input;
+        dnnLayout_t mkl_lt_internal_input;
+        void* mkl_buf_convert_input = nullptr;
+
+        CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_input,
+                                                  prim_concat,
+                                                  (dnnResourceType_t)
+                                      (dnnResourceMultipleSrc + i)),
+                 E_SUCCESS);
+
+        if (!dnnLayoutCompare_F32(lt_inputs[i], mkl_lt_internal_input)) {
+          CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input,
+                         lt_inputs[i],
+                         mkl_lt_internal_input),
+                   E_SUCCESS);
+
+          AllocTmpBuffer(context, &mkl_tmp_tensors[i],
+                         mkl_lt_internal_input,
+                         &mkl_buf_convert_input);
+
+          CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input,
+                         const_cast<void*>(static_cast<const void*>(
+                           input_tensors[i].flat<T>().data())),
+                         mkl_buf_convert_input),
+                   E_SUCCESS);
+
+          concat_res[dnnResourceMultipleSrc + i] = mkl_buf_convert_input;
+          CHECK_EQ(dnnDelete_F32(mkl_prim_convert_input), E_SUCCESS);
+        } else {
+           concat_res[dnnResourceMultipleSrc + i] = const_cast<void*>(
+                         static_cast<const void*>(
+                           input_tensors[i].flat<T>().data()));
+        }
+
+        CHECK_EQ(dnnLayoutDelete_F32(mkl_lt_internal_input), E_SUCCESS);
+      }
+    }
+
+    void MklCleanup() {
+      for (auto& lt : lt_inputs) {
+        lt = nullptr;
+      }
+      CHECK_EQ(dnnDelete_F32(prim_concat), E_SUCCESS);
+    }
+  } MklConcatOpContext;
+
+  void CallEigenVersion(OpKernelContext* context, const OpInputList& values,
+                        const MklShapeList& input_shapes) {
+    // Before calling Eigen version, we need to convert Mkl tensors to TF.
+    // First check that the number of input tensors and the number of Mkl
+    // shapes match.
+    CHECK_EQ(values.size(), input_shapes.size());
+
+    std::vector<Tensor> converted_values;
+    for (int i = 0; i < input_shapes.size(); i++) {
+      if (input_shapes[i].IsMklTensor()) {
+        // If input tensor is Mkl, then do the conversion.
+        Tensor tmp_tensor = ConvertMklToTF<T>(context,
+                                              values[i],
+                                              input_shapes[i]);
+        converted_values.push_back(tmp_tensor);
+      } else {
+        // If input tensor is TF already, then we do not need any conversion.
+        converted_values.push_back(values[i]);
+      }
+    }
+
+    // Call Eigen concat.
+    eigen_concat_op_.Compute(context, converted_values);
+
+    // Set dummy Mkl tensor as output Mkl tensor for this op.
+    MklShape mkl_tensor_mkl_shape;
+    mkl_tensor_mkl_shape.SetMklTensor(false);
+    mkl_tensor_mkl_shape.SetDimensions(4);
+    mkl_tensor_mkl_shape.SetTfDimOrder(4);  // Dimensions
+    Tensor* mkl_tensor = nullptr;
+    TensorShape mkl_tensor_tf_shape;
+    mkl_tensor_tf_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(
+                             mkl_tensor_mkl_shape.GetDimension()));
+    int tf_output_index = 0;
+    context->allocate_output(GetTensorMetaDataIndex(tf_output_index,
+                                                    context->num_outputs()),
+                             mkl_tensor_tf_shape, &mkl_tensor);
+    mkl_tensor_mkl_shape.SerializeMklShape(
+                             mkl_tensor->flat<uint8>().data(),
+                             mkl_tensor->flat<uint8>().size() * sizeof(uint8));
+  }
+};
+
+/* Use optimized concat for float type only */
+#define REGISTER_MKL_CPU(type)                                              \
+  REGISTER_KERNEL_BUILDER(Name("MklConcat")                                 \
+                              .Device(DEVICE_CPU)                           \
+                              .TypeConstraint<type>("T")                    \
+                              .HostMemory("concat_dim")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel),   \
+                          MklConcatOp<CPUDevice, type, NAME_IS_CONCAT_DIM>) \
+  REGISTER_KERNEL_BUILDER(Name("MklConcatV2")                               \
+                              .Device(DEVICE_CPU)                           \
+                              .TypeConstraint<type>("T")                    \
+                              .TypeConstraint<int32>("Tidx")                \
+                              .HostMemory("axis")                           \
+                              .Label(mkl_layer_registry::kMklLayerLabel),   \
+                          MklConcatOp<CPUDevice, type, NAME_IS_AXIS>)
+
+TF_CALL_float(REGISTER_MKL_CPU);
+
+#undef REGISTER_CONCAT_MKL
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
new file mode 100644
index 0000000000..996771e379
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
@@ -0,0 +1,688 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifdef INTEL_MKL
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/util/tensor_format.h"
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+
+#include "tensorflow/core/util/mkl_util.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+
+namespace tensorflow {
+using CPUDevice = Eigen::ThreadPoolDevice;
+template <typename Device, typename T>
+class MklFusedBatchNormOp : public OpKernel {
+ public:
+  explicit MklFusedBatchNormOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    float epsilon;
+    OP_REQUIRES_OK(context, context->GetAttr("epsilon", &epsilon));
+    epsilon_ = T(epsilon);
+    string tensor_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &tensor_format));
+    OP_REQUIRES(context, FormatFromString(tensor_format, &tensor_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("is_training", &is_training_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklFusedBatchNormOpContext mkl_context;
+
+    const Tensor& input = MklGetInput(context, 0);
+    const Tensor& scale = MklGetInput(context, 1);
+    const Tensor& shift = MklGetInput(context, 2);
+    const Tensor& est_mean = MklGetInput(context, 3);
+    const Tensor& est_variance = MklGetInput(context, 4);
+
+    GetMklShape(context, 0, &(mkl_context.mkl_shape_input_shape));
+    bool input_in_mkl_format = mkl_context.mkl_shape_input_shape.IsMklTensor();
+    if (!input_in_mkl_format) {
+      OP_REQUIRES(context, input.dims() == 4,
+                  errors::InvalidArgument("input must be 4-dimensional",
+                                          input.shape().DebugString()));
+    }
+    OP_REQUIRES(context, scale.dims() == 1,
+                errors::InvalidArgument("scale must be 1-dimensional",
+                                        scale.shape().DebugString()));
+    OP_REQUIRES(context, shift.dims() == 1,
+                errors::InvalidArgument("offset must be 1-dimensional",
+                                        shift.shape().DebugString()));
+    OP_REQUIRES(context, est_mean.dims() == 1,
+                errors::InvalidArgument("estimated_mean must be 1-dimensional",
+                                        est_mean.shape().DebugString()));
+    OP_REQUIRES(
+        context, est_variance.dims() == 1,
+        errors::InvalidArgument("estimated_variance must be 1-dimensional",
+                                est_variance.shape().DebugString()));
+    if (is_training_) {
+      OP_REQUIRES(context, est_mean.dim_size(0) == 0,
+                  errors::InvalidArgument("estimated_mean empty for training",
+                                          est_mean.shape().DebugString()));
+      OP_REQUIRES(context, est_variance.dim_size(0) == 0,
+                  errors::InvalidArgument(
+                      "estimated_variance must be empty for training",
+                      est_variance.shape().DebugString()));
+    }
+
+    unsigned int flag_batch_norm =
+        is_training_ ? dnnUseScaleShift
+                     : (dnnUseInputMeanVariance | dnnUseScaleShift);
+
+    mkl_context.MklExtractParams(context, tensor_format_);
+
+    // Create layout only for input data as it is used in Op primitive.
+    mkl_context.MklCreateInputLayout(context);
+
+    // Create Op primitive.
+    CHECK_EQ(dnnBatchNormalizationCreateForward_v2_F32(
+                 &(mkl_context.mkl_prim_batchnorm), nullptr,
+                 mkl_context.mkl_lt_input, static_cast<float>(epsilon_),
+                 flag_batch_norm),
+             E_SUCCESS);
+
+    // Temporary tensors with buffers for the context inputs, if
+    // conversion to MKL-Op specific layouts are required. It is assumed here
+    // that TF's 1D tensors (scale, shift, est_mean, and est_variance) won't
+    // require any conversion.
+    // Since scale-shift is combined in MKL, a buffer is required.
+    Tensor mkl_tmp_input_buf_tensor, mkl_tmp_scale_shift_buf_tensor;
+    mkl_context.MklPrepareContextInputs(context, &mkl_tmp_input_buf_tensor,
+                                        &mkl_tmp_scale_shift_buf_tensor);
+
+    // Output data in MKL layout
+    Tensor* output = nullptr;
+    TensorShape tf_shape_output;
+    MklShape mkl_shape_output;
+    mkl_shape_output.SetMklTensor(true);
+    mkl_shape_output.SetMklLayout(mkl_context.mkl_prim_batchnorm,
+                                  dnnResourceDst);
+    mkl_shape_output.SetTfLayout(mkl_context.mkl_params.in_dim,
+                                 mkl_context.mkl_params.in_sizes,
+                                 mkl_context.mkl_params.in_strides);
+    mkl_shape_output.SetTfDimOrder(mkl_context.mkl_params.in_dim,
+                                   tensor_format_);
+    tf_shape_output.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                               mkl_shape_output.GetMklLayout())) /
+                           sizeof(T));
+    AllocateOutputSetMklshape(context, 0, &output, tf_shape_output,
+                              mkl_shape_output);
+    mkl_context.mkl_res_batchnorm[dnnResourceDst] =
+        static_cast<void*>(output->flat<T>().data());
+
+    // Batch mean in TF layout
+    Tensor* batch_mean = nullptr;
+    MklShape mkl_shape_batch_mean;
+    mkl_shape_batch_mean.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 1, &batch_mean, scale.shape(),
+                              mkl_shape_batch_mean);
+    // Batch variance in TF layout
+    Tensor* batch_variance = nullptr;
+    MklShape mkl_shape_batch_variance;
+    mkl_shape_batch_variance.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 2, &batch_variance, scale.shape(),
+                              mkl_shape_batch_variance);
+    // If training mode, set dnnResourceMean and dnnResourceVariance to
+    // output tensors for batch mean and variance.
+    // Otherwise, set dnnResourceMean and dnnResourceVariance to
+    // estimated mean and variance.
+    if (is_training_)
+      mkl_context.MklSetMeanVariance(*batch_mean, *batch_variance);
+    else
+      mkl_context.MklSetMeanVariance(est_mean, est_variance);
+
+    // Now that all resources are set, it is ready for dnnExecute
+    CHECK_EQ(dnnExecute_F32(mkl_context.mkl_prim_batchnorm,
+                            mkl_context.mkl_res_batchnorm),
+             E_SUCCESS);
+
+    // Mean and variance (without Bessel's correction) saved for backward
+    // computation to serve as pre-computed mean and variance.
+    Tensor* saved_mean = nullptr;
+    MklShape mkl_shape_saved_mean;
+    mkl_shape_saved_mean.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 3, &saved_mean, scale.shape(),
+                              mkl_shape_saved_mean);
+    std::memcpy(
+        reinterpret_cast<char*>(saved_mean->flat<float>().data()),
+        reinterpret_cast<char*>(mkl_context.mkl_res_batchnorm[dnnResourceMean]),
+        scale.NumElements() * sizeof(float));
+    Tensor* saved_variance = nullptr;
+    MklShape mkl_shape_saved_variance;
+    mkl_shape_saved_variance.SetMklTensor(false);
+    AllocateOutputSetMklshape(context, 4, &saved_variance, scale.shape(),
+                              mkl_shape_saved_variance);
+    std::memcpy(reinterpret_cast<char*>(saved_variance->flat<float>().data()),
+                reinterpret_cast<char*>(
+                    mkl_context.mkl_res_batchnorm[dnnResourceVariance]),
+                scale.NumElements() * sizeof(float));
+
+    // Bessel's correction on variance, if training mode in on
+    if (is_training_) {
+      float* p_var = static_cast<float*>(batch_variance->flat<T>().data());
+      auto depth = mkl_context.mkl_params.depth;
+      size_t orig_size = mkl_context.mkl_params.in_sizes[0] *
+                         mkl_context.mkl_params.in_sizes[1] *
+                         mkl_context.mkl_params.in_sizes[3];
+      size_t adjust_size = orig_size - 1;
+      float adjust_factor = (static_cast<float>(orig_size)) / adjust_size;
+      for (int i = 0; i < depth; i++) p_var[i] = adjust_factor * p_var[i];
+    }
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  T epsilon_;
+  TensorFormat tensor_format_;
+  bool is_training_;
+
+  // Structure containing all info for MklOp
+  typedef struct {
+    // Parameters used for input and output layouts
+    struct MklBatchNormParams {
+      // BatchNormOp src and
+      size_t in_dim;
+      size_t in_sizes[4];
+      size_t in_strides[4];
+      size_t depth;  // Batch normalization is done for per channel.
+    } mkl_params;
+
+    MklShape mkl_shape_input_shape;
+
+    // MKL primitive and resources for BatchNormOp
+    dnnPrimitive_t mkl_prim_batchnorm = nullptr;
+    void* mkl_res_batchnorm[dnnResourceNumber];
+
+    // MKL layouts for inputs in the context
+    dnnLayout_t mkl_lt_input = nullptr;
+
+    void MklCleanup() {
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      if (!input_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_input);
+
+      if (mkl_prim_batchnorm != nullptr) dnnDelete_F32(mkl_prim_batchnorm);
+    }
+
+    void MklExtractParams(OpKernelContext* context,
+                          const TensorFormat& tensor_format) {
+      const Tensor& input = MklGetInput(context, 0);
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      mkl_params.in_dim = input_in_mkl_format
+                              ? mkl_shape_input_shape.GetDimension()
+                              : input.dims();
+      mkl_params.in_sizes[0] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[0]
+                              : GetTensorDim(input, tensor_format, 'W'));
+      mkl_params.in_sizes[1] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[1]
+                              : GetTensorDim(input, tensor_format, 'H'));
+      mkl_params.in_sizes[2] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[2]
+                              : GetTensorDim(input, tensor_format, 'C'));
+      mkl_params.in_sizes[3] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[3]
+                              : GetTensorDim(input, tensor_format, 'N'));
+      mkl_params.depth = mkl_params.in_sizes[2];
+      GetStridesFromSizes(tensor_format, mkl_params.in_strides,
+                          mkl_params.in_sizes);
+    }
+
+    void MklCreateInputLayout(OpKernelContext* context) {
+      const Tensor& input = MklGetInput(context, 0);
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      if (input_in_mkl_format) {
+        mkl_lt_input =
+            static_cast<dnnLayout_t>(mkl_shape_input_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&mkl_lt_input, mkl_params.in_dim,
+                                mkl_params.in_sizes, mkl_params.in_strides),
+            E_SUCCESS);
+      }
+    }
+
+    void MklPrepareContextInputs(OpKernelContext* context,
+                                 Tensor* mkl_tmp_input_buf_tensor,
+                                 Tensor* mkl_tmp_scale_shift_buf_tensor) {
+      bool mkl_convert_input;
+      dnnPrimitive_t mkl_prim_convert_input = nullptr;
+      dnnLayout_t mkl_lt_internal_input = nullptr;
+      void* mkl_buf_converted_input = nullptr;
+      // Compare with internal layouts and convert if needed
+      const Tensor& input = MklGetInput(context, 0);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &mkl_lt_internal_input, mkl_prim_batchnorm, dnnResourceSrc),
+               E_SUCCESS);
+      mkl_convert_input =
+          !dnnLayoutCompare_F32(mkl_lt_internal_input, mkl_lt_input);
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input, mkl_lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &mkl_buf_converted_input);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input, mkl_buf_input,
+                                          mkl_buf_converted_input),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_input);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
+      mkl_res_batchnorm[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_converted_input : mkl_buf_input;
+
+      // scale-shift layout is created from primitive. So no conversion
+      // is needed, however, a buffer has to be allocated.
+      dnnLayout_t mkl_lt_scale_shift = nullptr;
+      void* mkl_buf_scale_shift = nullptr;
+      CHECK_EQ(
+          dnnLayoutCreateFromPrimitive_F32(
+              &mkl_lt_scale_shift, mkl_prim_batchnorm, dnnResourceScaleShift),
+          E_SUCCESS);
+      AllocTmpBuffer(context, mkl_tmp_scale_shift_buf_tensor,
+                     mkl_lt_scale_shift, &mkl_buf_scale_shift);
+      // Fill the scale-shift buffer with data, presumably buffer is 2D array
+      const Tensor& scale = MklGetInput(context, 1);
+      const Tensor& shift = MklGetInput(context, 2);
+      float* buf_scale_shift = static_cast<float*>(mkl_buf_scale_shift);
+      float* buf_scale = const_cast<float*>(
+          static_cast<const float*>(scale.flat<float>().data()));
+      float* buf_shift = const_cast<float*>(
+          static_cast<const float*>(shift.flat<float>().data()));
+      auto depth = mkl_params.depth;
+      for (int i = 0; i < depth; i++) {
+        buf_scale_shift[i] = buf_scale[i];
+        buf_scale_shift[i + depth] = buf_shift[i];
+      }
+      mkl_res_batchnorm[dnnResourceScaleShift] = mkl_buf_scale_shift;
+    }
+
+    inline void MklSetMeanVariance(const Tensor& mean, const Tensor& variance) {
+      mkl_res_batchnorm[dnnResourceMean] = const_cast<void*>(
+          static_cast<const void*>(mean.flat<float>().data()));
+      mkl_res_batchnorm[dnnResourceVariance] = const_cast<void*>(
+          static_cast<const void*>(variance.flat<float>().data()));
+    }
+  } MklFusedBatchNormOpContext;
+};
+
+#define REGISTER_MKL_CPU(T)                                               \
+  REGISTER_KERNEL_BUILDER(Name("MklFusedBatchNorm")                       \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<T>("T")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklFusedBatchNormOp<CPUDevice, T>);
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+
+template <typename Device, typename T>
+class MklFusedBatchNormGradOp : public OpKernel {
+ public:
+  explicit MklFusedBatchNormGradOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    float epsilon;
+    OP_REQUIRES_OK(context, context->GetAttr("epsilon", &epsilon));
+    epsilon_ = T(epsilon);
+    string tensor_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &tensor_format));
+    OP_REQUIRES(context, FormatFromString(tensor_format, &tensor_format_),
+                errors::InvalidArgument("Invalid data format"));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklFusedBatchNormGradOpContext mkl_context;
+
+    const Tensor& out_backprop = MklGetInput(context, 0);
+    const Tensor& input = MklGetInput(context, 1);
+    const Tensor& scale = MklGetInput(context, 2);
+    const Tensor& saved_mean = MklGetInput(context, 3);
+    const Tensor& saved_var = MklGetInput(context, 4);
+
+    // Here scale, mean, and variance are 1D and considered
+    // those having same layout in MKL and TF
+    GetMklShape(context, 0, &(mkl_context.mkl_shape_out_backprop));
+    GetMklShape(context, 1, &(mkl_context.mkl_shape_input_shape));
+
+    bool input_in_mkl_format = mkl_context.mkl_shape_input_shape.IsMklTensor();
+    bool out_backprop_in_mkl_format =
+        mkl_context.mkl_shape_out_backprop.IsMklTensor();
+    if (!out_backprop_in_mkl_format) {
+      OP_REQUIRES(context, out_backprop.dims() == 4,
+                  errors::InvalidArgument("input must be 4-dimensional",
+                                          out_backprop.shape().DebugString()));
+    }
+    if (!input_in_mkl_format) {
+      OP_REQUIRES(context, input.dims() == 4,
+                  errors::InvalidArgument("input must be 4-dimensional",
+                                          input.shape().DebugString()));
+    }
+    OP_REQUIRES(context, scale.dims() == 1,
+                errors::InvalidArgument("scale must be 1-dimensional",
+                                        scale.shape().DebugString()));
+    OP_REQUIRES(context, saved_mean.dims() == 1,
+                errors::InvalidArgument("saved mean must be 1-dimensional",
+                                        saved_mean.shape().DebugString()));
+    OP_REQUIRES(context, saved_var.dims() == 1,
+                errors::InvalidArgument("saved variance must be 1-dimensional",
+                                        saved_var.shape().DebugString()));
+
+    mkl_context.MklExtractParams(context, tensor_format_);
+
+    mkl_context.MklCreateInputLayout(context);
+
+    unsigned int flag_batch_norm_grad = dnnUseScaleShift;
+
+    // Create Backward Op primitive.
+    CHECK_EQ(dnnBatchNormalizationCreateBackward_v2_F32(
+                 &(mkl_context.mkl_prim_batchnorm_bwd), nullptr,
+                 mkl_context.mkl_lt_input, static_cast<float>(epsilon_),
+                 flag_batch_norm_grad),
+             E_SUCCESS);
+
+    // Temporary tensors and their buffers if conversion is required
+    Tensor mkl_tmp_input_buf_tensor, mkl_tmp_outbackprop_buf_tensor,
+        mkl_tmp_scaleshift_buf_tensor;
+    mkl_context.MklPrepareContextInputs(context, &mkl_tmp_input_buf_tensor,
+                                        &mkl_tmp_outbackprop_buf_tensor,
+                                        &mkl_tmp_scaleshift_buf_tensor);
+
+    // Allocate tensor for grad w.r.t. input(x)
+    Tensor* in_backprop = nullptr;
+    TensorShape tf_shape_in_backprop;
+    MklShape mkl_shape_in_backprop;
+    mkl_shape_in_backprop.SetMklTensor(true);
+    mkl_shape_in_backprop.SetMklLayout(mkl_context.mkl_prim_batchnorm_bwd,
+                                       dnnResourceDiffSrc);
+    mkl_shape_in_backprop.SetTfLayout(mkl_context.mkl_params.in_dims,
+                                      mkl_context.mkl_params.in_sizes,
+                                      mkl_context.mkl_params.in_strides);
+    mkl_shape_in_backprop.SetTfDimOrder(mkl_context.mkl_params.in_dims,
+                                        tensor_format_);
+    tf_shape_in_backprop.AddDim(
+        dnnLayoutGetMemorySize_F32(
+            static_cast<dnnLayout_t>(mkl_shape_in_backprop.GetMklLayout())) /
+        sizeof(T));
+    AllocateOutputSetMklshape(context, 0, &in_backprop, tf_shape_in_backprop,
+                              mkl_shape_in_backprop);
+    mkl_context.mkl_res_batchnorm_bwd[dnnResourceDiffSrc] =
+        static_cast<void*>(in_backprop->flat<T>().data());
+
+    // grad_scale and grad_shift are combined together in MKL
+    // So create a single temporary buffer for those.
+    // Also set dnnResourceDiffScaleShift to the temporary buffer
+    Tensor mkl_tmp_grad_scale_shift_buf_tensor;
+    mkl_context.MklPrepareGradScaleShift(context,
+                                         &mkl_tmp_grad_scale_shift_buf_tensor);
+
+    // All dnn resources are set now, ready to execute
+    CHECK_EQ(dnnExecute_F32(mkl_context.mkl_prim_batchnorm_bwd,
+                            mkl_context.mkl_res_batchnorm_bwd),
+             E_SUCCESS);
+
+    // Now separate out scale and shift grad and copy to individual tensors
+    const TensorShape& tf_shape_scale_shift = scale.shape();
+    // Allocate tensor for grad w.r.t. scale (beta)
+    Tensor* scale_backprop = nullptr;
+    MklShape mkl_shape_scale_backprop;
+    AllocateOutputSetMklshape(context, 1, &scale_backprop, tf_shape_scale_shift,
+                              mkl_shape_scale_backprop);
+
+    // Allocate tensor for grad w.r.t. shift(gamma)
+    Tensor* shift_backprop = nullptr;
+    MklShape mkl_shape_shift_backprop;
+    AllocateOutputSetMklshape(context, 2, &shift_backprop, tf_shape_scale_shift,
+                              mkl_shape_shift_backprop);
+
+    // copy scale and shift grads to tensors
+    float* mkl_buf_scale_shift = const_cast<float*>(static_cast<const float*>(
+        mkl_tmp_grad_scale_shift_buf_tensor.flat<T>().data()));
+    float* tf_buf_scale = const_cast<float*>(
+        static_cast<const float*>(scale_backprop->flat<T>().data()));
+    float* tf_buf_shift = const_cast<float*>(
+        static_cast<const float*>(shift_backprop->flat<T>().data()));
+    auto depth = mkl_context.mkl_params.depth;
+    for (int i = 0; i < depth; i++) {
+      tf_buf_scale[i] = mkl_buf_scale_shift[i];
+      tf_buf_shift[i] = mkl_buf_scale_shift[i + depth];
+    }
+
+    // Two placeholders for estimated_mean and estimated_variance, which are
+    // used for inference and thus not needed here for gradient computation.
+    Tensor* placeholder_1 = nullptr;
+    MklShape mkl_shape_placeholder_1;
+    AllocateOutputSetMklshape(context, 3, &placeholder_1, TensorShape({}),
+                              mkl_shape_placeholder_1);
+    Tensor* placeholder_2 = nullptr;
+    MklShape mkl_shape_placeholder_2;
+    AllocateOutputSetMklshape(context, 4, &placeholder_2, TensorShape({}),
+                              mkl_shape_placeholder_2);
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  T epsilon_;
+  TensorFormat tensor_format_;
+
+  // Structure containing all info for MklOp
+  typedef struct {
+    // Parameters used for input and output layouts
+    struct MklBatchNormParams {
+      // BatchNormOp src and
+      size_t in_dims;
+      size_t in_sizes[4];
+      size_t in_strides[4];
+      size_t depth;  // Batch normalization is done for per channel.
+    } mkl_params;
+
+    MklShape mkl_shape_out_backprop;
+    MklShape mkl_shape_input_shape;
+
+    // MKL primitive and resources for BatchNormOp
+    dnnPrimitive_t mkl_prim_batchnorm_bwd = nullptr;
+    void* mkl_res_batchnorm_bwd[dnnResourceNumber];
+
+    // MKL layouts for inputs in the context
+    dnnLayout_t mkl_lt_out_backprop = nullptr;
+    dnnLayout_t mkl_lt_input = nullptr;
+
+    void MklCleanup() {
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      bool out_backprop_in_mkl_format = mkl_shape_out_backprop.IsMklTensor();
+      if (!input_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_input);
+      if (!out_backprop_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_out_backprop);
+
+      dnnDelete_F32(mkl_prim_batchnorm_bwd);
+    }
+
+    void MklExtractParams(OpKernelContext* context,
+                          const TensorFormat& tensor_format) {
+      const Tensor& input = MklGetInput(context, 1);
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      mkl_params.in_dims = input_in_mkl_format
+                               ? mkl_shape_input_shape.GetDimension()
+                               : input.dims();
+      mkl_params.in_sizes[0] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[0]
+                              : GetTensorDim(input, tensor_format, 'W'));
+      mkl_params.in_sizes[1] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[1]
+                              : GetTensorDim(input, tensor_format, 'H'));
+      mkl_params.in_sizes[2] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[2]
+                              : GetTensorDim(input, tensor_format, 'C'));
+      mkl_params.in_sizes[3] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[3]
+                              : GetTensorDim(input, tensor_format, 'N'));
+      mkl_params.depth = mkl_params.in_sizes[2];
+      GetStridesFromSizes(tensor_format, mkl_params.in_strides,
+                          mkl_params.in_sizes);
+    }
+
+    void MklCreateInputLayout(OpKernelContext* context) {
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      if (input_in_mkl_format) {
+        mkl_lt_input =
+            static_cast<dnnLayout_t>(mkl_shape_input_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&mkl_lt_input, mkl_params.in_dims,
+                                mkl_params.in_sizes, mkl_params.in_strides),
+            E_SUCCESS);
+      }
+
+      bool out_backprop_in_mkl_format = mkl_shape_out_backprop.IsMklTensor();
+      if (out_backprop_in_mkl_format) {
+        mkl_lt_out_backprop =
+            static_cast<dnnLayout_t>(mkl_shape_out_backprop.GetCurLayout());
+      } else {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&mkl_lt_out_backprop, mkl_params.in_dims,
+                                mkl_params.in_sizes, mkl_params.in_strides),
+            E_SUCCESS);
+      }
+    }
+
+    void MklPrepareContextInputs(OpKernelContext* context,
+                                 Tensor* mkl_tmp_input_buf_tensor,
+                                 Tensor* mkl_tmp_outbackprop_buf_tensor,
+                                 Tensor* mkl_tmp_scaleshift_buf_tensor) {
+      bool mkl_convert_input;
+      dnnPrimitive_t mkl_prim_convert_input = nullptr;
+      dnnLayout_t mkl_lt_internal_input = nullptr;
+      void* mkl_buf_converted_input = nullptr;
+      // Compare with internal layouts and convert if needed
+      const Tensor& input = MklGetInput(context, 1);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+      CHECK_EQ(
+          dnnLayoutCreateFromPrimitive_F32(
+              &mkl_lt_internal_input, mkl_prim_batchnorm_bwd, dnnResourceSrc),
+          E_SUCCESS);
+      mkl_convert_input =
+          !dnnLayoutCompare_F32(mkl_lt_internal_input, mkl_lt_input);
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input, mkl_lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &mkl_buf_converted_input);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input, mkl_buf_input,
+                                          mkl_buf_converted_input),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_input);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
+      mkl_res_batchnorm_bwd[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_converted_input : mkl_buf_input;
+
+      bool mkl_convert_out_backprop;
+      dnnPrimitive_t mkl_prim_convert_out_backprop = nullptr;
+      dnnLayout_t mkl_lt_internal_out_backprop = nullptr;
+      void* mkl_buf_converted_out_backprop = nullptr;
+      // Compare with internal layouts and convert if needed
+      const Tensor& out_backprop = MklGetInput(context, 0);
+      void* mkl_buf_out_backprop = const_cast<void*>(
+          static_cast<const void*>(out_backprop.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_out_backprop,
+                                                mkl_prim_batchnorm_bwd,
+                                                dnnResourceDiffDst),
+               E_SUCCESS);
+      mkl_convert_out_backprop = !dnnLayoutCompare_F32(
+          mkl_lt_internal_out_backprop, mkl_lt_out_backprop);
+      if (mkl_convert_out_backprop) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_out_backprop,
+                                         mkl_lt_out_backprop,
+                                         mkl_lt_internal_out_backprop),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_outbackprop_buf_tensor,
+                       mkl_lt_internal_out_backprop,
+                       &mkl_buf_converted_out_backprop);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_out_backprop,
+                                          mkl_buf_out_backprop,
+                                          mkl_buf_converted_out_backprop),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_out_backprop);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_out_backprop);
+      mkl_res_batchnorm_bwd[dnnResourceDiffDst] =
+          (mkl_convert_out_backprop) ? mkl_buf_converted_out_backprop
+                                     : mkl_buf_out_backprop;
+
+      // Set dnnResourceMean and dnnResourceVariance
+      const Tensor& saved_mean = MklGetInput(context, 3);
+      const Tensor& saved_var = MklGetInput(context, 4);
+      void* mkl_buf_saved_mean = const_cast<void*>(
+          static_cast<const void*>(saved_mean.flat<T>().data()));
+      void* mkl_buf_saved_var = const_cast<void*>(
+          static_cast<const void*>(saved_var.flat<T>().data()));
+      mkl_res_batchnorm_bwd[dnnResourceMean] = mkl_buf_saved_mean;
+      mkl_res_batchnorm_bwd[dnnResourceVariance] = mkl_buf_saved_var;
+
+      // Set dnnResourceScaleShift
+      // Note backward Op needs only current values of scale parameters,
+      // shift parameters could be garbage and won't be used
+      const Tensor& scale = MklGetInput(context, 2);
+      dnnLayout_t mkl_lt_scale_shift = nullptr;
+      void* mkl_buf_scale_shift = nullptr;
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_scale_shift,
+                                                mkl_prim_batchnorm_bwd,
+                                                dnnResourceScaleShift),
+               E_SUCCESS);
+      AllocTmpBuffer(context, mkl_tmp_scaleshift_buf_tensor, mkl_lt_scale_shift,
+                     &mkl_buf_scale_shift);
+      float* pscale =
+          const_cast<float*>(static_cast<const float*>(scale.flat<T>().data()));
+      float* pscale_shift = static_cast<float*>(mkl_buf_scale_shift);
+      auto depth = mkl_params.depth;
+      for (int i = 0; i < depth; i++) pscale_shift[i] = pscale[i];
+      mkl_res_batchnorm_bwd[dnnResourceScaleShift] = mkl_buf_scale_shift;
+      dnnLayoutDelete_F32(mkl_lt_scale_shift);
+    }
+
+    void MklPrepareGradScaleShift(OpKernelContext* context,
+                                  Tensor* mkl_tmp_grad_scale_shift_buf_tensor) {
+      dnnLayout_t mkl_lt_grad_scaleshift = nullptr;
+      void* mkl_buf_grad_scaleshift = nullptr;
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_grad_scaleshift,
+                                                mkl_prim_batchnorm_bwd,
+                                                dnnResourceDiffScaleShift),
+               E_SUCCESS);
+      AllocTmpBuffer(context, mkl_tmp_grad_scale_shift_buf_tensor,
+                     mkl_lt_grad_scaleshift, &mkl_buf_grad_scaleshift);
+      mkl_res_batchnorm_bwd[dnnResourceDiffScaleShift] =
+          mkl_buf_grad_scaleshift;
+      dnnLayoutDelete_F32(mkl_lt_grad_scaleshift);
+    }
+  } MklFusedBatchNormGradOpContext;
+};
+
+#define REGISTER_MKL_CPU(T)                                               \
+  REGISTER_KERNEL_BUILDER(Name("MklFusedBatchNormGrad")                   \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<T>("T")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklFusedBatchNormGradOp<CPUDevice, T>);
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
new file mode 100644
index 0000000000..da1b1a15e8
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -0,0 +1,775 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// LRN = Local Response Normalization
+// See docs in ../ops/nn_ops.cc. This opkernel uses MKL library, create MKL
+// layout and primitives, use MKL dnn primitives to compute local
+// response normalization
+
+#ifdef INTEL_MKL
+
+#define EIGEN_USE_THREADS
+#include <vector>
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/util/mkl_util.h"
+#include "tensorflow/core/util/tensor_format.h"
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+
+#if !defined(IS_MOBILE_PLATFORM)
+#include "tensorflow/core/util/work_sharder.h"
+#endif
+
+namespace tensorflow {
+
+namespace {
+// Create a depth-by-depth band matrix with 1s along a swath of size (2 *
+// depth_radius + 1) around the diagonal.
+template <typename T>
+void GetBandMatrix(int depth, int depth_radius,
+                   Eigen::Tensor<T, 2, Eigen::RowMajor>* result) {
+  result->setZero();
+  for (int row = 0; row < depth; ++row) {
+    const int begin = std::max<int>(0, row - depth_radius);
+    const int end = std::min<int>(depth, row + depth_radius + 1);
+    Eigen::DSizes<Eigen::DenseIndex, 2> start(row, begin);
+    Eigen::DSizes<Eigen::DenseIndex, 2> sizes(1, end - begin);
+    result->slice(start, sizes).setConstant(T(1));
+  }
+}
+
+}  // namespace
+
+template <typename T>
+class MklLRNOp : public OpKernel {
+ public:
+  ~MklLRNOp() {}
+
+  explicit MklLRNOp(OpKernelConstruction* context) : OpKernel(context) {
+    int64 depth_radius64;
+    OP_REQUIRES_OK(context, context->GetAttr("depth_radius", &depth_radius64));
+    OP_REQUIRES(context, FastBoundsCheck(depth_radius64,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("depth_radius = ", depth_radius64,
+                                        " larger than int max"));
+    depth_radius_ = static_cast<size_t>(depth_radius64);
+
+    OP_REQUIRES_OK(context, context->GetAttr("bias", &bias_));
+    OP_REQUIRES_OK(context, context->GetAttr("alpha", &alpha_));
+    OP_REQUIRES_OK(context, context->GetAttr("beta", &beta_));
+    workspace_enabled_ = false;
+    context->GetAttr("workspace_enabled", &workspace_enabled_);
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklLRNOpContext mkl_context;
+
+    const Tensor& input = MklGetInput(context, 0);
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+
+    // Sanity checks
+    mkl_context.in_dims = input_in_mkl_format
+                              ? mkl_context.input_shape.GetDimension()
+                              : input.dims();
+    OP_REQUIRES(context, mkl_context.in_dims == 4,
+                errors::InvalidArgument("input must be 4-dimensional"));
+    OP_REQUIRES(context, FastBoundsCheck(input.NumElements(),
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("argument to LRN too large"));
+
+    if (!input_in_mkl_format) {
+      mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
+                                    beta_, input);
+      return;
+    }
+
+    if (input_in_mkl_format) {
+      // MKL supports normalization over channel dimension only
+      if (mkl_context.input_shape.tf_dim_idx(mkl_context.in_dims - 1) ==
+          MklDims::C) {
+        mkl_context.lt_input =
+            static_cast<dnnLayout_t>(mkl_context.input_shape.GetCurLayout());
+        workspace_enabled_ = true;
+        /* std::cout<<" the mkl lrn is enabled!!!!!!!!!!"<<std::endl; */
+      } else {
+        /* std::vector<const Tensor *> temp_input(1, &input);
+        std::vector< MklShape> mkl_input_shapes(1, mkl_context.input_shape);
+        std::vector<Tensor> temp_out = ConvertMklToTF<T>(context,
+                                                      temp_input,
+                                                      mkl_input_shapes); */
+        mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
+                                      beta_, input);
+        return;
+      }
+    }
+
+    int kernel_size = 2 * depth_radius_ + 1;
+
+    CHECK_EQ(dnnLRNCreateForward_F32(&mkl_context.lrn_fwd, NULL,
+                                     mkl_context.lt_input, kernel_size,
+                                     static_cast<float>(alpha_ * kernel_size),
+                                     beta_, bias_),
+             E_SUCCESS);
+
+    // Allocate output tensor and shape
+    Tensor* output = nullptr;
+    Tensor* workspace = nullptr;
+
+    // Convert Inputs if needed
+    Tensor mkl_tmp_input_buf_tensor;
+    mkl_context.MklPrepareLRNInputs(context, &mkl_tmp_input_buf_tensor);
+
+    // Allocate Layer Outputs
+    mkl_context.MklAllocateOutputs(context, &output, &workspace,
+                                   workspace_enabled_);
+
+    Tensor mkl_tmp_workspace_buf_tensor;
+    mkl_context.MklPrepareLRNOutputs(context, output, workspace,
+                                     &mkl_tmp_workspace_buf_tensor,
+                                     workspace_enabled_);
+
+    // Execute LRN.
+    CHECK_EQ(dnnExecute_F32(mkl_context.lrn_fwd, mkl_context.lrn_res),
+             E_SUCCESS);
+
+    // Release MKL resources.
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    size_t in_dims;
+    size_t in_sizes[4];
+    size_t in_strides[4];
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    MklShape input_shape;
+    dnnPrimitive_t lrn_fwd = nullptr;
+    dnnPrimitive_t convert_input = nullptr;
+    /* dnnPrimitive_t convert_output; */
+    dnnLayout_t lt_input = nullptr;
+    /* dnnLayout_t lt_output; */
+    dnnLayout_t lt_internal_input = nullptr;
+    dnnLayout_t lt_internal_workspace = nullptr;
+    dnnLayout_t lt_internal_output = nullptr;
+    void* lrn_res[dnnResourceNumber];
+
+    // Convert Inputs if needed
+    void MklPrepareLRNInputs(OpKernelContext* context,
+                             Tensor* mkl_tmp_input_buf_tensor) {
+      const Tensor& input = MklGetInput(context, 0);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_internal_input, lrn_fwd,
+                                                dnnResourceSrc),
+               E_SUCCESS);
+
+      void* mkl_buf_convert_input = nullptr;
+      bool mkl_convert_input = false;
+      mkl_convert_input = !dnnLayoutCompare_F32(lt_internal_input, lt_input);
+
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&convert_input, lt_input,
+                                         lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, lt_internal_input,
+                       &mkl_buf_convert_input);
+        CHECK_EQ(dnnConversionExecute_F32(convert_input, mkl_buf_input,
+                                          mkl_buf_convert_input),
+                 E_SUCCESS);
+        dnnDelete_F32(convert_input);
+      }
+
+      lrn_res[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_convert_input : mkl_buf_input;
+    }
+
+    // Allocate Layer Outputs
+    void MklAllocateOutputs(OpKernelContext* context, Tensor** output,
+                            Tensor** workspace, bool workspace_enabled_) {
+      TensorShape mkl_output_tf_shape; /* First tensor */
+      MklShape mkl_output_mkl_shape;   /* Second tensor */
+
+      mkl_output_mkl_shape.SetMklTensor(true);
+      mkl_output_mkl_shape.SetMklLayout(lrn_fwd, dnnResourceDst);
+      mkl_output_mkl_shape.SetTfLayout(in_dims, input_shape.GetSizes(),
+                                       input_shape.GetStrides());
+      mkl_output_mkl_shape.SetTfDimOrder(in_dims,
+                                         input_shape.GetTfToMklDimMap());
+      mkl_output_tf_shape.AddDim(
+          dnnLayoutGetMemorySize_F32(
+              static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
+          sizeof(T));
+      AllocateOutputSetMklshape(context, 0, output,
+                                mkl_output_tf_shape /* First tensor */,
+                                mkl_output_mkl_shape /* Second Tensor */);
+
+      if (workspace_enabled_) {
+        TensorShape mkl_workspace_tf_shape; /* First tensor */
+        MklShape mkl_workspace_mkl_shape;   /* Second tensor */
+        mkl_workspace_mkl_shape.SetMklTensor(false);
+        mkl_workspace_mkl_shape.SetMklLayout(lrn_fwd, dnnResourceWorkspace);
+        // Assumes workspace has same TF layout and TF dim order as input
+        mkl_workspace_mkl_shape.SetTfLayout(in_dims, input_shape.GetSizes(),
+                                            input_shape.GetStrides());
+        mkl_workspace_mkl_shape.SetTfDimOrder(in_dims,
+                                              input_shape.GetTfToMklDimMap());
+        mkl_workspace_tf_shape.AddDim(
+            dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                mkl_workspace_mkl_shape.GetMklLayout())) /
+            sizeof(T));
+        AllocateOutputSetMklshape(context, 1, workspace,
+                                  mkl_workspace_tf_shape /* First tensor */,
+                                  mkl_workspace_mkl_shape /* Second Tensor */);
+      }
+    }
+
+    void MklPrepareLRNOutputs(OpKernelContext* context, Tensor* output,
+                              Tensor* workspace,
+                              Tensor* mkl_tmp_workspace_buf_tensor,
+                              bool workspace_enabled_) {
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_internal_workspace, lrn_fwd,
+                                                dnnResourceWorkspace),
+               E_SUCCESS);
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_internal_output, lrn_fwd,
+                                                dnnResourceDst),
+               E_SUCCESS);
+
+      void* mkl_buf_output =
+          const_cast<void*>(static_cast<const void*>(output->flat<T>().data()));
+      lrn_res[dnnResourceDst] = mkl_buf_output;
+
+      void* mkl_buf_workspace = nullptr;
+      if (workspace_enabled_) {
+        mkl_buf_workspace = const_cast<void*>(
+            static_cast<const void*>(workspace->flat<T>().data()));
+      } else {
+        AllocTmpBuffer(context, mkl_tmp_workspace_buf_tensor,
+                       lt_internal_workspace, &mkl_buf_workspace);
+      }
+      lrn_res[dnnResourceWorkspace] = mkl_buf_workspace;
+    }
+
+    // Fallback implementation - Taken from lrn_op.cc
+    void MklDefaultToEigen(OpKernelContext* context, int depth_radius_,
+                           float bias_, float alpha_, float beta_,
+                           const Tensor &input) {
+      const int batch = static_cast<int>(input.dim_size(0));
+      const int rows = static_cast<int>(input.dim_size(1));
+      const int cols = static_cast<int>(input.dim_size(2));
+      const int depth = static_cast<int>(input.dim_size(3));
+      const int nodes = cols * rows;
+
+      auto in_shaped = input.shaped<T, 2>({nodes * batch, depth});
+      // Multiplying the input with the band matrix has the effect of reducing
+      // the
+      // correct patch along the depth.
+      Eigen::Tensor<T, 2, Eigen::RowMajor> multiplier(depth, depth);
+      GetBandMatrix<T>(depth, depth_radius_, &multiplier);
+
+      Tensor *output, *workspace;
+      MklShape mkl_output_mkl_shape, mkl_workspace_mkl_shape;
+      mkl_output_mkl_shape.SetMklTensor(false);
+      mkl_output_mkl_shape.SetDimensions(4);
+      AllocateOutputSetMklshape(context, 0, &output, input.shape(),
+                                mkl_output_mkl_shape);
+
+      mkl_workspace_mkl_shape.SetMklTensor(false);
+      mkl_workspace_mkl_shape.SetDimensions(4);
+      AllocateOutputSetMklshape(context, 1, &workspace, input.shape(),
+                                mkl_workspace_mkl_shape);
+
+      auto out_shaped = output->shaped<T, 2>({nodes * batch, depth});
+      Eigen::array<DimPair, 1> dims = {{DimPair(1, 0)}};
+      auto tmp = in_shaped.square().contract(multiplier, dims) * alpha_ + bias_;
+      if (beta_ == T(1)) {
+        out_shaped.device(context->eigen_cpu_device()) =
+            in_shaped * tmp.inverse();
+      } else if (beta_ == T(0.5)) {
+        out_shaped.device(context->eigen_cpu_device()) =
+            in_shaped * tmp.rsqrt();
+      } else {
+        out_shaped.device(context->eigen_cpu_device()) =
+            in_shaped * (tmp.log() * -beta_).exp();
+      }
+    }
+
+    // Release MKL resources.
+    void MklCleanup() {
+      dnnDelete_F32(lrn_fwd);
+      dnnLayoutDelete_F32(lt_internal_input);
+      dnnLayoutDelete_F32(lt_internal_workspace);
+      dnnLayoutDelete_F32(lt_internal_output);
+      // if (!input_in_mkl_format) {
+      //  dnnLayoutDelete_F32(mkl_prims.lt_input);
+      //}
+    }
+  } MklLRNOpContext;
+
+  typedef typename Eigen::Tensor<T, 1, Eigen::RowMajor>::DimensionPair DimPair;
+
+  bool workspace_enabled_;
+  int depth_radius_;
+  float bias_;
+  float alpha_;
+  float beta_;
+};
+
+
+
+template <typename T>
+class MklLRNGradOp : public OpKernel {
+ public:
+  explicit MklLRNGradOp(OpKernelConstruction* context) : OpKernel(context) {
+    int64 depth_radius64;
+    OP_REQUIRES_OK(context, context->GetAttr("depth_radius", &depth_radius64));
+    OP_REQUIRES(context, FastBoundsCheck(depth_radius64,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("depth_radius = ", depth_radius64,
+                                        " larger than int max"));
+    depth_radius_ = static_cast<int>(depth_radius64);
+    OP_REQUIRES_OK(context, context->GetAttr("bias", &bias_));
+    OP_REQUIRES_OK(context, context->GetAttr("alpha", &alpha_));
+    OP_REQUIRES_OK(context, context->GetAttr("beta", &beta_));
+    workspace_enabled_ = false;
+    context->GetAttr("workspace_enabled", &workspace_enabled_);
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklLRNGradOpContext mkl_context;
+    mkl_context.depth_radius_ = depth_radius_;
+    mkl_context.bias_ = bias_;
+    mkl_context.alpha_ = alpha_;
+    mkl_context.beta_ = beta_;
+
+    const Tensor& in_grads = MklGetInput(context, 0);
+    const Tensor& in_image = MklGetInput(context, 1);
+    const Tensor& out_image = MklGetInput(context, 2);
+
+    GetMklShape(context, 0, &mkl_context.ingrad_shape);
+    GetMklShape(context, 1, &mkl_context.inimage_shape);
+    GetMklShape(context, 2, &mkl_context.outimage_shape);
+
+    bool ingrad_in_mkl_format = mkl_context.ingrad_shape.IsMklTensor();
+    bool inimage_in_mkl_format = mkl_context.inimage_shape.IsMklTensor();
+    bool outimage_in_mkl_format = mkl_context.outimage_shape.IsMklTensor();
+
+    mkl_context.in_dims = inimage_in_mkl_format
+                              ? mkl_context.inimage_shape.GetDimension()
+                              : in_image.dims();
+    OP_REQUIRES(context, mkl_context.in_dims == 4,
+                errors::InvalidArgument("input images must be 4-dimensional"));
+
+    if (!workspace_enabled_) {
+      mkl_context.MklDefaultToEigen(context);
+      return;
+    }
+    if (ingrad_in_mkl_format || inimage_in_mkl_format) {
+      const MklShape* tmp_mkl_shape = (ingrad_in_mkl_format)
+                                          ? &mkl_context.ingrad_shape
+                                          : &mkl_context.inimage_shape;
+      if (tmp_mkl_shape->tf_dim_idx(mkl_context.in_dims - 1) != MklDims::C) {
+        // Fallback to eigen
+        mkl_context.MklDefaultToEigen(context);
+        return;
+      } else {  // MKL supports normalization over channel dimension only
+        for (int i = 0; i < mkl_context.in_dims; i++) {
+          mkl_context.in_sizes[i] = mkl_context.out_sizes[i] =
+              tmp_mkl_shape->GetSizes()[i];
+          mkl_context.in_strides[i] = mkl_context.out_strides[i] =
+              tmp_mkl_shape->GetStrides()[i];
+        }
+      }
+    } else {
+      // Fallback to eigen
+      mkl_context.MklDefaultToEigen(context);
+      return;
+    }
+
+    // Dimensions check for sanity purpose
+    if (ingrad_in_mkl_format) {
+      OP_REQUIRES(
+          context, mkl_context.ingrad_shape.GetDimension() == 4,
+          errors::InvalidArgument("input gradient must be 4-dimensional"));
+    } else {
+      OP_REQUIRES(
+          context, in_grads.dims() == 4,
+          errors::InvalidArgument("input gradient must be 4-dimensional"));
+    }
+
+    if (outimage_in_mkl_format) {
+      OP_REQUIRES(
+          context, mkl_context.outimage_shape.GetDimension() == 4,
+          errors::InvalidArgument("Output image must be 4-dimensional"));
+    } else {
+      OP_REQUIRES(
+          context, out_image.dims() == 4,
+          errors::InvalidArgument("Output image must be 4-dimensional"));
+    }
+
+    // Prepare mkl input layout
+    mkl_context.MklPrepareLRNInputsLayouts(context);
+    int ksize = 2 * depth_radius_ + 1;
+
+    CHECK_EQ(
+        dnnLRNCreateBackward_F32(&mkl_context.lrn_bwd, NULL,
+                                 mkl_context.lt_input, mkl_context.lt_output,
+                                 ksize, static_cast<float>(alpha_ *
+                                 ksize), beta_, bias_),
+        E_SUCCESS);
+
+    // Allocate output tensor and shape.
+    TensorShape mkl_output_tf_shape; /* First tensor */
+    MklShape mkl_output_mkl_shape;   /* Second tensor */
+    mkl_output_mkl_shape.SetMklTensor(true);
+    CHECK_NE(mkl_context.lrn_bwd, nullptr);
+    mkl_output_mkl_shape.SetMklLayout(mkl_context.lrn_bwd, dnnResourceDiffSrc);
+    mkl_output_mkl_shape.SetTfLayout(mkl_context.in_dims, mkl_context.out_sizes,
+                                     mkl_context.out_strides);
+    if (ingrad_in_mkl_format) {
+      mkl_output_mkl_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.ingrad_shape.GetTfToMklDimMap());
+    } else {
+      mkl_output_mkl_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.inimage_shape.GetTfToMklDimMap());
+    }
+    mkl_output_tf_shape.AddDim(
+        dnnLayoutGetMemorySize_F32(
+            static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
+        sizeof(T));
+    Tensor* output = nullptr;
+    AllocateOutputSetMklshape(context, 0, &output, mkl_output_tf_shape,
+                              mkl_output_mkl_shape);
+
+    // Get pointers to output data.
+    void* user_output =
+        const_cast<void*>(static_cast<const void*>(output->flat<T>().data()));
+
+    Tensor mkl_tmp_input_buf_tensor, mkl_tmp_image_buf_tensor,
+        mkl_tmp_outimage_buf_tensor, mkl_tmp_workspace_buf_tensor;
+    // Convert Inputs if needed
+    mkl_context.MklPrepareLRNGradInput(
+        context, &mkl_tmp_input_buf_tensor, &mkl_tmp_image_buf_tensor,
+        &mkl_tmp_outimage_buf_tensor, &mkl_tmp_workspace_buf_tensor);
+
+    // We do not do any conversion for output. But we simply emit it
+    // in MKL format.
+    mkl_context.res_lrn_bwd[dnnResourceDiffSrc] = user_output;
+    // Execute LRN backward using dnnExecute
+    CHECK_EQ(
+        dnnExecute_F32(mkl_context.lrn_bwd, mkl_context.res_lrn_bwd),
+        E_SUCCESS);
+    // Release MKL resources.
+    mkl_context.Mklcleanup();
+  }
+
+ private:
+  typedef struct {
+    int depth_radius_;
+    float bias_;
+    float alpha_;
+    float beta_;
+    size_t in_dims;
+    size_t in_sizes[4];
+    size_t in_strides[4];
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    MklShape ingrad_shape, inimage_shape, outimage_shape;
+    dnnPrimitive_t lrn_bwd = nullptr;
+    dnnPrimitive_t convert_input = nullptr;
+    /* dnnPrimitive_t convert_output; */
+    dnnLayout_t lt_input = nullptr;
+    dnnLayout_t lt_output = nullptr;
+    dnnLayout_t lt_bdw_input = nullptr;
+    dnnLayout_t lt_workspace = nullptr;
+    dnnLayout_t lt_internal_input = nullptr;
+    /* dnnLayout_t lt_internal_workspace;
+    dnnLayout_t lt_internal_output; */
+    void* res_lrn_bwd[dnnResourceNumber];
+
+    // prepare mkl input
+    void MklPrepareLRNInputsLayouts(OpKernelContext* context) {
+      bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
+      bool inimage_in_mkl_format = inimage_shape.IsMklTensor();
+      if (!ingrad_in_mkl_format) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_input = static_cast<dnnLayout_t>(ingrad_shape.GetCurLayout());
+      }
+
+      if (!inimage_in_mkl_format) {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&lt_output, in_dims, out_sizes, out_strides),
+            E_SUCCESS);
+      } else {
+        lt_output = static_cast<dnnLayout_t>(inimage_shape.GetCurLayout());
+      }
+    }
+
+    // convert input if needed
+    void MklPrepareLRNGradInput(OpKernelContext* context,
+                                Tensor* mkl_tmp_input_buf_tensor,
+                                Tensor* mkl_tmp_image_buf_tensor,
+                                Tensor* mkl_tmp_outimage_buf_tensor,
+                                Tensor* mkl_tmp_workspace_buf_tensor) {
+      const Tensor& in_grads = MklGetInput(context, 0);
+      const Tensor& in_image = MklGetInput(context, 1);
+      const Tensor& out_image = MklGetInput(context, 2);
+
+      void* user_input = const_cast<void*>(
+          static_cast<const void*>(in_grads.flat<T>().data()));
+      void* user_fwd_input = const_cast<void*>(
+          static_cast<const void*>(in_image.flat<T>().data()));
+      void* user_fwd_output = const_cast<void*>(
+          static_cast<const void*>(out_image.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_workspace, lrn_bwd,
+                                                dnnResourceWorkspace),
+               E_SUCCESS);
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_bdw_input, lrn_bwd,
+                                                dnnResourceDiffDst),
+               E_SUCCESS);
+
+      bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
+      if (ingrad_in_mkl_format) {
+        if (!dnnLayoutCompare_F32(lt_bdw_input, lt_input)) {
+          AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, lt_bdw_input,
+                         &res_lrn_bwd[dnnResourceDiffDst]);
+          ingrad_shape.GetConvertedFlatData(lt_bdw_input, user_input,
+                                            res_lrn_bwd[dnnResourceDiffDst]);
+        } else {
+          res_lrn_bwd[dnnResourceDiffDst] = user_input;
+        }
+      } else {
+        if (!dnnLayoutCompare_F32(lt_bdw_input, lt_input)) {
+          CHECK_EQ(
+              dnnConversionCreate_F32(&convert_input, lt_input, lt_bdw_input),
+              E_SUCCESS);
+
+          AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, lt_bdw_input,
+                         &res_lrn_bwd[dnnResourceDiffDst]);
+          CHECK_EQ(dnnConversionExecute_F32(convert_input, user_input,
+                                            res_lrn_bwd[dnnResourceDiffDst]),
+                   E_SUCCESS);
+          dnnDelete_F32(convert_input);
+        } else {
+          res_lrn_bwd[dnnResourceDiffDst] = user_input;
+        }
+      }
+
+// Although MKL documentation for LRN does not specify setting/getting
+// of dnnResourceSrc and dnnResourceDst, Caffe code sets dnnResourceSrc.
+// So we set dnnResourceSrc here. But we do not know why we are setting
+// dnnResourceDst.
+#if 0
+    // NOTE: The code below is kept just so that we know how we should handle
+    // dnnResourceSrc if the primitive layout for dnnResourceSrc was supported.
+
+    if (!dnnLayoutCompare_F32(lt_internal_input,
+         static_cast<dnnLayout_t>inimage_shape.GetCurLayout())) {
+      AllocTmpBuffer(context, mkl_tmp_image_buf_tensor, lt_internal_input,
+                     &res_lrn_bwd[dnnResourceSrc]);
+      inimage_shape.GetConvertedFlatData(lt_internal_input,
+                                           user_fwd_input,
+                                           res_lrn_bwd[dnnResourceSrc]);
+    } else {
+      res_lrn_bwd[dnnResourceSrc] = user_fwd_input;
+    }
+#endif
+
+      // Since we cannot get expected layout for dnnResourceSrc, we construct
+      // buffer using
+      // MKL format if input is in MKL format.
+      if (inimage_shape.IsMklTensor()) {
+        AllocTmpBuffer(context, mkl_tmp_image_buf_tensor,
+                       (dnnLayout_t)inimage_shape.GetCurLayout(),
+                       &res_lrn_bwd[dnnResourceSrc]);
+      } else {
+        res_lrn_bwd[dnnResourceSrc] = user_fwd_input;
+      }
+
+      // Same comment as above.
+      if (outimage_shape.IsMklTensor()) {
+        AllocTmpBuffer(context, mkl_tmp_outimage_buf_tensor,
+                       (dnnLayout_t)outimage_shape.GetCurLayout(),
+                       &res_lrn_bwd[dnnResourceDst]);
+      } else {
+        res_lrn_bwd[dnnResourceDst] = user_fwd_output;
+      }
+
+      // Allocate buffer for workspace.
+      AllocTmpBuffer(context, mkl_tmp_workspace_buf_tensor, lt_workspace,
+                     &res_lrn_bwd[dnnResourceWorkspace]);
+    }
+
+    // Fallback implementation - Taken from lrn_op.cc
+    void MklDefaultToEigen(OpKernelContext* context) {
+      // CHECK(false);
+      Tensor in_grads = MklGetInput(context, 0);
+      Tensor in_image = MklGetInput(context, 1);
+      Tensor out_image = MklGetInput(context, 2);
+
+      GetMklShape(context, 0, &ingrad_shape);
+      GetMklShape(context, 1, &inimage_shape);
+      GetMklShape(context, 2, &outimage_shape);
+
+      /* bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
+      bool inimage_in_mkl_format = inimage_shape.IsMklTensor();
+      bool outimage_in_mkl_format = outimage_shape.IsMklTensor();
+
+      if ( ingrad_in_mkl_format ) {
+        std::vector<const Tensor *> temp_ingrad(1, &in_grads);
+        std::vector< MklShape> mkl_ingrad_shapes(1, ingrad_shape);
+        std::vector<Tensor> temp_outingrad = ConvertMklToTF<T>(context,
+                                                      temp_ingrad,
+                                                      mkl_ingrad_shapes);
+        in_grads = temp_outingrad[0];
+      }
+      if ( inimage_in_mkl_format ) {
+        std::vector<const Tensor *> temp_inimage(1, &in_image);
+        std::vector< MklShape> mkl_inimage_shapes(1, inimage_shape);
+        std::vector<Tensor> temp_outinimage = ConvertMklToTF<T>(context,
+                                                      temp_inimage,
+                                                      mkl_inimage_shapes);
+        in_image = temp_outinimage[0];
+      }
+      if ( outimage_in_mkl_format ) {
+        std::vector<const Tensor *> temp_outimage(1, &out_image);
+        std::vector< MklShape> mkl_outimage_shapes(1, outimage_shape);
+        std::vector<Tensor> temp_outoutimage = ConvertMklToTF<T>(context,
+                                                      temp_outimage,
+                                                      mkl_outimage_shapes);
+        out_image = temp_outoutimage[0];
+      } */
+
+      const int64 batch = static_cast<int64>(in_grads.dim_size(0));
+      const int64 rows = static_cast<int64>(in_grads.dim_size(1));
+      const int64 cols = static_cast<int64>(in_grads.dim_size(2));
+      const int64 depth = static_cast<int64>(in_grads.dim_size(3));
+      const auto nodes = cols * rows;
+
+      auto grads_shaped = in_grads.shaped<T, 2>({nodes * batch, depth});
+      auto in_shaped = in_image.shaped<T, 2>({nodes * batch, depth});
+      auto activations = out_image.shaped<T, 2>({nodes * batch, depth});
+
+      Tensor* output;
+      MklShape mkl_output_mkl_shape;
+      mkl_output_mkl_shape.SetMklTensor(false);
+      mkl_output_mkl_shape.SetDimensions(4);
+      AllocateOutputSetMklshape(context, 0, &output, in_grads.shape(),
+                                mkl_output_mkl_shape);
+
+      auto out_shaped = output->shaped<T, 2>({nodes * batch, depth});
+      out_shaped.setZero();
+      auto shard = [this, activations, in_shaped, grads_shaped, out_shaped,
+                    depth](int64 begin, int64 end) {
+        for (int64 i = begin; i < end; ++i) {
+          for (int64 j = 0; j < depth; ++j) {
+            // Let y be the LRN activations and x be the inputs along the depth
+            // dimension. (LRN operates independently along rows, cols, and
+            // batch).
+            // We have
+            // yi = xi / (bias + alpha(sum_j_{i - depth_radius}^{i +
+            // depth_radius}
+            //      x_j^2))^beta
+            //
+            // Let N = (bias + alpha(sum_j_{i - depth_radius}^{i + depth_radius}
+            //           x_j^2))
+            // dy_i/dx_i = (N^beta - xi. beta*N^(beta-1)*2*alpha*xi)/N^(2*beta)
+            // dy_i/dx_j = (       - xi. beta*N^(beta-1)*2*alpha*xj)/N^(2*beta)
+            //
+            // NOTE(keveman) : We can compute N by doing (yi/xi) ^ (1/beta).
+            // However, this is numerically unstable for small values of xi. We
+            // compute N explicitly here to avoid that.
+
+            int64 depth_begin = std::max<int64>(0, j - depth_radius_);
+            int64 depth_end = std::min<int64>(depth, j + depth_radius_ + 1);
+
+            T norm(0);
+            for (int64 k = depth_begin; k < depth_end; ++k) {
+              norm += in_shaped(i, k) * in_shaped(i, k);
+            }
+            norm = alpha_ * norm + bias_;
+            DCHECK_GT(norm, T(1e-6));
+            for (int64 k = depth_begin; k < depth_end; ++k) {
+              T dyi = T(-2) * alpha_ * beta_ * in_shaped(i, k) *
+                      activations(i, j) / norm;
+              if (k == j) {
+                dyi += Eigen::numext::pow(norm, -beta_);
+              }
+              dyi *= grads_shaped(i, j);
+              const_cast<typename TTypes<T, 2>::Tensor&>(out_shaped)(i, k) +=
+                  dyi;
+            }
+          }
+        }
+      };
+      auto worker_threads =
+          *(context->device()->tensorflow_cpu_worker_threads());
+      Shard(worker_threads.num_threads, worker_threads.workers, nodes * batch,
+            depth * depth, shard);
+    }
+
+    // release mkl resources
+    void Mklcleanup() {
+      bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
+      bool inimage_in_mkl_format = inimage_shape.IsMklTensor();
+      if (!ingrad_in_mkl_format) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_input), E_SUCCESS);
+      }
+
+      if (!inimage_in_mkl_format) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_output), E_SUCCESS);
+      }
+      dnnDelete_F32(lrn_bwd);
+      dnnLayoutDelete_F32(lt_bdw_input);
+      dnnLayoutDelete_F32(lt_workspace);
+    }
+  } MklLRNGradOpContext;
+
+  typedef typename Eigen::Tensor<T, 1, Eigen::RowMajor>::DimensionPair DimPair;
+  bool workspace_enabled_;
+  int depth_radius_;
+  float bias_;
+  float alpha_;
+  float beta_;
+};
+
+#define REGISTER_MKL_LRN_CPU(T)                                           \
+  REGISTER_KERNEL_BUILDER(Name("MklLRN")                                  \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<T>("T")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklLRNOp<T>);                                   \
+  REGISTER_KERNEL_BUILDER(Name("MklLRNGrad")                              \
+                              .Device(DEVICE_CPU)                         \
+                              .TypeConstraint<T>("T")                     \
+                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                          MklLRNGradOp<T>);
+
+TF_CALL_float(REGISTER_MKL_LRN_CPU);
+
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e81490c498..944fb70bb1 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -394,6 +394,26 @@ output: A `Tensor` with the concatenation of values stacked along the
   in `concat_dim` where it has the sum of the sizes.
 )doc");
 
+#ifdef INTEL_MKL
+REGISTER_OP("MklConcatV2")
+    .Input("values: N * T")
+    .Input("axis: Tidx")
+    .Input("mkl_values: N * uint8")
+    .Input("mkl_axis: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("N: int >= 2")
+    .Attr("T: type")
+    .Attr("Tidx: {int32, int64} = DT_INT32")
+    .SetShapeFn(shape_inference::ConcatV2Shape)
+    .Doc(R"doc(
+MKL version of ConcatV2 operator. Uses MKL DNN APIs to perform concatenation.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+#endif
+
 REGISTER_OP("ConcatOffset")
     .Input("concat_dim: int32")
     .Input("shape: N * int32")
@@ -4963,6 +4983,27 @@ backprop_wrt_max: Backpropagated gradients w.r.t. max parameter, shape `[d]`:
   `sum_per_d(gradients * (inputs > max))`.
 )doc");
 
+#ifdef INTEL_MKL
+REGISTER_OP("MklConcat")
+    .Input("concat_dim: int32")
+    .Input("values: N * T")
+    .Input("mkl_concat_dim: uint8")
+    .Input("mkl_values: N * uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("N: int >= 2")
+    .Attr("T: type")
+    .SetShapeFn([](InferenceContext* c) {
+      return shape_inference::ConcatShape(c, c->num_inputs() - 3);
+    })
+    .Doc(R"doc(
+MKL version of Concat operator. Uses MKL DNN APIs to perform concatenation.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+#endif
+
 // Deprecated op registrations:
 
 // The following can be deleted after 10mar2017.
diff --git a/tensorflow/core/ops/nn_ops.cc b/tensorflow/core/ops/nn_ops.cc
index e9d5897af0..b894540ff6 100644
--- a/tensorflow/core/ops/nn_ops.cc
+++ b/tensorflow/core/ops/nn_ops.cc
@@ -2614,8 +2614,8 @@ scale_after_normalization: A bool indicating whether the resulted tensor
 #ifdef INTEL_MKL
 REGISTER_OP("MklConv2D")
     .Input("input: T")
-    .Input("mkl_input: uint8")
     .Input("filter: T")
+    .Input("mkl_input: uint8")
     .Input("mkl_filter: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2634,10 +2634,10 @@ expected to invoke these operators.
 
 REGISTER_OP("MklConv2DWithBias")
     .Input("input: T")
-    .Input("mkl_input: uint8")
     .Input("filter: T")
-    .Input("mkl_filter: uint8")
     .Input("bias: T")
+    .Input("mkl_input: uint8")
+    .Input("mkl_filter: uint8")
     .Input("mkl_bias: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2656,10 +2656,10 @@ expected to invoke these operators.
 
 REGISTER_OP("MklConv2DBackpropFilter")
     .Input("input: T")
-    .Input("mkl_input: uint8")
     .Input("filter_sizes: int32")
-    .Input("mkl_filter_size: uint8")
     .Input("out_backprop: T")
+    .Input("mkl_input: uint8")
+    .Input("mkl_filter_size: uint8")
     .Input("mkl_out_backprop: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2669,7 +2669,7 @@ REGISTER_OP("MklConv2DBackpropFilter")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
     .SetShapeFn([](InferenceContext* c) {
-      return InputTensorShapeOrUnknown(c, 2 /* input_idx */, 4 /* ndims */);
+      return InputTensorShapeOrUnknown(c, 1 /* input_idx */, 4 /* ndims */);
     })
     .Doc(R"doc(
 MKL version of Conv2DBackpropFilter. Uses MKL DNN APIs to compute the
@@ -2697,10 +2697,10 @@ expected to invoke these operators.
 
 REGISTER_OP("MklConv2DBackpropInput")
     .Input("input_sizes: int32")
-    .Input("mkl_input_sizes: uint8")
     .Input("filter: T")
-    .Input("mkl_filter: uint8")
     .Input("out_backprop: T")
+    .Input("mkl_input_sizes: uint8")
+    .Input("mkl_filter: uint8")
     .Input("mkl_out_backprop: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2736,8 +2736,8 @@ expected to invoke these operators.
 
 REGISTER_OP("MklReluGrad")
     .Input("gradients: T")
-    .Input("mkl_gradients: uint8")
     .Input("features: T")
+    .Input("mkl_gradients: uint8")
     .Input("mkl_features: uint8")
     .Output("backprops: T")
     .Output("mkl_backprops: uint8")
@@ -2761,8 +2761,8 @@ REGISTER_OP("MklMaxPool")
     .Input("input: T")
     .Input("mkl_input: uint8")
     .Output("output: T")
-    .Output("mkl_output: uint8")
     .Output("workspace: T")
+    .Output("mkl_output: uint8")
     .Output("mkl_workspace: uint8")
     .SetShapeFn(shape_inference::MaxPoolShape)
     .Doc(R"doc(
@@ -2781,12 +2781,12 @@ REGISTER_OP("MklMaxPoolGrad")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
     .Input("orig_input: T")
-    .Input("mkl_orig_input: uint8")
     .Input("orig_output: T")
-    .Input("mkl_orig_output: uint8")
     .Input("grad: T")
-    .Input("mkl_grad: uint8")
     .Input("workspace: T")
+    .Input("mkl_orig_input: uint8")
+    .Input("mkl_orig_output: uint8")
+    .Input("mkl_grad: uint8")
     .Input("mkl_workspace: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2822,8 +2822,8 @@ expected to invoke these operators.
 
 REGISTER_OP("MklAvgPoolGrad")
     .Input("orig_input_shape: int32")
-    .Input("mkl_orig_input: uint8")
     .Input("grad: T")
+    .Input("mkl_orig_input: uint8")
     .Input("mkl_grad: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2843,6 +2843,211 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
+REGISTER_OP("MklLRN")
+    .Input("input: T")
+    .Input("mkl_input: uint8")
+    .Output("output: T")
+    .Output("workspace: T")
+    .Output("mkl_output: uint8")
+    .Output("mkl_workspace: uint8")
+    .Attr("depth_radius: int = 5")
+    .Attr("bias: float = 1.0")
+    .Attr("alpha: float = 1.0")
+    .Attr("beta: float = 0.5")
+    .Attr("workspace_enabled: bool = false")
+    .Attr("T: {float, half} = DT_FLOAT")
+    .SetShapeFn([](InferenceContext* c) {
+      return UnchangedShapeWithRank(c, 4);
+    })
+    .Doc(R"doc(
+MKL version of LRN operator. Uses MKL DNN APIs to perform local response
+normalization
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklLRNGrad")
+    .Input("input_grads: T")
+    .Input("input_image: T")
+    .Input("output_image: T")
+    .Input("workspace: T")
+    .Input("mkl_input_grads: uint8")
+    .Input("mkl_input_image: uint8")
+    .Input("mkl_output_image: uint8")
+    .Input("mkl_workspace: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("depth_radius: int = 5")
+    .Attr("bias: float = 1.0")
+    .Attr("alpha: float = 1.0")
+    .Attr("beta: float = 0.5")
+    .Attr("workspace_enabled: bool = false")
+    .Attr("T: {float, half} = DT_FLOAT")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle s;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 4, &s));  // input_grads
+      TF_RETURN_IF_ERROR(c->Merge(s, c->input(1), &s));     // input_image
+      TF_RETURN_IF_ERROR(c->Merge(s, c->input(2), &s));     // output_image
+      c->set_output(0, s);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+MKL version of LRNGrad operator. Uses MKL DNN APIs to compute gradient for
+local response normalization
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklFusedBatchNorm")
+    .Input("x: T")
+    .Input("scale: T")
+    .Input("offset: T")
+    .Input("mean: T")
+    .Input("variance: T")
+    .Input("mkl_x: uint8")
+    .Input("mkl_scale: uint8")
+    .Input("mkl_offset: uint8")
+    .Input("mkl_mean: uint8")
+    .Input("mkl_variance: uint8")
+    .Output("y: T")
+    .Output("batch_mean: T")
+    .Output("batch_variance: T")
+    .Output("reserve_space_1: T")
+    .Output("reserve_space_2: T")
+    .Output("mkl_y: uint8")
+    .Output("mkl_batch_mean: uint8")
+    .Output("mkl_batch_variance: uint8")
+    .Output("mkl_reserve_space_1: uint8")
+    .Output("mkl_reserve_space_2: uint8")
+    .Attr("T: numbertype")
+    .Attr("epsilon: float = 0.0001")
+    .Attr("data_format: string = 'NHWC'")
+    .Attr("is_training: bool = true")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle x;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 4, &x));
+
+      bool is_training;
+      c->GetAttr("is_training", &is_training);
+      int number_inputs = (is_training) ? 3 : 5;
+      string data_format;
+      c->GetAttr("data_format", &data_format);
+      DimensionHandle channel_dim =
+          (data_format == "NHWC") ? c->Dim(x, 3) : c->Dim(x, 1);
+
+      // covers scale, offset, and if is_training is false, mean, variance
+      for (int i = 1; i < number_inputs; ++i) {
+        ShapeHandle vec;
+        TF_RETURN_IF_ERROR(c->WithRank(c->input(i), 1, &vec));
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(vec, 0), &channel_dim));
+      }
+
+      ShapeHandle y;
+      if (data_format == "NHWC") {
+        TF_RETURN_IF_ERROR(c->ReplaceDim(x, 3, channel_dim, &y));
+      } else {
+        TF_RETURN_IF_ERROR(c->ReplaceDim(x, 1, channel_dim, &y));
+      }
+      c->set_output(0, y);
+      ShapeHandle vector_shape = c->Vector(channel_dim);
+      c->set_output(1, vector_shape);
+      c->set_output(2, vector_shape);
+      c->set_output(3, vector_shape);
+      c->set_output(4, vector_shape);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+MKL version of FusedBatchNorm operator. Uses MKL DNN APIs to perform fused
+batch normalization
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("MklFusedBatchNormGrad")
+    .Input("y_backprop: T")
+    .Input("x: T")
+    .Input("scale: T")
+    .Input("reserve_space_1: T")
+    .Input("reserve_space_2: T")
+    .Input("mkl_y_backprop: uint8")
+    .Input("mkl_x: uint8")
+    .Input("mkl_scale: uint8")
+    .Input("mkl_reserve_space_1: uint8")
+    .Input("mkl_reserve_space_2: uint8")
+    .Output("x_backprop: T")
+    .Output("scale_backprop: T")
+    .Output("offset_backprop: T")
+    .Output("reserve_space_3: T")
+    .Output("reserve_space_4: T")
+    .Output("mkl_x_backprop: uint8")
+    .Output("mkl_scale_backprop: uint8")
+    .Output("mkl_offset_backprop: uint8")
+    .Output("mkl_reserve_space_3: uint8")
+    .Output("mkl_reserve_space_4: uint8")
+    .Attr("T: numbertype")
+    .Attr("epsilon: float = 0.0001")
+    .Attr("data_format: string = 'NHWC'")
+    .Attr("is_training: bool = true")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle y_backprop;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 4, &y_backprop));
+      ShapeHandle x;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 4, &x));
+
+      bool is_training;
+      string data_format;
+      c->GetAttr("is_training", &is_training);
+      c->GetAttr("data_format", &data_format);
+      DimensionHandle channel_dim = (data_format == "NHWC")
+                                        ? c->Dim(y_backprop, 3)
+                                        : c->Dim(y_backprop, 1);
+      if (data_format == "NHWC") {
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(x, 3), &channel_dim));
+      } else {
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(x, 1), &channel_dim));
+      }
+
+      // covers scale, mean (reserve_space_1), variance (reserve_space_2)
+      for (int i = 2; i < 5; ++i) {
+        ShapeHandle vec;
+        TF_RETURN_IF_ERROR(c->WithRank(c->input(i), 1, &vec));
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(vec, 0), &channel_dim));
+      }
+
+      ShapeHandle x_backprop;
+      if (data_format == "NHWC") {
+        TF_RETURN_IF_ERROR(
+            c->ReplaceDim(y_backprop, 3, channel_dim, &x_backprop));
+      } else {
+        TF_RETURN_IF_ERROR(
+            c->ReplaceDim(y_backprop, 1, channel_dim, &x_backprop));
+      }
+      c->set_output(0, x_backprop);
+      c->set_output(1, c->Vector(channel_dim));
+      c->set_output(2, c->Vector(channel_dim));
+      // Set the correct shapes for reserve_spaces
+      // so that gradients can be performed when
+      // the op is in a symbolic condition.
+      if (is_training) {
+        c->set_output(3, c->Vector(0));
+        c->set_output(4, c->Vector(0));
+      } else {
+        c->set_output(3, c->Vector(channel_dim));
+        c->set_output(4, c->Vector(channel_dim));
+      }
+      return Status::OK();
+    })
+    .Doc(R"doc(
+MKL version of FusedBatchNormGrad operator. Uses MKL DNN APIs to compute
+gradients for fused batch normalization
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
 REGISTER_OP("MklToTf")
     .Input("input: T")
     .Input("mkl_input: uint8")
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index ebbe195bbc..7182d6dfda 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -75,7 +75,6 @@ class MklShape {
   void SetTfLayout(const size_t dimension, const size_t* sizes,
                    const size_t* strides) {
     dimension_ = dimension;
-
     if (dimension > 0) {  // MKl doesn't support zero dimension tensors
       sizes_ = new size_t[dimension];
       strides_ = new size_t[dimension];
@@ -140,6 +139,39 @@ class MklShape {
   const size_t* GetTfToMklDimMap() const { return tf_to_mkl_dim_map_; }
   size_t tf_dim_idx(int index) const { return tf_to_mkl_dim_map_[index]; }
 
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Channel dimension.
+  bool IsMklChannelDim(int d) const { return tf_dim_idx(d) == MklDims::C; }
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Batch dimension.
+  bool IsMklBatchDim(int d)   const { return tf_dim_idx(d) == MklDims::N; }
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Width dimension.
+  bool IsMklWidthDim(int d)   const { return tf_dim_idx(d) == MklDims::W; }
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Height dimension.
+  bool IsMklHeightDim(int d)  const { return tf_dim_idx(d) == MklDims::H; }
+
+  // Check if the TF-Mkl dimension ordering map specifies if the input
+  // tensor is in NCHW format.
+  bool IsTensorInNCHWFormat() const {
+    TensorFormat data_format = FORMAT_NCHW;
+    return (IsMklBatchDim(GetTensorDimIndex<2>(data_format, 'N')) &&
+            IsMklChannelDim(GetTensorDimIndex<2>(data_format, 'C')) &&
+            IsMklHeightDim(GetTensorDimIndex<2>(data_format, 'H')) &&
+            IsMklWidthDim(GetTensorDimIndex<2>(data_format, 'W')));
+  }
+
+  // Check if the TF-Mkl dimension ordering map specifies if the input
+  // tensor is in NHWC format.
+  bool IsTensorInNHWCFormat() const {
+    TensorFormat data_format = FORMAT_NHWC;
+    return (IsMklBatchDim(GetTensorDimIndex<2>(data_format, 'N')) &&
+            IsMklChannelDim(GetTensorDimIndex<2>(data_format, 'C')) &&
+            IsMklHeightDim(GetTensorDimIndex<2>(data_format, 'H')) &&
+            IsMklWidthDim(GetTensorDimIndex<2>(data_format, 'W')));
+  }
+
   void GetConvertedFlatData(dnnLayout_t targetLayout, void* input,
                             void* output) const {
     dnnLayout_t curLayout;
@@ -186,7 +218,7 @@ class MklShape {
   (IS_MKL_TENSOR_OFFSET + sizeof(size_t))  // Location of dimension_
 #define SIZES_OFFSET(dims) \
   (DIMS_OFFSET +           \
-   sizeof(size_t))  // Location of sizes. Note dim is not used here, left here
+  sizeof(size_t))  // Location of sizes. Note dim is not used here, left here
                     // to make macros consistent.
 #define STRIDES_OFFSET(dims) \
   (SIZES_OFFSET(dims) + dims * sizeof(size_t))  // Location of strides
@@ -194,9 +226,9 @@ class MklShape {
   (STRIDES_OFFSET(dims) + dims * sizeof(size_t))  // Location of mklLayout_
 #define TF_LAYOUT_OFFSET(dims) \
   (MKL_LAYOUT_OFFSET(dims) + SIZE_OF_MKL_DNN_BUF)  // Location of tfLayout_
-// Location of tf_to_mkl_dim_map_
 #define TF_TO_MKL_DIM_MAP_OFFSET(dims) \
-  (TF_LAYOUT_OFFSET(dims) + SIZE_OF_MKL_DNN_BUF)
+  (TF_LAYOUT_OFFSET(dims) +            \
+  SIZE_OF_MKL_DNN_BUF)  // Location of tf_to_mkl_dim_map_
 
   // TODO(agramesh1) make sure to create a const to share with rewrite pass
   // for min size of MKL metadata tensor.
@@ -265,29 +297,150 @@ class MklShape {
   size_t dimension_ = 0;
   size_t* sizes_ = nullptr;    // Required by MKL for conversions
   size_t* strides_ = nullptr;  // Required by MKL for conversions
-  // TF dimension corresponding to this MKL dimension
-  size_t* tf_to_mkl_dim_map_ = nullptr;
+  size_t* tf_to_mkl_dim_map_ =
+      nullptr;  // TF dimension corresponding to this MKL dimension
 };
 
-int inline GetTensorDataIndex(int n) {
-  return 2 * n;  // index corresponding to nth input/output tensor
+// List of MklShape objects. Used in Concat/Split layers.
+typedef std::vector<MklShape> MklShapeList;
+
+// Check if all tensors specified by MklShapes are MKL tensors.
+inline bool AreAllMklTensors(const MklShapeList& shapes) {
+  for (auto& s : shapes) {
+    if (!s.IsMklTensor()) {
+      return false;
+    }
+  }
+  return true;
 }
 
-int inline GetTensorMetaDataIndex(int n) {
-  // index corresponding to meta data of nth input/output tensor
-  return 2 * n + 1;
+template <typename T>
+inline Tensor ConvertMklToTF(OpKernelContext *context,
+                             const Tensor& mkl_tensor,
+                             const MklShape& mkl_shape) {
+  Tensor output_tensor;
+  TensorShape output_shape;
+
+  for (size_t j = 0; j < mkl_shape.GetDimension(); j++) {
+     // Outermost to innermost dimension
+     output_shape.AddDim(mkl_shape.GetSizes()[mkl_shape.tf_dim_idx(j)]);
+  }
+
+  // Allocate output tensor.
+  context->allocate_temp(DataTypeToEnum<T>::v(),
+                       output_shape, &output_tensor);
+
+  dnnLayout_t output_layout = static_cast<dnnLayout_t>(
+                                mkl_shape.GetTfLayout());
+  void *input_buffer = const_cast<T*>(mkl_tensor.flat<T>().data());
+  void *output_buffer = const_cast<T*>(output_tensor.flat<T>().data());
+
+  if (mkl_tensor.NumElements() != 0) {
+    mkl_shape.GetConvertedFlatData(output_layout, input_buffer, output_buffer);
+  }
+
+  return output_tensor;
 }
+
+// Since our ops are going to produce and also consume N addition tensors
+// (Mkl) for N Tensorflow tensors, we can have following different
+// orderings among these 2N tensors.
+//
+// E.g., for Tensorflow tensors A, B, and C, our ops will produce and
+// consume A_m, B_m, and C_m additionally.
+//
+// INTERLEAVED: in this case 2N tensors are interleaved. So for above
+//              example, the ordering looks like: A, A_m, B, B_m, C, C_m.
+//
+// CONTIGUOUS: in thi case N Tensorflow tensors are contiguous followed
+//             by N Mkl tensors. So for above example, the ordering looks
+//             like: A, B, C, A_m, B_m, C_m
+//
+// Following APIs map index of original Tensorflow tensors to their appropriate
+// position based on selected ordering. For contiguous ordering, we need to know
+// the total number of tensors (parameter total).
+//
+typedef enum { TENSORS_INTERLEAVED, TENSORS_CONTIGUOUS } MklTfTensorOrdering;
+// NOTE: Currently, we use contiguous ordering. If you change this, then you
+// would need to change Mkl op definitions in nn_ops.cc.
+static MklTfTensorOrdering kTensorOrdering = TENSORS_CONTIGUOUS;
+
+// Get index of MetaData tensor from index 'n' of Data tensor.
+inline int DataIndexToMetaDataIndex(int n, int total_tensors) {
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    // For interleaved ordering, Mkl tensor follows immediately after
+    // Tensorflow tensor.
+    return n + 1;
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    // For contiguous ordering, Mkl tensor is n+total_tensors/2 away.
+    return n + total_tensors/2;
+  }
+}
+
+int inline GetTensorDataIndex(int n, int total_tensors) {
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    return 2 * n;  // index corresponding to nth input/output tensor
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    return n;
+  }
+}
+
+int inline GetTensorMetaDataIndex(int n, int total_tensors) {
+  // Get index for TensorData first and then use mapping function
+  // to get TensorMetaData index from TensorData index.
+  int tidx = GetTensorDataIndex(n, total_tensors);
+  return DataIndexToMetaDataIndex(tidx, total_tensors);
+}
+
+
 // Get the MKL shape from the second string tensor
 inline void GetMklShape(OpKernelContext* ctext, int n, MklShape* mklshape) {
   mklshape->DeSerializeMklShape(
-      ctext->input(GetTensorMetaDataIndex(n)).flat<uint8>().data(),
-      ctext->input(GetTensorMetaDataIndex(n)).flat<uint8>().size() *
+      ctext->input(
+        GetTensorMetaDataIndex(n, ctext->num_inputs())).flat<uint8>().data(),
+      ctext->input(
+        GetTensorMetaDataIndex(n, ctext->num_inputs())).flat<uint8>().size() *
           sizeof(uint8));
 }
 
 // Gets the actual input
 inline const Tensor& MklGetInput(OpKernelContext* ctext, int n) {
-  return ctext->input(GetTensorDataIndex(n));
+  return ctext->input(GetTensorDataIndex(n, ctext->num_inputs()));
+}
+
+inline void MklGetInputList(OpKernelContext* ctext,
+    StringPiece name, OpInputList* input_tensors) {
+  CHECK_NOTNULL(input_tensors);
+  ctext->input_list(name, input_tensors);
+}
+
+inline void GetMklShapeList(OpKernelContext* ctext, StringPiece name,
+                            MklShapeList* mkl_shapes) {
+  OpInputList input_mkl_tensors;
+  MklGetInputList(ctext, strings::StrCat("mkl_", name), &input_mkl_tensors);
+
+  for (int i = 0; i < input_mkl_tensors.size(); i++) {
+    (*mkl_shapes)[i].DeSerializeMklShape(
+      input_mkl_tensors[i].flat<uint8>().data(),
+      input_mkl_tensors[i].flat<uint8>().size() * sizeof(uint8));
+  }
+}
+
+// Allocate the output tensor, create a second output tensor that will contain
+// the MKL shape serialized
+inline void AllocateOutputSetMklshape(OpKernelContext* ctext, int n,
+                                      const MklShape& mklshape) {
+  Tensor* second_tensor = nullptr;
+  TensorShape second_shape;
+  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mklshape.GetDimension()));
+  OP_REQUIRES_OK(ctext, ctext->allocate_output(GetTensorMetaDataIndex(n,
+                                                ctext->num_outputs()),
+                                               second_shape, &second_tensor));
+  mklshape.SerializeMklShape(
+      second_tensor->flat<uint8>().data(),
+      second_tensor->flat<uint8>().size() * sizeof(uint8));
 }
 
 // Allocate the output tensor, create a second output tensor that will contain
@@ -300,9 +453,13 @@ inline void AllocateOutputSetMklshape(OpKernelContext* ctext, int n,
   TensorShape second_shape;
   second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mklshape.GetDimension()));
   OP_REQUIRES_OK(
-      ctext, ctext->allocate_output(GetTensorDataIndex(n), tfshape, output));
-  OP_REQUIRES_OK(ctext, ctext->allocate_output(GetTensorMetaDataIndex(n),
-                                               second_shape, &second_tensor));
+      ctext,
+      ctext->allocate_output(GetTensorDataIndex(n, ctext->num_outputs()),
+      tfshape, output));
+  OP_REQUIRES_OK(
+      ctext,
+      ctext->allocate_output(GetTensorMetaDataIndex(n, ctext->num_outputs()),
+      second_shape, &second_tensor));
   mklshape.SerializeMklShape(
       second_tensor->flat<uint8>().data(),
       second_tensor->flat<uint8>().size() * sizeof(uint8));
@@ -346,8 +503,6 @@ inline void MklSizesToTFSizes(OpKernelContext* context,
   size_t tf_dim = mklshape.GetDimension();
   const size_t* tf_sizes = mklshape.GetSizes();
 
-  // TODO(agramesh1): check if this constraint is applicable in other cases
-  // (besides BackpropInput, BackpropFilter).
   OP_REQUIRES(context, tf_dim == 4,
               errors::InvalidArgument("MKLSizesToTFSizes: size must be 4-dim"));
   std::vector<int32> sizes;
@@ -402,12 +557,8 @@ static const char* kMklLayerLabelPattern = "label='MklLayer'";
 // @return: true if opname is registered as Mkl layer op
 static inline bool IsMklLayer(const std::string& op_name, DataType T) {
   string kernel = KernelsRegisteredForOp(op_name);
-  // Currently, MKL only supports float type for ops. So we check if
-  // the type is float. Actually, we should query kernel registration and
-  // find out if op is supported for type T. But there is no API to query
-  // kernel registration using name and type.
   bool result =
-      (kernel.find(kMklLayerLabelPattern) != string::npos) && (T == DT_FLOAT);
+      kernel.find(kMklLayerLabelPattern) != string::npos && (T == DT_FLOAT);
   if (result == true) {
     VLOG(1) << "mkl_layer_registry::" << op_name << " is " << kMklLayerLabel;
   }
-- 
GitLab


From e0813b2c58890decedcddf84af839a1bf3c0bc76 Mon Sep 17 00:00:00 2001
From: agramesh1 <ag.ramesh@intel.com>
Date: Fri, 7 Apr 2017 05:05:25 -0700
Subject: [PATCH 0274/1563] Fixes based on feedback from Google on mkl-kernel-2

---
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |  4 +-
 tensorflow/core/kernels/mkl_concat_op.cc      |  4 +-
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |  2 +-
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |  2 +-
 .../core/kernels/mkl_conv_grad_input_ops.cc   |  2 +-
 tensorflow/core/kernels/mkl_conv_ops.cc       |  4 +-
 .../core/kernels/mkl_fused_batch_norm_op.cc   | 20 ++++----
 tensorflow/core/kernels/mkl_lrn_op.cc         | 12 ++---
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |  6 +--
 tensorflow/core/ops/nn_ops.cc                 |  8 +--
 tensorflow/core/util/mkl_util.h               | 50 +++++++++----------
 11 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
index 71918fe269..a78f6ede19 100644
--- a/tensorflow/core/kernels/mkl_avgpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -120,7 +120,7 @@ class MklAvgPoolingOp : public UnaryOp<T> {
                                 mkl_out_shape.GetMklLayout())) /
                             sizeof(T));
 
-    AllocateOutputSetMklshape(context, 0, &output, tensor_out_shape,
+    AllocateOutputSetMklShape(context, 0, &output, tensor_out_shape,
                               mkl_out_shape);
     mkl_context.pooling_res[dnnResourceDst] =
         static_cast<void*>(output->flat<T>().data());
@@ -304,7 +304,7 @@ class MklAvgPoolingGradOp : public OpKernel {
                                 mkl_out_shape.GetMklLayout())) /
                             sizeof(T));
 
-    AllocateOutputSetMklshape(context, 0, &output, tensor_out_shape,
+    AllocateOutputSetMklShape(context, 0, &output, tensor_out_shape,
                               mkl_out_shape);
 
     // Set output tensor.
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
index 08fad4daef..d65786a910 100644
--- a/tensorflow/core/kernels/mkl_concat_op.cc
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -160,7 +160,7 @@ class MklConcatOp : public OpKernel {
 
     // Get input tensors.
     OpInputList input_tensors;
-    MklGetInputList(context, "values", &input_tensors);
+    GetMklInputList(context, "values", &input_tensors);
     const int N = input_tensors.size();
     // Get MKL shapes.
     MklShapeList input_shapes(N);
@@ -300,7 +300,7 @@ class MklConcatOp : public OpKernel {
       static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout()))/sizeof(T));
 
     Tensor* output = nullptr;
-    AllocateOutputSetMklshape(context, 0, &output, mkl_output_tf_shape,
+    AllocateOutputSetMklShape(context, 0, &output, mkl_output_tf_shape,
                               mkl_output_mkl_shape);
 
     // Set destination resource.
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
index 627fd83b0d..0298c6b762 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -87,7 +87,7 @@ class MklConv2DCustomBackpropBiasOp : public OpKernel {
     Tensor* bias_backprop = nullptr;
     MklShape output_mkl_shape;
     output_mkl_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &bias_backprop, output_shape,
+    AllocateOutputSetMklShape(context, 0, &bias_backprop, output_shape,
                               output_mkl_shape);
 
     mkl_context.in_dims = 4;
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
index 85198d89f5..de557c7644 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -217,7 +217,7 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
     mkl_context.grad_filter_shape.SetTfLayout(mkl_context.filter_dims,
                                               mkl_context.filter_sizes,
                                               mkl_context.filter_strides);
-    AllocateOutputSetMklshape(context, 0, &grad_filter, filter_shape,
+    AllocateOutputSetMklShape(context, 0, &grad_filter, filter_shape,
                               mkl_context.grad_filter_shape);
 
     // Need to set member variable for TF layout
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index c7d95c86bc..73649eb4af 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -202,7 +202,7 @@ class MklConv2DCustomBackpropInputOp : public OpKernel {
     mkl_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                              mklOutputShape.GetMklLayout())) /
                          sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &in_backprop, mkl_out_shape,
+    AllocateOutputSetMklShape(context, 0, &in_backprop, mkl_out_shape,
                               mklOutputShape);
 
     mkl_context.conv_res[dnnResourceDiffSrc] =
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index e5c4c21a10..4dcaf78fa9 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -178,7 +178,7 @@ class MklConv2DOp : public OpKernel {
       // Nothing to do, allocate output tensor and return
       MklShape mkl_output_mkl_shape;
       mkl_output_mkl_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &output, input.shape(),
+      AllocateOutputSetMklShape(context, 0, &output, input.shape(),
                                 mkl_output_mkl_shape);
       return;
     }
@@ -264,7 +264,7 @@ class MklConv2DOp : public OpKernel {
         dnnLayoutGetMemorySize_F32(
             static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
         sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output, mkl_output_tf_shape,
+    AllocateOutputSetMklShape(context, 0, &output, mkl_output_tf_shape,
                               mkl_output_mkl_shape);
     mkl_context.conv_res[dnnResourceDst] =
         static_cast<void*>(output->flat<T>().data());
diff --git a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
index 996771e379..6dad2e4d12 100644
--- a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
+++ b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
@@ -121,7 +121,7 @@ class MklFusedBatchNormOp : public OpKernel {
     tf_shape_output.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                                mkl_shape_output.GetMklLayout())) /
                            sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output, tf_shape_output,
+    AllocateOutputSetMklShape(context, 0, &output, tf_shape_output,
                               mkl_shape_output);
     mkl_context.mkl_res_batchnorm[dnnResourceDst] =
         static_cast<void*>(output->flat<T>().data());
@@ -130,13 +130,13 @@ class MklFusedBatchNormOp : public OpKernel {
     Tensor* batch_mean = nullptr;
     MklShape mkl_shape_batch_mean;
     mkl_shape_batch_mean.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 1, &batch_mean, scale.shape(),
+    AllocateOutputSetMklShape(context, 1, &batch_mean, scale.shape(),
                               mkl_shape_batch_mean);
     // Batch variance in TF layout
     Tensor* batch_variance = nullptr;
     MklShape mkl_shape_batch_variance;
     mkl_shape_batch_variance.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 2, &batch_variance, scale.shape(),
+    AllocateOutputSetMklShape(context, 2, &batch_variance, scale.shape(),
                               mkl_shape_batch_variance);
     // If training mode, set dnnResourceMean and dnnResourceVariance to
     // output tensors for batch mean and variance.
@@ -157,7 +157,7 @@ class MklFusedBatchNormOp : public OpKernel {
     Tensor* saved_mean = nullptr;
     MklShape mkl_shape_saved_mean;
     mkl_shape_saved_mean.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 3, &saved_mean, scale.shape(),
+    AllocateOutputSetMklShape(context, 3, &saved_mean, scale.shape(),
                               mkl_shape_saved_mean);
     std::memcpy(
         reinterpret_cast<char*>(saved_mean->flat<float>().data()),
@@ -166,7 +166,7 @@ class MklFusedBatchNormOp : public OpKernel {
     Tensor* saved_variance = nullptr;
     MklShape mkl_shape_saved_variance;
     mkl_shape_saved_variance.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 4, &saved_variance, scale.shape(),
+    AllocateOutputSetMklShape(context, 4, &saved_variance, scale.shape(),
                               mkl_shape_saved_variance);
     std::memcpy(reinterpret_cast<char*>(saved_variance->flat<float>().data()),
                 reinterpret_cast<char*>(
@@ -420,7 +420,7 @@ class MklFusedBatchNormGradOp : public OpKernel {
         dnnLayoutGetMemorySize_F32(
             static_cast<dnnLayout_t>(mkl_shape_in_backprop.GetMklLayout())) /
         sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &in_backprop, tf_shape_in_backprop,
+    AllocateOutputSetMklShape(context, 0, &in_backprop, tf_shape_in_backprop,
                               mkl_shape_in_backprop);
     mkl_context.mkl_res_batchnorm_bwd[dnnResourceDiffSrc] =
         static_cast<void*>(in_backprop->flat<T>().data());
@@ -442,13 +442,13 @@ class MklFusedBatchNormGradOp : public OpKernel {
     // Allocate tensor for grad w.r.t. scale (beta)
     Tensor* scale_backprop = nullptr;
     MklShape mkl_shape_scale_backprop;
-    AllocateOutputSetMklshape(context, 1, &scale_backprop, tf_shape_scale_shift,
+    AllocateOutputSetMklShape(context, 1, &scale_backprop, tf_shape_scale_shift,
                               mkl_shape_scale_backprop);
 
     // Allocate tensor for grad w.r.t. shift(gamma)
     Tensor* shift_backprop = nullptr;
     MklShape mkl_shape_shift_backprop;
-    AllocateOutputSetMklshape(context, 2, &shift_backprop, tf_shape_scale_shift,
+    AllocateOutputSetMklShape(context, 2, &shift_backprop, tf_shape_scale_shift,
                               mkl_shape_shift_backprop);
 
     // copy scale and shift grads to tensors
@@ -468,11 +468,11 @@ class MklFusedBatchNormGradOp : public OpKernel {
     // used for inference and thus not needed here for gradient computation.
     Tensor* placeholder_1 = nullptr;
     MklShape mkl_shape_placeholder_1;
-    AllocateOutputSetMklshape(context, 3, &placeholder_1, TensorShape({}),
+    AllocateOutputSetMklShape(context, 3, &placeholder_1, TensorShape({}),
                               mkl_shape_placeholder_1);
     Tensor* placeholder_2 = nullptr;
     MklShape mkl_shape_placeholder_2;
-    AllocateOutputSetMklshape(context, 4, &placeholder_2, TensorShape({}),
+    AllocateOutputSetMklShape(context, 4, &placeholder_2, TensorShape({}),
                               mkl_shape_placeholder_2);
 
     mkl_context.MklCleanup();
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
index da1b1a15e8..d7ace8ff46 100644
--- a/tensorflow/core/kernels/mkl_lrn_op.cc
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -220,7 +220,7 @@ class MklLRNOp : public OpKernel {
           dnnLayoutGetMemorySize_F32(
               static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
           sizeof(T));
-      AllocateOutputSetMklshape(context, 0, output,
+      AllocateOutputSetMklShape(context, 0, output,
                                 mkl_output_tf_shape /* First tensor */,
                                 mkl_output_mkl_shape /* Second Tensor */);
 
@@ -238,7 +238,7 @@ class MklLRNOp : public OpKernel {
             dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                 mkl_workspace_mkl_shape.GetMklLayout())) /
             sizeof(T));
-        AllocateOutputSetMklshape(context, 1, workspace,
+        AllocateOutputSetMklShape(context, 1, workspace,
                                   mkl_workspace_tf_shape /* First tensor */,
                                   mkl_workspace_mkl_shape /* Second Tensor */);
       }
@@ -292,12 +292,12 @@ class MklLRNOp : public OpKernel {
       MklShape mkl_output_mkl_shape, mkl_workspace_mkl_shape;
       mkl_output_mkl_shape.SetMklTensor(false);
       mkl_output_mkl_shape.SetDimensions(4);
-      AllocateOutputSetMklshape(context, 0, &output, input.shape(),
+      AllocateOutputSetMklShape(context, 0, &output, input.shape(),
                                 mkl_output_mkl_shape);
 
       mkl_workspace_mkl_shape.SetMklTensor(false);
       mkl_workspace_mkl_shape.SetDimensions(4);
-      AllocateOutputSetMklshape(context, 1, &workspace, input.shape(),
+      AllocateOutputSetMklShape(context, 1, &workspace, input.shape(),
                                 mkl_workspace_mkl_shape);
 
       auto out_shaped = output->shaped<T, 2>({nodes * batch, depth});
@@ -459,7 +459,7 @@ class MklLRNGradOp : public OpKernel {
             static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
         sizeof(T));
     Tensor* output = nullptr;
-    AllocateOutputSetMklshape(context, 0, &output, mkl_output_tf_shape,
+    AllocateOutputSetMklShape(context, 0, &output, mkl_output_tf_shape,
                               mkl_output_mkl_shape);
 
     // Get pointers to output data.
@@ -677,7 +677,7 @@ class MklLRNGradOp : public OpKernel {
       MklShape mkl_output_mkl_shape;
       mkl_output_mkl_shape.SetMklTensor(false);
       mkl_output_mkl_shape.SetDimensions(4);
-      AllocateOutputSetMklshape(context, 0, &output, in_grads.shape(),
+      AllocateOutputSetMklShape(context, 0, &output, in_grads.shape(),
                                 mkl_output_mkl_shape);
 
       auto out_shaped = output->shaped<T, 2>({nodes * batch, depth});
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index 9d6cfb0c97..d28ed34f6d 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -98,7 +98,7 @@ class MklMaxPoolingOp : public OpKernel {
     tensor_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                                 mkl_out_shape.GetMklLayout())) /
                             sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output_tensor, tensor_out_shape,
+    AllocateOutputSetMklShape(context, 0, &output_tensor, tensor_out_shape,
                               mkl_out_shape);
 
     if (!workspace_enabled_) {
@@ -113,7 +113,7 @@ class MklMaxPoolingOp : public OpKernel {
           dnnLayoutGetMemorySize_F32(
               static_cast<dnnLayout_t>(mkl_context.lt_workspace)) /
           sizeof(T));
-      AllocateOutputSetMklshape(context, 1, &workspace_tensor, workspace_shape,
+      AllocateOutputSetMklShape(context, 1, &workspace_tensor, workspace_shape,
                                 mkl_out_shape);
       mkl_context.pooling_res[dnnResourceWorkspace] = const_cast<void*>(
           static_cast<const void*>(workspace_tensor->flat<T>().data()));
@@ -274,7 +274,7 @@ class MklMaxPoolingGradOp : public OpKernel {
         dnnLayoutGetMemorySize_F32(
             static_cast<dnnLayout_t>(mkl_output_shape.GetMklLayout())) /
         sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output_tensor, mkl_input_backprop,
+    AllocateOutputSetMklShape(context, 0, &output_tensor, mkl_input_backprop,
                               mkl_output_shape);
     mkl_context.pooling_res[dnnResourceDiffSrc] = const_cast<void*>(
         static_cast<const void*>(output_tensor->flat<T>().data()));
diff --git a/tensorflow/core/ops/nn_ops.cc b/tensorflow/core/ops/nn_ops.cc
index b894540ff6..4937977325 100644
--- a/tensorflow/core/ops/nn_ops.cc
+++ b/tensorflow/core/ops/nn_ops.cc
@@ -2861,7 +2861,7 @@ REGISTER_OP("MklLRN")
     })
     .Doc(R"doc(
 MKL version of LRN operator. Uses MKL DNN APIs to perform local response
-normalization
+normalization.
 
 NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
@@ -2894,7 +2894,7 @@ REGISTER_OP("MklLRNGrad")
     })
     .Doc(R"doc(
 MKL version of LRNGrad operator. Uses MKL DNN APIs to compute gradient for
-local response normalization
+local response normalization.
 
 NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
@@ -2960,7 +2960,7 @@ REGISTER_OP("MklFusedBatchNorm")
     })
     .Doc(R"doc(
 MKL version of FusedBatchNorm operator. Uses MKL DNN APIs to perform fused
-batch normalization
+batch normalization.
 
 NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
@@ -3042,7 +3042,7 @@ REGISTER_OP("MklFusedBatchNormGrad")
     })
     .Doc(R"doc(
 MKL version of FusedBatchNormGrad operator. Uses MKL DNN APIs to compute
-gradients for fused batch normalization
+gradients for fused batch normalization.
 
 NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index 7182d6dfda..0401f63b18 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -144,13 +144,13 @@ class MklShape {
   bool IsMklChannelDim(int d) const { return tf_dim_idx(d) == MklDims::C; }
   // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
   // corresponds to MKL's Batch dimension.
-  bool IsMklBatchDim(int d)   const { return tf_dim_idx(d) == MklDims::N; }
+  bool IsMklBatchDim(int d) const { return tf_dim_idx(d) == MklDims::N; }
   // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
   // corresponds to MKL's Width dimension.
-  bool IsMklWidthDim(int d)   const { return tf_dim_idx(d) == MklDims::W; }
+  bool IsMklWidthDim(int d) const { return tf_dim_idx(d) == MklDims::W; }
   // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
   // corresponds to MKL's Height dimension.
-  bool IsMklHeightDim(int d)  const { return tf_dim_idx(d) == MklDims::H; }
+  bool IsMklHeightDim(int d) const { return tf_dim_idx(d) == MklDims::H; }
 
   // Check if the TF-Mkl dimension ordering map specifies if the input
   // tensor is in NCHW format.
@@ -373,8 +373,8 @@ inline int DataIndexToMetaDataIndex(int n, int total_tensors) {
     return n + 1;
   } else {
     CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
-    // For contiguous ordering, Mkl tensor is n+total_tensors/2 away.
-    return n + total_tensors/2;
+    // For contiguous ordering, Mkl tensor is n+total_tensors / 2 away.
+    return n + total_tensors / 2;
   }
 }
 
@@ -410,7 +410,7 @@ inline const Tensor& MklGetInput(OpKernelContext* ctext, int n) {
   return ctext->input(GetTensorDataIndex(n, ctext->num_inputs()));
 }
 
-inline void MklGetInputList(OpKernelContext* ctext,
+inline void GetMklInputList(OpKernelContext* ctext,
     StringPiece name, OpInputList* input_tensors) {
   CHECK_NOTNULL(input_tensors);
   ctext->input_list(name, input_tensors);
@@ -419,7 +419,7 @@ inline void MklGetInputList(OpKernelContext* ctext,
 inline void GetMklShapeList(OpKernelContext* ctext, StringPiece name,
                             MklShapeList* mkl_shapes) {
   OpInputList input_mkl_tensors;
-  MklGetInputList(ctext, strings::StrCat("mkl_", name), &input_mkl_tensors);
+  GetMklInputList(ctext, strings::StrCat("mkl_", name), &input_mkl_tensors);
 
   for (int i = 0; i < input_mkl_tensors.size(); i++) {
     (*mkl_shapes)[i].DeSerializeMklShape(
@@ -428,39 +428,39 @@ inline void GetMklShapeList(OpKernelContext* ctext, StringPiece name,
   }
 }
 
-// Allocate the output tensor, create a second output tensor that will contain
+// Allocate the second output tensor that will contain
 // the MKL shape serialized
-inline void AllocateOutputSetMklshape(OpKernelContext* ctext, int n,
-                                      const MklShape& mklshape) {
+inline void AllocateOutputSetMklShape(OpKernelContext* ctext, int n,
+                                      const MklShape& mkl_shape) {
   Tensor* second_tensor = nullptr;
   TensorShape second_shape;
-  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mklshape.GetDimension()));
+  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mkl_shape.GetDimension()));
   OP_REQUIRES_OK(ctext, ctext->allocate_output(GetTensorMetaDataIndex(n,
                                                 ctext->num_outputs()),
                                                second_shape, &second_tensor));
-  mklshape.SerializeMklShape(
+  mkl_shape.SerializeMklShape(
       second_tensor->flat<uint8>().data(),
       second_tensor->flat<uint8>().size() * sizeof(uint8));
 }
 
 // Allocate the output tensor, create a second output tensor that will contain
 // the MKL shape serialized
-inline void AllocateOutputSetMklshape(OpKernelContext* ctext, int n,
+inline void AllocateOutputSetMklShape(OpKernelContext* ctext, int n,
                                       Tensor** output,
-                                      const TensorShape& tfshape,
-                                      const MklShape& mklshape) {
+                                      const TensorShape& tf_shape,
+                                      const MklShape& mkl_shape) {
   Tensor* second_tensor = nullptr;
   TensorShape second_shape;
-  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mklshape.GetDimension()));
+  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mkl_shape.GetDimension()));
   OP_REQUIRES_OK(
       ctext,
       ctext->allocate_output(GetTensorDataIndex(n, ctext->num_outputs()),
-      tfshape, output));
+      tf_shape, output));
   OP_REQUIRES_OK(
       ctext,
       ctext->allocate_output(GetTensorMetaDataIndex(n, ctext->num_outputs()),
       second_shape, &second_tensor));
-  mklshape.SerializeMklShape(
+  mkl_shape.SerializeMklShape(
       second_tensor->flat<uint8>().data(),
       second_tensor->flat<uint8>().size() * sizeof(uint8));
 }
@@ -499,9 +499,9 @@ inline void GetStridesFromSizes(TensorFormat data_format, size_t* strides,
 
 inline void MklSizesToTFSizes(OpKernelContext* context,
                               TensorFormat data_format_,
-                              const MklShape& mklshape, TensorShape* tfshape) {
-  size_t tf_dim = mklshape.GetDimension();
-  const size_t* tf_sizes = mklshape.GetSizes();
+                              const MklShape& mkl_shape, TensorShape* tf_shape) {
+  size_t tf_dim = mkl_shape.GetDimension();
+  const size_t* tf_sizes = mkl_shape.GetSizes();
 
   OP_REQUIRES(context, tf_dim == 4,
               errors::InvalidArgument("MKLSizesToTFSizes: size must be 4-dim"));
@@ -519,7 +519,7 @@ inline void MklSizesToTFSizes(OpKernelContext* context,
     sizes.push_back(tf_sizes[0]);
   }
 
-  OP_REQUIRES_OK(context, TensorShapeUtils::MakeShape(sizes, tfshape));
+  OP_REQUIRES_OK(context, TensorShapeUtils::MakeShape(sizes, tf_shape));
 }
 
 inline int32 GetMklTensorDimIndex(char dimension) {
@@ -538,11 +538,11 @@ inline int32 GetMklTensorDimIndex(char dimension) {
   }
 }
 
-inline int64 GetMklTensorDim(const MklShape& mklshape, char dimension) {
+inline int64 GetMklTensorDim(const MklShape& mkl_shape, char dimension) {
   int index = GetMklTensorDimIndex(dimension);
-  CHECK(index >= 0 && index < mklshape.GetDimension())
+  CHECK(index >= 0 && index < mkl_shape.GetDimension())
       << "Invalid index from the dimension: " << index << ", " << dimension;
-  return mklshape.dim_size(index);
+  return mkl_shape.dim_size(index);
 }
 
 namespace mkl_layer_registry {
-- 
GitLab


From d380f1f0eb70478f7a15ecacf88d926b427a5589 Mon Sep 17 00:00:00 2001
From: Niranjan Hasabnis <niranjan.hasabnis@intel.com>
Date: Fri, 7 Apr 2017 16:38:57 -0700
Subject: [PATCH 0275/1563] Fixes to Mkl graph passes based on review comments

---
 tensorflow/core/graph/mkl_layout_pass.cc      | 581 ++++++++----------
 .../core/graph/mkl_tfconversion_pass.cc       |   4 +-
 2 files changed, 262 insertions(+), 323 deletions(-)

diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 82f2d85335..c6470e4fa9 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -48,7 +48,7 @@ namespace tensorflow {
 //     1) Propagating Mkl layout as an additional output tensor
 //        (we will loosely call a tensor that carries Mkl layout as Mkl tensor
 //         henceforth.) from every Mkl supported NN layer.
-//     2) Context-based rewrite: This is neded in order to optimize
+//     2) Context-based rewrite: This is needed in order to optimize
 //        gradient ops of Conv2D+AddBias. Gradient op of both the Conv2D and
 //        MatMul is BiasAddGrad, and we need to rewrite BiasAddGrad into
 //        Conv2D-specific BiasAddGrad, and MatMul-specific BiasAddGrad.
@@ -68,7 +68,7 @@ namespace tensorflow {
 // Meaning of A_m, B_m and C_m is explained in B.1.
 //
 // Merge rules:
-//  - Merge for Conv2D and BiasAdd happens only when output of Conv2D _only_
+//  - Merge for Conv2D and BiasAdd happens when output of Conv2D _only_
 //    goes to BiasAdd.
 //  - Also, the intersection of attributes of both the nodes must have same
 //    values.
@@ -124,8 +124,8 @@ namespace tensorflow {
 //      Tensorflow tensor immediately. In the context of above example, it
 //      will be: (A, A_m, B, B_m). We follow same ordering rule for output
 //      tensors. Contiguous ordering means all Tensorflow tensors are
-//      contiguous followd by all contiguous Mkl tensors. As a default
-//      ordering, we use Contiguous one.
+//      contiguous followed by all contiguous Mkl tensors. We use contiguous
+//      ordering as default.
 //
 // NOTE: Current rewriting approach rewrites an op to Mkl op without any
 //      conditions. But in the future, it may be possible to consider
@@ -179,7 +179,9 @@ namespace tensorflow {
 // Handling workspace propagation for certain ops:
 //
 //        Certain backward ops in MKL (MaxPool, LRN and BatchNorm) require
-//        passing of workspace from their corresponding forward ops. But
+//        passing of workspace from their corresponding forward ops. Workspace
+//        carries meta-information about actual input tensors to MaxPool and
+//        LRN. This meta-information is used by corresponding backward passes.
 //        TensorFlow does not have a notion of workspace and as a result
 //        does not allow producing additional outputs from these forward ops.
 //        For these ops, we need to add an additional edge between forward
@@ -212,13 +214,13 @@ namespace tensorflow {
 //          where workspace originates (MaxPool in this example)
 //        Backward op name = name of the op in the backward pass that receives
 //          workspace from forward op (MaxPoolGrad in the example)
-//        Slot = Number of the output or input slot that will be
+//        Slot = Position of the output or input slot that will be
 //               used by the workspace (1 for MklMaxPool as W is 2nd
 //               output of MaxPool (0 is 1st); 3 for MklMaxPoolGrad)
 //
 //        Question:
 //
-//        How do we associate backward op to forward op? There can be more
+//        How do we associate a backward op to a forward op? There can be more
 //        than one op with exact same name.
 //
 //        In this example we associate MaxPoolGrad with MaxPool. But there
@@ -229,11 +231,12 @@ namespace tensorflow {
 //        How do we transform forward and backward op when there is no direct
 //        edge between them? In such case, we generate dummy tensors as
 //        workspace tensors. For the example, transformation of MaxPool will
-//        be exactly same --- it is just that MaxPool won't generate any
-//        workspace tensor. For MaxPoolGrad, transformation will also be same,
-//        but instead of connecting W and W_m with outputs of MaxPool, we will
-//        produce dummy tensors for them, and we will set workspace_enabled
-//        attribute to false.
+//        be exactly same as we would when there is a direct edge between
+//        forward and backward op --- it is just that MaxPool won't generate
+//        any workspace tensor. For MaxPoolGrad, transformation will also be
+//        same, but instead of connecting W and W_m with outputs of MaxPool,
+//        we will produce dummy tensors for them, and we will set
+//        workspace_enabled attribute to false.
 //
 // Example of B.2 : Context-based node rewrite
 // -------------------------------------------
@@ -242,7 +245,7 @@ namespace tensorflow {
 //           O = MklConv2D(A, B, C, A_m, B_m, C_m)
 //           P = BiasAddGrad(O)
 //
-// Then we rewrite is as:
+// Then we rewrite it as:
 //
 //           P = Conv2DWithBiasBackpropBias(O, O_m)
 //
@@ -260,78 +263,90 @@ static size_t kNodeMergeContextMaxDepth = 10;
 class MklLayoutRewritePass : public GraphOptimizationPass {
  public:
   MklLayoutRewritePass() {
-    csinfo_.conv2d = "Conv2D";
-    csinfo_.mklconv2d = "MklConv2D";
-    csinfo_.mklconv2dwithbias = "MklConv2DWithBias";
-    csinfo_.mklconv2dwithbiasbackpropbias = "MklConv2DWithBiasBackpropBias";
-    csinfo_.biasadd           = "BiasAdd";
-    csinfo_.matmul            = "MatMul";
-    csinfo_.biasaddgrad       = "BiasAddGrad";
-
-    csinfo_.concat            = "Concat";
-    csinfo_.concatv2          = "ConcatV2";
-    csinfo_.split             = "Split";
-    csinfo_.relu              = "Relu";
-    csinfo_.relugrad          = "ReluGrad";
-    csinfo_.maxpool           = "MaxPool";
-    csinfo_.maxpoolgrad       = "MaxPoolGrad";
-    csinfo_.avgpool           = "AvgPool";
-    csinfo_.avgpoolgrad       = "AvgPoolGrad";
-    csinfo_.conv2dgradinput   = "Conv2DBackpropInput";
-    csinfo_.conv2dgradfilter  = "Conv2DBackpropFilter";
-    csinfo_.lrn               = "LRN";
-    csinfo_.lrngrad           = "LRNGrad";
-    csinfo_.fused_batch_norm = "FusedBatchNorm";
+    // NOTE: names are alphabetically sorted.
+    csinfo_.avg_pool              = "AvgPool";
+    csinfo_.avg_pool_grad         = "AvgPoolGrad";
+    csinfo_.bias_add              = "BiasAdd";
+    csinfo_.bias_add_grad         = "BiasAddGrad";
+    csinfo_.concat                = "Concat";
+    csinfo_.concatv2              = "ConcatV2";
+    csinfo_.conv2d                = "Conv2D";
+    csinfo_.conv2d_grad_input     = "Conv2DBackpropInput";
+    csinfo_.conv2d_grad_filter    = "Conv2DBackpropFilter";
+    csinfo_.fused_batch_norm      = "FusedBatchNorm";
     csinfo_.fused_batch_norm_grad = "FusedBatchNormGrad";
-
-    rinfo_.push_back({csinfo_.conv2d,   csinfo_.mklconv2d,
-                      2, CopyAttrsConv2D, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.conv2dgradfilter,
-                      GetMklOpName(csinfo_.conv2dgradfilter), 3,
-                      CopyAttrsConv2D, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.conv2dgradinput,
-                      GetMklOpName(csinfo_.conv2dgradinput), 3, CopyAttrsConv2D,
-                      AlwaysRewrite});
-    rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu), 1,
-                      CopyAttrsRelu, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.lrn, GetMklOpName(csinfo_.lrn),
-                      1, CopyAttrsLRN, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.lrngrad, GetMklOpName(csinfo_.lrngrad),
-                      3, CopyAttrsLRN, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.maxpool, GetMklOpName(csinfo_.maxpool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.maxpoolgrad, GetMklOpName(csinfo_.maxpoolgrad), 3,
-                      CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpool, GetMklOpName(csinfo_.avgpool),
+    csinfo_.lrn                   = "LRN";
+    csinfo_.lrn_grad              = "LRNGrad";
+    csinfo_.matmul                = "MatMul";
+    csinfo_.max_pool              = "MaxPool";
+    csinfo_.max_pool_grad         = "MaxPoolGrad";
+    csinfo_.mkl_conv2d            = "MklConv2D";
+    csinfo_.mkl_conv2d_with_bias  = "MklConv2DWithBias";
+    csinfo_.mkl_conv2d_with_bias_backprop_bias =
+                                   "MklConv2DWithBiasBackpropBias";
+    csinfo_.relu                  = "Relu";
+    csinfo_.relu_grad             = "ReluGrad";
+    csinfo_.split                 = "Split";
+
+    // NOTE: names are alphabetically sorted.
+    rinfo_.push_back({csinfo_.avg_pool,
+                      GetMklOpName(csinfo_.avg_pool),
                       1, CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpoolgrad, GetMklOpName(csinfo_.avgpoolgrad),
+    rinfo_.push_back({csinfo_.avg_pool_grad,
+                      GetMklOpName(csinfo_.avg_pool_grad),
                       2, CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.concat, GetMklOpName(csinfo_.concat),
+    rinfo_.push_back({csinfo_.concat,
+                      GetMklOpName(csinfo_.concat),
                       0, CopyAttrsConcat, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.concatv2, GetMklOpName(csinfo_.concatv2),
+    rinfo_.push_back({csinfo_.concatv2,
+                      GetMklOpName(csinfo_.concatv2),
                       0, CopyAttrsConcatV2, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.conv2d,
+                      GetMklOpName(csinfo_.conv2d),
+                      2, CopyAttrsConv2D, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.conv2d_grad_filter,
+                      GetMklOpName(csinfo_.conv2d_grad_filter),
+                      3, CopyAttrsConv2D, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.conv2d_grad_input,
+                      GetMklOpName(csinfo_.conv2d_grad_input),
+                      3, CopyAttrsConv2D, AlwaysRewrite});
     rinfo_.push_back({csinfo_.fused_batch_norm,
-                      GetMklOpName(csinfo_.fused_batch_norm), 5,
-                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+                      GetMklOpName(csinfo_.fused_batch_norm),
+                      5, CopyAttrsFusedBatchNorm, AlwaysRewrite});
     rinfo_.push_back({csinfo_.fused_batch_norm_grad,
-                      GetMklOpName(csinfo_.fused_batch_norm_grad), 5,
-                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+                      GetMklOpName(csinfo_.fused_batch_norm_grad),
+                      5, CopyAttrsFusedBatchNorm, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.lrn,
+                      GetMklOpName(csinfo_.lrn),
+                      1, CopyAttrsLRN, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.lrn_grad,
+                      GetMklOpName(csinfo_.lrn_grad),
+                      3, CopyAttrsLRN, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.max_pool,
+                      GetMklOpName(csinfo_.max_pool),
+                      1, CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.max_pool_grad,
+                      GetMklOpName(csinfo_.max_pool_grad),
+                      3, CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.relu,
+                      GetMklOpName(csinfo_.relu),
+                      1, CopyAttrsRelu, AlwaysRewrite});
 
     // TODO(inteltf): we do not support ReluGrad and BiasAddGrad yet.
 
     // Add info about which ops to add workspace edge to and the slots.
-    wsinfo_.push_back({csinfo_.maxpool, csinfo_.maxpoolgrad, 0, 1, 1, 3});
-    wsinfo_.push_back({csinfo_.lrn, csinfo_.lrngrad, 0, 2, 1, 3});
+    wsinfo_.push_back({csinfo_.lrn, csinfo_.lrn_grad, 0, 2, 1, 3});
+    wsinfo_.push_back({csinfo_.max_pool, csinfo_.max_pool_grad, 0, 1, 1, 3});
 
     // Add a rule for merging nodes
     minfo_.push_back(
-        {csinfo_.mklconv2d, csinfo_.biasadd, 0, csinfo_.mklconv2dwithbias});
+        {csinfo_.mkl_conv2d, csinfo_.bias_add, 0, csinfo_.mkl_conv2d_with_bias});
 
     // We use maxhop of 10 based on empirical observations. Also, these are
     // maxhops in backward data-flow graph. Since input of forward nodes
     // (Conv2D) directly goes to backward nodes, we do not expect the
     // hop-distance would be more than few nodes.
-    cinfo_.push_back({csinfo_.biasaddgrad, csinfo_.mklconv2dwithbias,
+    cinfo_.push_back({csinfo_.bias_add_grad, csinfo_.mkl_conv2d_with_bias,
                       kNodeMergeContextMaxDepth});
   }
 
@@ -352,28 +367,28 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   /// the number of inputs to the original op, and the function to be used
   /// to copy attributes for the op
   typedef struct {
-    string name;     // Original name of the op in the graph
-    string newname;  // New name of op in the graph
-    int numins;      // Number of inputs to the original op
+    string name;      // Original name of the op in the graph
+    string new_name;  // New name of op in the graph
+    int num_ins;      // Number of inputs to the original op
     // Function handler to copy attributes from old node to new node.
-    std::function<void(const Node*, NodeBuilder*)> copyattrs;
-    std::function<bool(const Node*)> rewriterule;  // Rule under which to
+    std::function<void(const Node*, NodeBuilder*)> copy_attrs;
+    std::function<bool(const Node*)> rewrite_rule;  // Rule under which to
                                                    // rewrite this node.
   } RewriteInfo;
 
   /// Structure to specify forward op, backward op, and the slot numbers
   /// in forward and backward op where we will add workspace edge.
   typedef struct {
-    string fwdop;   // Name of the forward op in the graph
-    string bwdop;   // Name of the backward op in the graph
-    int fwdslot;    // Output slot in the forward op node where actual
-                    // output tensor resides
-    int bwdslot;    // Input slot in the backward op node where actual
-                    // input tensor resides
-    int wsfwdslot;  // Output slot in the forward op node where workspace
-                    // edge is added
-    int wsbwdslot;  // Input slot in the backward op node where workspace
-                    // edge is added
+    string fwd_op;   // Name of the forward op in the graph
+    string bwd_op;   // Name of the backward op in the graph
+    int fwd_slot;    // Output slot in the forward op node where actual
+                     // output tensor resides
+    int bwd_slot;    // Input slot in the backward op node where actual
+                     // input tensor resides
+    int ws_fwd_slot; // Output slot in the forward op node where workspace
+                     // edge is added
+    int ws_bwd_slot; // Input slot in the backward op node where workspace
+                     // edge is added
   } WorkSpaceInfo;
 
   /// Structure to specify information used in node merge
@@ -382,7 +397,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string succ;     // Successor node string
     int op;          // What operand no the predecessor node corresponds
                      // to successor node?
-    string newnode;  // Name of the node after merge
+    string new_node; // Name of the node after merge
   } MergeInfo;
 
   /// Structure to specify the context information used in node rewrite rule
@@ -390,38 +405,36 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string node;    // Name of the node to be rewritten
     string fwd;     // Node name in forward pass that this node
                     // corresponds to
-    size_t maxhop;  // Maximum number of hops the fwd is located
-                    // from this node. If fwd is farther than maxhop
+    size_t max_hop; // Maximum number of hops the fwd is located
+                    // from this node. If fwd is farther than max_hop
                     // then we do not rewrite the node.
   } ContextInfo;
 
   /// Structure to store all constant strings
+  /// NOTE: names are alphabetically sorted.
   struct {
+    string avg_pool;
+    string avg_pool_grad;
+    string bias_add;
+    string bias_add_grad;
     string concat;
     string concatv2;
-    string split;
-    string relu;
-    string relugrad;
-    // Conv ops
     string conv2d;
-    string mklconv2d;
-    string conv2dgradinput;
-    string conv2dgradfilter;
-    string mklconv2dwithbias;
-    string mklconv2dwithbiasbackpropbias;
-    string lrn;
-    string lrngrad;
-    // Pooling ops
-    string maxpool;
-    string maxpoolgrad;
-    string avgpool;
-    string avgpoolgrad;
-    // Others
-    string biasadd;
-    string matmul;
-    string biasaddgrad;
+    string conv2d_grad_input;
+    string conv2d_grad_filter;
     string fused_batch_norm;
     string fused_batch_norm_grad;
+    string lrn;
+    string lrn_grad;
+    string matmul;
+    string max_pool;
+    string max_pool_grad;
+    string mkl_conv2d;
+    string mkl_conv2d_with_bias;
+    string mkl_conv2d_with_bias_backprop_bias;
+    string relu;
+    string relu_grad;
+    string split;
   } csinfo_;
 
   /// Maintain info about nodes to rewrite
@@ -430,7 +443,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   /// Maintain info about nodes to add workspace edge
   std::vector<WorkSpaceInfo> wsinfo_;
 
-  /// Maintain info  to be merged
+  /// Maintain info about nodes to be merged
   std::vector<MergeInfo> minfo_;
 
   /// Maintain info about nodes to rewrite
@@ -440,7 +453,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   std::unordered_set<const Node*> visited_nodes_;
 
  private:
-  // Predicate to check if we rewrote node 'n'
+  // Check if we rewrote node 'n'
   //
   // If we rewrote the node, then the rewritten node will produce
   // Mkl tensor as output. If we did not rewrite the node, then
@@ -477,7 +490,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   }
 
   // Get length of a list in 'n' if 'arg' is of list type. Refer to
-  // description of ArgIsList for definitio of list type.
+  // description of ArgIsList for definition of list type.
   inline int GetTensorListLength(const OpDef::ArgDef& arg, Node* n) {
     CHECK_EQ(ArgIsList(arg), true);
     int N = 0;
@@ -514,7 +527,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //
   // Input nodes succ and pred may be deleted if the call to
   // this function is successful. Attempt to use the pointers
-  // after the call to function may result is undefined behaviors.
+  // after the call to function may result in undefined behaviors.
   //
   // @input g - input graph, succ - successor node, pred - predecessor node
   // @return Status::OK(), if merging is successful and supported.
@@ -544,13 +557,13 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // gradient op in the backward direction.
   //
   // @input n - Node (gradient op) whose contextinfo is to be searched,
-  //        fwdn - pointer to node from the forward pass that this node
-  //        belongs to. fwdn cannot be NULL.
+  //        fwd_node - pointer to node from the forward pass that this node
+  //        belongs to. fwd_node cannot be NULL.
   // @return Matching contextinfo in case a match is found; null otherwise.
-  //         Also updates *fwdn with pointer to forward node that this context
+  //         Also updates *fwd_node with pointer to forward node that this context
   //         matches.
   static const ContextInfo* SearchMatchingContext(const Node* n,
-                                                  const Node** fwdn);
+                                                  const Node** fwd_node);
 
   // Rewrites input node to a new node specified by its matching rewrite info.
   //
@@ -568,7 +581,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //         Otherwise, it is not updated.
   Status RewriteNode(std::unique_ptr<Graph>* g, Node* n, const RewriteInfo* ri);
 
-  // Create a node that will feed a list of TF tensors to the new
+  // Get a node that will feed a list of TF tensors to the new
   // node that we are constructing.
   //
   // @input g - input graph,
@@ -587,7 +600,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     int* input_idx, int list_length,
     std::vector<NodeBuilder::NodeOut>* output_nodes);
 
-  // Create a node that will feed a list of Mkl tensors to the new
+  // Get a node that will feed a list of Mkl tensors to the new
   // node that we are constructing.
   //
   // @input g - input graph,
@@ -606,7 +619,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     int* input_idx, int list_length,
     std::vector<NodeBuilder::NodeOut>* output_nodes);
 
-  // Create a node that will feed an Mkl tensor to the new
+  // Get a node that will feed an Mkl tensor to the new
   // node that we are constructing. The output node could be (1) 'n'
   // if it is Mkl layer, or (2) a dummy node producing dummy Mkl tensor
   // if 'n' is not an Mkl layer.
@@ -639,26 +652,8 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     std::vector<NodeBuilder::NodeOut>* workspace_tensors,
     bool are_workspace_tensors_available);
 
-#if 0
-  // TODO(nhasabni): enable it.
-  // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
-  // in graph 'g'. Original node is input in 'old_node'. Inputs to 'nb' are
-  // set up in interleaved fashion. 'workspace_tensors' carry graph nodes
-  // producing workspace edges if 'are_workspace_tensors_available' is true.
-  // Otherwise, 'workspace_tensors' is empty vector.
-  //
-  // For details, refer to 'Ordering of Tensorflow tensors and Mkl tensors'
-  // section in the documentation above.
-  //
-  // Returns Status::OK() if setting up inputs is successful, otherwise
-  // returns appropriate status code.
-  int SetUpInputsInterleaved(std::unique_ptr<Graph>* g,
-    const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
-    NodeBuilder* nb, Node* old_node);
-#endif
-
   // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
-  // in graph 'g'. Original node is input in 'orign'.
+  // in graph 'g'. Original node is input in 'orig_node'.
   //
   // For details, refer to 'Ordering of Tensorflow tensors and Mkl tensors'
   // section in the documentation above.
@@ -667,37 +662,38 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // returns appropriate status code.
   Status SetUpInputs(std::unique_ptr<Graph>* g,
                      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
-                     NodeBuilder* nb, Node* orign);
+                     NodeBuilder* nb, Node* orig_node);
 
-  // Add workspace edge on the input or output side of Node 'orign' by using
-  // NodeBuilder 'nb' for the new node provided. If 'orign' does not dictate
+  // Add workspace edge on the input or output side of Node 'orig_node' by using
+  // NodeBuilder 'nb' for the new node provided. If 'orig_node' does not dictate
   // adding workspace edge then do not add it. Workspace Tensorflow and Mkl
   // tensors, if they need to be added, will be set into these tensors.
   // If we set workspace tensors, then are_ws_tensors_added should be true.
-  void AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g, Node* orign,
+  void AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g, Node* orig_node,
       NodeBuilder* nb, std::vector<NodeBuilder::NodeOut>* ws_tensors,
       bool* are_ws_tensors_added);
 
   // Functions specific to operators to copy attributes
   // We need operator-specific function to copy attributes because the framework
   // does not provide any generic function for it.
-  static void CopyAttrsConv2D(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsBiasAddGrad(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsPooling(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsRelu(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsConcat(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsConcatV2(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsSplit(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsLRN(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsFusedBatchNorm(const Node* orign, NodeBuilder* nb);
+  // NOTE: names are alphabetically sorted.
+  static void CopyAttrsBiasAddGrad(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsConcat(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsConcatV2(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsConv2D(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsFusedBatchNorm(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsLRN(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsPooling(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsSplit(const Node* orig_node, NodeBuilder* nb);
 
   // Generate a graph node in graph 'g' representing a dummy Mkl tensor node,
-  // using node for original node 'orign' and return it in '*out'.
+  // using node for original node 'orig_node' and return it in '*out'.
   // TODO(nhasabni) We should move this to mkl_util.h
   void GetDummyMklTensorNode(std::unique_ptr<Graph>* g, Node** out,
-                             Node* orign);
+                             Node* orig_node);
   void GetDummyWorkspaceTensorNode(std::unique_ptr<Graph>* g, Node** out,
-                                   Node* orign);
+                                   Node* orig_node);
 };
 
 std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
@@ -732,64 +728,6 @@ static void FillInputs(const Node* n,
   }
 }
 
-#if 0
-// TODO(nhasabni): although, we are not using it right now. We can implement
-// it for sake of completion.
-int MklLayoutRewritePass::SetUpInputsInterleaved(std::unique_ptr<Graph>* g,
-    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
-    NodeBuilder* nb, Node* orign) {
-  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_INTERLEAVED);
-
-  // 1. Let's setup inputs for the new node.
-  for (int i = 0; i < inputs.size(); i++) {
-    Node* n = inputs[i].first;
-    CHECK_NOTNULL(n);
-    // First let's copy original TF tensor input as it is.
-    nb->Input(n, inputs[i].second);
-    new_inputs++;
-
-    // Second, let's add edge to propagate Mkl tensors from input Mkl layers,
-    // or generate a dummy Mkl tensor representing not-mkl-tensor case.
-    if (IsRewrittenNode(n)) {
-      // If we have visited this node and rewritten it, then it will generate
-      // an edge that will receive Mkl tensor from a node.
-      // First, let's assert that this op is Mkl layer.
-      DataType T;
-      TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
-      // If this op has been rewritten, then its name must have been same as
-      // Mkl op.
-      CHECK_EQ(mkl_layer_registry::IsMklLayer(n->type_string(), T), true);
-      // src slot number for Mkl tensor would be the one next to TF tensor
-      // slot number.
-      nb->Input(n, inputs[i].second+1);
-      new_inputs++;
-    } else {
-      // If we have not visited the node and rewritten it, then we need
-      // to create a dummy node that will feed a non-Mkl tensor to this node.
-      // DummyMklTensor node has no input and generates only 1 output
-      // (dummy Mkl tensor) as output slot number 0.
-      Node* dmt = nullptr;
-      GetDummyMklTensorNode(g, &dmt, orign);
-      CHECK_NOTNULL(dmt);
-      nb->Input(dmt, 0);
-      new_inputs++;
-    }
-  }
-
-  // If workspace tensors need to be added and we are interleaving the
-  // ordering, then we need to add them here because workspace tensors
-  // would be last tensors in the inputs.
-  if (are_workspace_tensors_available) {
-    CHECK_EQ(workspace_tensors.size(), 2);
-    // Tensorflow tensor
-    nb->Input(workspace_tensors[0].node, workspace_tensors[0].index);
-    new_inputs++;
-      nb->Input(workspace_tensors[1].node, workspace_tensors[1].index);
-      new_inputs++;
-  }
-}
-#endif
-
 void MklLayoutRewritePass::GetNodesProducingTFTensorList(
     const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
     int* input_idx, int list_length,
@@ -827,7 +765,7 @@ void MklLayoutRewritePass::GetNodesProducingTFTensorList(
 
 // TODO(nhasabni) We should move this to mkl_util.h.
 void MklLayoutRewritePass::GetDummyMklTensorNode(
-    std::unique_ptr<Graph>* g, Node** out, Node* orign) {
+    std::unique_ptr<Graph>* g, Node** out, Node* orig_node) {
   // We use a tensor of shape {8} and value 0,0,0,0,0,0,0,0 to represent
   // dummy Mkl tensor. 8 = 2*size_t.
   const DataType dt = DataTypeToEnum<uint8>::v();
@@ -841,11 +779,11 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
                  .Attr("value", proto)
                  .Attr("dtype", dt)
-                 .Device(orign->def().device())  // We place this node on same
+                 .Device(orig_node->def().device())  // We place this node on same
                                              // device as device of original
                                              // node.
                  .Finalize(&**g, out));
-  (*out)->set_assigned_device_name(orign->assigned_device_name());
+  (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
 void MklLayoutRewritePass::GetNodesProducingMklTensorList(
@@ -1033,7 +971,8 @@ Status MklLayoutRewritePass::SetUpInputs(std::unique_ptr<Graph>* g,
   if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
     // TODO(nhasabni): implement this function just for same of completion.
     // We do not use interleaved ordering right now.
-    // new_input_slots = SetUpInputsInterleaved();
+    return Status(error::Code::UNIMPLEMENTED,
+                "Interleaved ordering of tensors is currently not supported.");
   } else {
     CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
     new_node_input_slots = SetUpContiguousInputs(g, old_node_inputs, nb,
@@ -1067,7 +1006,7 @@ Status MklLayoutRewritePass::SetUpInputs(std::unique_ptr<Graph>* g,
 
 // TODO(nhasabni) We should move this to mkl_util.h.
 void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
-    std::unique_ptr<Graph>* g, Node** out, Node* orign) {
+    std::unique_ptr<Graph>* g, Node** out, Node* orig_node) {
   // We use a tensor of shape {1} and value 0 to represent
   // dummy float tensor. We need this as a dummy workspace tensor.
   // Workspace tensor has type float.
@@ -1082,15 +1021,15 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
                   .Attr("value", proto)
                   .Attr("dtype", dt)
-                  .Device(orign->def().device())  // We place this node on same
+                  .Device(orig_node->def().device())  // We place this node on same
                   // device as device of original
                   // node.
                   .Finalize(&**g, out));
-  (*out)->set_assigned_device_name(orign->assigned_device_name());
+  (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
 void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
-    Node* orign, NodeBuilder* nb,
+    Node* orig_node, NodeBuilder* nb,
     std::vector<NodeBuilder::NodeOut>* ws_tensors,
     bool* are_ws_tensors_added) {
   bool workspace_edge_added = false;  // Default initializer
@@ -1098,23 +1037,23 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
   *are_ws_tensors_added = false;  // Default initializer
 
   DataType T;
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
   for (auto ws : wsinfo_) {
-    if (orign->type_string() == ws.fwdop &&
-        mkl_layer_registry::IsMklLayer(GetMklOpName(orign->type_string()), T)) {
+    if (orig_node->type_string() == ws.fwd_op &&
+        mkl_layer_registry::IsMklLayer(GetMklOpName(orig_node->type_string()), T)) {
       // If this op is a fwd op, then we need to check if there is an
-      // edge from this node's fwdslot to bwdop's bwdslot. If there is
+      // edge from this node's fwd_slot to bwdop's bwd_slot. If there is
       // an edge, then we just add an attribute on this node for setting
       // workspace_passed to true. We don't add actual workspace edge
       // in this node. Actual workspace edge gets added in the backward
       // op for this node.
-      for (const Edge* e : orign->out_edges()) {
-        if (e->src_output() == ws.fwdslot &&
-            e->dst()->type_string() == ws.bwdop &&
-            e->dst_input() == ws.bwdslot) {
+      for (const Edge* e : orig_node->out_edges()) {
+        if (e->src_output() == ws.fwd_slot &&
+            e->dst()->type_string() == ws.bwd_op &&
+            e->dst_input() == ws.bwd_slot) {
           nb->Attr("workspace_enabled", true);
           VLOG(1) << "MklLayoutRewritePass: workspace_enabled for "
-                  << orign->type_string();
+                  << orig_node->type_string();
           workspace_edge_added = true;
           // We found the edge that we were looking for, so break.
           break;
@@ -1126,39 +1065,39 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         // node.
         nb->Attr("workspace_enabled", false);
       }
-    } else if (orign->type_string() == ws.bwdop &&
+    } else if (orig_node->type_string() == ws.bwd_op &&
                mkl_layer_registry::IsMklLayer(
-                   GetMklOpName(orign->type_string()), T)) {
+                   GetMklOpName(orig_node->type_string()), T)) {
       // If this op is a bwd op, then we need to add workspace edge and
       // it's Mkl tensor edge between its corresponding fwd op and this
-      // op. Corresponding fwd op is specified in 'fwdop' field of
-      // workspace info. fwdslot and bwdslot in workspace info specify
+      // op. Corresponding fwd op is specified in 'fwd_op' field of
+      // workspace info. fwd_slot and bwd_slot in workspace info specify
       // an edge between which slots connect forward and backward op.
       // Once all these criteria match, we add a workspace edge between
-      // wsfwdslot and wsbwdslot. It's corresponding Mkl tensor is
+      // ws_fwd_slot and ws_bwd_slot. Its corresponding Mkl tensor is
       // determined by interleaved/contiguous ordering. Function
       // DataIndexToMetaDataIndex tells us the location of Mkl tensor
       // from the location of the Tensorflow tensor.
-      for (const Edge* e : orign->in_edges()) {
-        if (e->src_output() == ws.fwdslot &&
+      for (const Edge* e : orig_node->in_edges()) {
+        if (e->src_output() == ws.fwd_slot &&
             // We would have rewritten the forward op, so we need to use
             // GetMklOpName call to get its Mkl name.
-            e->src()->type_string() == GetMklOpName(ws.fwdop) &&
-            e->dst_input() == ws.bwdslot) {
+            e->src()->type_string() == GetMklOpName(ws.fwd_op) &&
+            e->dst_input() == ws.bwd_slot) {
           nb->Attr("workspace_enabled", true);
           CHECK_NOTNULL(ws_tensors);
           // Add workspace edge between fwd op and bwd op.
-          ws_tensors->push_back(NodeBuilder::NodeOut(e->src(), ws.wsfwdslot));
+          ws_tensors->push_back(NodeBuilder::NodeOut(e->src(), ws.ws_fwd_slot));
           // Add Mkl tensor edge for workspace edge between fwd op and bwd op.
           ws_tensors->push_back(NodeBuilder::NodeOut(e->src(),
-            DataIndexToMetaDataIndex(ws.wsfwdslot, e->src()->num_outputs())));
+            DataIndexToMetaDataIndex(ws.ws_fwd_slot, e->src()->num_outputs())));
           *are_ws_tensors_added = true;
           // In terms of input ordering, we add these calls to add Input
           // here because workspace edge (and its Mkl tensor) is the last
           // edge in the fwdop and bwdop. So all inputs before workspace
           // tensor have been added by SetUpInputs function.
           VLOG(1) << "MklLayoutRewritePass: workspace_enabled for "
-                  << orign->type_string();
+                  << orig_node->type_string();
           workspace_edge_added = true;
           // We found the edge that we were looking for, so break.
           break;
@@ -1173,8 +1112,8 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         nb->Attr("workspace_enabled", false);
         Node* dmt_ws = nullptr;      // Dummy tensor for workspace
         Node* dmt_mkl_ws = nullptr;  // Dummy Mkl tensor for workspace
-        GetDummyWorkspaceTensorNode(g, &dmt_ws, orign);
-        GetDummyMklTensorNode(g, &dmt_mkl_ws, orign);
+        GetDummyWorkspaceTensorNode(g, &dmt_ws, orig_node);
+        GetDummyMklTensorNode(g, &dmt_mkl_ws, orig_node);
         CHECK_NOTNULL(dmt_ws);
         CHECK_NOTNULL(dmt_mkl_ws);
         CHECK_NOTNULL(ws_tensors);
@@ -1184,7 +1123,7 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         ws_tensors->push_back(NodeBuilder::NodeOut(dmt_mkl_ws, 0));
         *are_ws_tensors_added = true;
         VLOG(1) << "MklLayoutRewritePass: dummy workspace_enabled for "
-                << orign->type_string();
+                << orig_node->type_string();
       }
     } else {
       // If this node does not match any workspace info, then we do not
@@ -1197,7 +1136,7 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
 // Op-specific functions to copy attributes from old node to new node
 //////////////////////////////////////////////////////////////////////////
 
-void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orig_node, NodeBuilder* nb) {
   DataType T;
   string data_format;
   string padding;
@@ -1205,11 +1144,11 @@ void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
   bool use_cudnn_on_gpu;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "padding", &padding));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "use_cudnn_on_gpu", &use_cudnn_on_gpu));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "padding", &padding));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "use_cudnn_on_gpu", &use_cudnn_on_gpu));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1219,16 +1158,16 @@ void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
   nb->Attr("use_cudnn_on_gpu", use_cudnn_on_gpu);
 }
 
-void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
+void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orig_node,
                                                 NodeBuilder* nb) {
   DataType T;
   string data_format;
   std::vector<int32> strides;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1236,7 +1175,7 @@ void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsLRN(const Node* orign, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsLRN(const Node* orig_node, NodeBuilder* nb) {
   DataType T;
   int depth_radius;
   float bias;
@@ -1244,11 +1183,11 @@ void MklLayoutRewritePass::CopyAttrsLRN(const Node* orign, NodeBuilder* nb) {
   float beta;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "depth_radius", &depth_radius));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "bias", &bias));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "alpha", &alpha));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "beta", &beta));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "depth_radius", &depth_radius));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "bias", &bias));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "alpha", &alpha));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "beta", &beta));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1258,7 +1197,7 @@ void MklLayoutRewritePass::CopyAttrsLRN(const Node* orign, NodeBuilder* nb) {
   nb->Attr("beta", beta);
 }
 
-void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
+void MklLayoutRewritePass::CopyAttrsPooling(const Node* orig_node,
                                             NodeBuilder* nb) {
   DataType T;
   string data_format;
@@ -1266,11 +1205,11 @@ void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
   std::vector<int32> ksize, strides;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "ksize", &ksize));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "padding", &padding));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "ksize", &ksize));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "padding", &padding));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1280,25 +1219,25 @@ void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsRelu(const Node* orign, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb) {
   DataType T;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
 
   // Add attributes to new node.
   nb->Attr("T", T);
 }
 
-void MklLayoutRewritePass::CopyAttrsSplit(const Node* orign, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsSplit(const Node* orig_node, NodeBuilder* nb) {
   DataType T;
   string data_format;
   int num_split;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "num_split", &num_split));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "num_split", &num_split));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1306,29 +1245,29 @@ void MklLayoutRewritePass::CopyAttrsSplit(const Node* orign, NodeBuilder* nb) {
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsConcat(const Node* orign, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsConcat(const Node* orig_node, NodeBuilder* nb) {
   DataType T;
   int N;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "N", &N));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "N", &N));
 
   // Add attributes to new node.
   nb->Attr("T", T);
   nb->Attr("N", N);
 }
 
-void MklLayoutRewritePass::CopyAttrsConcatV2(const Node* orign,
+void MklLayoutRewritePass::CopyAttrsConcatV2(const Node* orig_node,
                                              NodeBuilder* nb) {
   DataType T;
   int N;
   DataType tidx;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "N", &N));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "Tidx", &tidx));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "N", &N));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tidx", &tidx));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1336,7 +1275,7 @@ void MklLayoutRewritePass::CopyAttrsConcatV2(const Node* orign,
   nb->Attr("Tidx", tidx);
 }
 
-void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orign,
+void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orig_node,
                                                    NodeBuilder* nb) {
   DataType T;
   float epsilon;
@@ -1344,10 +1283,10 @@ void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orign,
   bool is_training;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "epsilon", &epsilon));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "is_training", &is_training));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "epsilon", &epsilon));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "is_training", &is_training));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1413,8 +1352,8 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
   CHECK_NOTNULL(succ);
   CHECK_NOTNULL(pred);
 
-  if (succ->type_string() == csinfo_.biasadd &&
-      pred->type_string() == csinfo_.mklconv2d) {
+  if (succ->type_string() == csinfo_.bias_add &&
+      pred->type_string() == csinfo_.mkl_conv2d) {
     // 1. Get all attributes from input nodes.
     DataType T_pred, T_succ;
     string padding;
@@ -1484,7 +1423,7 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     // We will use the node name of BiasAdd as the name of new node
     // Build new node. We use same name as original node, but change the op
     // name.
-    NodeBuilder nb(succ->name(), csinfo_.mklconv2dwithbias);
+    NodeBuilder nb(succ->name(), csinfo_.mkl_conv2d_with_bias);
     if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
       nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
       // pred_in[1] will be Mkl tensor for In1 if we follow interleaved
@@ -1551,35 +1490,35 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
 //           Helper functions for node rewrite
 //////////////////////////////////////////////////////////////////////////
 
-Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
+Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orig_node,
                                          const RewriteInfo* ri) {
   CHECK_NOTNULL(ri);
-  CHECK_NOTNULL(orign);
+  CHECK_NOTNULL(orig_node);
 
-  VLOG(1) << "MklLayoutRewritePass: Original node:" << orign->DebugString();
+  VLOG(1) << "MklLayoutRewritePass: Original node:" << orig_node->DebugString();
 
   // Check if this is scenario 2 (context-based rewrite).
   // Get the matching ContextInfo if it is.
-  const Node* fwdn = nullptr;
+  const Node* fwd_node = nullptr;
   const ContextInfo* ci = nullptr;
   bool is_context_based_rewrite = false;
-  if ((ci = SearchMatchingContext(orign, &fwdn)) != nullptr) {
-    CHECK_NOTNULL(fwdn);
+  if ((ci = SearchMatchingContext(orig_node, &fwd_node)) != nullptr) {
+    CHECK_NOTNULL(fwd_node);
     is_context_based_rewrite = true;
 
     // Sanity checks for context-based rewrite (if any)
-    if (orign->type_string() == csinfo_.biasaddgrad &&
-        ri->newname == csinfo_.mklconv2dwithbiasbackpropbias) {
+    if (orig_node->type_string() == csinfo_.bias_add_grad &&
+        ri->new_name == csinfo_.mkl_conv2d_with_bias_backprop_bias) {
       DataType orig_T, ctx_T;
       string orig_data_format, ctx_data_format;
-      TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &orig_T));
-      TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &orig_data_format));
-      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "T", &ctx_T));
-      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "data_format", &ctx_data_format));
+      TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &orig_T));
+      TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &orig_data_format));
+      TF_CHECK_OK(GetNodeAttr(fwd_node->def(), "T", &ctx_T));
+      TF_CHECK_OK(GetNodeAttr(fwd_node->def(), "data_format", &ctx_data_format));
 
       if (orig_data_format != ctx_data_format || orig_T != ctx_T ||
-          orign->assigned_device_name() != fwdn->assigned_device_name() ||
-          orign->def().device() != fwdn->def().device()) {
+          orig_node->assigned_device_name() != fwd_node->assigned_device_name() ||
+          orig_node->def().device() != fwd_node->def().device()) {
         return Status(
             error::Code::INVALID_ARGUMENT,
             "data_format or T attribute or devices of BiasAddGrad and "
@@ -1589,22 +1528,22 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   }
 
   // Get all inputs.
-  const int num = orign->in_edges().size();
+  const int num = orig_node->in_edges().size();
   // Check the number of inputs against the user-specified value for non-vararg
   // nodes.
-  if (!IsVarArgNode(orign)) {
-    CHECK_EQ(num, ri->numins);
+  if (!IsVarArgNode(orig_node)) {
+    CHECK_EQ(num, ri->num_ins);
   }
   gtl::InlinedVector<Node*, 4> control_edges;
   gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num);
-  FillInputs(orign, &control_edges, &inputs);
+  FillInputs(orig_node, &control_edges, &inputs);
 
   // Build new node. We use same name as original node, but change the op name.
-  NodeBuilder nb(orign->name().c_str(), ri->newname.c_str());
+  NodeBuilder nb(orig_node->name().c_str(), ri->new_name.c_str());
   // Copy user-specified device assigned to original node to new node.
-  nb.Device(orign->def().device());
+  nb.Device(orig_node->def().device());
   // Set up new inputs to the rewritten node.
-  Status s = SetUpInputs(g, inputs, &nb, orign);
+  Status s = SetUpInputs(g, inputs, &nb, orig_node);
   if (s != Status::OK()) {
     return s;
   }
@@ -1612,16 +1551,16 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   // Copy attributes from original node to new node (for scenario 1).
   // For context-based rewrite, we use context to copy the attributes.
   if (is_context_based_rewrite) {
-    if (orign->type_string() == csinfo_.biasaddgrad &&
-        ri->newname == csinfo_.mklconv2dwithbiasbackpropbias) {
-      CHECK_NOTNULL(fwdn);
-      ri->copyattrs(fwdn, &nb);
+    if (orig_node->type_string() == csinfo_.bias_add_grad &&
+        ri->new_name == csinfo_.mkl_conv2d_with_bias_backprop_bias) {
+      CHECK_NOTNULL(fwd_node);
+      ri->copy_attrs(fwd_node, &nb);
     } else {
       return Status(error::Code::UNIMPLEMENTED,
                     "Unimplemented case for node rewrite optimization.");
     }
   } else {
-    ri->copyattrs(const_cast<const Node*>(orign), &nb);
+    ri->copy_attrs(const_cast<const Node*>(orig_node), &nb);
   }
   // Set the Mkl layer label for this op.
   nb.Attr("_kernel", mkl_layer_registry::kMklLayerLabel);
@@ -1631,14 +1570,14 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   TF_CHECK_OK(nb.Finalize(&**g, &newn));
   CHECK_NOTNULL(newn);
 
-  // Incoming edges from 'orign' node to new 'newn' node are already copied
-  // in BuildNode. Copy outgoing edges from 'orign' node to new 'newn' node.
+  // Incoming edges from 'orig_node' node to new 'newn' node are already copied
+  // in BuildNode. Copy outgoing edges from 'orig_node' node to new 'newn' node.
   // Since the output also follows same ordering among Tensorflow tensors and
   // Mkl tensors. We need to connect Tensorflow tensors appropriately.
   // Specifically, nth output of original node will become 2*nth output of
   // Mkl node for interleaved ordering of tensors. For contiguous ordering of
   // tensors it will be n. GetTensorDataIndex provides this mapping function.
-  for (const Edge* e : orign->out_edges()) {
+  for (const Edge* e : orig_node->out_edges()) {
     // We need to handle control-edges by using their original slot number.
     // Generally, -1 is reserved for control slot.
     if (e->src_output() < 0) {
@@ -1651,10 +1590,10 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   }
 
   // Copy the runtime device assigned from original code to new node.
-  newn->set_assigned_device_name(orign->assigned_device_name());
+  newn->set_assigned_device_name(orig_node->assigned_device_name());
 
   // Delete original node and mark new node as rewritten.
-  (*g)->RemoveNode(orign);
+  (*g)->RemoveNode(orig_node);
   MarkRewrittenNode(newn);
 
   VLOG(1) << "MklLayoutRewritePass: New node:" << newn->DebugString();
@@ -1662,10 +1601,10 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
 }
 
 const MklLayoutRewritePass::ContextInfo*
-MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
+MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwd_node) {
   CHECK_NOTNULL(n);
-  CHECK_NOTNULL(fwdn);
-  *fwdn = nullptr;
+  CHECK_NOTNULL(fwd_node);
+  *fwd_node = nullptr;
 
   // Search for matching contextinfo based on node name.
   // There could be more than one matching contextinfos.
@@ -1713,7 +1652,7 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
     // If we find a match, we return immediately.
     for (const ContextInfo* ci : mci) {
       if (curr_node->type_string() == ci->fwd) {
-        *fwdn = curr_node;
+        *fwd_node = curr_node;
         return ci;
       }
     }
@@ -1734,8 +1673,8 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
 }
 
 bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n) {
-  const Node* fwdn = nullptr;
-  return SearchMatchingContext(n, &fwdn) != nullptr;
+  const Node* fwd_node = nullptr;
+  return SearchMatchingContext(n, &fwd_node) != nullptr;
 }
 
 const MklLayoutRewritePass::RewriteInfo*
@@ -1762,7 +1701,7 @@ MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
 
   // Find matching RewriteInfo and then check that rewrite rule applies.
   for (auto ri = rinfo_.cbegin(); ri != rinfo_.cend(); ++ri) {
-    if (n->type_string().compare(ri->name) == 0 && ri->rewriterule(n)) {
+    if (n->type_string().compare(ri->name) == 0 && ri->rewrite_rule(n)) {
       return &*ri;
     }
   }
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 09775484c4..9503e25d0b 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -107,7 +107,7 @@ const OptimizationPassRegistry::Grouping kMklTfConvPassGroup =
 REGISTER_OPTIMIZATION(kMklTfConvPassGroup, 1, MklToTfConversionPass);
 
 Status MklToTfConversionPass::InsertConversionNodeOnEdge(
-    std::unique_ptr<Graph>* g, Edge *e) {
+    std::unique_ptr<Graph>* g, Edge* e) {
   CHECK_NOTNULL(e);
 
   Node* src = e->src();
@@ -181,7 +181,7 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
   // are candidate for inserting conversion node
   std::vector<Edge*> candidate_edges;
 
-  for (const Edge *e : (*g)->edges()) {
+  for (const Edge* e : (*g)->edges()) {
     Node* src = e->src();
     Node* dst = e->dst();
 
-- 
GitLab


From 7a2b8153a3eb8ca21224c84857fe054060256ef6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 13:37:39 -0800
Subject: [PATCH 0276/1563] Allows summary writer to take an optional suffix=
 argument, which is appended to every summary file name. Change: 152736272

---
 tensorflow/core/util/events_writer.cc         | 13 ++++++-----
 tensorflow/core/util/events_writer.h          | 14 ++++++++----
 tensorflow/python/client/events_writer.i      |  1 +
 .../summary/writer/event_file_writer.py       |  7 +++++-
 tensorflow/python/summary/writer/writer.py    | 22 ++++++++++---------
 .../python/summary/writer/writer_test.py      | 16 ++++++++++++++
 .../tensorflow.summary.-file-writer.pbtxt     |  2 +-
 7 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/tensorflow/core/util/events_writer.cc b/tensorflow/core/util/events_writer.cc
index fa23ff2bcb..60ba39dab1 100644
--- a/tensorflow/core/util/events_writer.cc
+++ b/tensorflow/core/util/events_writer.cc
@@ -35,7 +35,7 @@ EventsWriter::EventsWriter(const string& file_prefix)
       file_prefix_(file_prefix),
       num_outstanding_events_(0) {}
 
-bool EventsWriter::Init() {
+bool EventsWriter::InitIfNeeded() {
   if (recordio_writer_.get() != nullptr) {
     CHECK(!filename_.empty());
     if (FileHasDisappeared()) {
@@ -52,9 +52,10 @@ bool EventsWriter::Init() {
 
   int64 time_in_seconds = env_->NowMicros() / 1000000;
 
-  filename_ = strings::Printf(
-      "%s.out.tfevents.%010lld.%s", file_prefix_.c_str(),
-      static_cast<long long>(time_in_seconds), port::Hostname().c_str());
+  filename_ =
+      strings::Printf("%s.out.tfevents.%010lld.%s%s", file_prefix_.c_str(),
+                      static_cast<int64>(time_in_seconds),
+                      port::Hostname().c_str(), file_suffix_.c_str());
   port::AdjustFilenameForLogging(&filename_);
 
   Status s = env_->NewWritableFile(filename_, &recordio_file_);
@@ -84,14 +85,14 @@ bool EventsWriter::Init() {
 
 string EventsWriter::FileName() {
   if (filename_.empty()) {
-    Init();
+    InitIfNeeded();
   }
   return filename_;
 }
 
 void EventsWriter::WriteSerializedEvent(StringPiece event_str) {
   if (recordio_writer_.get() == NULL) {
-    if (!Init()) {
+    if (!InitIfNeeded()) {
       LOG(ERROR) << "Write failed because file could not be opened.";
       return;
     }
diff --git a/tensorflow/core/util/events_writer.h b/tensorflow/core/util/events_writer.h
index 2604ebdda2..a1a8cf790d 100644
--- a/tensorflow/core/util/events_writer.h
+++ b/tensorflow/core/util/events_writer.h
@@ -35,10 +35,10 @@ class EventsWriter {
 #endif
 
   // Events files typically have a name of the form
-  //   '/some/file/path/my.file.out.events.[timestamp].[hostname]'
+  //   '/some/file/path/my.file.out.events.[timestamp].[hostname][suffix]'
   // To create and EventWriter, the user should provide file_prefix =
   //   '/some/file/path/my.file'
-  // The EventsWriter will append '.out.events.[timestamp].[hostname]'
+  // The EventsWriter will append '.out.events.[timestamp].[hostname][suffix]'
   // to the ultimate filename once Init() is called.
   // Note that it is not recommended to simultaneously have two
   // EventWriters writing to the same file_prefix.
@@ -51,10 +51,14 @@ class EventsWriter {
   // and is open this is a no-op.  If on the other hand the file was opened,
   // but has since disappeared (e.g. deleted by another process), this will open
   // a new file with a new timestamp in its filename.
-  bool Init();
+  bool Init() { return InitWithSuffix(""); }
+  bool InitWithSuffix(const string& suffix) {
+    file_suffix_ = suffix;
+    return InitIfNeeded();
+  }
 
   // Returns the filename for the current events file:
-  // filename_ = [file_prefix_].out.events.[timestamp].[hostname]
+  // filename_ = [file_prefix_].out.events.[timestamp].[hostname][suffix]
   string FileName();
 
   // Append "event" to the file.  The "tensorflow::" part is for swig happiness.
@@ -78,9 +82,11 @@ class EventsWriter {
 
  private:
   bool FileHasDisappeared();  // True if event_file_path_ does not exist.
+  bool InitIfNeeded();
 
   Env* env_;
   const string file_prefix_;
+  string file_suffix_;
   string filename_;
   std::unique_ptr<WritableFile> recordio_file_;
   std::unique_ptr<io::RecordWriter> recordio_writer_;
diff --git a/tensorflow/python/client/events_writer.i b/tensorflow/python/client/events_writer.i
index ab83688074..de030fcb42 100644
--- a/tensorflow/python/client/events_writer.i
+++ b/tensorflow/python/client/events_writer.i
@@ -28,6 +28,7 @@ limitations under the License.
 %unignore tensorflow::EventsWriter;
 %unignore tensorflow::EventsWriter::EventsWriter;
 %unignore tensorflow::EventsWriter::~EventsWriter;
+%unignore tensorflow::EventsWriter::InitWithSuffix;
 %unignore tensorflow::EventsWriter::FileName;
 %rename("_WriteSerializedEvent") tensorflow::EventsWriter::WriteSerializedEvent;
 %unignore tensorflow::EventsWriter::Flush;
diff --git a/tensorflow/python/summary/writer/event_file_writer.py b/tensorflow/python/summary/writer/event_file_writer.py
index 7142998ce7..8940d9b72e 100644
--- a/tensorflow/python/summary/writer/event_file_writer.py
+++ b/tensorflow/python/summary/writer/event_file_writer.py
@@ -37,7 +37,8 @@ class EventFileWriter(object):
   is encoded using the tfrecord format, which is similar to RecordIO.
   """
 
-  def __init__(self, logdir, max_queue=10, flush_secs=120):
+  def __init__(self, logdir, max_queue=10, flush_secs=120,
+               filename_suffix=None):
     """Creates a `EventFileWriter` and an event file to write to.
 
     On construction the summary writer creates a new event file in `logdir`.
@@ -57,6 +58,8 @@ class EventFileWriter(object):
       max_queue: Integer. Size of the queue for pending events and summaries.
       flush_secs: Number. How often, in seconds, to flush the
         pending events and summaries to disk.
+      filename_suffix: A string. Every event file's name is suffixed with
+        `filename_suffix`.
     """
     self._logdir = logdir
     if not gfile.IsDirectory(self._logdir):
@@ -64,6 +67,8 @@ class EventFileWriter(object):
     self._event_queue = six.moves.queue.Queue(max_queue)
     self._ev_writer = pywrap_tensorflow.EventsWriter(
         compat.as_bytes(os.path.join(self._logdir, "events")))
+    if filename_suffix:
+      self._ev_writer.InitWithSuffix(compat.as_bytes(filename_suffix))
     self._closed = False
     self._worker = _EventLoggerThread(self._event_queue, self._ev_writer,
                                       flush_secs)
diff --git a/tensorflow/python/summary/writer/writer.py b/tensorflow/python/summary/writer/writer.py
index 2dad7b88d3..05f97fb284 100644
--- a/tensorflow/python/summary/writer/writer.py
+++ b/tensorflow/python/summary/writer/writer.py
@@ -32,7 +32,6 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.summary import plugin_asset
 from tensorflow.python.summary.writer.event_file_writer import EventFileWriter
 
-
 _PLUGINS_DIR = "plugins"
 
 
@@ -81,12 +80,11 @@ class SummaryToEventTransformer(object):
       self.add_graph(graph=graph, graph_def=graph_def)
       # Also export the meta_graph_def in this case.
       # graph may itself be a graph_def due to positional arguments
-      maybe_graph_as_def = (
-          graph.as_graph_def(add_shapes=True) if isinstance(graph, ops.Graph)
-          else graph)
+      maybe_graph_as_def = (graph.as_graph_def(add_shapes=True)
+                            if isinstance(graph, ops.Graph) else graph)
       self.add_meta_graph(
-          meta_graph.create_meta_graph_def(
-              graph_def=graph_def or maybe_graph_as_def))
+          meta_graph.create_meta_graph_def(graph_def=graph_def or
+                                           maybe_graph_as_def))
 
   def add_summary(self, summary, global_step=None):
     """Adds a `Summary` protocol buffer to the event file.
@@ -214,8 +212,8 @@ class SummaryToEventTransformer(object):
       TypeError: If both `meta_graph_def` is not an instance of `MetaGraphDef`.
     """
     if not isinstance(meta_graph_def, meta_graph_pb2.MetaGraphDef):
-      raise TypeError("meta_graph_def must be type MetaGraphDef, saw type: %s"
-                      % type(meta_graph_def))
+      raise TypeError("meta_graph_def must be type MetaGraphDef, saw type: %s" %
+                      type(meta_graph_def))
     meta_graph_bytes = meta_graph_def.SerializeToString()
     event = event_pb2.Event(meta_graph_def=meta_graph_bytes)
     self._add_event(event, global_step)
@@ -266,7 +264,8 @@ class FileWriter(SummaryToEventTransformer):
                graph=None,
                max_queue=10,
                flush_secs=120,
-               graph_def=None):
+               graph_def=None,
+               filename_suffix=None):
     """Creates a `FileWriter` and an event file.
 
     On construction the summary writer creates a new event file in `logdir`.
@@ -304,8 +303,11 @@ class FileWriter(SummaryToEventTransformer):
       flush_secs: Number. How often, in seconds, to flush the
         pending events and summaries to disk.
       graph_def: DEPRECATED: Use the `graph` argument instead.
+      filename_suffix: A string. Every event file's name is suffixed with
+        `suffix`.
     """
-    event_writer = EventFileWriter(logdir, max_queue, flush_secs)
+    event_writer = EventFileWriter(logdir, max_queue, flush_secs,
+                                   filename_suffix)
     super(FileWriter, self).__init__(event_writer, graph, graph_def)
 
   def get_logdir(self):
diff --git a/tensorflow/python/summary/writer/writer_test.py b/tensorflow/python/summary/writer/writer_test.py
index 50797483ee..b31c41d112 100644
--- a/tensorflow/python/summary/writer/writer_test.py
+++ b/tensorflow/python/summary/writer/writer_test.py
@@ -308,6 +308,22 @@ class SummaryWriterTestCase(test.TestCase):
     # We should be done.
     self.assertRaises(StopIteration, lambda: next(rr))
 
+  def testFileWriterWithSuffix(self):
+    test_dir = self._CleanTestDir("test_suffix")
+    sw = writer.FileWriter(test_dir, filename_suffix="_test_suffix")
+    for _ in range(10):
+      sw.add_summary(
+          summary_pb2.Summary(value=[
+              summary_pb2.Summary.Value(tag="float_ten", simple_value=10.0)
+          ]),
+          10)
+      sw.close()
+      sw.reopen()
+    sw.close()
+    event_filenames = glob.glob(os.path.join(test_dir, "event*"))
+    for filename in event_filenames:
+      self.assertTrue(filename.endswith("_test_suffix"))
+
 
 class SummaryWriterCacheTest(test.TestCase):
   """SummaryWriterCache tests."""
diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
index 502c35ee7b..dcf747971b 100644
--- a/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-file-writer.pbtxt
@@ -5,7 +5,7 @@ tf_class {
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'logdir\', \'graph\', \'max_queue\', \'flush_secs\', \'graph_def\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'120\', \'None\'], "
+    argspec: "args=[\'self\', \'logdir\', \'graph\', \'max_queue\', \'flush_secs\', \'graph_def\', \'filename_suffix\'], varargs=None, keywords=None, defaults=[\'None\', \'10\', \'120\', \'None\', \'None\'], "
   }
   member_method {
     name: "add_event"
-- 
GitLab


From 181823f83a88eed6128bd90cea2c0955cd570187 Mon Sep 17 00:00:00 2001
From: Andrew Harp <andrewharp@google.com>
Date: Mon, 10 Apr 2017 14:09:02 -0800
Subject: [PATCH 0277/1563] Add run_mode field to TestResults proto for
 differentiating between test types. Change: 152740961

---
 tensorflow/core/util/test_log.proto | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/core/util/test_log.proto b/tensorflow/core/util/test_log.proto
index 8c73ba54ff..409d5db211 100644
--- a/tensorflow/core/util/test_log.proto
+++ b/tensorflow/core/util/test_log.proto
@@ -183,4 +183,7 @@ message TestResults {
     ANDROID_BENCHMARK = 3;
   }
   BenchmarkType benchmark_type = 10;
+
+  // Used for differentiating between continuous and debug builds.
+  string run_mode = 11;
 };
-- 
GitLab


From 14dcbfac6e5d40556a8b1c43f6c1690df9a0fd45 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Mon, 10 Apr 2017 15:28:22 -0700
Subject: [PATCH 0278/1563] Copy Keras config file handling from master.

---
 .../contrib/keras/python/keras/backend.py     | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index 9769bce3b0..9efc2d5e8e 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -3583,27 +3583,39 @@ def foldr(fn, elems, initializer=None, name=None):
 
 # Load Keras default configuration from config file if present.
 _keras_base_dir = os.path.expanduser('~')
-if not os.access(_keras_base_dir, os.W_OK):
-  _keras_base_dir = '/tmp'
 _keras_dir = os.path.join(_keras_base_dir, '.keras')
-if not os.path.exists(_keras_dir):
-  try:
-    os.makedirs(_keras_dir)
-  except OSError as e:
-    if e.errno == errno.EEXIST:
-      pass
-    else:
-      raise
 _config_path = os.path.expanduser(os.path.join(_keras_dir, 'keras.json'))
 if os.path.exists(_config_path):
-  _config = json.load(open(_config_path))
+  try:
+    _config = json.load(open(_config_path))
+  except ValueError:
+    _config = {}
   _floatx = _config.get('floatx', floatx())
   assert _floatx in {'float16', 'float32', 'float64'}
   _epsilon = _config.get('epsilon', epsilon())
   assert isinstance(_epsilon, float)
-  _backend = backend()
   _image_data_format = _config.get('image_data_format', image_data_format())
   assert _image_data_format in {'channels_last', 'channels_first'}
   set_floatx(_floatx)
   set_epsilon(_epsilon)
   set_image_data_format(_image_data_format)
+
+# Save config file.
+if os.access(_keras_base_dir, os.W_OK):
+  if not os.path.exists(_keras_dir):
+    try:
+      os.makedirs(_keras_dir)
+    except OSError:
+      # Except potential race conditions
+      # in multi-threaded environments.
+      pass
+
+  if not os.path.exists(_config_path):
+    _config = {
+        'floatx': floatx(),
+        'epsilon': epsilon(),
+        'backend': 'tensorflow',
+        'image_data_format': image_data_format()
+    }
+    with open(_config_path, 'w') as f:
+      f.write(json.dumps(_config, indent=4))
-- 
GitLab


From d3eaf7bbce7d6e62cd7f1e6cade69f684617bcba Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 14:17:36 -0800
Subject: [PATCH 0279/1563] Add a missing "const" to an operator- method. Found
 by running unit-tests with GLIBCXX_DEBUG. Change: 152742124

---
 .../contrib/boosted_trees/lib/utils/sparse_column_iterable.cc   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/boosted_trees/lib/utils/sparse_column_iterable.cc b/tensorflow/contrib/boosted_trees/lib/utils/sparse_column_iterable.cc
index 21df5d13ff..bc0a93db8c 100644
--- a/tensorflow/contrib/boosted_trees/lib/utils/sparse_column_iterable.cc
+++ b/tensorflow/contrib/boosted_trees/lib/utils/sparse_column_iterable.cc
@@ -87,7 +87,7 @@ class IndicesRowIterator
     return tmp;
   }
 
-  difference_type operator-(const IndicesRowIterator& other) {
+  difference_type operator-(const IndicesRowIterator& other) const {
     return row_idx_ - other.row_idx_;
   }
 
-- 
GitLab


From a352cba4a60aa99af9c817a792aae3e03e1b74a6 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Mon, 10 Apr 2017 14:26:04 -0800
Subject: [PATCH 0280/1563] Fix a segfault in AlgebraicSimplifierVisitor.
 Change: 152743270

---
 .../xla/service/algebraic_simplifier.cc       |  8 ++++-
 .../xla/service/algebraic_simplifier_test.cc  | 30 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 415aafe69a..22ea09e29b 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -1349,8 +1349,14 @@ StatusOr<bool> AlgebraicSimplifier::Run(HloModule* module) {
   XLA_VLOG_LINES(2,
                  "AlgebraicSimplifier::Run(), before:\n" + module->ToString());
   bool changed = false;
+  // Make a copy of the computations because we may add computations to the
+  // module, invalidating iteration.
+  std::vector<HloComputation*> computations;
   for (auto& comp : module->computations()) {
-    if (AlgebraicSimplifierVisitor::Run(comp.get(), is_layout_sensitive_,
+    computations.push_back(comp.get());
+  }
+  for (auto& comp : computations) {
+    if (AlgebraicSimplifierVisitor::Run(comp, is_layout_sensitive_,
                                         valid_bitcast_callback_,
                                         enable_dot_simplification_)) {
       changed = true;
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 0969cff39a..6b4e9e90ae 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -1466,5 +1466,35 @@ TEST_F(AlgebraicSimplifierTest, ReversalOfTrivialDimensionsToBitcast) {
   EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
 }
 
+TEST_F(AlgebraicSimplifierTest, IteratorInvalidation) {
+  // Dots add computations to the parent module. Test that, when the HloModule's
+  // computations are updated, then iterator invalidation doesn't occur
+  // when running on subsequent computations.
+  Shape r1f32 = ShapeUtil::MakeShape(F32, {1});
+  HloComputation::Builder builder(TestName() + ".Dot");
+  HloInstruction* x =
+      builder.AddInstruction(HloInstruction::CreateParameter(0, r1f32, "x"));
+  HloInstruction* y =
+      builder.AddInstruction(HloInstruction::CreateParameter(1, r1f32, "y"));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(r1f32, HloOpcode::kDot, x, y));
+  std::unique_ptr<HloComputation> dot_computation(builder.Build());
+
+  HloComputation::Builder call_builder(TestName() + ".Call");
+  HloInstruction* zero = call_builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR1<float>({0.0f})));
+  HloInstruction* one = call_builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR1<float>({1.0f})));
+  builder.AddInstruction(
+      HloInstruction::CreateCall(r1f32, {zero, one}, dot_computation.get()));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  module->AddEmbeddedComputation(std::move(dot_computation));
+  module->AddEntryComputation(call_builder.Build());
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 163b1c078dcf393fdeb1662ac066dd7eb6b4d1bd Mon Sep 17 00:00:00 2001
From: Eduardo Pinho <enet4mikeenet@gmail.com>
Date: Tue, 11 Apr 2017 00:10:16 +0100
Subject: [PATCH 0281/1563] Add gradient op for MaxPoolWithArgmax (#8930)

---
 tensorflow/python/ops/nn_grad.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tensorflow/python/ops/nn_grad.py b/tensorflow/python/ops/nn_grad.py
index 9b765390b3..dca4de3119 100644
--- a/tensorflow/python/ops/nn_grad.py
+++ b/tensorflow/python/ops/nn_grad.py
@@ -504,6 +504,16 @@ def _MaxPoolGrad(op, grad):
                                    data_format=op.get_attr("data_format"))
 
 
+@ops.RegisterGradient("MaxPoolWithArgmax")
+def _MaxPoolGradWithArgmax(op, grad, unused_argmax_grad):
+  return gen_nn_ops._max_pool_grad_with_argmax(op.inputs[0],
+                                               grad,
+                                               op.outputs[1],
+                                               op.get_attr("ksize"),
+                                               op.get_attr("strides"),
+                                               padding=op.get_attr("padding"))
+
+
 @ops.RegisterGradient("MaxPoolGrad")
 def _MaxPoolGradGrad(op, grad):
   return (array_ops.zeros(
-- 
GitLab


From 50af91c8f7557027f638a21de7e0456c7932afa5 Mon Sep 17 00:00:00 2001
From: Yuxin Wu <ppwwyyxxc@gmail.com>
Date: Mon, 10 Apr 2017 16:11:06 -0700
Subject: [PATCH 0282/1563] Update adding_an_op.md (#8980)

* Update adding_an_op.md

* Minor markup polishing.
---
 tensorflow/docs_src/extend/adding_an_op.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index 45f7530506..c75c7f111d 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -182,10 +182,10 @@ g++ -std=c++11 -shared zero_out.cc -o zero_out.so -fPIC -I $TF_INC -O2
 On Mac OS X, the additional flag "-undefined dynamic_lookup" is required when
 building the `.so` file.
 
->   Note on gcc version 5: gcc5 uses the new C++
->   [ABI](https://gcc.gnu.org/gcc-5/changes.html#libstdcxx). The binary pip
->   packages available on the TensorFlow website are built with gcc4 that uses
->   the older ABI. If you compile your op library with gcc5, add
+>   Note on `gcc` version `>=5`: gcc uses the new C++
+>   [ABI](https://gcc.gnu.org/gcc-5/changes.html#libstdcxx) since version `5`. The binary pip
+>   packages available on the TensorFlow website are built with `gcc4` that uses
+>   the older ABI. If you compile your op library with `gcc>=5`, add
 >   `-D_GLIBCXX_USE_CXX11_ABI=0` to the command line to make the library
 >   compatible with the older abi.
 >   Furthermore if you are using TensorFlow package created from source remember to add `-cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"`
-- 
GitLab


From 6d6738098055416e3f190745fcb236eff5ead514 Mon Sep 17 00:00:00 2001
From: Ilya Edrenkin <ilya.edrenkin@gmail.com>
Date: Tue, 11 Apr 2017 01:20:21 +0200
Subject: [PATCH 0283/1563] Fix tf.nn.softmax (#8716)

* Fix tf.nn.softmax

https://github.com/tensorflow/tensorflow/issues/8667

* Update nn_ops.py

Avoid redundant using tf.identity for assigning tensor name
---
 tensorflow/python/ops/nn_ops.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 66ccedf546..ccce9402c7 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -1478,14 +1478,14 @@ def _softmax(logits, compute_op, dim=-1, name=None):
     InvalidArgumentError: if `logits` is empty or `dim` is beyond the last
       dimension of `logits`.
   """
-  def _swap_axis(logits, dim_index, last_index):
+  def _swap_axis(logits, dim_index, last_index, name=None):
     """Swaps logits's dim_index and last_index."""
     return array_ops.transpose(logits,
                                array_ops.concat([
                                    math_ops.range(dim_index), [last_index],
                                    math_ops.range(dim_index + 1, last_index),
                                    [dim_index]
-                               ], 0))
+                               ], 0), name=name)
 
   logits = ops.convert_to_tensor(logits)
 
@@ -1501,8 +1501,8 @@ def _softmax(logits, compute_op, dim=-1, name=None):
   if is_last_dim:
     input_shape = array_ops.shape(logits)
     logits = _flatten_outer_dims(logits)
-    output = compute_op(logits, name=name)
-    output = array_ops.reshape(output, input_shape)
+    output = compute_op(logits)
+    output = array_ops.reshape(output, input_shape, name=name)
     return output
 
   # If dim is not the last dimension, we have to do a reshape and transpose so
@@ -1517,11 +1517,11 @@ def _softmax(logits, compute_op, dim=-1, name=None):
   logits = _flatten_outer_dims(logits)
 
   # Do the actual softmax on its last dimension.
-  output = compute_op(logits, name=name)
+  output = compute_op(logits)
 
   # Transform back the output tensor.
   output = array_ops.reshape(output, shape_after_swap)
-  output = _swap_axis(output, dim, math_ops.subtract(input_rank, 1))
+  output = _swap_axis(output, dim, math_ops.subtract(input_rank, 1), name=name)
 
   # Make shape inference work since reshape and transpose may erase its static
   # shape.
-- 
GitLab


From 31559fd5317abd10c457575a1718b88b3917446c Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Mon, 10 Apr 2017 15:12:02 -0800
Subject: [PATCH 0284/1563] Fix some size_t casting issues. Change: 152749005

---
 tensorflow/core/distributed_runtime/master.cc           | 2 +-
 tensorflow/core/distributed_runtime/master_session.cc   | 2 +-
 tensorflow/core/grappler/optimizers/layout_optimizer.cc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/master.cc b/tensorflow/core/distributed_runtime/master.cc
index 583776b7e3..b4adee3bf6 100644
--- a/tensorflow/core/distributed_runtime/master.cc
+++ b/tensorflow/core/distributed_runtime/master.cc
@@ -198,7 +198,7 @@ class DeviceFinder {
     while (num_pending_ != 0) {
       pending_zero_.wait_for(l, std::chrono::milliseconds(kLoggingPeriodMs));
       if (num_pending_ != 0) {
-        for (int i = 0; static_cast<size_t>(i) < targets_.size(); ++i) {
+        for (size_t i = 0; i < targets_.size(); ++i) {
           if (!seen_targets_[i]) {
             LOG(INFO)
                 << "CreateSession still waiting for response from worker: "
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index bd848849b5..3b52652752 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -552,7 +552,7 @@ Status MasterSession::ReffedClientGraph::RunPartitions(
     // We keep these as separate paths for now, to ensure we aren't
     // inadvertently slowing down the normal run path.
     if (is_partial_) {
-      for (int i = 0; static_cast<size_t>(i) < req.num_feeds(); ++i) {
+      for (size_t i = 0; i < req.num_feeds(); ++i) {
         const string& name = req.feed_name(i);
         auto iter = part.feed_key.find(name);
         if (iter == part.feed_key.end()) {
diff --git a/tensorflow/core/grappler/optimizers/layout_optimizer.cc b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
index 5438bff0c1..9570ec17d0 100644
--- a/tensorflow/core/grappler/optimizers/layout_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
@@ -508,7 +508,7 @@ class BinaryOpProcessor : public AgnosticNodeProcessor {
     AttrValue attr_tensor;
     Tensor tensor(DT_INT32, TensorShape({4}));
     std::vector<int> shape = {1, num_channels, 1, 1};
-    for (int i = 0; static_cast<size_t>(i) < shape.size(); i++) {
+    for (int i = 0; i < static_cast<int>(shape.size()); i++) {
       tensor.flat<int>()(i) = shape[i];
     }
     tensor.AsProtoTensorContent(attr_tensor.mutable_tensor());
-- 
GitLab


From 5b628924684b36aaa6905a5c74075953c087be16 Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Mon, 10 Apr 2017 16:43:06 -0700
Subject: [PATCH 0285/1563] Support self_adjoint_eig to complex64 and
 complex128 (#8662)

This fix adds the complex64 and complex128 support for
self_adjoint_eig, as was raised in 5190.

This fix fixes 5190.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
---
 tensorflow/core/kernels/self_adjoint_eig_v2_op.cc        | 8 ++++++++
 tensorflow/core/ops/linalg_ops.cc                        | 2 +-
 .../python/kernel_tests/self_adjoint_eig_op_test.py      | 9 +++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc b/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc
index c647d3aaac..0e590007fb 100644
--- a/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc
+++ b/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc
@@ -81,7 +81,15 @@ class SelfAdjointEigV2Op : public LinearAlgebraOp<Scalar> {
 
 REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<float>), float);
 REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<double>), double);
+REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<complex64>),
+                   complex64);
+REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<complex128>),
+                   complex128);
 REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<float>), float);
 REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<double>),
                    double);
+REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<complex64>),
+                   complex64);
+REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<complex128>),
+                   complex128);
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/linalg_ops.cc b/tensorflow/core/ops/linalg_ops.cc
index a2762cf206..872824b885 100644
--- a/tensorflow/core/ops/linalg_ops.cc
+++ b/tensorflow/core/ops/linalg_ops.cc
@@ -318,7 +318,7 @@ REGISTER_OP("SelfAdjointEigV2")
     .Output("e: T")
     .Output("v: T")
     .Attr("compute_v: bool = True")
-    .Attr("T: {double, float}")
+    .Attr("T: {double, float, complex64, complex128}")
     .SetShapeFn(SelfAdjointEigV2ShapeFn)
     .Doc(R"doc(
 Computes the eigen decomposition of one or more square self-adjoint matrices.
diff --git a/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py b/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
index 36b3ed33d8..9ab9304572 100644
--- a/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
+++ b/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
@@ -78,7 +78,7 @@ def _GetSelfAdjointEigTest(dtype_, shape_):
         low=-1.0, high=1.0, size=n * n).reshape([n, n]).astype(dtype_)
     a += a.T
     a = np.tile(a, batch_shape + (1, 1))
-    if dtype_ == np.float32:
+    if dtype_ == np.float32 or dtype_ == np.complex64:
       atol = 1e-4
     else:
       atol = 1e-12
@@ -150,13 +150,14 @@ def _GetSelfAdjointEigGradTest(dtype_, shape_):
 
 
 if __name__ == '__main__':
-  for dtype in np.float32, np.float64:
+  for dtype in np.float32, np.float64, np.complex64, np.complex128:
     for size in 1, 2, 5, 10:
       for batch_dims in [(), (3,)] + [(3, 2)] * (max(size, size) < 10):
         shape = batch_dims + (size, size)
         name = '%s_%s' % (dtype.__name__, '_'.join(map(str, shape)))
         setattr(SelfAdjointEigTest, 'testSelfAdjointEig_' + name,
                 _GetSelfAdjointEigTest(dtype, shape))
-        setattr(SelfAdjointEigGradTest, 'testSelfAdjointEigGrad_' + name,
-                _GetSelfAdjointEigGradTest(dtype, shape))
+        if dtype in [np.float32, np.float64]:
+          setattr(SelfAdjointEigGradTest, 'testSelfAdjointEigGrad_' + name,
+                  _GetSelfAdjointEigGradTest(dtype, shape))
   test.main()
-- 
GitLab


From 24a95ae389e1c76e771ac33d66e0ec40a236260f Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Mon, 10 Apr 2017 15:29:15 -0800
Subject: [PATCH 0286/1563] Change Placeholder to support partial shapes and
 enforce scalar shapes.

Adds tests; testScalar failed before with the original placeholder because
it treated [] as "?" instead of scalar.  Now you can actually specify
[] and it means 'scalar'.

Added a backwards compatibility test using a graph_def generated
from a previous tf version.

RELNOTES: tf.placeholder can represent scalar shapes and partially known
shapes accurately. Note, this change can break already buggy programs because
it makes placeholder shape handling more consistent across graph serializations.

Note: There are some buggy cases where this change can break a buggy pipeline: namely those that serialize a graph using an unknown shape (e.g., [None, 10] in a tf.placeholder, but then reload the graph using import_graph_def and feed it a different shape.  Prior to this change, serializing the graph_def loses the [None, 10] shape requirement, so you can feed anything you want. This change makes it so that you serialize the graph with [None, 10], and so when you reload it, it would fail if you fed it a different shape.  In these cases, the fix is to correct the original placeholder shape to match what you feed it, which is not a bug in TF but in the user's program.

Note 2: A python user that did tf.placeholder(shape=[]) would get scalar checking
in the same process due to python shape inference code.  However, a C++ user that did Placeholder(shape=[]) would not have gotten
scalar shape checking; a C++ program that passed Placeholder(shape=[]) that expects
to interpret this as "UnknownShape" would break -- however, that user could have
already used an {unknown_shape: true} proto, and should not have expected the legacy behavior.

Backwards compatibility: Old graphs that have shape = {} in the proto will also have a
graph_def_version <= 21, so the default value of shape prior to this change will be interpreted by new binaries as "UnknownShape" just as before.

Forwards compatibility: new graphs will produce, by default, shape={ unknown rank: true}; old binaries will use PartialTensorShape's parsing code to parse that proto
into an object whose shape.dims() <= 0, and so these binaries will continue to interpret
the default shape as "unknown shape" without crashing and without producing new errors.

Fixes #9103
Change: 152751019
---
 tensorflow/cc/client/client_session_test.cc   |   2 +-
 tensorflow/cc/framework/cc_op_gen.cc          |  33 ++--
 .../core/framework/partial_tensor_shape.cc    |  12 ++
 .../core/framework/partial_tensor_shape.h     |   4 +-
 tensorflow/core/ops/array_ops.cc              |   4 +-
 tensorflow/core/ops/array_ops_test.cc         |  64 +------
 tensorflow/core/public/version.h              |   5 +-
 .../python/kernel_tests/constant_op_test.py   | 166 ++++++++++--------
 tensorflow/python/ops/array_ops.py            |  12 +-
 9 files changed, 139 insertions(+), 163 deletions(-)

diff --git a/tensorflow/cc/client/client_session_test.cc b/tensorflow/cc/client/client_session_test.cc
index 9c0f00f2b1..dfbac9788e 100644
--- a/tensorflow/cc/client/client_session_test.cc
+++ b/tensorflow/cc/client/client_session_test.cc
@@ -49,7 +49,7 @@ TEST(ClientSessionTest, Feed) {
 
 TEST(ClientSessionTest, Extend) {
   Scope root = Scope::NewRootScope();
-  auto a = Placeholder(root, DT_INT32);
+  auto a = Placeholder(root, DT_INT32, Placeholder::Shape({2}));
   auto c = Add(root, a, {2, 2});
   ClientSession session(root);
   std::vector<Tensor> outputs;
diff --git a/tensorflow/cc/framework/cc_op_gen.cc b/tensorflow/cc/framework/cc_op_gen.cc
index 22cd7fb0d4..26f15975c1 100644
--- a/tensorflow/cc/framework/cc_op_gen.cc
+++ b/tensorflow/cc/framework/cc_op_gen.cc
@@ -126,7 +126,11 @@ string PrintString(const string& str) {
   return strings::StrCat("\"", str_util::CEscape(str), "\"");
 }
 
-string PrintTensorShape(const TensorShape& shape) {
+string PrintTensorShape(const TensorShapeProto& shape_proto) {
+  PartialTensorShape shape(shape_proto);
+  if (shape.IsIdenticalTo(PartialTensorShape())) {
+    return "::tensorflow::PartialTensorShape() /* unknown */";
+  }
   string ret = "{";
   for (int d = 0; d < shape.dims(); ++d) {
     if (d > 0) strings::StrAppend(&ret, ", ");
@@ -188,6 +192,12 @@ string PrintTensor(const TensorProto& tensor_proto) {
   }
 }
 
+string PrintTensorProto(const TensorProto& proto) {
+  return strings::StrCat("Input::Initializer(", "{", PrintTensor(proto), "}, ",
+                         PrintTensorShape(proto.tensor_shape()),
+                         ").AsTensorProto()");
+}
+
 string PrintAttrValue(string op, const AttrValue& attr_value) {
   switch (attr_value.value_case()) {
     case AttrValue::kS:
@@ -203,12 +213,9 @@ string PrintAttrValue(string op, const AttrValue& attr_value) {
     case AttrValue::kType:
       return EnumName_DataType(attr_value.type());
     case AttrValue::kShape:
-      return PrintTensorShape(TensorShape(attr_value.shape()));
+      return PrintTensorShape(attr_value.shape());
     case AttrValue::kTensor:
-      return strings::StrCat(
-          "Input::Initializer(", "{", PrintTensor(attr_value.tensor()), "}, ",
-          PrintTensorShape(TensorShape(attr_value.tensor().tensor_shape())),
-          ").AsTensorProto()");
+      return PrintTensorProto(attr_value.tensor());
     case AttrValue::kList: {
       string ret = "{";
       if (attr_value.list().s_size() > 0) {
@@ -241,8 +248,14 @@ string PrintAttrValue(string op, const AttrValue& attr_value) {
       } else if (attr_value.list().shape_size() > 0) {
         for (int i = 0; i < attr_value.list().shape_size(); ++i) {
           if (i > 0) strings::StrAppend(&ret, ", ");
-          strings::StrAppend(
-              &ret, PrintTensorShape(TensorShape(attr_value.list().shape(i))));
+          strings::StrAppend(&ret,
+                             PrintTensorShape(attr_value.list().shape(i)));
+        }
+      } else if (attr_value.list().tensor_size() > 0) {
+        for (int i = 0; i < attr_value.list().tensor_size(); ++i) {
+          if (i > 0) strings::StrAppend(&ret, ", ");
+          strings::StrAppend(&ret,
+                             PrintTensorProto(attr_value.list().tensor(i)));
         }
       }
       strings::StrAppend(&ret, "}");
@@ -292,8 +305,8 @@ std::pair<const char*, bool> AttrTypeName(StringPiece attr_type) {
           {"list(bool)", {"gtl::ArraySlice<bool>", true}},
           {"type", {"DataType", false}},
           {"list(type)", {"DataTypeSlice", true}},
-          {"shape", {"TensorShape", false}},
-          {"list(shape)", {"gtl::ArraySlice<TensorShape>", true}},
+          {"shape", {"PartialTensorShape", false}},
+          {"list(shape)", {"gtl::ArraySlice<PartialTensorShape>", true}},
           {"tensor", {"TensorProto", true}},
           {"list(tensor)", {"gtl::ArraySlice<TensorProto>", true}},
           {"func", {"NameAttrList", true}},
diff --git a/tensorflow/core/framework/partial_tensor_shape.cc b/tensorflow/core/framework/partial_tensor_shape.cc
index f650468c1c..f02553b434 100644
--- a/tensorflow/core/framework/partial_tensor_shape.cc
+++ b/tensorflow/core/framework/partial_tensor_shape.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/framework/partial_tensor_shape.h"
 
+#include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/kernels/bounds_check.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/str_util.h"
@@ -81,6 +82,17 @@ PartialTensorShape::PartialTensorShape(gtl::ArraySlice<int64> dim_sizes)
   }
 }
 
+PartialTensorShape::PartialTensorShape(const TensorShape& shape)
+    : is_unknown_(false) {
+  const int num_dims = shape.dims();
+  dim_sizes_.reserve(num_dims);
+  for (int i = 0; i < num_dims; ++i) {
+    const int64 dim = internal::SubtleMustCopy(shape.dim_size(i));
+    CHECK_GE(dim, 0);
+    dim_sizes_.push_back(dim);
+  }
+}
+
 PartialTensorShape PartialTensorShape::Concatenate(int64 size) const {
   if (is_unknown_) {
     return *this;
diff --git a/tensorflow/core/framework/partial_tensor_shape.h b/tensorflow/core/framework/partial_tensor_shape.h
index 7a70167d7c..ab22eec356 100644
--- a/tensorflow/core/framework/partial_tensor_shape.h
+++ b/tensorflow/core/framework/partial_tensor_shape.h
@@ -46,7 +46,9 @@ class PartialTensorShape {
       : PartialTensorShape(gtl::ArraySlice<int64>(dim_sizes)) {}
 
   /// REQUIRES: `IsValid(proto)`
-  explicit PartialTensorShape(const TensorShapeProto& proto);
+  PartialTensorShape(
+      const TensorShapeProto& proto);            // NOLINT(runtime/explicit)
+  PartialTensorShape(const TensorShape& shape);  // NOLINT(runtime/explicit)
 
   /// Returns `true` iff `proto` is a valid partial tensor shape.
   static bool IsValid(const TensorShapeProto& proto);
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 7f6afca5b6..0cdad3a175 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -2738,7 +2738,7 @@ output: The folded tensor.
 REGISTER_OP("Placeholder")
     .Output("output: dtype")
     .Attr("dtype: type")
-    .Attr("shape: shape = {}")
+    .Attr("shape: shape = { unknown_rank: true }")
     .SetShapeFn([](InferenceContext* c) {
       PartialTensorShape shape;
       TF_RETURN_IF_ERROR(c->GetAttr("shape", &shape));
@@ -2746,7 +2746,7 @@ REGISTER_OP("Placeholder")
       // Placeholder has legacy behavior where we cannot tell the difference
       // between a scalar shape attribute and 'unknown shape'.  So if the shape
       // is a scalar, we return an unknown shape.
-      if (shape.dims() <= 0) {
+      if (c->graph_def_version() <= 21 && shape.dims() <= 0) {
         return shape_inference::UnknownShape(c);
       }
 
diff --git a/tensorflow/core/ops/array_ops_test.cc b/tensorflow/core/ops/array_ops_test.cc
index adb1320fc7..ef27c51333 100644
--- a/tensorflow/core/ops/array_ops_test.cc
+++ b/tensorflow/core/ops/array_ops_test.cc
@@ -786,14 +786,14 @@ TEST(ArrayOpsTest, Placeholder_ShapeFn) {
   }
 
   {
-    // Scalar shapes are unknown shapes due to legacy.
+    // Scalar shapes are supported
     ShapeInferenceTestOp op("Placeholder");
     TensorShape shape({});
     TF_ASSERT_OK(NodeDefBuilder("test", "Placeholder")
                      .Attr("shape", shape)
                      .Attr("dtype", DT_FLOAT)
                      .Finalize(&op.node_def));
-    INFER_OK(op, "", "?");
+    INFER_OK(op, "", "[]");
   }
 
   {
@@ -809,67 +809,11 @@ TEST(ArrayOpsTest, Placeholder_ShapeFn) {
     INFER_OK(op, "", "[1,?]");
   }
 
-  {
-    ShapeInferenceTestOp op("PlaceholderWithDefault");
-    const int64 dims[2] = {1, -1};
-    PartialTensorShape shape;
-    TF_ASSERT_OK(PartialTensorShape::MakePartialShape(dims, 2, &shape));
-    TF_ASSERT_OK(NodeDefBuilder("test", "PlaceholderWithDefault")
-                     .Input("input", 0, DT_FLOAT)
-                     .Attr("shape", shape)
-                     .Attr("dtype", DT_FLOAT)
-                     .Finalize(&op.node_def));
-    INFER_OK(op, "[1,2]", "[1,?]");
-
-    // input shape is not compatible with output shape.
-    INFER_ERROR("Dimension 0 in both shapes must be equal, but are 2 and 1", op,
-                "[2,3]");
-    // Wrong rank
-    INFER_ERROR("Shapes must be equal rank, but are 3 and 2", op, "[1,3,10]");
-  }
-}
-
-TEST(ArrayOpsTest, PlaceholderV2_ShapeFn) {
-  {
-    // 2D shape
-    ShapeInferenceTestOp op("PlaceholderV2");
-    TensorShape shape({1, 2});
-    TF_ASSERT_OK(NodeDefBuilder("test", "PlaceholderV2")
-                     .Attr("shape", shape)
-                     .Attr("dtype", DT_FLOAT)
-                     .Finalize(&op.node_def));
-    INFER_OK(op, "", "[1,2]");
-  }
-
-  {
-    // Scalar shapes are supported in V2.
-    ShapeInferenceTestOp op("PlaceholderV2");
-    TensorShape shape({});
-    TF_ASSERT_OK(NodeDefBuilder("test", "PlaceholderV2")
-                     .Attr("shape", shape)
-                     .Attr("dtype", DT_FLOAT)
-                     .Finalize(&op.node_def));
-    INFER_OK(op, "", "[]");
-  }
-
-  {
-    // Partial shape
-    ShapeInferenceTestOp op("PlaceholderV2");
-    const int64 dims[2] = {1, -1};
-    PartialTensorShape shape;
-    TF_ASSERT_OK(PartialTensorShape::MakePartialShape(dims, 2, &shape));
-    TF_ASSERT_OK(NodeDefBuilder("test", "PlaceholderV2")
-                     .Attr("shape", shape)
-                     .Attr("dtype", DT_FLOAT)
-                     .Finalize(&op.node_def));
-    INFER_OK(op, "", "[1,?]");
-  }
-
   {
     // Unknown shape
-    ShapeInferenceTestOp op("PlaceholderV2");
+    ShapeInferenceTestOp op("Placeholder");
     PartialTensorShape shape;
-    TF_ASSERT_OK(NodeDefBuilder("test", "PlaceholderV2")
+    TF_ASSERT_OK(NodeDefBuilder("test", "Placeholder")
                      .Attr("shape", shape)
                      .Attr("dtype", DT_FLOAT)
                      .Finalize(&op.node_def));
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index 14e45c37d9..dfffbfa396 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -84,10 +84,13 @@ limitations under the License.
 //     Some earlier graph def versions allowed this.
 // 21. Dropped FunctionDef.Node support, switched to node_def introduced
 //     in version 12. (11jan2017)
+// 22. Placeholder now can specify and enforce scalar and partial
+//     shapes, particularly when restoring a graph from GraphDef
+//     produced at version 22 or later.  (04/10/2016)
 
 #define TF_GRAPH_DEF_VERSION_MIN_PRODUCER 0
 #define TF_GRAPH_DEF_VERSION_MIN_CONSUMER 0
-#define TF_GRAPH_DEF_VERSION 21
+#define TF_GRAPH_DEF_VERSION 22
 
 // Checkpoint compatibility versions (the versions field in SavedSliceMeta).
 //
diff --git a/tensorflow/python/kernel_tests/constant_op_test.py b/tensorflow/python/kernel_tests/constant_op_test.py
index 128a6529f0..313db0183f 100644
--- a/tensorflow/python/kernel_tests/constant_op_test.py
+++ b/tensorflow/python/kernel_tests/constant_op_test.py
@@ -20,9 +20,13 @@ from __future__ import print_function
 
 import numpy as np
 
+from google.protobuf import text_format
+
+from tensorflow.core.framework import graph_pb2
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes as dtypes_lib
 from tensorflow.python.framework import errors_impl
+from tensorflow.python.framework import importer
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
@@ -589,18 +593,6 @@ class FillTest(test.TestCase):
 class PlaceholderTest(test.TestCase):
 
   def testDtype(self):
-    with self.test_session():
-      p = array_ops.placeholder(dtypes_lib.float32, name="p")
-      p_identity = array_ops.identity(p)
-      feed_array = np.random.rand(10, 10)
-      self.assertAllClose(
-          p_identity.eval(feed_dict={p: feed_array}), feed_array)
-
-      with self.assertRaisesOpError(
-          "must feed a value for placeholder tensor 'p' with dtype float"):
-        p_identity.eval()
-
-  def testShape(self):
     with self.test_session():
       p = array_ops.placeholder(dtypes_lib.float32, shape=(10, 10), name="p")
       p_identity = array_ops.identity(p)
@@ -608,67 +600,13 @@ class PlaceholderTest(test.TestCase):
       self.assertAllClose(
           p_identity.eval(feed_dict={p: feed_array}), feed_array)
 
-      with self.assertRaisesOpError(
-          "must feed a value for placeholder tensor 'p' with dtype float and "
-          r"shape \[10,10\]"):
-        p_identity.eval()
-
-      with self.assertRaisesWithPredicateMatch(
-          ValueError, lambda e: "Cannot feed value of shape" in str(e)):
-        p_identity.eval(feed_dict={p: feed_array[:5, :5]})
-
-  def testPartialShape(self):
-    with self.test_session():
-      p = array_ops.placeholder(dtypes_lib.float32, shape=[None, 3], name="p")
-      p_identity = array_ops.identity(p)
-      feed_array = np.random.rand(10, 3)
-      self.assertAllClose(
-          p_identity.eval(feed_dict={p: feed_array}), feed_array)
-
-      with self.assertRaisesWithPredicateMatch(
-          ValueError, lambda e: "Cannot feed value of shape" in str(e)):
-        p_identity.eval(feed_dict={p: feed_array[:5, :2]})
-
-  def testControlDependency(self):
-    with self.test_session():
-      p = array_ops.placeholder(dtypes_lib.int32, shape=[], name="p")
-      with ops.control_dependencies([p]):
-        c = constant_op.constant(5, dtypes_lib.int32)
-      d = math_ops.multiply(p, c)
-      self.assertEqual(10, d.eval(feed_dict={p: 2}))
-
-  def testBadShape(self):
-    with self.assertRaises(ValueError):
-      array_ops.placeholder(dtypes_lib.float32, shape=(-1, 10))
-
-  def testTensorStr(self):
-    a = array_ops.placeholder(dtypes_lib.float32, name="a")
-    self.assertEqual("<tf.Tensor 'a:0' shape=<unknown> dtype=float32>", repr(a))
-
-    b = array_ops.placeholder(dtypes_lib.int32, shape=(32, 40), name="b")
-    self.assertEqual("<tf.Tensor 'b:0' shape=(32, 40) dtype=int32>", repr(b))
-
-    c = array_ops.placeholder(dtypes_lib.qint32, shape=(32, None, 2), name="c")
-    self.assertEqual("<tf.Tensor 'c:0' shape=(32, ?, 2) dtype=qint32>", repr(c))
-
-
-class PlaceholderV2Test(test.TestCase):
-
-  def testDtype(self):
-    with self.test_session():
-      p = array_ops.placeholder_v2(dtypes_lib.float32, shape=None, name="p")
-      p_identity = array_ops.identity(p)
-      feed_array = np.random.rand(10, 10)
-      self.assertAllClose(
-          p_identity.eval(feed_dict={p: feed_array}), feed_array)
-
       with self.assertRaisesOpError(
           "must feed a value for placeholder tensor 'p' with dtype float"):
         p_identity.eval()
 
   def testShape(self):
     with self.test_session():
-      p = array_ops.placeholder_v2(dtypes_lib.float32, shape=(10, 10), name="p")
+      p = array_ops.placeholder(dtypes_lib.float32, shape=(10, 10), name="p")
       p_identity = array_ops.identity(p)
       feed_array = np.random.rand(10, 10)
       self.assertAllClose(
@@ -685,7 +623,7 @@ class PlaceholderV2Test(test.TestCase):
 
   def testUnknownShape(self):
     with self.test_session():
-      p = array_ops.placeholder_v2(dtypes_lib.float32, shape=None, name="p")
+      p = array_ops.placeholder(dtypes_lib.float32, shape=None, name="p")
       p_identity = array_ops.identity(p)
       # can feed anything
       feed_array = np.random.rand(10, 3)
@@ -697,14 +635,13 @@ class PlaceholderV2Test(test.TestCase):
 
   def testScalarShape(self):
     with self.test_session():
-      p = array_ops.placeholder_v2(dtypes_lib.float32, shape=[], name="p")
+      p = array_ops.placeholder(dtypes_lib.float32, shape=[], name="p")
       p_identity = array_ops.identity(p)
       self.assertAllClose(p_identity.eval(feed_dict={p: 5}), 5)
 
   def testPartialShape(self):
     with self.test_session():
-      p = array_ops.placeholder_v2(
-          dtypes_lib.float32, shape=[None, 3], name="p")
+      p = array_ops.placeholder(dtypes_lib.float32, shape=[None, 3], name="p")
       p_identity = array_ops.identity(p)
       feed_array = np.random.rand(10, 3)
       self.assertAllClose(
@@ -716,7 +653,7 @@ class PlaceholderV2Test(test.TestCase):
 
   def testControlDependency(self):
     with self.test_session():
-      p = array_ops.placeholder_v2(dtypes_lib.int32, shape=[], name="p")
+      p = array_ops.placeholder(dtypes_lib.int32, shape=[], name="p")
       with ops.control_dependencies([p]):
         c = constant_op.constant(5, dtypes_lib.int32)
       d = math_ops.multiply(p, c)
@@ -725,19 +662,94 @@ class PlaceholderV2Test(test.TestCase):
 
   def testBadShape(self):
     with self.assertRaises(ValueError):
-      array_ops.placeholder_v2(dtypes_lib.float32, shape=(-1, 10))
+      array_ops.placeholder(dtypes_lib.float32, shape=(-1, 10))
 
   def testTensorStr(self):
-    a = array_ops.placeholder_v2(dtypes_lib.float32, shape=None, name="a")
+    a = array_ops.placeholder(dtypes_lib.float32, shape=None, name="a")
     self.assertEqual("<tf.Tensor 'a:0' shape=<unknown> dtype=float32>", repr(a))
 
-    b = array_ops.placeholder_v2(dtypes_lib.int32, shape=(32, 40), name="b")
+    b = array_ops.placeholder(dtypes_lib.int32, shape=(32, 40), name="b")
     self.assertEqual("<tf.Tensor 'b:0' shape=(32, 40) dtype=int32>", repr(b))
 
-    c = array_ops.placeholder_v2(
-        dtypes_lib.qint32, shape=(32, None, 2), name="c")
+    c = array_ops.placeholder(dtypes_lib.qint32, shape=(32, None, 2), name="c")
     self.assertEqual("<tf.Tensor 'c:0' shape=(32, ?, 2) dtype=qint32>", repr(c))
 
+  def testOldGraph(self):
+    # Load graph generated from earlier version of TF where
+    # placeholder shape was not set.
+    #
+    # a = tf.placeholder(tf.float32)
+    # b = a + 1.0
+    #
+    # Older graph's default shape is 'shape {}', not 'shape {
+    # unknown_rank: true }'
+    graph = """
+node {
+  name: "Placeholder"
+  op: "Placeholder"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+      }
+    }
+  }
+}
+node {
+  name: "add/y"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1.0
+      }
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "Placeholder"
+  input: "add/y"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+}
+versions {
+  producer: 21
+}
+"""
+    gdef = graph_pb2.GraphDef()
+    text_format.Merge(graph, gdef)
+    with self.test_session():
+      p, ret = importer.import_graph_def(
+          gdef, return_elements=["Placeholder:0", "add:0"])
+
+      # Feed in a vector of two elements.  Since the producer version
+      # of 21, a shape of {} is interpreted as "any shape".  If
+      # producer version were 22, then we'd get a shape mismatch
+      # error.
+      self.assertAllEqual([2.0, 3.0], ret.eval(feed_dict={p: [1.0, 2.0]}))
+
 
 class PlaceholderWithDefaultTest(test.TestCase):
 
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 45efc51d5c..4f5d71f5f6 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1509,17 +1509,7 @@ def placeholder(dtype, shape=None, name=None):
     A `Tensor` that may be used as a handle for feeding a value, but not
     evaluated directly.
   """
-  shape = tensor_shape.as_shape(shape)
-  if shape.is_fully_defined():
-    dim_list = shape.as_list()
-  else:
-    dim_list = []
-  ret = gen_array_ops._placeholder(
-      dtype=dtype,
-      shape=dim_list,
-      name=name)
-  ret.set_shape(shape)
-  return ret
+  return gen_array_ops._placeholder(dtype=dtype, shape=shape, name=name)
 
 
 # pylint: disable=redefined-outer-name
-- 
GitLab


From 67f9925ef9ceed02892c200a3122092ab497943a Mon Sep 17 00:00:00 2001
From: Niranjan Hasabnis <niranjan.hasabnis@intel.com>
Date: Mon, 10 Apr 2017 17:03:29 -0700
Subject: [PATCH 0287/1563] Updates based on review comments - round 2

This commit makes following changes based on review comments:
1) Changes API that uses notion of Mkl layer to use Mkl Op
2) Adds description of workspace
3) Fixes incorrectly updated mkl_relu
---
 tensorflow/core/graph/mkl_layout_pass.cc      | 119 ++++++++++--------
 .../core/graph/mkl_tfconversion_pass.cc       |   4 +-
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |   4 +-
 tensorflow/core/kernels/mkl_concat_op.cc      |   4 +-
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |   2 +-
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |   2 +-
 .../core/kernels/mkl_conv_grad_input_ops.cc   |   2 +-
 tensorflow/core/kernels/mkl_conv_ops.cc       |   4 +-
 .../core/kernels/mkl_fused_batch_norm_op.cc   |   4 +-
 tensorflow/core/kernels/mkl_lrn_op.cc         |   4 +-
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |   4 +-
 tensorflow/core/kernels/mkl_relu_op.cc        |  16 +--
 tensorflow/core/kernels/mkl_tfconv_op.cc      |   2 +-
 tensorflow/core/util/mkl_util.h               |  18 +--
 14 files changed, 99 insertions(+), 90 deletions(-)

diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index c6470e4fa9..a374b7924f 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -180,14 +180,13 @@ namespace tensorflow {
 //
 //        Certain backward ops in MKL (MaxPool, LRN and BatchNorm) require
 //        passing of workspace from their corresponding forward ops. Workspace
-//        carries meta-information about actual input tensors to MaxPool and
-//        LRN. This meta-information is used by corresponding backward passes.
-//        TensorFlow does not have a notion of workspace and as a result
-//        does not allow producing additional outputs from these forward ops.
-//        For these ops, we need to add an additional edge between forward
-//        ops and their corresponding backward ops, and this edge carries
-//        workspace tensor value and another edge carries Mkl tensor for
-//        workspace tensor.
+//        tensors provide memory for storing results of intermediate operations
+//        which are helpful in backward propagation. TensorFlow does not have
+//        a notion of workspace and as a result does not allow producing
+//        additional outputs from these forward ops. For these ops, we need
+//        to add an additional edge between forward ops and their corresponding
+//        backward ops, and this edge carries workspace tensor value and
+//        another edge carries Mkl tensor for workspace tensor.
 //
 //        Example:
 //
@@ -340,7 +339,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
 
     // Add a rule for merging nodes
     minfo_.push_back(
-        {csinfo_.mkl_conv2d, csinfo_.bias_add, 0, csinfo_.mkl_conv2d_with_bias});
+       {csinfo_.mkl_conv2d, csinfo_.bias_add, 0, csinfo_.mkl_conv2d_with_bias});
 
     // We use maxhop of 10 based on empirical observations. Also, these are
     // maxhops in backward data-flow graph. Since input of forward nodes
@@ -379,35 +378,35 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   /// Structure to specify forward op, backward op, and the slot numbers
   /// in forward and backward op where we will add workspace edge.
   typedef struct {
-    string fwd_op;   // Name of the forward op in the graph
-    string bwd_op;   // Name of the backward op in the graph
-    int fwd_slot;    // Output slot in the forward op node where actual
-                     // output tensor resides
-    int bwd_slot;    // Input slot in the backward op node where actual
-                     // input tensor resides
-    int ws_fwd_slot; // Output slot in the forward op node where workspace
-                     // edge is added
-    int ws_bwd_slot; // Input slot in the backward op node where workspace
-                     // edge is added
+    string fwd_op;    // Name of the forward op in the graph
+    string bwd_op;    // Name of the backward op in the graph
+    int fwd_slot;     // Output slot in the forward op node where actual
+                      // output tensor resides
+    int bwd_slot;     // Input slot in the backward op node where actual
+                      // input tensor resides
+    int ws_fwd_slot;  // Output slot in the forward op node where workspace
+                      // edge is added
+    int ws_bwd_slot;  // Input slot in the backward op node where workspace
+                      // edge is added
   } WorkSpaceInfo;
 
   /// Structure to specify information used in node merge
   typedef struct {
-    string pred;     // Predecessor node string
-    string succ;     // Successor node string
-    int op;          // What operand no the predecessor node corresponds
-                     // to successor node?
-    string new_node; // Name of the node after merge
+    string pred;      // Predecessor node string
+    string succ;      // Successor node string
+    int op;           // What operand no the predecessor node corresponds
+                      // to successor node?
+    string new_node;  // Name of the node after merge
   } MergeInfo;
 
   /// Structure to specify the context information used in node rewrite rule
   typedef struct {
-    string node;    // Name of the node to be rewritten
-    string fwd;     // Node name in forward pass that this node
-                    // corresponds to
-    size_t max_hop; // Maximum number of hops the fwd is located
-                    // from this node. If fwd is farther than max_hop
-                    // then we do not rewrite the node.
+    string node;     // Name of the node to be rewritten
+    string fwd;      // Node name in forward pass that this node
+                     // corresponds to
+    size_t max_hop;  // Maximum number of hops the fwd is located
+                     // from this node. If fwd is farther than max_hop
+                     // then we do not rewrite the node.
   } ContextInfo;
 
   /// Structure to store all constant strings
@@ -560,8 +559,8 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //        fwd_node - pointer to node from the forward pass that this node
   //        belongs to. fwd_node cannot be NULL.
   // @return Matching contextinfo in case a match is found; null otherwise.
-  //         Also updates *fwd_node with pointer to forward node that this context
-  //         matches.
+  //         Also updates *fwd_node with pointer to forward node that this
+  //         context matches.
   static const ContextInfo* SearchMatchingContext(const Node* n,
                                                   const Node** fwd_node);
 
@@ -779,9 +778,9 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
                  .Attr("value", proto)
                  .Attr("dtype", dt)
-                 .Device(orig_node->def().device())  // We place this node on same
-                                             // device as device of original
-                                             // node.
+                 .Device(orig_node->def().device())  // We place this node on
+                                             // same device as device of
+                                             // original node.
                  .Finalize(&**g, out));
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
@@ -851,7 +850,7 @@ void MklLayoutRewritePass::GetNodeProducingMklTensor(std::unique_ptr<Graph>* g,
     TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
     // If this op has been rewritten, then its name must have been same as
     // Mkl op.
-    CHECK_EQ(mkl_layer_registry::IsMklLayer(n->type_string(), T), true);
+    CHECK_EQ(mkl_op_registry::IsMklOp(n->type_string(), T), true);
     // output slot number for Mkl tensor would be N+slot number of TensorFlow
     // tensor, where N is total number of TensorFlow tensors.
     *mkl_node = n;
@@ -1021,9 +1020,8 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
                   .Attr("value", proto)
                   .Attr("dtype", dt)
-                  .Device(orig_node->def().device())  // We place this node on same
-                  // device as device of original
-                  // node.
+                  .Device(orig_node->def().device())  // We place this node on
+                  // same device as device of original node.
                   .Finalize(&**g, out));
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
@@ -1040,7 +1038,7 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
   TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
   for (auto ws : wsinfo_) {
     if (orig_node->type_string() == ws.fwd_op &&
-        mkl_layer_registry::IsMklLayer(GetMklOpName(orig_node->type_string()), T)) {
+        mkl_op_registry::IsMklOp(GetMklOpName(orig_node->type_string()), T)) {
       // If this op is a fwd op, then we need to check if there is an
       // edge from this node's fwd_slot to bwdop's bwd_slot. If there is
       // an edge, then we just add an attribute on this node for setting
@@ -1066,7 +1064,7 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         nb->Attr("workspace_enabled", false);
       }
     } else if (orig_node->type_string() == ws.bwd_op &&
-               mkl_layer_registry::IsMklLayer(
+               mkl_op_registry::IsMklOp(
                    GetMklOpName(orig_node->type_string()), T)) {
       // If this op is a bwd op, then we need to add workspace edge and
       // it's Mkl tensor edge between its corresponding fwd op and this
@@ -1136,7 +1134,8 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
 // Op-specific functions to copy attributes from old node to new node
 //////////////////////////////////////////////////////////////////////////
 
-void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orig_node, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orig_node,
+                                           NodeBuilder* nb) {
   DataType T;
   string data_format;
   string padding;
@@ -1148,7 +1147,8 @@ void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orig_node, NodeBuilder* n
   TF_CHECK_OK(GetNodeAttr(orig_node->def(), "strides", &strides));
   TF_CHECK_OK(GetNodeAttr(orig_node->def(), "padding", &padding));
   TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
-  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "use_cudnn_on_gpu", &use_cudnn_on_gpu));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "use_cudnn_on_gpu",
+                          &use_cudnn_on_gpu));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -1175,7 +1175,8 @@ void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orig_node,
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsLRN(const Node* orig_node, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsLRN(const Node* orig_node,
+                                        NodeBuilder* nb) {
   DataType T;
   int depth_radius;
   float bias;
@@ -1219,7 +1220,8 @@ void MklLayoutRewritePass::CopyAttrsPooling(const Node* orig_node,
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsRelu(const Node* orig_node,
+                                         NodeBuilder* nb) {
   DataType T;
 
   // Get all attributes from old node.
@@ -1229,7 +1231,8 @@ void MklLayoutRewritePass::CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb)
   nb->Attr("T", T);
 }
 
-void MklLayoutRewritePass::CopyAttrsSplit(const Node* orig_node, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsSplit(const Node* orig_node,
+                                          NodeBuilder* nb) {
   DataType T;
   string data_format;
   int num_split;
@@ -1245,7 +1248,8 @@ void MklLayoutRewritePass::CopyAttrsSplit(const Node* orig_node, NodeBuilder* nb
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsConcat(const Node* orig_node, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsConcat(const Node* orig_node,
+                                           NodeBuilder* nb) {
   DataType T;
   int N;
 
@@ -1459,7 +1463,7 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     CHECK_NOTNULL(newn);
 
     // Set the Mkl layer label for this op.
-    newn->AddAttr("_kernel", mkl_layer_registry::kMklLayerLabel);
+    newn->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
     // Incoming edges are fixed, we will fix the outgoing edges now.
     for (const Edge* e : succ->out_edges()) {
@@ -1490,7 +1494,8 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
 //           Helper functions for node rewrite
 //////////////////////////////////////////////////////////////////////////
 
-Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orig_node,
+Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
+                                         Node* orig_node,
                                          const RewriteInfo* ri) {
   CHECK_NOTNULL(ri);
   CHECK_NOTNULL(orig_node);
@@ -1512,12 +1517,15 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orig_n
       DataType orig_T, ctx_T;
       string orig_data_format, ctx_data_format;
       TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &orig_T));
-      TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &orig_data_format));
+      TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format",
+                              &orig_data_format));
       TF_CHECK_OK(GetNodeAttr(fwd_node->def(), "T", &ctx_T));
-      TF_CHECK_OK(GetNodeAttr(fwd_node->def(), "data_format", &ctx_data_format));
+      TF_CHECK_OK(GetNodeAttr(fwd_node->def(), "data_format",
+                              &ctx_data_format));
 
       if (orig_data_format != ctx_data_format || orig_T != ctx_T ||
-          orig_node->assigned_device_name() != fwd_node->assigned_device_name() ||
+          orig_node->assigned_device_name() !=
+            fwd_node->assigned_device_name() ||
           orig_node->def().device() != fwd_node->def().device()) {
         return Status(
             error::Code::INVALID_ARGUMENT,
@@ -1563,7 +1571,7 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orig_n
     ri->copy_attrs(const_cast<const Node*>(orig_node), &nb);
   }
   // Set the Mkl layer label for this op.
-  nb.Attr("_kernel", mkl_layer_registry::kMklLayerLabel);
+  nb.Attr("_kernel", mkl_op_registry::kMklOpLabel);
 
   // Finalize graph and get new node.
   Node* newn = nullptr;
@@ -1601,7 +1609,8 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orig_n
 }
 
 const MklLayoutRewritePass::ContextInfo*
-MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwd_node) {
+MklLayoutRewritePass::SearchMatchingContext(const Node* n,
+                                            const Node** fwd_node) {
   CHECK_NOTNULL(n);
   CHECK_NOTNULL(fwd_node);
   *fwd_node = nullptr;
@@ -1690,7 +1699,7 @@ MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
     return nullptr;
   }
 
-  if (!mkl_layer_registry::IsMklLayer(GetMklOpName(n->type_string()), T)) {
+  if (!mkl_op_registry::IsMklOp(GetMklOpName(n->type_string()), T)) {
     return nullptr;
   }
 
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 9503e25d0b..b2f05af475 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -85,7 +85,7 @@ class MklToTfConversionPass : public GraphOptimizationPass {
   // @input T Datatype to use for checking input op
   // @return true if op is Mkl supported; false, otherwise.
   inline bool IsMklSupportedOp(const string& op_name, DataType T) const {
-    return mkl_layer_registry::IsMklLayer(op_name, T);
+    return mkl_op_registry::IsMklOp(op_name, T);
   }
 
   // Insert layout conversion node on the edge pointed by 'e' from graph 'g'.
@@ -151,7 +151,7 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
   conversion_node->set_assigned_device_name(src->assigned_device_name());
 
   // Set the Mkl layer label for this op.
-  conversion_node->AddAttr("_kernel", mkl_layer_registry::kMklLayerLabel);
+  conversion_node->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
   // Now that we have added edge from src->conversion_node, let's add edge from
   // output of conversion_node to the dest node. Since conversion_node
diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
index a78f6ede19..1ec38692e1 100644
--- a/tensorflow/core/kernels/mkl_avgpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -415,13 +415,13 @@ class MklAvgPoolingGradOp : public OpKernel {
 REGISTER_KERNEL_BUILDER(Name("MklAvgPool")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklAvgPoolingOp<CPUDevice, float>);
 
 REGISTER_KERNEL_BUILDER(Name("MklAvgPoolGrad")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklAvgPoolingGradOp<CPUDevice, float>);
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
index d65786a910..9156530025 100644
--- a/tensorflow/core/kernels/mkl_concat_op.cc
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -437,14 +437,14 @@ class MklConcatOp : public OpKernel {
                               .Device(DEVICE_CPU)                           \
                               .TypeConstraint<type>("T")                    \
                               .HostMemory("concat_dim")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel),   \
+                              .Label(mkl_op_registry::kMklOpLabel),         \
                           MklConcatOp<CPUDevice, type, NAME_IS_CONCAT_DIM>) \
   REGISTER_KERNEL_BUILDER(Name("MklConcatV2")                               \
                               .Device(DEVICE_CPU)                           \
                               .TypeConstraint<type>("T")                    \
                               .TypeConstraint<int32>("Tidx")                \
                               .HostMemory("axis")                           \
-                              .Label(mkl_layer_registry::kMklLayerLabel),   \
+                              .Label(mkl_op_registry::kMklOpLabel),         \
                           MklConcatOp<CPUDevice, type, NAME_IS_AXIS>)
 
 TF_CALL_float(REGISTER_MKL_CPU);
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
index 0298c6b762..82973340c3 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -255,7 +255,7 @@ class MklConv2DCustomBackpropBiasOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklConv2DWithBiasBackpropBias")           \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklConv2DCustomBackpropBiasOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_CPU_KERNELS);
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
index de557c7644..03a0dc8d99 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -412,7 +412,7 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklConv2DBackpropFilter")                 \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklConv2DCustomBackpropFilterOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_MKL_FILTER_KERNELS);
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index 73649eb4af..431abcf69d 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -345,7 +345,7 @@ class MklConv2DCustomBackpropInputOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklConv2DBackpropInput")                  \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklConv2DCustomBackpropInputOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_MKL_CPU_KERNELS);
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index 4dcaf78fa9..b0040351ed 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -441,12 +441,12 @@ class MklConv2DOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklConv2D")                               \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklConv2DOp<CPUDevice, T, false>);              \
   REGISTER_KERNEL_BUILDER(Name("MklConv2DWithBias")                       \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklConv2DOp<CPUDevice, T, true>);
 
 TF_CALL_float(REGISTER_MKL_CPU);
diff --git a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
index 6dad2e4d12..a5656640b4 100644
--- a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
+++ b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
@@ -328,7 +328,7 @@ class MklFusedBatchNormOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklFusedBatchNorm")                       \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklFusedBatchNormOp<CPUDevice, T>);
 TF_CALL_float(REGISTER_MKL_CPU);
 #undef REGISTER_MKL_CPU
@@ -679,7 +679,7 @@ class MklFusedBatchNormGradOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklFusedBatchNormGrad")                   \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklFusedBatchNormGradOp<CPUDevice, T>);
 TF_CALL_float(REGISTER_MKL_CPU);
 #undef REGISTER_MKL_CPU
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
index d7ace8ff46..892580e63e 100644
--- a/tensorflow/core/kernels/mkl_lrn_op.cc
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -760,12 +760,12 @@ class MklLRNGradOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklLRN")                                  \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklLRNOp<T>);                                   \
   REGISTER_KERNEL_BUILDER(Name("MklLRNGrad")                              \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklLRNGradOp<T>);
 
 TF_CALL_float(REGISTER_MKL_LRN_CPU);
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index d28ed34f6d..29a95dd8da 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -493,13 +493,13 @@ class MklMaxPoolingGradOp : public OpKernel {
 REGISTER_KERNEL_BUILDER(Name("MklMaxPool")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklMaxPoolingOp<CPUDevice, float>);
 
 REGISTER_KERNEL_BUILDER(Name("MklMaxPoolGrad")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklMaxPoolingGradOp<CPUDevice, float>);
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc
index 7809711524..02f0a5d6de 100644
--- a/tensorflow/core/kernels/mkl_relu_op.cc
+++ b/tensorflow/core/kernels/mkl_relu_op.cc
@@ -63,7 +63,7 @@ class MklReluOp : public OpKernel {
       const TensorShape& o_shape = input.shape();
       Tensor* out_tensor = nullptr;
       mkl_context.output_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &out_tensor, o_shape,
+      AllocateOutputSetMklShape(context, 0, &out_tensor, o_shape,
                                 mkl_context.output_shape);
       void* out_o = static_cast<void*>(out_tensor->flat<T>().data());
       (static_cast<T*>(out_o))[0] =
@@ -114,12 +114,12 @@ class MklReluOp : public OpKernel {
       tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                           mkl_context.output_shape.GetMklLayout())) /
                       sizeof(T));
-      AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+      AllocateOutputSetMklShape(context, 0, &output, tf_shape,
                                 mkl_context.output_shape);
     } else {
       const TensorShape& o_shape = input.shape();
       mkl_context.output_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &output, o_shape,
+      AllocateOutputSetMklShape(context, 0, &output, o_shape,
                                 mkl_context.output_shape);
     }
 
@@ -293,7 +293,7 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
     // Allocate space for g and
     const TensorShape& g_shape = g.shape();
     mkl_context.output_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &output, g_shape,
+    AllocateOutputSetMklShape(context, 0, &output, g_shape,
                               mkl_context.output_shape);
     void* out_o = static_cast<void*>(output->flat<T>().data());
     (static_cast<T*>(out_o))[0] =
@@ -359,13 +359,13 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
     tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                         mkl_context.output_shape.GetMklLayout())) /
                     sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+    AllocateOutputSetMklShape(context, 0, &output, tf_shape,
                               mkl_context.output_shape);
 
   } else {
     const TensorShape& o_shape = g.shape();
     mkl_context.output_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &output, o_shape,
+    AllocateOutputSetMklShape(context, 0, &output, o_shape,
                               mkl_context.output_shape);
   }
 
@@ -383,12 +383,12 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
   REGISTER_KERNEL_BUILDER(Name("MklRelu")                                 \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<type>("T")                  \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklReluOp<CPUDevice, type>);                    \
   REGISTER_KERNEL_BUILDER(Name("MklReluGrad")                             \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<type>("T")                  \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklReluGradOp<CPUDevice, type>);
 TF_CALL_float(REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES);
 
diff --git a/tensorflow/core/kernels/mkl_tfconv_op.cc b/tensorflow/core/kernels/mkl_tfconv_op.cc
index 51f90b3f90..09529e4a70 100644
--- a/tensorflow/core/kernels/mkl_tfconv_op.cc
+++ b/tensorflow/core/kernels/mkl_tfconv_op.cc
@@ -109,7 +109,7 @@ class MklToTfOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("MklToTf")                                 \
                               .Device(DEVICE_CPU)                         \
                               .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
                           MklToTfOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_CPU);
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index 0401f63b18..c5b1c7a1cf 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -499,7 +499,7 @@ inline void GetStridesFromSizes(TensorFormat data_format, size_t* strides,
 
 inline void MklSizesToTFSizes(OpKernelContext* context,
                               TensorFormat data_format_,
-                              const MklShape& mkl_shape, TensorShape* tf_shape) {
+                            const MklShape& mkl_shape, TensorShape* tf_shape) {
   size_t tf_dim = mkl_shape.GetDimension();
   const size_t* tf_sizes = mkl_shape.GetSizes();
 
@@ -545,27 +545,27 @@ inline int64 GetMklTensorDim(const MklShape& mkl_shape, char dimension) {
   return mkl_shape.dim_size(index);
 }
 
-namespace mkl_layer_registry {
+namespace mkl_op_registry {
 
-static const char* kMklLayerLabel = "MklLayer";
-static const char* kMklLayerLabelPattern = "label='MklLayer'";
+static const char* kMklOpLabel = "MklOp";
+static const char* kMklOpLabelPattern = "label='MklOp'";
 
 // Check whether opname with type T is registered as MKL-compliant.
 //
 // @input: name of the op
 // @input: T datatype to be used for checking op
-// @return: true if opname is registered as Mkl layer op
-static inline bool IsMklLayer(const std::string& op_name, DataType T) {
+// @return: true if opname is registered as Mkl op
+static inline bool IsMklOp(const std::string& op_name, DataType T) {
   string kernel = KernelsRegisteredForOp(op_name);
   bool result =
-      kernel.find(kMklLayerLabelPattern) != string::npos && (T == DT_FLOAT);
+      kernel.find(kMklOpLabelPattern) != string::npos && (T == DT_FLOAT);
   if (result == true) {
-    VLOG(1) << "mkl_layer_registry::" << op_name << " is " << kMklLayerLabel;
+    VLOG(1) << "mkl_op_registry::" << op_name << " is " << kMklOpLabel;
   }
   return result;
 }
 
-}  // namespace mkl_layer_registry
+}  // namespace mkl_op_registry
 
 }  // namespace tensorflow
 #endif  // INTEL_MKL
-- 
GitLab


From 6d108bb829ee97b3a7a11ab71c29796611931b7e Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 10 Apr 2017 15:46:09 -0800
Subject: [PATCH 0288/1563] [tf contrib seq2seq] Change 'attention_history' to
 'alignment_history' (this is the history most folks want; and attention is
 returned as an output). Change: 152752862

---
 .../kernel_tests/attention_wrapper_test.py    | 82 ++++++++++++++-----
 .../seq2seq/python/ops/attention_wrapper.py   | 42 +++++-----
 2 files changed, 85 insertions(+), 39 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index 606215b656..067af818bb 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -68,7 +68,8 @@ class AttentionWrapperTest(test.TestCase):
                          expected_final_output,
                          expected_final_state,
                          attention_mechanism_depth=3,
-                         attention_history=False,
+                         alignment_history=False,
+                         expected_final_alignment_history=None,
                          name=""):
     encoder_sequence_length = [3, 2, 3, 1, 0]
     decoder_sequence_length = [2, 0, 1, 2, 3]
@@ -96,8 +97,10 @@ class AttentionWrapperTest(test.TestCase):
           initializer=init_ops.random_normal_initializer(stddev=0.01, seed=3)):
         cell = core_rnn_cell.LSTMCell(cell_depth)
         cell = wrapper.AttentionWrapper(
-            cell, attention_mechanism, attention_size=attention_depth,
-            attention_history=attention_history)
+            cell,
+            attention_mechanism,
+            attention_size=attention_depth,
+            alignment_history=alignment_history)
         helper = helper_py.TrainingHelper(decoder_inputs,
                                           decoder_sequence_length)
         my_decoder = basic_decoder.BasicDecoder(
@@ -127,21 +130,21 @@ class AttentionWrapperTest(test.TestCase):
       self.assertEqual((batch_size, cell_depth),
                        tuple(final_state.cell_state.h.get_shape().as_list()))
 
-      if attention_history:
-        state_attention_history = final_state.attention_history.stack()
+      if alignment_history:
+        state_alignment_history = final_state.alignment_history.stack()
         # Remove the history from final_state for purposes of the
         # remainder of the tests.
-        final_state = final_state._replace(attention_history=())  # pylint: disable=protected-access
-        self.assertEqual((None, batch_size, attention_depth),
-                         tuple(state_attention_history.get_shape().as_list()))
+        final_state = final_state._replace(alignment_history=())  # pylint: disable=protected-access
+        self.assertEqual((None, batch_size, encoder_max_time),
+                         tuple(state_alignment_history.get_shape().as_list()))
       else:
-        state_attention_history = ()
+        state_alignment_history = ()
 
       sess.run(variables.global_variables_initializer())
       sess_results = sess.run({
           "final_outputs": final_outputs,
           "final_state": final_state,
-          "state_attention_history": state_attention_history,
+          "state_alignment_history": state_alignment_history,
       })
 
       print("Copy/paste (%s)\nexpected_final_output = " % name,
@@ -150,16 +153,18 @@ class AttentionWrapperTest(test.TestCase):
       print("Copy/paste (%s)\nexpected_final_state = " % name,
             sess_results["final_state"])
       sys.stdout.flush()
+      print("Copy/paste (%s)\nexpected_final_alignment_history = " % name,
+            sess_results["state_alignment_history"])
+      sys.stdout.flush()
       nest.map_structure(self.assertAllClose, expected_final_output,
                          sess_results["final_outputs"])
       nest.map_structure(self.assertAllClose, expected_final_state,
                          sess_results["final_state"])
-      if attention_history:  # by default, the wrapper emits attention as output
+      if alignment_history:  # by default, the wrapper emits attention as output
         self.assertAllClose(
             # outputs are batch major but the stacked TensorArray is time major
-            sess_results["state_attention_history"],
-            np.transpose(sess_results["final_outputs"].rnn_output,
-                         (1, 0, 2)))
+            sess_results["state_alignment_history"],
+            expected_final_alignment_history)
 
   def testBahdanauNotNormalized(self):
     create_attention_mechanism = wrapper.BahdanauAttention
@@ -284,13 +289,52 @@ class AttentionWrapperTest(test.TestCase):
             ]],
             dtype=float32),
         time=3,
-        attention_history=())
+        alignment_history=())
+
+    expected_final_alignment_history = [[[
+        0.12525459, 0.12438694, 0.12613983, 0.12484372, 0.12484372, 0.12484372,
+        0.12484372, 0.12484372
+    ], [
+        0.12648369, 0.12322279, 0.12504892, 0.12504892, 0.12504892, 0.12504892,
+        0.12504892, 0.12504892
+    ], [
+        0.12611018, 0.12528601, 0.12638952, 0.12444285, 0.12444285, 0.12444285,
+        0.12444285, 0.12444285
+    ], [
+        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
+        0.12501054, 0.12501054
+    ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
+        0.12525459, 0.12438691, 0.1261397, 0.12484375, 0.12484375, 0.12484375,
+        0.12484375, 0.12484375
+    ], [
+        0.12648349, 0.12322238, 0.12504902, 0.12504902, 0.12504902, 0.12504902,
+        0.12504902, 0.12504902
+    ], [
+        0.12611009, 0.12528586, 0.12638941, 0.12444293, 0.12444293, 0.12444293,
+        0.12444293, 0.12444293
+    ], [
+        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
+        0.12501054, 0.12501054
+    ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
+        0.12525487, 0.12438726, 0.12613991, 0.12484358, 0.12484358, 0.12484358,
+        0.12484358, 0.12484358
+    ], [
+        0.12648354, 0.12322233, 0.12504901, 0.12504901, 0.12504901, 0.12504901,
+        0.12504901, 0.12504901
+    ], [
+        0.12611021, 0.125286, 0.12638955, 0.12444286, 0.12444286, 0.12444286,
+        0.12444286, 0.12444286
+    ], [
+        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
+        0.12501054, 0.12501054
+    ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]]]
 
     self._testWithAttention(
         create_attention_mechanism,
         expected_final_output,
         expected_final_state,
-        attention_history=True,
+        alignment_history=True,
+        expected_final_alignment_history=expected_final_alignment_history,
         name="testBahdanauNotNormalized")
 
   def testBahdanauNormalized(self):
@@ -417,7 +461,7 @@ class AttentionWrapperTest(test.TestCase):
             ]],
             dtype=float32),
         time=3,
-        attention_history=())
+        alignment_history=())
 
     self._testWithAttention(
         create_attention_mechanism,
@@ -548,7 +592,7 @@ class AttentionWrapperTest(test.TestCase):
             ]],
             dtype=float32),
         time=3,
-        attention_history=())
+        alignment_history=())
 
     self._testWithAttention(
         create_attention_mechanism,
@@ -681,7 +725,7 @@ class AttentionWrapperTest(test.TestCase):
             ]],
             dtype=float32),
         time=3,
-        attention_history=())
+        alignment_history=())
 
     self._testWithAttention(
         create_attention_mechanism,
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index d01d375119..3aec58df29 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -356,9 +356,9 @@ class BahdanauAttention(_BaseAttentionMechanism):
 
 
 class AttentionWrapperState(
-    collections.namedtuple(
-        "AttentionWrapperState", (
-            "cell_state", "attention", "time", "attention_history"))):
+    collections.namedtuple("AttentionWrapperState",
+                           ("cell_state", "attention", "time",
+                            "alignment_history"))):
   """`namedtuple` storing the state of a `AttentionWrapper`.
 
   Contains:
@@ -366,7 +366,7 @@ class AttentionWrapperState(
     - `cell_state`: The state of the wrapped `RNNCell`.
     - `attention`: The attention emitted at the previous time step.
     - `time`: int32 scalar containing the current time step.
-    - `attention_history`: (if enabled) a `TensorArray` containing attention
+    - `alignment_history`: (if enabled) a `TensorArray` containing alignment
        matrices from all time steps.  Call `stack()` to convert to a `Tensor`.
   """
 
@@ -420,7 +420,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
                cell,
                attention_mechanism,
                attention_size,
-               attention_history=False,
+               alignment_history=False,
                cell_input_fn=None,
                probability_fn=None,
                output_attention=True,
@@ -432,7 +432,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       attention_mechanism: An instance of `AttentionMechanism`.
       attention_size: Python integer, the depth of the attention (output)
         tensor.
-      attention_history: Python boolean, whether to store attention history
+      alignment_history: Python boolean, whether to store alignment history
         from all time steps in the final output state (currently stored as a
         time major `TensorArray` on which you must call `stack()`).
       cell_input_fn: (optional) A `callable`.  The default is:
@@ -480,7 +480,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     self._cell_input_fn = cell_input_fn
     self._probability_fn = probability_fn
     self._output_attention = output_attention
-    self._attention_history = attention_history
+    self._alignment_history = alignment_history
 
   @property
   def output_size(self):
@@ -495,21 +495,21 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         cell_state=self._cell.state_size,
         time=tensor_shape.TensorShape([]),
         attention=self._attention_size,
-        attention_history=())  # attention_history is sometimes a TensorArray
+        alignment_history=())  # alignment_history is sometimes a TensorArray
 
   def zero_state(self, batch_size, dtype):
     with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
-      if self._attention_history:
-        attention_history = tensor_array_ops.TensorArray(
+      if self._alignment_history:
+        alignment_history = tensor_array_ops.TensorArray(
             dtype=dtype, size=0, dynamic_size=True)
       else:
-        attention_history = ()
+        alignment_history = ()
       return AttentionWrapperState(
           cell_state=self._cell.zero_state(batch_size, dtype),
           time=array_ops.zeros([], dtype=dtypes.int32),
-          attention=_zero_state_tensors(
-              self._attention_size, batch_size, dtype),
-          attention_history=attention_history)
+          attention=_zero_state_tensors(self._attention_size, batch_size,
+                                        dtype),
+          alignment_history=alignment_history)
 
   def __call__(self, inputs, state, scope=None):
     """Perform a step of attention-wrapped RNN.
@@ -557,7 +557,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       alignments = self._probability_fn(score)
 
       # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
-      alignments = array_ops.expand_dims(alignments, 1)
+      expanded_alignments = array_ops.expand_dims(alignments, 1)
       # Context is the inner product of alignments and values along the
       # memory time dimension.
       # alignments shape is
@@ -567,22 +567,24 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       # the batched matmul is over memory_time, so the output shape is
       #   [batch_size, 1, attention_mechanism.num_units].
       # we then squeeze out the singleton dim.
-      context = math_ops.matmul(alignments, self._attention_mechanism.values)
+      context = math_ops.matmul(expanded_alignments,
+                                self._attention_mechanism.values)
       context = array_ops.squeeze(context, [1])
 
       attention = self._attention_layer(
           array_ops.concat([cell_output, context], 1))
 
-      if self._attention_history:
-        attention_history = state.attention_history.write(state.time, attention)
+      if self._alignment_history:
+        alignment_history = state.alignment_history.write(
+            state.time, alignments)
       else:
-        attention_history = ()
+        alignment_history = ()
 
       next_state = AttentionWrapperState(
           time=state.time + 1,
           cell_state=next_cell_state,
           attention=attention,
-          attention_history=attention_history)
+          alignment_history=alignment_history)
 
     if self._output_attention:
       return attention, next_state
-- 
GitLab


From ace2aa7b6f1381163d8187f1bf78b393cef4701f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 15:59:20 -0800
Subject: [PATCH 0289/1563] Add option to return loss as batch sum, or divided
 by number of non-zero weights. Change: 152754313

---
 tensorflow/python/kernel_tests/losses_test.py |  88 ++++++-----
 tensorflow/python/ops/losses/losses.py        |   1 +
 tensorflow/python/ops/losses/losses_impl.py   | 143 +++++++++++-------
 .../golden/tensorflow.losses.-reduction.pbtxt |  24 +++
 .../tools/api/golden/tensorflow.losses.pbtxt  |  22 +--
 5 files changed, 179 insertions(+), 99 deletions(-)
 create mode 100644 tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt

diff --git a/tensorflow/python/kernel_tests/losses_test.py b/tensorflow/python/kernel_tests/losses_test.py
index f94561b48e..983808710e 100644
--- a/tensorflow/python/kernel_tests/losses_test.py
+++ b/tensorflow/python/kernel_tests/losses_test.py
@@ -1188,27 +1188,40 @@ class ComputeWeightedLossTest(test.TestCase):
           next_loss += 1.0
     raw_losses.setflags(write=False)
     self._raw_losses = raw_losses
-    self._unweighted_loss = np.mean(self._raw_losses)
 
   def testUnweighted(self):
-    with ops.Graph().as_default():
-      self.assertEqual(0, len(util.get_losses()))
-      raw_losses = self._raw_losses
-      unweighted_losses = (
-          losses.compute_weighted_loss(raw_losses),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones((1, 1, 1))),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones((1, 1, 4))),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones((1, 2, 1))),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones((1, 2, 4))),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones((3, 1, 1))),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones((3, 1, 4))),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones((3, 2, 1))),
-          losses.compute_weighted_loss(raw_losses, weights=np.ones(self._shape))
-      )
-      self.assertEqual(9, len(util.get_losses()))
-      with self.test_session():
-        for unweighted_loss in unweighted_losses:
-          self.assertAllClose(self._unweighted_loss, unweighted_loss.eval())
+    for reduction in losses.Reduction.all():
+      with ops.Graph().as_default() as g:
+        self.assertEqual(0, len(util.get_losses()))
+        raw_losses = self._raw_losses
+        unweighted_losses = (
+            losses.compute_weighted_loss(raw_losses, reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones((1, 1, 1)), reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones((1, 1, 4)), reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones((1, 2, 1)), reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones((1, 2, 4)), reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones((3, 1, 1)), reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones((3, 1, 4)), reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones((3, 2, 1)), reduction=reduction),
+            losses.compute_weighted_loss(
+                raw_losses, weights=np.ones(self._shape), reduction=reduction)
+        )
+        self.assertEqual(9, len(util.get_losses()))
+        with self.test_session(g):
+          for unweighted_loss in unweighted_losses:
+            if reduction == losses.Reduction.WEIGHTED_SUM:
+              self.assertAllClose(
+                  np.sum(self._raw_losses), unweighted_loss.eval())
+            else:  # losses.Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS
+              self.assertAllClose(
+                  np.mean(self._raw_losses), unweighted_loss.eval())
 
   def testScalarWeight(self):
     with ops.Graph().as_default():
@@ -1281,15 +1294,22 @@ class ComputeWeightedLossTest(test.TestCase):
     self._test_invalid_weights((17.0,),)
 
   def _test_valid_weights(self, weights):
-    with ops.Graph().as_default():
-      self.assertEqual(0, len(util.get_losses()))
-      weighted_loss = losses.compute_weighted_loss(
-          self._raw_losses, weights=weights)
-      self.assertEqual(1, len(util.get_losses()))
-      with self.test_session():
-        self.assertAllClose(
-            np.mean(weights * self._raw_losses),
-            weighted_loss.eval())
+    for reduction in losses.Reduction.all():
+      with ops.Graph().as_default() as g:
+        self.assertEqual(0, len(util.get_losses()))
+        weighted_loss = losses.compute_weighted_loss(
+            self._raw_losses, weights=weights, reduction=reduction)
+        self.assertEqual(1, len(util.get_losses()))
+        with self.test_session(g):
+          weighted_losses = weights * self._raw_losses
+          weighted_sum = np.sum(weighted_losses)
+          if reduction == losses.Reduction.WEIGHTED_SUM:
+            self.assertAllClose(weighted_sum, weighted_loss.eval())
+          else:  # losses.Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS
+            broadcast_weights = weights * np.ones_like(self._raw_losses)
+            self.assertAllClose(
+                weighted_sum / np.count_nonzero(broadcast_weights),
+                weighted_loss.eval())
 
   def test1x1x1Weight(self):
     self._test_valid_weights((((17.0,),),))
@@ -1298,7 +1318,7 @@ class ComputeWeightedLossTest(test.TestCase):
     self._test_valid_weights((((17.0,), (3.0,),),))
 
   def test1x1x4Weight(self):
-    self._test_valid_weights((((17.0, 13.0, 2.0, 5.0),),))
+    self._test_valid_weights((((17.0, 0.0, 2.0, 5.0),),))
 
   def test3x1x1Weight(self):
     self._test_valid_weights((((17.0,),), ((5.0,),), ((2.0,),),))
@@ -1312,22 +1332,22 @@ class ComputeWeightedLossTest(test.TestCase):
 
   def test3x1x4Weight(self):
     self._test_valid_weights((
-        ((17.0, 13.0, 2.0, 5.0),),
+        ((17.0, 0.0, 2.0, 5.0),),
         ((5.0, 31.0, 17.0, 5.0),),
         ((7.0, 3.0, 11.0, 5.0),),
     ))
 
   def test1x2x4Weight(self):
     self._test_valid_weights(((
-        (17.0, 13.0, 2.0, 5.0),
+        (17.0, 0.0, 2.0, 5.0),
         (3.0, 13.0, 11.0, 2.0),
     ),))
 
   def test3x2x4Weight(self):
     self._test_valid_weights((
-        ((17.0, 13.0, 2.0, 5.0), (3.0, 13.0, 11.0, 2.0),),
-        ((5.0, 31.0, 17.0, 5.0), (13.0, 3.0, 1.0, 11.0),),
-        ((7.0, 3.0, 11.0, 5.0), (13.0, 11.0, 1.0, 7.0),),
+        ((17.0, 0.0, 2.0, 5.0), (3.0, 13.0, 11.0, 2.0),),
+        ((5.0, 31.0, 17.0, 5.0), (13.0, 3.0, 0.0, 11.0),),
+        ((0.0, 3.0, 11.0, 5.0), (13.0, 11.0, 1.0, 7.0),),
     ))
 
 
diff --git a/tensorflow/python/ops/losses/losses.py b/tensorflow/python/ops/losses/losses.py
index 28f004228d..f93ee9fca5 100644
--- a/tensorflow/python/ops/losses/losses.py
+++ b/tensorflow/python/ops/losses/losses.py
@@ -16,6 +16,7 @@
 
 Note: All the losses are added to the `GraphKeys.LOSSES` collection by default.
 
+@@Reduction
 @@absolute_difference
 @@compute_weighted_loss
 @@cosine_distance
diff --git a/tensorflow/python/ops/losses/losses_impl.py b/tensorflow/python/ops/losses/losses_impl.py
index 89daa9594a..717671f928 100644
--- a/tensorflow/python/ops/losses/losses_impl.py
+++ b/tensorflow/python/ops/losses/losses_impl.py
@@ -29,27 +29,24 @@ from tensorflow.python.ops import weights_broadcast_ops
 from tensorflow.python.ops.losses import util
 
 
-def _scale_losses(losses, weights):
-  """Computes the scaled loss.
+# TODO(ptucker): Per-example? Divided by batch_size? Divided by sum of weights?
+class Reduction(object):
+  """Types of loss reduction."""
 
-  Args:
-    losses: `Tensor` of shape `[batch_size, d1, ... dN]`.
-    weights: `Tensor` of shape `[]`, `[batch_size]` or
-      `[batch_size, d1, ... dN]`. The `losses` are reduced (`tf.reduce_sum`)
-      until its dimension matches that of `weights` at which point the reduced
-      `losses` are element-wise multiplied by `weights` and a final `reduce_sum`
-      is computed on the result. Conceptually, this operation is similar to
-      broadcasting (tiling) `weights` to be the same shape as `losses`,
-      performing an element-wise multiplication, and summing the result. Note,
-      however, that the dimension matching is right-to-left, not left-to-right;
-      i.e., the opposite of standard NumPy/Tensorflow broadcasting.
+  # Batch sum of weighted losses.
+  WEIGHTED_SUM = "weighted_sum"
 
-  Returns:
-    A scalar tf.float32 `Tensor` whose value represents the sum of the scaled
-      `losses`.
-  """
-  weighted_losses = math_ops.multiply(losses, weights)
-  return math_ops.reduce_sum(weighted_losses)
+  # `WEIGHTED_SUM` divided by number of non-zero weights.
+  WEIGHTED_SUM_BY_NONZERO_WEIGHTS = "weighted_sum_by_nonzero_weights"
+
+  @classmethod
+  def all(cls):
+    return (cls.WEIGHTED_SUM, cls.WEIGHTED_SUM_BY_NONZERO_WEIGHTS)
+
+  @classmethod
+  def validate(cls, key):
+    if key not in cls.all():
+      raise ValueError("Invalid ReductionKey %s." % key)
 
 
 def _safe_div(numerator, denominator, name="value"):
@@ -129,7 +126,8 @@ def _num_present(losses, weights, per_batch=False):
 
 
 def compute_weighted_loss(
-    losses, weights=1.0, scope=None, loss_collection=ops.GraphKeys.LOSSES):
+    losses, weights=1.0, scope=None, loss_collection=ops.GraphKeys.LOSSES,
+    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Computes the weighted loss.
 
   Args:
@@ -139,6 +137,7 @@ def compute_weighted_loss(
       be either `1`, or the same as the corresponding `losses` dimension).
     scope: the scope for the operations performed in computing the loss.
     loss_collection: the loss will be added to these collections.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
     A scalar `Tensor` that returns the weighted loss.
@@ -148,6 +147,7 @@ def compute_weighted_loss(
       `losses`, or if the number of dimensions (rank) of either `losses` or
       `weights` is missing.
   """
+  Reduction.validate(reduction)
   with ops.name_scope(scope, "weighted_loss", (losses, weights)):
     with ops.control_dependencies((
         weights_broadcast_ops.assert_broadcastable(weights, losses),)):
@@ -155,18 +155,21 @@ def compute_weighted_loss(
       input_dtype = losses.dtype
       losses = math_ops.to_float(losses)
       weights = math_ops.to_float(weights)
-      total_loss = _scale_losses(losses, weights)
-      num_present = _num_present(losses, weights)
-      mean_loss = _safe_mean(total_loss, num_present)
+      weighted_losses = math_ops.multiply(losses, weights)
+      loss = math_ops.reduce_sum(weighted_losses)
+      if reduction == Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS:
+        loss = _safe_mean(loss, _num_present(losses, weights))
+
       # Convert the result back to the input type.
-      mean_loss = math_ops.cast(mean_loss, input_dtype)
-      util.add_loss(mean_loss, loss_collection)
-      return mean_loss
+      loss = math_ops.cast(loss, input_dtype)
+      util.add_loss(loss, loss_collection)
+      return loss
 
 
 def absolute_difference(
     labels, predictions, weights=1.0, scope=None,
-    loss_collection=ops.GraphKeys.LOSSES):
+    loss_collection=ops.GraphKeys.LOSSES,
+    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Adds an Absolute Difference loss to the training procedure.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided, then
@@ -185,9 +188,10 @@ def absolute_difference(
       be either `1`, or the same as the corresponding `losses` dimension).
     scope: The scope for the operations performed in computing the loss.
     loss_collection: collection to which this loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` representing the loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -199,12 +203,14 @@ def absolute_difference(
     labels = math_ops.to_float(labels)
     predictions.get_shape().assert_is_compatible_with(labels.get_shape())
     losses = math_ops.abs(math_ops.subtract(predictions, labels))
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
 
 
 def cosine_distance(
     labels, predictions, dim=None, weights=1.0, scope=None,
-    loss_collection=ops.GraphKeys.LOSSES):
+    loss_collection=ops.GraphKeys.LOSSES,
+    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Adds a cosine-distance loss to the training procedure.
 
   Note that the function assumes that `predictions` and `labels` are already
@@ -219,9 +225,10 @@ def cosine_distance(
       be either `1`, or the same as the corresponding `losses` dimension).
     scope: The scope for the operations performed in computing the loss.
     loss_collection: collection to which this loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` representing the loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If `predictions` shape doesn't match `labels` shape, or
@@ -237,11 +244,13 @@ def cosine_distance(
 
     radial_diffs = math_ops.multiply(predictions, labels)
     losses = 1 - math_ops.reduce_sum(radial_diffs, axis=(dim,), keep_dims=True)
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
 
 
 def hinge_loss(labels, logits, weights=1.0, scope=None,
-               loss_collection=ops.GraphKeys.LOSSES):
+               loss_collection=ops.GraphKeys.LOSSES,
+               reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Adds a hinge loss to the training procedure.
 
   Args:
@@ -253,9 +262,10 @@ def hinge_loss(labels, logits, weights=1.0, scope=None,
       be either `1`, or the same as the corresponding `losses` dimension).
     scope: The scope for the operations performed in computing the loss.
     loss_collection: collection to which the loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` of the loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shapes of `logits` and `labels` don't match.
@@ -269,11 +279,13 @@ def hinge_loss(labels, logits, weights=1.0, scope=None,
     labels = math_ops.subtract(2 * labels, all_ones)
     losses = nn_ops.relu(
         math_ops.subtract(all_ones, math_ops.multiply(labels, logits)))
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
 
 
 def log_loss(labels, predictions, weights=1.0, epsilon=1e-7, scope=None,
-             loss_collection=ops.GraphKeys.LOSSES):
+             loss_collection=ops.GraphKeys.LOSSES,
+             reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Adds a Log Loss term to the training procedure.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided, then
@@ -293,9 +305,10 @@ def log_loss(labels, predictions, weights=1.0, epsilon=1e-7, scope=None,
     epsilon: A small increment to add to avoid taking a log of zero.
     scope: The scope for the operations performed in computing the loss.
     loss_collection: collection to which the loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` representing the loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -310,11 +323,14 @@ def log_loss(labels, predictions, weights=1.0, epsilon=1e-7, scope=None,
         labels,
         math_ops.log(predictions + epsilon)) - math_ops.multiply(
             (1 - labels), math_ops.log(1 - predictions + epsilon))
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
 
 
-def mean_pairwise_squared_error(labels, predictions, weights=1.0, scope=None,
-                                loss_collection=ops.GraphKeys.LOSSES):
+# TODO(b/37208492): Add reduction arg.
+def mean_pairwise_squared_error(
+    labels, predictions, weights=1.0, scope=None,
+    loss_collection=ops.GraphKeys.LOSSES):
   """Adds a pairwise-errors-squared loss to the training procedure.
 
   Unlike `mean_squared_error`, which is a measure of the differences between
@@ -349,7 +365,7 @@ def mean_pairwise_squared_error(labels, predictions, weights=1.0, scope=None,
     loss_collection: collection to which the loss will be added.
 
   Returns:
-    A scalar `Tensor` representing the loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -381,7 +397,8 @@ def mean_pairwise_squared_error(labels, predictions, weights=1.0, scope=None,
       term2 = 2.0 * _safe_div(math_ops.square(sum_diff),
                               math_ops.square(num_present_per_batch))
 
-      loss = _scale_losses(term1 - term2, weights)
+      weighted_losses = math_ops.multiply(term1 - term2, weights)
+      loss = math_ops.reduce_sum(weighted_losses)
 
       mean_loss = array_ops.where(
           math_ops.reduce_sum(num_present_per_batch) > 0,
@@ -392,8 +409,10 @@ def mean_pairwise_squared_error(labels, predictions, weights=1.0, scope=None,
       return mean_loss
 
 
-def mean_squared_error(labels, predictions, weights=1.0, scope=None,
-                       loss_collection=ops.GraphKeys.LOSSES):
+def mean_squared_error(
+    labels, predictions, weights=1.0, scope=None,
+    loss_collection=ops.GraphKeys.LOSSES,
+    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Adds a Sum-of-Squares loss to the training procedure.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided, then
@@ -412,9 +431,10 @@ def mean_squared_error(labels, predictions, weights=1.0, scope=None,
       be either `1`, or the same as the corresponding `losses` dimension).
     scope: The scope for the operations performed in computing the loss.
     loss_collection: collection to which the loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` representing the loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -426,12 +446,14 @@ def mean_squared_error(labels, predictions, weights=1.0, scope=None,
     labels = math_ops.to_float(labels)
     predictions.get_shape().assert_is_compatible_with(labels.get_shape())
     losses = math_ops.square(math_ops.subtract(predictions, labels))
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
 
 
 def sigmoid_cross_entropy(
     multi_class_labels, logits, weights=1.0, label_smoothing=0, scope=None,
-    loss_collection=ops.GraphKeys.LOSSES):
+    loss_collection=ops.GraphKeys.LOSSES,
+    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Creates a cross-entropy loss using tf.nn.sigmoid_cross_entropy_with_logits.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided,
@@ -454,9 +476,10 @@ def sigmoid_cross_entropy(
     label_smoothing: If greater than `0` then smooth the labels.
     scope: The scope for the operations performed in computing the loss.
     loss_collection: collection to which the loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` representing the loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shape of `logits` doesn't match that of
@@ -476,12 +499,14 @@ def sigmoid_cross_entropy(
     losses = nn.sigmoid_cross_entropy_with_logits(labels=multi_class_labels,
                                                   logits=logits,
                                                   name="xentropy")
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
 
 
 def softmax_cross_entropy(
     onehot_labels, logits, weights=1.0, label_smoothing=0, scope=None,
-    loss_collection=ops.GraphKeys.LOSSES):
+    loss_collection=ops.GraphKeys.LOSSES,
+    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Creates a cross-entropy loss using tf.nn.softmax_cross_entropy_with_logits.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided,
@@ -503,9 +528,10 @@ def softmax_cross_entropy(
     label_smoothing: If greater than 0 then smooth the labels.
     scope: the scope for the operations performed in computing the loss.
     loss_collection: collection to which the loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` representing the mean loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shape of `logits` doesn't match that of `onehot_labels`
@@ -527,7 +553,8 @@ def softmax_cross_entropy(
     losses = nn.softmax_cross_entropy_with_logits(labels=onehot_labels,
                                                   logits=logits,
                                                   name="xentropy")
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
 
 
 # TODO(ptucker): Merge this with similar method in metrics_impl.
@@ -581,8 +608,10 @@ def _remove_squeezable_dimensions(
   return labels, predictions, weights
 
 
-def sparse_softmax_cross_entropy(labels, logits, weights=1.0, scope=None,
-                                 loss_collection=ops.GraphKeys.LOSSES):
+def sparse_softmax_cross_entropy(
+    labels, logits, weights=1.0, scope=None,
+    loss_collection=ops.GraphKeys.LOSSES,
+    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
   """Cross-entropy loss using `tf.nn.sparse_softmax_cross_entropy_with_logits`.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided,
@@ -602,9 +631,10 @@ def sparse_softmax_cross_entropy(labels, logits, weights=1.0, scope=None,
       `labels`
     scope: the scope for the operations performed in computing the loss.
     loss_collection: collection to which the loss will be added.
+    reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` representing the mean loss value.
+    A scalar `Tensor` that returns the weighted loss.
 
   Raises:
     ValueError: If the shapes of logits, labels, and weight are incompatible, or
@@ -620,4 +650,5 @@ def sparse_softmax_cross_entropy(labels, logits, weights=1.0, scope=None,
     losses = nn.sparse_softmax_cross_entropy_with_logits(labels=labels,
                                                          logits=logits,
                                                          name="xentropy")
-    return compute_weighted_loss(losses, weights, scope, loss_collection)
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt
new file mode 100644
index 0000000000..f2fc1f003e
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt
@@ -0,0 +1,24 @@
+path: "tensorflow.losses.Reduction"
+tf_class {
+  is_instance: "<class \'tensorflow.python.ops.losses.losses_impl.Reduction\'>"
+  is_instance: "<type \'object\'>"
+  member {
+    name: "WEIGHTED_SUM"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "WEIGHTED_SUM_BY_NONZERO_WEIGHTS"
+    mtype: "<type \'str\'>"
+  }
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "all"
+    argspec: "args=[\'cls\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "validate"
+    argspec: "args=[\'cls\', \'key\'], varargs=None, keywords=None, defaults=None"
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
index 5477ac5817..ff58644ebd 100644
--- a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
@@ -1,8 +1,12 @@
 path: "tensorflow.losses"
 tf_module {
+  member {
+    name: "Reduction"
+    mtype: "<type \'type\'>"
+  }
   member_method {
     name: "absolute_difference"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "add_loss"
@@ -10,11 +14,11 @@ tf_module {
   }
   member_method {
     name: "compute_weighted_loss"
-    argspec: "args=[\'losses\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+    argspec: "args=[\'losses\', \'weights\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "cosine_distance"
-    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'None\', \'1.0\', \'None\', \'losses\'], "
+    argspec: "args=[\'labels\', \'predictions\', \'dim\', \'weights\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'None\', \'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "get_losses"
@@ -34,11 +38,11 @@ tf_module {
   }
   member_method {
     name: "hinge_loss"
-    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "log_loss"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'epsilon\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1e-07\', \'None\', \'losses\'], "
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'epsilon\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1e-07\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "mean_pairwise_squared_error"
@@ -46,18 +50,18 @@ tf_module {
   }
   member_method {
     name: "mean_squared_error"
-    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "sigmoid_cross_entropy"
-    argspec: "args=[\'multi_class_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+    argspec: "args=[\'multi_class_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "softmax_cross_entropy"
-    argspec: "args=[\'onehot_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\'], "
+    argspec: "args=[\'onehot_labels\', \'logits\', \'weights\', \'label_smoothing\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
   member_method {
     name: "sparse_softmax_cross_entropy"
-    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\'], "
+    argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
 }
-- 
GitLab


From 2f5fde8dd977681110714a0564445a406506282c Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Mon, 10 Apr 2017 16:13:55 -0800
Subject: [PATCH 0290/1563] Add tf.concat GPU kernels for complex64/complex128.

Also update concat_op_test to always use_gpu=True where previously it was running each test twice.
Change: 152755973
---
 tensorflow/core/kernels/concat_lib_gpu.cc     |   2 +
 .../core/kernels/concat_lib_gpu_impl.cu.cc    |   8 +
 tensorflow/core/kernels/concat_op.cc          |   2 +
 .../python/kernel_tests/concat_op_test.py     | 138 ++++++++----------
 4 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/tensorflow/core/kernels/concat_lib_gpu.cc b/tensorflow/core/kernels/concat_lib_gpu.cc
index 592621c52a..cd0414ef40 100644
--- a/tensorflow/core/kernels/concat_lib_gpu.cc
+++ b/tensorflow/core/kernels/concat_lib_gpu.cc
@@ -113,6 +113,8 @@ void ConcatGPU(
       Tensor* output, typename TTypes<T, 2>::Tensor* output_flat);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER);
+TF_CALL_complex64(REGISTER);
+TF_CALL_complex128(REGISTER);
 REGISTER(bfloat16);
 
 #undef REGISTER
diff --git a/tensorflow/core/kernels/concat_lib_gpu_impl.cu.cc b/tensorflow/core/kernels/concat_lib_gpu_impl.cu.cc
index 019d6b6ab2..3ed6241b7a 100644
--- a/tensorflow/core/kernels/concat_lib_gpu_impl.cu.cc
+++ b/tensorflow/core/kernels/concat_lib_gpu_impl.cu.cc
@@ -198,15 +198,23 @@ void ConcatGPUImpl(const Eigen::GpuDevice& gpu_device,
       int split_size, typename TTypes<T, 2>::Matrix* output);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPUCONCAT32);
+TF_CALL_complex64(REGISTER_GPUCONCAT32);
+TF_CALL_complex128(REGISTER_GPUCONCAT32);
 REGISTER_GPUCONCAT32(bfloat16);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPUCONCAT64);
+TF_CALL_complex64(REGISTER_GPUCONCAT64);
+TF_CALL_complex128(REGISTER_GPUCONCAT64);
 REGISTER_GPUCONCAT64(bfloat16);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU32);
+TF_CALL_complex64(REGISTER_GPU32);
+TF_CALL_complex128(REGISTER_GPU32);
 REGISTER_GPU32(bfloat16);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU64);
+TF_CALL_complex64(REGISTER_GPU64);
+TF_CALL_complex128(REGISTER_GPU64);
 REGISTER_GPU64(bfloat16);
 
 #undef REGISTER_GPUCONCAT32
diff --git a/tensorflow/core/kernels/concat_op.cc b/tensorflow/core/kernels/concat_op.cc
index 9628a7efa4..916bbc4996 100644
--- a/tensorflow/core/kernels/concat_op.cc
+++ b/tensorflow/core/kernels/concat_op.cc
@@ -193,6 +193,8 @@ REGISTER_CONCAT(bfloat16);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
 REGISTER_GPU(bfloat16);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 #undef REGISTER_GPU
 
 // A special GPU kernel for int32.
diff --git a/tensorflow/python/kernel_tests/concat_op_test.py b/tensorflow/python/kernel_tests/concat_op_test.py
index a9cd0dd726..0bb5b55155 100644
--- a/tensorflow/python/kernel_tests/concat_op_test.py
+++ b/tensorflow/python/kernel_tests/concat_op_test.py
@@ -35,7 +35,7 @@ from tensorflow.python.platform import test
 class ConcatOpTest(test.TestCase):
 
   def testHStack(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       p1 = array_ops.placeholder(dtypes.float32, shape=[4, 4])
       p2 = array_ops.placeholder(dtypes.float32, shape=[4, 4])
       c = array_ops.concat([p1, p2], 0)
@@ -50,7 +50,7 @@ class ConcatOpTest(test.TestCase):
     self.assertAllEqual(result[4:, :], params[p2])
 
   def testVStack(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       p1 = array_ops.placeholder(dtypes.float32, shape=[4, 4])
       p2 = array_ops.placeholder(dtypes.float32, shape=[4, 4])
       c = array_ops.concat([p1, p2], 1)
@@ -76,7 +76,7 @@ class ConcatOpTest(test.TestCase):
     self.assertAllEqual(result[2:, :], p2)
 
   def testRefType(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       p1 = np.random.rand(4, 4).astype("f")
       p2 = np.random.rand(4, 4).astype("f")
       v1 = variables.Variable(p1)
@@ -89,7 +89,7 @@ class ConcatOpTest(test.TestCase):
     self.assertAllEqual(result[:4, :], p1)
     self.assertAllEqual(result[4:, :], p2)
 
-  def _testRandom(self, dtype, use_gpu=False):
+  def _testRandom(self, dtype):
     # Random dims of rank 5
     shape = np.random.randint(1, 5, size=5)
     # Random number of tensors, but always > 1.
@@ -101,7 +101,7 @@ class ConcatOpTest(test.TestCase):
       dtype_feed = dtypes.float32
     else:
       dtype_feed = dtype
-    with self.test_session(use_gpu=use_gpu):
+    with self.test_session(use_gpu=True):
       p = []
       for i in np.arange(num_tensors):
         input_shape = shape
@@ -139,11 +139,11 @@ class ConcatOpTest(test.TestCase):
 
   def testRandom(self):
     self._testRandom(dtypes.float32)
-    self._testRandom(dtypes.float32, use_gpu=True)
     self._testRandom(dtypes.int16)
-    self._testRandom(dtypes.int32, use_gpu=True)
+    self._testRandom(dtypes.int32)
     self._testRandom(dtypes.bfloat16)
-    self._testRandom(dtypes.bfloat16, use_gpu=True)
+    self._testRandom(dtypes.complex64)
+    self._testRandom(dtypes.complex128)
 
   def testInvalidConcatDimTypeAndShape(self):
     a = variables.Variable(constant_op.constant(1.0, shape=[1]))
@@ -166,38 +166,42 @@ class ConcatOpTest(test.TestCase):
     with self.assertRaises(ValueError):
       array_ops.concat(1, constant_op.constant(0, shape=[1]))
 
-  def _testGradientsSimple(self, use_gpu):
+  def _testGradientsSimple(self, dtype):
     # Test both positive and negative concat axis.
     # -2 and 1 correspond to the same axis for 3-dimensional tensors.
     for axis in [-2, 1]:
-      with self.test_session(use_gpu=use_gpu):
+      with self.test_session(use_gpu=True):
         inp = []
         inp_tensors = []
         for x in [1, 2, 6]:
           shape = [10, x, 2]
-          t = np.random.rand(*shape).astype("f")
+          t = np.random.rand(*shape).astype(dtype.as_numpy_dtype)
+          if dtype.is_complex:
+            t += -1j * t
           inp.append(t)
           inp_tensors.append(
               constant_op.constant(
-                  [float(y) for y in t.flatten()],
+                  t.flatten(),
                   shape=shape,
-                  dtype=dtypes.float32))
+                  dtype=dtype))
         c = array_ops.concat(inp_tensors, axis)
         output_shape = [10, 9, 2]
-        grad_inp = np.random.rand(*output_shape).astype("f")
+        grad_inp = np.random.rand(*output_shape).astype(dtype.as_numpy_dtype)
+        if dtype.is_complex:
+          grad_inp += -1j * grad_inp
         grad_tensor = constant_op.constant(
-            [float(x) for x in grad_inp.flatten()], shape=output_shape)
+            grad_inp.flatten(), shape=output_shape)
         grad = gradients_impl.gradients([c], inp_tensors, [grad_tensor])
         concated_grad = array_ops.concat(grad, axis)
         result = concated_grad.eval()
     self.assertAllEqual(result, grad_inp)
 
-  def testGradientsSimpleAll(self):
-    self._testGradientsSimple(use_gpu=True)
-    self._testGradientsSimple(use_gpu=False)
+  def testGradientsSimple(self):
+    self._testGradientsSimple(dtypes.float32)
+    self._testGradientsSimple(dtypes.complex64)
 
-  def _testGradientsFirstDim(self, use_gpu):
-    with self.test_session(use_gpu=use_gpu):
+  def testGradientsFirstDim(self):
+    with self.test_session(use_gpu=True):
       inp = []
       inp_tensors = []
       for x in [1, 2, 6]:
@@ -206,29 +210,25 @@ class ConcatOpTest(test.TestCase):
         inp.append(t)
         inp_tensors.append(
             constant_op.constant(
-                [float(y) for y in t.flatten()],
+                t.flatten(),
                 shape=shape,
                 dtype=dtypes.float32))
       c = array_ops.concat(inp_tensors, 0)
       output_shape = [9, 10, 2]
       grad_inp = np.random.rand(*output_shape).astype("f")
       grad_tensor = constant_op.constant(
-          [float(x) for x in grad_inp.flatten()], shape=output_shape)
+          grad_inp.flatten(), shape=output_shape)
       grad = gradients_impl.gradients([c], inp_tensors, [grad_tensor])
       concated_grad = array_ops.concat(grad, 0)
       result = concated_grad.eval()
 
     self.assertAllEqual(result, grad_inp)
 
-  def testGradientsFirstDimAll(self):
-    self._testGradientsFirstDim(use_gpu=False)
-    self._testGradientsFirstDim(use_gpu=True)
-
-  def _testGradientsLastDim(self, use_gpu):
+  def testGradientsLastDim(self):
     # Test both positive and negative concat axis.
     # -1 and 2 correspond to the same axis for 3-dimensional tensors.
     for axis in [-1, 2]:
-      with self.test_session(use_gpu=use_gpu):
+      with self.test_session(use_gpu=True):
         inp = []
         inp_tensors = []
         for x in [1, 2, 6]:
@@ -237,25 +237,21 @@ class ConcatOpTest(test.TestCase):
           inp.append(t)
           inp_tensors.append(
               constant_op.constant(
-                  [float(y) for y in t.flatten()],
+                  t.flatten(),
                   shape=shape,
                   dtype=dtypes.float32))
         c = array_ops.concat(inp_tensors, 2)
         output_shape = [10, 2, 9]
         grad_inp = np.random.rand(*output_shape).astype("f")
         grad_tensor = constant_op.constant(
-            [float(x) for x in grad_inp.flatten()], shape=output_shape)
+            grad_inp.flatten(), shape=output_shape)
         grad = gradients_impl.gradients([c], inp_tensors, [grad_tensor])
         concated_grad = array_ops.concat(grad, axis)
         result = concated_grad.eval()
 
     self.assertAllEqual(result, grad_inp)
 
-  def testGradientsLastDimAll(self):
-    self._testGradientsLastDim(use_gpu=False)
-    self._testGradientsLastDim(use_gpu=True)
-
-  def _RunAndVerifyGradientsRandom(self, use_gpu):
+  def _RunAndVerifyGradientsRandom(self):
     # Random dims of rank 5
     input_shape = np.random.randint(1, 5, size=5)
     # Random number of tensors
@@ -263,7 +259,7 @@ class ConcatOpTest(test.TestCase):
     # Random dim to concat on
     concat_dim = np.random.randint(5)
     concat_dim_sizes = np.random.randint(1, 5, size=num_tensors)
-    with self.test_session(use_gpu=use_gpu):
+    with self.test_session(use_gpu=True):
       inp = []
       inp_tensors = []
       for x in concat_dim_sizes:
@@ -272,16 +268,13 @@ class ConcatOpTest(test.TestCase):
         t = np.random.rand(*shape).astype("f")
         inp.append(t)
         inp_tensors.append(
-            constant_op.constant(
-                [float(y) for y in t.flatten()],
-                shape=shape,
-                dtype=dtypes.float32))
+            constant_op.constant(t.flatten(), shape=shape,
+                                 dtype=dtypes.float32))
       c = array_ops.concat(inp_tensors, concat_dim)
       output_shape = input_shape
       output_shape[concat_dim] = concat_dim_sizes.sum()
       grad_inp = np.random.rand(*output_shape).astype("f")
-      grad_tensor = constant_op.constant(
-          [float(x) for x in grad_inp.flatten()], shape=output_shape)
+      grad_tensor = constant_op.constant(grad_inp.flatten(), shape=output_shape)
       grad = gradients_impl.gradients([c], inp_tensors, [grad_tensor])
       concated_grad = array_ops.concat(grad, concat_dim)
       result = concated_grad.eval()
@@ -290,8 +283,7 @@ class ConcatOpTest(test.TestCase):
 
   def testGradientsRandom(self):
     for _ in range(5):
-      self._RunAndVerifyGradientsRandom(use_gpu=False)
-      self._RunAndVerifyGradientsRandom(use_gpu=True)
+      self._RunAndVerifyGradientsRandom()
 
   def testGradientWithUnknownInputDim(self):
     with self.test_session(use_gpu=True):
@@ -302,7 +294,7 @@ class ConcatOpTest(test.TestCase):
       output_shape = [10, 2, 9]
       grad_inp = np.random.rand(*output_shape).astype("f")
       grad_tensor = constant_op.constant(
-          [float(inp) for inp in grad_inp.flatten()], shape=output_shape)
+          grad_inp.flatten(), shape=output_shape)
 
       grad = gradients_impl.gradients([c], [x, y], [grad_tensor])
       concated_grad = array_ops.concat(grad, 2)
@@ -364,24 +356,23 @@ class ConcatOpTest(test.TestCase):
   def testZeroSize(self):
     # Verify that concat doesn't crash and burn for zero size inputs
     np.random.seed(7)
-    for use_gpu in False, True:
-      with self.test_session(use_gpu=use_gpu) as sess:
-        for shape0 in (), (2,):
-          axis = len(shape0)
-          for shape1 in (), (3,):
-            for n0 in 0, 1, 2:
-              for n1 in 0, 1, 2:
-                x0 = np.random.randn(*(shape0 + (n0,) + shape1))
-                x1 = np.random.randn(*(shape0 + (n1,) + shape1))
-                correct = np.concatenate([x0, x1], axis=axis)
-                # TODO(irving): Make tf.concat handle map, then drop list().
-                xs = list(map(constant_op.constant, [x0, x1]))
-                c = array_ops.concat(xs, axis)
-                self.assertAllEqual(c.eval(), correct)
-                # Check gradients
-                dc = np.random.randn(*c.get_shape().as_list())
-                dxs = sess.run(gradients_impl.gradients(c, xs, dc))
-                self.assertAllEqual(dc, np.concatenate(dxs, axis=axis))
+    with self.test_session(use_gpu=True) as sess:
+      for shape0 in (), (2,):
+        axis = len(shape0)
+        for shape1 in (), (3,):
+          for n0 in 0, 1, 2:
+            for n1 in 0, 1, 2:
+              x0 = np.random.randn(*(shape0 + (n0,) + shape1))
+              x1 = np.random.randn(*(shape0 + (n1,) + shape1))
+              correct = np.concatenate([x0, x1], axis=axis)
+              # TODO(irving): Make tf.concat handle map, then drop list().
+              xs = list(map(constant_op.constant, [x0, x1]))
+              c = array_ops.concat(xs, axis)
+              self.assertAllEqual(c.eval(), correct)
+              # Check gradients
+              dc = np.random.randn(*c.get_shape().as_list())
+              dxs = sess.run(gradients_impl.gradients(c, xs, dc))
+              self.assertAllEqual(dc, np.concatenate(dxs, axis=axis))
 
   def testTensorConcatDim0Grad(self):
     x_shapes = [[20, 7, 3], [10, 7, 3], [14, 7, 3]]
@@ -565,7 +556,7 @@ class ConcatOpTest(test.TestCase):
       c = array_ops.concat(inp_tensors, axis)
       grad_inp = np.random.rand(*output_shape).astype("f")
       grad_tensor = constant_op.constant(
-          [float(x) for x in grad_inp.flatten()], shape=output_shape)
+          grad_inp.flatten(), shape=output_shape)
       grad = gradients_impl.gradients([c], inp_tensors, [grad_tensor])
       concated_grad = array_ops.concat(grad, axis)
       result = concated_grad.eval(feed_dict=feed_dict)
@@ -578,7 +569,7 @@ class ConcatOpTest(test.TestCase):
           array_ops.concat(inp_tensors, axis), gather_indexes)
       grad_inp = np.random.rand(*output_shape).astype("f")
       grad_tensor = constant_op.constant(
-          [float(x) for x in grad_inp.flatten()], shape=output_shape)
+          grad_inp.flatten(), shape=output_shape)
       grad = gradients_impl.gradients([c], inp_tensors, [grad_tensor])
       concated_grad = array_ops.gather(
           array_ops.concat(grad, axis), gather_indexes)
@@ -617,15 +608,14 @@ class ConcatOpTest(test.TestCase):
 class ConcatOffsetTest(test.TestCase):
 
   def testBasic(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu) as sess:
-        cdim = constant_op.constant(1, dtypes.int32)
-        s0 = constant_op.constant([2, 3, 5], dtypes.int32)
-        s1 = constant_op.constant([2, 7, 5], dtypes.int32)
-        s2 = constant_op.constant([2, 20, 5], dtypes.int32)
-        off = gen_array_ops._concat_offset(cdim, [s0, s1, s2])
-        ans = sess.run(off)
-        self.assertAllEqual(ans, [[0, 0, 0], [0, 3, 0], [0, 10, 0]])
+    with self.test_session(use_gpu=True) as sess:
+      cdim = constant_op.constant(1, dtypes.int32)
+      s0 = constant_op.constant([2, 3, 5], dtypes.int32)
+      s1 = constant_op.constant([2, 7, 5], dtypes.int32)
+      s2 = constant_op.constant([2, 20, 5], dtypes.int32)
+      off = gen_array_ops._concat_offset(cdim, [s0, s1, s2])
+      ans = sess.run(off)
+      self.assertAllEqual(ans, [[0, 0, 0], [0, 3, 0], [0, 10, 0]])
 
   def testNotVector(self):
     with self.test_session() as sess:
-- 
GitLab


From 72c023d3967a3218cd3d830ce6e57f7c4d87a18c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 16:17:44 -0800
Subject: [PATCH 0291/1563] Add support for solvers based on the Nvidia
 cuSolver library. Implement a GPU version of tf.cholesky as a first example.
 Change: 152756373

---
 .../kernel_tests/operator_pd_full_test.py     |   2 +-
 .../python/kernel_tests/wishart_test.py       |   2 +-
 tensorflow/core/kernels/BUILD                 |  23 ++-
 tensorflow/core/kernels/cholesky_op.cc        |  88 +++++++-
 tensorflow/core/kernels/cuda_solvers.cc       | 190 ++++++++++++++++++
 tensorflow/core/kernels/cuda_solvers.h        | 178 ++++++++++++++++
 tensorflow/core/kernels/linalg_ops_common.cc  |   8 +
 tensorflow/core/kernels/linalg_ops_common.h   |  45 ++++-
 .../python/kernel_tests/cholesky_op_test.py   |  15 +-
 third_party/gpus/cuda/BUILD.tpl               |  10 +
 third_party/gpus/cuda_configure.bzl           |   7 +
 11 files changed, 546 insertions(+), 22 deletions(-)
 create mode 100644 tensorflow/core/kernels/cuda_solvers.cc
 create mode 100644 tensorflow/core/kernels/cuda_solvers.h

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_full_test.py b/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_full_test.py
index dd59c649e1..35a7c7e603 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_full_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_full_test.py
@@ -47,7 +47,7 @@ class OperatorPDFullTest(test.TestCase):
       operator = operator_pd_full.OperatorPDFull(matrix, verify_pd=True)
       # Could fail inside Cholesky decomposition, or later when we test the
       # diag.
-      with self.assertRaisesOpError("x > 0|LLT"):
+      with self.assertRaisesOpError("x > 0|Cholesky"):
         operator.to_dense().eval()
 
   def testNonSymmetricMatrixRaises(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/wishart_test.py b/tensorflow/contrib/distributions/python/kernel_tests/wishart_test.py
index 1fa6ca0906..d9dc978f23 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/wishart_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/wishart_test.py
@@ -339,7 +339,7 @@ class WishartCholeskyTest(test.TestCase):
                             chol_scale_deferred: chol_scale})
 
       with self.assertRaisesRegexp(errors_impl.InvalidArgumentError,
-                                   "LLT decomposition was not successful"):
+                                   "Cholesky decomposition was not successful"):
         chol_w = distributions.WishartFull(
             df=df_deferred, scale=chol_scale_deferred)
         # np.ones((3, 3)) is not positive, definite.
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 0778821cc8..72136c3ae9 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -41,6 +41,7 @@ load(
     "//third_party/mkl:build_defs.bzl",
     "if_mkl",
 )
+load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
 
 config_setting(
     # Add "--define tensorflow_xsmm=1" to your build command to use libxsmm for
@@ -1972,6 +1973,23 @@ cc_library(
     ],
 )
 
+tf_kernel_library(
+    name = "cuda_solvers",
+    srcs = ["cuda_solvers.cc"],
+    hdrs = ["cuda_solvers.h"],
+    # @local_config_cuda//cuda:cusolver, //third_party/eigen3:blas,
+    # and //third_party/libf2c all contain various parts of BLAS, LAPACK,
+    # and f2c helper functions in global namespace. Tell the compiler to
+    # allow multiple definitions when linking this.
+    linkopts = ["-Wl,-zmuldefs"],
+    visibility = ["//visibility:private"],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "@local_config_cuda//cuda:cusolver",
+    ],
+)
+
 LINALG_DEPS = [
     ":linalg_ops_common",
     "//third_party/eigen3",
@@ -1983,7 +2001,10 @@ LINALG_DEPS = [
 tf_kernel_library(
     name = "cholesky_op",
     prefix = "cholesky_op",
-    deps = LINALG_DEPS,
+    deps = if_cuda([
+        ":cuda_solvers",
+        ":matrix_band_part_op",
+    ]) + LINALG_DEPS,
 )
 
 tf_kernel_library(
diff --git a/tensorflow/core/kernels/cholesky_op.cc b/tensorflow/core/kernels/cholesky_op.cc
index e5bf164cfa..2e33170d27 100644
--- a/tensorflow/core/kernels/cholesky_op.cc
+++ b/tensorflow/core/kernels/cholesky_op.cc
@@ -16,31 +16,40 @@ limitations under the License.
 // See docs in ../ops/linalg_ops.cc.
 // TODO(konstantinos): Enable complex inputs. This will require additional tests
 //                     and OP_REQUIRES.
+#if GOOGLE_CUDA
+#define EIGEN_USE_GPU
+#endif  // GOOGLE_CUDA
 
 #include "third_party/eigen3/Eigen/Cholesky"
 #include "third_party/eigen3/Eigen/Core"
 #include "tensorflow/core/framework/kernel_def_builder.h"
 #include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/kernels/linalg_ops_common.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/types.h"
 
+#if GOOGLE_CUDA
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/kernels/cuda_solvers.h"
+#include "tensorflow/core/kernels/matrix_band_part_op.h"
+#include "tensorflow/core/platform/stream_executor.h"
+#endif
+
 namespace tensorflow {
 
+static const char kErrMsg[] =
+    "Cholesky decomposition was not successful. The input might not be valid.";
+
 template <class Scalar>
 class CholeskyOp : public LinearAlgebraOp<Scalar> {
  public:
-  typedef LinearAlgebraOp<Scalar> Base;
+  INHERIT_LINALG_TYPEDEFS(Scalar);
 
   explicit CholeskyOp(OpKernelConstruction* context) : Base(context) {}
 
-  using Matrix = typename Base::Matrix;
-  using MatrixMaps = typename Base::MatrixMaps;
-  using ConstMatrixMap = typename Base::ConstMatrixMap;
-  using ConstMatrixMaps = typename Base::ConstMatrixMaps;
-
   void ComputeMatrix(OpKernelContext* context, const ConstMatrixMaps& inputs,
                      MatrixMaps* outputs) final {
     const ConstMatrixMap& input = inputs[0];
@@ -60,11 +69,74 @@ class CholeskyOp : public LinearAlgebraOp<Scalar> {
     outputs->at(0) = llt_decomposition.matrixL();
 
     OP_REQUIRES(context, llt_decomposition.info() == Eigen::Success,
-                errors::InvalidArgument("LLT decomposition was not successful. "
-                                        "The input might not be valid."));
+                errors::InvalidArgument(kErrMsg));
   }
 };
 
+#if GOOGLE_CUDA
+typedef Eigen::GpuDevice GPUDevice;
+
+namespace functor {
+#define DECLARE_GPU_SPEC(T)                                                  \
+  template <>                                                                \
+  void MatrixBandPart<GPUDevice, T>::Compute(                                \
+      const GPUDevice& d, Eigen::DenseIndex num_lower,                       \
+      Eigen::DenseIndex num_upper, typename TTypes<T, 3>::ConstTensor input, \
+      typename TTypes<T, 3>::Tensor output);                                 \
+  extern template struct MatrixBandPart<GPUDevice, T>;
+
+TF_CALL_float(DECLARE_GPU_SPEC);
+TF_CALL_double(DECLARE_GPU_SPEC);
+}  // namespace functor
+
+template <class Scalar>
+class CholeskyOpGpu : public LinearAlgebraOp<Scalar> {
+ public:
+  INHERIT_LINALG_TYPEDEFS(Scalar);
+
+  explicit CholeskyOpGpu(OpKernelConstruction* context) : Base(context) {}
+
+  // Copy the lower triangular part of the input matrices to the output and
+  // set the strictly upper triangular part to zero. We use a pre-existing
+  // kernel MatrixBandPart to do this for all matrices in the batch at once,
+  // before we launch each of the Cholesky factorization kernels in parallel.
+  void BatchPreCompute(OpKernelContext* context, const TensorInputs& inputs,
+                       const TensorShapes& input_matrix_shapes,
+                       const TensorOutputs& outputs,
+                       const TensorShapes& output_matrix_shapes) final {
+    const int n = input_matrix_shapes[0].dim_size(0);
+    auto input_reshaped = inputs[0]->template flat_inner_dims<Scalar, 3>();
+    auto output_reshaped = outputs[0]->template flat_inner_dims<Scalar, 3>();
+    functor::MatrixBandPart<GPUDevice, Scalar>::Compute(
+        context->eigen_device<GPUDevice>(), n, 0, input_reshaped,
+        output_reshaped);
+  }
+
+  void ComputeMatrix(OpKernelContext* context, const ConstMatrixMaps& inputs,
+                     MatrixMaps* outputs) final {
+    const ConstMatrixMap& input = inputs[0];
+    const int n = input.rows();
+    if (n == 0) {
+      // If X is an empty matrix (0 rows, 0 col), X * X' == X.
+      // Therefore, we return X.
+      return;
+    }
+    // Launch the Cholesky kernel.
+    CudaSolverDN cusolver(context);
+    const Status status = cusolver.potrf(CUBLAS_FILL_MODE_UPPER, n,
+                                         outputs->at(0).data(), n, nullptr);
+    if (!status.ok()) {
+      LOG(ERROR) << status.ToString();
+    }
+    OP_REQUIRES(context, status.ok(), errors::InvalidArgument(kErrMsg));
+  }
+};
+
+REGISTER_LINALG_OP_GPU("Cholesky", (CholeskyOpGpu<float>), float);
+REGISTER_LINALG_OP_GPU("Cholesky", (CholeskyOpGpu<double>), double);
+
+#endif  // GOOGLE_CUDA
+
 REGISTER_LINALG_OP("Cholesky", (CholeskyOp<float>), float);
 REGISTER_LINALG_OP("Cholesky", (CholeskyOp<double>), double);
 REGISTER_LINALG_OP("BatchCholesky", (CholeskyOp<float>), float);
diff --git a/tensorflow/core/kernels/cuda_solvers.cc b/tensorflow/core/kernels/cuda_solvers.cc
new file mode 100644
index 0000000000..3e59fb0a5a
--- /dev/null
+++ b/tensorflow/core/kernels/cuda_solvers.cc
@@ -0,0 +1,190 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================
+*/
+#ifdef GOOGLE_CUDA
+#include "tensorflow/core/kernels/cuda_solvers.h"
+
+#include <chrono>
+#include <complex>
+
+#include "cuda/include/cublas_v2.h"
+#include "cuda/include/cusolverDn.h"
+#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/blocking_counter.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/stream_executor.h"
+
+namespace tensorflow {
+namespace {
+
+template <typename Scalar>
+class ScratchSpace {
+ public:
+  explicit ScratchSpace(OpKernelContext* context, int size) {
+    TF_CHECK_OK(context->allocate_temp(DataTypeToEnum<Scalar>::value,
+                                       TensorShape({size}), &scratch_tensor_));
+  }
+  Scalar* data() { return scratch_tensor_.template flat<Scalar>().data(); }
+
+ private:
+  Tensor scratch_tensor_;
+};
+
+// Type traits to get CUDA complex types from std::complex<>.
+
+template <typename T>
+struct CUDAComplexT {
+  typedef T type;
+};
+
+template <>
+struct CUDAComplexT<std::complex<float>> {
+  typedef cuComplex type;
+};
+
+template <>
+struct CUDAComplexT<std::complex<double>> {
+  typedef cuDoubleComplex type;
+};
+
+// Converts pointers of std::complex<> to pointers of
+// cuComplex/cuDoubleComplex. No type conversion for non-complex types.
+
+template <typename T>
+inline const typename CUDAComplexT<T>::type* CUDAComplex(const T* p) {
+  return reinterpret_cast<const typename CUDAComplexT<T>::type*>(p);
+}
+
+template <typename T>
+inline typename CUDAComplexT<T>::type* CUDAComplex(T* p) {
+  return reinterpret_cast<typename CUDAComplexT<T>::type*>(p);
+}
+
+// Converts values of std::complex<float/double> to values of
+// cuComplex/cuDoubleComplex.
+inline cuComplex CUDAComplexValue(std::complex<float> val) {
+  return {val.real(), val.imag()};
+}
+
+inline cuDoubleComplex CUDAComplexValue(std::complex<double> val) {
+  return {val.real(), val.imag()};
+}
+}  // namespace
+
+#define TF_RETURN_IF_CUSOLVER_ERROR_MSG(expr, msg)             \
+  do {                                                         \
+    auto status = (expr);                                      \
+    if (TF_PREDICT_FALSE(status != CUSOLVER_STATUS_SUCCESS)) { \
+      return errors::Internal(msg);                            \
+    }                                                          \
+  } while (0)
+
+#define TF_RETURN_IF_CUSOLVER_ERROR(expr) \
+  TF_RETURN_IF_CUSOLVER_ERROR_MSG(expr, "cuSolverDN call failed.")
+
+#define TF_RETURN_STATUS_FROM_INFO(method, device_info_ptr, info_ptr)     \
+  do {                                                                    \
+    int local_info;                                                       \
+    TF_RETURN_IF_ERROR(GetInfo(device_info_ptr, &local_info));            \
+    if (info_ptr != nullptr) *info_ptr = local_info;                      \
+    if (TF_PREDICT_FALSE(local_info != 0)) {                              \
+      return errors::Internal("cuSolverDN::" #method " returned info = ", \
+                              local_info, ", expected info = 0");         \
+    } else {                                                              \
+      return Status::OK();                                                \
+    }                                                                     \
+  } while (0)
+
+CudaSolverDN::CudaSolverDN(OpKernelContext* context) : context_(context) {
+  const cudaStream_t* cu_stream_ptr = CHECK_NOTNULL(
+      reinterpret_cast<const cudaStream_t*>(context->op_device_context()
+                                                ->stream()
+                                                ->implementation()
+                                                ->CudaStreamMemberHack()));
+  cuda_stream_ = *cu_stream_ptr;
+  CHECK(cusolverDnCreate(&handle_) == CUSOLVER_STATUS_SUCCESS)
+      << "Failed to create cuSolverDN instance.";
+  CHECK(cusolverDnSetStream(handle_, cuda_stream_) == CUSOLVER_STATUS_SUCCESS)
+      << "Failed to set cuSolverDN stream.";
+}
+
+CudaSolverDN::~CudaSolverDN() {
+  CHECK(cusolverDnDestroy(handle_) == CUSOLVER_STATUS_SUCCESS)
+      << "Failed to destroy cuSolverDN instance.";
+}
+
+Status CudaSolverDN::GetInfo(const int* dev_info, int* host_info) const {
+  CHECK(dev_info != nullptr);
+  CHECK(host_info != nullptr);
+  auto stream = context_->op_device_context()->stream();
+  perftools::gputools::DeviceMemoryBase wrapped(const_cast<int*>(dev_info));
+  if (!stream
+           ->ThenMemcpy(host_info /* destination */, wrapped /* source */,
+                        sizeof(int))
+           .ok()) {
+    return errors::Internal("Failed to copy dev_info to host.");
+  }
+  BlockingCounter barrier(1);
+  context_->device()->tensorflow_gpu_device_info()->event_mgr->ThenExecute(
+      stream, [&barrier]() { barrier.DecrementCount(); });
+  if (!barrier.WaitFor(std::chrono::minutes(1))) {
+    return errors::Internal("Failed to copy dev_info to host within 1 minute.");
+  }
+  return Status::OK();
+}
+
+// Macro that specializes a solver method for all 4 standard
+// numeric types.
+#define TF_CALL_LAPACK_TYPES(m) \
+  m(float, S) m(double, D) m(std::complex<float>, C) m(std::complex<double>, Z)
+
+// Macros to construct cusolver method names.
+#define SOLVER_NAME(method, lapack_prefix) cusolverDn##lapack_prefix##method
+#define BUFSIZE_NAME(method, lapack_prefix) \
+  cusolverDn##lapack_prefix##method##_bufferSize
+
+//=============================================================================
+// Wrappers of cuSolverDN computational methods begin here.
+//=============================================================================
+#define POTRF_INSTANCE(Scalar, lapack_prefix)                                 \
+  template <>                                                                 \
+  Status CudaSolverDN::potrf<Scalar>(cublasFillMode_t uplo, int n, Scalar* A, \
+                                     int lda, int* info) const {              \
+    /* Get amount of workspace memory required. */                            \
+    int lwork;                                                                \
+    TF_RETURN_IF_CUSOLVER_ERROR(BUFSIZE_NAME(potrf, lapack_prefix)(           \
+        handle_, uplo, n, CUDAComplex(A), lda, &lwork));                      \
+                                                                              \
+    /* Allocate device memory for workspace and info. */                      \
+    ScratchSpace<Scalar> device_workspace(context_, lwork);                   \
+    ScratchSpace<int> device_info(context_, 1);                               \
+                                                                              \
+    /* Launch the solver kernel. */                                           \
+    TF_RETURN_IF_CUSOLVER_ERROR(SOLVER_NAME(potrf, lapack_prefix)(            \
+        handle_, uplo, n, CUDAComplex(A), lda,                                \
+        CUDAComplex(device_workspace.data()), lwork, device_info.data()));    \
+                                                                              \
+    /* Get info from device and return status. */                             \
+    TF_RETURN_STATUS_FROM_INFO(potrf, device_info.data(), info);              \
+    return Status::OK();                                                      \
+  }
+
+TF_CALL_LAPACK_TYPES(POTRF_INSTANCE);
+
+}  // namespace tensorflow
+
+#endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/cuda_solvers.h b/tensorflow/core/kernels/cuda_solvers.h
new file mode 100644
index 0000000000..eeb179cfa6
--- /dev/null
+++ b/tensorflow/core/kernels/cuda_solvers.h
@@ -0,0 +1,178 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================
+*/
+
+// This header implements CudaSolverDN and CuBlas, which contain templatized
+// wrappers of linear algebra solvers in the cuBlas and cuSolverDN libraries
+// for use in TensorFlow kernels.
+
+#ifdef GOOGLE_CUDA
+
+#include "cuda/include/cublas_v2.h"
+#include "cuda/include/cusolverDn.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+// A class that provides a simplified templated API for the solver methods
+// in cuSolverDN (http://docs.nvidia.com/cuda/cusolver).
+// An object of this class wraps a cuSolverDN instance, and will launch
+// kernels on the cuda stream wrapped by the GPU device in the OpKernelContext
+// provided to the constructor. The class methods transparently fetch the output
+// status of the solvers (a.k.a. the LAPACK "info" output variable) without
+// having to manually synchronize the underlying Cuda stream.
+class CudaSolverDN {
+ public:
+  explicit CudaSolverDN(OpKernelContext* context);
+  virtual ~CudaSolverDN();
+
+  // ====================================================================
+  // Templated wrappers for cuSolver functions start here.
+
+  // Cholesky factorization.
+  // Computes Cholesky factorization A = L * L^T.
+  // Returns Status::OK(), if the Cholesky factorization was successful.
+  // If info is not nullptr it is used to return the potrf info code:
+  // Returns zero if success, returns -i if the
+  // i-th parameter is wrong, returns i > 0, if the leading minor of order i is
+  // not positive definite, see:
+  // http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-potrf
+  template <typename Scalar>
+  Status potrf(cublasFillMode_t uplo, int n, Scalar* A, int lda,
+               int* info) const;
+
+  /*
+  TODO(rmlarsen, volunteers): Implement the kernels below.
+  // Uses Cholesky factorization to solve A * X = B.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-potrs
+  template <typename Scalar>
+  Status potrs(cublasFillMode_t uplo, int n, int nrhs, const Scalar* A, int lda,
+             Scalar* B, int ldb, int* info) const;
+
+  // LU factorization.
+  // Computes LU factorization with partial pivoting P * A = L * U.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-getrf
+  template <typename Scalar>
+  Status getrf(int m, int n, Scalar* A, int lda, int* devIpiv,
+             int* devInfo) const;
+
+  // Uses LU factorization to solve A * X = B.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-getrs
+  template <typename Scalar>
+  Status getrs(int n, int nrhs, const Scalar* A, int lda, const int* devIpiv,
+             Scalar* B, int ldb, int* devInfo) const;
+
+  // QR factorization.
+  // Computes QR factorization A = Q * R.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-geqrf
+  template <typename Scalar>
+  Status geqrf(int m, int n, Scalar* A, int lda, Scalar* TAU, int* devInfo)
+  const;
+
+  // Multiplies by Q.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-ormqr
+  template <typename Scalar>
+  Status mqr(cublasSideMode_t side, cublasOperation_t trans, int m, int n, int
+  k, const Scalar* A, int lda, const Scalar* tau, Scalar* C, int ldc, int*
+  devInfo const);
+
+  // Materializes Q.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-orgqr
+  template <typename Scalar>
+  Status gqr(int m, int n, int k, Scalar* A, int lda, const Scalar* tau,
+           int* devInfo) const;
+
+  // Symmetric/Hermitian Eigen decomposition.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-syevd
+  template <typename Scalar>
+  Status evd(cusolverEigMode_t jobz, cublasFillMode_t uplo, int n, Scalar* A,
+           int lda, Scalar* W, int* devInfo) const;
+
+  // Singular value decomposition.
+  // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-gesvd
+  template <typename Scalar>
+  Status gesvd(signed char jobu, signed char jobvt, int m, int n, Scalar* A,
+             int lda, Scalar* S, Scalar* U, int ldu, Scalar* VT, int ldvt,
+             int* devInfo);
+*/
+
+ private:
+  // Copies dev_info status back from the device to host and uses event manager
+  // to wait (with a timeout) until the copy has finished. Returns an error if
+  // the copy fails to complete successfully within the timeout period.
+  Status GetInfo(const int* dev_info, int* host_info) const;
+
+  OpKernelContext* context_;  // not owned.
+  cudaStream_t cuda_stream_;
+  cusolverDnHandle_t handle_;
+};
+
+/*
+  TODO(rmlarsen, volunteers): Implement the kernels below. These are utils and
+batched solvers not currently wrapped by stream executor. class CudaBlas {
+ public:
+  // Initializes a cuSolverDN handle that will launch kernels using the
+  // cuda stream wrapped by the GPU device in context.
+  explicit CudaBlas(OpKernelContext* context);
+  virtual ~CudaBlas();
+
+  // Templatized wrappers for cuBlas functions.
+
+  // Matrix addition, copy and transposition.
+  // See: http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-geam
+  template <typename Scalar>
+  Status geam(cublasOperation_t transa, cublasOperation_t transb, int m, int n,
+            const Scalar* alpha, const Scalar* A, int lda, const Scalar* beta,
+            const Scalar* B, int ldb, Scalar* C, int ldc) const;
+
+  // Batched LU fatorization.
+  // See:
+http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrfbatched
+  template <typename Scalar>
+  Status getrfBatched(int n, Scalar* Aarray[], int lda, int* PivotArray,
+                    int* infoArray, int batchSize) const;
+
+  // Batched linear solver using LU factorization from getrfBatched.
+  // See:
+http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrsbatched
+  template <typename Scalar>
+  Status getrsBatched(cublasOperation_t trans, int n, int nrhs,
+                    const Scalar* Aarray[], int lda, const int* devIpiv,
+                    Scalar* Barray[], int ldb, int* info, int batchSize) const;
+
+  // Batched matrix inverse.
+  // See:
+http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getribatched
+  template <typename Scalar>
+  Status getriBatched(cublasHandle_t handle, int n, Scalar* Aarray[], int lda,
+                    int* PivotArray, Scalar* Carray[], int ldc, int* infoArray,
+                    int batchSize);
+
+ private:
+  // Copies dev_info status back from the device to host and uses event manager
+  // to wait (with a timeout) until the copy has finished. Returns an error if
+  // the copy fails to complete successfully within the timeout period.
+  Status GetInfo(const int* dev_info, int* host_info) const;
+
+  OpKernelContext* context_;  // not owned.
+  cudaStream_t cuda_stream_;
+  cublasHandle_t handle_;
+};
+*/
+
+}  // namespace tensorflow
+
+#endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/linalg_ops_common.cc b/tensorflow/core/kernels/linalg_ops_common.cc
index dc001857d7..a38ddf76eb 100644
--- a/tensorflow/core/kernels/linalg_ops_common.cc
+++ b/tensorflow/core/kernels/linalg_ops_common.cc
@@ -95,6 +95,10 @@ void LinearAlgebraOp<Scalar>::Compute(OpKernelContext* context) {
   PrepareOutputs(context, input_matrix_shapes, batch_shape, &outputs,
                  &output_matrix_shapes);
 
+  // Perform batch-wide pre-computions, if any.
+  BatchPreCompute(context, inputs, input_matrix_shapes, outputs,
+                  output_matrix_shapes);
+
   // Process the individual matrix problems in parallel using a threadpool.
   auto shard = [this, &inputs, &input_matrix_shapes, &outputs,
                 &output_matrix_shapes, context](int64 begin, int64 end) {
@@ -106,6 +110,10 @@ void LinearAlgebraOp<Scalar>::Compute(OpKernelContext* context) {
   auto worker_threads = *(context->device()->tensorflow_cpu_worker_threads());
   Shard(worker_threads.num_threads, worker_threads.workers,
         batch_shape.num_elements(), GetCostPerUnit(input_matrix_shapes), shard);
+
+  // Perform batch-wide post-computions, if any.
+  BatchPostCompute(context, inputs, input_matrix_shapes, outputs,
+                   output_matrix_shapes);
 }
 
 template <typename Scalar>
diff --git a/tensorflow/core/kernels/linalg_ops_common.h b/tensorflow/core/kernels/linalg_ops_common.h
index ab4142ac93..fcb735bfdb 100644
--- a/tensorflow/core/kernels/linalg_ops_common.h
+++ b/tensorflow/core/kernels/linalg_ops_common.h
@@ -130,12 +130,28 @@ class LinearAlgebraOp : public OpKernel {
                              const ConstMatrixMaps& inputs,
                              MatrixMaps* outputs) = 0;
 
- private:
   using TensorInputs = gtl::InlinedVector<const Tensor*, 4>;
   using TensorOutputs = gtl::InlinedVector<Tensor*, 4>;
 
-  // This function maps slices (matrices) of the input and output tensors using
-  // Eigen::Map and calls ComputeMatrix implemented in terms of the
+  // Hook for doing batch-wide processing before ComputeMatrix is called
+  // on each individual slice.
+  virtual void BatchPreCompute(OpKernelContext* context,
+                               const TensorInputs& inputs,
+                               const TensorShapes& input_matrix_shapes,
+                               const TensorOutputs& outputs,
+                               const TensorShapes& output_matrix_shapes) {}
+
+  // Hook for doing batch-wide processing after ComputeMatrix is called
+  // on each individual slice.
+  virtual void BatchPostCompute(OpKernelContext* context,
+                                const TensorInputs& inputs,
+                                const TensorShapes& input_matrix_shapes,
+                                const TensorOutputs& outputs,
+                                const TensorShapes& output_matrix_shapes) {}
+
+ private:
+  // This function maps 2-d slices (matrices) of the input and output tensors
+  // using Eigen::Map and calls ComputeMatrix implemented in terms of the
   // Eigen::MatrixBase API by the derived class.
   //
   // The 'matrix_index' parameter specifies the index of the matrix to be used
@@ -176,8 +192,27 @@ extern template class LinearAlgebraOp<complex128>;
 
 }  // namespace tensorflow
 
-#define REGISTER_LINALG_OP(OpName, OpClass, Scalar) \
-  REGISTER_KERNEL_BUILDER(                          \
+#define INHERIT_LINALG_TYPEDEFS(Scalar)                   \
+  typedef LinearAlgebraOp<Scalar> Base;                   \
+  using Matrix = typename Base::Matrix;                   \
+  using MatrixMap = typename Base::MatrixMap;             \
+  using MatrixMaps = typename Base::MatrixMaps;           \
+  using ConstMatrixMap = typename Base::ConstMatrixMap;   \
+  using ConstMatrixMaps = typename Base::ConstMatrixMaps; \
+  using TensorShapes = typename Base::TensorShapes;       \
+  using TensorInputs = typename Base::TensorInputs;       \
+  using TensorOutputs = typename Base::TensorOutputs
+
+#define REGISTER_LINALG_OP_CPU(OpName, OpClass, Scalar) \
+  REGISTER_KERNEL_BUILDER(                              \
       Name(OpName).Device(DEVICE_CPU).TypeConstraint<Scalar>("T"), OpClass)
 
+#define REGISTER_LINALG_OP_GPU(OpName, OpClass, Scalar) \
+  REGISTER_KERNEL_BUILDER(                              \
+      Name(OpName).Device(DEVICE_GPU).TypeConstraint<Scalar>("T"), OpClass)
+
+// Deprecated, use one of the device-specific macros above.
+#define REGISTER_LINALG_OP(OpName, OpClass, Scalar) \
+  REGISTER_LINALG_OP_CPU(OpName, OpClass, Scalar)
+
 #endif  // TENSORFLOW_KERNELS_LINALG_OPS_COMMON_H_
diff --git a/tensorflow/python/kernel_tests/cholesky_op_test.py b/tensorflow/python/kernel_tests/cholesky_op_test.py
index bbe1d052f0..d95200ec92 100644
--- a/tensorflow/python/kernel_tests/cholesky_op_test.py
+++ b/tensorflow/python/kernel_tests/cholesky_op_test.py
@@ -48,13 +48,15 @@ class CholeskyOpTest(test.TestCase):
 
   def _verifyCholesky(self, x):
     # Verify that LL^T == x.
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       chol = linalg_ops.cholesky(x)
       verification = math_ops.matmul(chol, chol, adjoint_b=True)
       self._verifyCholeskyBase(sess, x, chol, verification)
 
   def testBasic(self):
-    self._verifyCholesky(np.array([[4., -1., 2.], [-1., 6., 0], [2., 0., 5.]]))
+    for dtype in (np.float32, np.float64):
+      self._verifyCholesky(
+          np.array([[4., -1., 2.], [-1., 6., 0], [2., 0., 5.]]).astype(dtype))
 
   def testBatch(self):
     simple_array = np.array([[[1., 0.], [0., 5.]]])  # shape (1, 2, 2)
@@ -84,11 +86,12 @@ class CholeskyOpTest(test.TestCase):
     with self.assertRaises(ValueError):
       linalg_ops.cholesky(tensor3)
 
-  def testNotInvertible(self):
+  def testNotInvertibleCPU(self):
     # The input should be invertible.
-    with self.test_session():
-      with self.assertRaisesOpError("LLT decomposition was not successful. The"
-                                    " input might not be valid."):
+    with self.test_session(use_gpu=False):
+      with self.assertRaisesOpError(
+          "Cholesky decomposition was not successful. The"
+          " input might not be valid."):
         # All rows of the matrix below add to zero
         self._verifyCholesky(
             np.array([[1., -1., 0.], [-1., 1., -1.], [0., -1., 1.]]))
diff --git a/third_party/gpus/cuda/BUILD.tpl b/third_party/gpus/cuda/BUILD.tpl
index e101f9fbd8..474c972a4c 100644
--- a/third_party/gpus/cuda/BUILD.tpl
+++ b/third_party/gpus/cuda/BUILD.tpl
@@ -90,6 +90,16 @@ cc_library(
     visibility = ["//visibility:public"],
 )
 
+cc_library(
+    name = "cusolver",
+    srcs = ["lib/%{cusolver_lib}"],
+    data = ["lib/%{cusolver_lib}"],
+    includes = ["include/"],
+    linkstatic = 1,
+    linkopts = ["-lgomp"],
+    visibility = ["//visibility:public"],
+)
+
 cc_library(
     name = "cudnn",
     srcs = ["lib/%{cudnn_lib}"],
diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index 05ff584be0..e06092ab4e 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -541,6 +541,9 @@ def _find_libs(repository_ctx, cuda_config):
       "cublas": _find_cuda_lib(
           "cublas", repository_ctx, cpu_value, cuda_config.cuda_toolkit_path,
           cuda_config.cuda_version),
+      "cusolver": _find_cuda_lib(
+          "cusolver", repository_ctx, cpu_value, cuda_config.cuda_toolkit_path,
+          cuda_config.cuda_version),
       "curand": _find_cuda_lib(
           "curand", repository_ctx, cpu_value, cuda_config.cuda_toolkit_path,
           cuda_config.cuda_version),
@@ -695,6 +698,7 @@ def _create_dummy_repository(repository_ctx):
            "%{cudart_static_linkopt}": _cudart_static_linkopt(cpu_value),
            "%{cudart_lib}": _lib_name("cudart", cpu_value),
            "%{cublas_lib}": _lib_name("cublas", cpu_value),
+           "%{cusolver_lib}": _lib_name("cusolver", cpu_value),
            "%{cudnn_lib}": _lib_name("cudnn", cpu_value),
            "%{cufft_lib}": _lib_name("cufft", cpu_value),
            "%{curand_lib}": _lib_name("curand", cpu_value),
@@ -708,6 +712,7 @@ def _create_dummy_repository(repository_ctx):
            "%{cudart_static_linkopt}": _cudart_static_linkopt(cpu_value),
            "%{cudart_lib}": _lib_name("cudart", cpu_value),
            "%{cublas_lib}": _lib_name("cublas", cpu_value),
+           "%{cusolver_lib}": _lib_name("cusolver", cpu_value),
            "%{cudnn_lib}": _lib_name("cudnn", cpu_value),
            "%{cufft_lib}": _lib_name("cufft", cpu_value),
            "%{curand_lib}": _lib_name("curand", cpu_value),
@@ -730,6 +735,7 @@ def _create_dummy_repository(repository_ctx):
   repository_ctx.file("cuda/lib/%s" % _lib_name("cudart", cpu_value))
   repository_ctx.file("cuda/lib/%s" % _lib_name("cudart_static", cpu_value))
   repository_ctx.file("cuda/lib/%s" % _lib_name("cublas", cpu_value))
+  repository_ctx.file("cuda/lib/%s" % _lib_name("cusolver", cpu_value))
   repository_ctx.file("cuda/lib/%s" % _lib_name("cudnn", cpu_value))
   repository_ctx.file("cuda/lib/%s" % _lib_name("curand", cpu_value))
   repository_ctx.file("cuda/lib/%s" % _lib_name("cufft", cpu_value))
@@ -822,6 +828,7 @@ def _create_cuda_repository(repository_ctx):
                cuda_config.cpu_value),
            "%{cudart_lib}": cuda_libs["cudart"].file_name,
            "%{cublas_lib}": cuda_libs["cublas"].file_name,
+           "%{cusolver_lib}": cuda_libs["cusolver"].file_name,
            "%{cudnn_lib}": cuda_libs["cudnn"].file_name,
            "%{cufft_lib}": cuda_libs["cufft"].file_name,
            "%{curand_lib}": cuda_libs["curand"].file_name,
-- 
GitLab


From 55ccff33bd77d8fc82fe0b5b109c22234734e82b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 20 Mar 2017 15:23:48 -0800
Subject: [PATCH 0292/1563] Copying the whl file for python 3.6 as well.
 Change: 150691934

---
 tensorflow/tools/ci_build/builds/pip.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/tools/ci_build/builds/pip.sh b/tensorflow/tools/ci_build/builds/pip.sh
index 0a78fa236b..751f7de9a1 100755
--- a/tensorflow/tools/ci_build/builds/pip.sh
+++ b/tensorflow/tools/ci_build/builds/pip.sh
@@ -191,6 +191,8 @@ elif [[ $(uname) == "Darwin" ]]; then
     PY_TAGS="py2-none"
   elif [[ ${PY_MAJOR_MINOR_VER} == "3.5" ]]; then
     PY_TAGS="py3-none"
+  elif [[ ${PY_MAJOR_MINOR_VER} == "3.6" ]]; then
+    PY_TAGS="py3-none"
   fi
   PLATFORM_TAG="any"
 fi
-- 
GitLab


From d34eec7ec3b604b9f34dc0fc262577719514fcde Mon Sep 17 00:00:00 2001
From: Vinu Rajashekhar <vinuraja@google.com>
Date: Mon, 10 Apr 2017 16:19:27 -0800
Subject: [PATCH 0293/1563] Does a deep copy of the tensors output from
 GraphRunner::Run(...)

The current GraphRunner::Run(...) outputs tensors produced from running the
Executor on the graph, but these tensors are actually owned by the allocator
from the device created for the Run(...), which could be deleted along with the
device. The deep copy allows the ownership to be transferred to the global
static cpu_allocator(). Before, the allocator was always a
global cpu_allocator(), but with a recent change there is an option to tie allocations
to a memory limited allocator per-session.
Change: 152756520
---
 .../core/common_runtime/graph_runner.cc       |  8 +++++-
 .../core/common_runtime/graph_runner_test.cc  | 27 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/common_runtime/graph_runner.cc b/tensorflow/core/common_runtime/graph_runner.cc
index d4dc8f0057..514a63590b 100644
--- a/tensorflow/core/common_runtime/graph_runner.cc
+++ b/tensorflow/core/common_runtime/graph_runner.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/rendezvous_mgr.h"
 #include "tensorflow/core/framework/log_memory.h"
 #include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor_util.h"
 #include "tensorflow/core/graph/algorithm.h"
 #include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/graph/node_builder.h"
@@ -175,8 +176,13 @@ Status GraphRunner::Run(Graph* graph, FunctionLibraryRuntime* function_library,
     Rendezvous::ParsedKey parsed;
     TF_RETURN_IF_ERROR(Rendezvous::ParseKey(output_key, &parsed));
     bool is_dead;
+    Tensor output_tensor;
     TF_RETURN_IF_ERROR(
-        rendez->Recv(parsed, Rendezvous::Args(), &(*outputs)[i], &is_dead));
+        rendez->Recv(parsed, Rendezvous::Args(), &output_tensor, &is_dead));
+    // Does a deep copy so that ownership of the tensor isn't tied to the
+    // allocator of the cpu device we created above. The allocator could be
+    // deleted along with the device.
+    (*outputs)[i] = tensor::DeepCopy(output_tensor);
   }
 
   return Status::OK();
diff --git a/tensorflow/core/common_runtime/graph_runner_test.cc b/tensorflow/core/common_runtime/graph_runner_test.cc
index ccb44af0ec..e969ee8df7 100644
--- a/tensorflow/core/common_runtime/graph_runner_test.cc
+++ b/tensorflow/core/common_runtime/graph_runner_test.cc
@@ -53,6 +53,33 @@ TEST(GraphRunnerTest, SingleConst) {
   ExpectEqual(42.0f, outputs[0].scalar<float>()());
 }
 
+// If not using DeepCopy, and the allocator is deleted with the cpu-device,
+// this test will seg-fault.
+TEST(GraphRunnerTest, DeepCopy) {
+  Scope root = Scope::NewRootScope();
+  auto p1 = ops::Placeholder(root.WithOpName("p1"), DT_FLOAT);
+  auto p2 = ops::Placeholder(root.WithOpName("p2"), DT_FLOAT);
+  auto add = ops::Add(root.WithOpName("add"), p1, p2);
+
+  Tensor p1_data(DT_FLOAT, TensorShape({}));
+  Tensor p2_data(DT_FLOAT, TensorShape({}));
+  p1_data.scalar<float>()() = 1.0f;
+  p2_data.scalar<float>()() = 2.0f;
+  std::vector<std::pair<string, Tensor>> inputs = {{"p1:0", p1_data},
+                                                   {"p2:0", p2_data}};
+
+  // Create and destroy the GraphRunner, and ensure that the outputs are
+  // consumable beyond the lifetime of GraphRunner.
+  std::vector<Tensor> outputs;
+  {
+    GraphRunner graph_runner(Env::Default());
+    Status s =
+        graph_runner.Run(root.graph(), nullptr, inputs, {"add:0"}, &outputs);
+    TF_ASSERT_OK(s);
+  }
+  ExpectEqual(3.0f, outputs[0].scalar<float>()());
+}
+
 TEST(GraphRunnerTest, MultiFetchConst) {
   Scope root = Scope::NewRootScope();
   auto c = ops::Const(root, 42.0f);
-- 
GitLab


From c0095c97099213cac22c87dad59200194a6f4f48 Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Mon, 10 Apr 2017 16:27:56 -0800
Subject: [PATCH 0294/1563] Adds `tf.Session.make_callable()`.

This method returns a Python callable that has the same semantics as
`tf.Session.run()`, but can cache some of the work that must be done
to map Tensor-like objects to the arguments of the underlying C API
function.

The initial implementation is optimized for single-`Tensor` and
single-`Operation` fetches, and delegates to `tf.Session.run()` for
handling feeds. Since most queue runners use a single-`Operation`
`run()` call, switch the `tf.train.QueueRunner` implementation to use
`make_callable()`

Using this new interface can improve the latency of small steps (measurements from my workstation):

* The median time to fetch a 4-byte tensor decreases from 99us to 52us (-47us).
* The median time to run a trivial op decreases from 80us to 31us (-49us).
Change: 152757301
---
 tensorflow/python/client/session.py           |  85 ++++++++++++
 tensorflow/python/client/session_benchmark.py | 121 ++++++++++++++++--
 tensorflow/python/client/session_test.py      |  37 ++++--
 .../python/training/queue_runner_impl.py      |   5 +-
 .../tensorflow.-interactive-session.pbtxt     |   4 +
 .../api/golden/tensorflow.-session.pbtxt      |   4 +
 6 files changed, 235 insertions(+), 21 deletions(-)

diff --git a/tensorflow/python/client/session.py b/tensorflow/python/client/session.py
index 5b50df3ed3..7981defe78 100644
--- a/tensorflow/python/client/session.py
+++ b/tensorflow/python/client/session.py
@@ -996,6 +996,91 @@ class BaseSession(SessionInterface):
       results = []
     return fetch_handler.build_results(self, results)
 
+  def make_callable(self, fetches, feed_list=None):
+    """Returns a Python callable that runs a particular step.
+
+    The returned callable will take `len(feed_list)` arguments whose types
+    must be compatible feed values for the respective elements of `feed_list`.
+    For example, if element `i` of `feed_list` is a `tf.Tensor`, the `i`th
+    argument to the returned callable must be a numpy ndarray (or something
+    convertible to an ndarray) with matching element type and shape. See
+    @{tf.Session.run} for details of the allowable feed key and value types.
+
+    The returned callable will have the same return type as
+    `tf.Session.run(fetches, ...)`. For example, if `fetches` is a `tf.Tensor`,
+    the callable will return a numpy ndarray; if `fetches` is a `tf.Operation`,
+    it will return `None`.
+
+    Args:
+      fetches: A value or list of values to fetch. See @{tf.Session.run}
+        for details of the allowable fetch types.
+      feed_list: (Optional.) A list of `feed_dict` keys. See
+        @{tf.Session.run} for details of the allowable feed key types.
+
+    Returns:
+      A function that when called will execute the step defined by
+      `feed_list` and `fetches` in this session.
+
+    Raises:
+      TypeError: If `fetches` or `feed_list` cannot be interpreted
+        as arguments to @{tf.Session.run}.
+    """
+    if feed_list is not None:
+      if not isinstance(feed_list, (list, tuple)):
+        raise TypeError('`feed_list` must be a list or tuple.')
+      # Delegate any non-empty feed lists to the existing `run()` logic.
+      # TODO(mrry): Refactor the feed handling logic from
+      # `Session._run()` so that we can convert the feeds to a list of
+      # strings here.
+      def _generic_run(*feed_args):
+        feed_dict = {feed: feed_val
+                     for feed, feed_val in zip(feed_list, feed_args)}
+        return self.run(fetches, feed_dict=feed_dict)
+      return _generic_run
+
+    # Ensure any changes to the graph are reflected in the runtime.
+    # Note that we don't need to do this on subsequent calls to the
+    # returned object, because the arguments to `fetches` must already be
+    # in the graph.
+    self._extend_graph()
+
+    # Create a fetch handler to take care of the structure of fetches.
+    fetch_handler = _FetchHandler(self._graph, fetches, {})
+    fetch_list_as_strings = fetch_handler.fetches()
+    target_list_as_strings = fetch_handler.targets()
+
+    if isinstance(fetches, ops.Operation):
+      # Special case for fetching a single operation, because the
+      # function will have no return value.
+      assert not fetch_list_as_strings
+      assert len(target_list_as_strings) == 1
+      def _single_operation_run():
+        with errors.raise_exception_on_not_ok_status() as status:
+          tf_session.TF_Run(self._session, None, {}, [],
+                            target_list_as_strings, status, None)
+      return _single_operation_run
+    elif isinstance(fetches, ops.Tensor):
+      # Special case for fetching a single tensor, because the
+      # function can return the result of `TF_Run()` directly.
+      assert len(fetch_list_as_strings) == 1
+      assert not target_list_as_strings
+      def _single_tensor_run():
+        with errors.raise_exception_on_not_ok_status() as status:
+          results = tf_session.TF_Run(self._session, None, {},
+                                      fetch_list_as_strings, [], status, None)
+        return results[0]
+      return _single_tensor_run
+    else:
+      # In all other cases, we must use `fetch_handler` to build the
+      # results for us.
+      def _fetch_handler_run():
+        with errors.raise_exception_on_not_ok_status() as status:
+          results = tf_session.TF_Run(self._session, None, {},
+                                      fetch_list_as_strings,
+                                      target_list_as_strings, status, None)
+        return fetch_handler.build_results(self, results)
+      return _fetch_handler_run
+
   # Captures the name of a node in an error status.
   _NODEDEF_NAME_RE = re.compile(r'\[\[Node: ([^ ]*?) =')
 
diff --git a/tensorflow/python/client/session_benchmark.py b/tensorflow/python/client/session_benchmark.py
index 614eede681..721bca91b7 100644
--- a/tensorflow/python/client/session_benchmark.py
+++ b/tensorflow/python/client/session_benchmark.py
@@ -92,26 +92,127 @@ class SessionBenchmark(test.Benchmark):
     print("%s %d %f" % (name, size, np.median(times)))
     self.report_benchmark(iters=1, wall_time=np.median(times), name=name)
 
+  def _benchmarkFetchPrebuilt(self, name, target, size, iters):
+    """Runs a microbenchmark to measure the cost of fetching a tensor.
+
+    Reports the median cost of fetching a tensor of `size` * `sizeof(float)`
+    bytes.
+
+    Args:
+      name: A human-readable name for logging the output.
+      target: The session target to use for the benchmark.
+      size: The number of floating-point numbers to be fetched.
+      iters: The number of iterations to perform.
+    """
+    times = []
+    with ops.Graph().as_default():
+      # Define the tensor to be fetched as a variable, to avoid
+      # constant-folding.
+      v = variables.Variable(random_ops.random_normal([size]))
+      with session.Session(target) as sess:
+        sess.run(v.initializer)
+        runner = sess.make_callable(v)
+        runner()  # Warm-up run.
+        for _ in xrange(iters):
+          start_time = time.time()
+          runner()
+          end_time = time.time()
+          times.append(end_time - start_time)
+    print("%s %d %f" % (name, size, np.median(times)))
+    self.report_benchmark(iters=1, wall_time=np.median(times), name=name)
+
+  def _benchmarkRunOp(self, name, target, iters):
+    """Runs a microbenchmark to measure the cost of running an op.
+
+    Reports the median cost of running a trivial (Variable) op.
+
+    Args:
+      name: A human-readable name for logging the output.
+      target: The session target to use for the benchmark.
+      iters: The number of iterations to perform.
+    """
+    times = []
+    with ops.Graph().as_default():
+      # Define the op to be run as a variable, to avoid
+      # constant-folding.
+      v = variables.Variable(random_ops.random_normal([]))
+      with session.Session(target) as sess:
+        sess.run(v.initializer)
+        sess.run(v.op)  # Warm-up run.
+        for _ in xrange(iters):
+          start_time = time.time()
+          sess.run(v.op)
+          end_time = time.time()
+          times.append(end_time - start_time)
+    print("%s %f" % (name, np.median(times)))
+    self.report_benchmark(iters=1, wall_time=np.median(times), name=name)
+
+  def _benchmarkRunOpPrebuilt(self, name, target, iters):
+    """Runs a microbenchmark to measure the cost of running an op.
+
+    Reports the median cost of running a trivial (Variable) op.
+
+    Args:
+      name: A human-readable name for logging the output.
+      target: The session target to use for the benchmark.
+      iters: The number of iterations to perform.
+    """
+    times = []
+    with ops.Graph().as_default():
+      # Define the op to be run as a variable, to avoid
+      # constant-folding.
+      v = variables.Variable(random_ops.random_normal([]))
+      with session.Session(target) as sess:
+        sess.run(v.initializer)
+        runner = sess.make_callable(v.op)
+        runner()  # Warm-up run.
+        for _ in xrange(iters):
+          start_time = time.time()
+          runner()
+          end_time = time.time()
+          times.append(end_time - start_time)
+    print("%s %f" % (name, np.median(times)))
+    self.report_benchmark(iters=1, wall_time=np.median(times), name=name)
+
   def benchmarkGrpcSession(self):
     server = server_lib.Server.create_local_server()
     self._benchmarkFeed("benchmark_session_feed_grpc_4B", server.target, 1,
-                        10000)
+                        30000)
     session.Session.reset(server.target)
-    self._benchmarkFeed("benchmark_session_feed_grpc_4MB", server.target, 1
-                        << 20, 100)
+    self._benchmarkFeed("benchmark_session_feed_grpc_4MB", server.target,
+                        1 << 20, 25000)
     session.Session.reset(server.target)
     self._benchmarkFetch("benchmark_session_fetch_grpc_4B", server.target, 1,
-                         20000)
+                         40000)
+    session.Session.reset(server.target)
+    self._benchmarkFetch("benchmark_session_fetch_grpc_4MB", server.target,
+                         1 << 20, 20000)
     session.Session.reset(server.target)
-    self._benchmarkFetch("benchmark_session_fetch_grpc_4MB", server.target, 1
-                         << 20, 100)
+    self._benchmarkFetchPrebuilt("benchmark_session_fetchprebuilt_grpc_4B",
+                                 server.target, 1, 50000)
+    session.Session.reset(server.target)
+    self._benchmarkFetchPrebuilt("benchmark_session_fetchprebuilt_grpc_4MB",
+                                 server.target, 1 << 20, 50000)
+    session.Session.reset(server.target)
+    self._benchmarkRunOp("benchmark_session_runop_grpc", server.target, 50000)
+    session.Session.reset(server.target)
+    self._benchmarkRunOpPrebuilt("benchmark_session_runopprebuilt_grpc",
+                                 server.target, 100000)
     session.Session.reset(server.target)
 
   def benchmarkDirectSession(self):
-    self._benchmarkFeed("benchmark_session_feed_direct_4B", "", 1, 5000)
-    self._benchmarkFeed("benchmark_session_feed_direct_4MB", "", 1 << 20, 200)
-    self._benchmarkFetch("benchmark_session_fetch_direct_4B", "", 1, 5000)
-    self._benchmarkFetch("benchmark_session_fetch_direct_4MB", "", 1 << 20, 100)
+    self._benchmarkFeed("benchmark_session_feed_direct_4B", "", 1, 80000)
+    self._benchmarkFeed("benchmark_session_feed_direct_4MB", "", 1 << 20, 20000)
+    self._benchmarkFetch("benchmark_session_fetch_direct_4B", "", 1, 100000)
+    self._benchmarkFetch("benchmark_session_fetch_direct_4MB", "", 1 << 20,
+                         20000)
+    self._benchmarkFetchPrebuilt("benchmark_session_fetchprebuilt_direct_4B",
+                                 "", 1, 200000)
+    self._benchmarkFetchPrebuilt("benchmark_session_fetchprebuilt_direct_4MB",
+                                 "", 1 << 20, 200000)
+    self._benchmarkRunOp("benchmark_session_runop_direct", "", 200000)
+    self._benchmarkRunOpPrebuilt("benchmark_session_runopprebuilt_direct", "",
+                                 200000)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 13c2736609..99402ff2ed 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -193,6 +193,12 @@ class SessionTest(test_util.TensorFlowTestCase):
       self.assertEqual(42.0, res)
       res = sess.run(a.op)  # An op, not a tensor.
       self.assertEqual(None, res)
+      tensor_runner = sess.make_callable(a)
+      res = tensor_runner()
+      self.assertEqual(42.0, res)
+      op_runner = sess.make_callable(a.op)
+      res = op_runner()
+      self.assertEqual(None, res)
 
   def testFetchSingletonByName(self):
     with session.Session() as sess:
@@ -211,12 +217,11 @@ class SessionTest(test_util.TensorFlowTestCase):
       assign = v.assign([63.0])
       res = sess.run([a, b, c, a.name, assign.op])
       self.assertTrue(isinstance(res, list))
-      self.assertEqual(42.0, res[0])
-      self.assertEqual(None, res[1])
-      self.assertEqual(44.0, res[2])
-      self.assertEqual(42.0, res[3])
-      self.assertEqual(None, res[4])
-      self.assertEqual(63.0, sess.run(v))
+      self.assertEqual([42.0, None, 44.0, 42.0, None], res)
+      list_runner = sess.make_callable([a, b, c, a.name, assign.op])
+      res = list_runner()
+      self.assertTrue(isinstance(res, list))
+      self.assertEqual([42.0, None, 44.0, 42.0, None], res)
 
   def testFetchTuple(self):
     with session.Session() as sess:
@@ -225,10 +230,11 @@ class SessionTest(test_util.TensorFlowTestCase):
       c = constant_op.constant(44.0)
       res = sess.run((a, b, c, a.name))
       self.assertTrue(isinstance(res, tuple))
-      self.assertEqual(42.0, res[0])
-      self.assertEqual(None, res[1])
-      self.assertEqual(44.0, res[2])
-      self.assertEqual(42.0, res[3])
+      self.assertEqual((42.0, None, 44.0, 42.0), res)
+      tuple_runner = sess.make_callable((a, b, c, a.name))
+      res = tuple_runner()
+      self.assertTrue(isinstance(res, tuple))
+      self.assertEqual((42.0, None, 44.0, 42.0), res)
 
   def testFetchNamedTuple(self):
     # pylint: disable=invalid-name
@@ -243,6 +249,12 @@ class SessionTest(test_util.TensorFlowTestCase):
       self.assertEqual(42.0, res.a)
       self.assertEqual(None, res.b)
       self.assertEqual(44.0, res.c)
+      namedtuple_runner = sess.make_callable(ABC(a, b, c))
+      res = namedtuple_runner()
+      self.assertTrue(isinstance(res, ABC))
+      self.assertEqual(42.0, res.a)
+      self.assertEqual(None, res.b)
+      self.assertEqual(44.0, res.c)
 
   def testFetchDict(self):
     with session.Session() as sess:
@@ -1181,6 +1193,11 @@ class SessionTest(test_util.TensorFlowTestCase):
           self.assertAllEqual(np_array, out_v)
           self.assertAllEqual(np_array, feed_v)
 
+          feed_fetch_runner = sess.make_callable([out_t, feed_t], [feed_t])
+          out_v, feed_v = feed_fetch_runner(np_array)
+          self.assertAllEqual(np_array, out_v)
+          self.assertAllEqual(np_array, feed_v)
+
   def testFeedError(self):
     with session.Session() as sess:
       feed_t = array_ops.placeholder(dtype=dtypes.float32)
diff --git a/tensorflow/python/training/queue_runner_impl.py b/tensorflow/python/training/queue_runner_impl.py
index 3901470fbc..d713e222ae 100644
--- a/tensorflow/python/training/queue_runner_impl.py
+++ b/tensorflow/python/training/queue_runner_impl.py
@@ -227,11 +227,14 @@ class QueueRunner(object):
     """
     decremented = False
     try:
+      # Make a cached callable from the `enqueue_op` to decrease the
+      # Python overhead in the queue-runner loop.
+      enqueue_callable = sess.make_callable(enqueue_op)
       while True:
         if coord and coord.should_stop():
           break
         try:
-          sess.run(enqueue_op)
+          enqueue_callable()
         except self._queue_closed_exception_types:  # pylint: disable=catching-non-exception
           # This exception indicates that a queue was closed.
           with self._lock:
diff --git a/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
index 623f4b1a27..9503ec440f 100644
--- a/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-interactive-session.pbtxt
@@ -28,6 +28,10 @@ tf_class {
     name: "close"
     argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
   }
+  member_method {
+    name: "make_callable"
+    argspec: "args=[\'self\', \'fetches\', \'feed_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "partial_run"
     argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
diff --git a/tensorflow/tools/api/golden/tensorflow.-session.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
index f5c597548f..5eec14f365 100644
--- a/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-session.pbtxt
@@ -28,6 +28,10 @@ tf_class {
     name: "close"
     argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
   }
+  member_method {
+    name: "make_callable"
+    argspec: "args=[\'self\', \'fetches\', \'feed_list\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "partial_run"
     argspec: "args=[\'self\', \'handle\', \'fetches\', \'feed_dict\'], varargs=None, keywords=None, defaults=[\'None\'], "
-- 
GitLab


From 6fecffd7eca64100ce14969a2c3366b89b7cecc2 Mon Sep 17 00:00:00 2001
From: zjj2wry <zhengjiajin2016@gmail.com>
Date: Tue, 11 Apr 2017 08:47:57 +0800
Subject: [PATCH 0295/1563] line<= 80 and RELU to ReLU (#9109)

---
 .../examples/learn/text_classification_character_cnn.py      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/examples/learn/text_classification_character_cnn.py b/tensorflow/examples/learn/text_classification_character_cnn.py
index 0c96976146..5ad53acf9f 100644
--- a/tensorflow/examples/learn/text_classification_character_cnn.py
+++ b/tensorflow/examples/learn/text_classification_character_cnn.py
@@ -11,7 +11,8 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-"""This is an example of using convolutional networks over characters for DBpedia dataset to predict class from description of an entity.
+"""This is an example of using convolutional networks over characters for
+   DBpedia dataset to predict class from description of an entity.
 
 This model is similar to one described in this paper:
    "Character-level Convolutional Networks for Text Classification"
@@ -54,7 +55,7 @@ def char_cnn_model(features, target):
     # Apply Convolution filtering on input sequence.
     conv1 = tf.contrib.layers.convolution2d(
         byte_list, N_FILTERS, FILTER_SHAPE1, padding='VALID')
-    # Add a RELU for non linearity.
+    # Add a ReLU for non linearity.
     conv1 = tf.nn.relu(conv1)
     # Max pooling across output of Convolution+Relu.
     pool1 = tf.nn.max_pool(
-- 
GitLab


From df83cd08d2d4c0b0e852c4bc316d19f58563535c Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Mon, 10 Apr 2017 16:31:02 -0800
Subject: [PATCH 0296/1563] Add Split and SplitV GPU support for
 complex64/complex128.

Update split_op_test to test complex numbers in addition to floats and always test with a GPU if one is available.
Change: 152757648
---
 tensorflow/core/kernels/split_lib_gpu.cu.cc   |   8 +
 tensorflow/core/kernels/split_op.cc           |   2 +
 tensorflow/core/kernels/split_v_op.cc         |   2 +
 .../python/kernel_tests/split_op_test.py      | 139 +++++++++---------
 4 files changed, 82 insertions(+), 69 deletions(-)

diff --git a/tensorflow/core/kernels/split_lib_gpu.cu.cc b/tensorflow/core/kernels/split_lib_gpu.cu.cc
index 40b8952e14..3c0b5d113b 100644
--- a/tensorflow/core/kernels/split_lib_gpu.cu.cc
+++ b/tensorflow/core/kernels/split_lib_gpu.cu.cc
@@ -50,12 +50,16 @@ void SplitCustom<Device, T>::operator()(
 #define DEFINE_GPU_KERNELS(T) template struct Split<Eigen::GpuDevice, T>;
 
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_KERNELS);
+TF_CALL_complex64(DEFINE_GPU_KERNELS);
+TF_CALL_complex128(DEFINE_GPU_KERNELS);
 DEFINE_GPU_KERNELS(bfloat16);
 
 #undef DEFINE_GPU_KERNELS
 #define DEFINE_GPU_KERNELS(T) template struct SplitCustom<Eigen::GpuDevice, T>;
 
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_KERNELS);
+TF_CALL_complex64(DEFINE_GPU_KERNELS);
+TF_CALL_complex128(DEFINE_GPU_KERNELS);
 DEFINE_GPU_KERNELS(bfloat16);
 
 #undef DEFINE_GPU_KERNELS
@@ -236,12 +240,16 @@ struct SplitVOpGPULaunch {
 #define REGISTER_GPU_KERNEL(T) template struct SplitOpGPULaunch<T>;
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_KERNEL);
+TF_CALL_complex64(REGISTER_GPU_KERNEL);
+TF_CALL_complex128(REGISTER_GPU_KERNEL);
 #undef REGISTER_GPU_KERNEL
 #define REGISTER_GPU_KERNEL(T)                 \
   template struct SplitVOpGPULaunch<T, int32>; \
   template struct SplitVOpGPULaunch<T, int64>;
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_KERNEL);
+TF_CALL_complex64(REGISTER_GPU_KERNEL);
+TF_CALL_complex128(REGISTER_GPU_KERNEL);
 REGISTER_GPU_KERNEL(bfloat16);
 #undef REGISTER_GPU_KERNEL
 
diff --git a/tensorflow/core/kernels/split_op.cc b/tensorflow/core/kernels/split_op.cc
index cca2fc41c2..cf22a22fa3 100644
--- a/tensorflow/core/kernels/split_op.cc
+++ b/tensorflow/core/kernels/split_op.cc
@@ -337,6 +337,8 @@ REGISTER_SPLIT(quint8);
                           SplitOpGPU<type>)
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 #undef REGISTER_GPU
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/split_v_op.cc b/tensorflow/core/kernels/split_v_op.cc
index 47d98a9f08..114b41ae42 100644
--- a/tensorflow/core/kernels/split_v_op.cc
+++ b/tensorflow/core/kernels/split_v_op.cc
@@ -374,6 +374,8 @@ REGISTER_SPLIT_LEN(bfloat16);
   REGISTER_GPU(type, int64);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_LEN);
+TF_CALL_complex64(REGISTER_GPU_LEN);
+TF_CALL_complex128(REGISTER_GPU_LEN);
 REGISTER_GPU_LEN(bfloat16);
 #undef REGISTER_GPU_LEN
 #undef REGISTER_GPU
diff --git a/tensorflow/python/kernel_tests/split_op_test.py b/tensorflow/python/kernel_tests/split_op_test.py
index 9eed5bedab..38093ab6d6 100644
--- a/tensorflow/python/kernel_tests/split_op_test.py
+++ b/tensorflow/python/kernel_tests/split_op_test.py
@@ -28,15 +28,24 @@ from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 
+_TEST_DTYPES = (dtypes.float32, dtypes.float64, dtypes.complex64,
+                dtypes.complex128)
+
 
 class SplitOpTest(test.TestCase):
 
+  def _makeData(self, shape, dtype):
+    data = np.random.rand(*shape).astype(dtype.as_numpy_dtype)
+    if dtype.is_complex:
+      data -= 1j * data
+    return data
+
   def testExplicitNum(self):
     size_splits = array_ops.placeholder(dtype=dtypes.int32, shape=[None])
 
     value = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
 
-    with self.test_session(use_gpu=False) as sess:
+    with self.test_session(use_gpu=True) as sess:
       with self.assertRaises(ValueError) as context:
         sess.run(array_ops.split(value, size_splits), {size_splits: [2, 2, 6]})
 
@@ -55,13 +64,13 @@ class SplitOpTest(test.TestCase):
 
     value = np.random.rand(11, 11)
 
-    with self.test_session(use_gpu=False) as sess:
+    with self.test_session(use_gpu=True) as sess:
       result = sess.run(array_ops.split(value, [a, b]))
 
     self.assertAllEqual(result[0], value[0:5, :])
     self.assertAllEqual(result[1], value[5:, :])
 
-  def _RunAndVerifyVariable(self, use_gpu, large_num_splits=False):
+  def _RunAndVerifyVariable(self, dtype, large_num_splits=False):
     # Random dims of rank 5
     shape = np.random.randint(1, 5, size=5)
     split_dim = np.random.randint(0, 5)
@@ -71,8 +80,8 @@ class SplitOpTest(test.TestCase):
       num_split = np.random.randint(2, 8)
     size_splits = np.random.randint(2, 8, num_split)
     shape[split_dim] = np.sum(size_splits)
-    inp = np.random.rand(*shape).astype("f")
-    with self.test_session(use_gpu=use_gpu) as sess:
+    inp = self._makeData(shape, dtype)
+    with self.test_session(use_gpu=True) as sess:
       result = sess.run(array_ops.split(inp, size_splits, split_dim))
     slices = [slice(0, x) for x in shape]
     offset = 0
@@ -81,10 +90,10 @@ class SplitOpTest(test.TestCase):
       offset += size_splits[i]
       self.assertAllEqual(result[i], inp[slices])
 
-  def _testSpecialCasesVariable(self, use_gpu):
+  def _testSpecialCasesVariable(self):
     inp = np.random.rand(4, 4).astype("f")
 
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=True) as sess:
       result = sess.run(array_ops.split(inp, [4], 0))
       self.assertAllEqual(result[0], inp)
 
@@ -92,13 +101,13 @@ class SplitOpTest(test.TestCase):
       self.assertAllEqual(result[0], inp[0:1, :])
       self.assertAllEqual(result[1], inp[1:4, :])
 
-  def _testHugeNumberOfTensorsVariable(self, use_gpu):
+  def _testHugeNumberOfTensorsVariable(self, dtype):
     num_split = 10000
     size_splits = np.random.randint(1, 3, num_split)
     shape = [3, np.sum(size_splits)]
     split_dim = 1
-    inp = np.random.rand(*shape).astype("f")
-    with self.test_session(use_gpu=use_gpu) as sess:
+    inp = self._makeData(shape, dtype)
+    with self.test_session(use_gpu=True) as sess:
       result = sess.run(array_ops.split(inp, size_splits, split_dim))
     slices = [slice(0, x) for x in shape]
     offset = 0
@@ -108,18 +117,17 @@ class SplitOpTest(test.TestCase):
       self.assertAllEqual(result[i], inp[slices])
 
   def testSpecialCasesVariable(self):
-    self._testSpecialCasesVariable(False)
-    self._testSpecialCasesVariable(True)
-    self._testHugeNumberOfTensorsVariable(False)
-    self._testHugeNumberOfTensorsVariable(True)
+    self._testSpecialCasesVariable()
+    for dtype in _TEST_DTYPES:
+      self._testHugeNumberOfTensorsVariable(dtype)
 
-  def _testGradientsSimpleVariable(self, use_gpu):
-    inp = np.random.rand(4, 4).astype("f")
-    with self.test_session(use_gpu=use_gpu):
+  def _testGradientsSimpleVariable(self, dtype):
+    inp = self._makeData((4, 4), dtype)
+    with self.test_session(use_gpu=True):
       inp_tensor = ops.convert_to_tensor(inp)
       s = array_ops.split(inp_tensor, [1, 3], 1)
       inp_grads = [
-          np.random.rand(4, 1).astype("f"), np.random.rand(4, 3).astype("f")
+          self._makeData((4, 1), dtype), self._makeData((4, 3), dtype)
       ]
       grad_tensors = [constant_op.constant(x) for x in inp_grads]
       grad = gradients_impl.gradients(s, [inp_tensor], grad_tensors)[-1]
@@ -129,16 +137,16 @@ class SplitOpTest(test.TestCase):
     self.assertAllEqual(result[:, 1:4], inp_grads[1])
 
   def testOutputShape(self):
-    with self.test_session(use_gpu=False):
+    with self.test_session(use_gpu=True):
       tensor = array_ops.placeholder(dtypes.float32, shape=[None, 12])
       size_splits = [3, 7, 2]
       outputs = array_ops.split(tensor, size_splits, 1)
       for i, output in enumerate(outputs):
         self.assertEqual(output.get_shape().as_list(), [None, size_splits[i]])
 
-  def _compare(self, x, dim, num, use_gpu):
+  def _compare(self, x, dim, num):
     np_ans = np.split(x, num, dim)
-    with self.test_session(use_gpu=use_gpu) as sess:
+    with self.test_session(use_gpu=True) as sess:
       tf_ans = array_ops.split(value=x, num_or_size_splits=num, axis=dim)
       out = sess.run(tf_ans)
     self.assertEqual(num, len(np_ans))
@@ -148,21 +156,15 @@ class SplitOpTest(test.TestCase):
       self.assertAllEqual(np_ans[i], out[i])
       self.assertShapeEqual(np_ans[i], tf_ans[i])
 
-  def _testSplitRows(self, use_gpu):
-    inp = np.random.rand(4, 4).astype("f")
-    self._compare(inp, 0, 4, use_gpu)
-
-  def testSplitRowsAll(self):
-    self._testSplitRows(use_gpu=False)
-    self._testSplitRows(use_gpu=True)
-
-  def _testSplitCols(self, use_gpu):
-    inp = np.random.rand(4, 4).astype("f")
-    self._compare(inp, 1, 4, use_gpu)
+  def testSplitRows(self):
+    for dtype in _TEST_DTYPES:
+      inp = self._makeData((4, 4), dtype)
+      self._compare(inp, 0, 4)
 
-  def testSplitColsAll(self):
-    self._testSplitRows(use_gpu=False)
-    self._testSplitCols(use_gpu=True)
+  def testSplitCols(self):
+    for dtype in _TEST_DTYPES:
+      inp = self._makeData((4, 4), dtype)
+      self._compare(inp, 1, 4)
 
   def _testEmpty(self, x, dim, num, expected_shape):
     with self.test_session() as sess:
@@ -177,27 +179,28 @@ class SplitOpTest(test.TestCase):
   def testEmpty(self):
     # Note: np.split returns a rank-0 empty ndarray
     # if the input ndarray is empty.
-    inp = np.random.rand(8, 0, 21).astype("f")
-    self._testEmpty(inp, 0, 2, (4, 0, 21))
-    self._testEmpty(inp, 0, 4, (2, 0, 21))
-    self._testEmpty(inp, 1, 4, (8, 0, 21))
-    self._testEmpty(inp, 2, 3, (8, 0, 7))
-    self._testEmpty(inp, 2, 7, (8, 0, 3))
+    for dtype in _TEST_DTYPES:
+      inp = self._makeData((8, 0, 21), dtype)
+      self._testEmpty(inp, 0, 2, (4, 0, 21))
+      self._testEmpty(inp, 0, 4, (2, 0, 21))
+      self._testEmpty(inp, 1, 4, (8, 0, 21))
+      self._testEmpty(inp, 2, 3, (8, 0, 7))
+      self._testEmpty(inp, 2, 7, (8, 0, 3))
 
   def testIdentity(self):
-    inp = np.random.rand(2, 2, 2).astype("f")
-    for use_gpu in [False, True]:
-      self._compare(inp, 0, 1, use_gpu)
-      self._compare(inp, 1, 1, use_gpu)
-      self._compare(inp, 2, 1, use_gpu)
+    for dtype in _TEST_DTYPES:
+      inp = self._makeData((2, 2, 2), dtype)
+      self._compare(inp, 0, 1)
+      self._compare(inp, 1, 1)
+      self._compare(inp, 2, 1)
 
   def testSplitDim0(self):
-    for use_gpu in [False, True]:
-      self._compare(np.random.rand(6, 10, 18).astype("f"), 0, 3, use_gpu)
-      self._compare(np.random.rand(6, 7, 18).astype("f"), 0, 3, use_gpu)
-      self._compare(np.random.rand(6, 7, 9).astype("f"), 0, 3, use_gpu)
+    for dtype in _TEST_DTYPES:
+      self._compare(self._makeData((6, 10, 18), dtype), 0, 3)
+      self._compare(self._makeData((6, 7, 18), dtype), 0, 3)
+      self._compare(self._makeData((6, 7, 9), dtype), 0, 3)
 
-  def _RunAndVerify(self, use_gpu, large_num_splits=False):
+  def _RunAndVerify(self, dtype, large_num_splits=False):
     # Random dims of rank 5
     shape = np.random.randint(0, 5, size=5)
     split_dim = np.random.randint(0, 5)
@@ -206,8 +209,8 @@ class SplitOpTest(test.TestCase):
     else:
       num_split = np.random.randint(2, 8)
     shape[split_dim] = np.random.randint(2, 5) * num_split
-    inp = np.random.rand(*shape).astype("f")
-    with self.test_session(use_gpu=use_gpu) as sess:
+    inp = self._makeData(shape, dtype)
+    with self.test_session(use_gpu=True) as sess:
       result = sess.run(
           array_ops.split(
               value=inp, num_or_size_splits=num_split, axis=split_dim))
@@ -220,20 +223,19 @@ class SplitOpTest(test.TestCase):
       self.assertAllEqual(result[i], inp[slices])
 
   def testRandom(self):
-    for _ in range(5):
-      self._RunAndVerify(use_gpu=False)
-      self._RunAndVerify(use_gpu=True)
-      self._RunAndVerify(use_gpu=True, large_num_splits=True)
-      self._RunAndVerifyVariable(use_gpu=False)
-      self._RunAndVerifyVariable(use_gpu=True)
-      self._RunAndVerifyVariable(use_gpu=True, large_num_splits=True)
-
-  def _testGradientsSimple(self, use_gpu):
-    inp = np.random.rand(4, 4).astype("f")
-    with self.test_session(use_gpu=use_gpu):
+    for dtype in _TEST_DTYPES:
+      for _ in range(5):
+        self._RunAndVerify(dtype)
+        self._RunAndVerify(dtype, large_num_splits=True)
+        self._RunAndVerifyVariable(dtype)
+        self._RunAndVerifyVariable(dtype, large_num_splits=True)
+
+  def _testGradientsSimple(self, dtype):
+    inp = self._makeData((4, 4), dtype)
+    with self.test_session(use_gpu=True):
       inp_tensor = ops.convert_to_tensor(inp)
       s = array_ops.split(value=inp_tensor, num_or_size_splits=4, axis=1)
-      inp_grads = [np.random.rand(4, 1).astype("f") for _ in range(4)]
+      inp_grads = [self._makeData((4, 1), dtype)for _ in range(4)]
       grad_tensors = [constant_op.constant(x) for x in inp_grads]
       grad = gradients_impl.gradients(s, [inp_tensor], grad_tensors)[0]
       result = grad.eval()
@@ -241,10 +243,9 @@ class SplitOpTest(test.TestCase):
       self.assertAllEqual(result[:, i:i + 1], inp_grads[i])
 
   def testGradientsAll(self):
-    self._testGradientsSimple(use_gpu=False)
-    self._testGradientsSimple(use_gpu=True)
-    self._testGradientsSimpleVariable(use_gpu=False)
-    self._testGradientsSimpleVariable(use_gpu=True)
+    for dtype in _TEST_DTYPES:
+      self._testGradientsSimple(dtype)
+      self._testGradientsSimpleVariable(dtype)
 
   def testShapeFunctionEdgeCases(self):
     # split_dim greater than rank of input.
-- 
GitLab


From 8cabe77fabd6eb395b9d751c82c18f32b8ce492d Mon Sep 17 00:00:00 2001
From: Dustin Tran <dustinviettran@gmail.com>
Date: Mon, 10 Apr 2017 21:25:02 -0400
Subject: [PATCH 0297/1563] Add check op for assert valid sample in Bernoulli
 for contrib.distributions (#8635)

* add check op for valid sample in bernoulli.py

* replace call to tf.ones_like with array_ops.ones_like

* remove check_integer test
---
 .../python/kernel_tests/bernoulli_test.py           |  9 +++++++++
 .../contrib/distributions/python/ops/bernoulli.py   | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
index 6ba872ef9c..87b2331a1d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
@@ -148,6 +148,15 @@ class BernoulliTest(test.TestCase):
               p: [0.2, 0.3, 0.4]
           }), [[0.2, 0.7, 0.4]])
 
+  def testPmfInvalid(self):
+    p = [0.1, 0.2, 0.7]
+    with self.test_session():
+      dist = bernoulli.Bernoulli(probs=p, validate_args=True)
+      with self.assertRaisesOpError("must be non-negative."):
+        dist.prob([1, 1, -1]).eval()
+      with self.assertRaisesOpError("is not less than or equal to 1."):
+        dist.prob([2, 0, 1]).eval()
+
   def testPmfWithP(self):
     p = [[0.2, 0.4], [0.3, 0.6]]
     self._testPmf(probs=p)
diff --git a/tensorflow/contrib/distributions/python/ops/bernoulli.py b/tensorflow/contrib/distributions/python/ops/bernoulli.py
index 33e6dbd78b..c491cb5d42 100644
--- a/tensorflow/contrib/distributions/python/ops/bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/bernoulli.py
@@ -25,6 +25,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
@@ -120,6 +121,7 @@ class Bernoulli(distribution.Distribution):
     return math_ops.cast(sample, self.dtype)
 
   def _log_prob(self, event):
+    event = self._maybe_assert_valid_sample(event)
     # TODO(jaana): The current sigmoid_cross_entropy_with_logits has
     # inconsistent  behavior for logits = inf/-inf.
     event = math_ops.cast(event, self.logits.dtype)
@@ -160,6 +162,17 @@ class Bernoulli(distribution.Distribution):
     """Returns `1` if `prob > 0.5` and `0` otherwise."""
     return math_ops.cast(self.probs > 0.5, self.dtype)
 
+  def _maybe_assert_valid_sample(self, event, check_integer=True):
+    if not self.validate_args:
+      return event
+    event = distribution_util.embed_check_nonnegative_discrete(
+        event, check_integer=check_integer)
+    return control_flow_ops.with_dependencies([
+        check_ops.assert_less_equal(
+            event, array_ops.ones_like(event),
+            message="event is not less than or equal to 1."),
+    ], event)
+
 
 class BernoulliWithSigmoidProbs(Bernoulli):
   """Bernoulli with `probs = nn.sigmoid(logits)`."""
-- 
GitLab


From 0054c39243f7bdba159cd530241aa968211d9f83 Mon Sep 17 00:00:00 2001
From: zjj2wry <zhengjiajin2016@gmail.com>
Date: Tue, 11 Apr 2017 09:54:05 +0800
Subject: [PATCH 0298/1563] add code description (#9106)

* add code description

* add space after comma

* Add period to comply with style.
---
 tensorflow/examples/learn/iris_custom_decay_dnn.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/examples/learn/iris_custom_decay_dnn.py b/tensorflow/examples/learn/iris_custom_decay_dnn.py
index 73c526cd4e..31acbd30cd 100644
--- a/tensorflow/examples/learn/iris_custom_decay_dnn.py
+++ b/tensorflow/examples/learn/iris_custom_decay_dnn.py
@@ -11,6 +11,8 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+"""Example of DNNClassifier for Iris plant dataset, with exponential decay."""
+
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-- 
GitLab


From 75fa9ea1acd363b6f1770a714a9391890993d0d5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 19:14:04 -0800
Subject: [PATCH 0299/1563] Add a utility to check ops in a graph are supported
 on hvx Change: 152768777

---
 tensorflow/BUILD                              |  1 +
 .../contrib/hvx/hvx_ops_support_checker/BUILD | 35 +++++++
 .../hvx_ops_support_checker_main.cc           | 91 +++++++++++++++++++
 .../hexagon/hexagon_ops_definitions.cc        |  1 +
 4 files changed, 128 insertions(+)
 create mode 100644 tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD
 create mode 100644 tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index a943b871bb..f356dac100 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -210,6 +210,7 @@ filegroup(
         "//tensorflow/contrib/graph_editor:all_files",
         "//tensorflow/contrib/grid_rnn:all_files",
         "//tensorflow/contrib/hooks:all_files",
+        "//tensorflow/contrib/hvx/hvx_ops_support_checker:all_files",
         "//tensorflow/contrib/image:all_files",
         "//tensorflow/contrib/imperative:all_files",
         "//tensorflow/contrib/input_pipeline:all_files",
diff --git a/tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD b/tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD
new file mode 100644
index 0000000000..922996a686
--- /dev/null
+++ b/tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD
@@ -0,0 +1,35 @@
+# Description:
+#   Contains a tool to dump TensorFlow ops which are not supported
+#   in TensorFlow HVX runtime.
+
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+)
+
+cc_binary(
+    name = "hvx_ops_support_checker",
+    testonly = 1,
+    srcs = ["hvx_ops_support_checker_main.cc"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:tensorflow",
+        "//tensorflow/core/kernels/hexagon:graph_transferer",
+        "//tensorflow/tools/graph_transforms:transform_utils",
+    ],
+)
diff --git a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
new file mode 100644
index 0000000000..200714046c
--- /dev/null
+++ b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
@@ -0,0 +1,91 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// bazel build tensorflow/contrib/hvx/hvx_ops_support_checker &&
+// bazel-bin/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker
+// \
+// --in_graph=graph_def.pb
+
+#include <unordered_set>
+
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/util/command_line_flags.h"
+#include "tensorflow/tools/graph_transforms/transform_utils.h"
+
+namespace tensorflow {
+namespace {
+static int ParseFlags(int argc, char* argv[], string* in_graph) {
+  std::vector<Flag> flag_list = {
+      Flag("in_graph", in_graph, "input graph file name"),
+  };
+  CHECK(Flags::Parse(&argc, argv, flag_list));
+  string usage = Flags::Usage(argv[0], flag_list);
+  CHECK(in_graph->empty()) << "in_graph graph can't be empty.\n" << usage;
+
+  return 0;
+}
+
+static void CheckOpsSupport(const GraphDef& graph_def) {
+  const IGraphTransferOpsDefinitions& ops_definition =
+      HexagonOpsDefinitions::getInstance();
+  LOG(INFO) << "Checking " << graph_def.node_size() << " nodes";
+
+  std::unordered_set<string> unsupported_ops;
+  bool all_supported = true;
+  for (const NodeDef& node : graph_def.node()) {
+    const int op_id = ops_definition.GetOpIdFor(node.op());
+    if (op_id == IGraphTransferOpsDefinitions::INVALID_OP_ID) {
+      all_supported = false;
+      LOG(ERROR) << "OP type: " << node.op() << " is not supported on hvx. "
+                 << "Name = " << node.name();
+      unsupported_ops.emplace(node.op());
+    }
+  }
+
+  LOG(INFO) << "\n";
+  LOG(INFO) << "Unsupported ops:";
+  int count = 0;
+  for (const string& op_type : unsupported_ops) {
+    LOG(INFO) << "(" << (++count) << ") " << op_type;
+  }
+  if (count == 0) {
+    LOG(INFO) << "All ops supported!";
+  } else {
+    LOG(INFO) << count << " ops are not supported.";
+  }
+}
+
+}  // namespace
+}  // namespace tensorflow
+
+int main(int argc, char** argv) {
+  tensorflow::string in_graph;
+  const int ret = tensorflow::ParseFlags(argc, argv, &in_graph);
+  if (ret != 0) {
+    return ret;
+  }
+
+  tensorflow::GraphDef graph_def;
+  TF_CHECK_OK(tensorflow::graph_transforms::LoadTextOrBinaryGraphFile(
+      in_graph, &graph_def));
+
+  tensorflow::CheckOpsSupport(graph_def);
+  return 0;
+}
diff --git a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
index ad9200e948..6a7d6713fd 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
@@ -156,6 +156,7 @@ const std::unordered_map<string, SupportedOpType> OP_NAME_TO_SOC_OP_TYPE_MAP{
     {"NoOp", SupportedOpType::NOP},
     {IGraphTransferOpsDefinitions::FLATTEN_OP_NAME, SupportedOpType::FLATTEN},
     // Tensorflow op name
+    {"Const", SupportedOpType::OP_CONST},
     {"QuantizedConv2D", SupportedOpType::QUANTIZEDCONV2D_8X8TO32},
     {"QuantizedMatMul", SupportedOpType::QUANTIZEDMATMUL_8X8TO32},
     {"QuantizeDownAndShrinkRange",
-- 
GitLab


From 0f7df20b2ca2eae753437503b7fe80bf09315ad3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 04:46:01 -0800
Subject: [PATCH 0300/1563] Allow callers to control the names of the slot
 variables.

Other optimizers which have only a single slot variable allow control through
the 'name' constructor parameter, but the FtrlOptimizer has two variables.
Because they both are created with the same 'name' parameter, one of them has
name as a suffix, and the other has name + "_1" as a suffix.  This change
allows them to be specified in a more controllable way.
Change: 152802478
---
 tensorflow/python/training/ftrl.py            | 63 ++++++++++++-------
 .../tensorflow.train.-ftrl-optimizer.pbtxt    |  2 +-
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/tensorflow/python/training/ftrl.py b/tensorflow/python/training/ftrl.py
index f5b8959612..618f3baf08 100644
--- a/tensorflow/python/training/ftrl.py
+++ b/tensorflow/python/training/ftrl.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
 """Ftrl-proximal for TensorFlow."""
 from __future__ import absolute_import
 from __future__ import division
@@ -32,12 +31,16 @@ class FtrlOptimizer(optimizer.Optimizer):
   https://www.eecs.tufts.edu/~dsculley/papers/ad-click-prediction.pdf).
   """
 
-  def __init__(self, learning_rate,
+  def __init__(self,
+               learning_rate,
                learning_rate_power=-0.5,
                initial_accumulator_value=0.1,
                l1_regularization_strength=0.0,
                l2_regularization_strength=0.0,
-               use_locking=False, name="Ftrl"):
+               use_locking=False,
+               name="Ftrl",
+               accum_name=None,
+               linear_name=None):
     """Construct a new FTRL optimizer.
 
     Args:
@@ -52,6 +55,10 @@ class FtrlOptimizer(optimizer.Optimizer):
       use_locking: If `True` use locks for update operations.
       name: Optional name prefix for the operations created when applying
         gradients.  Defaults to "Ftrl".
+      accum_name: The suffix for the variable that keeps the gradient squared
+        accumulator.  If not present, defaults to name.
+      linear_name: The suffix for the variable that keeps the linear gradient
+        accumulator.  If not present, defaults to name + "_1".
 
     Raises:
       ValueError: If one of the arguments is invalid.
@@ -82,35 +89,36 @@ class FtrlOptimizer(optimizer.Optimizer):
     self._learning_rate_power_tensor = None
     self._l1_regularization_strength_tensor = None
     self._l2_regularization_strength_tensor = None
+    self._accum_name = accum_name
+    self._linear_name = linear_name
 
   def _create_slots(self, var_list):
     # Create the "accum" and "linear" slots.
     for v in var_list:
       with ops.colocate_with(v):
-        val = constant_op.constant(self._initial_accumulator_value,
-                                   dtype=v.dtype, shape=v.get_shape())
-        self._get_or_make_slot(v, val, "accum", self._name)
-        self._zeros_slot(v, "linear", self._name)
+        val = constant_op.constant(
+            self._initial_accumulator_value, dtype=v.dtype, shape=v.get_shape())
+        self._get_or_make_slot(v, val, "accum", self._accum_name or self._name)
+        self._zeros_slot(v, "linear", self._linear_name or self._name)
 
   def _prepare(self):
     self._learning_rate_tensor = ops.convert_to_tensor(
-        self._learning_rate,
-        name="learning_rate")
+        self._learning_rate, name="learning_rate")
     self._l1_regularization_strength_tensor = ops.convert_to_tensor(
-        self._l1_regularization_strength,
-        name="l1_regularization_strength")
+        self._l1_regularization_strength, name="l1_regularization_strength")
     self._l2_regularization_strength_tensor = ops.convert_to_tensor(
-        self._l2_regularization_strength,
-        name="l2_regularization_strength")
+        self._l2_regularization_strength, name="l2_regularization_strength")
     self._learning_rate_power_tensor = ops.convert_to_tensor(
-        self._learning_rate_power,
-        name="learning_rate_power")
+        self._learning_rate_power, name="learning_rate_power")
 
   def _apply_dense(self, grad, var):
     accum = self.get_slot(var, "accum")
     linear = self.get_slot(var, "linear")
     return training_ops.apply_ftrl(
-        var, accum, linear, grad,
+        var,
+        accum,
+        linear,
+        grad,
         math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
         math_ops.cast(self._l1_regularization_strength_tensor,
                       var.dtype.base_dtype),
@@ -123,7 +131,10 @@ class FtrlOptimizer(optimizer.Optimizer):
     accum = self.get_slot(var, "accum")
     linear = self.get_slot(var, "linear")
     return training_ops.resource_apply_ftrl(
-        var.handle, accum.handle, linear.handle, grad,
+        var.handle,
+        accum.handle,
+        linear.handle,
+        grad,
         math_ops.cast(self._learning_rate_tensor, grad.dtype.base_dtype),
         math_ops.cast(self._l1_regularization_strength_tensor,
                       grad.dtype.base_dtype),
@@ -136,7 +147,11 @@ class FtrlOptimizer(optimizer.Optimizer):
     accum = self.get_slot(var, "accum")
     linear = self.get_slot(var, "linear")
     return training_ops.sparse_apply_ftrl(
-        var, accum, linear, grad.values, grad.indices,
+        var,
+        accum,
+        linear,
+        grad.values,
+        grad.indices,
         math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
         math_ops.cast(self._l1_regularization_strength_tensor,
                       var.dtype.base_dtype),
@@ -149,11 +164,13 @@ class FtrlOptimizer(optimizer.Optimizer):
     accum = self.get_slot(var, "accum")
     linear = self.get_slot(var, "linear")
     return training_ops.resource_sparse_apply_ftrl(
-        var.handle, accum.handle, linear.handle, grad, indices,
+        var.handle,
+        accum.handle,
+        linear.handle,
+        grad,
+        indices,
         math_ops.cast(self._learning_rate_tensor, grad.dtype),
-        math_ops.cast(self._l1_regularization_strength_tensor,
-                      grad.dtype),
-        math_ops.cast(self._l2_regularization_strength_tensor,
-                      grad.dtype),
+        math_ops.cast(self._l1_regularization_strength_tensor, grad.dtype),
+        math_ops.cast(self._l2_regularization_strength_tensor, grad.dtype),
         math_ops.cast(self._learning_rate_power_tensor, grad.dtype),
         use_locking=self._use_locking)
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
index 0252474a1d..2dc11df57b 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-ftrl-optimizer.pbtxt
@@ -17,7 +17,7 @@ tf_class {
   }
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'learning_rate\', \'learning_rate_power\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\'], varargs=None, keywords=None, defaults=[\'-0.5\', \'0.1\', \'0.0\', \'0.0\', \'False\', \'Ftrl\'], "
+    argspec: "args=[\'self\', \'learning_rate\', \'learning_rate_power\', \'initial_accumulator_value\', \'l1_regularization_strength\', \'l2_regularization_strength\', \'use_locking\', \'name\', \'accum_name\', \'linear_name\'], varargs=None, keywords=None, defaults=[\'-0.5\', \'0.1\', \'0.0\', \'0.0\', \'False\', \'Ftrl\', \'None\', \'None\'], "
   }
   member_method {
     name: "apply_gradients"
-- 
GitLab


From 858678e34865bbb8a515b7d5c9aec59e3dc72eca Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Tue, 11 Apr 2017 04:50:46 -0800
Subject: [PATCH 0301/1563] [XLA:CPU] VLOG(1) the target CPU and its feature in
 SimpleOrcJIT's constructor. Change: 152802749

---
 tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc b/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc
index 8beb565ab3..22066e1d32 100644
--- a/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc
+++ b/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc
@@ -142,7 +142,10 @@ SimpleOrcJIT::SimpleOrcJIT(const llvm::TargetOptions &target_options,
       data_layout_(target_machine_->createDataLayout()),
       compile_layer_(object_layer_,
                      CompilerFunctor(target_machine_.get(), &disassembler_,
-                                     opt_level, GetAvailableIntrinsics())) {}
+                                     opt_level, GetAvailableIntrinsics())) {
+  VLOG(1) << "CPU target: " << target_machine_->getTargetCPU().str()
+          << " features: " << target_machine_->getTargetFeatureString().str();
+}
 
 SimpleOrcJIT::ModuleHandleT SimpleOrcJIT::AddModule(
     std::unique_ptr<llvm::Module> module) {
-- 
GitLab


From fefea3315dd16d6b10df9a8faba5cebe1f749183 Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Tue, 11 Apr 2017 08:13:05 -0800
Subject: [PATCH 0302/1563] [XLA:CPU] Disable AVX512

The AVX512 support in LLVM hasn't solidified enough. Ignore support for it
while it stabilizes.
Change: 152819598
---
 .../compiler/xla/service/cpu/simple_orc_jit.cc   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc b/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc
index 22066e1d32..7c74912a7a 100644
--- a/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc
+++ b/tensorflow/compiler/xla/service/cpu/simple_orc_jit.cc
@@ -112,13 +112,25 @@ llvm::SmallVector<std::string, 0> DetectMachineAttributes() {
   if (llvm::sys::getHostCPUFeatures(host_features)) {
     for (auto &feature : host_features) {
       if (feature.second) {
-        result.push_back(feature.first());
+        llvm::StringRef feature_name = feature.first();
+        // Skip avx512 for now, it isn't quite ready in LLVM.
+        if (feature_name.startswith("avx512")) {
+          continue;
+        }
+        result.push_back(feature_name);
       }
     }
   }
   return result;
 }
 
+llvm::StringRef GetHostCpuName() {
+  auto cpu_name = llvm::sys::getHostCPUName();
+  // Skip avx512 for now, it isn't quite ready in LLVM.
+  cpu_name.consume_back("-avx512");
+  return cpu_name;
+}
+
 CompilerFunctor::VectorIntrinsics GetAvailableIntrinsics() {
   CompilerFunctor::VectorIntrinsics intrinsics;
   intrinsics.sse_intrinsics = (&runtime::ExpV4F32 != nullptr);
@@ -136,7 +148,7 @@ SimpleOrcJIT::SimpleOrcJIT(const llvm::TargetOptions &target_options,
                             .setOptLevel(opt_level)
                             .selectTarget(
                                 /*TargetTriple=*/llvm::Triple(), /*MArch=*/"",
-                                /*MCPU=*/llvm::sys::getHostCPUName(),
+                                /*MCPU=*/GetHostCpuName(),
                                 /*MAttrs=*/DetectMachineAttributes()))),
       disassembler_(*target_machine_),
       data_layout_(target_machine_->createDataLayout()),
-- 
GitLab


From 315443bbb01719a9e417826c4a077c47056bc071 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Tue, 11 Apr 2017 08:32:26 -0800
Subject: [PATCH 0303/1563] Remove explicit FunctionLibraryDefinition from
 tfcompile_main.cc

Instead of passing around a manually-constructed FunctionLibraryDefinition, use the constructed graph's FunctionLibraryDefinition.
Change: 152821479
---
 tensorflow/compiler/aot/compile.cc        | 13 +++++--------
 tensorflow/compiler/aot/compile.h         |  4 +---
 tensorflow/compiler/aot/tfcompile_main.cc |  6 ++----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index 1284155c07..4b5534c164 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -275,7 +275,6 @@ Status CreateXlaArgs(const Graph& graph,
 // Converts the TensorFlow graph into an XLA computation, by executing the
 // graph symbolically, with each op building up the XLA HLO.
 Status ConvertGraphToXla(xla::LocalClient* client, std::unique_ptr<Graph> graph,
-                         const FunctionLibraryDefinition* flib_def,
                          xla::Computation* computation, bool* has_context_arg) {
   // Create a device and context to convert the graph into an XLA computation.
   XlaOpRegistry::RegisterCompilationKernels();
@@ -295,7 +294,7 @@ Status ConvertGraphToXla(xla::LocalClient* client, std::unique_ptr<Graph> graph,
 
   std::unique_ptr<FunctionLibraryRuntime> flib_run(NewFunctionLibraryRuntime(
       compiler.device_mgr(), Env::Default(), compiler.device(),
-      graph->versions().producer(), flib_def, OptimizerOptions()));
+      graph->versions().producer(), &graph->flib_def(), OptimizerOptions()));
   XlaCompiler::CompilationResult result;
   TF_RETURN_IF_ERROR(compiler.CompileGraph("tfcompile", std::move(graph),
                                            flib_run.get(), xla_args, &result));
@@ -373,10 +372,10 @@ Status CompileXla(xla::LocalClient* client, const xla::Computation& computation,
 }  // namespace
 
 Status InitGraph(const GraphDef& graph_def, const Config& config,
-                 const MainFlags& flags, const FunctionLibraryDefinition* flib,
-                 std::unique_ptr<Graph>* graph) {
+                 const MainFlags& flags, std::unique_ptr<Graph>* graph) {
   TF_RETURN_IF_ERROR(ValidateConfig(config));
-  std::unique_ptr<Graph> g(new Graph(flib));
+  FunctionLibraryDefinition flib_def(OpRegistry::Global(), graph_def.library());
+  std::unique_ptr<Graph> g(new Graph(flib_def));
   GraphDef copy_def(graph_def);
   TF_RETURN_IF_ERROR(AddDefaultAttrsToGraphDef(&copy_def, *g->op_registry(),
                                                0 /*node_offset*/));
@@ -388,7 +387,6 @@ Status InitGraph(const GraphDef& graph_def, const Config& config,
 }
 
 Status CompileGraph(std::unique_ptr<Graph> graph, const MainFlags& flags,
-                    const FunctionLibraryDefinition* flib,
                     CompileResult* compile_result) {
   // Converts the graph into an XLA computation, and compiles the
   // computation.
@@ -399,8 +397,7 @@ Status CompileGraph(std::unique_ptr<Graph> graph, const MainFlags& flags,
   xla::LocalClient* client =
       xla::ClientLibrary::GetOrCreateLocalClient(cpu_platform).ValueOrDie();
   xla::Computation computation;
-  TF_RETURN_IF_ERROR(ConvertGraphToXla(client, std::move(graph), flib,
-                                       &computation,
+  TF_RETURN_IF_ERROR(ConvertGraphToXla(client, std::move(graph), &computation,
                                        &compile_result->has_context_arg));
   if (!flags.debug_dir.empty()) {
     TF_ASSIGN_OR_RETURN(std::unique_ptr<xla::SessionModule> module,
diff --git a/tensorflow/compiler/aot/compile.h b/tensorflow/compiler/aot/compile.h
index 8e9c64820b..e929272b2e 100644
--- a/tensorflow/compiler/aot/compile.h
+++ b/tensorflow/compiler/aot/compile.h
@@ -56,8 +56,7 @@ extern const char* const kDebugNameAttr;
 // compute the outputs.  If dump_graphs is true, graph rewrites will be dumped
 // for debugging.
 Status InitGraph(const GraphDef& graph_def, const Config& config,
-                 const MainFlags& flags, const FunctionLibraryDefinition* flib,
-                 std::unique_ptr<Graph>* graph);
+                 const MainFlags& flags, std::unique_ptr<Graph>* graph);
 
 // CompileResult describes the output of CompileGraph, where the object file
 // data and meta-information is available in aot.
@@ -83,7 +82,6 @@ struct CompileResult {
 //
 // The XLA compilation options are specified in the flags.
 Status CompileGraph(std::unique_ptr<Graph> graph, const MainFlags& flags,
-                    const FunctionLibraryDefinition* flib,
                     CompileResult* result);
 
 }  // namespace tfcompile
diff --git a/tensorflow/compiler/aot/tfcompile_main.cc b/tensorflow/compiler/aot/tfcompile_main.cc
index 59a45538a7..4b7e220769 100644
--- a/tensorflow/compiler/aot/tfcompile_main.cc
+++ b/tensorflow/compiler/aot/tfcompile_main.cc
@@ -95,12 +95,10 @@ Status Main(const MainFlags& flags) {
   GraphDef graph_def;
   TF_RETURN_IF_ERROR(ReadProtoFile("graph", flags.graph, &graph_def));
   std::unique_ptr<Graph> graph;
-  FunctionLibraryDefinition flib(OpRegistry::Global(), graph_def.library());
-  TF_RETURN_IF_ERROR(InitGraph(graph_def, config, flags, &flib, &graph));
+  TF_RETURN_IF_ERROR(InitGraph(graph_def, config, flags, &graph));
 
   CompileResult compile_result;
-  TF_RETURN_IF_ERROR(
-      CompileGraph(std::move(graph), flags, &flib, &compile_result));
+  TF_RETURN_IF_ERROR(CompileGraph(std::move(graph), flags, &compile_result));
 
   // Write output files.
   Env* env = Env::Default();
-- 
GitLab


From 5c8acccfc9e90d694a8394f5522097bfe87379b2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 08:52:06 -0800
Subject: [PATCH 0304/1563] Using GMock matchers in XLA tests. Change:
 152823724

---
 tensorflow/compiler/xla/BUILD                 |  23 +-
 tensorflow/compiler/xla/array2d_test.cc       |   2 +-
 tensorflow/compiler/xla/array3d_test.cc       |   2 +-
 tensorflow/compiler/xla/array4d_test.cc       |   2 +-
 tensorflow/compiler/xla/index_util_test.cc    |  12 +-
 tensorflow/compiler/xla/layout_util_test.cc   |  20 +-
 .../compiler/xla/reference_util_test.cc       |   2 +-
 tensorflow/compiler/xla/service/BUILD         |  42 +--
 .../xla/service/algebraic_simplifier_test.cc  |   9 +-
 .../xla/service/buffer_assignment_test.cc     |  14 +-
 .../compiler/xla/service/call_graph_test.cc   |  28 +-
 .../xla/service/copy_insertion_test.cc        |  22 +-
 tensorflow/compiler/xla/service/gpu/BUILD     |   6 +-
 .../xla/service/gpu/while_transformer_test.cc |   9 +-
 .../xla/service/hlo_computation_test.cc       |  45 ++-
 .../xla/service/hlo_instruction_test.cc       |  65 ++--
 .../compiler/xla/service/hlo_module_test.cc   |  16 +-
 .../compiler/xla/service/hlo_opcode_test.cc   |   2 +-
 .../compiler/xla/service/inliner_test.cc      |   2 +-
 .../xla/service/layout_assignment_test.cc     |   1 +
 .../xla/service/shape_inference_test.cc       | 225 +++++++-------
 .../xla/service/transpose_folding_test.cc     |   5 +-
 .../service/tuple_points_to_analysis_test.cc  |  45 +--
 tensorflow/compiler/xla/shape_tree_test.cc    |   2 +-
 tensorflow/compiler/xla/shape_util_test.cc    |   2 +-
 tensorflow/compiler/xla/status_macros_test.cc |  10 +-
 tensorflow/compiler/xla/statusor_test.cc      |   2 +-
 tensorflow/compiler/xla/test_helpers.cc       |  69 -----
 tensorflow/compiler/xla/test_helpers.h        | 285 ------------------
 tensorflow/compiler/xla/tests/BUILD           |   2 +
 .../xla/tests/array_elementwise_ops_test.cc   |   8 +-
 .../tests/bad_rng_shape_validation_test.cc    |   7 +-
 .../xla/tests/broadcast_simple_test.cc        |  15 +-
 tensorflow/compiler/xla/tests/call_test.cc    |   1 +
 .../xla/tests/check_execution_arity_test.cc   |  24 +-
 .../xla/tests/compute_constant_test.cc        |   9 +-
 tensorflow/compiler/xla/tests/concat_test.cc  |  18 +-
 .../convolution_dimension_numbers_test.cc     |  11 +-
 .../compiler/xla/tests/deallocation_test.cc   |  28 +-
 .../xla/tests/deconstruct_tuple_test.cc       |  41 +--
 .../compiler/xla/tests/dynamic_ops_test.cc    |   1 +
 tensorflow/compiler/xla/tests/hlo_test_base.h |  22 --
 .../xla/tests/inprocess_service_test.cc       |   8 +-
 .../compiler/xla/tests/literal_test_util.cc   |  38 +--
 .../compiler/xla/tests/literal_test_util.h    |   7 +-
 tensorflow/compiler/xla/tests/map_test.cc     |   8 +-
 tensorflow/compiler/xla/tests/reshape_test.cc |  11 +-
 .../compiler/xla/text_literal_reader_test.cc  |   2 +-
 .../compiler/xla/text_literal_writer_test.cc  |   2 +-
 tensorflow/compiler/xla/util_test.cc          |   2 +-
 50 files changed, 429 insertions(+), 805 deletions(-)
 delete mode 100644 tensorflow/compiler/xla/test_helpers.cc

diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index 26ad8ac5f8..7576dff0cd 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -92,6 +92,7 @@ cc_test(
     deps = [
         ":status_macros",
         ":statusor",
+        ":test",
         ":test_helpers",
         "//tensorflow/core:lib",
         "//tensorflow/core:test",
@@ -127,6 +128,7 @@ cc_test(
     srcs = ["statusor_test.cc"],
     deps = [
         ":statusor",
+        ":test",
         ":types",
         "//tensorflow/core:lib",
         "//tensorflow/core:test",
@@ -169,9 +171,9 @@ cc_test(
     name = "util_test",
     srcs = ["util_test.cc"],
     deps = [
+        ":test",
         ":types",
         ":util",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -210,6 +212,7 @@ cc_test(
     srcs = ["shape_util_test.cc"],
     deps = [
         ":shape_util",
+        ":test",
         ":test_helpers",
         ":types",
         ":util",
@@ -223,6 +226,7 @@ cc_test(
     srcs = ["layout_util_test.cc"],
     deps = [
         ":shape_util",
+        ":test",
         ":test_helpers",
         "//tensorflow/compiler/xla/legacy_flags:layout_util_flags",
         "//tensorflow/core:test",
@@ -235,9 +239,9 @@ cc_test(
     srcs = ["index_util_test.cc"],
     deps = [
         ":shape_util",
+        ":test",
         ":test_helpers",
         ":xla_data_proto",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -281,7 +285,6 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":util",
-        ":xla_data_proto",
         "//tensorflow/core:lib",
     ],
 )
@@ -314,7 +317,7 @@ cc_test(
     srcs = ["array2d_test.cc"],
     deps = [
         ":array2d",
-        "//tensorflow/core:test",
+        ":test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -334,8 +337,8 @@ cc_test(
     srcs = ["array3d_test.cc"],
     deps = [
         ":array3d",
+        ":test",
         ":types",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -356,8 +359,8 @@ cc_test(
     srcs = ["array4d_test.cc"],
     deps = [
         ":array4d",
+        ":test",
         "//tensorflow/core:lib",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -389,7 +392,6 @@ cc_library(
 cc_library(
     name = "test_helpers",
     testonly = 1,
-    srcs = ["test_helpers.cc"],
     hdrs = ["test_helpers.h"],
     visibility = [":internal"],
     deps = [
@@ -425,11 +427,11 @@ cc_test(
     deps = [
         ":literal_util",
         ":shape_util",
+        ":test",
         ":text_literal_reader",
         ":types",
         ":xla_data_proto",
         "//tensorflow/core:lib",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -454,6 +456,7 @@ cc_test(
     srcs = ["text_literal_writer_test.cc"],
     deps = [
         ":literal_util",
+        ":test",
         ":test_helpers",
         ":text_literal_writer",
         ":types",
@@ -482,8 +485,8 @@ cc_test(
     deps = [
         ":shape_tree",
         ":shape_util",
+        ":test",
         ":xla_data_proto",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -541,11 +544,11 @@ cc_test(
         ":array4d",
         ":literal_util",
         ":reference_util",
+        ":test",
         ":util",
         ":xla_data_proto",
         "//tensorflow/compiler/xla/client:padding",
         "//tensorflow/compiler/xla/tests:literal_test_util",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/array2d_test.cc b/tensorflow/compiler/xla/array2d_test.cc
index ac107b1c0d..0d502eaf3b 100644
--- a/tensorflow/compiler/xla/array2d_test.cc
+++ b/tensorflow/compiler/xla/array2d_test.cc
@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <initializer_list>
 
-#include "tensorflow/core/platform/test.h"
+#include "tensorflow/compiler/xla/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/array3d_test.cc b/tensorflow/compiler/xla/array3d_test.cc
index fa4435dfc4..6b5f4b343b 100644
--- a/tensorflow/compiler/xla/array3d_test.cc
+++ b/tensorflow/compiler/xla/array3d_test.cc
@@ -17,8 +17,8 @@ limitations under the License.
 
 #include <initializer_list>
 
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/array4d_test.cc b/tensorflow/compiler/xla/array4d_test.cc
index 72ada467e5..3bc8148c91 100644
--- a/tensorflow/compiler/xla/array4d_test.cc
+++ b/tensorflow/compiler/xla/array4d_test.cc
@@ -18,8 +18,8 @@ limitations under the License.
 #include <initializer_list>
 #include <numeric>
 
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/index_util_test.cc b/tensorflow/compiler/xla/index_util_test.cc
index 85259b33f0..7c4efdee48 100644
--- a/tensorflow/compiler/xla/index_util_test.cc
+++ b/tensorflow/compiler/xla/index_util_test.cc
@@ -18,9 +18,8 @@ limitations under the License.
 #include <initializer_list>
 
 #include "tensorflow/compiler/xla/shape_util.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
@@ -144,14 +143,11 @@ TEST(IndexUtilTest, BumpIndices2x2) {
   auto shape = ShapeUtil::MakeShape(S32, {2, 2});
   std::vector<int64> indices = {0, 0};
   EXPECT_TRUE(IndexUtil::BumpIndices(shape, &indices));
-  EXPECT_MATCH(indices,
-               testing::VectorMatcher<int64>(std::vector<int64>{0, 1}));
+  EXPECT_THAT(indices, ::testing::ElementsAre(0, 1));
   EXPECT_TRUE(IndexUtil::BumpIndices(shape, &indices));
-  EXPECT_MATCH(indices,
-               testing::VectorMatcher<int64>(std::vector<int64>{1, 0}));
+  EXPECT_THAT(indices, ::testing::ElementsAre(1, 0));
   EXPECT_TRUE(IndexUtil::BumpIndices(shape, &indices));
-  EXPECT_MATCH(indices,
-               testing::VectorMatcher<int64>(std::vector<int64>{1, 1}));
+  EXPECT_THAT(indices, ::testing::ElementsAre(1, 1));
   EXPECT_FALSE(IndexUtil::BumpIndices(shape, &indices));
 }
 
diff --git a/tensorflow/compiler/xla/layout_util_test.cc b/tensorflow/compiler/xla/layout_util_test.cc
index 531a6e03da..d3fcccff65 100644
--- a/tensorflow/compiler/xla/layout_util_test.cc
+++ b/tensorflow/compiler/xla/layout_util_test.cc
@@ -14,11 +14,10 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/compiler/xla/layout_util.h"
-#include "tensorflow/compiler/xla/shape_util.h"
-
 #include "tensorflow/compiler/xla/legacy_flags/layout_util_flags.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
@@ -114,8 +113,8 @@ TEST_F(LayoutUtilTest, CopyLayoutNotCompatibleDifferentRank) {
   Shape dst = MakeShapeWithLayout(F32, {2, 3}, {1, 0});
   auto status = LayoutUtil::CopyLayoutBetweenShapes(src, &dst);
   EXPECT_FALSE(status.ok());
-  EXPECT_MATCH(status.error_message(),
-               testing::ContainsRegex("cannot copy layout from shape"));
+  EXPECT_THAT(status.error_message(),
+              ::testing::ContainsRegex("cannot copy layout from shape"));
 }
 
 TEST_F(LayoutUtilTest, CopyLayoutNotCompatibleTuple) {
@@ -133,8 +132,8 @@ TEST_F(LayoutUtilTest, CopyLayoutNotCompatibleTuple) {
 
   auto status = LayoutUtil::CopyLayoutBetweenShapes(src, &dst);
   EXPECT_FALSE(status.ok());
-  EXPECT_MATCH(status.error_message(),
-               testing::ContainsRegex("cannot copy layout from shape"));
+  EXPECT_THAT(status.error_message(),
+              ::testing::ContainsRegex("cannot copy layout from shape"));
 }
 
 TEST_F(LayoutUtilTest, CopyLayoutBogusLayout) {
@@ -145,9 +144,10 @@ TEST_F(LayoutUtilTest, CopyLayoutBogusLayout) {
 
   auto status = LayoutUtil::CopyLayoutBetweenShapes(src, &dst);
   EXPECT_FALSE(status.ok());
-  EXPECT_MATCH(status.error_message(),
-               testing::ContainsRegex("layout minor_to_major field contains .* "
-                                      "elements, but shape is rank"));
+  EXPECT_THAT(
+      status.error_message(),
+      ::testing::ContainsRegex("layout minor_to_major field contains .* "
+                               "elements, but shape is rank"));
 }
 
 TEST_F(LayoutUtilTest, ClearLayoutTuple) {
diff --git a/tensorflow/compiler/xla/reference_util_test.cc b/tensorflow/compiler/xla/reference_util_test.cc
index c53351ca93..b0aa558402 100644
--- a/tensorflow/compiler/xla/reference_util_test.cc
+++ b/tensorflow/compiler/xla/reference_util_test.cc
@@ -23,9 +23,9 @@ limitations under the License.
 #include "tensorflow/compiler/xla/client/padding.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index fc69d8eb3a..92e49314d9 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -52,6 +52,7 @@ cc_test(
     deps = [
         ":shape_inference",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:xla_data_proto",
@@ -64,8 +65,8 @@ cc_test(
     srcs = ["hlo_opcode_test.cc"],
     deps = [
         ":hlo",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:types",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
@@ -123,6 +124,7 @@ cc_test(
         ":hlo",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
@@ -151,6 +153,7 @@ cc_test(
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
@@ -504,7 +507,6 @@ cc_library(
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
-        "//tensorflow/core:lib",
     ],
 )
 
@@ -515,9 +517,6 @@ cc_test(
         ":hlo",
         ":liveness_util",
         ":tuple_points_to_analysis",
-        "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:types",
-        "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
         "//tensorflow/core:test_main",
     ],
@@ -600,6 +599,8 @@ cc_test(
         ":hlo_ordering",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
+        "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
@@ -636,14 +637,8 @@ cc_test(
         ":hlo",
         ":logical_buffer",
         ":tuple_points_to_analysis",
-        "//tensorflow/compiler/xla:literal_util",
-        "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:status_macros",
-        "//tensorflow/compiler/xla:types",
-        "//tensorflow/compiler/xla:util",
-        "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
-        "//tensorflow/core:lib",
         "//tensorflow/core:test_main",
     ],
 )
@@ -748,7 +743,7 @@ cc_test(
         ":hlo_pass",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:test_helpers",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
@@ -811,7 +806,7 @@ cc_test(
         ":inliner",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:test_helpers",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
@@ -945,6 +940,7 @@ cc_test(
         ":hlo",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
         "//tensorflow/core:test_main",
@@ -974,7 +970,7 @@ cc_test(
         ":hlo",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:test_helpers",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
@@ -1030,6 +1026,7 @@ cc_test(
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
@@ -1105,13 +1102,13 @@ cc_test(
     name = "copy_insertion_test",
     srcs = ["copy_insertion_test.cc"],
     deps = [
-        ":buffer_liveness",
         ":copy_insertion",
         ":cpu_plugin",
         ":hlo",
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
@@ -1139,16 +1136,7 @@ cc_library(
     name = "hlo_verifier",
     srcs = ["hlo_verifier.cc"],
     hdrs = ["hlo_verifier.h"],
-    deps = [
-        ":hlo",
-        ":hlo_pass",
-        "//tensorflow/compiler/xla:status",
-        "//tensorflow/compiler/xla:status_macros",
-        "//tensorflow/compiler/xla:statusor",
-        "//tensorflow/compiler/xla:types",
-        "//tensorflow/compiler/xla:util",
-        "//tensorflow/core:lib",
-    ],
+    deps = [":hlo_pass"],
 )
 
 cc_library(
@@ -1221,6 +1209,7 @@ cc_test(
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_layout",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
@@ -1276,7 +1265,6 @@ cc_library(
         ":hlo_pass",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:status_macros",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/core:lib",
@@ -1312,7 +1300,6 @@ cc_library(
         ":hlo_pass",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla:status_macros",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/core:lib",
@@ -1448,6 +1435,7 @@ cc_test(
         ":transpose_folding",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/client:computation_builder",
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 6b4e9e90ae..85e3381700 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -26,7 +26,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/hlo_pass_fix.h"
 #include "tensorflow/compiler/xla/shape_util.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
@@ -844,8 +844,8 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_4_3x2x4_6x1x1x4) {
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
   EXPECT_EQ(HloOpcode::kBroadcast, computation->root_instruction()->opcode());
-  EXPECT_MATCH(computation->root_instruction()->dimensions(),
-               testing::VectorMatcher<int64>({3}));
+  EXPECT_THAT(computation->root_instruction()->dimensions(),
+              ::testing::ElementsAre(3));
 }
 
 TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_1_3x2x1_6x1x1x1) {
@@ -867,8 +867,7 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_1_3x2x1_6x1x1x1) {
   const std::vector<int64> broadcast_dims =
       computation->root_instruction()->dimensions();
   EXPECT_EQ(1, broadcast_dims.size());
-  EXPECT_TRUE(broadcast_dims[0] == 1 || broadcast_dims[0] == 2 ||
-              broadcast_dims[0] == 3);
+  EXPECT_THAT(broadcast_dims[0], ::testing::AnyOf(1, 2, 3));
 }
 
 TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_4_3x2x4x2_6x8) {
diff --git a/tensorflow/compiler/xla/service/buffer_assignment_test.cc b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
index f6637d6098..4fe85434a7 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
@@ -30,6 +30,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/hlo_ordering.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
+#include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
@@ -1146,12 +1148,12 @@ TEST_F(BufferAssignmentTest, AmbiguousBufferAsOutput) {
   // should include the slices of both of the elements in the parameters.
   auto element_slices = assignment->GetAllSlices(select, /*index=*/{0});
   EXPECT_EQ(2, element_slices.size());
-  EXPECT_MATCH(testing::SetToVec<BufferAllocation::Slice>(element_slices),
-               testing::UnorderedMatcher<BufferAllocation::Slice>(
-                   assignment->GetUniqueSlice(tuple_param0, /*index=*/{0})
-                       .ConsumeValueOrDie(),
-                   assignment->GetUniqueSlice(tuple_param1, /*index=*/{0})
-                       .ConsumeValueOrDie()));
+  EXPECT_THAT(element_slices,
+              ::testing::UnorderedElementsAre(
+                  assignment->GetUniqueSlice(tuple_param0, /*index=*/{0})
+                      .ConsumeValueOrDie(),
+                  assignment->GetUniqueSlice(tuple_param1, /*index=*/{0})
+                      .ConsumeValueOrDie()));
 }
 
 // TODO(b/34669761): Remove this test when buffers are allowed to share
diff --git a/tensorflow/compiler/xla/service/call_graph_test.cc b/tensorflow/compiler/xla/service/call_graph_test.cc
index 65900fd4f8..644b19c348 100644
--- a/tensorflow/compiler/xla/service/call_graph_test.cc
+++ b/tensorflow/compiler/xla/service/call_graph_test.cc
@@ -19,6 +19,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/util.h"
@@ -28,7 +29,7 @@ limitations under the License.
 namespace xla {
 namespace {
 
-using testing::UnorderedMatcher;
+using ::testing::UnorderedElementsAre;
 
 class CallGraphTest : public HloTestBase {
  protected:
@@ -222,15 +223,15 @@ TEST_F(CallGraphTest, ContextBothComputations) {
 
   const CallSite& call_callsite = entry_node->callsites()[0];
   EXPECT_EQ(call, call_callsite.instruction());
-  EXPECT_MATCH(call_callsite.called_computations(),
-               UnorderedMatcher<HloComputation*>(subcomputation));
+  EXPECT_THAT(call_callsite.called_computations(),
+              UnorderedElementsAre(subcomputation));
   EXPECT_EQ(CallContext::kSequential, call_callsite.context());
   EXPECT_EQ(entry_node->GetCallSite(call), &call_callsite);
 
   const CallSite& map_callsite = entry_node->callsites()[1];
   EXPECT_EQ(map, map_callsite.instruction());
-  EXPECT_MATCH(map_callsite.called_computations(),
-               UnorderedMatcher(subcomputation));
+  EXPECT_THAT(map_callsite.called_computations(),
+              UnorderedElementsAre(subcomputation));
   EXPECT_EQ(CallContext::kParallel, map_callsite.context());
   EXPECT_EQ(entry_node->GetCallSite(map), &map_callsite);
 
@@ -293,15 +294,15 @@ TEST_F(CallGraphTest, ComplexGraph) {
   ASSERT_EQ(1, entry_node->callsites().size());
   const std::vector<HloComputation*>& called_computations =
       entry_node->callsites()[0].called_computations();
-  EXPECT_MATCH(called_computations,
-               UnorderedMatcher(cond_computation, a_computation));
+  EXPECT_THAT(called_computations,
+              UnorderedElementsAre(cond_computation, a_computation));
   EXPECT_EQ(CallContext::kSequential, entry_node->context());
 
   TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* c_node,
                          call_graph->GetNode(c_computation));
   EXPECT_TRUE(c_node->callsites().empty());
-  EXPECT_MATCH(c_node->callers(),
-               UnorderedMatcher(a_computation, b_computation));
+  EXPECT_THAT(c_node->callers(),
+              UnorderedElementsAre(a_computation, b_computation));
   EXPECT_EQ(CallContext::kBoth, c_node->context());
 
   // Visit the graph and verify nodes were visited in callee-before-caller
@@ -343,7 +344,7 @@ TEST_F(CallGraphTest, VisitSingletonComputation) {
     visited.push_back(node.computation());
     return Status::OK();
   }));
-  EXPECT_MATCH(visited, UnorderedMatcher(computation));
+  EXPECT_THAT(visited, UnorderedElementsAre(computation));
 }
 
 TEST_F(CallGraphTest, VisitUnreachableComputation) {
@@ -379,8 +380,8 @@ TEST_F(CallGraphTest, VisitUnreachableComputation) {
         },
         /*visit_unreachable_nodes=*/true));
     EXPECT_EQ(visited.size(), 2);
-    EXPECT_MATCH(visited,
-                 UnorderedMatcher(entry_computation, unreachable_computation));
+    EXPECT_THAT(visited, UnorderedElementsAre(entry_computation,
+                                              unreachable_computation));
   }
 }
 
@@ -396,7 +397,8 @@ TEST_F(CallGraphTest, VisitWithError) {
 
   ASSERT_FALSE(status.ok());
   ASSERT_EQ(status.code(), tensorflow::error::INTERNAL);
-  ASSERT_MATCH(status.error_message(), testing::HasSubstr("Visitation failed"));
+  ASSERT_THAT(status.error_message(),
+              ::testing::HasSubstr("Visitation failed"));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/copy_insertion_test.cc b/tensorflow/compiler/xla/service/copy_insertion_test.cc
index 4c26b2de12..3c45c454a1 100644
--- a/tensorflow/compiler/xla/service/copy_insertion_test.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion_test.cc
@@ -24,14 +24,16 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
+#include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 
-#include "tensorflow/compiler/xla/test_helpers.h"
-
 namespace xla {
 namespace {
 
+using ::testing::UnorderedElementsAre;
+
 class CopyInsertionTest : public HloTestBase {
  protected:
   void InsertCopies(HloModule* module) {
@@ -97,7 +99,7 @@ TEST_F(CopyInsertionTest, SingleParameter) {
   HloInstruction* tuple =
       builder.AddInstruction(HloInstruction::CreateTuple({x}));
 
-  ExpectEqUnordered(x->users(), {tuple});
+  EXPECT_THAT(x->users(), UnorderedElementsAre(tuple));
 
   HloModule module(TestName());
   module.AddEntryComputation(builder.Build());
@@ -125,7 +127,7 @@ TEST_F(CopyInsertionTest, SingleConstant) {
   HloInstruction* tuple =
       builder.AddInstruction(HloInstruction::CreateTuple({constant}));
 
-  ExpectEqUnordered(constant->users(), {tuple});
+  EXPECT_THAT(constant->users(), UnorderedElementsAre(tuple));
 
   HloModule module(TestName());
   module.AddEntryComputation(builder.Build());
@@ -219,9 +221,9 @@ TEST_F(CopyInsertionTest, AmbiguousPointsToSet) {
   builder.AddInstruction(HloInstruction::CreateTernary(
       tuple1->shape(), HloOpcode::kSelect, pred, tuple1, tuple2));
 
-  ExpectEqUnordered(constant1->users(), {tuple1});
-  ExpectEqUnordered(constant2->users(), {tuple1, tuple2});
-  ExpectEqUnordered(constant3->users(), {tuple2});
+  EXPECT_THAT(constant1->users(), UnorderedElementsAre(tuple1));
+  EXPECT_THAT(constant2->users(), UnorderedElementsAre(tuple1, tuple2));
+  EXPECT_THAT(constant3->users(), UnorderedElementsAre(tuple2));
 
   HloModule module(TestName());
   module.AddEntryComputation(builder.Build());
@@ -259,7 +261,7 @@ TEST_F(CopyInsertionTest, BitcastParameter) {
   HloModule module(TestName());
   module.AddEntryComputation(builder.Build());
 
-  ExpectEqUnordered(x->users(), {bitcast});
+  EXPECT_THAT(x->users(), UnorderedElementsAre(bitcast));
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
@@ -287,7 +289,7 @@ TEST_F(CopyInsertionTest, BitcastConstant) {
   HloModule module(TestName());
   module.AddEntryComputation(builder.Build());
 
-  ExpectEqUnordered(constant->users(), {bitcast});
+  EXPECT_THAT(constant->users(), UnorderedElementsAre(bitcast));
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
@@ -314,7 +316,7 @@ TEST_F(CopyInsertionTest, BitcastTupleElementParameter) {
   HloModule module(TestName());
   module.AddEntryComputation(builder.Build());
 
-  ExpectEqUnordered(x->users(), {bitcast});
+  EXPECT_THAT(x->users(), UnorderedElementsAre(bitcast));
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
diff --git a/tensorflow/compiler/xla/service/gpu/BUILD b/tensorflow/compiler/xla/service/gpu/BUILD
index 9de6d65a27..e2847df81a 100644
--- a/tensorflow/compiler/xla/service/gpu/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/BUILD
@@ -529,14 +529,10 @@ cc_test(
     deps = [
         ":instruction_fusion",
         ":while_transformer",
-        "//tensorflow/compiler/xla:literal_util",
-        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla/service:copy_insertion",
-        "//tensorflow/compiler/xla/service:hlo",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc b/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
index ddf9676e37..b32575d381 100644
--- a/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
+++ b/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/copy_insertion.h"
 #include "tensorflow/compiler/xla/service/gpu/instruction_fusion.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 
@@ -174,9 +175,9 @@ TEST_F(WhileTransformerTest, InvalidLoopLimit) {
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
   EXPECT_FALSE(result.ok());
-  EXPECT_MATCH(
+  EXPECT_THAT(
       result.status().error_message(),
-      testing::ContainsRegex("Loop start must be less than loop limit."));
+      ::testing::ContainsRegex("Loop start must be less than loop limit."));
 }
 
 TEST_F(WhileTransformerTest, InvalidLoopIncrement) {
@@ -191,9 +192,9 @@ TEST_F(WhileTransformerTest, InvalidLoopIncrement) {
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
   EXPECT_FALSE(result.ok());
-  EXPECT_MATCH(
+  EXPECT_THAT(
       result.status().error_message(),
-      testing::ContainsRegex("Loop increment must greater than zero."));
+      ::testing::ContainsRegex("Loop increment must greater than zero."));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/hlo_computation_test.cc b/tensorflow/compiler/xla/service/hlo_computation_test.cc
index 12a5683396..8e663d0af6 100644
--- a/tensorflow/compiler/xla/service/hlo_computation_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation_test.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 
@@ -29,6 +30,9 @@ namespace xla {
 
 namespace {
 
+using ::testing::ElementsAre;
+using ::testing::UnorderedElementsAre;
+
 class HloComputationTest : public HloTestBase {
  protected:
   HloComputationTest() {}
@@ -67,8 +71,8 @@ TEST_F(HloComputationTest, GetEmbeddedComputationsOneComputation) {
   auto negate_computation = CreateNegateComputation();
   auto map_computation = CreateMapComputation(negate_computation.get());
   EXPECT_TRUE(negate_computation->MakeEmbeddedComputationsList().empty());
-  EXPECT_EQ(map_computation->MakeEmbeddedComputationsList().front(),
-            negate_computation.get());
+  EXPECT_THAT(map_computation->MakeEmbeddedComputationsList(),
+              ElementsAre(negate_computation.get()));
 }
 
 TEST_F(HloComputationTest, GetEmbeddedComputationsDiamond) {
@@ -93,10 +97,10 @@ TEST_F(HloComputationTest, GetEmbeddedComputationsDiamond) {
   // GetEmbeddedComputations returns a post order of the embedded computations,
   // so the negate computation must come first.
   EXPECT_EQ(negate_computation.get(), *embedded_computations.begin());
-  EXPECT_MATCH(testing::ListToVec<HloComputation*>(embedded_computations),
-               testing::UnorderedMatcher<HloComputation*>(
-                   negate_computation.get(), map1_computation.get(),
-                   map2_computation.get()));
+  EXPECT_THAT(
+      embedded_computations,
+      UnorderedElementsAre(negate_computation.get(), map1_computation.get(),
+                           map2_computation.get()));
 }
 
 TEST_F(HloComputationTest, PostOrderSingleton) {
@@ -106,7 +110,7 @@ TEST_F(HloComputationTest, PostOrderSingleton) {
       HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
   auto computation = builder.Build();
 
-  EXPECT_EQ(computation->MakeInstructionPostOrder().front(), constant);
+  EXPECT_THAT(computation->MakeInstructionPostOrder(), ElementsAre(constant));
 }
 
 TEST_F(HloComputationTest, PostOrderSimple) {
@@ -121,10 +125,8 @@ TEST_F(HloComputationTest, PostOrderSimple) {
       HloInstruction::CreateUnary(r0f32_, HloOpcode::kNegate, negate1));
   auto computation = builder.Build();
 
-  EXPECT_MATCH(
-      testing::ListToVec<HloInstruction*>(
-          computation->MakeInstructionPostOrder()),
-      testing::OrderedMatcher<HloInstruction*>(constant, negate1, negate2));
+  EXPECT_THAT(computation->MakeInstructionPostOrder(),
+              ElementsAre(constant, negate1, negate2));
 }
 
 TEST_F(HloComputationTest, PostOrderTrace) {
@@ -141,10 +143,8 @@ TEST_F(HloComputationTest, PostOrderTrace) {
   auto computation = builder.Build();
 
   // Trace instructions should be at the end of the sort.
-  EXPECT_MATCH(testing::ListToVec<HloInstruction*>(
-                   computation->MakeInstructionPostOrder()),
-               testing::OrderedMatcher<HloInstruction*>(constant, negate1,
-                                                        negate2, trace));
+  EXPECT_THAT(computation->MakeInstructionPostOrder(),
+              ElementsAre(constant, negate1, negate2, trace));
 }
 
 TEST_F(HloComputationTest, PostOrderDisconnectedInstructions) {
@@ -161,10 +161,8 @@ TEST_F(HloComputationTest, PostOrderDisconnectedInstructions) {
       HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
   auto computation = builder.Build();
 
-  EXPECT_MATCH(testing::ListToVec<HloInstruction*>(
-                   computation->MakeInstructionPostOrder()),
-               testing::UnorderedMatcher<HloInstruction*>(
-                   constant1, constant2, constant3, constant4));
+  EXPECT_THAT(computation->MakeInstructionPostOrder(),
+              UnorderedElementsAre(constant1, constant2, constant3, constant4));
 }
 
 TEST_F(HloComputationTest, PostOrderWithMultipleRoots) {
@@ -187,9 +185,8 @@ TEST_F(HloComputationTest, PostOrderWithMultipleRoots) {
 
   auto post_order = computation->MakeInstructionPostOrder();
   EXPECT_EQ(6, post_order.size());
-  EXPECT_MATCH(testing::ListToVec<HloInstruction*>(post_order),
-               testing::UnorderedMatcher<HloInstruction*>(
-                   constant1, constant2, constant3, add1, add2, add3));
+  EXPECT_THAT(post_order, UnorderedElementsAre(constant1, constant2, constant3,
+                                               add1, add2, add3));
 }
 
 TEST_F(HloComputationTest, VisitWithMultipleRoots) {
@@ -302,8 +299,8 @@ TEST_F(HloComputationTest, CycleDetection) {
   const auto visitor = [](HloInstruction* instruction) { return Status::OK(); };
   auto visit_status = computation->Accept(visitor);
   ASSERT_FALSE(visit_status.ok());
-  ASSERT_MATCH(visit_status.error_message(),
-               testing::ContainsRegex("cycle is detecte"));
+  ASSERT_THAT(visit_status.error_message(),
+              ::testing::ContainsRegex("cycle is detecte"));
 }
 
 TEST_F(HloComputationTest, RemoveInstructionWithDuplicateOperand) {
diff --git a/tensorflow/compiler/xla/service/hlo_instruction_test.cc b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
index 8eabaa1c47..e1b76d194f 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/util.h"
@@ -31,6 +32,9 @@ limitations under the License.
 namespace xla {
 namespace {
 
+using ::testing::ElementsAre;
+using ::testing::UnorderedElementsAre;
+
 class HloInstructionTest : public HloTestBase {
  protected:
   HloInstructionTest() {}
@@ -148,9 +152,9 @@ TEST_F(HloInstructionTest, UserWithTwoOperands) {
   auto add = HloInstruction::CreateBinary(r0f32_, HloOpcode::kAdd, foo.get(),
                                           bar.get());
 
-  ExpectEqOrdered(add->operands(), {foo.get(), bar.get()});
-  ExpectEqUnordered(foo->users(), {add.get()});
-  ExpectEqUnordered(bar->users(), {add.get()});
+  EXPECT_THAT(add->operands(), UnorderedElementsAre(foo.get(), bar.get()));
+  EXPECT_THAT(foo->users(), UnorderedElementsAre(add.get()));
+  EXPECT_THAT(bar->users(), UnorderedElementsAre(add.get()));
 
   OpAndUserCollectingVisitor visitor;
   ASSERT_IS_OK(add->Accept(&visitor));
@@ -383,12 +387,13 @@ TEST_F(HloInstructionTest, ReplaceUseInBinaryOps) {
   EXPECT_EQ(1, foo->user_count());
   EXPECT_EQ(2, bar->user_count());
 
-  ExpectEqUnordered(foo->users(), {add_foobar.get()});
-  ExpectEqOrdered(add_foobar->operands(), {foo.get(), bar.get()});
+  EXPECT_THAT(foo->users(), UnorderedElementsAre(add_foobar.get()));
+  EXPECT_THAT(add_foobar->operands(), ElementsAre(foo.get(), bar.get()));
 
-  ExpectEqUnordered(bar->users(), {add_foobar.get(), add_foofoo.get()});
-  ExpectEqOrdered(add_foobar->operands(), {foo.get(), bar.get()});
-  ExpectEqOrdered(add_foofoo->operands(), {bar.get(), bar.get()});
+  EXPECT_THAT(bar->users(),
+              UnorderedElementsAre(add_foobar.get(), add_foofoo.get()));
+  EXPECT_THAT(add_foobar->operands(), ElementsAre(foo.get(), bar.get()));
+  EXPECT_THAT(add_foofoo->operands(), ElementsAre(bar.get(), bar.get()));
 }
 
 TEST_F(HloInstructionTest, ReplaceUseInVariadicOp) {
@@ -404,16 +409,17 @@ TEST_F(HloInstructionTest, ReplaceUseInVariadicOp) {
                                                  foo.get(), bar.get());
 
   EXPECT_EQ(2, foo->user_count());
-  ExpectEqUnordered(foo->users(), {tuple.get(), add_foobar.get()});
+  EXPECT_THAT(foo->users(),
+              UnorderedElementsAre(tuple.get(), add_foobar.get()));
 
   // Replace the use of foo in tuple with bar.
   ASSERT_IS_OK(foo->ReplaceUseWith(tuple.get(), bar.get()));
 
-  ExpectEqUnordered(foo->users(), {add_foobar.get()});
+  EXPECT_THAT(foo->users(), UnorderedElementsAre(add_foobar.get()));
 
   // Both uses of foo in tuple should have been replaced with bar.
-  ExpectEqOrdered(tuple->operands(),
-                  {bar.get(), bar.get(), baz.get(), bar.get()});
+  EXPECT_THAT(tuple->operands(),
+              ElementsAre(bar.get(), bar.get(), baz.get(), bar.get()));
 }
 
 TEST_F(HloInstructionTest, ReplaceUseInUnaryOp) {
@@ -426,7 +432,7 @@ TEST_F(HloInstructionTest, ReplaceUseInUnaryOp) {
   auto log = HloInstruction::CreateUnary(r0f32_, HloOpcode::kLog, foo.get());
 
   EXPECT_EQ(2, foo->user_count());
-  ExpectEqUnordered(foo->users(), {exp.get(), log.get()});
+  EXPECT_THAT(foo->users(), UnorderedElementsAre(exp.get(), log.get()));
   EXPECT_EQ(0, bar->user_count());
 
   // Replace the use of foo in exp with bar.
@@ -434,8 +440,8 @@ TEST_F(HloInstructionTest, ReplaceUseInUnaryOp) {
 
   // The use of foo in log should not have been affected.
   EXPECT_EQ(1, foo->user_count());
-  ExpectEqUnordered(foo->users(), {log.get()});
-  ExpectEqOrdered(log->operands(), {foo.get()});
+  EXPECT_THAT(foo->users(), UnorderedElementsAre(log.get()));
+  EXPECT_THAT(log->operands(), ElementsAre(foo.get()));
 
   // Bar should now be used in exp.
   EXPECT_EQ(1, bar->user_count());
@@ -466,7 +472,8 @@ TEST_F(HloInstructionTest, ReplaceAllUsesWithInBinaryOps) {
   EXPECT_EQ(0, foo->user_count());
   EXPECT_EQ(2, bar->user_count());
 
-  ExpectEqUnordered(bar->users(), {add_foobar.get(), add_foofoo.get()});
+  EXPECT_THAT(bar->users(),
+              UnorderedElementsAre(add_foobar.get(), add_foofoo.get()));
 }
 
 TEST_F(HloInstructionTest, ReplaceAllUsesInMultipleOps) {
@@ -490,7 +497,8 @@ TEST_F(HloInstructionTest, ReplaceAllUsesInMultipleOps) {
   EXPECT_EQ(0, foo->user_count());
   EXPECT_EQ(3, bar->user_count());
 
-  ExpectEqUnordered(bar->users(), {add_foobar.get(), exp.get(), tuple.get()});
+  EXPECT_THAT(bar->users(),
+              UnorderedElementsAre(add_foobar.get(), exp.get(), tuple.get()));
 }
 
 // Simple visitor that collects and post-processes each node in the graph.
@@ -558,8 +566,8 @@ TEST_F(HloInstructionTest, SingletonFusionOp) {
   auto fusion = HloInstruction::CreateFusion(
       r0f32_, HloInstruction::FusionKind::kLoop, exp.get());
 
-  ExpectEqOrdered(fusion->operands(), {constant.get()});
-  ExpectEqUnordered(constant->users(), {fusion.get(), exp.get()});
+  EXPECT_THAT(fusion->operands(), ElementsAre(constant.get()));
+  EXPECT_THAT(constant->users(), UnorderedElementsAre(fusion.get(), exp.get()));
 }
 
 TEST_F(HloInstructionTest, BinaryFusionOp) {
@@ -574,9 +582,12 @@ TEST_F(HloInstructionTest, BinaryFusionOp) {
   auto fusion = HloInstruction::CreateFusion(
       r0f32_, HloInstruction::FusionKind::kLoop, add.get());
 
-  ExpectEqOrdered(fusion->operands(), {constant1.get(), constant2.get()});
-  ExpectEqUnordered(constant1->users(), {fusion.get(), add.get()});
-  ExpectEqUnordered(constant2->users(), {fusion.get(), add.get()});
+  EXPECT_THAT(fusion->operands(),
+              ElementsAre(constant1.get(), constant2.get()));
+  EXPECT_THAT(constant1->users(),
+              UnorderedElementsAre(fusion.get(), add.get()));
+  EXPECT_THAT(constant2->users(),
+              UnorderedElementsAre(fusion.get(), add.get()));
 }
 
 TEST_F(HloInstructionTest, ChainFusionOp) {
@@ -593,8 +604,9 @@ TEST_F(HloInstructionTest, ChainFusionOp) {
   fusion->FuseInstruction(exp2.get());
   fusion->FuseInstruction(exp1.get());
 
-  ExpectEqOrdered(fusion->operands(), {constant.get()});
-  ExpectEqUnordered(constant->users(), {fusion.get(), exp1.get()});
+  EXPECT_THAT(fusion->operands(), ElementsAre(constant.get()));
+  EXPECT_THAT(constant->users(),
+              UnorderedElementsAre(fusion.get(), exp1.get()));
 }
 
 TEST_F(HloInstructionTest, FusionOpWithCalledComputations) {
@@ -675,8 +687,9 @@ TEST_F(HloInstructionTest, ComplexFusionOp) {
 
   // Operands in the fusion instruction's operands() vector should be in the
   // order in which their users were added fused.
-  ExpectEqOrdered(fusion->operands(), {c1.get(), c3.get(), c2.get()});
-  ExpectEqUnordered(c1->users(), {add.get(), tuple.get(), fusion.get()});
+  EXPECT_THAT(fusion->operands(), ElementsAre(c1.get(), c3.get(), c2.get()));
+  EXPECT_THAT(c1->users(),
+              UnorderedElementsAre(add.get(), tuple.get(), fusion.get()));
 }
 
 // Convenience function for comparing two HloInstructions inside of
diff --git a/tensorflow/compiler/xla/service/hlo_module_test.cc b/tensorflow/compiler/xla/service/hlo_module_test.cc
index dba9731e2a..1175be4f50 100644
--- a/tensorflow/compiler/xla/service/hlo_module_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_module_test.cc
@@ -23,7 +23,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
 
 namespace xla {
@@ -61,7 +61,8 @@ TEST_F(HloModuleTest, OneComputationPostOrder) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(CreateConstantComputation());
 
-  EXPECT_EQ(module->MakeComputationPostOrder().front(), computation);
+  EXPECT_THAT(module->MakeComputationPostOrder(),
+              ::testing::ElementsAre(computation));
 }
 
 TEST_F(HloModuleTest, TwoComputationsPostOrder) {
@@ -71,9 +72,8 @@ TEST_F(HloModuleTest, TwoComputationsPostOrder) {
   auto computation2 =
       module->AddEmbeddedComputation(CreateConstantComputation());
 
-  EXPECT_MATCH(
-      testing::ListToVec<HloComputation*>(module->MakeComputationPostOrder()),
-      testing::UnorderedMatcher<HloComputation*>(computation1, computation2));
+  EXPECT_THAT(module->MakeComputationPostOrder(),
+              ::testing::UnorderedElementsAre(computation1, computation2));
 
   // We specified the same name for both computations, but the HloModule should
   // have made the names unique.
@@ -94,9 +94,9 @@ TEST_F(HloModuleTest, DiamondComputationsPostOrder) {
       CreateCallComputation({computation2, computation3}));
 
   auto post_order = module->MakeComputationPostOrder();
-  EXPECT_MATCH(testing::ListToVec<HloComputation*>(post_order),
-               testing::UnorderedMatcher<HloComputation*>(
-                   computation1, computation2, computation3, computation4));
+  EXPECT_THAT(post_order,
+              ::testing::UnorderedElementsAre(computation1, computation2,
+                                              computation3, computation4));
   EXPECT_EQ(post_order.back(), computation4);
   EXPECT_EQ(post_order.front(), computation1);
 }
diff --git a/tensorflow/compiler/xla/service/hlo_opcode_test.cc b/tensorflow/compiler/xla/service/hlo_opcode_test.cc
index 0b64c16fdc..892c89f9df 100644
--- a/tensorflow/compiler/xla/service/hlo_opcode_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_opcode_test.cc
@@ -15,8 +15,8 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/service/inliner_test.cc b/tensorflow/compiler/xla/service/inliner_test.cc
index 0054edcf6a..a286c2e74d 100644
--- a/tensorflow/compiler/xla/service/inliner_test.cc
+++ b/tensorflow/compiler/xla/service/inliner_test.cc
@@ -24,7 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_util.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
diff --git a/tensorflow/compiler/xla/service/layout_assignment_test.cc b/tensorflow/compiler/xla/service/layout_assignment_test.cc
index 6361907b0e..5692199f5a 100644
--- a/tensorflow/compiler/xla/service/layout_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment_test.cc
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_layout.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/tests/test_utils.h"
diff --git a/tensorflow/compiler/xla/service/shape_inference_test.cc b/tensorflow/compiler/xla/service/shape_inference_test.cc
index 6f968ded56..255d64b320 100644
--- a/tensorflow/compiler/xla/service/shape_inference_test.cc
+++ b/tensorflow/compiler/xla/service/shape_inference_test.cc
@@ -20,12 +20,15 @@ limitations under the License.
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/types.h"
 
 namespace xla {
 namespace {
 
+using ::testing::ContainsRegex;
+
 class ShapeInferenceTest : public ::testing::Test {
  protected:
   // Some handy scalar shapes.
@@ -128,23 +131,21 @@ TEST_F(ShapeInferenceTest, SelectBadShapes) {
   auto inferred_status_error1 = ShapeInference::InferTernaryOpShape(
       TernaryOperation::TRIOP_SELECT, pred_, matrix_64_48_, matrix_32_64_);
   ASSERT_FALSE(inferred_status_error1.ok());
-  ASSERT_MATCH(
-      inferred_status_error1.status().error_message(),
-      testing::ContainsRegex("operands to select must be the same shape"));
+  ASSERT_THAT(inferred_status_error1.status().error_message(),
+              ContainsRegex("operands to select must be the same shape"));
 
   auto inferred_status_error2 = ShapeInference::InferTernaryOpShape(
       TernaryOperation::TRIOP_SELECT, s32_, matrix_64_48_, matrix_64_48_);
   ASSERT_FALSE(inferred_status_error2.ok());
-  ASSERT_MATCH(inferred_status_error2.status().error_message(),
-               testing::ContainsRegex("pred operand must have PRED"));
+  ASSERT_THAT(inferred_status_error2.status().error_message(),
+              ContainsRegex("pred operand must have PRED"));
 
   auto inferred_status_error3 = ShapeInference::InferTernaryOpShape(
       TernaryOperation::TRIOP_SELECT, ShapeUtil::MakeShape(PRED, {64}),
       matrix_64_48_, matrix_64_48_);
   ASSERT_FALSE(inferred_status_error3.ok());
-  ASSERT_MATCH(
-      inferred_status_error3.status().error_message(),
-      testing::ContainsRegex("with non-scalar predicate with dimensionality"));
+  ASSERT_THAT(inferred_status_error3.status().error_message(),
+              ContainsRegex("with non-scalar predicate with dimensionality"));
 
   // Tuples have a TUPLE element type and cannot be the pred of a select.
   auto inferred_status_error4 = ShapeInference::InferTernaryOpShape(
@@ -152,9 +153,8 @@ TEST_F(ShapeInferenceTest, SelectBadShapes) {
       ShapeUtil::MakeTupleShape({f32_, f32_}),
       ShapeUtil::MakeTupleShape({f32_, f32_}));
   ASSERT_FALSE(inferred_status_error4.ok());
-  ASSERT_MATCH(
-      inferred_status_error4.status().error_message(),
-      testing::ContainsRegex("pred operand must have PRED element type"));
+  ASSERT_THAT(inferred_status_error4.status().error_message(),
+              ContainsRegex("pred operand must have PRED element type"));
 }
 
 TEST_F(ShapeInferenceTest, ClampAllMatrix) {
@@ -298,8 +298,8 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSourceShape) {
       operand_shape_, select_program_shape_, window_, source_shape_fail,
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
-  ASSERT_MATCH(inferred_status_fail.status().error_message(),
-               testing::ContainsRegex("source shape does not match"));
+  ASSERT_THAT(inferred_status_fail.status().error_message(),
+              ContainsRegex("source shape does not match"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape1) {
@@ -309,9 +309,8 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape1) {
       operand_shape_, select_program_shape_fail, window_, source_shape_,
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
-  ASSERT_MATCH(
-      inferred_status_fail.status().error_message(),
-      testing::ContainsRegex("select function must take 2 parameters"));
+  ASSERT_THAT(inferred_status_fail.status().error_message(),
+              ContainsRegex("select function must take 2 parameters"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape2) {
@@ -321,8 +320,8 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape2) {
       operand_shape_, select_program_shape_fail, window_, source_shape_,
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
-  ASSERT_MATCH(inferred_status_fail.status().error_message(),
-               testing::ContainsRegex("select function must have rank-0 PRED"));
+  ASSERT_THAT(inferred_status_fail.status().error_message(),
+              ContainsRegex("select function must have rank-0 PRED"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape3) {
@@ -332,8 +331,8 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape3) {
       operand_shape_, select_program_shape_fail, window_, source_shape_,
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
-  ASSERT_MATCH(inferred_status_fail.status().error_message(),
-               testing::ContainsRegex("select function's first parameter"));
+  ASSERT_THAT(inferred_status_fail.status().error_message(),
+              ContainsRegex("select function's first parameter"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape4) {
@@ -343,8 +342,8 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape4) {
       operand_shape_, select_program_shape_fail, window_, source_shape_,
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
-  ASSERT_MATCH(inferred_status_fail.status().error_message(),
-               testing::ContainsRegex("select function's second parameter"));
+  ASSERT_THAT(inferred_status_fail.status().error_message(),
+              ContainsRegex("select function's second parameter"));
 }
 
 TEST_F(ShapeInferenceTest, Convolve) {
@@ -498,8 +497,8 @@ TEST_F(ShapeInferenceTest, ConvolveDimensionNumbersOverlapError) {
   auto inferred_status =
       ShapeInference::InferConvolveShape(lhs_shape, rhs_shape, window, dnums);
   ASSERT_FALSE(inferred_status.ok());
-  ASSERT_MATCH(inferred_status.status().error_message(),
-               testing::ContainsRegex("each dimension exactly once"));
+  ASSERT_THAT(inferred_status.status().error_message(),
+              ContainsRegex("each dimension exactly once"));
 }
 
 TEST_F(ShapeInferenceTest, MapThatChangesElementType) {
@@ -536,43 +535,42 @@ TEST_F(ShapeInferenceTest, Map) {
   auto no_args_error = ShapeInference::InferMapShape(
       {}, ShapeUtil::MakeProgramShape({f32_, f32_}, f32_));
   ASSERT_FALSE(no_args_error.ok());
-  ASSERT_MATCH(no_args_error.status().error_message(),
-               testing::ContainsRegex("expects at least one argument"));
+  ASSERT_THAT(no_args_error.status().error_message(),
+              ContainsRegex("expects at least one argument"));
 
   auto args_diff_shapes_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_64_},
       ShapeUtil::MakeProgramShape({f32_, f32_}, f32_));
   ASSERT_FALSE(args_diff_shapes_error.ok());
-  ASSERT_MATCH(
-      args_diff_shapes_error.status().error_message(),
-      testing::ContainsRegex("requires all operands to have the same shape"));
+  ASSERT_THAT(args_diff_shapes_error.status().error_message(),
+              ContainsRegex("requires all operands to have the same shape"));
 
   auto arity_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_}, ShapeUtil::MakeProgramShape({f32_}, f32_));
   ASSERT_FALSE(arity_error.ok());
-  ASSERT_MATCH(arity_error.status().error_message(),
-               testing::ContainsRegex("function arity must match"));
+  ASSERT_THAT(arity_error.status().error_message(),
+              ContainsRegex("function arity must match"));
 
   auto output_shape_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_},
       ShapeUtil::MakeProgramShape({f32_, f32_}, vector_32_));
   ASSERT_FALSE(output_shape_error.ok());
-  ASSERT_MATCH(output_shape_error.status().error_message(),
-               testing::ContainsRegex("result has to be a scalar"));
+  ASSERT_THAT(output_shape_error.status().error_message(),
+              ContainsRegex("result has to be a scalar"));
 
   auto param_shape_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_},
       ShapeUtil::MakeProgramShape({vector_32_, f32_}, f32_));
   ASSERT_FALSE(param_shape_error.ok());
-  ASSERT_MATCH(param_shape_error.status().error_message(),
-               testing::ContainsRegex("parameter has to be a scalar"));
+  ASSERT_THAT(param_shape_error.status().error_message(),
+              ContainsRegex("parameter has to be a scalar"));
 
   auto param_element_type_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_},
       ShapeUtil::MakeProgramShape({f32_, s32_}, f32_));
   ASSERT_FALSE(param_element_type_error.ok());
-  ASSERT_MATCH(param_element_type_error.status().error_message(),
-               testing::ContainsRegex("parameter type has to match argument"));
+  ASSERT_THAT(param_element_type_error.status().error_message(),
+              ContainsRegex("parameter type has to match argument"));
 
   Shape arg = ShapeUtil::MakeShape(F32, {20});
   ProgramShape to_apply = ShapeUtil::MakeProgramShape({f32_}, f32_);
@@ -583,26 +581,26 @@ TEST_F(ShapeInferenceTest, Map) {
   auto inferred_status_error1 = ShapeInference::InferMapShape(
       {&arg}, ShapeUtil::MakeProgramShape({f32_, f32_}, f32_));
   ASSERT_FALSE(inferred_status_error1.ok());
-  ASSERT_MATCH(inferred_status_error1.status().error_message(),
-               testing::ContainsRegex("arity must match number of arguments"));
+  ASSERT_THAT(inferred_status_error1.status().error_message(),
+              ContainsRegex("arity must match number of arguments"));
 
   auto inferred_status_error2 = ShapeInference::InferMapShape(
       {&arg}, ShapeUtil::MakeProgramShape({vector_32_}, f32_));
   ASSERT_FALSE(inferred_status_error2.ok());
-  ASSERT_MATCH(inferred_status_error2.status().error_message(),
-               testing::ContainsRegex("has to be a scalar"));
+  ASSERT_THAT(inferred_status_error2.status().error_message(),
+              ContainsRegex("has to be a scalar"));
 
   auto inferred_status_error3 = ShapeInference::InferMapShape(
       {&arg}, ShapeUtil::MakeProgramShape({f32_}, vector_32_));
   ASSERT_FALSE(inferred_status_error3.ok());
-  ASSERT_MATCH(inferred_status_error3.status().error_message(),
-               testing::ContainsRegex("has to be a scalar"));
+  ASSERT_THAT(inferred_status_error3.status().error_message(),
+              ContainsRegex("has to be a scalar"));
 
   auto inferred_status_error5 = ShapeInference::InferMapShape(
       {&arg}, ShapeUtil::MakeProgramShape({s32_}, s32_));
   ASSERT_FALSE(inferred_status_error5.ok());
-  ASSERT_MATCH(inferred_status_error5.status().error_message(),
-               testing::ContainsRegex("parameter type has to match argument"));
+  ASSERT_THAT(inferred_status_error5.status().error_message(),
+              ContainsRegex("parameter type has to match argument"));
 }
 
 TEST_F(ReduceShapeInferenceTest, ReduceVectorToScalar) {
@@ -656,8 +654,8 @@ TEST_F(ReduceShapeInferenceTest, ErrorOutOfBoundsDimension) {
       ShapeUtil::MakeShape(F32, {5, 3}), f32_, /*dimensions_to_reduce=*/{3, 4},
       to_apply);
   EXPECT_FALSE(inferred_status.ok());
-  EXPECT_MATCH(inferred_status.status().error_message(),
-               testing::ContainsRegex("out-of-bounds dimension"));
+  EXPECT_THAT(inferred_status.status().error_message(),
+              ContainsRegex("out-of-bounds dimension"));
 }
 
 TEST_F(ReduceShapeInferenceTest, ErrorToApplyArity) {
@@ -666,8 +664,8 @@ TEST_F(ReduceShapeInferenceTest, ErrorToApplyArity) {
       ShapeInference::InferReduceShape(ShapeUtil::MakeShape(F32, {5, 3}), f32_,
                                        /*dimensions_to_reduce=*/{0}, to_apply);
   EXPECT_FALSE(inferred_status.ok());
-  EXPECT_MATCH(inferred_status.status().error_message(),
-               testing::ContainsRegex("take 2 parameters"));
+  EXPECT_THAT(inferred_status.status().error_message(),
+              ContainsRegex("take 2 parameters"));
 }
 
 TEST_F(ReduceShapeInferenceTest, ErrorElementTypeVsApplyType) {
@@ -676,8 +674,8 @@ TEST_F(ReduceShapeInferenceTest, ErrorElementTypeVsApplyType) {
       ShapeInference::InferReduceShape(ShapeUtil::MakeShape(F32, {5, 3}), f32_,
                                        /*dimensions_to_reduce=*/{0}, to_apply);
   EXPECT_FALSE(inferred_status.ok());
-  EXPECT_MATCH(inferred_status.status().error_message(),
-               testing::ContainsRegex("first parameter shape differs"));
+  EXPECT_THAT(inferred_status.status().error_message(),
+              ContainsRegex("first parameter shape differs"));
 }
 
 TEST_F(ShapeInferenceTest, InferSliceShapeRank2) {
@@ -819,8 +817,8 @@ TEST_F(ShapeInferenceTest, ScalarDotVector) {
   auto inferred_status =
       ShapeInference::InferBinaryOpShape(BINOP_DOT, f32_, vector_32_, {});
   ASSERT_FALSE(inferred_status.ok());
-  ASSERT_MATCH(inferred_status.status().error_message(),
-               testing::ContainsRegex("dot only supports rank"));
+  ASSERT_THAT(inferred_status.status().error_message(),
+              ContainsRegex("dot only supports rank"));
 }
 
 // 3D <dot> 2D: error
@@ -828,8 +826,8 @@ TEST_F(ShapeInferenceTest, DotWithRankHigherThanTwo) {
   auto inferred_status = ShapeInference::InferBinaryOpShape(
       BINOP_DOT, ShapeUtil::MakeShape(F32, {32, 32, 32}), matrix_32_64_, {});
   ASSERT_FALSE(inferred_status.ok());
-  ASSERT_MATCH(inferred_status.status().error_message(),
-               testing::ContainsRegex("dot only supports rank"));
+  ASSERT_THAT(inferred_status.status().error_message(),
+              ContainsRegex("dot only supports rank"));
 }
 
 // vector <dot> vector -> scalar
@@ -941,46 +939,43 @@ TEST_F(ShapeInferenceTest, BinOpBroadcastBadDimension) {
   auto inferred_status_error1 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor, vec8, {});
   ASSERT_FALSE(inferred_status_error1.ok());
-  ASSERT_MATCH(inferred_status_error1.status().error_message(),
-               testing::ContainsRegex("automatic"));
+  ASSERT_THAT(inferred_status_error1.status().error_message(),
+              ContainsRegex("automatic"));
 
   // broadcast_dimension out of bounds for tensor's rank
   auto inferred_status_error2 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor, vec8, {3});
   ASSERT_FALSE(inferred_status_error2.ok());
-  ASSERT_MATCH(
-      inferred_status_error2.status().error_message(),
-      testing::ContainsRegex("broadcast dimension number .* too large"));
+  ASSERT_THAT(inferred_status_error2.status().error_message(),
+              ContainsRegex("broadcast dimension number .* too large"));
 
   // broadcast_dimension doesn't match corresponding dimension
   auto inferred_status_error3 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor, vec8, {0});
   ASSERT_FALSE(inferred_status_error3.ok());
-  ASSERT_MATCH(inferred_status_error3.status().error_message(),
-               testing::ContainsRegex("broadcast dimension 0 mismatch"));
+  ASSERT_THAT(inferred_status_error3.status().error_message(),
+              ContainsRegex("broadcast dimension 0 mismatch"));
 
   // broadcast_dimensions list too long
   auto inferred_status_error4 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor, matrix8_4, {0, 1, 2});
   ASSERT_FALSE(inferred_status_error4.ok());
-  ASSERT_MATCH(
-      inferred_status_error4.status().error_message(),
-      testing::ContainsRegex("size of broadcast_dimensions has to match"));
+  ASSERT_THAT(inferred_status_error4.status().error_message(),
+              ContainsRegex("size of broadcast_dimensions has to match"));
 
   // there's a dimension above the rank of the tensor
   auto inferred_status_error5 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor, matrix8_4, {3, 0});
   ASSERT_FALSE(inferred_status_error5.ok());
-  ASSERT_MATCH(
-      inferred_status_error5.status().error_message(),
-      testing::ContainsRegex("broadcast dimension number .* too large"));
+  ASSERT_THAT(inferred_status_error5.status().error_message(),
+              ContainsRegex("broadcast dimension number .* too large"));
 
   // broadcasting dimensions don't match in this order
   auto inferred_status_error6 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor, matrix8_4, {2, 1});
   ASSERT_FALSE(inferred_status_error6.ok());
-  ASSERT_MATCH(inferred_status_error6.status().error_message(),
-               testing::ContainsRegex("broadcast dimension 0 mismatch"));
+  ASSERT_THAT(inferred_status_error6.status().error_message(),
+              ContainsRegex("broadcast dimension 0 mismatch"));
 
   // The following two tests make sure that broadcasting dimensions are listed
   // in a proper (strictly increasing) order, even if the lower-rank array
@@ -988,14 +983,14 @@ TEST_F(ShapeInferenceTest, BinOpBroadcastBadDimension) {
   auto inferred_status_error7 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor8_8_8, matrix8_8, {0, 0});
   ASSERT_FALSE(inferred_status_error7.ok());
-  ASSERT_MATCH(inferred_status_error7.status().error_message(),
-               testing::ContainsRegex("broadcast dimensions order is wrong"));
+  ASSERT_THAT(inferred_status_error7.status().error_message(),
+              ContainsRegex("broadcast dimensions order is wrong"));
 
   auto inferred_status_error8 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor8_8_8, matrix8_8, {1, 0});
   ASSERT_FALSE(inferred_status_error8.ok());
-  ASSERT_MATCH(inferred_status_error8.status().error_message(),
-               testing::ContainsRegex("broadcast dimensions order is wrong"));
+  ASSERT_THAT(inferred_status_error8.status().error_message(),
+              ContainsRegex("broadcast dimensions order is wrong"));
 }
 
 // Tests for the while instruction with proper shapes.
@@ -1020,30 +1015,30 @@ TEST_F(ShapeInferenceTest, WhileWithBadShapes) {
   auto inferred_status_error1 =
       ShapeInference::InferWhileShape(bad_shape_1, body, result_shape);
   ASSERT_FALSE(inferred_status_error1.ok());
-  ASSERT_MATCH(inferred_status_error1.status().error_message(),
-               testing::ContainsRegex("condition must take 1 arguments"));
+  ASSERT_THAT(inferred_status_error1.status().error_message(),
+              ContainsRegex("condition must take 1 arguments"));
 
   auto bad_shape_2 =
       ShapeUtil::MakeProgramShape({s32_, result_shape}, result_shape);
   auto inferred_status_error2 =
       ShapeInference::InferWhileShape(cond, bad_shape_2, result_shape);
   ASSERT_FALSE(inferred_status_error2.ok());
-  ASSERT_MATCH(inferred_status_error2.status().error_message(),
-               testing::ContainsRegex("body must take 1 arguments"));
+  ASSERT_THAT(inferred_status_error2.status().error_message(),
+              ContainsRegex("body must take 1 arguments"));
 
   auto bad_shape_3 = ShapeUtil::MakeProgramShape({result_shape}, s32_);
   auto inferred_status_error3 =
       ShapeInference::InferWhileShape(bad_shape_3, body, result_shape);
   ASSERT_FALSE(inferred_status_error3.ok());
-  ASSERT_MATCH(inferred_status_error3.status().error_message(),
-               testing::ContainsRegex("condition must return a boolean"));
+  ASSERT_THAT(inferred_status_error3.status().error_message(),
+              ContainsRegex("condition must return a boolean"));
 
   auto bad_shape_4 = ShapeUtil::MakeProgramShape({result_shape}, vector_32_);
   auto inferred_status_error4 =
       ShapeInference::InferWhileShape(cond, bad_shape_4, result_shape);
   ASSERT_FALSE(inferred_status_error4.ok());
-  ASSERT_MATCH(inferred_status_error4.status().error_message(),
-               testing::ContainsRegex("parameter of condition and body"));
+  ASSERT_THAT(inferred_status_error4.status().error_message(),
+              ContainsRegex("parameter of condition and body"));
 }
 
 // Tests for the concatenate instruction with proper shapes.
@@ -1073,49 +1068,45 @@ TEST_F(ShapeInferenceTest, ConcatenateWithBadShapes) {
   auto inferred_status_error1 =
       ShapeInference::InferConcatOpShape({}, /*dimension=*/0);
   ASSERT_FALSE(inferred_status_error1.ok());
-  ASSERT_MATCH(
-      inferred_status_error1.status().error_message(),
-      testing::ContainsRegex("Concatenate expects at least one argument"));
+  ASSERT_THAT(inferred_status_error1.status().error_message(),
+              ContainsRegex("Concatenate expects at least one argument"));
 
   auto inferred_status_error2 =
       ShapeInference::InferConcatOpShape({&vector_32_}, /*dimension=*/-1);
   ASSERT_FALSE(inferred_status_error2.ok());
-  ASSERT_MATCH(inferred_status_error2.status().error_message(),
-               testing::ContainsRegex(
-                   "dimension to concatenate along out of bounds: -1"));
+  ASSERT_THAT(
+      inferred_status_error2.status().error_message(),
+      ContainsRegex("dimension to concatenate along out of bounds: -1"));
 
   auto inferred_status_error3 =
       ShapeInference::InferConcatOpShape({&vector_32_}, /*dimension=*/1);
   ASSERT_FALSE(inferred_status_error3.ok());
-  ASSERT_MATCH(inferred_status_error3.status().error_message(),
-               testing::ContainsRegex(
-                   "dimension to concatenate along out of bounds: 1"));
+  ASSERT_THAT(inferred_status_error3.status().error_message(),
+              ContainsRegex("dimension to concatenate along out of bounds: 1"));
 
   Shape tuple = ShapeUtil::MakeTupleShape({vector_32_});
   auto inferred_status_error4 = ShapeInference::InferConcatOpShape(
       {&vector_32_, &tuple}, /*dimension=*/0);
   ASSERT_FALSE(inferred_status_error4.ok());
-  ASSERT_MATCH(
-      inferred_status_error4.status().error_message(),
-      testing::ContainsRegex(
-          "Expected non-tuple argument for operand of concatenation."));
+  ASSERT_THAT(inferred_status_error4.status().error_message(),
+              ContainsRegex(
+                  "Expected non-tuple argument for operand of concatenation."));
 
   const Shape vector_s32 = ShapeUtil::MakeShape(S32, {32});
   auto inferred_status_error5 = ShapeInference::InferConcatOpShape(
       {&vector_32_, &vector_s32}, /*dimension=*/0);
   ASSERT_FALSE(inferred_status_error5.ok());
-  ASSERT_MATCH(inferred_status_error5.status().error_message(),
-               testing::ContainsRegex(
-                   "cannot concatenate arrays with different element types"));
+  ASSERT_THAT(
+      inferred_status_error5.status().error_message(),
+      ContainsRegex("cannot concatenate arrays with different element types"));
 
   auto inferred_status_error6 = ShapeInference::InferConcatOpShape(
       {&matrix_32_48_, &matrix_32_64_}, /*dimension=*/0);
   ASSERT_FALSE(inferred_status_error6.ok());
-  ASSERT_MATCH(
-      inferred_status_error6.status().error_message(),
-      testing::ContainsRegex("cannot concatenate arrays that differ in "
-                             "dimensions other than the one being "
-                             "concatenated"));
+  ASSERT_THAT(inferred_status_error6.status().error_message(),
+              ContainsRegex("cannot concatenate arrays that differ in "
+                            "dimensions other than the one being "
+                            "concatenated"));
 }
 
 TEST_F(ShapeInferenceTest, Pad) {
@@ -1156,27 +1147,27 @@ TEST_F(ShapeInferenceTest, ReverseInvalidDimension) {
   auto inferred_status_error0 =
       ShapeInference::InferReverseShape(input_shape, {0, 2});
   ASSERT_FALSE(inferred_status_error0.ok());
-  ASSERT_MATCH(inferred_status_error0.status().error_message(),
-               testing::ContainsRegex("out-of-bounds"));
+  ASSERT_THAT(inferred_status_error0.status().error_message(),
+              ContainsRegex("out-of-bounds"));
 
   auto inferred_status_error1 =
       ShapeInference::InferReverseShape(input_shape, {0, -1});
   ASSERT_FALSE(inferred_status_error1.ok());
-  ASSERT_MATCH(inferred_status_error1.status().error_message(),
-               testing::ContainsRegex("out-of-bounds"));
+  ASSERT_THAT(inferred_status_error1.status().error_message(),
+              ContainsRegex("out-of-bounds"));
 
   auto inferred_status_error2 =
       ShapeInference::InferReverseShape(input_shape, {0, 0});
   ASSERT_FALSE(inferred_status_error2.ok());
-  ASSERT_MATCH(inferred_status_error2.status().error_message(),
-               testing::ContainsRegex("duplicated"));
+  ASSERT_THAT(inferred_status_error2.status().error_message(),
+              ContainsRegex("duplicated"));
 
   Shape tuple_shape = ShapeUtil::MakeTupleShape({input_shape, input_shape});
   auto inferred_status_error3 =
       ShapeInference::InferReverseShape(tuple_shape, {0});
   ASSERT_FALSE(inferred_status_error3.ok());
-  ASSERT_MATCH(inferred_status_error3.status().error_message(),
-               testing::ContainsRegex("Expected non-tuple argument"));
+  ASSERT_THAT(inferred_status_error3.status().error_message(),
+              ContainsRegex("Expected non-tuple argument"));
 }
 
 TEST_F(ShapeInferenceTest, Call) {
@@ -1196,20 +1187,20 @@ TEST_F(ShapeInferenceTest, Call) {
   auto inferred_status_error0 = ShapeInference::InferCallShape(
       {}, ShapeUtil::MakeProgramShape({f32_}, f32_));
   EXPECT_FALSE(inferred_status_error0.ok());
-  EXPECT_MATCH(inferred_status_error0.status().error_message(),
-               testing::ContainsRegex("arity must match"));
+  EXPECT_THAT(inferred_status_error0.status().error_message(),
+              ContainsRegex("arity must match"));
 
   auto inferred_status_error1 = ShapeInference::InferCallShape(
       {&f32_}, ShapeUtil::MakeProgramShape({}, f32_));
   EXPECT_FALSE(inferred_status_error1.ok());
-  EXPECT_MATCH(inferred_status_error1.status().error_message(),
-               testing::ContainsRegex("arity must match"));
+  EXPECT_THAT(inferred_status_error1.status().error_message(),
+              ContainsRegex("arity must match"));
 
   auto inferred_status_error2 = ShapeInference::InferCallShape(
       {&f32_}, ShapeUtil::MakeProgramShape({s32_}, f32_));
   EXPECT_FALSE(inferred_status_error2.ok());
-  EXPECT_MATCH(inferred_status_error2.status().error_message(),
-               testing::ContainsRegex("parameter must match argument"));
+  EXPECT_THAT(inferred_status_error2.status().error_message(),
+              ContainsRegex("parameter must match argument"));
 }
 
 TEST_F(ShapeInferenceTest, Transpose) {
diff --git a/tensorflow/compiler/xla/service/transpose_folding_test.cc b/tensorflow/compiler/xla/service/transpose_folding_test.cc
index ea5ab2b917..6643f541da 100644
--- a/tensorflow/compiler/xla/service/transpose_folding_test.cc
+++ b/tensorflow/compiler/xla/service/transpose_folding_test.cc
@@ -28,6 +28,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/shape_inference.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/platform/logging.h"
@@ -151,8 +152,8 @@ TEST_F(TransposeFoldingTest, FuseDotWithConstantOperands) {
   EXPECT_EQ(call, entry_computation->root_instruction());
   HloComputation* callee_computation = call->to_apply();
   // The arguments to the call should be const1, const2, and const3.
-  EXPECT_MATCH(call->operands(), testing::UnorderedMatcher<HloInstruction*>(
-                                     const1, const2, const3));
+  EXPECT_THAT(call->operands(),
+              ::testing::UnorderedElementsAre(const1, const2, const3));
 
   // The callee should contain 3 parameters and 3 binary operators.
   EXPECT_EQ(6, callee_computation->instructions().size());
diff --git a/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc b/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
index 4a4a6e64ff..a09559262f 100644
--- a/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
+++ b/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/instruction_fusion.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
@@ -31,6 +32,9 @@ limitations under the License.
 namespace xla {
 namespace {
 
+using ::testing::UnorderedElementsAreArray;
+using ::testing::UnorderedElementsAre;
+
 class TuplePointsToAnalysisTest : public HloTestBase {
  protected:
   // Builds a module with the given entry computation and runs points to
@@ -70,7 +74,7 @@ class TuplePointsToAnalysisTest : public HloTestBase {
       const std::vector<const LogicalBuffer*>& points_to_set,
       tensorflow::gtl::ArraySlice<const LogicalBuffer*> buffers) {
     std::vector<const LogicalBuffer*> vec(buffers.begin(), buffers.end());
-    EXPECT_MATCH(points_to_set, testing::UnorderedElementsAre(vec));
+    EXPECT_THAT(points_to_set, UnorderedElementsAreArray(vec));
   }
 
   // Checks that the given points-to set contains exactly (unordered) the
@@ -107,20 +111,14 @@ class TuplePointsToAnalysisTest : public HloTestBase {
     for (auto& pair : expected) {
       expected_aliases.push_back(BufferAlias(*buffer, pair.first, pair.second));
     }
-    EXPECT_MATCH(points_to_analysis_->GetBufferAliases(*buffer),
-                 testing::UnorderedElementsAre(expected_aliases));
+    EXPECT_THAT(points_to_analysis_->GetBufferAliases(*buffer),
+                UnorderedElementsAreArray(expected_aliases));
   }
 
   std::unique_ptr<HloModule> module_;
   std::unique_ptr<TuplePointsToAnalysis> points_to_analysis_;
 };
 
-// Expect the given std::set<HloInstruction*> as A contains exactly the given
-// HloInstruction*s as __VA_ARGS__.
-#define EXPECT_ISET(A, ...)                           \
-  EXPECT_MATCH(testing::SetToVec<HloInstruction*>(A), \
-               testing::UnorderedMatcher<HloInstruction*>(__VA_ARGS__))
-
 TEST_F(TuplePointsToAnalysisTest, SimpleTuple) {
   auto builder = HloComputation::Builder(TestName());
   auto constant1 = builder.AddInstruction(
@@ -146,8 +144,8 @@ TEST_F(TuplePointsToAnalysisTest, SimpleTuple) {
 
   EXPECT_EQ(3, points_to_analysis_->GetPointsToSet(tuple).size());
   EXPECT_FALSE(points_to_analysis_->GetPointsToSet(tuple).IsAmbiguous());
-  EXPECT_ISET(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({}),
-              tuple);
+  EXPECT_THAT(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({}),
+              UnorderedElementsAre(tuple));
 
   ExpectHasTopLevelBuffers(
       points_to_analysis_->GetPointsToSet(tuple).CreateFlattenedSet(),
@@ -205,9 +203,9 @@ TEST_F(TuplePointsToAnalysisTest, NestedTuple) {
   ExpectHasTopLevelBuffers(
       points_to_analysis_->GetPointsToSet(inner_tuple).element({}),
       {inner_tuple});
-  EXPECT_ISET(
+  EXPECT_THAT(
       points_to_analysis_->GetPointsToSet(inner_tuple).tuple_sources({}),
-      inner_tuple);
+      UnorderedElementsAre(inner_tuple));
 
   EXPECT_EQ(5, points_to_analysis_->GetPointsToSet(tuple).size());
   EXPECT_FALSE(points_to_analysis_->GetPointsToSet(tuple).IsAmbiguous());
@@ -215,10 +213,10 @@ TEST_F(TuplePointsToAnalysisTest, NestedTuple) {
       points_to_analysis_->GetPointsToSet(tuple).CreateFlattenedSet(),
       {constant1, constant2, constant3, inner_tuple, tuple});
 
-  EXPECT_ISET(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({}),
-              tuple);
-  EXPECT_ISET(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({0}),
-              inner_tuple);
+  EXPECT_THAT(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({}),
+              UnorderedElementsAre(tuple));
+  EXPECT_THAT(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({0}),
+              UnorderedElementsAre(inner_tuple));
   EXPECT_TRUE(
       points_to_analysis_->GetPointsToSet(tuple).tuple_sources({1}).empty());
 
@@ -262,7 +260,8 @@ TEST_F(TuplePointsToAnalysisTest, GetTupleElement) {
                            {constant1, constant2, inner_tuple});
   ExpectHasTopLevelBuffers(points_to_set.element({}), {inner_tuple});
 
-  EXPECT_ISET(points_to_set.tuple_sources({}), inner_tuple);
+  EXPECT_THAT(points_to_set.tuple_sources({}),
+              UnorderedElementsAre(inner_tuple));
 }
 
 TEST_F(TuplePointsToAnalysisTest, DuplicatedElement) {
@@ -460,8 +459,10 @@ TEST_F(TuplePointsToAnalysisTest, NestedTupleSelect) {
   ExpectHasTopLevelBuffers(points_to_set.element({0, 1}), {constant2});
 
   // Verify tuple sources.
-  EXPECT_ISET(points_to_set.tuple_sources({}), tuple1, tuple2);
-  EXPECT_ISET(points_to_set.tuple_sources({0}), inner_tuple1, inner_tuple2);
+  EXPECT_THAT(points_to_set.tuple_sources({}),
+              UnorderedElementsAre(tuple1, tuple2));
+  EXPECT_THAT(points_to_set.tuple_sources({0}),
+              UnorderedElementsAre(inner_tuple1, inner_tuple2));
   EXPECT_EQ(0, points_to_set.tuple_sources({0, 0}).size());
   EXPECT_EQ(0, points_to_set.tuple_sources({0, 1}).size());
 }
@@ -489,8 +490,8 @@ TEST_F(TuplePointsToAnalysisTest, TupleWithBitcast) {
 
   EXPECT_EQ(3, points_to_analysis_->GetPointsToSet(tuple).size());
   EXPECT_FALSE(points_to_analysis_->GetPointsToSet(tuple).IsAmbiguous());
-  EXPECT_ISET(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({}),
-              tuple);
+  EXPECT_THAT(points_to_analysis_->GetPointsToSet(tuple).tuple_sources({}),
+              UnorderedElementsAre(tuple));
 
   ExpectHasTopLevelBuffers(
       points_to_analysis_->GetPointsToSet(tuple).CreateFlattenedSet(),
diff --git a/tensorflow/compiler/xla/shape_tree_test.cc b/tensorflow/compiler/xla/shape_tree_test.cc
index d37f536b75..ecb141d75b 100644
--- a/tensorflow/compiler/xla/shape_tree_test.cc
+++ b/tensorflow/compiler/xla/shape_tree_test.cc
@@ -16,8 +16,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/shape_tree.h"
 
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/shape_util_test.cc b/tensorflow/compiler/xla/shape_util_test.cc
index 9e6b243611..b0a4b0c9a7 100644
--- a/tensorflow/compiler/xla/shape_util_test.cc
+++ b/tensorflow/compiler/xla/shape_util_test.cc
@@ -16,10 +16,10 @@ limitations under the License.
 #include "tensorflow/compiler/xla/shape_util.h"
 
 #include "tensorflow/compiler/xla/layout_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/util.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/status_macros_test.cc b/tensorflow/compiler/xla/status_macros_test.cc
index 4e7b9161db..5563159776 100644
--- a/tensorflow/compiler/xla/status_macros_test.cc
+++ b/tensorflow/compiler/xla/status_macros_test.cc
@@ -16,9 +16,9 @@ limitations under the License.
 #include "tensorflow/compiler/xla/status_macros.h"
 
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 
@@ -40,15 +40,15 @@ Status RetCheckSuccess() {
 TEST(StatusMacros, RetCheckFailing) {
   Status status = RetCheckFail();
   EXPECT_EQ(status.code(), tensorflow::error::INTERNAL);
-  EXPECT_MATCH(status.error_message(),
-               xla::testing::ContainsRegex("RET_CHECK failure.*2 > 3"));
+  EXPECT_THAT(status.error_message(),
+              ::testing::ContainsRegex("RET_CHECK failure.*2 > 3"));
 }
 
 TEST(StatusMacros, RetCheckFailingWithExtraMessage) {
   Status status = RetCheckFailWithExtraMessage();
   EXPECT_EQ(status.code(), tensorflow::error::INTERNAL);
-  EXPECT_MATCH(status.error_message(),
-               xla::testing::ContainsRegex("RET_CHECK.*2 > 3 extra message"));
+  EXPECT_THAT(status.error_message(),
+              ::testing::ContainsRegex("RET_CHECK.*2 > 3 extra message"));
 }
 
 TEST(StatusMacros, RetCheckSucceeding) {
diff --git a/tensorflow/compiler/xla/statusor_test.cc b/tensorflow/compiler/xla/statusor_test.cc
index d98eb27933..d3bc3e9225 100644
--- a/tensorflow/compiler/xla/statusor_test.cc
+++ b/tensorflow/compiler/xla/statusor_test.cc
@@ -20,10 +20,10 @@ limitations under the License.
 #include <memory>
 #include <type_traits>
 
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/platform/macros.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/test_benchmark.h"
 
 namespace xla {
diff --git a/tensorflow/compiler/xla/test_helpers.cc b/tensorflow/compiler/xla/test_helpers.cc
deleted file mode 100644
index 02abfdeab8..0000000000
--- a/tensorflow/compiler/xla/test_helpers.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/compiler/xla/test_helpers.h"
-#include "tensorflow/compiler/xla/types.h"
-#include "tensorflow/core/platform/regexp.h"
-
-namespace xla {
-namespace testing {
-
-AssertionResult::AssertionResult(const AssertionResult& other)
-    : success_(other.success_),
-      message_(other.message_ != nullptr ? new std::string(*other.message_)
-                                         : static_cast<std::string*>(nullptr)) {
-}
-
-// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-AssertionResult AssertionResult::operator!() const {
-  AssertionResult negation(!success_);
-  if (message_ != nullptr) negation << *message_;
-  return negation;
-}
-
-AssertionResult& AssertionResult::operator=(const AssertionResult& ar) {
-  success_ = ar.success_;
-  message_.reset(ar.message_ != nullptr ? new std::string(*ar.message_)
-                                        : nullptr);
-  return *this;
-}
-
-AssertionResult AssertionFailure() { return AssertionResult(false); }
-
-AssertionResult AssertionSuccess() { return AssertionResult(true); }
-
-std::function<bool(tensorflow::StringPiece)> ContainsRegex(
-    const tensorflow::StringPiece regex) {
-  return [regex](const tensorflow::StringPiece to_test) {
-    if (RE2::PartialMatch(
-            tensorflow::RegexpStringPiece(to_test.data(), to_test.size()),
-            tensorflow::RegexpStringPiece(regex.data(), regex.size()))) {
-      return true;
-    } else {
-      LOG(ERROR) << "Expected to find " << regex << " in " << to_test;
-      return false;
-    }
-  };
-}
-
-std::function<bool(tensorflow::StringPiece)> HasSubstr(
-    const tensorflow::StringPiece part) {
-  return [part](const tensorflow::StringPiece whole) {
-    return whole.contains(part);
-  };
-}
-
-}  // namespace testing
-}  // namespace xla
diff --git a/tensorflow/compiler/xla/test_helpers.h b/tensorflow/compiler/xla/test_helpers.h
index f923d9f36c..634cdb5aa2 100644
--- a/tensorflow/compiler/xla/test_helpers.h
+++ b/tensorflow/compiler/xla/test_helpers.h
@@ -39,286 +39,6 @@ class Literal;
 
 namespace testing {
 
-class AssertionResult {
- public:
-  explicit AssertionResult(bool success) : success_(success) {}
-
-  // Returns true iff the assertion succeeded.
-  operator bool() const { return success_; }  // NOLINT
-
-  // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE.
-  AssertionResult operator!() const;
-
-  // Returns the text streamed into this AssertionResult. Test assertions
-  // use it when they fail (i.e., the predicate's outcome doesn't match the
-  // assertion's expectation). When nothing has been streamed into the
-  // object, returns an empty string.
-  const char* message() const {
-    return message_ != nullptr ? message_->c_str() : "";
-  }
-
-  // Streams a custom failure message into this object.
-  template <typename T>
-  AssertionResult& operator<<(const T& value) {
-    AppendMessage(::testing::Message() << value);
-    return *this;
-  }
-
-  // Allows streaming basic output manipulators such as endl or flush into
-  // this object.
-  AssertionResult& operator<<(
-      std::ostream& (*basic_manipulator)(std::ostream& stream)) {
-    AppendMessage(::testing::Message() << basic_manipulator);
-    return *this;
-  }
-
-  // Copy operator.
-  AssertionResult(const AssertionResult& ar);
-
-  // Assignment operator.
-  AssertionResult& operator=(const AssertionResult&);
-
- private:
-  // Appends the contents of message to message_.
-  void AppendMessage(const ::testing::Message& a_message) {
-    if (message_ == nullptr) message_.reset(new std::string);
-    message_->append(a_message.GetString().c_str());
-  }
-
-  bool success_ = false;
-
-  // Stores the message describing the condition in case the
-  // expectation construct is not satisfied with the predicate's
-  // outcome.  Referenced via a pointer to avoid taking too much stack
-  // frame space with test assertions.
-  std::unique_ptr<std::string> message_;
-};
-
-AssertionResult AssertionFailure();
-
-AssertionResult AssertionSuccess();
-
-std::function<bool(tensorflow::StringPiece)> ContainsRegex(
-    const tensorflow::StringPiece regex);
-
-std::function<bool(tensorflow::StringPiece)> HasSubstr(
-    const tensorflow::StringPiece part);
-
-// Matcher for a vector of same-type values for which operator= is
-// defined.
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> VectorMatcher(
-    const std::vector<T>& expected) {
-  return [expected](const std::vector<T>& actual) -> AssertionResult {
-    int len = expected.size();
-    if (actual.size() != len) {
-      return AssertionFailure() << "Actual values len of " << actual.size()
-                                << " != expected.size " << len;
-    }
-    for (int i = 0; i < len; ++i) {
-      if (actual[i] != expected[i]) {
-        return AssertionFailure() << "Element " << i << " actual " << actual[i]
-                                  << " != " << expected[i];
-      }
-    }
-    return AssertionSuccess();
-  };
-}
-
-// Approximate matcher for a vector of floats or similar.
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)>
-ApproxVectorMatcher(const std::vector<T>& expected, float abs_diff,
-                    float rel_diff) {
-  return [abs_diff, rel_diff,
-          expected](const std::vector<T>& actual) -> AssertionResult {
-    int len = expected.size();
-    if (actual.size() != len) {
-      AssertionResult ar = AssertionFailure() << "Actual values len of "
-                                              << actual.size()
-                                              << " != expected.size " << len;
-      LOG(ERROR) << ar.message();
-      return ar;
-    }
-    for (int i = 0; i < len; ++i) {
-      T diff = actual[i] - expected[i];
-      if (diff < 0) {
-        diff *= -1;
-      }
-      if (diff > abs_diff) {
-        T rdiff = (expected[i] != 0 ? diff / expected[i] : 0.0 * expected[i]);
-        if (rdiff > rel_diff) {
-          AssertionResult ar = AssertionFailure()
-                               << "Element " << i << " actual " << actual[i]
-                               << " != " << expected[i]
-                               << "( abs_diff = " << diff
-                               << ", rel_diff = " << rdiff << ")";
-          LOG(ERROR) << ar.message();
-          return ar;
-        }
-      }
-    }
-    return AssertionSuccess();
-  };
-}
-
-// Matches a vector of same-type values against another, succeeding so
-// long as they have the same length and every value in 'actual'
-// matches one in 'expected.'  Does not verify an exhaustive
-// one-to-one mapping between the two.
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)>
-UnorderedElementsAre(const std::vector<T>& expected) {
-  return [expected](const std::vector<T>& actual) -> AssertionResult {
-    if (actual.size() != expected.size()) {
-      return AssertionFailure() << "sizes don't match";
-    }
-    for (auto a : actual) {
-      bool found = false;
-      for (auto e : expected) {
-        if (a == e) {
-          found = true;
-          break;
-        }
-      }
-      if (!found) {
-        return AssertionFailure() << "actual element " << a
-                                  << " not in expected";
-      }
-    }
-    return AssertionSuccess();
-  };
-}
-
-// Overloaded cover functions for UnorderedElementsAre, for the numbers
-// of values used in practice.
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> UnorderedMatcher(
-    T a) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  return testing::UnorderedElementsAre<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> UnorderedMatcher(
-    T a, T b) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  return testing::UnorderedElementsAre<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> UnorderedMatcher(
-    T a, T b, T c) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  expected.push_back(c);
-  return testing::UnorderedElementsAre<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> UnorderedMatcher(
-    T a, T b, T c, T d) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  expected.push_back(c);
-  expected.push_back(d);
-  return testing::UnorderedElementsAre<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> UnorderedMatcher(
-    T a, T b, T c, T d, T e) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  expected.push_back(c);
-  expected.push_back(d);
-  expected.push_back(e);
-  return testing::UnorderedElementsAre<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> UnorderedMatcher(
-    T a, T b, T c, T d, T e, T f) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  expected.push_back(c);
-  expected.push_back(d);
-  expected.push_back(e);
-  expected.push_back(f);
-  return testing::UnorderedElementsAre<T>(expected);
-}
-
-// Overloaded cover functions for VectorMatcher for the numbers of
-// elements used in practice.
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> OrderedMatcher(
-    T a) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  return testing::VectorMatcher<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> OrderedMatcher(
-    T a, T b) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  return testing::VectorMatcher<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> OrderedMatcher(
-    T a, T b, T c) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  expected.push_back(c);
-  return testing::VectorMatcher<T>(expected);
-}
-
-template <typename T>
-std::function<AssertionResult(const std::vector<T>& actual)> OrderedMatcher(
-    T a, T b, T c, T d) {
-  std::vector<T> expected;
-  expected.push_back(a);
-  expected.push_back(b);
-  expected.push_back(c);
-  expected.push_back(d);
-  return testing::VectorMatcher<T>(expected);
-}
-
-// Convert a RepeatedField to a flat vector.
-template <typename T>
-std::vector<T> PBToVec(const tensorflow::protobuf::RepeatedField<T> rf) {
-  return std::vector<T>(rf.begin(), rf.end());
-}
-
-// Convert a List to a flat vector.
-template <typename T>
-std::vector<T> ListToVec(const std::list<T>& l) {
-  return std::vector<T>(l.begin(), l.end());
-}
-
-// Convert a Set to a flat vector.
-template <typename T>
-std::vector<T> SetToVec(const std::set<T>& c) {
-  return std::vector<T>(c.begin(), c.end());
-}
-
-// Convert an Array to a flat vector.
-template <typename T>
-std::vector<T> Array2DToVec(const Array2D<T>& a) {
-  return std::vector<T>(a.data(), a.data() + a.num_elements());
-}
-
 namespace internal_status {
 inline const ::tensorflow::Status& GetStatus(
     const ::tensorflow::Status& status) {
@@ -347,9 +67,4 @@ inline const ::tensorflow::Status& GetStatus(const StatusOr<T>& status) {
   ASSERT_EQ(tensorflow::Status::OK(), \
             xla::testing::internal_status::GetStatus(expression))
 
-// Macros that apply a Matcher to a Value, returning an
-// AssertionResult which gets digested by a standard gunit macro.
-#define EXPECT_MATCH(V, M) EXPECT_TRUE((M)((V)))
-#define ASSERT_MATCH(V, M) ASSERT_TRUE(M(V))
-
 #endif  // TENSORFLOW_COMPILER_XLA_TEST_HELPERS_H_
diff --git a/tensorflow/compiler/xla/tests/BUILD b/tensorflow/compiler/xla/tests/BUILD
index c7cbbdf499..12bc1e9956 100644
--- a/tensorflow/compiler/xla/tests/BUILD
+++ b/tensorflow/compiler/xla/tests/BUILD
@@ -69,6 +69,7 @@ cc_library(
         "//tensorflow/compiler/xla:array4d",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
@@ -103,6 +104,7 @@ cc_library(
         "//tensorflow/compiler/xla/service:hlo_graph_dumper",
         "//tensorflow/compiler/xla/service:hlo_module_config",
         "//tensorflow/compiler/xla/service:transfer_manager",
+        "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:lib",
         "//tensorflow/core:stream_executor_no_cuda",
         "//tensorflow/core:test",
diff --git a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
index d18511a6b4..e682f285e0 100644
--- a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
+++ b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
@@ -29,13 +29,13 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/core/casts.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -1667,9 +1667,9 @@ TEST_F(ArrayElementwiseOpTest, CannotAddOpaques) {
   auto concatenated = builder.Add(x, x);
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_FALSE(computation_status.ok());
-  EXPECT_MATCH(computation_status.status().ToString(),
-               testing::ContainsRegex(
-                   "Expected non-opaque argument for lhs of binary operation"));
+  EXPECT_THAT(computation_status.status().ToString(),
+              ::testing::ContainsRegex(
+                  "Expected non-opaque argument for lhs of binary operation"));
 }
 
 // Regression test for b/31927799. "slice - y" is fused and requires implicit
diff --git a/tensorflow/compiler/xla/tests/bad_rng_shape_validation_test.cc b/tensorflow/compiler/xla/tests/bad_rng_shape_validation_test.cc
index c7b533b80f..a67f18a44e 100644
--- a/tensorflow/compiler/xla/tests/bad_rng_shape_validation_test.cc
+++ b/tensorflow/compiler/xla/tests/bad_rng_shape_validation_test.cc
@@ -23,12 +23,11 @@ limitations under the License.
 #include "tensorflow/compiler/xla/client/local_client.h"
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/statusor.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
@@ -45,8 +44,8 @@ TEST_F(BadRngShapeValidationTest, DefaultConstructedShapeCreatesError) {
   StatusOr<Computation> computation = builder.Build();
   EXPECT_FALSE(computation.ok());
   LOG(INFO) << "status received: " << computation.status();
-  EXPECT_MATCH(computation.status().error_message(),
-               testing::HasSubstr("shape has invalid"));
+  EXPECT_THAT(computation.status().error_message(),
+              ::testing::HasSubstr("shape has invalid"));
 }
 
 TEST_F(BadRngShapeValidationTest, ShapeWithoutLayoutIsOk) {
diff --git a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
index 63744afb4e..68b4d9916e 100644
--- a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
+++ b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
@@ -24,11 +24,10 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
@@ -220,8 +219,8 @@ XLA_TEST_F(BroadcastSimpleTest, InvalidBinaryAndDegenerateBroadcasting) {
 
   auto result_status = Execute(&b, {});
   EXPECT_FALSE(result_status.ok());
-  EXPECT_MATCH(result_status.status().error_message(),
-               testing::ContainsRegex("broadcast dimension 0 mismatch"));
+  EXPECT_THAT(result_status.status().error_message(),
+              ::testing::ContainsRegex("broadcast dimension 0 mismatch"));
 }
 
 XLA_TEST_F(BroadcastSimpleTest, InvalidInDimensionBroadcasting) {
@@ -233,9 +232,9 @@ XLA_TEST_F(BroadcastSimpleTest, InvalidInDimensionBroadcasting) {
 
   auto result_status = Execute(&b, {});
   EXPECT_FALSE(result_status.ok());
-  EXPECT_MATCH(
+  EXPECT_THAT(
       result_status.status().error_message(),
-      testing::ContainsRegex("binary op BINOP_ADD with incompatible shapes"));
+      ::testing::ContainsRegex("binary op BINOP_ADD with incompatible shapes"));
 }
 
 XLA_TEST_F(BroadcastSimpleTest, InvalidDegenerateBroadcasting) {
@@ -247,9 +246,9 @@ XLA_TEST_F(BroadcastSimpleTest, InvalidDegenerateBroadcasting) {
 
   auto result_status = Execute(&b, {});
   EXPECT_FALSE(result_status.ok());
-  EXPECT_MATCH(
+  EXPECT_THAT(
       result_status.status().error_message(),
-      testing::ContainsRegex("binary op BINOP_ADD with incompatible shapes"));
+      ::testing::ContainsRegex("binary op BINOP_ADD with incompatible shapes"));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/tests/call_test.cc b/tensorflow/compiler/xla/tests/call_test.cc
index 0b5e6d5127..9b96173aaa 100644
--- a/tensorflow/compiler/xla/tests/call_test.cc
+++ b/tensorflow/compiler/xla/tests/call_test.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
diff --git a/tensorflow/compiler/xla/tests/check_execution_arity_test.cc b/tensorflow/compiler/xla/tests/check_execution_arity_test.cc
index 675c9fccb0..1bb1a1d6b4 100644
--- a/tensorflow/compiler/xla/tests/check_execution_arity_test.cc
+++ b/tensorflow/compiler/xla/tests/check_execution_arity_test.cc
@@ -22,15 +22,17 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
 
+using ::testing::ContainsRegex;
+
 class CheckExecutionArityTest : public ClientLibraryTestBase {};
 
 TEST_F(CheckExecutionArityTest, TwoParamComputationNumArguments) {
@@ -60,15 +62,15 @@ TEST_F(CheckExecutionArityTest, TwoParamComputationNumArguments) {
   ASSERT_FALSE(result_one_arg.ok());
   ASSERT_EQ(result_one_arg.status().code(),
             tensorflow::error::INVALID_ARGUMENT);
-  ASSERT_MATCH(result_one_arg.status().error_message(),
-               testing::ContainsRegex("takes 2"));
+  ASSERT_THAT(result_one_arg.status().error_message(),
+              ContainsRegex("takes 2"));
 
   auto result_zero_args = client_->Execute(computation, {});
   ASSERT_FALSE(result_zero_args.ok());
   ASSERT_EQ(result_zero_args.status().code(),
             tensorflow::error::INVALID_ARGUMENT);
-  ASSERT_MATCH(result_zero_args.status().error_message(),
-               testing::ContainsRegex("takes 2"));
+  ASSERT_THAT(result_zero_args.status().error_message(),
+              ContainsRegex("takes 2"));
 }
 
 XLA_TEST_F(CheckExecutionArityTest, CheckArgumentShapes) {
@@ -99,22 +101,22 @@ XLA_TEST_F(CheckExecutionArityTest, CheckArgumentShapes) {
   status = client_->Execute(computation, {f32_4_data.get(), f32_4_data.get()});
   ASSERT_FALSE(status.ok());
   ASSERT_EQ(status.status().code(), tensorflow::error::INVALID_ARGUMENT);
-  ASSERT_MATCH(status.status().error_message(),
-               testing::ContainsRegex("expects parameter 0"));
+  ASSERT_THAT(status.status().error_message(),
+              ContainsRegex("expects parameter 0"));
 
   // Shape mismatch in parameter 1 (rank)
   status = client_->Execute(computation, {f32_data.get(), f32_data.get()});
   ASSERT_FALSE(status.ok());
   ASSERT_EQ(status.status().code(), tensorflow::error::INVALID_ARGUMENT);
-  ASSERT_MATCH(status.status().error_message(),
-               testing::ContainsRegex("expects parameter 1"));
+  ASSERT_THAT(status.status().error_message(),
+              ContainsRegex("expects parameter 1"));
 
   // Shape mismatch in parameter 1 (element type)
   status = client_->Execute(computation, {f32_data.get(), u8_4_data.get()});
   ASSERT_FALSE(status.ok());
   ASSERT_EQ(status.status().code(), tensorflow::error::INVALID_ARGUMENT);
-  ASSERT_MATCH(status.status().error_message(),
-               testing::ContainsRegex("expects parameter 1"));
+  ASSERT_THAT(status.status().error_message(),
+              ContainsRegex("expects parameter 1"));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/tests/compute_constant_test.cc b/tensorflow/compiler/xla/tests/compute_constant_test.cc
index 709ce5029c..4170e0f4e2 100644
--- a/tensorflow/compiler/xla/tests/compute_constant_test.cc
+++ b/tensorflow/compiler/xla/tests/compute_constant_test.cc
@@ -27,13 +27,12 @@ limitations under the License.
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/statusor.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/tests/test_utils.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -222,10 +221,10 @@ TEST_F(ComputeConstantTest, DISABLED_ON_CPU(ReuseComputedConstant)) {
   // Try to use value from ComputeConstant in Execute.
   auto execute_status = client_->Execute(computation, {handle.get()});
   EXPECT_FALSE(execute_status.ok());
-  EXPECT_MATCH(
+  EXPECT_THAT(
       execute_status.status().error_message(),
-      testing::ContainsRegex("argument 0 is on device Host:0 but computation "
-                             "will be executed on device"));
+      ::testing::ContainsRegex("argument 0 is on device Host:0 but computation "
+                               "will be executed on device"));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/tests/concat_test.cc b/tensorflow/compiler/xla/tests/concat_test.cc
index 9a48b19b96..0b660bcbf9 100644
--- a/tensorflow/compiler/xla/tests/concat_test.cc
+++ b/tensorflow/compiler/xla/tests/concat_test.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/reference_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
@@ -41,9 +42,9 @@ XLA_TEST_F(ConcatTest, Concat_Nothing) {
   auto concatenated = builder.ConcatInDim({}, 0);
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_FALSE(computation_status.ok());
-  EXPECT_MATCH(
+  EXPECT_THAT(
       computation_status.status().ToString(),
-      testing::ContainsRegex("Concatenate expects at least one argument"));
+      ::testing::ContainsRegex("Concatenate expects at least one argument"));
 }
 
 // Concatenate with one argument works.
@@ -65,9 +66,9 @@ XLA_TEST_F(ConcatTest, CannotConcatR0WithR0) {
   auto concatenated = builder.ConcatInDim({a, b}, 0);
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_FALSE(computation_status.ok());
-  EXPECT_MATCH(computation_status.status().ToString(),
-               testing::ContainsRegex(
-                   "dimension to concatenate along out of bounds: 0"));
+  EXPECT_THAT(computation_status.status().ToString(),
+              ::testing::ContainsRegex(
+                  "dimension to concatenate along out of bounds: 0"));
 }
 
 XLA_TEST_F(ConcatTest, Concat_R1_L0_With_R1_L0) {
@@ -404,10 +405,9 @@ XLA_TEST_F(ConcatTest, CannotConcatOpaques) {
   auto concatenated = builder.ConcatInDim({x, y}, 0);
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_FALSE(computation_status.ok());
-  EXPECT_MATCH(
-      computation_status.status().ToString(),
-      testing::ContainsRegex(
-          "Expected non-opaque argument for operand of concatenation"));
+  EXPECT_THAT(computation_status.status().ToString(),
+              ::testing::ContainsRegex(
+                  "Expected non-opaque argument for operand of concatenation"));
 }
 
 XLA_TEST_F(ConcatTest, ConcatSeveralBoxedPredicates) {
diff --git a/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc b/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc
index 9f38dc4b36..59f4fb8db2 100644
--- a/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc
+++ b/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc
@@ -25,12 +25,11 @@ limitations under the License.
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/reference_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -43,8 +42,8 @@ TEST_F(ConvolutionDimensionNumbersTest, InvalidInputDimensionNumbers) {
   auto dimension_numbers_status =
       ComputationBuilder::CreateConvDimensionNumbers(0, 2, 2, 3, 0, 1, 2, 3);
   ASSERT_FALSE(dimension_numbers_status.ok());
-  ASSERT_MATCH(dimension_numbers_status.status().error_message(),
-               testing::ContainsRegex("input are not unique"));
+  ASSERT_THAT(dimension_numbers_status.status().error_message(),
+              ::testing::ContainsRegex("input are not unique"));
 }
 
 // Tests the convolution operation with invalid weight dimension numbers.
@@ -52,8 +51,8 @@ TEST_F(ConvolutionDimensionNumbersTest, InvalidWeightDimensionNumbers) {
   auto dimension_numbers_status =
       ComputationBuilder::CreateConvDimensionNumbers(0, 1, 2, 3, 2, 3, 2, 3);
   ASSERT_FALSE(dimension_numbers_status.ok());
-  ASSERT_MATCH(dimension_numbers_status.status().error_message(),
-               testing::ContainsRegex("weight are not unique"));
+  ASSERT_THAT(dimension_numbers_status.status().error_message(),
+              ::testing::ContainsRegex("weight are not unique"));
 }
 
 XLA_TEST_F(ConvolutionDimensionNumbersTest,
diff --git a/tensorflow/compiler/xla/tests/deallocation_test.cc b/tensorflow/compiler/xla/tests/deallocation_test.cc
index 528efd2942..94f34f753b 100644
--- a/tensorflow/compiler/xla/tests/deallocation_test.cc
+++ b/tensorflow/compiler/xla/tests/deallocation_test.cc
@@ -21,15 +21,17 @@ limitations under the License.
 #include "tensorflow/compiler/xla/client/local_client.h"
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
 
+using ::testing::HasSubstr;
+
 class DeallocationTest : public ClientLibraryTestBase {
  protected:
   // Build and execute the given computation then verify the results can be
@@ -59,8 +61,8 @@ TEST_F(DeallocationTest, DeallocateScalar) {
 
   auto transfer_status = client_->Transfer(*global_data);
   ASSERT_FALSE(transfer_status.ok());
-  ASSERT_MATCH(transfer_status.status().error_message(),
-               testing::HasSubstr("was previously deallocated"));
+  ASSERT_THAT(transfer_status.status().error_message(),
+              HasSubstr("was previously deallocated"));
 }
 
 TEST_F(DeallocationTest, DeallocateVector) {
@@ -72,8 +74,8 @@ TEST_F(DeallocationTest, DeallocateVector) {
 
   auto transfer_status = client_->Transfer(*global_data);
   ASSERT_FALSE(transfer_status.ok());
-  ASSERT_MATCH(transfer_status.status().error_message(),
-               testing::HasSubstr("was previously deallocated"));
+  ASSERT_THAT(transfer_status.status().error_message(),
+              HasSubstr("was previously deallocated"));
 }
 
 TEST_F(DeallocationTest, DeallocateEmptyVector) {
@@ -85,8 +87,8 @@ TEST_F(DeallocationTest, DeallocateEmptyVector) {
 
   auto transfer_status = client_->Transfer(*global_data);
   ASSERT_FALSE(transfer_status.ok());
-  ASSERT_MATCH(transfer_status.status().error_message(),
-               testing::HasSubstr("was previously deallocated"));
+  ASSERT_THAT(transfer_status.status().error_message(),
+              HasSubstr("was previously deallocated"));
 }
 
 XLA_TEST_F(DeallocationTest, DeallocateTuple) {
@@ -99,8 +101,8 @@ XLA_TEST_F(DeallocationTest, DeallocateTuple) {
 
   auto transfer_status = client_->Transfer(*global_data);
   ASSERT_FALSE(transfer_status.ok());
-  ASSERT_MATCH(transfer_status.status().error_message(),
-               testing::HasSubstr("was previously deallocated"));
+  ASSERT_THAT(transfer_status.status().error_message(),
+              HasSubstr("was previously deallocated"));
 }
 
 XLA_TEST_F(DeallocationTest, DeallocateTupleWithRepeatedElements) {
@@ -114,8 +116,8 @@ XLA_TEST_F(DeallocationTest, DeallocateTupleWithRepeatedElements) {
 
   auto transfer_status = client_->Transfer(*global_data);
   ASSERT_FALSE(transfer_status.ok());
-  ASSERT_MATCH(transfer_status.status().error_message(),
-               testing::HasSubstr("was previously deallocated"));
+  ASSERT_THAT(transfer_status.status().error_message(),
+              HasSubstr("was previously deallocated"));
 }
 
 XLA_TEST_F(DeallocationTest, DeallocateNestedTuple) {
@@ -130,8 +132,8 @@ XLA_TEST_F(DeallocationTest, DeallocateNestedTuple) {
 
   auto transfer_status = client_->Transfer(*global_data);
   ASSERT_FALSE(transfer_status.ok());
-  ASSERT_MATCH(transfer_status.status().error_message(),
-               testing::HasSubstr("was previously deallocated"));
+  ASSERT_THAT(transfer_status.status().error_message(),
+              HasSubstr("was previously deallocated"));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc b/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc
index 57a7c61b14..33c710a606 100644
--- a/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc
+++ b/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
@@ -34,6 +35,8 @@ limitations under the License.
 namespace xla {
 namespace {
 
+using ::testing::ElementsAre;
+
 class DeconstructTupleTest : public ClientLibraryTestBase {
  protected:
   // Build and execute the given computation then verify the results can be
@@ -63,9 +66,9 @@ TEST_F(DeconstructTupleTest, DeconstructTuple) {
   auto handles = result_status.ConsumeValueOrDie();
   std::vector<float> copy(4);
   ASSERT_IS_OK(client_->TransferInProcess(*handles[0], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles[1], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({2.0, 4.0, 6.0, 8.0}));
+  EXPECT_THAT(copy, ElementsAre(2.0, 4.0, 6.0, 8.0));
 }
 
 TEST_F(DeconstructTupleTest, DeconstructTupleTwice) {
@@ -85,16 +88,16 @@ TEST_F(DeconstructTupleTest, DeconstructTupleTwice) {
   std::vector<float> copy(4);
 
   ASSERT_IS_OK(client_->TransferInProcess(*handles1[0], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles1[1], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({2.0, 4.0, 6.0, 8.0}));
+  EXPECT_THAT(copy, ElementsAre(2.0, 4.0, 6.0, 8.0));
   handles1[0].reset();
   handles1[1].reset();
 
   ASSERT_IS_OK(client_->TransferInProcess(*handles2[0], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles2[1], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({2.0, 4.0, 6.0, 8.0}));
+  EXPECT_THAT(copy, ElementsAre(2.0, 4.0, 6.0, 8.0));
 }
 
 XLA_TEST_F(DeconstructTupleTest, DeconstructTupleRepeatedElement) {
@@ -114,13 +117,13 @@ XLA_TEST_F(DeconstructTupleTest, DeconstructTupleRepeatedElement) {
 
   std::vector<float> copy(4);
   ASSERT_IS_OK(client_->TransferInProcess(*handles[0], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles[1], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({2.0, 4.0, 6.0, 8.0}));
+  EXPECT_THAT(copy, ElementsAre(2.0, 4.0, 6.0, 8.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles[2], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({2.0, 4.0, 6.0, 8.0}));
+  EXPECT_THAT(copy, ElementsAre(2.0, 4.0, 6.0, 8.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles[3], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
 }
 
 TEST_F(DeconstructTupleTest, DeconstructTupleThenDeallocate) {
@@ -140,17 +143,17 @@ TEST_F(DeconstructTupleTest, DeconstructTupleThenDeallocate) {
 
   std::vector<float> copy(4);
   ASSERT_IS_OK(client_->TransferInProcess(*handles[0], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles[1], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({2.0, 4.0, 6.0, 8.0}));
+  EXPECT_THAT(copy, ElementsAre(2.0, 4.0, 6.0, 8.0));
   ASSERT_IS_OK(client_->TransferInProcess(*handles[2], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
 
   /// Try deallocating one of the repeated elements, then copy
   handles[0].reset();
 
   ASSERT_IS_OK(client_->TransferInProcess(*handles[2], &copy[0]));
-  EXPECT_MATCH(copy, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(copy, ElementsAre(1.0, 2.0, 3.0, 4.0));
 }
 
 TEST_F(DeconstructTupleTest, DeconstructNonTuple) {
@@ -160,8 +163,8 @@ TEST_F(DeconstructTupleTest, DeconstructNonTuple) {
 
   auto result_status = client_->DeconstructTuple(*global_data);
   EXPECT_FALSE(result_status.ok());
-  EXPECT_MATCH(result_status.status().error_message(),
-               testing::ContainsRegex("global data handle .* is not a tuple"));
+  EXPECT_THAT(result_status.status().error_message(),
+              ::testing::ContainsRegex("global data handle .* is not a tuple"));
 }
 
 XLA_TEST_F(DeconstructTupleTest, DeconstructTupleFromParam) {
@@ -189,9 +192,9 @@ XLA_TEST_F(DeconstructTupleTest, DeconstructNestedTuple) {
 
   auto result_status = client_->DeconstructTuple(*global_data);
   EXPECT_FALSE(result_status.ok());
-  EXPECT_MATCH(
-      result_status.status().error_message(),
-      testing::ContainsRegex("deconstructing nested tuples not yet supported"));
+  EXPECT_THAT(result_status.status().error_message(),
+              ::testing::ContainsRegex(
+                  "deconstructing nested tuples not yet supported"));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/tests/dynamic_ops_test.cc b/tensorflow/compiler/xla/tests/dynamic_ops_test.cc
index 1d1fb33707..180e851410 100644
--- a/tensorflow/compiler/xla/tests/dynamic_ops_test.cc
+++ b/tensorflow/compiler/xla/tests/dynamic_ops_test.cc
@@ -28,6 +28,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/platform_util.h"
 #include "tensorflow/compiler/xla/service/shaped_buffer.h"
 #include "tensorflow/compiler/xla/service/transfer_manager.h"
+#include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
diff --git a/tensorflow/compiler/xla/tests/hlo_test_base.h b/tensorflow/compiler/xla/tests/hlo_test_base.h
index 6119473d81..91fc9b87cd 100644
--- a/tensorflow/compiler/xla/tests/hlo_test_base.h
+++ b/tensorflow/compiler/xla/tests/hlo_test_base.h
@@ -84,28 +84,6 @@ class HloTestBase : public ::testing::Test {
       tensorflow::gtl::ArraySlice<perftools::gputools::DeviceMemoryBase>
           arguments);
 
-  // Helpers for comparing ordered and unordered equality of HloInstruction
-  // containers.
-  void ExpectEqOrdered(
-      tensorflow::gtl::ArraySlice<const HloInstruction*> actual,
-      tensorflow::gtl::ArraySlice<const HloInstruction*> expected) {
-    std::vector<const HloInstruction*> expected_vec(expected.begin(),
-                                                    expected.end());
-    std::vector<const HloInstruction*> actual_vec(actual.begin(), actual.end());
-    EXPECT_TRUE(testing::VectorMatcher<const HloInstruction*>(expected_vec)(
-        actual_vec));
-  }
-
-  void ExpectEqUnordered(
-      tensorflow::gtl::ArraySlice<const HloInstruction*> actual,
-      tensorflow::gtl::ArraySlice<const HloInstruction*> expected) {
-    std::vector<const HloInstruction*> expected_vec(expected.begin(),
-                                                    expected.end());
-    std::vector<const HloInstruction*> actual_vec(actual.begin(), actual.end());
-    EXPECT_TRUE(testing::UnorderedElementsAre<const HloInstruction*>(
-        expected_vec)(actual_vec));
-  }
-
   string TestName() const;
 
   std::unique_ptr<Backend> backend_;
diff --git a/tensorflow/compiler/xla/tests/inprocess_service_test.cc b/tensorflow/compiler/xla/tests/inprocess_service_test.cc
index ea0be07872..97adf7ad6c 100644
--- a/tensorflow/compiler/xla/tests/inprocess_service_test.cc
+++ b/tensorflow/compiler/xla/tests/inprocess_service_test.cc
@@ -26,13 +26,13 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -74,7 +74,7 @@ XLA_TEST_F(InProcessServiceTest, TransferFromServer) {
 
   std::vector<int32> result(3, 0);
   ASSERT_IS_OK(client_->TransferInProcess(*handle, result.data()));
-  EXPECT_MATCH(result, testing::VectorMatcher<int32>({1, 42, 5}));
+  EXPECT_THAT(result, ::testing::ElementsAre(1, 42, 5));
 }
 
 XLA_TEST_F(InProcessServiceTest, TransferToServer) {
@@ -148,7 +148,7 @@ XLA_TEST_F(InProcessServiceTest, ExecuteRowMajor) {
   Shape shape;
   ASSERT_IS_OK(client_->TransferInProcess(*handle, result.data()));
 
-  EXPECT_MATCH(result, testing::VectorMatcher<float>({1.0, 2.0, 3.0, 4.0}));
+  EXPECT_THAT(result, ::testing::ElementsAre(1.0, 2.0, 3.0, 4.0));
 }
 
 XLA_TEST_F(InProcessServiceTest, ExecuteColumnMajor) {
@@ -159,7 +159,7 @@ XLA_TEST_F(InProcessServiceTest, ExecuteColumnMajor) {
   Shape shape;
   ASSERT_IS_OK(client_->TransferInProcess(*handle, result.data()));
 
-  EXPECT_MATCH(result, testing::VectorMatcher<float>({1.0, 3.0, 2.0, 4.0}));
+  EXPECT_THAT(result, ::testing::ElementsAre(1.0, 3.0, 2.0, 4.0));
 }
 
 XLA_TEST_F(InProcessServiceTest, ExecuteAndReuseDifferentLayouts) {
diff --git a/tensorflow/compiler/xla/tests/literal_test_util.cc b/tensorflow/compiler/xla/tests/literal_test_util.cc
index f7bbc0f38b..ef81db6fd6 100644
--- a/tensorflow/compiler/xla/tests/literal_test_util.cc
+++ b/tensorflow/compiler/xla/tests/literal_test_util.cc
@@ -24,7 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/lib/core/casts.h"
 #include "tensorflow/core/lib/io/path.h"
@@ -76,11 +76,11 @@ string Hostname() {
 // between the left-hand-side and right-hand-side, by bit-casting to UnsignedT
 // -- on miscompare, a nice error message is given in the AssertionFailure.
 template <typename FloatT, typename UnsignedT>
-testing::AssertionResult CompareFloatsBitwiseEqual(FloatT lhs, FloatT rhs) {
+::testing::AssertionResult CompareFloatsBitwiseEqual(FloatT lhs, FloatT rhs) {
   auto ulhs = tensorflow::bit_cast<UnsignedT>(lhs);
   auto urhs = tensorflow::bit_cast<UnsignedT>(rhs);
   if (ulhs != urhs) {
-    return testing::AssertionFailure() << tensorflow::strings::Printf(
+    return ::testing::AssertionFailure() << tensorflow::strings::Printf(
                "floating values are not bitwise-equal; and equality testing "
                "was requested: %s=%g=%a vs %s=%g=%a",
                tensorflow::strings::StrCat(tensorflow::strings::Hex(ulhs))
@@ -90,33 +90,33 @@ testing::AssertionResult CompareFloatsBitwiseEqual(FloatT lhs, FloatT rhs) {
                    .c_str(),
                rhs, rhs);
   }
-  return testing::AssertionSuccess();
+  return ::testing::AssertionSuccess();
 }
 
 // Templated comparator that specializes for float equality comparison with the
 // bitwise helper above (this is the un-specialized fallback, to just use the
 // default gunit implementation).
 template <typename NativeT>
-testing::AssertionResult CompareEqual(NativeT lhs, NativeT rhs) {
+::testing::AssertionResult CompareEqual(NativeT lhs, NativeT rhs) {
   if (lhs == rhs) {
-    return testing::AssertionSuccess();
+    return ::testing::AssertionSuccess();
   }
   ::testing::Message msg;
   msg << "Expected equality of these values:";
   msg << "\n  " << lhs;
   msg << "\n  " << rhs;
 
-  return testing::AssertionFailure() << msg;
+  return ::testing::AssertionFailure() << msg;
 }
 
 // Specializations for floating types that do bitwise comparisons when equality
 // comparison is requested.
 template <>
-testing::AssertionResult CompareEqual<float>(float lhs, float rhs) {
+::testing::AssertionResult CompareEqual<float>(float lhs, float rhs) {
   return CompareFloatsBitwiseEqual<float, uint32>(lhs, rhs);
 }
 template <>
-testing::AssertionResult CompareEqual<double>(double lhs, double rhs) {
+::testing::AssertionResult CompareEqual<double>(double lhs, double rhs) {
   return CompareFloatsBitwiseEqual<double, uint64>(lhs, rhs);
 }
 
@@ -130,7 +130,7 @@ bool ExpectLiteralsEqual(const Literal& expected, const Literal& actual,
   if (dimension == expected.shape().dimensions_size()) {
     NativeT expected_value = LiteralUtil::Get<NativeT>(expected, multi_index);
     NativeT actual_value = LiteralUtil::Get<NativeT>(actual, multi_index);
-    testing::AssertionResult result =
+    ::testing::AssertionResult result =
         CompareEqual<NativeT>(expected_value, actual_value);
     return result;  // Defines implicit coersion to bool.
   }
@@ -159,7 +159,7 @@ bool ExpectLiteralsEqual(const Literal& expected, const Literal& actual,
   EXPECT_FALSE(Equal(expected, actual));
 }
 
-/* static */ testing::AssertionResult LiteralTestUtil::Equal(
+/* static */ ::testing::AssertionResult LiteralTestUtil::Equal(
     const Literal& expected, const Literal& actual) {
   VLOG(1) << "expected: " << LiteralUtil::ToString(expected);
   VLOG(1) << "actual:   " << LiteralUtil::ToString(actual);
@@ -207,9 +207,9 @@ bool ExpectLiteralsEqual(const Literal& expected, const Literal& actual,
           << "Unsupported primitive type in LiteralTestUtil::ExpectEqual: "
           << PrimitiveType_Name(expected.shape().element_type());
   }
-  testing::AssertionResult result = testing::AssertionSuccess();
+  ::testing::AssertionResult result = ::testing::AssertionSuccess();
   if (!match) {
-    result = testing::AssertionFailure()
+    result = ::testing::AssertionFailure()
              << "expected: " << LiteralUtil::ToString(expected)
              << "\nactual:   " << LiteralUtil::ToString(actual);
     VLOG(1) << result.message();
@@ -421,12 +421,12 @@ class NearComparator {
 
 }  // namespace
 
-/* static */ testing::AssertionResult LiteralTestUtil::Near(
+/* static */ ::testing::AssertionResult LiteralTestUtil::Near(
     const Literal& expected, const Literal& actual, const ErrorSpec& error) {
   NearComparator comparator(error);
   return comparator.ExpectNear(expected, actual)
-             ? testing::AssertionSuccess()
-             : testing::AssertionFailure() << "values were not near";
+             ? ::testing::AssertionSuccess()
+             : ::testing::AssertionFailure() << "values were not near";
 }
 
 /* static */ void LiteralTestUtil::ExpectNear(const Literal& expected,
@@ -435,14 +435,14 @@ class NearComparator {
   EXPECT_TRUE(Near(expected, actual, error));
 }
 
-/* static */ testing::AssertionResult LiteralTestUtil::NearTuple(
+/* static */ ::testing::AssertionResult LiteralTestUtil::NearTuple(
     const Literal& expected, const Literal& actual, const ErrorSpec& error) {
   VLOG(1) << "expected: " << LiteralUtil::ToString(expected);
   VLOG(1) << "actual:   " << LiteralUtil::ToString(actual);
 
   if (!ShapeUtil::IsTuple(expected.shape()) ||
       !ShapeUtil::IsTuple(actual.shape())) {
-    return testing::AssertionFailure()
+    return ::testing::AssertionFailure()
            << "tuples expected expected shape = "
            << expected.shape().ShortDebugString()
            << " actual shape = " << actual.shape().ShortDebugString();
@@ -469,7 +469,7 @@ class NearComparator {
     }
   }
 
-  return testing::AssertionSuccess();
+  return ::testing::AssertionSuccess();
 }
 
 /* static */ void LiteralTestUtil::ExpectNearTuple(const Literal& expected,
diff --git a/tensorflow/compiler/xla/tests/literal_test_util.h b/tensorflow/compiler/xla/tests/literal_test_util.h
index 85656a53e4..aeadc023cc 100644
--- a/tensorflow/compiler/xla/tests/literal_test_util.h
+++ b/tensorflow/compiler/xla/tests/literal_test_util.h
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/array3d.h"
 #include "tensorflow/compiler/xla/array4d.h"
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
@@ -57,7 +58,7 @@ class LiteralTestUtil {
   // Asserts that the expected and actual literals are (bitwise) equal for all
   // elements in the literal. Also, asserts that the rank, dimensions sizes, and
   // primitive type are equal.
-  static testing::AssertionResult Equal(
+  static ::testing::AssertionResult Equal(
       const Literal& expected, const Literal& actual) TF_MUST_USE_RESULT;
 
   // Expects that expected and actual are Equal.
@@ -101,7 +102,7 @@ class LiteralTestUtil {
   // Asserts that the expected and actual literals are within the given error
   // bound for all elements. Also, asserts that the rank, dimensions sizes, and
   // bounds are equivalent. Only supported for floating point values.
-  static testing::AssertionResult Near(
+  static ::testing::AssertionResult Near(
       const Literal& expected, const Literal& actual,
       const ErrorSpec& error) TF_MUST_USE_RESULT;
 
@@ -147,7 +148,7 @@ class LiteralTestUtil {
   // tuples are within the given error bound. Tuples are matched recursively.
   // If the elements of the tuple are not floating-point types, the error spec
   // is ignored and exact equality is checked.
-  static testing::AssertionResult NearTuple(
+  static ::testing::AssertionResult NearTuple(
       const Literal& expected, const Literal& actual,
       const ErrorSpec& error) TF_MUST_USE_RESULT;
 
diff --git a/tensorflow/compiler/xla/tests/map_test.cc b/tensorflow/compiler/xla/tests/map_test.cc
index 2433c5653a..3cfa89e2e7 100644
--- a/tensorflow/compiler/xla/tests/map_test.cc
+++ b/tensorflow/compiler/xla/tests/map_test.cc
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
@@ -33,7 +34,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/xla.pb.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/platform/stream_executor_no_cuda.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -529,9 +529,9 @@ TEST_F(MapTest, MapOperantionWithBuildError) {
 
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_TRUE(!computation_status.ok());
-  EXPECT_MATCH(computation_status.status().ToString(),
-               testing::HasSubstr("error from: ErrorAdd: binary op with "
-                                  "different element types: f32[] and u16[]"));
+  EXPECT_THAT(computation_status.status().ToString(),
+              ::testing::HasSubstr("error from: ErrorAdd: binary op with "
+                                   "different element types: f32[] and u16[]"));
 }
 
 // MapTest disables inline and algsimp. MapTestWithFullOpt runs all
diff --git a/tensorflow/compiler/xla/tests/reshape_test.cc b/tensorflow/compiler/xla/tests/reshape_test.cc
index 18e6e2d3f1..839ae42a19 100644
--- a/tensorflow/compiler/xla/tests/reshape_test.cc
+++ b/tensorflow/compiler/xla/tests/reshape_test.cc
@@ -31,13 +31,12 @@ limitations under the License.
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/statusor.h"
-#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -383,15 +382,15 @@ XLA_TEST_F(ReshapeTest, ToScalar) {
 XLA_TEST_F(ReshapeTest, BadDimensions) {
   ComputationBuilder b(client_, TestName());
   b.Reshape(b.ConstantR1<int32>({1}), {}, {});
-  EXPECT_MATCH(ExecuteToString(&b, {}),
-               testing::HasSubstr("dimensions not a permutation"));
+  EXPECT_THAT(ExecuteToString(&b, {}),
+              ::testing::HasSubstr("dimensions not a permutation"));
 }
 
 XLA_TEST_F(ReshapeTest, BadNewSizes) {
   ComputationBuilder b(client_, TestName());
   b.Reshape(b.ConstantR1<int32>({1, 2}), {1}, {});
-  EXPECT_MATCH(ExecuteToString(&b, {}),
-               testing::HasSubstr("mismatched element counts"));
+  EXPECT_THAT(ExecuteToString(&b, {}),
+              ::testing::HasSubstr("mismatched element counts"));
 }
 
 XLA_TEST_F(ReshapeTest, R4Dim0MinorLayoutToR2Dim0MajorLayout) {
diff --git a/tensorflow/compiler/xla/text_literal_reader_test.cc b/tensorflow/compiler/xla/text_literal_reader_test.cc
index 94d0f2646b..a167d80f73 100644
--- a/tensorflow/compiler/xla/text_literal_reader_test.cc
+++ b/tensorflow/compiler/xla/text_literal_reader_test.cc
@@ -19,10 +19,10 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/text_literal_writer_test.cc b/tensorflow/compiler/xla/text_literal_writer_test.cc
index 9dce4d13bb..177ae4ea03 100644
--- a/tensorflow/compiler/xla/text_literal_writer_test.cc
+++ b/tensorflow/compiler/xla/text_literal_writer_test.cc
@@ -19,12 +19,12 @@ limitations under the License.
 #include <string>
 
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/tensorflow/compiler/xla/util_test.cc b/tensorflow/compiler/xla/util_test.cc
index bf01ac0fec..a81014f3b7 100644
--- a/tensorflow/compiler/xla/util_test.cc
+++ b/tensorflow/compiler/xla/util_test.cc
@@ -17,8 +17,8 @@ limitations under the License.
 
 #include <list>
 
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
-#include "tensorflow/core/platform/test.h"
 
 namespace xla {
 namespace {
-- 
GitLab


From 5b79de86364db353e3fe68d1612f1465bad9fca0 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Tue, 11 Apr 2017 08:59:19 -0800
Subject: [PATCH 0305/1563] Enable TensorArray GPU kernels for
 complex64/complex128. Change: 152824547

---
 tensorflow/core/kernels/tensor_array.cc       |   4 +
 tensorflow/core/kernels/tensor_array.h        |   4 +
 tensorflow/core/kernels/tensor_array_ops.cc   |  14 ++
 .../kernel_tests/tensor_array_ops_test.py     | 127 +++++++++---------
 4 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/tensorflow/core/kernels/tensor_array.cc b/tensorflow/core/kernels/tensor_array.cc
index ad3f7cb1e5..7b85ff2ea4 100644
--- a/tensorflow/core/kernels/tensor_array.cc
+++ b/tensorflow/core/kernels/tensor_array.cc
@@ -45,6 +45,8 @@ TF_CALL_NUMBER_TYPES(TENSOR_ARRAY_WRITE_OR_ADD_CPU)
 
 #define TENSOR_ARRAY_WRITE_OR_ADD_GPU(T) TENSOR_ARRAY_WRITE_OR_ADD(GPUDevice, T)
 TF_CALL_GPU_NUMBER_TYPES(TENSOR_ARRAY_WRITE_OR_ADD_GPU);
+TF_CALL_complex64(TENSOR_ARRAY_WRITE_OR_ADD_GPU);
+TF_CALL_complex128(TENSOR_ARRAY_WRITE_OR_ADD_GPU);
 #undef TENSOR_ARRAY_WRITE_OR_ADD_GPU
 
 #endif  // GOOGLE_CUDA
@@ -67,6 +69,8 @@ TF_CALL_NUMBER_TYPES(TENSOR_ARRAY_SET_ZERO_CPU)
 
 #define TENSOR_ARRAY_SET_ZERO_GPU(T) TENSOR_ARRAY_SET_ZERO(GPUDevice, T)
 TF_CALL_GPU_NUMBER_TYPES(TENSOR_ARRAY_SET_ZERO_GPU);
+TF_CALL_complex64(TENSOR_ARRAY_SET_ZERO_GPU);
+TF_CALL_complex128(TENSOR_ARRAY_SET_ZERO_GPU);
 #undef TENSOR_ARRAY_SET_ZERO_GPU
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/tensor_array.h b/tensorflow/core/kernels/tensor_array.h
index 4704130994..b43fafe921 100644
--- a/tensorflow/core/kernels/tensor_array.h
+++ b/tensorflow/core/kernels/tensor_array.h
@@ -61,6 +61,8 @@ TF_CALL_NUMBER_TYPES(TENSOR_ARRAY_WRITE_OR_ADD_CPU)
 
 #define TENSOR_ARRAY_WRITE_OR_ADD_GPU(T) TENSOR_ARRAY_WRITE_OR_ADD(GPUDevice, T)
 TF_CALL_GPU_NUMBER_TYPES(TENSOR_ARRAY_WRITE_OR_ADD_GPU);
+TF_CALL_complex64(TENSOR_ARRAY_WRITE_OR_ADD_GPU);
+TF_CALL_complex128(TENSOR_ARRAY_WRITE_OR_ADD_GPU);
 #undef TENSOR_ARRAY_WRITE_OR_ADD_GPU
 
 #endif  // GOOGLE_CUDA
@@ -86,6 +88,8 @@ TF_CALL_NUMBER_TYPES(TENSOR_ARRAY_SET_ZERO_CPU)
 
 #define TENSOR_ARRAY_SET_ZERO_GPU(T) TENSOR_ARRAY_SET_ZERO(GPUDevice, T)
 TF_CALL_GPU_NUMBER_TYPES(TENSOR_ARRAY_SET_ZERO_GPU);
+TF_CALL_complex64(TENSOR_ARRAY_SET_ZERO_GPU);
+TF_CALL_complex128(TENSOR_ARRAY_SET_ZERO_GPU);
 #undef TENSOR_ARRAY_SET_ZERO_GPU
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/tensor_array_ops.cc b/tensorflow/core/kernels/tensor_array_ops.cc
index 5fc9ce5f92..bd7556658a 100644
--- a/tensorflow/core/kernels/tensor_array_ops.cc
+++ b/tensorflow/core/kernels/tensor_array_ops.cc
@@ -236,6 +236,8 @@ REGISTER_KERNEL_BUILDER(Name("TensorArrayV3").Device(DEVICE_CPU),
                           TensorArrayOp);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 REGISTER_GPU(bfloat16);
 #undef REGISTER_GPU
 
@@ -432,6 +434,8 @@ TF_CALL_ALL_TYPES(REGISTER_WRITE);
                           TensorArrayWriteOp<GPUDevice, type>);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 REGISTER_GPU(bfloat16);
 #undef REGISTER_GPU
 
@@ -519,6 +523,8 @@ TF_CALL_ALL_TYPES(REGISTER_READ)
                           TensorArrayReadOp<GPUDevice, type>);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 REGISTER_GPU(bfloat16);
 #undef REGISTER_GPU
 
@@ -718,6 +724,8 @@ REGISTER_GATHER_AND_PACK(bfloat16);
       TensorArrayPackOrGatherOp<GPUDevice, type, false /* LEGACY_PACK */>);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 REGISTER_GPU(bfloat16);
 #undef REGISTER_GPU
 
@@ -938,6 +946,8 @@ REGISTER_CONCAT(bfloat16);
                           TensorArrayConcatOp<GPUDevice, type>)
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 REGISTER_GPU(bfloat16);
 #undef REGISTER_GPU
 
@@ -1155,6 +1165,8 @@ TF_CALL_ALL_TYPES(REGISTER_SCATTER_AND_UNPACK);
                                    false /* LEGACY_UNPACK */>);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 #undef REGISTER_GPU
 
 #endif  // GOOGLE_CUDA
@@ -1320,6 +1332,8 @@ TF_CALL_ALL_TYPES(REGISTER_SPLIT);
                           TensorArraySplitOp<GPUDevice, type>);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
+TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 #undef REGISTER_GPU
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/python/kernel_tests/tensor_array_ops_test.py b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
index 9aadf638f2..0fec42e1db 100644
--- a/tensorflow/python/kernel_tests/tensor_array_ops_test.py
+++ b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
@@ -36,10 +36,23 @@ import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import test
 
 
+def _make_converter(tf_dtype):
+  def _converter(x):
+    if tf_dtype == dtypes.string:
+      # In Python3, np.str is unicode, while we always want bytes
+      return np.asarray(x).astype("|S")
+    x = np.asarray(x).astype(tf_dtype.as_numpy_dtype)
+    if tf_dtype.is_complex:
+      # Add a non-zero imaginary component to x.
+      x -= 1j * x
+    return x
+  return _converter
+
+
 class TensorArrayTest(test.TestCase):
 
   def testTensorArrayWriteRead(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -60,16 +73,11 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(-3.0, d2)
 
   def _testTensorArrayWritePack(self, tf_dtype):
-    dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3)
 
-      if tf_dtype == dtypes.string:
-        # In Python3, np.str is unicode, while we always want bytes
-        convert = lambda x: np.asarray(x).astype("|S")
-      else:
-        convert = lambda x: np.asarray(x).astype(dtype)
+      convert = _make_converter(tf_dtype)
 
       w0 = ta.write(0, convert([[4.0, 5.0]]))
       w1 = w0.write(1, convert([[6.0, 7.0]]))
@@ -93,7 +101,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayWritePackMaybeLegacy()
 
   def testEmptyTensorArrayPack(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -107,16 +115,11 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([3, 0, 1], c0.eval().shape)
 
   def _testTensorArrayWriteConcat(self, tf_dtype):
-    dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3, infer_shape=False)
 
-      if tf_dtype == dtypes.string:
-        # In Python3, np.str is unicode, while we always want bytes
-        convert = lambda x: np.asarray(x).astype("|S")
-      else:
-        convert = lambda x: np.asarray(x).astype(dtype)
+      convert = _make_converter(tf_dtype)
 
       w0 = ta.write(0, convert([[4.0, 5.0], [104.0, 105.0], [204.0, 205.0]]))
       w1 = w0.write(1, convert([[6.0, 7.0], [106.0, 107.0]]))
@@ -138,7 +141,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayWriteConcat(dtypes.string)
 
   def _testTensorArrayPackNotAllValuesAvailableFails(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -150,16 +153,11 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayPackNotAllValuesAvailableFails()
 
   def _testTensorArrayUnpackRead(self, tf_dtype):
-    dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3)
 
-      if tf_dtype is dtypes.string:
-        # In Python3, np.str is unicode, while we always want bytes
-        convert = lambda x: np.asarray(x).astype("|S")
-      else:
-        convert = lambda x: np.asarray(x).astype(dtype)
+      convert = _make_converter(tf_dtype)
 
       # Unpack a vector into scalars
       w0 = ta.unstack(convert([1.0, 2.0, 3.0]))
@@ -215,16 +213,11 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayUnpackReadMaybeLegacy()
 
   def _testTensorArraySplitRead(self, tf_dtype):
-    dtype = tf_dtype.as_numpy_dtype()
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=tf_dtype, tensor_array_name="foo", size=3, infer_shape=False)
 
-      if tf_dtype == dtypes.string:
-        # In Python3, np.str is unicode, while we always want bytes
-        convert = lambda x: np.asarray(x).astype("|S")
-      else:
-        convert = lambda x: np.asarray(x).astype(dtype)
+      convert = _make_converter(tf_dtype)
 
       # Split an empty vector
       lengths = constant_op.constant([0, 0, 0])
@@ -273,7 +266,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArraySplitRead(dtypes.string)
 
   def testTensorGradArrayWriteRead(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -306,7 +299,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(-2.0, g_d2)
 
   def testTensorGradArrayDynamicWriteRead(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -347,7 +340,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(3, g_vs)
 
   def testTensorGradAccessTwiceReceiveSameObject(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
       g_ta_0 = ta.grad("grad")
@@ -363,7 +356,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([[4.0, 5.0]], d_r1_0)
 
   def testTensorArrayWriteWrongIndexOrDataTypeFails(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -385,7 +378,7 @@ class TensorArrayTest(test.TestCase):
         ta.write(3, 3.0).flow.eval()
 
   def testTensorArrayReadWrongIndexOrDataTypeFails(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -416,7 +409,7 @@ class TensorArrayTest(test.TestCase):
         ta.read(3).eval()
 
   def testTensorArrayWriteMultipleFails(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
 
@@ -426,7 +419,7 @@ class TensorArrayTest(test.TestCase):
         ta.write(2, 3.0).write(2, 3.0).flow.eval()
 
   def testTensorArrayConcatIncompatibleShapesFails(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -458,7 +451,7 @@ class TensorArrayTest(test.TestCase):
         w3.concat().eval()
 
   def testTensorArraySplitIncompatibleShapesFails(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -492,7 +485,7 @@ class TensorArrayTest(test.TestCase):
         ta.split([1.0], [1]).flow.eval()
 
   def _testTensorArrayWriteGradientAddMultipleAdds(self, dtype):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtype, tensor_array_name="foo", size=3, infer_shape=False)
       ta_grad = ta.grad("grad")
@@ -531,7 +524,7 @@ class TensorArrayTest(test.TestCase):
       self._testTensorArrayWriteGradientAddMultipleAdds(dtype)
 
   def testMultiTensorArray(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       h1 = tensor_array_ops.TensorArray(
           size=1, dtype=dtypes.float32, tensor_array_name="foo")
       w1 = h1.write(0, 4.0)
@@ -546,7 +539,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllClose(9.0, r.eval())
 
   def _testTensorArrayGradientWriteReadType(self, dtype):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.as_dtype(dtype),
           tensor_array_name="foo",
@@ -598,7 +591,7 @@ class TensorArrayTest(test.TestCase):
       self._testTensorArrayGradientWriteReadType(dtype)
 
   def _testTensorArrayGradientWritePackConcatAndRead(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -633,7 +626,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayGradientWritePackConcatAndRead()
 
   def testTensorArrayReadTwice(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       value = constant_op.constant([[1.0, -1.0], [10.0, -10.0]])
 
       ta_readonce = tensor_array_ops.TensorArray(
@@ -662,7 +655,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([1.0, -1.0], r1_readtwice.eval())
 
   def _testTensorArrayGradientUnpackRead(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -690,7 +683,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayGradientUnpackRead()
 
   def testTensorArrayGradientSplitConcat(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=2)
 
@@ -712,7 +705,7 @@ class TensorArrayTest(test.TestCase):
                           grad_vals[0])
 
   def _testTensorArrayGradientDynamicUnpackRead(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -737,21 +730,21 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayGradientDynamicUnpackRead()
 
   def testCloseTensorArray(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
       c1 = ta.close()
       session.run(c1)
 
   def testSizeTensorArray(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
       s = ta.size()
       self.assertAllEqual(3, s.eval())
 
   def testWriteCloseTensorArray(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -763,7 +756,7 @@ class TensorArrayTest(test.TestCase):
 
   def _testWhileLoopWritePackGradients(self, dynamic_size, dtype):
     np_dtype = dtype.as_numpy_dtype
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       v0 = array_ops.identity(np.arange(3 * 5, dtype=np_dtype).reshape(3, 5))
       var = variables.Variable(np.arange(100, 105, dtype=np_dtype))
       state0 = array_ops.identity(np.array([1] * 5, dtype=np_dtype))
@@ -845,7 +838,7 @@ class TensorArrayTest(test.TestCase):
         dynamic_size=True, dtype=dtypes.float32)
 
   def testGradSerialTwoLoops(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       num_steps = 100
       acc = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
@@ -878,7 +871,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllClose(31.0, grad.eval())
 
   def testSumOfTwoReadVariablesWithoutRepeatGrad(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       a = array_ops.identity(
           np.arange(
               3 * 5, dtype=np.float32).reshape(3, 5) + 1)
@@ -951,7 +944,7 @@ class TensorArrayTest(test.TestCase):
         self._grad_source_for_name("foo/gradients/bar/gradients_0/baz"))
 
   def testWriteShape(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=3)
       c0 = constant_op.constant([4.0, 5.0])
@@ -975,7 +968,7 @@ class TensorArrayTest(test.TestCase):
         w0.write(0, c2)
 
   def testPartlyUnknownShape(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, tensor_array_name="foo", size=6)
 
@@ -1015,7 +1008,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([5, 4, 2, 3], r5.get_shape().as_list())
 
   def _testUnpackShape(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -1041,7 +1034,7 @@ class TensorArrayTest(test.TestCase):
     self._testUnpackShape()
 
   def testSplitShape(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -1064,7 +1057,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(r0.get_shape(), tensor_shape.unknown_shape())
 
   def testWriteUnknownShape(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -1076,7 +1069,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(r0.get_shape(), tensor_shape.unknown_shape())
 
   def _testGradientWhenNotAllComponentsRead(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
       x = constant_op.constant([2.0, 3.0])
       w = ta.unstack(x)
@@ -1090,7 +1083,7 @@ class TensorArrayTest(test.TestCase):
     self._testGradientWhenNotAllComponentsRead()
 
   def _testTensorArrayUnpackDynamic(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=3, dynamic_size=True)
       x = constant_op.constant([1.0, 2.0, 3.0])
@@ -1105,7 +1098,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayUnpackDynamic()
 
   def testTensorArraySplitDynamic(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=3, dynamic_size=True)
       x = constant_op.constant([1.0, 2.0, 3.0])
@@ -1117,7 +1110,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(np.array([1.0, 1.0, 1.0]), sess.run(grad)[0])
 
   def _testTensorArrayEvalEmpty(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=0, dynamic_size=False, infer_shape=False)
       with self.assertRaisesOpError(
@@ -1130,7 +1123,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayEvalEmpty()
 
   def _testTensorArrayEvalEmptyWithDefault(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32, size=0, dynamic_size=False, infer_shape=True)
       self.assertEqual(0, ta.size().eval())
@@ -1146,7 +1139,7 @@ class TensorArrayTest(test.TestCase):
     self._testTensorArrayEvalEmptyWithDefault()
 
   def testTensorArrayScatterReadAndGradients(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -1172,7 +1165,7 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual([[2.0, 3.0], [4.0, 5.0]], grad_vals[0])
 
   def testTensorArrayWriteGatherAndGradients(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(
           dtype=dtypes.float32,
           tensor_array_name="foo",
@@ -1263,7 +1256,7 @@ class TensorArrayTest(test.TestCase):
     self.assertTrue("gpu:0" in ta.handle.device.lower())
 
   def testTensorArrayLazyDeviceSettingDoesNotConfuseInitialAccess(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
       self.assertEqual(ta.handle.device, "")
 
@@ -1279,7 +1272,7 @@ class TensorArrayTest(test.TestCase):
       self.assertEqual(2, size_value)
 
   def testTensorArrayIdentity(self):
-    with self.test_session() as session:
+    with self.test_session(use_gpu=True) as session:
       ta0 = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2,
                                          infer_shape=False)
       ta1 = tensor_array_ops.TensorArray(dtype=dtypes.int32, size=4,
-- 
GitLab


From af08eacee9c6878392013d21a85f99b73caff64e Mon Sep 17 00:00:00 2001
From: Greg Peatfield <Mazecreator@users.noreply.github.com>
Date: Tue, 11 Apr 2017 13:24:11 -0400
Subject: [PATCH 0306/1563] Add SingleImageRandomDotStereogramsOp to Contrib
 (#8370)

* Add single_image_randome_dot_stereograms to CONTRIB

* remove Debug commands

* Clean up code formatting

* Manually reformat Python Code 4 spaces after Oparen

* formatting fixes

* more formatting

* Fixed spelling error and other improvements based upon review

* Fixed typo in description

* Eliminate generation_mode parameter

* Add back number_colors in PY file that was removed in error

* Indentation

* Enable IMAGE TEST
---
 tensorflow/contrib/BUILD                      |   1 +
 tensorflow/contrib/image/BUILD                |  28 ++
 tensorflow/contrib/image/__init__.py          |   2 +
 ...single_image_random_dot_stereograms_ops.cc | 424 ++++++++++++++++++
 ...single_image_random_dot_stereograms_ops.cc |  93 ++++
 .../single_image_random_dot_stereograms.py    | 125 ++++++
 6 files changed, 673 insertions(+)
 mode change 100644 => 100755 tensorflow/contrib/BUILD
 mode change 100644 => 100755 tensorflow/contrib/image/BUILD
 mode change 100644 => 100755 tensorflow/contrib/image/__init__.py
 create mode 100755 tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc
 create mode 100755 tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc
 create mode 100755 tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py

diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
old mode 100644
new mode 100755
index a726471d0f..01d72830bc
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -28,6 +28,7 @@ py_library(
         "//tensorflow/contrib/grid_rnn:grid_rnn_py",
         "//tensorflow/contrib/hooks",
         "//tensorflow/contrib/image:image_py",
+        "//tensorflow/contrib/image:single_image_random_dot_stereograms_py",
         "//tensorflow/contrib/imperative",
         "//tensorflow/contrib/input_pipeline:input_pipeline_py",
         "//tensorflow/contrib/integrate:integrate_py",
diff --git a/tensorflow/contrib/image/BUILD b/tensorflow/contrib/image/BUILD
old mode 100644
new mode 100755
index c31ac7b324..7599406aca
--- a/tensorflow/contrib/image/BUILD
+++ b/tensorflow/contrib/image/BUILD
@@ -87,6 +87,7 @@ cuda_py_test(
     srcs = ["python/kernel_tests/image_ops_test.py"],
     additional_deps = [
         ":image_py",
+        ":single_image_random_dot_stereograms_py",
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -96,6 +97,33 @@ cuda_py_test(
     ],
 )
 
+tf_custom_op_library(
+    name = "python/ops/_single_image_random_dot_stereograms.so",
+    srcs = [
+        "kernels/single_image_random_dot_stereograms_ops.cc",
+        "ops/single_image_random_dot_stereograms_ops.cc",
+    ],
+)
+
+tf_gen_op_libs(
+    op_lib_names = ["single_image_random_dot_stereograms_ops"],
+)
+
+tf_gen_op_wrapper_py(
+    name = "single_image_random_dot_stereograms_ops",
+    deps = [":single_image_random_dot_stereograms_ops_op_lib"],
+)
+
+py_library(
+    name = "single_image_random_dot_stereograms_py",
+    srcs = glob(["python/ops/single*.py"]) + ["__init__.py"],
+    data = [":python/ops/_single_image_random_dot_stereograms.so"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":single_image_random_dot_stereograms_ops",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/contrib/image/__init__.py b/tensorflow/contrib/image/__init__.py
old mode 100644
new mode 100755
index 4ad599b1f8..aa70d42339
--- a/tensorflow/contrib/image/__init__.py
+++ b/tensorflow/contrib/image/__init__.py
@@ -25,6 +25,7 @@ projective transforms (including rotation) are supported.
 @@compose_transforms
 @@rotate
 @@transform
+@@single_image_random_dot_stereograms
 """
 from __future__ import absolute_import
 from __future__ import division
@@ -35,6 +36,7 @@ from tensorflow.contrib.image.python.ops.image_ops import angles_to_projective_t
 from tensorflow.contrib.image.python.ops.image_ops import compose_transforms
 from tensorflow.contrib.image.python.ops.image_ops import rotate
 from tensorflow.contrib.image.python.ops.image_ops import transform
+from tensorflow.contrib.image.python.ops.single_image_random_dot_stereograms import single_image_random_dot_stereograms
 
 from tensorflow.python.util.all_util import remove_undocumented
 
diff --git a/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc b/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc
new file mode 100755
index 0000000000..f4db64e999
--- /dev/null
+++ b/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc
@@ -0,0 +1,424 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+using shape_inference::InferenceContext;
+
+template <typename T>
+class SingleImageRandomDotStereogramsOp : public OpKernel {
+ private:
+  int E2Epixels;  // Pixels from eye to eye = eye_to_eye_inches * DPI
+
+  int input_Xvalue;  // X value of input Z values (width)
+  int input_Yvalue;  // Y value of input Z values (height)
+
+  int output_Ximage;  // X value of output image (width)
+  int output_Yimage;  // Y value of output image (height)
+  int output_Cimage;  // color value of output image (color, 1 or 3)  (3 not
+                      // implemented)
+
+  int data_box_left;    // X starting value for DATA window
+  int data_box_top;     // Y starting value for DATA window
+  int data_box_width;   // width of scan line
+  int data_box_height;  // hight of image
+
+  int converge_dot_box_end;  // Row convergences dots end on
+
+  uint8* outputImage;  // Output Image flat as a buffer (Tensor Connection)
+  double* ZBuffer;     // For internal use, allow for MASK, etc later, actual Z
+                       // used for Stereogram, XxY (X is the row index, y is col
+                       // index like a screen)
+                       // 0 (far) -> 1.0(near) range
+  bool hidden_surface_removal;
+  int convergence_dots_size;
+  int dots_per_inch;
+  float eye_separation;
+  float mu;
+  bool normalize;
+  float normalize_max;
+  float normalize_min;
+  float border_level;
+  int number_colors;
+  ::tensorflow::TensorShapeProto output_image_shape;
+  ::tensorflow::TensorShapeProto output_data_window;
+
+  uint8 Cblack = (uint8)0;
+  uint8 Cwhite = (uint8)255;
+
+  int indexMode = 0;  // 0 - truncate XY, 1 - round XY, 2 - Interpolate XY (not
+                      // implemented yet, keep default of 0)
+  int interp_x, interp_y;  // 1 - yes, 0 - no  interpolation directions (not
+                           // implemented yet)
+
+  bool debugging = false;
+
+  inline int separation(double z) {
+    return (std::round((1 - mu * z) * E2Epixels / (2 - mu * z)));
+  }
+
+  inline int get_far_width() { return (separation(0.0)); }
+  inline int get_near_width() { return (separation(1.0)); }
+
+ public:
+  explicit SingleImageRandomDotStereogramsOp(OpKernelConstruction* context)
+      : OpKernel(context) {  // Constructor
+    OP_REQUIRES_OK(context, context->GetAttr("hidden_surface_removal",
+                                             &hidden_surface_removal));
+    OP_REQUIRES_OK(context, context->GetAttr("convergence_dots_size",
+                                             &convergence_dots_size));
+    OP_REQUIRES_OK(context, context->GetAttr("dots_per_inch", &dots_per_inch));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("eye_separation", &eye_separation));
+    OP_REQUIRES_OK(context, context->GetAttr("mu", &mu));
+    OP_REQUIRES_OK(context, context->GetAttr("normalize", &normalize));
+    OP_REQUIRES_OK(context, context->GetAttr("normalize_max", &normalize_max));
+    OP_REQUIRES_OK(context, context->GetAttr("normalize_min", &normalize_min));
+    OP_REQUIRES_OK(context, context->GetAttr("border_level", &border_level));
+    OP_REQUIRES_OK(context, context->GetAttr("number_colors", &number_colors));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("output_image_shape", &output_image_shape));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("output_data_window", &output_data_window));
+
+    E2Epixels =
+        eye_separation * dots_per_inch;  // Initialize pixels from eye to eye
+  }
+
+  ~SingleImageRandomDotStereogramsOp() {  // Destructor
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input_tensor = context->input(0);
+    input_Xvalue = input_tensor.shape().dim_size(
+        1);  // X value is the number of columns of the input matrix
+    input_Yvalue =
+        input_tensor.shape().dim_size(0);  // Y value is the number of rows
+
+    output_Ximage = output_image_shape.dim(0).size();
+    output_Yimage = output_image_shape.dim(1).size();
+    output_Cimage = output_image_shape.dim(2).size();
+
+    if (number_colors > 256)  // Go to full color image
+      output_Cimage = 3;
+
+    int data_Xwindow = output_data_window.dim(0).size();
+    int data_Ywindow = output_data_window.dim(1).size();
+
+    int deltaX_border_image = output_Ximage - data_Xwindow;
+    int deltaY_border_image = output_Yimage - data_Ywindow;
+
+    if (convergence_dots_size >
+        0)  // 3 frame sections in Y direction due to DOTS
+    {
+      deltaY_border_image =
+          deltaY_border_image -
+          convergence_dots_size;  // Take off space for Convergence Dots
+      deltaY_border_image = std::max(0, deltaY_border_image);
+      data_box_top = deltaY_border_image / 3;
+
+      if (deltaY_border_image >= 0) {
+        converge_dot_box_end = output_Yimage - 1 - data_box_top;
+      } else {
+        converge_dot_box_end = output_Yimage - 1;
+      }
+    } else  // Otherwise only 2, no convergence dot
+    {
+      data_box_top = deltaY_border_image / 2;  // Center DATA in Y dimension
+      converge_dot_box_end = output_Yimage - 1;
+    }
+
+    data_box_left = deltaX_border_image / 2;  // Center DATA in X dimension
+    data_box_width = data_Xwindow;             // width of scan line
+    data_box_height = data_Ywindow;            // hight of image
+
+    const T* inputZ = input_tensor.flat<T>().data();  // Flatten input Z buffer
+
+    BuildZBuffer(inputZ);
+
+    // Output a scalar string.
+    Tensor* output_tensor = NULL;
+    OP_REQUIRES_OK(
+        context,
+        context->allocate_output(
+            0, TensorShape({output_Yimage, output_Ximage, output_Cimage}),
+            &output_tensor));
+
+    outputImage = output_tensor->flat<uint8>().data();
+
+    generate_stereogram();
+
+    delete[] ZBuffer;
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+  // Move input into standard Z format to reduce complexity of algorithm
+  //
+  void BuildZBuffer(const T* Z, bool log = false) {
+    double MaxValue = 1.0;
+    double MinValue = 0.0;
+    ZBuffer = new double[input_Xvalue * input_Yvalue];  // Used to computer
+                                                        // final Z values before
+                                                        // rendering to output
+
+    if (normalize) {
+      // Init Min/Max to first value
+      if (normalize_max < normalize_min)  // Autoscale if MIN>MAX
+      {
+        MaxValue = (double)*Z;
+        MinValue = (double)*Z;
+
+        for (int y = 0; y < input_Yvalue; ++y)
+          for (int x = 0; x < input_Xvalue; ++x) {
+            double value = getZfromInputImage(Z, x, y);
+            if (value > MaxValue) MaxValue = value;
+            if (value < MinValue) MinValue = value;
+          }
+      } else {
+        MaxValue = normalize_max;
+        MinValue = normalize_min;
+      }
+    }
+
+    for (int y = 0; y < input_Yvalue; ++y)
+      for (int x = 0; x < input_Xvalue; ++x) {
+        double value = getZfromInputImage(Z, x, y);
+
+        if (normalize) {
+          value = (value - MinValue) / (MaxValue - MinValue);
+        }
+
+        if (value > 1.0) value = 1.0;
+        if (value < 0.0) value = 0.0;
+
+        *(ZBuffer + (input_Xvalue * y + x)) = value;
+      }
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+  double getZfromInputImage(const T* Z, int x, int y) {
+    double return_val;
+
+    return_val = (double)*(Z + input_Xvalue * y + x);  // Get value
+    return return_val;
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+  // All normalized, not checking required
+  // Possible Projection issue if DATA is bigger or smaller than Input
+  //  Modes include:
+  //         Truncate value (Default)
+  //         Round-off value
+  //         Interpolate between values
+  //
+  double getZfromZbuffer(double x, double y) {
+    int xi, yi;
+
+    switch (indexMode) {
+      case 0:  // Truncate
+        xi = int(x);
+        yi = int(y);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+      case 1:  // Round-off
+        xi = std::round(x);
+        yi = std::round(y);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+      case 2:  // Interpolate (Not implemented yet, will need 4 points
+               // [x,y],[x+1,y],[x,y+1],[x+1,y+1], then interpolate)
+        xi = int(x);
+        yi = int(y);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+      default:  // Round-off is the default
+        xi = int(x + 0.5);
+        yi = int(y + 0.5);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+    }
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  int getOutputImageIndex(int x, int y,
+                          int channel) {  // No error checking for some
+                                          // optimization, calling routine
+                                          // required to make sure there is no
+                                          // violation
+    return ((output_Ximage * output_Cimage) * y + x * output_Cimage + channel);
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  double getZFromOutputPixel(int x, int y) {
+    double xofz, yofz, returnval;
+
+    // Convert pixel units to Z units, do this as "double"
+
+    xofz =
+        (double)input_Xvalue * (x - data_box_left) / ((double)data_box_width);
+    yofz =
+        (double)input_Yvalue * (y - data_box_top) / ((double)data_box_height);
+
+    if ((xofz < 0) || (yofz < 0) || (yofz >= input_Yvalue) ||
+        (xofz >= input_Xvalue)) {  // Top of left side border hit or  Right
+                                   // side or bottom border hit
+                                   // Send BORDER Z value
+      return (border_level);
+    }
+
+    {  // in data set Z interpolate if need
+      double gz;
+
+      gz = getZfromZbuffer(xofz, yofz);
+
+      returnval = gz;
+    }
+
+    return (returnval);
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  void generate_stereogram() {
+    int s, left, right, visible, t, l;
+    double zt, gz;
+    // Scan line
+    uint8* pix;  // Scan row color for each pixel
+    int* same;   // Used to determine if Pixel needs to be the same as another
+                 // pixel in the row
+
+    pix = new uint8[output_Ximage * output_Cimage];
+    same = new int[output_Ximage];
+
+    for (int y = 0; y < output_Yimage; ++y) {
+      // Set no dependencies on any pixels, tie each one back to itself
+      for (int x = 0; x < output_Ximage; ++x) same[x] = x;
+
+      for (int x = 0; x < output_Ximage; ++x) {
+        gz = getZFromOutputPixel(x, y);
+        s = separation(gz);
+        left = x - s / 2;
+        right = left + s;
+
+        if ((left >= 0) && (right < output_Ximage)) {
+          t = 1;
+          visible = 1;
+          if (hidden_surface_removal) do {
+              zt = gz + 2 * (2 - mu * gz) * t / (mu * E2Epixels);
+              visible = (getZFromOutputPixel(x - t, y) < zt) &&
+                        (getZFromOutputPixel(x + t, y) < zt);
+              ++t;
+            } while ((visible) && (zt < 1));
+
+          if (visible) {
+            l = same[left];
+            while ((l != left) && (l != right))
+              if (l < right) {
+                left = l;
+                l = same[left];
+              } else {
+                same[left] = right;
+                left = right;
+                l = same[left];
+                right = l;
+              }
+            same[left] = right;
+          }
+        }
+      }
+      // Set colors for scan row, use channels and number_colors
+      for (int x = output_Ximage - 1; x >= 0; x--) {
+        for (int channel = 0; channel < output_Cimage; ++channel) {
+          if (same[x] == x) {  // Pick a random color
+            if (number_colors == 2) {
+              if ((rand() % 2) == 0) {
+                pix[x * output_Cimage + channel] = Cblack;
+              } else {
+                pix[x * output_Cimage + channel] = Cwhite;
+              }
+            } else {
+              pix[x * output_Cimage + channel] = rand() % 256;
+            }
+          } else
+            pix[x * output_Cimage + channel] =
+                pix[same[x] * output_Cimage + channel];
+
+          setpixel(x, y, channel, pix[x * output_Cimage + channel]);
+        }
+      }
+    }
+
+    draw_convergence_dots();
+
+    delete[] pix;
+    delete[] same;
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  void draw_convergence_dots() {
+    int x1, x2;  // center position for convergence dots
+
+    if (convergence_dots_size == 0)  // No dot, return
+      return;
+
+    x1 = output_Ximage / 2 - get_far_width() / 2;
+    x2 = output_Ximage / 2 + get_far_width() / 2;
+
+    for (int lloop = 0; lloop < convergence_dots_size; ++lloop)
+      for (int wloop = 0; wloop < convergence_dots_size; ++wloop)
+        for (int channel = 0; channel < output_Cimage; ++channel) {
+          setpixel(x1 - (convergence_dots_size / 2) + wloop,
+                   converge_dot_box_end - lloop, channel, Cblack);
+          setpixel(x2 - (convergence_dots_size / 2) + wloop,
+                   converge_dot_box_end - lloop, channel, Cblack);
+        }
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  void setpixel(int x, int y, int channel, uint8 color) {
+    *(outputImage + getOutputImageIndex(x, y, channel)) = color;
+  }
+};
+
+#define REGISTER_KERNEL(T)                                        \
+  REGISTER_KERNEL_BUILDER(Name("SingleImageRandomDotStereograms") \
+                              .Device(DEVICE_CPU)                 \
+                              .TypeConstraint<T>("T"),            \
+                          SingleImageRandomDotStereogramsOp<T>);
+
+REGISTER_KERNEL(int32);
+REGISTER_KERNEL(int64);
+REGISTER_KERNEL(float);
+REGISTER_KERNEL(double);
+
+#undef REGISTER_KERNEL
+
+}  // end namespace tensorflow
diff --git a/tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc b/tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc
new file mode 100755
index 0000000000..0435f0823c
--- /dev/null
+++ b/tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc
@@ -0,0 +1,93 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+using shape_inference::InferenceContext;
+
+REGISTER_OP("SingleImageRandomDotStereograms")
+    .Attr("T: {double,float,int64,int32}")
+    .Input("depth_values: T")
+    .Output("image: uint8")
+    .Attr("hidden_surface_removal: bool = true")
+    .Attr("convergence_dots_size: int = 8")
+    .Attr("dots_per_inch: int = 72")
+    .Attr("eye_separation: float = 2.5")
+    .Attr("mu: float = .3333")
+    .Attr("normalize: bool = true")
+    .Attr("normalize_max: float = -100.0")
+    .Attr("normalize_min: float = 100.0")
+    .Attr("border_level: float = 0.0")
+    .Attr("number_colors: int = 256")
+    .Attr(
+        "output_image_shape: shape = { dim {size:1024} dim {size: 768} dim "
+        "{size: 1}}")
+    .Attr("output_data_window: shape = { dim {size:1022} dim {size: 757}}")
+    .Doc(R"doc(
+Outputs a single image random dot stereogram for export via encode_PNG/JPG OP.
+
+Given the 2-D tensor 'depth_values' with encoded Z values, this operation will 
+encode 3-D data into a 2-D image.  The output of this Op is suitable for the
+encode_PNG/JPG ops.  Be careful with image compression as this may corrupt the
+encode 3-D data witin the image.
+
+This Op is based upon:
+'http://www.learningace.com/doc/4331582/b6ab058d1e206d68ab60e4e1ead2fe6e/sirds-paper'
+
+Example use which outputs a SIRDS image as picture_out.png:
+```python
+img=[[1,2,3,3,2,1],
+     [1,2,3,4,5,2],
+     [1,2,3,4,5,3],
+     [1,2,3,4,5,4],
+     [6,5,4,4,5,5]]
+
+session = tf.InteractiveSession()
+
+sirds = single_image_random_dot_stereograms(img,convergence_dots_size=8,number_colors=256,normalize=True)
+
+out = sirds.eval()
+
+png = tf.image.encode_png(out).eval()
+
+with open('picture_out.png', 'wb') as f:
+    f.write(png)
+```
+
+depth_values: Z values of data to encode into 'output_data_window' window, 
+  lower values are further away {0.0 floor(far), 1.0 ceiling(near) after normalization}, must be 2-D tensor
+hidden_surface_removal: Activate hidden surface removal
+convergence_dots_size: Black dot size in pixels to help view converge image, drawn on bottom of image
+dots_per_inch: Output device in dots/inch
+eye_separation: Separation between eyes in inches
+mu: Depth of field, Fraction of viewing distance (eg. 1/3 = .3333)
+normalize: Normalize input data to [0.0, 1.0] 
+normalize_max: Fix MAX value for Normalization - if < MIN, autoscale
+normalize_min: Fix MIN value for Normalization - if > MAX, autoscale
+border_level: Value of border depth 0.0 {far} to 1.0 {near}
+number_colors: 2 (Black & White),256 (grayscale), and Numbers > 256 (Full Color) are all that are supported currently
+output_image_shape: Output size of returned image in X,Y, Channels 1-grayscale, 3 color (1024, 768, 1),
+  channels will be updated to 3 if 'number_colors' > 256
+output_data_window: Size of "DATA" window, must be equal to or smaller than 'output_image_shape', will be centered
+  and use 'convergence_dots_size' for best fit to avoid overlap if possible
+
+image:= A tensor of size 'output_image_shape' with the encloded 'depth_values'
+)doc");
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py b/tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py
new file mode 100755
index 0000000000..79261c5e75
--- /dev/null
+++ b/tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py
@@ -0,0 +1,125 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Python layer for image_ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.util import loader
+from tensorflow.python.framework import ops
+from tensorflow.python.platform import resource_loader
+
+_sirds_ops = loader.load_op_library(
+    resource_loader.get_path_to_datafile(
+        "_single_image_random_dot_stereograms.so"))
+
+def single_image_random_dot_stereograms(
+    depth_values,
+    hidden_surface_removal=None,
+    convergence_dots_size=None,
+    dots_per_inch=None,
+    eye_separation=None, mu=None,
+    normalize=None, normalize_max=None,
+    normalize_min=None,
+    border_level=None,
+    number_colors=None,
+    output_image_shape=None,
+    output_data_window=None):
+  """Output a RandomDotStereogram Tensor for export via encode_PNG/JPG OP.
+
+  Given the 2-D tensor 'depth_values' with encoded Z values, this operation
+  will encode 3-D data into a 2-D image.  The output of this Op is suitable
+  for the encode_PNG/JPG ops.  Be careful with image compression as this may
+  corrupt the encode 3-D data witin the image.
+
+  Based upon [this paper](http://www.learningace.com/doc/4331582/b6ab058d1e206d68ab60e4e1ead2fe6e/sirds-paper).
+
+  This outputs a SIRDS image as picture_out.png:
+
+  ```python
+  img=[[1,2,3,3,2,1],
+       [1,2,3,4,5,2],
+       [1,2,3,4,5,3],
+       [1,2,3,4,5,4],
+       [6,5,4,4,5,5]]
+  session = tf.InteractiveSession()
+  sirds = single_image_random_dot_stereograms(
+      img,
+      convergence_dots_size=8,
+      number_colors=256,normalize=True)
+
+  out = sirds.eval()
+  png = tf.image.encode_png(out).eval()
+  with open('picture_out.png', 'wb') as f:
+    f.write(png)
+  ```
+
+  Args:
+    depth_values: A `Tensor`. Must be one of the following types: 
+      `float64`, `float32`, `int64`, `int32`.  Z values of data to encode
+      into 'output_data_window' window, lower further away {0.0 floor(far),
+      1.0 ceiling(near) after norm}, must be 2-D tensor
+    hidden_surface_removal: An optional `bool`. Defaults to `True`.
+      Activate hidden surface removal
+    convergence_dots_size: An optional `int`. Defaults to `8`.
+      Black dot size in pixels to help view converge image, drawn on bottom
+      of the image
+    dots_per_inch: An optional `int`. Defaults to `72`.
+      Output device in dots/inch
+    eye_separation: An optional `float`. Defaults to `2.5`.
+      Separation between eyes in inches
+    mu: An optional `float`. Defaults to `0.3333`.
+      Depth of field, Fraction of viewing distance (eg. 1/3 = 0.3333)
+    normalize: An optional `bool`. Defaults to `True`.
+      Normalize input data to [0.0, 1.0] 
+    normalize_max: An optional `float`. Defaults to `-100`.
+      Fix MAX value for Normalization (0.0) - if < MIN, autoscale
+    normalize_min: An optional `float`. Defaults to `100`.
+      Fix MIN value for Normalization (0.0) - if > MAX, autoscale
+    border_level: An optional `float`. Defaults to `0`.
+      Value of bord in depth 0.0 {far} to 1.0 {near} 
+    number_colors: An optional `int`. Defaults to `256`. 2 (Black &
+      White), 256 (grayscale), and Numbers > 256 (Full Color) are
+      supported
+    output_image_shape: An optional `tf.TensorShape` or list of `ints`. 
+      Defaults to shape `[1024, 768, 1]`. Defines output shape of returned
+      image in '[X,Y, Channels]' 1-grayscale, 3 color; channels will be
+      updated to 3 if number_colors > 256
+    output_data_window: An optional `tf.TensorShape` or list of `ints`.
+      Defaults to `[1022, 757]`. Size of "DATA" window, must be equal to or
+      smaller than `output_image_shape`, will be centered and use
+      `convergence_dots_size` for best fit to avoid overlap if possible
+
+  Returns:
+    A `Tensor` of type `uint8` of shape 'output_image_shape' with encoded
+    'depth_values'
+  """
+
+  result = _sirds_ops.single_image_random_dot_stereograms(
+      depth_values=depth_values,
+      hidden_surface_removal=hidden_surface_removal,
+      convergence_dots_size=convergence_dots_size,
+      dots_per_inch=dots_per_inch,
+      eye_separation=eye_separation, mu=mu,
+      normalize=normalize,
+      normalize_max=normalize_max,
+      normalize_min=normalize_min,
+      border_level=border_level,
+      number_colors=number_colors,
+      output_image_shape=output_image_shape,
+      output_data_window=output_data_window)
+  return result
+
+ops.NotDifferentiable("SingleImageRandomDotStereograms")
-- 
GitLab


From d3aa99075fdd9b5ce0d65537e12af4e3a448d18a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 09:41:14 -0800
Subject: [PATCH 0307/1563] Fixes tf.cond with nested return values inside
 while loops. Change: 152830112

---
 tensorflow/python/ops/control_flow_ops.py      |  3 +--
 tensorflow/python/ops/control_flow_ops_test.py | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index dea2180069..93416140ff 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -1416,8 +1416,7 @@ class ControlFlowContext(object):
   def ExitResult(self, result):
     """Make a list of tensors available in the outer context."""
     if self._outer_context:
-      for x in result:
-        self._outer_context.AddName(x.name)
+      nest.map_structure(lambda x: self._outer_context.AddName(x.name), result)
 
   def GetWhileContext(self):
     """Return the while context containing this context."""
diff --git a/tensorflow/python/ops/control_flow_ops_test.py b/tensorflow/python/ops/control_flow_ops_test.py
index a88143224f..21a5afabe0 100644
--- a/tensorflow/python/ops/control_flow_ops_test.py
+++ b/tensorflow/python/ops/control_flow_ops_test.py
@@ -678,6 +678,22 @@ class DataTypesTest(TensorFlowTestCase):
                            [1, TestTuple(2, [3, 4]), np.zeros([5, 5]), 6],
                            [11, TestTuple(12, [13, 14]), np.ones([5, 5]), 16])
 
+  def test_cond_inside_while_loop(self):
+    def Body(i, matrix):
+      result_tuple, unused_matrix = control_flow_ops.cond(
+          constant_op.constant(True),
+          lambda: (TestTuple(matrix * 2, matrix * 4), matrix),
+          lambda: (TestTuple(matrix * 4, matrix * 2), matrix))
+      return [i+1, result_tuple.a]
+
+    iteration, matrix = control_flow_ops.while_loop(
+        lambda i, matrix: i < 10,
+        Body,
+        loop_vars=[constant_op.constant(0), array_ops.ones([2, 2])])
+
+    self.assertEqual(iteration.get_shape(), tensor_shape.TensorShape([]))
+    self.assertEqual(matrix.get_shape(), tensor_shape.TensorShape([2, 2]))
+
 
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From a2818749579f315740ea150c34fad25f87b69e13 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 09:43:29 -0800
Subject: [PATCH 0308/1563] [XLA] Fix cloning of tuples in
 HloInstruction::CloneWithNewOperands.

Tuple instructions would previously not be cloned with new operands.
Change: 152830440
---
 .../compiler/xla/service/hlo_instruction.cc   | 108 +++++++++---------
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 905647c2ed..d5aa80052e 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -702,7 +702,8 @@ void HloInstruction::CheckFusionInstruction() const {
 }
 
 std::unique_ptr<HloInstruction> HloInstruction::CloneWithNewOperands(
-    const Shape& shape, tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
+    const Shape& shape,
+    tensorflow::gtl::ArraySlice<HloInstruction*> new_operands) {
   // Explicitly call the factory for the instruction type. This is more robust
   // in the face of code changes than copying fields explicitly. This also
   // properly sets the user fields of the operands.
@@ -721,8 +722,8 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneWithNewOperands(
     case HloOpcode::kSign:
     case HloOpcode::kSort:
     case HloOpcode::kTanh:
-      CHECK_EQ(operands.size(), 1);
-      return CreateUnary(shape, opcode_, operands[0]);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateUnary(shape, opcode_, new_operands[0]);
     // Binary ops.
     case HloOpcode::kAdd:
     case HloOpcode::kDivide:
@@ -741,90 +742,93 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneWithNewOperands(
     case HloOpcode::kRemainder:
     case HloOpcode::kLogicalAnd:
     case HloOpcode::kLogicalOr:
-      CHECK_EQ(operands.size(), 2);
-      return CreateBinary(shape, opcode_, operands[0], operands[1]);
+      CHECK_EQ(new_operands.size(), 2);
+      return CreateBinary(shape, opcode_, new_operands[0], new_operands[1]);
     // Ternary ops.
     case HloOpcode::kClamp:
     case HloOpcode::kSelect:
-      CHECK_EQ(operands.size(), 3);
-      return CreateTernary(shape, opcode_, operands[0], operands[1],
-                           operands[2]);
+      CHECK_EQ(new_operands.size(), 3);
+      return CreateTernary(shape, opcode_, new_operands[0], new_operands[1],
+                           new_operands[2]);
     // Other supported ops.
     case HloOpcode::kBroadcast:
-      CHECK_EQ(operands.size(), 1);
-      return CreateBroadcast(shape, operands[0], dimensions_);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateBroadcast(shape, new_operands[0], dimensions_);
     case HloOpcode::kCall:
-      return CreateCall(shape, operands, to_apply());
+      return CreateCall(shape, new_operands, to_apply());
     case HloOpcode::kCustomCall:
-      return CreateCustomCall(shape, operands, custom_call_target_);
+      return CreateCustomCall(shape, new_operands, custom_call_target_);
     case HloOpcode::kConcatenate:
-      return CreateConcatenate(shape, operands, dimensions(0));
+      return CreateConcatenate(shape, new_operands, dimensions(0));
     case HloOpcode::kConvert:
-      CHECK_EQ(operands.size(), 1);
-      return CreateConvert(shape, operands[0]);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateConvert(shape, new_operands[0]);
     case HloOpcode::kConvolution:
-      CHECK_EQ(operands.size(), 2);
-      return CreateConvolve(shape, operands[0], operands[1], *window_,
+      CHECK_EQ(new_operands.size(), 2);
+      return CreateConvolve(shape, new_operands[0], new_operands[1], *window_,
                             *convolution_dimension_numbers_);
     case HloOpcode::kCrossReplicaSum:
-      CHECK_EQ(operands.size(), 1);
-      return CreateCrossReplicaSum(shape, operands[0]);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateCrossReplicaSum(shape, new_operands[0]);
     case HloOpcode::kGetTupleElement:
-      CHECK_EQ(operands.size(), 1);
-      return CreateGetTupleElement(shape, operands[0], tuple_index());
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateGetTupleElement(shape, new_operands[0], tuple_index());
     case HloOpcode::kMap:
-      return CreateMap(shape, operands, to_apply());
+      return CreateMap(shape, new_operands, to_apply());
     case HloOpcode::kPad:
-      CHECK_EQ(operands.size(), 2);
-      return CreatePad(shape, operands[0], operands[1], *padding_config_);
+      CHECK_EQ(new_operands.size(), 2);
+      return CreatePad(shape, new_operands[0], new_operands[1],
+                       *padding_config_);
     case HloOpcode::kReduce:
-      CHECK_EQ(operands.size(), 2);
-      return CreateReduce(shape, operands[0], operands[1], dimensions_,
+      CHECK_EQ(new_operands.size(), 2);
+      return CreateReduce(shape, new_operands[0], new_operands[1], dimensions_,
                           to_apply());
     case HloOpcode::kReduceWindow:
-      CHECK_EQ(operands.size(), 2);
-      return CreateReduceWindow(shape, operands[0], operands[1], *window_,
-                                to_apply());
+      CHECK_EQ(new_operands.size(), 2);
+      return CreateReduceWindow(shape, new_operands[0], new_operands[1],
+                                *window_, to_apply());
     case HloOpcode::kSelectAndScatter:
-      CHECK_EQ(operands.size(), 3);
-      return CreateSelectAndScatter(shape, operands[0], select(), *window_,
-                                    operands[1], operands[2], scatter());
+      CHECK_EQ(new_operands.size(), 3);
+      return CreateSelectAndScatter(shape, new_operands[0], select(), *window_,
+                                    new_operands[1], new_operands[2],
+                                    scatter());
     case HloOpcode::kRecv:
-      CHECK_EQ(operands.size(), 0);
+      CHECK_EQ(new_operands.size(), 0);
       return CreateRecv(shape, channel_id_);
     case HloOpcode::kReverse:
-      CHECK_EQ(operands.size(), 1);
-      return CreateReverse(shape, operands[0], dimensions_);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateReverse(shape, new_operands[0], dimensions_);
     case HloOpcode::kRng:
-      return CreateRng(shape, distribution_, operands);
+      return CreateRng(shape, distribution_, new_operands);
     case HloOpcode::kReshape:
-      CHECK_EQ(operands.size(), 1);
-      return CreateReshape(shape, operands[0]);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateReshape(shape, new_operands[0]);
     case HloOpcode::kSend:
-      CHECK_EQ(operands.size(), 1);
-      return CreateSend(operands[0], channel_id_);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateSend(new_operands[0], channel_id_);
     case HloOpcode::kSlice:
-      CHECK_EQ(operands.size(), 1);
-      return CreateSlice(shape, operands[0], slice_starts_, slice_limits_);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateSlice(shape, new_operands[0], slice_starts_, slice_limits_);
     case HloOpcode::kDynamicSlice:
-      return CreateDynamicSlice(shape, operands[0], operands[1],
+      return CreateDynamicSlice(shape, new_operands[0], new_operands[1],
                                 dynamic_slice_sizes_);
     case HloOpcode::kDynamicUpdateSlice:
-      CHECK_EQ(operands.size(), 3);
-      return CreateDynamicUpdateSlice(shape, operands[0], operands[1],
-                                      operands[2]);
+      CHECK_EQ(new_operands.size(), 3);
+      return CreateDynamicUpdateSlice(shape, new_operands[0], new_operands[1],
+                                      new_operands[2]);
     case HloOpcode::kTranspose:
-      CHECK_EQ(operands.size(), 1);
-      return CreateTranspose(shape, operands[0], dimensions_);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateTranspose(shape, new_operands[0], dimensions_);
     case HloOpcode::kTuple:
-      return CreateTuple(operands_);
+      return CreateTuple(new_operands);
     case HloOpcode::kWhile:
-      CHECK_EQ(operands.size(), 1);
-      return CreateWhile(shape, while_condition(), while_body(), operands[0]);
+      CHECK_EQ(new_operands.size(), 1);
+      return CreateWhile(shape, while_condition(), while_body(),
+                         new_operands[0]);
     case HloOpcode::kConstant:
       return CreateConstant(LiteralUtil::CloneToUnique(*literal_));
     case HloOpcode::kFusion:
-      return CloneFusionWithNewOperands(shape, operands);
+      return CloneFusionWithNewOperands(shape, new_operands);
     case HloOpcode::kParameter:
       return CreateParameter(parameter_number_, shape, parameter_name_);
     // Unsupported ops for cloning.
-- 
GitLab


From 2fe28ca92fdf4ec209a68877c9c5e76348809a8b Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Tue, 11 Apr 2017 09:53:36 -0800
Subject: [PATCH 0309/1563] Add a tf.neg GPU kernel for complex64/complex128.

Also, enable GPU tests for ops that are already supported on GPU.
Change: 152831861
---
 .../core/kernels/cwise_op_gpu_neg.cu.cc       |  3 ++-
 tensorflow/core/kernels/cwise_op_neg.cc       |  3 ++-
 .../core/kernels/cwise_ops_gpu_common.cu.h    |  3 +++
 .../python/kernel_tests/cwise_ops_test.py     | 23 ++++++++++---------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tensorflow/core/kernels/cwise_op_gpu_neg.cu.cc b/tensorflow/core/kernels/cwise_op_gpu_neg.cu.cc
index 2f234f2bab..d74cab6edf 100644
--- a/tensorflow/core/kernels/cwise_op_gpu_neg.cu.cc
+++ b/tensorflow/core/kernels/cwise_op_gpu_neg.cu.cc
@@ -19,7 +19,8 @@ limitations under the License.
 
 namespace tensorflow {
 namespace functor {
-DEFINE_UNARY5(neg, Eigen::half, float, double, int32, int64);
+DEFINE_UNARY7(neg, Eigen::half, float, double, int32, int64, complex64,
+              complex128);
 }  // namespace functor
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/kernels/cwise_op_neg.cc b/tensorflow/core/kernels/cwise_op_neg.cc
index c4a9b22883..eb7e3764d9 100644
--- a/tensorflow/core/kernels/cwise_op_neg.cc
+++ b/tensorflow/core/kernels/cwise_op_neg.cc
@@ -43,7 +43,8 @@ REGISTER_KERNEL_BUILDER(Name("Neg")
 #endif // TENSORFLOW_USE_SYCL
 
 #if GOOGLE_CUDA
-REGISTER4(UnaryOp, GPU, "Neg", functor::neg, float, Eigen::half, double, int64);
+REGISTER6(UnaryOp, GPU, "Neg", functor::neg, float, Eigen::half, double, int64,
+          complex64, complex128);
 
 // A special GPU kernel for int32.
 // TODO(b/25387198): Also enable int32 in device memory. This kernel
diff --git a/tensorflow/core/kernels/cwise_ops_gpu_common.cu.h b/tensorflow/core/kernels/cwise_ops_gpu_common.cu.h
index b8e23e2c35..6dd108f722 100644
--- a/tensorflow/core/kernels/cwise_ops_gpu_common.cu.h
+++ b/tensorflow/core/kernels/cwise_ops_gpu_common.cu.h
@@ -133,6 +133,9 @@ struct ApproximateEqual<GPUDevice, T> {
 #define DEFINE_UNARY6(F, T0, T1, T2, T3, T4, T5) \
   DEFINE_UNARY2(F, T0, T1);                      \
   DEFINE_UNARY4(F, T2, T3, T4, T5)
+#define DEFINE_UNARY7(F, T0, T1, T2, T3, T4, T5, T6) \
+  DEFINE_UNARY2(F, T0, T1);                          \
+  DEFINE_UNARY5(F, T2, T3, T4, T5, T6)
 
 // Macros to explicitly instantiate kernels on GPU for multiple types
 // (T0, T1, etc.) for BinaryFunctor.
diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py
index cfe2754b32..fbcf13d21d 100644
--- a/tensorflow/python/kernel_tests/cwise_ops_test.py
+++ b/tensorflow/python/kernel_tests/cwise_ops_test.py
@@ -372,10 +372,10 @@ class UnaryOpTest(test.TestCase):
     x = np.complex(1, 1) * np.arange(-3, 3).reshape(1, 3,
                                                     2).astype(np.complex64)
     y = x + 0.5  # no zeros
-    self._compareCpu(x, np.abs, math_ops.abs)
-    self._compareCpu(x, np.abs, _ABS)
-    self._compareCpu(x, np.negative, math_ops.negative)
-    self._compareCpu(x, np.negative, _NEG)
+    self._compareBoth(x, np.abs, math_ops.abs)
+    self._compareBoth(x, np.abs, _ABS)
+    self._compareBoth(x, np.negative, math_ops.negative)
+    self._compareBoth(x, np.negative, _NEG)
     self._compareCpu(y, self._inv, math_ops.reciprocal)
     self._compareCpu(x, np.square, math_ops.square)
     self._compareCpu(y, np.sqrt, math_ops.sqrt)
@@ -399,17 +399,17 @@ class UnaryOpTest(test.TestCase):
     def complex_sign(x):
       return x / np.abs(x)
 
-    self._compareCpu(y, complex_sign, math_ops.sign)
+    self._compareBoth(y, complex_sign, math_ops.sign)
     self._compareBothSparse(y, complex_sign, math_ops.sign)
 
   def testComplex128Basic(self):
     x = np.complex(1, 1) * np.arange(-3, 3).reshape(1, 3,
                                                     2).astype(np.complex128)
     y = x + 0.5  # no zeros
-    self._compareCpu(x, np.abs, math_ops.abs)
-    self._compareCpu(x, np.abs, _ABS)
-    self._compareCpu(x, np.negative, math_ops.negative)
-    self._compareCpu(x, np.negative, _NEG)
+    self._compareBoth(x, np.abs, math_ops.abs)
+    self._compareBoth(x, np.abs, _ABS)
+    self._compareBoth(x, np.negative, math_ops.negative)
+    self._compareBoth(x, np.negative, _NEG)
     self._compareCpu(y, self._inv, math_ops.reciprocal)
     self._compareCpu(x, np.square, math_ops.square)
     self._compareCpu(y, np.sqrt, math_ops.sqrt)
@@ -433,7 +433,7 @@ class UnaryOpTest(test.TestCase):
     def complex_sign(x):
       return x / np.abs(x)
 
-    self._compareCpu(y, complex_sign, math_ops.sign)
+    self._compareBoth(y, complex_sign, math_ops.sign)
     self._compareBothSparse(y, complex_sign, math_ops.sign)
 
   def testGradGrad(self):
@@ -585,7 +585,8 @@ class BinaryOpTest(test.TestCase):
 
   def _compareBoth(self, x, y, np_func, tf_func, also_compare_variables=False):
     self._compareCpu(x, y, np_func, tf_func, also_compare_variables)
-    if x.dtype in (np.float16, np.float32, np.float64):
+    if x.dtype in (np.float16, np.float32, np.float64, np.complex64,
+                   np.complex128):
       if tf_func not in (_FLOORDIV, math_ops.floordiv, math_ops.igamma,
                          math_ops.igammac, math_ops.zeta, math_ops.polygamma):
         self._compareGradientX(x, y, np_func, tf_func)
-- 
GitLab


From 2e85e1c2c1d8d3b9f404fd110ca7ffd34a046f65 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 10:15:32 -0800
Subject: [PATCH 0310/1563] Fix QuantizedToFloat to avoid bias. Change:
 152835355

---
 tensorflow/core/kernels/quantization_utils.h   | 18 ++++++++++++++----
 .../core/kernels/quantization_utils_test.cc    | 13 +++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/tensorflow/core/kernels/quantization_utils.h b/tensorflow/core/kernels/quantization_utils.h
index 91dc52dc7d..be67dfd112 100644
--- a/tensorflow/core/kernels/quantization_utils.h
+++ b/tensorflow/core/kernels/quantization_utils.h
@@ -79,7 +79,13 @@ float QuantizedToFloat(T input, float range_min, float range_max) {
   const int64 lowest_quantized =
       static_cast<int64>(Eigen::NumTraits<T>::lowest());
   const double offset_input = static_cast<double>(input) - lowest_quantized;
-  const double result = range_min + (offset_input * range_scale);
+  // For compatibility with DEQUANTIZE_WITH_EIGEN, we should convert
+  // range_scale to a float, otherwise range_min_rounded might be slighly
+  // different.
+  const double range_min_rounded =
+      round(range_min / static_cast<float>(range_scale)) *
+      static_cast<float>(range_scale);
+  const double result = range_min_rounded + (offset_input * range_scale);
   return static_cast<float>(result);
 }
 
@@ -113,8 +119,8 @@ void QuantizationRangeForMultiplication(float min_a, float max_a, float min_b,
 // input_array is an eigen Tensor.  q2f is a QuantizedToFloatStruct.
 // This evaluates to an eigen tensor expression, to be used like:
 // auto tensor = DEQUANTIZE_WITH_EIGEN(input_tensor, q2f);
-#define DEQUANTIZE_WITH_EIGEN(input_array, q2f)                 \
-  ((q2f.range_min - q2f.lowest_quantized() * q2f.range_scale) + \
+#define DEQUANTIZE_WITH_EIGEN(input_array, q2f)                         \
+  ((q2f.range_min_rounded - q2f.lowest_quantized() * q2f.range_scale) + \
    input_array.template cast<float>() * q2f.range_scale)
 
 // input_array is an eigen Tensor.  f2q is a FloatToQuantizedStruct.
@@ -142,10 +148,14 @@ struct QuantizedToFloatStruct {
 
   QuantizedToFloatStruct(float range_min, float range_max)
       : range_min(range_min),
-        range_scale((range_max - range_min) / (number_of_steps - 1.0)) {}
+        range_scale((range_max - range_min) / (number_of_steps - 1.0)),
+        range_min_rounded(range_max == range_min
+                              ? range_min
+                              : round(range_min / range_scale) * range_scale) {}
 
   const float range_min;
   const float range_scale;
+  const float range_min_rounded;
 };
 
 // For use with QUANTIZE_WITH_EIGEN.
diff --git a/tensorflow/core/kernels/quantization_utils_test.cc b/tensorflow/core/kernels/quantization_utils_test.cc
index c7dbc0e5d1..0c23c0586c 100644
--- a/tensorflow/core/kernels/quantization_utils_test.cc
+++ b/tensorflow/core/kernels/quantization_utils_test.cc
@@ -364,14 +364,10 @@ TEST_F(QuantizationUtilsTest, AvoidBias) {
   const float tolerance = step_size / 1000.0f;
   // This is the smallest perfectly representable float in the range.
   float first_float = ceil(min / step_size) * step_size;
-  // TODO(ahentz): The current version always incur a small error, which we
-  // need to account for. We should fix QuantizedToFloat<> to remove this bias.
-  const float expected_error = first_float - min;
-  ASSERT_GT(expected_error, tolerance);
   for (float f = first_float; f <= max; f += step_size) {
     const int as_int = FloatToQuantized<quint8>(f, min, max);
     const float back_to_float = QuantizedToFloat<quint8>(as_int, min, max);
-    EXPECT_NEAR(f, back_to_float + expected_error, tolerance);
+    EXPECT_NEAR(f, back_to_float, tolerance);
   }
 }
 
@@ -412,11 +408,16 @@ TEST_F(QuantizationUtilsTest, RequantizeInNewRange) {
 }
 
 TEST_F(QuantizationUtilsTest, RequantizeInNewRangeRealData) {
-  const float value_as_float = -0.290169f;
   const float input_min = -0.739539f;
   const float input_max = 0.641057f;
   const float output_min = -2381.49f;
   const float output_max = 2207.6f;
+
+  // Start with a value that can be perfectly represented in 8 bits. This
+  // ensures minimal quantization error, and allows us to use EXPECT_LT below.
+  const float value_as_float =
+      QuantizedToFloat<quint8>(83, input_min, input_max);
+
   const quint8 value_as_quint8 =
       FloatToQuantized<quint8>(value_as_float, input_min, input_max);
   EXPECT_EQ(quint8(83), value_as_quint8);
-- 
GitLab


From 8ab0ce8f86780ccb9ce1365ce6a95ba133c0bb4b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 10:16:41 -0800
Subject: [PATCH 0311/1563] Adding license headers to cmake files. Change:
 152835531

---
 tensorflow/contrib/cmake/external/boringssl.cmake  | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/eigen.cmake      | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/farmhash.cmake   | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/gemmlowp.cmake   | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/gif.cmake        | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/googletest.cmake | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/grpc.cmake       | 14 ++++++++++++++
 .../contrib/cmake/external/highwayhash.cmake       | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/jemalloc.cmake   | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/jpeg.cmake       | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/jsoncpp.cmake    | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/png.cmake        | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/protobuf.cmake   | 14 ++++++++++++++
 .../contrib/cmake/external/tensorboard.cmake       | 14 ++++++++++++++
 tensorflow/contrib/cmake/external/zlib.cmake       | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_cc_ops.cmake           | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_core_cpu.cmake         | 14 ++++++++++++++
 .../contrib/cmake/tf_core_direct_session.cmake     | 14 ++++++++++++++
 .../cmake/tf_core_distributed_runtime.cmake        | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_core_framework.cmake   | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_core_kernels.cmake     | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_core_ops.cmake         | 14 ++++++++++++++
 .../contrib/cmake/tf_label_image_example.cmake     | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_python.cmake           | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_stream_executor.cmake  | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_tests.cmake            | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_tools.cmake            | 14 ++++++++++++++
 tensorflow/contrib/cmake/tf_tutorials.cmake        | 14 ++++++++++++++
 tensorflow/tools/ci_build/Dockerfile.cmake         | 14 ++++++++++++++
 29 files changed, 406 insertions(+)

diff --git a/tensorflow/contrib/cmake/external/boringssl.cmake b/tensorflow/contrib/cmake/external/boringssl.cmake
index b91c7bf383..2ae591d3fa 100644
--- a/tensorflow/contrib/cmake/external/boringssl.cmake
+++ b/tensorflow/contrib/cmake/external/boringssl.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(boringssl_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boringssl/src/boringssl/include)
diff --git a/tensorflow/contrib/cmake/external/eigen.cmake b/tensorflow/contrib/cmake/external/eigen.cmake
index 7dd7dd4070..45a0096085 100644
--- a/tensorflow/contrib/cmake/external/eigen.cmake
+++ b/tensorflow/contrib/cmake/external/eigen.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 #new_http_archive(
 #  name = "eigen_archive",
 #  urls = ["https://bitbucket.org/eigen/eigen/get/..."],
diff --git a/tensorflow/contrib/cmake/external/farmhash.cmake b/tensorflow/contrib/cmake/external/farmhash.cmake
index c256f5f303..41b0e8c92b 100644
--- a/tensorflow/contrib/cmake/external/farmhash.cmake
+++ b/tensorflow/contrib/cmake/external/farmhash.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(farmhash_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/farmhash_archive ${CMAKE_CURRENT_BINARY_DIR}/external/farmhash_archive/util)
diff --git a/tensorflow/contrib/cmake/external/gemmlowp.cmake b/tensorflow/contrib/cmake/external/gemmlowp.cmake
index 30ee21a13b..eee61ffd57 100644
--- a/tensorflow/contrib/cmake/external/gemmlowp.cmake
+++ b/tensorflow/contrib/cmake/external/gemmlowp.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(gemmlowp_URL http://github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz)
diff --git a/tensorflow/contrib/cmake/external/gif.cmake b/tensorflow/contrib/cmake/external/gif.cmake
index aaa0787f8b..5011239c14 100644
--- a/tensorflow/contrib/cmake/external/gif.cmake
+++ b/tensorflow/contrib/cmake/external/gif.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(gif_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/gif_archive/giflib-5.1.4/)
diff --git a/tensorflow/contrib/cmake/external/googletest.cmake b/tensorflow/contrib/cmake/external/googletest.cmake
index fe1a936717..c370f46d2a 100644
--- a/tensorflow/contrib/cmake/external/googletest.cmake
+++ b/tensorflow/contrib/cmake/external/googletest.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(googletest_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/include)
diff --git a/tensorflow/contrib/cmake/external/grpc.cmake b/tensorflow/contrib/cmake/external/grpc.cmake
index 7065e5d60d..46ea519f09 100644
--- a/tensorflow/contrib/cmake/external/grpc.cmake
+++ b/tensorflow/contrib/cmake/external/grpc.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(GRPC_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/include)
diff --git a/tensorflow/contrib/cmake/external/highwayhash.cmake b/tensorflow/contrib/cmake/external/highwayhash.cmake
index 972c97a55a..2c23bef8a3 100644
--- a/tensorflow/contrib/cmake/external/highwayhash.cmake
+++ b/tensorflow/contrib/cmake/external/highwayhash.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(highwayhash_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/highwayhash)
diff --git a/tensorflow/contrib/cmake/external/jemalloc.cmake b/tensorflow/contrib/cmake/external/jemalloc.cmake
index b0b212eeb6..e4737a1dd8 100644
--- a/tensorflow/contrib/cmake/external/jemalloc.cmake
+++ b/tensorflow/contrib/cmake/external/jemalloc.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(jemalloc_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/jemalloc/src/jemalloc/include)
diff --git a/tensorflow/contrib/cmake/external/jpeg.cmake b/tensorflow/contrib/cmake/external/jpeg.cmake
index fcfa9d3485..f2797d13b2 100644
--- a/tensorflow/contrib/cmake/external/jpeg.cmake
+++ b/tensorflow/contrib/cmake/external/jpeg.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(jpeg_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/jpeg_archive)
diff --git a/tensorflow/contrib/cmake/external/jsoncpp.cmake b/tensorflow/contrib/cmake/external/jsoncpp.cmake
index 43d6e0456c..1ef49681a6 100644
--- a/tensorflow/contrib/cmake/external/jsoncpp.cmake
+++ b/tensorflow/contrib/cmake/external/jsoncpp.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(jsoncpp_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/jsoncpp/src/jsoncpp)
diff --git a/tensorflow/contrib/cmake/external/png.cmake b/tensorflow/contrib/cmake/external/png.cmake
index bfad8e5a26..05e9688d1f 100644
--- a/tensorflow/contrib/cmake/external/png.cmake
+++ b/tensorflow/contrib/cmake/external/png.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(png_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/png_archive)
diff --git a/tensorflow/contrib/cmake/external/protobuf.cmake b/tensorflow/contrib/cmake/external/protobuf.cmake
index 5ee6987175..6cd9c11750 100644
--- a/tensorflow/contrib/cmake/external/protobuf.cmake
+++ b/tensorflow/contrib/cmake/external/protobuf.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(PROTOBUF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/src)
diff --git a/tensorflow/contrib/cmake/external/tensorboard.cmake b/tensorflow/contrib/cmake/external/tensorboard.cmake
index a249af0705..457868c72b 100644
--- a/tensorflow/contrib/cmake/external/tensorboard.cmake
+++ b/tensorflow/contrib/cmake/external/tensorboard.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(tensorboard_dependencies)
diff --git a/tensorflow/contrib/cmake/external/zlib.cmake b/tensorflow/contrib/cmake/external/zlib.cmake
index eb7d4bc38b..8cfde90438 100644
--- a/tensorflow/contrib/cmake/external/zlib.cmake
+++ b/tensorflow/contrib/cmake/external/zlib.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 include (ExternalProject)
 
 set(zlib_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/zlib_archive)
diff --git a/tensorflow/contrib/cmake/tf_cc_ops.cmake b/tensorflow/contrib/cmake/tf_cc_ops.cmake
index 936196dd20..bb03593d54 100644
--- a/tensorflow/contrib/cmake/tf_cc_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_cc_ops.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 ########################################################
 # tf_cc_framework library
 ########################################################
diff --git a/tensorflow/contrib/cmake/tf_core_cpu.cmake b/tensorflow/contrib/cmake/tf_core_cpu.cmake
index 4410b361f3..1c80ffcd7b 100644
--- a/tensorflow/contrib/cmake/tf_core_cpu.cmake
+++ b/tensorflow/contrib/cmake/tf_core_cpu.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 ########################################################
 # tf_core_cpu library
 ########################################################
diff --git a/tensorflow/contrib/cmake/tf_core_direct_session.cmake b/tensorflow/contrib/cmake/tf_core_direct_session.cmake
index 712f04ddc1..de2fa86695 100644
--- a/tensorflow/contrib/cmake/tf_core_direct_session.cmake
+++ b/tensorflow/contrib/cmake/tf_core_direct_session.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 ########################################################
 # tf_core_direct_session library
 ########################################################
diff --git a/tensorflow/contrib/cmake/tf_core_distributed_runtime.cmake b/tensorflow/contrib/cmake/tf_core_distributed_runtime.cmake
index ffa5710534..2c1b6d1f6e 100644
--- a/tensorflow/contrib/cmake/tf_core_distributed_runtime.cmake
+++ b/tensorflow/contrib/cmake/tf_core_distributed_runtime.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 ########################################################
 # tf_core_distributed_runtime library
 ########################################################
diff --git a/tensorflow/contrib/cmake/tf_core_framework.cmake b/tensorflow/contrib/cmake/tf_core_framework.cmake
index 3787ac4c81..6fd1ae0814 100644
--- a/tensorflow/contrib/cmake/tf_core_framework.cmake
+++ b/tensorflow/contrib/cmake/tf_core_framework.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 ########################################################
 # RELATIVE_PROTOBUF_GENERATE_CPP function
 ########################################################
diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index 0663ba1637..c13c28910f 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 ########################################################
 # tf_core_kernels library
 ########################################################
diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index 126ef6c00c..cd56fa437e 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 set(tf_op_lib_names
     "array_ops"
     "candidate_sampling_ops"
diff --git a/tensorflow/contrib/cmake/tf_label_image_example.cmake b/tensorflow/contrib/cmake/tf_label_image_example.cmake
index cfd2131148..0d3a4699eb 100644
--- a/tensorflow/contrib/cmake/tf_label_image_example.cmake
+++ b/tensorflow/contrib/cmake/tf_label_image_example.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 set(tf_label_image_example_srcs
     "${tensorflow_source_dir}/tensorflow/examples/label_image/main.cc"
 )
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 178e03c222..c0c6cd54ac 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 # CMake rules for generating the TensorFlow Python bindings.
 #
 # Known limitations:
diff --git a/tensorflow/contrib/cmake/tf_stream_executor.cmake b/tensorflow/contrib/cmake/tf_stream_executor.cmake
index bf45bb0863..3d84f1ebb9 100644
--- a/tensorflow/contrib/cmake/tf_stream_executor.cmake
+++ b/tensorflow/contrib/cmake/tf_stream_executor.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 #cc_library(
 #    name = "stream_executor",
 #    srcs = glob(
diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index 2146870dfd..cc79b31d91 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 enable_testing()
 
 #
diff --git a/tensorflow/contrib/cmake/tf_tools.cmake b/tensorflow/contrib/cmake/tf_tools.cmake
index 636caf5f3d..c518414f0c 100644
--- a/tensorflow/contrib/cmake/tf_tools.cmake
+++ b/tensorflow/contrib/cmake/tf_tools.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 set(tf_tools_proto_text_src_dir "${tensorflow_source_dir}/tensorflow/tools/proto_text")
 
 file(GLOB tf_tools_proto_text_srcs
diff --git a/tensorflow/contrib/cmake/tf_tutorials.cmake b/tensorflow/contrib/cmake/tf_tutorials.cmake
index d6547d6eac..858e7dda92 100644
--- a/tensorflow/contrib/cmake/tf_tutorials.cmake
+++ b/tensorflow/contrib/cmake/tf_tutorials.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 set(tf_tutorials_example_trainer_srcs
     "${tensorflow_source_dir}/tensorflow/cc/tutorials/example_trainer.cc"
 )
diff --git a/tensorflow/tools/ci_build/Dockerfile.cmake b/tensorflow/tools/ci_build/Dockerfile.cmake
index 22eaf11b91..9013dc012d 100644
--- a/tensorflow/tools/ci_build/Dockerfile.cmake
+++ b/tensorflow/tools/ci_build/Dockerfile.cmake
@@ -1,3 +1,17 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
 FROM ubuntu:16.04
 
 MAINTAINER Shanqing Cai <cais@google.com>
-- 
GitLab


From 4e69ce821b5d6f579223f4adaf2987460767ab0e Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Tue, 11 Apr 2017 10:31:27 -0800
Subject: [PATCH 0312/1563] Update release notes with mention of
 `tf.Session.make_callable()`. Change: 152837661

---
 RELEASE.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/RELEASE.md b/RELEASE.md
index ebb5c28451..33fce86bf4 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,3 +1,9 @@
+# Changes since the last release
+
+## Major Features and Improvements
+* Added `tf.Session.make_callable()`, which provides a lower overhead means of running a similar step multiple times.
+
+
 # Release 1.1.0
 
 ## Major Features and Improvements
-- 
GitLab


From 59d82b9133616c88af00340260f475d7e2af4c59 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 10:32:40 -0800
Subject: [PATCH 0313/1563] Gracefully exit on writing config file. Change:
 152837817

---
 .../contrib/keras/python/keras/backend.py     | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index d149138796..b35ee5db09 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -3627,21 +3627,24 @@ if os.path.exists(_config_path):
   set_image_data_format(_image_data_format)
 
 # Save config file.
-if os.access(_keras_base_dir, os.W_OK):
-  if not os.path.exists(_keras_dir):
-    try:
-      os.makedirs(_keras_dir)
-    except OSError:
-      # Except potential race conditions
-      # in multi-threaded environments.
-      pass
-
-  if not os.path.exists(_config_path):
-    _config = {
-        'floatx': floatx(),
-        'epsilon': epsilon(),
-        'backend': 'tensorflow',
-        'image_data_format': image_data_format()
-    }
+if not os.path.exists(_keras_dir):
+  try:
+    os.makedirs(_keras_dir)
+  except OSError:
+    # Except permission denied and potential race conditions
+    # in multi-threaded environments.
+    pass
+
+if not os.path.exists(_config_path):
+  _config = {
+      'floatx': floatx(),
+      'epsilon': epsilon(),
+      'backend': 'tensorflow',
+      'image_data_format': image_data_format()
+  }
+  try:
     with open(_config_path, 'w') as f:
       f.write(json.dumps(_config, indent=4))
+  except IOError:
+    # Except permission denied.
+    pass
-- 
GitLab


From c66c9e59301c5adcc830b8e12408868e28e2d6e6 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Tue, 11 Apr 2017 10:32:56 -0800
Subject: [PATCH 0314/1563] SimpleGraphExecutionState::InitBaseGraph(): don't
 pass FunctionLibraryDefinition to Graph ctor

ConvertGraphDefToGraph() adds functions to the graph now, so there's no need to explicitly pass them into the graph constructor.
Change: 152837855
---
 tensorflow/core/common_runtime/simple_graph_execution_state.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/common_runtime/simple_graph_execution_state.cc b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
index dd0896e1dd..c2ac15b345 100644
--- a/tensorflow/core/common_runtime/simple_graph_execution_state.cc
+++ b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
@@ -274,7 +274,7 @@ Status SimpleGraphExecutionState::InitBaseGraph(
     }
   }
 
-  std::unique_ptr<Graph> new_graph(new Graph(flib_def_.get()));
+  std::unique_ptr<Graph> new_graph(new Graph(OpRegistry::Global()));
   GraphConstructorOptions opts;
   TF_RETURN_IF_ERROR(ConvertGraphDefToGraph(opts, *graph_def, new_graph.get()));
   for (const Node* n : new_graph->nodes()) {
-- 
GitLab


From 740053be5054027bc66c7995c045d40b07479943 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Tue, 11 Apr 2017 10:36:59 -0800
Subject: [PATCH 0315/1563] Allow passing custom hooks to 'evaluation_loop'.
 Change: 152838415

---
 .../contrib/slim/python/slim/evaluation.py    | 15 +++++++++----
 .../slim/python/slim/evaluation_test.py       | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/evaluation.py b/tensorflow/contrib/slim/python/slim/evaluation.py
index 85616be410..15c9f3d3f4 100644
--- a/tensorflow/contrib/slim/python/slim/evaluation.py
+++ b/tensorflow/contrib/slim/python/slim/evaluation.py
@@ -224,7 +224,8 @@ def evaluation_loop(master,
                     eval_interval_secs=60,
                     max_number_of_evaluations=None,
                     session_config=None,
-                    timeout=None):
+                    timeout=None,
+                    hooks=None):
   """Runs TF-Slim's Evaluation Loop.
 
   Args:
@@ -255,6 +256,8 @@ def evaluation_loop(master,
       configure the `Session`. If left as `None`, the default will be used.
     timeout: The maximum amount of time to wait between checkpoints. If left as
       `None`, then the process will wait indefinitely.
+    hooks: A list of additional SessionRunHook objects to pass during
+      repeated evaluations.
 
   Returns:
     The value of `final_op` or `None` if `final_op` is `None`.
@@ -262,12 +265,16 @@ def evaluation_loop(master,
   if summary_op == _USE_DEFAULT:
     summary_op = summary.merge_all()
 
-  hooks = [evaluation.StopAfterNEvalsHook(num_evals),]
+  all_hooks = [evaluation.StopAfterNEvalsHook(num_evals),]
 
   if summary_op is not None:
-    hooks.append(evaluation.SummaryAtEndHook(
+    all_hooks.append(evaluation.SummaryAtEndHook(
         log_dir=logdir, summary_op=summary_op, feed_dict=summary_op_feed_dict))
 
+  if hooks is not None:
+    # Add custom hooks if provided.
+    all_hooks.extend(hooks)
+
   saver = None
   if variables_to_restore is not None:
     saver = tf_saver.Saver(variables_to_restore)
@@ -283,7 +290,7 @@ def evaluation_loop(master,
       final_ops=final_op,
       final_ops_feed_dict=final_op_feed_dict,
       eval_interval_secs=eval_interval_secs,
-      hooks=hooks,
+      hooks=all_hooks,
       config=session_config,
       max_number_of_evaluations=max_number_of_evaluations,
       timeout=timeout)
diff --git a/tensorflow/contrib/slim/python/slim/evaluation_test.py b/tensorflow/contrib/slim/python/slim/evaluation_test.py
index 18c97d75e5..d9e0f54b72 100644
--- a/tensorflow/contrib/slim/python/slim/evaluation_test.py
+++ b/tensorflow/contrib/slim/python/slim/evaluation_test.py
@@ -41,6 +41,8 @@ from tensorflow.python.platform import test
 from tensorflow.python.summary import summary_iterator
 from tensorflow.python.training import input
 from tensorflow.python.training import saver as saver_lib
+from tensorflow.python.training import session_run_hook
+
 
 FLAGS = flags.FLAGS
 
@@ -100,6 +102,22 @@ class EvaluationTest(test.TestCase):
       init_op.run()
       saver.save(sess, os.path.join(chkpt_dir, 'chkpt'))
 
+    class Object(object):
+
+      def __init__(self):
+        self.hook_was_run = False
+
+    obj = Object()
+
+    # Create a custom session run hook.
+    class CustomHook(session_run_hook.SessionRunHook):
+
+      def __init__(self, obj):
+        self.obj = obj
+
+      def end(self, session):
+        self.obj.hook_was_run = True
+
     # Now, run the evaluation loop:
     accuracy_value = evaluation.evaluation_loop(
         '',
@@ -107,9 +125,13 @@ class EvaluationTest(test.TestCase):
         logdir,
         eval_op=update_op,
         final_op=value_op,
+        hooks=[CustomHook(obj)],
         max_number_of_evaluations=1)
     self.assertAlmostEqual(accuracy_value, self._expected_accuracy)
 
+    # Validate that custom hook ran.
+    self.assertTrue(obj.hook_was_run)
+
   def _create_names_to_metrics(self, predictions, labels):
     accuracy0, update_op0 = metric_ops.streaming_accuracy(predictions, labels)
     accuracy1, update_op1 = metric_ops.streaming_accuracy(predictions + 1,
-- 
GitLab


From a11e669c5a4c855b0b507da97378bc7e03a08f86 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 11:12:15 -0800
Subject: [PATCH 0316/1563] Support two data types as inputs in
 RemoteFusedGraphExecuteOp Change: 152843285

---
 .../sub_makefiles/quantization/Makefile.in    |  1 +
 .../kernels/hexagon/graph_transfer_utils.cc   | 27 +++++--------
 .../kernels/remote_fused_graph_execute_op.cc  | 23 +++++++----
 .../remote_fused_graph_execute_op_test.cc     | 38 +++++++++++++------
 .../remote_fused_graph_execute_utils.cc       |  3 +-
 tensorflow/core/ops/remote_fused_graph_ops.cc | 12 +++---
 .../core/ops/remote_fused_graph_ops_test.cc   | 32 +++++++++++-----
 7 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/tensorflow/contrib/makefile/sub_makefiles/quantization/Makefile.in b/tensorflow/contrib/makefile/sub_makefiles/quantization/Makefile.in
index bc7a238fdb..6ba41d5d12 100644
--- a/tensorflow/contrib/makefile/sub_makefiles/quantization/Makefile.in
+++ b/tensorflow/contrib/makefile/sub_makefiles/quantization/Makefile.in
@@ -50,6 +50,7 @@ tensorflow/core/kernels/hexagon/graph_transferer_test.cc \
 tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc \
 tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc \
 tensorflow/core/kernels/remote_fused_graph_execute_op.cc \
+tensorflow/core/kernels/remote_fused_graph_execute_utils.cc \
 tensorflow/core/ops/remote_fused_graph_ops.cc \
 tensorflow/core/platform/posix/test.cc
 
diff --git a/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc b/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc
index 4352f13309..aff78837a3 100644
--- a/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc
+++ b/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc
@@ -107,18 +107,14 @@ GraphTransferUtils::BuildRemoteFusedGraphExecuteInfo(
         AddOutputTensorShapeTypeByTensorShapeMap(tensor_shape_map, &node_def));
   }
   CHECK(status.ok());
-  const DataType input_data_type =
-      inputs.empty() ? DT_FLOAT : inputs.at(0).second.dtype();
 
   Scope root = Scope::NewRootScope();
   std::vector<Output> output_list;
+  DataTypeVector input_types;
   for (const std::pair<string, Tensor>& input_node_info : inputs) {
     const Scope& scope = root.WithOpName(input_node_info.first);
     Node* ret;
     const auto unique_name = scope.GetUniqueNameForOp("PlaceholderV2");
-    const DataType dt = input_node_info.second.dtype();
-    // DataType of input arguments should be same.
-    CHECK_EQ(input_data_type, dt);
     auto builder = NodeBuilder(unique_name, "PlaceholderV2")
                        .Attr("dtype", input_node_info.second.dtype())
                        .Attr("shape", input_node_info.second.shape());
@@ -126,25 +122,21 @@ GraphTransferUtils::BuildRemoteFusedGraphExecuteInfo(
     scope.UpdateStatus(builder.Finalize(scope.graph(), &ret));
     CHECK(scope.ok());
     output_list.emplace_back(Output(ret, 0));
+    input_types.push_back(input_node_info.second.dtype());
   }
 
   const RemoteFusedGraphExecuteInfo execute_info =
       BuildRemoteFusedGraphExecuteInfo(*original_def, inputs, outputs,
                                        tensor_shape_map);
 
-  const std::pair<DataType, TensorShape>* tensor_shape_type =
-      RemoteFusedGraphExecuteUtils::GetTensorShapeType(tensor_shape_map,
-                                                       outputs.at(0));
-  CHECK_NE(tensor_shape_type, nullptr);
-  const DataType output_data_type = tensor_shape_type->first;
+  DataTypeVector output_types;
   // Sanity-check to confirm all output data types are same.
   for (const string& output_node_name : outputs) {
     const std::pair<DataType, TensorShape>* tst =
         RemoteFusedGraphExecuteUtils::GetTensorShapeType(tensor_shape_map,
                                                          output_node_name);
     CHECK_NE(tst, nullptr);
-    const DataType dt = tensor_shape_type->first;
-    CHECK_EQ(output_data_type, dt);
+    output_types.push_back(tst->first);
   }
 
   const Scope& scope = root.WithOpName(remote_graph_execute_name);
@@ -152,18 +144,17 @@ GraphTransferUtils::BuildRemoteFusedGraphExecuteInfo(
   auto node_out_list = ops::AsNodeOutList(scope, InputList(output_list));
   Node* node;
   const auto unique_name = scope.GetUniqueNameForOp("RemoteFusedGraphExecute");
+
   auto builder = NodeBuilder(unique_name, "RemoteFusedGraphExecute")
                      .Input(node_out_list)
-                     .Attr("M", static_cast<int64>(output_list.size()))
-                     .Attr("N", static_cast<int64>(outputs.size()))
-                     .Attr("T", input_data_type)
-                     .Attr("U", output_data_type)
-                     .Attr("serialized_graph_transfer_info",
+                     .Attr("Tinputs", input_types)
+                     .Attr("Toutputs", output_types)
+                     .Attr("serialized_remote_fused_graph_execute_info",
                            StringPiece(execute_info.SerializeAsString()));
   CHECK(scope.ok());
   scope.UpdateBuilder(&builder);
   scope.UpdateStatus(builder.Finalize(scope.graph(), &node));
-  CHECK(scope.ok());
+  CHECK(scope.ok()) << scope.status();
 
   GraphDef fusedGraphDef;
   TF_CHECK_OK(root.ToGraphDef(&fusedGraphDef));
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_op.cc b/tensorflow/core/kernels/remote_fused_graph_execute_op.cc
index bd95474a62..101d0e694b 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_op.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_op.cc
@@ -29,8 +29,11 @@ class RemoteFusedGraphExecuteOp : public OpKernel {
   explicit RemoteFusedGraphExecuteOp(OpKernelConstruction* const ctx)
       : OpKernel(ctx), execute_info_() {
     string serialized_proto;
-    OP_REQUIRES_OK(
-        ctx, ctx->GetAttr("serialized_graph_transfer_info", &serialized_proto));
+    OP_REQUIRES_OK(ctx,
+                   ctx->GetAttr("serialized_remote_fused_graph_execute_info",
+                                &serialized_proto));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("Tinputs", &input_types_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("Toutputs", &output_types_));
     execute_info_.ParseFromString(serialized_proto);
     if (!execute_info_.executor_name().empty()) {
       const RemoteFusedGraphExecuteUtils::ExecutorBuildFunc* build_func =
@@ -69,12 +72,15 @@ class RemoteFusedGraphExecuteOp : public OpKernel {
   void Compute(OpKernelContext* const ctx) final {
     CHECK(ctx != nullptr);
     const int input_count = ctx->num_inputs();
-    CHECK(input_count == execute_info_.graph_input_node_name_size())
+    const int graph_input_count = execute_info_.graph_input_node_name_size();
+    CHECK(input_count == graph_input_count &&
+          input_count == input_types_.size())
         << "input_count = " << input_count
-        << ", gt input count = " << execute_info_.graph_input_node_name_size();
+        << ", gt input count = " << execute_info_.graph_input_node_name_size()
+        << ", type count = " << input_types_.size();
 
-    // 3. Send inputs into remote processor
-    for (int i = 0; i < input_count; ++i) {
+    // 3. Send first data type inputs into remote processor
+    for (int i = 0; i < graph_input_count; ++i) {
       const Tensor& input_tensor = ctx->input(i);
       const string& input_node_name = execute_info_.graph_input_node_name(i);
       if (remote_fused_graph_executor_) {
@@ -90,7 +96,8 @@ class RemoteFusedGraphExecuteOp : public OpKernel {
 
     // 5. Load outputs from remote processor
     const int output_count = ctx->num_outputs();
-    CHECK(output_count == execute_info_.graph_output_node_name_size());
+    CHECK(output_count == execute_info_.graph_output_node_name_size() &&
+          output_count == output_types_.size());
     for (int i = 0; i < output_count; ++i) {
       Tensor* output = nullptr;
       const string& output_node_name = execute_info_.graph_output_node_name(i);
@@ -110,6 +117,8 @@ class RemoteFusedGraphExecuteOp : public OpKernel {
  private:
   RemoteFusedGraphExecuteInfo execute_info_;
   std::unique_ptr<IRemoteFusedGraphExecutor> remote_fused_graph_executor_;
+  DataTypeVector input_types_;
+  DataTypeVector output_types_;
 
   TF_DISALLOW_COPY_AND_ASSIGN(RemoteFusedGraphExecuteOp);
 };
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc b/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
index 580be4b7db..925af1f79e 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
@@ -37,20 +37,34 @@ namespace tensorflow {
 
 class RemoteFusedGraphExecuteTest : public OpsTestBase {};
 
-TEST_F(RemoteFusedGraphExecuteTest, ExecuteAddGraph) {
+TEST_F(RemoteFusedGraphExecuteTest, BuildModelWithOneDataType) {
+  DataTypeVector input_types({DT_FLOAT, DT_FLOAT});
+  DataTypeVector output_types({DT_FLOAT});
   TF_ASSERT_OK(
       NodeDefBuilder("remote_fused_graph_execute_op", "RemoteFusedGraphExecute")
           .Input(FakeInput(2, DT_FLOAT))
-          .Attr("M", 2)
-          .Attr("N", 1)
-          .Attr("T", DataTypeToEnum<float>::v())
-          .Attr("U", DataTypeToEnum<float>::v())
-          .Attr("serialized_graph_transfer_info", "")
+          .Attr("Tinputs", input_types)
+          .Attr("Toutputs", output_types)
+          .Attr("serialized_remote_fused_graph_execute_info", "")
           .Finalize(node_def()));
   TF_ASSERT_OK(InitOp());
   // TODO(satok): Add benchmark
 }
 
+TEST_F(RemoteFusedGraphExecuteTest, BuildModelWithWrongDataType) {
+  DataTypeVector input_types({DT_INT32, DT_INT32});
+  DataTypeVector output_types({DT_FLOAT});
+  ASSERT_FALSE(
+      NodeDefBuilder("remote_fused_graph_execute_op", "RemoteFusedGraphExecute")
+          .Input(FakeInput(2, DT_FLOAT))
+          .Attr("Tinputs", input_types)
+          .Attr("Toutputs", output_types)
+          .Attr("serialized_remote_fused_graph_execute_info", "")
+          .Finalize(node_def())
+          .ok());
+  // TODO(satok): Add benchmark
+}
+
 ////////////////////////////
 // End-to-end test: Begin //
 ////////////////////////////
@@ -94,13 +108,15 @@ static Output BuildRemoteFusedGraphExecuteOp(
   CHECK(scope.ok());
   auto node_out_list = ops::AsNodeOutList(scope, InputList(output_list));
   const auto unique_name = scope.GetUniqueNameForOp("RemoteFusedGraphExecute");
+
+  DataTypeVector input_types{DT_FLOAT};
+  DataTypeVector output_types{DT_FLOAT};
+
   auto builder = NodeBuilder(unique_name, "RemoteFusedGraphExecute")
                      .Input(node_out_list)
-                     .Attr("M", static_cast<int64>(output_list.size()))
-                     .Attr("N", static_cast<int64>(output_node_count))
-                     .Attr("T", DT_FLOAT)
-                     .Attr("U", DT_FLOAT)
-                     .Attr("serialized_graph_transfer_info",
+                     .Attr("Tinputs", input_types)
+                     .Attr("Toutputs", output_types)
+                     .Attr("serialized_remote_fused_graph_execute_info",
                            StringPiece(execute_info.SerializeAsString()));
   CHECK(scope.ok());
   scope.UpdateBuilder(&builder);
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
index a6eb06004a..b885c5ce09 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
@@ -187,7 +187,8 @@ RemoteFusedGraphExecuteUtils::GetExecutorBuildRegistry() {
     const std::vector<std::pair<string, Tensor>>& input_tensor_vector,
     const string& node_name) {
   for (const std::pair<string, Tensor>& pair : input_tensor_vector) {
-    if (node_name == pair.first) {
+    const TensorId tid = ParseTensorName(pair.first);
+    if (node_name == tid.first.ToString()) {
       return true;
     }
   }
diff --git a/tensorflow/core/ops/remote_fused_graph_ops.cc b/tensorflow/core/ops/remote_fused_graph_ops.cc
index 3d90c054d4..6e9f37a615 100644
--- a/tensorflow/core/ops/remote_fused_graph_ops.cc
+++ b/tensorflow/core/ops/remote_fused_graph_ops.cc
@@ -21,13 +21,11 @@ namespace tensorflow {
 
 // TODO(satok): Implement shape_inference
 REGISTER_OP("RemoteFusedGraphExecute")
-    .Input("values: M * T")
-    .Output("output: N * U")
-    .Attr("M: int >= 0")
-    .Attr("N: int >= 0")
-    .Attr("T: type")
-    .Attr("U: type")
-    .Attr("serialized_graph_transfer_info: string")
+    .Input("inputs: Tinputs")
+    .Output("outputs: Toutputs")
+    .Attr("Tinputs: list(type) >= 0")
+    .Attr("Toutputs: list(type) >= 0")
+    .Attr("serialized_remote_fused_graph_execute_info: string")
     .SetShapeFn(shape_inference::UnknownShape)
     .Doc(R"doc(
 Execute a sub graph on a remote processor transferred by GraphTransferer.
diff --git a/tensorflow/core/ops/remote_fused_graph_ops_test.cc b/tensorflow/core/ops/remote_fused_graph_ops_test.cc
index 7fbe213e20..f5d90a676d 100644
--- a/tensorflow/core/ops/remote_fused_graph_ops_test.cc
+++ b/tensorflow/core/ops/remote_fused_graph_ops_test.cc
@@ -26,21 +26,33 @@ namespace tensorflow {
 
 TEST(RemoteFusedGraphOpsTest, RemoteFusedGraphExecute_ShapeFn) {
   ShapeInferenceTestOp op("RemoteFusedGraphExecute");
-  auto set_n = [&op](int input_count, int output_count) {
+  auto set_n = [&op](int input1_count, int input2_count, int output_count) {
     std::vector<NodeDefBuilder::NodeOut> src_list;
-    for (int i = 0; i < input_count; ++i) {
+    DataTypeVector input_types;
+    for (int i = 0; i < input1_count; ++i) {
       src_list.emplace_back("a", 0, DT_FLOAT);
+      input_types.emplace_back(DT_FLOAT);
     }
-    TF_ASSERT_OK(NodeDefBuilder("test", "RemoteFusedGraphExecute")
-                     .Input(src_list)
-                     .Attr("M", input_count)
-                     .Attr("N", output_count)
-                     .Attr("T", DT_FLOAT)
-                     .Attr("U", DT_FLOAT)
-                     .Finalize(&op.node_def));
+    for (int i = 0; i < input2_count; ++i) {
+      src_list.emplace_back("b", 0, DT_INT32);
+      input_types.emplace_back(DT_INT32);
+    }
+    DataTypeVector output_types;
+    for (int i = 0; i < output_count; ++i) {
+      output_types.emplace_back(DT_FLOAT);
+    }
+    NodeDefBuilder builder = NodeDefBuilder("test", "RemoteFusedGraphExecute")
+                                 .Input(src_list)
+                                 .Attr("Tinputs", input_types)
+                                 .Attr("Toutputs", output_types);
+    TF_ASSERT_OK(builder.Finalize(&op.node_def));
   };
-  set_n(4, 2);
+  set_n(4, 0, 2);
   INFER_OK(op, "?;?;?;?", "?;?");  // output rank unknown
+
+  set_n(4, 3, 3);
+  INFER_OK(op, "?;?;?;?;?;?;?", "?;?;?");  // output rank unknown
+
   // TODO(satok): Implement shape inference and do its test here
 }
 
-- 
GitLab


From 6461dd322be3a74f0c20b62a8136bc0d8d8c1bb8 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Tue, 11 Apr 2017 11:17:58 -0800
Subject: [PATCH 0317/1563] Deprecate PlaceholderV2 since we found a way to
 make the same change to Placeholder in a backwards compatible way. Change:
 152843957

---
 tensorflow/core/ops/array_ops.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 0cdad3a175..e0f448d1c1 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -2770,11 +2770,9 @@ shape: (Optional) The shape of the tensor. If the shape has 0 dimensions, the
   shape is unconstrained.
 )doc");
 
-// This version fixes an issue with the original version of Placeholder
-// where the empty shape attribute "[]" was used to denote
-// an unknown shape.  This meant that scalars (added later) could
-// not be represented natively.  This new version fixes that
-// limitation.
+// Placeholder was modified in a backwards compatible way to do what
+// PlaceholderV2 did, so we have deprecated V2 (no one was really
+// using it).
 REGISTER_OP("PlaceholderV2")
     .Output("output: dtype")
     .Attr("dtype: type")
@@ -2787,6 +2785,7 @@ REGISTER_OP("PlaceholderV2")
       c->set_output(0, output);
       return Status::OK();
     })
+    .Deprecated(23, "Placeholder now behaves the same as PlaceholderV2.")
     .Doc(R"doc(
 A placeholder op for a value that will be fed into the computation.
 
-- 
GitLab


From f8efe38ed32378b7bcddfabc12b1ee8260d07de8 Mon Sep 17 00:00:00 2001
From: Vincent Zhao <kumasento@users.noreply.github.com>
Date: Tue, 11 Apr 2017 20:53:23 +0100
Subject: [PATCH 0318/1563] Update quantization.md (#9133)

A simple typo in the quantization documentation.
---
 tensorflow/docs_src/performance/quantization.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/docs_src/performance/quantization.md b/tensorflow/docs_src/performance/quantization.md
index 86d2b92494..ad23bab443 100644
--- a/tensorflow/docs_src/performance/quantization.md
+++ b/tensorflow/docs_src/performance/quantization.md
@@ -91,8 +91,8 @@ eight-bit computations:
 ```sh
 curl http://download.tensorflow.org/models/image/imagenet/inception-2015-12-05.tgz -o /tmp/inceptionv3.tgz
 tar xzf /tmp/inceptionv3.tgz -C /tmp/
-bazel build tensorflow/tools/quantization/tools:quantize_graph
-bazel-bin/tensorflow/tools/quantization/tools/quantize_graph \
+bazel build tensorflow/tools/quantization:quantize_graph
+bazel-bin/tensorflow/tools/quantization/quantize_graph \
   --input=/tmp/classify_image_graph_def.pb \
   --output_node_names="softmax" --output=/tmp/quantized_graph.pb \
   --mode=eightbit
-- 
GitLab


From f30f73c0a24a09f0ff1432011f1c9690bf719651 Mon Sep 17 00:00:00 2001
From: Vit Stepanovs <vistepan@microsoft.com>
Date: Tue, 11 Apr 2017 13:03:40 -0700
Subject: [PATCH 0319/1563] [CMake] Optionally support building TF as a shared
 lib (#9124)

* [CMake] Make tools build in GPU build

* [CMake] Allow building TensorFlow as a shared library
---
 tensorflow/contrib/cmake/CMakeLists.txt       |  7 +-
 tensorflow/contrib/cmake/tf_c.cmake           | 11 +++
 tensorflow/contrib/cmake/tf_python.cmake      | 28 +++----
 tensorflow/contrib/cmake/tf_shared_lib.cmake  | 73 +++++++++++++++++
 tensorflow/contrib/cmake/tf_tools.cmake       |  9 +++
 .../contrib/cmake/tools/create_def_file.py    | 78 +++++++++++++------
 6 files changed, 169 insertions(+), 37 deletions(-)
 create mode 100644 tensorflow/contrib/cmake/tf_c.cmake
 create mode 100644 tensorflow/contrib/cmake/tf_shared_lib.cmake

diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index e27df6898e..4606d317d7 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -29,6 +29,7 @@ option(tensorflow_BUILD_ALL_KERNELS "Build all OpKernels" ON)
 option(tensorflow_BUILD_CONTRIB_KERNELS "Build OpKernels from tensorflow/contrib/..." ON)
 option(tensorflow_BUILD_CC_TESTS "Build cc unit tests " OFF)
 option(tensorflow_BUILD_PYTHON_TESTS "Build python unit tests " OFF)
+option(tensorflow_BUILD_SHARED_LIB "Build TensorFlow as a shared library" OFF)
 option(tensorflow_OPTIMIZE_FOR_NATIVE_ARCH "Enable compiler optimizations for the native processor architecture (if available)" ON)
 option(tensorflow_WIN_CPU_SIMD_OPTIONS "Enables CPU SIMD instructions")
 
@@ -241,6 +242,7 @@ include(tf_core_kernels.cmake)
 if(tensorflow_ENABLE_GRPC_SUPPORT)
   include(tf_core_distributed_runtime.cmake)
 endif()
+include(tf_c.cmake)
 include(tf_cc_ops.cmake)
 if(tensorflow_BUILD_CC_EXAMPLE)
   include(tf_tutorials.cmake)
@@ -251,6 +253,9 @@ if(tensorflow_BUILD_PYTHON_BINDINGS)
   include(tensorboard)
   include(tf_python.cmake)
 endif()
-if (tensorflow_BUILD_CC_TESTS OR tensorflow_BUILD_PYTHON_TESTS)
+if(tensorflow_BUILD_SHARED_LIB)
+  include(tf_shared_lib.cmake)
+endif()
+if(tensorflow_BUILD_CC_TESTS OR tensorflow_BUILD_PYTHON_TESTS)
   include(tf_tests.cmake)
 endif()
diff --git a/tensorflow/contrib/cmake/tf_c.cmake b/tensorflow/contrib/cmake/tf_c.cmake
new file mode 100644
index 0000000000..efe832acae
--- /dev/null
+++ b/tensorflow/contrib/cmake/tf_c.cmake
@@ -0,0 +1,11 @@
+set(tf_c_srcs
+    "${tensorflow_source_dir}/tensorflow/c/c_api.cc"
+    "${tensorflow_source_dir}/tensorflow/c/c_api.h"
+    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.cc"
+    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.h"
+    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.cc"
+    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.h"
+)
+
+add_library(tf_c OBJECT ${tf_c_srcs})
+add_dependencies(tf_c tf_core_lib tf_protos_cc)
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 178e03c222..1c81cd6ecc 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -669,12 +669,6 @@ set (pywrap_tensorflow_internal_src
     "${tensorflow_source_dir}/tensorflow/python/lib/io/py_record_writer.cc"
     "${tensorflow_source_dir}/tensorflow/python/util/kernel_registry.h"
     "${tensorflow_source_dir}/tensorflow/python/util/kernel_registry.cc"
-    "${tensorflow_source_dir}/tensorflow/c/c_api.cc"
-    "${tensorflow_source_dir}/tensorflow/c/c_api.h"
-    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.cc"
-    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.h"
-    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.cc"
-    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.h"
     "${CMAKE_CURRENT_BINARY_DIR}/pywrap_tensorflow_internal.cc"
 )
 
@@ -690,6 +684,7 @@ if(WIN32)
     #
     add_library(pywrap_tensorflow_internal_static STATIC
         ${pywrap_tensorflow_internal_src}
+        $<TARGET_OBJECTS:tf_c>
         $<TARGET_OBJECTS:tf_core_lib>
         $<TARGET_OBJECTS:tf_core_cpu>
         $<TARGET_OBJECTS:tf_core_framework>
@@ -701,30 +696,36 @@ if(WIN32)
         $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
         $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
     )
+    
     target_include_directories(pywrap_tensorflow_internal_static PUBLIC
         ${PYTHON_INCLUDE_DIR}
         ${NUMPY_INCLUDE_DIR}
     )
-    target_link_libraries(pywrap_tensorflow_internal_static
-        tf_protos_cc
-        tf_python_protos_cc
+    
+    add_dependencies(pywrap_tensorflow_internal_static tf_protos_cc tf_python_protos_cc)
+    set(pywrap_tensorflow_internal_static_dependencies
+        $<TARGET_FILE:pywrap_tensorflow_internal_static>
+        $<TARGET_FILE:tf_protos_cc>
+        $<TARGET_FILE:tf_python_protos_cc>
     )
+    
     set(pywrap_tensorflow_deffile "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pywrap_tensorflow.def")
     set_source_files_properties(${pywrap_tensorflow_deffile} PROPERTIES GENERATED TRUE)
 
     add_custom_command(TARGET pywrap_tensorflow_internal_static POST_BUILD
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/create_def_file.py
-            --input $<TARGET_FILE:pywrap_tensorflow_internal_static>
-            --output ${pywrap_tensorflow_deffile}
+            --input "${pywrap_tensorflow_internal_static_dependencies}"
+            --output "${pywrap_tensorflow_deffile}"
+            --target _pywrap_tensorflow_internal.pyd
     )
 endif(WIN32)
 
-
 # pywrap_tensorflow_internal is a shared library containing all of the
 # TensorFlow runtime and the standard ops and kernels. These are installed into
 # tf_python/tensorflow/python/.
 add_library(pywrap_tensorflow_internal SHARED
     ${pywrap_tensorflow_internal_src}
+    $<TARGET_OBJECTS:tf_c>
     $<TARGET_OBJECTS:tf_core_lib>
     $<TARGET_OBJECTS:tf_core_cpu>
     $<TARGET_OBJECTS:tf_core_framework>
@@ -746,7 +747,8 @@ target_include_directories(pywrap_tensorflow_internal PUBLIC
     ${PYTHON_INCLUDE_DIR}
     ${NUMPY_INCLUDE_DIR}
 )
-target_link_libraries(pywrap_tensorflow_internal
+
+target_link_libraries(pywrap_tensorflow_internal PRIVATE
     ${tf_core_gpu_kernels_lib}
     ${tensorflow_EXTERNAL_LIBRARIES}
     tf_protos_cc
diff --git a/tensorflow/contrib/cmake/tf_shared_lib.cmake b/tensorflow/contrib/cmake/tf_shared_lib.cmake
new file mode 100644
index 0000000000..55eb43c4c0
--- /dev/null
+++ b/tensorflow/contrib/cmake/tf_shared_lib.cmake
@@ -0,0 +1,73 @@
+if(WIN32)
+  # Windows: build a static library with the same objects as tensorflow.dll.
+  # This can be used to build for a standalone exe and also helps us to
+  # find all symbols that need to be exported from the dll which is needed
+  # to provide the tensorflow c/c++ api in tensorflow.dll.
+  # From the static library we create the def file with all symbols that need to
+  # be exported from tensorflow.dll. Because there is a limit of 64K sybmols
+  # that can be exported, we filter the symbols with a python script to the namespaces
+  # we need.
+  #
+  add_library(tensorflow_static STATIC
+      $<TARGET_OBJECTS:tf_c>
+      $<TARGET_OBJECTS:tf_cc>
+      $<TARGET_OBJECTS:tf_cc_framework>
+      $<TARGET_OBJECTS:tf_cc_ops>
+      $<TARGET_OBJECTS:tf_core_lib>
+      $<TARGET_OBJECTS:tf_core_cpu>
+      $<TARGET_OBJECTS:tf_core_framework>
+      $<TARGET_OBJECTS:tf_core_ops>
+      $<TARGET_OBJECTS:tf_core_direct_session>
+      $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
+      $<$<BOOL:${tensorflow_ENABLE_GRPC_SUPPORT}>:$<TARGET_OBJECTS:tf_core_distributed_runtime>>
+      $<TARGET_OBJECTS:tf_core_kernels>
+      $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+      $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
+  )
+
+  add_dependencies(tensorflow_static tf_protos_cc)
+  set(tensorflow_static_dependencies
+      $<TARGET_FILE:tensorflow_static>
+      $<TARGET_FILE:tf_protos_cc>
+  )
+    
+  set(tensorflow_deffile "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/tensorflow.def")
+  set_source_files_properties(${tensorflow_deffile} PROPERTIES GENERATED TRUE)
+
+  add_custom_command(TARGET tensorflow_static POST_BUILD
+      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/create_def_file.py
+          --input "${tensorflow_static_dependencies}"
+          --output "${tensorflow_deffile}"
+          --target tensorflow.dll
+  )
+endif(WIN32)
+
+# tensorflow is a shared library containing all of the
+# TensorFlow runtime and the standard ops and kernels.
+add_library(tensorflow SHARED
+    $<TARGET_OBJECTS:tf_c>
+    $<TARGET_OBJECTS:tf_cc>
+    $<TARGET_OBJECTS:tf_cc_framework>
+    $<TARGET_OBJECTS:tf_cc_ops>
+    $<TARGET_OBJECTS:tf_core_lib>
+    $<TARGET_OBJECTS:tf_core_cpu>
+    $<TARGET_OBJECTS:tf_core_framework>
+    $<TARGET_OBJECTS:tf_core_ops>
+    $<TARGET_OBJECTS:tf_core_direct_session>
+    $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
+    $<$<BOOL:${tensorflow_ENABLE_GRPC_SUPPORT}>:$<TARGET_OBJECTS:tf_core_distributed_runtime>>
+    $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
+    ${tensorflow_deffile}
+)
+
+target_link_libraries(tensorflow PRIVATE
+    ${tf_core_gpu_kernels_lib}
+    ${tensorflow_EXTERNAL_LIBRARIES}
+    tf_protos_cc
+)
+
+if(WIN32)
+  add_dependencies(tensorflow tensorflow_static)
+endif(WIN32)
diff --git a/tensorflow/contrib/cmake/tf_tools.cmake b/tensorflow/contrib/cmake/tf_tools.cmake
index 636caf5f3d..511e6bb0e6 100644
--- a/tensorflow/contrib/cmake/tf_tools.cmake
+++ b/tensorflow/contrib/cmake/tf_tools.cmake
@@ -59,10 +59,13 @@ add_executable(${transform_graph}
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
     $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
 )
 
 target_link_libraries(${transform_graph} PUBLIC
   tf_protos_cc
+  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
@@ -78,10 +81,13 @@ add_executable(${summarize_graph}
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
     $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
 )
 
 target_link_libraries(${summarize_graph} PUBLIC
   tf_protos_cc
+  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
@@ -97,10 +103,13 @@ add_executable(${compare_graphs}
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
     $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
 )
 
 target_link_libraries(${compare_graphs} PUBLIC
   tf_protos_cc
+  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
diff --git a/tensorflow/contrib/cmake/tools/create_def_file.py b/tensorflow/contrib/cmake/tools/create_def_file.py
index ebdc918168..9bd287d0d7 100644
--- a/tensorflow/contrib/cmake/tools/create_def_file.py
+++ b/tensorflow/contrib/cmake/tools/create_def_file.py
@@ -47,8 +47,16 @@ DUMPBIN = "dumpbin.exe"
 EXCLUDE_RE = re.compile(r"deleting destructor|::internal::")
 
 # Include if matched before exclude
-INCLUDEPRE_RE = re.compile(r"tensorflow::internal::LogMessage|"
-                           r"tensorflow::internal::CheckOpMessageBuilder")
+INCLUDEPRE_RE = re.compile(r"google::protobuf::internal::ExplicitlyConstructed|"
+                           r"tensorflow::internal::LogMessage|"
+                           r"tensorflow::internal::LogString|"
+                           r"tensorflow::internal::CheckOpMessageBuilder|"
+                           r"tensorflow::internal::PickUnusedPortOrDie|"
+                           r"tensorflow::internal::ValidateDevice|"
+                           r"tensorflow::ops::internal::Enter|"
+                           r"tensorflow::strings::internal::AppendPieces|"
+                           r"tensorflow::strings::internal::CatPieces|"
+                           r"tensorflow::io::internal::JoinPathImpl")
 
 # Include if matched after exclude
 INCLUDE_RE = re.compile(r"^(TF_\w*)$|"
@@ -56,12 +64,27 @@ INCLUDE_RE = re.compile(r"^(TF_\w*)$|"
                         r"functor::|"
                         r"perftools::gputools")
 
-
+# We want to identify data members explicitly in the DEF file, so that no one
+# can implicitly link against the DLL if they use one of the variables exported
+# from the DLL and the header they use does not decorate the symbol with
+# __declspec(dllimport). It is easier to detect what a data symbol does 
+# NOT look like, so doing it with the below regex.
+DATA_EXCLUDE_RE = re.compile(r"[)(]|"
+                             r"vftable|"
+                             r"vbtable|"
+                             r"vcall|"
+                             r"RTTI|"
+                             r"protobuf::internal::ExplicitlyConstructed")
+      
 def get_args():
   """Parse command line."""
+  filename_list = lambda x: x.split(";")
   parser = argparse.ArgumentParser()
-  parser.add_argument("--input", help="input library", required=True)
+  parser.add_argument("--input", type=filename_list,
+                      help="paths to input libraries separated by semicolons",
+                      required=True)
   parser.add_argument("--output", help="output deffile", required=True)
+  parser.add_argument("--target", help="name of the target", required=True)
   args = parser.parse_args()
   return args
 
@@ -70,25 +93,26 @@ def main():
   """main."""
   args = get_args()
 
-  # Pipe dumpbin to extract all linkable symbols from a lib.
+  # Pipe dumpbin to extract all linkable symbols from libs.
   # Good symbols are collected in candidates and also written to
   # a temp file.
   candidates = []
   tmpfile = tempfile.NamedTemporaryFile(mode="w", delete=False)
-  proc = subprocess.Popen([DUMPBIN, "/nologo", "/linkermember:1", args.input],
-                          stdout=subprocess.PIPE)
-  for line in io.TextIOWrapper(proc.stdout, encoding="utf-8"):
-    cols = line.split()
-    if len(cols) < 2:
-      continue
-    sym = cols[1]
-    tmpfile.file.write(sym + "\n")
-    candidates.append(sym)
+  for lib_path in args.input:
+    proc = subprocess.Popen([DUMPBIN, "/nologo", "/linkermember:1", lib_path],
+                            stdout=subprocess.PIPE)
+    for line in io.TextIOWrapper(proc.stdout, encoding="utf-8"):
+      cols = line.split()
+      if len(cols) < 2:
+        continue
+      sym = cols[1]
+      tmpfile.file.write(sym + "\n")
+      candidates.append(sym)
+    exit_code = proc.wait()
+    if exit_code != 0:
+      print("{} failed, exit={}".format(DUMPBIN, exit_code))
+      return exit_code
   tmpfile.file.close()
-  exit_code = proc.wait()
-  if exit_code != 0:
-    print("{} failed, exit={}".format(DUMPBIN, exit_code))
-    return exit_code
 
   # Run the symbols through undname to get their undecorated name
   # so we can filter on something readable.
@@ -96,9 +120,8 @@ def main():
     # track dupes
     taken = set()
 
-    # Header for the def file. Since the tensorflow.dll is actually called
-    # _pywrap_tensorflow.pyd in the python wheel, hint that in the def file.
-    def_fp.write("LIBRARY _pywrap_tensorflow_internal.pyd\n")
+    # Header for the def file.
+    def_fp.write("LIBRARY " + args.target + "\n")
     def_fp.write("EXPORTS\n")
     def_fp.write("\t ??1OpDef@tensorflow@@UEAA@XZ\n")
 
@@ -118,8 +141,17 @@ def main():
           continue
         if not INCLUDE_RE.search(line):
           continue
-
-      def_fp.write("\t" + decorated + "\n")
+          
+      if "deleting destructor" in line:
+        # Some of the symbols convered by INCLUDEPRE_RE export deleting
+        # destructor symbols, which is a bad idea.
+        # So we filter out such symbols here.
+        continue
+          
+      if DATA_EXCLUDE_RE.search(line):
+        def_fp.write("\t" + decorated + "\n")
+      else:
+        def_fp.write("\t" + decorated + " DATA\n")      
       taken.add(decorated)
   exit_code = proc.wait()
   if exit_code != 0:
-- 
GitLab


From 154b2169456cf61c630a58da4b90015a32562d1c Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Tue, 11 Apr 2017 13:57:21 -0800
Subject: [PATCH 0320/1563] Add tf.unsorted_segment_sum GPU kernel for
 complex64/complex128. Change: 152864723

---
 .../core/kernels/segment_reduction_ops.cc     |  2 +
 .../kernels/segment_reduction_ops_gpu.cu.cc   | 32 ++++++-
 .../segment_reduction_ops_test.py             | 92 ++++++++++---------
 3 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/tensorflow/core/kernels/segment_reduction_ops.cc b/tensorflow/core/kernels/segment_reduction_ops.cc
index fffe8cd18e..9cdbe89457 100644
--- a/tensorflow/core/kernels/segment_reduction_ops.cc
+++ b/tensorflow/core/kernels/segment_reduction_ops.cc
@@ -407,6 +407,8 @@ REGISTER_COMPLEX_CPU_UNSORTED_KERNELS_ALL(complex128);
   REGISTER_GPU_UNSORTED_KERNELS(type, int64);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_UNSORTED_KERNELS_ALL);
+TF_CALL_complex64(REGISTER_GPU_UNSORTED_KERNELS_ALL);
+TF_CALL_complex128(REGISTER_GPU_UNSORTED_KERNELS_ALL);
 #undef REGISTER_GPU_UNSORTED_KERNELS
 #undef REGISTER_GPU_UNSORTED_KERNELS_ALL
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc b/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
index 5f53f098aa..3848832f38 100644
--- a/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
@@ -28,6 +28,34 @@ namespace tensorflow {
 
 using GPUDevice = Eigen::GpuDevice;
 
+// Helper for UnusortedSegmentSumCustomKernel that adds value into dest
+// atomically.
+template <typename T>
+static __device__ __forceinline__ void AccumulateInto(T* dest, const T& value) {
+  CudaAtomicAdd(dest, value);
+}
+
+// Specializations of AccumulateInto for complex types, which CudaAtomicAdd does
+// not support. We treat a std::complex<T>* as a T* (the C++ standard section
+// 26.4.4 allows this explicitly) and atomic add the real and imaginary
+// components individually. The operation as a whole is not atomic, but we can
+// safely treat the components independently for the purpose of accumulating.
+template <>
+__device__ __forceinline__ void AccumulateInto(
+    std::complex<float>* dest, const std::complex<float>& value) {
+  auto dest_scalar = reinterpret_cast<float*>(dest);
+  CudaAtomicAdd(dest_scalar, value.real());
+  CudaAtomicAdd(dest_scalar + 1, value.imag());
+}
+
+template <>
+__device__ __forceinline__ void AccumulateInto(
+    std::complex<double>* dest, const std::complex<double>& value) {
+  auto dest_scalar = reinterpret_cast<double*>(dest);
+  CudaAtomicAdd(dest_scalar, value.real());
+  CudaAtomicAdd(dest_scalar + 1, value.imag());
+}
+
 // UnsortedSegmentSumFunctor kernel processes 'input_total_size' elements.
 // Each element is mapped from input to output by a combination of its
 // 'segment_ids' mapping and 'inner_dim_size'.
@@ -48,7 +76,7 @@ __global__ void UnsortedSegmentSumCustomKernel(
     }
     const Index output_index =
         output_segment_index * inner_dim_size + segment_offset;
-    CudaAtomicAdd(output + output_index, ldg(input + input_index));
+    AccumulateInto<T>(output + output_index, ldg(input + input_index));
   }
 }
 
@@ -99,6 +127,8 @@ struct UnsortedSegmentSumFunctor<GPUDevice, T, Index>: UnsortedSegmentBaseFuncto
   DEFINE_GPU_SPECS_INDEX(T, int64);
 
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
+TF_CALL_complex64(DEFINE_GPU_SPECS);
+TF_CALL_complex128(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 #undef DEFINE_GPU_SPECS_INDEX
diff --git a/tensorflow/python/kernel_tests/segment_reduction_ops_test.py b/tensorflow/python/kernel_tests/segment_reduction_ops_test.py
index fead455bfa..33269c9123 100644
--- a/tensorflow/python/kernel_tests/segment_reduction_ops_test.py
+++ b/tensorflow/python/kernel_tests/segment_reduction_ops_test.py
@@ -36,8 +36,11 @@ class SegmentReductionHelper(test.TestCase):
       num_elem *= x
     values = np.arange(1, num_elem + 1)
     np_values = values.reshape(input_shape).astype(dtype.as_numpy_dtype)
+    # Add a non-zero imaginary component to complex types.
+    if dtype.is_complex:
+      np_values -= 1j * np_values
     return constant_op.constant(
-        values, shape=input_shape, dtype=dtype), np_values
+        np_values, shape=input_shape, dtype=dtype), np_values
 
   def _segmentReduce(self, indices, x, op1, op2=None, num_out_rows=None):
     if not x.size:
@@ -228,11 +231,10 @@ class SegmentReductionOpTest(SegmentReductionHelper):
             s, [3, 4],
             x_init_value=np_x.astype(np.double),
             delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+      self.assertAllClose(jacob_t, jacob_n)
 
 
 class UnsortedSegmentSumTest(SegmentReductionHelper):
-  use_gpu = False
 
   def testValues(self):
     dtypes = [
@@ -244,7 +246,7 @@ class UnsortedSegmentSumTest(SegmentReductionHelper):
     for indices in indices_flat, indices_flat.reshape(5, 2):
       shape = indices.shape + (2,)
       for dtype in dtypes:
-        with self.test_session(use_gpu=self.use_gpu):
+        with self.test_session(use_gpu=True):
           tf_x, np_x = self._input(shape, dtype=dtype)
           np_ans = self._segmentReduce(
               indices, np_x, np.add, op2=None, num_out_rows=num_segments)
@@ -258,19 +260,21 @@ class UnsortedSegmentSumTest(SegmentReductionHelper):
     num_cols = 2
     indices_flat = np.array([0, 4, 0, 8, 3, 8, 4, 7, 7, 3])
     num_segments = max(indices_flat) + 3
-    for indices in indices_flat, indices_flat.reshape(5, 2):
-      shape = indices.shape + (num_cols,)
-      with self.test_session(use_gpu=self.use_gpu):
-        tf_x, np_x = self._input(shape, dtype=dtypes_lib.float64)
-        s = math_ops.unsorted_segment_sum(
-            data=tf_x, segment_ids=indices, num_segments=num_segments)
-        jacob_t, jacob_n = gradient_checker.compute_gradient(
-            tf_x,
-            shape,
-            s, [num_segments, num_cols],
-            x_init_value=np_x.astype(np.double),
-            delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+    for dtype in [dtypes_lib.float32, dtypes_lib.float64, dtypes_lib.complex64,
+                  dtypes_lib.complex128]:
+      for indices in indices_flat, indices_flat.reshape(5, 2):
+        shape = indices.shape + (num_cols,)
+        with self.test_session(use_gpu=True):
+          tf_x, np_x = self._input(shape, dtype=dtype)
+          s = math_ops.unsorted_segment_sum(
+              data=tf_x, segment_ids=indices, num_segments=num_segments)
+          jacob_t, jacob_n = gradient_checker.compute_gradient(
+              tf_x,
+              shape,
+              s, [num_segments, num_cols],
+              x_init_value=np_x,
+              delta=1)
+        self.assertAllClose(jacob_t, jacob_n)
 
   def testGradientMatchesSegmentSum(self):
     # Strategy: compute the gradient for UnsortedSegmentSum and SegmentSum
@@ -283,27 +287,28 @@ class UnsortedSegmentSumTest(SegmentReductionHelper):
     num_cols = 2
     shape = [n, num_cols]
     num_segments = max(indices) + 1
-    with self.test_session(use_gpu=self.use_gpu):
-      tf_x, np_x = self._input(shape, dtype=dtypes_lib.float64)
-      # Results from UnsortedSegmentSum
-      unsorted_s = math_ops.unsorted_segment_sum(
-          data=tf_x, segment_ids=indices, num_segments=num_segments)
-      (unsorted_jacob_t, unsorted_jacob_n) = gradient_checker.compute_gradient(
-          tf_x,
-          shape,
-          unsorted_s, [num_segments, num_cols],
-          x_init_value=np_x.astype(np.double),
-          delta=1)
-      # Results from SegmentSum
-      sorted_s = math_ops.segment_sum(data=tf_x, segment_ids=indices)
-      sorted_jacob_t, sorted_jacob_n = gradient_checker.compute_gradient(
-          tf_x,
-          shape,
-          sorted_s, [num_segments, num_cols],
-          x_init_value=np_x.astype(np.double),
-          delta=1)
-    self.assertAllClose(unsorted_jacob_t, sorted_jacob_t, rtol=1e-3, atol=1e-3)
-    self.assertAllClose(unsorted_jacob_n, sorted_jacob_n, rtol=1e-3, atol=1e-3)
+    for dtype in [dtypes_lib.float32, dtypes_lib.float64, dtypes_lib.complex64,
+                  dtypes_lib.complex128]:
+      with self.test_session(use_gpu=True):
+        tf_x, np_x = self._input(shape, dtype=dtype)
+        # Results from UnsortedSegmentSum
+        unsorted_s = math_ops.unsorted_segment_sum(
+            data=tf_x, segment_ids=indices, num_segments=num_segments)
+        unsorted_jacob_t, unsorted_jacob_n = (
+            gradient_checker.compute_gradient(tf_x, shape, unsorted_s,
+                                              [num_segments, num_cols],
+                                              x_init_value=np_x, delta=1))
+
+        # Results from SegmentSum
+        sorted_s = math_ops.segment_sum(data=tf_x, segment_ids=indices)
+        sorted_jacob_t, sorted_jacob_n = gradient_checker.compute_gradient(
+            tf_x,
+            shape,
+            sorted_s, [num_segments, num_cols],
+            x_init_value=np_x,
+            delta=1)
+      self.assertAllClose(unsorted_jacob_t, sorted_jacob_t)
+      self.assertAllClose(unsorted_jacob_n, sorted_jacob_n)
 
   def testBadIndices(self):
     # Note: GPU kernel does not return the out-of-range error needed for this
@@ -319,7 +324,7 @@ class UnsortedSegmentSumTest(SegmentReductionHelper):
     dtypes = [
         np.float32, np.float64, np.int64, np.int32, np.complex64, np.complex128
     ]
-    with self.test_session(use_gpu=self.use_gpu):
+    with self.test_session(use_gpu=True):
       for dtype in dtypes:
         for itype in (np.int32, np.int64):
           data = np.zeros((2, 0), dtype=dtype)
@@ -333,7 +338,7 @@ class UnsortedSegmentSumTest(SegmentReductionHelper):
     num_segments = max(indices_flat) + 3
     for indices in indices_flat, indices_flat.reshape(5, 2):
       shape = indices.shape + (num_cols,)
-      with self.test_session():
+      with self.test_session(use_gpu=True):
         tf_x, np_x = self._input(shape, dtype=dtypes_lib.float64)
         s = math_ops.unsorted_segment_max(data=tf_x, segment_ids=indices,
                                     num_segments=num_segments)
@@ -343,10 +348,7 @@ class UnsortedSegmentSumTest(SegmentReductionHelper):
             s,
             [num_segments, num_cols],
             x_init_value=np_x.astype(np.double), delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
-
-class UnsortedSegmentSumGpuTest(UnsortedSegmentSumTest):
-  use_gpu = True
+      self.assertAllClose(jacob_t, jacob_n)
 
 
 class SparseSegmentReductionHelper(SegmentReductionHelper):
@@ -539,7 +541,7 @@ class SparseSegmentReductionOpTest(SparseSegmentReductionHelper):
             s, [3, 4],
             x_init_value=np_x.astype(np.double),
             delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+      self.assertAllClose(jacob_t, jacob_n)
 
   def testGradientValid(self):
     # Baseline for the testGradient*Invalid* methods below.
-- 
GitLab


From 43acf393020106400b7fc123d76aadea62a939dd Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Tue, 11 Apr 2017 14:05:42 -0800
Subject: [PATCH 0321/1563] Update the docstring of tuner. Change: 152866121

---
 tensorflow/contrib/training/python/training/tuner.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/training/python/training/tuner.py b/tensorflow/contrib/training/python/training/tuner.py
index b724c84c54..8843632619 100644
--- a/tensorflow/contrib/training/python/training/tuner.py
+++ b/tensorflow/contrib/training/python/training/tuner.py
@@ -29,11 +29,11 @@ class Tuner(object):
 
   Example:
   ```
-    def _create_my_experiment(config, hparams):
+    def _create_my_experiment(run_config, hparams):
       hidden_units = [hparams.unit_per_layer] * hparams.num_hidden_layers
 
       return tf.contrib.learn.Experiment(
-          estimator=DNNClassifier(config=config, hidden_units=hidden_units),
+          estimator=DNNClassifier(config=run_config, hidden_units=hidden_units),
           train_input_fn=my_train_input,
           eval_input_fn=my_eval_input)
 
@@ -79,7 +79,7 @@ class Tuner(object):
 
     Args:
       experiment_fn: A function that creates an `Experiment`. It should accept
-        an argument `config` which should be used to create the `Estimator`
+        an argument `run_config` which should be used to create the `Estimator`
         (passed as `config` to its constructor), and an argument `hparams`,
         which should be used for hyper-parameters tuning. It must return an
         `Experiment`.
-- 
GitLab


From 846a6222e622818286934954347a14c807a11c88 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Tue, 11 Apr 2017 14:11:34 -0800
Subject: [PATCH 0322/1563] Docs: Tutorial formatting and links fix

Fixes #9092
(When accompanied by changes to the www.tensorflow.org/code redirects to point
to the appropriate release branch on github)
Change: 152866886
---
 tensorflow/docs_src/tutorials/wide.md          |  5 ++---
 tensorflow/docs_src/tutorials/wide_and_deep.md | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tensorflow/docs_src/tutorials/wide.md b/tensorflow/docs_src/tutorials/wide.md
index 1b72ba0746..e530e6e1ac 100644
--- a/tensorflow/docs_src/tutorials/wide.md
+++ b/tensorflow/docs_src/tutorials/wide.md
@@ -14,8 +14,7 @@ To try the code for this tutorial:
 
 1.  @{$install$Install TensorFlow} if you haven't already.
 
-2.  Download [the tutorial code](
-https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/learn/wide_n_deep_tutorial.py).
+2.  Download [the tutorial code](https://www.tensorflow.org/code/tensorflow/examples/learn/wide_n_deep_tutorial.py).
 
 3.  Install the pandas data analysis library. tf.learn doesn't require pandas, but it does support it, and this tutorial uses pandas. To install pandas:
     1. Get `pip`:
@@ -387,7 +386,7 @@ which means the accuracy is 83.6%. Feel free to try more features and
 transformations and see if you can do even better!
 
 If you'd like to see a working end-to-end example, you can download our
-[example code](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/learn/wide_n_deep_tutorial.py)
+[example code](https://www.tensorflow.org/code/tensorflow/examples/learn/wide_n_deep_tutorial.py).
 and set the `model_type` flag to `wide`.
 
 ## Adding Regularization to Prevent Overfitting
diff --git a/tensorflow/docs_src/tutorials/wide_and_deep.md b/tensorflow/docs_src/tutorials/wide_and_deep.md
index dd830eeca9..bae934b3f4 100644
--- a/tensorflow/docs_src/tutorials/wide_and_deep.md
+++ b/tensorflow/docs_src/tutorials/wide_and_deep.md
@@ -39,14 +39,14 @@ And that's it! Let's go through a simple example.
 
 To try the code for this tutorial:
 
-1.  @{$install$Install TensorFlow}[Install TensorFlow]  if you haven't already.
+1.  @{$install$Install TensorFlow} if you haven't already.
 
-2.  Download [the tutorial code](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/learn/wide_n_deep_tutorial.py).
+2.  Download [the tutorial code](https://www.tensorflow.org/code/tensorflow/examples/learn/wide_n_deep_tutorial.py).
 
 3.  Install the pandas data analysis library. tf.learn doesn't require pandas, but it does support it, and this tutorial uses pandas. To install pandas:
     1. Get `pip`:
 
-       ```shell
+       ```bsh
        # Ubuntu/Linux 64-bit
        $ sudo apt-get install python-pip python-dev
 
@@ -57,7 +57,7 @@ To try the code for this tutorial:
 
     2. Use `pip` to install pandas:
 
-       ```shell
+       ```bsh
        $ sudo pip install pandas
        ```
 
@@ -262,7 +262,7 @@ The first line of the output should be something like `accuracy: 0.84429705`. We
 can see that the accuracy was improved from about 83.6% using a wide-only linear
 model to about 84.4% using a Wide & Deep model. If you'd like to see a working
 end-to-end example, you can download our
-[example code](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/learn/wide_n_deep_tutorial.py).
+[example code](https://www.tensorflow.org/code/tensorflow/examples/learn/wide_n_deep_tutorial.py).
 
 Note that this tutorial is just a quick example on a small dataset to get you
 familiar with the API. Wide & Deep Learning will be even more powerful if you
-- 
GitLab


From b8b8ebcf851df71ebb5209ae27d75e2befc50f0d Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Tue, 11 Apr 2017 14:12:32 -0800
Subject: [PATCH 0323/1563] Backport fixes and improvements from external
 Keras. Change: 152867002

---
 tensorflow/contrib/keras/BUILD                |   1 +
 .../contrib/keras/python/keras/backend.py     |  17 +-
 .../contrib/keras/python/keras/callbacks.py   |  80 +++++-
 .../keras/python/keras/datasets/imdb.py       |   8 +-
 .../keras/python/keras/engine/topology.py     | 229 +++++++++---------
 .../keras/python/keras/engine/training.py     | 104 ++++----
 .../python/keras/layers/convolutional.py      | 183 ++++++++------
 .../keras/python/keras/layers/embeddings.py   |   7 +-
 .../keras/python/keras/layers/local.py        |   5 +-
 .../keras/python/keras/layers/merge.py        |   8 +-
 .../python/keras/layers/normalization.py      |   4 +-
 .../keras/python/keras/layers/recurrent.py    |  26 +-
 .../keras/python/keras/layers/wrappers.py     |  58 ++++-
 .../contrib/keras/python/keras/models.py      |  14 +-
 .../contrib/keras/python/keras/optimizers.py  |   9 +-
 .../keras/python/keras/preprocessing/image.py |   4 +-
 .../keras/python/keras/preprocessing/text.py  |   4 +-
 .../keras/python/keras/utils/conv_utils.py    |  12 +-
 .../keras/python/keras/utils/data_utils.py    | 184 +++++++++++---
 .../keras/python/keras/utils/generic_utils.py |   4 +-
 20 files changed, 616 insertions(+), 345 deletions(-)

diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD
index 449b0a3f50..da320e22d8 100644
--- a/tensorflow/contrib/keras/BUILD
+++ b/tensorflow/contrib/keras/BUILD
@@ -107,6 +107,7 @@ py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
+        "//tensorflow/contrib/tensorboard:projector",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:check_ops",
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index b35ee5db09..e52b23843a 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -351,7 +351,8 @@ def get_session():
       _SESSION = session_module.Session(config=config)
     session = _SESSION
   if not _MANUAL_VAR_INIT:
-    _initialize_variables()
+    with session.graph.as_default():
+      _initialize_variables()
   return session
 
 
@@ -2898,13 +2899,14 @@ def in_top_k(predictions, targets, k):
   """Returns whether the `targets` are in the top `k` `predictions`.
 
   Arguments:
-      predictions: A tensor of shape `batch_size` x classes and type `float32`.
-      targets: A tensor of shape batch_size and type `int32` or `int64`.
+      predictions: A tensor of shape `(batch_size, classes)` and type `float32`.
+      targets: A 1D tensor of length `batch_size` and type `int32` or `int64`.
       k: An `int`, number of top elements to consider.
 
   Returns:
-      A tensor of shape `batch_size` and type `bool`. `output_i` is `True` if
-      `targets_i` is within top-k values of `predictions_i`
+      A 1D tensor of length `batch_size` and type `bool`.
+      `output[i]` is `True` if `predictions[i, targets[i]]` is within top-`k`
+      values of `predictions[i]`.
   """
   return nn.in_top_k(predictions, targets, k)
 
@@ -3452,8 +3454,9 @@ def ctc_label_dense_to_sparse(labels, label_lengths):
   max_num_labels_tns = array_ops.stack([label_shape[1]])
 
   def range_less_than(_, current_input):
-    return array_ops.expand_dims(math_ops.range(
-        label_shape[1]), 0) < array_ops.fill(max_num_labels_tns, current_input)
+    return array_ops.expand_dims(
+        math_ops.range(label_shape[1]), 0) < array_ops.fill(
+            max_num_labels_tns, current_input)
 
   init = math_ops.cast(
       array_ops.fill([1, label_shape[1]], 0), dtypes_module.bool)
diff --git a/tensorflow/contrib/keras/python/keras/callbacks.py b/tensorflow/contrib/keras/python/keras/callbacks.py
index 345db2791c..a533e0fbda 100644
--- a/tensorflow/contrib/keras/python/keras/callbacks.py
+++ b/tensorflow/contrib/keras/python/keras/callbacks.py
@@ -31,8 +31,10 @@ import numpy as np
 
 from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import Progbar
+from tensorflow.contrib.tensorboard.plugins import projector
 from tensorflow.python.ops import array_ops
 from tensorflow.python.summary import summary as tf_summary
+from tensorflow.python.training import saver as saver_lib
 
 
 # pylint: disable=g-import-not-at-top
@@ -108,9 +110,9 @@ class CallbackList(object):
     delta_t_median = np.median(self._delta_ts_batch_begin)
     if (self._delta_t_batch > 0. and
         delta_t_median > 0.95 * self._delta_t_batch and delta_t_median > 0.1):
-      warnings.warn('Method on_batch_begin() is slow compared '
-                    'to the batch update (%f). Check your callbacks.' %
-                    delta_t_median)
+      warnings.warn(
+          'Method on_batch_begin() is slow compared '
+          'to the batch update (%f). Check your callbacks.' % delta_t_median)
     self._t_enter_batch = time.time()
 
   def on_batch_end(self, batch, logs=None):
@@ -131,9 +133,9 @@ class CallbackList(object):
     delta_t_median = np.median(self._delta_ts_batch_end)
     if (self._delta_t_batch > 0. and
         (delta_t_median > 0.95 * self._delta_t_batch and delta_t_median > 0.1)):
-      warnings.warn('Method on_batch_end() is slow compared '
-                    'to the batch update (%f). Check your callbacks.' %
-                    delta_t_median)
+      warnings.warn(
+          'Method on_batch_end() is slow compared '
+          'to the batch update (%f). Check your callbacks.' % delta_t_median)
 
   def on_train_begin(self, logs=None):
     """Called at the beginning of training.
@@ -585,6 +587,7 @@ class LearningRateScheduler(Callback):
 
 
 class TensorBoard(Callback):
+  # pylint: disable=line-too-long
   """Tensorboard basic visualizations.
 
   This callback writes a log for TensorBoard, which allows
@@ -603,19 +606,36 @@ class TensorBoard(Callback):
           write_graph is set to True.
       write_images: whether to write model weights to visualize as
           image in Tensorboard.
+      embeddings_freq: frequency (in epochs) at which selected embedding
+          layers will be saved.
+      embeddings_layer_names: a list of names of layers to keep eye on. If
+          None or empty list all the embedding layer will be watched.
+      embeddings_metadata: a dictionary which maps layer name to a file name
+          in which metadata for this embedding layer is saved. See the
+          [details](https://www.tensorflow.org/how_tos/embedding_viz/#metadata_optional)
+          about metadata files format. In case if the same metadata file is
+          used for all embedding layers, string can be passed.
   """
 
+  # pylint: enable=line-too-long
+
   def __init__(self,
                log_dir='./logs',
                histogram_freq=0,
                write_graph=True,
-               write_images=False):
+               write_images=False,
+               embeddings_freq=0,
+               embeddings_layer_names=None,
+               embeddings_metadata=None):
     super(TensorBoard, self).__init__()
     self.log_dir = log_dir
     self.histogram_freq = histogram_freq
     self.merged = None
     self.write_graph = write_graph
     self.write_images = write_images
+    self.embeddings_freq = embeddings_freq
+    self.embeddings_layer_names = embeddings_layer_names
+    self.embeddings_metadata = embeddings_metadata or {}
 
   def set_model(self, model):
     self.model = model
@@ -644,6 +664,47 @@ class TensorBoard(Callback):
     else:
       self.writer = tf_summary.FileWriter(self.log_dir)
 
+    if self.embeddings_freq:
+      self.saver = saver_lib.Saver()
+
+      embeddings_layer_names = self.embeddings_layer_names
+
+      if not embeddings_layer_names:
+        embeddings_layer_names = [
+            layer.name for layer in self.model.layers
+            if type(layer).__name__ == 'Embedding'
+        ]
+
+      embeddings = {
+          layer.name: layer.weights[0]
+          for layer in self.model.layers if layer.name in embeddings_layer_names
+      }
+
+      embeddings_metadata = {}
+
+      if not isinstance(self.embeddings_metadata, str):
+        embeddings_metadata = self.embeddings_metadata
+      else:
+        embeddings_metadata = {
+            layer_name: self.embeddings_metadata
+            for layer_name in embeddings.keys()
+        }
+
+      config = projector.ProjectorConfig()
+      self.embeddings_logs = []
+
+      for layer_name, tensor in embeddings.items():
+        embedding = config.embeddings.add()
+        embedding.tensor_name = tensor.name
+
+        self.embeddings_logs.append(
+            os.path.join(self.log_dir, layer_name + '.ckpt'))
+
+        if layer_name in embeddings_metadata:
+          embedding.metadata_path = embeddings_metadata[layer_name]
+
+      projector.visualize_embeddings(self.writer, config)
+
   def on_epoch_end(self, epoch, logs=None):
     logs = logs or {}
 
@@ -663,6 +724,11 @@ class TensorBoard(Callback):
         summary_str = result[0]
         self.writer.add_summary(summary_str, epoch)
 
+    if self.embeddings_freq and self.embeddings_logs:
+      if epoch % self.embeddings_freq == 0:
+        for log in self.embeddings_logs:
+          self.saver.save(self.sess, log, epoch)
+
     for name, value in logs.items():
       if name in ['batch', 'size']:
         continue
diff --git a/tensorflow/contrib/keras/python/keras/datasets/imdb.py b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
index 2688e8bede..bafd92aca6 100644
--- a/tensorflow/contrib/keras/python/keras/datasets/imdb.py
+++ b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
@@ -100,10 +100,10 @@ def load_data(path='imdb.npz',
         new_labels.append(y)
     xs = new_xs
     labels = new_labels
-  if not xs:
-    raise ValueError('After filtering for sequences shorter than maxlen=' + str(
-        maxlen) + ', no sequence was kept. '
-                     'Increase maxlen.')
+    if not xs:
+      raise ValueError('After filtering for sequences shorter than maxlen=' +
+                       str(maxlen) + ', no sequence was kept. '
+                       'Increase maxlen.')
   if not num_words:
     num_words = max([max(x) for x in xs])
 
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index e33268235f..0d1812aaa2 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -283,7 +283,11 @@ class Layer(object):
     self._trainable_weights = []
     self._non_trainable_weights = []
     self._constraints = {}  # dict {tensor: constraint instance}
-    self.built = False
+    self._losses = []
+    self._updates = []
+    self._per_input_losses = {}
+    self._per_input_updates = {}
+    self._built = False
 
     # These lists will be filled via successive calls
     # to self._add_inbound_node().
@@ -340,6 +344,22 @@ class Layer(object):
     else:
       self._initial_weights = None
 
+  @property
+  def losses(self):
+    return self._losses
+
+  @property
+  def updates(self):
+    return self._updates
+
+  @property
+  def built(self):
+    return self._built
+
+  @built.setter
+  def built(self, value):
+    self._built = value
+
   @property
   def constraints(self):
     return self._constraints
@@ -429,10 +449,10 @@ class Layer(object):
       input_spec = self.input_spec
     inputs = _to_list(inputs)
     if len(inputs) != len(input_spec):
-      raise ValueError('Layer ' + self.name + ' expects ' + str(
-          len(input_spec)) + ' inputs, '
+      raise ValueError('Layer ' + self.name + ' expects ' +
+                       str(len(input_spec)) + ' inputs, '
                        'but it received ' + str(len(inputs)) +
-                       ' input tensors. Input received: ' + str(input))
+                       ' input tensors. Input received: ' + str(inputs))
     for input_index, (x, spec) in enumerate(zip(inputs, input_spec)):
       if spec is None:
         continue
@@ -440,31 +460,31 @@ class Layer(object):
       # Check ndim.
       if spec.ndim is not None:
         if K.ndim(x) != spec.ndim:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
-                           ': expected ndim=' + str(
-                               spec.ndim) + ', found ndim=' + str(K.ndim(x)))
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
+                           ': expected ndim=' + str(spec.ndim) + ', found ndim='
+                           + str(K.ndim(x)))
       if spec.max_ndim is not None:
         ndim = K.ndim(x)
         if ndim is not None and ndim > spec.max_ndim:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
                            ': expected max_ndim=' + str(spec.max_ndim) +
                            ', found ndim=' + str(K.ndim(x)))
       if spec.min_ndim is not None:
         ndim = K.ndim(x)
         if ndim is not None and ndim < spec.min_ndim:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
                            ': expected min_ndim=' + str(spec.min_ndim) +
                            ', found ndim=' + str(K.ndim(x)))
       # Check dtype.
       if spec.dtype is not None:
         if K.dtype(x) != spec.dtype:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
-                           ': expected dtype=' + str(
-                               spec.dtype) + ', found dtype=' + str(K.dtype(x)))
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
+                           ': expected dtype=' + str(spec.dtype) +
+                           ', found dtype=' + str(K.dtype(x)))
       # Check specific shape axes.
       if spec.axes:
         try:
@@ -478,8 +498,8 @@ class Layer(object):
             if value is not None and x_shape[int(axis)] not in {value, None}:
               raise ValueError(
                   'Input ' + str(input_index) + ' is incompatible with layer ' +
-                  self.name + ': expected axis ' + str(
-                      axis) + ' of input shape to have '
+                  self.name + ': expected axis ' + str(axis) +
+                  ' of input shape to have '
                   'value ' + str(value) + ' but got shape ' + str(x_shape))
       # Check shape.
       if spec.shape is not None:
@@ -493,8 +513,8 @@ class Layer(object):
               spec_dim = spec_dim.value
             if spec_dim is not None and dim is not None:
               if spec_dim != dim:
-                raise ValueError('Input ' + str(
-                    input_index) + ' is incompatible with layer ' + self.name +
+                raise ValueError('Input ' + str(input_index) +
+                                 ' is incompatible with layer ' + self.name +
                                  ': expected shape=' + str(spec.shape) +
                                  ', found shape=' + str(x_shape))
 
@@ -561,6 +581,7 @@ class Layer(object):
 
       # Handle mask propagation.
       previous_mask = _collect_previous_mask(inputs)
+      user_kwargs = copy.copy(kwargs)
       if not _is_all_none(previous_mask):
         # The previous layer generated a mask.
         if 'mask' in inspect.getargspec(self.call).args:
@@ -583,7 +604,7 @@ class Layer(object):
           output_tensors=output,
           input_masks=previous_mask,
           output_masks=output_mask,
-          arguments=kwargs)
+          arguments=user_kwargs)
 
       # Apply activity regularizer if any:
       if hasattr(
@@ -736,9 +757,9 @@ class Layer(object):
       raise RuntimeError('The layer has never been called '
                          'and thus has no defined ' + attr_name + '.')
     if not len(self.inbound_nodes) > node_index:
-      raise ValueError('Asked to get ' + attr_name + ' at node ' + str(
-          node_index) + ', but the layer has only ' + str(
-              len(self.inbound_nodes)) + ' inbound nodes.')
+      raise ValueError('Asked to get ' + attr_name + ' at node ' +
+                       str(node_index) + ', but the layer has only ' +
+                       str(len(self.inbound_nodes)) + ' inbound nodes.')
     values = getattr(self.inbound_nodes[node_index], attr)
     if len(values) == 1:
       return values[0]
@@ -1027,23 +1048,15 @@ class Layer(object):
             (e.g. L2 weight regularization, which only depends
             on the layer's weights variables, not on any inputs tensors).
     """
-    if losses is None:
+    if losses is None or losses == []:  # pylint: disable=g-explicit-bool-comparison
       return
     # Update self.losses
     losses = _to_list(losses)
-    if not hasattr(self, 'losses'):
-      self.losses = []
-    try:
-      self.losses += losses
-    except AttributeError:
-      # In case self.losses isn't settable
-      # (i.e. it's a getter method).
-      # In that case the `losses` property is
-      # auto-computed and shouldn't be set.
-      pass
+    if hasattr(self, '_losses'):
+      self._losses += losses
     # Update self._per_input_updates
-    if not hasattr(self, '_per_input_losses'):
-      self._per_input_losses = {}
+    if inputs == []:  # pylint: disable=g-explicit-bool-comparison
+      inputs = None
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1067,23 +1080,15 @@ class Layer(object):
             the updates as conditional on these inputs.
             If None is passed, the updates are assumed unconditional.
     """
-    if updates is None:
+    if updates is None or updates == []:  # pylint: disable=g-explicit-bool-comparison
       return
     # Update self.updates
     updates = _to_list(updates)
-    if not hasattr(self, 'updates'):
-      self.updates = []
-    try:
-      self.updates += updates
-    except AttributeError:
-      # In case self.updates isn't settable
-      # (i.e. it's a getter method).
-      # In that case the `updates` property is
-      # auto-computed and shouldn't be set.
-      pass
+    if hasattr(self, '_updates'):
+      self._updates += updates
     # Update self._per_input_updates
-    if not hasattr(self, '_per_input_updates'):
-      self._per_input_updates = {}
+    if inputs == []:  # pylint: disable=g-explicit-bool-comparison
+      inputs = None
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1095,8 +1100,6 @@ class Layer(object):
     self._per_input_updates[inputs_hash] += updates
 
   def get_updates_for(self, inputs):
-    if not hasattr(self, '_per_input_updates'):
-      return []
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1106,8 +1109,6 @@ class Layer(object):
     return []
 
   def get_losses_for(self, inputs):
-    if not hasattr(self, '_per_input_losses'):
-      return []
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1137,10 +1138,10 @@ class Layer(object):
     params = self.weights
     if len(params) != len(weights):
       raise ValueError('You called `set_weights(weights)` on layer "' +
-                       self.name + '" with a  weight list of length ' + str(
-                           len(weights)) + ', but the layer was expecting ' +
-                       str(len(params)) + ' weights. Provided weights: ' + str(
-                           weights)[:50] + '...')
+                       self.name + '" with a  weight list of length ' +
+                       str(len(weights)) + ', but the layer was expecting ' +
+                       str(len(params)) + ' weights. Provided weights: ' +
+                       str(weights)[:50] + '...')
     if not params:
       return
     weight_value_tuples = []
@@ -1448,6 +1449,8 @@ class Container(Layer):
 
     self.supports_masking = False
     self.trainable = True
+    self._per_input_losses = {}
+    self._per_input_updates = {}
 
     # Container-specific properties.
     if isinstance(inputs, (list, tuple)):
@@ -1498,8 +1501,8 @@ class Container(Layer):
       if not hasattr(x, '_keras_history'):
         cls_name = self.__class__.__name__
         raise TypeError('Input tensors to a ' + cls_name + ' ' +
-                        'must be Keras tensors. Found: ' + str(
-                            x) + ' (missing Keras metadata).')
+                        'must be Keras tensors. Found: ' + str(x) +
+                        ' (missing Keras metadata).')
       # Check that x is an input tensor.
       layer, node_index, tensor_index = x._keras_history
       if len(layer.inbound_nodes) > 1 or (
@@ -1707,8 +1710,8 @@ class Container(Layer):
                                  'cannot obtain value for tensor ' + str(x) +
                                  ' at layer "' + layer.name + '". '
                                  'The following previous layers '
-                                 'were accessed without issue: ' + str(
-                                     layers_with_complete_input))
+                                 'were accessed without issue: ' +
+                                 str(layers_with_complete_input))
           for x in node.output_tensors:
             computable_tensors.append(x)
           layers_with_complete_input.append(layer.name)
@@ -1722,8 +1725,8 @@ class Container(Layer):
     all_names = [layer.name for layer in self.layers]
     for name in all_names:
       if all_names.count(name) != 1:
-        raise RuntimeError('The name "' + name + '" is used ' + str(
-            all_names.count(name)) + ' times in the model. '
+        raise RuntimeError('The name "' + name + '" is used ' +
+                           str(all_names.count(name)) + ' times in the model. '
                            'All layer names should be unique.')
 
     # Layer parameters.
@@ -1772,9 +1775,9 @@ class Container(Layer):
     # without the container being notified of it.
     if index is not None:
       if len(self.layers) <= index:
-        raise ValueError('Was asked to retrieve layer at index ' +
-                         str(index) + ' but model only has ' + str(
-                             len(self.layers)) + ' layers.')
+        raise ValueError('Was asked to retrieve layer at index ' + str(index) +
+                         ' but model only has ' + str(len(self.layers)) +
+                         ' layers.')
       else:
         return self.layers[index]
     else:
@@ -1802,19 +1805,16 @@ class Container(Layer):
     updates = []
     for layer in self.layers:
       if hasattr(layer, 'updates'):
-        if len(layer.inbound_nodes) == 1:
-          updates += layer.updates
-        else:
-          # Collect updates that are dependent on inputs
-          # that are part of the model.
-          for node_index, node in enumerate(layer.inbound_nodes):
-            node_key = layer.name + '_ib-' + str(node_index)
-            if node_key in self.container_nodes:
-              # The model owns this layer node.
-              inputs = node.input_tensors
-              updates += layer.get_updates_for(inputs)
-          # Collect unconditional updates.
-          updates += layer.get_updates_for(None)
+        # Collect updates that are dependent on inputs
+        # that are part of the model.
+        for node_index, node in enumerate(layer.inbound_nodes):
+          node_key = layer.name + '_ib-' + str(node_index)
+          if node_key in self.container_nodes:
+            # The model owns this layer node.
+            inputs = node.input_tensors
+            updates += layer.get_updates_for(inputs)
+        # Collect unconditional updates.
+        updates += layer.get_updates_for(None)
     return updates
 
   @property
@@ -1833,22 +1833,18 @@ class Container(Layer):
     # Retrieve losses for all internal layers.
     for layer in self.layers:
       if hasattr(layer, 'losses'):
-        if len(layer.inbound_nodes) == 1:
-          losses += layer.losses
-        else:
-          # Collect losses that are dependent on inputs
-          # that are part of the model.
-          for node_index, node in enumerate(layer.inbound_nodes):
-            node_key = layer.name + '_ib-' + str(node_index)
-            if node_key in self.container_nodes:
-              # The model owns this layer node.
-              inputs = node.input_tensors
-              losses += layer.get_losses_for(inputs)
-          # Collect unconditional losses.
-          losses += layer.get_losses_for(None)
+        # Collect losses that are dependent on inputs
+        # that are part of the model.
+        for node_index, node in enumerate(layer.inbound_nodes):
+          node_key = layer.name + '_ib-' + str(node_index)
+          if node_key in self.container_nodes:
+            # The model owns this layer node.
+            inputs = node.input_tensors
+            losses += layer.get_losses_for(inputs)
+        # Collect unconditional losses.
+        losses += layer.get_losses_for(None)
     # Add any potential unconditional model-level loss.
-    if hasattr(self, '_per_input_losses'):
-      losses += self._per_input_losses.get(None, [])
+    losses += self.get_losses_for(None)
     return losses
 
   @property
@@ -2025,9 +2021,9 @@ class Container(Layer):
         input_shapes = [None]
 
     if len(input_shapes) != len(self.input_layers):
-      raise ValueError('Invalid input_shape argument ' +
-                       str(input_shape) + ': model has ' + str(
-                           len(self.input_layers)) + ' tensor inputs.')
+      raise ValueError('Invalid input_shape argument ' + str(input_shape) +
+                       ': model has ' + str(len(self.input_layers)) +
+                       ' tensor inputs.')
 
     cache_key = ','.join([str(x) for x in input_shapes])
     if cache_key in self._output_shape_cache:
@@ -2160,6 +2156,7 @@ class Container(Layer):
         for x in reference_input_tensors:
           if str(id(x)) in tensor_map:
             computed_data.append(tensor_map[str(id(x))])
+
         if len(computed_data) == len(reference_input_tensors):
           # call layer
           with K.name_scope(layer.name):
@@ -2187,16 +2184,23 @@ class Container(Layer):
               output_masks = _to_list(
                   layer.compute_mask(computed_tensors, computed_masks))
 
+            # Apply activity regularizer if any:
+            if hasattr(layer, 'activity_regularizer'
+                      ) and layer.activity_regularizer is not None:
+              regularization_losses = [
+                  layer.activity_regularizer(x) for x in computed_tensors
+              ]
+              layer.add_loss(regularization_losses, computed_tensors)
+
           # Update model updates and losses:
-          layer_inputs = [x[0] for x in computed_data]
           # Keep track of updates that depend on the inputs
           # (e.g. BN updates).
-          self.add_update(layer.get_updates_for(layer_inputs), inputs)
+          self.add_update(layer.get_updates_for(computed_tensors), inputs)
           # Keep track of unconditional updates (e.g. a counter).
           self.add_update(layer.get_updates_for(None), None)
           # Keep track of losses that depend on the inputs
           # (e.g. activity regularizers).
-          self.add_loss(layer.get_losses_for(layer_inputs), inputs)
+          self.add_loss(layer.get_losses_for(computed_tensors), inputs)
           # Keep track of unconditional losses
           # (e.g. weight regularizers).
           self.add_loss(layer.get_losses_for(None), None)
@@ -2420,7 +2424,7 @@ class Container(Layer):
       output_tensors.append(layer_output_tensors[tensor_index])
     return cls(inputs=input_tensors, outputs=output_tensors, name=name)
 
-  def save(self, filepath, overwrite=True):
+  def save(self, filepath, overwrite=True, include_optimizer=True):
     """Save the model to a single HDF5 file.
 
     The savefile includes:
@@ -2441,6 +2445,7 @@ class Container(Layer):
         filepath: String, path to the file to save the weights to.
         overwrite: Whether to silently overwrite any existing file at the
             target location, or provide the user with a manual prompt.
+        include_optimizer: If True, save optimizer's state together.
 
     Example:
 
@@ -2456,7 +2461,7 @@ class Container(Layer):
     ```
     """
     from tensorflow.contrib.keras.python.keras.models import save_model  # pylint: disable=g-import-not-at-top
-    save_model(self, filepath, overwrite)
+    save_model(self, filepath, overwrite, include_optimizer)
 
   def save_weights(self, filepath, overwrite=True):
     """Dumps all layer weights to a HDF5 file.
@@ -2885,9 +2890,9 @@ def load_weights_from_hdf5_group(f, layers):
   layer_names = filtered_layer_names
   if len(layer_names) != len(filtered_layers):
     raise ValueError('You are trying to load a weight file '
-                     'containing ' + str(len(
-                         layer_names)) + ' layers into a model with ' + str(
-                             len(filtered_layers)) + ' layers.')
+                     'containing ' + str(len(layer_names)) +
+                     ' layers into a model with ' + str(len(filtered_layers)) +
+                     ' layers.')
 
   # We batch weight value assignments in a single backend call
   # which provides a speedup in TensorFlow.
@@ -2906,8 +2911,8 @@ def load_weights_from_hdf5_group(f, layers):
                        'correspond to layer ' + name + ' in the save file. '
                        'However the new layer ' + layer.name + ' expects ' +
                        str(len(symbolic_weights)) +
-                       ' weights, but the saved weights have ' + str(
-                           len(weight_values)) + ' elements.')
+                       ' weights, but the saved weights have ' +
+                       str(len(weight_values)) + ' elements.')
     weight_value_tuples += zip(symbolic_weights, weight_values)
   K.batch_set_value(weight_value_tuples)
 
@@ -2958,10 +2963,10 @@ def load_weights_from_hdf5_group_by_name(f, layers):
       weight_values = preprocess_weights_for_loading(
           layer, weight_values, original_keras_version, original_backend)
       if len(weight_values) != len(symbolic_weights):
-        raise ValueError('Layer #' + str(
-            k) + ' (named "' + layer.name + '") expects ' + str(
-                len(symbolic_weights)) + ' weight(s), but the saved weights' +
-                         ' have ' + str(len(weight_values)) + ' element(s).')
+        raise ValueError('Layer #' + str(k) + ' (named "' + layer.name +
+                         '") expects ' + str(len(symbolic_weights)) +
+                         ' weight(s), but the saved weights' + ' have ' +
+                         str(len(weight_values)) + ' element(s).')
       # Set values.
       for i in range(len(weight_values)):
         weight_value_tuples.append((symbolic_weights[i], weight_values[i]))
diff --git a/tensorflow/contrib/keras/python/keras/engine/training.py b/tensorflow/contrib/keras/python/keras/engine/training.py
index 0097c4a1c2..ba6201713e 100644
--- a/tensorflow/contrib/keras/python/keras/engine/training.py
+++ b/tensorflow/contrib/keras/python/keras/engine/training.py
@@ -84,14 +84,14 @@ def _standardize_input_data(data,
   elif isinstance(data, list):
     if len(data) != len(names):
       if data and hasattr(data[0], 'shape'):
-        raise ValueError('Error when checking ' + exception_prefix +
-                         ': the list of Numpy arrays '
-                         'that you are passing to your model '
-                         'is not the size the model expected. '
-                         'Expected to see ' + str(len(
-                             names)) + ' arrays but instead got '
-                         'the following list of ' + str(len(
-                             data)) + ' arrays: ' + str(data)[:200] + '...')
+        raise ValueError(
+            'Error when checking ' + exception_prefix +
+            ': the list of Numpy arrays '
+            'that you are passing to your model '
+            'is not the size the model expected. '
+            'Expected to see ' + str(len(names)) + ' arrays but instead got '
+            'the following list of ' + str(len(data)) + ' arrays: ' +
+            str(data)[:200] + '...')
       else:
         if len(names) == 1:
           data = [np.asarray(data)]
@@ -100,8 +100,8 @@ def _standardize_input_data(data,
                            ': you are passing a list as '
                            'input to your model, '
                            'but the model expects '
-                           'a list of ' + str(len(
-                               names)) + ' Numpy arrays instead. '
+                           'a list of ' + str(len(names)) +
+                           ' Numpy arrays instead. '
                            'The list you passed was: ' + str(data)[:200])
     arrays = data
   else:
@@ -133,8 +133,8 @@ def _standardize_input_data(data,
       array = arrays[i]
       if len(array.shape) != len(shapes[i]):
         raise ValueError(
-            'Error when checking ' + exception_prefix + ': expected ' + names[
-                i] + ' to have ' + str(len(shapes[i])) +
+            'Error when checking ' + exception_prefix + ': expected ' + names[i]
+            + ' to have ' + str(len(shapes[i])) +
             ' dimensions, but got array with shape ' + str(array.shape))
       for j, (dim, ref_dim) in enumerate(zip(array.shape, shapes[i])):
         if not j and not check_batch_axis:
@@ -143,8 +143,8 @@ def _standardize_input_data(data,
         if ref_dim:
           if ref_dim != dim:
             raise ValueError('Error when checking ' + exception_prefix +
-                             ': expected ' + names[i] + ' to have shape ' + str(
-                                 shapes[i]) + ' but got array with shape ' +
+                             ': expected ' + names[i] + ' to have shape ' +
+                             str(shapes[i]) + ' but got array with shape ' +
                              str(array.shape))
   return arrays
 
@@ -175,9 +175,9 @@ def _standardize_sample_or_class_weights(x_weight, output_names, weight_type):
       return [x_weight]
   if isinstance(x_weight, list):
     if len(x_weight) != len(output_names):
-      raise ValueError('Provided `' + weight_type + '` was a list of ' + str(
-          len(x_weight)) + ' elements, but the model has ' + str(
-              len(output_names)) + ' outputs. '
+      raise ValueError('Provided `' + weight_type + '` was a list of ' +
+                       str(len(x_weight)) + ' elements, but the model has ' +
+                       str(len(output_names)) + ' outputs. '
                        'You should provide one `' + weight_type + '`'
                        'array per model output.')
     return x_weight
@@ -239,9 +239,9 @@ def _check_array_lengths(inputs, targets, weights):
                      'and ' + str(list(set_y)[0]) + ' target samples.')
   if set_y and set_w and list(set_y)[0] != list(set_w)[0]:
     raise ValueError('Sample_weight arrays should have '
-                     'the same number of samples as target arrays. Got ' + str(
-                         list(set_y)[0]) + ' input samples and ' + str(
-                             list(set_w)[0]) + ' target samples.')
+                     'the same number of samples as target arrays. Got ' +
+                     str(list(set_y)[0]) + ' input samples and ' +
+                     str(list(set_w)[0]) + ' target samples.')
 
 
 def _check_loss_and_target_compatibility(targets, loss_fns, output_shapes):
@@ -284,8 +284,8 @@ def _check_loss_and_target_compatibility(targets, loss_fns, output_shapes):
     if loss.__name__ in key_losses:
       for target_dim, out_dim in zip(y.shape[1:], shape[1:]):
         if out_dim is not None and target_dim != out_dim:
-          raise ValueError('A target array with shape ' + str(
-              y.shape) + ' was passed for an output of shape ' + str(shape) +
+          raise ValueError('A target array with shape ' + str(y.shape) +
+                           ' was passed for an output of shape ' + str(shape) +
                            ' while using as loss `' + loss.__name__ + '`. '
                            'This loss expects '
                            'targets to have the same shape '
@@ -535,14 +535,14 @@ def _standardize_weights(y,
                        'outputs that are at least 3D, i.e. that have '
                        'a time dimension.')
     if sample_weight is not None and len(sample_weight.shape) != 2:
-      raise ValueError('Found a sample_weight array with shape ' + str(
-          sample_weight.shape) + '. '
+      raise ValueError('Found a sample_weight array with shape ' +
+                       str(sample_weight.shape) + '. '
                        'In order to use timestep-wise sample weighting, '
                        'you should pass a 2D sample_weight array.')
   else:
     if sample_weight is not None and len(sample_weight.shape) != 1:
-      raise ValueError('Found a sample_weight array with shape ' + str(
-          sample_weight.shape) + '. '
+      raise ValueError('Found a sample_weight array with shape ' +
+                       str(sample_weight.shape) + '. '
                        'In order to use timestep-wise sample weights, '
                        'you should specify '
                        'sample_weight_mode="temporal" '
@@ -552,15 +552,15 @@ def _standardize_weights(y,
 
   if sample_weight is not None:
     if len(sample_weight.shape) > len(y.shape):
-      raise ValueError('Found a sample_weight with shape' + str(
-          sample_weight.shape) + '.'
+      raise ValueError('Found a sample_weight with shape' +
+                       str(sample_weight.shape) + '.'
                        'Expected sample_weight with rank '
                        'less than or equal to ' + str(len(y.shape)))
 
     if y.shape[:sample_weight.ndim] != sample_weight.shape:
-      raise ValueError('Found a sample_weight array with shape ' + str(
-          sample_weight.shape) + ' for an input with shape ' + str(y.shape) +
-                       '. '
+      raise ValueError('Found a sample_weight array with shape ' +
+                       str(sample_weight.shape) + ' for an input with shape ' +
+                       str(y.shape) + '. '
                        'sample_weight cannot be broadcast.')
     return sample_weight
   elif isinstance(class_weight, dict):
@@ -728,8 +728,8 @@ class Model(Container):
         if name not in self.output_names:
           raise ValueError('Unknown entry in loss '
                            'dictionary: "' + name + '". '
-                           'Only expected the following keys: ' + str(
-                               self.output_names))
+                           'Only expected the following keys: ' +
+                           str(self.output_names))
       loss_functions = []
       for name in self.output_names:
         if name not in loss:
@@ -781,8 +781,8 @@ class Model(Container):
         if name not in self.output_names:
           raise ValueError('Unknown entry in loss_weights '
                            'dictionary: "' + name + '". '
-                           'Only expected the following keys: ' + str(
-                               self.output_names))
+                           'Only expected the following keys: ' +
+                           str(self.output_names))
       loss_weights_list = []
       for name in self.output_names:
         loss_weights_list.append(loss_weights.get(name, 1.))
@@ -791,12 +791,12 @@ class Model(Container):
         raise ValueError('When passing a list as loss_weights, '
                          'it should have one entry per model outputs. '
                          'The model has ' + str(len(self.outputs)) +
-                         ' outputs, but you passed loss_weights=' + str(
-                             loss_weights))
+                         ' outputs, but you passed loss_weights=' +
+                         str(loss_weights))
       loss_weights_list = loss_weights
     else:
-      raise TypeError('Could not interpret loss_weights argument: ' + str(
-          loss_weights) + ' - expected a list of dicts.')
+      raise TypeError('Could not interpret loss_weights argument: ' +
+                      str(loss_weights) + ' - expected a list of dicts.')
 
     # Prepare sample weights.
     sample_weights = []
@@ -806,8 +806,8 @@ class Model(Container):
         if name not in self.output_names:
           raise ValueError('Unknown entry in '
                            'sample_weight_mode dictionary: "' + name + '". '
-                           'Only expected the following keys: ' + str(
-                               self.output_names))
+                           'Only expected the following keys: ' +
+                           str(self.output_names))
       for i, name in enumerate(self.output_names):
         if i in skip_indices:
           weight = None
@@ -941,8 +941,8 @@ class Model(Container):
           # (because of class mode duality)
           output_shape = self.internal_output_shapes[i]
           acc_fn = None
-          if output_shape[-1] == 1 or self.loss_functions[
-              i] == losses.binary_crossentropy:
+          if (output_shape[-1] == 1 or
+              self.loss_functions[i] == losses.binary_crossentropy):
             # case: binary accuracy
             acc_fn = metrics_module.binary_accuracy
           elif self.loss_functions[i] == losses.sparse_categorical_crossentropy:
@@ -1321,8 +1321,8 @@ class Model(Container):
         raise ValueError('In a stateful network, '
                          'you should only pass inputs with '
                          'a number of samples that can be '
-                         'divided by the batch size. Found: ' + str(
-                             x[0].shape[0]) + ' samples')
+                         'divided by the batch size. Found: ' +
+                         str(x[0].shape[0]) + ' samples')
     return x, y, sample_weights
 
   def fit(self,
@@ -1413,11 +1413,11 @@ class Model(Container):
       elif len(validation_data) == 3:
         val_x, val_y, val_sample_weight = validation_data  # pylint: disable=unpacking-non-sequence
       else:
-        raise ValueError('When passing validation_data, '
-                         'it must contain 2 (x_val, y_val) '
-                         'or 3 (x_val, y_val, val_sample_weights) '
-                         'items, however it contains %d items' %
-                         len(validation_data))
+        raise ValueError(
+            'When passing validation_data, '
+            'it must contain 2 (x_val, y_val) '
+            'or 3 (x_val, y_val, val_sample_weights) '
+            'items, however it contains %d items' % len(validation_data))
 
       val_x, val_y, val_sample_weights = self._standardize_user_data(
           val_x,
@@ -1568,8 +1568,8 @@ class Model(Container):
         raise ValueError('In a stateful network, '
                          'you should only pass inputs with '
                          'a number of samples that can be '
-                         'divided by the batch size. Found: ' + str(
-                             x[0].shape[0]) + ' samples. '
+                         'divided by the batch size. Found: ' +
+                         str(x[0].shape[0]) + ' samples. '
                          'Batch size: ' + str(batch_size) + '.')
 
     # prepare inputs, delegate logic to _predict_loop
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional.py b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
index 3b68022115..38b8fe66a3 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
@@ -1110,17 +1110,17 @@ class UpSampling2D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      height = self.size[0] * input_shape[2] if input_shape[
-          2] is not None else None
-      width = self.size[1] * input_shape[3] if input_shape[
-          3] is not None else None
+      height = self.size[0] * input_shape[
+          2] if input_shape[2] is not None else None
+      width = self.size[1] * input_shape[
+          3] if input_shape[3] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], height, width])
     else:
-      height = self.size[0] * input_shape[1] if input_shape[
-          1] is not None else None
-      width = self.size[1] * input_shape[2] if input_shape[
-          2] is not None else None
+      height = self.size[0] * input_shape[
+          1] if input_shape[1] is not None else None
+      width = self.size[1] * input_shape[
+          2] if input_shape[2] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], height, width, input_shape[3]])
 
@@ -1177,21 +1177,21 @@ class UpSampling3D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      dim1 = self.size[0] * input_shape[2] if input_shape[
-          2] is not None else None
-      dim2 = self.size[1] * input_shape[3] if input_shape[
-          3] is not None else None
-      dim3 = self.size[2] * input_shape[4] if input_shape[
-          4] is not None else None
+      dim1 = self.size[0] * input_shape[
+          2] if input_shape[2] is not None else None
+      dim2 = self.size[1] * input_shape[
+          3] if input_shape[3] is not None else None
+      dim3 = self.size[2] * input_shape[
+          4] if input_shape[4] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], dim1, dim2, dim3])
     else:
-      dim1 = self.size[0] * input_shape[1] if input_shape[
-          1] is not None else None
-      dim2 = self.size[1] * input_shape[2] if input_shape[
-          2] is not None else None
-      dim3 = self.size[2] * input_shape[3] if input_shape[
-          3] is not None else None
+      dim1 = self.size[0] * input_shape[
+          1] if input_shape[1] is not None else None
+      dim2 = self.size[1] * input_shape[
+          2] if input_shape[2] is not None else None
+      dim3 = self.size[2] * input_shape[
+          3] if input_shape[3] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], dim1, dim2, dim3, input_shape[4]])
 
@@ -1230,9 +1230,10 @@ class ZeroPadding1D(Layer):
     self.input_spec = InputSpec(ndim=3)
 
   def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    length = input_shape[1] + self.padding[0] + self.padding[1] if input_shape[
-        1] is not None else None
+    if input_shape[1] is not None:
+      length = input_shape[1] + self.padding[0] + self.padding[1]
+    else:
+      length = None
     return tensor_shape.TensorShape([input_shape[0], length, input_shape[2]])
 
   def call(self, inputs):
@@ -1313,17 +1314,25 @@ class ZeroPadding2D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      rows = input_shape[2] + self.padding[0][0] + self.padding[0][
-          1] if input_shape[2] is not None else None
-      cols = input_shape[3] + self.padding[1][0] + self.padding[1][
-          1] if input_shape[3] is not None else None
+      if input_shape[2] is not None:
+        rows = input_shape[2] + self.padding[0][0] + self.padding[0][1]
+      else:
+        rows = None
+      if input_shape[3] is not None:
+        cols = input_shape[3] + self.padding[1][0] + self.padding[1][1]
+      else:
+        cols = None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], rows, cols])
-    else:
-      rows = input_shape[1] + self.padding[0][0] + self.padding[0][
-          1] if input_shape[1] is not None else None
-      cols = input_shape[2] + self.padding[1][0] + self.padding[1][
-          1] if input_shape[2] is not None else None
+    elif self.data_format == 'channels_last':
+      if input_shape[1] is not None:
+        rows = input_shape[1] + self.padding[0][0] + self.padding[0][1]
+      else:
+        rows = None
+      if input_shape[2] is not None:
+        cols = input_shape[2] + self.padding[1][0] + self.padding[1][1]
+      else:
+        cols = None
       return tensor_shape.TensorShape(
           [input_shape[0], rows, cols, input_shape[3]])
 
@@ -1414,21 +1423,33 @@ class ZeroPadding3D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      dim1 = input_shape[2] + 2 * self.padding[0][0] if input_shape[
-          2] is not None else None
-      dim2 = input_shape[3] + 2 * self.padding[1][0] if input_shape[
-          3] is not None else None
-      dim3 = input_shape[4] + 2 * self.padding[2][0] if input_shape[
-          4] is not None else None
+      if input_shape[2] is not None:
+        dim1 = input_shape[2] + 2 * self.padding[0][0]
+      else:
+        dim1 = None
+      if input_shape[3] is not None:
+        dim2 = input_shape[3] + 2 * self.padding[1][0]
+      else:
+        dim2 = None
+      if input_shape[4] is not None:
+        dim3 = input_shape[4] + 2 * self.padding[2][0]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], dim1, dim2, dim3])
-    else:
-      dim1 = input_shape[1] + 2 * self.padding[0][1] if input_shape[
-          1] is not None else None
-      dim2 = input_shape[2] + 2 * self.padding[1][1] if input_shape[
-          2] is not None else None
-      dim3 = input_shape[3] + 2 * self.padding[2][1] if input_shape[
-          3] is not None else None
+    elif self.data_format == 'channels_last':
+      if input_shape[1] is not None:
+        dim1 = input_shape[1] + 2 * self.padding[0][1]
+      else:
+        dim1 = None
+      if input_shape[2] is not None:
+        dim2 = input_shape[2] + 2 * self.padding[1][1]
+      else:
+        dim2 = None
+      if input_shape[3] is not None:
+        dim3 = input_shape[3] + 2 * self.padding[2][1]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], dim1, dim2, dim3, input_shape[4]])
 
@@ -1700,21 +1721,33 @@ class Cropping3D(Layer):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     # pylint: disable=invalid-unary-operand-type
     if self.data_format == 'channels_first':
-      dim1 = input_shape[2] - self.cropping[0][0] - self.cropping[0][
-          1] if input_shape[2] is not None else None
-      dim2 = input_shape[3] - self.cropping[1][0] - self.cropping[1][
-          1] if input_shape[3] is not None else None
-      dim3 = input_shape[4] - self.cropping[2][0] - self.cropping[2][
-          1] if input_shape[4] is not None else None
+      if input_shape[2] is not None:
+        dim1 = input_shape[2] - self.cropping[0][0] - self.cropping[0][1]
+      else:
+        dim1 = None
+      if input_shape[3] is not None:
+        dim2 = input_shape[3] - self.cropping[1][0] - self.cropping[1][1]
+      else:
+        dim2 = None
+      if input_shape[4] is not None:
+        dim3 = input_shape[4] - self.cropping[2][0] - self.cropping[2][1]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], dim1, dim2, dim3])
-    else:
-      dim1 = input_shape[1] - self.cropping[0][0] - self.cropping[0][
-          1] if input_shape[1] is not None else None
-      dim2 = input_shape[2] - self.cropping[1][0] - self.cropping[1][
-          1] if input_shape[2] is not None else None
-      dim3 = input_shape[3] - self.cropping[2][0] - self.cropping[2][
-          1] if input_shape[3] is not None else None
+    elif self.data_format == 'channels_last':
+      if input_shape[1] is not None:
+        dim1 = input_shape[1] - self.cropping[0][0] - self.cropping[0][1]
+      else:
+        dim1 = None
+      if input_shape[2] is not None:
+        dim2 = input_shape[2] - self.cropping[1][0] - self.cropping[1][1]
+      else:
+        dim2 = None
+      if input_shape[3] is not None:
+        dim3 = input_shape[3] - self.cropping[2][0] - self.cropping[2][1]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], dim1, dim2, dim3, input_shape[4]])
     # pylint: enable=invalid-unary-operand-type
@@ -1738,14 +1771,14 @@ class Cropping3D(Layer):
         return inputs[:, :, self.cropping[0][0]:, self.cropping[1][
             0]:-self.cropping[1][1], self.cropping[2][0]:-self.cropping[2][1]]
       elif self.cropping[1][1] == 0:
-        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:, self.cropping[2][0]:-self.cropping[2][1]]
+        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][1], self.
+                      cropping[1][0]:, self.cropping[2][0]:-self.cropping[2][1]]
       elif self.cropping[2][1] == 0:
-        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][0]:]
-      return inputs[:, :, self.cropping[0][0]:-self.cropping[0][
-          1], self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][0]:
-                    -self.cropping[2][1]]
+        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][1], self.
+                      cropping[1][0]:-self.cropping[1][1], self.cropping[2][0]:]
+      return inputs[:, :, self.cropping[0][0]:-self.cropping[0][1],
+                    self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][
+                        0]:-self.cropping[2][1]]
     else:
       if self.cropping[0][1] == self.cropping[1][1] == self.cropping[2][1] == 0:
         return inputs[:, self.cropping[0][0]:, self.cropping[1][0]:,
@@ -1761,19 +1794,19 @@ class Cropping3D(Layer):
                       -self.cropping[1][1], self.cropping[2][0]:, :]
       elif self.cropping[0][1] == 0:
         return inputs[:, self.cropping[0][0]:, self.cropping[1][
-            0]:-self.cropping[1][1], self.cropping[2][0]:-self.cropping[2][
-                1], :]
+            0]:-self.cropping[1][1], self.cropping[2][0]:
+                      -self.cropping[2][1], :]
       elif self.cropping[1][1] == 0:
-        return inputs[:, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:, self.cropping[2][0]:-self.cropping[2][
-                1], :]
+        return inputs[:, self.cropping[0][
+            0]:-self.cropping[0][1], self.cropping[1][0]:, self.cropping[2][0]:
+                      -self.cropping[2][1], :]
       elif self.cropping[2][1] == 0:
-        return inputs[:, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][
-                0]:, :]
+        return inputs[:, self.cropping[0][0]:-self.cropping[0][1],
+                      self.cropping[1][0]:-self.cropping[1][1], self.cropping[
+                          2][0]:, :]
       return inputs[:, self.cropping[0][0]:-self.cropping[0][1], self.cropping[
-          1][0]:-self.cropping[1][1], self.cropping[2][0]:-self.cropping[2][  # pylint: disable=invalid-unary-operand-type
-              1], :]
+          1][0]:-self.cropping[1][1], self.cropping[2][0]:  # pylint: disable=invalid-unary-operand-type
+                    -self.cropping[2][1], :]  # pylint: disable=invalid-unary-operand-type
     # pylint: enable=invalid-unary-operand-type
 
   def get_config(self):
diff --git a/tensorflow/contrib/keras/python/keras/layers/embeddings.py b/tensorflow/contrib/keras/python/keras/layers/embeddings.py
index 5ba7d7db8a..12a2ce39eb 100644
--- a/tensorflow/contrib/keras/python/keras/layers/embeddings.py
+++ b/tensorflow/contrib/keras/python/keras/layers/embeddings.py
@@ -53,8 +53,8 @@ class Embedding(Layer):
   ```
 
   Arguments:
-    input_dim: int > 0. Size of the vocabulary, ie.
-        1 + maximum integer index occurring in the input data.
+    input_dim: int > 0. Size of the vocabulary,
+        i.e. maximum integer index + 1.
     output_dim: int >= 0. Dimension of the dense embedding.
     embeddings_initializer: Initializer for the `embeddings` matrix.
     embeddings_regularizer: Regularizer function applied to
@@ -68,7 +68,8 @@ class Embedding(Layer):
         If this is `True` then all subsequent layers
         in the model need to support masking or an exception will be raised.
         If mask_zero is set to True, as a consequence, index 0 cannot be
-        used in the vocabulary (input_dim should equal `|vocabulary| + 2`).
+        used in the vocabulary (input_dim should equal size of
+        vocabulary + 1).
     input_length: Length of input sequences, when it is constant.
         This argument is required if you are going to connect
         `Flatten` then `Dense` layers upstream
diff --git a/tensorflow/contrib/keras/python/keras/layers/local.py b/tensorflow/contrib/keras/python/keras/layers/local.py
index 895d6e3727..d96ccc4a63 100644
--- a/tensorflow/contrib/keras/python/keras/layers/local.py
+++ b/tensorflow/contrib/keras/python/keras/layers/local.py
@@ -336,8 +336,9 @@ class LocallyConnected2D(Layer):
                                                self.padding, self.strides[1])
     self.output_row = output_row
     self.output_col = output_col
-    self.kernel_shape = (output_row * output_col, self.kernel_size[0] *
-                         self.kernel_size[1] * input_filter, self.filters)
+    self.kernel_shape = (
+        output_row * output_col,
+        self.kernel_size[0] * self.kernel_size[1] * input_filter, self.filters)
     self.kernel = self.add_weight(
         self.kernel_shape,
         initializer=self.kernel_initializer,
diff --git a/tensorflow/contrib/keras/python/keras/layers/merge.py b/tensorflow/contrib/keras/python/keras/layers/merge.py
index d52bd2bbb3..7c6482d0de 100644
--- a/tensorflow/contrib/keras/python/keras/layers/merge.py
+++ b/tensorflow/contrib/keras/python/keras/layers/merge.py
@@ -74,8 +74,8 @@ class _Merge(Layer):
       else:
         if i != j:
           raise ValueError('Operands could not be broadcast '
-                           'together with shapes ' + str(shape1) + ' ' + str(
-                               shape2))
+                           'together with shapes ' + str(shape1) + ' ' +
+                           str(shape2))
         output_shape.append(i)
     return tuple(output_shape)
 
@@ -92,8 +92,8 @@ class _Merge(Layer):
     batch_sizes -= set([None])
     if len(batch_sizes) > 1:
       raise ValueError('Can not merge tensors with different '
-                       'batch sizes. Got tensors with shapes : ' + str(
-                           input_shape))
+                       'batch sizes. Got tensors with shapes : ' +
+                       str(input_shape))
     if input_shape[0] is None:
       output_shape = None
     else:
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index d429cd6d9b..9a0340aeaf 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -109,8 +109,8 @@ class BatchNormalization(Layer):
     if dim is None:
       raise ValueError('Axis ' + str(self.axis) + ' of '
                        'input tensor should have a defined dimension '
-                       'but the layer received an input with shape ' + str(
-                           input_shape) + '.')
+                       'but the layer received an input with shape ' +
+                       str(input_shape) + '.')
     self.input_spec = InputSpec(ndim=len(input_shape), axes={self.axis: dim})
     shape = (dim,)
 
diff --git a/tensorflow/contrib/keras/python/keras/layers/recurrent.py b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
index 6301132f4d..1ea1cb22d9 100644
--- a/tensorflow/contrib/keras/python/keras/layers/recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
@@ -305,9 +305,9 @@ class Recurrent(Layer):
       initial_states = self.get_initial_states(inputs)
 
     if len(initial_states) != len(self.states):
-      raise ValueError('Layer has ' + str(
-          len(self.states)) + ' states but was passed ' + str(
-              len(initial_states)) + ' initial states.')
+      raise ValueError('Layer has ' + str(len(self.states)) +
+                       ' states but was passed ' + str(len(initial_states)) +
+                       ' initial states.')
     input_shape = K.int_shape(inputs)
     if self.unroll and input_shape[1] is None:
       raise ValueError('Cannot unroll a RNN if the '
@@ -381,8 +381,8 @@ class Recurrent(Layer):
       if states_value:
         value = states_value[i]
         if value.shape != (batch_size, self.units):
-          raise ValueError('Expected state #' + str(
-              i) + ' to have shape ' + str((batch_size, self.units)) +
+          raise ValueError('Expected state #' + str(i) + ' to have shape ' +
+                           str((batch_size, self.units)) +
                            ' but got array with shape ' + str(value.shape))
       else:
         value = np.zeros((batch_size, self.units))
@@ -748,8 +748,8 @@ class GRU(Recurrent):
     self.kernel_z = self.kernel[:, :self.units]
     self.recurrent_kernel_z = self.recurrent_kernel[:, :self.units]
     self.kernel_r = self.kernel[:, self.units:self.units * 2]
-    self.recurrent_kernel_r = self.recurrent_kernel[:, self.units:self.units *
-                                                    2]
+    self.recurrent_kernel_r = self.recurrent_kernel[:, self.units:
+                                                    self.units * 2]
     self.kernel_h = self.kernel[:, self.units * 2:]
     self.recurrent_kernel_h = self.recurrent_kernel[:, self.units * 2:]
 
@@ -1071,10 +1071,10 @@ class LSTM(Recurrent):
     self.kernel_o = self.kernel[:, self.units * 3:]
 
     self.recurrent_kernel_i = self.recurrent_kernel[:, :self.units]
-    self.recurrent_kernel_f = self.recurrent_kernel[:, self.units:self.units *
-                                                    2]
-    self.recurrent_kernel_c = self.recurrent_kernel[:, self.units * 2:self.units
-                                                    * 3]
+    self.recurrent_kernel_f = self.recurrent_kernel[:, self.units:
+                                                    self.units * 2]
+    self.recurrent_kernel_c = self.recurrent_kernel[:, self.units * 2:
+                                                    self.units * 3]
     self.recurrent_kernel_o = self.recurrent_kernel[:, self.units * 3:]
 
     if self.use_bias:
@@ -1209,8 +1209,8 @@ class LSTM(Recurrent):
                                                 self.recurrent_kernel_i))
       f = self.recurrent_activation(x_f + K.dot(h_tm1 * rec_dp_mask[1],
                                                 self.recurrent_kernel_f))
-      c = f * c_tm1 + i * self.activation(x_c + K.dot(h_tm1 * rec_dp_mask[2],
-                                                      self.recurrent_kernel_c))
+      c = f * c_tm1 + i * self.activation(
+          x_c + K.dot(h_tm1 * rec_dp_mask[2], self.recurrent_kernel_c))
       o = self.recurrent_activation(x_o + K.dot(h_tm1 * rec_dp_mask[3],
                                                 self.recurrent_kernel_o))
     h = o * self.activation(c)
diff --git a/tensorflow/contrib/keras/python/keras/layers/wrappers.py b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
index eeb67493ee..a322696514 100644
--- a/tensorflow/contrib/keras/python/keras/layers/wrappers.py
+++ b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
@@ -44,19 +44,53 @@ class Wrapper(Layer):
     super(Wrapper, self).__init__(**kwargs)
 
   def build(self, input_shape=None):
-    # Assumes that self.layer is already set.
-    # Should be called at the end of .build() in the children classes.
-    self.trainable_weights = getattr(self.layer, 'trainable_weights', [])
-    self.non_trainable_weights = getattr(self.layer, 'non_trainable_weights',
-                                         [])
-    self.updates = getattr(self.layer, 'updates', [])
-    self.losses = getattr(self.layer, 'losses', [])
-    self.constraints = getattr(self.layer, 'constraints', {})
     self.built = True
 
+  @property
+  def activity_regularizer(self):
+    if hasattr(self.layer, 'activity_regularizer'):
+      return self.layer.activity_regularizer
+    else:
+      return None
+
+  @property
+  def trainable_weights(self):
+    return self.layer.trainable_weights
+
+  @property
+  def non_trainable_weights(self):
+    return self.layer.non_trainable_weights
+
+  @property
+  def updates(self):
+    if hasattr(self.layer, 'updates'):
+      return self.layer.updates
+    return []
+
+  def get_updates_for(self, inputs=None):
+    if inputs is None:
+      updates = self.layer.get_updates_for(None)
+      return updates + super(Wrapper, self).get_updates_for(None)
+    return super(Wrapper, self).get_updates_for(inputs)
+
+  @property
+  def losses(self):
+    if hasattr(self.layer, 'losses'):
+      return self.layer.losses
+    return []
+
+  def get_losses_for(self, inputs=None):
+    if inputs is None:
+      losses = self.layer.get_losses_for(None)
+      return losses + super(Wrapper, self).get_losses_for(None)
+    return super(Wrapper, self).get_losses_for(inputs)
+
+  @property
+  def constraints(self):
+    return self.layer.constraints
+
   def get_weights(self):
-    weights = self.layer.get_weights()
-    return weights
+    return self.layer.get_weights()
 
   def set_weights(self, weights):
     self.layer.set_weights(weights)
@@ -135,8 +169,8 @@ class TimeDistributed(Wrapper):
 
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    child_input_shape = tensor_shape.TensorShape([input_shape[0]] + input_shape[
-        2:])
+    child_input_shape = tensor_shape.TensorShape([input_shape[0]] +
+                                                 input_shape[2:])
     child_output_shape = self.layer._compute_output_shape(  # pylint: disable=protected-access
         child_input_shape).as_list()
     timesteps = input_shape[1]
diff --git a/tensorflow/contrib/keras/python/keras/models.py b/tensorflow/contrib/keras/python/keras/models.py
index 5289bb732b..eb0996fa12 100644
--- a/tensorflow/contrib/keras/python/keras/models.py
+++ b/tensorflow/contrib/keras/python/keras/models.py
@@ -50,7 +50,7 @@ except ImportError:
 # pylint: enable=g-import-not-at-top
 
 
-def save_model(model, filepath, overwrite=True):
+def save_model(model, filepath, overwrite=True, include_optimizer=True):
   """Save a model to a HDF5 file.
 
   The saved model contains:
@@ -68,6 +68,7 @@ def save_model(model, filepath, overwrite=True):
       overwrite: Whether we should overwrite any existing
           model at the target location, or instead
           ask the user with a manual prompt.
+      include_optimizer: If True, save optimizer's state together.
 
   Raises:
       ImportError: if h5py is not available.
@@ -129,7 +130,7 @@ def save_model(model, filepath, overwrite=True):
   model_layers = model.layers
   topology.save_weights_to_hdf5_group(model_weights_group, model_layers)
 
-  if hasattr(model, 'optimizer'):
+  if include_optimizer and hasattr(model, 'optimizer'):
     if isinstance(model.optimizer, optimizers.TFOptimizer):
       warnings.warn(
           'TensorFlow optimizers do not '
@@ -234,7 +235,14 @@ def load_model(filepath, custom_objects=None):
     if isinstance(obj, dict):
       deserialized = {}
       for key, value in obj.items():
-        if value in custom_objects:
+        deserialized[key] = []
+        if isinstance(value, list):
+          for element in value:
+            if element in custom_objects:
+              deserialized[key].append(custom_objects[element])
+            else:
+              deserialized[key].append(element)
+        elif value in custom_objects:
           deserialized[key] = custom_objects[value]
         else:
           deserialized[key] = value
diff --git a/tensorflow/contrib/keras/python/keras/optimizers.py b/tensorflow/contrib/keras/python/keras/optimizers.py
index b50c18b0e1..75fce5c96f 100644
--- a/tensorflow/contrib/keras/python/keras/optimizers.py
+++ b/tensorflow/contrib/keras/python/keras/optimizers.py
@@ -596,8 +596,9 @@ class Nadam(Optimizer):
     # Due to the recommendations in [2], i.e. warming momentum schedule
     momentum_cache_t = self.beta_1 * (1. - 0.5 *
                                       (K.pow(0.96, t * self.schedule_decay)))
-    momentum_cache_t_1 = self.beta_1 * (
-        1. - 0.5 * (K.pow(0.96, (t + 1) * self.schedule_decay)))
+    momentum_cache_t_1 = self.beta_1 * (1. - 0.5 *
+                                        (K.pow(0.96,
+                                               (t + 1) * self.schedule_decay)))
     m_schedule_new = self.m_schedule * momentum_cache_t
     m_schedule_next = self.m_schedule * momentum_cache_t * momentum_cache_t_1
     self.updates.append((self.m_schedule, m_schedule_new))
@@ -615,8 +616,8 @@ class Nadam(Optimizer):
       m_t_prime = m_t / (1. - m_schedule_next)
       v_t = self.beta_2 * v + (1. - self.beta_2) * K.square(g)
       v_t_prime = v_t / (1. - K.pow(self.beta_2, t))
-      m_t_bar = (1. - momentum_cache_t
-                ) * g_prime + momentum_cache_t_1 * m_t_prime
+      m_t_bar = (
+          1. - momentum_cache_t) * g_prime + momentum_cache_t_1 * m_t_prime
 
       self.updates.append(K.update(m, m_t))
       self.updates.append(K.update(v, v_t))
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/image.py b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
index de0749ae02..8cceb441df 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/image.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
@@ -711,8 +711,8 @@ class ImageDataGenerator(object):
           'following the data format convention "' + self.data_format + '" '
           '(channels on axis ' + str(self.channel_axis) + '), i.e. expected '
           'either 1, 3 or 4 channels on axis ' + str(self.channel_axis) + '. '
-          'However, it was passed an array with shape ' + str(
-              x.shape) + ' (' + str(x.shape[self.channel_axis]) + ' channels).')
+          'However, it was passed an array with shape ' + str(x.shape) + ' (' +
+          str(x.shape[self.channel_axis]) + ' channels).')
 
     if seed is not None:
       np.random.seed(seed)
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/text.py b/tensorflow/contrib/keras/python/keras/preprocessing/text.py
index b164b613d2..5b89c8035c 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/text.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/text.py
@@ -280,8 +280,8 @@ class Tokenizer(object):
           # Use weighting scheme 2 in
           # https://en.wikipedia.org/wiki/Tf%E2%80%93idf
           tf = 1 + np.log(c)
-          idf = np.log(1 + self.document_count / (1 + self.index_docs.get(j, 0)
-                                                 ))
+          idf = np.log(1 + self.document_count /
+                       (1 + self.index_docs.get(j, 0)))
           x[i][j] = tf * idf
         else:
           raise ValueError('Unknown vectorization mode:', mode)
diff --git a/tensorflow/contrib/keras/python/keras/utils/conv_utils.py b/tensorflow/contrib/keras/python/keras/utils/conv_utils.py
index ffc131ec4f..7d4fdda296 100644
--- a/tensorflow/contrib/keras/python/keras/utils/conv_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/conv_utils.py
@@ -47,11 +47,11 @@ def normalize_tuple(value, n, name):
     try:
       value_tuple = tuple(value)
     except TypeError:
-      raise ValueError('The `' + name + '` argument must be a tuple of ' + str(
-          n) + ' integers. Received: ' + str(value))
+      raise ValueError('The `' + name + '` argument must be a tuple of ' +
+                       str(n) + ' integers. Received: ' + str(value))
     if len(value_tuple) != n:
-      raise ValueError('The `' + name + '` argument must be a tuple of ' + str(
-          n) + ' integers. Received: ' + str(value))
+      raise ValueError('The `' + name + '` argument must be a tuple of ' +
+                       str(n) + ' integers. Received: ' + str(value))
     for single_value in value_tuple:
       try:
         int(single_value)
@@ -69,8 +69,8 @@ def normalize_data_format(value):
   data_format = value.lower()
   if data_format not in {'channels_first', 'channels_last'}:
     raise ValueError('The `data_format` argument must be one of '
-                     '"channels_first", "channels_last". Received: ' + str(
-                         value))
+                     '"channels_first", "channels_last". Received: ' +
+                     str(value))
   return data_format
 
 
diff --git a/tensorflow/contrib/keras/python/keras/utils/data_utils.py b/tensorflow/contrib/keras/python/keras/utils/data_utils.py
index b2d5427c97..5a42444308 100644
--- a/tensorflow/contrib/keras/python/keras/utils/data_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/data_utils.py
@@ -23,7 +23,9 @@ import os
 import shutil
 import sys
 import tarfile
+import zipfile
 
+import six
 from six.moves.urllib.error import HTTPError
 from six.moves.urllib.error import URLError
 from six.moves.urllib.request import urlopen
@@ -73,24 +75,108 @@ else:
   from six.moves.urllib.request import urlretrieve  # pylint: disable=g-import-not-at-top
 
 
-def get_file(fname, origin, untar=False, md5_hash=None,
-             cache_subdir='datasets'):
+def _extract_archive(file_path, path='.', archive_format='auto'):
+  """Extracts an archive if it matches tar, tar.gz, tar.bz, or zip formats.
+
+  Arguments:
+      file_path: path to the archive file
+      path: path to extract the archive file
+      archive_format: Archive format to try for extracting the file.
+          Options are 'auto', 'tar', 'zip', and None.
+          'tar' includes tar, tar.gz, and tar.bz files.
+          The default 'auto' is ['tar', 'zip'].
+          None or an empty list will return no matches found.
+
+  Returns:
+      True if a match was found and an archive extraction was completed,
+      False otherwise.
+  """
+  if archive_format is None:
+    return False
+  if archive_format is 'auto':
+    archive_format = ['tar', 'zip']
+  if isinstance(archive_format, six.string_types):
+    archive_format = [archive_format]
+
+  for archive_type in archive_format:
+    if archive_type is 'tar':
+      open_fn = tarfile.open
+      is_match_fn = tarfile.is_tarfile
+    if archive_type is 'zip':
+      open_fn = zipfile.ZipFile
+      is_match_fn = zipfile.is_zipfile
+
+    if is_match_fn(file_path):
+      with open_fn(file_path) as archive:
+        try:
+          archive.extractall(path)
+        except (tarfile.TarError, RuntimeError, KeyboardInterrupt):
+          if os.path.exists(path):
+            if os.path.isfile(path):
+              os.remove(path)
+            else:
+              shutil.rmtree(path)
+          raise
+      return True
+  return False
+
+
+def get_file(fname,
+             origin,
+             untar=False,
+             md5_hash=None,
+             file_hash=None,
+             cache_subdir='datasets',
+             hash_algorithm='auto',
+             extract=False,
+             archive_format='auto',
+             cache_dir=None):
   """Downloads a file from a URL if it not already in the cache.
 
-  Passing the MD5 hash will verify the file after download
-  as well as if it is already present in the cache.
+  By default the file at the url `origin` is downloaded to the
+  cache_dir `~/.keras`, placed in the cache_subdir `datasets`,
+  and given the filename `fname`. The final location of a file
+  `example.txt` would therefore be `~/.keras/datasets/example.txt`.
+
+  Files in tar, tar.gz, tar.bz, and zip formats can also be extracted.
+  Passing a hash will verify the file after download. The command line
+  programs `shasum` and `sha256sum` can compute the hash.
 
   Arguments:
-      fname: name of the file
-      origin: original URL of the file
-      untar: boolean, whether the file should be decompressed
-      md5_hash: MD5 hash of the file for verification
-      cache_subdir: directory being used as the cache
+      fname: Name of the file. If an absolute path `/path/to/file.txt` is
+          specified the file will be saved at that location.
+      origin: Original URL of the file.
+      untar: Deprecated in favor of 'extract'.
+          boolean, whether the file should be decompressed
+      md5_hash: Deprecated in favor of 'file_hash'.
+          md5 hash of the file for verification
+      file_hash: The expected hash string of the file after download.
+          The sha256 and md5 hash algorithms are both supported.
+      cache_subdir: Subdirectory under the Keras cache dir where the file is
+          saved. If an absolute path `/path/to/folder` is
+          specified the file will be saved at that location.
+      hash_algorithm: Select the hash algorithm to verify the file.
+          options are 'md5', 'sha256', and 'auto'.
+          The default 'auto' detects the hash algorithm in use.
+      extract: True tries extracting the file as an Archive, like tar or zip.
+      archive_format: Archive format to try for extracting the file.
+          Options are 'auto', 'tar', 'zip', and None.
+          'tar' includes tar, tar.gz, and tar.bz files.
+          The default 'auto' is ['tar', 'zip'].
+          None or an empty list will return no matches found.
+      cache_dir: Location to store cached files, when None it
+          defaults to the [Keras
+            Directory](/faq/#where-is-the-keras-configuration-filed-stored).
 
   Returns:
       Path to the downloaded file
   """
-  datadir_base = os.path.expanduser(os.path.join('~', '.keras'))
+  if cache_dir is None:
+    cache_dir = os.path.expanduser(os.path.join('~', '.keras'))
+  if md5_hash is not None and file_hash is None:
+    file_hash = md5_hash
+    hash_algorithm = 'md5'
+  datadir_base = os.path.expanduser(cache_dir)
   if not os.access(datadir_base, os.W_OK):
     datadir_base = os.path.join('/tmp', '.keras')
   datadir = os.path.join(datadir_base, cache_subdir)
@@ -106,10 +192,12 @@ def get_file(fname, origin, untar=False, md5_hash=None,
   download = False
   if os.path.exists(fpath):
     # File found; verify integrity if a hash was provided.
-    if md5_hash is not None:
-      if not validate_file(fpath, md5_hash):
+    if file_hash is not None:
+      if not validate_file(fpath, file_hash, algorithm=hash_algorithm):
         print('A local file was found, but it seems to be '
-              'incomplete or outdated.')
+              'incomplete or outdated because the ' + hash_algorithm +
+              ' file hash does not match the original value of ' + file_hash +
+              ' so we will re-download the data.')
         download = True
   else:
     download = True
@@ -141,38 +229,68 @@ def get_file(fname, origin, untar=False, md5_hash=None,
 
   if untar:
     if not os.path.exists(untar_fpath):
-      print('Untaring file...')
-      tfile = tarfile.open(fpath, 'r:gz')
-      try:
-        tfile.extractall(path=datadir)
-      except (Exception, KeyboardInterrupt) as e:
-        if os.path.exists(untar_fpath):
-          if os.path.isfile(untar_fpath):
-            os.remove(untar_fpath)
-          else:
-            shutil.rmtree(untar_fpath)
-        raise
-      tfile.close()
+      _extract_archive(fpath, datadir, archive_format='tar')
     return untar_fpath
 
+  if extract:
+    _extract_archive(fpath, datadir, archive_format)
+
   return fpath
 
 
-def validate_file(fpath, md5_hash):
-  """Validates a file against a MD5 hash.
+def _hash_file(fpath, algorithm='sha256', chunk_size=65535):
+  """Calculates a file sha256 or md5 hash.
+
+  Example:
+
+  ```python
+     >>> from keras.data_utils import _hash_file
+     >>> _hash_file('/path/to/file.zip')
+     'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  ```
+
+  Arguments:
+      fpath: path to the file being validated
+      algorithm: hash algorithm, one of 'auto', 'sha256', or 'md5'.
+          The default 'auto' detects the hash algorithm in use.
+      chunk_size: Bytes to read at a time, important for large files.
+
+  Returns:
+      The file hash
+  """
+  if (algorithm is 'sha256') or (algorithm is 'auto' and len(hash) is 64):
+    hasher = hashlib.sha256()
+  else:
+    hasher = hashlib.md5()
+
+  with open(fpath, 'rb') as fpath_file:
+    for chunk in iter(lambda: fpath_file.read(chunk_size), b''):
+      hasher.update(chunk)
+
+  return hasher.hexdigest()
+
+
+def validate_file(fpath, file_hash, algorithm='auto', chunk_size=65535):
+  """Validates a file against a sha256 or md5 hash.
 
   Arguments:
       fpath: path to the file being validated
-      md5_hash: the MD5 hash being validated against
+      file_hash:  The expected hash string of the file.
+          The sha256 and md5 hash algorithms are both supported.
+      algorithm: Hash algorithm, one of 'auto', 'sha256', or 'md5'.
+          The default 'auto' detects the hash algorithm in use.
+      chunk_size: Bytes to read at a time, important for large files.
 
   Returns:
       Whether the file is valid
   """
-  hasher = hashlib.md5()
-  with open(fpath, 'rb') as f:
-    buf = f.read()
-    hasher.update(buf)
-  if str(hasher.hexdigest()) == str(md5_hash):
+  if ((algorithm is 'sha256') or
+      (algorithm is 'auto' and len(file_hash) is 64)):
+    hasher = 'sha256'
+  else:
+    hasher = 'md5'
+
+  if str(_hash_file(fpath, hasher, chunk_size)) == str(file_hash):
     return True
   else:
     return False
diff --git a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
index 6e83fde2c9..4c95c314b1 100644
--- a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
@@ -155,8 +155,8 @@ def deserialize_keras_object(identifier,
         return cls.from_config(
             config['config'],
             custom_objects=dict(
-                list(_GLOBAL_CUSTOM_OBJECTS.items()) + list(
-                    custom_objects.items())))
+                list(_GLOBAL_CUSTOM_OBJECTS.items()) +
+                list(custom_objects.items())))
       return cls.from_config(config['config'])
     else:
       # Then `cls` may be a function returning a class.
-- 
GitLab


From b6d47b5e56b19394c2fa55e55b36e2ef77fbc69e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 14:17:58 -0800
Subject: [PATCH 0324/1563] fix formatting errors and broken links inside
 "Getting Started With TensorFlow" Change: 152867721

---
 tensorflow/docs_src/get_started/get_started.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 6116c7d87f..33ff1d87d5 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -49,7 +49,6 @@ The canonical import statement for TensorFlow programs is as follows:
 
 ```python
 import tensorflow as tf
-
 ```
 This gives Python access to all of TensorFlow's classes, methods, and symbols.
 Most of the documentation assumes you have already done this.
@@ -69,12 +68,15 @@ or more tensors as inputs and produces a tensor as an output. One type of node
 is a constant. Like all TensorFlow constants, it takes no inputs, and it outputs
 a value it stores internally. We can create two floating point Tensors `node1`
 and `node2` as follows:
+
 ```python
 node1 = tf.constant(3.0, dtype=tf.float32)
 node2 = tf.constant(4.0) # also tf.float32 implicitly
 print(node1, node2)
 ```
+
 The final print statement produces
+
 ```
 Tensor("Const:0", shape=(), dtype=float32) Tensor("Const_1:0", shape=(), dtype=float32)
 ```
@@ -93,7 +95,9 @@ running the computational graph in a session as follows:
 sess = tf.Session()
 print(sess.run([node1, node2]))
 ```
+
 we see the expected values of 3.0 and 4.0:
+
 ```
 [3.0, 4.0]
 ```
@@ -107,7 +111,9 @@ node3 = tf.add(node1, node2)
 print("node3: ", node3)
 print("sess.run(node3): ",sess.run(node3))
 ```
+
 The last two print statements produce
+
 ```
 node3:  Tensor("Add:0", shape=(), dtype=float32)
 sess.run(node3):  7.0
@@ -140,10 +146,12 @@ print(sess.run(adder_node, {a: 3, b:4.5}))
 print(sess.run(adder_node, {a: [1,3], b: [2, 4]}))
 ```
 resulting in the output
+
 ```
 7.5
 [ 3.  7.]
 ```
+
 In TensorBoard, the graph looks like this:
 
 ![TensorBoard screenshot](../images/getting_started_adder.png)
-- 
GitLab


From 7c9d2a458ee6cb925a0b3d23793d0e356a6eac12 Mon Sep 17 00:00:00 2001
From: Pete Warden <petewarden@google.com>
Date: Tue, 11 Apr 2017 14:53:41 -0800
Subject: [PATCH 0325/1563] Add AudioSpectrogram op to TensorFlow for audio
 feature generation Change: 152872386

---
 tensorflow/BUILD                              |   1 +
 tensorflow/contrib/cmake/CMakeLists.txt       |   3 +
 tensorflow/contrib/cmake/external/fft2d.cmake |  52 +++
 .../cmake/patches/fft2d/CMakeLists.txt        |  17 +
 tensorflow/core/BUILD                         |   9 +-
 tensorflow/core/kernels/BUILD                 | 112 ++++++
 tensorflow/core/kernels/spectrogram.cc        | 212 +++++++++++
 tensorflow/core/kernels/spectrogram.h         | 112 ++++++
 .../kernels/spectrogram_convert_test_data.cc  |  56 +++
 tensorflow/core/kernels/spectrogram_op.cc     | 120 +++++++
 .../core/kernels/spectrogram_op_test.cc       | 104 ++++++
 tensorflow/core/kernels/spectrogram_test.cc   | 340 ++++++++++++++++++
 .../core/kernels/spectrogram_test_data/README |   8 +
 .../short_test_segment.wav                    | Bin 0 -> 91784 bytes
 .../short_test_segment_spectrogram.csv.bin    | Bin 0 -> 365968 bytes
 ...t_test_segment_spectrogram_400_200.csv.bin | Bin 0 -> 468768 bytes
 .../core/kernels/spectrogram_test_utils.cc    | 288 +++++++++++++++
 .../core/kernels/spectrogram_test_utils.h     |  81 +++++
 tensorflow/core/lib/core/bits.h               |  13 +
 tensorflow/core/ops/audio_ops.cc              |  79 ++++
 .../core/platform/default/build_config/BUILD  |   1 +
 tensorflow/core/util/command_line_flags.cc    |  28 ++
 tensorflow/core/util/command_line_flags.h     |   4 +-
 .../core/util/command_line_flags_test.cc      |  35 +-
 tensorflow/examples/wav_to_spectrogram/BUILD  |  68 ++++
 .../examples/wav_to_spectrogram/README.md     |  49 +++
 .../examples/wav_to_spectrogram/main.cc       |  66 ++++
 .../wav_to_spectrogram/wav_to_spectrogram.cc  |  97 +++++
 .../wav_to_spectrogram/wav_to_spectrogram.h   |  31 ++
 .../wav_to_spectrogram_test.cc                |  37 ++
 tensorflow/tools/lib_package/BUILD            |   4 +
 tensorflow/tools/pip_package/BUILD            |   2 +
 tensorflow/workspace.bzl                      |  10 +
 33 files changed, 2031 insertions(+), 8 deletions(-)
 create mode 100644 tensorflow/contrib/cmake/external/fft2d.cmake
 create mode 100644 tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
 create mode 100644 tensorflow/core/kernels/spectrogram.cc
 create mode 100644 tensorflow/core/kernels/spectrogram.h
 create mode 100644 tensorflow/core/kernels/spectrogram_convert_test_data.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_op.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_op_test.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_test.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/README
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin
 create mode 100644 tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin
 create mode 100644 tensorflow/core/kernels/spectrogram_test_utils.cc
 create mode 100644 tensorflow/core/kernels/spectrogram_test_utils.h
 create mode 100644 tensorflow/examples/wav_to_spectrogram/BUILD
 create mode 100644 tensorflow/examples/wav_to_spectrogram/README.md
 create mode 100644 tensorflow/examples/wav_to_spectrogram/main.cc
 create mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
 create mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
 create mode 100644 tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index f356dac100..cffc55ad31 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -277,6 +277,7 @@ filegroup(
         "//tensorflow/examples/tutorials/estimators:all_files",
         "//tensorflow/examples/tutorials/mnist:all_files",
         "//tensorflow/examples/tutorials/word2vec:all_files",
+        "//tensorflow/examples/wav_to_spectrogram:all_files",
         "//tensorflow/go:all_files",
         "//tensorflow/java:all_files",
         "//tensorflow/java/src/main/java/org/tensorflow/examples:all_files",
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index e27df6898e..31a3d45a98 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -108,6 +108,7 @@ include(eigen)
 include(gemmlowp)
 include(jsoncpp)
 include(farmhash)
+include(fft2d)
 include(highwayhash)
 include(protobuf)
 if (tensorflow_BUILD_CC_TESTS)
@@ -121,6 +122,7 @@ set(tensorflow_EXTERNAL_LIBRARIES
     ${jpeg_STATIC_LIBRARIES}
     ${jsoncpp_STATIC_LIBRARIES}
     ${farmhash_STATIC_LIBRARIES}
+    ${fft2d_STATIC_LIBRARIES}
     ${highwayhash_STATIC_LIBRARIES}
     ${protobuf_STATIC_LIBRARIES}
 )
@@ -135,6 +137,7 @@ set(tensorflow_EXTERNAL_DEPENDENCIES
     protobuf
     eigen
     gemmlowp
+    fft2d
 )
 
 include_directories(
diff --git a/tensorflow/contrib/cmake/external/fft2d.cmake b/tensorflow/contrib/cmake/external/fft2d.cmake
new file mode 100644
index 0000000000..85f77e9879
--- /dev/null
+++ b/tensorflow/contrib/cmake/external/fft2d.cmake
@@ -0,0 +1,52 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+include (ExternalProject)
+
+set(fft2d_URL http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz)
+set(fft2d_HASH SHA256=52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296)
+set(fft2d_BUILD ${CMAKE_CURRENT_BINARY_DIR}/fft2d/)
+set(fft2d_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/fft2d/src)
+
+if(WIN32)
+  set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/lib/fft2d.lib)
+
+  ExternalProject_Add(fft2d
+      PREFIX fft2d
+      URL ${fft2d_URL}
+      URL_HASH ${fft2d_HASH}
+      DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+      BUILD_IN_SOURCE 1
+      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt
+      INSTALL_DIR ${fft2d_INSTALL}
+      CMAKE_CACHE_ARGS
+          -DCMAKE_BUILD_TYPE:STRING=Release
+          -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+          -DCMAKE_INSTALL_PREFIX:STRING=${fft2d_INSTALL})
+else()
+  set(fft2d_STATIC_LIBRARIES ${fft2d_BUILD}/src/fft2d/libfft2d.a)
+
+  ExternalProject_Add(fft2d
+      PREFIX fft2d
+      URL ${fft2d_URL}
+      URL_HASH ${fft2d_HASH}
+      DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
+      BUILD_IN_SOURCE 1
+      PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/patches/fft2d/CMakeLists.txt ${fft2d_BUILD}/src/fft2d/CMakeLists.txt
+      INSTALL_DIR $(fft2d_INSTALL)
+      INSTALL_COMMAND echo
+      BUILD_COMMAND $(MAKE))
+    
+endif()
diff --git a/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt b/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
new file mode 100644
index 0000000000..b31ea3ed98
--- /dev/null
+++ b/tensorflow/contrib/cmake/patches/fft2d/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.8.3)
+
+project(fft2d)
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+set(FFT2D_SRCS
+    "fftsg.c"
+)
+
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_library(fft2d ${FFT2D_SRCS})
+
+install(TARGETS fft2d
+  LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+  ARCHIVE DESTINATION lib COMPONENT Development)
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index afcc7891b6..d3455e50b0 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -496,7 +496,6 @@ cc_library(
 tf_gen_op_libs(
     op_lib_names = [
         "array_ops",
-        "audio_ops",
         "candidate_sampling_ops",
         "control_flow_ops",
         "ctc_ops",
@@ -526,6 +525,13 @@ tf_gen_op_libs(
     ],
 )
 
+tf_gen_op_libs(
+    op_lib_names = [
+        "audio_ops",
+    ],
+    deps = [":lib"],
+)
+
 cc_library(
     name = "debug_ops_op_lib",
     srcs = ["ops/debug_ops.cc"],
@@ -688,6 +694,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//tensorflow/core/kernels:array",
+        "//tensorflow/core/kernels:audio",
         "//tensorflow/core/kernels:bincount_op",
         "//tensorflow/core/kernels:candidate_sampler_ops",
         "//tensorflow/core/kernels:control_flow_ops",
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 72136c3ae9..036ac32419 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -3559,6 +3559,117 @@ tf_kernel_library(
     ],
 )
 
+filegroup(
+    name = "spectrogram_test_data",
+    srcs = [
+        "spectrogram_test_data/short_test_segment.wav",
+        "spectrogram_test_data/short_test_segment_spectrogram.csv.bin",
+        "spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "spectrogram",
+    srcs = ["spectrogram.cc"],
+    hdrs = ["spectrogram.h"],
+    copts = tf_copts(),
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//third_party/fft2d:fft2d_headers",
+        "@fft2d//:fft2d",
+    ],
+)
+
+cc_library(
+    name = "spectrogram_test_utils",
+    testonly = 1,
+    srcs = ["spectrogram_test_utils.cc"],
+    hdrs = ["spectrogram_test_utils.h"],
+    copts = tf_copts(),
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+    ],
+)
+
+cc_binary(
+    name = "spectrogram_convert_test_data",
+    testonly = 1,
+    srcs = ["spectrogram_convert_test_data.cc"],
+    deps = [
+        ":spectrogram_test_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_cc_test(
+    name = "spectrogram_test",
+    size = "medium",
+    srcs = ["spectrogram_test.cc"],
+    data = [":spectrogram_test_data"],
+    deps = [
+        ":spectrogram",
+        ":spectrogram_test_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:lib_test_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//third_party/eigen3",
+    ],
+)
+
+tf_kernel_library(
+    name = "spectrogram_op",
+    prefix = "spectrogram_op",
+    deps = [
+        ":spectrogram",
+        "//tensorflow/core:audio_ops_op_lib",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+    alwayslink = 1,
+)
+
+tf_cuda_cc_test(
+    name = "spectrogram_op_test",
+    size = "small",
+    srcs = ["spectrogram_op_test.cc"],
+    deps = [
+        ":ops_util",
+        ":spectrogram_op",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:client_session",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:tensorflow",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+    ],
+)
+
+cc_library(
+    name = "audio",
+    deps = [
+        ":decode_wav_op",
+        ":encode_wav_op",
+        ":spectrogram_op",
+    ],
+)
+
 # Android libraries -----------------------------------------------------------
 
 # Changes to the Android srcs here should be replicated in
@@ -3962,6 +4073,7 @@ filegroup(
             "whole_file_read_ops.*",
             "sample_distorted_bounding_box_op.*",
             "ctc_loss_op.*",
+            "spectrogram_convert_test_data.cc",
             # Excluded due to experimental status:
             "debug_ops.*",
             "scatter_nd_op*",
diff --git a/tensorflow/core/kernels/spectrogram.cc b/tensorflow/core/kernels/spectrogram.cc
new file mode 100644
index 0000000000..7531d5d64a
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram.cc
@@ -0,0 +1,212 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/spectrogram.h"
+
+#include <math.h>
+
+#include "third_party/fft2d/fft.h"
+#include "tensorflow/core/lib/core/bits.h"
+
+namespace tensorflow {
+
+using std::complex;
+
+namespace {
+// Returns the default Hann window function for the spectrogram.
+void GetPeriodicHann(int window_length, std::vector<double>* window) {
+  // Some platforms don't have M_PI, so define a local constant here.
+  const double pi = std::atan(1) * 4;
+  window->resize(window_length);
+  for (int i = 0; i < window_length; ++i) {
+    (*window)[i] = 0.5 - 0.5 * cos((2 * pi * i) / window_length);
+  }
+}
+}  // namespace
+
+bool Spectrogram::Initialize(int window_length, int step_length) {
+  std::vector<double> window;
+  GetPeriodicHann(window_length, &window);
+  return Initialize(window, step_length);
+}
+
+bool Spectrogram::Initialize(const std::vector<double>& window,
+                             int step_length) {
+  window_length_ = window.size();
+  window_ = window;  // Copy window.
+  if (window_length_ < 2) {
+    LOG(ERROR) << "Window length too short.";
+    initialized_ = false;
+    return false;
+  }
+
+  step_length_ = step_length;
+  if (step_length_ < 1) {
+    LOG(ERROR) << "Step length must be positive.";
+    initialized_ = false;
+    return false;
+  }
+
+  fft_length_ = NextPowerOfTwo(window_length_);
+  CHECK(fft_length_ >= window_length_);
+  output_frequency_channels_ = 1 + fft_length_ / 2;
+
+  // Allocate 2 more than what rdft needs, so we can rationalize the layout.
+  fft_input_output_.assign(fft_length_ + 2, 0.0);
+
+  int half_fft_length = fft_length_ / 2;
+  fft_double_working_area_.assign(half_fft_length, 0.0);
+  fft_integer_working_area_.assign(2 + static_cast<int>(sqrt(half_fft_length)),
+                                   0);
+  // Set flag element to ensure that the working areas are initialized
+  // on the first call to cdft.  It's redundant given the assign above,
+  // but keep it as a reminder.
+  fft_integer_working_area_[0] = 0;
+  input_queue_.clear();
+  samples_to_next_step_ = window_length_;
+  initialized_ = true;
+  return true;
+}
+
+template <class InputSample, class OutputSample>
+bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<InputSample>& input,
+    std::vector<std::vector<complex<OutputSample>>>* output) {
+  if (!initialized_) {
+    LOG(ERROR) << "ComputeComplexSpectrogram() called before successful call "
+               << "to Initialize().";
+    return false;
+  }
+  CHECK(output);
+  output->clear();
+  int input_start = 0;
+  while (GetNextWindowOfSamples(input, &input_start)) {
+    DCHECK_EQ(input_queue_.size(), window_length_);
+    ProcessCoreFFT();  // Processes input_queue_ to fft_input_output_.
+    // Add a new slice vector onto the output, to save new result to.
+    output->resize(output->size() + 1);
+    // Get a reference to the newly added slice to fill in.
+    auto& spectrogram_slice = output->back();
+    spectrogram_slice.resize(output_frequency_channels_);
+    for (int i = 0; i < output_frequency_channels_; ++i) {
+      // This will convert double to float if it needs to.
+      spectrogram_slice[i] = complex<OutputSample>(
+          fft_input_output_[2 * i], fft_input_output_[2 * i + 1]);
+    }
+  }
+  return true;
+}
+// Instantiate it four ways:
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<float>& input, std::vector<std::vector<complex<float>>>*);
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<double>& input,
+    std::vector<std::vector<complex<float>>>*);
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<float>& input,
+    std::vector<std::vector<complex<double>>>*);
+template bool Spectrogram::ComputeComplexSpectrogram(
+    const std::vector<double>& input,
+    std::vector<std::vector<complex<double>>>*);
+
+template <class InputSample, class OutputSample>
+bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<InputSample>& input,
+    std::vector<std::vector<OutputSample>>* output) {
+  if (!initialized_) {
+    LOG(ERROR) << "ComputeSquaredMagnitudeSpectrogram() called before "
+               << "successful call to Initialize().";
+    return false;
+  }
+  CHECK(output);
+  output->clear();
+  int input_start = 0;
+  while (GetNextWindowOfSamples(input, &input_start)) {
+    DCHECK_EQ(input_queue_.size(), window_length_);
+    ProcessCoreFFT();  // Processes input_queue_ to fft_input_output_.
+    // Add a new slice vector onto the output, to save new result to.
+    output->resize(output->size() + 1);
+    // Get a reference to the newly added slice to fill in.
+    auto& spectrogram_slice = output->back();
+    spectrogram_slice.resize(output_frequency_channels_);
+    for (int i = 0; i < output_frequency_channels_; ++i) {
+      // Similar to the Complex case, except storing the norm.
+      // But the norm function is known to be a performance killer,
+      // so do it this way with explicit real and imagninary temps.
+      const double re = fft_input_output_[2 * i];
+      const double im = fft_input_output_[2 * i + 1];
+      // Which finally converts double to float if it needs to.
+      spectrogram_slice[i] = re * re + im * im;
+    }
+  }
+  return true;
+}
+// Instantiate it four ways:
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<float>& input, std::vector<std::vector<float>>*);
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<double>& input, std::vector<std::vector<float>>*);
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<float>& input, std::vector<std::vector<double>>*);
+template bool Spectrogram::ComputeSquaredMagnitudeSpectrogram(
+    const std::vector<double>& input, std::vector<std::vector<double>>*);
+
+// Return true if a full window of samples is prepared; manage the queue.
+template <class InputSample>
+bool Spectrogram::GetNextWindowOfSamples(const std::vector<InputSample>& input,
+                                         int* input_start) {
+  auto input_it = input.begin() + *input_start;
+  int input_remaining = input.end() - input_it;
+  if (samples_to_next_step_ > input_remaining) {
+    // Copy in as many samples are left and return false, no full window.
+    input_queue_.insert(input_queue_.end(), input_it, input.end());
+    *input_start += input_remaining;  // Increases it to input.size().
+    samples_to_next_step_ -= input_remaining;
+    return false;  // Not enough for a full window.
+  } else {
+    // Copy just enough into queue to make a new window, then trim the
+    // front off the queue to make it window-sized.
+    input_queue_.insert(input_queue_.end(), input_it,
+                        input_it + samples_to_next_step_);
+    *input_start += samples_to_next_step_;
+    input_queue_.erase(
+        input_queue_.begin(),
+        input_queue_.begin() + input_queue_.size() - window_length_);
+    DCHECK_EQ(window_length_, input_queue_.size());
+    samples_to_next_step_ = step_length_;  // Be ready for next time.
+    return true;  // Yes, input_queue_ now contains exactly a window-full.
+  }
+}
+
+void Spectrogram::ProcessCoreFFT() {
+  for (int j = 0; j < window_length_; ++j) {
+    fft_input_output_[j] = input_queue_[j] * window_[j];
+  }
+  // Zero-pad the rest of the input buffer.
+  for (int j = window_length_; j < fft_length_; ++j) {
+    fft_input_output_[j] = 0.0;
+  }
+  const int kForwardFFT = 1;  // 1 means forward; -1 reverse.
+  // This real FFT is a fair amount faster than using cdft here.
+  rdft(fft_length_, kForwardFFT, &fft_input_output_[0],
+       &fft_integer_working_area_[0], &fft_double_working_area_[0]);
+  // Make rdft result look like cdft result;
+  // unpack the last real value from the first position's imag slot.
+  fft_input_output_[fft_length_] = fft_input_output_[1];
+  fft_input_output_[fft_length_ + 1] = 0;
+  fft_input_output_[1] = 0;
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram.h b/tensorflow/core/kernels/spectrogram.h
new file mode 100644
index 0000000000..5476a0a961
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram.h
@@ -0,0 +1,112 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Class for generating spectrogram slices from a waveform.
+// Initialize() should be called before calls to other functions.  Once
+// Initialize() has been called and returned true, The Compute*() functions can
+// be called repeatedly with sequential input data (ie. the first element of the
+// next input vector directly follows the last element of the previous input
+// vector). Whenever enough audio samples are buffered to produce a
+// new frame, it will be placed in output. Output is cleared on each
+// call to Compute*(). This class is thread-unsafe, and should only be
+// called from one thread at a time.
+// With the default parameters, the output of this class should be very
+// close to the results of the following MATLAB code:
+// overlap_samples = window_length_samples - step_samples;
+// window = hann(window_length_samples, 'periodic');
+// S = abs(spectrogram(audio, window, overlap_samples)).^2;
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
+
+#include <complex>
+#include <deque>
+#include <vector>
+
+#include "third_party/fft2d/fft.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+class Spectrogram {
+ public:
+  Spectrogram() : initialized_(false) {}
+  ~Spectrogram() {}
+
+  // Initializes the class with a given window length and step length
+  // (both in samples). Internally a Hann window is used as the window
+  // function. Returns true on success, after which calls to Process()
+  // are possible. window_length must be greater than 1 and step
+  // length must be greater than 0.
+  bool Initialize(int window_length, int step_length);
+
+  // Initialize with an explicit window instead of a length.
+  bool Initialize(const std::vector<double>& window, int step_length);
+
+  // Processes an arbitrary amount of audio data (contained in input)
+  // to yield complex spectrogram frames. After a successful call to
+  // Initialize(), Process() may be called repeatedly with new input data
+  // each time.  The audio input is buffered internally, and the output
+  // vector is populated with as many temporally-ordered spectral slices
+  // as it is possible to generate from the input.  The output is cleared
+  // on each call before the new frames (if any) are added.
+  //
+  // The template parameters can be float or double.
+  template <class InputSample, class OutputSample>
+  bool ComputeComplexSpectrogram(
+      const std::vector<InputSample>& input,
+      std::vector<std::vector<std::complex<OutputSample>>>* output);
+
+  // This function works as the one above, but returns the power
+  // (the L2 norm, or the squared magnitude) of each complex value.
+  template <class InputSample, class OutputSample>
+  bool ComputeSquaredMagnitudeSpectrogram(
+      const std::vector<InputSample>& input,
+      std::vector<std::vector<OutputSample>>* output);
+
+  // Return reference to the window function used internally.
+  const std::vector<double>& GetWindow() const { return window_; }
+
+  // Return the number of frequency channels in the spectrogram.
+  int output_frequency_channels() const { return output_frequency_channels_; }
+
+ private:
+  template <class InputSample>
+  bool GetNextWindowOfSamples(const std::vector<InputSample>& input,
+                              int* input_start);
+  void ProcessCoreFFT();
+
+  int fft_length_;
+  int output_frequency_channels_;
+  int window_length_;
+  int step_length_;
+  bool initialized_;
+  int samples_to_next_step_;
+
+  std::vector<double> window_;
+  std::vector<double> fft_input_output_;
+  std::deque<double> input_queue_;
+
+  // Working data areas for the FFT routines.
+  std::vector<int> fft_integer_working_area_;
+  std::vector<double> fft_double_working_area_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(Spectrogram);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_H_
diff --git a/tensorflow/core/kernels/spectrogram_convert_test_data.cc b/tensorflow/core/kernels/spectrogram_convert_test_data.cc
new file mode 100644
index 0000000000..bae13c0213
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_convert_test_data.cc
@@ -0,0 +1,56 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/spectrogram_test_utils.h"
+
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+namespace wav {
+
+// This takes a CSV file representing an array of complex numbers, and saves out
+// a version using a binary format to save space in the repository.
+Status ConvertCsvToRaw(const string& input_filename) {
+  std::vector<std::vector<std::complex<double>>> input_data;
+  ReadCSVFileToComplexVectorOrDie(input_filename, &input_data);
+  const string output_filename = input_filename + ".bin";
+  if (!WriteComplexVectorToRawFloatFile(output_filename, input_data)) {
+    return errors::InvalidArgument("Failed to write raw float file ",
+                                   input_filename);
+  }
+  LOG(INFO) << "Wrote raw file to " << output_filename;
+  return Status::OK();
+}
+
+}  // namespace wav
+}  // namespace tensorflow
+
+int main(int argc, char* argv[]) {
+  tensorflow::port::InitMain(argv[0], &argc, &argv);
+  if (argc < 2) {
+    LOG(ERROR) << "You must supply a CSV file as the first argument";
+    return 1;
+  }
+  tensorflow::string filename(argv[1]);
+  tensorflow::Status status = tensorflow::wav::ConvertCsvToRaw(filename);
+  if (!status.ok()) {
+    LOG(ERROR) << "Error processing '" << filename << "':" << status;
+    return 1;
+  }
+  return 0;
+}
diff --git a/tensorflow/core/kernels/spectrogram_op.cc b/tensorflow/core/kernels/spectrogram_op.cc
new file mode 100644
index 0000000000..98d9bb1ad1
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_op.cc
@@ -0,0 +1,120 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/audio_ops.cc
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/spectrogram.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+// Create a spectrogram frequency visualization from audio data.
+class SpectrogramOp : public OpKernel {
+ public:
+  explicit SpectrogramOp(OpKernelConstruction* context) : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("window_size", &window_size_));
+    OP_REQUIRES_OK(context, context->GetAttr("stride", &stride_));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("magnitude_squared", &magnitude_squared_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input = context->input(0);
+    OP_REQUIRES(context, input.dims() == 2,
+                errors::InvalidArgument("input must be 2-dimensional",
+                                        input.shape().DebugString()));
+    Spectrogram spectrogram;
+    OP_REQUIRES(context, spectrogram.Initialize(window_size_, stride_),
+                errors::InvalidArgument(
+                    "Spectrogram initialization failed for window size ",
+                    window_size_, " and stride ", stride_));
+
+    const auto input_as_matrix = input.matrix<float>();
+
+    const int64 sample_count = input.dim_size(0);
+    const int64 channel_count = input.dim_size(1);
+
+    const int64 output_width = spectrogram.output_frequency_channels();
+    const int64 length_minus_window = (sample_count - window_size_);
+    int64 output_height;
+    if (length_minus_window < 0) {
+      output_height = 0;
+    } else {
+      output_height = 1 + (length_minus_window / stride_);
+    }
+    const int64 output_slices = channel_count;
+
+    Tensor* output_tensor = nullptr;
+    OP_REQUIRES_OK(
+        context,
+        context->allocate_output(
+            0, TensorShape({output_slices, output_height, output_width}),
+            &output_tensor));
+    auto output_flat = output_tensor->flat<float>().data();
+
+    std::vector<float> input_for_channel(sample_count);
+    for (int64 channel = 0; channel < channel_count; ++channel) {
+      float* output_slice =
+          output_flat + (channel * output_height * output_width);
+      for (int i = 0; i < sample_count; ++i) {
+        input_for_channel[i] = input_as_matrix(i, channel);
+      }
+      std::vector<std::vector<float>> spectrogram_output;
+      OP_REQUIRES(context,
+                  spectrogram.ComputeSquaredMagnitudeSpectrogram(
+                      input_for_channel, &spectrogram_output),
+                  errors::InvalidArgument("Spectrogram compute failed"));
+      OP_REQUIRES(context, (spectrogram_output.size() == output_height),
+                  errors::InvalidArgument(
+                      "Spectrogram size calculation failed: Expected height ",
+                      output_height, " but got ", spectrogram_output.size()));
+      OP_REQUIRES(context,
+                  spectrogram_output.empty() ||
+                      (spectrogram_output[0].size() == output_width),
+                  errors::InvalidArgument(
+                      "Spectrogram size calculation failed: Expected width ",
+                      output_width, " but got ", spectrogram_output[0].size()));
+      for (int row_index = 0; row_index < output_height; ++row_index) {
+        const std::vector<float>& spectrogram_row =
+            spectrogram_output[row_index];
+        DCHECK_EQ(spectrogram_row.size(), output_width);
+        float* output_row = output_slice + (row_index * output_width);
+        if (magnitude_squared_) {
+          for (int i = 0; i < output_width; ++i) {
+            output_row[i] = spectrogram_row[i];
+          }
+        } else {
+          for (int i = 0; i < output_width; ++i) {
+            output_row[i] = sqrtf(spectrogram_row[i]);
+          }
+        }
+      }
+    }
+  }
+
+ private:
+  int32 window_size_;
+  int32 stride_;
+  bool magnitude_squared_;
+};
+REGISTER_KERNEL_BUILDER(Name("AudioSpectrogram").Device(DEVICE_CPU),
+                        SpectrogramOp);
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_op_test.cc b/tensorflow/core/kernels/spectrogram_op_test.cc
new file mode 100644
index 0000000000..5c3cbeeeb9
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_op_test.cc
@@ -0,0 +1,104 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#define EIGEN_USE_THREADS
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "tensorflow/cc/client/client_session.h"
+#include "tensorflow/cc/ops/audio_ops.h"
+#include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/math_ops.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/framework/types.pb.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+
+using namespace ops;  // NOLINT(build/namespaces)
+
+TEST(SpectrogramOpTest, SimpleTest) {
+  Scope root = Scope::NewRootScope();
+
+  Tensor audio_tensor(DT_FLOAT, TensorShape({8, 1}));
+  test::FillValues<float>(&audio_tensor,
+                          {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f});
+
+  Output audio_const_op = Const(root.WithOpName("audio_const_op"),
+                                Input::Initializer(audio_tensor));
+
+  AudioSpectrogram spectrogram_op =
+      AudioSpectrogram(root.WithOpName("spectrogram_op"), audio_const_op, 8, 1);
+
+  TF_ASSERT_OK(root.status());
+
+  ClientSession session(root);
+  std::vector<Tensor> outputs;
+
+  TF_EXPECT_OK(session.Run(ClientSession::FeedType(),
+                           {spectrogram_op.spectrogram}, &outputs));
+
+  const Tensor& spectrogram_tensor = outputs[0];
+
+  EXPECT_EQ(3, spectrogram_tensor.dims());
+  EXPECT_EQ(5, spectrogram_tensor.dim_size(2));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(1));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(0));
+
+  test::ExpectTensorNear<float>(
+      spectrogram_tensor,
+      test::AsTensor<float>({0, 1, 2, 1, 0}, TensorShape({1, 1, 5})), 1e-3);
+}
+
+TEST(SpectrogramOpTest, SquaredTest) {
+  Scope root = Scope::NewRootScope();
+
+  Tensor audio_tensor(DT_FLOAT, TensorShape({8, 1}));
+  test::FillValues<float>(&audio_tensor,
+                          {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f});
+
+  Output audio_const_op = Const(root.WithOpName("audio_const_op"),
+                                Input::Initializer(audio_tensor));
+
+  AudioSpectrogram spectrogram_op =
+      AudioSpectrogram(root.WithOpName("spectrogram_op"), audio_const_op, 8, 1,
+                       AudioSpectrogram::Attrs().MagnitudeSquared(true));
+
+  TF_ASSERT_OK(root.status());
+
+  ClientSession session(root);
+  std::vector<Tensor> outputs;
+
+  TF_EXPECT_OK(session.Run(ClientSession::FeedType(),
+                           {spectrogram_op.spectrogram}, &outputs));
+
+  const Tensor& spectrogram_tensor = outputs[0];
+
+  EXPECT_EQ(3, spectrogram_tensor.dims());
+  EXPECT_EQ(5, spectrogram_tensor.dim_size(2));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(1));
+  EXPECT_EQ(1, spectrogram_tensor.dim_size(0));
+
+  test::ExpectTensorNear<float>(
+      spectrogram_tensor,
+      test::AsTensor<float>({0, 1, 4, 1, 0}, TensorShape({1, 1, 5})), 1e-3);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test.cc b/tensorflow/core/kernels/spectrogram_test.cc
new file mode 100644
index 0000000000..73175a91a0
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test.cc
@@ -0,0 +1,340 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// The MATLAB test data were generated using GenerateTestData.m.
+
+#include "tensorflow/core/kernels/spectrogram.h"
+
+#include <complex>
+#include <vector>
+
+#include "tensorflow/core/kernels/spectrogram_test_utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+using ::std::complex;
+
+const char kInputFilename[] =
+    "core/kernels/spectrogram_test_data/short_test_segment.wav";
+
+const char kExpectedFilename[] =
+    "core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin";
+const int kDataVectorLength = 257;
+const int kNumberOfFramesInTestData = 178;
+
+const char kExpectedNonPowerOfTwoFilename[] =
+    "core/kernels/spectrogram_test_data/"
+    "short_test_segment_spectrogram_400_200.csv.bin";
+const int kNonPowerOfTwoDataVectorLength = 257;
+const int kNumberOfFramesInNonPowerOfTwoTestData = 228;
+
+TEST(SpectrogramTest, TooLittleDataYieldsNoFrames) {
+  Spectrogram sgram;
+  sgram.Initialize(400, 200);
+  std::vector<double> input;
+  // Generate 44 samples of audio.
+  SineWave(44100, 1000.0, 0.001, &input);
+  EXPECT_EQ(44, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(0, output.size());
+}
+
+TEST(SpectrogramTest, StepSizeSmallerThanWindow) {
+  Spectrogram sgram;
+  EXPECT_TRUE(sgram.Initialize(400, 200));
+  std::vector<double> input;
+  // Generate 661 samples of audio.
+  SineWave(44100, 1000.0, 0.015, &input);
+  EXPECT_EQ(661, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(2, output.size());
+}
+
+TEST(SpectrogramTest, StepSizeBiggerThanWindow) {
+  Spectrogram sgram;
+  EXPECT_TRUE(sgram.Initialize(200, 400));
+  std::vector<double> input;
+  // Generate 882 samples of audio.
+  SineWave(44100, 1000.0, 0.02, &input);
+  EXPECT_EQ(882, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(2, output.size());
+}
+
+TEST(SpectrogramTest, StepSizeBiggerThanWindow2) {
+  Spectrogram sgram;
+  EXPECT_TRUE(sgram.Initialize(200, 400));
+  std::vector<double> input;
+  // Generate more than 600 but fewer than 800 samples of audio.
+  SineWave(44100, 1000.0, 0.016, &input);
+  EXPECT_GT(input.size(), 600);
+  EXPECT_LT(input.size(), 800);
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(2, output.size());
+}
+
+TEST(SpectrogramTest,
+     MultipleCallsToComputeComplexSpectrogramMayYieldDifferentNumbersOfFrames) {
+  // Repeatedly pass inputs with "extra" samples beyond complete windows
+  // and check that the excess points cumulate to eventually cause an
+  // extra output frame.
+  Spectrogram sgram;
+  sgram.Initialize(200, 400);
+  std::vector<double> input;
+  // Generate 882 samples of audio.
+  SineWave(44100, 1000.0, 0.02, &input);
+  EXPECT_EQ(882, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  const std::vector<int> expected_output_sizes = {
+      2,  // One pass of input leaves 82 samples buffered after two steps of
+          // 400.
+      2,  // Passing in 882 samples again will now leave 164 samples buffered.
+      3,  // Third time gives 246 extra samples, triggering an extra output
+          // frame.
+  };
+  for (int expected_output_size : expected_output_sizes) {
+    sgram.ComputeComplexSpectrogram(input, &output);
+    EXPECT_EQ(expected_output_size, output.size());
+  }
+}
+
+TEST(SpectrogramTest, CumulatingExcessInputsForOverlappingFrames) {
+  // Input frames that don't fit into whole windows are cumulated even when
+  // the windows have overlap (similar to
+  // MultipleCallsToComputeComplexSpectrogramMayYieldDifferentNumbersOfFrames
+  // but with window size/hop size swapped).
+  Spectrogram sgram;
+  sgram.Initialize(400, 200);
+  std::vector<double> input;
+  // Generate 882 samples of audio.
+  SineWave(44100, 1000.0, 0.02, &input);
+  EXPECT_EQ(882, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  const std::vector<int> expected_output_sizes = {
+      3,  // Windows 0..400, 200..600, 400..800 with 82 samples buffered.
+      4,  // 1764 frames input; outputs from 600, 800, 1000, 1200..1600.
+      5,  // 2646 frames in; outputs from 1400, 1600, 1800, 2000, 2200..2600.
+  };
+  for (int expected_output_size : expected_output_sizes) {
+    sgram.ComputeComplexSpectrogram(input, &output);
+    EXPECT_EQ(expected_output_size, output.size());
+  }
+}
+
+TEST(SpectrogramTest, StepSizeEqualToWindowWorks) {
+  Spectrogram sgram;
+  sgram.Initialize(200, 200);
+  std::vector<double> input;
+  // Generate 2205 samples of audio.
+  SineWave(44100, 1000.0, 0.05, &input);
+  EXPECT_EQ(2205, input.size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  EXPECT_EQ(11, output.size());
+}
+
+template <class ExpectedSample, class ActualSample>
+void CompareComplexData(
+    const std::vector<std::vector<complex<ExpectedSample>>>& expected,
+    const std::vector<std::vector<complex<ActualSample>>>& actual,
+    double tolerance) {
+  ASSERT_EQ(actual.size(), expected.size());
+  for (int i = 0; i < expected.size(); ++i) {
+    ASSERT_EQ(expected[i].size(), actual[i].size());
+    for (int j = 0; j < expected[i].size(); ++j) {
+      ASSERT_NEAR(real(expected[i][j]), real(actual[i][j]), tolerance)
+          << ": where i=" << i << " and j=" << j << ".";
+      ASSERT_NEAR(imag(expected[i][j]), imag(actual[i][j]), tolerance)
+          << ": where i=" << i << " and j=" << j << ".";
+    }
+  }
+}
+
+template <class Sample>
+double GetMaximumAbsolute(const std::vector<std::vector<Sample>>& spectrogram) {
+  double max_absolute = 0.0;
+  for (int i = 0; i < spectrogram.size(); ++i) {
+    for (int j = 0; j < spectrogram[i].size(); ++j) {
+      double absolute_value = std::abs(spectrogram[i][j]);
+      if (absolute_value > max_absolute) {
+        max_absolute = absolute_value;
+      }
+    }
+  }
+  return max_absolute;
+}
+
+template <class ExpectedSample, class ActualSample>
+void CompareMagnitudeData(
+    const std::vector<std::vector<complex<ExpectedSample>>>&
+        expected_complex_output,
+    const std::vector<std::vector<ActualSample>>& actual_squared_magnitude,
+    double tolerance) {
+  ASSERT_EQ(actual_squared_magnitude.size(), expected_complex_output.size());
+  for (int i = 0; i < expected_complex_output.size(); ++i) {
+    ASSERT_EQ(expected_complex_output[i].size(),
+              actual_squared_magnitude[i].size());
+    for (int j = 0; j < expected_complex_output[i].size(); ++j) {
+      ASSERT_NEAR(norm(expected_complex_output[i][j]),
+                  actual_squared_magnitude[i][j], tolerance)
+          << ": where i=" << i << " and j=" << j << ".";
+    }
+  }
+}
+
+TEST(SpectrogramTest, ReInitializationWorks) {
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  std::vector<std::vector<complex<double>>> first_output;
+  std::vector<std::vector<complex<double>>> second_output;
+  sgram.Initialize(512, 256);
+  sgram.ComputeComplexSpectrogram(input, &first_output);
+  // Re-Initialize it.
+  sgram.Initialize(512, 256);
+  sgram.ComputeComplexSpectrogram(input, &second_output);
+  // Verify identical outputs.
+  ASSERT_EQ(first_output.size(), second_output.size());
+  int slice_size = first_output[0].size();
+  for (int i = 0; i < first_output.size(); ++i) {
+    ASSERT_EQ(slice_size, first_output[i].size());
+    ASSERT_EQ(slice_size, second_output[i].size());
+    for (int j = 0; j < slice_size; ++j) {
+      ASSERT_EQ(first_output[i][j], second_output[i][j]);
+    }
+  }
+}
+
+TEST(SpectrogramTest, ComputedComplexDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  CompareComplexData(expected_output, output, 1e-5);
+}
+
+TEST(SpectrogramTest, ComputedFloatComplexDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> double_input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &double_input));
+  std::vector<float> input;
+  input.assign(double_input.begin(), double_input.end());
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<complex<float>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  CompareComplexData(expected_output, output, 1e-4);
+}
+
+TEST(SpectrogramTest, ComputedSquaredMagnitudeDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<double>> output;
+  sgram.ComputeSquaredMagnitudeSpectrogram(input, &output);
+  CompareMagnitudeData(expected_output, output, 1e-3);
+}
+
+TEST(SpectrogramTest, ComputedFloatSquaredMagnitudeDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(512, 256);
+  std::vector<double> double_input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &double_input));
+  EXPECT_EQ(kInputDataLength, double_input.size());
+  std::vector<float> input;
+  input.assign(double_input.begin(), double_input.end());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kExpectedFilename),
+      kDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInTestData, expected_output.size());
+  EXPECT_EQ(kDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<float>> output;
+  sgram.ComputeSquaredMagnitudeSpectrogram(input, &output);
+  double max_absolute = GetMaximumAbsolute(output);
+  EXPECT_GT(max_absolute, 2300.0);  // Verify that we have some big numbers.
+  // Squaring increases dynamic range; max square is about 2300,
+  // so 2e-4 is about 7 decimal digits; not bad for a float.
+  CompareMagnitudeData(expected_output, output, 2e-4);
+}
+
+TEST(SpectrogramTest, ComputedNonPowerOfTwoComplexDataAgreeWithMatlab) {
+  const int kInputDataLength = 45870;
+  Spectrogram sgram;
+  sgram.Initialize(400, 200);
+  std::vector<double> input;
+  CHECK(ReadWaveFileToVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(), kInputFilename),
+      &input));
+  EXPECT_EQ(kInputDataLength, input.size());
+  std::vector<std::vector<complex<double>>> expected_output;
+  ASSERT_TRUE(ReadRawFloatFileToComplexVector(
+      tensorflow::io::JoinPath(testing::TensorFlowSrcRoot(),
+                               kExpectedNonPowerOfTwoFilename),
+      kNonPowerOfTwoDataVectorLength, &expected_output));
+  EXPECT_EQ(kNumberOfFramesInNonPowerOfTwoTestData, expected_output.size());
+  EXPECT_EQ(kNonPowerOfTwoDataVectorLength, expected_output[0].size());
+  std::vector<std::vector<complex<double>>> output;
+  sgram.ComputeComplexSpectrogram(input, &output);
+  CompareComplexData(expected_output, output, 1e-5);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test_data/README b/tensorflow/core/kernels/spectrogram_test_data/README
new file mode 100644
index 0000000000..271238e0c9
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test_data/README
@@ -0,0 +1,8 @@
+The CSV spectrogram files in this directory are generated from the
+matlab code in ./matlab/GenerateTestData.m
+To save space in the repo, you'll then need to convert them into a binary packed
+format using the convert_test_data.cc command line tool.
+
+
+short_test_segment.wav is approximately 1s of music audio.
+
diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav
new file mode 100644
index 0000000000000000000000000000000000000000..7339dfd08c8b31806e4e12c4421b7b0312173953
GIT binary patch
literal 91784
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
amQv;w%%Lm+tXAyXx$OB53cnHa69)iyveY;L

literal 0
HcmV?d00001

diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram.csv.bin
new file mode 100644
index 0000000000000000000000000000000000000000..67b9e2487c3f9cf960ad4af96f0688683e91cb02
GIT binary patch
literal 365968
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%0D|N{M)s2**0sdrRR2Ao?X(v)0Jt4<tMXr
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%0Df)#Z`<
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
Jmkw?R005nUfC~Ts

literal 0
HcmV?d00001

diff --git a/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin b/tensorflow/core/kernels/spectrogram_test_data/short_test_segment_spectrogram_400_200.csv.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d5e4cc5dd60e96211ced3eaf6f08929bf61cff4e
GIT binary patch
literal 468768
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%0A!|!T$xD`IzQVia>5J{^$Z@k;xK7FHbavOS
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
Avj6}9

literal 0
HcmV?d00001

diff --git a/tensorflow/core/kernels/spectrogram_test_utils.cc b/tensorflow/core/kernels/spectrogram_test_utils.cc
new file mode 100644
index 0000000000..a2141c649f
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test_utils.cc
@@ -0,0 +1,288 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/spectrogram_test_utils.h"
+
+#include <math.h>
+#include <stddef.h>
+
+#include "tensorflow/core/lib/core/error_codes.pb.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/wav/wav_io.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+bool ReadWaveFileToVector(const string& file_name, std::vector<double>* data) {
+  string wav_data;
+  if (!ReadFileToString(Env::Default(), file_name, &wav_data).ok()) {
+    LOG(ERROR) << "Wave file read failed for " << file_name;
+    return false;
+  }
+  std::vector<float> decoded_data;
+  uint32 decoded_sample_count;
+  uint16 decoded_channel_count;
+  uint32 decoded_sample_rate;
+  if (!wav::DecodeLin16WaveAsFloatVector(
+           wav_data, &decoded_data, &decoded_sample_count,
+           &decoded_channel_count, &decoded_sample_rate)
+           .ok()) {
+    return false;
+  }
+  // Convert from float to double for the output value.
+  data->resize(decoded_data.size());
+  for (int i = 0; i < decoded_data.size(); ++i) {
+    (*data)[i] = decoded_data[i];
+  }
+  return true;
+}
+
+bool ReadRawFloatFileToComplexVector(
+    const string& file_name, int row_length,
+    std::vector<std::vector<std::complex<double> > >* data) {
+  data->clear();
+  string data_string;
+  if (!ReadFileToString(Env::Default(), file_name, &data_string).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  float real_out;
+  float imag_out;
+  const int kBytesPerValue = 4;
+  CHECK_EQ(sizeof(real_out), kBytesPerValue);
+  std::vector<std::complex<double> > data_row;
+  int row_counter = 0;
+  int offset = 0;
+  const int end = data_string.size();
+  while (offset < end) {
+    memcpy(&real_out, data_string.data() + offset, kBytesPerValue);
+    offset += kBytesPerValue;
+    memcpy(&imag_out, data_string.data() + offset, kBytesPerValue);
+    offset += kBytesPerValue;
+    if (row_counter >= row_length) {
+      data->push_back(data_row);
+      data_row.clear();
+      row_counter = 0;
+    }
+    data_row.push_back(std::complex<double>(real_out, imag_out));
+    ++row_counter;
+  }
+  if (row_counter >= row_length) {
+    data->push_back(data_row);
+  }
+  return true;
+}
+
+void ReadCSVFileToComplexVectorOrDie(
+    const string& file_name,
+    std::vector<std::vector<std::complex<double> > >* data) {
+  data->clear();
+  string data_string;
+  if (!ReadFileToString(Env::Default(), file_name, &data_string).ok()) {
+    LOG(FATAL) << "Failed to open file " << file_name;
+    return;
+  }
+  std::vector<string> lines = str_util::Split(data_string, '\n');
+  for (const string& line : lines) {
+    if (line == "") {
+      continue;
+    }
+    std::vector<std::complex<double> > data_line;
+    std::vector<string> values = str_util::Split(line, ',');
+    for (std::vector<string>::const_iterator i = values.begin();
+         i != values.end(); ++i) {
+      // each element of values may be in the form:
+      // 0.001+0.002i, 0.001, 0.001i, -1.2i, -1.2-3.2i, 1.5, 1.5e-03+21.0i
+      std::vector<string> parts;
+      // Find the first instance of + or - after the second character
+      // in the string, that does not immediately follow an 'e'.
+      size_t operator_index = i->find_first_of("+-", 2);
+      if (operator_index < i->size() &&
+          i->substr(operator_index - 1, 1) == "e") {
+        operator_index = i->find_first_of("+-", operator_index + 1);
+      }
+      parts.push_back(i->substr(0, operator_index));
+      if (operator_index < i->size()) {
+        parts.push_back(i->substr(operator_index, string::npos));
+      }
+
+      double real_part = 0.0;
+      double imaginary_part = 0.0;
+      for (std::vector<string>::const_iterator j = parts.begin();
+           j != parts.end(); ++j) {
+        if (j->find_first_of("ij") != string::npos) {
+          strings::safe_strtod((*j).c_str(), &imaginary_part);
+        } else {
+          strings::safe_strtod((*j).c_str(), &real_part);
+        }
+      }
+      data_line.push_back(std::complex<double>(real_part, imaginary_part));
+    }
+    data->push_back(data_line);
+  }
+}
+
+void ReadCSVFileToArrayOrDie(const string& filename,
+                             std::vector<std::vector<float> >* array) {
+  string contents;
+  TF_CHECK_OK(ReadFileToString(Env::Default(), filename, &contents));
+  std::vector<string> lines = str_util::Split(contents, '\n');
+  contents.clear();
+
+  array->clear();
+  std::vector<float> values;
+  for (int l = 0; l < lines.size(); ++l) {
+    values.clear();
+    CHECK(str_util::SplitAndParseAsFloats(lines[l], ',', &values));
+    array->push_back(values);
+  }
+}
+
+bool WriteDoubleVectorToFile(const string& file_name,
+                             const std::vector<double>& data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < data.size(); ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteFloatVectorToFile(const string& file_name,
+                            const std::vector<float>& data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < data.size(); ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteDoubleArrayToFile(const string& file_name, int size,
+                            const double* data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < size; ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteFloatArrayToFile(const string& file_name, int size,
+                           const float* data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < size; ++i) {
+    if (!file->Append(StringPiece(reinterpret_cast<const char*>(&(data[i])),
+                                  sizeof(data[i])))
+             .ok()) {
+      LOG(ERROR) << "Failed to append to file " << file_name;
+      return false;
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+bool WriteComplexVectorToRawFloatFile(
+    const string& file_name,
+    const std::vector<std::vector<std::complex<double> > >& data) {
+  std::unique_ptr<WritableFile> file;
+  if (!Env::Default()->NewWritableFile(file_name, &file).ok()) {
+    LOG(ERROR) << "Failed to open file " << file_name;
+    return false;
+  }
+  for (int i = 0; i < data.size(); ++i) {
+    for (int j = 0; j < data[i].size(); ++j) {
+      const float real_part(real(data[i][j]));
+      if (!file->Append(StringPiece(reinterpret_cast<const char*>(&real_part),
+                                    sizeof(real_part)))
+               .ok()) {
+        LOG(ERROR) << "Failed to append to file " << file_name;
+        return false;
+      }
+
+      const float imag_part(imag(data[i][j]));
+      if (!file->Append(StringPiece(reinterpret_cast<const char*>(&imag_part),
+                                    sizeof(imag_part)))
+               .ok()) {
+        LOG(ERROR) << "Failed to append to file " << file_name;
+        return false;
+      }
+    }
+  }
+  if (!file->Close().ok()) {
+    LOG(ERROR) << "Failed to close file " << file_name;
+    return false;
+  }
+  return true;
+}
+
+void SineWave(int sample_rate, float frequency, float duration_seconds,
+              std::vector<double>* data) {
+  data->clear();
+  for (int i = 0; i < static_cast<int>(sample_rate * duration_seconds); ++i) {
+    data->push_back(
+        sin(2.0 * M_PI * i * frequency / static_cast<double>(sample_rate)));
+  }
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/spectrogram_test_utils.h b/tensorflow/core/kernels/spectrogram_test_utils.h
new file mode 100644
index 0000000000..59a903549e
--- /dev/null
+++ b/tensorflow/core/kernels/spectrogram_test_utils.h
@@ -0,0 +1,81 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
+
+#include <complex>
+#include <string>
+#include <vector>
+
+#include "tensorflow/core/framework/types.h"
+
+namespace tensorflow {
+
+// Reads a wav format file into a vector of floating-point values with range
+// -1.0 to 1.0.
+bool ReadWaveFileToVector(const string& file_name, std::vector<double>* data);
+
+// Reads a binary file containing 32-bit floating point values in the
+// form [real_1, imag_1, real_2, imag_2, ...] into a rectangular array
+// of complex values where row_length is the length of each inner vector.
+bool ReadRawFloatFileToComplexVector(
+    const string& file_name, int row_length,
+    std::vector<std::vector<std::complex<double> > >* data);
+
+// Reads a CSV file of numbers in the format 1.1+2.2i,1.1,2.2i,3.3j into data.
+void ReadCSVFileToComplexVectorOrDie(
+    const string& file_name,
+    std::vector<std::vector<std::complex<double> > >* data);
+
+// Reads a 2D array of floats from an ASCII text file, where each line is a row
+// of the array, and elements are separated by commas.
+void ReadCSVFileToArrayOrDie(const string& filename,
+                             std::vector<std::vector<float> >* array);
+
+// Write a binary file containing 64-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteDoubleVectorToFile(const string& file_name,
+                             const std::vector<double>& data);
+
+// Write a binary file containing 32-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteFloatVectorToFile(const string& file_name,
+                            const std::vector<float>& data);
+
+// Write a binary file containing 64-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteDoubleArrayToFile(const string& file_name, int size,
+                            const double* data);
+
+// Write a binary file containing 32-bit floating-point values for
+// reading by, for example, MATLAB.
+bool WriteFloatArrayToFile(const string& file_name, int size,
+                           const float* data);
+
+// Write a binary file in the format read by
+// ReadRawDoubleFileToComplexVector above.
+bool WriteComplexVectorToRawFloatFile(
+    const string& file_name,
+    const std::vector<std::vector<std::complex<double> > >& data);
+
+// Generate a sine wave with the provided parameters, and populate
+// data with the samples.
+void SineWave(int sample_rate, float frequency, float duration_seconds,
+              std::vector<double>* data);
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_SPECTROGRAM_TEST_UTILS_H_
diff --git a/tensorflow/core/lib/core/bits.h b/tensorflow/core/lib/core/bits.h
index 30ad0c2bea..1110ef5c2a 100644
--- a/tensorflow/core/lib/core/bits.h
+++ b/tensorflow/core/lib/core/bits.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LIB_CORE_BITS_H_
 #define TENSORFLOW_LIB_CORE_BITS_H_
 
+#include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -91,6 +92,18 @@ inline int Log2Ceiling64(uint64 n) {
     return floor + 1;
 }
 
+inline uint32 NextPowerOfTwo(uint32 value) {
+  int exponent = Log2Ceiling(value);
+  DCHECK_LT(exponent, std::numeric_limits<uint32>::digits);
+  return 1 << exponent;
+}
+
+inline uint64 NextPowerOfTwo64(uint64 value) {
+  int exponent = Log2Ceiling(value);
+  DCHECK_LT(exponent, std::numeric_limits<uint64>::digits);
+  return 1LL << exponent;
+}
+
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_LIB_CORE_BITS_H_
diff --git a/tensorflow/core/ops/audio_ops.cc b/tensorflow/core/ops/audio_ops.cc
index d6dedc3820..2f55e45e37 100644
--- a/tensorflow/core/ops/audio_ops.cc
+++ b/tensorflow/core/ops/audio_ops.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/framework/common_shape_fns.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/shape_inference.h"
+#include "tensorflow/core/lib/core/bits.h"
 
 namespace tensorflow {
 
@@ -66,6 +67,39 @@ Status EncodeWavShapeFn(InferenceContext* c) {
   return Status::OK();
 }
 
+Status SpectrogramShapeFn(InferenceContext* c) {
+  ShapeHandle input;
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 2, &input));
+  int32 window_size;
+  TF_RETURN_IF_ERROR(c->GetAttr("window_size", &window_size));
+  int32 stride;
+  TF_RETURN_IF_ERROR(c->GetAttr("stride", &stride));
+
+  DimensionHandle input_channels = c->Dim(input, 0);
+  DimensionHandle input_length = c->Dim(input, 1);
+
+  DimensionHandle output_length;
+  if (!c->ValueKnown(input_length)) {
+    output_length = c->UnknownDim();
+  } else {
+    const int64 input_length_value = c->Value(input_length);
+    const int64 length_minus_window = (input_length_value - window_size);
+    int64 output_length_value;
+    if (length_minus_window < 0) {
+      output_length_value = 0;
+    } else {
+      output_length_value = 1 + (length_minus_window / stride);
+    }
+    output_length = c->MakeDim(output_length_value);
+  }
+
+  DimensionHandle output_channels =
+      c->MakeDim(1 + NextPowerOfTwo(window_size) / 2);
+  c->set_output(0,
+                c->MakeShape({input_channels, output_length, output_channels}));
+  return Status::OK();
+}
+
 }  // namespace
 
 REGISTER_OP("DecodeWav")
@@ -121,4 +155,49 @@ sample_rate: Scalar containing the sample frequency.
 contents: 0-D. WAV-encoded file contents.
 )doc");
 
+REGISTER_OP("AudioSpectrogram")
+    .Input("input: float")
+    .Attr("window_size: int")
+    .Attr("stride: int")
+    .Attr("magnitude_squared: bool = false")
+    .Output("spectrogram: float")
+    .SetShapeFn(SpectrogramShapeFn)
+    .Doc(R"doc(
+Produces a visualization of audio data over time.
+
+Spectrograms are a standard way of representing audio information as a series of
+slices of frequency information, one slice for each window of time. By joining
+these together into a sequence, they form a distinctive fingerprint of the sound
+over time.
+
+This op expects to receive audio data as an input, stored as floats in the range
+-1 to 1, together with a window width in samples, and a stride specifying how
+far to move the window between slices. From this it generates a three
+dimensional output. The lowest dimension has an amplitude value for each
+frequency during that time slice. The next dimension is time, with successive
+frequency slices. The final dimension is for the channels in the input, so a
+stereo audio input would have two here for example.
+
+This means the layout when converted and saved as an image is rotated 90 degrees
+clockwise from a typical spectrogram. Time is descending down the Y axis, and
+the frequency decreases from left to right.
+
+Each value in the result represents the square root of the sum of the real and
+imaginary parts of an FFT on the current window of samples. In this way, the
+lowest dimension represents the power of each frequency in the current window,
+and adjacent windows are concatenated in the next dimension.
+
+To get a more intuitive and visual look at what this operation does, you can run
+tensorflow/examples/wav_to_spectrogram to read in an audio file and save out the
+resulting spectrogram as a PNG image.
+
+input: Float representation of audio data.
+window_size: How wide the input window is in samples. For the highest efficiency
+  this should be a power of two, but other values are accepted.
+stride: How widely apart the center of adjacent sample windows should be.
+magnitude_squared: Whether to return the squared magnitude or just the
+  magnitude. Using squared magnitude can avoid extra calculations.
+spectrogram: 3D representation of the audio frequencies as an image.
+)doc");
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/platform/default/build_config/BUILD b/tensorflow/core/platform/default/build_config/BUILD
index 0857010f7c..62af852173 100644
--- a/tensorflow/core/platform/default/build_config/BUILD
+++ b/tensorflow/core/platform/default/build_config/BUILD
@@ -92,6 +92,7 @@ cc_library(
         "//tensorflow/core:protos_cc",
         "@com_googlesource_code_re2//:re2",
         "@farmhash_archive//:farmhash",
+        "@fft2d//:fft2d",
         "@highwayhash//:sip_hash",
         "@png_archive//:png",
     ],
diff --git a/tensorflow/core/util/command_line_flags.cc b/tensorflow/core/util/command_line_flags.cc
index 03eb076f30..8373eb1f9e 100644
--- a/tensorflow/core/util/command_line_flags.cc
+++ b/tensorflow/core/util/command_line_flags.cc
@@ -93,6 +93,22 @@ bool ParseBoolFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag,
   return false;
 }
 
+bool ParseFloatFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag,
+                    float* dst, bool* value_parsing_ok) {
+  *value_parsing_ok = true;
+  if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) {
+    char extra;
+    if (sscanf(arg.data(), "%f%c", dst, &extra) != 1) {
+      LOG(ERROR) << "Couldn't interpret value " << arg << " for flag " << flag
+                 << ".";
+      *value_parsing_ok = false;
+    }
+    return true;
+  }
+
+  return false;
+}
+
 }  // namespace
 
 Flag::Flag(const char* name, tensorflow::int32* dst, const string& usage_text)
@@ -116,6 +132,12 @@ Flag::Flag(const char* name, string* dst, const string& usage_text)
       string_value_(dst),
       usage_text_(usage_text) {}
 
+Flag::Flag(const char* name, float* dst, const string& usage_text)
+    : name_(name),
+      type_(TYPE_FLOAT),
+      float_value_(dst),
+      usage_text_(usage_text) {}
+
 bool Flag::Parse(string arg, bool* value_parsing_ok) const {
   bool result = false;
   if (type_ == TYPE_INT) {
@@ -126,6 +148,8 @@ bool Flag::Parse(string arg, bool* value_parsing_ok) const {
     result = ParseBoolFlag(arg, name_, bool_value_, value_parsing_ok);
   } else if (type_ == TYPE_STRING) {
     result = ParseStringFlag(arg, name_, string_value_, value_parsing_ok);
+  } else if (type_ == TYPE_FLOAT) {
+    result = ParseFloatFlag(arg, name_, float_value_, value_parsing_ok);
   }
   return result;
 }
@@ -195,6 +219,10 @@ bool Flag::Parse(string arg, bool* value_parsing_ok) const {
       type_name = "string";
       flag_string = strings::Printf("--%s=\"%s\"", flag.name_.c_str(),
                                     flag.string_value_->c_str());
+    } else if (flag.type_ == Flag::TYPE_FLOAT) {
+      type_name = "float";
+      flag_string =
+          strings::Printf("--%s=%f", flag.name_.c_str(), *flag.float_value_);
     }
     strings::Appendf(&usage_text, "\t%-33s\t%s\t%s\n", flag_string.c_str(),
                      type_name, flag.usage_text_.c_str());
diff --git a/tensorflow/core/util/command_line_flags.h b/tensorflow/core/util/command_line_flags.h
index 2c77d7874f..f349df16fd 100644
--- a/tensorflow/core/util/command_line_flags.h
+++ b/tensorflow/core/util/command_line_flags.h
@@ -65,6 +65,7 @@ class Flag {
   Flag(const char* name, int64* dst1, const string& usage_text);
   Flag(const char* name, bool* dst, const string& usage_text);
   Flag(const char* name, string* dst, const string& usage_text);
+  Flag(const char* name, float* dst, const string& usage_text);
 
  private:
   friend class Flags;
@@ -72,11 +73,12 @@ class Flag {
   bool Parse(string arg, bool* value_parsing_ok) const;
 
   string name_;
-  enum { TYPE_INT, TYPE_INT64, TYPE_BOOL, TYPE_STRING } type_;
+  enum { TYPE_INT, TYPE_INT64, TYPE_BOOL, TYPE_STRING, TYPE_FLOAT } type_;
   int* int_value_;
   int64* int64_value_;
   bool* bool_value_;
   string* string_value_;
+  float* float_value_;
   string usage_text_;
 };
 
diff --git a/tensorflow/core/util/command_line_flags_test.cc b/tensorflow/core/util/command_line_flags_test.cc
index b002e35899..62025463af 100644
--- a/tensorflow/core/util/command_line_flags_test.cc
+++ b/tensorflow/core/util/command_line_flags_test.cc
@@ -32,29 +32,35 @@ std::vector<char *> CharPointerVectorFromStrings(
   }
   return result;
 }
-}
+}  // namespace
 
 TEST(CommandLineFlagsTest, BasicUsage) {
   int some_int = 10;
   int64 some_int64 = 21474836470;  // max int32 is 2147483647
   bool some_switch = false;
   string some_name = "something";
-  int argc = 5;
-  std::vector<string> argv_strings = {
-      "program_name", "--some_int=20", "--some_int64=214748364700",
-      "--some_switch", "--some_name=somethingelse"};
+  float some_float = -23.23f;
+  int argc = 6;
+  std::vector<string> argv_strings = {"program_name",
+                                      "--some_int=20",
+                                      "--some_int64=214748364700",
+                                      "--some_switch",
+                                      "--some_name=somethingelse",
+                                      "--some_float=42.0"};
   std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings);
   bool parsed_ok =
       Flags::Parse(&argc, argv_array.data(),
                    {Flag("some_int", &some_int, "some int"),
                     Flag("some_int64", &some_int64, "some int64"),
                     Flag("some_switch", &some_switch, "some switch"),
-                    Flag("some_name", &some_name, "some name")});
+                    Flag("some_name", &some_name, "some name"),
+                    Flag("some_float", &some_float, "some float")});
   EXPECT_EQ(true, parsed_ok);
   EXPECT_EQ(20, some_int);
   EXPECT_EQ(214748364700, some_int64);
   EXPECT_EQ(true, some_switch);
   EXPECT_EQ("somethingelse", some_name);
+  EXPECT_NEAR(42.0f, some_float, 1e-5f);
   EXPECT_EQ(argc, 1);
 }
 
@@ -85,6 +91,21 @@ TEST(CommandLineFlagsTest, BadBoolValue) {
   EXPECT_EQ(argc, 1);
 }
 
+TEST(CommandLineFlagsTest, BadFloatValue) {
+  float some_float = -23.23f;
+  int argc = 2;
+  std::vector<string> argv_strings = {"program_name",
+                                      "--some_float=notanumber"};
+  std::vector<char *> argv_array = CharPointerVectorFromStrings(argv_strings);
+  bool parsed_ok =
+      Flags::Parse(&argc, argv_array.data(),
+                   {Flag("some_float", &some_float, "some float")});
+
+  EXPECT_EQ(false, parsed_ok);
+  EXPECT_NEAR(-23.23f, some_float, 1e-5f);
+  EXPECT_EQ(argc, 1);
+}
+
 // Return whether str==pat, but allowing any whitespace in pat
 // to match zero or more whitespace characters in str.
 static bool MatchWithAnyWhitespace(const string &str, const string &pat) {
@@ -111,6 +132,8 @@ TEST(CommandLineFlagsTest, UsageString) {
   int64 some_int64 = 21474836470;  // max int32 is 2147483647
   bool some_switch = false;
   string some_name = "something";
+  // Don't test float in this case, because precision is hard to predict and
+  // match against, and we don't want a flakey test.
   const string tool_name = "some_tool_name";
   string usage = Flags::Usage(tool_name + "<flags>",
                               {Flag("some_int", &some_int, "some int"),
diff --git a/tensorflow/examples/wav_to_spectrogram/BUILD b/tensorflow/examples/wav_to_spectrogram/BUILD
new file mode 100644
index 0000000000..1e72324fb0
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/BUILD
@@ -0,0 +1,68 @@
+# Description:
+#   TensorFlow C++ inference example for labeling images.
+
+package(
+    default_visibility = ["//tensorflow:internal"],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+cc_library(
+    name = "wav_to_spectrogram_lib",
+    srcs = [
+        "wav_to_spectrogram.cc",
+    ],
+    hdrs = [
+        "wav_to_spectrogram.h",
+    ],
+    deps = [
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:tensorflow",
+    ],
+)
+
+cc_binary(
+    name = "wav_to_spectrogram",
+    srcs = [
+        "main.cc",
+    ],
+    deps = [
+        ":wav_to_spectrogram_lib",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:tensorflow",
+    ],
+)
+
+cc_test(
+    name = "wav_to_spectrogram_test",
+    size = "medium",
+    srcs = ["wav_to_spectrogram_test.cc"],
+    deps = [
+        ":wav_to_spectrogram_lib",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+            "bin/**",
+            "gen/**",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/examples/wav_to_spectrogram/README.md b/tensorflow/examples/wav_to_spectrogram/README.md
new file mode 100644
index 0000000000..7f7eb43700
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/README.md
@@ -0,0 +1,49 @@
+# TensorFlow Spectrogram Example
+
+This example shows how you can load audio from a .wav file, convert it to a
+spectrogram, and then save it out as a PNG image. A spectrogram is a
+visualization of the frequencies in sound over time, and can be useful as a
+feature for neural network recognition on noise or speech.
+
+## Building
+
+To build it, run this command:
+
+```bash
+bazel build tensorflow/examples/wav_to_spectrogram/...
+```
+
+That should build a binary executable that you can then run like this:
+
+```bash
+bazel-bin/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram
+```
+
+This uses a default test audio file that's part of the TensorFlow source code,
+and writes out the image to the current directory as spectrogram.png.
+
+## Options
+
+To load your own audio, you need to supply a .wav file in LIN16 format, and use
+the `--input_audio` flag to pass in the path.
+
+To control how the spectrogram is created, you can specify the `--window_size`
+and `--stride` arguments, which control how wide the window used to estimate
+frequencies is, and how widely adjacent windows are spaced.
+
+The `--output_image` flag sets the path to save the image file to. This is
+always written out in PNG format, even if you specify a different file
+extension.
+
+If your result seems too dark, try using the `--brightness` flag to make the
+output image easier to see.
+
+Here's an example of how to use all of them together:
+
+```bash
+bazel-bin/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram \
+--input_wav=/tmp/my_audio.wav \
+--window=1024 \
+--stride=512 \
+--output_image=/tmp/my_spectrogram.png
+```
diff --git a/tensorflow/examples/wav_to_spectrogram/main.cc b/tensorflow/examples/wav_to_spectrogram/main.cc
new file mode 100644
index 0000000000..539e6c4fe4
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/main.cc
@@ -0,0 +1,66 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
+
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/util/command_line_flags.h"
+
+int main(int argc, char* argv[]) {
+  // These are the command-line flags the program can understand.
+  // They define where the graph and input data is located, and what kind of
+  // input the model expects. If you train your own model, or use something
+  // other than inception_v3, then you'll need to update these.
+  tensorflow::string input_wav =
+      "tensorflow/core/kernels/spectrogram_test_data/short_test_segment.wav";
+  tensorflow::int32 window_size = 256;
+  tensorflow::int32 stride = 128;
+  float brightness = 64.0f;
+  tensorflow::string output_image = "spectrogram.png";
+  std::vector<tensorflow::Flag> flag_list = {
+      tensorflow::Flag("input_wav", &input_wav, "audio file to load"),
+      tensorflow::Flag("window_size", &window_size,
+                       "frequency sample window width"),
+      tensorflow::Flag("stride", &stride,
+                       "how far apart to place frequency windows"),
+      tensorflow::Flag("brightness", &brightness,
+                       "controls how bright the output image is"),
+      tensorflow::Flag("output_image", &output_image,
+                       "where to save the spectrogram image to"),
+  };
+  tensorflow::string usage = tensorflow::Flags::Usage(argv[0], flag_list);
+  const bool parse_result = tensorflow::Flags::Parse(&argc, argv, flag_list);
+  if (!parse_result) {
+    LOG(ERROR) << usage;
+    return -1;
+  }
+
+  // We need to call this to set up global state for TensorFlow.
+  tensorflow::port::InitMain(argv[0], &argc, &argv);
+  if (argc > 1) {
+    LOG(ERROR) << "Unknown argument " << argv[1] << "\n" << usage;
+    return -1;
+  }
+
+  tensorflow::Status wav_status = WavToSpectrogram(
+      input_wav, window_size, stride, brightness, output_image);
+  if (!wav_status.ok()) {
+    LOG(ERROR) << "WavToSpectrogram failed with " << wav_status;
+    return -1;
+  }
+
+  return 0;
+}
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
new file mode 100644
index 0000000000..c69a359637
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.cc
@@ -0,0 +1,97 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
+
+#include <vector>
+
+#include "tensorflow/cc/ops/audio_ops.h"
+#include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/image_ops.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/graph/default_device.h"
+#include "tensorflow/core/graph/graph_def_builder.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/public/session.h"
+#include "tensorflow/core/util/command_line_flags.h"
+
+using tensorflow::DT_FLOAT;
+using tensorflow::DT_UINT8;
+using tensorflow::Output;
+using tensorflow::TensorShape;
+
+// Runs a TensorFlow graph to convert an audio file into a visualization.
+tensorflow::Status WavToSpectrogram(const tensorflow::string& input_wav,
+                                    tensorflow::int32 window_size,
+                                    tensorflow::int32 stride, float brightness,
+                                    const tensorflow::string& output_image) {
+  auto root = tensorflow::Scope::NewRootScope();
+  using namespace tensorflow::ops;  // NOLINT(build/namespaces)
+  // The following block creates a TensorFlow graph that:
+  //  - Reads and decodes the audio file into a tensor of float samples.
+  //  - Creates a float spectrogram from those samples.
+  //  - Scales, clamps, and converts that spectrogram to 0 to 255 uint8's.
+  //  - Reshapes the tensor so that it's [height, width, 1] for imaging.
+  //  - Encodes it as a PNG stream and saves it out to a file.
+  Output file_reader = ReadFile(root.WithOpName("input_wav"), input_wav);
+  DecodeWav wav_decoder =
+      DecodeWav(root.WithOpName("wav_decoder"), file_reader);
+  Output spectrogram = AudioSpectrogram(root.WithOpName("spectrogram"),
+                                        wav_decoder.audio, window_size, stride);
+  Output brightness_placeholder =
+      Placeholder(root.WithOpName("brightness_placeholder"), DT_FLOAT,
+                  Placeholder::Attrs().Shape(TensorShape({})));
+  Output mul = Mul(root.WithOpName("mul"), spectrogram, brightness_placeholder);
+  Output min_const = Const(root.WithOpName("min_const"), 255.0f);
+  Output min = Minimum(root.WithOpName("min"), mul, min_const);
+  Output cast = Cast(root.WithOpName("cast"), min, DT_UINT8);
+  Output expand_dims_const = Const(root.WithOpName("expand_dims_const"), -1);
+  Output expand_dims =
+      ExpandDims(root.WithOpName("expand_dims"), cast, expand_dims_const);
+  Output squeeze = Squeeze(root.WithOpName("squeeze"), expand_dims,
+                           Squeeze::Attrs().SqueezeDims({0}));
+  Output png_encoder = EncodePng(root.WithOpName("png_encoder"), squeeze);
+  WriteFile file_writer =
+      WriteFile(root.WithOpName("output_image"), output_image, png_encoder);
+  tensorflow::GraphDef graph;
+  TF_RETURN_IF_ERROR(root.ToGraphDef(&graph));
+
+  // Build a session object from this graph definition. The power of TensorFlow
+  // is that you can reuse complex computations like this, so usually we'd run a
+  // lot of different inputs through it. In this example, we're just doing a
+  // one-off run, so we'll create it and then use it immediately.
+  std::unique_ptr<tensorflow::Session> session(
+      tensorflow::NewSession(tensorflow::SessionOptions()));
+  TF_RETURN_IF_ERROR(session->Create(graph));
+
+  // We're passing in the brightness as an input, so create a tensor to hold the
+  // value.
+  tensorflow::Tensor brightness_tensor(DT_FLOAT, TensorShape({}));
+  brightness_tensor.scalar<float>()() = brightness;
+
+  // Run the session to analyze the audio and write out the file.
+  TF_RETURN_IF_ERROR(
+      session->Run({{"brightness_placeholder", brightness_tensor}}, {},
+                   {"output_image"}, nullptr));
+  return tensorflow::Status::OK();
+}
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
new file mode 100644
index 0000000000..fa8cb0abe9
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h
@@ -0,0 +1,31 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
+#define THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
+
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/types.h"
+
+// Runs a TensorFlow graph to convert an audio file into a visualization. Takes
+// in the path to the audio file, the window size and stride parameters
+// controlling the spectrogram creation, the brightness scaling to use, and a
+// path to save the output PNG file to.
+tensorflow::Status WavToSpectrogram(const tensorflow::string& input_wav,
+                                    tensorflow::int32 window_size,
+                                    tensorflow::int32 stride, float brightness,
+                                    const tensorflow::string& output_image);
+
+#endif  // THIRD_PARTY_TENSORFLOW_EXAMPLES_WAV_TO_SPECTROGRAM_WAV_TO_SPECTROGRAM_H_
diff --git a/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc
new file mode 100644
index 0000000000..e599711445
--- /dev/null
+++ b/tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram_test.cc
@@ -0,0 +1,37 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/examples/wav_to_spectrogram/wav_to_spectrogram.h"
+
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/lib/wav/wav_io.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/test.h"
+
+TEST(WavToSpectrogramTest, WavToSpectrogramTest) {
+  const tensorflow::string input_wav =
+      tensorflow::io::JoinPath(tensorflow::testing::TmpDir(), "input_wav.wav");
+  const tensorflow::string output_image = tensorflow::io::JoinPath(
+      tensorflow::testing::TmpDir(), "output_image.png");
+  float audio[8] = {-1.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f};
+  tensorflow::string wav_string;
+  TF_ASSERT_OK(
+      tensorflow::wav::EncodeAudioAsS16LEWav(audio, 44100, 1, 8, &wav_string));
+  TF_ASSERT_OK(tensorflow::WriteStringToFile(tensorflow::Env::Default(),
+                                             input_wav, wav_string));
+  TF_ASSERT_OK(WavToSpectrogram(input_wav, 4, 4, 64.0f, output_image));
+  TF_EXPECT_OK(tensorflow::Env::Default()->FileExists(output_image));
+}
diff --git a/tensorflow/tools/lib_package/BUILD b/tensorflow/tools/lib_package/BUILD
index 3e049724f6..a8e6ecdbf0 100644
--- a/tensorflow/tools/lib_package/BUILD
+++ b/tensorflow/tools/lib_package/BUILD
@@ -79,11 +79,13 @@ genrule(
     srcs = [
         "//third_party/hadoop:LICENSE.txt",
         "//third_party/eigen3:LICENSE",
+        "//third_party/fft2d:LICENSE",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
+        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@highwayhash//:LICENSE",
@@ -106,11 +108,13 @@ genrule(
     srcs = [
         "//third_party/hadoop:LICENSE.txt",
         "//third_party/eigen3:LICENSE",
+        "//third_party/fft2d:LICENSE",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
+        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@highwayhash//:LICENSE",
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 2a96e80ccb..c17a7f7fb1 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -91,12 +91,14 @@ filegroup(
     name = "licenses",
     data = [
         "//third_party/eigen3:LICENSE",
+        "//third_party/fft2d:LICENSE",
         "//third_party/hadoop:LICENSE.txt",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
+        "@fft2d//:fft/readme.txt",
         "@gemmlowp//:LICENSE",
         "@gif_archive//:COPYING",
         "@grpc//:LICENSE",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index e5e005fa93..0b77d471aa 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -500,6 +500,16 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name="zlib",
       actual="@zlib_archive//:zlib",)
 
+  native.new_http_archive(
+      name = "fft2d",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
+          "http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
+      ],
+      sha256 = "52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296",
+      build_file = str(Label("//third_party/fft2d:fft2d.BUILD")),
+  )
+
   temp_workaround_http_archive(
       name="snappy",
       urls=[
-- 
GitLab


From d305d81bde5d53261b1c1d56cd0fa60e27ab1179 Mon Sep 17 00:00:00 2001
From: Vinu Rajashekhar <vinuraja@google.com>
Date: Tue, 11 Apr 2017 14:59:22 -0800
Subject: [PATCH 0326/1563] Relabeling some tests.

- Both of these are at the edge of their allowed limits in terms of test
  timeout.
Change: 152873079
---
 tensorflow/contrib/linalg/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/linalg/BUILD b/tensorflow/contrib/linalg/BUILD
index 34a293f80b..9b4f36da15 100644
--- a/tensorflow/contrib/linalg/BUILD
+++ b/tensorflow/contrib/linalg/BUILD
@@ -138,6 +138,7 @@ cuda_py_tests(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
+    shard_count = 5,
 )
 
 cuda_py_tests(
-- 
GitLab


From a2019a128c0731b35f1cb4231c996b1af142a0be Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Tue, 11 Apr 2017 15:00:15 -0800
Subject: [PATCH 0327/1563] tfdbg: fix bug related to compiled Python files

Previously, the modules source_utils.py and analyzer_cli.py did not take into account that files in the stack could be compiled (i.e., pyc and pyo files).
Change: 152873179
---
 tensorflow/python/debug/BUILD                 |  1 +
 tensorflow/python/debug/cli/analyzer_cli.py   | 22 +++++++++------
 .../python/debug/cli/analyzer_cli_test.py     | 28 +++++++++++++++++++
 tensorflow/python/debug/lib/source_utils.py   | 20 +++++++++++--
 .../python/debug/lib/source_utils_test.py     |  2 +-
 5 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 0b87660e5d..3813aa996b 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -590,6 +590,7 @@ cuda_py_test(
         ":debug_data",
         ":debug_utils",
         ":debugger_cli_common",
+        ":source_utils",
         "//third_party/py/numpy",
         "@six_archive//:six",
         "//tensorflow:tensorflow_py",
diff --git a/tensorflow/python/debug/cli/analyzer_cli.py b/tensorflow/python/debug/cli/analyzer_cli.py
index 95d3f3f249..49d0ef54fe 100644
--- a/tensorflow/python/debug/cli/analyzer_cli.py
+++ b/tensorflow/python/debug/cli/analyzer_cli.py
@@ -1128,19 +1128,23 @@ class DebugAnalyzer(object):
 
     lines.append(head)
 
-    for item in source_list:
-      path_attributes = [debugger_cli_common.MenuItem(
-          None, "ps %s -b %d" % (item[0], item[5])), color]
-
-      line = RL(item[0], path_attributes)
+    for (file_path, _, num_nodes, num_tensors, num_dumps,
+         first_line_num) in source_list:
+      path_attributes = [color]
+      if source_utils.is_extension_uncompiled_python_source(file_path):
+        path_attributes.append(
+            debugger_cli_common.MenuItem(None, "ps %s -b %d" %
+                                         (file_path, first_line_num)))
+
+      line = RL(file_path, path_attributes)
       line += " " * (path_column_width - len(line))
       line += RL(
-          str(item[2]) + " " * (num_nodes_column_width - len(str(item[2]))),
+          str(num_nodes) + " " * (num_nodes_column_width - len(str(num_nodes))),
           color)
       line += RL(
-          str(item[3]) + " " * (num_tensors_column_width - len(str(item[3]))),
-          color)
-      line += RL(str(item[4]), color)
+          str(num_tensors) + " " *
+          (num_tensors_column_width - len(str(num_tensors))), color)
+      line += RL(str(num_dumps), color)
       lines.append(line)
     lines.append(RL())
 
diff --git a/tensorflow/python/debug/cli/analyzer_cli_test.py b/tensorflow/python/debug/cli/analyzer_cli_test.py
index 185d395126..e62a0f611f 100644
--- a/tensorflow/python/debug/cli/analyzer_cli_test.py
+++ b/tensorflow/python/debug/cli/analyzer_cli_test.py
@@ -33,6 +33,7 @@ from tensorflow.python.debug.cli import command_parser
 from tensorflow.python.debug.cli import debugger_cli_common
 from tensorflow.python.debug.lib import debug_data
 from tensorflow.python.debug.lib import debug_utils
+from tensorflow.python.debug.lib import source_utils
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import control_flow_ops
@@ -1354,6 +1355,33 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
         "File path regex filter: \"%s\"" % self._curr_file_path,
         "Node name regex filter: \".*read\"", ""], out.lines[:4])
 
+  def testListSourceWithCompiledPythonSourceWorks(self):
+    def fake_list_source_files_against_dump(dump,
+                                            path_regex_whitelist=None,
+                                            node_name_regex_whitelist=None):
+      del dump, path_regex_whitelist, node_name_regex_whitelist
+      return [("compiled_1.pyc", False, 10, 20, 30, 4),
+              ("compiled_2.pyo", False, 10, 20, 30, 5),
+              ("uncompiled.py", False, 10, 20, 30, 6)]
+
+    with test.mock.patch.object(
+        source_utils, "list_source_files_against_dump",
+        side_effect=fake_list_source_files_against_dump):
+      out = self._registry.dispatch_command("list_source", [])
+
+      self.assertStartsWith(out.lines[4], "compiled_1.pyc")
+      self.assertEqual((0, 14, [cli_shared.COLOR_WHITE]),
+                       out.font_attr_segs[4][0])
+      self.assertStartsWith(out.lines[5], "compiled_2.pyo")
+      self.assertEqual((0, 14, [cli_shared.COLOR_WHITE]),
+                       out.font_attr_segs[5][0])
+      self.assertStartsWith(out.lines[6], "uncompiled.py")
+      self.assertEqual(0, out.font_attr_segs[6][0][0])
+      self.assertEqual(13, out.font_attr_segs[6][0][1])
+      self.assertEqual(cli_shared.COLOR_WHITE, out.font_attr_segs[6][0][2][0])
+      self.assertEqual("ps uncompiled.py -b 6",
+                       out.font_attr_segs[6][0][2][1].content)
+
 
 class AnalyzerCLIPrintLargeTensorTest(test_util.TensorFlowTestCase):
 
diff --git a/tensorflow/python/debug/lib/source_utils.py b/tensorflow/python/debug/lib/source_utils.py
index b8a5daf860..580bdc054b 100644
--- a/tensorflow/python/debug/lib/source_utils.py
+++ b/tensorflow/python/debug/lib/source_utils.py
@@ -26,6 +26,19 @@ _TENSORFLOW_BASEDIR = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.dirname(
         os.path.normpath(os.path.abspath(__file__))))))
 
+UNCOMPILED_SOURCE_SUFFIXES = (".py")
+COMPILED_SOURCE_SUFFIXES = (".pyc", ".pyo")
+
+
+def is_extension_uncompiled_python_source(file_path):
+  _, extension = os.path.splitext(file_path)
+  return extension.lower() in UNCOMPILED_SOURCE_SUFFIXES
+
+
+def is_extension_compiled_python_source(file_path):
+  _, extension = os.path.splitext(file_path)
+  return extension.lower() in COMPILED_SOURCE_SUFFIXES
+
 
 def _convert_watch_key_to_tensor_name(watch_key):
   return watch_key[:watch_key.rfind(":")]
@@ -45,10 +58,11 @@ def _guess_is_tensorflow_py_library(py_file_path):
     (`bool`) Whether the file is a part of the tensorflow library.
 
   Raises:
-    ValueError: if py_file_path does not end with ".py".
+    ValueError: if the extension name of py_file_path does not indicate a Python
+      source file (compiled or uncomplied).
   """
-
-  if not py_file_path.endswith(".py"):
+  if (not is_extension_uncompiled_python_source(py_file_path) and
+      not is_extension_compiled_python_source(py_file_path)):
     raise ValueError(
         "Input file path (%s) is not a Python source file." % py_file_path)
   py_file_path = os.path.normpath(os.path.abspath(py_file_path))
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index 138c75de31..6010723d46 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -59,7 +59,7 @@ class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
     self.assertFalse(source_utils._guess_is_tensorflow_py_library(
         self.curr_file_path))
 
-  def _disabledtestSourceUtilModuleReturnsTrue(self):
+  def testSourceUtilModuleReturnsTrue(self):
     self.assertTrue(source_utils._guess_is_tensorflow_py_library(
         source_utils.__file__))
 
-- 
GitLab


From 4188fa25957eb1ef95bb0135f65ffda8dfce3732 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 15:12:42 -0800
Subject: [PATCH 0328/1563] N/A Change: 152874742

---
 tensorflow/contrib/keras/BUILD |  6 ++++++
 tensorflow/python/BUILD        | 21 ++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD
index da320e22d8..a9bb9ddd58 100644
--- a/tensorflow/contrib/keras/BUILD
+++ b/tensorflow/contrib/keras/BUILD
@@ -137,6 +137,7 @@ py_test(
     size = "small",
     srcs = ["python/keras/integration_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":keras",
         ":testing_utils",
@@ -194,6 +195,7 @@ py_test(
     size = "medium",
     srcs = ["python/keras/optimizers_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":keras",
         ":testing_utils",
@@ -307,6 +309,7 @@ py_test(
     size = "medium",
     srcs = ["python/keras/layers/convolutional_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":keras",
         ":testing_utils",
@@ -460,6 +463,7 @@ py_test(
     size = "small",
     srcs = ["python/keras/wrappers/scikit_learn_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":keras",
         ":testing_utils",
@@ -505,6 +509,7 @@ py_test(
     size = "small",
     srcs = ["python/keras/callbacks_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":keras",
         ":testing_utils",
@@ -517,6 +522,7 @@ py_test(
     size = "small",
     srcs = ["python/keras/engine/training_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":keras",
         ":testing_utils",
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index a62bde0fcd..de9daf4179 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2875,6 +2875,26 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "moving_averages_test",
+    size = "small",
+    srcs = [
+        "training/moving_averages_test.py",
+    ],
+    additional_deps = [
+        ":array_ops",
+        ":client_testlib",
+        ":constant_op",
+        ":dtypes",
+        ":framework_for_generated_wrappers",
+        ":framework_ops",
+        ":training",
+        ":variable_scope",
+        ":variables",
+    ],
+    tags = ["notsan"],
+)
+
 cuda_py_tests(
     name = "training_tests",
     size = "small",
@@ -2889,7 +2909,6 @@ cuda_py_tests(
         "training/gradient_descent_test.py",
         "training/learning_rate_decay_test.py",
         "training/momentum_test.py",
-        "training/moving_averages_test.py",
         "training/optimizer_test.py",
         "training/proximal_adagrad_test.py",
         "training/proximal_gradient_descent_test.py",
-- 
GitLab


From f9e3f6318f11727445c1fbeab145dc747d60fc08 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 15:26:42 -0800
Subject: [PATCH 0329/1563] Add functions to tfdbg for parsing time and memory
 intervals. Change: 152876511

---
 tensorflow/python/debug/cli/command_parser.py | 135 ++++++++++++++++++
 .../python/debug/cli/command_parser_test.py   | 106 ++++++++++++++
 2 files changed, 241 insertions(+)

diff --git a/tensorflow/python/debug/cli/command_parser.py b/tensorflow/python/debug/cli/command_parser.py
index 68b0b9a8af..de56099a52 100644
--- a/tensorflow/python/debug/cli/command_parser.py
+++ b/tensorflow/python/debug/cli/command_parser.py
@@ -18,6 +18,7 @@ from __future__ import division
 from __future__ import print_function
 
 import ast
+from collections import namedtuple
 import re
 import sys
 
@@ -27,6 +28,10 @@ _QUOTES_PATTERN = re.compile(r"\"[^\"]*\"")
 _WHITESPACE_PATTERN = re.compile(r"\s+")
 
 
+Interval = namedtuple("Interval",
+                      ["start", "start_included", "end", "end_included"])
+
+
 def parse_command(command):
   """Parse command string into a list of arguments.
 
@@ -243,6 +248,108 @@ def parse_ranges(range_string):
   return ranges
 
 
+def parse_memory_interval(interval_str):
+  """Convert a human-readable memory interval to a tuple of start and end value.
+
+  Args:
+    interval_str: (`str`) A human-readable str representing an interval
+      (e.g., "[10kB, 20kB]", "<100M", ">100G"). Only the units "kB", "MB", "GB"
+      are supported. The "B character at the end of the input `str` may be
+      omitted.
+
+  Returns:
+    `Interval` object where start and end are in bytes.
+
+  Raises:
+    ValueError: if the input is not valid.
+  """
+  str_interval = _parse_interval(interval_str)
+  interval_start = 0
+  interval_end = float("inf")
+  if str_interval.start:
+    interval_start = parse_readable_size_str(str_interval.start)
+  if str_interval.end:
+    interval_end = parse_readable_size_str(str_interval.end)
+  if interval_start > interval_end:
+    raise ValueError(
+        "Invalid interval %s. Start of interval must be less than or equal "
+        "to end of interval." % interval_str)
+  return Interval(interval_start, str_interval.start_included,
+                  interval_end, str_interval.end_included)
+
+
+def parse_time_interval(interval_str):
+  """Convert a human-readable time interval to a tuple of start and end value.
+
+  Args:
+    interval_str: (`str`) A human-readable str representing an interval
+      (e.g., "[10us, 20us]", "<100s", ">100ms"). Supported time suffixes are
+      us, ms, s.
+
+  Returns:
+    `Interval` object where start and end are in microseconds.
+
+  Raises:
+    ValueError: if the input is not valid.
+  """
+  str_interval = _parse_interval(interval_str)
+  interval_start = 0
+  interval_end = float("inf")
+  if str_interval.start:
+    interval_start = parse_readable_time_str(str_interval.start)
+  if str_interval.end:
+    interval_end = parse_readable_time_str(str_interval.end)
+  if interval_start > interval_end:
+    raise ValueError(
+        "Invalid interval %s. Start must be before end of interval." %
+        interval_str)
+  return Interval(interval_start, str_interval.start_included,
+                  interval_end, str_interval.end_included)
+
+
+def _parse_interval(interval_str):
+  """Convert a human-readable interval to a tuple of start and end value.
+
+  Args:
+    interval_str: (`str`) A human-readable str representing an interval
+      (e.g., "[1M, 2M]", "<100k", ">100ms")
+
+  Returns:
+    Interval object where start or end can be None
+    if the range is specified as "<N" or ">N" respectively.
+
+  Raises:
+    ValueError: if the input is not valid.
+  """
+  interval_str = interval_str.strip()
+  if interval_str.startswith("<="):
+    return Interval(start=None, start_included=False,
+                    end=interval_str[2:].strip(), end_included=True)
+  if interval_str.startswith("<"):
+    return Interval(start=None, start_included=False,
+                    end=interval_str[1:].strip(), end_included=False)
+  if interval_str.startswith(">="):
+    return Interval(start=interval_str[2:].strip(), start_included=True,
+                    end=None, end_included=False)
+  if interval_str.startswith(">"):
+    return Interval(start=interval_str[1:].strip(), start_included=False,
+                    end=None, end_included=False)
+  if (not interval_str.startswith(("[", "("))
+      or not interval_str.endswith(("]", ")"))):
+    raise ValueError(
+        "Invalid interval format: %s. Valid formats are: [min, max], "
+        "(min, max), <max, >min" % interval_str)
+  interval = interval_str[1:-1].split(",")
+  if len(interval) != 2:
+    raise ValueError(
+        "Incorrect interval format: %s. Interval should specify two values: "
+        "[min, max] or (min, max)." % interval_str)
+  return Interval(start=interval[0].strip(),
+                  start_included=(interval_str[0] == "["),
+                  end=interval[1].strip(),
+                  end_included=(interval_str[-1] == "]"))
+
+
 def parse_readable_size_str(size_str):
   """Convert a human-readable str representation to number of bytes.
 
@@ -277,6 +384,34 @@ def parse_readable_size_str(size_str):
                      size_str)
 
 
+def parse_readable_time_str(time_str):
+  """Parses a time string in the format N, Nus, Nms, Ns.
+
+  Args:
+    time_str: (`str`) string consisting of an integer time value optionally
+      followed by 'us', 'ms', or 's' suffix. If suffix is not specified,
+      value is assumed to be in microseconds. (e.g. 100us, 8ms, 5s, 100).
+
+  Returns:
+    Microseconds value.
+  """
+  def parse_positive_float(value_str):
+    value = float(value_str)
+    if value < 0:
+      raise ValueError(
+          "Invalid time %s. Time value must be positive." % value_str)
+    return value
+
+  time_str = time_str.strip()
+  if time_str.endswith("us"):
+    return int(parse_positive_float(time_str[:-2]))
+  elif time_str.endswith("ms"):
+    return int(parse_positive_float(time_str[:-2]) * 1e3)
+  elif time_str.endswith("s"):
+    return int(parse_positive_float(time_str[:-1]) * 1e6)
+  return int(parse_positive_float(time_str))
+
+
 def evaluate_tensor_slice(tensor, tensor_slicing):
   """Call eval on the slicing of a tensor, with validation.
 
diff --git a/tensorflow/python/debug/cli/command_parser_test.py b/tensorflow/python/debug/cli/command_parser_test.py
index 3f8b8744c3..8fc7418e18 100644
--- a/tensorflow/python/debug/cli/command_parser_test.py
+++ b/tensorflow/python/debug/cli/command_parser_test.py
@@ -297,5 +297,111 @@ class ParseReadableSizeStrTest(test_util.TensorFlowTestCase):
       command_parser.parse_readable_size_str("2EB")
 
 
+class ParseReadableTimeStrTest(test_util.TensorFlowTestCase):
+
+  def testParseNoUnitWorks(self):
+    self.assertEqual(0, command_parser.parse_readable_time_str("0"))
+    self.assertEqual(100, command_parser.parse_readable_time_str("100 "))
+    self.assertEqual(25, command_parser.parse_readable_time_str(" 25 "))
+
+  def testParseSeconds(self):
+    self.assertEqual(1e6, command_parser.parse_readable_time_str("1 s"))
+    self.assertEqual(2e6, command_parser.parse_readable_time_str("2s"))
+
+  def testParseMicros(self):
+    self.assertEqual(2, command_parser.parse_readable_time_str("2us"))
+
+  def testParseMillis(self):
+    self.assertEqual(2e3, command_parser.parse_readable_time_str("2ms"))
+
+  def testParseUnsupportedUnitRaisesException(self):
+    with self.assertRaisesRegexp(
+        ValueError, r".*float.*2us.*"):
+      command_parser.parse_readable_time_str("2uss")
+
+    with self.assertRaisesRegexp(
+        ValueError, r".*float.*2m.*"):
+      command_parser.parse_readable_time_str("2m")
+
+    with self.assertRaisesRegexp(
+        ValueError, r"Invalid time -1. Time value must be positive."):
+      command_parser.parse_readable_time_str("-1s")
+
+
+class ParseInterval(test_util.TensorFlowTestCase):
+
+  def testParseTimeInterval(self):
+    self.assertEquals(
+        command_parser.Interval(10, True, 1e3, True),
+        command_parser.parse_time_interval("[10us, 1ms]"))
+    self.assertEquals(
+        command_parser.Interval(10, False, 1e3, False),
+        command_parser.parse_time_interval("(10us, 1ms)"))
+    self.assertEquals(
+        command_parser.Interval(10, False, 1e3, True),
+        command_parser.parse_time_interval("(10us, 1ms]"))
+    self.assertEquals(
+        command_parser.Interval(10, True, 1e3, False),
+        command_parser.parse_time_interval("[10us, 1ms)"))
+    self.assertEquals(command_parser.Interval(0, False, 1e3, True),
+                      command_parser.parse_time_interval("<=1ms"))
+    self.assertEquals(
+        command_parser.Interval(1e3, True, float("inf"), False),
+        command_parser.parse_time_interval(">=1ms"))
+    self.assertEquals(command_parser.Interval(0, False, 1e3, False),
+                      command_parser.parse_time_interval("<1ms"))
+    self.assertEquals(
+        command_parser.Interval(1e3, False, float("inf"), False),
+        command_parser.parse_time_interval(">1ms"))
+
+  def testInvalidTimeIntervalRaisesException(self):
+    with self.assertRaisesRegexp(
+        ValueError,
+        r"Invalid interval format: \[10us, 1ms. Valid formats are: "
+        r"\[min, max\], \(min, max\), <max, >min"):
+      command_parser.parse_time_interval("[10us, 1ms")
+    with self.assertRaisesRegexp(
+        ValueError,
+        r"Incorrect interval format: \[10us, 1ms, 2ms\]. Interval should "
+        r"specify two values: \[min, max\] or \(min, max\)"):
+      command_parser.parse_time_interval("[10us, 1ms, 2ms]")
+    with self.assertRaisesRegexp(
+        ValueError,
+        r"Invalid interval \[1s, 1ms\]. Start must be before end of interval."):
+      command_parser.parse_time_interval("[1s, 1ms]")
+
+  def testParseMemoryInterval(self):
+    self.assertEquals(
+        command_parser.Interval(1024, True, 2048, True),
+        command_parser.parse_memory_interval("[1k, 2k]"))
+    self.assertEquals(
+        command_parser.Interval(1024, False, 2048, False),
+        command_parser.parse_memory_interval("(1kB, 2kB)"))
+    self.assertEquals(
+        command_parser.Interval(1024, False, 2048, True),
+        command_parser.parse_memory_interval("(1k, 2k]"))
+    self.assertEquals(
+        command_parser.Interval(1024, True, 2048, False),
+        command_parser.parse_memory_interval("[1k, 2k)"))
+    self.assertEquals(
+        command_parser.Interval(0, False, 2048, True),
+        command_parser.parse_memory_interval("<=2k"))
+    self.assertEquals(
+        command_parser.Interval(11, True, float("inf"), False),
+        command_parser.parse_memory_interval(">=11"))
+    self.assertEquals(command_parser.Interval(0, False, 2048, False),
+                      command_parser.parse_memory_interval("<2k"))
+    self.assertEquals(
+        command_parser.Interval(11, False, float("inf"), False),
+        command_parser.parse_memory_interval(">11"))
+
+  def testInvalidMemoryIntervalRaisesException(self):
+    with self.assertRaisesRegexp(
+        ValueError,
+        r"Invalid interval \[5k, 3k\]. Start of interval must be less than or "
+        "equal to end of interval."):
+      command_parser.parse_memory_interval("[5k, 3k]")
+
+
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From 66148731c29cd4b7a13ce030cdf78c7b08b6e03d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 15:30:18 -0800
Subject: [PATCH 0330/1563] Internal changes. Change: 152876919

---
 tensorflow/core/platform/logging.h    | 10 ----------
 tensorflow/core/util/events_writer.cc |  1 -
 2 files changed, 11 deletions(-)

diff --git a/tensorflow/core/platform/logging.h b/tensorflow/core/platform/logging.h
index 1ca36db548..985c061676 100644
--- a/tensorflow/core/platform/logging.h
+++ b/tensorflow/core/platform/logging.h
@@ -26,16 +26,6 @@ limitations under the License.
 #endif
 
 namespace tensorflow {
-namespace port {
-
-// Some platforms require that filenames be of a certain form when
-// used for logging.  This function is invoked to allow platforms to
-// adjust the filename used for logging appropriately, if necessary
-// (most ports can just do nothing).  If any changes are necessary, the
-// implementation should mutate "*filename" appropriately.
-void AdjustFilenameForLogging(string* filename);
-
-}  // namespace port
 
 namespace internal {
 // Emit "message" as a log message to the log for the specified
diff --git a/tensorflow/core/util/events_writer.cc b/tensorflow/core/util/events_writer.cc
index 60ba39dab1..7cd040ebd4 100644
--- a/tensorflow/core/util/events_writer.cc
+++ b/tensorflow/core/util/events_writer.cc
@@ -56,7 +56,6 @@ bool EventsWriter::InitIfNeeded() {
       strings::Printf("%s.out.tfevents.%010lld.%s%s", file_prefix_.c_str(),
                       static_cast<int64>(time_in_seconds),
                       port::Hostname().c_str(), file_suffix_.c_str());
-  port::AdjustFilenameForLogging(&filename_);
 
   Status s = env_->NewWritableFile(filename_, &recordio_file_);
   if (!s.ok()) {
-- 
GitLab


From da64460f75ae3c116baa708686b60bf924a4277b Mon Sep 17 00:00:00 2001
From: Zhaojun Zhang <zhaojun@coursera.org>
Date: Tue, 11 Apr 2017 16:59:42 -0700
Subject: [PATCH 0331/1563] Remove boston_input_fn_with_queue

since it is not used.
---
 .../learn/python/learn/estimators/estimator_test.py  | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
index 1dc362beb8..3fb65fc0fa 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
@@ -81,18 +81,6 @@ def boston_input_fn(num_epochs=None):
   return features, labels
 
 
-def boston_input_fn_with_queue(num_epochs=None):
-  features, labels = boston_input_fn(num_epochs=num_epochs)
-
-  # Create a minimal queue runner.
-  fake_queue = data_flow_ops.FIFOQueue(30, dtypes.int32)
-  queue_runner = queue_runner_impl.QueueRunner(fake_queue,
-                                               [constant_op.constant(0)])
-  queue_runner_impl.add_queue_runner(queue_runner)
-
-  return features, labels
-
-
 def iris_input_fn():
   iris = base.load_iris()
   features = array_ops.reshape(
-- 
GitLab


From acae9a9192e115315232a95d60826a603ef9cb2e Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Tue, 11 Apr 2017 15:54:33 -0800
Subject: [PATCH 0332/1563] Add complex128 GPU registrations to tf.gather and
 tf.strided_slice.

Removes use_gpu duplication in their tests and ensures that complex test values' imaginary components are non-zero.
Change: 152879786
---
 tensorflow/core/kernels/gather_functor.cc     |   1 +
 .../core/kernels/gather_functor_gpu.cu.cc     |   1 +
 tensorflow/core/kernels/gather_op.cc          |   1 +
 tensorflow/core/kernels/strided_slice_op.cc   |   1 +
 .../core/kernels/strided_slice_op_gpu.cu.cc   |   1 +
 .../core/kernels/strided_slice_op_impl.h      |   2 +
 .../python/kernel_tests/array_ops_test.py     | 392 +++++++++---------
 .../python/kernel_tests/gather_op_test.py     |  33 +-
 8 files changed, 217 insertions(+), 215 deletions(-)

diff --git a/tensorflow/core/kernels/gather_functor.cc b/tensorflow/core/kernels/gather_functor.cc
index 8ef027a1dd..c1d58733a2 100644
--- a/tensorflow/core/kernels/gather_functor.cc
+++ b/tensorflow/core/kernels/gather_functor.cc
@@ -39,6 +39,7 @@ namespace functor {
 
 TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPECS);
 TF_CALL_complex64(DECLARE_GPU_SPECS);
+TF_CALL_complex128(DECLARE_GPU_SPECS);
 
 #undef DECLARE_GPU_SPECS
 #undef DECLARE_GPU_SPECS_INDEX
diff --git a/tensorflow/core/kernels/gather_functor_gpu.cu.cc b/tensorflow/core/kernels/gather_functor_gpu.cu.cc
index 456f4023a7..39b6924d74 100644
--- a/tensorflow/core/kernels/gather_functor_gpu.cu.cc
+++ b/tensorflow/core/kernels/gather_functor_gpu.cu.cc
@@ -33,6 +33,7 @@ typedef Eigen::GpuDevice GPUDevice;
 
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 TF_CALL_complex64(DEFINE_GPU_SPECS);
+TF_CALL_complex128(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 #undef DEFINE_GPU_SPECS_INDEX
diff --git a/tensorflow/core/kernels/gather_op.cc b/tensorflow/core/kernels/gather_op.cc
index 31af37693c..dd25f58957 100644
--- a/tensorflow/core/kernels/gather_op.cc
+++ b/tensorflow/core/kernels/gather_op.cc
@@ -115,6 +115,7 @@ TF_CALL_QUANTIZED_TYPES(REGISTER_GATHER_CPU);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GATHER_GPU);
 TF_CALL_complex64(REGISTER_GATHER_GPU);
+TF_CALL_complex128(REGISTER_GATHER_GPU);
 
 #undef REGISTER_GATHER_GPU
 
diff --git a/tensorflow/core/kernels/strided_slice_op.cc b/tensorflow/core/kernels/strided_slice_op.cc
index 10593516f7..24884578ea 100644
--- a/tensorflow/core/kernels/strided_slice_op.cc
+++ b/tensorflow/core/kernels/strided_slice_op.cc
@@ -414,6 +414,7 @@ REGISTER_STRIDED_SLICE(bfloat16);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
 TF_CALL_complex64(REGISTER_GPU);
+TF_CALL_complex128(REGISTER_GPU);
 
 // A special GPU kernel for int32.
 // TODO(b/25387198): Also enable int32 in device memory. This kernel
diff --git a/tensorflow/core/kernels/strided_slice_op_gpu.cu.cc b/tensorflow/core/kernels/strided_slice_op_gpu.cu.cc
index 3679d9b985..a8487f49f4 100644
--- a/tensorflow/core/kernels/strided_slice_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/strided_slice_op_gpu.cu.cc
@@ -52,6 +52,7 @@ typedef Eigen::GpuDevice GPUDevice;
   template struct functor::StridedSliceAssignScalar<GPUDevice, T>;
 TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_KERNELS);
 TF_CALL_complex64(DEFINE_GPU_KERNELS);
+TF_CALL_complex128(DEFINE_GPU_KERNELS);
 DEFINE_GPU_KERNELS(int32);
 
 #undef DEFINE_GPU_KERNELS
diff --git a/tensorflow/core/kernels/strided_slice_op_impl.h b/tensorflow/core/kernels/strided_slice_op_impl.h
index d820db348e..df7490486e 100644
--- a/tensorflow/core/kernels/strided_slice_op_impl.h
+++ b/tensorflow/core/kernels/strided_slice_op_impl.h
@@ -278,9 +278,11 @@ class HandleStridedSliceAssignCase<Device, T, 0> {
 #if GOOGLE_CUDA
 TF_CALL_GPU_PROXY_TYPES(PREVENT_FOR_N_GPU);
 TF_CALL_complex64(PREVENT_FOR_N_GPU);
+TF_CALL_complex128(PREVENT_FOR_N_GPU);
 
 TF_CALL_GPU_NUMBER_TYPES(DECLARE_FOR_N_GPU);
 TF_CALL_complex64(DECLARE_FOR_N_GPU);
+TF_CALL_complex128(DECLARE_FOR_N_GPU);
 DECLARE_FOR_N_GPU(int32);
 #endif  // END GOOGLE_CUDA
 
diff --git a/tensorflow/python/kernel_tests/array_ops_test.py b/tensorflow/python/kernel_tests/array_ops_test.py
index caa4cd2223..d6ad00477c 100644
--- a/tensorflow/python/kernel_tests/array_ops_test.py
+++ b/tensorflow/python/kernel_tests/array_ops_test.py
@@ -396,11 +396,12 @@ class StridedSliceChecker(object):
   REF_TENSOR_ALIGNED = np.arange(1, 97, dtype=np.float32).reshape(3, 4, 8)
 
   def __init__(self, test, x, tensor_type=dtypes.int32, check_type_infer=True):
+    self.x_np = np.array(x).astype(tensor_type.as_numpy_dtype)
+    # Give the value a non-zero imaginary component for complex types.
+    if tensor_type.is_complex:
+      self.x_np -= 1j * self.x_np
     self.test = test
-    self.x = math_ops.cast(
-        constant_op.constant(
-            x, dtype=dtypes.float32), dtype=tensor_type)
-    self.x_np = np.array(x)
+    self.x = constant_op.constant(self.x_np, dtype=tensor_type)
     self.check_type_infer = check_type_infer
 
   def __getitem__(self, spec):
@@ -435,7 +436,8 @@ class StridedSliceChecker(object):
 
 
 STRIDED_SLICE_TYPES = [dtypes.int32, dtypes.int64, dtypes.int16, dtypes.int8,
-                       dtypes.float32, dtypes.float64, dtypes.complex64]
+                       dtypes.float32, dtypes.float64, dtypes.complex64,
+                       dtypes.complex128]
 
 
 class StridedSliceTest(test_util.TensorFlowTestCase):
@@ -443,134 +445,126 @@ class StridedSliceTest(test_util.TensorFlowTestCase):
 
   def test_basic_slice(self):
     for tensor_type in STRIDED_SLICE_TYPES:
-      for use_gpu in [False, True]:
-        with self.test_session(use_gpu=use_gpu):
-          checker = StridedSliceChecker(
-              self, StridedSliceChecker.REF_TENSOR, tensor_type=tensor_type)
-          _ = checker[:, :, :]
-          # Various ways of representing identity slice
-          _ = checker[:, :, :]
-          _ = checker[::, ::, ::]
-          _ = checker[::1, ::1, ::1]
-          # Not zero slice
-          _ = checker[::1, ::5, ::2]
-          # Reverse in each dimension independently
-          _ = checker[::-1, :, :]
-          _ = checker[:, ::-1, :]
-          _ = checker[:, :, ::-1]
-          ## negative index tests i.e. n-2 in first component
-          _ = checker[-2::-1, :, ::1]
-          # negative index tests i.e. n-2 in first component, non-unit stride
-          _ = checker[-2::-1, :, ::2]
-
-          # Check rank-0 examples
-          checker2 = StridedSliceChecker(self, 5, tensor_type=tensor_type)
-          _ = checker2[None]
-          _ = checker2[...]
-          _ = checker2[tuple()]
+      with self.test_session(use_gpu=True):
+        checker = StridedSliceChecker(
+            self, StridedSliceChecker.REF_TENSOR, tensor_type=tensor_type)
+        _ = checker[:, :, :]
+        # Various ways of representing identity slice
+        _ = checker[:, :, :]
+        _ = checker[::, ::, ::]
+        _ = checker[::1, ::1, ::1]
+        # Not zero slice
+        _ = checker[::1, ::5, ::2]
+        # Reverse in each dimension independently
+        _ = checker[::-1, :, :]
+        _ = checker[:, ::-1, :]
+        _ = checker[:, :, ::-1]
+        ## negative index tests i.e. n-2 in first component
+        _ = checker[-2::-1, :, ::1]
+        # negative index tests i.e. n-2 in first component, non-unit stride
+        _ = checker[-2::-1, :, ::2]
+
+        # Check rank-0 examples
+        checker2 = StridedSliceChecker(self, 5, tensor_type=tensor_type)
+        _ = checker2[None]
+        _ = checker2[...]
+        _ = checker2[tuple()]
 
   def testDegenerateSlices(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        checker = StridedSliceChecker(self, StridedSliceChecker.REF_TENSOR)
-        # degenerate by offering a forward interval with a negative stride
-        _ = checker[0:-1:-1, :, :]
-        # degenerate with a reverse interval with a positive stride
-        _ = checker[-1:0, :, :]
-        # empty interval in every dimension
-        _ = checker[-1:0, 2:2, 2:3:-1]
+    with self.test_session(use_gpu=True):
+      checker = StridedSliceChecker(self, StridedSliceChecker.REF_TENSOR)
+      # degenerate by offering a forward interval with a negative stride
+      _ = checker[0:-1:-1, :, :]
+      # degenerate with a reverse interval with a positive stride
+      _ = checker[-1:0, :, :]
+      # empty interval in every dimension
+      _ = checker[-1:0, 2:2, 2:3:-1]
 
   def testEllipsis(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        raw = [[[[[1, 2], [3, 4], [5, 6]]], [[[7, 8], [9, 10], [11, 12]]]]]
-        checker = StridedSliceChecker(self, raw)
-
-        _ = checker[0:]
-        # implicit ellipsis
-        _ = checker[0:, ...]
-        # ellipsis alone
-        _ = checker[...]
-        # ellipsis at end
-        _ = checker[0:1, ...]
-        # ellipsis at begin
-        _ = checker[..., 0:1]
-        # ellipsis at middle
-        _ = checker[0:1, ..., 0:1]
-        # multiple ellipses not allowed
-        with self.assertRaisesRegexp(ValueError, "Multiple ellipses"):
-          _ = checker[..., :, ...].eval()
+    with self.test_session(use_gpu=True):
+      raw = [[[[[1, 2], [3, 4], [5, 6]]], [[[7, 8], [9, 10], [11, 12]]]]]
+      checker = StridedSliceChecker(self, raw)
+
+      _ = checker[0:]
+      # implicit ellipsis
+      _ = checker[0:, ...]
+      # ellipsis alone
+      _ = checker[...]
+      # ellipsis at end
+      _ = checker[0:1, ...]
+      # ellipsis at begin
+      _ = checker[..., 0:1]
+      # ellipsis at middle
+      _ = checker[0:1, ..., 0:1]
+      # multiple ellipses not allowed
+      with self.assertRaisesRegexp(ValueError, "Multiple ellipses"):
+        _ = checker[..., :, ...].eval()
 
   def testShrink(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        raw = [[[[[1, 2, 4, 5], [5, 6, 7, 8], [9, 10, 11, 12]]],
-                [[[13, 14, 15, 16], [17, 18, 19, 20], [21, 22, 23, 24]]]]]
-        checker = StridedSliceChecker(self, raw)
-        _ = checker[:, :, :, :, 3]
-        _ = checker[..., 3]
-        _ = checker[:, 0]
-        _ = checker[:, :, 0]
+    with self.test_session(use_gpu=True):
+      raw = [[[[[1, 2, 4, 5], [5, 6, 7, 8], [9, 10, 11, 12]]],
+              [[[13, 14, 15, 16], [17, 18, 19, 20], [21, 22, 23, 24]]]]]
+      checker = StridedSliceChecker(self, raw)
+      _ = checker[:, :, :, :, 3]
+      _ = checker[..., 3]
+      _ = checker[:, 0]
+      _ = checker[:, :, 0]
 
   def testTensorIndexing(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        raw = [[[[[1, 2, 4, 5], [5, 6, 7, 8], [9, 10, 11, 12]]],
-                [[[13, 14, 15, 16], [17, 18, 19, 20], [21, 22, 23, 24]]]]]
-        checker = StridedSliceChecker(self, raw, check_type_infer=False)
-        bar = constant_op.constant(2)
-        bar2 = constant_op.constant(3)
-        _ = checker[..., bar:bar2]
-        _ = checker[..., bar]
-        with self.assertRaisesRegexp(
-            TypeError,
-            "Value passed to parameter 'begin' has DataType float32 not in "
-            "list of allowed values"):
-          _ = checker[..., 3.0]
-        _ = checker[..., 3]
+    with self.test_session(use_gpu=True):
+      raw = [[[[[1, 2, 4, 5], [5, 6, 7, 8], [9, 10, 11, 12]]],
+              [[[13, 14, 15, 16], [17, 18, 19, 20], [21, 22, 23, 24]]]]]
+      checker = StridedSliceChecker(self, raw, check_type_infer=False)
+      bar = constant_op.constant(2)
+      bar2 = constant_op.constant(3)
+      _ = checker[..., bar:bar2]
+      _ = checker[..., bar]
+      with self.assertRaisesRegexp(
+          TypeError,
+          "Value passed to parameter 'begin' has DataType float32 not in "
+          "list of allowed values"):
+        _ = checker[..., 3.0]
+      _ = checker[..., 3]
 
   def testExpand(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        raw = [[[[[1, 2, 4, 5], [5, 6, 7, 8], [9, 10, 11, 12]]],
-                [[[13, 14, 15, 16], [17, 18, 19, 20], [21, 22, 23, 24]]]]]
-        checker = StridedSliceChecker(self, raw)
-        # new axis (followed by implicit ellipsis)
-        _ = checker[np.newaxis]
-        # newaxis after ellipsis
-        _ = checker[..., np.newaxis]
-        # newaxis in between ellipsis and explicit range
-        _ = checker[..., np.newaxis, :]
-        _ = checker[:, ..., np.newaxis, :, :]
-        # Reverse final dimension with new axis
-        _ = checker[:, :, np.newaxis, :, 2::-1]
-        # Ellipsis in middle of two newaxis
-        _ = checker[np.newaxis, ..., np.newaxis]
+    with self.test_session(use_gpu=True):
+      raw = [[[[[1, 2, 4, 5], [5, 6, 7, 8], [9, 10, 11, 12]]],
+              [[[13, 14, 15, 16], [17, 18, 19, 20], [21, 22, 23, 24]]]]]
+      checker = StridedSliceChecker(self, raw)
+      # new axis (followed by implicit ellipsis)
+      _ = checker[np.newaxis]
+      # newaxis after ellipsis
+      _ = checker[..., np.newaxis]
+      # newaxis in between ellipsis and explicit range
+      _ = checker[..., np.newaxis, :]
+      _ = checker[:, ..., np.newaxis, :, :]
+      # Reverse final dimension with new axis
+      _ = checker[:, :, np.newaxis, :, 2::-1]
+      # Ellipsis in middle of two newaxis
+      _ = checker[np.newaxis, ..., np.newaxis]
 
   def testExpandVariable(self):
-    for use_gpu in False, True:
-      with self.test_session(use_gpu=use_gpu):
-        x = variables.Variable(7, dtype=dtypes.int32)
-        x.initializer.run()
-        y = x[None].eval()
-        self.assertEqual(y.shape, (1,))
-        self.assertAllEqual(y, (7,))
+    with self.test_session(use_gpu=True):
+      x = variables.Variable(7, dtype=dtypes.int32)
+      x.initializer.run()
+      y = x[None].eval()
+      self.assertEqual(y.shape, (1,))
+      self.assertAllEqual(y, (7,))
 
   def testOptimizedCases(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        checker = StridedSliceChecker(self,
-                                      StridedSliceChecker.REF_TENSOR_ALIGNED)
-        # Identity
-        _ = checker[:]
-        # Identity
-        _ = checker[...]
-        # Identity
-        _ = checker[np.newaxis, ..., np.newaxis]
-        # First axis slice
-        _ = checker[1:]
-        # First axis slice
-        _ = checker[np.newaxis, 1:]
+    with self.test_session(use_gpu=True):
+      checker = StridedSliceChecker(self,
+                                    StridedSliceChecker.REF_TENSOR_ALIGNED)
+      # Identity
+      _ = checker[:]
+      # Identity
+      _ = checker[...]
+      # Identity
+      _ = checker[np.newaxis, ..., np.newaxis]
+      # First axis slice
+      _ = checker[1:]
+      # First axis slice
+      _ = checker[np.newaxis, 1:]
 
 
 class StridedSliceShapeChecker(object):
@@ -587,7 +581,7 @@ class StridedSliceShapeTest(test_util.TensorFlowTestCase):
   """Test the shape inference of StridedSliceShapes."""
 
   def testUnknown(self):
-    with self.test_session(use_gpu=False):
+    with self.test_session(use_gpu=True):
       uncertain_tensor = array_ops.placeholder(dtypes.float32)
       a = StridedSliceShapeChecker(uncertain_tensor)
       a_slice_shape = a[...]
@@ -598,45 +592,43 @@ class StridedSliceShapeTest(test_util.TensorFlowTestCase):
     self.assertEqual(x.as_list(), y.as_list())
 
   def testTensorShapeUncertain(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        uncertain_tensor = array_ops.placeholder(
-            dtypes.float32, shape=(5, None, 7))
-        a = StridedSliceShapeChecker(uncertain_tensor)
-        self.tensorShapeEqual(a[3:5], tensor_shape.TensorShape([2, None, 7]))
-        self.tensorShapeEqual(a[3:5, :, 4], tensor_shape.TensorShape([2, None]))
-        self.tensorShapeEqual(a[3:5, 3:4, 4],
-                              tensor_shape.TensorShape([2, None]))
-        self.tensorShapeEqual(a[3:5, :, 5:10],
-                              tensor_shape.TensorShape([2, None, 2]))
-        self.tensorShapeEqual(a[3:5, :, 50:3],
-                              tensor_shape.TensorShape([2, None, 0]))
-        self.tensorShapeEqual(a[3:5, :, array_ops.newaxis, 50:3,],
-                              tensor_shape.TensorShape([2, None, 1, 0]))
-        self.tensorShapeEqual(a[1:5:2, :, array_ops.newaxis, 50:3,],
-                              tensor_shape.TensorShape([2, None, 1, 0]))
-        self.tensorShapeEqual(a[:5:3, :, array_ops.newaxis, 50:3,],
-                              tensor_shape.TensorShape([2, None, 1, 0]))
-        self.tensorShapeEqual(a[:2:3, :, array_ops.newaxis, 50:3,],
-                              tensor_shape.TensorShape([1, None, 1, 0]))
-        self.tensorShapeEqual(a[::-1, :, array_ops.newaxis, ::-2],
-                              tensor_shape.TensorShape([5, None, 1, 4]))
+    with self.test_session(use_gpu=True):
+      uncertain_tensor = array_ops.placeholder(
+          dtypes.float32, shape=(5, None, 7))
+      a = StridedSliceShapeChecker(uncertain_tensor)
+      self.tensorShapeEqual(a[3:5], tensor_shape.TensorShape([2, None, 7]))
+      self.tensorShapeEqual(a[3:5, :, 4], tensor_shape.TensorShape([2, None]))
+      self.tensorShapeEqual(a[3:5, 3:4, 4],
+                            tensor_shape.TensorShape([2, None]))
+      self.tensorShapeEqual(a[3:5, :, 5:10],
+                            tensor_shape.TensorShape([2, None, 2]))
+      self.tensorShapeEqual(a[3:5, :, 50:3],
+                            tensor_shape.TensorShape([2, None, 0]))
+      self.tensorShapeEqual(a[3:5, :, array_ops.newaxis, 50:3,],
+                            tensor_shape.TensorShape([2, None, 1, 0]))
+      self.tensorShapeEqual(a[1:5:2, :, array_ops.newaxis, 50:3,],
+                            tensor_shape.TensorShape([2, None, 1, 0]))
+      self.tensorShapeEqual(a[:5:3, :, array_ops.newaxis, 50:3,],
+                            tensor_shape.TensorShape([2, None, 1, 0]))
+      self.tensorShapeEqual(a[:2:3, :, array_ops.newaxis, 50:3,],
+                            tensor_shape.TensorShape([1, None, 1, 0]))
+      self.tensorShapeEqual(a[::-1, :, array_ops.newaxis, ::-2],
+                            tensor_shape.TensorShape([5, None, 1, 4]))
 
   def testTensorValuedIndexShape(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu):
-        defined_shape_tensor = array_ops.placeholder(
-            dtypes.float32, shape=(5, 3, 7))
-        index_value = array_ops.placeholder(dtypes.int32, shape=())
-        a = StridedSliceShapeChecker(defined_shape_tensor)
-        self.tensorShapeEqual(a[index_value], tensor_shape.TensorShape([3, 7]))
-        self.tensorShapeEqual(a[index_value, ::-1],
-                              tensor_shape.TensorShape([3, 7]))
-        self.tensorShapeEqual(a[index_value, ::-2],
-                              tensor_shape.TensorShape([2, 7]))
-        other_scalar = array_ops.placeholder(dtypes.int32, shape=())
-        self.tensorShapeEqual(a[index_value, other_scalar:2],
-                              tensor_shape.TensorShape([None, 7]))
+    with self.test_session(use_gpu=True):
+      defined_shape_tensor = array_ops.placeholder(
+          dtypes.float32, shape=(5, 3, 7))
+      index_value = array_ops.placeholder(dtypes.int32, shape=())
+      a = StridedSliceShapeChecker(defined_shape_tensor)
+      self.tensorShapeEqual(a[index_value], tensor_shape.TensorShape([3, 7]))
+      self.tensorShapeEqual(a[index_value, ::-1],
+                            tensor_shape.TensorShape([3, 7]))
+      self.tensorShapeEqual(a[index_value, ::-2],
+                            tensor_shape.TensorShape([2, 7]))
+      other_scalar = array_ops.placeholder(dtypes.int32, shape=())
+      self.tensorShapeEqual(a[index_value, other_scalar:2],
+                            tensor_shape.TensorShape([None, 7]))
 
 
 class GradSliceChecker(object):
@@ -681,35 +673,33 @@ class StridedSliceGradTest(test_util.TensorFlowTestCase):
   """Test that strided slice's custom gradient produces correct gradients."""
 
   def testGradient(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu) as sess:
-        var = variables.Variable(
-            array_ops.reshape(
-                math_ops.range(1, 97, 1), shape=(6, 4, 4)))
-        init = variables.global_variables_initializer()
-        sess.run(init)
-
-        grad = GradSliceChecker(self, sess, var,
-                                np.array(range(1, 97, 1)).reshape((6, 4, 4)))
-        _ = grad[2:6:2, 1:3, 1:3]
-        _ = grad[3:0:-2, 1:3, 1:3]
-        _ = grad[3:0:-2, array_ops.newaxis, 1:3, 2, array_ops.newaxis]
-        _ = grad[3:0:-2, 1:3, 2]
-        _ = grad[:, -1, :]
-        _ = grad[:, -2, :]
-        with self.assertRaisesRegexp(ValueError, "out of bounds"):
-          _ = grad[:, -200, :]
-        with self.assertRaisesRegexp(ValueError, "out of bounds"):
-          _ = grad[:, 200, :]
+    with self.test_session(use_gpu=True) as sess:
+      var = variables.Variable(
+          array_ops.reshape(
+              math_ops.range(1, 97, 1), shape=(6, 4, 4)))
+      init = variables.global_variables_initializer()
+      sess.run(init)
+
+      grad = GradSliceChecker(self, sess, var,
+                              np.array(range(1, 97, 1)).reshape((6, 4, 4)))
+      _ = grad[2:6:2, 1:3, 1:3]
+      _ = grad[3:0:-2, 1:3, 1:3]
+      _ = grad[3:0:-2, array_ops.newaxis, 1:3, 2, array_ops.newaxis]
+      _ = grad[3:0:-2, 1:3, 2]
+      _ = grad[:, -1, :]
+      _ = grad[:, -2, :]
+      with self.assertRaisesRegexp(ValueError, "out of bounds"):
+        _ = grad[:, -200, :]
+      with self.assertRaisesRegexp(ValueError, "out of bounds"):
+        _ = grad[:, 200, :]
 
   def testGradientZero(self):
-    for use_gpu in [False, True]:
-      with self.test_session(use_gpu=use_gpu) as sess:
-        var = variables.Variable(8)
-        init = variables.global_variables_initializer()
-        sess.run(init)
-        grad = GradSliceChecker(self, sess, var, np.array(8))
-        _ = grad[tuple()]
+    with self.test_session(use_gpu=True) as sess:
+      var = variables.Variable(8)
+      init = variables.global_variables_initializer()
+      sess.run(init)
+      grad = GradSliceChecker(self, sess, var, np.array(8))
+      _ = grad[tuple()]
 
 
 class StridedSliceGradTypeTest(test_util.TensorFlowTestCase):
@@ -819,22 +809,28 @@ class StridedSliceAssignChecker(object):
   def __init__(self, test, x, tensor_type=dtypes.float32):
     self.tensor_type = tensor_type
     self.test = test
-    self.x = math_ops.cast(
-        constant_op.constant(
-            x, dtype=dtypes.float32), dtype=tensor_type)
-    self.x_np = np.array(x)
+
+    self.x_np = np.array(x).astype(tensor_type.as_numpy_dtype)
+    # Give the value a non-zero imaginary component for complex types.
+    if tensor_type.is_complex:
+      self.x_np -= 1j * self.x_np
+    self.x = constant_op.constant(self.x_np, dtype=tensor_type)
 
   def __setitem__(self, index, value):
-    for use_gpu in [False, True]:
-      with self.test.test_session(use_gpu=use_gpu) as sess:
-        var = variables.Variable(self.x)
-        sess.run(variables.initialize_variables([var]))
-        val = sess.run(var[index].assign(
-            constant_op.constant(
-                value, dtype=self.tensor_type)))
-        valnp = np.copy(self.x_np)
-        valnp[index] = np.array(value)
-        self.test.assertAllEqual(val, valnp)
+    value = np.array(value).astype(self.tensor_type.as_numpy_dtype)
+    # Give the value a non-zero imaginary component for complex types.
+    if self.tensor_type.is_complex:
+      value -= 1j * value
+
+    with self.test.test_session(use_gpu=True) as sess:
+      var = variables.Variable(self.x)
+      sess.run(variables.initialize_variables([var]))
+      val = sess.run(var[index].assign(
+          constant_op.constant(
+              value, dtype=self.tensor_type)))
+      valnp = np.copy(self.x_np)
+      valnp[index] = np.array(value)
+      self.test.assertAllEqual(val, valnp)
 
 
 class SliceAssignTest(test_util.TensorFlowTestCase):
diff --git a/tensorflow/python/kernel_tests/gather_op_test.py b/tensorflow/python/kernel_tests/gather_op_test.py
index 1f161e59cd..b3ce234d4e 100644
--- a/tensorflow/python/kernel_tests/gather_op_test.py
+++ b/tensorflow/python/kernel_tests/gather_op_test.py
@@ -27,9 +27,10 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.platform import test
 
+_TEST_TYPES = (dtypes.float32, dtypes.complex64, dtypes.complex128)
+
 
 class GatherTest(test.TestCase):
-  use_gpu = False
 
   def _buildParams(self, data, dtype):
     data = data.astype(dtype.as_numpy_dtype)
@@ -40,9 +41,9 @@ class GatherTest(test.TestCase):
     return data
 
   def testScalar1D(self):
-    with self.test_session(use_gpu=self.use_gpu):
+    with self.test_session(use_gpu=True):
       data = np.array([0, 1, 2, 3, 7, 5])
-      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+      for dtype in _TEST_TYPES:
         params_np = self._buildParams(data, dtype)
         params = constant_op.constant(params_np)
         indices = constant_op.constant(4)
@@ -52,10 +53,10 @@ class GatherTest(test.TestCase):
         self.assertEqual([], gather_t.get_shape())
 
   def testScalar2D(self):
-    with self.test_session(use_gpu=self.use_gpu):
+    with self.test_session(use_gpu=True):
       data = np.array([[0, 1, 2], [3, 4, 5], [6, 7, 8],
                        [9, 10, 11], [12, 13, 14]])
-      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+      for dtype in _TEST_TYPES:
         params_np = self._buildParams(data, dtype)
         params = constant_op.constant(params_np)
         indices = constant_op.constant(2)
@@ -65,10 +66,10 @@ class GatherTest(test.TestCase):
         self.assertEqual([3], gather_t.get_shape())
 
   def testSimpleTwoD32(self):
-    with self.test_session(use_gpu=self.use_gpu):
+    with self.test_session(use_gpu=True):
       data = np.array([[0, 1, 2], [3, 4, 5], [6, 7, 8],
                        [9, 10, 11], [12, 13, 14]])
-      for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+      for dtype in _TEST_TYPES:
         params_np = self._buildParams(data, dtype)
         params = constant_op.constant(params_np)
         indices = constant_op.constant([0, 4, 0, 2])
@@ -82,10 +83,10 @@ class GatherTest(test.TestCase):
     # We check that scalar and empty shapes work as well
     for shape in (7, 0), (4, 3, 2):
       for indices_shape in (), (0,), (3, 0), (3, 5):
-        for dtype in (dtypes.float32, dtypes.complex64, dtypes.complex128):
+        for dtype in _TEST_TYPES:
           params = self._buildParams(np.random.randn(*shape), dtype)
           indices = np.random.randint(shape[0], size=indices_shape)
-          with self.test_session(use_gpu=self.use_gpu):
+          with self.test_session(use_gpu=True):
             tf_params = constant_op.constant(params)
             tf_indices = constant_op.constant(indices)
             gather = array_ops.gather(tf_params, tf_indices)
@@ -95,6 +96,8 @@ class GatherTest(test.TestCase):
             # Test gradients
             gather_grad = np.random.randn(*gather.get_shape().as_list()).astype(
                 dtype.as_numpy_dtype)
+            if dtype.is_complex:
+              gather_grad -= 1j * gather_grad
             params_grad, indices_grad = gradients_impl.gradients(
                 gather, [tf_params, tf_indices], gather_grad)
             self.assertEqual(indices_grad, None)
@@ -113,7 +116,7 @@ class GatherTest(test.TestCase):
     self.assertEqual(None, gather_t.get_shape())
 
   def testBadIndices(self):
-    with self.test_session(use_gpu=False):
+    with self.test_session(use_gpu=True):
       params = [0, 1, 2]
       indices = [[7]]
       gather = array_ops.gather(params, indices)
@@ -121,18 +124,14 @@ class GatherTest(test.TestCase):
         gather.eval()
 
   def testEmptySlices(self):
-    with self.test_session(use_gpu=self.use_gpu):
-      for dtype in np.float32, np.float64, np.complex64, np.complex128:
+    with self.test_session(use_gpu=True):
+      for dtype in _TEST_TYPES:
         for itype in np.int32, np.int64:
-          params = np.zeros((7, 0), dtype=dtype)
+          params = np.zeros((7, 0), dtype=dtype.as_numpy_dtype)
           indices = np.array([3, 4], dtype=itype)
           gather = array_ops.gather(params, indices)
           self.assertAllEqual(gather.eval(), np.zeros((2, 0)))
 
 
-class GatherGpuTest(GatherTest):
-  use_gpu = True
-
-
 if __name__ == "__main__":
   test.main()
-- 
GitLab


From 0aa67b90001f48c1004754036505b7e405243a28 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 16:17:25 -0800
Subject: [PATCH 0333/1563] Change for internal compatibility.

---
 tensorflow/core/framework/attr_value_util.cc |  2 +-
 tensorflow/core/framework/function.cc        | 10 +++++-----
 tensorflow/core/lib/gtl/top_n_test.cc        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/framework/attr_value_util.cc b/tensorflow/core/framework/attr_value_util.cc
index 55e0099640..452cfdda9e 100644
--- a/tensorflow/core/framework/attr_value_util.cc
+++ b/tensorflow/core/framework/attr_value_util.cc
@@ -48,7 +48,7 @@ string SummarizeFunc(const NameAttrList& func) {
     entries.push_back(
         strings::StrCat(p.first, "=", SummarizeAttrValue(p.second)));
   }
-  sort(entries.begin(), entries.end());
+  std::sort(entries.begin(), entries.end());
   return strings::StrCat(func.name(), "[", str_util::Join(entries, ", "), "]");
 }
 
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index 002929d58a..eba649458c 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -408,7 +408,7 @@ string Print(const AttrValue& attr_value) {
     for (auto p : attr_value.func().attr()) {
       entries.push_back(strings::StrCat(p.first, "=", Print(p.second)));
     }
-    sort(entries.begin(), entries.end());
+    std::sort(entries.begin(), entries.end());
     return strings::StrCat(attr_value.func().name(), "[",
                            str_util::Join(entries, ", "), "]");
   }
@@ -424,7 +424,7 @@ string Print(const NodeDef& n) {
     for (auto& a : n.attr()) {
       entries.push_back(strings::StrCat(a.first, "=", Print(a.second)));
     }
-    sort(entries.begin(), entries.end());
+    std::sort(entries.begin(), entries.end());
     strings::StrAppend(&out, "[", str_util::Join(entries, ", "), "]");
   }
   strings::StrAppend(&out, "(");
@@ -502,8 +502,8 @@ string Print(const GraphDef& gdef) {
     TF_CHECK_OK(GetNodeAttr(*y, "index", &yi));
     return xi < yi;
   };
-  sort(arg.begin(), arg.end(), comp);
-  sort(ret.begin(), ret.end(), comp);
+  std::sort(arg.begin(), arg.end(), comp);
+  std::sort(ret.begin(), ret.end(), comp);
   string out;
   strings::StrAppend(&out, "\n(");
   auto get_type = [](const NodeDef& n) {
@@ -690,7 +690,7 @@ string Canonicalize(const string& funcname,
   for (auto p : attrs) {
     entries.push_back(strings::StrCat(p.first, "=", Print(p.second)));
   }
-  sort(entries.begin(), entries.end());
+  std::sort(entries.begin(), entries.end());
   return strings::StrCat(funcname, "[", str_util::Join(entries, ","), "]");
 }
 
diff --git a/tensorflow/core/lib/gtl/top_n_test.cc b/tensorflow/core/lib/gtl/top_n_test.cc
index fafcd445b8..0f2325e6fa 100644
--- a/tensorflow/core/lib/gtl/top_n_test.cc
+++ b/tensorflow/core/lib/gtl/top_n_test.cc
@@ -254,7 +254,7 @@ TEST(TopNTest, Iteration) {
   for (int i = 0; i < 8; ++i) top.push(i);
   std::vector<int> actual(top.unsorted_begin(), top.unsorted_end());
   // Check that we have 4,5,6,7 as the top 4 (in some order, so we sort)
-  sort(actual.begin(), actual.end());
+  std::sort(actual.begin(), actual.end());
   EXPECT_EQ(actual.size(), 4);
   EXPECT_EQ(actual[0], 4);
   EXPECT_EQ(actual[1], 5);
-- 
GitLab


From 348b3b114021c06d90dcf0f0efd3f22642d64929 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 11 Apr 2017 17:04:44 -0800
Subject: [PATCH 0334/1563] Ensure that moving_mean and moving_variance are
 grabbed before being updated. Note that this should not be necessary since
 they are only updated during training and used during testing (unlike
 renorm_* which are both used and updated during training). However, due to an
 apparent bug in tf.cond, we create "fake" updates during inference (with
 decay=1), and so data races may result. This CL fixes that. Change: 152887553

---
 tensorflow/python/layers/normalization.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 5fd20259be..34b663119e 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -282,6 +282,13 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
       # Some of the computations here are not necessary when training==False
       # but not a constant. However, this makes the code simpler.
       mean, variance = nn.moments(inputs, reduction_axes)
+      mean = _smart_select(training,
+                           lambda: mean,
+                           lambda: self.moving_mean)
+      variance = _smart_select(training,
+                               lambda: variance,
+                               lambda: self.moving_variance)
+
       if self.renorm:
         r, d, new_mean, new_variance = self._renorm_correction_and_moments(
             mean, variance, training)
@@ -312,13 +319,6 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
         self.updates.append(mean_update)
         self.updates.append(variance_update)
 
-      mean = _smart_select(training,
-                           lambda: mean,
-                           lambda: self.moving_mean)
-      variance = _smart_select(training,
-                               lambda: variance,
-                               lambda: self.moving_variance)
-
     else:
       mean, variance = self.moving_mean, self.moving_variance
 
-- 
GitLab


From b11dff9a7c9571527c50962752456ce9632ebdf3 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Tue, 11 Apr 2017 19:11:56 -0800
Subject: [PATCH 0335/1563] Make the contrib.RunConfig as a child class of
 core.RunConfig. Change: 152895502

---
 .../python/learn/estimators/run_config.py     |  5 ++-
 .../learn/estimators/run_config_test.py       | 36 ++++++++++---------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 37ee814b62..0e4c551bc1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -27,6 +27,7 @@ import six
 
 from tensorflow.contrib.framework.python.framework import experimental
 from tensorflow.core.protobuf import config_pb2
+from tensorflow.python.estimator import run_config as core_run_config
 from tensorflow.python.training import server_lib
 
 
@@ -192,9 +193,11 @@ class ClusterConfig(object):
     return int(task_index) if task_index else 0
 
 
-class RunConfig(ClusterConfig):
+class RunConfig(ClusterConfig, core_run_config.RunConfig):
   """This class specifies the configurations for an `Estimator` run.
 
+  This class is the implementation of ${tf.estimator.RunConfig} interface.
+
   If you're a Google-internal user using command line flags with
   `learn_runner.py` (for instance, to do distributed training or to use
   parameter servers), you probably want to use `learn_runner.EstimatorConfig`
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index 4d312ca8ee..e4fd7c5734 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import json
 
-from tensorflow.contrib.learn.python.learn import run_config
 from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
+from tensorflow.python.estimator import run_config as core_run_config
 from tensorflow.python.platform import test
 from tensorflow.python.training import server_lib
 
@@ -34,8 +34,12 @@ patch = test.mock.patch
 
 class RunConfigTest(test.TestCase):
 
+  def test_instance_of_core_run_config(self):
+    config = run_config_lib.RunConfig()
+    self.assertTrue(isinstance(config, core_run_config.RunConfig))
+
   def test_defaults_with_no_tf_config(self):
-    config = run_config.RunConfig()
+    config = run_config_lib.RunConfig()
     self.assertEqual(config.master, "")
     self.assertEqual(config.task_id, 0)
     self.assertEqual(config.num_ps_replicas, 0)
@@ -56,7 +60,7 @@ class RunConfigTest(test.TestCase):
         }
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
 
     self.assertEqual(config.master, "grpc://host4:4")
     self.assertEqual(config.task_id, 1)
@@ -80,7 +84,7 @@ class RunConfigTest(test.TestCase):
         }
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig(
+      config = run_config_lib.RunConfig(
           master="localhost:0", evaluation_master="localhost:9991")
 
     self.assertEqual(config.master, "localhost:0")
@@ -95,7 +99,7 @@ class RunConfigTest(test.TestCase):
   def test_single_node_in_cluster_spec_produces_empty_master(self):
     tf_config = {"cluster": {run_config_lib.TaskType.WORKER: ["host1:1"]}}
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
       self.assertEqual(config.master, "")
 
   def test_no_task_type_produces_empty_master(self):
@@ -107,7 +111,7 @@ class RunConfigTest(test.TestCase):
         # Omits "task": {"type": "worker}
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
       self.assertEqual(config.master, "")
 
   def test_invalid_job_name_raises(self):
@@ -125,7 +129,7 @@ class RunConfigTest(test.TestCase):
         "os.environ",
         {"TF_CONFIG": json.dumps(tf_config)}), self.assertRaisesRegexp(
             ValueError, expected_msg_regexp):
-      run_config.RunConfig()
+      run_config_lib.RunConfig()
 
   def test_illegal_task_index_raises(self):
     tf_config = {
@@ -143,7 +147,7 @@ class RunConfigTest(test.TestCase):
         "os.environ",
         {"TF_CONFIG": json.dumps(tf_config)}), self.assertRaisesRegexp(
             ValueError, expected_msg_regexp):
-      run_config.RunConfig()
+      run_config_lib.RunConfig()
 
   def test_is_chief_from_cloud_tf_config(self):
     # is_chief should be true when ["task"]["type"] == "master" and
@@ -162,7 +166,7 @@ class RunConfigTest(test.TestCase):
         "environment": "cloud"
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
 
     self.assertTrue(config.is_chief)
 
@@ -182,7 +186,7 @@ class RunConfigTest(test.TestCase):
         "environment": "random"
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
 
     self.assertTrue(config.is_chief)
 
@@ -200,26 +204,26 @@ class RunConfigTest(test.TestCase):
         "environment": "random"
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
 
     self.assertFalse(config.is_chief)
 
   def test_default_is_chief_from_tf_config_without_job_name(self):
     tf_config = {"cluster": {}, "task": {}}
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
 
     self.assertTrue(config.is_chief)
 
   def test_model_dir(self):
-    empty_config = run_config.RunConfig()
+    empty_config = run_config_lib.RunConfig()
     self.assertIsNone(empty_config.model_dir)
 
-    config = run_config.RunConfig(model_dir=TEST_DIR)
+    config = run_config_lib.RunConfig(model_dir=TEST_DIR)
     self.assertEqual(TEST_DIR, config.model_dir)
 
   def test_replace(self):
-    config = run_config.RunConfig(
+    config = run_config_lib.RunConfig(
         tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
     self.assertEqual(TEST_DIR, config.model_dir)
     self.assertEqual(RANDOM_SEED, config.tf_random_seed)
@@ -239,7 +243,7 @@ class RunConfigTest(test.TestCase):
       config.replace(some_undefined_property=RANDOM_SEED)
 
   def test_uid(self):
-    config = run_config.RunConfig(
+    config = run_config_lib.RunConfig(
         tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
 
     expected_uid = config.uid()
-- 
GitLab


From 62850f51dd5e978ac243695efab753490a52ca15 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 02:48:13 -0800
Subject: [PATCH 0336/1563] Support dumping HLO graphs as TF GraphDefs in
 hlo_graph_dumper

- Added a new --xla_hlo_dump_as_graphdef TF_XLA_FLAGS
- Moved hlo_tfgraph_builder from xla/tools/ to xla/service/
- Refactored GraphRendererInterface a bit to support both dot graph and tf graph.
Change: 152921467
---
 .../legacy_flags/hlo_graph_dumper_flags.cc    |  4 +
 .../xla/legacy_flags/hlo_graph_dumper_flags.h |  3 +
 tensorflow/compiler/xla/service/BUILD         | 28 ++++++
 .../compiler/xla/service/hlo_graph_dumper.cc  | 44 +++++++--
 .../compiler/xla/service/hlo_graph_dumper.h   | 31 +++---
 .../{tools => service}/hlo_tfgraph_builder.cc |  6 +-
 .../{tools => service}/hlo_tfgraph_builder.h  | 11 +--
 .../hlo_tfgraph_builder_test.cc               | 16 +--
 tensorflow/compiler/xla/tools/BUILD           | 30 +-----
 .../dumped_computation_to_tf_graphdef.cc      | 99 ++++---------------
 10 files changed, 126 insertions(+), 146 deletions(-)
 rename tensorflow/compiler/xla/{tools => service}/hlo_tfgraph_builder.cc (98%)
 rename tensorflow/compiler/xla/{tools => service}/hlo_tfgraph_builder.h (86%)
 rename tensorflow/compiler/xla/{tools => service}/hlo_tfgraph_builder_test.cc (92%)

diff --git a/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.cc b/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.cc
index 8822f6f610..ba43a59195 100644
--- a/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.cc
+++ b/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.cc
@@ -36,10 +36,14 @@ static std::once_flag flags_init;
 static void AllocateFlags() {
   flags = new HloGraphDumperFlags;
   flags->xla_hlo_dump_graph_path = "/tmp/";
+  flags->xla_hlo_dump_as_graphdef = false;
   flag_list = new std::vector<tensorflow::Flag>({
       tensorflow::Flag("xla_hlo_dump_graph_path",
                        &flags->xla_hlo_dump_graph_path,
                        "Path to write dumped HLO graphs to"),
+      tensorflow::Flag("xla_hlo_dump_as_graphdef",
+                       &flags->xla_hlo_dump_as_graphdef,
+                       "Dumps HLO graphs as tensorflow GraphDefs"),
   });
   ParseFlagsFromEnv(*flag_list);
 }
diff --git a/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.h b/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.h
index b6dfced87c..d0b4d092ff 100644
--- a/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.h
+++ b/tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.h
@@ -34,6 +34,9 @@ void AppendHloGraphDumperFlags(std::vector<tensorflow::Flag>* flag_list);
 // The values of flags associated with XLA's hlo_graph_dumper module.
 typedef struct {
   string xla_hlo_dump_graph_path;  // Path to write dumped HLO graphs to
+  // If set, dumps HLO graphs as tensorflow GraphDef; otherwise, dumps HLO
+  // graphs as DOT graph.
+  bool xla_hlo_dump_as_graphdef;
 } HloGraphDumperFlags;
 
 // Return a pointer to the HloGraphDumperFlags struct;
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 92e49314d9..c019eff72d 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1392,6 +1392,33 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "hlo_tfgraph_builder",
+    srcs = ["hlo_tfgraph_builder.cc"],
+    hdrs = ["hlo_tfgraph_builder.h"],
+    visibility = ["//tensorflow/compiler/xla/tools:__pkg__"],
+    deps = [
+        ":hlo",
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
+cc_test(
+    name = "hlo_tfgraph_builder_test",
+    srcs = ["hlo_tfgraph_builder_test.cc"],
+    deps = [
+        ":hlo_tfgraph_builder",
+        "//tensorflow/compiler/xla/client:computation_builder",
+        "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test_main",
+    ],
+)
+
 cc_library(
     name = "hlo_graph_dumper",
     srcs = [
@@ -1401,6 +1428,7 @@ cc_library(
     deps = [
         ":hlo",
         ":hlo_execution_profile",
+        ":hlo_tfgraph_builder",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:types",
diff --git a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
index 0af4c99d0a..fc8fcfce9e 100644
--- a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
+++ b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
+#include "tensorflow/compiler/xla/service/hlo_tfgraph_builder.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/window_util.h"
@@ -414,14 +415,24 @@ namespace {
 
 class FileGraphRenderer : public GraphRendererInterface {
  public:
-  string RenderGraph(const string& graph) override {
+  string RenderGraph(const string& graph, GraphKind graph_kind) override {
     static std::atomic<int> output_num(0);
     legacy_flags::HloGraphDumperFlags* flags =
         legacy_flags::GetHloGraphDumperFlags();
-    string path = StrCat(flags->xla_hlo_dump_graph_path, "hlo_graph_",
-                         output_num++, ".XXXXXX.dot");
+    string file_extension;
+    switch (graph_kind) {
+      case DOT_GRAPH:
+        file_extension = ".dot";
+        break;
+      case TF_GRAPHDEF:
+        file_extension = ".pbtxt";
+        break;
+    }
+    string path =
+        JoinPath(flags->xla_hlo_dump_graph_path,
+                 StrCat("hlo_graph_", output_num++, ".XXXXXX", file_extension));
     auto status = Status::OK();
-    int fd = mkstemps(&path[0], 4);
+    int fd = mkstemps(&path[0], file_extension.length());
     if (fd < 0) {
       status =
           Status(tensorflow::error::Code::UNKNOWN,
@@ -446,10 +457,26 @@ XLA_REGISTER_GRAPH_RENDERER(FileGraphRenderer, 0);
 string DumpGraph(const HloComputation& computation, const string& label,
                  bool show_addresses, bool show_layouts,
                  const HloExecutionProfile* hlo_execution_profile) {
-  string graph = ComputationToDotGraph(computation, label, show_addresses,
-                                       show_layouts, hlo_execution_profile);
-
-  string graph_url = GetGraphRenderer()->RenderGraph(graph);
+  string graph;
+  string graph_url;
+  legacy_flags::HloGraphDumperFlags* flags =
+      legacy_flags::GetHloGraphDumperFlags();
+  if (flags->xla_hlo_dump_as_graphdef) {
+    HloTfGraphBuilder builder;
+    TF_CHECK_OK(builder.AddComputation(computation));
+    CHECK(tensorflow::protobuf::TextFormat::PrintToString(builder.GetGraphDef(),
+                                                          &graph));
+    // TODO(b/37198616): Use the default registered renderers when all
+    // renderers support rendering GraphDefs. Always dump GraphDefs to files
+    // for now.
+    graph_url = FileGraphRenderer().RenderGraph(
+        graph, GraphRendererInterface::TF_GRAPHDEF);
+  } else {
+    graph = ComputationToDotGraph(computation, label, show_addresses,
+                                  show_layouts, hlo_execution_profile);
+    graph_url = GetGraphRenderer()->RenderGraph(
+        graph, GraphRendererInterface::DOT_GRAPH);
+  }
   LOG(INFO) << "computation " << computation.name() << " [" << label
             << "]: " << graph_url;
   return graph_url;
@@ -467,5 +494,4 @@ void DumpText(const HloModule& module, const string& label,
 }
 
 }  // namespace hlo_graph_dumper
-
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_graph_dumper.h b/tensorflow/compiler/xla/service/hlo_graph_dumper.h
index 5f841da1f3..8ed50c3847 100644
--- a/tensorflow/compiler/xla/service/hlo_graph_dumper.h
+++ b/tensorflow/compiler/xla/service/hlo_graph_dumper.h
@@ -25,8 +25,25 @@ limitations under the License.
 namespace xla {
 namespace hlo_graph_dumper {
 
-// Dumps a graph of the computation to the GraphViz server and returns
-// a description of the rendered graph (e.g., a URL).
+// Abstract interface for classes that render HLO graphs (e.g. DOT graph,
+// tensorflow GraphDef).
+class GraphRendererInterface {
+ public:
+  enum GraphKind {
+    DOT_GRAPH,
+    TF_GRAPHDEF,
+  };
+
+  virtual ~GraphRendererInterface() = default;
+
+  // Renders a DOT graph, returning a description of the rendered output
+  // (e.g., a URL)
+  virtual string RenderGraph(const string& graph, GraphKind graph_kind) = 0;
+};
+
+// Dumps a graph of the computation and returns a description of the rendered
+// graph (e.g., a URL) based on the renderer. The "best" renderer in the
+// registry is used.
 string DumpGraph(const HloComputation& computation, const string& label,
                  bool show_addresses, bool show_layouts,
                  const HloExecutionProfile* hlo_execution_profile = nullptr);
@@ -40,16 +57,6 @@ string DumpGraph(const HloComputation& computation, const string& label,
 void DumpText(const HloModule& module, const string& label,
               const string& directory_path, bool do_prefix = true);
 
-// Abstract interface for classes that render DOT graphs.
-class GraphRendererInterface {
- public:
-  virtual ~GraphRendererInterface() = default;
-
-  // Renders a DOT graph, returning a description of the rendered output
-  // (e.g., a URL)
-  virtual string RenderGraph(const string& graph) = 0;
-};
-
 // Graph renderers may be added using a registration mechanism, e.g.:
 // XLA_REGISTER_GRAPH_RENDERER(AGraphRendererClass, 100)
 // The renderer with the highest numeric priority value is used.
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
similarity index 98%
rename from tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
rename to tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
index fe835a20c4..7f2f5bedee 100644
--- a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/service/hlo_tfgraph_builder.h"
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
@@ -31,7 +31,7 @@ using ::tensorflow::strings::StrCat;
 using ::tensorflow::str_util::Join;
 
 namespace xla {
-namespace tools {
+namespace hlo_graph_dumper {
 namespace {
 
 string GetOpDefName(const HloInstruction* instruction) {
@@ -200,5 +200,5 @@ Status HloTfGraphBuilder::AddInstruction(const HloInstruction* instruction) {
   return Status::OK();
 }
 
-}  // namespace tools
+}  // namespace hlo_graph_dumper
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.h
similarity index 86%
rename from tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
rename to tensorflow/compiler/xla/service/hlo_tfgraph_builder.h
index 3052eae113..b2c578af91 100644
--- a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.h
@@ -13,16 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
-#define THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
+#ifndef THIRD_PARTY_TENSORFLOW_COMPILER_XLA_SERVICE_HLO_TFGRAPH_BUILDER_H_
+#define THIRD_PARTY_TENSORFLOW_COMPILER_XLA_SERVICE_HLO_TFGRAPH_BUILDER_H_
 
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
-#include "tensorflow/core/graph/graph.h"
 
 namespace xla {
-namespace tools {
+namespace hlo_graph_dumper {
 
 // This constructs a tensorflow graph for HLO computations.
 class HloTfGraphBuilder {
@@ -53,7 +52,7 @@ class HloTfGraphBuilder {
 // Cleans the node name to make it a valid name in a tensorflow graph.
 void CleanNodeName(string* name);
 
-}  // namespace tools
+}  // namespace hlo_graph_dumper
 }  // namespace xla
 
-#endif  // THIRD_PARTY_TENSORFLOW_COMPILER_XLA_TOOLS_HLO_TFGRAPH_BUILDER_H_
+#endif  // THIRD_PARTY_TENSORFLOW_COMPILER_XLA_SERVICE_HLO_TFGRAPH_BUILDER_H_
diff --git a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
similarity index 92%
rename from tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
rename to tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
index 626bcc6d85..3190f2d703 100644
--- a/tensorflow/compiler/xla/tools/hlo_tfgraph_builder_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
@@ -13,12 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
+#include "tensorflow/compiler/xla/service/hlo_tfgraph_builder.h"
 #include "tensorflow/compiler/xla/client/computation_builder.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/tensor_shape.pb.h"
 
 namespace xla {
-namespace tools {
+namespace hlo_graph_dumper {
 namespace {
 
 using ::tensorflow::GraphDef;
@@ -40,7 +42,7 @@ class HloTfGraphBuilderTest : public HloTestBase {
 
   // Creates a computation which calls map with the given computation.
   std::unique_ptr<HloComputation> CreateMapComputation(
-      HloComputation* map_computation) {
+      HloComputation *map_computation) {
     auto builder = HloComputation::Builder("Map");
     auto param = builder.AddInstruction(
         HloInstruction::CreateParameter(0, r0f32_, "param0"));
@@ -48,18 +50,18 @@ class HloTfGraphBuilderTest : public HloTestBase {
         HloInstruction::CreateMap(r0f32_, {param}, map_computation));
     return builder.Build();
   }
-  Shape r0f32_ = ShapeUtil::MakeShape(F32, {});
+  Shape r0f32_ = ShapeUtil::MakeShape(PrimitiveType::F32, {});
 };
 
 TEST_F(HloTfGraphBuilderTest, CheckConcatenateDimsAndShapes) {
   auto builder = HloComputation::Builder("Concatenate");
-  Shape shape = ShapeUtil::MakeShape(F32, {2, 2});
+  Shape shape = ShapeUtil::MakeShape(PrimitiveType::F32, {2, 2});
   auto param_1 = builder.AddInstruction(
       HloInstruction::CreateParameter(0, shape, "param0"));
   auto param_2 = builder.AddInstruction(
       HloInstruction::CreateParameter(1, shape, "param1"));
   builder.AddInstruction(HloInstruction::CreateConcatenate(
-      ShapeUtil::MakeShape(F32, {2, 4}), {param_1, param_2}, 1));
+      ShapeUtil::MakeShape(PrimitiveType::F32, {2, 4}), {param_1, param_2}, 1));
   TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
   GraphDef graph_def = generator_.GetGraphDef();
   EXPECT_EQ(graph_def.node_size(), 3);
@@ -150,5 +152,5 @@ TEST_F(HloTfGraphBuilderTest, EmbeddedComputationsDiamond) {
 }
 
 }  // namespace
-}  // namespace tools
+}  // namespace hlo_graph_dumper
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/tools/BUILD b/tensorflow/compiler/xla/tools/BUILD
index ab598b8edd..1d9baf5de1 100644
--- a/tensorflow/compiler/xla/tools/BUILD
+++ b/tensorflow/compiler/xla/tools/BUILD
@@ -176,49 +176,21 @@ cc_binary(
     ],
 )
 
-cc_library(
-    name = "hlo_tfgraph_builder",
-    srcs = ["hlo_tfgraph_builder.cc"],
-    hdrs = ["hlo_tfgraph_builder.h"],
-    deps = [
-        "//tensorflow/compiler/xla:literal_util",
-        "//tensorflow/compiler/xla:shape_util",
-        "//tensorflow/compiler/xla/service:hlo",
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-    ],
-)
-
-cc_test(
-    name = "hlo_tfgraph_builder_test",
-    srcs = ["hlo_tfgraph_builder_test.cc"],
-    deps = [
-        ":hlo_tfgraph_builder",
-        "//tensorflow/compiler/xla/client:computation_builder",
-        "//tensorflow/compiler/xla/tests:hlo_test_base",
-        "//tensorflow/core:test_main",
-    ],
-)
-
 cc_binary(
     name = "dumped_computation_to_tf_graphdef",
     srcs = ["dumped_computation_to_tf_graphdef.cc"],
     deps = [
-        ":hlo_tfgraph_builder",
         "//tensorflow/compiler/xla:statusor",
         "//tensorflow/compiler/xla:types",
-        "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/client",
         "//tensorflow/compiler/xla/client:client_library",
         "//tensorflow/compiler/xla/client:computation",
         "//tensorflow/compiler/xla/client:local_client",
+        "//tensorflow/compiler/xla/legacy_flags:hlo_graph_dumper_flags",
         "//tensorflow/compiler/xla/service",
         "//tensorflow/compiler/xla/service:hlo_graph_dumper",
         "//tensorflow/compiler/xla/service:session_proto",
         "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
     ],
 )
 
diff --git a/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc b/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
index 1aa769ee5a..850267d319 100644
--- a/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
+++ b/tensorflow/compiler/xla/tools/dumped_computation_to_tf_graphdef.cc
@@ -13,8 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-// Usage: dumped_computation_to_tf_graph \
-//          --output_dir=/tmp/graphs/ some_binary_snapshot_proto*
+// Usage: dumped_computation_to_tf_graph some_binary_snapshot_proto*
 //
 // Dumps a tensorflow GraphDef in text format for a snapshot computation. The
 // dumped graph is an HLO computation with HLO instructions as nodes and can be
@@ -31,87 +30,31 @@ limitations under the License.
 #include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/compiler/xla/client/computation.h"
 #include "tensorflow/compiler/xla/client/local_client.h"
+#include "tensorflow/compiler/xla/legacy_flags/hlo_graph_dumper_flags.h"
 #include "tensorflow/compiler/xla/service/service.h"
 #include "tensorflow/compiler/xla/service/session.pb.h"
 #include "tensorflow/compiler/xla/statusor.h"
-#include "tensorflow/compiler/xla/tools/hlo_tfgraph_builder.h"
 #include "tensorflow/compiler/xla/types.h"
-#include "tensorflow/compiler/xla/xla_data.pb.h"
-#include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/init_main.h"
 #include "tensorflow/core/platform/logging.h"
 
 using tensorflow::Env;
-using tensorflow::io::JoinPath;
-using tensorflow::strings::StrAppend;
 
 namespace xla {
 namespace tools {
-namespace {
 
-// Dumps all computations in the module to the given directory.
-void DumpTfGraph(const HloModule& module, const string& directory_path) {
-  Env* env = Env::Default();
-  TF_CHECK_OK(env->RecursivelyCreateDir(directory_path));
-  string fname = module.name();
-  std::replace(fname.begin(), fname.end(), '/', '_');
-  // Since the file name will be used as the top-level scope name, clean it up
-  // to make it a valid scope name.
-  CleanNodeName(&fname);
-  StrAppend(&fname, ".pbtxt");
-  string path = JoinPath(directory_path, fname);
-  HloTfGraphBuilder builder;
-  TF_CHECK_OK(builder.AddComputation(*module.entry_computation()));
-  std::cout << "Dumping " << module.name() << " to " << path << std::endl;
-  TF_CHECK_OK(WriteTextProto(env, path, builder.GetGraphDef()));
-}
-
-}  // namespace
-
-void RealMain(tensorflow::gtl::ArraySlice<char*> args,
-              const string& output_dir) {
-  LocalClient* client = ClientLibrary::LocalClientOrDie();
-  // To avoid adding a new flag, use local service and lower the computations
-  // locally.
-  LocalService* local_service =
-      ClientLibrary::GetXlaService(client->platform());
-  // Build HloModule for each Computation and dump to file.
+void RealMain(tensorflow::gtl::ArraySlice<char*> args) {
+  Client* client = ClientLibrary::LocalClientOrDie();
   for (char* arg : args) {
-    SessionModule session_module;
-    TF_CHECK_OK(tensorflow::ReadBinaryProto(tensorflow::Env::Default(), arg,
-                                            &session_module));
-    auto computation_status = client->LoadSnapshot(session_module);
-    if (!computation_status.ok()) {
-      fprintf(stderr, "could not load snapshot for %s: %s\n", arg,
-              computation_status.status().ToString().c_str());
-      continue;
-    }
-    Computation computation = computation_status.ConsumeValueOrDie();
-
-    StatusOr<UserComputation*> user_computation_status =
-        local_service->computation_tracker().Resolve(computation.handle());
-    if (!user_computation_status.ok()) {
-      fprintf(stderr,
-              "failed to resolve computation to UserComputation %s: %s\n", arg,
-              user_computation_status.status().ToString().c_str());
-      continue;
-    }
-
-    auto* user_computation = user_computation_status.ValueOrDie();
-    StatusOr<std::unique_ptr<HloModule>> module_status =
-        local_service->computation_tracker().BuildHloModule(
-            user_computation->GetVersionedHandle());
-
-    if (!module_status.ok()) {
-      fprintf(stderr, "failed to build HloModule %s: %s\n", arg,
-              module_status.status().ToString().c_str());
-      continue;
-    }
-
-    DumpTfGraph(*module_status.ValueOrDie(), output_dir);
+    SessionModule module;
+    TF_CHECK_OK(
+        tensorflow::ReadBinaryProto(tensorflow::Env::Default(), arg, &module));
+    Computation computation = client->LoadSnapshot(module).ConsumeValueOrDie();
+    ComputationStats stats =
+        client->GetComputationStats(computation).ConsumeValueOrDie();
+    fprintf(stdout, ">>> %s :: %s\n", arg, stats.DebugString().c_str());
   }
 }
 
@@ -119,21 +62,17 @@ void RealMain(tensorflow::gtl::ArraySlice<char*> args,
 }  // namespace xla
 
 int main(int argc, char** argv) {
-  string output_dir = "";
-  const std::vector<tensorflow::Flag> flag_list = {
-      tensorflow::Flag("output_dir", &output_dir,
-                       "Directory to write GraphDef data to."),
-  };
-
-  string usage = tensorflow::Flags::Usage(argv[0], flag_list);
-  bool parse_ok = tensorflow::Flags::Parse(&argc, argv, flag_list);
-  if (!parse_ok || output_dir.empty()) {
-    LOG(QFATAL) << usage;
-  }
   tensorflow::port::InitMain(argv[0], &argc, &argv);
 
+  xla::legacy_flags::ServiceFlags* flags = xla::legacy_flags::GetServiceFlags();
+  flags->xla_generate_hlo_graph = ".*";
+
+  xla::legacy_flags::HloGraphDumperFlags* dumper_flags =
+      xla::legacy_flags::GetHloGraphDumperFlags();
+  dumper_flags->xla_hlo_dump_as_graphdef = true;
+
   tensorflow::gtl::ArraySlice<char*> args(argv, argc);
   args.pop_front();  // Pop off the binary name, argv[0]
-  xla::tools::RealMain(args, output_dir);
+  xla::tools::RealMain(args);
   return 0;
 }
-- 
GitLab


From 161448e879443455c16d85fce079d2b36da25a80 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 06:37:38 -0800
Subject: [PATCH 0337/1563] Reshape all dense features to a rank 2, shape (*,1)
 tensor to avoid concat errors. Change: 152936284

---
 tensorflow/contrib/tensor_forest/python/ops/data_ops.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/tensor_forest/python/ops/data_ops.py b/tensorflow/contrib/tensor_forest/python/ops/data_ops.py
index 2e54f620d5..92f7faf7ac 100644
--- a/tensorflow/contrib/tensor_forest/python/ops/data_ops.py
+++ b/tensorflow/contrib/tensor_forest/python/ops/data_ops.py
@@ -145,7 +145,8 @@ def ParseDataTensorOrDict(data):
           col_spec.size = shape[1].value
 
         dense_features_size += col_spec.size
-        dense_features.append(CastToFloat(data[k]))
+        x = array_ops.reshape(data[k], [-1, 1])
+        dense_features.append(CastToFloat(x))
 
     processed_dense_features = None
     processed_sparse_features = None
-- 
GitLab


From 295f9ed91c901891bceab568e939c58d3422e84a Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 12 Apr 2017 07:39:22 -0800
Subject: [PATCH 0338/1563] tfdbg core: refactor polling method into testlib +
 some BUILD cleanup Change: 152941658

---
 tensorflow/core/debug/debug_grpc_testlib.cc | 28 +++++++++++++++++++++
 tensorflow/core/debug/debug_grpc_testlib.h  | 11 ++++++++
 2 files changed, 39 insertions(+)

diff --git a/tensorflow/core/debug/debug_grpc_testlib.cc b/tensorflow/core/debug/debug_grpc_testlib.cc
index e746192a55..8dfa904489 100644
--- a/tensorflow/core/debug/debug_grpc_testlib.cc
+++ b/tensorflow/core/debug/debug_grpc_testlib.cc
@@ -116,6 +116,34 @@ void TestEventListenerImpl::StopServer() {
   }
 }
 
+bool PollTillFirstRequestSucceeds(const string& server_url,
+                                  const size_t max_attempts) {
+  const int kSleepDurationMicros = 100 * 1000;
+  size_t n_attempts = 0;
+  bool success = false;
+
+  // Try a number of times to send the Event proto to the server, as it may
+  // take the server a few seconds to start up and become responsive.
+  Tensor prep_tensor(DT_FLOAT, TensorShape({1, 1}));
+  prep_tensor.flat<float>()(0) = 42.0f;
+
+  while (n_attempts++ < max_attempts) {
+    const uint64 wall_time = Env::Default()->NowMicros();
+    Status publish_s = DebugIO::PublishDebugTensor(
+        "prep_node:0", "DebugIdentity", prep_tensor, wall_time, {server_url});
+    Status close_s = DebugIO::CloseDebugURL(server_url);
+
+    if (publish_s.ok() && close_s.ok()) {
+      success = true;
+      break;
+    } else {
+      Env::Default()->SleepForMicroseconds(kSleepDurationMicros);
+    }
+  }
+
+  return success;
+}
+
 }  // namespace test
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/debug/debug_grpc_testlib.h b/tensorflow/core/debug/debug_grpc_testlib.h
index ee9b3bdec6..0e3223dbfe 100644
--- a/tensorflow/core/debug/debug_grpc_testlib.h
+++ b/tensorflow/core/debug/debug_grpc_testlib.h
@@ -64,6 +64,17 @@ class TestEventListenerImpl final : public EventListener::Service {
   mutex changes_mu_;
 };
 
+// Poll a gRPC debug server by sending a small tensor repeatedly till success.
+//
+// Args:
+//   server_url: gRPC URL of the server to poll, e.g., "grpc://foo:3333".
+//   max_attempts: Maximum number of attempts.
+//
+// Returns:
+//   Whether the polling succeeded within max_attempts.
+bool PollTillFirstRequestSucceeds(const string& server_url,
+                                  const size_t max_attempts);
+
 }  // namespace test
 
 }  // namespace tensorflow
-- 
GitLab


From e9d407a67bf6a68393f6f991dd4b076a648804c0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 07:46:14 -0800
Subject: [PATCH 0339/1563] Update ops-related pbtxt files. Change: 152942451

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 199 ++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |  66 +++++-
 2 files changed, 263 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index c538a278a3..9dea77ed26 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1666,6 +1666,32 @@ op {
     }
   }
 }
+op {
+  name: "AudioSpectrogram"
+  input_arg {
+    name: "input"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "spectrogram"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "window_size"
+    type: "int"
+  }
+  attr {
+    name: "stride"
+    type: "int"
+  }
+  attr {
+    name: "magnitude_squared"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+}
 op {
   name: "AudioSummary"
   input_arg {
@@ -5116,6 +5142,75 @@ op {
   }
   allows_uninitialized_input: true
 }
+op {
+  name: "DebugIdentity"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "tensor_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "debug_urls"
+    type: "list(string)"
+    default_value {
+      list {
+      }
+    }
+  }
+  attr {
+    name: "gated_grpc"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  allows_uninitialized_input: true
+}
+op {
+  name: "DebugNanCount"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type: DT_INT64
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "tensor_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "debug_urls"
+    type: "list(string)"
+    default_value {
+      list {
+      }
+    }
+  }
+  allows_uninitialized_input: true
+}
 op {
   name: "DebugNanCount"
   input_arg {
@@ -5145,6 +5240,44 @@ op {
       }
     }
   }
+  attr {
+    name: "gated_grpc"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  allows_uninitialized_input: true
+}
+op {
+  name: "DebugNumericSummary"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type: DT_DOUBLE
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "tensor_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "debug_urls"
+    type: "list(string)"
+    default_value {
+      list {
+      }
+    }
+  }
   allows_uninitialized_input: true
 }
 op {
@@ -5176,6 +5309,27 @@ op {
       }
     }
   }
+  attr {
+    name: "lower_bound"
+    type: "float"
+    default_value {
+      f: -inf
+    }
+  }
+  attr {
+    name: "upper_bound"
+    type: "float"
+    default_value {
+      f: inf
+    }
+  }
+  attr {
+    name: "mute_if_healthy"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
   allows_uninitialized_input: true
 }
 op {
@@ -5228,6 +5382,13 @@ op {
       b: false
     }
   }
+  attr {
+    name: "gated_grpc"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
   allows_uninitialized_input: true
 }
 op {
@@ -12268,6 +12429,41 @@ op {
     }
   }
 }
+op {
+  name: "Placeholder"
+  output_arg {
+    name: "output"
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+  }
+  attr {
+    name: "shape"
+    type: "shape"
+    default_value {
+      shape {
+        unknown_rank: true
+      }
+    }
+  }
+}
+op {
+  name: "PlaceholderV2"
+  output_arg {
+    name: "output"
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+  }
+  attr {
+    name: "shape"
+    type: "shape"
+  }
+}
 op {
   name: "PlaceholderV2"
   output_arg {
@@ -12282,6 +12478,9 @@ op {
     name: "shape"
     type: "shape"
   }
+  deprecation {
+    version: 23
+  }
 }
 op {
   name: "PlaceholderWithDefault"
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 172bdf02e2..a896f4c943 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -1903,6 +1903,39 @@ op {
   }
   summary: "Computes atan of x element-wise."
 }
+op {
+  name: "AudioSpectrogram"
+  input_arg {
+    name: "input"
+    description: "Float representation of audio data."
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "spectrogram"
+    description: "3D representation of the audio frequencies as an image."
+    type: DT_FLOAT
+  }
+  attr {
+    name: "window_size"
+    type: "int"
+    description: "How wide the input window is in samples. For the highest efficiency\nthis should be a power of two, but other values are accepted."
+  }
+  attr {
+    name: "stride"
+    type: "int"
+    description: "How widely apart the center of adjacent sample windows should be."
+  }
+  attr {
+    name: "magnitude_squared"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "Whether to return the squared magnitude or just the\nmagnitude. Using squared magnitude can avoid extra calculations."
+  }
+  summary: "Produces a visualization of audio data over time."
+  description: "Spectrograms are a standard way of representing audio information as a series of\nslices of frequency information, one slice for each window of time. By joining\nthese together into a sequence, they form a distinctive fingerprint of the sound\nover time.\n\nThis op expects to receive audio data as an input, stored as floats in the range\n-1 to 1, together with a window width in samples, and a stride specifying how\nfar to move the window between slices. From this it generates a three\ndimensional output. The lowest dimension has an amplitude value for each\nfrequency during that time slice. The next dimension is time, with successive\nfrequency slices. The final dimension is for the channels in the input, so a\nstereo audio input would have two here for example.\n\nThis means the layout when converted and saved as an image is rotated 90 degrees\nclockwise from a typical spectrogram. Time is descending down the Y axis, and\nthe frequency decreases from left to right.\n\nEach value in the result represents the square root of the sum of the real and\nimaginary parts of an FFT on the current window of samples. In this way, the\nlowest dimension represents the power of each frequency in the current window,\nand adjacent windows are concatenated in the next dimension.\n\nTo get a more intuitive and visual look at what this operation does, you can run\ntensorflow/examples/wav_to_spectrogram to read in an audio file and save out the\nresulting spectrogram as a PNG image."
+}
 op {
   name: "AudioSummary"
   input_arg {
@@ -5318,6 +5351,14 @@ op {
     }
     description: "List of URLs to debug targets, e.g.,\nfile:///foo/tfdbg_dump, grpc:://localhost:11011"
   }
+  attr {
+    name: "gated_grpc"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "Whether this op will be gated. If any of the debug_urls of this\ndebug node is of the grpc:// scheme, when the value of this attribute is set\nto True, the data will not actually be sent via the grpc stream unless this\ndebug op has been enabled at the debug_url. If all of the debug_urls of this\ndebug node are of the grpc:// scheme and the debug op is enabled at none of\nthem, the output will be an empty Tensor."
+  }
   summary: "Debug Identity Op."
   description: "Provides an identity mapping of the non-Ref type input tensor for debugging."
   allows_uninitialized_input: true
@@ -5353,7 +5394,15 @@ op {
       list {
       }
     }
-    description: "List of URLs to debug targets, e.g.,\nfile:///foo/tfdbg_dump, grpc:://localhost:11011"
+    description: "List of URLs to debug targets, e.g.,\nfile:///foo/tfdbg_dump, grpc:://localhost:11011."
+  }
+  attr {
+    name: "gated_grpc"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "Whether this op will be gated. If any of the debug_urls of this\ndebug node is of the grpc:// scheme, when the value of this attribute is set\nto True, the data will not actually be sent via the grpc stream unless this\ndebug op has been enabled at the debug_url. If all of the debug_urls of this\ndebug node are of the grpc:// scheme and the debug op is enabled at none of\nthem, the output will be an empty Tensor."
   }
   summary: "Debug NaN Value Counter Op"
   description: "Counts number of NaNs in the input tensor, for debugging."
@@ -5416,6 +5465,14 @@ op {
     }
     description: "(bool) Do not send data to the debug URLs unless at least one\nof elements [2], [3] and [7] (i.e., the nan count and the generalized -inf and\ninf counts) is non-zero."
   }
+  attr {
+    name: "gated_grpc"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "Whether this op will be gated. If any of the debug_urls of this\ndebug node is of the grpc:// scheme, when the value of this attribute is set\nto True, the data will not actually be sent via the grpc stream unless this\ndebug op has been enabled at the debug_url. If all of the debug_urls of this\ndebug node are of the grpc:// scheme and the debug op is enabled at none of\nthem, the output will be an empty Tensor."
+  }
   summary: "Debug Numeric Summary Op."
   description: "Provide a basic summary of numeric value types, range and distribution."
   allows_uninitialized_input: true
@@ -8477,7 +8534,7 @@ op {
     }
   }
   summary: "Gather slices from `params` according to `indices`."
-  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in unspecified behavior (currently the result is\n`0`, but this may become an error in the future).\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/Gather.png\" alt>\n</div>"
+  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in safe but unspecified behavior, which may include\nraising an error.\n`0`, but this may become an error in the future).\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/Gather.png\" alt>\n</div>"
 }
 op {
   name: "GatherNd"
@@ -12807,6 +12864,7 @@ op {
     type: "shape"
     default_value {
       shape {
+        unknown_rank: true
       }
     }
     description: "(Optional) The shape of the tensor. If the shape has 0 dimensions, the\nshape is unconstrained."
@@ -12833,6 +12891,10 @@ op {
   }
   summary: "A placeholder op for a value that will be fed into the computation."
   description: "N.B. This operation will fail with an error if it is executed. It is\nintended as a way to represent a value that will always be fed, and to\nprovide attrs that enable the fed value to be checked at runtime."
+  deprecation {
+    version: 23
+    explanation: "Placeholder now behaves the same as PlaceholderV2."
+  }
 }
 op {
   name: "PlaceholderWithDefault"
-- 
GitLab


From a18d61d2f6507b29dc076a8711ff310c48d053ca Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Wed, 12 Apr 2017 08:22:17 -0800
Subject: [PATCH 0340/1563] Switch the benchmark in direct_session_test.cc to
 use Placeholder (not V2). Change: 152946496

---
 tensorflow/core/common_runtime/direct_session_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/common_runtime/direct_session_test.cc b/tensorflow/core/common_runtime/direct_session_test.cc
index c8b8a09b8e..f8deaaf222 100644
--- a/tensorflow/core/common_runtime/direct_session_test.cc
+++ b/tensorflow/core/common_runtime/direct_session_test.cc
@@ -1178,7 +1178,7 @@ void FeedFetchBenchmarkHelper(int num_feeds, int iters) {
     // monitor this overhead where possible, but that is not the
     // object of study in this benchmark.
     Node* placeholder;
-    TF_CHECK_OK(NodeBuilder(g.NewName("Placeholder"), "PlaceholderV2")
+    TF_CHECK_OK(NodeBuilder(g.NewName("Placeholder"), "Placeholder")
                     .Attr("shape", TensorShape())
                     .Attr("dtype", DT_FLOAT)
                     .Device("/cpu:0")
-- 
GitLab


From 9cc21f04ed051d6a6d3a21e909aa547110aa8b0d Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 12 Apr 2017 08:30:33 -0800
Subject: [PATCH 0341/1563] tfdbg: fix broken link in
 python/debug/examples/README.md

Fixes: #9161
Change: 152947343
---
 tensorflow/python/debug/examples/README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/debug/examples/README.md b/tensorflow/python/debug/examples/README.md
index 41bf777c97..cb4d484092 100644
--- a/tensorflow/python/debug/examples/README.md
+++ b/tensorflow/python/debug/examples/README.md
@@ -1,4 +1,9 @@
 Hi, there!
 
-The documentation of **TensorFlow Debugger (tfdbg)** has moved to
-[this new location](../../../g3doc/how_tos/debugger/index.md).
+The documentation of **TensorFlow Debugger (tfdbg)** has moved.
+
+See the source version at
+[this new location](../../../docs_src/programmers_guide/debugger.md).
+
+See the public website version at
+[https://www.tensorflow.org/programmers_guide/debugger](https://www.tensorflow.org/programmers_guide/debugger).
-- 
GitLab


From 1bd57696aecd7dc63cd5018d29202847b44ec533 Mon Sep 17 00:00:00 2001
From: "Jeffrey A. Dean" <jeff@google.com>
Date: Wed, 12 Apr 2017 08:48:12 -0800
Subject: [PATCH 0342/1563] Minor internal change. Change: 152949383

---
 tensorflow/compiler/xla/xla_data.proto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/compiler/xla/xla_data.proto b/tensorflow/compiler/xla/xla_data.proto
index 2bb09c069c..cf4c9e0fe5 100644
--- a/tensorflow/compiler/xla/xla_data.proto
+++ b/tensorflow/compiler/xla/xla_data.proto
@@ -16,6 +16,7 @@ limitations under the License.
 syntax = "proto3";
 
 package xla;
+option cc_enable_arenas = true;
 
 // Primitive types are the individual values that can be held in rectangular
 // multidimensional arrays. A description of the rectangular multidimensional
-- 
GitLab


From 875c02af426f623d237e6633f99776e3821552d0 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 12 Apr 2017 08:48:34 -0800
Subject: [PATCH 0343/1563] Remove unnecessary copy-assignment in
 GetSessionHandleOp::Compute() Change: 152949451

---
 tensorflow/core/kernels/session_ops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/kernels/session_ops.cc b/tensorflow/core/kernels/session_ops.cc
index 54eca4a20a..27ad2fcd87 100644
--- a/tensorflow/core/kernels/session_ops.cc
+++ b/tensorflow/core/kernels/session_ops.cc
@@ -41,7 +41,7 @@ class GetSessionHandleOp : public OpKernel {
       : OpKernel(context) {}
 
   void Compute(OpKernelContext* ctx) override {
-    Tensor val = ctx->input(0);
+    const Tensor& val = ctx->input(0);
     int64 id = ctx->session_state()->GetNewId();
     TensorStore::TensorAndKey tk{val, id, def().device()};
     OP_REQUIRES_OK(ctx, ctx->tensor_store()->AddTensor(def().name(), tk));
-- 
GitLab


From 26332f733e3432b815e2d3dbd5a2f123a38af4e7 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Wed, 12 Apr 2017 08:53:32 -0800
Subject: [PATCH 0344/1563] Speed up linear_operator_udvh_update_test by
 removing the tests for 10x10 matrices.  Previously this was timing out on
 mac. Change: 152950095

---
 .../kernel_tests/linear_operator_udvh_update_test.py     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_udvh_update_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_udvh_update_test.py
index 7abe12f1a4..f28213096b 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_udvh_update_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_udvh_update_test.py
@@ -56,10 +56,11 @@ class BaseLinearOperatorUDVHUpdatetest(object):
 
   @property
   def _shapes_to_test(self):
-    # Add the (2, 10, 10) shape at the end to get something slightly larger than
-    # the other tests.  Doing this because this operator makes use of inversion
-    # and determinant lemmas that are known to have stability issues.
-    return [(0, 0), (1, 1), (1, 3, 3), (3, 4, 4), (2, 1, 4, 4), (2, 10, 10)]
+    # Previously we had a (2, 10, 10) shape at the end.  We did this to test the
+    # inversion and determinant lemmas on not-tiny matrices, since these are
+    # known to have stability issues.  This resulted in test timeouts, so this
+    # shape has been removed, but rest assured, the tests did pass.
+    return [(0, 0), (1, 1), (1, 3, 3), (3, 4, 4), (2, 1, 4, 4)]
 
   def _operator_and_mat_and_feed_dict(self, shape, dtype, use_placeholder):
     # Recall A = L + UDV^H
-- 
GitLab


From 9992074410d0b8d7102b7a63ff5f01a1a4554357 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 09:29:33 -0800
Subject: [PATCH 0345/1563] Simplified XLA tests by using gmock matchers.
 Change: 152954991

---
 .../xla/service/gpu/while_transformer_test.cc |  25 ++--
 .../xla/service/hlo_instruction_test.cc       |  10 +-
 .../xla/service/shape_inference_test.cc       | 108 +++++++++---------
 .../xla/tests/broadcast_simple_test.cc        |  13 +--
 tensorflow/compiler/xla/tests/concat_test.cc  |  15 ++-
 .../convolution_dimension_numbers_test.cc     |   4 +-
 .../xla/tests/deconstruct_tuple_test.cc       |   7 +-
 7 files changed, 89 insertions(+), 93 deletions(-)

diff --git a/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc b/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
index b32575d381..fcf99fe00a 100644
--- a/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
+++ b/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
@@ -24,6 +24,9 @@ limitations under the License.
 namespace xla {
 namespace {
 
+using ::testing::Eq;
+using ::testing::HasSubstr;
+
 class WhileTransformerTest : public HloTestBase {
  protected:
   WhileTransformerTest()
@@ -138,10 +141,8 @@ TEST_F(WhileTransformerTest, InductionVariableAtTupleElement0) {
   auto result = gpu::CanTransformWhileToFor(while_hlo);
   EXPECT_TRUE(result.ok());
   // Check results.
-  auto tuple = result.ConsumeValueOrDie();
-  EXPECT_EQ(0, std::get<0>(tuple));
-  EXPECT_EQ(10, std::get<1>(tuple));
-  EXPECT_EQ(1, std::get<2>(tuple));
+  EXPECT_THAT(result.ConsumeValueOrDie(),
+              Eq(std::tuple<int64, int64, int64>(0, 10, 1)));
 }
 
 TEST_F(WhileTransformerTest, InductionVariableAtTupleElement1) {
@@ -157,10 +158,8 @@ TEST_F(WhileTransformerTest, InductionVariableAtTupleElement1) {
   auto result = gpu::CanTransformWhileToFor(while_hlo);
   EXPECT_TRUE(result.ok());
   // Check results.
-  auto tuple = result.ConsumeValueOrDie();
-  EXPECT_EQ(0, std::get<0>(tuple));
-  EXPECT_EQ(10, std::get<1>(tuple));
-  EXPECT_EQ(1, std::get<2>(tuple));
+  EXPECT_THAT(result.ConsumeValueOrDie(),
+              Eq(std::tuple<int64, int64, int64>(0, 10, 1)));
 }
 
 TEST_F(WhileTransformerTest, InvalidLoopLimit) {
@@ -175,9 +174,8 @@ TEST_F(WhileTransformerTest, InvalidLoopLimit) {
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
   EXPECT_FALSE(result.ok());
-  EXPECT_THAT(
-      result.status().error_message(),
-      ::testing::ContainsRegex("Loop start must be less than loop limit."));
+  EXPECT_THAT(result.status().error_message(),
+              HasSubstr("Loop start must be less than loop limit."));
 }
 
 TEST_F(WhileTransformerTest, InvalidLoopIncrement) {
@@ -192,9 +190,8 @@ TEST_F(WhileTransformerTest, InvalidLoopIncrement) {
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
   EXPECT_FALSE(result.ok());
-  EXPECT_THAT(
-      result.status().error_message(),
-      ::testing::ContainsRegex("Loop increment must greater than zero."));
+  EXPECT_THAT(result.status().error_message(),
+              HasSubstr("Loop increment must greater than zero."));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/hlo_instruction_test.cc b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
index e1b76d194f..050fceca9c 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
@@ -638,15 +638,15 @@ TEST_F(HloInstructionTest, FusionOpWithCalledComputations) {
   auto fusion = HloInstruction::CreateFusion(
       scalar_shape, HloInstruction::FusionKind::kLoop, map_3_y.get());
 
-  ASSERT_EQ(fusion->called_computations().size(), 1);
-  EXPECT_EQ(fusion->called_computations()[0], computation_y.get());
+  EXPECT_THAT(fusion->called_computations(), ElementsAre(computation_y.get()));
 
   fusion->FuseInstruction(map_2_x.get());
-  ASSERT_EQ(fusion->called_computations().size(), 2);
-  EXPECT_EQ(fusion->called_computations()[1], computation_x.get());
+  EXPECT_THAT(fusion->called_computations(),
+              ElementsAre(computation_y.get(), computation_x.get()));
 
   fusion->FuseInstruction(map_1_x.get());
-  ASSERT_EQ(fusion->called_computations().size(), 2);
+  EXPECT_THAT(fusion->called_computations(),
+              ElementsAre(computation_y.get(), computation_x.get()));
 }
 
 TEST_F(HloInstructionTest, ComplexFusionOp) {
diff --git a/tensorflow/compiler/xla/service/shape_inference_test.cc b/tensorflow/compiler/xla/service/shape_inference_test.cc
index 255d64b320..7cff042a48 100644
--- a/tensorflow/compiler/xla/service/shape_inference_test.cc
+++ b/tensorflow/compiler/xla/service/shape_inference_test.cc
@@ -28,6 +28,7 @@ namespace xla {
 namespace {
 
 using ::testing::ContainsRegex;
+using ::testing::HasSubstr;
 
 class ShapeInferenceTest : public ::testing::Test {
  protected:
@@ -132,20 +133,20 @@ TEST_F(ShapeInferenceTest, SelectBadShapes) {
       TernaryOperation::TRIOP_SELECT, pred_, matrix_64_48_, matrix_32_64_);
   ASSERT_FALSE(inferred_status_error1.ok());
   ASSERT_THAT(inferred_status_error1.status().error_message(),
-              ContainsRegex("operands to select must be the same shape"));
+              HasSubstr("operands to select must be the same shape"));
 
   auto inferred_status_error2 = ShapeInference::InferTernaryOpShape(
       TernaryOperation::TRIOP_SELECT, s32_, matrix_64_48_, matrix_64_48_);
   ASSERT_FALSE(inferred_status_error2.ok());
   ASSERT_THAT(inferred_status_error2.status().error_message(),
-              ContainsRegex("pred operand must have PRED"));
+              HasSubstr("pred operand must have PRED"));
 
   auto inferred_status_error3 = ShapeInference::InferTernaryOpShape(
       TernaryOperation::TRIOP_SELECT, ShapeUtil::MakeShape(PRED, {64}),
       matrix_64_48_, matrix_64_48_);
   ASSERT_FALSE(inferred_status_error3.ok());
   ASSERT_THAT(inferred_status_error3.status().error_message(),
-              ContainsRegex("with non-scalar predicate with dimensionality"));
+              HasSubstr("with non-scalar predicate with dimensionality"));
 
   // Tuples have a TUPLE element type and cannot be the pred of a select.
   auto inferred_status_error4 = ShapeInference::InferTernaryOpShape(
@@ -154,7 +155,7 @@ TEST_F(ShapeInferenceTest, SelectBadShapes) {
       ShapeUtil::MakeTupleShape({f32_, f32_}));
   ASSERT_FALSE(inferred_status_error4.ok());
   ASSERT_THAT(inferred_status_error4.status().error_message(),
-              ContainsRegex("pred operand must have PRED element type"));
+              HasSubstr("pred operand must have PRED element type"));
 }
 
 TEST_F(ShapeInferenceTest, ClampAllMatrix) {
@@ -299,7 +300,7 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSourceShape) {
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
   ASSERT_THAT(inferred_status_fail.status().error_message(),
-              ContainsRegex("source shape does not match"));
+              HasSubstr("source shape does not match"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape1) {
@@ -310,7 +311,7 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape1) {
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
   ASSERT_THAT(inferred_status_fail.status().error_message(),
-              ContainsRegex("select function must take 2 parameters"));
+              HasSubstr("select function must take 2 parameters"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape2) {
@@ -321,7 +322,7 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape2) {
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
   ASSERT_THAT(inferred_status_fail.status().error_message(),
-              ContainsRegex("select function must have rank-0 PRED"));
+              HasSubstr("select function must have rank-0 PRED"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape3) {
@@ -332,7 +333,7 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape3) {
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
   ASSERT_THAT(inferred_status_fail.status().error_message(),
-              ContainsRegex("select function's first parameter"));
+              HasSubstr("select function's first parameter"));
 }
 
 TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape4) {
@@ -343,7 +344,7 @@ TEST_F(SelectAndScatterShapeInferenceTest, SelectAndScatterWrongSelectShape4) {
       init_value_shape_, scatter_program_shape_);
   ASSERT_FALSE(inferred_status_fail.ok());
   ASSERT_THAT(inferred_status_fail.status().error_message(),
-              ContainsRegex("select function's second parameter"));
+              HasSubstr("select function's second parameter"));
 }
 
 TEST_F(ShapeInferenceTest, Convolve) {
@@ -498,7 +499,7 @@ TEST_F(ShapeInferenceTest, ConvolveDimensionNumbersOverlapError) {
       ShapeInference::InferConvolveShape(lhs_shape, rhs_shape, window, dnums);
   ASSERT_FALSE(inferred_status.ok());
   ASSERT_THAT(inferred_status.status().error_message(),
-              ContainsRegex("each dimension exactly once"));
+              HasSubstr("each dimension exactly once"));
 }
 
 TEST_F(ShapeInferenceTest, MapThatChangesElementType) {
@@ -536,41 +537,41 @@ TEST_F(ShapeInferenceTest, Map) {
       {}, ShapeUtil::MakeProgramShape({f32_, f32_}, f32_));
   ASSERT_FALSE(no_args_error.ok());
   ASSERT_THAT(no_args_error.status().error_message(),
-              ContainsRegex("expects at least one argument"));
+              HasSubstr("expects at least one argument"));
 
   auto args_diff_shapes_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_64_},
       ShapeUtil::MakeProgramShape({f32_, f32_}, f32_));
   ASSERT_FALSE(args_diff_shapes_error.ok());
   ASSERT_THAT(args_diff_shapes_error.status().error_message(),
-              ContainsRegex("requires all operands to have the same shape"));
+              HasSubstr("requires all operands to have the same shape"));
 
   auto arity_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_}, ShapeUtil::MakeProgramShape({f32_}, f32_));
   ASSERT_FALSE(arity_error.ok());
   ASSERT_THAT(arity_error.status().error_message(),
-              ContainsRegex("function arity must match"));
+              HasSubstr("function arity must match"));
 
   auto output_shape_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_},
       ShapeUtil::MakeProgramShape({f32_, f32_}, vector_32_));
   ASSERT_FALSE(output_shape_error.ok());
   ASSERT_THAT(output_shape_error.status().error_message(),
-              ContainsRegex("result has to be a scalar"));
+              HasSubstr("result has to be a scalar"));
 
   auto param_shape_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_},
       ShapeUtil::MakeProgramShape({vector_32_, f32_}, f32_));
   ASSERT_FALSE(param_shape_error.ok());
   ASSERT_THAT(param_shape_error.status().error_message(),
-              ContainsRegex("parameter has to be a scalar"));
+              HasSubstr("parameter has to be a scalar"));
 
   auto param_element_type_error = ShapeInference::InferMapShape(
       {&vector_32_, &vector_32_},
       ShapeUtil::MakeProgramShape({f32_, s32_}, f32_));
   ASSERT_FALSE(param_element_type_error.ok());
   ASSERT_THAT(param_element_type_error.status().error_message(),
-              ContainsRegex("parameter type has to match argument"));
+              HasSubstr("parameter type has to match argument"));
 
   Shape arg = ShapeUtil::MakeShape(F32, {20});
   ProgramShape to_apply = ShapeUtil::MakeProgramShape({f32_}, f32_);
@@ -582,25 +583,25 @@ TEST_F(ShapeInferenceTest, Map) {
       {&arg}, ShapeUtil::MakeProgramShape({f32_, f32_}, f32_));
   ASSERT_FALSE(inferred_status_error1.ok());
   ASSERT_THAT(inferred_status_error1.status().error_message(),
-              ContainsRegex("arity must match number of arguments"));
+              HasSubstr("arity must match number of arguments"));
 
   auto inferred_status_error2 = ShapeInference::InferMapShape(
       {&arg}, ShapeUtil::MakeProgramShape({vector_32_}, f32_));
   ASSERT_FALSE(inferred_status_error2.ok());
   ASSERT_THAT(inferred_status_error2.status().error_message(),
-              ContainsRegex("has to be a scalar"));
+              HasSubstr("has to be a scalar"));
 
   auto inferred_status_error3 = ShapeInference::InferMapShape(
       {&arg}, ShapeUtil::MakeProgramShape({f32_}, vector_32_));
   ASSERT_FALSE(inferred_status_error3.ok());
   ASSERT_THAT(inferred_status_error3.status().error_message(),
-              ContainsRegex("has to be a scalar"));
+              HasSubstr("has to be a scalar"));
 
   auto inferred_status_error5 = ShapeInference::InferMapShape(
       {&arg}, ShapeUtil::MakeProgramShape({s32_}, s32_));
   ASSERT_FALSE(inferred_status_error5.ok());
   ASSERT_THAT(inferred_status_error5.status().error_message(),
-              ContainsRegex("parameter type has to match argument"));
+              HasSubstr("parameter type has to match argument"));
 }
 
 TEST_F(ReduceShapeInferenceTest, ReduceVectorToScalar) {
@@ -655,7 +656,7 @@ TEST_F(ReduceShapeInferenceTest, ErrorOutOfBoundsDimension) {
       to_apply);
   EXPECT_FALSE(inferred_status.ok());
   EXPECT_THAT(inferred_status.status().error_message(),
-              ContainsRegex("out-of-bounds dimension"));
+              HasSubstr("out-of-bounds dimension"));
 }
 
 TEST_F(ReduceShapeInferenceTest, ErrorToApplyArity) {
@@ -665,7 +666,7 @@ TEST_F(ReduceShapeInferenceTest, ErrorToApplyArity) {
                                        /*dimensions_to_reduce=*/{0}, to_apply);
   EXPECT_FALSE(inferred_status.ok());
   EXPECT_THAT(inferred_status.status().error_message(),
-              ContainsRegex("take 2 parameters"));
+              HasSubstr("take 2 parameters"));
 }
 
 TEST_F(ReduceShapeInferenceTest, ErrorElementTypeVsApplyType) {
@@ -675,7 +676,7 @@ TEST_F(ReduceShapeInferenceTest, ErrorElementTypeVsApplyType) {
                                        /*dimensions_to_reduce=*/{0}, to_apply);
   EXPECT_FALSE(inferred_status.ok());
   EXPECT_THAT(inferred_status.status().error_message(),
-              ContainsRegex("first parameter shape differs"));
+              HasSubstr("first parameter shape differs"));
 }
 
 TEST_F(ShapeInferenceTest, InferSliceShapeRank2) {
@@ -818,7 +819,7 @@ TEST_F(ShapeInferenceTest, ScalarDotVector) {
       ShapeInference::InferBinaryOpShape(BINOP_DOT, f32_, vector_32_, {});
   ASSERT_FALSE(inferred_status.ok());
   ASSERT_THAT(inferred_status.status().error_message(),
-              ContainsRegex("dot only supports rank"));
+              HasSubstr("dot only supports rank"));
 }
 
 // 3D <dot> 2D: error
@@ -827,7 +828,7 @@ TEST_F(ShapeInferenceTest, DotWithRankHigherThanTwo) {
       BINOP_DOT, ShapeUtil::MakeShape(F32, {32, 32, 32}), matrix_32_64_, {});
   ASSERT_FALSE(inferred_status.ok());
   ASSERT_THAT(inferred_status.status().error_message(),
-              ContainsRegex("dot only supports rank"));
+              HasSubstr("dot only supports rank"));
 }
 
 // vector <dot> vector -> scalar
@@ -940,7 +941,7 @@ TEST_F(ShapeInferenceTest, BinOpBroadcastBadDimension) {
       BinaryOperation::BINOP_ADD, tensor, vec8, {});
   ASSERT_FALSE(inferred_status_error1.ok());
   ASSERT_THAT(inferred_status_error1.status().error_message(),
-              ContainsRegex("automatic"));
+              HasSubstr("automatic"));
 
   // broadcast_dimension out of bounds for tensor's rank
   auto inferred_status_error2 = ShapeInference::InferBinaryOpShape(
@@ -954,14 +955,14 @@ TEST_F(ShapeInferenceTest, BinOpBroadcastBadDimension) {
       BinaryOperation::BINOP_ADD, tensor, vec8, {0});
   ASSERT_FALSE(inferred_status_error3.ok());
   ASSERT_THAT(inferred_status_error3.status().error_message(),
-              ContainsRegex("broadcast dimension 0 mismatch"));
+              HasSubstr("broadcast dimension 0 mismatch"));
 
   // broadcast_dimensions list too long
   auto inferred_status_error4 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor, matrix8_4, {0, 1, 2});
   ASSERT_FALSE(inferred_status_error4.ok());
   ASSERT_THAT(inferred_status_error4.status().error_message(),
-              ContainsRegex("size of broadcast_dimensions has to match"));
+              HasSubstr("size of broadcast_dimensions has to match"));
 
   // there's a dimension above the rank of the tensor
   auto inferred_status_error5 = ShapeInference::InferBinaryOpShape(
@@ -975,7 +976,7 @@ TEST_F(ShapeInferenceTest, BinOpBroadcastBadDimension) {
       BinaryOperation::BINOP_ADD, tensor, matrix8_4, {2, 1});
   ASSERT_FALSE(inferred_status_error6.ok());
   ASSERT_THAT(inferred_status_error6.status().error_message(),
-              ContainsRegex("broadcast dimension 0 mismatch"));
+              HasSubstr("broadcast dimension 0 mismatch"));
 
   // The following two tests make sure that broadcasting dimensions are listed
   // in a proper (strictly increasing) order, even if the lower-rank array
@@ -984,13 +985,13 @@ TEST_F(ShapeInferenceTest, BinOpBroadcastBadDimension) {
       BinaryOperation::BINOP_ADD, tensor8_8_8, matrix8_8, {0, 0});
   ASSERT_FALSE(inferred_status_error7.ok());
   ASSERT_THAT(inferred_status_error7.status().error_message(),
-              ContainsRegex("broadcast dimensions order is wrong"));
+              HasSubstr("broadcast dimensions order is wrong"));
 
   auto inferred_status_error8 = ShapeInference::InferBinaryOpShape(
       BinaryOperation::BINOP_ADD, tensor8_8_8, matrix8_8, {1, 0});
   ASSERT_FALSE(inferred_status_error8.ok());
   ASSERT_THAT(inferred_status_error8.status().error_message(),
-              ContainsRegex("broadcast dimensions order is wrong"));
+              HasSubstr("broadcast dimensions order is wrong"));
 }
 
 // Tests for the while instruction with proper shapes.
@@ -1016,7 +1017,7 @@ TEST_F(ShapeInferenceTest, WhileWithBadShapes) {
       ShapeInference::InferWhileShape(bad_shape_1, body, result_shape);
   ASSERT_FALSE(inferred_status_error1.ok());
   ASSERT_THAT(inferred_status_error1.status().error_message(),
-              ContainsRegex("condition must take 1 arguments"));
+              HasSubstr("condition must take 1 arguments"));
 
   auto bad_shape_2 =
       ShapeUtil::MakeProgramShape({s32_, result_shape}, result_shape);
@@ -1024,21 +1025,21 @@ TEST_F(ShapeInferenceTest, WhileWithBadShapes) {
       ShapeInference::InferWhileShape(cond, bad_shape_2, result_shape);
   ASSERT_FALSE(inferred_status_error2.ok());
   ASSERT_THAT(inferred_status_error2.status().error_message(),
-              ContainsRegex("body must take 1 arguments"));
+              HasSubstr("body must take 1 arguments"));
 
   auto bad_shape_3 = ShapeUtil::MakeProgramShape({result_shape}, s32_);
   auto inferred_status_error3 =
       ShapeInference::InferWhileShape(bad_shape_3, body, result_shape);
   ASSERT_FALSE(inferred_status_error3.ok());
   ASSERT_THAT(inferred_status_error3.status().error_message(),
-              ContainsRegex("condition must return a boolean"));
+              HasSubstr("condition must return a boolean"));
 
   auto bad_shape_4 = ShapeUtil::MakeProgramShape({result_shape}, vector_32_);
   auto inferred_status_error4 =
       ShapeInference::InferWhileShape(cond, bad_shape_4, result_shape);
   ASSERT_FALSE(inferred_status_error4.ok());
   ASSERT_THAT(inferred_status_error4.status().error_message(),
-              ContainsRegex("parameter of condition and body"));
+              HasSubstr("parameter of condition and body"));
 }
 
 // Tests for the concatenate instruction with proper shapes.
@@ -1069,28 +1070,27 @@ TEST_F(ShapeInferenceTest, ConcatenateWithBadShapes) {
       ShapeInference::InferConcatOpShape({}, /*dimension=*/0);
   ASSERT_FALSE(inferred_status_error1.ok());
   ASSERT_THAT(inferred_status_error1.status().error_message(),
-              ContainsRegex("Concatenate expects at least one argument"));
+              HasSubstr("Concatenate expects at least one argument"));
 
   auto inferred_status_error2 =
       ShapeInference::InferConcatOpShape({&vector_32_}, /*dimension=*/-1);
   ASSERT_FALSE(inferred_status_error2.ok());
-  ASSERT_THAT(
-      inferred_status_error2.status().error_message(),
-      ContainsRegex("dimension to concatenate along out of bounds: -1"));
+  ASSERT_THAT(inferred_status_error2.status().error_message(),
+              HasSubstr("dimension to concatenate along out of bounds: -1"));
 
   auto inferred_status_error3 =
       ShapeInference::InferConcatOpShape({&vector_32_}, /*dimension=*/1);
   ASSERT_FALSE(inferred_status_error3.ok());
   ASSERT_THAT(inferred_status_error3.status().error_message(),
-              ContainsRegex("dimension to concatenate along out of bounds: 1"));
+              HasSubstr("dimension to concatenate along out of bounds: 1"));
 
   Shape tuple = ShapeUtil::MakeTupleShape({vector_32_});
   auto inferred_status_error4 = ShapeInference::InferConcatOpShape(
       {&vector_32_, &tuple}, /*dimension=*/0);
   ASSERT_FALSE(inferred_status_error4.ok());
-  ASSERT_THAT(inferred_status_error4.status().error_message(),
-              ContainsRegex(
-                  "Expected non-tuple argument for operand of concatenation."));
+  ASSERT_THAT(
+      inferred_status_error4.status().error_message(),
+      HasSubstr("Expected non-tuple argument for operand of concatenation."));
 
   const Shape vector_s32 = ShapeUtil::MakeShape(S32, {32});
   auto inferred_status_error5 = ShapeInference::InferConcatOpShape(
@@ -1098,15 +1098,15 @@ TEST_F(ShapeInferenceTest, ConcatenateWithBadShapes) {
   ASSERT_FALSE(inferred_status_error5.ok());
   ASSERT_THAT(
       inferred_status_error5.status().error_message(),
-      ContainsRegex("cannot concatenate arrays with different element types"));
+      HasSubstr("cannot concatenate arrays with different element types"));
 
   auto inferred_status_error6 = ShapeInference::InferConcatOpShape(
       {&matrix_32_48_, &matrix_32_64_}, /*dimension=*/0);
   ASSERT_FALSE(inferred_status_error6.ok());
   ASSERT_THAT(inferred_status_error6.status().error_message(),
-              ContainsRegex("cannot concatenate arrays that differ in "
-                            "dimensions other than the one being "
-                            "concatenated"));
+              HasSubstr("cannot concatenate arrays that differ in "
+                        "dimensions other than the one being "
+                        "concatenated"));
 }
 
 TEST_F(ShapeInferenceTest, Pad) {
@@ -1148,26 +1148,26 @@ TEST_F(ShapeInferenceTest, ReverseInvalidDimension) {
       ShapeInference::InferReverseShape(input_shape, {0, 2});
   ASSERT_FALSE(inferred_status_error0.ok());
   ASSERT_THAT(inferred_status_error0.status().error_message(),
-              ContainsRegex("out-of-bounds"));
+              HasSubstr("out-of-bounds"));
 
   auto inferred_status_error1 =
       ShapeInference::InferReverseShape(input_shape, {0, -1});
   ASSERT_FALSE(inferred_status_error1.ok());
   ASSERT_THAT(inferred_status_error1.status().error_message(),
-              ContainsRegex("out-of-bounds"));
+              HasSubstr("out-of-bounds"));
 
   auto inferred_status_error2 =
       ShapeInference::InferReverseShape(input_shape, {0, 0});
   ASSERT_FALSE(inferred_status_error2.ok());
   ASSERT_THAT(inferred_status_error2.status().error_message(),
-              ContainsRegex("duplicated"));
+              HasSubstr("duplicated"));
 
   Shape tuple_shape = ShapeUtil::MakeTupleShape({input_shape, input_shape});
   auto inferred_status_error3 =
       ShapeInference::InferReverseShape(tuple_shape, {0});
   ASSERT_FALSE(inferred_status_error3.ok());
   ASSERT_THAT(inferred_status_error3.status().error_message(),
-              ContainsRegex("Expected non-tuple argument"));
+              HasSubstr("Expected non-tuple argument"));
 }
 
 TEST_F(ShapeInferenceTest, Call) {
@@ -1188,19 +1188,19 @@ TEST_F(ShapeInferenceTest, Call) {
       {}, ShapeUtil::MakeProgramShape({f32_}, f32_));
   EXPECT_FALSE(inferred_status_error0.ok());
   EXPECT_THAT(inferred_status_error0.status().error_message(),
-              ContainsRegex("arity must match"));
+              HasSubstr("arity must match"));
 
   auto inferred_status_error1 = ShapeInference::InferCallShape(
       {&f32_}, ShapeUtil::MakeProgramShape({}, f32_));
   EXPECT_FALSE(inferred_status_error1.ok());
   EXPECT_THAT(inferred_status_error1.status().error_message(),
-              ContainsRegex("arity must match"));
+              HasSubstr("arity must match"));
 
   auto inferred_status_error2 = ShapeInference::InferCallShape(
       {&f32_}, ShapeUtil::MakeProgramShape({s32_}, f32_));
   EXPECT_FALSE(inferred_status_error2.ok());
   EXPECT_THAT(inferred_status_error2.status().error_message(),
-              ContainsRegex("parameter must match argument"));
+              HasSubstr("parameter must match argument"));
 }
 
 TEST_F(ShapeInferenceTest, Transpose) {
diff --git a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
index 68b4d9916e..c8030aade8 100644
--- a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
+++ b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
@@ -33,6 +33,7 @@ namespace xla {
 namespace {
 
 using BroadcastSimpleTest = ClientLibraryTestBase;
+using ::testing::HasSubstr;
 
 XLA_TEST_F(BroadcastSimpleTest, ScalarNoOpBroadcast) {
   ComputationBuilder b(client_, TestName());
@@ -220,7 +221,7 @@ XLA_TEST_F(BroadcastSimpleTest, InvalidBinaryAndDegenerateBroadcasting) {
   auto result_status = Execute(&b, {});
   EXPECT_FALSE(result_status.ok());
   EXPECT_THAT(result_status.status().error_message(),
-              ::testing::ContainsRegex("broadcast dimension 0 mismatch"));
+              HasSubstr("broadcast dimension 0 mismatch"));
 }
 
 XLA_TEST_F(BroadcastSimpleTest, InvalidInDimensionBroadcasting) {
@@ -232,9 +233,8 @@ XLA_TEST_F(BroadcastSimpleTest, InvalidInDimensionBroadcasting) {
 
   auto result_status = Execute(&b, {});
   EXPECT_FALSE(result_status.ok());
-  EXPECT_THAT(
-      result_status.status().error_message(),
-      ::testing::ContainsRegex("binary op BINOP_ADD with incompatible shapes"));
+  EXPECT_THAT(result_status.status().error_message(),
+              HasSubstr("binary op BINOP_ADD with incompatible shapes"));
 }
 
 XLA_TEST_F(BroadcastSimpleTest, InvalidDegenerateBroadcasting) {
@@ -246,9 +246,8 @@ XLA_TEST_F(BroadcastSimpleTest, InvalidDegenerateBroadcasting) {
 
   auto result_status = Execute(&b, {});
   EXPECT_FALSE(result_status.ok());
-  EXPECT_THAT(
-      result_status.status().error_message(),
-      ::testing::ContainsRegex("binary op BINOP_ADD with incompatible shapes"));
+  EXPECT_THAT(result_status.status().error_message(),
+              HasSubstr("binary op BINOP_ADD with incompatible shapes"));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/tests/concat_test.cc b/tensorflow/compiler/xla/tests/concat_test.cc
index 0b660bcbf9..e645e23361 100644
--- a/tensorflow/compiler/xla/tests/concat_test.cc
+++ b/tensorflow/compiler/xla/tests/concat_test.cc
@@ -35,6 +35,7 @@ namespace xla {
 namespace {
 
 using ConcatTest = ClientLibraryTestBase;
+using ::testing::HasSubstr;
 
 // Concatenate expects at least one argument.
 XLA_TEST_F(ConcatTest, Concat_Nothing) {
@@ -42,9 +43,8 @@ XLA_TEST_F(ConcatTest, Concat_Nothing) {
   auto concatenated = builder.ConcatInDim({}, 0);
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_FALSE(computation_status.ok());
-  EXPECT_THAT(
-      computation_status.status().ToString(),
-      ::testing::ContainsRegex("Concatenate expects at least one argument"));
+  EXPECT_THAT(computation_status.status().ToString(),
+              HasSubstr("Concatenate expects at least one argument"));
 }
 
 // Concatenate with one argument works.
@@ -67,8 +67,7 @@ XLA_TEST_F(ConcatTest, CannotConcatR0WithR0) {
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_FALSE(computation_status.ok());
   EXPECT_THAT(computation_status.status().ToString(),
-              ::testing::ContainsRegex(
-                  "dimension to concatenate along out of bounds: 0"));
+              HasSubstr("dimension to concatenate along out of bounds: 0"));
 }
 
 XLA_TEST_F(ConcatTest, Concat_R1_L0_With_R1_L0) {
@@ -405,9 +404,9 @@ XLA_TEST_F(ConcatTest, CannotConcatOpaques) {
   auto concatenated = builder.ConcatInDim({x, y}, 0);
   StatusOr<Computation> computation_status = builder.Build();
   ASSERT_FALSE(computation_status.ok());
-  EXPECT_THAT(computation_status.status().ToString(),
-              ::testing::ContainsRegex(
-                  "Expected non-opaque argument for operand of concatenation"));
+  EXPECT_THAT(
+      computation_status.status().ToString(),
+      HasSubstr("Expected non-opaque argument for operand of concatenation"));
 }
 
 XLA_TEST_F(ConcatTest, ConcatSeveralBoxedPredicates) {
diff --git a/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc b/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc
index 59f4fb8db2..4aff6dc7d5 100644
--- a/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc
+++ b/tensorflow/compiler/xla/tests/convolution_dimension_numbers_test.cc
@@ -43,7 +43,7 @@ TEST_F(ConvolutionDimensionNumbersTest, InvalidInputDimensionNumbers) {
       ComputationBuilder::CreateConvDimensionNumbers(0, 2, 2, 3, 0, 1, 2, 3);
   ASSERT_FALSE(dimension_numbers_status.ok());
   ASSERT_THAT(dimension_numbers_status.status().error_message(),
-              ::testing::ContainsRegex("input are not unique"));
+              ::testing::HasSubstr("input are not unique"));
 }
 
 // Tests the convolution operation with invalid weight dimension numbers.
@@ -52,7 +52,7 @@ TEST_F(ConvolutionDimensionNumbersTest, InvalidWeightDimensionNumbers) {
       ComputationBuilder::CreateConvDimensionNumbers(0, 1, 2, 3, 2, 3, 2, 3);
   ASSERT_FALSE(dimension_numbers_status.ok());
   ASSERT_THAT(dimension_numbers_status.status().error_message(),
-              ::testing::ContainsRegex("weight are not unique"));
+              ::testing::HasSubstr("weight are not unique"));
 }
 
 XLA_TEST_F(ConvolutionDimensionNumbersTest,
diff --git a/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc b/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc
index 33c710a606..60ce2b1b58 100644
--- a/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc
+++ b/tensorflow/compiler/xla/tests/deconstruct_tuple_test.cc
@@ -35,7 +35,9 @@ limitations under the License.
 namespace xla {
 namespace {
 
+using ::testing::ContainsRegex;
 using ::testing::ElementsAre;
+using ::testing::HasSubstr;
 
 class DeconstructTupleTest : public ClientLibraryTestBase {
  protected:
@@ -164,7 +166,7 @@ TEST_F(DeconstructTupleTest, DeconstructNonTuple) {
   auto result_status = client_->DeconstructTuple(*global_data);
   EXPECT_FALSE(result_status.ok());
   EXPECT_THAT(result_status.status().error_message(),
-              ::testing::ContainsRegex("global data handle .* is not a tuple"));
+              ContainsRegex("global data handle .* is not a tuple"));
 }
 
 XLA_TEST_F(DeconstructTupleTest, DeconstructTupleFromParam) {
@@ -193,8 +195,7 @@ XLA_TEST_F(DeconstructTupleTest, DeconstructNestedTuple) {
   auto result_status = client_->DeconstructTuple(*global_data);
   EXPECT_FALSE(result_status.ok());
   EXPECT_THAT(result_status.status().error_message(),
-              ::testing::ContainsRegex(
-                  "deconstructing nested tuples not yet supported"));
+              HasSubstr("deconstructing nested tuples not yet supported"));
 }
 
 }  // namespace
-- 
GitLab


From 2cd26189a825ebcf37978f09ff88f663fce67986 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 12 Apr 2017 09:55:40 -0800
Subject: [PATCH 0346/1563] keras:integration_test: Replace assertTrue with
 assertGreater

so we can get more information about the actual val_acc value when the test fails flakily.
Change: 152959293
---
 .../contrib/keras/python/keras/integration_test.py     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/integration_test.py b/tensorflow/contrib/keras/python/keras/integration_test.py
index f42f81b286..3a3d36ca1c 100644
--- a/tensorflow/contrib/keras/python/keras/integration_test.py
+++ b/tensorflow/contrib/keras/python/keras/integration_test.py
@@ -51,7 +51,7 @@ class KerasIntegrationTest(test.TestCase):
       history = model.fit(x_train, y_train, epochs=10, batch_size=16,
                           validation_data=(x_test, y_test),
                           verbose=2)
-      self.assertTrue(history.history['val_acc'][-1] > 0.85)
+      self.assertGreater(history.history['val_acc'][-1], 0.85)
 
   def test_vector_classification_functional(self):
     with self.test_session():
@@ -76,7 +76,7 @@ class KerasIntegrationTest(test.TestCase):
       history = model.fit(x_train, y_train, epochs=10, batch_size=16,
                           validation_data=(x_test, y_test),
                           verbose=2)
-      self.assertTrue(history.history['val_acc'][-1] > 0.85)
+      self.assertGreater(history.history['val_acc'][-1], 0.85)
 
   def test_temporal_classification_declarative(self):
     with self.test_session():
@@ -99,7 +99,7 @@ class KerasIntegrationTest(test.TestCase):
       history = model.fit(x_train, y_train, epochs=10, batch_size=16,
                           validation_data=(x_test, y_test),
                           verbose=2)
-      self.assertTrue(history.history['val_acc'][-1] > 0.85)
+      self.assertGreater(history.history['val_acc'][-1], 0.85)
 
   def test_image_classification_declarative(self):
     with self.test_session():
@@ -130,7 +130,7 @@ class KerasIntegrationTest(test.TestCase):
       history = model.fit(x_train, y_train, epochs=10, batch_size=16,
                           validation_data=(x_test, y_test),
                           verbose=2)
-      self.assertTrue(history.history['val_acc'][-1] > 0.85)
+      self.assertGreater(history.history['val_acc'][-1], 0.85)
 
   def test_video_classification_functional(self):
     with self.test_session():
@@ -159,7 +159,7 @@ class KerasIntegrationTest(test.TestCase):
       history = model.fit(x_train, y_train, epochs=10, batch_size=16,
                           validation_data=(x_test, y_test),
                           verbose=2)
-      self.assertTrue(history.history['val_acc'][-1] > 0.85)
+      self.assertGreater(history.history['val_acc'][-1], 0.85)
 
 
 if __name__ == '__main__':
-- 
GitLab


From 688d1aced9a57c73b8d849db2dce5f61dd6d0f83 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 12 Apr 2017 09:56:19 -0800
Subject: [PATCH 0347/1563] Thoroughly skip testWarnings for Python version
 >=3.6

Should fix nightly build errors such as https://ci.tensorflow.org/view/Tensorflow%20Jenkins%20Monitored%20builds/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=NO_OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/455/consoleFull
Change: 152959394
---
 tensorflow/python/ops/gradients_test.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tensorflow/python/ops/gradients_test.py b/tensorflow/python/ops/gradients_test.py
index cd4c37d7e0..aefed34d74 100644
--- a/tensorflow/python/ops/gradients_test.py
+++ b/tensorflow/python/ops/gradients_test.py
@@ -577,14 +577,16 @@ class IndexedSlicesToTensorTest(test_util.TensorFlowTestCase):
   def testWarnings(self):
     # TODO(gunan) Reenable after this issue is fixed:
     # https://github.com/google/protobuf/issues/2812
-    if sys.version_info < (3, 6):
-      # Smaller than the threshold: no warning.
-      c_sparse = ops.IndexedSlices(
-          array_ops.placeholder(dtypes.float32),
-          array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
-      with warnings.catch_warnings(record=True) as w:
-        math_ops.multiply(c_sparse, 1.0)
-      self.assertEqual(0, len(w))
+    if sys.version_info >= (3, 6):
+      self.skipTest("Skipped test for Python 3.6+")
+
+    # Smaller than the threshold: no warning.
+    c_sparse = ops.IndexedSlices(
+        array_ops.placeholder(dtypes.float32),
+        array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
+    with warnings.catch_warnings(record=True) as w:
+      math_ops.multiply(c_sparse, 1.0)
+    self.assertEqual(0, len(w))
 
     # Greater than or equal to the threshold: warning.
     c_sparse = ops.IndexedSlices(
-- 
GitLab


From ea82ff5a5737073bf2962aeac788ad3057418b9a Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Wed, 12 Apr 2017 09:56:49 -0800
Subject: [PATCH 0348/1563] Fix typo in docstring Change: 152959462

---
 tensorflow/python/ops/variables.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/ops/variables.py b/tensorflow/python/ops/variables.py
index 6a3dc75096..4793cb4a17 100644
--- a/tensorflow/python/ops/variables.py
+++ b/tensorflow/python/ops/variables.py
@@ -1159,7 +1159,7 @@ def initialize_variables(var_list, name="init"):
 def global_variables_initializer():
   """Returns an Op that initializes global variables.
 
-  This is just a shortcut for `variable_initializers(global_variables())`
+  This is just a shortcut for `variable_initializer(global_variables())`
 
   Returns:
     An Op that initializes global variables in the graph.
@@ -1176,7 +1176,7 @@ def initialize_all_variables():
 def local_variables_initializer():
   """Returns an Op that initializes all local variables.
 
-  This is just a shortcut for `variable_initializers(local_variables())`
+  This is just a shortcut for `variable_initializer(local_variables())`
 
   Returns:
     An Op that initializes all local variables in the graph.
-- 
GitLab


From 331ba78797f57af890a4a7b09ee03de3eff9b615 Mon Sep 17 00:00:00 2001
From: Guenther Schmuelling <guschmue@microsoft.com>
Date: Wed, 12 Apr 2017 11:34:02 -0700
Subject: [PATCH 0349/1563] fix windows gpu build:
 https://github.com/tensorflow/tensorflow/commit/72c023d3967a3218cd3d830ce6e57f7c4d87a18c
 (#9165)

requires cusolver
---
 tensorflow/contrib/cmake/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 4606d317d7..401fabce7b 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -196,7 +196,7 @@ if (tensorflow_ENABLE_GPU)
     # add cudnn
     include_directories(${CUDNN_HOME})
     set(CUDA_LIBRARIES ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY} ${CUDA_CUBLAS_LIBRARIES} ${CUDA_CUFFT_LIBRARIES}
-      ${CUDA_curand_LIBRARY} ${CUDA_cupti_LIBRARY} ${CUDNN_HOME}/lib/x64/cudnn.lib)
+      ${CUDA_curand_LIBRARY} ${CUDA_cupti_LIBRARY} ${CUDA_cusolver_LIBRARY} ${CUDNN_HOME}/lib/x64/cudnn.lib)
 
     # create cuda_config.h
     FILE(WRITE ${tensorflow_source_dir}/third_party/gpus/cuda/cuda_config.h
@@ -217,6 +217,7 @@ if (tensorflow_ENABLE_GPU)
       ${CUDA_TOOLKIT_TARGET_DIR}/include/cublas_v2.h ${CUDNN_HOME}/include/cudnn.h
       ${CUDA_TOOLKIT_TARGET_DIR}/include/cufft.h ${CUDA_TOOLKIT_TARGET_DIR}/include/curand.h
       ${CUDA_TOOLKIT_TARGET_DIR}/include/cuda_runtime_api.h
+      ${CUDA_TOOLKIT_TARGET_DIR}/include/cusolverDn.h
       DESTINATION ${tensorflow_source_dir}/third_party/gpus/cuda/include
     )
     include_directories(${tensorflow_source_dir}/third_party/gpus)
-- 
GitLab


From 732fe69d6514b9ae075bec237a86abed0522e3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Schl=C3=B6sser?= <dominik.schloesser@gmail.com>
Date: Wed, 12 Apr 2017 20:40:26 +0200
Subject: [PATCH 0350/1563] missing dash in install from source at cxxopt added
 (#9157)

---
 tensorflow/docs_src/install/install_sources.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 16c410ef29..5f351c40b4 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -298,7 +298,7 @@ invoke the following command:
 
 <pre>$ <b>bazel build --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package</b> </pre>
 
-**NOTE on gcc 5 or later:** the binary pip packages available on the TensorFlow website are built with gcc 4, which uses the older ABI. To make your build compatible with the older ABI, you need to add `-cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"` to your `bazel build` command. ABI compatibility allows custom ops built against the TensorFlow pip package to continue to work against your built package.
+**NOTE on gcc 5 or later:** the binary pip packages available on the TensorFlow website are built with gcc 4, which uses the older ABI. To make your build compatible with the older ABI, you need to add `--cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"` to your `bazel build` command. ABI compatibility allows custom ops built against the TensorFlow pip package to continue to work against your built package.
 
 <b>Tip:</b> By default, building TensorFlow from sources consumes
 a lot of RAM.  If RAM is an issue on your system, you may limit RAM usage
-- 
GitLab


From d6362c90e7ef942808bc31887175e2c0ef437896 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 10:25:07 -0800
Subject: [PATCH 0351/1563] Add var name to errors on variable restore. Change:
 152963830

---
 tensorflow/core/kernels/save_restore_tensor.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/kernels/save_restore_tensor.cc b/tensorflow/core/kernels/save_restore_tensor.cc
index 35c5d1d4f0..006ef988b5 100644
--- a/tensorflow/core/kernels/save_restore_tensor.cc
+++ b/tensorflow/core/kernels/save_restore_tensor.cc
@@ -268,7 +268,8 @@ Status RestoreTensorsV2(OpKernelContext* context, const Tensor& prefix,
                                          &parsed_slice, &parsed_slice_shape));
       if (!restored_full_shape.IsSameSize(parsed_full_shape)) {
         return errors::InvalidArgument(
-            "Shape in shape_and_slice spec ", parsed_full_shape.DebugString(),
+            "tensor_name = ", tensor_name, "; shape in shape_and_slice spec ",
+            parsed_full_shape.DebugString(),
             " does not match the shape stored in checkpoint: ",
             restored_full_shape.DebugString());
       }
@@ -279,10 +280,10 @@ Status RestoreTensorsV2(OpKernelContext* context, const Tensor& prefix,
           reader.LookupSlice(tensor_name, parsed_slice, restored_tensor));
     }
     if (dtypes[i] != restored_tensor->dtype()) {
-      return errors::InvalidArgument("Expected dtype ",
-                                     DataTypeString(dtypes[i]),
-                                     " does not equal restored dtype ",
-                                     DataTypeString(restored_tensor->dtype()));
+      return errors::InvalidArgument(
+          "tensor_name = ", tensor_name, "; expected dtype ",
+          DataTypeString(dtypes[i]), " does not equal restored dtype ",
+          DataTypeString(restored_tensor->dtype()));
     }
   }
   return Status::OK();
-- 
GitLab


From 9ef89190595fde6a66fefcdc2acf62bfa5b4fc13 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 12 Apr 2017 11:03:31 -0800
Subject: [PATCH 0352/1563] Add helper method XlaDevice::GetMetadata for
 retrieving the XlaDevice metadata from an operator. Change: 152968735

---
 tensorflow/compiler/jit/xla_device.cc | 11 +++++++++++
 tensorflow/compiler/jit/xla_device.h  |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/tensorflow/compiler/jit/xla_device.cc b/tensorflow/compiler/jit/xla_device.cc
index 3c6793b894..58b4febcd6 100644
--- a/tensorflow/compiler/jit/xla_device.cc
+++ b/tensorflow/compiler/jit/xla_device.cc
@@ -108,6 +108,17 @@ const DeviceType& XlaDevice::Metadata::jit_device_type() const {
 
 string XlaDevice::Metadata::DebugString() { return "XLA device metadata"; }
 
+/* static */ Status XlaDevice::GetMetadata(OpKernelContext* ctx,
+                                           Metadata** metadata) {
+  ResourceMgr* rm = ctx->resource_manager();
+  if (rm == nullptr) {
+    return errors::Internal("No resource manager.");
+  }
+  TF_RETURN_IF_ERROR(
+      rm->Lookup<Metadata>(rm->default_container(), "xla_metadata", metadata));
+  return Status::OK();
+}
+
 XlaDevice::XlaDevice(const SessionOptions& options,
                      const DeviceAttributes& attrs, int device_ordinal,
                      const DeviceType& jit_device_name,
diff --git a/tensorflow/compiler/jit/xla_device.h b/tensorflow/compiler/jit/xla_device.h
index 3de14f3061..0badb390c6 100644
--- a/tensorflow/compiler/jit/xla_device.h
+++ b/tensorflow/compiler/jit/xla_device.h
@@ -67,6 +67,10 @@ class XlaDevice : public LocalDevice {
     perftools::gputools::Platform* platform_;  // Not owned.
   };
 
+  // Sets `*metadata` to the XlaDevice Metadata in the resource manager of
+  // `ctx`.
+  static Status GetMetadata(OpKernelContext* ctx, Metadata** metadata);
+
   // Factory function. 'platform_name' is the name of the XLA platform.
   // 'device_name' is the name of the Tensorflow device to create.
   // 'jit_device_name' is the name of the corresponding JIT device.
-- 
GitLab


From 497dbbca428c3441f36a03a5306d862b10d83674 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 11:09:48 -0800
Subject: [PATCH 0353/1563] Adding a license header to a python file. Change:
 152969546

---
 tensorflow/examples/how_tos/__init__.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tensorflow/examples/how_tos/__init__.py b/tensorflow/examples/how_tos/__init__.py
index 878841c184..2069def242 100644
--- a/tensorflow/examples/how_tos/__init__.py
+++ b/tensorflow/examples/how_tos/__init__.py
@@ -1,3 +1,19 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Declaring how_tos a python package.
+"""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-- 
GitLab


From 86d3891ba6612552347beaabe27edac11f5758d7 Mon Sep 17 00:00:00 2001
From: Louie Helm <louiehelm@users.noreply.github.com>
Date: Wed, 12 Apr 2017 14:39:35 -0500
Subject: [PATCH 0354/1563] NADAM Optimizer (#8405)

* Nadam + Radam Optimizers

* Better sparse Nadam

* Formatting fixes + proper SYCL undefs

* Formatting fix

* Fixed quote formatting

* Fix lint errors

Super calls in Nadam/Radam init worked but were gross.

* Variable rename
---
 tensorflow/core/kernels/training_ops.cc       | 336 +++++++++++++++++-
 tensorflow/core/kernels/training_ops.h        |  27 ++
 .../core/kernels/training_ops_gpu.cu.cc       |  83 +++++
 tensorflow/core/ops/training_ops.cc           | 229 ++++++++++++
 tensorflow/python/training/adam.py            | 155 ++++++++
 tensorflow/python/training/training.py        |   4 +
 6 files changed, 833 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index c7a5ea3a9c..84b151279b 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -258,6 +258,63 @@ struct ApplyAdam<CPUDevice, T> : ApplyAdamNonCuda<CPUDevice, T> {};
 template <typename T>
 struct ApplyAdam<SYCLDevice, T> : ApplyAdamNonCuda<SYCLDevice, T> {};
 
+template <typename Device, typename T>
+struct ApplyRadamNonCuda {
+  void operator()(const Device& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
+                  typename TTypes<T>::ConstScalar beta1_power,
+                  typename TTypes<T>::ConstScalar beta2_power,
+                  typename TTypes<T>::ConstScalar lr,
+                  typename TTypes<T>::ConstScalar beta1,
+                  typename TTypes<T>::ConstScalar beta2,
+                  typename TTypes<T>::ConstScalar epsilon,
+                  typename TTypes<T>::ConstScalar gamma,
+                  typename TTypes<T>::ConstFlat grad) {
+    const T alpha = lr() * Eigen::numext::sqrt(T(1) - beta2_power()) /
+                    (T(1) - beta1_power());
+    var.device(d) -= (((T(1) - gamma()) * m + gamma() * grad) * alpha)
+                     / (v.sqrt() + epsilon());
+    m.device(d) += (grad - m) * (T(1) - beta1());
+    v.device(d) += (grad.square() - v) * (T(1) - beta2());
+
+  }
+};
+
+template <typename T>
+struct ApplyRadam<CPUDevice, T> : ApplyRadamNonCuda<CPUDevice, T> {};
+template <typename T>
+struct ApplyRadam<SYCLDevice, T> : ApplyRadamNonCuda<SYCLDevice, T> {};
+
+
+template <typename Device, typename T>
+struct ApplyNadamNonCuda {
+  void operator()(const Device& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
+                  typename TTypes<T>::ConstScalar beta1_power,
+                  typename TTypes<T>::ConstScalar beta2_power,
+                  typename TTypes<T>::ConstScalar lr,
+                  typename TTypes<T>::ConstScalar beta1,
+                  typename TTypes<T>::ConstScalar beta2,
+                  typename TTypes<T>::ConstScalar epsilon,
+                  typename TTypes<T>::ConstFlat grad) {
+    const T alpha1 = Eigen::numext::sqrt(T(1) - beta2_power()) /
+                     (T(1) - beta1_power());
+    const T alpha2 = Eigen::numext::sqrt(T(1) - beta2_power()*beta2()) /
+                     (T(1) - beta1_power()*beta1());
+    const T nes = alpha2 / alpha1;
+    var.device(d) -= (m * lr() * alpha1) / (v.sqrt() + epsilon());
+    m.device(d) += (grad - m * nes) * (T(1) - beta1());
+    v.device(d) += (grad.square() - v) * (T(1) - beta2());
+  }
+};
+
+template <typename T>
+struct ApplyNadam<CPUDevice, T> : ApplyNadamNonCuda<CPUDevice, T> {};
+template <typename T>
+struct ApplyNadam<SYCLDevice, T> : ApplyNadamNonCuda<SYCLDevice, T> {};
+
+
+
 template <typename T>
 struct ApplyRMSProp<CPUDevice, T> {
   void operator()(const CPUDevice& d, typename TTypes<T>::Flat var,
@@ -2381,9 +2438,9 @@ TF_CALL_double(REGISTER_CPU_KERNELS);
 
 #ifdef TENSORFLOW_USE_SYCL
 #define REGISTER_SYCL_KERNELS(T) REGISTER_KERNELS(SYCL, T);
-
 TF_CALL_float(REGISTER_SYCL_KERNELS);
 TF_CALL_double(REGISTER_SYCL_KERNELS);
+#undef REGISTER_SYCL_KERNELS
 #endif
 
 #if GOOGLE_CUDA
@@ -2941,4 +2998,281 @@ REGISTER_KERNELS(double, int64);
 
 #undef REGISTER_KERNELS
 
+template <typename Device, typename T>
+class ApplyRadamOp : public OpKernel {
+ public:
+  explicit ApplyRadamOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
+
+    Tensor var;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    Tensor m;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &m));
+    Tensor v;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &v));
+    OP_REQUIRES(
+        ctx, var.IsInitialized(),
+        errors::FailedPrecondition(
+            "Attempting to use uninitialized variables: ", def().input(0)));
+    OP_REQUIRES(
+        ctx, m.IsInitialized(),
+        errors::FailedPrecondition(
+            "Attempting to use uninitialized variables: ", def().input(1)));
+    OP_REQUIRES(
+        ctx, v.IsInitialized(),
+        errors::FailedPrecondition(
+            "Attempting to use uninitialized variables: ", def().input(2)));
+
+    const Tensor& beta1_power = ctx->input(3);
+    const Tensor& beta2_power = ctx->input(4);
+    const Tensor& lr = ctx->input(5);
+    const Tensor& beta1 = ctx->input(6);
+    const Tensor& beta2 = ctx->input(7);
+    const Tensor& epsilon = ctx->input(8);
+    const Tensor& gamma = ctx->input(9);
+
+
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1_power.shape()),
+                errors::InvalidArgument("beta1_power is not a scalar: ",
+                                        beta1_power.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2_power.shape()),
+                errors::InvalidArgument("beta2_power is not a scalar: ",
+                                        beta2_power.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(lr.shape()),
+                errors::InvalidArgument("lr is not a scalar : ",
+                                        lr.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1.shape()),
+                errors::InvalidArgument("beta1 is not a scalar: ",
+                                        beta1.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2.shape()),
+                errors::InvalidArgument("beta2 is not a scalar: ",
+                                        beta2.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(epsilon.shape()),
+                errors::InvalidArgument("epsilon is not a scalar: ",
+                                        epsilon.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(gamma.shape()),
+                errors::InvalidArgument("gamma is not a scalar: ",
+                                        gamma.shape().DebugString()));
+    
+    const Tensor& grad = ctx->input(10);
+    OP_REQUIRES(ctx, var.shape().IsSameSize(m.shape()),
+                errors::InvalidArgument("var and m do not have the same shape",
+                                        var.shape().DebugString(), " ",
+                                        m.shape().DebugString()));
+    OP_REQUIRES(ctx, var.shape().IsSameSize(v.shape()),
+                errors::InvalidArgument("var and v do not have the same shape",
+                                        var.shape().DebugString(), " ",
+                                        v.shape().DebugString()));
+    OP_REQUIRES(
+        ctx, var.shape().IsSameSize(grad.shape()),
+        errors::InvalidArgument("var and grad do not have the same shape",
+                                var.shape().DebugString(), " ",
+                                grad.shape().DebugString()));
+
+    const Device& device = ctx->template eigen_device<Device>();
+    functor::ApplyRadam<Device, T>()(device, var.flat<T>(), m.flat<T>(),
+                                    v.flat<T>(), beta1_power.scalar<T>(),
+                                    beta2_power.scalar<T>(), lr.scalar<T>(),
+                                    beta1.scalar<T>(), beta2.scalar<T>(),
+                                    epsilon.scalar<T>(), gamma.scalar<T>(),
+                                    grad.flat<T>());
+
+    MaybeForwardRefInputToRefOutput(ctx, 0, 0);
+  }
+
+ private:
+  bool use_exclusive_lock_;
+};
+
+using CPUDevice = Eigen::ThreadPoolDevice;
+using GPUDevice = Eigen::GpuDevice;
+
+#define REGISTER_KERNELS(D, T)                                              \
+  REGISTER_KERNEL_BUILDER(                                                  \
+      Name("ApplyRadam").Device(DEVICE_##D).TypeConstraint<T>("T"),         \
+      ApplyRadamOp<D##Device, T>);                                          \
+  REGISTER_KERNEL_BUILDER(                                                  \
+      Name("ResourceApplyRadam").Device(DEVICE_##D).TypeConstraint<T>("T"), \
+      ApplyRadamOp<D##Device, T>);
+#define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T);
+
+TF_CALL_half(REGISTER_CPU_KERNELS);
+TF_CALL_float(REGISTER_CPU_KERNELS);
+TF_CALL_double(REGISTER_CPU_KERNELS);
+
+#ifdef TENSORFLOW_USE_SYCL
+#define REGISTER_SYCL_KERNELS(T) REGISTER_KERNELS(SYCL, T);
+TF_CALL_float(REGISTER_SYCL_KERNELS);
+#undef REGISTER_SYCL_KERNELS
+#endif
+
+#if GOOGLE_CUDA
+// Forward declarations of the functor specializations for GPU.
+namespace functor {
+#define DECLARE_GPU_SPEC(T)                                   \
+  template <>                                                 \
+  void ApplyRadam<GPUDevice, T>::operator()(                  \
+      const GPUDevice& d, typename TTypes<T>::Flat var,       \
+      typename TTypes<T>::Flat m, typename TTypes<T>::Flat v, \
+      typename TTypes<T>::ConstScalar beta1_power,            \
+      typename TTypes<T>::ConstScalar beta2_power,            \
+      typename TTypes<T>::ConstScalar lr,                     \
+      typename TTypes<T>::ConstScalar beta1,                  \
+      typename TTypes<T>::ConstScalar beta2,                  \
+      typename TTypes<T>::ConstScalar epsilon,                \
+      typename TTypes<T>::ConstScalar gamma,                  \
+      typename TTypes<T>::ConstFlat grad);                    \
+  extern template struct ApplyRadam<GPUDevice, T>;
+DECLARE_GPU_SPEC(Eigen::half);
+DECLARE_GPU_SPEC(float);
+DECLARE_GPU_SPEC(double);
+#undef DECLARE_GPU_SPEC
+}  // namespace functor
+
+REGISTER_KERNELS(GPU, Eigen::half);
+REGISTER_KERNELS(GPU, float);
+REGISTER_KERNELS(GPU, double);
+#endif
+#undef REGISTER_CPU_KERNELS
+#undef REGISTER_KERNELS
+
+template <typename Device, typename T>
+class ApplyNadamOp : public OpKernel {
+ public:
+  explicit ApplyNadamOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
+
+    Tensor var;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    Tensor m;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &m));
+    Tensor v;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &v));
+    OP_REQUIRES(
+        ctx, var.IsInitialized(),
+        errors::FailedPrecondition(
+            "Attempting to use uninitialized variables: ", def().input(0)));
+    OP_REQUIRES(
+        ctx, m.IsInitialized(),
+        errors::FailedPrecondition(
+            "Attempting to use uninitialized variables: ", def().input(1)));
+    OP_REQUIRES(
+        ctx, v.IsInitialized(),
+        errors::FailedPrecondition(
+            "Attempting to use uninitialized variables: ", def().input(2)));
+
+    const Tensor& beta1_power = ctx->input(3);
+    const Tensor& beta2_power = ctx->input(4);
+    const Tensor& lr = ctx->input(5);
+    const Tensor& beta1 = ctx->input(6);
+    const Tensor& beta2 = ctx->input(7);
+    const Tensor& epsilon = ctx->input(8);
+
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1_power.shape()),
+                errors::InvalidArgument("beta1_power is not a scalar: ",
+                                        beta1_power.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2_power.shape()),
+                errors::InvalidArgument("beta2_power is not a scalar: ",
+                                        beta2_power.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(lr.shape()),
+                errors::InvalidArgument("lr is not a scalar : ",
+                                        lr.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1.shape()),
+                errors::InvalidArgument("beta1 is not a scalar: ",
+                                        beta1.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2.shape()),
+                errors::InvalidArgument("beta2 is not a scalar: ",
+                                        beta2.shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(epsilon.shape()),
+                errors::InvalidArgument("epsilon is not a scalar: ",
+                                        epsilon.shape().DebugString()));
+
+    const Tensor& grad = ctx->input(9);
+    OP_REQUIRES(ctx, var.shape().IsSameSize(m.shape()),
+                errors::InvalidArgument("var and m do not have the same shape",
+                                        var.shape().DebugString(), " ",
+                                        m.shape().DebugString()));
+    OP_REQUIRES(ctx, var.shape().IsSameSize(v.shape()),
+                errors::InvalidArgument("var and v do not have the same shape",
+                                        var.shape().DebugString(), " ",
+                                        v.shape().DebugString()));
+    OP_REQUIRES(
+        ctx, var.shape().IsSameSize(grad.shape()),
+        errors::InvalidArgument("var and grad do not have the same shape",
+                                var.shape().DebugString(), " ",
+                                grad.shape().DebugString()));
+
+    const Device& device = ctx->template eigen_device<Device>();
+    functor::ApplyNadam<Device, T>()(device, var.flat<T>(), m.flat<T>(),
+                                    v.flat<T>(), beta1_power.scalar<T>(),
+                                    beta2_power.scalar<T>(), lr.scalar<T>(),
+                                    beta1.scalar<T>(), beta2.scalar<T>(),
+                                    epsilon.scalar<T>(), grad.flat<T>());
+
+    MaybeForwardRefInputToRefOutput(ctx, 0, 0);
+  }
+
+ private:
+  bool use_exclusive_lock_;
+};
+
+using CPUDevice = Eigen::ThreadPoolDevice;
+using GPUDevice = Eigen::GpuDevice;
+
+#define REGISTER_KERNELS(D, T)                                             \
+  REGISTER_KERNEL_BUILDER(                                                 \
+      Name("ApplyNadam").Device(DEVICE_##D).TypeConstraint<T>("T"),         \
+      ApplyNadamOp<D##Device, T>);                                          \
+  REGISTER_KERNEL_BUILDER(                                                 \
+      Name("ResourceApplyNadam").Device(DEVICE_##D).TypeConstraint<T>("T"), \
+      ApplyNadamOp<D##Device, T>);
+#define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T);
+
+TF_CALL_half(REGISTER_CPU_KERNELS);
+TF_CALL_float(REGISTER_CPU_KERNELS);
+TF_CALL_double(REGISTER_CPU_KERNELS);
+
+#ifdef TENSORFLOW_USE_SYCL
+#define REGISTER_SYCL_KERNELS(T) REGISTER_KERNELS(SYCL, T);
+TF_CALL_float(REGISTER_SYCL_KERNELS);
+#undef REGISTER_SYCL_KERNELS
+#endif
+
+#if GOOGLE_CUDA
+// Forward declarations of the functor specializations for GPU.
+namespace functor {
+#define DECLARE_GPU_SPEC(T)                                   \
+  template <>                                                 \
+  void ApplyNadam<GPUDevice, T>::operator()(                  \
+      const GPUDevice& d, typename TTypes<T>::Flat var,       \
+      typename TTypes<T>::Flat m, typename TTypes<T>::Flat v, \
+      typename TTypes<T>::ConstScalar beta1_power,            \
+      typename TTypes<T>::ConstScalar beta2_power,            \
+      typename TTypes<T>::ConstScalar lr,                     \
+      typename TTypes<T>::ConstScalar beta1,                  \
+      typename TTypes<T>::ConstScalar beta2,                  \
+      typename TTypes<T>::ConstScalar epsilon,                \
+      typename TTypes<T>::ConstFlat grad);                    \
+  extern template struct ApplyNadam<GPUDevice, T>;
+DECLARE_GPU_SPEC(Eigen::half);
+DECLARE_GPU_SPEC(float);
+DECLARE_GPU_SPEC(double);
+#undef DECLARE_GPU_SPEC
+}  // namespace functor
+
+REGISTER_KERNELS(GPU, Eigen::half);
+REGISTER_KERNELS(GPU, float);
+REGISTER_KERNELS(GPU, double);
+#endif
+#undef REGISTER_CPU_KERNELS
+#undef REGISTER_KERNELS
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index 6b599656ce..6f89fde4e6 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -126,6 +126,33 @@ struct ApplyAdam {
                   typename TTypes<T>::ConstFlat grad);
 };
 
+template <typename Device, typename T>
+struct ApplyRadam {
+  void operator()(const Device& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
+                  typename TTypes<T>::ConstScalar beta1_power,
+                  typename TTypes<T>::ConstScalar beta2_power,
+                  typename TTypes<T>::ConstScalar lr,
+                  typename TTypes<T>::ConstScalar beta1,
+                  typename TTypes<T>::ConstScalar beta2,
+                  typename TTypes<T>::ConstScalar epsilon,
+                  typename TTypes<T>::ConstScalar gamma,
+                  typename TTypes<T>::ConstFlat grad);
+};
+
+template <typename Device, typename T>
+struct ApplyNadam {
+  void operator()(const Device& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
+                  typename TTypes<T>::ConstScalar beta1_power,
+                  typename TTypes<T>::ConstScalar beta2_power,
+                  typename TTypes<T>::ConstScalar lr,
+                  typename TTypes<T>::ConstScalar beta1,
+                  typename TTypes<T>::ConstScalar beta2,
+                  typename TTypes<T>::ConstScalar epsilon,
+                  typename TTypes<T>::ConstFlat grad);
+};
+
 template <typename Device, typename T>
 struct ApplyRMSProp {
   void operator()(const Device& d, typename TTypes<T>::Flat var,
diff --git a/tensorflow/core/kernels/training_ops_gpu.cu.cc b/tensorflow/core/kernels/training_ops_gpu.cu.cc
index f6acdf2422..614a7e15de 100644
--- a/tensorflow/core/kernels/training_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/training_ops_gpu.cu.cc
@@ -130,6 +130,81 @@ struct ApplyAdam<GPUDevice, T> {
   }
 };
 
+
+
+
+template <typename T>
+struct ApplyRadam<GPUDevice, T> {
+  void operator()(const GPUDevice& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
+                  typename TTypes<T>::ConstScalar beta1_power,
+                  typename TTypes<T>::ConstScalar beta2_power,
+                  typename TTypes<T>::ConstScalar lr,
+                  typename TTypes<T>::ConstScalar beta1,
+                  typename TTypes<T>::ConstScalar beta2,
+                  typename TTypes<T>::ConstScalar epsilon,
+                  typename TTypes<T>::ConstScalar gamma,
+                  typename TTypes<T>::ConstFlat grad) {
+    Eigen::array<typename TTypes<T>::Tensor::Index, 1> bcast;
+    bcast[0] = grad.dimension(0);
+    Eigen::Sizes<1> single;
+    const auto one = static_cast<T>(1.0);
+    m.device(d) =
+        m +
+        (beta1.constant(one) - beta1).reshape(single).broadcast(bcast) *
+            (grad - m);
+    v.device(d) =
+        v +
+        (beta2.constant(one) - beta2).reshape(single).broadcast(bcast) *
+            (grad.square() - v);
+    var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
+                      (beta1_power.constant(one) - beta1_power))
+                         .reshape(single)
+                         .broadcast(bcast) *
+                     ((gamma.constant(one) - gamma).reshape(single).broadcast(bcast) * m +
+                     (gamma).reshape(single).broadcast(bcast) * grad) /
+                     (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
+
+  }
+};
+
+
+template <typename T>
+struct ApplyNadam<GPUDevice, T> {
+  void operator()(const GPUDevice& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
+                  typename TTypes<T>::ConstScalar beta1_power,
+                  typename TTypes<T>::ConstScalar beta2_power,
+                  typename TTypes<T>::ConstScalar lr,
+                  typename TTypes<T>::ConstScalar beta1,
+                  typename TTypes<T>::ConstScalar beta2,
+                  typename TTypes<T>::ConstScalar epsilon,
+                  typename TTypes<T>::ConstFlat grad) {
+    Eigen::array<typename TTypes<T>::Tensor::Index, 1> bcast;
+    bcast[0] = grad.dimension(0);
+    Eigen::Sizes<1> single;
+    const auto one = static_cast<T>(1.0);
+    m.device(d) =
+        m +
+        (beta1.constant(one) - beta1).reshape(single).broadcast(bcast) *
+            (grad - m * ((beta2_power.constant(one) - beta2_power*beta2).sqrt()
+             / (beta1_power.constant(one) - beta1_power*beta1)) /
+              ((beta2_power.constant(one) - beta2_power).sqrt() /
+               (beta1_power.constant(one) - beta1_power)));
+    v.device(d) =
+        v +
+        (beta2.constant(one) - beta2).reshape(single).broadcast(bcast) *
+            (grad.square() - v);
+    var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
+                      (beta1_power.constant(one) - beta1_power))
+                         .reshape(single)
+                         .broadcast(bcast) *
+                     m / (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
+  }
+};
+
+
+
 template <typename T>
 struct ApplyRMSProp<GPUDevice, T> {
   void operator()(const GPUDevice& d, typename TTypes<T>::Flat var,
@@ -201,6 +276,14 @@ template struct functor::ApplyAdam<GPUDevice, Eigen::half>;
 template struct functor::ApplyAdam<GPUDevice, float>;
 template struct functor::ApplyAdam<GPUDevice, double>;
 
+template struct functor::ApplyRadam<GPUDevice, Eigen::half>;
+template struct functor::ApplyRadam<GPUDevice, float>;
+template struct functor::ApplyRadam<GPUDevice, double>;
+
+template struct functor::ApplyNadam<GPUDevice, Eigen::half>;
+template struct functor::ApplyNadam<GPUDevice, float>;
+template struct functor::ApplyNadam<GPUDevice, double>;
+
 template struct functor::ApplyRMSProp<GPUDevice, Eigen::half>;
 template struct functor::ApplyRMSProp<GPUDevice, float>;
 template struct functor::ApplyRMSProp<GPUDevice, double>;
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 2027bf4603..5fa80b2349 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -1619,4 +1619,233 @@ use_locking: If `True`, updating of the var, mg, ms, and mom tensors is
   contention.
 )doc");
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+static Status ApplyRadamShapeFn(InferenceContext* c, bool sparse) {
+  ShapeHandle unused;
+  ShapeHandle s = ShapeOrHandleShape(c, 0);                       // var
+  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 1), &s));  // m
+  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 2), &s));  // v
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(3), 0, &unused));  // beta1_power
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(4), 0, &unused));  // beta2_power
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(5), 0, &unused));  // lr
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(6), 0, &unused));  // beta1
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(7), 0, &unused));  // beta2
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(8), 0, &unused));  // epsilon
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(9), 0, &unused));  // gamma
+  TF_RETURN_IF_ERROR(
+      HandleGradAndIndicesInputs(c, sparse, 10 /* grad_idx */, &s));
+  if (c->num_outputs() > 0) {
+    c->set_output(0, s);
+  }
+  return Status::OK();
+}
+
+REGISTER_OP("ApplyRadam")
+    .Input("var: Ref(T)")
+    .Input("m: Ref(T)")
+    .Input("v: Ref(T)")
+    .Input("beta1_power: T")
+    .Input("beta2_power: T")
+    .Input("lr: T")
+    .Input("beta1: T")
+    .Input("beta2: T")
+    .Input("epsilon: T")
+    .Input("gamma: T")
+    .Input("grad: T")
+    .Output("out: Ref(T)")
+    .Attr("T: numbertype")
+    .Attr("use_locking: bool = false")
+    .SetShapeFn([](InferenceContext* c) {
+      return ApplyRadamShapeFn(c, false /* sparse */);
+    })
+    .Doc(R"doc(
+Update '*var' according to the Adam algorithm.
+
+lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
+m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
+v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
+variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
+
+var: Should be from a Variable().
+m: Should be from a Variable().
+v: Should be from a Variable().
+beta1_power: Must be a scalar.
+beta2_power: Must be a scalar.
+lr: Scaling factor. Must be a scalar.
+beta1: Momentum factor. Must be a scalar.
+beta2: Momentum factor. Must be a scalar.
+epsilon: Ridge term. Must be a scalar.
+grad: The gradient.
+out: Same as "var".
+use_locking: If `True`, updating of the var, m, and v tensors will be protected
+  by a lock; otherwise the behavior is undefined, but may exhibit less
+  contention.
+)doc");
+
+REGISTER_OP("ResourceApplyRadam")
+    .Input("var: resource")
+    .Input("m: resource")
+    .Input("v: resource")
+    .Input("beta1_power: T")
+    .Input("beta2_power: T")
+    .Input("lr: T")
+    .Input("beta1: T")
+    .Input("beta2: T")
+    .Input("epsilon: T")
+    .Input("gamma: T")
+    .Input("grad: T")
+    .Attr("T: numbertype")
+    .Attr("use_locking: bool = false")
+    .SetShapeFn([](InferenceContext* c) {
+      return ApplyRadamShapeFn(c, false /* sparse */);
+    })
+    .Doc(R"doc(
+Update '*var' according to the Radam algorithm.
+
+lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
+m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
+v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
+variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
+
+var: Should be from a Variable().
+m: Should be from a Variable().
+v: Should be from a Variable().
+beta1_power: Must be a scalar.
+beta2_power: Must be a scalar.
+lr: Scaling factor. Must be a scalar.
+beta1: Momentum factor. Must be a scalar.
+beta2: Momentum factor. Must be a scalar.
+epsilon: Ridge term. Must be a scalar.
+grad: The gradient.
+use_locking: If `True`, updating of the var, m, and v tensors will be protected
+  by a lock; otherwise the behavior is undefined, but may exhibit less
+  contention.
+)doc");
+
+
+
+
+
+
+
+
+
+
+static Status ApplyNadamShapeFn(InferenceContext* c, bool sparse) {
+  ShapeHandle unused;
+  ShapeHandle s = ShapeOrHandleShape(c, 0);                       // var
+  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 1), &s));  // m
+  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 2), &s));  // v
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(3), 0, &unused));  // beta1_power
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(4), 0, &unused));  // beta2_power
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(5), 0, &unused));  // lr
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(6), 0, &unused));  // beta1
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(7), 0, &unused));  // beta2
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(8), 0, &unused));  // epsilon
+  TF_RETURN_IF_ERROR(
+      HandleGradAndIndicesInputs(c, sparse, 9 /* grad_idx */, &s));
+  if (c->num_outputs() > 0) {
+    c->set_output(0, s);
+  }
+  return Status::OK();
+}
+
+REGISTER_OP("ApplyNadam")
+    .Input("var: Ref(T)")
+    .Input("m: Ref(T)")
+    .Input("v: Ref(T)")
+    .Input("beta1_power: T")
+    .Input("beta2_power: T")
+    .Input("lr: T")
+    .Input("beta1: T")
+    .Input("beta2: T")
+    .Input("epsilon: T")
+    .Input("grad: T")
+    .Output("out: Ref(T)")
+    .Attr("T: numbertype")
+    .Attr("use_locking: bool = false")
+    .SetShapeFn([](InferenceContext* c) {
+      return ApplyNadamShapeFn(c, false /* sparse */);
+    })
+    .Doc(R"doc(
+Update '*var' according to the Adam algorithm.
+
+lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
+m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
+v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
+variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
+
+var: Should be from a Variable().
+m: Should be from a Variable().
+v: Should be from a Variable().
+beta1_power: Must be a scalar.
+beta2_power: Must be a scalar.
+lr: Scaling factor. Must be a scalar.
+beta1: Momentum factor. Must be a scalar.
+beta2: Momentum factor. Must be a scalar.
+epsilon: Ridge term. Must be a scalar.
+grad: The gradient.
+out: Same as "var".
+use_locking: If `True`, updating of the var, m, and v tensors will be protected
+  by a lock; otherwise the behavior is undefined, but may exhibit less
+  contention.
+)doc");
+
+REGISTER_OP("ResourceApplyNadam")
+    .Input("var: resource")
+    .Input("m: resource")
+    .Input("v: resource")
+    .Input("beta1_power: T")
+    .Input("beta2_power: T")
+    .Input("lr: T")
+    .Input("beta1: T")
+    .Input("beta2: T")
+    .Input("epsilon: T")
+    .Input("grad: T")
+    .Attr("T: numbertype")
+    .Attr("use_locking: bool = false")
+    .SetShapeFn([](InferenceContext* c) {
+      return ApplyNadamShapeFn(c, false /* sparse */);
+    })
+    .Doc(R"doc(
+Update '*var' according to the Adam algorithm.
+
+lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
+m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
+v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
+variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
+
+var: Should be from a Variable().
+m: Should be from a Variable().
+v: Should be from a Variable().
+beta1_power: Must be a scalar.
+beta2_power: Must be a scalar.
+lr: Scaling factor. Must be a scalar.
+beta1: Momentum factor. Must be a scalar.
+beta2: Momentum factor. Must be a scalar.
+epsilon: Ridge term. Must be a scalar.
+grad: The gradient.
+use_locking: If `True`, updating of the var, m, and v tensors will be protected
+  by a lock; otherwise the behavior is undefined, but may exhibit less
+  contention.
+)doc");
+
+
+
+
+
 }  // namespace tensorflow
diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index e611b0c0ec..ea145b659a 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -210,3 +210,158 @@ class AdamOptimizer(optimizer.Optimizer):
             use_locking=self._use_locking)
     return control_flow_ops.group(*update_ops + [update_beta1, update_beta2],
                                   name=name_scope)
+
+
+
+
+class NadamOptimizer(AdamOptimizer):
+
+  """Nadam and Radam optimizer extensions both feather Nesterov momentum
+  (or a Nesterov-like interpolation factor) into Adam calculations.
+
+  Both algorithms tend to be more stable than Adam with negligiable added 
+  calculation (even though Nadam looks extravagent).
+
+  Nadam's added Nesterov momentum term typically provides a 1-2% shift in momentum
+  during the initial optimization steps. This is when optimizers are most prone 
+  to develop instablity though so this can be quite important. This momentum 
+  correction term is both theoretically known to reduce regret bounds as well as
+  improve performance and stability in practice.
+
+  [Dozat 2015]  "Incorporating Nesterov momentum into Adam",
+  Stanford University, CS 229 Machine Learning, Tech. Rep.,
+  2015. http://cs229.stanford.edu/proj2015/054_report.pdf
+
+  Adapted from https://github.com/tdozat/Optimization/blob/master/tensorflow/
+
+  """
+  def __init__(self, learning_rate=0.0002, beta1=0.825, beta2=0.99685, epsilon=1e-8,
+               use_locking=False, name="Nadam"):
+
+    super(NadamOptimizer, self).__init__(use_locking, name)
+    self._lr = learning_rate
+    self._beta1 = beta1
+    self._beta2 = beta2
+    self._epsilon = epsilon
+
+    # Tensor versions of the constructor arguments, created in _prepare().
+    self._lr_t = None
+    self._beta1_t = None
+    self._beta2_t = None
+    self._epsilon_t = None
+
+    # Variables to accumulate the powers of the beta parameters.
+    # Created in _create_slots when we know the variables to optimize.
+    self._beta1_power = None
+    self._beta2_power = None
+
+    # Created in SparseApply if needed.
+    self._updated_lr = None
+
+
+  def _apply_dense(self, grad, var):
+    m = self.get_slot(var, "m")
+    v = self.get_slot(var, "v")
+    return training_ops.apply_nadam(
+        var, m, v,
+        math_ops.cast(self._beta1_power, var.dtype.base_dtype),
+        math_ops.cast(self._beta2_power, var.dtype.base_dtype),
+        math_ops.cast(self._lr_t, var.dtype.base_dtype),
+        math_ops.cast(self._beta1_t, var.dtype.base_dtype),
+        math_ops.cast(self._beta2_t, var.dtype.base_dtype),
+        math_ops.cast(self._epsilon_t, var.dtype.base_dtype),
+        grad, use_locking=self._use_locking).op
+
+  def _resource_apply_dense(self, grad, var):
+    m = self.get_slot(var, "m")
+    v = self.get_slot(var, "v")
+    return training_ops.resource_apply_nadam(
+        var, m.handle, v.handle,
+        math_ops.cast(self._beta1_power, grad.dtype.base_dtype),
+        math_ops.cast(self._beta2_power, grad.dtype.base_dtype),
+        math_ops.cast(self._lr_t, grad.dtype.base_dtype),
+        math_ops.cast(self._beta1_t, grad.dtype.base_dtype),
+        math_ops.cast(self._beta2_t, grad.dtype.base_dtype),
+        math_ops.cast(self._epsilon_t, grad.dtype.base_dtype),
+        grad, use_locking=self._use_locking)
+
+  def _apply_sparse(self, grad, var):
+    beta1_power = math_ops.cast(self._beta1_power, var.dtype.base_dtype)
+    beta2_power = math_ops.cast(self._beta2_power, var.dtype.base_dtype)
+    lr_t = math_ops.cast(self._lr_t, var.dtype.base_dtype)
+    beta1_t = math_ops.cast(self._beta1_t, var.dtype.base_dtype)
+    beta2_t = math_ops.cast(self._beta2_t, var.dtype.base_dtype)
+    epsilon_t = math_ops.cast(self._epsilon_t, var.dtype.base_dtype)
+    tp = math_ops.sqrt(1 - beta2_power) / (1 - beta1_power)
+    tp1 = math_ops.sqrt(1 - beta2_power*beta2_t) / (1 - beta1_power*beta1_t)
+
+    # m_t = beta1 * m + (1 - beta1) * g_t
+    m = self.get_slot(var, "m")
+    m_t = state_ops.scatter_update(m, grad.indices,
+                                   beta1_t * array_ops.gather(m, grad.indices) +
+                                   (tp1 / tp) * (1 - beta1_t) * grad.values,
+                                   use_locking=self._use_locking)
+
+    # v_t = beta2 * v + (1 - beta2) * (g_t * g_t)
+    v = self.get_slot(var, "v")
+    v_t = state_ops.scatter_update(v, grad.indices,
+                                   beta2_t * array_ops.gather(v, grad.indices) +
+                                   (1 - beta2_t) * math_ops.square(grad.values),
+                                   use_locking=self._use_locking)
+
+    # variable -= learning_rate * m_t / (epsilon_t + sqrt(v_t))
+    m_t_slice = array_ops.gather(m_t, grad.indices)
+    v_t_slice = array_ops.gather(v_t, grad.indices)
+    denominator_slice = math_ops.sqrt(v_t_slice) + epsilon_t
+    var_update = state_ops.scatter_sub(var, grad.indices,
+                                       lr_t * tp * m_t_slice / denominator_slice,
+                                       use_locking=self._use_locking)
+    return control_flow_ops.group(var_update, m_t, v_t)
+
+
+
+
+class RadamOptimizer(AdamOptimizer):
+
+  """
+  Radam is a proposed mathematical simplification of the more theoretically sound
+  but complex Nadam algorithm. This proposal comes from additional, more informal
+  work by Dozat (to extend his results on Nadam):
+
+  Details of Radam extension - https://github.com/tdozat/Optimization
+
+  [Dozat 2015]  "Incorporating Nesterov momentum into Adam",
+  Stanford University, CS 229 Machine Learning, Tech. Rep.,
+  2015. http://cs229.stanford.edu/proj2015/054_report.pdf
+
+  Interestingly, Radam turns out to be isomorphic to an Adam optimizer initialized
+  with lower beta1 and a slightly higher learning rate.
+
+  However, Radam's gamma hyperparameter is a more straightforward way for those
+  who have a good learning rate for an Adam optimizer to incorporate a Nesterov-like
+  momentum adjustment, than attempting to tune beta1 (or beta1+lr) by hand.
+
+  """
+
+  def __init__(self, learning_rate=0.001, beta1=0.9, beta2=0.999, epsilon=1e-8,
+               gamma=0.05, use_locking=False, name="Radam"):
+
+    super(RadamOptimizer, self).__init__(use_locking, name)
+    self._beta1 = beta1 - gamma
+    self._lr = learning_rate * (self._beta1 / beta1)
+    self._beta2 = beta2
+    self._epsilon = epsilon
+
+    # Tensor versions of the constructor arguments, created in _prepare().
+    self._lr_t = None
+    self._beta1_t = None
+    self._beta2_t = None
+    self._epsilon_t = None
+
+    # Variables to accumulate the powers of the beta parameters.
+    # Created in _create_slots when we know the variables to optimize.
+    self._beta1_power = None
+    self._beta2_power = None
+
+    # Created in SparseApply if needed.
+    self._updated_lr = None
diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index f2bcc56175..67b5d9d712 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -24,6 +24,8 @@ See the @{$python/train} guide.
 @@AdagradDAOptimizer
 @@MomentumOptimizer
 @@AdamOptimizer
+@@NadamOptimizer
+@@RadamOptimizer
 @@FtrlOptimizer
 @@ProximalGradientDescentOptimizer
 @@ProximalAdagradOptimizer
@@ -104,6 +106,8 @@ from tensorflow.python.training.adagrad import AdagradOptimizer
 from tensorflow.python.training.adagrad_da import AdagradDAOptimizer
 from tensorflow.python.training.proximal_adagrad import ProximalAdagradOptimizer
 from tensorflow.python.training.adam import AdamOptimizer
+from tensorflow.python.training.adam import NadamOptimizer
+from tensorflow.python.training.adam import RadamOptimizer
 from tensorflow.python.training.ftrl import FtrlOptimizer
 from tensorflow.python.training.momentum import MomentumOptimizer
 from tensorflow.python.training.moving_averages import ExponentialMovingAverage
-- 
GitLab


From 59b3423ee2f7fafd59d9ee4ff2efe8f4d5441485 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Wed, 12 Apr 2017 11:48:26 -0800
Subject: [PATCH 0355/1563] Add an error message when queue runner threads
 return errors. Change: 152974181

---
 tensorflow/cc/training/queue_runner.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/cc/training/queue_runner.cc b/tensorflow/cc/training/queue_runner.cc
index 6b61591681..51eba5d8a1 100644
--- a/tensorflow/cc/training/queue_runner.cc
+++ b/tensorflow/cc/training/queue_runner.cc
@@ -186,6 +186,8 @@ void QueueRunner::Run(Session* sess, const string& enqueue_op) {
       UpdateStatus(RealRun(sess, close_op_name_));
     }
   } else if (!status.ok()) {
+    LOG(ERROR) << "Queue runner thread got a failure status: "
+               << status.ToString();
     UpdateStatus(status);
     if (coord_) {
       coord_->RequestStop().IgnoreError();
-- 
GitLab


From 7c3ad6569611aac36fd2527030bf98fb8756919f Mon Sep 17 00:00:00 2001
From: Jay Young <github@yjmade.net>
Date: Thu, 13 Apr 2017 04:28:11 +0800
Subject: [PATCH 0356/1563] fix missing Gather.png in tf.gather document
 (#9163)

---
 tensorflow/core/ops/array_ops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index bd832bea84..11df3c43c7 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1332,7 +1332,7 @@ out-of-bound indices result in safe but unspecified behavior, which may include
 raising an error.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/Gather.png" alt>
+<img style="width:100%" src="../../../images/Gather.png" alt>
 </div>
 )doc");
 
-- 
GitLab


From f2f9cdcadd3ba96c75ea7da4ef67de2a54e373cf Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Wed, 12 Apr 2017 13:09:54 -0800
Subject: [PATCH 0357/1563] Enable tf.equal and tf.not_equal GPU kernels for
 complex types. Change: 152984852

---
 .../core/kernels/cwise_op_equal_to_2.cc       |  3 +-
 .../core/kernels/cwise_op_not_equal_to_2.cc   |  4 +-
 .../python/kernel_tests/cwise_ops_test.py     | 85 +++++++++----------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/tensorflow/core/kernels/cwise_op_equal_to_2.cc b/tensorflow/core/kernels/cwise_op_equal_to_2.cc
index e7f4d3c07e..57e19c7202 100644
--- a/tensorflow/core/kernels/cwise_op_equal_to_2.cc
+++ b/tensorflow/core/kernels/cwise_op_equal_to_2.cc
@@ -25,7 +25,8 @@ namespace tensorflow {
 REGISTER6(BinaryOp, CPU, "Equal", functor::equal_to, int32, int64, complex64,
           complex128, string, bool);
 #if GOOGLE_CUDA
-REGISTER4(BinaryOp, GPU, "Equal", functor::equal_to, int8, int16, int64, bool);
+REGISTER6(BinaryOp, GPU, "Equal", functor::equal_to, int8, int16, int64,
+          complex64, complex128, bool);
 #endif  // GOOGLE_CUDA
 
 #endif  // !defined(__ANDROID_TYPES_SLIM__)
diff --git a/tensorflow/core/kernels/cwise_op_not_equal_to_2.cc b/tensorflow/core/kernels/cwise_op_not_equal_to_2.cc
index 59424d7a28..7d4ecec59f 100644
--- a/tensorflow/core/kernels/cwise_op_not_equal_to_2.cc
+++ b/tensorflow/core/kernels/cwise_op_not_equal_to_2.cc
@@ -25,8 +25,8 @@ namespace tensorflow {
 REGISTER6(BinaryOp, CPU, "NotEqual", functor::not_equal_to, int32, int64,
           complex64, complex128, string, bool);
 #if GOOGLE_CUDA
-REGISTER4(BinaryOp, GPU, "NotEqual", functor::not_equal_to, int8, int16, int64,
-          bool);
+REGISTER6(BinaryOp, GPU, "NotEqual", functor::not_equal_to, int8, int16, int64,
+          complex64, complex128, bool);
 
 #endif  // GOOGLE_CUDA
 
diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py
index fbcf13d21d..9cd42d8851 100644
--- a/tensorflow/python/kernel_tests/cwise_ops_test.py
+++ b/tensorflow/python/kernel_tests/cwise_ops_test.py
@@ -1088,8 +1088,8 @@ class BinaryOpTest(test.TestCase):
 
 class ComparisonOpTest(test.TestCase):
 
-  def _compare(self, func, x, y, dtype):
-    with self.test_session(use_gpu=False):
+  def _compareScalar(self, func, x, y, dtype):
+    with self.test_session(use_gpu=True):
       out = func(
           ops.convert_to_tensor(np.array([x]).astype(dtype)),
           ops.convert_to_tensor(np.array([y]).astype(dtype)))
@@ -1102,38 +1102,30 @@ class ComparisonOpTest(test.TestCase):
     for t in dtypes:
       for x in data:
         for y in data:
-          self.assertEqual(self._compare(math_ops.less, x, y, t), x < y)
-          self.assertEqual(self._compare(math_ops.less_equal, x, y, t), x <= y)
-          self.assertEqual(self._compare(math_ops.greater, x, y, t), x > y)
+          self.assertEqual(self._compareScalar(math_ops.less, x, y, t), x < y)
+          self.assertEqual(self._compareScalar(math_ops.less_equal, x, y, t),
+                           x <= y)
+          self.assertEqual(self._compareScalar(math_ops.greater, x, y, t),
+                           x > y)
           self.assertEqual(
-              self._compare(math_ops.greater_equal, x, y, t), x >= y)
-          self.assertEqual(self._compare(math_ops.equal, x, y, t), x == y)
-          self.assertEqual(self._compare(math_ops.not_equal, x, y, t), x != y)
+              self._compareScalar(math_ops.greater_equal, x, y, t), x >= y)
+          self.assertEqual(self._compareScalar(math_ops.equal, x, y, t), x == y)
+          self.assertEqual(self._compareScalar(math_ops.not_equal, x, y, t),
+                           x != y)
     data = [-1, 0, 1, -1j, 1j, 1 + 1j, 1 - 1j]
     for t in [np.complex64, np.complex128]:
       for x in data:
         for y in data:
-          self.assertEqual(self._compare(math_ops.equal, x, y, t), x == y)
-          self.assertEqual(self._compare(math_ops.not_equal, x, y, t), x != y)
-
-  def _compareCpu(self, x, y, np_func, tf_func):
-    np_ans = np_func(x, y)
-    with self.test_session(use_gpu=False):
-      out = tf_func(ops.convert_to_tensor(x), ops.convert_to_tensor(y))
-      tf_cpu = out.eval()
-    self.assertAllEqual(np_ans, tf_cpu)
+          self.assertEqual(self._compareScalar(math_ops.equal, x, y, t), x == y)
+          self.assertEqual(self._compareScalar(math_ops.not_equal, x, y, t),
+                           x != y)
 
-  def _compareGpu(self, x, y, np_func, tf_func):
+  def _compare(self, x, y, np_func, tf_func):
     np_ans = np_func(x, y)
     with self.test_session(use_gpu=True):
       out = tf_func(ops.convert_to_tensor(x), ops.convert_to_tensor(y))
-      tf_gpu = out.eval()
-    self.assertAllEqual(np_ans, tf_gpu)
-
-  def _compareBoth(self, x, y, np_func, tf_func):
-    self._compareCpu(x, y, np_func, tf_func)
-    if x.dtype == np.float16 or x.dtype == np.float32 or x.dtype == np.float64:
-      self._compareGpu(x, y, np_func, tf_func)
+      tf_ans = out.eval()
+    self.assertAllEqual(np_ans, tf_ans)
 
   def testTensorCompareTensor(self):
     x = np.linspace(-15, 15, 6).reshape(1, 3, 2)
@@ -1141,28 +1133,31 @@ class ComparisonOpTest(test.TestCase):
     for t in [np.float16, np.float32, np.float64, np.int32, np.int64]:
       xt = x.astype(t)
       yt = y.astype(t)
-      self._compareBoth(xt, yt, np.less, math_ops.less)
-      self._compareBoth(xt, yt, np.less_equal, math_ops.less_equal)
-      self._compareBoth(xt, yt, np.greater, math_ops.greater)
-      self._compareBoth(xt, yt, np.greater_equal, math_ops.greater_equal)
-      self._compareBoth(xt, yt, np.equal, math_ops.equal)
-      self._compareBoth(xt, yt, np.not_equal, math_ops.not_equal)
-    # TODO(zhifengc): complex64 doesn't work on GPU yet.
+      self._compare(xt, yt, np.less, math_ops.less)
+      self._compare(xt, yt, np.less_equal, math_ops.less_equal)
+      self._compare(xt, yt, np.greater, math_ops.greater)
+      self._compare(xt, yt, np.greater_equal, math_ops.greater_equal)
+      self._compare(xt, yt, np.equal, math_ops.equal)
+      self._compare(xt, yt, np.not_equal, math_ops.not_equal)
+    # Complex types do not support ordering but do support equality tests.
     for t in [np.complex64, np.complex128]:
-      self._compareCpu(x.astype(t), y.astype(t), np.equal, math_ops.equal)
-      self._compareCpu(
-          x.astype(t), y.astype(t), np.not_equal, math_ops.not_equal)
+      xt = x.astype(t)
+      xt -= 1j * xt
+      yt = y.astype(t)
+      yt -= 1j * yt
+      self._compare(xt, yt, np.equal, math_ops.equal)
+      self._compare(xt, yt, np.not_equal, math_ops.not_equal)
 
   def _compareBCast(self, xs, ys, dtype, np_func, tf_func):
     x = np.linspace(-15, 15, np.prod(xs)).astype(dtype).reshape(xs)
     y = np.linspace(20, -10, np.prod(ys)).astype(dtype).reshape(ys)
-    self._compareCpu(x, y, np_func, tf_func)
-    self._compareCpu(y, x, np_func, tf_func)
-    if x.dtype == np.float16 or x.dtype == np.float32 or x.dtype == np.float64:
-      self._compareGpu(x, y, np_func, tf_func)
-      self._compareGpu(y, x, np_func, tf_func)
+    if dtype in (np.complex64, np.complex128):
+      x -= 1j * x
+      y -= 1j * y
+    self._compare(x, y, np_func, tf_func)
+    self._compare(y, x, np_func, tf_func)
 
-  def _testBCastByFunc(self, np_func, tf_func):
+  def _testBCastByFunc(self, np_func, tf_func, include_complex=False):
     shapes = [
         ([1, 3, 2], [1]),
         ([1, 3, 2], [2]),
@@ -1183,6 +1178,9 @@ class ComparisonOpTest(test.TestCase):
         np.int32,
         np.int64,
     ]
+    if include_complex:
+      dtypes.extend([np.complex64, np.complex128])
+
     for (xs, ys) in shapes:
       for dtype in dtypes:
         self._compareBCast(xs, ys, dtype, np_func, tf_func)
@@ -1200,10 +1198,11 @@ class ComparisonOpTest(test.TestCase):
     self._testBCastByFunc(np.greater_equal, math_ops.greater_equal)
 
   def testBCastEqual(self):
-    self._testBCastByFunc(np.equal, math_ops.equal)
+    self._testBCastByFunc(np.equal, math_ops.equal, include_complex=True)
 
   def testBCastNotEqual(self):
-    self._testBCastByFunc(np.not_equal, math_ops.not_equal)
+    self._testBCastByFunc(np.not_equal, math_ops.not_equal,
+                          include_complex=True)
 
   def testShapeMismatch(self):
     dtypes = [np.float16, np.float32, np.float64, np.int32, np.int64]
-- 
GitLab


From 4714207c80e79a3d3e23fa3976c30fdd610ec326 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 13:19:56 -0800
Subject: [PATCH 0358/1563] Optimization.

The original code had a O(n^2) run time. This became a problem when dealing
with graphs of 100-1000+ nodes.

The new code has a run time of O(n).
Change: 152986359
---
 tensorflow/contrib/graph_editor/util.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/graph_editor/util.py b/tensorflow/contrib/graph_editor/util.py
index 01c31ffc18..ec32beda5a 100644
--- a/tensorflow/contrib/graph_editor/util.py
+++ b/tensorflow/contrib/graph_editor/util.py
@@ -39,10 +39,21 @@ __all__ = [
 
 
 def concatenate_unique(la, lb):
-  """Add all the elements of lb in la if they are not there already."""
+  """Add all the elements of `lb` to `la` if they are not there already.
+
+  The elements added to `la` maintain ordering with respect to `lb`.
+
+  Args:
+    la: List of Python objects.
+    lb: List of Python objects.
+  Returns:
+    `la`: The list `la` with missing elements from `lb`.
+  """
+  la_set = set(la)
   for l in lb:
-    if l not in la:
+    if l not in la_set:
       la.append(l)
+      la_set.add(l)
   return la
 
 
-- 
GitLab


From 1926b9d3b91375f5a4433303a27b49b4da53f64e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 13:48:09 -0800
Subject: [PATCH 0359/1563] Documentation fix for Adam's "epsilon" parameter.

Fixes #9047.
Change: 152990185
---
 tensorflow/python/training/adam.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index e611b0c0ec..592a9e8585 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -61,7 +61,10 @@ class AdamOptimizer(optimizer.Optimizer):
 
     The default value of 1e-8 for epsilon might not be a good default in
     general. For example, when training an Inception network on ImageNet a
-    current good choice is 1.0 or 0.1.
+    current good choice is 1.0 or 0.1. Note that since AdamOptimizer uses the
+    formulation just before Section 2.1 of the Kingma and Ba paper rather than
+    the formulation in Algorithm 1, the "epsilon" referred to here is "epsilon
+    hat" in the paper.
 
     The sparse implementation of this algorithm (used when the gradient is an
     IndexedSlices object, typically because of `tf.gather` or an embedding
@@ -78,7 +81,9 @@ class AdamOptimizer(optimizer.Optimizer):
         The exponential decay rate for the 1st moment estimates.
       beta2: A float value or a constant float tensor.
         The exponential decay rate for the 2nd moment estimates.
-      epsilon: A small constant for numerical stability.
+      epsilon: A small constant for numerical stability. This epsilon is
+        "epsilon hat" in the Kingma and Ba paper (in the formula just before
+        Section 2.1), not the epsilon in Algorithm 1 of the paper.
       use_locking: If True use locks for update operations.
       name: Optional name for the operations created when applying gradients.
         Defaults to "Adam".
-- 
GitLab


From b35b82ad64bdd1599e1a33e22e1b374d0b24daf8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 13:48:37 -0800
Subject: [PATCH 0360/1563] Vulcanize TensorBoard

This vulcanized version contains features such as the text dashboard.
Change: 152990262
---
 .../tensorboard/dist/tf-tensorboard.html      | 2319 ++++++++++++-----
 1 file changed, 1635 insertions(+), 684 deletions(-)

diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 7922c69793..10721e41e9 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -19,6 +19,21 @@ Instead, use `gulp regenerate` to create a new version with your changes.
 
 <html><head><!--
 @license
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--><!--
+@license
 Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,7 +81,7 @@ var TF;
         // The names of TensorBoard tabs.
         Globals.TABS = [
             'scalars', 'images', 'audio', 'graphs', 'distributions', 'histograms',
-            'embeddings'
+            'embeddings', 'text'
         ];
         // If true, TensorBoard stores its hash in the URI state.
         // If false, tab switching in TensorBoard will not update location hash,
@@ -318,11 +333,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var TF;
 (function (TF) {
     var Backend;
@@ -616,6 +636,8 @@ var TF;
                 audio: standardRoute('audio'),
                 runMetadata: standardRoute('run_metadata', '.pbtxt'),
                 healthPills: function () { return dataDir + '/plugin/debugger/health_pills'; },
+                textRuns: function () { return dataDir + '/plugin/text/runs' + (demoMode ? '.json' : ''); },
+                text: standardRoute('plugin/text/text'),
             };
         }
         Backend.router = router;
@@ -644,7 +666,7 @@ var TF;
         ;
         Backend_1.TYPES = [
             'scalar', 'histogram', 'compressedHistogram', 'graph', 'image', 'audio',
-            'runMetadata'
+            'runMetadata', 'text'
         ];
         /**
          * The Backend class provides a convenient and typed interface to the backend.
@@ -721,6 +743,23 @@ var TF;
             Backend.prototype.runMetadataRuns = function () {
                 return this.runs().then(function (x) { return _.mapValues(x, 'run_metadata'); });
             };
+            /**
+             * Returns a promise showing the Run-to-Tag mapping for text data.
+             */
+            Backend.prototype.textRuns = function () {
+                return this.requestManager.request(this.router.textRuns());
+            };
+            /**
+             * Returns a promise containing TextDatums for given run and tag.
+             */
+            Backend.prototype.text = function (tag, run) {
+                var url = this.router.text(tag, run);
+                // tslint:disable-next-line:no-any it's convenient and harmless here
+                return this.requestManager.request(url).then(map(function (x) {
+                    x.wall_time = timeToDate(x.wall_time);
+                    return x;
+                }));
+            };
             /**
              * Return a promise of a graph string from the backend.
              */
@@ -740,8 +779,13 @@ var TF;
             /**
              * Returns a promise for requesting the health pills for a list of nodes.
              */
-            Backend.prototype.healthPills = function (nodeNames) {
+            Backend.prototype.healthPills = function (nodeNames, step) {
                 var postData = { 'node_names': JSON.stringify(nodeNames) };
+                if (step !== undefined) {
+                    // The user requested health pills for a specific step. This request
+                    // might be slow since the backend reads events sequentially from disk.
+                    postData['step'] = step;
+                }
                 return this.requestManager.request(this.router.healthPills(), postData);
             };
             /**
@@ -1457,10 +1501,9 @@ var TF;
             and pass the graph either via the constructor, or by calling its
             <code>add_graph()</code> method.
             You may want to check out the
-            <a href="https://www.tensorflow.org/versions/master/how_tos/graph_viz/index.html">
+            <a href="https://www.tensorflow.org/get_started/graph_viz">
               graph visualizer tutorial
-            </a>
-            .
+            </a>.
           </p>
         </template>
         <template is="dom-if" if="[[_isProjector(dataType)]]">
@@ -1476,7 +1519,7 @@ var TF;
               <li>
                 You are not saving any checkpoint. To save your model,
                 create a
-                <a href="https://www.tensorflow.org/versions/master/api_docs/python/state_ops.html#Saver">
+                <a href="https://www.tensorflow.org/api_docs/python/tf/train/Saver">
                   <code>tf.train.Saver</code>
                 </a>
                 and save your model periodically
@@ -1509,7 +1552,7 @@ var TF;
             README
           </a>
           and perhaps the
-          <a href="https://www.tensorflow.org/versions/master/how_tos/summaries_and_tensorboard/index.html">
+          <a href="https://www.tensorflow.org/get_started/summaries_and_tensorboard">
             TensorBoard tutorial
           </a>.
         </p>
@@ -1559,6 +1602,49 @@ You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+var TF;
+(function (TF) {
+    var Dashboard;
+    (function (Dashboard) {
+        /**
+         * A behavior that TensorBoard dashboards must implement. This behavior serves
+         * the purpose of an interface.
+         */
+        function DashboardBehavior(dashboardName) {
+            return {
+                properties: {
+                    name: {
+                        type: String,
+                        value: dashboardName,
+                        readOnly: true,
+                    },
+                },
+                // This method is called when the dashboard reloads, either when the
+                // dashboard is first visited, periodically reloaded, or manually reloaded
+                // via the user clicking the button. Note that dashboard custom elements
+                // that use TF.Dashboard.ReloadBehavior already implement a reload method.
+                reload: function () {
+                    throw Error('The ' + dashboardName + ' dashboard does not implement reload.');
+                },
+            };
+        }
+        Dashboard.DashboardBehavior = DashboardBehavior;
+    })(Dashboard = TF.Dashboard || (TF.Dashboard = {}));
+})(TF || (TF = {}));
+</script><script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1596,6 +1682,7 @@ var TF;
 })(TF || (TF = {}));
 </script>
 
+
 <dom-module id="tf-option-selector" assetpath="../tf-dashboard-common/">
   <template>
     <div id="wrap">
@@ -1692,7 +1779,7 @@ var TF;
       :host:first-of-type {
         margin-top: 20px;
       }
-
+      
       :host:last-of-type {
         margin-bottom: 20px;
       }
@@ -2121,7 +2208,7 @@ svg.plottable {
 
 <dom-module id="tf-panes-helper" assetpath="../tf-dashboard-common/">
   <template>
-    <content></content>
+    <content></content> 
     <tf-no-data-warning data-type="[[dataType]]" show-warning="[[dataNotFound]]"></tf-no-data-warning>
 
     <template is="dom-repeat" items="[[categories]]" as="category">
@@ -2137,7 +2224,7 @@ svg.plottable {
                 </div>
                 <div class="card-content">
                   <tf-chart-scaffold tag="[[item.tag]]" data-provider="[[dataProvider]]" visible-series="[[item.runs]]" on-ready="_instantiateTemplate">
-
+                    
                   </tf-chart-scaffold>
                 </div>
                 <div class="card-bottom-row">
@@ -2160,7 +2247,7 @@ svg.plottable {
         display: flex;
         flex-direction: column;
         margin: 5px;
-        padding: 0 30px 35px 0;
+        padding: var(--card-padding, 0 30px 35px 0);
         -webkit-user-select: none;
         -moz-user-select: none;
         position: relative;
@@ -2213,6 +2300,7 @@ svg.plottable {
         padding: 4px;
         border-radius: 100%;
         pointer-events: auto;
+        display: var(--show-expand-button, block);
       }
 
       .card-expanded .expand-button {
@@ -2419,6 +2507,8 @@ limitations under the License.
  * It generates URI components like: events&runPrefix=train*
  * which TensorBoard uses after like localhost:8000/#events&runPrefix=train*
  * to store state in the URI.
+ *
+ * It also allows saving the values to localStorage for long-term persistance.
  */
 var TF;
 (function (TF) {
@@ -2447,76 +2537,79 @@ var TF;
          */
         URIStorage.DISAMBIGUATOR = 'disambiguator';
         /**
-         * Return a boolean stored in the URI, given a corresponding key.
+         * Return a string stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getBoolean(key) {
-            var items = _componentToDict(_readComponent());
-            var item = items[key];
-            return item === 'true' ? true : item === 'false' ? false : undefined;
+        function getString(key, useLocalStorage) {
+            if (useLocalStorage) {
+                return window.localStorage.getItem(key);
+            }
+            else {
+                return _componentToDict(_readComponent())[key];
+            }
         }
-        URIStorage.getBoolean = getBoolean;
+        URIStorage.getString = getString;
         /**
-         * Store a boolean in the URI, with a corresponding key.
+         * Set a string in URI or localStorage.
          */
-        function setBoolean(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = value.toString();
-            _writeComponent(_dictToComponent(items));
+        function setString(key, value, useLocalStorage) {
+            if (useLocalStorage) {
+                window.localStorage.setItem(key, value);
+            }
+            else {
+                var items = _componentToDict(_readComponent());
+                items[key] = value;
+                _writeComponent(_dictToComponent(items));
+            }
         }
-        URIStorage.setBoolean = setBoolean;
+        URIStorage.setString = setString;
         /**
-         * Return a string stored in the URI, given a corresponding key.
+         * Return a boolean stored in stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getString(key) {
-            var items = _componentToDict(_readComponent());
-            return items[key];
+        function getBoolean(key, useLocalStorage) {
+            var item = getString(key, useLocalStorage);
+            return item === 'true' ? true : item === 'false' ? false : undefined;
         }
-        URIStorage.getString = getString;
+        URIStorage.getBoolean = getBoolean;
         /**
-         * Store a string in the URI, with a corresponding key.
+         * Store a boolean in URI or localStorage.
          */
-        function setString(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = value;
-            _writeComponent(_dictToComponent(items));
+        function setBoolean(key, value, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            setString(key, value.toString(), useLocalStorage);
         }
-        URIStorage.setString = setString;
+        URIStorage.setBoolean = setBoolean;
         /**
-         * Return a number stored in the URI, given a corresponding key.
+         * Return a number stored in stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getNumber(key) {
-            var items = _componentToDict(_readComponent());
-            return items[key] === undefined ? undefined : +items[key];
+        function getNumber(key, useLocalStorage) {
+            var item = getString(key, useLocalStorage);
+            return item === undefined ? undefined : +item;
         }
         URIStorage.getNumber = getNumber;
         /**
-         * Store a number in the URI, with a corresponding key.
+         * Store a number in URI or localStorage.
          */
-        function setNumber(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = '' + value;
-            _writeComponent(_dictToComponent(items));
+        function setNumber(key, value, useLocalStorage) {
+            setString(key, '' + value, useLocalStorage);
         }
         URIStorage.setNumber = setNumber;
         /**
-         * Return an object stored in the URI, given a corresponding key.
+         * Return an object stored in stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getObject(key) {
-            var items = _componentToDict(_readComponent());
-            return items[key] === undefined ? undefined : JSON.parse(atob(items[key]));
+        function getObject(key, useLocalStorage) {
+            var item = getString(key, useLocalStorage);
+            return item === undefined ? undefined : JSON.parse(atob(item));
         }
         URIStorage.getObject = getObject;
         /**
-         * Store an object in the URI, with a corresponding key.
+         * Store an object in URI or localStorage.
          */
-        function setObject(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = btoa(JSON.stringify(value));
-            _writeComponent(_dictToComponent(items));
+        function setObject(key, value, useLocalStorage) {
+            setString(key, btoa(JSON.stringify(value)), useLocalStorage);
         }
         URIStorage.setObject = setObject;
         /**
@@ -2537,8 +2630,9 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function getBooleanInitializer(propertyName, defaultVal) {
-            return _getInitializer(getBoolean, propertyName, defaultVal);
+        function getBooleanInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getBoolean, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getBooleanInitializer = getBooleanInitializer;
         /**
@@ -2547,8 +2641,9 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function getStringInitializer(propertyName, defaultVal) {
-            return _getInitializer(getString, propertyName, defaultVal);
+        function getStringInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getString, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getStringInitializer = getStringInitializer;
         /**
@@ -2557,8 +2652,9 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function getNumberInitializer(propertyName, defaultVal) {
-            return _getInitializer(getNumber, propertyName, defaultVal);
+        function getNumberInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getNumber, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getNumberInitializer = getNumberInitializer;
         /**
@@ -2569,38 +2665,43 @@ var TF;
          *
          * Generates a deep clone of the defaultVal to avoid mutation issues.
          */
-        function getObjectInitializer(propertyName, defaultVal) {
-            return _getInitializer(getObject, propertyName, defaultVal);
+        function getObjectInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getObject, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getObjectInitializer = getObjectInitializer;
         /**
          * Return a function that updates URIStorage when a string property changes.
          */
-        function getBooleanObserver(propertyName, defaultVal) {
-            return _getObserver(getBoolean, setBoolean, propertyName, defaultVal);
+        function getBooleanObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getObserver(getBoolean, setBoolean, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getBooleanObserver = getBooleanObserver;
         /**
          * Return a function that updates URIStorage when a string property changes.
          */
-        function getStringObserver(propertyName, defaultVal) {
-            return _getObserver(getString, setString, propertyName, defaultVal);
+        function getStringObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getObserver(getString, setString, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getStringObserver = getStringObserver;
         /**
          * Return a function that updates URIStorage when a number property changes.
          */
-        function getNumberObserver(propertyName, defaultVal) {
-            return _getObserver(getNumber, setNumber, propertyName, defaultVal);
+        function getNumberObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getObserver(getNumber, setNumber, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getNumberObserver = getNumberObserver;
         /**
          * Return a function that updates URIStorage when an object property changes.
          * Generates a deep clone of the defaultVal to avoid mutation issues.
          */
-        function getObjectObserver(propertyName, defaultVal) {
+        function getObjectObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
             var clone = _.cloneDeep(defaultVal);
-            return _getObserver(getObject, setObject, propertyName, clone);
+            return _getObserver(getObject, setObject, propertyName, clone, useLocalStorage);
         }
         URIStorage.getObjectObserver = getObjectObserver;
         /**
@@ -2673,7 +2774,7 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function _getInitializer(get, propertyName, defaultVal) {
+        function _getInitializer(get, propertyName, defaultVal, useLocalStorage) {
             return function () {
                 var _this = this;
                 var URIStorageName = getURIStorageName(this, propertyName);
@@ -2683,22 +2784,41 @@ var TF;
                 // It is important that this function does not re-assign needlessly,
                 // to avoid Polymer observer churn.
                 var setComponentValue = function () {
-                    var uriValue = get(URIStorageName);
+                    var uriValue = get(URIStorageName, false);
                     var currentValue = _this[propertyName];
                     // if uriValue is undefined, we will ensure that the property has the
                     // default value
                     if (uriValue === undefined) {
-                        if (!_.isEqual(currentValue, defaultVal)) {
+                        var valueToSet = void 0;
+                        // if we are using localStorage, we will set the value to the value
+                        // from localStorage. Then, the corresponding observer will proxy
+                        // the localStorage value into URI storage.
+                        // in this way, localStorage takes precedence over the default val
+                        // but not over the URI value.
+                        if (useLocalStorage) {
+                            var useLocalStorageValue = get(URIStorageName, true);
+                            valueToSet = useLocalStorageValue === undefined ?
+                                defaultVal :
+                                useLocalStorageValue;
+                        }
+                        else {
+                            valueToSet = defaultVal;
+                        }
+                        if (!_.isEqual(currentValue, valueToSet)) {
                             // If we don't have an explicit URI value, then we need to ensure
                             // the property value is equal to the default value.
                             // We will assign a clone rather than the canonical default, because
                             // the component receiving this property may mutate it, and we need
                             // to keep a pristine copy of the default.
-                            _this[propertyName] = _.clone(defaultVal);
+                            _this[propertyName] = _.clone(valueToSet);
                         }
+                        // In this case, we have an explicit URI value, so we will ensure that
+                        // the component has an equivalent value.
                     }
-                    else if (!_.isEqual(uriValue, currentValue)) {
-                        _this[propertyName] = uriValue;
+                    else {
+                        if (!_.isEqual(uriValue, currentValue)) {
+                            _this[propertyName] = uriValue;
+                        }
                     }
                 };
                 // Set the value on the property.
@@ -2710,16 +2830,21 @@ var TF;
         /**
          * Return a function that updates URIStorage when a property changes.
          */
-        function _getObserver(get, set, propertyName, defaultVal) {
+        function _getObserver(get, set, propertyName, defaultVal, useLocalStorage) {
             return function () {
                 var URIStorageName = getURIStorageName(this, propertyName);
                 var newVal = this[propertyName];
-                if (!_.isEqual(newVal, get(URIStorageName))) {
+                // if this is a localStorage property, we always synchronize the value
+                // in localStorage to match the one currently in the URI.
+                if (useLocalStorage) {
+                    set(URIStorageName, newVal, true);
+                }
+                if (!_.isEqual(newVal, get(URIStorageName, false))) {
                     if (_.isEqual(newVal, defaultVal)) {
-                        _unset(URIStorageName);
+                        _unsetFromURI(URIStorageName);
                     }
                     else {
-                        set(URIStorageName, newVal);
+                        set(URIStorageName, newVal, false);
                     }
                 }
             };
@@ -2727,7 +2852,7 @@ var TF;
         /**
          * Delete a key from the URI.
          */
-        function _unset(key) {
+        function _unsetFromURI(key) {
             var items = _componentToDict(_readComponent());
             delete items[key];
             _writeComponent(_dictToComponent(items));
@@ -3211,10 +3336,11 @@ var Categorizer;
         type: Object,
         observer: "synchronizeColors",
       }, // map from run name to css class
-      numRunsEnabledByDefault: {
-        // When TB first loads, first k runs are enabled, rest are disabled.
+      maxRunsToEnableByDefault: {
+        // When TB first loads, if it has k or fewer runs, they are all enabled
+        // by default. If there are more, then they are all disabled.
         type: Number,
-        value: 10,
+        value: 40,
       },
       _debouncedRegexChange: {
         type: Function,
@@ -3247,8 +3373,24 @@ var Categorizer;
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMapping(runSelectionState)",
+      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
+    _storeRunToIsCheckedMappingWithDefault() {
+      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
+      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
+        return;
+      }
+      var _this = this;
+      var allToggledOn = this.namesMatchingRegex
+              .every(function(n) {return _this.runSelectionState[n]});
+      var allToggledOff = this.namesMatchingRegex
+              .every(function(n) {return !_this.runSelectionState[n]});
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
+        this.runSelectionState = {};
+      }
+      this._storeRunToIsCheckedMapping(this.runSelectionState);
+    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
@@ -3278,9 +3420,10 @@ var Categorizer;
     },
     computeOutSelected: function(__, ___) {
       var runSelectionState = this.runSelectionState;
-      var num = this.numRunsEnabledByDefault;
+      var num = this.maxRunsToEnableByDefault;
+      var allEnabled = this.namesMatchingRegex.length <= num;
       return this.namesMatchingRegex.filter(function(n, i) {
-        return runSelectionState[n] == null ? i<num : runSelectionState[n];
+        return runSelectionState[n] == null ? allEnabled : runSelectionState[n];
       });
     },
     synchronizeColors: function(e) {
@@ -3330,18 +3473,24 @@ var Categorizer;
     _regexInputObserver: TF.URIStorage.getStringObserver("regexInput", ""),
     toggleAll: function() {
       var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-                    .every(function(n) {return _this.runSelectionState[n]});
+      var anyToggledOn = this.namesMatchingRegex
+                    .some(function(n) {return _this.runSelectionState[n]});
+
 
       var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
 
-      var numRuns = this.namesMatchingRegex.length;
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      // We have runs toggled either if some were explicitly toggled on, or if
+      // we are in the default state, and there are few enough that we default
+      // to toggling on.
+      anyToggledOn = anyToggledOn || runSelectionStateIsDefault && !defaultOff;
 
-      var shouldDisable = allToggledOn || runSelectionStateIsDefault;
+      // If any are toggled on, we turn everything off. Or, if none are toggled
+      // on, we turn everything on.
 
       var newRunsDisabled = {};
       this.names.forEach(function(n) {
-        newRunsDisabled[n] = !shouldDisable;
+        newRunsDisabled[n] = !anyToggledOn;
       })
       this.runSelectionState = newRunsDisabled;
     },
@@ -3437,17 +3586,9 @@ var Categorizer;
       },
     },
     observers: [
+      "_onBackendUpdate(backend)",
       "_logdirSet(logdir)",
     ],
-    ready: function() {
-      // Populate the logdir.
-      this.backend.logdir().then(logdirObject => {
-        this.set('logdir', logdirObject.logdir);
-      }).catch(e => {
-        // Fetching the logdir failed. Prevent the exception from logging to
-        // console. The console already logs a 404 network event.
-      });
-    },
     _toggleAll: function() {
       this.$.multiCheckbox.toggleAll();
     },
@@ -3455,8 +3596,21 @@ var Categorizer;
     _breakString: function(originalString) {
       return originalString.replace(/([\/=\-_,])/g, "$1<wbr>");
     },
+    _onBackendUpdate: function(backend) {
+      if (backend === undefined) {
+        return;
+      }
+
+      // When the backend is set, the selector can request the logdir.
+      backend.logdir().then(logdirObject => {
+        this.set('logdir', logdirObject.logdir);
+      }).catch(e => {
+        // Fetching the logdir failed. Prevent the exception from logging to
+        // console. The console already logs a 404 network event.
+      });
+    },
     _logdirSet: function(logdir) {
-      if (!logdir) {
+      if (logdir === undefined) {
         // The logdir has not been set yet.
         return;
       }
@@ -3694,11 +3848,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var Plottable;
 (function (Plottable) {
     var DragZoomLayer = (function (_super) {
@@ -3888,7 +4047,7 @@ var VZ;
             this.colorScale = colorScale;
             this.tooltip = tooltip;
             this.datasets = [];
-            this._ignoreYOutliers = true;
+            this._ignoreYOutliers = false;
             // lastPointDataset is a dataset that contains just the last point of
             // every dataset we're currently drawing.
             this.lastPointsDataset = new Plottable.Dataset();
@@ -4230,34 +4389,20 @@ var VZ;
             }
         };
         LineChart.prototype.resmoothDataset = function (dataset) {
-            // When increasing the smoothing window, it smoothes a lot with the first
-            // few points and then starts to gradually smooth slower, so using an
-            // exponential function makes the slider more consistent. 1000^x has a
-            // range of [1, 1000], so subtracting 1 and dividing by 999 results in a
-            // range of [0, 1], which can be used as the percentage of the data, so
-            // that the kernel size can be specified as a percentage instead of a
-            // hardcoded number, what would be bad with multiple series.
-            var factor = (Math.pow(1000, this.smoothingWeight) - 1) / 999;
             var data = dataset.data();
-            var kernelRadius = Math.floor(data.length * factor / 2);
-            data.forEach(function (d, i) {
-                var actualKernelRadius = Math.min(kernelRadius, i);
-                var start = i - actualKernelRadius;
-                var end = i + actualKernelRadius + 1;
-                if (end >= data.length) {
-                    // In the beginning, it's OK for the smoothing window to be small,
-                    // but this is not desirable towards the end. Rather than shrinking
-                    // the window, or extrapolating data to fill the gap, we're simply
-                    // not going to display the smoothed line towards the end.
-                    d.smoothed = Infinity;
-                }
-                else if (!_.isFinite(d.scalar)) {
-                    // Only smooth finite numbers.
+            var smoothingWeight = this.smoothingWeight;
+            var last = data.length > 0 ? data[0].scalar : NaN;
+            data.forEach(function (d) {
+                if (!_.isFinite(last)) {
                     d.smoothed = d.scalar;
                 }
                 else {
-                    d.smoothed = d3.mean(data.slice(start, end).filter(function (d) { return _.isFinite(d.scalar); }), function (d) { return d.scalar; });
+                    // 1st-order IIR low-pass filter to attenuate the higher-
+                    // frequency components of the time-series.
+                    d.smoothed =
+                        last * smoothingWeight + (1 - smoothingWeight) * d.scalar;
                 }
+                last = d.smoothed;
             });
         };
         LineChart.prototype.getDataset = function (name) {
@@ -4424,23 +4569,36 @@ var VZ;
             var b;
             if (ignoreOutliers) {
                 var sorted = _.sortBy(values);
-                a = d3.quantile(sorted, 0.10);
-                b = d3.quantile(sorted, 0.90);
+                a = d3.quantile(sorted, 0.05);
+                b = d3.quantile(sorted, 0.95);
             }
             else {
                 a = d3.min(values);
                 b = d3.max(values);
             }
-            // When the data all fits into the unit interval, we switch to a consistent
-            // domain for unit data. This is helpful for proportional parameters like
-            // error rates or % of queue that is full. This way, users can meaningfully
-            // compare charts and see information at a glance (if the value is always
-            // 1, it appears at top of the chart, 0 is bottom, etc.)
-            if (a >= 0 && b <= 1) {
-                return [-0.1, 1.1];
+            var padding;
+            var span = b - a;
+            if (span === 0) {
+                // If b===a, we would create an empty range. We instead select the range
+                // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
+                // extra padding on the top and bottom of the plot.
+                padding = Math.abs(a) * 1.1;
+            }
+            else {
+                padding = span * 0.2;
+            }
+            var lower;
+            if (a >= 0 && a < span) {
+                // We include the intercept (y = 0) if doing so less than doubles the span
+                // of the y-axis. (We actually select a lower bound that's slightly less
+                // than 0 so that 0.00 will clearly be written on the lower edge of the
+                // chart. The label on the lowest tick is often filtered out.)
+                lower = -0.1 * b;
+            }
+            else {
+                lower = a - padding;
             }
-            var padding = (b - a) * 0.20;
-            var domain = [a - padding, b + padding];
+            var domain = [lower, b + padding];
             domain = d3.scale.linear().domain(domain).nice().domain();
             return domain;
         }
@@ -4623,7 +4781,7 @@ var VZ;
 
         ignoreYOutliers: {
           type: Boolean,
-          value: true,
+          value: false,
         },
 
         /**
@@ -4818,7 +4976,7 @@ var VZ;
         </tf-sidebar-helper>
       </div>
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" show-download-links="[[_showDownloadLinks]]" download-link-url-function="[[scalarUrl]]">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" show-download-links="[[_showDownloadLinks]]" download-link-url-function="[[scalarUrl]]">
           <template>
             <vz-line-chart x-type="[[_xType]]" color-scale="[[_colorScale]]" smoothing-enabled="[[_smoothingEnabled]]" smoothing-weight="[[_smoothingWeight]]" tooltip-sorting-method="[[_tooltipSortingMethod]]" ignore-y-outliers="[[_ignoreYOutliers]]"></vz-line-chart>
             <paper-icon-button class="log-button" icon="line-weight" on-tap="toggleLogScale" title="Toggle y-axis log scale"></paper-icon-button>
@@ -4870,9 +5028,14 @@ var VZ;
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfScalarDashboard = Polymer({
       is: "tf-scalar-dashboard",
+      factoryImpl: function(backend, router) {
+        this.backend = backend;
+        this.router = router;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("scalars"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
@@ -4891,7 +5054,7 @@ var VZ;
           type: Boolean,
           notify: true,
           value: TF.URIStorage.getBooleanInitializer('_showDownloadLinks',
-              false),
+              false, true),
           observer: '_showDownloadLinksObserver'
         },
         _smoothingWeight: {
@@ -4906,7 +5069,8 @@ var VZ;
         },
         _ignoreYOutliers: {
           type: Boolean,
-          value: true,
+          value: TF.URIStorage.getBooleanInitializer('_ignoreYOutliers', true, true),
+          observer: '_ignoreYOutliersObserver',
         },
         _xType: {
           type: String,
@@ -4922,9 +5086,11 @@ var VZ;
         return this.router.scalars;
       },
       _showDownloadLinksObserver: TF.URIStorage.getBooleanObserver(
-          '_showDownloadLinks', false),
+          '_showDownloadLinks', /*default=*/ false, /*useLocalStorage=*/ true),
       _smoothingWeightObserver: TF.URIStorage.getNumberObserver(
           '_smoothingWeight', 0.6),
+      _ignoreYOutliersObserver: TF.URIStorage.getBooleanObserver(
+          '_ignoreYOutliers', /*default=*/ true, /*useLocalStorage=*/true),
       _computeSmoothingEnabled: function(_smoothingWeight) {
         return _smoothingWeight > 0;
       },
@@ -5153,23 +5319,36 @@ var VZ;
             var b;
             if (ignoreOutliers) {
                 var sorted = _.sortBy(values);
-                a = d3.quantile(sorted, 0.10);
-                b = d3.quantile(sorted, 0.90);
+                a = d3.quantile(sorted, 0.05);
+                b = d3.quantile(sorted, 0.95);
             }
             else {
                 a = d3.min(values);
                 b = d3.max(values);
             }
-            // When the data all fits into the unit interval, we switch to a consistent
-            // domain for unit data. This is helpful for proportional parameters like
-            // error rates or % of queue that is full. This way, users can meaningfully
-            // compare charts and see information at a glance (if the value is always
-            // 1, it appears at top of the chart, 0 is bottom, etc.)
-            if (a >= 0 && b <= 1) {
-                return [-0.1, 1.1];
+            var padding;
+            var span = b - a;
+            if (span === 0) {
+                // If b===a, we would create an empty range. We instead select the range
+                // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
+                // extra padding on the top and bottom of the plot.
+                padding = Math.abs(a) * 1.1;
+            }
+            else {
+                padding = span * 0.2;
+            }
+            var lower;
+            if (a >= 0 && a < span) {
+                // We include the intercept (y = 0) if doing so less than doubles the span
+                // of the y-axis. (We actually select a lower bound that's slightly less
+                // than 0 so that 0.00 will clearly be written on the lower edge of the
+                // chart. The label on the lowest tick is often filtered out.)
+                lower = -0.1 * b;
+            }
+            else {
+                lower = a - padding;
             }
-            var padding = (b - a) * 0.20;
-            var domain = [a - padding, b + padding];
+            var domain = [lower, b + padding];
             domain = d3.scale.linear().domain(domain).nice().domain();
             return domain;
         }
@@ -5383,7 +5562,7 @@ var VZ;
       </div>
 
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
           <template>
             <vz-distribution-chart x-type="[[_xType]]" color-scale="[[_colorScale]]"></vz-distribution-chart>
           </template>
@@ -5395,9 +5574,13 @@ var VZ;
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfDistributionDashboard = Polymer({
       is: "tf-distribution-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("distributions"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
@@ -6114,12 +6297,12 @@ var VZ;
               <paper-button id="relative">relative</paper-button>
               <paper-button id="wall_time">wall</paper-button>
             </tf-option-selector>
-
+          
        </div>
       </tf-sidebar-helper></div>
 
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
           <template>
             <vz-histogram-timeseries time-property="[[_timeProperty]]" mode="[[_histogramMode]]" color-scale="[[_colorScaleFunction]]"></vz-histogram-timeseries>
           </template>
@@ -6137,9 +6320,13 @@ var VZ;
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfHistogramDashboard = Polymer({
       is: "tf-histogram-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("histograms"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
@@ -6383,7 +6570,7 @@ var VZ;
         </tf-sidebar-helper>
       </div>
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
           <template>
             <tf-image-loader color-scale="[[_colorScale]]"></tf-image-loader>
             <paper-icon-button class="actual-size-button" icon="aspect-ratio" on-tap="_showActualSize" title="Show the image at its true pixel size"></paper-icon-button>
@@ -6423,8 +6610,11 @@ var VZ;
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfImageDashboard = Polymer({
       is: "tf-image-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         backend: Object,
         dataType: {
@@ -6433,8 +6623,9 @@ var VZ;
         },
       },
       behaviors: [
-          TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-          TF.Backend.Behavior,
+        TF.Dashboard.DashboardBehavior("images"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
       ],
       attached: function() {
         this.async(function() {
@@ -6470,20 +6661,70 @@ var VZ;
 
 <dom-module id="tf-audio-loader" assetpath="../tf-audio-dashboard/">
   <style>
-  :host {
-    display: block;
-  }
-  img {
-    width: 100%;
-    height: 100%;
-    image-rendering: pixelated;
-  }
+    :host {
+      display: block;
+      --step-slider-knob-color: #424242;
+    }
+
+    img {
+      width: 100%;
+      height: 100%;
+      image-rendering: pixelated;
+    }
+
+    .step-description {
+      font-size: 12px;
+    }
+
+    .step-value {
+      font-weight: bold;
+    }
+
+    #audio-loading-spinner {
+      width: 14px;
+      height: 14px;
+      vertical-align: text-bottom;
+      --paper-spinner-color: var(--tb-orange-strong)
+    }
+
+    #steps {
+      height: 15px;
+      margin: 0 0 0 -15px;
+      /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
+       * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
+       * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
+      width: calc(100% + 31px);
+      --paper-slider-active-color: var(--step-slider-knob-color);
+      --paper-slider-knob-color: var(--step-slider-knob-color);
+      --paper-slider-pin-color: var(--step-slider-knob-color);
+      --paper-slider-knob-start-color: var(--step-slider-knob-color);
+      --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
+      --paper-slider-pin-start-color: var(--step-slider-knob-color);
+    }
+
+    #individual-audio-container audio {
+      margin: 5px 0 0 -10px;
+      width: calc(100% + 20px);
+    }
   </style>
   <template>
-    <template is="dom-if" if="[[audioUrl]]">
-      <audio controls="" loop="">
-        <source src="[[audioUrl]]" type="[[audioContentType]]">
-      </audio>
+    <template is="dom-if" if="[[_metadatas]]">
+      <template is="dom-if" if="[[_hasAtLeastOneStep(_metadatas)]]">
+        <div class="step-description">
+          step
+          <span class="step-value">
+            [[_stepValue]]
+          </span><br>
+          <template is="dom-if" if="[[_stepWallTime]]">
+            [[_stepWallTime]]
+          </template>
+          <paper-spinner-lite active="" id="audio-loading-spinner" hidden$="[[!_isAudioLoading]]"></paper-spinner-lite>
+        </div>
+      </template>
+      <template is="dom-if" if="[[_maxStepIndex]]">
+        <paper-slider id="steps" immediate-value="{{_stepIndex}}" max="[[_maxStepIndex]]" max-markers="[[_maxStepIndex]]" snaps="" step="1" value="{{_stepIndex}}"></paper-slider>
+      </template>
+      <div id="individual-audio-container"></div>
     </template>
   </template>
   <script>
@@ -6493,18 +6734,42 @@ var VZ;
         run: String,
         tag: String,
         audioGenerator: Function,
-        audioUrl: String,
-        audioContentType: String
+        // todo: document.
+        _metadatas: Array,
+        _stepIndex: Number,
+        _stepValue: {
+          type: Number,
+          computed: "_computeStepValue(_metadatas, _stepIndex)",
+          value: 0,
+        },
+        _stepWallTime: {
+          type: Number,
+          computed: "_computeStepWallTime(_metadatas, _stepIndex)",
+          value: 0,
+        },
+        _maxStepIndex: {
+          type: Number,
+          computed: "_computeMaxStepIndex(_metadatas)",
+          value: 0,
+        },
+        _isAudioLoading: Boolean,
+        // Used to identify stale requests for audio.
+        _audioRequestId: {
+          type: Number,
+          value: 1
+        },
       },
+      observers: [
+        "_updateAudio(_metadatas, _stepIndex)",
+      ],
       reload: function() {
-        var _this = this;
-        this.audioUrl = ""; // force reload
-        this.audioContentType = "";
         this.audioGenerator(this.tag, this.run).then(function(metadatas) {
-          var last_metadata = _.last(metadatas);
-          _this.audioUrl = last_metadata.url;
-          _this.audioContentType = last_metadata.content_type;
-        })
+          // Set the list of available metadata.
+          this.set("_metadatas", metadatas);
+
+          // Set the index to be the last one.
+          this.set("_stepIndex", this._maxStepIndex);
+        }.bind(this));
       },
       ready: function() {
         // Need to test so that it will not error if it is constructed w/o
@@ -6513,6 +6778,79 @@ var VZ;
           this.reload();
         }
       },
+      _updateAudio: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return;
+        }
+
+        // Load new audio.
+        const requestId = ++this._audioRequestId;
+        this.set("_isAudioLoading", true);
+
+        // Create a new audio element. Only replace the previous one once the new audio loads.
+        let audioElement = document.createElement("audio");
+        audioElement.setAttribute("controls", true);
+        audioElement.setAttribute("loop", "loop");
+        let canPlayHandler = function() {
+          if (requestId !== this._audioRequestId) {
+            // This request is no longer relevant.
+            return;
+          }
+
+          // Remove this event listener: "canplay" apparently fires in Chrome every time playing
+          // begins again on loop. So, if we create a new audio element every time that happens, we
+          // don't actually loop.
+          audioElement.removeEventListener("canplay", canPlayHandler);
+
+          let individualAudioContainer = this.$$("#individual-audio-container");
+          individualAudioContainer.innerHTML = "";
+          Polymer.dom(individualAudioContainer).appendChild(audioElement);
+          this.set("_isAudioLoading", false);
+        }.bind(this);
+        audioElement.addEventListener("canplay", canPlayHandler);
+        audioElement.addEventListener("error", function() {
+          if (requestId !== this._audioRequestId) {
+            // This request is no longer relevant.
+            return;
+          }
+
+          // The audio could not be loaded.
+          this.$$("#individual-audio-container").innerHTML = "";
+          this.set("_isAudioLoading", false);
+        }.bind(this));
+
+        // Initiate the request for new audio.
+        var sourceElement = document.createElement("source");
+        let metadata = metadatas[stepIndex];
+        sourceElement.setAttribute("src", metadata.url);
+        sourceElement.setAttribute("type", metadata.content_type);
+        audioElement.appendChild(sourceElement);
+      },
+      _computeStepValue: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas[stepIndex].step;
+      },
+      _computeStepWallTime: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas[stepIndex].wall_time.toString();
+      },
+      _computeMaxStepIndex: function(metadatas) {
+        if (!metadatas || metadatas.length === 0) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas.length - 1;
+      },
+      _hasAtLeastOneStep: function(metadatas) {
+        return metadatas && metadatas.length > 0;
+      },
     });
   </script>
 </dom-module>
@@ -6523,11 +6861,13 @@ var VZ;
     <div id="fullContainer" class="container scrollbar">
       <div id="topRow" class="container">
         <div class="noshrink" id="paddingCell"></div>
-        <template is="dom-repeat" items="[[runs]]" as="run">
-        <div class="run-name-cell noshrink">
-          <span>[[run]]</span>
-        </div>
-      </template>
+        <template is="dom-if" if="[[_tagsExist(tags)]]">
+          <template is="dom-repeat" items="[[runs]]" as="run">
+            <div class="run-name-cell noshrink">
+              <span>[[run]]</span>
+            </div>
+          </template>
+        </template>
       </div>
       <div id="bottomContainer" class="container">
         <template is="dom-repeat" items="[[tags]]" as="tag">
@@ -6551,6 +6891,7 @@ var VZ;
       :host {
         display: block;
         height: 100%;
+        --audio-cell-min-height: 105px;
       }
       .container {
         display: flex;
@@ -6579,14 +6920,17 @@ var VZ;
         padding-top: 5px;
       }
       .audio-cell {
+        background: #FAFAFA;
         width: 300px;
-        height: 36px;
+        min-height: var(--audio-cell-min-height);
         border: 1px solid black;
         margin-right: 3px;
+        padding: 10px;
+        box-sizing: border-box;
       }
       .tag-name-cell {
         width: 300px;
-        height: 36px;
+        height: var(--audio-cell-min-height);
         display:flex;
         flex-direction: column;
         justify-content: center;
@@ -6598,7 +6942,6 @@ var VZ;
       }
       .run-name-cell {
         width: 300px;
-        height: 36px;
         text-align: center;
         margin-right: 5px;
       }
@@ -6607,7 +6950,6 @@ var VZ;
       }
       #paddingCell {
         width: 300px;
-        height: 36px;
       }
     </style>
   </template>
@@ -6620,6 +6962,9 @@ var VZ;
         runs: Array,
         audioGenerator: Function,
       },
+      _tagsExist: function(tags) {
+        return tags && tags.length > 0;
+      },
       _exists: function (run, tag) {
         return this.runToAudio[run].indexOf(tag) !== -1;
       },
@@ -6650,12 +6995,16 @@ var VZ;
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfAudioDashboard = Polymer({
       is: "tf-audio-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         dataType: {value: "audio"},
       },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("audio"),
         TF.Dashboard.ReloadBehavior("tf-audio-loader"),
         TF.Backend.Behavior
       ],
@@ -6834,7 +7183,6 @@ Polymer({
   }
 });
 </script>
-<script src="../lodash/lodash.min.js"></script>
 <script src="../graphlib/dist/graphlib.core.js"></script>
 <script src="../dagre/dist/dagre.core.js"></script>
 <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
@@ -7065,6 +7413,8 @@ var tf;
         ;
         /** Attribute key reserved for the shapes of the output tensors. */
         var OUTPUT_SHAPES_KEY = '_output_shapes';
+        /** Attribute key reserved for the XLA cluster that an op runs on. */
+        var _XLA_CLUSTER_KEY = '_XlaCluster';
         /**
          * A SlimGraph is inspired by graphlib.Graph, but having only the functionality
          * that we need.
@@ -7121,6 +7471,7 @@ var tf;
                 // control dependency.
                 this.inputs = normalizeInputs(rawNode.input);
                 this.outputShapes = extractOutputShapes(rawNode.attr);
+                this.xlaCluster = extractXlaCluster(rawNode.attr);
                 // additional properties
                 this.type = NodeType.OP;
                 this.isGroupNode = false;
@@ -7174,6 +7525,7 @@ var tf;
                                 else {
                                     /* tslint:disable */
                                     console.log('ignoring negative memory allocation for ' + nodeName);
+                                    /* tslint:enable */
                                 }
                             }
                         });
@@ -7196,6 +7548,7 @@ var tf;
                         else {
                             /* tslint:disable */
                             console.log('ignoring negative runtime for ' + nodeName);
+                            /* tslint:enable */
                         }
                     }
                 });
@@ -7447,6 +7800,7 @@ var tf;
          * Extracts the shapes of the output tensors from the attr property in the
          * node proto.
          */
+        // tslint:disable-next-line:no-any
         function extractOutputShapes(attr) {
             var result = null;
             // We don't know anything about the output tensors.
@@ -7489,6 +7843,25 @@ var tf;
             // about the output tensors.
             return null;
         }
+        /**
+         * Extracts the XLA Cluster that an op runs on from the attrs of the OpNode.
+         * @param attr The attr property.
+         * @return A string that is the name of the cluster. Or null if it could not be
+         *     determined.
+         */
+        // tslint:disable-next-line:no-any
+        function extractXlaCluster(attr) {
+            if (!attr) {
+                return null;
+            }
+            // Find the attribute for XLA cluster if there is one.
+            for (var i = 0; i < attr.length; i++) {
+                if (attr[i].key === _XLA_CLUSTER_KEY) {
+                    return attr[i].value['s'] || null;
+                }
+            }
+            return null;
+        }
         /**
          * Normalizes the inputs and extracts associated metadata:
          * 1) Inputs can contain a colon followed by a number at the end
@@ -8176,14 +8549,19 @@ var tf;
                 var seriesNames = {};
                 return tf.graph.util
                     .runAsyncTask('Adding nodes', 20, function () {
-                    // Get all the possible device names.
+                    // Get all the possible device and XLA cluster names.
                     var deviceNames = {};
+                    var xlaClusterNames = {};
                     _.each(graph.nodes, function (node, nodeName) {
-                        if (node.device != null) {
+                        if (node.device) {
                             deviceNames[node.device] = true;
                         }
+                        if (node.xlaCluster) {
+                            xlaClusterNames[node.xlaCluster] = true;
+                        }
                     });
                     h.devices = _.keys(deviceNames);
+                    h.xlaClusters = _.keys(xlaClusterNames);
                     addNodes(h, graph);
                 }, tracker)
                     .then(function () {
@@ -8203,7 +8581,9 @@ var tf;
                         h.templates = graph_1.template.detect(h, params.verifyTemplate);
                     }, tracker);
                 })
-                    .then(function () { return h; });
+                    .then(function () {
+                    return h;
+                });
             }
             hierarchy_1.build = build;
             ;
@@ -9518,11 +9898,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 </script>
-<script>var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+<script>var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 /* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the 'License');
@@ -9582,7 +9967,12 @@ var tf;
                     var light = lightened ? 95 : 80;
                     return d3.hsl(hue, .01 * sat, .01 * light).toString();
                 },
-                DEVICE_PALETTE: function (index) { return render.MetanodeColors.STRUCTURE_PALETTE(index); },
+                DEVICE_PALETTE: function (index) {
+                    return render.MetanodeColors.STRUCTURE_PALETTE(index);
+                },
+                XLA_CLUSTER_PALETTE: function (index) {
+                    return render.MetanodeColors.STRUCTURE_PALETTE(index);
+                },
                 UNKNOWN: '#eee',
                 GRADIENT_OUTLINE: '#888'
             };
@@ -9690,6 +10080,10 @@ var tf;
                     this.deviceColorMap = d3.scale.ordinal()
                         .domain(this.hierarchy.devices)
                         .range(_.map(d3.range(this.hierarchy.devices.length), render.MetanodeColors.DEVICE_PALETTE));
+                    this.xlaClusterColorMap =
+                        d3.scale.ordinal()
+                            .domain(this.hierarchy.xlaClusters)
+                            .range(_.map(d3.range(this.hierarchy.xlaClusters.length), render.MetanodeColors.XLA_CLUSTER_PALETTE));
                     var topLevelGraph = this.hierarchy.root.metagraph;
                     // Find the maximum and minimum memory usage.
                     var memoryExtent = d3.extent(topLevelGraph.nodes(), function (nodeName, index) {
@@ -9761,6 +10155,12 @@ var tf;
                         renderInfo.computeTimeColor =
                             this.computeTimeScale(node.stats.totalMicros);
                     }
+                    if (!node.isGroupNode) {
+                        var clusterName = node.xlaCluster;
+                        if (clusterName) {
+                            renderInfo.xlaClusterColor = this.xlaClusterColorMap(clusterName);
+                        }
+                    }
                     // We only fade nodes when we're displaying stats.
                     renderInfo.isFadedOut = this.displayingStats &&
                         !tf.graph.util.hasDisplayableNodeStats(node.stats);
@@ -10747,6 +11147,8 @@ var tf;
                                 graph.removeNode(n);
                             }
                             else {
+                                // if a low degree node has both in- & out- annotations, do nothing
+                                // because it is unclear which side it should go to.
                             }
                         }
                     }
@@ -11913,8 +12315,9 @@ var tf;
                 (function (ColorBy) {
                     ColorBy[ColorBy["STRUCTURE"] = 0] = "STRUCTURE";
                     ColorBy[ColorBy["DEVICE"] = 1] = "DEVICE";
-                    ColorBy[ColorBy["COMPUTE_TIME"] = 2] = "COMPUTE_TIME";
-                    ColorBy[ColorBy["MEMORY"] = 3] = "MEMORY";
+                    ColorBy[ColorBy["XLA_CLUSTER"] = 2] = "XLA_CLUSTER";
+                    ColorBy[ColorBy["COMPUTE_TIME"] = 3] = "COMPUTE_TIME";
+                    ColorBy[ColorBy["MEMORY"] = 4] = "MEMORY";
                 })(ColorBy = node_1.ColorBy || (node_1.ColorBy = {}));
                 ;
                 /**
@@ -11974,6 +12377,9 @@ var tf;
                                 });
                             }
                             return isExpanded ? colorParams.EXPANDED_COLOR : "url(#" + escapedId + ")";
+                        case ColorBy.XLA_CLUSTER:
+                            return isExpanded ? colorParams.EXPANDED_COLOR :
+                                renderInfo.xlaClusterColor || colorParams.UNKNOWN;
                         case ColorBy.COMPUTE_TIME:
                             return isExpanded ?
                                 colorParams.EXPANDED_COLOR : renderInfo.computeTimeColor ||
@@ -14351,7 +14757,7 @@ Polymer({
 <svg id="svg">
   <defs>
 
-
+    
     <path id="ref-arrowhead-path" d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"></path>
     <marker class="ref-arrowhead" id="ref-arrowhead-small" viewBox="0 0 10 10" markerWidth="10" markerHeight="10" refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
       <use xlink:href="#ref-arrowhead-path"></use>
@@ -14366,7 +14772,7 @@ Polymer({
       <use xlink:href="#ref-arrowhead-path"></use>
     </marker>
 
-
+    
     <marker id="annotation-arrowhead" markerWidth="5" markerHeight="5" refX="5" refY="2.5" orient="auto">
       <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"></path>
     </marker>
@@ -14379,23 +14785,23 @@ Polymer({
     <marker id="ref-annotation-arrowhead-faded" markerWidth="5" markerHeight="5" refX="0" refY="2.5" orient="auto">
       <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"></path>
     </marker>
-
+    
     <ellipse id="op-node-stamp" rx="7.5" ry="3" stroke="inherit" fill="inherit"></ellipse>
-
+    
     <ellipse id="op-node-annotation-stamp" rx="5" ry="2" stroke="inherit" fill="inherit"></ellipse>
-
+    
     <g id="op-series-vertical-stamp">
       <use xlink:href="#op-node-stamp" x="8" y="9"></use>
       <use xlink:href="#op-node-stamp" x="8" y="6"></use>
       <use xlink:href="#op-node-stamp" x="8" y="3"></use>
     </g>
-
+    
     <g id="op-series-horizontal-stamp">
       <use xlink:href="#op-node-stamp" x="16" y="4"></use>
       <use xlink:href="#op-node-stamp" x="12" y="4"></use>
       <use xlink:href="#op-node-stamp" x="8" y="4"></use>
     </g>
-
+    
     <g id="op-series-annotation-stamp">
       <use xlink:href="#op-node-annotation-stamp" x="9" y="2"></use>
       <use xlink:href="#op-node-annotation-stamp" x="7" y="2"></use>
@@ -14404,10 +14810,10 @@ Polymer({
     <svg id="summary-icon" fill="#848484" height="12" viewBox="0 0 24 24" width="12">
       <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"></path>
     </svg>
-
+    
     <g id="linearGradients"></g>
 
-
+    
     <pattern id="rectHatch" patternTransform="rotate(45 0 0)" width="5" height="5" patternUnits="userSpaceOnUse">
       <line x1="0" y1="0" x2="0" y2="5" style="stroke-width: 1"></line>
     </pattern>
@@ -14415,7 +14821,7 @@ Polymer({
       <line x1="0" y1="0" x2="0" y2="2" style="stroke-width: 1"></line>
     </pattern>
 
-
+    
     <filter id="health-pill-shadow" x="-40%" y="-40%" width="180%" height="180%">
       <feGaussianBlur in="SourceAlpha" stdDeviation="0.8"></feGaussianBlur>
       <feOffset dx="0" dy="0" result="offsetblur"></feOffset>
@@ -14427,7 +14833,7 @@ Polymer({
       </feMerge>
     </filter>
   </defs>
-
+  
   <rect fill="white" width="10000" height="10000"></rect>
   <g id="root"></g>
 </svg>
@@ -14440,6 +14846,18 @@ Polymer({
     renderHierarchy: Object,
     name: String,
     colorBy: String,
+
+    // For each render hierarchy, we only fit it to the viewport once (when the scene is attached to
+    // the DOM). We do not fit the hierarchy again (unless the user clicks the reset button). For
+    // instance, if the user enters a certain view in the graph, switches to another dashboard, and
+    // returns to the graph dashboard, the user expects the previous view. These properties enable
+    // that behavior.
+
+    /** Whether the scene has fit the current render hierarchy (to the viewport) at least once. */
+    _hasRenderHierarchyBeenFitOnce: Boolean,
+    /** Whether this scene element is currently attached to a parent element. */
+    _isAttached: Boolean,
+
     /** @type {d3_zoom} d3 zoom object */
     _zoom: Object,
     highlightedNode: {
@@ -14544,7 +14962,10 @@ Polymer({
   },
   observers: [
     '_colorByChanged(colorBy)',
-    '_buildAndFit(renderHierarchy)',
+    '_renderHierarchyChanged(renderHierarchy)',
+    // Animation and fitting must come after the observer for the hierarchy changing because we must
+    // first build the render hierarchy.
+    '_animateAndFit(_isAttached, renderHierarchy)',
     '_updateHealthPills(nodeNamesToHealthPills, healthPillStepIndex)',
   ],
   getNode: function(nodeName) {
@@ -14647,9 +15068,24 @@ Polymer({
         tf.graph.layout.PARAMS.minimap.size,
         tf.graph.layout.PARAMS.subscene.meta.labelHeight);
   },
-  _buildAndFit: function(renderHierarchy) {
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
+  _renderHierarchyChanged: function(renderHierarchy) {
+    this._hasRenderHierarchyBeenFitOnce = false;
     this._resetState();
     this._build(renderHierarchy);
+  },
+  _animateAndFit: function(isAttached, renderHierarchy) {
+    if (this._hasRenderHierarchyBeenFitOnce || !isAttached) {
+      // Do not animate and fit if the scene has already fitted this render hierarchy once. Or if
+      // the graph dashboard is not attached (in which case the scene lacks DOM info for fitting).
+      return;
+    }
+
     // Fit to screen after the graph is done animating.
     setTimeout(this.fit.bind(this), tf.graph.layout.PARAMS.animation.duration);
   },
@@ -14702,6 +15138,7 @@ Polymer({
     }
   },
   fit: function() {
+    this._hasRenderHierarchyBeenFitOnce = true;
     tf.graph.scene.fit(this.$.svg, this.$.root, this._zoom, function() {
       this._zoomed = false;
     }.bind(this));
@@ -14983,7 +15420,14 @@ Polymer({
             device: deviceName,
             color: renderGraph.deviceColorMap(deviceName)
           };
-        })
+        }),
+        xla_cluster: _.map(renderGraph.xlaClusterColorMap.domain(),
+            function(xlaClusterName) {
+          return {
+            xla_cluster: xlaClusterName,
+            color: renderGraph.xlaClusterColorMap(xlaClusterName)
+          };
+        }),
       });
       this._setRenderHierarchy(renderGraph);
       this.async(function() {
@@ -16111,6 +16555,17 @@ h2 {
    * Apparently, the paper-slider lacks a mixin for those padding values. */
   width: calc(100% + 31px);
 }
+
+#health-pills-loading-spinner {
+  width: 20px;
+  height: 20px;
+  vertical-align: top;
+}
+
+#health-pill-step-number-input {
+  text-align: center;
+  vertical-align: top;
+}
 </style>
 <template is="dom-if" if="{{selectedNode}}">
   <paper-material elevation="1" class="card">
@@ -16118,13 +16573,31 @@ h2 {
     </tf-node-info>
   </paper-material>
 </template>
-<template is="dom-if" if="[[_healthPillsAvailable(nodeNamesToHealthPills)]]">
+<template is="dom-if" if="[[_healthPillsAvailable(debuggerDataEnabled, nodeNamesToHealthPills)]]">
   <paper-material elevation="1" class="card health-pill-legend">
-    <template is="dom-if" if="[[_maxStepIndex]]">
-      <h2>
-        Step of Health Pills: [[_currentStepDisplayValue]]
-      </h2>
-      <paper-slider id="health-pill-step-slider" immediate-value="{{healthPillStepIndex}}" max="[[_maxStepIndex]]" snaps="" step="1" value="{{healthPillStepIndex}}"></paper-slider>
+    <div class="title">
+      Enable all (not just sampled) steps. Requires slow disk read.
+    </div>
+    <paper-toggle-button id="enableAllStepsModeToggle" checked="{{allStepsModeEnabled}}">
+    </paper-toggle-button>
+    <h2>
+      Step of Health Pills:
+      <template is="dom-if" if="[[allStepsModeEnabled]]">
+        <input type="number" id="health-pill-step-number-input" min="0" max="[[_biggestStepEverSeen]]" value="{{specificHealthPillStep::input}}">
+      </template>
+      <template is="dom-if" if="[[!allStepsModeEnabled]]">
+        [[_currentStepDisplayValue]]
+      </template>
+
+      <paper-spinner-lite active="" hidden$="[[!areHealthPillsLoading]]" id="health-pills-loading-spinner"></paper-spinner-lite>
+    </h2>
+    <template is="dom-if" if="[[allStepsModeEnabled]]">
+      <paper-slider id="health-pill-step-slider" immediate-value="{{specificHealthPillStep}}" max="[[_biggestStepEverSeen]]" snaps="" step="1" value="{{specificHealthPillStep}}"></paper-slider>
+    </template>
+    <template is="dom-if" if="[[!allStepsModeEnabled]]">
+      <template is="dom-if" if="[[_maxStepIndex]]">
+        <paper-slider id="health-pill-step-slider" immediate-value="{{healthPillStepIndex}}" max="[[_maxStepIndex]]" snaps="" step="1" value="{{healthPillStepIndex}}"></paper-slider>
+      </template>
     </template>
     <h2>
       Health Pill
@@ -16162,6 +16635,13 @@ h2 {
         type: Number,
         notify: true,
       },
+      // Only relevant if we are in all steps mode, in which case the user may want to view health
+      // pills for a specific step.
+      specificHealthPillStep: {
+        type: Number,
+        value: 0,
+        notify: true,
+      },
       colorBy: String,
       // Two-ways
       selectedNode: {
@@ -16177,6 +16657,11 @@ h2 {
         type: Number,
         notify: true
       },
+      // Whether debugger data is enabled for this instance of Tensorboard.
+      debuggerDataEnabled: Boolean,
+      // Whether health pills are currently being loaded, in which case we show a spinner (and the
+      // current health pills shown might be out of date).
+      areHealthPillsLoading: Boolean,
       healthPillEntries: {
         type: Array,
         value: tf.graph.scene.healthPillEntries,
@@ -16184,7 +16669,19 @@ h2 {
       },
       healthPillValuesForSelectedNode: {
         type: Array,
-        computed: '_computeHealthPillForNode(nodeNamesToHealthPills, healthPillStepIndex, selectedNode)',
+        computed: '_computeHealthPillForNode(nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading)',
+      },
+      // When all-steps mode is enabled, the user can request health pills for any step. In this
+      // mode, Tensorboard makes a request every time the user drags the slider to a different step.
+      allStepsModeEnabled: {
+        type: Boolean,
+        notify: true,
+      },
+      // The biggest step value ever seen. Used to determine what steps of health pills to let the
+      // user fetch in all steps mode.
+      _biggestStepEverSeen: {
+        type: Number,
+        computed: '_computeBiggestStepEverSeen(nodeNamesToHealthPills)',
       },
       _maxStepIndex: {
         type: Number,
@@ -16192,7 +16689,7 @@ h2 {
       },
       _currentStepDisplayValue: {
         type: String,
-        computed: '_computeCurrentStepDisplayValue(nodeNamesToHealthPills, healthPillStepIndex)',
+        computed: '_computeCurrentStepDisplayValue(nodeNamesToHealthPills, healthPillStepIndex, allStepsModeEnabled, specificHealthPillStep, areHealthPillsLoading)',
       },
     },
     listeners: {
@@ -16209,12 +16706,11 @@ h2 {
     _nodeListItemMouseout: function() {
       this.highlightedNode = null;
     },
-    _healthPillsAvailable: function(nodeNamesToHealthPills) {
-      let count = 0;
-      for (let nodeName in nodeNamesToHealthPills) {
-        return true;
-      }
-      return false;
+    _healthPillsAvailable: function(debuggerDataEnabled, nodeNamesToHealthPills) {
+      // So long as there is a mapping (even if empty) from node name to health pills, show the
+      // legend and slider. We do that because, even if no health pills exist at the current step,
+      // the user may desire to change steps, and the slider must show for the user to do that.
+      return debuggerDataEnabled && nodeNamesToHealthPills;
     },
     _computeTensorCountString: function(healthPillValuesForSelectedNode, valueIndex) {
       if (!healthPillValuesForSelectedNode) {
@@ -16225,7 +16721,12 @@ h2 {
       return healthPillValuesForSelectedNode[valueIndex].toFixed(0);
     },
     _computeHealthPillForNode: function(
-        nodeNamesToHealthPills, healthPillStepIndex, selectedNode) {
+        nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading) {
+      if (areHealthPillsLoading) {
+        // Health pills are loading. Do not render data that is out of date.
+        return null;
+      }
+
       if (!selectedNode) {
         // No node is selected.
         return null;
@@ -16237,7 +16738,9 @@ h2 {
         return null;
       }
 
-      const healthPill = healthPills[healthPillStepIndex];
+      // If all steps mode is enabled, we use the first health pill in the list because the JSON
+      // response from the server is a mapping between node name and a list of 1 health pill.
+      const healthPill = healthPills[allStepsModeEnabled ? 0 : healthPillStepIndex];
       if (!healthPill) {
         // This node lacks a health pill at the current step.
         return null;
@@ -16246,16 +16749,44 @@ h2 {
       // The health pill count values start at 2. Each health pill contains 6 values.
       return healthPill.value.slice(2, 8);
     },
-    _computeCurrentStepDisplayValue: function(nodeNamesToHealthPills, healthPillStepIndex) {
+    _computeCurrentStepDisplayValue: function(
+        nodeNamesToHealthPills,
+        healthPillStepIndex,
+        allStepsModeEnabled,
+        specificHealthPillStep,
+        areHealthPillsLoading) {
+      if (allStepsModeEnabled) {
+        // The user seeks health pills for specific step from the server.
+        return specificHealthPillStep.toFixed(0);
+      }
+
+      if (areHealthPillsLoading) {
+        // The current step is undefined.
+        return 0;
+      }
+
       for (let nodeName in nodeNamesToHealthPills) {
         // All nodes have the same number of steps stored, so only examine 1 node. We cannot
         // directly index into the nodeNamesToHealthPills object because we do not have a key.
+        // If all steps mode is enabled, we only have 1 step to show.
         return nodeNamesToHealthPills[nodeName][healthPillStepIndex].step.toFixed(0);
       }
 
       // The current step could not be computed.
       return 0;
     },
+    _computeBiggestStepEverSeen: function(nodeNamesToHealthPills) {
+      for (let nodeName in nodeNamesToHealthPills) {
+        // All nodes have the same number of steps stored, so only examine 1 node.
+        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
+        // of the array will be greater than 1.
+        var healthPills = nodeNamesToHealthPills[nodeName];
+        return Math.max(this._biggestStepEverSeen, healthPills[healthPills.length - 1].step);
+      }
+
+      // No steps seen so far. Default to 0.
+      return this._biggestStepEverSeen || 0;
+    },
     _computeMaxStepIndex: function(nodeNamesToHealthPills) {
       for (let nodeName in nodeNamesToHealthPills) {
         // All nodes have the same number of steps stored, so only examine 1 node.
@@ -16379,7 +16910,7 @@ paper-progress {
     <tf-graph id="graph" graph-hierarchy="{{graphHierarchy}}" basic-graph="[[graph]]" hierarchy-params="[[hierarchyParams]]" render-hierarchy="{{renderHierarchy}}" devices-for-stats="[[devicesForStats]]" stats="[[stats]]" selected-node="{{_selectedNode}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="{{colorByParams}}" progress="{{progress}}" node-names-to-health-pills="[[nodeNamesToHealthPills]]" health-pill-step-index="[[healthPillStepIndex]]"></tf-graph>
   </div>
   <div id="info">
-    <tf-graph-info id="graph-info" title="selected" graph-hierarchy="[[graphHierarchy]]" render-hierarchy="[[renderHierarchy]]" graph="[[graph]]" selected-node="{{_selectedNode}}" selected-node-include="{{_selectedNodeInclude}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="[[colorByParams]]" node-names-to-health-pills="[[nodeNamesToHealthPills]]" health-pill-step-index="{{healthPillStepIndex}}"></tf-graph-info>
+    <tf-graph-info id="graph-info" title="selected" graph-hierarchy="[[graphHierarchy]]" render-hierarchy="[[renderHierarchy]]" graph="[[graph]]" selected-node="{{_selectedNode}}" selected-node-include="{{_selectedNodeInclude}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="[[colorByParams]]" debugger-data-enabled="[[debuggerDataEnabled]]" are-health-pills-loading="[[areHealthPillsLoading]]" node-names-to-health-pills="[[nodeNamesToHealthPills]]" all-steps-mode-enabled="{{allStepsModeEnabled}}" specific-health-pill-step="{{specificHealthPillStep}}" health-pill-step-index="{{healthPillStepIndex}}"></tf-graph-info>
   </div>
   <div class="context-menu"></div>
 </div>
@@ -16410,8 +16941,26 @@ Polymer({
       type: Object,
       notify: true
     },
+    // Whether debugger data is enabled for this instance of Tensorboard.
+    debuggerDataEnabled: Boolean,
+    // Whether health pills are currently being loaded.
+    areHealthPillsLoading: Boolean,
     // A mapping between node name to the tf.graph.scene.HealthPill to render.
     nodeNamesToHealthPills: Object,
+    // Whether the user can request health pills for individual steps from the server. This can be
+    // slow compared the default of showing sampled health pills.
+    allStepsModeEnabled: {
+      type: Boolean,
+      notify: true,
+      value: false,
+    },
+    // Relevant if allStepsModeEnabled. The specific step for which to fetch health pills from the
+    // server for.
+    specificHealthPillStep: {
+      type: Number,
+      notify: true,
+      value: 0,
+    },
     // The step of health pills to show throughout the graph.
     healthPillStepIndex: Number,
     // Private API: Data routing between child components.
@@ -16574,7 +17123,7 @@ svg.icon {
 .title small {
   font-weight: normal;
 }
-.deviceList {
+.deviceList, .xlaClusterList {
   max-height: 200px;
   overflow-y: auto;
 }
@@ -16664,6 +17213,12 @@ table.control-holder {
 table.tf-graph-controls td.input-element-table-data {
   padding: 0 0 0 20px;
 }
+
+/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
+/*  tooltips do not appear. */
+#color-by-radio-group paper-radio-button {
+  pointer-events: auto !important;
+}
 </style>
 <svg width="0" height="0">
   <defs>
@@ -16743,13 +17298,33 @@ table.tf-graph-controls td.input-element-table-data {
   </tbody></table>
   <div class="control-holder">
     <div class="title">Color</div>
-    <paper-radio-group selected="{{colorBy}}">
+    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
       <paper-radio-button name="structure">Structure</paper-radio-button>
+
       <paper-radio-button name="device">Device</paper-radio-button>
-      <template is="dom-if" if="[[_statsNotNull(stats)]]">
-        <paper-radio-button name="compute_time">Compute time</paper-radio-button>
-        <paper-radio-button name="memory">Memory</paper-radio-button>
-      </template>
+
+      <paper-radio-button id="xla-cluster-radio-button" name="xla_cluster" disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
+        XLA Cluster
+      </paper-radio-button>
+      <paper-tooltip for="xla-cluster-radio-button" position="right">
+        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
+      </paper-tooltip>
+
+      <paper-radio-button id="compute-time-radio-button" name="compute_time" disabled="[[!stats]]">
+        Compute time
+      </paper-radio-button>
+      <paper-tooltip for="compute-time-radio-button" position="right">
+        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
+
+      <paper-radio-button id="memory-radio-button" name="memory" disabled="[[!stats]]">
+        Memory
+      </paper-radio-button>
+      <paper-tooltip for="memory-radio-button" position="right">
+        Coloring by memory is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
     </paper-radio-group>
   </div>
   <div>
@@ -16831,6 +17406,31 @@ table.tf-graph-controls td.input-element-table-data {
         </div>
       </div>
     </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
+      <div class="color-text">
+        <div class="xlaClusterList">
+          <table>
+          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
+            <tr>
+              <td style$="[[_getBackgroundColor(item.color)]]">
+                <div class="colorBox"></div>
+              </td>
+              <td>
+                <div>[[item.xla_cluster]]</div>
+              </td>
+            </tr>
+          </template>
+          </table>
+        </div>
+        <br>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#grey-rect" x="0" y="0"></use>
+          </svg>
+          <span class="color-legend-value">unknown XLA cluster</span>
+        </div>
+      </div>
+    </template>
     <template is="dom-if" if="[[_statsNotNull(stats)]]">
       <div class="color-legend-row">
         <svg>
@@ -16840,7 +17440,7 @@ table.tf-graph-controls td.input-element-table-data {
       </div>
     </template>
   </div>
-
+  
   <template is="dom-if" if="[[!_isGradientColoring(stats, colorBy)]]">
     <div class="legend-holder">
       <table>
@@ -17022,8 +17622,10 @@ Polymer({
     this.renderHierarchy.traceInputs = event.target.active;
     tf.graph.scene.node.traceInputs(this.renderHierarchy);
   },
-  _statsNotNull: function(stats) {
-    return stats != null;
+  _xlaClustersProvided: function(renderHierarchy) {
+    return renderHierarchy &&
+        renderHierarchy.hierarchy &&
+        renderHierarchy.hierarchy.xlaClusters.length > 0;
   },
   _statsChanged: function(stats) {
     if (stats == null) {
@@ -17175,7 +17777,7 @@ Polymer({
   <tf-graph-loader id="loader" datasets="[[_datasets]]" selected-dataset="[[_selectedDataset]]" selected-metadata-tag="[[_selectedMetadataTag]]" selected-file="[[_selectedFile]]" out-graph-hierarchy="{{_graphHierarchy}}" out-graph="{{_graph}}" out-stats="{{_stats}}" progress="{{_progress}}" out-hierarchy-params="{{_hierarchyParams}}"></tf-graph-loader>
 </div>
 <div class="center">
-    <tf-graph-board id="graphboard" devices-for-stats="[[_devicesForStats]]" color-by="[[_colorBy]]" color-by-params="{{_colorByParams}}" graph-hierarchy="[[_graphHierarchy]]" graph="[[_graph]]" hierarchy-params="[[_hierarchyParams]]" progress="[[_progress]]" node-names-to-health-pills="[[_nodeNamesToHealthPills]]" health-pill-step-index="[[_healthPillStepIndex]]" render-hierarchy="{{_renderHierarchy}}" stats="[[_stats]]"></tf-graph-board>
+    <tf-graph-board id="graphboard" devices-for-stats="[[_devicesForStats]]" color-by="[[_colorBy]]" color-by-params="{{_colorByParams}}" graph-hierarchy="[[_graphHierarchy]]" graph="[[_graph]]" hierarchy-params="[[_hierarchyParams]]" progress="[[_progress]]" debugger-data-enabled="[[debuggerDataEnabled]]" are-health-pills-loading="[[_areHealthPillsLoading]]" node-names-to-health-pills="[[_nodeNamesToHealthPills]]" all-steps-mode-enabled="{{allStepsModeEnabled}}" specific-health-pill-step="{{specificHealthPillStep}}" health-pill-step-index="[[_healthPillStepIndex]]" render-hierarchy="{{_renderHierarchy}}" stats="[[_stats]]"></tf-graph-board>
 </div>
 </tf-dashboard-layout>
 </template>
@@ -17196,9 +17798,14 @@ Polymer({
 
 <script>
 (function() {
-Polymer({
+TF.Dashboard.TfGraphDashboard = Polymer({
   is: 'tf-graph-dashboard',
+  factoryImpl: function(backend, debuggerDataEnabled) {
+    this.backend = backend;
+    this.debuggerDataEnabled = debuggerDataEnabled;
+  },
   behaviors: [
+    TF.Dashboard.DashboardBehavior("graphs"),
     TF.Dashboard.ReloadBehavior("tf-graph-dashboard"),
     TF.Backend.Behavior,
   ],
@@ -17207,18 +17814,38 @@ Polymer({
     _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
     backend: {type: Object, observer: '_backendChanged'},
     debuggerDataEnabled: Boolean,
+    allStepsModeEnabled: Boolean,
+    specificHealthPillStep: {type: Number, value: 0},
     healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
+    // Whether health pills are currently being loaded, in which case we may want to say show a
+    // spinner.
+    _areHealthPillsLoading: Boolean,
     // Maps the names of nodes to an array of health pills (HealthPillDatums).
     _nodeNamesToHealthPills: {
       type: Object,
       value: {},
     },
     _healthPillStepIndex: Number,
-    runs: Array
+    // A strictly increasing ID. Each request for health pills has a unique ID. This helps us
+    // identify stale requests.
+    _healthPillRequestId: {type: Number, value: 1},
+    // The setTimeout ID for the pending request for health pills at a specific step.
+    _healthPillStepRequestTimerId: Number,
+    // The request for health pills at a specific step (as opposed to all sampled health pills) may
+    // involve slow disk reads. Hence, we throttle to 1 of those requests every this many ms.
+    _healthPillStepRequestTimerDelay: {
+      type: Number,
+      value: 500,
+      readOnly: true,
+    },
+    runs: Array,
   },
   listeners: {
     'node-toggle-expand': '_handleNodeToggleExpand',
   },
+  observers: [
+    '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+  ],
   reload: function() {
     if (!this.debuggerDataEnabled ||
         !this.healthPillsToggledOn ||
@@ -17257,12 +17884,51 @@ Polymer({
       }.bind(this));
   },
   _requestHealthPills: function() {
-    this.backend.healthPills(this._renderHierarchy.getNamesOfRenderedOps()).then(function(result) {
+    this.set('_areHealthPillsLoading', true);
+    const requestId = ++this._healthPillRequestId;
+
+    if (this._healthPillStepRequestTimerId !== null) {
+      // A request for health pills is already scheduled to be initiated. Clear it, and schedule a
+      // new request.
+      window.clearTimeout(this._healthPillStepRequestTimerId);
+      this._healthPillStepRequestTimerId = null;
+    }
+
+    if (this.allStepsModeEnabled) {
+      // This path may be slow. Schedule network requests to start some time later. If another
+      // request is scheduled in the mean time, drop this current request.
+      this._healthPillStepRequestTimerId = setTimeout(function() {
+        this._healthPillStepRequestTimerId = null;
+        this._initiateNetworkRequestForHealthPills(requestId);
+      }.bind(this), this._healthPillStepRequestTimerDelay);
+    } else {
+      // The user is fetching sampled steps. This path is fast, so no need to throttle. Directly
+      // fetch the health pills across the network.
+      this._initiateNetworkRequestForHealthPills(requestId);
+    }
+  },
+  // Initiates the network request for health pills. Do not directly call this method - network
+  // requests may be throttled. Instead, call _requestHealthPills, which uses this method.
+  _initiateNetworkRequestForHealthPills: function(requestId) {
+    if (this._healthPillRequestId !== requestId) {
+      // This possibly scheduled request was outdated before it was even sent across the network. Do
+      // not bother initiating it.
+      return;
+    }
+
+    const specificStep = this.allStepsModeEnabled ? this.specificHealthPillStep : undefined;
+    this.backend.healthPills(this._renderHierarchy.getNamesOfRenderedOps(), specificStep).then(
+        function(result) {
       if (!this.healthPillsToggledOn) {
         // The user has opted to hide health pills via the toggle button.
         return;
       }
 
+      if (requestId !== this._healthPillRequestId) {
+        // This response is no longer relevant.
+        return;
+      }
+
       // Set the index for which step to show for the health pills. By default, show the last step.
       // A precondition we assume (that Tensorboard's reservoir sampling guarantees) is that all
       // node names should be mapped to the same number of steps.
@@ -17272,6 +17938,8 @@ Polymer({
       }
 
       this.set('_nodeNamesToHealthPills', result);
+      this.set('_areHealthPillsLoading', false);
+      this.set('_healthPillStepRequestTimerId', null);
     }.bind(this));
   },
   _datasetsEmpty: function(datasets) {
@@ -17295,9 +17963,195 @@ Polymer({
       this.set('_nodeNamesToHealthPills', {});
     }
   },
+  // Fetch health pills for a specific step if applicable.
+  _maybeFetchHealthPillsAtSpecificStep: function(allStepsModeEnabled, specificHealthPillStep) {
+    if (!this._renderHierarchy) {
+      // The graph is not ready yet.
+      return;
+    }
+
+    this._requestHealthPills();
+  },
 });
 })();
 </script>
+<link rel="import" href="../paper-material/paper-material.html">
+
+
+<style>
+  tf-text-loader p {
+    margin: 0.3em 0;
+  }
+
+  tf-text-loader table {
+    border-collapse: collapse;
+  }
+
+  tf-text-loader table th {
+    font-weight: 600;
+  }
+
+  tf-text-loader table th,
+  tf-text-loader table td {
+    padding: 6px 13px;
+    border: 1px solid #dfe2e5;
+  }
+
+  tf-text-loader table tr {
+    background-color: #fff;
+    border-top: 1px solid #c6cbd1;
+  }
+
+</style>
+<dom-module id="tf-text-loader" assetpath="../tf-text-dashboard/">
+
+  
+  <template>
+    <style include="scrollbar-style"></style>
+    <paper-material elevation="1" id="outer" class="container scrollbar">
+      <template id="repeater" is="dom-repeat" items="[[_texts]]">
+      <paper-material elevation="1" class="step-container">
+        step <span class="step-value">[[_numfmt(item.step)]]</span>
+      </paper-material>
+      <paper-material elevation="1" inner-h-t-m-l="[[item.text]]" class="text">
+        </paper-material>
+      </template>
+    </paper-material>
+
+
+    <style>
+      #outer {
+        display: block;
+        overflow: auto;
+        max-height: 500px;
+        position: relative;
+        border-radius: 3px;
+        border: 2px solid black;
+      }
+      .text {
+        margin: 0 10px 10px 10px;
+        border-radius: 0 3px 3px 3px;
+        background-color: white;
+        padding: 5px;
+        word-break: break-word;
+      }
+      .step-container {
+        border-left: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        border-top: 1px solid #ccc;
+        border-radius: 3px 3px 0 0;
+        font-style: italic;
+        margin-top: 10px;
+        background-color: var(--tb-ui-light-accent);
+        display: inline-block;
+        margin-left: 9px;
+        padding: 3px;
+        font-size: 12px;
+      }
+
+    </style>
+
+  </template>
+  <script>
+    Polymer({
+      is: "tf-text-loader",
+      properties: {
+        colorScale: Object,
+        run: String,
+        // This is an array of Tensorboard Text&Datum objects (See backend.ts for details). The
+        // properties of objects in this array are
+        // {
+        //   wall_time: Date,
+        //   step: number,
+        //   text: string,
+        // }
+        // they are ordered from most recent to oldest
+        _texts: {
+          type: Array,
+          value: [],
+        },
+
+      },
+      redraw: function() {
+        // Other dashboards logic requires a redraw method to be defined.
+      },
+      setVisibleSeries: function(runs) {
+        // Do nothing.
+      },
+      setSeriesData: function(run, texts) {
+        this.set("run", run);
+        this.set("_texts", texts.reverse());
+
+        // Update the border color based on the run.
+        var color = this.colorScale.scale(run);
+        this.$$("#outer").style.borderColor = color;
+      },
+      _numfmt: function(n) {
+        return d3.format(",")(n);
+      }
+    });
+  </script>
+</dom-module>
+
+<dom-module id="tf-text-dashboard" assetpath="../tf-text-dashboard/">
+  <template>
+    <paper-dialog with-backdrop="" id="actual-text-size-dialog"></paper-dialog>
+    <div id="plumbing">
+      <tf-color-scale id="colorScale" runs="[[runs]]" out-color-scale="{{_colorScale}}"></tf-color-scale>
+    </div>
+
+    <tf-dashboard-layout>
+      <div class="sidebar">
+        <tf-sidebar-helper backend="[[backend]]" categories="{{_categories}}" color-scale="[[_colorScale]]" run2tag="[[run2tag]]" runs="[[runs]]" selected-runs="{{_selectedRuns}}">
+        </tf-sidebar-helper>
+      </div>
+      <div class="center">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+          <template>
+            <tf-text-loader color-scale="[[_colorScale]]"></tf-text-loader>
+          </template>
+        </tf-panes-helper>
+      </div>
+    </tf-dashboard-layout>
+    <style include="dashboard-style"></style>
+    <style>
+      tf-panes-helper {
+        --card-width: 100%;
+        --card-height: auto;
+        --card-expanded-width: 100%;
+        --card-expanded-height: 1000px;
+        --card-padding: 0 5px 5px 5px;
+        --show-expand-button: none;
+      }
+
+    </style>
+  </template>
+  <script>
+    TF.Dashboard.TfTextDashboard = Polymer({
+      is: "tf-text-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
+      properties: {
+        backend: Object,
+        dataType: {
+          type: String,
+          value: "text"
+        },
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("text"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
+      ],
+      attached: function() {
+        this.async(function() {
+          this.fire("rendered");
+        });
+      },
+    });
+  </script>
+</dom-module>
 <dom-module id="vz-projector-styles" assetpath="../vz-projector/">
 <template>
 <style>
@@ -17575,13 +18429,13 @@ paper-textarea {
       </paper-tooltip>
     </div>
     <div id="icon-container">
-
+      
       <paper-icon-button id="expand-more" icon="expand-less" on-tap="_expandMore"></paper-icon-button>
       <paper-icon-button id="expand-less" style="display: none" icon="expand-more" on-tap="_expandLess"></paper-icon-button>
     </div>
   </div>
   <iron-collapse id="panel">
-
+    
     <div id="state-section">
       <template is="dom-if" if="[[!savedStates.length]]">
         <p id="no-bookmarks">
@@ -17838,7 +18692,7 @@ paper-dropdown-menu paper-item {
 </style>
 <div class="title">DATA</div>
 <div class="container">
-
+  
   <template is="dom-if" if="[[_hasChoices(runNames)]]">
     <paper-dropdown-menu no-animations="" label="[[_getNumRunsLabel(runNames)]] found">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedRun}}">
@@ -17852,7 +18706,7 @@ paper-dropdown-menu paper-item {
   </template>
 
   <template is="dom-if" if="[[tensorNames]]">
-
+    
     <paper-dropdown-menu no-animations="" label="[[_getNumTensorsLabel(tensorNames)]] found">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedTensor}}">
         <template is="dom-repeat" items="[[tensorNames]]">
@@ -17866,7 +18720,7 @@ paper-dropdown-menu paper-item {
       </paper-listbox>
     </paper-dropdown-menu>
   </template>
-
+  
   <template is="dom-if" if="[[_hasChoices(labelOptions)]]">
     <paper-dropdown-menu no-animations="" label="Label by">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedLabelOption}}">
@@ -17879,7 +18733,7 @@ paper-dropdown-menu paper-item {
     </paper-dropdown-menu>
   </template>
 
-
+  
   <div hidden$="[[!_hasChoices(colorOptions)]]" class="colorby-container">
     <paper-dropdown-menu id="colorby" no-animations="" label="Color by">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedColorOptionName}}">
@@ -17920,7 +18774,7 @@ paper-dropdown-menu paper-item {
       </paper-tooltip>
       <paper-button id="upload" class="ink-button" onclick="dataDialog.open()">Load data</paper-button>
     </span>
-    <span>
+    <span id="publish-container">
       <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds="">
         Publish your embedding visualization and data
       </paper-tooltip>
@@ -17931,7 +18785,7 @@ paper-dropdown-menu paper-item {
     <paper-dialog id="dataDialog" with-backdrop="">
       <h2>Load data from your computer</h2>
       <paper-dialog-scrollable class="scrollable-container">
-        <div class="data-step">
+        <div class="data-step" id="upload-tensors-step-container">
           <div class="upload-step">
             <div>
                 <b><span class="step-label">Step 1:</span> Load a TSV file of vectors.</b>
@@ -17955,7 +18809,7 @@ paper-dropdown-menu paper-item {
         <div class="data-step">
           <div class="upload-step">
             <div>
-                <span class="step-label"><b>Step 2</b> (optional):</span> <b>Load a TSV file of metadata.</b>
+                <span class="step-label" id="upload-metadata-label"><b>Step 2</b> (optional):</span> <b>Load a TSV file of metadata.</b>
             </div>
           </div>
           <div class="data-step-contents">
@@ -17984,7 +18838,7 @@ paper-dropdown-menu paper-item {
         <div>
           <p>
             If you'd like to share your visualization with the world, follow these simple steps.
-            See <a target="_blank" href="https://www.tensorflow.org/versions/master/how_tos/embedding_viz/index.md">this tutorial</a> for more.
+            See <a target="_blank" href="https://www.tensorflow.org/get_started/embedding_viz">this tutorial</a> for more.
           </p>
           <h4><span class="step-label">Step 1:</span> Make data public</h4>
           <p>
@@ -18511,7 +19365,7 @@ paper-dropdown-menu paper-item {
     </div>
   </div>
   <div class="container">
-
+    
     <div data-panel="tsne" class="ink-panel-content">
       <div class="slider">
         <label>Dimension</label>
@@ -18562,10 +19416,10 @@ paper-dropdown-menu paper-item {
         </a>
       </p>
     </div>
-
+    
     <div data-panel="pca" class="ink-panel-content">
       <div class="two-columns">
-        <div>
+        <div> 
           <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations="" label="X">
             <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaX}}">
               <paper-item disabled="" class="dropdown-item header">
@@ -18595,7 +19449,7 @@ paper-dropdown-menu paper-item {
             </paper-listbox>
           </paper-dropdown-menu>
         </div>
-        <div>
+        <div> 
           <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations="" label="Y">
             <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaY}}">
               <paper-item disabled="" class="dropdown-item header">
@@ -18622,7 +19476,7 @@ paper-dropdown-menu paper-item {
         For fast results, the data was sampled to [[getPcaSampleSizeText()]] points and randomly projected down to [[getPcaSampledDimText()]] dimensions.
       </paper-tooltip>
     </div>
-
+    
     <div data-panel="custom" class="ink-panel-content">
       <paper-dropdown-menu style="width: 100%" no-animations="" label="Search by">
         <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{customSelectedSearchByMetadataOption}}">
@@ -18950,7 +19804,7 @@ paper-dropdown-menu paper-item {
 </div>
 <paper-toast id="toast" always-on-top=""></paper-toast>
 
-</template>
+</template> 
 </dom-module>
 <dom-module id="vz-projector-dashboard" assetpath="../vz-projector/">
 <template>
@@ -18961,18 +19815,33 @@ paper-dropdown-menu paper-item {
 </template>
 <script>
 (function() {
-Polymer({
+TF.Dashboard.VzProjectorDashboard = Polymer({
   is: 'vz-projector-dashboard',
+  factoryImpl: function(routePrefix) {
+    this.routePrefix = routePrefix;
+  },
   properties: {
     dataNotFound: Boolean,
     routePrefix: String
   },
-  ready() {
-    var self = this;
-    d3.json(this.routePrefix + '/runs', function(err, runs) {
-      self.dataNotFound = (runs.length === 0);
+  behaviors: [
+    TF.Dashboard.DashboardBehavior("embeddings"),
+  ],
+  observers: [
+    "_routePrefixSet(routePrefix)",
+  ],
+  reload: function() {
+    // Do not reload the embedding projector. Reloading could take a long time.
+  },
+  _routePrefixSet: function(routePrefix) {
+    if (routePrefix === undefined) {
+      // The route prefix has not been set yet.
+      return;
+    }
+    d3.json(routePrefix + '/runs', (err, runs) => {
+      this.set('dataNotFound', runs.length === 0);
     });
-  }
+  },
 });
 })();
 </script>
@@ -19051,54 +19920,23 @@ var TF;
         <div id="toolbar-content">
           <div class="toolbar-title">TensorBoard</div>
           <paper-tabs selected="{{modeIndex}}" noink="" class="tabs" id="tabs">
-            <template is="dom-repeat" items="[[tabs]]">
-              <template is="dom-if" if="[[_isTabEnabled(item)]]">
-                <paper-tab data-mode="[[item]]">[[item]]</paper-tab>
+            <template is="dom-repeat" items="[[_dashboards]]">
+              <template is="dom-if" if="[[_isTabEnabled(item.name)]]">
+                <paper-tab data-mode="[[item.name]]">[[item.name]]</paper-tab>
               </template>
             </template>
           </paper-tabs>
           <div class="global-actions">
             <paper-icon-button icon="refresh" on-tap="reload" disabled$="[[_isReloadDisabled(mode)]]" id="reload-button"></paper-icon-button>
-            <paper-icon-button icon="settings" on-tap="openSettings" id="settings-button"></paper-icon-button>
-            <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md" tabindex="-1">
-              <paper-icon-button icon="help-outline"></paper-icon-button>
-            </a>
-          </div>
-        </div>
-      </paper-toolbar>
-
-      <div id="content" class="fit">
-        <content id="injected-overview"></content>
-
-        <template is="dom-if" if="[[_modeIsScalars(mode)]]">
-          <tf-scalar-dashboard id="scalars" backend="[[_backend]]" router="[[router]]"></tf-scalar-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsImages(mode)]]">
-          <tf-image-dashboard id="images" backend="[[_backend]]"></tf-image-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsAudio(mode)]]">
-          <tf-audio-dashboard id="audio" backend="[[_backend]]"></tf-audio-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsGraphs(mode)]]">
-          <tf-graph-dashboard id="graphs" backend="[[_backend]]" debugger-data-enabled="[[_debuggerDataEnabled]]"></tf-graph-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsDistributions(mode)]]">
-          <tf-distribution-dashboard id="distributions" backend="[[_backend]]"></tf-distribution-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsHistograms(mode)]]">
-          <tf-histogram-dashboard id="histograms" backend="[[_backend]]"></tf-histogram-dashboard>
-        </template>
+            <paper-icon-button icon="settings" on-tap="openSettings" id="settings-button"></paper-icon-button>
+            <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md" tabindex="-1">
+              <paper-icon-button icon="help-outline"></paper-icon-button>
+            </a>
+          </div>
+        </div>
+      </paper-toolbar>
 
-        <template is="dom-if" if="[[_modeIsEmbeddings(mode)]]">
-          <vz-projector-dashboard id="projector" route-prefix="/data/plugin/projector">
-          </vz-projector-dashboard>
-        </template>
-      </div>
+      <div id="content" class="fit"></div>
     </paper-header-panel>
 
     <style>
@@ -19189,16 +20027,21 @@ var TF;
             return match && match.length == 1;
           },
         },
+        _dashboards: {
+          type: Array,
+          computed: "_makeDashboardList(_backend, router, _debuggerDataEnabled)",
+        },
+        // Maps dashboard name to dashboard object.
+        _dashboardMapping: {
+          type: Object,
+          computed: "_makeDashboardMapping(_dashboards)",
+        },
         // Which tab is selected (scalars, graph, images etc).
         mode: {
           type: String,
           computed: '_getModeFromIndex(modeIndex)',
           notify: true,
-        },
-        tabs: {
-          type: Array,
-          readOnly: true,
-          value: TF.Globals.TABS,
+          observer: '_modeChanged',
         },
         // If this is set to a string, TensorBoard will switch to "demo mode"
         // and attempt to load serialized json data from that directory. You can
@@ -19223,7 +20066,7 @@ var TF;
         return true;
       },
       _getModeFromIndex: function(modeIndex) {
-        var mode = this.tabs[modeIndex];
+        var mode = this._dashboards[modeIndex].name;
         TF.URIStorage.setString(TF.URIStorage.TAB, mode);
         return mode;
       },
@@ -19235,31 +20078,10 @@ var TF;
         return new TF.Backend.Backend(router);
       },
       _isReloadDisabled: function(mode) {
-        return !this._debuggerDataEnabled && this._modeIsGraphs(mode);
-      },
-      _modeIsScalars: function(mode) {
-        return mode === "scalars";
-      },
-      _modeIsImages: function(mode) {
-        return mode === "images";
-      },
-      _modeIsAudio: function(mode) {
-        return mode === "audio";
-      },
-      _modeIsGraphs: function(mode) {
-        return mode === "graphs";
-      },
-      _modeIsEmbeddings: function(mode) {
-        return mode === "embeddings";
-      },
-      _modeIsDistributions: function(mode) {
-        return mode === "distributions";
-      },
-      _modeIsHistograms: function(mode) {
-        return mode === "histograms";
+        return !this._debuggerDataEnabled && mode == 'graphs';
       },
       selectedDashboard: function() {
-        var dashboard = this.$$("#" + this.mode);
+        var dashboard = this._dashboardMapping[this.mode];
         if (dashboard == null) {
           throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
         }
@@ -19273,24 +20095,67 @@ var TF;
           this._getModeFromHash();
         }.bind(this));
       },
+      _makeDashboardList: function(backend, router, debuggerDataEnabled) {
+        if (!backend || !router) {
+          // The dashboards require these entities. We are not ready to construct dashboards.
+          return null;
+        }
+
+        return [
+          new TF.Dashboard.TfScalarDashboard(backend, router),
+          new TF.Dashboard.TfImageDashboard(backend),
+          new TF.Dashboard.TfAudioDashboard(backend),
+          new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
+          new TF.Dashboard.TfDistributionDashboard(backend),
+          new TF.Dashboard.TfHistogramDashboard(backend),
+          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
+          new TF.Dashboard.TfTextDashboard(backend),
+        ];
+      },
+      _makeDashboardMapping: function(dashboards) {
+        if (!dashboards) {
+          return null;
+        }
+
+        let mapping = {};
+        dashboards.forEach(function(dashboard) {
+          mapping[dashboard.name] = dashboard;
+        });
+        return mapping;
+      },
       _getModeFromHash: function() {
         var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
-        var modeIndex = this.tabs.indexOf(tabName);
-        if (modeIndex == -1 && this.modeIndex == null) {
+        var modeIndex;
+        for (var i = 0; i < this._dashboards.length; i++) {
+          if (this._dashboards[i].name == tabName) {
+            modeIndex = i;
+            break;
+          }
+        }
+
+        if (modeIndex === undefined && this.modeIndex == null) {
           // Select the first tab as default.
           this.set('modeIndex', 0);
         }
-        if (modeIndex != -1 && modeIndex != this.modeIndex) {
+        if (modeIndex !== undefined && modeIndex != this.modeIndex) {
           this.set('modeIndex', modeIndex);
         }
       },
-      reload: function() {
-        if (this._modeIsEmbeddings(this.mode)) {
-          return;
+      _modeChanged: function(mode) {
+        let currentDashboard = this.$.content.firstChild;
+        if (currentDashboard) {
+          this.$.content.removeChild(currentDashboard);
         }
-        if (!this._debuggerDataEnabled && this._modeIsGraphs(this.mode)) {
+
+        if (!mode || !this._dashboardMapping) {
           return;
         }
+
+        // Append the new dashboard.
+        const newDashboard = this.selectedDashboard();
+        this.$.content.appendChild(newDashboard);
+      },
+      reload: function() {
         this.selectedDashboard().reload();
       },
       openSettings: function() {
@@ -19298,7 +20163,7 @@ var TF;
       },
     });
   </script>
-
+  
   <script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 "use strict";
 var AnalyticsLogger = (function () {
@@ -19837,15 +20702,18 @@ var DemoDataProvider = (function () {
         }
         else {
             logging.setModalMessage('Fetching tensors...', data_provider_1.TENSORS_MSG_ID);
-            d3.text(url, function (error, dataString) {
-                if (error) {
-                    logging.setErrorMessage(error.responseText, 'fetching tensors');
-                    return;
-                }
-                dataProvider.parseTensors(dataString).then(function (points) {
+            var request_1 = new XMLHttpRequest();
+            request_1.open('GET', url);
+            request_1.responseType = 'arraybuffer';
+            request_1.onerror = function () {
+                logging.setErrorMessage(request_1.responseText, 'fetching tensors');
+            };
+            request_1.onload = function () {
+                dataProvider.parseTensors(request_1.response).then(function (points) {
                     callback(new data_1.DataSet(points));
                 });
-            });
+            };
+            request_1.send();
         }
     };
     DemoDataProvider.prototype.retrieveSpriteAndMetadata = function (run, tensorName, callback) {
@@ -20131,19 +20999,69 @@ function parseRawMetadata(contents, callback) {
     parseMetadata(contents).then(function (result) { return callback(result); });
 }
 exports.parseRawMetadata = parseRawMetadata;
+/**
+ * Parse an ArrayBuffer in a streaming fashion line by line (or custom delim).
+ * Can handle very large files.
+ *
+ * @param content The array buffer.
+ * @param callback The callback called on each line.
+ * @param chunkSize The size of each read chunk, defaults to ~1MB. (optional)
+ * @param delim The delimiter used to split a line, defaults to '\n'. (optional)
+ * @returns A promise for when it is finished.
+ */
+function streamParse(content, callback, chunkSize, delim) {
+    if (chunkSize === void 0) { chunkSize = 1000000; }
+    if (delim === void 0) { delim = '\n'; }
+    return new Promise(function (resolve, reject) {
+        var offset = 0;
+        var bufferSize = content.byteLength - 1;
+        var data = '';
+        function readHandler(str) {
+            offset += chunkSize;
+            var parts = str.split(delim);
+            var first = data + parts[0];
+            if (parts.length === 1) {
+                data = first;
+                readChunk(offset, chunkSize);
+                return;
+            }
+            data = parts[parts.length - 1];
+            callback(first);
+            for (var i = 1; i < parts.length - 1; i++) {
+                callback(parts[i]);
+            }
+            if (offset >= bufferSize) {
+                if (data) {
+                    callback(data);
+                }
+                resolve();
+                return;
+            }
+            readChunk(offset, chunkSize);
+        }
+        function readChunk(offset, size) {
+            var contentChunk = content.slice(offset, offset + size);
+            var blob = new Blob([contentChunk]);
+            var file = new FileReader();
+            file.onload = function (e) { return readHandler(e.target.result); };
+            file.readAsText(blob);
+        }
+        readChunk(offset, chunkSize);
+    });
+}
 /** Parses a tsv text file. */
-function parseTensors(content, delim) {
-    if (delim === void 0) { delim = '\t'; }
-    var data = [];
-    var numDim;
-    return util_1.runAsyncTask('Parsing tensors...', function () {
-        var lines = content.split('\n');
-        lines.forEach(function (line) {
+function parseTensors(content, valueDelim) {
+    if (valueDelim === void 0) { valueDelim = '\t'; }
+    logging.setModalMessage('Parsing tensors...', exports.TENSORS_MSG_ID);
+    return new Promise(function (resolve, reject) {
+        var data = [];
+        var numDim;
+        streamParse(content, function (line) {
             line = line.trim();
             if (line === '') {
                 return;
             }
-            var row = line.split(delim);
+            var row = line.split(valueDelim);
             var dataPoint = {
                 metadata: {},
                 vector: null,
@@ -20170,11 +21088,10 @@ function parseTensors(content, delim) {
                 logging.setModalMessage('Parsing failed. Found a vector with only one dimension?');
                 throw Error('Parsing failed');
             }
+        }).then(function () {
+            logging.setModalMessage(null, exports.TENSORS_MSG_ID);
+            resolve(data);
         });
-        return data;
-    }, exports.TENSORS_MSG_ID).then(function (dataPoints) {
-        logging.setModalMessage(null, exports.TENSORS_MSG_ID);
-        return dataPoints;
     });
 }
 exports.parseTensors = parseTensors;
@@ -20250,18 +21167,27 @@ function analyzeMetadata(columnNames, pointsMetadata) {
 }
 exports.analyzeMetadata = analyzeMetadata;
 function parseMetadata(content) {
-    return util_1.runAsyncTask('Parsing metadata...', function () {
-        var lines = content.split('\n').filter(function (line) { return line.trim().length > 0; });
-        var hasHeader = lines[0].indexOf('\t') >= 0;
+    logging.setModalMessage('Parsing metadata...', exports.METADATA_MSG_ID);
+    return new Promise(function (resolve, reject) {
         var pointsMetadata = [];
-        // If the first row doesn't contain metadata keys, we assume that the values
-        // are labels.
+        var hasHeader = false;
+        var lineNumber = 0;
         var columnNames = ['label'];
-        if (hasHeader) {
-            columnNames = lines[0].split('\t');
-            lines = lines.slice(1);
-        }
-        lines.forEach(function (line) {
+        streamParse(content, function (line) {
+            if (line.trim().length === 0) {
+                return;
+            }
+            if (lineNumber === 0) {
+                hasHeader = line.indexOf('\t') >= 0;
+                // If the first row doesn't contain metadata keys, we assume that the
+                // values are labels.
+                if (hasHeader) {
+                    columnNames = line.split('\t');
+                    lineNumber++;
+                    return;
+                }
+            }
+            lineNumber++;
             var rowValues = line.split('\t');
             var metadata = {};
             pointsMetadata.push(metadata);
@@ -20271,14 +21197,13 @@ function parseMetadata(content) {
                 value = (value === '' ? null : value);
                 metadata[name] = value;
             });
+        }).then(function () {
+            logging.setModalMessage(null, exports.METADATA_MSG_ID);
+            resolve({
+                stats: analyzeMetadata(columnNames, pointsMetadata),
+                pointsInfo: pointsMetadata
+            });
         });
-        return {
-            stats: analyzeMetadata(columnNames, pointsMetadata),
-            pointsInfo: pointsMetadata
-        };
-    }, exports.METADATA_MSG_ID).then(function (metadata) {
-        logging.setModalMessage(null, exports.METADATA_MSG_ID);
-        return metadata;
     });
 }
 exports.parseMetadata = parseMetadata;
@@ -20297,14 +21222,17 @@ function retrieveSpriteAndMetadataInfo(metadataPath, spriteImagePath, spriteMeta
     if (metadataPath) {
         metadataPromise = new Promise(function (resolve, reject) {
             logging.setModalMessage('Fetching metadata...', exports.METADATA_MSG_ID);
-            d3.text(metadataPath, function (err, rawMetadata) {
-                if (err) {
-                    logging.setErrorMessage(err.responseText, 'fetching metadata');
-                    reject(err);
-                    return;
-                }
-                resolve(parseMetadata(rawMetadata));
-            });
+            var request = new XMLHttpRequest();
+            request.open('GET', metadataPath);
+            request.responseType = 'arraybuffer';
+            request.onerror = function () {
+                logging.setErrorMessage(request.responseText, 'fetching metadata');
+                reject();
+            };
+            request.onload = function () {
+                resolve(parseMetadata(request.response));
+            };
+            request.send(null);
         });
     }
     var spriteMsgId = null;
@@ -20364,8 +21292,25 @@ exports.PCA_SAMPLE_SIZE = 50000;
 exports.PCA_SAMPLE_DIM = 200;
 /** Number of pca components to compute. */
 var NUM_PCA_COMPONENTS = 10;
-/** Reserved metadata attribute used for trace information. */
-var TRACE_METADATA_ATTR = '__next__';
+/**
+ * Reserved metadata attributes used for sequence information
+ * NOTE: Use "__seq_next__" as "__next__" is deprecated.
+ */
+var SEQUENCE_METADATA_ATTRS = ['__next__', '__seq_next__'];
+function getSequenceNextPointIndex(pointMetadata) {
+    var sequenceAttr = null;
+    for (var _i = 0, SEQUENCE_METADATA_ATTRS_1 = SEQUENCE_METADATA_ATTRS; _i < SEQUENCE_METADATA_ATTRS_1.length; _i++) {
+        var metadataAttr = SEQUENCE_METADATA_ATTRS_1[_i];
+        if (metadataAttr in pointMetadata && pointMetadata[metadataAttr] !== '') {
+            sequenceAttr = pointMetadata[metadataAttr];
+            break;
+        }
+    }
+    if (sequenceAttr == null) {
+        return null;
+    }
+    return +sequenceAttr;
+}
 /**
  * Dataset contains a DataPoints array that should be treated as immutable. This
  * acts as a working subset of the original data, with cached properties
@@ -20388,52 +21333,52 @@ var DataSet = (function () {
         this.hasTSNERun = false;
         this.points = points;
         this.shuffledDataIndices = util.shuffle(d3.range(this.points.length));
-        this.traces = this.computeTraces(points);
+        this.sequences = this.computeSequences(points);
         this.dim = [this.points.length, this.points[0].vector.length];
         this.spriteAndMetadataInfo = spriteAndMetadataInfo;
     }
-    DataSet.prototype.computeTraces = function (points) {
-        // Keep a list of indices seen so we don't compute traces for a given
+    DataSet.prototype.computeSequences = function (points) {
+        // Keep a list of indices seen so we don't compute sequences for a given
         // point twice.
         var indicesSeen = new Int8Array(points.length);
-        // Compute traces.
-        var indexToTrace = {};
-        var traces = [];
+        // Compute sequences.
+        var indexToSequence = {};
+        var sequences = [];
         for (var i = 0; i < points.length; i++) {
             if (indicesSeen[i]) {
                 continue;
             }
             indicesSeen[i] = 1;
-            // Ignore points without a trace attribute.
-            var next = points[i].metadata[TRACE_METADATA_ATTR];
-            if (next == null || next === '') {
+            // Ignore points without a sequence attribute.
+            var next = getSequenceNextPointIndex(points[i].metadata);
+            if (next == null) {
                 continue;
             }
-            if (next in indexToTrace) {
-                var existingTrace = indexToTrace[+next];
+            if (next in indexToSequence) {
+                var existingSequence = indexToSequence[next];
                 // Pushing at the beginning of the array.
-                existingTrace.pointIndices.unshift(i);
-                indexToTrace[i] = existingTrace;
+                existingSequence.pointIndices.unshift(i);
+                indexToSequence[i] = existingSequence;
                 continue;
             }
-            // The current point is pointing to a new/unseen trace.
-            var newTrace = { pointIndices: [] };
-            indexToTrace[i] = newTrace;
-            traces.push(newTrace);
+            // The current point is pointing to a new/unseen sequence.
+            var newSequence = { pointIndices: [] };
+            indexToSequence[i] = newSequence;
+            sequences.push(newSequence);
             var currentIndex = i;
             while (points[currentIndex]) {
-                newTrace.pointIndices.push(currentIndex);
-                var next_1 = points[currentIndex].metadata[TRACE_METADATA_ATTR];
-                if (next_1 != null && next_1 !== '') {
-                    indicesSeen[+next_1] = 1;
-                    currentIndex = +next_1;
+                newSequence.pointIndices.push(currentIndex);
+                var next_1 = getSequenceNextPointIndex(points[currentIndex].metadata);
+                if (next_1 != null) {
+                    indicesSeen[next_1] = 1;
+                    currentIndex = next_1;
                 }
                 else {
                     currentIndex = -1;
                 }
             }
         }
-        return traces;
+        return sequences;
     };
     DataSet.prototype.projectionCanBeRendered = function (projection) {
         if (projection !== 'tsne') {
@@ -21348,8 +22293,8 @@ var renderContext_1 = require('./renderContext');
 var scatterPlot_1 = require('./scatterPlot');
 var scatterPlotVisualizer3DLabels_1 = require('./scatterPlotVisualizer3DLabels');
 var scatterPlotVisualizerCanvasLabels_1 = require('./scatterPlotVisualizerCanvasLabels');
+var scatterPlotVisualizerPolylines_1 = require('./scatterPlotVisualizerPolylines');
 var scatterPlotVisualizerSprites_1 = require('./scatterPlotVisualizerSprites');
-var scatterPlotVisualizerTraces_1 = require('./scatterPlotVisualizerTraces');
 var vector = require('./vector');
 var LABEL_FONT_SIZE = 10;
 var LABEL_SCALE_DEFAULT = 1.0;
@@ -21372,15 +22317,15 @@ var LABELS_3D_COLOR_UNSELECTED = 0xFFFFFF;
 var LABELS_3D_COLOR_NO_SELECTION = 0xFFFFFF;
 var SPRITE_IMAGE_COLOR_UNSELECTED = 0xFFFFFF;
 var SPRITE_IMAGE_COLOR_NO_SELECTION = 0xFFFFFF;
-var TRACE_START_HUE = 60;
-var TRACE_END_HUE = 360;
-var TRACE_SATURATION = 1;
-var TRACE_LIGHTNESS = .3;
-var TRACE_DEFAULT_OPACITY = .2;
-var TRACE_DEFAULT_LINEWIDTH = 2;
-var TRACE_SELECTED_OPACITY = .9;
-var TRACE_SELECTED_LINEWIDTH = 3;
-var TRACE_DESELECTED_OPACITY = .05;
+var POLYLINE_START_HUE = 60;
+var POLYLINE_END_HUE = 360;
+var POLYLINE_SATURATION = 1;
+var POLYLINE_LIGHTNESS = .3;
+var POLYLINE_DEFAULT_OPACITY = .2;
+var POLYLINE_DEFAULT_LINEWIDTH = 2;
+var POLYLINE_SELECTED_OPACITY = .9;
+var POLYLINE_SELECTED_LINEWIDTH = 3;
+var POLYLINE_DESELECTED_OPACITY = .05;
 var SCATTER_PLOT_CUBE_LENGTH = 2;
 /** Color scale for nearest neighbors. */
 var NN_COLOR_SCALE = d3.scale.linear()
@@ -21431,8 +22376,8 @@ var ProjectorScatterPlotAdapter = (function () {
             // atomic unit of update.
             this.projection.dataSet = dataSet;
         }
-        if (this.traceVisualizer != null) {
-            this.traceVisualizer.setDataSet(dataSet);
+        if (this.polylineVisualizer != null) {
+            this.polylineVisualizer.setDataSet(dataSet);
         }
         if (this.labels3DVisualizer != null) {
             this.labels3DVisualizer.setLabelStrings(this.generate3DLabelsArray(dataSet, this.labelPointAccessor));
@@ -21498,15 +22443,15 @@ var ProjectorScatterPlotAdapter = (function () {
         var pointColors = this.generatePointColorArray(dataSet, pointColorer, this.distanceMetric, selectedSet, neighbors, hoverIndex, this.renderLabelsIn3D, this.getSpriteImageMode());
         var pointScaleFactors = this.generatePointScaleFactorArray(dataSet, selectedSet, neighbors, hoverIndex);
         var labels = this.generateVisibleLabelRenderParams(dataSet, selectedSet, neighbors, hoverIndex);
-        var traceColors = this.generateLineSegmentColorMap(dataSet, pointColorer);
-        var traceOpacities = this.generateLineSegmentOpacityArray(dataSet, selectedSet);
-        var traceWidths = this.generateLineSegmentWidthArray(dataSet, selectedSet);
+        var polylineColors = this.generateLineSegmentColorMap(dataSet, pointColorer);
+        var polylineOpacities = this.generateLineSegmentOpacityArray(dataSet, selectedSet);
+        var polylineWidths = this.generateLineSegmentWidthArray(dataSet, selectedSet);
         this.scatterPlot.setPointColors(pointColors);
         this.scatterPlot.setPointScaleFactors(pointScaleFactors);
         this.scatterPlot.setLabels(labels);
-        this.scatterPlot.setTraceColors(traceColors);
-        this.scatterPlot.setTraceOpacities(traceOpacities);
-        this.scatterPlot.setTraceWidths(traceWidths);
+        this.scatterPlot.setPolylineColors(polylineColors);
+        this.scatterPlot.setPolylineOpacities(polylineOpacities);
+        this.scatterPlot.setPolylineWidths(polylineWidths);
     };
     ProjectorScatterPlotAdapter.prototype.render = function () {
         this.scatterPlot.render();
@@ -21641,18 +22586,18 @@ var ProjectorScatterPlotAdapter = (function () {
         return scale;
     };
     ProjectorScatterPlotAdapter.prototype.generateLineSegmentColorMap = function (ds, legendPointColorer) {
-        var traceColorArrayMap = {};
+        var polylineColorArrayMap = {};
         if (ds == null) {
-            return traceColorArrayMap;
+            return polylineColorArrayMap;
         }
-        for (var i = 0; i < ds.traces.length; i++) {
-            var dataTrace = ds.traces[i];
-            var colors = new Float32Array(2 * (dataTrace.pointIndices.length - 1) * 3);
+        for (var i = 0; i < ds.sequences.length; i++) {
+            var sequence = ds.sequences[i];
+            var colors = new Float32Array(2 * (sequence.pointIndices.length - 1) * 3);
             var colorIndex = 0;
             if (legendPointColorer) {
-                for (var j = 0; j < dataTrace.pointIndices.length - 1; j++) {
-                    var c1 = new THREE.Color(legendPointColorer(ds, dataTrace.pointIndices[j]));
-                    var c2 = new THREE.Color(legendPointColorer(ds, dataTrace.pointIndices[j + 1]));
+                for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                    var c1 = new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j]));
+                    var c2 = new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j + 1]));
                     colors[colorIndex++] = c1.r;
                     colors[colorIndex++] = c1.g;
                     colors[colorIndex++] = c1.b;
@@ -21662,9 +22607,9 @@ var ProjectorScatterPlotAdapter = (function () {
                 }
             }
             else {
-                for (var j = 0; j < dataTrace.pointIndices.length - 1; j++) {
-                    var c1 = getDefaultPointInTraceColor(j, dataTrace.pointIndices.length);
-                    var c2 = getDefaultPointInTraceColor(j + 1, dataTrace.pointIndices.length);
+                for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                    var c1 = getDefaultPointInPolylineColor(j, sequence.pointIndices.length);
+                    var c2 = getDefaultPointInPolylineColor(j + 1, sequence.pointIndices.length);
                     colors[colorIndex++] = c1.r;
                     colors[colorIndex++] = c1.g;
                     colors[colorIndex++] = c1.b;
@@ -21673,23 +22618,23 @@ var ProjectorScatterPlotAdapter = (function () {
                     colors[colorIndex++] = c2.b;
                 }
             }
-            traceColorArrayMap[i] = colors;
+            polylineColorArrayMap[i] = colors;
         }
-        return traceColorArrayMap;
+        return polylineColorArrayMap;
     };
     ProjectorScatterPlotAdapter.prototype.generateLineSegmentOpacityArray = function (ds, selectedPoints) {
         if (ds == null) {
             return new Float32Array(0);
         }
-        var opacities = new Float32Array(ds.traces.length);
+        var opacities = new Float32Array(ds.sequences.length);
         var selectedPointCount = (selectedPoints == null) ? 0 : selectedPoints.length;
         if (selectedPointCount > 0) {
-            opacities.fill(TRACE_DESELECTED_OPACITY);
-            var i = ds.points[selectedPoints[0]].traceIndex;
-            opacities[i] = TRACE_SELECTED_OPACITY;
+            opacities.fill(POLYLINE_DESELECTED_OPACITY);
+            var i = ds.points[selectedPoints[0]].sequenceIndex;
+            opacities[i] = POLYLINE_SELECTED_OPACITY;
         }
         else {
-            opacities.fill(TRACE_DEFAULT_OPACITY);
+            opacities.fill(POLYLINE_DEFAULT_OPACITY);
         }
         return opacities;
     };
@@ -21697,12 +22642,12 @@ var ProjectorScatterPlotAdapter = (function () {
         if (ds == null) {
             return new Float32Array(0);
         }
-        var widths = new Float32Array(ds.traces.length);
-        widths.fill(TRACE_DEFAULT_LINEWIDTH);
+        var widths = new Float32Array(ds.sequences.length);
+        widths.fill(POLYLINE_DEFAULT_LINEWIDTH);
         var selectedPointCount = (selectedPoints == null) ? 0 : selectedPoints.length;
         if (selectedPointCount > 0) {
-            var i = ds.points[selectedPoints[0]].traceIndex;
-            widths[i] = TRACE_SELECTED_LINEWIDTH;
+            var i = ds.points[selectedPoints[0]].sequenceIndex;
+            widths[i] = POLYLINE_SELECTED_LINEWIDTH;
         }
         return widths;
     };
@@ -21822,7 +22767,7 @@ var ProjectorScatterPlotAdapter = (function () {
         this.labels3DVisualizer = null;
         this.canvasLabelsVisualizer = null;
         this.spriteVisualizer = null;
-        this.traceVisualizer = null;
+        this.polylineVisualizer = null;
         if (inLabels3DMode) {
             this.labels3DVisualizer = new scatterPlotVisualizer3DLabels_1.ScatterPlotVisualizer3DLabels();
             this.labels3DVisualizer.setLabelStrings(this.generate3DLabelsArray(ds, this.labelPointAccessor));
@@ -21833,7 +22778,7 @@ var ProjectorScatterPlotAdapter = (function () {
             this.canvasLabelsVisualizer =
                 new scatterPlotVisualizerCanvasLabels_1.ScatterPlotVisualizerCanvasLabels(this.scatterPlotContainer);
         }
-        this.traceVisualizer = new scatterPlotVisualizerTraces_1.ScatterPlotVisualizerTraces();
+        this.polylineVisualizer = new scatterPlotVisualizerPolylines_1.ScatterPlotVisualizerPolylines();
         this.setDataSet(ds);
         if (this.spriteVisualizer) {
             scatterPlot.addVisualizer(this.spriteVisualizer);
@@ -21844,7 +22789,7 @@ var ProjectorScatterPlotAdapter = (function () {
         if (this.canvasLabelsVisualizer) {
             scatterPlot.addVisualizer(this.canvasLabelsVisualizer);
         }
-        scatterPlot.addVisualizer(this.traceVisualizer);
+        scatterPlot.addVisualizer(this.polylineVisualizer);
     };
     ProjectorScatterPlotAdapter.prototype.getSpriteImageMode = function () {
         if (this.projection == null) {
@@ -21868,9 +22813,10 @@ function styleRgbFromHexColor(hex) {
     var c = new THREE.Color(hex);
     return [(c.r * 255) | 0, (c.g * 255) | 0, (c.b * 255) | 0];
 }
-function getDefaultPointInTraceColor(index, totalPoints) {
-    var hue = TRACE_START_HUE + (TRACE_END_HUE - TRACE_START_HUE) * index / totalPoints;
-    var rgb = d3.hsl(hue, TRACE_SATURATION, TRACE_LIGHTNESS).rgb();
+function getDefaultPointInPolylineColor(index, totalPoints) {
+    var hue = POLYLINE_START_HUE +
+        (POLYLINE_END_HUE - POLYLINE_START_HUE) * index / totalPoints;
+    var rgb = d3.hsl(hue, POLYLINE_SATURATION, POLYLINE_LIGHTNESS).rgb();
     return new THREE.Color(rgb.r / 255, rgb.g / 255, rgb.b / 255);
 }
 /**
@@ -21887,7 +22833,7 @@ function dist2color(distFunc, d, minDist) {
 }
 exports.dist2color = dist2color;
 
-},{"./renderContext":15,"./scatterPlot":16,"./scatterPlotVisualizer3DLabels":19,"./scatterPlotVisualizerCanvasLabels":20,"./scatterPlotVisualizerSprites":21,"./scatterPlotVisualizerTraces":22,"./vector":25}],15:[function(require,module,exports){
+},{"./renderContext":15,"./scatterPlot":16,"./scatterPlotVisualizer3DLabels":19,"./scatterPlotVisualizerCanvasLabels":20,"./scatterPlotVisualizerPolylines":21,"./scatterPlotVisualizerSprites":22,"./vector":25}],15:[function(require,module,exports){
 /* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -21935,7 +22881,7 @@ var CameraType = exports.CameraType;
  * only when they change.
  */
 var RenderContext = (function () {
-    function RenderContext(camera, cameraType, cameraTarget, screenWidth, screenHeight, nearestCameraSpacePointZ, farthestCameraSpacePointZ, backgroundColor, pointColors, pointScaleFactors, labels, traceColors, traceOpacities, traceWidths) {
+    function RenderContext(camera, cameraType, cameraTarget, screenWidth, screenHeight, nearestCameraSpacePointZ, farthestCameraSpacePointZ, backgroundColor, pointColors, pointScaleFactors, labels, polylineColors, polylineOpacities, polylineWidths) {
         this.camera = camera;
         this.cameraType = cameraType;
         this.cameraTarget = cameraTarget;
@@ -21947,9 +22893,9 @@ var RenderContext = (function () {
         this.pointColors = pointColors;
         this.pointScaleFactors = pointScaleFactors;
         this.labels = labels;
-        this.traceColors = traceColors;
-        this.traceOpacities = traceOpacities;
-        this.traceWidths = traceWidths;
+        this.polylineColors = polylineColors;
+        this.polylineOpacities = polylineOpacities;
+        this.polylineWidths = polylineWidths;
     }
     return RenderContext;
 }());
@@ -22438,7 +23384,7 @@ var ScatterPlot = (function () {
         if (this.worldSpacePointPositions != null) {
             cameraSpacePointExtents = util.getNearFarPoints(this.worldSpacePointPositions, this.camera.position, this.orbitCameraControls.target);
         }
-        var rc = new renderContext_1.RenderContext(this.camera, cameraType, this.orbitCameraControls.target, this.width, this.height, cameraSpacePointExtents[0], cameraSpacePointExtents[1], this.backgroundColor, this.pointColors, this.pointScaleFactors, this.labels, this.traceColors, this.traceOpacities, this.traceWidths);
+        var rc = new renderContext_1.RenderContext(this.camera, cameraType, this.orbitCameraControls.target, this.width, this.height, cameraSpacePointExtents[0], cameraSpacePointExtents[1], this.backgroundColor, this.pointColors, this.pointScaleFactors, this.labels, this.polylineColors, this.polylineOpacities, this.polylineWidths);
         // Render first pass to picking target. This render fills pickingTexture
         // with colors that are actually point ids, so that sampling the texture at
         // the mouse's current x,y coordinates will reveal the data point that the
@@ -22478,15 +23424,15 @@ var ScatterPlot = (function () {
     ScatterPlot.prototype.setLabels = function (labels) {
         this.labels = labels;
     };
-    /** Set the colors for every data trace. (RGB triplets) */
-    ScatterPlot.prototype.setTraceColors = function (colors) {
-        this.traceColors = colors;
+    /** Set the colors for every data polyline. (RGB triplets) */
+    ScatterPlot.prototype.setPolylineColors = function (colors) {
+        this.polylineColors = colors;
     };
-    ScatterPlot.prototype.setTraceOpacities = function (opacities) {
-        this.traceOpacities = opacities;
+    ScatterPlot.prototype.setPolylineOpacities = function (opacities) {
+        this.polylineOpacities = opacities;
     };
-    ScatterPlot.prototype.setTraceWidths = function (widths) {
-        this.traceWidths = widths;
+    ScatterPlot.prototype.setPolylineWidths = function (widths) {
+        this.polylineWidths = widths;
     };
     ScatterPlot.prototype.getMouseMode = function () {
         return this.mouseMode;
@@ -23082,6 +24028,136 @@ You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+"use strict";
+var util = require('./util');
+var RGB_NUM_ELEMENTS = 3;
+var XYZ_NUM_ELEMENTS = 3;
+/**
+ * Renders polylines that connect multiple points in the dataset.
+ */
+var ScatterPlotVisualizerPolylines = (function () {
+    function ScatterPlotVisualizerPolylines() {
+        this.polylinePositionBuffer = {};
+        this.polylineColorBuffer = {};
+    }
+    ScatterPlotVisualizerPolylines.prototype.updateSequenceIndicesInDataSet = function (ds) {
+        for (var i = 0; i < ds.sequences.length; i++) {
+            var sequence = ds.sequences[i];
+            for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                ds.points[sequence.pointIndices[j]].sequenceIndex = i;
+                ds.points[sequence.pointIndices[j + 1]].sequenceIndex = i;
+            }
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.createPolylines = function (scene) {
+        if (!this.dataSet || !this.dataSet.sequences) {
+            return;
+        }
+        this.updateSequenceIndicesInDataSet(this.dataSet);
+        this.polylines = [];
+        for (var i = 0; i < this.dataSet.sequences.length; i++) {
+            var geometry = new THREE.BufferGeometry();
+            geometry.addAttribute('position', this.polylinePositionBuffer[i]);
+            geometry.addAttribute('color', this.polylineColorBuffer[i]);
+            var material = new THREE.LineBasicMaterial({
+                linewidth: 1,
+                opacity: 1.0,
+                transparent: true,
+                vertexColors: THREE.VertexColors
+            });
+            var polyline = new THREE.LineSegments(geometry, material);
+            polyline.frustumCulled = false;
+            this.polylines.push(polyline);
+            scene.add(polyline);
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.dispose = function () {
+        if (this.polylines == null) {
+            return;
+        }
+        for (var i = 0; i < this.polylines.length; i++) {
+            this.scene.remove(this.polylines[i]);
+            this.polylines[i].geometry.dispose();
+        }
+        this.polylines = null;
+        this.polylinePositionBuffer = {};
+        this.polylineColorBuffer = {};
+    };
+    ScatterPlotVisualizerPolylines.prototype.setScene = function (scene) {
+        this.scene = scene;
+    };
+    ScatterPlotVisualizerPolylines.prototype.setDataSet = function (dataSet) {
+        this.dataSet = dataSet;
+    };
+    ScatterPlotVisualizerPolylines.prototype.onPointPositionsChanged = function (newPositions) {
+        if ((newPositions == null) || (this.polylines != null)) {
+            this.dispose();
+        }
+        if ((newPositions == null) || (this.dataSet == null)) {
+            return;
+        }
+        // Set up the position buffer arrays for each polyline.
+        for (var i = 0; i < this.dataSet.sequences.length; i++) {
+            var sequence = this.dataSet.sequences[i];
+            var vertexCount = 2 * (sequence.pointIndices.length - 1);
+            var polylines = new Float32Array(vertexCount * XYZ_NUM_ELEMENTS);
+            this.polylinePositionBuffer[i] =
+                new THREE.BufferAttribute(polylines, XYZ_NUM_ELEMENTS);
+            var colors = new Float32Array(vertexCount * RGB_NUM_ELEMENTS);
+            this.polylineColorBuffer[i] =
+                new THREE.BufferAttribute(colors, RGB_NUM_ELEMENTS);
+        }
+        for (var i = 0; i < this.dataSet.sequences.length; i++) {
+            var sequence = this.dataSet.sequences[i];
+            var src = 0;
+            for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                var p1Index = sequence.pointIndices[j];
+                var p2Index = sequence.pointIndices[j + 1];
+                var p1 = util.vector3FromPackedArray(newPositions, p1Index);
+                var p2 = util.vector3FromPackedArray(newPositions, p2Index);
+                this.polylinePositionBuffer[i].setXYZ(src, p1.x, p1.y, p1.z);
+                this.polylinePositionBuffer[i].setXYZ(src + 1, p2.x, p2.y, p2.z);
+                src += 2;
+            }
+            this.polylinePositionBuffer[i].needsUpdate = true;
+        }
+        if (this.polylines == null) {
+            this.createPolylines(this.scene);
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.onRender = function (renderContext) {
+        if (this.polylines == null) {
+            return;
+        }
+        for (var i = 0; i < this.polylines.length; i++) {
+            this.polylines[i].material.opacity = renderContext.polylineOpacities[i];
+            this.polylines[i].material.linewidth =
+                renderContext.polylineWidths[i];
+            this.polylineColorBuffer[i].array = renderContext.polylineColors[i];
+            this.polylineColorBuffer[i].needsUpdate = true;
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.onPickingRender = function (renderContext) { };
+    ScatterPlotVisualizerPolylines.prototype.onResize = function (newWidth, newHeight) { };
+    return ScatterPlotVisualizerPolylines;
+}());
+exports.ScatterPlotVisualizerPolylines = ScatterPlotVisualizerPolylines;
+
+},{"./util":24}],22:[function(require,module,exports){
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23339,137 +24415,7 @@ var ScatterPlotVisualizerSprites = (function () {
 }());
 exports.ScatterPlotVisualizerSprites = ScatterPlotVisualizerSprites;
 
-},{"./renderContext":15,"./util":24}],22:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var util = require('./util');
-var RGB_NUM_ELEMENTS = 3;
-var XYZ_NUM_ELEMENTS = 3;
-/**
- * Renders 'traces' (polylines) that connect multiple points in the dataset
- */
-var ScatterPlotVisualizerTraces = (function () {
-    function ScatterPlotVisualizerTraces() {
-        this.tracePositionBuffer = {};
-        this.traceColorBuffer = {};
-    }
-    ScatterPlotVisualizerTraces.prototype.updateTraceIndicesInDataSet = function (ds) {
-        for (var i = 0; i < ds.traces.length; i++) {
-            var trace = ds.traces[i];
-            for (var j = 0; j < trace.pointIndices.length - 1; j++) {
-                ds.points[trace.pointIndices[j]].traceIndex = i;
-                ds.points[trace.pointIndices[j + 1]].traceIndex = i;
-            }
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.createTraces = function (scene) {
-        if (!this.dataSet || !this.dataSet.traces) {
-            return;
-        }
-        this.updateTraceIndicesInDataSet(this.dataSet);
-        this.traces = [];
-        for (var i = 0; i < this.dataSet.traces.length; i++) {
-            var geometry = new THREE.BufferGeometry();
-            geometry.addAttribute('position', this.tracePositionBuffer[i]);
-            geometry.addAttribute('color', this.traceColorBuffer[i]);
-            var material = new THREE.LineBasicMaterial({
-                linewidth: 1,
-                opacity: 1.0,
-                transparent: true,
-                vertexColors: THREE.VertexColors
-            });
-            var trace = new THREE.LineSegments(geometry, material);
-            trace.frustumCulled = false;
-            this.traces.push(trace);
-            scene.add(trace);
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.dispose = function () {
-        if (this.traces == null) {
-            return;
-        }
-        for (var i = 0; i < this.traces.length; i++) {
-            this.scene.remove(this.traces[i]);
-            this.traces[i].geometry.dispose();
-        }
-        this.traces = null;
-        this.tracePositionBuffer = {};
-        this.traceColorBuffer = {};
-    };
-    ScatterPlotVisualizerTraces.prototype.setScene = function (scene) {
-        this.scene = scene;
-    };
-    ScatterPlotVisualizerTraces.prototype.setDataSet = function (dataSet) {
-        this.dataSet = dataSet;
-    };
-    ScatterPlotVisualizerTraces.prototype.onPointPositionsChanged = function (newPositions) {
-        if ((newPositions == null) || (this.traces != null)) {
-            this.dispose();
-        }
-        if ((newPositions == null) || (this.dataSet == null)) {
-            return;
-        }
-        // Set up the position buffer arrays for each trace.
-        for (var i = 0; i < this.dataSet.traces.length; i++) {
-            var dataTrace = this.dataSet.traces[i];
-            var vertexCount = 2 * (dataTrace.pointIndices.length - 1);
-            var traces = new Float32Array(vertexCount * XYZ_NUM_ELEMENTS);
-            this.tracePositionBuffer[i] =
-                new THREE.BufferAttribute(traces, XYZ_NUM_ELEMENTS);
-            var colors = new Float32Array(vertexCount * RGB_NUM_ELEMENTS);
-            this.traceColorBuffer[i] =
-                new THREE.BufferAttribute(colors, RGB_NUM_ELEMENTS);
-        }
-        for (var i = 0; i < this.dataSet.traces.length; i++) {
-            var dataTrace = this.dataSet.traces[i];
-            var src = 0;
-            for (var j = 0; j < dataTrace.pointIndices.length - 1; j++) {
-                var p1Index = dataTrace.pointIndices[j];
-                var p2Index = dataTrace.pointIndices[j + 1];
-                var p1 = util.vector3FromPackedArray(newPositions, p1Index);
-                var p2 = util.vector3FromPackedArray(newPositions, p2Index);
-                this.tracePositionBuffer[i].setXYZ(src, p1.x, p1.y, p1.z);
-                this.tracePositionBuffer[i].setXYZ(src + 1, p2.x, p2.y, p2.z);
-                src += 2;
-            }
-            this.tracePositionBuffer[i].needsUpdate = true;
-        }
-        if (this.traces == null) {
-            this.createTraces(this.scene);
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.onRender = function (renderContext) {
-        if (this.traces == null) {
-            return;
-        }
-        for (var i = 0; i < this.traces.length; i++) {
-            this.traces[i].material.opacity = renderContext.traceOpacities[i];
-            this.traces[i].material.linewidth =
-                renderContext.traceWidths[i];
-            this.traceColorBuffer[i].array = renderContext.traceColors[i];
-            this.traceColorBuffer[i].needsUpdate = true;
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.onPickingRender = function (renderContext) { };
-    ScatterPlotVisualizerTraces.prototype.onResize = function (newWidth, newHeight) { };
-    return ScatterPlotVisualizerTraces;
-}());
-exports.ScatterPlotVisualizerTraces = ScatterPlotVisualizerTraces;
-
-},{"./util":24}],23:[function(require,module,exports){
+},{"./renderContext":15,"./util":24}],23:[function(require,module,exports){
 /* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -24635,7 +25581,7 @@ var DataPanel = (function (_super) {
                 var content = evt.target.result;
                 _this.tensorWasReadFromFile(content, file.name);
             };
-            fileReader.readAsText(file);
+            fileReader.readAsArrayBuffer(file);
         });
         var uploadButton = this.dom.select('#upload-tensors');
         uploadButton.on('click', function () {
@@ -24653,74 +25599,79 @@ var DataPanel = (function (_super) {
                 var contents = evt.target.result;
                 _this.metadataWasReadFromFile(contents, file.name);
             };
-            fileReader.readAsText(file);
+            fileReader.readAsArrayBuffer(file);
         });
         var uploadMetadataButton = this.dom.select('#upload-metadata');
         uploadMetadataButton.on('click', function () {
             fileMetadataInput.node().click();
         });
-        if (this.projector.servingMode === 'demo') {
-            this.$$('#demo-data-buttons-container').style.display =
-                'block';
-            // Fill out the projector config.
-            var projectorConfigTemplate_1 = this.$$('#projector-config-template');
-            var projectorConfigTemplateJson_1 = {
-                embeddings: [{
-                        tensorName: 'My tensor',
-                        tensorShape: [1000, 50],
-                        tensorPath: 'https://gist.github.com/.../tensors.tsv',
-                        metadataPath: 'https://gist.github.com/.../optional.metadata.tsv',
-                    }],
-            };
-            this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            // Set up optional field checkboxes.
-            var spriteFieldCheckbox_1 = this.$$('#config-sprite-checkbox');
-            spriteFieldCheckbox_1.addEventListener('change', function () {
-                if (spriteFieldCheckbox_1.checked) {
-                    projectorConfigTemplateJson_1.embeddings[0].sprite = {
-                        imagePath: 'https://github.com/.../optional.sprite.png',
-                        singleImageDim: [32, 32]
-                    };
-                }
-                else {
-                    delete projectorConfigTemplateJson_1.embeddings[0].sprite;
-                }
-                _this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            });
-            var bookmarksFieldCheckbox_1 = this.$$('#config-bookmarks-checkbox');
-            bookmarksFieldCheckbox_1.addEventListener('change', function () {
-                if (bookmarksFieldCheckbox_1.checked) {
-                    projectorConfigTemplateJson_1.embeddings[0].bookmarksPath =
-                        'https://gist.github.com/.../bookmarks.txt';
-                }
-                else {
-                    delete projectorConfigTemplateJson_1.embeddings[0].bookmarksPath;
-                }
-                _this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            });
-            var metadataFieldCheckbox_1 = this.$$('#config-metadata-checkbox');
-            metadataFieldCheckbox_1.addEventListener('change', function () {
-                if (metadataFieldCheckbox_1.checked) {
-                    projectorConfigTemplateJson_1.embeddings[0].metadataPath =
-                        'https://gist.github.com/.../optional.metadata.tsv';
-                }
-                else {
-                    delete projectorConfigTemplateJson_1.embeddings[0].metadataPath;
-                }
-                _this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            });
-            // Update the link and the readonly shareable URL.
-            var projectorConfigUrlInput_1 = this.$$('#projector-config-url');
-            var projectorConfigDemoUrlInput_1 = this.$$('#projector-share-url');
-            var projectorConfigDemoUrlLink_1 = this.$$('#projector-share-url-link');
-            projectorConfigUrlInput_1.addEventListener('input', function () {
-                var projectorDemoUrl = location.protocol + '//' + location.host +
-                    location.pathname + '?config=' +
-                    projectorConfigUrlInput_1.value;
-                projectorConfigDemoUrlInput_1.value = projectorDemoUrl;
-                projectorConfigDemoUrlLink_1.href = projectorDemoUrl;
-            });
-        }
+        if (this.projector.servingMode !== 'demo') {
+            this.$$('#publish-container').style.display = 'none';
+            this.$$('#upload-tensors-step-container').style.display =
+                'none';
+            this.$$('#upload-metadata-label').style.display = 'none';
+        }
+        this.$$('#demo-data-buttons-container').style.display =
+            'block';
+        // Fill out the projector config.
+        var projectorConfigTemplate = this.$$('#projector-config-template');
+        var projectorConfigTemplateJson = {
+            embeddings: [{
+                    tensorName: 'My tensor',
+                    tensorShape: [1000, 50],
+                    tensorPath: 'https://gist.github.com/.../tensors.tsv',
+                    metadataPath: 'https://gist.github.com/.../optional.metadata.tsv',
+                }],
+        };
+        this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        // Set up optional field checkboxes.
+        var spriteFieldCheckbox = this.$$('#config-sprite-checkbox');
+        spriteFieldCheckbox.addEventListener('change', function () {
+            if (spriteFieldCheckbox.checked) {
+                projectorConfigTemplateJson.embeddings[0].sprite = {
+                    imagePath: 'https://github.com/.../optional.sprite.png',
+                    singleImageDim: [32, 32]
+                };
+            }
+            else {
+                delete projectorConfigTemplateJson.embeddings[0].sprite;
+            }
+            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        });
+        var bookmarksFieldCheckbox = this.$$('#config-bookmarks-checkbox');
+        bookmarksFieldCheckbox.addEventListener('change', function () {
+            if (bookmarksFieldCheckbox.checked) {
+                projectorConfigTemplateJson.embeddings[0].bookmarksPath =
+                    'https://gist.github.com/.../bookmarks.txt';
+            }
+            else {
+                delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
+            }
+            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        });
+        var metadataFieldCheckbox = this.$$('#config-metadata-checkbox');
+        metadataFieldCheckbox.addEventListener('change', function () {
+            if (metadataFieldCheckbox.checked) {
+                projectorConfigTemplateJson.embeddings[0].metadataPath =
+                    'https://gist.github.com/.../optional.metadata.tsv';
+            }
+            else {
+                delete projectorConfigTemplateJson.embeddings[0].metadataPath;
+            }
+            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        });
+        // Update the link and the readonly shareable URL.
+        var projectorConfigUrlInput = this.$$('#projector-config-url');
+        var projectorConfigDemoUrlInput = this.$$('#projector-share-url');
+        var projectorConfigDemoUrlLink = this.$$('#projector-share-url-link');
+        projectorConfigUrlInput.addEventListener('input', function () {
+            var projectorDemoUrl = location.protocol + '//' + location.host +
+                location.pathname +
+                '?config=' + projectorConfigUrlInput.value;
+            projectorConfigDemoUrlInput.value =
+                projectorDemoUrl;
+            projectorConfigDemoUrlLink.href = projectorDemoUrl;
+        });
     };
     DataPanel.prototype.setProjectorConfigTemplateJson = function (projectorConfigTemplate, config) {
         projectorConfigTemplate.value =
-- 
GitLab


From eec34a104fae837a3ea7ce64c8110c2e19f20a27 Mon Sep 17 00:00:00 2001
From: Yutaka Leon <yleon@google.com>
Date: Wed, 12 Apr 2017 14:57:34 -0800
Subject: [PATCH 0361/1563] Move HashTable and Table initializer from file to
 the header so they can be used by other kernels. Change: 152999226

---
 .../core/kernels/lookup_table_init_op.cc      |   7 +-
 .../core/kernels/lookup_table_init_op.h       |  33 +++++
 tensorflow/core/kernels/lookup_table_op.cc    | 114 -----------------
 tensorflow/core/kernels/lookup_table_op.h     | 115 ++++++++++++++++++
 4 files changed, 152 insertions(+), 117 deletions(-)
 create mode 100644 tensorflow/core/kernels/lookup_table_init_op.h

diff --git a/tensorflow/core/kernels/lookup_table_init_op.cc b/tensorflow/core/kernels/lookup_table_init_op.cc
index a46e6f762b..bde1d0360a 100644
--- a/tensorflow/core/kernels/lookup_table_init_op.cc
+++ b/tensorflow/core/kernels/lookup_table_init_op.cc
@@ -12,9 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-
 #define EIGEN_USE_THREADS
 
+#include "tensorflow/core/kernels/lookup_table_init_op.h"
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -25,7 +26,6 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/kernels/initializable_lookup_table.h"
 #include "tensorflow/core/kernels/lookup_util.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
@@ -304,6 +304,8 @@ class TextFileLineIterator
   TF_DISALLOW_COPY_AND_ASSIGN(TextFileLineIterator);
 };
 
+}  // namespace
+
 // Helper function to initialize an InitializableLookupTable from a text file.
 Status InitializeTableFromTextFile(const string& filename, int64 vocab_size,
                                    char delimiter, int32 key_index,
@@ -349,7 +351,6 @@ Status InitializeTableFromTextFile(const string& filename, int64 vocab_size,
   return s;
 }
 
-}  // namespace
 }  // namespace lookup
 
 // Kernel to initialize a look table given a key and value tensors.
diff --git a/tensorflow/core/kernels/lookup_table_init_op.h b/tensorflow/core/kernels/lookup_table_init_op.h
new file mode 100644
index 0000000000..177a26daa8
--- /dev/null
+++ b/tensorflow/core/kernels/lookup_table_init_op.h
@@ -0,0 +1,33 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_KERNELS_LOOKUP_TABLE_INIT_OP_H_
+#define TENSORFLOW_KERNELS_LOOKUP_TABLE_INIT_OP_H_
+
+#include "tensorflow/core/kernels/initializable_lookup_table.h"
+
+namespace tensorflow {
+namespace lookup {
+
+// Helper function to initialize an InitializableLookupTable from a text file.
+Status InitializeTableFromTextFile(const string& filename, int64 vocab_size,
+                                   char delimiter, int32 key_index,
+                                   int32 value_index, Env* env,
+                                   InitializableLookupTable* table);
+
+}  // namespace lookup
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_KERNELS_LOOKUP_TABLE_INIT_OP_H_
diff --git a/tensorflow/core/kernels/lookup_table_op.cc b/tensorflow/core/kernels/lookup_table_op.cc
index 41a2543054..0a065e37d7 100644
--- a/tensorflow/core/kernels/lookup_table_op.cc
+++ b/tensorflow/core/kernels/lookup_table_op.cc
@@ -22,126 +22,12 @@ limitations under the License.
 
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/kernels/bounds_check.h"
 #include "tensorflow/core/kernels/initializable_lookup_table.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
-#include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/hash/hash.h"
 
 namespace tensorflow {
 namespace lookup {
-namespace {
-
-// Ensure that the compiler cannot elide a copy into a local, for
-// bounds checking on source tensors that might be updated asynchronously for
-// integral types. However non-integer variables are not allowed and therefore
-// the local copy is unnecessary.
-template <typename T>
-T SubtleMustCopyUnlessStringOrFloat(const T& value) {
-  return internal::SubtleMustCopy(value);
-}
-
-const string& SubtleMustCopyUnlessStringOrFloat(const string& value) {
-  return value;
-}
-
-const float SubtleMustCopyUnlessStringOrFloat(const float value) {
-  return value;
-}
-
-const double SubtleMustCopyUnlessStringOrFloat(const double value) {
-  return value;
-}
-
-}  // namespace
-
-// Lookup table that wraps an unordered_map, where the key and value data type
-// is specified.
-//
-// This table is recommended for any variations to key values.
-//
-// For look up, the table is required to be initialized (allocated
-// and populated). Once the table is marked as initialized it becomes read-only.
-//
-// Sample use case:
-//
-// HashTable<int64, int64> table;  // int64 -> int64.
-// table.Prepare(10); // Prepare the underlying data structure, the number of
-//                    // elements is required by interface, but not used.
-// // Populate the table, elements could be added in one or multiple calls.
-// table.Insert(key_tensor, value_tensor); // Populate the table.
-// ...
-// table.set_is_initialized();
-//
-// table.Find(in_t, &out_t, default_t)
-//
-template <class K, class V>
-class HashTable : public InitializableLookupTable {
- public:
-  HashTable(OpKernelContext* ctx, OpKernel* kernel) {}
-
-  size_t size() const override {
-    // return the size of the table only if it's initialized, otherwise 0.
-    if (!is_initialized_) {
-      return 0;
-    }
-    std::atomic_thread_fence(std::memory_order_acquire);
-    return table_ ? table_->size() : 0;
-  }
-
-  DataType key_dtype() const override { return DataTypeToEnum<K>::v(); }
-
-  DataType value_dtype() const override { return DataTypeToEnum<V>::v(); }
-
- protected:
-  Status DoPrepare(size_t unused) override {
-    if (is_initialized_) {
-      return errors::Aborted("HashTable already initialized.");
-    }
-    if (!table_) {
-      table_ = std::unique_ptr<std::unordered_map<K, V>>(
-          new std::unordered_map<K, V>());
-    }
-    return Status::OK();
-  };
-
-  Status DoInsert(const Tensor& keys, const Tensor& values) override {
-    if (!table_) {
-      return errors::FailedPrecondition("HashTable is not prepared.");
-    }
-
-    const auto key_values = keys.flat<K>();
-    const auto value_values = values.flat<V>();
-    for (int64 i = 0; i < key_values.size(); ++i) {
-      const K key = SubtleMustCopyUnlessStringOrFloat(key_values(i));
-      const V value = SubtleMustCopyUnlessStringOrFloat(value_values(i));
-      const V& previous_value = gtl::LookupOrInsert(table_.get(), key, value);
-      if (previous_value != value) {
-        return errors::FailedPrecondition(
-            "HashTable has different value for same key. Key ", key, " has ",
-            previous_value, " and trying to add value ", value);
-      }
-    }
-    return Status::OK();
-  }
-
-  Status DoFind(const Tensor& key, Tensor* value,
-                const Tensor& default_value) override {
-    const V default_val = default_value.flat<V>()(0);
-    const auto key_values = key.flat<K>();
-    auto value_values = value->flat<V>();
-
-    for (int64 i = 0; i < key_values.size(); ++i) {
-      value_values(i) = gtl::FindWithDefault(
-          *table_, SubtleMustCopyUnlessStringOrFloat(key_values(i)),
-          default_val);
-    }
-    return Status::OK();
-  }
-
- private:
-  std::unique_ptr<std::unordered_map<K, V>> table_;
-};
 
 // Lookup table that wraps an unordered_map, where the key and value data type
 // is specified. Each individual value must be a scalar. If vector values are
diff --git a/tensorflow/core/kernels/lookup_table_op.h b/tensorflow/core/kernels/lookup_table_op.h
index 41123a300a..ae253b4dc9 100644
--- a/tensorflow/core/kernels/lookup_table_op.h
+++ b/tensorflow/core/kernels/lookup_table_op.h
@@ -21,9 +21,11 @@ limitations under the License.
 #include "tensorflow/core/framework/resource_mgr.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/kernels/bounds_check.h"
 #include "tensorflow/core/kernels/lookup_util.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/thread_annotations.h"
 
@@ -104,6 +106,119 @@ class LookupTableOp : public OpKernel {
   TF_DISALLOW_COPY_AND_ASSIGN(LookupTableOp);
 };
 
+namespace lookup {
+
+// Ensure that the compiler cannot elide a copy into a local, for
+// bounds checking on source tensors that might be updated asynchronously for
+// integral types. However non-integer variables are not allowed and therefore
+// the local copy is unnecessary.
+template <typename T>
+T SubtleMustCopyUnlessStringOrFloat(const T& value) {
+  return internal::SubtleMustCopy(value);
+}
+
+inline const string& SubtleMustCopyUnlessStringOrFloat(const string& value) {
+  return value;
+}
+
+inline const float SubtleMustCopyUnlessStringOrFloat(const float value) {
+  return value;
+}
+
+inline const double SubtleMustCopyUnlessStringOrFloat(const double value) {
+  return value;
+}
+
+// Lookup table that wraps an unordered_map, where the key and value data type
+// is specified.
+//
+// This table is recommended for any variations to key values.
+//
+// For look up, the table is required to be initialized (allocated
+// and populated). Once the table is marked as initialized it becomes read-only.
+//
+// Sample use case:
+//
+// HashTable<int64, int64> table;  // int64 -> int64.
+// table.Prepare(10); // Prepare the underlying data structure, the number of
+//                    // elements is required by interface, but not used.
+// // Populate the table, elements could be added in one or multiple calls.
+// table.Insert(key_tensor, value_tensor); // Populate the table.
+// ...
+// table.set_is_initialized();
+//
+// table.Find(in_t, &out_t, default_t)
+//
+template <class K, class V>
+class HashTable : public InitializableLookupTable {
+ public:
+  HashTable(OpKernelContext* ctx, OpKernel* kernel) {}
+
+  size_t size() const override {
+    // return the size of the table only if it's initialized, otherwise 0.
+    if (!is_initialized_) {
+      return 0;
+    }
+    std::atomic_thread_fence(std::memory_order_acquire);
+    return table_ ? table_->size() : 0;
+  }
+
+  DataType key_dtype() const override { return DataTypeToEnum<K>::v(); }
+
+  DataType value_dtype() const override { return DataTypeToEnum<V>::v(); }
+
+ protected:
+  Status DoPrepare(size_t unused) override {
+    if (is_initialized_) {
+      return errors::Aborted("HashTable already initialized.");
+    }
+    if (!table_) {
+      table_ = std::unique_ptr<std::unordered_map<K, V>>(
+          new std::unordered_map<K, V>());
+    }
+    return Status::OK();
+  };
+
+  Status DoInsert(const Tensor& keys, const Tensor& values) override {
+    if (!table_) {
+      return errors::FailedPrecondition("HashTable is not prepared.");
+    }
+
+    const auto key_values = keys.flat<K>();
+    const auto value_values = values.flat<V>();
+    for (int64 i = 0; i < key_values.size(); ++i) {
+      const K key = SubtleMustCopyUnlessStringOrFloat(key_values(i));
+      const V value = SubtleMustCopyUnlessStringOrFloat(value_values(i));
+      const V& previous_value = gtl::LookupOrInsert(table_.get(), key, value);
+      if (previous_value != value) {
+        return errors::FailedPrecondition(
+            "HashTable has different value for same key. Key ", key, " has ",
+            previous_value, " and trying to add value ", value);
+      }
+    }
+    return Status::OK();
+  }
+
+  Status DoFind(const Tensor& key, Tensor* value,
+                const Tensor& default_value) override {
+    const V default_val = default_value.flat<V>()(0);
+    const auto key_values = key.flat<K>();
+    auto value_values = value->flat<V>();
+
+    for (int64 i = 0; i < key_values.size(); ++i) {
+      value_values(i) = gtl::FindWithDefault(
+          *table_, SubtleMustCopyUnlessStringOrFloat(key_values(i)),
+          default_val);
+    }
+    return Status::OK();
+  }
+
+ private:
+  std::unique_ptr<std::unordered_map<K, V>> table_;
+};
+
+}  // namespace lookup
+
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_KERNELS_LOOKUP_TABLE_OP_H_
-- 
GitLab


From a5a8558feb9417359e30a991ab5e01cf17194473 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Wed, 12 Apr 2017 15:30:57 -0800
Subject: [PATCH 0362/1563] Fetch / py_func arguments no longer copy. Change:
 153003331

---
 tensorflow/c/c_api.cc                         |  12 ++
 tensorflow/c/c_api.h                          |   4 +
 tensorflow/c/c_api_test.cc                    |  16 ++
 tensorflow/python/BUILD                       |   2 +
 tensorflow/python/client/tf_session_helper.cc | 113 +++----------
 .../python/lib/core/ndarray_tensor_bridge.cc  | 156 ++++++++++++++++++
 .../python/lib/core/ndarray_tensor_bridge.h   |  20 +++
 tensorflow/python/lib/core/py_func.cc         |  60 ++-----
 8 files changed, 249 insertions(+), 134 deletions(-)

diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index d4bcc01b6b..a8c360541c 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -220,6 +220,18 @@ TF_Tensor* TF_NewTensor(TF_DataType dtype, const int64_t* dims, int num_dims,
   return new TF_Tensor{dtype, TensorShape(dimvec), buf};
 }
 
+TF_Tensor* TF_TensorMaybeMove(TF_Tensor* tensor) {
+  // It is safe to move the Tensor if and only if we own the unique reference to
+  // it. In that case, we might as well not delete and reallocate, but a future
+  // implementation might need to do so.
+  if (tensor->buffer->RefCountIsOne() &&
+      tensor->buffer->root_buffer()->RefCountIsOne() &&
+      tensor->buffer->OwnsMemory()) {
+    return tensor;
+  }
+  return nullptr;
+}
+
 void TF_DeleteTensor(TF_Tensor* t) {
   t->buffer->Unref();
   delete t;
diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h
index f837b68d76..a686f7f701 100644
--- a/tensorflow/c/c_api.h
+++ b/tensorflow/c/c_api.h
@@ -220,6 +220,10 @@ extern TF_Tensor* TF_NewTensor(TF_DataType, const int64_t* dims, int num_dims,
 extern TF_Tensor* TF_AllocateTensor(TF_DataType, const int64_t* dims,
                                     int num_dims, size_t len);
 
+// Deletes `tensor` and returns a new TF_Tensor with the same content if
+// possible. Returns nullptr and leaves `tensor` untouched if not.
+extern TF_Tensor* TF_TensorMaybeMove(TF_Tensor* tensor);
+
 // Destroy a tensor.
 extern void TF_DeleteTensor(TF_Tensor*);
 
diff --git a/tensorflow/c/c_api_test.cc b/tensorflow/c/c_api_test.cc
index 5673f657d3..32143f4f2f 100644
--- a/tensorflow/c/c_api_test.cc
+++ b/tensorflow/c/c_api_test.cc
@@ -105,6 +105,22 @@ TEST(CAPI, AllocateTensor) {
   TF_DeleteTensor(t);
 }
 
+TEST(CAPI, MaybeMove) {
+  const int num_bytes = 6 * sizeof(float);
+  float* values =
+      reinterpret_cast<float*>(tensorflow::cpu_allocator()->AllocateRaw(
+          EIGEN_MAX_ALIGN_BYTES, num_bytes));
+  int64_t dims[] = {2, 3};
+  bool deallocator_called = false;
+  TF_Tensor* t = TF_NewTensor(TF_FLOAT, dims, 2, values, num_bytes,
+                              &Deallocator, &deallocator_called);
+
+  TF_Tensor* o = TF_TensorMaybeMove(t);
+  ASSERT_TRUE(o == nullptr);  // It is unsafe to move memory TF might not own.
+  TF_DeleteTensor(t);
+  EXPECT_TRUE(deallocator_called);
+}
+
 TEST(CAPI, LibraryLoadFunctions) {
   // Load the library.
   TF_Status* status = TF_NewStatus();
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index de9daf4179..f9031a0c84 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -170,6 +170,8 @@ cc_library(
     hdrs = ["lib/core/ndarray_tensor_bridge.h"],
     deps = [
         ":numpy_lib",
+        "//tensorflow/c:c_api",
+        "//tensorflow/core:lib",
     ],
 )
 
diff --git a/tensorflow/python/client/tf_session_helper.cc b/tensorflow/python/client/tf_session_helper.cc
index 930eb5f283..deb575b60f 100644
--- a/tensorflow/python/client/tf_session_helper.cc
+++ b/tensorflow/python/client/tf_session_helper.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <cstring>
 
+#include "tensorflow/c/c_api.h"
 #include "tensorflow/c/tf_status_helper.h"
 #include "tensorflow/core/framework/allocator.h"
 #include "tensorflow/core/framework/log_memory.h"
@@ -142,78 +143,6 @@ Status PyArray_TYPE_to_TF_DataType(PyArrayObject* array,
   return Status::OK();
 }
 
-Status TF_DataType_to_PyArray_TYPE(TF_DataType tf_datatype,
-                                   int* out_pyarray_type) {
-  switch (tf_datatype) {
-    case TF_HALF:
-      *out_pyarray_type = NPY_FLOAT16;
-      break;
-    case TF_FLOAT:
-      *out_pyarray_type = NPY_FLOAT32;
-      break;
-    case TF_DOUBLE:
-      *out_pyarray_type = NPY_FLOAT64;
-      break;
-    case TF_INT32:
-      *out_pyarray_type = NPY_INT32;
-      break;
-    case TF_UINT8:
-      *out_pyarray_type = NPY_UINT8;
-      break;
-    case TF_UINT16:
-      *out_pyarray_type = NPY_UINT16;
-      break;
-    case TF_INT8:
-      *out_pyarray_type = NPY_INT8;
-      break;
-    case TF_INT16:
-      *out_pyarray_type = NPY_INT16;
-      break;
-    case TF_INT64:
-      *out_pyarray_type = NPY_INT64;
-      break;
-    case TF_BOOL:
-      *out_pyarray_type = NPY_BOOL;
-      break;
-    case TF_COMPLEX64:
-      *out_pyarray_type = NPY_COMPLEX64;
-      break;
-    case TF_COMPLEX128:
-      *out_pyarray_type = NPY_COMPLEX128;
-      break;
-    case TF_STRING:
-      *out_pyarray_type = NPY_OBJECT;
-      break;
-    case TF_RESOURCE:
-      *out_pyarray_type = NPY_VOID;
-      break;
-    // TODO(keveman): These should be changed to NPY_VOID, and the type used for
-    // the resulting numpy array should be the custom struct types that we
-    // expect for quantized types.
-    case TF_QINT8:
-      *out_pyarray_type = NPY_INT8;
-      break;
-    case TF_QUINT8:
-      *out_pyarray_type = NPY_UINT8;
-      break;
-    case TF_QINT16:
-      *out_pyarray_type = NPY_INT16;
-      break;
-    case TF_QUINT16:
-      *out_pyarray_type = NPY_UINT16;
-      break;
-    case TF_QINT32:
-      *out_pyarray_type = NPY_INT32;
-      break;
-    case TF_BFLOAT16:
-      *out_pyarray_type = NPY_UINT16;
-      break;
-    default:
-      return errors::Internal("Unsupported fetch type");
-  }
-  return Status::OK();
-}
-
 // Iterate over the string array 'array', extract the ptr and len of each string
 // element and call f(ptr, len).
 template <typename F>
@@ -393,7 +322,7 @@ Status GetPyArrayDescrForTensor(const TF_Tensor* tensor,
 
 // Converts the given TF_Tensor to a Numpy array.
 // If the returned status is OK, the caller becomes the owner of *out_array.
-Status TF_Tensor_to_PyObject(TF_Tensor* tensor, PyObject** out_array) {
+Status TF_Tensor_to_PyObject(Safe_TF_TensorPtr tensor, PyObject** out_array) {
   // A fetched operation will correspond to a null tensor, and a None
   // in Python.
   if (tensor == nullptr) {
@@ -404,16 +333,26 @@ Status TF_Tensor_to_PyObject(TF_Tensor* tensor, PyObject** out_array) {
 
   tensorflow::int64 nelems = -1;
   gtl::InlinedVector<npy_intp, 4> dims =
-      GetPyArrayDimensionsForTensor(tensor, &nelems);
+      GetPyArrayDimensionsForTensor(tensor.get(), &nelems);
 
   // Convert TensorFlow dtype to numpy type descriptor.
   PyArray_Descr* descr = nullptr;
-  TF_RETURN_IF_ERROR(GetPyArrayDescrForTensor(tensor, &descr));
+  TF_RETURN_IF_ERROR(GetPyArrayDescrForTensor(tensor.get(), &descr));
+
+  // If the type is neither string nor resource we can reuse the Tensor memory.
+  TF_Tensor* original = tensor.get();
+  TF_Tensor* moved = TF_TensorMaybeMove(tensor.release());
+  if (moved != nullptr) {
+    if (ArrayFromMemory(dims.size(), dims.data(), TF_TensorData(moved),
+                        static_cast<DataType>(TF_TensorType(moved)),
+                        [moved] { TF_DeleteTensor(moved); }, out_array)
+            .ok()) {
+      return Status::OK();
+    }
+  }
+  tensor.reset(original);
 
   // Copy the TF_TensorData into a newly-created ndarray and return it.
-  // TODO(mrry): Perhaps investigate zero-copy approaches. This would involve
-  // creating an ndarray-like object that wraps the TF_Tensor buffer, and
-  // maps its destructor to TF_DeleteTensor.
   Safe_PyObjectPtr safe_out_array =
       tensorflow::make_safe(PyArray_Empty(dims.size(), dims.data(), descr, 0));
   if (!safe_out_array) {
@@ -422,31 +361,31 @@ Status TF_Tensor_to_PyObject(TF_Tensor* tensor, PyObject** out_array) {
   PyArrayObject* py_array =
       reinterpret_cast<PyArrayObject*>(safe_out_array.get());
   if (PyArray_NBYTES(py_array) !=
-      static_cast<int64>(TF_TensorByteSize(tensor))) {
-    if (TF_TensorType(tensor) == TF_STRING) {
+      static_cast<int64>(TF_TensorByteSize(tensor.get()))) {
+    if (TF_TensorType(tensor.get()) == TF_STRING) {
       // Copy element by element.
       auto iter = tensorflow::make_safe(PyArray_IterNew(safe_out_array.get()));
       for (tensorflow::int64 i = 0; i < nelems; ++i) {
-        auto s =
-            CopyStringToPyArrayElement(py_array, iter.get(), tensor, nelems, i);
+        auto s = CopyStringToPyArrayElement(py_array, iter.get(), tensor.get(),
+                                            nelems, i);
         if (!s.ok()) {
           return s;
         }
         PyArray_ITER_NEXT(iter.get());
       }
-    } else if (TF_TensorType(tensor) == TF_RESOURCE) {
+    } else if (TF_TensorType(tensor.get()) == TF_RESOURCE) {
       ResourceHandle* resource_handle =
-          reinterpret_cast<ResourceHandle*>(TF_TensorData(tensor));
+          reinterpret_cast<ResourceHandle*>(TF_TensorData(tensor.get()));
       memcpy(PyArray_DATA(py_array),
              resource_handle->SerializeAsString().c_str(),
              PyArray_NBYTES(py_array));
     } else {
       return errors::Internal("ndarray was ", PyArray_NBYTES(py_array),
                               " bytes but TF_Tensor was ",
-                              TF_TensorByteSize(tensor), " bytes");
+                              TF_TensorByteSize(tensor.get()), " bytes");
     }
   } else {
-    memcpy(PyArray_DATA(py_array), TF_TensorData(tensor),
+    memcpy(PyArray_DATA(py_array), TF_TensorData(tensor.get()),
            PyArray_NBYTES(py_array));
   }
 
@@ -610,7 +549,7 @@ void TF_Run_wrapper_helper(TF_DeprecatedSession* session, const char* handle,
   Safe_PyObjectVector py_outputs_safe;
   for (size_t i = 0; i < output_names.size(); ++i) {
     PyObject* py_array;
-    s = TF_Tensor_to_PyObject(outputs[i], &py_array);
+    s = TF_Tensor_to_PyObject(std::move(tf_outputs_safe[i]), &py_array);
     if (!s.ok()) {
       Set_TF_Status_from_Status(out_status, s);
       return;
diff --git a/tensorflow/python/lib/core/ndarray_tensor_bridge.cc b/tensorflow/python/lib/core/ndarray_tensor_bridge.cc
index baba144daf..b9a43bd820 100644
--- a/tensorflow/python/lib/core/ndarray_tensor_bridge.cc
+++ b/tensorflow/python/lib/core/ndarray_tensor_bridge.cc
@@ -18,6 +18,8 @@ limitations under the License.
 
 #include <vector>
 
+#include "tensorflow/c/c_api.h"
+#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/python/lib/core/ndarray_tensor_bridge.h"
 
@@ -54,4 +56,158 @@ void ClearDecrefCache() {
   DecrefCache()->clear();
 }
 
+// Structure which keeps a reference to a Tensor alive while numpy has a pointer
+// to it.
+struct TensorReleaser {
+  // Python macro to include standard members.
+  PyObject_HEAD
+
+      // Destructor responsible for releasing the memory.
+      std::function<void()>* destructor;
+};
+
+extern PyTypeObject TensorReleaserType;
+
+static void TensorReleaser_dealloc(TensorReleaser* self) {
+  (*self->destructor)();
+  delete self->destructor;
+  TensorReleaserType.tp_free(self);
+}
+
+PyTypeObject TensorReleaserType = {
+    PyVarObject_HEAD_INIT(nullptr, 0) /* head init */
+    "tensorflow_wrapper",             /* tp_name */
+    sizeof(TensorReleaser),           /* tp_basicsize */
+    0,                                /* tp_itemsize */
+    /* methods */
+    (destructor)TensorReleaser_dealloc, /* tp_dealloc */
+    0,                                  /* tp_print */
+    0,                                  /* tp_getattr */
+    0,                                  /* tp_setattr */
+    0,                                  /* tp_compare */
+    0,                                  /* tp_repr */
+    0,                                  /* tp_as_number */
+    0,                                  /* tp_as_sequence */
+    0,                                  /* tp_as_mapping */
+    0,                                  /* tp_hash */
+    0,                                  /* tp_call */
+    0,                                  /* tp_str */
+    0,                                  /* tp_getattro */
+    0,                                  /* tp_setattro */
+    0,                                  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,                 /* tp_flags */
+    "Wrapped TensorFlow Tensor",        /* tp_doc */
+    0,                                  /* tp_traverse */
+    0,                                  /* tp_clear */
+    0,                                  /* tp_richcompare */
+};
+
+Status TF_DataType_to_PyArray_TYPE(TF_DataType tf_datatype,
+                                   int* out_pyarray_type) {
+  switch (tf_datatype) {
+    case TF_HALF:
+      *out_pyarray_type = NPY_FLOAT16;
+      break;
+    case TF_FLOAT:
+      *out_pyarray_type = NPY_FLOAT32;
+      break;
+    case TF_DOUBLE:
+      *out_pyarray_type = NPY_FLOAT64;
+      break;
+    case TF_INT32:
+      *out_pyarray_type = NPY_INT32;
+      break;
+    case TF_UINT8:
+      *out_pyarray_type = NPY_UINT8;
+      break;
+    case TF_UINT16:
+      *out_pyarray_type = NPY_UINT16;
+      break;
+    case TF_INT8:
+      *out_pyarray_type = NPY_INT8;
+      break;
+    case TF_INT16:
+      *out_pyarray_type = NPY_INT16;
+      break;
+    case TF_INT64:
+      *out_pyarray_type = NPY_INT64;
+      break;
+    case TF_BOOL:
+      *out_pyarray_type = NPY_BOOL;
+      break;
+    case TF_COMPLEX64:
+      *out_pyarray_type = NPY_COMPLEX64;
+      break;
+    case TF_COMPLEX128:
+      *out_pyarray_type = NPY_COMPLEX128;
+      break;
+    case TF_STRING:
+      *out_pyarray_type = NPY_OBJECT;
+      break;
+    case TF_RESOURCE:
+      *out_pyarray_type = NPY_VOID;
+      break;
+    // TODO(keveman): These should be changed to NPY_VOID, and the type used for
+    // the resulting numpy array should be the custom struct types that we
+    // expect for quantized types.
+    case TF_QINT8:
+      *out_pyarray_type = NPY_INT8;
+      break;
+    case TF_QUINT8:
+      *out_pyarray_type = NPY_UINT8;
+      break;
+    case TF_QINT16:
+      *out_pyarray_type = NPY_INT16;
+      break;
+    case TF_QUINT16:
+      *out_pyarray_type = NPY_UINT16;
+      break;
+    case TF_QINT32:
+      *out_pyarray_type = NPY_INT32;
+      break;
+    case TF_BFLOAT16:
+      *out_pyarray_type = NPY_UINT16;
+      break;
+    default:
+      return errors::Internal("Tensorflow type ", tf_datatype,
+                              " not convertible to numpy dtype.");
+  }
+  return Status::OK();
+}
+
+Status ArrayFromMemory(int dim_size, npy_intp* dims, void* data, DataType dtype,
+                       std::function<void()> destructor, PyObject** result) {
+  int size = 1;
+  for (int i = 0; i < dim_size; ++i) {
+    size *= dims[i];
+  }
+  if (dtype == DT_STRING || dtype == DT_RESOURCE || size == 0) {
+    return errors::FailedPrecondition(
+        "Cannot convert strings, resources, or empty Tensors.");
+  }
+
+  int type_num = -1;
+  Status s =
+      TF_DataType_to_PyArray_TYPE(static_cast<TF_DataType>(dtype), &type_num);
+  if (!s.ok()) {
+    return s;
+  }
+
+  PyObject* np_array =
+      PyArray_SimpleNewFromData(dim_size, dims, type_num, data);
+  if (PyType_Ready(&TensorReleaserType) == -1) {
+    return errors::Unknown("Python type initialization failed.");
+  }
+  TensorReleaser* releaser = reinterpret_cast<TensorReleaser*>(
+      TensorReleaserType.tp_alloc(&TensorReleaserType, 0));
+  releaser->destructor = new std::function<void()>(std::move(destructor));
+  if (PyArray_SetBaseObject(reinterpret_cast<PyArrayObject*>(np_array),
+                            reinterpret_cast<PyObject*>(releaser)) == -1) {
+    Py_DECREF(releaser);
+    return errors::Unknown("Python array refused to use memory.");
+  }
+  *result = PyArray_Return(reinterpret_cast<PyArrayObject*>(np_array));
+  return Status::OK();
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/python/lib/core/ndarray_tensor_bridge.h b/tensorflow/python/lib/core/ndarray_tensor_bridge.h
index 5890e1328e..029c0d3ef0 100644
--- a/tensorflow/python/lib/core/ndarray_tensor_bridge.h
+++ b/tensorflow/python/lib/core/ndarray_tensor_bridge.h
@@ -15,6 +15,15 @@ limitations under the License.
 #ifndef TENSORFLOW_PYTHON_LIB_CORE_NDARRAY_TENSOR_BRIDGE_H_
 #define TENSORFLOW_PYTHON_LIB_CORE_NDARRAY_TENSOR_BRIDGE_H_
 
+// Must be included first.
+#include "tensorflow/python/lib/core/numpy.h"
+
+#include <functional>
+
+#include "tensorflow/c/c_api.h"
+#include "tensorflow/core/framework/types.pb.h"
+#include "tensorflow/core/lib/core/status.h"
+
 namespace tensorflow {
 
 // Destructor passed to TF_NewTensor when it reuses a numpy buffer. Stores a
@@ -26,6 +35,17 @@ void DelayedNumpyDecref(void* data, size_t len, void* obj);
 // holding the GIL.
 void ClearDecrefCache();
 
+// Creates a numpy array with shapes specified by dim_size and dims and content
+// in data. The array does not own the memory, and destructor will be called to
+// release it. If the status is not ok the caller is responsible for releasing
+// the memory.
+Status ArrayFromMemory(int dim_size, npy_intp* dims, void* data, DataType dtype,
+                       std::function<void()> destructor, PyObject** result);
+
+// Converts TF_DataType to the corresponding numpy type.
+Status TF_DataType_to_PyArray_TYPE(TF_DataType tf_datatype,
+                                   int* out_pyarray_type);
+
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_PYTHON_LIB_CORE_NDARRAY_TENSOR_BRIDGE_H_
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
index fe0557b535..3e53f1d69f 100644
--- a/tensorflow/python/lib/core/py_func.cc
+++ b/tensorflow/python/lib/core/py_func.cc
@@ -41,50 +41,6 @@ PyObject* GetPyTrampoline() {
   return py_trampoline;
 }
 
-// Returns the corresponding numpy dtype in 'np' for tf data type
-// 'tf'.  Returns an error if the type is not supported by this
-// module.
-Status TfDTypeToNpDType(const DataType& tf, int* np) {
-  switch (tf) {
-    case DT_FLOAT:
-      *np = NPY_FLOAT32;
-      break;
-    case DT_DOUBLE:
-      *np = NPY_FLOAT64;
-      break;
-    case DT_INT32:
-      *np = NPY_INT32;
-      break;
-    case DT_UINT8:
-      *np = NPY_UINT8;
-      break;
-    case DT_INT8:
-      *np = NPY_INT8;
-      break;
-    case DT_INT16:
-      *np = NPY_INT16;
-      break;
-    case DT_INT64:
-      *np = NPY_INT64;
-      break;
-    case DT_BOOL:
-      *np = NPY_BOOL;
-      break;
-    case DT_COMPLEX64:
-      *np = NPY_COMPLEX64;
-      break;
-    case DT_COMPLEX128:
-      *np = NPY_COMPLEX128;
-      break;
-    case DT_STRING:
-      *np = NPY_OBJECT;
-      break;
-    default:
-      return errors::Unimplemented("Unsupported tf type ", DataTypeString(tf));
-  }
-  return Status::OK();
-}
-
 // A call to the registered python function.
 struct PyCall {
   // Passed to python runtime to call the python function registered
@@ -382,17 +338,27 @@ Status ConvertNdarrayToTensor(PyObject* obj, Tensor* ret) {
   return Status::OK();
 }
 
-// Creates a numpy array in 'ret' and copies the content of tensor 't'
-// into 'ret'.
+// Creates a numpy array in 'ret' which either aliases the content of 't' or has
+// a copy.
 Status ConvertTensorToNdarray(const Tensor& t, PyObject** ret) {
   int typenum = -1;
-  TF_RETURN_IF_ERROR(TfDTypeToNpDType(t.dtype(), &typenum));
+  TF_RETURN_IF_ERROR(TF_DataType_to_PyArray_TYPE(
+      static_cast<TF_DataType>(t.dtype()), &typenum));
   PyArray_Descr* descr = PyArray_DescrFromType(typenum);
   CHECK(descr);
   std::vector<npy_intp> dims;
   for (int i = 0; i < t.dims(); ++i) {
     dims.push_back(t.dim_size(i));
   }
+  Tensor* copy = new Tensor(t);
+  if (ArrayFromMemory(dims.size(), dims.data(),
+                      const_cast<char*>(copy->tensor_data().data()), t.dtype(),
+                      [copy]() { delete copy; }, ret)
+          .ok()) {
+    return Status::OK();
+  }
+  delete copy;
+
   PyObject* obj = PyArray_Empty(dims.size(), dims.data(), descr, 0);
   if (obj == nullptr) {
     return errors::Internal("Failed to allocate np array: ",
-- 
GitLab


From 83ca5d6afd387caf6abb4767d2f415c16ee02139 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Wed, 12 Apr 2017 15:38:38 -0800
Subject: [PATCH 0363/1563] Make "node_name:0" a legit target node name.
 Change: 153004183

---
 tensorflow/core/graph/subgraph.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tensorflow/core/graph/subgraph.cc b/tensorflow/core/graph/subgraph.cc
index ff46abd439..91292500e1 100644
--- a/tensorflow/core/graph/subgraph.cc
+++ b/tensorflow/core/graph/subgraph.cc
@@ -143,10 +143,7 @@ static bool AddNodeToTargets(const string& node_or_tensor_name,
     return false;
   }
   const Node* n = iter->second;
-  if (n->name() != node_or_tensor_name) {
-    return false;
-  }
-
+  CHECK_EQ(n->name(), id.first);
   targets->insert(n);
   return true;
 }
-- 
GitLab


From 43315df710bf23fbc8e668806d77b7a1233884f4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 16:42:37 -0800
Subject: [PATCH 0364/1563] Internal change. Change: 153011270

---
 tensorflow/python/kernel_tests/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index ad455babbc..f40ae8d749 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -1787,7 +1787,7 @@ cuda_py_test(
 
 cuda_py_test(
     name = "split_op_test",
-    size = "small",
+    size = "medium",
     srcs = ["split_op_test.py"],
     additional_deps = [
         "//third_party/py/numpy",
-- 
GitLab


From 26b5e3cdeabadd6a00fe5ab9d6eeb7c827ca1a1b Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Wed, 12 Apr 2017 16:48:20 -0800
Subject: [PATCH 0365/1563] libtensorflow.sh: Delete old artifacts before
 attempting the build

Otherwise the previous artifacts show up in the Jenkins list of artifacts
even when the build fails.
Change: 153011768
---
 tensorflow/tools/ci_build/builds/libtensorflow.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/ci_build/builds/libtensorflow.sh b/tensorflow/tools/ci_build/builds/libtensorflow.sh
index 0ae31dfb51..54ecaf6990 100755
--- a/tensorflow/tools/ci_build/builds/libtensorflow.sh
+++ b/tensorflow/tools/ci_build/builds/libtensorflow.sh
@@ -45,6 +45,10 @@ function build_libtensorflow_tarball() {
     echo "Must run this from the root of the bazel workspace"
     exit 1
   fi
+  # Delete any leftovers from previous builds in this workspace.
+  DIR=lib_package
+  rm -rf ${DIR}
+
   TARBALL_SUFFIX="${1}"
   BAZEL="bazel --bazelrc ./tensorflow/tools/ci_build/install/.bazelrc"
   BAZEL_OPTS="-c opt"
@@ -71,8 +75,6 @@ function build_libtensorflow_tarball() {
     //tensorflow/java:libtensorflow.jar \
     //tensorflow/java:libtensorflow-src.jar
 
-  DIR=lib_package
-  rm -rf ${DIR}
   mkdir -p ${DIR}
   cp bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz ${DIR}/libtensorflow${TARBALL_SUFFIX}.tar.gz
   cp bazel-bin/tensorflow/tools/lib_package/libtensorflow_jni.tar.gz ${DIR}/libtensorflow_jni${TARBALL_SUFFIX}.tar.gz
-- 
GitLab


From ab4ee1d1100b64f52cfeef99c713593eabead842 Mon Sep 17 00:00:00 2001
From: Neal Wu <wun@google.com>
Date: Wed, 12 Apr 2017 16:57:01 -0800
Subject: [PATCH 0366/1563] Documentation change for new instance creation in
 MultiRNNCell (see comment from @richardjdavies at
 #5599#issuecomment-293514292) Change: 153012500

---
 tensorflow/docs_src/tutorials/recurrent.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/tutorials/recurrent.md b/tensorflow/docs_src/tutorials/recurrent.md
index 8cc6cf15ef..12d6285147 100644
--- a/tensorflow/docs_src/tutorials/recurrent.md
+++ b/tensorflow/docs_src/tutorials/recurrent.md
@@ -156,9 +156,10 @@ the second and so on.
 We have a class called `MultiRNNCell` that makes the implementation seamless:
 
 ```python
-lstm = tf.contrib.rnn.BasicLSTMCell(lstm_size, state_is_tuple=False)
-stacked_lstm = tf.contrib.rnn.MultiRNNCell([lstm] * number_of_layers,
-    state_is_tuple=False)
+def lstm_cell():
+  return tf.contrib.rnn.BasicLSTMCell(lstm_size)
+stacked_lstm = tf.contrib.rnn.MultiRNNCell(
+    [lstm_cell() for _ in range(number_of_layers)])
 
 initial_state = state = stacked_lstm.zero_state(batch_size, tf.float32)
 for i in range(num_steps):
-- 
GitLab


From 5dad630a7010f2e1fa56c21fa0f6a730ac3094d9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 17:30:22 -0800
Subject: [PATCH 0367/1563] Internal change. Change: 153015162

---
 tensorflow/python/kernel_tests/BUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index f40ae8d749..e2394d73a4 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2122,6 +2122,7 @@ cuda_py_test(
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:nn_ops_gen",
     ],
+    shard_count = 4,
 )
 
 cuda_py_test(
@@ -2137,6 +2138,7 @@ cuda_py_test(
         "//tensorflow/python:platform",
         "//tensorflow/python:random_ops",
     ],
+    shard_count = 4,
 )
 
 cuda_py_test(
-- 
GitLab


From 97c6203bb3f3978ac67920c66b6234ef82051c57 Mon Sep 17 00:00:00 2001
From: Andrew Selle <aselle@andyselle.com>
Date: Wed, 12 Apr 2017 22:03:06 -0700
Subject: [PATCH 0368/1563] Update issue template (thanks jart@) and add env
 collection script. (#9140)

* Update issue template (thanks jart@) and add env collection script.

* Improve shell script and issue template more (address review)

- Make shell script for stringent by using -u
- Use uppercase GIT_VERSION instead of __git_version__.
- Add OS platform to required information
---
 ISSUE_TEMPLATE.md       | 24 +++++++++--
 tools/tf_env_collect.sh | 94 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100755 tools/tf_env_collect.sh

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 50f67963bf..d0979e87f7 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,14 +1,32 @@
-NOTE: Issues that are not bugs or feature requests will be closed. Please ask usage questions on StackOverflow.
+Please go to Stack Overflow for help and support. http://stackoverflow.com/questions/tagged/tensorflow
+If you open a GitHub issue, here is our policy:
 
-### You must complete this information or else your issue will be closed
+1. It must be a bug or feature request.
+2. The form below must be filled out.
+
+**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g. fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
+
+------------------------
+
+Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
+
+### System Information
 - *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
+- *OS Platform and Distribution (i.e. Linux Ubuntu 16.0)*:
 - *TensorFlow installed from (source or binary)?*:
-- *TensorFlow version*:
+- *TensorFlow version* (use command below):
 - *Bazel version (if compiling from source)*:
 - *CUDA/cuDNN version*:
 - *GPU Model and Memory*:
 - *Exact command to reproduce*:
 
+You can collect some of this information using our environment capture script https://github.com/tensorflow/tensorflow/blob/master/tools/
+You can collect the TensorFlow version with
+```sh
+python -c "import tensorflow as tf; print (tf.GIT_VERSION, tf.VERSION)"
+```
+
+
 ### Describe the problem clearly
 
 ### Source Code / Logs
diff --git a/tools/tf_env_collect.sh b/tools/tf_env_collect.sh
new file mode 100755
index 0000000000..2a92e9a078
--- /dev/null
+++ b/tools/tf_env_collect.sh
@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+
+set -u  # Check for undefined variables
+
+echo "Collecting system information..."
+
+OUTPUT_FILE=tf_env.txt
+
+echo >> $OUTPUT_FILE
+echo "== cat /etc/issue ===============================================" >> $OUTPUT_FILE
+uname -a >> $OUTPUT_FILE
+uname=`uname -s`
+if [ "$(uname)" == "Darwin" ]; then
+  echo Mac OS X `sw_vers -productVersion` >> $OUTPUT_FILE
+elif [ "$(uname)" == "Linux" ]; then
+  cat /etc/*release | grep VERSION >> $OUTPUT_FILE
+fi
+
+
+echo >> $OUTPUT_FILE
+echo '== are we in docker =============================================' >> $OUTPUT_FILE
+num=`cat /proc/1/cgroup | grep docker | wc -l`;
+if [ $num -ge 1 ]; then
+  echo "Yes" >> $OUTPUT_FILE
+else
+  echo "No" >> $OUTPUT_FILE
+fi
+
+echo >> $OUTPUT_FILE
+echo '== compiler =====================================================' >> $OUTPUT_FILE
+c++ --version &>> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== uname -a =====================================================' >> $OUTPUT_FILE
+uname -a >> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== check pips ===================================================' >> $OUTPUT_FILE
+pip list 2>&1 | grep "proto\|numpy\|tensorflow" &>> $OUTPUT_FILE
+
+
+echo >> $OUTPUT_FILE
+echo '== check for virtualenv =========================================' >> $OUTPUT_FILE
+python -c "import sys;print(hasattr(sys, \"real_prefix\"))" >> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== tensorflow import ============================================' >> $OUTPUT_FILE
+cat <<EOF > /tmp/check_tf.py
+import tensorflow as tf;
+print("tf.VERSION = %s" % tf.VERSION)
+print("tf.GIT_VERSION = %s" % tf.GIT_VERSION)
+print("tf.COMPILER_VERSION = %s" % tf.GIT_VERSION)
+with tf.Session() as sess:
+  print("Sanity check: %r" % sess.run(tf.constant([1,2,3])[:1]))
+EOF
+python /tmp/check_tf.py &>> ${OUTPUT_FILE}
+
+DEBUG_LD=libs python -c "import tensorflow"  2>>${OUTPUT_FILE} > /tmp/loadedlibs
+grep libcudnn.so /tmp/loadedlibs >> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== env ==========================================================' >> $OUTPUT_FILE
+if [ -z ${LD_LIBRARY_PATH+x} ]; then
+  echo "LD_LIBRARY_PATH is unset" >> $OUTPUT_FILE;
+else
+  echo LD_LIBRARY_PATH ${LD_LIBRARY_PATH}  >> $OUTPUT_FILE;
+fi
+if [ -z ${DYLD_LIBRARY_PATH+x} ]; then
+  echo "DYLD_LIBRARY_PATH is unset" >> $OUTPUT_FILE;
+else
+  echo DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}  >> $OUTPUT_FILE;
+fi
+
+
+echo >> $OUTPUT_FILE >> $OUTPUT_FILE
+echo '== nvidia-smi ===================================================' >> $OUTPUT_FILE
+nvidia-smi &>> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+
+echo '== cuda libs  ===================================================' >> $OUTPUT_FILE
+find /usr/local -type f -name 'libcudart*'  2>/dev/null | grep cuda |  grep -v "\\.cache" >> ${OUTPUT_FILE}
+find /usr/local -type f -name 'libudnn*'  2>/dev/null | grep cuda |  grep -v "\\.cache" >> ${OUTPUT_FILE}
+
+# Remove any words with google.
+mv $OUTPUT_FILE old-$OUTPUT_FILE
+grep -v -i google old-${OUTPUT_FILE} > $OUTPUT_FILE
+
+echo "Wrote environment to ${OUTPUT_FILE}. You can review the contents of that file."
+echo "and use it to populate the fields in the github issue template."
+echo
+echo "cat ${OUTPUT_FILE}"
+echo
+
-- 
GitLab


From cf1a098bc78897d04ec14c411ddf2a158fdb0851 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Wed, 12 Apr 2017 20:50:15 -0800
Subject: [PATCH 0369/1563] Fix the bug that "0" is overridden in the
 constructor Change: 153026139

---
 tensorflow/contrib/learn/python/learn/experiment.py      | 6 ++++--
 tensorflow/contrib/learn/python/learn/experiment_test.py | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index c363a1c947..602d33e5f9 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -116,6 +116,7 @@ class Experiment(object):
       min_eval_frequency: (applies only to train_and_evaluate). the minimum
         number of steps between evaluations. Of course, evaluation does not
         occur if no new snapshot is available, hence, this is the minimum.
+        If 0, the evaluation will only happen after training.
         If None, defaults to 1, unless model_dir is on GCS, in which case the
         default is 1000.
       delay_workers_by_global_step: if `True` delays training workers
@@ -164,7 +165,8 @@ class Experiment(object):
     # we use a different default. This is a temporary band-aid, to be
     # fixed holistically later (b/36498507).
     default_min_eval_frequency = 1000 if _is_gcs(estimator.model_dir) else 1
-    self._min_eval_frequency = min_eval_frequency or default_min_eval_frequency
+    self._min_eval_frequency = min_eval_frequency if (
+        min_eval_frequency is not None) else default_min_eval_frequency
     self._delay_workers_by_global_step = delay_workers_by_global_step
     self._train_monitors = train_monitors[:] if train_monitors else []
     self._eval_hooks = eval_hooks[:] if eval_hooks else []
@@ -454,7 +456,7 @@ class Experiment(object):
     """Interleaves training and evaluation.
 
     The frequency of evaluation is controlled by the contructor arg
-    `min_eval_frequency`. When this parameter is None or 0, evaluation happens
+    `min_eval_frequency`. When this parameter is 0, evaluation happens
     only after training has completed. Note that evaluation cannot happen
     more frequently than checkpoints are taken. If no new snapshots are
     available when evaluation is supposed to occur, then evaluation doesn't
diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index c8ad58336b..e0fafef951 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -590,6 +590,15 @@ class ExperimentTest(test.TestCase):
         eval_input_fn=None)
     self.assertEquals(ex._min_eval_frequency, 123)
 
+    # Make sure default not used when explicitly set as 0
+    estimator = core_estimator.Estimator(dummy_model_fn, 'gs://dummy_bucket')
+    ex = experiment.Experiment(
+        estimator,
+        min_eval_frequency=0,
+        train_input_fn=None,
+        eval_input_fn=None)
+    self.assertEquals(ex._min_eval_frequency, 0)
+
   def test_continuous_train_and_eval(self):
     for est in self._estimators_for_tests(eval_dict={'global_step': 100}):
       eval_metrics = 'eval_metrics' if not isinstance(
-- 
GitLab


From b4396632f78624057eefc79721e5081254068d48 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 00:52:08 -0800
Subject: [PATCH 0370/1563] Add a GPUOPTIONS option to force all tensors to be
 gpu_compatible Change: 153039058

---
 tensorflow/core/common_runtime/gpu/gpu_device.h  |  1 +
 .../common_runtime/gpu/gpu_device_factory.cc     | 16 ++++++++++++----
 tensorflow/core/protobuf/config.proto            | 12 ++++++++++++
 .../api/golden/tensorflow.-g-p-u-options.pbtxt   |  4 ++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.h b/tensorflow/core/common_runtime/gpu/gpu_device.h
index 370b3cc4f6..2525931301 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.h
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.h
@@ -108,6 +108,7 @@ class BaseGPUDevice : public LocalDevice {
   mutex trace_mu_;
   int gpu_id_ = -1;
   const bool sync_every_op_ = false;
+  bool force_gpu_compatible_ = false;
   const int32 max_streams_;
   std::unique_ptr<EventMgr> em_;
 
diff --git a/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc b/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
index 94143a55d5..d9fa5a6b96 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
@@ -31,12 +31,16 @@ class GPUDevice : public BaseGPUDevice {
             Allocator* cpu_allocator)
       : BaseGPUDevice(options, name, memory_limit, locality, gpu_id,
                       physical_device_desc, gpu_allocator, cpu_allocator,
-                      false /* sync every op */, 1 /* max_streams */) {}
+                      false /* sync every op */, 1 /* max_streams */) {
+    if (options.config.has_gpu_options()) {
+      force_gpu_compatible_ = options.config.gpu_options.force_gpu_compatible;
+    }
+  }
 
   Allocator* GetAllocator(AllocatorAttributes attr) override {
     if (attr.on_host()) {
       ProcessState* ps = ProcessState::singleton();
-      if (attr.gpu_compatible()) {
+      if (attr.gpu_compatible() || force_gpu_compatible_) {
         return ps->GetCUDAHostAllocator(0);
       } else {
         return cpu_allocator_;
@@ -71,12 +75,16 @@ class GPUCompatibleCPUDevice : public ThreadPoolDevice {
   GPUCompatibleCPUDevice(const SessionOptions& options, const string& name,
                          Bytes memory_limit, const DeviceLocality& locality,
                          Allocator* allocator)
-      : ThreadPoolDevice(options, name, memory_limit, locality, allocator) {}
+      : ThreadPoolDevice(options, name, memory_limit, locality, allocator) {
+    if (options.config.has_gpu_options()) {
+      force_gpu_compatible_ = options.config.gpu_options.force_gpu_compatible;
+    }
+  }
   ~GPUCompatibleCPUDevice() override {}
 
   Allocator* GetAllocator(AllocatorAttributes attr) override {
     ProcessState* ps = ProcessState::singleton();
-    if (attr.gpu_compatible()) {
+    if (attr.gpu_compatible() || force_gpu_compatible_) {
       return ps->GetCUDAHostAllocator(0);
     } else {
       // Call the parent's implementation.
diff --git a/tensorflow/core/protobuf/config.proto b/tensorflow/core/protobuf/config.proto
index 98e7b171d2..5c0f7232eb 100644
--- a/tensorflow/core/protobuf/config.proto
+++ b/tensorflow/core/protobuf/config.proto
@@ -64,6 +64,18 @@ message GPUOptions {
   // PollEvents calls, when the queue is empty.  If value is not
   // set or set to 0, gets set to a non-zero default.
   int32 polling_inactive_delay_msecs = 7;
+
+  // Force all tensors to be gpu_compatible. On a GPU-enabled TensorFlow,
+  // enabling this option forces all CPU tensors to be allocated with Cuda
+  // pinned memory. Normally, TensorFlow will infer which tensors should be
+  // allocated as the pinned memory. But in case where the inference is
+  // incomplete, this option can significantly speed up the cross-device memory
+  // copy performance as long as it fits the memory.
+  // Note that this option is not something that should be
+  // enabled by default for unknown or very large models, since all Cuda pinned
+  // memory is unpageable, having too much pinned memory might negatively impact
+  // the overall host system performance.
+  bool force_gpu_compatible = 8;
 };
 
 // Options passed to the graph optimizer
diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
index 48cda623f7..30f7e4e116 100644
--- a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
@@ -22,6 +22,10 @@ tf_class {
     name: "Extensions"
     mtype: "<type \'getset_descriptor\'>"
   }
+  member {
+    name: "FORCE_GPU_COMPATIBLE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
   member {
     name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
     mtype: "<type \'int\'>"
-- 
GitLab


From 7d4aaddaad9343fea73dbc0e100e8c5d726f45d6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 02:35:33 -0800
Subject: [PATCH 0371/1563] Automated rollback of change 153039058 Change:
 153045639

---
 tensorflow/core/common_runtime/gpu/gpu_device.h  |  1 -
 .../common_runtime/gpu/gpu_device_factory.cc     | 16 ++++------------
 tensorflow/core/protobuf/config.proto            | 12 ------------
 .../api/golden/tensorflow.-g-p-u-options.pbtxt   |  4 ----
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.h b/tensorflow/core/common_runtime/gpu/gpu_device.h
index 2525931301..370b3cc4f6 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.h
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.h
@@ -108,7 +108,6 @@ class BaseGPUDevice : public LocalDevice {
   mutex trace_mu_;
   int gpu_id_ = -1;
   const bool sync_every_op_ = false;
-  bool force_gpu_compatible_ = false;
   const int32 max_streams_;
   std::unique_ptr<EventMgr> em_;
 
diff --git a/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc b/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
index d9fa5a6b96..94143a55d5 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
@@ -31,16 +31,12 @@ class GPUDevice : public BaseGPUDevice {
             Allocator* cpu_allocator)
       : BaseGPUDevice(options, name, memory_limit, locality, gpu_id,
                       physical_device_desc, gpu_allocator, cpu_allocator,
-                      false /* sync every op */, 1 /* max_streams */) {
-    if (options.config.has_gpu_options()) {
-      force_gpu_compatible_ = options.config.gpu_options.force_gpu_compatible;
-    }
-  }
+                      false /* sync every op */, 1 /* max_streams */) {}
 
   Allocator* GetAllocator(AllocatorAttributes attr) override {
     if (attr.on_host()) {
       ProcessState* ps = ProcessState::singleton();
-      if (attr.gpu_compatible() || force_gpu_compatible_) {
+      if (attr.gpu_compatible()) {
         return ps->GetCUDAHostAllocator(0);
       } else {
         return cpu_allocator_;
@@ -75,16 +71,12 @@ class GPUCompatibleCPUDevice : public ThreadPoolDevice {
   GPUCompatibleCPUDevice(const SessionOptions& options, const string& name,
                          Bytes memory_limit, const DeviceLocality& locality,
                          Allocator* allocator)
-      : ThreadPoolDevice(options, name, memory_limit, locality, allocator) {
-    if (options.config.has_gpu_options()) {
-      force_gpu_compatible_ = options.config.gpu_options.force_gpu_compatible;
-    }
-  }
+      : ThreadPoolDevice(options, name, memory_limit, locality, allocator) {}
   ~GPUCompatibleCPUDevice() override {}
 
   Allocator* GetAllocator(AllocatorAttributes attr) override {
     ProcessState* ps = ProcessState::singleton();
-    if (attr.gpu_compatible() || force_gpu_compatible_) {
+    if (attr.gpu_compatible()) {
       return ps->GetCUDAHostAllocator(0);
     } else {
       // Call the parent's implementation.
diff --git a/tensorflow/core/protobuf/config.proto b/tensorflow/core/protobuf/config.proto
index 5c0f7232eb..98e7b171d2 100644
--- a/tensorflow/core/protobuf/config.proto
+++ b/tensorflow/core/protobuf/config.proto
@@ -64,18 +64,6 @@ message GPUOptions {
   // PollEvents calls, when the queue is empty.  If value is not
   // set or set to 0, gets set to a non-zero default.
   int32 polling_inactive_delay_msecs = 7;
-
-  // Force all tensors to be gpu_compatible. On a GPU-enabled TensorFlow,
-  // enabling this option forces all CPU tensors to be allocated with Cuda
-  // pinned memory. Normally, TensorFlow will infer which tensors should be
-  // allocated as the pinned memory. But in case where the inference is
-  // incomplete, this option can significantly speed up the cross-device memory
-  // copy performance as long as it fits the memory.
-  // Note that this option is not something that should be
-  // enabled by default for unknown or very large models, since all Cuda pinned
-  // memory is unpageable, having too much pinned memory might negatively impact
-  // the overall host system performance.
-  bool force_gpu_compatible = 8;
 };
 
 // Options passed to the graph optimizer
diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
index 30f7e4e116..48cda623f7 100644
--- a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
@@ -22,10 +22,6 @@ tf_class {
     name: "Extensions"
     mtype: "<type \'getset_descriptor\'>"
   }
-  member {
-    name: "FORCE_GPU_COMPATIBLE_FIELD_NUMBER"
-    mtype: "<type \'int\'>"
-  }
   member {
     name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
     mtype: "<type \'int\'>"
-- 
GitLab


From a16db8302a2436d915dcb551d0a7b537025e2f35 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Thu, 13 Apr 2017 09:30:19 -0800
Subject: [PATCH 0372/1563] C API: fix misnamed function in c_api.h

TF_ImportGraphDefOptionsRemapControlDependency() was accidentally
called TF_GraphImportGraphDefOptionsRemapControlDependency() in the
header file. This change is technically a breaking change to the public
API, but given that the public function was never defined it seems ok
to change it to the intended name. This change also adds a test for
TF_ImportGraphDefOptionsRemapControlDependency(), which was missing
before, allowing this to happen.
Change: 153075645
---
 tensorflow/c/c_api.h       |  2 +-
 tensorflow/c/c_api_test.cc | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h
index a686f7f701..9b08f9d981 100644
--- a/tensorflow/c/c_api.h
+++ b/tensorflow/c/c_api.h
@@ -818,7 +818,7 @@ extern void TF_ImportGraphDefOptionsAddInputMapping(
 // replaced with `dst`. `src_name` refers to a node in the graph to be imported,
 // `dst` references an operation already existing in the graph being imported
 // into.
-extern void TF_GraphImportGraphDefOptionsRemapControlDependency(
+extern void TF_ImportGraphDefOptionsRemapControlDependency(
     TF_ImportGraphDefOptions* opts, const char* src_name, TF_Operation* dst);
 
 // Cause the imported graph to have a control dependency on `oper`. `oper`
diff --git a/tensorflow/c/c_api_test.cc b/tensorflow/c/c_api_test.cc
index 32143f4f2f..d846daa71b 100644
--- a/tensorflow/c/c_api_test.cc
+++ b/tensorflow/c/c_api_test.cc
@@ -821,6 +821,33 @@ TEST(CAPI, ImportGraphDef) {
   EXPECT_EQ(feed, control_inputs[0]);
   EXPECT_EQ(feed2, control_inputs[1]);
 
+  // Export to a graph def so we can import a graph with control dependencies
+  TF_DeleteBuffer(graph_def);
+  graph_def = TF_NewBuffer();
+  TF_GraphToGraphDef(graph, graph_def, s);
+  ASSERT_EQ(TF_OK, TF_GetCode(s)) << TF_Message(s);
+
+  // Import again, with remapped control dependency, into the same graph
+  TF_DeleteImportGraphDefOptions(opts);
+  opts = TF_NewImportGraphDefOptions();
+  TF_ImportGraphDefOptionsSetPrefix(opts, "imported4");
+  TF_ImportGraphDefOptionsRemapControlDependency(opts, "imported/feed", feed);
+  TF_GraphImportGraphDef(graph, graph_def, opts, s);
+  ASSERT_EQ(TF_OK, TF_GetCode(s)) << TF_Message(s);
+
+  TF_Operation* scalar4 =
+      TF_GraphOperationByName(graph, "imported4/imported3/scalar");
+  TF_Operation* feed4 =
+      TF_GraphOperationByName(graph, "imported4/imported2/feed");
+
+  // Check that imported `imported3/scalar` has remapped control dep from
+  // original graph and imported control dep
+  num_control_inputs = TF_OperationGetControlInputs(
+      scalar4, control_inputs, TF_OperationNumControlInputs(scalar4));
+  ASSERT_EQ(2, num_control_inputs);
+  EXPECT_EQ(feed, control_inputs[0]);
+  EXPECT_EQ(feed4, control_inputs[1]);
+
   TF_DeleteImportGraphDefOptions(opts);
   TF_DeleteBuffer(graph_def);
 
-- 
GitLab


From 743e08b0fbee63cf647ff5ab429e025ef7196ca1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 09:30:21 -0800
Subject: [PATCH 0373/1563] Added hpp files to cuda_headers target. Change:
 153075650

---
 third_party/gpus/cuda/BUILD.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/third_party/gpus/cuda/BUILD.tpl b/third_party/gpus/cuda/BUILD.tpl
index 474c972a4c..4b996db7a6 100644
--- a/third_party/gpus/cuda/BUILD.tpl
+++ b/third_party/gpus/cuda/BUILD.tpl
@@ -43,6 +43,7 @@ cc_library(
     name = "cuda_headers",
     hdrs = glob([
         "**/*.h",
+        "**/*.hpp",
     ]),
     includes = [
         ".",
-- 
GitLab


From d5a93567547d77ae2682b55170a3c7a28cfce6f8 Mon Sep 17 00:00:00 2001
From: drpngx <drpngx@users.noreply.github.com>
Date: Thu, 13 Apr 2017 11:13:47 -0700
Subject: [PATCH 0374/1563] Revert "NADAM Optimizer (#8405)" (#9192)

We need to put this in contrib instead.

This reverts commit 86d3891ba6612552347beaabe27edac11f5758d7.
---
 tensorflow/core/kernels/training_ops.cc       | 336 +-----------------
 tensorflow/core/kernels/training_ops.h        |  27 --
 .../core/kernels/training_ops_gpu.cu.cc       |  83 -----
 tensorflow/core/ops/training_ops.cc           | 229 ------------
 tensorflow/python/training/adam.py            | 155 --------
 tensorflow/python/training/training.py        |   4 -
 6 files changed, 1 insertion(+), 833 deletions(-)

diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index 84b151279b..c7a5ea3a9c 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -258,63 +258,6 @@ struct ApplyAdam<CPUDevice, T> : ApplyAdamNonCuda<CPUDevice, T> {};
 template <typename T>
 struct ApplyAdam<SYCLDevice, T> : ApplyAdamNonCuda<SYCLDevice, T> {};
 
-template <typename Device, typename T>
-struct ApplyRadamNonCuda {
-  void operator()(const Device& d, typename TTypes<T>::Flat var,
-                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
-                  typename TTypes<T>::ConstScalar beta1_power,
-                  typename TTypes<T>::ConstScalar beta2_power,
-                  typename TTypes<T>::ConstScalar lr,
-                  typename TTypes<T>::ConstScalar beta1,
-                  typename TTypes<T>::ConstScalar beta2,
-                  typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstScalar gamma,
-                  typename TTypes<T>::ConstFlat grad) {
-    const T alpha = lr() * Eigen::numext::sqrt(T(1) - beta2_power()) /
-                    (T(1) - beta1_power());
-    var.device(d) -= (((T(1) - gamma()) * m + gamma() * grad) * alpha)
-                     / (v.sqrt() + epsilon());
-    m.device(d) += (grad - m) * (T(1) - beta1());
-    v.device(d) += (grad.square() - v) * (T(1) - beta2());
-
-  }
-};
-
-template <typename T>
-struct ApplyRadam<CPUDevice, T> : ApplyRadamNonCuda<CPUDevice, T> {};
-template <typename T>
-struct ApplyRadam<SYCLDevice, T> : ApplyRadamNonCuda<SYCLDevice, T> {};
-
-
-template <typename Device, typename T>
-struct ApplyNadamNonCuda {
-  void operator()(const Device& d, typename TTypes<T>::Flat var,
-                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
-                  typename TTypes<T>::ConstScalar beta1_power,
-                  typename TTypes<T>::ConstScalar beta2_power,
-                  typename TTypes<T>::ConstScalar lr,
-                  typename TTypes<T>::ConstScalar beta1,
-                  typename TTypes<T>::ConstScalar beta2,
-                  typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad) {
-    const T alpha1 = Eigen::numext::sqrt(T(1) - beta2_power()) /
-                     (T(1) - beta1_power());
-    const T alpha2 = Eigen::numext::sqrt(T(1) - beta2_power()*beta2()) /
-                     (T(1) - beta1_power()*beta1());
-    const T nes = alpha2 / alpha1;
-    var.device(d) -= (m * lr() * alpha1) / (v.sqrt() + epsilon());
-    m.device(d) += (grad - m * nes) * (T(1) - beta1());
-    v.device(d) += (grad.square() - v) * (T(1) - beta2());
-  }
-};
-
-template <typename T>
-struct ApplyNadam<CPUDevice, T> : ApplyNadamNonCuda<CPUDevice, T> {};
-template <typename T>
-struct ApplyNadam<SYCLDevice, T> : ApplyNadamNonCuda<SYCLDevice, T> {};
-
-
-
 template <typename T>
 struct ApplyRMSProp<CPUDevice, T> {
   void operator()(const CPUDevice& d, typename TTypes<T>::Flat var,
@@ -2438,9 +2381,9 @@ TF_CALL_double(REGISTER_CPU_KERNELS);
 
 #ifdef TENSORFLOW_USE_SYCL
 #define REGISTER_SYCL_KERNELS(T) REGISTER_KERNELS(SYCL, T);
+
 TF_CALL_float(REGISTER_SYCL_KERNELS);
 TF_CALL_double(REGISTER_SYCL_KERNELS);
-#undef REGISTER_SYCL_KERNELS
 #endif
 
 #if GOOGLE_CUDA
@@ -2998,281 +2941,4 @@ REGISTER_KERNELS(double, int64);
 
 #undef REGISTER_KERNELS
 
-template <typename Device, typename T>
-class ApplyRadamOp : public OpKernel {
- public:
-  explicit ApplyRadamOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
-    OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
-  }
-
-  void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
-
-    Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
-    Tensor m;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &m));
-    Tensor v;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &v));
-    OP_REQUIRES(
-        ctx, var.IsInitialized(),
-        errors::FailedPrecondition(
-            "Attempting to use uninitialized variables: ", def().input(0)));
-    OP_REQUIRES(
-        ctx, m.IsInitialized(),
-        errors::FailedPrecondition(
-            "Attempting to use uninitialized variables: ", def().input(1)));
-    OP_REQUIRES(
-        ctx, v.IsInitialized(),
-        errors::FailedPrecondition(
-            "Attempting to use uninitialized variables: ", def().input(2)));
-
-    const Tensor& beta1_power = ctx->input(3);
-    const Tensor& beta2_power = ctx->input(4);
-    const Tensor& lr = ctx->input(5);
-    const Tensor& beta1 = ctx->input(6);
-    const Tensor& beta2 = ctx->input(7);
-    const Tensor& epsilon = ctx->input(8);
-    const Tensor& gamma = ctx->input(9);
-
-
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1_power.shape()),
-                errors::InvalidArgument("beta1_power is not a scalar: ",
-                                        beta1_power.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2_power.shape()),
-                errors::InvalidArgument("beta2_power is not a scalar: ",
-                                        beta2_power.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(lr.shape()),
-                errors::InvalidArgument("lr is not a scalar : ",
-                                        lr.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1.shape()),
-                errors::InvalidArgument("beta1 is not a scalar: ",
-                                        beta1.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2.shape()),
-                errors::InvalidArgument("beta2 is not a scalar: ",
-                                        beta2.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(epsilon.shape()),
-                errors::InvalidArgument("epsilon is not a scalar: ",
-                                        epsilon.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(gamma.shape()),
-                errors::InvalidArgument("gamma is not a scalar: ",
-                                        gamma.shape().DebugString()));
-    
-    const Tensor& grad = ctx->input(10);
-    OP_REQUIRES(ctx, var.shape().IsSameSize(m.shape()),
-                errors::InvalidArgument("var and m do not have the same shape",
-                                        var.shape().DebugString(), " ",
-                                        m.shape().DebugString()));
-    OP_REQUIRES(ctx, var.shape().IsSameSize(v.shape()),
-                errors::InvalidArgument("var and v do not have the same shape",
-                                        var.shape().DebugString(), " ",
-                                        v.shape().DebugString()));
-    OP_REQUIRES(
-        ctx, var.shape().IsSameSize(grad.shape()),
-        errors::InvalidArgument("var and grad do not have the same shape",
-                                var.shape().DebugString(), " ",
-                                grad.shape().DebugString()));
-
-    const Device& device = ctx->template eigen_device<Device>();
-    functor::ApplyRadam<Device, T>()(device, var.flat<T>(), m.flat<T>(),
-                                    v.flat<T>(), beta1_power.scalar<T>(),
-                                    beta2_power.scalar<T>(), lr.scalar<T>(),
-                                    beta1.scalar<T>(), beta2.scalar<T>(),
-                                    epsilon.scalar<T>(), gamma.scalar<T>(),
-                                    grad.flat<T>());
-
-    MaybeForwardRefInputToRefOutput(ctx, 0, 0);
-  }
-
- private:
-  bool use_exclusive_lock_;
-};
-
-using CPUDevice = Eigen::ThreadPoolDevice;
-using GPUDevice = Eigen::GpuDevice;
-
-#define REGISTER_KERNELS(D, T)                                              \
-  REGISTER_KERNEL_BUILDER(                                                  \
-      Name("ApplyRadam").Device(DEVICE_##D).TypeConstraint<T>("T"),         \
-      ApplyRadamOp<D##Device, T>);                                          \
-  REGISTER_KERNEL_BUILDER(                                                  \
-      Name("ResourceApplyRadam").Device(DEVICE_##D).TypeConstraint<T>("T"), \
-      ApplyRadamOp<D##Device, T>);
-#define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T);
-
-TF_CALL_half(REGISTER_CPU_KERNELS);
-TF_CALL_float(REGISTER_CPU_KERNELS);
-TF_CALL_double(REGISTER_CPU_KERNELS);
-
-#ifdef TENSORFLOW_USE_SYCL
-#define REGISTER_SYCL_KERNELS(T) REGISTER_KERNELS(SYCL, T);
-TF_CALL_float(REGISTER_SYCL_KERNELS);
-#undef REGISTER_SYCL_KERNELS
-#endif
-
-#if GOOGLE_CUDA
-// Forward declarations of the functor specializations for GPU.
-namespace functor {
-#define DECLARE_GPU_SPEC(T)                                   \
-  template <>                                                 \
-  void ApplyRadam<GPUDevice, T>::operator()(                  \
-      const GPUDevice& d, typename TTypes<T>::Flat var,       \
-      typename TTypes<T>::Flat m, typename TTypes<T>::Flat v, \
-      typename TTypes<T>::ConstScalar beta1_power,            \
-      typename TTypes<T>::ConstScalar beta2_power,            \
-      typename TTypes<T>::ConstScalar lr,                     \
-      typename TTypes<T>::ConstScalar beta1,                  \
-      typename TTypes<T>::ConstScalar beta2,                  \
-      typename TTypes<T>::ConstScalar epsilon,                \
-      typename TTypes<T>::ConstScalar gamma,                  \
-      typename TTypes<T>::ConstFlat grad);                    \
-  extern template struct ApplyRadam<GPUDevice, T>;
-DECLARE_GPU_SPEC(Eigen::half);
-DECLARE_GPU_SPEC(float);
-DECLARE_GPU_SPEC(double);
-#undef DECLARE_GPU_SPEC
-}  // namespace functor
-
-REGISTER_KERNELS(GPU, Eigen::half);
-REGISTER_KERNELS(GPU, float);
-REGISTER_KERNELS(GPU, double);
-#endif
-#undef REGISTER_CPU_KERNELS
-#undef REGISTER_KERNELS
-
-template <typename Device, typename T>
-class ApplyNadamOp : public OpKernel {
- public:
-  explicit ApplyNadamOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
-    OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
-  }
-
-  void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
-
-    Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
-    Tensor m;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &m));
-    Tensor v;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &v));
-    OP_REQUIRES(
-        ctx, var.IsInitialized(),
-        errors::FailedPrecondition(
-            "Attempting to use uninitialized variables: ", def().input(0)));
-    OP_REQUIRES(
-        ctx, m.IsInitialized(),
-        errors::FailedPrecondition(
-            "Attempting to use uninitialized variables: ", def().input(1)));
-    OP_REQUIRES(
-        ctx, v.IsInitialized(),
-        errors::FailedPrecondition(
-            "Attempting to use uninitialized variables: ", def().input(2)));
-
-    const Tensor& beta1_power = ctx->input(3);
-    const Tensor& beta2_power = ctx->input(4);
-    const Tensor& lr = ctx->input(5);
-    const Tensor& beta1 = ctx->input(6);
-    const Tensor& beta2 = ctx->input(7);
-    const Tensor& epsilon = ctx->input(8);
-
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1_power.shape()),
-                errors::InvalidArgument("beta1_power is not a scalar: ",
-                                        beta1_power.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2_power.shape()),
-                errors::InvalidArgument("beta2_power is not a scalar: ",
-                                        beta2_power.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(lr.shape()),
-                errors::InvalidArgument("lr is not a scalar : ",
-                                        lr.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1.shape()),
-                errors::InvalidArgument("beta1 is not a scalar: ",
-                                        beta1.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2.shape()),
-                errors::InvalidArgument("beta2 is not a scalar: ",
-                                        beta2.shape().DebugString()));
-    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(epsilon.shape()),
-                errors::InvalidArgument("epsilon is not a scalar: ",
-                                        epsilon.shape().DebugString()));
-
-    const Tensor& grad = ctx->input(9);
-    OP_REQUIRES(ctx, var.shape().IsSameSize(m.shape()),
-                errors::InvalidArgument("var and m do not have the same shape",
-                                        var.shape().DebugString(), " ",
-                                        m.shape().DebugString()));
-    OP_REQUIRES(ctx, var.shape().IsSameSize(v.shape()),
-                errors::InvalidArgument("var and v do not have the same shape",
-                                        var.shape().DebugString(), " ",
-                                        v.shape().DebugString()));
-    OP_REQUIRES(
-        ctx, var.shape().IsSameSize(grad.shape()),
-        errors::InvalidArgument("var and grad do not have the same shape",
-                                var.shape().DebugString(), " ",
-                                grad.shape().DebugString()));
-
-    const Device& device = ctx->template eigen_device<Device>();
-    functor::ApplyNadam<Device, T>()(device, var.flat<T>(), m.flat<T>(),
-                                    v.flat<T>(), beta1_power.scalar<T>(),
-                                    beta2_power.scalar<T>(), lr.scalar<T>(),
-                                    beta1.scalar<T>(), beta2.scalar<T>(),
-                                    epsilon.scalar<T>(), grad.flat<T>());
-
-    MaybeForwardRefInputToRefOutput(ctx, 0, 0);
-  }
-
- private:
-  bool use_exclusive_lock_;
-};
-
-using CPUDevice = Eigen::ThreadPoolDevice;
-using GPUDevice = Eigen::GpuDevice;
-
-#define REGISTER_KERNELS(D, T)                                             \
-  REGISTER_KERNEL_BUILDER(                                                 \
-      Name("ApplyNadam").Device(DEVICE_##D).TypeConstraint<T>("T"),         \
-      ApplyNadamOp<D##Device, T>);                                          \
-  REGISTER_KERNEL_BUILDER(                                                 \
-      Name("ResourceApplyNadam").Device(DEVICE_##D).TypeConstraint<T>("T"), \
-      ApplyNadamOp<D##Device, T>);
-#define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T);
-
-TF_CALL_half(REGISTER_CPU_KERNELS);
-TF_CALL_float(REGISTER_CPU_KERNELS);
-TF_CALL_double(REGISTER_CPU_KERNELS);
-
-#ifdef TENSORFLOW_USE_SYCL
-#define REGISTER_SYCL_KERNELS(T) REGISTER_KERNELS(SYCL, T);
-TF_CALL_float(REGISTER_SYCL_KERNELS);
-#undef REGISTER_SYCL_KERNELS
-#endif
-
-#if GOOGLE_CUDA
-// Forward declarations of the functor specializations for GPU.
-namespace functor {
-#define DECLARE_GPU_SPEC(T)                                   \
-  template <>                                                 \
-  void ApplyNadam<GPUDevice, T>::operator()(                  \
-      const GPUDevice& d, typename TTypes<T>::Flat var,       \
-      typename TTypes<T>::Flat m, typename TTypes<T>::Flat v, \
-      typename TTypes<T>::ConstScalar beta1_power,            \
-      typename TTypes<T>::ConstScalar beta2_power,            \
-      typename TTypes<T>::ConstScalar lr,                     \
-      typename TTypes<T>::ConstScalar beta1,                  \
-      typename TTypes<T>::ConstScalar beta2,                  \
-      typename TTypes<T>::ConstScalar epsilon,                \
-      typename TTypes<T>::ConstFlat grad);                    \
-  extern template struct ApplyNadam<GPUDevice, T>;
-DECLARE_GPU_SPEC(Eigen::half);
-DECLARE_GPU_SPEC(float);
-DECLARE_GPU_SPEC(double);
-#undef DECLARE_GPU_SPEC
-}  // namespace functor
-
-REGISTER_KERNELS(GPU, Eigen::half);
-REGISTER_KERNELS(GPU, float);
-REGISTER_KERNELS(GPU, double);
-#endif
-#undef REGISTER_CPU_KERNELS
-#undef REGISTER_KERNELS
-
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index 6f89fde4e6..6b599656ce 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -126,33 +126,6 @@ struct ApplyAdam {
                   typename TTypes<T>::ConstFlat grad);
 };
 
-template <typename Device, typename T>
-struct ApplyRadam {
-  void operator()(const Device& d, typename TTypes<T>::Flat var,
-                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
-                  typename TTypes<T>::ConstScalar beta1_power,
-                  typename TTypes<T>::ConstScalar beta2_power,
-                  typename TTypes<T>::ConstScalar lr,
-                  typename TTypes<T>::ConstScalar beta1,
-                  typename TTypes<T>::ConstScalar beta2,
-                  typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstScalar gamma,
-                  typename TTypes<T>::ConstFlat grad);
-};
-
-template <typename Device, typename T>
-struct ApplyNadam {
-  void operator()(const Device& d, typename TTypes<T>::Flat var,
-                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
-                  typename TTypes<T>::ConstScalar beta1_power,
-                  typename TTypes<T>::ConstScalar beta2_power,
-                  typename TTypes<T>::ConstScalar lr,
-                  typename TTypes<T>::ConstScalar beta1,
-                  typename TTypes<T>::ConstScalar beta2,
-                  typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad);
-};
-
 template <typename Device, typename T>
 struct ApplyRMSProp {
   void operator()(const Device& d, typename TTypes<T>::Flat var,
diff --git a/tensorflow/core/kernels/training_ops_gpu.cu.cc b/tensorflow/core/kernels/training_ops_gpu.cu.cc
index 614a7e15de..f6acdf2422 100644
--- a/tensorflow/core/kernels/training_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/training_ops_gpu.cu.cc
@@ -130,81 +130,6 @@ struct ApplyAdam<GPUDevice, T> {
   }
 };
 
-
-
-
-template <typename T>
-struct ApplyRadam<GPUDevice, T> {
-  void operator()(const GPUDevice& d, typename TTypes<T>::Flat var,
-                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
-                  typename TTypes<T>::ConstScalar beta1_power,
-                  typename TTypes<T>::ConstScalar beta2_power,
-                  typename TTypes<T>::ConstScalar lr,
-                  typename TTypes<T>::ConstScalar beta1,
-                  typename TTypes<T>::ConstScalar beta2,
-                  typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstScalar gamma,
-                  typename TTypes<T>::ConstFlat grad) {
-    Eigen::array<typename TTypes<T>::Tensor::Index, 1> bcast;
-    bcast[0] = grad.dimension(0);
-    Eigen::Sizes<1> single;
-    const auto one = static_cast<T>(1.0);
-    m.device(d) =
-        m +
-        (beta1.constant(one) - beta1).reshape(single).broadcast(bcast) *
-            (grad - m);
-    v.device(d) =
-        v +
-        (beta2.constant(one) - beta2).reshape(single).broadcast(bcast) *
-            (grad.square() - v);
-    var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
-                      (beta1_power.constant(one) - beta1_power))
-                         .reshape(single)
-                         .broadcast(bcast) *
-                     ((gamma.constant(one) - gamma).reshape(single).broadcast(bcast) * m +
-                     (gamma).reshape(single).broadcast(bcast) * grad) /
-                     (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
-
-  }
-};
-
-
-template <typename T>
-struct ApplyNadam<GPUDevice, T> {
-  void operator()(const GPUDevice& d, typename TTypes<T>::Flat var,
-                  typename TTypes<T>::Flat m, typename TTypes<T>::Flat v,
-                  typename TTypes<T>::ConstScalar beta1_power,
-                  typename TTypes<T>::ConstScalar beta2_power,
-                  typename TTypes<T>::ConstScalar lr,
-                  typename TTypes<T>::ConstScalar beta1,
-                  typename TTypes<T>::ConstScalar beta2,
-                  typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad) {
-    Eigen::array<typename TTypes<T>::Tensor::Index, 1> bcast;
-    bcast[0] = grad.dimension(0);
-    Eigen::Sizes<1> single;
-    const auto one = static_cast<T>(1.0);
-    m.device(d) =
-        m +
-        (beta1.constant(one) - beta1).reshape(single).broadcast(bcast) *
-            (grad - m * ((beta2_power.constant(one) - beta2_power*beta2).sqrt()
-             / (beta1_power.constant(one) - beta1_power*beta1)) /
-              ((beta2_power.constant(one) - beta2_power).sqrt() /
-               (beta1_power.constant(one) - beta1_power)));
-    v.device(d) =
-        v +
-        (beta2.constant(one) - beta2).reshape(single).broadcast(bcast) *
-            (grad.square() - v);
-    var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
-                      (beta1_power.constant(one) - beta1_power))
-                         .reshape(single)
-                         .broadcast(bcast) *
-                     m / (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
-  }
-};
-
-
-
 template <typename T>
 struct ApplyRMSProp<GPUDevice, T> {
   void operator()(const GPUDevice& d, typename TTypes<T>::Flat var,
@@ -276,14 +201,6 @@ template struct functor::ApplyAdam<GPUDevice, Eigen::half>;
 template struct functor::ApplyAdam<GPUDevice, float>;
 template struct functor::ApplyAdam<GPUDevice, double>;
 
-template struct functor::ApplyRadam<GPUDevice, Eigen::half>;
-template struct functor::ApplyRadam<GPUDevice, float>;
-template struct functor::ApplyRadam<GPUDevice, double>;
-
-template struct functor::ApplyNadam<GPUDevice, Eigen::half>;
-template struct functor::ApplyNadam<GPUDevice, float>;
-template struct functor::ApplyNadam<GPUDevice, double>;
-
 template struct functor::ApplyRMSProp<GPUDevice, Eigen::half>;
 template struct functor::ApplyRMSProp<GPUDevice, float>;
 template struct functor::ApplyRMSProp<GPUDevice, double>;
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 5fa80b2349..2027bf4603 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -1619,233 +1619,4 @@ use_locking: If `True`, updating of the var, mg, ms, and mom tensors is
   contention.
 )doc");
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-static Status ApplyRadamShapeFn(InferenceContext* c, bool sparse) {
-  ShapeHandle unused;
-  ShapeHandle s = ShapeOrHandleShape(c, 0);                       // var
-  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 1), &s));  // m
-  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 2), &s));  // v
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(3), 0, &unused));  // beta1_power
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(4), 0, &unused));  // beta2_power
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(5), 0, &unused));  // lr
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(6), 0, &unused));  // beta1
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(7), 0, &unused));  // beta2
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(8), 0, &unused));  // epsilon
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(9), 0, &unused));  // gamma
-  TF_RETURN_IF_ERROR(
-      HandleGradAndIndicesInputs(c, sparse, 10 /* grad_idx */, &s));
-  if (c->num_outputs() > 0) {
-    c->set_output(0, s);
-  }
-  return Status::OK();
-}
-
-REGISTER_OP("ApplyRadam")
-    .Input("var: Ref(T)")
-    .Input("m: Ref(T)")
-    .Input("v: Ref(T)")
-    .Input("beta1_power: T")
-    .Input("beta2_power: T")
-    .Input("lr: T")
-    .Input("beta1: T")
-    .Input("beta2: T")
-    .Input("epsilon: T")
-    .Input("gamma: T")
-    .Input("grad: T")
-    .Output("out: Ref(T)")
-    .Attr("T: numbertype")
-    .Attr("use_locking: bool = false")
-    .SetShapeFn([](InferenceContext* c) {
-      return ApplyRadamShapeFn(c, false /* sparse */);
-    })
-    .Doc(R"doc(
-Update '*var' according to the Adam algorithm.
-
-lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
-m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
-v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
-variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
-
-var: Should be from a Variable().
-m: Should be from a Variable().
-v: Should be from a Variable().
-beta1_power: Must be a scalar.
-beta2_power: Must be a scalar.
-lr: Scaling factor. Must be a scalar.
-beta1: Momentum factor. Must be a scalar.
-beta2: Momentum factor. Must be a scalar.
-epsilon: Ridge term. Must be a scalar.
-grad: The gradient.
-out: Same as "var".
-use_locking: If `True`, updating of the var, m, and v tensors will be protected
-  by a lock; otherwise the behavior is undefined, but may exhibit less
-  contention.
-)doc");
-
-REGISTER_OP("ResourceApplyRadam")
-    .Input("var: resource")
-    .Input("m: resource")
-    .Input("v: resource")
-    .Input("beta1_power: T")
-    .Input("beta2_power: T")
-    .Input("lr: T")
-    .Input("beta1: T")
-    .Input("beta2: T")
-    .Input("epsilon: T")
-    .Input("gamma: T")
-    .Input("grad: T")
-    .Attr("T: numbertype")
-    .Attr("use_locking: bool = false")
-    .SetShapeFn([](InferenceContext* c) {
-      return ApplyRadamShapeFn(c, false /* sparse */);
-    })
-    .Doc(R"doc(
-Update '*var' according to the Radam algorithm.
-
-lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
-m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
-v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
-variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
-
-var: Should be from a Variable().
-m: Should be from a Variable().
-v: Should be from a Variable().
-beta1_power: Must be a scalar.
-beta2_power: Must be a scalar.
-lr: Scaling factor. Must be a scalar.
-beta1: Momentum factor. Must be a scalar.
-beta2: Momentum factor. Must be a scalar.
-epsilon: Ridge term. Must be a scalar.
-grad: The gradient.
-use_locking: If `True`, updating of the var, m, and v tensors will be protected
-  by a lock; otherwise the behavior is undefined, but may exhibit less
-  contention.
-)doc");
-
-
-
-
-
-
-
-
-
-
-static Status ApplyNadamShapeFn(InferenceContext* c, bool sparse) {
-  ShapeHandle unused;
-  ShapeHandle s = ShapeOrHandleShape(c, 0);                       // var
-  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 1), &s));  // m
-  TF_RETURN_IF_ERROR(c->Merge(s, ShapeOrHandleShape(c, 2), &s));  // v
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(3), 0, &unused));  // beta1_power
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(4), 0, &unused));  // beta2_power
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(5), 0, &unused));  // lr
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(6), 0, &unused));  // beta1
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(7), 0, &unused));  // beta2
-  TF_RETURN_IF_ERROR(c->WithRank(c->input(8), 0, &unused));  // epsilon
-  TF_RETURN_IF_ERROR(
-      HandleGradAndIndicesInputs(c, sparse, 9 /* grad_idx */, &s));
-  if (c->num_outputs() > 0) {
-    c->set_output(0, s);
-  }
-  return Status::OK();
-}
-
-REGISTER_OP("ApplyNadam")
-    .Input("var: Ref(T)")
-    .Input("m: Ref(T)")
-    .Input("v: Ref(T)")
-    .Input("beta1_power: T")
-    .Input("beta2_power: T")
-    .Input("lr: T")
-    .Input("beta1: T")
-    .Input("beta2: T")
-    .Input("epsilon: T")
-    .Input("grad: T")
-    .Output("out: Ref(T)")
-    .Attr("T: numbertype")
-    .Attr("use_locking: bool = false")
-    .SetShapeFn([](InferenceContext* c) {
-      return ApplyNadamShapeFn(c, false /* sparse */);
-    })
-    .Doc(R"doc(
-Update '*var' according to the Adam algorithm.
-
-lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
-m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
-v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
-variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
-
-var: Should be from a Variable().
-m: Should be from a Variable().
-v: Should be from a Variable().
-beta1_power: Must be a scalar.
-beta2_power: Must be a scalar.
-lr: Scaling factor. Must be a scalar.
-beta1: Momentum factor. Must be a scalar.
-beta2: Momentum factor. Must be a scalar.
-epsilon: Ridge term. Must be a scalar.
-grad: The gradient.
-out: Same as "var".
-use_locking: If `True`, updating of the var, m, and v tensors will be protected
-  by a lock; otherwise the behavior is undefined, but may exhibit less
-  contention.
-)doc");
-
-REGISTER_OP("ResourceApplyNadam")
-    .Input("var: resource")
-    .Input("m: resource")
-    .Input("v: resource")
-    .Input("beta1_power: T")
-    .Input("beta2_power: T")
-    .Input("lr: T")
-    .Input("beta1: T")
-    .Input("beta2: T")
-    .Input("epsilon: T")
-    .Input("grad: T")
-    .Attr("T: numbertype")
-    .Attr("use_locking: bool = false")
-    .SetShapeFn([](InferenceContext* c) {
-      return ApplyNadamShapeFn(c, false /* sparse */);
-    })
-    .Doc(R"doc(
-Update '*var' according to the Adam algorithm.
-
-lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
-m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
-v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
-variable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)
-
-var: Should be from a Variable().
-m: Should be from a Variable().
-v: Should be from a Variable().
-beta1_power: Must be a scalar.
-beta2_power: Must be a scalar.
-lr: Scaling factor. Must be a scalar.
-beta1: Momentum factor. Must be a scalar.
-beta2: Momentum factor. Must be a scalar.
-epsilon: Ridge term. Must be a scalar.
-grad: The gradient.
-use_locking: If `True`, updating of the var, m, and v tensors will be protected
-  by a lock; otherwise the behavior is undefined, but may exhibit less
-  contention.
-)doc");
-
-
-
-
-
 }  // namespace tensorflow
diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index ea145b659a..e611b0c0ec 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -210,158 +210,3 @@ class AdamOptimizer(optimizer.Optimizer):
             use_locking=self._use_locking)
     return control_flow_ops.group(*update_ops + [update_beta1, update_beta2],
                                   name=name_scope)
-
-
-
-
-class NadamOptimizer(AdamOptimizer):
-
-  """Nadam and Radam optimizer extensions both feather Nesterov momentum
-  (or a Nesterov-like interpolation factor) into Adam calculations.
-
-  Both algorithms tend to be more stable than Adam with negligiable added 
-  calculation (even though Nadam looks extravagent).
-
-  Nadam's added Nesterov momentum term typically provides a 1-2% shift in momentum
-  during the initial optimization steps. This is when optimizers are most prone 
-  to develop instablity though so this can be quite important. This momentum 
-  correction term is both theoretically known to reduce regret bounds as well as
-  improve performance and stability in practice.
-
-  [Dozat 2015]  "Incorporating Nesterov momentum into Adam",
-  Stanford University, CS 229 Machine Learning, Tech. Rep.,
-  2015. http://cs229.stanford.edu/proj2015/054_report.pdf
-
-  Adapted from https://github.com/tdozat/Optimization/blob/master/tensorflow/
-
-  """
-  def __init__(self, learning_rate=0.0002, beta1=0.825, beta2=0.99685, epsilon=1e-8,
-               use_locking=False, name="Nadam"):
-
-    super(NadamOptimizer, self).__init__(use_locking, name)
-    self._lr = learning_rate
-    self._beta1 = beta1
-    self._beta2 = beta2
-    self._epsilon = epsilon
-
-    # Tensor versions of the constructor arguments, created in _prepare().
-    self._lr_t = None
-    self._beta1_t = None
-    self._beta2_t = None
-    self._epsilon_t = None
-
-    # Variables to accumulate the powers of the beta parameters.
-    # Created in _create_slots when we know the variables to optimize.
-    self._beta1_power = None
-    self._beta2_power = None
-
-    # Created in SparseApply if needed.
-    self._updated_lr = None
-
-
-  def _apply_dense(self, grad, var):
-    m = self.get_slot(var, "m")
-    v = self.get_slot(var, "v")
-    return training_ops.apply_nadam(
-        var, m, v,
-        math_ops.cast(self._beta1_power, var.dtype.base_dtype),
-        math_ops.cast(self._beta2_power, var.dtype.base_dtype),
-        math_ops.cast(self._lr_t, var.dtype.base_dtype),
-        math_ops.cast(self._beta1_t, var.dtype.base_dtype),
-        math_ops.cast(self._beta2_t, var.dtype.base_dtype),
-        math_ops.cast(self._epsilon_t, var.dtype.base_dtype),
-        grad, use_locking=self._use_locking).op
-
-  def _resource_apply_dense(self, grad, var):
-    m = self.get_slot(var, "m")
-    v = self.get_slot(var, "v")
-    return training_ops.resource_apply_nadam(
-        var, m.handle, v.handle,
-        math_ops.cast(self._beta1_power, grad.dtype.base_dtype),
-        math_ops.cast(self._beta2_power, grad.dtype.base_dtype),
-        math_ops.cast(self._lr_t, grad.dtype.base_dtype),
-        math_ops.cast(self._beta1_t, grad.dtype.base_dtype),
-        math_ops.cast(self._beta2_t, grad.dtype.base_dtype),
-        math_ops.cast(self._epsilon_t, grad.dtype.base_dtype),
-        grad, use_locking=self._use_locking)
-
-  def _apply_sparse(self, grad, var):
-    beta1_power = math_ops.cast(self._beta1_power, var.dtype.base_dtype)
-    beta2_power = math_ops.cast(self._beta2_power, var.dtype.base_dtype)
-    lr_t = math_ops.cast(self._lr_t, var.dtype.base_dtype)
-    beta1_t = math_ops.cast(self._beta1_t, var.dtype.base_dtype)
-    beta2_t = math_ops.cast(self._beta2_t, var.dtype.base_dtype)
-    epsilon_t = math_ops.cast(self._epsilon_t, var.dtype.base_dtype)
-    tp = math_ops.sqrt(1 - beta2_power) / (1 - beta1_power)
-    tp1 = math_ops.sqrt(1 - beta2_power*beta2_t) / (1 - beta1_power*beta1_t)
-
-    # m_t = beta1 * m + (1 - beta1) * g_t
-    m = self.get_slot(var, "m")
-    m_t = state_ops.scatter_update(m, grad.indices,
-                                   beta1_t * array_ops.gather(m, grad.indices) +
-                                   (tp1 / tp) * (1 - beta1_t) * grad.values,
-                                   use_locking=self._use_locking)
-
-    # v_t = beta2 * v + (1 - beta2) * (g_t * g_t)
-    v = self.get_slot(var, "v")
-    v_t = state_ops.scatter_update(v, grad.indices,
-                                   beta2_t * array_ops.gather(v, grad.indices) +
-                                   (1 - beta2_t) * math_ops.square(grad.values),
-                                   use_locking=self._use_locking)
-
-    # variable -= learning_rate * m_t / (epsilon_t + sqrt(v_t))
-    m_t_slice = array_ops.gather(m_t, grad.indices)
-    v_t_slice = array_ops.gather(v_t, grad.indices)
-    denominator_slice = math_ops.sqrt(v_t_slice) + epsilon_t
-    var_update = state_ops.scatter_sub(var, grad.indices,
-                                       lr_t * tp * m_t_slice / denominator_slice,
-                                       use_locking=self._use_locking)
-    return control_flow_ops.group(var_update, m_t, v_t)
-
-
-
-
-class RadamOptimizer(AdamOptimizer):
-
-  """
-  Radam is a proposed mathematical simplification of the more theoretically sound
-  but complex Nadam algorithm. This proposal comes from additional, more informal
-  work by Dozat (to extend his results on Nadam):
-
-  Details of Radam extension - https://github.com/tdozat/Optimization
-
-  [Dozat 2015]  "Incorporating Nesterov momentum into Adam",
-  Stanford University, CS 229 Machine Learning, Tech. Rep.,
-  2015. http://cs229.stanford.edu/proj2015/054_report.pdf
-
-  Interestingly, Radam turns out to be isomorphic to an Adam optimizer initialized
-  with lower beta1 and a slightly higher learning rate.
-
-  However, Radam's gamma hyperparameter is a more straightforward way for those
-  who have a good learning rate for an Adam optimizer to incorporate a Nesterov-like
-  momentum adjustment, than attempting to tune beta1 (or beta1+lr) by hand.
-
-  """
-
-  def __init__(self, learning_rate=0.001, beta1=0.9, beta2=0.999, epsilon=1e-8,
-               gamma=0.05, use_locking=False, name="Radam"):
-
-    super(RadamOptimizer, self).__init__(use_locking, name)
-    self._beta1 = beta1 - gamma
-    self._lr = learning_rate * (self._beta1 / beta1)
-    self._beta2 = beta2
-    self._epsilon = epsilon
-
-    # Tensor versions of the constructor arguments, created in _prepare().
-    self._lr_t = None
-    self._beta1_t = None
-    self._beta2_t = None
-    self._epsilon_t = None
-
-    # Variables to accumulate the powers of the beta parameters.
-    # Created in _create_slots when we know the variables to optimize.
-    self._beta1_power = None
-    self._beta2_power = None
-
-    # Created in SparseApply if needed.
-    self._updated_lr = None
diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index 67b5d9d712..f2bcc56175 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -24,8 +24,6 @@ See the @{$python/train} guide.
 @@AdagradDAOptimizer
 @@MomentumOptimizer
 @@AdamOptimizer
-@@NadamOptimizer
-@@RadamOptimizer
 @@FtrlOptimizer
 @@ProximalGradientDescentOptimizer
 @@ProximalAdagradOptimizer
@@ -106,8 +104,6 @@ from tensorflow.python.training.adagrad import AdagradOptimizer
 from tensorflow.python.training.adagrad_da import AdagradDAOptimizer
 from tensorflow.python.training.proximal_adagrad import ProximalAdagradOptimizer
 from tensorflow.python.training.adam import AdamOptimizer
-from tensorflow.python.training.adam import NadamOptimizer
-from tensorflow.python.training.adam import RadamOptimizer
 from tensorflow.python.training.ftrl import FtrlOptimizer
 from tensorflow.python.training.momentum import MomentumOptimizer
 from tensorflow.python.training.moving_averages import ExponentialMovingAverage
-- 
GitLab


From a5f08e69a081d3b07b05e9f02f1b48950b89faac Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 11:22:24 -0800
Subject: [PATCH 0375/1563] Implement the quantile function for the Normal
 distribution, which is the inverse of the CDF, equivalent to
 scipy.stats.norm.ppf() (aka "percent point function"). The implementation is
 a direct port from the implementation found in the cephes library
 (https://github.com/poliastro/cephes/blob/master/src/ndtri.c) which is the
 underlying implementation used by scipy. Change: 153090458

---
 .../python/kernel_tests/normal_test.py        |  46 ++++++
 .../python/kernel_tests/special_math_test.py  |  42 ++++++
 .../distributions/python/ops/distribution.py  |  30 ++++
 .../distributions/python/ops/normal.py        |   8 ++
 .../distributions/python/ops/special_math.py  | 132 ++++++++++++++++++
 5 files changed, 258 insertions(+)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/normal_test.py b/tensorflow/contrib/distributions/python/kernel_tests/normal_test.py
index 9b70efaa37..bda06df0f7 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/normal_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/normal_test.py
@@ -22,6 +22,7 @@ import math
 
 import numpy as np
 from scipy import stats
+
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.contrib.distributions.python.ops import normal as normal_lib
 from tensorflow.python.framework import constant_op
@@ -276,6 +277,51 @@ class NormalTest(test.TestCase):
       self.assertAllEqual((3,), normal.mode().get_shape())
       self.assertAllEqual([7., 7, 7], normal.mode().eval())
 
+  def testNormalQuantile(self):
+    with self.test_session():
+      batch_size = 52
+      mu = self._rng.randn(batch_size)
+      sigma = self._rng.rand(batch_size) + 1.0
+      p = np.linspace(0., 1.0, batch_size - 2).astype(np.float64)
+      # Quantile performs piecewise rational approximation so adding some
+      # special input values to make sure we hit all the pieces.
+      p = np.hstack((p, np.exp(-33), 1. - np.exp(-33)))
+
+      normal = normal_lib.Normal(loc=mu, scale=sigma)
+      expected_x = stats.norm(mu, sigma).ppf(p)
+      x = normal.quantile(p)
+
+      self.assertAllClose(expected_x, x.eval(), atol=0.)
+      self.assertAllEqual(normal.batch_shape_tensor().eval(), x.get_shape())
+      self.assertAllEqual(normal.batch_shape_tensor().eval(), x.eval().shape)
+      self.assertAllEqual(normal.batch_shape, x.get_shape())
+      self.assertAllEqual(normal.batch_shape, x.eval().shape)
+
+  def _baseQuantileFiniteGradientAtDifficultPoints(self, dtype):
+    g = ops.Graph()
+    with g.as_default():
+      mu = variables.Variable(dtype(0.0))
+      sigma = variables.Variable(dtype(1.0))
+      dist = normal_lib.Normal(loc=mu, scale=sigma)
+      p = variables.Variable(
+          np.array([0.,
+                    np.exp(-32.), np.exp(-2.),
+                    1. - np.exp(-2.), 1. - np.exp(-32.),
+                    1.]).astype(dtype))
+
+      value = dist.quantile(p)
+      grads = gradients_impl.gradients(value, [mu, p])
+      with self.test_session(graph=g):
+        variables.global_variables_initializer().run()
+        self.assertAllFinite(grads[0])
+        self.assertAllFinite(grads[1])
+
+  def testQuantileFiniteGradientAtDifficultPointsFloat32(self):
+    self._baseQuantileFiniteGradientAtDifficultPoints(np.float32)
+
+  def testQuantileFiniteGradientAtDifficultPointsFloat64(self):
+    self._baseQuantileFiniteGradientAtDifficultPoints(np.float64)
+
   def testNormalVariance(self):
     with self.test_session():
       # sigma will be broadcast to [7, 7, 7]
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/special_math_test.py b/tensorflow/contrib/distributions/python/kernel_tests/special_math_test.py
index 795087e6a4..6ccbeb7122 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/special_math_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/special_math_test.py
@@ -56,6 +56,48 @@ GridSpec = collections.namedtuple("GridSpec", ["min", "max", "shape"])
 ErrorSpec = collections.namedtuple("ErrorSpec", ["rtol", "atol"])
 
 
+class NdtriTest(test.TestCase):
+
+  def assertAllFinite(self, tensor):
+    is_finite = np.isfinite(tensor.eval())
+    all_true = np.ones_like(is_finite, dtype=np.bool)
+    self.assertAllEqual(all_true, is_finite)
+
+  def testNdtri(self):
+    """Verifies that ndtri computation is correct."""
+    with self.test_session():
+      p = np.linspace(0., 1.0, 50).astype(np.float64)
+      # Quantile performs piecewise rational approximation so adding some
+      # special input values to make sure we hit all the pieces.
+      p = np.hstack((p, np.exp(-32), 1. - np.exp(-32),
+                     np.exp(-2), 1. - np.exp(-2)))
+      expected_x = special.ndtri(p)
+      x = special_math.ndtri(p)
+      self.assertAllClose(expected_x, x.eval(), atol=0.)
+
+  def _baseNdtriFiniteGradientTest(self, dtype):
+    """Verifies that ndtri has finite gradients at interesting points."""
+    g = ops.Graph()
+    with g.as_default():
+      # Tests gradients at 0, 1, and piece-wise boundaries.
+      p = variables.Variable(
+          np.array([0.,
+                    np.exp(-32.), np.exp(-2.),
+                    1. - np.exp(-2.), 1. - np.exp(-32.),
+                    1.]).astype(dtype))
+    value = special_math.ndtri(p)
+    grads = gradients_impl.gradients(value, p)
+    with self.test_session(graph=g):
+      variables.global_variables_initializer().run()
+      self.assertAllFinite(grads[0])
+
+  def testNdtriFiniteGradientFloat32(self):
+    self._baseNdtriFiniteGradientTest(np.float32)
+
+  def testNdtriFiniteGradientFloat64(self):
+    self._baseNdtriFiniteGradientTest(np.float64)
+
+
 class NdtrTest(test.TestCase):
   _use_log = False
   # Grid min/max chosen to ensure 0 < cdf(x) < 1.
diff --git a/tensorflow/contrib/distributions/python/ops/distribution.py b/tensorflow/contrib/distributions/python/ops/distribution.py
index 5beb3999bc..95d6c23388 100644
--- a/tensorflow/contrib/distributions/python/ops/distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/distribution.py
@@ -870,6 +870,36 @@ class Distribution(_BaseDistribution):
     with self._name_scope(name):
       return self._mean()
 
+  def _quantile(self, value):
+    raise NotImplementedError("quantile is not implemented")
+
+  def _call_quantile(self, value, name, **kwargs):
+    with self._name_scope(name, values=[value]):
+      value = ops.convert_to_tensor(value, name="value")
+      try:
+        return self._quantile(value, **kwargs)
+      except NotImplementedError as original_exception:
+        raise original_exception
+
+  def quantile(self, value, name="quantile"):
+    """Quantile function. Aka "inverse cdf" or "percent point function".
+
+    Given random variable `X` and `p in [0, 1]`, the `quantile` is:
+
+    ```none
+    quantile(p) := x such that P[X <= x] == p
+    ```
+
+    Args:
+      value: `float` or `double` `Tensor`.
+      name: The name to give this op.
+
+    Returns:
+      quantile: a `Tensor` of shape `sample_shape(x) + self.batch_shape` with
+        values of type `self.dtype`.
+    """
+    return self._call_quantile(value, name)
+
   def _variance(self):
     raise NotImplementedError("variance is not implemented")
 
diff --git a/tensorflow/contrib/distributions/python/ops/normal.py b/tensorflow/contrib/distributions/python/ops/normal.py
index c06dd570b9..a8bc918af9 100644
--- a/tensorflow/contrib/distributions/python/ops/normal.py
+++ b/tensorflow/contrib/distributions/python/ops/normal.py
@@ -215,6 +215,9 @@ class Normal(distribution.Distribution):
   def _mean(self):
     return self.loc * array_ops.ones_like(self.scale)
 
+  def _quantile(self, p):
+    return self._inv_z(special_math.ndtri(p))
+
   def _stddev(self):
     return self.scale * array_ops.ones_like(self.loc)
 
@@ -226,6 +229,11 @@ class Normal(distribution.Distribution):
     with ops.name_scope("standardize", values=[x]):
       return (x - self.loc) / self.scale
 
+  def _inv_z(self, z):
+    """Reconstruct input `x` from a its normalized version."""
+    with ops.name_scope("reconstruct", values=[z]):
+      return z * self.scale + self.loc
+
 
 class NormalWithSoftplusScale(Normal):
   """Normal with softplus applied to `scale`."""
diff --git a/tensorflow/contrib/distributions/python/ops/special_math.py b/tensorflow/contrib/distributions/python/ops/special_math.py
index e5e5e1963e..f96eafed71 100644
--- a/tensorflow/contrib/distributions/python/ops/special_math.py
+++ b/tensorflow/contrib/distributions/python/ops/special_math.py
@@ -28,6 +28,7 @@ from tensorflow.python.ops import math_ops
 
 __all__ = [
     "ndtr",
+    "ndtri",
     "log_ndtr",
     "log_cdf_laplace",
 ]
@@ -100,6 +101,137 @@ def _ndtr(x):
   return 0.5 * y
 
 
+def ndtri(p, name="ndtri"):
+  """The inverse of the CDF of the Normal distribution function.
+
+  Returns x such that the area under the pdf from minus infinity to x is equal
+  to p.
+
+  A piece-wise rational approximation is done for the function.
+  This is a port of the implementation in netlib.
+
+  Args:
+    p: `Tensor` of type `float32`, `float64`.
+    name: Python string. A name for the operation (default="ndtri").
+
+  Returns:
+    x: `Tensor` with `dtype=p.dtype`.
+
+  Raises:
+    TypeError: if `p` is not floating-type.
+  """
+
+  with ops.name_scope(name, values=[p]):
+    p = ops.convert_to_tensor(p, name="p")
+    if p.dtype.as_numpy_dtype not in [np.float32, np.float64]:
+      raise TypeError(
+          "p.dtype=%s is not handled, see docstring for supported types."
+          % p.dtype)
+    return _ndtri(p)
+
+
+def _ndtri(p):
+  """Implements ndtri core logic."""
+
+  # Constants used in piece-wise rational approximations. Taken from the cephes
+  # library:
+  # https://github.com/scipy/scipy/blob/master/scipy/special/cephes/ndtri.c
+  p0 = list(reversed([-5.99633501014107895267E1,
+                      9.80010754185999661536E1,
+                      -5.66762857469070293439E1,
+                      1.39312609387279679503E1,
+                      -1.23916583867381258016E0]))
+  q0 = list(reversed([1.0,
+                      1.95448858338141759834E0,
+                      4.67627912898881538453E0,
+                      8.63602421390890590575E1,
+                      -2.25462687854119370527E2,
+                      2.00260212380060660359E2,
+                      -8.20372256168333339912E1,
+                      1.59056225126211695515E1,
+                      -1.18331621121330003142E0]))
+  p1 = list(reversed([4.05544892305962419923E0,
+                      3.15251094599893866154E1,
+                      5.71628192246421288162E1,
+                      4.40805073893200834700E1,
+                      1.46849561928858024014E1,
+                      2.18663306850790267539E0,
+                      -1.40256079171354495875E-1,
+                      -3.50424626827848203418E-2,
+                      -8.57456785154685413611E-4]))
+  q1 = list(reversed([1.0,
+                      1.57799883256466749731E1,
+                      4.53907635128879210584E1,
+                      4.13172038254672030440E1,
+                      1.50425385692907503408E1,
+                      2.50464946208309415979E0,
+                      -1.42182922854787788574E-1,
+                      -3.80806407691578277194E-2,
+                      -9.33259480895457427372E-4]))
+  p2 = list(reversed([3.23774891776946035970E0,
+                      6.91522889068984211695E0,
+                      3.93881025292474443415E0,
+                      1.33303460815807542389E0,
+                      2.01485389549179081538E-1,
+                      1.23716634817820021358E-2,
+                      3.01581553508235416007E-4,
+                      2.65806974686737550832E-6,
+                      6.23974539184983293730E-9]))
+  q2 = list(reversed([1.0,
+                      6.02427039364742014255E0,
+                      3.67983563856160859403E0,
+                      1.37702099489081330271E0,
+                      2.16236993594496635890E-1,
+                      1.34204006088543189037E-2,
+                      3.28014464682127739104E-4,
+                      2.89247864745380683936E-6,
+                      6.79019408009981274425E-9]))
+
+  def _create_polynomial(var, coeffs):
+    """Compute n_th order polynomial via Horner's method."""
+    if not coeffs:
+      return 0.
+    return coeffs[0] + _create_polynomial(var, coeffs[1:]) * var
+
+  maybe_complement_p = array_ops.where(p > 1. - np.exp(-2.), 1. - p, p)
+  # Write in an arbitrary value in place of 0 for p since 0 will cause NaNs
+  # later on. The result from the computation when p == 0 is not used so any
+  # number that doesn't result in NaNs is fine.
+  sanitized_mcp = array_ops.where(
+      maybe_complement_p <= 0.,
+      constant_op.constant(0.5, dtype=p.dtype, shape=p.shape),
+      maybe_complement_p)
+
+  # Compute x for p > exp(-2): x/sqrt(2pi) = w + w**3 P0(w**2)/Q0(w**2).
+  w = sanitized_mcp - 0.5
+  ww = w ** 2
+  x_for_big_p = w + w * ww * (_create_polynomial(ww, p0)
+                              / _create_polynomial(ww, q0))
+  x_for_big_p *= -np.sqrt(2. * np.pi)
+
+  # Compute x for p <= exp(-2): x = z - log(z)/z - (1/z) P(1/z) / Q(1/z),
+  # where z = sqrt(-2. * log(p)), and P/Q are chosen between two different
+  # arrays based on wether p < exp(-32).
+  z = math_ops.sqrt(-2. * math_ops.log(sanitized_mcp))
+  first_term = z - math_ops.log(z) / z
+  second_term_small_p = (_create_polynomial(1. / z, p2)
+                         / _create_polynomial(1. / z, q2)) / z
+  second_term_otherwise = (_create_polynomial(1. / z, p1)
+                           / _create_polynomial(1. / z, q1)) / z
+  x_for_small_p = first_term - second_term_small_p
+  x_otherwise = first_term - second_term_otherwise
+
+  x = array_ops.where(sanitized_mcp > np.exp(-2.),
+                      x_for_big_p,
+                      array_ops.where(z >= 8.0, x_for_small_p, x_otherwise))
+
+  x = array_ops.where(p > 1. - np.exp(-2.), x, -x)
+  infinity = constant_op.constant(np.inf, dtype=x.dtype, shape=x.shape)
+  x_nan_replaced = array_ops.where(
+      p <= 0.0, -infinity, array_ops.where(p >= 1.0, infinity, x))
+  return x_nan_replaced
+
+
 def log_ndtr(x, series_order=3, name="log_ndtr"):
   """Log Normal distribution function.
 
-- 
GitLab


From 59ccf014e89ff625dc3d9779e1fb54a980c4b6ac Mon Sep 17 00:00:00 2001
From: Nikhil Thorat <nsthorat@google.com>
Date: Thu, 13 Apr 2017 11:29:27 -0800
Subject: [PATCH 0376/1563] Update the embedding projector's publish dialogue
 to be clear about linking to directly to the raw gist file, rather than the
 gist description page with all the github chrome. Change: 153091327

---
 .../components/vz_projector/vz-projector-data-panel.html | 1 +
 .../components/vz_projector/vz-projector-data-panel.ts   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html
index f7ef059302..607d446789 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html
@@ -347,6 +347,7 @@ paper-dropdown-menu paper-item {
           </p>
           <p>
             One option is using a <a target=_blank href="https://gist.github.com/">github gist</a>.
+            If you choose this approach, make sure to link directly to the raw file.
           </p>
         </div>
         <div>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
index d52f024e3f..5e6bd3e7ab 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
@@ -402,8 +402,9 @@ export class DataPanel extends DataPanelPolymer {
       embeddings: [{
         tensorName: 'My tensor',
         tensorShape: [1000, 50],
-        tensorPath: 'https://gist.github.com/.../tensors.tsv',
-        metadataPath: 'https://gist.github.com/.../optional.metadata.tsv',
+        tensorPath: 'https://raw.githubusercontent.com/.../tensors.tsv',
+        metadataPath:
+            'https://raw.githubusercontent.com/.../optional.metadata.tsv',
       }],
     };
     this.setProjectorConfigTemplateJson(
@@ -427,7 +428,7 @@ export class DataPanel extends DataPanelPolymer {
     bookmarksFieldCheckbox.addEventListener('change', () => {
       if ((bookmarksFieldCheckbox as any).checked) {
         projectorConfigTemplateJson.embeddings[0].bookmarksPath =
-            'https://gist.github.com/.../bookmarks.txt';
+            'https://raw.githubusercontent.com/.../bookmarks.txt';
       } else {
         delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
       }
@@ -438,7 +439,7 @@ export class DataPanel extends DataPanelPolymer {
     metadataFieldCheckbox.addEventListener('change', () => {
       if ((metadataFieldCheckbox as HTMLInputElement).checked) {
         projectorConfigTemplateJson.embeddings[0].metadataPath =
-            'https://gist.github.com/.../optional.metadata.tsv';
+            'https://raw.githubusercontent.com/.../optional.metadata.tsv';
       } else {
         delete projectorConfigTemplateJson.embeddings[0].metadataPath;
       }
-- 
GitLab


From 908d5b6ede6ae829dff138a873eec397ef434cd6 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Thu, 13 Apr 2017 11:42:52 -0800
Subject: [PATCH 0377/1563] Add C++ gradients to c_api.

#6268

This CL does the following:
(1) Adds TF_AddGradients function to C_API which adds gradient nodes for the specified inputs.
(2) Adds internal constructor for Scope, need to create a scope from an existing graph in the c_api.
(3) Adds constructor for AddSymbolicGradients that assumes OnesLike when grad_inputs aren't provided.
(4) Improves error message when gradients aren't provided.
Change: 153092774
---
 tensorflow/c/BUILD                          |   8 +-
 tensorflow/c/c_api.cc                       |  72 +++++
 tensorflow/c/c_api.h                        |  19 +-
 tensorflow/c/c_api_test.cc                  | 276 ++++++++++++++++++++
 tensorflow/cc/BUILD                         |  14 +-
 tensorflow/cc/framework/grad_op_registry.cc |   8 +-
 tensorflow/cc/framework/gradients.cc        |  13 +
 tensorflow/cc/framework/gradients.h         |  11 +-
 tensorflow/cc/framework/gradients_test.cc   |  28 +-
 tensorflow/cc/framework/scope.cc            |  59 ++++-
 tensorflow/cc/framework/scope.h             |   1 +
 tensorflow/cc/framework/scope_internal.h    |  33 +++
 tensorflow/contrib/cmake/tf_python.cmake    |  10 +
 13 files changed, 531 insertions(+), 21 deletions(-)
 create mode 100644 tensorflow/cc/framework/scope_internal.h

diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index 6e39deee63..af96ce70b6 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -38,6 +38,9 @@ tf_cuda_library(
         ],
         "//conditions:default": [
             "//tensorflow/cc/saved_model:loader",
+            "//tensorflow/cc:gradients",
+            "//tensorflow/cc:ops",
+            "//tensorflow/cc:scope_internal",
             "//tensorflow/core:core_cpu",
             "//tensorflow/core:framework",
             "//tensorflow/core:lib",
@@ -97,21 +100,22 @@ tf_cc_test(
     # linkstatic = tf_kernel_tests_linkstatic(),
     deps = [
         ":c_api",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:grad_ops",
         "//tensorflow/cc/saved_model:signature_constants",
         "//tensorflow/cc/saved_model:tag_constants",
         "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:direct_session",
         "//tensorflow/core:framework",
+        "//tensorflow/core:framework_internal",
         "//tensorflow/core:lib",
         "//tensorflow/core:proto_text",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
-        "//tensorflow/core:testlib",
         "//tensorflow/core/kernels:array",
         "//tensorflow/core/kernels:control_flow_ops",
         "//tensorflow/core/kernels:math",
-        "//third_party/eigen3",
     ],
 )
 
diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index a8c360541c..b2c6b13b69 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -21,6 +21,9 @@ limitations under the License.
 #include <vector>
 
 #ifndef __ANDROID__
+#include "tensorflow/cc/framework/gradients.h"
+#include "tensorflow/cc/framework/ops.h"
+#include "tensorflow/cc/framework/scope_internal.h"
 #include "tensorflow/cc/saved_model/loader.h"
 #endif
 #include "tensorflow/core/common_runtime/shape_refiner.h"
@@ -2113,6 +2116,75 @@ void TF_FinishWhile(const TF_WhileParams* params, TF_Status* status,
 
 void TF_AbortWhile(const TF_WhileParams* params) { FreeWhileResources(params); }
 
+#ifndef __ANDROID__
+namespace {
+
+void OutputsFromTFOutputs(TF_Output* tf_outputs, int n, TF_Status* status,
+                          std::vector<tensorflow::Output>* outputs) {
+  outputs->resize(n);
+  for (int i = 0; i < n; i++) {
+    const TF_Output& tf_output = tf_outputs[i];
+    (*outputs)[i] = tensorflow::Output(&tf_output.oper->node, tf_output.index);
+  }
+}
+
+void TFOutputsFromOutputs(const std::vector<tensorflow::Output>& outputs,
+                          TF_Output* tf_outputs) {
+  for (int i = 0; i < outputs.size(); i++) {
+    tf_outputs[i].oper = ToOperation(outputs[i].node());
+    tf_outputs[i].index = outputs[i].index();
+  }
+}
+
+}  // namespace
+#endif  // __ANDROID__
+
+void TF_AddGradients(TF_Graph* g, TF_Output* y, int ny, TF_Output* x, int nx,
+                     TF_Output* dx, TF_Status* status, TF_Output* dy) {
+#ifdef __ANDROID__
+  status->status = tensorflow::errors::Unimplemented(
+      "Adding gradients is not supported in Android. File a bug at "
+      "https://github.com/tensorflow/tensorflow/issues if this feature is "
+      "important to you");
+#else
+  std::vector<tensorflow::Output> y_arg;
+  std::vector<tensorflow::Output> x_arg;
+  std::vector<tensorflow::Output> dy_arg;
+  OutputsFromTFOutputs(y, ny, status, &y_arg);
+  OutputsFromTFOutputs(x, nx, status, &x_arg);
+
+  {
+    // We need to hold on to the lock while we have a scope that uses TF_Graph.
+    mutex_lock graph_lock(g->mu);
+
+    const int max_node_id_before = g->graph.num_node_ids();
+
+    tensorflow::Scope scope =
+        NewInternalScope(&g->graph, &status->status, &g->refiner);
+
+    if (dx != nullptr) {
+      std::vector<tensorflow::Output> dx_arg;
+      OutputsFromTFOutputs(dx, ny, status, &dx_arg);
+      status->status =
+          AddSymbolicGradients(scope, y_arg, x_arg, dx_arg, &dy_arg);
+    } else {
+      status->status = AddSymbolicGradients(scope, y_arg, x_arg, &dy_arg);
+    }
+
+    // Update g->name_map with the name_map from the scope, which will contain
+    // the new gradient ops.
+    for (int i = max_node_id_before; i < g->graph.num_node_ids(); ++i) {
+      Node* n = g->graph.FindNodeId(i);
+      if (n == nullptr) continue;
+      g->name_map[n->name()] = n;
+    }
+  }
+
+  // Unpack the results from grad_outputs_arg.
+  TFOutputsFromOutputs(dy_arg, dy);
+#endif  // __ANDROID__
+}
+
 // TF_Session functions ----------------------------------------------
 
 TF_Session* TF_NewSession(TF_Graph* graph, const TF_SessionOptions* opt,
diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h
index 9b08f9d981..88438a3585 100644
--- a/tensorflow/c/c_api.h
+++ b/tensorflow/c/c_api.h
@@ -898,7 +898,7 @@ typedef struct TF_WhileParams {
 // TF_FinishWhile() or TF_AbortWhile().
 //
 // Missing functionality (TODO):
-// - Gradients (not yet implmented for any ops)
+// - Gradients
 // - Reference-type inputs
 // - Directly referencing external tensors from the cond/body graphs (this is
 //   possible in the Python API)
@@ -921,7 +921,22 @@ void TF_FinishWhile(const TF_WhileParams* params, TF_Status* status,
 // called after a successful TF_NewWhile() call.
 void TF_AbortWhile(const TF_WhileParams* params);
 
-// TODO(andydavis): Function to add gradients to a graph.
+// Adds operations to compute the partial derivatives of sum of `y`s w.r.t `x`s,
+// i.e., d(y_1 + y_2 + ...)/dx_1, d(y_1 + y_2 + ...)/dx_2...
+// `dx` are used as initial gradients (which represent the symbolic partial
+// derivatives of some loss function `L` w.r.t. `y`).
+// `dx` must be nullptr or have size `ny`.
+// If `dx` is nullptr, the implementation will use dx of `OnesLike` for all
+// shapes in `y`.
+// The partial derivatives are returned in `dy`. `dy` should be allocated to
+// size `nx`.
+//
+// WARNING: This function does not yet support all the gradients that python
+// supports. See
+// https://www.tensorflow.org/code/tensorflow/cc/gradients/README.md
+// for instructions on how to add C++ more gradients.
+void TF_AddGradients(TF_Graph* g, TF_Output* y, int ny, TF_Output* x, int nx,
+                     TF_Output* dx, TF_Status* status, TF_Output* dy);
 
 // TODO(josh11b): Register OpDef, available to all operations added
 // to this graph.
diff --git a/tensorflow/c/c_api_test.cc b/tensorflow/c/c_api_test.cc
index d846daa71b..0ddc59db20 100644
--- a/tensorflow/c/c_api_test.cc
+++ b/tensorflow/c/c_api_test.cc
@@ -38,6 +38,7 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/protobuf/meta_graph.pb.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 using tensorflow::int32;
 using tensorflow::string;
@@ -1525,6 +1526,281 @@ TEST_F(CApiWhileLoopTest, BadTypes) {
   TF_AbortWhile(params_.get());
 }
 
+REGISTER_OP("TestOpWithNoGradient")
+    .Input("x: T")
+    .Output("y: T")
+    .Attr("T: {float, double}")
+    .Doc(R"doc(
+Test op with no grad registered.
+
+x: input
+y: output
+)doc");
+
+class CApiGradientsTest : public ::testing::Test {
+ protected:
+  CApiGradientsTest()
+      : s_(TF_NewStatus()),
+        graph_(TF_NewGraph()),
+        expected_graph_(TF_NewGraph()) {}
+
+  ~CApiGradientsTest() override {
+    TF_DeleteGraph(graph_);
+    TF_DeleteGraph(expected_graph_);
+    TF_DeleteStatus(s_);
+  }
+
+  void TestGradientsSuccess(bool grad_inputs_provided) {
+    TF_Output inputs[2];
+    TF_Output outputs[1];
+    TF_Output grad_outputs[2];
+    TF_Output expected_grad_outputs[2];
+
+    BuildSuccessGraph(inputs, outputs);
+    BuildExpectedGraph(grad_inputs_provided, expected_grad_outputs);
+
+    AddGradients(grad_inputs_provided, inputs, 2, outputs, 1, grad_outputs);
+
+    EXPECT_EQ(TF_OK, TF_GetCode(s_)) << TF_Message(s_);
+
+    // Compare that the graphs match.
+    GraphDef expected_gdef;
+    GraphDef gdef;
+    EXPECT_TRUE(GetGraphDef(expected_graph_, &expected_gdef));
+    EXPECT_TRUE(GetGraphDef(graph_, &gdef));
+    TF_EXPECT_GRAPH_EQ(expected_gdef, gdef);
+
+    // Compare that the output of the gradients of both graphs match.
+    RunGraphsAndCompareOutputs(grad_outputs, expected_grad_outputs);
+  }
+
+  void TestGradientsError(bool grad_inputs_provided) {
+    TF_Output inputs[1];
+    TF_Output outputs[1];
+    TF_Output grad_outputs[1];
+
+    BuildErrorGraph(inputs, outputs);
+
+    AddGradients(grad_inputs_provided, inputs, 1, outputs, 1, grad_outputs);
+
+    string expected_msg =
+        "No gradient defined for op: TestOpWithNoGradient. Please see "
+        "https://www.tensorflow.org/code/"
+        "tensorflow/cc/gradients/README.md"
+        " for instructions on how to add C++ gradients.";
+    EXPECT_EQ(expected_msg, TF_Message(s_));
+  }
+
+  // Run the graph and ensure that the gradient values are as expected.
+  void RunGraphsAndCompareOutputs(TF_Output* grad_outputs,
+                                  TF_Output* expected_grad_outputs) {
+    std::unique_ptr<CSession> csession(new CSession(graph_, s_));
+    std::unique_ptr<CSession> expected_csession(
+        new CSession(expected_graph_, s_));
+
+    std::vector<TF_Output> grad_outputs_vec;
+    grad_outputs_vec.assign(grad_outputs, grad_outputs + 2);
+    csession->SetOutputs(grad_outputs_vec);
+    csession->Run(s_);
+    ASSERT_EQ(TF_OK, TF_GetCode(s_)) << TF_Message(s_);
+    TF_Tensor* out0 = csession->output_tensor(0);
+    TF_Tensor* out1 = csession->output_tensor(1);
+
+    std::vector<TF_Output> expected_grad_outputs_vec;
+    expected_grad_outputs_vec.assign(expected_grad_outputs,
+                                     expected_grad_outputs + 2);
+    expected_csession->SetOutputs(expected_grad_outputs_vec);
+    expected_csession->Run(s_);
+    ASSERT_EQ(TF_OK, TF_GetCode(s_)) << TF_Message(s_);
+    TF_Tensor* expected_out0 = expected_csession->output_tensor(0);
+    TF_Tensor* expected_out1 = expected_csession->output_tensor(1);
+
+    CompareTensors(out0, expected_out0);
+    CompareTensors(out1, expected_out1);
+  }
+
+  void CompareTensors(TF_Tensor* a, TF_Tensor* b) {
+    float* a_data = static_cast<float*>(TF_TensorData(a));
+    float* b_data = static_cast<float*>(TF_TensorData(b));
+    EXPECT_EQ(*a_data, *b_data);
+  }
+
+  void AddGradients(bool grad_inputs_provided, TF_Output* inputs, int ninputs,
+                    TF_Output* outputs, int noutputs, TF_Output* grad_outputs) {
+    if (grad_inputs_provided) {
+      TF_Output grad_inputs[1];
+      const float grad_inputs_val[] = {1.0, 1.0, 1.0, 1.0};
+      TF_Operation* grad_inputs_op =
+          FloatConst2x2(graph_, s_, grad_inputs_val, "GradInputs");
+      grad_inputs[0] = TF_Output{grad_inputs_op, 0};
+      TF_AddGradients(graph_, outputs, noutputs, inputs, ninputs, grad_inputs,
+                      s_, grad_outputs);
+    } else {
+      TF_AddGradients(graph_, outputs, noutputs, inputs, ninputs, nullptr, s_,
+                      grad_outputs);
+    }
+  }
+
+  void BuildErrorGraph(TF_Output* inputs, TF_Output* outputs) {
+    const float const0_val[] = {1.0, 2.0, 3.0, 4.0};
+    TF_Operation* const0 = FloatConst2x2(graph_, s_, const0_val, "Const_0");
+    TF_Operation* nograd = NoGradientOp(graph_, s_, const0, "NoGrad");
+    inputs[0] = TF_Output{const0, 0};
+    outputs[0] = TF_Output{nograd, 0};
+    EXPECT_EQ(TF_OK, TF_GetCode(s_)) << TF_Message(s_);
+  }
+
+  void BuildSuccessGraph(TF_Output* inputs, TF_Output* outputs) {
+    // Construct the following graph:
+    //            |
+    //           z|
+    //            |
+    //          MatMul
+    //         /       \
+    //        ^         ^
+    //        |         |
+    //       x|        y|
+    //        |         |
+    //        |         |
+    //      Const_0    Const_1
+    //
+    const float const0_val[] = {1.0, 2.0, 3.0, 4.0};
+    const float const1_val[] = {1.0, 0.0, 0.0, 1.0};
+    TF_Operation* const0 = FloatConst2x2(graph_, s_, const0_val, "Const_0");
+    TF_Operation* const1 = FloatConst2x2(graph_, s_, const1_val, "Const_1");
+    TF_Operation* matmul = MatMul(graph_, s_, const0, const1, "MatMul");
+    inputs[0] = TF_Output{const0, 0};
+    inputs[1] = TF_Output{const1, 0};
+    outputs[0] = TF_Output{matmul, 0};
+    EXPECT_EQ(TF_OK, TF_GetCode(s_)) << TF_Message(s_);
+  }
+
+  void BuildExpectedGraph(bool grad_inputs_provided,
+                          TF_Output* expected_grad_outputs) {
+    // The expected graph looks like this if grad_inputs_provided.
+    // If grad_inputs_provided is false, Const_0 will be a OnesLike op.
+    //      ^             ^
+    //    dy|           dx|        // MatMul Gradient Graph
+    //      |             |
+    //   MatMul_2      MatMul_1
+    //   ^   ^          ^    ^
+    //   |   |----------|    |
+    //   |        ^          |
+    //   |      dz|          |
+    //   |        |          |
+    //   |     Const_3       |
+    //   |                   |
+    //   |        ^          |
+    //   |       z|          |     // MatMul Forward Graph
+    //   |        |          |
+    //   |      MatMul       |
+    //   |     /       \     |
+    //   |    ^         ^    |
+    //   |    |         |    |
+    //   |---x|        y|----|
+    //        |         |
+    //        |         |
+    //      Const_0   Const_1
+    //
+    const float const0_val[] = {1.0, 2.0, 3.0, 4.0};
+    const float const1_val[] = {1.0, 0.0, 0.0, 1.0};
+    TF_Operation* const0 =
+        FloatConst2x2(expected_graph_, s_, const0_val, "Const_0");
+    TF_Operation* const1 =
+        FloatConst2x2(expected_graph_, s_, const1_val, "Const_1");
+    TF_Operation* matmul =
+        MatMul(expected_graph_, s_, const0, const1, "MatMul");
+
+    TF_Operation* const3;
+    if (grad_inputs_provided) {
+      const float const3_val[] = {1.0, 1.0, 1.0, 1.0};
+      const3 = FloatConst2x2(expected_graph_, s_, const3_val, "GradInputs");
+    } else {
+      const3 = OnesLike(expected_graph_, s_, matmul, "OnesLike");
+    }
+
+    TF_Operation* matmul1 =
+        MatMul(expected_graph_, s_, const3, const1, "MatMul_1", false, true);
+    TF_Operation* matmul2 =
+        MatMul(expected_graph_, s_, const0, const3, "MatMul_2", true, false);
+    expected_grad_outputs[0] = {matmul1, 0};
+    expected_grad_outputs[1] = {matmul2, 0};
+  }
+
+  TF_Tensor* FloatTensor2x2(const float* values) {
+    const int64_t dims[2] = {2, 2};
+    TF_Tensor* t = TF_AllocateTensor(TF_FLOAT, dims, 2, sizeof(float) * 4);
+    memcpy(TF_TensorData(t), values, sizeof(float) * 4);
+    return t;
+  }
+
+  TF_Operation* FloatConst2x2(TF_Graph* graph, TF_Status* s,
+                              const float* values, const char* name) {
+    unique_tensor_ptr tensor(FloatTensor2x2(values), TF_DeleteTensor);
+    TF_OperationDescription* desc = TF_NewOperation(graph, "Const", name);
+    TF_SetAttrTensor(desc, "value", tensor.get(), s);
+    if (TF_GetCode(s) != TF_OK) return nullptr;
+    TF_SetAttrType(desc, "dtype", TF_FLOAT);
+    TF_Operation* op = TF_FinishOperation(desc, s);
+    EXPECT_EQ(TF_OK, TF_GetCode(s)) << TF_Message(s);
+    return op;
+  }
+
+  TF_Operation* MatMul(TF_Graph* graph, TF_Status* s, TF_Operation* l,
+                       TF_Operation* r, const char* name,
+                       bool transpose_a = false, bool transpose_b = false) {
+    TF_OperationDescription* desc = TF_NewOperation(graph, "MatMul", name);
+    if (transpose_a) {
+      TF_SetAttrBool(desc, "transpose_a", 1);
+    }
+    if (transpose_b) {
+      TF_SetAttrBool(desc, "transpose_b", 1);
+    }
+    TF_AddInput(desc, {l, 0});
+    TF_AddInput(desc, {r, 0});
+    TF_Operation* op = TF_FinishOperation(desc, s);
+    EXPECT_EQ(TF_OK, TF_GetCode(s)) << TF_Message(s);
+    return op;
+  }
+
+  TF_Operation* OnesLike(TF_Graph* graph, TF_Status* s, TF_Operation* in,
+                         const char* name) {
+    TF_OperationDescription* desc = TF_NewOperation(graph, "OnesLike", name);
+    TF_AddInput(desc, {in, 0});
+    TF_Operation* op = TF_FinishOperation(desc, s);
+    EXPECT_EQ(TF_OK, TF_GetCode(s)) << TF_Message(s);
+    return op;
+  }
+
+  TF_Operation* NoGradientOp(TF_Graph* graph, TF_Status* s, TF_Operation* in,
+                             const char* name) {
+    TF_OperationDescription* desc =
+        TF_NewOperation(graph, "TestOpWithNoGradient", name);
+    TF_AddInput(desc, {in, 0});
+    TF_Operation* op = TF_FinishOperation(desc, s);
+    EXPECT_EQ(TF_OK, TF_GetCode(s)) << TF_Message(s);
+    return op;
+  }
+
+  TF_Status* s_;
+  TF_Graph* graph_;
+  TF_Graph* expected_graph_;
+};
+
+TEST_F(CApiGradientsTest, Gradients_GradInputs) { TestGradientsSuccess(true); }
+
+TEST_F(CApiGradientsTest, Gradients_NoGradInputs) {
+  TestGradientsSuccess(false);
+}
+
+TEST_F(CApiGradientsTest, OpWithNoGradientRegistered_GradInputs) {
+  TestGradientsError(true);
+}
+
+TEST_F(CApiGradientsTest, OpWithNoGradientRegistered_NoGradInputs) {
+  TestGradientsError(false);
+}
+
 // Create a tensor with values of type TF_INT8 provided by `values`.
 TF_Tensor* Int8Tensor(const int64_t* dims, int num_dims, const char* values) {
   int64_t num_values = 1;
diff --git a/tensorflow/cc/BUILD b/tensorflow/cc/BUILD
index aaebdded9a..42fa139282 100644
--- a/tensorflow/cc/BUILD
+++ b/tensorflow/cc/BUILD
@@ -122,7 +122,10 @@ cc_library_with_android_deps(
 
 cc_library_with_android_deps(
     name = "scope",
-    srcs = ["framework/scope.cc"],
+    srcs = [
+        "framework/scope.cc",
+        "framework/scope_internal.h",
+    ],
     hdrs = ["framework/scope.h"],
     android_deps = ["//tensorflow/core:android_tensorflow_lib"],
     common_deps = [
@@ -136,6 +139,15 @@ cc_library_with_android_deps(
     ],
 )
 
+cc_library_with_android_deps(
+    name = "scope_internal",
+    hdrs = ["framework/scope_internal.h"],
+    common_deps = [
+        ":scope",
+    ],
+    deps = [],
+)
+
 tf_cc_test(
     name = "framework_scope_test",
     srcs = ["framework/scope_test.cc"],
diff --git a/tensorflow/cc/framework/grad_op_registry.cc b/tensorflow/cc/framework/grad_op_registry.cc
index 0d6a377b50..254705736e 100644
--- a/tensorflow/cc/framework/grad_op_registry.cc
+++ b/tensorflow/cc/framework/grad_op_registry.cc
@@ -32,7 +32,13 @@ bool GradOpRegistry::Register(const string& op, GradFunc func) {
 Status GradOpRegistry::Lookup(const string& op, GradFunc* func) const {
   auto iter = registry_.find(op);
   if (iter == registry_.end()) {
-    return errors::NotFound("No gradient defined for op: ", op);
+    const string error_msg =
+        "No gradient defined for op: " + op +
+        ". Please see "
+        "https://www.tensorflow.org/code/"
+        "tensorflow/cc/gradients/README.md"
+        " for instructions on how to add C++ gradients.";
+    return errors::NotFound(error_msg);
   }
   *func = iter->second;
   return Status::OK();
diff --git a/tensorflow/cc/framework/gradients.cc b/tensorflow/cc/framework/gradients.cc
index 2c60f947a5..4ada9351ca 100644
--- a/tensorflow/cc/framework/gradients.cc
+++ b/tensorflow/cc/framework/gradients.cc
@@ -367,6 +367,19 @@ Status AddSymbolicGradients(const Scope& scope,
   return builder.AddGradients();
 }
 
+Status AddSymbolicGradients(const Scope& scope,
+                            const std::vector<Output>& outputs,
+                            const std::vector<Output>& inputs,
+                            std::vector<Output>* grad_outputs) {
+  std::vector<Output> grad_inputs;
+  grad_inputs.reserve(outputs.size());
+  for (const Output& output : outputs) {
+    grad_inputs.emplace_back(ops::OnesLike(scope, output));
+  }
+  return AddSymbolicGradients(scope, outputs, inputs, grad_inputs,
+                              grad_outputs);
+}
+
 Output NoGradient() { return SymbolicGradientBuilder::NoGradient(); }
 
 }  // end namespace tensorflow
diff --git a/tensorflow/cc/framework/gradients.h b/tensorflow/cc/framework/gradients.h
index d076bc43b4..717f6f0636 100644
--- a/tensorflow/cc/framework/gradients.h
+++ b/tensorflow/cc/framework/gradients.h
@@ -27,16 +27,19 @@ namespace tensorflow {
 /// derivatives of some loss function 'L' w.r.t 'outputs'), adds gradient nodes
 /// to the graph associated with 'scope', which compute (and return in
 /// 'grad_outputs') the symbolic partial derivatives of 'L' w.r.t 'inputs'.
-///
-
-// TODO(andydavis) Add overload of this function with no 'grad_inputs' arg.
-// Implementation will fill in 'OnesLike' for all shapes in 'outputs'.
 Status AddSymbolicGradients(const Scope& scope,
                             const std::vector<Output>& outputs,
                             const std::vector<Output>& inputs,
                             const std::vector<Output>& grad_inputs,
                             std::vector<Output>* grad_outputs);
 
+// Same as above, but uses 'OnesLike' for all shapes in
+// 'outputs' as grad_inputs.
+Status AddSymbolicGradients(const Scope& scope,
+                            const std::vector<Output>& outputs,
+                            const std::vector<Output>& inputs,
+                            std::vector<Output>* grad_outputs);
+
 /// Returns a sentinel Output that represents 'no gradient' (i.e. no gradient
 /// flows along some graph edge during backpropagation).
 /// Can be returned in 'grad_outputs' by an invocation of 'AddSymbolicGradients'
diff --git a/tensorflow/cc/framework/gradients_test.cc b/tensorflow/cc/framework/gradients_test.cc
index 6c2c2fcd1e..7783bdce3a 100644
--- a/tensorflow/cc/framework/gradients_test.cc
+++ b/tensorflow/cc/framework/gradients_test.cc
@@ -40,7 +40,7 @@ class GradientsTest : public ::testing::Test {
     TF_ASSERT_OK(scope_test_.ToGraphDef(&gdef_test));
     GraphDef gdef_exp;
     TF_ASSERT_OK(scope_expected_.ToGraphDef(&gdef_exp));
-    TF_EXPECT_GRAPH_EQ(gdef_test, gdef_exp);
+    TF_EXPECT_GRAPH_EQ(gdef_exp, gdef_test);
   }
 
   Scope scope_expected_;
@@ -98,6 +98,32 @@ TEST_F(GradientsTest, OneMatMul) {
   CompareTestAndExpectedGraphs();
 }
 
+TEST_F(GradientsTest, OneMatMul_InferGradInputs) {
+  for (const bool expected : {false, true}) {
+    const Scope& scope = expected ? scope_expected_ : scope_test_;
+    // Construct forward graph.
+    auto x = Const(scope, {{1.0, 2.0}, {3.0, 4.0}});
+    auto y = Const(scope, {{1.0, 0.0}, {0.0, 1.0}});
+    auto z = MatMul(scope, x, y);
+    TF_ASSERT_OK(scope.status());
+    CHECK_NOTNULL(z.node());
+
+    if (expected) {
+      // Construct backward graph.
+      // The gradients function adds a OnesLike to create a dz of ones with the
+      // shape of z.
+      auto dz = OnesLike(scope, z);
+      auto dx = MatMul(scope, dz, y, MatMul::TransposeB(true));
+      auto dy = MatMul(scope, x, dz, MatMul::TransposeA(true));
+    } else {
+      // Call AddSymbolicGradients.
+      std::vector<Output> grad_outputs;
+      TF_ASSERT_OK(AddSymbolicGradients(scope, {z}, {x, y}, &grad_outputs));
+    }
+  }
+  CompareTestAndExpectedGraphs();
+}
+
 TEST_F(GradientsTest, TwoMatMuls_Chained) {
   for (const bool expected : {false, true}) {
     const Scope& scope = expected ? scope_expected_ : scope_test_;
diff --git a/tensorflow/cc/framework/scope.cc b/tensorflow/cc/framework/scope.cc
index 571c6e1e57..8b7fc1406f 100644
--- a/tensorflow/cc/framework/scope.cc
+++ b/tensorflow/cc/framework/scope.cc
@@ -16,7 +16,7 @@ limitations under the License.
 #include <algorithm>
 #include <vector>
 
-#include "tensorflow/cc/framework/scope.h"
+#include "tensorflow/cc/framework/scope_internal.h"
 #include "tensorflow/core/common_runtime/shape_refiner.h"
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/graph/graph_constructor.h"
@@ -25,6 +25,20 @@ limitations under the License.
 namespace tensorflow {
 
 class Scope::Impl {
+ public:
+  // A NameMap is used to keep track of suffixes for names used in a scope. A
+  // name that has not been used so far in a scope will get no suffix. Later
+  // uses of the same name will get suffixes _1, _2, _3, etc. Multiple scopes
+  // can share the same NameMap. For instance, a new scope created using
+  // WithControlDependencies() should would share the same NameMap with the
+  // parent.
+  typedef std::unordered_map<string, int> NameMap;
+
+  Impl(const std::shared_ptr<Graph>& graph,
+       const std::shared_ptr<Status>& status,
+       const std::shared_ptr<NameMap>& name_map,
+       const std::shared_ptr<ShapeRefiner>& refiner);
+
  private:
   friend class Scope;
 
@@ -40,14 +54,6 @@ class Scope::Impl {
     enum class Colocate;
   };
 
-  // A NameMap is used to keep track of suffixes for names used in a scope. A
-  // name that has not been used so far in a scope will get no suffix. Later
-  // uses of the same name will get suffixes _1, _2, _3, etc. Multiple scopes
-  // can share the same NameMap. For instance, a new scope created using
-  // WithControlDependencies() should would share the same NameMap with the
-  // parent.
-  typedef std::unordered_map<string, int> NameMap;
-
   Impl(Graph* graph, Status* status, NameMap* name_map, ShapeRefiner* refiner);
   Impl(const Scope& other, Tags::ScopeName, const string& name,
        bool copy_names);
@@ -116,6 +122,17 @@ Scope::Impl::Impl(Graph* graph, Status* status, NameMap* name_map,
       scope_used_(nullptr),
       colocation_constraints_() {}
 
+Scope::Impl::Impl(const std::shared_ptr<Graph>& graph,
+                  const std::shared_ptr<Status>& status,
+                  const std::shared_ptr<NameMap>& name_map,
+                  const std::shared_ptr<ShapeRefiner>& refiner)
+    : graph_(graph),
+      status_(status),
+      name_map_(name_map),
+      refiner_(refiner),
+      scope_used_(nullptr),
+      colocation_constraints_() {}
+
 Scope Scope::NewRootScope() {
   Graph* graph = new Graph(OpRegistry::Global());
   ShapeRefiner* refiner =
@@ -277,7 +294,7 @@ std::shared_ptr<Graph> Scope::graph_as_shared_ptr() const {
   return impl()->graph_;
 }
 
-Status Scope::status() const { return *impl()->status_; };
+Status Scope::status() const { return *impl()->status_; }
 
 const std::vector<Operation>& Scope::control_deps() const {
   return impl()->control_deps_;
@@ -464,4 +481,26 @@ CompositeOpScopes Scope::GetCompositeOpScopes(
   }
 }
 
+class InternalScope {
+ public:
+  // NewScope doesn't take ownership of the inputs.
+  static Scope NewScope(Graph* graph, Status* status, ShapeRefiner* refiner) {
+    Scope::Impl::NameMap* name_map = new Scope::Impl::NameMap;
+    for (const Node* node : graph->nodes()) {
+      (*name_map)[node->name()] = 0;
+    }
+    // We provide null destructors for these shared ptrs (except for name_map)
+    // since the caller owns them and doesn't want the scope to destroy them.
+    return Scope(new Scope::Impl(
+        std::shared_ptr<Graph>(graph, [](Graph*) {}),
+        std::shared_ptr<Status>(status, [](Status*) {}),
+        std::shared_ptr<Scope::Impl::NameMap>(name_map),
+        std::shared_ptr<ShapeRefiner>(refiner, [](ShapeRefiner*) {})));
+  }
+};
+
+Scope NewInternalScope(Graph* graph, Status* status, ShapeRefiner* refiner) {
+  return InternalScope::NewScope(graph, status, refiner);
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/cc/framework/scope.h b/tensorflow/cc/framework/scope.h
index ce70da7096..ec3543772d 100644
--- a/tensorflow/cc/framework/scope.h
+++ b/tensorflow/cc/framework/scope.h
@@ -204,6 +204,7 @@ class Scope {
   const std::vector<Operation>& control_deps() const;
 
  private:
+  friend class InternalScope;
   class Impl;
   std::unique_ptr<Impl> impl_;
   Impl* impl() { return impl_.get(); }
diff --git a/tensorflow/cc/framework/scope_internal.h b/tensorflow/cc/framework/scope_internal.h
new file mode 100644
index 0000000000..f2a911877f
--- /dev/null
+++ b/tensorflow/cc/framework/scope_internal.h
@@ -0,0 +1,33 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CC_FRAMEWORK_SCOPE_INTERNAL_H_
+#define THIRD_PARTY_TENSORFLOW_CC_FRAMEWORK_SCOPE_INTERNAL_H_
+
+#include "tensorflow/cc/framework/scope.h"
+
+namespace tensorflow {
+
+class ShapeRefiner;
+
+// NewInternalScope returns a new scope which doesn't take ownership of
+// graph, status, name_map, and refiner.
+// This is intended to enable the C API (which are used by other language
+// bindings) to create a Scope and access C++ functionality (i.e. gradients).
+Scope NewInternalScope(Graph* graph, Status* status, ShapeRefiner* refiner);
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CC_FRAMEWORK_SCOPE_INTERNAL_H_
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index c0c6cd54ac..9fcb25c4f7 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -689,6 +689,14 @@ set (pywrap_tensorflow_internal_src
     "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.h"
     "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.cc"
     "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.h"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/gradients.h"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/gradients.cc"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/grad_op_registry.h"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/grad_op_registry.cc"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/ops.h"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/ops.cc"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/scope_internal.h"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/scope.cc"
     "${CMAKE_CURRENT_BINARY_DIR}/pywrap_tensorflow_internal.cc"
 )
 
@@ -707,6 +715,7 @@ if(WIN32)
         $<TARGET_OBJECTS:tf_core_lib>
         $<TARGET_OBJECTS:tf_core_cpu>
         $<TARGET_OBJECTS:tf_core_framework>
+        $<TARGET_OBJECTS:tf_cc_ops>
         $<TARGET_OBJECTS:tf_core_ops>
         $<TARGET_OBJECTS:tf_core_direct_session>
         $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
@@ -742,6 +751,7 @@ add_library(pywrap_tensorflow_internal SHARED
     $<TARGET_OBJECTS:tf_core_lib>
     $<TARGET_OBJECTS:tf_core_cpu>
     $<TARGET_OBJECTS:tf_core_framework>
+    $<TARGET_OBJECTS:tf_cc_ops>
     $<TARGET_OBJECTS:tf_core_ops>
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
-- 
GitLab


From 4df3a25ab889d1e01ebf6e34092de4c0ce5ca93a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 11:57:23 -0800
Subject: [PATCH 0378/1563] Add boolean param for whether to use local storage
 to test

This fixes a TypeScript compilation error during vulcanization.
Change: 153094698
---
 .../tf_storage/test/storageTests.ts           | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_storage/test/storageTests.ts b/tensorflow/tensorboard/components/tf_storage/test/storageTests.ts
index d036005caa..b1c4a5cf47 100644
--- a/tensorflow/tensorboard/components/tf_storage/test/storageTests.ts
+++ b/tensorflow/tensorboard/components/tf_storage/test/storageTests.ts
@@ -16,47 +16,47 @@ limitations under the License.
 module TF.URIStorage {
   describe('URIStorage', function() {
     it('get/setString', function() {
-      setString('key_a', 'hello');
-      setString('key_b', 'there');
-      chai.assert.equal('hello', getString('key_a'));
-      chai.assert.equal('there', getString('key_b'));
-      chai.assert.equal(null, getString('key_c'));
+      setString('key_a', 'hello', false);
+      setString('key_b', 'there', false);
+      chai.assert.equal('hello', getString('key_a', false));
+      chai.assert.equal('there', getString('key_b', false));
+      chai.assert.equal(null, getString('key_c', false));
     });
 
     it('get/setNumber', function() {
-      setNumber('key_a', 12);
-      setNumber('key_b', 3.4);
-      chai.assert.equal(12, getNumber('key_a'));
-      chai.assert.equal(3.4, getNumber('key_b'));
-      chai.assert.equal(null, getNumber('key_c'));
+      setNumber('key_a', 12, false);
+      setNumber('key_b', 3.4, false);
+      chai.assert.equal(12, getNumber('key_a', false));
+      chai.assert.equal(3.4, getNumber('key_b', false));
+      chai.assert.equal(null, getNumber('key_c', false));
     });
 
     it('get/setObject', function() {
       let obj = {'foo': 2.3, 'bar': 'barstr'};
-      setObject('key_a', obj);
-      chai.assert.deepEqual(obj, getObject('key_a'));
+      setObject('key_a', obj, false);
+      chai.assert.deepEqual(obj, getObject('key_a', false));
     });
 
     it('get/setWeirdValues', function() {
-      setNumber('key_a', NaN);
-      chai.assert.deepEqual(NaN, getNumber('key_a'));
+      setNumber('key_a', NaN, false);
+      chai.assert.deepEqual(NaN, getNumber('key_a', false));
 
-      setNumber('key_a', +Infinity);
-      chai.assert.equal(+Infinity, getNumber('key_a'));
+      setNumber('key_a', +Infinity, false);
+      chai.assert.equal(+Infinity, getNumber('key_a', false));
 
-      setNumber('key_a', -Infinity);
-      chai.assert.equal(-Infinity, getNumber('key_a'));
+      setNumber('key_a', -Infinity, false);
+      chai.assert.equal(-Infinity, getNumber('key_a', false));
 
-      setNumber('key_a', 1 / 3);
-      chai.assert.equal(1 / 3, getNumber('key_a'));
+      setNumber('key_a', 1 / 3, false);
+      chai.assert.equal(1 / 3, getNumber('key_a', false));
 
-      setNumber('key_a', -0);
-      chai.assert.equal(-0, getNumber('key_a'));
+      setNumber('key_a', -0, false);
+      chai.assert.equal(-0, getNumber('key_a', false));
     });
 
     it('set/getTab', function() {
-      setString(TAB, TF.Globals.TABS[0]);
-      chai.assert.equal(TF.Globals.TABS[0], getString(TAB));
+      setString(TAB, TF.Globals.TABS[0], false);
+      chai.assert.equal(TF.Globals.TABS[0], getString(TAB, false));
     });
   });
 }
-- 
GitLab


From 127fb45e9b29e500a4520300d3b47d1f80b53b4f Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Thu, 13 Apr 2017 11:59:54 -0800
Subject: [PATCH 0379/1563] Adds a test to ensure ValidationMonitor will not be
 added when min_eval_frequencey is set as 0. Change: 153095072

---
 .../learn/python/learn/experiment_test.py     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index e0fafef951..4b5f3a195c 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -565,6 +565,25 @@ class ExperimentTest(test.TestCase):
       self.assertEqual([noop_hook], est.eval_hooks)
       self.assertTrue(isinstance(est.monitors[0], monitors.ValidationMonitor))
 
+  def test_train_and_evaluate_with_no_eval_during_training(self):
+    for est in self._estimators_for_tests():
+      eval_metrics = 'eval_metrics' if not isinstance(
+          est, core_estimator.Estimator) else None
+      noop_hook = _NoopHook()
+      ex = experiment.Experiment(
+          est,
+          train_input_fn='train_input',
+          eval_input_fn='eval_input',
+          eval_metrics=eval_metrics,
+          eval_hooks=[noop_hook],
+          train_steps=100,
+          eval_steps=100,
+          min_eval_frequency=0)
+      ex.train_and_evaluate()
+      self.assertEqual(1, est.fit_count)
+      self.assertEqual(1, est.eval_count)
+      self.assertEqual(0, len(est.monitors))
+
   def test_min_eval_frequency_defaults(self):
     def dummy_model_fn(features, labels):  # pylint: disable=unused-argument
       pass
-- 
GitLab


From 16399c361859f61ab6b26f5a25dc1da617605219 Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Tue, 11 Apr 2017 14:12:32 -0800
Subject: [PATCH 0380/1563] Backport fixes and improvements from external
 Keras. Change: 152867002

---
 tensorflow/contrib/keras/BUILD                |   1 +
 .../contrib/keras/python/keras/backend.py     |  17 +-
 .../contrib/keras/python/keras/callbacks.py   |  80 +++++-
 .../keras/python/keras/datasets/imdb.py       |   8 +-
 .../keras/python/keras/engine/topology.py     | 229 +++++++++---------
 .../keras/python/keras/engine/training.py     | 104 ++++----
 .../python/keras/layers/convolutional.py      | 183 ++++++++------
 .../keras/python/keras/layers/embeddings.py   |   7 +-
 .../keras/python/keras/layers/local.py        |   5 +-
 .../keras/python/keras/layers/merge.py        |  75 ++++--
 .../python/keras/layers/normalization.py      |   4 +-
 .../keras/python/keras/layers/recurrent.py    |  26 +-
 .../keras/python/keras/layers/wrappers.py     |  58 ++++-
 .../contrib/keras/python/keras/models.py      |  14 +-
 .../contrib/keras/python/keras/optimizers.py  |   9 +-
 .../keras/python/keras/preprocessing/image.py |   4 +-
 .../keras/python/keras/preprocessing/text.py  |   4 +-
 .../keras/python/keras/utils/conv_utils.py    |  12 +-
 .../keras/python/keras/utils/data_utils.py    | 184 +++++++++++---
 .../keras/python/keras/utils/generic_utils.py |   4 +-
 20 files changed, 673 insertions(+), 355 deletions(-)

diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD
index 449b0a3f50..da320e22d8 100644
--- a/tensorflow/contrib/keras/BUILD
+++ b/tensorflow/contrib/keras/BUILD
@@ -107,6 +107,7 @@ py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
+        "//tensorflow/contrib/tensorboard:projector",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:check_ops",
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index 9efc2d5e8e..ce44e38d09 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -351,7 +351,8 @@ def get_session():
       _SESSION = session_module.Session(config=config)
     session = _SESSION
   if not _MANUAL_VAR_INIT:
-    _initialize_variables()
+    with session.graph.as_default():
+      _initialize_variables()
   return session
 
 
@@ -2872,13 +2873,14 @@ def in_top_k(predictions, targets, k):
   """Returns whether the `targets` are in the top `k` `predictions`.
 
   Arguments:
-      predictions: A tensor of shape `batch_size` x classes and type `float32`.
-      targets: A tensor of shape batch_size and type `int32` or `int64`.
+      predictions: A tensor of shape `(batch_size, classes)` and type `float32`.
+      targets: A 1D tensor of length `batch_size` and type `int32` or `int64`.
       k: An `int`, number of top elements to consider.
 
   Returns:
-      A tensor of shape `batch_size` and type `bool`. `output_i` is `True` if
-      `targets_i` is within top-k values of `predictions_i`
+      A 1D tensor of length `batch_size` and type `bool`.
+      `output[i]` is `True` if `predictions[i, targets[i]]` is within top-`k`
+      values of `predictions[i]`.
   """
   return nn.in_top_k(predictions, targets, k)
 
@@ -3426,8 +3428,9 @@ def ctc_label_dense_to_sparse(labels, label_lengths):
   max_num_labels_tns = array_ops.stack([label_shape[1]])
 
   def range_less_than(_, current_input):
-    return array_ops.expand_dims(math_ops.range(
-        label_shape[1]), 0) < array_ops.fill(max_num_labels_tns, current_input)
+    return array_ops.expand_dims(
+        math_ops.range(label_shape[1]), 0) < array_ops.fill(
+            max_num_labels_tns, current_input)
 
   init = math_ops.cast(
       array_ops.fill([1, label_shape[1]], 0), dtypes_module.bool)
diff --git a/tensorflow/contrib/keras/python/keras/callbacks.py b/tensorflow/contrib/keras/python/keras/callbacks.py
index 345db2791c..a533e0fbda 100644
--- a/tensorflow/contrib/keras/python/keras/callbacks.py
+++ b/tensorflow/contrib/keras/python/keras/callbacks.py
@@ -31,8 +31,10 @@ import numpy as np
 
 from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import Progbar
+from tensorflow.contrib.tensorboard.plugins import projector
 from tensorflow.python.ops import array_ops
 from tensorflow.python.summary import summary as tf_summary
+from tensorflow.python.training import saver as saver_lib
 
 
 # pylint: disable=g-import-not-at-top
@@ -108,9 +110,9 @@ class CallbackList(object):
     delta_t_median = np.median(self._delta_ts_batch_begin)
     if (self._delta_t_batch > 0. and
         delta_t_median > 0.95 * self._delta_t_batch and delta_t_median > 0.1):
-      warnings.warn('Method on_batch_begin() is slow compared '
-                    'to the batch update (%f). Check your callbacks.' %
-                    delta_t_median)
+      warnings.warn(
+          'Method on_batch_begin() is slow compared '
+          'to the batch update (%f). Check your callbacks.' % delta_t_median)
     self._t_enter_batch = time.time()
 
   def on_batch_end(self, batch, logs=None):
@@ -131,9 +133,9 @@ class CallbackList(object):
     delta_t_median = np.median(self._delta_ts_batch_end)
     if (self._delta_t_batch > 0. and
         (delta_t_median > 0.95 * self._delta_t_batch and delta_t_median > 0.1)):
-      warnings.warn('Method on_batch_end() is slow compared '
-                    'to the batch update (%f). Check your callbacks.' %
-                    delta_t_median)
+      warnings.warn(
+          'Method on_batch_end() is slow compared '
+          'to the batch update (%f). Check your callbacks.' % delta_t_median)
 
   def on_train_begin(self, logs=None):
     """Called at the beginning of training.
@@ -585,6 +587,7 @@ class LearningRateScheduler(Callback):
 
 
 class TensorBoard(Callback):
+  # pylint: disable=line-too-long
   """Tensorboard basic visualizations.
 
   This callback writes a log for TensorBoard, which allows
@@ -603,19 +606,36 @@ class TensorBoard(Callback):
           write_graph is set to True.
       write_images: whether to write model weights to visualize as
           image in Tensorboard.
+      embeddings_freq: frequency (in epochs) at which selected embedding
+          layers will be saved.
+      embeddings_layer_names: a list of names of layers to keep eye on. If
+          None or empty list all the embedding layer will be watched.
+      embeddings_metadata: a dictionary which maps layer name to a file name
+          in which metadata for this embedding layer is saved. See the
+          [details](https://www.tensorflow.org/how_tos/embedding_viz/#metadata_optional)
+          about metadata files format. In case if the same metadata file is
+          used for all embedding layers, string can be passed.
   """
 
+  # pylint: enable=line-too-long
+
   def __init__(self,
                log_dir='./logs',
                histogram_freq=0,
                write_graph=True,
-               write_images=False):
+               write_images=False,
+               embeddings_freq=0,
+               embeddings_layer_names=None,
+               embeddings_metadata=None):
     super(TensorBoard, self).__init__()
     self.log_dir = log_dir
     self.histogram_freq = histogram_freq
     self.merged = None
     self.write_graph = write_graph
     self.write_images = write_images
+    self.embeddings_freq = embeddings_freq
+    self.embeddings_layer_names = embeddings_layer_names
+    self.embeddings_metadata = embeddings_metadata or {}
 
   def set_model(self, model):
     self.model = model
@@ -644,6 +664,47 @@ class TensorBoard(Callback):
     else:
       self.writer = tf_summary.FileWriter(self.log_dir)
 
+    if self.embeddings_freq:
+      self.saver = saver_lib.Saver()
+
+      embeddings_layer_names = self.embeddings_layer_names
+
+      if not embeddings_layer_names:
+        embeddings_layer_names = [
+            layer.name for layer in self.model.layers
+            if type(layer).__name__ == 'Embedding'
+        ]
+
+      embeddings = {
+          layer.name: layer.weights[0]
+          for layer in self.model.layers if layer.name in embeddings_layer_names
+      }
+
+      embeddings_metadata = {}
+
+      if not isinstance(self.embeddings_metadata, str):
+        embeddings_metadata = self.embeddings_metadata
+      else:
+        embeddings_metadata = {
+            layer_name: self.embeddings_metadata
+            for layer_name in embeddings.keys()
+        }
+
+      config = projector.ProjectorConfig()
+      self.embeddings_logs = []
+
+      for layer_name, tensor in embeddings.items():
+        embedding = config.embeddings.add()
+        embedding.tensor_name = tensor.name
+
+        self.embeddings_logs.append(
+            os.path.join(self.log_dir, layer_name + '.ckpt'))
+
+        if layer_name in embeddings_metadata:
+          embedding.metadata_path = embeddings_metadata[layer_name]
+
+      projector.visualize_embeddings(self.writer, config)
+
   def on_epoch_end(self, epoch, logs=None):
     logs = logs or {}
 
@@ -663,6 +724,11 @@ class TensorBoard(Callback):
         summary_str = result[0]
         self.writer.add_summary(summary_str, epoch)
 
+    if self.embeddings_freq and self.embeddings_logs:
+      if epoch % self.embeddings_freq == 0:
+        for log in self.embeddings_logs:
+          self.saver.save(self.sess, log, epoch)
+
     for name, value in logs.items():
       if name in ['batch', 'size']:
         continue
diff --git a/tensorflow/contrib/keras/python/keras/datasets/imdb.py b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
index 2688e8bede..bafd92aca6 100644
--- a/tensorflow/contrib/keras/python/keras/datasets/imdb.py
+++ b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
@@ -100,10 +100,10 @@ def load_data(path='imdb.npz',
         new_labels.append(y)
     xs = new_xs
     labels = new_labels
-  if not xs:
-    raise ValueError('After filtering for sequences shorter than maxlen=' + str(
-        maxlen) + ', no sequence was kept. '
-                     'Increase maxlen.')
+    if not xs:
+      raise ValueError('After filtering for sequences shorter than maxlen=' +
+                       str(maxlen) + ', no sequence was kept. '
+                       'Increase maxlen.')
   if not num_words:
     num_words = max([max(x) for x in xs])
 
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 0f506ff0a4..0a8a4c76a6 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -283,7 +283,11 @@ class Layer(object):
     self._trainable_weights = []
     self._non_trainable_weights = []
     self._constraints = {}  # dict {tensor: constraint instance}
-    self.built = False
+    self._losses = []
+    self._updates = []
+    self._per_input_losses = {}
+    self._per_input_updates = {}
+    self._built = False
 
     # These lists will be filled via successive calls
     # to self._add_inbound_node().
@@ -327,6 +331,22 @@ class Layer(object):
     else:
       self._initial_weights = None
 
+  @property
+  def losses(self):
+    return self._losses
+
+  @property
+  def updates(self):
+    return self._updates
+
+  @property
+  def built(self):
+    return self._built
+
+  @built.setter
+  def built(self, value):
+    self._built = value
+
   @property
   def constraints(self):
     return self._constraints
@@ -416,10 +436,10 @@ class Layer(object):
       input_spec = self.input_spec
     inputs = _to_list(inputs)
     if len(inputs) != len(input_spec):
-      raise ValueError('Layer ' + self.name + ' expects ' + str(
-          len(input_spec)) + ' inputs, '
+      raise ValueError('Layer ' + self.name + ' expects ' +
+                       str(len(input_spec)) + ' inputs, '
                        'but it received ' + str(len(inputs)) +
-                       ' input tensors. Input received: ' + str(input))
+                       ' input tensors. Input received: ' + str(inputs))
     for input_index, (x, spec) in enumerate(zip(inputs, input_spec)):
       if spec is None:
         continue
@@ -427,31 +447,31 @@ class Layer(object):
       # Check ndim.
       if spec.ndim is not None:
         if K.ndim(x) != spec.ndim:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
-                           ': expected ndim=' + str(
-                               spec.ndim) + ', found ndim=' + str(K.ndim(x)))
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
+                           ': expected ndim=' + str(spec.ndim) + ', found ndim='
+                           + str(K.ndim(x)))
       if spec.max_ndim is not None:
         ndim = K.ndim(x)
         if ndim is not None and ndim > spec.max_ndim:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
                            ': expected max_ndim=' + str(spec.max_ndim) +
                            ', found ndim=' + str(K.ndim(x)))
       if spec.min_ndim is not None:
         ndim = K.ndim(x)
         if ndim is not None and ndim < spec.min_ndim:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
                            ': expected min_ndim=' + str(spec.min_ndim) +
                            ', found ndim=' + str(K.ndim(x)))
       # Check dtype.
       if spec.dtype is not None:
         if K.dtype(x) != spec.dtype:
-          raise ValueError('Input ' + str(
-              input_index) + ' is incompatible with layer ' + self.name +
-                           ': expected dtype=' + str(
-                               spec.dtype) + ', found dtype=' + str(K.dtype(x)))
+          raise ValueError('Input ' + str(input_index) +
+                           ' is incompatible with layer ' + self.name +
+                           ': expected dtype=' + str(spec.dtype) +
+                           ', found dtype=' + str(K.dtype(x)))
       # Check specific shape axes.
       if spec.axes:
         try:
@@ -465,8 +485,8 @@ class Layer(object):
             if value is not None and x_shape[int(axis)] not in {value, None}:
               raise ValueError(
                   'Input ' + str(input_index) + ' is incompatible with layer ' +
-                  self.name + ': expected axis ' + str(
-                      axis) + ' of input shape to have '
+                  self.name + ': expected axis ' + str(axis) +
+                  ' of input shape to have '
                   'value ' + str(value) + ' but got shape ' + str(x_shape))
       # Check shape.
       if spec.shape is not None:
@@ -480,8 +500,8 @@ class Layer(object):
               spec_dim = spec_dim.value
             if spec_dim is not None and dim is not None:
               if spec_dim != dim:
-                raise ValueError('Input ' + str(
-                    input_index) + ' is incompatible with layer ' + self.name +
+                raise ValueError('Input ' + str(input_index) +
+                                 ' is incompatible with layer ' + self.name +
                                  ': expected shape=' + str(spec.shape) +
                                  ', found shape=' + str(x_shape))
 
@@ -545,6 +565,7 @@ class Layer(object):
 
       # Handle mask propagation.
       previous_mask = _collect_previous_mask(inputs)
+      user_kwargs = copy.copy(kwargs)
       if not _is_all_none(previous_mask):
         # The previous layer generated a mask.
         if 'mask' in inspect.getargspec(self.call).args:
@@ -567,7 +588,7 @@ class Layer(object):
           output_tensors=output,
           input_masks=previous_mask,
           output_masks=output_mask,
-          arguments=kwargs)
+          arguments=user_kwargs)
 
       # Apply activity regularizer if any:
       if hasattr(
@@ -720,9 +741,9 @@ class Layer(object):
       raise RuntimeError('The layer has never been called '
                          'and thus has no defined ' + attr_name + '.')
     if not len(self.inbound_nodes) > node_index:
-      raise ValueError('Asked to get ' + attr_name + ' at node ' + str(
-          node_index) + ', but the layer has only ' + str(
-              len(self.inbound_nodes)) + ' inbound nodes.')
+      raise ValueError('Asked to get ' + attr_name + ' at node ' +
+                       str(node_index) + ', but the layer has only ' +
+                       str(len(self.inbound_nodes)) + ' inbound nodes.')
     values = getattr(self.inbound_nodes[node_index], attr)
     if len(values) == 1:
       return values[0]
@@ -1011,23 +1032,15 @@ class Layer(object):
             (e.g. L2 weight regularization, which only depends
             on the layer's weights variables, not on any inputs tensors).
     """
-    if losses is None:
+    if losses is None or losses == []:  # pylint: disable=g-explicit-bool-comparison
       return
     # Update self.losses
     losses = _to_list(losses)
-    if not hasattr(self, 'losses'):
-      self.losses = []
-    try:
-      self.losses += losses
-    except AttributeError:
-      # In case self.losses isn't settable
-      # (i.e. it's a getter method).
-      # In that case the `losses` property is
-      # auto-computed and shouldn't be set.
-      pass
+    if hasattr(self, '_losses'):
+      self._losses += losses
     # Update self._per_input_updates
-    if not hasattr(self, '_per_input_losses'):
-      self._per_input_losses = {}
+    if inputs == []:  # pylint: disable=g-explicit-bool-comparison
+      inputs = None
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1051,23 +1064,15 @@ class Layer(object):
             the updates as conditional on these inputs.
             If None is passed, the updates are assumed unconditional.
     """
-    if updates is None:
+    if updates is None or updates == []:  # pylint: disable=g-explicit-bool-comparison
       return
     # Update self.updates
     updates = _to_list(updates)
-    if not hasattr(self, 'updates'):
-      self.updates = []
-    try:
-      self.updates += updates
-    except AttributeError:
-      # In case self.updates isn't settable
-      # (i.e. it's a getter method).
-      # In that case the `updates` property is
-      # auto-computed and shouldn't be set.
-      pass
+    if hasattr(self, '_updates'):
+      self._updates += updates
     # Update self._per_input_updates
-    if not hasattr(self, '_per_input_updates'):
-      self._per_input_updates = {}
+    if inputs == []:  # pylint: disable=g-explicit-bool-comparison
+      inputs = None
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1079,8 +1084,6 @@ class Layer(object):
     self._per_input_updates[inputs_hash] += updates
 
   def get_updates_for(self, inputs):
-    if not hasattr(self, '_per_input_updates'):
-      return []
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1090,8 +1093,6 @@ class Layer(object):
     return []
 
   def get_losses_for(self, inputs):
-    if not hasattr(self, '_per_input_losses'):
-      return []
     if inputs is not None:
       inputs_hash = _object_list_uid(inputs)
     else:
@@ -1121,10 +1122,10 @@ class Layer(object):
     params = self.weights
     if len(params) != len(weights):
       raise ValueError('You called `set_weights(weights)` on layer "' +
-                       self.name + '" with a  weight list of length ' + str(
-                           len(weights)) + ', but the layer was expecting ' +
-                       str(len(params)) + ' weights. Provided weights: ' + str(
-                           weights)[:50] + '...')
+                       self.name + '" with a  weight list of length ' +
+                       str(len(weights)) + ', but the layer was expecting ' +
+                       str(len(params)) + ' weights. Provided weights: ' +
+                       str(weights)[:50] + '...')
     if not params:
       return
     weight_value_tuples = []
@@ -1432,6 +1433,8 @@ class Container(Layer):
 
     self.supports_masking = False
     self.trainable = True
+    self._per_input_losses = {}
+    self._per_input_updates = {}
 
     # Container-specific properties.
     if isinstance(inputs, (list, tuple)):
@@ -1482,8 +1485,8 @@ class Container(Layer):
       if not hasattr(x, '_keras_history'):
         cls_name = self.__class__.__name__
         raise TypeError('Input tensors to a ' + cls_name + ' ' +
-                        'must be Keras tensors. Found: ' + str(
-                            x) + ' (missing Keras metadata).')
+                        'must be Keras tensors. Found: ' + str(x) +
+                        ' (missing Keras metadata).')
       # Check that x is an input tensor.
       layer, node_index, tensor_index = x._keras_history
       if len(layer.inbound_nodes) > 1 or (
@@ -1691,8 +1694,8 @@ class Container(Layer):
                                  'cannot obtain value for tensor ' + str(x) +
                                  ' at layer "' + layer.name + '". '
                                  'The following previous layers '
-                                 'were accessed without issue: ' + str(
-                                     layers_with_complete_input))
+                                 'were accessed without issue: ' +
+                                 str(layers_with_complete_input))
           for x in node.output_tensors:
             computable_tensors.append(x)
           layers_with_complete_input.append(layer.name)
@@ -1706,8 +1709,8 @@ class Container(Layer):
     all_names = [layer.name for layer in self.layers]
     for name in all_names:
       if all_names.count(name) != 1:
-        raise RuntimeError('The name "' + name + '" is used ' + str(
-            all_names.count(name)) + ' times in the model. '
+        raise RuntimeError('The name "' + name + '" is used ' +
+                           str(all_names.count(name)) + ' times in the model. '
                            'All layer names should be unique.')
 
     # Layer parameters.
@@ -1756,9 +1759,9 @@ class Container(Layer):
     # without the container being notified of it.
     if index is not None:
       if len(self.layers) <= index:
-        raise ValueError('Was asked to retrieve layer at index ' +
-                         str(index) + ' but model only has ' + str(
-                             len(self.layers)) + ' layers.')
+        raise ValueError('Was asked to retrieve layer at index ' + str(index) +
+                         ' but model only has ' + str(len(self.layers)) +
+                         ' layers.')
       else:
         return self.layers[index]
     else:
@@ -1786,19 +1789,16 @@ class Container(Layer):
     updates = []
     for layer in self.layers:
       if hasattr(layer, 'updates'):
-        if len(layer.inbound_nodes) == 1:
-          updates += layer.updates
-        else:
-          # Collect updates that are dependent on inputs
-          # that are part of the model.
-          for node_index, node in enumerate(layer.inbound_nodes):
-            node_key = layer.name + '_ib-' + str(node_index)
-            if node_key in self.container_nodes:
-              # The model owns this layer node.
-              inputs = node.input_tensors
-              updates += layer.get_updates_for(inputs)
-          # Collect unconditional updates.
-          updates += layer.get_updates_for(None)
+        # Collect updates that are dependent on inputs
+        # that are part of the model.
+        for node_index, node in enumerate(layer.inbound_nodes):
+          node_key = layer.name + '_ib-' + str(node_index)
+          if node_key in self.container_nodes:
+            # The model owns this layer node.
+            inputs = node.input_tensors
+            updates += layer.get_updates_for(inputs)
+        # Collect unconditional updates.
+        updates += layer.get_updates_for(None)
     return updates
 
   @property
@@ -1817,22 +1817,18 @@ class Container(Layer):
     # Retrieve losses for all internal layers.
     for layer in self.layers:
       if hasattr(layer, 'losses'):
-        if len(layer.inbound_nodes) == 1:
-          losses += layer.losses
-        else:
-          # Collect losses that are dependent on inputs
-          # that are part of the model.
-          for node_index, node in enumerate(layer.inbound_nodes):
-            node_key = layer.name + '_ib-' + str(node_index)
-            if node_key in self.container_nodes:
-              # The model owns this layer node.
-              inputs = node.input_tensors
-              losses += layer.get_losses_for(inputs)
-          # Collect unconditional losses.
-          losses += layer.get_losses_for(None)
+        # Collect losses that are dependent on inputs
+        # that are part of the model.
+        for node_index, node in enumerate(layer.inbound_nodes):
+          node_key = layer.name + '_ib-' + str(node_index)
+          if node_key in self.container_nodes:
+            # The model owns this layer node.
+            inputs = node.input_tensors
+            losses += layer.get_losses_for(inputs)
+        # Collect unconditional losses.
+        losses += layer.get_losses_for(None)
     # Add any potential unconditional model-level loss.
-    if hasattr(self, '_per_input_losses'):
-      losses += self._per_input_losses.get(None, [])
+    losses += self.get_losses_for(None)
     return losses
 
   @property
@@ -2009,9 +2005,9 @@ class Container(Layer):
         input_shapes = [None]
 
     if len(input_shapes) != len(self.input_layers):
-      raise ValueError('Invalid input_shape argument ' +
-                       str(input_shape) + ': model has ' + str(
-                           len(self.input_layers)) + ' tensor inputs.')
+      raise ValueError('Invalid input_shape argument ' + str(input_shape) +
+                       ': model has ' + str(len(self.input_layers)) +
+                       ' tensor inputs.')
 
     cache_key = ','.join([str(x) for x in input_shapes])
     if cache_key in self._output_shape_cache:
@@ -2144,6 +2140,7 @@ class Container(Layer):
         for x in reference_input_tensors:
           if str(id(x)) in tensor_map:
             computed_data.append(tensor_map[str(id(x))])
+
         if len(computed_data) == len(reference_input_tensors):
           # call layer
           with K.name_scope(layer.name):
@@ -2171,16 +2168,23 @@ class Container(Layer):
               output_masks = _to_list(
                   layer.compute_mask(computed_tensors, computed_masks))
 
+            # Apply activity regularizer if any:
+            if hasattr(layer, 'activity_regularizer'
+                      ) and layer.activity_regularizer is not None:
+              regularization_losses = [
+                  layer.activity_regularizer(x) for x in computed_tensors
+              ]
+              layer.add_loss(regularization_losses, computed_tensors)
+
           # Update model updates and losses:
-          layer_inputs = [x[0] for x in computed_data]
           # Keep track of updates that depend on the inputs
           # (e.g. BN updates).
-          self.add_update(layer.get_updates_for(layer_inputs), inputs)
+          self.add_update(layer.get_updates_for(computed_tensors), inputs)
           # Keep track of unconditional updates (e.g. a counter).
           self.add_update(layer.get_updates_for(None), None)
           # Keep track of losses that depend on the inputs
           # (e.g. activity regularizers).
-          self.add_loss(layer.get_losses_for(layer_inputs), inputs)
+          self.add_loss(layer.get_losses_for(computed_tensors), inputs)
           # Keep track of unconditional losses
           # (e.g. weight regularizers).
           self.add_loss(layer.get_losses_for(None), None)
@@ -2404,7 +2408,7 @@ class Container(Layer):
       output_tensors.append(layer_output_tensors[tensor_index])
     return cls(inputs=input_tensors, outputs=output_tensors, name=name)
 
-  def save(self, filepath, overwrite=True):
+  def save(self, filepath, overwrite=True, include_optimizer=True):
     """Save the model to a single HDF5 file.
 
     The savefile includes:
@@ -2425,6 +2429,7 @@ class Container(Layer):
         filepath: String, path to the file to save the weights to.
         overwrite: Whether to silently overwrite any existing file at the
             target location, or provide the user with a manual prompt.
+        include_optimizer: If True, save optimizer's state together.
 
     Example:
 
@@ -2440,7 +2445,7 @@ class Container(Layer):
     ```
     """
     from tensorflow.contrib.keras.python.keras.models import save_model  # pylint: disable=g-import-not-at-top
-    save_model(self, filepath, overwrite)
+    save_model(self, filepath, overwrite, include_optimizer)
 
   def save_weights(self, filepath, overwrite=True):
     """Dumps all layer weights to a HDF5 file.
@@ -2869,9 +2874,9 @@ def load_weights_from_hdf5_group(f, layers):
   layer_names = filtered_layer_names
   if len(layer_names) != len(filtered_layers):
     raise ValueError('You are trying to load a weight file '
-                     'containing ' + str(len(
-                         layer_names)) + ' layers into a model with ' + str(
-                             len(filtered_layers)) + ' layers.')
+                     'containing ' + str(len(layer_names)) +
+                     ' layers into a model with ' + str(len(filtered_layers)) +
+                     ' layers.')
 
   # We batch weight value assignments in a single backend call
   # which provides a speedup in TensorFlow.
@@ -2890,8 +2895,8 @@ def load_weights_from_hdf5_group(f, layers):
                        'correspond to layer ' + name + ' in the save file. '
                        'However the new layer ' + layer.name + ' expects ' +
                        str(len(symbolic_weights)) +
-                       ' weights, but the saved weights have ' + str(
-                           len(weight_values)) + ' elements.')
+                       ' weights, but the saved weights have ' +
+                       str(len(weight_values)) + ' elements.')
     weight_value_tuples += zip(symbolic_weights, weight_values)
   K.batch_set_value(weight_value_tuples)
 
@@ -2942,10 +2947,10 @@ def load_weights_from_hdf5_group_by_name(f, layers):
       weight_values = preprocess_weights_for_loading(
           layer, weight_values, original_keras_version, original_backend)
       if len(weight_values) != len(symbolic_weights):
-        raise ValueError('Layer #' + str(
-            k) + ' (named "' + layer.name + '") expects ' + str(
-                len(symbolic_weights)) + ' weight(s), but the saved weights' +
-                         ' have ' + str(len(weight_values)) + ' element(s).')
+        raise ValueError('Layer #' + str(k) + ' (named "' + layer.name +
+                         '") expects ' + str(len(symbolic_weights)) +
+                         ' weight(s), but the saved weights' + ' have ' +
+                         str(len(weight_values)) + ' element(s).')
       # Set values.
       for i in range(len(weight_values)):
         weight_value_tuples.append((symbolic_weights[i], weight_values[i]))
diff --git a/tensorflow/contrib/keras/python/keras/engine/training.py b/tensorflow/contrib/keras/python/keras/engine/training.py
index efd437f6f6..19ac97d24b 100644
--- a/tensorflow/contrib/keras/python/keras/engine/training.py
+++ b/tensorflow/contrib/keras/python/keras/engine/training.py
@@ -84,14 +84,14 @@ def _standardize_input_data(data,
   elif isinstance(data, list):
     if len(data) != len(names):
       if data and hasattr(data[0], 'shape'):
-        raise ValueError('Error when checking ' + exception_prefix +
-                         ': the list of Numpy arrays '
-                         'that you are passing to your model '
-                         'is not the size the model expected. '
-                         'Expected to see ' + str(len(
-                             names)) + ' arrays but instead got '
-                         'the following list of ' + str(len(
-                             data)) + ' arrays: ' + str(data)[:200] + '...')
+        raise ValueError(
+            'Error when checking ' + exception_prefix +
+            ': the list of Numpy arrays '
+            'that you are passing to your model '
+            'is not the size the model expected. '
+            'Expected to see ' + str(len(names)) + ' arrays but instead got '
+            'the following list of ' + str(len(data)) + ' arrays: ' +
+            str(data)[:200] + '...')
       else:
         if len(names) == 1:
           data = [np.asarray(data)]
@@ -100,8 +100,8 @@ def _standardize_input_data(data,
                            ': you are passing a list as '
                            'input to your model, '
                            'but the model expects '
-                           'a list of ' + str(len(
-                               names)) + ' Numpy arrays instead. '
+                           'a list of ' + str(len(names)) +
+                           ' Numpy arrays instead. '
                            'The list you passed was: ' + str(data)[:200])
     arrays = data
   else:
@@ -133,8 +133,8 @@ def _standardize_input_data(data,
       array = arrays[i]
       if len(array.shape) != len(shapes[i]):
         raise ValueError(
-            'Error when checking ' + exception_prefix + ': expected ' + names[
-                i] + ' to have ' + str(len(shapes[i])) +
+            'Error when checking ' + exception_prefix + ': expected ' + names[i]
+            + ' to have ' + str(len(shapes[i])) +
             ' dimensions, but got array with shape ' + str(array.shape))
       for j, (dim, ref_dim) in enumerate(zip(array.shape, shapes[i])):
         if not j and not check_batch_axis:
@@ -143,8 +143,8 @@ def _standardize_input_data(data,
         if ref_dim:
           if ref_dim != dim:
             raise ValueError('Error when checking ' + exception_prefix +
-                             ': expected ' + names[i] + ' to have shape ' + str(
-                                 shapes[i]) + ' but got array with shape ' +
+                             ': expected ' + names[i] + ' to have shape ' +
+                             str(shapes[i]) + ' but got array with shape ' +
                              str(array.shape))
   return arrays
 
@@ -175,9 +175,9 @@ def _standardize_sample_or_class_weights(x_weight, output_names, weight_type):
       return [x_weight]
   if isinstance(x_weight, list):
     if len(x_weight) != len(output_names):
-      raise ValueError('Provided `' + weight_type + '` was a list of ' + str(
-          len(x_weight)) + ' elements, but the model has ' + str(
-              len(output_names)) + ' outputs. '
+      raise ValueError('Provided `' + weight_type + '` was a list of ' +
+                       str(len(x_weight)) + ' elements, but the model has ' +
+                       str(len(output_names)) + ' outputs. '
                        'You should provide one `' + weight_type + '`'
                        'array per model output.')
     return x_weight
@@ -239,9 +239,9 @@ def _check_array_lengths(inputs, targets, weights):
                      'and ' + str(list(set_y)[0]) + ' target samples.')
   if set_y and set_w and list(set_y)[0] != list(set_w)[0]:
     raise ValueError('Sample_weight arrays should have '
-                     'the same number of samples as target arrays. Got ' + str(
-                         list(set_y)[0]) + ' input samples and ' + str(
-                             list(set_w)[0]) + ' target samples.')
+                     'the same number of samples as target arrays. Got ' +
+                     str(list(set_y)[0]) + ' input samples and ' +
+                     str(list(set_w)[0]) + ' target samples.')
 
 
 def _check_loss_and_target_compatibility(targets, loss_fns, output_shapes):
@@ -284,8 +284,8 @@ def _check_loss_and_target_compatibility(targets, loss_fns, output_shapes):
     if loss.__name__ in key_losses:
       for target_dim, out_dim in zip(y.shape[1:], shape[1:]):
         if out_dim is not None and target_dim != out_dim:
-          raise ValueError('A target array with shape ' + str(
-              y.shape) + ' was passed for an output of shape ' + str(shape) +
+          raise ValueError('A target array with shape ' + str(y.shape) +
+                           ' was passed for an output of shape ' + str(shape) +
                            ' while using as loss `' + loss.__name__ + '`. '
                            'This loss expects '
                            'targets to have the same shape '
@@ -535,14 +535,14 @@ def _standardize_weights(y,
                        'outputs that are at least 3D, i.e. that have '
                        'a time dimension.')
     if sample_weight is not None and len(sample_weight.shape) != 2:
-      raise ValueError('Found a sample_weight array with shape ' + str(
-          sample_weight.shape) + '. '
+      raise ValueError('Found a sample_weight array with shape ' +
+                       str(sample_weight.shape) + '. '
                        'In order to use timestep-wise sample weighting, '
                        'you should pass a 2D sample_weight array.')
   else:
     if sample_weight is not None and len(sample_weight.shape) != 1:
-      raise ValueError('Found a sample_weight array with shape ' + str(
-          sample_weight.shape) + '. '
+      raise ValueError('Found a sample_weight array with shape ' +
+                       str(sample_weight.shape) + '. '
                        'In order to use timestep-wise sample weights, '
                        'you should specify '
                        'sample_weight_mode="temporal" '
@@ -552,15 +552,15 @@ def _standardize_weights(y,
 
   if sample_weight is not None:
     if len(sample_weight.shape) > len(y.shape):
-      raise ValueError('Found a sample_weight with shape' + str(
-          sample_weight.shape) + '.'
+      raise ValueError('Found a sample_weight with shape' +
+                       str(sample_weight.shape) + '.'
                        'Expected sample_weight with rank '
                        'less than or equal to ' + str(len(y.shape)))
 
     if y.shape[:sample_weight.ndim] != sample_weight.shape:
-      raise ValueError('Found a sample_weight array with shape ' + str(
-          sample_weight.shape) + ' for an input with shape ' + str(y.shape) +
-                       '. '
+      raise ValueError('Found a sample_weight array with shape ' +
+                       str(sample_weight.shape) + ' for an input with shape ' +
+                       str(y.shape) + '. '
                        'sample_weight cannot be broadcast.')
     return sample_weight
   elif isinstance(class_weight, dict):
@@ -728,8 +728,8 @@ class Model(Container):
         if name not in self.output_names:
           raise ValueError('Unknown entry in loss '
                            'dictionary: "' + name + '". '
-                           'Only expected the following keys: ' + str(
-                               self.output_names))
+                           'Only expected the following keys: ' +
+                           str(self.output_names))
       loss_functions = []
       for name in self.output_names:
         if name not in loss:
@@ -780,8 +780,8 @@ class Model(Container):
         if name not in self.output_names:
           raise ValueError('Unknown entry in loss_weights '
                            'dictionary: "' + name + '". '
-                           'Only expected the following keys: ' + str(
-                               self.output_names))
+                           'Only expected the following keys: ' +
+                           str(self.output_names))
       loss_weights_list = []
       for name in self.output_names:
         loss_weights_list.append(loss_weights.get(name, 1.))
@@ -790,12 +790,12 @@ class Model(Container):
         raise ValueError('When passing a list as loss_weights, '
                          'it should have one entry per model outputs. '
                          'The model has ' + str(len(self.outputs)) +
-                         ' outputs, but you passed loss_weights=' + str(
-                             loss_weights))
+                         ' outputs, but you passed loss_weights=' +
+                         str(loss_weights))
       loss_weights_list = loss_weights
     else:
-      raise TypeError('Could not interpret loss_weights argument: ' + str(
-          loss_weights) + ' - expected a list of dicts.')
+      raise TypeError('Could not interpret loss_weights argument: ' +
+                      str(loss_weights) + ' - expected a list of dicts.')
 
     # Prepare sample weights.
     sample_weights = []
@@ -805,8 +805,8 @@ class Model(Container):
         if name not in self.output_names:
           raise ValueError('Unknown entry in '
                            'sample_weight_mode dictionary: "' + name + '". '
-                           'Only expected the following keys: ' + str(
-                               self.output_names))
+                           'Only expected the following keys: ' +
+                           str(self.output_names))
       for i, name in enumerate(self.output_names):
         if i in skip_indices:
           weight = None
@@ -940,8 +940,8 @@ class Model(Container):
           # (because of class mode duality)
           output_shape = self.internal_output_shapes[i]
           acc_fn = None
-          if output_shape[-1] == 1 or self.loss_functions[
-              i] == losses.binary_crossentropy:
+          if (output_shape[-1] == 1 or
+              self.loss_functions[i] == losses.binary_crossentropy):
             # case: binary accuracy
             acc_fn = metrics_module.binary_accuracy
           elif self.loss_functions[i] == losses.sparse_categorical_crossentropy:
@@ -1320,8 +1320,8 @@ class Model(Container):
         raise ValueError('In a stateful network, '
                          'you should only pass inputs with '
                          'a number of samples that can be '
-                         'divided by the batch size. Found: ' + str(
-                             x[0].shape[0]) + ' samples')
+                         'divided by the batch size. Found: ' +
+                         str(x[0].shape[0]) + ' samples')
     return x, y, sample_weights
 
   def fit(self,
@@ -1412,11 +1412,11 @@ class Model(Container):
       elif len(validation_data) == 3:
         val_x, val_y, val_sample_weight = validation_data  # pylint: disable=unpacking-non-sequence
       else:
-        raise ValueError('When passing validation_data, '
-                         'it must contain 2 (x_val, y_val) '
-                         'or 3 (x_val, y_val, val_sample_weights) '
-                         'items, however it contains %d items' %
-                         len(validation_data))
+        raise ValueError(
+            'When passing validation_data, '
+            'it must contain 2 (x_val, y_val) '
+            'or 3 (x_val, y_val, val_sample_weights) '
+            'items, however it contains %d items' % len(validation_data))
 
       val_x, val_y, val_sample_weights = self._standardize_user_data(
           val_x,
@@ -1567,8 +1567,8 @@ class Model(Container):
         raise ValueError('In a stateful network, '
                          'you should only pass inputs with '
                          'a number of samples that can be '
-                         'divided by the batch size. Found: ' + str(
-                             x[0].shape[0]) + ' samples. '
+                         'divided by the batch size. Found: ' +
+                         str(x[0].shape[0]) + ' samples. '
                          'Batch size: ' + str(batch_size) + '.')
 
     # prepare inputs, delegate logic to _predict_loop
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional.py b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
index 1a28399a28..b4fa58e736 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
@@ -1110,17 +1110,17 @@ class UpSampling2D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      height = self.size[0] * input_shape[2] if input_shape[
-          2] is not None else None
-      width = self.size[1] * input_shape[3] if input_shape[
-          3] is not None else None
+      height = self.size[0] * input_shape[
+          2] if input_shape[2] is not None else None
+      width = self.size[1] * input_shape[
+          3] if input_shape[3] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], height, width])
     else:
-      height = self.size[0] * input_shape[1] if input_shape[
-          1] is not None else None
-      width = self.size[1] * input_shape[2] if input_shape[
-          2] is not None else None
+      height = self.size[0] * input_shape[
+          1] if input_shape[1] is not None else None
+      width = self.size[1] * input_shape[
+          2] if input_shape[2] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], height, width, input_shape[3]])
 
@@ -1177,21 +1177,21 @@ class UpSampling3D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      dim1 = self.size[0] * input_shape[2] if input_shape[
-          2] is not None else None
-      dim2 = self.size[1] * input_shape[3] if input_shape[
-          3] is not None else None
-      dim3 = self.size[2] * input_shape[4] if input_shape[
-          4] is not None else None
+      dim1 = self.size[0] * input_shape[
+          2] if input_shape[2] is not None else None
+      dim2 = self.size[1] * input_shape[
+          3] if input_shape[3] is not None else None
+      dim3 = self.size[2] * input_shape[
+          4] if input_shape[4] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], dim1, dim2, dim3])
     else:
-      dim1 = self.size[0] * input_shape[1] if input_shape[
-          1] is not None else None
-      dim2 = self.size[1] * input_shape[2] if input_shape[
-          2] is not None else None
-      dim3 = self.size[2] * input_shape[3] if input_shape[
-          3] is not None else None
+      dim1 = self.size[0] * input_shape[
+          1] if input_shape[1] is not None else None
+      dim2 = self.size[1] * input_shape[
+          2] if input_shape[2] is not None else None
+      dim3 = self.size[2] * input_shape[
+          3] if input_shape[3] is not None else None
       return tensor_shape.TensorShape(
           [input_shape[0], dim1, dim2, dim3, input_shape[4]])
 
@@ -1230,9 +1230,10 @@ class ZeroPadding1D(Layer):
     self.input_spec = InputSpec(ndim=3)
 
   def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    length = input_shape[1] + self.padding[0] + self.padding[1] if input_shape[
-        1] is not None else None
+    if input_shape[1] is not None:
+      length = input_shape[1] + self.padding[0] + self.padding[1]
+    else:
+      length = None
     return tensor_shape.TensorShape([input_shape[0], length, input_shape[2]])
 
   def call(self, inputs):
@@ -1313,17 +1314,25 @@ class ZeroPadding2D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      rows = input_shape[2] + self.padding[0][0] + self.padding[0][
-          1] if input_shape[2] is not None else None
-      cols = input_shape[3] + self.padding[1][0] + self.padding[1][
-          1] if input_shape[3] is not None else None
+      if input_shape[2] is not None:
+        rows = input_shape[2] + self.padding[0][0] + self.padding[0][1]
+      else:
+        rows = None
+      if input_shape[3] is not None:
+        cols = input_shape[3] + self.padding[1][0] + self.padding[1][1]
+      else:
+        cols = None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], rows, cols])
-    else:
-      rows = input_shape[1] + self.padding[0][0] + self.padding[0][
-          1] if input_shape[1] is not None else None
-      cols = input_shape[2] + self.padding[1][0] + self.padding[1][
-          1] if input_shape[2] is not None else None
+    elif self.data_format == 'channels_last':
+      if input_shape[1] is not None:
+        rows = input_shape[1] + self.padding[0][0] + self.padding[0][1]
+      else:
+        rows = None
+      if input_shape[2] is not None:
+        cols = input_shape[2] + self.padding[1][0] + self.padding[1][1]
+      else:
+        cols = None
       return tensor_shape.TensorShape(
           [input_shape[0], rows, cols, input_shape[3]])
 
@@ -1414,21 +1423,33 @@ class ZeroPadding3D(Layer):
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     if self.data_format == 'channels_first':
-      dim1 = input_shape[2] + 2 * self.padding[0][0] if input_shape[
-          2] is not None else None
-      dim2 = input_shape[3] + 2 * self.padding[1][0] if input_shape[
-          3] is not None else None
-      dim3 = input_shape[4] + 2 * self.padding[2][0] if input_shape[
-          4] is not None else None
+      if input_shape[2] is not None:
+        dim1 = input_shape[2] + 2 * self.padding[0][0]
+      else:
+        dim1 = None
+      if input_shape[3] is not None:
+        dim2 = input_shape[3] + 2 * self.padding[1][0]
+      else:
+        dim2 = None
+      if input_shape[4] is not None:
+        dim3 = input_shape[4] + 2 * self.padding[2][0]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], dim1, dim2, dim3])
-    else:
-      dim1 = input_shape[1] + 2 * self.padding[0][1] if input_shape[
-          1] is not None else None
-      dim2 = input_shape[2] + 2 * self.padding[1][1] if input_shape[
-          2] is not None else None
-      dim3 = input_shape[3] + 2 * self.padding[2][1] if input_shape[
-          3] is not None else None
+    elif self.data_format == 'channels_last':
+      if input_shape[1] is not None:
+        dim1 = input_shape[1] + 2 * self.padding[0][1]
+      else:
+        dim1 = None
+      if input_shape[2] is not None:
+        dim2 = input_shape[2] + 2 * self.padding[1][1]
+      else:
+        dim2 = None
+      if input_shape[3] is not None:
+        dim3 = input_shape[3] + 2 * self.padding[2][1]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], dim1, dim2, dim3, input_shape[4]])
 
@@ -1700,21 +1721,33 @@ class Cropping3D(Layer):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     # pylint: disable=invalid-unary-operand-type
     if self.data_format == 'channels_first':
-      dim1 = input_shape[2] - self.cropping[0][0] - self.cropping[0][
-          1] if input_shape[2] is not None else None
-      dim2 = input_shape[3] - self.cropping[1][0] - self.cropping[1][
-          1] if input_shape[3] is not None else None
-      dim3 = input_shape[4] - self.cropping[2][0] - self.cropping[2][
-          1] if input_shape[4] is not None else None
+      if input_shape[2] is not None:
+        dim1 = input_shape[2] - self.cropping[0][0] - self.cropping[0][1]
+      else:
+        dim1 = None
+      if input_shape[3] is not None:
+        dim2 = input_shape[3] - self.cropping[1][0] - self.cropping[1][1]
+      else:
+        dim2 = None
+      if input_shape[4] is not None:
+        dim3 = input_shape[4] - self.cropping[2][0] - self.cropping[2][1]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], input_shape[1], dim1, dim2, dim3])
-    else:
-      dim1 = input_shape[1] - self.cropping[0][0] - self.cropping[0][
-          1] if input_shape[1] is not None else None
-      dim2 = input_shape[2] - self.cropping[1][0] - self.cropping[1][
-          1] if input_shape[2] is not None else None
-      dim3 = input_shape[3] - self.cropping[2][0] - self.cropping[2][
-          1] if input_shape[3] is not None else None
+    elif self.data_format == 'channels_last':
+      if input_shape[1] is not None:
+        dim1 = input_shape[1] - self.cropping[0][0] - self.cropping[0][1]
+      else:
+        dim1 = None
+      if input_shape[2] is not None:
+        dim2 = input_shape[2] - self.cropping[1][0] - self.cropping[1][1]
+      else:
+        dim2 = None
+      if input_shape[3] is not None:
+        dim3 = input_shape[3] - self.cropping[2][0] - self.cropping[2][1]
+      else:
+        dim3 = None
       return tensor_shape.TensorShape(
           [input_shape[0], dim1, dim2, dim3, input_shape[4]])
     # pylint: enable=invalid-unary-operand-type
@@ -1738,14 +1771,14 @@ class Cropping3D(Layer):
         return inputs[:, :, self.cropping[0][0]:, self.cropping[1][
             0]:-self.cropping[1][1], self.cropping[2][0]:-self.cropping[2][1]]
       elif self.cropping[1][1] == 0:
-        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:, self.cropping[2][0]:-self.cropping[2][1]]
+        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][1], self.
+                      cropping[1][0]:, self.cropping[2][0]:-self.cropping[2][1]]
       elif self.cropping[2][1] == 0:
-        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][0]:]
-      return inputs[:, :, self.cropping[0][0]:-self.cropping[0][
-          1], self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][0]:
-                    -self.cropping[2][1]]
+        return inputs[:, :, self.cropping[0][0]:-self.cropping[0][1], self.
+                      cropping[1][0]:-self.cropping[1][1], self.cropping[2][0]:]
+      return inputs[:, :, self.cropping[0][0]:-self.cropping[0][1],
+                    self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][
+                        0]:-self.cropping[2][1]]
     else:
       if self.cropping[0][1] == self.cropping[1][1] == self.cropping[2][1] == 0:
         return inputs[:, self.cropping[0][0]:, self.cropping[1][0]:,
@@ -1761,19 +1794,19 @@ class Cropping3D(Layer):
                       -self.cropping[1][1], self.cropping[2][0]:, :]
       elif self.cropping[0][1] == 0:
         return inputs[:, self.cropping[0][0]:, self.cropping[1][
-            0]:-self.cropping[1][1], self.cropping[2][0]:-self.cropping[2][
-                1], :]
+            0]:-self.cropping[1][1], self.cropping[2][0]:
+                      -self.cropping[2][1], :]
       elif self.cropping[1][1] == 0:
-        return inputs[:, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:, self.cropping[2][0]:-self.cropping[2][
-                1], :]
+        return inputs[:, self.cropping[0][
+            0]:-self.cropping[0][1], self.cropping[1][0]:, self.cropping[2][0]:
+                      -self.cropping[2][1], :]
       elif self.cropping[2][1] == 0:
-        return inputs[:, self.cropping[0][0]:-self.cropping[0][
-            1], self.cropping[1][0]:-self.cropping[1][1], self.cropping[2][
-                0]:, :]
+        return inputs[:, self.cropping[0][0]:-self.cropping[0][1],
+                      self.cropping[1][0]:-self.cropping[1][1], self.cropping[
+                          2][0]:, :]
       return inputs[:, self.cropping[0][0]:-self.cropping[0][1], self.cropping[
-          1][0]:-self.cropping[1][1], self.cropping[2][0]:-self.cropping[2][  # pylint: disable=invalid-unary-operand-type
-              1], :]
+          1][0]:-self.cropping[1][1], self.cropping[2][0]:  # pylint: disable=invalid-unary-operand-type
+                    -self.cropping[2][1], :]  # pylint: disable=invalid-unary-operand-type
     # pylint: enable=invalid-unary-operand-type
 
   def get_config(self):
diff --git a/tensorflow/contrib/keras/python/keras/layers/embeddings.py b/tensorflow/contrib/keras/python/keras/layers/embeddings.py
index 5ba7d7db8a..12a2ce39eb 100644
--- a/tensorflow/contrib/keras/python/keras/layers/embeddings.py
+++ b/tensorflow/contrib/keras/python/keras/layers/embeddings.py
@@ -53,8 +53,8 @@ class Embedding(Layer):
   ```
 
   Arguments:
-    input_dim: int > 0. Size of the vocabulary, ie.
-        1 + maximum integer index occurring in the input data.
+    input_dim: int > 0. Size of the vocabulary,
+        i.e. maximum integer index + 1.
     output_dim: int >= 0. Dimension of the dense embedding.
     embeddings_initializer: Initializer for the `embeddings` matrix.
     embeddings_regularizer: Regularizer function applied to
@@ -68,7 +68,8 @@ class Embedding(Layer):
         If this is `True` then all subsequent layers
         in the model need to support masking or an exception will be raised.
         If mask_zero is set to True, as a consequence, index 0 cannot be
-        used in the vocabulary (input_dim should equal `|vocabulary| + 2`).
+        used in the vocabulary (input_dim should equal size of
+        vocabulary + 1).
     input_length: Length of input sequences, when it is constant.
         This argument is required if you are going to connect
         `Flatten` then `Dense` layers upstream
diff --git a/tensorflow/contrib/keras/python/keras/layers/local.py b/tensorflow/contrib/keras/python/keras/layers/local.py
index 3bf5ee4f0f..0dc140bcb3 100644
--- a/tensorflow/contrib/keras/python/keras/layers/local.py
+++ b/tensorflow/contrib/keras/python/keras/layers/local.py
@@ -336,8 +336,9 @@ class LocallyConnected2D(Layer):
                                                self.padding, self.strides[1])
     self.output_row = output_row
     self.output_col = output_col
-    self.kernel_shape = (output_row * output_col, self.kernel_size[0] *
-                         self.kernel_size[1] * input_filter, self.filters)
+    self.kernel_shape = (
+        output_row * output_col,
+        self.kernel_size[0] * self.kernel_size[1] * input_filter, self.filters)
     self.kernel = self.add_weight(
         self.kernel_shape,
         initializer=self.kernel_initializer,
diff --git a/tensorflow/contrib/keras/python/keras/layers/merge.py b/tensorflow/contrib/keras/python/keras/layers/merge.py
index eea4313d31..1da4a9d20d 100644
--- a/tensorflow/contrib/keras/python/keras/layers/merge.py
+++ b/tensorflow/contrib/keras/python/keras/layers/merge.py
@@ -41,6 +41,44 @@ class _Merge(Layer):
   def _merge_function(self, inputs):
     raise NotImplementedError
 
+  def _compute_elemwise_op_output_shape(self, shape1, shape2):
+    """Computes the shape of the resultant of an elementwise operation.
+
+    Arguments:
+        shape1: tuple or None. Shape of the first tensor
+        shape2: tuple or None. Shape of the second tensor
+
+    Returns:
+        expected output shape when an element-wise operation is
+        carried out on 2 tensors with shapes shape1 and shape2.
+        tuple or None.
+
+    Raises:
+        ValueError: if shape1 and shape2 are not compatible for
+            element-wise operations.
+    """
+    if None in [shape1, shape2]:
+      return None
+    elif len(shape1) < len(shape2):
+      return self._compute_elemwise_op_output_shape(shape2, shape1)
+    elif not shape2:
+      return shape1
+    output_shape = list(shape1[:-len(shape2)])
+    for i, j in zip(shape1[-len(shape2):], shape2):
+      if i is None or j is None:
+        output_shape.append(None)
+      elif i == 1:
+        output_shape.append(j)
+      elif j == 1:
+        output_shape.append(i)
+      else:
+        if i != j:
+          raise ValueError('Operands could not be broadcast '
+                           'together with shapes ' + str(shape1) + ' ' +
+                           str(shape2))
+        output_shape.append(i)
+    return tuple(output_shape)
+
   def build(self, input_shape):
     # Used purely for shape validation.
     if not isinstance(input_shape, list):
@@ -49,20 +87,29 @@ class _Merge(Layer):
       raise ValueError('A merge layer should be called '
                        'on a list of at least 2 inputs. '
                        'Got ' + str(len(input_shape)) + ' inputs.')
-    if all([shape is None for shape in input_shape]):
-      return
-    input_shapes = [
-        tuple(tensor_shape.TensorShape(shape).as_list())
-        for shape in input_shape
-    ]
-    # TODO(fchollet): handle shapes with None entries.
-    input_shapes_set = set(input_shapes)
-    if None in input_shapes_set:
-      input_shapes_set.remove(None)
-    if len(input_shapes_set) > 1:
-      raise ValueError('Only tensors of same shape can '
-                       'be merged by layer' + self.name +
-                       ' Got input shapes: %s' % input_shapes)
+    batch_sizes = [s[0] for s in input_shape if s is not None]
+    batch_sizes = set(batch_sizes)
+    batch_sizes -= set([None])
+    if len(batch_sizes) > 1:
+      raise ValueError('Can not merge tensors with different '
+                       'batch sizes. Got tensors with shapes : ' +
+                       str(input_shape))
+    if input_shape[0] is None:
+      output_shape = None
+    else:
+      output_shape = input_shape[0][1:]
+    for i in range(1, len(input_shape)):
+      if input_shape[i] is None:
+        shape = None
+      else:
+        shape = input_shape[i][1:]
+      output_shape = self._compute_elemwise_op_output_shape(output_shape, shape)
+    # If the inputs have different ranks, we have to reshape them
+    # to make them broadcastable.
+    if None not in input_shape and len(set(map(len, input_shape))) == 1:
+      self._reshape_required = False
+    else:
+      self._reshape_required = True
 
   def call(self, inputs):
     return self._merge_function(inputs)
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index 41c618cc79..905b99ece8 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -109,8 +109,8 @@ class BatchNormalization(Layer):
     if dim is None:
       raise ValueError('Axis ' + str(self.axis) + ' of '
                        'input tensor should have a defined dimension '
-                       'but the layer received an input with shape ' + str(
-                           input_shape) + '.')
+                       'but the layer received an input with shape ' +
+                       str(input_shape) + '.')
     self.input_spec = InputSpec(ndim=len(input_shape), axes={self.axis: dim})
     shape = (dim,)
 
diff --git a/tensorflow/contrib/keras/python/keras/layers/recurrent.py b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
index 06986d3eaa..751636ad88 100644
--- a/tensorflow/contrib/keras/python/keras/layers/recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
@@ -296,9 +296,9 @@ class Recurrent(Layer):
       initial_states = self.get_initial_states(inputs)
 
     if len(initial_states) != len(self.states):
-      raise ValueError('Layer has ' + str(
-          len(self.states)) + ' states but was passed ' + str(
-              len(initial_states)) + ' initial states.')
+      raise ValueError('Layer has ' + str(len(self.states)) +
+                       ' states but was passed ' + str(len(initial_states)) +
+                       ' initial states.')
     input_shape = K.int_shape(inputs)
     if self.unroll and input_shape[1] is None:
       raise ValueError('Cannot unroll a RNN if the '
@@ -372,8 +372,8 @@ class Recurrent(Layer):
       if states_value:
         value = states_value[i]
         if value.shape != (batch_size, self.units):
-          raise ValueError('Expected state #' + str(
-              i) + ' to have shape ' + str((batch_size, self.units)) +
+          raise ValueError('Expected state #' + str(i) + ' to have shape ' +
+                           str((batch_size, self.units)) +
                            ' but got array with shape ' + str(value.shape))
       else:
         value = np.zeros((batch_size, self.units))
@@ -738,8 +738,8 @@ class GRU(Recurrent):
     self.kernel_z = self.kernel[:, :self.units]
     self.recurrent_kernel_z = self.recurrent_kernel[:, :self.units]
     self.kernel_r = self.kernel[:, self.units:self.units * 2]
-    self.recurrent_kernel_r = self.recurrent_kernel[:, self.units:self.units *
-                                                    2]
+    self.recurrent_kernel_r = self.recurrent_kernel[:, self.units:
+                                                    self.units * 2]
     self.kernel_h = self.kernel[:, self.units * 2:]
     self.recurrent_kernel_h = self.recurrent_kernel[:, self.units * 2:]
 
@@ -1061,10 +1061,10 @@ class LSTM(Recurrent):
     self.kernel_o = self.kernel[:, self.units * 3:]
 
     self.recurrent_kernel_i = self.recurrent_kernel[:, :self.units]
-    self.recurrent_kernel_f = self.recurrent_kernel[:, self.units:self.units *
-                                                    2]
-    self.recurrent_kernel_c = self.recurrent_kernel[:, self.units * 2:self.units
-                                                    * 3]
+    self.recurrent_kernel_f = self.recurrent_kernel[:, self.units:
+                                                    self.units * 2]
+    self.recurrent_kernel_c = self.recurrent_kernel[:, self.units * 2:
+                                                    self.units * 3]
     self.recurrent_kernel_o = self.recurrent_kernel[:, self.units * 3:]
 
     if self.use_bias:
@@ -1199,8 +1199,8 @@ class LSTM(Recurrent):
                                                 self.recurrent_kernel_i))
       f = self.recurrent_activation(x_f + K.dot(h_tm1 * rec_dp_mask[1],
                                                 self.recurrent_kernel_f))
-      c = f * c_tm1 + i * self.activation(x_c + K.dot(h_tm1 * rec_dp_mask[2],
-                                                      self.recurrent_kernel_c))
+      c = f * c_tm1 + i * self.activation(
+          x_c + K.dot(h_tm1 * rec_dp_mask[2], self.recurrent_kernel_c))
       o = self.recurrent_activation(x_o + K.dot(h_tm1 * rec_dp_mask[3],
                                                 self.recurrent_kernel_o))
     h = o * self.activation(c)
diff --git a/tensorflow/contrib/keras/python/keras/layers/wrappers.py b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
index 75b4810e40..674c559a72 100644
--- a/tensorflow/contrib/keras/python/keras/layers/wrappers.py
+++ b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
@@ -42,19 +42,53 @@ class Wrapper(Layer):
     super(Wrapper, self).__init__(**kwargs)
 
   def build(self, input_shape=None):
-    # Assumes that self.layer is already set.
-    # Should be called at the end of .build() in the children classes.
-    self.trainable_weights = getattr(self.layer, 'trainable_weights', [])
-    self.non_trainable_weights = getattr(self.layer, 'non_trainable_weights',
-                                         [])
-    self.updates = getattr(self.layer, 'updates', [])
-    self.losses = getattr(self.layer, 'losses', [])
-    self.constraints = getattr(self.layer, 'constraints', {})
     self.built = True
 
+  @property
+  def activity_regularizer(self):
+    if hasattr(self.layer, 'activity_regularizer'):
+      return self.layer.activity_regularizer
+    else:
+      return None
+
+  @property
+  def trainable_weights(self):
+    return self.layer.trainable_weights
+
+  @property
+  def non_trainable_weights(self):
+    return self.layer.non_trainable_weights
+
+  @property
+  def updates(self):
+    if hasattr(self.layer, 'updates'):
+      return self.layer.updates
+    return []
+
+  def get_updates_for(self, inputs=None):
+    if inputs is None:
+      updates = self.layer.get_updates_for(None)
+      return updates + super(Wrapper, self).get_updates_for(None)
+    return super(Wrapper, self).get_updates_for(inputs)
+
+  @property
+  def losses(self):
+    if hasattr(self.layer, 'losses'):
+      return self.layer.losses
+    return []
+
+  def get_losses_for(self, inputs=None):
+    if inputs is None:
+      losses = self.layer.get_losses_for(None)
+      return losses + super(Wrapper, self).get_losses_for(None)
+    return super(Wrapper, self).get_losses_for(inputs)
+
+  @property
+  def constraints(self):
+    return self.layer.constraints
+
   def get_weights(self):
-    weights = self.layer.get_weights()
-    return weights
+    return self.layer.get_weights()
 
   def set_weights(self, weights):
     self.layer.set_weights(weights)
@@ -132,8 +166,8 @@ class TimeDistributed(Wrapper):
 
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    child_input_shape = tensor_shape.TensorShape([input_shape[0]] + input_shape[
-        2:])
+    child_input_shape = tensor_shape.TensorShape([input_shape[0]] +
+                                                 input_shape[2:])
     child_output_shape = self.layer._compute_output_shape(  # pylint: disable=protected-access
         child_input_shape).as_list()
     timesteps = input_shape[1]
diff --git a/tensorflow/contrib/keras/python/keras/models.py b/tensorflow/contrib/keras/python/keras/models.py
index 2be4431d03..7ac78784ca 100644
--- a/tensorflow/contrib/keras/python/keras/models.py
+++ b/tensorflow/contrib/keras/python/keras/models.py
@@ -50,7 +50,7 @@ except ImportError:
 # pylint: enable=g-import-not-at-top
 
 
-def save_model(model, filepath, overwrite=True):
+def save_model(model, filepath, overwrite=True, include_optimizer=True):
   """Save a model to a HDF5 file.
 
   The saved model contains:
@@ -68,6 +68,7 @@ def save_model(model, filepath, overwrite=True):
       overwrite: Whether we should overwrite any existing
           model at the target location, or instead
           ask the user with a manual prompt.
+      include_optimizer: If True, save optimizer's state together.
 
   Raises:
       ImportError: if h5py is not available.
@@ -129,7 +130,7 @@ def save_model(model, filepath, overwrite=True):
   model_layers = model.layers
   topology.save_weights_to_hdf5_group(model_weights_group, model_layers)
 
-  if hasattr(model, 'optimizer'):
+  if include_optimizer and hasattr(model, 'optimizer'):
     if isinstance(model.optimizer, optimizers.TFOptimizer):
       warnings.warn(
           'TensorFlow optimizers do not '
@@ -234,7 +235,14 @@ def load_model(filepath, custom_objects=None):
     if isinstance(obj, dict):
       deserialized = {}
       for key, value in obj.items():
-        if value in custom_objects:
+        deserialized[key] = []
+        if isinstance(value, list):
+          for element in value:
+            if element in custom_objects:
+              deserialized[key].append(custom_objects[element])
+            else:
+              deserialized[key].append(element)
+        elif value in custom_objects:
           deserialized[key] = custom_objects[value]
         else:
           deserialized[key] = value
diff --git a/tensorflow/contrib/keras/python/keras/optimizers.py b/tensorflow/contrib/keras/python/keras/optimizers.py
index b50c18b0e1..75fce5c96f 100644
--- a/tensorflow/contrib/keras/python/keras/optimizers.py
+++ b/tensorflow/contrib/keras/python/keras/optimizers.py
@@ -596,8 +596,9 @@ class Nadam(Optimizer):
     # Due to the recommendations in [2], i.e. warming momentum schedule
     momentum_cache_t = self.beta_1 * (1. - 0.5 *
                                       (K.pow(0.96, t * self.schedule_decay)))
-    momentum_cache_t_1 = self.beta_1 * (
-        1. - 0.5 * (K.pow(0.96, (t + 1) * self.schedule_decay)))
+    momentum_cache_t_1 = self.beta_1 * (1. - 0.5 *
+                                        (K.pow(0.96,
+                                               (t + 1) * self.schedule_decay)))
     m_schedule_new = self.m_schedule * momentum_cache_t
     m_schedule_next = self.m_schedule * momentum_cache_t * momentum_cache_t_1
     self.updates.append((self.m_schedule, m_schedule_new))
@@ -615,8 +616,8 @@ class Nadam(Optimizer):
       m_t_prime = m_t / (1. - m_schedule_next)
       v_t = self.beta_2 * v + (1. - self.beta_2) * K.square(g)
       v_t_prime = v_t / (1. - K.pow(self.beta_2, t))
-      m_t_bar = (1. - momentum_cache_t
-                ) * g_prime + momentum_cache_t_1 * m_t_prime
+      m_t_bar = (
+          1. - momentum_cache_t) * g_prime + momentum_cache_t_1 * m_t_prime
 
       self.updates.append(K.update(m, m_t))
       self.updates.append(K.update(v, v_t))
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/image.py b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
index 86c7650a07..5bec447ee6 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/image.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/image.py
@@ -711,8 +711,8 @@ class ImageDataGenerator(object):
           'following the data format convention "' + self.data_format + '" '
           '(channels on axis ' + str(self.channel_axis) + '), i.e. expected '
           'either 1, 3 or 4 channels on axis ' + str(self.channel_axis) + '. '
-          'However, it was passed an array with shape ' + str(
-              x.shape) + ' (' + str(x.shape[self.channel_axis]) + ' channels).')
+          'However, it was passed an array with shape ' + str(x.shape) + ' (' +
+          str(x.shape[self.channel_axis]) + ' channels).')
 
     if seed is not None:
       np.random.seed(seed)
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/text.py b/tensorflow/contrib/keras/python/keras/preprocessing/text.py
index b164b613d2..5b89c8035c 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/text.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/text.py
@@ -280,8 +280,8 @@ class Tokenizer(object):
           # Use weighting scheme 2 in
           # https://en.wikipedia.org/wiki/Tf%E2%80%93idf
           tf = 1 + np.log(c)
-          idf = np.log(1 + self.document_count / (1 + self.index_docs.get(j, 0)
-                                                 ))
+          idf = np.log(1 + self.document_count /
+                       (1 + self.index_docs.get(j, 0)))
           x[i][j] = tf * idf
         else:
           raise ValueError('Unknown vectorization mode:', mode)
diff --git a/tensorflow/contrib/keras/python/keras/utils/conv_utils.py b/tensorflow/contrib/keras/python/keras/utils/conv_utils.py
index ffc131ec4f..7d4fdda296 100644
--- a/tensorflow/contrib/keras/python/keras/utils/conv_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/conv_utils.py
@@ -47,11 +47,11 @@ def normalize_tuple(value, n, name):
     try:
       value_tuple = tuple(value)
     except TypeError:
-      raise ValueError('The `' + name + '` argument must be a tuple of ' + str(
-          n) + ' integers. Received: ' + str(value))
+      raise ValueError('The `' + name + '` argument must be a tuple of ' +
+                       str(n) + ' integers. Received: ' + str(value))
     if len(value_tuple) != n:
-      raise ValueError('The `' + name + '` argument must be a tuple of ' + str(
-          n) + ' integers. Received: ' + str(value))
+      raise ValueError('The `' + name + '` argument must be a tuple of ' +
+                       str(n) + ' integers. Received: ' + str(value))
     for single_value in value_tuple:
       try:
         int(single_value)
@@ -69,8 +69,8 @@ def normalize_data_format(value):
   data_format = value.lower()
   if data_format not in {'channels_first', 'channels_last'}:
     raise ValueError('The `data_format` argument must be one of '
-                     '"channels_first", "channels_last". Received: ' + str(
-                         value))
+                     '"channels_first", "channels_last". Received: ' +
+                     str(value))
   return data_format
 
 
diff --git a/tensorflow/contrib/keras/python/keras/utils/data_utils.py b/tensorflow/contrib/keras/python/keras/utils/data_utils.py
index b2d5427c97..5a42444308 100644
--- a/tensorflow/contrib/keras/python/keras/utils/data_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/data_utils.py
@@ -23,7 +23,9 @@ import os
 import shutil
 import sys
 import tarfile
+import zipfile
 
+import six
 from six.moves.urllib.error import HTTPError
 from six.moves.urllib.error import URLError
 from six.moves.urllib.request import urlopen
@@ -73,24 +75,108 @@ else:
   from six.moves.urllib.request import urlretrieve  # pylint: disable=g-import-not-at-top
 
 
-def get_file(fname, origin, untar=False, md5_hash=None,
-             cache_subdir='datasets'):
+def _extract_archive(file_path, path='.', archive_format='auto'):
+  """Extracts an archive if it matches tar, tar.gz, tar.bz, or zip formats.
+
+  Arguments:
+      file_path: path to the archive file
+      path: path to extract the archive file
+      archive_format: Archive format to try for extracting the file.
+          Options are 'auto', 'tar', 'zip', and None.
+          'tar' includes tar, tar.gz, and tar.bz files.
+          The default 'auto' is ['tar', 'zip'].
+          None or an empty list will return no matches found.
+
+  Returns:
+      True if a match was found and an archive extraction was completed,
+      False otherwise.
+  """
+  if archive_format is None:
+    return False
+  if archive_format is 'auto':
+    archive_format = ['tar', 'zip']
+  if isinstance(archive_format, six.string_types):
+    archive_format = [archive_format]
+
+  for archive_type in archive_format:
+    if archive_type is 'tar':
+      open_fn = tarfile.open
+      is_match_fn = tarfile.is_tarfile
+    if archive_type is 'zip':
+      open_fn = zipfile.ZipFile
+      is_match_fn = zipfile.is_zipfile
+
+    if is_match_fn(file_path):
+      with open_fn(file_path) as archive:
+        try:
+          archive.extractall(path)
+        except (tarfile.TarError, RuntimeError, KeyboardInterrupt):
+          if os.path.exists(path):
+            if os.path.isfile(path):
+              os.remove(path)
+            else:
+              shutil.rmtree(path)
+          raise
+      return True
+  return False
+
+
+def get_file(fname,
+             origin,
+             untar=False,
+             md5_hash=None,
+             file_hash=None,
+             cache_subdir='datasets',
+             hash_algorithm='auto',
+             extract=False,
+             archive_format='auto',
+             cache_dir=None):
   """Downloads a file from a URL if it not already in the cache.
 
-  Passing the MD5 hash will verify the file after download
-  as well as if it is already present in the cache.
+  By default the file at the url `origin` is downloaded to the
+  cache_dir `~/.keras`, placed in the cache_subdir `datasets`,
+  and given the filename `fname`. The final location of a file
+  `example.txt` would therefore be `~/.keras/datasets/example.txt`.
+
+  Files in tar, tar.gz, tar.bz, and zip formats can also be extracted.
+  Passing a hash will verify the file after download. The command line
+  programs `shasum` and `sha256sum` can compute the hash.
 
   Arguments:
-      fname: name of the file
-      origin: original URL of the file
-      untar: boolean, whether the file should be decompressed
-      md5_hash: MD5 hash of the file for verification
-      cache_subdir: directory being used as the cache
+      fname: Name of the file. If an absolute path `/path/to/file.txt` is
+          specified the file will be saved at that location.
+      origin: Original URL of the file.
+      untar: Deprecated in favor of 'extract'.
+          boolean, whether the file should be decompressed
+      md5_hash: Deprecated in favor of 'file_hash'.
+          md5 hash of the file for verification
+      file_hash: The expected hash string of the file after download.
+          The sha256 and md5 hash algorithms are both supported.
+      cache_subdir: Subdirectory under the Keras cache dir where the file is
+          saved. If an absolute path `/path/to/folder` is
+          specified the file will be saved at that location.
+      hash_algorithm: Select the hash algorithm to verify the file.
+          options are 'md5', 'sha256', and 'auto'.
+          The default 'auto' detects the hash algorithm in use.
+      extract: True tries extracting the file as an Archive, like tar or zip.
+      archive_format: Archive format to try for extracting the file.
+          Options are 'auto', 'tar', 'zip', and None.
+          'tar' includes tar, tar.gz, and tar.bz files.
+          The default 'auto' is ['tar', 'zip'].
+          None or an empty list will return no matches found.
+      cache_dir: Location to store cached files, when None it
+          defaults to the [Keras
+            Directory](/faq/#where-is-the-keras-configuration-filed-stored).
 
   Returns:
       Path to the downloaded file
   """
-  datadir_base = os.path.expanduser(os.path.join('~', '.keras'))
+  if cache_dir is None:
+    cache_dir = os.path.expanduser(os.path.join('~', '.keras'))
+  if md5_hash is not None and file_hash is None:
+    file_hash = md5_hash
+    hash_algorithm = 'md5'
+  datadir_base = os.path.expanduser(cache_dir)
   if not os.access(datadir_base, os.W_OK):
     datadir_base = os.path.join('/tmp', '.keras')
   datadir = os.path.join(datadir_base, cache_subdir)
@@ -106,10 +192,12 @@ def get_file(fname, origin, untar=False, md5_hash=None,
   download = False
   if os.path.exists(fpath):
     # File found; verify integrity if a hash was provided.
-    if md5_hash is not None:
-      if not validate_file(fpath, md5_hash):
+    if file_hash is not None:
+      if not validate_file(fpath, file_hash, algorithm=hash_algorithm):
         print('A local file was found, but it seems to be '
-              'incomplete or outdated.')
+              'incomplete or outdated because the ' + hash_algorithm +
+              ' file hash does not match the original value of ' + file_hash +
+              ' so we will re-download the data.')
         download = True
   else:
     download = True
@@ -141,38 +229,68 @@ def get_file(fname, origin, untar=False, md5_hash=None,
 
   if untar:
     if not os.path.exists(untar_fpath):
-      print('Untaring file...')
-      tfile = tarfile.open(fpath, 'r:gz')
-      try:
-        tfile.extractall(path=datadir)
-      except (Exception, KeyboardInterrupt) as e:
-        if os.path.exists(untar_fpath):
-          if os.path.isfile(untar_fpath):
-            os.remove(untar_fpath)
-          else:
-            shutil.rmtree(untar_fpath)
-        raise
-      tfile.close()
+      _extract_archive(fpath, datadir, archive_format='tar')
     return untar_fpath
 
+  if extract:
+    _extract_archive(fpath, datadir, archive_format)
+
   return fpath
 
 
-def validate_file(fpath, md5_hash):
-  """Validates a file against a MD5 hash.
+def _hash_file(fpath, algorithm='sha256', chunk_size=65535):
+  """Calculates a file sha256 or md5 hash.
+
+  Example:
+
+  ```python
+     >>> from keras.data_utils import _hash_file
+     >>> _hash_file('/path/to/file.zip')
+     'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  ```
+
+  Arguments:
+      fpath: path to the file being validated
+      algorithm: hash algorithm, one of 'auto', 'sha256', or 'md5'.
+          The default 'auto' detects the hash algorithm in use.
+      chunk_size: Bytes to read at a time, important for large files.
+
+  Returns:
+      The file hash
+  """
+  if (algorithm is 'sha256') or (algorithm is 'auto' and len(hash) is 64):
+    hasher = hashlib.sha256()
+  else:
+    hasher = hashlib.md5()
+
+  with open(fpath, 'rb') as fpath_file:
+    for chunk in iter(lambda: fpath_file.read(chunk_size), b''):
+      hasher.update(chunk)
+
+  return hasher.hexdigest()
+
+
+def validate_file(fpath, file_hash, algorithm='auto', chunk_size=65535):
+  """Validates a file against a sha256 or md5 hash.
 
   Arguments:
       fpath: path to the file being validated
-      md5_hash: the MD5 hash being validated against
+      file_hash:  The expected hash string of the file.
+          The sha256 and md5 hash algorithms are both supported.
+      algorithm: Hash algorithm, one of 'auto', 'sha256', or 'md5'.
+          The default 'auto' detects the hash algorithm in use.
+      chunk_size: Bytes to read at a time, important for large files.
 
   Returns:
       Whether the file is valid
   """
-  hasher = hashlib.md5()
-  with open(fpath, 'rb') as f:
-    buf = f.read()
-    hasher.update(buf)
-  if str(hasher.hexdigest()) == str(md5_hash):
+  if ((algorithm is 'sha256') or
+      (algorithm is 'auto' and len(file_hash) is 64)):
+    hasher = 'sha256'
+  else:
+    hasher = 'md5'
+
+  if str(_hash_file(fpath, hasher, chunk_size)) == str(file_hash):
     return True
   else:
     return False
diff --git a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
index c1e0296835..f59839295b 100644
--- a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
@@ -155,8 +155,8 @@ def deserialize_keras_object(identifier,
         return cls.from_config(
             config['config'],
             custom_objects=dict(
-                list(_GLOBAL_CUSTOM_OBJECTS.items()) + list(
-                    custom_objects.items())))
+                list(_GLOBAL_CUSTOM_OBJECTS.items()) +
+                list(custom_objects.items())))
       return cls.from_config(config['config'])
     else:
       # Then `cls` may be a function returning a class.
-- 
GitLab


From 141ad526a1ad2241d9af6ec1c4df3ea411b3b6e2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 12 Apr 2017 13:48:37 -0800
Subject: [PATCH 0381/1563] Vulcanize TensorBoard

This vulcanized version contains features such as the text dashboard.
Change: 152990262
---
 .../tensorboard/dist/tf-tensorboard.html      | 2319 ++++++++++++-----
 1 file changed, 1635 insertions(+), 684 deletions(-)

diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 7922c69793..10721e41e9 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -19,6 +19,21 @@ Instead, use `gulp regenerate` to create a new version with your changes.
 
 <html><head><!--
 @license
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--><!--
+@license
 Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,7 +81,7 @@ var TF;
         // The names of TensorBoard tabs.
         Globals.TABS = [
             'scalars', 'images', 'audio', 'graphs', 'distributions', 'histograms',
-            'embeddings'
+            'embeddings', 'text'
         ];
         // If true, TensorBoard stores its hash in the URI state.
         // If false, tab switching in TensorBoard will not update location hash,
@@ -318,11 +333,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var TF;
 (function (TF) {
     var Backend;
@@ -616,6 +636,8 @@ var TF;
                 audio: standardRoute('audio'),
                 runMetadata: standardRoute('run_metadata', '.pbtxt'),
                 healthPills: function () { return dataDir + '/plugin/debugger/health_pills'; },
+                textRuns: function () { return dataDir + '/plugin/text/runs' + (demoMode ? '.json' : ''); },
+                text: standardRoute('plugin/text/text'),
             };
         }
         Backend.router = router;
@@ -644,7 +666,7 @@ var TF;
         ;
         Backend_1.TYPES = [
             'scalar', 'histogram', 'compressedHistogram', 'graph', 'image', 'audio',
-            'runMetadata'
+            'runMetadata', 'text'
         ];
         /**
          * The Backend class provides a convenient and typed interface to the backend.
@@ -721,6 +743,23 @@ var TF;
             Backend.prototype.runMetadataRuns = function () {
                 return this.runs().then(function (x) { return _.mapValues(x, 'run_metadata'); });
             };
+            /**
+             * Returns a promise showing the Run-to-Tag mapping for text data.
+             */
+            Backend.prototype.textRuns = function () {
+                return this.requestManager.request(this.router.textRuns());
+            };
+            /**
+             * Returns a promise containing TextDatums for given run and tag.
+             */
+            Backend.prototype.text = function (tag, run) {
+                var url = this.router.text(tag, run);
+                // tslint:disable-next-line:no-any it's convenient and harmless here
+                return this.requestManager.request(url).then(map(function (x) {
+                    x.wall_time = timeToDate(x.wall_time);
+                    return x;
+                }));
+            };
             /**
              * Return a promise of a graph string from the backend.
              */
@@ -740,8 +779,13 @@ var TF;
             /**
              * Returns a promise for requesting the health pills for a list of nodes.
              */
-            Backend.prototype.healthPills = function (nodeNames) {
+            Backend.prototype.healthPills = function (nodeNames, step) {
                 var postData = { 'node_names': JSON.stringify(nodeNames) };
+                if (step !== undefined) {
+                    // The user requested health pills for a specific step. This request
+                    // might be slow since the backend reads events sequentially from disk.
+                    postData['step'] = step;
+                }
                 return this.requestManager.request(this.router.healthPills(), postData);
             };
             /**
@@ -1457,10 +1501,9 @@ var TF;
             and pass the graph either via the constructor, or by calling its
             <code>add_graph()</code> method.
             You may want to check out the
-            <a href="https://www.tensorflow.org/versions/master/how_tos/graph_viz/index.html">
+            <a href="https://www.tensorflow.org/get_started/graph_viz">
               graph visualizer tutorial
-            </a>
-            .
+            </a>.
           </p>
         </template>
         <template is="dom-if" if="[[_isProjector(dataType)]]">
@@ -1476,7 +1519,7 @@ var TF;
               <li>
                 You are not saving any checkpoint. To save your model,
                 create a
-                <a href="https://www.tensorflow.org/versions/master/api_docs/python/state_ops.html#Saver">
+                <a href="https://www.tensorflow.org/api_docs/python/tf/train/Saver">
                   <code>tf.train.Saver</code>
                 </a>
                 and save your model periodically
@@ -1509,7 +1552,7 @@ var TF;
             README
           </a>
           and perhaps the
-          <a href="https://www.tensorflow.org/versions/master/how_tos/summaries_and_tensorboard/index.html">
+          <a href="https://www.tensorflow.org/get_started/summaries_and_tensorboard">
             TensorBoard tutorial
           </a>.
         </p>
@@ -1559,6 +1602,49 @@ You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+var TF;
+(function (TF) {
+    var Dashboard;
+    (function (Dashboard) {
+        /**
+         * A behavior that TensorBoard dashboards must implement. This behavior serves
+         * the purpose of an interface.
+         */
+        function DashboardBehavior(dashboardName) {
+            return {
+                properties: {
+                    name: {
+                        type: String,
+                        value: dashboardName,
+                        readOnly: true,
+                    },
+                },
+                // This method is called when the dashboard reloads, either when the
+                // dashboard is first visited, periodically reloaded, or manually reloaded
+                // via the user clicking the button. Note that dashboard custom elements
+                // that use TF.Dashboard.ReloadBehavior already implement a reload method.
+                reload: function () {
+                    throw Error('The ' + dashboardName + ' dashboard does not implement reload.');
+                },
+            };
+        }
+        Dashboard.DashboardBehavior = DashboardBehavior;
+    })(Dashboard = TF.Dashboard || (TF.Dashboard = {}));
+})(TF || (TF = {}));
+</script><script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -1596,6 +1682,7 @@ var TF;
 })(TF || (TF = {}));
 </script>
 
+
 <dom-module id="tf-option-selector" assetpath="../tf-dashboard-common/">
   <template>
     <div id="wrap">
@@ -1692,7 +1779,7 @@ var TF;
       :host:first-of-type {
         margin-top: 20px;
       }
-
+      
       :host:last-of-type {
         margin-bottom: 20px;
       }
@@ -2121,7 +2208,7 @@ svg.plottable {
 
 <dom-module id="tf-panes-helper" assetpath="../tf-dashboard-common/">
   <template>
-    <content></content>
+    <content></content> 
     <tf-no-data-warning data-type="[[dataType]]" show-warning="[[dataNotFound]]"></tf-no-data-warning>
 
     <template is="dom-repeat" items="[[categories]]" as="category">
@@ -2137,7 +2224,7 @@ svg.plottable {
                 </div>
                 <div class="card-content">
                   <tf-chart-scaffold tag="[[item.tag]]" data-provider="[[dataProvider]]" visible-series="[[item.runs]]" on-ready="_instantiateTemplate">
-
+                    
                   </tf-chart-scaffold>
                 </div>
                 <div class="card-bottom-row">
@@ -2160,7 +2247,7 @@ svg.plottable {
         display: flex;
         flex-direction: column;
         margin: 5px;
-        padding: 0 30px 35px 0;
+        padding: var(--card-padding, 0 30px 35px 0);
         -webkit-user-select: none;
         -moz-user-select: none;
         position: relative;
@@ -2213,6 +2300,7 @@ svg.plottable {
         padding: 4px;
         border-radius: 100%;
         pointer-events: auto;
+        display: var(--show-expand-button, block);
       }
 
       .card-expanded .expand-button {
@@ -2419,6 +2507,8 @@ limitations under the License.
  * It generates URI components like: events&runPrefix=train*
  * which TensorBoard uses after like localhost:8000/#events&runPrefix=train*
  * to store state in the URI.
+ *
+ * It also allows saving the values to localStorage for long-term persistance.
  */
 var TF;
 (function (TF) {
@@ -2447,76 +2537,79 @@ var TF;
          */
         URIStorage.DISAMBIGUATOR = 'disambiguator';
         /**
-         * Return a boolean stored in the URI, given a corresponding key.
+         * Return a string stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getBoolean(key) {
-            var items = _componentToDict(_readComponent());
-            var item = items[key];
-            return item === 'true' ? true : item === 'false' ? false : undefined;
+        function getString(key, useLocalStorage) {
+            if (useLocalStorage) {
+                return window.localStorage.getItem(key);
+            }
+            else {
+                return _componentToDict(_readComponent())[key];
+            }
         }
-        URIStorage.getBoolean = getBoolean;
+        URIStorage.getString = getString;
         /**
-         * Store a boolean in the URI, with a corresponding key.
+         * Set a string in URI or localStorage.
          */
-        function setBoolean(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = value.toString();
-            _writeComponent(_dictToComponent(items));
+        function setString(key, value, useLocalStorage) {
+            if (useLocalStorage) {
+                window.localStorage.setItem(key, value);
+            }
+            else {
+                var items = _componentToDict(_readComponent());
+                items[key] = value;
+                _writeComponent(_dictToComponent(items));
+            }
         }
-        URIStorage.setBoolean = setBoolean;
+        URIStorage.setString = setString;
         /**
-         * Return a string stored in the URI, given a corresponding key.
+         * Return a boolean stored in stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getString(key) {
-            var items = _componentToDict(_readComponent());
-            return items[key];
+        function getBoolean(key, useLocalStorage) {
+            var item = getString(key, useLocalStorage);
+            return item === 'true' ? true : item === 'false' ? false : undefined;
         }
-        URIStorage.getString = getString;
+        URIStorage.getBoolean = getBoolean;
         /**
-         * Store a string in the URI, with a corresponding key.
+         * Store a boolean in URI or localStorage.
          */
-        function setString(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = value;
-            _writeComponent(_dictToComponent(items));
+        function setBoolean(key, value, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            setString(key, value.toString(), useLocalStorage);
         }
-        URIStorage.setString = setString;
+        URIStorage.setBoolean = setBoolean;
         /**
-         * Return a number stored in the URI, given a corresponding key.
+         * Return a number stored in stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getNumber(key) {
-            var items = _componentToDict(_readComponent());
-            return items[key] === undefined ? undefined : +items[key];
+        function getNumber(key, useLocalStorage) {
+            var item = getString(key, useLocalStorage);
+            return item === undefined ? undefined : +item;
         }
         URIStorage.getNumber = getNumber;
         /**
-         * Store a number in the URI, with a corresponding key.
+         * Store a number in URI or localStorage.
          */
-        function setNumber(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = '' + value;
-            _writeComponent(_dictToComponent(items));
+        function setNumber(key, value, useLocalStorage) {
+            setString(key, '' + value, useLocalStorage);
         }
         URIStorage.setNumber = setNumber;
         /**
-         * Return an object stored in the URI, given a corresponding key.
+         * Return an object stored in stored in URI or localStorage.
          * Undefined if not found.
          */
-        function getObject(key) {
-            var items = _componentToDict(_readComponent());
-            return items[key] === undefined ? undefined : JSON.parse(atob(items[key]));
+        function getObject(key, useLocalStorage) {
+            var item = getString(key, useLocalStorage);
+            return item === undefined ? undefined : JSON.parse(atob(item));
         }
         URIStorage.getObject = getObject;
         /**
-         * Store an object in the URI, with a corresponding key.
+         * Store an object in URI or localStorage.
          */
-        function setObject(key, value) {
-            var items = _componentToDict(_readComponent());
-            items[key] = btoa(JSON.stringify(value));
-            _writeComponent(_dictToComponent(items));
+        function setObject(key, value, useLocalStorage) {
+            setString(key, btoa(JSON.stringify(value)), useLocalStorage);
         }
         URIStorage.setObject = setObject;
         /**
@@ -2537,8 +2630,9 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function getBooleanInitializer(propertyName, defaultVal) {
-            return _getInitializer(getBoolean, propertyName, defaultVal);
+        function getBooleanInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getBoolean, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getBooleanInitializer = getBooleanInitializer;
         /**
@@ -2547,8 +2641,9 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function getStringInitializer(propertyName, defaultVal) {
-            return _getInitializer(getString, propertyName, defaultVal);
+        function getStringInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getString, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getStringInitializer = getStringInitializer;
         /**
@@ -2557,8 +2652,9 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function getNumberInitializer(propertyName, defaultVal) {
-            return _getInitializer(getNumber, propertyName, defaultVal);
+        function getNumberInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getNumber, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getNumberInitializer = getNumberInitializer;
         /**
@@ -2569,38 +2665,43 @@ var TF;
          *
          * Generates a deep clone of the defaultVal to avoid mutation issues.
          */
-        function getObjectInitializer(propertyName, defaultVal) {
-            return _getInitializer(getObject, propertyName, defaultVal);
+        function getObjectInitializer(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getInitializer(getObject, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getObjectInitializer = getObjectInitializer;
         /**
          * Return a function that updates URIStorage when a string property changes.
          */
-        function getBooleanObserver(propertyName, defaultVal) {
-            return _getObserver(getBoolean, setBoolean, propertyName, defaultVal);
+        function getBooleanObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getObserver(getBoolean, setBoolean, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getBooleanObserver = getBooleanObserver;
         /**
          * Return a function that updates URIStorage when a string property changes.
          */
-        function getStringObserver(propertyName, defaultVal) {
-            return _getObserver(getString, setString, propertyName, defaultVal);
+        function getStringObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getObserver(getString, setString, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getStringObserver = getStringObserver;
         /**
          * Return a function that updates URIStorage when a number property changes.
          */
-        function getNumberObserver(propertyName, defaultVal) {
-            return _getObserver(getNumber, setNumber, propertyName, defaultVal);
+        function getNumberObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
+            return _getObserver(getNumber, setNumber, propertyName, defaultVal, useLocalStorage);
         }
         URIStorage.getNumberObserver = getNumberObserver;
         /**
          * Return a function that updates URIStorage when an object property changes.
          * Generates a deep clone of the defaultVal to avoid mutation issues.
          */
-        function getObjectObserver(propertyName, defaultVal) {
+        function getObjectObserver(propertyName, defaultVal, useLocalStorage) {
+            if (useLocalStorage === void 0) { useLocalStorage = false; }
             var clone = _.cloneDeep(defaultVal);
-            return _getObserver(getObject, setObject, propertyName, clone);
+            return _getObserver(getObject, setObject, propertyName, clone, useLocalStorage);
         }
         URIStorage.getObjectObserver = getObjectObserver;
         /**
@@ -2673,7 +2774,7 @@ var TF;
          *     value is not already set
          * (2) Sets up listener that updates Polymer property on hash change.
          */
-        function _getInitializer(get, propertyName, defaultVal) {
+        function _getInitializer(get, propertyName, defaultVal, useLocalStorage) {
             return function () {
                 var _this = this;
                 var URIStorageName = getURIStorageName(this, propertyName);
@@ -2683,22 +2784,41 @@ var TF;
                 // It is important that this function does not re-assign needlessly,
                 // to avoid Polymer observer churn.
                 var setComponentValue = function () {
-                    var uriValue = get(URIStorageName);
+                    var uriValue = get(URIStorageName, false);
                     var currentValue = _this[propertyName];
                     // if uriValue is undefined, we will ensure that the property has the
                     // default value
                     if (uriValue === undefined) {
-                        if (!_.isEqual(currentValue, defaultVal)) {
+                        var valueToSet = void 0;
+                        // if we are using localStorage, we will set the value to the value
+                        // from localStorage. Then, the corresponding observer will proxy
+                        // the localStorage value into URI storage.
+                        // in this way, localStorage takes precedence over the default val
+                        // but not over the URI value.
+                        if (useLocalStorage) {
+                            var useLocalStorageValue = get(URIStorageName, true);
+                            valueToSet = useLocalStorageValue === undefined ?
+                                defaultVal :
+                                useLocalStorageValue;
+                        }
+                        else {
+                            valueToSet = defaultVal;
+                        }
+                        if (!_.isEqual(currentValue, valueToSet)) {
                             // If we don't have an explicit URI value, then we need to ensure
                             // the property value is equal to the default value.
                             // We will assign a clone rather than the canonical default, because
                             // the component receiving this property may mutate it, and we need
                             // to keep a pristine copy of the default.
-                            _this[propertyName] = _.clone(defaultVal);
+                            _this[propertyName] = _.clone(valueToSet);
                         }
+                        // In this case, we have an explicit URI value, so we will ensure that
+                        // the component has an equivalent value.
                     }
-                    else if (!_.isEqual(uriValue, currentValue)) {
-                        _this[propertyName] = uriValue;
+                    else {
+                        if (!_.isEqual(uriValue, currentValue)) {
+                            _this[propertyName] = uriValue;
+                        }
                     }
                 };
                 // Set the value on the property.
@@ -2710,16 +2830,21 @@ var TF;
         /**
          * Return a function that updates URIStorage when a property changes.
          */
-        function _getObserver(get, set, propertyName, defaultVal) {
+        function _getObserver(get, set, propertyName, defaultVal, useLocalStorage) {
             return function () {
                 var URIStorageName = getURIStorageName(this, propertyName);
                 var newVal = this[propertyName];
-                if (!_.isEqual(newVal, get(URIStorageName))) {
+                // if this is a localStorage property, we always synchronize the value
+                // in localStorage to match the one currently in the URI.
+                if (useLocalStorage) {
+                    set(URIStorageName, newVal, true);
+                }
+                if (!_.isEqual(newVal, get(URIStorageName, false))) {
                     if (_.isEqual(newVal, defaultVal)) {
-                        _unset(URIStorageName);
+                        _unsetFromURI(URIStorageName);
                     }
                     else {
-                        set(URIStorageName, newVal);
+                        set(URIStorageName, newVal, false);
                     }
                 }
             };
@@ -2727,7 +2852,7 @@ var TF;
         /**
          * Delete a key from the URI.
          */
-        function _unset(key) {
+        function _unsetFromURI(key) {
             var items = _componentToDict(_readComponent());
             delete items[key];
             _writeComponent(_dictToComponent(items));
@@ -3211,10 +3336,11 @@ var Categorizer;
         type: Object,
         observer: "synchronizeColors",
       }, // map from run name to css class
-      numRunsEnabledByDefault: {
-        // When TB first loads, first k runs are enabled, rest are disabled.
+      maxRunsToEnableByDefault: {
+        // When TB first loads, if it has k or fewer runs, they are all enabled
+        // by default. If there are more, then they are all disabled.
         type: Number,
-        value: 10,
+        value: 40,
       },
       _debouncedRegexChange: {
         type: Function,
@@ -3247,8 +3373,24 @@ var Categorizer;
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMapping(runSelectionState)",
+      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
+    _storeRunToIsCheckedMappingWithDefault() {
+      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
+      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
+        return;
+      }
+      var _this = this;
+      var allToggledOn = this.namesMatchingRegex
+              .every(function(n) {return _this.runSelectionState[n]});
+      var allToggledOff = this.namesMatchingRegex
+              .every(function(n) {return !_this.runSelectionState[n]});
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
+        this.runSelectionState = {};
+      }
+      this._storeRunToIsCheckedMapping(this.runSelectionState);
+    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
@@ -3278,9 +3420,10 @@ var Categorizer;
     },
     computeOutSelected: function(__, ___) {
       var runSelectionState = this.runSelectionState;
-      var num = this.numRunsEnabledByDefault;
+      var num = this.maxRunsToEnableByDefault;
+      var allEnabled = this.namesMatchingRegex.length <= num;
       return this.namesMatchingRegex.filter(function(n, i) {
-        return runSelectionState[n] == null ? i<num : runSelectionState[n];
+        return runSelectionState[n] == null ? allEnabled : runSelectionState[n];
       });
     },
     synchronizeColors: function(e) {
@@ -3330,18 +3473,24 @@ var Categorizer;
     _regexInputObserver: TF.URIStorage.getStringObserver("regexInput", ""),
     toggleAll: function() {
       var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-                    .every(function(n) {return _this.runSelectionState[n]});
+      var anyToggledOn = this.namesMatchingRegex
+                    .some(function(n) {return _this.runSelectionState[n]});
+
 
       var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
 
-      var numRuns = this.namesMatchingRegex.length;
+      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+      // We have runs toggled either if some were explicitly toggled on, or if
+      // we are in the default state, and there are few enough that we default
+      // to toggling on.
+      anyToggledOn = anyToggledOn || runSelectionStateIsDefault && !defaultOff;
 
-      var shouldDisable = allToggledOn || runSelectionStateIsDefault;
+      // If any are toggled on, we turn everything off. Or, if none are toggled
+      // on, we turn everything on.
 
       var newRunsDisabled = {};
       this.names.forEach(function(n) {
-        newRunsDisabled[n] = !shouldDisable;
+        newRunsDisabled[n] = !anyToggledOn;
       })
       this.runSelectionState = newRunsDisabled;
     },
@@ -3437,17 +3586,9 @@ var Categorizer;
       },
     },
     observers: [
+      "_onBackendUpdate(backend)",
       "_logdirSet(logdir)",
     ],
-    ready: function() {
-      // Populate the logdir.
-      this.backend.logdir().then(logdirObject => {
-        this.set('logdir', logdirObject.logdir);
-      }).catch(e => {
-        // Fetching the logdir failed. Prevent the exception from logging to
-        // console. The console already logs a 404 network event.
-      });
-    },
     _toggleAll: function() {
       this.$.multiCheckbox.toggleAll();
     },
@@ -3455,8 +3596,21 @@ var Categorizer;
     _breakString: function(originalString) {
       return originalString.replace(/([\/=\-_,])/g, "$1<wbr>");
     },
+    _onBackendUpdate: function(backend) {
+      if (backend === undefined) {
+        return;
+      }
+
+      // When the backend is set, the selector can request the logdir.
+      backend.logdir().then(logdirObject => {
+        this.set('logdir', logdirObject.logdir);
+      }).catch(e => {
+        // Fetching the logdir failed. Prevent the exception from logging to
+        // console. The console already logs a 404 network event.
+      });
+    },
     _logdirSet: function(logdir) {
-      if (!logdir) {
+      if (logdir === undefined) {
         // The logdir has not been set yet.
         return;
       }
@@ -3694,11 +3848,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var Plottable;
 (function (Plottable) {
     var DragZoomLayer = (function (_super) {
@@ -3888,7 +4047,7 @@ var VZ;
             this.colorScale = colorScale;
             this.tooltip = tooltip;
             this.datasets = [];
-            this._ignoreYOutliers = true;
+            this._ignoreYOutliers = false;
             // lastPointDataset is a dataset that contains just the last point of
             // every dataset we're currently drawing.
             this.lastPointsDataset = new Plottable.Dataset();
@@ -4230,34 +4389,20 @@ var VZ;
             }
         };
         LineChart.prototype.resmoothDataset = function (dataset) {
-            // When increasing the smoothing window, it smoothes a lot with the first
-            // few points and then starts to gradually smooth slower, so using an
-            // exponential function makes the slider more consistent. 1000^x has a
-            // range of [1, 1000], so subtracting 1 and dividing by 999 results in a
-            // range of [0, 1], which can be used as the percentage of the data, so
-            // that the kernel size can be specified as a percentage instead of a
-            // hardcoded number, what would be bad with multiple series.
-            var factor = (Math.pow(1000, this.smoothingWeight) - 1) / 999;
             var data = dataset.data();
-            var kernelRadius = Math.floor(data.length * factor / 2);
-            data.forEach(function (d, i) {
-                var actualKernelRadius = Math.min(kernelRadius, i);
-                var start = i - actualKernelRadius;
-                var end = i + actualKernelRadius + 1;
-                if (end >= data.length) {
-                    // In the beginning, it's OK for the smoothing window to be small,
-                    // but this is not desirable towards the end. Rather than shrinking
-                    // the window, or extrapolating data to fill the gap, we're simply
-                    // not going to display the smoothed line towards the end.
-                    d.smoothed = Infinity;
-                }
-                else if (!_.isFinite(d.scalar)) {
-                    // Only smooth finite numbers.
+            var smoothingWeight = this.smoothingWeight;
+            var last = data.length > 0 ? data[0].scalar : NaN;
+            data.forEach(function (d) {
+                if (!_.isFinite(last)) {
                     d.smoothed = d.scalar;
                 }
                 else {
-                    d.smoothed = d3.mean(data.slice(start, end).filter(function (d) { return _.isFinite(d.scalar); }), function (d) { return d.scalar; });
+                    // 1st-order IIR low-pass filter to attenuate the higher-
+                    // frequency components of the time-series.
+                    d.smoothed =
+                        last * smoothingWeight + (1 - smoothingWeight) * d.scalar;
                 }
+                last = d.smoothed;
             });
         };
         LineChart.prototype.getDataset = function (name) {
@@ -4424,23 +4569,36 @@ var VZ;
             var b;
             if (ignoreOutliers) {
                 var sorted = _.sortBy(values);
-                a = d3.quantile(sorted, 0.10);
-                b = d3.quantile(sorted, 0.90);
+                a = d3.quantile(sorted, 0.05);
+                b = d3.quantile(sorted, 0.95);
             }
             else {
                 a = d3.min(values);
                 b = d3.max(values);
             }
-            // When the data all fits into the unit interval, we switch to a consistent
-            // domain for unit data. This is helpful for proportional parameters like
-            // error rates or % of queue that is full. This way, users can meaningfully
-            // compare charts and see information at a glance (if the value is always
-            // 1, it appears at top of the chart, 0 is bottom, etc.)
-            if (a >= 0 && b <= 1) {
-                return [-0.1, 1.1];
+            var padding;
+            var span = b - a;
+            if (span === 0) {
+                // If b===a, we would create an empty range. We instead select the range
+                // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
+                // extra padding on the top and bottom of the plot.
+                padding = Math.abs(a) * 1.1;
+            }
+            else {
+                padding = span * 0.2;
+            }
+            var lower;
+            if (a >= 0 && a < span) {
+                // We include the intercept (y = 0) if doing so less than doubles the span
+                // of the y-axis. (We actually select a lower bound that's slightly less
+                // than 0 so that 0.00 will clearly be written on the lower edge of the
+                // chart. The label on the lowest tick is often filtered out.)
+                lower = -0.1 * b;
+            }
+            else {
+                lower = a - padding;
             }
-            var padding = (b - a) * 0.20;
-            var domain = [a - padding, b + padding];
+            var domain = [lower, b + padding];
             domain = d3.scale.linear().domain(domain).nice().domain();
             return domain;
         }
@@ -4623,7 +4781,7 @@ var VZ;
 
         ignoreYOutliers: {
           type: Boolean,
-          value: true,
+          value: false,
         },
 
         /**
@@ -4818,7 +4976,7 @@ var VZ;
         </tf-sidebar-helper>
       </div>
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" show-download-links="[[_showDownloadLinks]]" download-link-url-function="[[scalarUrl]]">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" show-download-links="[[_showDownloadLinks]]" download-link-url-function="[[scalarUrl]]">
           <template>
             <vz-line-chart x-type="[[_xType]]" color-scale="[[_colorScale]]" smoothing-enabled="[[_smoothingEnabled]]" smoothing-weight="[[_smoothingWeight]]" tooltip-sorting-method="[[_tooltipSortingMethod]]" ignore-y-outliers="[[_ignoreYOutliers]]"></vz-line-chart>
             <paper-icon-button class="log-button" icon="line-weight" on-tap="toggleLogScale" title="Toggle y-axis log scale"></paper-icon-button>
@@ -4870,9 +5028,14 @@ var VZ;
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfScalarDashboard = Polymer({
       is: "tf-scalar-dashboard",
+      factoryImpl: function(backend, router) {
+        this.backend = backend;
+        this.router = router;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("scalars"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
@@ -4891,7 +5054,7 @@ var VZ;
           type: Boolean,
           notify: true,
           value: TF.URIStorage.getBooleanInitializer('_showDownloadLinks',
-              false),
+              false, true),
           observer: '_showDownloadLinksObserver'
         },
         _smoothingWeight: {
@@ -4906,7 +5069,8 @@ var VZ;
         },
         _ignoreYOutliers: {
           type: Boolean,
-          value: true,
+          value: TF.URIStorage.getBooleanInitializer('_ignoreYOutliers', true, true),
+          observer: '_ignoreYOutliersObserver',
         },
         _xType: {
           type: String,
@@ -4922,9 +5086,11 @@ var VZ;
         return this.router.scalars;
       },
       _showDownloadLinksObserver: TF.URIStorage.getBooleanObserver(
-          '_showDownloadLinks', false),
+          '_showDownloadLinks', /*default=*/ false, /*useLocalStorage=*/ true),
       _smoothingWeightObserver: TF.URIStorage.getNumberObserver(
           '_smoothingWeight', 0.6),
+      _ignoreYOutliersObserver: TF.URIStorage.getBooleanObserver(
+          '_ignoreYOutliers', /*default=*/ true, /*useLocalStorage=*/true),
       _computeSmoothingEnabled: function(_smoothingWeight) {
         return _smoothingWeight > 0;
       },
@@ -5153,23 +5319,36 @@ var VZ;
             var b;
             if (ignoreOutliers) {
                 var sorted = _.sortBy(values);
-                a = d3.quantile(sorted, 0.10);
-                b = d3.quantile(sorted, 0.90);
+                a = d3.quantile(sorted, 0.05);
+                b = d3.quantile(sorted, 0.95);
             }
             else {
                 a = d3.min(values);
                 b = d3.max(values);
             }
-            // When the data all fits into the unit interval, we switch to a consistent
-            // domain for unit data. This is helpful for proportional parameters like
-            // error rates or % of queue that is full. This way, users can meaningfully
-            // compare charts and see information at a glance (if the value is always
-            // 1, it appears at top of the chart, 0 is bottom, etc.)
-            if (a >= 0 && b <= 1) {
-                return [-0.1, 1.1];
+            var padding;
+            var span = b - a;
+            if (span === 0) {
+                // If b===a, we would create an empty range. We instead select the range
+                // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
+                // extra padding on the top and bottom of the plot.
+                padding = Math.abs(a) * 1.1;
+            }
+            else {
+                padding = span * 0.2;
+            }
+            var lower;
+            if (a >= 0 && a < span) {
+                // We include the intercept (y = 0) if doing so less than doubles the span
+                // of the y-axis. (We actually select a lower bound that's slightly less
+                // than 0 so that 0.00 will clearly be written on the lower edge of the
+                // chart. The label on the lowest tick is often filtered out.)
+                lower = -0.1 * b;
+            }
+            else {
+                lower = a - padding;
             }
-            var padding = (b - a) * 0.20;
-            var domain = [a - padding, b + padding];
+            var domain = [lower, b + padding];
             domain = d3.scale.linear().domain(domain).nice().domain();
             return domain;
         }
@@ -5383,7 +5562,7 @@ var VZ;
       </div>
 
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
           <template>
             <vz-distribution-chart x-type="[[_xType]]" color-scale="[[_colorScale]]"></vz-distribution-chart>
           </template>
@@ -5395,9 +5574,13 @@ var VZ;
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfDistributionDashboard = Polymer({
       is: "tf-distribution-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("distributions"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
@@ -6114,12 +6297,12 @@ var VZ;
               <paper-button id="relative">relative</paper-button>
               <paper-button id="wall_time">wall</paper-button>
             </tf-option-selector>
-
+          
        </div>
       </tf-sidebar-helper></div>
 
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
           <template>
             <vz-histogram-timeseries time-property="[[_timeProperty]]" mode="[[_histogramMode]]" color-scale="[[_colorScaleFunction]]"></vz-histogram-timeseries>
           </template>
@@ -6137,9 +6320,13 @@ var VZ;
   </template>
 
   <script>
-    Polymer({
+    TF.Dashboard.TfHistogramDashboard = Polymer({
       is: "tf-histogram-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("histograms"),
         TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
         TF.Backend.Behavior,
       ],
@@ -6383,7 +6570,7 @@ var VZ;
         </tf-sidebar-helper>
       </div>
       <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
           <template>
             <tf-image-loader color-scale="[[_colorScale]]"></tf-image-loader>
             <paper-icon-button class="actual-size-button" icon="aspect-ratio" on-tap="_showActualSize" title="Show the image at its true pixel size"></paper-icon-button>
@@ -6423,8 +6610,11 @@ var VZ;
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfImageDashboard = Polymer({
       is: "tf-image-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         backend: Object,
         dataType: {
@@ -6433,8 +6623,9 @@ var VZ;
         },
       },
       behaviors: [
-          TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-          TF.Backend.Behavior,
+        TF.Dashboard.DashboardBehavior("images"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
       ],
       attached: function() {
         this.async(function() {
@@ -6470,20 +6661,70 @@ var VZ;
 
 <dom-module id="tf-audio-loader" assetpath="../tf-audio-dashboard/">
   <style>
-  :host {
-    display: block;
-  }
-  img {
-    width: 100%;
-    height: 100%;
-    image-rendering: pixelated;
-  }
+    :host {
+      display: block;
+      --step-slider-knob-color: #424242;
+    }
+
+    img {
+      width: 100%;
+      height: 100%;
+      image-rendering: pixelated;
+    }
+
+    .step-description {
+      font-size: 12px;
+    }
+
+    .step-value {
+      font-weight: bold;
+    }
+
+    #audio-loading-spinner {
+      width: 14px;
+      height: 14px;
+      vertical-align: text-bottom;
+      --paper-spinner-color: var(--tb-orange-strong)
+    }
+
+    #steps {
+      height: 15px;
+      margin: 0 0 0 -15px;
+      /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
+       * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
+       * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
+      width: calc(100% + 31px);
+      --paper-slider-active-color: var(--step-slider-knob-color);
+      --paper-slider-knob-color: var(--step-slider-knob-color);
+      --paper-slider-pin-color: var(--step-slider-knob-color);
+      --paper-slider-knob-start-color: var(--step-slider-knob-color);
+      --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
+      --paper-slider-pin-start-color: var(--step-slider-knob-color);
+    }
+
+    #individual-audio-container audio {
+      margin: 5px 0 0 -10px;
+      width: calc(100% + 20px);
+    }
   </style>
   <template>
-    <template is="dom-if" if="[[audioUrl]]">
-      <audio controls="" loop="">
-        <source src="[[audioUrl]]" type="[[audioContentType]]">
-      </audio>
+    <template is="dom-if" if="[[_metadatas]]">
+      <template is="dom-if" if="[[_hasAtLeastOneStep(_metadatas)]]">
+        <div class="step-description">
+          step
+          <span class="step-value">
+            [[_stepValue]]
+          </span><br>
+          <template is="dom-if" if="[[_stepWallTime]]">
+            [[_stepWallTime]]
+          </template>
+          <paper-spinner-lite active="" id="audio-loading-spinner" hidden$="[[!_isAudioLoading]]"></paper-spinner-lite>
+        </div>
+      </template>
+      <template is="dom-if" if="[[_maxStepIndex]]">
+        <paper-slider id="steps" immediate-value="{{_stepIndex}}" max="[[_maxStepIndex]]" max-markers="[[_maxStepIndex]]" snaps="" step="1" value="{{_stepIndex}}"></paper-slider>
+      </template>
+      <div id="individual-audio-container"></div>
     </template>
   </template>
   <script>
@@ -6493,18 +6734,42 @@ var VZ;
         run: String,
         tag: String,
         audioGenerator: Function,
-        audioUrl: String,
-        audioContentType: String
+        // todo: document.
+        _metadatas: Array,
+        _stepIndex: Number,
+        _stepValue: {
+          type: Number,
+          computed: "_computeStepValue(_metadatas, _stepIndex)",
+          value: 0,
+        },
+        _stepWallTime: {
+          type: Number,
+          computed: "_computeStepWallTime(_metadatas, _stepIndex)",
+          value: 0,
+        },
+        _maxStepIndex: {
+          type: Number,
+          computed: "_computeMaxStepIndex(_metadatas)",
+          value: 0,
+        },
+        _isAudioLoading: Boolean,
+        // Used to identify stale requests for audio.
+        _audioRequestId: {
+          type: Number,
+          value: 1
+        },
       },
+      observers: [
+        "_updateAudio(_metadatas, _stepIndex)",
+      ],
       reload: function() {
-        var _this = this;
-        this.audioUrl = ""; // force reload
-        this.audioContentType = "";
         this.audioGenerator(this.tag, this.run).then(function(metadatas) {
-          var last_metadata = _.last(metadatas);
-          _this.audioUrl = last_metadata.url;
-          _this.audioContentType = last_metadata.content_type;
-        })
+          // Set the list of available metadata.
+          this.set("_metadatas", metadatas);
+
+          // Set the index to be the last one.
+          this.set("_stepIndex", this._maxStepIndex);
+        }.bind(this));
       },
       ready: function() {
         // Need to test so that it will not error if it is constructed w/o
@@ -6513,6 +6778,79 @@ var VZ;
           this.reload();
         }
       },
+      _updateAudio: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return;
+        }
+
+        // Load new audio.
+        const requestId = ++this._audioRequestId;
+        this.set("_isAudioLoading", true);
+
+        // Create a new audio element. Only replace the previous one once the new audio loads.
+        let audioElement = document.createElement("audio");
+        audioElement.setAttribute("controls", true);
+        audioElement.setAttribute("loop", "loop");
+        let canPlayHandler = function() {
+          if (requestId !== this._audioRequestId) {
+            // This request is no longer relevant.
+            return;
+          }
+
+          // Remove this event listener: "canplay" apparently fires in Chrome every time playing
+          // begins again on loop. So, if we create a new audio element every time that happens, we
+          // don't actually loop.
+          audioElement.removeEventListener("canplay", canPlayHandler);
+
+          let individualAudioContainer = this.$$("#individual-audio-container");
+          individualAudioContainer.innerHTML = "";
+          Polymer.dom(individualAudioContainer).appendChild(audioElement);
+          this.set("_isAudioLoading", false);
+        }.bind(this);
+        audioElement.addEventListener("canplay", canPlayHandler);
+        audioElement.addEventListener("error", function() {
+          if (requestId !== this._audioRequestId) {
+            // This request is no longer relevant.
+            return;
+          }
+
+          // The audio could not be loaded.
+          this.$$("#individual-audio-container").innerHTML = "";
+          this.set("_isAudioLoading", false);
+        }.bind(this));
+
+        // Initiate the request for new audio.
+        var sourceElement = document.createElement("source");
+        let metadata = metadatas[stepIndex];
+        sourceElement.setAttribute("src", metadata.url);
+        sourceElement.setAttribute("type", metadata.content_type);
+        audioElement.appendChild(sourceElement);
+      },
+      _computeStepValue: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas[stepIndex].step;
+      },
+      _computeStepWallTime: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas[stepIndex].wall_time.toString();
+      },
+      _computeMaxStepIndex: function(metadatas) {
+        if (!metadatas || metadatas.length === 0) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas.length - 1;
+      },
+      _hasAtLeastOneStep: function(metadatas) {
+        return metadatas && metadatas.length > 0;
+      },
     });
   </script>
 </dom-module>
@@ -6523,11 +6861,13 @@ var VZ;
     <div id="fullContainer" class="container scrollbar">
       <div id="topRow" class="container">
         <div class="noshrink" id="paddingCell"></div>
-        <template is="dom-repeat" items="[[runs]]" as="run">
-        <div class="run-name-cell noshrink">
-          <span>[[run]]</span>
-        </div>
-      </template>
+        <template is="dom-if" if="[[_tagsExist(tags)]]">
+          <template is="dom-repeat" items="[[runs]]" as="run">
+            <div class="run-name-cell noshrink">
+              <span>[[run]]</span>
+            </div>
+          </template>
+        </template>
       </div>
       <div id="bottomContainer" class="container">
         <template is="dom-repeat" items="[[tags]]" as="tag">
@@ -6551,6 +6891,7 @@ var VZ;
       :host {
         display: block;
         height: 100%;
+        --audio-cell-min-height: 105px;
       }
       .container {
         display: flex;
@@ -6579,14 +6920,17 @@ var VZ;
         padding-top: 5px;
       }
       .audio-cell {
+        background: #FAFAFA;
         width: 300px;
-        height: 36px;
+        min-height: var(--audio-cell-min-height);
         border: 1px solid black;
         margin-right: 3px;
+        padding: 10px;
+        box-sizing: border-box;
       }
       .tag-name-cell {
         width: 300px;
-        height: 36px;
+        height: var(--audio-cell-min-height);
         display:flex;
         flex-direction: column;
         justify-content: center;
@@ -6598,7 +6942,6 @@ var VZ;
       }
       .run-name-cell {
         width: 300px;
-        height: 36px;
         text-align: center;
         margin-right: 5px;
       }
@@ -6607,7 +6950,6 @@ var VZ;
       }
       #paddingCell {
         width: 300px;
-        height: 36px;
       }
     </style>
   </template>
@@ -6620,6 +6962,9 @@ var VZ;
         runs: Array,
         audioGenerator: Function,
       },
+      _tagsExist: function(tags) {
+        return tags && tags.length > 0;
+      },
       _exists: function (run, tag) {
         return this.runToAudio[run].indexOf(tag) !== -1;
       },
@@ -6650,12 +6995,16 @@ var VZ;
     </style>
   </template>
   <script>
-    Polymer({
+    TF.Dashboard.TfAudioDashboard = Polymer({
       is: "tf-audio-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
       properties: {
         dataType: {value: "audio"},
       },
       behaviors: [
+        TF.Dashboard.DashboardBehavior("audio"),
         TF.Dashboard.ReloadBehavior("tf-audio-loader"),
         TF.Backend.Behavior
       ],
@@ -6834,7 +7183,6 @@ Polymer({
   }
 });
 </script>
-<script src="../lodash/lodash.min.js"></script>
 <script src="../graphlib/dist/graphlib.core.js"></script>
 <script src="../dagre/dist/dagre.core.js"></script>
 <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
@@ -7065,6 +7413,8 @@ var tf;
         ;
         /** Attribute key reserved for the shapes of the output tensors. */
         var OUTPUT_SHAPES_KEY = '_output_shapes';
+        /** Attribute key reserved for the XLA cluster that an op runs on. */
+        var _XLA_CLUSTER_KEY = '_XlaCluster';
         /**
          * A SlimGraph is inspired by graphlib.Graph, but having only the functionality
          * that we need.
@@ -7121,6 +7471,7 @@ var tf;
                 // control dependency.
                 this.inputs = normalizeInputs(rawNode.input);
                 this.outputShapes = extractOutputShapes(rawNode.attr);
+                this.xlaCluster = extractXlaCluster(rawNode.attr);
                 // additional properties
                 this.type = NodeType.OP;
                 this.isGroupNode = false;
@@ -7174,6 +7525,7 @@ var tf;
                                 else {
                                     /* tslint:disable */
                                     console.log('ignoring negative memory allocation for ' + nodeName);
+                                    /* tslint:enable */
                                 }
                             }
                         });
@@ -7196,6 +7548,7 @@ var tf;
                         else {
                             /* tslint:disable */
                             console.log('ignoring negative runtime for ' + nodeName);
+                            /* tslint:enable */
                         }
                     }
                 });
@@ -7447,6 +7800,7 @@ var tf;
          * Extracts the shapes of the output tensors from the attr property in the
          * node proto.
          */
+        // tslint:disable-next-line:no-any
         function extractOutputShapes(attr) {
             var result = null;
             // We don't know anything about the output tensors.
@@ -7489,6 +7843,25 @@ var tf;
             // about the output tensors.
             return null;
         }
+        /**
+         * Extracts the XLA Cluster that an op runs on from the attrs of the OpNode.
+         * @param attr The attr property.
+         * @return A string that is the name of the cluster. Or null if it could not be
+         *     determined.
+         */
+        // tslint:disable-next-line:no-any
+        function extractXlaCluster(attr) {
+            if (!attr) {
+                return null;
+            }
+            // Find the attribute for XLA cluster if there is one.
+            for (var i = 0; i < attr.length; i++) {
+                if (attr[i].key === _XLA_CLUSTER_KEY) {
+                    return attr[i].value['s'] || null;
+                }
+            }
+            return null;
+        }
         /**
          * Normalizes the inputs and extracts associated metadata:
          * 1) Inputs can contain a colon followed by a number at the end
@@ -8176,14 +8549,19 @@ var tf;
                 var seriesNames = {};
                 return tf.graph.util
                     .runAsyncTask('Adding nodes', 20, function () {
-                    // Get all the possible device names.
+                    // Get all the possible device and XLA cluster names.
                     var deviceNames = {};
+                    var xlaClusterNames = {};
                     _.each(graph.nodes, function (node, nodeName) {
-                        if (node.device != null) {
+                        if (node.device) {
                             deviceNames[node.device] = true;
                         }
+                        if (node.xlaCluster) {
+                            xlaClusterNames[node.xlaCluster] = true;
+                        }
                     });
                     h.devices = _.keys(deviceNames);
+                    h.xlaClusters = _.keys(xlaClusterNames);
                     addNodes(h, graph);
                 }, tracker)
                     .then(function () {
@@ -8203,7 +8581,9 @@ var tf;
                         h.templates = graph_1.template.detect(h, params.verifyTemplate);
                     }, tracker);
                 })
-                    .then(function () { return h; });
+                    .then(function () {
+                    return h;
+                });
             }
             hierarchy_1.build = build;
             ;
@@ -9518,11 +9898,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 </script>
-<script>var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+<script>var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 /* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the 'License');
@@ -9582,7 +9967,12 @@ var tf;
                     var light = lightened ? 95 : 80;
                     return d3.hsl(hue, .01 * sat, .01 * light).toString();
                 },
-                DEVICE_PALETTE: function (index) { return render.MetanodeColors.STRUCTURE_PALETTE(index); },
+                DEVICE_PALETTE: function (index) {
+                    return render.MetanodeColors.STRUCTURE_PALETTE(index);
+                },
+                XLA_CLUSTER_PALETTE: function (index) {
+                    return render.MetanodeColors.STRUCTURE_PALETTE(index);
+                },
                 UNKNOWN: '#eee',
                 GRADIENT_OUTLINE: '#888'
             };
@@ -9690,6 +10080,10 @@ var tf;
                     this.deviceColorMap = d3.scale.ordinal()
                         .domain(this.hierarchy.devices)
                         .range(_.map(d3.range(this.hierarchy.devices.length), render.MetanodeColors.DEVICE_PALETTE));
+                    this.xlaClusterColorMap =
+                        d3.scale.ordinal()
+                            .domain(this.hierarchy.xlaClusters)
+                            .range(_.map(d3.range(this.hierarchy.xlaClusters.length), render.MetanodeColors.XLA_CLUSTER_PALETTE));
                     var topLevelGraph = this.hierarchy.root.metagraph;
                     // Find the maximum and minimum memory usage.
                     var memoryExtent = d3.extent(topLevelGraph.nodes(), function (nodeName, index) {
@@ -9761,6 +10155,12 @@ var tf;
                         renderInfo.computeTimeColor =
                             this.computeTimeScale(node.stats.totalMicros);
                     }
+                    if (!node.isGroupNode) {
+                        var clusterName = node.xlaCluster;
+                        if (clusterName) {
+                            renderInfo.xlaClusterColor = this.xlaClusterColorMap(clusterName);
+                        }
+                    }
                     // We only fade nodes when we're displaying stats.
                     renderInfo.isFadedOut = this.displayingStats &&
                         !tf.graph.util.hasDisplayableNodeStats(node.stats);
@@ -10747,6 +11147,8 @@ var tf;
                                 graph.removeNode(n);
                             }
                             else {
+                                // if a low degree node has both in- & out- annotations, do nothing
+                                // because it is unclear which side it should go to.
                             }
                         }
                     }
@@ -11913,8 +12315,9 @@ var tf;
                 (function (ColorBy) {
                     ColorBy[ColorBy["STRUCTURE"] = 0] = "STRUCTURE";
                     ColorBy[ColorBy["DEVICE"] = 1] = "DEVICE";
-                    ColorBy[ColorBy["COMPUTE_TIME"] = 2] = "COMPUTE_TIME";
-                    ColorBy[ColorBy["MEMORY"] = 3] = "MEMORY";
+                    ColorBy[ColorBy["XLA_CLUSTER"] = 2] = "XLA_CLUSTER";
+                    ColorBy[ColorBy["COMPUTE_TIME"] = 3] = "COMPUTE_TIME";
+                    ColorBy[ColorBy["MEMORY"] = 4] = "MEMORY";
                 })(ColorBy = node_1.ColorBy || (node_1.ColorBy = {}));
                 ;
                 /**
@@ -11974,6 +12377,9 @@ var tf;
                                 });
                             }
                             return isExpanded ? colorParams.EXPANDED_COLOR : "url(#" + escapedId + ")";
+                        case ColorBy.XLA_CLUSTER:
+                            return isExpanded ? colorParams.EXPANDED_COLOR :
+                                renderInfo.xlaClusterColor || colorParams.UNKNOWN;
                         case ColorBy.COMPUTE_TIME:
                             return isExpanded ?
                                 colorParams.EXPANDED_COLOR : renderInfo.computeTimeColor ||
@@ -14351,7 +14757,7 @@ Polymer({
 <svg id="svg">
   <defs>
 
-
+    
     <path id="ref-arrowhead-path" d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"></path>
     <marker class="ref-arrowhead" id="ref-arrowhead-small" viewBox="0 0 10 10" markerWidth="10" markerHeight="10" refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
       <use xlink:href="#ref-arrowhead-path"></use>
@@ -14366,7 +14772,7 @@ Polymer({
       <use xlink:href="#ref-arrowhead-path"></use>
     </marker>
 
-
+    
     <marker id="annotation-arrowhead" markerWidth="5" markerHeight="5" refX="5" refY="2.5" orient="auto">
       <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"></path>
     </marker>
@@ -14379,23 +14785,23 @@ Polymer({
     <marker id="ref-annotation-arrowhead-faded" markerWidth="5" markerHeight="5" refX="0" refY="2.5" orient="auto">
       <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"></path>
     </marker>
-
+    
     <ellipse id="op-node-stamp" rx="7.5" ry="3" stroke="inherit" fill="inherit"></ellipse>
-
+    
     <ellipse id="op-node-annotation-stamp" rx="5" ry="2" stroke="inherit" fill="inherit"></ellipse>
-
+    
     <g id="op-series-vertical-stamp">
       <use xlink:href="#op-node-stamp" x="8" y="9"></use>
       <use xlink:href="#op-node-stamp" x="8" y="6"></use>
       <use xlink:href="#op-node-stamp" x="8" y="3"></use>
     </g>
-
+    
     <g id="op-series-horizontal-stamp">
       <use xlink:href="#op-node-stamp" x="16" y="4"></use>
       <use xlink:href="#op-node-stamp" x="12" y="4"></use>
       <use xlink:href="#op-node-stamp" x="8" y="4"></use>
     </g>
-
+    
     <g id="op-series-annotation-stamp">
       <use xlink:href="#op-node-annotation-stamp" x="9" y="2"></use>
       <use xlink:href="#op-node-annotation-stamp" x="7" y="2"></use>
@@ -14404,10 +14810,10 @@ Polymer({
     <svg id="summary-icon" fill="#848484" height="12" viewBox="0 0 24 24" width="12">
       <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"></path>
     </svg>
-
+    
     <g id="linearGradients"></g>
 
-
+    
     <pattern id="rectHatch" patternTransform="rotate(45 0 0)" width="5" height="5" patternUnits="userSpaceOnUse">
       <line x1="0" y1="0" x2="0" y2="5" style="stroke-width: 1"></line>
     </pattern>
@@ -14415,7 +14821,7 @@ Polymer({
       <line x1="0" y1="0" x2="0" y2="2" style="stroke-width: 1"></line>
     </pattern>
 
-
+    
     <filter id="health-pill-shadow" x="-40%" y="-40%" width="180%" height="180%">
       <feGaussianBlur in="SourceAlpha" stdDeviation="0.8"></feGaussianBlur>
       <feOffset dx="0" dy="0" result="offsetblur"></feOffset>
@@ -14427,7 +14833,7 @@ Polymer({
       </feMerge>
     </filter>
   </defs>
-
+  
   <rect fill="white" width="10000" height="10000"></rect>
   <g id="root"></g>
 </svg>
@@ -14440,6 +14846,18 @@ Polymer({
     renderHierarchy: Object,
     name: String,
     colorBy: String,
+
+    // For each render hierarchy, we only fit it to the viewport once (when the scene is attached to
+    // the DOM). We do not fit the hierarchy again (unless the user clicks the reset button). For
+    // instance, if the user enters a certain view in the graph, switches to another dashboard, and
+    // returns to the graph dashboard, the user expects the previous view. These properties enable
+    // that behavior.
+
+    /** Whether the scene has fit the current render hierarchy (to the viewport) at least once. */
+    _hasRenderHierarchyBeenFitOnce: Boolean,
+    /** Whether this scene element is currently attached to a parent element. */
+    _isAttached: Boolean,
+
     /** @type {d3_zoom} d3 zoom object */
     _zoom: Object,
     highlightedNode: {
@@ -14544,7 +14962,10 @@ Polymer({
   },
   observers: [
     '_colorByChanged(colorBy)',
-    '_buildAndFit(renderHierarchy)',
+    '_renderHierarchyChanged(renderHierarchy)',
+    // Animation and fitting must come after the observer for the hierarchy changing because we must
+    // first build the render hierarchy.
+    '_animateAndFit(_isAttached, renderHierarchy)',
     '_updateHealthPills(nodeNamesToHealthPills, healthPillStepIndex)',
   ],
   getNode: function(nodeName) {
@@ -14647,9 +15068,24 @@ Polymer({
         tf.graph.layout.PARAMS.minimap.size,
         tf.graph.layout.PARAMS.subscene.meta.labelHeight);
   },
-  _buildAndFit: function(renderHierarchy) {
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
+  _renderHierarchyChanged: function(renderHierarchy) {
+    this._hasRenderHierarchyBeenFitOnce = false;
     this._resetState();
     this._build(renderHierarchy);
+  },
+  _animateAndFit: function(isAttached, renderHierarchy) {
+    if (this._hasRenderHierarchyBeenFitOnce || !isAttached) {
+      // Do not animate and fit if the scene has already fitted this render hierarchy once. Or if
+      // the graph dashboard is not attached (in which case the scene lacks DOM info for fitting).
+      return;
+    }
+
     // Fit to screen after the graph is done animating.
     setTimeout(this.fit.bind(this), tf.graph.layout.PARAMS.animation.duration);
   },
@@ -14702,6 +15138,7 @@ Polymer({
     }
   },
   fit: function() {
+    this._hasRenderHierarchyBeenFitOnce = true;
     tf.graph.scene.fit(this.$.svg, this.$.root, this._zoom, function() {
       this._zoomed = false;
     }.bind(this));
@@ -14983,7 +15420,14 @@ Polymer({
             device: deviceName,
             color: renderGraph.deviceColorMap(deviceName)
           };
-        })
+        }),
+        xla_cluster: _.map(renderGraph.xlaClusterColorMap.domain(),
+            function(xlaClusterName) {
+          return {
+            xla_cluster: xlaClusterName,
+            color: renderGraph.xlaClusterColorMap(xlaClusterName)
+          };
+        }),
       });
       this._setRenderHierarchy(renderGraph);
       this.async(function() {
@@ -16111,6 +16555,17 @@ h2 {
    * Apparently, the paper-slider lacks a mixin for those padding values. */
   width: calc(100% + 31px);
 }
+
+#health-pills-loading-spinner {
+  width: 20px;
+  height: 20px;
+  vertical-align: top;
+}
+
+#health-pill-step-number-input {
+  text-align: center;
+  vertical-align: top;
+}
 </style>
 <template is="dom-if" if="{{selectedNode}}">
   <paper-material elevation="1" class="card">
@@ -16118,13 +16573,31 @@ h2 {
     </tf-node-info>
   </paper-material>
 </template>
-<template is="dom-if" if="[[_healthPillsAvailable(nodeNamesToHealthPills)]]">
+<template is="dom-if" if="[[_healthPillsAvailable(debuggerDataEnabled, nodeNamesToHealthPills)]]">
   <paper-material elevation="1" class="card health-pill-legend">
-    <template is="dom-if" if="[[_maxStepIndex]]">
-      <h2>
-        Step of Health Pills: [[_currentStepDisplayValue]]
-      </h2>
-      <paper-slider id="health-pill-step-slider" immediate-value="{{healthPillStepIndex}}" max="[[_maxStepIndex]]" snaps="" step="1" value="{{healthPillStepIndex}}"></paper-slider>
+    <div class="title">
+      Enable all (not just sampled) steps. Requires slow disk read.
+    </div>
+    <paper-toggle-button id="enableAllStepsModeToggle" checked="{{allStepsModeEnabled}}">
+    </paper-toggle-button>
+    <h2>
+      Step of Health Pills:
+      <template is="dom-if" if="[[allStepsModeEnabled]]">
+        <input type="number" id="health-pill-step-number-input" min="0" max="[[_biggestStepEverSeen]]" value="{{specificHealthPillStep::input}}">
+      </template>
+      <template is="dom-if" if="[[!allStepsModeEnabled]]">
+        [[_currentStepDisplayValue]]
+      </template>
+
+      <paper-spinner-lite active="" hidden$="[[!areHealthPillsLoading]]" id="health-pills-loading-spinner"></paper-spinner-lite>
+    </h2>
+    <template is="dom-if" if="[[allStepsModeEnabled]]">
+      <paper-slider id="health-pill-step-slider" immediate-value="{{specificHealthPillStep}}" max="[[_biggestStepEverSeen]]" snaps="" step="1" value="{{specificHealthPillStep}}"></paper-slider>
+    </template>
+    <template is="dom-if" if="[[!allStepsModeEnabled]]">
+      <template is="dom-if" if="[[_maxStepIndex]]">
+        <paper-slider id="health-pill-step-slider" immediate-value="{{healthPillStepIndex}}" max="[[_maxStepIndex]]" snaps="" step="1" value="{{healthPillStepIndex}}"></paper-slider>
+      </template>
     </template>
     <h2>
       Health Pill
@@ -16162,6 +16635,13 @@ h2 {
         type: Number,
         notify: true,
       },
+      // Only relevant if we are in all steps mode, in which case the user may want to view health
+      // pills for a specific step.
+      specificHealthPillStep: {
+        type: Number,
+        value: 0,
+        notify: true,
+      },
       colorBy: String,
       // Two-ways
       selectedNode: {
@@ -16177,6 +16657,11 @@ h2 {
         type: Number,
         notify: true
       },
+      // Whether debugger data is enabled for this instance of Tensorboard.
+      debuggerDataEnabled: Boolean,
+      // Whether health pills are currently being loaded, in which case we show a spinner (and the
+      // current health pills shown might be out of date).
+      areHealthPillsLoading: Boolean,
       healthPillEntries: {
         type: Array,
         value: tf.graph.scene.healthPillEntries,
@@ -16184,7 +16669,19 @@ h2 {
       },
       healthPillValuesForSelectedNode: {
         type: Array,
-        computed: '_computeHealthPillForNode(nodeNamesToHealthPills, healthPillStepIndex, selectedNode)',
+        computed: '_computeHealthPillForNode(nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading)',
+      },
+      // When all-steps mode is enabled, the user can request health pills for any step. In this
+      // mode, Tensorboard makes a request every time the user drags the slider to a different step.
+      allStepsModeEnabled: {
+        type: Boolean,
+        notify: true,
+      },
+      // The biggest step value ever seen. Used to determine what steps of health pills to let the
+      // user fetch in all steps mode.
+      _biggestStepEverSeen: {
+        type: Number,
+        computed: '_computeBiggestStepEverSeen(nodeNamesToHealthPills)',
       },
       _maxStepIndex: {
         type: Number,
@@ -16192,7 +16689,7 @@ h2 {
       },
       _currentStepDisplayValue: {
         type: String,
-        computed: '_computeCurrentStepDisplayValue(nodeNamesToHealthPills, healthPillStepIndex)',
+        computed: '_computeCurrentStepDisplayValue(nodeNamesToHealthPills, healthPillStepIndex, allStepsModeEnabled, specificHealthPillStep, areHealthPillsLoading)',
       },
     },
     listeners: {
@@ -16209,12 +16706,11 @@ h2 {
     _nodeListItemMouseout: function() {
       this.highlightedNode = null;
     },
-    _healthPillsAvailable: function(nodeNamesToHealthPills) {
-      let count = 0;
-      for (let nodeName in nodeNamesToHealthPills) {
-        return true;
-      }
-      return false;
+    _healthPillsAvailable: function(debuggerDataEnabled, nodeNamesToHealthPills) {
+      // So long as there is a mapping (even if empty) from node name to health pills, show the
+      // legend and slider. We do that because, even if no health pills exist at the current step,
+      // the user may desire to change steps, and the slider must show for the user to do that.
+      return debuggerDataEnabled && nodeNamesToHealthPills;
     },
     _computeTensorCountString: function(healthPillValuesForSelectedNode, valueIndex) {
       if (!healthPillValuesForSelectedNode) {
@@ -16225,7 +16721,12 @@ h2 {
       return healthPillValuesForSelectedNode[valueIndex].toFixed(0);
     },
     _computeHealthPillForNode: function(
-        nodeNamesToHealthPills, healthPillStepIndex, selectedNode) {
+        nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading) {
+      if (areHealthPillsLoading) {
+        // Health pills are loading. Do not render data that is out of date.
+        return null;
+      }
+
       if (!selectedNode) {
         // No node is selected.
         return null;
@@ -16237,7 +16738,9 @@ h2 {
         return null;
       }
 
-      const healthPill = healthPills[healthPillStepIndex];
+      // If all steps mode is enabled, we use the first health pill in the list because the JSON
+      // response from the server is a mapping between node name and a list of 1 health pill.
+      const healthPill = healthPills[allStepsModeEnabled ? 0 : healthPillStepIndex];
       if (!healthPill) {
         // This node lacks a health pill at the current step.
         return null;
@@ -16246,16 +16749,44 @@ h2 {
       // The health pill count values start at 2. Each health pill contains 6 values.
       return healthPill.value.slice(2, 8);
     },
-    _computeCurrentStepDisplayValue: function(nodeNamesToHealthPills, healthPillStepIndex) {
+    _computeCurrentStepDisplayValue: function(
+        nodeNamesToHealthPills,
+        healthPillStepIndex,
+        allStepsModeEnabled,
+        specificHealthPillStep,
+        areHealthPillsLoading) {
+      if (allStepsModeEnabled) {
+        // The user seeks health pills for specific step from the server.
+        return specificHealthPillStep.toFixed(0);
+      }
+
+      if (areHealthPillsLoading) {
+        // The current step is undefined.
+        return 0;
+      }
+
       for (let nodeName in nodeNamesToHealthPills) {
         // All nodes have the same number of steps stored, so only examine 1 node. We cannot
         // directly index into the nodeNamesToHealthPills object because we do not have a key.
+        // If all steps mode is enabled, we only have 1 step to show.
         return nodeNamesToHealthPills[nodeName][healthPillStepIndex].step.toFixed(0);
       }
 
       // The current step could not be computed.
       return 0;
     },
+    _computeBiggestStepEverSeen: function(nodeNamesToHealthPills) {
+      for (let nodeName in nodeNamesToHealthPills) {
+        // All nodes have the same number of steps stored, so only examine 1 node.
+        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
+        // of the array will be greater than 1.
+        var healthPills = nodeNamesToHealthPills[nodeName];
+        return Math.max(this._biggestStepEverSeen, healthPills[healthPills.length - 1].step);
+      }
+
+      // No steps seen so far. Default to 0.
+      return this._biggestStepEverSeen || 0;
+    },
     _computeMaxStepIndex: function(nodeNamesToHealthPills) {
       for (let nodeName in nodeNamesToHealthPills) {
         // All nodes have the same number of steps stored, so only examine 1 node.
@@ -16379,7 +16910,7 @@ paper-progress {
     <tf-graph id="graph" graph-hierarchy="{{graphHierarchy}}" basic-graph="[[graph]]" hierarchy-params="[[hierarchyParams]]" render-hierarchy="{{renderHierarchy}}" devices-for-stats="[[devicesForStats]]" stats="[[stats]]" selected-node="{{_selectedNode}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="{{colorByParams}}" progress="{{progress}}" node-names-to-health-pills="[[nodeNamesToHealthPills]]" health-pill-step-index="[[healthPillStepIndex]]"></tf-graph>
   </div>
   <div id="info">
-    <tf-graph-info id="graph-info" title="selected" graph-hierarchy="[[graphHierarchy]]" render-hierarchy="[[renderHierarchy]]" graph="[[graph]]" selected-node="{{_selectedNode}}" selected-node-include="{{_selectedNodeInclude}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="[[colorByParams]]" node-names-to-health-pills="[[nodeNamesToHealthPills]]" health-pill-step-index="{{healthPillStepIndex}}"></tf-graph-info>
+    <tf-graph-info id="graph-info" title="selected" graph-hierarchy="[[graphHierarchy]]" render-hierarchy="[[renderHierarchy]]" graph="[[graph]]" selected-node="{{_selectedNode}}" selected-node-include="{{_selectedNodeInclude}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="[[colorByParams]]" debugger-data-enabled="[[debuggerDataEnabled]]" are-health-pills-loading="[[areHealthPillsLoading]]" node-names-to-health-pills="[[nodeNamesToHealthPills]]" all-steps-mode-enabled="{{allStepsModeEnabled}}" specific-health-pill-step="{{specificHealthPillStep}}" health-pill-step-index="{{healthPillStepIndex}}"></tf-graph-info>
   </div>
   <div class="context-menu"></div>
 </div>
@@ -16410,8 +16941,26 @@ Polymer({
       type: Object,
       notify: true
     },
+    // Whether debugger data is enabled for this instance of Tensorboard.
+    debuggerDataEnabled: Boolean,
+    // Whether health pills are currently being loaded.
+    areHealthPillsLoading: Boolean,
     // A mapping between node name to the tf.graph.scene.HealthPill to render.
     nodeNamesToHealthPills: Object,
+    // Whether the user can request health pills for individual steps from the server. This can be
+    // slow compared the default of showing sampled health pills.
+    allStepsModeEnabled: {
+      type: Boolean,
+      notify: true,
+      value: false,
+    },
+    // Relevant if allStepsModeEnabled. The specific step for which to fetch health pills from the
+    // server for.
+    specificHealthPillStep: {
+      type: Number,
+      notify: true,
+      value: 0,
+    },
     // The step of health pills to show throughout the graph.
     healthPillStepIndex: Number,
     // Private API: Data routing between child components.
@@ -16574,7 +17123,7 @@ svg.icon {
 .title small {
   font-weight: normal;
 }
-.deviceList {
+.deviceList, .xlaClusterList {
   max-height: 200px;
   overflow-y: auto;
 }
@@ -16664,6 +17213,12 @@ table.control-holder {
 table.tf-graph-controls td.input-element-table-data {
   padding: 0 0 0 20px;
 }
+
+/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
+/*  tooltips do not appear. */
+#color-by-radio-group paper-radio-button {
+  pointer-events: auto !important;
+}
 </style>
 <svg width="0" height="0">
   <defs>
@@ -16743,13 +17298,33 @@ table.tf-graph-controls td.input-element-table-data {
   </tbody></table>
   <div class="control-holder">
     <div class="title">Color</div>
-    <paper-radio-group selected="{{colorBy}}">
+    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
       <paper-radio-button name="structure">Structure</paper-radio-button>
+
       <paper-radio-button name="device">Device</paper-radio-button>
-      <template is="dom-if" if="[[_statsNotNull(stats)]]">
-        <paper-radio-button name="compute_time">Compute time</paper-radio-button>
-        <paper-radio-button name="memory">Memory</paper-radio-button>
-      </template>
+
+      <paper-radio-button id="xla-cluster-radio-button" name="xla_cluster" disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
+        XLA Cluster
+      </paper-radio-button>
+      <paper-tooltip for="xla-cluster-radio-button" position="right">
+        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
+      </paper-tooltip>
+
+      <paper-radio-button id="compute-time-radio-button" name="compute_time" disabled="[[!stats]]">
+        Compute time
+      </paper-radio-button>
+      <paper-tooltip for="compute-time-radio-button" position="right">
+        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
+
+      <paper-radio-button id="memory-radio-button" name="memory" disabled="[[!stats]]">
+        Memory
+      </paper-radio-button>
+      <paper-tooltip for="memory-radio-button" position="right">
+        Coloring by memory is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
     </paper-radio-group>
   </div>
   <div>
@@ -16831,6 +17406,31 @@ table.tf-graph-controls td.input-element-table-data {
         </div>
       </div>
     </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
+      <div class="color-text">
+        <div class="xlaClusterList">
+          <table>
+          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
+            <tr>
+              <td style$="[[_getBackgroundColor(item.color)]]">
+                <div class="colorBox"></div>
+              </td>
+              <td>
+                <div>[[item.xla_cluster]]</div>
+              </td>
+            </tr>
+          </template>
+          </table>
+        </div>
+        <br>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#grey-rect" x="0" y="0"></use>
+          </svg>
+          <span class="color-legend-value">unknown XLA cluster</span>
+        </div>
+      </div>
+    </template>
     <template is="dom-if" if="[[_statsNotNull(stats)]]">
       <div class="color-legend-row">
         <svg>
@@ -16840,7 +17440,7 @@ table.tf-graph-controls td.input-element-table-data {
       </div>
     </template>
   </div>
-
+  
   <template is="dom-if" if="[[!_isGradientColoring(stats, colorBy)]]">
     <div class="legend-holder">
       <table>
@@ -17022,8 +17622,10 @@ Polymer({
     this.renderHierarchy.traceInputs = event.target.active;
     tf.graph.scene.node.traceInputs(this.renderHierarchy);
   },
-  _statsNotNull: function(stats) {
-    return stats != null;
+  _xlaClustersProvided: function(renderHierarchy) {
+    return renderHierarchy &&
+        renderHierarchy.hierarchy &&
+        renderHierarchy.hierarchy.xlaClusters.length > 0;
   },
   _statsChanged: function(stats) {
     if (stats == null) {
@@ -17175,7 +17777,7 @@ Polymer({
   <tf-graph-loader id="loader" datasets="[[_datasets]]" selected-dataset="[[_selectedDataset]]" selected-metadata-tag="[[_selectedMetadataTag]]" selected-file="[[_selectedFile]]" out-graph-hierarchy="{{_graphHierarchy}}" out-graph="{{_graph}}" out-stats="{{_stats}}" progress="{{_progress}}" out-hierarchy-params="{{_hierarchyParams}}"></tf-graph-loader>
 </div>
 <div class="center">
-    <tf-graph-board id="graphboard" devices-for-stats="[[_devicesForStats]]" color-by="[[_colorBy]]" color-by-params="{{_colorByParams}}" graph-hierarchy="[[_graphHierarchy]]" graph="[[_graph]]" hierarchy-params="[[_hierarchyParams]]" progress="[[_progress]]" node-names-to-health-pills="[[_nodeNamesToHealthPills]]" health-pill-step-index="[[_healthPillStepIndex]]" render-hierarchy="{{_renderHierarchy}}" stats="[[_stats]]"></tf-graph-board>
+    <tf-graph-board id="graphboard" devices-for-stats="[[_devicesForStats]]" color-by="[[_colorBy]]" color-by-params="{{_colorByParams}}" graph-hierarchy="[[_graphHierarchy]]" graph="[[_graph]]" hierarchy-params="[[_hierarchyParams]]" progress="[[_progress]]" debugger-data-enabled="[[debuggerDataEnabled]]" are-health-pills-loading="[[_areHealthPillsLoading]]" node-names-to-health-pills="[[_nodeNamesToHealthPills]]" all-steps-mode-enabled="{{allStepsModeEnabled}}" specific-health-pill-step="{{specificHealthPillStep}}" health-pill-step-index="[[_healthPillStepIndex]]" render-hierarchy="{{_renderHierarchy}}" stats="[[_stats]]"></tf-graph-board>
 </div>
 </tf-dashboard-layout>
 </template>
@@ -17196,9 +17798,14 @@ Polymer({
 
 <script>
 (function() {
-Polymer({
+TF.Dashboard.TfGraphDashboard = Polymer({
   is: 'tf-graph-dashboard',
+  factoryImpl: function(backend, debuggerDataEnabled) {
+    this.backend = backend;
+    this.debuggerDataEnabled = debuggerDataEnabled;
+  },
   behaviors: [
+    TF.Dashboard.DashboardBehavior("graphs"),
     TF.Dashboard.ReloadBehavior("tf-graph-dashboard"),
     TF.Backend.Behavior,
   ],
@@ -17207,18 +17814,38 @@ Polymer({
     _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
     backend: {type: Object, observer: '_backendChanged'},
     debuggerDataEnabled: Boolean,
+    allStepsModeEnabled: Boolean,
+    specificHealthPillStep: {type: Number, value: 0},
     healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
+    // Whether health pills are currently being loaded, in which case we may want to say show a
+    // spinner.
+    _areHealthPillsLoading: Boolean,
     // Maps the names of nodes to an array of health pills (HealthPillDatums).
     _nodeNamesToHealthPills: {
       type: Object,
       value: {},
     },
     _healthPillStepIndex: Number,
-    runs: Array
+    // A strictly increasing ID. Each request for health pills has a unique ID. This helps us
+    // identify stale requests.
+    _healthPillRequestId: {type: Number, value: 1},
+    // The setTimeout ID for the pending request for health pills at a specific step.
+    _healthPillStepRequestTimerId: Number,
+    // The request for health pills at a specific step (as opposed to all sampled health pills) may
+    // involve slow disk reads. Hence, we throttle to 1 of those requests every this many ms.
+    _healthPillStepRequestTimerDelay: {
+      type: Number,
+      value: 500,
+      readOnly: true,
+    },
+    runs: Array,
   },
   listeners: {
     'node-toggle-expand': '_handleNodeToggleExpand',
   },
+  observers: [
+    '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+  ],
   reload: function() {
     if (!this.debuggerDataEnabled ||
         !this.healthPillsToggledOn ||
@@ -17257,12 +17884,51 @@ Polymer({
       }.bind(this));
   },
   _requestHealthPills: function() {
-    this.backend.healthPills(this._renderHierarchy.getNamesOfRenderedOps()).then(function(result) {
+    this.set('_areHealthPillsLoading', true);
+    const requestId = ++this._healthPillRequestId;
+
+    if (this._healthPillStepRequestTimerId !== null) {
+      // A request for health pills is already scheduled to be initiated. Clear it, and schedule a
+      // new request.
+      window.clearTimeout(this._healthPillStepRequestTimerId);
+      this._healthPillStepRequestTimerId = null;
+    }
+
+    if (this.allStepsModeEnabled) {
+      // This path may be slow. Schedule network requests to start some time later. If another
+      // request is scheduled in the mean time, drop this current request.
+      this._healthPillStepRequestTimerId = setTimeout(function() {
+        this._healthPillStepRequestTimerId = null;
+        this._initiateNetworkRequestForHealthPills(requestId);
+      }.bind(this), this._healthPillStepRequestTimerDelay);
+    } else {
+      // The user is fetching sampled steps. This path is fast, so no need to throttle. Directly
+      // fetch the health pills across the network.
+      this._initiateNetworkRequestForHealthPills(requestId);
+    }
+  },
+  // Initiates the network request for health pills. Do not directly call this method - network
+  // requests may be throttled. Instead, call _requestHealthPills, which uses this method.
+  _initiateNetworkRequestForHealthPills: function(requestId) {
+    if (this._healthPillRequestId !== requestId) {
+      // This possibly scheduled request was outdated before it was even sent across the network. Do
+      // not bother initiating it.
+      return;
+    }
+
+    const specificStep = this.allStepsModeEnabled ? this.specificHealthPillStep : undefined;
+    this.backend.healthPills(this._renderHierarchy.getNamesOfRenderedOps(), specificStep).then(
+        function(result) {
       if (!this.healthPillsToggledOn) {
         // The user has opted to hide health pills via the toggle button.
         return;
       }
 
+      if (requestId !== this._healthPillRequestId) {
+        // This response is no longer relevant.
+        return;
+      }
+
       // Set the index for which step to show for the health pills. By default, show the last step.
       // A precondition we assume (that Tensorboard's reservoir sampling guarantees) is that all
       // node names should be mapped to the same number of steps.
@@ -17272,6 +17938,8 @@ Polymer({
       }
 
       this.set('_nodeNamesToHealthPills', result);
+      this.set('_areHealthPillsLoading', false);
+      this.set('_healthPillStepRequestTimerId', null);
     }.bind(this));
   },
   _datasetsEmpty: function(datasets) {
@@ -17295,9 +17963,195 @@ Polymer({
       this.set('_nodeNamesToHealthPills', {});
     }
   },
+  // Fetch health pills for a specific step if applicable.
+  _maybeFetchHealthPillsAtSpecificStep: function(allStepsModeEnabled, specificHealthPillStep) {
+    if (!this._renderHierarchy) {
+      // The graph is not ready yet.
+      return;
+    }
+
+    this._requestHealthPills();
+  },
 });
 })();
 </script>
+<link rel="import" href="../paper-material/paper-material.html">
+
+
+<style>
+  tf-text-loader p {
+    margin: 0.3em 0;
+  }
+
+  tf-text-loader table {
+    border-collapse: collapse;
+  }
+
+  tf-text-loader table th {
+    font-weight: 600;
+  }
+
+  tf-text-loader table th,
+  tf-text-loader table td {
+    padding: 6px 13px;
+    border: 1px solid #dfe2e5;
+  }
+
+  tf-text-loader table tr {
+    background-color: #fff;
+    border-top: 1px solid #c6cbd1;
+  }
+
+</style>
+<dom-module id="tf-text-loader" assetpath="../tf-text-dashboard/">
+
+  
+  <template>
+    <style include="scrollbar-style"></style>
+    <paper-material elevation="1" id="outer" class="container scrollbar">
+      <template id="repeater" is="dom-repeat" items="[[_texts]]">
+      <paper-material elevation="1" class="step-container">
+        step <span class="step-value">[[_numfmt(item.step)]]</span>
+      </paper-material>
+      <paper-material elevation="1" inner-h-t-m-l="[[item.text]]" class="text">
+        </paper-material>
+      </template>
+    </paper-material>
+
+
+    <style>
+      #outer {
+        display: block;
+        overflow: auto;
+        max-height: 500px;
+        position: relative;
+        border-radius: 3px;
+        border: 2px solid black;
+      }
+      .text {
+        margin: 0 10px 10px 10px;
+        border-radius: 0 3px 3px 3px;
+        background-color: white;
+        padding: 5px;
+        word-break: break-word;
+      }
+      .step-container {
+        border-left: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        border-top: 1px solid #ccc;
+        border-radius: 3px 3px 0 0;
+        font-style: italic;
+        margin-top: 10px;
+        background-color: var(--tb-ui-light-accent);
+        display: inline-block;
+        margin-left: 9px;
+        padding: 3px;
+        font-size: 12px;
+      }
+
+    </style>
+
+  </template>
+  <script>
+    Polymer({
+      is: "tf-text-loader",
+      properties: {
+        colorScale: Object,
+        run: String,
+        // This is an array of Tensorboard Text&Datum objects (See backend.ts for details). The
+        // properties of objects in this array are
+        // {
+        //   wall_time: Date,
+        //   step: number,
+        //   text: string,
+        // }
+        // they are ordered from most recent to oldest
+        _texts: {
+          type: Array,
+          value: [],
+        },
+
+      },
+      redraw: function() {
+        // Other dashboards logic requires a redraw method to be defined.
+      },
+      setVisibleSeries: function(runs) {
+        // Do nothing.
+      },
+      setSeriesData: function(run, texts) {
+        this.set("run", run);
+        this.set("_texts", texts.reverse());
+
+        // Update the border color based on the run.
+        var color = this.colorScale.scale(run);
+        this.$$("#outer").style.borderColor = color;
+      },
+      _numfmt: function(n) {
+        return d3.format(",")(n);
+      }
+    });
+  </script>
+</dom-module>
+
+<dom-module id="tf-text-dashboard" assetpath="../tf-text-dashboard/">
+  <template>
+    <paper-dialog with-backdrop="" id="actual-text-size-dialog"></paper-dialog>
+    <div id="plumbing">
+      <tf-color-scale id="colorScale" runs="[[runs]]" out-color-scale="{{_colorScale}}"></tf-color-scale>
+    </div>
+
+    <tf-dashboard-layout>
+      <div class="sidebar">
+        <tf-sidebar-helper backend="[[backend]]" categories="{{_categories}}" color-scale="[[_colorScale]]" run2tag="[[run2tag]]" runs="[[runs]]" selected-runs="{{_selectedRuns}}">
+        </tf-sidebar-helper>
+      </div>
+      <div class="center">
+        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
+          <template>
+            <tf-text-loader color-scale="[[_colorScale]]"></tf-text-loader>
+          </template>
+        </tf-panes-helper>
+      </div>
+    </tf-dashboard-layout>
+    <style include="dashboard-style"></style>
+    <style>
+      tf-panes-helper {
+        --card-width: 100%;
+        --card-height: auto;
+        --card-expanded-width: 100%;
+        --card-expanded-height: 1000px;
+        --card-padding: 0 5px 5px 5px;
+        --show-expand-button: none;
+      }
+
+    </style>
+  </template>
+  <script>
+    TF.Dashboard.TfTextDashboard = Polymer({
+      is: "tf-text-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
+      properties: {
+        backend: Object,
+        dataType: {
+          type: String,
+          value: "text"
+        },
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("text"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.Behavior,
+      ],
+      attached: function() {
+        this.async(function() {
+          this.fire("rendered");
+        });
+      },
+    });
+  </script>
+</dom-module>
 <dom-module id="vz-projector-styles" assetpath="../vz-projector/">
 <template>
 <style>
@@ -17575,13 +18429,13 @@ paper-textarea {
       </paper-tooltip>
     </div>
     <div id="icon-container">
-
+      
       <paper-icon-button id="expand-more" icon="expand-less" on-tap="_expandMore"></paper-icon-button>
       <paper-icon-button id="expand-less" style="display: none" icon="expand-more" on-tap="_expandLess"></paper-icon-button>
     </div>
   </div>
   <iron-collapse id="panel">
-
+    
     <div id="state-section">
       <template is="dom-if" if="[[!savedStates.length]]">
         <p id="no-bookmarks">
@@ -17838,7 +18692,7 @@ paper-dropdown-menu paper-item {
 </style>
 <div class="title">DATA</div>
 <div class="container">
-
+  
   <template is="dom-if" if="[[_hasChoices(runNames)]]">
     <paper-dropdown-menu no-animations="" label="[[_getNumRunsLabel(runNames)]] found">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedRun}}">
@@ -17852,7 +18706,7 @@ paper-dropdown-menu paper-item {
   </template>
 
   <template is="dom-if" if="[[tensorNames]]">
-
+    
     <paper-dropdown-menu no-animations="" label="[[_getNumTensorsLabel(tensorNames)]] found">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedTensor}}">
         <template is="dom-repeat" items="[[tensorNames]]">
@@ -17866,7 +18720,7 @@ paper-dropdown-menu paper-item {
       </paper-listbox>
     </paper-dropdown-menu>
   </template>
-
+  
   <template is="dom-if" if="[[_hasChoices(labelOptions)]]">
     <paper-dropdown-menu no-animations="" label="Label by">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedLabelOption}}">
@@ -17879,7 +18733,7 @@ paper-dropdown-menu paper-item {
     </paper-dropdown-menu>
   </template>
 
-
+  
   <div hidden$="[[!_hasChoices(colorOptions)]]" class="colorby-container">
     <paper-dropdown-menu id="colorby" no-animations="" label="Color by">
       <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedColorOptionName}}">
@@ -17920,7 +18774,7 @@ paper-dropdown-menu paper-item {
       </paper-tooltip>
       <paper-button id="upload" class="ink-button" onclick="dataDialog.open()">Load data</paper-button>
     </span>
-    <span>
+    <span id="publish-container">
       <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds="">
         Publish your embedding visualization and data
       </paper-tooltip>
@@ -17931,7 +18785,7 @@ paper-dropdown-menu paper-item {
     <paper-dialog id="dataDialog" with-backdrop="">
       <h2>Load data from your computer</h2>
       <paper-dialog-scrollable class="scrollable-container">
-        <div class="data-step">
+        <div class="data-step" id="upload-tensors-step-container">
           <div class="upload-step">
             <div>
                 <b><span class="step-label">Step 1:</span> Load a TSV file of vectors.</b>
@@ -17955,7 +18809,7 @@ paper-dropdown-menu paper-item {
         <div class="data-step">
           <div class="upload-step">
             <div>
-                <span class="step-label"><b>Step 2</b> (optional):</span> <b>Load a TSV file of metadata.</b>
+                <span class="step-label" id="upload-metadata-label"><b>Step 2</b> (optional):</span> <b>Load a TSV file of metadata.</b>
             </div>
           </div>
           <div class="data-step-contents">
@@ -17984,7 +18838,7 @@ paper-dropdown-menu paper-item {
         <div>
           <p>
             If you'd like to share your visualization with the world, follow these simple steps.
-            See <a target="_blank" href="https://www.tensorflow.org/versions/master/how_tos/embedding_viz/index.md">this tutorial</a> for more.
+            See <a target="_blank" href="https://www.tensorflow.org/get_started/embedding_viz">this tutorial</a> for more.
           </p>
           <h4><span class="step-label">Step 1:</span> Make data public</h4>
           <p>
@@ -18511,7 +19365,7 @@ paper-dropdown-menu paper-item {
     </div>
   </div>
   <div class="container">
-
+    
     <div data-panel="tsne" class="ink-panel-content">
       <div class="slider">
         <label>Dimension</label>
@@ -18562,10 +19416,10 @@ paper-dropdown-menu paper-item {
         </a>
       </p>
     </div>
-
+    
     <div data-panel="pca" class="ink-panel-content">
       <div class="two-columns">
-        <div>
+        <div> 
           <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations="" label="X">
             <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaX}}">
               <paper-item disabled="" class="dropdown-item header">
@@ -18595,7 +19449,7 @@ paper-dropdown-menu paper-item {
             </paper-listbox>
           </paper-dropdown-menu>
         </div>
-        <div>
+        <div> 
           <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations="" label="Y">
             <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaY}}">
               <paper-item disabled="" class="dropdown-item header">
@@ -18622,7 +19476,7 @@ paper-dropdown-menu paper-item {
         For fast results, the data was sampled to [[getPcaSampleSizeText()]] points and randomly projected down to [[getPcaSampledDimText()]] dimensions.
       </paper-tooltip>
     </div>
-
+    
     <div data-panel="custom" class="ink-panel-content">
       <paper-dropdown-menu style="width: 100%" no-animations="" label="Search by">
         <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{customSelectedSearchByMetadataOption}}">
@@ -18950,7 +19804,7 @@ paper-dropdown-menu paper-item {
 </div>
 <paper-toast id="toast" always-on-top=""></paper-toast>
 
-</template>
+</template> 
 </dom-module>
 <dom-module id="vz-projector-dashboard" assetpath="../vz-projector/">
 <template>
@@ -18961,18 +19815,33 @@ paper-dropdown-menu paper-item {
 </template>
 <script>
 (function() {
-Polymer({
+TF.Dashboard.VzProjectorDashboard = Polymer({
   is: 'vz-projector-dashboard',
+  factoryImpl: function(routePrefix) {
+    this.routePrefix = routePrefix;
+  },
   properties: {
     dataNotFound: Boolean,
     routePrefix: String
   },
-  ready() {
-    var self = this;
-    d3.json(this.routePrefix + '/runs', function(err, runs) {
-      self.dataNotFound = (runs.length === 0);
+  behaviors: [
+    TF.Dashboard.DashboardBehavior("embeddings"),
+  ],
+  observers: [
+    "_routePrefixSet(routePrefix)",
+  ],
+  reload: function() {
+    // Do not reload the embedding projector. Reloading could take a long time.
+  },
+  _routePrefixSet: function(routePrefix) {
+    if (routePrefix === undefined) {
+      // The route prefix has not been set yet.
+      return;
+    }
+    d3.json(routePrefix + '/runs', (err, runs) => {
+      this.set('dataNotFound', runs.length === 0);
     });
-  }
+  },
 });
 })();
 </script>
@@ -19051,54 +19920,23 @@ var TF;
         <div id="toolbar-content">
           <div class="toolbar-title">TensorBoard</div>
           <paper-tabs selected="{{modeIndex}}" noink="" class="tabs" id="tabs">
-            <template is="dom-repeat" items="[[tabs]]">
-              <template is="dom-if" if="[[_isTabEnabled(item)]]">
-                <paper-tab data-mode="[[item]]">[[item]]</paper-tab>
+            <template is="dom-repeat" items="[[_dashboards]]">
+              <template is="dom-if" if="[[_isTabEnabled(item.name)]]">
+                <paper-tab data-mode="[[item.name]]">[[item.name]]</paper-tab>
               </template>
             </template>
           </paper-tabs>
           <div class="global-actions">
             <paper-icon-button icon="refresh" on-tap="reload" disabled$="[[_isReloadDisabled(mode)]]" id="reload-button"></paper-icon-button>
-            <paper-icon-button icon="settings" on-tap="openSettings" id="settings-button"></paper-icon-button>
-            <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md" tabindex="-1">
-              <paper-icon-button icon="help-outline"></paper-icon-button>
-            </a>
-          </div>
-        </div>
-      </paper-toolbar>
-
-      <div id="content" class="fit">
-        <content id="injected-overview"></content>
-
-        <template is="dom-if" if="[[_modeIsScalars(mode)]]">
-          <tf-scalar-dashboard id="scalars" backend="[[_backend]]" router="[[router]]"></tf-scalar-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsImages(mode)]]">
-          <tf-image-dashboard id="images" backend="[[_backend]]"></tf-image-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsAudio(mode)]]">
-          <tf-audio-dashboard id="audio" backend="[[_backend]]"></tf-audio-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsGraphs(mode)]]">
-          <tf-graph-dashboard id="graphs" backend="[[_backend]]" debugger-data-enabled="[[_debuggerDataEnabled]]"></tf-graph-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsDistributions(mode)]]">
-          <tf-distribution-dashboard id="distributions" backend="[[_backend]]"></tf-distribution-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsHistograms(mode)]]">
-          <tf-histogram-dashboard id="histograms" backend="[[_backend]]"></tf-histogram-dashboard>
-        </template>
+            <paper-icon-button icon="settings" on-tap="openSettings" id="settings-button"></paper-icon-button>
+            <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md" tabindex="-1">
+              <paper-icon-button icon="help-outline"></paper-icon-button>
+            </a>
+          </div>
+        </div>
+      </paper-toolbar>
 
-        <template is="dom-if" if="[[_modeIsEmbeddings(mode)]]">
-          <vz-projector-dashboard id="projector" route-prefix="/data/plugin/projector">
-          </vz-projector-dashboard>
-        </template>
-      </div>
+      <div id="content" class="fit"></div>
     </paper-header-panel>
 
     <style>
@@ -19189,16 +20027,21 @@ var TF;
             return match && match.length == 1;
           },
         },
+        _dashboards: {
+          type: Array,
+          computed: "_makeDashboardList(_backend, router, _debuggerDataEnabled)",
+        },
+        // Maps dashboard name to dashboard object.
+        _dashboardMapping: {
+          type: Object,
+          computed: "_makeDashboardMapping(_dashboards)",
+        },
         // Which tab is selected (scalars, graph, images etc).
         mode: {
           type: String,
           computed: '_getModeFromIndex(modeIndex)',
           notify: true,
-        },
-        tabs: {
-          type: Array,
-          readOnly: true,
-          value: TF.Globals.TABS,
+          observer: '_modeChanged',
         },
         // If this is set to a string, TensorBoard will switch to "demo mode"
         // and attempt to load serialized json data from that directory. You can
@@ -19223,7 +20066,7 @@ var TF;
         return true;
       },
       _getModeFromIndex: function(modeIndex) {
-        var mode = this.tabs[modeIndex];
+        var mode = this._dashboards[modeIndex].name;
         TF.URIStorage.setString(TF.URIStorage.TAB, mode);
         return mode;
       },
@@ -19235,31 +20078,10 @@ var TF;
         return new TF.Backend.Backend(router);
       },
       _isReloadDisabled: function(mode) {
-        return !this._debuggerDataEnabled && this._modeIsGraphs(mode);
-      },
-      _modeIsScalars: function(mode) {
-        return mode === "scalars";
-      },
-      _modeIsImages: function(mode) {
-        return mode === "images";
-      },
-      _modeIsAudio: function(mode) {
-        return mode === "audio";
-      },
-      _modeIsGraphs: function(mode) {
-        return mode === "graphs";
-      },
-      _modeIsEmbeddings: function(mode) {
-        return mode === "embeddings";
-      },
-      _modeIsDistributions: function(mode) {
-        return mode === "distributions";
-      },
-      _modeIsHistograms: function(mode) {
-        return mode === "histograms";
+        return !this._debuggerDataEnabled && mode == 'graphs';
       },
       selectedDashboard: function() {
-        var dashboard = this.$$("#" + this.mode);
+        var dashboard = this._dashboardMapping[this.mode];
         if (dashboard == null) {
           throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
         }
@@ -19273,24 +20095,67 @@ var TF;
           this._getModeFromHash();
         }.bind(this));
       },
+      _makeDashboardList: function(backend, router, debuggerDataEnabled) {
+        if (!backend || !router) {
+          // The dashboards require these entities. We are not ready to construct dashboards.
+          return null;
+        }
+
+        return [
+          new TF.Dashboard.TfScalarDashboard(backend, router),
+          new TF.Dashboard.TfImageDashboard(backend),
+          new TF.Dashboard.TfAudioDashboard(backend),
+          new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
+          new TF.Dashboard.TfDistributionDashboard(backend),
+          new TF.Dashboard.TfHistogramDashboard(backend),
+          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
+          new TF.Dashboard.TfTextDashboard(backend),
+        ];
+      },
+      _makeDashboardMapping: function(dashboards) {
+        if (!dashboards) {
+          return null;
+        }
+
+        let mapping = {};
+        dashboards.forEach(function(dashboard) {
+          mapping[dashboard.name] = dashboard;
+        });
+        return mapping;
+      },
       _getModeFromHash: function() {
         var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
-        var modeIndex = this.tabs.indexOf(tabName);
-        if (modeIndex == -1 && this.modeIndex == null) {
+        var modeIndex;
+        for (var i = 0; i < this._dashboards.length; i++) {
+          if (this._dashboards[i].name == tabName) {
+            modeIndex = i;
+            break;
+          }
+        }
+
+        if (modeIndex === undefined && this.modeIndex == null) {
           // Select the first tab as default.
           this.set('modeIndex', 0);
         }
-        if (modeIndex != -1 && modeIndex != this.modeIndex) {
+        if (modeIndex !== undefined && modeIndex != this.modeIndex) {
           this.set('modeIndex', modeIndex);
         }
       },
-      reload: function() {
-        if (this._modeIsEmbeddings(this.mode)) {
-          return;
+      _modeChanged: function(mode) {
+        let currentDashboard = this.$.content.firstChild;
+        if (currentDashboard) {
+          this.$.content.removeChild(currentDashboard);
         }
-        if (!this._debuggerDataEnabled && this._modeIsGraphs(this.mode)) {
+
+        if (!mode || !this._dashboardMapping) {
           return;
         }
+
+        // Append the new dashboard.
+        const newDashboard = this.selectedDashboard();
+        this.$.content.appendChild(newDashboard);
+      },
+      reload: function() {
         this.selectedDashboard().reload();
       },
       openSettings: function() {
@@ -19298,7 +20163,7 @@ var TF;
       },
     });
   </script>
-
+  
   <script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 "use strict";
 var AnalyticsLogger = (function () {
@@ -19837,15 +20702,18 @@ var DemoDataProvider = (function () {
         }
         else {
             logging.setModalMessage('Fetching tensors...', data_provider_1.TENSORS_MSG_ID);
-            d3.text(url, function (error, dataString) {
-                if (error) {
-                    logging.setErrorMessage(error.responseText, 'fetching tensors');
-                    return;
-                }
-                dataProvider.parseTensors(dataString).then(function (points) {
+            var request_1 = new XMLHttpRequest();
+            request_1.open('GET', url);
+            request_1.responseType = 'arraybuffer';
+            request_1.onerror = function () {
+                logging.setErrorMessage(request_1.responseText, 'fetching tensors');
+            };
+            request_1.onload = function () {
+                dataProvider.parseTensors(request_1.response).then(function (points) {
                     callback(new data_1.DataSet(points));
                 });
-            });
+            };
+            request_1.send();
         }
     };
     DemoDataProvider.prototype.retrieveSpriteAndMetadata = function (run, tensorName, callback) {
@@ -20131,19 +20999,69 @@ function parseRawMetadata(contents, callback) {
     parseMetadata(contents).then(function (result) { return callback(result); });
 }
 exports.parseRawMetadata = parseRawMetadata;
+/**
+ * Parse an ArrayBuffer in a streaming fashion line by line (or custom delim).
+ * Can handle very large files.
+ *
+ * @param content The array buffer.
+ * @param callback The callback called on each line.
+ * @param chunkSize The size of each read chunk, defaults to ~1MB. (optional)
+ * @param delim The delimiter used to split a line, defaults to '\n'. (optional)
+ * @returns A promise for when it is finished.
+ */
+function streamParse(content, callback, chunkSize, delim) {
+    if (chunkSize === void 0) { chunkSize = 1000000; }
+    if (delim === void 0) { delim = '\n'; }
+    return new Promise(function (resolve, reject) {
+        var offset = 0;
+        var bufferSize = content.byteLength - 1;
+        var data = '';
+        function readHandler(str) {
+            offset += chunkSize;
+            var parts = str.split(delim);
+            var first = data + parts[0];
+            if (parts.length === 1) {
+                data = first;
+                readChunk(offset, chunkSize);
+                return;
+            }
+            data = parts[parts.length - 1];
+            callback(first);
+            for (var i = 1; i < parts.length - 1; i++) {
+                callback(parts[i]);
+            }
+            if (offset >= bufferSize) {
+                if (data) {
+                    callback(data);
+                }
+                resolve();
+                return;
+            }
+            readChunk(offset, chunkSize);
+        }
+        function readChunk(offset, size) {
+            var contentChunk = content.slice(offset, offset + size);
+            var blob = new Blob([contentChunk]);
+            var file = new FileReader();
+            file.onload = function (e) { return readHandler(e.target.result); };
+            file.readAsText(blob);
+        }
+        readChunk(offset, chunkSize);
+    });
+}
 /** Parses a tsv text file. */
-function parseTensors(content, delim) {
-    if (delim === void 0) { delim = '\t'; }
-    var data = [];
-    var numDim;
-    return util_1.runAsyncTask('Parsing tensors...', function () {
-        var lines = content.split('\n');
-        lines.forEach(function (line) {
+function parseTensors(content, valueDelim) {
+    if (valueDelim === void 0) { valueDelim = '\t'; }
+    logging.setModalMessage('Parsing tensors...', exports.TENSORS_MSG_ID);
+    return new Promise(function (resolve, reject) {
+        var data = [];
+        var numDim;
+        streamParse(content, function (line) {
             line = line.trim();
             if (line === '') {
                 return;
             }
-            var row = line.split(delim);
+            var row = line.split(valueDelim);
             var dataPoint = {
                 metadata: {},
                 vector: null,
@@ -20170,11 +21088,10 @@ function parseTensors(content, delim) {
                 logging.setModalMessage('Parsing failed. Found a vector with only one dimension?');
                 throw Error('Parsing failed');
             }
+        }).then(function () {
+            logging.setModalMessage(null, exports.TENSORS_MSG_ID);
+            resolve(data);
         });
-        return data;
-    }, exports.TENSORS_MSG_ID).then(function (dataPoints) {
-        logging.setModalMessage(null, exports.TENSORS_MSG_ID);
-        return dataPoints;
     });
 }
 exports.parseTensors = parseTensors;
@@ -20250,18 +21167,27 @@ function analyzeMetadata(columnNames, pointsMetadata) {
 }
 exports.analyzeMetadata = analyzeMetadata;
 function parseMetadata(content) {
-    return util_1.runAsyncTask('Parsing metadata...', function () {
-        var lines = content.split('\n').filter(function (line) { return line.trim().length > 0; });
-        var hasHeader = lines[0].indexOf('\t') >= 0;
+    logging.setModalMessage('Parsing metadata...', exports.METADATA_MSG_ID);
+    return new Promise(function (resolve, reject) {
         var pointsMetadata = [];
-        // If the first row doesn't contain metadata keys, we assume that the values
-        // are labels.
+        var hasHeader = false;
+        var lineNumber = 0;
         var columnNames = ['label'];
-        if (hasHeader) {
-            columnNames = lines[0].split('\t');
-            lines = lines.slice(1);
-        }
-        lines.forEach(function (line) {
+        streamParse(content, function (line) {
+            if (line.trim().length === 0) {
+                return;
+            }
+            if (lineNumber === 0) {
+                hasHeader = line.indexOf('\t') >= 0;
+                // If the first row doesn't contain metadata keys, we assume that the
+                // values are labels.
+                if (hasHeader) {
+                    columnNames = line.split('\t');
+                    lineNumber++;
+                    return;
+                }
+            }
+            lineNumber++;
             var rowValues = line.split('\t');
             var metadata = {};
             pointsMetadata.push(metadata);
@@ -20271,14 +21197,13 @@ function parseMetadata(content) {
                 value = (value === '' ? null : value);
                 metadata[name] = value;
             });
+        }).then(function () {
+            logging.setModalMessage(null, exports.METADATA_MSG_ID);
+            resolve({
+                stats: analyzeMetadata(columnNames, pointsMetadata),
+                pointsInfo: pointsMetadata
+            });
         });
-        return {
-            stats: analyzeMetadata(columnNames, pointsMetadata),
-            pointsInfo: pointsMetadata
-        };
-    }, exports.METADATA_MSG_ID).then(function (metadata) {
-        logging.setModalMessage(null, exports.METADATA_MSG_ID);
-        return metadata;
     });
 }
 exports.parseMetadata = parseMetadata;
@@ -20297,14 +21222,17 @@ function retrieveSpriteAndMetadataInfo(metadataPath, spriteImagePath, spriteMeta
     if (metadataPath) {
         metadataPromise = new Promise(function (resolve, reject) {
             logging.setModalMessage('Fetching metadata...', exports.METADATA_MSG_ID);
-            d3.text(metadataPath, function (err, rawMetadata) {
-                if (err) {
-                    logging.setErrorMessage(err.responseText, 'fetching metadata');
-                    reject(err);
-                    return;
-                }
-                resolve(parseMetadata(rawMetadata));
-            });
+            var request = new XMLHttpRequest();
+            request.open('GET', metadataPath);
+            request.responseType = 'arraybuffer';
+            request.onerror = function () {
+                logging.setErrorMessage(request.responseText, 'fetching metadata');
+                reject();
+            };
+            request.onload = function () {
+                resolve(parseMetadata(request.response));
+            };
+            request.send(null);
         });
     }
     var spriteMsgId = null;
@@ -20364,8 +21292,25 @@ exports.PCA_SAMPLE_SIZE = 50000;
 exports.PCA_SAMPLE_DIM = 200;
 /** Number of pca components to compute. */
 var NUM_PCA_COMPONENTS = 10;
-/** Reserved metadata attribute used for trace information. */
-var TRACE_METADATA_ATTR = '__next__';
+/**
+ * Reserved metadata attributes used for sequence information
+ * NOTE: Use "__seq_next__" as "__next__" is deprecated.
+ */
+var SEQUENCE_METADATA_ATTRS = ['__next__', '__seq_next__'];
+function getSequenceNextPointIndex(pointMetadata) {
+    var sequenceAttr = null;
+    for (var _i = 0, SEQUENCE_METADATA_ATTRS_1 = SEQUENCE_METADATA_ATTRS; _i < SEQUENCE_METADATA_ATTRS_1.length; _i++) {
+        var metadataAttr = SEQUENCE_METADATA_ATTRS_1[_i];
+        if (metadataAttr in pointMetadata && pointMetadata[metadataAttr] !== '') {
+            sequenceAttr = pointMetadata[metadataAttr];
+            break;
+        }
+    }
+    if (sequenceAttr == null) {
+        return null;
+    }
+    return +sequenceAttr;
+}
 /**
  * Dataset contains a DataPoints array that should be treated as immutable. This
  * acts as a working subset of the original data, with cached properties
@@ -20388,52 +21333,52 @@ var DataSet = (function () {
         this.hasTSNERun = false;
         this.points = points;
         this.shuffledDataIndices = util.shuffle(d3.range(this.points.length));
-        this.traces = this.computeTraces(points);
+        this.sequences = this.computeSequences(points);
         this.dim = [this.points.length, this.points[0].vector.length];
         this.spriteAndMetadataInfo = spriteAndMetadataInfo;
     }
-    DataSet.prototype.computeTraces = function (points) {
-        // Keep a list of indices seen so we don't compute traces for a given
+    DataSet.prototype.computeSequences = function (points) {
+        // Keep a list of indices seen so we don't compute sequences for a given
         // point twice.
         var indicesSeen = new Int8Array(points.length);
-        // Compute traces.
-        var indexToTrace = {};
-        var traces = [];
+        // Compute sequences.
+        var indexToSequence = {};
+        var sequences = [];
         for (var i = 0; i < points.length; i++) {
             if (indicesSeen[i]) {
                 continue;
             }
             indicesSeen[i] = 1;
-            // Ignore points without a trace attribute.
-            var next = points[i].metadata[TRACE_METADATA_ATTR];
-            if (next == null || next === '') {
+            // Ignore points without a sequence attribute.
+            var next = getSequenceNextPointIndex(points[i].metadata);
+            if (next == null) {
                 continue;
             }
-            if (next in indexToTrace) {
-                var existingTrace = indexToTrace[+next];
+            if (next in indexToSequence) {
+                var existingSequence = indexToSequence[next];
                 // Pushing at the beginning of the array.
-                existingTrace.pointIndices.unshift(i);
-                indexToTrace[i] = existingTrace;
+                existingSequence.pointIndices.unshift(i);
+                indexToSequence[i] = existingSequence;
                 continue;
             }
-            // The current point is pointing to a new/unseen trace.
-            var newTrace = { pointIndices: [] };
-            indexToTrace[i] = newTrace;
-            traces.push(newTrace);
+            // The current point is pointing to a new/unseen sequence.
+            var newSequence = { pointIndices: [] };
+            indexToSequence[i] = newSequence;
+            sequences.push(newSequence);
             var currentIndex = i;
             while (points[currentIndex]) {
-                newTrace.pointIndices.push(currentIndex);
-                var next_1 = points[currentIndex].metadata[TRACE_METADATA_ATTR];
-                if (next_1 != null && next_1 !== '') {
-                    indicesSeen[+next_1] = 1;
-                    currentIndex = +next_1;
+                newSequence.pointIndices.push(currentIndex);
+                var next_1 = getSequenceNextPointIndex(points[currentIndex].metadata);
+                if (next_1 != null) {
+                    indicesSeen[next_1] = 1;
+                    currentIndex = next_1;
                 }
                 else {
                     currentIndex = -1;
                 }
             }
         }
-        return traces;
+        return sequences;
     };
     DataSet.prototype.projectionCanBeRendered = function (projection) {
         if (projection !== 'tsne') {
@@ -21348,8 +22293,8 @@ var renderContext_1 = require('./renderContext');
 var scatterPlot_1 = require('./scatterPlot');
 var scatterPlotVisualizer3DLabels_1 = require('./scatterPlotVisualizer3DLabels');
 var scatterPlotVisualizerCanvasLabels_1 = require('./scatterPlotVisualizerCanvasLabels');
+var scatterPlotVisualizerPolylines_1 = require('./scatterPlotVisualizerPolylines');
 var scatterPlotVisualizerSprites_1 = require('./scatterPlotVisualizerSprites');
-var scatterPlotVisualizerTraces_1 = require('./scatterPlotVisualizerTraces');
 var vector = require('./vector');
 var LABEL_FONT_SIZE = 10;
 var LABEL_SCALE_DEFAULT = 1.0;
@@ -21372,15 +22317,15 @@ var LABELS_3D_COLOR_UNSELECTED = 0xFFFFFF;
 var LABELS_3D_COLOR_NO_SELECTION = 0xFFFFFF;
 var SPRITE_IMAGE_COLOR_UNSELECTED = 0xFFFFFF;
 var SPRITE_IMAGE_COLOR_NO_SELECTION = 0xFFFFFF;
-var TRACE_START_HUE = 60;
-var TRACE_END_HUE = 360;
-var TRACE_SATURATION = 1;
-var TRACE_LIGHTNESS = .3;
-var TRACE_DEFAULT_OPACITY = .2;
-var TRACE_DEFAULT_LINEWIDTH = 2;
-var TRACE_SELECTED_OPACITY = .9;
-var TRACE_SELECTED_LINEWIDTH = 3;
-var TRACE_DESELECTED_OPACITY = .05;
+var POLYLINE_START_HUE = 60;
+var POLYLINE_END_HUE = 360;
+var POLYLINE_SATURATION = 1;
+var POLYLINE_LIGHTNESS = .3;
+var POLYLINE_DEFAULT_OPACITY = .2;
+var POLYLINE_DEFAULT_LINEWIDTH = 2;
+var POLYLINE_SELECTED_OPACITY = .9;
+var POLYLINE_SELECTED_LINEWIDTH = 3;
+var POLYLINE_DESELECTED_OPACITY = .05;
 var SCATTER_PLOT_CUBE_LENGTH = 2;
 /** Color scale for nearest neighbors. */
 var NN_COLOR_SCALE = d3.scale.linear()
@@ -21431,8 +22376,8 @@ var ProjectorScatterPlotAdapter = (function () {
             // atomic unit of update.
             this.projection.dataSet = dataSet;
         }
-        if (this.traceVisualizer != null) {
-            this.traceVisualizer.setDataSet(dataSet);
+        if (this.polylineVisualizer != null) {
+            this.polylineVisualizer.setDataSet(dataSet);
         }
         if (this.labels3DVisualizer != null) {
             this.labels3DVisualizer.setLabelStrings(this.generate3DLabelsArray(dataSet, this.labelPointAccessor));
@@ -21498,15 +22443,15 @@ var ProjectorScatterPlotAdapter = (function () {
         var pointColors = this.generatePointColorArray(dataSet, pointColorer, this.distanceMetric, selectedSet, neighbors, hoverIndex, this.renderLabelsIn3D, this.getSpriteImageMode());
         var pointScaleFactors = this.generatePointScaleFactorArray(dataSet, selectedSet, neighbors, hoverIndex);
         var labels = this.generateVisibleLabelRenderParams(dataSet, selectedSet, neighbors, hoverIndex);
-        var traceColors = this.generateLineSegmentColorMap(dataSet, pointColorer);
-        var traceOpacities = this.generateLineSegmentOpacityArray(dataSet, selectedSet);
-        var traceWidths = this.generateLineSegmentWidthArray(dataSet, selectedSet);
+        var polylineColors = this.generateLineSegmentColorMap(dataSet, pointColorer);
+        var polylineOpacities = this.generateLineSegmentOpacityArray(dataSet, selectedSet);
+        var polylineWidths = this.generateLineSegmentWidthArray(dataSet, selectedSet);
         this.scatterPlot.setPointColors(pointColors);
         this.scatterPlot.setPointScaleFactors(pointScaleFactors);
         this.scatterPlot.setLabels(labels);
-        this.scatterPlot.setTraceColors(traceColors);
-        this.scatterPlot.setTraceOpacities(traceOpacities);
-        this.scatterPlot.setTraceWidths(traceWidths);
+        this.scatterPlot.setPolylineColors(polylineColors);
+        this.scatterPlot.setPolylineOpacities(polylineOpacities);
+        this.scatterPlot.setPolylineWidths(polylineWidths);
     };
     ProjectorScatterPlotAdapter.prototype.render = function () {
         this.scatterPlot.render();
@@ -21641,18 +22586,18 @@ var ProjectorScatterPlotAdapter = (function () {
         return scale;
     };
     ProjectorScatterPlotAdapter.prototype.generateLineSegmentColorMap = function (ds, legendPointColorer) {
-        var traceColorArrayMap = {};
+        var polylineColorArrayMap = {};
         if (ds == null) {
-            return traceColorArrayMap;
+            return polylineColorArrayMap;
         }
-        for (var i = 0; i < ds.traces.length; i++) {
-            var dataTrace = ds.traces[i];
-            var colors = new Float32Array(2 * (dataTrace.pointIndices.length - 1) * 3);
+        for (var i = 0; i < ds.sequences.length; i++) {
+            var sequence = ds.sequences[i];
+            var colors = new Float32Array(2 * (sequence.pointIndices.length - 1) * 3);
             var colorIndex = 0;
             if (legendPointColorer) {
-                for (var j = 0; j < dataTrace.pointIndices.length - 1; j++) {
-                    var c1 = new THREE.Color(legendPointColorer(ds, dataTrace.pointIndices[j]));
-                    var c2 = new THREE.Color(legendPointColorer(ds, dataTrace.pointIndices[j + 1]));
+                for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                    var c1 = new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j]));
+                    var c2 = new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j + 1]));
                     colors[colorIndex++] = c1.r;
                     colors[colorIndex++] = c1.g;
                     colors[colorIndex++] = c1.b;
@@ -21662,9 +22607,9 @@ var ProjectorScatterPlotAdapter = (function () {
                 }
             }
             else {
-                for (var j = 0; j < dataTrace.pointIndices.length - 1; j++) {
-                    var c1 = getDefaultPointInTraceColor(j, dataTrace.pointIndices.length);
-                    var c2 = getDefaultPointInTraceColor(j + 1, dataTrace.pointIndices.length);
+                for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                    var c1 = getDefaultPointInPolylineColor(j, sequence.pointIndices.length);
+                    var c2 = getDefaultPointInPolylineColor(j + 1, sequence.pointIndices.length);
                     colors[colorIndex++] = c1.r;
                     colors[colorIndex++] = c1.g;
                     colors[colorIndex++] = c1.b;
@@ -21673,23 +22618,23 @@ var ProjectorScatterPlotAdapter = (function () {
                     colors[colorIndex++] = c2.b;
                 }
             }
-            traceColorArrayMap[i] = colors;
+            polylineColorArrayMap[i] = colors;
         }
-        return traceColorArrayMap;
+        return polylineColorArrayMap;
     };
     ProjectorScatterPlotAdapter.prototype.generateLineSegmentOpacityArray = function (ds, selectedPoints) {
         if (ds == null) {
             return new Float32Array(0);
         }
-        var opacities = new Float32Array(ds.traces.length);
+        var opacities = new Float32Array(ds.sequences.length);
         var selectedPointCount = (selectedPoints == null) ? 0 : selectedPoints.length;
         if (selectedPointCount > 0) {
-            opacities.fill(TRACE_DESELECTED_OPACITY);
-            var i = ds.points[selectedPoints[0]].traceIndex;
-            opacities[i] = TRACE_SELECTED_OPACITY;
+            opacities.fill(POLYLINE_DESELECTED_OPACITY);
+            var i = ds.points[selectedPoints[0]].sequenceIndex;
+            opacities[i] = POLYLINE_SELECTED_OPACITY;
         }
         else {
-            opacities.fill(TRACE_DEFAULT_OPACITY);
+            opacities.fill(POLYLINE_DEFAULT_OPACITY);
         }
         return opacities;
     };
@@ -21697,12 +22642,12 @@ var ProjectorScatterPlotAdapter = (function () {
         if (ds == null) {
             return new Float32Array(0);
         }
-        var widths = new Float32Array(ds.traces.length);
-        widths.fill(TRACE_DEFAULT_LINEWIDTH);
+        var widths = new Float32Array(ds.sequences.length);
+        widths.fill(POLYLINE_DEFAULT_LINEWIDTH);
         var selectedPointCount = (selectedPoints == null) ? 0 : selectedPoints.length;
         if (selectedPointCount > 0) {
-            var i = ds.points[selectedPoints[0]].traceIndex;
-            widths[i] = TRACE_SELECTED_LINEWIDTH;
+            var i = ds.points[selectedPoints[0]].sequenceIndex;
+            widths[i] = POLYLINE_SELECTED_LINEWIDTH;
         }
         return widths;
     };
@@ -21822,7 +22767,7 @@ var ProjectorScatterPlotAdapter = (function () {
         this.labels3DVisualizer = null;
         this.canvasLabelsVisualizer = null;
         this.spriteVisualizer = null;
-        this.traceVisualizer = null;
+        this.polylineVisualizer = null;
         if (inLabels3DMode) {
             this.labels3DVisualizer = new scatterPlotVisualizer3DLabels_1.ScatterPlotVisualizer3DLabels();
             this.labels3DVisualizer.setLabelStrings(this.generate3DLabelsArray(ds, this.labelPointAccessor));
@@ -21833,7 +22778,7 @@ var ProjectorScatterPlotAdapter = (function () {
             this.canvasLabelsVisualizer =
                 new scatterPlotVisualizerCanvasLabels_1.ScatterPlotVisualizerCanvasLabels(this.scatterPlotContainer);
         }
-        this.traceVisualizer = new scatterPlotVisualizerTraces_1.ScatterPlotVisualizerTraces();
+        this.polylineVisualizer = new scatterPlotVisualizerPolylines_1.ScatterPlotVisualizerPolylines();
         this.setDataSet(ds);
         if (this.spriteVisualizer) {
             scatterPlot.addVisualizer(this.spriteVisualizer);
@@ -21844,7 +22789,7 @@ var ProjectorScatterPlotAdapter = (function () {
         if (this.canvasLabelsVisualizer) {
             scatterPlot.addVisualizer(this.canvasLabelsVisualizer);
         }
-        scatterPlot.addVisualizer(this.traceVisualizer);
+        scatterPlot.addVisualizer(this.polylineVisualizer);
     };
     ProjectorScatterPlotAdapter.prototype.getSpriteImageMode = function () {
         if (this.projection == null) {
@@ -21868,9 +22813,10 @@ function styleRgbFromHexColor(hex) {
     var c = new THREE.Color(hex);
     return [(c.r * 255) | 0, (c.g * 255) | 0, (c.b * 255) | 0];
 }
-function getDefaultPointInTraceColor(index, totalPoints) {
-    var hue = TRACE_START_HUE + (TRACE_END_HUE - TRACE_START_HUE) * index / totalPoints;
-    var rgb = d3.hsl(hue, TRACE_SATURATION, TRACE_LIGHTNESS).rgb();
+function getDefaultPointInPolylineColor(index, totalPoints) {
+    var hue = POLYLINE_START_HUE +
+        (POLYLINE_END_HUE - POLYLINE_START_HUE) * index / totalPoints;
+    var rgb = d3.hsl(hue, POLYLINE_SATURATION, POLYLINE_LIGHTNESS).rgb();
     return new THREE.Color(rgb.r / 255, rgb.g / 255, rgb.b / 255);
 }
 /**
@@ -21887,7 +22833,7 @@ function dist2color(distFunc, d, minDist) {
 }
 exports.dist2color = dist2color;
 
-},{"./renderContext":15,"./scatterPlot":16,"./scatterPlotVisualizer3DLabels":19,"./scatterPlotVisualizerCanvasLabels":20,"./scatterPlotVisualizerSprites":21,"./scatterPlotVisualizerTraces":22,"./vector":25}],15:[function(require,module,exports){
+},{"./renderContext":15,"./scatterPlot":16,"./scatterPlotVisualizer3DLabels":19,"./scatterPlotVisualizerCanvasLabels":20,"./scatterPlotVisualizerPolylines":21,"./scatterPlotVisualizerSprites":22,"./vector":25}],15:[function(require,module,exports){
 /* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -21935,7 +22881,7 @@ var CameraType = exports.CameraType;
  * only when they change.
  */
 var RenderContext = (function () {
-    function RenderContext(camera, cameraType, cameraTarget, screenWidth, screenHeight, nearestCameraSpacePointZ, farthestCameraSpacePointZ, backgroundColor, pointColors, pointScaleFactors, labels, traceColors, traceOpacities, traceWidths) {
+    function RenderContext(camera, cameraType, cameraTarget, screenWidth, screenHeight, nearestCameraSpacePointZ, farthestCameraSpacePointZ, backgroundColor, pointColors, pointScaleFactors, labels, polylineColors, polylineOpacities, polylineWidths) {
         this.camera = camera;
         this.cameraType = cameraType;
         this.cameraTarget = cameraTarget;
@@ -21947,9 +22893,9 @@ var RenderContext = (function () {
         this.pointColors = pointColors;
         this.pointScaleFactors = pointScaleFactors;
         this.labels = labels;
-        this.traceColors = traceColors;
-        this.traceOpacities = traceOpacities;
-        this.traceWidths = traceWidths;
+        this.polylineColors = polylineColors;
+        this.polylineOpacities = polylineOpacities;
+        this.polylineWidths = polylineWidths;
     }
     return RenderContext;
 }());
@@ -22438,7 +23384,7 @@ var ScatterPlot = (function () {
         if (this.worldSpacePointPositions != null) {
             cameraSpacePointExtents = util.getNearFarPoints(this.worldSpacePointPositions, this.camera.position, this.orbitCameraControls.target);
         }
-        var rc = new renderContext_1.RenderContext(this.camera, cameraType, this.orbitCameraControls.target, this.width, this.height, cameraSpacePointExtents[0], cameraSpacePointExtents[1], this.backgroundColor, this.pointColors, this.pointScaleFactors, this.labels, this.traceColors, this.traceOpacities, this.traceWidths);
+        var rc = new renderContext_1.RenderContext(this.camera, cameraType, this.orbitCameraControls.target, this.width, this.height, cameraSpacePointExtents[0], cameraSpacePointExtents[1], this.backgroundColor, this.pointColors, this.pointScaleFactors, this.labels, this.polylineColors, this.polylineOpacities, this.polylineWidths);
         // Render first pass to picking target. This render fills pickingTexture
         // with colors that are actually point ids, so that sampling the texture at
         // the mouse's current x,y coordinates will reveal the data point that the
@@ -22478,15 +23424,15 @@ var ScatterPlot = (function () {
     ScatterPlot.prototype.setLabels = function (labels) {
         this.labels = labels;
     };
-    /** Set the colors for every data trace. (RGB triplets) */
-    ScatterPlot.prototype.setTraceColors = function (colors) {
-        this.traceColors = colors;
+    /** Set the colors for every data polyline. (RGB triplets) */
+    ScatterPlot.prototype.setPolylineColors = function (colors) {
+        this.polylineColors = colors;
     };
-    ScatterPlot.prototype.setTraceOpacities = function (opacities) {
-        this.traceOpacities = opacities;
+    ScatterPlot.prototype.setPolylineOpacities = function (opacities) {
+        this.polylineOpacities = opacities;
     };
-    ScatterPlot.prototype.setTraceWidths = function (widths) {
-        this.traceWidths = widths;
+    ScatterPlot.prototype.setPolylineWidths = function (widths) {
+        this.polylineWidths = widths;
     };
     ScatterPlot.prototype.getMouseMode = function () {
         return this.mouseMode;
@@ -23082,6 +24028,136 @@ You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+"use strict";
+var util = require('./util');
+var RGB_NUM_ELEMENTS = 3;
+var XYZ_NUM_ELEMENTS = 3;
+/**
+ * Renders polylines that connect multiple points in the dataset.
+ */
+var ScatterPlotVisualizerPolylines = (function () {
+    function ScatterPlotVisualizerPolylines() {
+        this.polylinePositionBuffer = {};
+        this.polylineColorBuffer = {};
+    }
+    ScatterPlotVisualizerPolylines.prototype.updateSequenceIndicesInDataSet = function (ds) {
+        for (var i = 0; i < ds.sequences.length; i++) {
+            var sequence = ds.sequences[i];
+            for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                ds.points[sequence.pointIndices[j]].sequenceIndex = i;
+                ds.points[sequence.pointIndices[j + 1]].sequenceIndex = i;
+            }
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.createPolylines = function (scene) {
+        if (!this.dataSet || !this.dataSet.sequences) {
+            return;
+        }
+        this.updateSequenceIndicesInDataSet(this.dataSet);
+        this.polylines = [];
+        for (var i = 0; i < this.dataSet.sequences.length; i++) {
+            var geometry = new THREE.BufferGeometry();
+            geometry.addAttribute('position', this.polylinePositionBuffer[i]);
+            geometry.addAttribute('color', this.polylineColorBuffer[i]);
+            var material = new THREE.LineBasicMaterial({
+                linewidth: 1,
+                opacity: 1.0,
+                transparent: true,
+                vertexColors: THREE.VertexColors
+            });
+            var polyline = new THREE.LineSegments(geometry, material);
+            polyline.frustumCulled = false;
+            this.polylines.push(polyline);
+            scene.add(polyline);
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.dispose = function () {
+        if (this.polylines == null) {
+            return;
+        }
+        for (var i = 0; i < this.polylines.length; i++) {
+            this.scene.remove(this.polylines[i]);
+            this.polylines[i].geometry.dispose();
+        }
+        this.polylines = null;
+        this.polylinePositionBuffer = {};
+        this.polylineColorBuffer = {};
+    };
+    ScatterPlotVisualizerPolylines.prototype.setScene = function (scene) {
+        this.scene = scene;
+    };
+    ScatterPlotVisualizerPolylines.prototype.setDataSet = function (dataSet) {
+        this.dataSet = dataSet;
+    };
+    ScatterPlotVisualizerPolylines.prototype.onPointPositionsChanged = function (newPositions) {
+        if ((newPositions == null) || (this.polylines != null)) {
+            this.dispose();
+        }
+        if ((newPositions == null) || (this.dataSet == null)) {
+            return;
+        }
+        // Set up the position buffer arrays for each polyline.
+        for (var i = 0; i < this.dataSet.sequences.length; i++) {
+            var sequence = this.dataSet.sequences[i];
+            var vertexCount = 2 * (sequence.pointIndices.length - 1);
+            var polylines = new Float32Array(vertexCount * XYZ_NUM_ELEMENTS);
+            this.polylinePositionBuffer[i] =
+                new THREE.BufferAttribute(polylines, XYZ_NUM_ELEMENTS);
+            var colors = new Float32Array(vertexCount * RGB_NUM_ELEMENTS);
+            this.polylineColorBuffer[i] =
+                new THREE.BufferAttribute(colors, RGB_NUM_ELEMENTS);
+        }
+        for (var i = 0; i < this.dataSet.sequences.length; i++) {
+            var sequence = this.dataSet.sequences[i];
+            var src = 0;
+            for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
+                var p1Index = sequence.pointIndices[j];
+                var p2Index = sequence.pointIndices[j + 1];
+                var p1 = util.vector3FromPackedArray(newPositions, p1Index);
+                var p2 = util.vector3FromPackedArray(newPositions, p2Index);
+                this.polylinePositionBuffer[i].setXYZ(src, p1.x, p1.y, p1.z);
+                this.polylinePositionBuffer[i].setXYZ(src + 1, p2.x, p2.y, p2.z);
+                src += 2;
+            }
+            this.polylinePositionBuffer[i].needsUpdate = true;
+        }
+        if (this.polylines == null) {
+            this.createPolylines(this.scene);
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.onRender = function (renderContext) {
+        if (this.polylines == null) {
+            return;
+        }
+        for (var i = 0; i < this.polylines.length; i++) {
+            this.polylines[i].material.opacity = renderContext.polylineOpacities[i];
+            this.polylines[i].material.linewidth =
+                renderContext.polylineWidths[i];
+            this.polylineColorBuffer[i].array = renderContext.polylineColors[i];
+            this.polylineColorBuffer[i].needsUpdate = true;
+        }
+    };
+    ScatterPlotVisualizerPolylines.prototype.onPickingRender = function (renderContext) { };
+    ScatterPlotVisualizerPolylines.prototype.onResize = function (newWidth, newHeight) { };
+    return ScatterPlotVisualizerPolylines;
+}());
+exports.ScatterPlotVisualizerPolylines = ScatterPlotVisualizerPolylines;
+
+},{"./util":24}],22:[function(require,module,exports){
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23339,137 +24415,7 @@ var ScatterPlotVisualizerSprites = (function () {
 }());
 exports.ScatterPlotVisualizerSprites = ScatterPlotVisualizerSprites;
 
-},{"./renderContext":15,"./util":24}],22:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var util = require('./util');
-var RGB_NUM_ELEMENTS = 3;
-var XYZ_NUM_ELEMENTS = 3;
-/**
- * Renders 'traces' (polylines) that connect multiple points in the dataset
- */
-var ScatterPlotVisualizerTraces = (function () {
-    function ScatterPlotVisualizerTraces() {
-        this.tracePositionBuffer = {};
-        this.traceColorBuffer = {};
-    }
-    ScatterPlotVisualizerTraces.prototype.updateTraceIndicesInDataSet = function (ds) {
-        for (var i = 0; i < ds.traces.length; i++) {
-            var trace = ds.traces[i];
-            for (var j = 0; j < trace.pointIndices.length - 1; j++) {
-                ds.points[trace.pointIndices[j]].traceIndex = i;
-                ds.points[trace.pointIndices[j + 1]].traceIndex = i;
-            }
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.createTraces = function (scene) {
-        if (!this.dataSet || !this.dataSet.traces) {
-            return;
-        }
-        this.updateTraceIndicesInDataSet(this.dataSet);
-        this.traces = [];
-        for (var i = 0; i < this.dataSet.traces.length; i++) {
-            var geometry = new THREE.BufferGeometry();
-            geometry.addAttribute('position', this.tracePositionBuffer[i]);
-            geometry.addAttribute('color', this.traceColorBuffer[i]);
-            var material = new THREE.LineBasicMaterial({
-                linewidth: 1,
-                opacity: 1.0,
-                transparent: true,
-                vertexColors: THREE.VertexColors
-            });
-            var trace = new THREE.LineSegments(geometry, material);
-            trace.frustumCulled = false;
-            this.traces.push(trace);
-            scene.add(trace);
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.dispose = function () {
-        if (this.traces == null) {
-            return;
-        }
-        for (var i = 0; i < this.traces.length; i++) {
-            this.scene.remove(this.traces[i]);
-            this.traces[i].geometry.dispose();
-        }
-        this.traces = null;
-        this.tracePositionBuffer = {};
-        this.traceColorBuffer = {};
-    };
-    ScatterPlotVisualizerTraces.prototype.setScene = function (scene) {
-        this.scene = scene;
-    };
-    ScatterPlotVisualizerTraces.prototype.setDataSet = function (dataSet) {
-        this.dataSet = dataSet;
-    };
-    ScatterPlotVisualizerTraces.prototype.onPointPositionsChanged = function (newPositions) {
-        if ((newPositions == null) || (this.traces != null)) {
-            this.dispose();
-        }
-        if ((newPositions == null) || (this.dataSet == null)) {
-            return;
-        }
-        // Set up the position buffer arrays for each trace.
-        for (var i = 0; i < this.dataSet.traces.length; i++) {
-            var dataTrace = this.dataSet.traces[i];
-            var vertexCount = 2 * (dataTrace.pointIndices.length - 1);
-            var traces = new Float32Array(vertexCount * XYZ_NUM_ELEMENTS);
-            this.tracePositionBuffer[i] =
-                new THREE.BufferAttribute(traces, XYZ_NUM_ELEMENTS);
-            var colors = new Float32Array(vertexCount * RGB_NUM_ELEMENTS);
-            this.traceColorBuffer[i] =
-                new THREE.BufferAttribute(colors, RGB_NUM_ELEMENTS);
-        }
-        for (var i = 0; i < this.dataSet.traces.length; i++) {
-            var dataTrace = this.dataSet.traces[i];
-            var src = 0;
-            for (var j = 0; j < dataTrace.pointIndices.length - 1; j++) {
-                var p1Index = dataTrace.pointIndices[j];
-                var p2Index = dataTrace.pointIndices[j + 1];
-                var p1 = util.vector3FromPackedArray(newPositions, p1Index);
-                var p2 = util.vector3FromPackedArray(newPositions, p2Index);
-                this.tracePositionBuffer[i].setXYZ(src, p1.x, p1.y, p1.z);
-                this.tracePositionBuffer[i].setXYZ(src + 1, p2.x, p2.y, p2.z);
-                src += 2;
-            }
-            this.tracePositionBuffer[i].needsUpdate = true;
-        }
-        if (this.traces == null) {
-            this.createTraces(this.scene);
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.onRender = function (renderContext) {
-        if (this.traces == null) {
-            return;
-        }
-        for (var i = 0; i < this.traces.length; i++) {
-            this.traces[i].material.opacity = renderContext.traceOpacities[i];
-            this.traces[i].material.linewidth =
-                renderContext.traceWidths[i];
-            this.traceColorBuffer[i].array = renderContext.traceColors[i];
-            this.traceColorBuffer[i].needsUpdate = true;
-        }
-    };
-    ScatterPlotVisualizerTraces.prototype.onPickingRender = function (renderContext) { };
-    ScatterPlotVisualizerTraces.prototype.onResize = function (newWidth, newHeight) { };
-    return ScatterPlotVisualizerTraces;
-}());
-exports.ScatterPlotVisualizerTraces = ScatterPlotVisualizerTraces;
-
-},{"./util":24}],23:[function(require,module,exports){
+},{"./renderContext":15,"./util":24}],23:[function(require,module,exports){
 /* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -24635,7 +25581,7 @@ var DataPanel = (function (_super) {
                 var content = evt.target.result;
                 _this.tensorWasReadFromFile(content, file.name);
             };
-            fileReader.readAsText(file);
+            fileReader.readAsArrayBuffer(file);
         });
         var uploadButton = this.dom.select('#upload-tensors');
         uploadButton.on('click', function () {
@@ -24653,74 +25599,79 @@ var DataPanel = (function (_super) {
                 var contents = evt.target.result;
                 _this.metadataWasReadFromFile(contents, file.name);
             };
-            fileReader.readAsText(file);
+            fileReader.readAsArrayBuffer(file);
         });
         var uploadMetadataButton = this.dom.select('#upload-metadata');
         uploadMetadataButton.on('click', function () {
             fileMetadataInput.node().click();
         });
-        if (this.projector.servingMode === 'demo') {
-            this.$$('#demo-data-buttons-container').style.display =
-                'block';
-            // Fill out the projector config.
-            var projectorConfigTemplate_1 = this.$$('#projector-config-template');
-            var projectorConfigTemplateJson_1 = {
-                embeddings: [{
-                        tensorName: 'My tensor',
-                        tensorShape: [1000, 50],
-                        tensorPath: 'https://gist.github.com/.../tensors.tsv',
-                        metadataPath: 'https://gist.github.com/.../optional.metadata.tsv',
-                    }],
-            };
-            this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            // Set up optional field checkboxes.
-            var spriteFieldCheckbox_1 = this.$$('#config-sprite-checkbox');
-            spriteFieldCheckbox_1.addEventListener('change', function () {
-                if (spriteFieldCheckbox_1.checked) {
-                    projectorConfigTemplateJson_1.embeddings[0].sprite = {
-                        imagePath: 'https://github.com/.../optional.sprite.png',
-                        singleImageDim: [32, 32]
-                    };
-                }
-                else {
-                    delete projectorConfigTemplateJson_1.embeddings[0].sprite;
-                }
-                _this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            });
-            var bookmarksFieldCheckbox_1 = this.$$('#config-bookmarks-checkbox');
-            bookmarksFieldCheckbox_1.addEventListener('change', function () {
-                if (bookmarksFieldCheckbox_1.checked) {
-                    projectorConfigTemplateJson_1.embeddings[0].bookmarksPath =
-                        'https://gist.github.com/.../bookmarks.txt';
-                }
-                else {
-                    delete projectorConfigTemplateJson_1.embeddings[0].bookmarksPath;
-                }
-                _this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            });
-            var metadataFieldCheckbox_1 = this.$$('#config-metadata-checkbox');
-            metadataFieldCheckbox_1.addEventListener('change', function () {
-                if (metadataFieldCheckbox_1.checked) {
-                    projectorConfigTemplateJson_1.embeddings[0].metadataPath =
-                        'https://gist.github.com/.../optional.metadata.tsv';
-                }
-                else {
-                    delete projectorConfigTemplateJson_1.embeddings[0].metadataPath;
-                }
-                _this.setProjectorConfigTemplateJson(projectorConfigTemplate_1, projectorConfigTemplateJson_1);
-            });
-            // Update the link and the readonly shareable URL.
-            var projectorConfigUrlInput_1 = this.$$('#projector-config-url');
-            var projectorConfigDemoUrlInput_1 = this.$$('#projector-share-url');
-            var projectorConfigDemoUrlLink_1 = this.$$('#projector-share-url-link');
-            projectorConfigUrlInput_1.addEventListener('input', function () {
-                var projectorDemoUrl = location.protocol + '//' + location.host +
-                    location.pathname + '?config=' +
-                    projectorConfigUrlInput_1.value;
-                projectorConfigDemoUrlInput_1.value = projectorDemoUrl;
-                projectorConfigDemoUrlLink_1.href = projectorDemoUrl;
-            });
-        }
+        if (this.projector.servingMode !== 'demo') {
+            this.$$('#publish-container').style.display = 'none';
+            this.$$('#upload-tensors-step-container').style.display =
+                'none';
+            this.$$('#upload-metadata-label').style.display = 'none';
+        }
+        this.$$('#demo-data-buttons-container').style.display =
+            'block';
+        // Fill out the projector config.
+        var projectorConfigTemplate = this.$$('#projector-config-template');
+        var projectorConfigTemplateJson = {
+            embeddings: [{
+                    tensorName: 'My tensor',
+                    tensorShape: [1000, 50],
+                    tensorPath: 'https://gist.github.com/.../tensors.tsv',
+                    metadataPath: 'https://gist.github.com/.../optional.metadata.tsv',
+                }],
+        };
+        this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        // Set up optional field checkboxes.
+        var spriteFieldCheckbox = this.$$('#config-sprite-checkbox');
+        spriteFieldCheckbox.addEventListener('change', function () {
+            if (spriteFieldCheckbox.checked) {
+                projectorConfigTemplateJson.embeddings[0].sprite = {
+                    imagePath: 'https://github.com/.../optional.sprite.png',
+                    singleImageDim: [32, 32]
+                };
+            }
+            else {
+                delete projectorConfigTemplateJson.embeddings[0].sprite;
+            }
+            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        });
+        var bookmarksFieldCheckbox = this.$$('#config-bookmarks-checkbox');
+        bookmarksFieldCheckbox.addEventListener('change', function () {
+            if (bookmarksFieldCheckbox.checked) {
+                projectorConfigTemplateJson.embeddings[0].bookmarksPath =
+                    'https://gist.github.com/.../bookmarks.txt';
+            }
+            else {
+                delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
+            }
+            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        });
+        var metadataFieldCheckbox = this.$$('#config-metadata-checkbox');
+        metadataFieldCheckbox.addEventListener('change', function () {
+            if (metadataFieldCheckbox.checked) {
+                projectorConfigTemplateJson.embeddings[0].metadataPath =
+                    'https://gist.github.com/.../optional.metadata.tsv';
+            }
+            else {
+                delete projectorConfigTemplateJson.embeddings[0].metadataPath;
+            }
+            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
+        });
+        // Update the link and the readonly shareable URL.
+        var projectorConfigUrlInput = this.$$('#projector-config-url');
+        var projectorConfigDemoUrlInput = this.$$('#projector-share-url');
+        var projectorConfigDemoUrlLink = this.$$('#projector-share-url-link');
+        projectorConfigUrlInput.addEventListener('input', function () {
+            var projectorDemoUrl = location.protocol + '//' + location.host +
+                location.pathname +
+                '?config=' + projectorConfigUrlInput.value;
+            projectorConfigDemoUrlInput.value =
+                projectorDemoUrl;
+            projectorConfigDemoUrlLink.href = projectorDemoUrl;
+        });
     };
     DataPanel.prototype.setProjectorConfigTemplateJson = function (projectorConfigTemplate, config) {
         projectorConfigTemplate.value =
-- 
GitLab


From 71f558ffc155d70e0c4581b76b3fca5cb1c421fb Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 10 Apr 2017 12:46:13 -0800
Subject: [PATCH 0382/1563] Updating update_version to update the suffix in
 core.h Change: 152729057

---
 tensorflow/tools/ci_build/update_version.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index 429437f807..e0ca8c3259 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -61,7 +61,9 @@ fi
 MAJOR=$(echo "${NEW_VER}" | cut -d \. -f 1)
 MINOR=$(echo "${NEW_VER}" | cut -d \. -f 2)
 PATCH=$(echo "${NEW_VER}" | cut -d \. -f 3)
+PATCH_NUM=$(echo "$PATCH" | cut -d \- -f 1)
 PIP_PATCH="${PATCH//-}"
+SUFFIX=$(echo $NEW_VER | sed "s/${MAJOR}.${MINOR}.${PATCH%-*}//g")
 
 # Update tensorflow/core/public/version.h
 VERSION_H="${TF_SRC_DIR}/core/public/version.h"
@@ -77,8 +79,8 @@ OLD_PIP_PATCH="${OLD_PATCH//-}"
 
 sed -i -e "s/^#define TF_MAJOR_VERSION ${OLD_MAJOR}/#define TF_MAJOR_VERSION ${MAJOR}/g" ${VERSION_H}
 sed -i -e "s/^#define TF_MINOR_VERSION ${OLD_MINOR}/#define TF_MINOR_VERSION ${MINOR}/g" ${VERSION_H}
-sed -i -e "s/^#define TF_PATCH_VERSION ${OLD_PATCH}/#define TF_PATCH_VERSION ${PATCH}/g" "${VERSION_H}"
-
+sed -i -e "s/^#define TF_PATCH_VERSION ${OLD_PATCH}/#define TF_PATCH_VERSION ${PATCH_NUM}/g" "${VERSION_H}"
+sed -i -e "s/^#define TF_VERSION_SUFFIX \".*\"/#define TF_VERSION_SUFFIX \"${SUFFIX}\"/g" "${VERSION_H}"
 
 # Update setup.py
 SETUP_PY="${TF_SRC_DIR}/tools/pip_package/setup.py"
-- 
GitLab


From d126be41681690aea243ad2a234e3e31638454cd Mon Sep 17 00:00:00 2001
From: jinghua2 <jing1.huang@intel.com>
Date: Thu, 13 Apr 2017 13:57:06 -0700
Subject: [PATCH 0383/1563] updated based on review comments for mkl_lrn

---
 tensorflow/core/kernels/mkl_lrn_op.cc | 106 ++++++--------------------
 1 file changed, 25 insertions(+), 81 deletions(-)

diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
index 892580e63e..4aa00838c8 100644
--- a/tensorflow/core/kernels/mkl_lrn_op.cc
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -109,13 +109,7 @@ class MklLRNOp : public OpKernel {
         mkl_context.lt_input =
             static_cast<dnnLayout_t>(mkl_context.input_shape.GetCurLayout());
         workspace_enabled_ = true;
-        /* std::cout<<" the mkl lrn is enabled!!!!!!!!!!"<<std::endl; */
       } else {
-        /* std::vector<const Tensor *> temp_input(1, &input);
-        std::vector< MklShape> mkl_input_shapes(1, mkl_context.input_shape);
-        std::vector<Tensor> temp_out = ConvertMklToTF<T>(context,
-                                                      temp_input,
-                                                      mkl_input_shapes); */
         mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
                                       beta_, input);
         return;
@@ -124,10 +118,9 @@ class MklLRNOp : public OpKernel {
 
     int kernel_size = 2 * depth_radius_ + 1;
 
-    CHECK_EQ(dnnLRNCreateForward_F32(&mkl_context.lrn_fwd, NULL,
-                                     mkl_context.lt_input, kernel_size,
-                                     static_cast<float>(alpha_ * kernel_size),
-                                     beta_, bias_),
+    CHECK_EQ(dnnLRNCreateForward_F32(
+                 &mkl_context.lrn_fwd, NULL, mkl_context.lt_input, kernel_size,
+                 static_cast<float>(alpha_ * kernel_size), beta_, bias_),
              E_SUCCESS);
 
     // Allocate output tensor and shape
@@ -272,9 +265,11 @@ class MklLRNOp : public OpKernel {
     }
 
     // Fallback implementation - Taken from lrn_op.cc
+    // TODO(intelft) Check if we can use EigenLRNOp directly instead of making a
+    // copy.
     void MklDefaultToEigen(OpKernelContext* context, int depth_radius_,
                            float bias_, float alpha_, float beta_,
-                           const Tensor &input) {
+                           const Tensor& input) {
       const int batch = static_cast<int>(input.dim_size(0));
       const int rows = static_cast<int>(input.dim_size(1));
       const int cols = static_cast<int>(input.dim_size(2));
@@ -321,9 +316,6 @@ class MklLRNOp : public OpKernel {
       dnnLayoutDelete_F32(lt_internal_input);
       dnnLayoutDelete_F32(lt_internal_workspace);
       dnnLayoutDelete_F32(lt_internal_output);
-      // if (!input_in_mkl_format) {
-      //  dnnLayoutDelete_F32(mkl_prims.lt_input);
-      //}
     }
   } MklLRNOpContext;
 
@@ -336,8 +328,6 @@ class MklLRNOp : public OpKernel {
   float beta_;
 };
 
-
-
 template <typename T>
 class MklLRNGradOp : public OpKernel {
  public:
@@ -432,12 +422,11 @@ class MklLRNGradOp : public OpKernel {
     mkl_context.MklPrepareLRNInputsLayouts(context);
     int ksize = 2 * depth_radius_ + 1;
 
-    CHECK_EQ(
-        dnnLRNCreateBackward_F32(&mkl_context.lrn_bwd, NULL,
-                                 mkl_context.lt_input, mkl_context.lt_output,
-                                 ksize, static_cast<float>(alpha_ *
-                                 ksize), beta_, bias_),
-        E_SUCCESS);
+    CHECK_EQ(dnnLRNCreateBackward_F32(
+                 &mkl_context.lrn_bwd, NULL, mkl_context.lt_input,
+                 mkl_context.lt_output, ksize,
+                 static_cast<float>(alpha_ * ksize), beta_, bias_),
+             E_SUCCESS);
 
     // Allocate output tensor and shape.
     TensorShape mkl_output_tf_shape; /* First tensor */
@@ -477,9 +466,8 @@ class MklLRNGradOp : public OpKernel {
     // in MKL format.
     mkl_context.res_lrn_bwd[dnnResourceDiffSrc] = user_output;
     // Execute LRN backward using dnnExecute
-    CHECK_EQ(
-        dnnExecute_F32(mkl_context.lrn_bwd, mkl_context.res_lrn_bwd),
-        E_SUCCESS);
+    CHECK_EQ(dnnExecute_F32(mkl_context.lrn_bwd, mkl_context.res_lrn_bwd),
+             E_SUCCESS);
     // Release MKL resources.
     mkl_context.Mklcleanup();
   }
@@ -624,6 +612,8 @@ class MklLRNGradOp : public OpKernel {
     }
 
     // Fallback implementation - Taken from lrn_op.cc
+    // TODO(intelft) Check if we can use EigenLRNOp directly instead of making a
+    // copy.
     void MklDefaultToEigen(OpKernelContext* context) {
       // CHECK(false);
       Tensor in_grads = MklGetInput(context, 0);
@@ -634,35 +624,6 @@ class MklLRNGradOp : public OpKernel {
       GetMklShape(context, 1, &inimage_shape);
       GetMklShape(context, 2, &outimage_shape);
 
-      /* bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
-      bool inimage_in_mkl_format = inimage_shape.IsMklTensor();
-      bool outimage_in_mkl_format = outimage_shape.IsMklTensor();
-
-      if ( ingrad_in_mkl_format ) {
-        std::vector<const Tensor *> temp_ingrad(1, &in_grads);
-        std::vector< MklShape> mkl_ingrad_shapes(1, ingrad_shape);
-        std::vector<Tensor> temp_outingrad = ConvertMklToTF<T>(context,
-                                                      temp_ingrad,
-                                                      mkl_ingrad_shapes);
-        in_grads = temp_outingrad[0];
-      }
-      if ( inimage_in_mkl_format ) {
-        std::vector<const Tensor *> temp_inimage(1, &in_image);
-        std::vector< MklShape> mkl_inimage_shapes(1, inimage_shape);
-        std::vector<Tensor> temp_outinimage = ConvertMklToTF<T>(context,
-                                                      temp_inimage,
-                                                      mkl_inimage_shapes);
-        in_image = temp_outinimage[0];
-      }
-      if ( outimage_in_mkl_format ) {
-        std::vector<const Tensor *> temp_outimage(1, &out_image);
-        std::vector< MklShape> mkl_outimage_shapes(1, outimage_shape);
-        std::vector<Tensor> temp_outoutimage = ConvertMklToTF<T>(context,
-                                                      temp_outimage,
-                                                      mkl_outimage_shapes);
-        out_image = temp_outoutimage[0];
-      } */
-
       const int64 batch = static_cast<int64>(in_grads.dim_size(0));
       const int64 rows = static_cast<int64>(in_grads.dim_size(1));
       const int64 cols = static_cast<int64>(in_grads.dim_size(2));
@@ -686,23 +647,6 @@ class MklLRNGradOp : public OpKernel {
                     depth](int64 begin, int64 end) {
         for (int64 i = begin; i < end; ++i) {
           for (int64 j = 0; j < depth; ++j) {
-            // Let y be the LRN activations and x be the inputs along the depth
-            // dimension. (LRN operates independently along rows, cols, and
-            // batch).
-            // We have
-            // yi = xi / (bias + alpha(sum_j_{i - depth_radius}^{i +
-            // depth_radius}
-            //      x_j^2))^beta
-            //
-            // Let N = (bias + alpha(sum_j_{i - depth_radius}^{i + depth_radius}
-            //           x_j^2))
-            // dy_i/dx_i = (N^beta - xi. beta*N^(beta-1)*2*alpha*xi)/N^(2*beta)
-            // dy_i/dx_j = (       - xi. beta*N^(beta-1)*2*alpha*xj)/N^(2*beta)
-            //
-            // NOTE(keveman) : We can compute N by doing (yi/xi) ^ (1/beta).
-            // However, this is numerically unstable for small values of xi. We
-            // compute N explicitly here to avoid that.
-
             int64 depth_begin = std::max<int64>(0, j - depth_radius_);
             int64 depth_end = std::min<int64>(depth, j + depth_radius_ + 1);
 
@@ -756,16 +700,16 @@ class MklLRNGradOp : public OpKernel {
   float beta_;
 };
 
-#define REGISTER_MKL_LRN_CPU(T)                                           \
-  REGISTER_KERNEL_BUILDER(Name("MklLRN")                                  \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_op_registry::kMklOpLabel),       \
-                          MklLRNOp<T>);                                   \
-  REGISTER_KERNEL_BUILDER(Name("MklLRNGrad")                              \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_op_registry::kMklOpLabel),       \
+#define REGISTER_MKL_LRN_CPU(T)                                     \
+  REGISTER_KERNEL_BUILDER(Name("MklLRN")                            \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklLRNOp<T>);                             \
+  REGISTER_KERNEL_BUILDER(Name("MklLRNGrad")                        \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
                           MklLRNGradOp<T>);
 
 TF_CALL_float(REGISTER_MKL_LRN_CPU);
-- 
GitLab


From f5fa5d6a0de3eea720dc28c36d4a0a2a5795434b Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Thu, 13 Apr 2017 14:05:14 -0700
Subject: [PATCH 0384/1563] Updating version to 1.1.0-rc2

---
 README.md                                     | 12 +++++-----
 tensorflow/core/public/version.h              |  4 ++--
 tensorflow/docs_src/install/install_c.md      |  2 +-
 tensorflow/docs_src/install/install_go.md     |  2 +-
 tensorflow/docs_src/install/install_java.md   | 16 +++++++-------
 tensorflow/docs_src/install/install_linux.md  | 22 +++++++++----------
 tensorflow/docs_src/install/install_mac.md    | 14 ++++++------
 .../docs_src/install/install_sources.md       |  4 ++--
 .../docs_src/install/install_windows.md       |  4 ++--
 tensorflow/tools/pip_package/setup.py         |  2 +-
 10 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index 3ad10c9158..17aecb87a3 100644
--- a/README.md
+++ b/README.md
@@ -33,12 +33,12 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index 14e45c37d9..9ad3cb2a39 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -20,11 +20,11 @@ limitations under the License.
 
 #define TF_MAJOR_VERSION 1
 #define TF_MINOR_VERSION 1
-#define TF_PATCH_VERSION 0-rc1
+#define TF_PATCH_VERSION 0
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
-#define TF_VERSION_SUFFIX ""
+#define TF_VERSION_SUFFIX "-rc2"
 
 #define TF_STR_HELPER(x) #x
 #define TF_STR(x) TF_STR_HELPER(x)
diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index 0f3914d52d..c1581efb4f 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index 6874a1f03f..dd713e4786 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc2.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 45322511c6..948f5aa17c 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc1</version>
+  <version>1.1.0-rc2</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0-rc1</version>
+                 <version>1.1.0-rc2</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc2.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0-rc1.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0-rc2.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -213,7 +213,7 @@ two files are available to the JVM:
 
 For example, the following command line executes the `HelloTF` program:
 
-<pre><b>java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index a72af7ef86..67abdae044 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      virtualenv environment:
 
      <pre>(tensorflow)$ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -268,7 +268,7 @@ take the following steps:
 
      <pre>
      $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl</b>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b>
      </pre>
 
      If this step fails, see
@@ -455,7 +455,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -622,14 +622,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -641,14 +641,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -660,14 +660,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -679,14 +679,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index 69eb7473bf..4cb1646af1 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -286,7 +286,7 @@ take the following steps:
      support, issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b> </pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
      [Common installation problems](#CommonInstallationProblems).
@@ -398,7 +398,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      TensorFlow for Python 2.7:
 
      <pre> (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -594,13 +594,13 @@ This section documents the relevant values for Mac OS installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py2-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
@@ -612,13 +612,13 @@ Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py3-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py3-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 7c47436816..879eae34df 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -319,10 +319,10 @@ $ <b>bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pk
 Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
-for TensorFlow 1.1.0rc1 on Linux:
+for TensorFlow 1.1.0rc2 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc1-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc2-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 7cda030f58..3fae112b94 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 41b781ddef..0e528ae63c 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc1'
+_VERSION = '1.1.0-rc2'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
-- 
GitLab


From 624f0d402383ba4476e6131cbe1d421e3710c1bd Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 13 Apr 2017 12:47:18 -0800
Subject: [PATCH 0385/1563] Improve efficiency of get_session_handle

Change get_session_handle() back to use v1 of GetSessionHandleOp, instead of v2. The v1 op returns a string, instead of an encoded ResourceHandle, which gets rid of the need to call ParseFromString() in Python.
Change: 153101229
---
 .../core/common_runtime/direct_session.cc     |  3 +-
 tensorflow/core/ops/data_flow_ops.cc          |  8 ++++-
 tensorflow/python/client/tf_session.i         |  4 +++
 tensorflow/python/ops/session_ops.py          | 32 ++++++++-----------
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index 768c2f6f75..e660624e28 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -757,7 +757,8 @@ Status DirectSession::ResourceHandleToInputTensor(const Tensor& resource_tensor,
 
   ResourceHandle resource_handle = resource_tensor.scalar<ResourceHandle>()();
 
-  if (resource_handle.hash_code() == MakeTypeIndex<Tensor>().hash_code()) {
+  if (resource_handle.container() ==
+      SessionState::kTensorHandleResourceTypeName) {
     return session_state_.GetTensor(resource_handle.name(), retrieved_tensor);
   } else {
     return errors::InvalidArgument(strings::StrCat(
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index 7e7d499f88..cb886ae8fa 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -2154,7 +2154,13 @@ REGISTER_OP("GetSessionHandle")
     .Output("handle: string")
     .Attr("T: type")
     .SetShapeFn(shape_inference::ScalarShape)
-    .Deprecated(23, "Use GetSessionHandleV2");
+    .Doc(R"doc(
+Store the input tensor in the state of the current session.
+
+value: The tensor to be stored.
+handle: The handle for the tensor stored in the session state, represented
+  as a string.
+)doc");
 
 REGISTER_OP("GetSessionHandleV2")
     .Input("value: T")
diff --git a/tensorflow/python/client/tf_session.i b/tensorflow/python/client/tf_session.i
index 3331f17217..7c6f1cdd5e 100644
--- a/tensorflow/python/client/tf_session.i
+++ b/tensorflow/python/client/tf_session.i
@@ -18,6 +18,7 @@ limitations under the License.
 %{
 
 #include "tensorflow/python/client/tf_session_helper.h"
+#include "tensorflow/core/framework/session_state.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/public/version.h"
 
@@ -57,6 +58,9 @@ tensorflow::ImportNumpy();
   }
 }
 
+// Constants used by TensorHandle (get_session_handle).
+%constant const char* TENSOR_HANDLE_KEY = tensorflow::SessionState::kTensorHandleResourceTypeName;
+
 ////////////////////////////////////////////////////////////////////////////////
 // BEGIN TYPEMAPS FOR tensorflow::TF_Run_wrapper()
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tensorflow/python/ops/session_ops.py b/tensorflow/python/ops/session_ops.py
index 3d038cfd8a..de43b562f9 100644
--- a/tensorflow/python/ops/session_ops.py
+++ b/tensorflow/python/ops/session_ops.py
@@ -26,11 +26,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import sys
-
 import numpy as np
 
 from tensorflow.core.framework import resource_handle_pb2
+from tensorflow.python import pywrap_tensorflow_internal
 from tensorflow.python.framework import device as pydev
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -39,16 +38,6 @@ from tensorflow.python.ops import gen_data_flow_ops
 from tensorflow.python.util import compat
 
 
-def decode_resource_handle(encoded):
-  """Decode a ResourceHandle proto encoded as custom numpy struct type."""
-  resource_handle = resource_handle_pb2.ResourceHandle()
-  if sys.version_info.major < 3:
-    resource_handle.ParseFromString("".join([chr(ch[0]) for ch in encoded]))
-  else:
-    resource_handle.ParseFromString(bytes([ch[0] for ch in encoded]))
-  return resource_handle
-
-
 def encode_resource_handle(resource_handle):
   """Encode a ResourceHandle proto as custom numpy struct type."""
   return np.asarray(bytearray(resource_handle.SerializeToString()),
@@ -69,8 +58,8 @@ class TensorHandle(object):
       dtype: The data type of the tensor represented by `handle`.
       session: The session in which the tensor is produced.
     """
-    self._resource_handle = decode_resource_handle(handle)
-    self._handle = compat.as_str_any(self._resource_handle.name)
+    self._handle = compat.as_str_any(handle)
+    self._resource_handle = None
     self._dtype = dtype
     self._session = session
     self._auto_gc_enabled = True
@@ -82,9 +71,14 @@ class TensorHandle(object):
   def __str__(self):
     return self._handle
 
-  @property
-  def resource_handle(self):
+  def _get_resource_handle(self):
     """The ResourceHandle representation of this handle."""
+    if not self._resource_handle:
+      self._resource_handle = resource_handle_pb2.ResourceHandle()
+      self._resource_handle.device = self._handle.split(";")[-1]
+      self._resource_handle.container = (
+          pywrap_tensorflow_internal.TENSOR_HANDLE_KEY)
+      self._resource_handle.name = self._handle
     return self._resource_handle
 
   def to_numpy_array(self):
@@ -94,7 +88,7 @@ class TensorHandle(object):
       A numpy array of a custom struct type that can be used as a feed value
       to run().
     """
-    return encode_resource_handle(self.resource_handle)
+    return encode_resource_handle(self._get_resource_handle())
 
   @property
   def handle(self):
@@ -186,7 +180,7 @@ def get_session_handle(data, name=None):
 
   # Colocate this operation with data.
   with ops.colocate_with(data):
-    return gen_data_flow_ops._get_session_handle_v2(data, name=name)  # pylint: disable=protected-access
+    return gen_data_flow_ops._get_session_handle(data, name=name)  # pylint: disable=protected-access
 
 
 def get_session_tensor(handle, dtype, name=None):
@@ -291,7 +285,7 @@ def _get_handle_mover(graph, feeder, handle):
     # Create mover if we haven't done it.
     holder, reader = _get_handle_reader(graph, handle, dtype)
     with graph.as_default(), graph.device(feeder.op.device):
-      mover = gen_data_flow_ops._get_session_handle_v2(reader)  # pylint: disable=protected-access
+      mover = gen_data_flow_ops._get_session_handle(reader)  # pylint: disable=protected-access
     result = (holder, mover)
     graph._handle_movers[graph_key] = result
   return result
-- 
GitLab


From c11ea29bcfc2a0036dbbbe5f6dc3dc16f4a01ada Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 12:53:09 -0800
Subject: [PATCH 0386/1563] Add serving code for set membership split type.
 Change: 153101982

---
 .../boosted_trees/lib/trees/decision_tree.cc  | 33 +++++++++++++++++++
 .../lib/trees/decision_tree_test.cc           | 20 +++++++++++
 .../boosted_trees/proto/tree_config.proto     | 16 +++++++++
 3 files changed, 69 insertions(+)

diff --git a/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc
index 318d8a5296..cd9a747d51 100644
--- a/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc
+++ b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc
@@ -73,6 +73,26 @@ int DecisionTree::Traverse(const DecisionTreeConfig& config,
                       : split.right_id();
         break;
       }
+      case TreeNode::kCategoricalIdSetMembershipBinarySplit: {
+        const auto& split =
+            current_node.categorical_id_set_membership_binary_split();
+        bool found = false;
+        for (const int64 feature_id :
+             example.sparse_int_features[split.feature_column()]) {
+          const auto iter =
+              std::lower_bound(split.feature_ids().begin(),
+                               split.feature_ids().end(), feature_id);
+          if (iter != split.feature_ids().end() && *iter == feature_id) {
+            node_id = split.left_id();
+            found = true;
+            break;
+          }
+        }
+        if (!found) {
+          node_id = split.right_id();
+        }
+        break;
+      }
       case TreeNode::NODE_NOT_SET: {
         QCHECK(false) << "Invalid node in tree: " << current_node.DebugString();
         break;
@@ -129,6 +149,15 @@ void DecisionTree::LinkChildren(const std::vector<int32>& children,
       split->set_right_id(*++children_it);
       break;
     }
+    case TreeNode::kCategoricalIdSetMembershipBinarySplit: {
+      QCHECK(children.size() == 2)
+          << "A binary split node must have exactly two children.";
+      auto* split =
+          parent_node->mutable_categorical_id_set_membership_binary_split();
+      split->set_left_id(*children_it);
+      split->set_right_id(*++children_it);
+      break;
+    }
     case TreeNode::NODE_NOT_SET: {
       QCHECK(false) << "A non-set node cannot have children.";
       break;
@@ -159,6 +188,10 @@ std::vector<int32> DecisionTree::GetChildren(const TreeNode& node) {
       const auto& split = node.categorical_id_binary_split();
       return {split.left_id(), split.right_id()};
     }
+    case TreeNode::kCategoricalIdSetMembershipBinarySplit: {
+      const auto& split = node.categorical_id_set_membership_binary_split();
+      return {split.left_id(), split.right_id()};
+    }
     case TreeNode::NODE_NOT_SET: {
       return {};
     }
diff --git a/tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc
index 0f082d7fd5..c55d09807e 100644
--- a/tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc
+++ b/tensorflow/contrib/boosted_trees/lib/trees/decision_tree_test.cc
@@ -181,6 +181,26 @@ TEST_F(DecisionTreeTest, TraverseCategoricalIdBinarySplit) {
   EXPECT_EQ(2, DecisionTree::Traverse(tree_config, 0, *++example_it));
 }
 
+TEST_F(DecisionTreeTest, TraverseCategoricalIdSetMembershipBinarySplit) {
+  DecisionTreeConfig tree_config;
+  auto* split_node = tree_config.add_nodes()
+                         ->mutable_categorical_id_set_membership_binary_split();
+  split_node->set_feature_column(0);
+  split_node->add_feature_ids(3);
+  split_node->set_left_id(1);
+  split_node->set_right_id(2);
+  tree_config.add_nodes()->mutable_leaf();
+  tree_config.add_nodes()->mutable_leaf();
+  auto example_iterable = batch_features_.examples_iterable(0, 2);
+
+  // Expect left child to be picked as 3 in {3};
+  auto example_it = example_iterable.begin();
+  EXPECT_EQ(1, DecisionTree::Traverse(tree_config, 0, *example_it));
+
+  // Expect right child to be picked as the feature is missing;
+  EXPECT_EQ(2, DecisionTree::Traverse(tree_config, 0, *++example_it));
+}
+
 TEST_F(DecisionTreeTest, TraverseHybridSplits) {
   DecisionTreeConfig tree_config;
   auto* split_node1 =
diff --git a/tensorflow/contrib/boosted_trees/proto/tree_config.proto b/tensorflow/contrib/boosted_trees/proto/tree_config.proto
index 3daa613b5d..62856b6829 100644
--- a/tensorflow/contrib/boosted_trees/proto/tree_config.proto
+++ b/tensorflow/contrib/boosted_trees/proto/tree_config.proto
@@ -13,6 +13,8 @@ message TreeNode {
     SparseFloatBinarySplitDefaultRight sparse_float_binary_split_default_right =
         4;
     CategoricalIdBinarySplit categorical_id_binary_split = 5;
+    CategoricalIdSetMembershipBinarySplit
+        categorical_id_set_membership_binary_split = 6;
   }
   TreeNodeMetadata node_metadata = 777;
 }
@@ -81,6 +83,20 @@ message CategoricalIdBinarySplit {
   int32 right_id = 4;
 }
 
+// Split rule for categorical features with a set of feature Ids.
+message CategoricalIdSetMembershipBinarySplit {
+  // Categorical feature column and Id describing
+  // the rule feature ∈ feature_ids.
+  int32 feature_column = 1;
+  // Sorted list of Ids in the set.
+  repeated int64 feature_ids = 2;
+
+  // Node children indexing into a contiguous
+  // vector of nodes starting from the root.
+  int32 left_id = 3;
+  int32 right_id = 4;
+}
+
 // DecisionTreeConfig describes a list of connected nodes.
 // Node 0 must be the root and can carry any payload including a leaf
 // in the case of representing the bias.
-- 
GitLab


From 75496707d8c32d960561e0e0fe3735d64aeecd5b Mon Sep 17 00:00:00 2001
From: Niranjan Hasabnis <niranjan.hasabnis@intel.com>
Date: Thu, 13 Apr 2017 14:41:36 -0700
Subject: [PATCH 0387/1563] Updates based on review comments - round 3

---
 tensorflow/core/graph/mkl_layout_pass.cc      | 299 +++++++++---------
 .../core/graph/mkl_tfconversion_pass.cc       |  39 ++-
 tensorflow/core/kernels/mkl_concat_op.cc      |   2 +
 .../core/kernels/mkl_fused_batch_norm_op.cc   |   2 +-
 tensorflow/core/util/mkl_util.h               |   2 +-
 5 files changed, 174 insertions(+), 170 deletions(-)

diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index a374b7924f..db8a4bcb13 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -65,10 +65,10 @@ namespace tensorflow {
 // We merge them into Conv2DWithBias as:
 //           P = MklConv2DWithBias(A, A_m, B, B_m, C, C_m)
 //
-// Meaning of A_m, B_m and C_m is explained in B.1.
+// The meaning of A_m, B_m and C_m is explained in B.1.
 //
 // Merge rules:
-//  - Merge for Conv2D and BiasAdd happens when output of Conv2D _only_
+//  - The merge for Conv2D and BiasAdd happens when the output of Conv2D _only_
 //    goes to BiasAdd.
 //  - Also, the intersection of attributes of both the nodes must have same
 //    values.
@@ -76,7 +76,7 @@ namespace tensorflow {
 //
 // Example of B.1 : Rewriting nodes to Mkl nodes
 // ---------------------------------------------
-// Consider Relu layer. Current definition of Relu layer looks like:
+// Consider a Relu node. Current definition of Relu node looks like:
 //
 //           O = Relu(A)
 //
@@ -87,62 +87,59 @@ namespace tensorflow {
 //
 //          O, O_m = MklRelu(A, A_m)
 //
-// MklRelu has 2 inputs (A and A_m) and 2 outputs (O and O_m). Here A input is
-// same as A input of Relu; O output is same as O output of Relu. O_m is the
+// MklRelu has 2 inputs (A and A_m) and 2 outputs (O and O_m). Here input A is
+// same as input A of Relu; output O is same as output O of Relu. O_m is the
 // additional output tensor that will be set by MklRelu, and it represents
 // Mkl tensor corresponding to O -- in other words, O_m is some kind of
 // metadata for O. A_m is additional input of Relu, and it represents metadata
 // for A - as O_m is metadata for O, A_m is metadata for A. MklRelu receives
-// this metadata from previous layer (in the graph).
+// this metadata from previous node in the graph.
 //
-// When previous layer in the graph is Mkl layer, A_m will represent a valid
-// Mkl tensor. But when previous Mkl layer is not an Mkl layer, then A_m
-// represents a dummy Mkl tensor.
+// When a previous node in the graph is an Mkl node, A_m will represent a valid
+// Mkl tensor. But when a previous node is not an Mkl node, A_m will represent
+// represent a dummy Mkl tensor.
 //
 // Rewriting rules:
-//  - Selection of an op for rewriting happens by registering an op with this
-//     pass. If an op is not registered, then it is not rewritten.
+//  - Selection of a node for rewriting happens by registering the op type of
+//    the node with the rewriting pass. If the op type is not registered, then
+//    all nodes of this op type will not be rewritten.
 //  - Number of inputs after rewriting:
-//      Since for every input Tensorflow tensor, the rewritten layer gets Mkl
-//      tensor, rewritten op gets 2*N inputs, where N is the number of inputs
-//      for original op.
+//      Since for every input Tensorflow tensor, the rewritten node gets Mkl
+//      tensor(s), rewritten node gets 2*N inputs, where N is the number of
+//      inputs for the original node.
 //  - Number of outputs after rewriting:
-//      Since for every output Tensorflow tensor, the rewritten layer generates
-//      Mkl tensor, rewritten op generates 2*N outputs, where N is the number
-//      of outputs of original op.
+//      Since for every output Tensorflow tensor, the rewritten node generates
+//      Mkl tensor(s), the rewritten node generates 2*N outputs, where N is the
+//      number of outputs of the original node.
 //  - Ordering of Tensorflow tensors and Mkl tensors:
-//      Since every op generates twice the number of inputs and outputs, one
-//      could imagine different ordering among Tensorflow tensors and Mkl
-//      tensors. E.g., let's assume an op 'Conv2D' takes (A, B) as input, then
-//      new op 'MklConv2D' can take (A, A_m, B, B_m) as input or it can also
-//      take (A, B, A_m, B_m) as input. Among N inputs one can get N!
-//      permutations.
+//      Since every rewritten node generates twice the number of inputs and
+//      outputs, one ould imagine various orderings among Tensorflow tensors
+//      and Mkl tensors. E.g., assume an op 'Conv2D' that takes (A, B) as
+//      inputs, then the new op 'MklConv2D' can take inputs A, B, A_m and B_m
+//      in A, A_m, B, B_m order or it can also take them in A, B, A_m, B_m
+//      order. Among N inputs one can get N! permutations.
 //
-//      So the question is: which one do we follow? We support 2 types of
+//      So the question is: which order do we follow? We support 2 types of
 //      orderings: (1) interleaved, and (2) contiguous. Interleaved ordering
-//      follows an intuitive order where Mkl tensor follows a corresponding
-//      Tensorflow tensor immediately. In the context of above example, it
-//      will be: (A, A_m, B, B_m). We follow same ordering rule for output
-//      tensors. Contiguous ordering means all Tensorflow tensors are
-//      contiguous followed by all contiguous Mkl tensors. We use contiguous
-//      ordering as default.
-//
-// NOTE: Current rewriting approach rewrites an op to Mkl op without any
-//      conditions. But in the future, it may be possible to consider
-//      conditions such as input shapes and sizes to rewrite an op.
+//      follows an intuitive order where an Mkl tensor follows the
+//      corresponding Tensorflow tensor immediately. In the context of the
+//      above example, it will be: A, A_m, B, B_m. Note that the ordering rule
+//      applies to both the inputs and outputs. Contiguous ordering means
+//      all the Tensorflow tensors are contiguous followed by all the Mkl
+//      tensors. We use contiguous ordering as default.
 //
 // Graph rewrite algorithm:
 //      Algorithm: Graph Rewrite
-//      Input: Graph G, Names of nodes to rewrite and their new nodes
-//      Output: Modified Graph G' if nodes are modified, G otherwise.
+//      Input: Graph G, Names of the nodes to rewrite and their new names
+//      Output: Modified Graph G' if the nodes are modified, G otherwise.
 //      Start:
-//        N = Topological_Sort(G) // N is set of nodes in toposort order.
+//        N = Topological_Sort(G) // N is a set of nodes in toposort order.
 //        foreach node n in N
 //        do
-//          if (Is_MKL_Layer(n))  // Can this layer accept Mkl layout as input.
+//          if (Is_MKL_Op(n))  // Can this node accept an Mkl layout as input.
 //          then
 //            E = set of <incoming edge and its src_output slot> of n
-//            E' = {}   // new set of edges for rewritten node
+//            E' = {}   // a new set of edges for rewritten node
 //            foreach <e,s> in E
 //            do
 //              E' U {<e,s>}  // First copy edge which generates Tensorflow
@@ -150,43 +147,44 @@ namespace tensorflow {
 //              m = Source node of edge e
 //              if Is_Rewritten(m)  // Did we rewrite this node in this pass?
 //              then
-//                E' U {<m,s+1>}    // If yes, then m will generate Mkl tensor
-//                                  // as output.
+//                E' U {<m,s+1>}    // If yes, then m will generate an Mkl
+//                                  // tensor as an additional output.
 //              else
-//                d = Generate_Dummy_Mkl_Tensor()  // If not, generate dummy
+//                d = Generate_Dummy_Mkl_Tensor()  // If not, generate a dummy
 //                                                 // Mkl tensor.
-//                E' U {<d,0>}   // Dummy Mkl tensor has only 1 output slot.
+//                E' U {<d,0>}  // The dummy Mkl tensor has only 1 output slot.
 //              fi
 //            done
 //            n' = Build_New_Node(G,new_name,E')
-//            Mark_Rewritten(n')  // Mark new node as being rewritten.
+//            Mark_Rewritten(n')  // Mark the new node as being rewritten.
 //          fi
 //        done
 //
 //      Explanation:
-//        For graph rewrite, we visit nodes of the graph in the topological
-//        sort order. With this ordering, we visit nodes in top-to-bottom
-//        fashion. We need this order because while visiting a node we want
-//        all of its input nodes (parents) visited (and rewritten if
-//        applicable). This is because if we need to rewrite a current node
+//        For graph rewrite, we visit nodes of the input graph in the
+//        topological sort order. With this ordering, we visit nodes in the
+//        top-to-bottom fashion. We need this order because while visiting a
+//        node we want that all of its input nodes are visited and rewritten if
+//        applicable. This is because if we need to rewrite a given node
 //        then all of its input nodes need to be fixed (in other words they
-//        cannot be removed later.)
+//        cannot be deleted later.)
 //
-//        While visiting each node, we first check if it is Mkl layer. If
-//        it is, then we rewrite that node after constructing new inputs to
-//        the node. If it is not Mkl layer, then we do not rewrite the node.
+//        While visiting a node, we first check if the op type of the node is
+//        an Mkl op. If it is, then we rewrite that node after constructing
+//        new inputs to the node. If the op type of the node is not Mkl op,
+//        then we do not rewrite that node.
 //
 // Handling workspace propagation for certain ops:
 //
 //        Certain backward ops in MKL (MaxPool, LRN and BatchNorm) require
-//        passing of workspace from their corresponding forward ops. Workspace
+//        passing of a workspace from their respective forward ops. Workspace
 //        tensors provide memory for storing results of intermediate operations
 //        which are helpful in backward propagation. TensorFlow does not have
-//        a notion of workspace and as a result does not allow producing
+//        a notion of a workspace and as a result does not allow producing
 //        additional outputs from these forward ops. For these ops, we need
-//        to add an additional edge between forward ops and their corresponding
-//        backward ops, and this edge carries workspace tensor value and
-//        another edge carries Mkl tensor for workspace tensor.
+//        to add 2 extra edges between forward ops and their corresponding
+//        backward ops - the first extra edge carries a workspace tensor and
+//        the second one carries an Mkl tensor for the workspace tensor.
 //
 //        Example:
 //
@@ -195,47 +193,47 @@ namespace tensorflow {
 //        A = MaxPool(T)
 //        B = MaxPoolGrad(X, A, Y)
 //
-//        We will transform this graph to propagate workspace as:
-//        (with contiguous ordering)
+//        We will transform this graph to propagate the workspace as:
+//        (with the contiguous ordering)
 //
 //        A, W, A_m, W_m = MklMaxPool(T, T_m)
 //        B, B_m = MklMaxPoolGrad(X, A, Y, W, X_m, A_m, Y_m, W_m)
 //
-//        Here W is the workspace tensor. Transformed tensors with name
-//        suffix _m are Mkl tensors and this transformation has been done
+//        Here W is the workspace tensor. Transformed tensor names with the
+//        suffix _m are Mkl tensors, and this transformation has been done
 //        using the algorithm discussed earlier. The transformation for
-//        workspace only adds extra outputs (W, W_m) for forward op and
-//        connects them to corresponding backward ops.
+//        workspace propagation only adds extra outputs (W, W_m) for a forward
+//        op and connects them to the corresponding backward ops.
 //
 //        Terms:
 //
 //        Forward op name = name of the op in the forward pass
-//          where workspace originates (MaxPool in this example)
+//          where a workspace tensor originates (MaxPool in this example)
 //        Backward op name = name of the op in the backward pass that receives
-//          workspace from forward op (MaxPoolGrad in the example)
+//          a workspace tensor from the forward op (MaxPoolGrad in the example)
 //        Slot = Position of the output or input slot that will be
-//               used by the workspace (1 for MklMaxPool as W is 2nd
+//               used by the workspace tensor (1 for MklMaxPool as W is the 2nd
 //               output of MaxPool (0 is 1st); 3 for MklMaxPoolGrad)
 //
 //        Question:
 //
 //        How do we associate a backward op to a forward op? There can be more
-//        than one op with exact same name.
+//        than one op with the exact same name.
 //
-//        In this example we associate MaxPoolGrad with MaxPool. But there
+//        In this example, we associate MaxPoolGrad with MaxPool. But there
 //        could be more than one MaxPool ops. To solve this problem, we look
-//        for _direct_ edge between forward op and backward op (tensor A is
-//        flowing along this edge in the example.)
+//        for _direct_ edge between a forward op and a backward op (tensor A is
+//        flowing along this edge in the example).
 //
-//        How do we transform forward and backward op when there is no direct
-//        edge between them? In such case, we generate dummy tensors as
+//        How do we transform forward and backward ops when there is no direct
+//        edge between them? In such a case, we generate dummy tensors for
 //        workspace tensors. For the example, transformation of MaxPool will
-//        be exactly same as we would when there is a direct edge between
-//        forward and backward op --- it is just that MaxPool won't generate
-//        any workspace tensor. For MaxPoolGrad, transformation will also be
-//        same, but instead of connecting W and W_m with outputs of MaxPool,
-//        we will produce dummy tensors for them, and we will set
-//        workspace_enabled attribute to false.
+//        be exactly same as it would be when there is a direct edge between
+//        the forward and the backward op --- it is just that MaxPool won't
+//        generate any workspace tensor. For MaxPoolGrad, the transformation
+//        will also be same, but instead of connecting W and W_m with the
+//        outputs of MaxPool, we will produce dummy tensors for them, and we
+//        will set workspace_enabled attribute to false.
 //
 // Example of B.2 : Context-based node rewrite
 // -------------------------------------------
@@ -362,24 +360,25 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   bool RunPass(std::unique_ptr<Graph>* g);
 
  private:
-  /// Structure to specify name of original op, its new name after rewrite,
-  /// the number of inputs to the original op, and the function to be used
-  /// to copy attributes for the op
+  /// Structure to specify the name of an original node, its new name after
+  /// rewrite, the number of inputs to the original node, the function to
+  /// be used to copy attributes for the op, and the rule (if any) which
+  /// must hold for rewriting the node
   typedef struct {
-    string name;      // Original name of the op in the graph
-    string new_name;  // New name of op in the graph
-    int num_ins;      // Number of inputs to the original op
-    // Function handler to copy attributes from old node to new node.
+    string name;      // Original name of op of the node in the graph
+    string new_name;  // New name of the op of the node in the graph
+    int num_ins;      // The number of inputs to the original op type
+    // A function handler to copy attributes from an old node to a new node.
     std::function<void(const Node*, NodeBuilder*)> copy_attrs;
-    std::function<bool(const Node*)> rewrite_rule;  // Rule under which to
+    std::function<bool(const Node*)> rewrite_rule;  // A rule under which to
                                                    // rewrite this node.
   } RewriteInfo;
 
-  /// Structure to specify forward op, backward op, and the slot numbers
-  /// in forward and backward op where we will add workspace edge.
+  /// Structure to specify a forward op, a backward op, and the slot numbers
+  /// in the forward and backward ops where we will add a workspace edge.
   typedef struct {
-    string fwd_op;    // Name of the forward op in the graph
-    string bwd_op;    // Name of the backward op in the graph
+    string fwd_op;    // Name of a forward op in the graph
+    string bwd_op;    // Name of a backward op in the graph
     int fwd_slot;     // Output slot in the forward op node where actual
                       // output tensor resides
     int bwd_slot;     // Input slot in the backward op node where actual
@@ -394,18 +393,18 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   typedef struct {
     string pred;      // Predecessor node string
     string succ;      // Successor node string
-    int op;           // What operand no the predecessor node corresponds
-                      // to successor node?
+    int op;           // The operand no the predecessor node corresponds
+                      // to the successor node
     string new_node;  // Name of the node after merge
   } MergeInfo;
 
-  /// Structure to specify the context information used in node rewrite rule
+  /// Structure to specify the context information used in a node rewrite rule
   typedef struct {
     string node;     // Name of the node to be rewritten
-    string fwd;      // Node name in forward pass that this node
+    string fwd;      // Name of the node in the forward pass that this node
                      // corresponds to
     size_t max_hop;  // Maximum number of hops the fwd is located
-                     // from this node. If fwd is farther than max_hop
+                     // from this node. If the fwd is farther than max_hop
                      // then we do not rewrite the node.
   } ContextInfo;
 
@@ -474,9 +473,9 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //
   // Concat, Split are vararg nodes.
   inline bool IsVarArgNode(Node* n) {
-    if (n->type_string() == csinfo_.concat ||
-        n->type_string() == csinfo_.split  ||
-       n->type_string() == csinfo_.concatv2) {
+    if (n->type_string() == csinfo_.concat   ||
+        n->type_string() == csinfo_.concatv2 ||
+        n->type_string() == csinfo_.split) {
       return true;
     }
     return false;
@@ -580,7 +579,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //         Otherwise, it is not updated.
   Status RewriteNode(std::unique_ptr<Graph>* g, Node* n, const RewriteInfo* ri);
 
-  // Get a node that will feed a list of TF tensors to the new
+  // Get nodes that will feed a list of TF tensors to the new
   // node that we are constructing.
   //
   // @input g - input graph,
@@ -599,7 +598,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     int* input_idx, int list_length,
     std::vector<NodeBuilder::NodeOut>* output_nodes);
 
-  // Get a node that will feed a list of Mkl tensors to the new
+  // Get nodes that will feed a list of Mkl tensors to the new
   // node that we are constructing.
   //
   // @input g - input graph,
@@ -776,12 +775,13 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(
   TensorShape dummy_shape({8});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                 .Attr("value", proto)
-                 .Attr("dtype", dt)
-                 .Device(orig_node->def().device())  // We place this node on
-                                             // same device as device of
-                                             // original node.
-                 .Finalize(&**g, out));
+               .Attr("value", proto)
+               .Attr("dtype", dt)
+               .Device(orig_node->def().device())  // We place this node on
+                                                   // the same device as the
+                                                   // device of the original
+                                                   // node.
+               .Finalize(&**g, out));
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
@@ -881,26 +881,26 @@ int MklLayoutRewritePass::SetUpContiguousInputs(std::unique_ptr<Graph>* g,
   // Actual number of inputs can be greater than or equal to number
   // of Input slots because inputs of type list could be unfolded.
   CHECK_GE(old_node_inputs.size(), old_node_input_slots);
-  int nnsidx = 0;  // slot index for inputs of new node
+  int nn_slot_idx = 0;  // slot index for inputs of new node
 
   // Let's copy all inputs (TF tensors) of original node to new node.
   int iidx = 0;
-  for (int onsidx = 0; onsidx < old_node_input_slots; onsidx++) {
+  for (int on_slot_idx = 0; on_slot_idx < old_node_input_slots; on_slot_idx++) {
     // An input slot could be a single tensor or a list. We need
     // to handle this case accordingly.
     CHECK_LT(iidx, old_node_inputs.size());
-    const OpDef::ArgDef& arg = old_node->op_def().input_arg(onsidx);
+    const OpDef::ArgDef& arg = old_node->op_def().input_arg(on_slot_idx);
     if (ArgIsList(arg)) {
       std::vector<NodeBuilder::NodeOut> new_node_inputs;
       int N = GetTensorListLength(arg, old_node);
       GetNodesProducingTFTensorList(old_node_inputs, &iidx, N,
                                     &new_node_inputs);
       nb->Input(new_node_inputs);
-      nnsidx++;
+      nn_slot_idx++;
     } else {
       nb->Input(old_node_inputs[iidx].first, old_node_inputs[iidx].second);
       iidx++;
-      nnsidx++;
+      nn_slot_idx++;
     }
   }
 
@@ -912,24 +912,24 @@ int MklLayoutRewritePass::SetUpContiguousInputs(std::unique_ptr<Graph>* g,
     CHECK_EQ(workspace_tensors->size(), 2);
     // Tensorflow tensor
     nb->Input((*workspace_tensors)[0].node, (*workspace_tensors)[0].index);
-    nnsidx++;
+    nn_slot_idx++;
   }
 
   // Let's now setup all Mkl inputs to new node.
   // Number of Mkl inputs must be same as number of TF inputs.
   iidx = 0;
-  for (int onsidx = 0; onsidx < old_node_input_slots; onsidx++) {
+  for (int on_slot_idx = 0; on_slot_idx < old_node_input_slots; on_slot_idx++) {
     // An input slot could be a single tensor or a list. We need
     // to handle this case accordingly.
     CHECK_LT(iidx, old_node_inputs.size());
-    const OpDef::ArgDef& arg = old_node->op_def().input_arg(onsidx);
+    const OpDef::ArgDef& arg = old_node->op_def().input_arg(on_slot_idx);
     if (ArgIsList(arg)) {
       std::vector<NodeBuilder::NodeOut> new_node_inputs;
       int N = GetTensorListLength(arg, old_node);
       GetNodesProducingMklTensorList(g, old_node_inputs, &iidx,
                                      N, &new_node_inputs);
       nb->Input(new_node_inputs);
-      nnsidx++;
+      nn_slot_idx++;
     } else {
       Node* mkl_node = nullptr;
       int mkl_node_output_slot = 0;
@@ -938,7 +938,7 @@ int MklLayoutRewritePass::SetUpContiguousInputs(std::unique_ptr<Graph>* g,
                                 &mkl_node, &mkl_node_output_slot);
       nb->Input(mkl_node, mkl_node_output_slot);
       iidx++;
-      nnsidx++;
+      nn_slot_idx++;
     }
   }
 
@@ -950,10 +950,10 @@ int MklLayoutRewritePass::SetUpContiguousInputs(std::unique_ptr<Graph>* g,
     CHECK_EQ(workspace_tensors->size(), 2);
     // Mkl tensor
     nb->Input((*workspace_tensors)[1].node, (*workspace_tensors)[1].index);
-    nnsidx++;
+    nn_slot_idx++;
   }
 
-  return nnsidx;
+  return nn_slot_idx;
 }
 
 Status MklLayoutRewritePass::SetUpInputs(std::unique_ptr<Graph>* g,
@@ -1018,11 +1018,13 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
   TensorShape dummy_shape({1});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                  .Attr("value", proto)
-                  .Attr("dtype", dt)
-                  .Device(orig_node->def().device())  // We place this node on
-                  // same device as device of original node.
-                  .Finalize(&**g, out));
+                .Attr("value", proto)
+                .Attr("dtype", dt)
+                .Device(orig_node->def().device())  // We place this node on
+                                                    // same the device as the
+                                                    // device of the original
+                                                    // node.
+                .Finalize(&**g, out));
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
@@ -1458,30 +1460,30 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     nb.Device(succ->def().device());
 
     // Create node.
-    Node* newn;
-    nb.Finalize(&**g, &newn);
-    CHECK_NOTNULL(newn);
+    Node* new_node;
+    nb.Finalize(&**g, &new_node);
+    CHECK_NOTNULL(new_node);
 
     // Set the Mkl layer label for this op.
-    newn->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
+    new_node->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
     // Incoming edges are fixed, we will fix the outgoing edges now.
     for (const Edge* e : succ->out_edges()) {
-      (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
+      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
     }
 
     // Copy device assigned to old node to new node.
     // It's ok to use pred or succ as we have enforced a check that
     // both have same device assigned.
-    newn->set_assigned_device_name(pred->assigned_device_name());
+    new_node->set_assigned_device_name(pred->assigned_device_name());
 
     VLOG(1) << "MklLayoutRewritePass: Merged old node:" << pred->DebugString()
             << ", and node: " << succ->DebugString()
-            << ", into node:" << newn->DebugString();
+            << ", into node:" << new_node->DebugString();
 
     (*g)->RemoveNode(succ);
     (*g)->RemoveNode(pred);
-    MarkRewrittenNode(newn);
+    MarkRewrittenNode(new_node);
 
     return Status::OK();
   }
@@ -1574,37 +1576,38 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
   nb.Attr("_kernel", mkl_op_registry::kMklOpLabel);
 
   // Finalize graph and get new node.
-  Node* newn = nullptr;
-  TF_CHECK_OK(nb.Finalize(&**g, &newn));
-  CHECK_NOTNULL(newn);
-
-  // Incoming edges from 'orig_node' node to new 'newn' node are already copied
-  // in BuildNode. Copy outgoing edges from 'orig_node' node to new 'newn' node.
-  // Since the output also follows same ordering among Tensorflow tensors and
-  // Mkl tensors. We need to connect Tensorflow tensors appropriately.
-  // Specifically, nth output of original node will become 2*nth output of
-  // Mkl node for interleaved ordering of tensors. For contiguous ordering of
-  // tensors it will be n. GetTensorDataIndex provides this mapping function.
+  Node* new_node = nullptr;
+  TF_CHECK_OK(nb.Finalize(&**g, &new_node));
+  CHECK_NOTNULL(new_node);
+
+  // Incoming edges from 'orig_node' node to new 'new_node' node are already
+  // copied in BuildNode. Copy outgoing edges from 'orig_node' node to new
+  // 'new_node' node, since the output also follows same ordering among
+  // Tensorflow tensors and Mkl tensors. We need to connect Tensorflow
+  // tensors appropriately. Specifically, nth output of the original node
+  // will become 2*nth output of the Mkl node for the interleaved ordering
+  // of the tensors. For the contiguous ordering of the tensors, it will be n.
+  // GetTensorDataIndex provides this mapping function.
   for (const Edge* e : orig_node->out_edges()) {
     // We need to handle control-edges by using their original slot number.
     // Generally, -1 is reserved for control slot.
     if (e->src_output() < 0) {
-      (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
+      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
     } else {
-      (*g)->AddEdge(newn, GetTensorDataIndex(e->src_output(),
+      (*g)->AddEdge(new_node, GetTensorDataIndex(e->src_output(),
                             e->src()->num_outputs()),
                     e->dst(), e->dst_input());
     }
   }
 
   // Copy the runtime device assigned from original code to new node.
-  newn->set_assigned_device_name(orig_node->assigned_device_name());
+  new_node->set_assigned_device_name(orig_node->assigned_device_name());
 
   // Delete original node and mark new node as rewritten.
   (*g)->RemoveNode(orig_node);
-  MarkRewrittenNode(newn);
+  MarkRewrittenNode(new_node);
 
-  VLOG(1) << "MklLayoutRewritePass: New node:" << newn->DebugString();
+  VLOG(1) << "MklLayoutRewritePass: New node:" << new_node->DebugString();
   return Status::OK();
 }
 
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index b2f05af475..affe9b31c3 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -40,16 +40,16 @@ namespace tensorflow {
 
 // This pass inserts Mkl to Tf tensor conversion nodes (represented by C)
 // in the graph in between A and B, where A and B match any one
-// of the following
-// cases:
-//  1) A = layer/Op that generates output in Mkl format and,
-//     B = layer/Op that does not accept input in Mkl format and,
+// of the following cases:
+//
+//  1) A = a node that generates output in the Mkl format and,
+//     B = a node that does not accept input in the Mkl format and,
 //     A -> B (there is a direct edge between A and B, then
 //     We will insert C such that A->C->B.
 //
-//  2) A = layer/Op that generates output in Mkl format and,
-//     B = NULL (in other words, A is the last layer in the graph), then
-//     We will insert C such that A->C->B. (C will be the last layer.)
+//  2) A = a node that generates output in the Mkl format and,
+//     B = NULL (in other words, A is the last node in the graph), then
+//     We will insert C such that A->C->B. (C will be the last node.)
 //
 //  Note that case 1 applies to all outputs of A that are input to B.
 //  In other words, the conversions will be required for every output
@@ -59,9 +59,9 @@ namespace tensorflow {
 //  do the conversion for A1 and A2 only. We do not need to do any conversion
 //  for A3.
 //
-// This pass relies on layers registering themselves about their Mkl compliant.
-// Mkl compliant layer can accept inputs in Mkl format, and produce output in
-// Mkl format. Non-compliant layer accepts inputs and outputs in
+// This pass relies on ops registering themselves about their Mkl compliance.
+// An Mkl-compliant op can accept inputs in the Mkl format, and produce outputs
+// in the Mkl format. Non-compliant ops accept inputs and outputs in the
 // TensorFlow format.
 //
 class MklToTfConversionPass : public GraphOptimizationPass {
@@ -77,7 +77,6 @@ class MklToTfConversionPass : public GraphOptimizationPass {
   // false, otherwise.
   bool RunPass(std::unique_ptr<Graph>* g);
 
-
  private:
   // Is the input Op supported by Mkl-specific layout?
   //
@@ -130,12 +129,12 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
     return Status(error::Code::INVALID_ARGUMENT, err_msg.c_str());
   }
 
-  // Lets build the conversion node and specify src as input.
+  // Build the conversion node and specify src as input.
   TF_CHECK_OK(NodeBuilder((*g)->NewName("Mkl2Tf"), "MklToTf")
         .Input(src, e->src_output())
         .Input(src, DataIndexToMetaDataIndex(
-            e->src_output(), src->num_outputs()))  // Get Mkl tensor slot
-                                        // from Tf tensor slot.
+            e->src_output(), src->num_outputs()))  // Get an Mkl tensor slot
+                                                   // from the Tf tensor slot.
         .Device(src->def().device())  // We want to get conversion node
                                       // on same device as source node.
         .Attr("T", src_datatype)
@@ -150,7 +149,7 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
   // We want conversion node to be on the same device as the source node.
   conversion_node->set_assigned_device_name(src->assigned_device_name());
 
-  // Set the Mkl layer label for this op.
+  // Set the Mkl op label for this op.
   conversion_node->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
   // Now that we have added edge from src->conversion_node, let's add edge from
@@ -174,11 +173,11 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
 
   DumpGraph("Before MklToTfConversionPass", &**g);
 
-  // Since we are looking for mkl-supported op node immediately
-  // followed by non-mkl op node, we will just iterate over edge
+  // Since we are looking for an Mkl-supported op node immediately
+  // followed by a non-Mkl op node, we will just iterate over edge
   // set of the graph.
-  // vector to maintain candiadate edges whose source and destination
-  // are candidate for inserting conversion node
+  // edge set whose source and destination are candidates for
+  // inserting conversion node
   std::vector<Edge*> candidate_edges;
 
   for (const Edge* e : (*g)->edges()) {
@@ -191,7 +190,7 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
     }
 
     // We skip adding MklToTf on an edge between X->MklToTf or
-    // MklToTf->X, where X is any layer.
+    // MklToTf->X, where X is any node.
     if (src->type_string().compare("MklToTf") == 0 ||
         dst->type_string().compare("MklToTf") == 0) {
       continue;
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
index 9156530025..2f5f623d92 100644
--- a/tensorflow/core/kernels/mkl_concat_op.cc
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -38,6 +38,8 @@ typedef Eigen::ThreadPoolDevice CPUDevice;
 
 enum AxisArgumentName { NAME_IS_AXIS, NAME_IS_CONCAT_DIM };
 
+// TODO(intelft) Check if we can reuse existing EigenConcatOp using Mutable
+// reference inputs.
 // --------------------------------------------------------------------------
 //                      Eigen Concat Op
 // --------------------------------------------------------------------------
diff --git a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
index a5656640b4..2c84623d2a 100644
--- a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
+++ b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
@@ -173,7 +173,7 @@ class MklFusedBatchNormOp : public OpKernel {
                     mkl_context.mkl_res_batchnorm[dnnResourceVariance]),
                 scale.NumElements() * sizeof(float));
 
-    // Bessel's correction on variance, if training mode in on
+    // Bessel's correction on variance, if training mode is on
     if (is_training_) {
       float* p_var = static_cast<float*>(batch_variance->flat<T>().data());
       auto depth = mkl_context.mkl_params.depth;
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index c5b1c7a1cf..8f3d178bcb 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -559,7 +559,7 @@ static inline bool IsMklOp(const std::string& op_name, DataType T) {
   string kernel = KernelsRegisteredForOp(op_name);
   bool result =
       kernel.find(kMklOpLabelPattern) != string::npos && (T == DT_FLOAT);
-  if (result == true) {
+  if (result) {
     VLOG(1) << "mkl_op_registry::" << op_name << " is " << kMklOpLabel;
   }
   return result;
-- 
GitLab


From 4152dfba9380f273411502d975a9c6b22ebdba42 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 13 Apr 2017 13:19:09 -0800
Subject: [PATCH 0388/1563] Fix MetaGraphDef comparison.

Don't compare the collection_def protos in serialized form; this leads to errors
when the proto serialization isn't exactly identical.
Change: 153105424
---
 .../python/framework/meta_graph_test.py       |  3 +-
 tensorflow/python/framework/test_util.py      | 30 +++++++++++++++++++
 tensorflow/python/training/saver_test.py      |  5 +++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/framework/meta_graph_test.py b/tensorflow/python/framework/meta_graph_test.py
index de17eeb5b4..f8056ade3e 100644
--- a/tensorflow/python/framework/meta_graph_test.py
+++ b/tensorflow/python/framework/meta_graph_test.py
@@ -29,6 +29,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import function
 from tensorflow.python.framework import meta_graph
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
@@ -332,7 +333,7 @@ class ScopedMetaGraphTest(test.TestCase):
     del orig_meta_graphs[0].collection_def["unbound_inputs"]
     del new_meta_graphs[0].collection_def["unbound_inputs"]
     for a, b in zip(orig_meta_graphs, new_meta_graphs):
-      self.assertProtoEquals(a, b)
+      test_util.assert_meta_graph_protos_equal(self, a, b)
 
   def _testScopedExportWithQueue(self, test_dir, exported_filename):
     graph = ops.Graph()
diff --git a/tensorflow/python/framework/test_util.py b/tensorflow/python/framework/test_util.py
index a9755506ab..06fc494a08 100644
--- a/tensorflow/python/framework/test_util.py
+++ b/tensorflow/python/framework/test_util.py
@@ -117,6 +117,36 @@ def assert_equal_graph_def(actual, expected, checkpoint_v2=False):
     raise AssertionError(compat.as_str(diff))
 
 
+def assert_meta_graph_protos_equal(tester, a, b):
+  """Compares MetaGraphDefs `a` and `b` in unit test class `tester`."""
+  # Carefully check the collection_defs
+  tester.assertEqual(set(a.collection_def), set(b.collection_def))
+  collection_keys = a.collection_def.keys()
+  for k in collection_keys:
+    a_value = a.collection_def[k]
+    b_value = b.collection_def[k]
+    proto_type = ops.get_collection_proto_type(k)
+    if proto_type:
+      a_proto = proto_type()
+      b_proto = proto_type()
+      # Number of entries in the collections is the same
+      tester.assertEqual(len(a_value.bytes_list.value),
+                         len(b_value.bytes_list.value))
+      for (a_value_item, b_value_item) in zip(
+          a_value.bytes_list.value,
+          b_value.bytes_list.value):
+        a_proto.ParseFromString(a_value_item)
+        b_proto.ParseFromString(b_value_item)
+        tester.assertProtoEquals(a_proto, b_proto)
+    else:
+      tester.assertEquals(a_value, b_value)
+  # Compared the fields directly, remove their raw values from the
+  # proto comparison below.
+  a.ClearField("collection_def")
+  b.ClearField("collection_def")
+  tester.assertProtoEquals(a, b)
+
+
 # Matches attributes named via _SHARDED_SUFFIX in
 # tensorflow/python/training/saver.py
 _SHARDED_SAVE_OP_PATTERN = "_temp_[0-9a-z]{32}/part"
diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py
index 1a980f9311..ec370afee1 100644
--- a/tensorflow/python/training/saver_test.py
+++ b/tensorflow/python/training/saver_test.py
@@ -46,6 +46,7 @@ from tensorflow.python.framework import function
 from tensorflow.python.framework import graph_io
 from tensorflow.python.framework import meta_graph
 from tensorflow.python.framework import ops as ops_lib
+from tensorflow.python.framework import test_util
 from tensorflow.python.lib.io import file_io
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
@@ -1482,7 +1483,9 @@ class MetaGraphTest(test.TestCase):
       # Generates a new MetaGraphDef.
       new_meta_graph_def = new_saver.export_meta_graph()
       # It should be the same as the original.
-      self.assertProtoEquals(meta_graph_def, new_meta_graph_def)
+
+    test_util.assert_meta_graph_protos_equal(
+        self, meta_graph_def, new_meta_graph_def)
 
   def testAddCollectionDefFails(self):
     with self.test_session():
-- 
GitLab


From e67bb079741b7bf8f54d63624b92d0cea4ef3a57 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 13 Apr 2017 13:29:51 -0800
Subject: [PATCH 0389/1563] Don't use git_repository for gflags

It goes slow. jGit is buggy. It's not mirrored.
Change: 153106869
---
 tensorflow/workspace.bzl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 0b77d471aa..559a0d5d50 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -355,10 +355,15 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name="gtest_main",
       actual="@gmock_archive//:gtest_main",)
 
-  native.git_repository(
-      name="com_github_gflags_gflags",
-      commit="f8a0efe03aa69b3336d8e228b37d4ccb17324b88",
-      remote="https://github.com/gflags/gflags.git",)
+  native.http_archive(
+      name = "com_github_gflags_gflags",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/github.com/gflags/gflags/archive/f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz",
+          "https://github.com/gflags/gflags/archive/f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz",
+      ],
+      sha256 = "4d222fab8f1ede4709cdff417d15a1336f862d7334a81abf76d09c15ecf9acd1",
+      strip_prefix = "gflags-f8a0efe03aa69b3336d8e228b37d4ccb17324b88",
+  )
 
   native.bind(
       name="python_headers",
-- 
GitLab


From 24bf4047ce8a91619b33b107ac333397aa7a77a4 Mon Sep 17 00:00:00 2001
From: Niranjan Hasabnis <niranjan.hasabnis@intel.com>
Date: Thu, 13 Apr 2017 15:22:07 -0700
Subject: [PATCH 0390/1563] Minor English corrections in mkl layout pass

---
 tensorflow/core/graph/mkl_layout_pass.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index db8a4bcb13..a1ea92281b 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -97,7 +97,7 @@ namespace tensorflow {
 //
 // When a previous node in the graph is an Mkl node, A_m will represent a valid
 // Mkl tensor. But when a previous node is not an Mkl node, A_m will represent
-// represent a dummy Mkl tensor.
+// a dummy Mkl tensor.
 //
 // Rewriting rules:
 //  - Selection of a node for rewriting happens by registering the op type of
@@ -113,7 +113,7 @@ namespace tensorflow {
 //      number of outputs of the original node.
 //  - Ordering of Tensorflow tensors and Mkl tensors:
 //      Since every rewritten node generates twice the number of inputs and
-//      outputs, one ould imagine various orderings among Tensorflow tensors
+//      outputs, one could imagine various orderings among Tensorflow tensors
 //      and Mkl tensors. E.g., assume an op 'Conv2D' that takes (A, B) as
 //      inputs, then the new op 'MklConv2D' can take inputs A, B, A_m and B_m
 //      in A, A_m, B, B_m order or it can also take them in A, B, A_m, B_m
-- 
GitLab


From 34eb5f87279176269632f330cf0418310e3f0eca Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 13 Apr 2017 14:04:22 -0800
Subject: [PATCH 0391/1563] Make SleepForMicroseconds test less flaky Change:
 153111659

---
 tensorflow/core/platform/env_test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/platform/env_test.cc b/tensorflow/core/platform/env_test.cc
index d0a249ddc1..b766c5d25b 100644
--- a/tensorflow/core/platform/env_test.cc
+++ b/tensorflow/core/platform/env_test.cc
@@ -253,10 +253,10 @@ TEST_F(DefaultEnvTest, SleepForMicroseconds) {
   env_->SleepForMicroseconds(sleep_time);
   const int64 delta = env_->NowMicros() - start;
 
-  // Subtract 50 from the sleep_time for this check because NowMicros can
+  // Subtract 200 from the sleep_time for this check because NowMicros can
   // sometimes give slightly inconsistent values between the start and the
   // finish (e.g. because the two calls run on different CPUs).
-  EXPECT_GE(delta, sleep_time - 50);
+  EXPECT_GE(delta, sleep_time - 200);
 }
 
 class TmpDirFileSystem : public NullFileSystem {
-- 
GitLab


From 72d7af2f55b596947f6ba5a2b8aa7d30d5e0695d Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 13 Apr 2017 14:53:18 -0800
Subject: [PATCH 0392/1563] Bug fix: zeros_like(x) does not depend on x if its
 shape is fully defined. Change: 153117347

---
 tensorflow/python/framework/tensor_util.py    |  7 ++++++
 .../python/framework/tensor_util_test.py      |  7 ++++++
 .../python/kernel_tests/constant_op_test.py   | 22 ++++++++++++++-----
 tensorflow/python/ops/array_ops.py            | 13 +++++++----
 tensorflow/python/ops/nn_grad.py              | 10 ++++++++-
 5 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/framework/tensor_util.py b/tensorflow/python/framework/tensor_util.py
index c2378ac4b2..1e445591b1 100644
--- a/tensorflow/python/framework/tensor_util.py
+++ b/tensorflow/python/framework/tensor_util.py
@@ -671,6 +671,13 @@ def _ConstantValue(tensor):
         return None
       values.append(value)
     return np.array(values)
+  elif tensor.op.type == "Fill":
+    fill_shape = tensor.shape
+    fill_value = constant_value(tensor.op.inputs[1])
+    if fill_shape.is_fully_defined() and fill_value is not None:
+      return np.full(fill_shape.as_list(), fill_value, dtype=fill_value.dtype)
+    else:
+      return None
   else:
     return None
 
diff --git a/tensorflow/python/framework/tensor_util_test.py b/tensorflow/python/framework/tensor_util_test.py
index 5eb5230404..8949702b87 100644
--- a/tensorflow/python/framework/tensor_util_test.py
+++ b/tensorflow/python/framework/tensor_util_test.py
@@ -713,6 +713,13 @@ class ConstantValueTest(test.TestCase):
     self.assertAllEqual(np_val, c_val)
     self.assertEqual(np.int32, c_val.dtype)
 
+  def testFill(self):
+    np_val = np.array([-1, -1, -1], dtype=np.float32)
+    tf_val = array_ops.fill([3], constant_op.constant(-1.0))
+    c_val = tensor_util.constant_value(tf_val)
+    self.assertAllEqual(np_val, c_val)
+    self.assertEqual(np.float32, c_val.dtype)
+
   def testSize(self):
     tf_val = array_ops.size(constant_op.constant(0.0, shape=[1, 2, 3]))
     c_val = tensor_util.constant_value(tf_val)
diff --git a/tensorflow/python/kernel_tests/constant_op_test.py b/tensorflow/python/kernel_tests/constant_op_test.py
index 313db0183f..411b1c760f 100644
--- a/tensorflow/python/kernel_tests/constant_op_test.py
+++ b/tensorflow/python/kernel_tests/constant_op_test.py
@@ -350,7 +350,7 @@ class ZerosTest(test.TestCase):
 
 class ZerosLikeTest(test.TestCase):
 
-  def _compareZeros(self, dtype, use_gpu):
+  def _compareZeros(self, dtype, fully_defined_shape, use_gpu):
     with self.test_session(use_gpu=use_gpu):
       # Creates a tensor of non-zero values with shape 2 x 3.
       # NOTE(kearnes): The default numpy dtype associated with tf.string is
@@ -361,16 +361,24 @@ class ZerosLikeTest(test.TestCase):
         numpy_dtype = np.string_
       else:
         numpy_dtype = dtype.as_numpy_dtype
-      d = constant_op.constant(np.ones((2, 3), dtype=numpy_dtype), dtype=dtype)
+      if fully_defined_shape:
+        d = constant_op.constant(
+            np.ones((2, 3), dtype=numpy_dtype), dtype=dtype)
+      else:
+        d = array_ops.placeholder(dtype=dtype)
       # Constructs a tensor of zeros of the same dimensions and type as "d".
       z_var = array_ops.zeros_like(d)
       # Test that the type is correct
       self.assertEqual(z_var.dtype, dtype)
       # Test that the shape is correct
-      self.assertEqual([2, 3], z_var.get_shape())
+      if fully_defined_shape:
+        self.assertEqual([2, 3], z_var.get_shape())
 
       # Test that the value is correct
-      z_value = z_var.eval()
+      feed_dict = {}
+      if not fully_defined_shape:
+        feed_dict[d] = np.ones((2, 3), dtype=numpy_dtype)
+      z_value = z_var.eval(feed_dict=feed_dict)
       self.assertFalse(np.any(z_value))
       self.assertEqual((2, 3), z_value.shape)
 
@@ -381,14 +389,16 @@ class ZerosLikeTest(test.TestCase):
         dtypes_lib.complex64, dtypes_lib.complex128, dtypes_lib.int64,
         dtypes_lib.string
     ]:
-      self._compareZeros(dtype, False)
+      self._compareZeros(dtype, fully_defined_shape=False, use_gpu=False)
+      self._compareZeros(dtype, fully_defined_shape=True, use_gpu=False)
 
   def testZerosLikeGPU(self):
     for dtype in [
         dtypes_lib.float32, dtypes_lib.float64, dtypes_lib.int32,
         dtypes_lib.bool, dtypes_lib.int64, dtypes_lib.string
     ]:
-      self._compareZeros(dtype, True)
+      self._compareZeros(dtype, fully_defined_shape=False, use_gpu=True)
+      self._compareZeros(dtype, fully_defined_shape=True, use_gpu=True)
 
   def testZerosLikePartialShape(self):
     d = array_ops.placeholder(dtypes_lib.float32, shape=[None, 4, None])
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 4f5d71f5f6..0b936022ea 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1402,10 +1402,15 @@ def zeros_like(tensor, dtype=None, name=None, optimize=True):
   """
   with ops.name_scope(name, "zeros_like", [tensor]) as name:
     tensor = ops.convert_to_tensor(tensor, name="tensor")
-    if dtype is not None and tensor.dtype != dtype:
-      ret = zeros(shape_internal(tensor, optimize=optimize), dtype, name=name)
-      ret.set_shape(tensor.get_shape())
-      return ret
+
+    if tensor.shape.is_fully_defined():
+      # We can produce a zeros tensor independent of the value of 'tensor',
+      # since the shape is known statically.
+      return zeros(tensor.shape, dtype=dtype or tensor.dtype, name=name)
+
+    if dtype is not None and dtype != tensor.dtype:
+      return zeros(shape_internal(tensor, optimize=optimize), dtype=dtype,
+                   name=name)
     else:
       return gen_array_ops._zeros_like(tensor, name=name)
 
diff --git a/tensorflow/python/ops/nn_grad.py b/tensorflow/python/ops/nn_grad.py
index 9b765390b3..ebf17c8a41 100644
--- a/tensorflow/python/ops/nn_grad.py
+++ b/tensorflow/python/ops/nn_grad.py
@@ -20,6 +20,7 @@ from __future__ import print_function
 
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gen_nn_ops
 from tensorflow.python.ops import math_ops
@@ -387,7 +388,14 @@ def _SoftmaxCrossEntropyWithLogitsGrad(op, grad_loss, grad_grad):
   softmax_grad = op.outputs[1]
   grad = _BroadcastMul(grad_loss, softmax_grad)
 
-  if grad_grad.op.type not in ("ZerosLike", "Zeros"):
+  def IsZero(g):
+    # Some introspection to check if the gradient is feeding zeros
+    if g.op.type in ("ZerosLike", "Zeros"):
+      return True
+    const_fill_value = tensor_util.constant_value(g)
+    return const_fill_value is not None and (const_fill_value == 0).all()
+
+  if not IsZero(grad_grad):
     logits = op.inputs[0]
     softmax = nn_ops.softmax(logits)
 
-- 
GitLab


From 55dee478b92486b8f3e420950e30998716fadae9 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Thu, 13 Apr 2017 16:25:34 -0700
Subject: [PATCH 0393/1563] Updating RELEASE.md to include keras fixes and
 TensorBoard text dashboard.

---
 RELEASE.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/RELEASE.md b/RELEASE.md
index ebb5c28451..10a8644529 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -16,6 +16,7 @@
   * New navigation bar in Curses-based UI
   * NodeStepper (command `invoke_stepper`) now uses intermediate tensor dumps. It also uses `TensorHandles` as direct feeds during successive `cont` calls for improved performance and reduced memory consumption.
 * Initial release of installation guides for Java, C, and Go.
+* Added Text Dashboard to TensorBoard.
 
 ## Deprecations
 
@@ -71,6 +72,8 @@
   * Command history now persists across runs.
   * Bug fix in graph validation related to `tf.while_loops`.
 * Java Maven fixes for bugs with Windows installation.
+* Backport fixes and improvements from external keras.
+* Keras config file handling fix.
 
 ## Thanks to our Contributors
 
-- 
GitLab


From c8399f61ea845b0c440d13407429a92f6a0591e3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 15:18:09 -0800
Subject: [PATCH 0394/1563] [XLA] Remove checks about Tupple allocation.
 Change: 153120363

---
 tensorflow/compiler/xla/service/allocation_tracker.cc | 4 +---
 tensorflow/compiler/xla/service/transfer_manager.h    | 7 -------
 tensorflow/compiler/xla/tests/hlo_test_base.cc        | 4 +---
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/tensorflow/compiler/xla/service/allocation_tracker.cc b/tensorflow/compiler/xla/service/allocation_tracker.cc
index e59fad4e05..49a621810e 100644
--- a/tensorflow/compiler/xla/service/allocation_tracker.cc
+++ b/tensorflow/compiler/xla/service/allocation_tracker.cc
@@ -125,9 +125,7 @@ tensorflow::Status AllocationTracker::DeallocateShape(
     handle_map.erase(device_memory->opaque());
   }
 
-  // TODO(b/36256956) Ideally tuple elements could always be distinct buffers.
-  if (ShapeUtil::IsTuple(shape) &&
-      backend->transfer_manager()->TupleElementsAreDistinctBuffers()) {
+  if (ShapeUtil::IsTuple(shape)) {
     // Traverse into tuple recursively deallocating buffers.
     TF_ASSIGN_OR_RETURN(se::StreamExecutor * executor,
                         backend->stream_executor(device_ordinal));
diff --git a/tensorflow/compiler/xla/service/transfer_manager.h b/tensorflow/compiler/xla/service/transfer_manager.h
index b052bb8146..83e893a14a 100644
--- a/tensorflow/compiler/xla/service/transfer_manager.h
+++ b/tensorflow/compiler/xla/service/transfer_manager.h
@@ -99,13 +99,6 @@ class TransferManager {
   // region for a host-to-device transfer.
   virtual int64 GetByteSizeRequirement(const Shape& shape) = 0;
 
-  // Returns whether tuple elements are distinct buffers (in which case each of
-  // the elements of a tuple should be deallocated, in addition to the tuple's
-  // buffer itself).
-  //
-  // TODO(b/36256956) Ideally tuple elements could always be distinct buffers.
-  virtual bool TupleElementsAreDistinctBuffers() const { return true; }
-
   // Transfer a memory block of the given size from the device source into the
   // 'destination' buffer.
   //
diff --git a/tensorflow/compiler/xla/tests/hlo_test_base.cc b/tensorflow/compiler/xla/tests/hlo_test_base.cc
index 62878fed55..4e956bc00c 100644
--- a/tensorflow/compiler/xla/tests/hlo_test_base.cc
+++ b/tensorflow/compiler/xla/tests/hlo_test_base.cc
@@ -123,9 +123,7 @@ StatusOr<se::DeviceMemoryBase> HloTestBase::Execute(
 
   *result_shape = executable->result_shape();
 
-  // TODO(b/36256956) Ideally tuple elements could always be distinct buffers.
-  if (ShapeUtil::IsTuple(*result_shape) &&
-      backend_->transfer_manager()->TupleElementsAreDistinctBuffers()) {
+  if (ShapeUtil::IsTuple(*result_shape)) {
     // We must record element buffers of tuples as well to avoid leaks.
     DCHECK(!ShapeUtil::IsNestedTuple(*result_shape));
     TF_ASSIGN_OR_RETURN(
-- 
GitLab


From b5ef5bfcb39a0ba0cef4e1f7e9d766344f918ab2 Mon Sep 17 00:00:00 2001
From: Niranjan Hasabnis <niranjan.hasabnis@intel.com>
Date: Thu, 13 Apr 2017 16:34:56 -0700
Subject: [PATCH 0395/1563] Addressing some of review comments in
 MklFusedBatchNorm

---
 tensorflow/core/kernels/mkl_fused_batch_norm_op.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
index 2c84623d2a..b698af6e9e 100644
--- a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
+++ b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
@@ -25,6 +25,8 @@ limitations under the License.
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
 
+// TODO(inteltf) Address comments from PR 8968.
+
 namespace tensorflow {
 using CPUDevice = Eigen::ThreadPoolDevice;
 template <typename Device, typename T>
@@ -216,7 +218,6 @@ class MklFusedBatchNormOp : public OpKernel {
     void MklCleanup() {
       bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
       if (!input_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_input);
-
       if (mkl_prim_batchnorm != nullptr) dnnDelete_F32(mkl_prim_batchnorm);
     }
 
-- 
GitLab


From dd3a6d364a739496b864e61e9a93c21cbc1b5d1d Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 13 Apr 2017 15:44:29 -0800
Subject: [PATCH 0396/1563] Only record the cost graph in the queue runner:
 this ensures that the memory usage remains bounded over time. Change:
 153123196

---
 tensorflow/cc/training/coordinator.cc         | 14 ++---
 tensorflow/cc/training/coordinator.h          |  4 +-
 tensorflow/cc/training/queue_runner.cc        | 46 ++++++++---------
 tensorflow/cc/training/queue_runner.h         | 24 ++++-----
 tensorflow/cc/training/queue_runner_test.cc   | 51 ++++++++++++-------
 .../core/grappler/clusters/single_machine.cc  |  2 +-
 6 files changed, 76 insertions(+), 65 deletions(-)

diff --git a/tensorflow/cc/training/coordinator.cc b/tensorflow/cc/training/coordinator.cc
index 4618c932c3..fe45931f7f 100644
--- a/tensorflow/cc/training/coordinator.cc
+++ b/tensorflow/cc/training/coordinator.cc
@@ -116,17 +116,13 @@ void Coordinator::WaitForStop() {
 }
 
 Status Coordinator::ExportCostGraph(CostGraphDef* cost_graph) const {
-  RunMetadata tmp_metadata;
-  {
-    mutex_lock l(runners_lock_);
-    for (auto& t : runners_) {
-      Status s = t->ExportRunMetadata(&tmp_metadata);
-      if (!s.ok()) {
-        return s;
-      }
+  mutex_lock l(runners_lock_);
+  for (auto& t : runners_) {
+    Status s = t->ExportCostGraph(cost_graph);
+    if (!s.ok()) {
+      return s;
     }
   }
-  cost_graph->MergeFrom(tmp_metadata.cost_graph());
   return Status::OK();
 }
 
diff --git a/tensorflow/cc/training/coordinator.h b/tensorflow/cc/training/coordinator.h
index 632418c5ca..0e01b19cd9 100644
--- a/tensorflow/cc/training/coordinator.h
+++ b/tensorflow/cc/training/coordinator.h
@@ -36,8 +36,8 @@ class RunnerInterface {
  public:
   virtual ~RunnerInterface() {}
   virtual Status Join() = 0;
-  virtual Status ExportRunMetadata(RunMetadata* metadata) const {
-    return Status(error::INVALID_ARGUMENT, "No RunMetadata to export.");
+  virtual Status ExportCostGraph(CostGraphDef* cost_graph) const {
+    return Status(error::INVALID_ARGUMENT, "No cost model to export.");
   }
   /// Returns true iff the runner is running, i.e. if it is trying to populate
   /// its queue.
diff --git a/tensorflow/cc/training/queue_runner.cc b/tensorflow/cc/training/queue_runner.cc
index 51eba5d8a1..324a62e1a9 100644
--- a/tensorflow/cc/training/queue_runner.cc
+++ b/tensorflow/cc/training/queue_runner.cc
@@ -82,9 +82,9 @@ QueueRunner::~QueueRunner() {
 
 Status QueueRunner::Start(Session* sess) { return Start(sess, 0); }
 
-Status QueueRunner::StartAndCollectRunMetadata(Session* sess,
-                                               const RunOptions* run_options) {
-  SetRunArgumentsAndRunMetadata(run_options);
+Status QueueRunner::StartAndCollectCostGraph(Session* sess,
+                                             const RunOptions* run_options) {
+  SetRunArgumentsAndCostGraph(run_options);
   return Start(sess, 0);
 }
 
@@ -115,10 +115,9 @@ Status QueueRunner::Start(Session* sess, int wait_for) {
   return Status::OK();
 }
 
-Status QueueRunner::StartAndCollectRunMetadata(Session* session,
-                                               int wait_for_ms,
-                                               const RunOptions* run_options) {
-  SetRunArgumentsAndRunMetadata(run_options);
+Status QueueRunner::StartAndCollectCostGraph(Session* session, int wait_for_ms,
+                                             const RunOptions* run_options) {
+  SetRunArgumentsAndCostGraph(run_options);
   return Start(session, wait_for_ms);
 }
 
@@ -127,7 +126,7 @@ void QueueRunner::Stop(Session* sess) {
     coord_->WaitForStop();
   }
   if (!cancel_op_name_.empty()) {
-    UpdateStatus(RealRun(sess, cancel_op_name_));
+    UpdateStatus(RealRun(sess, cancel_op_name_, false));
   }
   stopped_ = true;
 }
@@ -162,7 +161,7 @@ void QueueRunner::Run(Session* sess, const string& enqueue_op) {
     if (coord_ && coord_->ShouldStop()) {
       break;
     }
-    status = RealRun(sess, enqueue_op);
+    status = RealRun(sess, enqueue_op, true);
     if (first_iteration) {
       if (!status.ok()) {
         mutex_lock l(mu_);
@@ -183,7 +182,7 @@ void QueueRunner::Run(Session* sess, const string& enqueue_op) {
   // will be run anway in this case.
   if (IsQueueClosed(status) && (!coord_ || !coord_->ShouldStop())) {
     if (last_run && !close_op_name_.empty()) {
-      UpdateStatus(RealRun(sess, close_op_name_));
+      UpdateStatus(RealRun(sess, close_op_name_, false));
     }
   } else if (!status.ok()) {
     LOG(ERROR) << "Queue runner thread got a failure status: "
@@ -200,34 +199,35 @@ Status QueueRunner::GetStatus() {
   return status_;
 }
 
-Status QueueRunner::ExportRunMetadata(RunMetadata* metadata) const {
-  if (!rm_mu_) {
+Status QueueRunner::ExportCostGraph(CostGraphDef* cost_graph) const {
+  if (!cg_mu_) {
     return Status(error::FAILED_PRECONDITION,
-                  "This QueueRunner doesn't collect and store RunMetadata.");
+                  "This QueueRunner doesn't collect a cost graph.");
   }
-  mutex_lock l(*rm_mu_);
-  metadata->MergeFrom(*run_metadata_);
+  mutex_lock l(*cg_mu_);
+  cost_graph->MergeFrom(*cost_graph_);
   return Status::OK();
 }
 
-void QueueRunner::SetRunArgumentsAndRunMetadata(const RunOptions* run_options) {
-  rm_mu_.reset(new mutex());
+void QueueRunner::SetRunArgumentsAndCostGraph(const RunOptions* run_options) {
+  cg_mu_.reset(new mutex());
   {
-    mutex_lock l(*rm_mu_);
-    run_metadata_.reset(new RunMetadata());
+    mutex_lock l(*cg_mu_);
+    cost_graph_.reset(new CostGraphDef());
   }
   if (run_options) {
     run_options_ = *run_options;
   }
 }
 
-Status QueueRunner::RealRun(Session* sess, const string& op) {
+Status QueueRunner::RealRun(Session* sess, const string& op,
+                            bool update_costs) {
   Status s;
-  if (rm_mu_) {
+  if (update_costs && cg_mu_) {
     RunMetadata metadata;
     s = sess->Run(run_options_, {}, {}, {op}, nullptr, &metadata);
-    mutex_lock l(*rm_mu_);
-    run_metadata_->MergeFrom(metadata);
+    mutex_lock l(*cg_mu_);
+    cost_graph_->Swap(metadata.mutable_cost_graph());
   } else {
     s = sess->Run({}, {}, {op}, nullptr);
   }
diff --git a/tensorflow/cc/training/queue_runner.h b/tensorflow/cc/training/queue_runner.h
index c69f28793a..71ed44c9c6 100644
--- a/tensorflow/cc/training/queue_runner.h
+++ b/tensorflow/cc/training/queue_runner.h
@@ -60,15 +60,15 @@ class QueueRunner : public RunnerInterface {
   Status Start(Session* sess);
 
   /// Starts the queue runner with the given session and sets the run arguments
-  /// for sess->Run. It also collects and stores the run metedata.
-  Status StartAndCollectRunMetadata(Session* sess,
-                                    const RunOptions* run_options = nullptr);
+  /// for sess->Run. It also collects and stores the cost model.
+  Status StartAndCollectCostGraph(Session* sess,
+                                  const RunOptions* run_options = nullptr);
 
   /// Starts the queue runner with the given session, and wait for up to the
   /// specified time (in milliseconds) for the queues to start to fill up.
   Status Start(Session* sess, int wait_for_ms);
-  Status StartAndCollectRunMetadata(Session* session, int wait_for_ms,
-                                    const RunOptions* run_options = nullptr);
+  Status StartAndCollectCostGraph(Session* session, int wait_for_ms,
+                                  const RunOptions* run_options = nullptr);
 
   /// Requests to stop and runs the cancel op. It would be called in a separate
   /// thread when coordinator is set. If there is no coordinator it should be
@@ -82,11 +82,11 @@ class QueueRunner : public RunnerInterface {
   /// Returns the latest status.
   Status GetStatus();
 
-  // Returns the stored run metadata.
-  Status ExportRunMetadata(RunMetadata* metadata) const override;
+  // Returns the stored cost model.
+  Status ExportCostGraph(CostGraphDef* cost_graph) const override;
 
  private:
-  QueueRunner() : coord_(nullptr), stopped_(false), rm_mu_(nullptr) {}
+  QueueRunner() : coord_(nullptr), stopped_(false), cg_mu_(nullptr) {}
 
   // Initializes the instance with the QueueRunnerDef proto.
   Status Init(const QueueRunnerDef& queue_runner_def);
@@ -105,9 +105,9 @@ class QueueRunner : public RunnerInterface {
 
   bool IsRunning() const override { return !stopped_; }
 
-  void SetRunArgumentsAndRunMetadata(const RunOptions* run_options);
+  void SetRunArgumentsAndCostGraph(const RunOptions* run_options);
 
-  Status RealRun(Session* sess, const string& op);
+  Status RealRun(Session* sess, const string& op, bool update_costs);
 
   string queue_name_;
   std::vector<string> enqueue_op_names_;
@@ -130,8 +130,8 @@ class QueueRunner : public RunnerInterface {
   mutex cb_mu_;
   std::vector<std::function<void(Status)>> callbacks_;
 
-  mutable std::unique_ptr<mutex> rm_mu_;
-  std::unique_ptr<RunMetadata> run_metadata_ GUARDED_BY(rm_mu_);
+  mutable std::unique_ptr<mutex> cg_mu_;
+  std::unique_ptr<CostGraphDef> cost_graph_ GUARDED_BY(cg_mu_);
   RunOptions run_options_;
 };
 
diff --git a/tensorflow/cc/training/queue_runner_test.cc b/tensorflow/cc/training/queue_runner_test.cc
index c37a69a7f7..e814be8630 100644
--- a/tensorflow/cc/training/queue_runner_test.cc
+++ b/tensorflow/cc/training/queue_runner_test.cc
@@ -44,6 +44,7 @@ using ops::FIFOQueue;
 using ops::QueueClose;
 using ops::QueueDequeue;
 using ops::QueueEnqueue;
+using ops::RandomNormal;
 using ops::Square;
 using ops::Variable;
 
@@ -84,7 +85,7 @@ QueueRunnerDef BuildQueueRunnerDef(
     const std::string& close_op, const std::string& cancel_op,
     const std::vector<Code>& queue_closed_error_codes) {
   QueueRunnerDef queue_runner_def;
-  *queue_runner_def.mutable_queue_name() = kQueueName;
+  *queue_runner_def.mutable_queue_name() = queue_name;
   for (const std::string& enqueue_op : enqueue_ops) {
     *queue_runner_def.mutable_enqueue_op_name()->Add() = enqueue_op;
   }
@@ -345,37 +346,51 @@ TEST(QueueRunnerTest, CallbackCalledOnError) {
 }
 
 TEST(QueueRunnerTest, RunMetaDataTest) {
+  Scope root = Scope::NewRootScope();
+  auto q0 = FIFOQueue(root.WithOpName(kQueueName), {DataType::DT_FLOAT});
+  Output rnd = RandomNormal(root.WithOpName("rnd"), {1, 1}, DataType::DT_FLOAT);
+  Output square = Square(root.WithOpName(kSquareOpName), rnd);
+  auto enqueue0 = QueueEnqueue(root.WithOpName(kEnqueueOp0), q0, {square});
+  auto close0 = QueueClose(root.WithOpName(kCloseOp0), q0);
+  auto cancel0 = QueueClose(root.WithOpName(kCancelOp0), q0,
+                            QueueClose::CancelPendingEnqueues(true));
+  auto dequeue0 =
+      QueueDequeue(root.WithOpName(kDequeueOp0), q0, {DataType::DT_FLOAT});
+
+  GraphDef graph_def;
+  TF_EXPECT_OK(root.ToGraphDef(&graph_def));
+  for (auto& node : *graph_def.mutable_node()) {
+    node.set_device("/cpu:0");
+  }
   SessionOptions sess_options;
   sess_options.config.mutable_graph_options()->set_build_cost_model(1);
   std::unique_ptr<Session> session(NewSession(sess_options));
 
-  GraphDef graph_def = BuildSimpleGraph();
   TF_CHECK_OK(session->Create(graph_def));
-  TF_CHECK_OK(session->Run({}, {}, {kAssignOpName}, nullptr));
 
-  RunOptions run_options;
-  run_options.set_trace_level(RunOptions::HARDWARE_TRACE);
-
-  QueueRunnerDef queue_runner_def = BuildQueueRunnerDef(
-      kQueueName, {kCountUpToOpName}, kSquareOpName, "", {});
+  QueueRunnerDef queue_runner_def =
+      BuildQueueRunnerDef(kQueueName, {kEnqueueOp0}, kCloseOp0, kCancelOp0, {});
   std::unique_ptr<QueueRunner> qr;
   TF_EXPECT_OK(QueueRunner::New(queue_runner_def, &qr));
-  TF_CHECK_OK(qr->StartAndCollectRunMetadata(session.get(), &run_options));
+  RunOptions run_options;
+  TF_CHECK_OK(qr->StartAndCollectCostGraph(session.get(), &run_options));
 
-  TF_EXPECT_OK(qr->Join());
-  RunMetadata run_metadata;
-  TF_CHECK_OK(qr->ExportRunMetadata(&run_metadata));
+  // Make sure there was at least one element enqueued in q0: this prevents a
+  // race condition where we close the queue before it was populated.
+  std::vector<Tensor> dq0;
+  TF_EXPECT_OK(session->Run({}, {kDequeueOp0}, {}, &dq0));
+
+  CostGraphDef cost_graph;
+  TF_CHECK_OK(qr->ExportCostGraph(&cost_graph));
+  EXPECT_TRUE(cost_graph.node_size() > 0);
 
-  EXPECT_TRUE(run_metadata.has_cost_graph());
+  qr->Stop(session.get());
 }
 
 TEST(QueueRunnerTest, NoRunMetaDataTest) {
   GraphDef graph_def = BuildSimpleGraph();
   auto session = BuildSessionAndInitVariable(graph_def);
 
-  RunOptions run_options;
-  run_options.set_trace_level(RunOptions::HARDWARE_TRACE);
-
   QueueRunnerDef queue_runner_def = BuildQueueRunnerDef(
       kQueueName, {kCountUpToOpName}, kSquareOpName, "", {});
   std::unique_ptr<QueueRunner> qr;
@@ -383,8 +398,8 @@ TEST(QueueRunnerTest, NoRunMetaDataTest) {
   TF_CHECK_OK(qr->Start(session.get()));
 
   TF_EXPECT_OK(qr->Join());
-  RunMetadata run_metadata;
-  EXPECT_EQ(qr->ExportRunMetadata(&run_metadata).code(),
+  CostGraphDef cost_graph;
+  EXPECT_EQ(qr->ExportCostGraph(&cost_graph).code(),
             error::FAILED_PRECONDITION);
 }
 
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 6296c71a6c..a8319350c1 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -110,7 +110,7 @@ Status SingleMachine::Run(const GraphDef& graph_def,
         std::unique_ptr<QueueRunner> queue_runner;
         TF_RETURN_IF_ERROR(QueueRunner::New(queue_runner_defs_[i],
                                             coordinator_.get(), &queue_runner));
-        TF_RETURN_IF_ERROR(queue_runner->StartAndCollectRunMetadata(
+        TF_RETURN_IF_ERROR(queue_runner->StartAndCollectCostGraph(
             session_.get(), &run_options_));
         TF_RETURN_IF_ERROR(
             coordinator_->RegisterRunner(std::move(queue_runner)));
-- 
GitLab


From c44e87d142eadb6d01b568e272e8dc0fb2de43d5 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 12 Apr 2017 09:56:19 -0800
Subject: [PATCH 0397/1563] Thoroughly skip testWarnings for Python version
 >=3.6

Should fix nightly build errors such as https://ci.tensorflow.org/view/Tensorflow%20Jenkins%20Monitored%20builds/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=NO_OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/455/consoleFull
Change: 152959394
---
 tensorflow/python/ops/gradients_test.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tensorflow/python/ops/gradients_test.py b/tensorflow/python/ops/gradients_test.py
index dd28f4e64e..3fb339733c 100644
--- a/tensorflow/python/ops/gradients_test.py
+++ b/tensorflow/python/ops/gradients_test.py
@@ -562,14 +562,16 @@ class IndexedSlicesToTensorTest(test_util.TensorFlowTestCase):
   def testWarnings(self):
     # TODO(gunan) Reenable after this issue is fixed:
     # https://github.com/google/protobuf/issues/2812
-    if sys.version_info < (3, 6):
-      # Smaller than the threshold: no warning.
-      c_sparse = ops.IndexedSlices(
-          array_ops.placeholder(dtypes.float32),
-          array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
-      with warnings.catch_warnings(record=True) as w:
-        math_ops.multiply(c_sparse, 1.0)
-      self.assertEqual(0, len(w))
+    if sys.version_info >= (3, 6):
+      self.skipTest("Skipped test for Python 3.6+")
+
+    # Smaller than the threshold: no warning.
+    c_sparse = ops.IndexedSlices(
+        array_ops.placeholder(dtypes.float32),
+        array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
+    with warnings.catch_warnings(record=True) as w:
+      math_ops.multiply(c_sparse, 1.0)
+    self.assertEqual(0, len(w))
 
     # Greater than or equal to the threshold: warning.
     c_sparse = ops.IndexedSlices(
-- 
GitLab


From f77f19ba8633104d7fe1601537fdd66392d655a2 Mon Sep 17 00:00:00 2001
From: Neal Wu <neal@nealwu.com>
Date: Thu, 13 Apr 2017 17:27:21 -0700
Subject: [PATCH 0398/1563] Improvements to ISSUE_TEMPLATE.md (#9199)

* Improvements to ISSUE_TEMPLATE.md

* Add back the asterisks to make things easier for the issue triager

* Bold instead of italicized
---
 ISSUE_TEMPLATE.md | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index d0979e87f7..fb4825dd1f 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,33 +1,33 @@
-Please go to Stack Overflow for help and support. http://stackoverflow.com/questions/tagged/tensorflow
+Please go to Stack Overflow for help and support: http://stackoverflow.com/questions/tagged/tensorflow
+
 If you open a GitHub issue, here is our policy:
 
-1. It must be a bug or feature request.
+1. It must be a bug or a feature request.
 2. The form below must be filled out.
 
-**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g. fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
+**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g., fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
 
 ------------------------
 
-Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
+### System information
+- **Have I written custom code (as opposed to using a stock example script provided in TensorFlow)**:
+- **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
+- **TensorFlow installed from (source or binary)**:
+- **TensorFlow version (use command below)**:
+- **Bazel version (if compiling from source)**:
+- **CUDA/cuDNN version**:
+- **GPU model and memory**:
+- **Exact command to reproduce**:
 
-### System Information
-- *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
-- *OS Platform and Distribution (i.e. Linux Ubuntu 16.0)*:
-- *TensorFlow installed from (source or binary)?*:
-- *TensorFlow version* (use command below):
-- *Bazel version (if compiling from source)*:
-- *CUDA/cuDNN version*:
-- *GPU Model and Memory*:
-- *Exact command to reproduce*:
+You can collect some of this information using our environment capture script: https://github.com/tensorflow/tensorflow/tree/master/tools
 
-You can collect some of this information using our environment capture script https://github.com/tensorflow/tensorflow/blob/master/tools/
-You can collect the TensorFlow version with
-```sh
-python -c "import tensorflow as tf; print (tf.GIT_VERSION, tf.VERSION)"
-```
+You can obtain the TensorFlow version with
 
+python -c "import tensorflow as tf; print(tf.GIT_VERSION, tf.VERSION)"
 
-### Describe the problem clearly
+### Describe the problem
+
+Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
 
-### Source Code / Logs
-Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full-traceback. Large logs and files should be attached. Try to reproducible test-case code the bare-minimum necessary to generate the problem
+### Source code / logs
+Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached. Try to provide a reproducible test case that is the bare minimum necessary to generate the problem.
-- 
GitLab


From 163da25caf2b63ba61fe94821de65c5362249691 Mon Sep 17 00:00:00 2001
From: FloopCZ <FloopCZ@users.noreply.github.com>
Date: Fri, 14 Apr 2017 02:59:41 +0200
Subject: [PATCH 0399/1563] Enable protobuf's --with-pic option (#9195)

---
 tensorflow/contrib/makefile/compile_linux_protobuf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/makefile/compile_linux_protobuf.sh b/tensorflow/contrib/makefile/compile_linux_protobuf.sh
index 480fbcc215..6eb061a3c9 100755
--- a/tensorflow/contrib/makefile/compile_linux_protobuf.sh
+++ b/tensorflow/contrib/makefile/compile_linux_protobuf.sh
@@ -38,7 +38,7 @@ then
   exit 1
 fi
 
-./configure --prefix="${GENDIR}"
+./configure --prefix="${GENDIR}" --with-pic
 if [ $? -ne 0 ]
 then
   echo "./configure command failed."
-- 
GitLab


From d146e67e20f1288cf7ea4441eb3c3301cf7fad43 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 16:41:34 -0800
Subject: [PATCH 0400/1563] Adding tracing of TensorFlow operations executed on
 the CPU. Such tracing is disabled by default. Change: 153128900

---
 tensorflow/compiler/jit/BUILD                     |  3 +--
 tensorflow/compiler/jit/xla_device.cc             |  6 ++++++
 tensorflow/core/common_runtime/gpu/gpu_device.cc  |  6 ++++--
 .../core/common_runtime/threadpool_device.cc      |  9 +++++++--
 tensorflow/core/platform/tracing.h                | 15 +++++++++++++++
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/tensorflow/compiler/jit/BUILD b/tensorflow/compiler/jit/BUILD
index c16fe56122..03bad214d4 100644
--- a/tensorflow/compiler/jit/BUILD
+++ b/tensorflow/compiler/jit/BUILD
@@ -125,7 +125,6 @@ cc_library(
         "//tensorflow/compiler/tf2xla:xla_compiler",
         "//tensorflow/compiler/tf2xla/kernels:xla_ops",
         "//tensorflow/compiler/xla:literal_util",
-        "//tensorflow/compiler/xla:statusor",
         "//tensorflow/compiler/xla/client:client_library",
         "//tensorflow/compiler/xla/client:global_data",
         "//tensorflow/compiler/xla/client:local_client",
@@ -133,9 +132,9 @@ cc_library(
         "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
         "//tensorflow/core:stream_executor_no_cuda",
         "//tensorflow/core:tensorflow_opensource",
-        "//tensorflow/core/kernels:assign_op",
         "//tensorflow/core/kernels:constant_op",
         "//tensorflow/core/kernels:control_flow_ops",
         "//tensorflow/core/kernels:identity_op",
diff --git a/tensorflow/compiler/jit/xla_device.cc b/tensorflow/compiler/jit/xla_device.cc
index 58b4febcd6..93f487c36c 100644
--- a/tensorflow/compiler/jit/xla_device.cc
+++ b/tensorflow/compiler/jit/xla_device.cc
@@ -40,6 +40,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/stream_executor_no_cuda.h"
+#include "tensorflow/core/platform/tracing.h"
 #include "tensorflow/core/public/session_options.h"
 #include "tensorflow/core/public/version.h"
 #include "tensorflow/core/util/device_name_utils.h"
@@ -174,6 +175,10 @@ Status XlaDevice::FillContextMap(const Graph* graph,
 void XlaDevice::Compute(OpKernel* op_kernel, OpKernelContext* context) {
   VLOG(1) << "XlaDevice::Compute " << op_kernel->name() << ":"
           << op_kernel->type_string();
+  // When TraceMe profiling is off (which is the default), the
+  // following TraceMe constructor is simply a conditional test of
+  // false value. Measurements show that its overhead is negligible.
+  port::Tracing::TraceMe trace_me(op_kernel->name(), op_kernel->type_string());
   op_kernel->Compute(context);
 }
 
@@ -181,6 +186,7 @@ void XlaDevice::ComputeAsync(AsyncOpKernel* op_kernel, OpKernelContext* context,
                              AsyncOpKernel::DoneCallback done) {
   VLOG(1) << "XlaDevice::ComputeAsync " << op_kernel->name() << ":"
           << op_kernel->type_string();
+  port::Tracing::TraceMe trace_me(op_kernel->name(), op_kernel->type_string());
   op_kernel->ComputeAsync(context, done);
 }
 
diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index 8b9f468487..c8e2cfb3a3 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -426,8 +426,10 @@ void BaseGPUDevice::ComputeAsync(AsyncOpKernel* op_kernel,
           << op_kernel->def().op() << " on GPU" << gpu_id_ << " stream["
           << stream_id << "]";
 
-  port::Tracing::TraceMe activity(
-      strings::StrCat(op_kernel->name(), ":", op_kernel->type_string()));
+  // When TraceMe profiling is off (which is the default), the
+  // following TraceMe constructor is simply a conditional test of
+  // false value. Measurements show that its overhead is negligible.
+  port::Tracing::TraceMe activity(op_kernel->name(), op_kernel->type_string());
   op_kernel->ComputeAsync(context, done);
 }
 
diff --git a/tensorflow/core/common_runtime/threadpool_device.cc b/tensorflow/core/common_runtime/threadpool_device.cc
index ca6ba7970f..60348e885f 100644
--- a/tensorflow/core/common_runtime/threadpool_device.cc
+++ b/tensorflow/core/common_runtime/threadpool_device.cc
@@ -38,14 +38,19 @@ ThreadPoolDevice::ThreadPoolDevice(const SessionOptions& options,
                                    const string& name, Bytes memory_limit,
                                    const DeviceLocality& locality,
                                    Allocator* allocator)
-    : LocalDevice(options, Device::BuildDeviceAttributes(
-                               name, DEVICE_CPU, memory_limit, locality),
+    : LocalDevice(options,
+                  Device::BuildDeviceAttributes(name, DEVICE_CPU, memory_limit,
+                                                locality),
                   allocator),
       allocator_(allocator) {}
 
 ThreadPoolDevice::~ThreadPoolDevice() {}
 
 void ThreadPoolDevice::Compute(OpKernel* op_kernel, OpKernelContext* context) {
+  // When TraceMe profiling is off (which is the default), the
+  // following TraceMe constructor is simply a conditional test of
+  // false value. Measurements show that its overhead is negligible.
+  port::Tracing::TraceMe trace_me(op_kernel->name(), op_kernel->type_string());
   if (port::Tracing::IsActive()) {
     // TODO(pbar) We really need a useful identifier of the graph node.
     const uint64 id = Hash64(op_kernel->name());
diff --git a/tensorflow/core/platform/tracing.h b/tensorflow/core/platform/tracing.h
index a34b23eb9d..ff3aa4a6f1 100644
--- a/tensorflow/core/platform/tracing.h
+++ b/tensorflow/core/platform/tracing.h
@@ -215,6 +215,12 @@ class Tracing::TraceMe {
  public:
   explicit TraceMe(StringPiece name);
 
+  // If tracing is enabled, set up a traceMe with a label of
+  // "<name_part1>:<name_part2>".  This can be cheaper than the
+  // single-argument constructor because the concatenation of the
+  // label string is only done if tracing is enabled.
+  TraceMe(StringPiece name_part1, StringPiece name_part2);
+
  private:
   std::unique_ptr<Engine::Tracer> tracer_;
 };
@@ -242,6 +248,15 @@ inline Tracing::TraceMe::TraceMe(StringPiece name) {
   }
 }
 
+inline Tracing::TraceMe::TraceMe(StringPiece name_part1,
+                                 StringPiece name_part2) {
+  auto e = Tracing::engine();
+  if (e && e->IsEnabled()) {
+    tracer_.reset(
+        e->StartTracing(strings::StrCat(name_part1, ":", name_part2)));
+  }
+}
+
 }  // namespace port
 }  // namespace tensorflow
 
-- 
GitLab


From a156357d92c02c6be965f26f5bcce663e28528d5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 16:54:13 -0800
Subject: [PATCH 0401/1563] Change for internal compatibility.

---
 tensorflow/BUILD | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index cffc55ad31..69e800be44 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -14,9 +14,7 @@ exports_files([
 # Config setting for determining if we are building for Android.
 config_setting(
     name = "android",
-    values = {
-        "crosstool_top": "//external:android/crosstool",
-    },
+    values = {"crosstool_top": "//external:android/crosstool"},
     visibility = ["//visibility:public"],
 )
 
@@ -76,9 +74,7 @@ config_setting(
 
 config_setting(
     name = "ios",
-    values = {
-        "crosstool_top": "//tools/osx/crosstool:crosstool",
-    },
+    values = {"crosstool_top": "//tools/osx/crosstool:crosstool"},
     visibility = ["//visibility:public"],
 )
 
-- 
GitLab


From 7eee50b635f4cd4196f84bbc1edec2d34d1a1821 Mon Sep 17 00:00:00 2001
From: Evan Klitzke <evan@eklitzke.org>
Date: Thu, 13 Apr 2017 18:54:06 -0700
Subject: [PATCH 0402/1563] fix this build warning about comparing
 signed/unsigned types (#9200)

---
 tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
index a758bb92aa..e520139e65 100644
--- a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
+++ b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
@@ -142,7 +142,7 @@ template <typename UInt>
 string LittleEndianData(UInt data) {
   static_assert(std::is_unsigned<UInt>::value, "UInt must be unsigned");
   string str;
-  for (int i = 0; i < sizeof(UInt); ++i) {
+  for (size_t i = 0; i < sizeof(UInt); ++i) {
     const unsigned char bits = static_cast<unsigned char>(data & 0xFFU);
     char ch;
     ::memcpy(&ch, &bits, sizeof(bits));
-- 
GitLab


From d53b5a4930a81bb32ac7858c465b63ec87fb3f83 Mon Sep 17 00:00:00 2001
From: Maxwell Paul Brickner <mbrickn@users.noreply.github.com>
Date: Thu, 13 Apr 2017 22:08:13 -0400
Subject: [PATCH 0403/1563] Updated the link to tensorflow.org to use https
 (#9203)

This is a very minor change.

I just updated the link to tensorflow.org so that it uses https instead of http, and users aren't redirected. ^ _ ^
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd0bffde79..92ac8f0d21 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ Hello, TensorFlow!
 
 ## For more information
 
-* [TensorFlow website](http://tensorflow.org)
+* [TensorFlow website](https://tensorflow.org)
 * [TensorFlow whitepaper](http://download.tensorflow.org/paper/whitepaper2015.pdf)
 * [TensorFlow Model Zoo](https://github.com/tensorflow/models)
 * [TensorFlow MOOC on Udacity](https://www.udacity.com/course/deep-learning--ud730)
-- 
GitLab


From de7a060aa76cb3ab6cec16f9402d9152e341b0af Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 13 Apr 2017 19:51:59 -0700
Subject: [PATCH 0404/1563] Update vgg_16 ref in slim readme (#9208)

Fixes #9187
---
 tensorflow/contrib/slim/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md
index dae50e67c5..c8842dd57b 100644
--- a/tensorflow/contrib/slim/README.md
+++ b/tensorflow/contrib/slim/README.md
@@ -447,7 +447,7 @@ vgg = tf.contrib.slim.nets.vgg
 images, labels = ...
 
 # Create the model.
-predictions = vgg.vgg16(images)
+predictions = vgg.vgg_16(images)
 
 # Define the loss functions and get the total loss.
 loss = slim.losses.softmax_cross_entropy(predictions, labels)
-- 
GitLab


From 1c0adf6e58f09201ba5f00b780c1e5700a33c789 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 13 Apr 2017 18:59:06 -0800
Subject: [PATCH 0405/1563] [XLA] Remove vestigial colocate_related_buffers_
 boolean in BufferAssignment. Change: 153137071

---
 .../compiler/xla/service/buffer_assignment.cc | 25 +++++--------------
 .../compiler/xla/service/buffer_assignment.h  | 22 +++-------------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index 931f589800..fa834c2ebd 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -489,23 +489,12 @@ Status GatherComputationsByAllocationType(
 StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::Run(
     const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
     LogicalBuffer::SizeFunction buffer_size, int64 alignment,
-    bool colocate_related_buffers,
     const std::vector<const HloInstruction*>* hlos_to_allocate) {
-  BufferAssigner assigner(std::move(buffer_size), alignment,
-                          colocate_related_buffers);
+  BufferAssigner assigner(std::move(buffer_size), alignment);
   return assigner.CreateAssignment(module, std::move(hlo_ordering),
                                    hlos_to_allocate);
 }
 
-/* static */
-StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::Run(
-    const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-    LogicalBuffer::SizeFunction buffer_size, int64 alignment) {
-  return BufferAssigner::Run(module, std::move(hlo_ordering),
-                             std::move(buffer_size), alignment,
-                             /*colocate_related_buffers=*/true);
-}
-
 bool BufferAssigner::MaybeAssignBuffer(BufferAllocation* allocation,
                                        const LogicalBuffer& buffer,
                                        BufferAssignment* assignment) {
@@ -1125,13 +1114,11 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
   // buffers outside of the set) in AssignBuffersForComputation.
   FlatSet<const LogicalBuffer*> colocated_buffers;
   FlatSet<BufferAllocation::Index> colocated_allocations;
-  if (colocate_related_buffers_) {
-    std::vector<ColocatedBufferSet> colocated_buffer_sets;
-    BuildColocatedBufferSets(module, assignment->liveness(),
-                             &colocated_buffer_sets);
-    AssignColocatedBufferSets(colocated_buffer_sets, assignment.get(),
-                              &colocated_buffers, &colocated_allocations);
-  }
+  std::vector<ColocatedBufferSet> colocated_buffer_sets;
+  BuildColocatedBufferSets(module, assignment->liveness(),
+                           &colocated_buffer_sets);
+  AssignColocatedBufferSets(colocated_buffer_sets, assignment.get(),
+                            &colocated_buffers, &colocated_allocations);
 
   for (auto* computation : global_computations) {
     TF_RETURN_IF_ERROR(AssignBuffersForComputation(
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.h b/tensorflow/compiler/xla/service/buffer_assignment.h
index ec1375e24d..34667c435d 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.h
+++ b/tensorflow/compiler/xla/service/buffer_assignment.h
@@ -398,29 +398,16 @@ class BufferAssigner {
   // which returns the size of a LogicalBuffer. Alignment is the the minimum
   // alignment of any buffer. If hlos_to_allocate is not null then only
   // instructions in this vector are considered for buffer assignment. If
-  // hlos_to_allocate is null then all instructions are considered. If
-  // 'colocate_related_buffers' is true, related LogicalBuffers will be
-  // colocated in the same allocation (i.e buffers for while result will share
-  // an allocation with buffers related to that same while instruction: init
-  // operand, condition/body parameter and body result).
+  // hlos_to_allocate is null then all instructions are considered.
   static StatusOr<std::unique_ptr<BufferAssignment>> Run(
       const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
       LogicalBuffer::SizeFunction buffer_size, int64 alignment,
-      bool colocate_related_buffers,
       const std::vector<const HloInstruction*>* hlos_to_allocate = nullptr);
 
-  // Overload of Run which uses ShapeUtil::ByteSizeOf to determine buffer size
-  // and assigns buffers to all HLO instructions in the module.
-  static StatusOr<std::unique_ptr<BufferAssignment>> Run(
-      const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-      LogicalBuffer::SizeFunction buffer_size, int64 alignment);
-
  private:
   explicit BufferAssigner(LogicalBuffer::SizeFunction buffer_size,
-                          int64 alignment, bool colocate_related_buffers)
-      : buffer_size_(std::move(buffer_size)),
-        alignment_(alignment),
-        colocate_related_buffers_(colocate_related_buffers) {}
+                          int64 alignment)
+      : buffer_size_(std::move(buffer_size)), alignment_(alignment) {}
   virtual ~BufferAssigner() = default;
 
   // Create a buffer assignment.
@@ -498,9 +485,6 @@ class BufferAssigner {
   // Minimum alignment of any buffer.
   int64 alignment_;
 
-  // Indicates whether related buffers should share the same buffer allocation.
-  const bool colocate_related_buffers_;
-
   TF_DISALLOW_COPY_AND_ASSIGN(BufferAssigner);
 };
 
-- 
GitLab


From efce4a0452f1eba55fd35a22d20249f449f0debe Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 03:23:58 -0800
Subject: [PATCH 0406/1563] Added and using GMock matcher for HloInstruction
 Change: 153159175

---
 tensorflow/compiler/xla/service/BUILD         |  33 ++
 .../xla/service/algebraic_simplifier_test.cc  | 330 ++++++++-------
 .../xla/service/copy_insertion_test.cc        | 394 ++++--------------
 .../xla/service/hlo_computation_test.cc       |  24 +-
 .../compiler/xla/service/hlo_matchers.cc      |  77 ++++
 .../compiler/xla/service/hlo_matchers.h       | 142 +++++++
 .../compiler/xla/service/hlo_matchers_test.cc |  71 ++++
 .../compiler/xla/service/inliner_test.cc      |  11 +-
 .../xla/service/instruction_fusion_test.cc    |   9 +-
 .../xla/service/layout_assignment_test.cc     |  11 +-
 .../xla/service/reshape_mover_test.cc         | 115 +++--
 .../service/tuple_points_to_analysis_test.cc  |   5 +-
 .../xla/service/user_computation_test.cc      |  13 +-
 13 files changed, 699 insertions(+), 536 deletions(-)
 create mode 100644 tensorflow/compiler/xla/service/hlo_matchers.cc
 create mode 100644 tensorflow/compiler/xla/service/hlo_matchers.h
 create mode 100644 tensorflow/compiler/xla/service/hlo_matchers_test.cc

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index c019eff72d..680dbc851f 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -106,6 +106,27 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "hlo_matchers",
+    testonly = 1,
+    srcs = ["hlo_matchers.cc"],
+    hdrs = ["hlo_matchers.h"],
+    deps = [
+        ":hlo",
+        "//tensorflow/compiler/xla:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+cc_test(
+    name = "hlo_matchers_test",
+    srcs = ["hlo_matchers_test.cc"],
+    deps = [
+        ":hlo_matchers",
+        "//tensorflow/compiler/xla:shape_util",
+    ],
+)
+
 cc_library(
     name = "versioned_computation_handle",
     srcs = ["versioned_computation_handle.cc"],
@@ -188,10 +209,12 @@ cc_test(
     name = "user_computation_test",
     srcs = ["user_computation_test.cc"],
     deps = [
+        ":hlo_matchers",
         ":user_computation",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/service:hlo",
@@ -707,6 +730,7 @@ cc_test(
     name = "instruction_fusion_test",
     srcs = ["instruction_fusion_test.cc"],
     deps = [
+        ":hlo_matchers",
         ":instruction_fusion",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
         "//tensorflow/core:test_main",
@@ -740,6 +764,7 @@ cc_test(
         ":algebraic_simplifier",
         ":cpu_plugin",
         ":hlo",
+        ":hlo_matchers",
         ":hlo_pass",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
@@ -770,9 +795,11 @@ cc_test(
     srcs = ["reshape_mover_test.cc"],
     deps = [
         ":hlo",
+        ":hlo_matchers",
         ":reshape_mover",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
@@ -803,6 +830,7 @@ cc_test(
     deps = [
         ":cpu_plugin",
         ":hlo",
+        ":hlo_matchers",
         ":inliner",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
@@ -938,6 +966,7 @@ cc_test(
     deps = [
         ":cpu_plugin",
         ":hlo",
+        ":hlo_matchers",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:test",
@@ -1022,6 +1051,7 @@ cc_test(
     srcs = ["tuple_points_to_analysis_test.cc"],
     deps = [
         ":hlo",
+        ":hlo_matchers",
         ":instruction_fusion",
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:literal_util",
@@ -1105,6 +1135,7 @@ cc_test(
         ":copy_insertion",
         ":cpu_plugin",
         ":hlo",
+        ":hlo_matchers",
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
@@ -1205,6 +1236,7 @@ cc_test(
         ":computation_layout",
         ":cpu_plugin",
         ":hlo",
+        ":hlo_matchers",
         ":layout_assignment",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_layout",
@@ -1459,6 +1491,7 @@ cc_test(
     srcs = ["transpose_folding_test.cc"],
     deps = [
         ":hlo",
+        ":hlo_matchers",
         ":shape_inference",
         ":transpose_folding",
         "//tensorflow/compiler/xla:literal_util",
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 85e3381700..cf74dffb30 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -23,6 +23,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/hlo_pass_fix.h"
 #include "tensorflow/compiler/xla/shape_util.h"
@@ -32,6 +33,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
@@ -157,9 +160,7 @@ TEST_F(AlgebraicSimplifierTest, SelectMakeTuple) {
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
   root = computation->root_instruction();
-  EXPECT_EQ(root, add);
-  EXPECT_EQ(root->operand(0), param1);
-  EXPECT_EQ(root->operand(1), param2);
+  EXPECT_THAT(root, op::Add(param1, param2));
 }
 
 // Test that exp(A)/exp(B) is simplified to exp(A-B)
@@ -179,17 +180,16 @@ TEST_F(AlgebraicSimplifierTest, ExpDiv) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kDivide);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Divide(op::Exp(param0), op::Exp(param1)));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kExp);
-  EXPECT_EQ(root->operand_count(), 1);
-  EXPECT_EQ(root->operand(0)->opcode(), HloOpcode::kSubtract);
-  EXPECT_EQ(root->operand(0)->operand(0), param0);
-  EXPECT_EQ(root->operand(0)->operand(1), param1);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Exp(op::Subtract(param0, param1)));
 }
 
 // Test that ln(exp(A)) is simplified to A
@@ -205,14 +205,14 @@ TEST_F(AlgebraicSimplifierTest, LnExp) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kLog);
+
+  EXPECT_THAT(computation->root_instruction(), op::Log(op::Exp(param0)));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kParameter);
-  EXPECT_EQ(root, param0);
+
+  EXPECT_EQ(computation->root_instruction(), param0);
 }
 
 // Test that ln(exp(A)/exp(B)) is simplified to A-B
@@ -234,15 +234,15 @@ TEST_F(AlgebraicSimplifierTest, LnExpDiv) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kLog);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Log(op::Divide(op::Exp(param0), op::Exp(param1))));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kSubtract);
-  EXPECT_EQ(root->operand(0), param0);
-  EXPECT_EQ(root->operand(1), param1);
+
+  EXPECT_THAT(computation->root_instruction(), op::Subtract(param0, param1));
 }
 
 // Test that pow(A, 0) where A is a scalar is simplified to the scalar
@@ -259,11 +259,15 @@ TEST_F(AlgebraicSimplifierTest, Pow0Scalar) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Power(param0, zero));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
   HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kConstant);
+  EXPECT_THAT(root, op::Constant());
   EXPECT_EQ(LiteralUtil::GetFirstElement<float>(root->literal()), 1);
 }
 
@@ -280,11 +284,15 @@ TEST_F(AlgebraicSimplifierTest, Pow0Vector) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Power(param0, zero));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
   HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kBroadcast);
+  EXPECT_THAT(root, op::Broadcast());
   EXPECT_TRUE(ShapeUtil::Equal(root->shape(), r1f32))
       << ShapeUtil::HumanString(root->shape());
   EXPECT_EQ(root->dimensions().size(), 0);
@@ -306,12 +314,14 @@ TEST_F(AlgebraicSimplifierTest, Pow1) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Power(param0, one));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kParameter);
-  EXPECT_EQ(root, param0);
+
+  EXPECT_EQ(computation->root_instruction(), param0);
 }
 
 // Test that pow(A, 2) is simplified to A*A.
@@ -327,13 +337,14 @@ TEST_F(AlgebraicSimplifierTest, Pow2) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Power(param0, two));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kMultiply);
-  EXPECT_EQ(root->operand(0), param0);
-  EXPECT_EQ(root->operand(1), param0);
+
+  EXPECT_THAT(computation->root_instruction(), op::Multiply(param0, param0));
 }
 
 // Test that pow(A, -1) is simplified to 1/A.
@@ -349,15 +360,17 @@ TEST_F(AlgebraicSimplifierTest, PowNegative1) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Power(param0, negative_one));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
   HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kDivide);
-  EXPECT_EQ(root->operand(0)->opcode(), HloOpcode::kConstant);
+  EXPECT_THAT(root, op::Divide(op::Constant(), param0));
   EXPECT_EQ(LiteralUtil::GetFirstElement<float>(root->operand(0)->literal()),
             1);
-  EXPECT_EQ(root->operand(1), param0);
 }
 
 TEST_F(AlgebraicSimplifierTest, ReshapeBroadcast) {
@@ -376,12 +389,15 @@ TEST_F(AlgebraicSimplifierTest, ReshapeBroadcast) {
   auto computation = builder.Build();
   auto module = MakeUnique<HloModule>(TestName());
   module->AddEntryComputation(std::move(computation));
-  HloInstruction* root = module->entry_computation()->root_instruction();
+
+  EXPECT_THAT(module->entry_computation()->root_instruction(),
+              op::Reshape(op::Broadcast(op::Reshape(op))));
+
   HloPassFix<AlgebraicSimplifier> simplifier(/*is_layout_sensitive=*/false,
                                              non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  root = module->entry_computation()->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kParameter);
+
+  EXPECT_THAT(module->entry_computation()->root_instruction(), op);
 }
 
 // Test that convert(A, $TYPE) is simplified to A if A is of type $TYPE.
@@ -395,13 +411,13 @@ TEST_F(AlgebraicSimplifierTest, ConvertBetweenSameType) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(HloOpcode::kConvert, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kConstant, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), input);
 }
 
 TEST_F(AlgebraicSimplifierTest, ConvertF32ToS64) {
@@ -414,13 +430,13 @@ TEST_F(AlgebraicSimplifierTest, ConvertF32ToS64) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(HloOpcode::kConvert, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kConstant, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
   EXPECT_EQ(LiteralUtil::GetFirstElement<int64>(
                 computation->root_instruction()->literal()),
             42);
@@ -436,13 +452,13 @@ TEST_F(AlgebraicSimplifierTest, ConvertS64ToF32) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(HloOpcode::kConvert, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kConstant, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
   EXPECT_EQ(LiteralUtil::GetFirstElement<float>(
                 computation->root_instruction()->literal()),
             42.0f);
@@ -458,13 +474,13 @@ TEST_F(AlgebraicSimplifierTest, ConvertF32ArrayToS64Array) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(HloOpcode::kConvert, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kConstant, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
   EXPECT_EQ(
       LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {0}),
       42);
@@ -479,19 +495,19 @@ TEST_F(AlgebraicSimplifierTest, RemoveCopy) {
   HloComputation::Builder builder(TestName());
   HloInstruction* param0 = builder.AddInstruction(
       HloInstruction::CreateParameter(0, r0f32, "param0"));
-  HloInstruction* copy = builder.AddInstruction(
+  builder.AddInstruction(
       HloInstruction::CreateUnary(param0->shape(), HloOpcode::kCopy, param0));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(copy, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), op::Copy(param0));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(param0, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), param0);
 }
 
 // Test that a simplification which changes layouts is not performed if layout
@@ -511,14 +527,14 @@ TEST_F(AlgebraicSimplifierTest, CopyWithDifferentLayout) {
   *param0->mutable_shape()->mutable_layout() = LayoutUtil::MakeLayout({0, 1});
   *copy->mutable_shape()->mutable_layout() = LayoutUtil::MakeLayout({1, 0});
 
-  EXPECT_EQ(copy, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), op::Copy(param0));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/true,
                                  non_bitcasting_callback());
   EXPECT_FALSE(simplifier.Run(module.get()).ValueOrDie());
 
   // Copy has not been removed.
-  EXPECT_EQ(copy, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), op::Copy(param0));
 }
 
 // Test that a simplification which preserves layouts is performed if layout
@@ -538,14 +554,14 @@ TEST_F(AlgebraicSimplifierTest, CopyWithSameLayout) {
   *param0->mutable_shape()->mutable_layout() = LayoutUtil::MakeLayout({0, 1});
   *copy->mutable_shape()->mutable_layout() = LayoutUtil::MakeLayout({0, 1});
 
-  EXPECT_EQ(copy, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), op::Copy(param0));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/true,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
   // Copy has been removed.
-  EXPECT_EQ(param0, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), param0);
 }
 
 // Test that a reshape which could be replaced with a bitcast is not if
@@ -566,14 +582,14 @@ TEST_F(AlgebraicSimplifierTest, NoBitcastAdded) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(reshape, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), op::Reshape(param0));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/true,
                                  non_bitcasting_callback());
   EXPECT_FALSE(simplifier.Run(module.get()).ValueOrDie());
 
   // Reshape is not replaced with a bitcast.
-  EXPECT_EQ(reshape, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(), op::Reshape(param0));
 }
 
 // Test transforming reshapes to bitcasts under various conditions.
@@ -612,22 +628,18 @@ TEST_F(AlgebraicSimplifierTest, ReshapeReplacedWithBitcast) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(transformable_reshape, computation->root_instruction()->operand(0));
-  EXPECT_EQ(dimensions_wrong_reshape,
-            computation->root_instruction()->operand(1));
-  EXPECT_EQ(layout_wrong_reshape, computation->root_instruction()->operand(2));
+  EXPECT_THAT(computation->root_instruction(),
+              op::Tuple(transformable_reshape, dimensions_wrong_reshape,
+                        layout_wrong_reshape));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/true,
                                  bitcasting_callback());
   simplifier.Run(module.get()).ValueOrDie();
 
   // Verify that only the first reshape is replaced.
-  EXPECT_NE(transformable_reshape, computation->root_instruction()->operand(0));
-  EXPECT_EQ(HloOpcode::kBitcast,
-            computation->root_instruction()->operand(0)->opcode());
-  EXPECT_EQ(dimensions_wrong_reshape,
-            computation->root_instruction()->operand(1));
-  EXPECT_EQ(layout_wrong_reshape, computation->root_instruction()->operand(2));
+  EXPECT_THAT(
+      computation->root_instruction(),
+      op::Tuple(op::Bitcast(), dimensions_wrong_reshape, layout_wrong_reshape));
 }
 
 TEST_F(AlgebraicSimplifierTest, ReshapeAfterEffectiveUnary) {
@@ -645,14 +657,16 @@ TEST_F(AlgebraicSimplifierTest, ReshapeAfterEffectiveUnary) {
                                    HloOpcode::kMaximum, movable_reshape, zero));
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kMaximum);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Maximum(op::Reshape(param), zero));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  bitcasting_callback());
+
   simplifier.Run(module.get()).ValueOrDie();
-  EXPECT_EQ(HloOpcode::kReshape, computation->root_instruction()->opcode());
-  EXPECT_EQ(HloOpcode::kMaximum,
-            computation->root_instruction()->operand(0)->opcode());
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Maximum(param, zero)));
 }
 
 TEST_F(AlgebraicSimplifierTest, TransposeEqualsBitcast1) {
@@ -672,13 +686,14 @@ TEST_F(AlgebraicSimplifierTest, TransposeEqualsBitcast1) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(), op::Transpose(param));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/true,
                                  bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
   // Verify that the reshape is replaced.
-  EXPECT_EQ(2, computation->instruction_count());
-  EXPECT_EQ(HloOpcode::kBitcast, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Bitcast(param));
 }
 
 TEST_F(AlgebraicSimplifierTest, TransposeEqualsBitcast2) {
@@ -698,13 +713,14 @@ TEST_F(AlgebraicSimplifierTest, TransposeEqualsBitcast2) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(), op::Transpose(param));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/true,
                                  bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
   // Verify that the reshape is replaced.
-  EXPECT_EQ(2, computation->instruction_count());
-  EXPECT_EQ(HloOpcode::kBitcast, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Bitcast(param));
 }
 
 TEST_F(AlgebraicSimplifierTest, ReshapesMerged) {
@@ -717,23 +733,20 @@ TEST_F(AlgebraicSimplifierTest, ReshapesMerged) {
       builder.AddInstruction(HloInstruction::CreateReshape(
           ShapeUtil::MakeShape(F32, {2, 1, 2}), param0));
 
-  HloInstruction* reshape2 =
       builder.AddInstruction(HloInstruction::CreateReshape(
           ShapeUtil::MakeShape(F32, {1, 2, 1, 1, 2, 1}), reshape1));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(reshape2, computation->root_instruction());
-  EXPECT_EQ(reshape1, computation->root_instruction()->operand(0));
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Reshape(param0)));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kReshape, computation->root_instruction()->opcode());
-  EXPECT_EQ(HloOpcode::kParameter,
-            computation->root_instruction()->operand(0)->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Reshape(param0));
 }
 
 TEST_F(AlgebraicSimplifierTest, TransposesMerged) {
@@ -746,25 +759,21 @@ TEST_F(AlgebraicSimplifierTest, TransposesMerged) {
       builder.AddInstruction(HloInstruction::CreateTranspose(
           ShapeUtil::MakeShape(F32, {3, 4, 2}), param0, {1, 2, 0}));
 
-  HloInstruction* transpose2 =
       builder.AddInstruction(HloInstruction::CreateTranspose(
           ShapeUtil::MakeShape(F32, {4, 3, 2}), transpose1, {1, 0, 2}));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
-  EXPECT_EQ(transpose2, computation->root_instruction());
-  EXPECT_EQ(transpose1, computation->root_instruction()->operand(0));
+  EXPECT_THAT(computation->root_instruction(), op::Transpose(transpose1));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kTranspose, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Transpose(param0));
   EXPECT_EQ(std::vector<int64>({2, 1, 0}),
             computation->root_instruction()->dimensions());
-  EXPECT_EQ(HloOpcode::kParameter,
-            computation->root_instruction()->operand(0)->opcode());
 }
 
 // Test merging reshape and broadcast.
@@ -780,13 +789,14 @@ TEST_F(AlgebraicSimplifierTest, ReshapeAndBroadcastMerged) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(),
+              op::Broadcast(op::Reshape(param0)));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kBroadcast, computation->root_instruction()->opcode());
-  EXPECT_EQ(HloOpcode::kParameter,
-            computation->root_instruction()->operand(0)->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Broadcast(param0));
 }
 
 // Test merging broadcast and reshape.
@@ -802,13 +812,14 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshapeMerged) {
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Broadcast(param0)));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 
-  EXPECT_EQ(HloOpcode::kBroadcast, computation->root_instruction()->opcode());
-  EXPECT_EQ(HloOpcode::kParameter,
-            computation->root_instruction()->operand(0)->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Broadcast(param0));
 }
 
 TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_1_3x1_3) {
@@ -821,11 +832,17 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_1_3x1_3) {
       HloInstruction::CreateReshape(ShapeUtil::MakeShape(F32, {3}), broadcast));
 
   auto module = MakeUnique<HloModule>(TestName());
-  module->AddEntryComputation(builder.Build());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Broadcast(param)));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   EXPECT_FALSE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Broadcast(param)));
 }
 
 TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_4_3x2x4_6x1x1x4) {
@@ -840,10 +857,14 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_4_3x2x4_6x1x1x4) {
   auto module = MakeUnique<HloModule>(TestName());
   HloComputation* computation = module->AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Broadcast(param)));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  EXPECT_EQ(HloOpcode::kBroadcast, computation->root_instruction()->opcode());
+
+  EXPECT_THAT(computation->root_instruction(), op::Broadcast(param));
   EXPECT_THAT(computation->root_instruction()->dimensions(),
               ::testing::ElementsAre(3));
 }
@@ -860,10 +881,14 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_1_3x2x1_6x1x1x1) {
   auto module = MakeUnique<HloModule>(TestName());
   HloComputation* computation = module->AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Broadcast(param)));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-  EXPECT_EQ(HloOpcode::kBroadcast, computation->root_instruction()->opcode());
+
+  EXPECT_THAT(computation->root_instruction(), op::Broadcast(param));
   const std::vector<int64> broadcast_dims =
       computation->root_instruction()->dimensions();
   EXPECT_EQ(1, broadcast_dims.size());
@@ -880,11 +905,17 @@ TEST_F(AlgebraicSimplifierTest, BroadcastAndReshape_4_3x2x4x2_6x8) {
       ShapeUtil::MakeShape(F32, {6, 8}), broadcast));
 
   auto module = MakeUnique<HloModule>(TestName());
-  module->AddEntryComputation(builder.Build());
+  HloComputation* computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Broadcast(param)));
 
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   EXPECT_FALSE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Broadcast(param)));
 }
 
 TEST_F(AlgebraicSimplifierTest, RemoveNoopPad) {
@@ -907,10 +938,13 @@ TEST_F(AlgebraicSimplifierTest, RemoveNoopPad) {
   HloModule module(TestName());
   HloComputation* computation = module.AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(), op::Pad(param, zero));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-  EXPECT_EQ(1, computation->instruction_count());
+
+  EXPECT_THAT(computation->root_instruction(), param);
 }
 
 TEST_F(AlgebraicSimplifierTest, NegativePadding) {
@@ -950,18 +984,14 @@ TEST_F(AlgebraicSimplifierTest, NegativePadding) {
     return false;
   };
 
-  EXPECT_EQ(3, computation->instruction_count());
-  EXPECT_EQ(computation->root_instruction(), pad);
+  EXPECT_THAT(computation->root_instruction(), op::Pad(param, zero));
   EXPECT_TRUE(has_negative_padding(pad));
 
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
 
-  EXPECT_EQ(4, computation->instruction_count());
-  EXPECT_EQ(computation->root_instruction()->opcode(), HloOpcode::kSlice);
-  const HloInstruction* root_operand =
-      computation->root_instruction()->operand(0);
-  EXPECT_EQ(root_operand->opcode(), HloOpcode::kPad);
-  EXPECT_FALSE(has_negative_padding(root_operand));
+  EXPECT_THAT(computation->root_instruction(), op::Slice(op::Pad(param, zero)));
+  EXPECT_FALSE(
+      has_negative_padding(computation->root_instruction()->operand(0)));
 }
 
 TEST_F(AlgebraicSimplifierTest, RemoveNoopReshape) {
@@ -975,10 +1005,13 @@ TEST_F(AlgebraicSimplifierTest, RemoveNoopReshape) {
   HloModule module(TestName());
   HloComputation* computation = module.AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(), op::Reshape(param));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-  EXPECT_EQ(1, computation->instruction_count());
+
+  EXPECT_THAT(computation->root_instruction(), param);
 }
 
 TEST_F(AlgebraicSimplifierTest, RemoveNoopSlice) {
@@ -995,10 +1028,13 @@ TEST_F(AlgebraicSimplifierTest, RemoveNoopSlice) {
   HloModule module(TestName());
   HloComputation* computation = module.AddEntryComputation(builder.Build());
 
+  EXPECT_THAT(computation->root_instruction(), op::Slice(param));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-  EXPECT_EQ(1, computation->instruction_count());
+
+  EXPECT_THAT(computation->root_instruction(), param);
 }
 
 TEST_F(AlgebraicSimplifierTest, ConvertConvToMatmul) {
@@ -1234,21 +1270,21 @@ TEST_F(AlgebraicSimplifierTest, MaxMinToClamp) {
       HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0f)));
   HloInstruction* min = builder.AddInstruction(HloInstruction::CreateBinary(
       r0f32, HloOpcode::kMinimum, param0, min_value));
-  HloInstruction* max = builder.AddInstruction(
+  builder.AddInstruction(
       HloInstruction::CreateBinary(r0f32, HloOpcode::kMaximum, min, max_value));
 
   HloModule module(TestName());
   auto computation = module.AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root, max);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Maximum(op::Minimum(param0, min_value), max_value));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-  root = computation->root_instruction();
-  ASSERT_EQ(root->opcode(), HloOpcode::kClamp);
-  EXPECT_EQ(root->operand(0), max_value);
-  EXPECT_EQ(root->operand(1), param0);
-  EXPECT_EQ(root->operand(2), min_value);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Clamp(max_value, param0, min_value));
 }
 
 // Test that min(max(A, x), y) is transformed to clamp(x, A, y) for scalar
@@ -1264,21 +1300,21 @@ TEST_F(AlgebraicSimplifierTest, MinMaxToClamp) {
       HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0f)));
   HloInstruction* max = builder.AddInstruction(HloInstruction::CreateBinary(
       r0f32, HloOpcode::kMaximum, param0, max_value));
-  HloInstruction* min = builder.AddInstruction(
+  builder.AddInstruction(
       HloInstruction::CreateBinary(r0f32, HloOpcode::kMinimum, max, min_value));
 
   HloModule module(TestName());
   auto computation = module.AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root, min);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Minimum(op::Maximum(param0, max_value), min_value));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-  root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kClamp);
-  EXPECT_EQ(root->operand(0), max_value);
-  EXPECT_EQ(root->operand(1), param0);
-  EXPECT_EQ(root->operand(2), min_value);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Clamp(max_value, param0, min_value));
 }
 
 // Test that min(max(A, x), y) is transformed to clamp(x, A, y) for
@@ -1295,21 +1331,21 @@ TEST_F(AlgebraicSimplifierTest, MinMaxWithBroadcastToClamp) {
       HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0f)));
   HloInstruction* max = builder.AddInstruction(HloInstruction::CreateBinary(
       r1f32, HloOpcode::kMaximum, param0, max_value));
-  HloInstruction* min = builder.AddInstruction(
+  builder.AddInstruction(
       HloInstruction::CreateBinary(r1f32, HloOpcode::kMinimum, max, min_value));
 
   HloModule module(TestName());
   auto computation = module.AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root, min);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Minimum(op::Maximum(param0, max_value), min_value));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-  root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kClamp);
-  EXPECT_EQ(root->operand(0), max_value);
-  EXPECT_EQ(root->operand(1), param0);
-  EXPECT_EQ(root->operand(2), min_value);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Clamp(max_value, param0, min_value));
 }
 
 // Test that min(max(A, non-constant1), non-constant2) is not canonicalized to
@@ -1325,17 +1361,21 @@ TEST_F(AlgebraicSimplifierTest, MinMaxNotToClamp) {
       HloInstruction::CreateParameter(2, r0f32, "param2"));
   HloInstruction* max = builder.AddInstruction(HloInstruction::CreateBinary(
       r0f32, HloOpcode::kMaximum, param0, max_value));
-  HloInstruction* min = builder.AddInstruction(
+  builder.AddInstruction(
       HloInstruction::CreateBinary(r0f32, HloOpcode::kMinimum, max, min_value));
 
   HloModule module(TestName());
   auto computation = module.AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Minimum(op::Maximum(param0, max_value), min_value));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   EXPECT_FALSE(simplifier.Run(&module).ValueOrDie());
-  root = computation->root_instruction();
-  EXPECT_EQ(root, min);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Minimum(op::Maximum(param0, max_value), min_value));
 }
 
 // Test that min(f(max(A, constant1)), constant2) is not transformed to
@@ -1353,18 +1393,23 @@ TEST_F(AlgebraicSimplifierTest, MinEquationWithMaxNotToClamp) {
       r0f32, HloOpcode::kMaximum, param0, max_value));
   HloInstruction* fmax = builder.AddInstruction(
       HloInstruction::CreateBinary(r0f32, HloOpcode::kAdd, max, max_value));
-  HloInstruction* min = builder.AddInstruction(HloInstruction::CreateBinary(
+  builder.AddInstruction(HloInstruction::CreateBinary(
       r0f32, HloOpcode::kMinimum, fmax, min_value));
 
   HloModule module(TestName());
   auto computation = module.AddEntryComputation(builder.Build());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root, min);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Minimum(op::Add(op::Maximum(param0, max_value), max_value),
+                          min_value));
+
   AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
                                  non_bitcasting_callback());
   EXPECT_FALSE(simplifier.Run(&module).ValueOrDie());
-  root = computation->root_instruction();
-  EXPECT_EQ(root, min);
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Minimum(op::Add(op::Maximum(param0, max_value), max_value),
+                          min_value));
 }
 
 // Test that slice(broadcast(/*scalar value*/)) simplifies to a single
@@ -1401,8 +1446,7 @@ TEST_F(AlgebraicSimplifierTest, ScalarBroadcastToSlice) {
   ASSERT_FALSE(simplifier.Run(&module).ValueOrDie());
 
   root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kBroadcast);
-  EXPECT_EQ(scalar_param, root->operand(0));
+  EXPECT_THAT(root, op::Broadcast(scalar_param));
   EXPECT_TRUE(ShapeUtil::Equal(root->shape(), slice_shape));
 }
 
@@ -1439,8 +1483,7 @@ TEST_F(AlgebraicSimplifierTest, ScalarBroadcastToTransposeReshape) {
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
 
   root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kBroadcast);
-  EXPECT_EQ(forty_two, root->operand(0));
+  EXPECT_THAT(root, op::Broadcast(forty_two));
   EXPECT_TRUE(ShapeUtil::Equal(root->shape(), reshape_shape));
 }
 
@@ -1460,7 +1503,6 @@ TEST_F(AlgebraicSimplifierTest, ReversalOfTrivialDimensionsToBitcast) {
   ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
 
   HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kParameter);
   EXPECT_EQ(a, root);
   EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
 }
diff --git a/tensorflow/compiler/xla/service/copy_insertion_test.cc b/tensorflow/compiler/xla/service/copy_insertion_test.cc
index 3c45c454a1..89b7b6e23d 100644
--- a/tensorflow/compiler/xla/service/copy_insertion_test.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion_test.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
@@ -29,6 +30,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
@@ -53,43 +56,6 @@ class CopyInsertionTest : public HloTestBase {
       EXPECT_NE(buffer->instruction()->opcode(), HloOpcode::kParameter);
     }
   }
-
-  // OperandTree is a test helper class that simplifies the expression of
-  // an expected tree of operands (starting at some root instruction) in a
-  // unit test.
-  // Each HLO instruction is represented as a node in the OperandTree.
-  struct OperandTree {
-    // The expected opcode for this OperandTree node.
-    HloOpcode opcode;
-    // The set of operands expected for this OperandTree node.
-    std::vector<OperandTree> operands;
-    // If non-null, a pointer to the expected HloInstruction at this node.
-    const HloInstruction* instruction = nullptr;
-
-    // Returns a mutable reference to operand 'i' of this node.
-    OperandTree& op(int i) {
-      if (i >= operands.size()) {
-        operands.resize(i + 1);
-      }
-      return operands[i];
-    }
-
-    // Check that 'instruction' and its operands match expected values recorded
-    // in OperandTree.
-    void Check(const HloInstruction* instruction) {
-      EXPECT_EQ(opcode, instruction->opcode());
-      if (instruction != nullptr) {
-        EXPECT_EQ(instruction, instruction);
-      }
-      if (operands.empty()) {
-        return;
-      }
-      EXPECT_EQ(operands.size(), instruction->operand_count());
-      for (int i = 0; i < instruction->operand_count(); ++i) {
-        operands[i].Check(instruction->operand(i));
-      }
-    }
-  };
 };
 
 TEST_F(CopyInsertionTest, SingleParameter) {
@@ -106,18 +72,9 @@ TEST_F(CopyInsertionTest, SingleParameter) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
-
-  // Check path from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_root;
 
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Tuple(op::Copy(op::GetTupleElement(old_root))));
 }
 
 TEST_F(CopyInsertionTest, SingleConstant) {
@@ -134,18 +91,9 @@ TEST_F(CopyInsertionTest, SingleConstant) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
-
-  // Check path from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
 
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Tuple(op::Copy(op::GetTupleElement(old_root))));
 }
 
 TEST_F(CopyInsertionTest, MultipleConstantsAndParameters) {
@@ -174,30 +122,11 @@ TEST_F(CopyInsertionTest, MultipleConstantsAndParameters) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
-
-  // "constant2" and parameter "x" are pointed to by the tuple and should be
-  // copied.
-
-  // Check all paths from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).op(0).instruction = old_root;
 
-  op_tree.op(2).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(2).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(2).op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Tuple(op::Copy(op::GetTupleElement(old_root)),
+                        op::Copy(op::GetTupleElement(old_root)),
+                        op::GetTupleElement(old_root)));
 }
 
 TEST_F(CopyInsertionTest, AmbiguousPointsToSet) {
@@ -230,23 +159,10 @@ TEST_F(CopyInsertionTest, AmbiguousPointsToSet) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
-
-  // Check all paths from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kSelect;
-  op_tree.op(0).op(0).op(0).instruction = old_root;
 
-  op_tree.op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kSelect;
-  op_tree.op(1).op(0).op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Tuple(op::Copy(op::GetTupleElement(old_root)),
+                        op::Copy(op::GetTupleElement(old_root))));
 }
 
 TEST_F(CopyInsertionTest, BitcastParameter) {
@@ -265,15 +181,9 @@ TEST_F(CopyInsertionTest, BitcastParameter) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
 
-  // Check path from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kCopy;
-  op_tree.op(0).opcode = HloOpcode::kBitcast;
-  op_tree.op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Copy(old_root));
 }
 
 TEST_F(CopyInsertionTest, BitcastConstant) {
@@ -293,15 +203,9 @@ TEST_F(CopyInsertionTest, BitcastConstant) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
 
-  // Check path from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kCopy;
-  op_tree.op(0).opcode = HloOpcode::kBitcast;
-  op_tree.op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Copy(old_root));
 }
 
 TEST_F(CopyInsertionTest, BitcastTupleElementParameter) {
@@ -320,17 +224,9 @@ TEST_F(CopyInsertionTest, BitcastTupleElementParameter) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
 
-  // Check path from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Tuple(op::Copy(op::GetTupleElement(old_root))));
 }
 
 TEST_F(CopyInsertionTest, NestedTupleParameter) {
@@ -341,10 +237,11 @@ TEST_F(CopyInsertionTest, NestedTupleParameter) {
 
   // Param shape is: ((F32[], S32[1,2,3]), F32[42])
   builder.AddInstruction(HloInstruction::CreateParameter(
-      0, ShapeUtil::MakeTupleShape(
-             {ShapeUtil::MakeTupleShape({ShapeUtil::MakeShape(F32, {}),
-                                         ShapeUtil::MakeShape(S32, {1, 2, 3})}),
-              ShapeUtil::MakeShape(F32, {42})}),
+      0,
+      ShapeUtil::MakeTupleShape(
+          {ShapeUtil::MakeTupleShape({ShapeUtil::MakeShape(F32, {}),
+                                      ShapeUtil::MakeShape(S32, {1, 2, 3})}),
+           ShapeUtil::MakeShape(F32, {42})}),
       "param0"));
 
   HloModule module(TestName());
@@ -358,30 +255,13 @@ TEST_F(CopyInsertionTest, NestedTupleParameter) {
   HloInstruction* new_root = module.entry_computation()->root_instruction();
   EXPECT_NE(old_root, new_root);
 
-  // Check all paths from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).op(0).op(0).opcode = HloOpcode::kParameter;
-  op_tree.op(0).op(0).op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(1).op(0).op(0).op(0).opcode = HloOpcode::kParameter;
-  op_tree.op(0).op(1).op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kParameter;
-  op_tree.op(1).op(0).op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(
+      new_root,
+      op::Tuple(
+          op::Tuple(
+              op::Copy(op::GetTupleElement(op::GetTupleElement(old_root))),
+              op::Copy(op::GetTupleElement(op::GetTupleElement(old_root)))),
+          op::Copy(op::GetTupleElement(old_root))));
 }
 
 TEST_F(CopyInsertionTest, ElementOfNestedTupleParameter) {
@@ -391,10 +271,11 @@ TEST_F(CopyInsertionTest, ElementOfNestedTupleParameter) {
 
   // Param shape is: ((F32[], S32[1,2,3]), F32[42])
   auto param = builder.AddInstruction(HloInstruction::CreateParameter(
-      0, ShapeUtil::MakeTupleShape(
-             {ShapeUtil::MakeTupleShape({ShapeUtil::MakeShape(F32, {}),
-                                         ShapeUtil::MakeShape(S32, {1, 2, 3})}),
-              ShapeUtil::MakeShape(F32, {42})}),
+      0,
+      ShapeUtil::MakeTupleShape(
+          {ShapeUtil::MakeTupleShape({ShapeUtil::MakeShape(F32, {}),
+                                      ShapeUtil::MakeShape(S32, {1, 2, 3})}),
+           ShapeUtil::MakeShape(F32, {42})}),
       "param0"));
 
   // The return value of the computation is the zero-th elemnt of the nested
@@ -409,23 +290,10 @@ TEST_F(CopyInsertionTest, ElementOfNestedTupleParameter) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
-
-  // Check all paths from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).instruction = old_root;
 
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Tuple(op::Copy(op::GetTupleElement(old_root)),
+                        op::Copy(op::GetTupleElement(old_root))));
 }
 
 TEST_F(CopyInsertionTest, AmbiguousTopLevelRoot) {
@@ -458,15 +326,9 @@ TEST_F(CopyInsertionTest, AmbiguousTopLevelRoot) {
 
   HloInstruction* old_root = module.entry_computation()->root_instruction();
   InsertCopies(&module);
-  HloInstruction* new_root = module.entry_computation()->root_instruction();
-
-  // Check path from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kCopy;
-  op_tree.op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).instruction = old_root;
 
-  op_tree.Check(new_root);
+  EXPECT_THAT(module.entry_computation()->root_instruction(),
+              op::Copy(old_root));
 }
 
 class WhileCopyInsertionTest : public CopyInsertionTest {
@@ -790,7 +652,7 @@ TEST_F(WhileCopyInsertionTest, IndependentTupleElements) {
   HloInstruction* new_root = body->root_instruction();
 
   // No copies should be inserted so root should not be updated.
-  CHECK_EQ(old_root, new_root);
+  EXPECT_EQ(old_root, new_root);
 }
 
 // Tests while body computation with dependent tuple elements:
@@ -817,22 +679,10 @@ TEST_F(WhileCopyInsertionTest, DependentTupleElements) {
 
   HloInstruction* old_root = body->root_instruction();
   InsertCopies(&module_);
-  HloInstruction* new_root = body->root_instruction();
-
-  // Check all paths from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
 
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.op(1).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(body->root_instruction(),
+              op::Tuple(op::Copy(op::GetTupleElement(old_root)),
+                        op::GetTupleElement(old_root)));
 }
 
 // Tests while body computation with read-only tuple element 0:
@@ -861,7 +711,7 @@ TEST_F(WhileCopyInsertionTest, DependentTupleElements_OneReadOnly) {
   HloInstruction* new_root = body->root_instruction();
 
   // No copies should be inserted so root should not be updated.
-  CHECK_EQ(old_root, new_root);
+  EXPECT_EQ(old_root, new_root);
 }
 
 // Tests while body computation with nested tuple elements:
@@ -900,30 +750,13 @@ TEST_F(WhileCopyInsertionTest, NestedTupleElements) {
 
   HloInstruction* old_root = body->root_instruction();
   InsertCopies(&module_);
-  HloInstruction* new_root = body->root_instruction();
-
-  // Check all paths from 'new_root' to 'old_root'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
 
-  op_tree.op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).instruction = old_root;
-
-  op_tree.op(1).opcode = HloOpcode::kTuple;
-
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.op(1).op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(1).op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(1).op(0).op(0).op(0).instruction = old_root;
-
-  op_tree.Check(new_root);
+  EXPECT_THAT(
+      body->root_instruction(),
+      op::Tuple(op::GetTupleElement(old_root),
+                op::Tuple(op::GetTupleElement(op::GetTupleElement(old_root)),
+                          op::Copy(op::GetTupleElement(
+                              op::GetTupleElement(old_root))))));
 }
 
 // Tests while init instruction which points-to a constant.
@@ -944,23 +777,10 @@ TEST_F(WhileCopyInsertionTest, InitPointsToConstant) {
   auto while_hlo = BuildWhileInstruction_InitPointsToConstant();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
-  auto new_init = while_hlo->operand(0);
 
-  // Check all paths from 'new_init' to 'old_init'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).op(0).instruction = old_init;
-
-  op_tree.Check(new_init);
+  EXPECT_THAT(while_hlo->operand(0),
+              op::Tuple(op::Copy(op::GetTupleElement(old_init)),
+                        op::Copy(op::GetTupleElement(old_init))));
 }
 
 // Tests while init instruction which points-to a parameter.
@@ -981,23 +801,10 @@ TEST_F(WhileCopyInsertionTest, InitPointsToParameter) {
   auto while_hlo = BuildWhileInstruction_InitPointsToParameter();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
-  auto new_init = while_hlo->operand(0);
-
-  // Check all paths from 'new_init' to 'old_init'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
 
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).op(0).instruction = old_init;
-
-  op_tree.Check(new_init);
+  EXPECT_THAT(while_hlo->operand(0),
+              op::Tuple(op::Copy(op::GetTupleElement(old_init)),
+                        op::Copy(op::GetTupleElement(old_init))));
 }
 
 // Tests while init instruction which has an ambiguous points-to set.
@@ -1027,32 +834,14 @@ TEST_F(WhileCopyInsertionTest, InitPointsToAmbiguous) {
   auto while_hlo = BuildWhileInstruction_InitPointsToAmbiguous();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
-  auto new_init = while_hlo->operand(0);
-
-  // Check all paths from 'new_init' to 'old_init'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_init;
 
-  op_tree.op(1).opcode = HloOpcode::kTuple;
-
-  op_tree.op(1).op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.op(1).op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(1).op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(1).op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.Check(new_init);
+  EXPECT_THAT(
+      while_hlo->operand(0),
+      op::Tuple(
+          op::Copy(op::GetTupleElement(old_init)),
+          op::Tuple(
+              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))),
+              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))))));
 }
 
 // Tests while init instruction which has a non-distinct points-to set.
@@ -1081,32 +870,14 @@ TEST_F(WhileCopyInsertionTest, InitPointsToNonDistinct) {
   auto while_hlo = BuildWhileInstruction_InitPointsToNonDistinct();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
-  auto new_init = while_hlo->operand(0);
-
-  // Check all paths from 'new_init' to 'old_init'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
 
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.op(1).opcode = HloOpcode::kTuple;
-
-  op_tree.op(1).op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.op(1).op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(1).op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(1).op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(1).op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.Check(new_init);
+  EXPECT_THAT(
+      while_hlo->operand(0),
+      op::Tuple(
+          op::Copy(op::GetTupleElement(old_init)),
+          op::Tuple(
+              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))),
+              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))))));
 }
 
 // Tests while init instruction buffer which interfers with while result buffer.
@@ -1129,23 +900,10 @@ TEST_F(WhileCopyInsertionTest, InitPointsToInterfering) {
   auto while_hlo = BuildWhileInstruction_InitPointsToInterfering();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
-  auto new_init = while_hlo->operand(0);
-
-  // Check all paths from 'new_init' to 'old_init'.
-  OperandTree op_tree;
-  op_tree.opcode = HloOpcode::kTuple;
-
-  op_tree.op(0).opcode = HloOpcode::kCopy;
-  op_tree.op(0).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(0).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(0).op(0).op(0).instruction = old_init;
-
-  op_tree.op(1).opcode = HloOpcode::kCopy;
-  op_tree.op(1).op(0).opcode = HloOpcode::kGetTupleElement;
-  op_tree.op(1).op(0).op(0).opcode = HloOpcode::kTuple;
-  op_tree.op(1).op(0).op(0).instruction = old_init;
 
-  op_tree.Check(new_init);
+  EXPECT_THAT(while_hlo->operand(0),
+              op::Tuple(op::Copy(op::GetTupleElement(old_init)),
+                        op::Copy(op::GetTupleElement(old_init))));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/hlo_computation_test.cc b/tensorflow/compiler/xla/service/hlo_computation_test.cc
index 8e663d0af6..e82eba9b11 100644
--- a/tensorflow/compiler/xla/service/hlo_computation_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation_test.cc
@@ -20,12 +20,15 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 
 namespace {
@@ -250,8 +253,7 @@ TEST_F(HloComputationTest, DeepCopyArray) {
 
   auto copy = computation->DeepCopyInstruction(constant).ValueOrDie();
 
-  EXPECT_EQ(HloOpcode::kCopy, copy->opcode());
-  EXPECT_EQ(constant, copy->operand(0));
+  EXPECT_THAT(copy, op::Copy(constant));
 }
 
 TEST_F(HloComputationTest, DeepCopyTuple) {
@@ -268,18 +270,10 @@ TEST_F(HloComputationTest, DeepCopyTuple) {
 
   auto tuple_copy = computation->DeepCopyInstruction(tuple).ValueOrDie();
 
-  EXPECT_EQ(HloOpcode::kTuple, tuple_copy->opcode());
-  EXPECT_EQ(HloOpcode::kCopy, tuple_copy->operand(0)->opcode());
-  const HloInstruction* gte0 = tuple_copy->operand(0)->operand(0);
-  EXPECT_EQ(HloOpcode::kGetTupleElement, gte0->opcode());
-  EXPECT_EQ(0, gte0->tuple_index());
-  EXPECT_EQ(tuple, gte0->operand(0));
-
-  EXPECT_EQ(HloOpcode::kCopy, tuple_copy->operand(1)->opcode());
-  const HloInstruction* gte1 = tuple_copy->operand(1)->operand(0);
-  EXPECT_EQ(HloOpcode::kGetTupleElement, gte1->opcode());
-  EXPECT_EQ(1, gte1->tuple_index());
-  EXPECT_EQ(tuple, gte1->operand(0));
+  EXPECT_THAT(tuple_copy, op::Tuple(op::Copy(op::GetTupleElement(tuple)),
+                                    op::Copy(op::GetTupleElement(tuple))));
+  EXPECT_EQ(0, tuple_copy->operand(0)->operand(0)->tuple_index());
+  EXPECT_EQ(1, tuple_copy->operand(1)->operand(0)->tuple_index());
 }
 
 TEST_F(HloComputationTest, CycleDetection) {
@@ -319,11 +313,13 @@ TEST_F(HloComputationTest, RemoveInstructionWithDuplicateOperand) {
   auto computation = builder.Build();
 
   EXPECT_EQ(4, computation->instruction_count());
+  EXPECT_THAT(computation->root_instruction(), op::Negate(constant));
   EXPECT_EQ(negate, computation->root_instruction());
 
   ASSERT_IS_OK(computation->RemoveInstructionAndUnusedOperands(dead_add));
 
   EXPECT_EQ(2, computation->instruction_count());
+  EXPECT_THAT(computation->root_instruction(), op::Negate(constant));
   EXPECT_EQ(negate, computation->root_instruction());
 }
 
diff --git a/tensorflow/compiler/xla/service/hlo_matchers.cc b/tensorflow/compiler/xla/service/hlo_matchers.cc
new file mode 100644
index 0000000000..e022c4836d
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_matchers.cc
@@ -0,0 +1,77 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
+
+#include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/test.h"
+
+namespace xla {
+namespace testing {
+
+bool HloMatcher::MatchAndExplain(
+    const HloInstruction* instruction,
+    ::testing::MatchResultListener* listener) const {
+  // These cases are self-explanatory from the printed value.
+  if (!instruction || instruction->opcode() != opcode_) {
+    return false;
+  }
+  // Special case: no operand matchers means don't verify.
+  if (operands_.empty()) {
+    return true;
+  }
+  const auto& operands = instruction->operands();
+  if (operands.size() != operands_.size()) {
+    *listener << "has too "
+              << (operands.size() > operands_.size() ? "many" : "few")
+              << " operands (got " << operands.size() << ", want "
+              << operands_.size() << ")";
+    return false;
+  }
+  for (int index = 0; index < operands.size(); index++) {
+    ::testing::StringMatchResultListener inner_listener;
+    if (!operands_[index].MatchAndExplain(operands[index], &inner_listener)) {
+      if (listener->IsInterested()) {
+        *listener << "\noperand " << index << ":\n\t"
+                  << operands[index]->ToString()
+                  << "\ndoesn't match expected:\n\t";
+        operands_[index].DescribeTo(listener->stream());
+        string explanation = inner_listener.str();
+        if (!explanation.empty()) {
+          *listener << ", " << explanation;
+        }
+      }
+      return false;
+    }
+  }
+  return true;
+}
+
+void HloMatcher::DescribeTo(::std::ostream* os) const {
+  *os << opcode_;
+  if (!operands_.empty()) {
+    *os << "(";
+    for (int i = 0; i < operands_.size(); i++) {
+      if (i > 0) {
+        *os << ", ";
+      }
+      operands_[i].DescribeTo(os);
+    }
+    *os << ")";
+  }
+}
+
+}  // namespace testing
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_matchers.h b/tensorflow/compiler/xla/service/hlo_matchers.h
new file mode 100644
index 0000000000..141251011c
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_matchers.h
@@ -0,0 +1,142 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_COMPILER_XLA_SERVICE_HLO_MATCHERS_H_
+#define TENSORFLOW_COMPILER_XLA_SERVICE_HLO_MATCHERS_H_
+
+#include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/test.h"
+
+namespace xla {
+namespace testing {
+
+class HloMatcher : public ::testing::MatcherInterface<const HloInstruction*> {
+ public:
+  HloMatcher(HloOpcode opcode,
+             std::vector<::testing::Matcher<const HloInstruction*>> operands)
+      : opcode_(opcode), operands_(operands) {}
+
+  bool MatchAndExplain(const HloInstruction* instruction,
+                       ::testing::MatchResultListener* listener) const override;
+
+  void DescribeTo(::std::ostream* os) const override;
+
+ private:
+  HloOpcode opcode_;
+  std::vector<::testing::Matcher<const HloInstruction*>> operands_;
+};
+
+// HloInstruction* matchers for opcode and operands. Example:
+//   namespace op = xla::opcode_matchers;
+//   EXPECT_THAT(instruction,
+//               op::Add(op::Reshape(), op::Add(op::Reshape(), _)));
+namespace opcode_matchers {
+#define HLO_MATCHER(opcode)                                                \
+  template <typename... M>                                                 \
+  ::testing::Matcher<const ::xla::HloInstruction*> opcode(M... operands) { \
+    return ::testing::MakeMatcher(new ::xla::testing::HloMatcher(          \
+        ::xla::HloOpcode::k##opcode, {operands...}));                      \
+  }
+HLO_MATCHER(Abs);
+HLO_MATCHER(Add);
+HLO_MATCHER(Bitcast);
+HLO_MATCHER(Broadcast);
+HLO_MATCHER(Call);
+HLO_MATCHER(Ceil);
+HLO_MATCHER(Clamp);
+HLO_MATCHER(Concatenate);
+HLO_MATCHER(Constant);
+HLO_MATCHER(Convert);
+HLO_MATCHER(Convolution);
+HLO_MATCHER(Copy);
+HLO_MATCHER(CrossReplicaSum);
+HLO_MATCHER(CustomCall);
+HLO_MATCHER(Divide);
+HLO_MATCHER(Dot);
+HLO_MATCHER(DynamicSlice);
+HLO_MATCHER(DynamicUpdateSlice);
+HLO_MATCHER(Eq);
+HLO_MATCHER(Exp);
+HLO_MATCHER(Floor);
+HLO_MATCHER(Fusion);
+HLO_MATCHER(Ge);
+HLO_MATCHER(GetTupleElement);
+HLO_MATCHER(Gt);
+HLO_MATCHER(Index);
+HLO_MATCHER(Infeed);
+HLO_MATCHER(IsFinite);
+HLO_MATCHER(Le);
+HLO_MATCHER(Log);
+HLO_MATCHER(LogicalAnd);
+HLO_MATCHER(LogicalNot);
+HLO_MATCHER(LogicalOr);
+HLO_MATCHER(Lt);
+HLO_MATCHER(Map);
+HLO_MATCHER(Maximum);
+HLO_MATCHER(Minimum);
+HLO_MATCHER(Multiply);
+HLO_MATCHER(Ne);
+HLO_MATCHER(Negate);
+HLO_MATCHER(Outfeed);
+HLO_MATCHER(Pad);
+HLO_MATCHER(Parameter);
+HLO_MATCHER(Power);
+HLO_MATCHER(Recv);
+HLO_MATCHER(Reduce);
+HLO_MATCHER(ReduceWindow);
+HLO_MATCHER(Remainder);
+HLO_MATCHER(Reshape);
+HLO_MATCHER(Reverse);
+HLO_MATCHER(Rng);
+HLO_MATCHER(Select);
+HLO_MATCHER(SelectAndScatter);
+HLO_MATCHER(Send);
+HLO_MATCHER(Sign);
+HLO_MATCHER(Slice);
+HLO_MATCHER(Sort);
+HLO_MATCHER(Subtract);
+HLO_MATCHER(Tanh);
+HLO_MATCHER(Trace);
+HLO_MATCHER(Transpose);
+HLO_MATCHER(Tuple);
+HLO_MATCHER(Update);
+HLO_MATCHER(While);
+#undef HLO_MATCHER
+}  // namespace opcode_matchers
+
+// Helper to convert smart to raw pointers for matching.
+template <typename Container>
+std::vector<const HloInstruction*> Pointers(const Container& container) {
+  std::vector<const HloInstruction*> result;
+  result.reserve(container.size());
+  for (const auto& entry : container) result.push_back(entry.get());
+  return result;
+}
+
+}  // namespace testing
+
+// Tell GMock to print HloInstruction* by value, so error messages are nice.
+// Has to be in the same namespace as 'HloInstruction'.
+void PrintTo(const HloInstruction* inst, ::std::ostream* os) {
+  *os << (inst ? inst->ToString() : "nullptr");
+}
+
+void PrintTo(HloInstruction* inst, ::std::ostream* os) {
+  PrintTo(const_cast<const HloInstruction*>(inst), os);
+}
+
+}  // namespace xla
+
+#endif  // TENSORFLOW_COMPILER_XLA_SERVICE_HLO_MATCHERS_H_
diff --git a/tensorflow/compiler/xla/service/hlo_matchers_test.cc b/tensorflow/compiler/xla/service/hlo_matchers_test.cc
new file mode 100644
index 0000000000..4ff83c2de7
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_matchers_test.cc
@@ -0,0 +1,71 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+
+namespace op = xla::testing::opcode_matchers;
+using ::testing::_;
+using ::testing::Eq;
+
+namespace xla {
+namespace {
+
+template <typename M, typename T>
+string Explain(const T& t, const M& m) {
+  ::testing::StringMatchResultListener listener;
+  EXPECT_THAT(t, ::testing::Not(m));  // For the error message.
+  EXPECT_FALSE(m.MatchAndExplain(t, &listener));
+  return listener.str();
+}
+
+TEST(HloMatchersTest, Test) {
+  auto shape = ShapeUtil::MakeShape(F32, {1});
+  auto param = HloInstruction::CreateParameter(0, shape, "param");
+  auto mul = HloInstruction::CreateBinary(shape, HloOpcode::kMultiply,
+                                          param.get(), param.get());
+  auto add = HloInstruction::CreateBinary(shape, HloOpcode::kAdd, param.get(),
+                                          mul.get());
+
+  EXPECT_THAT(add.get(), op::Add());
+  EXPECT_THAT(add.get(), op::Add(op::Parameter(), op::Multiply()));
+  EXPECT_THAT(add.get(),
+              op::Add(op::Parameter(), op::Multiply(_, op::Parameter())));
+
+  // Negative matches: check the explanation string.
+  EXPECT_THAT(Explain(add.get(), op::Parameter()), Eq(""));
+  EXPECT_THAT(Explain(add.get(), op::Add(op::Parameter())),
+              Eq("has too many operands (got 2, want 1)"));
+  EXPECT_THAT(
+      Explain(add.get(), op::Add(op::Parameter(), op::Parameter())),
+      Eq("\noperand 1:\n\t"
+         "%multiply = f32[1]{0} multiply(f32[1]{0} %param, f32[1]{0} %param)\n"
+         "doesn't match expected:\n\t"
+         "parameter"));
+  EXPECT_THAT(
+      Explain(add.get(),
+              op::Add(op::Parameter(), op::Multiply(op::Add(), op::Add()))),
+      Eq("\noperand 1:\n\t"
+         "%multiply = f32[1]{0} multiply(f32[1]{0} %param, f32[1]{0} %param)\n"
+         "doesn't match expected:\n\t"
+         "multiply(add, add), \n"
+         "operand 0:\n\t"
+         "%param = f32[1]{0} parameter()\n"
+         "doesn't match expected:\n\t"
+         "add"));
+}
+
+}  // namespace
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/inliner_test.cc b/tensorflow/compiler/xla/service/inliner_test.cc
index a286c2e74d..a8d4ecf261 100644
--- a/tensorflow/compiler/xla/service/inliner_test.cc
+++ b/tensorflow/compiler/xla/service/inliner_test.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/test.h"
@@ -29,6 +30,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
@@ -59,11 +62,11 @@ TEST_F(InlinerTest, MapMax) {
   auto hlo_module = MakeUnique<HloModule>("test_module");
   hlo_module->AddEmbeddedComputation(std::move(max_f32));
   hlo_module->AddEntryComputation(std::move(computation));
-  HloInstruction* root = hlo_module->entry_computation()->root_instruction();
+
   Inliner inliner;
   EXPECT_TRUE(inliner.Run(hlo_module.get()).ValueOrDie());
-  root = hlo_module->entry_computation()->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kMaximum);
+  EXPECT_THAT(hlo_module->entry_computation()->root_instruction(),
+              op::Maximum(lhs, rhs));
 
   // Verify execution on CPU.
   auto result = ExecuteAndTransfer(std::move(hlo_module), {});
@@ -97,7 +100,7 @@ TEST_F(InlinerTest, MapConstant) {
   Inliner inliner;
   EXPECT_TRUE(inliner.Run(hlo_module.get()).ValueOrDie());
   root = hlo_module->entry_computation()->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kBroadcast);
+  EXPECT_THAT(root, op::Broadcast(op::Constant()));
 
   // Verify execution on CPU.
   auto result = ExecuteAndTransfer(std::move(hlo_module), {});
diff --git a/tensorflow/compiler/xla/service/instruction_fusion_test.cc b/tensorflow/compiler/xla/service/instruction_fusion_test.cc
index a4c269f0eb..bd1372b827 100644
--- a/tensorflow/compiler/xla/service/instruction_fusion_test.cc
+++ b/tensorflow/compiler/xla/service/instruction_fusion_test.cc
@@ -15,8 +15,11 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/instruction_fusion.h"
 
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 
 using InstructionFusionTest = HloTestBase;
@@ -60,7 +63,7 @@ TEST_F(InstructionFusionTest,
       InstructionFusion(InstructionFusion::IsExpensive, /*may_duplicate=*/true)
           .Run(module.get())
           .ValueOrDie());
-  EXPECT_EQ(HloOpcode::kFusion, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Fusion());
 }
 
 TEST_F(InstructionFusionTest,
@@ -80,7 +83,7 @@ TEST_F(InstructionFusionTest,
       InstructionFusion(InstructionFusion::IsExpensive, /*may_duplicate=*/true)
           .Run(module.get())
           .ValueOrDie());
-  EXPECT_EQ(HloOpcode::kFusion, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Fusion());
 }
 
 TEST_F(InstructionFusionTest,
@@ -100,7 +103,7 @@ TEST_F(InstructionFusionTest,
       InstructionFusion(InstructionFusion::IsExpensive, /*may_duplicate=*/true)
           .Run(module.get())
           .ValueOrDie());
-  EXPECT_EQ(HloOpcode::kFusion, computation->root_instruction()->opcode());
+  EXPECT_THAT(computation->root_instruction(), op::Fusion());
 }
 
 TEST_F(InstructionFusionTest, PotentialBitcastReshapeOfParameterUnfused) {
diff --git a/tensorflow/compiler/xla/service/layout_assignment_test.cc b/tensorflow/compiler/xla/service/layout_assignment_test.cc
index 5692199f5a..3a3d2d30d7 100644
--- a/tensorflow/compiler/xla/service/layout_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment_test.cc
@@ -26,6 +26,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/computation_layout.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_layout.h"
@@ -39,6 +40,8 @@ limitations under the License.
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
@@ -305,11 +308,9 @@ TEST_F(LayoutAssignmentTest, ConflictingLayoutTuple) {
   EXPECT_TRUE(ShapeUtil::Equal(ShapeUtil::GetSubshape(result_shape, {1}),
                                root->operand(1)->shape()));
 
-  // Verify some of the structure of the HLO graph.
-  EXPECT_EQ(constant, root->operand(0)->operand(0));
-  EXPECT_EQ(HloOpcode::kCopy, root->operand(1)->operand(0)->opcode());
-  EXPECT_EQ(HloOpcode::kConstant,
-            root->operand(1)->operand(0)->operand(0)->opcode());
+  // Verify the structure of the HLO graph.
+  EXPECT_THAT(root,
+              op::Tuple(op::Tuple(constant), op::Tuple(op::Copy(constant))));
 }
 
 TEST_F(LayoutAssignmentTest, ElementwiseAndReshape) {
diff --git a/tensorflow/compiler/xla/service/reshape_mover_test.cc b/tensorflow/compiler/xla/service/reshape_mover_test.cc
index 09a673ea80..1831d775d4 100644
--- a/tensorflow/compiler/xla/service/reshape_mover_test.cc
+++ b/tensorflow/compiler/xla/service/reshape_mover_test.cc
@@ -20,14 +20,18 @@ limitations under the License.
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 using ReshapeMoverTest = HloTestBase;
@@ -43,14 +47,19 @@ TEST_F(ReshapeMoverTest, ReshapesWithDifferentInputShapesNotMoved) {
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param0));
   auto reshape1 =
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param1));
-  auto add = builder.AddInstruction(HloInstruction::CreateBinary(
+  builder.AddInstruction(HloInstruction::CreateBinary(
       root_shape, HloOpcode::kAdd, reshape0, reshape1));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  EXPECT_EQ(add, computation->root_instruction());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Add(op::Reshape(param0), op::Reshape(param1)));
+
   EXPECT_FALSE(ReshapeMover().Run(module.get()).ValueOrDie());
-  EXPECT_EQ(add, computation->root_instruction());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Add(op::Reshape(param0), op::Reshape(param1)));
 }
 
 TEST_F(ReshapeMoverTest, ScalarReshapesNotMoved) {
@@ -64,14 +73,20 @@ TEST_F(ReshapeMoverTest, ScalarReshapesNotMoved) {
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param0));
   auto reshape1 =
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param1));
-  auto add = builder.AddInstruction(HloInstruction::CreateBinary(
+  builder.AddInstruction(HloInstruction::CreateBinary(
       root_shape, HloOpcode::kAdd, reshape0, reshape1));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  EXPECT_EQ(add, computation->root_instruction());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Add(op::Reshape(param0), op::Reshape(param1)));
+
   EXPECT_FALSE(ReshapeMover().Run(module.get()).ValueOrDie());
-  EXPECT_EQ(add, computation->root_instruction());
+
+  EXPECT_THAT(
+      computation->root_instruction(),
+      op::Add(op::Reshape(op::Parameter()), op::Reshape(op::Parameter())));
 }
 
 TEST_F(ReshapeMoverTest, EquivalentReshapesMoved) {
@@ -85,18 +100,20 @@ TEST_F(ReshapeMoverTest, EquivalentReshapesMoved) {
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param0));
   auto reshape1 =
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param1));
-  auto add = builder.AddInstruction(HloInstruction::CreateBinary(
+  builder.AddInstruction(HloInstruction::CreateBinary(
       root_shape, HloOpcode::kAdd, reshape0, reshape1));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  EXPECT_EQ(add, computation->root_instruction());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Add(op::Reshape(param0), op::Reshape(param1)));
   EXPECT_TRUE(ReshapeMover().Run(module.get()).ValueOrDie());
 
-  auto new_root = computation->root_instruction();
-  EXPECT_NE(add, new_root);
-  EXPECT_EQ(HloOpcode::kReshape, new_root->opcode());
-  EXPECT_EQ(root_shape.DebugString(), new_root->shape().DebugString());
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Add(param0, param1)));
+  EXPECT_EQ(root_shape.DebugString(),
+            computation->root_instruction()->shape().DebugString());
 }
 
 TEST_F(ReshapeMoverTest, ConstantAndReshapeMoved) {
@@ -108,18 +125,21 @@ TEST_F(ReshapeMoverTest, ConstantAndReshapeMoved) {
       LiteralUtil::CreateR2<float>({{1, 2, 3}, {4, 5, 6}})));
   auto reshape0 =
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param0));
-  auto add = builder.AddInstruction(HloInstruction::CreateBinary(
+  builder.AddInstruction(HloInstruction::CreateBinary(
       root_shape, HloOpcode::kAdd, reshape0, const1));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  EXPECT_EQ(add, computation->root_instruction());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Add(op::Reshape(param0), const1));
+
   EXPECT_TRUE(ReshapeMover().Run(module.get()).ValueOrDie());
 
-  auto new_root = computation->root_instruction();
-  EXPECT_NE(add, new_root);
-  EXPECT_EQ(HloOpcode::kReshape, new_root->opcode());
-  EXPECT_EQ(root_shape.DebugString(), new_root->shape().DebugString());
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Add(param0, op::Reshape(const1))));
+  EXPECT_EQ(root_shape.DebugString(),
+            computation->root_instruction()->shape().DebugString());
 }
 
 TEST_F(ReshapeMoverTest, EquivalentReshapesMovedAcrossFusion) {
@@ -141,13 +161,16 @@ TEST_F(ReshapeMoverTest, EquivalentReshapesMovedAcrossFusion) {
   auto fusion = computation->AddInstruction(HloInstruction::CreateFusion(
       add->shape(), HloInstruction::FusionKind::kLoop, add));
   TF_CHECK_OK(computation->ReplaceInstruction(add, fusion));
-  EXPECT_EQ(fusion, computation->root_instruction());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Fusion(op::Reshape(param0), op::Reshape(param1)));
+
   EXPECT_TRUE(ReshapeMover().Run(module.get()).ValueOrDie());
 
-  auto new_root = computation->root_instruction();
-  EXPECT_NE(fusion, new_root);
-  EXPECT_EQ(HloOpcode::kReshape, new_root->opcode());
-  EXPECT_EQ(root_shape.DebugString(), new_root->shape().DebugString());
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Fusion(param0, param1)));
+  EXPECT_EQ(root_shape.DebugString(),
+            computation->root_instruction()->shape().DebugString());
 }
 
 TEST_F(ReshapeMoverTest, EquivalentReshapesMovedAcrossSelect) {
@@ -166,18 +189,22 @@ TEST_F(ReshapeMoverTest, EquivalentReshapesMovedAcrossSelect) {
       builder.AddInstruction(HloInstruction::CreateReshape(root_shape, param1));
   auto reshape_pred =
       builder.AddInstruction(HloInstruction::CreateReshape(pred_shape, pred));
-  auto select = builder.AddInstruction(HloInstruction::CreateTernary(
+  builder.AddInstruction(HloInstruction::CreateTernary(
       root_shape, HloOpcode::kSelect, reshape_pred, reshape0, reshape1));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  EXPECT_EQ(select, computation->root_instruction());
+
+  EXPECT_THAT(
+      computation->root_instruction(),
+      op::Select(op::Reshape(pred), op::Reshape(param0), op::Reshape(param1)));
+
   EXPECT_TRUE(ReshapeMover().Run(module.get()).ValueOrDie());
 
-  auto new_root = computation->root_instruction();
-  EXPECT_NE(select, new_root);
-  EXPECT_EQ(HloOpcode::kReshape, new_root->opcode());
-  EXPECT_EQ(root_shape.DebugString(), new_root->shape().DebugString());
+  EXPECT_THAT(computation->root_instruction(),
+              op::Reshape(op::Select(pred, param0, param1)));
+  EXPECT_EQ(root_shape.DebugString(),
+            computation->root_instruction()->shape().DebugString());
 }
 
 TEST_F(ReshapeMoverTest, ScalarReshapeNotMovedAcrossSelect) {
@@ -197,8 +224,13 @@ TEST_F(ReshapeMoverTest, ScalarReshapeNotMovedAcrossSelect) {
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  EXPECT_EQ(select, computation->root_instruction());
+  EXPECT_THAT(computation->root_instruction(),
+              op::Select(op::Reshape(pred), param0, param1));
+
   EXPECT_FALSE(ReshapeMover().Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Select(op::Reshape(pred), param0, param1));
   EXPECT_EQ(select, computation->root_instruction());
 }
 
@@ -236,21 +268,22 @@ TEST_F(ReshapeMoverTest, MultiplePasses) {
       builder.AddInstruction(HloInstruction::CreateReshape(shape3, param2));
   auto reshape3 =
       builder.AddInstruction(HloInstruction::CreateReshape(shape3, add0));
-  auto add1 = builder.AddInstruction(HloInstruction::CreateBinary(
-      shape3, HloOpcode::kAdd, reshape2, reshape3));
+  builder.AddInstruction(HloInstruction::CreateBinary(shape3, HloOpcode::kAdd,
+                                                      reshape2, reshape3));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
-  EXPECT_EQ(add1, computation->root_instruction());
+
+  EXPECT_THAT(
+      computation->root_instruction(),
+      op::Add(op::Reshape(param2),
+              op::Reshape(op::Add(op::Reshape(param0), op::Reshape(param1)))));
+
   EXPECT_TRUE(ReshapeMover().Run(module.get()).ValueOrDie());
-  EXPECT_EQ(HloOpcode::kReshape, computation->root_instruction()->opcode());
-  EXPECT_EQ(HloOpcode::kAdd,
-            computation->root_instruction()->operand(0)->opcode());
-  const auto& add_params =
-      computation->root_instruction()->operand(0)->operands();
-  EXPECT_EQ(2, add_params.size());
-  EXPECT_EQ(HloOpcode::kParameter, add_params[0]->opcode());
-  EXPECT_EQ(HloOpcode::kReshape, add_params[1]->opcode());
+
+  EXPECT_THAT(
+      computation->root_instruction(),
+      op::Reshape(op::Add(param2, op::Reshape(op::Add(param0, param1)))));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc b/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
index a09559262f..808050bdab 100644
--- a/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
+++ b/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
@@ -19,6 +19,7 @@ limitations under the License.
 #include <memory>
 
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/instruction_fusion.h"
 #include "tensorflow/compiler/xla/shape_util.h"
@@ -29,6 +30,8 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/test.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
@@ -604,7 +607,7 @@ class FusionPointsToAnalysisTest : public TuplePointsToAnalysisTest {
                     .ValueOrDie());
     // Get computation root instruction (should be a kFusion).
     auto* fusion = module_->entry_computation()->root_instruction();
-    EXPECT_EQ(HloOpcode::kFusion, fusion->opcode());
+    EXPECT_THAT(fusion, op::Fusion(tuple_param0));
     // Run points-to analysis (should include fused instructions from 'fusion').
     RunAnalysis(/*include_loop_fusion_instructions=*/true);
 
diff --git a/tensorflow/compiler/xla/service/user_computation_test.cc b/tensorflow/compiler/xla/service/user_computation_test.cc
index e67254328a..032b5cfac6 100644
--- a/tensorflow/compiler/xla/service/user_computation_test.cc
+++ b/tensorflow/compiler/xla/service/user_computation_test.cc
@@ -17,12 +17,16 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
@@ -89,8 +93,7 @@ TEST_F(UserComputationTest, SimpleComputation) {
     EXPECT_EQ(3, hlo_computation->instruction_count());
     // The root of the instruction should be the parameter instruction (not the
     // outfeed).
-    EXPECT_EQ(HloOpcode::kParameter,
-              hlo_computation->root_instruction()->opcode());
+    EXPECT_THAT(hlo_computation->root_instruction(), op::Parameter());
   }
 
   {
@@ -114,8 +117,7 @@ TEST_F(UserComputationTest, SimpleComputation) {
                            computation.BuildHloComputation(
                                version_at_param.version, hlo_resolver));
     EXPECT_EQ(2, hlo_computation->instruction_count());
-    EXPECT_EQ(HloOpcode::kParameter,
-              hlo_computation->root_instruction()->opcode());
+    EXPECT_THAT(hlo_computation->root_instruction(), op::Parameter());
   }
   {
     // Test the computation at the latest version, but lowered with
@@ -132,8 +134,7 @@ TEST_F(UserComputationTest, SimpleComputation) {
     EXPECT_EQ(1, hlo_computation->instruction_count());
     // The root of the instruction should be the parameter instruction (not the
     // outfeed).
-    EXPECT_EQ(HloOpcode::kParameter,
-              hlo_computation->root_instruction()->opcode());
+    EXPECT_THAT(hlo_computation->root_instruction(), op::Parameter());
   }
 }
 
-- 
GitLab


From 585315d1b047b6473f8ed1d0745a226253410e5b Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 14 Apr 2017 09:50:13 -0400
Subject: [PATCH 0407/1563] Docker build: fix bazel installer and LICENSE
 download issue

---
 tensorflow/tools/docker/Dockerfile.devel     | 4 ++--
 tensorflow/tools/docker/Dockerfile.devel-gpu | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index 7bf7fd5719..bfac54c601 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -71,8 +71,8 @@ ENV BAZEL_VERSION 0.4.5
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
-    curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
-    curl -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE.txt && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
     chmod +x bazel-*.sh && \
     ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
     cd / && \
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 769731974a..7726cbdfbf 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -71,8 +71,8 @@ ENV BAZEL_VERSION 0.4.5
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
-    curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
-    curl -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE.txt && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
     chmod +x bazel-*.sh && \
     ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
     cd / && \
-- 
GitLab


From b3888c3c1274c83d6fbd84db2768bfebf84e5183 Mon Sep 17 00:00:00 2001
From: Dan Smilkov <smilkov@google.com>
Date: Fri, 14 Apr 2017 06:56:24 -0800
Subject: [PATCH 0408/1563] Use hash url to memorize the currently opened tab.

We already do this internally. This enables it for the open-source version. See issue: #4354
Change: 153167734
---
 tensorflow/tensorboard/dist/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/dist/index.html b/tensorflow/tensorboard/dist/index.html
index 66fce9fe9a..5f09faf31d 100644
--- a/tensorflow/tensorboard/dist/index.html
+++ b/tensorflow/tensorboard/dist/index.html
@@ -27,6 +27,6 @@ limitations under the License.
     <link rel="import" href="dist/tf-tensorboard.html">
   </head>
   <body>
-    <tf-tensorboard></tf-tensorboard>
+    <tf-tensorboard use-hash></tf-tensorboard>
   </body>
 </html>
-- 
GitLab


From 77cbe5a665bc842a3eb4a3682d69be10fb66a20b Mon Sep 17 00:00:00 2001
From: Dan Smilkov <smilkov@google.com>
Date: Fri, 14 Apr 2017 06:56:43 -0800
Subject: [PATCH 0409/1563] Embedding Projector- fix bug where
 LOGDIR/projector_config.pbtxt gets ignored, but no plugin assets exist.
 Change: 153167747

---
 .../plugins/projector/projector_plugin.py     |  5 ++-
 .../projector/projector_plugin_test.py        | 36 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 001c6e1e35..4b1c8d98e7 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -314,6 +314,7 @@ def _parse_positive_int_param(request, param_name):
 
 
 def _rel_to_abs_asset_path(fpath, config_fpath):
+  fpath = os.path.expanduser(fpath)
   if not os.path.isabs(fpath):
     return os.path.join(os.path.dirname(config_fpath), fpath)
   return fpath
@@ -502,7 +503,9 @@ class ProjectorPlugin(TBPlugin):
     return None
 
   def _append_plugin_asset_directories(self, run_path_pairs):
-    for run in self.multiplexer.PluginAssets(_PLUGIN_NAME):
+    for run, assets in self.multiplexer.PluginAssets(_PLUGIN_NAME).items():
+      if PROJECTOR_FILENAME not in assets:
+        continue
       assets_dir = os.path.join(self.run_paths[run], _PLUGINS_DIR, _PLUGIN_NAME)
       assets_path_pair = (run, os.path.abspath(assets_dir))
       run_path_pairs.append(assets_path_pair)
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index 9e2e7159d8..76cf8b48cb 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -28,7 +28,9 @@ import numpy as np
 from werkzeug import test as werkzeug_test
 from werkzeug import wrappers
 from google.protobuf import text_format
+from tensorflow.core.framework import summary_pb2
 from tensorflow.core.protobuf import saver_pb2
+from tensorflow.core.util import event_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import image_ops
@@ -86,7 +88,7 @@ class ProjectorAppTest(test.TestCase):
     run_json = self._GetJson('/data/plugin/projector/runs')
     self.assertEqual(run_json, [])
 
-  def testInfoWithValidCheckpoint(self):
+  def testInfoWithValidCheckpointNoEventsData(self):
     self._GenerateProjectorTestData()
     self._SetupWSGIApp()
 
@@ -103,6 +105,27 @@ class ProjectorAppTest(test.TestCase):
         'tensorName': 'var3'
     }])
 
+  def testInfoWithValidCheckpointAndEventsData(self):
+    self._GenerateProjectorTestData()
+    self._GenerateEventsData()
+    self._SetupWSGIApp()
+
+    run_json = self._GetJson('/data/plugin/projector/runs')
+    self.assertTrue(run_json)
+    run = run_json[0]
+    info_json = self._GetJson('/data/plugin/projector/info?run=%s' % run)
+    self.assertItemsEqual(info_json['embeddings'], [{
+        'tensorShape': [1, 2],
+        'tensorName': 'var1',
+        'bookmarksPath': 'bookmarks.json'
+    }, {
+        'tensorShape': [10, 10],
+        'tensorName': 'var2'
+    }, {
+        'tensorShape': [100, 100],
+        'tensorName': 'var3'
+    }])
+
   def testTensorWithValidCheckpoint(self):
     self._GenerateProjectorTestData()
     self._SetupWSGIApp()
@@ -401,6 +424,17 @@ class ProjectorAppTest(test.TestCase):
       data = gzip.GzipFile('', 'rb', 9, io.BytesIO(data)).read()
     return json.loads(data.decode('utf-8'))
 
+  def _GenerateEventsData(self):
+    fw = writer.FileWriter(self.log_dir)
+    event = event_pb2.Event(
+        wall_time=1,
+        step=1,
+        summary=summary_pb2.Summary(
+            value=[summary_pb2.Summary.Value(
+                tag='s1', simple_value=0)]))
+    fw.add_event(event)
+    fw.close()
+
   def _GenerateProjectorTestData(self):
     config_path = os.path.join(self.log_dir, 'projector_config.pbtxt')
     config = projector_config_pb2.ProjectorConfig()
-- 
GitLab


From f4f065c27846290b695f832ddd081769f91e42b6 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 14 Apr 2017 11:20:57 -0400
Subject: [PATCH 0410/1563] Docker build: fix bazel installer and LICENSE
 download issue (#9217)

---
 tensorflow/tools/docker/Dockerfile.devel     | 4 ++--
 tensorflow/tools/docker/Dockerfile.devel-gpu | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index 7bf7fd5719..bfac54c601 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -71,8 +71,8 @@ ENV BAZEL_VERSION 0.4.5
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
-    curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
-    curl -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE.txt && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
     chmod +x bazel-*.sh && \
     ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
     cd / && \
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 769731974a..7726cbdfbf 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -71,8 +71,8 @@ ENV BAZEL_VERSION 0.4.5
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
-    curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
-    curl -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE.txt && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
     chmod +x bazel-*.sh && \
     ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
     cd / && \
-- 
GitLab


From 0c446d2674f261b57e45634e43ad87ebe1ffc48e Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 6 Apr 2017 13:21:48 -0400
Subject: [PATCH 0411/1563] In non-devel Docker images, positively confirm
 --allow-root (#9021)

to avoid an error that started to happen recently:
[C 10:09:34.858 NotebookApp] Running as root is not recommended. Use
--allow-root to bypass.

E.g., see
http://ci.tensorflow.org/view/Nightly/job/nightly-docker-cpu/TF_DOCKER_BUILD_IS_DEVEL=NO,TF_DOCKER_BUILD_PYTHON_VERSION=PYTHON2,label=gcs-access/361/console
---
 tensorflow/tools/docker/Dockerfile     | 2 +-
 tensorflow/tools/docker/Dockerfile.gpu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/docker/Dockerfile b/tensorflow/tools/docker/Dockerfile
index b61eb5db37..5b3f1f936a 100644
--- a/tensorflow/tools/docker/Dockerfile
+++ b/tensorflow/tools/docker/Dockerfile
@@ -66,4 +66,4 @@ EXPOSE 8888
 
 WORKDIR "/notebooks"
 
-CMD ["/run_jupyter.sh"]
+CMD ["/run_jupyter.sh", "--allow-root"]
diff --git a/tensorflow/tools/docker/Dockerfile.gpu b/tensorflow/tools/docker/Dockerfile.gpu
index b2b39501cd..88876421f5 100644
--- a/tensorflow/tools/docker/Dockerfile.gpu
+++ b/tensorflow/tools/docker/Dockerfile.gpu
@@ -69,4 +69,4 @@ EXPOSE 8888
 
 WORKDIR "/notebooks"
 
-CMD ["/run_jupyter.sh"]
+CMD ["/run_jupyter.sh", "--allow-root"]
-- 
GitLab


From 69c064d3fe310676196f76f5a5eda45bf81845cf Mon Sep 17 00:00:00 2001
From: "Joshua V. Dillon" <jvdillon@google.com>
Date: Fri, 14 Apr 2017 07:43:41 -0800
Subject: [PATCH 0412/1563] Unhide bijectors. Correct TransformedDistribution
 docstring. Change: 153170745

---
 .../kernel_tests/stochastic_tensor_test.py    | 40 +++++-----
 tensorflow/contrib/distributions/__init__.py  | 10 ++-
 .../bijectors/affine_linear_operator_test.py  |  8 +-
 .../kernel_tests/bijectors/affine_test.py     | 74 +++++++++---------
 .../kernel_tests/bijectors/bijector_test.py   |  8 +-
 .../kernel_tests/bijectors/chain_test.py      | 25 +++---
 .../bijectors/cholesky_outer_product_test.py  |  4 +-
 .../bijectors/conditional_bijector_test.py    |  4 +-
 .../python/kernel_tests/bijectors/exp_test.py | 15 ++--
 .../kernel_tests/bijectors/identity_test.py   | 10 +--
 .../kernel_tests/bijectors/inline_test.py     | 10 +--
 .../kernel_tests/bijectors/invert_test.py     |  4 +-
 .../bijectors/power_transform_test.py         | 15 ++--
 .../bijectors/sigmoid_centered_test.py        |  4 +-
 .../kernel_tests/bijectors/sigmoid_test.py    | 33 +++-----
 .../bijectors/softmax_centered_test.py        | 16 ++--
 .../kernel_tests/bijectors/softplus_test.py   | 25 +++---
 ...nditional_transformed_distribution_test.py |  4 +-
 .../python/ops/bijectors/__init__.py          |  6 +-
 .../python/ops/relaxed_bernoulli.py           |  6 +-
 .../python/ops/transformed_distribution.py    | 76 ++++++-------------
 .../python/ops/vector_student_t.py            |  2 +-
 22 files changed, 186 insertions(+), 213 deletions(-)

diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
index c7f185aab8..859f0e4b17 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
@@ -19,16 +19,16 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-from tensorflow.contrib import distributions as distributions_lib
+
 from tensorflow.contrib.bayesflow.python.ops import stochastic_gradient_estimators
 from tensorflow.contrib.bayesflow.python.ops import stochastic_tensor_impl
+from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
-distributions = distributions_lib
 sge = stochastic_gradient_estimators
 st = stochastic_tensor_impl
 
@@ -42,18 +42,18 @@ class StochasticTensorTest(test.TestCase):
       sigma2 = constant_op.constant([0.1, 0.2, 0.3])
 
       prior_default = st.StochasticTensor(
-          distributions.Normal(loc=mu, scale=sigma))
+          normal.Normal(loc=mu, scale=sigma))
       self.assertTrue(isinstance(prior_default.value_type, st.SampleValue))
       prior_0 = st.StochasticTensor(
-          distributions.Normal(loc=mu, scale=sigma),
+          normal.Normal(loc=mu, scale=sigma),
           dist_value_type=st.SampleValue())
       self.assertTrue(isinstance(prior_0.value_type, st.SampleValue))
 
       with st.value_type(st.SampleValue()):
-        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.SampleValue))
         likelihood = st.StochasticTensor(
-            distributions.Normal(loc=prior, scale=sigma2))
+            normal.Normal(loc=prior, scale=sigma2))
         self.assertTrue(isinstance(likelihood.value_type, st.SampleValue))
 
       coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
@@ -82,7 +82,7 @@ class StochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
 
       with st.value_type(st.MeanValue()):
-        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior.value_type, st.MeanValue))
 
       prior_mean = prior.mean()
@@ -99,7 +99,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue()):
         prior_single = st.StochasticTensor(
-            distributions.Normal(loc=mu, scale=sigma))
+            normal.Normal(loc=mu, scale=sigma))
 
       prior_single_value = prior_single.value()
       self.assertEqual(prior_single_value.get_shape(), (2, 3))
@@ -109,7 +109,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(1)):
         prior_single = st.StochasticTensor(
-            distributions.Normal(loc=mu, scale=sigma))
+            normal.Normal(loc=mu, scale=sigma))
         self.assertTrue(isinstance(prior_single.value_type, st.SampleValue))
 
       prior_single_value = prior_single.value()
@@ -120,7 +120,7 @@ class StochasticTensorTest(test.TestCase):
 
       with st.value_type(st.SampleValue(2)):
         prior_double = st.StochasticTensor(
-            distributions.Normal(loc=mu, scale=sigma))
+            normal.Normal(loc=mu, scale=sigma))
 
       prior_double_value = prior_double.value()
       self.assertEqual(prior_double_value.get_shape(), (2, 2, 3))
@@ -133,10 +133,10 @@ class StochasticTensorTest(test.TestCase):
       mu = [0.0, -1.0, 1.0]
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       with st.value_type(st.MeanValue()):
-        prior = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        prior = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
         entropy = prior.entropy()
         deep_entropy = prior.distribution.entropy()
-        expected_deep_entropy = distributions.Normal(
+        expected_deep_entropy = normal.Normal(
             loc=mu, scale=sigma).entropy()
         entropies = sess.run([entropy, deep_entropy, expected_deep_entropy])
         self.assertAllEqual(entropies[2], entropies[0])
@@ -149,7 +149,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With default
       with st.value_type(st.MeanValue(stop_gradient=True)):
-        dt = st.StochasticTensor(distributions.Normal(loc=mu, scale=sigma))
+        dt = st.StochasticTensor(normal.Normal(loc=mu, scale=sigma))
       loss = dt.loss([constant_op.constant(2.0)])
       self.assertTrue(loss is not None)
       self.assertAllClose(
@@ -157,7 +157,7 @@ class StochasticTensorTest(test.TestCase):
 
       # With passed-in loss_fn.
       dt = st.StochasticTensor(
-          distributions.Normal(loc=mu, scale=sigma),
+          normal.Normal(loc=mu, scale=sigma),
           dist_value_type=st.MeanValue(stop_gradient=True),
           loss_fn=sge.get_score_function_with_constant_baseline(
               baseline=constant_op.constant(8.0)))
@@ -192,7 +192,7 @@ class ObservedStochasticTensorTest(test.TestCase):
       sigma = constant_op.constant([1.1, 1.2, 1.3])
       obs = array_ops.zeros((2, 3))
       z = st.ObservedStochasticTensor(
-          distributions.Normal(loc=mu, scale=sigma), value=obs)
+          normal.Normal(loc=mu, scale=sigma), value=obs)
       [obs_val, z_val] = sess.run([obs, z.value()])
       self.assertAllEqual(obs_val, z_val)
 
@@ -204,13 +204,13 @@ class ObservedStochasticTensorTest(test.TestCase):
     sigma = array_ops.placeholder(dtypes.float32)
     obs = array_ops.placeholder(dtypes.float32)
     z = st.ObservedStochasticTensor(
-        distributions.Normal(loc=mu, scale=sigma), value=obs)
+        normal.Normal(loc=mu, scale=sigma), value=obs)
 
     mu2 = array_ops.placeholder(dtypes.float32, shape=[None])
     sigma2 = array_ops.placeholder(dtypes.float32, shape=[None])
     obs2 = array_ops.placeholder(dtypes.float32, shape=[None, None])
     z2 = st.ObservedStochasticTensor(
-        distributions.Normal(loc=mu2, scale=sigma2), value=obs2)
+        normal.Normal(loc=mu2, scale=sigma2), value=obs2)
 
     coll = ops.get_collection(st.STOCHASTIC_TENSOR_COLLECTION)
     self.assertEqual(coll, [z, z2])
@@ -221,17 +221,17 @@ class ObservedStochasticTensorTest(test.TestCase):
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(loc=mu, scale=sigma),
+        normal.Normal(loc=mu, scale=sigma),
         value=array_ops.zeros((3,)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(loc=mu, scale=sigma),
+        normal.Normal(loc=mu, scale=sigma),
         value=array_ops.zeros((3, 1)))
     self.assertRaises(
         ValueError,
         st.ObservedStochasticTensor,
-        distributions.Normal(loc=mu, scale=sigma),
+        normal.Normal(loc=mu, scale=sigma),
         value=array_ops.zeros((1, 2), dtype=dtypes.int32))
 
 
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index e17197080a..257aefa857 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -90,10 +90,9 @@ from __future__ import print_function
 
 # pylint: disable=unused-import,wildcard-import,line-too-long,g-importing-member
 
-
+from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops.bernoulli import *
 from tensorflow.contrib.distributions.python.ops.beta import *
-from tensorflow.contrib.distributions.python.ops.bijectors import *
 from tensorflow.contrib.distributions.python.ops.binomial import *
 from tensorflow.contrib.distributions.python.ops.categorical import *
 from tensorflow.contrib.distributions.python.ops.chi2 import *
@@ -136,8 +135,11 @@ from tensorflow.contrib.distributions.python.ops.wishart import *
 from tensorflow.python.util.all_util import remove_undocumented
 
 _allowed_symbols = [
-    'ConditionalDistribution', 'ConditionalTransformedDistribution',
-    'FULLY_REPARAMETERIZED', 'NOT_REPARAMETERIZED'
+    'bijectors',
+    'ConditionalDistribution',
+    'ConditionalTransformedDistribution',
+    'FULLY_REPARAMETERIZED',
+    'NOT_REPARAMETERIZED',
 ]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
index d4f83567e4..0738754b21 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_linear_operator_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.contrib import linalg
-from tensorflow.contrib.distributions.python.ops.bijectors import affine_linear_operator as affine_linear_operator_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.affine_linear_operator import AffineLinearOperator
 from tensorflow.python.platform import test
 
 
@@ -29,7 +29,7 @@ class AffineLinearOperatorTest(test.TestCase):
 
   def testIdentity(self):
     with self.test_session():
-      affine = affine_linear_operator_lib.AffineLinearOperator(
+      affine = AffineLinearOperator(
           validate_args=True)
       x = np.array([[1, 0, -1], [2, 3, 4]], dtype=np.float32)
       y = x
@@ -48,7 +48,7 @@ class AffineLinearOperatorTest(test.TestCase):
       diag = np.array([[1, 2, 3],
                        [2, 5, 6]], dtype=np.float32)
       scale = linalg.LinearOperatorDiag(diag, is_non_singular=True)
-      affine = affine_linear_operator_lib.AffineLinearOperator(
+      affine = AffineLinearOperator(
           shift=shift, scale=scale, validate_args=True)
 
       x = np.array([[1, 0, -1], [2, 3, 4]], dtype=np.float32)
@@ -73,7 +73,7 @@ class AffineLinearOperatorTest(test.TestCase):
                         [4, 3, 2]]],
                       dtype=np.float32)
       scale = linalg.LinearOperatorTriL(tril, is_non_singular=True)
-      affine = affine_linear_operator_lib.AffineLinearOperator(
+      affine = AffineLinearOperator(
           shift=shift, scale=scale, validate_args=True)
 
       x = np.array([[[1, 0, -1],
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
index 5d6e4d9197..13554f7664 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
@@ -22,8 +22,8 @@ import itertools
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import affine as affine_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors.affine import Affine
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -36,7 +36,7 @@ class AffineBijectorTest(test.TestCase):
     with self.test_session():
       mu = -1.
       # scale corresponds to 1.
-      bijector = affine_lib.Affine(shift=mu, event_ndims=0)
+      bijector = Affine(shift=mu, event_ndims=0)
       self.assertEqual("affine", bijector.name)
 
   def testNoBatchScalarViaIdentity(self):
@@ -53,7 +53,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu, scale_identity_multiplier=2., event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 2, 3]  # Three scalar samples (no batches).
@@ -76,7 +76,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[2.], event_ndims=0)
+        bijector = Affine(shift=mu, scale_diag=[2.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 2, 3]  # Three scalar samples (no batches).
         self.assertAllClose([1., 3, 5], run(bijector.forward, x))
@@ -98,7 +98,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2.
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu, scale_identity_multiplier=2., event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [[1., 2, 3], [4, 5, 6]]  # Weird sample shape.
@@ -126,7 +126,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1.]
         # One batch, scalar.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, event_ndims=0)
+        bijector = Affine(shift=mu, event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1.]  # One sample from one batches.
         self.assertAllClose([2.], run(bijector.forward, x))
@@ -148,7 +148,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1.]
         # One batch, scalar.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[1.], event_ndims=0)
+        bijector = Affine(shift=mu, scale_diag=[1.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1.]  # One sample from one batches.
         self.assertAllClose([2.], run(bijector.forward, x))
@@ -170,7 +170,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Univariate, two batches.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, event_ndims=0)
+        bijector = Affine(shift=mu, event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 1]  # One sample from each of two batches.
         self.assertAllClose([2., 0], run(bijector.forward, x))
@@ -192,7 +192,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Univariate, two batches.
         # Corresponds to scale = 1.
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[1.], event_ndims=0)
+        bijector = Affine(shift=mu, scale_diag=[1.], event_ndims=0)
         self.assertEqual(0, bijector.event_ndims.eval())  # "is scalar"
         x = [1., 1]  # One sample from each of two batches.
         self.assertAllClose([2., 0], run(bijector.forward, x))
@@ -214,7 +214,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Multivariate
         # Corresponds to scale = [[1., 0], [0, 1.]]
-        bijector = affine_lib.Affine(shift=mu)
+        bijector = Affine(shift=mu)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 1]
         # matmul(sigma, x) + shift
@@ -245,7 +245,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [1., -1]
         # Multivariate
         # Corresponds to scale = [[2., 0], [0, 1.]]
-        bijector = affine_lib.Affine(shift=mu, scale_diag=[2., 1])
+        bijector = Affine(shift=mu, scale_diag=[2., 1])
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 1]
         # matmul(sigma, x) + shift
@@ -287,7 +287,7 @@ class AffineBijectorTest(test.TestCase):
           event_ndims: event_ndims_value
       }
 
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu, scale_diag=scale_diag, event_ndims=event_ndims)
       self.assertEqual(1, sess.run(bijector.event_ndims, feed_dict))
       self.assertAllClose([[3., 1]], sess.run(bijector.forward(x), feed_dict))
@@ -311,7 +311,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [[1., -1]]
         # Corresponds to 1 2x2 matrix, with twos on the diagonal.
         scale = 2.
-        bijector = affine_lib.Affine(shift=mu, scale_identity_multiplier=scale)
+        bijector = Affine(shift=mu, scale_identity_multiplier=scale)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[[1., 1]]]
         self.assertAllClose([[[3., 1]]], run(bijector.forward, x))
@@ -334,7 +334,7 @@ class AffineBijectorTest(test.TestCase):
         mu = [[1., -1]]
         # Corresponds to 1 2x2 matrix, with twos on the diagonal.
         scale_diag = [[2., 2]]
-        bijector = affine_lib.Affine(shift=mu, scale_diag=scale_diag)
+        bijector = Affine(shift=mu, scale_diag=scale_diag)
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[[1., 1]]]
         self.assertAllClose([[[3., 1]]], run(bijector.forward, x))
@@ -361,7 +361,7 @@ class AffineBijectorTest(test.TestCase):
           event_ndims: event_ndims_value
       }
 
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu, scale_diag=scale_diag, event_ndims=event_ndims)
       self.assertEqual(1, sess.run(bijector.event_ndims, feed_dict))
       self.assertAllClose([[[3., 1]]], sess.run(bijector.forward(x), feed_dict))
@@ -384,7 +384,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = 2
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=1.,
             scale_diag=[1.],
@@ -410,7 +410,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[2., 0], [2, 2]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=1.,
             scale_tril=[[1., 0], [2., 1]])
@@ -435,7 +435,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[2., 0], [2, 3]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu, scale_diag=[1., 2.], scale_tril=[[1., 0], [2., 1]])
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [[1., 2]]  # One multivariate sample.
@@ -458,7 +458,7 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # scale = [[3., 0], [2, 4]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=1.0,
             scale_diag=[1., 2.],
@@ -484,12 +484,12 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [0, 2, 0], [0, 0, 3]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_identity_multiplier=2.,
             scale_perturb_diag=[2., 1],
             scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
-        bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 2, 3])
+        bijector_ref = Affine(shift=mu, scale_diag=[10., 2, 3])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
@@ -520,12 +520,12 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [0, 3, 0], [0, 0, 5]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_diag=[2., 3, 4],
             scale_perturb_diag=[2., 1],
             scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
-        bijector_ref = affine_lib.Affine(shift=mu, scale_diag=[10., 3, 5])
+        bijector_ref = Affine(shift=mu, scale_diag=[10., 3, 5])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
         x = [1., 2, 3]  # Vector.
@@ -555,12 +555,12 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[10, 0, 0], [1, 3, 0], [2, 3, 5]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_tril=[[2., 0, 0], [1, 3, 0], [2, 3, 4]],
             scale_perturb_diag=[2., 1],
             scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
-        bijector_ref = affine_lib.Affine(
+        bijector_ref = Affine(
             shift=mu, scale_tril=[[10., 0, 0], [1, 3, 0], [2, 3, 5]])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -591,12 +591,12 @@ class AffineBijectorTest(test.TestCase):
       for run in (static_run, dynamic_run):
         mu = -1.
         # Corresponds to scale = [[6, 0, 0], [1, 3, 0], [2, 3, 5]]
-        bijector = affine_lib.Affine(
+        bijector = Affine(
             shift=mu,
             scale_tril=[[2., 0, 0], [1, 3, 0], [2, 3, 4]],
             scale_perturb_diag=None,
             scale_perturb_factor=[[2., 0], [0., 0], [0, 1]])
-        bijector_ref = affine_lib.Affine(
+        bijector_ref = Affine(
             shift=mu, scale_tril=[[6., 0, 0], [1, 3, 0], [2, 3, 5]])
 
         self.assertEqual(1, bijector.event_ndims.eval())  # "is vector"
@@ -616,7 +616,7 @@ class AffineBijectorTest(test.TestCase):
   def testNoBatchMultivariateRaisesWhenSingular(self):
     with self.test_session():
       mu = [1., -1]
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu,
           # Has zero on the diagonal.
           scale_diag=[0., 1],
@@ -628,14 +628,14 @@ class AffineBijectorTest(test.TestCase):
     with self.test_session():
       mu = [1., -1]
       # Scale corresponds to 2x2 identity matrix.
-      bijector = affine_lib.Affine(shift=mu, event_ndims=2, validate_args=True)
+      bijector = Affine(shift=mu, event_ndims=2, validate_args=True)
       bijector.forward([1., 1.]).eval()
 
   def testScaleZeroScalarRaises(self):
     with self.test_session():
       mu = -1.
       # Check Identity matrix with zero scaling.
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu,
           scale_identity_multiplier=0.0,
           event_ndims=0,
@@ -644,16 +644,16 @@ class AffineBijectorTest(test.TestCase):
         bijector.forward(1.).eval()
 
       # Check Diag matrix with zero scaling.
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=mu, scale_diag=[0.0], event_ndims=0, validate_args=True)
       with self.assertRaisesOpError("Condition x > 0"):
         bijector.forward(1.).eval()
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = affine_lib.Affine(
+      bijector = Affine(
           shift=3.6, scale_identity_multiplier=0.42, event_ndims=0)
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
   def _makeScale(self,
@@ -733,9 +733,9 @@ class AffineBijectorTest(test.TestCase):
         # We haven't specified enough information for the scale.
         if scale is None:
           with self.assertRaisesRegexp(ValueError, ("must be specified.")):
-            bijector = affine_lib.Affine(shift=shift, **bijector_args)
+            bijector = Affine(shift=shift, **bijector_args)
         else:
-          bijector = affine_lib.Affine(shift=shift, **bijector_args)
+          bijector = Affine(shift=shift, **bijector_args)
           np_x = x
           # For the case a vector is passed in, we need to make the shape
           # match the matrix for matmul to work.
@@ -813,7 +813,7 @@ class AffineBijectorTest(test.TestCase):
   def testScalePropertyAssertsCorrectly(self):
     with self.test_session():
       with self.assertRaises(NotImplementedError):
-        scale = affine_lib.Affine(  # pylint:disable=unused-variable
+        scale = Affine(  # pylint:disable=unused-variable
             scale_tril=[[1., 0], [2, 1]],
             scale_perturb_factor=[2., 1.]).scale
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
index 94f3bc959b..3ba6aa5293 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
@@ -22,7 +22,7 @@ import abc
 
 import six
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector as bijector_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector import Bijector
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
@@ -36,10 +36,10 @@ class BaseBijectorTest(test.TestCase):
       with self.assertRaisesRegexp(TypeError,
                                    ("Can't instantiate abstract class Bijector "
                                     "with abstract methods __init__")):
-        bijector_lib.Bijector()
+        Bijector()
 
   def testDefaults(self):
-    class _BareBonesBijector(bijector_lib.Bijector):
+    class _BareBonesBijector(Bijector):
       """Minimal specification of a `Bijector`."""
 
       def __init__(self):
@@ -80,7 +80,7 @@ class IntentionallyMissingError(Exception):
   pass
 
 
-class BrokenBijector(bijector_lib.Bijector):
+class BrokenBijector(Bijector):
   """Forward and inverse are not inverses of each other."""
 
   def __init__(self, forward_missing=False, inverse_missing=False):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
index cb514e625b..994e21dd48 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
@@ -20,11 +20,11 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import chain as chain_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import softmax_centered as softmax_centered_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import softplus as softplus_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.chain import Chain
+from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
+from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
+from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.platform import test
 
@@ -34,8 +34,7 @@ class ChainBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      chain = chain_lib.Chain((exp_lib.Exp(event_ndims=1),
-                               softplus_lib.Softplus(event_ndims=1)))
+      chain = Chain((Exp(event_ndims=1), Softplus(event_ndims=1)))
       self.assertEqual("chain_of_exp_of_softplus", chain.name)
       x = np.asarray([[[1., 2.],
                        [2., 3.]]])
@@ -49,7 +48,7 @@ class ChainBijectorTest(test.TestCase):
 
   def testBijectorIdentity(self):
     with self.test_session():
-      chain = chain_lib.Chain()
+      chain = Chain()
       self.assertEqual("identity", chain.name)
       x = np.asarray([[[1., 2.],
                        [2., 3.]]])
@@ -60,16 +59,16 @@ class ChainBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = chain_lib.Chain((exp_lib.Exp(), softplus_lib.Softplus()))
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Chain((Exp(), Softplus()))
+      assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
     with self.test_session():
-      bijector = chain_lib.Chain([
-          softmax_centered_lib.SoftmaxCentered(
+      bijector = Chain([
+          SoftmaxCentered(
               event_ndims=1, validate_args=True),
-          softmax_centered_lib.SoftmaxCentered(
+          SoftmaxCentered(
               event_ndims=0, validate_args=True)
       ])
       x = tensor_shape.TensorShape([])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
index 7b09553be9..267e4ad350 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -57,7 +57,7 @@ class InvertBijectorTest(test.TestCase):
   def testScalarCongruency(self):
     with self.test_session():
       bijector = bijectors.Invert(bijectors.Exp())
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
index 9c2a1c8f91..26e0d2a539 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/conditional_bijector_test.py
@@ -18,12 +18,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import conditional_bijector
+from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import ConditionalBijector
 from tensorflow.python.framework import dtypes
 from tensorflow.python.platform import test
 
 
-class _TestBijector(conditional_bijector.ConditionalBijector):
+class _TestBijector(ConditionalBijector):
 
   def __init__(self):
     super(_TestBijector, self).__init__(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
index 04ddf09b69..c30ce60cac 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
@@ -20,8 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
 from tensorflow.python.platform import test
 
 
@@ -30,7 +31,7 @@ class ExpBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      bijector = exp_lib.Exp(event_ndims=1)
+      bijector = Exp(event_ndims=1)
       self.assertEqual("exp", bijector.name)
       x = [[[1.], [2.]]]
       y = np.exp(x)
@@ -44,16 +45,16 @@ class ExpBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = exp_lib.Exp()
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Exp()
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=1.5, rtol=0.05)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      bijector = exp_lib.Exp(event_ndims=0)
+      bijector = Exp(event_ndims=0)
       x = np.linspace(-10, 10, num=10).astype(np.float32)
       y = np.logspace(-10, 10, num=10).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(bijector, x, y)
+      assert_bijective_and_finite(bijector, x, y)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
index f6aabe0d63..0969c293d4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import identity as identity_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
 from tensorflow.python.platform import test
 
 
@@ -28,7 +28,7 @@ class IdentityBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      bijector = identity_lib.Identity()
+      bijector = Identity()
       self.assertEqual("identity", bijector.name)
       x = [[[0.], [1.]]]
       self.assertAllEqual(x, bijector.forward(x).eval())
@@ -38,8 +38,8 @@ class IdentityBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = identity_lib.Identity()
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Identity()
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
index c17c67c6f5..739fa6d439 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/inline_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import exp as exp_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import inline as inline_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
+from tensorflow.contrib.distributions.python.ops.bijectors.inline import Inline
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -33,8 +33,8 @@ class InlineBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      exp = exp_lib.Exp(event_ndims=1)
-      inline = inline_lib.Inline(
+      exp = Exp(event_ndims=1)
+      inline = Inline(
           forward_fn=math_ops.exp,
           inverse_fn=math_ops.log,
           inverse_log_det_jacobian_fn=(
@@ -57,7 +57,7 @@ class InlineBijectorTest(test.TestCase):
 
   def testShapeGetters(self):
     with self.test_session():
-      bijector = inline_lib.Inline(
+      bijector = Inline(
           forward_event_shape_tensor_fn=lambda x: array_ops.concat((x, [1]), 0),
           forward_event_shape_fn=lambda x: x.as_list() + [1],
           inverse_event_shape_tensor_fn=lambda x: x[:-1],
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
index 7b09553be9..267e4ad350 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
@@ -57,7 +57,7 @@ class InvertBijectorTest(test.TestCase):
   def testScalarCongruency(self):
     with self.test_session():
       bijector = bijectors.Invert(bijectors.Exp())
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=1e-3, upper_x=1.5, rtol=0.05)
 
   def testShapeGetters(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
index e95bbdf67e..b30a3b599b 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
@@ -20,8 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import power_transform as power_transform_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.power_transform import PowerTransform
 from tensorflow.python.platform import test
 
 
@@ -31,7 +32,7 @@ class PowerTransformBijectorTest(test.TestCase):
   def testBijector(self):
     with self.test_session():
       c = 0.2
-      bijector = power_transform_lib.PowerTransform(
+      bijector = PowerTransform(
           power=c, event_ndims=1, validate_args=True)
       self.assertEqual("power_transform", bijector.name)
       x = np.array([[[-1.], [2.], [-5. + 1e-4]]])
@@ -49,18 +50,18 @@ class PowerTransformBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = power_transform_lib.PowerTransform(
+      bijector = PowerTransform(
           power=0.2, validate_args=True)
-      bijector_test_util.assert_scalar_congruency(
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=1.5, rtol=0.05)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      bijector = power_transform_lib.PowerTransform(
+      bijector = PowerTransform(
           power=0.2, event_ndims=0, validate_args=True)
       x = np.linspace(-4.999, 10, num=10).astype(np.float32)
       y = np.logspace(0.001, 10, num=10).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(bijector, x, y, rtol=1e-3)
+      assert_bijective_and_finite(bijector, x, y, rtol=1e-3)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
index 8884da146d..4ff3f334cc 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_centered_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid_centered as sigmoid_centered_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid_centered import SigmoidCentered
 from tensorflow.python.platform import test
 
 
@@ -29,7 +29,7 @@ class SigmoidCenteredBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      sigmoid = sigmoid_centered_lib.SigmoidCentered()
+      sigmoid = SigmoidCentered()
       self.assertEqual("sigmoid_centered", sigmoid.name)
       x = np.log([[2., 3, 4],
                   [4., 8, 12]])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
index 40018de63f..6f1a6b1cf4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
@@ -21,8 +21,9 @@ from __future__ import print_function
 import numpy as np
 from scipy import special
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
 from tensorflow.python.platform import test
 
 
@@ -31,37 +32,27 @@ class SigmoidBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      self.assertEqual("sigmoid", sigmoid.Sigmoid().name)
+      self.assertEqual("sigmoid", Sigmoid().name)
       x = np.linspace(-10., 10., 100).reshape([2, 5, 10]).astype(np.float32)
       y = special.expit(x)
       ildj = -np.log(y) - np.log1p(-y)
-      self.assertAllClose(
-          y, sigmoid.Sigmoid().forward(x).eval(), atol=0., rtol=1e-2)
-      self.assertAllClose(
-          x, sigmoid.Sigmoid().inverse(y).eval(), atol=0., rtol=1e-4)
-      self.assertAllClose(
-          ildj,
-          sigmoid.Sigmoid().inverse_log_det_jacobian(y).eval(),
-          atol=0.,
-          rtol=1e-6)
-      self.assertAllClose(
-          -ildj,
-          sigmoid.Sigmoid().forward_log_det_jacobian(x).eval(),
-          atol=0.,
-          rtol=1e-4)
+      self.assertAllClose(y, Sigmoid().forward(x).eval(), atol=0., rtol=1e-2)
+      self.assertAllClose(x, Sigmoid().inverse(y).eval(), atol=0., rtol=1e-4)
+      self.assertAllClose(ildj, Sigmoid().inverse_log_det_jacobian(y).eval(),
+                          atol=0., rtol=1e-6)
+      self.assertAllClose(-ildj, Sigmoid().forward_log_det_jacobian(x).eval(),
+                          atol=0., rtol=1e-4)
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector_test_util.assert_scalar_congruency(
-          sigmoid.Sigmoid(), lower_x=-7., upper_x=7.)
+      assert_scalar_congruency(Sigmoid(), lower_x=-7., upper_x=7.)
 
   def testBijectiveAndFinite(self):
     with self.test_session():
       x = np.linspace(-7., 7., 100).astype(np.float32)
       eps = 1e-3
       y = np.linspace(eps, 1. - eps, 100).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(
-          sigmoid.Sigmoid(), x, y, atol=0., rtol=1e-4)
+      assert_bijective_and_finite(Sigmoid(), x, y, atol=0., rtol=1e-4)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
index 97df62ec05..173d52686d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import softmax_centered as softmax_centered_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.platform import test
 
@@ -34,7 +34,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectorScalar(self):
     with self.test_session():
-      softmax = softmax_centered_lib.SoftmaxCentered()  # scalar by default
+      softmax = SoftmaxCentered()  # scalar by default
       self.assertEqual("softmax_centered", softmax.name)
       x = np.log([[2., 3, 4],
                   [4., 8, 12]])
@@ -59,7 +59,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectorVector(self):
     with self.test_session():
-      softmax = softmax_centered_lib.SoftmaxCentered(event_ndims=1)
+      softmax = SoftmaxCentered(event_ndims=1)
       self.assertEqual("softmax_centered", softmax.name)
       x = np.log([[2., 3, 4], [4., 8, 12]])
       y = [[0.2, 0.3, 0.4, 0.1], [0.16, 0.32, 0.48, 0.04]]
@@ -80,11 +80,11 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
     with self.test_session():
       for x, y, b in ((tensor_shape.TensorShape([]),
                        tensor_shape.TensorShape([2]),
-                       softmax_centered_lib.SoftmaxCentered(
+                       SoftmaxCentered(
                            event_ndims=0, validate_args=True)),
                       (tensor_shape.TensorShape([4]),
                        tensor_shape.TensorShape([5]),
-                       softmax_centered_lib.SoftmaxCentered(
+                       SoftmaxCentered(
                            event_ndims=1, validate_args=True))):
         self.assertAllEqual(y, b.forward_event_shape(x))
         self.assertAllEqual(y.as_list(),
@@ -95,7 +95,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
 
   def testBijectiveAndFinite(self):
     with self.test_session():
-      softmax = softmax_centered_lib.SoftmaxCentered(event_ndims=1)
+      softmax = SoftmaxCentered(event_ndims=1)
       x = np.linspace(-50, 50, num=10).reshape(5, 2).astype(np.float32)
       # Make y values on the simplex with a wide range.
       y_0 = np.ones(5).astype(np.float32)
@@ -104,7 +104,7 @@ class SoftmaxCenteredBijectorTest(test.TestCase):
       y = np.array([y_0, y_1, y_2])
       y /= y.sum(axis=0)
       y = y.T  # y.shape = [5, 3]
-      bijector_test_util.assert_bijective_and_finite(softmax, x, y)
+      assert_bijective_and_finite(softmax, x, y)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
index a7db1dcc6c..2c58519fda 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
@@ -20,8 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector_test_util
-from tensorflow.contrib.distributions.python.ops.bijectors import softplus as softplus_lib
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
+from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
+from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
 from tensorflow.python.platform import test
 
 rng = np.random.RandomState(42)
@@ -42,7 +43,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorForwardInverseEventDimsZero(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       self.assertEqual("softplus", bijector.name)
       x = 2 * rng.randn(2, 10)
       y = self._softplus(x)
@@ -52,7 +53,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorLogDetJacobianEventDimsZero(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       y = 2 * rng.rand(2, 10)
       # No reduction needed if event_dims = 0.
       ildj = self._softplus_ildj_before_reduction(y)
@@ -61,7 +62,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorForwardInverseEventDimsOne(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=1)
+      bijector = Softplus(event_ndims=1)
       self.assertEqual("softplus", bijector.name)
       x = 2 * rng.randn(2, 10)
       y = self._softplus(x)
@@ -71,7 +72,7 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testBijectorLogDetJacobianEventDimsOne(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=1)
+      bijector = Softplus(event_ndims=1)
       y = 2 * rng.rand(2, 10)
       ildj_before = self._softplus_ildj_before_reduction(y)
       ildj = np.sum(ildj_before, axis=1)
@@ -80,28 +81,28 @@ class SoftplusBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
-      bijector_test_util.assert_scalar_congruency(
+      bijector = Softplus(event_ndims=0)
+      assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
   def testBijectiveAndFinite32bit(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       x = np.linspace(-20., 20., 100).astype(np.float32)
       y = np.logspace(-10, 10, 100).astype(np.float32)
-      bijector_test_util.assert_bijective_and_finite(
+      assert_bijective_and_finite(
           bijector, x, y, rtol=1e-2, atol=1e-2)
 
   def testBijectiveAndFinite16bit(self):
     with self.test_session():
-      bijector = softplus_lib.Softplus(event_ndims=0)
+      bijector = Softplus(event_ndims=0)
       # softplus(-20) is zero, so we can't use such a large range as in 32bit.
       x = np.linspace(-10., 20., 100).astype(np.float16)
       # Note that float16 is only in the open set (0, inf) for a smaller
       # logspace range.  The actual range was (-7, 4), so use something smaller
       # for the test.
       y = np.logspace(-6, 3, 100).astype(np.float16)
-      bijector_test_util.assert_bijective_and_finite(
+      assert_bijective_and_finite(
           bijector, x, y, rtol=1e-1, atol=1e-3)
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py b/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
index eacdfd9ccc..545471907f 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/conditional_transformed_distribution_test.py
@@ -22,7 +22,7 @@ import numpy as np
 
 from tensorflow.contrib import distributions
 from tensorflow.contrib.distributions.python.kernel_tests import transformed_distribution_test
-from tensorflow.contrib.distributions.python.ops.bijectors import conditional_bijector
+from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import ConditionalBijector
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -32,7 +32,7 @@ from tensorflow.python.platform import test
 ds = distributions
 
 
-class _ChooseLocation(conditional_bijector.ConditionalBijector):
+class _ChooseLocation(ConditionalBijector):
   """A Bijector which chooses between one of two location parameters."""
 
   def __init__(self, loc, name="ChooseLocation"):
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
index 2e83ed6e41..db03705608 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
@@ -14,8 +14,6 @@
 # ==============================================================================
 """Bijector Ops.
 
-See the @{$python/contrib.distributions.bijectors} guide.
-
 @@Affine
 @@AffineLinearOperator
 @@Bijector
@@ -56,3 +54,7 @@ from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered impo
 from tensorflow.contrib.distributions.python.ops.bijectors.softplus import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
+
+from tensorflow.python.util.all_util import remove_undocumented
+
+remove_undocumented(__name__)
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
index e3f6ddd8c0..2c7db7214b 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
@@ -21,7 +21,9 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import logistic
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
-from tensorflow.contrib.distributions.python.ops.bijectors import sigmoid as sigmoid_lib
+# Bijectors must be directly imported because `remove_undocumented` prevents
+# individual file imports.
+from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -177,7 +179,7 @@ class RelaxedBernoulli(transformed_distribution.TransformedDistribution):
               validate_args=validate_args,
               allow_nan_stats=allow_nan_stats,
               name=name + "/Logistic"),
-          bijector=sigmoid_lib.Sigmoid(validate_args=validate_args),
+          bijector=Sigmoid(validate_args=validate_args),
           validate_args=validate_args,
           name=name)
     self._parameters = parameters
diff --git a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
index 844f78ca96..1403adbda2 100644
--- a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
@@ -19,9 +19,11 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution as distributions
+from tensorflow.contrib.distributions.python.ops import distribution as distribution_lib
 from tensorflow.contrib.distributions.python.ops import distribution_util
-from tensorflow.contrib.distributions.python.ops.bijectors import identity as identity_lib
+# Bijectors must be directly imported because `remove_undocumented` prevents
+# individual file imports.
+from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -119,7 +121,7 @@ def _is_scalar_from_shape(shape):
   return _logical_equal(_ndims_from_shape(shape), 0)
 
 
-class TransformedDistribution(distributions.Distribution):
+class TransformedDistribution(distribution_lib.Distribution):
   """A Transformed Distribution.
 
   A `TransformedDistribution` models `p(y)` given a base distribution `p(x)`,
@@ -146,49 +148,19 @@ class TransformedDistribution(distributions.Distribution):
 
   A `TransformedDistribution` implements the following operations:
 
-    * `sample`:
+    * `sample`
+      Mathematically:   `Y = g(X)`
+      Programmatically: `bijector.forward(distribution.sample(...))`
 
-      Mathematically:
+    * `log_prob`
+      Mathematically:   `(log o pdf)(Y=y) = (log o pdf o g^{-1})(y)
+                         + (log o abs o det o J o g^{-1})(y)`
+      Programmatically: `(distribution.log_prob(bijector.inverse(y))
+                         + bijector.inverse_log_det_jacobian(y))`
 
-      ```none
-      Y = g(X)
-      ```
-
-      Programmatically:
-
-      ```python
-      return bijector.forward(distribution.sample(...))
-      ```
-
-    * `log_prob`:
-
-      Mathematically:
-
-      ```none
-      (log o pdf)(Y=y) = (log o pdf o g^{-1})(y) +
-                           (log o abs o det o J o g^{-1})(y)
-      ```
-
-      Programmatically:
-
-      ```python
-      return (distribution.log_prob(bijector.inverse(y)) +
-              bijector.inverse_log_det_jacobian(y))
-      ```
-
-    * `log_cdf`:
-
-      Mathematically:
-
-      ```none
-      (log o cdf)(Y=y) = (log o cdf o g^{-1})(y)
-      ```
-
-      Programmatically:
-
-      ```python
-      return distribution.log_cdf(bijector.inverse(x))
-      ```
+    * `log_cdf`
+      Mathematically:   `(log o cdf)(Y=y) = (log o cdf o g^{-1})(y)`
+      Programmatically: `distribution.log_cdf(bijector.inverse(x))`
 
     * and similarly for: `cdf`, `prob`, `log_survival_function`,
      `survival_function`.
@@ -199,7 +171,7 @@ class TransformedDistribution(distributions.Distribution):
   ```python
   ds = tf.contrib.distributions
   log_normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=mu, scale=sigma),
+    distribution=ds.Normal(loc=0., scale=1.),
     bijector=ds.bijectors.Exp(),
     name="LogNormalTransformedDistribution")
   ```
@@ -209,7 +181,7 @@ class TransformedDistribution(distributions.Distribution):
   ```python
   ds = tf.contrib.distributions
   log_normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=mu, scale=sigma),
+    distribution=ds.Normal(loc=0., scale=1.),
     bijector=ds.bijectors.Inline(
       forward_fn=tf.exp,
       inverse_fn=tf.log,
@@ -223,8 +195,11 @@ class TransformedDistribution(distributions.Distribution):
   ```python
   ds = tf.contrib.distributions
   normal = ds.TransformedDistribution(
-    distribution=ds.Normal(loc=0, scale=1),
-    bijector=ds.bijectors.ScaleAndShift(loc=mu, scale=sigma, event_ndims=0),
+    distribution=ds.Normal(loc=0., scale=1.),
+    bijector=ds.bijectors.Affine(
+      shift=-1.,
+      scale_identity_multiplier=2.,
+      event_ndims=0),
     name="NormalTransformedDistribution")
   ```
 
@@ -237,7 +212,6 @@ class TransformedDistribution(distributions.Distribution):
   multivariate Normal as a `TransformedDistribution`.
 
   ```python
-  bs = tf.contrib.distributions.bijector
   ds = tf.contrib.distributions
   # We will create two MVNs with batch_shape = event_shape = 2.
   mean = [[-1., 0],      # batch:0
@@ -248,7 +222,7 @@ class TransformedDistribution(distributions.Distribution):
                [2, 2]]]  # batch:1
   mvn1 = ds.TransformedDistribution(
       distribution=ds.Normal(loc=0., scale=1.),
-      bijector=bs.Affine(shift=mean, tril=chol_cov),
+      bijector=ds.bijectors.Affine(shift=mean, scale_tril=chol_cov),
       batch_shape=[2],  # Valid because base_distribution.batch_shape == [].
       event_shape=[2])  # Valid because base_distribution.event_shape == [].
   mvn2 = ds.MultivariateNormalTriL(loc=mean, scale_tril=chol_cov)
@@ -291,7 +265,7 @@ class TransformedDistribution(distributions.Distribution):
       self._empty = constant_op.constant([], dtype=dtypes.int32, name="empty")
 
       if bijector is None:
-        bijector = identity_lib.Identity(validate_args=validate_args)
+        bijector = Identity(validate_args=validate_args)
 
       # We will keep track of a static and dynamic version of
       # self._is_{batch,event}_override. This way we can do more prior to graph
diff --git a/tensorflow/contrib/distributions/python/ops/vector_student_t.py b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
index 2f4b33b7e7..8d680ab27a 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
@@ -191,7 +191,7 @@ class _VectorStudentT(transformed_distribution.TransformedDistribution):
   ```
 
   For more examples of how to construct the `scale` matrix, see the
-  `bijectors.Affine` docstring.
+  `tf.contrib.distributions.bijectors.Affine` docstring.
 
   """
 
-- 
GitLab


From 87cdfafd44ff5e332fd820608783432fea83a4c9 Mon Sep 17 00:00:00 2001
From: Nishidha <nishidha@us.ibm.com>
Date: Fri, 14 Apr 2017 21:54:00 +0530
Subject: [PATCH 0413/1563] Enabled LLVM to be built properly on Linux ppc64le
 when XLA is enabled while configure (#9211)

---
 tensorflow/BUILD                      | 6 ++++++
 tensorflow/compiler/aot/tfcompile.bzl | 1 +
 third_party/llvm/llvm.BUILD           | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index c65eb035f3..70a2362f72 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -110,6 +110,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "linux_ppc64le",
+    values = {"cpu": "ppc"},
+    visibility = ["//visibility:public"],
+)
+
 # TODO(jhseu): Enable on other platforms other than Linux.
 config_setting(
     name = "with_jemalloc",
diff --git a/tensorflow/compiler/aot/tfcompile.bzl b/tensorflow/compiler/aot/tfcompile.bzl
index 64e5bfd602..7d61bee8ca 100644
--- a/tensorflow/compiler/aot/tfcompile.bzl
+++ b/tensorflow/compiler/aot/tfcompile.bzl
@@ -282,5 +282,6 @@ def target_llvm_triple():
       "//tensorflow:android_arm": "armv7-none-android",
       "//tensorflow:android_arm64": "aarch64-none-android",
       "//tensorflow:android_x86": "i686-none-android",
+      "//tensorflow:linux_ppc64le": "ppc64le-ibm-linux-gnu",
       "//conditions:default": "x86_64-pc-linux",
   })
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 5657ef554f..0a955cb7ee 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -151,6 +151,11 @@ all_cmake_vars = select({
         cmake_vars + llvm_target_cmake_vars("X86", "x86_64-apple-darwin") +
         darwin_cmake_vars,
     ),
+    "@%ws%//tensorflow:linux_ppc64le": cmake_var_string(
+        cmake_vars +
+        llvm_target_cmake_vars("PowerPC", "powerpc64le-unknown-linux_gnu") +
+        linux_cmake_vars,
+    ),
     "//conditions:default": cmake_var_string(
         cmake_vars +
         llvm_target_cmake_vars("X86", "x86_64-unknown-linux_gnu") +
-- 
GitLab


From ba4bfd9208998d937ce740e2c2978889ec0c68be Mon Sep 17 00:00:00 2001
From: Patrick Nguyen <drpng@google.com>
Date: Fri, 14 Apr 2017 08:52:16 -0800
Subject: [PATCH 0414/1563] Add sdca ops to tf.train.

This adds:
  * tf.train.sdca_optimizer
  * tf.train.sdca_fprint
  * tf.train.sdca_shrink_l1
which were previously documented, and prior to 1.0, in tf.sdca.
In 1.0, they were absent from tf.sdca, so this does not break
compatibility.

The module tf.sdca is removed.
Change: 153176548
---
 .../python/kernel_tests/sdca_ops_test.py             |  2 +-
 .../contrib/linear_optimizer/python/ops/sdca_ops.py  |  6 +++---
 tensorflow/python/BUILD                              |  2 +-
 tensorflow/python/__init__.py                        |  2 --
 tensorflow/python/ops/hidden_ops.txt                 |  3 ---
 tensorflow/python/training/training.py               |  6 +++++-
 tensorflow/tools/api/golden/tensorflow.pbtxt         |  4 ----
 tensorflow/tools/api/golden/tensorflow.sdca.pbtxt    |  3 ---
 tensorflow/tools/api/golden/tensorflow.train.pbtxt   | 12 ++++++++++++
 9 files changed, 22 insertions(+), 18 deletions(-)
 delete mode 100644 tensorflow/tools/api/golden/tensorflow.sdca.pbtxt

diff --git a/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py b/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py
index eb1bdeff59..70f777f08b 100644
--- a/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py
+++ b/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py
@@ -1058,7 +1058,7 @@ class SdcaFprintTest(SdcaModelTest):
   def testFprint(self):
     with self._single_threaded_test_session():
       in_data = constant_op.constant(['abc', 'very looooooong string', 'def'])
-      out_data = gen_sdca_ops._sdca_fprint(in_data)
+      out_data = gen_sdca_ops.sdca_fprint(in_data)
       self.assertAllEqual([[4143508125394299908, -6879828354153669051],
                            [5849691694103072671, -4874542629849009556],
                            [603227410218889250, 8762207001949257490]],
diff --git a/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py b/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py
index d8f140f5ed..13f2f0f502 100644
--- a/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py
+++ b/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py
@@ -307,7 +307,7 @@ class SdcaModel(object):
           sparse_features_values.append(sf.feature_values)
 
       # pylint: disable=protected-access
-      example_ids_hashed = gen_sdca_ops._sdca_fprint(
+      example_ids_hashed = gen_sdca_ops.sdca_fprint(
           internal_convert_to_tensor(self._examples['example_ids']))
       # pylint: enable=protected-access
       example_state_data = self._hashtable.lookup(example_ids_hashed)
@@ -328,7 +328,7 @@ class SdcaModel(object):
           sparse_weights.append(array_ops.gather(w, sparse_indices[-1]))
 
       # pylint: disable=protected-access
-      esu, sfw, dfw = gen_sdca_ops._sdca_optimizer(
+      esu, sfw, dfw = gen_sdca_ops.sdca_optimizer(
           sparse_example_indices,
           sparse_feature_indices,
           sparse_features_values,
@@ -390,7 +390,7 @@ class SdcaModel(object):
           with ops.device(var.device):
             # pylint: disable=protected-access
             update_ops.append(
-                gen_sdca_ops._sdca_shrink_l1(
+                gen_sdca_ops.sdca_shrink_l1(
                     self._convert_n_to_tensor(
                         [var], as_ref=True),
                     l1=self._symmetric_l1_regularization(),
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index f9031a0c84..e2b07c1903 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -60,7 +60,6 @@ py_library(
         ":nn",
         ":platform",
         ":script_ops",
-        ":sdca_ops",
         ":session_ops",
         ":sets",
         ":sparse_ops",
@@ -2270,6 +2269,7 @@ py_library(
         ":random_ops",
         ":resource_variable_ops",
         ":resources",
+        ":sdca_ops",
         ":sparse_ops",
         ":state_ops",
         ":string_ops",
diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py
index 5f59836427..d2945adf75 100644
--- a/tensorflow/python/__init__.py
+++ b/tensorflow/python/__init__.py
@@ -80,7 +80,6 @@ from tensorflow.python.layers import layers
 from tensorflow.python.ops import image_ops as image
 from tensorflow.python.ops import metrics
 from tensorflow.python.ops import nn
-from tensorflow.python.ops import sdca_ops as sdca
 from tensorflow.python.ops import sets
 from tensorflow.python.ops import spectral_ops as spectral
 from tensorflow.python.ops.losses import losses
@@ -225,7 +224,6 @@ _allowed_symbols.extend([
     'python_io',
     'resource_loader',
     'saved_model',
-    'sdca',
     'sets',
     'spectral',
     'summary',
diff --git a/tensorflow/python/ops/hidden_ops.txt b/tensorflow/python/ops/hidden_ops.txt
index 4981cb6a2e..f302477068 100644
--- a/tensorflow/python/ops/hidden_ops.txt
+++ b/tensorflow/python/ops/hidden_ops.txt
@@ -301,9 +301,6 @@ PyFunc
 PyFuncStateless
 
 # sdca_ops
-SdcaFprint
-SdcaOptimizer
-SdcaShrinkL1
 
 # state_ops
 Variable
diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index f2bcc56175..bdf3d9c017 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -95,10 +95,14 @@ from __future__ import print_function
 import sys as _sys
 
 from tensorflow.python.ops import io_ops as _io_ops
+from tensorflow.python.ops import sdca_ops as _sdca_ops
 from tensorflow.python.ops import state_ops as _state_ops
 from tensorflow.python.util.all_util import remove_undocumented
 
 # pylint: disable=g-bad-import-order,unused-import
+from tensorflow.python.ops.sdca_ops import sdca_optimizer
+from tensorflow.python.ops.sdca_ops import sdca_fprint
+from tensorflow.python.ops.sdca_ops import sdca_shrink_l1
 from tensorflow.python.training.adadelta import AdadeltaOptimizer
 from tensorflow.python.training.adagrad import AdagradOptimizer
 from tensorflow.python.training.adagrad_da import AdagradDAOptimizer
@@ -224,4 +228,4 @@ _allowed_symbols = [
 # * Input methods in tf.train are documented in io_ops.
 # * Saver methods in tf.train are documented in state_ops.
 remove_undocumented(__name__, _allowed_symbols,
-                    [_sys.modules[__name__], _io_ops, _state_ops])
+                    [_sys.modules[__name__], _io_ops, _sdca_ops, _state_ops])
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index 7a1a7e7949..bc7f9bf3bd 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -420,10 +420,6 @@ tf_module {
     name: "saved_model"
     mtype: "<type \'module\'>"
   }
-  member {
-    name: "sdca"
-    mtype: "<type \'module\'>"
-  }
   member {
     name: "sets"
     mtype: "<type \'module\'>"
diff --git a/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt b/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
deleted file mode 100644
index 7c9e6a25c7..0000000000
--- a/tensorflow/tools/api/golden/tensorflow.sdca.pbtxt
+++ /dev/null
@@ -1,3 +0,0 @@
-path: "tensorflow.sdca"
-tf_module {
-}
diff --git a/tensorflow/tools/api/golden/tensorflow.train.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
index 79fd49d0ad..00c4f7709a 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.pbtxt
@@ -360,6 +360,18 @@ tf_module {
     name: "replica_device_setter"
     argspec: "args=[\'ps_tasks\', \'ps_device\', \'worker_device\', \'merge_devices\', \'cluster\', \'ps_ops\', \'ps_strategy\'], varargs=None, keywords=None, defaults=[\'0\', \'/job:ps\', \'/job:worker\', \'True\', \'None\', \'None\', \'None\'], "
   }
+  member_method {
+    name: "sdca_fprint"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "sdca_optimizer"
+    argspec: "args=[\'sparse_example_indices\', \'sparse_feature_indices\', \'sparse_feature_values\', \'dense_features\', \'example_weights\', \'example_labels\', \'sparse_indices\', \'sparse_weights\', \'dense_weights\', \'example_state_data\', \'loss_type\', \'l1\', \'l2\', \'num_loss_partitions\', \'num_inner_iterations\', \'adaptative\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
+  member_method {
+    name: "sdca_shrink_l1"
+    argspec: "args=[\'weights\', \'l1\', \'l2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "shuffle_batch"
     argspec: "args=[\'tensors\', \'batch_size\', \'capacity\', \'min_after_dequeue\', \'num_threads\', \'seed\', \'enqueue_many\', \'shapes\', \'allow_smaller_final_batch\', \'shared_name\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'None\', \'False\', \'None\', \'False\', \'None\', \'None\'], "
-- 
GitLab


From 4254fa13de1697226e15df26cc101d00d1cb1a03 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 14 Apr 2017 09:49:45 -0800
Subject: [PATCH 0415/1563] Added a new IsVariable function to detect op
 variables Change: 153182884

---
 tensorflow/core/grappler/BUILD            | 3 +++
 tensorflow/core/grappler/grappler_item.cc | 3 ++-
 tensorflow/core/grappler/op_types.cc      | 5 +++++
 tensorflow/core/grappler/op_types.h       | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index 476a9ac52a..6fcb6b9dda 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -21,6 +21,8 @@ filegroup(
         "devices.h",
         "grappler_item.cc",
         "grappler_item.h",
+        "op_types.cc",
+        "op_types.h",
         "utils.cc",
         "utils.h",
         "//tensorflow/core/grappler/clusters:android_srcs",
@@ -84,6 +86,7 @@ cc_library(
     hdrs = ["grappler_item.h"],
     visibility = ["//visibility:public"],
     deps = [
+        ":op_types",
         ":utils",
         "//tensorflow/core:framework",
         "//tensorflow/core:protos_all_cc",
diff --git a/tensorflow/core/grappler/grappler_item.cc b/tensorflow/core/grappler/grappler_item.cc
index 38db9eff7e..312a457abf 100644
--- a/tensorflow/core/grappler/grappler_item.cc
+++ b/tensorflow/core/grappler/grappler_item.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/op_types.h"
 #include "tensorflow/core/grappler/utils.h"
 
 namespace tensorflow {
@@ -37,7 +38,7 @@ std::vector<const NodeDef*> GrapplerItem::MainVariables() const {
   std::vector<const NodeDef*> fanin = ComputeTransitiveFanin(graph, init_ops);
   std::vector<const NodeDef*> vars;
   for (const NodeDef* node : fanin) {
-    if (node->op() == "Variable" || node->op() == "VariableV2") {
+    if (IsVariable(*node)) {
       vars.push_back(node);
     }
   }
diff --git a/tensorflow/core/grappler/op_types.cc b/tensorflow/core/grappler/op_types.cc
index 33ef498db0..e928e21264 100644
--- a/tensorflow/core/grappler/op_types.cc
+++ b/tensorflow/core/grappler/op_types.cc
@@ -23,5 +23,10 @@ bool IsPlaceholder(const NodeDef& node) {
   return op == "Placeholder" || op == "PlaceholderV2";
 }
 
+bool IsVariable(const NodeDef& node) {
+  const auto op = node.op();
+  return op == "Variable" || op == "VariableV2";
+}
+
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/op_types.h b/tensorflow/core/grappler/op_types.h
index 30a3c91411..2f83325c9d 100644
--- a/tensorflow/core/grappler/op_types.h
+++ b/tensorflow/core/grappler/op_types.h
@@ -22,6 +22,7 @@ namespace tensorflow {
 namespace grappler {
 
 bool IsPlaceholder(const NodeDef& node);
+bool IsVariable(const NodeDef& node);
 
 }  // end namespace grappler
 }  // end namespace tensorflow
-- 
GitLab


From 9c67e16d7f319363804977b106e33faa972ed89f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 09:51:39 -0800
Subject: [PATCH 0416/1563] [XLA] Flatten computation call graph

This CL clones computations that are called from >1 call sites in a sequential context (call, while nodes) so that the call graph becomes a tree.
Change: 153183115
---
 tensorflow/compiler/xla/service/BUILD         |  38 +++
 .../xla/service/buffer_assignment_test.cc     | 152 ++++++++---
 tensorflow/compiler/xla/service/call_graph.cc |  38 ++-
 tensorflow/compiler/xla/service/call_graph.h  |   2 +
 .../compiler/xla/service/call_graph_test.cc   |  13 +-
 tensorflow/compiler/xla/service/cpu/BUILD     |   1 +
 .../compiler/xla/service/cpu/cpu_compiler.cc  |   3 +-
 .../xla/service/flatten_call_graph.cc         | 113 +++++++++
 .../compiler/xla/service/flatten_call_graph.h |  40 +++
 .../xla/service/flatten_call_graph_test.cc    | 236 ++++++++++++++++++
 tensorflow/compiler/xla/service/gpu/BUILD     |   1 +
 .../compiler/xla/service/gpu/gpu_compiler.cc  |   3 +-
 .../compiler/xla/service/hlo_computation.cc   |  36 +++
 .../compiler/xla/service/hlo_computation.h    |   3 +
 .../xla/service/hlo_computation_test.cc       |  29 +++
 .../compiler/xla/service/hlo_instruction.cc   |   8 +-
 .../xla/service/hlo_rematerialization.cc      |   2 +-
 tensorflow/compiler/xla/tests/while_test.cc   | 228 ++++++++++++++++-
 18 files changed, 880 insertions(+), 66 deletions(-)
 create mode 100644 tensorflow/compiler/xla/service/flatten_call_graph.cc
 create mode 100644 tensorflow/compiler/xla/service/flatten_call_graph.h
 create mode 100644 tensorflow/compiler/xla/service/flatten_call_graph_test.cc

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 680dbc851f..da9d5882d5 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -185,6 +185,41 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "flatten_call_graph",
+    srcs = ["flatten_call_graph.cc"],
+    hdrs = ["flatten_call_graph.h"],
+    deps = [
+        ":call_graph",
+        ":hlo",
+        ":hlo_pass",
+        "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:util",
+        "//tensorflow/core:lib",
+    ],
+)
+
+cc_test(
+    name = "flatten_call_graph_test",
+    srcs = ["flatten_call_graph_test.cc"],
+    deps = [
+        ":call_graph",
+        ":flatten_call_graph",
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:test",
+        "//tensorflow/compiler/xla:test_helpers",
+        "//tensorflow/compiler/xla:util",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/service:hlo",
+        "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
 cc_library(
     name = "user_computation",
     srcs = ["user_computation.cc"],
@@ -615,9 +650,11 @@ cc_test(
     srcs = ["buffer_assignment_test.cc"],
     deps = [
         ":buffer_assignment",
+        ":call_graph",
         ":computation_tracker",
         ":copy_insertion",
         ":cpu_plugin",
+        ":flatten_call_graph",
         ":hlo",
         ":hlo_ordering",
         "//tensorflow/compiler/xla:literal_util",
@@ -1177,6 +1214,7 @@ cc_library(
     deps = [
         ":buffer_liveness",
         ":call_graph",
+        ":flatten_call_graph",
         ":hlo",
         ":hlo_cost_analysis",
         ":hlo_dce",
diff --git a/tensorflow/compiler/xla/service/buffer_assignment_test.cc b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
index 4fe85434a7..e6f02030aa 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
@@ -22,9 +22,11 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
+#include "tensorflow/compiler/xla/service/call_graph.h"
 #include "tensorflow/compiler/xla/service/computation_tracker.h"
 #include "tensorflow/compiler/xla/service/copy_insertion.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
+#include "tensorflow/compiler/xla/service/flatten_call_graph.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
@@ -212,30 +214,6 @@ class BufferAssignmentTest : public HloTestBase {
     return total_size;
   }
 
-  // Returns true if the buffers assigned to instructions in "a" are distinct
-  // from the buffers assigned to those in "b" (ie, intersection is empty).
-  bool BuffersDistinct(const std::vector<const HloInstruction*>& a,
-                       const std::vector<const HloInstruction*>& b,
-                       const BufferAssignment& assignment) {
-    std::set<BufferAllocation::Slice> a_slices;
-    for (const HloInstruction* instruction : a) {
-      if (assignment.HasTopLevelAllocation(instruction)) {
-        a_slices.insert(
-            assignment.GetUniqueTopLevelSlice(instruction).ConsumeValueOrDie());
-      }
-    }
-
-    for (const HloInstruction* instruction : b) {
-      if (assignment.HasTopLevelAllocation(instruction)) {
-        if (a_slices.count(assignment.GetUniqueTopLevelSlice(instruction)
-                               .ConsumeValueOrDie())) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
   // Computation tracker for nested computations.
   ComputationTracker computation_tracker_;
 
@@ -250,6 +228,30 @@ class BufferAssignmentTest : public HloTestBase {
   Shape t_s32_f32v10_ = ShapeUtil::MakeTupleShape({s32_, f32vec10_});
 };
 
+// Returns true if the buffers assigned to instructions in "a" are distinct
+// from the buffers assigned to those in "b" (ie, intersection is empty).
+static bool BuffersDistinct(const std::vector<const HloInstruction*>& a,
+                            const std::vector<const HloInstruction*>& b,
+                            const BufferAssignment& assignment) {
+  std::set<BufferAllocation::Slice> a_slices;
+  for (const HloInstruction* instruction : a) {
+    if (assignment.HasTopLevelAllocation(instruction)) {
+      a_slices.insert(
+          assignment.GetUniqueTopLevelSlice(instruction).ConsumeValueOrDie());
+    }
+  }
+
+  for (const HloInstruction* instruction : b) {
+    if (assignment.HasTopLevelAllocation(instruction)) {
+      if (a_slices.count(assignment.GetUniqueTopLevelSlice(instruction)
+                             .ConsumeValueOrDie())) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
 // Tests a computation consisting of a single scalar constant node.
 TEST_F(BufferAssignmentTest, ScalarConstant) {
   auto builder = HloComputation::Builder(TestName());
@@ -1281,11 +1283,6 @@ class WhileBufferAssignmentTest : public HloTestBase {
     return builder.Build();
   }
 
-  void RunCopyInsertion(HloModule* module) {
-    CopyInsertion copy_insertion;
-    EXPECT_IS_OK(copy_insertion.Run(module).status());
-  }
-
   std::unique_ptr<BufferAssignment> RunBufferAssignment(HloModule* module,
                                                         int64 alignment = 1) {
     auto sequence =
@@ -1305,6 +1302,11 @@ class WhileBufferAssignmentTest : public HloTestBase {
       ShapeUtil::MakeTupleShape({data_shape_, data_shape_, data_shape_});
 };
 
+static void RunCopyInsertion(HloModule* module) {
+  CopyInsertion copy_insertion;
+  EXPECT_IS_OK(copy_insertion.Run(module).status());
+}
+
 TEST_F(WhileBufferAssignmentTest, TwoForwardWhileLoops) {
   auto module = MakeUnique<HloModule>(TestName());
   auto builder = HloComputation::Builder("entry");
@@ -1407,5 +1409,97 @@ TEST_F(WhileBufferAssignmentTest, OneForwardBackwardWhileLoopSet) {
             assignment->GetUniqueSlice(while1, {1}).ConsumeValueOrDie());
 }
 
+TEST_F(BufferAssignmentTest, TwoCalls) {
+  auto module = MakeUnique<HloModule>(TestName());
+  Shape r0f32 = ShapeUtil::MakeShape(xla::F32, {});
+  HloComputation* sub_computation;
+  {
+    auto builder = HloComputation::Builder(TestName() + "_sub_comp");
+    auto param = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, r0f32, "param"));
+    auto constant1 = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0)));
+    auto add = builder.AddInstruction(
+        HloInstruction::CreateBinary(r0f32, HloOpcode::kAdd, param, constant1));
+    sub_computation = module->AddEmbeddedComputation(builder.Build(add));
+  }
+  auto builder = HloComputation::Builder(TestName());
+  auto constant2 = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(2.0)));
+  auto constant3 = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(3.0)));
+  auto call1 = builder.AddInstruction(
+      HloInstruction::CreateCall(r0f32, {constant2}, sub_computation));
+  auto call2 = builder.AddInstruction(
+      HloInstruction::CreateCall(r0f32, {constant3}, sub_computation));
+  auto add1 = builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32, HloOpcode::kAdd, call1, constant2));
+  auto add2 = builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32, HloOpcode::kAdd, call2, add1));
+  module->AddEntryComputation(builder.Build(add2));
+
+  {
+    FlattenCallGraph flatten;
+    TF_ASSIGN_OR_ASSERT_OK(bool result, flatten.Run(module.get()));
+    EXPECT_TRUE(result);
+    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
+                           CallGraph::Build(module.get()));
+  }
+
+  RunCopyInsertion(module.get());
+  auto assignment = RunBufferAssignment(module.get());
+
+  EXPECT_TRUE(BuffersDistinct({call1}, {call2}, *assignment));
+}
+
+// Test buffer assignment for while nodes with multiple uses.
+// TODO(b/37245345): Fix buffer assignment for this case.
+TEST_F(WhileBufferAssignmentTest, DISABLED_TwoWhiles) {
+  auto module = MakeUnique<HloModule>(TestName());
+  auto builder = HloComputation::Builder(TestName());
+
+  auto input0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, data_shape_, "input0"));
+  auto weights0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, data_shape_, "weights0"));
+
+  auto zero = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0.0)));
+  auto output0 = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape_, zero, {1}));
+
+  auto cond0 =
+      module->AddEmbeddedComputation(BuildWhileConditionComputation("cond"));
+  auto body0 =
+      module->AddEmbeddedComputation(BuildWhileBodyComputation("body"));
+
+  auto tuple0 = builder.AddInstruction(
+      HloInstruction::CreateTuple({input0, weights0, output0}));
+  auto while0 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond0, body0, tuple0));
+  auto while1 = builder.AddInstruction(
+      HloInstruction::CreateWhile(loop_state_shape_, cond0, body0, while0));
+
+  auto get0 = builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(data_shape_, while0, 2));
+  auto get1 = builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(data_shape_, while1, 2));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(data_shape_, HloOpcode::kAdd, get0, get1));
+  module->AddEntryComputation(builder.Build());
+
+  RunCopyInsertion(module.get());
+
+  {
+    FlattenCallGraph flatten;
+    TF_ASSIGN_OR_ASSERT_OK(bool result, flatten.Run(module.get()));
+    EXPECT_TRUE(result);
+  }
+
+  auto assignment = RunBufferAssignment(module.get());
+
+  EXPECT_TRUE(BuffersDistinct({while0}, {while1}, *assignment));
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/call_graph.cc b/tensorflow/compiler/xla/service/call_graph.cc
index ab3eae2495..57d69f5b71 100644
--- a/tensorflow/compiler/xla/service/call_graph.cc
+++ b/tensorflow/compiler/xla/service/call_graph.cc
@@ -51,6 +51,22 @@ std::ostream& operator<<(std::ostream& out, const CallContext& context) {
   return out;
 }
 
+CallContext GetInstructionCallContext(const HloInstruction* instruction) {
+  switch (instruction->opcode()) {
+    case HloOpcode::kCall:
+    case HloOpcode::kWhile:
+      return CallContext::kSequential;
+    case HloOpcode::kMap:
+    case HloOpcode::kReduce:
+    case HloOpcode::kReduceWindow:
+    case HloOpcode::kSelectAndScatter:
+    case HloOpcode::kFusion:
+      return CallContext::kParallel;
+    default:
+      return CallContext::kNone;
+  }
+}
+
 string CallSite::ToString() const {
   return StrCat(instruction()->name(), " calls in context ",
                 CallContextToString(context()), ": ",
@@ -82,26 +98,6 @@ void CallGraphNode::AddCallerCallSite(const CallSite& caller_callsite) {
   }
 }
 
-namespace {
-
-CallContext GetInstructionCallContext(const HloInstruction* instruction) {
-  switch (instruction->opcode()) {
-    case HloOpcode::kCall:
-    case HloOpcode::kWhile:
-      return CallContext::kSequential;
-    case HloOpcode::kMap:
-    case HloOpcode::kReduce:
-    case HloOpcode::kReduceWindow:
-    case HloOpcode::kSelectAndScatter:
-    case HloOpcode::kFusion:
-      return CallContext::kParallel;
-    default:
-      return CallContext::kNone;
-  }
-}
-
-}  // namespace
-
 Status CallGraphNode::AddCallSiteForInstruction(HloInstruction* instruction) {
   TF_RET_CHECK(instruction->parent() == computation());
   const CallContext context = GetInstructionCallContext(instruction);
@@ -223,7 +219,7 @@ StatusOr<std::unique_ptr<CallGraph>> CallGraph::Build(const HloModule* module) {
        module->computations()) {
     auto it_added = call_graph->node_indices_.insert(
         {computation.get(), call_graph->nodes_.size()});
-    // All computation should be unique, so the computation should not already
+    // All computations should be unique, so the computation should not already
     // exist in the map.
     TF_RET_CHECK(it_added.second);
     call_graph->nodes_.emplace_back(computation.get());
diff --git a/tensorflow/compiler/xla/service/call_graph.h b/tensorflow/compiler/xla/service/call_graph.h
index e2fed044c8..62d12f8f91 100644
--- a/tensorflow/compiler/xla/service/call_graph.h
+++ b/tensorflow/compiler/xla/service/call_graph.h
@@ -54,6 +54,8 @@ enum class CallContext {
 string CallContextToString(CallContext context);
 std::ostream& operator<<(std::ostream& out, const CallContext& context);
 
+CallContext GetInstructionCallContext(const HloInstruction* instruction);
+
 // Represents an HLO instruction which calls one or more computations.
 class CallSite {
  public:
diff --git a/tensorflow/compiler/xla/service/call_graph_test.cc b/tensorflow/compiler/xla/service/call_graph_test.cc
index 644b19c348..f71a5d01af 100644
--- a/tensorflow/compiler/xla/service/call_graph_test.cc
+++ b/tensorflow/compiler/xla/service/call_graph_test.cc
@@ -61,14 +61,15 @@ class CallGraphTest : public HloTestBase {
   // Build and return a computation which takes a scalar and calls (kCall) the
   // given computation with value 'callsites' number of times.
   std::unique_ptr<HloComputation> MakeCallingComputation(
-      HloComputation* map_computation, int64 callsites) {
-    HloComputation::Builder builder(TestName() + ".CallingComputation");
+      HloComputation* callee_computation, int64 callsites,
+      const string& suffix = ".CallingComputation") {
+    HloComputation::Builder builder(TestName() + suffix);
     HloInstruction* param0 = builder.AddInstruction(
         HloInstruction::CreateParameter(0, kScalarShape, "param0"));
     HloInstruction* last_value = param0;
     for (int64 i = 0; i < callsites; ++i) {
       last_value = builder.AddInstruction(HloInstruction::CreateCall(
-          kScalarShape, {last_value}, map_computation));
+          kScalarShape, {last_value}, callee_computation));
     }
     return builder.Build();
   }
@@ -137,7 +138,7 @@ TEST_F(CallGraphTest, ParallelComputation) {
   HloModule module(TestName());
   HloComputation* map_computation =
       module.AddEmbeddedComputation(MakeScalarComputation());
-  HloComputation* entry_computation = module.AddEmbeddedComputation(
+  HloComputation* entry_computation = module.AddEntryComputation(
       MakeMappingComputation(map_computation, /*callsites=*/5));
 
   TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
@@ -169,7 +170,7 @@ TEST_F(CallGraphTest, SequentialComputations) {
   HloModule module(TestName());
   HloComputation* called_computation =
       module.AddEmbeddedComputation(MakeScalarComputation());
-  HloComputation* entry_computation = module.AddEmbeddedComputation(
+  HloComputation* entry_computation = module.AddEntryComputation(
       MakeCallingComputation(called_computation, /*callsites=*/3));
 
   TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
@@ -210,7 +211,7 @@ TEST_F(CallGraphTest, ContextBothComputations) {
   HloInstruction* map = builder.AddInstruction(
       HloInstruction::CreateMap(kScalarShape, {call}, subcomputation));
   HloComputation* entry_computation =
-      module.AddEmbeddedComputation(builder.Build());
+      module.AddEntryComputation(builder.Build());
 
   TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
                          CallGraph::Build(&module));
diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD
index e996352811..6e24506b38 100644
--- a/tensorflow/compiler/xla/service/cpu/BUILD
+++ b/tensorflow/compiler/xla/service/cpu/BUILD
@@ -60,6 +60,7 @@ cc_library(
         "//tensorflow/compiler/xla/service:compiler",
         "//tensorflow/compiler/xla/service:copy_insertion",
         "//tensorflow/compiler/xla/service:executable",
+        "//tensorflow/compiler/xla/service:flatten_call_graph",
         "//tensorflow/compiler/xla/service:hlo",
         "//tensorflow/compiler/xla/service:hlo_constant_folding",
         "//tensorflow/compiler/xla/service:hlo_cse",
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
index 4fbdb15e70..aa5e84d65b 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
@@ -58,6 +58,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h"
 #include "tensorflow/compiler/xla/service/cpu/simple_orc_jit.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
+#include "tensorflow/compiler/xla/service/flatten_call_graph.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_constant_folding.h"
 #include "tensorflow/compiler/xla/service/hlo_cse.h"
@@ -240,7 +241,6 @@ Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
                    : TransposeFolding::OperandIndices{};
       },
       TransposeFolding::NeverFoldTranspose);
-  pipeline.AddPass<HloSubcomputationUnification>();
   pipeline.AddPass<HloCSE>(/*is_layout_sensitive=*/false);
   pipeline.AddPass<CpuInstructionFusion>();
   pipeline.AddPass<CpuLayoutAssignment>(
@@ -268,6 +268,7 @@ Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
     pipeline.AddPass<ParallelizationPreparation>();
   }
   pipeline.AddPass<HloDCE>();
+  pipeline.AddPass<FlattenCallGraph>();
   return pipeline.Run(hlo_module).status();
 }
 
diff --git a/tensorflow/compiler/xla/service/flatten_call_graph.cc b/tensorflow/compiler/xla/service/flatten_call_graph.cc
new file mode 100644
index 0000000000..3c41fe870f
--- /dev/null
+++ b/tensorflow/compiler/xla/service/flatten_call_graph.cc
@@ -0,0 +1,113 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/service/flatten_call_graph.h"
+
+#include "tensorflow/compiler/xla/service/call_graph.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_module.h"
+#include "tensorflow/compiler/xla/util.h"
+#include "tensorflow/core/lib/core/errors.h"
+
+namespace xla {
+
+namespace {
+
+// Helper to replace the called computation at a while- or call-instruction.
+void ReplaceCalledComputation(HloInstruction* instruction,
+                              HloComputation* computation,
+                              HloComputation* new_computation) {
+  switch (instruction->opcode()) {
+    case HloOpcode::kWhile: {
+      if (computation == instruction->while_condition()) {
+        instruction->set_while_condition(new_computation);
+      } else {
+        CHECK_EQ(computation, instruction->while_body());
+        instruction->set_while_body(new_computation);
+      }
+      break;
+    }
+    case HloOpcode::kCall: {
+      CHECK_EQ(instruction->to_apply(), computation);
+      instruction->set_to_apply(new_computation);
+      break;
+    }
+    default:
+      LOG(FATAL) << "unexpected opcode: "
+                 << HloOpcodeString(instruction->opcode());
+  }
+}
+
+// Flatten a single call graph node. Expects to visit nodes in postorder.
+Status FlattenNode(const CallGraphNode& node) {
+  HloComputation* computation = node.computation();
+  HloModule* module = computation->parent();
+  // Clone callee for all call-sites except the first one.
+  for (int i = 0; i < node.caller_callsites().size(); ++i) {
+    CallSite call_site = node.caller_callsites()[i];
+    // Only consider sequential call contexts.
+    if (call_site.context() == CallContext::kParallel) {
+      continue;
+    }
+    CHECK_EQ(call_site.context(), CallContext::kSequential);
+
+    // Skip first element if this computation is only called from a sequential
+    // context.
+    if (node.context() != CallContext::kBoth && i == 0) {
+      continue;
+    }
+
+    // Clone computation for the remaining sequential context call sites.
+    HloComputation* clone =
+        module->AddEmbeddedComputation(computation->Clone());
+    ReplaceCalledComputation(call_site.instruction(), computation, clone);
+    // Clone the sub-tree of all computations called from this node.
+    std::vector<HloComputation*> worklist;
+    worklist.push_back(clone);
+    while (!worklist.empty()) {
+      auto current = worklist.back();
+      worklist.pop_back();
+      for (auto& instruction : current->instructions()) {
+        if (GetInstructionCallContext(instruction.get()) !=
+            CallContext::kSequential) {
+          continue;
+        }
+        for (auto callee : instruction->called_computations()) {
+          HloComputation* callee_clone =
+              module->AddEmbeddedComputation(callee->Clone());
+          ReplaceCalledComputation(instruction.get(), callee, callee_clone);
+          worklist.push_back(callee_clone);
+        }
+      }
+    }
+  }
+  return Status::OK();
+}
+
+}  // namespace
+
+StatusOr<bool> FlattenCallGraph::Run(HloModule* module) {
+  XLA_VLOG_LINES(3, "Before flatten call graph:\n" + module->ToString());
+
+  TF_ASSIGN_OR_RETURN(std::unique_ptr<CallGraph> call_graph,
+                      CallGraph::Build(module));
+  TF_RETURN_IF_ERROR(call_graph->VisitNodes(FlattenNode));
+
+  XLA_VLOG_LINES(3, "After flatten call graph:\n" + module->ToString());
+  return true;
+}
+
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/flatten_call_graph.h b/tensorflow/compiler/xla/service/flatten_call_graph.h
new file mode 100644
index 0000000000..d3efab3614
--- /dev/null
+++ b/tensorflow/compiler/xla/service/flatten_call_graph.h
@@ -0,0 +1,40 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Flatten the call graph for an HLO module into a tree.
+
+#ifndef TENSORFLOW_COMPILER_XLA_SERVICE_FLATTEN_CALL_GRAPH_H_
+#define TENSORFLOW_COMPILER_XLA_SERVICE_FLATTEN_CALL_GRAPH_H_
+
+#include "tensorflow/compiler/xla/service/hlo_pass_interface.h"
+#include "tensorflow/compiler/xla/statusor.h"
+
+namespace xla {
+
+// Flattening associates each call site with a unique computation (for
+// sequential calling contexts) This simplifies buffer assignment and
+// points-to analysis (see b/36865746 for details).
+class FlattenCallGraph : public HloPassInterface {
+ public:
+  tensorflow::StringPiece name() const override { return "flatten-call-graph"; }
+
+  // Duplicates computations called from multiple call- or while-nodes to
+  // flatten the call graph.
+  StatusOr<bool> Run(HloModule* module) override;
+};
+
+}  // namespace xla
+
+#endif  // TENSORFLOW_COMPILER_XLA_SERVICE_FLATTEN_CALL_GRAPH_H_
diff --git a/tensorflow/compiler/xla/service/flatten_call_graph_test.cc b/tensorflow/compiler/xla/service/flatten_call_graph_test.cc
new file mode 100644
index 0000000000..6c4a48bbe8
--- /dev/null
+++ b/tensorflow/compiler/xla/service/flatten_call_graph_test.cc
@@ -0,0 +1,236 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/service/flatten_call_graph.h"
+
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/call_graph.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/compiler/xla/test.h"
+#include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+#include "tensorflow/compiler/xla/util.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+
+namespace xla {
+namespace {
+
+class FlattenCallGraphTest : public HloTestBase {
+ protected:
+  // Build and return a trivial computation taking and returning a scalar.
+  std::unique_ptr<HloComputation> MakeScalarComputation() {
+    HloComputation::Builder builder(TestName() + ".ScalarComputation");
+    HloInstruction* param0 = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, kScalarShape, "param0"));
+    builder.AddInstruction(
+        HloInstruction::CreateUnary(kScalarShape, HloOpcode::kNegate, param0));
+    return builder.Build();
+  }
+
+  // Build and return a computation which takes a scalar and maps (kMap) the
+  // given computation to the value 'callsites' number of times.
+  std::unique_ptr<HloComputation> MakeMappingComputation(
+      HloComputation* map_computation, int64 callsites) {
+    HloComputation::Builder builder(TestName() + ".MappingComputation");
+    HloInstruction* param0 = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, kScalarShape, "param0"));
+    HloInstruction* last_value = param0;
+    for (int64 i = 0; i < callsites; ++i) {
+      last_value = builder.AddInstruction(HloInstruction::CreateMap(
+          kScalarShape, {last_value}, map_computation));
+    }
+    return builder.Build();
+  }
+
+  // Build and return a computation which takes a scalar and calls (kCall) the
+  // given computation with value 'callsites' number of times.
+  std::unique_ptr<HloComputation> MakeCallingComputation(
+      HloComputation* callee_computation, int64 callsites,
+      const string& suffix = ".CallingComputation") {
+    HloComputation::Builder builder(TestName() + suffix);
+    HloInstruction* param0 = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, kScalarShape, "param0"));
+    HloInstruction* last_value = param0;
+    for (int64 i = 0; i < callsites; ++i) {
+      last_value = builder.AddInstruction(HloInstruction::CreateCall(
+          kScalarShape, {last_value}, callee_computation));
+    }
+    return builder.Build();
+  }
+
+  // Build and return a computation which takes a scalar and returns a PRED
+  // value.
+  std::unique_ptr<HloComputation> MakeConditionComputation() {
+    HloComputation::Builder builder(TestName() + ".ConditionComputation");
+    HloInstruction* param0 = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, kScalarShape, "param0"));
+    HloInstruction* zero = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0.0f)));
+    builder.AddInstruction(HloInstruction::CreateBinary(
+        ShapeUtil::MakeShape(PRED, {}), HloOpcode::kGt, param0, zero));
+    return builder.Build();
+  }
+
+  StatusOr<bool> RunFlattenCallGraph(HloModule* module) {
+    FlattenCallGraph flatten;
+    TF_ASSIGN_OR_RETURN(bool result, flatten.Run(module));
+    return result;
+  }
+
+  const Shape kScalarShape = ShapeUtil::MakeShape(F32, {});
+};
+
+TEST_F(FlattenCallGraphTest, ComplexGraph) {
+  // Test a call graph of a module with several computation called in various
+  // contexts. The call graph looks like:
+  //
+  //      entry
+  //      /  |
+  //     a   |
+  //   / | \ |
+  //  b  |  cond
+  //   \ |
+  //    c
+  //
+  // Calls are made via kCall, kWhile, and kMap instructions.
+  HloModule module(TestName());
+  HloComputation* cond_computation =
+      module.AddEmbeddedComputation(MakeConditionComputation());
+  HloComputation* c_computation =
+      module.AddEmbeddedComputation(MakeScalarComputation());
+  HloComputation* b_computation = module.AddEmbeddedComputation(
+      MakeMappingComputation(c_computation, /*callsites=*/1));
+
+  HloComputation* a_computation;
+  {
+    HloComputation::Builder builder(TestName() + ".a");
+    HloInstruction* param0 = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, kScalarShape, "param0"));
+    HloInstruction* call = builder.AddInstruction(
+        HloInstruction::CreateCall(kScalarShape, {param0}, c_computation));
+    builder.AddInstruction(HloInstruction::CreateWhile(
+        kScalarShape, cond_computation, b_computation, call));
+    a_computation = module.AddEmbeddedComputation(builder.Build());
+  }
+
+  HloComputation* entry_computation;
+  {
+    HloComputation::Builder builder(TestName() + ".entry");
+    HloInstruction* param0 = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, kScalarShape, "param0"));
+    builder.AddInstruction(HloInstruction::CreateWhile(
+        kScalarShape, cond_computation, a_computation, param0));
+    entry_computation = module.AddEntryComputation(builder.Build());
+  }
+
+  {
+    TF_ASSIGN_OR_ASSERT_OK(bool result, RunFlattenCallGraph(&module));
+    EXPECT_TRUE(result);
+    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> flat_call_graph,
+                           CallGraph::Build(&module));
+    TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* c_node,
+                           flat_call_graph->GetNode(c_computation));
+    EXPECT_EQ(1, c_node->caller_callsites().size());
+  }
+}
+
+// Test corner case of a computation used as a body and a loop condition.
+TEST_F(FlattenCallGraphTest, SharedWhileConditionAndBody) {
+  HloModule module(TestName());
+  HloComputation* cond_computation;
+  {
+    HloComputation::Builder builder(TestName() + ".cond");
+    HloInstruction* param0 =
+        builder.AddInstruction(HloInstruction::CreateParameter(
+            0, ShapeUtil::MakeShape(PRED, {}), "param0"));
+    HloInstruction* false_constant = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<bool>(false)));
+    builder.AddInstruction(
+        HloInstruction::CreateBinary(ShapeUtil::MakeShape(PRED, {}),
+                                     HloOpcode::kEq, param0, false_constant));
+    cond_computation = module.AddEmbeddedComputation(builder.Build());
+  }
+
+  HloComputation* entry_computation;
+  {
+    HloComputation::Builder builder(TestName() + ".entry");
+    HloInstruction* false_constant = builder.AddInstruction(
+        HloInstruction::CreateConstant(LiteralUtil::CreateR0<bool>(false)));
+    builder.AddInstruction(HloInstruction::CreateWhile(
+        ShapeUtil::MakeShape(PRED, {}), cond_computation, cond_computation,
+        false_constant));
+    entry_computation = module.AddEntryComputation(builder.Build());
+  }
+
+  {
+    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
+                           CallGraph::Build(&module));
+    TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* cond_node,
+                           call_graph->GetNode(cond_computation));
+    EXPECT_EQ(2, cond_node->caller_callsites().size());
+  }
+
+  {
+    TF_ASSIGN_OR_ASSERT_OK(bool result, RunFlattenCallGraph(&module));
+    EXPECT_TRUE(result);
+    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
+                           CallGraph::Build(&module));
+    TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* cond_node,
+                           call_graph->GetNode(cond_computation));
+    EXPECT_EQ(1, cond_node->caller_callsites().size());
+  }
+}
+
+// Test flattening of a nested calling computations.
+//
+//   Entry
+//    / \
+//    \ /
+//     B
+//    / \
+//    \ /
+//     C
+//
+TEST_F(FlattenCallGraphTest, FlattenCalls) {
+  HloModule module(TestName());
+  HloComputation* c_computation =
+      module.AddEmbeddedComputation(MakeScalarComputation());
+
+  HloComputation* b_computation = module.AddEmbeddedComputation(
+      MakeCallingComputation(c_computation, /*callsites=*/2, ".B"));
+
+  module.AddEntryComputation(
+      MakeCallingComputation(b_computation, /*callsites=*/2, ".Entry"));
+
+  TF_ASSIGN_OR_ASSERT_OK(bool result, RunFlattenCallGraph(&module));
+  EXPECT_TRUE(result);
+  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
+                         CallGraph::Build(&module));
+  EXPECT_EQ(7, module.computations().size());
+
+  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* c_node,
+                         call_graph->GetNode(c_computation));
+  EXPECT_EQ(1, c_node->caller_callsites().size());
+
+  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* b_node,
+                         call_graph->GetNode(b_computation));
+  EXPECT_EQ(1, b_node->caller_callsites().size());
+}
+
+}  // namespace
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/gpu/BUILD b/tensorflow/compiler/xla/service/gpu/BUILD
index e2847df81a..1fdbcfe564 100644
--- a/tensorflow/compiler/xla/service/gpu/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/BUILD
@@ -425,6 +425,7 @@ cc_library(
         "//tensorflow/compiler/xla/service:buffer_liveness",
         "//tensorflow/compiler/xla/service:compiler",
         "//tensorflow/compiler/xla/service:executable",
+        "//tensorflow/compiler/xla/service:flatten_call_graph",
         "//tensorflow/compiler/xla/service:hlo",
         "//tensorflow/compiler/xla/service:hlo_constant_folding",
         "//tensorflow/compiler/xla/service:hlo_cse",
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index 1d2111c427..161d0033a3 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -28,6 +28,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/algebraic_simplifier.h"
 #include "tensorflow/compiler/xla/service/buffer_assignment.h"
 #include "tensorflow/compiler/xla/service/buffer_liveness.h"
+#include "tensorflow/compiler/xla/service/flatten_call_graph.h"
 #include "tensorflow/compiler/xla/service/gpu/convolution_folding.h"
 #include "tensorflow/compiler/xla/service/gpu/copy_insertion.h"
 #include "tensorflow/compiler/xla/service/gpu/fusion_merger.h"
@@ -140,7 +141,6 @@ tensorflow::Status OptimizeHloModule(HloModule* hlo_module,
                                         : TransposeFolding::OperandIndices{};
         },
         TransposeFolding::NeverFoldTranspose);
-    pipeline.AddPass<HloSubcomputationUnification>();
     pipeline.AddPass<HloCSE>(/*is_layout_sensitive=*/false);
     pipeline.AddPass<HloDCE>();
     TF_RETURN_IF_ERROR(pipeline.Run(hlo_module).status());
@@ -181,6 +181,7 @@ tensorflow::Status PrepareHloModuleForIrEmitting(
   // instruction which materializes a value).
   pipeline.AddPass<GpuCopyInsertion>();
   pipeline.AddPass<HloDCE>();
+  pipeline.AddPass<FlattenCallGraph>();
   return pipeline.Run(hlo_module).status();
 }
 
diff --git a/tensorflow/compiler/xla/service/hlo_computation.cc b/tensorflow/compiler/xla/service/hlo_computation.cc
index 35f8dcb7ca..15de24fffd 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation.cc
@@ -583,4 +583,40 @@ Status HloComputation::Accept(
   return this->Accept(&visitor);
 }
 
+std::unique_ptr<HloComputation> HloComputation::Clone(const string& suffix) {
+  VLOG(1) << "Cloning " << name() << " --> " << suffix << "\n";
+  auto postorder = MakeInstructionPostOrder();
+  std::unordered_map<HloInstruction*, HloInstruction*> clone_map;
+  std::vector<std::unique_ptr<HloInstruction>> instructions;
+  std::unique_ptr<HloInstruction> new_instr = nullptr;
+  for (auto instr : postorder) {
+    std::vector<HloInstruction*> new_operands;
+    for (auto operand : instr->operands()) {
+      HloInstruction* new_operand = FindOrDie(clone_map, operand);
+      CHECK(new_operand != nullptr);
+      new_operands.push_back(new_operand);
+    }
+
+    new_instr = instr->CloneWithNewOperands(instr->shape(), new_operands);
+    InsertOrDie(&clone_map, instr, new_instr.get());
+    instructions.push_back(std::move(new_instr));
+  }
+  Builder builder(name() + suffix);
+  for (auto& instr : instructions) {
+    builder.AddInstruction(std::move(instr));
+  }
+  auto result = builder.Build(
+      /*root_instruction=*/FindOrDie(clone_map, root_instruction()));
+
+  // Clone control dependencies.
+  for (auto instr : postorder) {
+    HloInstruction* new_instr = FindOrDie(clone_map, instr);
+    for (auto successor : instr->control_successors()) {
+      TF_CHECK_OK(
+          new_instr->AddControlDependencyTo(FindOrDie(clone_map, successor)));
+    }
+  }
+  return result;
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_computation.h b/tensorflow/compiler/xla/service/hlo_computation.h
index dddcf51974..82934595e1 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.h
+++ b/tensorflow/compiler/xla/service/hlo_computation.h
@@ -220,6 +220,9 @@ class HloComputation {
   // Same as Accept() above, but the visitor is given as a function.
   Status Accept(const FunctionVisitor::VisitorFunction& visitor_func) const;
 
+  // Returns a deep copy of this computation including all instructions.
+  std::unique_ptr<HloComputation> Clone(const string& suffix = "clone");
+
   // Returns true if instructions of the given opcode can be removed from the
   // computation. Instructions such as parameters and send/receive instructions
   // cannot be removed without violating invariants of the HLO computation or
diff --git a/tensorflow/compiler/xla/service/hlo_computation_test.cc b/tensorflow/compiler/xla/service/hlo_computation_test.cc
index e82eba9b11..3812653fe3 100644
--- a/tensorflow/compiler/xla/service/hlo_computation_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation_test.cc
@@ -323,6 +323,35 @@ TEST_F(HloComputationTest, RemoveInstructionWithDuplicateOperand) {
   EXPECT_EQ(negate, computation->root_instruction());
 }
 
+TEST_F(HloComputationTest, CloneWithControlDependency) {
+  auto builder = HloComputation::Builder(TestName());
+  auto constant1 = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0f)));
+  auto constant2 = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(2.0f)));
+  auto add = builder.AddInstruction(HloInstruction::CreateBinary(
+      r0f32_, HloOpcode::kAdd, constant1, constant2));
+
+  auto param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r0f32_, "param0"));
+  auto negate = builder.AddInstruction(
+      HloInstruction::CreateUnary(r0f32_, HloOpcode::kNegate, param));
+  auto computation = builder.Build(/*root_instruction=*/add);
+
+  TF_CHECK_OK(negate->AddControlDependencyTo(add));
+
+  auto clone = computation->Clone();
+
+  auto cloned_add = clone->root_instruction();
+  EXPECT_EQ(cloned_add->opcode(), HloOpcode::kAdd);
+
+  auto predecessors = cloned_add->control_predecessors();
+  EXPECT_EQ(1, predecessors.size());
+  EXPECT_EQ(HloOpcode::kNegate, predecessors[0]->opcode());
+  auto successors = predecessors[0]->control_successors();
+  EXPECT_THAT(successors, ::testing::ElementsAre(cloned_add));
+}
+
 }  // namespace
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index d5aa80052e..0cfde79c97 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -792,9 +792,6 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneWithNewOperands(
       return CreateSelectAndScatter(shape, new_operands[0], select(), *window_,
                                     new_operands[1], new_operands[2],
                                     scatter());
-    case HloOpcode::kRecv:
-      CHECK_EQ(new_operands.size(), 0);
-      return CreateRecv(shape, channel_id_);
     case HloOpcode::kReverse:
       CHECK_EQ(new_operands.size(), 1);
       return CreateReverse(shape, new_operands[0], dimensions_);
@@ -803,9 +800,6 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneWithNewOperands(
     case HloOpcode::kReshape:
       CHECK_EQ(new_operands.size(), 1);
       return CreateReshape(shape, new_operands[0]);
-    case HloOpcode::kSend:
-      CHECK_EQ(new_operands.size(), 1);
-      return CreateSend(new_operands[0], channel_id_);
     case HloOpcode::kSlice:
       CHECK_EQ(new_operands.size(), 1);
       return CreateSlice(shape, new_operands[0], slice_starts_, slice_limits_);
@@ -832,6 +826,8 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneWithNewOperands(
     case HloOpcode::kParameter:
       return CreateParameter(parameter_number_, shape, parameter_name_);
     // Unsupported ops for cloning.
+    case HloOpcode::kRecv:
+    case HloOpcode::kSend:
     case HloOpcode::kUpdate:
     case HloOpcode::kIndex:
     case HloOpcode::kInfeed:
diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization.cc b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
index 52a0181029..101c9076f8 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
@@ -22,6 +22,7 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/map_util.h"
 #include "tensorflow/compiler/xla/primitive_util.h"
+#include "tensorflow/compiler/xla/service/flatten_call_graph.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_dce.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
@@ -754,7 +755,6 @@ StatusOr<bool> HloRematerialization::Run(
           << HumanReadableNumBytes(memory_limit_bytes);
 
   XLA_VLOG_LINES(3, "Before HloRematerialization:\n" + module->ToString());
-
   // Create initial sequence of HLO instructions.
   TF_ASSIGN_OR_RETURN(*sequence,
                       CreateMemoryMinimizingSequence(
diff --git a/tensorflow/compiler/xla/tests/while_test.cc b/tensorflow/compiler/xla/tests/while_test.cc
index 4cff199086..5a2333e338 100644
--- a/tensorflow/compiler/xla/tests/while_test.cc
+++ b/tensorflow/compiler/xla/tests/while_test.cc
@@ -26,6 +26,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/platform_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
@@ -247,6 +248,230 @@ TEST_F(WhileTest, WhileWithTupleResult) {
   ComputeAndCompareTuple(&builder, *expected, {}, ErrorSpec(0.0001));
 }
 
+// Tests two while nodes when the result type T is a Tuple and the second
+// while node uses the result of the first while node which is used in two
+// nodes.
+// tuple<int32, vector<float>> w0(0, vector<float>(10, 0.0f));
+// w0 = while (get<0>(w0) < c1) {
+//        get<0>(w0) = get<0>(w0) + 1;
+//        get<1>(w0) = get<1>(w0) + vector<float>(10, 1.0f);
+//      }
+// tuple<int32, vector<float>> w1(get<0>(w0), get<1>(w0));
+// w1 = while (get<0>(w1) < c2) {
+//        get<0>(w1) = get<0>(w1) + 1;
+//        get<1>(w1) = get<1>(w1) + vector<float>(10, 1.0f);
+//      }
+// result = get<1>(w0) + get<1>(w1)
+TEST_F(WhileTest, TwoWhileWithTupleResult) {
+  std::vector<Shape> shape_elements = {ShapeUtil::MakeShape(S32, {}),
+                                       ShapeUtil::MakeShape(F32, {10})};
+  Shape result_shape = ShapeUtil::MakeTupleShape(shape_elements);
+
+  // Create a computation for the condition.
+  // Repeat for 5 iterations.
+  Computation condition;
+  const int c1 = 5;
+  {
+    ComputationBuilder builder(client_, "condition");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    builder.Lt(iteration, builder.ConstantR0<int32>(c1));
+    TF_ASSIGN_OR_ASSERT_OK(condition, builder.Build());
+  }
+
+  Computation condition2;
+  const int c2 = 7;
+  {
+    ComputationBuilder builder(client_, "condition2");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    builder.Lt(iteration, builder.ConstantR0<int32>(c2));
+    TF_ASSIGN_OR_ASSERT_OK(condition2, builder.Build());
+  }
+
+  // Create a computation for the body.
+  // Add 1 to the iteration variable and add a constant vector of 1.0f to
+  // the weight variable, both of which are tuple elements.
+  Computation body;
+  {
+    ComputationBuilder builder(client_, "body");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    auto weights = builder.GetTupleElement(prev, 1);
+    auto input = builder.ConstantR1<float>(10, 1.f);
+    auto new_weights = builder.Add(weights, input);
+    auto result = builder.Tuple(
+        {builder.Add(iteration, builder.ConstantR0<int32>(1)), new_weights});
+    TF_ASSIGN_OR_ASSERT_OK(body, builder.Build());
+  }
+
+  Computation body2;
+  {
+    ComputationBuilder builder(client_, "body");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    auto weights = builder.GetTupleElement(prev, 1);
+    auto input = builder.ConstantR1<float>(10, 1.f);
+    auto new_weights = builder.Add(weights, input);
+    auto result = builder.Tuple(
+        {builder.Add(iteration, builder.ConstantR0<int32>(1)), new_weights});
+    TF_ASSIGN_OR_ASSERT_OK(body2, builder.Build());
+  }
+
+  // Create a While node with computations for the condition and the body.
+  ComputationBuilder builder(client_, "while");
+  auto init = builder.Tuple(
+      {builder.ConstantR0<int32>(0), builder.ConstantR1<float>(10, 0.f)});
+  auto while1 = builder.While(condition, body, init);
+
+  auto while2 = builder.While(condition2, body2, while1);
+
+  auto while_result1 = builder.GetTupleElement(while1, 1);
+  auto while_result2 = builder.GetTupleElement(while2, 1);
+  VLOG(2) << "while_result2 = "
+          << ShapeUtil::HumanString(
+                 *builder.GetShape(while_result2).ConsumeValueOrDie());
+  auto result = builder.Add(while_result1, while_result2);
+  VLOG(2) << "result = "
+          << ShapeUtil::HumanString(
+                 *builder.GetShape(result).ConsumeValueOrDie());
+  const float sum = c1 + c2;
+  std::vector<float> expected(10, sum);
+  ComputeAndCompareR1<float>(&builder, expected, {}, ErrorSpec(0.0001));
+}
+
+// Test while nodes that share the while body computation.
+TEST_F(WhileTest, TwoWhileLoopsAndSharedBody) {
+  std::vector<Shape> shape_elements = {ShapeUtil::MakeShape(S32, {}),
+                                       ShapeUtil::MakeShape(F32, {10})};
+  Shape result_shape = ShapeUtil::MakeTupleShape(shape_elements);
+
+  // Create a computation for the condition.
+  // Repeat for 5 iterations.
+  Computation condition;
+  const int c1 = 5;
+  {
+    ComputationBuilder builder(client_, "condition");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    builder.Lt(iteration, builder.ConstantR0<int32>(c1));
+    TF_ASSIGN_OR_ASSERT_OK(condition, builder.Build());
+  }
+
+  Computation condition2;
+  const int c2 = 7;
+  {
+    ComputationBuilder builder(client_, "condition2");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    builder.Lt(iteration, builder.ConstantR0<int32>(c2));
+    TF_ASSIGN_OR_ASSERT_OK(condition2, builder.Build());
+  }
+
+  // Create a computation for the body.
+  // Add 1 to the iteration variable and add a constant vector of 1.0f to
+  // the weight variable, both of which are tuple elements.
+  Computation body;
+  {
+    ComputationBuilder builder(client_, "body");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    auto weights = builder.GetTupleElement(prev, 1);
+    auto input = builder.ConstantR1<float>(10, 1.f);
+    auto new_weights = builder.Add(weights, input);
+    auto result = builder.Tuple(
+        {builder.Add(iteration, builder.ConstantR0<int32>(1)), new_weights});
+    TF_ASSIGN_OR_ASSERT_OK(body, builder.Build());
+  }
+
+  // Create a While node with computations for the condition and the body.
+  ComputationBuilder builder(client_, "while");
+  auto init = builder.Tuple(
+      {builder.ConstantR0<int32>(0), builder.ConstantR1<float>(10, 0.f)});
+  auto while1 = builder.While(condition, body, init);
+
+  auto while2 = builder.While(condition2, body, while1);
+
+  auto while_result1 = builder.GetTupleElement(while1, 1);
+  auto while_result2 = builder.GetTupleElement(while2, 1);
+  VLOG(2) << "while_result2 = "
+          << ShapeUtil::HumanString(
+                 *builder.GetShape(while_result2).ConsumeValueOrDie());
+  auto result = builder.Add(while_result1, while_result2);
+  VLOG(2) << "result = "
+          << ShapeUtil::HumanString(
+                 *builder.GetShape(result).ConsumeValueOrDie());
+  const float sum = c1 + c2;
+  std::vector<float> expected(10, sum);
+  ComputeAndCompareR1<float>(&builder, expected, {}, ErrorSpec(0.0001));
+}
+
+// Test while nodes that share the while body computation.
+// TODO(b/37245345): Fails on GPU backend.
+TEST_F(WhileTest, DISABLED_ON_GPU(WhileLoopsWithSharedBodyAndInit)) {
+  std::vector<Shape> shape_elements = {ShapeUtil::MakeShape(S32, {}),
+                                       ShapeUtil::MakeShape(F32, {10})};
+  Shape result_shape = ShapeUtil::MakeTupleShape(shape_elements);
+
+  // Create a computation for the condition.
+  // Repeat for 5 iterations.
+  Computation condition;
+  const int c1 = 5;
+  {
+    ComputationBuilder builder(client_, "condition");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    builder.Lt(iteration, builder.ConstantR0<int32>(c1));
+    TF_ASSIGN_OR_ASSERT_OK(condition, builder.Build());
+  }
+
+  Computation condition2;
+  const int c2 = 7;
+  {
+    ComputationBuilder builder(client_, "condition2");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    builder.Lt(iteration, builder.ConstantR0<int32>(c2));
+    TF_ASSIGN_OR_ASSERT_OK(condition2, builder.Build());
+  }
+
+  // Create a computation for the body.
+  // Add 1 to the iteration variable and add a constant vector of 1.0f to
+  // the weight variable, both of which are tuple elements.
+  Computation body;
+  {
+    ComputationBuilder builder(client_, "body");
+    auto prev = builder.Parameter(0, result_shape, "prev");
+    auto iteration = builder.GetTupleElement(prev, 0);
+    auto weights = builder.GetTupleElement(prev, 1);
+    auto input = builder.ConstantR1<float>(10, 1.f);
+    auto new_weights = builder.Add(weights, input);
+    auto result = builder.Tuple(
+        {builder.Add(iteration, builder.ConstantR0<int32>(1)), new_weights});
+    TF_ASSIGN_OR_ASSERT_OK(body, builder.Build());
+  }
+
+  // Create a While node with computations for the condition and the body.
+  ComputationBuilder builder(client_, "while");
+  auto init = builder.Tuple(
+      {builder.ConstantR0<int32>(0), builder.ConstantR1<float>(10, 0.f)});
+  auto while1 = builder.While(condition, body, init);
+  auto while2 = builder.While(condition2, body, init);
+
+  auto while_result1 = builder.GetTupleElement(while1, 1);
+  auto while_result2 = builder.GetTupleElement(while2, 1);
+  VLOG(2) << "while_result2 = "
+          << ShapeUtil::HumanString(
+                 *builder.GetShape(while_result2).ConsumeValueOrDie());
+  auto result = builder.Add(while_result1, while_result2);
+  VLOG(2) << "result = "
+          << ShapeUtil::HumanString(
+                 *builder.GetShape(result).ConsumeValueOrDie());
+  const float sum = c1 + c2;
+  std::vector<float> expected(10, sum);
+  ComputeAndCompareR1<float>(&builder, expected, {}, ErrorSpec(0.0001));
+}
+
 // WhileTest that uses DynamicUpdateSlice instruction in body computation.
 // Loop state tuple element 1 has as its single user operand(0) of
 // DynamicUpdateSlice, which will trigger in-place dynamic slice update on GPU.
@@ -315,7 +540,8 @@ XLA_TEST_F(WhileTest, WhileWithDynamicUpdateSlice) {
 //   result += (1, U[0, 100], U[0, 100], U[0, 100], U[0, 100], U[0, 100]);
 // }
 //
-// This test misuses a vector to represent a pair:
+// This test misuses a vector WhileTest.WhileLoopsWithSharedBodyto represent a
+// pair:
 //   ((iteration, (random vector))).
 //
 // Note: this test currently only tests generating random values within a loop.
-- 
GitLab


From 617ec9b47e70b4d9bd673642a559ac5652332df1 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 14 Apr 2017 09:53:30 -0800
Subject: [PATCH 0417/1563] tfdbg core: internally-oriented changes Change:
 153183329

---
 tensorflow/core/debug/debug_gateway_test.cc   |  5 ++
 tensorflow/core/debug/debug_graph_utils.cc    | 63 ++++++++++++++++---
 tensorflow/core/debug/debug_graph_utils.h     | 10 +--
 tensorflow/core/debug/debug_io_utils.cc       | 23 ++++++-
 tensorflow/core/debug/debug_io_utils.h        | 27 +++++++-
 tensorflow/core/kernels/debug_ops.h           | 26 ++++++--
 tensorflow/core/ops/debug_ops.cc              | 22 +++++++
 tensorflow/python/debug/lib/debug_data.py     |  8 +--
 .../python/debug/lib/debug_data_test.py       | 10 +--
 .../python/debug/lib/session_debug_testlib.py | 46 ++++++++++++++
 10 files changed, 210 insertions(+), 30 deletions(-)

diff --git a/tensorflow/core/debug/debug_gateway_test.cc b/tensorflow/core/debug/debug_gateway_test.cc
index d6f656c5ca..2911205db2 100644
--- a/tensorflow/core/debug/debug_gateway_test.cc
+++ b/tensorflow/core/debug/debug_gateway_test.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/debug/debug_gateway.h"
 
 #include <algorithm>
+#include <cstdlib>
 #include <unordered_map>
 
 #include "tensorflow/core/debug/debug_graph_utils.h"
@@ -758,6 +759,10 @@ TEST_F(SessionDebugVariableTest, VariableAssignWithDebugOps) {
   tensor_watch_opts->add_debug_ops(debug_identity);
   tensor_watch_opts->add_debug_ops(debug_nan_count);
 
+  char tempdir_template[] = "/tmp/tfdbg_XXXXXX";
+  string temp_dir(mkdtemp(tempdir_template));
+  tensor_watch_opts->add_debug_urls(strings::StrCat("file://", temp_dir));
+
   // Expected name of the inserted debug node
   string debug_identity_node_name = DebugNodeInserter::GetDebugNodeName(
       strings::StrCat(var_node_name_, ":", 0), 0, debug_identity);
diff --git a/tensorflow/core/debug/debug_graph_utils.cc b/tensorflow/core/debug/debug_graph_utils.cc
index 4452f140a4..9061fd39f5 100644
--- a/tensorflow/core/debug/debug_graph_utils.cc
+++ b/tensorflow/core/debug/debug_graph_utils.cc
@@ -26,6 +26,25 @@ limitations under the License.
 
 namespace tensorflow {
 
+namespace {
+
+// TODO(cais): Switch to safe_strtob when available.
+Status ParseBoolString(const string& bool_str, bool* bool_val) {
+  const string lower_bool_str = str_util::Lowercase(bool_str);
+  if (lower_bool_str == "false" || lower_bool_str == "f" ||
+      lower_bool_str == "0") {
+    *bool_val = false;
+  } else if (lower_bool_str == "true" || lower_bool_str == "t" ||
+             lower_bool_str == "1") {
+    *bool_val = true;
+  } else {
+    return errors::InvalidArgument("Invalid string for bool value: ", bool_str);
+  }
+  return Status::OK();
+}
+
+}  // namespace
+
 DebuggerState::DebuggerState(const DebugOptions& debug_options)
     : watches(debug_options.debug_tensor_watch_opts()), debug_urls_() {
   for (const DebugTensorWatch& watch : watches) {
@@ -93,6 +112,9 @@ Status DebuggerState::PublishDebugMetadata(
 Status DebugNodeInserter::InsertNodes(
     const protobuf::RepeatedPtrField<DebugTensorWatch>& watches, Graph* graph,
     Device* device) {
+  // TODO(cais): This method is getting too large in size.
+  // Refactor it with helpers.
+
   if (watches.empty()) {
     // Nothing to do: Return OK right away.
     return Status::OK();
@@ -191,7 +213,8 @@ Status DebugNodeInserter::InsertNodes(
       Node* copy_node;
       Status copy_s = CreateCopyNode(
           graph, device_type, memory_type == HOST_MEMORY, src_node->name(),
-          src_output_slot, src_dt, tensor_name, &copy_node);
+          src_output_slot, src_dt, tensor_name, tensor_watches[tensor_name],
+          tensor_watch_urls[tensor_name], &copy_node);
       if (!copy_s.ok()) {
         return Status(
             error::FAILED_PRECONDITION,
@@ -305,15 +328,40 @@ const string DebugNodeInserter::GetDebugNodeName(const string& tensor_name,
 Status DebugNodeInserter::CreateCopyNode(
     Graph* graph, const DeviceType device_type, const bool is_host_memory,
     const string& src_node_name, const int src_output, const DataType src_dt,
-    const string& tensor_name, Node** copy_node) {
+    const string& tensor_name, const std::vector<string>& debug_ops,
+    const std::vector<string>& debug_urls, Node** copy_node) {
+  const string kGatedGrpcAttributeKey = "gated_grpc";
+
   NodeDef node_def;
   const KernelDef* kdef;
 
   const string copy_op_name = is_host_memory ? "CopyHost" : "Copy";
   const string copy_node_name = GetCopyNodeName(src_node_name, src_output);
 
+  // Cross debug_ops and debug_urls to get the list of debug ops and watches.
+  std::vector<string> debug_ops_spec;
+  for (const string& debug_op : debug_ops) {
+    for (const string& debug_url : debug_urls) {
+      string debug_op_name_proper;
+      std::unordered_map<string, string> custom_attributes;
+      TF_RETURN_IF_ERROR(ParseDebugOpName(debug_op, &debug_op_name_proper,
+                                          &custom_attributes));
+
+      bool gated_grpc_value = false;
+      if (custom_attributes.find(kGatedGrpcAttributeKey) !=
+          custom_attributes.end()) {
+        TF_RETURN_IF_ERROR(ParseBoolString(
+            custom_attributes[kGatedGrpcAttributeKey], &gated_grpc_value));
+      }
+      debug_ops_spec.push_back(strings::StrCat(debug_op_name_proper, ";",
+                                               debug_url, ";",
+                                               gated_grpc_value ? "1" : "0"));
+    }
+  }
+
   auto builder = NodeDefBuilder(copy_node_name, copy_op_name)
-                     .Input(src_node_name, src_output, src_dt);
+                     .Input(src_node_name, src_output, src_dt)
+                     .Attr("debug_ops_spec", std::move(debug_ops_spec));
 
   if (!builder.Finalize(&node_def).ok()) {
     return Status(
@@ -422,16 +470,13 @@ Status DebugNodeInserter::SetDebugNodeAttributes(
         }
         debug_node->AddAttr<int>(attr.name(), int_value);
       } else if (attr.type() == "bool") {
-        string bool_str = str_util::Lowercase(attr_value);
-        if (bool_str == "false" || bool_str == "f" || bool_str == "0") {
-          debug_node->AddAttr<bool>(attr.name(), false);
-        } else if (bool_str == "true" || bool_str == "t" || bool_str == "1") {
-          debug_node->AddAttr<bool>(attr.name(), true);
-        } else {
+        bool bool_value;
+        if (!ParseBoolString(attr_value, &bool_value).ok()) {
           return errors::InvalidArgument(
               "Invalid value string for bool-type attribute ", attr.name(),
               "of debug node ", debug_node->name(), ": \"", attr_value, "\"");
         }
+        debug_node->AddAttr<bool>(attr.name(), bool_value);
       } else {
         return errors::InvalidArgument(
             "Unsupported type of custom attribute for debug ops: ",
diff --git a/tensorflow/core/debug/debug_graph_utils.h b/tensorflow/core/debug/debug_graph_utils.h
index 5cfe95c12b..ac97856443 100644
--- a/tensorflow/core/debug/debug_graph_utils.h
+++ b/tensorflow/core/debug/debug_graph_utils.h
@@ -121,11 +121,11 @@ class DebugNodeInserter {
                                        const string& debug_op_name);
 
  private:
-  static Status CreateCopyNode(Graph* graph, const DeviceType device_type,
-                               const bool is_host_memory,
-                               const string& src_node_name,
-                               const int src_output, const DataType src_dt,
-                               const string& tensor_name, Node** copy_node);
+  static Status CreateCopyNode(
+      Graph* graph, const DeviceType device_type, const bool is_host_memory,
+      const string& src_node_name, const int src_output, const DataType src_dt,
+      const string& tensor_name, const std::vector<string>& debug_ops,
+      const std::vector<string>& debug_urls, Node** copy_node);
 
   // Parse the debug_op_name string to extract proper op name and attributes.
   // debug_op_name can be the proper op name only, e.g., "DebugNumericSummary".
diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc
index aa14065657..2be510ee9b 100644
--- a/tensorflow/core/debug/debug_io_utils.cc
+++ b/tensorflow/core/debug/debug_io_utils.cc
@@ -322,12 +322,33 @@ Status DebugIO::PublishGraph(const Graph& graph,
   return status;
 }
 
+// static
+bool DebugIO::IsCopyNodeGateOpen(
+    const std::vector<DebugWatchAndURLSpec>& specs) {
+#if defined(PLATFORM_GOOGLE)
+  for (const DebugWatchAndURLSpec& spec : specs) {
+    if (!spec.gated_grpc || spec.url.compare(0, strlen(DebugIO::kGrpcURLScheme),
+                                             DebugIO::kGrpcURLScheme)) {
+      return true;
+    } else {
+      if (DebugGrpcIO::IsGateOpen(spec.watch_key, spec.url)) {
+        return true;
+      }
+    }
+  }
+  return false;
+#else
+  return true;
+#endif
+}
+
 // static
 bool DebugIO::IsDebugNodeGateOpen(const string& watch_key,
                                   const std::vector<string>& debug_urls) {
 #if defined(PLATFORM_GOOGLE)
   for (const string& debug_url : debug_urls) {
-    if (debug_url.find(DebugIO::kGrpcURLScheme) != 0) {
+    if (debug_url.compare(0, strlen(DebugIO::kGrpcURLScheme),
+                          DebugIO::kGrpcURLScheme)) {
       return true;
     } else {
       if (DebugGrpcIO::IsGateOpen(watch_key, debug_url)) {
diff --git a/tensorflow/core/debug/debug_io_utils.h b/tensorflow/core/debug/debug_io_utils.h
index 448c9950c0..7e0c3b1945 100644
--- a/tensorflow/core/debug/debug_io_utils.h
+++ b/tensorflow/core/debug/debug_io_utils.h
@@ -30,6 +30,16 @@ namespace tensorflow {
 
 Status ReadEventFromFile(const string& dump_file_path, Event* event);
 
+struct DebugWatchAndURLSpec {
+  DebugWatchAndURLSpec(const string& watch_key, const string& url,
+                       const bool gated_grpc)
+      : watch_key(watch_key), url(url), gated_grpc(gated_grpc) {}
+
+  const string watch_key;
+  const string url;
+  const bool gated_grpc;
+};
+
 class DebugIO {
  public:
   static Status PublishDebugMetadata(
@@ -72,7 +82,22 @@ class DebugIO {
   static Status PublishGraph(const Graph& graph,
                              const std::unordered_set<string>& debug_urls);
 
-  // TODO(cais): (b/37150755) Implement IsCopyNodeGateOpen.
+  // Determine whether a copy node needs to perform deep-copy of input tensor.
+  //
+  // The input arguments contain sufficient information about the attached
+  // downstream debug ops for this method to determine whether all the said
+  // ops are disabled given the current status of the gRPC gating.
+  //
+  // Args:
+  //   specs: A vector of DebugWatchAndURLSpec carrying information about the
+  //     debug ops attached to the Copy node, their debug URLs and whether
+  //     they have the attribute value gated_grpc == True.
+  //
+  // Returns:
+  //   Whether any of the attached downstream debug ops is enabled given the
+  //   current status of the gRPC gating.
+  static bool IsCopyNodeGateOpen(
+      const std::vector<DebugWatchAndURLSpec>& specs);
 
   // Determine whether a debug node needs to proceed given the current gRPC
   // gating status.
diff --git a/tensorflow/core/kernels/debug_ops.h b/tensorflow/core/kernels/debug_ops.h
index 8735bcab47..080c3ac3fe 100644
--- a/tensorflow/core/kernels/debug_ops.h
+++ b/tensorflow/core/kernels/debug_ops.h
@@ -35,17 +35,32 @@ class CopyOp : public OpKernel {
  public:
   explicit CopyOp(OpKernelConstruction* context) : OpKernel(context) {
     OP_REQUIRES_OK(context, context->GetAttr("tensor_name", &tensor_name_));
+
+    std::vector<string> debug_ops_spec;
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("debug_ops_spec", &debug_ops_spec));
+    for (const string& debug_op_spec : debug_ops_spec) {
+      // Assume debug_op_spec has the format
+      // <debug_op>;<debug_url>;<gated_grpc>, e.g.,
+      // DebugIdentity;grpc://localhost:3333;1
+      const std::vector<string> items = str_util::Split(debug_op_spec, ";");
+      OP_REQUIRES(
+          context, items.size() == 3,
+          errors::Internal(
+              "Unexpected number of semicolons in debug_ops_spec element: ",
+              debug_op_spec));
+      debug_op_and_url_specs_.push_back(
+          DebugWatchAndURLSpec(strings::StrCat(tensor_name_, ":", items[0]),
+                               items[1], items[2] == "1"));
+    }
   }
 
   void Compute(OpKernelContext* context) override {
-    // TODO(cais): (b/37150755) Copy ops need to be gated in a similar way to
-    // Debug* ops, so that unnecessary mem-copying can be avoided when all the
-    // downstream Debug* ops are gated off.
-
     const Tensor& src_tensor = context->input(0);
 
     if (src_tensor.IsInitialized() &&
-        DataTypeCanUseMemcpy(src_tensor.dtype())) {
+        DataTypeCanUseMemcpy(src_tensor.dtype()) &&
+        DebugIO::IsCopyNodeGateOpen(debug_op_and_url_specs_)) {
       // Source tensor is initialized and is mem-copyable. Make a copy.
       Tensor* copied_tensor;
       OP_REQUIRES_OK(context, context->allocate_output(0, src_tensor.shape(),
@@ -83,6 +98,7 @@ class CopyOp : public OpKernel {
 
  private:
   string tensor_name_;
+  std::vector<DebugWatchAndURLSpec> debug_op_and_url_specs_;
 };
 
 // Base class of all debug ops.
diff --git a/tensorflow/core/ops/debug_ops.cc b/tensorflow/core/ops/debug_ops.cc
index e4b9875c91..74f9722956 100644
--- a/tensorflow/core/ops/debug_ops.cc
+++ b/tensorflow/core/ops/debug_ops.cc
@@ -19,17 +19,25 @@ limitations under the License.
 namespace tensorflow {
 
 // EXPERIMENTAL: tfdbg debugger-inserted ops.
+// These ops are used only internally by tfdbg. There is no API for users to
+// direct create them. Users can create them indirectly by using
+// RunOptions.debug_options during Session::Run() call. See tfdbg documentation
+// for more details.
 REGISTER_OP("Copy")
     .Input("input: T")
     .Output("output: T")
     .Attr("T: type")
     .Attr("tensor_name: string = ''")
+    .Attr("debug_ops_spec: list(string) = []")
     .SetAllowsUninitializedInput()
     .Doc(R"doc(
 Copy Op.
 
 Performs CPU-to-CPU or GPU-to-GPU deep-copying of tensor, depending on the
 device on which the tensor is allocated.
+N.B.: If the all downstream attached debug ops are disabled given the current
+gRPC gating status, the output will simply forward the input tensor without
+deep-copying. See the documentation of Debug* ops for more details.
 
 Unlike the CopyHost Op, this op does not have HostMemory constraint on its
 input or output.
@@ -37,6 +45,11 @@ input or output.
 input: Input tensor.
 output: Output tensor, deep-copied from input.
 tensor_name: The name of the input tensor.
+debug_ops_spec: A list of debug op spec (op, url, gated_grpc) for attached debug
+  ops. Each element of the list has the format
+  <debug_op>;<grpc_url>;<gated_grpc>, wherein gated_grpc is boolean represented
+  as 0/1. E.g., "DebugIdentity;grpc://foo:3333;1",
+  "DebugIdentity;file:///tmp/tfdbg_1;0".
 )doc");
 
 REGISTER_OP("CopyHost")
@@ -44,17 +57,26 @@ REGISTER_OP("CopyHost")
     .Output("output: T")
     .Attr("T: type")
     .Attr("tensor_name: string = ''")
+    .Attr("debug_ops_spec: list(string) = []")
     .SetAllowsUninitializedInput()
     .Doc(R"doc(
 Copy Host Op.
 
 Performs CPU-to-CPU deep-copying of tensor.
+N.B.: If the all downstream attached debug ops are disabled given the current
+gRPC gating status, the output will simply forward the input tensor without
+deep-copying. See the documentation of Debug* ops for more details.
 
 Unlike the Copy Op, this op has HostMemory constraint on its input or output.
 
 input: Input tensor.
 output: Output tensor, deep-copied from input.
 tensor_name: The name of the input tensor.
+debug_ops_spec: A list of debug op spec (op, url, gated_grpc) for attached debug
+  ops. Each element of the list has the format
+  <debug_op>;<grpc_url>;<gated_grpc>, wherein gated_grpc is boolean represented
+  as 0/1. E.g., "DebugIdentity;grpc://foo:3333;1",
+  "DebugIdentity;file:///tmp/tfdbg_1;0".
 )doc");
 
 REGISTER_OP("DebugIdentity")
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index 96772aed8f..a76dd4f6d6 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -199,7 +199,7 @@ def _get_tensor_watch_key(node_name, output_slot, debug_op):
   return "%s:%s" % (_get_tensor_name(node_name, output_slot), debug_op)
 
 
-def _is_copy_node(node_name):
+def is_copy_node(node_name):
   """Determine whether a node name is that of a debug Copy node.
 
   Such nodes are inserted by TensorFlow core upon request in
@@ -820,7 +820,7 @@ class DebugDumpDir(object):
     self._node_op_types[node.name] = node.op
 
     for inp in node.input:
-      if _is_copy_node(inp) and node.op == "_Send":
+      if is_copy_node(inp) and node.op == "_Send":
         self._copy_send_nodes.append(node.name)
 
       if inp.startswith("^"):
@@ -855,14 +855,14 @@ class DebugDumpDir(object):
       if node in self._copy_send_nodes:
         continue
 
-      if _is_copy_node(node):
+      if is_copy_node(node):
         copy_nodes.append(node)
 
       inputs = self._node_inputs[node]
 
       for i in xrange(len(inputs)):
         inp = inputs[i]
-        if _is_copy_node(inp):
+        if is_copy_node(inp):
           # Find the input to the Copy node, which should be the original
           # input to the node.
           orig_inp = self._node_inputs[inp][0]
diff --git a/tensorflow/python/debug/lib/debug_data_test.py b/tensorflow/python/debug/lib/debug_data_test.py
index 7ca222785b..2bb423bd2c 100644
--- a/tensorflow/python/debug/lib/debug_data_test.py
+++ b/tensorflow/python/debug/lib/debug_data_test.py
@@ -47,12 +47,12 @@ class ParseNodeOrTensorNameTest(test_util.TensorFlowTestCase):
 class NodeNameChecksTest(test_util.TensorFlowTestCase):
 
   def testIsCopyNode(self):
-    self.assertTrue(debug_data._is_copy_node("__copy_ns1/ns2/node3_0"))
+    self.assertTrue(debug_data.is_copy_node("__copy_ns1/ns2/node3_0"))
 
-    self.assertFalse(debug_data._is_copy_node("copy_ns1/ns2/node3_0"))
-    self.assertFalse(debug_data._is_copy_node("_copy_ns1/ns2/node3_0"))
-    self.assertFalse(debug_data._is_copy_node("_copyns1/ns2/node3_0"))
-    self.assertFalse(debug_data._is_copy_node("__dbg_ns1/ns2/node3_0"))
+    self.assertFalse(debug_data.is_copy_node("copy_ns1/ns2/node3_0"))
+    self.assertFalse(debug_data.is_copy_node("_copy_ns1/ns2/node3_0"))
+    self.assertFalse(debug_data.is_copy_node("_copyns1/ns2/node3_0"))
+    self.assertFalse(debug_data.is_copy_node("__dbg_ns1/ns2/node3_0"))
 
   def testIsDebugNode(self):
     self.assertTrue(
diff --git a/tensorflow/python/debug/lib/session_debug_testlib.py b/tensorflow/python/debug/lib/session_debug_testlib.py
index 97a79eda1a..acebb2297f 100644
--- a/tensorflow/python/debug/lib/session_debug_testlib.py
+++ b/tensorflow/python/debug/lib/session_debug_testlib.py
@@ -158,6 +158,52 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
     return simple_add_results(u_init_val, v_init_val, u, v, w, u_name, v_name,
                               w_name, dump)
 
+  def testCopyNodesHaveCorrectDebugOpsAndURLsAttributeValues(self):
+    with session.Session() as sess:
+      u = variables.Variable(2.1, name="u")
+      v = variables.Variable(20.0, name="v")
+      w = math_ops.multiply(u, v, name="w")
+
+      sess.run(variables.global_variables_initializer())
+
+      run_options = config_pb2.RunOptions(output_partition_graphs=True)
+      debug_urls = self._debug_urls()
+      debug_utils.add_debug_tensor_watch(
+          run_options,
+          "u",
+          0, ["DebugNumericSummary(gated_grpc=True)", "DebugIdentity"],
+          debug_urls=debug_urls)
+      debug_utils.add_debug_tensor_watch(
+          run_options, "v", 0, ["DebugNumericSummary"], debug_urls=debug_urls)
+
+      run_metadata = config_pb2.RunMetadata()
+      r = sess.run(w, options=run_options, run_metadata=run_metadata)
+      self.assertAllClose(42.0, r)
+
+      u_copy_node_def = None
+      v_copy_node_def = None
+      for partition_graph in run_metadata.partition_graphs:
+        for node_def in partition_graph.node:
+          if debug_data.is_copy_node(node_def.name):
+            if node_def.name == "__copy_u_0":
+              u_copy_node_def = node_def
+            elif node_def.name == "__copy_v_0":
+              v_copy_node_def = node_def
+
+      self.assertIsNotNone(u_copy_node_def)
+      debug_ops_spec = u_copy_node_def.attr["debug_ops_spec"].list.s
+      self.assertEqual(2, len(debug_ops_spec))
+      self.assertEqual("DebugNumericSummary;%s;1" % debug_urls[0],
+                       debug_ops_spec[0].decode("utf-8"))
+      self.assertEqual("DebugIdentity;%s;0" % debug_urls[0],
+                       debug_ops_spec[1].decode("utf-8"))
+
+      self.assertIsNotNone(v_copy_node_def)
+      debug_ops_spec = v_copy_node_def.attr["debug_ops_spec"].list.s
+      self.assertEqual(1, len(debug_ops_spec))
+      self.assertEqual("DebugNumericSummary;%s;0" % debug_urls[0],
+                       debug_ops_spec[0].decode("utf-8"))
+
   def testConcurrentDumpingToPathsWithOverlappingParentDirsWorks(self):
     results = self._generate_dump_from_simple_addition_graph()
     self.assertTrue(results.dump.loaded_partition_graphs())
-- 
GitLab


From a81d9d999d08d544764d3da9a31966945e82b2ea Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Fri, 14 Apr 2017 10:01:52 -0800
Subject: [PATCH 0418/1563] Revert stylistic change to workspace.bzl Change:
 153184416

---
 tensorflow/workspace.bzl | 1777 ++++++++++++++++++++------------------
 1 file changed, 947 insertions(+), 830 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 559a0d5d50..e2b8bc9331 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -1,12 +1,10 @@
 # TensorFlow external dependencies that can be loaded in WORKSPACE files.
 
-load("@io_bazel_rules_closure//closure/private:java_import_external.bzl",
-     "java_import_external")
-load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
 load("//third_party/gpus:cuda_configure.bzl", "cuda_configure")
-
 load("//third_party/sycl:sycl_configure.bzl", "sycl_configure")
+load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external")
+load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
 
 
 # Parse the bazel version string from `native.bazel_version`.
@@ -40,7 +38,6 @@ def check_version(bazel_version):
     if minimum_bazel_version > current_bazel_version:
       fail("\nCurrent Bazel version is {}, expected at least {}\n".format(
           native.bazel_version, bazel_version))
-  pass
 
 
 def _repos_are_siblings():
@@ -61,18 +58,20 @@ def _temp_workaround_http_archive_impl(repo_ctx):
 
 
 temp_workaround_http_archive = repository_rule(
-    implementation=_temp_workaround_http_archive_impl,
-    attrs={
+    implementation = _temp_workaround_http_archive_impl,
+    attrs = {
         "build_file": attr.label(),
         "repository": attr.string(),
-        "patch_file": attr.label(default=None),
-        "urls": attr.string_list(default=[]),
-        "sha256": attr.string(default=""),
-        "strip_prefix": attr.string(default=""),
-    })
+        "patch_file": attr.label(default = None),
+        "urls": attr.string_list(default = []),
+        "sha256": attr.string(default = ""),
+        "strip_prefix": attr.string(default = ""),
+    },
+)
 
 
-# Executes specified command with arguments and calls 'fail' if it exited with non-zero code
+# Executes specified command with arguments and calls 'fail' if it exited with
+# non-zero code
 def _execute_and_check_ret_code(repo_ctx, cmd_and_args):
   result = repo_ctx.execute(cmd_and_args)
   if result.return_code != 0:
@@ -99,15 +98,16 @@ def _patched_http_archive_impl(repo_ctx):
 
 
 patched_http_archive = repository_rule(
-    implementation=_patched_http_archive_impl,
-    attrs={
+    implementation = _patched_http_archive_impl,
+    attrs = {
         "patch_file": attr.label(),
         "build_file": attr.label(),
         "repository": attr.string(),
-        "urls": attr.string_list(default=[]),
-        "sha256": attr.string(default=""),
-        "strip_prefix": attr.string(default=""),
-    })
+        "urls": attr.string_list(default = []),
+        "sha256": attr.string(default = ""),
+        "strip_prefix": attr.string(default = ""),
+    },
+)
 
 
 # If TensorFlow is linked as a submodule.
@@ -120,240 +120,261 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   cuda_configure(name="local_config_cuda")
   sycl_configure(name="local_config_sycl")
   if path_prefix:
-    print(
-        "path_prefix was specified to tf_workspace but is no longer used and " +
-        "will be removed in the future."
-    )
+    print("path_prefix was specified to tf_workspace but is no longer used " +
+          "and will be removed in the future.")
   if tf_repo_name:
-    print(
-        "tf_repo_name was specified to tf_workspace but is no longer used " +
-        "and will be removed in the future."
-    )
+    print("tf_repo_name was specified to tf_workspace but is no longer used " +
+          "and will be removed in the future.")
 
   native.new_http_archive(
-      name="eigen_archive",
-      urls=[
+      name = "eigen_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
           "https://bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
       ],
-      sha256="a39834683eb5bdb9a7434f0ab3621d2cbc3b07e8002db6de101e45ec536723eb",
-      strip_prefix="eigen-eigen-deff8b280204",
-      build_file=str(Label("//third_party:eigen.BUILD")),)
+      sha256 = "a39834683eb5bdb9a7434f0ab3621d2cbc3b07e8002db6de101e45ec536723eb",
+      strip_prefix = "eigen-eigen-deff8b280204",
+      build_file = str(Label("//third_party:eigen.BUILD")),
+  )
 
   native.new_http_archive(
-      name="libxsmm_archive",
-      urls=[
+      name = "libxsmm_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/hfp/libxsmm/archive/1.8.tar.gz",
           "https://github.com/hfp/libxsmm/archive/1.8.tar.gz",
       ],
-      sha256="0330201afb5525d0950ec861fec9dd75eb40a03845ebe03d2c635cf8bfc14fea",
-      strip_prefix="libxsmm-1.8",
-      build_file=str(Label("//third_party:libxsmm.BUILD")),)
+      sha256 = "0330201afb5525d0950ec861fec9dd75eb40a03845ebe03d2c635cf8bfc14fea",
+      strip_prefix = "libxsmm-1.8",
+      build_file = str(Label("//third_party:libxsmm.BUILD")),
+  )
 
   native.bind(
-      name="xsmm_avx",
-      actual="@libxsmm_archive//third_party:xsmm_avx",)
+      name = "xsmm_avx",
+      actual = "@libxsmm_archive//third_party:xsmm_avx",
+  )
 
   native.new_http_archive(
-      name="ortools_archive",
-      urls=[
+      name = "ortools_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
           "https://github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
       ],
-      sha256="932075525642b04ac6f1b50589f1df5cd72ec2f448b721fd32234cf183f0e755",
-      strip_prefix="or-tools-253f7955c6a1fd805408fba2e42ac6d45b312d15/src",
-      build_file=str(Label("//third_party:ortools.BUILD")),)
+      sha256 = "932075525642b04ac6f1b50589f1df5cd72ec2f448b721fd32234cf183f0e755",
+      strip_prefix = "or-tools-253f7955c6a1fd805408fba2e42ac6d45b312d15/src",
+      build_file = str(Label("//third_party:ortools.BUILD")),
+  )
 
   native.http_archive(
-      name="com_googlesource_code_re2",
-      urls=[
+      name = "com_googlesource_code_re2",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
           "https://github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
       ],
-      sha256="bd63550101e056427c9e7ff12a408c1c8b74e9803f393ca916b2926fc2c4906f",
-      strip_prefix="re2-b94b7cd42e9f02673cd748c1ac1d16db4052514c",)
+      sha256 = "bd63550101e056427c9e7ff12a408c1c8b74e9803f393ca916b2926fc2c4906f",
+      strip_prefix = "re2-b94b7cd42e9f02673cd748c1ac1d16db4052514c",
+  )
 
   native.http_archive(
-      name="gemmlowp",
-      urls=[
+      name = "gemmlowp",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
           "https://github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
       ],
-      sha256="75d40ea8e68b0d1644f052fffe8f14a410b2a73d40ccb859a95c0578d194ec26",
-      strip_prefix="gemmlowp-a6f29d8ac48d63293f845f2253eccbf86bc28321",)
+      sha256 = "75d40ea8e68b0d1644f052fffe8f14a410b2a73d40ccb859a95c0578d194ec26",
+      strip_prefix = "gemmlowp-a6f29d8ac48d63293f845f2253eccbf86bc28321",
+  )
 
   native.new_http_archive(
-      name="farmhash_archive",
-      urls=[
+      name = "farmhash_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
           "https://github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
       ],
-      sha256="4c626d1f306bda2c6804ab955892f803f5245f4dcaecb4979dc08b091256da54",
-      strip_prefix="farmhash-92e897b282426729f4724d91a637596c7e2fe28f",
-      build_file=str(Label("//third_party:farmhash.BUILD")),)
+      sha256 = "4c626d1f306bda2c6804ab955892f803f5245f4dcaecb4979dc08b091256da54",
+      strip_prefix = "farmhash-92e897b282426729f4724d91a637596c7e2fe28f",
+      build_file = str(Label("//third_party:farmhash.BUILD")),
+  )
 
   native.bind(
-      name="farmhash",
-      actual="@farmhash//:farmhash",)
+      name = "farmhash",
+      actual = "@farmhash//:farmhash",
+  )
 
   native.new_http_archive(
-      name="highwayhash",
-      urls=[
+      name = "highwayhash",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
           "https://github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
       ],
-      sha256="0f30a15b1566d93f146c8d149878a06e91d9bb7ec2cfd76906df62a82be4aac9",
-      strip_prefix="highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b",
-      build_file=str(Label("//third_party:highwayhash.BUILD")),)
+      sha256 = "0f30a15b1566d93f146c8d149878a06e91d9bb7ec2cfd76906df62a82be4aac9",
+      strip_prefix = "highwayhash-dfcb97ca4fe9277bf9dc1802dd979b071896453b",
+      build_file = str(Label("//third_party:highwayhash.BUILD")),
+  )
 
   native.new_http_archive(
-      name="nasm",
-      urls=[
+      name = "nasm",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.bz2",
           "http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2",
       ],
-      sha256="00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
-      strip_prefix="nasm-2.12.02",
-      build_file=str(Label("//third_party:nasm.BUILD")),)
+      sha256 = "00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
+      strip_prefix = "nasm-2.12.02",
+      build_file = str(Label("//third_party:nasm.BUILD")),
+  )
 
   temp_workaround_http_archive(
-      name="jpeg",
-      urls=[
+      name = "jpeg",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
           "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
       ],
-      sha256="c15a9607892113946379ccea3ca8b85018301b200754f209453ab21674268e77",
-      strip_prefix="libjpeg-turbo-1.5.1",
-      build_file=str(Label("//third_party/jpeg:jpeg.BUILD")),
-      repository=tf_repo_name,)
+      sha256 = "c15a9607892113946379ccea3ca8b85018301b200754f209453ab21674268e77",
+      strip_prefix = "libjpeg-turbo-1.5.1",
+      build_file = str(Label("//third_party/jpeg:jpeg.BUILD")),
+      repository = tf_repo_name,
+  )
 
   native.new_http_archive(
-      name="png_archive",
-      urls=[
+      name = "png_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/glennrp/libpng/archive/v1.2.53.zip",
           "https://github.com/glennrp/libpng/archive/v1.2.53.zip",
       ],
-      sha256="c35bcc6387495ee6e757507a68ba036d38ad05b415c2553b3debe2a57647a692",
-      strip_prefix="libpng-1.2.53",
-      build_file=str(Label("//third_party:png.BUILD")),)
+      sha256 = "c35bcc6387495ee6e757507a68ba036d38ad05b415c2553b3debe2a57647a692",
+      strip_prefix = "libpng-1.2.53",
+      build_file = str(Label("//third_party:png.BUILD")),
+  )
 
   native.new_http_archive(
-      name="gif_archive",
-      urls=[
+      name = "gif_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
       ],
-      sha256="34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1",
-      strip_prefix="giflib-5.1.4",
-      build_file=str(Label("//third_party:gif.BUILD")),)
+      sha256 = "34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1",
+      strip_prefix = "giflib-5.1.4",
+      build_file = str(Label("//third_party:gif.BUILD")),
+  )
 
   native.new_http_archive(
-      name="six_archive",
-      urls=[
+      name = "six_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
           "http://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
       ],
-      sha256="105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
-      strip_prefix="six-1.10.0",
-      build_file=str(Label("//third_party:six.BUILD")),)
+      sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
+      strip_prefix = "six-1.10.0",
+      build_file = str(Label("//third_party:six.BUILD")),
+  )
 
   native.new_http_archive(
-      name="org_pythonhosted_markdown",
-      urls=[
+      name = "org_pythonhosted_markdown",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
           "https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
       ],
-      strip_prefix="Markdown-2.6.8",
-      sha256="0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33",
-      build_file=str(Label("//third_party:markdown.BUILD")),)
+      strip_prefix = "Markdown-2.6.8",
+      sha256 = "0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33",
+      build_file = str(Label("//third_party:markdown.BUILD")),
+  )
 
   native.new_http_archive(
-      name="org_html5lib",
-      urls=[
+      name = "org_html5lib",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",
           "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",  # identical to 1.0b8
       ],
-      sha256="184257f98539159a433e2a2197309657ae1283b4c44dbd9c87b2f02ff36adce8",
-      strip_prefix="html5lib-python-0.9999999",
-      build_file=str(Label("//third_party:html5lib.BUILD")),)
+      sha256 = "184257f98539159a433e2a2197309657ae1283b4c44dbd9c87b2f02ff36adce8",
+      strip_prefix = "html5lib-python-0.9999999",
+      build_file = str(Label("//third_party:html5lib.BUILD")),
+  )
 
   native.new_http_archive(
-      name="org_mozilla_bleach",
-      urls=[
+      name = "org_mozilla_bleach",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/mozilla/bleach/archive/v1.5.tar.gz",
           "https://github.com/mozilla/bleach/archive/v1.5.tar.gz",
       ],
-      strip_prefix="bleach-1.5",
-      sha256="0d68713d02ba4148c417ab1637dd819333d96929a34401d0233947bec0881ad8",
-      build_file=str(Label("//third_party:bleach.BUILD")),)
+      strip_prefix = "bleach-1.5",
+      sha256 = "0d68713d02ba4148c417ab1637dd819333d96929a34401d0233947bec0881ad8",
+      build_file = str(Label("//third_party:bleach.BUILD")),
+  )
 
   native.new_http_archive(
-      name="org_pocoo_werkzeug",
-      urls=[
+      name = "org_pocoo_werkzeug",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
           "https://pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
       ],
-      strip_prefix="Werkzeug-0.11.10",
-      sha256="cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee",
-      build_file=str(Label("//third_party:werkzeug.BUILD")),)
+      strip_prefix = "Werkzeug-0.11.10",
+      sha256 = "cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee",
+      build_file = str(Label("//third_party:werkzeug.BUILD")),
+  )
 
   native.bind(
-      name="six",
-      actual="@six_archive//:six",)
+      name = "six",
+      actual = "@six_archive//:six",
+  )
 
   patched_http_archive(
-      name="protobuf",
-      urls=[
+      name = "protobuf",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
-      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
-      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
+      sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
       # TODO: remove patching when tensorflow stops linking same protos into
       #       multiple shared libraries loaded in runtime by python.
       #       This patch fixes a runtime crash when tensorflow is compiled
       #       with clang -O2 on Linux (see https://github.com/tensorflow/tensorflow/issues/8394)
-      patch_file=str(Label("//third_party/protobuf:add_noinlines.patch")),)
+      patch_file = str(Label("//third_party/protobuf:add_noinlines.patch")),
+  )
 
   # We need to import the protobuf library under the names com_google_protobuf
   # and com_google_protobuf_cc to enable proto_library support in bazel.
   # Unfortunately there is no way to alias http_archives at the moment.
   native.http_archive(
-      name="com_google_protobuf",
-      urls=[
+      name = "com_google_protobuf",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
-      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
-      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",)
+      sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
+  )
 
   native.http_archive(
-      name="com_google_protobuf_cc",
-      urls=[
+      name = "com_google_protobuf_cc",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
-      sha256="e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
-      strip_prefix="protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",)
+      sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
+      strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
+  )
 
   native.new_http_archive(
-      name="gmock_archive",
-      urls=[
+      name = "gmock_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/googletest/archive/release-1.8.0.zip",
           "https://github.com/google/googletest/archive/release-1.8.0.zip",
       ],
-      sha256="f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
-      strip_prefix="googletest-release-1.8.0",
-      build_file=str(Label("//third_party:gmock.BUILD")),)
+      sha256 = "f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
+      strip_prefix = "googletest-release-1.8.0",
+      build_file = str(Label("//third_party:gmock.BUILD")),
+  )
 
   native.bind(
-      name="gtest",
-      actual="@gmock_archive//:gtest",)
+      name = "gtest",
+      actual = "@gmock_archive//:gtest",
+  )
 
   native.bind(
-      name="gtest_main",
-      actual="@gmock_archive//:gtest_main",)
+      name = "gtest_main",
+      actual = "@gmock_archive//:gtest_main",
+  )
 
   native.http_archive(
       name = "com_github_gflags_gflags",
@@ -366,144 +387,162 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   )
 
   native.bind(
-      name="python_headers",
-      actual=str(Label("//util/python:python_headers")),)
+      name = "python_headers",
+      actual = str(Label("//util/python:python_headers")),
+  )
 
   native.new_http_archive(
-      name="pcre",
-      sha256="ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7",
-      urls=[
+      name = "pcre",
+      sha256 = "ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
           "http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
       ],
-      strip_prefix="pcre-8.39",
-      build_file=str(Label("//third_party:pcre.BUILD")),)
+      strip_prefix = "pcre-8.39",
+      build_file = str(Label("//third_party:pcre.BUILD")),
+  )
 
   native.new_http_archive(
-      name="swig",
-      sha256="58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
-      urls=[
+      name = "swig",
+      sha256 = "58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
       ],
-      strip_prefix="swig-3.0.8",
-      build_file=str(Label("//third_party:swig.BUILD")),)
+      strip_prefix = "swig-3.0.8",
+      build_file = str(Label("//third_party:swig.BUILD")),
+  )
 
   temp_workaround_http_archive(
-      name="curl",
-      sha256="ff3e80c1ca6a068428726cd7dd19037a47cc538ce58ef61c59587191039b2ca6",
-      urls=[
+      name = "curl",
+      sha256 = "ff3e80c1ca6a068428726cd7dd19037a47cc538ce58ef61c59587191039b2ca6",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/curl.haxx.se/download/curl-7.49.1.tar.gz",
           "https://curl.haxx.se/download/curl-7.49.1.tar.gz",
       ],
-      strip_prefix="curl-7.49.1",
-      build_file=str(Label("//third_party:curl.BUILD")),
-      repository=tf_repo_name)
+      strip_prefix = "curl-7.49.1",
+      build_file = str(Label("//third_party:curl.BUILD")),
+      repository = tf_repo_name
+  )
 
   # grpc expects //external:protobuf_clib and //external:protobuf_compiler
   # to point to the protobuf's compiler library.
   native.bind(
-      name="protobuf_clib",
-      actual="@protobuf//:protoc_lib",)
+      name = "protobuf_clib",
+      actual = "@protobuf//:protoc_lib",
+  )
 
   native.bind(
-      name="protobuf_compiler",
-      actual="@protobuf//:protoc_lib",)
+      name = "protobuf_compiler",
+      actual = "@protobuf//:protoc_lib",
+  )
 
   native.new_http_archive(
-      name="grpc",
-      urls=[
+      name = "grpc",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
           "https://github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
       ],
-      sha256="a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31",
-      strip_prefix="grpc-d7ff4ff40071d2b486a052183e3e9f9382afb745",
-      build_file=str(Label("//third_party:grpc.BUILD")),)
+      sha256 = "a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31",
+      strip_prefix = "grpc-d7ff4ff40071d2b486a052183e3e9f9382afb745",
+      build_file = str(Label("//third_party:grpc.BUILD")),
+  )
 
   # protobuf expects //external:grpc_cpp_plugin to point to grpc's
   # C++ plugin code generator.
   native.bind(
-      name="grpc_cpp_plugin",
-      actual="@grpc//:grpc_cpp_plugin",)
+      name = "grpc_cpp_plugin",
+      actual = "@grpc//:grpc_cpp_plugin",
+  )
 
   native.bind(
-      name="grpc_lib",
-      actual="@grpc//:grpc++_unsecure",)
+      name = "grpc_lib",
+      actual = "@grpc//:grpc++_unsecure",
+  )
 
   native.new_http_archive(
-      name="linenoise",
-      sha256="7f51f45887a3d31b4ce4fa5965210a5e64637ceac12720cfce7954d6a2e812f7",
-      urls=[
+      name = "linenoise",
+      sha256 = "7f51f45887a3d31b4ce4fa5965210a5e64637ceac12720cfce7954d6a2e812f7",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
           "https://github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
       ],
-      strip_prefix="linenoise-c894b9e59f02203dbe4e2be657572cf88c4230c3",
-      build_file=str(Label("//third_party:linenoise.BUILD")),)
+      strip_prefix = "linenoise-c894b9e59f02203dbe4e2be657572cf88c4230c3",
+      build_file = str(Label("//third_party:linenoise.BUILD")),
+  )
 
   # TODO(phawkins): currently, this rule uses an unofficial LLVM mirror.
   # Switch to an official source of snapshots if/when possible.
   temp_workaround_http_archive(
-      name="llvm",
-      urls=[
+      name = "llvm",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
           "https://github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
       ],
-      sha256="3cecf39bf4b3854629d610bb321bb57e0e46bda9110bd51c3bae5a4171c82bab",
-      strip_prefix="llvm-5d2b26453d4bca5a13b69b0130e4369d1fcd393d",
-      build_file=str(Label("//third_party/llvm:llvm.BUILD")),
-      repository=tf_repo_name,)
+      sha256 = "3cecf39bf4b3854629d610bb321bb57e0e46bda9110bd51c3bae5a4171c82bab",
+      strip_prefix = "llvm-5d2b26453d4bca5a13b69b0130e4369d1fcd393d",
+      build_file = str(Label("//third_party/llvm:llvm.BUILD")),
+      repository = tf_repo_name,
+  )
 
   native.new_http_archive(
-      name="jsoncpp_git",
-      urls=[
+      name = "jsoncpp_git",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
           "https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
       ],
-      sha256="07d34db40593d257324ec5fb9debc4dc33f29f8fb44e33a2eeb35503e61d0fe2",
-      strip_prefix="jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70",
-      build_file=str(Label("//third_party:jsoncpp.BUILD")),)
+      sha256 = "07d34db40593d257324ec5fb9debc4dc33f29f8fb44e33a2eeb35503e61d0fe2",
+      strip_prefix = "jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70",
+      build_file = str(Label("//third_party:jsoncpp.BUILD")),
+  )
 
   native.bind(
-      name="jsoncpp",
-      actual="@jsoncpp_git//:jsoncpp",)
+      name = "jsoncpp",
+      actual = "@jsoncpp_git//:jsoncpp",
+  )
 
   native.http_archive(
-      name="boringssl",
-      urls=[
+      name = "boringssl",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",
           "https://github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",  # 2016-07-11
       ],
-      sha256="025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
-      strip_prefix="boringssl-bbcaa15b0647816b9a1a9b9e0d209cd6712f0105",)
+      sha256 = "025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
+      strip_prefix = "boringssl-bbcaa15b0647816b9a1a9b9e0d209cd6712f0105",
+  )
 
   native.new_http_archive(
-      name="nanopb_git",
-      urls=[
+      name = "nanopb_git",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
           "https://github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
       ],
-      sha256="ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33",
-      strip_prefix="nanopb-1251fa1065afc0d62f635e0f63fec8276e14e13c",
-      build_file=str(Label("//third_party:nanopb.BUILD")),)
+      sha256 = "ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33",
+      strip_prefix = "nanopb-1251fa1065afc0d62f635e0f63fec8276e14e13c",
+      build_file = str(Label("//third_party:nanopb.BUILD")),
+  )
 
   native.bind(
-      name="nanopb",
-      actual="@nanopb_git//:nanopb",)
+      name = "nanopb",
+      actual = "@nanopb_git//:nanopb",
+  )
 
   native.new_http_archive(
-      name="zlib_archive",
-      urls=[
+      name = "zlib_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/zlib.net/zlib-1.2.8.tar.gz",
           "http://zlib.net/fossils/zlib-1.2.8.tar.gz",
       ],
-      sha256="36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
-      strip_prefix="zlib-1.2.8",
-      build_file=str(Label("//third_party:zlib.BUILD")),)
+      sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
+      strip_prefix = "zlib-1.2.8",
+      build_file = str(Label("//third_party:zlib.BUILD")),
+  )
 
   native.bind(
-      name="zlib",
-      actual="@zlib_archive//:zlib",)
+      name = "zlib",
+      actual = "@zlib_archive//:zlib",
+  )
 
   native.new_http_archive(
       name = "fft2d",
@@ -516,70 +555,73 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   )
 
   temp_workaround_http_archive(
-      name="snappy",
-      urls=[
+      name = "snappy",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/google/snappy/archive/1.1.4.zip",
           "https://github.com/google/snappy/archive/1.1.4.zip",
       ],
-      sha256="6c74d2b663170d68184da353cdd71b5b7d57bc8888ef1e99b4929b5d680dba54",
-      strip_prefix="snappy-1.1.4",
-      build_file=str(Label("//third_party:snappy.BUILD")),
-      repository=tf_repo_name,)
+      sha256 = "6c74d2b663170d68184da353cdd71b5b7d57bc8888ef1e99b4929b5d680dba54",
+      strip_prefix = "snappy-1.1.4",
+      build_file = str(Label("//third_party:snappy.BUILD")),
+      repository = tf_repo_name,
+  )
 
   temp_workaround_http_archive(
-      name="nccl_archive",
-      urls=[
+      name = "nccl_archive",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
           "https://github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
       ],
-      sha256="6787f0eed88d52ee8e32956fa4947d92c139da469f1d8e311c307f27d641118e",
-      strip_prefix="nccl-024d1e267845f2ed06f3e2e42476d50f04a00ee6",
-      build_file=str(Label("//third_party/nccl:nccl.BUILD")),
+      sha256 = "6787f0eed88d52ee8e32956fa4947d92c139da469f1d8e311c307f27d641118e",
+      strip_prefix = "nccl-024d1e267845f2ed06f3e2e42476d50f04a00ee6",
+      build_file = str(Label("//third_party/nccl:nccl.BUILD")),
       # TODO: Remove patching after the fix is merged into nccl(see https://github.com/NVIDIA/nccl/pull/78)
-      patch_file=str(Label("//third_party/nccl:fix_clang_compilation.patch")),
-      repository=tf_repo_name,)
+      patch_file = str(Label("//third_party/nccl:fix_clang_compilation.patch")),
+      repository = tf_repo_name,
+  )
 
   java_import_external(
-      name="junit",
-      jar_sha256=
-      "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
-      jar_urls=[
+      name = "junit",
+      jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
+      jar_urls = [
           "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://maven.ibiblio.org/maven2/junit/junit/4.12/junit-4.12.jar",
       ],
-      licenses=["reciprocal"],  # Common Public License Version 1.0
-      testonly_=True,
-      deps=["@org_hamcrest_core"],)
+      licenses = ["reciprocal"],  # Common Public License Version 1.0
+      testonly_ = True,
+      deps = ["@org_hamcrest_core"],
+  )
 
   java_import_external(
-      name="org_hamcrest_core",
-      jar_sha256=
-      "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
-      jar_urls=[
+      name = "org_hamcrest_core",
+      jar_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
+      jar_urls = [
           "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://maven.ibiblio.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
       ],
-      licenses=["notice"],  # New BSD License
-      testonly_=True,)
+      licenses = ["notice"],  # New BSD License
+      testonly_ = True,
+  )
 
   temp_workaround_http_archive(
-      name="jemalloc",
-      urls=[
+      name = "jemalloc",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
           "https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
       ],
-      sha256="3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8",
-      strip_prefix="jemalloc-4.4.0",
-      build_file=str(Label("//third_party:jemalloc.BUILD")),
-      repository=tf_repo_name,)
+      sha256 = "3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8",
+      strip_prefix = "jemalloc-4.4.0",
+      build_file = str(Label("//third_party:jemalloc.BUILD")),
+      repository = tf_repo_name,
+  )
 
   ##############################################################################
   # TensorBoard Build Tools
 
   filegroup_external(
-      name="org_nodejs",
+      name = "org_nodejs",
       # MIT with portions licensed:
       # - MIT
       # - Old MIT
@@ -589,14 +631,14 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       # - Unicode
       # - zlib
       # - Artistic 2.0
-      licenses=["notice"],
-      sha256_urls_extract_macos={
+      licenses = ["notice"],
+      sha256_urls_extract_macos = {
           "47109a00cac344d80296c195451bb5eee7c21727fcef1594384ddfe1f852957a": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
           ],
       },
-      sha256_urls_windows={
+      sha256_urls_windows = {
           "606c44c42d17866c017c50c0afadad411d9492ac4281d2431b937f881911614e": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/win-x64/node.exe",
               "http://nodejs.org/dist/v4.3.2/win-x64/node.exe",
@@ -606,25 +648,26 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "http://nodejs.org/dist/v4.3.2/win-x64/node.lib",
           ],
       },
-      sha256_urls_extract={
+      sha256_urls_extract = {
           "4350d0431b49697517c6cca5d66adf5f74eb9101c52f52ae959fa94225822d44": [
               "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
           ],
       },
-      strip_prefix={
+      strip_prefix = {
           "node-v4.3.2-darwin-x64.tar.xz": "node-v4.3.2-darwin-x64",
           "node-v4.3.2-linux-x64.tar.xz": "node-v4.3.2-linux-x64",
       },
-      executable=[
+      executable = [
           "node",
           "node.exe",
-      ],)
+      ],
+  )
 
   filegroup_external(
-      name="com_microsoft_typescript",
-      licenses=["notice"],  # Apache 2.0
-      sha256_urls={
+      name = "com_microsoft_typescript",
+      licenses = ["notice"],  # Apache 2.0
+      sha256_urls = {
           "43a7c763fe024d5add8d5365e5a7981f4a359ba5bf86481f545a0db8f60d48cc": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
@@ -634,7 +677,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/lib.es6.d.ts",
           ],
       },
-      extra_build_file_content="\n".join([
+      extra_build_file_content = "\n".join([
           "sh_binary(",
           "    name = \"tsc\",",
           "    srcs = [\"tsc.sh\"],",
@@ -657,37 +700,40 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "          \"EOF\",",
           "    executable = True,",
           ")",
-      ]),)
+      ]),
+  )
 
   ##############################################################################
   # TensorBoard JavaScript Production Dependencies
 
   filegroup_external(
-      name="com_lodash",
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      name = "com_lodash",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "7c7b391810bc08cf815683431857c51b5ee190062ae4f557e1e4689d6dd910ea": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
               "https://raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="com_numericjs",
+      name = "com_numericjs",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "dfaca3b8485bee735788cc6eebca82ea25719adc1fb8911c7799c6bd5a95df3b": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
               "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="com_palantir_plottable",
+      name = "com_palantir_plottable",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "77510d7538dbd3b59f1c8a06f68131b38562e3be546364747618d5112723e818": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
@@ -700,56 +746,61 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="io_github_cpettitt_dagre",
+      name = "io_github_cpettitt_dagre",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "7323829ddd77924a69e2b1235ded3eac30acd990da0f037e0fbd3c8e9035b50d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
               "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="io_github_cpettitt_graphlib",
+      name = "io_github_cpettitt_graphlib",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "772045d412b1513b549be991c2e1846c38019429d43974efcae943fbe83489bf": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
               "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="io_github_waylonflinn_weblas",
+      name = "io_github_waylonflinn_weblas",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "f138fce57f673ca8a633f4aee5ae5b6fcb6ad0de59069a42a74e996fd04d8fcc": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
               "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="org_d3js",
+      name = "org_d3js",
       # no @license header
-      licenses=["notice"],  # BSD-3-Clause
-      sha256_urls={
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256_urls = {
           "bc1e38838f5c5c8e040132d41efee6bfddbef728210bd566479dc1694af1d3f5": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
               "https://raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="org_definitelytyped",
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      name = "org_definitelytyped",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "b7da645f6e5555feb7aeede73775da0023ce2257df9c8e76c9159266035a9c0d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
@@ -766,13 +817,14 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="org_threejs",
+      name = "org_threejs",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "7aff264bd84c90bed3c72a4dc31db8c19151853c6df6980f52b01d3e9872c82d": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
@@ -781,179 +833,190 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
           ],
-      },)
+      },
+  )
 
   ##############################################################################
   # TensorBoard JavaScript Testing Dependencies
 
   filegroup_external(
-      name="com_chaijs",
+      name = "com_chaijs",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "b926b325ad9843bf0b7a6d580ef78bb560e47c484b98680098d4fd9b31b77cd9": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
               "https://raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
           ],
-      },)
+      },
+  )
 
   filegroup_external(
-      name="org_mochajs",
+      name = "org_mochajs",
       # no @license header
-      licenses=["notice"],  # MIT
-      sha256_urls={
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
           "e36d865a17ffdf5868e55e736526ae30f3d4bc667c85a2a28cd5c850a82361e2": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
               "https://raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
           ],
-      },)
+      },
+  )
 
   ##############################################################################
   # TensorBoard Polymer Dependencies
 
   webfiles_external(
-      name="org_polymer_font_roboto",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
-      urls=[
+      name = "org_polymer_font_roboto",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
           "https://github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
       ],
-      strip_prefix="font-roboto-1.0.1",
-      path="/font-roboto",
-      srcs=["roboto.html"],)
+      strip_prefix = "font-roboto-1.0.1",
+      path = "/font-roboto",
+      srcs = ["roboto.html"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_a11y_announcer",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
-      urls=[
+      name = "org_polymer_iron_a11y_announcer",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
       ],
-      strip_prefix="iron-a11y-announcer-1.0.5",
-      path="/iron-a11y-announcer",
-      srcs=["iron-a11y-announcer.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-a11y-announcer-1.0.5",
+      path = "/iron-a11y-announcer",
+      srcs = ["iron-a11y-announcer.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_a11y_keys_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
-      urls=[
+      name = "org_polymer_iron_a11y_keys_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
       ],
-      strip_prefix="iron-a11y-keys-behavior-1.1.8",
-      path="/iron-a11y-keys-behavior",
-      srcs=["iron-a11y-keys-behavior.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-a11y-keys-behavior-1.1.8",
+      path = "/iron-a11y-keys-behavior",
+      srcs = ["iron-a11y-keys-behavior.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_ajax",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
-      urls=[
+      name = "org_polymer_iron_ajax",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
       ],
-      strip_prefix="iron-ajax-1.2.0",
-      path="/iron-ajax",
-      srcs=[
+      strip_prefix = "iron-ajax-1.2.0",
+      path = "/iron-ajax",
+      srcs = [
           "iron-ajax.html",
           "iron-request.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_promise_polyfill",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_autogrow_textarea",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
-      urls=[
+      name = "org_polymer_iron_autogrow_textarea",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
       ],
-      strip_prefix="iron-autogrow-textarea-1.0.12",
-      path="/iron-autogrow-textarea",
-      srcs=["iron-autogrow-textarea.html"],
-      deps=[
+      strip_prefix = "iron-autogrow-textarea-1.0.12",
+      path = "/iron-autogrow-textarea",
+      srcs = ["iron-autogrow-textarea.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_validatable_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_behaviors",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
-      urls=[
+      name = "org_polymer_iron_behaviors",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
           "https://github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
       ],
-      strip_prefix="iron-behaviors-1.0.17",
-      path="/iron-behaviors",
-      srcs=[
+      strip_prefix = "iron-behaviors-1.0.17",
+      path = "/iron-behaviors",
+      srcs = [
           "iron-button-state.html",
           "iron-control-state.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_checked_element_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
-      urls=[
+      name = "org_polymer_iron_checked_element_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix="iron-checked-element-behavior-1.0.4",
-      path="/iron-checked-element-behavior",
-      srcs=["iron-checked-element-behavior.html"],
-      deps=[
+      strip_prefix = "iron-checked-element-behavior-1.0.4",
+      path = "/iron-checked-element-behavior",
+      srcs = ["iron-checked-element-behavior.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_validatable_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_collapse",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
-      urls=[
+      name = "org_polymer_iron_collapse",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
           "https://github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
       ],
-      strip_prefix="iron-collapse-1.0.8",
-      path="/iron-collapse",
-      srcs=["iron-collapse.html"],
-      deps=[
+      strip_prefix = "iron-collapse-1.0.8",
+      path = "/iron-collapse",
+      srcs = ["iron-collapse.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_resizable_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_demo_helpers",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
-      urls=[
+      name = "org_polymer_iron_demo_helpers",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
       ],
-      strip_prefix="iron-demo-helpers-1.1.0",
-      path="/iron-demo-helpers",
-      srcs=[
+      strip_prefix = "iron-demo-helpers-1.1.0",
+      path = "/iron-demo-helpers",
+      srcs = [
           "demo-pages-shared-styles.html",
           "demo-snippet.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_icons",
@@ -961,103 +1024,109 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "@org_polymer_paper_icon_button",
           "@org_polymer_paper_styles",
           "@org_polymer_prism_element",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_dropdown",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
-      urls=[
+      name = "org_polymer_iron_dropdown",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix="iron-dropdown-1.4.0",
-      path="/iron-dropdown",
-      srcs=[
+      strip_prefix = "iron-dropdown-1.4.0",
+      path = "/iron-dropdown",
+      srcs = [
           "iron-dropdown.html",
           "iron-dropdown-scroll-manager.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_overlay_behavior",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_neon_animation",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_fit_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
-      urls=[
+      name = "org_polymer_iron_fit_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
       ],
-      strip_prefix="iron-fit-behavior-1.2.5",
-      path="/iron-fit-behavior",
-      srcs=["iron-fit-behavior.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-fit-behavior-1.2.5",
+      path = "/iron-fit-behavior",
+      srcs = ["iron-fit-behavior.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_flex_layout",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
-      urls=[
+      name = "org_polymer_iron_flex_layout",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
       ],
-      strip_prefix="iron-flex-layout-1.3.0",
-      path="/iron-flex-layout",
-      srcs=[
+      strip_prefix = "iron-flex-layout-1.3.0",
+      path = "/iron-flex-layout",
+      srcs = [
           "classes/iron-flex-layout.html",
           "classes/iron-shadow-flex-layout.html",
           "iron-flex-layout.html",
           "iron-flex-layout-classes.html",
       ],
-      deps=["@org_polymer"],)
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_form_element_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
-      urls=[
+      name = "org_polymer_iron_form_element_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
       ],
-      strip_prefix="iron-form-element-behavior-1.0.6",
-      path="/iron-form-element-behavior",
-      srcs=["iron-form-element-behavior.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-form-element-behavior-1.0.6",
+      path = "/iron-form-element-behavior",
+      srcs = ["iron-form-element-behavior.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_icon",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
-      urls=[
+      name = "org_polymer_iron_icon",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
       ],
-      strip_prefix="iron-icon-1.0.11",
-      path="/iron-icon",
-      srcs=["iron-icon.html"],
-      deps=[
+      strip_prefix = "iron-icon-1.0.11",
+      path = "/iron-icon",
+      srcs = ["iron-icon.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_meta",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_icons",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
-      urls=[
+      name = "org_polymer_iron_icons",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix="iron-icons-1.1.3",
-      path="/iron-icons",
-      srcs=[
+      strip_prefix = "iron-icons-1.1.3",
+      path = "/iron-icons",
+      srcs = [
           "av-icons.html",
           "communication-icons.html",
           "device-icons.html",
@@ -1070,233 +1139,247 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "places-icons.html",
           "social-icons.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer_iron_icon",
           "@org_polymer_iron_iconset_svg",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_iconset_svg",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
-      urls=[
+      name = "org_polymer_iron_iconset_svg",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
       ],
-      strip_prefix="iron-iconset-svg-1.1.0",
-      path="/iron-iconset-svg",
-      srcs=["iron-iconset-svg.html"],
-      deps=[
+      strip_prefix = "iron-iconset-svg-1.1.0",
+      path = "/iron-iconset-svg",
+      srcs = ["iron-iconset-svg.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_meta",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_input",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
-      urls=[
+      name = "org_polymer_iron_input",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
           "https://github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
       ],
-      strip_prefix="iron-input-1.0.10",
-      path="/iron-input",
-      srcs=["iron-input.html"],
-      deps=[
+      strip_prefix = "iron-input-1.0.10",
+      path = "/iron-input",
+      srcs = ["iron-input.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_announcer",
           "@org_polymer_iron_validatable_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_list",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
-      urls=[
+      name = "org_polymer_iron_list",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
           "https://github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
       ],
-      strip_prefix="iron-list-1.3.9",
-      path="/iron-list",
-      srcs=["iron-list.html"],
-      deps=[
+      strip_prefix = "iron-list-1.3.9",
+      path = "/iron-list",
+      srcs = ["iron-list.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_iron_scroll_target_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_menu_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
-      urls=[
+      name = "org_polymer_iron_menu_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
           "https://github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
       ],
-      strip_prefix="iron-menu-behavior-1.1.10",
-      path="/iron-menu-behavior",
-      srcs=[
+      strip_prefix = "iron-menu-behavior-1.1.10",
+      path = "/iron-menu-behavior",
+      srcs = [
           "iron-menu-behavior.html",
           "iron-menubar-behavior.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_selector",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_meta",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
-      urls=[
+      name = "org_polymer_iron_meta",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix="iron-meta-1.1.1",
-      path="/iron-meta",
-      srcs=["iron-meta.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-meta-1.1.1",
+      path = "/iron-meta",
+      srcs = ["iron-meta.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_overlay_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
-      urls=[
+      name = "org_polymer_iron_overlay_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
           "https://github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
       ],
-      strip_prefix="iron-overlay-behavior-1.10.1",
-      path="/iron-overlay-behavior",
-      srcs=[
+      strip_prefix = "iron-overlay-behavior-1.10.1",
+      path = "/iron-overlay-behavior",
+      srcs = [
           "iron-focusables-helper.html",
           "iron-overlay-backdrop.html",
           "iron-overlay-behavior.html",
           "iron-overlay-manager.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_fit_behavior",
           "@org_polymer_iron_resizable_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_range_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
-      urls=[
+      name = "org_polymer_iron_range_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix="iron-range-behavior-1.0.4",
-      path="/iron-range-behavior",
-      srcs=["iron-range-behavior.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-range-behavior-1.0.4",
+      path = "/iron-range-behavior",
+      srcs = ["iron-range-behavior.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_resizable_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
-      urls=[
+      name = "org_polymer_iron_resizable_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
       ],
-      strip_prefix="iron-resizable-behavior-1.0.3",
-      path="/iron-resizable-behavior",
-      srcs=["iron-resizable-behavior.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-resizable-behavior-1.0.3",
+      path = "/iron-resizable-behavior",
+      srcs = ["iron-resizable-behavior.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_scroll_target_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
-      urls=[
+      name = "org_polymer_iron_scroll_target_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
       ],
-      strip_prefix="iron-scroll-target-behavior-1.0.3",
-      path="/iron-scroll-target-behavior",
-      srcs=["iron-scroll-target-behavior.html"],
-      deps=["@org_polymer"],)
+      strip_prefix = "iron-scroll-target-behavior-1.0.3",
+      path = "/iron-scroll-target-behavior",
+      srcs = ["iron-scroll-target-behavior.html"],
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_selector",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
-      urls=[
+      name = "org_polymer_iron_selector",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
           "https://github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
       ],
-      strip_prefix="iron-selector-1.5.2",
-      path="/iron-selector",
-      srcs=[
+      strip_prefix = "iron-selector-1.5.2",
+      path = "/iron-selector",
+      srcs = [
           "iron-multi-selectable.html",
           "iron-selectable.html",
           "iron-selection.html",
           "iron-selector.html",
       ],
-      deps=["@org_polymer"],)
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_iron_validatable_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
-      urls=[
+      name = "org_polymer_iron_validatable_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix="iron-validatable-behavior-1.1.1",
-      path="/iron-validatable-behavior",
-      srcs=["iron-validatable-behavior.html"],
-      deps=[
+      strip_prefix = "iron-validatable-behavior-1.1.1",
+      path = "/iron-validatable-behavior",
+      srcs = ["iron-validatable-behavior.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_meta",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_marked",
-      licenses=["notice"],  # MIT
-      sha256="93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
-      urls=[
+      name = "org_polymer_marked",
+      licenses = ["notice"],  # MIT
+      sha256 = "93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/chjj/marked/archive/v0.3.2.zip",
           "https://github.com/chjj/marked/archive/v0.3.2.zip",
       ],
-      strip_prefix="marked-0.3.2",
-      path="/marked",
-      srcs=["lib/marked.js"],)
+      strip_prefix = "marked-0.3.2",
+      path = "/marked",
+      srcs = ["lib/marked.js"],
+  )
 
   webfiles_external(
-      name="org_polymer_marked_element",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
-      urls=[
+      name = "org_polymer_marked_element",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix="marked-element-1.1.3",
-      path="/marked-element",
-      srcs=[
+      strip_prefix = "marked-element-1.1.3",
+      path = "/marked-element",
+      srcs = [
           "marked-element.html",
           "marked-import.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_marked",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_neon_animation",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
-      urls=[
+      name = "org_polymer_neon_animation",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
       ],
-      strip_prefix="neon-animation-1.2.2",
-      path="/neon-animation",
-      srcs=[
+      strip_prefix = "neon-animation-1.2.2",
+      path = "/neon-animation",
+      srcs = [
           "animations/cascaded-animation.html",
           "animations/fade-in-animation.html",
           "animations/fade-out-animation.html",
@@ -1326,148 +1409,155 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "neon-shared-element-animation-behavior.html",
           "web-animations.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_meta",
           "@org_polymer_iron_resizable_behavior",
           "@org_polymer_iron_selector",
           "@org_polymer_web_animations_js",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_behaviors",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
-      urls=[
+      name = "org_polymer_paper_behaviors",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
       ],
-      strip_prefix="paper-behaviors-1.0.12",
-      path="/paper-behaviors",
-      srcs=[
+      strip_prefix = "paper-behaviors-1.0.12",
+      path = "/paper-behaviors",
+      srcs = [
           "paper-button-behavior.html",
           "paper-checked-element-behavior.html",
           "paper-inky-focus-behavior.html",
           "paper-ripple-behavior.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_checked_element_behavior",
           "@org_polymer_paper_ripple",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_button",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
-      urls=[
+      name = "org_polymer_paper_button",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
       ],
-      strip_prefix="paper-button-1.0.11",
-      path="/paper-button",
-      srcs=["paper-button.html"],
-      deps=[
+      strip_prefix = "paper-button-1.0.11",
+      path = "/paper-button",
+      srcs = ["paper-button.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_material",
           "@org_polymer_paper_ripple",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_checkbox",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
-      urls=[
+      name = "org_polymer_paper_checkbox",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix="paper-checkbox-1.4.0",
-      path="/paper-checkbox",
-      srcs=["paper-checkbox.html"],
-      deps=[
+      strip_prefix = "paper-checkbox-1.4.0",
+      path = "/paper-checkbox",
+      srcs = ["paper-checkbox.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_dialog",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
-      urls=[
+      name = "org_polymer_paper_dialog",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
       ],
-      strip_prefix="paper-dialog-1.0.4",
-      path="/paper-dialog",
-      srcs=["paper-dialog.html"],
-      deps=[
+      strip_prefix = "paper-dialog-1.0.4",
+      path = "/paper-dialog",
+      srcs = ["paper-dialog.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_neon_animation",
           "@org_polymer_paper_dialog_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_dialog_behavior",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
-      urls=[
+      name = "org_polymer_paper_dialog_behavior",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
       ],
-      strip_prefix="paper-dialog-behavior-1.2.5",
-      path="/paper-dialog-behavior",
-      srcs=[
+      strip_prefix = "paper-dialog-behavior-1.2.5",
+      path = "/paper-dialog-behavior",
+      srcs = [
           "paper-dialog-behavior.html",
           "paper-dialog-common.css",
           "paper-dialog-shared-styles.html",
       ],
-      suppress=["cssSyntax"],
-      deps=[
+      suppress = ["cssSyntax"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_overlay_behavior",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_dialog_scrollable",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
-      urls=[
+      name = "org_polymer_paper_dialog_scrollable",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
       ],
-      strip_prefix="paper-dialog-scrollable-1.1.5",
-      path="/paper-dialog-scrollable",
-      srcs=["paper-dialog-scrollable.html"],
-      deps=[
+      strip_prefix = "paper-dialog-scrollable-1.1.5",
+      path = "/paper-dialog-scrollable",
+      srcs = ["paper-dialog-scrollable.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_dialog_behavior",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_dropdown_menu",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
-      urls=[
+      name = "org_polymer_paper_dropdown_menu",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
       ],
-      strip_prefix="paper-dropdown-menu-1.4.0",
-      path="/paper-dropdown-menu",
-      srcs=[
+      strip_prefix = "paper-dropdown-menu-1.4.0",
+      path = "/paper-dropdown-menu",
+      srcs = [
           "paper-dropdown-menu.html",
           "paper-dropdown-menu-icons.html",
           "paper-dropdown-menu-light.html",
           "paper-dropdown-menu-shared-styles.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
@@ -1480,56 +1570,59 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "@org_polymer_paper_menu_button",
           "@org_polymer_paper_ripple",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_header_panel",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
-      urls=[
+      name = "org_polymer_paper_header_panel",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix="paper-header-panel-1.1.4",
-      path="/paper-header-panel",
-      srcs=["paper-header-panel.html"],
-      deps=[
+      strip_prefix = "paper-header-panel-1.1.4",
+      path = "/paper-header-panel",
+      srcs = ["paper-header-panel.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_icon_button",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
-      urls=[
+      name = "org_polymer_paper_icon_button",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
       ],
-      strip_prefix="paper-icon-button-1.1.3",
-      path="/paper-icon-button",
-      srcs=[
+      strip_prefix = "paper-icon-button-1.1.3",
+      path = "/paper-icon-button",
+      srcs = [
           "paper-icon-button.html",
           "paper-icon-button-light.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_icon",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_input",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
-      urls=[
+      name = "org_polymer_paper_input",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
           "https://github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
       ],
-      strip_prefix="paper-input-1.1.18",
-      path="/paper-input",
-      srcs=[
+      strip_prefix = "paper-input-1.1.18",
+      path = "/paper-input",
+      srcs = [
           "paper-input.html",
           "paper-input-addon-behavior.html",
           "paper-input-behavior.html",
@@ -1538,7 +1631,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "paper-input-error.html",
           "paper-textarea.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_autogrow_textarea",
@@ -1547,196 +1640,206 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "@org_polymer_iron_form_element_behavior",
           "@org_polymer_iron_input",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_item",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
-      urls=[
+      name = "org_polymer_paper_item",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix="paper-item-1.1.4",
-      path="/paper-item",
-      srcs=[
+      strip_prefix = "paper-item-1.1.4",
+      path = "/paper-item",
+      srcs = [
           "paper-icon-item.html",
           "paper-item.html",
           "paper-item-behavior.html",
           "paper-item-body.html",
           "paper-item-shared-styles.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_listbox",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
-      urls=[
+      name = "org_polymer_paper_listbox",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix="paper-listbox-1.1.2",
-      path="/paper-listbox",
-      srcs=["paper-listbox.html"],
-      deps=[
+      strip_prefix = "paper-listbox-1.1.2",
+      path = "/paper-listbox",
+      srcs = ["paper-listbox.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_menu_behavior",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_material",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
-      urls=[
+      name = "org_polymer_paper_material",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
       ],
-      strip_prefix="paper-material-1.0.6",
-      path="/paper-material",
-      srcs=[
+      strip_prefix = "paper-material-1.0.6",
+      path = "/paper-material",
+      srcs = [
           "paper-material.html",
           "paper-material-shared-styles.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_menu",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
-      urls=[
+      name = "org_polymer_paper_menu",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
       ],
-      strip_prefix="paper-menu-1.2.2",
-      path="/paper-menu",
-      srcs=[
+      strip_prefix = "paper-menu-1.2.2",
+      path = "/paper-menu",
+      srcs = [
           "paper-menu.html",
           "paper-menu-shared-styles.html",
           "paper-submenu.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_collapse",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_menu_behavior",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_menu_button",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
-      urls=[
+      name = "org_polymer_paper_menu_button",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
           "https://github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
       ],
-      strip_prefix="paper-menu-button-1.5.1",
-      path="/paper-menu-button",
-      srcs=[
+      strip_prefix = "paper-menu-button-1.5.1",
+      path = "/paper-menu-button",
+      srcs = [
           "paper-menu-button.html",
           "paper-menu-button-animations.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_dropdown",
           "@org_polymer_neon_animation",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_progress",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
-      urls=[
+      name = "org_polymer_paper_progress",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
       ],
-      strip_prefix="paper-progress-1.0.9",
-      path="/paper-progress",
-      srcs=["paper-progress.html"],
-      deps=[
+      strip_prefix = "paper-progress-1.0.9",
+      path = "/paper-progress",
+      srcs = ["paper-progress.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_iron_range_behavior",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_radio_button",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
-      urls=[
+      name = "org_polymer_paper_radio_button",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix="paper-radio-button-1.1.2",
-      path="/paper-radio-button",
-      srcs=["paper-radio-button.html"],
-      deps=[
+      strip_prefix = "paper-radio-button-1.1.2",
+      path = "/paper-radio-button",
+      srcs = ["paper-radio-button.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_radio_group",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
-      urls=[
+      name = "org_polymer_paper_radio_group",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
       ],
-      strip_prefix="paper-radio-group-1.0.9",
-      path="/paper-radio-group",
-      srcs=["paper-radio-group.html"],
-      deps=[
+      strip_prefix = "paper-radio-group-1.0.9",
+      path = "/paper-radio-group",
+      srcs = ["paper-radio-group.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_selector",
           "@org_polymer_paper_radio_button",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_ripple",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
-      urls=[
+      name = "org_polymer_paper_ripple",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
       ],
-      strip_prefix="paper-ripple-1.0.5",
-      path="/paper-ripple",
-      srcs=["paper-ripple.html"],
-      deps=[
+      strip_prefix = "paper-ripple-1.0.5",
+      path = "/paper-ripple",
+      srcs = ["paper-ripple.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_slider",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
-      urls=[
+      name = "org_polymer_paper_slider",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
           "https://github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
       ],
-      strip_prefix="paper-slider-1.0.10",
-      path="/paper-slider",
-      srcs=["paper-slider.html"],
-      deps=[
+      strip_prefix = "paper-slider-1.0.10",
+      path = "/paper-slider",
+      srcs = ["paper-slider.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_keys_behavior",
           "@org_polymer_iron_flex_layout",
@@ -1746,39 +1849,41 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "@org_polymer_paper_input",
           "@org_polymer_paper_progress",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_spinner",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
-      urls=[
+      name = "org_polymer_paper_spinner",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
       ],
-      strip_prefix="paper-spinner-1.1.1",
-      path="/paper-spinner",
-      srcs=[
+      strip_prefix = "paper-spinner-1.1.1",
+      path = "/paper-spinner",
+      srcs = [
           "paper-spinner.html", "paper-spinner-behavior.html",
           "paper-spinner-lite.html", "paper-spinner-styles.html"
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_styles",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
-      urls=[
+      name = "org_polymer_paper_styles",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix="paper-styles-1.1.4",
-      path="/paper-styles",
-      srcs=[
+      strip_prefix = "paper-styles-1.1.4",
+      path = "/paper-styles",
+      srcs = [
           "classes/global.html",
           "classes/shadow.html",
           "classes/shadow-layout.html",
@@ -1792,28 +1897,29 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "shadow.html",
           "typography.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_font_roboto",
           "@org_polymer_iron_flex_layout",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_tabs",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
-      urls=[
+      name = "org_polymer_paper_tabs",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
           "https://github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
       ],
-      strip_prefix="paper-tabs-1.7.0",
-      path="/paper-tabs",
-      srcs=[
+      strip_prefix = "paper-tabs-1.7.0",
+      path = "/paper-tabs",
+      srcs = [
           "paper-tab.html",
           "paper-tabs.html",
           "paper-tabs-icons.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_behaviors",
           "@org_polymer_iron_flex_layout",
@@ -1824,165 +1930,175 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_icon_button",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_toast",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
-      urls=[
+      name = "org_polymer_paper_toast",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
       ],
-      strip_prefix="paper-toast-1.3.0",
-      path="/paper-toast",
-      srcs=["paper-toast.html"],
-      deps=[
+      strip_prefix = "paper-toast-1.3.0",
+      path = "/paper-toast",
+      srcs = ["paper-toast.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_a11y_announcer",
           "@org_polymer_iron_overlay_behavior",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_toggle_button",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
-      urls=[
+      name = "org_polymer_paper_toggle_button",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
       ],
-      strip_prefix="paper-toggle-button-1.2.0",
-      path="/paper-toggle-button",
-      srcs=["paper-toggle-button.html"],
-      deps=[
+      strip_prefix = "paper-toggle-button-1.2.0",
+      path = "/paper-toggle-button",
+      srcs = ["paper-toggle-button.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_behaviors",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_toolbar",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
-      urls=[
+      name = "org_polymer_paper_toolbar",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
       ],
-      strip_prefix="paper-toolbar-1.1.4",
-      path="/paper-toolbar",
-      srcs=["paper-toolbar.html"],
-      deps=[
+      strip_prefix = "paper-toolbar-1.1.4",
+      path = "/paper-toolbar",
+      srcs = ["paper-toolbar.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
           "@org_polymer_paper_styles",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_paper_tooltip",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
-      urls=[
+      name = "org_polymer_paper_tooltip",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
       ],
-      strip_prefix="paper-tooltip-1.1.2",
-      path="/paper-tooltip",
-      srcs=["paper-tooltip.html"],
-      deps=[
+      strip_prefix = "paper-tooltip-1.1.2",
+      path = "/paper-tooltip",
+      srcs = ["paper-tooltip.html"],
+      deps = [
           "@org_polymer",
           "@org_polymer_neon_animation",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
-      strip_prefix="polymer-1.7.0",
-      urls=[
+      name = "org_polymer",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
+      strip_prefix = "polymer-1.7.0",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/polymer/polymer/archive/v1.7.0.tar.gz",
           "https://github.com/polymer/polymer/archive/v1.7.0.tar.gz",
       ],
-      path="/polymer",
-      srcs=[
+      path = "/polymer",
+      srcs = [
           "polymer.html",
           "polymer-micro.html",
           "polymer-mini.html",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_prism",
-      licenses=["notice"],  # MIT
-      sha256="e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
-      urls=[
+      name = "org_polymer_prism",
+      licenses = ["notice"],  # MIT
+      sha256 = "e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
           "https://github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
       ],
-      strip_prefix="prism-abee2b7587f1925e57777044270e2a1860810994",
-      path="/prism",
-      srcs=[
+      strip_prefix = "prism-abee2b7587f1925e57777044270e2a1860810994",
+      path = "/prism",
+      srcs = [
           "prism.js",
           "themes/prism.css",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_prism_element",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
-      urls=[
+      name = "org_polymer_prism_element",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
           "https://github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
       ],
-      strip_prefix="prism-element-1.0.4",
-      path="/prism-element",
-      srcs=[
+      strip_prefix = "prism-element-1.0.4",
+      path = "/prism-element",
+      srcs = [
           "prism-highlighter.html",
           "prism-import.html",
       ],
-      deps=[
+      deps = [
           "@org_polymer",
           "@org_polymer_prism",
-      ],)
+      ],
+  )
 
   webfiles_external(
-      name="org_polymer_promise_polyfill",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
-      strip_prefix="promise-polyfill-1.0.0",
-      urls=[
+      name = "org_polymer_promise_polyfill",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
+      strip_prefix = "promise-polyfill-1.0.0",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
           "https://github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
       ],
-      path="/promise-polyfill",
-      srcs=[
+      path = "/promise-polyfill",
+      srcs = [
           "Promise.js", "Promise-Statics.js", "promise-polyfill.html",
           "promise-polyfill-lite.html"
       ],
-      deps=["@org_polymer"],)
+      deps = ["@org_polymer"],
+  )
 
   webfiles_external(
-      name="org_polymer_web_animations_js",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
-      urls=[
+      name = "org_polymer_web_animations_js",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
           "https://github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
       ],
-      strip_prefix="web-animations-js-2.2.1",
-      path="/web-animations-js",
-      srcs=["web-animations-next-lite.min.js"],)
+      strip_prefix = "web-animations-js-2.2.1",
+      path = "/web-animations-js",
+      srcs = ["web-animations-next-lite.min.js"],
+  )
 
   webfiles_external(
-      name="org_polymer_webcomponentsjs",
-      licenses=["notice"],  # BSD-3-Clause
-      sha256="138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
-      urls=[
+      name = "org_polymer_webcomponentsjs",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
+      urls = [
           "http://bazel-mirror.storage.googleapis.com/github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
           "https://github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
       ],
-      strip_prefix="webcomponentsjs-0.7.22",
-      path="/webcomponentsjs",
-      srcs=[
+      strip_prefix = "webcomponentsjs-0.7.22",
+      path = "/webcomponentsjs",
+      srcs = [
           "CustomElements.js",
           "CustomElements.min.js",
           "HTMLImports.js",
@@ -1995,4 +2111,5 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "webcomponents.min.js",
           "webcomponents-lite.js",
           "webcomponents-lite.min.js",
-      ],)
+      ],
+  )
-- 
GitLab


From 05176f0d7e62a9001bb644d637db29f7d87089e8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 10:38:47 -0800
Subject: [PATCH 0419/1563] Allow dynamic shapes for zero/ones initializer.
 Change: 153188909

---
 tensorflow/python/ops/init_ops.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/ops/init_ops.py b/tensorflow/python/ops/init_ops.py
index 7610a4629b..60175965da 100644
--- a/tensorflow/python/ops/init_ops.py
+++ b/tensorflow/python/ops/init_ops.py
@@ -59,8 +59,7 @@ class Zeros(Initializer):
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
       dtype = self.dtype
-    return constant_op.constant(False if dtype is dtypes.bool else 0,
-                                dtype=dtype, shape=shape)
+    return array_ops.zeros(shape, dtype)
 
 
 class Ones(Initializer):
@@ -72,7 +71,7 @@ class Ones(Initializer):
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
       dtype = self.dtype
-    return constant_op.constant(1, dtype=dtype, shape=shape)
+    return array_ops.ones(shape, dtype)
 
 
 class Constant(Initializer):
-- 
GitLab


From cdc06faad08daf72c397555170a578581b814376 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 11:53:24 -0800
Subject: [PATCH 0420/1563] Internal change. Change: 153196671

---
 tensorflow/contrib/keras/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD
index a9bb9ddd58..438e2056c6 100644
--- a/tensorflow/contrib/keras/BUILD
+++ b/tensorflow/contrib/keras/BUILD
@@ -405,6 +405,7 @@ py_test(
     size = "medium",
     srcs = ["python/keras/layers/simplernn_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":keras",
         ":testing_utils",
-- 
GitLab


From c632c78e439847597cd4e9ea8311c1025e7996ee Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Fri, 14 Apr 2017 12:47:17 -0800
Subject: [PATCH 0421/1563] Clarify documentation on number_of_steps. Change:
 153202236

---
 tensorflow/contrib/slim/python/slim/learning.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/learning.py b/tensorflow/contrib/slim/python/slim/learning.py
index 814ce51100..4bda2f7971 100644
--- a/tensorflow/contrib/slim/python/slim/learning.py
+++ b/tensorflow/contrib/slim/python/slim/learning.py
@@ -578,8 +578,10 @@ def train(train_op,
       replica during replica training.
     global_step: The `Tensor` representing the global step. If left as `None`,
       then slim.variables.get_or_create_global_step() is used.
-    number_of_steps: The max number of gradient steps to take during training.
-      If the value is left as None, training proceeds indefinitely.
+    number_of_steps: The max number of gradient steps to take during training,
+      as measured by 'global_step': training will stop if global_step is
+      greater than 'number_of_steps'. If the value is left as None, training
+      proceeds indefinitely.
     init_op: The initialization operation. If left to its default value, then
       the session is initialized by calling `tf.global_variables_initializer()`.
     init_feed_dict: A feed dictionary to use when executing the `init_op`.
-- 
GitLab


From a88053349afdd85f9d0efca7917fdb8eedbcc647 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Fri, 14 Apr 2017 13:09:03 -0800
Subject: [PATCH 0422/1563] Fold the content a const op into its consumer node.
 Change: 153204827

---
 .../core/grappler/costs/graph_properties.cc   |  3 +-
 .../grappler/costs/op_performance_data.proto  |  4 +-
 tensorflow/core/grappler/costs/utils.cc       | 84 ++++++++++++++-----
 tensorflow/core/grappler/costs/utils.h        |  6 +-
 4 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 345c7e2f21..4edcdccdfe 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -96,6 +96,7 @@ Status GraphProperties::InferDynamically(Cluster* cluster) {
       cluster->Run(item_.graph, item_.feed, item_.fetch, &metadata));
 
   std::unordered_map<string, const CostGraphDef::Node*> name_to_cost;
+  std::unordered_map<string, const NodeDef*> name_to_node;  // Empty
   for (auto& node : metadata.cost_graph().node()) {
     name_to_cost[node.name()] = &node;
 
@@ -119,7 +120,7 @@ Status GraphProperties::InferDynamically(Cluster* cluster) {
       continue;
     }
     std::vector<OpInfo::TensorProperties> inputs =
-        FindInputFeatures(node, name_to_cost);
+        FindInputFeatures(node, name_to_cost, name_to_node);
 
     input_properties_[node.name()] = inputs;
 
diff --git a/tensorflow/core/grappler/costs/op_performance_data.proto b/tensorflow/core/grappler/costs/op_performance_data.proto
index 3279158f87..a371868193 100644
--- a/tensorflow/core/grappler/costs/op_performance_data.proto
+++ b/tensorflow/core/grappler/costs/op_performance_data.proto
@@ -18,6 +18,7 @@ syntax = "proto3";
 package tensorflow;
 option cc_enable_arenas = true;
 
+import "tensorflow/core/framework/tensor.proto";
 import "tensorflow/core/framework/tensor_shape.proto";
 import "tensorflow/core/framework/types.proto";
 import "tensorflow/core/framework/attr_value.proto";
@@ -31,10 +32,11 @@ message OpInfo {
   // Custom parameters impacting the behavior of the op.
   map<string, AttrValue> attr = 2;
 
-  // Input types and shapes
+  // Input types, shapes and values if known.
   message TensorProperties {
     DataType dtype = 1;
     TensorShapeProto shape = 2;
+    TensorProto value = 3;
   };
   repeated TensorProperties inputs = 3;
 
diff --git a/tensorflow/core/grappler/costs/utils.cc b/tensorflow/core/grappler/costs/utils.cc
index 9eab8495ce..4e35de9d4a 100644
--- a/tensorflow/core/grappler/costs/utils.cc
+++ b/tensorflow/core/grappler/costs/utils.cc
@@ -28,6 +28,8 @@ limitations under the License.
 
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/framework/types.pb.h"
+#include "tensorflow/core/graph/graph.h"
+#include "tensorflow/core/graph/tensor_id.h"
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/cpu_info.h"
@@ -36,39 +38,79 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+static OpInfo::TensorProperties UnknownInput() {
+  OpInfo::TensorProperties input;
+  input.set_dtype(DataType::DT_INVALID);
+  input.mutable_shape()->set_unknown_rank(true);
+  return input;
+}
+
+static std::vector<TensorProto> ExtractTensors(const AttrValue& attr_value) {
+  std::vector<TensorProto> tensors;
+  switch (attr_value.value_case()) {
+    case AttrValue::kTensor: {
+      tensors.push_back(attr_value.tensor());
+      break;
+    }
+    case AttrValue::kList: {
+      for (const auto& tensor_proto : attr_value.list().tensor()) {
+        tensors.push_back(tensor_proto);
+      }
+      break;
+    }
+    default: {}
+  }
+  return tensors;
+}
+
 std::vector<OpInfo::TensorProperties> FindInputFeatures(
     const NodeDef& node,
-    const std::unordered_map<string, const CostGraphDef::Node*>& name_to_cost) {
+    const std::unordered_map<string, const CostGraphDef::Node*>& name_to_cost,
+    const std::unordered_map<string, const NodeDef*>& name_to_node) {
   std::vector<OpInfo::TensorProperties> inputs;
   for (const auto& input_name : node.input()) {
-    // Skip control inputs. These are prefixed with the ^ character.
     CHECK(!input_name.empty());
-    if (input_name[0] == '^') {
+    TensorId input_tensor_id = ParseTensorName(input_name);
+    const string input_node_name = input_tensor_id.first.ToString();
+    const int output_index = input_tensor_id.second;
+
+    // Skip control inputs.
+    if (output_index == Graph::kControlSlot) {
       continue;
     }
 
-    // Each input is "node_name:output_imdex" with "node_name" being a string
-    // name and "output_index" indicating which output tensor to use from
-    // "node_name". If "output_index" is 0 the ":0" suffix can be omitted.
-    string input_node_name;
-    int output_index = -1;
-    const size_t pos = input_name.rfind(':');
-    if (pos == string::npos) {
-      input_node_name = input_name;
-      output_index = 0;
-    } else {
-      string index = input_name.substr(pos);
-      if (strings::safe_strto32(index, &output_index)) {
-        input_node_name = input_name.substr(0, pos);
+    auto iter = name_to_node.find(input_node_name);
+    if (iter != name_to_node.end()) {
+      const NodeDef* node = iter->second;
+      if (node->op() == "Const") {
+        auto it = node->attr().find("value");
+        if (it == node->attr().end()) {
+          inputs.push_back(UnknownInput());
+          continue;
+        }
+
+        const AttrValue& attr_value = it->second;
+        std::vector<TensorProto> tensors = ExtractTensors(attr_value);
+
+        if (tensors.empty()) {
+          inputs.push_back(UnknownInput());
+          continue;
+        }
+
+        for (const auto& t : tensors) {
+          OpInfo::TensorProperties input;
+          input.set_dtype(t.dtype());
+          *(input.mutable_shape()) = t.tensor_shape();
+          *(input.mutable_value()) = t;
+          inputs.push_back(input);
+        }
+        continue;
       }
     }
 
-    auto it = name_to_cost.find(input_name);
+    auto it = name_to_cost.find(input_node_name);
     if (it == name_to_cost.end() || output_index < 0) {
-      OpInfo::TensorProperties input;
-      input.set_dtype(DataType::DT_INVALID);
-      input.mutable_shape()->set_unknown_rank(true);
-      inputs.push_back(input);
+      inputs.push_back(UnknownInput());
     } else {
       const CostGraphDef::Node* input_cost = it->second;
       const CostGraphDef::Node::OutputInfo& output =
diff --git a/tensorflow/core/grappler/costs/utils.h b/tensorflow/core/grappler/costs/utils.h
index 79be906128..1193c0f5da 100644
--- a/tensorflow/core/grappler/costs/utils.h
+++ b/tensorflow/core/grappler/costs/utils.h
@@ -32,10 +32,12 @@ namespace grappler {
 // Returns a vector of InputProperties for 'node'. The vector will contain one
 // entry for each input of 'node'.
 // For each node in the graph, the 'name_to_cost' map stores a pointer to the
-// corresponding cost graph node indexed by node name.
+// corresponding cost graph node indexed by node name. The 'name_to_node' maps a
+// node name to its node definition.
 std::vector<OpInfo::TensorProperties> FindInputFeatures(
     const NodeDef& node,
-    const std::unordered_map<string, const CostGraphDef::Node*>& name_to_cost);
+    const std::unordered_map<string, const CostGraphDef::Node*>& name_to_cost,
+    const std::unordered_map<string, const NodeDef*>& name_to_node);
 
 // Returns the DeviceProperties of the device on which 'node' runs.
 OpInfo::DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node);
-- 
GitLab


From 4019c5837d21aee67e7365ae579bfd04c7ec6f88 Mon Sep 17 00:00:00 2001
From: zjj2wry <zhengjiajin2016@gmail.com>
Date: Sat, 15 Apr 2017 05:41:11 +0800
Subject: [PATCH 0423/1563] small change to format code (#9223)

---
 .../examples/tutorials/mnist/mnist_with_summaries.py     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
index 698c97ca1d..90497fae09 100644
--- a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
+++ b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
@@ -135,7 +135,8 @@ def train():
       accuracy = tf.reduce_mean(tf.cast(correct_prediction, tf.float32))
   tf.summary.scalar('accuracy', accuracy)
 
-  # Merge all the summaries and write them out to /tmp/tensorflow/mnist/logs/mnist_with_summaries (by default)
+  # Merge all the summaries and write them out to
+  # /tmp/tensorflow/mnist/logs/mnist_with_summaries (by default)
   merged = tf.summary.merge_all()
   train_writer = tf.summary.FileWriter(FLAGS.log_dir + '/train', sess.graph)
   test_writer = tf.summary.FileWriter(FLAGS.log_dir + '/test')
@@ -196,9 +197,11 @@ if __name__ == '__main__':
                       help='Initial learning rate')
   parser.add_argument('--dropout', type=float, default=0.9,
                       help='Keep probability for training dropout.')
-  parser.add_argument('--data_dir', type=str, default='/tmp/tensorflow/mnist/input_data',
+  parser.add_argument('--data_dir', type=str,
+                      default='/tmp/tensorflow/mnist/input_data',
                       help='Directory for storing input data')
-  parser.add_argument('--log_dir', type=str, default='/tmp/tensorflow/mnist/logs/mnist_with_summaries',
+  parser.add_argument('--log_dir', type=str,
+                      default='/tmp/tensorflow/mnist/logs/mnist_with_summaries',
                       help='Summaries log directory')
   FLAGS, unparsed = parser.parse_known_args()
   tf.app.run(main=main, argv=[sys.argv[0]] + unparsed)
-- 
GitLab


From 94fcc167ac19f8600312707f470e8561365e97a4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 14:37:31 -0800
Subject: [PATCH 0424/1563] Fix _get_arguments to work with partials. Change:
 153215155

---
 .../python/learn/estimators/estimator.py      |  35 +++---
 .../python/learn/estimators/estimator_test.py | 103 +++++++++++++++---
 2 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 29ea692f8f..89fbe76840 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -173,17 +173,26 @@ def infer_real_valued_columns_from_input(x):
   return infer_real_valued_columns_from_input_fn(input_fn)
 
 
-def _get_arguments(func):
-  """Returns list of arguments this function has."""
-  if hasattr(func, '__code__'):
-    # Regular function.
-    return inspect.getargspec(func).args
-  elif hasattr(func, '__call__'):
-    # Callable object.
-    return _get_arguments(func.__call__)
-  elif hasattr(func, 'func'):
-    # Partial function.
-    return _get_arguments(func.func)
+def _model_fn_args(fn):
+  """Get argument names for function-like object.
+
+  Args:
+    fn: Function, or function-like object (e.g., result of `functools.partial`).
+
+  Returns:
+    `tuple` of string argument names.
+
+  Raises:
+    ValueError: if partial function has positionally bound arguments
+  """
+  if hasattr(fn, 'func') and hasattr(fn, 'keywords') and hasattr(fn, 'args'):
+    # Handle functools.partial and similar objects.
+    return tuple([
+        arg for arg in inspect.getargspec(fn.func).args[len(fn.args):]
+        if arg not in set(fn.keywords.keys())
+    ])
+  # Handle function.
+  return tuple(inspect.getargspec(fn).args)
 
 
 def _get_replica_device_setter(config):
@@ -1070,7 +1079,7 @@ class Estimator(BaseEstimator):
     super(Estimator, self).__init__(model_dir=model_dir, config=config)
     if model_fn is not None:
       # Check number of arguments of the given function matches requirements.
-      model_fn_args = _get_arguments(model_fn)
+      model_fn_args = _model_fn_args(model_fn)
       if params is not None and 'params' not in model_fn_args:
         raise ValueError('Estimator\'s model_fn (%s) has less than 4 '
                          'arguments, but not None params (%s) are passed.' %
@@ -1100,7 +1109,7 @@ class Estimator(BaseEstimator):
       ValueError: if model_fn returns invalid objects.
     """
     features, labels = self._feature_engineering_fn(features, labels)
-    model_fn_args = _get_arguments(self._model_fn)
+    model_fn_args = _model_fn_args(self._model_fn)
     kwargs = {}
     if 'mode' in model_fn_args:
       kwargs['mode'] = mode
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
index 1dc362beb8..ce2eb4e052 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
@@ -50,6 +50,7 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
@@ -295,33 +296,93 @@ class CheckCallsMonitor(monitors_lib.BaseMonitor):
             self.begin_calls == self.expect_calls)
 
 
-class EstimatorTest(test.TestCase):
+def _model_fn_ops(
+    expected_features, expected_labels, actual_features, actual_labels, mode):
+  assert_ops = tuple([
+      check_ops.assert_equal(
+          expected_features[k], actual_features[k], name='assert_%s' % k)
+      for k in expected_features
+  ] + [
+      check_ops.assert_equal(
+          expected_labels, actual_labels, name='assert_labels')
+  ])
+  with ops.control_dependencies(assert_ops):
+    return model_fn.ModelFnOps(
+        mode=mode,
+        predictions=constant_op.constant(0.),
+        loss=constant_op.constant(0.),
+        train_op=constant_op.constant(0.))
+
+
+def _make_input_fn(features, labels):
+  def _input_fn():
+    return {
+        k: constant_op.constant(v)
+        for k, v in six.iteritems(features)
+    }, constant_op.constant(labels)
+  return _input_fn
 
-  def testExperimentIntegration(self):
-    exp = experiment.Experiment(
-        estimator=estimator.Estimator(model_fn=linear_model_fn),
-        train_input_fn=boston_input_fn,
-        eval_input_fn=boston_input_fn)
-    exp.test()
+
+class EstimatorModelFnTest(test.TestCase):
 
   def testModelFnArgs(self):
-    expected_param = {'some_param': 'some_value'}
+    features = {'x': 42., 'y': 43.}
+    labels = 44.
+    expected_params = {'some_param': 'some_value'}
     expected_config = run_config.RunConfig()
     expected_config.i_am_test = True
 
-    def _argument_checker(features, labels, mode, params, config):
-      _, _ = features, labels
+    # TODO(ptucker): We have to roll our own mock since Estimator._get_arguments
+    # doesn't work with mock fns.
+    model_fn_call_count = [0]
+
+    # `features` and `labels` are passed by position, `arg0` and `arg1` here.
+    def _model_fn(arg0, arg1, mode, params, config):
+      model_fn_call_count[0] += 1
+      self.assertItemsEqual(features.keys(), arg0.keys())
       self.assertEqual(model_fn.ModeKeys.TRAIN, mode)
-      self.assertEqual(expected_param, params)
+      self.assertEqual(expected_params, params)
       self.assertTrue(config.i_am_test)
-      return constant_op.constant(0.), constant_op.constant(
-          0.), constant_op.constant(0.)
+      return _model_fn_ops(features, labels, arg0, arg1, mode)
 
     est = estimator.Estimator(
-        model_fn=_argument_checker,
-        params=expected_param,
+        model_fn=_model_fn, params=expected_params, config=expected_config)
+    self.assertEqual(0, model_fn_call_count[0])
+    est.fit(input_fn=_make_input_fn(features, labels), steps=1)
+    self.assertEqual(1, model_fn_call_count[0])
+
+  def testPartialModelFnArgs(self):
+    features = {'x': 42., 'y': 43.}
+    labels = 44.
+    expected_params = {'some_param': 'some_value'}
+    expected_config = run_config.RunConfig()
+    expected_config.i_am_test = True
+    expected_foo = 45.
+    expected_bar = 46.
+
+    # TODO(ptucker): We have to roll our own mock since Estimator._get_arguments
+    # doesn't work with mock fns.
+    model_fn_call_count = [0]
+
+    # `features` and `labels` are passed by position, `arg0` and `arg1` here.
+    def _model_fn(arg0, arg1, foo, mode, params, config, bar):
+      model_fn_call_count[0] += 1
+      self.assertEqual(expected_foo, foo)
+      self.assertEqual(expected_bar, bar)
+      self.assertItemsEqual(features.keys(), arg0.keys())
+      self.assertEqual(model_fn.ModeKeys.TRAIN, mode)
+      self.assertEqual(expected_params, params)
+      self.assertTrue(config.i_am_test)
+      return _model_fn_ops(features, labels, arg0, arg1, mode)
+    partial_model_fn = functools.partial(
+        _model_fn, foo=expected_foo, bar=expected_bar)
+
+    est = estimator.Estimator(
+        model_fn=partial_model_fn, params=expected_params,
         config=expected_config)
-    est.fit(input_fn=boston_input_fn, steps=1)
+    self.assertEqual(0, model_fn_call_count[0])
+    est.fit(input_fn=_make_input_fn(features, labels), steps=1)
+    self.assertEqual(1, model_fn_call_count[0])
 
   def testModelFnWithModelDir(self):
     expected_param = {'some_param': 'some_value'}
@@ -447,6 +508,16 @@ class EstimatorTest(test.TestCase):
     est.export_savedmodel(est.model_dir + '/export', serving_input_fn)
     self.assertTrue(self.mock_saver.restore.called)
 
+
+class EstimatorTest(test.TestCase):
+
+  def testExperimentIntegration(self):
+    exp = experiment.Experiment(
+        estimator=estimator.Estimator(model_fn=linear_model_fn),
+        train_input_fn=boston_input_fn,
+        eval_input_fn=boston_input_fn)
+    exp.test()
+
   def testCheckpointSaverHookSuppressesTheDefaultOne(self):
     saver_hook = test.mock.Mock(
         spec=basic_session_run_hooks.CheckpointSaverHook)
-- 
GitLab


From f83c3da135b2cd99bf156cec9b1241c5de66172e Mon Sep 17 00:00:00 2001
From: cfperez <christian.f.perez@gmail.com>
Date: Fri, 14 Apr 2017 15:52:57 -0700
Subject: [PATCH 0425/1563] Correct tf.matmul() keyword reference in docs

In `tf.sparse_dense_matmul()` docstring:

Was `tf.matmul(sp_a=True)`

Now `tf.matmul(a_is_sparse)`
---
 tensorflow/python/ops/sparse_ops.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 9f4e6607d1..af7abf5251 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -1239,7 +1239,7 @@ def sparse_tensor_dense_matmul(sp_a,
     A should be sorted in order of increasing dimension 1 (i.e., "column major"
     order instead of "row major" order).
 
-  Deciding when to use sparse_tensor_dense_matmul vs. matmul(sp_a=True):
+  Deciding when to use sparse_tensor_dense_matmul vs. matmul(a_is_sparse=True):
 
   There are a number of questions to ask in the decision process, including:
 
@@ -1249,14 +1249,14 @@ def sparse_tensor_dense_matmul(sp_a,
 
   If the answer to several of these questions is yes, consider
   converting the `SparseTensor` to a dense one and using `tf.matmul` with
-  `sp_a=True`.
+  `a_is_sparse=True`.
 
   This operation tends to perform well when A is more sparse, if the column size
   of the product is small (e.g. matrix-vector multiplication), if
   `sp_a.dense_shape` takes on large values.
 
   Below is a rough speed comparison between sparse_tensor_dense_matmul,
-  labelled 'sparse', and matmul(sp_a=True), labelled 'dense'.  For purposes of
+  labelled 'sparse', and matmul(a_is_sparse=True), labelled 'dense'.  For purposes of
   the comparison, the time spent converting from a SparseTensor to a dense
   Tensor is not included, so it is overly conservative with respect to
   the time ratio.
-- 
GitLab


From 8d0768c7053de00ce1c1dfec1a2d8fab3d35de3f Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Fri, 14 Apr 2017 14:43:50 -0800
Subject: [PATCH 0426/1563] Adds new experiment_fn signature support. Change:
 153215832

---
 .../learn/python/learn/learn_runner.py        | 145 +++++++--
 .../learn/python/learn/learn_runner_test.py   | 292 ++++++++++++++----
 2 files changed, 347 insertions(+), 90 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/learn_runner.py b/tensorflow/contrib/learn/python/learn/learn_runner.py
index 183ab438b6..983ac7462a 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner.py
@@ -19,8 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.framework.python.framework import experimental
-from tensorflow.contrib.learn.python.learn.estimators import run_config
+from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
 from tensorflow.contrib.learn.python.learn.experiment import Experiment
+from tensorflow.contrib.training.python.training import hparam as hparam_lib
 from tensorflow.python.platform import tf_logging as logging
 
 
@@ -46,7 +47,51 @@ def _execute_schedule(experiment, schedule):
   return task()
 
 
-def run(experiment_fn, output_dir, schedule=None):
+def _wrapped_experiment_fn_with_uid_check(experiment_fn, require_hparams=False):
+  """Wraps the `RunConfig` uid check with `experiment_fn`.
+
+  For `experiment_fn` which takes `run_config`, it is expected that the
+  `run_config` is passed to the Estimator correctly. Toward that, the wrapped
+  `experiment_fn` compares the `uid` of the `RunConfig` instance.
+
+  Args:
+    experiment_fn: The original `experiment_fn` which takes `run_config` and
+      `hparams`.
+    require_hparams: If True, the `hparams` passed to `experiment_fn` cannot be
+      `None`.
+
+  Returns:
+    A experiment_fn with same signature.
+  """
+  def wrapped_experiment_fn(run_config, hparams):
+    """Calls experiment_fn and checks the uid of `RunConfig`."""
+    if not isinstance(run_config, run_config_lib.RunConfig):
+      raise ValueError('`run_config` must be `RunConfig` instance')
+    if not run_config.model_dir:
+      raise ValueError('Must specify a model directory in `run_config`.')
+    if hparams is not None and not isinstance(hparams, hparam_lib.HParams):
+      raise ValueError('`hparams` must be `HParams` instance')
+    if require_hparams and hparams is None:
+      raise ValueError('`hparams` cannot be `None`.')
+
+    expected_uid = run_config.uid()
+    experiment = experiment_fn(run_config, hparams)
+
+    if not isinstance(experiment, Experiment):
+      raise TypeError('Experiment builder did not return an Experiment '
+                      'instance, got %s instead.' % type(experiment))
+
+    if experiment.estimator.config.uid() != expected_uid:
+      raise RuntimeError(
+          '`RunConfig` instance is expected to be used by the `Estimator` '
+          'inside the `Experiment`. expected {}, but got {}'.format(
+              expected_uid, experiment.estimator.config.uid()))
+    return experiment
+  return wrapped_experiment_fn
+
+
+def run(experiment_fn, output_dir=None, schedule=None, run_config=None,
+        hparams=None):
   """Make and run an experiment.
 
   It creates an Experiment by calling `experiment_fn`. Then it calls the
@@ -62,7 +107,21 @@ def run(experiment_fn, output_dir, schedule=None):
   If the experiment's config does not include a task type, then an exception
   is raised.
 
-  Example:
+  Example with `run_config` (Recommended):
+  ```
+    def _create_my_experiment(run_config, hparams):
+        return tf.contrib.learn.Experiment(
+          estimator=my_estimator(config=run_config, hparams=hparams),
+          train_input_fn=my_train_input,
+          eval_input_fn=my_eval_input)
+
+    learn_runner.run(
+      experiment_fn=_create_my_experiment,
+      run_config=run_config_lib.RunConfig(model_dir="some/output/dir"),
+      schedule="train",
+      hparams=_create_default_hparams())
+
+  Example with `output_dir` (deprecated):
   ```
     def _create_my_experiment(output_dir):
         return tf.contrib.learn.Experiment(
@@ -76,37 +135,62 @@ def run(experiment_fn, output_dir, schedule=None):
       schedule="train")
   ```
   Args:
-    experiment_fn: A function that creates an `Experiment`. It should accept an
-      argument `output_dir` which should be used to create the `Estimator`
-      (passed as `model_dir` to its constructor). It must return an
-      `Experiment`.
-    output_dir: Base output directory.
+    experiment_fn: A function that creates an `Experiment`. It could be one of
+      the two following signatures:
+      1) [Deprecated] It accepts an argument `output_dir` which should be used
+      to create the `Estimator` (passed as `model_dir` to its constructor). It
+      must return an `Experiment`. For this case, `run_config` and `hparams`
+      must be None.
+      2) It accpets two arguments `run_config` and `hparams`, which should be
+      used to create the `Estimator` (`run_config` passed as `config` to its
+      constructor; `hparams` used as the hyper-paremeters of the model).
+      It must return an `Experiment`. For this case, `output_dir` must be None.
+    output_dir: Base output directory [Deprecated].
     schedule: The name of the  method in the `Experiment` to run.
+    run_config: `RunConfig` instance. If set, `output_dir` must be None.
+    hparams: `HParams` instance. The default hyper-parameters, which will be
+      passed to the `experiment_fn` if `run_config` is not None.
 
   Returns:
     The return value of function `schedule`.
 
   Raises:
-    ValueError: If `output_dir` is empty, `schedule` is None but no task
-      type is set in the built experiment's config, the task type has no
-      default, or `schedule` doesn't reference a member of `Experiment`.
+    ValueError: If both `output_dir` and `run_config` are empty or set,
+      `schedule` is None but no task type is set in the built experiment's
+      config, the task type has no default, or `schedule` doesn't reference a
+      member of `Experiment`.
     TypeError: `schedule` references non-callable member.
   """
-  if not output_dir:
-    raise ValueError('Must specify an output directory')
+
+  if output_dir is not None and run_config is not None:
+    raise ValueError('Cannot provide both `output_dir` and `run_config`')
+
+  if output_dir is None and run_config is None:
+    raise ValueError('Must set value for `output_dir` or `run_config`')
+
   if not callable(experiment_fn):
     raise TypeError('Experiment builder "%s" is not callable.' %
                     experiment_fn)
 
-  # Call the builder
-  experiment = experiment_fn(output_dir=output_dir)
-  if not isinstance(experiment, Experiment):
-    raise TypeError('Experiment builder did not return an Experiment '
-                    'instance, got %s instead.' % type(experiment))
+  experiment = None
+  if run_config is not None:
+    wrapped_experiment_fn = _wrapped_experiment_fn_with_uid_check(experiment_fn)
+    experiment = wrapped_experiment_fn(run_config=run_config, hparams=hparams)
+  else:
+    if not output_dir:
+      raise ValueError('Must specify an output directory')
+    if hparams is not None:
+      raise ValueError(
+          'Must set `hparams` as None for `experiment_fn` with `output_dir`.')
+    # Call the builder
+    experiment = experiment_fn(output_dir=output_dir)
+    if not isinstance(experiment, Experiment):
+      raise TypeError('Experiment builder did not return an Experiment '
+                      'instance, got %s instead.' % type(experiment))
 
   # Get the schedule
-  config = experiment.estimator.config
-  schedule = schedule or _get_default_schedule(config)
+  run_config = run_config or experiment.estimator.config
+  schedule = schedule or _get_default_schedule(run_config)
 
   return _execute_schedule(experiment, schedule)
 
@@ -122,11 +206,11 @@ def tune(experiment_fn, tuner):
 
   Example:
   ```
-    def _create_my_experiment(config, hparams):
+    def _create_my_experiment(run_config, hparams):
       hidden_units = [hparams.unit_per_layer] * hparams.num_hidden_layers
 
       return tf.contrib.learn.Experiment(
-          estimator=DNNClassifier(config=config, hidden_units=hidden_units),
+          estimator=DNNClassifier(config=run_config, hidden_units=hidden_units),
           train_input_fn=my_train_input,
           eval_input_fn=my_eval_input)
 
@@ -136,13 +220,16 @@ def tune(experiment_fn, tuner):
   ```
   Args:
     experiment_fn: A function that creates an `Experiment`. It should accept an
-      argument `config` which should be used to create the `Estimator` (passed
-      as `config` to its constructor), and an argument `hparams`, which should
-      be used for hyper-parameters tuning. It must return an `Experiment`.
+      argument `run_config` which should be used to create the `Estimator` (
+      passed as `config` to its constructor), and an argument `hparams`, which
+      should be used for hyper-parameters tuning. It must return an
+      `Experiment`.
     tuner: A `Tuner` instance.
   """
   while tuner.next_trial():
-    tuner.run_experiment(experiment_fn)
+    tuner.run_experiment(
+        _wrapped_experiment_fn_with_uid_check(
+            experiment_fn, require_hparams=True))
 
 
 def _is_distributed(config):
@@ -168,13 +255,13 @@ def _get_default_schedule(config):
   if not config.task_type:
     raise ValueError('Must specify a schedule')
 
-  if config.task_type == run_config.TaskType.MASTER:
+  if config.task_type == run_config_lib.TaskType.MASTER:
     # TODO(rhaertel): handle the case where there is more than one master
     # or explicitly disallow such a case.
     return 'train_and_evaluate'
-  elif config.task_type == run_config.TaskType.PS:
+  elif config.task_type == run_config_lib.TaskType.PS:
     return 'run_std_server'
-  elif config.task_type == run_config.TaskType.WORKER:
+  elif config.task_type == run_config_lib.TaskType.WORKER:
     return 'train'
 
   raise ValueError('No default schedule for task type: %s' % (config.task_type))
diff --git a/tensorflow/contrib/learn/python/learn/learn_runner_test.py b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
index 400ea5e9e0..6c8cde453f 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
@@ -24,27 +24,49 @@ import os
 from tensorflow.contrib.learn.python.learn import evaluable  # pylint: disable=g-import-not-at-top
 from tensorflow.contrib.learn.python.learn import experiment
 from tensorflow.contrib.learn.python.learn import learn_runner
-from tensorflow.contrib.learn.python.learn import run_config
 from tensorflow.contrib.learn.python.learn import trainable
+
 from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
+from tensorflow.contrib.training.python.training import hparam as hparam_lib
 from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging
 
 patch = test.mock.patch
 
+_MODIR_DIR = "/tmp"
+_HPARAMS = hparam_lib.HParams(learning_rate=0.01)
+_MUST_SPECIFY_OUTPUT_DIR_MSG = "Must specify an output directory"
+_MISSING_MODEL_DIR_ERR_MSG = "Must specify a model directory in `run_config`."
+_EXP_NOT_CALLABLE_MSG = "Experiment builder .* is not callable"
+_INVALID_HPARAMS_ERR_MSG = "`hparams` must be `HParams` instance"
+_NOT_EXP_TYPE_MSG = "Experiment builder did not return an Experiment"
+_NON_EXIST_TASK_MSG = "Schedule references non-existent task"
+_NON_CALLABLE_MSG = "Schedule references non-callable member"
+_MUST_SPECIFY_OUTPUT_DIR_OR_CONFIG_MSG = (
+    "Must set value for `output_dir` or `run_config`")
+_HPARAMS_CANNOT_BE_SET_FOR_OUTPUT_DIR_MSG = (
+    "Must set `hparams` as None for `experiment_fn` with `output_dir`.")
+_CANNOT_SET_BOTH_OUTPUT_DIR_AND_CONFIG_MSG = (
+    "Cannot provide both `output_dir` and `run_config`")
+_INVALID_RUN_CONFIG_TYPE_MSG = "`run_config` must be `RunConfig` instance"
+_RUN_CONFIG_UID_CHECK_ERR_MSG = (
+    "`RunConfig` instance is expected to be used by the `Estimator`")
+
 
 class TestExperiment(experiment.Experiment):
 
   def __init__(self, default=None, config=None, model_dir=None):
     self.default = default
     self.config = config
+    internal_model_dir = model_dir or config.model_dir
+    self._model_dir = internal_model_dir
 
     class Estimator(evaluable.Evaluable, trainable.Trainable):
       config = self.config
 
       @property
       def model_dir(self):
-        return model_dir
+        return internal_model_dir
 
       def fit(self, x=None, y=None, input_fn=None, steps=None, batch_size=None,
               monitors=None, max_steps=None):
@@ -58,16 +80,16 @@ class TestExperiment(experiment.Experiment):
     super(TestExperiment, self).__init__(Estimator(), None, None)
 
   def local_run(self):
-    return "local_run"
+    return "local_run-{}".format(self._model_dir)
 
   def train(self):
-    return "train"
+    return "train-{}".format(self._model_dir)
 
   def run_std_server(self):
-    return "run_std_server"
+    return "run_std_server-{}".format(self._model_dir)
 
   def train_and_evaluate(self):
-    return "train_and_evaluate"
+    return "train_and_evaluate-{}".format(self._model_dir)
 
   def simple_task(self):
     return "simple_task, default=%s." % self.default
@@ -76,7 +98,20 @@ class TestExperiment(experiment.Experiment):
 # pylint: disable=unused-argument
 def build_experiment(output_dir):
   tf_logging.info("In default build_experiment.")
-  return TestExperiment()
+  return TestExperiment(model_dir=output_dir)
+
+
+def build_experiment_fn_for_output_dir(run_config=None):
+  def _build_experiment(output_dir):
+    tf_logging.info("In default build_experiment.")
+    return TestExperiment(config=run_config, model_dir=output_dir)
+  return _build_experiment
+
+
+def build_experiment_for_run_config(run_config, hparams):
+  if hparams is not None and hparams != _HPARAMS:
+    raise ValueError("hparams is not set correctly")
+  return TestExperiment(config=run_config)
 
 
 def build_non_experiment(output_dir):
@@ -99,7 +134,7 @@ def build_non_distributed_cluster_spec():
   return {"foo": ["localhost:1234"]}
 
 
-class MainTest(test.TestCase):
+class LearnRunnerRunWithOutputDirTest(test.TestCase):
 
   def setUp(self):
     # Ensure the TF_CONFIG environment variable is unset for all tests.
@@ -109,16 +144,171 @@ class MainTest(test.TestCase):
     self.assertEqual(
         "simple_task, default=None.",
         learn_runner.run(build_experiment,
-                         output_dir="/tmp",
+                         output_dir=_MODIR_DIR,
                          schedule="simple_task"))
 
   def test_run_with_explicit_local_run(self):
     self.assertEqual(
-        "local_run",
+        "local_run-" + _MODIR_DIR,
         learn_runner.run(build_experiment,
-                         output_dir="/tmp",
+                         output_dir=_MODIR_DIR,
                          schedule="local_run"))
 
+  def test_fail_output_dir_and_run_config_are_both_set(self):
+    with self.assertRaisesRegexp(
+        ValueError, _CANNOT_SET_BOTH_OUTPUT_DIR_AND_CONFIG_MSG):
+      learn_runner.run(build_experiment,
+                       output_dir=_MODIR_DIR,
+                       schedule="simple_task",
+                       run_config=run_config_lib.RunConfig())
+
+  def test_fail_empty_output_dir(self):
+    with self.assertRaisesRegexp(ValueError, _MUST_SPECIFY_OUTPUT_DIR_MSG):
+      learn_runner.run(build_experiment, output_dir="", schedule="simple_task")
+
+  def test_fail_no_output_dir(self):
+    with self.assertRaisesRegexp(
+        ValueError, _MUST_SPECIFY_OUTPUT_DIR_OR_CONFIG_MSG):
+      learn_runner.run(build_experiment, None, "simple_task")
+
+  def test_fail_hparams_are_set(self):
+    hparams = _HPARAMS
+    with self.assertRaisesRegexp(
+        ValueError, _HPARAMS_CANNOT_BE_SET_FOR_OUTPUT_DIR_MSG):
+      learn_runner.run(
+          build_experiment, _MODIR_DIR, schedule="simple_task", hparams=hparams)
+
+  def test_fail_non_callable(self):
+    with self.assertRaisesRegexp(TypeError, _EXP_NOT_CALLABLE_MSG):
+      learn_runner.run("not callable", _MODIR_DIR, "simple_test")
+
+  def test_fail_not_experiment(self):
+    with self.assertRaisesRegexp(TypeError, _NOT_EXP_TYPE_MSG):
+      learn_runner.run(build_non_experiment, _MODIR_DIR, "simple_test")
+
+  def test_fail_non_existent_task(self):
+    with self.assertRaisesRegexp(ValueError, _NON_EXIST_TASK_MSG):
+      learn_runner.run(build_experiment, _MODIR_DIR, "mirage")
+
+  def test_fail_non_callable_task(self):
+    with self.assertRaisesRegexp(TypeError, _NON_CALLABLE_MSG):
+      learn_runner.run(build_experiment, _MODIR_DIR, "default")
+
+
+class LearnRunnerRunWithRunConfigTest(test.TestCase):
+
+  def setUp(self):
+    # Ensure the TF_CONFIG environment variable is unset for all tests.
+    os.environ.pop("TF_CONFIG", None)
+
+  def test_run_with_custom_schedule(self):
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    self.assertEqual(
+        "simple_task, default=None.",
+        learn_runner.run(build_experiment_for_run_config,
+                         run_config=run_config,
+                         schedule="simple_task"))
+
+  def test_run_with_hparams(self):
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    self.assertEqual(
+        "simple_task, default=None.",
+        learn_runner.run(build_experiment_for_run_config,
+                         run_config=run_config,
+                         schedule="simple_task",
+                         hparams=_HPARAMS))
+
+  def test_run_with_explicit_local_run(self):
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    self.assertEqual(
+        "local_run-" + _MODIR_DIR,
+        learn_runner.run(build_experiment_for_run_config,
+                         run_config=run_config,
+                         schedule="local_run"))
+
+  def test_fail_empty_output_dir(self):
+    run_config = run_config_lib.RunConfig(model_dir="")
+    with self.assertRaisesRegexp(ValueError, _MISSING_MODEL_DIR_ERR_MSG):
+      learn_runner.run(build_experiment_for_run_config,
+                       run_config=run_config,
+                       schedule="local_run")
+
+  def test_fail_no_output_dir(self):
+    run_config = run_config_lib.RunConfig()
+    with self.assertRaisesRegexp(ValueError, _MISSING_MODEL_DIR_ERR_MSG):
+      learn_runner.run(build_experiment_for_run_config,
+                       run_config=run_config,
+                       schedule="local_run")
+
+  def test_fail_invalid_run_config_type(self):
+    run_config = "invalid_run_config"
+    with self.assertRaisesRegexp(ValueError, _INVALID_RUN_CONFIG_TYPE_MSG):
+      learn_runner.run(build_experiment_for_run_config,
+                       run_config=run_config,
+                       schedule="local_run")
+
+  def test_fail_invalid_hparams_type(self):
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    with self.assertRaisesRegexp(ValueError, _INVALID_HPARAMS_ERR_MSG):
+      learn_runner.run(build_experiment_for_run_config,
+                       run_config=run_config,
+                       schedule="local_run",
+                       hparams=["hparams"])
+
+  def test_fail_non_callable(self):
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    with self.assertRaisesRegexp(TypeError, _EXP_NOT_CALLABLE_MSG):
+      learn_runner.run("not callable",
+                       run_config=run_config,
+                       schedule="simple_task")
+
+  def test_fail_not_experiment(self):
+    def _experiment_fn(run_config, hparams):
+      del run_config, hparams  # unused.
+      return "not experiment"
+
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    with self.assertRaisesRegexp(TypeError, _NOT_EXP_TYPE_MSG):
+      learn_runner.run(_experiment_fn,
+                       run_config=run_config,
+                       schedule="simple_task")
+
+  def test_fail_non_existent_task(self):
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    with self.assertRaisesRegexp(ValueError, _NON_EXIST_TASK_MSG):
+      learn_runner.run(build_experiment_for_run_config,
+                       run_config=run_config,
+                       schedule="mirage")
+
+  def test_fail_non_callable_task(self):
+    run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+    with self.assertRaisesRegexp(TypeError, _NON_CALLABLE_MSG):
+      learn_runner.run(build_experiment_for_run_config,
+                       run_config=run_config,
+                       schedule="default")
+
+  def test_basic_run_config_uid_check(self):
+    expected_run_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR)
+
+    def _experiment_fn(run_config, hparams):
+      del run_config, hparams  # unused.
+      # Explicitly use a new run_config.
+      new_config = run_config_lib.RunConfig(
+          model_dir=_MODIR_DIR, save_checkpoints_steps=123)
+
+      return TestExperiment(config=new_config)
+
+    with self.assertRaisesRegexp(RuntimeError, _RUN_CONFIG_UID_CHECK_ERR_MSG):
+      learn_runner.run(experiment_fn=_experiment_fn,
+                       run_config=expected_run_config)
+
+
+class LearnRunnerDefaultScheduleTest(test.TestCase):
+
+  def setUp(self):
+    # Ensure the TF_CONFIG environment variable is unset for all tests.
+    os.environ.pop("TF_CONFIG", None)
+
   def test_schedule_from_tf_config_runs_train_on_worker(self):
     os.environ["TF_CONFIG"] = json.dumps({
         "cluster": build_distributed_cluster_spec(),
@@ -127,11 +317,12 @@ class MainTest(test.TestCase):
         }
     })
     # RunConfig constructor will set job_name from TF_CONFIG.
-    config = run_config.RunConfig()
+    config = run_config_lib.RunConfig()
     self.assertEqual(
-        "train",
-        learn_runner.run(lambda output_dir: TestExperiment(config=config),
-                         output_dir="/tmp"))
+        "train-" + _MODIR_DIR,
+        learn_runner.run(
+            build_experiment_fn_for_output_dir(config),
+            output_dir=_MODIR_DIR))
 
   def test_schedule_from_tf_config_runs_train_and_evaluate_on_master(self):
     tf_config = {
@@ -141,11 +332,12 @@ class MainTest(test.TestCase):
         }
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
       self.assertEqual(
-          "train_and_evaluate",
-          learn_runner.run(lambda output_dir: TestExperiment(config=config),
-                           output_dir="/tmp"))
+          "train_and_evaluate-" + _MODIR_DIR,
+          learn_runner.run(
+              build_experiment_fn_for_output_dir(config),
+              output_dir=_MODIR_DIR))
 
   def test_schedule_from_tf_config_runs_serve_on_ps(self):
     tf_config = {
@@ -155,30 +347,27 @@ class MainTest(test.TestCase):
         }
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
       self.assertEqual(
-          "run_std_server",
-          learn_runner.run(lambda output_dir: TestExperiment(config=config),
-                           output_dir="/tmp"))
-
-  def test_fail_no_output_dir(self):
-    self.assertRaisesRegexp(ValueError, "Must specify an output directory",
-                            learn_runner.run, build_experiment, "",
-                            "simple_task")
+          "run_std_server-" + _MODIR_DIR,
+          learn_runner.run(
+              build_experiment_fn_for_output_dir(config),
+              output_dir=_MODIR_DIR))
 
   def test_no_schedule_and_no_config_runs_train_and_evaluate(self):
     self.assertEqual(
-        "train_and_evaluate",
-        learn_runner.run(build_experiment, output_dir="/tmp"))
+        "train_and_evaluate-" + _MODIR_DIR,
+        learn_runner.run(build_experiment, output_dir=_MODIR_DIR))
 
   def test_no_schedule_and_non_distributed_runs_train_and_evaluate(self):
     tf_config = {"cluster": build_non_distributed_cluster_spec()}
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
       self.assertEqual(
-          "train_and_evaluate",
-          learn_runner.run(lambda output_dir: TestExperiment(config=config),
-                           output_dir="/tmp"))
+          "train_and_evaluate-" + _MODIR_DIR,
+          learn_runner.run(
+              build_experiment_fn_for_output_dir(config),
+              output_dir=_MODIR_DIR))
 
   def test_fail_task_type_with_no_default_schedule(self):
     tf_config = {
@@ -188,43 +377,24 @@ class MainTest(test.TestCase):
         }
     }
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
       create_experiment_fn = lambda output_dir: TestExperiment(config=config)
-      self.assertRaisesRegexp(ValueError, "No default schedule",
-                              learn_runner.run, create_experiment_fn, "/tmp")
-
-  def test_fail_non_callable(self):
-    self.assertRaisesRegexp(TypeError, "Experiment builder .* is not callable",
-                            learn_runner.run, "not callable", "/tmp",
-                            "simple_test")
-
-  def test_fail_not_experiment(self):
-    self.assertRaisesRegexp(TypeError,
-                            "Experiment builder did not return an Experiment",
-                            learn_runner.run, build_non_experiment, "/tmp",
-                            "simple_test")
-
-  def test_fail_non_existent_task(self):
-    self.assertRaisesRegexp(ValueError, "Schedule references non-existent task",
-                            learn_runner.run, build_experiment, "/tmp",
-                            "mirage")
-
-  def test_fail_non_callable_task(self):
-    self.assertRaisesRegexp(TypeError,
-                            "Schedule references non-callable member",
-                            learn_runner.run, build_experiment, "/tmp",
-                            "default")
+      self.assertRaisesRegexp(ValueError,
+                              "No default schedule",
+                              learn_runner.run,
+                              create_experiment_fn,
+                              _MODIR_DIR)
 
   def test_fail_schedule_from_config_with_no_task_type(self):
     tf_config = {"cluster": build_distributed_cluster_spec()}
     with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
-      config = run_config.RunConfig()
+      config = run_config_lib.RunConfig()
       self.assertRaisesRegexp(
           ValueError,
           "Must specify a schedule",
           learn_runner.run,
           lambda output_dir: TestExperiment(config=config),
-          output_dir="/tmp")
+          output_dir=_MODIR_DIR)
 
 
 if __name__ == "__main__":
-- 
GitLab


From 664ec6a898733c6621403c971767be1378308303 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 15:05:59 -0800
Subject: [PATCH 0427/1563] Clarify TODO. Change: 153218159

---
 tensorflow/contrib/learn/python/learn/estimators/head.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 14f7666b3d..5a34b551e8 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -1658,7 +1658,7 @@ def _compute_weighted_loss(loss_unweighted, weight, name="loss"):
     name: Optional name
 
   Returns:
-    A tuple of losses. First one for training and the second one for reproting.
+    A tuple of losses. First one for training and the second one for reporting.
   """
   with ops.name_scope(name, values=(loss_unweighted, weight)) as name_scope:
     if weight is None:
@@ -1666,11 +1666,10 @@ def _compute_weighted_loss(loss_unweighted, weight, name="loss"):
       return loss, loss
     with ops.name_scope(None, "weighted_loss",
                         (loss_unweighted, weight)) as name:
+      # TODO(ptucker): Support weight broadcasting, or switch to tf.losses.
       weighted_loss = math_ops.multiply(
           array_ops.reshape(loss_unweighted, shape=(-1,)),
           array_ops.reshape(weight, shape=(-1,)), name=name)
-    # TODO(ptucker): This might be wrong if weights are broadcast to loss shape.
-    # We should use tf.losses here.
     weighted_loss_mean = math_ops.reduce_mean(weighted_loss, name=name_scope)
     weighted_loss_normalized = math_ops.div(
         math_ops.reduce_sum(weighted_loss),
-- 
GitLab


From 7650ec9e2983d8d6b94923b65055f41b74367622 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Fri, 14 Apr 2017 15:25:29 -0800
Subject: [PATCH 0428/1563] Use get_variable instead in adam optimizer. Change:
 153220046

---
 tensorflow/python/training/adam.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index 592a9e8585..b173b100f8 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -20,10 +20,11 @@ from __future__ import print_function
 
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import state_ops
-from tensorflow.python.ops import variables
+from tensorflow.python.ops import variable_scope as vs
 from tensorflow.python.training import optimizer
 from tensorflow.python.training import training_ops
 
@@ -111,18 +112,27 @@ class AdamOptimizer(optimizer.Optimizer):
   def _get_beta_accumulators(self):
     return self._beta1_power, self._beta2_power
 
+  # Suffix appended to optimizer variables.
+  _reuse_counter = 0
+
   def _create_slots(self, var_list):
     # Create the beta1 and beta2 accumulators on the same device as the first
     # variable.
     if (self._beta1_power is None or
         self._beta1_power.graph is not var_list[0].graph):
       with ops.colocate_with(var_list[0]):
-        self._beta1_power = variables.Variable(self._beta1,
-                                               name="beta1_power",
-                                               trainable=False)
-        self._beta2_power = variables.Variable(self._beta2,
-                                               name="beta2_power",
-                                               trainable=False)
+        self._beta1_power = vs.get_variable(
+            name="beta1_power_%d" % AdamOptimizer._reuse_counter,
+            shape=[],
+            initializer=init_ops.constant_initializer(self._beta1),
+            trainable=False)
+        self._beta2_power = vs.get_variable(
+            name="beta2_power_%d" % AdamOptimizer._reuse_counter,
+            shape=[],
+            initializer=init_ops.constant_initializer(self._beta2),
+            trainable=False)
+        AdamOptimizer._reuse_counter += 1
+
     # Create slots for the first and second moments.
     for v in var_list:
       self._zeros_slot(v, "m", self._name)
-- 
GitLab


From 2e89e03db00adda31bfba1c659fb15382f43b2b9 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Fri, 14 Apr 2017 15:53:11 -0800
Subject: [PATCH 0429/1563] Update Eigen version to f3a22f35b044 to include
 updates to std::complex<T> CUDA reduction support. Change: 153222576

---
 tensorflow/workspace.bzl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index e2b8bc9331..c1e711260f 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -129,11 +129,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "eigen_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
-          "https://bitbucket.org/eigen/eigen/get/deff8b280204.tar.gz",
+          "http://bazel-mirror.storage.googleapis.com/bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
+          "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
       ],
-      sha256 = "a39834683eb5bdb9a7434f0ab3621d2cbc3b07e8002db6de101e45ec536723eb",
-      strip_prefix = "eigen-eigen-deff8b280204",
+      sha256 = "ca7beac153d4059c02c8fc59816c82d54ea47fe58365e8aded4082ded0b820c4",
+      strip_prefix = "eigen-eigen-f3a22f35b044",
       build_file = str(Label("//third_party:eigen.BUILD")),
   )
 
-- 
GitLab


From e5c6d7c929b4e0c90c397075ead6dd559abd52fd Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 16:22:57 -0800
Subject: [PATCH 0430/1563] Output the error message when stream_executor's
 ValueOrDie, ConsumeValueOrDie, or SE_CHECK_OK fail. Change: 153225083

---
 tensorflow/stream_executor/lib/status.h   | 3 +--
 tensorflow/stream_executor/lib/statusor.h | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tensorflow/stream_executor/lib/status.h b/tensorflow/stream_executor/lib/status.h
index 0aec2917dc..8c289e1927 100644
--- a/tensorflow/stream_executor/lib/status.h
+++ b/tensorflow/stream_executor/lib/status.h
@@ -29,8 +29,7 @@ namespace port {
 
 using Status = tensorflow::Status;
 
-#define SE_CHECK_OK(val) \
-  CHECK_EQ(::perftools::gputools::port::Status::OK(), (val))
+#define SE_CHECK_OK(val) TF_CHECK_OK(val)
 #define SE_ASSERT_OK(val) \
   ASSERT_EQ(::perftools::gputools::port::Status::OK(), (val))
 
diff --git a/tensorflow/stream_executor/lib/statusor.h b/tensorflow/stream_executor/lib/statusor.h
index 2a6df910ab..06278d5152 100644
--- a/tensorflow/stream_executor/lib/statusor.h
+++ b/tensorflow/stream_executor/lib/statusor.h
@@ -202,13 +202,13 @@ StatusOr<T>::StatusOr(const T& value)
 
 template <typename T>
 const T& StatusOr<T>::ValueOrDie() const {
-  assert(status_.ok());
+  TF_CHECK_OK(status_);
   return value_;
 }
 
 template <typename T>
 T StatusOr<T>::ConsumeValueOrDie() {
-  assert(status_.ok());
+  TF_CHECK_OK(status_);
   return std::move(value_);
 }
 
-- 
GitLab


From 572556d271903023f35ab573462f5fb10d58643e Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Fri, 14 Apr 2017 16:50:39 -0800
Subject: [PATCH 0431/1563] Have better support of uid for cluster_spec.
 Change: 153227038

---
 .../python/learn/estimators/run_config.py     |  4 +++
 .../learn/estimators/run_config_test.py       | 28 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 0e4c551bc1..25da51675a 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -326,6 +326,10 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     state = {k: v for k, v in self.__dict__.items() if not k.startswith('__')}
     ordered_state = collections.OrderedDict(
         sorted(state.items(), key=lambda t: t[0]))
+    # For class instance without __repr__, some special cares are required.
+    # Otherwise, the object address will be used.
+    if '_cluster_spec' in ordered_state:
+      ordered_state['_cluster_spec'] = ordered_state['_cluster_spec'].as_dict()
     return ', '.join(
         '%s=%r' % (k, v) for (k, v) in six.iteritems(ordered_state))
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index e4fd7c5734..14cef7cc43 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import copy
 import json
 
 from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
@@ -242,7 +243,7 @@ class RunConfigTest(test.TestCase):
     with self.assertRaises(ValueError):
       config.replace(some_undefined_property=RANDOM_SEED)
 
-  def test_uid(self):
+  def test_uid_for_different_configs(self):
     config = run_config_lib.RunConfig(
         tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
 
@@ -252,7 +253,32 @@ class RunConfigTest(test.TestCase):
       self.assertEqual(expected_uid, config.uid())
 
     new_config = config.replace(model_dir=ANOTHER_TEST_DIR)
+    self.assertEqual(TEST_DIR, config.model_dir)
     self.assertNotEqual(expected_uid, new_config.uid())
+    self.assertEqual(ANOTHER_TEST_DIR, new_config.model_dir)
+
+  def test_uid_for_deepcopy(self):
+    tf_config = {
+        "cluster": {
+            run_config_lib.TaskType.PS: ["host1:1", "host2:2"],
+            run_config_lib.TaskType.WORKER: ["host3:3", "host4:4", "host5:5"]
+        },
+        "task": {
+            "type": run_config_lib.TaskType.WORKER,
+            "index": 1
+        }
+    }
+    with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
+      config = run_config_lib.RunConfig(
+          tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
+    self.assertEqual(config.cluster_spec.as_dict(), tf_config["cluster"])
+
+    config = run_config_lib.RunConfig(
+        tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
+
+    expected_uid = config.uid()
+    new_config = copy.deepcopy(config)
+    self.assertEqual(expected_uid, new_config.uid())
 
 
 if __name__ == "__main__":
-- 
GitLab


From b365526102e5ed65cf5880884af5a089b6fcbf5b Mon Sep 17 00:00:00 2001
From: Daniel Rasmussen <drasmuss@users.noreply.github.com>
Date: Fri, 14 Apr 2017 22:34:17 -0400
Subject: [PATCH 0432/1563] Support int32 idxs in sparse_tensor_dense_matmul
 (#9193)

---
 .../kernels/sparse_tensor_dense_matmul_op.cc  | 122 ++++++++++--------
 .../kernels/sparse_tensor_dense_matmul_op.h   |  16 ++-
 .../sparse_tensor_dense_matmul_op_gpu.cu.cc   |  46 +++----
 tensorflow/core/ops/sparse_ops.cc             |   3 +-
 .../sparse_tensor_dense_matmul_grad_test.py   |  35 ++---
 .../sparse_tensor_dense_matmul_op_test.py     |  15 ++-
 tensorflow/python/ops/sparse_grad.py          |  14 +-
 7 files changed, 140 insertions(+), 111 deletions(-)

diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
index 1669ac47c8..a1fd64b326 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
@@ -29,7 +29,7 @@ namespace tensorflow {
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
 
-template <typename Device, typename T>
+template <typename Device, typename T, typename Tindices>
 class SparseTensorDenseMatMulOp : public OpKernel {
  public:
   explicit SparseTensorDenseMatMulOp(OpKernelConstruction* ctx)
@@ -141,9 +141,10 @@ class SparseTensorDenseMatMulOp : public OpKernel {
 
 #define MAYBE_ADJOINT(ADJ_A, ADJ_B)                                            \
   if (adjoint_a_ == ADJ_A && adjoint_b_ == ADJ_B) {                            \
-    functor::SparseTensorDenseMatMulFunctor<Device, T, ADJ_A, ADJ_B>::Compute( \
+    functor::SparseTensorDenseMatMulFunctor<Device, T, Tindices, ADJ_A,        \
+                                            ADJ_B>::Compute(                   \
         ctx->eigen_device<Device>(), out->matrix<T>(),                         \
-        a_indices->matrix<int64>(), a_values->vec<T>(), b->matrix<T>(),        \
+        a_indices->matrix<Tindices>(), a_values->vec<T>(), b->matrix<T>(),     \
         scratch.vec<T>());                                                     \
   }
 
@@ -160,64 +161,83 @@ class SparseTensorDenseMatMulOp : public OpKernel {
   bool adjoint_b_;
 };
 
-#define REGISTER_CPU(T)                                   \
-  REGISTER_KERNEL_BUILDER(Name("SparseTensorDenseMatMul") \
-                              .Device(DEVICE_CPU)         \
-                              .TypeConstraint<T>("T")     \
-                              .HostMemory("a_shape"),     \
-                          SparseTensorDenseMatMulOp<CPUDevice, T>);
-
-REGISTER_CPU(float);
-REGISTER_CPU(double);
-REGISTER_CPU(int32);
-REGISTER_CPU(complex64);
-REGISTER_CPU(complex128);
+#define REGISTER_CPU(TypeT, TypeIndex)                                   \
+  REGISTER_KERNEL_BUILDER(                                               \
+      Name("SparseTensorDenseMatMul")                                    \
+          .Device(DEVICE_CPU)                                            \
+          .TypeConstraint<TypeT>("T")                                    \
+          .TypeConstraint<TypeIndex>("Tindices")                         \
+          .HostMemory("a_shape"),                                        \
+      SparseTensorDenseMatMulOp<CPUDevice, TypeT, TypeIndex>);           \
+
+#define REGISTER_KERNELS_CPU(T)       \
+  REGISTER_CPU(T, int64);             \
+  REGISTER_CPU(T, int32)
+
+REGISTER_KERNELS_CPU(float);
+REGISTER_KERNELS_CPU(double);
+REGISTER_KERNELS_CPU(int32);
+REGISTER_KERNELS_CPU(complex64);
+REGISTER_KERNELS_CPU(complex128);
 
 #if GOOGLE_CUDA
 
 namespace functor {
-#define DECLARE_GPU_SPEC(T, ADJ_A, ADJ_B)                                    \
-  template <>                                                                \
-  void SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B>::Compute(  \
-      const GPUDevice& d, typename TTypes<T>::Matrix out,                    \
-      TTypes<int64>::ConstMatrix a_indices,                                  \
-      typename TTypes<T>::ConstVec a_values,                                 \
-      typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);   \
-  extern template struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, \
-                                                        ADJ_B>;
-
-#define DECLARE_ADJOINT_GPU_SPEC(T) \
-  DECLARE_GPU_SPEC(T, false, false) \
-  DECLARE_GPU_SPEC(T, false, true)  \
-  DECLARE_GPU_SPEC(T, true, false)  \
-  DECLARE_GPU_SPEC(T, true, true)
+#define DECLARE_GPU_SPEC(T, Tindices, ADJ_A, ADJ_B)                            \
+  template <>                                                                  \
+  void SparseTensorDenseMatMulFunctor<GPUDevice, T, Tindices, ADJ_A,           \
+                                      ADJ_B>::Compute(                         \
+      const GPUDevice& d, typename TTypes<T>::Matrix out,                      \
+      typename TTypes<Tindices>::ConstMatrix a_indices,                        \
+      typename TTypes<T>::ConstVec a_values,                                   \
+      typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);     \
+  extern template struct SparseTensorDenseMatMulFunctor<GPUDevice, T, Tindices,\
+                                                        ADJ_A, ADJ_B>;
+
+#define REGISTER_GPU_SPEC(T, ADJ_A, ADJ_B)  \
+  DECLARE_GPU_SPEC(T, int32, ADJ_A, ADJ_B); \
+  DECLARE_GPU_SPEC(T, int64, ADJ_A, ADJ_B)
+
+#define DECLARE_ADJOINT_GPU_SPEC(T)  \
+  REGISTER_GPU_SPEC(T, false, false) \
+  REGISTER_GPU_SPEC(T, false, true)  \
+  REGISTER_GPU_SPEC(T, true, false)  \
+  REGISTER_GPU_SPEC(T, true, true)
 
 DECLARE_ADJOINT_GPU_SPEC(float);
 #undef DECLARE_ADJOINT_GPU_SPEC
 #undef DECLARE_GPU_SPEC
+#undef REGISTER_GPU_SPEC
 
 }  // namespace functor
 
-#define REGISTER_GPU(T)                                   \
-  REGISTER_KERNEL_BUILDER(Name("SparseTensorDenseMatMul") \
-                              .Device(DEVICE_GPU)         \
-                              .TypeConstraint<T>("T")     \
-                              .HostMemory("a_shape"),     \
-                          SparseTensorDenseMatMulOp<GPUDevice, T>);
+#define REGISTER_GPU(TypeT, TypeIndex)           \
+  REGISTER_KERNEL_BUILDER(                       \
+      Name("SparseTensorDenseMatMul")            \
+          .Device(DEVICE_GPU)                    \
+          .TypeConstraint<TypeT>("T")            \
+          .TypeConstraint<TypeIndex>("Tindices") \
+          .HostMemory("a_shape"),                \
+      SparseTensorDenseMatMulOp<GPUDevice, TypeT, TypeIndex>);
+
+#define REGISTER_KERNELS_GPU(T)    \
+  REGISTER_GPU(T, int64);          \
+  REGISTER_GPU(T, int32)
 
-REGISTER_GPU(float);
+REGISTER_KERNELS_GPU(float);
 #undef REGISTER_GPU
+#undef REGISTER_KERNELS_GPU
 #endif  // GOOGLE_CUDA
 
 namespace functor {
 
-template <typename T, bool ADJ_A, bool ADJ_B>
-struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
+template <typename T, typename Tindices, bool ADJ_A, bool ADJ_B>
+struct SparseTensorDenseMatMulFunctor<CPUDevice, T, Tindices, ADJ_A, ADJ_B> {
   // Vectorize certain operations above this size.
   static const std::size_t kNumVectorize = 32;
 
   static void Compute(const CPUDevice& d, typename TTypes<T>::Matrix out,
-                      TTypes<int64>::ConstMatrix a_indices,
+                      typename TTypes<Tindices>::ConstMatrix a_indices,
                       typename TTypes<T>::ConstVec a_values,
                       typename TTypes<T>::ConstMatrix b,
                       typename TTypes<T>::Vec scratch) {
@@ -237,8 +257,8 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
       // Disable vectorization if the RHS of output is too small
       auto maybe_adjoint_b = MaybeAdjoint<decltype(b), ADJ_B>(b);
       for (std::size_t i = 0; i < nnz; ++i) {
-        const int64 m = internal::SubtleMustCopy(a_indices(i, lhs_index_a));
-        const int64 k = internal::SubtleMustCopy(a_indices(i, rhs_index_a));
+        const Tindices m = internal::SubtleMustCopy(a_indices(i, lhs_index_a));
+        const Tindices k = internal::SubtleMustCopy(a_indices(i, rhs_index_a));
         CHECK_LT(k, lhs_right);
         CHECK_LT(m, out.dimension(0));
         const T a_value = ADJ_A ? MaybeConj(a_values(i)) : a_values(i);
@@ -251,15 +271,15 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
       // Vectorization via Eigen.
       const int b_chip_index = ADJ_B ? 1 : 0;
 
-#define LOOP_NNZ(b_passed)                                               \
-  for (std::size_t i = 0; i < nnz; ++i) {                                \
-    const int64 m = internal::SubtleMustCopy(a_indices(i, lhs_index_a)); \
-    const int64 k = internal::SubtleMustCopy(a_indices(i, rhs_index_a)); \
-    const T a_value = (ADJ_A) ? MaybeConj(a_values(i)) : a_values(i);    \
-    CHECK_LT(m, out.dimension(0));                                       \
-    CHECK_LT(k, lhs_right);                                              \
-    out.template chip<0>(m) +=                                           \
-        b_passed.template chip<b_chip_index>(k) * a_value;               \
+#define LOOP_NNZ(b_passed)                                                  \
+  for (std::size_t i = 0; i < nnz; ++i) {                                   \
+    const Tindices m = internal::SubtleMustCopy(a_indices(i, lhs_index_a)); \
+    const Tindices k = internal::SubtleMustCopy(a_indices(i, rhs_index_a)); \
+    const T a_value = (ADJ_A) ? MaybeConj(a_values(i)) : a_values(i);       \
+    CHECK_LT(m, out.dimension(0));                                          \
+    CHECK_LT(k, lhs_right);                                                 \
+    out.template chip<0>(m) +=                                              \
+        b_passed.template chip<b_chip_index>(k) * a_value;                  \
   }
 
       if (ADJ_B) {
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
index 3bec4ce5f2..d8dfa464ac 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
@@ -24,14 +24,16 @@ namespace tensorflow {
 
 namespace functor {
 
-template <typename Device, typename T, bool ADJ_A, bool ADJ_B>
+template <typename Device, typename T, typename Tindices, bool ADJ_A,   \
+          bool ADJ_B>
 struct SparseTensorDenseMatMulFunctor {
-  static EIGEN_ALWAYS_INLINE void Compute(const Device& d,
-                                          typename TTypes<T>::Matrix out,
-                                          TTypes<int64>::ConstMatrix a_indices,
-                                          typename TTypes<T>::ConstVec a_values,
-                                          typename TTypes<T>::ConstMatrix b,
-                                          typename TTypes<T>::Vec scratch);
+  static EIGEN_ALWAYS_INLINE void Compute(
+      const Device& d,
+      typename TTypes<T>::Matrix out,
+      typename TTypes<Tindices>::ConstMatrix a_indices,
+      typename TTypes<T>::ConstVec a_values,
+      typename TTypes<T>::ConstMatrix b,
+      typename TTypes<T>::Vec scratch);
 };
 
 template <typename MATRIX, bool ADJ>
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
index a1776968f0..b2e7f045ba 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
@@ -27,12 +27,12 @@ typedef Eigen::GpuDevice GPUDevice;
 
 namespace generator {
 
-template <typename T, bool ADJ_A, bool ADJ_B>
+template <typename T, typename Tindices, bool ADJ_A, bool ADJ_B>
 class SparseTensorDenseMatMulGPUGenerator {
  public:
   EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE SparseTensorDenseMatMulGPUGenerator(
       typename TTypes<T, 2>::Tensor32Bit out,
-      TTypes<const int64, 2>::Tensor32Bit a_indices,
+      typename TTypes<const Tindices, 2>::Tensor32Bit a_indices,
       typename TTypes<const T, 1>::Tensor32Bit a_values,
       typename TTypes<const T, 2>::Tensor32Bit b)
       : out_(out),
@@ -77,7 +77,7 @@ class SparseTensorDenseMatMulGPUGenerator {
   mutable typename TTypes<T, 2>::Tensor32Bit out_;
   const int lhs_index_a_;
   const int rhs_index_a_;
-  TTypes<const int64, 2>::Tensor32Bit a_indices_;
+  typename TTypes<const Tindices, 2>::Tensor32Bit a_indices_;
   typename TTypes<const T, 1>::Tensor32Bit a_values_;
   const int lhs_right_size;
   functor::MaybeAdjoint<typename TTypes<const T, 2>::Tensor32Bit, ADJ_B>
@@ -88,15 +88,14 @@ class SparseTensorDenseMatMulGPUGenerator {
 
 namespace functor {
 
-template <typename T, bool ADJ_A, bool ADJ_B>
-struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B> {
-  static EIGEN_ALWAYS_INLINE void Compute(const GPUDevice& d,
-                                          typename TTypes<T>::Matrix out,
-                                          TTypes<int64>::ConstMatrix a_indices,
-                                          typename TTypes<T>::ConstVec a_values,
-                                          typename TTypes<T>::ConstMatrix b,
-                                          typename TTypes<T>::Vec scratch) {
-    generator::SparseTensorDenseMatMulGPUGenerator<T, ADJ_A, ADJ_B>
+template <typename T, typename Tindices, bool ADJ_A, bool ADJ_B>
+struct SparseTensorDenseMatMulFunctor<GPUDevice, T, Tindices, ADJ_A, ADJ_B> {
+  static EIGEN_ALWAYS_INLINE void Compute(
+        const GPUDevice& d, typename TTypes<T>::Matrix out,
+        typename TTypes<Tindices>::ConstMatrix a_indices,
+        typename TTypes<T>::ConstVec a_values,
+        typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch) {
+    generator::SparseTensorDenseMatMulGPUGenerator<T, Tindices, ADJ_A, ADJ_B>
         sparse_tensor_dense_matmul_generator(To32Bit(out), To32Bit(a_indices),
                                              To32Bit(a_values), To32Bit(b));
     To32Bit(out).device(d) = To32Bit(out).constant(T(0));
@@ -145,17 +144,18 @@ struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B> {
 
 }  // namespace functor
 
-#define DEFINE(T)                                                              \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, false, \
-                                                          false>;              \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, false, \
-                                                          true>;               \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, true,  \
-                                                          false>;              \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, true,  \
-                                                          true>;
-
-DEFINE(float);
+#define DEFINE(T, Tindices)                                                    \
+  template struct functor::SparseTensorDenseMatMulFunctor<                     \
+      GPUDevice, T, Tindices, false, false>;                                   \
+  template struct functor::SparseTensorDenseMatMulFunctor<                     \
+      GPUDevice, T, Tindices, false, true>;                                    \
+  template struct functor::SparseTensorDenseMatMulFunctor<                     \
+      GPUDevice, T, Tindices, true, false>;                                    \
+  template struct functor::SparseTensorDenseMatMulFunctor<                     \
+      GPUDevice, T, Tindices, true, true>;
+
+DEFINE(float, int32);
+DEFINE(float, int64);
 #undef DEFINE
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/ops/sparse_ops.cc b/tensorflow/core/ops/sparse_ops.cc
index 860b3475e9..b90f7a5dfb 100644
--- a/tensorflow/core/ops/sparse_ops.cc
+++ b/tensorflow/core/ops/sparse_ops.cc
@@ -128,12 +128,13 @@ pair takes space.
 )doc");
 
 REGISTER_OP("SparseTensorDenseMatMul")
-    .Input("a_indices: int64")
+    .Input("a_indices: Tindices")
     .Input("a_values: T")
     .Input("a_shape: int64")
     .Input("b: T")
     .Output("product: T")
     .Attr("T: type")
+    .Attr("Tindices: {int32,int64} = DT_INT64")
     .Attr("adjoint_a: bool = false")
     .Attr("adjoint_b: bool = false")
     .SetShapeFn([](InferenceContext* c) {
diff --git a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py
index df5462dd2d..3af73907a6 100644
--- a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py
+++ b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py
@@ -30,34 +30,37 @@ from tensorflow.python.platform import test
 
 class SparseTensorDenseMatMulGradientTest(test.TestCase):
 
-  def _sparsify(self, x):
+  def _sparsify(self, x, indices_dtype=np.int64):
     x[x < 0.5] = 0
 
     non_zero = np.where(x)
-    x_indices = np.vstack(non_zero).astype(np.int64).T
+    x_indices = np.vstack(non_zero).astype(indices_dtype).T
     x_values = x[non_zero]
     x_shape = x.shape
 
     return sparse_tensor.SparseTensor(
         indices=x_indices, values=x_values, dense_shape=x_shape), len(x_values)
 
-  def _randomTensor(self, size, np_dtype, adjoint=False, sparse=False):
+  def _randomTensor(self, size, values_dtype, adjoint=False, sparse=False,
+                    indices_dtype=np.int64):
     n, m = size
-    x = np.random.randn(n, m).astype(np_dtype)
+    x = np.random.randn(n, m).astype(values_dtype)
 
     if adjoint:
       x = x.transpose()
 
     if sparse:
-      return self._sparsify(x)
+      return self._sparsify(x, indices_dtype=indices_dtype)
     else:
-      return constant_op.constant(x, dtype=np_dtype)
+      return constant_op.constant(x, dtype=values_dtype)
 
-  def _testGradients(self, adjoint_a, adjoint_b, name, np_dtype):
+  def _testGradients(self, adjoint_a, adjoint_b, name, values_dtype,
+                     indices_dtype):
     n, k, m = np.random.randint(1, 10, size=3)
     sp_t, nnz = self._randomTensor(
-        [n, k], np_dtype, adjoint=adjoint_a, sparse=True)
-    dense_t = self._randomTensor([k, m], np_dtype, adjoint=adjoint_b)
+        [n, k], values_dtype, adjoint=adjoint_a, sparse=True,
+      indices_dtype=indices_dtype)
+    dense_t = self._randomTensor([k, m], values_dtype, adjoint=adjoint_b)
 
     matmul = sparse_ops.sparse_tensor_dense_matmul(
         sp_t, dense_t, adjoint_a=adjoint_a, adjoint_b=adjoint_b, name=name)
@@ -71,17 +74,19 @@ class SparseTensorDenseMatMulGradientTest(test.TestCase):
       print("%s gradient err = %s" % (name, err))
       self.assertLess(err, 1e-3)
 
-  def _testGradientsType(self, np_dtype):
+  def _testGradientsType(self, values_dtype, indices_dtype):
     for adjoint_a in [True, False]:
       for adjoint_b in [True, False]:
-        name = "sparse_tensor_dense_matmul_%s_%s_%s" % (adjoint_a, adjoint_b,
-                                                        np_dtype.__name__)
-        self._testGradients(adjoint_a, adjoint_b, name, np_dtype)
+        name = "sparse_tensor_dense_matmul_%s_%s_%s_%s" % (
+          adjoint_a, adjoint_b, values_dtype.__name__, indices_dtype.__name__)
+        self._testGradients(adjoint_a, adjoint_b, name, values_dtype,
+                            indices_dtype)
 
   def testGradients(self):
     np.random.seed(5)  # Fix seed to avoid flakiness
-    self._testGradientsType(np.float32)
-    self._testGradientsType(np.float64)
+    self._testGradientsType(np.float32, np.int64)
+    self._testGradientsType(np.float64, np.int64)
+    self._testGradientsType(np.float32, np.int32)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
index 25da6691e6..c0d81f7651 100644
--- a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
@@ -45,7 +45,8 @@ def _maybe_complex(x):
 
 class SparseTensorDenseMatMulTest(test.TestCase):
 
-  def _testMatmul(self, x, y, adjoint_a=False, adjoint_b=False):
+  def _testMatmul(self, x, y, adjoint_a=False, adjoint_b=False,
+                  indices_dtype=np.int64):
     x_mat = np.matrix(x)
     if adjoint_a:
       x_mat = x_mat.H
@@ -55,7 +56,7 @@ class SparseTensorDenseMatMulTest(test.TestCase):
 
     np_ans = x_mat * y_mat
 
-    x_indices = np.vstack(np.where(x)).astype(np.int64).T
+    x_indices = np.vstack(np.where(x)).astype(indices_dtype).T
     x_values = x[np.where(x)]
     x_shape = x.shape
 
@@ -82,13 +83,13 @@ class SparseTensorDenseMatMulTest(test.TestCase):
         else:
           self.assertAllClose(np_ans, out, rtol=1e-4, atol=1e-4)
 
-  def _testBasic(self, np_dtype):
-    x = _maybe_complex(np.random.rand(10, 10).astype(np_dtype))
+  def _testBasic(self, value_dtype, indices_dtype=np.int64):
+    x = _maybe_complex(np.random.rand(10, 10).astype(value_dtype))
     x[np.abs(x) < 0.5] = 0  # Make it sparse
 
-    y = _maybe_complex(np.random.randn(10, 20).astype(np_dtype))
+    y = _maybe_complex(np.random.randn(10, 20).astype(value_dtype))
 
-    self._testMatmul(x, y)
+    self._testMatmul(x, y, indices_dtype=indices_dtype)
 
   def testBasic(self):
     np.random.seed(127)  # Repeatable results
@@ -97,6 +98,8 @@ class SparseTensorDenseMatMulTest(test.TestCase):
     self._testBasic(np.float64)
     self._testBasic(np.complex64)
     self._testBasic(np.complex128)
+    self._testBasic(np.int32, indices_dtype=np.int32)
+    self._testBasic(np.float32, indices_dtype=np.int32)
 
   def testShapeInference(self):
     x = np.random.rand(10, 10)
diff --git a/tensorflow/python/ops/sparse_grad.py b/tensorflow/python/ops/sparse_grad.py
index fa015856ce..6a6158620f 100644
--- a/tensorflow/python/ops/sparse_grad.py
+++ b/tensorflow/python/ops/sparse_grad.py
@@ -136,12 +136,13 @@ def _SparseTensorDenseMatMulGrad(op, grad):
   Raises:
     TypeError: When the two operands don't have the same type.
   """
-  sp_t = sparse_tensor.SparseTensor(*op.inputs[:3])
+  a_indices, a_values, a_shape = op.inputs[:3]
+  b = op.inputs[3]
   adj_a = op.get_attr("adjoint_a")
   adj_b = op.get_attr("adjoint_b")
 
-  a_type = sp_t.values.dtype.base_dtype
-  b_type = op.inputs[3].dtype.base_dtype
+  a_type = a_values.dtype.base_dtype
+  b_type = b.dtype.base_dtype
   if a_type != b_type:
     raise TypeError("SparseTensorDenseMatMul op received operands with "
                     "different types: ", a_type, " and ", b_type)
@@ -150,15 +151,12 @@ def _SparseTensorDenseMatMulGrad(op, grad):
                               "complex gradients.")
 
   # gradient w.r.t. dense
-  b_grad = sparse_ops.sparse_tensor_dense_matmul(sp_t, grad,
-                                                 adjoint_a=not adj_a)
+  b_grad = gen_sparse_ops._sparse_tensor_dense_mat_mul(
+    a_indices, a_values, a_shape, grad, adjoint_a=not adj_a)
   if adj_b:
     b_grad = array_ops.transpose(b_grad)
 
   # gradient w.r.t. sparse values
-  a_indices = op.inputs[0]
-  b = op.inputs[3]
-
   rows = a_indices[:, 0]
   cols = a_indices[:, 1]
 
-- 
GitLab


From 283789792f3a4df2e54ee6b3b62771809894f7aa Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Fri, 14 Apr 2017 19:16:03 -0800
Subject: [PATCH 0433/1563] Add model_dir in RunConfig. Estimator will read it
 also. Change: 153233683

---
 tensorflow/python/estimator/estimator.py      | 25 +++++---
 tensorflow/python/estimator/estimator_test.py | 62 ++++++++++++++++++-
 tensorflow/python/estimator/run_config.py     |  4 ++
 .../tensorflow.estimator.-run-config.pbtxt    |  4 ++
 4 files changed, 86 insertions(+), 9 deletions(-)

diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 80c5bbf684..449cb54c84 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -111,7 +111,9 @@ class Estimator(object):
           `EstimatorSpec`
       model_dir: Directory to save model parameters, graph and etc. This can
         also be used to load checkpoints from the directory into a estimator to
-        continue training a previously saved model.
+        continue training a previously saved model. If `None`, the model_dir in
+        `config` will be used if set. If both are set, they must be same. If
+        both are `None`, a temporary directory will be used.
       config: Configuration object.
       params: `dict` of hyper parameters that will be passed into `model_fn`.
               Keys are names of parameters, values are basic python types.
@@ -122,12 +124,6 @@ class Estimator(object):
         a member of `Estimator`.
     """
     Estimator._assert_members_are_not_overridden(self)
-    # Model directory.
-    self._model_dir = model_dir
-    if self._model_dir is None:
-      self._model_dir = tempfile.mkdtemp()
-      logging.warning('Using temporary folder as model directory: %s',
-                      self._model_dir)
 
     if config is None:
       self._config = run_config.RunConfig()
@@ -139,6 +135,21 @@ class Estimator(object):
             config)
       self._config = config
 
+    # Model directory.
+    if (model_dir is not None) and (self._config.model_dir is not None):
+      if model_dir != self._config.model_dir:
+        # pylint: disable=g-doc-exception
+        raise ValueError(
+            "model_dir are set both in constructor and RunConfig, but with "
+            "different values. In constructor: '{}', in RunConfig: "
+            "'{}' ".format(model_dir, self._config.model_dir))
+        # pylint: enable=g-doc-exception
+
+    self._model_dir = model_dir or self._config.model_dir
+    if self._model_dir is None:
+      self._model_dir = tempfile.mkdtemp()
+      logging.warning('Using temporary folder as model directory: %s',
+                      self._model_dir)
     logging.info('Using config: %s', str(vars(self._config)))
 
     if self._config.session_config is None:
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 84813073d3..89a9483e20 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -58,6 +58,9 @@ from tensorflow.python.training import session_run_hook
 from tensorflow.python.training import training
 from tensorflow.python.util import compat
 
+_TMP_DIR = '/tmp'
+_ANOTHER_TMP_DIR = '/another_tmp'
+
 
 def dummy_model_fn(features, labels, params):
   _, _, _ = features, labels, params
@@ -122,7 +125,7 @@ class EstimatorConstructorTest(test.TestCase):
     def model_fn(features, labels, params):
       _, _, _ = features, labels, params
 
-    class FakeConfig(run_config.RunConfig):  # pylint: disable=g-wrong-blank-lines
+    class FakeConfig(run_config.RunConfig):
       pass
 
     params = {'hidden_layers': [3, 4]}
@@ -148,6 +151,61 @@ class EstimatorConstructorTest(test.TestCase):
     est = estimator.Estimator(model_fn=model_fn)
     self.assertTrue(est.model_dir is not None)
 
+  def test_model_dir_in_constructor(self):
+
+    def model_fn(features, labels):
+      _, _ = features, labels
+
+    est = estimator.Estimator(model_fn=model_fn, model_dir=_TMP_DIR)
+    self.assertEqual(_TMP_DIR, est.model_dir)
+
+  def test_model_dir_in_run_config(self):
+
+    class FakeConfig(run_config.RunConfig):
+
+      @property
+      def model_dir(self):
+        return _TMP_DIR
+
+    def model_fn(features, labels):
+      _, _ = features, labels
+
+    est = estimator.Estimator(model_fn=model_fn, config=FakeConfig())
+    self.assertEqual(_TMP_DIR, est.model_dir)
+
+  def test_same_model_dir_in_constructor_and_run_config(self):
+
+    class FakeConfig(run_config.RunConfig):
+
+      @property
+      def model_dir(self):
+        return _TMP_DIR
+
+    def model_fn(features, labels):
+      _, _ = features, labels
+
+    est = estimator.Estimator(
+        model_fn=model_fn, config=FakeConfig(), model_dir=_TMP_DIR)
+    self.assertEqual(_TMP_DIR, est.model_dir)
+
+  def test_different_model_dir_in_constructor_and_run_config(self):
+
+    class FakeConfig(run_config.RunConfig):
+
+      @property
+      def model_dir(self):
+        return _TMP_DIR
+
+    def model_fn(features, labels):
+      _, _ = features, labels
+
+    with self.assertRaisesRegexp(
+        ValueError,
+        'model_dir are set both in constructor and RunConfig, but '
+        'with different values'):
+      estimator.Estimator(
+          model_fn=model_fn, config=FakeConfig(), model_dir=_ANOTHER_TMP_DIR)
+
   def test_model_fn_args_must_include_features(self):
 
     def model_fn(x, labels):
@@ -359,7 +417,7 @@ class EstimatorTrainTest(test.TestCase):
           training_chief_hooks=[chief_hook],
           training_hooks=[hook])
 
-    class NonChiefRunConfig(run_config.RunConfig):  # pylint: disable=g-wrong-blank-lines
+    class NonChiefRunConfig(run_config.RunConfig):
       @property
       def is_chief(self):  # pylint: disable=g-wrong-blank-lines
         return False
diff --git a/tensorflow/python/estimator/run_config.py b/tensorflow/python/estimator/run_config.py
index 79b55c6853..504bf5c3fe 100644
--- a/tensorflow/python/estimator/run_config.py
+++ b/tensorflow/python/estimator/run_config.py
@@ -87,3 +87,7 @@ class RunConfig(object):
   @property
   def keep_checkpoint_every_n_hours(self):
     return 10000
+
+  @property
+  def model_dir(self):
+    return None
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
index 8fd991a317..32082fc10b 100644
--- a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
@@ -26,6 +26,10 @@ tf_class {
     name: "master"
     mtype: "<type \'property\'>"
   }
+  member {
+    name: "model_dir"
+    mtype: "<type \'property\'>"
+  }
   member {
     name: "num_ps_replicas"
     mtype: "<type \'property\'>"
-- 
GitLab


From 5b6e90eb5c26a2b6232626c58a615800fba47b6e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 14 Apr 2017 19:31:12 -0800
Subject: [PATCH 0434/1563] [XLA] Only pass instruction in instruction visitor
 functions. Change: 153234174

---
 .../compiler/xla/service/cpu/cpu_compiler.cc      | 10 +++++-----
 tensorflow/compiler/xla/service/cpu/ir_emitter.cc | 15 ++++++++-------
 tensorflow/compiler/xla/service/cpu/ir_emitter.h  |  7 ++-----
 tensorflow/compiler/xla/service/dfs_hlo_visitor.h |  9 ++-------
 .../xla/service/dfs_hlo_visitor_with_default.h    |  8 ++------
 tensorflow/compiler/xla/service/gpu/ir_emitter.cc |  8 +++-----
 tensorflow/compiler/xla/service/gpu/ir_emitter.h  |  7 ++-----
 .../xla/service/gpu/ir_emitter_unnested.cc        |  6 ++----
 .../compiler/xla/service/hlo_cost_analysis.cc     | 15 +++++----------
 .../compiler/xla/service/hlo_cost_analysis.h      |  7 ++-----
 .../compiler/xla/service/hlo_instruction.cc       |  5 ++---
 11 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
index aa5e84d65b..14f69a362e 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
@@ -193,16 +193,16 @@ class CollectProfileCandidates : public DfsHloVisitorWithDefault {
   }
   // It is important to recurse for "while" or else we risk overly coarse
   // profiling information.
-  Status HandleWhile(HloInstruction* xla_while, HloInstruction* /*init*/,
-                     HloComputation* condition, HloComputation* body) override {
+  Status HandleWhile(HloInstruction* xla_while) override {
     TF_RETURN_IF_ERROR(DefaultAction(xla_while));
 
     CollectProfileCandidates candidates_for_condition(hlo_to_profile_idx_);
-    TF_RETURN_IF_ERROR(
-        condition->root_instruction()->Accept(&candidates_for_condition));
+    TF_RETURN_IF_ERROR(xla_while->while_condition()->root_instruction()->Accept(
+        &candidates_for_condition));
 
     CollectProfileCandidates candidates_for_body(hlo_to_profile_idx_);
-    TF_RETURN_IF_ERROR(body->root_instruction()->Accept(&candidates_for_body));
+    TF_RETURN_IF_ERROR(xla_while->while_body()->root_instruction()->Accept(
+        &candidates_for_body));
 
     return Status::OK();
   }
diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
index 51c6dc4426..3a8d74c21c 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
@@ -1265,13 +1265,12 @@ Status IrEmitter::HandleFusion(HloInstruction* fusion) {
   }
 }
 
-Status IrEmitter::HandleCall(
-    HloInstruction* call, tensorflow::gtl::ArraySlice<HloInstruction*> operands,
-    HloComputation* computation) {
+Status IrEmitter::HandleCall(HloInstruction* call) {
+  HloComputation* computation = call->to_apply();
   llvm::Function* call_ir_function = FindOrDie(emitted_functions_, computation);
 
   std::vector<llvm::Value*> parameter_addresses;
-  for (HloInstruction* operand : operands) {
+  for (const HloInstruction* operand : call->operands()) {
     parameter_addresses.push_back(GetEmittedValueFor(operand));
   }
 
@@ -1322,9 +1321,9 @@ Status IrEmitter::HandleCustomCall(
   return Status::OK();
 }
 
-Status IrEmitter::HandleWhile(HloInstruction* xla_while, HloInstruction* init,
-                              HloComputation* condition, HloComputation* body) {
+Status IrEmitter::HandleWhile(HloInstruction* xla_while) {
   // Precondition: Condition computation must return a scalar bool.
+  HloComputation* condition = xla_while->while_condition();
   TF_RET_CHECK(ShapeUtil::IsScalar(condition->root_instruction()->shape()) &&
                condition->root_instruction()->shape().element_type() == PRED)
       << "While condition computation must return bool";
@@ -1361,12 +1360,14 @@ Status IrEmitter::HandleWhile(HloInstruction* xla_while, HloInstruction* init,
       }));
 
   // Set emitted value to that of 'init' with which it shares an allocation.
+  const HloInstruction* init = xla_while->operand(0);
   emitted_value_[xla_while] = GetEmittedValueFor(init);
 
   // The called computation should have been emitted previously.
   llvm::Function* condition_ir_function =
       FindOrDie(emitted_functions_, condition);
-  llvm::Function* body_ir_function = FindOrDie(emitted_functions_, body);
+  llvm::Function* body_ir_function =
+      FindOrDie(emitted_functions_, xla_while->while_body());
 
   // Generating:
   //   while (Condition(while_result)) {
diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.h b/tensorflow/compiler/xla/service/cpu/ir_emitter.h
index 66bae457e3..6bcd9aa287 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.h
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.h
@@ -125,14 +125,11 @@ class IrEmitter : public DfsHloVisitorWithDefault {
       HloComputation* function,
       tensorflow::gtl::ArraySlice<HloInstruction*> static_operands) override;
   Status HandleFusion(HloInstruction* fusion) override;
-  Status HandleCall(HloInstruction* call,
-                    tensorflow::gtl::ArraySlice<HloInstruction*> operands,
-                    HloComputation* computation) override;
+  Status HandleCall(HloInstruction* call) override;
   Status HandleCustomCall(HloInstruction* custom_call,
                           tensorflow::gtl::ArraySlice<HloInstruction*> operands,
                           tensorflow::StringPiece custom_call_target) override;
-  Status HandleWhile(HloInstruction* xla_while, HloInstruction* init,
-                     HloComputation* condition, HloComputation* body) override;
+  Status HandleWhile(HloInstruction* xla_while) override;
   Status FinishVisit(HloInstruction* root) override;
 
   Status Preprocess(HloInstruction* hlo) override;
diff --git a/tensorflow/compiler/xla/service/dfs_hlo_visitor.h b/tensorflow/compiler/xla/service/dfs_hlo_visitor.h
index 351efa82dd..a18c643eb7 100644
--- a/tensorflow/compiler/xla/service/dfs_hlo_visitor.h
+++ b/tensorflow/compiler/xla/service/dfs_hlo_visitor.h
@@ -189,10 +189,7 @@ class DfsHloVisitor {
   virtual Status HandleTranspose(HloInstruction* transpose) = 0;
   virtual Status HandleParameter(HloInstruction* parameter) = 0;
   virtual Status HandleFusion(HloInstruction* fusion) = 0;
-  virtual Status HandleCall(
-      HloInstruction* call,
-      tensorflow::gtl::ArraySlice<HloInstruction*> operands,
-      HloComputation* computation) = 0;
+  virtual Status HandleCall(HloInstruction* call) = 0;
   virtual Status HandleCustomCall(
       HloInstruction* custom_call,
       tensorflow::gtl::ArraySlice<HloInstruction*> operands,
@@ -219,9 +216,7 @@ class DfsHloVisitor {
                                     const Window& window,
                                     HloComputation* function) = 0;
   virtual Status HandleSelectAndScatter(HloInstruction* instruction) = 0;
-  virtual Status HandleWhile(HloInstruction* xla_while, HloInstruction* init,
-                             HloComputation* condition,
-                             HloComputation* body) = 0;
+  virtual Status HandleWhile(HloInstruction* xla_while) = 0;
 
   virtual Status HandlePad(HloInstruction* pad) = 0;
 
diff --git a/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h b/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h
index 18cfaf83e1..684ccc5720 100644
--- a/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h
+++ b/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h
@@ -121,9 +121,7 @@ class DfsHloVisitorWithDefault : public DfsHloVisitor {
   Status HandleFusion(HloInstruction* fusion) override {
     return DefaultAction(fusion);
   }
-  Status HandleCall(HloInstruction* call,
-                    tensorflow::gtl::ArraySlice<HloInstruction*> /*operands*/,
-                    HloComputation* /*computation*/) override {
+  Status HandleCall(HloInstruction* call) override {
     return DefaultAction(call);
   }
   Status HandleCustomCall(
@@ -188,9 +186,7 @@ class DfsHloVisitorWithDefault : public DfsHloVisitor {
   Status HandleTranspose(HloInstruction* transpose) override {
     return DefaultAction(transpose);
   }
-  Status HandleWhile(HloInstruction* xla_while, HloInstruction* /*init*/,
-                     HloComputation* /*condition*/,
-                     HloComputation* /*body*/) override {
+  Status HandleWhile(HloInstruction* xla_while) override {
     return DefaultAction(xla_while);
   }
   Status HandleSend(HloInstruction* send) override {
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emitter.cc b/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
index 5f3ce85f85..e60978df0a 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
@@ -549,14 +549,12 @@ Status IrEmitter::HandleFusion(HloInstruction* fusion) {
   return EmitTargetElementLoop(*fusion, fused_emitter.GetRootGenerator());
 }
 
-Status IrEmitter::HandleCall(
-    HloInstruction* call, tensorflow::gtl::ArraySlice<HloInstruction*> operands,
-    HloComputation* computation) {
+Status IrEmitter::HandleCall(HloInstruction* call) {
   std::vector<llvm::Value*> operand_addresses;
-  for (HloInstruction* operand : operands) {
+  for (HloInstruction* operand : call->operands()) {
     operand_addresses.push_back(GetBasePointer(*operand));
   }
-  return EmitCallToNestedComputation(*computation, operand_addresses,
+  return EmitCallToNestedComputation(*call->to_apply(), operand_addresses,
                                      GetBasePointer(*call));
 }
 
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emitter.h b/tensorflow/compiler/xla/service/gpu/ir_emitter.h
index 1aefee2739..513bead62d 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emitter.h
+++ b/tensorflow/compiler/xla/service/gpu/ir_emitter.h
@@ -101,9 +101,7 @@ class IrEmitter : public DfsHloVisitorWithDefault {
                       HloInstruction* on_true,
                       HloInstruction* on_false) override;
   Status HandleFusion(HloInstruction* fusion) override;
-  Status HandleCall(HloInstruction* call,
-                    tensorflow::gtl::ArraySlice<HloInstruction*> operands,
-                    HloComputation* computation) override;
+  Status HandleCall(HloInstruction* call) override;
   Status HandleCustomCall(HloInstruction* custom_call,
                           tensorflow::gtl::ArraySlice<HloInstruction*> operands,
                           tensorflow::StringPiece custom_call_target) override;
@@ -249,8 +247,7 @@ class IrEmitterUnnested : public IrEmitter {
   Status HandleTuple(
       HloInstruction* tuple,
       tensorflow::gtl::ArraySlice<HloInstruction*> operands) override;
-  Status HandleWhile(HloInstruction* xla_while, HloInstruction* init,
-                     HloComputation* condition, HloComputation* body) override;
+  Status HandleWhile(HloInstruction* xla_while) override;
   Status HandleRng(HloInstruction* random,
                    RandomDistribution distribution) override;
   Status HandleSelect(HloInstruction* select, HloInstruction* pred,
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc b/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc
index 9b7aa7c860..04babcca0c 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc
+++ b/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc
@@ -1540,10 +1540,8 @@ Status IrEmitterUnnested::HandleSelectAndScatter(
       .EmitLoop();
 }
 
-Status IrEmitterUnnested::HandleWhile(HloInstruction* xla_while,
-                                      HloInstruction* init,
-                                      HloComputation* condition,
-                                      HloComputation* body) {
+Status IrEmitterUnnested::HandleWhile(HloInstruction* xla_while) {
+  HloComputation* condition = xla_while->while_condition();
   TF_RET_CHECK(ShapeUtil::IsScalar(condition->root_instruction()->shape()) &&
                condition->root_instruction()->shape().element_type() == PRED)
       << "While condition computation must return bool";
diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis.cc b/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
index 5fc7d6b22e..aeb5b4df66 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
@@ -368,11 +368,9 @@ Status HloCostAnalysis::HandleFusion(HloInstruction* fusion) {
   return Status::OK();
 }
 
-Status HloCostAnalysis::HandleCall(
-    HloInstruction* call, tensorflow::gtl::ArraySlice<HloInstruction*> operands,
-    HloComputation* computation) {
+Status HloCostAnalysis::HandleCall(HloInstruction* call) {
   HloCostAnalysis computation_visitor(shape_size_);
-  TF_RETURN_IF_ERROR(computation->Accept(&computation_visitor));
+  TF_RETURN_IF_ERROR(call->to_apply()->Accept(&computation_visitor));
 
   current_flop_count_ = computation_visitor.flop_count();
   current_transcendental_count_ = computation_visitor.transcendental_count();
@@ -396,18 +394,15 @@ Status HloCostAnalysis::HandleSort(HloInstruction* sort,
   return Status::OK();
 }
 
-Status HloCostAnalysis::HandleWhile(HloInstruction* xla_while,
-                                    HloInstruction* init,
-                                    HloComputation* condition,
-                                    HloComputation* body) {
+Status HloCostAnalysis::HandleWhile(HloInstruction* xla_while) {
   // Since the number of iterations of the while node is not statically
   // determined, we cannot precisely compute the cost of a while node. For now
   // compute the cost of a single iteration.
   // TODO(b/26346211): Improve the cost analysis for while node.
   HloCostAnalysis body_visitor(shape_size_);
-  TF_RETURN_IF_ERROR(body->Accept(&body_visitor));
+  TF_RETURN_IF_ERROR(xla_while->while_body()->Accept(&body_visitor));
   HloCostAnalysis condition_visitor(shape_size_);
-  TF_RETURN_IF_ERROR(condition->Accept(&condition_visitor));
+  TF_RETURN_IF_ERROR(xla_while->while_condition()->Accept(&condition_visitor));
 
   current_flop_count_ =
       body_visitor.flop_count() + condition_visitor.flop_count();
diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis.h b/tensorflow/compiler/xla/service/hlo_cost_analysis.h
index e6f059f533..05c2e4d10c 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis.h
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis.h
@@ -84,9 +84,7 @@ class HloCostAnalysis : public DfsHloVisitor {
                       tensorflow::gtl::ArraySlice<int64> dimensions,
                       HloComputation* function_handle) override;
   Status HandleFusion(HloInstruction* fusion) override;
-  Status HandleCall(HloInstruction* call,
-                    tensorflow::gtl::ArraySlice<HloInstruction*> operands,
-                    HloComputation* computation) override;
+  Status HandleCall(HloInstruction* call) override;
   Status HandleCustomCall(HloInstruction* custom_call,
                           tensorflow::gtl::ArraySlice<HloInstruction*> operands,
                           tensorflow::StringPiece custom_call_target) override;
@@ -115,8 +113,7 @@ class HloCostAnalysis : public DfsHloVisitor {
   Status HandlePad(HloInstruction* pad) override;
   Status HandleReshape(HloInstruction* reshape) override;
   Status HandleTranspose(HloInstruction* transpose) override;
-  Status HandleWhile(HloInstruction* xla_while, HloInstruction* init,
-                     HloComputation* condition, HloComputation* body) override;
+  Status HandleWhile(HloInstruction* xla_while) override;
   Status FinishVisit(HloInstruction* root) override;
 
   Status Preprocess(HloInstruction* hlo) override;
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 0cfde79c97..e14529a5b6 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -1716,12 +1716,11 @@ Status HloInstruction::Visit(DfsHloVisitor* visitor) {
     case HloOpcode::kRng:
       return visitor->HandleRng(this, distribution_);
     case HloOpcode::kWhile:
-      return visitor->HandleWhile(this, operands_[0], while_condition(),
-                                  while_body());
+      return visitor->HandleWhile(this);
     case HloOpcode::kFusion:
       return visitor->HandleFusion(this);
     case HloOpcode::kCall:
-      return visitor->HandleCall(this, operands_, to_apply());
+      return visitor->HandleCall(this);
     case HloOpcode::kCustomCall:
       return visitor->HandleCustomCall(this, operands_, custom_call_target_);
     case HloOpcode::kSend:
-- 
GitLab


From f7e1a723aa40e29ac7a887e481e3f183e1b38ff8 Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Fri, 14 Apr 2017 21:42:40 -0800
Subject: [PATCH 0435/1563] Internal-only changes. Change: 153238377

---
 tensorflow/compiler/xla/service/hlo_instruction.cc | 5 +++++
 tensorflow/compiler/xla/service/hlo_instruction.h  | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index e14529a5b6..979afa4369 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <algorithm>
 #include <deque>
+#include <ostream>
 #include <set>
 #include <unordered_set>
 #include <utility>
@@ -2106,6 +2107,10 @@ string ToString(HloInstruction::FusionKind kind) {
   }
 }
 
+std::ostream& operator<<(std::ostream& os, HloInstruction::FusionKind kind) {
+  return os << ToString(kind);
+}
+
 string HloInstruction::ConvolutionDimensionNumbersToString() const {
   string result;
   if (convolution_dimension_numbers_ == nullptr) {
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 6557ca9116..5f160892e9 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -22,6 +22,7 @@ limitations under the License.
 #define TENSORFLOW_COMPILER_XLA_SERVICE_HLO_INSTRUCTION_H_
 
 #include <functional>
+#include <iosfwd>
 #include <list>
 #include <memory>
 #include <string>
@@ -898,6 +899,8 @@ class HloInstruction {
 
 string ToString(HloInstruction::FusionKind kind);
 
+std::ostream& operator<<(std::ostream& os, HloInstruction::FusionKind kind);
+
 }  // namespace xla
 
 #endif  // TENSORFLOW_COMPILER_XLA_SERVICE_HLO_INSTRUCTION_H_
-- 
GitLab


From 3e6a22f0d1227cc24f0394a3e920c10bfce1e9c3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 15 Apr 2017 11:04:31 -0800
Subject: [PATCH 0436/1563] Add support for tf.assign ops on variable slices

e.g. usage

slice_assign = tf.assign(s[0, 1:3], [3, 4])
sess.run(slice_assign)
Change: 153259872
---
 tensorflow/python/kernel_tests/BUILD             | 1 +
 tensorflow/python/kernel_tests/array_ops_test.py | 9 ++++++---
 tensorflow/python/ops/array_ops.py               | 9 +++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index e2394d73a4..cdb15e0a91 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -980,6 +980,7 @@ cuda_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:gradients",
         "//tensorflow/python:math_ops",
+        "//tensorflow/python:state_ops",
         "//tensorflow/python:test_ops",
         "//tensorflow/python:variables",
     ],
diff --git a/tensorflow/python/kernel_tests/array_ops_test.py b/tensorflow/python/kernel_tests/array_ops_test.py
index d6ad00477c..23d8e89283 100644
--- a/tensorflow/python/kernel_tests/array_ops_test.py
+++ b/tensorflow/python/kernel_tests/array_ops_test.py
@@ -33,6 +33,7 @@ from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test as test_lib
 
@@ -825,12 +826,14 @@ class StridedSliceAssignChecker(object):
     with self.test.test_session(use_gpu=True) as sess:
       var = variables.Variable(self.x)
       sess.run(variables.initialize_variables([var]))
-      val = sess.run(var[index].assign(
-          constant_op.constant(
-              value, dtype=self.tensor_type)))
+      val = sess.run(var[index].assign(value))
+      # val_copy is used to check that tf.assign works equivalently to the
+      # assign method above.
+      val_copy = sess.run(state_ops.assign(var[index], value))
       valnp = np.copy(self.x_np)
       valnp[index] = np.array(value)
       self.test.assertAllEqual(val, valnp)
+      self.test.assertAllEqual(val_copy, valnp)
 
 
 class SliceAssignTest(test_util.TensorFlowTestCase):
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 0b936022ea..44c632df61 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -654,19 +654,24 @@ def strided_slice(input_,
       new_axis_mask=new_axis_mask,
       shrink_axis_mask=shrink_axis_mask)
 
-  def assign(val):
+  parent_name = name
+
+  def assign(val, name=None):
     """Closure that holds all the arguments to create an assignment."""
 
     if var is None:
       raise ValueError("Sliced assignment is only supported for variables")
 
+    if name is None:
+      name = parent_name + "_assign"
+
     return gen_array_ops.strided_slice_assign(
         ref=var,
         begin=begin,
         end=end,
         strides=strides,
         value=val,
-        name=name + "_assign",
+        name=name,
         begin_mask=begin_mask,
         end_mask=end_mask,
         ellipsis_mask=ellipsis_mask,
-- 
GitLab


From a09eeb237157f161b2d70159ffd0276899f024a4 Mon Sep 17 00:00:00 2001
From: wannabesrevenge <schultz100190@gmail.com>
Date: Sat, 15 Apr 2017 21:59:34 -0500
Subject: [PATCH 0437/1563] Tensorboard change NPM script name prepare to prep
 (#9051)

NPM 4.3 now calls the 'prepare' script as part of the install process.
As a result, running 'npm install' or 'npm run prepare' causes an
infinite loop. This removes the infinite loop.
---
 tensorflow/tensorboard/DEVELOPMENT.md | 2 +-
 tensorflow/tensorboard/package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/DEVELOPMENT.md b/tensorflow/tensorboard/DEVELOPMENT.md
index 0a35dec42f..3ff2c87dab 100644
--- a/tensorflow/tensorboard/DEVELOPMENT.md
+++ b/tensorflow/tensorboard/DEVELOPMENT.md
@@ -21,7 +21,7 @@ Then, cd into the TensorBoard directory:
 
 and install dependencies:
 
-`npm run prepare`
+`npm run prep`
 
 Then, run gulp: `gulp`
 
diff --git a/tensorflow/tensorboard/package.json b/tensorflow/tensorboard/package.json
index 5dcf2f21e9..69f08495a3 100644
--- a/tensorflow/tensorboard/package.json
+++ b/tensorflow/tensorboard/package.json
@@ -4,7 +4,7 @@
   "description": "Visualizers for TensorFlow",
   "scripts": {
     "test": "gulp test",
-    "prepare": "npm install && bower install && typings install",
+    "prep": "npm install && bower install && typings install",
     "compile": "gulp compile"
   },
   "keywords": [
-- 
GitLab


From 70b73ac3acae7496281bd8c3bea15b75c5f89961 Mon Sep 17 00:00:00 2001
From: zjj2wry <zhengjiajin2016@gmail.com>
Date: Sun, 16 Apr 2017 11:03:51 +0800
Subject: [PATCH 0438/1563] fix description (#9238)

---
 tensorflow/python/layers/convolutional_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/layers/convolutional_test.py b/tensorflow/python/layers/convolutional_test.py
index c3e133d08b..da962b2f99 100644
--- a/tensorflow/python/layers/convolutional_test.py
+++ b/tensorflow/python/layers/convolutional_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tf.layers.core."""
+"""Tests for tf.layers.convolutional."""
 
 from __future__ import absolute_import
 from __future__ import division
-- 
GitLab


From 4522412c6aff907ca83e442de773bf7d259fc8b9 Mon Sep 17 00:00:00 2001
From: Luiz Henrique Soares <luizhenriquesoares91@gmail.com>
Date: Sat, 15 Apr 2017 19:34:18 -0800
Subject: [PATCH 0439/1563] added const

---
 tensorflow/tensorboard/gulp_tasks/bower.js    |  4 +--
 tensorflow/tensorboard/gulp_tasks/compile.js  | 32 +++++++++----------
 tensorflow/tensorboard/gulp_tasks/test.js     |  4 +--
 tensorflow/tensorboard/gulp_tasks/util.js     |  6 ++--
 .../tensorboard/gulp_tasks/vulcanize.js       | 26 +++++++--------
 tensorflow/tensorboard/gulpfile.js            | 16 +++++-----
 6 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/tensorflow/tensorboard/gulp_tasks/bower.js b/tensorflow/tensorboard/gulp_tasks/bower.js
index 7c0e515c6c..8f4666a8c1 100644
--- a/tensorflow/tensorboard/gulp_tasks/bower.js
+++ b/tensorflow/tensorboard/gulp_tasks/bower.js
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var bower = require('gulp-bower');
+const gulp = require('gulp');
+const bower = require('gulp-bower');
 
 module.exports = function() {
   return function() {
diff --git a/tensorflow/tensorboard/gulp_tasks/compile.js b/tensorflow/tensorboard/gulp_tasks/compile.js
index 3d0d725cfb..44d703501e 100644
--- a/tensorflow/tensorboard/gulp_tasks/compile.js
+++ b/tensorflow/tensorboard/gulp_tasks/compile.js
@@ -13,25 +13,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var ts = require('gulp-typescript');
-var typescript = require('typescript');
-var gutil = require('gulp-util');
-var filter = require('gulp-filter');
-var merge = require('merge2');
-var browserify = require('browserify');
-var tsify = require('tsify');
-var source = require('vinyl-source-stream');
-var glob = require('glob').sync;
-var concat = require('gulp-concat');
+const gulp = require('gulp');
+const ts = require('gulp-typescript');
+const typescript = require('typescript');
+const gutil = require('gulp-util');
+const filter = require('gulp-filter');
+const merge = require('merge2');
+const browserify = require('browserify');
+const tsify = require('tsify');
+const source = require('vinyl-source-stream');
+const glob = require('glob').sync;
+const concat = require('gulp-concat');
 
-var tsProject = ts.createProject('./tsconfig.json', {
+const tsProject = ts.createProject('./tsconfig.json', {
   typescript: typescript,
   noExternalResolve: true, // opt-in for faster compilation!
 });
 
 /** List of components (and their external deps) that are using es6 modules. */
-var ES6_COMPONENTS = [{
+const ES6_COMPONENTS = [{
   name: 'vz_projector',
   deps: [
     'd3/d3.min.js', 'weblas/dist/weblas.js', 'three.js/build/three.min.js',
@@ -44,8 +44,8 @@ module.exports = function(includeDeps) {
   return function() {
     // Compile all components that are using ES6 modules into a bundle.js
     // using browserify.
-    var entries = ['typings/index.d.ts'];
-    var deps = {};
+    const entries = ['typings/index.d.ts'];
+    const deps = {};
     ES6_COMPONENTS.forEach(function(component) {
       // Collect all the typescript files across the components.
       entries = entries.concat(glob(
@@ -79,7 +79,7 @@ module.exports = function(includeDeps) {
 
     // Compile components that are using global namespaces producing 1 js file
     // for each ts file.
-    var isComponent = filter([
+    const isComponent = filter([
       'components/tf_*/**/*.ts', 'components/vz_*/**/*.ts', 'typings/**/*.ts',
       'components/plottable/plottable.d.ts'
       // Ignore components that use es6 modules.
diff --git a/tensorflow/tensorboard/gulp_tasks/test.js b/tensorflow/tensorboard/gulp_tasks/test.js
index ffa8122c7b..0c8b14a4cd 100644
--- a/tensorflow/tensorboard/gulp_tasks/test.js
+++ b/tensorflow/tensorboard/gulp_tasks/test.js
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var tester = require('web-component-tester').test;
+const gulp = require('gulp');
+const tester = require('web-component-tester').test;
 
 module.exports = function(done) {
   tester({}, function(error) {
diff --git a/tensorflow/tensorboard/gulp_tasks/util.js b/tensorflow/tensorboard/gulp_tasks/util.js
index 7a1d2a58ab..0d73f69c73 100644
--- a/tensorflow/tensorboard/gulp_tasks/util.js
+++ b/tensorflow/tensorboard/gulp_tasks/util.js
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var fs = require('fs');
-var path = require('path');
+const fs = require('fs');
+const path = require('path');
 
 /**
  * Returns a list of web components inside the components directory for which
@@ -34,6 +34,6 @@ exports.getComponents = function(namePredicate) {
  * directory.
  */
 exports.tbComponents = exports.getComponents(function(name) {
-  var prefix = name.slice(0, 3);
+  const prefix = name.slice(0, 3);
   return prefix == 'tf_' || prefix == 'vz_';
 });
diff --git a/tensorflow/tensorboard/gulp_tasks/vulcanize.js b/tensorflow/tensorboard/gulp_tasks/vulcanize.js
index b8cdd80af0..d48ec91afe 100644
--- a/tensorflow/tensorboard/gulp_tasks/vulcanize.js
+++ b/tensorflow/tensorboard/gulp_tasks/vulcanize.js
@@ -13,15 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var path = require('path');
-var util = require('./util');
-var vulcanize = require('gulp-vulcanize');
-var replace = require('gulp-replace');
-var rename = require('gulp-rename');
-var header = require('gulp-header');
+const gulp = require('gulp');
+const path = require('path');
+const util = require('./util');
+const vulcanize = require('gulp-vulcanize');
+const replace = require('gulp-replace');
+const rename = require('gulp-rename');
+const header = require('gulp-header');
 
-var HEADER_STR = '<!-- Copyright 2015 The TensorFlow Authors. All Rights Reserved.\n\
+const HEADER_STR = '<!-- Copyright 2015 The TensorFlow Authors. All Rights Reserved.\n\
 \n\
 Licensed under the Apache License, Version 2.0 (the "License");\n\
 you may not use this file except in compliance with the License.\n\
@@ -40,22 +40,22 @@ This file is generated by `gulp` & `vulcanize`. Do not directly change it.\n\
 Instead, use `gulp regenerate` to create a new version with your changes.\n\
 -->\n\n'
 
-var base = path.join(__dirname, '../components');
+const base = path.join(__dirname, '../components');
 // List of redirects of the form path1|path2 for every tensorboard component
 // in order to replace dashes with underscores.
 // E.g. .../tf-tensorboard|.../tf_tensorboard
-var redirects = util.tbComponents.map(function(dir) {
+const redirects = util.tbComponents.map(function(dir) {
   return path.join(base, dir.replace(/_/g, '-')) + '|' + path.join(base, dir);
 });
 
-var nonTBComponents = util.getComponents(function(name) {
-  var prefix = name.slice(0, 3);
+const nonTBComponents = util.getComponents(function(name) {
+  const prefix = name.slice(0, 3);
   return prefix !== 'tf_'  && prefix !== 'vz_';
 });
 
 module.exports = function(overwrite) {
   return function() {
-    var suffix = overwrite ? '' : '.OPENSOURCE';
+    const suffix = overwrite ? '' : '.OPENSOURCE';
     // Vulcanize TensorBoard without external libraries.
     gulp.src('components/tf_tensorboard/tf-tensorboard.html')
         .pipe(vulcanize({
diff --git a/tensorflow/tensorboard/gulpfile.js b/tensorflow/tensorboard/gulpfile.js
index 257ee0ab83..d49057f937 100644
--- a/tensorflow/tensorboard/gulpfile.js
+++ b/tensorflow/tensorboard/gulpfile.js
@@ -13,12 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var server = require('gulp-server-livereload');
-var minimist = require('minimist');
-var util = require('./gulp_tasks/util');
+const gulp = require('gulp');
+const server = require('gulp-server-livereload');
+const minimist = require('minimist');
+const util = require('./gulp_tasks/util');
 
-var options = minimist(process.argv.slice(2), {
+const options = minimist(process.argv.slice(2), {
   default: {
     p: 8000,  // port for gulp server
     h: '0.0.0.0', // host to serve on
@@ -43,8 +43,8 @@ gulp.task('watch', [], function() {
       {ignoreInitial: true}, ['compile']);
 });
 
-var httpPrefix = 'http://' + options.h + ':' + options.p + '/components';
-var proxies = util.tbComponents.map(function(component) {
+const httpPrefix = 'http://' + options.h + ':' + options.p + '/components';
+const proxies = util.tbComponents.map(function(component) {
   return {
     source: '/components' + component.replace(/_/g, '-'),
     target: httpPrefix + component
@@ -84,7 +84,7 @@ gulp.task(
 gulp.task('default', ['watch', 'server']);
 
 // Clean all compiled JS files.
-var cleanCompiledTypeScript = require('gulp-clean-compiled-typescript');
+const cleanCompiledTypeScript = require('gulp-clean-compiled-typescript');
 gulp.task('clean', function () {
   return gulp.src(['./components/**/*.ts', '!./components/**/deps.d.ts'])
       .pipe(cleanCompiledTypeScript());
-- 
GitLab


From 0e714992102ccc4bd221d117833fa133e026742f Mon Sep 17 00:00:00 2001
From: Evan Klitzke <evan@eklitzke.org>
Date: Sat, 15 Apr 2017 21:23:37 -0700
Subject: [PATCH 0440/1563] fix warning about comparing signed/unsigned types

---
 tensorflow/core/grappler/optimizers/auto_parallel.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.cc b/tensorflow/core/grappler/optimizers/auto_parallel.cc
index 77ab178653..96fb9d3792 100644
--- a/tensorflow/core/grappler/optimizers/auto_parallel.cc
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.cc
@@ -227,7 +227,7 @@ void AutoParallel::BuildGraph(GraphDef* graph) {
     AddOneReplica(graph, i);
   }
   std::set<string> fetches;
-  for (int i = 0; i < item_->fetch.size(); i++) {
+  for (size_t i = 0; i < item_->fetch.size(); i++) {
     for (int j = 0; j < num_replicas_; j++) {
       string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", j);
       string fetch = AddPrefixToNodeName(item_->fetch[i], prefix);
-- 
GitLab


From 9594624658f14a5cb94a7d4d9258c1dc013a493b Mon Sep 17 00:00:00 2001
From: zhengjiajin <393926893@qq.com>
Date: Mon, 17 Apr 2017 00:38:04 +0800
Subject: [PATCH 0441/1563] fix package description

---
 tensorflow/python/layers/normalization_test.py | 2 +-
 tensorflow/python/layers/utils_test.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/layers/normalization_test.py b/tensorflow/python/layers/normalization_test.py
index 0f82f73ea4..933f196e01 100644
--- a/tensorflow/python/layers/normalization_test.py
+++ b/tensorflow/python/layers/normalization_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tf.layers.core."""
+"""Tests for tf.layers.normalization."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/layers/utils_test.py b/tensorflow/python/layers/utils_test.py
index ace8046a0b..54e757c112 100644
--- a/tensorflow/python/layers/utils_test.py
+++ b/tensorflow/python/layers/utils_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tf.layers.core."""
+"""Tests for tf.layers.utils."""
 
 from __future__ import absolute_import
 from __future__ import division
-- 
GitLab


From ee7a9034a23d5dcd2da274b6a6b0cdf921802e21 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Sun, 16 Apr 2017 08:27:19 -0800
Subject: [PATCH 0442/1563] Automated rollback of change 153220046 Change:
 153293984

---
 tensorflow/python/training/adam.py | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index b173b100f8..592a9e8585 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -20,11 +20,10 @@ from __future__ import print_function
 
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import state_ops
-from tensorflow.python.ops import variable_scope as vs
+from tensorflow.python.ops import variables
 from tensorflow.python.training import optimizer
 from tensorflow.python.training import training_ops
 
@@ -112,27 +111,18 @@ class AdamOptimizer(optimizer.Optimizer):
   def _get_beta_accumulators(self):
     return self._beta1_power, self._beta2_power
 
-  # Suffix appended to optimizer variables.
-  _reuse_counter = 0
-
   def _create_slots(self, var_list):
     # Create the beta1 and beta2 accumulators on the same device as the first
     # variable.
     if (self._beta1_power is None or
         self._beta1_power.graph is not var_list[0].graph):
       with ops.colocate_with(var_list[0]):
-        self._beta1_power = vs.get_variable(
-            name="beta1_power_%d" % AdamOptimizer._reuse_counter,
-            shape=[],
-            initializer=init_ops.constant_initializer(self._beta1),
-            trainable=False)
-        self._beta2_power = vs.get_variable(
-            name="beta2_power_%d" % AdamOptimizer._reuse_counter,
-            shape=[],
-            initializer=init_ops.constant_initializer(self._beta2),
-            trainable=False)
-        AdamOptimizer._reuse_counter += 1
-
+        self._beta1_power = variables.Variable(self._beta1,
+                                               name="beta1_power",
+                                               trainable=False)
+        self._beta2_power = variables.Variable(self._beta2,
+                                               name="beta2_power",
+                                               trainable=False)
     # Create slots for the first and second moments.
     for v in var_list:
       self._zeros_slot(v, "m", self._name)
-- 
GitLab


From a241fe8ec5bc46e06c48c3ad609f00bc7a5030d9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 16 Apr 2017 15:27:18 -0800
Subject: [PATCH 0443/1563] [XLA] Improve ShapeTree implementation.

1) Ensure PODs are zero-initialized via the shape-constructor; i.e.
   ShapeTree<bool>(shape) has all data items initialized to false.
2) Add a default constructor, which makes it possible to use operator[] in a
   FlatMap<_, ShapeTree<_>>. This creates a tree where !ShapeTree::IsValid.
3) Change the representation so that the root node holds the shape by value,
   while non-root nodes don't hold a shape. This is "cleaner" than holding an
   unused shape in non-root nodes, and also simplifies the implementation.
   There is now a struct internal::ShapeTreeNode only used by ShapeTree.
4) Simplify constructors to delegate to a single implementation.
5) Fix bug in ShapeTree(Shape shape, T init_value) constructor, which caused
   the existing code to only work for T=bool.
6) Fix documentation to indicate that a T data value is held for every node in
   the tree, not just leaf nodes. That was the original behavior, which is
   unchanged in this CL; it's just the documentation that was wrong.
Change: 153305130
---
 tensorflow/compiler/xla/shape_tree.h       | 239 ++++++++++-----------
 tensorflow/compiler/xla/shape_tree_test.cc |  82 ++++++-
 2 files changed, 193 insertions(+), 128 deletions(-)

diff --git a/tensorflow/compiler/xla/shape_tree.h b/tensorflow/compiler/xla/shape_tree.h
index 6963a68d10..7dfb50650c 100644
--- a/tensorflow/compiler/xla/shape_tree.h
+++ b/tensorflow/compiler/xla/shape_tree.h
@@ -33,22 +33,65 @@ limitations under the License.
 
 namespace xla {
 
+namespace internal {
+
+// Internal representation of each node in a ShapeTree.
+template <typename T>
+struct ShapeTreeNode {
+  // Data corresponding to this node.
+  T data;
+
+  // Children of this node.
+  std::vector<std::unique_ptr<ShapeTreeNode>> children;
+
+  explicit ShapeTreeNode(const T& data) : data(data) {}
+
+  ShapeTreeNode(const ShapeTreeNode& other)
+      : data(other.data), children(other.children.size()) {
+    for (size_t i = 0; i < children.size(); ++i) {
+      children[i] = MakeUnique<ShapeTreeNode>(*other.children[i]);
+    }
+  }
+
+  ShapeTreeNode& operator=(const ShapeTreeNode& other) {
+    if (this != &other) {
+      data = other.data;
+      children.resize(other.children.size());
+      for (size_t i = 0; i < children.size(); ++i) {
+        children[i] = MakeUnique<ShapeTreeNode>(*other.children[i]);
+      }
+    }
+    return *this;
+  }
+};
+
+}  // namespace internal
+
 // A ShapeTree<T> is a recursive data structure which mirrors the structure of a
-// XLA shape and holds a value of type T for each array in the shape. For
-// array shapes, a ShapeTree trivially holds a single value of type T. For tuple
-// shapes which can be an arbitrary tree with arrays at the leaves, a ShapeTree
-// is an identically structured tree with data elements of type T at the leaves.
+// XLA shape and holds a value of type T for each subshape (i.e. tuple or array)
+// in the shape. For array shapes, a ShapeTree trivially holds a single value of
+// type T.
+//
+// For tuple shapes which can be an arbitrary tree with arrays at the leaves, a
+// ShapeTree is an identically structured tree with data elements of type T at
+// every node. I.e. the root is a tuple by definition, all interior nodes are
+// also tuples, and all leaves are arrays.
 //
 // Like the Shape data structure, this is a tree and tuple elements cannot be
-// duplicated. That is, every distinct element position in the Shape has a
-// unique T object.
+// duplicated. That is, every distinct ShapeIndex in the Shape has a unique T
+// object.
 template <typename T>
 class ShapeTree {
  public:
-  explicit ShapeTree(const Shape& shape);
+  // Default constructor creates a tree with a nil shape (i.e. an empty tuple).
+  ShapeTree() : ShapeTree(ShapeUtil::MakeNil()) {}
+  // Create ShapeTree with the given shape, and default T values for all nodes.
+  explicit ShapeTree(const Shape& shape) : ShapeTree(shape, T()) {}
+  // Create ShapeTree with the given shape, and init_value for all nodes.
   ShapeTree(const Shape& shape, const T& init_value);
-  ShapeTree(const ShapeTree<T>& other);
-  ShapeTree<T>& operator=(const ShapeTree<T>& other);
+
+  ShapeTree(const ShapeTree& other) = default;
+  ShapeTree& operator=(const ShapeTree& other) = default;
 
   // Returns the data element associated with the array in the shape at the
   // given index (see ShapeUtil::GetSubshape for how indexes are defined).
@@ -56,12 +99,12 @@ class ShapeTree {
   T* mutable_element(const ShapeIndex& index);
 
   // Return the shape represented with this ShapeTree.
-  const Shape& shape() const { return *shape_; }
+  const Shape& shape() const { return shape_; }
 
   // Returns true if the node at the given index is a leaf node (an array
   // shape).
   bool IsLeaf(const ShapeIndex& index) const {
-    return Lookup(index).elements_.empty();
+    return Lookup(index)->children.empty();
   }
 
   // Recursively traverses the shape and calls the given function at each
@@ -76,183 +119,127 @@ class ShapeTree {
   //
   // If any call to the given function returns a non-OK status, then traversal
   // is aborted and the status value is returned.
-  using VisitorFunction = std::function<tensorflow::Status(
+  using VisitorFunction = std::function<Status(
       const ShapeIndex& /*index*/, bool /*is_leaf*/, const T& /*data*/)>;
-  tensorflow::Status ForEachElement(VisitorFunction func) const;
+  Status ForEachElement(const VisitorFunction& func) const;
 
-  using MutableVisitorFunction = std::function<tensorflow::Status(
+  using MutableVisitorFunction = std::function<Status(
       const ShapeIndex& /*index*/, bool /*is_leaf*/, T* /*data*/)>;
-  tensorflow::Status ForEachMutableElement(MutableVisitorFunction func);
+  Status ForEachMutableElement(const MutableVisitorFunction& func);
 
  private:
-  // Private default constructor for non-root nodes of the tree.
-  ShapeTree() = default;
+  using Node = internal::ShapeTreeNode<T>;
+
+  // Initialize node->children based on 'shape'. All children are assigned the
+  // the given 'init_value'.
+  void InitChildren(const Shape& shape, const T& init_value, Node* node);
 
   // Helpers for traversing the shape via ForEachElement. The helpers
   // recursively traverse the subtree rooted at "index" (defined as in
   // ShapeUtil::GetSubshape).
-  static tensorflow::Status ForEachHelperMutable(ShapeIndex* index,
-                                                 ShapeTree<T>* shape_tree,
-                                                 MutableVisitorFunction func);
-  static tensorflow::Status ForEachHelper(ShapeIndex* index,
-                                          const ShapeTree<T>& shape_tree,
-                                          VisitorFunction func);
-
-  // Copy all the data elements (of type T) from "other" into "this". "this"
-  // must have the same tree structure as "other" prior to calling this method.
-  void CopyDataElements(const ShapeTree<T>& other);
-
-  // Recursive helper for constructing a subtree beneath "this" node.
-  void BuildTree(const Shape& shape);
+  static Status ForEachHelper(const VisitorFunction& func, const Node& node,
+                              ShapeIndex* index);
+  static Status ForEachMutableHelper(const MutableVisitorFunction& func,
+                                     Node* node, ShapeIndex* index);
 
   // Return the tree node at the given index.
-  ShapeTree<T>& Lookup(const ShapeIndex& index);
-  const ShapeTree<T>& Lookup(const ShapeIndex& index) const;
-
-  // The data corresponding to the array at this node.
-  T data_;
+  Node* Lookup(const ShapeIndex& index);
+  const Node* Lookup(const ShapeIndex& index) const;
 
-  // The XLA shape mirrored in this ShapeTree. Only the root of the
-  // ShapeTree has this member set.
-  std::unique_ptr<Shape> shape_;
+  // The root node, which contains all other nodes.
+  Node root_;
 
-  // The children of this node in the tree.
-  std::vector<std::unique_ptr<ShapeTree>> elements_;
+  // The XLA shape mirrored in this ShapeTree.
+  const Shape shape_;
 };
 
 template <typename T>
-void ShapeTree<T>::BuildTree(const Shape& shape) {
+void ShapeTree<T>::InitChildren(const Shape& shape, const T& init_value,
+                                Node* node) {
   if (ShapeUtil::IsTuple(shape)) {
     for (int i = 0; i < ShapeUtil::TupleElementCount(shape); ++i) {
-      elements_.emplace_back(new ShapeTree());
-      elements_.back()->BuildTree(shape.tuple_shapes(i));
+      node->children.emplace_back(new Node(init_value));
+      InitChildren(shape.tuple_shapes(i), init_value,
+                   node->children.back().get());
     }
   }
 }
 
-template <typename T>
-ShapeTree<T>::ShapeTree(const Shape& shape) : shape_(MakeUnique<Shape>(shape)) {
-  // The shape_ field is just used to hold the structure of the shape. It should
-  // not be relied upon to store layout information.
-  LayoutUtil::ClearLayout(shape_.get());
-  BuildTree(*shape_);
-}
-
 template <typename T>
 ShapeTree<T>::ShapeTree(const Shape& shape, const T& init_value)
-    : shape_(MakeUnique<Shape>(shape)) {
-  LayoutUtil::ClearLayout(shape_.get());
-  BuildTree(*shape_);
-  TF_CHECK_OK(ForEachMutableElement(
-      [&init_value](const ShapeIndex& /*index*/, bool /*is_leaf*/, bool* data) {
-        *data = init_value;
-        return tensorflow::Status::OK();
-      }));
-}
-
-template <typename T>
-ShapeTree<T>::ShapeTree(const ShapeTree& other)
-    : shape_(MakeUnique<Shape>(other.shape())) {
-  LayoutUtil::ClearLayout(shape_.get());
-  BuildTree(*shape_);
-  CopyDataElements(other);
-}
-
-template <typename T>
-ShapeTree<T>& ShapeTree<T>::operator=(const ShapeTree<T>& other) {
-  if (this == &other) {
-    return *this;
-  }
-  elements_.clear();
-  shape_ = MakeUnique<Shape>(other.shape());
-  LayoutUtil::ClearLayout(shape_.get());
-
-  BuildTree(*shape_);
-  CopyDataElements(other);
-  return *this;
-}
-
-template <typename T>
-void ShapeTree<T>::CopyDataElements(const ShapeTree<T>& other) {
-  CHECK(ShapeUtil::Compatible(shape(), other.shape()));
-  TF_CHECK_OK(ForEachMutableElement(
-      [&other](const ShapeIndex& index, bool /*is_leaf*/, T* data) {
-        *data = other.element(index);
-        return tensorflow::Status::OK();
-      }));
+    : root_(init_value), shape_([](Shape shape) {
+        // The shape_ field is just used to hold the structure of the shape.
+        // It should not be relied upon to store layout information.
+        LayoutUtil::ClearLayout(&shape);
+        return shape;
+      }(shape)) {
+  InitChildren(shape_, init_value, &root_);
 }
 
 template <typename T>
 const T& ShapeTree<T>::element(const ShapeIndex& index) const {
-  return Lookup(index).data_;
+  return Lookup(index)->data;
 }
 
 template <typename T>
 T* ShapeTree<T>::mutable_element(const ShapeIndex& index) {
-  return &Lookup(index).data_;
+  return &Lookup(index)->data;
 }
 
 template <typename T>
-ShapeTree<T>& ShapeTree<T>::Lookup(const ShapeIndex& index) {
-  ShapeTree<T>* node = this;
-  for (auto& i : index) {
+internal::ShapeTreeNode<T>* ShapeTree<T>::Lookup(const ShapeIndex& index) {
+  Node* node = &root_;
+  for (const int64 i : index) {
     CHECK_GE(i, 0);
-    CHECK_LT(i, node->elements_.size());
-    node = node->elements_[i].get();
+    CHECK_LT(i, node->children.size());
+    node = node->children[i].get();
   }
-  return *node;
+  return node;
 }
 
 template <typename T>
-const ShapeTree<T>& ShapeTree<T>::Lookup(const ShapeIndex& index) const {
-  return const_cast<ShapeTree<T>*>(this)->Lookup(index);
+const internal::ShapeTreeNode<T>* ShapeTree<T>::Lookup(
+    const ShapeIndex& index) const {
+  return const_cast<ShapeTree*>(this)->Lookup(index);
 }
 
 /* static */
 template <typename T>
-tensorflow::Status ShapeTree<T>::ForEachHelperMutable(
-    ShapeIndex* index, ShapeTree<T>* shape_tree,
-    ShapeTree<T>::MutableVisitorFunction func) {
-  TF_RETURN_IF_ERROR(
-      func(*index, shape_tree->elements_.empty(), &shape_tree->data_));
-  for (int i = 0; i < shape_tree->elements_.size(); ++i) {
+Status ShapeTree<T>::ForEachHelper(const VisitorFunction& func,
+                                   const Node& node, ShapeIndex* index) {
+  TF_RETURN_IF_ERROR(func(*index, node.children.empty(), node.data));
+  for (int64 i = 0; i < node.children.size(); ++i) {
     index->push_back(i);
-    TF_RETURN_IF_ERROR(
-        ForEachHelperMutable(index, shape_tree->elements_[i].get(), func));
+    TF_RETURN_IF_ERROR(ForEachHelper(func, *node.children[i], index));
     index->pop_back();
   }
-
-  return tensorflow::Status::OK();
+  return Status::OK();
 }
 
 /* static */
 template <typename T>
-tensorflow::Status ShapeTree<T>::ForEachHelper(
-    ShapeIndex* index, const ShapeTree<T>& shape_tree,
-    ShapeTree<T>::VisitorFunction func) {
-  TF_RETURN_IF_ERROR(
-      func(*index, shape_tree.elements_.empty(), shape_tree.data_));
-  for (int i = 0; i < shape_tree.elements_.size(); ++i) {
+Status ShapeTree<T>::ForEachMutableHelper(const MutableVisitorFunction& func,
+                                          Node* node, ShapeIndex* index) {
+  TF_RETURN_IF_ERROR(func(*index, node->children.empty(), &node->data));
+  for (int64 i = 0; i < node->children.size(); ++i) {
     index->push_back(i);
-    TF_RETURN_IF_ERROR(ForEachHelper(index, *shape_tree.elements_[i], func));
+    TF_RETURN_IF_ERROR(
+        ForEachMutableHelper(func, node->children[i].get(), index));
     index->pop_back();
   }
-
-  return tensorflow::Status::OK();
+  return Status::OK();
 }
 
 template <typename T>
-tensorflow::Status ShapeTree<T>::ForEachElement(
-    ShapeTree<T>::VisitorFunction func) const {
+Status ShapeTree<T>::ForEachElement(const VisitorFunction& func) const {
   ShapeIndex index;
-  return ForEachHelper(&index, *this, func);
+  return ForEachHelper(func, root_, &index);
 }
 
 template <typename T>
-tensorflow::Status ShapeTree<T>::ForEachMutableElement(
-    ShapeTree<T>::MutableVisitorFunction func) {
+Status ShapeTree<T>::ForEachMutableElement(const MutableVisitorFunction& func) {
   ShapeIndex index;
-  return ForEachHelperMutable(&index, this, func);
+  return ForEachMutableHelper(func, &root_, &index);
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/shape_tree_test.cc b/tensorflow/compiler/xla/shape_tree_test.cc
index ecb141d75b..21edfb7e2b 100644
--- a/tensorflow/compiler/xla/shape_tree_test.cc
+++ b/tensorflow/compiler/xla/shape_tree_test.cc
@@ -35,6 +35,9 @@ class ShapeTreeTest : public ::testing::Test {
               array_shape_})});
   }
 
+  void TestShapeConstructor(const Shape& shape, int expected_num_nodes);
+  void TestInitValueConstructor(const Shape& shape, int expected_num_nodes);
+
   // An array shape (non-tuple).
   Shape array_shape_;
 
@@ -45,6 +48,81 @@ class ShapeTreeTest : public ::testing::Test {
   Shape nested_tuple_shape_;
 };
 
+TEST_F(ShapeTreeTest, DefaultConstructor) {
+  ShapeTree<int> int_tree;
+  EXPECT_TRUE(ShapeUtil::IsNil(int_tree.shape()));
+
+  ShapeTree<bool> bool_tree;
+  EXPECT_TRUE(ShapeUtil::IsNil(bool_tree.shape()));
+}
+
+void ShapeTreeTest::TestShapeConstructor(const Shape& shape,
+                                         int expected_num_nodes) {
+  ShapeTree<int> int_tree(shape);
+  int num_nodes = 0;
+  TF_CHECK_OK(int_tree.ForEachElement(
+      [&num_nodes](const ShapeIndex& /*index*/, bool /*is_leaf*/, int data) {
+        EXPECT_EQ(0, data);
+        ++num_nodes;
+        return Status::OK();
+      }));
+  EXPECT_EQ(expected_num_nodes, num_nodes);
+
+  ShapeTree<bool> bool_tree(shape);
+  num_nodes = 0;
+  TF_CHECK_OK(bool_tree.ForEachElement(
+      [&num_nodes](const ShapeIndex& /*index*/, bool /*is_leaf*/, bool data) {
+        EXPECT_EQ(false, data);
+        ++num_nodes;
+        return Status::OK();
+      }));
+  EXPECT_EQ(expected_num_nodes, num_nodes);
+}
+
+TEST_F(ShapeTreeTest, ShapeConstructor) {
+  TestShapeConstructor(array_shape_, 1);
+  TestShapeConstructor(tuple_shape_, 4);
+  TestShapeConstructor(nested_tuple_shape_, 10);
+}
+
+void ShapeTreeTest::TestInitValueConstructor(const Shape& shape,
+                                             int expected_num_nodes) {
+  ShapeTree<int> tree(shape, 42);
+  int num_nodes = 0;
+  TF_CHECK_OK(tree.ForEachElement(
+      [&num_nodes](const ShapeIndex& /*index*/, bool /*is_leaf*/, int data) {
+        EXPECT_EQ(42, data);
+        ++num_nodes;
+        return Status::OK();
+      }));
+  EXPECT_EQ(expected_num_nodes, num_nodes);
+
+  num_nodes = 0;
+  TF_CHECK_OK(tree.ForEachMutableElement(
+      [&num_nodes](const ShapeIndex& /*index*/, bool /*is_leaf*/, int* data) {
+        EXPECT_EQ(42, *data);
+        *data = num_nodes;
+        ++num_nodes;
+        return Status::OK();
+      }));
+  EXPECT_EQ(expected_num_nodes, num_nodes);
+
+  num_nodes = 0;
+  TF_CHECK_OK(tree.ForEachElement(
+      [&num_nodes](const ShapeIndex& /*index*/, bool /*is_leaf*/, int data) {
+        EXPECT_EQ(num_nodes, data);
+        ++num_nodes;
+        return Status::OK();
+      }));
+  EXPECT_EQ(expected_num_nodes, num_nodes);
+}
+
+TEST_F(ShapeTreeTest, InitValueConstructor) {
+  TestInitValueConstructor(array_shape_, 1);
+  TestInitValueConstructor(tuple_shape_, 4);
+  TestInitValueConstructor(nested_tuple_shape_, 10);
+}
+
 TEST_F(ShapeTreeTest, ArrayShape) {
   ShapeTree<int> shape_tree{array_shape_};
   *shape_tree.mutable_element({}) = 42;
@@ -77,7 +155,7 @@ TEST_F(ShapeTreeTest, TupleShape) {
   TF_CHECK_OK(shape_tree.ForEachElement(
       [&sum](const ShapeIndex& /*index*/, bool /*is_leaf*/, int data) {
         sum += data;
-        return tensorflow::Status::OK();
+        return Status::OK();
       }));
   EXPECT_EQ(66, sum);
 
@@ -92,7 +170,7 @@ TEST_F(ShapeTreeTest, TupleShape) {
   TF_CHECK_OK(shape_tree.ForEachMutableElement(
       [&sum](const ShapeIndex& /*index*/, bool /*is_leaf*/, int* data) {
         *data = 0;
-        return tensorflow::Status::OK();
+        return Status::OK();
       }));
   EXPECT_EQ(0, shape_tree.element({}));
   EXPECT_EQ(0, shape_tree.element({0}));
-- 
GitLab


From 8382abdd54ae12ad5563c3df93107b7daecf3e04 Mon Sep 17 00:00:00 2001
From: Sergio Guadarrama <sguada@google.com>
Date: Sun, 16 Apr 2017 18:35:01 -0800
Subject: [PATCH 0444/1563] Increase logging global step time decimals. Change:
 153311513

---
 tensorflow/contrib/slim/python/slim/learning.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/slim/python/slim/learning.py b/tensorflow/contrib/slim/python/slim/learning.py
index 4bda2f7971..5ced8a4f08 100644
--- a/tensorflow/contrib/slim/python/slim/learning.py
+++ b/tensorflow/contrib/slim/python/slim/learning.py
@@ -502,7 +502,7 @@ def train_step(sess, train_op, global_step, train_step_kwargs):
 
   if 'should_log' in train_step_kwargs:
     if sess.run(train_step_kwargs['should_log']):
-      logging.info('global step %d: loss = %.4f (%.2f sec/step)',
+      logging.info('global step %d: loss = %.4f (%.3f sec/step)',
                    np_global_step, total_loss, time_elapsed)
 
   # TODO(nsilberman): figure out why we can't put this into sess.run. The
-- 
GitLab


From 0e1716213d3a6d03f65b0d6533d41886f2ec0369 Mon Sep 17 00:00:00 2001
From: Egil Martinsson <egil.martinsson@gmail.com>
Date: Mon, 17 Apr 2017 13:28:48 +0200
Subject: [PATCH 0445/1563] fix style_guide.md my_op-example

2 Typos causes errors:

-tf.add_to_collections -> tf.add_to_collection
-adding missing indentation (0 -> 2 spaces)

Resulting my_op-chunk tested with tf. version 1.0.1

See:
https://www.tensorflow.org/community/style_guide
For the erronous version.
---
 tensorflow/docs_src/community/style_guide.md | 50 ++++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/tensorflow/docs_src/community/style_guide.md b/tensorflow/docs_src/community/style_guide.md
index a2df61bc80..767e33c3d0 100644
--- a/tensorflow/docs_src/community/style_guide.md
+++ b/tensorflow/docs_src/community/style_guide.md
@@ -115,31 +115,31 @@ Example:
 
     def my_op(tensor_in, other_tensor_in, my_param, other_param=0.5,
               output_collections=(), name=None):
-    """My operation that adds two tensors with given coefficients.
-
-    Args:
-      tensor_in: `Tensor`, input tensor.
-      other_tensor_in: `Tensor`, same shape as `tensor_in`, other input tensor.
-      my_param: `float`, coefficient for `tensor_in`.
-      other_param: `float`, coefficient for `other_tensor_in`.
-      output_collections: `tuple` of `string`s, name of the collection to
-                          collect result of this op.
-      name: `string`, name of the operation.
-
-    Returns:
-      `Tensor` of same shape as `tensor_in`, sum of input values with coefficients.
-
-    Example:
-      >>> my_op([1., 2.], [3., 4.], my_param=0.5, other_param=0.6,
-                output_collections=['MY_OPS'], name='add_t1t2')
-      [2.3, 3.4]
-    """
-    with tf.name_scope(name, "my_op", [tensor_in, other_tensor_in]):
-      tensor_in = tf.convert_to_tensor(tensor_in)
-      other_tensor_in = tf.convert_to_tensor(other_tensor_in)
-      result = my_param * tensor_in + other_param * other_tensor_in
-      tf.add_to_collections(output_collections, result)
-      return result
+      """My operation that adds two tensors with given coefficients.
+
+      Args:
+        tensor_in: `Tensor`, input tensor.
+        other_tensor_in: `Tensor`, same shape as `tensor_in`, other input tensor.
+        my_param: `float`, coefficient for `tensor_in`.
+        other_param: `float`, coefficient for `other_tensor_in`.
+        output_collections: `tuple` of `string`s, name of the collection to
+                            collect result of this op.
+        name: `string`, name of the operation.
+
+      Returns:
+        `Tensor` of same shape as `tensor_in`, sum of input values with coefficients.
+
+      Example:
+        >>> my_op([1., 2.], [3., 4.], my_param=0.5, other_param=0.6,
+                  output_collections=['MY_OPS'], name='add_t1t2')
+        [2.3, 3.4]
+      """
+      with tf.name_scope(name, "my_op", [tensor_in, other_tensor_in]):
+        tensor_in = tf.convert_to_tensor(tensor_in)
+        other_tensor_in = tf.convert_to_tensor(other_tensor_in)
+        result = my_param * tensor_in + other_param * other_tensor_in
+        tf.add_to_collection(output_collections, result)
+        return result
 
 Usage:
 
-- 
GitLab


From 7c876d2476b634edac5e3bbfb28edb627527b275 Mon Sep 17 00:00:00 2001
From: Sergio Guadarrama <sguada@gmail.com>
Date: Mon, 17 Apr 2017 07:50:59 -0700
Subject: [PATCH 0446/1563] Update batch_norm_benchmark.py

Fix typo
---
 tensorflow/python/ops/batch_norm_benchmark.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/batch_norm_benchmark.py b/tensorflow/python/ops/batch_norm_benchmark.py
index 397ed91078..c2ee2b3832 100644
--- a/tensorflow/python/ops/batch_norm_benchmark.py
+++ b/tensorflow/python/ops/batch_norm_benchmark.py
@@ -198,7 +198,7 @@ class BatchNormBenchmark(test.Benchmark):
     if FLAGS.use_gpu:
       t1 = self._run_graph("gpu", shape, axes, 10, "op", True, True, 50)
       t2 = self._run_graph("gpu", shape, axes, 10, "py", True, True, 50)
-      t2 = self._run_graph("gpu", shape, axes, 10, "slow", True, True, 50)
+      t3 = self._run_graph("gpu", shape, axes, 10, "slow", True, True, 50)
       print_difference("op vs py", t1, t2)
       print_difference("py vs slow", t2, t3)
     print("Forward convolution (higher layers).")
-- 
GitLab


From 04efa1e4b49aba28335b343313778c75c65d5f0e Mon Sep 17 00:00:00 2001
From: zhengjiajin <393926893@qq.com>
Date: Mon, 17 Apr 2017 23:32:54 +0800
Subject: [PATCH 0447/1563] Fix code annotation

---
 tensorflow/python/framework/dtypes_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/framework/dtypes_test.py b/tensorflow/python/framework/dtypes_test.py
index fac2cf4def..f04f67ffed 100644
--- a/tensorflow/python/framework/dtypes_test.py
+++ b/tensorflow/python/framework/dtypes_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tensorflow.python.framework.importer."""
+"""Tests for tensorflow.python.framework.dtypes."""
 
 from __future__ import absolute_import
 from __future__ import division
-- 
GitLab


From b01685c9ab8c03c814a0b4f720223a87cd928467 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Mon, 17 Apr 2017 07:08:36 -0800
Subject: [PATCH 0448/1563] GraphManager::InitItem(): don't pass
 FunctionLibraryDefinition to Graph ctor

ConvertGraphDefToGraph() adds functions to the graph now, so there's
no need to explicitly pass them into the graph constructor. This
change also makes Partition() add the function library to the
partition GraphDefs, so the ConvertGraphDefToGraph() call for each
partition yields a graph with the function library (previous to this
change partition GraphDefs never had functions, and the function
library was manually passed to the graph in the ctor).

I also tried switching more functionality in GraphMgr to using the
function library in the graphs instead of maintaining separate
libraries, but the graphs' lifetimes make this non-trivial. I might
try cleaning this up more in a subsequent patch.
Change: 153344952
---
 .../core/distributed_runtime/graph_mgr.cc     |  4 +--
 tensorflow/core/graph/graph_partition.cc      |  3 +-
 tensorflow/core/graph/graph_partition_test.cc | 35 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index 545ae867f6..36b7b5b628 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -120,7 +120,7 @@ Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
   }
 
   // Constructs the graph out of "gdef".
-  Graph graph(item->lib_def);
+  Graph graph(OpRegistry::Global());
   GraphConstructorOptions opts;
   opts.allow_internal_ops = true;
   opts.expect_device_spec = true;
@@ -152,7 +152,7 @@ Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
 
   std::unordered_map<string, std::unique_ptr<Graph>> partition_graphs;
   for (const auto& partition : partitions) {
-    std::unique_ptr<Graph> device_graph(new Graph(item->lib_def));
+    std::unique_ptr<Graph> device_graph(new Graph(OpRegistry::Global()));
     GraphConstructorOptions device_opts;
     // There are internal operations (e.g., send/recv) that we now allow.
     device_opts.allow_internal_ops = true;
diff --git a/tensorflow/core/graph/graph_partition.cc b/tensorflow/core/graph/graph_partition.cc
index fe994024c4..c7ad6a1e77 100644
--- a/tensorflow/core/graph/graph_partition.cc
+++ b/tensorflow/core/graph/graph_partition.cc
@@ -1028,9 +1028,10 @@ Status Partition(const PartitionOptions& opts, Graph* g,
     }
   }
 
-  // Set versions
+  // Set versions and function library
   for (auto& it : *partitions) {
     it.second.mutable_versions()->CopyFrom(g->versions());
+    *it.second.mutable_library() = g->flib_def().ToProto();
   }
 
   // Set the start times for recvs at the very end.
diff --git a/tensorflow/core/graph/graph_partition_test.cc b/tensorflow/core/graph/graph_partition_test.cc
index aa732f1fc9..ee545dbfbf 100644
--- a/tensorflow/core/graph/graph_partition_test.cc
+++ b/tensorflow/core/graph/graph_partition_test.cc
@@ -23,6 +23,7 @@ limitations under the License.
 #include "tensorflow/cc/ops/control_flow_ops_internal.h"
 #include "tensorflow/cc/ops/random_ops.h"
 #include "tensorflow/cc/ops/sendrecv_ops.h"
+#include "tensorflow/core/framework/function_testlib.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/graph/graph_constructor.h"
@@ -137,7 +138,8 @@ Output ConstructOp(const Scope& scope, const string& op_type,
                    const gtl::ArraySlice<Input>& inputs) {
   if (!scope.ok()) return Output();
   const string unique_name = scope.GetUniqueNameForOp(op_type);
-  auto builder = NodeBuilder(unique_name, op_type);
+  auto builder =
+      NodeBuilder(unique_name, op_type, scope.graph()->op_registry());
   for (auto const& input : inputs) {
     builder.Input(ops::NodeOut(input.node(), input.index()));
   }
@@ -188,6 +190,15 @@ class GraphPartitionTest : public ::testing::Test {
     TF_EXPECT_GRAPH_EQ(graph_def, partitions_[b]);
   }
 
+  void ExpectFunctions(const FunctionDefLibrary& library,
+                       const std::set<string>& expected_names) {
+    std::set<string> actual_names;
+    for (const FunctionDef& fdef : library.function()) {
+      actual_names.insert(fdef.signature().name());
+    }
+    EXPECT_EQ(actual_names, expected_names);
+  }
+
   Scope in_;
   GraphDef in_graph_def_;
   Scope scope_a_;
@@ -401,5 +412,27 @@ TEST_F(GraphPartitionTest, PartitionIncompleteGraph) {
   EXPECT_EQ(error::INVALID_ARGUMENT, status.code()) << status;
 }
 
+TEST_F(GraphPartitionTest, Functions) {
+  FunctionDefLibrary fdef_lib;
+  *fdef_lib.add_function() = test::function::XTimesTwo();
+  *fdef_lib.add_function() = test::function::XTimesFour();
+  TF_ASSERT_OK(in_.graph()->AddFunctionLibrary(fdef_lib));
+
+  using namespace ::tensorflow::ops;  // NOLINT(build/namespaces)
+  auto a1 = FloatInput(in_.WithOpName("A1"));
+  auto b1 = FloatInput(in_.WithOpName("B1"));
+  ConstructOp(in_.WithOpName("A2"), "XTimesTwo", {a1});
+  ConstructOp(in_.WithOpName("B2"), "XTimesFour", {b1});
+
+  Partition(ToGraphDef(), &partitions_);
+  EXPECT_EQ(2, partitions_.size());
+
+  // Test that partition graphs inherit function library from original graph
+  string a = "/job:a/replica:0/task:0/cpu:0";
+  string b = "/job:a/replica:0/task:0/cpu:1";
+  ExpectFunctions(partitions_[a].library(), {"XTimesTwo", "XTimesFour"});
+  ExpectFunctions(partitions_[b].library(), {"XTimesTwo", "XTimesFour"});
+}
+
 }  // namespace
 }  // namespace tensorflow
-- 
GitLab


From 28181e3b469a47694c7805f658f676eb8e7fe37c Mon Sep 17 00:00:00 2001
From: Santiago Castro <bryant@montevideo.com.uy>
Date: Mon, 17 Apr 2017 13:22:49 -0300
Subject: [PATCH 0449/1563] Remove extra space in sample code

---
 tensorflow/docs_src/get_started/get_started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 33ff1d87d5..6bee7529d0 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -323,7 +323,7 @@ for i in range(1000):
   sess.run(train, {x:x_train, y:y_train})
 
 # evaluate training accuracy
-curr_W, curr_b, curr_loss  = sess.run([W, b, loss], {x:x_train, y:y_train})
+curr_W, curr_b, curr_loss = sess.run([W, b, loss], {x:x_train, y:y_train})
 print("W: %s b: %s loss: %s"%(curr_W, curr_b, curr_loss))
 ```
 When run, it produces
-- 
GitLab


From a0d429cafe8226834365210caf703c28996d5795 Mon Sep 17 00:00:00 2001
From: Namnamseo <0201ssw+github@gmail.com>
Date: Tue, 18 Apr 2017 01:23:44 +0900
Subject: [PATCH 0450/1563] Avoid use of sufficient_statistics in moments()
 (#8906)

* Avoid use of sufficient_statistics in moments()

sufficient_statistics() uses reduce_prod if some of the dimensions are unknown.
But reduce_prod is not differentiable on GPU for now. This commit avoids the usage of sufficient_statistics in moments().

* Add names to operations

* Use squeeze() to reduce axes
---
 tensorflow/python/ops/nn_impl.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/tensorflow/python/ops/nn_impl.py b/tensorflow/python/ops/nn_impl.py
index 118ade45ec..c1ee26d037 100644
--- a/tensorflow/python/ops/nn_impl.py
+++ b/tensorflow/python/ops/nn_impl.py
@@ -639,19 +639,21 @@ def moments(x, axes, shift=None, name=None, keep_dims=False):
           math_ops.reduce_mean(y, axes, keep_dims=True))
     else:
       shift = math_ops.cast(shift, y.dtype)
-    counts, m_ss, v_ss, shift = sufficient_statistics(
-        y, axes, shift=shift, keep_dims=keep_dims, name=name)
-    # Reshape shift as needed.
-    shift = array_ops.reshape(shift, array_ops.shape(m_ss))
-    shift.set_shape(m_ss.get_shape())
-    with ops.control_dependencies([counts, m_ss, v_ss]):
-      mean, variance = normalize_moments(counts, m_ss, v_ss, shift, name=name)
-      if x.dtype == dtypes.float16:
-        return (math_ops.cast(mean, dtypes.float16),
-                math_ops.cast(variance, dtypes.float16))
-      else:
-        return (mean, variance)
-
+    shifted_mean = math_ops.reduce_mean(
+      math_ops.subtract(y, shift), axes, keep_dims=True, name="shifted_mean")
+    variance = math_ops.subtract(
+        math_ops.reduce_mean(math_ops.squared_difference(y, shift), axes, keep_dims=True),
+        math_ops.square(shifted_mean),
+        name="variance")
+    mean = math_ops.add(shifted_mean, shift, name="mean")
+    if not keep_dims:
+      mean = array_ops.squeeze(mean, axes)
+      variance = array_ops.squeeze(variance, axes)
+    if x.dtype == dtypes.float16:
+      return (math_ops.cast(mean, dtypes.float16),
+              math_ops.cast(variance, dtypes.float16))
+    else:
+      return (mean, variance)
 
 def weighted_moments(x, axes, frequency_weights, name=None, keep_dims=False):
   """Returns the frequency-weighted mean and variance of `x`.
-- 
GitLab


From 7d5755cebd80f375bdef5310ed35afc92c0f5110 Mon Sep 17 00:00:00 2001
From: td2014 <td2014@users.noreply.github.com>
Date: Mon, 17 Apr 2017 09:34:21 -0700
Subject: [PATCH 0451/1563] Modified mnist.py to use random seeds. (#8548)

* Modified mnist.py to use random seeds.

* Address girving's comments.
---
 .../learn/python/learn/datasets/mnist.py      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/datasets/mnist.py b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
index fd50070dac..881a833469 100644
--- a/tensorflow/contrib/learn/python/learn/datasets/mnist.py
+++ b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
@@ -26,6 +26,7 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.contrib.learn.python.learn.datasets import base
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import random_seed
 
 # CVDF mirror of http://yann.lecun.com/exdb/mnist/
 SOURCE_URL = 'https://storage.googleapis.com/cvdf-datasets/mnist/'
@@ -109,12 +110,16 @@ class DataSet(object):
                fake_data=False,
                one_hot=False,
                dtype=dtypes.float32,
-               reshape=True):
+               reshape=True,
+               seed=None):
     """Construct a DataSet.
     one_hot arg is used only if fake_data is true.  `dtype` can be either
     `uint8` to leave the input as `[0, 255]`, or `float32` to rescale into
-    `[0, 1]`.
+    `[0, 1]`.  Seed arg provides for convenient deterministic testing.
     """
+    seed1, seed2 = random_seed.get_seed(seed)
+    # If op level seed is not set, use whatever graph level seed is returned
+    numpy.random.seed(seed1 if seed is None else seed2)
     dtype = dtypes.as_dtype(dtype).base_dtype
     if dtype not in (dtypes.uint8, dtypes.float32):
       raise TypeError('Invalid image dtype %r, expected uint8 or float32' %
@@ -208,11 +213,12 @@ def read_data_sets(train_dir,
                    one_hot=False,
                    dtype=dtypes.float32,
                    reshape=True,
-                   validation_size=5000):
+                   validation_size=5000,
+                   seed=None):
   if fake_data:
 
     def fake():
-      return DataSet([], [], fake_data=True, one_hot=one_hot, dtype=dtype)
+      return DataSet([], [], fake_data=True, one_hot=one_hot, dtype=dtype, seed=seed)
 
     train = fake()
     validation = fake()
@@ -254,12 +260,13 @@ def read_data_sets(train_dir,
   train_images = train_images[validation_size:]
   train_labels = train_labels[validation_size:]
 
-  train = DataSet(train_images, train_labels, dtype=dtype, reshape=reshape)
+  train = DataSet(train_images, train_labels, dtype=dtype, reshape=reshape, seed=seed)
   validation = DataSet(validation_images,
                        validation_labels,
                        dtype=dtype,
-                       reshape=reshape)
-  test = DataSet(test_images, test_labels, dtype=dtype, reshape=reshape)
+                       reshape=reshape,
+                       seed=seed)
+  test = DataSet(test_images, test_labels, dtype=dtype, reshape=reshape, seed=seed)
 
   return base.Datasets(train=train, validation=validation, test=test)
 
-- 
GitLab


From 0845c9c976974ced632cb85e52808b22c1e7c669 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Mon, 17 Apr 2017 08:32:59 -0800
Subject: [PATCH 0452/1563] Makes calls to variables.Variable resource-safe.
 Change: 153351835

---
 .../python/ops/clustering_ops.py              | 37 ++++++++++---------
 .../python/ops/factorization_ops.py           |  9 +++--
 .../factorization/python/ops/gmm_ops.py       | 10 ++---
 .../contrib/factorization/python/ops/wals.py  |  8 ++--
 .../contrib/framework/python/ops/variables.py |  3 +-
 .../python/layers/feature_column_ops.py       | 17 ++++++---
 .../learn/python/learn/estimators/head.py     |  3 +-
 .../contrib/metrics/python/ops/metric_ops.py  |  3 +-
 .../training/python/training/sampling_ops.py  |  3 +-
 tensorflow/python/ops/metrics_impl.py         |  7 ++--
 tensorflow/python/ops/variable_scope.py       | 19 ++++++++++
 tensorflow/python/training/input.py           | 11 +++---
 .../training/sync_replicas_optimizer.py       |  3 +-
 13 files changed, 80 insertions(+), 53 deletions(-)

diff --git a/tensorflow/contrib/factorization/python/ops/clustering_ops.py b/tensorflow/contrib/factorization/python/ops/clustering_ops.py
index 253f2d81e5..d3fa233a12 100644
--- a/tensorflow/contrib/factorization/python/ops/clustering_ops.py
+++ b/tensorflow/contrib/factorization/python/ops/clustering_ops.py
@@ -34,7 +34,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_impl
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import state_ops
-from tensorflow.python.ops import variables
+from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops.embedding_ops import embedding_lookup
 from tensorflow.python.platform import resource_loader
 
@@ -327,31 +327,34 @@ class KMeans(object):
         cluster_centers_updated back to cluster_centers.
     """
     init_value = array_ops.constant([], dtype=dtypes.float32)
-    cluster_centers = variables.Variable(init_value,
-                                         name='clusters',
-                                         validate_shape=False)
-    cluster_centers_initialized = variables.Variable(False,
-                                                     dtype=dtypes.bool,
-                                                     name='initialized')
+    cluster_centers = variable_scope.variable(init_value,
+                                              name='clusters',
+                                              validate_shape=False)
+    cluster_centers_initialized = variable_scope.variable(False,
+                                                          dtype=dtypes.bool,
+                                                          name='initialized')
 
     if self._use_mini_batch and self._mini_batch_steps_per_iteration > 1:
       # Copy of cluster centers actively updated each step according to
       # mini-batch update rule.
-      cluster_centers_updated = variables.Variable(init_value,
-                                                   name='clusters_updated',
-                                                   validate_shape=False)
+      cluster_centers_updated = variable_scope.variable(init_value,
+                                                        name='clusters_updated',
+                                                        validate_shape=False)
       # How many steps till we copy the updated clusters to cluster_centers.
-      update_in_steps = variables.Variable(self._mini_batch_steps_per_iteration,
-                                           dtype=dtypes.int64,
-                                           name='update_in_steps')
+      update_in_steps = variable_scope.variable(
+          self._mini_batch_steps_per_iteration,
+          dtype=dtypes.int64,
+          name='update_in_steps')
       # Count of points assigned to cluster_centers_updated.
-      cluster_counts = variables.Variable(array_ops.zeros([self._num_clusters],
-                                                          dtype=dtypes.int64))
+      cluster_counts = variable_scope.variable(
+          array_ops.zeros([self._num_clusters],
+                          dtype=dtypes.int64))
     else:
       cluster_centers_updated = cluster_centers
       update_in_steps = None
-      cluster_counts = (variables.Variable(array_ops.ones([self._num_clusters],
-                                                          dtype=dtypes.int64))
+      cluster_counts = (variable_scope.variable(array_ops.ones(
+          [self._num_clusters],
+          dtype=dtypes.int64))
                         if self._use_mini_batch else None)
     return (cluster_centers,
             cluster_centers_initialized,
diff --git a/tensorflow/contrib/factorization/python/ops/factorization_ops.py b/tensorflow/contrib/factorization/python/ops/factorization_ops.py
index 8fb33dad6f..000e2403a7 100644
--- a/tensorflow/contrib/factorization/python/ops/factorization_ops.py
+++ b/tensorflow/contrib/factorization/python/ops/factorization_ops.py
@@ -40,6 +40,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import state_ops
+from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import resource_loader
 
@@ -328,7 +329,7 @@ class WALSModel(object):
       var_name = "%s_shard_%d" % (name, i)
       var_init = make_initializer(i, size)
       sharded_matrix.append(
-          variables.Variable(
+          variable_scope.variable(
               var_init, dtype=dtypes.float32, name=var_name))
 
     return sharded_matrix
@@ -387,7 +388,7 @@ class WALSModel(object):
       var_name = "%s_shard_%d" % (name, i)
       var_init = make_wt_initializer(i, size)
       sharded_weight.append(
-          variables.Variable(
+          variable_scope.variable(
               var_init, dtype=dtypes.float32, name=var_name))
 
     return sharded_weight
@@ -404,7 +405,7 @@ class WALSModel(object):
     Returns:
       A gramian Tensor with shape of [n_components, n_components].
     """
-    return variables.Variable(
+    return variable_scope.variable(
         array_ops.zeros([n_components, n_components]),
         dtype=dtypes.float32,
         name=name)
@@ -412,7 +413,7 @@ class WALSModel(object):
   @staticmethod
   def _transient_var(name):
     """Helper function to create a Variable."""
-    return variables.Variable(
+    return variable_scope.variable(
         1.0,
         trainable=False,
         collections=[ops.GraphKeys.LOCAL_VARIABLES],
diff --git a/tensorflow/contrib/factorization/python/ops/gmm_ops.py b/tensorflow/contrib/factorization/python/ops/gmm_ops.py
index 8d78067b9a..42544ff884 100644
--- a/tensorflow/contrib/factorization/python/ops/gmm_ops.py
+++ b/tensorflow/contrib/factorization/python/ops/gmm_ops.py
@@ -33,7 +33,7 @@ from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import state_ops
-from tensorflow.python.ops import variables
+from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops.embedding_ops import embedding_lookup
 from tensorflow.python.summary import summary
 
@@ -161,14 +161,14 @@ class GmmAlgorithm(object):
     first_shard = data[0]
     # Initialize means: num_classes X 1 X dimensions.
     if initial_means is not None:
-      self._means = variables.Variable(
+      self._means = variable_scope.variable(
           array_ops.expand_dims(initial_means, 1),
           name=self.CLUSTERS_VARIABLE,
           validate_shape=False,
           dtype=dtypes.float32)
     else:
       # Sample data randomly
-      self._means = variables.Variable(
+      self._means = variable_scope.variable(
           array_ops.expand_dims(
               _init_clusters_random(data, self._num_classes, self._random_seed),
               1),
@@ -187,11 +187,11 @@ class GmmAlgorithm(object):
       covs = array_ops.tile(
           array_ops.expand_dims(array_ops.diag_part(cov), 0),
           [self._num_classes, 1])
-    self._covs = variables.Variable(
+    self._covs = variable_scope.variable(
         covs, name=self.CLUSTERS_COVS_VARIABLE, validate_shape=False)
     # Mixture weights, representing the probability that a randomly
     # selected unobservable data (in EM terms) was generated by component k.
-    self._alpha = variables.Variable(
+    self._alpha = variable_scope.variable(
         array_ops.tile([1.0 / self._num_classes], [self._num_classes]),
         name=self.CLUSTERS_WEIGHT,
         validate_shape=False)
diff --git a/tensorflow/contrib/factorization/python/ops/wals.py b/tensorflow/contrib/factorization/python/ops/wals.py
index 41211859f1..9636625b10 100644
--- a/tensorflow/contrib/factorization/python/ops/wals.py
+++ b/tensorflow/contrib/factorization/python/ops/wals.py
@@ -29,7 +29,7 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import gen_math_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import state_ops
-from tensorflow.python.ops import variables
+from tensorflow.python.ops import variable_scope
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import session_run_hook
 
@@ -125,14 +125,14 @@ class _SweepHook(session_run_hook.SessionRunHook):
     """
     processed_rows_init = array_ops.fill(dims=[self._num_rows], value=False)
     with ops.colocate_with(processed_rows_init):
-      processed_rows = variables.Variable(
+      processed_rows = variable_scope.variable(
           processed_rows_init,
           collections=[ops.GraphKeys.GLOBAL_VARIABLES],
           trainable=False,
           name="sweep_hook_processed_rows")
     processed_cols_init = array_ops.fill(dims=[self._num_cols], value=False)
     with ops.colocate_with(processed_cols_init):
-      processed_cols = variables.Variable(
+      processed_cols = variable_scope.variable(
           processed_cols_init,
           collections=[ops.GraphKeys.GLOBAL_VARIABLES],
           trainable=False,
@@ -280,7 +280,7 @@ def _wals_factorization_model_function(features, labels, mode, params):
   # During a col sweep:
   #   update_col_factors_op
 
-  is_row_sweep_var = variables.Variable(
+  is_row_sweep_var = variable_scope.variable(
       True, "is_row_sweep",
       collections=[ops.GraphKeys.GLOBAL_VARIABLES])
   # The row sweep is determined by is_row_sweep_var (controlled by the
diff --git a/tensorflow/contrib/framework/python/ops/variables.py b/tensorflow/contrib/framework/python/ops/variables.py
index 4f8e266cbe..f02a7c6360 100644
--- a/tensorflow/contrib/framework/python/ops/variables.py
+++ b/tensorflow/contrib/framework/python/ops/variables.py
@@ -32,7 +32,6 @@ from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import variable_scope
-from tensorflow.python.ops import variables
 from tensorflow.python.ops import gen_state_ops
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.platform import resource_loader
@@ -157,7 +156,7 @@ def local_variable(initial_value, validate_shape=True, name=None):
   Returns:
     New variable.
   """
-  return variables.Variable(
+  return variable_scope.variable(
       initial_value, trainable=False,
       collections=[ops.GraphKeys.LOCAL_VARIABLES],
       validate_shape=validate_shape, name=name)
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops.py b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
index 2662d0ae3e..31aca87002 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
@@ -34,6 +34,7 @@ from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
@@ -41,6 +42,12 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import nest
 
 
+def _is_variable(v):
+  """Returns true if `v` is a variable."""
+  return isinstance(v, (variables.Variable,
+                        resource_variable_ops.ResourceVariable))
+
+
 def _embeddings_from_arguments(column,
                                args,
                                weight_collections,
@@ -123,7 +130,7 @@ def _embeddings_from_arguments(column,
         trainable=(trainable and args.trainable),
         collections=weight_collections)
 
-  if isinstance(embeddings, variables.Variable):
+  if _is_variable(embeddings):
     embeddings = [embeddings]
   else:
     embeddings = embeddings._get_variable_list()  # pylint: disable=protected-access
@@ -386,7 +393,7 @@ def _create_embedding_lookup(column,
         initializer=embedding_lookup_arguments.initializer,
         trainable=trainable,
         collections=weight_collections)
-    if isinstance(variable, variables.Variable):
+    if _is_variable(variable):
       variable = [variable]
     else:
       variable = variable._get_variable_list()  # pylint: disable=protected-access
@@ -444,7 +451,7 @@ def _create_joint_embedding_lookup(columns_to_tensors,
         initializer=init_ops.zeros_initializer(),
         trainable=trainable,
         collections=weight_collections)
-    if isinstance(variable, variables.Variable):
+    if _is_variable(variable):
       variable = [variable]
     else:
       variable = variable._get_variable_list()  # pylint: disable=protected-access
@@ -820,10 +827,10 @@ def parse_feature_columns_from_sequence_examples(
 def _log_variable(variable):
   if isinstance(variable, list):
     for var in variable:
-      if isinstance(variable, variables.Variable):
+      if _is_variable(variable):
         logging.info('Created variable %s, with device=%s', var.name,
                      var.device)
-  elif isinstance(variable, variables.Variable):
+  elif _is_variable(variable):
     logging.info('Created variable %s, with device=%s', variable.name,
                  variable.device)
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 5a34b551e8..68f71ff022 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -44,7 +44,6 @@ from tensorflow.python.ops import nn
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import string_ops
 from tensorflow.python.ops import variable_scope
-from tensorflow.python.ops import variables
 from tensorflow.python.summary import summary
 from tensorflow.python.training import training
 
@@ -1734,7 +1733,7 @@ def _centered_bias(logits_dimension, head_name=None):
   # Do not create a variable with variable_scope.get_variable, because that may
   # create a PartitionedVariable, which does not support indexing, so
   # summary.scalar will not work.
-  centered_bias = variables.Variable(
+  centered_bias = variable_scope.variable(
       name="centered_bias_weight",
       initial_value=array_ops.zeros(shape=(logits_dimension,)),
       trainable=True)
diff --git a/tensorflow/contrib/metrics/python/ops/metric_ops.py b/tensorflow/contrib/metrics/python/ops/metric_ops.py
index 90c1440f08..d57203c042 100644
--- a/tensorflow/contrib/metrics/python/ops/metric_ops.py
+++ b/tensorflow/contrib/metrics/python/ops/metric_ops.py
@@ -35,7 +35,6 @@ from tensorflow.python.ops import metrics_impl
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variable_scope
-from tensorflow.python.ops import variables
 
 
 def _safe_div(numerator, denominator, name):
@@ -73,7 +72,7 @@ def _create_local(name, shape, collections=None, validate_shape=True,
   # Make sure local variables are added to tf.GraphKeys.LOCAL_VARIABLES
   collections = list(collections or [])
   collections += [ops.GraphKeys.LOCAL_VARIABLES]
-  return variables.Variable(
+  return variable_scope.variable(
       initial_value=array_ops.zeros(shape, dtype=dtype),
       name=name,
       trainable=False,
diff --git a/tensorflow/contrib/training/python/training/sampling_ops.py b/tensorflow/contrib/training/python/training/sampling_ops.py
index bf1d2c8cad..410c0a9a6b 100644
--- a/tensorflow/contrib/training/python/training/sampling_ops.py
+++ b/tensorflow/contrib/training/python/training/sampling_ops.py
@@ -26,7 +26,6 @@ from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import variable_scope
-from tensorflow.python.ops import variables
 from tensorflow.python.training import input as input_ops
 
 __all__ = [
@@ -264,7 +263,7 @@ def _estimate_data_distribution(labels, num_classes, smoothing_constant=10):
   # slower convergence.
   if smoothing_constant <= 0:
     raise ValueError('smoothing_constant must be nonzero.')
-  num_examples_per_class_seen = variables.Variable(
+  num_examples_per_class_seen = variable_scope.variable(
       initial_value=[smoothing_constant] * num_classes,
       trainable=False,
       name='class_count',
diff --git a/tensorflow/python/ops/metrics_impl.py b/tensorflow/python/ops/metrics_impl.py
index bdb34dd78e..4dc8e702ca 100644
--- a/tensorflow/python/ops/metrics_impl.py
+++ b/tensorflow/python/ops/metrics_impl.py
@@ -31,7 +31,6 @@ from tensorflow.python.ops import sets
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variable_scope
-from tensorflow.python.ops import variables
 from tensorflow.python.ops import weights_broadcast_ops
 
 
@@ -45,7 +44,7 @@ def _local_variable(initial_value, validate_shape=True, name=None):
   Returns:
     New variable.
   """
-  return variables.Variable(
+  return variable_scope.variable(
       initial_value, trainable=False,
       collections=[ops.GraphKeys.LOCAL_VARIABLES],
       validate_shape=validate_shape, name=name)
@@ -189,8 +188,8 @@ def _create_local(name, shape, collections=None, validate_shape=True,
   # Make sure local variables are added to tf.GraphKeys.LOCAL_VARIABLES
   collections = list(collections or [])
   collections += [ops.GraphKeys.LOCAL_VARIABLES]
-  return variables.Variable(
-      initial_value=array_ops.zeros(shape, dtype=dtype),
+  return variable_scope.variable(
+      array_ops.zeros(shape, dtype=dtype),
       name=name,
       trainable=False,
       collections=collections,
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index b3745fa4e6..ff9f134a0e 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -1639,3 +1639,22 @@ def _compute_slice_dim_and_shape(full_shape, slicing):
   if slice_dim is None:
     slice_dim = 0
   return slice_dim, slice_shape
+
+
+def variable(initial_value=None,
+             trainable=True,
+             collections=None,
+             validate_shape=True,
+             caching_device=None,
+             name=None,
+             dtype=None):
+  if get_variable_scope().use_resource:
+    return resource_variable_ops.ResourceVariable(
+        initial_value=initial_value, trainable=trainable,
+        collections=collections, validate_shape=validate_shape,
+        caching_device=caching_device, name=name, dtype=dtype)
+  else:
+    return variables.Variable(
+        initial_value=initial_value, trainable=trainable,
+        collections=collections, validate_shape=validate_shape,
+        caching_device=caching_device, name=name, dtype=dtype)
diff --git a/tensorflow/python/training/input.py b/tensorflow/python/training/input.py
index 06e21fb420..9a2880a110 100644
--- a/tensorflow/python/training/input.py
+++ b/tensorflow/python/training/input.py
@@ -40,7 +40,7 @@ from tensorflow.python.ops import io_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import sparse_ops
-from tensorflow.python.ops import variables
+from tensorflow.python.ops import variable_scope as vs
 from tensorflow.python.summary import summary
 from tensorflow.python.training import queue_runner
 
@@ -63,9 +63,10 @@ def match_filenames_once(pattern, name=None):
     A variable that is initialized to the list of files matching the pattern(s).
   """
   with ops.name_scope(name, "matching_filenames", [pattern]) as name:
-    return variables.Variable(io_ops.matching_files(pattern), trainable=False,
-                              name=name, validate_shape=False,
-                              collections=[ops.GraphKeys.LOCAL_VARIABLES])
+    return vs.variable(
+        name=name, initial_value=io_ops.matching_files(pattern),
+        trainable=False, validate_shape=False,
+        collections=[ops.GraphKeys.LOCAL_VARIABLES])
 
 
 def limit_epochs(tensor, num_epochs=None, name=None):
@@ -92,7 +93,7 @@ def limit_epochs(tensor, num_epochs=None, name=None):
     raise ValueError("num_epochs must be > 0 not %d." % num_epochs)
   with ops.name_scope(name, "limit_epochs", [tensor]) as name:
     zero64 = constant_op.constant(0, dtype=dtypes.int64)
-    epochs = variables.Variable(
+    epochs = vs.variable(
         zero64, name="epochs", trainable=False,
         collections=[ops.GraphKeys.LOCAL_VARIABLES])
     counter = epochs.count_up_to(num_epochs)
diff --git a/tensorflow/python/training/sync_replicas_optimizer.py b/tensorflow/python/training/sync_replicas_optimizer.py
index 3cee0b2f59..16903c77cf 100644
--- a/tensorflow/python/training/sync_replicas_optimizer.py
+++ b/tensorflow/python/training/sync_replicas_optimizer.py
@@ -24,6 +24,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import state_ops
+from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import optimizer
@@ -239,7 +240,7 @@ class SyncReplicasOptimizer(optimizer.Optimizer):
     aggregated_grad = []
     var_list = []
 
-    self._local_step = variables.Variable(
+    self._local_step = variable_scope.variable(
         initial_value=0,
         trainable=False,
         collections=[ops.GraphKeys.LOCAL_VARIABLES],
-- 
GitLab


From 698a961a5309230a87c3c02ef534b1756be32af3 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Mon, 17 Apr 2017 09:21:14 -0800
Subject: [PATCH 0453/1563] Error out when running out of GPU memory instead of
 triggering a fatal error. Change: 153357257

---
 .../core/common_runtime/gpu/gpu_device.cc       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index c8e2cfb3a3..ce2cc604e4 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -41,6 +41,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/graph/types.h"
+#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/gtl/stl_util.h"
 #include "tensorflow/core/lib/strings/numbers.h"
@@ -74,7 +75,8 @@ namespace tensorflow {
 
 class EigenCudaStreamDevice : public ::Eigen::StreamInterface {
  public:
-  EigenCudaStreamDevice() : scratch_(nullptr), semaphore_(nullptr) {
+  EigenCudaStreamDevice()
+      : scratch_(nullptr), semaphore_(nullptr), context_(nullptr) {
     Eigen::initializeDeviceProp();
   }
   ~EigenCudaStreamDevice() {}
@@ -84,6 +86,7 @@ class EigenCudaStreamDevice : public ::Eigen::StreamInterface {
       operation_ = context->op_kernel().name() + "/EigenAllocator";
       step_id_ = context->step_id();
     }
+    context_ = context;
     scratch_ = scratch;
     semaphore_ =
         reinterpret_cast<unsigned int*>(scratch + Eigen::kCudaScratchSize);
@@ -100,8 +103,15 @@ class EigenCudaStreamDevice : public ::Eigen::StreamInterface {
   void* allocate(size_t num_bytes) const override {
     void* ret = allocator_->AllocateRaw(32 /* alignment */, num_bytes);
     if (ret == nullptr) {
-      LOG(FATAL) << "EigenAllocator for GPU ran out of memory when allocating "
-                 << num_bytes << ". See error logs for more detailed info.";
+      if (context_) {
+        context_->SetStatus(errors::ResourceExhausted(
+            strings::StrCat("Ran out of GPU memory when allocating ", num_bytes,
+                            " bytes for ", operation_)));
+      } else {
+        LOG(FATAL)
+            << "EigenAllocator for GPU ran out of memory when allocating "
+            << num_bytes << ". See error logs for more detailed info.";
+      }
     }
     if (LogMemory::IsEnabled()) {
       LogMemory::RecordRawAllocation(operation_, step_id_, num_bytes, ret,
@@ -159,6 +169,7 @@ class EigenCudaStreamDevice : public ::Eigen::StreamInterface {
   ::tensorflow::Allocator* allocator_;  // Not owned.
   mutable char* scratch_;
   mutable unsigned int* semaphore_;
+  OpKernelContext* context_;
 
   TF_DISALLOW_COPY_AND_ASSIGN(EigenCudaStreamDevice);
 };
-- 
GitLab


From 005378110e501ec3d398b0c94438d0e320ac18a3 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Mon, 17 Apr 2017 10:45:30 -0700
Subject: [PATCH 0454/1563] Merging rc2 commits back into master.

---
 README.md                                     | 13 +++++----
 RELEASE.md                                    |  3 ++
 configure                                     | 12 ++++++++
 tensorflow/core/public/version.h              |  4 +--
 tensorflow/docs_src/install/install_c.md      |  2 +-
 tensorflow/docs_src/install/install_go.md     |  2 +-
 tensorflow/docs_src/install/install_java.md   | 16 +++++------
 tensorflow/docs_src/install/install_linux.md  | 28 ++++++++++---------
 tensorflow/docs_src/install/install_mac.md    | 14 +++++-----
 .../docs_src/install/install_sources.md       |  5 ++--
 .../docs_src/install/install_windows.md       |  4 +--
 tensorflow/tensorflow.bzl                     | 12 ++++++++
 tensorflow/tools/pip_package/setup.py         |  2 +-
 13 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 92ac8f0d21..276012a8aa 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,13 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
diff --git a/RELEASE.md b/RELEASE.md
index 33fce86bf4..f2c4ee0381 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -22,6 +22,7 @@
   * New navigation bar in Curses-based UI
   * NodeStepper (command `invoke_stepper`) now uses intermediate tensor dumps. It also uses `TensorHandles` as direct feeds during successive `cont` calls for improved performance and reduced memory consumption.
 * Initial release of installation guides for Java, C, and Go.
+* Added Text Dashboard to TensorBoard.
 
 ## Deprecations
 
@@ -77,6 +78,8 @@
   * Command history now persists across runs.
   * Bug fix in graph validation related to `tf.while_loops`.
 * Java Maven fixes for bugs with Windows installation.
+* Backport fixes and improvements from external keras.
+* Keras config file handling fix.
 
 ## Thanks to our Contributors
 
diff --git a/configure b/configure
index 48a4594da6..6746a947e7 100755
--- a/configure
+++ b/configure
@@ -35,6 +35,18 @@ function is_windows() {
   fi
 }
 
+function bazel_clean_and_fetch() {
+  if ! is_windows; then
+    bazel clean --expunge
+  fi
+
+  if [ -z "$TF_BAZEL_TARGETS" ]; then
+    bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
+  else
+    bazel fetch $TF_BAZEL_TARGETS
+  fi
+}
+
 function sed_hyphen_i() {
   if is_macos; then
     sed -i '' "$@"
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index dfffbfa396..df33cf38c9 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -20,11 +20,11 @@ limitations under the License.
 
 #define TF_MAJOR_VERSION 1
 #define TF_MINOR_VERSION 1
-#define TF_PATCH_VERSION 0-rc1
+#define TF_PATCH_VERSION 0
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
-#define TF_VERSION_SUFFIX ""
+#define TF_VERSION_SUFFIX "-rc2"
 
 #define TF_STR_HELPER(x) #x
 #define TF_STR(x) TF_STR_HELPER(x)
diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index 0f3914d52d..c1581efb4f 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index 6874a1f03f..dd713e4786 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc2.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 127d8fd029..1abf3b69f5 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc1</version>
+  <version>1.1.0-rc2</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0-rc1</version>
+                 <version>1.1.0-rc2</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc2.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0-rc1.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0-rc2.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -213,7 +213,7 @@ two files are available to the JVM:
 
 For example, the following command line executes the `HelloTF` program:
 
-<pre><b>java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index 4a5d63f337..8ee31fe692 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -165,8 +165,8 @@ Take the following steps to install TensorFlow with Virtualenv:
      issue the following command to install TensorFlow in the active
      virtualenv environment:
 
-     <pre> (tensorflow)$ <b>pip install --upgrade \\
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
+     <pre>(tensorflow)$ <b>pip3 install --upgrade \
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#common_installation_problems).
@@ -269,8 +269,10 @@ take the following steps:
      install TensorFlow for Linux, Python 2.7, and CPU-only support, issue
      the following command:
 
-     <pre> $ <b>sudo pip install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
+     <pre>
+     $ <b>sudo pip3 install --upgrade \
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b>
+     </pre>
 
      If this step fails, see
      [Common Installation Problems](#common_installation_problems).
@@ -456,7 +458,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -624,14 +626,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -643,14 +645,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -662,14 +664,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -681,14 +683,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index ccfe9ada6d..0882422e4d 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -286,7 +286,7 @@ take the following steps:
      support, issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b> </pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
      [Common installation problems](#CommonInstallationProblems).
@@ -398,7 +398,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      TensorFlow for Python 2.7:
 
      <pre> (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -604,13 +604,13 @@ This section documents the relevant values for Mac OS installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py2-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
@@ -622,13 +622,13 @@ Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py3-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py3-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 5f351c40b4..88268ba62f 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -319,10 +319,11 @@ $ <b>bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pk
 Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
-for TensorFlow 1.1.0rc1 on Linux:
+
+for TensorFlow 1.1.0rc2 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc1-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc2-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 7d3d13c34a..5f7c27c028 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index ddffabd8cb..a3056b861b 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -930,6 +930,18 @@ def tf_custom_op_py_library(name,
       deps=deps,)
 
 
+def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
+                            srcs_version="PY2AND3", visibility=None, deps=[]):
+  kernels = kernels  # unused argument
+  native.py_library(
+      name=name,
+      data=dso,
+      srcs=srcs,
+      srcs_version=srcs_version,
+      visibility=visibility,
+      deps=deps,
+  )
+
 def tf_extension_linkopts():
   return []  # No extension link opts
 
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 3253440a23..2ea78b24be 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc1'
+_VERSION = '1.1.0-rc2'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
-- 
GitLab


From 38d03aea6a9bcb1a960c7d116457d7b6932be4b0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 09:32:05 -0800
Subject: [PATCH 0455/1563] update the comments for gradient_multipliers and
 added an assertion to fail when the gradients are empty list Change:
 153358570

---
 .../contrib/layers/python/layers/optimizers.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/optimizers.py b/tensorflow/contrib/layers/python/layers/optimizers.py
index c804303671..9b6666477f 100644
--- a/tensorflow/contrib/layers/python/layers/optimizers.py
+++ b/tensorflow/contrib/layers/python/layers/optimizers.py
@@ -107,8 +107,13 @@ def optimize_loss(loss,
     gradient_noise_scale: float or None, adds 0-mean normal noise scaled by this
                           value.
     gradient_multipliers: dict of variables or variable names to floats.
-                          If present, gradients for specified
-                          variables will be multiplied by given constant.
+                          Most often it should be an instance of
+                          collections.defaultdict(lambda: 1.0), so that
+                          unspecified variable would still be updated with
+                          normal rate. If a common dict is provided, only
+                          gradients for specified variables will be
+                          multiplied by given constant and unspecified
+                          gradients will be dropped.
     clip_gradients: float, callable or `None`. If float, is provided, a global
       clipping is applied to prevent the norm of the gradient to exceed this
       value. Alternatively, a callable can be provided e.g.: adaptive_clipping.
@@ -148,6 +153,7 @@ def optimize_loss(loss,
         * `clip_gradients` is not float or callable.
         * `learning_rate` and `learning_rate_decay_fn` are supplied, but no
           `global_step` is available.
+        * `gradients` is empty
   """
   loss = ops.convert_to_tensor(loss)
   contrib_framework.assert_scalar(loss)
@@ -244,6 +250,10 @@ def optimize_loss(loss,
     # Multiply some gradients.
     if gradient_multipliers is not None:
       gradients = _multiply_gradients(gradients, gradient_multipliers)
+      if not gradients:
+        raise ValueError(
+            "Empty list of (gradient, var) pairs encountered. This is most "
+            "likely to be caused by an improper value of gradient_multipliers.")
 
     if "gradient_norm" in summaries:
       summary.scalar("global_norm/gradient_norm",
@@ -255,8 +265,8 @@ def optimize_loss(loss,
     elif callable(clip_gradients):
       gradients = clip_gradients(gradients)
     elif clip_gradients is not None:
-      raise ValueError("Unknown type %s for clip_gradients" %
-                       type(clip_gradients))
+      raise ValueError(
+          "Unknown type %s for clip_gradients" % type(clip_gradients))
 
     # Add scalar summary for loss.
     if "loss" in summaries:
-- 
GitLab


From 8cb87d72f6f133ed7687b469faf3d860d1eeee1c Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Mon, 17 Apr 2017 09:48:27 -0800
Subject: [PATCH 0456/1563] Java: Update release to 1.1.0-rc2 Change: 153360687

---
 tensorflow/java/README.md                     | 28 +++++++++----------
 tensorflow/java/maven/libtensorflow/pom.xml   |  2 +-
 .../java/maven/libtensorflow_jni/pom.xml      |  2 +-
 tensorflow/java/maven/pom.xml                 |  2 +-
 tensorflow/java/maven/tensorflow/pom.xml      |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tensorflow/java/README.md b/tensorflow/java/README.md
index 42cd24a7df..81e262db93 100644
--- a/tensorflow/java/README.md
+++ b/tensorflow/java/README.md
@@ -24,7 +24,7 @@ your project's `pom.xml`:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc1</version>
+  <version>1.1.0-rc2</version>
 </dependency>
 ```
 
@@ -50,7 +50,7 @@ That's all. As an example, to create a Maven project for the
           <dependency>
             <groupId>org.tensorflow</groupId>
             <artifactId>tensorflow</artifactId>
-            <version>1.1.0-rc1</version>
+            <version>1.1.0-rc2</version>
           </dependency>
         </dependencies>
     </project>
@@ -75,22 +75,22 @@ That's all. As an example, to create a Maven project for the
 This section describes how to use TensorFlow armed with just a JDK installation.
 
 1.  Download the Java archive (JAR):
-    [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar)
+    [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar)
     (optionally, the Java sources:
-    [libtensorflow-src.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-src-1.1.0-rc1.jar)).
+    [libtensorflow-src.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-src-1.1.0-rc2.jar)).
 
 2.  Download the native library. GPU-enabled versions required CUDA 8 and cuDNN
     5.1. For other versions, the native library will need to be built from
     source (see below).
 
     -   Linux:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-linux-x86_64-1.1.0-rc1.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-linux-x86_64-1.1.0-rc1.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-linux-x86_64-1.1.0-rc2.tar.gz),
+        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-linux-x86_64-1.1.0-rc2.tar.gz)
     -   OS X:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-darwin-x86_64-1.1.0-rc1.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-darwin-x86_64-1.1.0-rc1.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-darwin-x86_64-1.1.0-rc2.tar.gz),
+        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-darwin-x86_64-1.1.0-rc2.tar.gz)
     -   Windows:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc2.zip)
 
 
     The following shell snippet downloads and extracts the native library on
@@ -101,7 +101,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     OS=$(uname -s | tr '[:upper:]' '[:lower:]')
     mkdir -p ./jni
     curl -L \
-      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
+      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
     tar -xz -C ./jni
     ```
 
@@ -121,7 +121,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     then it should be compiled with:
 
     ```sh
-    javac -cp libtensorflow-1.1.0-rc1.jar MyClass.java
+    javac -cp libtensorflow-1.1.0-rc2.jar MyClass.java
     ```
 
     For a more sophisticated example, see
@@ -130,7 +130,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
 
     ```sh
     javac \
-      -cp libtensorflow-1.1.0-rc1.jar \
+      -cp libtensorflow-1.1.0-rc2.jar \
       ./src/main/java/org/tensorflow/examples/LabelImage.java
     ```
 
@@ -138,7 +138,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     library path during execution. For example:
 
     ```sh
-    java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni MyClass
+    java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni MyClass
     ```
 
     or for the `LabelImage` example:
@@ -146,7 +146,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     ```sh
     java \
       -Djava.library.path=./jni \
-      -cp libtensorflow-1.1.0-rc1.jar:./src/main/java \
+      -cp libtensorflow-1.1.0-rc2.jar:./src/main/java \
       org.tensorflow.examples.LabelImage
     ```
 
diff --git a/tensorflow/java/maven/libtensorflow/pom.xml b/tensorflow/java/maven/libtensorflow/pom.xml
index ec044a3ff6..d1ef706732 100644
--- a/tensorflow/java/maven/libtensorflow/pom.xml
+++ b/tensorflow/java/maven/libtensorflow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc1</version>
+    <version>1.1.0-rc2</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>libtensorflow</artifactId>
diff --git a/tensorflow/java/maven/libtensorflow_jni/pom.xml b/tensorflow/java/maven/libtensorflow_jni/pom.xml
index 8a243fe834..98e8eba031 100644
--- a/tensorflow/java/maven/libtensorflow_jni/pom.xml
+++ b/tensorflow/java/maven/libtensorflow_jni/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc1</version>
+    <version>1.1.0-rc2</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>libtensorflow_jni</artifactId>
diff --git a/tensorflow/java/maven/pom.xml b/tensorflow/java/maven/pom.xml
index 4939ed0b63..cf02b17ca6 100644
--- a/tensorflow/java/maven/pom.xml
+++ b/tensorflow/java/maven/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.tensorflow</groupId>
   <artifactId>parentpom</artifactId>
-  <version>1.1.0-rc1</version>
+  <version>1.1.0-rc2</version>
   <packaging>pom</packaging>
 
   <url>https://www.tensorflow.org</url>
diff --git a/tensorflow/java/maven/tensorflow/pom.xml b/tensorflow/java/maven/tensorflow/pom.xml
index 4b17d5d25a..0789cca40b 100644
--- a/tensorflow/java/maven/tensorflow/pom.xml
+++ b/tensorflow/java/maven/tensorflow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc1</version>
+    <version>1.1.0-rc2</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>tensorflow</artifactId>
-- 
GitLab


From da29a61b43ff58f4aea792069e96d9944257f0e0 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Mon, 17 Apr 2017 11:15:23 -0700
Subject: [PATCH 0457/1563] Fixing mistakes made to bzl file and configure.

---
 configure                 | 12 ------------
 tensorflow/tensorflow.bzl | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/configure b/configure
index 6746a947e7..48a4594da6 100755
--- a/configure
+++ b/configure
@@ -35,18 +35,6 @@ function is_windows() {
   fi
 }
 
-function bazel_clean_and_fetch() {
-  if ! is_windows; then
-    bazel clean --expunge
-  fi
-
-  if [ -z "$TF_BAZEL_TARGETS" ]; then
-    bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
-  else
-    bazel fetch $TF_BAZEL_TARGETS
-  fi
-}
-
 function sed_hyphen_i() {
   if is_macos; then
     sed -i '' "$@"
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index a3056b861b..ddffabd8cb 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -930,18 +930,6 @@ def tf_custom_op_py_library(name,
       deps=deps,)
 
 
-def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
-                            srcs_version="PY2AND3", visibility=None, deps=[]):
-  kernels = kernels  # unused argument
-  native.py_library(
-      name=name,
-      data=dso,
-      srcs=srcs,
-      srcs_version=srcs_version,
-      visibility=visibility,
-      deps=deps,
-  )
-
 def tf_extension_linkopts():
   return []  # No extension link opts
 
-- 
GitLab


From fd32dc59f0eb27119f3f7c62d35b67fca57fc417 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 09:54:04 -0800
Subject: [PATCH 0458/1563] Speed up dequantize for combined, by using a simple
 loop and avoiding the casts in the eigen expression. Change: 153361424

---
 tensorflow/core/kernels/BUILD                 |  19 +++
 tensorflow/core/kernels/dequantize_op.cc      |  15 +-
 tensorflow/core/kernels/dequantize_op_test.cc | 144 ++++++++++++++++++
 3 files changed, 172 insertions(+), 6 deletions(-)
 create mode 100644 tensorflow/core/kernels/dequantize_op_test.cc

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 036ac32419..f243c13377 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -1052,6 +1052,25 @@ tf_cuda_cc_test(
     ],
 )
 
+tf_cc_test(
+    name = "dequantize_op_test",
+    size = "small",
+    srcs = ["dequantize_op_test.cc"],
+    deps = [
+        ":ops_testutil",
+        ":ops_util",
+        ":quantized_ops",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+    ],
+)
+
 tf_cc_test(
     name = "reverse_op_test",
     size = "small",
diff --git a/tensorflow/core/kernels/dequantize_op.cc b/tensorflow/core/kernels/dequantize_op.cc
index c28909e03b..8efe0d1e35 100644
--- a/tensorflow/core/kernels/dequantize_op.cc
+++ b/tensorflow/core/kernels/dequantize_op.cc
@@ -69,12 +69,15 @@ class DequantizeOp : public OpKernel {
           (static_cast<float>(std::numeric_limits<T>::max()) -
            std::numeric_limits<T>::min());
 
-      // Multiply by scale factor and add min_range.
-      output->flat<float>() =
-          ((input.flat<T>().template cast<int>().template cast<float>() +
-            half_range_) *
-           scale_factor) +
-          min_range;
+      float* out_ptr = output->flat<float>().data();
+      const T* in_ptr = input.flat<T>().data();
+
+      const int64 num_elements = input.NumElements();
+      for (int i = 0; i < num_elements; ++i) {
+        out_ptr[i] =
+            ((static_cast<int>(in_ptr[i]) + half_range_) * scale_factor) +
+            min_range;
+      }
     } else if (mode_ == QUANTIZE_MODE_MIN_FIRST) {
       if (meta::IsSupportedAndEnabled() && std::is_same<T, quint8>()) {
         auto input_ui8_array = input.flat<quint8>();
diff --git a/tensorflow/core/kernels/dequantize_op_test.cc b/tensorflow/core/kernels/dequantize_op_test.cc
new file mode 100644
index 0000000000..efce810175
--- /dev/null
+++ b/tensorflow/core/kernels/dequantize_op_test.cc
@@ -0,0 +1,144 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "tensorflow/cc/ops/array_ops.h"
+#include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/core/common_runtime/kernel_benchmark_testlib.h"
+#include "tensorflow/core/framework/allocator.h"
+#include "tensorflow/core/framework/fake_input.h"
+#include "tensorflow/core/framework/node_def_builder.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/ops_testutil.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test_benchmark.h"
+
+namespace tensorflow {
+namespace {
+
+class DequantizeOpTest : public OpsTestBase {
+ protected:
+  template <typename T>
+  void ComputeDequantizeMinCombinedUsingEigen(const Tensor& input,
+                                              float min_range, float max_range,
+                                              Tensor* output) {
+    float half_range =
+        !std::is_signed<T>::value
+            ? 0.0f
+            : (static_cast<float>(std::numeric_limits<T>::max()) -
+               std::numeric_limits<T>::min() + 1) /
+                  2.0f;
+    const float scale_factor =
+        (max_range - min_range) /
+        (static_cast<float>(std::numeric_limits<T>::max()) -
+         std::numeric_limits<T>::min());
+    output->flat<float>() =
+        ((input.flat<T>().template cast<int>().template cast<float>() +
+          half_range) *
+         scale_factor) +
+        min_range;
+  }
+
+  // Compares dequantize min vs the same using eigen. This tests that a change
+  // to not use eigen gives equivalent results to using eigen.
+  template <typename T>
+  void RunDequantizeMinCombinedTest(float min_range, float max_range) {
+    TF_ASSERT_OK(NodeDefBuilder("dequantize_op", "Dequantize")
+                     .Input(FakeInput(DataTypeToEnum<T>::v()))
+                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(DT_FLOAT))
+                     .Attr("T", DataTypeToEnum<T>::v())
+                     .Attr("mode", "MIN_COMBINED")
+                     .Finalize(node_def()));
+    TF_ASSERT_OK(InitOp());
+
+    std::vector<T> input;
+    for (int64 i = std::numeric_limits<T>::min();
+         i < std::numeric_limits<T>::max(); ++i) {
+      input.push_back(static_cast<T>(i));
+    }
+    TensorShape shape({static_cast<int64>(input.size())});
+    AddInputFromArray<T>(shape, input);
+    AddInputFromArray<float>(TensorShape({1}), {min_range});
+    AddInputFromArray<float>(TensorShape({1}), {max_range});
+    TF_ASSERT_OK(RunOpKernel());
+    Tensor expected(allocator(), DT_FLOAT, shape);
+    ComputeDequantizeMinCombinedUsingEigen<T>(GetInput(0), min_range, max_range,
+                                              &expected);
+    test::ExpectTensorEqual<float>(expected, *GetOutput(0));
+  }
+};
+
+TEST_F(DequantizeOpTest, DequantizeMinCombinedQuint8) {
+  RunDequantizeMinCombinedTest<quint8>(0, 255.0f);
+}
+TEST_F(DequantizeOpTest, DequantizeMinCombinedQint8) {
+  RunDequantizeMinCombinedTest<qint8>(0, 255.0f);
+}
+TEST_F(DequantizeOpTest, DequantizeMinCombinedQint16) {
+  RunDequantizeMinCombinedTest<qint16>(0, 255.0f);
+}
+TEST_F(DequantizeOpTest, DequantizeMinCombinedQuint16) {
+  RunDequantizeMinCombinedTest<quint16>(0, 255.0f);
+}
+
+template <typename T>
+static void BM_DequantizeMinCombinedCpu(int iters) {
+  auto root = Scope::NewRootScope().ExitOnError();
+  const int64 num_values = 1500 * 250;
+  std::vector<T> inputs;
+  for (int i = 0; i < num_values; ++i) inputs.push_back(i);
+  ops::Dequantize(root, test::AsTensor<T>(inputs),
+                  test::AsTensor<float>({-1.5f}),
+                  test::AsTensor<float>({20.5f}),
+                  ops::Dequantize::Attrs().Mode("MIN_COMBINED"));
+  TF_CHECK_OK(root.status());
+  Graph* g = new Graph(OpRegistry::Global());
+  TF_CHECK_OK(root.ToGraph(g));
+
+  test::Benchmark("cpu", g).Run(iters);
+  testing::BytesProcessed(iters * num_values * (sizeof(float) + sizeof(T)));
+  testing::ItemsProcessed(iters);
+}
+
+static void BM_DequantizeMinCombinedCpuQuint16(int iters) {
+  BM_DequantizeMinCombinedCpu<quint16>(iters);
+}
+
+static void BM_DequantizeMinCombinedCpuQint16(int iters) {
+  BM_DequantizeMinCombinedCpu<qint16>(iters);
+}
+
+static void BM_DequantizeMinCombinedCpuQuint8(int iters) {
+  BM_DequantizeMinCombinedCpu<quint8>(iters);
+}
+
+static void BM_DequantizeMinCombinedCpuQint8(int iters) {
+  BM_DequantizeMinCombinedCpu<qint8>(iters);
+}
+
+BENCHMARK(BM_DequantizeMinCombinedCpuQuint16);
+BENCHMARK(BM_DequantizeMinCombinedCpuQint16);
+BENCHMARK(BM_DequantizeMinCombinedCpuQuint8);
+BENCHMARK(BM_DequantizeMinCombinedCpuQint8);
+
+}  // namespace
+}  // namespace tensorflow
-- 
GitLab


From 1ae60b652a787692d18d4b1e6db399db3e171461 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Mon, 17 Apr 2017 10:05:29 -0800
Subject: [PATCH 0459/1563] Release: Package public API protocol buffer files
 into an archive Change: 153363147

---
 tensorflow/tools/ci_build/builds/libtensorflow.sh |  5 ++++-
 tensorflow/tools/lib_package/BUILD                | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tensorflow/tools/ci_build/builds/libtensorflow.sh b/tensorflow/tools/ci_build/builds/libtensorflow.sh
index 54ecaf6990..c611695ad8 100755
--- a/tensorflow/tools/ci_build/builds/libtensorflow.sh
+++ b/tensorflow/tools/ci_build/builds/libtensorflow.sh
@@ -34,6 +34,7 @@
 # - lib_package/libtensorflow_jni${SUFFIX}.tar.gz
 # - lib_package/libtensorflow.jar
 # - lib_package/libtensorflow-src.jar
+# - lib_package/libtensorflow_proto.zip
 #
 # ASSUMPTIONS:
 # - build_libtensorflow_tarball is invoked from the root of the git tree.
@@ -73,10 +74,12 @@ function build_libtensorflow_tarball() {
     //tensorflow/tools/lib_package:libtensorflow.tar.gz \
     //tensorflow/tools/lib_package:libtensorflow_jni.tar.gz \
     //tensorflow/java:libtensorflow.jar \
-    //tensorflow/java:libtensorflow-src.jar
+    //tensorflow/java:libtensorflow-src.jar \
+    //tensorflow/tools/lib_package:libtensorflow_proto.zip
 
   mkdir -p ${DIR}
   cp bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz ${DIR}/libtensorflow${TARBALL_SUFFIX}.tar.gz
   cp bazel-bin/tensorflow/tools/lib_package/libtensorflow_jni.tar.gz ${DIR}/libtensorflow_jni${TARBALL_SUFFIX}.tar.gz
   cp bazel-bin/tensorflow/java/libtensorflow.jar bazel-bin/tensorflow/java/libtensorflow-src.jar ${DIR}
+  cp bazel-bin/tensorflow/tools/lib_package/libtensorflow_proto.zip ${DIR}
 }
diff --git a/tensorflow/tools/lib_package/BUILD b/tensorflow/tools/lib_package/BUILD
index a8e6ecdbf0..1e36af93ea 100644
--- a/tensorflow/tools/lib_package/BUILD
+++ b/tensorflow/tools/lib_package/BUILD
@@ -1,12 +1,17 @@
-# Packaging the TensorFlow C API and Java libraries into standalone archives
-# for use with language bindings and installations without Python.
-#
-# TODO(ashankar): Something similar for the C++ API (caveat: ABI compatibility)
+# Packaging for TensorFlow artifacts other than the Python API (pip whl).
+# This includes the C API, Java API, and protocol buffer files.
 
 package(default_visibility = ["//visibility:private"])
 
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 
+genrule(
+    name = "libtensorflow_proto",
+    srcs = ["//tensorflow/core:protos_all_proto_srcs"],
+    outs = ["libtensorflow_proto.zip"],
+    cmd = "zip $@ $(SRCS)",
+)
+
 pkg_tar(
     name = "libtensorflow",
     extension = "tar.gz",
-- 
GitLab


From 7e52901db1bb8b6bec4ae413772be850d83232d3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 10:11:30 -0800
Subject: [PATCH 0460/1563] Print tensors in alphabetical order of their names.
 Change: 153363979

---
 tensorflow/python/tools/inspect_checkpoint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/tools/inspect_checkpoint.py b/tensorflow/python/tools/inspect_checkpoint.py
index 9942a5d908..47a74e5abf 100644
--- a/tensorflow/python/tools/inspect_checkpoint.py
+++ b/tensorflow/python/tools/inspect_checkpoint.py
@@ -46,7 +46,7 @@ def print_tensors_in_checkpoint_file(file_name, tensor_name, all_tensors):
     reader = pywrap_tensorflow.NewCheckpointReader(file_name)
     if all_tensors:
       var_to_shape_map = reader.get_variable_to_shape_map()
-      for key in var_to_shape_map:
+      for key in sorted(var_to_shape_map):
         print("tensor_name: ", key)
         print(reader.get_tensor(key))
     elif not tensor_name:
-- 
GitLab


From cfa63bccfb8196c9097d26e82f5ce3fac694a03c Mon Sep 17 00:00:00 2001
From: Nishidha <nishidha@us.ibm.com>
Date: Tue, 18 Apr 2017 00:07:31 +0530
Subject: [PATCH 0461/1563] Fixed jemalloc build on linux ppc64le when it is
 enabled while configure (#9214)

* Fixed jemalloc build on linux ppc64le when it is enabled while configure

* Review comments incorporated

* Fixed build issue caused after rebase from the latest master

* Update jemalloc.BUILD
---
 tensorflow/BUILD                              | 19 +++++++++---
 .../core/platform/default/build_config.bzl    |  6 ++--
 third_party/jemalloc.BUILD                    | 31 ++++++++++++++++---
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 70a2362f72..bd3cce9a90 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -88,6 +88,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "linux_ppc64le",
+    values = {"cpu": "ppc"},
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "debug",
     values = {
@@ -110,17 +116,20 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+# TODO(jhseu): Enable on other platforms other than Linux.
 config_setting(
-    name = "linux_ppc64le",
-    values = {"cpu": "ppc"},
+    name = "with_jemalloc_linux_x86_64",
+    values = {
+        "cpu": "k8",
+        "define": "with_jemalloc=true",
+    },
     visibility = ["//visibility:public"],
 )
 
-# TODO(jhseu): Enable on other platforms other than Linux.
 config_setting(
-    name = "with_jemalloc",
+    name = "with_jemalloc_linux_ppc64le",
     values = {
-        "cpu": "k8",
+        "cpu": "ppc",
         "define": "with_jemalloc=true",
     },
     visibility = ["//visibility:public"],
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index f21a646ca1..0d0b2a8ad5 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -193,13 +193,15 @@ def tf_kernel_tests_linkstatic():
 
 def tf_additional_lib_defines():
   return select({
-      "//tensorflow:with_jemalloc": ["TENSORFLOW_USE_JEMALLOC"],
+      "//tensorflow:with_jemalloc_linux_x86_64": ["TENSORFLOW_USE_JEMALLOC"],
+      "//tensorflow:with_jemalloc_linux_ppc64le":["TENSORFLOW_USE_JEMALLOC"],
       "//conditions:default": [],
   })
 
 def tf_additional_lib_deps():
   return select({
-      "//tensorflow:with_jemalloc": ["@jemalloc"],
+      "//tensorflow:with_jemalloc_linux_x86_64": ["@jemalloc"],
+      "//tensorflow:with_jemalloc_linux_ppc64le": ["@jemalloc"],
       "//conditions:default": [],
   })
 
diff --git a/third_party/jemalloc.BUILD b/third_party/jemalloc.BUILD
index aabff39d7b..b9eeaf5a42 100644
--- a/third_party/jemalloc.BUILD
+++ b/third_party/jemalloc.BUILD
@@ -89,6 +89,14 @@ cc_library(
         "-D_REENTRANT",
     ],
     includes = ["include"],
+    # pthread_atfork() is called for PPC.
+    linkopts = select({
+        "@%ws%//tensorflow:linux_ppc64le": [
+            "-lpthread",
+        ],
+        "//conditions:default": [
+        ],
+    }),
     visibility = ["//visibility:public"],
 )
 
@@ -183,12 +191,17 @@ sh_binary(
     srcs = ["include/jemalloc/internal/size_classes.sh"],
 )
 
-# Size classes for Linux x86_64. Update if adding builds for other
-# architectures. See size_classes.sh for details on the arguments.
+# Size classes for Linux x86_64 and ppc64le. Update if adding builds for other
+# architectures. See size_classes.sh for details on the arguments. 
+# For default case, kept the arguments same as that of  x86_64 for now.
 genrule(
     name = "size_classes_h",
     outs = ["include/jemalloc/internal/size_classes.h"],
-    cmd = "$(location :size_classes_sh) \"3 4\" 3 12 2 >$@",
+    cmd = select({
+        "@%ws%//tensorflow:linux_ppc64le": "$(location :size_classes_sh) \"3 4\" 3 16 2 >$@",
+        "@%ws%//tensorflow:linux_x86_64": "$(location :size_classes_sh) \"3 4\" 3 12 2 >$@",
+        "//conditions:default": "$(location :size_classes_sh) \"3 4\" 3 12 2 >$@",
+    }),
     tools = [":size_classes_sh"],
 )
 
@@ -210,7 +223,11 @@ template_rule(
         "#undef JEMALLOC_PREFIX": "#define JEMALLOC_PREFIX \"jemalloc_\"",
         "#undef JEMALLOC_CPREFIX": "#define JEMALLOC_CPREFIX \"JEMALLOC_\"",
         "#undef JEMALLOC_PRIVATE_NAMESPACE": "#define JEMALLOC_PRIVATE_NAMESPACE je_",
-        "#undef CPU_SPINWAIT": "#define CPU_SPINWAIT __asm__ volatile(\"pause\")",
+        "#undef CPU_SPINWAIT": "\n".join(["#if defined(__powerpc64__) || defined(__powerpc__)",
+                                          "#define CPU_SPINWAIT __asm__ volatile(\"or 27,27,27\")",
+                                          "#else",
+                                          "#define CPU_SPINWAIT __asm__ volatile(\"pause\")",
+                                          "#endif"]),
         "#undef JEMALLOC_HAVE_BUILTIN_CLZ": "#define JEMALLOC_HAVE_BUILTIN_CLZ",
         "#undef JEMALLOC_USE_SYSCALL": "#define JEMALLOC_USE_SYSCALL",
         "#undef JEMALLOC_HAVE_SECURE_GETENV": "#define JEMALLOC_HAVE_SECURE_GETENV",
@@ -226,7 +243,11 @@ template_rule(
         "#undef JEMALLOC_DSS": "#define JEMALLOC_DSS",
         "#undef JEMALLOC_FILL": "#define JEMALLOC_FILL",
         "#undef LG_TINY_MIN": "#define LG_TINY_MIN 3",
-        "#undef LG_PAGE": "#define LG_PAGE 12",
+        "#undef LG_PAGE": "\n".join(["#if defined(__powerpc64__) || defined(__powerpc__)",
+                                     "#define LG_PAGE 16",
+                                     "#else",
+                                     "#define LG_PAGE 12",
+                                     "#endif"]),
         "#undef JEMALLOC_MAPS_COALESCE": "#define JEMALLOC_MAPS_COALESCE",
         "#undef JEMALLOC_TLS": "#define JEMALLOC_TLS",
         "#undef JEMALLOC_INTERNAL_UNREACHABLE": "#define JEMALLOC_INTERNAL_UNREACHABLE __builtin_unreachable",
-- 
GitLab


From 4f95b09d9e52ee0ae98f97c1de9895317088979b Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Mon, 17 Apr 2017 10:18:01 -0800
Subject: [PATCH 0462/1563] Don't assert on unimplemented layout Change:
 153364868

---
 tensorflow/core/kernels/conv_ops.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tensorflow/core/kernels/conv_ops.cc b/tensorflow/core/kernels/conv_ops.cc
index 8076daf387..b3803778c8 100644
--- a/tensorflow/core/kernels/conv_ops.cc
+++ b/tensorflow/core/kernels/conv_ops.cc
@@ -117,6 +117,12 @@ class LaunchConv2DOp<CPUDevice, T> {
               const Tensor& input, const Tensor& filter, int row_stride,
               int col_stride, const Eigen::PaddingType& padding, Tensor* output,
               TensorFormat data_format) {
+    if (data_format != FORMAT_NHWC) {
+      ctx->SetStatus(
+          errors::Unimplemented("Generic conv implementation only supports "
+                                "NHWC tensor format for now."));
+      return;
+    }
     LaunchGeneric<CPUDevice, T>::launch(ctx, input, filter, row_stride,
                                         col_stride, padding, output,
                                         data_format);
-- 
GitLab


From 9fded1f4e0b58cc6ac7997faae37446f62b39fe8 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Mon, 17 Apr 2017 10:27:50 -0800
Subject: [PATCH 0463/1563] Uses variable_scope.variable in Adam Change:
 153366126

---
 tensorflow/python/training/adam.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/training/adam.py b/tensorflow/python/training/adam.py
index 592a9e8585..5ae82524a3 100644
--- a/tensorflow/python/training/adam.py
+++ b/tensorflow/python/training/adam.py
@@ -23,7 +23,7 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import state_ops
-from tensorflow.python.ops import variables
+from tensorflow.python.ops import variable_scope
 from tensorflow.python.training import optimizer
 from tensorflow.python.training import training_ops
 
@@ -117,12 +117,12 @@ class AdamOptimizer(optimizer.Optimizer):
     if (self._beta1_power is None or
         self._beta1_power.graph is not var_list[0].graph):
       with ops.colocate_with(var_list[0]):
-        self._beta1_power = variables.Variable(self._beta1,
-                                               name="beta1_power",
-                                               trainable=False)
-        self._beta2_power = variables.Variable(self._beta2,
-                                               name="beta2_power",
-                                               trainable=False)
+        self._beta1_power = variable_scope.variable(self._beta1,
+                                                    name="beta1_power",
+                                                    trainable=False)
+        self._beta2_power = variable_scope.variable(self._beta2,
+                                                    name="beta2_power",
+                                                    trainable=False)
     # Create slots for the first and second moments.
     for v in var_list:
       self._zeros_slot(v, "m", self._name)
-- 
GitLab


From 88a6cdeb5ee79765462932a611d4d16dd715007c Mon Sep 17 00:00:00 2001
From: RJ Ryan <rjryan@google.com>
Date: Mon, 17 Apr 2017 10:43:44 -0800
Subject: [PATCH 0464/1563] Enable reduce_mean, reduce_sum and reduce_prod for
 complex types on CPU/GPU. Change: 153368416

---
 .../core/kernels/reduction_ops_gpu.cu.cc      |   8 +-
 tensorflow/core/kernels/reduction_ops_mean.cc |   8 +-
 tensorflow/core/kernels/reduction_ops_prod.cc |  10 +-
 tensorflow/core/kernels/reduction_ops_sum.cc  |  15 +-
 .../python/kernel_tests/reduction_ops_test.py | 505 ++++++++----------
 5 files changed, 238 insertions(+), 308 deletions(-)

diff --git a/tensorflow/core/kernels/reduction_ops_gpu.cu.cc b/tensorflow/core/kernels/reduction_ops_gpu.cu.cc
index fbc4ee31a4..ec4490db83 100644
--- a/tensorflow/core/kernels/reduction_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/reduction_ops_gpu.cu.cc
@@ -47,7 +47,7 @@ struct ReduceFunctor<GPUDevice, Reducer> {
 };
 
 template <typename T>
-struct ReduceFunctor<GPUDevice, Eigen::internal::MeanReducer<T> > {
+struct ReduceFunctor<GPUDevice, Eigen::internal::MeanReducer<T>> {
   template <typename OUT_T, typename IN_T, typename ReductionAxes>
   static void Reduce(const GPUDevice& d, OUT_T out, IN_T in,
                      const ReductionAxes& reduction_axes,
@@ -60,7 +60,7 @@ struct ReduceFunctor<GPUDevice, Eigen::internal::MeanReducer<T> > {
          ++i) {
       num_coeffs_to_reduce *= in.dimension(reduction_axes[i]);
     }
-    T scale = T(1.0) / num_coeffs_to_reduce;
+    T scale = T(1.0 / num_coeffs_to_reduce);
     out.device(d) = (in * scale).sum(reduction_axes);
   }
 
@@ -108,6 +108,10 @@ DEFINE_FOR_ALL_REDUCERS(double);
 
 DEFINE_FOR_TYPE_AND_R(complex64, Eigen::internal::SumReducer<complex64>);
 DEFINE_FOR_TYPE_AND_R(complex128, Eigen::internal::SumReducer<complex128>);
+DEFINE_FOR_TYPE_AND_R(complex64, Eigen::internal::MeanReducer<complex64>);
+DEFINE_FOR_TYPE_AND_R(complex128, Eigen::internal::MeanReducer<complex128>);
+DEFINE_FOR_TYPE_AND_R(complex64, Eigen::internal::ProdReducer<complex64>);
+DEFINE_FOR_TYPE_AND_R(complex128, Eigen::internal::ProdReducer<complex128>);
 DEFINE_FOR_TYPE_AND_R(bool, Eigen::internal::AndReducer);
 DEFINE_FOR_TYPE_AND_R(bool, Eigen::internal::OrReducer);
 #undef DEFINE_FOR_TYPE_AND_R
diff --git a/tensorflow/core/kernels/reduction_ops_mean.cc b/tensorflow/core/kernels/reduction_ops_mean.cc
index e018cb55dd..03f737b4fa 100644
--- a/tensorflow/core/kernels/reduction_ops_mean.cc
+++ b/tensorflow/core/kernels/reduction_ops_mean.cc
@@ -24,7 +24,7 @@ namespace tensorflow {
           .TypeConstraint<type>("T")      \
           .TypeConstraint<int32>("Tidx"), \
       ReductionOp<CPUDevice, type, Eigen::internal::MeanReducer<type>>);
-TF_CALL_REAL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
+TF_CALL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
 #undef REGISTER_CPU_KERNELS
 
 #if GOOGLE_CUDA
@@ -37,9 +37,9 @@ TF_CALL_REAL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
           .TypeConstraint<int32>("Tidx")    \
           .HostMemory("reduction_indices"), \
       ReductionOp<GPUDevice, type, Eigen::internal::MeanReducer<type>>);
-REGISTER_GPU_KERNELS(Eigen::half);
-REGISTER_GPU_KERNELS(float);
-REGISTER_GPU_KERNELS(double);
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_KERNELS);
+TF_CALL_complex64(REGISTER_GPU_KERNELS);
+TF_CALL_complex128(REGISTER_GPU_KERNELS);
 #undef REGISTER_GPU_KERNELS
 
 #endif
diff --git a/tensorflow/core/kernels/reduction_ops_prod.cc b/tensorflow/core/kernels/reduction_ops_prod.cc
index e04c655dab..f841a981b4 100644
--- a/tensorflow/core/kernels/reduction_ops_prod.cc
+++ b/tensorflow/core/kernels/reduction_ops_prod.cc
@@ -24,7 +24,7 @@ namespace tensorflow {
           .TypeConstraint<type>("T")      \
           .TypeConstraint<int32>("Tidx"), \
       ReductionOp<CPUDevice, type, Eigen::internal::ProdReducer<type>>);
-TF_CALL_REAL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
+TF_CALL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
 #undef REGISTER_CPU_KERNELS
 
 #if GOOGLE_CUDA
@@ -37,10 +37,10 @@ TF_CALL_REAL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
           .TypeConstraint<int32>("Tidx")    \
           .HostMemory("reduction_indices"), \
       ReductionOp<GPUDevice, type, Eigen::internal::ProdReducer<type>>);
-REGISTER_GPU_KERNELS(Eigen::half);
-REGISTER_GPU_KERNELS(int32);
-REGISTER_GPU_KERNELS(float);
-REGISTER_GPU_KERNELS(double);
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_KERNELS);
+TF_CALL_int32(REGISTER_GPU_KERNELS);
+TF_CALL_complex64(REGISTER_GPU_KERNELS);
+TF_CALL_complex128(REGISTER_GPU_KERNELS);
 #undef REGISTER_GPU_KERNELS
 
 #endif
diff --git a/tensorflow/core/kernels/reduction_ops_sum.cc b/tensorflow/core/kernels/reduction_ops_sum.cc
index 938ca66a0c..828e1a588c 100644
--- a/tensorflow/core/kernels/reduction_ops_sum.cc
+++ b/tensorflow/core/kernels/reduction_ops_sum.cc
@@ -24,12 +24,7 @@ namespace tensorflow {
           .TypeConstraint<type>("T")      \
           .TypeConstraint<int32>("Tidx"), \
       ReductionOp<CPUDevice, type, Eigen::internal::SumReducer<type>>);
-TF_CALL_REAL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
-// NOTE: We should have mean(complex64,int32), too. But that needs to
-// change Eigen::internal::MeanReducer to cast int to complex<float>.
-// We don't see immediate need of mean(complex64,int32) anyway.
-TF_CALL_complex64(REGISTER_CPU_KERNELS);
-TF_CALL_complex128(REGISTER_CPU_KERNELS);
+TF_CALL_NUMBER_TYPES(REGISTER_CPU_KERNELS);
 #undef REGISTER_CPU_KERNELS
 
 #if GOOGLE_CUDA
@@ -42,11 +37,9 @@ TF_CALL_complex128(REGISTER_CPU_KERNELS);
           .TypeConstraint<int32>("Tidx")    \
           .HostMemory("reduction_indices"), \
       ReductionOp<GPUDevice, type, Eigen::internal::SumReducer<type>>);
-REGISTER_GPU_KERNELS(Eigen::half);
-REGISTER_GPU_KERNELS(float);
-REGISTER_GPU_KERNELS(double);
-REGISTER_GPU_KERNELS(complex64);
-REGISTER_GPU_KERNELS(complex128);
+TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU_KERNELS);
+TF_CALL_complex64(REGISTER_GPU_KERNELS);
+TF_CALL_complex128(REGISTER_GPU_KERNELS);
 #undef REGISTER_GPU_KERNELS
 
 // A special GPU kernel for int32.
diff --git a/tensorflow/python/kernel_tests/reduction_ops_test.py b/tensorflow/python/kernel_tests/reduction_ops_test.py
index 316c23609c..1dfc7f48d5 100644
--- a/tensorflow/python/kernel_tests/reduction_ops_test.py
+++ b/tensorflow/python/kernel_tests/reduction_ops_test.py
@@ -18,6 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import itertools
+import numbers
+
 import numpy as np
 
 from tensorflow.python.framework import constant_op
@@ -29,6 +32,26 @@ from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 
+# The maximum input rank to test.
+_MAX_RANK = 5
+
+
+def _powerset(iterable):
+  """Helper for generating all possible reduction_axes arguments.
+
+  Example:
+  powerset([0,1,2]): () (0,) (1,) (2,) (0,1) (0,2) (1,2) (0,1,2)
+
+  Args:
+    iterable: An iterable of items to generate the powerset of.
+
+  Returns:
+    The powerset of all items in iterable.
+  """
+  s = list(iterable)
+  return itertools.chain.from_iterable(
+      itertools.combinations(s, r) for r in range(len(s)+1))
+
 
 class ReducedShapeTest(test.TestCase):
 
@@ -68,23 +91,30 @@ class ReducedShapeTest(test.TestCase):
       self._check([10, 10, 10], [-3], [1, 10, 10])
 
 
-class SumReductionTest(test.TestCase):
+class BaseReductionTest(test.TestCase):
 
-  def _compare(self,
-               x,
-               reduction_axes,
-               keep_dims,
-               use_gpu=False,
-               feed_dict=None):
-    np_ans = x
-    if reduction_axes is None:
-      np_ans = np.sum(np_ans, keepdims=keep_dims)
-    else:
-      reduction_axes = np.array(reduction_axes).astype(np.int32)
-      for ra in reduction_axes.ravel()[::-1]:
-        np_ans = np.sum(np_ans, axis=ra, keepdims=keep_dims)
-    with self.test_session(use_gpu=use_gpu) as sess:
-      tf_ans = math_ops.reduce_sum(x, reduction_axes, keep_dims)
+  def _tf_reduce(self, x, reduction_axes, keep_dims):
+    raise NotImplementedError()
+
+  def _np_reduce(self, x, reduction_axes, keep_dims):
+    raise NotImplementedError()
+
+  def _makeIncremental(self, shape, dtype):
+    data = np.arange(np.prod(shape)).reshape(shape).astype(dtype.as_numpy_dtype)
+    if dtype.is_complex:
+      data -= 2j * data
+    return data
+
+  def _makeRandom(self, shape, dtype):
+    data = np.random.rand(*shape).astype(dtype.as_numpy_dtype)
+    if dtype.is_complex:
+      data -= 2j * data
+    return data
+
+  def _compare(self, x, reduction_axes, keep_dims, feed_dict=None):
+    np_ans = self._np_reduce(x, reduction_axes, keep_dims)
+    with self.test_session(use_gpu=True) as sess:
+      tf_ans = self._tf_reduce(x, reduction_axes, keep_dims)
       out = sess.run(tf_ans, feed_dict)
     self.assertAllClose(np_ans, out)
     self.assertShapeEqual(np_ans, tf_ans)
@@ -93,10 +123,45 @@ class SumReductionTest(test.TestCase):
     if reduction_axes is not None and np.shape(reduction_axes) == (1,):
       # Test scalar reduction_axes argument
       self._compareAll(x, reduction_axes[0])
-    self._compare(x, reduction_axes, False, use_gpu=True, feed_dict=feed_dict)
-    self._compare(x, reduction_axes, False, use_gpu=False, feed_dict=feed_dict)
-    self._compare(x, reduction_axes, True, use_gpu=True, feed_dict=feed_dict)
-    self._compare(x, reduction_axes, True, use_gpu=False, feed_dict=feed_dict)
+    self._compare(x, reduction_axes, keep_dims=False, feed_dict=feed_dict)
+    self._compare(x, reduction_axes, keep_dims=True, feed_dict=feed_dict)
+
+  def _compareAllAxes(self, x, feed_dict=None):
+    self._compareAll(x, None)
+    for axes in _powerset(range(x.ndim)):
+      self._compareAll(x, axes, feed_dict)
+
+  def _compareGradient(self, x, reduction_axes, rtol=1e-8, atol=1e-8):
+    if reduction_axes is not None and np.shape(reduction_axes) == (1,):
+      # Test scalar reduction_axes argument
+      self._compareGradient(x, reduction_axes[0], rtol=rtol, atol=atol)
+    with self.test_session(use_gpu=True):
+      t = ops.convert_to_tensor(x)
+      su = self._tf_reduce(t, reduction_axes, False)
+      jacob_t, jacob_n = gradient_checker.compute_gradient(
+          t, x.shape, su, su.get_shape().as_list(), x_init_value=x, delta=1)
+    self.assertAllClose(jacob_t, jacob_n, rtol=rtol, atol=atol)
+
+  def _compareGradientAxes(self, x, rtol=1e-8, atol=1e-8):
+    self._compareGradient(x, None, rtol=rtol, atol=atol)
+    self._compareGradient(x, [], rtol=rtol, atol=atol)
+    self._compareGradient(x, 0, rtol=rtol, atol=atol)
+    self._compareGradient(x, [1], rtol=rtol, atol=atol)
+    self._compareGradient(x, [2], rtol=rtol, atol=atol)
+    self._compareGradient(x, [1, 2], rtol=rtol, atol=atol)
+    self._compareGradient(x, [0, 1, 2, 3], rtol=rtol, atol=atol)
+
+
+class SumReductionTest(BaseReductionTest):
+
+  def _tf_reduce(self, x, reduction_axes, keep_dims):
+    return math_ops.reduce_sum(x, reduction_axes, keep_dims)
+
+  def _np_reduce(self, x, reduction_axes, keep_dims):
+    if isinstance(reduction_axes, list) or isinstance(reduction_axes,
+                                                      np.ndarray):
+      reduction_axes = tuple(reduction_axes)
+    return np.sum(x, axis=reduction_axes, keepdims=keep_dims)
 
   def testInfinity(self):
     for dtype in [np.float32, np.float64]:
@@ -105,95 +170,30 @@ class SumReductionTest(test.TestCase):
           np_arr = np.array([special_value_x, special_value_y]).astype(dtype)
           self._compareAll(np_arr, None)
 
-  def testFloatReduce1D(self):
-    # Create a 1D array of floats
-    np_arr = np.arange(1, 6).reshape([5]).astype(np.float32)
-    self._compareAll(np_arr, [0])
+  def testInt32(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.int32)
+      self._compareAllAxes(np_arr)
 
-  def testFloatReduce2D(self):
-    # Create a 2D array of floats and reduce across all possible
-    # dimensions
-    np_arr = np.arange(0, 10).reshape([2, 5]).astype(np.float32)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-    self._compareAll(np_arr, [1])
-    self._compareAll(np_arr, [0, 1])
+  def testFloat32(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.float32)
+      self._compareAllAxes(np_arr)
 
-  def testFloatReduce3D(self):
-    # Create a 3D array of floats and reduce across all possible
-    # dimensions
-    np_arr = np.arange(0, 30).reshape([2, 3, 5]).astype(np.float32)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-    self._compareAll(np_arr, [1])
-    self._compareAll(np_arr, [2])
-    self._compareAll(np_arr, [0, 1])
-    self._compareAll(np_arr, [1, 2])
-    self._compareAll(np_arr, [0, 2])
-    self._compareAll(np_arr, [0, 1, 2])
-    self._compareAll(np_arr, [-1])
-    self._compareAll(np_arr, [-1, -3])
-    self._compareAll(np_arr, [-1, 1])
+  def testFloat64(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.float64)
+      self._compareAllAxes(np_arr)
 
-  def testFloatReduce4D(self):
-    # Create a 4D array of floats and reduce across some
-    # dimensions
-    np_arr = np.arange(0, 210).reshape([2, 3, 5, 7]).astype(np.float32)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-    self._compareAll(np_arr, [1])
-    self._compareAll(np_arr, [2])
-    self._compareAll(np_arr, [0, 1])
-    self._compareAll(np_arr, [1, 2])
-    # Need specialization for reduce(4D, [0, 2])
-    # self._compareAll(np_arr, [0, 2])
-    self._compareAll(np_arr, [0, 1, 2])
-    self._compareAll(np_arr, [1, 2, 3])
-    self._compareAll(np_arr, [0, 1, 2, 3])
+  def testComplex64(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.complex64)
+      self._compareAllAxes(np_arr)
 
-  def testFloatReduce5D(self):
-    # Create a 5D array of floats and reduce across some dimensions
-    np_arr = np.arange(0, 840).reshape([2, 3, 5, 7, 4]).astype(np.float32)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-    self._compareAll(np_arr, [1])
-    self._compareAll(np_arr, [2])
-    self._compareAll(np_arr, [0, 1])
-    self._compareAll(np_arr, [1, 2])
-    # Need specialization for reduce(4D, [0, 2])
-    # self._compareAll(np_arr, [0, 2])
-    self._compareAll(np_arr, [0, 1, 2])
-    self._compareAll(np_arr, [1, 2, 3])
-    self._compareAll(np_arr, [0, 1, 2, 3])
-    self._compareAll(np_arr, [1, 2, 3, 4])
-    self._compareAll(np_arr, [0, 1, 2, 3, 4])
-
-  # Simple tests for various types.
-  def testDoubleReduce1D(self):
-    np_arr = np.arange(1, 6).reshape([5]).astype(np.float64)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-
-  def testInt32Reduce1D(self):
-    np_arr = np.arange(1, 6).reshape([5]).astype(np.int32)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-
-  def testComplex64Reduce1D(self):
-    np_arr = np.arange(1, 6).reshape([5]).astype(np.complex64)
-    self._compare(np_arr, [], False)
-    self._compare(np_arr, [0], False)
-
-  def testComplex128Reduce1D(self):
-    np_arr = np.arange(1, 6).reshape([5]).astype(np.complex128)
-    self._compare(np_arr, [], False)
-    self._compare(np_arr, [0], False)
+  def testComplex128(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.complex128)
+      self._compareAllAxes(np_arr)
 
   def testInvalidIndex(self):
     np_arr = np.arange(0, 10).reshape([2, 5]).astype(np.float32)
@@ -250,32 +250,11 @@ class SumReductionTest(test.TestCase):
 
   # Int64??
 
-  def _compareGradient(self, shape, sum_shape, reduction_axes):
-    if reduction_axes is not None and np.shape(reduction_axes) == (1,):
-      # Test scalar reduction_axes argument
-      self._compareGradient(shape, sum_shape, reduction_axes[0])
-    x = np.arange(1.0, 49.0).reshape(shape).astype(np.float64)
-    with self.test_session():
-      t = ops.convert_to_tensor(x)
-      su = math_ops.reduce_sum(t, reduction_axes)
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, shape, su, sum_shape, x_init_value=x, delta=1)
-    self.assertAllClose(jacob_t, jacob_n, rtol=1e-8, atol=1e-8)
-
   def testGradient(self):
-    self._compareGradient([2, 3, 4, 2], [2, 2], [1, 2])
-
-  def testGradient2(self):
-    self._compareGradient([2, 3, 4, 2], [2, 4, 2], [1])
-
-  def testGradient3(self):
-    self._compareGradient([2, 3, 4, 2], [2, 3, 2], [2])
-
-  def testGradient4(self):
-    self._compareGradient([2, 3, 4, 2], [], None)
-
-  def testGradient5(self):
-    self._compareGradient([2, 3, 4, 2], [3, 4, 2], 0)
+    for dtype in [dtypes.float32, dtypes.float64, dtypes.complex64,
+                  dtypes.complex128]:
+      x = self._makeIncremental([2, 3, 4, 2], dtype)
+      self._compareGradientAxes(x)
 
   def testHighRank(self):
     # Do a bunch of random high dimensional reductions
@@ -300,61 +279,45 @@ class SumReductionTest(test.TestCase):
     self._compareAll(x, [1])
 
   def testEmptyGradients(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       x = array_ops.zeros([0, 3])
       y = math_ops.reduce_sum(x, [1])
       error = gradient_checker.compute_gradient_error(x, [0, 3], y, [0])
       self.assertEqual(error, 0)
 
   def testDegenerate(self):
-    for use_gpu in False, True:
-      with self.test_session(use_gpu=use_gpu):
-        for dtype in (dtypes.float16, dtypes.float32, dtypes.float64,
-                      dtypes.complex64, dtypes.complex128):
-          # A large number is needed to get Eigen to die
-          x = array_ops.zeros((0, 9938), dtype=dtype)
-          y = math_ops.reduce_sum(x, [0])
-          self.assertAllEqual(y.eval(), np.zeros(9938))
+    with self.test_session(use_gpu=True):
+      for dtype in (dtypes.float16, dtypes.float32, dtypes.float64,
+                    dtypes.complex64, dtypes.complex128):
+        # A large number is needed to get Eigen to die
+        x = array_ops.zeros((0, 9938), dtype=dtype)
+        y = math_ops.reduce_sum(x, [0])
+        self.assertAllEqual(y.eval(), np.zeros(9938))
 
 
-class MeanReductionTest(test.TestCase):
+class MeanReductionTest(BaseReductionTest):
 
-  def _compare(self, x, reduction_axes, keep_dims, use_gpu=False):
-    np_ans = x
-    if reduction_axes is None:
-      np_ans = np.mean(np_ans, keepdims=keep_dims)
-    else:
-      reduction_axes = np.array(reduction_axes).astype(np.int32)
-      count = 1
-      for ra in reduction_axes.ravel()[::-1]:
-        np_ans = np.sum(np_ans, axis=ra, keepdims=keep_dims)
-        count *= x.shape[ra]
-      np_ans /= count
-    with self.test_session(use_gpu=use_gpu):
-      tf_ans = math_ops.reduce_mean(x, reduction_axes, keep_dims)
-      out = tf_ans.eval()
-    self.assertAllClose(np_ans, out)
-    self.assertShapeEqual(np_ans, tf_ans)
+  def _tf_reduce(self, x, reduction_axes, keep_dims):
+    return math_ops.reduce_mean(x, reduction_axes, keep_dims)
 
-  def _compareAll(self, x, reduction_axes):
-    self._compare(x, reduction_axes, False, use_gpu=True)
-    self._compare(x, reduction_axes, True, use_gpu=True)
-    self._compare(x, reduction_axes, False, use_gpu=False)
-    self._compare(x, reduction_axes, True, use_gpu=False)
+  def _np_reduce(self, x, reduction_axes, keep_dims):
+    if isinstance(reduction_axes, list) or isinstance(reduction_axes,
+                                                      np.ndarray):
+      reduction_axes = tuple(reduction_axes)
+    elif isinstance(reduction_axes, numbers.Integral):
+      reduction_axes = (reduction_axes,)
 
-  def testFloatReduce3D(self):
-    # Create a 3D array of floats and reduce across all possible
-    # dimensions
-    np_arr = np.arange(0, 30).reshape([2, 3, 5]).astype(np.float32)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-    self._compareAll(np_arr, [1])
-    self._compareAll(np_arr, [2])
-    self._compareAll(np_arr, [0, 1])
-    self._compareAll(np_arr, [1, 2])
-    self._compareAll(np_arr, [0, 2])
-    self._compareAll(np_arr, [0, 1, 2])
+    if reduction_axes is None:
+      count = np.prod(x.shape)
+    else:
+      count = np.prod([x.shape[ax] for ax in reduction_axes])
+    # np.mean automatically converts integer inputs to float, while TensorFlow's
+    # reduce_mean does not. For integer inputs, we emulate TensorFlow's behavior
+    # using np.sum and truncating division.
+    np_sum = np.sum(x, axis=reduction_axes, keepdims=keep_dims)
+    if np.issubdtype(x.dtype, np.integer):
+      return np_sum // count
+    return np_sum / count
 
   def testInfinity(self):
     for dtype in [np.float32, np.float64]:
@@ -363,83 +326,64 @@ class MeanReductionTest(test.TestCase):
           np_arr = np.array([special_value_x, special_value_y]).astype(dtype)
           self._compareAll(np_arr, None)
 
-  def testDoubleReduce3D(self):
-    # Create a 3D array of doubles and reduce across all possible
-    # dimensions
-    np_arr = np.arange(0, 30).reshape([2, 3, 5]).astype(np.float64)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-    self._compareAll(np_arr, [1])
-    self._compareAll(np_arr, [2])
-    self._compareAll(np_arr, [0, 1])
-    self._compareAll(np_arr, [1, 2])
-    self._compareAll(np_arr, [0, 2])
-    self._compareAll(np_arr, [0, 1, 2])
+  def testInt32(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.int32)
+      self._compareAllAxes(np_arr)
 
-  def testGradient(self):
-    s = [2, 3, 4, 2]
-    x = np.arange(1.0, 49.0).reshape(s).astype(np.float32)
-    with self.test_session():
-      t = ops.convert_to_tensor(x)
-      su = math_ops.reduce_mean(t, [1, 2])
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, s, su, [2, 2], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+  def testFloat32(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.float32)
+      self._compareAllAxes(np_arr)
 
-      su = math_ops.reduce_mean(t, [0, 1, 2, 3])
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, s, su, [1], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+  def testFloat64(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.float64)
+      self._compareAllAxes(np_arr)
 
-      su = math_ops.reduce_mean(t, [])
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, s, su, [2, 3, 4, 2], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+  def testComplex64(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.complex64)
+      self._compareAllAxes(np_arr)
 
-      su = math_ops.reduce_mean(t, 0)
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, s, su, [3, 4, 2], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+  def testComplex128(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.complex128)
+      self._compareAllAxes(np_arr)
+
+  def testGradient(self):
+    s = [2, 3, 4, 2]
+    for dtype in [dtypes.float32, dtypes.float64]:
+      x = self._makeIncremental(s, dtype)
+      self._compareGradientAxes(x, rtol=1e-3, atol=1e-3)
 
   def testEmptyGradients(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       x = array_ops.zeros([0, 3])
       y = math_ops.reduce_mean(x, [1])
       error = gradient_checker.compute_gradient_error(x, [0, 3], y, [0])
       self.assertEqual(error, 0)
 
   def testDegenerate(self):
-    for use_gpu in False, True:
-      with self.test_session(use_gpu=use_gpu):
-        for dtype in (dtypes.float16, dtypes.float32, dtypes.float64):
-          # A large number is needed to get Eigen to die
-          x = array_ops.zeros((0, 9938), dtype=dtype)
-          y = math_ops.reduce_mean(x, [0]).eval()
-          self.assertEqual(y.shape, (9938,))
-          self.assertTrue(np.all(np.isnan(y)))
+    with self.test_session(use_gpu=True):
+      for dtype in (dtypes.float16, dtypes.float32, dtypes.float64):
+        # A large number is needed to get Eigen to die
+        x = array_ops.zeros((0, 9938), dtype=dtype)
+        y = math_ops.reduce_mean(x, [0]).eval()
+        self.assertEqual(y.shape, (9938,))
+        self.assertTrue(np.all(np.isnan(y)))
 
 
-class ProdReductionTest(test.TestCase):
+class ProdReductionTest(BaseReductionTest):
 
-  def _compare(self, x, reduction_axes, keep_dims):
-    np_ans = x
-    if reduction_axes is None:
-      np_ans = np.prod(np_ans, keepdims=keep_dims)
-    else:
-      for ra in reduction_axes[::-1]:
-        np_ans = np.prod(np_ans, axis=ra, keepdims=keep_dims)
-    with self.test_session():
-      if reduction_axes is not None:
-        reduction_axes = np.array(reduction_axes).astype(np.int32)
-      tf_ans = math_ops.reduce_prod(x, reduction_axes, keep_dims)
-      out = tf_ans.eval()
-    self.assertAllClose(np_ans, out)
-    self.assertShapeEqual(np_ans, tf_ans)
+  def _tf_reduce(self, x, reduction_axes, keep_dims):
+    return math_ops.reduce_prod(x, reduction_axes, keep_dims)
 
-  def _compareAll(self, x, reduction_axes):
-    self._compare(x, reduction_axes, False)
-    self._compare(x, reduction_axes, True)
+  def _np_reduce(self, x, reduction_axes, keep_dims):
+    if isinstance(reduction_axes, list) or isinstance(reduction_axes,
+                                                      np.ndarray):
+      reduction_axes = tuple(reduction_axes)
+    return np.prod(x, axis=reduction_axes, keepdims=keep_dims)
 
   def testInfinity(self):
     for dtype in [np.float32, np.float64]:
@@ -448,81 +392,70 @@ class ProdReductionTest(test.TestCase):
           np_arr = np.array([special_value_x, special_value_y]).astype(dtype)
           self._compareAll(np_arr, None)
 
-  def testFloatReduce3D(self):
-    # Create a 3D array of floats and reduce across all possible
-    # dimensions
-    np_arr = np.arange(0, 30).reshape([2, 3, 5]).astype(np.float32)
-    self._compareAll(np_arr, None)
-    self._compareAll(np_arr, [])
-    self._compareAll(np_arr, [0])
-    self._compareAll(np_arr, [1])
-    self._compareAll(np_arr, [2])
-    self._compareAll(np_arr, [0, 1])
-    self._compareAll(np_arr, [1, 2])
-    self._compareAll(np_arr, [0, 2])
-    self._compareAll(np_arr, [0, 1, 2])
-
-  def _compareGradient(self, x):
-    with self.test_session():
-      t = ops.convert_to_tensor(x)
-
-      su = math_ops.reduce_prod(t, [])
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, x.shape, su, [2, 3, 4, 2], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
-
-      su = math_ops.reduce_prod(t, [1, 2])
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, x.shape, su, [2, 2], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
-
-      su = math_ops.reduce_prod(t, [0, 1, 2, 3])
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, x.shape, su, [1], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
-
-      su = math_ops.reduce_prod(t, 0)
-      jacob_t, jacob_n = gradient_checker.compute_gradient(
-          t, x.shape, su, [3, 4, 2], x_init_value=x, delta=1)
-      self.assertAllClose(jacob_t, jacob_n, rtol=1e-3, atol=1e-3)
+  def testInt32(self):
+    # Numpy automatically upgrades the type of np.prod from int32 to int64, so
+    # Numpy does not overflow an int32 np.prod while TensorFlow does. To avoid
+    # overflow, divide the incremental int32 array by 2.
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.int32) / 2
+      self._compareAllAxes(np_arr)
+
+  def testFloat32(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.float32)
+      self._compareAllAxes(np_arr)
+
+  def testFloat64(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.float64)
+      self._compareAllAxes(np_arr)
+
+  def testComplex64(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.complex64)
+      self._compareAllAxes(np_arr)
+
+  def testComplex128(self):
+    for rank in range(1, _MAX_RANK + 1):
+      np_arr = self._makeIncremental((2,) * rank, dtypes.complex128)
+      self._compareAllAxes(np_arr)
 
   def testGradientWithZeros(self):
     s = [2, 3, 4, 2]
-    x = np.arange(1.0, 49.0).reshape(s).astype(np.float32) / 20.
+    x = self._makeIncremental(s, dtypes.float32) / 20.
     # No zeros in input
-    self._compareGradient(x)
+    self._compareGradientAxes(x, rtol=1e-3, atol=1e-3)
     # Zero at beginning
     x1 = x.copy()
     x1[:, :, 0, :] = 0
-    self._compareGradient(x1)
+    self._compareGradientAxes(x1, rtol=1e-3, atol=1e-3)
     # Zero at end
     x2 = x.copy()
     x2[:, :, -1, :] = 0
-    self._compareGradient(x2)
+    self._compareGradientAxes(x2, rtol=1e-3, atol=1e-3)
     # Zero in middle
     x3 = x.copy()
     x3[:, :, 2, :] = 0
-    self._compareGradient(x3)
+    self._compareGradientAxes(x3, rtol=1e-3, atol=1e-3)
     # All zeros
     x4 = x.copy()
     x4[:, :, :, :] = 0
-    self._compareGradient(x4)
+    self._compareGradientAxes(x4, rtol=1e-3, atol=1e-3)
 
   def testEmptyGradients(self):
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       x = array_ops.zeros([0, 3])
       y = math_ops.reduce_prod(x, [1])
       error = gradient_checker.compute_gradient_error(x, [0, 3], y, [0])
       self.assertEqual(error, 0)
 
   def testDegenerate(self):
-    for use_gpu in False, True:
-      with self.test_session(use_gpu=use_gpu):
-        for dtype in (dtypes.float16, dtypes.float32, dtypes.float64):
-          # A large number is needed to get Eigen to die
-          x = array_ops.zeros((0, 9938), dtype=dtype)
-          y = math_ops.reduce_prod(x, [0])
-          self.assertAllEqual(y.eval(), np.ones(9938))
+    with self.test_session(use_gpu=True):
+      for dtype in (dtypes.float16, dtypes.float32, dtypes.float64):
+        # A large number is needed to get Eigen to die
+        x = array_ops.zeros((0, 9938), dtype=dtype)
+        y = math_ops.reduce_prod(x, [0])
+        self.assertAllEqual(y.eval(), np.ones(9938))
 
 
 class MinReductionTest(test.TestCase):
-- 
GitLab


From 7737d09e9711f599ed48caa90801721c46f9b1a1 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Mon, 17 Apr 2017 11:09:55 -0800
Subject: [PATCH 0465/1563] Java: Publish Maven artifact for TensorFlow
 protocol buffers. Change: 153371868

---
 .../core/platform/default/build_config.bzl    |  1 +
 tensorflow/java/maven/.gitignore              |  2 +
 tensorflow/java/maven/README.md               |  9 ++-
 tensorflow/java/maven/pom.xml                 |  1 +
 tensorflow/java/maven/proto/pom.xml           | 62 +++++++++++++++++++
 tensorflow/java/maven/run_inside_container.sh | 46 ++++++++++++++
 6 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 tensorflow/java/maven/proto/pom.xml

diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index f21a646ca1..58ccda5c9b 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -34,6 +34,7 @@ def tf_proto_library_cc(name, srcs = [], has_services = None,
       name = name + "_proto_srcs",
       srcs = srcs + tf_deps(protodeps, "_proto_srcs"),
       testonly = testonly,
+      visibility = visibility,
   )
 
   use_grpc_plugin = None
diff --git a/tensorflow/java/maven/.gitignore b/tensorflow/java/maven/.gitignore
index 50eda94643..0e11e83a0c 100644
--- a/tensorflow/java/maven/.gitignore
+++ b/tensorflow/java/maven/.gitignore
@@ -7,3 +7,5 @@ libtensorflow_jni/src
 libtensorflow_jni/target
 tensorflow/src
 tensorflow/target
+proto/src
+proto/target
diff --git a/tensorflow/java/maven/README.md b/tensorflow/java/maven/README.md
index 19a214f42d..17bb799961 100644
--- a/tensorflow/java/maven/README.md
+++ b/tensorflow/java/maven/README.md
@@ -20,7 +20,7 @@ Hence, the process for building and uploading release artifacts is not a single
 
 ## Artifact Structure
 
-There are four artifacts and thus `pom.xml`s involved in this release:
+There are five artifacts and thus `pom.xml`s involved in this release:
 
 1.  `tensorflow`: The single dependency for projects requiring TensorFlow for
     Java. This convenience package depends on the two below, and is the one that
@@ -34,8 +34,11 @@ There are four artifacts and thus `pom.xml`s involved in this release:
 3.  `libtensorflow_jni`: The native libraries required by `libtensorflow`.
     Native code for all supported platforms is packaged into a single `.jar`.
 
-4.  [`parentpom`](https://maven.apache.org/pom/index.html): Common settings
-    shared between the above three.
+4.  `proto`: Generated Java code for TensorFlow protocol buffers
+    (e.g., `MetaGraphDef`, `ConfigProto` etc.)
+
+5.  [`parentpom`](https://maven.apache.org/pom/index.html): Common settings
+    shared by all of the above.
 
 ## Updating the release
 
diff --git a/tensorflow/java/maven/pom.xml b/tensorflow/java/maven/pom.xml
index cf02b17ca6..7bb191c7c7 100644
--- a/tensorflow/java/maven/pom.xml
+++ b/tensorflow/java/maven/pom.xml
@@ -30,6 +30,7 @@
     <module>libtensorflow</module>
     <module>libtensorflow_jni</module>
     <module>tensorflow</module>
+    <module>proto</module>
   </modules>
 
 
diff --git a/tensorflow/java/maven/proto/pom.xml b/tensorflow/java/maven/proto/pom.xml
new file mode 100644
index 0000000000..97feb735a1
--- /dev/null
+++ b/tensorflow/java/maven/proto/pom.xml
@@ -0,0 +1,62 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <modelVersion>4.0.0</modelVersion>
+  <description>Java API for TensorFlow protocol buffers.</description>
+  <parent>
+    <groupId>org.tensorflow</groupId>
+    <artifactId>parentpom</artifactId>
+    <version>1.1.0-rc2</version>
+    <relativePath>../</relativePath>
+  </parent>
+  <artifactId>proto</artifactId>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>3.2.0</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tensorflow/java/maven/run_inside_container.sh b/tensorflow/java/maven/run_inside_container.sh
index 684cfe1868..b5e2bfc3a6 100644
--- a/tensorflow/java/maven/run_inside_container.sh
+++ b/tensorflow/java/maven/run_inside_container.sh
@@ -23,6 +23,7 @@ IS_SNAPSHOT="false"
 if [[ "${TF_VERSION}" == *"-SNAPSHOT" ]]; then
   IS_SNAPSHOT="true"
 fi
+PROTOC_RELEASE_URL="https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip"
 
 set -ex
 
@@ -81,6 +82,50 @@ download_libtensorflow_jni() {
   cd "${DIR}"
 }
 
+# Ideally, the .jar for generated Java code for TensorFlow protocol buffer files
+# would have been produced by bazel rules. However, protocol buffer library
+# support in bazel is in flux. Once
+# https://github.com/bazelbuild/bazel/issues/2626 has been resolved, perhaps
+# TensorFlow can move to something like
+# https://bazel.build/blog/2017/02/27/protocol-buffers.html
+# for generating C++, Java and Python code for protocol buffers.
+#
+# At that point, perhaps the libtensorflow build scripts
+# (tensorflow/tools/ci_build/builds/libtensorflow.sh) can build .jars for
+# generated code and this function would not need to download protoc to generate
+# code.
+generate_java_protos() {
+  # Clean any previous attempts
+  rm -rf "${DIR}/proto/tmp"
+
+  # Download protoc
+  curl -L "${PROTOC_RELEASE_URL}" -o "/tmp/protoc.zip"
+  mkdir -p "${DIR}/proto/tmp/protoc"
+  unzip -d "${DIR}/proto/tmp/protoc" "/tmp/protoc.zip"
+  rm -f "/tmp/protoc.zip"
+
+  # Download the release archive of TensorFlow protos.
+  if [[ "${IS_SNAPSHOT}" == "true" ]]; then
+    URL="http://ci.tensorflow.org/view/Nightly/job/nightly-libtensorflow/TYPE=cpu-slave/lastSuccessfulBuild/artifact/lib_package/libtensorflow_proto.zip"
+  else
+    URL="${RELEASE_URL_PREFIX}/libtensorflow_proto-${TF_VERSION}.zip"
+  fi
+  curl -L "${URL}" -o /tmp/libtensorflow_proto.zip
+  mkdir -p "${DIR}/proto/tmp/src"
+  unzip -d "${DIR}/proto/tmp/src" "/tmp/libtensorflow_proto.zip"
+  rm -f "/tmp/libtensorflow_proto.zip"
+
+  # Generate Java code
+  mkdir -p "${DIR}/proto/src/main/java"
+  find "${DIR}/proto/tmp/src" -name "*.proto" | xargs \
+  ${DIR}/proto/tmp/protoc/bin/protoc \
+    --proto_path="${DIR}/proto/tmp/src" \
+    --java_out="${DIR}/proto/src/main/java"
+
+  # Cleanup
+  rm -rf "${DIR}/proto/tmp"
+}
+
 if [ -z "${TF_VERSION}" ]
 then
   echo "Must set the TF_VERSION environment variable"
@@ -99,6 +144,7 @@ clean
 update_version_in_pom
 download_libtensorflow
 download_libtensorflow_jni
+generate_java_protos
 # Build the release artifacts
 mvn verify
 # If successfully built, try to deploy.
-- 
GitLab


From 1bef4c82615f74b82db6cd99d6f19a258d008a4a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 12:39:26 -0800
Subject: [PATCH 0466/1563] Guarded initialization of the graph dashboard so
 that the dashboard only initializes once it has been attached to the DOM.

Without this change, the graph dashboard initializes before it is attached to the DOM, which is a problem because initialization of the graph dashboard depends on features in the DOM.

Some other dashboards will be similarly guarded in separate changes.
Change: 153382262
---
 .../tf-graph-dashboard.html                   | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
index 12f3d948d2..050e7cb74a 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
@@ -118,11 +118,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   properties: {
     _datasets: Object,
     _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
-    backend: {type: Object, observer: '_backendChanged'},
+    backend: Object,
     debuggerDataEnabled: Boolean,
     allStepsModeEnabled: Boolean,
     specificHealthPillStep: {type: Number, value: 0},
     healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
+    _isAttached: Boolean,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
     // Whether health pills are currently being loaded, in which case we may want to say show a
     // spinner.
     _areHealthPillsLoading: Boolean,
@@ -151,7 +154,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   },
   observers: [
     '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+    '_maybeInitializeDashboard(backend, _isAttached)',
   ],
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
   reload: function() {
     if (!this.debuggerDataEnabled ||
         !this.healthPillsToggledOn ||
@@ -167,7 +177,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     // would not change across reloads.
     this._requestHealthPills();
   },
-  _backendChanged: function(backend) {
+  _maybeInitializeDashboard: function(backend, isAttached) {
+    if (this._initialized || !backend || !isAttached) {
+      // Either this dashboard is already initialized ... or we are not yet ready to initialize.
+      return;
+    }
+
+    // Set this to true so we only initialize once.
+    this._initialized = true;
     Promise.all([backend.graphRuns(), backend.runMetadataRuns()])
       .then(function(result) {
         var runsWithGraph = result[0].sort(VZ.Sorting.compareTagNames);
-- 
GitLab


From ea910532bc21e265d5af7bdcd63d836e4204acf2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 13:02:22 -0800
Subject: [PATCH 0467/1563] Fix ShapeTree operator= to actually work.  Also
 added some tests. Change: 153385325

---
 tensorflow/compiler/xla/shape_tree.h       | 12 +++----
 tensorflow/compiler/xla/shape_tree_test.cc | 37 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/tensorflow/compiler/xla/shape_tree.h b/tensorflow/compiler/xla/shape_tree.h
index 7dfb50650c..aa4341d18e 100644
--- a/tensorflow/compiler/xla/shape_tree.h
+++ b/tensorflow/compiler/xla/shape_tree.h
@@ -150,7 +150,7 @@ class ShapeTree {
   Node root_;
 
   // The XLA shape mirrored in this ShapeTree.
-  const Shape shape_;
+  Shape shape_;
 };
 
 template <typename T>
@@ -167,12 +167,10 @@ void ShapeTree<T>::InitChildren(const Shape& shape, const T& init_value,
 
 template <typename T>
 ShapeTree<T>::ShapeTree(const Shape& shape, const T& init_value)
-    : root_(init_value), shape_([](Shape shape) {
-        // The shape_ field is just used to hold the structure of the shape.
-        // It should not be relied upon to store layout information.
-        LayoutUtil::ClearLayout(&shape);
-        return shape;
-      }(shape)) {
+    : root_(init_value), shape_(shape) {
+  // The shape_ field is just used to hold the structure of the shape.
+  // It should not be relied upon to store layout information.
+  LayoutUtil::ClearLayout(&shape_);
   InitChildren(shape_, init_value, &root_);
 }
 
diff --git a/tensorflow/compiler/xla/shape_tree_test.cc b/tensorflow/compiler/xla/shape_tree_test.cc
index 21edfb7e2b..efb6f422e0 100644
--- a/tensorflow/compiler/xla/shape_tree_test.cc
+++ b/tensorflow/compiler/xla/shape_tree_test.cc
@@ -135,6 +135,15 @@ TEST_F(ShapeTreeTest, ArrayShape) {
   // Test the copy constructor.
   ShapeTree<int> copy{shape_tree};
   EXPECT_EQ(123, copy.element({}));
+
+  // Mutate the copy, and ensure the original doesn't change.
+  *copy.mutable_element({}) = 99;
+  EXPECT_EQ(99, copy.element({}));
+  EXPECT_EQ(123, shape_tree.element({}));
+
+  // Test the assignment operator.
+  copy = shape_tree;
+  EXPECT_EQ(123, copy.element({}));
 }
 
 TEST_F(ShapeTreeTest, TupleShape) {
@@ -176,6 +185,17 @@ TEST_F(ShapeTreeTest, TupleShape) {
   EXPECT_EQ(0, shape_tree.element({0}));
   EXPECT_EQ(0, shape_tree.element({1}));
   EXPECT_EQ(0, shape_tree.element({2}));
+  EXPECT_EQ(1, copy.element({}));
+  EXPECT_EQ(42, copy.element({0}));
+  EXPECT_EQ(123, copy.element({1}));
+  EXPECT_EQ(-100, copy.element({2}));
+
+  // Test the assignment operator.
+  copy = shape_tree;
+  EXPECT_EQ(0, copy.element({}));
+  EXPECT_EQ(0, copy.element({0}));
+  EXPECT_EQ(0, copy.element({1}));
+  EXPECT_EQ(0, copy.element({2}));
 }
 
 TEST_F(ShapeTreeTest, NestedTupleShape) {
@@ -194,6 +214,23 @@ TEST_F(ShapeTreeTest, NestedTupleShape) {
   EXPECT_EQ(42, copy.element({0}));
   EXPECT_EQ(123, copy.element({1, 1}));
   EXPECT_EQ(-100, copy.element({2, 0, 1}));
+
+  // Mutate the copy, and ensure the original doesn't change.
+  *copy.mutable_element({0}) = 1;
+  *copy.mutable_element({1, 1}) = 2;
+  *copy.mutable_element({2, 0, 1}) = 3;
+  EXPECT_EQ(1, copy.element({0}));
+  EXPECT_EQ(2, copy.element({1, 1}));
+  EXPECT_EQ(3, copy.element({2, 0, 1}));
+  EXPECT_EQ(42, shape_tree.element({0}));
+  EXPECT_EQ(123, shape_tree.element({1, 1}));
+  EXPECT_EQ(-100, shape_tree.element({2, 0, 1}));
+
+  // Test the assignment operator.
+  copy = shape_tree;
+  EXPECT_EQ(42, copy.element({0}));
+  EXPECT_EQ(123, copy.element({1, 1}));
+  EXPECT_EQ(-100, copy.element({2, 0, 1}));
 }
 
 TEST_F(ShapeTreeTest, InvalidIndexingTuple) {
-- 
GitLab


From af36579b631269fac681e682e7d038915a523eef Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 13:03:06 -0800
Subject: [PATCH 0468/1563] In python function to convert a shape to a tensor,
 support converting to an int64 tensor if a dimension of the shape is too
 large for int32. Change: 153385458

---
 tensorflow/python/framework/constant_op.py    | 14 +++++++++--
 .../python/kernel_tests/constant_op_test.py   | 23 +++++++++++++++++++
 .../python/kernel_tests/random_ops_test.py    |  8 +++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/framework/constant_op.py b/tensorflow/python/framework/constant_op.py
index d1485d419c..49f5739194 100644
--- a/tensorflow/python/framework/constant_op.py
+++ b/tensorflow/python/framework/constant_op.py
@@ -129,14 +129,24 @@ def _tensor_shape_tensor_conversion_function(s, dtype=None, name=None,
   if not s.is_fully_defined():
     raise ValueError(
         "Cannot convert a partially known TensorShape to a Tensor: %s" % s)
+  s_list = s.as_list()
+  int64_value = 0
+  for dim in s_list:
+    if dim >= 2**31:
+      int64_value = dim
+      break
+
   if dtype is not None:
     if dtype not in (dtypes.int32, dtypes.int64):
       raise TypeError("Cannot convert a TensorShape to dtype: %s" % dtype)
+    if dtype == dtypes.int32 and int64_value:
+      raise ValueError("Cannot convert a TensorShape to dtype int32; "
+                       "a dimension is too large (%s)" % int64_value)
   else:
-    dtype = dtypes.int32
+    dtype = dtypes.int64 if int64_value else dtypes.int32
   if name is None:
     name = "shape_as_tensor"
-  return constant(s.as_list(), dtype=dtype, name=name)
+  return constant(s_list, dtype=dtype, name=name)
 
 ops.register_tensor_conversion_function(
     tensor_shape.TensorShape, _tensor_shape_tensor_conversion_function, 100)
diff --git a/tensorflow/python/kernel_tests/constant_op_test.py b/tensorflow/python/kernel_tests/constant_op_test.py
index 411b1c760f..40c6a9e614 100644
--- a/tensorflow/python/kernel_tests/constant_op_test.py
+++ b/tensorflow/python/kernel_tests/constant_op_test.py
@@ -230,6 +230,29 @@ class AsTensorTest(test.TestCase):
       self.assertEqual(dtypes_lib.int32, x.dtype)
       self.assertAllEqual([1, 2, 3], x.eval())
 
+      x = ops.convert_to_tensor(tensor_shape.TensorShape([2**31-1, 2, 3]))
+      self.assertEqual(dtypes_lib.int32, x.dtype)
+      self.assertAllEqual([2**31-1, 2, 3], x.eval())
+
+      x = ops.convert_to_tensor(tensor_shape.TensorShape([2**31-1, 2, 3]),
+                                dtype=dtypes_lib.int32)
+      self.assertEqual(dtypes_lib.int32, x.dtype)
+      self.assertAllEqual([2**31-1, 2, 3], x.eval())
+
+      x = ops.convert_to_tensor(tensor_shape.TensorShape([2**31, 2, 3]))
+      self.assertEqual(dtypes_lib.int64, x.dtype)
+      self.assertAllEqual([2**31, 2, 3], x.eval())
+
+      x = ops.convert_to_tensor(tensor_shape.TensorShape([2**31, 2, 3]),
+                                dtype=dtypes_lib.int64)
+      self.assertEqual(dtypes_lib.int64, x.dtype)
+      self.assertAllEqual([2**31, 2, 3], x.eval())
+
+      with self.assertRaisesRegexp(
+          ValueError, "a dimension is too large .2147483648."):
+        x = ops.convert_to_tensor(tensor_shape.TensorShape([2**31, 2, 3]),
+                                  dtype=dtypes_lib.int32)
+
       x = ops.convert_to_tensor(
           tensor_shape.TensorShape([1, 2, 3]), dtype=dtypes_lib.int64)
       self.assertEqual(dtypes_lib.int64, x.dtype)
diff --git a/tensorflow/python/kernel_tests/random_ops_test.py b/tensorflow/python/kernel_tests/random_ops_test.py
index fa323b2496..d44c0b3d9f 100644
--- a/tensorflow/python/kernel_tests/random_ops_test.py
+++ b/tensorflow/python/kernel_tests/random_ops_test.py
@@ -25,6 +25,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 
 
@@ -157,6 +158,13 @@ class TruncatedNormalTest(test.TestCase):
       print("std(x)", np.std(x), abs(np.std(x) / stddev - 0.85))
       self.assertTrue(abs(np.std(x) / stddev - 0.85) < 0.04)
 
+  def testLargeShape(self):
+    with self.test_session(use_gpu=True):
+      v = variables.Variable(
+          array_ops.zeros(dtype=dtypes.float32, shape=[2**33, 1]))
+      n = random_ops.truncated_normal(v.shape)
+      self.assertEqual([8589934592, 1], n.shape.as_list())
+
   def testNoCSE(self):
     with self.test_session(use_gpu=True):
       shape = [2, 3, 4]
-- 
GitLab


From 94a2da39054cfe63ece1251392a7140628a323e4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 13:11:09 -0800
Subject: [PATCH 0469/1563] Add a GPUOPTIONS option to force all tensors to be
 gpu_compatible Change: 153386455

---
 .../common_runtime/gpu/gpu_device_factory.cc  | 26 +++++++++++++++----
 tensorflow/core/protobuf/config.proto         | 12 +++++++++
 .../golden/tensorflow.-g-p-u-options.pbtxt    |  4 +++
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc b/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
index 94143a55d5..1e7a2b35be 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device_factory.cc
@@ -31,12 +31,17 @@ class GPUDevice : public BaseGPUDevice {
             Allocator* cpu_allocator)
       : BaseGPUDevice(options, name, memory_limit, locality, gpu_id,
                       physical_device_desc, gpu_allocator, cpu_allocator,
-                      false /* sync every op */, 1 /* max_streams */) {}
+                      false /* sync every op */, 1 /* max_streams */) {
+    if (options.config.has_gpu_options()) {
+      force_gpu_compatible_ =
+          options.config.gpu_options().force_gpu_compatible();
+    }
+  }
 
   Allocator* GetAllocator(AllocatorAttributes attr) override {
     if (attr.on_host()) {
-      ProcessState* ps = ProcessState::singleton();
-      if (attr.gpu_compatible()) {
+      if (attr.gpu_compatible() || force_gpu_compatible_) {
+        ProcessState* ps = ProcessState::singleton();
         return ps->GetCUDAHostAllocator(0);
       } else {
         return cpu_allocator_;
@@ -45,6 +50,9 @@ class GPUDevice : public BaseGPUDevice {
       return gpu_allocator_;
     }
   }
+
+ private:
+  bool force_gpu_compatible_ = false;
 };
 
 class GPUDeviceFactory : public BaseGPUDeviceFactory {
@@ -71,18 +79,26 @@ class GPUCompatibleCPUDevice : public ThreadPoolDevice {
   GPUCompatibleCPUDevice(const SessionOptions& options, const string& name,
                          Bytes memory_limit, const DeviceLocality& locality,
                          Allocator* allocator)
-      : ThreadPoolDevice(options, name, memory_limit, locality, allocator) {}
+      : ThreadPoolDevice(options, name, memory_limit, locality, allocator) {
+    if (options.config.has_gpu_options()) {
+      force_gpu_compatible_ =
+          options.config.gpu_options().force_gpu_compatible();
+    }
+  }
   ~GPUCompatibleCPUDevice() override {}
 
   Allocator* GetAllocator(AllocatorAttributes attr) override {
     ProcessState* ps = ProcessState::singleton();
-    if (attr.gpu_compatible()) {
+    if (attr.gpu_compatible() || force_gpu_compatible_) {
       return ps->GetCUDAHostAllocator(0);
     } else {
       // Call the parent's implementation.
       return ThreadPoolDevice::GetAllocator(attr);
     }
   }
+
+ private:
+  bool force_gpu_compatible_ = false;
 };
 
 // The associated factory.
diff --git a/tensorflow/core/protobuf/config.proto b/tensorflow/core/protobuf/config.proto
index 98e7b171d2..5c0f7232eb 100644
--- a/tensorflow/core/protobuf/config.proto
+++ b/tensorflow/core/protobuf/config.proto
@@ -64,6 +64,18 @@ message GPUOptions {
   // PollEvents calls, when the queue is empty.  If value is not
   // set or set to 0, gets set to a non-zero default.
   int32 polling_inactive_delay_msecs = 7;
+
+  // Force all tensors to be gpu_compatible. On a GPU-enabled TensorFlow,
+  // enabling this option forces all CPU tensors to be allocated with Cuda
+  // pinned memory. Normally, TensorFlow will infer which tensors should be
+  // allocated as the pinned memory. But in case where the inference is
+  // incomplete, this option can significantly speed up the cross-device memory
+  // copy performance as long as it fits the memory.
+  // Note that this option is not something that should be
+  // enabled by default for unknown or very large models, since all Cuda pinned
+  // memory is unpageable, having too much pinned memory might negatively impact
+  // the overall host system performance.
+  bool force_gpu_compatible = 8;
 };
 
 // Options passed to the graph optimizer
diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
index 48cda623f7..30f7e4e116 100644
--- a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
@@ -22,6 +22,10 @@ tf_class {
     name: "Extensions"
     mtype: "<type \'getset_descriptor\'>"
   }
+  member {
+    name: "FORCE_GPU_COMPATIBLE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
   member {
     name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
     mtype: "<type \'int\'>"
-- 
GitLab


From 3d0380476b16d8180cd89c34b1b9e7d6e7275e7f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 13:30:00 -0800
Subject: [PATCH 0470/1563] Fixed GreedyEmbeddingHelper docstring. Change:
 153388906

---
 tensorflow/contrib/seq2seq/python/ops/helper.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/helper.py b/tensorflow/contrib/seq2seq/python/ops/helper.py
index 7a24261b64..e43d155608 100644
--- a/tensorflow/contrib/seq2seq/python/ops/helper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/helper.py
@@ -450,12 +450,14 @@ class GreedyEmbeddingHelper(Helper):
 
     Args:
       embedding: A callable that takes a vector tensor of `ids` (argmax ids),
-        or the `params` argument for `embedding_lookup`.
+        or the `params` argument for `embedding_lookup`. The returned tensor
+        will be passed to the decoder input.
       start_tokens: `int32` vector shaped `[batch_size]`, the start tokens.
       end_token: `int32` scalar, the token that marks end of decoding.
 
     Raises:
-      ValueError: if `sequence_length` is not a 1D tensor.
+      ValueError: if `start_tokens` is not a 1D tensor or `end_token` is not a
+        scalar.
     """
     if callable(embedding):
       self._embedding_fn = embedding
-- 
GitLab


From cc45456e4ad0eff16127d1727d0cf48afb71ca0e Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Mon, 17 Apr 2017 13:30:47 -0800
Subject: [PATCH 0471/1563] Add stateless random ops for custom control of
 seeding

The new ops are in tf.contrib.stateless.  They reuse the same Philox kernels as
the stateful random ops, but this may change in future.

RELNOTES: Add tf.contrib.stateless for random ops with custom seed control.
Change: 153388998
---
 tensorflow/BUILD                              |   1 +
 tensorflow/contrib/BUILD                      |   1 +
 tensorflow/contrib/__init__.py                |   1 +
 tensorflow/contrib/cmake/README.md            |  22 +--
 tensorflow/contrib/cmake/tf_core_ops.cmake    |   5 +-
 tensorflow/contrib/cmake/tf_python.cmake      |   3 +
 tensorflow/contrib/cmake/tf_tests.cmake       |   3 +-
 .../contrib/factorization/kernels/BUILD       |   2 -
 tensorflow/contrib/stateless/BUILD            |  50 +++++
 tensorflow/contrib/stateless/__init__.py      |  38 ++++
 .../kernel_tests/stateless_random_ops_test.py |  84 +++++++++
 tensorflow/core/BUILD                         |   3 +
 tensorflow/core/kernels/BUILD                 |  12 ++
 .../core/kernels/stateless_random_ops.cc      | 173 ++++++++++++++++++
 tensorflow/core/ops/stateless_random_ops.cc   |  94 ++++++++++
 15 files changed, 476 insertions(+), 16 deletions(-)
 create mode 100644 tensorflow/contrib/stateless/BUILD
 create mode 100644 tensorflow/contrib/stateless/__init__.py
 create mode 100644 tensorflow/contrib/stateless/python/kernel_tests/stateless_random_ops_test.py
 create mode 100644 tensorflow/core/kernels/stateless_random_ops.cc
 create mode 100644 tensorflow/core/ops/stateless_random_ops.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 69e800be44..08850d6e83 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -239,6 +239,7 @@ filegroup(
         "//tensorflow/contrib/sparsemax:all_files",
         "//tensorflow/contrib/specs:all_files",
         "//tensorflow/contrib/stat_summarizer:all_files",
+        "//tensorflow/contrib/stateless:all_files",
         "//tensorflow/contrib/tensor_forest:all_files",
         "//tensorflow/contrib/tensor_forest/hybrid:all_files",
         "//tensorflow/contrib/tensorboard:all_files",
diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index a726471d0f..17997844df 100644
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -58,6 +58,7 @@ py_library(
         "//tensorflow/contrib/sparsemax:sparsemax_py",
         "//tensorflow/contrib/specs",
         "//tensorflow/contrib/stat_summarizer:stat_summarizer_py",
+        "//tensorflow/contrib/stateless",
         "//tensorflow/contrib/tensor_forest:init_py",
         "//tensorflow/contrib/tensorboard",
         "//tensorflow/contrib/testing:testing_py",
diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py
index 1ce1b4da09..814bf76eb0 100644
--- a/tensorflow/contrib/__init__.py
+++ b/tensorflow/contrib/__init__.py
@@ -57,6 +57,7 @@ from tensorflow.contrib import slim
 from tensorflow.contrib import solvers
 from tensorflow.contrib import sparsemax
 from tensorflow.contrib import stat_summarizer
+from tensorflow.contrib import stateless
 from tensorflow.contrib import tensor_forest
 from tensorflow.contrib import tensorboard
 from tensorflow.contrib import testing
diff --git a/tensorflow/contrib/cmake/README.md b/tensorflow/contrib/cmake/README.md
index 14d99a30cd..664d0f4b6b 100644
--- a/tensorflow/contrib/cmake/README.md
+++ b/tensorflow/contrib/cmake/README.md
@@ -24,7 +24,7 @@ for instructions on how to install a pre-built TensorFlow package on Windows.
  - QuantizeAndDequantize
  - QuantizedAvgPool
  - QuantizedBatchNomWithGlobalNormalization
- - QuantizedBiasAdd 
+ - QuantizedBiasAdd
  - QuantizedConcat
  - QuantizedConv2D
  - QuantizedMatmul
@@ -71,7 +71,7 @@ bindings.
   - [NVidia CUDA Toolkit 8.0](https://developer.nvidia.com/cuda-downloads)
   - [NVidia CUDNN 5.1](https://developer.nvidia.com/cudnn)
   - [CMake 3.6](https://cmake.org/files/v3.6/cmake-3.6.3-win64-x64.msi)
-  
+
 * Ubuntu 14.04
   - Makefile generator
   - Docker 1.9.1 (for automated testing)
@@ -87,7 +87,7 @@ bindings.
 
   - The following Python APIs are not currently implemented:
     * Loading custom op libraries via `tf.load_op_library()`. In order to use your
-      custom op, please put the source code under the tensorflow/core/user_ops 
+      custom op, please put the source code under the tensorflow/core/user_ops
       directory, and a shape function is required (not optional) for each op.
     * Path manipulation functions (such as `tf.gfile.ListDirectory()`) are not
       functional.
@@ -132,12 +132,12 @@ Step-by-step Windows build
      D:\temp> "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvarsall.bat"
      ```
 
-   * When building with GPU support after installing the CUDNN zip file from NVidia, append its 
+   * When building with GPU support after installing the CUDNN zip file from NVidia, append its
      bin directory to your PATH environment variable.
-     In case TensorFlow fails to find the CUDA dll's during initialization, check your PATH environment variable. 
+     In case TensorFlow fails to find the CUDA dll's during initialization, check your PATH environment variable.
      It should contain the directory of the CUDA dlls and the directory of the CUDNN dll.
      For example:
-     
+
      ```
      D:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v8.0\bin
      D:\local\cuda\bin
@@ -174,7 +174,7 @@ Step-by-step Windows build
    D:\...\build> cmake .. -A x64 -DCMAKE_BUILD_TYPE=Release ^
    More? -DSWIG_EXECUTABLE=C:/tools/swigwin-3.0.10/swig.exe ^
    More? -DPYTHON_EXECUTABLE=C:/Users/%USERNAME%/AppData/Local/Continuum/Anaconda3/python.exe ^
-   More? -DPYTHON_LIBRARIES=C:/Users/%USERNAME%/AppData/Local/Continuum/Anaconda3/libs/python35.lib 
+   More? -DPYTHON_LIBRARIES=C:/Users/%USERNAME%/AppData/Local/Continuum/Anaconda3/libs/python35.lib
    ```
    To build with GPU support add "^" at the end of the last line above following with:
    ```
@@ -184,7 +184,7 @@ Step-by-step Windows build
    To enable SIMD instructions with MSVC, as AVX and SSE, define it as follows:
    ```
    More? -Dtensorflow_WIN_CPU_SIMD_OPTIONS=/arch:AVX
-   ```     
+   ```
 
    Note that the `-DCMAKE_BUILD_TYPE=Release` flag must match the build
    configuration that you choose when invoking `msbuild`. The known-good
@@ -222,11 +222,11 @@ Step-by-step Windows build
      SSL support (for making secure HTTP requests) in the TensorFlow runtime.
      This support is incomplete, and will be used for Google Cloud Storage
      support.
-     
+
    * `-Dtensorflow_ENABLE_GPU=(ON|OFF)`. Defaults to `OFF`. Include
      GPU support. If GPU is enabled you need to install the CUDA 8.0 Toolkit and CUDNN 5.1.
      CMake will expect the location of CUDNN in -DCUDNN_HOME=path_you_unziped_cudnn.
- 
+
    * `-Dtensorflow_BUILD_CC_TESTS=(ON|OFF)`. Defaults to `OFF`. This builds cc unit tests.
      There are many of them and building will take a few hours.
      After cmake, build and execute the tests with
@@ -234,7 +234,7 @@ Step-by-step Windows build
      MSBuild /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
      ctest -C RelWithDebInfo
      ```
- 
+
    * `-Dtensorflow_BUILD_PYTHON_TESTS=(ON|OFF)`. Defaults to `OFF`. This enables python kernel tests.
      After building the python wheel, you need to install the new wheel before running the tests.
      To execute the tests, use
diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index cd56fa437e..6127f674f2 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -32,11 +32,12 @@ set(tf_op_lib_names
     "resource_variable_ops"
     "script_ops"
     "sdca_ops"
-    "set_ops"  
+    "set_ops"
     "sendrecv_ops"
     "sparse_ops"
     "spectral_ops"
     "state_ops"
+    "stateless_random_ops"
     "string_ops"
     "training_ops"
 )
@@ -110,7 +111,7 @@ file(GLOB_RECURSE tf_core_ops_exclude_srcs
     "${tensorflow_source_dir}/tensorflow/core/user_ops/*.cu.cc"
 )
 
-list(REMOVE_ITEM tf_core_ops_srcs ${tf_core_ops_exclude_srcs}) 
+list(REMOVE_ITEM tf_core_ops_srcs ${tf_core_ops_exclude_srcs})
 
 add_library(tf_core_ops OBJECT ${tf_core_ops_srcs})
 
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 9fcb25c4f7..35629ba3b3 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -469,6 +469,7 @@ add_python_module("tensorflow/contrib/sparsemax/python/ops")
 add_python_module("tensorflow/contrib/specs")
 add_python_module("tensorflow/contrib/specs/python")
 add_python_module("tensorflow/contrib/stat_summarizer")
+add_python_module("tensorflow/contrib/stateless")
 add_python_module("tensorflow/contrib/tensorboard")
 add_python_module("tensorflow/contrib/tensorboard/plugins")
 add_python_module("tensorflow/contrib/tensorboard/plugins/projector")
@@ -634,6 +635,8 @@ GENERATE_PYTHON_OP_LIB("contrib_tensor_forest_hybrid_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/tensor_forest/hybrid/ops/gen_training_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_bigquery_reader_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/cloud/python/ops/gen_bigquery_reader_ops.py)
+GENERATE_PYTHON_OP_LIB("stateless_random_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/stateless/gen_stateless_random_ops.py)
 
 add_custom_target(tf_python_ops SOURCES ${tf_python_ops_generated_files} ${PYTHON_PROTO_GENFILES})
 add_dependencies(tf_python_ops tf_python_op_gen_main)
diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index cc79b31d91..c41f72e141 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -134,7 +134,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/python/kernel_tests/*_test.py"
     )
   endif()
- 
+
   file(GLOB_RECURSE tf_test_src_py
     ${tf_test_rnn_src_py}
     "${tensorflow_source_dir}/tensorflow/python/debug/cli/*_test.py"
@@ -146,6 +146,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
     "${tensorflow_source_dir}/tensorflow/tensorboard/*_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/factorization/*_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/keras/python/keras/integration_test.py"
+    "${tensorflow_source_dir}/tensorflow/contrib/stateless/python/kernel_tests/*_test.py"
     # NOTE: tensor_forest tests in tensor_forest/hybrid/... still don't pass.
     "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/client/*_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/python/*_test.py"
diff --git a/tensorflow/contrib/factorization/kernels/BUILD b/tensorflow/contrib/factorization/kernels/BUILD
index 195a58e040..f10a5586b8 100644
--- a/tensorflow/contrib/factorization/kernels/BUILD
+++ b/tensorflow/contrib/factorization/kernels/BUILD
@@ -6,8 +6,6 @@ exports_files(["LICENSE"])
 
 package(default_visibility = ["//tensorflow:__subpackages__"])
 
-load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
-
 cc_library(
     name = "all_kernels",
     deps = [
diff --git a/tensorflow/contrib/stateless/BUILD b/tensorflow/contrib/stateless/BUILD
new file mode 100644
index 0000000000..1d9c1ffa50
--- /dev/null
+++ b/tensorflow/contrib/stateless/BUILD
@@ -0,0 +1,50 @@
+# Stateless random ops
+
+package(default_visibility = ["//tensorflow:__subpackages__"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
+
+tf_gen_op_wrapper_py(
+    name = "stateless_random_ops",
+    out = "gen_stateless_random_ops.py",  # cmake chokes without this
+    deps = ["//tensorflow/core:stateless_random_ops_op_lib"],
+)
+
+py_library(
+    name = "stateless",
+    srcs = ["__init__.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":stateless_random_ops",
+    ],
+)
+
+cuda_py_test(
+    name = "stateless_random_ops_test",
+    srcs = ["python/kernel_tests/stateless_random_ops_test.py"],
+    additional_deps = [
+        ":stateless",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:random_ops",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/stateless/__init__.py b/tensorflow/contrib/stateless/__init__.py
new file mode 100644
index 0000000000..82e5d36ce4
--- /dev/null
+++ b/tensorflow/contrib/stateless/__init__.py
@@ -0,0 +1,38 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Stateless random ops which take seed as a tensor input.
+
+Instead of taking `seed` as an attr which initializes a mutable state within
+the op, these random ops take `seed` as an input, and the random numbers are
+a deterministic function of `shape` and `seed`.
+
+WARNING: These ops are in contrib, and are not stable.  They should be
+consistent across multiple runs on the same hardware, but only for the same
+version of the code.
+
+@@stateless_random_uniform
+@@stateless_random_normal
+@@stateless_truncated_normal
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+# pylint: disable=wildcard-import
+from tensorflow.contrib.stateless.gen_stateless_random_ops import *
+
+from tensorflow.python.util.all_util import remove_undocumented
+remove_undocumented(__name__)
diff --git a/tensorflow/contrib/stateless/python/kernel_tests/stateless_random_ops_test.py b/tensorflow/contrib/stateless/python/kernel_tests/stateless_random_ops_test.py
new file mode 100644
index 0000000000..9a36bdc2f9
--- /dev/null
+++ b/tensorflow/contrib/stateless/python/kernel_tests/stateless_random_ops_test.py
@@ -0,0 +1,84 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for stateless random ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+from tensorflow.contrib import stateless
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import random_seed
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import random_ops
+from tensorflow.python.platform import test
+
+CASES = [(stateless.stateless_random_uniform, random_ops.random_uniform),
+         (stateless.stateless_random_normal, random_ops.random_normal),
+         (stateless.stateless_truncated_normal, random_ops.truncated_normal)]
+
+
+def invert_philox(key, value):
+  """Invert the Philox bijection."""
+  key = np.array(key, dtype=np.uint32)
+  value = np.array(value, dtype=np.uint32)
+  step = np.array([0x9E3779B9, 0xBB67AE85], dtype=np.uint32)
+  for n in range(10)[::-1]:
+    key0, key1 = key + n * step
+    v0 = value[3] * 0x991a7cdb & 0xffffffff
+    v2 = value[1] * 0x6d7cae67 & 0xffffffff
+    hi0 = v0 * 0xD2511F53 >> 32
+    hi1 = v2 * 0xCD9E8D57 >> 32
+    v1 = hi1 ^ value[0] ^ key0
+    v3 = hi0 ^ value[2] ^ key1
+    value = v0, v1, v2, v3
+  return np.array(value)
+
+
+class StatelessOpsTest(test.TestCase):
+
+  def testMatchStateful(self):
+    # Stateless ops should be the same as stateful ops on the first call
+    # after seed scrambling.
+    key = 0x3ec8f720, 0x02461e29
+    for seed in (7, 17), (11, 5), (2, 3):
+      preseed = invert_philox(key, (seed[0], 0, seed[1], 0)).astype(np.uint64)
+      preseed = preseed[::2] | preseed[1::2] << 32
+      random_seed.set_random_seed(seed[0])
+      with self.test_session(use_gpu=True):
+        for stateless_op, stateful_op in CASES:
+          for shape in (), (3,), (2, 5):
+            stateful = stateful_op(shape, seed=seed[1])
+            pure = stateless_op(shape, seed=preseed)
+            self.assertAllEqual(stateful.eval(), pure.eval())
+
+  def testDeterminism(self):
+    # Stateless values should be equal iff the seeds are equal (roughly)
+    with self.test_session(use_gpu=True):
+      seed_t = array_ops.placeholder(dtypes.int64, shape=[2])
+      seeds = [(x, y) for x in range(5) for y in range(5)] * 3
+      for stateless_op, _ in CASES:
+        for shape in (), (3,), (2, 5):
+          pure = stateless_op(shape, seed=seed_t)
+          values = [(seed, pure.eval(feed_dict={seed_t: seed}))
+                    for seed in seeds]
+          for s0, v0 in values:
+            for s1, v1 in values:
+              self.assertEqual(s0 == s1, np.all(v0 == v1))
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index d3455e50b0..1b78b25ff5 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -520,6 +520,7 @@ tf_gen_op_libs(
         "sparse_ops",
         "spectral_ops",
         "state_ops",
+        "stateless_random_ops",
         "string_ops",
         "training_ops",
     ],
@@ -593,6 +594,7 @@ cc_library(
         ":sparse_ops_op_lib",
         ":spectral_ops_op_lib",
         ":state_ops_op_lib",
+        ":stateless_random_ops_op_lib",
         ":string_ops_op_lib",
         ":training_ops_op_lib",
         ":user_ops_op_lib",
@@ -720,6 +722,7 @@ cc_library(
         "//tensorflow/core/kernels:set_kernels",
         "//tensorflow/core/kernels:sparse",
         "//tensorflow/core/kernels:state",
+        "//tensorflow/core/kernels:stateless_random_ops",
         "//tensorflow/core/kernels:string",
         "//tensorflow/core/kernels:training_ops",
         "//tensorflow/core/kernels:word2vec_kernels",
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index f243c13377..c9ec61328f 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -3055,6 +3055,18 @@ tf_cuda_cc_test(
     ],
 )
 
+tf_kernel_library(
+    name = "stateless_random_ops",
+    prefix = "stateless_random_ops",
+    deps = [
+        ":bounds_check",
+        ":random_op",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:stateless_random_ops_op_lib",
+    ],
+)
+
 cc_library(
     name = "required",
     deps = [
diff --git a/tensorflow/core/kernels/stateless_random_ops.cc b/tensorflow/core/kernels/stateless_random_ops.cc
new file mode 100644
index 0000000000..79d0c07acd
--- /dev/null
+++ b/tensorflow/core/kernels/stateless_random_ops.cc
@@ -0,0 +1,173 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/kernels/random_op.h"
+#include "tensorflow/core/lib/random/random_distributions.h"
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+
+using CPUDevice = Eigen::ThreadPoolDevice;
+using GPUDevice = Eigen::GpuDevice;
+
+namespace {
+
+class StatelessRandomOpBase : public OpKernel {
+ public:
+  explicit StatelessRandomOpBase(OpKernelConstruction* context)
+      : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    // Sanitize input
+    const Tensor& shape_t = context->input(0);
+    const Tensor& seed_t = context->input(1);
+    TensorShape shape;
+    OP_REQUIRES_OK(context, MakeShape(shape_t, &shape));
+    OP_REQUIRES(context, seed_t.dims() == 1 && seed_t.dim_size(0) == 2,
+                errors::InvalidArgument("seed must have shape [2], not ",
+                                        seed_t.shape().DebugString()));
+
+    // Allocate output
+    Tensor* output;
+    OP_REQUIRES_OK(context, context->allocate_output(0, shape, &output));
+    if (shape.num_elements() == 0) return;
+
+    // Grab the two seeds
+    const auto seed = seed_t.flat<int64>();
+    const uint64 seed0 = internal::SubtleMustCopy(seed(0));
+    const uint64 seed1 = internal::SubtleMustCopy(seed(1));
+
+    // Scramble the seeds so that the user doesn't need to worry about which
+    // part of the seed needs to be strong.
+    random::PhiloxRandom::Key key;
+    random::PhiloxRandom::ResultType counter;
+    key[0] = 0x3ec8f720;
+    key[1] = 0x02461e29;
+    counter[0] = static_cast<uint32>(seed0);
+    counter[1] = static_cast<uint32>(seed0 >> 32);
+    counter[2] = static_cast<uint32>(seed1);
+    counter[3] = static_cast<uint32>(seed1 >> 32);
+    const auto mix = random::PhiloxRandom(counter, key)();
+    key[0] = mix[0];
+    key[1] = mix[1];
+    counter[0] = counter[1] = 0;
+    counter[2] = mix[2];
+    counter[3] = mix[3];
+
+    // Fill in the random numbers
+    Fill(context, random::PhiloxRandom(counter, key), output);
+  }
+
+  // The part of Compute that depends on device, type, and distribution
+  virtual void Fill(OpKernelContext* context, random::PhiloxRandom random,
+                    Tensor* output) = 0;
+};
+
+template <typename Device, class Distribution>
+class StatelessRandomOp : public StatelessRandomOpBase {
+ public:
+  using StatelessRandomOpBase::StatelessRandomOpBase;
+
+  void Fill(OpKernelContext* context, random::PhiloxRandom random,
+            Tensor* output) override {
+    typedef typename Distribution::ResultElementType T;
+    auto flat = output->flat<T>();
+    // Reuse the compute kernels from the stateful random ops
+    functor::FillPhiloxRandom<Device, Distribution>()(
+        context, context->eigen_device<Device>(), random, flat.data(),
+        flat.size(), Distribution());
+  }
+};
+
+}  // namespace
+
+#define REGISTER(TYPE)                                                 \
+  REGISTER_KERNEL_BUILDER(                                             \
+      Name("StatelessRandomUniform")                                   \
+          .Device(DEVICE_CPU)                                          \
+          .HostMemory("shape")                                         \
+          .TypeConstraint<TYPE>("dtype"),                              \
+      StatelessRandomOp<CPUDevice, random::UniformDistribution<        \
+                                       random::PhiloxRandom, TYPE> >); \
+  REGISTER_KERNEL_BUILDER(                                             \
+      Name("StatelessRandomNormal")                                    \
+          .Device(DEVICE_CPU)                                          \
+          .HostMemory("shape")                                         \
+          .TypeConstraint<TYPE>("dtype"),                              \
+      StatelessRandomOp<CPUDevice, random::NormalDistribution<         \
+                                       random::PhiloxRandom, TYPE> >); \
+  REGISTER_KERNEL_BUILDER(                                             \
+      Name("StatelessTruncatedNormal")                                 \
+          .Device(DEVICE_CPU)                                          \
+          .HostMemory("shape")                                         \
+          .TypeConstraint<TYPE>("dtype"),                              \
+      StatelessRandomOp<                                               \
+          CPUDevice,                                                   \
+          random::TruncatedNormalDistribution<                         \
+              random::SingleSampleAdapter<random::PhiloxRandom>, TYPE> >);
+
+TF_CALL_half(REGISTER);
+TF_CALL_float(REGISTER);
+TF_CALL_double(REGISTER);
+
+#undef REGISTER
+
+#if GOOGLE_CUDA
+
+#define REGISTER(TYPE)                                                 \
+  REGISTER_KERNEL_BUILDER(                                             \
+      Name("StatelessRandomUniform")                                   \
+          .Device(DEVICE_GPU)                                          \
+          .HostMemory("shape")                                         \
+          .HostMemory("seed")                                          \
+          .TypeConstraint<int32>("T")                                  \
+          .TypeConstraint<TYPE>("dtype"),                              \
+      StatelessRandomOp<GPUDevice, random::UniformDistribution<        \
+                                       random::PhiloxRandom, TYPE> >); \
+  REGISTER_KERNEL_BUILDER(                                             \
+      Name("StatelessRandomNormal")                                    \
+          .Device(DEVICE_GPU)                                          \
+          .HostMemory("shape")                                         \
+          .HostMemory("seed")                                          \
+          .TypeConstraint<int32>("T")                                  \
+          .TypeConstraint<TYPE>("dtype"),                              \
+      StatelessRandomOp<GPUDevice, random::NormalDistribution<         \
+                                       random::PhiloxRandom, TYPE> >); \
+  REGISTER_KERNEL_BUILDER(                                             \
+      Name("StatelessTruncatedNormal")                                 \
+          .Device(DEVICE_GPU)                                          \
+          .HostMemory("shape")                                         \
+          .HostMemory("seed")                                          \
+          .TypeConstraint<int32>("T")                                  \
+          .TypeConstraint<TYPE>("dtype"),                              \
+      StatelessRandomOp<                                               \
+          GPUDevice,                                                   \
+          random::TruncatedNormalDistribution<                         \
+              random::SingleSampleAdapter<random::PhiloxRandom>, TYPE> >);
+
+TF_CALL_half(REGISTER);
+TF_CALL_float(REGISTER);
+TF_CALL_double(REGISTER);
+
+#undef REGISTER
+
+#endif  // GOOGLE_CUDA
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/ops/stateless_random_ops.cc b/tensorflow/core/ops/stateless_random_ops.cc
new file mode 100644
index 0000000000..b222b5b241
--- /dev/null
+++ b/tensorflow/core/ops/stateless_random_ops.cc
@@ -0,0 +1,94 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/common_shape_fns.h"
+#include "tensorflow/core/framework/op.h"
+
+namespace tensorflow {
+
+using shape_inference::DimensionHandle;
+using shape_inference::ShapeHandle;
+
+static Status StatelessShape(shape_inference::InferenceContext* context) {
+  // Check seed shape
+  ShapeHandle seed;
+  TF_RETURN_IF_ERROR(context->WithRank(context->input(1), 1, &seed));
+  DimensionHandle unused;
+  TF_RETURN_IF_ERROR(context->WithValue(context->Dim(seed, 0), 2, &unused));
+
+  // Set output shape
+  shape_inference::ShapeHandle out;
+  TF_RETURN_IF_ERROR(context->MakeShapeFromShapeTensor(0, &out));
+  context->set_output(0, out);
+  return Status::OK();
+}
+
+#define REGISTER_STATELESS_OP(name)                  \
+  REGISTER_OP(name)                                  \
+      .Input("shape: T")                             \
+      .Input("seed: int64")                          \
+      .Output("output: dtype")                       \
+      .Attr("dtype: {half,float,double} = DT_FLOAT") \
+      .Attr("T: {int32, int64} = DT_INT32")          \
+      .SetShapeFn(StatelessShape)
+
+// This op is exposed through contrib/stateless only.  The interface may change.
+REGISTER_STATELESS_OP("StatelessRandomUniform").Doc(R"doc(
+Outputs deterministic pseudorandom random values from a uniform distribution.
+
+The generated values follow a uniform distribution in the range `[0, 1)`. The
+lower bound 0 is included in the range, while the upper bound 1 is excluded.
+
+The outputs are a deterministic function of `shape` and `seed`.
+
+shape: The shape of the output tensor.
+dtype: The type of the output.
+seed: 2 seeds (shape [2]).
+output: Random values with specified shape.
+)doc");
+
+// This op is exposed through contrib/stateless only.  The interface may change.
+REGISTER_STATELESS_OP("StatelessRandomNormal").Doc(R"doc(
+Outputs deterministic pseudorandom values from a normal distribution.
+
+The generated values will have mean 0 and standard deviation 1.
+
+The outputs are a deterministic function of `shape` and `seed`.
+
+shape: The shape of the output tensor.
+dtype: The type of the output.
+seed: 2 seeds (shape [2]).
+output: Random values with specified shape.
+)doc");
+
+// This op is exposed through contrib/stateless only.  The interface may change.
+REGISTER_STATELESS_OP("StatelessTruncatedNormal").Doc(R"doc(
+Outputs deterministic pseudorandom values from a truncated normal distribution.
+
+The generated values follow a normal distribution with mean 0 and standard
+deviation 1, except that values whose magnitude is more than 2 standard
+deviations from the mean are dropped and re-picked.
+
+The outputs are a deterministic function of `shape` and `seed`.
+
+shape: The shape of the output tensor.
+dtype: The type of the output.
+seed: 2 seeds (shape [2]).
+output: Random values with specified shape.
+)doc");
+
+#undef REGISTER_STATELESS_OP
+
+}  // namespace tensorflow
-- 
GitLab


From 33fd4134234170745f989e2cdd73c8ca8709d926 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 13:39:36 -0800
Subject: [PATCH 0472/1563] [XLA] Represent fusion instructions as a
 HloComputation

Using a HloComputation to represent the HloInstructions inside a fusion
instruction.

All the interfaces are kept the same except for the parent field of the fusion
instruction. It now points to the newly created HloComputation rather the
enclosing computation for the fusion instruction.
Change: 153390245
---
 .../compiler/xla/service/hlo_computation.cc   |  73 +++++++---
 .../compiler/xla/service/hlo_computation.h    |  34 +++--
 tensorflow/compiler/xla/service/hlo_dce.cc    |   2 +-
 .../compiler/xla/service/hlo_instruction.cc   | 126 ++++++++++++------
 .../compiler/xla/service/hlo_instruction.h    |  32 +++--
 tensorflow/compiler/xla/service/hlo_module.h  |   5 +
 .../compiler/xla/service/hlo_verifier.cc      |   3 +-
 7 files changed, 192 insertions(+), 83 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_computation.cc b/tensorflow/compiler/xla/service/hlo_computation.cc
index 15de24fffd..655546d715 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation.cc
@@ -52,16 +52,17 @@ std::unique_ptr<HloComputation> HloComputation::Builder::Build(
       root_instruction ? root_instruction : last_added_instruction_;
   CHECK_NE(nullptr, root);
 
-  return WrapUnique(
-      new HloComputation(name_, parameter_count, &instructions_, root));
+  return WrapUnique(new HloComputation(name_, parameter_count, &instructions_,
+                                       root, is_fusion_computation_));
 }
 
 HloComputation::HloComputation(
     const string& name, int parameter_count,
     std::vector<std::unique_ptr<HloInstruction>>* instructions,
-    HloInstruction* root_instruction)
+    HloInstruction* root_instruction, bool is_fusion_computation)
     : name_(name),
       root_instruction_(root_instruction),
+      is_fusion_computation_(is_fusion_computation),
       instruction_name_uniquer_(/*separator=*/".") {
   param_instructions_.resize(parameter_count, nullptr);
   bool root_found = false;
@@ -99,19 +100,54 @@ HloInstruction* HloComputation::AddInstructionInternal(
   return pinst;
 }
 
-void HloComputation::Reparent(HloInstruction* instruction) {
+HloInstruction* HloComputation::AddParameter(
+    std::unique_ptr<HloInstruction> instruction) {
+  CHECK(instruction->opcode() == HloOpcode::kParameter);
+  CHECK(is_fusion_computation_);
+  CHECK(root_instruction_->fusion_instruction() != nullptr);
+  instruction->SetParentFusion(root_instruction_->fusion_instruction());
+  CHECK(root_instruction_->fusion_instruction()->operand_count() ==
+        param_instructions_.size());
   instruction->set_parent(this);
-  if (instruction->opcode() == HloOpcode::kFusion) {
-    for (auto& i : instruction->fused_instructions()) {
-      Reparent(i.get());
-    }
+  param_instructions_.push_back(instruction.get());
+  AddInstructionInternal(std::move(instruction));
+  return instructions_.back().get();
+}
+
+Status HloComputation::RemoveParameter(int64 param_no) {
+  CHECK_GE(param_no, 0);
+  CHECK_LT(param_no, param_instructions_.size());
+  CHECK(is_fusion_computation_);
+  CHECK(root_instruction_->fusion_instruction() != nullptr);
+  HloInstruction* param_instruction = param_instructions_[param_no];
+  auto param_instruction_iterator = param_instructions_.begin() + param_no;
+  param_instructions_.erase(param_instruction_iterator);
+  // Throw removed fused parameter instruction away.
+  TF_RETURN_IF_ERROR(RemoveInstruction(param_instruction));
+
+  while (param_no < param_instructions_.size()) {
+    param_instruction = param_instructions_[param_no];
+    HloInstruction* new_instr =
+        AddInstructionInternal(HloInstruction::CreateParameter(
+            param_no, param_instruction->shape(), param_instruction->name()));
+    TF_RETURN_IF_ERROR(param_instruction->ReplaceAllUsesWith(new_instr));
+    new_instr->SetParentFusion(root_instruction_->fusion_instruction());
+    param_instructions_[param_no] = new_instr;
+    TF_RETURN_IF_ERROR(RemoveInstruction(param_instruction));
+    param_no++;
   }
+
+  return Status::OK();
 }
 
-/* static */ bool HloComputation::IsRemovable(const HloOpcode& opcode) {
-  return !(opcode == HloOpcode::kParameter || opcode == HloOpcode::kRecv ||
-           opcode == HloOpcode::kSend || opcode == HloOpcode::kTrace ||
-           opcode == HloOpcode::kOutfeed);
+void HloComputation::Reparent(HloInstruction* instruction) {
+  instruction->set_parent(this);
+}
+
+bool HloComputation::IsRemovable(const HloOpcode& opcode) {
+  return !((opcode == HloOpcode::kParameter && !is_fusion_computation_) ||
+           opcode == HloOpcode::kRecv || opcode == HloOpcode::kSend ||
+           opcode == HloOpcode::kTrace || opcode == HloOpcode::kOutfeed);
 }
 
 Status HloComputation::RemoveInstructionAndUnusedOperands(
@@ -119,7 +155,7 @@ Status HloComputation::RemoveInstructionAndUnusedOperands(
   TF_RET_CHECK(root_instruction() != instruction);
 
   TF_RET_CHECK(instruction->user_count() == 0);
-  TF_RET_CHECK(HloComputation::IsRemovable(instruction->opcode()));
+  TF_RET_CHECK(IsRemovable(instruction->opcode()));
   std::unordered_set<HloInstruction*> removed;
   std::queue<HloInstruction*> worklist;
   worklist.push(instruction);
@@ -128,8 +164,7 @@ Status HloComputation::RemoveInstructionAndUnusedOperands(
     worklist.pop();
 
     if (removed.count(item) != 0 || item->user_count() != 0 ||
-        item == root_instruction() ||
-        !HloComputation::IsRemovable(item->opcode())) {
+        item == root_instruction() || !IsRemovable(item->opcode())) {
       continue;
     }
     for (int i = 0; i < item->operand_count(); ++i) {
@@ -302,12 +337,8 @@ string HloComputation::ToString() const {
   for (const HloInstruction* instruction : MakeInstructionPostOrder()) {
     s << "  " << instruction->ToString() << "\n";
     if (instruction->opcode() == HloOpcode::kFusion) {
-      tensorflow::gtl::FlatSet<HloInstruction*> added_instructions;
-      auto fused_instructions = InstructionPostOrderer::GetOrder(
-          instruction->fused_expression_root(), &added_instructions);
-      for (const auto& fused_instruction : fused_instructions) {
-        s << "    " << fused_instruction->ToString() << "\n";
-      }
+      s << "    " << instruction->fused_instructions_computation()->ToString()
+        << "\n";
     }
   }
   s << "}";
diff --git a/tensorflow/compiler/xla/service/hlo_computation.h b/tensorflow/compiler/xla/service/hlo_computation.h
index 82934595e1..1b32b9fe56 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.h
+++ b/tensorflow/compiler/xla/service/hlo_computation.h
@@ -54,8 +54,10 @@ class HloComputation {
   // Builder class for HloComputation.
   class Builder {
    public:
-    explicit Builder(const string& name)
-        : name_(name), last_added_instruction_(nullptr) {}
+    explicit Builder(const string& name, bool is_fusion_computation = false)
+        : name_(name),
+          last_added_instruction_(nullptr),
+          is_fusion_computation_(is_fusion_computation) {}
 
     // Build and return an HloComputation. The parameter root_instruction
     // specifies the already-added instruction to use as the root. If
@@ -74,6 +76,7 @@ class HloComputation {
    private:
     const string name_;
     HloInstruction* last_added_instruction_;
+    bool is_fusion_computation_;
     std::vector<std::unique_ptr<HloInstruction>> instructions_;
   };
 
@@ -81,6 +84,16 @@ class HloComputation {
   // the instruction.
   HloInstruction* AddInstruction(std::unique_ptr<HloInstruction> instruction);
 
+  // Remove the param_no'th parameter from the computation.
+  // Note this is only applicatable to the computation for the fusion
+  // instruction.
+  Status RemoveParameter(int64 param_no);
+
+  // Add new parameter instruction to the computation.
+  // This should be a new parameter. Instruction will be appended to parameters
+  // and inserted to the instruction list.
+  HloInstruction* AddParameter(std::unique_ptr<HloInstruction> instruction);
+
   // Remove an instruction from the computation. The instruction must have no
   // users. Instruction is deallocated with this call.
   Status RemoveInstruction(HloInstruction* instruction);
@@ -226,14 +239,18 @@ class HloComputation {
   // Returns true if instructions of the given opcode can be removed from the
   // computation. Instructions such as parameters and send/receive instructions
   // cannot be removed without violating invariants of the HLO computation or
-  // module.
-  static bool IsRemovable(const HloOpcode& opcode);
+  // module with the exception of fusion computation.
+  // A parameter instruction is removable for a fusion computation.
+  bool IsRemovable(const HloOpcode& opcode);
+
+  // Returns if this computation is a fusion computation.
+  bool IsFusionComputation() const { return is_fusion_computation_; }
 
  private:
   explicit HloComputation(
       const string& name, int parameter_count,
       std::vector<std::unique_ptr<HloInstruction>>* instructions,
-      HloInstruction* root_instruction);
+      HloInstruction* root_instruction, bool is_fusion_computation = false);
 
   // Internal helper for adding instructions.
   HloInstruction* AddInstructionInternal(
@@ -241,10 +258,6 @@ class HloComputation {
 
   // Helper for setting the parent of instructions that are added to this
   // computation.
-  //
-  // Because we clone HLO instructions without knowing what computation they're
-  // destined to be added to, this is required to appropriate set the parent on
-  // fused instruction sequences.
   void Reparent(HloInstruction* instruction);
 
   // Fuses HLOs in instructions_to_fuse into fusion_instruction.
@@ -264,6 +277,9 @@ class HloComputation {
   string name_;
   HloInstruction* root_instruction_;
 
+  // A tag shows if this is a fusion computation.
+  bool is_fusion_computation_;
+
   // Module containing this computation.
   HloModule* parent_ = nullptr;
 
diff --git a/tensorflow/compiler/xla/service/hlo_dce.cc b/tensorflow/compiler/xla/service/hlo_dce.cc
index fdfbbf8baf..dbf5bf28c8 100644
--- a/tensorflow/compiler/xla/service/hlo_dce.cc
+++ b/tensorflow/compiler/xla/service/hlo_dce.cc
@@ -52,7 +52,7 @@ StatusOr<bool> HloDCE::Run(HloModule* module) {
     for (auto& instruction : computation->instructions()) {
       if (instruction->user_count() == 0 &&
           live_instructions.count(instruction.get()) == 0 &&
-          HloComputation::IsRemovable(instruction->opcode())) {
+          computation->IsRemovable(instruction->opcode())) {
         dead_roots.push_back(instruction.get());
       }
     }
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 979afa4369..d15b8236bb 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -28,6 +28,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/compiler/xla/service/hlo_module.h"
+#include "tensorflow/compiler/xla/service/name_uniquer.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/types.h"
@@ -498,14 +500,28 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
   CHECK_EQ(opcode_, HloOpcode::kFusion);
   CHECK(instruction_to_fuse->IsFusable());
 
-  bool new_fusion_instruction = fused_instructions_.empty();
-  fused_instructions_.emplace_back(instruction_to_fuse->Clone());
-  HloInstruction* clone = fused_instructions_.back().get();
-  clone->parent_fusion_instruction_ = this;
-
-  if (new_fusion_instruction) {
-    fused_root_ = clone;
+  HloInstruction* clone = nullptr;
+  if (fused_instructions_computation_ == nullptr) {
+    // New fusion instruction.
+    string computation_name;
+    HloModule* module = GetModule();
+    if (module) {
+      computation_name = module->GetUniqueCompuationName(
+          instruction_to_fuse->name() + ".fusion");
+    } else {
+      computation_name = instruction_to_fuse->name() + ".fusion";
+    }
+    auto builder = HloComputation::Builder(computation_name, true);
+    builder.AddInstruction(instruction_to_fuse->Clone());
+    fused_instructions_computation_ = builder.Build();
+    clone = fused_expression_root();
+    clone->parent_fusion_instruction_ = this;
   } else {
+    CHECK(fused_instructions_computation_ != nullptr &&
+          fused_instructions_computation_->IsFusionComputation());
+    clone = fused_instructions_computation_->AddInstruction(
+        instruction_to_fuse->Clone());
+    clone->parent_fusion_instruction_ = this;
     // instruction_to_fuse is necessarily an operand of the fusion instruction.
     // After fusion this will no longer be the case. Remove the operand from the
     // operand list and remove its corresponding fused parameter
@@ -513,6 +529,8 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
     // consistent with their index in the fused_parameter_ vector.
     CHECK(std::find(operands_.begin(), operands_.end(), instruction_to_fuse) !=
           operands_.end());
+    const std::vector<HloInstruction*>& fused_parameters_ =
+        fused_instructions_computation_->parameter_instructions();
     for (int64 operand_num = 0; operand_num < operand_count(); ++operand_num) {
       if (instruction_to_fuse == operands_[operand_num]) {
         // replace the fused parameter instruction's uses with the clone.
@@ -521,22 +539,9 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
 
         // Remove the corresponding fused parameter and operand from their
         // respective vectors.
-        fused_parameters_.erase(fused_parameters_.begin() + operand_num);
+        TF_CHECK_OK(
+            fused_instructions_computation_->RemoveParameter(operand_num));
         operands_.erase(operands_.begin() + operand_num);
-
-        // Renumber fused parameter numbers to match the vector index.
-        while (operand_num < fused_parameters_.size()) {
-          fused_parameters_[operand_num]->parameter_number_ = operand_num;
-          operand_num++;
-        }
-        // Throw removed fused parameter instruction away.
-        auto inst_it =
-            std::find_if(fused_instructions_.begin(), fused_instructions_.end(),
-                         [=](const std::unique_ptr<HloInstruction>& inst) {
-                           return inst.get() == fused_parameter;
-                         });
-        CHECK(inst_it != fused_instructions_.end());
-        fused_instructions_.erase(inst_it);
         break;
       }
     }
@@ -545,6 +550,10 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
     instruction_to_fuse->RemoveUser(this);
   }
 
+  // Reread the parameters in the computation.
+  const std::vector<HloInstruction*>& fused_parameters_ =
+      fused_instructions_computation_->parameter_instructions();
+
   // Add each operand of the clone as an operand of the fusion instruction. A
   // complication is that some clone operands may already be operands of the
   // fusion instruction.
@@ -570,13 +579,10 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
       std::unique_ptr<HloInstruction> param_instruction =
           CreateParameter(param_no, operand->shape(), "fusion_param");
 
-      param_instruction->set_parent(parent());
       param_instruction->parent_fusion_instruction_ = this;
-      fused_parameters_.push_back(param_instruction.get());
-      fused_instructions_.push_back(std::move(param_instruction));
+      fused_param = fused_instructions_computation_->AddParameter(
+          std::move(param_instruction));
       AppendOperand(operand);
-
-      fused_param = fused_instructions_.back().get();
     }
     TF_CHECK_OK(clone->ReplaceOperandWith(operand_num, fused_param));
   }
@@ -599,18 +605,25 @@ RandomDistribution HloInstruction::random_distribution() const {
 
 void HloInstruction::CheckFusionInstruction() const {
   CHECK_EQ(opcode_, HloOpcode::kFusion);
+  CHECK(fused_instructions_computation_ != nullptr &&
+        fused_instructions_computation_->IsFusionComputation());
 
+  const std::list<std::unique_ptr<HloInstruction>>& fused_instructions_ =
+      fused_instructions_computation_->instructions();
   // All instructions owned by this fusion instruction must be fused, and the
   // parent fusion instruction of the fused instructions must be 'this'.
   for (auto& instruction : fused_instructions_) {
     CHECK(instruction->IsFused());
     CHECK_EQ(this, instruction->fusion_instruction());
-    CHECK_EQ(parent(), instruction->parent()) << instruction->ToString();
+    CHECK_EQ(fused_instructions_computation_.get(), instruction->parent())
+        << instruction->ToString();
   }
 
   // Fused root instruction and fused parameters must all be owned by the fusion
   // instruction.
   bool root_owned = false;
+  const std::vector<HloInstruction*>& fused_parameters_ = fused_parameters();
+  const HloInstruction* fused_root_ = fused_expression_root();
   std::vector<bool> parameter_owned(fused_parameters_.size(), false);
   for (auto& instruction : fused_instructions_) {
     if (fused_root_ == instruction.get()) {
@@ -838,6 +851,8 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneWithNewOperands(
   }
 }
 
+HloInstruction::~HloInstruction() {}
+
 std::unique_ptr<HloInstruction> HloInstruction::Clone(const string& suffix) {
   std::unique_ptr<HloInstruction> clone =
       CloneWithNewOperands(shape_, operands_);
@@ -850,6 +865,8 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneFusionWithNewOperands(
     const Shape& shape, tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
   CHECK_EQ(opcode_, HloOpcode::kFusion);
   CHECK(parent() != nullptr);
+  CHECK(fused_instructions_computation_ != nullptr &&
+        fused_instructions_computation_->IsFusionComputation());
 
   auto new_instruction =
       WrapUnique(new HloInstruction(HloOpcode::kFusion, shape));
@@ -863,6 +880,11 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneFusionWithNewOperands(
   // Create the list of fused parameters by mapping through the cloned,
   // fused instructions.
   std::vector<HloInstruction*> new_fused_parameters;
+  const std::vector<HloInstruction*>& fused_parameters_ =
+      fused_instructions_computation_->parameter_instructions();
+  const std::list<std::unique_ptr<HloInstruction>>& fused_instructions_ =
+      fused_instructions_computation_->instructions();
+
   for (HloInstruction* old_fused_parameter : fused_parameters_) {
     new_fused_instructions.push_back(old_fused_parameter->Clone());
     HloInstruction* new_fusion_parameter = new_fused_instructions.back().get();
@@ -893,13 +915,19 @@ std::unique_ptr<HloInstruction> HloInstruction::CloneFusionWithNewOperands(
     new_fused_instruction->parent_fusion_instruction_ = new_instruction.get();
     InsertOrDie(&old_to_new, old_fused_instruction, new_fused_instruction);
   }
+  new_instruction->fusion_kind_ = fusion_kind_;
+  auto computation_builder = HloComputation::Builder(
+      fused_instructions_computation_->name() + ".clone", true);
   // We iterated the fusion instructions in reverse post order which means
   // that we must reverse our new list of fusion instructions.
-  std::reverse(new_fused_instructions.begin(), new_fused_instructions.end());
-  new_instruction->fusion_kind_ = fusion_kind_;
-  new_instruction->fused_instructions_ = std::move(new_fused_instructions);
-  new_instruction->fused_parameters_ = std::move(new_fused_parameters);
-  new_instruction->fused_root_ = FindOrDie(old_to_new, fused_root_);
+  for (auto new_fused_instruction_iter = new_fused_instructions.rbegin();
+       new_fused_instruction_iter != new_fused_instructions.rend();
+       ++new_fused_instruction_iter) {
+    computation_builder.AddInstruction(std::move(*new_fused_instruction_iter));
+  }
+  auto fused_root_ = fused_expression_root();
+  new_instruction->fused_instructions_computation_ =
+      computation_builder.Build(FindOrDie(old_to_new, fused_root_));
   new_instruction->set_parent(parent());
   new_instruction->CheckFusionInstruction();
   return new_instruction;
@@ -1570,6 +1598,11 @@ bool HloInstruction::IsFusable() const {
   }
 }
 
+HloComputation* HloInstruction::fused_instructions_computation() const {
+  CHECK_EQ(opcode_, HloOpcode::kFusion);
+  return fused_instructions_computation_.get();
+}
+
 HloInstruction* HloInstruction::fusion_instruction() const {
   CHECK(IsFused());
   return parent_fusion_instruction_;
@@ -1577,25 +1610,32 @@ HloInstruction* HloInstruction::fusion_instruction() const {
 
 HloInstruction* HloInstruction::fused_expression_root() const {
   CHECK_EQ(opcode_, HloOpcode::kFusion);
-  return fused_root_;
+  CHECK(fused_instructions_computation_ != nullptr &&
+        fused_instructions_computation_->IsFusionComputation());
+  return fused_instructions_computation_->root_instruction();
 }
 
 HloInstruction* HloInstruction::fused_parameter(int64 parameter_number) const {
   CHECK_EQ(opcode_, HloOpcode::kFusion);
-  CHECK_GE(parameter_number, 0);
-  CHECK_LT(parameter_number, fused_parameters_.size());
-  return fused_parameters_[parameter_number];
+  CHECK(fused_instructions_computation_ != nullptr &&
+        fused_instructions_computation_->IsFusionComputation());
+  return fused_instructions_computation_->parameter_instruction(
+      parameter_number);
 }
 
 const std::vector<HloInstruction*>& HloInstruction::fused_parameters() const {
   CHECK_EQ(opcode_, HloOpcode::kFusion);
-  return fused_parameters_;
+  CHECK(fused_instructions_computation_ != nullptr &&
+        fused_instructions_computation_->IsFusionComputation());
+  return fused_instructions_computation_->parameter_instructions();
 }
 
 const std::list<std::unique_ptr<HloInstruction>>&
 HloInstruction::fused_instructions() const {
   CHECK_EQ(opcode_, HloOpcode::kFusion);
-  return fused_instructions_;
+  CHECK(fused_instructions_computation_ != nullptr &&
+        fused_instructions_computation_->IsFusionComputation());
+  return fused_instructions_computation_->instructions();
 }
 
 HloInstruction::HloInstruction(HloOpcode opcode, const Shape& shape)
@@ -2076,7 +2116,7 @@ HloInstruction::UseKind HloInstruction::OperandElementUse(int64 i) const {
             }
             return cache[&hlo];
           };
-      return reuses_parameter_elements(*fused_root_);
+      return reuses_parameter_elements(*fused_expression_root());
     }
     default:
       return IsElementwise() ? UseKind::kUse : UseKind::kReuse;
@@ -2168,4 +2208,10 @@ bool HloInstruction::CouldBeBitcast() const {
   }
 }
 
+HloModule* HloInstruction::GetModule() const {
+  if (parent_) {
+    return parent_->parent();
+  }
+  return nullptr;
+}
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 5f160892e9..4f62be5235 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -46,6 +46,7 @@ limitations under the License.
 namespace xla {
 
 class HloComputation;
+class HloModule;
 
 // HLO instructions are the IR used by the high-level compiler.
 class HloInstruction {
@@ -58,6 +59,7 @@ class HloInstruction {
     kConvBackwardInput,   // Fused into a backward input convolution.
   };
 
+  ~HloInstruction();
   // Creates a parameter-retrieving instruction.
   static std::unique_ptr<HloInstruction> CreateParameter(int64 parameter_number,
                                                          const Shape& shape,
@@ -535,6 +537,11 @@ class HloInstruction {
   // Precondition: opcode() == HloOpcode::kFusion
   HloInstruction* fused_expression_root() const;
 
+  // Returns the computation for this fused instruction.
+  //
+  // Precondition: opcode() == HloOpcode::kFusion
+  HloComputation* fused_instructions_computation() const;
+
   // Returns the vector of fused instructions inside this fusion
   // instruction. The order is a reverse postorder of the fused expression (root
   // is first in the order).
@@ -719,10 +726,21 @@ class HloInstruction {
   const HloComputation* parent() const { return parent_; }
   HloComputation* parent() { return parent_; }
 
+  // Returns the module for this instruction.
+  HloModule* GetModule() const;
+
   // Returns whether we could assign input and output layouts to this
   // instruction to make it a bitcast.
   bool CouldBeBitcast() const;
 
+  // Sets param_no for this Parameter instruction.
+  //
+  // Precondition: opcode() == HloOpcode::kParameter
+  void SetParentFusion(HloInstruction* fusion_instruction) {
+    CHECK_EQ(HloOpcode::kFusion, fusion_instruction->opcode());
+    parent_fusion_instruction_ = fusion_instruction;
+  }
+
  private:
   enum class UseKind { kNoUse, kReuse, kUsePermutingElements, kUse };
 
@@ -808,22 +826,14 @@ class HloInstruction {
   // padding of this pad instruction. Only set for pad instructions.
   std::unique_ptr<PaddingConfig> padding_config_;
 
-  // The set of instruction fused into this fusion instruction. Only set for
-  // fusion instructions.
-  std::list<std::unique_ptr<HloInstruction>> fused_instructions_;
+  // The computation that stores of instructions fused into this fusion
+  // instruction. Only set for fusion instructions.
+  std::unique_ptr<HloComputation> fused_instructions_computation_;
 
   // If this instruction is fused into a fusion instruction, this field points
   // to the fusion instruction.
   HloInstruction* parent_fusion_instruction_ = nullptr;
 
-  // The vector of parameter instructions inside this fusion instruction.  The
-  // index of the vector is the parameter_number of the parameter instruction.
-  // This vector is non-empty only for fusion instructions.
-  std::vector<HloInstruction*> fused_parameters_;
-
-  // The root of the expression fused into this fusion instruction.
-  HloInstruction* fused_root_ = nullptr;
-
   // The type of the fusion. Used by kFusion only.
   FusionKind fusion_kind_;
 
diff --git a/tensorflow/compiler/xla/service/hlo_module.h b/tensorflow/compiler/xla/service/hlo_module.h
index 1ff5c5dacb..d76f08d3bc 100644
--- a/tensorflow/compiler/xla/service/hlo_module.h
+++ b/tensorflow/compiler/xla/service/hlo_module.h
@@ -106,6 +106,11 @@ class HloModule {
   // Returns a randomly generated uint64.
   uint64 RandomNew64() const;
 
+  // Returns the unique name for a computation in this module.
+  string GetUniqueCompuationName(const string& prefix) {
+    return computation_name_uniquer_.GetUniqueName(prefix);
+  }
+
  private:
   HloComputation* AddComputationInternal(
       std::unique_ptr<HloComputation> computation);
diff --git a/tensorflow/compiler/xla/service/hlo_verifier.cc b/tensorflow/compiler/xla/service/hlo_verifier.cc
index 035b570ed3..de6081e57e 100644
--- a/tensorflow/compiler/xla/service/hlo_verifier.cc
+++ b/tensorflow/compiler/xla/service/hlo_verifier.cc
@@ -23,7 +23,8 @@ StatusOr<bool> HloVerifier::Run(HloModule* module) {
       TF_RET_CHECK(instruction->parent() == computation.get());
       if (instruction->opcode() == HloOpcode::kFusion) {
         for (const auto& fused : instruction->fused_instructions()) {
-          TF_RET_CHECK(fused->parent() == computation.get())
+          TF_RET_CHECK(fused->parent() ==
+                       instruction->fused_instructions_computation())
               << "Fused HLO was missing a parent: " << fused->ToString()
               << " parent: " << fused->parent()
               << " computation: " << computation.get();
-- 
GitLab


From 10dbab8e6eebe77a32e93195241c98adb175070e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 13:48:36 -0800
Subject: [PATCH 0473/1563] Guarded initialization of the embedding projector
 dashboard so that the dashboard only initializes once it has been attached to
 the DOM.

Without this change, the dashboard initializes before it is attached to the DOM, which is a problem because initialization depends on features in the DOM.
Change: 153391505
---
 .../vz_projector/vz-projector-dashboard.html   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
index a641a54e41..718325db88 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
@@ -45,23 +45,25 @@ TF.Dashboard.VzProjectorDashboard = Polymer({
   },
   properties: {
     dataNotFound: Boolean,
-    routePrefix: String
+    routePrefix: String,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
   },
   behaviors: [
     TF.Dashboard.DashboardBehavior("embeddings"),
   ],
-  observers: [
-    "_routePrefixSet(routePrefix)",
-  ],
   reload: function() {
     // Do not reload the embedding projector. Reloading could take a long time.
   },
-  _routePrefixSet: function(routePrefix) {
-    if (routePrefix === undefined) {
-      // The route prefix has not been set yet.
+  attached: function() {
+    if (this._initialized) {
       return;
     }
-    d3.json(routePrefix + '/runs', (err, runs) => {
+
+    // Set this to true so we only initialize once.
+    this._initialized = true;
+
+    d3.json(this.routePrefix + '/runs', (err, runs) => {
       this.set('dataNotFound', runs.length === 0);
     });
   },
-- 
GitLab


From 9d3efca71e9a6250802dcdc3d19152f3acf0c675 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Mon, 17 Apr 2017 14:12:43 -0800
Subject: [PATCH 0474/1563] Pass min and max attributes to
 FakeQuantWithMinMaxArgsGradient. Fixes #6616. Change: 153394867

---
 tensorflow/python/ops/array_ops.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 44c632df61..e03192508f 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1876,7 +1876,8 @@ def edit_distance(hypothesis, truth, normalize=True, name="edit_distance"):
 @ops.RegisterGradient("FakeQuantWithMinMaxArgs")
 def _FakeQuantWithMinMaxArgsGradient(op, grad):
   """Gradient for FakeQuantWithMinMaxArgs op."""
-  return fake_quant_with_min_max_args_gradient(grad, op.inputs[0])
+  return fake_quant_with_min_max_args_gradient(
+      grad, op.inputs[0], min=op.get_attr("min"), max=op.get_attr("max"))
 
 
 @ops.RegisterGradient("FakeQuantWithMinMaxVars")
-- 
GitLab


From 8450cb260279ac0cc4727277bf6fe8932e345453 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 14:25:20 -0800
Subject: [PATCH 0475/1563] Update ops-related pbtxt files. Change: 153396472

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 203 ++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 173 ++++++++++++++-
 2 files changed, 370 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 9dea77ed26..89ad301e87 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -4723,6 +4723,37 @@ op {
   }
   allows_uninitialized_input: true
 }
+op {
+  name: "Copy"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "tensor_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "debug_ops_spec"
+    type: "list(string)"
+    default_value {
+      list {
+      }
+    }
+  }
+  allows_uninitialized_input: true
+}
 op {
   name: "CopyHost"
   input_arg {
@@ -4746,6 +4777,37 @@ op {
   }
   allows_uninitialized_input: true
 }
+op {
+  name: "CopyHost"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "tensor_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "debug_ops_spec"
+    type: "list(string)"
+    default_value {
+      list {
+      }
+    }
+  }
+  allows_uninitialized_input: true
+}
 op {
   name: "Cos"
   input_arg {
@@ -8236,6 +8298,21 @@ op {
     version: 23
   }
 }
+op {
+  name: "GetSessionHandle"
+  input_arg {
+    name: "value"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_STRING
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+}
 op {
   name: "GetSessionHandleV2"
   input_arg {
@@ -21884,6 +21961,132 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "StatelessRandomNormal"
+  input_arg {
+    name: "shape"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "seed"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output"
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+}
+op {
+  name: "StatelessRandomUniform"
+  input_arg {
+    name: "shape"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "seed"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output"
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+}
+op {
+  name: "StatelessTruncatedNormal"
+  input_arg {
+    name: "shape"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "seed"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output"
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+}
 op {
   name: "StopGradient"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index a896f4c943..41353f0ea3 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -4884,8 +4884,17 @@ op {
     }
     description: "The name of the input tensor."
   }
+  attr {
+    name: "debug_ops_spec"
+    type: "list(string)"
+    default_value {
+      list {
+      }
+    }
+    description: "A list of debug op spec (op, url, gated_grpc) for attached debug\nops. Each element of the list has the format\n<debug_op>;<grpc_url>;<gated_grpc>, wherein gated_grpc is boolean represented\nas 0/1. E.g., \"DebugIdentity;grpc://foo:3333;1\",\n\"DebugIdentity;file:///tmp/tfdbg_1;0\"."
+  }
   summary: "Copy Op."
-  description: "Performs CPU-to-CPU or GPU-to-GPU deep-copying of tensor, depending on the\ndevice on which the tensor is allocated.\n\nUnlike the CopyHost Op, this op does not have HostMemory constraint on its\ninput or output."
+  description: "Performs CPU-to-CPU or GPU-to-GPU deep-copying of tensor, depending on the\ndevice on which the tensor is allocated.\nN.B.: If the all downstream attached debug ops are disabled given the current\ngRPC gating status, the output will simply forward the input tensor without\ndeep-copying. See the documentation of Debug* ops for more details.\n\nUnlike the CopyHost Op, this op does not have HostMemory constraint on its\ninput or output."
   allows_uninitialized_input: true
 }
 op {
@@ -4912,8 +4921,17 @@ op {
     }
     description: "The name of the input tensor."
   }
+  attr {
+    name: "debug_ops_spec"
+    type: "list(string)"
+    default_value {
+      list {
+      }
+    }
+    description: "A list of debug op spec (op, url, gated_grpc) for attached debug\nops. Each element of the list has the format\n<debug_op>;<grpc_url>;<gated_grpc>, wherein gated_grpc is boolean represented\nas 0/1. E.g., \"DebugIdentity;grpc://foo:3333;1\",\n\"DebugIdentity;file:///tmp/tfdbg_1;0\"."
+  }
   summary: "Copy Host Op."
-  description: "Performs CPU-to-CPU deep-copying of tensor.\n\nUnlike the Copy Op, this op has HostMemory constraint on its input or output."
+  description: "Performs CPU-to-CPU deep-copying of tensor.\nN.B.: If the all downstream attached debug ops are disabled given the current\ngRPC gating status, the output will simply forward the input tensor without\ndeep-copying. See the documentation of Debug* ops for more details.\n\nUnlike the Copy Op, this op has HostMemory constraint on its input or output."
   allows_uninitialized_input: true
 }
 op {
@@ -8574,20 +8592,19 @@ op {
   name: "GetSessionHandle"
   input_arg {
     name: "value"
+    description: "The tensor to be stored."
     type_attr: "T"
   }
   output_arg {
     name: "handle"
+    description: "The handle for the tensor stored in the session state, represented\nas a string."
     type: DT_STRING
   }
   attr {
     name: "T"
     type: "type"
   }
-  deprecation {
-    version: 23
-    explanation: "Use GetSessionHandleV2"
-  }
+  summary: "Store the input tensor in the state of the current session."
 }
 op {
   name: "GetSessionHandleV2"
@@ -23566,6 +23583,150 @@ op {
   description: "Op is similar to a queue with many fewer capabilities and options.  This Op is\noptimized for performance."
   is_stateful: true
 }
+op {
+  name: "StatelessRandomNormal"
+  input_arg {
+    name: "shape"
+    description: "The shape of the output tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "seed"
+    description: "2 seeds (shape [2])."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output"
+    description: "Random values with specified shape."
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    description: "The type of the output."
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  summary: "Outputs deterministic pseudorandom values from a normal distribution."
+  description: "The generated values will have mean 0 and standard deviation 1.\n\nThe outputs are a deterministic function of `shape` and `seed`."
+}
+op {
+  name: "StatelessRandomUniform"
+  input_arg {
+    name: "shape"
+    description: "The shape of the output tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "seed"
+    description: "2 seeds (shape [2])."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output"
+    description: "Random values with specified shape."
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    description: "The type of the output."
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  summary: "Outputs deterministic pseudorandom random values from a uniform distribution."
+  description: "The generated values follow a uniform distribution in the range `[0, 1)`. The\nlower bound 0 is included in the range, while the upper bound 1 is excluded.\n\nThe outputs are a deterministic function of `shape` and `seed`."
+}
+op {
+  name: "StatelessTruncatedNormal"
+  input_arg {
+    name: "shape"
+    description: "The shape of the output tensor."
+    type_attr: "T"
+  }
+  input_arg {
+    name: "seed"
+    description: "2 seeds (shape [2])."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output"
+    description: "Random values with specified shape."
+    type_attr: "dtype"
+  }
+  attr {
+    name: "dtype"
+    type: "type"
+    default_value {
+      type: DT_FLOAT
+    }
+    description: "The type of the output."
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  summary: "Outputs deterministic pseudorandom values from a truncated normal distribution."
+  description: "The generated values follow a normal distribution with mean 0 and standard\ndeviation 1, except that values whose magnitude is more than 2 standard\ndeviations from the mean are dropped and re-picked.\n\nThe outputs are a deterministic function of `shape` and `seed`."
+}
 op {
   name: "StopGradient"
   input_arg {
-- 
GitLab


From 9b87707d8e314ae2637b445341f5f82f1db26046 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 14:45:06 -0800
Subject: [PATCH 0476/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 153398765

---
 tensorflow/go/op/wrappers.go | 2236 +++++++++++++++++++---------------
 1 file changed, 1230 insertions(+), 1006 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 877961d0aa..514868ff14 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -1342,6 +1342,8 @@ func Squeeze(scope *Scope, input tf.Output, optional ...SqueezeAttr) (output tf.
 
 // A placeholder op for a value that will be fed into the computation.
 //
+// DEPRECATED at GraphDef version 23: Placeholder now behaves the same as PlaceholderV2.
+//
 // N.B. This operation will fail with an error if it is executed. It is
 // intended as a way to represent a value that will always be fed, and to
 // provide attrs that enable the fed value to be checked at runtime.
@@ -1373,7 +1375,7 @@ type PlaceholderAttr func(optionalAttr)
 //
 // value: (Optional) The shape of the tensor. If the shape has 0 dimensions, the
 // shape is unconstrained.
-// If not specified, defaults to <>
+// If not specified, defaults to <unknown_rank:true >
 func PlaceholderShape(value tf.Shape) PlaceholderAttr {
 	return func(m optionalAttr) {
 		m["shape"] = value
@@ -4894,6 +4896,151 @@ func CropAndResizeGradBoxes(scope *Scope, grads tf.Output, image tf.Output, boxe
 	return op.Output(0)
 }
 
+// CropAndResizeGradImageAttr is an optional argument to CropAndResizeGradImage.
+type CropAndResizeGradImageAttr func(optionalAttr)
+
+// CropAndResizeGradImageMethod sets the optional method attribute to value.
+//
+// value: A string specifying the interpolation method. Only 'bilinear' is
+// supported for now.
+// If not specified, defaults to "bilinear"
+func CropAndResizeGradImageMethod(value string) CropAndResizeGradImageAttr {
+	return func(m optionalAttr) {
+		m["method"] = value
+	}
+}
+
+// Computes the gradient of the crop_and_resize op wrt the input image tensor.
+//
+// Arguments:
+//	grads: A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
+//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
+// specifies the coordinates of a box in the `box_ind[i]` image and is specified
+// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
+// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
+// `[0, 1]` interval of normalized image height is mapped to
+// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
+// which case the sampled crop is an up-down flipped version of the original
+// image. The width dimension is treated similarly. Normalized coordinates
+// outside the `[0, 1]` range are allowed, in which case we use
+// `extrapolation_value` to extrapolate the input image values.
+//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
+// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
+//	image_size: A 1-D tensor with value `[batch, image_height, image_width, depth]`
+// containing the original image size. Both `image_height` and `image_width` need
+// to be positive.
+//
+//
+// Returns A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
+func CropAndResizeGradImage(scope *Scope, grads tf.Output, boxes tf.Output, box_ind tf.Output, image_size tf.Output, T tf.DataType, optional ...CropAndResizeGradImageAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"T": T}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "CropAndResizeGradImage",
+		Input: []tf.Input{
+			grads, boxes, box_ind, image_size,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// ExtractGlimpseAttr is an optional argument to ExtractGlimpse.
+type ExtractGlimpseAttr func(optionalAttr)
+
+// ExtractGlimpseCentered sets the optional centered attribute to value.
+//
+// value: indicates if the offset coordinates are centered relative to
+// the image, in which case the (0, 0) offset is relative to the center
+// of the input images. If false, the (0,0) offset corresponds to the
+// upper left corner of the input images.
+// If not specified, defaults to true
+func ExtractGlimpseCentered(value bool) ExtractGlimpseAttr {
+	return func(m optionalAttr) {
+		m["centered"] = value
+	}
+}
+
+// ExtractGlimpseNormalized sets the optional normalized attribute to value.
+//
+// value: indicates if the offset coordinates are normalized.
+// If not specified, defaults to true
+func ExtractGlimpseNormalized(value bool) ExtractGlimpseAttr {
+	return func(m optionalAttr) {
+		m["normalized"] = value
+	}
+}
+
+// ExtractGlimpseUniformNoise sets the optional uniform_noise attribute to value.
+//
+// value: indicates if the noise should be generated using a
+// uniform distribution or a Gaussian distribution.
+// If not specified, defaults to true
+func ExtractGlimpseUniformNoise(value bool) ExtractGlimpseAttr {
+	return func(m optionalAttr) {
+		m["uniform_noise"] = value
+	}
+}
+
+// Extracts a glimpse from the input tensor.
+//
+// Returns a set of windows called glimpses extracted at location
+// `offsets` from the input tensor. If the windows only partially
+// overlaps the inputs, the non overlapping areas will be filled with
+// random noise.
+//
+// The result is a 4-D tensor of shape `[batch_size, glimpse_height,
+// glimpse_width, channels]`. The channels and batch dimensions are the
+// same as that of the input tensor. The height and width of the output
+// windows are specified in the `size` parameter.
+//
+// The argument `normalized` and `centered` controls how the windows are built:
+//
+// * If the coordinates are normalized but not centered, 0.0 and 1.0
+//   correspond to the minimum and maximum of each height and width
+//   dimension.
+// * If the coordinates are both normalized and centered, they range from
+//   -1.0 to 1.0. The coordinates (-1.0, -1.0) correspond to the upper
+//   left corner, the lower right corner is located at (1.0, 1.0) and the
+//   center is at (0, 0).
+// * If the coordinates are not normalized they are interpreted as
+//   numbers of pixels.
+//
+// Arguments:
+//	input: A 4-D float tensor of shape `[batch_size, height, width, channels]`.
+//	size: A 1-D tensor of 2 elements containing the size of the glimpses
+// to extract.  The glimpse height must be specified first, following
+// by the glimpse width.
+//	offsets: A 2-D integer tensor of shape `[batch_size, 2]` containing
+// the y, x locations of the center of each window.
+//
+// Returns A tensor representing the glimpses `[batch_size,
+// glimpse_height, glimpse_width, channels]`.
+func ExtractGlimpse(scope *Scope, input tf.Output, size tf.Output, offsets tf.Output, optional ...ExtractGlimpseAttr) (glimpse tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ExtractGlimpse",
+		Input: []tf.Input{
+			input, size, offsets,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes softmax cross entropy cost and gradients to backpropagate.
 //
 // Unlike `SoftmaxCrossEntropyWithLogits`, this operation does not accept
@@ -5159,6 +5306,74 @@ func Relu6(scope *Scope, features tf.Output) (activations tf.Output) {
 	return op.Output(0)
 }
 
+// AudioSpectrogramAttr is an optional argument to AudioSpectrogram.
+type AudioSpectrogramAttr func(optionalAttr)
+
+// AudioSpectrogramMagnitudeSquared sets the optional magnitude_squared attribute to value.
+//
+// value: Whether to return the squared magnitude or just the
+// magnitude. Using squared magnitude can avoid extra calculations.
+// If not specified, defaults to false
+func AudioSpectrogramMagnitudeSquared(value bool) AudioSpectrogramAttr {
+	return func(m optionalAttr) {
+		m["magnitude_squared"] = value
+	}
+}
+
+// Produces a visualization of audio data over time.
+//
+// Spectrograms are a standard way of representing audio information as a series of
+// slices of frequency information, one slice for each window of time. By joining
+// these together into a sequence, they form a distinctive fingerprint of the sound
+// over time.
+//
+// This op expects to receive audio data as an input, stored as floats in the range
+// -1 to 1, together with a window width in samples, and a stride specifying how
+// far to move the window between slices. From this it generates a three
+// dimensional output. The lowest dimension has an amplitude value for each
+// frequency during that time slice. The next dimension is time, with successive
+// frequency slices. The final dimension is for the channels in the input, so a
+// stereo audio input would have two here for example.
+//
+// This means the layout when converted and saved as an image is rotated 90 degrees
+// clockwise from a typical spectrogram. Time is descending down the Y axis, and
+// the frequency decreases from left to right.
+//
+// Each value in the result represents the square root of the sum of the real and
+// imaginary parts of an FFT on the current window of samples. In this way, the
+// lowest dimension represents the power of each frequency in the current window,
+// and adjacent windows are concatenated in the next dimension.
+//
+// To get a more intuitive and visual look at what this operation does, you can run
+// tensorflow/examples/wav_to_spectrogram to read in an audio file and save out the
+// resulting spectrogram as a PNG image.
+//
+// Arguments:
+//	input: Float representation of audio data.
+//	window_size: How wide the input window is in samples. For the highest efficiency
+// this should be a power of two, but other values are accepted.
+//	stride: How widely apart the center of adjacent sample windows should be.
+//
+// Returns 3D representation of the audio frequencies as an image.
+func AudioSpectrogram(scope *Scope, input tf.Output, window_size int64, stride int64, optional ...AudioSpectrogramAttr) (spectrogram tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"window_size": window_size, "stride": stride}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "AudioSpectrogram",
+		Input: []tf.Input{
+			input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes the gradient of morphological 2-D dilation with respect to the input.
 //
 // Arguments:
@@ -5769,15 +5984,15 @@ func RsqrtGrad(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 // The graph specifications are serialized by protobuf as graph_transfer_info.
 // The implementation / limitations may differ for each platform
 // and each available peripheral.
-func RemoteFusedGraphExecute(scope *Scope, values []tf.Output, N int64, U tf.DataType, serialized_graph_transfer_info string) (output []tf.Output) {
+func RemoteFusedGraphExecute(scope *Scope, inputs []tf.Output, Toutputs []tf.DataType, serialized_remote_fused_graph_execute_info string) (outputs []tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"N": N, "U": U, "serialized_graph_transfer_info": serialized_graph_transfer_info}
+	attrs := map[string]interface{}{"Toutputs": Toutputs, "serialized_remote_fused_graph_execute_info": serialized_remote_fused_graph_execute_info}
 	opspec := tf.OpSpec{
 		Type: "RemoteFusedGraphExecute",
 		Input: []tf.Input{
-			tf.OutputList(values),
+			tf.OutputList(inputs),
 		},
 		Attrs: attrs,
 	}
@@ -5787,11 +6002,11 @@ func RemoteFusedGraphExecute(scope *Scope, values []tf.Output, N int64, U tf.Dat
 	}
 	var idx int
 	var err error
-	if output, idx, err = makeOutputList(op, idx, "output"); err != nil {
+	if outputs, idx, err = makeOutputList(op, idx, "outputs"); err != nil {
 		scope.UpdateErr("RemoteFusedGraphExecute", err)
 		return
 	}
-	return output
+	return outputs
 }
 
 // Conv3DBackpropFilterV2Attr is an optional argument to Conv3DBackpropFilterV2.
@@ -6035,34 +6250,157 @@ func DepthwiseConv2dNative(scope *Scope, input tf.Output, filter tf.Output, stri
 	return op.Output(0)
 }
 
-// Adds `bias` to `value`.
+// CropAndResizeAttr is an optional argument to CropAndResize.
+type CropAndResizeAttr func(optionalAttr)
+
+// CropAndResizeMethod sets the optional method attribute to value.
 //
-// This is a deprecated version of BiasAdd and will be soon removed.
+// value: A string specifying the interpolation method. Only 'bilinear' is
+// supported for now.
+// If not specified, defaults to "bilinear"
+func CropAndResizeMethod(value string) CropAndResizeAttr {
+	return func(m optionalAttr) {
+		m["method"] = value
+	}
+}
+
+// CropAndResizeExtrapolationValue sets the optional extrapolation_value attribute to value.
 //
-// This is a special case of `tf.add` where `bias` is restricted to be 1-D.
-// Broadcasting is supported, so `value` may have any number of dimensions.
+// value: Value used for extrapolation, when applicable.
+// If not specified, defaults to 0
+func CropAndResizeExtrapolationValue(value float32) CropAndResizeAttr {
+	return func(m optionalAttr) {
+		m["extrapolation_value"] = value
+	}
+}
+
+// Extracts crops from the input image tensor and bilinearly resizes them (possibly
+//
+// with aspect ratio change) to a common output size specified by `crop_size`. This
+// is more general than the `crop_to_bounding_box` op which extracts a fixed size
+// slice from the input image and does not allow resizing or aspect ratio change.
+//
+// Returns a tensor with `crops` from the input `image` at positions defined at the
+// bounding box locations in `boxes`. The cropped boxes are all resized (with
+// bilinear interpolation) to a fixed `size = [crop_height, crop_width]`. The
+// result is a 4-D tensor `[num_boxes, crop_height, crop_width, depth]`.
 //
 // Arguments:
-//	value: Any number of dimensions.
-//	bias: 1-D with size the last dimension of `value`.
+//	image: A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
+// Both `image_height` and `image_width` need to be positive.
+//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
+// specifies the coordinates of a box in the `box_ind[i]` image and is specified
+// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
+// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
+// `[0, 1]` interval of normalized image height is mapped to
+// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
+// which case the sampled crop is an up-down flipped version of the original
+// image. The width dimension is treated similarly. Normalized coordinates
+// outside the `[0, 1]` range are allowed, in which case we use
+// `extrapolation_value` to extrapolate the input image values.
+//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
+// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
+//	crop_size: A 1-D tensor of 2 elements, `size = [crop_height, crop_width]`. All
+// cropped image patches are resized to this size. The aspect ratio of the image
+// content is not preserved. Both `crop_height` and `crop_width` need to be
+// positive.
 //
-// Returns Broadcasted sum of `value` and `bias`.
-func BiasAddV1(scope *Scope, value tf.Output, bias tf.Output) (output tf.Output) {
+// Returns A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
+func CropAndResize(scope *Scope, image tf.Output, boxes tf.Output, box_ind tf.Output, crop_size tf.Output, optional ...CropAndResizeAttr) (crops tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "BiasAddV1",
+		Type: "CropAndResize",
 		Input: []tf.Input{
-			value, bias,
+			image, boxes, box_ind, crop_size,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Conv2DBackpropInputAttr is an optional argument to Conv2DBackpropInput.
-type Conv2DBackpropInputAttr func(optionalAttr)
+// MaxPoolGradAttr is an optional argument to MaxPoolGrad.
+type MaxPoolGradAttr func(optionalAttr)
+
+// MaxPoolGradDataFormat sets the optional data_format attribute to value.
+//
+// value: Specify the data format of the input and output data. With the
+// default format "NHWC", the data is stored in the order of:
+//     [batch, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCHW", the data storage order of:
+//     [batch, in_channels, in_height, in_width].
+// If not specified, defaults to "NHWC"
+func MaxPoolGradDataFormat(value string) MaxPoolGradAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Computes gradients of the maxpooling function.
+//
+// Arguments:
+//	orig_input: The original input tensor.
+//	orig_output: The original output tensor.
+//	grad: 4-D.  Gradients w.r.t. the output of `max_pool`.
+//	ksize: The size of the window for each dimension of the input tensor.
+//	strides: The stride of the sliding window for each dimension of the
+// input tensor.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients w.r.t. the input to `max_pool`.
+func MaxPoolGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPoolGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MaxPoolGrad",
+		Input: []tf.Input{
+			orig_input, orig_output, grad,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Adds `bias` to `value`.
+//
+// This is a deprecated version of BiasAdd and will be soon removed.
+//
+// This is a special case of `tf.add` where `bias` is restricted to be 1-D.
+// Broadcasting is supported, so `value` may have any number of dimensions.
+//
+// Arguments:
+//	value: Any number of dimensions.
+//	bias: 1-D with size the last dimension of `value`.
+//
+// Returns Broadcasted sum of `value` and `bias`.
+func BiasAddV1(scope *Scope, value tf.Output, bias tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "BiasAddV1",
+		Input: []tf.Input{
+			value, bias,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Conv2DBackpropInputAttr is an optional argument to Conv2DBackpropInput.
+type Conv2DBackpropInputAttr func(optionalAttr)
 
 // Conv2DBackpropInputUseCudnnOnGpu sets the optional use_cudnn_on_gpu attribute to value.
 // If not specified, defaults to true
@@ -7758,58 +8096,6 @@ func DenseToSparseSetOperation(scope *Scope, set1 tf.Output, set2_indices tf.Out
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
-// TopKV2Attr is an optional argument to TopKV2.
-type TopKV2Attr func(optionalAttr)
-
-// TopKV2Sorted sets the optional sorted attribute to value.
-//
-// value: If true the resulting `k` elements will be sorted by the values in
-// descending order.
-// If not specified, defaults to true
-func TopKV2Sorted(value bool) TopKV2Attr {
-	return func(m optionalAttr) {
-		m["sorted"] = value
-	}
-}
-
-// Finds values and indices of the `k` largest elements for the last dimension.
-//
-// If the input is a vector (rank-1), finds the `k` largest entries in the vector
-// and outputs their values and indices as vectors.  Thus `values[j]` is the
-// `j`-th largest entry in `input`, and its index is `indices[j]`.
-//
-// For matrices (resp. higher rank input), computes the top `k` entries in each
-// row (resp. vector along the last dimension).  Thus,
-//
-//     values.shape = indices.shape = input.shape[:-1] + [k]
-//
-// If two elements are equal, the lower-index element appears first.
-//
-// Arguments:
-//	input: 1-D or higher with last dimension at least `k`.
-//	k: 0-D.  Number of top elements to look for along the last dimension (along each
-// row for matrices).
-//
-// Returns The `k` largest elements along each last dimensional slice.The indices of `values` within the last dimension of `input`.
-func TopKV2(scope *Scope, input tf.Output, k tf.Output, optional ...TopKV2Attr) (values tf.Output, indices tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "TopKV2",
-		Input: []tf.Input{
-			input, k,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
-}
-
 // Delete the tensor specified by its handle in the session.
 //
 // Arguments:
@@ -8460,65 +8746,336 @@ func SparseTensorDenseAdd(scope *Scope, a_indices tf.Output, a_values tf.Output,
 	return op.Output(0)
 }
 
-// Batch normalization.
+// Concatenates a list of `SparseTensor` along the specified dimension.
 //
-// DEPRECATED at GraphDef version 9: Use tf.nn.batch_normalization()
+// Concatenation is with respect to the dense versions of these sparse tensors.
+// It is assumed that each input is a `SparseTensor` whose elements are ordered
+// along increasing dimension number.
 //
-// This op is deprecated. Prefer `tf.nn.batch_normalization`.
+// All inputs' shapes must match, except for the concat dimension.  The
+// `indices`, `values`, and `shapes` lists must have the same length.
+//
+// The output shape is identical to the inputs', except along the concat
+// dimension, where it is the sum of the inputs' sizes along that dimension.
+//
+// The output elements will be resorted to preserve the sort order along
+// increasing dimension number.
+//
+// This op runs in `O(M log M)` time, where `M` is the total number of non-empty
+// values across all inputs. This is due to the need for an internal sort in
+// order to concatenate efficiently across an arbitrary dimension.
+//
+// For example, if `concat_dim = 1` and the inputs are
+//
+//     sp_inputs[0]: shape = [2, 3]
+//     [0, 2]: "a"
+//     [1, 0]: "b"
+//     [1, 1]: "c"
+//
+//     sp_inputs[1]: shape = [2, 4]
+//     [0, 1]: "d"
+//     [0, 2]: "e"
+//
+// then the output will be
+//
+//     shape = [2, 7]
+//     [0, 2]: "a"
+//     [0, 4]: "d"
+//     [0, 5]: "e"
+//     [1, 0]: "b"
+//     [1, 1]: "c"
+//
+// Graphically this is equivalent to doing
+//
+//     [    a] concat [  d e  ] = [    a   d e  ]
+//     [b c  ]        [       ]   [b c          ]
 //
 // Arguments:
-//	t: A 4D input Tensor.
-//	m: A 1D mean Tensor with size matching the last dimension of t.
-// This is the first output from tf.nn.moments,
-// or a saved moving average thereof.
-//	v: A 1D variance Tensor with size matching the last dimension of t.
-// This is the second output from tf.nn.moments,
-// or a saved moving average thereof.
-//	beta: A 1D beta Tensor with size matching the last dimension of t.
-// An offset to be added to the normalized tensor.
-//	gamma: A 1D gamma Tensor with size matching the last dimension of t.
-// If "scale_after_normalization" is true, this tensor will be multiplied
-// with the normalized tensor.
-//	variance_epsilon: A small float number to avoid dividing by 0.
-//	scale_after_normalization: A bool indicating whether the resulted tensor
-// needs to be multiplied with gamma.
-func BatchNormWithGlobalNormalization(scope *Scope, t tf.Output, m tf.Output, v tf.Output, beta tf.Output, gamma tf.Output, variance_epsilon float32, scale_after_normalization bool) (result tf.Output) {
+//	indices: 2-D.  Indices of each input `SparseTensor`.
+//	values: 1-D.  Non-empty values of each `SparseTensor`.
+//	shapes: 1-D.  Shapes of each `SparseTensor`.
+//	concat_dim: Dimension to concatenate along. Must be in range [-rank, rank),
+// where rank is the number of dimensions in each input `SparseTensor`.
+//
+// Returns 2-D.  Indices of the concatenated `SparseTensor`.1-D.  Non-empty values of the concatenated `SparseTensor`.1-D.  Shape of the concatenated `SparseTensor`.
+func SparseConcat(scope *Scope, indices []tf.Output, values []tf.Output, shapes []tf.Output, concat_dim int64) (output_indices tf.Output, output_values tf.Output, output_shape tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"variance_epsilon": variance_epsilon, "scale_after_normalization": scale_after_normalization}
+	attrs := map[string]interface{}{"concat_dim": concat_dim}
 	opspec := tf.OpSpec{
-		Type: "BatchNormWithGlobalNormalization",
+		Type: "SparseConcat",
 		Input: []tf.Input{
-			t, m, v, beta, gamma,
+			tf.OutputList(indices), tf.OutputList(values), tf.OutputList(shapes),
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1), op.Output(2)
 }
 
-// Generate a glob pattern matching all sharded file names.
-func ShardedFilespec(scope *Scope, basename tf.Output, num_shards tf.Output) (filename tf.Output) {
+// IdentityReaderV2Attr is an optional argument to IdentityReaderV2.
+type IdentityReaderV2Attr func(optionalAttr)
+
+// IdentityReaderV2Container sets the optional container attribute to value.
+//
+// value: If non-empty, this reader is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func IdentityReaderV2Container(value string) IdentityReaderV2Attr {
+	return func(m optionalAttr) {
+		m["container"] = value
+	}
+}
+
+// IdentityReaderV2SharedName sets the optional shared_name attribute to value.
+//
+// value: If non-empty, this reader is named in the given bucket
+// with this shared_name. Otherwise, the node name is used instead.
+// If not specified, defaults to ""
+func IdentityReaderV2SharedName(value string) IdentityReaderV2Attr {
+	return func(m optionalAttr) {
+		m["shared_name"] = value
+	}
+}
+
+// A Reader that outputs the queued work as both the key and value.
+//
+// To use, enqueue strings in a Queue.  ReaderRead will take the front
+// work string and output (work, work).
+//
+// Returns The handle to reference the Reader.
+func IdentityReaderV2(scope *Scope, optional ...IdentityReaderV2Attr) (reader_handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "ShardedFilespec",
-		Input: []tf.Input{
-			basename, num_shards,
-		},
+		Type: "IdentityReaderV2",
+
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Saves the input tensors to disk.
-//
-// The size of `tensor_names` must match the number of tensors in `data`. `data[i]`
-// is written to `filename` with name `tensor_names[i]`.
-//
-// See also `SaveSlices`.
+// Performs a padding as a preprocess during a convolution.
+//
+// Similar to FusedResizeAndPadConv2d, this op allows for an optimized
+// implementation where the spatial padding transformation stage is fused with the
+// im2col lookup, but in this case without the bilinear filtering required for
+// resizing. Fusing the padding prevents the need to write out the intermediate
+// results as whole tensors, reducing memory pressure, and we can get some latency
+// gains by merging the transformation calculations.
+// The data_format attribute for Conv2D isn't supported by this op, and 'NHWC'
+// order is used instead.
+// Internally this op uses a single per-graph scratch buffer, which means that it
+// will block if multiple versions are being run in parallel. This is because this
+// operator is primarily an optimization to minimize memory usage.
+//
+// Arguments:
+//	input: 4-D with shape `[batch, in_height, in_width, in_channels]`.
+//	paddings: A two-column matrix specifying the padding sizes. The number of
+// rows must be the same as the rank of `input`.
+//	filter: 4-D with shape
+// `[filter_height, filter_width, in_channels, out_channels]`.
+//
+//	strides: 1-D of length 4.  The stride of the sliding window for each dimension
+// of `input`. Must be in the same order as the dimension specified with format.
+//	padding: The type of padding algorithm to use.
+func FusedPadConv2D(scope *Scope, input tf.Output, paddings tf.Output, filter tf.Output, mode string, strides []int64, padding string) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"mode": mode, "strides": strides, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "FusedPadConv2D",
+		Input: []tf.Input{
+			input, paddings, filter,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Computes the reverse mode backpropagated gradient of the Cholesky algorithm.
+//
+// For an explanation see "Differentiation of the Cholesky algorithm" by
+// Iain Murray http://arxiv.org/abs/1602.07527.
+//
+// Arguments:
+//	l: Output of batch Cholesky algorithm l = cholesky(A). Shape is `[..., M, M]`.
+// Algorithm depends only on lower triangular part of the innermost matrices of
+// this tensor.
+//	grad: df/dl where f is some scalar function. Shape is `[..., M, M]`.
+// Algorithm depends only on lower triangular part of the innermost matrices of
+// this tensor.
+//
+// Returns Symmetrized version of df/dA . Shape is `[..., M, M]`
+func CholeskyGrad(scope *Scope, l tf.Output, grad tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "CholeskyGrad",
+		Input: []tf.Input{
+			l, grad,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Returns immutable tensor from memory region.
+//
+// The current implementation memmaps the tensor from a file.
+//
+// Arguments:
+//	dtype: Type of the returned tensor.
+//	shape: Shape of the returned tensor.
+//	memory_region_name: Name of readonly memory region used by the tensor, see
+// NewReadOnlyMemoryRegionFromFile in tensorflow::Env.
+func ImmutableConst(scope *Scope, dtype tf.DataType, shape tf.Shape, memory_region_name string) (tensor tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"dtype": dtype, "shape": shape, "memory_region_name": memory_region_name}
+	opspec := tf.OpSpec{
+		Type: "ImmutableConst",
+
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Deserialize and concatenate `SparseTensors` from a serialized minibatch.
+//
+// The input `serialized_sparse` must be a string matrix of shape `[N x 3]` where
+// `N` is the minibatch size and the rows correspond to packed outputs of
+// `SerializeSparse`.  The ranks of the original `SparseTensor` objects
+// must all match.  When the final `SparseTensor` is created, it has rank one
+// higher than the ranks of the incoming `SparseTensor` objects
+// (they have been concatenated along a new row dimension).
+//
+// The output `SparseTensor` object's shape values for all dimensions but the
+// first are the max across the input `SparseTensor` objects' shape values
+// for the corresponding dimensions.  Its first shape value is `N`, the minibatch
+// size.
+//
+// The input `SparseTensor` objects' indices are assumed ordered in
+// standard lexicographic order.  If this is not the case, after this
+// step run `SparseReorder` to restore index ordering.
+//
+// For example, if the serialized input is a `[2 x 3]` matrix representing two
+// original `SparseTensor` objects:
+//
+//     index = [ 0]
+//             [10]
+//             [20]
+//     values = [1, 2, 3]
+//     shape = [50]
+//
+// and
+//
+//     index = [ 2]
+//             [10]
+//     values = [4, 5]
+//     shape = [30]
+//
+// then the final deserialized `SparseTensor` will be:
+//
+//     index = [0  0]
+//             [0 10]
+//             [0 20]
+//             [1  2]
+//             [1 10]
+//     values = [1, 2, 3, 4, 5]
+//     shape = [2 50]
+//
+// Arguments:
+//	serialized_sparse: 2-D, The `N` serialized `SparseTensor` objects.
+// Must have 3 columns.
+//	dtype: The `dtype` of the serialized `SparseTensor` objects.
+func DeserializeManySparse(scope *Scope, serialized_sparse tf.Output, dtype tf.DataType) (sparse_indices tf.Output, sparse_values tf.Output, sparse_shape tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"dtype": dtype}
+	opspec := tf.OpSpec{
+		Type: "DeserializeManySparse",
+		Input: []tf.Input{
+			serialized_sparse,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
+// Batch normalization.
+//
+// DEPRECATED at GraphDef version 9: Use tf.nn.batch_normalization()
+//
+// This op is deprecated. Prefer `tf.nn.batch_normalization`.
+//
+// Arguments:
+//	t: A 4D input Tensor.
+//	m: A 1D mean Tensor with size matching the last dimension of t.
+// This is the first output from tf.nn.moments,
+// or a saved moving average thereof.
+//	v: A 1D variance Tensor with size matching the last dimension of t.
+// This is the second output from tf.nn.moments,
+// or a saved moving average thereof.
+//	beta: A 1D beta Tensor with size matching the last dimension of t.
+// An offset to be added to the normalized tensor.
+//	gamma: A 1D gamma Tensor with size matching the last dimension of t.
+// If "scale_after_normalization" is true, this tensor will be multiplied
+// with the normalized tensor.
+//	variance_epsilon: A small float number to avoid dividing by 0.
+//	scale_after_normalization: A bool indicating whether the resulted tensor
+// needs to be multiplied with gamma.
+func BatchNormWithGlobalNormalization(scope *Scope, t tf.Output, m tf.Output, v tf.Output, beta tf.Output, gamma tf.Output, variance_epsilon float32, scale_after_normalization bool) (result tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"variance_epsilon": variance_epsilon, "scale_after_normalization": scale_after_normalization}
+	opspec := tf.OpSpec{
+		Type: "BatchNormWithGlobalNormalization",
+		Input: []tf.Input{
+			t, m, v, beta, gamma,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Generate a glob pattern matching all sharded file names.
+func ShardedFilespec(scope *Scope, basename tf.Output, num_shards tf.Output) (filename tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "ShardedFilespec",
+		Input: []tf.Input{
+			basename, num_shards,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Saves the input tensors to disk.
+//
+// The size of `tensor_names` must match the number of tensors in `data`. `data[i]`
+// is written to `filename` with name `tensor_names[i]`.
+//
+// See also `SaveSlices`.
 //
 // Arguments:
 //	filename: Must have a single element. The name of the file to which we write
@@ -9122,23 +9679,10 @@ func SelfAdjointEig(scope *Scope, input tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
-// FractionalMaxPoolAttr is an optional argument to FractionalMaxPool.
-type FractionalMaxPoolAttr func(optionalAttr)
-
-// FractionalMaxPoolPseudoRandom sets the optional pseudo_random attribute to value.
-//
-// value: When set to True, generates the pooling sequence in a
-// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
-// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
-// difference between pseudorandom and random.
-// If not specified, defaults to false
-func FractionalMaxPoolPseudoRandom(value bool) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["pseudo_random"] = value
-	}
-}
+// FractionalAvgPoolGradAttr is an optional argument to FractionalAvgPoolGrad.
+type FractionalAvgPoolGradAttr func(optionalAttr)
 
-// FractionalMaxPoolOverlapping sets the optional overlapping attribute to value.
+// FractionalAvgPoolGradOverlapping sets the optional overlapping attribute to value.
 //
 // value: When set to True, it means when pooling, the values at the boundary
 // of adjacent pooling cells are used by both cells. For example:
@@ -9148,136 +9692,21 @@ func FractionalMaxPoolPseudoRandom(value bool) FractionalMaxPoolAttr {
 // `value  20 5  16 3  7`
 //
 // If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [20, 16] for fractional max pooling.
+// The result would be [41/3, 26/3] for fractional avg pooling.
 // If not specified, defaults to false
-func FractionalMaxPoolOverlapping(value bool) FractionalMaxPoolAttr {
+func FractionalAvgPoolGradOverlapping(value bool) FractionalAvgPoolGradAttr {
 	return func(m optionalAttr) {
 		m["overlapping"] = value
 	}
 }
 
-// FractionalMaxPoolDeterministic sets the optional deterministic attribute to value.
+// Computes gradient of the FractionalAvgPool function.
 //
-// value: When set to True, a fixed pooling region will be used when
-// iterating over a FractionalMaxPool node in the computation graph. Mainly used
-// in unit test to make FractionalMaxPool deterministic.
-// If not specified, defaults to false
-func FractionalMaxPoolDeterministic(value bool) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["deterministic"] = value
-	}
-}
-
-// FractionalMaxPoolSeed sets the optional seed attribute to value.
-//
-// value: If either seed or seed2 are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func FractionalMaxPoolSeed(value int64) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// FractionalMaxPoolSeed2 sets the optional seed2 attribute to value.
-//
-// value: An second seed to avoid seed collision.
-// If not specified, defaults to 0
-func FractionalMaxPoolSeed2(value int64) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Performs fractional max pooling on the input.
-//
-// Fractional max pooling is slightly different than regular max pooling.  In
-// regular max pooling, you downsize an input set by taking the maximum value of
-// smaller N x N subsections of the set (often 2x2), and try to reduce the set by
-// a factor of N, where N is an integer.  Fractional max pooling, as you might
-// expect from the word "fractional", means that the overall reduction ratio N
-// does not have to be an integer.
-//
-// The sizes of the pooling regions are generated randomly but are fairly uniform.
-// For example, let's look at the height dimension, and the constraints on the
-// list of rows that will be pool boundaries.
-//
-// First we define the following:
-//
-// 1.  input_row_length : the number of rows from the input set
-// 2.  output_row_length : which will be smaller than the input
-// 3.  alpha = input_row_length / output_row_length : our reduction ratio
-// 4.  K = floor(alpha)
-// 5.  row_pooling_sequence : this is the result list of pool boundary rows
-//
-// Then, row_pooling_sequence should satisfy:
-//
-// 1.  a[0] = 0 : the first value of the sequence is 0
-// 2.  a[end] = input_row_length : the last value of the sequence is the size
-// 3.  K <= (a[i+1] - a[i]) <= K+1 : all intervals are K or K+1 size
-// 4.  length(row_pooling_sequence) = output_row_length+1
-//
-// For more details on fractional max pooling, see this paper:
-// [Benjamin Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071)
-//
-// Arguments:
-//	value: 4-D with shape `[batch, height, width, channels]`.
-//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
-// supports row and col dimension and should be >= 1.0. For example, a valid
-// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
-// must be 1.0 because we don't allow pooling on batch and channels
-// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
-// respectively.
-//
-// Returns output tensor after fractional max pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
-func FractionalMaxPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalMaxPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalMaxPool",
-		Input: []tf.Input{
-			value,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// FractionalAvgPoolGradAttr is an optional argument to FractionalAvgPoolGrad.
-type FractionalAvgPoolGradAttr func(optionalAttr)
-
-// FractionalAvgPoolGradOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [41/3, 26/3] for fractional avg pooling.
-// If not specified, defaults to false
-func FractionalAvgPoolGradOverlapping(value bool) FractionalAvgPoolGradAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// Computes gradient of the FractionalAvgPool function.
-//
-// Unlike FractionalMaxPoolGrad, we don't need to find arg_max for
-// FractionalAvgPoolGrad, we just need to evenly back-propagate each element of
-// out_backprop to those indices that form the same pooling cell. Therefore, we
-// just need to know the shape of original input tensor, instead of the whole
-// tensor.
+// Unlike FractionalMaxPoolGrad, we don't need to find arg_max for
+// FractionalAvgPoolGrad, we just need to evenly back-propagate each element of
+// out_backprop to those indices that form the same pooling cell. Therefore, we
+// just need to know the shape of original input tensor, instead of the whole
+// tensor.
 //
 // Arguments:
 //	orig_input_tensor_shape: Original input tensor shape for `fractional_avg_pool`
@@ -11720,6 +12149,27 @@ func ResourceSparseApplyProximalAdagrad(scope *Scope, var_ tf.Output, accum tf.O
 	return scope.AddOperation(opspec)
 }
 
+// Store the input tensor in the state of the current session.
+//
+// Arguments:
+//	value: The tensor to be stored.
+//
+// Returns The handle for the tensor stored in the session state, represented
+// as a string.
+func GetSessionHandle(scope *Scope, value tf.Output) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "GetSessionHandle",
+		Input: []tf.Input{
+			value,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Decode web-safe base64-encoded strings.
 //
 // Input may or may not have padding at the end. See EncodeBase64 for padding.
@@ -12448,6 +12898,50 @@ func Fact(scope *Scope) (fact tf.Output) {
 	return op.Output(0)
 }
 
+// StatelessRandomUniformAttr is an optional argument to StatelessRandomUniform.
+type StatelessRandomUniformAttr func(optionalAttr)
+
+// StatelessRandomUniformDtype sets the optional dtype attribute to value.
+//
+// value: The type of the output.
+// If not specified, defaults to DT_FLOAT
+func StatelessRandomUniformDtype(value tf.DataType) StatelessRandomUniformAttr {
+	return func(m optionalAttr) {
+		m["dtype"] = value
+	}
+}
+
+// Outputs deterministic pseudorandom random values from a uniform distribution.
+//
+// The generated values follow a uniform distribution in the range `[0, 1)`. The
+// lower bound 0 is included in the range, while the upper bound 1 is excluded.
+//
+// The outputs are a deterministic function of `shape` and `seed`.
+//
+// Arguments:
+//	shape: The shape of the output tensor.
+//	seed: 2 seeds (shape [2]).
+//
+// Returns Random values with specified shape.
+func StatelessRandomUniform(scope *Scope, shape tf.Output, seed tf.Output, optional ...StatelessRandomUniformAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "StatelessRandomUniform",
+		Input: []tf.Input{
+			shape, seed,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // PrintAttr is an optional argument to Print.
 type PrintAttr func(optionalAttr)
 
@@ -13106,7 +13600,8 @@ func GatherValidateIndices(value bool) GatherAttr {
 //
 // `validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
 // `indices` are always validated to be within range. If assigned to GPU,
-// out-of-bound indices result in unspecified behavior (currently the result is
+// out-of-bound indices result in safe but unspecified behavior, which may include
+// raising an error.
 // `0`, but this may become an error in the future).
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
@@ -13444,6 +13939,77 @@ func Substr(scope *Scope, input tf.Output, pos tf.Output, len tf.Output) (output
 	return op.Output(0)
 }
 
+// StatelessRandomNormalAttr is an optional argument to StatelessRandomNormal.
+type StatelessRandomNormalAttr func(optionalAttr)
+
+// StatelessRandomNormalDtype sets the optional dtype attribute to value.
+//
+// value: The type of the output.
+// If not specified, defaults to DT_FLOAT
+func StatelessRandomNormalDtype(value tf.DataType) StatelessRandomNormalAttr {
+	return func(m optionalAttr) {
+		m["dtype"] = value
+	}
+}
+
+// Outputs deterministic pseudorandom values from a normal distribution.
+//
+// The generated values will have mean 0 and standard deviation 1.
+//
+// The outputs are a deterministic function of `shape` and `seed`.
+//
+// Arguments:
+//	shape: The shape of the output tensor.
+//	seed: 2 seeds (shape [2]).
+//
+// Returns Random values with specified shape.
+func StatelessRandomNormal(scope *Scope, shape tf.Output, seed tf.Output, optional ...StatelessRandomNormalAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "StatelessRandomNormal",
+		Input: []tf.Input{
+			shape, seed,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Inverse fast Fourier transform.
+//
+// Computes the inverse 1-dimensional discrete Fourier transform over the
+// inner-most dimension of `input`.
+//
+// Arguments:
+//	input: A complex64 tensor.
+//
+// Returns A complex64 tensor of the same shape as `input`. The inner-most
+//   dimension of `input` is replaced with its inverse 1D Fourier transform.
+//
+// @compatibility(numpy)
+// Equivalent to np.fft.ifft
+// @end_compatibility
+func IFFT(scope *Scope, input tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "IFFT",
+		Input: []tf.Input{
+			input,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes the sum along sparse segments of a tensor divided by the sqrt of N.
 //
 // N is the size of the segment being reduced.
@@ -13617,37 +14183,80 @@ func ResizeBilinear(scope *Scope, images tf.Output, size tf.Output, optional ...
 	return op.Output(0)
 }
 
-// RandomPoissonAttr is an optional argument to RandomPoisson.
-type RandomPoissonAttr func(optionalAttr)
-
-// RandomPoissonSeed sets the optional seed attribute to value.
+// Computes the absolute value of a tensor.
 //
-// value: If either `seed` or `seed2` are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func RandomPoissonSeed(value int64) RandomPoissonAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
+// Given a tensor `x`, this operation returns a tensor containing the absolute
+// value of each element in `x`. For example, if x is an input element and y is
+// an output element, this operation computes \\(y = |x|\\).
+func Abs(scope *Scope, x tf.Output) (y tf.Output) {
+	if scope.Err() != nil {
+		return
 	}
-}
-
-// RandomPoissonSeed2 sets the optional seed2 attribute to value.
-//
-// value: A second seed to avoid seed collision.
-// If not specified, defaults to 0
-func RandomPoissonSeed2(value int64) RandomPoissonAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
+	opspec := tf.OpSpec{
+		Type: "Abs",
+		Input: []tf.Input{
+			x,
+		},
 	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
-// Outputs random values from the Poisson distribution(s) described by rate.
+// Restore a reader to a previously saved state.
 //
-// This op uses two algorithms, depending on rate. If rate >= 10, then
-// the algorithm by Hormann is used to acquire samples via
-// transformation-rejection.
-// See http://www.sciencedirect.com/science/article/pii/0167668793909974.
+// Not all Readers support being restored, so this can produce an
+// Unimplemented error.
+//
+// Arguments:
+//	reader_handle: Handle to a Reader.
+//	state: Result of a ReaderSerializeState of a Reader with type
+// matching reader_handle.
+//
+// Returns the created operation.
+func ReaderRestoreStateV2(scope *Scope, reader_handle tf.Output, state tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "ReaderRestoreStateV2",
+		Input: []tf.Input{
+			reader_handle, state,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// RandomPoissonAttr is an optional argument to RandomPoisson.
+type RandomPoissonAttr func(optionalAttr)
+
+// RandomPoissonSeed sets the optional seed attribute to value.
+//
+// value: If either `seed` or `seed2` are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func RandomPoissonSeed(value int64) RandomPoissonAttr {
+	return func(m optionalAttr) {
+		m["seed"] = value
+	}
+}
+
+// RandomPoissonSeed2 sets the optional seed2 attribute to value.
+//
+// value: A second seed to avoid seed collision.
+// If not specified, defaults to 0
+func RandomPoissonSeed2(value int64) RandomPoissonAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Outputs random values from the Poisson distribution(s) described by rate.
+//
+// This op uses two algorithms, depending on rate. If rate >= 10, then
+// the algorithm by Hormann is used to acquire samples via
+// transformation-rejection.
+// See http://www.sciencedirect.com/science/article/pii/0167668793909974.
 //
 // Otherwise, Knuth's algorithm is used to acquire samples via multiplying uniform
 // random variables.
@@ -14315,34 +14924,6 @@ func Zeta(scope *Scope, x tf.Output, q tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
-// Inverse fast Fourier transform.
-//
-// Computes the inverse 1-dimensional discrete Fourier transform over the
-// inner-most dimension of `input`.
-//
-// Arguments:
-//	input: A complex64 tensor.
-//
-// Returns A complex64 tensor of the same shape as `input`. The inner-most
-//   dimension of `input` is replaced with its inverse 1D Fourier transform.
-//
-// @compatibility(numpy)
-// Equivalent to np.fft.ifft
-// @end_compatibility
-func IFFT(scope *Scope, input tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "IFFT",
-		Input: []tf.Input{
-			input,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Inverse real-valued fast Fourier transform.
 //
 // Computes the inverse 1-dimensional discrete Fourier transform of a real-valued
@@ -14828,6 +15409,161 @@ func SdcaFprint(scope *Scope, input tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
+// Returns the number of records this Reader has produced.
+//
+// This is the same as the number of ReaderRead executions that have
+// succeeded.
+//
+// Arguments:
+//	reader_handle: Handle to a Reader.
+func ReaderNumRecordsProducedV2(scope *Scope, reader_handle tf.Output) (records_produced tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "ReaderNumRecordsProducedV2",
+		Input: []tf.Input{
+			reader_handle,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Computes exponential of x - 1 element-wise.
+//
+// I.e., \\(y = (\exp x) - 1\\).
+func Expm1(scope *Scope, x tf.Output) (y tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Expm1",
+		Input: []tf.Input{
+			x,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Returns x - y element-wise.
+//
+// *NOTE*: `Sub` supports broadcasting. More about broadcasting
+// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
+func Sub(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Sub",
+		Input: []tf.Input{
+			x, y,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Split elements of `input` based on `delimiter` into a `SparseTensor`.
+//
+// Let N be the size of source (typically N will be the batch size). Split each
+// element of `input` based on `delimiter` and return a `SparseTensor`
+// containing the splitted tokens. Empty tokens are ignored.
+//
+// `delimiter` can be empty, or a string of split characters. If `delimiter` is an
+//  empty string, each element of `input` is split into individual single-byte
+//  character strings, including splitting of UTF-8 multibyte sequences. Otherwise
+//  every character of `delimiter` is a potential split point.
+//
+// For example:
+//   N = 2, input[0] is 'hello world' and input[1] is 'a b c', then the output
+//   will be
+//
+//   indices = [0, 0;
+//              0, 1;
+//              1, 0;
+//              1, 1;
+//              1, 2]
+//   shape = [2, 3]
+//   values = ['hello', 'world', 'a', 'b', 'c']
+//
+// Arguments:
+//	input: 1-D. Strings to split.
+//	delimiter: 0-D. Delimiter characters (bytes), or empty string.
+//
+// Returns A dense matrix of int64 representing the indices of the sparse tensor.A vector of strings corresponding to the splited values.a length-2 vector of int64 representing the shape of the sparse
+// tensor, where the first value is N and the second value is the maximum number
+// of tokens in a single input entry.
+func StringSplit(scope *Scope, input tf.Output, delimiter tf.Output) (indices tf.Output, values tf.Output, shape tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "StringSplit",
+		Input: []tf.Input{
+			input, delimiter,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
+// Inverse 3D real-valued fast Fourier transform.
+//
+// Computes the inverse 3-dimensional discrete Fourier transform of a real-valued
+// signal over the inner-most 3 dimensions of `input`.
+//
+// The inner-most 3 dimensions of `input` are assumed to be the result of `RFFT3D`:
+// The inner-most dimension contains the `fft_length / 2 + 1` unique components of
+// the DFT of a real-valued signal. If `fft_length` is not provided, it is computed
+// from the size of the inner-most 3 dimensions of `input`. If the FFT length used
+// to compute `input` is odd, it should be provided since it cannot be inferred
+// properly.
+//
+// Arguments:
+//	input: A complex64 tensor.
+//	fft_length: An int32 tensor of shape [3]. The FFT length for each dimension.
+//
+// Returns A float32 tensor of the same rank as `input`. The inner-most 3
+//   dimensions of `input` are replaced with the `fft_length` samples of their
+//   inverse 3D real Fourier transform.
+//
+// @compatibility(numpy)
+// Equivalent to np.irfftn with 3 dimensions.
+// @end_compatibility
+func IRFFT3D(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "IRFFT3D",
+		Input: []tf.Input{
+			input, fft_length,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Returns the truth value of (x != y) element-wise.
+//
+// *NOTE*: `NotEqual` supports broadcasting. More about broadcasting
+// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
+func NotEqual(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "NotEqual",
+		Input: []tf.Input{
+			x, y,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Returns a batched diagonal tensor with a given batched diagonal values.
 //
 // Given a `diagonal`, this operation returns a tensor with the `diagonal` and
@@ -14996,473 +15732,184 @@ func TopK(scope *Scope, input tf.Output, k int64, optional ...TopKAttr) (values
 	return op.Output(0), op.Output(1)
 }
 
-// Returns the number of records this Reader has produced.
-//
-// This is the same as the number of ReaderRead executions that have
-// succeeded.
-//
-// Arguments:
-//	reader_handle: Handle to a Reader.
-func ReaderNumRecordsProducedV2(scope *Scope, reader_handle tf.Output) (records_produced tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "ReaderNumRecordsProducedV2",
-		Input: []tf.Input{
-			reader_handle,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Computes exponential of x - 1 element-wise.
-//
-// I.e., \\(y = (\exp x) - 1\\).
-func Expm1(scope *Scope, x tf.Output) (y tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Expm1",
-		Input: []tf.Input{
-			x,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Returns x - y element-wise.
-//
-// *NOTE*: `Sub` supports broadcasting. More about broadcasting
-// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func Sub(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Sub",
-		Input: []tf.Input{
-			x, y,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Split elements of `input` based on `delimiter` into a `SparseTensor`.
-//
-// Let N be the size of source (typically N will be the batch size). Split each
-// element of `input` based on `delimiter` and return a `SparseTensor`
-// containing the splitted tokens. Empty tokens are ignored.
-//
-// `delimiter` can be empty, or a string of split characters. If `delimiter` is an
-//  empty string, each element of `input` is split into individual single-byte
-//  character strings, including splitting of UTF-8 multibyte sequences. Otherwise
-//  every character of `delimiter` is a potential split point.
-//
-// For example:
-//   N = 2, input[0] is 'hello world' and input[1] is 'a b c', then the output
-//   will be
-//
-//   indices = [0, 0;
-//              0, 1;
-//              1, 0;
-//              1, 1;
-//              1, 2]
-//   shape = [2, 3]
-//   values = ['hello', 'world', 'a', 'b', 'c']
-//
-// Arguments:
-//	input: 1-D. Strings to split.
-//	delimiter: 0-D. Delimiter characters (bytes), or empty string.
-//
-// Returns A dense matrix of int64 representing the indices of the sparse tensor.A vector of strings corresponding to the splited values.a length-2 vector of int64 representing the shape of the sparse
-// tensor, where the first value is N and the second value is the maximum number
-// of tokens in a single input entry.
-func StringSplit(scope *Scope, input tf.Output, delimiter tf.Output) (indices tf.Output, values tf.Output, shape tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "StringSplit",
-		Input: []tf.Input{
-			input, delimiter,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// Inverse 3D real-valued fast Fourier transform.
-//
-// Computes the inverse 3-dimensional discrete Fourier transform of a real-valued
-// signal over the inner-most 3 dimensions of `input`.
-//
-// The inner-most 3 dimensions of `input` are assumed to be the result of `RFFT3D`:
-// The inner-most dimension contains the `fft_length / 2 + 1` unique components of
-// the DFT of a real-valued signal. If `fft_length` is not provided, it is computed
-// from the size of the inner-most 3 dimensions of `input`. If the FFT length used
-// to compute `input` is odd, it should be provided since it cannot be inferred
-// properly.
-//
-// Arguments:
-//	input: A complex64 tensor.
-//	fft_length: An int32 tensor of shape [3]. The FFT length for each dimension.
-//
-// Returns A float32 tensor of the same rank as `input`. The inner-most 3
-//   dimensions of `input` are replaced with the `fft_length` samples of their
-//   inverse 3D real Fourier transform.
-//
-// @compatibility(numpy)
-// Equivalent to np.irfftn with 3 dimensions.
-// @end_compatibility
-func IRFFT3D(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "IRFFT3D",
-		Input: []tf.Input{
-			input, fft_length,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Returns the truth value of (x != y) element-wise.
-//
-// *NOTE*: `NotEqual` supports broadcasting. More about broadcasting
-// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func NotEqual(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "NotEqual",
-		Input: []tf.Input{
-			x, y,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Returns immutable tensor from memory region.
-//
-// The current implementation memmaps the tensor from a file.
-//
-// Arguments:
-//	dtype: Type of the returned tensor.
-//	shape: Shape of the returned tensor.
-//	memory_region_name: Name of readonly memory region used by the tensor, see
-// NewReadOnlyMemoryRegionFromFile in tensorflow::Env.
-func ImmutableConst(scope *Scope, dtype tf.DataType, shape tf.Shape, memory_region_name string) (tensor tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"dtype": dtype, "shape": shape, "memory_region_name": memory_region_name}
-	opspec := tf.OpSpec{
-		Type: "ImmutableConst",
-
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Deserialize and concatenate `SparseTensors` from a serialized minibatch.
-//
-// The input `serialized_sparse` must be a string matrix of shape `[N x 3]` where
-// `N` is the minibatch size and the rows correspond to packed outputs of
-// `SerializeSparse`.  The ranks of the original `SparseTensor` objects
-// must all match.  When the final `SparseTensor` is created, it has rank one
-// higher than the ranks of the incoming `SparseTensor` objects
-// (they have been concatenated along a new row dimension).
-//
-// The output `SparseTensor` object's shape values for all dimensions but the
-// first are the max across the input `SparseTensor` objects' shape values
-// for the corresponding dimensions.  Its first shape value is `N`, the minibatch
-// size.
-//
-// The input `SparseTensor` objects' indices are assumed ordered in
-// standard lexicographic order.  If this is not the case, after this
-// step run `SparseReorder` to restore index ordering.
-//
-// For example, if the serialized input is a `[2 x 3]` matrix representing two
-// original `SparseTensor` objects:
-//
-//     index = [ 0]
-//             [10]
-//             [20]
-//     values = [1, 2, 3]
-//     shape = [50]
-//
-// and
-//
-//     index = [ 2]
-//             [10]
-//     values = [4, 5]
-//     shape = [30]
-//
-// then the final deserialized `SparseTensor` will be:
-//
-//     index = [0  0]
-//             [0 10]
-//             [0 20]
-//             [1  2]
-//             [1 10]
-//     values = [1, 2, 3, 4, 5]
-//     shape = [2 50]
-//
-// Arguments:
-//	serialized_sparse: 2-D, The `N` serialized `SparseTensor` objects.
-// Must have 3 columns.
-//	dtype: The `dtype` of the serialized `SparseTensor` objects.
-func DeserializeManySparse(scope *Scope, serialized_sparse tf.Output, dtype tf.DataType) (sparse_indices tf.Output, sparse_values tf.Output, sparse_shape tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"dtype": dtype}
-	opspec := tf.OpSpec{
-		Type: "DeserializeManySparse",
-		Input: []tf.Input{
-			serialized_sparse,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// Performs a padding as a preprocess during a convolution.
-//
-// Similar to FusedResizeAndPadConv2d, this op allows for an optimized
-// implementation where the spatial padding transformation stage is fused with the
-// im2col lookup, but in this case without the bilinear filtering required for
-// resizing. Fusing the padding prevents the need to write out the intermediate
-// results as whole tensors, reducing memory pressure, and we can get some latency
-// gains by merging the transformation calculations.
-// The data_format attribute for Conv2D isn't supported by this op, and 'NHWC'
-// order is used instead.
-// Internally this op uses a single per-graph scratch buffer, which means that it
-// will block if multiple versions are being run in parallel. This is because this
-// operator is primarily an optimization to minimize memory usage.
-//
-// Arguments:
-//	input: 4-D with shape `[batch, in_height, in_width, in_channels]`.
-//	paddings: A two-column matrix specifying the padding sizes. The number of
-// rows must be the same as the rank of `input`.
-//	filter: 4-D with shape
-// `[filter_height, filter_width, in_channels, out_channels]`.
-//
-//	strides: 1-D of length 4.  The stride of the sliding window for each dimension
-// of `input`. Must be in the same order as the dimension specified with format.
-//	padding: The type of padding algorithm to use.
-func FusedPadConv2D(scope *Scope, input tf.Output, paddings tf.Output, filter tf.Output, mode string, strides []int64, padding string) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"mode": mode, "strides": strides, "padding": padding}
-	opspec := tf.OpSpec{
-		Type: "FusedPadConv2D",
-		Input: []tf.Input{
-			input, paddings, filter,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Restore a reader to a previously saved state.
-//
-// Not all Readers support being restored, so this can produce an
-// Unimplemented error.
-//
-// Arguments:
-//	reader_handle: Handle to a Reader.
-//	state: Result of a ReaderSerializeState of a Reader with type
-// matching reader_handle.
-//
-// Returns the created operation.
-func ReaderRestoreStateV2(scope *Scope, reader_handle tf.Output, state tf.Output) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "ReaderRestoreStateV2",
-		Input: []tf.Input{
-			reader_handle, state,
-		},
-	}
-	return scope.AddOperation(opspec)
-}
-
-// Computes the absolute value of a tensor.
-//
-// Given a tensor `x`, this operation returns a tensor containing the absolute
-// value of each element in `x`. For example, if x is an input element and y is
-// an output element, this operation computes \\(y = |x|\\).
-func Abs(scope *Scope, x tf.Output) (y tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Abs",
-		Input: []tf.Input{
-			x,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Computes the reverse mode backpropagated gradient of the Cholesky algorithm.
-//
-// For an explanation see "Differentiation of the Cholesky algorithm" by
-// Iain Murray http://arxiv.org/abs/1602.07527.
-//
-// Arguments:
-//	l: Output of batch Cholesky algorithm l = cholesky(A). Shape is `[..., M, M]`.
-// Algorithm depends only on lower triangular part of the innermost matrices of
-// this tensor.
-//	grad: df/dl where f is some scalar function. Shape is `[..., M, M]`.
-// Algorithm depends only on lower triangular part of the innermost matrices of
-// this tensor.
-//
-// Returns Symmetrized version of df/dA . Shape is `[..., M, M]`
-func CholeskyGrad(scope *Scope, l tf.Output, grad tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "CholeskyGrad",
-		Input: []tf.Input{
-			l, grad,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Concatenates a list of `SparseTensor` along the specified dimension.
-//
-// Concatenation is with respect to the dense versions of these sparse tensors.
-// It is assumed that each input is a `SparseTensor` whose elements are ordered
-// along increasing dimension number.
-//
-// All inputs' shapes must match, except for the concat dimension.  The
-// `indices`, `values`, and `shapes` lists must have the same length.
-//
-// The output shape is identical to the inputs', except along the concat
-// dimension, where it is the sum of the inputs' sizes along that dimension.
-//
-// The output elements will be resorted to preserve the sort order along
-// increasing dimension number.
-//
-// This op runs in `O(M log M)` time, where `M` is the total number of non-empty
-// values across all inputs. This is due to the need for an internal sort in
-// order to concatenate efficiently across an arbitrary dimension.
-//
-// For example, if `concat_dim = 1` and the inputs are
-//
-//     sp_inputs[0]: shape = [2, 3]
-//     [0, 2]: "a"
-//     [1, 0]: "b"
-//     [1, 1]: "c"
+// TopKV2Attr is an optional argument to TopKV2.
+type TopKV2Attr func(optionalAttr)
+
+// TopKV2Sorted sets the optional sorted attribute to value.
 //
-//     sp_inputs[1]: shape = [2, 4]
-//     [0, 1]: "d"
-//     [0, 2]: "e"
+// value: If true the resulting `k` elements will be sorted by the values in
+// descending order.
+// If not specified, defaults to true
+func TopKV2Sorted(value bool) TopKV2Attr {
+	return func(m optionalAttr) {
+		m["sorted"] = value
+	}
+}
+
+// Finds values and indices of the `k` largest elements for the last dimension.
 //
-// then the output will be
+// If the input is a vector (rank-1), finds the `k` largest entries in the vector
+// and outputs their values and indices as vectors.  Thus `values[j]` is the
+// `j`-th largest entry in `input`, and its index is `indices[j]`.
 //
-//     shape = [2, 7]
-//     [0, 2]: "a"
-//     [0, 4]: "d"
-//     [0, 5]: "e"
-//     [1, 0]: "b"
-//     [1, 1]: "c"
+// For matrices (resp. higher rank input), computes the top `k` entries in each
+// row (resp. vector along the last dimension).  Thus,
 //
-// Graphically this is equivalent to doing
+//     values.shape = indices.shape = input.shape[:-1] + [k]
 //
-//     [    a] concat [  d e  ] = [    a   d e  ]
-//     [b c  ]        [       ]   [b c          ]
+// If two elements are equal, the lower-index element appears first.
 //
 // Arguments:
-//	indices: 2-D.  Indices of each input `SparseTensor`.
-//	values: 1-D.  Non-empty values of each `SparseTensor`.
-//	shapes: 1-D.  Shapes of each `SparseTensor`.
-//	concat_dim: Dimension to concatenate along. Must be in range [-rank, rank),
-// where rank is the number of dimensions in each input `SparseTensor`.
+//	input: 1-D or higher with last dimension at least `k`.
+//	k: 0-D.  Number of top elements to look for along the last dimension (along each
+// row for matrices).
 //
-// Returns 2-D.  Indices of the concatenated `SparseTensor`.1-D.  Non-empty values of the concatenated `SparseTensor`.1-D.  Shape of the concatenated `SparseTensor`.
-func SparseConcat(scope *Scope, indices []tf.Output, values []tf.Output, shapes []tf.Output, concat_dim int64) (output_indices tf.Output, output_values tf.Output, output_shape tf.Output) {
+// Returns The `k` largest elements along each last dimensional slice.The indices of `values` within the last dimension of `input`.
+func TopKV2(scope *Scope, input tf.Output, k tf.Output, optional ...TopKV2Attr) (values tf.Output, indices tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"concat_dim": concat_dim}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "SparseConcat",
+		Type: "TopKV2",
 		Input: []tf.Input{
-			tf.OutputList(indices), tf.OutputList(values), tf.OutputList(shapes),
+			input, k,
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
+	return op.Output(0), op.Output(1)
 }
 
-// IdentityReaderV2Attr is an optional argument to IdentityReaderV2.
-type IdentityReaderV2Attr func(optionalAttr)
+// FractionalMaxPoolAttr is an optional argument to FractionalMaxPool.
+type FractionalMaxPoolAttr func(optionalAttr)
 
-// IdentityReaderV2Container sets the optional container attribute to value.
+// FractionalMaxPoolPseudoRandom sets the optional pseudo_random attribute to value.
 //
-// value: If non-empty, this reader is placed in the given container.
-// Otherwise, a default container is used.
-// If not specified, defaults to ""
-func IdentityReaderV2Container(value string) IdentityReaderV2Attr {
+// value: When set to True, generates the pooling sequence in a
+// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
+// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
+// difference between pseudorandom and random.
+// If not specified, defaults to false
+func FractionalMaxPoolPseudoRandom(value bool) FractionalMaxPoolAttr {
 	return func(m optionalAttr) {
-		m["container"] = value
+		m["pseudo_random"] = value
 	}
 }
 
-// IdentityReaderV2SharedName sets the optional shared_name attribute to value.
+// FractionalMaxPoolOverlapping sets the optional overlapping attribute to value.
 //
-// value: If non-empty, this reader is named in the given bucket
-// with this shared_name. Otherwise, the node name is used instead.
-// If not specified, defaults to ""
-func IdentityReaderV2SharedName(value string) IdentityReaderV2Attr {
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [20, 16] for fractional max pooling.
+// If not specified, defaults to false
+func FractionalMaxPoolOverlapping(value bool) FractionalMaxPoolAttr {
 	return func(m optionalAttr) {
-		m["shared_name"] = value
+		m["overlapping"] = value
 	}
 }
 
-// A Reader that outputs the queued work as both the key and value.
+// FractionalMaxPoolDeterministic sets the optional deterministic attribute to value.
 //
-// To use, enqueue strings in a Queue.  ReaderRead will take the front
-// work string and output (work, work).
+// value: When set to True, a fixed pooling region will be used when
+// iterating over a FractionalMaxPool node in the computation graph. Mainly used
+// in unit test to make FractionalMaxPool deterministic.
+// If not specified, defaults to false
+func FractionalMaxPoolDeterministic(value bool) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["deterministic"] = value
+	}
+}
+
+// FractionalMaxPoolSeed sets the optional seed attribute to value.
 //
-// Returns The handle to reference the Reader.
-func IdentityReaderV2(scope *Scope, optional ...IdentityReaderV2Attr) (reader_handle tf.Output) {
+// value: If either seed or seed2 are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func FractionalMaxPoolSeed(value int64) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["seed"] = value
+	}
+}
+
+// FractionalMaxPoolSeed2 sets the optional seed2 attribute to value.
+//
+// value: An second seed to avoid seed collision.
+// If not specified, defaults to 0
+func FractionalMaxPoolSeed2(value int64) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Performs fractional max pooling on the input.
+//
+// Fractional max pooling is slightly different than regular max pooling.  In
+// regular max pooling, you downsize an input set by taking the maximum value of
+// smaller N x N subsections of the set (often 2x2), and try to reduce the set by
+// a factor of N, where N is an integer.  Fractional max pooling, as you might
+// expect from the word "fractional", means that the overall reduction ratio N
+// does not have to be an integer.
+//
+// The sizes of the pooling regions are generated randomly but are fairly uniform.
+// For example, let's look at the height dimension, and the constraints on the
+// list of rows that will be pool boundaries.
+//
+// First we define the following:
+//
+// 1.  input_row_length : the number of rows from the input set
+// 2.  output_row_length : which will be smaller than the input
+// 3.  alpha = input_row_length / output_row_length : our reduction ratio
+// 4.  K = floor(alpha)
+// 5.  row_pooling_sequence : this is the result list of pool boundary rows
+//
+// Then, row_pooling_sequence should satisfy:
+//
+// 1.  a[0] = 0 : the first value of the sequence is 0
+// 2.  a[end] = input_row_length : the last value of the sequence is the size
+// 3.  K <= (a[i+1] - a[i]) <= K+1 : all intervals are K or K+1 size
+// 4.  length(row_pooling_sequence) = output_row_length+1
+//
+// For more details on fractional max pooling, see this paper:
+// [Benjamin Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071)
+//
+// Arguments:
+//	value: 4-D with shape `[batch, height, width, channels]`.
+//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
+// supports row and col dimension and should be >= 1.0. For example, a valid
+// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
+// must be 1.0 because we don't allow pooling on batch and channels
+// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
+// respectively.
+//
+// Returns output tensor after fractional max pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
+func FractionalMaxPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalMaxPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
+	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "IdentityReaderV2",
-
+		Type: "FractionalMaxPool",
+		Input: []tf.Input{
+			value,
+		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1), op.Output(2)
 }
 
 // RandomCropAttr is an optional argument to RandomCrop.
@@ -18468,6 +18915,51 @@ func Conj(scope *Scope, input tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
+// StatelessTruncatedNormalAttr is an optional argument to StatelessTruncatedNormal.
+type StatelessTruncatedNormalAttr func(optionalAttr)
+
+// StatelessTruncatedNormalDtype sets the optional dtype attribute to value.
+//
+// value: The type of the output.
+// If not specified, defaults to DT_FLOAT
+func StatelessTruncatedNormalDtype(value tf.DataType) StatelessTruncatedNormalAttr {
+	return func(m optionalAttr) {
+		m["dtype"] = value
+	}
+}
+
+// Outputs deterministic pseudorandom values from a truncated normal distribution.
+//
+// The generated values follow a normal distribution with mean 0 and standard
+// deviation 1, except that values whose magnitude is more than 2 standard
+// deviations from the mean are dropped and re-picked.
+//
+// The outputs are a deterministic function of `shape` and `seed`.
+//
+// Arguments:
+//	shape: The shape of the output tensor.
+//	seed: 2 seeds (shape [2]).
+//
+// Returns Random values with specified shape.
+func StatelessTruncatedNormal(scope *Scope, shape tf.Output, seed tf.Output, optional ...StatelessTruncatedNormalAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "StatelessTruncatedNormal",
+		Input: []tf.Input{
+			shape, seed,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // RestoreSliceAttr is an optional argument to RestoreSlice.
 type RestoreSliceAttr func(optionalAttr)
 
@@ -19764,86 +20256,31 @@ func ReaderNumWorkUnitsCompletedV2(scope *Scope, reader_handle tf.Output) (units
 	if scope.Err() != nil {
 		return
 	}
-	opspec := tf.OpSpec{
-		Type: "ReaderNumWorkUnitsCompletedV2",
-		Input: []tf.Input{
-			reader_handle,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Returns x / y element-wise for real types.
-//
-// If `x` and `y` are reals, this will return the floating-point division.
-//
-// *NOTE*: `Div` supports broadcasting. More about broadcasting
-// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func RealDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "RealDiv",
-		Input: []tf.Input{
-			x, y,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// CropAndResizeGradImageAttr is an optional argument to CropAndResizeGradImage.
-type CropAndResizeGradImageAttr func(optionalAttr)
-
-// CropAndResizeGradImageMethod sets the optional method attribute to value.
-//
-// value: A string specifying the interpolation method. Only 'bilinear' is
-// supported for now.
-// If not specified, defaults to "bilinear"
-func CropAndResizeGradImageMethod(value string) CropAndResizeGradImageAttr {
-	return func(m optionalAttr) {
-		m["method"] = value
-	}
+	opspec := tf.OpSpec{
+		Type: "ReaderNumWorkUnitsCompletedV2",
+		Input: []tf.Input{
+			reader_handle,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
-// Computes the gradient of the crop_and_resize op wrt the input image tensor.
-//
-// Arguments:
-//	grads: A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
-//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
-// specifies the coordinates of a box in the `box_ind[i]` image and is specified
-// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
-// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
-// `[0, 1]` interval of normalized image height is mapped to
-// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
-// which case the sampled crop is an up-down flipped version of the original
-// image. The width dimension is treated similarly. Normalized coordinates
-// outside the `[0, 1]` range are allowed, in which case we use
-// `extrapolation_value` to extrapolate the input image values.
-//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
-// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
-//	image_size: A 1-D tensor with value `[batch, image_height, image_width, depth]`
-// containing the original image size. Both `image_height` and `image_width` need
-// to be positive.
+// Returns x / y element-wise for real types.
 //
+// If `x` and `y` are reals, this will return the floating-point division.
 //
-// Returns A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
-func CropAndResizeGradImage(scope *Scope, grads tf.Output, boxes tf.Output, box_ind tf.Output, image_size tf.Output, T tf.DataType, optional ...CropAndResizeGradImageAttr) (output tf.Output) {
+// *NOTE*: `Div` supports broadcasting. More about broadcasting
+// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
+func RealDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"T": T}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "CropAndResizeGradImage",
+		Type: "RealDiv",
 		Input: []tf.Input{
-			grads, boxes, box_ind, image_size,
+			x, y,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -20556,216 +20993,3 @@ func RGBToHSV(scope *Scope, images tf.Output) (output tf.Output) {
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
-
-// ExtractGlimpseAttr is an optional argument to ExtractGlimpse.
-type ExtractGlimpseAttr func(optionalAttr)
-
-// ExtractGlimpseCentered sets the optional centered attribute to value.
-//
-// value: indicates if the offset coordinates are centered relative to
-// the image, in which case the (0, 0) offset is relative to the center
-// of the input images. If false, the (0,0) offset corresponds to the
-// upper left corner of the input images.
-// If not specified, defaults to true
-func ExtractGlimpseCentered(value bool) ExtractGlimpseAttr {
-	return func(m optionalAttr) {
-		m["centered"] = value
-	}
-}
-
-// ExtractGlimpseNormalized sets the optional normalized attribute to value.
-//
-// value: indicates if the offset coordinates are normalized.
-// If not specified, defaults to true
-func ExtractGlimpseNormalized(value bool) ExtractGlimpseAttr {
-	return func(m optionalAttr) {
-		m["normalized"] = value
-	}
-}
-
-// ExtractGlimpseUniformNoise sets the optional uniform_noise attribute to value.
-//
-// value: indicates if the noise should be generated using a
-// uniform distribution or a Gaussian distribution.
-// If not specified, defaults to true
-func ExtractGlimpseUniformNoise(value bool) ExtractGlimpseAttr {
-	return func(m optionalAttr) {
-		m["uniform_noise"] = value
-	}
-}
-
-// Extracts a glimpse from the input tensor.
-//
-// Returns a set of windows called glimpses extracted at location
-// `offsets` from the input tensor. If the windows only partially
-// overlaps the inputs, the non overlapping areas will be filled with
-// random noise.
-//
-// The result is a 4-D tensor of shape `[batch_size, glimpse_height,
-// glimpse_width, channels]`. The channels and batch dimensions are the
-// same as that of the input tensor. The height and width of the output
-// windows are specified in the `size` parameter.
-//
-// The argument `normalized` and `centered` controls how the windows are built:
-//
-// * If the coordinates are normalized but not centered, 0.0 and 1.0
-//   correspond to the minimum and maximum of each height and width
-//   dimension.
-// * If the coordinates are both normalized and centered, they range from
-//   -1.0 to 1.0. The coordinates (-1.0, -1.0) correspond to the upper
-//   left corner, the lower right corner is located at (1.0, 1.0) and the
-//   center is at (0, 0).
-// * If the coordinates are not normalized they are interpreted as
-//   numbers of pixels.
-//
-// Arguments:
-//	input: A 4-D float tensor of shape `[batch_size, height, width, channels]`.
-//	size: A 1-D tensor of 2 elements containing the size of the glimpses
-// to extract.  The glimpse height must be specified first, following
-// by the glimpse width.
-//	offsets: A 2-D integer tensor of shape `[batch_size, 2]` containing
-// the y, x locations of the center of each window.
-//
-// Returns A tensor representing the glimpses `[batch_size,
-// glimpse_height, glimpse_width, channels]`.
-func ExtractGlimpse(scope *Scope, input tf.Output, size tf.Output, offsets tf.Output, optional ...ExtractGlimpseAttr) (glimpse tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "ExtractGlimpse",
-		Input: []tf.Input{
-			input, size, offsets,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// MaxPoolGradAttr is an optional argument to MaxPoolGrad.
-type MaxPoolGradAttr func(optionalAttr)
-
-// MaxPoolGradDataFormat sets the optional data_format attribute to value.
-//
-// value: Specify the data format of the input and output data. With the
-// default format "NHWC", the data is stored in the order of:
-//     [batch, in_height, in_width, in_channels].
-// Alternatively, the format could be "NCHW", the data storage order of:
-//     [batch, in_channels, in_height, in_width].
-// If not specified, defaults to "NHWC"
-func MaxPoolGradDataFormat(value string) MaxPoolGradAttr {
-	return func(m optionalAttr) {
-		m["data_format"] = value
-	}
-}
-
-// Computes gradients of the maxpooling function.
-//
-// Arguments:
-//	orig_input: The original input tensor.
-//	orig_output: The original output tensor.
-//	grad: 4-D.  Gradients w.r.t. the output of `max_pool`.
-//	ksize: The size of the window for each dimension of the input tensor.
-//	strides: The stride of the sliding window for each dimension of the
-// input tensor.
-//	padding: The type of padding algorithm to use.
-//
-// Returns Gradients w.r.t. the input to `max_pool`.
-func MaxPoolGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPoolGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "MaxPoolGrad",
-		Input: []tf.Input{
-			orig_input, orig_output, grad,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// CropAndResizeAttr is an optional argument to CropAndResize.
-type CropAndResizeAttr func(optionalAttr)
-
-// CropAndResizeMethod sets the optional method attribute to value.
-//
-// value: A string specifying the interpolation method. Only 'bilinear' is
-// supported for now.
-// If not specified, defaults to "bilinear"
-func CropAndResizeMethod(value string) CropAndResizeAttr {
-	return func(m optionalAttr) {
-		m["method"] = value
-	}
-}
-
-// CropAndResizeExtrapolationValue sets the optional extrapolation_value attribute to value.
-//
-// value: Value used for extrapolation, when applicable.
-// If not specified, defaults to 0
-func CropAndResizeExtrapolationValue(value float32) CropAndResizeAttr {
-	return func(m optionalAttr) {
-		m["extrapolation_value"] = value
-	}
-}
-
-// Extracts crops from the input image tensor and bilinearly resizes them (possibly
-//
-// with aspect ratio change) to a common output size specified by `crop_size`. This
-// is more general than the `crop_to_bounding_box` op which extracts a fixed size
-// slice from the input image and does not allow resizing or aspect ratio change.
-//
-// Returns a tensor with `crops` from the input `image` at positions defined at the
-// bounding box locations in `boxes`. The cropped boxes are all resized (with
-// bilinear interpolation) to a fixed `size = [crop_height, crop_width]`. The
-// result is a 4-D tensor `[num_boxes, crop_height, crop_width, depth]`.
-//
-// Arguments:
-//	image: A 4-D tensor of shape `[batch, image_height, image_width, depth]`.
-// Both `image_height` and `image_width` need to be positive.
-//	boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
-// specifies the coordinates of a box in the `box_ind[i]` image and is specified
-// in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
-// `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
-// `[0, 1]` interval of normalized image height is mapped to
-// `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
-// which case the sampled crop is an up-down flipped version of the original
-// image. The width dimension is treated similarly. Normalized coordinates
-// outside the `[0, 1]` range are allowed, in which case we use
-// `extrapolation_value` to extrapolate the input image values.
-//	box_ind: A 1-D tensor of shape `[num_boxes]` with int32 values in `[0, batch)`.
-// The value of `box_ind[i]` specifies the image that the `i`-th box refers to.
-//	crop_size: A 1-D tensor of 2 elements, `size = [crop_height, crop_width]`. All
-// cropped image patches are resized to this size. The aspect ratio of the image
-// content is not preserved. Both `crop_height` and `crop_width` need to be
-// positive.
-//
-// Returns A 4-D tensor of shape `[num_boxes, crop_height, crop_width, depth]`.
-func CropAndResize(scope *Scope, image tf.Output, boxes tf.Output, box_ind tf.Output, crop_size tf.Output, optional ...CropAndResizeAttr) (crops tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "CropAndResize",
-		Input: []tf.Input{
-			image, boxes, box_ind, crop_size,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-- 
GitLab


From 4b046fb5aac1c204c9a48ba92091be97eee477c7 Mon Sep 17 00:00:00 2001
From: Sergio Guadarrama <sguada@google.com>
Date: Mon, 17 Apr 2017 15:02:27 -0800
Subject: [PATCH 0477/1563] Add Huber Loss to tf.losses Change: 153400856

---
 tensorflow/python/kernel_tests/losses_test.py | 38 ++++++++++++
 tensorflow/python/ops/losses/losses.py        |  1 +
 tensorflow/python/ops/losses/losses_impl.py   | 62 +++++++++++++++++++
 .../tools/api/golden/tensorflow.losses.pbtxt  |  4 ++
 4 files changed, 105 insertions(+)

diff --git a/tensorflow/python/kernel_tests/losses_test.py b/tensorflow/python/kernel_tests/losses_test.py
index 983808710e..15eeb762d8 100644
--- a/tensorflow/python/kernel_tests/losses_test.py
+++ b/tensorflow/python/kernel_tests/losses_test.py
@@ -753,6 +753,44 @@ class HingeLossTest(test.TestCase):
       self.assertAllClose(loss.eval(), 0.875, atol=1e-3)
 
 
+class HuberLossTest(test.TestCase):
+
+  def testIncompatibleShapes(self):
+    with self.test_session():
+      predictions = constant_op.constant([[-1.0], [2.1]])
+      labels = constant_op.constant([0.0, 1.0])
+      with self.assertRaises(ValueError):
+        _ = losses.huber_loss(labels, predictions).eval()
+
+  def testAllQuadratic(self):
+    with self.test_session():
+      predictions = constant_op.constant([1.5, -1.4, -1.0, 0.0])
+      labels = constant_op.constant([1.0, -1.0, 0.0, 0.5])
+      loss = losses.huber_loss(labels, predictions)
+      self.assertAllClose(loss.eval(),
+                          0.5 * (0.25 + 0.16 + 1.0 + 0.25) / 4., atol=1e-5)
+
+  def testAllLinear(self):
+    with self.test_session():
+      predictions = constant_op.constant([1.5, -1.4, -1.0, 0.0])
+      labels = constant_op.constant([0.0, 1.0, 0.0, 1.5])
+      loss = losses.huber_loss(labels, predictions)
+      self.assertAllClose(loss.eval(),
+                          (1.5 + 2.4 + 1.0 + 1.5) / 4. - 0.5, atol=1e-5)
+
+  def testMixedQuadraticLinear(self):
+    with self.test_session():
+      predictions = constant_op.constant([[1.5, -1.4, -1.0, 0.0],
+                                          [1.5, -1.4, -1.0, 0.0]])
+      labels = constant_op.constant([[1.0, -1.0, 0.0, 0.5],
+                                     [0.0, 1.0, 0.0, 1.5]])
+      loss = losses.huber_loss(labels, predictions)
+      quadratic = 0.5 * (0.25 + 0.16 + 1.0 + 0.25) / 4.
+      linear = (1.5 + 2.4 + 1.0 + 1.5) / 4. - 0.5
+      expected_loss = (quadratic + linear) / 2.
+      self.assertAllClose(loss.eval(), expected_loss, atol=1e-5)
+
+
 class MeanSquaredErrorTest(test.TestCase):
 
   def setUp(self):
diff --git a/tensorflow/python/ops/losses/losses.py b/tensorflow/python/ops/losses/losses.py
index f93ee9fca5..8532c19ad6 100644
--- a/tensorflow/python/ops/losses/losses.py
+++ b/tensorflow/python/ops/losses/losses.py
@@ -21,6 +21,7 @@ Note: All the losses are added to the `GraphKeys.LOSSES` collection by default.
 @@compute_weighted_loss
 @@cosine_distance
 @@hinge_loss
+@@huber_loss
 @@log_loss
 @@mean_pairwise_squared_error
 @@mean_squared_error
diff --git a/tensorflow/python/ops/losses/losses_impl.py b/tensorflow/python/ops/losses/losses_impl.py
index 717671f928..45075d4d3c 100644
--- a/tensorflow/python/ops/losses/losses_impl.py
+++ b/tensorflow/python/ops/losses/losses_impl.py
@@ -283,6 +283,68 @@ def hinge_loss(labels, logits, weights=1.0, scope=None,
         losses, weights, scope, loss_collection, reduction=reduction)
 
 
+def huber_loss(labels, predictions, weights=1.0, delta=1.0, scope=None,
+               loss_collection=ops.GraphKeys.LOSSES,
+               reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+  """Adds a Huber Loss term to the training procedure.
+
+  For each value x in `error=labels-predictions`, the following is calculated:
+
+  ```
+    0.5 * x^2                  if |x| <= d
+    0.5 * d^2 + d * (|x| - d)  if |x| > d
+  ```
+
+  where d is `delta`.
+
+  See: https://en.wikipedia.org/wiki/Huber_loss
+
+  `weights` acts as a coefficient for the loss. If a scalar is provided, then
+  the loss is simply scaled by the given value. If `weights` is a tensor of size
+  [batch_size], then the total loss for each sample of the batch is rescaled
+  by the corresponding element in the `weights` vector. If the shape of
+  `weights` matches the shape of `predictions`, then the loss of each
+  measurable element of `predictions` is scaled by the corresponding value of
+  `weights`.
+
+  Args:
+    labels: The ground truth output tensor, same dimensions as 'predictions'.
+    predictions: The predicted outputs.
+    weights: Optional `Tensor` whose rank is either 0, or the same rank as
+      `labels`, and must be broadcastable to `labels` (i.e., all dimensions must
+      be either `1`, or the same as the corresponding `losses` dimension).
+    delta: `float`, the point where the huber loss function
+      changes from a quadratic to linear.
+    scope: The scope for the operations performed in computing the loss.
+    loss_collection: collection to which the loss will be added.
+    reduction: Type of reduction to apply to loss.
+
+  Returns:
+    A scalar `Tensor` that returns the weighted loss.
+
+  Raises:
+    ValueError: If the shape of `predictions` doesn't match that of `labels` or
+      if the shape of `weights` is invalid.
+  """
+  with ops.name_scope(scope, "huber_loss",
+                      (predictions, labels, weights)) as scope:
+    predictions = math_ops.to_float(predictions)
+    labels = math_ops.to_float(labels)
+    predictions.get_shape().assert_is_compatible_with(labels.get_shape())
+    error = math_ops.subtract(predictions, labels)
+    abs_error = math_ops.abs(error)
+    quadratic = math_ops.minimum(abs_error, delta)
+    # The following expression is the same in value as
+    # tf.maximum(abs_error - delta, 0), but importantly the gradient for the
+    # expression when abs_error == delta is 0 (for tf.maximum it would be 1).
+    # This is necessary to avoid doubling the gradient, since there is already a
+    # nonzero contribution to the gradient from the quadratic term.
+    linear = (abs_error - quadratic)
+    losses = 0.5 * quadratic**2 + delta * linear
+    return compute_weighted_loss(
+        losses, weights, scope, loss_collection, reduction=reduction)
+
+
 def log_loss(labels, predictions, weights=1.0, epsilon=1e-7, scope=None,
              loss_collection=ops.GraphKeys.LOSSES,
              reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
index ff58644ebd..79443839b9 100644
--- a/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.losses.pbtxt
@@ -40,6 +40,10 @@ tf_module {
     name: "hinge_loss"
     argspec: "args=[\'labels\', \'logits\', \'weights\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
   }
+  member_method {
+    name: "huber_loss"
+    argspec: "args=[\'labels\', \'predictions\', \'weights\', \'delta\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1.0\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
+  }
   member_method {
     name: "log_loss"
     argspec: "args=[\'labels\', \'predictions\', \'weights\', \'epsilon\', \'scope\', \'loss_collection\', \'reduction\'], varargs=None, keywords=None, defaults=[\'1.0\', \'1e-07\', \'None\', \'losses\', \'weighted_sum_by_nonzero_weights\'], "
-- 
GitLab


From ae84106edc892b60976b1635907009888150989f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 15:16:31 -0800
Subject: [PATCH 0478/1563] Modify assertAllClose to handle dicts. Change:
 153402607

---
 tensorflow/python/framework/test_util.py      | 42 ++++++++++++++-----
 tensorflow/python/framework/test_util_test.py | 42 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/framework/test_util.py b/tensorflow/python/framework/test_util.py
index 06fc494a08..c3169e23a5 100644
--- a/tensorflow/python/framework/test_util.py
+++ b/tensorflow/python/framework/test_util.py
@@ -564,15 +564,7 @@ class TensorFlowTestCase(googletest.TestCase):
       a = np.array(a)
     return a
 
-  def assertAllClose(self, a, b, rtol=1e-6, atol=1e-6):
-    """Asserts that two numpy arrays have near values.
-
-    Args:
-      a: a numpy ndarray or anything can be converted to one.
-      b: a numpy ndarray or anything can be converted to one.
-      rtol: relative tolerance.
-      atol: absolute tolerance.
-    """
+  def _assertArrayLikeAllClose(self, a, b, rtol=1e-6, atol=1e-6, msg=None):
     a = self._GetNdArray(a)
     b = self._GetNdArray(b)
     self.assertEqual(a.shape, b.shape, "Shape mismatch: expected %s, got %s." %
@@ -600,7 +592,37 @@ class TensorFlowTestCase(googletest.TestCase):
       print("not close dif = ", np.abs(x - y))
       print("not close tol = ", atol + rtol * np.abs(y))
       print("dtype = %s, shape = %s" % (a.dtype, a.shape))
-      np.testing.assert_allclose(a, b, rtol=rtol, atol=atol)
+      np.testing.assert_allclose(a, b, rtol=rtol, atol=atol, err_msg=msg)
+
+  def assertAllClose(self, a, b, rtol=1e-6, atol=1e-6):
+    """Asserts that two numpy arrays, or dicts of same, have near values.
+
+    This does not support nested dicts.
+
+    Args:
+      a: A numpy ndarray (or anything can be converted to one), or dict of same.
+        Must be a dict iff `b` is a dict.
+      b: A numpy ndarray (or anything can be converted to one), or dict of same.
+        Must be a dict iff `a` is a dict.
+      rtol: relative tolerance.
+      atol: absolute tolerance.
+
+    Raises:
+      ValueError: if only one of `a` and `b` is a dict.
+    """
+    is_a_dict = isinstance(a, dict)
+    if is_a_dict != isinstance(b, dict):
+      raise ValueError("Can't compare dict to non-dict, %s vs %s." % (a, b))
+    if is_a_dict:
+      self.assertItemsEqual(
+          a.keys(), b.keys(),
+          msg="mismatched keys, expected %s, got %s" % (a.keys(), b.keys()))
+      for k in a:
+        self._assertArrayLikeAllClose(
+            a[k], b[k], rtol=rtol, atol=atol,
+            msg="%s: expected %s, got %s." % (k, a, b))
+    else:
+      self._assertArrayLikeAllClose(a, b, rtol=rtol, atol=atol)
 
   def assertAllCloseAccordingToType(self,
                                     a,
diff --git a/tensorflow/python/framework/test_util_test.py b/tensorflow/python/framework/test_util_test.py
index e457b35f00..cccba94fb0 100644
--- a/tensorflow/python/framework/test_util_test.py
+++ b/tensorflow/python/framework/test_util_test.py
@@ -196,7 +196,47 @@ class TestUtilTest(test_util.TensorFlowTestCase):
   def testAllCloseScalars(self):
     self.assertAllClose(7, 7 + 1e-8)
     with self.assertRaisesRegexp(AssertionError, r"Not equal to tolerance"):
-      self.assertAllClose(7, 8)
+      self.assertAllClose(7, 7 + 1e-5)
+
+  def testAllCloseDictToNonDict(self):
+    with self.assertRaisesRegexp(ValueError, r"Can't compare dict to non-dict"):
+      self.assertAllClose(1, {"a": 1})
+    with self.assertRaisesRegexp(ValueError, r"Can't compare dict to non-dict"):
+      self.assertAllClose({"a": 1}, 1)
+
+  def testAllCloseDicts(self):
+    a = 7
+    b = (2., 3.)
+    c = np.ones((3, 2, 4)) * 7.
+    expected = {"a": a, "b": b, "c": c}
+
+    # Identity.
+    self.assertAllClose(expected, expected)
+    self.assertAllClose(expected, dict(expected))
+
+    # With each item removed.
+    for k in expected:
+      actual = dict(expected)
+      del actual[k]
+      with self.assertRaisesRegexp(AssertionError, r"mismatched keys"):
+        self.assertAllClose(expected, actual)
+
+    # With each item changed.
+    with self.assertRaisesRegexp(AssertionError, r"Not equal to tolerance"):
+      self.assertAllClose(expected, {"a": a + 1e-5, "b": b, "c": c})
+    with self.assertRaisesRegexp(AssertionError, r"Shape mismatch"):
+      self.assertAllClose(expected, {"a": a, "b": b + (4.,), "c": c})
+    c_copy = np.array(c)
+    c_copy[1, 1, 1] += 1e-5
+    with self.assertRaisesRegexp(AssertionError, r"Not equal to tolerance"):
+      self.assertAllClose(expected, {"a": a, "b": b, "c": c_copy})
+
+  def testAllCloseNestedDicts(self):
+    a = {"a": 1, "b": 2, "nested": {"d": 3, "e": 4}}
+    with self.assertRaisesRegexp(
+        TypeError,
+        r"inputs could not be safely coerced to any supported types"):
+      self.assertAllClose(a, a)
 
   def testArrayNear(self):
     a = [1, 2]
-- 
GitLab


From fd561221d2fe782d320b97346dfffb41f38d2bcf Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Mon, 17 Apr 2017 15:20:31 -0800
Subject: [PATCH 0479/1563] Refactor Keras initializers to rely on core TF
 initializers; add serialization methods to core TF initializers. Change:
 153403157

---
 tensorflow/contrib/keras/BUILD                |   2 +-
 .../keras/python/keras/initializers.py        | 286 +-----------------
 .../keras/python/keras/initializers_test.py   | 115 +++----
 .../keras/python/keras/integration_test.py    |   8 +-
 .../keras/python/keras/optimizers_test.py     |   2 +-
 tensorflow/python/ops/init_ops.py             | 109 ++++++-
 .../tensorflow.constant_initializer.pbtxt     |   8 +
 .../golden/tensorflow.ones_initializer.pbtxt  |   8 +
 .../tensorflow.orthogonal_initializer.pbtxt   |  10 +-
 ...tensorflow.random_normal_initializer.pbtxt |   8 +
 ...ensorflow.random_uniform_initializer.pbtxt |   8 +
 ...sorflow.truncated_normal_initializer.pbtxt |   8 +
 ...low.uniform_unit_scaling_initializer.pbtxt |   8 +
 .../golden/tensorflow.zeros_initializer.pbtxt |   8 +
 14 files changed, 239 insertions(+), 349 deletions(-)

diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD
index 438e2056c6..5166ba37a3 100644
--- a/tensorflow/contrib/keras/BUILD
+++ b/tensorflow/contrib/keras/BUILD
@@ -134,7 +134,7 @@ py_library(
 
 py_test(
     name = "integration_test",
-    size = "small",
+    size = "medium",
     srcs = ["python/keras/integration_test.py"],
     srcs_version = "PY2AND3",
     tags = ["notsan"],
diff --git a/tensorflow/contrib/keras/python/keras/initializers.py b/tensorflow/contrib/keras/python/keras/initializers.py
index f9cb35e171..b0b71e7cb4 100644
--- a/tensorflow/contrib/keras/python/keras/initializers.py
+++ b/tensorflow/contrib/keras/python/keras/initializers.py
@@ -18,247 +18,20 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import math
-
 import numpy as np
 import six
 
-from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import deserialize_keras_object
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import serialize_keras_object
-from tensorflow.python.framework import tensor_shape
-
-
-class Initializer(object):
-  """Initializer base class: all initializers inherit from this class.
-  """
-
-  def __call__(self, shape, dtype=None):
-    raise NotImplementedError
-
-  def get_config(self):
-    return {}
-
-  @classmethod
-  def from_config(cls, config):
-    return cls(**config)
-
-
-class Zeros(Initializer):
-  """Initializer that generates tensors initialized to 0.
-  """
-
-  def __call__(self, shape, dtype=None):
-    return K.constant(0, shape=shape, dtype=dtype)
-
-
-class Ones(Initializer):
-  """Initializer that generates tensors initialized to 1.
-  """
-
-  def __call__(self, shape, dtype=None):
-    return K.constant(1, shape=shape, dtype=dtype)
-
-
-class Constant(Initializer):
-  """Initializer that generates tensors initialized to a constant value.
-
-  Arguments:
-      value: float; the value of the generator tensors.
-  """
-
-  def __init__(self, value=0):
-    self.value = value
-
-  def __call__(self, shape, dtype=None):
-    return K.constant(self.value, shape=shape, dtype=dtype)
-
-  def get_config(self):
-    return {'value': self.value}
-
-
-class RandomNormal(Initializer):
-  """Initializer that generates tensors with a normal distribution.
-
-  Arguments:
-      mean: a python scalar or a scalar tensor. Mean of the random values
-        to generate.
-      stddev: a python scalar or a scalar tensor. Standard deviation of the
-        random values to generate.
-      seed: A Python integer. Used to seed the random generator.
-  """
-
-  def __init__(self, mean=0., stddev=0.05, seed=None):
-    self.mean = mean
-    self.stddev = stddev
-    self.seed = seed
-
-  def __call__(self, shape, dtype=None):
-    return K.random_normal(
-        shape, self.mean, self.stddev, dtype=dtype, seed=self.seed)
-
-  def get_config(self):
-    return {'mean': self.mean, 'stddev': self.stddev, 'seed': self.seed}
-
-
-class RandomUniform(Initializer):
-  """Initializer that generates tensors with a uniform distribution.
-
-  Arguments:
-      minval: A python scalar or a scalar tensor. Lower bound of the range
-        of random values to generate.
-      maxval: A python scalar or a scalar tensor. Upper bound of the range
-        of random values to generate.  Defaults to 1 for float types.
-      seed: A Python integer. Used to seed the random generator.
-  """
-
-  def __init__(self, minval=-0.05, maxval=0.05, seed=None):
-    self.minval = minval
-    self.maxval = maxval
-    self.seed = seed
-
-  def __call__(self, shape, dtype=None):
-    return K.random_uniform(
-        shape, self.minval, self.maxval, dtype=dtype, seed=self.seed)
-
-  def get_config(self):
-    return {
-        'minval': self.minval,
-        'maxval': self.maxval,
-        'seed': self.seed,
-    }
-
-
-class TruncatedNormal(Initializer):
-  """Initializer that generates a truncated normal distribution.
-
-  These values are similar to values from a `RandomNormal`
-  except that values more than two standard deviations from the mean
-  are discarded and re-drawn. This is the recommended initializer for
-  neural network weights and filters.
-
-  Arguments:
-      mean: a python scalar or a scalar tensor. Mean of the random values
-        to generate.
-      stddev: a python scalar or a scalar tensor. Standard deviation of the
-        random values to generate.
-      seed: A Python integer. Used to seed the random generator.
-  """
-
-  def __init__(self, mean=0., stddev=0.05, seed=None):
-    self.mean = mean
-    self.stddev = stddev
-    self.seed = seed
-
-  def __call__(self, shape, dtype=None):
-    return K.truncated_normal(
-        shape, self.mean, self.stddev, dtype=dtype, seed=self.seed)
-
-  def get_config(self):
-    return {'mean': self.mean, 'stddev': self.stddev, 'seed': self.seed}
-
-
-class VarianceScaling(Initializer):
-  """Initializer capable of adapting its scale to the shape of weights.
-
-  With `distribution="normal"`, samples are drawn from a truncated normal
-  distribution centered on zero, with `stddev = sqrt(scale / n)` where n is:
-
-      - number of input units in the weight tensor, if mode = "fan_in"
-      - number of output units, if mode = "fan_out"
-      - average of the numbers of input and output units, if mode = "fan_avg"
-
-  With `distribution="uniform"`,
-  samples are drawn from a uniform distribution
-  within [-limit, limit], with `limit = sqrt(3 * scale / n)`.
-
-  Arguments:
-      scale: Scaling factor (positive float).
-      mode: One of "fan_in", "fan_out", "fan_avg".
-      distribution: Random distribution to use. One of "normal", "uniform".
-      seed: A Python integer. Used to seed the random generator.
-
-  Raises:
-      ValueError: In case of an invalid value for the "scale", mode" or
-        "distribution" arguments.
-  """
-
-  def __init__(self, scale=1.0, mode='fan_in', distribution='normal',
-               seed=None):
-    if scale <= 0.:
-      raise ValueError('`scale` must be a positive float. Got:', scale)
-    mode = mode.lower()
-    if mode not in {'fan_in', 'fan_out', 'fan_avg'}:
-      raise ValueError('Invalid `mode` argument: '
-                       'expected on of {"fan_in", "fan_out", "fan_avg"} '
-                       'but got', mode)
-    distribution = distribution.lower()
-    if distribution not in {'normal', 'uniform'}:
-      raise ValueError('Invalid `distribution` argument: '
-                       'expected one of {"normal", "uniform"} '
-                       'but got', distribution)
-    self.scale = scale
-    self.mode = mode
-    self.distribution = distribution
-    self.seed = seed
-
-  def __call__(self, shape, dtype=None):
-    fan_in, fan_out = _compute_fans(shape)
-    scale = self.scale
-    if self.mode == 'fan_in':
-      scale /= max(1., fan_in)
-    elif self.mode == 'fan_out':
-      scale /= max(1., fan_out)
-    else:
-      scale /= max(1., float(fan_in + fan_out) / 2)
-    if self.distribution == 'normal':
-      stddev = math.sqrt(scale)
-      return K.truncated_normal(shape, 0., stddev, dtype=dtype, seed=self.seed)
-    else:
-      limit = math.sqrt(3. * scale)
-      return K.random_uniform(shape, -limit, limit, dtype=dtype, seed=self.seed)
-
-  def get_config(self):
-    return {
-        'scale': self.scale,
-        'mode': self.mode,
-        'distribution': self.distribution,
-        'seed': self.seed
-    }
-
-
-class Orthogonal(Initializer):
-  """Initializer that generates a random orthogonal matrix.
-
-  Arguments:
-      gain: Multiplicative factor to apply to the orthogonal matrix.
-      seed: A Python integer. Used to seed the random generator.
-
-  References:
-      Saxe et al., http://arxiv.org/abs/1312.6120
-  """
-
-  def __init__(self, gain=1., seed=None):
-    self.gain = gain
-    self.seed = seed
-
-  def __call__(self, shape, dtype=None):
-    num_rows = 1
-    for dim in shape[:-1]:
-      num_rows *= dim
-    num_cols = shape[-1]
-    flat_shape = (num_rows, num_cols)
-    if self.seed is not None:
-      np.random.seed(self.seed)
-    a = np.random.normal(0.0, 1.0, flat_shape)
-    u, _, v = np.linalg.svd(a, full_matrices=False)
-    # Pick the one with the correct shape.
-    q = u if u.shape == flat_shape else v
-    q = q.reshape(shape)
-    return self.gain * q[:shape[0], :shape[1]]
-
-  def get_config(self):
-    return {'gain': self.gain, 'seed': self.seed}
+from tensorflow.python.ops.init_ops import Constant
+from tensorflow.python.ops.init_ops import Initializer
+from tensorflow.python.ops.init_ops import Ones
+from tensorflow.python.ops.init_ops import Orthogonal
+from tensorflow.python.ops.init_ops import RandomNormal
+from tensorflow.python.ops.init_ops import RandomUniform
+from tensorflow.python.ops.init_ops import TruncatedNormal
+from tensorflow.python.ops.init_ops import VarianceScaling
+from tensorflow.python.ops.init_ops import Zeros
 
 
 class Identity(Initializer):
@@ -406,47 +179,6 @@ orthogonal = Orthogonal
 # Utility functions
 
 
-def _compute_fans(shape, data_format='channels_last'):
-  """Computes the number of input and output units for a weight shape.
-
-  Arguments:
-      shape: Integer shape tuple.
-      data_format: Image data format to use for convolution kernels.
-          Note that all kernels in Keras are standardized on the
-          `channels_last` ordering (even when inputs are set
-          to `channels_first`).
-
-  Returns:
-      A tuple of scalars, `(fan_in, fan_out)`.
-
-  Raises:
-      ValueError: in case of invalid `data_format` argument.
-  """
-  shape = tensor_shape.TensorShape(shape).as_list()
-  if len(shape) == 2:
-    fan_in = shape[0]
-    fan_out = shape[1]
-  elif len(shape) in {3, 4, 5}:
-    # Assuming convolution kernels (1D, 2D or 3D).
-    # TH kernel shape: (depth, input_depth, ...)
-    # TF kernel shape: (..., input_depth, depth)
-    if data_format == 'channels_first':
-      receptive_field_size = np.prod(shape[2:])
-      fan_in = shape[1] * receptive_field_size
-      fan_out = shape[0] * receptive_field_size
-    elif data_format == 'channels_last':
-      receptive_field_size = np.prod(shape[:2])
-      fan_in = shape[-2] * receptive_field_size
-      fan_out = shape[-1] * receptive_field_size
-    else:
-      raise ValueError('Invalid data_format: ' + data_format)
-  else:
-    # No specific assumptions.
-    fan_in = math.sqrt(np.prod(shape))
-    fan_out = math.sqrt(np.prod(shape))
-  return fan_in, fan_out
-
-
 def serialize(initializer):
   return serialize_keras_object(initializer)
 
diff --git a/tensorflow/contrib/keras/python/keras/initializers_test.py b/tensorflow/contrib/keras/python/keras/initializers_test.py
index 7436fbb390..c9f50c28ea 100644
--- a/tensorflow/contrib/keras/python/keras/initializers_test.py
+++ b/tensorflow/contrib/keras/python/keras/initializers_test.py
@@ -21,121 +21,132 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.contrib.keras.python import keras
+from tensorflow.python.ops import init_ops
 from tensorflow.python.platform import test
 
 
-def _runner(init, shape, target_mean=None, target_std=None,
-            target_max=None, target_min=None):
-  variable = keras.backend.variable(init(shape))
-  output = keras.backend.get_value(variable)
-  lim = 3e-2
-  if target_std is not None:
-    assert abs(output.std() - target_std) < lim, output.std()
-  if target_mean is not None:
-    assert abs(output.mean() - target_mean) < lim, output.mean()
-  if target_max is not None:
-    assert abs(output.max() - target_max) < lim, output.max()
-  if target_min is not None:
-    assert abs(output.min() - target_min) < lim, output.min()
-
-
 class KerasInitializersTest(test.TestCase):
 
+  def _runner(self, init, shape, target_mean=None, target_std=None,
+              target_max=None, target_min=None):
+    variable = keras.backend.variable(init(shape))
+    output = keras.backend.get_value(variable)
+    lim = 3e-2
+    if target_std is not None:
+      self.assertGreater(lim, abs(output.std() - target_std))
+    if target_mean is not None:
+      self.assertGreater(lim, abs(output.mean() - target_mean))
+    if target_max is not None:
+      self.assertGreater(lim, abs(output.max() - target_max))
+    if target_min is not None:
+      self.assertGreater(lim, abs(output.min() - target_min))
+
+    # Test serialization (assumes deterministic behavior).
+    config = init.get_config()
+    reconstructed_init = init.__class__.from_config(config)
+    variable = keras.backend.variable(reconstructed_init(shape))
+    output_2 = keras.backend.get_value(variable)
+    self.assertAllClose(output, output_2, atol=1e-4)
+
   def test_uniform(self):
     tensor_shape = (9, 6, 7)
     with self.test_session():
-      _runner(keras.initializers.RandomUniform(minval=-1, maxval=1, seed=124),
-              tensor_shape,
-              target_mean=0., target_max=1, target_min=-1)
+      self._runner(keras.initializers.RandomUniform(minval=-1,
+                                                    maxval=1,
+                                                    seed=124),
+                   tensor_shape,
+                   target_mean=0., target_max=1, target_min=-1)
 
   def test_normal(self):
     tensor_shape = (8, 12, 99)
     with self.test_session():
-      _runner(keras.initializers.RandomNormal(mean=0, stddev=1, seed=153),
-              tensor_shape,
-              target_mean=0., target_std=1)
+      self._runner(keras.initializers.RandomNormal(mean=0, stddev=1, seed=153),
+                   tensor_shape,
+                   target_mean=0., target_std=1)
 
   def test_truncated_normal(self):
     tensor_shape = (12, 99, 7)
     with self.test_session():
-      _runner(keras.initializers.TruncatedNormal(mean=0, stddev=1, seed=126),
-              tensor_shape,
-              target_mean=0., target_std=None, target_max=2)
+      self._runner(keras.initializers.TruncatedNormal(mean=0,
+                                                      stddev=1,
+                                                      seed=126),
+                   tensor_shape,
+                   target_mean=0., target_std=None, target_max=2)
 
   def test_constant(self):
     tensor_shape = (5, 6, 4)
     with self.test_session():
-      _runner(keras.initializers.Constant(2), tensor_shape,
-              target_mean=2, target_max=2, target_min=2)
+      self._runner(keras.initializers.Constant(2), tensor_shape,
+                   target_mean=2, target_max=2, target_min=2)
 
   def test_lecun_uniform(self):
     tensor_shape = (5, 6, 4, 2)
     with self.test_session():
-      fan_in, _ = keras.initializers._compute_fans(tensor_shape)
+      fan_in, _ = init_ops._compute_fans(tensor_shape)
       scale = np.sqrt(3. / fan_in)
-      _runner(keras.initializers.lecun_uniform(seed=123), tensor_shape,
-              target_mean=0., target_max=scale, target_min=-scale)
+      self._runner(keras.initializers.lecun_uniform(seed=123), tensor_shape,
+                   target_mean=0., target_max=scale, target_min=-scale)
 
   def test_glorot_uniform(self):
     tensor_shape = (5, 6, 4, 2)
     with self.test_session():
-      fan_in, fan_out = keras.initializers._compute_fans(tensor_shape)
+      fan_in, fan_out = init_ops._compute_fans(tensor_shape)
       scale = np.sqrt(6. / (fan_in + fan_out))
-      _runner(keras.initializers.glorot_uniform(seed=123), tensor_shape,
-              target_mean=0., target_max=scale, target_min=-scale)
+      self._runner(keras.initializers.glorot_uniform(seed=123), tensor_shape,
+                   target_mean=0., target_max=scale, target_min=-scale)
 
   def test_he_uniform(self):
     tensor_shape = (5, 6, 4, 2)
     with self.test_session():
-      fan_in, _ = keras.initializers._compute_fans(tensor_shape)
+      fan_in, _ = init_ops._compute_fans(tensor_shape)
       scale = np.sqrt(6. / fan_in)
-      _runner(keras.initializers.he_uniform(seed=123), tensor_shape,
-              target_mean=0., target_max=scale, target_min=-scale)
+      self._runner(keras.initializers.he_uniform(seed=123), tensor_shape,
+                   target_mean=0., target_max=scale, target_min=-scale)
 
   def test_glorot_normal(self):
     tensor_shape = (5, 6, 4, 2)
     with self.test_session():
-      fan_in, fan_out = keras.initializers._compute_fans(tensor_shape)
+      fan_in, fan_out = init_ops._compute_fans(tensor_shape)
       scale = np.sqrt(2. / (fan_in + fan_out))
-      _runner(keras.initializers.glorot_normal(seed=123), tensor_shape,
-              target_mean=0., target_std=None, target_max=2 * scale)
+      self._runner(keras.initializers.glorot_normal(seed=123), tensor_shape,
+                   target_mean=0., target_std=None, target_max=2 * scale)
 
   def test_he_normal(self):
     tensor_shape = (5, 6, 4, 2)
     with self.test_session():
-      fan_in, _ = keras.initializers._compute_fans(tensor_shape)
+      fan_in, _ = init_ops._compute_fans(tensor_shape)
       scale = np.sqrt(2. / fan_in)
-      _runner(keras.initializers.he_normal(seed=123), tensor_shape,
-              target_mean=0., target_std=None, target_max=2 * scale)
+      self._runner(keras.initializers.he_normal(seed=123), tensor_shape,
+                   target_mean=0., target_std=None, target_max=2 * scale)
 
   def test_orthogonal(self):
-    tensor_shape = (7, 8)
+    tensor_shape = (10, 10)
     with self.test_session():
-      _runner(keras.initializers.orthogonal(seed=123), tensor_shape,
-              target_mean=0.)
+      self._runner(keras.initializers.orthogonal(seed=123), tensor_shape,
+                   target_mean=0.)
 
   def test_identity(self):
     with self.test_session():
       tensor_shape = (3, 4, 5)
       with self.assertRaises(ValueError):
-        _runner(keras.initializers.identity(), tensor_shape,
-                target_mean=1. / tensor_shape[0], target_max=1.)
+        self._runner(keras.initializers.identity(), tensor_shape,
+                     target_mean=1. / tensor_shape[0], target_max=1.)
 
       tensor_shape = (3, 3)
-      _runner(keras.initializers.identity(), tensor_shape,
-              target_mean=1. / tensor_shape[0], target_max=1.)
+      self._runner(keras.initializers.identity(), tensor_shape,
+                   target_mean=1. / tensor_shape[0], target_max=1.)
 
   def test_zero(self):
     tensor_shape = (4, 5)
     with self.test_session():
-      _runner(keras.initializers.zeros(), tensor_shape,
-              target_mean=0., target_max=0.)
+      self._runner(keras.initializers.zeros(), tensor_shape,
+                   target_mean=0., target_max=0.)
 
   def test_one(self):
     tensor_shape = (4, 5)
     with self.test_session():
-      _runner(keras.initializers.ones(), tensor_shape,
-              target_mean=1., target_max=1.)
+      self._runner(keras.initializers.ones(), tensor_shape,
+                   target_mean=1., target_max=1.)
 
 
 if __name__ == '__main__':
diff --git a/tensorflow/contrib/keras/python/keras/integration_test.py b/tensorflow/contrib/keras/python/keras/integration_test.py
index 3a3d36ca1c..16d0713b31 100644
--- a/tensorflow/contrib/keras/python/keras/integration_test.py
+++ b/tensorflow/contrib/keras/python/keras/integration_test.py
@@ -33,13 +33,13 @@ class KerasIntegrationTest(test.TestCase):
       (x_train, y_train), (x_test, y_test) = testing_utils.get_test_data(
           train_samples=200,
           test_samples=100,
-          input_shape=(8,),
+          input_shape=(10,),
           num_classes=2)
       y_train = keras.utils.to_categorical(y_train)
       y_test = keras.utils.to_categorical(y_test)
 
       model = keras.models.Sequential([
-          keras.layers.Dense(8,
+          keras.layers.Dense(16,
                              activation='relu',
                              input_shape=x_train.shape[1:]),
           keras.layers.Dropout(0.1),
@@ -59,13 +59,13 @@ class KerasIntegrationTest(test.TestCase):
       (x_train, y_train), (x_test, y_test) = testing_utils.get_test_data(
           train_samples=200,
           test_samples=100,
-          input_shape=(8,),
+          input_shape=(10,),
           num_classes=2)
       y_train = keras.utils.to_categorical(y_train)
       y_test = keras.utils.to_categorical(y_test)
 
       inputs = keras.layers.Input(shape=x_train.shape[1:])
-      x = keras.layers.Dense(8, activation='relu')(inputs)
+      x = keras.layers.Dense(16, activation='relu')(inputs)
       x = keras.layers.Dropout(0.1)(x)
       outputs = keras.layers.Dense(y_train.shape[-1], activation='softmax')(x)
 
diff --git a/tensorflow/contrib/keras/python/keras/optimizers_test.py b/tensorflow/contrib/keras/python/keras/optimizers_test.py
index b3aaddb7c0..af5e3c99b9 100644
--- a/tensorflow/contrib/keras/python/keras/optimizers_test.py
+++ b/tensorflow/contrib/keras/python/keras/optimizers_test.py
@@ -41,7 +41,7 @@ def _test_optimizer(optimizer, target=0.75):
                                                       input_shape=(10,),
                                                       num_classes=2)
   y_train = keras.utils.to_categorical(y_train)
-  model = _get_model(x_train.shape[1], 10, y_train.shape[1])
+  model = _get_model(x_train.shape[1], 20, y_train.shape[1])
   model.compile(loss='categorical_crossentropy',
                 optimizer=optimizer,
                 metrics=['accuracy'])
diff --git a/tensorflow/python/ops/init_ops.py b/tensorflow/python/ops/init_ops.py
index 60175965da..67fff9c803 100644
--- a/tensorflow/python/ops/init_ops.py
+++ b/tensorflow/python/ops/init_ops.py
@@ -49,30 +49,65 @@ class Initializer(object):
   def __call__(self, shape, dtype=None, partition_info=None):
     raise NotImplementedError
 
+  def get_config(self):
+    """Returns the configuration of the initializer as a JSON-serializable dict.
+
+    Returns:
+      A JSON-serializable Python dict.
+    """
+    return {}
+
+  @classmethod
+  def from_config(cls, config):
+    """Instantiates an initializer from a configuration dictionary.
+
+    Example:
+
+    ```
+    initializer = RandomUniform(-1, 1)
+    config = initializer.get_config()
+    initializer = RandomUniform.from_config(config)
+    ```
+
+    Arguments:
+      config: A Python dictionary.
+        It will typically be the output of `get_config`.
+
+    Returns:
+      An Initializer instance.
+    """
+    return cls(**config)
+
 
 class Zeros(Initializer):
   """Initializer that generates tensors initialized to 0."""
 
   def __init__(self, dtype=dtypes.float32):
-    self.dtype = dtype
+    self.dtype = dtypes.as_dtype(dtype)
 
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
       dtype = self.dtype
     return array_ops.zeros(shape, dtype)
 
+  def get_config(self):
+    return {"dtype": self.dtype.name}
+
 
 class Ones(Initializer):
   """Initializer that generates tensors initialized to 1."""
 
   def __init__(self, dtype=dtypes.float32):
-    self.dtype = dtype
+    self.dtype = dtypes.as_dtype(dtype)
 
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
       dtype = self.dtype
     return array_ops.ones(shape, dtype)
 
+  def get_config(self):
+    return {"dtype": self.dtype.name}
+
 
 class Constant(Initializer):
   """Initializer that generates tensors with constant values.
@@ -151,14 +186,27 @@ class Constant(Initializer):
 
   def __init__(self, value=0, dtype=dtypes.float32, verify_shape=False):
     self.value = value
-    self.dtype = dtype
-    self.verify_shape = verify_shape
+    self.dtype = dtypes.as_dtype(dtype)
+    self._verify_shape = verify_shape
 
-  def __call__(self, shape, dtype=None, partition_info=None):
+  def __call__(self, shape,
+               dtype=None,
+               partition_info=None,
+               verify_shape=None):
     if dtype is None:
       dtype = self.dtype
+    if verify_shape is None:
+      verify_shape = self._verify_shape
     return constant_op.constant(self.value, dtype=dtype, shape=shape,
-                                verify_shape=self.verify_shape)
+                                verify_shape=verify_shape)
+
+  def get_config(self):
+    # We don't include `verify_shape` for compatibility with Keras.
+    # `verify_shape` should be passed as an argument to `__call__` rather
+    # than as a constructor argument: conceptually it isn't a property
+    # of the initializer.
+    return {"value": self.value,
+            "dtype": self.dtype.name}
 
 
 class RandomUniform(Initializer):
@@ -179,7 +227,7 @@ class RandomUniform(Initializer):
     self.minval = minval
     self.maxval = maxval
     self.seed = seed
-    self.dtype = dtype
+    self.dtype = dtypes.as_dtype(dtype)
 
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
@@ -187,6 +235,12 @@ class RandomUniform(Initializer):
     return random_ops.random_uniform(shape, self.minval, self.maxval,
                                      dtype, seed=self.seed)
 
+  def get_config(self):
+    return {"minval": self.minval,
+            "maxval": self.maxval,
+            "seed": self.seed,
+            "dtype": self.dtype.name}
+
 
 class RandomNormal(Initializer):
   """Initializer that generates tensors with a normal distribution.
@@ -206,7 +260,7 @@ class RandomNormal(Initializer):
     self.mean = mean
     self.stddev = stddev
     self.seed = seed
-    self.dtype = _assert_float_dtype(dtype)
+    self.dtype = _assert_float_dtype(dtypes.as_dtype(dtype))
 
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
@@ -214,6 +268,12 @@ class RandomNormal(Initializer):
     return random_ops.random_normal(shape, self.mean, self.stddev,
                                     dtype, seed=self.seed)
 
+  def get_config(self):
+    return {"mean": self.mean,
+            "stddev": self.stddev,
+            "seed": self.seed,
+            "dtype": self.dtype.name}
+
 
 class TruncatedNormal(Initializer):
   """Initializer that generates a truncated normal distribution.
@@ -238,7 +298,7 @@ class TruncatedNormal(Initializer):
     self.mean = mean
     self.stddev = stddev
     self.seed = seed
-    self.dtype = _assert_float_dtype(dtype)
+    self.dtype = _assert_float_dtype(dtypes.as_dtype(dtype))
 
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
@@ -246,6 +306,12 @@ class TruncatedNormal(Initializer):
     return random_ops.truncated_normal(shape, self.mean, self.stddev,
                                        dtype, seed=self.seed)
 
+  def get_config(self):
+    return {"mean": self.mean,
+            "stddev": self.stddev,
+            "seed": self.seed,
+            "dtype": self.dtype.name}
+
 
 class UniformUnitScaling(Initializer):
   """Initializer that generates tensors without scaling variance.
@@ -277,7 +343,7 @@ class UniformUnitScaling(Initializer):
   def __init__(self, factor=1.0, seed=None, dtype=dtypes.float32):
     self.factor = factor
     self.seed = seed
-    self.dtype = _assert_float_dtype(dtype)
+    self.dtype = _assert_float_dtype(dtypes.as_dtype(dtype))
 
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
@@ -298,6 +364,11 @@ class UniformUnitScaling(Initializer):
     return random_ops.random_uniform(shape, -max_val, max_val,
                                      dtype, seed=self.seed)
 
+  def get_config(self):
+    return {"factor": self.factor,
+            "seed": self.seed,
+            "dtype": self.dtype.name}
+
 
 class VarianceScaling(Initializer):
   """Initializer capable of adapting its scale to the shape of weights tensors.
@@ -342,7 +413,7 @@ class VarianceScaling(Initializer):
     self.mode = mode
     self.distribution = distribution
     self.seed = seed
-    self.dtype = _assert_float_dtype(dtype)
+    self.dtype = _assert_float_dtype(dtypes.as_dtype(dtype))
 
   def __call__(self, shape, dtype=None, partition_info=None):
     if dtype is None:
@@ -367,6 +438,13 @@ class VarianceScaling(Initializer):
       return random_ops.random_uniform(shape, -limit, limit,
                                        dtype, seed=self.seed)
 
+  def get_config(self):
+    return {"scale": self.scale,
+            "mode": self.mode,
+            "distribution": self.distribution,
+            "seed": self.seed,
+            "dtype": self.dtype.name}
+
 
 class Orthogonal(Initializer):
   """Initializer that generates an orthogonal matrix.
@@ -388,9 +466,9 @@ class Orthogonal(Initializer):
       for behavior.
   """
 
-  def __init__(self, gain=1.0, dtype=dtypes.float32, seed=None):
+  def __init__(self, gain=1.0, seed=None, dtype=dtypes.float32):
     self.gain = gain
-    self.dtype = _assert_float_dtype(dtype)
+    self.dtype = _assert_float_dtype(dtypes.as_dtype(dtype))
     self.seed = seed
 
   def __call__(self, shape, dtype=None, partition_info=None):
@@ -421,6 +499,11 @@ class Orthogonal(Initializer):
       q = array_ops.transpose(v)
     return self.gain * array_ops.reshape(q, shape)
 
+  def get_config(self):
+    return {"gain": self.gain,
+            "seed": self.seed,
+            "dtype": self.dtype.name}
+
 
 # Aliases.
 
diff --git a/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
index d34bfe5147..00ec669b16 100644
--- a/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.constant_initializer.pbtxt
@@ -7,4 +7,12 @@ tf_class {
     name: "__init__"
     argspec: "args=[\'self\', \'value\', \'dtype\', \'verify_shape\'], varargs=None, keywords=None, defaults=[\'0\', \"<dtype: \'float32\'>\", \'False\'], "
   }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
 }
diff --git a/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
index d84ddc6eb0..210b56242b 100644
--- a/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.ones_initializer.pbtxt
@@ -7,4 +7,12 @@ tf_class {
     name: "__init__"
     argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
   }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
 }
diff --git a/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
index c8e266e70c..13ec7454f4 100644
--- a/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.orthogonal_initializer.pbtxt
@@ -5,6 +5,14 @@ tf_class {
   is_instance: "<type \'object\'>"
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'gain\', \'dtype\', \'seed\'], varargs=None, keywords=None, defaults=[\'1.0\', \"<dtype: \'float32\'>\", \'None\'], "
+    argspec: "args=[\'self\', \'gain\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
+  }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
   }
 }
diff --git a/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
index 70308bc601..5993fdeb9c 100644
--- a/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.random_normal_initializer.pbtxt
@@ -7,4 +7,12 @@ tf_class {
     name: "__init__"
     argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
   }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
 }
diff --git a/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
index 37bb1956e8..a434ed1599 100644
--- a/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.random_uniform_initializer.pbtxt
@@ -7,4 +7,12 @@ tf_class {
     name: "__init__"
     argspec: "args=[\'self\', \'minval\', \'maxval\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \'None\', \"<dtype: \'float32\'>\"], "
   }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
 }
diff --git a/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
index 7c48f4af07..c1e1c230a9 100644
--- a/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.truncated_normal_initializer.pbtxt
@@ -7,4 +7,12 @@ tf_class {
     name: "__init__"
     argspec: "args=[\'self\', \'mean\', \'stddev\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0.0\', \'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
   }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
 }
diff --git a/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
index 4558db619e..e1b18dc92f 100644
--- a/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.uniform_unit_scaling_initializer.pbtxt
@@ -7,4 +7,12 @@ tf_class {
     name: "__init__"
     argspec: "args=[\'self\', \'factor\', \'seed\', \'dtype\'], varargs=None, keywords=None, defaults=[\'1.0\', \'None\', \"<dtype: \'float32\'>\"], "
   }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
 }
diff --git a/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
index 8313009a68..e229b02cee 100644
--- a/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.zeros_initializer.pbtxt
@@ -7,4 +7,12 @@ tf_class {
     name: "__init__"
     argspec: "args=[\'self\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
   }
+  member_method {
+    name: "from_config"
+    argspec: "args=[\'cls\', \'config\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "get_config"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
 }
-- 
GitLab


From 6856a110178f67dedcfca366cce356766a25d80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Mon, 17 Apr 2017 15:54:40 -0800
Subject: [PATCH 0480/1563] Fix bug where if all data=0 then the y-scale does
 not display properly. Change: 153407154

---
 .../tensorboard/components/vz_line_chart/vz-chart-helpers.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts b/tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts
index 70defc4d3b..688a00714b 100644
--- a/tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts
+++ b/tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts
@@ -93,7 +93,7 @@ module VZ.ChartHelpers {
       // If b===a, we would create an empty range. We instead select the range
       // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
       // extra padding on the top and bottom of the plot.
-      padding = Math.abs(a) * 1.1;
+      padding = Math.abs(a) * 1.1 + 1.1;
     } else {
       padding = span * 0.2;
     }
-- 
GitLab


From 554b4ab833520e3ee6fc84b146e300bb2fcdd58b Mon Sep 17 00:00:00 2001
From: "Thomas H. P. Andersen" <phomes@gmail.com>
Date: Tue, 18 Apr 2017 02:24:43 +0200
Subject: [PATCH 0481/1563] fix filter position for Im2Col (#9181)

cac52fdebb292bc7706383d07c7987be66882085 fixed the filter position for
the reference class but the same problem exists in the Im2Col class.

This patch makes the calculation of the filter position consistent
with the reference quantized class and the gemm/fused conv_ops
classes.
---
 tensorflow/core/kernels/quantized_conv_ops.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/kernels/quantized_conv_ops.cc b/tensorflow/core/kernels/quantized_conv_ops.cc
index afa1f65aef..56a7e161df 100644
--- a/tensorflow/core/kernels/quantized_conv_ops.cc
+++ b/tensorflow/core/kernels/quantized_conv_ops.cc
@@ -233,9 +233,9 @@ class Im2ColConvFunctor {
     int filter_top_offset;
     if (padding == VALID) {
       filter_left_offset =
-          ((output_width - 1) * stride + filter_width - input_width) / 2;
+          ((output_width - 1) * stride + filter_width - input_width + 1) / 2;
       filter_top_offset =
-          ((output_height - 1) * stride + filter_height - input_height) / 2;
+          ((output_height - 1) * stride + filter_height - input_height + 1) / 2;
     } else {
       filter_left_offset =
           ((output_width - 1) * stride + filter_width - input_width) / 2;
-- 
GitLab


From 7448b27527d3003e662eff214735dbc991912098 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 16:17:01 -0800
Subject: [PATCH 0482/1563] API Update Change: 153409674

---
 .../layers/python/layers/feature_column.py       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 32839b251a..fe09ebb72c 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -39,9 +39,13 @@ should choose depends on (1) the feature type and (2) the model type.
      age_column = real_valued_column("age")
 
    To feed sparse features into DNN models, wrap the column with
-   `embedding_column` or `one_hot_column`. `one_hot_column` is recommended for
-   features with only a few possible values. For features with many possible
-   values, `embedding_column` is recommended.
+   `embedding_column` or `one_hot_column`. `one_hot_column` will create a dense
+   boolean tensor with an entry for each possible value, and thus the
+   computation cost is linear in the number of possible values versus the number
+   of values that occur in the sparse tensor. Thus using a "one_hot_column" is
+   only recommended for features with only a few possible values. For features
+   with many possible values or for very sparse features, `embedding_column` is
+   recommended.
 
      embedded_dept_column = embedding_column(
        sparse_column_with_keys("department", ["math", "philosphy", ...]),
@@ -49,7 +53,9 @@ should choose depends on (1) the feature type and (2) the model type.
 
 * Wide (aka linear) models (`LinearClassifier`, `LinearRegressor`).
 
-   Sparse features can be fed directly into linear models.
+   Sparse features can be fed directly into linear models. When doing so
+   an embedding_lookups are used to efficiently perform the sparse matrix
+   multiplication.
 
      dept_column = sparse_column_with_keys("department",
        ["math", "philosophy", "english"])
@@ -856,7 +862,7 @@ class _OneHotColumn(_FeatureColumn,
       output_rank: the desired rank of the output `Tensor`.
 
     Returns:
-      A multihot Tensor to be fed into the first layer of neural network.
+      A multi-hot Tensor to be fed into the first layer of neural network.
 
     Raises:
       ValueError: When using one_hot_column with weighted_sparse_column.
-- 
GitLab


From 949d457dc9b1d37e7d9c50c963b2007756baf25b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 16:18:32 -0800
Subject: [PATCH 0483/1563] Add utility to get current name scope in
 tf.contrib.framework. Change: 153409845

---
 tensorflow/contrib/framework/__init__.py       |  1 +
 tensorflow/contrib/framework/python/ops/ops.py | 18 ++++++++++++++++++
 .../contrib/framework/python/ops/ops_test.py   |  9 +++++++++
 tensorflow/python/framework/ops.py             | 17 +++++++++++++++++
 tensorflow/python/framework/ops_test.py        | 10 ++++++++++
 .../tools/api/golden/tensorflow.-graph.pbtxt   |  4 ++++
 6 files changed, 59 insertions(+)

diff --git a/tensorflow/contrib/framework/__init__.py b/tensorflow/contrib/framework/__init__.py
index 6fc4814d53..40234f5b48 100644
--- a/tensorflow/contrib/framework/__init__.py
+++ b/tensorflow/contrib/framework/__init__.py
@@ -53,6 +53,7 @@ See the @{$python/contrib.framework} guide.
 @@get_or_create_global_step
 @@get_local_variables
 @@get_model_variables
+@@get_name_scope
 @@get_trainable_variables
 @@get_unique_variable
 @@get_variables_by_name
diff --git a/tensorflow/contrib/framework/python/ops/ops.py b/tensorflow/contrib/framework/python/ops/ops.py
index f403942fe7..2117a24965 100644
--- a/tensorflow/contrib/framework/python/ops/ops.py
+++ b/tensorflow/contrib/framework/python/ops/ops.py
@@ -52,3 +52,21 @@ def get_graph_from_inputs(op_input_list, graph=None):
   """
   # pylint: disable=protected-access
   return ops._get_graph_from_inputs(op_input_list, graph)
+
+
+def get_name_scope():
+  """Returns the current name scope of the default graph.
+
+  For example:
+
+    ```python
+    with tf.name_scope('scope1'):
+      with tf.name_scope('scope2'):
+        print(tf.get_name_scope())
+    ```
+    would print the string `scope1/scope2`.
+
+  Returns:
+    A string represnting the current name scope.
+  """
+  return ops.get_default_graph().get_name_scope()
diff --git a/tensorflow/contrib/framework/python/ops/ops_test.py b/tensorflow/contrib/framework/python/ops/ops_test.py
index 321ca6b82d..19bcb5d22e 100644
--- a/tensorflow/contrib/framework/python/ops/ops_test.py
+++ b/tensorflow/contrib/framework/python/ops/ops_test.py
@@ -57,6 +57,15 @@ class OpsTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, "not from the passed-in graph"):
       ops_lib.get_graph_from_inputs(values, g1)
 
+  def testGetNameScope(self):
+    with ops.name_scope("scope1"):
+      with ops.name_scope("scope2"):
+        with ops.name_scope("scope3"):
+          self.assertEqual("scope1/scope2/scope3", ops_lib.get_name_scope())
+        self.assertEqual("scope1/scope2", ops_lib.get_name_scope())
+      self.assertEqual("scope1", ops_lib.get_name_scope())
+    self.assertEqual("", ops_lib.get_name_scope())
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 08572955d9..ebab40c0aa 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -2907,6 +2907,23 @@ class Graph(object):
         self._names_in_use[name] = 1
     return name
 
+  def get_name_scope(self):
+    """Returns the current name scope.
+
+    For example:
+
+    ```python
+    with tf.name_scope('scope1'):
+      with tf.name_scope('scope2'):
+        print(tf.get_default_graph().get_name_scope())
+    ```
+    would print the string `scope1/scope2`.
+
+    Returns:
+      A string representing the current name scope.
+    """
+    return self._name_stack
+
   @contextlib.contextmanager
   def colocate_with(self, op, ignore_existing=False):
     """Returns a context manager that specifies an op to colocate with.
diff --git a/tensorflow/python/framework/ops_test.py b/tensorflow/python/framework/ops_test.py
index bd4764982f..2cff66dfb7 100644
--- a/tensorflow/python/framework/ops_test.py
+++ b/tensorflow/python/framework/ops_test.py
@@ -1662,6 +1662,16 @@ class NameScopeTest(test_util.TensorFlowTestCase):
       self.assertEqual(es, striped)
       self.assertEqual(ep, ops.prepend_name_scope(striped, name_scope_to_add))
 
+  def testGetNameScope(self):
+    with ops.Graph().as_default() as g:
+      with ops.name_scope("scope1"):
+        with ops.name_scope("scope2"):
+          with ops.name_scope("scope3"):
+            self.assertEqual("scope1/scope2/scope3", g.get_name_scope())
+          self.assertEqual("scope1/scope2", g.get_name_scope())
+        self.assertEqual("scope1", g.get_name_scope())
+      self.assertEqual("", g.get_name_scope())
+
 
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
index 566456a255..9c70782b12 100644
--- a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
@@ -86,6 +86,10 @@ tf_class {
     name: "get_collection_ref"
     argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
   }
+  member_method {
+    name: "get_name_scope"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
   member_method {
     name: "get_operation_by_name"
     argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
-- 
GitLab


From 6656c28260ae93a24d032b44cb96aca87c8d350a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 16:27:15 -0800
Subject: [PATCH 0484/1563] [XLA] Eliminate unary concatenates in the
 AlgebraicSimplifier. Change: 153410715

---
 .../xla/service/algebraic_simplifier.cc       | 14 +++++++++++++
 .../xla/service/algebraic_simplifier_test.cc  | 21 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 22ea09e29b..6acb9bdcba 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -112,6 +112,10 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
 
   Status HandleBroadcast(HloInstruction* broadcast) override;
 
+  Status HandleConcatenate(
+      HloInstruction* concatenate,
+      tensorflow::gtl::ArraySlice<HloInstruction*> operands) override;
+
   Status HandleCopy(HloInstruction* copy, HloInstruction* operand) override;
 
   Status HandleConvert(HloInstruction* convert,
@@ -297,6 +301,16 @@ Status AlgebraicSimplifierVisitor::HandleCopy(HloInstruction* copy,
   return Status::OK();
 }
 
+Status AlgebraicSimplifierVisitor::HandleConcatenate(
+    HloInstruction* concatenate,
+    tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
+  // Unary concatenates are useless.
+  if (operands.size() == 1) {
+    ReplaceInstructionIfSameShape(concatenate, operands[0]);
+  }
+  return Status::OK();
+}
+
 Status AlgebraicSimplifierVisitor::HandleSubtract(HloInstruction* sub,
                                                   HloInstruction* lhs,
                                                   HloInstruction* rhs) {
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index cf74dffb30..3123ee4f87 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -510,6 +510,27 @@ TEST_F(AlgebraicSimplifierTest, RemoveCopy) {
   EXPECT_THAT(computation->root_instruction(), param0);
 }
 
+// Test that unary concatenates are removed.
+TEST_F(AlgebraicSimplifierTest, RemoveUnaryConcatenate) {
+  Shape r1f32 = ShapeUtil::MakeShape(F32, {100});
+  HloComputation::Builder builder(TestName());
+  HloInstruction* param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r1f32, "param0"));
+  builder.AddInstruction(
+      HloInstruction::CreateConcatenate(param0->shape(), {param0}, 0));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Concatenate(param0));
+
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(), param0);
+}
+
 // Test that a simplification which changes layouts is not performed if layout
 // sensitive is true.
 TEST_F(AlgebraicSimplifierTest, CopyWithDifferentLayout) {
-- 
GitLab


From a8b175a7d79032308f147351a85039bc3a29694a Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Mon, 17 Apr 2017 16:27:37 -0800
Subject: [PATCH 0485/1563] Improve graph and session management for retrain.py

Also fixed existing lint errors.
Change: 153410743
---
 .../examples/image_retraining/retrain.py      | 284 ++++++++++--------
 1 file changed, 162 insertions(+), 122 deletions(-)

diff --git a/tensorflow/examples/image_retraining/retrain.py b/tensorflow/examples/image_retraining/retrain.py
index a3a4ba310e..5f4b6bed48 100644
--- a/tensorflow/examples/image_retraining/retrain.py
+++ b/tensorflow/examples/image_retraining/retrain.py
@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Simple transfer learning with an Inception v3 architecture model which
-displays summaries in TensorBoard.
+r"""Simple transfer learning with an Inception v3 architecture model.
+
+With support for TensorBoard.
 
 This example shows how to take a Inception v3 architecture model trained on
 ImageNet images, and train a new top layer that can recognize other classes of
@@ -39,9 +40,20 @@ The subfolder names are important, since they define what label is applied to
 each image, but the filenames themselves don't matter. Once your images are
 prepared, you can run the training with a command like this:
 
+
+```bash
 bazel build tensorflow/examples/image_retraining:retrain && \
 bazel-bin/tensorflow/examples/image_retraining/retrain \
---image_dir ~/flower_photos
+    --image_dir ~/flower_photos
+```
+
+Or, if you have a pip installation of tensorflow, `retrain.py` can be run
+without bazel:
+
+```bash
+python tensorflow/examples/image_retraining/retrain.py \
+    --image_dir ~/flower_photos
+```
 
 You can replace the image_dir argument with any folder containing subfolders of
 images. The label for each image is taken from the name of the subfolder it's
@@ -244,7 +256,7 @@ def create_inception_graph():
     Graph holding the trained Inception network, and various tensors we'll be
     manipulating.
   """
-  with tf.Session() as sess:
+  with tf.Graph().as_default() as graph:
     model_filename = os.path.join(
         FLAGS.model_dir, 'classify_image_graph_def.pb')
     with gfile.FastGFile(model_filename, 'rb') as f:
@@ -254,7 +266,7 @@ def create_inception_graph():
           tf.import_graph_def(graph_def, name='', return_elements=[
               BOTTLENECK_TENSOR_NAME, JPEG_DATA_TENSOR_NAME,
               RESIZED_INPUT_TENSOR_NAME]))
-  return sess.graph, bottleneck_tensor, jpeg_data_tensor, resized_input_tensor
+  return graph, bottleneck_tensor, jpeg_data_tensor, resized_input_tensor
 
 
 def run_bottleneck_on_image(sess, image_data, image_data_tensor,
@@ -315,7 +327,7 @@ def ensure_dir_exists(dir_name):
     os.makedirs(dir_name)
 
 
-def write_list_of_floats_to_file(list_of_floats , file_path):
+def write_list_of_floats_to_file(list_of_floats, file_path):
   """Writes a given list of floats to a binary file.
 
   Args:
@@ -346,18 +358,25 @@ def read_list_of_floats_from_file(file_path):
 
 bottleneck_path_2_bottleneck_values = {}
 
+
 def create_bottleneck_file(bottleneck_path, image_lists, label_name, index,
-                           image_dir, category, sess, jpeg_data_tensor, bottleneck_tensor):
+                           image_dir, category, sess, jpeg_data_tensor,
+                           bottleneck_tensor):
+  """Create a single bottleneck file."""
   print('Creating bottleneck at ' + bottleneck_path)
-  image_path = get_image_path(image_lists, label_name, index, image_dir, category)
+  image_path = get_image_path(image_lists, label_name, index,
+                              image_dir, category)
   if not gfile.Exists(image_path):
     tf.logging.fatal('File does not exist %s', image_path)
   image_data = gfile.FastGFile(image_path, 'rb').read()
-  bottleneck_values = run_bottleneck_on_image(sess, image_data, jpeg_data_tensor, bottleneck_tensor)
+  bottleneck_values = run_bottleneck_on_image(sess, image_data,
+                                              jpeg_data_tensor,
+                                              bottleneck_tensor)
   bottleneck_string = ','.join(str(x) for x in bottleneck_values)
   with open(bottleneck_path, 'w') as bottleneck_file:
     bottleneck_file.write(bottleneck_string)
 
+
 def get_or_create_bottleneck(sess, image_lists, label_name, index, image_dir,
                              category, bottleneck_dir, jpeg_data_tensor,
                              bottleneck_tensor):
@@ -387,25 +406,32 @@ def get_or_create_bottleneck(sess, image_lists, label_name, index, image_dir,
   sub_dir = label_lists['dir']
   sub_dir_path = os.path.join(bottleneck_dir, sub_dir)
   ensure_dir_exists(sub_dir_path)
-  bottleneck_path = get_bottleneck_path(image_lists, label_name, index, bottleneck_dir, category)
+  bottleneck_path = get_bottleneck_path(image_lists, label_name, index,
+                                        bottleneck_dir, category)
   if not os.path.exists(bottleneck_path):
-    create_bottleneck_file(bottleneck_path, image_lists, label_name, index, image_dir, category, sess, jpeg_data_tensor, bottleneck_tensor)
+    create_bottleneck_file(bottleneck_path, image_lists, label_name, index,
+                           image_dir, category, sess, jpeg_data_tensor,
+                           bottleneck_tensor)
   with open(bottleneck_path, 'r') as bottleneck_file:
     bottleneck_string = bottleneck_file.read()
   did_hit_error = False
   try:
     bottleneck_values = [float(x) for x in bottleneck_string.split(',')]
-  except:
-    print("Invalid float found, recreating bottleneck")
+  except ValueError:
+    print('Invalid float found, recreating bottleneck')
     did_hit_error = True
   if did_hit_error:
-    create_bottleneck_file(bottleneck_path, image_lists, label_name, index, image_dir, category, sess, jpeg_data_tensor, bottleneck_tensor)
+    create_bottleneck_file(bottleneck_path, image_lists, label_name, index,
+                           image_dir, category, sess, jpeg_data_tensor,
+                           bottleneck_tensor)
     with open(bottleneck_path, 'r') as bottleneck_file:
       bottleneck_string = bottleneck_file.read()
-    # Allow exceptions to propagate here, since they shouldn't happen after a fresh creation
+    # Allow exceptions to propagate here, since they shouldn't happen after a
+    # fresh creation
     bottleneck_values = [float(x) for x in bottleneck_string.split(',')]
   return bottleneck_values
 
+
 def cache_bottlenecks(sess, image_lists, image_dir, bottleneck_dir,
                       jpeg_data_tensor, bottleneck_tensor):
   """Ensures all the training, testing, and validation bottlenecks are cached.
@@ -718,7 +744,11 @@ def add_final_training_ops(class_count, final_tensor_name, bottleneck_tensor):
   layer_name = 'final_training_ops'
   with tf.name_scope(layer_name):
     with tf.name_scope('weights'):
-      layer_weights = tf.Variable(tf.truncated_normal([BOTTLENECK_TENSOR_SIZE, class_count], stddev=0.001), name='final_weights')
+      initial_value = tf.truncated_normal([BOTTLENECK_TENSOR_SIZE, class_count],
+                                          stddev=0.001)
+
+      layer_weights = tf.Variable(initial_value, name='final_weights')
+
       variable_summaries(layer_weights)
     with tf.name_scope('biases'):
       layer_biases = tf.Variable(tf.zeros([class_count]), name='final_biases')
@@ -738,8 +768,8 @@ def add_final_training_ops(class_count, final_tensor_name, bottleneck_tensor):
   tf.summary.scalar('cross_entropy', cross_entropy_mean)
 
   with tf.name_scope('train'):
-    train_step = tf.train.GradientDescentOptimizer(FLAGS.learning_rate).minimize(
-        cross_entropy_mean)
+    optimizer = tf.train.GradientDescentOptimizer(FLAGS.learning_rate)
+    train_step = optimizer.minimize(cross_entropy_mean)
 
   return (train_step, cross_entropy_mean, bottleneck_input, ground_truth_input,
           final_tensor)
@@ -794,115 +824,125 @@ def main(_):
   do_distort_images = should_distort_images(
       FLAGS.flip_left_right, FLAGS.random_crop, FLAGS.random_scale,
       FLAGS.random_brightness)
-  sess = tf.Session()
 
-  if do_distort_images:
-    # We will be applying distortions, so setup the operations we'll need.
-    distorted_jpeg_data_tensor, distorted_image_tensor = add_input_distortions(
-        FLAGS.flip_left_right, FLAGS.random_crop, FLAGS.random_scale,
-        FLAGS.random_brightness)
-  else:
-    # We'll make sure we've calculated the 'bottleneck' image summaries and
-    # cached them on disk.
-    cache_bottlenecks(sess, image_lists, FLAGS.image_dir, FLAGS.bottleneck_dir,
-                      jpeg_data_tensor, bottleneck_tensor)
-
-  # Add the new layer that we'll be training.
-  (train_step, cross_entropy, bottleneck_input, ground_truth_input,
-   final_tensor) = add_final_training_ops(len(image_lists.keys()),
-                                          FLAGS.final_tensor_name,
-                                          bottleneck_tensor)
-
-  # Create the operations we need to evaluate the accuracy of our new layer.
-  evaluation_step, prediction = add_evaluation_step(
-      final_tensor, ground_truth_input)
-
-  # Merge all the summaries and write them out to /tmp/retrain_logs (by default)
-  merged = tf.summary.merge_all()
-  train_writer = tf.summary.FileWriter(FLAGS.summaries_dir + '/train',
-                                       sess.graph)
-  validation_writer = tf.summary.FileWriter(FLAGS.summaries_dir + '/validation')
-
-  # Set up all our weights to their initial default values.
-  init = tf.global_variables_initializer()
-  sess.run(init)
-
-  # Run the training for as many cycles as requested on the command line.
-  for i in range(FLAGS.how_many_training_steps):
-    # Get a batch of input bottleneck values, either calculated fresh every time
-    # with distortions applied, or from the cache stored on disk.
+  with tf.Session(graph=graph) as sess:
+
     if do_distort_images:
-      train_bottlenecks, train_ground_truth = get_random_distorted_bottlenecks(
-          sess, image_lists, FLAGS.train_batch_size, 'training',
-          FLAGS.image_dir, distorted_jpeg_data_tensor,
-          distorted_image_tensor, resized_image_tensor, bottleneck_tensor)
+      # We will be applying distortions, so setup the operations we'll need.
+      (distorted_jpeg_data_tensor,
+       distorted_image_tensor) = add_input_distortions(
+           FLAGS.flip_left_right, FLAGS.random_crop,
+           FLAGS.random_scale, FLAGS.random_brightness)
     else:
-      train_bottlenecks, train_ground_truth, _ = get_random_cached_bottlenecks(
-          sess, image_lists, FLAGS.train_batch_size, 'training',
-          FLAGS.bottleneck_dir, FLAGS.image_dir, jpeg_data_tensor,
-          bottleneck_tensor)
-    # Feed the bottlenecks and ground truth into the graph, and run a training
-    # step. Capture training summaries for TensorBoard with the `merged` op.
-    train_summary, _ = sess.run([merged, train_step],
-             feed_dict={bottleneck_input: train_bottlenecks,
-                        ground_truth_input: train_ground_truth})
-    train_writer.add_summary(train_summary, i)
-
-    # Every so often, print out how well the graph is training.
-    is_last_step = (i + 1 == FLAGS.how_many_training_steps)
-    if (i % FLAGS.eval_step_interval) == 0 or is_last_step:
-      train_accuracy, cross_entropy_value = sess.run(
-          [evaluation_step, cross_entropy],
+      # We'll make sure we've calculated the 'bottleneck' image summaries and
+      # cached them on disk.
+      cache_bottlenecks(sess, image_lists, FLAGS.image_dir,
+                        FLAGS.bottleneck_dir, jpeg_data_tensor,
+                        bottleneck_tensor)
+
+    # Add the new layer that we'll be training.
+    (train_step, cross_entropy, bottleneck_input, ground_truth_input,
+     final_tensor) = add_final_training_ops(len(image_lists.keys()),
+                                            FLAGS.final_tensor_name,
+                                            bottleneck_tensor)
+
+    # Create the operations we need to evaluate the accuracy of our new layer.
+    evaluation_step, prediction = add_evaluation_step(
+        final_tensor, ground_truth_input)
+
+    # Merge all the summaries and write them out to the summaries_dir
+    merged = tf.summary.merge_all()
+    train_writer = tf.summary.FileWriter(FLAGS.summaries_dir + '/train',
+                                         sess.graph)
+
+    validation_writer = tf.summary.FileWriter(
+        FLAGS.summaries_dir + '/validation')
+
+    # Set up all our weights to their initial default values.
+    init = tf.global_variables_initializer()
+    sess.run(init)
+
+    # Run the training for as many cycles as requested on the command line.
+    for i in range(FLAGS.how_many_training_steps):
+      # Get a batch of input bottleneck values, either calculated fresh every
+      # time with distortions applied, or from the cache stored on disk.
+      if do_distort_images:
+        (train_bottlenecks,
+         train_ground_truth) = get_random_distorted_bottlenecks(
+             sess, image_lists, FLAGS.train_batch_size, 'training',
+             FLAGS.image_dir, distorted_jpeg_data_tensor,
+             distorted_image_tensor, resized_image_tensor, bottleneck_tensor)
+      else:
+        (train_bottlenecks,
+         train_ground_truth, _) = get_random_cached_bottlenecks(
+             sess, image_lists, FLAGS.train_batch_size, 'training',
+             FLAGS.bottleneck_dir, FLAGS.image_dir, jpeg_data_tensor,
+             bottleneck_tensor)
+      # Feed the bottlenecks and ground truth into the graph, and run a training
+      # step. Capture training summaries for TensorBoard with the `merged` op.
+
+      train_summary, _ = sess.run(
+          [merged, train_step],
           feed_dict={bottleneck_input: train_bottlenecks,
                      ground_truth_input: train_ground_truth})
-      print('%s: Step %d: Train accuracy = %.1f%%' % (datetime.now(), i,
-                                                      train_accuracy * 100))
-      print('%s: Step %d: Cross entropy = %f' % (datetime.now(), i,
-                                                 cross_entropy_value))
-      validation_bottlenecks, validation_ground_truth, _ = (
-          get_random_cached_bottlenecks(
-              sess, image_lists, FLAGS.validation_batch_size, 'validation',
-              FLAGS.bottleneck_dir, FLAGS.image_dir, jpeg_data_tensor,
-              bottleneck_tensor))
-      # Run a validation step and capture training summaries for TensorBoard
-      # with the `merged` op.
-      validation_summary, validation_accuracy = sess.run(
-          [merged, evaluation_step],
-          feed_dict={bottleneck_input: validation_bottlenecks,
-                     ground_truth_input: validation_ground_truth})
-      validation_writer.add_summary(validation_summary, i)
-      print('%s: Step %d: Validation accuracy = %.1f%% (N=%d)' %
-            (datetime.now(), i, validation_accuracy * 100,
-             len(validation_bottlenecks)))
-
-  # We've completed all our training, so run a final test evaluation on
-  # some new images we haven't used before.
-  test_bottlenecks, test_ground_truth, test_filenames = (
-      get_random_cached_bottlenecks(sess, image_lists, FLAGS.test_batch_size,
-                                    'testing', FLAGS.bottleneck_dir,
-                                    FLAGS.image_dir, jpeg_data_tensor,
-                                    bottleneck_tensor))
-  test_accuracy, predictions = sess.run(
-      [evaluation_step, prediction],
-      feed_dict={bottleneck_input: test_bottlenecks,
-                 ground_truth_input: test_ground_truth})
-  print('Final test accuracy = %.1f%% (N=%d)' % (
-      test_accuracy * 100, len(test_bottlenecks)))
-
-  if FLAGS.print_misclassified_test_images:
-    print('=== MISCLASSIFIED TEST IMAGES ===')
-    for i, test_filename in enumerate(test_filenames):
-      if predictions[i] != test_ground_truth[i].argmax():
-        print('%70s  %s' % (test_filename,
-                            list(image_lists.keys())[predictions[i]]))
-
-  # Write out the trained graph and labels with the weights stored as constants.
-  output_graph_def = graph_util.convert_variables_to_constants(
-      sess, graph.as_graph_def(), [FLAGS.final_tensor_name])
-  with gfile.FastGFile(FLAGS.output_graph, 'wb') as f:
-    f.write(output_graph_def.SerializeToString())
-  with gfile.FastGFile(FLAGS.output_labels, 'w') as f:
-    f.write('\n'.join(image_lists.keys()) + '\n')
+      train_writer.add_summary(train_summary, i)
+
+      # Every so often, print out how well the graph is training.
+      is_last_step = (i + 1 == FLAGS.how_many_training_steps)
+      if (i % FLAGS.eval_step_interval) == 0 or is_last_step:
+        train_accuracy, cross_entropy_value = sess.run(
+            [evaluation_step, cross_entropy],
+            feed_dict={bottleneck_input: train_bottlenecks,
+                       ground_truth_input: train_ground_truth})
+        print('%s: Step %d: Train accuracy = %.1f%%' % (datetime.now(), i,
+                                                        train_accuracy * 100))
+        print('%s: Step %d: Cross entropy = %f' % (datetime.now(), i,
+                                                   cross_entropy_value))
+        validation_bottlenecks, validation_ground_truth, _ = (
+            get_random_cached_bottlenecks(
+                sess, image_lists, FLAGS.validation_batch_size, 'validation',
+                FLAGS.bottleneck_dir, FLAGS.image_dir, jpeg_data_tensor,
+                bottleneck_tensor))
+        # Run a validation step and capture training summaries for TensorBoard
+        # with the `merged` op.
+        validation_summary, validation_accuracy = sess.run(
+            [merged, evaluation_step],
+            feed_dict={bottleneck_input: validation_bottlenecks,
+                       ground_truth_input: validation_ground_truth})
+        validation_writer.add_summary(validation_summary, i)
+        print('%s: Step %d: Validation accuracy = %.1f%% (N=%d)' %
+              (datetime.now(), i, validation_accuracy * 100,
+               len(validation_bottlenecks)))
+
+    # We've completed all our training, so run a final test evaluation on
+    # some new images we haven't used before.
+    test_bottlenecks, test_ground_truth, test_filenames = (
+        get_random_cached_bottlenecks(sess, image_lists, FLAGS.test_batch_size,
+                                      'testing', FLAGS.bottleneck_dir,
+                                      FLAGS.image_dir, jpeg_data_tensor,
+                                      bottleneck_tensor))
+    test_accuracy, predictions = sess.run(
+        [evaluation_step, prediction],
+        feed_dict={bottleneck_input: test_bottlenecks,
+                   ground_truth_input: test_ground_truth})
+    print('Final test accuracy = %.1f%% (N=%d)' % (
+        test_accuracy * 100, len(test_bottlenecks)))
+
+    if FLAGS.print_misclassified_test_images:
+      print('=== MISCLASSIFIED TEST IMAGES ===')
+      for i, test_filename in enumerate(test_filenames):
+        if predictions[i] != test_ground_truth[i].argmax():
+          print('%70s  %s' % (test_filename,
+                              list(image_lists.keys())[predictions[i]]))
+
+    # Write out the trained graph and labels with the weights stored as
+    # constants.
+    output_graph_def = graph_util.convert_variables_to_constants(
+        sess, graph.as_graph_def(), [FLAGS.final_tensor_name])
+    with gfile.FastGFile(FLAGS.output_graph, 'wb') as f:
+      f.write(output_graph_def.SerializeToString())
+    with gfile.FastGFile(FLAGS.output_labels, 'w') as f:
+      f.write('\n'.join(image_lists.keys()) + '\n')
 
 
 if __name__ == '__main__':
-- 
GitLab


From 5eb25c7da590e83c55b7993656481cd27c0e1c71 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Mon, 17 Apr 2017 17:02:58 -0800
Subject: [PATCH 0486/1563] Docs: Fix #9074 Change: 153414133

---
 tensorflow/core/ops/math_ops.cc | 65 ++++++++++++++-------------------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index b69ce13775..0942e8ae75 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -1396,8 +1396,8 @@ REGISTER_OP("SegmentSum")
     .Doc(R"doc(
 Computes the sum along segments of a tensor.
 
-Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)
-for an explanation of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \sum_j data_j\\) where sum is over `j` such
@@ -1406,7 +1406,7 @@ that `segment_ids[j] == i`.
 If the sum is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentSum.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentSum.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1426,9 +1426,8 @@ REGISTER_OP("SegmentMean")
     .Doc(R"doc(
 Computes the mean along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \frac{\sum_j data_j}{N}\\) where `mean` is
@@ -1438,7 +1437,7 @@ values summed.
 If the mean is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentMean.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentMean.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1458,9 +1457,8 @@ REGISTER_OP("SegmentProd")
     .Doc(R"doc(
 Computes the product along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \prod_j data_j\\) where the product is over `j` such
@@ -1469,7 +1467,7 @@ that `segment_ids[j] == i`.
 If the product is empty for a given segment ID `i`, `output[i] = 1`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentProd.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentProd.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1489,9 +1487,8 @@ REGISTER_OP("SegmentMin")
     .Doc(R"doc(
 Computes the minimum along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \min_j(data_j)\\) where `min` is over `j` such
@@ -1500,7 +1497,7 @@ that `segment_ids[j] == i`.
 If the min is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentMin.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentMin.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1520,8 +1517,8 @@ REGISTER_OP("SegmentMax")
     .Doc(R"doc(
 Computes the maximum along segments of a tensor.
 
-Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)
-for an explanation of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \max_j(data_j)\\) where `max` is over `j` such
@@ -1530,7 +1527,7 @@ that `segment_ids[j] == i`.
 If the max is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentMax.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentMax.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1551,9 +1548,8 @@ REGISTER_OP("UnsortedSegmentSum")
     .Doc(R"doc(
 Computes the sum along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 `(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such
@@ -1566,7 +1562,7 @@ If the sum is empty for a given segment ID `i`, `output[i] = 0`.
 `num_segments` should equal the number of distinct segment IDs.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/UnsortedSegmentSum.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/UnsortedSegmentSum.png" alt>
 </div>
 
 segment_ids: A tensor whose shape is a prefix of `data.shape`.
@@ -1577,7 +1573,6 @@ output: Has same shape as data, except for the first `segment_ids.rank`
 
 )doc");
 
-
 REGISTER_OP("UnsortedSegmentMax")
     .Input("data: T")
     .Input("segment_ids: Tindices")
@@ -1589,11 +1584,10 @@ REGISTER_OP("UnsortedSegmentMax")
     .Doc(R"doc(
 Computes the Max along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
-This operator is similar to the [unsorted segment sum operator](../../api_docs/python/math_ops.md#UnsortedSegmentSum).
+This operator is similar to the [unsorted segment sum operator](../../../api_docs/python/math_ops.md#UnsortedSegmentSum).
 Instead of computing the sum over segments, it computes the maximum
 such that:
 
@@ -1604,7 +1598,7 @@ If the maximum is empty for a given segment ID `i`, it outputs the smallest poss
  `output[i] = numeric_limits<T>::min()`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/UnsortedSegmentSum.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/UnsortedSegmentSum.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1625,9 +1619,8 @@ REGISTER_OP("SparseSegmentSum")
     .Doc(R"doc(
 Computes the sum along sparse segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Like `SegmentSum`, but `segment_ids` can have rank less than `data`'s first
 dimension, selecting a subset of dimension 0, specified by `indices`.
@@ -1674,9 +1667,8 @@ REGISTER_OP("SparseSegmentMean")
     .Doc(R"doc(
 Computes the mean along sparse segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Like `SegmentMean`, but `segment_ids` can have rank less than `data`'s first
 dimension, selecting a subset of dimension 0, specified by `indices`.
@@ -1724,9 +1716,8 @@ Computes the sum along sparse segments of a tensor divided by the sqrt of N.
 
 N is the size of the segment being reduced.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 indices: A 1-D tensor. Has same rank as `segment_ids`.
 
-- 
GitLab


From 5fd2a521e49f64eb00e0c9d74cd2e512e6f95833 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 17:18:35 -0800
Subject: [PATCH 0487/1563] Update ops-related pbtxt files. Change: 153415587

---
 tensorflow/core/ops/ops.pbtxt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 41353f0ea3..1866a2b4cc 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -19801,7 +19801,7 @@ op {
     }
   }
   summary: "Computes the maximum along segments of a tensor."
-  description: "Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)\nfor an explanation of segments.\n\nComputes a tensor such that\n\\\\(output_i = \\max_j(data_j)\\\\) where `max` is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the max is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/SegmentMax.png\" alt>\n</div>"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n\\\\(output_i = \\max_j(data_j)\\\\) where `max` is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the max is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/SegmentMax.png\" alt>\n</div>"
 }
 op {
   name: "SegmentMean"
@@ -19847,7 +19847,7 @@ op {
     }
   }
   summary: "Computes the mean along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\frac{\\sum_j data_j}{N}\\\\) where `mean` is\nover `j` such that `segment_ids[j] == i` and `N` is the total number of\nvalues summed.\n\nIf the mean is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/SegmentMean.png\" alt>\n</div>"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n\\\\(output_i = \\frac{\\sum_j data_j}{N}\\\\) where `mean` is\nover `j` such that `segment_ids[j] == i` and `N` is the total number of\nvalues summed.\n\nIf the mean is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/SegmentMean.png\" alt>\n</div>"
 }
 op {
   name: "SegmentMin"
@@ -19893,7 +19893,7 @@ op {
     }
   }
   summary: "Computes the minimum along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\min_j(data_j)\\\\) where `min` is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the min is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/SegmentMin.png\" alt>\n</div>"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n\\\\(output_i = \\min_j(data_j)\\\\) where `min` is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the min is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/SegmentMin.png\" alt>\n</div>"
 }
 op {
   name: "SegmentProd"
@@ -19944,7 +19944,7 @@ op {
     }
   }
   summary: "Computes the product along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\prod_j data_j\\\\) where the product is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the product is empty for a given segment ID `i`, `output[i] = 1`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/SegmentProd.png\" alt>\n</div>"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n\\\\(output_i = \\prod_j data_j\\\\) where the product is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the product is empty for a given segment ID `i`, `output[i] = 1`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/SegmentProd.png\" alt>\n</div>"
 }
 op {
   name: "SegmentSum"
@@ -19995,7 +19995,7 @@ op {
     }
   }
   summary: "Computes the sum along segments of a tensor."
-  description: "Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)\nfor an explanation of segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/SegmentSum.png\" alt>\n</div>"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/SegmentSum.png\" alt>\n</div>"
 }
 op {
   name: "Select"
@@ -22528,7 +22528,7 @@ op {
     }
   }
   summary: "Computes the mean along sparse segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nLike `SegmentMean`, but `segment_ids` can have rank less than `data`\'s first\ndimension, selecting a subset of dimension 0, specified by `indices`."
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nLike `SegmentMean`, but `segment_ids` can have rank less than `data`\'s first\ndimension, selecting a subset of dimension 0, specified by `indices`."
 }
 op {
   name: "SparseSegmentMeanGrad"
@@ -22627,7 +22627,7 @@ op {
     }
   }
   summary: "Computes the sum along sparse segments of a tensor divided by the sqrt of N."
-  description: "N is the size of the segment being reduced.\n\nRead [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments."
+  description: "N is the size of the segment being reduced.\n\nRead @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments."
 }
 op {
   name: "SparseSegmentSqrtNGrad"
@@ -22733,7 +22733,7 @@ op {
     }
   }
   summary: "Computes the sum along sparse segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nLike `SegmentSum`, but `segment_ids` can have rank less than `data`\'s first\ndimension, selecting a subset of dimension 0, specified by `indices`.\n\nFor example:\n\n```prettyprint\nc = tf.constant([[1,2,3,4], [-1,-2,-3,-4], [5,6,7,8]])\n\n# Select two rows, one segment.\ntf.sparse_segment_sum(c, tf.constant([0, 1]), tf.constant([0, 0]))\n  ==> [[0 0 0 0]]\n\n# Select two rows, two segment.\ntf.sparse_segment_sum(c, tf.constant([0, 1]), tf.constant([0, 1]))\n  ==> [[ 1  2  3  4]\n       [-1 -2 -3 -4]]\n\n# Select all rows, two segments.\ntf.sparse_segment_sum(c, tf.constant([0, 1, 2]), tf.constant([0, 0, 1]))\n  ==> [[0 0 0 0]\n       [5 6 7 8]]\n\n# Which is equivalent to:\ntf.segment_sum(c, tf.constant([0, 0, 1]))\n```"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nLike `SegmentSum`, but `segment_ids` can have rank less than `data`\'s first\ndimension, selecting a subset of dimension 0, specified by `indices`.\n\nFor example:\n\n```prettyprint\nc = tf.constant([[1,2,3,4], [-1,-2,-3,-4], [5,6,7,8]])\n\n# Select two rows, one segment.\ntf.sparse_segment_sum(c, tf.constant([0, 1]), tf.constant([0, 0]))\n  ==> [[0 0 0 0]]\n\n# Select two rows, two segment.\ntf.sparse_segment_sum(c, tf.constant([0, 1]), tf.constant([0, 1]))\n  ==> [[ 1  2  3  4]\n       [-1 -2 -3 -4]]\n\n# Select all rows, two segments.\ntf.sparse_segment_sum(c, tf.constant([0, 1, 2]), tf.constant([0, 0, 1]))\n  ==> [[0 0 0 0]\n       [5 6 7 8]]\n\n# Which is equivalent to:\ntf.segment_sum(c, tf.constant([0, 0, 1]))\n```"
 }
 op {
   name: "SparseSoftmax"
@@ -26306,7 +26306,7 @@ op {
     }
   }
   summary: "Computes the Max along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nThis operator is similar to the [unsorted segment sum operator](../../api_docs/python/math_ops.md#UnsortedSegmentSum).\nInstead of computing the sum over segments, it computes the maximum\nsuch that:\n\n\\\\(output_i = \\max_j data_j\\\\) where max is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the maximum is empty for a given segment ID `i`, it outputs the smallest possible value for specific numeric type,\n `output[i] = numeric_limits<T>::min()`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nThis operator is similar to the [unsorted segment sum operator](../../../api_docs/python/math_ops.md#UnsortedSegmentSum).\nInstead of computing the sum over segments, it computes the maximum\nsuch that:\n\n\\\\(output_i = \\max_j data_j\\\\) where max is over `j` such\nthat `segment_ids[j] == i`.\n\nIf the maximum is empty for a given segment ID `i`, it outputs the smallest possible value for specific numeric type,\n `output[i] = numeric_limits<T>::min()`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
 op {
   name: "UnsortedSegmentSum"
@@ -26361,7 +26361,7 @@ op {
     }
   }
   summary: "Computes the sum along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
+  description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
 op {
   name: "Unstage"
-- 
GitLab


From 6a498a4d6735cfbd6063d8c2bac8fde6b85cce0d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 17:26:06 -0800
Subject: [PATCH 0488/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 153416197

---
 tensorflow/go/op/wrappers.go | 64 ++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 514868ff14..bf14cc908d 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -6709,8 +6709,8 @@ func AvgPoolGrad(scope *Scope, orig_input_shape tf.Output, grad tf.Output, ksize
 
 // Computes the maximum along segments of a tensor.
 //
-// Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)
-// for an explanation of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Computes a tensor such that
 // \\(output_i = \max_j(data_j)\\) where `max` is over `j` such
@@ -6719,7 +6719,7 @@ func AvgPoolGrad(scope *Scope, orig_input_shape tf.Output, grad tf.Output, ksize
 // If the max is empty for a given segment ID `i`, `output[i] = 0`.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/SegmentMax.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/SegmentMax.png" alt>
 // </div>
 //
 // Arguments:
@@ -7879,9 +7879,8 @@ func SdcaOptimizer(scope *Scope, sparse_example_indices []tf.Output, sparse_feat
 
 // Computes the minimum along segments of a tensor.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Computes a tensor such that
 // \\(output_i = \min_j(data_j)\\) where `min` is over `j` such
@@ -7890,7 +7889,7 @@ func SdcaOptimizer(scope *Scope, sparse_example_indices []tf.Output, sparse_feat
 // If the min is empty for a given segment ID `i`, `output[i] = 0`.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/SegmentMin.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/SegmentMin.png" alt>
 // </div>
 //
 // Arguments:
@@ -11313,9 +11312,8 @@ func ResourceSparseApplyCenteredRMSProp(scope *Scope, var_ tf.Output, mg tf.Outp
 
 // Computes the mean along segments of a tensor.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Computes a tensor such that
 // \\(output_i = \frac{\sum_j data_j}{N}\\) where `mean` is
@@ -11325,7 +11323,7 @@ func ResourceSparseApplyCenteredRMSProp(scope *Scope, var_ tf.Output, mg tf.Outp
 // If the mean is empty for a given segment ID `i`, `output[i] = 0`.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/SegmentMean.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/SegmentMean.png" alt>
 // </div>
 //
 // Arguments:
@@ -14014,9 +14012,8 @@ func IFFT(scope *Scope, input tf.Output) (output tf.Output) {
 //
 // N is the size of the segment being reduced.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Arguments:
 //
@@ -17662,11 +17659,10 @@ func Exp(scope *Scope, x tf.Output) (y tf.Output) {
 
 // Computes the Max along segments of a tensor.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
-// This operator is similar to the [unsorted segment sum operator](../../api_docs/python/math_ops.md#UnsortedSegmentSum).
+// This operator is similar to the [unsorted segment sum operator](../../../api_docs/python/math_ops.md#UnsortedSegmentSum).
 // Instead of computing the sum over segments, it computes the maximum
 // such that:
 //
@@ -17677,7 +17673,7 @@ func Exp(scope *Scope, x tf.Output) (y tf.Output) {
 //  `output[i] = numeric_limits<T>::min()`.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/UnsortedSegmentSum.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/UnsortedSegmentSum.png" alt>
 // </div>
 //
 // Arguments:
@@ -18413,8 +18409,8 @@ func ArgMax(scope *Scope, input tf.Output, dimension tf.Output) (output tf.Outpu
 
 // Computes the sum along segments of a tensor.
 //
-// Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)
-// for an explanation of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Computes a tensor such that
 // \\(output_i = \sum_j data_j\\) where sum is over `j` such
@@ -18423,7 +18419,7 @@ func ArgMax(scope *Scope, input tf.Output, dimension tf.Output) (output tf.Outpu
 // If the sum is empty for a given segment ID `i`, `output[i] = 0`.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/SegmentSum.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/SegmentSum.png" alt>
 // </div>
 //
 // Arguments:
@@ -18577,9 +18573,8 @@ func SparseReshape(scope *Scope, input_indices tf.Output, input_shape tf.Output,
 
 // Computes the product along segments of a tensor.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Computes a tensor such that
 // \\(output_i = \prod_j data_j\\) where the product is over `j` such
@@ -18588,7 +18583,7 @@ func SparseReshape(scope *Scope, input_indices tf.Output, input_shape tf.Output,
 // If the product is empty for a given segment ID `i`, `output[i] = 1`.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/SegmentProd.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/SegmentProd.png" alt>
 // </div>
 //
 // Arguments:
@@ -18614,9 +18609,8 @@ func SegmentProd(scope *Scope, data tf.Output, segment_ids tf.Output) (output tf
 
 // Computes the sum along segments of a tensor.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Computes a tensor such that
 // `(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such
@@ -18629,7 +18623,7 @@ func SegmentProd(scope *Scope, data tf.Output, segment_ids tf.Output) (output tf
 // `num_segments` should equal the number of distinct segment IDs.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/UnsortedSegmentSum.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/UnsortedSegmentSum.png" alt>
 // </div>
 //
 // Arguments:
@@ -18656,9 +18650,8 @@ func UnsortedSegmentSum(scope *Scope, data tf.Output, segment_ids tf.Output, num
 
 // Computes the sum along sparse segments of a tensor.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Like `SegmentSum`, but `segment_ids` can have rank less than `data`'s first
 // dimension, selecting a subset of dimension 0, specified by `indices`.
@@ -20023,9 +20016,8 @@ func AvgPool(scope *Scope, value tf.Output, ksize []int64, strides []int64, padd
 
 // Computes the mean along sparse segments of a tensor.
 //
-// Read [the section on
-// Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-// of segments.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
 //
 // Like `SegmentMean`, but `segment_ids` can have rank less than `data`'s first
 // dimension, selecting a subset of dimension 0, specified by `indices`.
-- 
GitLab


From 4eaf53c278d46d23655fe9c420d08103c8b82112 Mon Sep 17 00:00:00 2001
From: Vivek Rane <vivek.v.rane@intel.com>
Date: Mon, 17 Apr 2017 19:51:30 -0700
Subject: [PATCH 0489/1563] Adding MKL op for reshape and several fixes to
 other ops (#9228)

* Bug fixes to max/avg pooling

* Added fixes for unexpected behaviour of OP_REQUIRES

* Fix to get common_runtime/function_test to pass with MKL. Removes eigen label from test function when compiled with mkl flag

* MKL Reshape

* MKL Reshape (by Amin)

* Bug fixes to max/avg pooling

* Added fixes for unexpected behaviour of OP_REQUIRES

* Fix to get common_runtime/function_test to pass with MKL. Removes eigen label from test function when compiled with mkl flag

* MKL Reshape (by Amin)

* Fixed duplication caused during merge

* Modified Mkl Layer and Op Registry

* config for mkl

* Addressed PR comments

* Mkl ops ordered alphabetically in tensorflow/core/BUILD
---
 tensorflow/core/BUILD                         |   8 +-
 tensorflow/core/framework/function_testlib.cc |   4 +
 tensorflow/core/graph/mkl_layout_pass.cc      |  19 +++
 tensorflow/core/kernels/BUILD                 |   8 +
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |  39 ++---
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |  84 +++++-----
 .../core/kernels/mkl_pooling_ops_common.cc    |   2 +-
 tensorflow/core/kernels/mkl_reshape_op.cc     | 151 ++++++++++++++++++
 tensorflow/core/ops/array_ops.cc              |  15 ++
 tensorflow/core/util/mkl_util.h               |  40 ++++-
 10 files changed, 300 insertions(+), 70 deletions(-)
 create mode 100644 tensorflow/core/kernels/mkl_reshape_op.cc

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 98a25497f6..ffd30483ba 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -729,13 +729,14 @@ cc_library(
         "//tensorflow/core/kernels:math_not_windows",
         "//tensorflow/core/kernels:quantized_ops",
     ]) + if_mkl([
+        "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
+        "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
+        "//tensorflow/core/kernels:mkl_reshape_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
-        "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
-        "//tensorflow/core/kernels:mkl_lrn_op",
-        "//tensorflow/core/kernels:mkl_concat_op",
     ]),
 )
 
@@ -2114,6 +2115,7 @@ tf_cc_test_mkl(
         "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
+        "//tensorflow/core/kernels:mkl_reshape_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
         "//tensorflow/core/kernels:ops_util",
         "//third_party/eigen3",
diff --git a/tensorflow/core/framework/function_testlib.cc b/tensorflow/core/framework/function_testlib.cc
index fb1ad0102f..6b92e66f3c 100644
--- a/tensorflow/core/framework/function_testlib.cc
+++ b/tensorflow/core/framework/function_testlib.cc
@@ -143,7 +143,11 @@ FunctionDef WXPlusB() {
         {{"T", "$T"},
          {"transpose_a", false},
          {"transpose_b", false},
+#ifdef INTEL_MKL 
+         }},
+#else
          {"_kernel", "eigen"}}},
+#endif
        {{"y"}, "Add", {"mm", "b"}, {{"T", "$T"}}}});
 }
 
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index a1ea92281b..d27a6702e9 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -282,6 +282,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     csinfo_.mkl_conv2d_with_bias_backprop_bias =
                                    "MklConv2DWithBiasBackpropBias";
     csinfo_.relu                  = "Relu";
+    csinfo_.reshape               = "Reshape";
     csinfo_.relu_grad             = "ReluGrad";
     csinfo_.split                 = "Split";
 
@@ -328,6 +329,8 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     rinfo_.push_back({csinfo_.relu,
                       GetMklOpName(csinfo_.relu),
                       1, CopyAttrsRelu, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.reshape, GetMklOpName(csinfo_.reshape), 2,
+                      CopyAttrsReshape, AlwaysRewrite});
 
     // TODO(inteltf): we do not support ReluGrad and BiasAddGrad yet.
 
@@ -433,6 +436,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string relu;
     string relu_grad;
     string split;
+    string reshape;
   } csinfo_;
 
   /// Maintain info about nodes to rewrite
@@ -683,6 +687,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   static void CopyAttrsLRN(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsPooling(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsReshape(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsSplit(const Node* orig_node, NodeBuilder* nb);
 
   // Generate a graph node in graph 'g' representing a dummy Mkl tensor node,
@@ -1301,6 +1306,20 @@ void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orig_node,
   nb->Attr("is_training", is_training);
 }
 
+void MklLayoutRewritePass::CopyAttrsReshape(const Node* orig_node,
+                                           NodeBuilder* nb) {
+  DataType T;
+  DataType Tshape;
+  
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tshape", &Tshape));
+  
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("Tshape", Tshape);
+}
+
 //////////////////////////////////////////////////////////////////////////
 //           Helper functions related to node merge pass
 //////////////////////////////////////////////////////////////////////////
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 1c74e01fe2..6c354505d6 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4694,6 +4694,14 @@ tf_mkl_kernel_library(
     ],
 )
 
+tf_mkl_kernel_library(
+    name = "mkl_reshape_op",
+    prefix = "mkl_reshape_op",
+    deps = ARRAY_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
 tf_mkl_kernel_library(
     name = "mkl_lrn_op",
     prefix = "mkl_lrn_op",
diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
index 1ec38692e1..0d1aa57f65 100644
--- a/tensorflow/core/kernels/mkl_avgpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -29,10 +29,9 @@ namespace tensorflow {
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
 template <typename Device, typename T>
-class MklAvgPoolingOp : public UnaryOp<T> {
+class MklAvgPoolingOp : public OpKernel {
  public:
-  explicit MklAvgPoolingOp(OpKernelConstruction* context)
-      : UnaryOp<T>(context) {
+  explicit MklAvgPoolingOp(OpKernelConstruction* context) : OpKernel(context) {
     string data_format;
     OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
     OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
@@ -78,6 +77,7 @@ class MklAvgPoolingOp : public UnaryOp<T> {
     Tensor mkl_tmp_input_buf_tensor_;
     mkl_context.MklCreateLayoutsAndPrimitives(context,
                                               &mkl_tmp_input_buf_tensor_);
+    OP_REQUIRES_OK(context, context->status());
 
     Tensor workspace_tensor;
     void* workspace_buf;
@@ -138,9 +138,10 @@ class MklAvgPoolingOp : public UnaryOp<T> {
   typedef struct {
     MklPoolingOpParams params;
     MklShape input_shape;
-    dnnPrimitive_t prim_pooling_fwd, convert_input;
-    dnnLayout_t lt_user_input, lt_prim_input, lt_workspace;
-    void* input_buf;
+    dnnPrimitive_t prim_pooling_fwd = nullptr, convert_input = nullptr;
+    dnnLayout_t lt_user_input = nullptr, lt_prim_input = nullptr,
+                lt_workspace = nullptr;
+    void* input_buf = nullptr;
     void* pooling_res[dnnResourceNumber];
 
     void MklCreateLayoutsAndPrimitives(OpKernelContext* context,
@@ -243,6 +244,11 @@ class MklAvgPoolingGradOp : public OpKernel {
     pool_params.Init(context, ksize_, stride_, padding_, data_format_,
                      output_shape);
 
+    if (outbackprop_in_mkl_format == false)
+      mkl_context.params.in_dim = out_backprop.dims();
+    else
+      mkl_context.params.in_dim = mkl_context.out_backprop_shape.GetDimension();
+
     // Extract the parameters for the op from the pooling specs
     ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
 
@@ -250,6 +256,7 @@ class MklAvgPoolingGradOp : public OpKernel {
     Tensor outbackprop_buf_tensor;
     void* outbackprop_buf;
     mkl_context.MklCreateLayoutsAndPrimitives(context);
+    OP_REQUIRES_OK(context, context->status());
 
     // Check if outbackprop layout requires conversion.
     if (!dnnLayoutCompare_F32(mkl_context.lt_user_outbackprop,
@@ -323,10 +330,10 @@ class MklAvgPoolingGradOp : public OpKernel {
   typedef struct {
     MklPoolingOpParams params;
     MklShape out_backprop_shape;
-    dnnPrimitive_t prim_pooling_bwd, convert_outbackprop;
+    dnnPrimitive_t prim_pooling_bwd = nullptr, convert_outbackprop = nullptr;
     void* pooling_res[dnnResourceNumber];
-    dnnLayout_t lt_user_input, lt_user_outbackprop, lt_prim_outbackprop,
-        lt_workspace;
+    dnnLayout_t lt_user_input = nullptr, lt_user_outbackprop = nullptr,
+                lt_prim_outbackprop = nullptr, lt_workspace = nullptr;
 
     void MklCreateLayoutsAndPrimitives(OpKernelContext* context) {
       const Tensor& tensor_in_shape = MklGetInput(context, 0);
@@ -336,11 +343,10 @@ class MklAvgPoolingGradOp : public OpKernel {
       if (!outbackprop_in_mkl_format) {
         // For avgpooling, tensor_in_shape should have 1 dimension, and 4
         // elements.
-        OP_REQUIRES(
-            context,
-            tensor_in_shape.dims() == 1 && tensor_in_shape.NumElements() == 4,
-            errors::InvalidArgument("original input shape must be "
-                                    "1-dimensional and 4 elements"));
+        OP_REQUIRES(context, tensor_in_shape.dims() == 1 &&
+                                 tensor_in_shape.NumElements() == 4,
+                    errors::InvalidArgument("original input shape must be "
+                                            "1-dimensional and 4 elements"));
 
         // For avgpooling, out_backprop should have 4 dimensions.
         OP_REQUIRES(context, out_backprop.dims() == 4,
@@ -348,11 +354,6 @@ class MklAvgPoolingGradOp : public OpKernel {
                                             "4-dimensional"));
       } else {
         // Input in MKL format.
-        OP_REQUIRES(
-            context, out_backprop.dims() == 2,
-            errors::InvalidArgument("out_backprop in MKL format must be "
-                                    "2-dimensional"));
-
         // For avgpooling, out_backprop should have 4 dimensions.
         OP_REQUIRES(context, out_backprop_shape.GetDimension() == 4,
                     errors::InvalidArgument("out_backprop must be "
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index 29a95dd8da..af43c35af5 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -83,10 +83,11 @@ class MklMaxPoolingOp : public OpKernel {
     ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
 
     mkl_context.MklCreateLayoutsAndPrimitives(context);
+    OP_REQUIRES_OK(context, context->status());
 
     // Declare output tensor
     TensorShape tensor_out_shape;
-    MklShape mkl_out_shape;
+    MklShape mkl_out_shape, mkl_workspace_shape;
     mkl_out_shape.SetMklTensor(true);
     mkl_out_shape.SetMklLayout(mkl_context.prim_pooling_fwd, dnnResourceDst);
     mkl_out_shape.SetTfLayout(mkl_context.params.in_dim,
@@ -101,28 +102,19 @@ class MklMaxPoolingOp : public OpKernel {
     AllocateOutputSetMklShape(context, 0, &output_tensor, tensor_out_shape,
                               mkl_out_shape);
 
-    if (!workspace_enabled_) {
-      mkl_out_shape.SetMklTensor(false);
-    }
-
     Tensor* workspace_tensor;
     void* workspace_buf = nullptr;
-    if (workspace_enabled_) {
-      TensorShape workspace_shape;
-      workspace_shape.AddDim(
-          dnnLayoutGetMemorySize_F32(
-              static_cast<dnnLayout_t>(mkl_context.lt_workspace)) /
-          sizeof(T));
-      AllocateOutputSetMklShape(context, 1, &workspace_tensor, workspace_shape,
-                                mkl_out_shape);
-      mkl_context.pooling_res[dnnResourceWorkspace] = const_cast<void*>(
-          static_cast<const void*>(workspace_tensor->flat<T>().data()));
-    } else {
-      AllocTmpBuffer(context, workspace_tensor, mkl_context.lt_workspace,
-                     &workspace_buf);
-      mkl_context.pooling_res[dnnResourceWorkspace] = workspace_buf;
-    }
 
+    TensorShape workspace_shape;
+    mkl_workspace_shape.SetMklTensor(false);
+    workspace_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                               mkl_context.lt_workspace)) /
+                           sizeof(T));
+    AllocateOutputSetMklShape(context, 1, &workspace_tensor, workspace_shape,
+                              mkl_workspace_shape);
+
+    mkl_context.pooling_res[dnnResourceWorkspace] = const_cast<void*>(
+        static_cast<const void*>(workspace_tensor->flat<T>().data()));
     mkl_context.pooling_res[dnnResourceSrc] =
         const_cast<void*>(static_cast<const void*>(tensor_in.flat<T>().data()));
     mkl_context.pooling_res[dnnResourceDst] = const_cast<void*>(
@@ -140,8 +132,8 @@ class MklMaxPoolingOp : public OpKernel {
     MklPoolingOpParams params;
     MklShape input_shape;
     void* pooling_res[dnnResourceNumber];
-    dnnPrimitive_t prim_pooling_fwd;
-    dnnLayout_t lt_user_input, lt_workspace;
+    dnnPrimitive_t prim_pooling_fwd = nullptr;
+    dnnLayout_t lt_user_input = nullptr, lt_workspace = nullptr;
 
     void MklCreateLayoutsAndPrimitives(OpKernelContext* context) {
       bool input_in_mkl_format = input_shape.IsMklTensor();
@@ -256,8 +248,13 @@ class MklMaxPoolingGradOp : public OpKernel {
     ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
 
     mkl_context.MklCreateLayouts(context);
+    OP_REQUIRES_OK(context, context->status());
+
     mkl_context.MklCreatePrimitives(context, workspace_enabled_);
+    OP_REQUIRES_OK(context, context->status());
+
     mkl_context.MklPrepareInputs(context, workspace_enabled_);
+    OP_REQUIRES_OK(context, context->status());
 
     // Create shape for the input back prop output
     TensorShape mkl_input_backprop;
@@ -297,12 +294,15 @@ class MklMaxPoolingGradOp : public OpKernel {
     MklShape input_shape, output_backprop_shape;
     void* pooling_resfwd[dnnResourceNumber];
     void* pooling_res[dnnResourceNumber];
-    dnnPrimitive_t prim_pooling_fwd, prim_pooling_bwd, convert_input,
-        convert_outbackprop;
-    dnnLayout_t lt_outbackprop_user, lt_outbackprop_prim, lt_input_user,
-        lt_input_prim;
+    dnnPrimitive_t prim_pooling_fwd = nullptr, prim_pooling_bwd = nullptr,
+                   convert_input = nullptr, convert_outbackprop = nullptr;
+    dnnLayout_t lt_outbackprop_user = nullptr, lt_outbackprop_prim = nullptr,
+                lt_input_user = nullptr, lt_input_prim = nullptr;
     void* input_buf;
     void* outbackprop_buf;
+    Tensor tmp_output_buf_tensor;
+    Tensor workspace_buf_tensor;
+    Tensor input_buf_tensor, outbackprop_buf_tensor;
 
     void MklCreateLayouts(OpKernelContext* context) {
       bool input_in_mkl_format = input_shape.IsMklTensor();
@@ -351,9 +351,6 @@ class MklMaxPoolingGradOp : public OpKernel {
                    &lt_outbackprop_prim, prim_pooling_bwd, dnnResourceDiffDst),
                E_SUCCESS);
 
-      // Tensors needed to create temporary buffers
-      Tensor input_buf_tensor, outbackprop_buf_tensor;
-
       if (workspace_enabled == false) {
         CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
                      &lt_input_prim, prim_pooling_fwd, dnnResourceSrc),
@@ -384,28 +381,24 @@ class MklMaxPoolingGradOp : public OpKernel {
       bool input_in_mkl_format = input_shape.IsMklTensor();
       bool outbackprop_in_mkl_format = output_backprop_shape.IsMklTensor();
 
-      void* tmp_output_buf;
-      Tensor tmp_output_buf_tensor;
-
-      void* workspace_buf;
-      Tensor workspace_buf_tensor;
+      void* tmp_output_buf = nullptr;
+      void* workspace_buf = nullptr;
 
       if (workspace_enabled == false) {
         if (convert_input != nullptr) {
           if (input_in_mkl_format == false) {
-            CHECK_EQ(dnnConversionExecute_F32(
-                         convert_input,
-                         const_cast<void*>(static_cast<const void*>(
-                             tensor_in.flat<T>().data())),
-                         input_buf),
-                     E_SUCCESS);
+            CHECK_EQ(
+                dnnConversionExecute_F32(
+                    convert_input, const_cast<void*>(static_cast<const void*>(
+                                       tensor_in.flat<T>().data())),
+                    input_buf),
+                E_SUCCESS);
             CHECK_EQ(dnnDelete_F32(convert_input), E_SUCCESS);
             convert_input = nullptr;
           } else {
             input_shape.GetConvertedFlatData(
-                lt_input_prim,
-                const_cast<void*>(
-                    static_cast<const void*>(tensor_in.flat<T>().data())),
+                lt_input_prim, const_cast<void*>(static_cast<const void*>(
+                                   tensor_in.flat<T>().data())),
                 input_buf);
           }
           pooling_resfwd[dnnResourceSrc] = input_buf;
@@ -450,9 +443,8 @@ class MklMaxPoolingGradOp : public OpKernel {
           CHECK_EQ(dnnDelete_F32(convert_outbackprop), E_SUCCESS);
         } else {
           output_backprop_shape.GetConvertedFlatData(
-              lt_outbackprop_prim,
-              const_cast<void*>(
-                  static_cast<const void*>(out_backprop.flat<T>().data())),
+              lt_outbackprop_prim, const_cast<void*>(static_cast<const void*>(
+                                       out_backprop.flat<T>().data())),
               outbackprop_buf);
         }
         pooling_res[dnnResourceDiffDst] = outbackprop_buf;
diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.cc b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
index d88bd4c640..65e8852cfb 100644
--- a/tensorflow/core/kernels/mkl_pooling_ops_common.cc
+++ b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
@@ -14,8 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #ifdef INTEL_MKL
-#include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
 #include <vector>
+#include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/framework/common_shape_fns.h"
 
diff --git a/tensorflow/core/kernels/mkl_reshape_op.cc b/tensorflow/core/kernels/mkl_reshape_op.cc
new file mode 100644
index 0000000000..ea3a605564
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_reshape_op.cc
@@ -0,0 +1,151 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef INTEL_MKL
+
+#include <memory>
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/logging.h"
+
+#include "tensorflow/core/util/mkl_util.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+
+namespace tensorflow {
+using CPUDevice = Eigen::ThreadPoolDevice;
+template <typename Device, typename T>
+class MklReshapeOp : public OpKernel {
+ public:
+  explicit MklReshapeOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+
+    const Tensor& input = MklGetInput(context, 0);
+    const Tensor& sizes = MklGetInput(context, 1);
+
+    // Preliminary validation of sizes.
+    OP_REQUIRES(context, IsLegacyVector(sizes.shape()),
+                errors::InvalidArgument("sizes input must be 1-D, not shape ",
+                                        sizes.shape().DebugString()));
+    const int64 num_dims = sizes.NumElements();
+
+    // Compute the output shape.  Determine product of specified
+    // dimensions, and find the index of the unspecified one.
+    TensorShape shape;
+    int64 product = 1;
+    int unknown_index = -1;
+    auto vec_size = sizes.flat<int32>();
+    for (int d = 0; d < num_dims; ++d) {
+      const int32 size = vec_size(d);
+      if (size == -1) {
+        OP_REQUIRES(
+            context, unknown_index == -1,
+            errors::InvalidArgument("only one input size may be -1, not both ",
+                                    unknown_index, " and ", d));
+        unknown_index = d;
+        shape.AddDim(1);
+      } else {
+        OP_REQUIRES(context, size >= 0,
+                    errors::InvalidArgument(
+                        "size ", d, " must be non-negative, not ", size));
+        shape.AddDim(size);
+        product *= size;
+      }
+    }
+    if (unknown_index != -1) {
+      OP_REQUIRES(
+          context, product > 0,
+          errors::InvalidArgument("Reshape cannot infer the missing input size "
+                                  "for an empty tensor unless all specified "
+                                  "input sizes are non-zero"));
+      const int64 missing = input.NumElements() / product;
+      OP_REQUIRES(
+          context, product * missing == input.NumElements(),
+          errors::InvalidArgument(
+              "Input to reshape is a tensor with ", input.NumElements(),
+              " values, but the requested shape requires a multiple of ",
+              product));
+      shape.set_dim(unknown_index, missing);
+    }
+    OP_REQUIRES(context, shape.num_elements() == input.NumElements(),
+                errors::InvalidArgument("Input to reshape is a tensor with ",
+                                        input.NumElements(),
+                                        " values, but the requested shape has ",
+                                        shape.num_elements()));
+
+    MklShape mkl_shape_input;
+    GetMklShape(context, 0, &mkl_shape_input);
+    bool input_in_mkl_format = mkl_shape_input.IsMklTensor();
+    if (input_in_mkl_format) {
+      TensorShape & shape_to = shape;
+      TensorShape shape_from;
+      for (size_t i = 0; i < mkl_shape_input.GetDimension(); i++) {
+        // Outermost to innermost dimension
+        shape_from.AddDim(mkl_shape_input.GetSizes()[
+                                          mkl_shape_input.tf_dim_idx(i)]);
+      }
+
+      if (shape_from == shape_to) {
+        CopyMklTensorInToOut(context, 0, 0);
+        return;
+      } else {
+        // Allocate output tensor.
+        Tensor* output_tensor = NULL;
+        MklShape mkl_shape_output;
+        mkl_shape_output.SetMklTensor(false);
+        AllocateOutputSetMklShape(context, 0, &output_tensor, shape_to,
+                                  mkl_shape_output);
+
+        // Get output layout pointer.
+        dnnLayout_t output_layout = static_cast<dnnLayout_t>(
+                                      mkl_shape_input.GetTfLayout());
+
+        // Execute DNNConversion.
+        // Note: we  assume an MKL tensor always have float as its data type.
+        void *input_buffer  = static_cast<void*>(const_cast<float*>(
+                                  input.flat<float>().data()));
+        void *output_buffer = static_cast<void*>(const_cast<float*>(
+                                  output_tensor->flat<float>().data()));
+        mkl_shape_input.GetConvertedFlatData(output_layout, input_buffer,
+                                         output_buffer);
+
+        VLOG(1) << "MKLToTFConversion complete successfully.";
+        return;
+      }
+    } else {
+      CopyTFTensorInToOut(context, 0, 0, shape);
+    }
+  }
+
+};
+
+#define REGISTER_MKL_CPU(T)                                               \
+  REGISTER_KERNEL_BUILDER(Name("MklReshape")                              \
+                              .Device(DEVICE_CPU)                         \
+                              .HostMemory("shape")                        \
+                              .TypeConstraint<T>("T")                     \
+                              .TypeConstraint<int32>("Tshape")            \
+                              .Label(mkl_op_registry::kMklOpLabel),       \
+                          MklReshapeOp<CPUDevice, T>);
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index de5cd5247e..00a1566ae4 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1658,6 +1658,21 @@ reshape(t, []) ==> 7
 shape: Defines the shape of the output tensor.
 )Doc");
 
+#ifdef INTEL_MKL
+REGISTER_OP("MklReshape")
+    .Input("tensor: T")
+    .Input("shape: Tshape")
+    .Input("mkl_tensor: uint8")
+    .Input("mkl_shape: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("T: type")
+    .Attr("Tshape: {int32, int64} = DT_INT32")
+    .SetShapeFn([](InferenceContext* c) { return SetOutputShapeForReshape(c); })
+    .Doc(R"Doc( MKL implementation of ReshapeOp.
+)Doc");
+#endif // INTEL_MKL
+
 // --------------------------------------------------------------------------
 REGISTER_OP("InvertPermutation")
     .Input("x: T")
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index 8f3d178bcb..2493ea9c76 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -545,8 +545,46 @@ inline int64 GetMklTensorDim(const MklShape& mkl_shape, char dimension) {
   return mkl_shape.dim_size(index);
 }
 
-namespace mkl_op_registry {
+inline void CopyMklTensorInToOut(OpKernelContext* context,
+                                 int idx_in, int idx_out) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_meta_in = GetTensorMetaDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+  int idx_meta_out = GetTensorMetaDataIndex(idx_out, num_outputs);
+
+  const Tensor& data = context->input(idx_data_in);
+  const Tensor& meta = context->input(idx_meta_in);
+  Tensor output(data.dtype());
+  Tensor meta_output(meta.dtype());
+
+  // TODO(intel_tf): alternatively, call forward_input_to_output_with_shape(...)
+  CHECK(output.CopyFrom(data, data.shape()));
+  CHECK(meta_output.CopyFrom(meta, meta.shape()));
+  context->set_output(idx_data_out, output);
+  context->set_output(idx_meta_out, meta_output);
+}
 
+inline void CopyTFTensorInToOut(OpKernelContext* context,
+                                int idx_in, int idx_out,
+                                const TensorShape& shape) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+
+  const Tensor& data = context->input(idx_data_in);
+  MklShape mkl_shape_output;
+  mkl_shape_output.SetMklTensor(false);
+  AllocateOutputSetMklShape(context, idx_out, mkl_shape_output);
+  Tensor output(data.dtype());
+  // TODO(intel_tf): alternatively, call forward_input_to_output_with_shape(...)
+  CHECK(output.CopyFrom(data, shape));
+  context->set_output(idx_data_out, output);
+}
+
+namespace mkl_op_registry {
 static const char* kMklOpLabel = "MklOp";
 static const char* kMklOpLabelPattern = "label='MklOp'";
 
-- 
GitLab


From 60fb0a8c11f980fd87a6eded122191dd89c11199 Mon Sep 17 00:00:00 2001
From: Umang Mehta <umang.mehta@affectiva.com>
Date: Mon, 17 Apr 2017 23:00:58 -0400
Subject: [PATCH 0490/1563] Including the grpc++/create_channel.h only when
 gRPC support is enabled (#9267)

* Including the grpc++/create_channel.h only when gRPC support is enabled

* fixup for identation
---
 tensorflow/core/debug/debug_io_utils.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc
index aa14065657..8c8ad13042 100644
--- a/tensorflow/core/debug/debug_io_utils.cc
+++ b/tensorflow/core/debug/debug_io_utils.cc
@@ -17,7 +17,9 @@ limitations under the License.
 
 #include <vector>
 
+#if defined(PLATFORM_GOOGLE)
 #include "grpc++/create_channel.h"
+#endif
 
 #if defined(PLATFORM_WINDOWS)
 // winsock2.h is used in grpc, so Ws2_32.lib is needed
-- 
GitLab


From 822b60144146d97b544d8c7bec7f4ef4c68698d5 Mon Sep 17 00:00:00 2001
From: Yifei Feng <fengyifei2026@gmail.com>
Date: Mon, 17 Apr 2017 20:07:45 -0700
Subject: [PATCH 0491/1563] Add BestSplits op to common windows installation
 problems. (#9279)

* Add BestSplits op to common windows installation problems.

* Fix stackoverflow url.

* Add an entry about SSE instructions
---
 tensorflow/docs_src/install/install_windows.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 3fae112b94..c6bce00d0f 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -193,5 +193,19 @@ ImportError: cannot import name 'descriptor'</pre>
   <td><pre>No module named "pywrap_tensorflow"</pre></td>
 </tr>
 
+<tr>
+  <td><a href="https://stackoverflow.com/q/42217532">42217532</a></td>
+  <td>
+  <pre>OpKernel ('op: "BestSplits" device_type: "CPU"') for unknown op: BestSplits</pre>
+  </td>
+</tr>
+
+<tr>
+  <td><a href="https://stackoverflow.com/q/43134753">43134753</a></td>
+  <td>
+  <pre>The TensorFlow library wasn't compiled to use SSE instructions</pre>
+  </td>
+</tr>
+
 </table>
 
-- 
GitLab


From cca1b71352d246fc292d6e6b9cda63810c659c83 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 18:44:28 -0800
Subject: [PATCH 0492/1563] Expose `get_name_scope` and fix example docstring.
 Change: 153420717

---
 tensorflow/contrib/framework/python/ops/ops.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/framework/python/ops/ops.py b/tensorflow/contrib/framework/python/ops/ops.py
index 2117a24965..4fccc2ceac 100644
--- a/tensorflow/contrib/framework/python/ops/ops.py
+++ b/tensorflow/contrib/framework/python/ops/ops.py
@@ -21,7 +21,8 @@ from __future__ import print_function
 from tensorflow.python.framework import ops
 
 
-__all__ = ['get_graph_from_inputs']
+__all__ = ['get_graph_from_inputs',
+           'get_name_scope']
 
 
 def get_graph_from_inputs(op_input_list, graph=None):
@@ -62,7 +63,7 @@ def get_name_scope():
     ```python
     with tf.name_scope('scope1'):
       with tf.name_scope('scope2'):
-        print(tf.get_name_scope())
+        print(tf.contrib.framework.get_name_scope())
     ```
     would print the string `scope1/scope2`.
 
-- 
GitLab


From 69a4cf80a129af3fe46b6ff9c509be442d5a06f9 Mon Sep 17 00:00:00 2001
From: Patrick Nguyen <drpng@google.com>
Date: Mon, 17 Apr 2017 20:41:44 -0800
Subject: [PATCH 0493/1563] Merge changes from github. Change: 153426348

---
 ISSUE_TEMPLATE.md                             |  24 +-
 tensorflow/contrib/BUILD                      |   1 +
 tensorflow/contrib/cmake/CMakeLists.txt       |  11 +-
 tensorflow/contrib/cmake/tf_c.cmake           |  28 ++
 tensorflow/contrib/cmake/tf_cc_ops.cmake      |   1 +
 .../contrib/cmake/tf_core_kernels.cmake       |   4 +
 tensorflow/contrib/cmake/tf_python.cmake      |  39 +-
 tensorflow/contrib/cmake/tf_shared_lib.cmake  |  87 ++++
 tensorflow/contrib/cmake/tf_tools.cmake       |   9 +
 .../contrib/cmake/tools/create_def_file.py    |  78 +++-
 .../python/kernel_tests/bernoulli_test.py     |   9 +
 .../distributions/python/ops/bernoulli.py     |  13 +
 tensorflow/contrib/image/BUILD                |  28 ++
 tensorflow/contrib/image/__init__.py          |   2 +
 ...single_image_random_dot_stereograms_ops.cc | 424 ++++++++++++++++++
 ...single_image_random_dot_stereograms_ops.cc |  93 ++++
 .../single_image_random_dot_stereograms.py    | 125 ++++++
 .../dataframe/queues/feeding_functions.py     |   1 +
 .../learn/python/learn/estimators/head.py     |   2 +-
 .../python/learn/estimators/head_test.py      |  80 ++--
 .../python/learn/estimators/run_config.py     |   4 +-
 .../kernels/segment_reduction_ops_gpu.cu.cc   |   2 -
 .../core/kernels/self_adjoint_eig_v2_op.cc    |  10 +-
 tensorflow/core/ops/array_ops.cc              |   3 +-
 tensorflow/core/ops/linalg_ops.cc             |   2 +-
 tensorflow/core/ops/ops.pbtxt                 |  53 +++
 tensorflow/docs_src/extend/adding_an_op.md    |   8 +-
 .../docs_src/install/install_sources.md       |   3 +-
 .../docs_src/performance/quantization.md      |   4 +-
 .../examples/learn/iris_custom_decay_dnn.py   |   2 +
 .../text_classification_character_cnn.py      |   5 +-
 .../tutorials/mnist/mnist_with_summaries.py   |   4 +-
 .../kernel_tests/self_adjoint_eig_op_test.py  |   9 +-
 tensorflow/python/layers/normalization.py     |  17 +
 tensorflow/python/ops/nn_grad.py              |  10 +
 tensorflow/python/ops/nn_ops.py               |  12 +-
 .../summary/writer/event_file_writer.py       |  22 +-
 .../python/summary/writer/writer_test.py      |   9 +
 tensorflow/tools/graph_transforms/README.md   |   4 +-
 39 files changed, 1122 insertions(+), 120 deletions(-)
 mode change 100644 => 100755 tensorflow/contrib/BUILD
 create mode 100644 tensorflow/contrib/cmake/tf_c.cmake
 create mode 100644 tensorflow/contrib/cmake/tf_shared_lib.cmake
 mode change 100644 => 100755 tensorflow/contrib/image/BUILD
 mode change 100644 => 100755 tensorflow/contrib/image/__init__.py
 create mode 100755 tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc
 create mode 100755 tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc
 create mode 100755 tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 50f67963bf..d0979e87f7 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,14 +1,32 @@
-NOTE: Issues that are not bugs or feature requests will be closed. Please ask usage questions on StackOverflow.
+Please go to Stack Overflow for help and support. http://stackoverflow.com/questions/tagged/tensorflow
+If you open a GitHub issue, here is our policy:
 
-### You must complete this information or else your issue will be closed
+1. It must be a bug or feature request.
+2. The form below must be filled out.
+
+**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g. fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
+
+------------------------
+
+Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
+
+### System Information
 - *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
+- *OS Platform and Distribution (i.e. Linux Ubuntu 16.0)*:
 - *TensorFlow installed from (source or binary)?*:
-- *TensorFlow version*:
+- *TensorFlow version* (use command below):
 - *Bazel version (if compiling from source)*:
 - *CUDA/cuDNN version*:
 - *GPU Model and Memory*:
 - *Exact command to reproduce*:
 
+You can collect some of this information using our environment capture script https://github.com/tensorflow/tensorflow/blob/master/tools/
+You can collect the TensorFlow version with
+```sh
+python -c "import tensorflow as tf; print (tf.GIT_VERSION, tf.VERSION)"
+```
+
+
 ### Describe the problem clearly
 
 ### Source Code / Logs
diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
old mode 100644
new mode 100755
index 17997844df..3ff76c3054
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -28,6 +28,7 @@ py_library(
         "//tensorflow/contrib/grid_rnn:grid_rnn_py",
         "//tensorflow/contrib/hooks",
         "//tensorflow/contrib/image:image_py",
+        "//tensorflow/contrib/image:single_image_random_dot_stereograms_py",
         "//tensorflow/contrib/imperative",
         "//tensorflow/contrib/input_pipeline:input_pipeline_py",
         "//tensorflow/contrib/integrate:integrate_py",
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 31a3d45a98..af7b4fb386 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -29,6 +29,7 @@ option(tensorflow_BUILD_ALL_KERNELS "Build all OpKernels" ON)
 option(tensorflow_BUILD_CONTRIB_KERNELS "Build OpKernels from tensorflow/contrib/..." ON)
 option(tensorflow_BUILD_CC_TESTS "Build cc unit tests " OFF)
 option(tensorflow_BUILD_PYTHON_TESTS "Build python unit tests " OFF)
+option(tensorflow_BUILD_SHARED_LIB "Build TensorFlow as a shared library" OFF)
 option(tensorflow_OPTIMIZE_FOR_NATIVE_ARCH "Enable compiler optimizations for the native processor architecture (if available)" ON)
 option(tensorflow_WIN_CPU_SIMD_OPTIONS "Enables CPU SIMD instructions")
 
@@ -198,7 +199,7 @@ if (tensorflow_ENABLE_GPU)
     # add cudnn
     include_directories(${CUDNN_HOME})
     set(CUDA_LIBRARIES ${CUDA_LIBRARIES} ${CUDA_CUDA_LIBRARY} ${CUDA_CUBLAS_LIBRARIES} ${CUDA_CUFFT_LIBRARIES}
-      ${CUDA_curand_LIBRARY} ${CUDA_cupti_LIBRARY} ${CUDNN_HOME}/lib/x64/cudnn.lib)
+      ${CUDA_curand_LIBRARY} ${CUDA_cupti_LIBRARY} ${CUDA_cusolver_LIBRARY} ${CUDNN_HOME}/lib/x64/cudnn.lib)
 
     # create cuda_config.h
     FILE(WRITE ${tensorflow_source_dir}/third_party/gpus/cuda/cuda_config.h
@@ -219,6 +220,7 @@ if (tensorflow_ENABLE_GPU)
       ${CUDA_TOOLKIT_TARGET_DIR}/include/cublas_v2.h ${CUDNN_HOME}/include/cudnn.h
       ${CUDA_TOOLKIT_TARGET_DIR}/include/cufft.h ${CUDA_TOOLKIT_TARGET_DIR}/include/curand.h
       ${CUDA_TOOLKIT_TARGET_DIR}/include/cuda_runtime_api.h
+      ${CUDA_TOOLKIT_TARGET_DIR}/include/cusolverDn.h
       DESTINATION ${tensorflow_source_dir}/third_party/gpus/cuda/include
     )
     include_directories(${tensorflow_source_dir}/third_party/gpus)
@@ -244,7 +246,9 @@ include(tf_core_kernels.cmake)
 if(tensorflow_ENABLE_GRPC_SUPPORT)
   include(tf_core_distributed_runtime.cmake)
 endif()
+# We include tf_cc_ops first, because tf_c depends on tf_cc.
 include(tf_cc_ops.cmake)
+include(tf_c.cmake)
 if(tensorflow_BUILD_CC_EXAMPLE)
   include(tf_tutorials.cmake)
   include(tf_label_image_example.cmake)
@@ -254,6 +258,9 @@ if(tensorflow_BUILD_PYTHON_BINDINGS)
   include(tensorboard)
   include(tf_python.cmake)
 endif()
-if (tensorflow_BUILD_CC_TESTS OR tensorflow_BUILD_PYTHON_TESTS)
+if(tensorflow_BUILD_SHARED_LIB)
+  include(tf_shared_lib.cmake)
+endif()
+if(tensorflow_BUILD_CC_TESTS OR tensorflow_BUILD_PYTHON_TESTS)
   include(tf_tests.cmake)
 endif()
diff --git a/tensorflow/contrib/cmake/tf_c.cmake b/tensorflow/contrib/cmake/tf_c.cmake
new file mode 100644
index 0000000000..069cdfa352
--- /dev/null
+++ b/tensorflow/contrib/cmake/tf_c.cmake
@@ -0,0 +1,28 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+########################################################
+# tf_c_framework library
+########################################################
+set(tf_c_srcs
+    "${tensorflow_source_dir}/tensorflow/c/c_api.cc"
+    "${tensorflow_source_dir}/tensorflow/c/c_api.h"
+    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.cc"
+    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.h"
+    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.cc"
+    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.h"
+)
+
+add_library(tf_c OBJECT ${tf_c_srcs})
+add_dependencies(tf_c tf_cc_framework tf_core_lib tf_protos_cc)
diff --git a/tensorflow/contrib/cmake/tf_cc_ops.cmake b/tensorflow/contrib/cmake/tf_cc_ops.cmake
index bb03593d54..b53f428461 100644
--- a/tensorflow/contrib/cmake/tf_cc_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_cc_ops.cmake
@@ -19,6 +19,7 @@ set(tf_cc_framework_srcs
     "${tensorflow_source_dir}/tensorflow/cc/framework/ops.h"
     "${tensorflow_source_dir}/tensorflow/cc/framework/ops.cc"
     "${tensorflow_source_dir}/tensorflow/cc/framework/scope.h"
+    "${tensorflow_source_dir}/tensorflow/cc/framework/scope_internal.h"
     "${tensorflow_source_dir}/tensorflow/cc/framework/scope.cc"
 )
 
diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index c13c28910f..1b2096b645 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -116,6 +116,10 @@ if(WIN32)
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/lstm_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/gru_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/lstm_ops.cc"
+      # temporarily disable nccl (nccl itself needs to be ported to windows first)
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_manager.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_ops.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/nccl/ops/nccl_ops.cc"
   )
   list(REMOVE_ITEM tf_core_kernels_srcs ${tf_core_kernels_windows_exclude_srcs})
 endif(WIN32)
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 35629ba3b3..983f976c95 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -686,19 +686,7 @@ set (pywrap_tensorflow_internal_src
     "${tensorflow_source_dir}/tensorflow/python/lib/io/py_record_writer.cc"
     "${tensorflow_source_dir}/tensorflow/python/util/kernel_registry.h"
     "${tensorflow_source_dir}/tensorflow/python/util/kernel_registry.cc"
-    "${tensorflow_source_dir}/tensorflow/c/c_api.cc"
-    "${tensorflow_source_dir}/tensorflow/c/c_api.h"
-    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.cc"
-    "${tensorflow_source_dir}/tensorflow/c/checkpoint_reader.h"
-    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.cc"
-    "${tensorflow_source_dir}/tensorflow/c/tf_status_helper.h"
-    "${tensorflow_source_dir}/tensorflow/cc/framework/gradients.h"
-    "${tensorflow_source_dir}/tensorflow/cc/framework/gradients.cc"
-    "${tensorflow_source_dir}/tensorflow/cc/framework/grad_op_registry.h"
-    "${tensorflow_source_dir}/tensorflow/cc/framework/grad_op_registry.cc"
-    "${tensorflow_source_dir}/tensorflow/cc/framework/ops.h"
     "${tensorflow_source_dir}/tensorflow/cc/framework/ops.cc"
-    "${tensorflow_source_dir}/tensorflow/cc/framework/scope_internal.h"
     "${tensorflow_source_dir}/tensorflow/cc/framework/scope.cc"
     "${CMAKE_CURRENT_BINARY_DIR}/pywrap_tensorflow_internal.cc"
 )
@@ -715,9 +703,11 @@ if(WIN32)
     #
     add_library(pywrap_tensorflow_internal_static STATIC
         ${pywrap_tensorflow_internal_src}
+        $<TARGET_OBJECTS:tf_c>
         $<TARGET_OBJECTS:tf_core_lib>
         $<TARGET_OBJECTS:tf_core_cpu>
         $<TARGET_OBJECTS:tf_core_framework>
+        $<TARGET_OBJECTS:tf_cc>
         $<TARGET_OBJECTS:tf_cc_ops>
         $<TARGET_OBJECTS:tf_core_ops>
         $<TARGET_OBJECTS:tf_core_direct_session>
@@ -727,33 +717,43 @@ if(WIN32)
         $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
         $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
     )
+    
     target_include_directories(pywrap_tensorflow_internal_static PUBLIC
         ${PYTHON_INCLUDE_DIR}
         ${NUMPY_INCLUDE_DIR}
     )
-    target_link_libraries(pywrap_tensorflow_internal_static
-        tf_protos_cc
-        tf_python_protos_cc
+    #target_link_libraries(pywrap_tensorflow_internal_static
+    #	tf_protos_cc
+    #	tf_python_protos_cc
+    #)  
+    add_dependencies(pywrap_tensorflow_internal_static tf_protos_cc tf_python_protos_cc)
+    set(pywrap_tensorflow_internal_static_dependencies
+        $<TARGET_FILE:pywrap_tensorflow_internal_static>
+        $<TARGET_FILE:tf_protos_cc>
+        $<TARGET_FILE:tf_python_protos_cc>
     )
+    
     set(pywrap_tensorflow_deffile "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pywrap_tensorflow.def")
     set_source_files_properties(${pywrap_tensorflow_deffile} PROPERTIES GENERATED TRUE)
 
     add_custom_command(TARGET pywrap_tensorflow_internal_static POST_BUILD
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/create_def_file.py
-            --input $<TARGET_FILE:pywrap_tensorflow_internal_static>
-            --output ${pywrap_tensorflow_deffile}
+            --input "${pywrap_tensorflow_internal_static_dependencies}"
+            --output "${pywrap_tensorflow_deffile}"
+            --target _pywrap_tensorflow_internal.pyd
     )
 endif(WIN32)
 
-
 # pywrap_tensorflow_internal is a shared library containing all of the
 # TensorFlow runtime and the standard ops and kernels. These are installed into
 # tf_python/tensorflow/python/.
 add_library(pywrap_tensorflow_internal SHARED
     ${pywrap_tensorflow_internal_src}
+    $<TARGET_OBJECTS:tf_c>
     $<TARGET_OBJECTS:tf_core_lib>
     $<TARGET_OBJECTS:tf_core_cpu>
     $<TARGET_OBJECTS:tf_core_framework>
+    $<TARGET_OBJECTS:tf_cc>
     $<TARGET_OBJECTS:tf_cc_ops>
     $<TARGET_OBJECTS:tf_core_ops>
     $<TARGET_OBJECTS:tf_core_direct_session>
@@ -773,7 +773,8 @@ target_include_directories(pywrap_tensorflow_internal PUBLIC
     ${PYTHON_INCLUDE_DIR}
     ${NUMPY_INCLUDE_DIR}
 )
-target_link_libraries(pywrap_tensorflow_internal
+
+target_link_libraries(pywrap_tensorflow_internal PRIVATE
     ${tf_core_gpu_kernels_lib}
     ${tensorflow_EXTERNAL_LIBRARIES}
     tf_protos_cc
diff --git a/tensorflow/contrib/cmake/tf_shared_lib.cmake b/tensorflow/contrib/cmake/tf_shared_lib.cmake
new file mode 100644
index 0000000000..47289fd9d2
--- /dev/null
+++ b/tensorflow/contrib/cmake/tf_shared_lib.cmake
@@ -0,0 +1,87 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+if(WIN32)
+  # Windows: build a static library with the same objects as tensorflow.dll.
+  # This can be used to build for a standalone exe and also helps us to
+  # find all symbols that need to be exported from the dll which is needed
+  # to provide the tensorflow c/c++ api in tensorflow.dll.
+  # From the static library we create the def file with all symbols that need to
+  # be exported from tensorflow.dll. Because there is a limit of 64K sybmols
+  # that can be exported, we filter the symbols with a python script to the namespaces
+  # we need.
+  #
+  add_library(tensorflow_static STATIC
+      $<TARGET_OBJECTS:tf_c>
+      $<TARGET_OBJECTS:tf_cc>
+      $<TARGET_OBJECTS:tf_cc_framework>
+      $<TARGET_OBJECTS:tf_cc_ops>
+      $<TARGET_OBJECTS:tf_core_lib>
+      $<TARGET_OBJECTS:tf_core_cpu>
+      $<TARGET_OBJECTS:tf_core_framework>
+      $<TARGET_OBJECTS:tf_core_ops>
+      $<TARGET_OBJECTS:tf_core_direct_session>
+      $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
+      $<$<BOOL:${tensorflow_ENABLE_GRPC_SUPPORT}>:$<TARGET_OBJECTS:tf_core_distributed_runtime>>
+      $<TARGET_OBJECTS:tf_core_kernels>
+      $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+      $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
+  )
+
+  add_dependencies(tensorflow_static tf_protos_cc)
+  set(tensorflow_static_dependencies
+      $<TARGET_FILE:tensorflow_static>
+      $<TARGET_FILE:tf_protos_cc>
+  )
+    
+  set(tensorflow_deffile "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/tensorflow.def")
+  set_source_files_properties(${tensorflow_deffile} PROPERTIES GENERATED TRUE)
+
+  add_custom_command(TARGET tensorflow_static POST_BUILD
+      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/create_def_file.py
+          --input "${tensorflow_static_dependencies}"
+          --output "${tensorflow_deffile}"
+          --target tensorflow.dll
+  )
+endif(WIN32)
+
+# tensorflow is a shared library containing all of the
+# TensorFlow runtime and the standard ops and kernels.
+add_library(tensorflow SHARED
+    $<TARGET_OBJECTS:tf_c>
+    $<TARGET_OBJECTS:tf_cc>
+    $<TARGET_OBJECTS:tf_cc_framework>
+    $<TARGET_OBJECTS:tf_cc_ops>
+    $<TARGET_OBJECTS:tf_core_lib>
+    $<TARGET_OBJECTS:tf_core_cpu>
+    $<TARGET_OBJECTS:tf_core_framework>
+    $<TARGET_OBJECTS:tf_core_ops>
+    $<TARGET_OBJECTS:tf_core_direct_session>
+    $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
+    $<$<BOOL:${tensorflow_ENABLE_GRPC_SUPPORT}>:$<TARGET_OBJECTS:tf_core_distributed_runtime>>
+    $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
+    ${tensorflow_deffile}
+)
+
+target_link_libraries(tensorflow PRIVATE
+    ${tf_core_gpu_kernels_lib}
+    ${tensorflow_EXTERNAL_LIBRARIES}
+    tf_protos_cc
+)
+
+if(WIN32)
+  add_dependencies(tensorflow tensorflow_static)
+endif(WIN32)
diff --git a/tensorflow/contrib/cmake/tf_tools.cmake b/tensorflow/contrib/cmake/tf_tools.cmake
index c518414f0c..6ef9598963 100644
--- a/tensorflow/contrib/cmake/tf_tools.cmake
+++ b/tensorflow/contrib/cmake/tf_tools.cmake
@@ -73,10 +73,13 @@ add_executable(${transform_graph}
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
     $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
 )
 
 target_link_libraries(${transform_graph} PUBLIC
   tf_protos_cc
+  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
@@ -92,10 +95,13 @@ add_executable(${summarize_graph}
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
     $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
 )
 
 target_link_libraries(${summarize_graph} PUBLIC
   tf_protos_cc
+  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
@@ -111,10 +117,13 @@ add_executable(${compare_graphs}
     $<TARGET_OBJECTS:tf_core_direct_session>
     $<TARGET_OBJECTS:tf_tools_transform_graph_lib>
     $<TARGET_OBJECTS:tf_core_kernels>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_core_kernels_cpu_only>>
+    $<$<BOOL:${tensorflow_ENABLE_GPU}>:$<TARGET_OBJECTS:tf_stream_executor>>
 )
 
 target_link_libraries(${compare_graphs} PUBLIC
   tf_protos_cc
+  ${tf_core_gpu_kernels_lib}
   ${tensorflow_EXTERNAL_LIBRARIES}
 )
 
diff --git a/tensorflow/contrib/cmake/tools/create_def_file.py b/tensorflow/contrib/cmake/tools/create_def_file.py
index ebdc918168..9bd287d0d7 100644
--- a/tensorflow/contrib/cmake/tools/create_def_file.py
+++ b/tensorflow/contrib/cmake/tools/create_def_file.py
@@ -47,8 +47,16 @@ DUMPBIN = "dumpbin.exe"
 EXCLUDE_RE = re.compile(r"deleting destructor|::internal::")
 
 # Include if matched before exclude
-INCLUDEPRE_RE = re.compile(r"tensorflow::internal::LogMessage|"
-                           r"tensorflow::internal::CheckOpMessageBuilder")
+INCLUDEPRE_RE = re.compile(r"google::protobuf::internal::ExplicitlyConstructed|"
+                           r"tensorflow::internal::LogMessage|"
+                           r"tensorflow::internal::LogString|"
+                           r"tensorflow::internal::CheckOpMessageBuilder|"
+                           r"tensorflow::internal::PickUnusedPortOrDie|"
+                           r"tensorflow::internal::ValidateDevice|"
+                           r"tensorflow::ops::internal::Enter|"
+                           r"tensorflow::strings::internal::AppendPieces|"
+                           r"tensorflow::strings::internal::CatPieces|"
+                           r"tensorflow::io::internal::JoinPathImpl")
 
 # Include if matched after exclude
 INCLUDE_RE = re.compile(r"^(TF_\w*)$|"
@@ -56,12 +64,27 @@ INCLUDE_RE = re.compile(r"^(TF_\w*)$|"
                         r"functor::|"
                         r"perftools::gputools")
 
-
+# We want to identify data members explicitly in the DEF file, so that no one
+# can implicitly link against the DLL if they use one of the variables exported
+# from the DLL and the header they use does not decorate the symbol with
+# __declspec(dllimport). It is easier to detect what a data symbol does 
+# NOT look like, so doing it with the below regex.
+DATA_EXCLUDE_RE = re.compile(r"[)(]|"
+                             r"vftable|"
+                             r"vbtable|"
+                             r"vcall|"
+                             r"RTTI|"
+                             r"protobuf::internal::ExplicitlyConstructed")
+      
 def get_args():
   """Parse command line."""
+  filename_list = lambda x: x.split(";")
   parser = argparse.ArgumentParser()
-  parser.add_argument("--input", help="input library", required=True)
+  parser.add_argument("--input", type=filename_list,
+                      help="paths to input libraries separated by semicolons",
+                      required=True)
   parser.add_argument("--output", help="output deffile", required=True)
+  parser.add_argument("--target", help="name of the target", required=True)
   args = parser.parse_args()
   return args
 
@@ -70,25 +93,26 @@ def main():
   """main."""
   args = get_args()
 
-  # Pipe dumpbin to extract all linkable symbols from a lib.
+  # Pipe dumpbin to extract all linkable symbols from libs.
   # Good symbols are collected in candidates and also written to
   # a temp file.
   candidates = []
   tmpfile = tempfile.NamedTemporaryFile(mode="w", delete=False)
-  proc = subprocess.Popen([DUMPBIN, "/nologo", "/linkermember:1", args.input],
-                          stdout=subprocess.PIPE)
-  for line in io.TextIOWrapper(proc.stdout, encoding="utf-8"):
-    cols = line.split()
-    if len(cols) < 2:
-      continue
-    sym = cols[1]
-    tmpfile.file.write(sym + "\n")
-    candidates.append(sym)
+  for lib_path in args.input:
+    proc = subprocess.Popen([DUMPBIN, "/nologo", "/linkermember:1", lib_path],
+                            stdout=subprocess.PIPE)
+    for line in io.TextIOWrapper(proc.stdout, encoding="utf-8"):
+      cols = line.split()
+      if len(cols) < 2:
+        continue
+      sym = cols[1]
+      tmpfile.file.write(sym + "\n")
+      candidates.append(sym)
+    exit_code = proc.wait()
+    if exit_code != 0:
+      print("{} failed, exit={}".format(DUMPBIN, exit_code))
+      return exit_code
   tmpfile.file.close()
-  exit_code = proc.wait()
-  if exit_code != 0:
-    print("{} failed, exit={}".format(DUMPBIN, exit_code))
-    return exit_code
 
   # Run the symbols through undname to get their undecorated name
   # so we can filter on something readable.
@@ -96,9 +120,8 @@ def main():
     # track dupes
     taken = set()
 
-    # Header for the def file. Since the tensorflow.dll is actually called
-    # _pywrap_tensorflow.pyd in the python wheel, hint that in the def file.
-    def_fp.write("LIBRARY _pywrap_tensorflow_internal.pyd\n")
+    # Header for the def file.
+    def_fp.write("LIBRARY " + args.target + "\n")
     def_fp.write("EXPORTS\n")
     def_fp.write("\t ??1OpDef@tensorflow@@UEAA@XZ\n")
 
@@ -118,8 +141,17 @@ def main():
           continue
         if not INCLUDE_RE.search(line):
           continue
-
-      def_fp.write("\t" + decorated + "\n")
+          
+      if "deleting destructor" in line:
+        # Some of the symbols convered by INCLUDEPRE_RE export deleting
+        # destructor symbols, which is a bad idea.
+        # So we filter out such symbols here.
+        continue
+          
+      if DATA_EXCLUDE_RE.search(line):
+        def_fp.write("\t" + decorated + "\n")
+      else:
+        def_fp.write("\t" + decorated + " DATA\n")      
       taken.add(decorated)
   exit_code = proc.wait()
   if exit_code != 0:
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
index 6ba872ef9c..87b2331a1d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
@@ -148,6 +148,15 @@ class BernoulliTest(test.TestCase):
               p: [0.2, 0.3, 0.4]
           }), [[0.2, 0.7, 0.4]])
 
+  def testPmfInvalid(self):
+    p = [0.1, 0.2, 0.7]
+    with self.test_session():
+      dist = bernoulli.Bernoulli(probs=p, validate_args=True)
+      with self.assertRaisesOpError("must be non-negative."):
+        dist.prob([1, 1, -1]).eval()
+      with self.assertRaisesOpError("is not less than or equal to 1."):
+        dist.prob([2, 0, 1]).eval()
+
   def testPmfWithP(self):
     p = [[0.2, 0.4], [0.3, 0.6]]
     self._testPmf(probs=p)
diff --git a/tensorflow/contrib/distributions/python/ops/bernoulli.py b/tensorflow/contrib/distributions/python/ops/bernoulli.py
index 33e6dbd78b..c491cb5d42 100644
--- a/tensorflow/contrib/distributions/python/ops/bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/bernoulli.py
@@ -25,6 +25,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
@@ -120,6 +121,7 @@ class Bernoulli(distribution.Distribution):
     return math_ops.cast(sample, self.dtype)
 
   def _log_prob(self, event):
+    event = self._maybe_assert_valid_sample(event)
     # TODO(jaana): The current sigmoid_cross_entropy_with_logits has
     # inconsistent  behavior for logits = inf/-inf.
     event = math_ops.cast(event, self.logits.dtype)
@@ -160,6 +162,17 @@ class Bernoulli(distribution.Distribution):
     """Returns `1` if `prob > 0.5` and `0` otherwise."""
     return math_ops.cast(self.probs > 0.5, self.dtype)
 
+  def _maybe_assert_valid_sample(self, event, check_integer=True):
+    if not self.validate_args:
+      return event
+    event = distribution_util.embed_check_nonnegative_discrete(
+        event, check_integer=check_integer)
+    return control_flow_ops.with_dependencies([
+        check_ops.assert_less_equal(
+            event, array_ops.ones_like(event),
+            message="event is not less than or equal to 1."),
+    ], event)
+
 
 class BernoulliWithSigmoidProbs(Bernoulli):
   """Bernoulli with `probs = nn.sigmoid(logits)`."""
diff --git a/tensorflow/contrib/image/BUILD b/tensorflow/contrib/image/BUILD
old mode 100644
new mode 100755
index c31ac7b324..7599406aca
--- a/tensorflow/contrib/image/BUILD
+++ b/tensorflow/contrib/image/BUILD
@@ -87,6 +87,7 @@ cuda_py_test(
     srcs = ["python/kernel_tests/image_ops_test.py"],
     additional_deps = [
         ":image_py",
+        ":single_image_random_dot_stereograms_py",
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -96,6 +97,33 @@ cuda_py_test(
     ],
 )
 
+tf_custom_op_library(
+    name = "python/ops/_single_image_random_dot_stereograms.so",
+    srcs = [
+        "kernels/single_image_random_dot_stereograms_ops.cc",
+        "ops/single_image_random_dot_stereograms_ops.cc",
+    ],
+)
+
+tf_gen_op_libs(
+    op_lib_names = ["single_image_random_dot_stereograms_ops"],
+)
+
+tf_gen_op_wrapper_py(
+    name = "single_image_random_dot_stereograms_ops",
+    deps = [":single_image_random_dot_stereograms_ops_op_lib"],
+)
+
+py_library(
+    name = "single_image_random_dot_stereograms_py",
+    srcs = glob(["python/ops/single*.py"]) + ["__init__.py"],
+    data = [":python/ops/_single_image_random_dot_stereograms.so"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":single_image_random_dot_stereograms_ops",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/contrib/image/__init__.py b/tensorflow/contrib/image/__init__.py
old mode 100644
new mode 100755
index 4ad599b1f8..aa70d42339
--- a/tensorflow/contrib/image/__init__.py
+++ b/tensorflow/contrib/image/__init__.py
@@ -25,6 +25,7 @@ projective transforms (including rotation) are supported.
 @@compose_transforms
 @@rotate
 @@transform
+@@single_image_random_dot_stereograms
 """
 from __future__ import absolute_import
 from __future__ import division
@@ -35,6 +36,7 @@ from tensorflow.contrib.image.python.ops.image_ops import angles_to_projective_t
 from tensorflow.contrib.image.python.ops.image_ops import compose_transforms
 from tensorflow.contrib.image.python.ops.image_ops import rotate
 from tensorflow.contrib.image.python.ops.image_ops import transform
+from tensorflow.contrib.image.python.ops.single_image_random_dot_stereograms import single_image_random_dot_stereograms
 
 from tensorflow.python.util.all_util import remove_undocumented
 
diff --git a/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc b/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc
new file mode 100755
index 0000000000..23efd359d5
--- /dev/null
+++ b/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc
@@ -0,0 +1,424 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+using shape_inference::InferenceContext;
+
+template <typename T>
+class SingleImageRandomDotStereogramsOp : public OpKernel {
+ private:
+  int E2Epixels;  // Pixels from eye to eye = eye_to_eye_inches * DPI
+
+  int input_Xvalue;  // X value of input Z values (width)
+  int input_Yvalue;  // Y value of input Z values (height)
+
+  int output_Ximage;  // X value of output image (width)
+  int output_Yimage;  // Y value of output image (height)
+  int output_Cimage;  // color value of output image (color, 1 or 3)  (3 not
+                      // implemented)
+
+  int data_box_left;    // X starting value for DATA window
+  int data_box_top;     // Y starting value for DATA window
+  int data_box_width;   // width of scan line
+  int data_box_height;  // hight of image
+
+  int converge_dot_box_end;  // Row convergences dots end on
+
+  uint8* outputImage;  // Output Image flat as a buffer (Tensor Connection)
+  double* ZBuffer;     // For internal use, allow for MASK, etc later, actual Z
+                       // used for Stereogram, XxY (X is the row index, y is col
+                       // index like a screen)
+                       // 0 (far) -> 1.0(near) range
+  bool hidden_surface_removal;
+  int convergence_dots_size;
+  int dots_per_inch;
+  float eye_separation;
+  float mu;
+  bool normalize;
+  float normalize_max;
+  float normalize_min;
+  float border_level;
+  int number_colors;
+  ::tensorflow::TensorShapeProto output_image_shape;
+  ::tensorflow::TensorShapeProto output_data_window;
+
+  uint8 Cblack = (uint8)0;
+  uint8 Cwhite = (uint8)255;
+
+  int indexMode = 0;  // 0 - truncate XY, 1 - round XY, 2 - Interpolate XY (not
+                      // implemented yet, keep default of 0)
+  int interp_x, interp_y;  // 1 - yes, 0 - no  interpolation directions (not
+                           // implemented yet)
+
+  bool debugging = false;
+
+  inline int separation(double z) {
+    return (std::round((1 - mu * z) * E2Epixels / (2 - mu * z)));
+  }
+
+  inline int get_far_width() { return (separation(0.0)); }
+  inline int get_near_width() { return (separation(1.0)); }
+
+ public:
+  explicit SingleImageRandomDotStereogramsOp(OpKernelConstruction* context)
+      : OpKernel(context) {  // Constructor
+    OP_REQUIRES_OK(context, context->GetAttr("hidden_surface_removal",
+                                             &hidden_surface_removal));
+    OP_REQUIRES_OK(context, context->GetAttr("convergence_dots_size",
+                                             &convergence_dots_size));
+    OP_REQUIRES_OK(context, context->GetAttr("dots_per_inch", &dots_per_inch));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("eye_separation", &eye_separation));
+    OP_REQUIRES_OK(context, context->GetAttr("mu", &mu));
+    OP_REQUIRES_OK(context, context->GetAttr("normalize", &normalize));
+    OP_REQUIRES_OK(context, context->GetAttr("normalize_max", &normalize_max));
+    OP_REQUIRES_OK(context, context->GetAttr("normalize_min", &normalize_min));
+    OP_REQUIRES_OK(context, context->GetAttr("border_level", &border_level));
+    OP_REQUIRES_OK(context, context->GetAttr("number_colors", &number_colors));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("output_image_shape", &output_image_shape));
+    OP_REQUIRES_OK(context,
+                   context->GetAttr("output_data_window", &output_data_window));
+
+    E2Epixels =
+        eye_separation * dots_per_inch;  // Initialize pixels from eye to eye
+  }
+
+  ~SingleImageRandomDotStereogramsOp() {  // Destructor
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input_tensor = context->input(0);
+    input_Xvalue = input_tensor.shape().dim_size(
+        1);  // X value is the number of columns of the input matrix
+    input_Yvalue =
+        input_tensor.shape().dim_size(0);  // Y value is the number of rows
+
+    output_Ximage = output_image_shape.dim(0).size();
+    output_Yimage = output_image_shape.dim(1).size();
+    output_Cimage = output_image_shape.dim(2).size();
+
+    if (number_colors > 256)  // Go to full color image
+      output_Cimage = 3;
+
+    int data_Xwindow = output_data_window.dim(0).size();
+    int data_Ywindow = output_data_window.dim(1).size();
+
+    int deltaX_border_image = output_Ximage - data_Xwindow;
+    int deltaY_border_image = output_Yimage - data_Ywindow;
+
+    if (convergence_dots_size >
+        0)  // 3 frame sections in Y direction due to DOTS
+    {
+      deltaY_border_image =
+          deltaY_border_image -
+          convergence_dots_size;  // Take off space for Convergence Dots
+      deltaY_border_image = std::max(0, deltaY_border_image);
+      data_box_top = deltaY_border_image / 3;
+
+      if (deltaY_border_image >= 0) {
+        converge_dot_box_end = output_Yimage - 1 - data_box_top;
+      } else {
+        converge_dot_box_end = output_Yimage - 1;
+      }
+    } else  // Otherwise only 2, no convergence dot
+    {
+      data_box_top = deltaY_border_image / 2;  // Center DATA in Y dimension
+      converge_dot_box_end = output_Yimage - 1;
+    }
+
+    data_box_left = deltaX_border_image / 2;  // Center DATA in X dimension
+    data_box_width = data_Xwindow;             // width of scan line
+    data_box_height = data_Ywindow;            // hight of image
+
+    const T* inputZ = input_tensor.flat<T>().data();  // Flatten input Z buffer
+
+    BuildZBuffer(inputZ);
+
+    // Output a scalar string.
+    Tensor* output_tensor = NULL;
+    OP_REQUIRES_OK(
+        context,
+        context->allocate_output(
+            0, TensorShape({output_Yimage, output_Ximage, output_Cimage}),
+            &output_tensor));
+
+    outputImage = output_tensor->flat<uint8>().data();
+
+    generate_stereogram();
+
+    delete[] ZBuffer;
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+  // Move input into standard Z format to reduce complexity of algorithm
+  //
+  void BuildZBuffer(const T* Z, bool log = false) {
+    double MaxValue = 1.0;
+    double MinValue = 0.0;
+    ZBuffer = new double[input_Xvalue * input_Yvalue];  // Used to computer
+                                                        // final Z values before
+                                                        // rendering to output
+
+    if (normalize) {
+      // Init Min/Max to first value
+      if (normalize_max < normalize_min)  // Autoscale if MIN>MAX
+      {
+        MaxValue = (double)*Z;
+        MinValue = (double)*Z;
+
+        for (int y = 0; y < input_Yvalue; ++y)
+          for (int x = 0; x < input_Xvalue; ++x) {
+            double value = getZfromInputImage(Z, x, y);
+            if (value > MaxValue) MaxValue = value;
+            if (value < MinValue) MinValue = value;
+          }
+      } else {
+        MaxValue = normalize_max;
+        MinValue = normalize_min;
+      }
+    }
+
+    for (int y = 0; y < input_Yvalue; ++y)
+      for (int x = 0; x < input_Xvalue; ++x) {
+        double value = getZfromInputImage(Z, x, y);
+
+        if (normalize) {
+          value = (value - MinValue) / (MaxValue - MinValue);
+        }
+
+        if (value > 1.0) value = 1.0;
+        if (value < 0.0) value = 0.0;
+
+        *(ZBuffer + (input_Xvalue * y + x)) = value;
+      }
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+  double getZfromInputImage(const T* Z, int x, int y) {
+    double return_val;
+
+    return_val = (double)*(Z + input_Xvalue * y + x);  // Get value
+    return return_val;
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+  // All normalized, not checking required
+  // Possible Projection issue if DATA is bigger or smaller than Input
+  //  Modes include:
+  //         Truncate value (Default)
+  //         Round-off value
+  //         Interpolate between values
+  //
+  double getZfromZbuffer(double x, double y) {
+    int xi, yi;
+
+    switch (indexMode) {
+      case 0:  // Truncate
+        xi = int(x);
+        yi = int(y);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+      case 1:  // Round-off
+        xi = std::round(x);
+        yi = std::round(y);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+      case 2:  // Interpolate (Not implemented yet, will need 4 points
+               // [x,y],[x+1,y],[x,y+1],[x+1,y+1], then interpolate)
+        xi = int(x);
+        yi = int(y);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+      default:  // Round-off is the default
+        xi = int(x + 0.5);
+        yi = int(y + 0.5);
+        return (*(ZBuffer + (xi + input_Xvalue * yi)));
+        break;
+    }
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  int getOutputImageIndex(int x, int y,
+                          int channel) {  // No error checking for some
+                                          // optimization, calling routine
+                                          // required to make sure there is no
+                                          // violation
+    return ((output_Ximage * output_Cimage) * y + x * output_Cimage + channel);
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  double getZFromOutputPixel(int x, int y) {
+    double xofz, yofz, returnval;
+
+    // Convert pixel units to Z units, do this as "double"
+
+    xofz =
+        (double)input_Xvalue * (x - data_box_left) / ((double)data_box_width);
+    yofz =
+        (double)input_Yvalue * (y - data_box_top) / ((double)data_box_height);
+
+    if ((xofz < 0) || (yofz < 0) || (yofz >= input_Yvalue) ||
+        (xofz >= input_Xvalue)) {  // Top of left side border hit or  Right
+                                   // side or bottom border hit
+                                   // Send BORDER Z value
+      return (border_level);
+    }
+
+    {  // in data set Z interpolate if need
+      double gz;
+
+      gz = getZfromZbuffer(xofz, yofz);
+
+      returnval = gz;
+    }
+
+    return (returnval);
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  void generate_stereogram() {
+    int s, left, right, visible, t, l;
+    double zt, gz;
+    // Scan line
+    uint8* pix;  // Scan row color for each pixel
+    int* same;   // Used to determine if Pixel needs to be the same as another
+                 // pixel in the row
+
+    pix = new uint8[output_Ximage * output_Cimage];
+    same = new int[output_Ximage];
+
+    for (int y = 0; y < output_Yimage; ++y) {
+      // Set no dependencies on any pixels, tie each one back to itself
+      for (int x = 0; x < output_Ximage; ++x) same[x] = x;
+
+      for (int x = 0; x < output_Ximage; ++x) {
+        gz = getZFromOutputPixel(x, y);
+        s = separation(gz);
+        left = x - s / 2;
+        right = left + s;
+
+        if ((left >= 0) && (right < output_Ximage)) {
+          t = 1;
+          visible = 1;
+          if (hidden_surface_removal) do {
+              zt = gz + 2 * (2 - mu * gz) * t / (mu * E2Epixels);
+              visible = (getZFromOutputPixel(x - t, y) < zt) &&
+                        (getZFromOutputPixel(x + t, y) < zt);
+              ++t;
+            } while ((visible) && (zt < 1));
+
+          if (visible) {
+            l = same[left];
+            while ((l != left) && (l != right))
+              if (l < right) {
+                left = l;
+                l = same[left];
+              } else {
+                same[left] = right;
+                left = right;
+                l = same[left];
+                right = l;
+              }
+            same[left] = right;
+          }
+        }
+      }
+      // Set colors for scan row, use channels and number_colors
+      for (int x = output_Ximage - 1; x >= 0; x--) {
+        for (int channel = 0; channel < output_Cimage; ++channel) {
+          if (same[x] == x) {  // Pick a random color
+            if (number_colors == 2) {
+              if ((rand() % 2) == 0) {
+                pix[x * output_Cimage + channel] = Cblack;
+              } else {
+                pix[x * output_Cimage + channel] = Cwhite;
+              }
+            } else {
+              pix[x * output_Cimage + channel] = rand() % 256;
+            }
+          } else
+            pix[x * output_Cimage + channel] =
+                pix[same[x] * output_Cimage + channel];
+
+          setpixel(x, y, channel, pix[x * output_Cimage + channel]);
+        }
+      }
+    }
+
+    draw_convergence_dots();
+
+    delete[] pix;
+    delete[] same;
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  void draw_convergence_dots() {
+    int x1, x2;  // center position for convergence dots
+
+    if (convergence_dots_size == 0)  // No dot, return
+      return;
+
+    x1 = output_Ximage / 2 - get_far_width() / 2;
+    x2 = output_Ximage / 2 + get_far_width() / 2;
+
+    for (int lloop = 0; lloop < convergence_dots_size; ++lloop)
+      for (int wloop = 0; wloop < convergence_dots_size; ++wloop)
+        for (int channel = 0; channel < output_Cimage; ++channel) {
+          setpixel(x1 - (convergence_dots_size / 2) + wloop,
+                   converge_dot_box_end - lloop, channel, Cblack);
+          setpixel(x2 - (convergence_dots_size / 2) + wloop,
+                   converge_dot_box_end - lloop, channel, Cblack);
+        }
+  }
+
+  //***************************************************************************
+  //***************************************************************************
+
+  void setpixel(int x, int y, int channel, uint8 color) {
+    *(outputImage + getOutputImageIndex(x, y, channel)) = color;
+  }
+};
+
+#define REGISTER_KERNEL(T)                                        \
+  REGISTER_KERNEL_BUILDER(Name("SingleImageRandomDotStereograms") \
+                              .Device(DEVICE_CPU)                 \
+                              .TypeConstraint<T>("T"),            \
+                          SingleImageRandomDotStereogramsOp<T>);
+
+REGISTER_KERNEL(int32);
+REGISTER_KERNEL(int64);
+REGISTER_KERNEL(float);
+REGISTER_KERNEL(double);
+
+#undef REGISTER_KERNEL
+
+}  // end namespace tensorflow
diff --git a/tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc b/tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc
new file mode 100755
index 0000000000..8a7cc56256
--- /dev/null
+++ b/tensorflow/contrib/image/ops/single_image_random_dot_stereograms_ops.cc
@@ -0,0 +1,93 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+using shape_inference::InferenceContext;
+
+REGISTER_OP("SingleImageRandomDotStereograms")
+    .Attr("T: {double,float,int64,int32}")
+    .Input("depth_values: T")
+    .Output("image: uint8")
+    .Attr("hidden_surface_removal: bool = true")
+    .Attr("convergence_dots_size: int = 8")
+    .Attr("dots_per_inch: int = 72")
+    .Attr("eye_separation: float = 2.5")
+    .Attr("mu: float = .3333")
+    .Attr("normalize: bool = true")
+    .Attr("normalize_max: float = -100.0")
+    .Attr("normalize_min: float = 100.0")
+    .Attr("border_level: float = 0.0")
+    .Attr("number_colors: int = 256")
+    .Attr(
+        "output_image_shape: shape = { dim {size:1024} dim {size: 768} dim "
+        "{size: 1}}")
+    .Attr("output_data_window: shape = { dim {size:1022} dim {size: 757}}")
+    .Doc(R"doc(
+Outputs a single image random dot stereogram for export via encode_PNG/JPG OP.
+
+Given the 2-D tensor 'depth_values' with encoded Z values, this operation will 
+encode 3-D data into a 2-D image.  The output of this Op is suitable for the
+encode_PNG/JPG ops.  Be careful with image compression as this may corrupt the
+encode 3-D data witin the image.
+
+This Op is based upon:
+'http://www.learningace.com/doc/4331582/b6ab058d1e206d68ab60e4e1ead2fe6e/sirds-paper'
+
+Example use which outputs a SIRDS image as picture_out.png:
+```python
+img=[[1,2,3,3,2,1],
+     [1,2,3,4,5,2],
+     [1,2,3,4,5,3],
+     [1,2,3,4,5,4],
+     [6,5,4,4,5,5]]
+
+session = tf.InteractiveSession()
+
+sirds = single_image_random_dot_stereograms(img,convergence_dots_size=8,number_colors=256,normalize=True)
+
+out = sirds.eval()
+
+png = tf.image.encode_png(out).eval()
+
+with open('picture_out.png', 'wb') as f:
+    f.write(png)
+```
+
+depth_values: Z values of data to encode into 'output_data_window' window, 
+  lower values are further away {0.0 floor(far), 1.0 ceiling(near) after normalization}, must be 2-D tensor
+hidden_surface_removal: Activate hidden surface removal
+convergence_dots_size: Black dot size in pixels to help view converge image, drawn on bottom of image
+dots_per_inch: Output device in dots/inch
+eye_separation: Separation between eyes in inches
+mu: Depth of field, Fraction of viewing distance (eg. 1/3 = .3333)
+normalize: Normalize input data to [0.0, 1.0] 
+normalize_max: Fix MAX value for Normalization - if < MIN, autoscale
+normalize_min: Fix MIN value for Normalization - if > MAX, autoscale
+border_level: Value of border depth 0.0 {far} to 1.0 {near}
+number_colors: 2 (Black & White),256 (grayscale), and Numbers > 256 (Full Color) are all that are supported currently
+output_image_shape: Output size of returned image in X,Y, Channels 1-grayscale, 3 color (1024, 768, 1),
+  channels will be updated to 3 if 'number_colors' > 256
+output_data_window: Size of "DATA" window, must be equal to or smaller than 'output_image_shape', will be centered
+  and use 'convergence_dots_size' for best fit to avoid overlap if possible
+
+image:= A tensor of size 'output_image_shape' with the encloded 'depth_values'
+)doc");
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py b/tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py
new file mode 100755
index 0000000000..79261c5e75
--- /dev/null
+++ b/tensorflow/contrib/image/python/ops/single_image_random_dot_stereograms.py
@@ -0,0 +1,125 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Python layer for image_ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.util import loader
+from tensorflow.python.framework import ops
+from tensorflow.python.platform import resource_loader
+
+_sirds_ops = loader.load_op_library(
+    resource_loader.get_path_to_datafile(
+        "_single_image_random_dot_stereograms.so"))
+
+def single_image_random_dot_stereograms(
+    depth_values,
+    hidden_surface_removal=None,
+    convergence_dots_size=None,
+    dots_per_inch=None,
+    eye_separation=None, mu=None,
+    normalize=None, normalize_max=None,
+    normalize_min=None,
+    border_level=None,
+    number_colors=None,
+    output_image_shape=None,
+    output_data_window=None):
+  """Output a RandomDotStereogram Tensor for export via encode_PNG/JPG OP.
+
+  Given the 2-D tensor 'depth_values' with encoded Z values, this operation
+  will encode 3-D data into a 2-D image.  The output of this Op is suitable
+  for the encode_PNG/JPG ops.  Be careful with image compression as this may
+  corrupt the encode 3-D data witin the image.
+
+  Based upon [this paper](http://www.learningace.com/doc/4331582/b6ab058d1e206d68ab60e4e1ead2fe6e/sirds-paper).
+
+  This outputs a SIRDS image as picture_out.png:
+
+  ```python
+  img=[[1,2,3,3,2,1],
+       [1,2,3,4,5,2],
+       [1,2,3,4,5,3],
+       [1,2,3,4,5,4],
+       [6,5,4,4,5,5]]
+  session = tf.InteractiveSession()
+  sirds = single_image_random_dot_stereograms(
+      img,
+      convergence_dots_size=8,
+      number_colors=256,normalize=True)
+
+  out = sirds.eval()
+  png = tf.image.encode_png(out).eval()
+  with open('picture_out.png', 'wb') as f:
+    f.write(png)
+  ```
+
+  Args:
+    depth_values: A `Tensor`. Must be one of the following types: 
+      `float64`, `float32`, `int64`, `int32`.  Z values of data to encode
+      into 'output_data_window' window, lower further away {0.0 floor(far),
+      1.0 ceiling(near) after norm}, must be 2-D tensor
+    hidden_surface_removal: An optional `bool`. Defaults to `True`.
+      Activate hidden surface removal
+    convergence_dots_size: An optional `int`. Defaults to `8`.
+      Black dot size in pixels to help view converge image, drawn on bottom
+      of the image
+    dots_per_inch: An optional `int`. Defaults to `72`.
+      Output device in dots/inch
+    eye_separation: An optional `float`. Defaults to `2.5`.
+      Separation between eyes in inches
+    mu: An optional `float`. Defaults to `0.3333`.
+      Depth of field, Fraction of viewing distance (eg. 1/3 = 0.3333)
+    normalize: An optional `bool`. Defaults to `True`.
+      Normalize input data to [0.0, 1.0] 
+    normalize_max: An optional `float`. Defaults to `-100`.
+      Fix MAX value for Normalization (0.0) - if < MIN, autoscale
+    normalize_min: An optional `float`. Defaults to `100`.
+      Fix MIN value for Normalization (0.0) - if > MAX, autoscale
+    border_level: An optional `float`. Defaults to `0`.
+      Value of bord in depth 0.0 {far} to 1.0 {near} 
+    number_colors: An optional `int`. Defaults to `256`. 2 (Black &
+      White), 256 (grayscale), and Numbers > 256 (Full Color) are
+      supported
+    output_image_shape: An optional `tf.TensorShape` or list of `ints`. 
+      Defaults to shape `[1024, 768, 1]`. Defines output shape of returned
+      image in '[X,Y, Channels]' 1-grayscale, 3 color; channels will be
+      updated to 3 if number_colors > 256
+    output_data_window: An optional `tf.TensorShape` or list of `ints`.
+      Defaults to `[1022, 757]`. Size of "DATA" window, must be equal to or
+      smaller than `output_image_shape`, will be centered and use
+      `convergence_dots_size` for best fit to avoid overlap if possible
+
+  Returns:
+    A `Tensor` of type `uint8` of shape 'output_image_shape' with encoded
+    'depth_values'
+  """
+
+  result = _sirds_ops.single_image_random_dot_stereograms(
+      depth_values=depth_values,
+      hidden_surface_removal=hidden_surface_removal,
+      convergence_dots_size=convergence_dots_size,
+      dots_per_inch=dots_per_inch,
+      eye_separation=eye_separation, mu=mu,
+      normalize=normalize,
+      normalize_max=normalize_max,
+      normalize_min=normalize_min,
+      border_level=border_level,
+      number_colors=number_colors,
+      output_image_shape=output_image_shape,
+      output_data_window=output_data_window)
+  return result
+
+ops.NotDifferentiable("SingleImageRandomDotStereograms")
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
index b891bf2301..dfe08bb863 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
@@ -25,4 +25,5 @@ from tensorflow.python.estimator.inputs.queues.feeding_functions import _enqueue
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _OrderedDictNumpyFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _PandasFeedFn
+from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 # pylint: enable=unused-import
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 68f71ff022..ae01c678b6 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -611,7 +611,7 @@ def _create_model_fn_ops(features,
   if (mode != model_fn.ModeKeys.INFER) and (labels is not None):
     weight_tensor = _weight_tensor(features, weight_column_name)
     loss, weighted_average_loss = loss_fn(labels, logits, weight_tensor)
-    logging_ops.scalar_summary(
+    summary.scalar(
         _summary_key(head_name, mkey.LOSS), weighted_average_loss)
 
     if mode == model_fn.ModeKeys.TRAIN:
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index 9b8cba1526..abaf3a61a1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -124,7 +124,7 @@ class PoissonHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=logits)
       self._assert_output_alternatives(model_fn_ops)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_no_variables(self)
       loss = self._log_poisson_loss(logits, labels)
       _assert_metrics(self, loss, {"loss": loss}, model_fn_ops)
@@ -150,7 +150,7 @@ class RegressionHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_no_variables(self)
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
@@ -180,7 +180,7 @@ class RegressionHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 2. / 3, {"loss": 2. / 3}, model_fn_ops)
 
   def testRegressionWithLogitsAndLogitsInput(self):
@@ -208,7 +208,7 @@ class RegressionHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionWithLabelName(self):
@@ -223,7 +223,7 @@ class RegressionHeadTest(test.TestCase):
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionWithWeights(self):
@@ -238,7 +238,7 @@ class RegressionHeadTest(test.TestCase):
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["regression_head/loss"])
       _assert_metrics(self, 2. / len(weights), {"loss": 2. / np.sum(weights)},
                       model_fn_ops)
 
@@ -261,7 +261,7 @@ class RegressionHeadTest(test.TestCase):
           expected_trainable=("regression_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(
-          self, ["loss", "regression_head/centered_bias/bias_0"])
+          self, ["regression_head/loss", "regression_head/centered_bias/bias_0"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionErrorInSparseTensorLabels(self):
@@ -330,7 +330,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -347,7 +347,7 @@ class MultiLabelHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn, logits=logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = 1.00320443
       _assert_metrics(self, expected_loss, {
           "accuracy": 0.,
@@ -387,7 +387,7 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .69314718
       _assert_metrics(self, expected_loss, {
           "accuracy": 2. / 3,
@@ -432,7 +432,7 @@ class MultiLabelHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -451,7 +451,7 @@ class MultiLabelHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = 1.377779
       expected_eval_metrics = {
           "accuracy": 1. / 3,
@@ -519,7 +519,7 @@ class MultiLabelHeadTest(test.TestCase):
           head_lib.no_op_train_fn, logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -539,7 +539,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       _assert_metrics(self, .089985214,
                       self._expected_eval_metrics(2.69956), model_fn_ops)
 
@@ -559,7 +559,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       _assert_metrics(self, 0.089985214,
                       self._expected_eval_metrics(0.089985214), model_fn_ops)
 
@@ -583,7 +583,7 @@ class MultiLabelHeadTest(test.TestCase):
           expected_trainable=("multi_label_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self, (
-          "loss",
+          "multi_label_head/loss",
           "multi_label_head/centered_bias/bias_0",
           "multi_label_head/centered_bias/bias_1",
           "multi_label_head/centered_bias/bias_2"
@@ -608,7 +608,7 @@ class MultiLabelHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=self._logits)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_label_head/loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -674,7 +674,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -702,7 +702,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .69314718
       label_mean = np.mean(self._labels)
       _assert_metrics(self, expected_loss, {
@@ -738,7 +738,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -817,7 +817,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -838,7 +838,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       expected_total_loss = .31326166
       _assert_metrics(
           self,
@@ -871,7 +871,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_logistic_head/loss"])
       # logloss: z:label, x:logit
       # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
       # expected_loss is (total_weighted_loss)/1 since htere is 1 nonzero
@@ -911,7 +911,8 @@ class BinaryClassificationHeadTest(test.TestCase):
           expected_trainable=("binary_logistic_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(
-          self, ["loss", "binary_logistic_head/centered_bias/bias_0"])
+          self, ["binary_logistic_head/loss",
+		 "binary_logistic_head/centered_bias/bias_0"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -960,7 +961,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -999,7 +1000,7 @@ class MultiClassHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.0986123
       _assert_metrics(self, expected_loss, {
           "accuracy": 0.,
@@ -1050,7 +1051,7 @@ class MultiClassHeadTest(test.TestCase):
           expected_trainable=("multi_class_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self,
-                           ["loss",
+                           ["multi_class_head/loss",
                             "multi_class_head/centered_bias/bias_0",
                             "multi_class_head/centered_bias/bias_1",
                             "multi_class_head/centered_bias/bias_2"])
@@ -1068,7 +1069,7 @@ class MultiClassHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1087,7 +1088,7 @@ class MultiClassHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 3.1698461
       expected_eval_metrics = {
           "accuracy": 0.,
@@ -1126,7 +1127,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss * weight,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1150,7 +1151,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["multi_class_head/loss"])
       expected_loss = 1.5514447 * weight
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1257,7 +1258,7 @@ class MultiClassHeadTest(test.TestCase):
         data_flow_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
-        _assert_summary_tags(self, ["loss"])
+        _assert_summary_tags(self, ["multi_class_head/loss"])
         expected_loss = 1.5514447
         expected_eval_metrics = {
             "accuracy": 0.,
@@ -1283,7 +1284,7 @@ class MultiClassHeadTest(test.TestCase):
         data_flow_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
-        _assert_summary_tags(self, ["loss"])
+        _assert_summary_tags(self, ["multi_class_head/loss"])
         expected_loss = 0.5514447
         expected_eval_metrics = {
             "accuracy": 1.,
@@ -1322,7 +1323,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1352,7 +1353,7 @@ class BinarySvmHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = 1.
       _assert_metrics(self, expected_loss, {
           "accuracy": .5,
@@ -1384,7 +1385,7 @@ class BinarySvmHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1403,7 +1404,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1422,7 +1423,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["loss"])
+      _assert_summary_tags(self, ["binary_svm_head/loss"])
       expected_weighted_sum = np.sum(
           np.multiply(weights, self._expected_losses))
       _assert_metrics(self, expected_weighted_sum / len(weights), {
@@ -1450,7 +1451,8 @@ class BinarySvmHeadTest(test.TestCase):
           expected_trainable=("binary_svm_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(
-          self, ["loss", "binary_svm_head/centered_bias/bias_0"])
+          self, ["binary_svm_head/loss",
+		 "binary_svm_head/centered_bias/bias_0"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 25da51675a..109c8d25e1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -89,9 +89,9 @@ class ClusterConfig(object):
     ```
       cluster = {'ps': ['host1:2222', 'host2:2222'],
                  'worker': ['host3:2222', 'host4:2222', 'host5:2222']}
-      os.environ['TF_CONFIG'] = json.dumps({
+      os.environ['TF_CONFIG'] = json.dumps(
           {'cluster': cluster,
-           'task': {'type': 'worker', 'index': 1}}})
+           'task': {'type': 'worker', 'index': 1}})
       config = ClusterConfig()
       assert config.master == 'host4:2222'
       assert config.task_id == 1
diff --git a/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc b/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
index 3848832f38..b132b1e8f8 100644
--- a/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/segment_reduction_ops_gpu.cu.cc
@@ -19,8 +19,6 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/segment_reduction_ops.h"
 
-#include <stdio.h>
-
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/util/cuda_kernel_helper.h"
 
diff --git a/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc b/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc
index c647d3aaac..7a1db4e558 100644
--- a/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc
+++ b/tensorflow/core/kernels/self_adjoint_eig_v2_op.cc
@@ -69,7 +69,7 @@ class SelfAdjointEigV2Op : public LinearAlgebraOp<Scalar> {
         errors::InvalidArgument("Self Adjoint Eigen decomposition was not "
                                 "successful. The input might not be valid."));
 
-    outputs->at(0) = eig.eigenvalues();
+    outputs->at(0) = eig.eigenvalues().template cast<Scalar>();
     if (compute_v_) {
       outputs->at(1) = eig.eigenvectors();
     }
@@ -81,7 +81,15 @@ class SelfAdjointEigV2Op : public LinearAlgebraOp<Scalar> {
 
 REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<float>), float);
 REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<double>), double);
+REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<complex64>),
+                   complex64);
+REGISTER_LINALG_OP("SelfAdjointEigV2", (SelfAdjointEigV2Op<complex128>),
+                   complex128);
 REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<float>), float);
 REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<double>),
                    double);
+REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<complex64>),
+                   complex64);
+REGISTER_LINALG_OP("BatchSelfAdjointEigV2", (SelfAdjointEigV2Op<complex128>),
+                   complex128);
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e0f448d1c1..11df3c43c7 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1330,10 +1330,9 @@ this operation will permute `params` accordingly.
 `indices` are always validated to be within range. If assigned to GPU,
 out-of-bound indices result in safe but unspecified behavior, which may include
 raising an error.
-`0`, but this may become an error in the future).
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/Gather.png" alt>
+<img style="width:100%" src="../../../images/Gather.png" alt>
 </div>
 )doc");
 
diff --git a/tensorflow/core/ops/linalg_ops.cc b/tensorflow/core/ops/linalg_ops.cc
index a2762cf206..872824b885 100644
--- a/tensorflow/core/ops/linalg_ops.cc
+++ b/tensorflow/core/ops/linalg_ops.cc
@@ -318,7 +318,7 @@ REGISTER_OP("SelfAdjointEigV2")
     .Output("e: T")
     .Output("v: T")
     .Attr("compute_v: bool = True")
-    .Attr("T: {double, float}")
+    .Attr("T: {double, float, complex64, complex128}")
     .SetShapeFn(SelfAdjointEigV2ShapeFn)
     .Doc(R"doc(
 Computes the eigen decomposition of one or more square self-adjoint matrices.
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 1866a2b4cc..d42d01d6ba 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -26363,6 +26363,59 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
+op {
+  name: "UnsortedSegmentSum"
+  input_arg {
+    name: "data"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "segment_ids"
+    description: "A tensor whose shape is a prefix of `data.shape`."
+    type_attr: "Tindices"
+  }
+  input_arg {
+    name: "num_segments"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "Tindices"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  summary: "Computes the max along segments of a tensor."
+  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
+}
 op {
   name: "Unstage"
   output_arg {
diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index 45f7530506..c75c7f111d 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -182,10 +182,10 @@ g++ -std=c++11 -shared zero_out.cc -o zero_out.so -fPIC -I $TF_INC -O2
 On Mac OS X, the additional flag "-undefined dynamic_lookup" is required when
 building the `.so` file.
 
->   Note on gcc version 5: gcc5 uses the new C++
->   [ABI](https://gcc.gnu.org/gcc-5/changes.html#libstdcxx). The binary pip
->   packages available on the TensorFlow website are built with gcc4 that uses
->   the older ABI. If you compile your op library with gcc5, add
+>   Note on `gcc` version `>=5`: gcc uses the new C++
+>   [ABI](https://gcc.gnu.org/gcc-5/changes.html#libstdcxx) since version `5`. The binary pip
+>   packages available on the TensorFlow website are built with `gcc4` that uses
+>   the older ABI. If you compile your op library with `gcc>=5`, add
 >   `-D_GLIBCXX_USE_CXX11_ABI=0` to the command line to make the library
 >   compatible with the older abi.
 >   Furthermore if you are using TensorFlow package created from source remember to add `-cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"`
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 7d452feafa..5f351c40b4 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -298,7 +298,7 @@ invoke the following command:
 
 <pre>$ <b>bazel build --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package</b> </pre>
 
-**NOTE on gcc 5 or later:** the binary pip packages available on the TensorFlow website are built with gcc 4, which uses the older ABI. To make your build compatible with the older ABI, you need to add `-cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"` to your `bazel build` command. ABI compatibility allows custom ops built against the TensorFlow pip package to continue to work against your built package.
+**NOTE on gcc 5 or later:** the binary pip packages available on the TensorFlow website are built with gcc 4, which uses the older ABI. To make your build compatible with the older ABI, you need to add `--cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"` to your `bazel build` command. ABI compatibility allows custom ops built against the TensorFlow pip package to continue to work against your built package.
 
 <b>Tip:</b> By default, building TensorFlow from sources consumes
 a lot of RAM.  If RAM is an issue on your system, you may limit RAM usage
@@ -367,6 +367,7 @@ of one of the following guides:
 
   * @{$install_linux#CommonInstallationProblems$Installing TensorFlow on Linux}
   * @{$install_mac#CommonInstallationProblems$Installing TensorFlow on Mac OS}
+  * @{$install_windows#CommonInstallationProblems$Installing TensorFlow on Windows}
 
 Beyond the errors documented in those two guides, the following table
 notes additional errors specific to building TensorFlow.  Note that we
diff --git a/tensorflow/docs_src/performance/quantization.md b/tensorflow/docs_src/performance/quantization.md
index 86d2b92494..ad23bab443 100644
--- a/tensorflow/docs_src/performance/quantization.md
+++ b/tensorflow/docs_src/performance/quantization.md
@@ -91,8 +91,8 @@ eight-bit computations:
 ```sh
 curl http://download.tensorflow.org/models/image/imagenet/inception-2015-12-05.tgz -o /tmp/inceptionv3.tgz
 tar xzf /tmp/inceptionv3.tgz -C /tmp/
-bazel build tensorflow/tools/quantization/tools:quantize_graph
-bazel-bin/tensorflow/tools/quantization/tools/quantize_graph \
+bazel build tensorflow/tools/quantization:quantize_graph
+bazel-bin/tensorflow/tools/quantization/quantize_graph \
   --input=/tmp/classify_image_graph_def.pb \
   --output_node_names="softmax" --output=/tmp/quantized_graph.pb \
   --mode=eightbit
diff --git a/tensorflow/examples/learn/iris_custom_decay_dnn.py b/tensorflow/examples/learn/iris_custom_decay_dnn.py
index 73c526cd4e..31acbd30cd 100644
--- a/tensorflow/examples/learn/iris_custom_decay_dnn.py
+++ b/tensorflow/examples/learn/iris_custom_decay_dnn.py
@@ -11,6 +11,8 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+"""Example of DNNClassifier for Iris plant dataset, with exponential decay."""
+
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
diff --git a/tensorflow/examples/learn/text_classification_character_cnn.py b/tensorflow/examples/learn/text_classification_character_cnn.py
index 0c96976146..5ad53acf9f 100644
--- a/tensorflow/examples/learn/text_classification_character_cnn.py
+++ b/tensorflow/examples/learn/text_classification_character_cnn.py
@@ -11,7 +11,8 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-"""This is an example of using convolutional networks over characters for DBpedia dataset to predict class from description of an entity.
+"""This is an example of using convolutional networks over characters for
+   DBpedia dataset to predict class from description of an entity.
 
 This model is similar to one described in this paper:
    "Character-level Convolutional Networks for Text Classification"
@@ -54,7 +55,7 @@ def char_cnn_model(features, target):
     # Apply Convolution filtering on input sequence.
     conv1 = tf.contrib.layers.convolution2d(
         byte_list, N_FILTERS, FILTER_SHAPE1, padding='VALID')
-    # Add a RELU for non linearity.
+    # Add a ReLU for non linearity.
     conv1 = tf.nn.relu(conv1)
     # Max pooling across output of Convolution+Relu.
     pool1 = tf.nn.max_pool(
diff --git a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
index 75ea0b9c67..698c97ca1d 100644
--- a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
+++ b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
@@ -14,7 +14,7 @@
 # ==============================================================================
 """A simple MNIST classifier which displays summaries in TensorBoard.
 
- This is an unimpressive MNIST model, but it is a good example of using
+This is an unimpressive MNIST model, but it is a good example of using
 tf.name_scope to make a graph legible in the TensorBoard graph explorer, and of
 naming summary tags so that they are grouped meaningfully in TensorBoard.
 
@@ -78,7 +78,7 @@ def train():
   def nn_layer(input_tensor, input_dim, output_dim, layer_name, act=tf.nn.relu):
     """Reusable code for making a simple neural net layer.
 
-    It does a matrix multiply, bias add, and then uses relu to nonlinearize.
+    It does a matrix multiply, bias add, and then uses ReLU to nonlinearize.
     It also sets up name scoping so that the resultant graph is easy to read,
     and adds a number of summary ops.
     """
diff --git a/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py b/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
index 36b3ed33d8..9ab9304572 100644
--- a/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
+++ b/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
@@ -78,7 +78,7 @@ def _GetSelfAdjointEigTest(dtype_, shape_):
         low=-1.0, high=1.0, size=n * n).reshape([n, n]).astype(dtype_)
     a += a.T
     a = np.tile(a, batch_shape + (1, 1))
-    if dtype_ == np.float32:
+    if dtype_ == np.float32 or dtype_ == np.complex64:
       atol = 1e-4
     else:
       atol = 1e-12
@@ -150,13 +150,14 @@ def _GetSelfAdjointEigGradTest(dtype_, shape_):
 
 
 if __name__ == '__main__':
-  for dtype in np.float32, np.float64:
+  for dtype in np.float32, np.float64, np.complex64, np.complex128:
     for size in 1, 2, 5, 10:
       for batch_dims in [(), (3,)] + [(3, 2)] * (max(size, size) < 10):
         shape = batch_dims + (size, size)
         name = '%s_%s' % (dtype.__name__, '_'.join(map(str, shape)))
         setattr(SelfAdjointEigTest, 'testSelfAdjointEig_' + name,
                 _GetSelfAdjointEigTest(dtype, shape))
-        setattr(SelfAdjointEigGradTest, 'testSelfAdjointEigGrad_' + name,
-                _GetSelfAdjointEigGradTest(dtype, shape))
+        if dtype in [np.float32, np.float64]:
+          setattr(SelfAdjointEigGradTest, 'testSelfAdjointEigGrad_' + name,
+                  _GetSelfAdjointEigGradTest(dtype, shape))
   test.main()
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 34b663119e..41846ae0cd 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -364,6 +364,23 @@ def batch_normalization(inputs,
 
   Sergey Ioffe, Christian Szegedy
 
+  Note: the operations which update the `moving_mean` and `moving_variance`
+  variables will not be added as dependencies of your training operation and so
+  must be run separately. For example:
+  ```
+  extra_update_ops = tf.get_collection(tf.GraphKeys.UPDATE_OPS)
+  sess.run([train_op, extra_update_ops], ...)
+  ```
+  Alternatively, add the operations as a dependency to your training operation
+  manually, and then just run your training operation as normal:
+  ```
+  extra_update_ops = tf.get_collection(tf.GraphKeys.UPDATE_OPS)
+  with tf.control_dependencies(extra_update_ops):
+    train_op = optimizer.minimize(loss)
+  ...
+  sess.run([train_op], ...)
+  ```
+
   Arguments:
     inputs: Tensor input.
     axis: Integer, the axis that should be normalized (typically the features
diff --git a/tensorflow/python/ops/nn_grad.py b/tensorflow/python/ops/nn_grad.py
index ebf17c8a41..b1f50fd341 100644
--- a/tensorflow/python/ops/nn_grad.py
+++ b/tensorflow/python/ops/nn_grad.py
@@ -512,6 +512,16 @@ def _MaxPoolGrad(op, grad):
                                    data_format=op.get_attr("data_format"))
 
 
+@ops.RegisterGradient("MaxPoolWithArgmax")
+def _MaxPoolGradWithArgmax(op, grad, unused_argmax_grad):
+  return gen_nn_ops._max_pool_grad_with_argmax(op.inputs[0],
+                                               grad,
+                                               op.outputs[1],
+                                               op.get_attr("ksize"),
+                                               op.get_attr("strides"),
+                                               padding=op.get_attr("padding"))
+
+
 @ops.RegisterGradient("MaxPoolGrad")
 def _MaxPoolGradGrad(op, grad):
   return (array_ops.zeros(
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 66ccedf546..ccce9402c7 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -1478,14 +1478,14 @@ def _softmax(logits, compute_op, dim=-1, name=None):
     InvalidArgumentError: if `logits` is empty or `dim` is beyond the last
       dimension of `logits`.
   """
-  def _swap_axis(logits, dim_index, last_index):
+  def _swap_axis(logits, dim_index, last_index, name=None):
     """Swaps logits's dim_index and last_index."""
     return array_ops.transpose(logits,
                                array_ops.concat([
                                    math_ops.range(dim_index), [last_index],
                                    math_ops.range(dim_index + 1, last_index),
                                    [dim_index]
-                               ], 0))
+                               ], 0), name=name)
 
   logits = ops.convert_to_tensor(logits)
 
@@ -1501,8 +1501,8 @@ def _softmax(logits, compute_op, dim=-1, name=None):
   if is_last_dim:
     input_shape = array_ops.shape(logits)
     logits = _flatten_outer_dims(logits)
-    output = compute_op(logits, name=name)
-    output = array_ops.reshape(output, input_shape)
+    output = compute_op(logits)
+    output = array_ops.reshape(output, input_shape, name=name)
     return output
 
   # If dim is not the last dimension, we have to do a reshape and transpose so
@@ -1517,11 +1517,11 @@ def _softmax(logits, compute_op, dim=-1, name=None):
   logits = _flatten_outer_dims(logits)
 
   # Do the actual softmax on its last dimension.
-  output = compute_op(logits, name=name)
+  output = compute_op(logits)
 
   # Transform back the output tensor.
   output = array_ops.reshape(output, shape_after_swap)
-  output = _swap_axis(output, dim, math_ops.subtract(input_rank, 1))
+  output = _swap_axis(output, dim, math_ops.subtract(input_rank, 1), name=name)
 
   # Make shape inference work since reshape and transpose may erase its static
   # shape.
diff --git a/tensorflow/python/summary/writer/event_file_writer.py b/tensorflow/python/summary/writer/event_file_writer.py
index 8940d9b72e..2936a279bd 100644
--- a/tensorflow/python/summary/writer/event_file_writer.py
+++ b/tensorflow/python/summary/writer/event_file_writer.py
@@ -24,6 +24,7 @@ import time
 
 import six
 
+from tensorflow.core.util import event_pb2
 from tensorflow.python import pywrap_tensorflow
 from tensorflow.python.platform import gfile
 from tensorflow.python.util import compat
@@ -67,14 +68,20 @@ class EventFileWriter(object):
     self._event_queue = six.moves.queue.Queue(max_queue)
     self._ev_writer = pywrap_tensorflow.EventsWriter(
         compat.as_bytes(os.path.join(self._logdir, "events")))
+    self._flush_secs = flush_secs
+    self._sentinel_event = self._get_sentinel_event()
     if filename_suffix:
       self._ev_writer.InitWithSuffix(compat.as_bytes(filename_suffix))
     self._closed = False
     self._worker = _EventLoggerThread(self._event_queue, self._ev_writer,
-                                      flush_secs)
+                                      self._flush_secs, self._sentinel_event)
 
     self._worker.start()
 
+  def _get_sentinel_event(self):
+    """Generate a sentinel event for terminating worker."""
+    return event_pb2.Event()
+
   def get_logdir(self):
     """Returns the directory where event file will be written."""
     return self._logdir
@@ -88,6 +95,9 @@ class EventFileWriter(object):
     Does nothing if the EventFileWriter was not closed.
     """
     if self._closed:
+      self._worker = _EventLoggerThread(self._event_queue, self._ev_writer,
+                                        self._flush_secs, self._sentinel_event)
+      self._worker.start()
       self._closed = False
 
   def add_event(self, event):
@@ -113,7 +123,9 @@ class EventFileWriter(object):
 
     Call this method when you do not need the summary writer anymore.
     """
+    self.add_event(self._sentinel_event)
     self.flush()
+    self._worker.join()
     self._ev_writer.Close()
     self._closed = True
 
@@ -121,7 +133,7 @@ class EventFileWriter(object):
 class _EventLoggerThread(threading.Thread):
   """Thread that logs events."""
 
-  def __init__(self, queue, ev_writer, flush_secs):
+  def __init__(self, queue, ev_writer, flush_secs, sentinel_event):
     """Creates an _EventLoggerThread.
 
     Args:
@@ -130,6 +142,8 @@ class _EventLoggerThread(threading.Thread):
        the visualizer.
       flush_secs: How often, in seconds, to flush the
         pending file to disk.
+      sentinel_event: A sentinel element in queue that tells this thread to
+        terminate.
     """
     threading.Thread.__init__(self)
     self.daemon = True
@@ -138,10 +152,14 @@ class _EventLoggerThread(threading.Thread):
     self._flush_secs = flush_secs
     # The first event will be flushed immediately.
     self._next_event_flush_time = 0
+    self._sentinel_event = sentinel_event
 
   def run(self):
     while True:
       event = self._queue.get()
+      if event is self._sentinel_event:
+        self._queue.task_done()
+        break
       try:
         self._ev_writer.WriteEvent(event)
         # Flush the event writer every so often.
diff --git a/tensorflow/python/summary/writer/writer_test.py b/tensorflow/python/summary/writer/writer_test.py
index b31c41d112..8c34eb82e3 100644
--- a/tensorflow/python/summary/writer/writer_test.py
+++ b/tensorflow/python/summary/writer/writer_test.py
@@ -258,6 +258,15 @@ class SummaryWriterTestCase(test.TestCase):
     # We should be done.
     self.assertRaises(StopIteration, lambda: next(rr))
 
+  def testNonBlockingClose(self):
+    test_dir = self._CleanTestDir("non_blocking_close")
+    sw = writer.FileWriter(test_dir)
+    # Sleep 1.2 seconds to make sure event queue is empty.
+    time.sleep(1.2)
+    time_before_close = time.time()
+    sw.close()
+    self._assertRecent(time_before_close)
+
   # Checks that values returned from session Run() calls are added correctly to
   # summaries.  These are numpy types so we need to check they fit in the
   # protocol buffers correctly.
diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index 06ae78ef5d..df9191fb96 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -103,7 +103,7 @@ output layers of the model are. The best source for these is the model training
 process, where for a classifier the inputs will be the nodes that receive the
 data from the training set, and the output will be the predictions. If you're
 unsure, the
-[summarize_graph](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/graph_transforms/summarize_graph_main.cc)
+[`summarize_graph`](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/graph_transforms/summarize_graph_main.cc)
 tool can inspect the model and provide guesses about likely input and output nodes,
 as well as other information that's useful for debugging. Here's an example of
 how to use it on the [Inception V3
@@ -315,7 +315,7 @@ themselves contain commas (for example shape definitions).
 The --inputs and --outputs are shared across all transforms, since it's common
 to need to know what the ingoing and outgoing nodes in the graph are. You should
 make sure you set these correctly before calling the graph transform tool, and
-if you're in doubt check with the model's author, or use the `check_graph` tool
+if you're in doubt check with the model's author, or use the [`summarize_graph`](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/tools/graph_transforms#inspecting-graphs) tool
 to examine likely inputs and outputs.
 
 All transforms can be passed the `ignore_errors` flag, with the value set to
-- 
GitLab


From 447041676fb2762994dfbbc75ea89fc1a0aa4df6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 21:04:29 -0800
Subject: [PATCH 0494/1563] Update ops-related pbtxt files. Change: 153427582

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 34 +++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 57 +------------------
 2 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 89ad301e87..50e4971314 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -18898,6 +18898,40 @@ op {
     }
   }
 }
+op {
+  name: "SelfAdjointEigV2"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "e"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "v"
+    type_attr: "T"
+  }
+  attr {
+    name: "compute_v"
+    type: "bool"
+    default_value {
+      b: true
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_DOUBLE
+        type: DT_FLOAT
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+      }
+    }
+  }
+}
 op {
   name: "SerializeManySparse"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index d42d01d6ba..9725b6538d 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -8552,7 +8552,7 @@ op {
     }
   }
   summary: "Gather slices from `params` according to `indices`."
-  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in safe but unspecified behavior, which may include\nraising an error.\n`0`, but this may become an error in the future).\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/Gather.png\" alt>\n</div>"
+  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in safe but unspecified behavior, which may include\nraising an error.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../../images/Gather.png\" alt>\n</div>"
 }
 op {
   name: "GatherNd"
@@ -20086,6 +20086,8 @@ op {
       list {
         type: DT_DOUBLE
         type: DT_FLOAT
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
       }
     }
   }
@@ -26363,59 +26365,6 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
-op {
-  name: "UnsortedSegmentSum"
-  input_arg {
-    name: "data"
-    type_attr: "T"
-  }
-  input_arg {
-    name: "segment_ids"
-    description: "A tensor whose shape is a prefix of `data.shape`."
-    type_attr: "Tindices"
-  }
-  input_arg {
-    name: "num_segments"
-    type: DT_INT32
-  }
-  output_arg {
-    name: "output"
-    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
-    type_attr: "T"
-  }
-  attr {
-    name: "T"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
-      }
-    }
-  }
-  attr {
-    name: "Tindices"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_INT32
-        type: DT_INT64
-      }
-    }
-  }
-  summary: "Computes the max along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
-}
 op {
   name: "Unstage"
   output_arg {
-- 
GitLab


From 0926e0815e7f2136b6888300612a55848a9d075b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 21:11:02 -0800
Subject: [PATCH 0495/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 153427886

---
 tensorflow/go/op/wrappers.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index bf14cc908d..e832690e18 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -13600,10 +13600,9 @@ func GatherValidateIndices(value bool) GatherAttr {
 // `indices` are always validated to be within range. If assigned to GPU,
 // out-of-bound indices result in safe but unspecified behavior, which may include
 // raising an error.
-// `0`, but this may become an error in the future).
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/Gather.png" alt>
+// <img style="width:100%" src="../../../images/Gather.png" alt>
 // </div>
 func Gather(scope *Scope, params tf.Output, indices tf.Output, optional ...GatherAttr) (output tf.Output) {
 	if scope.Err() != nil {
-- 
GitLab


From 98f9dd67f7cfe339a3794bee9fa0b83a69462ff6 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Mon, 17 Apr 2017 23:14:38 -0800
Subject: [PATCH 0496/1563] Ensure that we merge config provided to
 tf.train.create_local_server with config provided to Session constructor.
 Fixes #8982. Change: 153433741

---
 .../rpc/grpc_server_lib.cc                    | 13 +++--
 tensorflow/python/client/session_test.py      | 49 +++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
index ff1df585df..ffe54ab9fb 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
@@ -100,7 +100,8 @@ Status GrpcServer::Init() {
   worker_env_.env = env_;
 
   SessionOptions sess_opts;
-  sess_opts.config = server_def_.default_session_config();
+  ConfigProto config = server_def_.default_session_config();
+  sess_opts.config = config;
 
   // Configure shared devices between master and worker.
   string name_prefix =
@@ -164,6 +165,8 @@ Status GrpcServer::Init() {
   builder.SetOption(
       std::unique_ptr<::grpc::ServerBuilderOption>(new NoReusePortOption));
   master_impl_ = CreateMaster(&master_env_);
+  // TODO(suharshs): Pass the default operation timeout to this, to ensure
+  // timeouts are propagated to GrpcMasterService.
   master_service_ = NewGrpcMasterService(master_impl_.get(), &builder);
   worker_impl_ = NewGrpcWorker(&worker_env_);
   worker_service_ =
@@ -194,12 +197,16 @@ Status GrpcServer::Init() {
   master_env_.ops = OpRegistry::Global();
   master_env_.worker_cache = worker_cache;
   master_env_.master_session_factory =
-      [](const SessionOptions& options, const MasterEnv* env,
-         std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devs) {
+      [config](
+          SessionOptions options, const MasterEnv* env,
+          std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devs) {
+        options.config.MergeFrom(config);
         return new MasterSession(options, env, std::move(remote_devs),
                                  CreateNoOpStatsPublisher);
       };
 
+  // TODO(suharshs): Pass the default operation timeout to this, to ensure
+  // timeouts are propagated to LocalMaster.
   // Provide direct access to the master from in-process clients.
   LocalMaster::Register(target(), master_impl_.get());
 
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 99402ff2ed..5fa80809bc 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -19,6 +19,8 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
+import os
+import sys
 import threading
 import time
 
@@ -1657,6 +1659,53 @@ class SessionTest(test_util.TensorFlowTestCase):
       squared_eval = sess.partial_run(partial_run, squared_tensor)
       self.assertAllClose(np2 * np2, squared_eval)
 
+  def testDefaultLogDevicePlacement(self):
+    class CaptureStderr(str):
+      """Class to capture stderr from C++ shared library."""
+
+      def __enter__(self):
+        self._esc = compat.as_str('\b')
+        self._output = compat.as_str('')
+        self._stderr = sys.stderr
+        self._fd = self._stderr.fileno()
+        self._out_pipe, in_pipe = os.pipe()
+        # Save the original io stream.
+        self._dup_fd = os.dup(self._fd)
+        # Replace the original io stream with in pipe.
+        os.dup2(in_pipe, self._fd)
+        return self
+
+      def __exit__(self, *args):
+        self._stderr.write(self._esc)
+        self._stderr.flush()
+        self.read()
+        os.close(self._out_pipe)
+        # Restore the original io stream.
+        os.dup2(self._dup_fd, self._fd)
+
+      def read(self):
+        while True:
+          data = os.read(self._out_pipe, 1)
+          if not data or compat.as_str(data) == self._esc:
+            break
+          self._output += compat.as_str(data)
+
+      def __str__(self):
+        return self._output
+
+    # Passing the config to the server, but not the session should still result
+    # in logging device placement.
+    config = config_pb2.ConfigProto(log_device_placement=True)
+    server = server_lib.Server.create_local_server(config=config)
+    a = constant_op.constant(1)
+    b = constant_op.constant(2)
+    c = a + b
+    with session.Session(server.target) as sess:
+      with CaptureStderr() as log:
+        sess.run(c)
+      # Ensure that we did log device placement.
+      self.assertTrue('/job:local/replica:0/task:0/cpu:0' in str(log))
+
 
 if __name__ == '__main__':
   googletest.main()
-- 
GitLab


From b12bc175e41d2519d57bbb026c735a68dfedd204 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 17 Apr 2017 23:22:30 -0800
Subject: [PATCH 0497/1563] [XLA] Initial introduction for a HLO instruction
 evaluator. Change: 153434122

---
 tensorflow/compiler/xla/index_util.cc         |  12 +-
 tensorflow/compiler/xla/index_util.h          |   3 +-
 tensorflow/compiler/xla/service/BUILD         |  35 ++
 .../compiler/xla/service/hlo_evaluator.cc     | 367 ++++++++++++++++++
 .../compiler/xla/service/hlo_evaluator.h      |  41 ++
 .../xla/service/hlo_evaluator_test.cc         | 152 ++++++++
 tensorflow/compiler/xla/service/hlo_query.cc  |   9 +
 tensorflow/compiler/xla/service/hlo_query.h   |   3 +
 8 files changed, 615 insertions(+), 7 deletions(-)
 create mode 100644 tensorflow/compiler/xla/service/hlo_evaluator.cc
 create mode 100644 tensorflow/compiler/xla/service/hlo_evaluator.h
 create mode 100644 tensorflow/compiler/xla/service/hlo_evaluator_test.cc

diff --git a/tensorflow/compiler/xla/index_util.cc b/tensorflow/compiler/xla/index_util.cc
index e3248d8e90..92aca3cae9 100644
--- a/tensorflow/compiler/xla/index_util.cc
+++ b/tensorflow/compiler/xla/index_util.cc
@@ -118,13 +118,13 @@ namespace xla {
   return multi_index;
 }
 
-/* static */ bool IndexUtil::BumpIndices(const Shape& shape,
-                                         std::vector<int64>* indices) {
-  for (int64 dimno = indices->size() - 1; dimno >= 0; --dimno) {
+/* static */ bool IndexUtil::BumpIndices(
+    const Shape& shape, tensorflow::gtl::MutableArraySlice<int64> indices) {
+  for (int64 dimno = indices.size() - 1; dimno >= 0; --dimno) {
     int64 limit = shape.dimensions(dimno);
-    if ((*indices)[dimno] + 1 < limit) {
-      (*indices)[dimno]++;
-      std::fill(indices->begin() + dimno + 1, indices->end(), 0);
+    if (indices[dimno] + 1 < limit) {
+      indices[dimno]++;
+      std::fill(indices.begin() + dimno + 1, indices.end(), 0);
       return true;
     }
   }
diff --git a/tensorflow/compiler/xla/index_util.h b/tensorflow/compiler/xla/index_util.h
index 2d8753c3fe..e6a26d6220 100644
--- a/tensorflow/compiler/xla/index_util.h
+++ b/tensorflow/compiler/xla/index_util.h
@@ -58,7 +58,8 @@ class IndexUtil {
   //
   // Returns true iff the indices were successfully bumped; false if we've hit
   // the limit where it can no longer be bumped in-bounds.
-  static bool BumpIndices(const Shape& shape, std::vector<int64>* indices);
+  static bool BumpIndices(const Shape& shape,
+                          tensorflow::gtl::MutableArraySlice<int64> indices);
 
  private:
   TF_DISALLOW_COPY_AND_ASSIGN(IndexUtil);
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index da9d5882d5..b7948ebfd4 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -71,6 +71,41 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "hlo_evaluator",
+    srcs = ["hlo_evaluator.cc"],
+    hdrs = ["hlo_evaluator.h"],
+    deps = [
+        ":hlo",
+        ":hlo_query",
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:types",
+        "//tensorflow/compiler/xla:util",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+cc_test(
+    name = "hlo_evaluator_test",
+    srcs = ["hlo_evaluator_test.cc"],
+    deps = [
+        ":hlo",
+        ":hlo_evaluator",
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:test",
+        "//tensorflow/compiler/xla:types",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:test_main",
+    ],
+)
+
 cc_library(
     name = "hlo",
     srcs = [
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
new file mode 100644
index 0000000000..d82ebc29e9
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -0,0 +1,367 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/compiler/xla/service/hlo_evaluator.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <functional>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "tensorflow/compiler/xla/index_util.h"
+#include "tensorflow/compiler/xla/layout_util.h"
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/primitive_util.h"
+#include "tensorflow/compiler/xla/ptr_util.h"
+#include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/hlo_query.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/types.h"
+#include "tensorflow/compiler/xla/util.h"
+#include "tensorflow/core/lib/core/bitmap.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/lib/gtl/inlined_vector.h"
+#include "tensorflow/core/platform/google/integral_types.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/platform/protobuf.h"
+
+namespace xla {
+
+namespace {
+
+template <typename NativeT>
+std::unique_ptr<Literal> ElementWiseUnaryOp(
+    const Shape& shape, std::function<NativeT(NativeT)>&& unary_op,
+    const Literal& operand) {
+  DCHECK(ShapeUtil::SameDimensions(shape, operand.shape()));
+
+  auto result = MakeUnique<Literal>();
+  *result->mutable_shape() = shape;
+  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+
+  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+  do {
+    LiteralUtil::Set<NativeT>(
+        result.get(), multi_index,
+        unary_op(LiteralUtil::Get<NativeT>(operand, multi_index)));
+  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+  return result;
+}
+
+template <typename NativeT>
+std::unique_ptr<Literal> ElementWiseBinaryOp(
+    const Shape& shape, std::function<NativeT(NativeT, NativeT)>&& binary_op,
+    const Literal& lhs, const Literal& rhs) {
+  DCHECK(ShapeUtil::SameDimensions(shape, rhs.shape()));
+  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
+
+  auto result = MakeUnique<Literal>();
+  *result->mutable_shape() = shape;
+  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+
+  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+  do {
+    LiteralUtil::Set<NativeT>(
+        result.get(), multi_index,
+        binary_op(LiteralUtil::Get<NativeT>(lhs, multi_index),
+                  LiteralUtil::Get<NativeT>(rhs, multi_index)));
+  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+  return result;
+}
+
+template <typename NativeT, typename LhsType, typename RhsType,
+          typename EhsType>
+std::unique_ptr<Literal> ElementWiseTernaryOp(
+    const Shape& shape,
+    std::function<NativeT(LhsType lhs, RhsType rhs, EhsType ehs)>&& ternary_op,
+    const Literal& lhs, const Literal& rhs, const Literal& ehs) {
+  DCHECK(ShapeUtil::SameDimensions(shape, lhs.shape()));
+  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
+  DCHECK(ShapeUtil::SameDimensions(rhs.shape(), ehs.shape()));
+
+  auto result = MakeUnique<Literal>();
+  *result->mutable_shape() = shape;
+  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+
+  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+  do {
+    LiteralUtil::Set<NativeT>(
+        result.get(), multi_index,
+        ternary_op(LiteralUtil::Get<LhsType>(lhs, multi_index),
+                   LiteralUtil::Get<RhsType>(rhs, multi_index),
+                   LiteralUtil::Get<EhsType>(ehs, multi_index)));
+  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+  return result;
+}
+
+// Templated abs so that unsigned types can be passed in without warning.
+template <
+    typename NativeT,
+    typename std::enable_if<std::is_unsigned<NativeT>::value>::type* = nullptr>
+NativeT AbsoluteVal(NativeT value) {
+  return value;
+}
+
+template <
+    typename NativeT,
+    typename std::enable_if<std::is_signed<NativeT>::value>::type* = nullptr>
+NativeT AbsoluteVal(NativeT value) {
+  return std::abs(value);
+}
+
+template <typename NativeT>
+StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
+    HloInstruction* instruction) {
+  DCHECK(hlo_query::AllOperandsAreConstants(*instruction));
+
+  const std::vector<HloInstruction*>& operands = instruction->operands();
+  HloOpcode opcode = instruction->opcode();
+  const Shape& shape = instruction->shape();
+
+  switch (opcode) {
+    // TODO(b/35950897): many of the stl function used here are not overloaded
+    // for all XLA primitive types.
+    // Unary element-wise ops.
+    case HloOpcode::kAbs:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return AbsoluteVal(operand); },
+          operands[0]->literal());
+    case HloOpcode::kCeil:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::ceil(operand); },
+          operands[0]->literal());
+    case HloOpcode::kConvert:
+      CHECK_EQ(operands.size(), 1);
+      // TODO(b/35950897): implement Convert.
+      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
+                           HloOpcodeString(opcode).c_str());
+    case HloOpcode::kCopy:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return operand; },
+          operands[0]->literal());
+    case HloOpcode::kExp:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::exp(operand); },
+          operands[0]->literal());
+    case HloOpcode::kFloor:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::floor(operand); },
+          operands[0]->literal());
+    case HloOpcode::kIsFinite:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::isfinite(operand); },
+          operands[0]->literal());
+    case HloOpcode::kLog:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::log(operand); },
+          operands[0]->literal());
+    case HloOpcode::kLogicalNot:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return !operand; },
+          operands[0]->literal());
+    case HloOpcode::kNegate:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return -operand; },
+          operands[0]->literal());
+    case HloOpcode::kSign:
+      CHECK_EQ(operands.size(), 1);
+      CHECK(primitive_util::IsIntegralType(shape.element_type()));
+      return ElementWiseUnaryOp<int>(shape,
+                                     [](NativeT operand) {
+                                       return (NativeT(0) < operand) -
+                                              (operand < NativeT(0));
+                                     },
+                                     operands[0]->literal());
+    case HloOpcode::kTanh:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::tanh(operand); },
+          operands[0]->literal());
+    // Binary element-wise ops.
+    case HloOpcode::kAdd:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs + rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kDivide:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs / rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kMultiply:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs * rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kSubtract:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs - rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kEq:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs == rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kGe:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs >= rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kGt:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs > rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kLe:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs <= rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kLt:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs < rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kNe:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs != rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kMaximum:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return std::max(lhs, rhs); },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kMinimum:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return std::min(lhs, rhs); },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kPower:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return std::pow(lhs, rhs); },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kRemainder:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape,
+          [](NativeT lhs, NativeT rhs) { return std::remainder(lhs, rhs); },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kLogicalAnd:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs && rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    case HloOpcode::kLogicalOr:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs || rhs; },
+          operands[0]->literal(), operands[1]->literal());
+    // Ternary element-wise ops.
+    case HloOpcode::kClamp: {
+      CHECK_EQ(operands.size(), 3);
+      std::function<NativeT(NativeT, NativeT, NativeT)> clamp_op =
+          [](NativeT low, NativeT high, NativeT value) {
+            return std::max(low, std::min(value, high));
+          };
+      return ElementWiseTernaryOp<NativeT, NativeT, NativeT, NativeT>(
+          shape, std::move(clamp_op), operands[0]->literal(),
+          operands[1]->literal(), operands[2]->literal());
+    } break;
+    case HloOpcode::kSelect: {
+      CHECK_EQ(operands.size(), 3);
+      CHECK(!ShapeUtil::IsTuple(shape));
+      std::function<NativeT(bool, NativeT, NativeT)> select_op =
+          [](bool pred, NativeT on_true, NativeT on_false) {
+            if (pred) {
+              return on_true;
+            }
+            return on_false;
+          };
+      return ElementWiseTernaryOp<NativeT, bool, NativeT, NativeT>(
+          shape, std::move(select_op), operands[0]->literal(),
+          operands[1]->literal(), operands[2]->literal());
+    } break;
+    default:
+      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
+                           HloOpcodeString(opcode).c_str());
+  }
+}
+
+}  // namespace
+
+/* static */ StatusOr<std::unique_ptr<Literal>>
+HloEvaluator::EvaluateOpForLiteral(HloInstruction* instruction) {
+  DCHECK(hlo_query::AllOperandsAreConstants(*instruction));
+
+  Shape shape = instruction->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  // REVIEW QUESTION: other than a few operations, do we need to handle the
+  // general case of operands being of different types in the context of the
+  // evaluator?
+
+  switch (shape.element_type()) {
+    case PRED:
+      return EvaluateOpForLiteralInternal<bool>(instruction);
+    case U8:
+      return EvaluateOpForLiteralInternal<uint8>(instruction);
+    case U16:
+      LOG(FATAL) << "U16/uint16 is unimplemented.";
+    case U32:
+      return EvaluateOpForLiteralInternal<uint32>(instruction);
+    case U64:
+      return EvaluateOpForLiteralInternal<uint64>(instruction);
+    case S8:
+      return EvaluateOpForLiteralInternal<int8>(instruction);
+    case S16:
+      LOG(FATAL) << "S16/int16 is unimplemented.";
+    case S32:
+      return EvaluateOpForLiteralInternal<int32>(instruction);
+    case S64:
+      return EvaluateOpForLiteralInternal<int64>(instruction);
+    case F16:
+      LOG(FATAL) << "F16 is unimplemented.";
+    case F32:
+      return EvaluateOpForLiteralInternal<float>(instruction);
+    case F64:
+      return EvaluateOpForLiteralInternal<double>(instruction);
+    default:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(shape.element_type()).c_str());
+  }
+}
+
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.h b/tensorflow/compiler/xla/service/hlo_evaluator.h
new file mode 100644
index 0000000000..c6ec650d67
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.h
@@ -0,0 +1,41 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_COMPILER_XLA_SERVICE_HLO_EVALUATOR_H_
+#define THIRD_PARTY_TENSORFLOW_COMPILER_XLA_SERVICE_HLO_EVALUATOR_H_
+
+#include <memory>
+
+#include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
+
+namespace xla {
+
+// Responsible for evaluating a HLO instruction with constant operands.
+class HloEvaluator {
+ public:
+  // Evaluates a single HLO instruction for constants and return the result as a
+  // Literal.
+  // Precondition: all operands of the instruction are constants, instruction is
+  // valid with corresponding number of operands for the given operator.
+  // TODO(b/35950897): implement more ops other than element-wise ops.
+  static StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteral(
+      HloInstruction* instruction);
+};
+
+}  // namespace xla
+
+#endif  // THIRD_PARTY_TENSORFLOW_COMPILER_XLA_SERVICE_HLO_EVALUATOR_H_
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator_test.cc b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
new file mode 100644
index 0000000000..3b91f4d59d
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
@@ -0,0 +1,152 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/compiler/xla/service/hlo_evaluator.h"
+
+#include <string>
+#include <utility>
+
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/test.h"
+#include "tensorflow/compiler/xla/types.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/platform/google/integral_types.h"
+
+namespace xla {
+namespace {
+
+// Verifies that HloEvaluator evaluates a HLO instruction that performs clamp
+// with 3 operands.
+TEST(HloEvaluatorTest, DoesClamp) {
+  auto low = LiteralUtil::CreateR2<float>({{0.f, 2.f}, {2.f, 4.f}});
+  auto high = LiteralUtil::CreateR2<float>({{2.f, 4.f}, {4.f, 4.f}});
+  auto value = LiteralUtil::CreateR2<float>({{0.f, 5.f}, {0.f, 4.f}});
+
+  Shape shape = low->shape();
+  auto c1 = HloInstruction::CreateConstant(std::move(low));
+  auto c2 = HloInstruction::CreateConstant(std::move(high));
+  auto c3 = HloInstruction::CreateConstant(std::move(value));
+  auto instruction = HloInstruction::CreateTernary(
+      shape, HloOpcode::kClamp, c1.get(), c2.get(), c3.get());
+
+  std::unique_ptr<Literal> result =
+      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+
+  auto expected = LiteralUtil::CreateR2<float>({{0, 4}, {2, 4}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+}
+
+// Verifies that HloEvaluator evaluates a HLO instruction that performs select
+// with 3 operands.
+TEST(HloEvaluatorTest, DoesSelect) {
+  auto pred = LiteralUtil::CreateR2<bool>({{true, false}, {false, true}});
+  auto on_true = LiteralUtil::CreateR2<float>({{2.f, 4.f}, {4.f, 4.f}});
+  auto on_false = LiteralUtil::CreateR2<float>({{0.f, 5.f}, {0.f, 4.f}});
+
+  Shape shape = on_true->shape();
+  auto c1 = HloInstruction::CreateConstant(std::move(pred));
+  auto c2 = HloInstruction::CreateConstant(std::move(on_true));
+  auto c3 = HloInstruction::CreateConstant(std::move(on_false));
+  auto instruction = HloInstruction::CreateTernary(
+      shape, HloOpcode::kSelect, c1.get(), c2.get(), c3.get());
+
+  std::unique_ptr<Literal> result =
+      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+
+  auto expected = LiteralUtil::CreateR2<float>({{2, 5}, {0, 4}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+}
+
+// Verifies that HloEvaluator evaluates a HLO instruction that performs
+// element-wise addition with 2 operands.
+TEST(HloEvaluatorTest, DoesAdd) {
+  auto lhs = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
+  auto rhs = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
+
+  Shape shape = ShapeUtil::MakeShape(S64, {2, 2});
+  auto c1 = HloInstruction::CreateConstant(std::move(lhs));
+  auto c2 = HloInstruction::CreateConstant(std::move(rhs));
+  auto instruction =
+      HloInstruction::CreateBinary(shape, HloOpcode::kAdd, c1.get(), c2.get());
+
+  std::unique_ptr<Literal> result =
+      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+
+  auto expected = LiteralUtil::CreateR2<int64>({{3, 4}, {-96, 8}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+}
+
+// Verifies that HloEvaluator evaluates a HLO instruction that performs
+// element-wise divide with 2 operands.
+TEST(HloEvaluatorTest, DoesDivide) {
+  auto lhs_s64 = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
+  auto rhs_s64 = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
+
+  Shape shape_s64 = ShapeUtil::MakeShape(S64, {2, 2});
+  auto c1_s64 = HloInstruction::CreateConstant(std::move(lhs_s64));
+  auto c2_s64 = HloInstruction::CreateConstant(std::move(rhs_s64));
+  auto instruction = HloInstruction::CreateBinary(shape_s64, HloOpcode::kDivide,
+                                                  c1_s64.get(), c2_s64.get());
+
+  std::unique_ptr<Literal> result =
+      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+
+  auto expected = LiteralUtil::CreateR2<int64>({{0, 0}, {-25, 1}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+
+  auto lhs_f64 = LiteralUtil::CreateR2<double>({{1.0, 0.0}, {-100.0, 4.0}});
+  auto rhs_f64 = LiteralUtil::CreateR2<double>({{2.2, 4.0}, {4.0, 4.0}});
+
+  Shape shape_f64 = ShapeUtil::MakeShape(F64, {2, 2});
+  auto c1_f64 = HloInstruction::CreateConstant(std::move(lhs_f64));
+  auto c2_f64 = HloInstruction::CreateConstant(std::move(rhs_f64));
+  instruction = HloInstruction::CreateBinary(shape_f64, HloOpcode::kDivide,
+                                             c1_f64.get(), c2_f64.get());
+
+  result =
+      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+
+  expected =
+      LiteralUtil::CreateR2<double>({{0.45454545454545453, 0}, {-25, 1}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+}
+
+// Verifies that HloEvaluator evaluates a HLO instruction that performs
+// element-wise abs op with 1 operand.
+TEST(HloEvaluatorTest, DoesAbs) {
+  auto operand = LiteralUtil::CreateR2<int64>({{1, -20}, {-100, 4}});
+
+  Shape shape = ShapeUtil::MakeShape(S64, {2, 2});
+  auto c1 = HloInstruction::CreateConstant(std::move(operand));
+  auto instruction =
+      HloInstruction::CreateUnary(shape, HloOpcode::kAbs, c1.get());
+
+  std::unique_ptr<Literal> result =
+      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+
+  auto expected = LiteralUtil::CreateR2<int64>({{1, 20}, {100, 4}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+}
+
+}  // namespace
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_query.cc b/tensorflow/compiler/xla/service/hlo_query.cc
index 1556d1772f..d699737864 100644
--- a/tensorflow/compiler/xla/service/hlo_query.cc
+++ b/tensorflow/compiler/xla/service/hlo_query.cc
@@ -41,6 +41,15 @@ bool AllOperandsAreParameters(const HloInstruction& instruction) {
   return true;
 }
 
+bool AllOperandsAreConstants(const HloInstruction& instruction) {
+  for (const auto& operand : instruction.operands()) {
+    if (operand->opcode() != HloOpcode::kConstant) {
+      return false;
+    }
+  }
+  return true;
+}
+
 HloInstruction* GetMatchingOperand(
     std::function<bool(const HloInstruction*)> matcher,
     HloInstruction* instruction) {
diff --git a/tensorflow/compiler/xla/service/hlo_query.h b/tensorflow/compiler/xla/service/hlo_query.h
index 864f892e92..56f3cfd863 100644
--- a/tensorflow/compiler/xla/service/hlo_query.h
+++ b/tensorflow/compiler/xla/service/hlo_query.h
@@ -31,6 +31,9 @@ bool IsConstantR0F32(HloInstruction* instruction, float* out);
 // Returns whether all of an instruction's operands are parameters.
 bool AllOperandsAreParameters(const HloInstruction& instruction);
 
+// Returns whether all of an instruction's operands are constants.
+bool AllOperandsAreConstants(const HloInstruction& instruction);
+
 // Returns whether the instruction is a scalar constant.
 bool IsScalarConstant(const HloInstruction* instruction);
 
-- 
GitLab


From 5e548af054fe229df71659031444f312ce3a7fee Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 00:47:19 -0800
Subject: [PATCH 0498/1563] Internal change. Change: 153438895

---
 tensorflow/compiler/xla/service/BUILD                 | 3 +--
 tensorflow/compiler/xla/service/hlo_evaluator.cc      | 2 +-
 tensorflow/compiler/xla/service/hlo_evaluator_test.cc | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index b7948ebfd4..7ca2832ec7 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -85,7 +85,6 @@ cc_library(
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
     ],
 )
 
@@ -101,7 +100,7 @@ cc_test(
         "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:xla_data_proto",
-        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:lib",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
index d82ebc29e9..ebe7428052 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -38,10 +38,10 @@ limitations under the License.
 #include "tensorflow/core/lib/core/stringpiece.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
-#include "tensorflow/core/platform/google/integral_types.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/protobuf.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace xla {
 
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator_test.cc b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
index 3b91f4d59d..585fe65def 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
@@ -24,7 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
-#include "tensorflow/core/platform/google/integral_types.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace xla {
 namespace {
-- 
GitLab


From 22cae0d3ac14dadc02f1451e501db99a4c8adc8a Mon Sep 17 00:00:00 2001
From: "Ruizhe Zhao (Vincent)" <kumasento@users.noreply.github.com>
Date: Tue, 18 Apr 2017 15:51:05 +0100
Subject: [PATCH 0499/1563] Update adding_an_op.md

The variable name for the output should better be consistent with the name below.
---
 tensorflow/docs_src/extend/adding_an_op.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index c75c7f111d..f54f79cbf4 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -121,16 +121,16 @@ class ZeroOutOp : public OpKernel {
     Tensor* output_tensor = NULL;
     OP_REQUIRES_OK(context, context->allocate_output(0, input_tensor.shape(),
                                                      &output_tensor));
-    auto output = output_tensor->flat<int32>();
+    auto output_flat = output_tensor->flat<int32>();
 
     // Set all but the first element of the output tensor to 0.
     const int N = input.size();
     for (int i = 1; i < N; i++) {
-      output(i) = 0;
+      output_flat(i) = 0;
     }
 
     // Preserve the first input value if possible.
-    if (N > 0) output(0) = input(0);
+    if (N > 0) output_flat(0) = input(0);
   }
 };
 ```
-- 
GitLab


From 7e2dcdbd3cb8e9a461dcdd4870613651017db9f4 Mon Sep 17 00:00:00 2001
From: Dan Smilkov <smilkov@google.com>
Date: Tue, 18 Apr 2017 07:10:20 -0800
Subject: [PATCH 0500/1563] Add LRU cache for the embedding projector to store
 the last used tensor.

Reading and parsing large tensors can take some time. Caching the last used tensor in memory improves the serving time significantly.
Change: 153463363
---
 .../plugins/projector/projector_plugin.py     | 88 ++++++++++++++-----
 .../projector/projector_plugin_test.py        | 38 ++++++++
 2 files changed, 104 insertions(+), 22 deletions(-)

diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 4b1c8d98e7..f631a3d19b 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
 import imghdr
 import math
 import os
@@ -48,6 +49,9 @@ PROJECTOR_FILENAME = 'projector_config.pbtxt'
 _PLUGIN_NAME = 'org_tensorflow_tensorboard_projector'
 _PLUGINS_DIR = 'plugins'
 
+# Number of tensors in the LRU cache.
+_TENSOR_CACHE_CAPACITY = 1
+
 # HTTP routes.
 CONFIG_ROUTE = '/info'
 TENSOR_ROUTE = '/tensor'
@@ -65,6 +69,34 @@ _IMGHDR_TO_MIMETYPE = {
 _DEFAULT_IMAGE_MIMETYPE = 'application/octet-stream'
 
 
+class LRUCache(object):
+  """LRU cache. Used for storing the last used tensor."""
+
+  def __init__(self, size):
+    if size < 1:
+      raise ValueError('The cache size must be >=1')
+    self._size = size
+    self._dict = collections.OrderedDict()
+
+  def get(self, key):
+    try:
+      value = self._dict.pop(key)
+      self._dict[key] = value
+      return value
+    except KeyError:
+      return None
+
+  def set(self, key, value):
+    if value is None:
+      raise ValueError('value must be != None')
+    try:
+      self._dict.pop(key)
+    except KeyError:
+      if len(self._dict) >= self._size:
+        self._dict.popitem(last=False)
+    self._dict[key] = value
+
+
 class EmbeddingMetadata(object):
   """Metadata container for an embedding.
 
@@ -252,7 +284,7 @@ class ProjectorPluginAsset(plugin_asset.PluginAsset):
     return self._assets
 
 
-def _read_tensor_file(fpath):
+def _read_tensor_tsv_file(fpath):
   with file_io.FileIO(fpath, 'r') as f:
     tensor = []
     for line in f:
@@ -333,6 +365,7 @@ class ProjectorPlugin(TBPlugin):
     self._configs = None
     self.old_num_run_paths = None
     self.multiplexer = None
+    self.tensor_cache = LRUCache(_TENSOR_CACHE_CAPACITY)
 
   def get_plugin_apps(self, multiplexer, logdir):
     self.multiplexer = multiplexer
@@ -392,7 +425,10 @@ class ProjectorPlugin(TBPlugin):
         if embedding.tensor_path and not embedding.tensor_shape:
           fpath = _rel_to_abs_asset_path(embedding.tensor_path,
                                          self.config_fpaths[run])
-          tensor = _read_tensor_file(fpath)
+          tensor = self.tensor_cache.get(embedding.tensor_name)
+          if tensor is None:
+            tensor = _read_tensor_tsv_file(fpath)
+            self.tensor_cache.set(embedding.tensor_name, tensor)
           embedding.tensor_shape.extend([len(tensor), len(tensor[0])])
 
       reader = self._get_reader_for_run(run)
@@ -439,6 +475,8 @@ class ProjectorPlugin(TBPlugin):
       has_tensor_files = False
       for embedding in config.embeddings:
         if embedding.tensor_path:
+          if not embedding.tensor_name:
+            embedding.tensor_name = os.path.basename(embedding.tensor_path)
           has_tensor_files = True
           break
 
@@ -595,29 +633,35 @@ class ProjectorPlugin(TBPlugin):
 
     config = self.configs[run]
 
-    # See if there is a tensor file in the config.
-    embedding = self._get_embedding(name, config)
-    if embedding and embedding.tensor_path:
-      fpath = _rel_to_abs_asset_path(embedding.tensor_path,
-                                     self.config_fpaths[run])
-      if not file_io.file_exists(fpath):
-        return Respond(request,
-                       'Tensor file "%s" does not exist' % fpath,
-                       'text/plain', 400)
-      tensor = _read_tensor_file(fpath)
-    else:
-      reader = self._get_reader_for_run(run)
-      if not reader or not reader.has_tensor(name):
-        return Respond(request, 'Tensor "%s" not found in checkpoint dir "%s"' %
-                       (name, config.model_checkpoint_path), 'text/plain', 400)
-      try:
-        tensor = reader.get_tensor(name)
-      except errors.InvalidArgumentError as e:
-        return Respond(request, str(e), 'text/plain', 400)
+    tensor = self.tensor_cache.get(name)
+    if tensor is None:
+      # See if there is a tensor file in the config.
+      embedding = self._get_embedding(name, config)
+
+      if embedding and embedding.tensor_path:
+        fpath = _rel_to_abs_asset_path(embedding.tensor_path,
+                                       self.config_fpaths[run])
+        if not file_io.file_exists(fpath):
+          return Respond(request,
+                         'Tensor file "%s" does not exist' % fpath,
+                         'text/plain', 400)
+        tensor = _read_tensor_tsv_file(fpath)
+      else:
+        reader = self._get_reader_for_run(run)
+        if not reader or not reader.has_tensor(name):
+          return Respond(request,
+                         'Tensor "%s" not found in checkpoint dir "%s"' %
+                         (name, config.model_checkpoint_path), 'text/plain',
+                         400)
+        try:
+          tensor = reader.get_tensor(name)
+        except errors.InvalidArgumentError as e:
+          return Respond(request, str(e), 'text/plain', 400)
+
+      self.tensor_cache.set(name, tensor)
 
     if num_rows:
       tensor = tensor[:num_rows]
-
     if tensor.dtype != 'float32':
       tensor = tensor.astype(dtype='float32', copy=False)
     data_bytes = tensor.tobytes()
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
index 76cf8b48cb..81330b3a76 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin_test.py
@@ -758,5 +758,43 @@ class ProjectorPluginAssetTest(test.TestCase):
         gfile.Exists(plugin_dir),
         'The projector plugin directory should not exist.')
 
+
+class LRUCacheTest(test.TestCase):
+
+  def testInvalidSize(self):
+    with self.assertRaises(ValueError):
+      projector_plugin.LRUCache(0)
+
+  def testSimpleGetAndSet(self):
+    cache = projector_plugin.LRUCache(1)
+    value = cache.get('a')
+    self.assertIsNone(value)
+    cache.set('a', 10)
+    self.assertEqual(cache.get('a'), 10)
+
+  def testErrorsWhenSettingNoneAsValue(self):
+    cache = projector_plugin.LRUCache(1)
+    with self.assertRaises(ValueError):
+      cache.set('a', None)
+
+  def testLRUReplacementPolicy(self):
+    cache = projector_plugin.LRUCache(2)
+    cache.set('a', 1)
+    cache.set('b', 2)
+    cache.set('c', 3)
+    self.assertIsNone(cache.get('a'))
+    self.assertEqual(cache.get('b'), 2)
+    self.assertEqual(cache.get('c'), 3)
+
+    # Make 'b' the most recently used.
+    cache.get('b')
+    cache.set('d', 4)
+
+    # Make sure 'c' got replaced with 'd'.
+    self.assertIsNone(cache.get('c'))
+    self.assertEqual(cache.get('b'), 2)
+    self.assertEqual(cache.get('d'), 4)
+
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From cdb741200163f288d41c870eef07732f162aa227 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Tue, 18 Apr 2017 07:50:32 -0800
Subject: [PATCH 0501/1563] tfdbg: command_parser: make
 extract_output_file_path smarter

Let it recognize that in some cases, strings after ">" are not output-redirect file paths, but represent interval lower bounds.
Change: 153467104
---
 tensorflow/python/debug/cli/command_parser.py | 65 ++++++++++----
 .../python/debug/cli/command_parser_test.py   | 88 +++++++++++++++++++
 2 files changed, 138 insertions(+), 15 deletions(-)

diff --git a/tensorflow/python/debug/cli/command_parser.py b/tensorflow/python/debug/cli/command_parser.py
index de56099a52..a71982f86a 100644
--- a/tensorflow/python/debug/cli/command_parser.py
+++ b/tensorflow/python/debug/cli/command_parser.py
@@ -27,6 +27,7 @@ _BRACKETS_PATTERN = re.compile(r"\[[^\]]*\]")
 _QUOTES_PATTERN = re.compile(r"\"[^\"]*\"")
 _WHITESPACE_PATTERN = re.compile(r"\s+")
 
+_NUMBER_PATTERN = re.compile(r"[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?")
 
 Interval = namedtuple("Interval",
                       ["start", "start_included", "end", "end_included"])
@@ -96,15 +97,26 @@ def extract_output_file_path(args):
   if args and args[-1].endswith(">"):
     raise SyntaxError("Redirect file path is empty")
   elif args and args[-1].startswith(">"):
-    output_file_path = args[-1][1:]
-    args = args[:-1]
+    try:
+      _parse_interval(args[-1])
+      if len(args) > 1 and args[-2].startswith("-"):
+        output_file_path = None
+      else:
+        output_file_path = args[-1][1:]
+        args = args[:-1]
+    except ValueError:
+      output_file_path = args[-1][1:]
+      args = args[:-1]
   elif len(args) > 1 and args[-2] == ">":
     output_file_path = args[-1]
     args = args[:-2]
   elif args and args[-1].count(">") == 1:
     gt_index = args[-1].index(">")
-    output_file_path = args[-1][gt_index + 1:]
-    args[-1] = args[-1][:gt_index]
+    if gt_index > 0 and args[-1][gt_index - 1] == "=":
+      output_file_path = None
+    else:
+      output_file_path = args[-1][gt_index + 1:]
+      args[-1] = args[-1][:gt_index]
   elif len(args) > 1 and args[-2].endswith(">"):
     output_file_path = args[-1]
     args = args[:-1]
@@ -312,7 +324,9 @@ def _parse_interval(interval_str):
 
   Args:
     interval_str: (`str`) A human-readable str representing an interval
-      (e.g., "[1M, 2M]", "<100k", ">100ms")
+      (e.g., "[1M, 2M]", "<100k", ">100ms"). The items following the ">", "<",
+      ">=" and "<=" signs have to start with a number (e.g., 3.0, -2, .98).
+      The same requirement applies to the items in the parentheses or brackets.
 
   Returns:
     Interval object where start or end can be None
@@ -323,17 +337,30 @@ def _parse_interval(interval_str):
   """
   interval_str = interval_str.strip()
   if interval_str.startswith("<="):
-    return Interval(start=None, start_included=False,
-                    end=interval_str[2:].strip(), end_included=True)
+    if _NUMBER_PATTERN.match(interval_str[2:].strip()):
+      return Interval(start=None, start_included=False,
+                      end=interval_str[2:].strip(), end_included=True)
+    else:
+      raise ValueError("Invalid value string after <= in '%s'" % interval_str)
   if interval_str.startswith("<"):
-    return Interval(start=None, start_included=False,
-                    end=interval_str[1:].strip(), end_included=False)
+    if _NUMBER_PATTERN.match(interval_str[1:].strip()):
+      return Interval(start=None, start_included=False,
+                      end=interval_str[1:].strip(), end_included=False)
+    else:
+      raise ValueError("Invalid value string after < in '%s'" % interval_str)
   if interval_str.startswith(">="):
-    return Interval(start=interval_str[2:].strip(), start_included=True,
-                    end=None, end_included=False)
+    if _NUMBER_PATTERN.match(interval_str[2:].strip()):
+      return Interval(start=interval_str[2:].strip(), start_included=True,
+                      end=None, end_included=False)
+    else:
+      raise ValueError("Invalid value string after >= in '%s'" % interval_str)
   if interval_str.startswith(">"):
-    return Interval(start=interval_str[1:].strip(), start_included=False,
-                    end=None, end_included=False)
+    if _NUMBER_PATTERN.match(interval_str[1:].strip()):
+      return Interval(start=interval_str[1:].strip(), start_included=False,
+                      end=None, end_included=False)
+    else:
+      raise ValueError("Invalid value string after > in '%s'" % interval_str)
+
   if (not interval_str.startswith(("[", "("))
       or not interval_str.endswith(("]", ")"))):
     raise ValueError(
@@ -344,9 +371,17 @@ def _parse_interval(interval_str):
     raise ValueError(
         "Incorrect interval format: %s. Interval should specify two values: "
         "[min, max] or (min, max)." % interval_str)
-  return Interval(start=interval[0].strip(),
+
+  start_item = interval[0].strip()
+  if not _NUMBER_PATTERN.match(start_item):
+    raise ValueError("Invalid first item in interval: '%s'" % start_item)
+  end_item = interval[1].strip()
+  if not _NUMBER_PATTERN.match(end_item):
+    raise ValueError("Invalid second item in interval: '%s'" % end_item)
+
+  return Interval(start=start_item,
                   start_included=(interval_str[0] == "["),
-                  end=interval[1].strip(),
+                  end=end_item,
                   end_included=(interval_str[-1] == "]"))
 
 
diff --git a/tensorflow/python/debug/cli/command_parser_test.py b/tensorflow/python/debug/cli/command_parser_test.py
index 8fc7418e18..ab9b3245dc 100644
--- a/tensorflow/python/debug/cli/command_parser_test.py
+++ b/tensorflow/python/debug/cli/command_parser_test.py
@@ -132,6 +132,63 @@ class ExtractOutputFilePathTest(test_util.TensorFlowTestCase):
     self.assertEqual(["pt", "a:0"], args)
     self.assertEqual(output_path, "/tmp/foo.txt")
 
+  def testFlagWithEqualGreaterThanShouldIgnoreIntervalFlags(self):
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--execution_time=>100ms"])
+    self.assertEqual(["lp", "--execution_time=>100ms"], args)
+    self.assertIsNone(output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--execution_time", ">1.2s"])
+    self.assertEqual(["lp", "--execution_time", ">1.2s"], args)
+    self.assertIsNone(output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "-e", ">1200"])
+    self.assertEqual(["lp", "-e", ">1200"], args)
+    self.assertIsNone(output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--foo_value", ">-.2MB"])
+    self.assertEqual(["lp", "--foo_value", ">-.2MB"], args)
+    self.assertIsNone(output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--bar_value", ">-42e3GB"])
+    self.assertEqual(["lp", "--bar_value", ">-42e3GB"], args)
+    self.assertIsNone(output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--execution_time", ">=100ms"])
+    self.assertEqual(["lp", "--execution_time", ">=100ms"], args)
+    self.assertIsNone(output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--execution_time=>=100ms"])
+    self.assertEqual(["lp", "--execution_time=>=100ms"], args)
+    self.assertIsNone(output_path)
+
+  def testFlagWithEqualGreaterThanShouldRecognizeFilePaths(self):
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", ">1.2s"])
+    self.assertEqual(["lp"], args)
+    self.assertEqual("1.2s", output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--execution_time", ">x.yms"])
+    self.assertEqual(["lp", "--execution_time"], args)
+    self.assertEqual("x.yms", output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--memory", ">a.1kB"])
+    self.assertEqual(["lp", "--memory"], args)
+    self.assertEqual("a.1kB", output_path)
+
+    args, output_path = command_parser.extract_output_file_path(
+        ["lp", "--memory", ">e002MB"])
+    self.assertEqual(["lp", "--memory"], args)
+    self.assertEqual("e002MB", output_path)
+
   def testOneArgumentIsHandledCorrectly(self):
     args, output_path = command_parser.extract_output_file_path(["lt"])
     self.assertEqual(["lt"], args)
@@ -354,6 +411,27 @@ class ParseInterval(test_util.TensorFlowTestCase):
         command_parser.Interval(1e3, False, float("inf"), False),
         command_parser.parse_time_interval(">1ms"))
 
+  def testParseTimeGreaterLessThanWithInvalidValueStrings(self):
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after >= "):
+      command_parser.parse_time_interval(">=wms")
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after > "):
+      command_parser.parse_time_interval(">Yms")
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after <= "):
+      command_parser.parse_time_interval("<= _ms")
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after < "):
+      command_parser.parse_time_interval("<-ms")
+
+  def testParseTimeIntervalsWithInvalidValueStrings(self):
+    with self.assertRaisesRegexp(ValueError, "Invalid first item in interval:"):
+      command_parser.parse_time_interval("[wms, 10ms]")
+    with self.assertRaisesRegexp(ValueError,
+                                 "Invalid second item in interval:"):
+      command_parser.parse_time_interval("[ 0ms, _ms]")
+    with self.assertRaisesRegexp(ValueError, "Invalid first item in interval:"):
+      command_parser.parse_time_interval("(xms, _ms]")
+    with self.assertRaisesRegexp(ValueError, "Invalid first item in interval:"):
+      command_parser.parse_time_interval("((3ms, _ms)")
+
   def testInvalidTimeIntervalRaisesException(self):
     with self.assertRaisesRegexp(
         ValueError,
@@ -395,6 +473,16 @@ class ParseInterval(test_util.TensorFlowTestCase):
         command_parser.Interval(11, False, float("inf"), False),
         command_parser.parse_memory_interval(">11"))
 
+  def testParseMemoryIntervalsWithInvalidValueStrings(self):
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after >= "):
+      command_parser.parse_time_interval(">=wM")
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after > "):
+      command_parser.parse_time_interval(">YM")
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after <= "):
+      command_parser.parse_time_interval("<= _MB")
+    with self.assertRaisesRegexp(ValueError, "Invalid value string after < "):
+      command_parser.parse_time_interval("<-MB")
+
   def testInvalidMemoryIntervalRaisesException(self):
     with self.assertRaisesRegexp(
         ValueError,
-- 
GitLab


From ba0ab4c09a0746d447bfcc76f8de4cfaf2bc1c57 Mon Sep 17 00:00:00 2001
From: Nikhil Thorat <nsthorat@google.com>
Date: Tue, 18 Apr 2017 07:50:32 -0800
Subject: [PATCH 0502/1563] Remove most of d3 references from projector and fix
 many lint errors along the way (mostly let => const)

Remaining is random normal variables, and color scales.
Change: 153467106
---
 .../vz_projector/data-provider-demo.ts        |  45 +--
 .../vz_projector/data-provider-server.ts      |  64 +++--
 .../components/vz_projector/data-provider.ts  |  37 +--
 .../components/vz_projector/data.ts           |   2 +-
 .../components/vz_projector/logging.ts        |  25 +-
 .../projectorScatterPlotAdapter.ts            |   4 +-
 .../components/vz_projector/scatterPlot.ts    |  43 ++-
 .../scatterPlotRectangleSelector.ts           |  40 +--
 .../scatterPlotRectangleSelector_test.ts      |   4 +
 .../scatterPlotVisualizerCanvasLabels.ts      |  18 +-
 .../components/vz_projector/util.ts           |  29 +-
 .../vz-projector-bookmark-panel.ts            |  32 ++-
 .../vz_projector/vz-projector-dashboard.html  |  16 +-
 .../vz_projector/vz-projector-data-panel.ts   | 118 ++++----
 .../vz_projector/vz-projector-input.ts        |  11 +-
 .../vz-projector-inspector-panel.ts           | 266 ++++++++++--------
 .../vz_projector/vz-projector-legend.ts       |  28 +-
 .../vz-projector-metadata-card.ts             |  20 +-
 .../vz-projector-projections-panel.ts         | 111 +++++---
 .../vz-projector-projections-panel_test.ts    |  51 +++-
 .../components/vz_projector/vz-projector.ts   |  37 ++-
 21 files changed, 585 insertions(+), 416 deletions(-)

diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts b/tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts
index 57e549c2f2..1410a84a8e 100644
--- a/tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts
+++ b/tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts
@@ -46,23 +46,27 @@ export class DemoDataProvider implements DataProvider {
 
   retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void)
       : void {
-    let msgId = logging.setModalMessage('Fetching projector config...');
-    d3.json(this.projectorConfigPath, (err, projectorConfig) => {
-      if (err) {
-        let errorMessage = err;
-        // If the error is a valid XMLHttpResponse, it's possible this is a
-        // cross-origin error.
-        if (err.responseText != null) {
-          errorMessage = 'Cannot fetch projector config, possibly a ' +
-              'Cross-Origin request error.';
-        }
-        logging.setErrorMessage(errorMessage, 'fetching projector config');
-        return;
+    const msgId = logging.setModalMessage('Fetching projector config...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', this.projectorConfigPath);
+    xhr.onerror = (err) => {
+      let errorMessage = err.message;
+      // If the error is a valid XMLHttpResponse, it's possible this is a
+      // cross-origin error.
+      if (xhr.responseText != null) {
+        errorMessage = 'Cannot fetch projector config, possibly a ' +
+            'Cross-Origin request error.';
       }
+      logging.setErrorMessage(errorMessage, 'fetching projector config');
+    };
+    xhr.onload = () => {
+      const projectorConfig = JSON.parse(xhr.responseText) as ProjectorConfig;
       logging.setModalMessage(null, msgId);
       this.projectorConfig = projectorConfig;
       callback(projectorConfig);
-    });
+    };
+    xhr.send();
   }
 
   retrieveTensor(run: string, tensorName: string,
@@ -107,14 +111,17 @@ export class DemoDataProvider implements DataProvider {
       run: string, tensorName: string, callback: (r: State[]) => void) {
     let embedding = this.getEmbeddingInfo(tensorName);
     let msgId = logging.setModalMessage('Fetching bookmarks...');
-    d3.json(embedding.bookmarksPath, (err, bookmarks: State[]) => {
-      if (err) {
-        logging.setErrorMessage(err.responseText);
-        return;
-      }
 
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', embedding.bookmarksPath);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText);
+    };
+    xhr.onload = () => {
+      const bookmarks = JSON.parse(xhr.responseText) as State[];
       logging.setModalMessage(null, msgId);
       callback(bookmarks);
-    });
+    };
+    xhr.send();
   }
 }
diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider-server.ts b/tensorflow/tensorboard/components/vz_projector/data-provider-server.ts
index ff535468de..02720ebf6a 100644
--- a/tensorflow/tensorboard/components/vz_projector/data-provider-server.ts
+++ b/tensorflow/tensorboard/components/vz_projector/data-provider-server.ts
@@ -36,9 +36,9 @@ export class ServerDataProvider implements DataProvider {
   private getEmbeddingInfo(run: string, tensorName: string,
       callback: (e: EmbeddingInfo) => void): void {
     this.retrieveProjectorConfig(run, config => {
-      let embeddings = config.embeddings;
+      const embeddings = config.embeddings;
       for (let i = 0; i < embeddings.length; i++) {
-        let embedding = embeddings[i];
+        const embedding = embeddings[i];
         if (embedding.tensorName === tensorName) {
           callback(embedding);
           return;
@@ -49,15 +49,19 @@ export class ServerDataProvider implements DataProvider {
   }
 
   retrieveRuns(callback: (runs: string[]) => void): void {
-    let msgId = logging.setModalMessage('Fetching runs...');
-    d3.json(`${this.routePrefix}/runs`, (err, runs: string[]) => {
-      if (err) {
-        logging.setErrorMessage(err.responseText, 'fetching runs');
-        return;
-      }
+    const msgId = logging.setModalMessage('Fetching runs...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', `${this.routePrefix}/runs`);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText, 'fetching runs');
+    };
+    xhr.onload = () => {
+      const runs = JSON.parse(xhr.responseText);
       logging.setModalMessage(null, msgId);
       callback(runs);
-    });
+    };
+    xhr.send();
   }
 
   retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void)
@@ -67,17 +71,20 @@ export class ServerDataProvider implements DataProvider {
       return;
     }
 
-    let msgId = logging.setModalMessage('Fetching projector config...');
-    d3.json(`${this.routePrefix}/info?run=${run}`, (err,
-        config: ProjectorConfig) => {
-      if (err) {
-        logging.setErrorMessage(err.responseText, 'fetching projector config');
-        return;
-      }
+    const msgId = logging.setModalMessage('Fetching projector config...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', `${this.routePrefix}/info?run=${run}`);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText, 'fetching projector config');
+    };
+    xhr.onload = () => {
+      const config = JSON.parse(xhr.responseText) as ProjectorConfig;
       logging.setModalMessage(null, msgId);
       this.runProjectorConfigCache[run] = config;
       callback(config);
-    });
+    };
+    xhr.send();
   }
 
   retrieveTensor(run: string, tensorName: string,
@@ -112,14 +119,19 @@ export class ServerDataProvider implements DataProvider {
 
   getBookmarks(
       run: string, tensorName: string, callback: (r: State[]) => void) {
-    let msgId = logging.setModalMessage('Fetching bookmarks...');
-    d3.json(
-        `${this.routePrefix}/bookmarks?run=${run}&name=${tensorName}`,
-        (err, bookmarks: State[]) => {
-          logging.setModalMessage(null, msgId);
-          if (!err) {
-            callback(bookmarks);
-          }
-        });
+    const msgId = logging.setModalMessage('Fetching bookmarks...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open(
+        'GET', `${this.routePrefix}/bookmarks?run=${run}&name=${tensorName}`);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText, 'fetching bookmarks');
+    };
+    xhr.onload = () => {
+      logging.setModalMessage(null, msgId);
+      const bookmarks = JSON.parse(xhr.responseText);
+      callback(bookmarks);
+    };
+    xhr.send();
   }
 }
diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider.ts b/tensorflow/tensorboard/components/vz_projector/data-provider.ts
index 3acc5a4374..c8eede798c 100644
--- a/tensorflow/tensorboard/components/vz_projector/data-provider.ts
+++ b/tensorflow/tensorboard/components/vz_projector/data-provider.ts
@@ -203,7 +203,7 @@ export function parseTensors(
   logging.setModalMessage('Parsing tensors...', TENSORS_MSG_ID);
 
   return new Promise<DataPoint[]>((resolve, reject) => {
-    let data: DataPoint[] = [];
+    const data: DataPoint[] = [];
     let numDim: number;
 
     streamParse(content, (line: string) => {
@@ -211,8 +211,8 @@ export function parseTensors(
       if (line === '') {
         return;
       }
-      let row = line.split(valueDelim);
-      let dataPoint: DataPoint = {
+      const row = line.split(valueDelim);
+      const dataPoint: DataPoint = {
         metadata: {},
         vector: null,
         index: data.length,
@@ -250,8 +250,8 @@ export function parseTensors(
 export function parseTensorsFromFloat32Array(data: Float32Array,
     dim: number): Promise<DataPoint[]> {
   return runAsyncTask('Parsing tensors...', () => {
-    let N = data.length / dim;
-    let dataPoints: DataPoint[] = [];
+    const N = data.length / dim;
+    const dataPoints: DataPoint[] = [];
     let offset = 0;
     for (let i = 0; i < N; ++i) {
       dataPoints.push({
@@ -271,7 +271,7 @@ export function parseTensorsFromFloat32Array(data: Float32Array,
 
 export function analyzeMetadata(
     columnNames, pointsMetadata: PointMetadata[]): ColumnStats[] {
-  let columnStats: ColumnStats[] = columnNames.map(name => {
+  const columnStats: ColumnStats[] = columnNames.map(name => {
     return {
       name: name,
       isNumeric: true,
@@ -280,12 +280,15 @@ export function analyzeMetadata(
       max: Number.NEGATIVE_INFINITY
     };
   });
-  let mapOfValues = columnNames.map(() => d3.map<number>());
+
+  const mapOfValues: [{[value: string]: number}] =
+      columnNames.map(() => new Object());
+
   pointsMetadata.forEach(metadata => {
     columnNames.forEach((name: string, colIndex: number) => {
-      let stats = columnStats[colIndex];
-      let map = mapOfValues[colIndex];
-      let value = metadata[name];
+      const stats = columnStats[colIndex];
+      const map = mapOfValues[colIndex];
+      const value = metadata[name];
 
       // Skip missing values.
       if (value == null) {
@@ -293,12 +296,12 @@ export function analyzeMetadata(
       }
 
       if (!stats.tooManyUniqueValues) {
-        if (map.has(value)) {
-          map.set(value, map.get(value) + 1);
+        if (value in map) {
+          map[value]++;
         } else {
-          map.set(value, 1);
+          map[value] = 1;
         }
-        if (map.size() > NUM_COLORS_COLOR_MAP) {
+        if (Object.keys(map).length > NUM_COLORS_COLOR_MAP) {
           stats.tooManyUniqueValues = true;
         }
       }
@@ -312,8 +315,8 @@ export function analyzeMetadata(
     });
   });
   columnStats.forEach((stats, colIndex) => {
-    stats.uniqueEntries = mapOfValues[colIndex].entries().map(e => {
-      return {label: e.key, count: e.value};
+    stats.uniqueEntries = Object.keys(mapOfValues[colIndex]).map(label => {
+      return {label, count: mapOfValues[colIndex][label]};
     });
   });
   return columnStats;
@@ -409,7 +412,7 @@ export function retrieveSpriteAndMetadataInfo(metadataPath: string,
     if (spriteMsgId) {
       logging.setModalMessage(null, spriteMsgId);
     }
-    let [metadata, spriteImage] = values;
+    const [metadata, spriteImage] = values;
 
     if (spriteImage && (spriteImage.height > MAX_SPRITE_IMAGE_SIZE_PX ||
                         spriteImage.width > MAX_SPRITE_IMAGE_SIZE_PX)) {
diff --git a/tensorflow/tensorboard/components/vz_projector/data.ts b/tensorflow/tensorboard/components/vz_projector/data.ts
index 701e28274b..4b467aef2b 100644
--- a/tensorflow/tensorboard/components/vz_projector/data.ts
+++ b/tensorflow/tensorboard/components/vz_projector/data.ts
@@ -141,7 +141,7 @@ export class DataSet {
   constructor(
       points: DataPoint[], spriteAndMetadataInfo?: SpriteAndMetadataInfo) {
     this.points = points;
-    this.shuffledDataIndices = util.shuffle(d3.range(this.points.length));
+    this.shuffledDataIndices = util.shuffle(util.range(this.points.length));
     this.sequences = this.computeSequences(points);
     this.dim = [this.points.length, this.points[0].vector.length];
     this.spriteAndMetadataInfo = spriteAndMetadataInfo;
diff --git a/tensorflow/tensorboard/components/vz_projector/logging.ts b/tensorflow/tensorboard/components/vz_projector/logging.ts
index b51b702653..59f3720601 100644
--- a/tensorflow/tensorboard/components/vz_projector/logging.ts
+++ b/tensorflow/tensorboard/components/vz_projector/logging.ts
@@ -53,19 +53,22 @@ export function setModalMessage(
   dialog.querySelector('#notification-title').innerHTML = title;
   let msgsContainer = dialog.querySelector('#notify-msgs') as HTMLElement;
   if (isErrorMsg) {
-    d3.select(msgsContainer).html('');
+    msgsContainer.innerHTML = '';
   } else {
-    d3.select(msgsContainer).selectAll('.error').remove();
+    const errors = msgsContainer.querySelectorAll('.error');
+    for (let i = 0; i < errors.length; i++) {
+      msgsContainer.removeChild(errors[i]);
+    }
   }
   let divId = `notify-msg-${id}`;
-  let msgDiv = d3.select(dialog.querySelector('#' + divId));
-  let exists = msgDiv.size() > 0;
-  if (!exists) {
-    msgDiv = d3.select(msgsContainer)
-                 .insert('div', ':first-child')
-                 .attr('class', 'notify-msg')
-                 .classed('error', isErrorMsg)
-                 .attr('id', divId);
+  let msgDiv = dialog.querySelector('#' + divId) as HTMLDivElement;
+  if (msgDiv == null) {
+    msgDiv = document.createElement('div');
+    msgDiv.className = 'notify-msg ' + (isErrorMsg ? 'error' : '');
+    msgDiv.id = divId;
+
+    msgsContainer.insertBefore(msgDiv, msgsContainer.firstChild);
+
     if (!isErrorMsg) {
       numActiveMessages++;
     } else {
@@ -79,7 +82,7 @@ export function setModalMessage(
     }
     msgDiv.remove();
   } else {
-    msgDiv.text(msg);
+    msgDiv.innerText = msg;
     dialog.open();
   }
   return id;
diff --git a/tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts b/tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts
index 2bf63eebdd..4f47ea99d8 100644
--- a/tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts
+++ b/tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts
@@ -76,7 +76,6 @@ const NN_COLOR_SCALE =
  */
 export class ProjectorScatterPlotAdapter {
   public scatterPlot: ScatterPlot;
-  private scatterPlotContainer: d3.Selection<any>;
   private projection: Projection;
   private hoverPointIndex: number;
   private selectedPointIndices: number[];
@@ -92,11 +91,10 @@ export class ProjectorScatterPlotAdapter {
   private polylineVisualizer: ScatterPlotVisualizerPolylines;
 
   constructor(
-      scatterPlotContainer: d3.Selection<any>,
+      private scatterPlotContainer: HTMLElement,
       projectorEventContext: ProjectorEventContext) {
     this.scatterPlot =
         new ScatterPlot(scatterPlotContainer, projectorEventContext);
-    this.scatterPlotContainer = scatterPlotContainer;
     projectorEventContext.registerProjectionChangedListener(projection => {
       this.projection = projection;
       this.updateScatterPlotWithNewProjection(projection);
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlot.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlot.ts
index b40863cead..283b608e83 100644
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlot.ts
+++ b/tensorflow/tensorboard/components/vz_projector/scatterPlot.ts
@@ -72,9 +72,6 @@ export class CameraDef {
  * array of visualizers and dispatches application events to them.
  */
 export class ScatterPlot {
-  private projectorEventContext: ProjectorEventContext;
-
-  private containerNode: HTMLElement;
   private visualizers: ScatterPlotVisualizer[] = [];
 
   private onCameraMoveListeners: OnCameraMoveListener[] = [];
@@ -113,17 +110,15 @@ export class ScatterPlot {
   private rectangleSelector: ScatterPlotRectangleSelector;
 
   constructor(
-      container: d3.Selection<any>,
-      projectorEventContext: ProjectorEventContext) {
-    this.containerNode = container.node() as HTMLElement;
-    this.projectorEventContext = projectorEventContext;
+      private container: HTMLElement,
+      private projectorEventContext: ProjectorEventContext) {
     this.getLayoutValues();
 
     this.scene = new THREE.Scene();
     this.renderer = new THREE.WebGLRenderer(
         {alpha: true, premultipliedAlpha: false, antialias: false});
     this.renderer.setClearColor(BACKGROUND_COLOR, 1);
-    this.containerNode.appendChild(this.renderer.domElement);
+    this.container.appendChild(this.renderer.domElement);
     this.light = new THREE.PointLight(0xFFECBF, 1, 0);
     this.scene.add(this.light);
 
@@ -132,18 +127,16 @@ export class ScatterPlot {
     this.renderer.render(this.scene, this.camera);
 
     this.rectangleSelector = new ScatterPlotRectangleSelector(
-        this.containerNode,
+        this.container,
         (boundingBox: BoundingBox) => this.selectBoundingBox(boundingBox));
     this.addInteractionListeners();
   }
 
   private addInteractionListeners() {
-    this.containerNode.addEventListener(
-        'mousemove', this.onMouseMove.bind(this));
-    this.containerNode.addEventListener(
-        'mousedown', this.onMouseDown.bind(this));
-    this.containerNode.addEventListener('mouseup', this.onMouseUp.bind(this));
-    this.containerNode.addEventListener('click', this.onClick.bind(this));
+    this.container.addEventListener('mousemove', this.onMouseMove.bind(this));
+    this.container.addEventListener('mousedown', this.onMouseDown.bind(this));
+    this.container.addEventListener('mouseup', this.onMouseUp.bind(this));
+    this.container.addEventListener('click', this.onClick.bind(this));
     window.addEventListener('keydown', this.onKeyDown.bind(this), false);
     window.addEventListener('keyup', this.onKeyUp.bind(this), false);
   }
@@ -356,7 +349,7 @@ export class ScatterPlot {
     // If shift is pressed, start selecting
     if (e.keyCode === SHIFT_KEY) {
       this.selecting = true;
-      this.containerNode.style.cursor = 'crosshair';
+      this.container.style.cursor = 'crosshair';
     }
   }
 
@@ -371,7 +364,7 @@ export class ScatterPlot {
     if (e.keyCode === SHIFT_KEY) {
       this.selecting = (this.getMouseMode() === MouseMode.AREA_SELECT);
       if (!this.selecting) {
-        this.containerNode.style.cursor = 'default';
+        this.container.style.cursor = 'default';
       }
       this.render();
     }
@@ -441,8 +434,8 @@ export class ScatterPlot {
   }
 
   private getLayoutValues(): Point2D {
-    this.width = this.containerNode.offsetWidth;
-    this.height = Math.max(1, this.containerNode.offsetHeight);
+    this.width = this.container.offsetWidth;
+    this.height = Math.max(1, this.container.offsetHeight);
     return [this.width, this.height];
   }
 
@@ -623,10 +616,10 @@ export class ScatterPlot {
     this.mouseMode = mouseMode;
     if (mouseMode === MouseMode.AREA_SELECT) {
       this.selecting = true;
-      this.containerNode.style.cursor = 'crosshair';
+      this.container.style.cursor = 'crosshair';
     } else {
       this.selecting = false;
-      this.containerNode.style.cursor = 'default';
+      this.container.style.cursor = 'default';
     }
   }
 
@@ -668,9 +661,11 @@ export class ScatterPlot {
   }
 
   setDayNightMode(isNight: boolean) {
-    d3.select(this.containerNode)
-        .selectAll('canvas')
-        .style('filter', isNight ? 'invert(100%)' : null);
+    const canvases = this.container.querySelectorAll('canvas');
+    const filterValue = isNight ? 'invert(100%)' : null;
+    for (let i = 0; i < canvases.length; i++) {
+      canvases[i].style.filter = filterValue;
+    }
   }
 
   resize(render = true) {
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts
index a2dba9dd25..a781877014 100644
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts
+++ b/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts
@@ -32,8 +32,8 @@ export interface BoundingBox {
  * A class that manages and renders a data selection rectangle.
  */
 export class ScatterPlotRectangleSelector {
-  private svgElement: d3.Selection<any>;
-  private rectElement: d3.Selection<any>;
+  private svgElement: SVGElement;
+  private rectElement: SVGRectElement;
 
   private isMouseDown: boolean;
   private startCoordinates: [number, number];
@@ -51,20 +51,23 @@ export class ScatterPlotRectangleSelector {
   constructor(
       container: HTMLElement,
       selectionCallback: (boundingBox: BoundingBox) => void) {
-    this.svgElement = d3.select(container).select('#selector');
-    this.rectElement = this.svgElement.append('rect')
-                           .style('stroke', STROKE)
-                           .style('stroke-dasharray', STROKE_DASHARRAY)
-                           .style('stroke-width', STROKE_WIDTH)
-                           .style('fill', FILL)
-                           .style('fill-opacity', FILL_OPACITY);
+    this.svgElement = container.querySelector('#selector') as SVGElement;
+    this.rectElement =
+        document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+    this.rectElement.style.stroke = STROKE;
+    this.rectElement.style.strokeDasharray = STROKE_DASHARRAY;
+    this.rectElement.style.strokeWidth = '' + STROKE_WIDTH;
+    this.rectElement.style.fill = FILL;
+    this.rectElement.style.fillOpacity = '' + FILL_OPACITY;
+    this.svgElement.appendChild(this.rectElement);
+
     this.selectionCallback = selectionCallback;
     this.isMouseDown = false;
   }
 
   onMouseDown(offsetX: number, offsetY: number) {
     this.isMouseDown = true;
-    this.svgElement.style('display', 'block');
+    this.rectElement.style.display = 'block';
 
     this.startCoordinates = [offsetX, offsetY];
     this.lastBoundingBox = {
@@ -87,19 +90,18 @@ export class ScatterPlotRectangleSelector {
     this.lastBoundingBox.height =
         this.lastBoundingBox.y - Math.min(offsetY, this.startCoordinates[1]);
 
-    this.rectElement.attr({
-      x: this.lastBoundingBox.x,
-      y: this.lastBoundingBox.y - this.lastBoundingBox.height,
-      width: this.lastBoundingBox.width,
-      height: this.lastBoundingBox.height
-    });
+    this.rectElement.setAttribute('x', '' + this.lastBoundingBox.x);
+    this.rectElement.setAttribute(
+        'y', '' + (this.lastBoundingBox.y - this.lastBoundingBox.height));
+    this.rectElement.setAttribute('width', '' + this.lastBoundingBox.width);
+    this.rectElement.setAttribute('height', '' + this.lastBoundingBox.height);
   }
 
   onMouseUp() {
     this.isMouseDown = false;
-    this.svgElement.style('display', 'none');
-    this.rectElement.attr('width', 0);
-    this.rectElement.attr('height', 0);
+    this.rectElement.style.display = 'none';
+    this.rectElement.setAttribute('width', '0');
+    this.rectElement.setAttribute('height', '0');
     this.selectionCallback(this.lastBoundingBox);
   }
 }
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts
index a93aca74a2..91cb10a97e 100644
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts
@@ -22,6 +22,10 @@ describe('selector callbacks make bounding box start bottom left', () => {
 
   beforeEach(() => {
     containerElement = document.createElement('div');
+    const selector = document.createElement('svg');
+    selector.id = 'selector';
+    containerElement.appendChild(selector);
+
     selectionCallback = jasmine.createSpy('selectionCallback');
     selection =
         new ScatterPlotRectangleSelector(containerElement, selectionCallback);
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts
index 04603e0fba..303b59f754 100644
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts
+++ b/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts
@@ -33,10 +33,14 @@ export class ScatterPlotVisualizerCanvasLabels implements
   private canvas: HTMLCanvasElement;
   private labelsActive: boolean = true;
 
-  constructor(container: d3.Selection<any>) {
-    this.canvas = container.append('canvas').node() as HTMLCanvasElement;
+  constructor(container: HTMLElement) {
+    this.canvas = document.createElement('canvas');
+    container.appendChild(this.canvas);
+
     this.gc = this.canvas.getContext('2d');
-    d3.select(this.canvas).style({position: 'absolute', left: 0, top: 0});
+    this.canvas.style.position = 'absolute';
+    this.canvas.style.left = '0';
+    this.canvas.style.top = '0';
     this.canvas.style.pointerEvents = 'none';
   }
 
@@ -151,10 +155,10 @@ export class ScatterPlotVisualizerCanvasLabels implements
 
   onResize(newWidth: number, newHeight: number) {
     let dpr = window.devicePixelRatio;
-    d3.select(this.canvas)
-        .attr('width', newWidth * dpr)
-        .attr('height', newHeight * dpr)
-        .style({width: newWidth + 'px', height: newHeight + 'px'});
+    this.canvas.width = newWidth * dpr;
+    this.canvas.height = newHeight * dpr;
+    this.canvas.style.width = newWidth + 'px';
+    this.canvas.style.height = newHeight + 'px';
   }
 
   dispose() {
diff --git a/tensorflow/tensorboard/components/vz_projector/util.ts b/tensorflow/tensorboard/components/vz_projector/util.ts
index b2400bac83..bd6df68b1a 100644
--- a/tensorflow/tensorboard/components/vz_projector/util.ts
+++ b/tensorflow/tensorboard/components/vz_projector/util.ts
@@ -42,6 +42,33 @@ export function shuffle<T>(array: T[]): T[] {
   return array;
 }
 
+export function range(count: number): number[] {
+  const rangeOutput: number[] = [];
+  for (let i = 0; i < count; i++) {
+    rangeOutput.push(i);
+  }
+  return rangeOutput;
+}
+
+export function classed(
+    element: HTMLElement, className: string, enabled: boolean) {
+  const classNames = element.className.split(' ');
+  if (enabled) {
+    if (className in classNames) {
+      return;
+    } else {
+      classNames.push(className);
+    }
+  } else {
+    const index = classNames.indexOf(className);
+    if (index === -1) {
+      return;
+    }
+    classNames.splice(index, 1);
+  }
+  element.className = classNames.join(' ');
+}
+
 /** Projects a 3d point into screen space */
 export function vector3DToScreenCoords(
     cam: THREE.Camera, w: number, h: number, v: THREE.Vector3): Point2D {
@@ -153,7 +180,7 @@ export function runAsyncTask<T>(
   let autoClear = (msgId == null);
   msgId = logging.setModalMessage(message, msgId);
   return new Promise<T>((resolve, reject) => {
-    d3.timer(() => {
+    setTimeout(() => {
       try {
         let result = task();
         // Clearing the old message.
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts
index d22904337a..53195fa47c 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts
@@ -41,13 +41,17 @@ export class BookmarkPanel extends BookmarkPanelPolymer {
   private selectedState: number;
   private ignoreNextProjectionEvent: boolean;
 
-  private dom: d3.Selection<any>;
+  private expandLessButton: HTMLButtonElement;
+  private expandMoreButton: HTMLButtonElement;
 
   ready() {
-    this.dom = d3.select(this);
     this.savedStates = [];
     this.setupUploadButton();
     this.ignoreNextProjectionEvent = false;
+    this.expandLessButton =
+        this.querySelector('#expand-less') as HTMLButtonElement;
+    this.expandMoreButton =
+        this.querySelector('#expand-more') as HTMLButtonElement;
   }
 
   initialize(
@@ -80,15 +84,15 @@ export class BookmarkPanel extends BookmarkPanelPolymer {
   /** Handles a click on show bookmarks tray button. */
   _expandMore() {
     this.$.panel.show();
-    this.dom.select('#expand-more').style('display', 'none');
-    this.dom.select('#expand-less').style('display', '');
+    this.expandMoreButton.style.display = 'none';
+    this.expandLessButton.style.display = '';
   }
 
   /** Handles a click on hide bookmarks tray button. */
   _expandLess() {
     this.$.panel.hide();
-    this.dom.select('#expand-more').style('display', '');
-    this.dom.select('#expand-less').style('display', 'none');
+    this.expandMoreButton.style.display = '';
+    this.expandLessButton.style.display = 'none';
   }
 
   /** Handles a click on the add bookmark button. */
@@ -136,16 +140,16 @@ export class BookmarkPanel extends BookmarkPanelPolymer {
 
   private setupUploadButton() {
     // Show and setup the load view button.
-    let fileInput = this.dom.select('#state-file');
-    fileInput.on('change', () => {
-      let file: File = (d3.event as any).target.files[0];
+    const fileInput = this.querySelector('#state-file') as HTMLInputElement;
+    fileInput.onchange = () => {
+      const file: File = fileInput.files[0];
       // Clear out the value of the file chooser. This ensures that if the user
       // selects the same file, we'll re-read it.
-      (d3.event as any).target.value = '';
-      let fileReader = new FileReader();
+      fileInput.value = '';
+      const fileReader = new FileReader();
       fileReader.onload = (evt) => {
-        let str: string = (evt.target as any).result;
-        let savedStates = JSON.parse(str);
+        const str: string = fileReader.result;
+        const savedStates = JSON.parse(str);
 
         // Verify the bookmarks match.
         if (this.savedStatesValid(savedStates)) {
@@ -158,7 +162,7 @@ export class BookmarkPanel extends BookmarkPanelPolymer {
         }
       };
       fileReader.readAsText(file);
-    });
+    };
   }
 
   addStates(savedStates?: State[]) {
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
index 718325db88..3857113ac0 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
@@ -59,13 +59,19 @@ TF.Dashboard.VzProjectorDashboard = Polymer({
     if (this._initialized) {
       return;
     }
+    let xhr = new XMLHttpRequest();
+    xhr.open('GET', this.routePrefix + '/runs');
+    xhr.onload = () => {
+      // Set this to true so we only initialize once.
+      this._initialized = true;
 
-    // Set this to true so we only initialize once.
-    this._initialized = true;
-
-    d3.json(this.routePrefix + '/runs', (err, runs) => {
+      let runs = JSON.parse(xhr.responseText);
       this.set('dataNotFound', runs.length === 0);
-    });
+    };
+    xhr.onerror = () => {
+      this.set('dataNotFound', false);
+    };
+    xhr.send();
   },
 });
 })();
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
index 5e6bd3e7ab..6856caa2f4 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
@@ -47,7 +47,6 @@ export class DataPanel extends DataPanelPolymer {
   private labelOptions: string[];
   private colorOptions: ColorOption[];
   forceCategoricalColoring: boolean = false;
-  private dom: d3.Selection<any>;
 
   private selectedTensor: string;
   private selectedRun: string;
@@ -61,7 +60,6 @@ export class DataPanel extends DataPanelPolymer {
   private metadataFile: string;
 
   ready() {
-    this.dom = d3.select(this);
     this.normalizeData = true;
   }
 
@@ -129,9 +127,11 @@ export class DataPanel extends DataPanelPolymer {
   }
 
   private updateMetadataUI(columnStats: ColumnStats[], metadataFile: string) {
-    this.dom.select('#metadata-file')
-        .html(this.addWordBreaks(metadataFile))
-        .attr('title', metadataFile);
+    const metadataFileElement =
+        this.querySelector('#metadata-file') as HTMLSpanElement;
+    metadataFileElement.innerHTML = this.addWordBreaks(metadataFile);
+    metadataFileElement.title = metadataFile;
+
     // Label by options.
     let labelIndex = -1;
     this.labelOptions = columnStats.map((stats, i) => {
@@ -144,13 +144,13 @@ export class DataPanel extends DataPanelPolymer {
     this.selectedLabelOption = this.labelOptions[Math.max(0, labelIndex)];
 
     // Color by options.
-    let standardColorOption: ColorOption[] = [
+    const standardColorOption: ColorOption[] = [
       {name: 'No color map'},
       // TODO(smilkov): Implement this.
       // {name: 'Distance of neighbors',
       //    desc: 'How far is each point from its neighbors'}
     ];
-    let metadataColorOption: ColorOption[] =
+    const metadataColorOption: ColorOption[] =
         columnStats
             .filter(stats => {
               return !stats.tooManyUniqueValues || stats.isNumeric;
@@ -263,13 +263,15 @@ export class DataPanel extends DataPanelPolymer {
       this.tensorNames = names.map(name => {
         return {name, shape: this.getEmbeddingInfoByName(name).tensorShape};
       });
-      let wordBreakablePath =
+      const wordBreakablePath =
           this.addWordBreaks(this.projectorConfig.modelCheckpointPath);
-      this.dom.select('#checkpoint-file')
-          .html(wordBreakablePath)
-          .attr('title', this.projectorConfig.modelCheckpointPath);
+      const checkpointFile =
+          this.querySelector('#checkpoint-file') as HTMLSpanElement;
+      checkpointFile.innerHTML = wordBreakablePath;
+      checkpointFile.title = this.projectorConfig.modelCheckpointPath;
+
       // If in demo mode, let the order decide which tensor to load by default.
-      let defaultTensor = this.projector.servingMode === 'demo' ?
+      const defaultTensor = this.projector.servingMode === 'demo' ?
           this.projectorConfig.embeddings[0].tensorName :
           names[0];
       if (this.selectedTensor === defaultTensor) {
@@ -322,9 +324,10 @@ export class DataPanel extends DataPanelPolymer {
 
   private tensorWasReadFromFile(rawContents: ArrayBuffer, fileName: string) {
     parseRawTensors(rawContents, ds => {
-      this.dom.select('#checkpoint-file')
-          .text(fileName)
-          .attr('title', fileName);
+      const checkpointFile =
+          this.querySelector('#checkpoint-file') as HTMLSpanElement;
+      checkpointFile.innerText = fileName;
+      checkpointFile.title = fileName;
       this.projector.updateDataSet(ds);
     });
   }
@@ -337,7 +340,7 @@ export class DataPanel extends DataPanelPolymer {
 
   private getEmbeddingInfoByName(tensorName: string): EmbeddingInfo {
     for (let i = 0; i < this.projectorConfig.embeddings.length; i++) {
-      let e = this.projectorConfig.embeddings[i];
+      const e = this.projectorConfig.embeddings[i];
       if (e.tensorName === tensorName) {
         return e;
       }
@@ -346,44 +349,47 @@ export class DataPanel extends DataPanelPolymer {
 
   private setupUploadButtons() {
     // Show and setup the upload button.
-    let fileInput = this.dom.select('#file');
-    fileInput.on('change', () => {
-      let file: File = (d3.event as any).target.files[0];
+    const fileInput = this.querySelector('#file') as HTMLInputElement;
+    fileInput.onchange = () => {
+      const file: File = fileInput.files[0];
       // Clear out the value of the file chooser. This ensures that if the user
       // selects the same file, we'll re-read it.
-      (d3.event as any).target.value = '';
-      let fileReader = new FileReader();
+      fileInput.value = '';
+      const fileReader = new FileReader();
       fileReader.onload = evt => {
-        let content: ArrayBuffer = (evt.target as any).result;
+        const content: ArrayBuffer = fileReader.result;
         this.tensorWasReadFromFile(content, file.name);
       };
       fileReader.readAsArrayBuffer(file);
-    });
+    };
 
-    let uploadButton = this.dom.select('#upload-tensors');
-    uploadButton.on('click', () => {
-      (fileInput.node() as HTMLInputElement).click();
-    });
+    const uploadButton =
+        this.querySelector('#upload-tensors') as HTMLButtonElement;
+    uploadButton.onclick = () => {
+      fileInput.click();
+    };
 
     // Show and setup the upload metadata button.
-    let fileMetadataInput = this.dom.select('#file-metadata');
-    fileMetadataInput.on('change', () => {
-      let file: File = (d3.event as any).target.files[0];
+    const fileMetadataInput =
+        this.querySelector('#file-metadata') as HTMLInputElement;
+    fileMetadataInput.onchange = () => {
+      const file: File = fileMetadataInput.files[0];
       // Clear out the value of the file chooser. This ensures that if the user
       // selects the same file, we'll re-read it.
-      (d3.event as any).target.value = '';
-      let fileReader = new FileReader();
+      fileMetadataInput.value = '';
+      const fileReader = new FileReader();
       fileReader.onload = evt => {
-        let contents: ArrayBuffer = (evt.target as any).result;
+        const contents: ArrayBuffer = fileReader.result;
         this.metadataWasReadFromFile(contents, file.name);
       };
       fileReader.readAsArrayBuffer(file);
-    });
+    };
 
-    let uploadMetadataButton = this.dom.select('#upload-metadata');
-    uploadMetadataButton.on('click', () => {
-      (fileMetadataInput.node() as HTMLInputElement).click();
-    });
+    const uploadMetadataButton =
+        this.querySelector('#upload-metadata') as HTMLButtonElement;
+    uploadMetadataButton.onclick = () => {
+      fileMetadataInput.click();
+    };
 
     if (this.projector.servingMode !== 'demo') {
       (this.$$('#publish-container') as HTMLElement).style.display = 'none';
@@ -396,9 +402,9 @@ export class DataPanel extends DataPanelPolymer {
         'block';
 
     // Fill out the projector config.
-    let projectorConfigTemplate =
+    const projectorConfigTemplate =
         this.$$('#projector-config-template') as HTMLTextAreaElement;
-    let projectorConfigTemplateJson: ProjectorConfig = {
+    const projectorConfigTemplateJson: ProjectorConfig = {
       embeddings: [{
         tensorName: 'My tensor',
         tensorShape: [1000, 50],
@@ -411,8 +417,9 @@ export class DataPanel extends DataPanelPolymer {
         projectorConfigTemplate, projectorConfigTemplateJson);
 
     // Set up optional field checkboxes.
-    let spriteFieldCheckbox = this.$$('#config-sprite-checkbox');
-    spriteFieldCheckbox.addEventListener('change', () => {
+    const spriteFieldCheckbox =
+        this.$$('#config-sprite-checkbox') as HTMLInputElement;
+    spriteFieldCheckbox.onchange = () => {
       if ((spriteFieldCheckbox as any).checked) {
         projectorConfigTemplateJson.embeddings[0].sprite = {
           imagePath: 'https://github.com/.../optional.sprite.png',
@@ -423,9 +430,10 @@ export class DataPanel extends DataPanelPolymer {
       }
       this.setProjectorConfigTemplateJson(
           projectorConfigTemplate, projectorConfigTemplateJson);
-    });
-    let bookmarksFieldCheckbox = this.$$('#config-bookmarks-checkbox');
-    bookmarksFieldCheckbox.addEventListener('change', () => {
+    };
+    const bookmarksFieldCheckbox =
+        this.$$('#config-bookmarks-checkbox') as HTMLInputElement;
+    bookmarksFieldCheckbox.onchange = () => {
       if ((bookmarksFieldCheckbox as any).checked) {
         projectorConfigTemplateJson.embeddings[0].bookmarksPath =
             'https://raw.githubusercontent.com/.../bookmarks.txt';
@@ -434,9 +442,10 @@ export class DataPanel extends DataPanelPolymer {
       }
       this.setProjectorConfigTemplateJson(
           projectorConfigTemplate, projectorConfigTemplateJson);
-    });
-    let metadataFieldCheckbox = this.$$('#config-metadata-checkbox');
-    metadataFieldCheckbox.addEventListener('change', () => {
+    };
+    const metadataFieldCheckbox =
+        this.$$('#config-metadata-checkbox') as HTMLInputElement;
+    metadataFieldCheckbox.onchange = () => {
       if ((metadataFieldCheckbox as HTMLInputElement).checked) {
         projectorConfigTemplateJson.embeddings[0].metadataPath =
             'https://raw.githubusercontent.com/.../optional.metadata.tsv';
@@ -445,13 +454,14 @@ export class DataPanel extends DataPanelPolymer {
       }
       this.setProjectorConfigTemplateJson(
           projectorConfigTemplate, projectorConfigTemplateJson);
-    });
+    };
 
     // Update the link and the readonly shareable URL.
-    let projectorConfigUrlInput = this.$$('#projector-config-url');
-    let projectorConfigDemoUrlInput = this.$$('#projector-share-url');
-    let projectorConfigDemoUrlLink = this.$$('#projector-share-url-link');
-    projectorConfigUrlInput.addEventListener('input', () => {
+    const projectorConfigUrlInput =
+        this.$$('#projector-config-url') as HTMLInputElement;
+    const projectorConfigDemoUrlInput = this.$$('#projector-share-url');
+    const projectorConfigDemoUrlLink = this.$$('#projector-share-url-link');
+    projectorConfigUrlInput.onchange = () => {
       let projectorDemoUrl = location.protocol + '//' + location.host +
           location.pathname +
           '?config=' + (projectorConfigUrlInput as HTMLInputElement).value;
@@ -459,7 +469,7 @@ export class DataPanel extends DataPanelPolymer {
       (projectorConfigDemoUrlInput as HTMLInputElement).value =
           projectorDemoUrl;
       (projectorConfigDemoUrlLink as HTMLLinkElement).href = projectorDemoUrl;
-    });
+    };
   }
 
   private setProjectorConfigTemplateJson(
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts
index 6270185dd4..e11346d327 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts
@@ -26,7 +26,6 @@ export interface InputChangedListener {
 
 /** Input control with custom capabilities (e.g. regex). */
 export class ProjectorInput extends PolymerClass {
-  private dom: d3.Selection<HTMLElement>;
   private textChangedListeners: InputChangedListener[];
   private paperInput: HTMLInputElement;
   private inRegexModeButton: HTMLButtonElement;
@@ -43,7 +42,6 @@ export class ProjectorInput extends PolymerClass {
   ready() {
     this.inRegexMode = false;
     this.textChangedListeners = [];
-    this.dom = d3.select(this);
     this.paperInput = this.querySelector('paper-input') as HTMLInputElement;
     this.inRegexModeButton =
         this.querySelector('paper-button') as HTMLButtonElement;
@@ -89,9 +87,12 @@ export class ProjectorInput extends PolymerClass {
   }
 
   private updateRegexModeDisplaySlashes() {
-    d3.select(this.paperInput)
-        .selectAll('.slash')
-        .style('display', this.inRegexMode ? null : 'none');
+    const slashes = this.paperInput.querySelectorAll('.slash');
+    const display = this.inRegexMode ? '' : 'none';
+
+    for (let i = 0; i < slashes.length; i++) {
+      (slashes[i] as HTMLDivElement).style.display = display;
+    }
   }
 
   getValue(): string {
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts
index 20dc67167f..3ee2c2165f 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts
@@ -17,6 +17,7 @@ import {DistanceFunction, SpriteAndMetadataInfo, State} from './data';
 import * as knn from './knn';
 import {ProjectorEventContext} from './projectorEventContext';
 import * as adapter from './projectorScatterPlotAdapter';
+import * as util from './util';
 import * as vector from './vector';
 import {Projector} from './vz-projector';
 import {ProjectorInput} from './vz-projector-input';
@@ -40,23 +41,24 @@ export class InspectorPanel extends PolymerClass {
 
   private selectedMetadataField: string;
   private metadataFields: string[];
-  private dom: d3.Selection<HTMLElement>;
   private projector: Projector;
   private selectedPointIndices: number[];
   private neighborsOfFirstPoint: knn.NearestEntry[];
   private searchBox: ProjectorInput;
 
-  private resetFilterButton: d3.Selection<HTMLElement>;
-  private setFilterButton: d3.Selection<HTMLElement>;
-  private clearSelectionButton: d3.Selection<HTMLElement>;
-  private limitMessage: d3.Selection<HTMLElement>;
+  private resetFilterButton: HTMLButtonElement;
+  private setFilterButton: HTMLButtonElement;
+  private clearSelectionButton: HTMLButtonElement;
+  private limitMessage: HTMLDivElement;
 
   ready() {
-    this.dom = d3.select(this);
-    this.resetFilterButton = this.dom.select('.reset-filter');
-    this.setFilterButton = this.dom.select('.set-filter');
-    this.clearSelectionButton = this.dom.select('.clear-selection');
-    this.limitMessage = this.dom.select('.limit-msg');
+    this.resetFilterButton =
+        this.querySelector('.reset-filter') as HTMLButtonElement;
+    this.setFilterButton =
+        this.querySelector('.set-filter') as HTMLButtonElement;
+    this.clearSelectionButton =
+        this.querySelector('.clear-selection') as HTMLButtonElement;
+    this.limitMessage = this.querySelector('.limit-msg') as HTMLDivElement;
     this.searchBox = this.querySelector('#search-box') as ProjectorInput;
     // https://www.polymer-project.org/1.0/docs/devguide/styling#scope-subtree
     this.scopeSubtree(this, true);
@@ -88,7 +90,7 @@ export class InspectorPanel extends PolymerClass {
   }
 
   private enableResetFilterButton(enabled: boolean) {
-    this.resetFilterButton.attr('disabled', enabled ? null : true);
+    this.resetFilterButton.disabled = !enabled;
   }
 
   restoreUIFromBookmark(bookmark: State) {
@@ -113,143 +115,178 @@ export class InspectorPanel extends PolymerClass {
   }
 
   private updateSearchResults(indices: number[]) {
-    let container = this.dom.select('.matches-list');
-    container.style('display', indices.length ? null : 'none');
-    let list = container.select('.list');
-    list.html('');
+    const container = this.querySelector('.matches-list') as HTMLDivElement;
+    container.style.display = indices.length ? null : 'none';
+    const list = container.querySelector('.list') as HTMLDivElement;
+    list.innerHTML = '';
     if (indices.length === 0) {
       return;
     }
-    this.limitMessage.style(
-        'display', indices.length <= LIMIT_RESULTS ? 'none' : null);
+
+    this.limitMessage.style.display =
+        indices.length <= LIMIT_RESULTS ? 'none' : null;
     indices = indices.slice(0, LIMIT_RESULTS);
-    let rows = list.selectAll('.row').data(indices).enter().append('div').attr(
-        'class', 'row');
-    rows.append('a')
-        .attr('class', 'label')
-        .attr('title', index => this.getLabelFromIndex(index))
-        .text(index => this.getLabelFromIndex(index));
-    rows.on('mouseenter', index => {
-      this.projectorEventContext.notifyHoverOverPoint(index);
-    });
-    rows.on('mouseleave', () => {
-      this.projectorEventContext.notifyHoverOverPoint(null);
-    });
-    rows.on('click', index => {
-      this.projectorEventContext.notifySelectionChanged([index]);
-    });
+
+    for (let i = 0; i < indices.length; i++) {
+      const index = indices[i];
+
+      const row = document.createElement('div');
+      row.className = 'row';
+
+      const label = this.getLabelFromIndex(index);
+      const rowLink = document.createElement('a');
+      rowLink.className = 'label';
+      rowLink.title = label;
+      rowLink.innerText = label;
+
+      rowLink.onmouseenter = () => {
+        this.projectorEventContext.notifyHoverOverPoint(index);
+      };
+      rowLink.onmouseleave = () => {
+        this.projectorEventContext.notifyHoverOverPoint(null);
+      };
+      rowLink.onclick = () => {
+        this.projectorEventContext.notifySelectionChanged([index]);
+      };
+
+      row.appendChild(rowLink);
+      list.appendChild(row);
+    }
   }
 
   private getLabelFromIndex(pointIndex: number): string {
-    let point = this.projector.dataSet.points[pointIndex];
+    const point = this.projector.dataSet.points[pointIndex];
     return point.metadata[this.selectedMetadataField].toString();
   }
 
   private updateNeighborsList(neighbors: knn.NearestEntry[]) {
-    let nnlist = this.dom.select('.nn-list');
-    nnlist.html('');
-    this.dom.select('.nn').style('display', neighbors.length ? null : 'none');
+    const nnlist = this.querySelector('.nn-list') as HTMLDivElement;
+    nnlist.innerHTML = '';
+
+    (this.querySelector('.nn') as HTMLDivElement).style.display =
+        neighbors.length ? null : 'none';
 
     if (neighbors.length === 0) {
       return;
     }
 
     this.searchBox.message = '';
-    let minDist = neighbors.length > 0 ? neighbors[0].dist : 0;
-    let n = nnlist.selectAll('.neighbor')
-                .data(neighbors)
-                .enter()
-                .append('div')
-                .attr('class', 'neighbor')
-                .append('a')
-                .attr('class', 'neighbor-link')
-                .attr('title', d => this.getLabelFromIndex(d.index));
-
-
-    let labelValue = n.append('div').attr('class', 'label-and-value');
-    labelValue.append('div')
-        .attr('class', 'label')
-        .style('color', d => adapter.dist2color(this.distFunc, d.dist, minDist))
-        .text(d => this.getLabelFromIndex(d.index));
-
-    labelValue.append('div')
-        .attr('class', 'value')
-        .text(d => d.dist.toFixed(3));
-
-    let bar = n.append('div').attr('class', 'bar');
-
-    bar.append('div')
-        .attr('class', 'fill')
-        .style(
-            'border-top-color',
-            d => {
-              return adapter.dist2color(this.distFunc, d.dist, minDist);
-            })
-        .style(
-            'width',
-            d => adapter.normalizeDist(this.distFunc, d.dist, minDist) * 100 +
-                '%');
-
-    bar.selectAll('.tick')
-        .data(d3.range(1, 4))
-        .enter()
-        .append('div')
-        .attr('class', 'tick')
-        .style('left', d => d * 100 / 4 + '%');
-    n.on('mouseenter', d => {
-      this.projectorEventContext.notifyHoverOverPoint(d.index);
-    });
-    n.on('mouseleave', () => {
-      this.projectorEventContext.notifyHoverOverPoint(null);
-    });
-    n.on('click', d => {
-      this.projectorEventContext.notifySelectionChanged([d.index]);
-    });
+    const minDist = neighbors.length > 0 ? neighbors[0].dist : 0;
+
+    for (let i = 0; i < neighbors.length; i++) {
+      const neighbor = neighbors[i];
+
+      const neighborElement = document.createElement('div');
+      neighborElement.className = 'neighbor';
+
+      const neighborElementLink = document.createElement('a');
+      neighborElementLink.className = 'neighbor-link';
+      neighborElementLink.title = this.getLabelFromIndex(neighbor.index);
+
+      const labelValueElement = document.createElement('div');
+      labelValueElement.className = 'label-and-value';
+
+      const labelElement = document.createElement('div');
+      labelElement.className = 'label';
+      labelElement.style.color =
+          adapter.dist2color(this.distFunc, neighbor.dist, minDist);
+      labelElement.innerText = this.getLabelFromIndex(neighbor.index);
+
+      const valueElement = document.createElement('div');
+      valueElement.className = 'value';
+      valueElement.innerText = neighbor.dist.toFixed(3);
+
+      labelValueElement.appendChild(labelElement);
+      labelValueElement.appendChild(valueElement);
+
+      const barElement = document.createElement('div');
+      barElement.className = 'bar';
+
+      const barFillElement = document.createElement('div');
+      barFillElement.className = 'fill';
+      barFillElement.style.borderTopColor =
+          adapter.dist2color(this.distFunc, neighbor.dist, minDist);
+      barFillElement.style.width =
+          adapter.normalizeDist(this.distFunc, neighbor.dist, minDist) * 100 +
+          '%';
+      barElement.appendChild(barFillElement);
+
+      for (let j = 1; j < 4; j++) {
+        const tickElement = document.createElement('div');
+        tickElement.className = 'tick';
+        tickElement.style.left = j * 100 / 4 + '%';
+        barElement.appendChild(tickElement);
+      }
+
+      neighborElementLink.appendChild(labelValueElement);
+      neighborElementLink.appendChild(barElement);
+      neighborElement.appendChild(neighborElementLink);
+      nnlist.appendChild(neighborElement);
+
+      neighborElementLink.onmouseenter = () => {
+        this.projectorEventContext.notifyHoverOverPoint(neighbor.index);
+      };
+      neighborElementLink.onmouseleave = () => {
+        this.projectorEventContext.notifyHoverOverPoint(null);
+      };
+      neighborElementLink.onclick = () => {
+        this.projectorEventContext.notifySelectionChanged([neighbor.index]);
+      };
+    }
   }
 
   private updateFilterButtons(numPoints: number) {
     if (numPoints > 1) {
-      this.setFilterButton.text(`Isolate ${numPoints} points`)
-          .attr('disabled', null);
-      this.clearSelectionButton.attr('disabled', null);
+      this.setFilterButton.innerText = `Isolate ${numPoints} points`;
+      this.setFilterButton.disabled = null;
+      this.clearSelectionButton.disabled = null;
     } else {
-      this.setFilterButton.attr('disabled', true);
-      this.clearSelectionButton.attr('disabled', true);
+      this.setFilterButton.disabled = true;
+      this.clearSelectionButton.disabled = true;
     }
   }
 
   private setupUI(projector: Projector) {
     this.distFunc = vector.cosDist;
-    let eucDist = this.dom.select('.distance a.euclidean');
-    eucDist.on('click', () => {
-      this.dom.selectAll('.distance a').classed('selected', false);
-      eucDist.classed('selected', true);
+    const eucDist =
+        this.querySelector('.distance a.euclidean') as HTMLLinkElement;
+    eucDist.onclick = () => {
+      const links = this.querySelectorAll('.distance a');
+      for (let i = 0; i < links.length; i++) {
+        util.classed(links[i] as HTMLElement, 'selected', false);
+      }
+      util.classed(eucDist as HTMLElement, 'selected', true);
+
       this.distFunc = vector.dist;
       this.projectorEventContext.notifyDistanceMetricChanged(this.distFunc);
-      let neighbors = projector.dataSet.findNeighbors(
+      const neighbors = projector.dataSet.findNeighbors(
           this.selectedPointIndices[0], this.distFunc, this.numNN);
       this.updateNeighborsList(neighbors);
-    });
+    };
+
+    const cosDist = this.querySelector('.distance a.cosine') as HTMLLinkElement;
+    cosDist.onclick = () => {
+      const links = this.querySelectorAll('.distance a');
+      for (let i = 0; i < links.length; i++) {
+        util.classed(links[i] as HTMLElement, 'selected', false);
+      }
+      util.classed(cosDist, 'selected', true);
 
-    let cosDist = this.dom.select('.distance a.cosine');
-    cosDist.on('click', () => {
-      this.dom.selectAll('.distance a').classed('selected', false);
-      cosDist.classed('selected', true);
       this.distFunc = vector.cosDist;
       this.projectorEventContext.notifyDistanceMetricChanged(this.distFunc);
-      let neighbors = projector.dataSet.findNeighbors(
+      const neighbors = projector.dataSet.findNeighbors(
           this.selectedPointIndices[0], this.distFunc, this.numNN);
       this.updateNeighborsList(neighbors);
-    });
+    };
 
     // Called whenever the search text input changes.
-    let updateInput = (value: string, inRegexMode: boolean) => {
+    const updateInput = (value: string, inRegexMode: boolean) => {
       if (value == null || value.trim() === '') {
         this.searchBox.message = '';
         this.projectorEventContext.notifySelectionChanged([]);
         return;
       }
-      let indices = projector.dataSet.query(
+      const indices = projector.dataSet.query(
           value, inRegexMode, this.selectedMetadataField);
       if (indices.length === 0) {
         this.searchBox.message = '0 matches.';
@@ -263,10 +300,11 @@ export class InspectorPanel extends PolymerClass {
     });
 
     // Nearest neighbors controls.
-    let numNNInput = this.$$('#nn-slider') as HTMLInputElement;
-    let updateNumNN = () => {
+    const numNNInput = this.$$('#nn-slider') as HTMLInputElement;
+    const updateNumNN = () => {
       this.numNN = +numNNInput.value;
-      this.dom.select('.num-nn .nn-count').text(this.numNN);
+      (this.querySelector('.num-nn .nn-count') as HTMLSpanElement).innerText =
+          '' + this.numNN;
       if (this.selectedPointIndices != null) {
         this.projectorEventContext.notifySelectionChanged(
             [this.selectedPointIndices[0]]);
@@ -276,22 +314,22 @@ export class InspectorPanel extends PolymerClass {
     updateNumNN();
 
     // Filtering dataset.
-    this.setFilterButton.on('click', () => {
+    this.setFilterButton.onclick = () => {
       const indices = this.selectedPointIndices.concat(
           this.neighborsOfFirstPoint.map(n => n.index));
       projector.filterDataset(indices);
       this.enableResetFilterButton(true);
       this.updateFilterButtons(0);
-    });
+    };
 
-    this.resetFilterButton.on('click', () => {
+    this.resetFilterButton.onclick = () => {
       projector.resetFilterDataset();
       this.enableResetFilterButton(false);
-    });
+    };
 
-    this.clearSelectionButton.on('click', () => {
+    this.clearSelectionButton.onclick = () => {
       projector.adjustSelectionAndHover([]);
-    });
+    };
     this.enableResetFilterButton(false);
   }
 }
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts
index d30a955480..1c4ddf940d 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts
@@ -44,11 +44,6 @@ export interface ColorLegendThreshold {
 
 export class Legend extends LegendPolymer {
   renderInfo: ColorLegendRenderInfo;
-  dom: d3.Selection<HTMLElement>;
-
-  ready() {
-    this.dom = d3.select(this);
-  }
 
   _renderInfoChanged() {
     if (this.renderInfo == null) {
@@ -70,29 +65,32 @@ export class Legend extends LegendPolymer {
   }
 
   private getOffset(value: number): string {
-    let min = this.renderInfo.thresholds[0].value;
-    let max =
+    const min = this.renderInfo.thresholds[0].value;
+    const max =
         this.renderInfo.thresholds[this.renderInfo.thresholds.length - 1].value;
     return (100 * (value - min) / (max - min)).toFixed(2) + '%';
   }
 
   private setupLinearGradient() {
-    let linearGradient = this.dom.select('#gradient');
+    const linearGradient =
+        this.querySelector('#gradient') as SVGLinearGradientElement;
 
-    let width =
-        (this.dom.select('svg.gradient').node() as SVGElement).clientWidth;
+    const width =
+        (this.querySelector('svg.gradient') as SVGElement).clientWidth;
 
     // Set the svg <rect> to be the width of its <svg> parent.
-    this.dom.select('svg.gradient rect').attr('width', width);
+    (this.querySelector('svg.gradient rect') as SVGRectElement).style.width =
+        width + 'px';
 
     // Remove all <stop> children from before.
-    linearGradient.selectAll('*').remove();
+    linearGradient.innerHTML = '';
 
     // Add a <stop> child in <linearGradient> for each gradient threshold.
     this.renderInfo.thresholds.forEach(t => {
-      linearGradient.append('stop')
-          .attr('offset', this.getOffset(t.value))
-          .attr('stop-color', t.color);
+      const stopElement =
+          document.createElementNS('http://www.w3.org/2000/svg', 'stop');
+      stopElement.setAttribute('offset', this.getOffset(t.value));
+      stopElement.setAttribute('stop-color', t.color);
     });
   }
 }
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts
index 17a4700bb5..939300f387 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts
@@ -28,8 +28,6 @@ export let MetadataCardPolymer = PolymerElement({
 });
 
 export class MetadataCard extends MetadataCardPolymer {
-  private dom: d3.Selection<any>;
-
   hasMetadata: boolean;
   metadata: Array<{key: string, value: string}>;
   label: string;
@@ -37,22 +35,28 @@ export class MetadataCard extends MetadataCardPolymer {
   private labelOption: string;
   private pointMetadata: PointMetadata;
 
+  private expandLessButton: HTMLButtonElement;
+  private expandMoreButton: HTMLButtonElement;
+
   ready() {
-    this.dom = d3.select(this);
+    this.expandLessButton =
+        this.querySelector('#expand-less') as HTMLButtonElement;
+    this.expandMoreButton =
+        this.querySelector('#expand-more') as HTMLButtonElement;
   }
-
   /** Handles a click on the expand more icon. */
   _expandMore() {
     (this.$$('#metadata-container') as any).toggle();
-    this.dom.select('#expand-more').style('display', 'none');
-    this.dom.select('#expand-less').style('display', '');
+
+    this.expandMoreButton.style.display = 'none';
+    this.expandLessButton.style.display = '';
   }
 
   /** Handles a click on the expand less icon. */
   _expandLess() {
     (this.$$('#metadata-container') as any).toggle();
-    this.dom.select('#expand-more').style('display', '');
-    this.dom.select('#expand-less').style('display', 'none');
+    this.expandMoreButton.style.display = '';
+    this.expandLessButton.style.display = 'none';
   }
 
   updateMetadata(pointMetadata?: PointMetadata) {
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts
index 9df182ed48..377c6c11ad 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts
@@ -15,6 +15,7 @@ limitations under the License.
 
 import * as data from './data';
 import {DataSet, Projection, ProjectionType, SpriteAndMetadataInfo, State} from './data';
+import * as util from './util';
 import * as vector from './vector';
 import {Vector} from './vector';
 import {Projector} from './vz-projector';
@@ -92,13 +93,12 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
   public customSelectedSearchByMetadataOption: string;
 
   /** Polymer elements. */
-  private dom: d3.Selection<any>;
-  private runTsneButton: d3.Selection<HTMLButtonElement>;
-  private stopTsneButton: d3.Selection<HTMLButtonElement>;
+  private runTsneButton: HTMLButtonElement;
+  private stopTsneButton: HTMLButtonElement;
   private perplexitySlider: HTMLInputElement;
   private learningRateInput: HTMLInputElement;
-  private zDropdown: d3.Selection<HTMLElement>;
-  private iterationLabel: d3.Selection<HTMLElement>;
+  private zDropdown: HTMLElement;
+  private iterationLabel: HTMLElement;
 
   private customProjectionXLeftInput: ProjectorInput;
   private customProjectionXRightInput: ProjectorInput;
@@ -121,14 +121,14 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
   }
 
   ready() {
-    this.dom = d3.select(this);
-    this.zDropdown = this.dom.select('#z-dropdown');
-    this.runTsneButton = this.dom.select('.run-tsne');
-    this.stopTsneButton = this.dom.select('.stop-tsne');
-    this.perplexitySlider = this.$$('#perplexity-slider') as HTMLInputElement;
+    this.zDropdown = this.querySelector('#z-dropdown') as HTMLElement;
+    this.runTsneButton = this.querySelector('.run-tsne') as HTMLButtonElement;
+    this.stopTsneButton = this.querySelector('.stop-tsne') as HTMLButtonElement;
+    this.perplexitySlider =
+        this.querySelector('#perplexity-slider') as HTMLInputElement;
     this.learningRateInput =
-        this.$$('#learning-rate-slider') as HTMLInputElement;
-    this.iterationLabel = this.dom.select('.run-tsne-iter');
+        this.querySelector('#learning-rate-slider') as HTMLInputElement;
+    this.iterationLabel = this.querySelector('.run-tsne-iter') as HTMLElement;
   }
 
   disablePolymerChangesTriggerReprojection() {
@@ -143,27 +143,33 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
     if (this.perplexitySlider) {
       this.perplexity = +this.perplexitySlider.value;
     }
-    this.dom.select('.tsne-perplexity span').text(this.perplexity);
+    (this.querySelector('.tsne-perplexity span') as HTMLSpanElement).innerText =
+        '' + this.perplexity;
   }
 
   private updateTSNELearningRateFromUIChange() {
     if (this.learningRateInput) {
       this.learningRate = Math.pow(10, +this.learningRateInput.value);
     }
-    this.dom.select('.tsne-learning-rate span').text(this.learningRate);
+    (this.querySelector('.tsne-learning-rate span') as HTMLSpanElement)
+        .innerText = '' + this.learningRate;
   }
 
   private setupUIControls() {
     {
       const self = this;
-      this.dom.selectAll('.ink-tab').on('click', function() {
-        let id = this.getAttribute('data-tab');
-        self.showTab(id);
-      });
+      const inkTabs = this.querySelectorAll('.ink-tab');
+      for (let i = 0; i < inkTabs.length; i++) {
+        inkTabs[i].addEventListener('click', function() {
+          let id = this.getAttribute('data-tab');
+          self.showTab(id);
+        });
+      }
     }
 
-    this.runTsneButton.on('click', () => this.runTSNE());
-    this.stopTsneButton.on('click', () => this.dataSet.stopTSNE());
+    this.runTsneButton.addEventListener('click', () => this.runTSNE());
+    this.stopTsneButton.addEventListener(
+        'click', () => this.dataSet.stopTSNE());
 
     this.perplexitySlider.value = this.perplexity.toString();
     this.perplexitySlider.addEventListener(
@@ -177,8 +183,11 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
     this.setupCustomProjectionInputFields();
     // TODO: figure out why `--paper-input-container-input` css mixin didn't
     // work.
-    this.dom.selectAll('paper-dropdown-menu paper-input input')
-        .style('font-size', '14px');
+    const inputs =
+        this.querySelectorAll('paper-dropdown-menu paper-input input');
+    for (let i = 0; i < inputs.length; i++) {
+      (inputs[i] as HTMLElement).style.fontSize = '14px';
+    }
   }
 
   restoreUIFromBookmark(bookmark: State) {
@@ -226,9 +235,11 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
     this.updateTSNEPerplexityFromSliderChange();
     this.updateTSNELearningRateFromUIChange();
     if (this.iterationLabel) {
-      this.iterationLabel.text(bookmark.tSNEIteration.toString());
+      this.iterationLabel.innerText = bookmark.tSNEIteration.toString();
+    }
+    if (bookmark.selectedProjection != null) {
+      this.showTab(bookmark.selectedProjection);
     }
-    this.showTab(bookmark.selectedProjection);
     this.enablePolymerChangesTriggerReprojection();
   }
 
@@ -282,7 +293,11 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
   // and the DOM.
   setZDropdownEnabled(enabled: boolean) {
     if (this.zDropdown) {
-      this.zDropdown.attr('disabled', enabled ? null : true);
+      if (enabled) {
+        this.zDropdown.removeAttribute('disabled');
+      } else {
+        this.zDropdown.setAttribute('disabled', 'true');
+      }
     }
   }
 
@@ -296,13 +311,13 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
     this.updateTSNEPerplexityFromSliderChange();
     this.clearCentroids();
 
-    this.dom.select('#tsne-sampling')
-        .style('display', pointCount > data.TSNE_SAMPLE_SIZE ? null : 'none');
+    (this.querySelector('#tsne-sampling') as HTMLElement).style.display =
+        pointCount > data.TSNE_SAMPLE_SIZE ? null : 'none';
     const wasSampled =
         (dataSet == null) ? false : (dataSet.dim[0] > data.PCA_SAMPLE_DIM ||
                                      dataSet.dim[1] > data.PCA_SAMPLE_DIM);
-    this.dom.select('#pca-sampling')
-        .style('display', wasSampled ? null : 'none');
+    (this.querySelector('#pca-sampling') as HTMLElement).style.display =
+        wasSampled ? null : 'none';
     this.showTab('pca');
   }
 
@@ -332,12 +347,24 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
   public showTab(id: ProjectionType) {
     this.currentProjection = id;
 
-    let tab = this.dom.select('.ink-tab[data-tab="' + id + '"]');
-    this.dom.selectAll('.ink-tab').classed('active', false);
-    tab.classed('active', true);
-    this.dom.selectAll('.ink-panel-content').classed('active', false);
-    this.dom.select('.ink-panel-content[data-panel="' + id + '"]')
-        .classed('active', true);
+    const tab =
+        this.querySelector('.ink-tab[data-tab="' + id + '"]') as HTMLElement;
+    const allTabs = this.querySelectorAll('.ink-tab');
+    for (let i = 0; i < allTabs.length; i++) {
+      util.classed(allTabs[i] as HTMLElement, 'active', false);
+    }
+
+    util.classed(tab, 'active', true);
+
+    const allTabContent = this.querySelectorAll('.ink-panel-content');
+    for (let i = 0; i < allTabContent.length; i++) {
+      util.classed(allTabContent[i] as HTMLElement, 'active', false);
+    }
+
+    util.classed(
+        this.querySelector('.ink-panel-content[data-panel="' + id + '"]') as
+            HTMLElement,
+        'active', true);
 
     // guard for unit tests, where polymer isn't attached and $ doesn't exist.
     if (this.$ != null) {
@@ -392,17 +419,17 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
   }
 
   private runTSNE() {
-    this.runTsneButton.attr('disabled', true);
-    this.stopTsneButton.attr('disabled', null);
+    this.runTsneButton.disabled = true;
+    this.stopTsneButton.disabled = null;
     this.dataSet.projectTSNE(
         this.perplexity, this.learningRate, this.tSNEis3d ? 3 : 2,
         (iteration: number) => {
           if (iteration != null) {
-            this.iterationLabel.text(iteration);
+            this.iterationLabel.innerText = '' + iteration;
             this.projector.notifyProjectionPositionsUpdated();
           } else {
-            this.runTsneButton.attr('disabled', null);
-            this.stopTsneButton.attr('disabled', true);
+            this.runTsneButton.disabled = null;
+            this.stopTsneButton.disabled = true;
           }
         });
   }
@@ -422,7 +449,7 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
       totalVariance += variances[this.pcaZ];
     }
     msg += (totalVariance * 100).toFixed(1) + '%.';
-    this.dom.select('#total-variance').html(msg);
+    (this.querySelector('#total-variance') as HTMLElement).innerHTML = msg;
   }
 
   private showPCA() {
@@ -440,7 +467,7 @@ export class ProjectionsPanel extends ProjectionsPanelPolymer {
       this.projector.setProjection(projection);
       let numComponents = Math.min(NUM_PCA_COMPONENTS, this.dataSet.dim[1]);
       this.updateTotalVarianceMessage();
-      this.pcaComponents = d3.range(0, numComponents).map(i => {
+      this.pcaComponents = util.range(numComponents).map(i => {
         let fracVariance = this.dataSet.fracVariancesExplained[i];
         return {
           id: i,
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts
index 3ce35afb74..fd1acf6f08 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts
@@ -18,10 +18,26 @@ import {ProjectionsPanel} from './vz-projector-projections-panel';
 const assert = chai.assert;
 
 describe('restoreUIFromBookmark', () => {
-  it('sets the pcaX/Y properties when setting 2D component values', () => {
-    let projectionsPanel = document.createElement(
-        ProjectionsPanel.prototype.is) as ProjectionsPanel;
+  let projectionsPanel: ProjectionsPanel;
+  beforeEach(() => {
+    projectionsPanel = document.createElement(ProjectionsPanel.prototype.is) as
+        ProjectionsPanel;
+
+    // Set up some of the UI so the elements are found in the production code.
+    const tsnePerplexityContainer = document.createElement('div');
+    tsnePerplexityContainer.className = 'tsne-perplexity';
+    const tsnePerplexity = document.createElement('span');
+    tsnePerplexityContainer.appendChild(tsnePerplexity);
+    projectionsPanel.appendChild(tsnePerplexityContainer);
+
+    const tsneLearningRateContainer = document.createElement('div');
+    tsneLearningRateContainer.className = 'tsne-learning-rate';
+    const tsneLearningRate = document.createElement('span');
+    tsneLearningRateContainer.appendChild(tsneLearningRate);
+    projectionsPanel.appendChild(tsneLearningRateContainer);
+  });
 
+  it('sets the pcaX/Y properties when setting 2D component values', () => {
     spyOn(projectionsPanel, 'setZDropdownEnabled');
 
     const s = new State();
@@ -35,9 +51,6 @@ describe('restoreUIFromBookmark', () => {
   });
 
   it('sets the pcaX/Y properties when setting 3D component values', () => {
-    let projectionsPanel = document.createElement(
-        ProjectionsPanel.prototype.is) as ProjectionsPanel;
-
     spyOn(projectionsPanel, 'setZDropdownEnabled');
 
     const s = new State();
@@ -53,10 +66,27 @@ describe('restoreUIFromBookmark', () => {
 });
 
 describe('populateBookmarkFromUI', () => {
-  it('gets the PCA component UI values from a 2D PCA projection', () => {
-    let projectionsPanel = document.createElement(
-        ProjectionsPanel.prototype.is) as ProjectionsPanel;
+  let projectionsPanel: ProjectionsPanel;
+
+  beforeEach(() => {
+    projectionsPanel = document.createElement(ProjectionsPanel.prototype.is) as
+        ProjectionsPanel;
+
+    // Set up some of the UI so the elements are found in the production code.
+    const tsnePerplexityContainer = document.createElement('div');
+    tsnePerplexityContainer.className = 'tsne-perplexity';
+    const tsnePerplexity = document.createElement('span');
+    tsnePerplexityContainer.appendChild(tsnePerplexity);
+    projectionsPanel.appendChild(tsnePerplexityContainer);
+
+    const tsneLearningRateContainer = document.createElement('div');
+    tsneLearningRateContainer.className = 'tsne-learning-rate';
+    const tsneLearningRate = document.createElement('span');
+    tsneLearningRateContainer.appendChild(tsneLearningRate);
+    projectionsPanel.appendChild(tsneLearningRateContainer);
+  });
 
+  it('gets the PCA component UI values from a 2D PCA projection', () => {
     projectionsPanel.pcaX = 0;
     projectionsPanel.pcaY = 1;
     projectionsPanel.pcaIs3d = false;
@@ -67,9 +97,6 @@ describe('populateBookmarkFromUI', () => {
   });
 
   it('gets the PCA component UI values from a 3D PCA projection', () => {
-    let projectionsPanel = document.createElement(
-        ProjectionsPanel.prototype.is) as ProjectionsPanel;
-
     projectionsPanel.pcaX = 0;
     projectionsPanel.pcaY = 1;
     projectionsPanel.pcaZ = 2;
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector.ts
index ba0f669e56..bf98a4d478 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector.ts
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector.ts
@@ -70,7 +70,6 @@ export class Projector extends ProjectorPolymer implements
 
   private originalDataSet: DataSet;
   private dataSetBeforeFilter: DataSet;
-  private dom: d3.Selection<any>;
   private projectorScatterPlotAdapter: ProjectorScatterPlotAdapter;
   private dim: number;
 
@@ -94,13 +93,12 @@ export class Projector extends ProjectorPolymer implements
   private projectionsPanel: ProjectionsPanel;
   private metadataCard: MetadataCard;
 
-  private statusBar: d3.Selection<HTMLElement>;
+  private statusBar: HTMLDivElement;
   private analyticsLogger: AnalyticsLogger;
   private eventLogging: boolean;
   private pageViewLogging: boolean;
 
   ready() {
-    this.dom = d3.select(this);
     logging.setDomContainer(this);
 
     this.analyticsLogger =
@@ -130,7 +128,7 @@ export class Projector extends ProjectorPolymer implements
     this.bookmarkPanel = this.$['bookmark-panel'] as BookmarkPanel;
     this.bookmarkPanel.initialize(this, this as ProjectorEventContext);
     this.metadataCard = this.$['metadata-card'] as MetadataCard;
-    this.statusBar = this.dom.select('#status-bar');
+    this.statusBar = this.querySelector('#status-bar') as HTMLDivElement;
     this.scopeSubtree(this.$$('#notification-dialog'), true);
     this.setupUIControls();
     this.initializeDataProvider();
@@ -199,8 +197,8 @@ export class Projector extends ProjectorPolymer implements
       this.dataPanel.metadataChanged(spriteAndMetadata, metadataFile);
       // Set the container to a fixed height, otherwise in Colab the
       // height can grow indefinitely.
-      let container = this.dom.select('#container');
-      container.style('height', container.property('clientHeight') + 'px');
+      const container = this.querySelector('#container') as HTMLDivElement;
+      container.style.height = container.clientHeight + 'px';
     } else {
       this.setCurrentDataSet(null);
     }
@@ -226,7 +224,7 @@ export class Projector extends ProjectorPolymer implements
     this.dataSetFilterIndices = pointIndices;
     this.projectorScatterPlotAdapter.updateScatterPlotPositions();
     this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-    this.adjustSelectionAndHover(d3.range(selectionSize));
+    this.adjustSelectionAndHover(util.range(selectionSize));
   }
 
   resetFilterDataset() {
@@ -387,8 +385,10 @@ export class Projector extends ProjectorPolymer implements
       ds.normalize();
     }
     this.dim = (ds == null) ? 0 : ds.dim[1];
-    this.dom.select('span.numDataPoints').text((ds == null) ? '0' : ds.dim[0]);
-    this.dom.select('span.dim').text((ds == null) ? '0' : ds.dim[1]);
+    (this.querySelector('span.numDataPoints') as HTMLSpanElement).innerText =
+        (ds == null) ? '0' : '' + ds.dim[0];
+    (this.querySelector('span.dim') as HTMLSpanElement).innerText =
+        (ds == null) ? '0' : '' + ds.dim[1];
 
     this.dataSet = ds;
 
@@ -425,10 +425,9 @@ export class Projector extends ProjectorPolymer implements
     });
 
     window.addEventListener('resize', () => {
-      let container = this.dom.select('#container');
-      let parentHeight =
-          (container.node().parentNode as HTMLElement).clientHeight;
-      container.style('height', parentHeight + 'px');
+      const container = this.querySelector('#container') as HTMLDivElement;
+      const parentHeight = (container.parentNode as HTMLElement).clientHeight;
+      container.style.height = parentHeight + 'px';
       this.projectorScatterPlotAdapter.resize();
     });
 
@@ -463,13 +462,13 @@ export class Projector extends ProjectorPolymer implements
       }
     }
     if (this.selectedPointIndices.length === 0) {
-      this.statusBar.style('display', hoverText ? null : 'none');
-      this.statusBar.text(hoverText);
+      this.statusBar.style.display = hoverText ? null : 'none';
+      this.statusBar.innerText = hoverText;
     }
   }
 
-  private getScatterContainer(): d3.Selection<any> {
-    return this.dom.select('#scatter');
+  private getScatterContainer(): HTMLDivElement {
+    return this.querySelector('#scatter') as HTMLDivElement;
   }
 
   private onSelectionChanged(
@@ -479,8 +478,8 @@ export class Projector extends ProjectorPolymer implements
     this.neighborsOfFirstPoint = neighborsOfFirstPoint;
     let totalNumPoints =
         this.selectedPointIndices.length + neighborsOfFirstPoint.length;
-    this.statusBar.text(`Selected ${totalNumPoints} points`)
-        .style('display', totalNumPoints > 0 ? null : 'none');
+    this.statusBar.innerText = `Selected ${totalNumPoints} points`;
+    this.statusBar.style.display = totalNumPoints > 0 ? null : 'none';
   }
 
   setProjection(projection: Projection) {
-- 
GitLab


From 573f9d74a9deaac4c6d7b986cda1881abc0e2be7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 07:54:40 -0800
Subject: [PATCH 0503/1563] Cleaning up duplicate calls to _tpl in
 cuda_configure.bzl Change: 153467463

---
 third_party/gpus/cuda_configure.bzl | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index e06092ab4e..60118a95f2 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -686,24 +686,6 @@ def _create_dummy_repository(repository_ctx):
            "%{cuda_is_configured}": "False",
            "%{cuda_extra_copts}": "[]"
        })
-  _tpl(repository_ctx, "cuda:BUILD",
-       {
-           "%{cudart_static_linkopt}": _cudart_static_linkopt(cpu_value),
-       })
-  _tpl(repository_ctx, "cuda:BUILD",
-       {
-           "%{cuda_driver_lib}": _lib_name("cuda", cpu_value),
-           "%{cudart_static_lib}": _lib_name("cudart_static", cpu_value,
-                                             static=True),
-           "%{cudart_static_linkopt}": _cudart_static_linkopt(cpu_value),
-           "%{cudart_lib}": _lib_name("cudart", cpu_value),
-           "%{cublas_lib}": _lib_name("cublas", cpu_value),
-           "%{cusolver_lib}": _lib_name("cusolver", cpu_value),
-           "%{cudnn_lib}": _lib_name("cudnn", cpu_value),
-           "%{cufft_lib}": _lib_name("cufft", cpu_value),
-           "%{curand_lib}": _lib_name("curand", cpu_value),
-           "%{cupti_lib}": _lib_name("cupti", cpu_value),
-       })
   _tpl(repository_ctx, "cuda:BUILD",
        {
            "%{cuda_driver_lib}": _lib_name("cuda", cpu_value),
-- 
GitLab


From 617e217cfcc2835752e839d3b6c1d28686b3a467 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Tue, 18 Apr 2017 08:23:41 -0800
Subject: [PATCH 0504/1563] Allow date=None for deprecation warnings, which
 will render as "in a future version". Change: 153470458

---
 tensorflow/python/util/deprecation.py      |  54 ++++----
 tensorflow/python/util/deprecation_test.py | 136 +++++++++++++--------
 2 files changed, 119 insertions(+), 71 deletions(-)

diff --git a/tensorflow/python/util/deprecation.py b/tensorflow/python/util/deprecation.py
index d09476a680..60b559b5f4 100644
--- a/tensorflow/python/util/deprecation.py
+++ b/tensorflow/python/util/deprecation.py
@@ -33,7 +33,8 @@ def _add_deprecated_function_notice_to_docstring(doc, date, instructions):
       doc, instructions,
       'DEPRECATED FUNCTION',
       '(deprecated)', [
-          'THIS FUNCTION IS DEPRECATED. It will be removed after %s.' % date,
+          'THIS FUNCTION IS DEPRECATED. It will be removed %s.' % (
+              'in a future version' if date is None else ('after %s' % date)),
           'Instructions for updating:'])
 
 
@@ -44,14 +45,13 @@ def _add_deprecated_arg_notice_to_docstring(doc, date, instructions):
       'DEPRECATED FUNCTION ARGUMENTS',
       '(deprecated arguments)', [
           'SOME ARGUMENTS ARE DEPRECATED. '
-          'They will be removed after %s.' % date,
+          'They will be removed %s.' % (
+              'in a future version' if date is None else ('after %s' % date)),
           'Instructions for updating:'])
 
 
 def _validate_deprecation_args(date, instructions):
-  if not date:
-    raise ValueError('Tell us what date this will be deprecated!')
-  if not re.match(r'20\d\d-[01]\d-[0123]\d', date):
+  if date is not None and not re.match(r'20\d\d-[01]\d-[0123]\d', date):
     raise ValueError('Date must be YYYY-MM-DD.')
   if not instructions:
     raise ValueError('Don\'t deprecate things without conversion instructions!')
@@ -84,6 +84,7 @@ def deprecated(date, instructions):
     Instructions for updating:
     <instructions>
 
+  If `date` is None, 'after <date>' is replaced with 'in a future version'.
   <function> will include the class name if it is a method.
 
   It also edits the docstring of the function: ' (deprecated)' is appended
@@ -91,8 +92,8 @@ def deprecated(date, instructions):
   to the rest of the docstring.
 
   Args:
-    date: String. The date the function is scheduled to be removed. Must be
-      ISO 8601 (YYYY-MM-DD).
+    date: String or None. The date the function is scheduled to be removed.
+      Must be ISO 8601 (YYYY-MM-DD), or None.
     instructions: String. Instructions on how to update code using the
       deprecated function.
 
@@ -100,7 +101,8 @@ def deprecated(date, instructions):
     Decorated function or method.
 
   Raises:
-    ValueError: If date is not in ISO 8601 format, or instructions are empty.
+    ValueError: If date is not None or in ISO 8601 format, or instructions are
+      empty.
   """
   _validate_deprecation_args(date, instructions)
 
@@ -110,11 +112,12 @@ def deprecated(date, instructions):
     @functools.wraps(func)
     def new_func(*args, **kwargs):
       logging.warning(
-          'From %s: %s (from %s) is deprecated and will be removed '
-          'after %s.\n'
+          'From %s: %s (from %s) is deprecated and will be removed %s.\n'
           'Instructions for updating:\n%s',
           _call_location(), decorator_utils.get_qualified_name(func),
-          func.__module__, date, instructions)
+          func.__module__,
+          'in a future version' if date is None else ('after %s' % date),
+          instructions)
       return func(*args, **kwargs)
     new_func.__doc__ = _add_deprecated_function_notice_to_docstring(
         func.__doc__, date, instructions)
@@ -136,15 +139,16 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
     removed after <date>. Instructions for updating:
       <instructions>
 
-  <function> will include the class name if it is a method.
+  If `date` is None, 'after <date>' is replaced with 'in a future version'.
+  <function> includes the class name if it is a method.
 
   It also edits the docstring of the function: ' (deprecated arguments)' is
   appended to the first line of the docstring and a deprecation notice is
   prepended to the rest of the docstring.
 
   Args:
-    date: String. The date the function is scheduled to be removed. Must be
-      ISO 8601 (YYYY-MM-DD).
+    date: String or None. The date the function is scheduled to be removed.
+      Must be ISO 8601 (YYYY-MM-DD), or None.
     instructions: String. Instructions on how to update code using the
       deprecated function.
     *deprecated_arg_names_or_tuples: String. or 2-Tuple(String,
@@ -156,7 +160,7 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
     Decorated function or method.
 
   Raises:
-    ValueError: If date is not in ISO 8601 format, instructions are
+    ValueError: If date is not None or in ISO 8601 format, instructions are
       empty, the deprecated arguments are not present in the function
       signature, or the second element of a deprecated_tuple is not a
       list.
@@ -275,9 +279,11 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
       for arg_name in invalid_args:
         logging.warning(
             'From %s: calling %s (from %s) with %s is deprecated and will '
-            'be removed after %s.\nInstructions for updating:\n%s',
+            'be removed %s.\nInstructions for updating:\n%s',
             _call_location(), decorator_utils.get_qualified_name(func),
-            func.__module__, arg_name, date, instructions)
+            func.__module__, arg_name,
+            'in a future version' if date is None else ('after %s' % date),
+            instructions)
       return func(*args, **kwargs)
     new_func.__doc__ = _add_deprecated_arg_notice_to_docstring(
         func.__doc__, date, instructions)
@@ -295,6 +301,7 @@ def deprecated_arg_values(date, instructions, **deprecated_kwargs):
     will be removed after <date>. Instructions for updating:
       <instructions>
 
+  If `date` is None, 'after <date>' is replaced with 'in a future version'.
   <function> will include the class name if it is a method.
 
   It also edits the docstring of the function: ' (deprecated arguments)' is
@@ -302,8 +309,8 @@ def deprecated_arg_values(date, instructions, **deprecated_kwargs):
   prepended to the rest of the docstring.
 
   Args:
-    date: String. The date the function is scheduled to be removed. Must be
-      ISO 8601 (YYYY-MM-DD).
+    date: String or None. The date the function is scheduled to be removed.
+      Must be ISO 8601 (YYYY-MM-DD), or None
     instructions: String. Instructions on how to update code using the
       deprecated function.
     **deprecated_kwargs: The deprecated argument values.
@@ -312,7 +319,8 @@ def deprecated_arg_values(date, instructions, **deprecated_kwargs):
     Decorated function or method.
 
   Raises:
-    ValueError: If date is not in ISO 8601 format, or instructions are empty.
+    ValueError: If date is not None or in ISO 8601 format, or instructions are
+      empty.
   """
   _validate_deprecation_args(date, instructions)
   if not deprecated_kwargs:
@@ -329,9 +337,11 @@ def deprecated_arg_values(date, instructions, **deprecated_kwargs):
         if arg_name in named_args and named_args[arg_name] == arg_value:
           logging.warning(
               'From %s: calling %s (from %s) with %s=%s is deprecated and will '
-              'be removed after %s.\nInstructions for updating:\n%s',
+              'be removed %s.\nInstructions for updating:\n%s',
               _call_location(), decorator_utils.get_qualified_name(func),
-              func.__module__, arg_name, arg_value, date, instructions)
+              func.__module__, arg_name, arg_value,
+              'in a future version' if date is None else ('after %s' % date),
+              instructions)
       return func(*args, **kwargs)
     new_func.__doc__ = _add_deprecated_arg_notice_to_docstring(
         func.__doc__, date, instructions)
diff --git a/tensorflow/python/util/deprecation_test.py b/tensorflow/python/util/deprecation_test.py
index 07d6bd6a48..cce0bb1b4e 100644
--- a/tensorflow/python/util/deprecation_test.py
+++ b/tensorflow/python/util/deprecation_test.py
@@ -33,9 +33,7 @@ class DeprecationTest(test.TestCase):
 
   def test_deprecated_illegal_args(self):
     instructions = "This is how you update..."
-    with self.assertRaisesRegexp(ValueError, "date"):
-      deprecation.deprecated(None, instructions)
-    with self.assertRaisesRegexp(ValueError, "date"):
+    with self.assertRaisesRegexp(ValueError, "YYYY-MM-DD"):
       deprecation.deprecated("", instructions)
     with self.assertRaisesRegexp(ValueError, "YYYY-MM-DD"):
       deprecation.deprecated("07-04-2016", instructions)
@@ -45,6 +43,46 @@ class DeprecationTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, "instructions"):
       deprecation.deprecated(date, "")
 
+  @test.mock.patch.object(logging, "warning", autospec=True)
+  def test_no_date(self, mock_warning):
+    date = None
+    instructions = "This is how you update..."
+
+    @deprecation.deprecated(date, instructions)
+    def _fn(arg0, arg1):
+      """fn doc.
+
+      Args:
+        arg0: Arg 0.
+        arg1: Arg 1.
+
+      Returns:
+        Sum of args.
+      """
+      return arg0 + arg1
+
+    self.assertEqual(
+        "fn doc. (deprecated)"
+        "\n"
+        "\nTHIS FUNCTION IS DEPRECATED. It will be removed in a future version."
+        "\nInstructions for updating:\n%s"
+        "\n"
+        "\nArgs:"
+        "\n  arg0: Arg 0."
+        "\n  arg1: Arg 1."
+        "\n"
+        "\nReturns:"
+        "\n  Sum of args." % instructions, _fn.__doc__)
+
+    # Assert calling new fn issues log warning.
+    self.assertEqual(3, _fn(1, 2))
+    self.assertEqual(1, mock_warning.call_count)
+    (args, _) = mock_warning.call_args
+    self.assertRegexpMatches(
+        args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["in a future version", instructions]),
+                        set(args[1:]))
+
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_static_fn_with_doc(self, mock_warning):
     date = "2016-07-04"
@@ -82,8 +120,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_static_fn_with_one_line_doc(self, mock_warning):
@@ -107,8 +145,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_static_fn_no_doc(self, mock_warning):
@@ -132,8 +170,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_instance_fn_with_doc(self, mock_warning):
@@ -177,8 +215,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual(3, _Object()._fn(1, 2))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_instance_fn_with_one_line_doc(self, mock_warning):
@@ -207,8 +245,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual(3, _Object()._fn(1, 2))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_instance_fn_no_doc(self, mock_warning):
@@ -236,8 +274,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual(3, _Object()._fn(1, 2))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   def test_prop_wrong_order(self):
     with self.assertRaisesRegexp(
@@ -290,8 +328,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual("prop_with_doc", _Object()._prop)
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_prop_no_doc(self, mock_warning):
@@ -320,8 +358,8 @@ class DeprecationTest(test.TestCase):
     self.assertEqual("prop_no_doc", _Object()._prop)
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
 
 class DeprecatedArgsTest(test.TestCase):
@@ -334,9 +372,7 @@ class DeprecatedArgsTest(test.TestCase):
   def test_deprecated_illegal_args(self):
     instructions = "This is how you update..."
     date = "2016-07-04"
-    with self.assertRaisesRegexp(ValueError, "date"):
-      deprecation.deprecated_args(None, instructions, "deprecated")
-    with self.assertRaisesRegexp(ValueError, "date"):
+    with self.assertRaisesRegexp(ValueError, "YYYY-MM-DD"):
       deprecation.deprecated_args("", instructions, "deprecated")
     with self.assertRaisesRegexp(ValueError, "YYYY-MM-DD"):
       deprecation.deprecated_args("07-04-2016", instructions, "deprecated")
@@ -401,8 +437,8 @@ class DeprecatedArgsTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, True))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_static_fn_with_one_line_doc(self, mock_warning):
@@ -430,8 +466,8 @@ class DeprecatedArgsTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, True))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_static_fn_no_doc(self, mock_warning):
@@ -459,8 +495,8 @@ class DeprecatedArgsTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, True))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_varargs(self, mock_warning):
@@ -479,8 +515,8 @@ class DeprecatedArgsTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, True, False))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_kwargs(self, mock_warning):
@@ -499,8 +535,8 @@ class DeprecatedArgsTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, a=True, b=False))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_positional_and_named(self, mock_warning):
@@ -519,11 +555,13 @@ class DeprecatedArgsTest(test.TestCase):
     self.assertEqual(2, _fn(1, None, 2, d2=False))
     self.assertEqual(2, mock_warning.call_count)
     (args1, _) = mock_warning.call_args_list[0]
-    self.assertRegexpMatches(args1[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions, "d1"]), set(args1[1:]))
+    self.assertRegexpMatches(args1[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions, "d1"]),
+                        set(args1[1:]))
     (args2, _) = mock_warning.call_args_list[1]
-    self.assertRegexpMatches(args1[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions, "d2"]), set(args2[1:]))
+    self.assertRegexpMatches(args2[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions, "d2"]),
+                        set(args2[1:]))
 
   @test.mock.patch.object(logging, "warning", autospec=True)
   def test_positional_and_named_with_ok_vals(self, mock_warning):
@@ -543,11 +581,13 @@ class DeprecatedArgsTest(test.TestCase):
     self.assertEqual(2, _fn(1, False, 2, d2=False))
     self.assertEqual(2, mock_warning.call_count)
     (args1, _) = mock_warning.call_args_list[0]
-    self.assertRegexpMatches(args1[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions, "d1"]), set(args1[1:]))
+    self.assertRegexpMatches(args1[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions, "d1"]),
+                        set(args1[1:]))
     (args2, _) = mock_warning.call_args_list[1]
-    self.assertRegexpMatches(args1[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions, "d2"]), set(args2[1:]))
+    self.assertRegexpMatches(args2[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions, "d2"]),
+                        set(args2[1:]))
 
     # Assert calls with the deprecated arguments dont log warnings if
     # the value matches the 'ok_val'.
@@ -565,9 +605,7 @@ class DeprecatedArgValuesTest(test.TestCase):
 
   def test_deprecated_illegal_args(self):
     instructions = "This is how you update..."
-    with self.assertRaisesRegexp(ValueError, "date"):
-      deprecation.deprecated_arg_values(None, instructions, deprecated=True)
-    with self.assertRaisesRegexp(ValueError, "date"):
+    with self.assertRaisesRegexp(ValueError, "YYYY-MM-DD"):
       deprecation.deprecated_arg_values("", instructions, deprecated=True)
     with self.assertRaisesRegexp(ValueError, "YYYY-MM-DD"):
       deprecation.deprecated_arg_values(
@@ -623,8 +661,8 @@ class DeprecatedArgValuesTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, deprecated=True))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
     # Assert calling new fn with default deprecated value issues log warning.
     self.assertEqual(3, _fn(1, 2))
@@ -656,8 +694,8 @@ class DeprecatedArgValuesTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, deprecated=True))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
     # Assert calling new fn with default deprecated value issues log warning.
     self.assertEqual(3, _fn(1, 2))
@@ -689,8 +727,8 @@ class DeprecatedArgValuesTest(test.TestCase):
     self.assertEqual(3, _fn(1, 2, deprecated=True))
     self.assertEqual(1, mock_warning.call_count)
     (args, _) = mock_warning.call_args
-    self.assertRegexpMatches(args[0], r"deprecated and will be removed after")
-    self._assert_subset(set([date, instructions]), set(args[1:]))
+    self.assertRegexpMatches(args[0], r"deprecated and will be removed")
+    self._assert_subset(set(["after " + date, instructions]), set(args[1:]))
 
     # Assert calling new fn with default deprecated value issues log warning.
     self.assertEqual(3, _fn(1, 2))
-- 
GitLab


From a498546ddf66f1c96b2fc9fd1ec5c57cd76e4aa0 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 18 Apr 2017 08:25:04 -0800
Subject: [PATCH 0505/1563] [TF contrib seq2seq] Beam search tree decoder op
 "GatherTree".

Based heavily on Denny Britz's initial implementation.
Change: 153470580
---
 .../contrib/cmake/tf_core_kernels.cmake       |   3 +
 tensorflow/contrib/cmake/tf_core_ops.cmake    |   1 +
 tensorflow/contrib/cmake/tf_python.cmake      |  24 +++
 tensorflow/contrib/seq2seq/BUILD              |  70 ++++++-
 tensorflow/contrib/seq2seq/__init__.py        |   3 +
 .../seq2seq/kernels/beam_search_ops.cc        | 174 ++++++++++++++++++
 .../contrib/seq2seq/kernels/beam_search_ops.h |  41 +++++
 .../seq2seq/kernels/beam_search_ops_gpu.cu.cc |  88 +++++++++
 .../contrib/seq2seq/ops/beam_search_ops.cc    |  65 +++++++
 .../kernel_tests/attention_wrapper_test.py    |   2 +-
 .../python/kernel_tests/basic_decoder_test.py |   8 +-
 .../kernel_tests/beam_search_ops_test.py      | 150 +++++++++++++++
 .../python/kernel_tests/decoder_test.py       |   4 +-
 .../seq2seq/python/kernel_tests/loss_test.py  |   2 +-
 .../seq2seq/python/ops/beam_search_ops.py     |  27 +++
 15 files changed, 653 insertions(+), 9 deletions(-)
 create mode 100644 tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc
 create mode 100644 tensorflow/contrib/seq2seq/kernels/beam_search_ops.h
 create mode 100644 tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc
 create mode 100644 tensorflow/contrib/seq2seq/ops/beam_search_ops.cc
 create mode 100644 tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py
 create mode 100644 tensorflow/contrib/seq2seq/python/ops/beam_search_ops.py

diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index 1b2096b645..0c420a0253 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -59,6 +59,8 @@ if(tensorflow_BUILD_CONTRIB_KERNELS)
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/lstm_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/gru_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/lstm_ops.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc"
+      "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/ops/tensor_forest_ops.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/kernels/best_splits_op.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/kernels/count_extremely_random_stats_op.cc"
@@ -127,6 +129,7 @@ endif(WIN32)
 file(GLOB_RECURSE tf_core_gpu_kernels_srcs
    "${tensorflow_source_dir}/tensorflow/core/kernels/*.cu.cc"
    "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/*.cu.cc"
+   "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/kernels/*.cu.cc"
 )
 
 if(WIN32 AND tensorflow_ENABLE_GPU)
diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index 6127f674f2..2beb264a54 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -76,6 +76,7 @@ GENERATE_CONTRIB_OP_LIBRARY(memory_stats "${tensorflow_source_dir}/tensorflow/co
 GENERATE_CONTRIB_OP_LIBRARY(nccl "${tensorflow_source_dir}/tensorflow/contrib/nccl/ops/nccl_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(rnn_gru "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/gru_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(rnn_lstm "${tensorflow_source_dir}/tensorflow/contrib/rnn/ops/lstm_ops.cc")
+GENERATE_CONTRIB_OP_LIBRARY(seq2seq_beam_search "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(tensor_forest "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/ops/tensor_forest_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(tensor_forest_hybrid "${tensor_forest_hybrid_srcs}")
 GENERATE_CONTRIB_OP_LIBRARY(bigquery_reader "${tensorflow_source_dir}/tensorflow/contrib/cloud/ops/bigquery_reader_ops.cc")
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 983f976c95..033d54cc1e 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -447,6 +447,8 @@ add_python_module("tensorflow/contrib/saved_model")
 add_python_module("tensorflow/contrib/saved_model/python")
 add_python_module("tensorflow/contrib/saved_model/python/saved_model")
 add_python_module("tensorflow/contrib/seq2seq")
+add_python_module("tensorflow/contrib/seq2seq/kernels")
+add_python_module("tensorflow/contrib/seq2seq/ops")
 add_python_module("tensorflow/contrib/seq2seq/python")
 add_python_module("tensorflow/contrib/seq2seq/python/kernel_tests")
 add_python_module("tensorflow/contrib/seq2seq/python/ops")
@@ -629,6 +631,8 @@ GENERATE_PYTHON_OP_LIB("contrib_rnn_gru_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/rnn/ops/gen_gru_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_rnn_lstm_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/rnn/ops/gen_lstm_ops.py)
+GENERATE_PYTHON_OP_LIB("contrib_seq2seq_beam_search_ops"
+  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/seq2seq/ops/gen_beam_search_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_tensor_forest_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/tensor_forest/python/ops/gen_tensor_forest_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_tensor_forest_hybrid_ops"
@@ -820,6 +824,26 @@ if(WIN32)
         DISTCOPY ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/rnn/python/ops/)
 endif(WIN32)
 
+if(WIN32)
+    # include contrib/seq2seq as .so
+    #
+    set(tf_beam_search_srcs
+        "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc"
+        "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h"
+        "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc"
+    )
+
+    set(tf_beam_search_gpu_srcs
+        "${tensorflow_source_dir}/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc"
+    )
+
+    AddUserOps(TARGET _beam_search_ops
+        SOURCES "${tf_beam_search_srcs}"
+        GPUSOURCES ${tf_beam_search_gpu_srcs}
+        DEPENDS pywrap_tensorflow_internal tf_python_ops
+        DISTCOPY ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/seq2seq/python/ops/)
+endif(WIN32)
+
 ############################################################
 # Build a PIP package containing the TensorFlow runtime.
 ############################################################
diff --git a/tensorflow/contrib/seq2seq/BUILD b/tensorflow/contrib/seq2seq/BUILD
index 652bbba85e..011c3ba427 100644
--- a/tensorflow/contrib/seq2seq/BUILD
+++ b/tensorflow/contrib/seq2seq/BUILD
@@ -8,12 +8,28 @@ exports_files(["LICENSE"])
 package(default_visibility = ["//tensorflow:__subpackages__"])
 
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
+load(
+    "//tensorflow:tensorflow.bzl",
+    "tf_custom_op_library",
+    "tf_gen_op_libs",
+    "tf_kernel_library",
+    "tf_gen_op_wrapper_py",
+)
 
-py_library(
+tf_custom_op_py_library(
     name = "seq2seq_py",
     srcs = ["__init__.py"] + glob(["python/ops/*.py"]),
+    dso = [
+        ":python/ops/_beam_search_ops.so",
+    ],
+    kernels = [
+        ":beam_search_ops_kernels",
+        ":beam_search_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     deps = [
+        ":beam_search_ops",
         "//tensorflow/contrib/distributions:distributions_py",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/contrib/rnn:rnn_py",
@@ -29,6 +45,44 @@ py_library(
     ],
 )
 
+tf_custom_op_library(
+    name = "python/ops/_beam_search_ops.so",
+    srcs = [
+        "kernels/beam_search_ops.cc",
+        "kernels/beam_search_ops.h",
+        "ops/beam_search_ops.cc",
+    ],
+    gpu_srcs = [
+        "kernels/beam_search_ops_gpu.cu.cc",
+        "kernels/beam_search_ops.h",
+    ],
+    deps = [
+        "//tensorflow/core/kernels:eigen_helpers",
+    ],
+)
+
+tf_gen_op_wrapper_py(
+    name = "beam_search_ops",
+    deps = [":beam_search_ops_op_lib"],
+)
+
+tf_gen_op_libs(
+    op_lib_names = [
+        "beam_search_ops",
+    ],
+)
+
+tf_kernel_library(
+    name = "beam_search_ops_kernels",
+    prefix = "kernels/beam_search_ops",
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core/kernels:eigen_helpers",
+        "//third_party/eigen3",
+    ],
+)
+
 cuda_py_test(
     name = "loss_test",
     size = "medium",
@@ -67,6 +121,20 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "beam_search_ops_test",
+    size = "medium",
+    srcs = ["python/kernel_tests/beam_search_ops_test.py"],
+    additional_deps = [
+        ":seq2seq_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 cuda_py_test(
     name = "decoder_test",
     size = "medium",
diff --git a/tensorflow/contrib/seq2seq/__init__.py b/tensorflow/contrib/seq2seq/__init__.py
index 277434c160..933f5ebe14 100644
--- a/tensorflow/contrib/seq2seq/__init__.py
+++ b/tensorflow/contrib/seq2seq/__init__.py
@@ -37,6 +37,8 @@ See the @{$python/contrib.seq2seq} guide.
 
 @@AttentionWrapperState
 @@AttentionWrapper
+
+@@gather_tree
 """
 
 from __future__ import absolute_import
@@ -46,6 +48,7 @@ from __future__ import print_function
 # pylint: disable=unused-import,wildcard-import,line-too-long
 from tensorflow.contrib.seq2seq.python.ops.attention_wrapper import *
 from tensorflow.contrib.seq2seq.python.ops.basic_decoder import *
+from tensorflow.contrib.seq2seq.python.ops.beam_search_ops import *
 from tensorflow.contrib.seq2seq.python.ops.decoder import *
 from tensorflow.contrib.seq2seq.python.ops.helper import *
 from tensorflow.contrib.seq2seq.python.ops.loss import *
diff --git a/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc
new file mode 100644
index 0000000000..3b0568794d
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc
@@ -0,0 +1,174 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#define EIGEN_USE_THREADS
+
+#if GOOGLE_CUDA
+#define EIGEN_USE_GPU
+#endif  // GOOGLE_CUDA
+
+#include "tensorflow/contrib/seq2seq/kernels/beam_search_ops.h"
+
+#include <memory>
+#include <vector>
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/util/work_sharder.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+typedef Eigen::GpuDevice GPUDevice;
+
+template <typename Device, typename T>
+class GatherTreeOp : public OpKernel {
+ public:
+  explicit GatherTreeOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    const Device& device = ctx->eigen_device<Device>();
+    const Tensor& step_ids = ctx->input(0);
+    const Tensor& parent_ids = ctx->input(1);
+    const Tensor& sequence_length = ctx->input(2);
+    const TensorShape& step_ids_shape = step_ids.shape();
+    OP_REQUIRES(
+        ctx, step_ids_shape.dims() == 3,
+        errors::InvalidArgument("step_ids must be a 3-tensor, saw shape: ",
+                                step_ids_shape.DebugString()));
+    OP_REQUIRES(
+        ctx, TensorShapeUtils::IsVector(sequence_length.shape()),
+        errors::InvalidArgument("sequence_length must be a vector, saw shape: ",
+                                sequence_length.shape().DebugString()));
+    OP_REQUIRES(ctx, sequence_length.dim_size(0) == step_ids_shape.dim_size(1),
+                errors::InvalidArgument(
+                    "Inconsistent batch sizes: sequence_length.shape[1] (",
+                    sequence_length.dim_size(0), ") != ", "step_ids.shape[1] (",
+                    step_ids_shape.dim_size(0), ")"));
+    OP_REQUIRES(
+        ctx, step_ids_shape == parent_ids.shape(),
+        errors::InvalidArgument(
+            "step_ids.shape must match parent_ids.shape.  but shapes are: ",
+            step_ids_shape.DebugString(), " and ",
+            parent_ids.shape().DebugString()));
+    Tensor* beams;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, step_ids_shape, &beams));
+    typename TTypes<T, 3>::ConstTensor step_ids_t = step_ids.tensor<T, 3>();
+    typename TTypes<T, 3>::ConstTensor parent_ids_t = parent_ids.tensor<T, 3>();
+    typename TTypes<T>::ConstVec seq_len_t = sequence_length.vec<T>();
+    typename TTypes<T, 3>::Tensor beams_t = beams->tensor<T, 3>();
+    functor::GatherTree<Device, T>()(ctx, device, step_ids_t, parent_ids_t,
+                                     seq_len_t, beams_t);
+  }
+};
+
+#define REGISTER_KERNEL(T)                                          \
+  REGISTER_KERNEL_BUILDER(                                          \
+      Name("GatherTree").Device(DEVICE_CPU).TypeConstraint<T>("T"), \
+      GatherTreeOp<CPUDevice, T>);
+REGISTER_KERNEL(int32);
+#undef REGISTER_KERNEL
+
+namespace functor {
+
+// CPU specialization
+template <>
+struct GatherTree<CPUDevice, int32> {
+  void operator()(OpKernelContext* ctx, const CPUDevice& d,
+                  typename TTypes<int32, 3>::ConstTensor step_ids,
+                  typename TTypes<int32, 3>::ConstTensor parent_ids,
+                  typename TTypes<int32>::ConstVec sequence_length,
+                  typename TTypes<int32, 3>::Tensor beams) {
+    const int64 max_time = parent_ids.dimension(0);
+    const int64 batch_size = parent_ids.dimension(1);
+    const int64 beam_width = parent_ids.dimension(2);
+    beams.setConstant(-1);
+
+    auto DoWork = [&, ctx](int start_batch_beam, int limit_batch_beam) {
+      int32 seq_len_b = -1;
+      int32 old_batch = -1;
+      for (int32 i = start_batch_beam; i < limit_batch_beam; ++i) {
+        const int32 batch = i / beam_width;
+        const int32 beam = i % beam_width;
+        if (batch != old_batch) {
+          seq_len_b = sequence_length(batch);
+          old_batch = batch;
+        }
+        if (seq_len_b == 0) {
+          continue;
+        }
+        beams(seq_len_b - 1, batch, beam) =
+            step_ids(seq_len_b - 1, batch, beam);
+        int32 parent = parent_ids(seq_len_b - 1, batch, beam);
+        for (int32 level = seq_len_b - 2; level >= 0; --level) {
+          if (parent < 0 || parent > beam_width) {
+            ctx->SetStatus(
+                errors::InvalidArgument("Saw invalid parent id ", parent,
+                                        " at (batch, time, beam) == (", batch,
+                                        ", ", level, ", ", beam, ")"));
+            return;
+          }
+          beams(level, batch, beam) = step_ids(level, batch, parent);
+          parent = parent_ids(level, batch, parent);
+        }
+      }
+    };
+    // Guesstimate of cost; ~5 lookup/store/compare per inner beam
+    // traversal time step.
+    const int64 batch_beam_cost =
+        Eigen::TensorOpCost::DivCost<int32>() +
+        6 * Eigen::TensorOpCost::AddCost<int32>() +
+        max_time * (5 * Eigen::TensorOpCost::AddCost<int32>());
+    auto worker_threads = *(ctx->device()->tensorflow_cpu_worker_threads());
+    Shard(worker_threads.num_threads, worker_threads.workers,
+          batch_size * beam_width, batch_beam_cost, DoWork);
+  }
+};
+
+}  // namespace functor
+
+#if GOOGLE_CUDA
+namespace functor {
+#define DECLARE_GPU_SPEC(T)                          \
+  template <>                                        \
+  void GatherTree<GPUDevice, T>::operator()(         \
+      OpKernelContext* ctx, const GPUDevice& d,      \
+      typename TTypes<T, 3>::ConstTensor step_ids,   \
+      typename TTypes<T, 3>::ConstTensor parent_ids, \
+      typename TTypes<T>::ConstVec sequence_length,  \
+      typename TTypes<T, 3>::Tensor beams);          \
+  extern template struct GatherTree<GPUDevice, T>;
+
+DECLARE_GPU_SPEC(int32);
+#undef DECLARE_GPU_SPEC
+}  // end namespace functor
+
+#define REGISTER_GPU_KERNEL(T)                                      \
+  REGISTER_KERNEL_BUILDER(                                          \
+      Name("GatherTree").Device(DEVICE_GPU).TypeConstraint<T>("T"), \
+      GatherTreeOp<GPUDevice, T>);
+
+REGISTER_GPU_KERNEL(int32);
+#undef REGISTER_GPU_KERNEL
+#endif  // GOOGLE_CUDA
+
+}  // end namespace tensorflow
diff --git a/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h
new file mode 100644
index 0000000000..501a2eae84
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h
@@ -0,0 +1,41 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_SEQ2SEQ_KERNELS_BEAM_SEARCH_OPS_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_SEQ2SEQ_KERNELS_BEAM_SEARCH_OPS_H_
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/kernels/eigen_activations.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+class OpKernelContext;
+
+namespace functor {
+
+template <typename Device, typename T>
+struct GatherTree {
+  void operator()(OpKernelContext* ctx, const Device& d,
+                  typename TTypes<T, 3>::ConstTensor step_ids,
+                  typename TTypes<T, 3>::ConstTensor parent_ids,
+                  typename TTypes<T>::ConstVec sequence_length,
+                  typename TTypes<T, 3>::Tensor beams);
+};
+
+}  // namespace functor
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_SEQ2SEQ_KERNELS_BEAM_SEARCH_OPS_H_
diff --git a/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc b/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc
new file mode 100644
index 0000000000..8d8fc81001
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc
@@ -0,0 +1,88 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#if GOOGLE_CUDA
+
+#define EIGEN_USE_GPU
+
+#include "tensorflow/contrib/seq2seq/kernels/beam_search_ops.h"
+#include "tensorflow/core/util/cuda_kernel_helper.h"
+
+namespace tensorflow {
+namespace functor {
+
+typedef Eigen::GpuDevice GPUDevice;
+
+template <typename T>
+__global__ void GatherTreeOpKernel(const int32 batch_size, const int32 max_time,
+                                   const int32 beam_width, const T* step_ids,
+                                   const T* parent_ids,
+                                   const T* sequence_length, T* beams) {
+  CUDA_1D_KERNEL_LOOP(i, batch_size * beam_width) {
+    const int32 batch = i / beam_width;
+    const int32 beam = i % beam_width;
+    const int32 seq_len_b = ldg(sequence_length + batch);
+#define GET_IX(time_ix, beam_ix) \
+  (batch_size * beam_width * (time_ix) + beam_width * batch + (beam_ix))
+    const int32 initial_beam_ix = GET_IX(seq_len_b - 1, beam);
+    beams[initial_beam_ix] = ldg(step_ids + initial_beam_ix);
+    int32 parent = ldg(parent_ids + initial_beam_ix);
+    for (int32 level = seq_len_b - 2; level >= 0; --level) {
+      const int32 level_beam_ix = GET_IX(level, beam);
+      const int32 level_parent_ix = GET_IX(level, parent);
+      if (parent < 0 || parent > beam_width) {
+        beams[level_beam_ix] = -1;
+        parent = -1;
+      } else {
+        beams[level_beam_ix] = ldg(step_ids + level_parent_ix);
+        parent = ldg(parent_ids + level_parent_ix);
+      }
+    }
+#undef GET_IX
+  }
+}
+
+template <typename T>
+struct GatherTree<GPUDevice, T> {
+  void operator()(OpKernelContext* ctx, const GPUDevice& d,
+                  typename TTypes<T, 3>::ConstTensor step_ids,
+                  typename TTypes<T, 3>::ConstTensor parent_ids,
+                  typename TTypes<T>::ConstVec sequence_length,
+                  typename TTypes<T, 3>::Tensor beams) {
+    const int32 max_time = parent_ids.dimension(0);
+    const int32 batch_size = parent_ids.dimension(1);
+    const int32 beam_width = parent_ids.dimension(2);
+    // First kernel launch to zero things out
+    beams.device(d) = beams.constant(T(-1));
+
+    CudaLaunchConfig config = GetCudaLaunchConfig(batch_size * beam_width, d);
+    // clang-format off
+    GatherTreeOpKernel<T>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            batch_size, max_time, beam_width,
+            step_ids.data(), parent_ids.data(), sequence_length.data(),
+            beams.data());
+    // clang-format on
+  }
+};
+
+#define DEFINE_GPU_SPECS(T) template struct GatherTree<GPUDevice, T>;
+
+DEFINE_GPU_SPECS(int32);
+#undef DEFINE_GPU_SPECS
+
+}  // end namespace functor
+}  // end namespace tensorflow
+#endif  // GOOGLE_CUDA
diff --git a/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc b/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc
new file mode 100644
index 0000000000..c167736d88
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc
@@ -0,0 +1,65 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+using shape_inference::DimensionHandle;
+using shape_inference::InferenceContext;
+using shape_inference::ShapeHandle;
+
+REGISTER_OP("GatherTree")
+    .Input("step_ids: T")
+    .Input("parent_ids: T")
+    .Input("sequence_length: T")
+    .Output("beams: T")
+    .Attr("T: {int32}")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle step_ids, parent_ids, sequence_length;
+
+      // step_ids, parent_ids, and output are all shaped:
+      //   [batch_size, max_time, beam_width].
+      // sequence_length is shaped [batch_size].
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 3, &step_ids));
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 3, &parent_ids));
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(2), 1, &sequence_length));
+
+      DimensionHandle batch_size = c->Dim(step_ids, 1);
+
+      TF_RETURN_IF_ERROR(c->Merge(step_ids, parent_ids, &step_ids));
+      TF_RETURN_IF_ERROR(
+          c->Merge(batch_size, c->Dim(sequence_length, 0), &batch_size));
+
+      c->set_output(0, step_ids);
+      return tensorflow::Status::OK();
+    })
+    .Doc(R"doc(
+Calculates the full beams from the per-step ids and parent beam ids.
+
+This op implements the following mathematical equations:
+
+```python
+TODO(ebrevdo): fill in
+```
+
+step_ids: `[max_time, batch_size, beam_width]`.
+parent_ids: `[max_time, batch_size, beam_width]`.
+sequence_length: `[batch_size]`.
+beams: `[max_time, batch_size, beam_width]`.
+)doc");
+
+}  // end namespace tensorflow
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index 067af818bb..aa84ae060c 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -91,7 +91,7 @@ class AttentionWrapperTest(test.TestCase):
         memory=encoder_outputs,
         memory_sequence_length=encoder_sequence_length)
 
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       with vs.variable_scope(
           "root",
           initializer=init_ops.random_normal_initializer(stddev=0.01, seed=3)):
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py
index 276801ba7c..6b57293c6f 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py
@@ -43,7 +43,7 @@ class BasicDecoderTest(test.TestCase):
     cell_depth = 10
     output_layer_depth = 3
 
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       inputs = np.random.randn(batch_size, max_time,
                                input_depth).astype(np.float32)
       cell = core_rnn_cell.LSTMCell(cell_depth)
@@ -127,7 +127,7 @@ class BasicDecoderTest(test.TestCase):
     start_tokens = [0] * batch_size
     end_token = 1
 
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       embeddings = np.random.randn(vocabulary_size,
                                    input_depth).astype(np.float32)
       cell = core_rnn_cell.LSTMCell(vocabulary_size)
@@ -196,7 +196,7 @@ class BasicDecoderTest(test.TestCase):
     input_depth = 7
     vocabulary_size = 10
 
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       inputs = np.random.randn(
           batch_size, max_time, input_depth).astype(np.float32)
       embeddings = np.random.randn(
@@ -290,7 +290,7 @@ class BasicDecoderTest(test.TestCase):
     else:
       auxiliary_inputs = None
 
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       inputs = np.random.randn(batch_size, max_time,
                                input_depth).astype(np.float32)
       cell = core_rnn_cell.LSTMCell(cell_depth)
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py
new file mode 100644
index 0000000000..542254854a
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py
@@ -0,0 +1,150 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for contrib.seq2seq.python.seq2seq.beam_search_ops."""
+# pylint: disable=unused-import,g-bad-import-order
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+# pylint: enable=unused-import
+
+import numpy as np
+
+from tensorflow.contrib.seq2seq.python.ops import beam_search_ops
+from tensorflow.python.framework import ops
+from tensorflow.python.platform import test
+
+
+def _transpose_batch_time(x):
+  return np.transpose(x, [1, 0, 2]).astype(np.int32)
+
+
+class GatherTreeTest(test.TestCase):
+
+  def testGatherTreeOne(self):
+    # (max_time = 4, batch_size = 1, beams = 3)
+    step_ids = _transpose_batch_time(
+        [[[1, 2, 3], [4, 5, 6], [7, 8, 9], [-1, -1, -1]]])
+    parent_ids = _transpose_batch_time(
+        [[[0, 0, 0], [0, 1, 1], [2, 1, 2], [-1, -1, -1]]])
+    sequence_length = [3]
+    expected_result = _transpose_batch_time(
+        [[[2, 2, 2], [6, 5, 6], [7, 8, 9], [-1, -1, -1]]])
+    beams = beam_search_ops.gather_tree(
+        step_ids=step_ids, parent_ids=parent_ids,
+        sequence_length=sequence_length)
+    with self.test_session(use_gpu=True):
+      self.assertAllEqual(expected_result, beams.eval())
+
+  def testBadParentValuesOnCPU(self):
+    # (batch_size = 1, max_time = 4, beams = 3)
+    # bad parent in beam 1 time 1
+    step_ids = _transpose_batch_time(
+        [[[1, 2, 3], [4, 5, 6], [7, 8, 9], [-1, -1, -1]]])
+    parent_ids = _transpose_batch_time(
+        [[[0, 0, 0], [0, -1, 1], [2, 1, 2], [-1, -1, -1]]])
+    sequence_length = [3]
+    with ops.device("/cpu:0"):
+      beams = beam_search_ops.gather_tree(
+          step_ids=step_ids, parent_ids=parent_ids,
+          sequence_length=sequence_length)
+    with self.test_session():
+      with self.assertRaisesOpError(
+          r"parent id -1 at \(batch, time, beam\) == \(0, 0, 1\)"):
+        _ = beams.eval()
+
+  def testBadParentValuesOnGPU(self):
+    if not test.is_gpu_available():
+      return
+    # (max_time = 4, batch_size = 1, beams = 3)
+    # bad parent in beam 1 time 1; appears as a negative index at time 0
+    step_ids = _transpose_batch_time(
+        [[[1, 2, 3], [4, 5, 6], [7, 8, 9], [-1, -1, -1]]])
+    parent_ids = _transpose_batch_time(
+        [[[0, 0, 0], [0, -1, 1], [2, 1, 2], [-1, -1, -1]]])
+    sequence_length = [3]
+    expected_result = _transpose_batch_time(
+        [[[2, -1, 2], [6, 5, 6], [7, 8, 9], [-1, -1, -1]]])
+    with ops.device("/gpu:0"):
+      beams = beam_search_ops.gather_tree(
+          step_ids=step_ids, parent_ids=parent_ids,
+          sequence_length=sequence_length)
+    with self.test_session(use_gpu=True):
+      self.assertAllEqual(expected_result, beams.eval())
+
+  def testGatherTreeBatch(self):
+    sequence_length = [0, 1, 2, 3]
+
+    with self.test_session(use_gpu=True):
+      # (max_time = 4, batch_size = 4, beam_width = 5)
+      step_ids = _transpose_batch_time(
+          [[[3, 4, 0, 4, 0],
+            [4, 2, 0, 3, 1],
+            [1, 1, 3, 2, 2],
+            [3, 1, 2, 3, 4]],
+           [[3, 4, 0, 4, 0],
+            [4, 2, 0, 3, 1],
+            [1, 1, 3, 2, 2],
+            [3, 1, 2, 3, 4]],
+           [[1, 2, 3, 4, 2],
+            [2, 1, 1, 3, 2],
+            [3, 0, 1, 0, 0],
+            [3, 4, 0, 2, 4]],
+           [[0, 2, 2, 3, 1],
+            [3, 2, 2, 2, 3],
+            [3, 4, 3, 0, 3],
+            [1, 2, 2, 2, 4]]])
+      parent_ids = _transpose_batch_time(
+          [[[4, 2, 4, 3, 4],
+            [3, 4, 0, 2, 0],
+            [3, 1, 3, 2, 2],
+            [0, 2, 1, 4, 2]],
+           [[4, 2, 4, 3, 4],
+            [3, 4, 0, 2, 0],
+            [3, 1, 3, 2, 2],
+            [0, 2, 1, 4, 2]],
+           [[3, 0, 0, 4, 0],
+            [1, 2, 4, 2, 2],
+            [4, 4, 0, 3, 0],
+            [2, 4, 4, 3, 0]],
+           [[3, 1, 4, 1, 3],
+            [3, 2, 4, 0, 4],
+            [1, 0, 1, 4, 2],
+            [0, 3, 2, 0, 1]]])
+      expected_beams = _transpose_batch_time(
+          [[[-1, -1, -1, -1, -1],
+            [-1, -1, -1, -1, -1],
+            [-1, -1, -1, -1, -1],
+            [-1, -1, -1, -1, -1]],
+           [[3, 4, 0, 4, 0],
+            [-1, -1, -1, -1, -1],
+            [-1, -1, -1, -1, -1],
+            [-1, -1, -1, -1, -1]],
+           [[2, 3, 2, 3, 3],
+            [2, 1, 1, 3, 2],
+            [-1, -1, -1, -1, -1],
+            [-1, -1, -1, -1, -1]],
+           [[2, 3, 2, 1, 1],
+            [2, 3, 2, 3, 2],
+            [3, 4, 3, 0, 3],
+            [-1, -1, -1, -1, -1]]])
+
+      beams = beam_search_ops.gather_tree(
+          step_ids=step_ids, parent_ids=parent_ids,
+          sequence_length=sequence_length)
+      self.assertAllEqual(expected_beams, beams.eval())
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py
index 00854ed8b7..340ec9bbb2 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py
@@ -44,7 +44,7 @@ class DynamicDecodeRNNTest(test.TestCase):
     cell_depth = 10
     max_out = max(sequence_length)
 
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       if time_major:
         inputs = np.random.randn(max_time, batch_size,
                                  input_depth).astype(np.float32)
@@ -118,7 +118,7 @@ class DynamicDecodeRNNTest(test.TestCase):
     cell_depth = 10
     max_out = max(sequence_length)
 
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       inputs = np.random.randn(batch_size, max_time,
                                input_depth).astype(np.float32)
 
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py
index 8c6d85d106..35c601a4bc 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/loss_test.py
@@ -34,7 +34,7 @@ from tensorflow.python.platform import test
 class LossTest(test.TestCase):
 
   def testSequenceLoss(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         batch_size = 2
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_ops.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_ops.py
new file mode 100644
index 0000000000..7d9fcc0c90
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_ops.py
@@ -0,0 +1,27 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Beam Search helper ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.seq2seq.ops import gen_beam_search_ops
+from tensorflow.contrib.util import loader
+from tensorflow.python.platform import resource_loader
+
+_beam_search_ops_so = loader.load_op_library(
+    resource_loader.get_path_to_datafile("_beam_search_ops.so"))
+
+gather_tree = gen_beam_search_ops.gather_tree
-- 
GitLab


From d8b65d40358ee2acde556511ebf84a9ad50cbd47 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 08:41:02 -0800
Subject: [PATCH 0506/1563] Enable DCHECK in shape inference to check that the
 shape function has called set_output for each output tensor. Change:
 153472242

---
 tensorflow/core/framework/shape_inference.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index 5e116884c6..e88f6dbb04 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -182,15 +182,12 @@ class InferenceContext {
     if (!s.ok()) {
       return AttachContext(s);
     }
-#if 0
-    // TODO(cwhipkey): enable this check
 #ifndef NDEBUG
     for (int i = 0; i < num_outputs(); ++i) {
       DCHECK(output(i).IsSet()) << i << " for " << node_def().name()
                                 << " of type " << node_def().op();
     }
 #endif  // NDEBUG
-#endif
     return s;
   }
 
-- 
GitLab


From 4b57da4ced14a9d892cb8a4d92bf9d3ec911b27a Mon Sep 17 00:00:00 2001
From: Dan Ringwalt <ringwalt@google.com>
Date: Tue, 18 Apr 2017 09:16:55 -0800
Subject: [PATCH 0507/1563] Move weights to be the second argument in
 tf.bincount.

This matches np.bincount(x, weights, minlength).
Change: 153476565
---
 tensorflow/python/kernel_tests/bincount_op_test.py | 4 ++--
 tensorflow/python/ops/math_ops.py                  | 8 ++++----
 tensorflow/tools/api/golden/tensorflow.pbtxt       | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/kernel_tests/bincount_op_test.py b/tensorflow/python/kernel_tests/bincount_op_test.py
index 2a1641b10f..7a610debd1 100644
--- a/tensorflow/python/kernel_tests/bincount_op_test.py
+++ b/tensorflow/python/kernel_tests/bincount_op_test.py
@@ -73,13 +73,13 @@ class BincountTest(test_util.TensorFlowTestCase):
         else:
           weights = np.random.random(num_samples)
         self.assertAllEqual(
-            math_ops.bincount(arr, weights=weights).eval(),
+            math_ops.bincount(arr, weights).eval(),
             np.bincount(arr, weights))
 
   def test_zero_weights(self):
     with self.test_session():
       self.assertAllEqual(
-          math_ops.bincount(np.arange(1000), weights=np.zeros(1000)).eval(),
+          math_ops.bincount(np.arange(1000), np.zeros(1000)).eval(),
           np.zeros(1000))
 
   def test_negative(self):
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 6734f3fc73..36a4184950 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -2026,9 +2026,9 @@ def tanh(x, name=None):
 
 
 def bincount(arr,
+             weights=None,
              minlength=None,
              maxlength=None,
-             weights=None,
              dtype=dtypes.int32):
   """Counts the number of occurrences of each value in an integer array.
 
@@ -2040,13 +2040,13 @@ def bincount(arr,
 
   Args:
     arr: An int32 tensor of non-negative values.
+    weights: If non-None, must be the same shape as arr. For each value in
+        `arr`, the bin will be incremented by the corresponding weight instead
+        of 1.
     minlength: If given, ensures the output has length at least `minlength`,
         padding with zeros at the end if necessary.
     maxlength: If given, skips values in `arr` that are equal or greater than
         `maxlength`, ensuring that the output has length at most `maxlength`.
-    weights: If non-None, must be the same shape as arr. For each value in
-        `arr`, the bin will be incremented by the corresponding weight instead
-        of 1.
     dtype: If `weights` is None, determines the type of the output bins.
 
   Returns:
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index bc7f9bf3bd..e354969c38 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -650,7 +650,7 @@ tf_module {
   }
   member_method {
     name: "bincount"
-    argspec: "args=[\'arr\', \'minlength\', \'maxlength\', \'weights\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \"<dtype: \'int32\'>\"], "
+    argspec: "args=[\'arr\', \'weights\', \'minlength\', \'maxlength\', \'dtype\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \"<dtype: \'int32\'>\"], "
   }
   member_method {
     name: "bitcast"
-- 
GitLab


From 746fd0c4cc24f8797e8e93ac0e519d682755305e Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Tue, 18 Apr 2017 10:47:07 -0700
Subject: [PATCH 0508/1563] Docs: Fix #9074 Change: 153414133

---
 tensorflow/core/ops/math_ops.cc | 65 ++++++++++++++-------------------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index bb80acc89f..4c722b31b5 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -1396,8 +1396,8 @@ REGISTER_OP("SegmentSum")
     .Doc(R"doc(
 Computes the sum along segments of a tensor.
 
-Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)
-for an explanation of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \sum_j data_j\\) where sum is over `j` such
@@ -1406,7 +1406,7 @@ that `segment_ids[j] == i`.
 If the sum is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentSum.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentSum.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1426,9 +1426,8 @@ REGISTER_OP("SegmentMean")
     .Doc(R"doc(
 Computes the mean along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \frac{\sum_j data_j}{N}\\) where `mean` is
@@ -1438,7 +1437,7 @@ values summed.
 If the mean is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentMean.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentMean.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1458,9 +1457,8 @@ REGISTER_OP("SegmentProd")
     .Doc(R"doc(
 Computes the product along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \prod_j data_j\\) where the product is over `j` such
@@ -1469,7 +1467,7 @@ that `segment_ids[j] == i`.
 If the product is empty for a given segment ID `i`, `output[i] = 1`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentProd.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentProd.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1489,9 +1487,8 @@ REGISTER_OP("SegmentMin")
     .Doc(R"doc(
 Computes the minimum along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \min_j(data_j)\\) where `min` is over `j` such
@@ -1500,7 +1497,7 @@ that `segment_ids[j] == i`.
 If the min is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentMin.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentMin.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1520,8 +1517,8 @@ REGISTER_OP("SegmentMax")
     .Doc(R"doc(
 Computes the maximum along segments of a tensor.
 
-Read [the section on Segmentation](../../api_docs/python/math_ops.md#segmentation)
-for an explanation of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 \\(output_i = \max_j(data_j)\\) where `max` is over `j` such
@@ -1530,7 +1527,7 @@ that `segment_ids[j] == i`.
 If the max is empty for a given segment ID `i`, `output[i] = 0`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/SegmentMax.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/SegmentMax.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1551,9 +1548,8 @@ REGISTER_OP("UnsortedSegmentSum")
     .Doc(R"doc(
 Computes the sum along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Computes a tensor such that
 `(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such
@@ -1566,7 +1562,7 @@ If the sum is empty for a given segment ID `i`, `output[i] = 0`.
 `num_segments` should equal the number of distinct segment IDs.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/UnsortedSegmentSum.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/UnsortedSegmentSum.png" alt>
 </div>
 
 segment_ids: A tensor whose shape is a prefix of `data.shape`.
@@ -1577,7 +1573,6 @@ output: Has same shape as data, except for the first `segment_ids.rank`
 
 )doc");
 
-
 REGISTER_OP("UnsortedSegmentMax")
     .Input("data: T")
     .Input("segment_ids: Tindices")
@@ -1589,11 +1584,10 @@ REGISTER_OP("UnsortedSegmentMax")
     .Doc(R"doc(
 Computes the Max along segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
-This operator is similar to the [unsorted segment sum operator](../../api_docs/python/math_ops.md#UnsortedSegmentSum).
+This operator is similar to the [unsorted segment sum operator](../../../api_docs/python/math_ops.md#UnsortedSegmentSum).
 Instead of computing the sum over segments, it computes the maximum
 such that:
 
@@ -1604,7 +1598,7 @@ If the maximum is empty for a given segment ID `i`, it outputs the smallest poss
  `output[i] = numeric_limits<T>::min()`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/UnsortedSegmentSum.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/UnsortedSegmentSum.png" alt>
 </div>
 
 segment_ids: A 1-D tensor whose rank is equal to the rank of `data`'s
@@ -1625,9 +1619,8 @@ REGISTER_OP("SparseSegmentSum")
     .Doc(R"doc(
 Computes the sum along sparse segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Like `SegmentSum`, but `segment_ids` can have rank less than `data`'s first
 dimension, selecting a subset of dimension 0, specified by `indices`.
@@ -1674,9 +1667,8 @@ REGISTER_OP("SparseSegmentMean")
     .Doc(R"doc(
 Computes the mean along sparse segments of a tensor.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 Like `SegmentMean`, but `segment_ids` can have rank less than `data`'s first
 dimension, selecting a subset of dimension 0, specified by `indices`.
@@ -1724,9 +1716,8 @@ Computes the sum along sparse segments of a tensor divided by the sqrt of N.
 
 N is the size of the segment being reduced.
 
-Read [the section on
-Segmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation
-of segments.
+Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+segments.
 
 indices: A 1-D tensor. Has same rank as `segment_ids`.
 
-- 
GitLab


From aa21cf9f6ff391898b5f93f223e8205e3a693c5a Mon Sep 17 00:00:00 2001
From: Richard Davies <richard@daviesmail.org>
Date: Tue, 18 Apr 2017 19:18:49 +0100
Subject: [PATCH 0509/1563] Force new instance creation in MultiRNNCell

---
 tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py b/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py
index 9a96d4e856..3a5cbf604d 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py
@@ -68,8 +68,8 @@ class LSTMBlockCellTest(test.TestCase):
         m3 = array_ops.zeros([1, 2])
         g, ((out_m0, out_m1),
             (out_m2, out_m3)) = core_rnn_cell_impl.MultiRNNCell(
-                [lstm_ops.LSTMBlockCell(2)] * 2, state_is_tuple=True)(x, (
-                    (m0, m1), (m2, m3)))
+                [lstm_ops.LSTMBlockCell(2) for _ in range(2)],
+                state_is_tuple=True)(x, ((m0, m1), (m2, m3)))
         sess.run([variables.global_variables_initializer()])
         res = sess.run([g, out_m0, out_m1, out_m2, out_m3], {
             x.name: np.array([[1., 1.]]),
-- 
GitLab


From c5f99a9973290964e2e3cb2508c9087611ae9ca3 Mon Sep 17 00:00:00 2001
From: t13m <fanziye.cis@gmail.com>
Date: Wed, 19 Apr 2017 02:35:08 +0800
Subject: [PATCH 0510/1563] Added "hop_bytes" option to FixedLengthRecordReader
 (#8970)

* Add overlap option to fixed_length_record_reader

* fixed bug(typo)

* Add unit test for overlap option of fixed_length_record_reader_op

* Add unit test for hop_bytes argument

* fixed python import order, add comment for the new checking condition
---
 .../kernels/fixed_length_record_reader_op.cc  | 35 +++++++++++--
 tensorflow/core/ops/io_ops.cc                 |  2 +
 .../python/kernel_tests/reader_ops_test.py    | 49 +++++++++++++++++++
 tensorflow/python/ops/io_ops.py               |  5 +-
 4 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/kernels/fixed_length_record_reader_op.cc b/tensorflow/core/kernels/fixed_length_record_reader_op.cc
index 637a6cef95..ee13038325 100644
--- a/tensorflow/core/kernels/fixed_length_record_reader_op.cc
+++ b/tensorflow/core/kernels/fixed_length_record_reader_op.cc
@@ -28,12 +28,14 @@ namespace tensorflow {
 class FixedLengthRecordReader : public ReaderBase {
  public:
   FixedLengthRecordReader(const string& node_name, int64 header_bytes,
-                          int64 record_bytes, int64 footer_bytes, Env* env)
+                          int64 record_bytes, int64 footer_bytes,
+                          int64 hop_bytes, Env* env)
       : ReaderBase(
             strings::StrCat("FixedLengthRecordReader '", node_name, "'")),
         header_bytes_(header_bytes),
         record_bytes_(record_bytes),
         footer_bytes_(footer_bytes),
+        hop_bytes_(hop_bytes),
         env_(env),
         file_pos_limit_(-1),
         record_number_(0) {}
@@ -62,14 +64,31 @@ class FixedLengthRecordReader : public ReaderBase {
 
   Status ReadLocked(string* key, string* value, bool* produced,
                     bool* at_end) override {
-    if (input_buffer_->Tell() >= file_pos_limit_) {
+    // The condition `input_buffer_->Tell() + record_bytes_ > file_pos_limit_`
+    // is to confirm that none of record bytes is out of the range of
+    // file_pos_limit_.
+    // This is necessary for the condition `hop_bytes > 0`. For example.
+    // File: "0123456"
+    // Reader setting: `record_bytes=3`, `hop_bytes=2`, `footer_bytes=0`,
+    //     `header_bytes=0`
+    // Without this checking condition, the forth time the reader will at
+    // this position: "012345|6" and the reading operation will result in
+    // an error.
+    if (input_buffer_->Tell() >= file_pos_limit_ ||
+        input_buffer_->Tell() + record_bytes_ > file_pos_limit_) {
       *at_end = true;
       return Status::OK();
     }
+    const int64 pos_before_read = input_buffer_->Tell();
     TF_RETURN_IF_ERROR(input_buffer_->ReadNBytes(record_bytes_, value));
     *key = strings::StrCat(current_work(), ":", record_number_);
     *produced = true;
     ++record_number_;
+
+    if (hop_bytes_ > 0) {
+        input_buffer_->Seek(pos_before_read + hop_bytes_);
+    }
+
     return Status::OK();
   }
 
@@ -87,6 +106,7 @@ class FixedLengthRecordReader : public ReaderBase {
   const int64 header_bytes_;
   const int64 record_bytes_;
   const int64 footer_bytes_;
+  const int64 hop_bytes_;
   Env* const env_;
   int64 file_pos_limit_;
   int64 record_number_;
@@ -98,10 +118,11 @@ class FixedLengthRecordReaderOp : public ReaderOpKernel {
  public:
   explicit FixedLengthRecordReaderOp(OpKernelConstruction* context)
       : ReaderOpKernel(context) {
-    int64 header_bytes = -1, record_bytes = -1, footer_bytes = -1;
+    int64 header_bytes = -1, record_bytes = -1, footer_bytes = -1, hop_bytes = -1;
     OP_REQUIRES_OK(context, context->GetAttr("header_bytes", &header_bytes));
     OP_REQUIRES_OK(context, context->GetAttr("record_bytes", &record_bytes));
     OP_REQUIRES_OK(context, context->GetAttr("footer_bytes", &footer_bytes));
+    OP_REQUIRES_OK(context, context->GetAttr("hop_bytes", &hop_bytes));
     OP_REQUIRES(context, header_bytes >= 0,
                 errors::InvalidArgument("header_bytes must be >= 0 not ",
                                         header_bytes));
@@ -111,10 +132,14 @@ class FixedLengthRecordReaderOp : public ReaderOpKernel {
     OP_REQUIRES(context, footer_bytes >= 0,
                 errors::InvalidArgument("footer_bytes must be >= 0 not ",
                                         footer_bytes));
+    OP_REQUIRES(context, hop_bytes >= 0,
+                errors::InvalidArgument("hop_bytes must be >= 0 not ",
+                                        hop_bytes));
     Env* env = context->env();
-    SetReaderFactory([this, header_bytes, record_bytes, footer_bytes, env]() {
+    SetReaderFactory([this, header_bytes, record_bytes, footer_bytes,
+                      hop_bytes, env]() {
       return new FixedLengthRecordReader(name(), header_bytes, record_bytes,
-                                         footer_bytes, env);
+                                         footer_bytes, hop_bytes, env);
     });
   }
 };
diff --git a/tensorflow/core/ops/io_ops.cc b/tensorflow/core/ops/io_ops.cc
index 3e2583f706..4dfc51490b 100644
--- a/tensorflow/core/ops/io_ops.cc
+++ b/tensorflow/core/ops/io_ops.cc
@@ -440,6 +440,7 @@ REGISTER_OP("FixedLengthRecordReader")
     .Attr("header_bytes: int = 0")
     .Attr("record_bytes: int")
     .Attr("footer_bytes: int = 0")
+    .Attr("hop_bytes: int = 0")
     .Attr("container: string = ''")
     .Attr("shared_name: string = ''")
     .SetIsStateful()
@@ -459,6 +460,7 @@ REGISTER_OP("FixedLengthRecordReaderV2")
     .Attr("header_bytes: int = 0")
     .Attr("record_bytes: int")
     .Attr("footer_bytes: int = 0")
+    .Attr("hop_bytes: int = 0")
     .Attr("container: string = ''")
     .Attr("shared_name: string = ''")
     .SetIsStateful()
diff --git a/tensorflow/python/kernel_tests/reader_ops_test.py b/tensorflow/python/kernel_tests/reader_ops_test.py
index 5e8f8e8673..d4950fa283 100644
--- a/tensorflow/python/kernel_tests/reader_ops_test.py
+++ b/tensorflow/python/kernel_tests/reader_ops_test.py
@@ -20,6 +20,7 @@ from __future__ import print_function
 
 import collections
 import gzip
+import math
 import os
 import threading
 import zlib
@@ -352,9 +353,18 @@ class FixedLengthRecordReaderTest(test.TestCase):
     self._record_bytes = 3
     self._footer_bytes = 2
 
+    self._hop_bytes = 2
+    self._num_overlapped_records = 3
+
   def _Record(self, f, r):
     return compat.as_bytes(str(f * 2 + r) * self._record_bytes)
 
+  def _OverlappedRecord(self, f, r):
+    record_str = "".join(
+      [str(i)[0] for i in range(
+        r * self._hop_bytes, r * self._hop_bytes + self._record_bytes)])
+    return compat.as_bytes(record_str)
+
   def _CreateFiles(self):
     filenames = []
     for i in range(self._num_files):
@@ -367,6 +377,20 @@ class FixedLengthRecordReaderTest(test.TestCase):
         f.write(b"F" * self._footer_bytes)
     return filenames
 
+  def _CreateOverlappedRecordFiles(self):
+    filenames = []
+    for i in range(self._num_files):
+      fn = os.path.join(self.get_temp_dir(), "fixed_length_overlapped_record.%d.txt" % i)
+      filenames.append(fn)
+      with open(fn, "wb") as f:
+        f.write(b"H" * self._header_bytes)
+        all_records_str = "".join(
+          [str(i)[0] for i in range(
+            self._record_bytes + self._hop_bytes * (self._num_overlapped_records - 1))])
+        f.write(compat.as_bytes(all_records_str))
+        f.write(b"F" * self._footer_bytes)
+    return filenames
+
   def testOneEpoch(self):
     files = self._CreateFiles()
     with self.test_session() as sess:
@@ -374,6 +398,7 @@ class FixedLengthRecordReaderTest(test.TestCase):
           header_bytes=self._header_bytes,
           record_bytes=self._record_bytes,
           footer_bytes=self._footer_bytes,
+          hop_bytes=0,
           name="test_reader")
       queue = data_flow_ops.FIFOQueue(99, [dtypes.string], shapes=())
       key, value = reader.read(queue)
@@ -390,6 +415,30 @@ class FixedLengthRecordReaderTest(test.TestCase):
                                     "\\(requested 1, current size 0\\)"):
         k, v = sess.run([key, value])
 
+  def testOneEpochWithHopBytes(self):
+    files = self._CreateOverlappedRecordFiles()
+    with self.test_session() as sess:
+      reader = io_ops.FixedLengthRecordReader(
+          header_bytes=self._header_bytes,
+          record_bytes=self._record_bytes,
+          footer_bytes=self._footer_bytes,
+          hop_bytes=self._hop_bytes,
+          name="test_reader")
+      queue = data_flow_ops.FIFOQueue(99, [dtypes.string], shapes=())
+      key, value = reader.read(queue)
+
+      queue.enqueue_many([files]).run()
+      queue.close().run()
+      for i in range(self._num_files):
+        for j in range(self._num_overlapped_records):
+          k, v = sess.run([key, value])
+          print(v)
+          self.assertAllEqual("%s:%d" % (files[i], j), compat.as_text(k))
+          self.assertAllEqual(self._OverlappedRecord(i, j), v)
+
+      with self.assertRaisesOpError("is closed and has insufficient elements "
+                                    "\\(requested 1, current size 0\\)"):
+        k, v = sess.run([key, value])
 
 class TFRecordReaderTest(test.TestCase):
 
diff --git a/tensorflow/python/ops/io_ops.py b/tensorflow/python/ops/io_ops.py
index ae45c40aec..b805237910 100644
--- a/tensorflow/python/ops/io_ops.py
+++ b/tensorflow/python/ops/io_ops.py
@@ -392,18 +392,19 @@ class FixedLengthRecordReader(ReaderBase):
   # TODO(josh11b): Support serializing and restoring state.
 
   def __init__(self, record_bytes, header_bytes=None, footer_bytes=None,
-               name=None):
+               hop_bytes=None, name=None):
     """Create a FixedLengthRecordReader.
 
     Args:
       record_bytes: An int.
       header_bytes: An optional int. Defaults to 0.
       footer_bytes: An optional int. Defaults to 0.
+      hop_bytes: An optional int. Defaults to 0.
       name: A name for the operation (optional).
     """
     rr = gen_io_ops._fixed_length_record_reader_v2(
         record_bytes=record_bytes, header_bytes=header_bytes,
-        footer_bytes=footer_bytes, name=name)
+        footer_bytes=footer_bytes, hop_bytes=hop_bytes, name=name)
     super(FixedLengthRecordReader, self).__init__(rr)
 
 
-- 
GitLab


From e25925838ea1e12f865926d93147f265665a195a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 11:26:42 -0800
Subject: [PATCH 0511/1563] Vulcanize TensorBoard (for the pip package)

This new version fixes a bug in the graph and embedding projector dashboards. They had been initialized before being added to the DOM, which is problematic because initialization of those dashboards depends on properties of the DOM.
Change: 153495107
---
 .../tensorboard/dist/tf-tensorboard.html      | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 10721e41e9..2a0a029ffa 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -4582,7 +4582,7 @@ var VZ;
                 // If b===a, we would create an empty range. We instead select the range
                 // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
                 // extra padding on the top and bottom of the plot.
-                padding = Math.abs(a) * 1.1;
+                padding = Math.abs(a) * 1.1 + 1.1;
             }
             else {
                 padding = span * 0.2;
@@ -5332,7 +5332,7 @@ var VZ;
                 // If b===a, we would create an empty range. We instead select the range
                 // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
                 // extra padding on the top and bottom of the plot.
-                padding = Math.abs(a) * 1.1;
+                padding = Math.abs(a) * 1.1 + 1.1;
             }
             else {
                 padding = span * 0.2;
@@ -17812,11 +17812,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   properties: {
     _datasets: Object,
     _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
-    backend: {type: Object, observer: '_backendChanged'},
+    backend: Object,
     debuggerDataEnabled: Boolean,
     allStepsModeEnabled: Boolean,
     specificHealthPillStep: {type: Number, value: 0},
     healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
+    _isAttached: Boolean,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
     // Whether health pills are currently being loaded, in which case we may want to say show a
     // spinner.
     _areHealthPillsLoading: Boolean,
@@ -17845,7 +17848,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   },
   observers: [
     '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+    '_maybeInitializeDashboard(backend, _isAttached)',
   ],
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
   reload: function() {
     if (!this.debuggerDataEnabled ||
         !this.healthPillsToggledOn ||
@@ -17861,7 +17871,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     // would not change across reloads.
     this._requestHealthPills();
   },
-  _backendChanged: function(backend) {
+  _maybeInitializeDashboard: function(backend, isAttached) {
+    if (this._initialized || !backend || !isAttached) {
+      // Either this dashboard is already initialized ... or we are not yet ready to initialize.
+      return;
+    }
+
+    // Set this to true so we only initialize once.
+    this._initialized = true;
     Promise.all([backend.graphRuns(), backend.runMetadataRuns()])
       .then(function(result) {
         var runsWithGraph = result[0].sort(VZ.Sorting.compareTagNames);
@@ -18846,6 +18863,7 @@ paper-dropdown-menu paper-item {
           </p>
           <p>
             One option is using a <a target="_blank" href="https://gist.github.com/">github gist</a>.
+            If you choose this approach, make sure to link directly to the raw file.
           </p>
         </div>
         <div>
@@ -19822,23 +19840,25 @@ TF.Dashboard.VzProjectorDashboard = Polymer({
   },
   properties: {
     dataNotFound: Boolean,
-    routePrefix: String
+    routePrefix: String,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
   },
   behaviors: [
     TF.Dashboard.DashboardBehavior("embeddings"),
   ],
-  observers: [
-    "_routePrefixSet(routePrefix)",
-  ],
   reload: function() {
     // Do not reload the embedding projector. Reloading could take a long time.
   },
-  _routePrefixSet: function(routePrefix) {
-    if (routePrefix === undefined) {
-      // The route prefix has not been set yet.
+  attached: function() {
+    if (this._initialized) {
       return;
     }
-    d3.json(routePrefix + '/runs', (err, runs) => {
+
+    // Set this to true so we only initialize once.
+    this._initialized = true;
+
+    d3.json(this.routePrefix + '/runs', (err, runs) => {
       this.set('dataNotFound', runs.length === 0);
     });
   },
@@ -25619,8 +25639,8 @@ var DataPanel = (function (_super) {
             embeddings: [{
                     tensorName: 'My tensor',
                     tensorShape: [1000, 50],
-                    tensorPath: 'https://gist.github.com/.../tensors.tsv',
-                    metadataPath: 'https://gist.github.com/.../optional.metadata.tsv',
+                    tensorPath: 'https://raw.githubusercontent.com/.../tensors.tsv',
+                    metadataPath: 'https://raw.githubusercontent.com/.../optional.metadata.tsv',
                 }],
         };
         this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
@@ -25642,7 +25662,7 @@ var DataPanel = (function (_super) {
         bookmarksFieldCheckbox.addEventListener('change', function () {
             if (bookmarksFieldCheckbox.checked) {
                 projectorConfigTemplateJson.embeddings[0].bookmarksPath =
-                    'https://gist.github.com/.../bookmarks.txt';
+                    'https://raw.githubusercontent.com/.../bookmarks.txt';
             }
             else {
                 delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
@@ -25653,7 +25673,7 @@ var DataPanel = (function (_super) {
         metadataFieldCheckbox.addEventListener('change', function () {
             if (metadataFieldCheckbox.checked) {
                 projectorConfigTemplateJson.embeddings[0].metadataPath =
-                    'https://gist.github.com/.../optional.metadata.tsv';
+                    'https://raw.githubusercontent.com/.../optional.metadata.tsv';
             }
             else {
                 delete projectorConfigTemplateJson.embeddings[0].metadataPath;
-- 
GitLab


From 8cabc326b0081fb9015f6d70f30512f20aa0fba5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 12:08:20 -0800
Subject: [PATCH 0512/1563] * Properly compute Hermitian matrices in
 self_adjoint_eig tests. * Disable self_adjoint_eig tests for complex types
 until we fix crash in Numpy code when compiling with nvcc or cudaclang.
 Change: 153500103

---
 .../python/kernel_tests/self_adjoint_eig_op_test.py    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py b/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
index 9ab9304572..f26b51013b 100644
--- a/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
+++ b/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py
@@ -76,7 +76,7 @@ def _GetSelfAdjointEigTest(dtype_, shape_):
     batch_shape = shape_[:-2]
     a = np.random.uniform(
         low=-1.0, high=1.0, size=n * n).reshape([n, n]).astype(dtype_)
-    a += a.T
+    a += np.conj(a.T)
     a = np.tile(a, batch_shape + (1, 1))
     if dtype_ == np.float32 or dtype_ == np.complex64:
       atol = 1e-4
@@ -118,7 +118,7 @@ def _GetSelfAdjointEigGradTest(dtype_, shape_):
     batch_shape = shape_[:-2]
     a = np.random.uniform(
         low=-1.0, high=1.0, size=n * n).reshape([n, n]).astype(dtype_)
-    a += a.T
+    a += np.conj(a.T)
     a = np.tile(a, batch_shape + (1, 1))
     # Optimal stepsize for central difference is O(epsilon^{1/3}).
     epsilon = np.finfo(dtype_).eps
@@ -135,7 +135,7 @@ def _GetSelfAdjointEigGradTest(dtype_, shape_):
       for b in tf_e, tf_v:
         x_init = np.random.uniform(
             low=-1.0, high=1.0, size=n * n).reshape([n, n]).astype(dtype_)
-        x_init += x_init.T
+        x_init += np.conj(x_init.T)
         x_init = np.tile(x_init, batch_shape + (1, 1))
         theoretical, numerical = gradient_checker.compute_gradient(
             tf_a,
@@ -150,7 +150,9 @@ def _GetSelfAdjointEigGradTest(dtype_, shape_):
 
 
 if __name__ == '__main__':
-  for dtype in np.float32, np.float64, np.complex64, np.complex128:
+  for dtype in np.float32, np.float64:
+    # TODO(rmlarsen): Re-enable for np.complex64, np.complex128
+    # when we have a fix for the crash in numpy.linalg.eig.
     for size in 1, 2, 5, 10:
       for batch_dims in [(), (3,)] + [(3, 2)] * (max(size, size) < 10):
         shape = batch_dims + (size, size)
-- 
GitLab


From 15c475463cf48b58f42ef81df8687fae79bd9c60 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 12:24:26 -0800
Subject: [PATCH 0513/1563] [XLA] Fix the indentation for printing fusion
 computation. Change: 153502127

---
 tensorflow/compiler/xla/service/hlo_computation.cc | 14 ++++++++++++--
 tensorflow/compiler/xla/service/hlo_computation.h  |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_computation.cc b/tensorflow/compiler/xla/service/hlo_computation.cc
index 655546d715..526c1c58b3 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation.cc
@@ -330,17 +330,27 @@ std::list<HloComputation*> HloComputation::MakeEmbeddedComputationsList()
   return post_order;
 }
 
-string HloComputation::ToString() const {
+string HloComputation::ToString(int nested_level) const {
   std::ostringstream s;
+  for (int i = 0; i < nested_level; i++) {
+    s << "    ";
+  }
   s << name() << " " << ShapeUtil::HumanString(ComputeProgramShape())
     << " { \n";
   for (const HloInstruction* instruction : MakeInstructionPostOrder()) {
+    for (int i = 0; i < nested_level; i++) {
+      s << "    ";
+    }
     s << "  " << instruction->ToString() << "\n";
     if (instruction->opcode() == HloOpcode::kFusion) {
-      s << "    " << instruction->fused_instructions_computation()->ToString()
+      s << instruction->fused_instructions_computation()->ToString(
+               nested_level + 1)
         << "\n";
     }
   }
+  for (int i = 0; i < nested_level; i++) {
+    s << "    ";
+  }
   s << "}";
   return s.str();
 }
diff --git a/tensorflow/compiler/xla/service/hlo_computation.h b/tensorflow/compiler/xla/service/hlo_computation.h
index 1b32b9fe56..4e20c6c8ef 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.h
+++ b/tensorflow/compiler/xla/service/hlo_computation.h
@@ -136,7 +136,7 @@ class HloComputation {
   void set_name(const string& name) { name_ = name; }
 
   // Return a string representation of the computation.
-  string ToString() const;
+  string ToString(int nested_level = 0) const;
 
   const std::list<std::unique_ptr<HloInstruction>>& instructions() const {
     return instructions_;
-- 
GitLab


From 7d4192472d0097c3acca205d15d74de4c27663e5 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Tue, 18 Apr 2017 12:27:08 -0800
Subject: [PATCH 0514/1563] Add "Bugs" section to "What is not covered".
 Change: 153502448

---
 .../programmers_guide/version_semantics.md        | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/programmers_guide/version_semantics.md b/tensorflow/docs_src/programmers_guide/version_semantics.md
index 0f06d4b076..7903053d5e 100644
--- a/tensorflow/docs_src/programmers_guide/version_semantics.md
+++ b/tensorflow/docs_src/programmers_guide/version_semantics.md
@@ -54,9 +54,9 @@ patch versions.  The public APIs consist of
 Some API functions are explicitly marked as "experimental" and can change in
 backward incompatible ways between minor releases. These include:
 
-* **Experimental APIs**: The @{tf.contrib} module and its submodules in Python
-  and any functions in the C API or fields in protocol buffers that are
-  explicitly commented as being experimental.
+*   **Experimental APIs**: The @{tf.contrib} module and its submodules in Python
+    and any functions in the C API or fields in protocol buffers that are
+    explicitly commented as being experimental.
 
 *   **Other languages**: TensorFlow APIs in languages other than Python and C,
     such as:
@@ -93,6 +93,15 @@ backward incompatible ways between minor releases. These include:
     single cluster is unsupported. There are no guarantees about backwards
     compatibility of the wire protocol.
 
+*   **Bugs:** We reserve the right to make backwards incompatible behavior
+    (though not API) changes if the current implementation is clearly broken,
+    i.e., if it is contradicting the documentation, or if a well-known and
+    well-defined intended behavior is not properly implemented due to a bug.
+    For example, if an optimizer claims to implement a well-known optimization
+    algorithm but, due to a bug, does not match that algorithm we will fix the
+    optimizer. This may break code relying on the wrong behavior for
+    convergence. We will note such changes in the release notes.
+
 Furthermore, any API methods marked "deprecated" in the 1.0 release can
 be deleted in any subsequent minor release.
 
-- 
GitLab


From fd74e2798f351184fbf044e766ca9368021fcd8d Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Tue, 18 Apr 2017 12:39:47 -0800
Subject: [PATCH 0515/1563] Documentation improvements for
 contrib/kernel_methods Change: 153504190

---
 tensorflow/contrib/kernel_methods/__init__.py |  2 +-
 .../python/kernel_estimators.py               | 13 +++---
 .../python/mappers/random_fourier_features.py | 45 ++++++++++---------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/tensorflow/contrib/kernel_methods/__init__.py b/tensorflow/contrib/kernel_methods/__init__.py
index a715df1bf1..7272e59516 100644
--- a/tensorflow/contrib/kernel_methods/__init__.py
+++ b/tensorflow/contrib/kernel_methods/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Ops for evaluation metrics and summary statistics.
+"""Ops and estimators that enable explicit kernel methods in TensorFlow.
 
 @@KernelLinearClassifier
 @@RandomFourierFeatureMapper
diff --git a/tensorflow/contrib/kernel_methods/python/kernel_estimators.py b/tensorflow/contrib/kernel_methods/python/kernel_estimators.py
index 8037082487..0ae88b22b4 100644
--- a/tensorflow/contrib/kernel_methods/python/kernel_estimators.py
+++ b/tensorflow/contrib/kernel_methods/python/kernel_estimators.py
@@ -59,7 +59,7 @@ def _update_features_and_columns(features, feature_columns,
                                  kernel_mappers_dict):
   """Updates features and feature_columns based on provided kernel mappers.
 
-  Currently supports the update of RealValuedColumns only.
+  Currently supports the update of `RealValuedColumn`s only.
 
   Args:
     features: Initial features dict. The key is a `string` (feature column name)
@@ -196,8 +196,10 @@ class KernelLinearClassifier(_KernelEstimator):
   The user can provide a list of kernel mappers to be applied to all or a subset
   of existing feature_columns. This way, the user can effectively provide 2
   types of feature columns:
-  - those passed as elements of feature_columns in the classifier's constructor
-  - those appearing as a key of the kernel_mappers dict.
+
+  * those passed as elements of feature_columns in the classifier's constructor
+  * those appearing as a key of the kernel_mappers dict.
+
   If a column appears in feature_columns only, no mapping is applied to it. If
   it appears as a key in kernel_mappers, the corresponding kernel mappers are
   applied to it. Note that it is possible that a column appears in both places.
@@ -237,8 +239,9 @@ class KernelLinearClassifier(_KernelEstimator):
   kernel_classifier.predict(...)
   ```
 
-  Input of `fit` and `evaluate` should have following features,
-    otherwise there will be a `KeyError`:
+  Input of `fit` and `evaluate` should have following features, otherwise there
+  will be a `KeyError`:
+
   * if `weight_column_name` is not `None`, a feature with
     `key=weight_column_name` whose value is a `Tensor`.
   * for each `column` in `feature_columns`:
diff --git a/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features.py b/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features.py
index 270a243970..9dc01124ab 100644
--- a/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features.py
+++ b/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features.py
@@ -31,26 +31,31 @@ from tensorflow.python.ops import math_ops
 # TODO(sibyl-vie3Poto,felixyu): add an option to control whether the parameters in the
 # kernel map are trainable.
 class RandomFourierFeatureMapper(dkm.DenseKernelMapper):
-  """Class that implements Random Fourier Feature Mapping.
+  r"""Class that implements Random Fourier Feature Mapping (RFFM) in TensorFlow.
 
   The RFFM mapping is used to approximate the Gaussian (RBF) kernel:
-    exp(-||x-y||_2^2 / (2 * sigma^2))
+  ```
+  exp(-||x-y||_2^2 / (2 * sigma^2))
+  ```
 
   The implementation of RFFM is based on the following paper:
   "Random Features for Large-Scale Kernel Machines" by Ali Rahimi and Ben Recht.
   (link: https://people.eecs.berkeley.edu/~brecht/papers/07.rah.rec.nips.pdf)
 
-  The mapping uses a matrix Omega in R^{d x D} and a bias vector b in R^D where
-  d is the input dimension (number of dense input features) and D is the output
-  dimension (i.e., dimension of the feature space the input is mapped to). Each
-  entry of Omega is sampled i.i.d. from a (scaled) Gaussian distribution and
-  each entry of the bias vector is sampled i.i.d. and uniformly from [0, 2*pi].
+  The mapping uses a matrix `Omega \in R^{d x D}` and a bias vector `b \in R^D`
+  where `d` is the input dimension (number of dense input features) and `D` is
+  the output dimension (i.e., dimension of the feature space the input is mapped
+  to). Each entry of `Omega` is sampled i.i.d. from a (scaled) Gaussian
+  distribution and each entry of `b` is sampled independently and uniformly from
+  [0, 2 * pi].
 
   For a single input feature vector x in R^d, its RFFM is defined as:
-              sqrt(2/D) * cos(x * Omega + b)
-  where cos is the element-wise cosine function and x, b are represented as row
-  vectors. The aforementioned paper shows that the linear kernel of RFFM-mapped
-  vectors approximates the Gaussian kernel of the initial vectors.
+  ```
+      sqrt(2/D) * cos(x * Omega + b)
+  ```
+  where `cos` is the element-wise cosine function and `x, b` are represented as
+  row vectors. The aforementioned paper shows that the linear kernel of
+  RFFM-mapped vectors approximates the Gaussian kernel of the initial vectors.
 
   """
 
@@ -63,8 +68,8 @@ class RandomFourierFeatureMapper(dkm.DenseKernelMapper):
       stddev: The standard deviation of the Gaussian kernel to be approximated.
         The error of the classifier trained using this approximation is very
         sensitive to this parameter.
-      seed: An integer used to initialize the parameters (Omega and bias) of the
-        mapper. For repeatable sequences across different invocations of the
+      seed: An integer used to initialize the parameters (`Omega` and `b`) of
+        the mapper. For repeatable sequences across different invocations of the
         mapper object (for instance, to ensure consistent mapping both at
         training and eval/inference if these happen in different invocations),
         set this to the same integer.
@@ -83,13 +88,13 @@ class RandomFourierFeatureMapper(dkm.DenseKernelMapper):
 
   @property
   def name(self):
-    """Returns a name for the RandomFourierFeatureMapper instance.
+    """Returns a name for the `RandomFourierFeatureMapper` instance.
 
-    If the name provided in the constructor is None, then the object's unique id
-    is returned.
+    If the name provided in the constructor is `None`, then the object's unique
+    id is returned.
 
     Returns:
-      A name for the RandomFourierFeatureMapper instance.
+      A name for the `RandomFourierFeatureMapper` instance.
     """
     return self._name or str(id(self))
 
@@ -105,15 +110,15 @@ class RandomFourierFeatureMapper(dkm.DenseKernelMapper):
     """Maps each row of input_tensor using random Fourier features.
 
     Args:
-      input_tensor: tensor containing input features. It's shape is
+      input_tensor: a `Tensor` containing input features. It's shape is
       [batch_size, self._input_dim].
 
     Returns:
-      A tensor of shape [batch_size, self._output_dim] containing RFFM-mapped
+      A `Tensor` of shape [batch_size, self._output_dim] containing RFFM-mapped
       features.
 
     Raises:
-      InvalidShapeError: if the shape of the input_tensor is inconsistent with
+      InvalidShapeError: if the shape of the `input_tensor` is inconsistent with
         expected input dimension.
     """
     input_tensor_shape = input_tensor.get_shape()
-- 
GitLab


From ea0c7558390344194428cd8c3b77457345ae6425 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 12:59:32 -0800
Subject: [PATCH 0516/1563] For SummaryAtEndHook, move FileWriterCache to
 after_session_run function in order to fix the b/37347760 for text summary
 plugin temporarily. Change: 153506993

---
 .../contrib/training/python/training/evaluation.py       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/training/python/training/evaluation.py b/tensorflow/contrib/training/python/training/evaluation.py
index a35c31dc55..f4effaf6ef 100644
--- a/tensorflow/contrib/training/python/training/evaluation.py
+++ b/tensorflow/contrib/training/python/training/evaluation.py
@@ -299,11 +299,13 @@ class SummaryAtEndHook(session_run_hook.SessionRunHook):
     self._global_step = variables.get_or_create_global_step()
 
   def begin(self):
-    if self._summary_writer is None and self._log_dir:
-      self._summary_writer = summary.FileWriterCache.get(self._log_dir)
     if self._summary_op is None:
       self._summary_op = summary.merge_all()
 
+  def after_create_session(self, session, coord):
+    if self._summary_writer is None and self._log_dir:
+      self._summary_writer = summary.FileWriterCache.get(self._log_dir)
+
   def end(self, session):
     global_step = training_util.global_step(session, self._global_step)
     summary_str = session.run(self._summary_op, self._feed_dict)
@@ -453,7 +455,8 @@ def evaluate_repeatedly(checkpoint_dir,
           '%Y-%m-%d-%H:%M:%S', time.gmtime()))
     num_evaluations += 1
 
-    if max_number_of_evaluations is not None and num_evaluations >= max_number_of_evaluations:
+    if (max_number_of_evaluations is not None and
+        num_evaluations >= max_number_of_evaluations):
       return final_ops_hook.final_ops_values
 
   return final_ops_hook.final_ops_values
-- 
GitLab


From 52e1c194ecf9aa4b2694eb1763a0d3e71df34bae Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 13:10:12 -0800
Subject: [PATCH 0517/1563] [XLA:HLO] Change BufferLiveness so entry params
 interfere with everything.

This makes more sense, since buffers for entry parameters are live throughout
the entire execution of the module.
Change: 153508641
---
 .../compiler/xla/service/buffer_liveness.cc   |  15 +++
 .../xla/service/buffer_liveness_test.cc       | 122 +++++++++++++++---
 2 files changed, 119 insertions(+), 18 deletions(-)

diff --git a/tensorflow/compiler/xla/service/buffer_liveness.cc b/tensorflow/compiler/xla/service/buffer_liveness.cc
index 736f227aa4..38c2c81551 100644
--- a/tensorflow/compiler/xla/service/buffer_liveness.cc
+++ b/tensorflow/compiler/xla/service/buffer_liveness.cc
@@ -135,6 +135,21 @@ bool BufferLiveness::live_range_strictly_before(const LogicalBuffer& a,
 
 bool BufferLiveness::MayInterfere(const LogicalBuffer& a,
                                   const LogicalBuffer& b) const {
+  // Entry parameters live for the entire execution, thus always interfere with
+  // all other instructions.
+  const HloInstruction* a_instruction = a.instruction();
+  const HloComputation* a_computation = a_instruction->parent();
+  if (a_instruction->opcode() == HloOpcode::kParameter &&
+      a_computation == a_computation->parent()->entry_computation()) {
+    return true;
+  }
+  const HloInstruction* b_instruction = b.instruction();
+  const HloComputation* b_computation = b_instruction->parent();
+  if (b_instruction->opcode() == HloOpcode::kParameter &&
+      b_computation == b_computation->parent()->entry_computation()) {
+    return true;
+  }
+  // Buffers without disjoint liveness may interfere.
   return (!live_range_strictly_before(a, b) &&
           !live_range_strictly_before(b, a));
 }
diff --git a/tensorflow/compiler/xla/service/buffer_liveness_test.cc b/tensorflow/compiler/xla/service/buffer_liveness_test.cc
index e71b98298b..ac814b1d7c 100644
--- a/tensorflow/compiler/xla/service/buffer_liveness_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_liveness_test.cc
@@ -92,6 +92,12 @@ class BufferLivenessTest : public HloTestBase {
         GetBuffer(liveness, instruction, /*index=*/{}));
   }
 
+  std::unique_ptr<HloComputation> BuildDummyComputation() {
+    auto builder = HloComputation::Builder(TestName() + "_dummy");
+    builder.AddInstruction(HloInstruction::CreateParameter(0, vec_, "param"));
+    return builder.Build();
+  }
+
   const Shape vec_ = ShapeUtil::MakeShape(xla::F32, {42});
 };
 
@@ -118,12 +124,18 @@ TEST_F(BufferLivenessTest, ElementwiseChain) {
                           MakeUnique<DependencyHloOrdering>(module.get()))
           .ConsumeValueOrDie();
 
+  // Entry params always interfere.
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, log));
+
   // No buffers should interfere.
-  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, negate));
   EXPECT_FALSE(InstructionsMayInterfere(*liveness, negate, exp));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, negate, log));
   EXPECT_FALSE(InstructionsMayInterfere(*liveness, exp, negate));
   EXPECT_FALSE(InstructionsMayInterfere(*liveness, exp, log));
-  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, log));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, log, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, log, exp));
 
   // Buffers should interfere with itself.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, exp, exp));
@@ -135,18 +147,68 @@ TEST_F(BufferLivenessTest, ElementwiseChain) {
   EXPECT_TRUE(InstructionMaybeLiveOut(*liveness, log));
 }
 
+TEST_F(BufferLivenessTest, MultipleEntryParameters_Sequential) {
+  // Two entry params, which interfere with each other.
+  //
+  // param0 --> negate ---------------\
+  //                   param1 --> exp --> add
+  auto builder = HloComputation::Builder(TestName());
+  auto param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, vec_, "param0"));
+  auto param1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, vec_, "param1"));
+  auto negate = builder.AddInstruction(
+      HloInstruction::CreateUnary(vec_, HloOpcode::kNegate, param0));
+  auto exp = builder.AddInstruction(
+      HloInstruction::CreateUnary(vec_, HloOpcode::kExp, param1));
+  auto add = builder.AddInstruction(
+      HloInstruction::CreateBinary(vec_, HloOpcode::kAdd, negate, exp));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  HloComputation* entry = module->AddEntryComputation(builder.Build());
+
+  SequentialHloOrdering::HloModuleSequence sequence;
+  sequence.insert({entry, {param0, negate, param1, exp, add}});
+  auto liveness = BufferLiveness::Run(
+                      module.get(),
+                      MakeUnique<SequentialHloOrdering>(module.get(), sequence))
+                      .ConsumeValueOrDie();
+
+  // Entry params always interfere.
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, param1));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, negate));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, add));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, param0));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, negate));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, add));
+
+  // Negate and exp still interfere.
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, negate, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, exp, negate));
+
+  // But {negate, add} and {exp, add} don't interfere.
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, negate, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, add, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, exp, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, add, exp));
+}
+
 TEST_F(BufferLivenessTest, NonElementwiseOperand) {
-  // A chain of operations with one elementwise and one non-elementwise. The
+  // A chain of operations with two elementwise and one non-elementwise. The
   // elementwise op should not interfere with its operand, while the
-  // non-elementwise op should interfere.
+  // non-elementwise op should interfere. Entry params always interfere.
   //
-  // param --> negate -> reverse
+  // param --> exp -> negate -> reverse
   //
   auto builder = HloComputation::Builder(TestName());
   auto param =
       builder.AddInstruction(HloInstruction::CreateParameter(0, vec_, "param"));
+  auto exp = builder.AddInstruction(
+      HloInstruction::CreateUnary(vec_, HloOpcode::kExp, param));
   auto negate = builder.AddInstruction(
-      HloInstruction::CreateUnary(vec_, HloOpcode::kNegate, param));
+      HloInstruction::CreateUnary(vec_, HloOpcode::kNegate, exp));
   auto reverse =
       builder.AddInstruction(HloInstruction::CreateReverse(vec_, negate, {0}));
 
@@ -158,10 +220,15 @@ TEST_F(BufferLivenessTest, NonElementwiseOperand) {
                           MakeUnique<DependencyHloOrdering>(module.get()))
           .ConsumeValueOrDie();
 
-  // No buffers should interfere.
-  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, negate));
+  // Entry params always interfere.
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, reverse));
+
+  // Negate is elementwise, so doesn't interfere with its operand.
+  // Reverse is non-elementwise, so does interfere with its operand.
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, exp, negate));
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, negate, reverse));
-  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, negate));
 }
 
 TEST_F(BufferLivenessTest, OverlappedBuffers) {
@@ -188,10 +255,18 @@ TEST_F(BufferLivenessTest, OverlappedBuffers) {
                           MakeUnique<DependencyHloOrdering>(module.get()))
           .ConsumeValueOrDie();
 
+  // Entry params always interfere.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, add));
+
+  // Negate and exp interfere with each other, but not with add.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, negate, exp));
-  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, add));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, exp, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, negate, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, add, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, exp, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, add, exp));
 }
 
 TEST_F(BufferLivenessTest, OverlappedBuffersSequentialOrder) {
@@ -204,8 +279,7 @@ TEST_F(BufferLivenessTest, OverlappedBuffersSequentialOrder) {
   // Sequential order:
   //  param, negate, exp, add
   //
-  // Liveness is identical to the DependencyHloOrdering except that 'param' and
-  // exp no longer interfere.
+  // Liveness is identical to the DependencyHloOrdering.
   auto builder = HloComputation::Builder(TestName());
   auto param =
       builder.AddInstruction(HloInstruction::CreateParameter(0, vec_, "param"));
@@ -227,10 +301,18 @@ TEST_F(BufferLivenessTest, OverlappedBuffersSequentialOrder) {
                                             module.get(), module_sequence))
           .ConsumeValueOrDie();
 
+  // Entry params always interfere.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
-  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, add));
+
+  // Negate and exp interfere with each other, but not with add.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, negate, exp));
-  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, add));
+  EXPECT_TRUE(InstructionsMayInterfere(*liveness, exp, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, negate, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, add, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, exp, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, add, exp));
 }
 
 TEST_F(BufferLivenessTest, TupleLiveOut) {
@@ -392,7 +474,8 @@ TEST_F(BufferLivenessTest, IndependentTupleElements) {
       builder.AddInstruction(HloInstruction::CreateTuple({add0, add1}));
 
   auto module = MakeUnique<HloModule>(TestName());
-  module->AddEntryComputation(builder.Build());
+  module->AddEntryComputation(BuildDummyComputation());
+  module->AddEmbeddedComputation(builder.Build());
 
   auto liveness =
       BufferLiveness::Run(module.get(),
@@ -452,7 +535,8 @@ TEST_F(BufferLivenessTest, DependentTupleElements) {
       builder.AddInstruction(HloInstruction::CreateTuple({add0, add1}));
 
   auto module = MakeUnique<HloModule>(TestName());
-  module->AddEntryComputation(builder.Build());
+  module->AddEntryComputation(BuildDummyComputation());
+  module->AddEmbeddedComputation(builder.Build());
 
   auto liveness =
       BufferLiveness::Run(module.get(),
@@ -524,7 +608,8 @@ class FusedDynamicUpdateSliceLivenessTest : public BufferLivenessTest {
         HloInstruction::CreateTuple({gte0, dynamic_update_slice}));
     // Build module and get reference to entry computation.
     auto module = MakeUnique<HloModule>(TestName());
-    auto* computation = module->AddEntryComputation(builder.Build());
+    module->AddEntryComputation(BuildDummyComputation());
+    auto* computation = module->AddEmbeddedComputation(builder.Build());
     // Create fusion instruction based on number of tuple element 1 users.
     if (update_uses_tuple_element1) {
       computation->CreateFusionInstruction(
@@ -651,7 +736,8 @@ class DynamicUpdateSliceLivenessTest : public BufferLivenessTest {
         HloInstruction::CreateTuple({gte0, dynamic_update_slice}));
     // Build module and get reference to entry computation.
     auto module = MakeUnique<HloModule>(TestName());
-    module->AddEntryComputation(builder.Build());
+    module->AddEntryComputation(BuildDummyComputation());
+    module->AddEmbeddedComputation(builder.Build());
     // Run BufferLiveness on 'module'.
     auto liveness =
         BufferLiveness::Run(module.get(),
-- 
GitLab


From 466baaa93830b42817478c2a09164bf42c58dd82 Mon Sep 17 00:00:00 2001
From: Daniel Trebbien <dtrebbien@gmail.com>
Date: Tue, 18 Apr 2017 18:32:46 -0400
Subject: [PATCH 0518/1563] Fix a small copy/paste typo in a comment

---
 tensorflow/stream_executor/stream_executor_internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/stream_executor/stream_executor_internal.h b/tensorflow/stream_executor/stream_executor_internal.h
index 751ccd3d0e..9d3ac4ed9e 100644
--- a/tensorflow/stream_executor/stream_executor_internal.h
+++ b/tensorflow/stream_executor/stream_executor_internal.h
@@ -319,7 +319,7 @@ class StreamExecutorInterface {
   // Creates a new DnnSupport object, ownership is transferred to the caller.
   // If SupportsDnn() is false, this will always return null.
   //
-  // If SupportsDnn() is true, this may return null, for example, if the RNG
+  // If SupportsDnn() is true, this may return null, for example, if the DNN
   // initialization fails.
   virtual dnn::DnnSupport *CreateDnn() { return nullptr; }
 
-- 
GitLab


From 1c3e6c74d1eb63ebef2257c3eb7f3ee05ddd88d2 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 18 Apr 2017 15:40:56 -0800
Subject: [PATCH 0519/1563] [TF] Optimization of tf.tile: Skip allocation if
 multiples is all ones. Change: 153528509

---
 tensorflow/core/kernels/tile_ops.cc              |  8 ++++++++
 tensorflow/python/kernel_tests/shape_ops_test.py | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/tensorflow/core/kernels/tile_ops.cc b/tensorflow/core/kernels/tile_ops.cc
index 9822b021eb..06f20cd9ec 100644
--- a/tensorflow/core/kernels/tile_ops.cc
+++ b/tensorflow/core/kernels/tile_ops.cc
@@ -124,6 +124,10 @@ class TileOp : public OpKernel {
                                   multiples_array[i]));
       output_shape.AddDim(input.dim_size(i) * multiples_array[i]);
     }
+    if (output_shape == input.shape()) {
+      context->set_output(0, input);
+      return;
+    }
     Tensor* result = nullptr;
     OP_REQUIRES_OK(context, context->allocate_output(0, output_shape, &result));
 
@@ -315,6 +319,10 @@ class TileGradientOp : public OpKernel {
       output_shape.AddDim(input.dim_size(i) / multiples_array[i]);
       input_dim_size_vec.push_back(input.dim_size(i));
     }
+    if (output_shape == input.shape()) {
+      context->set_output(0, input);
+      return;
+    }
     Tensor* result = nullptr;
     OP_REQUIRES_OK(context, context->allocate_output(0, output_shape, &result));
 
diff --git a/tensorflow/python/kernel_tests/shape_ops_test.py b/tensorflow/python/kernel_tests/shape_ops_test.py
index 875ac3a427..dbc52acb79 100644
--- a/tensorflow/python/kernel_tests/shape_ops_test.py
+++ b/tensorflow/python/kernel_tests/shape_ops_test.py
@@ -348,6 +348,16 @@ class TileTest(test.TestCase):
     self.assertEqual([4, 4], tiled.get_shape())
     self.assertTrue((result == np.tile(inp, (1, 4))).all())
 
+  def testIdentityTileAndGrad(self):
+    with self.test_session():
+      inp = np.random.rand(4, 1).astype(np.float32)
+      a = constant_op.constant(inp)
+      tiled = array_ops.tile(a, [1, 1])
+      result = tiled.eval()
+    self.assertEqual(result.shape, (4, 1))
+    self.assertEqual([4, 1], tiled.get_shape())
+    self.assertTrue((result == np.tile(inp, (1, 1))).all())
+
   def testEmpty(self):
     with self.test_session():
       inp = np.random.rand(2, 3).astype(np.float32)
@@ -528,6 +538,7 @@ class TileTest(test.TestCase):
     self._RunAndVerifyGradientResult([], [])
 
   def testGradientRandom(self):
+    self._RunAndVerifyGradientResult([2, 2, 1, 1, 3], [1, 1, 1, 1, 1])
     self._RunAndVerifyGradientResult([2, 2, 1, 1, 3], [1, 2, 1, 3, 1])
     self._RunAndVerifyGradientResult([2, 3, 1, 1, 3], [3, 1, 1, 2, 2])
     self._RunAndVerifyGradientResult([2, 1, 3, 3, 2], [1, 3, 3, 1, 2])
-- 
GitLab


From 9d4ec29f343a55f67753bc9433df8cd4a7d02ecd Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 18 Apr 2017 15:49:37 -0800
Subject: [PATCH 0520/1563] Added the ability to cancel a reader_op_kernel
 Change: 153529654

---
 tensorflow/core/framework/reader_op_kernel.h | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tensorflow/core/framework/reader_op_kernel.h b/tensorflow/core/framework/reader_op_kernel.h
index 502b98f13d..ffd6a1a184 100644
--- a/tensorflow/core/framework/reader_op_kernel.h
+++ b/tensorflow/core/framework/reader_op_kernel.h
@@ -47,7 +47,28 @@ class ReaderOpKernel : public ResourceOpKernel<ReaderInterface> {
     factory_ = factory;
   }
 
+  void Compute(OpKernelContext* context) override {
+    if (!IsCancellable()) {
+      ResourceOpKernel<ReaderInterface>::Compute(context);
+    } else {
+      // Install cancellation
+      CancellationManager* cm = context->cancellation_manager();
+      CancellationToken token = cm->get_cancellation_token();
+      bool already_cancelled =
+          !cm->RegisterCallback(token, [this]() { this->Cancel(); });
+
+      if (!already_cancelled) {
+        ResourceOpKernel<ReaderInterface>::Compute(context);
+      } else {
+        context->SetStatus(errors::Cancelled("read operation was cancelled"));
+      }
+    }
+  }
+
  private:
+  virtual bool IsCancellable() const { return false; }
+  virtual void Cancel() {}
+
   Status CreateResource(ReaderInterface** reader)
       EXCLUSIVE_LOCKS_REQUIRED(mu_) override {
     *reader = factory_();
-- 
GitLab


From 0ceee61be4646daac2da216210de8aafd5b1c2db Mon Sep 17 00:00:00 2001
From: Saurabh Saxena <srbs@google.com>
Date: Tue, 18 Apr 2017 16:22:09 -0800
Subject: [PATCH 0521/1563] Add function gradients for AvgPool and BiasAdd.
 Change: 153533625

---
 tensorflow/core/ops/nn_grad.cc | 47 ++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/tensorflow/core/ops/nn_grad.cc b/tensorflow/core/ops/nn_grad.cc
index 05ad635f58..560b71a337 100644
--- a/tensorflow/core/ops/nn_grad.cc
+++ b/tensorflow/core/ops/nn_grad.cc
@@ -181,6 +181,32 @@ Status MaxPoolGrad(const AttrSlice& attrs, FunctionDef* g) {
 }
 REGISTER_OP_GRADIENT("MaxPool", MaxPoolGrad);
 
+Status AvgPoolGrad(const AttrSlice& attrs, FunctionDef* g) {
+  // clang-format off
+  *g = FDH::Define(
+    // Arg defs
+    {"input: T", "grad: T"},
+    // Ret val defs
+    {"output: T"},
+    // Attr defs
+    {"T: {float, half} = DT_FLOAT",
+     "ksize: list(int) >= 4",
+     "strides: list(int) >= 4",
+     GetPaddingAttrString()},
+    // Nodes
+    {
+      {{"i_shape"}, "Shape", {"input"}, {{"T", "$T"}}},
+      {{"output"}, "AvgPoolGrad", {"i_shape", "grad"},
+       /*Attrs=*/{{"T", "$T"},
+                  {"ksize", "$ksize"},
+                  {"strides", "$strides"},
+                  {"padding", "$padding"}}}
+    });
+  // clang-format on
+  return Status::OK();
+}
+REGISTER_OP_GRADIENT("AvgPool", AvgPoolGrad);
+
 Status MaxPoolGradGrad(const AttrSlice& attrs, FunctionDef* g) {
   // clang-format off
   *g = FDH::Define(
@@ -212,4 +238,25 @@ Status MaxPoolGradGrad(const AttrSlice& attrs, FunctionDef* g) {
 }
 REGISTER_OP_GRADIENT("MaxPoolGrad", MaxPoolGradGrad);
 
+Status BiasAddGrad(const AttrSlice& attrs, FunctionDef* g) {
+  // clang-format off
+  *g = FDH::Define(
+    // Arg defs
+    {"input: T", "bias: T", "grad: T"},
+    // Ret val defs
+    {"grad: T", "bias_grad: T"},
+    // Attr defs
+    {{"T: {float, double}"},
+     GetConvnetDataFormatAttrString()},
+    // Nodes
+    {
+      {{"bias_grad"}, "BiasAddGrad", {"grad"},
+           /*Attrs=*/{{"T", "$T"},
+                      {"data_format", "$data_format"}}}
+    });
+  // clang-format on
+  return Status::OK();
+}
+REGISTER_OP_GRADIENT("BiasAdd", BiasAddGrad);
+
 }  // end namespace tensorflow
-- 
GitLab


From 63fd775a7ff8a7c57ed2a114027a37b51ddf1816 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Tue, 18 Apr 2017 16:36:25 -0800
Subject: [PATCH 0522/1563] partial_run_setup: Avoid an invalid free() if
 TF_PRunSetup fails. Change: 153535078

---
 tensorflow/c/c_api.cc                         | 1 +
 tensorflow/python/client/session_test.py      | 8 ++++++++
 tensorflow/python/client/tf_session_helper.cc | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index b2c6b13b69..7ef7e3c540 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -669,6 +669,7 @@ void TF_PRunSetup(TF_DeprecatedSession* s,
     memcpy(buf, new_handle.c_str(), new_handle.size() + 1);
     *handle = buf;
   } else {
+    *handle = nullptr;
     status->status = result;
   }
 }
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 5fa80809bc..78ba20f0fa 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -1431,6 +1431,14 @@ class SessionTest(test_util.TensorFlowTestCase):
                                  'You must feed a value for placeholder'):
       sess.partial_run(handle, fetches[0])
 
+  def testInvalidPartialRunSetup(self):
+    sess = session.Session()
+    x = array_ops.placeholder(dtypes.float32, shape=[])
+    with self.assertRaisesRegexp(
+        errors.InvalidArgumentError,
+        'specify at least one target to fetch or execute.'):
+      sess.partial_run_setup(fetches=[], feeds=[x])
+
   def testPartialRunDirect(self):
     self.runTestPartialRun(session.Session())
 
diff --git a/tensorflow/python/client/tf_session_helper.cc b/tensorflow/python/client/tf_session_helper.cc
index deb575b60f..36aa49c7e5 100644
--- a/tensorflow/python/client/tf_session_helper.cc
+++ b/tensorflow/python/client/tf_session_helper.cc
@@ -589,6 +589,14 @@ void TF_PRunSetup_wrapper(TF_DeprecatedSession* session,
       const_cast<const char**>(output_names.data()), output_names.size(),
       const_cast<const char**>(target_nodes.data()), target_nodes.size(),
       out_handle, out_status);
+  // TF_PRunSetup leaves out_handle undefined if it fails, but SWIG will call
+  // free(out_handle) on the returned handle regardless. Thus, must make sure it
+  // is valid.
+  if (TF_GetCode(out_status) != TF_OK) {
+    char* tmp = new char[1];
+    tmp[0] = '\0';
+    *out_handle = tmp;
+  }
   Py_END_ALLOW_THREADS;
 }
 
-- 
GitLab


From a27b2a0ff581ec68974fc035d72f496db1c32bac Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Tue, 18 Apr 2017 16:50:34 -0800
Subject: [PATCH 0523/1563] [TF:XLA:CPU] Clamp inputs to sigmoid function to
 [-18, 18] to avoid generating NaNs.

If we don't clamp the inputs, a large negative input to sigmoid will lead to us computing 1.0/inf, which can yield NaN, since we specify the LLVM NoInf fastmath option.
Change: 153536549
---
 tensorflow/compiler/tests/unary_ops_test.py |  5 +++++
 tensorflow/compiler/tf2xla/xla_context.cc   | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tensorflow/compiler/tests/unary_ops_test.py b/tensorflow/compiler/tests/unary_ops_test.py
index 3f324d1071..51d8786ce3 100644
--- a/tensorflow/compiler/tests/unary_ops_test.py
+++ b/tensorflow/compiler/tests/unary_ops_test.py
@@ -182,6 +182,11 @@ class UnaryOpsTest(XLATestCase):
                [0.7310586, 0.880797, 0.95257413, 0.98201376]],
               dtype=dtype))
 
+      self._assertOpOutputMatchesExpected(
+          math_ops.sigmoid,
+          np.array([-300, -150, 0, 150, 300], dtype=dtype),
+          expected=np.array([0, 0, 0.5, 1, 1], dtype=dtype))
+
       self._assertOpOutputMatchesExpected(
           math_ops.sqrt,
           np.array([[4, 9]], dtype=dtype),
diff --git a/tensorflow/compiler/tf2xla/xla_context.cc b/tensorflow/compiler/tf2xla/xla_context.cc
index 57d946509b..3592680303 100644
--- a/tensorflow/compiler/tf2xla/xla_context.cc
+++ b/tensorflow/compiler/tf2xla/xla_context.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/compiler/tf2xla/literal_util.h"
 #include "tensorflow/compiler/tf2xla/shape_util.h"
 #include "tensorflow/compiler/tf2xla/type_util.h"
+#include "tensorflow/compiler/tf2xla/xla_helpers.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/compiler/xla/client/computation_builder.h"
 #include "tensorflow/compiler/xla/layout_util.h"
@@ -183,9 +184,14 @@ const xla::Computation* XlaContext::GetOrCreateSigmoid(const DataType type) {
     xla::PrimitiveType xla_type;
     TF_CHECK_OK(DataTypeToPrimitiveType(type, &xla_type));
     auto x = b.Parameter(0, xla::ShapeUtil::MakeShape(xla_type, {}), "x");
-    auto one = b.ConstantLiteral(xla::LiteralUtil::One(xla_type));
-    auto minus_one = b.Neg(one);
-    b.Div(one, b.Add(b.Exp(b.Mul(x, minus_one)), one));
+    // Clamp the inputs to the range [-18, 18] since anything outside
+    // this range is 0.0f or 1.0f in single-precision. We must clamp the range
+    // of x to avoid incorrect outputs due to fast-math optimizations for large
+    // negative x.
+    x = b.Clamp(XlaHelpers::IntegerLiteral(&b, type, -18), x,
+                XlaHelpers::IntegerLiteral(&b, type, 18));
+    auto one = XlaHelpers::One(&b, type);
+    b.Div(one, b.Add(b.Exp(b.Neg(x)), one));
     return b.Build().ConsumeValueOrDie();
   });
 }
-- 
GitLab


From 2c558ed16f142b5fe7d74ae4a2dc45d69ef8ce89 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 17:10:14 -0800
Subject: [PATCH 0524/1563] Move checkpoint_utils to core. Change: 153538294

---
 tensorflow/python/BUILD                       |   1 +
 .../python/training/checkpoint_utils.py       | 328 ++++++++++++++++++
 .../python/training/checkpoint_utils_test.py  | 304 ++++++++++++++++
 3 files changed, 633 insertions(+)
 create mode 100644 tensorflow/python/training/checkpoint_utils.py
 create mode 100644 tensorflow/python/training/checkpoint_utils_test.py

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index e2b07c1903..b9e79ac156 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2905,6 +2905,7 @@ cuda_py_tests(
         "training/adagrad_da_test.py",
         "training/adagrad_test.py",
         "training/basic_loops_test.py",
+        "training/checkpoint_utils_test.py",
         "training/coordinator_test.py",
         "training/device_setter_test.py",
         "training/ftrl_test.py",
diff --git a/tensorflow/python/training/checkpoint_utils.py b/tensorflow/python/training/checkpoint_utils.py
new file mode 100644
index 0000000000..9bb435f6f7
--- /dev/null
+++ b/tensorflow/python/training/checkpoint_utils.py
@@ -0,0 +1,328 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tools to work with checkpoints."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import six
+
+from tensorflow.python.ops import io_ops
+from tensorflow.python.ops import state_ops
+from tensorflow.python.ops import variable_scope as vs
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import gfile
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.training import saver
+from tensorflow.python.training import training as train
+
+__all__ = [
+    "load_checkpoint", "load_variable", "list_variables", "init_from_checkpoint"
+]
+
+
+def load_checkpoint(ckpt_dir_or_file):
+  """Returns `CheckpointReader` for checkpoint found in `ckpt_dir_or_file`.
+
+  If `ckpt_dir_or_file` resolves to a directory with multiple checkpoints,
+  reader for the latest checkpoint is returned.
+
+  Args:
+    ckpt_dir_or_file: Directory with checkpoints file or path to checkpoint
+      file.
+
+  Returns:
+    `CheckpointReader` object.
+
+  Raises:
+    ValueError: If `ckpt_dir_or_file` resolves to a directory with no
+      checkpoints.
+  """
+  filename = _get_checkpoint_filename(ckpt_dir_or_file)
+  if filename is None:
+    raise ValueError("Couldn't find 'checkpoint' file or checkpoints in "
+                     "given directory %s" % ckpt_dir_or_file)
+  return train.NewCheckpointReader(filename)
+
+
+def load_variable(ckpt_dir_or_file, name):
+  """Returns a tensor with the contents of the given variable in the checkpoint.
+
+  Args:
+    ckpt_dir_or_file: Directory with checkpoints file or path to checkpoint.
+    name: Name of the tensor to return.
+
+  Returns:
+    `Tensor` object.
+  """
+  # TODO(b/29227106): Fix this in the right place and remove this.
+  if name.endswith(":0"):
+    name = name[:-2]
+  reader = load_checkpoint(ckpt_dir_or_file)
+  return reader.get_tensor(name)
+
+
+def list_variables(ckpt_dir_or_file):
+  """Returns list of all variables in the checkpoint.
+
+  Args:
+    ckpt_dir_or_file: Directory with checkpoints file or path to checkpoint.
+
+  Returns:
+    List of tuples `(name, shape)`.
+  """
+  reader = load_checkpoint(ckpt_dir_or_file)
+  variable_map = reader.get_variable_to_shape_map()
+  names = sorted(variable_map.keys())
+  result = []
+  for name in names:
+    result.append((name, variable_map[name]))
+  return result
+
+
+def init_from_checkpoint(ckpt_dir_or_file, assignment_map):
+  """Initializes current variables with tensors loaded from given checkpoint.
+
+  Note: This overrides default initialization ops of specified variables and
+  redefines dtype.
+
+  Assignment map supports following syntax:
+
+  * `'checkpoint_scope_name/': 'scope_name/'` - will load all variables in
+    current `scope_name` from `checkpoint_scope_name` with matching tensor
+    names.
+  * `'checkpoint_scope_name/some_other_variable': 'scope_name/variable_name'` -
+    will initialize `scope_name/variable_name` variable
+    from `checkpoint_scope_name/some_other_variable`.
+  * `'scope_variable_name': variable` - will initialize given `tf.Variable`
+    object with tensor 'scope_variable_name' from the checkpoint.
+  * `'scope_variable_name': list(variable)` - will initialize list of
+    partitioned variables with tensor 'scope_variable_name' from the checkpoint.
+  * `'/': 'scope_name/'` - will load all variables in current `scope_name` from
+    checkpoint's root (e.g. no scope).
+
+  Supports loading into partitioned variables, which are represented as
+  `'<variable>/part_<part #>'`.
+
+  Example:
+
+  ```python
+
+  # Say, '/tmp/model.ckpt' has the following tensors:
+  #  -- name='old_scope_1/var1', shape=[20, 2]
+  #  -- name='old_scope_1/var2', shape=[50, 4]
+  #  -- name='old_scope_2/var3', shape=[100, 100]
+
+  # Create new model's variables
+  with tf.variable_scope('new_scope_1'):
+    var1 = tf.get_variable('var1', shape=[20, 2],
+                           initializer=tf.zeros_initializer())
+  with tf.variable_scope('new_scope_2'):
+    var2 = tf.get_variable('var2', shape=[50, 4],
+                           initializer=tf.zeros_initializer())
+    # Partition into 5 variables along the first axis.
+    var3 = tf.get_variable(name='var3', shape=[100, 100],
+                           initializer=tf.zeros_initializer(),
+                           partitioner=lambda shape, dtype: [5, 1])
+
+  # Initialize all variables in `new_scope_1` from `old_scope_1`.
+  init_from_checkpoint('/tmp/model.ckpt', {'old_scope_1/', 'new_scope_1'})
+
+  # Use names to specify which variables to initialize from checkpoint.
+  init_from_checkpoint('/tmp/model.ckpt',
+                       {'old_scope_1/var1': 'new_scope_1/var1',
+                        'old_scope_1/var2': 'new_scope_2/var2'})
+
+  # Or use tf.Variable objects to identify what to initialize.
+  init_from_checkpoint('/tmp/model.ckpt',
+                       {'old_scope_1/var1': var1,
+                        'old_scope_1/var2': var2})
+
+  # Initialize partitioned variables using variable's name
+  init_from_checkpoint('/tmp/model.ckpt',
+                       {'old_scope_2/var3': 'new_scope_2/var3'})
+
+  # Or specify the list of tf.Variable objects.
+  init_from_checkpoint('/tmp/model.ckpt',
+                       {'old_scope_2/var3': var3._get_variable_list()})
+
+  ```
+
+  Args:
+    ckpt_dir_or_file: Directory with checkpoints file or path to checkpoint.
+    assignment_map: Dict, where keys are names of the variables in the
+      checkpoint and values are current variables or names of current variables
+      (in default graph).
+
+  Raises:
+    tf.errors.OpError: If missing checkpoints or tensors in checkpoints.
+    ValueError: If missing variables in current graph.
+  """
+  ckpt_file = _get_checkpoint_filename(ckpt_dir_or_file)
+  reader = load_checkpoint(ckpt_dir_or_file)
+  variable_map = reader.get_variable_to_shape_map()
+  for tensor_name_in_ckpt, current_var_or_name in six.iteritems(assignment_map):
+    var = None
+    # Check if this is Variable object or list of Variable objects (in case of
+    # partitioned variables).
+    is_var = lambda x: isinstance(x, variables.Variable)
+    if is_var(current_var_or_name) or (
+        isinstance(current_var_or_name, list)
+        and all(is_var(v) for v in current_var_or_name)):
+      var = current_var_or_name
+    else:
+      store_vars = vs._get_default_variable_store()._vars  # pylint:disable=protected-access
+      # Check if this variable is in var_store.
+      var = store_vars.get(current_var_or_name, None)
+      # Also check if variable is partitioned as list.
+      if var is None:
+        var = _collect_partitioned_variable(current_var_or_name, store_vars)
+    if var is not None:
+      # If 1 to 1 mapping was provided, find variable in the checkpoint.
+      if tensor_name_in_ckpt not in variable_map:
+        raise ValueError("Tensor %s is not found in %s checkpoint %s" % (
+            tensor_name_in_ckpt, ckpt_dir_or_file, variable_map
+        ))
+      if is_var(var):
+        # Additional at-call-time checks.
+        if not var.get_shape().is_compatible_with(
+            variable_map[tensor_name_in_ckpt]):
+          raise ValueError(
+              "Shape of variable %s (%s) doesn't match with shape of "
+              "tensor %s (%s) from checkpoint reader." % (
+                  var.name, str(var.get_shape()),
+                  tensor_name_in_ckpt, str(variable_map[tensor_name_in_ckpt])
+              ))
+        var_name = var.name
+      else:
+        var_name = ",".join([v.name for v in var])
+      _set_variable_or_list_initializer(var, ckpt_file, tensor_name_in_ckpt)
+      logging.info("Initialize variable %s from checkpoint %s with %s" % (
+          var_name, ckpt_dir_or_file, tensor_name_in_ckpt
+      ))
+    else:
+      scopes = ""
+      # TODO(vihanjain): Support list of 'current_var_or_name' here.
+      if "/" in current_var_or_name:
+        scopes = current_var_or_name[:current_var_or_name.rindex("/")]
+      if not tensor_name_in_ckpt.endswith("/"):
+        raise ValueError(
+            "Assignment map with scope only name {} should map to scope only "
+            "{}. Should be 'scope/': 'other_scope/'.".format(
+                scopes, tensor_name_in_ckpt))
+      # If scope to scope mapping was provided, find all variables in the scope
+      # and create variable to variable mapping.
+      scope_variables = set()
+      for var_name in store_vars:
+        if var_name.startswith(scopes):
+          # Consume /part_ if partitioned variable.
+          if "/part_" in var_name:
+            var_name = var_name[:var_name.index("/part_")]
+          scope_variables.add(var_name)
+      for var_name in scope_variables:
+        # Lookup name with specified prefix and suffix from current variable.
+        # If tensor_name given is '/' (root), don't use it for full name.
+        full_tensor_name = var_name[len(scopes):]
+        if current_var_or_name != "/":
+          full_tensor_name = full_tensor_name[1:]
+        if tensor_name_in_ckpt != "/":
+          full_tensor_name = tensor_name_in_ckpt + full_tensor_name
+        if full_tensor_name not in variable_map:
+          raise ValueError(
+              "Tensor %s (%s in %s) is not found in %s checkpoint" % (
+                  full_tensor_name, var_name[len(scopes) + 1:],
+                  tensor_name_in_ckpt, ckpt_dir_or_file
+              ))
+        var = store_vars.get(var_name, None)
+        if var is None:
+          var = _collect_partitioned_variable(var_name, store_vars)
+        _set_variable_or_list_initializer(var, ckpt_file, full_tensor_name)
+        logging.info("Initialize variable %s from checkpoint %s with %s" % (
+            var_name, ckpt_dir_or_file, full_tensor_name
+        ))
+
+
+def _get_checkpoint_filename(ckpt_dir_or_file):
+  """Returns checkpoint filename given directory or specific checkpoint file."""
+  if gfile.IsDirectory(ckpt_dir_or_file):
+    return saver.latest_checkpoint(ckpt_dir_or_file)
+  return ckpt_dir_or_file
+
+
+def _set_checkpoint_initializer(variable,
+                                ckpt_file,
+                                tensor_name,
+                                slice_spec,
+                                name="checkpoint_initializer"):
+  """Overrides given variable's initialization op.
+
+  Sets variable initializer to assign op that initializes variable from tensor's
+  value in the checkpoint.
+
+  Args:
+    variable: `tf.Variable` object.
+    ckpt_file: string, full path of the checkpoint.
+    tensor_name: Name of the tensor to load from the checkpoint.
+    slice_spec: Slice specification for loading partitioned tensors.
+    name: Name of the operation.
+  """
+  base_type = variable.dtype.base_dtype
+  restore_op = io_ops.restore_v2(
+      ckpt_file, [tensor_name], [slice_spec], [base_type], name=name)[0]
+  variable._initializer_op = state_ops.assign(variable, restore_op)  # pylint:disable=protected-access
+
+
+def _set_variable_or_list_initializer(variable_or_list, ckpt_file,
+                                      tensor_name):
+  """Overrides initialization op of given variable or list of variables.
+
+  Calls `_set_checkpoint_initializer` for each variable in the given list of
+  variables.
+
+  Args:
+    variable_or_list: `tf.Variable` object or a list of `tf.Variable` objects.
+    ckpt_file: string, full path of the checkpoint.
+    tensor_name: Name of the tensor to load from the checkpoint.
+
+  Raises:
+    ValueError: if all objects in `variable_or_list` are not partitions of the
+      same large variable.
+  """
+  if isinstance(variable_or_list, (list, tuple)):
+    # A set of slices.
+    slice_name = None
+    for v in variable_or_list:
+      slice_info = v._save_slice_info  # pylint:disable=protected-access
+      if slice_name is None:
+        slice_name = slice_info.full_name
+      elif slice_name != slice_info.full_name:
+        raise ValueError("Slices must all be from the same tensor: %s != %s" %
+                         (slice_name, slice_info.full_name))
+      _set_checkpoint_initializer(v, ckpt_file, tensor_name, slice_info.spec)
+  else:
+    _set_checkpoint_initializer(variable_or_list, ckpt_file, tensor_name, "")
+
+
+def _collect_partitioned_variable(name, all_vars):
+  """Returns list of `tf.Variable` that comprise the partitioned variable."""
+  if name + "/part_0" in all_vars:
+    var = []
+    i = 0
+    while name + "/part_%d" % i in all_vars:
+      var.append(all_vars[name + "/part_%d" % i])
+      i += 1
+    return var
+  return None
diff --git a/tensorflow/python/training/checkpoint_utils_test.py b/tensorflow/python/training/checkpoint_utils_test.py
new file mode 100644
index 0000000000..a73972f5cc
--- /dev/null
+++ b/tensorflow/python/training/checkpoint_utils_test.py
@@ -0,0 +1,304 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for checkpoints tools."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+import numpy as np
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors_impl
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import partitioned_variables
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+from tensorflow.python.training import checkpoint_utils
+from tensorflow.python.training import saver as saver_lib
+
+
+def _create_checkpoints(sess, checkpoint_dir):
+  checkpoint_prefix = os.path.join(checkpoint_dir, "model")
+  checkpoint_state_name = "checkpoint"
+  v1 = variable_scope.get_variable("var1", [1, 10])
+  v2 = variable_scope.get_variable("var2", [10, 10])
+  v3 = variable_scope.get_variable("var3", [100, 100])
+  with variable_scope.variable_scope("useful_scope"):
+    v4 = variable_scope.get_variable("var4", [9, 9])
+  sess.run(variables.global_variables_initializer())
+  v1_value, v2_value, v3_value, v4_value = sess.run([v1, v2, v3, v4])
+  saver = saver_lib.Saver()
+  saver.save(
+      sess,
+      checkpoint_prefix,
+      global_step=0,
+      latest_filename=checkpoint_state_name)
+  return v1_value, v2_value, v3_value, v4_value
+
+
+def _create_partition_checkpoints(sess, checkpoint_dir):
+  checkpoint_prefix = os.path.join(checkpoint_dir, "model")
+  checkpoint_state_name = "checkpoint"
+  with variable_scope.variable_scope("scope"):
+    v1 = variable_scope.get_variable(
+        name="var1",
+        shape=[100, 100],
+        initializer=init_ops.truncated_normal_initializer(0.5),
+        partitioner=partitioned_variables.min_max_variable_partitioner(
+            max_partitions=5, axis=0, min_slice_size=8 << 10))
+  sess.run(variables.global_variables_initializer())
+  v1_value = sess.run(v1._get_variable_list())
+  saver = saver_lib.Saver()
+  saver.save(
+      sess,
+      checkpoint_prefix,
+      global_step=0,
+      latest_filename=checkpoint_state_name)
+  return v1_value
+
+
+class CheckpointsTest(test.TestCase):
+
+  def testNoCheckpoints(self):
+    checkpoint_dir = self.get_temp_dir() + "/no_checkpoints"
+    with self.assertRaises(errors_impl.OpError):
+      self.assertAllEqual(
+          checkpoint_utils.load_variable(checkpoint_dir, "var1"), [])
+
+  def testNoTensor(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      _, _, _, _ = _create_checkpoints(session, checkpoint_dir)
+    with self.assertRaises(errors_impl.OpError):
+      self.assertAllEqual(
+          checkpoint_utils.load_variable(checkpoint_dir, "var5"), [])
+
+  def testGetTensor(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      v1, v2, v3, v4 = _create_checkpoints(session, checkpoint_dir)
+    self.assertAllEqual(
+        checkpoint_utils.load_variable(checkpoint_dir, "var1"), v1)
+    self.assertAllEqual(
+        checkpoint_utils.load_variable(checkpoint_dir, "var2"), v2)
+    self.assertAllEqual(
+        checkpoint_utils.load_variable(checkpoint_dir, "var3"), v3)
+    self.assertAllEqual(
+        checkpoint_utils.load_variable(checkpoint_dir, "useful_scope/var4"), v4)
+
+  def testGetAllVariables(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      _create_checkpoints(session, checkpoint_dir)
+    self.assertEqual(
+        checkpoint_utils.list_variables(checkpoint_dir),
+        [("useful_scope/var4", [9, 9]), ("var1", [1, 10]), ("var2", [10, 10]),
+         ("var3", [100, 100])])
+
+  def testInitFromCheckpoint(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      v1, v2, v3, v4 = _create_checkpoints(session, checkpoint_dir)
+
+    # New graph and session.
+    with ops.Graph().as_default() as g:
+      with self.test_session(graph=g) as session:
+        with variable_scope.variable_scope("some_scope"):
+          my1 = variable_scope.get_variable("my1", [1, 10])
+          with variable_scope.variable_scope("some_other_scope"):
+            my2 = variable_scope.get_variable("my2", [10, 10])
+            with variable_scope.variable_scope("other_useful_scope"):
+              my4 = variable_scope.get_variable("var4", [9, 9])
+        my3 = variable_scope.get_variable("my3", [100, 100])
+
+        checkpoint_utils.init_from_checkpoint(checkpoint_dir, {
+            "var1": "some_scope/my1",
+            "useful_scope/": "some_scope/some_other_scope/other_useful_scope/",
+        })
+        checkpoint_utils.init_from_checkpoint(checkpoint_dir, {
+            "var2": "some_scope/some_other_scope/my2",
+            "var3": my3,
+        })
+
+        session.run(variables.global_variables_initializer())
+        self.assertAllEqual(my1.eval(session), v1)
+        self.assertAllEqual(my2.eval(session), v2)
+        self.assertAllEqual(my3.eval(session), v3)
+        self.assertAllEqual(my4.eval(session), v4)
+
+        # Check that tensors are not explicitly in the graph.
+        self.assertLess(len(str(session.graph.as_graph_def())), 27000)
+
+  def testInitFromRootCheckpoint(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      v1, v2, v3, v4 = _create_checkpoints(session, checkpoint_dir)
+
+    # New graph and session.
+    with ops.Graph().as_default() as g:
+      with self.test_session(graph=g) as session:
+        with variable_scope.variable_scope("some_scope"):
+          my1 = variable_scope.get_variable("var1", [1, 10])
+          my2 = variable_scope.get_variable("var2", [10, 10])
+          my3 = variable_scope.get_variable("var3", [100, 100])
+          with variable_scope.variable_scope("useful_scope"):
+            my4 = variable_scope.get_variable("var4", [9, 9])
+
+        checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                              {"/": "some_scope/",})
+
+        session.run(variables.global_variables_initializer())
+        self.assertAllEqual(my1.eval(session), v1)
+        self.assertAllEqual(my2.eval(session), v2)
+        self.assertAllEqual(my3.eval(session), v3)
+        self.assertAllEqual(my4.eval(session), v4)
+
+  def testInitToRootCheckpoint(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      v1, v2, v3, v4 = _create_checkpoints(session, checkpoint_dir)
+
+    # New graph and session.
+    with ops.Graph().as_default() as g:
+      with self.test_session(graph=g) as session:
+        my1 = variable_scope.get_variable("var1", [1, 10])
+        my2 = variable_scope.get_variable("var2", [10, 10])
+        my3 = variable_scope.get_variable("var3", [100, 100])
+        with variable_scope.variable_scope("useful_scope"):
+          my4 = variable_scope.get_variable("var4", [9, 9])
+
+        checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                              {"/": "/",})
+
+        session.run(variables.global_variables_initializer())
+        self.assertAllEqual(my1.eval(session), v1)
+        self.assertAllEqual(my2.eval(session), v2)
+        self.assertAllEqual(my3.eval(session), v3)
+        self.assertAllEqual(my4.eval(session), v4)
+
+  def testInitFromPartitionVar(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      v1 = _create_partition_checkpoints(session, checkpoint_dir)
+
+    # New graph and session.
+    with ops.Graph().as_default() as g:
+      with self.test_session(graph=g) as session:
+        with variable_scope.variable_scope("some_scope"):
+          my1 = variable_scope.get_variable(
+              name="my1",
+              shape=[100, 100],
+              initializer=init_ops.zeros_initializer(),
+              partitioner=partitioned_variables.min_max_variable_partitioner(
+                  max_partitions=5, axis=0, min_slice_size=8 << 10))
+          my1_var_list = my1._get_variable_list()
+        # Create another variable with different partitions than the variable in
+        # the checkpoint.
+        with variable_scope.variable_scope("some_other_scope"):
+          my2 = variable_scope.get_variable(
+              name="var1",
+              shape=[100, 100],
+              initializer=init_ops.zeros_initializer(),
+              partitioner=partitioned_variables.min_max_variable_partitioner(
+                  max_partitions=5, axis=0, min_slice_size=16 << 10))
+          my2_var_list = my2._get_variable_list()
+
+        checkpoint_utils.init_from_checkpoint(checkpoint_dir, {
+            "scope/var1": "some_scope/my1",
+            "scope/": "some_other_scope/"})
+
+        session.run(variables.global_variables_initializer())
+        my1_values = session.run(my1_var_list)
+        self.assertAllEqual(my1_values, v1)
+        my2_values = session.run(my2_var_list)
+        # Verify we created different number of partitions.
+        self.assertNotEquals(len(my2_values), len(v1))
+        # Verify the values were correctly initialized inspite of different
+        # partitions.
+        full_my2_values = np.concatenate(my2_values, axis=0)
+        full_v1_values = np.concatenate(v1, axis=0)
+        self.assertAllEqual(full_my2_values, full_v1_values)
+
+    # New graph and session.
+    with ops.Graph().as_default() as g:
+      with self.test_session(graph=g) as session:
+        with variable_scope.variable_scope("some_scope"):
+          my1 = variable_scope.get_variable(
+              name="my1",
+              shape=[100, 100],
+              initializer=init_ops.truncated_normal_initializer(0.5),
+              partitioner=partitioned_variables.min_max_variable_partitioner(
+                  max_partitions=5, axis=0, min_slice_size=8 << 10))
+          my1_var_list = my1._get_variable_list()
+
+        checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                              {"scope/var1": my1_var_list,})
+
+        session.run(variables.global_variables_initializer())
+        my1_values = session.run(my1_var_list)
+        self.assertAllEqual(my1_values, v1)
+
+  def testInitFromCheckpointMissing(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      _, _, _, _ = _create_checkpoints(session, checkpoint_dir)
+
+    # New graph and session.
+    with ops.Graph().as_default() as g:
+      with self.test_session(graph=g) as session:
+        with variable_scope.variable_scope("some_scope"):
+          _ = variable_scope.get_variable("my1", [10, 10])
+          _ = variable_scope.get_variable(
+              "my2", [1, 10],
+              dtype=dtypes.int64,
+              initializer=init_ops.zeros_initializer())
+
+        # No directory.
+        with self.assertRaises(errors_impl.OpError):
+          checkpoint_utils.init_from_checkpoint("no_dir",
+                                                {"var1": "some_scope/my1"})
+
+        # No variable in checkpoint.
+        with self.assertRaises(ValueError):
+          checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                                {"no_var": "some_scope/my1"})
+
+        # No variable in the graph.
+        with self.assertRaises(ValueError):
+          checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                                {"var3": "some_scope/no_var"})
+
+        # Shape mismatch.
+        with self.assertRaises(ValueError):
+          checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                                {"var1": "some_scope/my1"})
+
+        # Variable 'my1' and 'my2' are missing in given checkpoint scope.
+        with self.assertRaises(ValueError):
+          checkpoint_utils.init_from_checkpoint(
+              checkpoint_dir, {"useful_scope/": "some_scope/"})
+
+        # Mapping is not to scope name.
+        with self.assertRaises(ValueError):
+          checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                                {"useful_scope": "some_scope/"})
+
+
+if __name__ == "__main__":
+  test.main()
-- 
GitLab


From 8fa41bb322820c2adb6cbe867d5de8a620a179f4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 17:19:18 -0800
Subject: [PATCH 0525/1563] Added examples to the nest.py documentation.
 Change: 153538997

---
 tensorflow/python/util/nest.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/util/nest.py b/tensorflow/python/util/nest.py
index ade6238981..1e22928b36 100644
--- a/tensorflow/python/util/nest.py
+++ b/tensorflow/python/util/nest.py
@@ -15,11 +15,14 @@
 
 """## Functions for working with arbitrarily nested sequences of elements.
 
-This module is used to perform any operations on nested structures, which can be
-specified as sequences that contain non-sequence elements or other sequences.
-The utilities here assume (and do not check) that the nested structures form a
-'tree', i.e. no references in the structure of the input of these functions
-should be recursive.
+This module is used to perform any operations on nested structures. A nested
+structure is a Python sequence that contains non-sequence elements or other
+sequences. The utilities here assume (and do not check) that the nested
+structures form a 'tree', i.e. no references in the structure of the input of
+these functions should be recursive.
+
+Example structures: `((3, 4), 5, (6, 7, (9, 10), 8))`, `(np.array(0),
+  (np.array([3, 4]), tf.constant([3, 4])))`
 
 @@assert_same_structure
 @@is_sequence
-- 
GitLab


From c58d0d7aa97eae4b63c3ce4149aae30be223111d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 19:24:01 -0800
Subject: [PATCH 0526/1563] Speed up non-eigen codepath for
 SparseTensorDenseMatmul by using FastBoundsCheck instead of CHECK_LT.

Return an error for an out-of-bounds sparse index in SparseTensorDenseMatmul,
instead of crashing (for CPU kernel only).
Change: 153546369
---
 .../kernels/sparse_tensor_dense_matmul_op.cc  | 73 +++++++++++++------
 .../kernels/sparse_tensor_dense_matmul_op.h   | 12 +--
 .../sparse_tensor_dense_matmul_op_gpu.cu.cc   | 13 ++--
 .../sparse_tensor_dense_matmul_op_test.py     | 31 ++++++++
 4 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
index 1669ac47c8..2bcc7f407d 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
@@ -139,12 +139,15 @@ class SparseTensorDenseMatMulOp : public OpKernel {
                                              TensorShape({0}), &scratch));
     }
 
-#define MAYBE_ADJOINT(ADJ_A, ADJ_B)                                            \
-  if (adjoint_a_ == ADJ_A && adjoint_b_ == ADJ_B) {                            \
-    functor::SparseTensorDenseMatMulFunctor<Device, T, ADJ_A, ADJ_B>::Compute( \
-        ctx->eigen_device<Device>(), out->matrix<T>(),                         \
-        a_indices->matrix<int64>(), a_values->vec<T>(), b->matrix<T>(),        \
-        scratch.vec<T>());                                                     \
+#define MAYBE_ADJOINT(ADJ_A, ADJ_B)                                           \
+  if (adjoint_a_ == ADJ_A && adjoint_b_ == ADJ_B) {                           \
+    Status functor_status = functor::SparseTensorDenseMatMulFunctor<          \
+        Device, T, ADJ_A, ADJ_B>::Compute(ctx->eigen_device<Device>(),        \
+                                          out->matrix<T>(),                   \
+                                          a_indices->matrix<int64>(),         \
+                                          a_values->vec<T>(), b->matrix<T>(), \
+                                          scratch.vec<T>());                  \
+    OP_REQUIRES_OK(ctx, functor_status);                                      \
   }
 
     MAYBE_ADJOINT(false, false);
@@ -176,14 +179,14 @@ REGISTER_CPU(complex128);
 #if GOOGLE_CUDA
 
 namespace functor {
-#define DECLARE_GPU_SPEC(T, ADJ_A, ADJ_B)                                    \
-  template <>                                                                \
-  void SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B>::Compute(  \
-      const GPUDevice& d, typename TTypes<T>::Matrix out,                    \
-      TTypes<int64>::ConstMatrix a_indices,                                  \
-      typename TTypes<T>::ConstVec a_values,                                 \
-      typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);   \
-  extern template struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, \
+#define DECLARE_GPU_SPEC(T, ADJ_A, ADJ_B)                                     \
+  template <>                                                                 \
+  Status SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B>::Compute( \
+      const GPUDevice& d, typename TTypes<T>::Matrix out,                     \
+      TTypes<int64>::ConstMatrix a_indices,                                   \
+      typename TTypes<T>::ConstVec a_values,                                  \
+      typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);    \
+  extern template struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A,  \
                                                         ADJ_B>;
 
 #define DECLARE_ADJOINT_GPU_SPEC(T) \
@@ -211,16 +214,30 @@ REGISTER_GPU(float);
 
 namespace functor {
 
+namespace {
+Status KOutOfBoundsError(int64 k, std::size_t i, int rhs_index_a,
+                         std::size_t lhs_right) {
+  return errors::InvalidArgument("k (", k, ") from index[", i, ",", rhs_index_a,
+                                 "] out of bounds (>=", lhs_right, ")");
+}
+
+Status MOutOfBoundsError(int64 m, std::size_t i, int lhs_index_a,
+                         int64 out_dim0) {
+  return errors::InvalidArgument("m (", m, ") from index[", i, ",", lhs_index_a,
+                                 "] out of bounds (>=", out_dim0, ")");
+}
+}  // namespace
+
 template <typename T, bool ADJ_A, bool ADJ_B>
 struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
   // Vectorize certain operations above this size.
   static const std::size_t kNumVectorize = 32;
 
-  static void Compute(const CPUDevice& d, typename TTypes<T>::Matrix out,
-                      TTypes<int64>::ConstMatrix a_indices,
-                      typename TTypes<T>::ConstVec a_values,
-                      typename TTypes<T>::ConstMatrix b,
-                      typename TTypes<T>::Vec scratch) {
+  static Status Compute(const CPUDevice& d, typename TTypes<T>::Matrix out,
+                        TTypes<int64>::ConstMatrix a_indices,
+                        typename TTypes<T>::ConstVec a_values,
+                        typename TTypes<T>::ConstMatrix b,
+                        typename TTypes<T>::Vec scratch) {
     const std::size_t nnz = a_values.size();
     const std::size_t rhs_right = (ADJ_B ? b.dimension(0) : b.dimension(1));
     const std::size_t lhs_right = (ADJ_B ? b.dimension(1) : b.dimension(0));
@@ -236,11 +253,16 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
     if (rhs_right < kNumVectorize) {
       // Disable vectorization if the RHS of output is too small
       auto maybe_adjoint_b = MaybeAdjoint<decltype(b), ADJ_B>(b);
+
       for (std::size_t i = 0; i < nnz; ++i) {
         const int64 m = internal::SubtleMustCopy(a_indices(i, lhs_index_a));
         const int64 k = internal::SubtleMustCopy(a_indices(i, rhs_index_a));
-        CHECK_LT(k, lhs_right);
-        CHECK_LT(m, out.dimension(0));
+        if (!FastBoundsCheck(k, lhs_right)) {
+          return KOutOfBoundsError(k, i, rhs_index_a, lhs_right);
+        }
+        if (!FastBoundsCheck(m, out.dimension(0))) {
+          return MOutOfBoundsError(m, i, lhs_index_a, out.dimension(0));
+        }
         const T a_value = ADJ_A ? MaybeConj(a_values(i)) : a_values(i);
         for (std::size_t n = 0; n < rhs_right; ++n) {
           const T b_value = maybe_adjoint_b(k, n);
@@ -256,8 +278,12 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
     const int64 m = internal::SubtleMustCopy(a_indices(i, lhs_index_a)); \
     const int64 k = internal::SubtleMustCopy(a_indices(i, rhs_index_a)); \
     const T a_value = (ADJ_A) ? MaybeConj(a_values(i)) : a_values(i);    \
-    CHECK_LT(m, out.dimension(0));                                       \
-    CHECK_LT(k, lhs_right);                                              \
+    if (!FastBoundsCheck(k, lhs_right)) {                                \
+      return KOutOfBoundsError(k, i, rhs_index_a, lhs_right);            \
+    }                                                                    \
+    if (!FastBoundsCheck(m, out.dimension(0))) {                         \
+      return MOutOfBoundsError(m, i, lhs_index_a, out.dimension(0));     \
+    }                                                                    \
     out.template chip<0>(m) +=                                           \
         b_passed.template chip<b_chip_index>(k) * a_value;               \
   }
@@ -274,6 +300,7 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
       }
 #undef LOOP_NNZ
     }
+    return Status::OK();
   }
 };
 
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
index 3bec4ce5f2..bcb836367b 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
@@ -19,6 +19,7 @@ limitations under the License.
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/errors.h"
 
 namespace tensorflow {
 
@@ -26,12 +27,11 @@ namespace functor {
 
 template <typename Device, typename T, bool ADJ_A, bool ADJ_B>
 struct SparseTensorDenseMatMulFunctor {
-  static EIGEN_ALWAYS_INLINE void Compute(const Device& d,
-                                          typename TTypes<T>::Matrix out,
-                                          TTypes<int64>::ConstMatrix a_indices,
-                                          typename TTypes<T>::ConstVec a_values,
-                                          typename TTypes<T>::ConstMatrix b,
-                                          typename TTypes<T>::Vec scratch);
+  static EIGEN_ALWAYS_INLINE Status
+  Compute(const Device& d, typename TTypes<T>::Matrix out,
+          TTypes<int64>::ConstMatrix a_indices,
+          typename TTypes<T>::ConstVec a_values,
+          typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);
 };
 
 template <typename MATRIX, bool ADJ>
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
index a1776968f0..07d218311e 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
@@ -90,12 +90,11 @@ namespace functor {
 
 template <typename T, bool ADJ_A, bool ADJ_B>
 struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B> {
-  static EIGEN_ALWAYS_INLINE void Compute(const GPUDevice& d,
-                                          typename TTypes<T>::Matrix out,
-                                          TTypes<int64>::ConstMatrix a_indices,
-                                          typename TTypes<T>::ConstVec a_values,
-                                          typename TTypes<T>::ConstMatrix b,
-                                          typename TTypes<T>::Vec scratch) {
+  static EIGEN_ALWAYS_INLINE Status
+  Compute(const GPUDevice& d, typename TTypes<T>::Matrix out,
+          TTypes<int64>::ConstMatrix a_indices,
+          typename TTypes<T>::ConstVec a_values,
+          typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch) {
     generator::SparseTensorDenseMatMulGPUGenerator<T, ADJ_A, ADJ_B>
         sparse_tensor_dense_matmul_generator(To32Bit(out), To32Bit(a_indices),
                                              To32Bit(a_values), To32Bit(b));
@@ -140,6 +139,8 @@ struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B> {
             .broadcast(n_by_1)
             .generate(sparse_tensor_dense_matmul_generator)
             .sum(reduce_on_rows);
+
+    return Status::OK();
   }
 };
 
diff --git a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
index 25da6691e6..da72803ee7 100644
--- a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
@@ -123,6 +123,37 @@ class SparseTensorDenseMatMulTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, "Dimensions must be equal"):
       sparse_ops.sparse_tensor_dense_matmul(x_st_shape_inconsistent, y)
 
+  def testInvalidIndicesForSparseTensorDenseMatmul(self):
+    # Note: use_gpu=False because nice errors are only returned from CPU kernel.
+    with self.test_session(use_gpu=False):
+      indices = np.matrix([[1, 10]]).astype(np.int64)
+      values = np.array([10]).astype(np.float32)
+      shape = [3, 2]
+      sparse_t = sparse_tensor.SparseTensor(indices, values, shape)
+
+      # Test multiplying by both a small and large dense matrix, to hit
+      # both cases in the kernel.
+      dense_t = np.matrix([[1] * 5, [2] * 5], dtype=np.float32)
+      with self.assertRaisesOpError(
+          "k .10. from index.0,1. out of bounds .>=2."):
+        sparse_ops.sparse_tensor_dense_matmul(sparse_t, dense_t).eval()
+      dense_t = np.matrix([[1] * 500, [2] * 500], dtype=np.float32)
+      with self.assertRaisesOpError(
+          "k .10. from index.0,1. out of bounds .>=2."):
+        sparse_ops.sparse_tensor_dense_matmul(sparse_t, dense_t).eval()
+
+      # Repeat with adjoint_a, to get a different error.
+      dense_t = np.matrix([[1] * 5, [2] * 5, [3] * 5], dtype=np.float32)
+      with self.assertRaisesOpError(
+          "m .10. from index.0,1. out of bounds .>=2."):
+        sparse_ops.sparse_tensor_dense_matmul(
+            sparse_t, dense_t, adjoint_a=True).eval()
+      dense_t = np.matrix([[1] * 500, [2] * 500, [3] * 500], dtype=np.float32)
+      with self.assertRaisesOpError(
+          "m .10. from index.0,1. out of bounds .>=2."):
+        sparse_ops.sparse_tensor_dense_matmul(
+            sparse_t, dense_t, adjoint_a=True).eval()
+
   # Tests setting one dimension to be a high value.
   def _testLarge(self, np_dtype):
     r1 = np.random.randint(6000, 20000)
-- 
GitLab


From 8b6c3c8e8817b64e83ba3a7379935d0ea9232605 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 19 Apr 2017 02:01:24 -0800
Subject: [PATCH 0527/1563] Fix error messages for missing or unspecified
 partial run feeds/fetches. Change: 153568192

---
 tensorflow/core/common_runtime/direct_session.cc      | 8 +++++---
 tensorflow/core/distributed_runtime/master_session.cc | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index e660624e28..c05cceced1 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -684,8 +684,9 @@ Status DirectSession::PRun(const string& handle, const NamedTensorList& inputs,
     for (const auto& input : inputs) {
       auto it = run_state->pending_inputs.find(input.first);
       if (it == run_state->pending_inputs.end()) {
-        return errors::InvalidArgument("The feed ", input.first,
-                                       " had already been fed.");
+        return errors::InvalidArgument(
+            "The feed ", input.first,
+            " has already been fed or was not specified in partial_run_setup.");
       }
     }
     // Check that this is a new set of fetches that are still pending.
@@ -693,7 +694,8 @@ Status DirectSession::PRun(const string& handle, const NamedTensorList& inputs,
       auto it = run_state->pending_outputs.find(output);
       if (it == run_state->pending_outputs.end()) {
         return errors::InvalidArgument("The fetch ", output,
-                                       " had already been fetched.");
+                                       " has already been fetched or was not "
+                                       "specified in partial_run_setup.");
       }
     }
   }
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 3b52652752..e8e4b09c2c 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -1272,8 +1272,9 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
   for (size_t i = 0; i < req.num_feeds(); ++i) {
     auto it = run_state->pending_inputs.find(req.feed_name(i));
     if (it == run_state->pending_inputs.end()) {
-      return errors::InvalidArgument("The feed ", req.feed_name(i),
-                                     " had already been fed.");
+      return errors::InvalidArgument(
+          "The feed ", req.feed_name(i),
+          " has already been fed or was not specified in partial_run_setup.");
     }
   }
   // Check that this is a new set of fetches that are still pending.
@@ -1282,7 +1283,8 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
     auto it = run_state->pending_outputs.find(fetch);
     if (it == run_state->pending_outputs.end()) {
       return errors::InvalidArgument("The fetch ", fetch,
-                                     " had already been fetched.");
+                                     " had already been fetched or was not "
+                                     "specified in partial_run_setup.");
     }
   }
 
-- 
GitLab


From f26e11d2e21092070b782651d93a9abc531b528c Mon Sep 17 00:00:00 2001
From: poohzrn <poohzrn@users.noreply.github.com>
Date: Wed, 19 Apr 2017 15:27:16 +0200
Subject: [PATCH 0528/1563] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17aecb87a3..c0e753fa67 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Hello, TensorFlow!
 >>>
 ```
 
-##For more information
+## For more information
 
 * [TensorFlow website](http://tensorflow.org)
 * [TensorFlow whitepaper](http://download.tensorflow.org/paper/whitepaper2015.pdf)
-- 
GitLab


From 95c5d7e880b8b4d18ba1f3b7cf40d15cd218b3c9 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Wed, 19 Apr 2017 06:15:23 -0800
Subject: [PATCH 0529/1563] Generalize LazyLoader for use by ffmpeg

Add __dir__ method so the docs generator doesn't need to
 do anything special to activate the loading
Change: 153583515
---
 tensorflow/__init__.py                        | 16 +----
 tensorflow/contrib/__init__.py                |  5 ++
 tensorflow/python/util/lazy_loader.py         | 58 +++++++++++++++++++
 tensorflow/tools/api/golden/tensorflow.pbtxt  |  2 +-
 .../api/lib/python_object_to_proto_visitor.py |  4 +-
 .../tools/api/tests/api_compatibility_test.py |  6 +-
 tensorflow/tools/common/public_api.py         | 52 +++++++++--------
 tensorflow/tools/docs/build_docs_test.py      |  1 -
 tensorflow/tools/docs/generate.py             |  1 -
 tensorflow/tools/docs/generate_1_0.py         |  1 -
 tensorflow/tools/docs/generate_lib.py         | 13 -----
 tensorflow/tools/docs/generate_lib_test.py    |  2 +-
 12 files changed, 103 insertions(+), 58 deletions(-)
 create mode 100644 tensorflow/python/util/lazy_loader.py

diff --git a/tensorflow/__init__.py b/tensorflow/__init__.py
index 0bca6f8fb8..083634bd79 100644
--- a/tensorflow/__init__.py
+++ b/tensorflow/__init__.py
@@ -24,19 +24,9 @@ from __future__ import print_function
 from tensorflow.python import *
 # pylint: enable=wildcard-import
 
-# Lazily import the `tf.contrib` module. This avoids loading all of the
-# dependencies of `tf.contrib` at `import tensorflow` time.
-class _LazyContribLoader(object):
-
-  def __getattr__(self, item):
-    global contrib
-    # Replace the lazy loader with the imported module itself.
-    import importlib  # pylint: disable=g-import-not-at-top
-    contrib = importlib.import_module('tensorflow.contrib')
-    return getattr(contrib, item)
-
-
-contrib = _LazyContribLoader()
+from tensorflow.python.util.lazy_loader import LazyLoader
+contrib = LazyLoader('contrib', globals(), 'tensorflow.contrib')
+del LazyLoader
 
 del absolute_import
 del division
diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py
index 814bf76eb0..44a5874de2 100644
--- a/tensorflow/contrib/__init__.py
+++ b/tensorflow/contrib/__init__.py
@@ -67,6 +67,11 @@ from tensorflow.contrib import util
 from tensorflow.contrib.ndlstm import python as ndlstm
 from tensorflow.contrib.specs import python as specs
 
+from tensorflow.python.util.lazy_loader import LazyLoader
+ffmpeg = LazyLoader("ffmpeg", globals(),
+                    "tensorflow.contrib.ffmpeg")
+del LazyLoader
+
 del absolute_import
 del division
 del print_function
diff --git a/tensorflow/python/util/lazy_loader.py b/tensorflow/python/util/lazy_loader.py
new file mode 100644
index 0000000000..34308ff931
--- /dev/null
+++ b/tensorflow/python/util/lazy_loader.py
@@ -0,0 +1,58 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""A LazyLoader class."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import importlib
+import types
+
+
+class LazyLoader(types.ModuleType):
+  """Lazily import a module, mainly to avoid pulling in large dependancies.
+
+  `contrib`, and `ffmpeg` are examples of modules that are large and not always
+  needed, and this allows them to only be loaded when they are used.
+  """
+
+  # The lint error here is incorrect.
+  def __init__(self, local_name, parent_module_globals, name):  # pylint: disable=super-on-old-class
+    self._local_name = local_name
+    self._parent_module_globals = parent_module_globals
+
+    super(LazyLoader, self).__init__(name)
+
+  def _load(self):
+    # Import the target module and insert it into the parent's namespace
+    module = importlib.import_module(self.__name__)
+    self._parent_module_globals[self._local_name] = module
+
+    # Update this object's dict so that if someone keeps a reference to the
+    #   LazyLoader, lookups are efficient (__getattr__ is only called on lookups
+    #   that fail).
+    self.__dict__.update(module.__dict__)
+
+    return module
+
+  def __getattr__(self, item):
+    module = self._load()
+    return getattr(module, item)
+
+  def __dir__(self):
+    module = self._load()
+    return dir(module)
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index e354969c38..92ded90834 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -278,7 +278,7 @@ tf_module {
   }
   member {
     name: "contrib"
-    mtype: "<class \'_LazyContribLoader\'>"
+    mtype: "<class \'tensorflow.python.util.lazy_loader.LazyLoader\'>"
   }
   member {
     name: "double"
diff --git a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
index 64092a6441..b4ab9f43f5 100644
--- a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
+++ b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
@@ -27,9 +27,7 @@ from tensorflow.tools.api.lib import api_objects_pb2
 
 # Following object need to be handled individually.
 _CORNER_CASES = {
-    '': {'contrib': {'name': 'contrib',
-                     'mtype': '<class \'_LazyContribLoader\'>'},
-         'tools': {}},
+    '': {'tools': {}},
     'test.TestCase': {},
     'test.TestCase.failureException': {},
 }
diff --git a/tensorflow/tools/api/tests/api_compatibility_test.py b/tensorflow/tools/api/tests/api_compatibility_test.py
index 27865fdc89..acd119c730 100644
--- a/tensorflow/tools/api/tests/api_compatibility_test.py
+++ b/tensorflow/tools/api/tests/api_compatibility_test.py
@@ -196,7 +196,11 @@ class ApiCompatibilityTest(test.TestCase):
   def testAPIBackwardsCompatibility(self):
     # Extract all API stuff.
     visitor = python_object_to_proto_visitor.PythonObjectToProtoVisitor()
-    traverse.traverse(tf, public_api.PublicAPIVisitor(visitor))
+
+    public_api_visitor = public_api.PublicAPIVisitor(visitor)
+    public_api_visitor.do_not_descend_map[''].append('contrib')
+    traverse.traverse(tf, public_api_visitor)
+
     proto_dict = visitor.GetProtos()
 
     # Read all golden files.
diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 173b39c538..44c6f24e56 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -36,29 +36,35 @@ class PublicAPIVisitor(object):
     """
     self._visitor = visitor
 
-  # Modules/classes we do not want to descend into if we hit them. Usually,
-  # sytem modules exposed through platforms for compatibility reasons.
-  # Each entry maps a module path to a name to ignore in traversal.
-  _do_not_descend_map = {
-      '': [
-          'core',
-          'examples',
-          'flags',  # Don't add flags
-          'platform',  # TODO(drpng): This can be removed once sealed off.
-          'pywrap_tensorflow',  # TODO(drpng): This can be removed once sealed.
-          'user_ops',  # TODO(drpng): This can be removed once sealed.
-          'python',
-          'tools',
-          'tensorboard',
-      ],
-
-      # Some implementations have this internal module that we shouldn't expose.
-      'flags': ['cpp_flags'],
-
-      # Everything below here is legitimate.
-      'app': ['flags'],  # It'll stay, but it's not officially part of the API.
-      'test': ['mock'],  # Imported for compatibility between py2/3.
-  }
+    # Modules/classes we do not want to descend into if we hit them. Usually,
+    # sytem modules exposed through platforms for compatibility reasons.
+    # Each entry maps a module path to a name to ignore in traversal.
+    self._do_not_descend_map = {
+        '': [
+            'core',
+            'examples',
+            'flags',  # Don't add flags
+            # TODO(drpng): This can be removed once sealed off.
+            'platform',
+            # TODO(drpng): This can be removed once sealed.
+            'pywrap_tensorflow',
+            # TODO(drpng): This can be removed once sealed.
+            'user_ops',
+            'python',
+            'tools',
+            'tensorboard',
+        ],
+
+        # Some implementations have this internal module that we shouldn't
+        # expose.
+        'flags': ['cpp_flags'],
+
+        ## Everything below here is legitimate.
+        # It'll stay, but it's not officially part of the API.
+        'app': ['flags'],
+        # Imported for compatibility between py2/3.
+        'test': ['mock'],
+    }
 
   @property
   def do_not_descend_map(self):
diff --git a/tensorflow/tools/docs/build_docs_test.py b/tensorflow/tools/docs/build_docs_test.py
index 08c27729a7..d28dd93b9a 100644
--- a/tensorflow/tools/docs/build_docs_test.py
+++ b/tensorflow/tools/docs/build_docs_test.py
@@ -40,7 +40,6 @@ class BuildDocsTest(googletest.TestCase):
     doc_generator = generate_lib.DocGenerator()
 
     doc_generator.set_py_modules([('tf', tf), ('tfdbg', tf_debug)])
-    doc_generator.load_contrib()
 
     status = doc_generator.build(Flags())
 
diff --git a/tensorflow/tools/docs/generate.py b/tensorflow/tools/docs/generate.py
index 1a3bbcbf7a..1217cd331f 100644
--- a/tensorflow/tools/docs/generate.py
+++ b/tensorflow/tools/docs/generate.py
@@ -46,6 +46,5 @@ if __name__ == '__main__':
 
   # tf_debug is not imported with tf, it's a separate module altogether
   doc_generator.set_py_modules([('tf', tf), ('tfdbg', tf_debug)])
-  doc_generator.load_contrib()
 
   sys.exit(doc_generator.build(flags))
diff --git a/tensorflow/tools/docs/generate_1_0.py b/tensorflow/tools/docs/generate_1_0.py
index 97a37252a9..088f8f58dc 100644
--- a/tensorflow/tools/docs/generate_1_0.py
+++ b/tensorflow/tools/docs/generate_1_0.py
@@ -47,7 +47,6 @@ if __name__ == '__main__':
   # tf_debug is not imported with tf, it's a separate module altogether
   doc_generator.set_py_modules([('tf', tf), ('tfdbg', tf_debug)])
 
-  doc_generator.load_contrib()
   doc_generator.set_do_not_descend_map({
       '': ['cli', 'lib', 'wrappers'],
       'contrib': [
diff --git a/tensorflow/tools/docs/generate_lib.py b/tensorflow/tools/docs/generate_lib.py
index 640ddb6df8..e30cfa8053 100644
--- a/tensorflow/tools/docs/generate_lib.py
+++ b/tensorflow/tools/docs/generate_lib.py
@@ -439,19 +439,6 @@ class DocGenerator(object):
   def set_py_modules(self, py_modules):
     self._py_modules = py_modules
 
-  def load_contrib(self):
-    """Access something in contrib so tf.contrib is properly loaded."""
-    # Without this, it ends up hidden behind lazy loading.  Requires
-    # that the caller has already called set_py_modules().
-    if self._py_modules is None:
-      raise RuntimeError(
-          'Must call set_py_modules() before running load_contrib().')
-    for name, module in self._py_modules:
-      if name == 'tf':
-        _ = module.contrib.__name__
-        return True
-    return False
-
   def py_module_names(self):
     if self._py_modules is None:
       raise RuntimeError(
diff --git a/tensorflow/tools/docs/generate_lib_test.py b/tensorflow/tools/docs/generate_lib_test.py
index c8d4c3fe7e..49f7ff597e 100644
--- a/tensorflow/tools/docs/generate_lib_test.py
+++ b/tensorflow/tools/docs/generate_lib_test.py
@@ -56,7 +56,7 @@ class GenerateTest(googletest.TestCase):
 
   def test_extraction(self):
     py_modules = [('tf', tf), ('tfdbg', tf_debug)]
-    _ = tf.contrib.__name__  # Trigger loading of tf.contrib
+
     try:
       generate_lib.extract(
           py_modules, generate_lib._get_default_do_not_descend_map())
-- 
GitLab


From dbdfa337237ec4b34ac396ab1b067cb979965bb2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 06:31:25 -0800
Subject: [PATCH 0530/1563] Add `sparse_row_envelope` to array_ops. Change:
 153584620

---
 .../contrib/layers/python/ops/sparse_ops.py   | 41 ++++++++++++++++
 .../layers/python/ops/sparse_ops_test.py      | 49 +++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/tensorflow/contrib/layers/python/ops/sparse_ops.py b/tensorflow/contrib/layers/python/ops/sparse_ops.py
index 8c24f37d77..02a635a46a 100644
--- a/tensorflow/contrib/layers/python/ops/sparse_ops.py
+++ b/tensorflow/contrib/layers/python/ops/sparse_ops.py
@@ -23,6 +23,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.util import compat
 
 
 def _multiplier_helper(shape):
@@ -81,3 +82,43 @@ def dense_to_sparse_tensor(dense_tensor, ignore_value=None):
       flat_indices = math_ops.add(flat_indices, offsets)
     values = array_ops.gather(flat_tensor, flat_indices)
     return sparse_tensor.SparseTensor(indices, values, dense_shape)
+
+
+def sparse_row_envelope(sparse_input, row_axis=0, col_axis=1, name=None):
+  """Returns the length of each 'row' in a `SparseTensor`.
+
+  For example, if `sparse_input` has indices `[[0,0], [2, 0], [2, 1], [2, 2]]`
+  and shape `[3, 3]`, this function will return `[1, 0, 3]`.
+
+  Args:
+    sparse_input: a `SparseTensor` of rank at least 2.
+    row_axis: An integer. The axis for the row of the envelope matrix. Default
+      is 0.
+    col_axis: An integer. The axis for the col of the envelope matrix. Default
+      is 1.
+    name: A name for the operation (optional).
+
+  Returns:
+    A one-dimensional `Tensor` whose entries correspond to the length of each
+    row of `SparseTensor`.
+
+  Raises:
+    ValueError: If row_axis and col_axis are the same axis or they are not
+      integers.
+  """
+  if not (isinstance(row_axis, compat.integral_types) and
+          isinstance(col_axis, compat.integral_types)):
+    raise ValueError("`row_axis` and `col_axis` must be integers.")
+
+  if row_axis == col_axis:
+    raise ValueError("Row and column can not be the same axis.")
+
+  with ops.name_scope(name, "sparse_row_envelope", [sparse_input]):
+    indices = sparse_input.indices
+    row_indices = indices[:, row_axis]
+    col_indices = indices[:, col_axis]
+    num_rows = math_ops.cast(sparse_input.dense_shape[row_axis], dtypes.int32)
+    row_envelope = math_ops.unsorted_segment_max(
+        col_indices + 1, row_indices, num_rows, name=name)
+    zeros = array_ops.zeros_like(row_envelope)
+    return array_ops.where(row_envelope > zeros, row_envelope, zeros)
diff --git a/tensorflow/contrib/layers/python/ops/sparse_ops_test.py b/tensorflow/contrib/layers/python/ops/sparse_ops_test.py
index b27174e437..76c4ea599d 100644
--- a/tensorflow/contrib/layers/python/ops/sparse_ops_test.py
+++ b/tensorflow/contrib/layers/python/ops/sparse_ops_test.py
@@ -22,6 +22,7 @@ import numpy as np
 
 from tensorflow.contrib.layers.python.ops import sparse_ops
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
@@ -133,6 +134,54 @@ class SparseOpsTest(test.TestCase):
         tensor = array_ops.placeholder(dtype=dtypes.int32)
         sparse_ops.dense_to_sparse_tensor(tensor)
 
+  def test_sparse_row_envelope(self):
+    expected_sparse_row_envelope = [1, 0, 3]
+    with self.test_session() as sess:
+      sparse_input = sparse_tensor.SparseTensor(
+          indices=[[0, 0], [2, 0], [2, 1], [2, 2]],
+          values=[0, 1, 2, 3],
+          dense_shape=[3, 3])
+      sparse_row_envelope = sess.run(
+          sparse_ops.sparse_row_envelope(sparse_input))
+      self.assertAllEqual(expected_sparse_row_envelope,
+                          sparse_row_envelope)
+
+  def test_sparse_row_envelope_unsorted_indices(self):
+    expected_sparse_row_envelope = [1, 0, 3]
+    with self.test_session() as sess:
+      sparse_input = sparse_tensor.SparseTensor(
+          indices=[[2, 0], [2, 2], [2, 1], [0, 0]],
+          values=[0, 1, 2, 3],
+          dense_shape=[3, 3])
+      sparse_row_envelope = sess.run(
+          sparse_ops.sparse_row_envelope(sparse_input))
+      self.assertAllEqual(expected_sparse_row_envelope,
+                          sparse_row_envelope)
+
+  def test_sparse_row_envelope_empty_in_the_end(self):
+    expected_sparse_row_envelope = [1, 0, 3, 0, 0]
+    with self.test_session() as sess:
+      sparse_input = sparse_tensor.SparseTensor(
+          indices=[[0, 0], [2, 0], [2, 1], [2, 2]],
+          values=[0, 1, 2, 3],
+          dense_shape=[5, 3])
+      sparse_row_envelope = sess.run(
+          sparse_ops.sparse_row_envelope(sparse_input))
+      self.assertAllEqual(expected_sparse_row_envelope,
+                          sparse_row_envelope)
+
+  def test_sparse_row_envelope_empty_3d(self):
+    expected_sparse_row_envelope = [1, 0, 3, 0, 0]
+    with self.test_session() as sess:
+      sparse_input = sparse_tensor.SparseTensor(
+          indices=[[0, 0, 0], [0, 2, 0], [0, 2, 1], [0, 2, 2]],
+          values=[0, 1, 2, 3],
+          dense_shape=[1, 5, 3])
+      sparse_row_envelope = sess.run(
+          sparse_ops.sparse_row_envelope(sparse_input, 1, 2))
+      self.assertAllEqual(expected_sparse_row_envelope,
+                          sparse_row_envelope)
+
 
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From ba7f9a78c8e3117fecbe6e2f84dcd0cf0e0dc8ef Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 07:54:06 -0800
Subject: [PATCH 0531/1563] Improved seq2seq documentation.

Improved several docstrings.
Added an example in the guide.
Change: 153592069
---
 .../seq2seq/python/ops/basic_decoder.py       |  5 ++-
 .../contrib/seq2seq/python/ops/decoder.py     | 36 +++++++++++++++----
 .../contrib/seq2seq/python/ops/helper.py      | 10 ++++--
 .../api_guides/python/contrib.seq2seq.md      | 26 ++++++++++++++
 4 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py b/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
index d19e2b0d5e..e73a637027 100644
--- a/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
@@ -52,14 +52,13 @@ class BasicDecoder(decoder.Decoder):
       cell: An `RNNCell` instance.
       helper: A `Helper` instance.
       initial_state: A (possibly nested tuple of...) tensors and TensorArrays.
+        The initial state of the RNNCell.
       output_layer: (Optional) An instance of `tf.layers.Layer`, i.e.,
         `tf.layers.Dense`.  Optional layer to apply to the RNN output prior
         to storing the result or sampling.
 
     Raises:
-      TypeError: if `cell` is not an instance of `RNNCell`, `helper`
-        is not an instance of `Helper`, or `output_layer` is not an instance
-        of `tf.layers.Layer`.
+      TypeError: if `cell`, `helper` or `output_layer` have an incorrect type.
     """
     if not isinstance(cell, core_rnn_cell.RNNCell):
       raise TypeError("cell must be an RNNCell, received: %s" % type(cell))
diff --git a/tensorflow/contrib/seq2seq/python/ops/decoder.py b/tensorflow/contrib/seq2seq/python/ops/decoder.py
index 6338eb152e..94c9257943 100644
--- a/tensorflow/contrib/seq2seq/python/ops/decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/decoder.py
@@ -44,11 +44,22 @@ _transpose_batch_time = rnn._transpose_batch_time  # pylint: disable=protected-a
 
 @six.add_metaclass(abc.ABCMeta)
 class Decoder(object):
-  """An RNN Decoder abstract interface object."""
+  """An RNN Decoder abstract interface object.
+
+  Concepts used by this interface:
+  - `inputs`: (structure of) tensors and TensorArrays that is passed as input to
+    the RNNCell composing the decoder, at each time step.
+  - `state`: (structure of) tensors and TensorArrays that is passed to the
+    RNNCell instance as the state.
+  - `finished`: boolean tensor telling whether each sequence in the batch is
+    finished.
+  - `outputs`: Instance of BasicDecoderOutput. Result of the decoding, at each
+    time step.
+  """
 
   @property
   def batch_size(self):
-    """The batch size of the inputs returned by `sample`."""
+    """The batch size of input values."""
     raise NotImplementedError
 
   @property
@@ -65,11 +76,14 @@ class Decoder(object):
   def initialize(self, name=None):
     """Called before any decoding iterations.
 
+    This methods must compute initial input values and initial state.
+
     Args:
       name: Name scope for any created operations.
 
     Returns:
-      `(finished, first_inputs, initial_state)`.
+      `(finished, initial_inputs, initial_state)`: initial values of
+      'finished' flags, inputs and state.
     """
     raise NotImplementedError
 
@@ -78,13 +92,19 @@ class Decoder(object):
     """Called per step of decoding (but only once for dynamic decoding).
 
     Args:
-      time: Scalar `int32` tensor.
-      inputs: Input (possibly nested tuple of) tensor[s] for this time step.
-      state: State (possibly nested tuple of) tensor[s] from previous time step.
+      time: Scalar `int32` tensor. Current step number.
+      inputs: RNNCell input (possibly nested tuple of) tensor[s] for this time
+        step.
+      state: RNNCell state (possibly nested tuple of) tensor[s] from previous
+        time step.
       name: Name scope for any created operations.
 
     Returns:
-      `(outputs, next_state, next_inputs, finished)`.
+      `(outputs, next_state, next_inputs, finished)`: `outputs` is an instance
+      of BasicDecoderOutput, `next_state` is a (structure of) state tensors and
+      TensorArrays, `next_inputs` is the tensor that should be used as input for
+      the next step, `finished` is a boolean tensor telling whether the sequence
+      is complete, for each sequence in the batch.
     """
     raise NotImplementedError
 
@@ -114,6 +134,8 @@ def dynamic_decode(decoder,
                    scope=None):
   """Perform dynamic decoding with `decoder`.
 
+  Calls initialize() once and step() repeatedly on the Decoder object.
+
   Args:
     decoder: A `Decoder` instance.
     output_time_major: Python boolean.  Default: `False` (batch major).  If
diff --git a/tensorflow/contrib/seq2seq/python/ops/helper.py b/tensorflow/contrib/seq2seq/python/ops/helper.py
index e43d155608..e2d56063a2 100644
--- a/tensorflow/contrib/seq2seq/python/ops/helper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/helper.py
@@ -57,11 +57,17 @@ def _unstack_ta(inp):
 
 @six.add_metaclass(abc.ABCMeta)
 class Helper(object):
-  """Helper interface.  Helper instances are used by SamplingDecoder."""
+  """Interface for implementing sampling in seq2seq decoders.
+
+  Helper instances are used by `BasicDecoder`.
+  """
 
   @abc.abstractproperty
   def batch_size(self):
-    """Returns a scalar int32 tensor."""
+    """Batch size of tensor returned by `sample`.
+
+    Returns a scalar int32 tensor.
+    """
     raise NotImplementedError("batch_size has not been implemented")
 
   @abc.abstractmethod
diff --git a/tensorflow/docs_src/api_guides/python/contrib.seq2seq.md b/tensorflow/docs_src/api_guides/python/contrib.seq2seq.md
index 223bf4a0a3..2522e50c26 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.seq2seq.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.seq2seq.md
@@ -91,6 +91,32 @@ not a suggested device partitioning strategy.)
 
 ## Dynamic Decoding
 
+Example usage:
+
+``` python
+cell = # instance of RNNCell
+
+if mode == "train":
+  helper = tf.contrib.seq2seq.TrainingHelper(
+    input=input_vectors,
+    sequence_length=input_lengths)
+elif mode == "infer":
+  helper = tf.contrib.seq2seq.GreedyEmbeddingHelper(
+      embedding=embedding,
+      start_tokens=tf.tile([GO_SYMBOL], [batch_size]),
+      end_token=END_SYMBOL)
+
+decoder = tf.contrib.seq2seq.BasicDecoder(
+    cell=cell,
+    helper=helper,
+    initial_state=cell.zero_state(batch_size, tf.float32))
+outputs, _ = tf.contrib.seq2seq.dynamic_decode(
+   decoder=decoder,
+   output_time_major=False,
+   impute_finished=True,
+   maximum_iterations=20)
+```
+
 ### Decoder base class and functions
 *   @{tf.contrib.seq2seq.Decoder}
 *   @{tf.contrib.seq2seq.dynamic_decode}
-- 
GitLab


From cfc2ee91d19c36400774f253e45cafc1891243fd Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 19 Apr 2017 08:54:33 -0800
Subject: [PATCH 0532/1563] Made sure that the cost model corresponding to the
 initialization is exported to the caller Change: 153598764

---
 tensorflow/core/grappler/clusters/BUILD       |  4 ++-
 .../core/grappler/clusters/single_machine.cc  |  4 ++-
 .../grappler/clusters/single_machine_test.cc  | 30 +++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index bd02c1e75d..00ec279891 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -63,12 +63,14 @@ cc_test(
     args = ["--heap_check=local"],  # The GPU tracer leaks memory
     deps = [
         ":single_machine",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:scope",
         "//tensorflow/core:lib_proto_parsing",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
         "//tensorflow/core/grappler:grappler_item",
-        "//tensorflow/core/grappler:grappler_item_builder",
+        "//tensorflow/core/grappler:utils",
         "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
     ],
 )
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index a8319350c1..9e96cc1e91 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -104,7 +104,6 @@ Status SingleMachine::Run(const GraphDef& graph_def,
         for (auto node : *init_metadata_.mutable_cost_graph()->mutable_node()) {
           node.clear_compute_cost();
         }
-        metadata->MergeFrom(init_metadata_);
       }
       for (int i = 0; i < queue_runner_defs_.size(); ++i) {
         std::unique_ptr<QueueRunner> queue_runner;
@@ -128,7 +127,10 @@ Status SingleMachine::Run(const GraphDef& graph_def,
   }
 
   TF_RETURN_IF_ERROR(RunWithTimeout(feed, fetch, metadata));
+
   if (metadata) {
+    // Add the costs of initialization and the queue runners.
+    metadata->MergeFrom(init_metadata_);
     return coordinator_->ExportCostGraph(metadata->mutable_cost_graph());
   } else {
     return Status::OK();
diff --git a/tensorflow/core/grappler/clusters/single_machine_test.cc b/tensorflow/core/grappler/clusters/single_machine_test.cc
index 3b39e5be61..0572aa04be 100644
--- a/tensorflow/core/grappler/clusters/single_machine_test.cc
+++ b/tensorflow/core/grappler/clusters/single_machine_test.cc
@@ -14,10 +14,13 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/clusters/single_machine.h"
+#include "tensorflow/cc/framework/scope.h"
+#include "tensorflow/cc/ops/standard_ops.h"
 #include "tensorflow/core/framework/cost_graph.pb.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h"
+#include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/test.h"
 
@@ -129,6 +132,33 @@ TEST_F(SingleMachineTest, MultipleItems) {
   }
 }
 
+TEST_F(SingleMachineTest, InitializationMemory) {
+  // Build a variable and its initialization graph.
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  int batch_size = 10;
+  Output x =
+      ops::RandomNormal(s.WithOpName("x"), {batch_size, 1}, DataType::DT_FLOAT);
+  Output v = ops::Variable(s.WithOpName("v"), TensorShape({batch_size, 1}),
+                           DataType::DT_FLOAT);
+  Output init = ops::Assign(s.WithOpName("init"), v, x);
+
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  item.init_ops.push_back(init.name());
+  item.fetch.push_back(v.name());
+
+  TF_CHECK_OK(cluster_->Initialize(item));
+  RunMetadata metadata;
+  TF_CHECK_OK(cluster_->Run(item.graph, item.feed, item.fetch, &metadata));
+
+  // Check that the initialization op is present in the cost model.
+  bool found = false;
+  for (const auto& node : metadata.cost_graph().node()) {
+    found |= (node.name() == NodeName(init.name()));
+  }
+  EXPECT_TRUE(found);
+}
+
 }  // namespace
 }  // namespace grappler
 }  // namespace tensorflow
-- 
GitLab


From ef9a552282e24bcbc5dd2d590d986c09d9eef9b1 Mon Sep 17 00:00:00 2001
From: Frank Chen <frankchn@google.com>
Date: Wed, 19 Apr 2017 08:58:36 -0800
Subject: [PATCH 0533/1563] Add validation (via ValidateHostPortPair) for the
 target when a new GrpcChannel is created. This introduces a function
 signature change to NewHostPortGrpcChannel and a conversion utility function
 ConvertToChannelCreationFunction. Change: 153599270

---
 .../core/distributed_runtime/master_test.cc   |  5 ++-
 .../distributed_runtime/remote_device_test.cc |  4 +-
 .../distributed_runtime/rpc/grpc_channel.cc   | 43 +++++++++++++------
 .../distributed_runtime/rpc/grpc_channel.h    |  7 ++-
 .../rpc/grpc_channel_test.cc                  | 24 +++++++++--
 .../rpc/grpc_server_lib.cc                    |  4 +-
 .../distributed_runtime/rpc/grpc_session.cc   | 10 +++--
 .../rpc/grpc_session_test.cc                  |  4 +-
 8 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/master_test.cc b/tensorflow/core/distributed_runtime/master_test.cc
index 77c1537b54..121c58762f 100644
--- a/tensorflow/core/distributed_runtime/master_test.cc
+++ b/tensorflow/core/distributed_runtime/master_test.cc
@@ -49,8 +49,9 @@ class MasterTest : public ::testing::Test {
     (*options.config.mutable_device_count())["CPU"] = 1;
     (*options.config.mutable_device_count())["GPU"] = 0;
     TF_CHECK_OK(test::TestCluster::MakeTestCluster(options, 2, &cluster_));
-    master_ = grpc::MasterService::NewStub(
-        NewHostPortGrpcChannel(cluster_->targets()[0]));
+    SharedGrpcChannelPtr channel_ptr;
+    TF_CHECK_OK(NewHostPortGrpcChannel(cluster_->targets()[0], &channel_ptr));
+    master_ = grpc::MasterService::NewStub(channel_ptr);
   }
 
   std::unique_ptr<test::TestCluster> cluster_;
diff --git a/tensorflow/core/distributed_runtime/remote_device_test.cc b/tensorflow/core/distributed_runtime/remote_device_test.cc
index 20d8d19e3c..fd8f8c0f35 100644
--- a/tensorflow/core/distributed_runtime/remote_device_test.cc
+++ b/tensorflow/core/distributed_runtime/remote_device_test.cc
@@ -47,8 +47,10 @@ class RemoteDeviceTest : public ::testing::Test {
     const string& hostport = cluster_->targets()[0];
     GrpcChannelSpec spec;
     TF_CHECK_OK(spec.AddHostPortsJob("localhost", {hostport}));
+    ChannelCreationFunction channel_func =
+        ConvertToChannelCreationFunction(NewHostPortGrpcChannel);
     worker_cache_.reset(
-        NewGrpcWorkerCache(NewGrpcChannelCache(spec, NewHostPortGrpcChannel)));
+        NewGrpcWorkerCache(NewGrpcChannelCache(spec, channel_func)));
     remote_name_ = "/job:localhost/replica:0/task:0";
     wi_ = worker_cache_->CreateWorker(remote_name_);
   }
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_channel.cc b/tensorflow/core/distributed_runtime/rpc/grpc_channel.cc
index 73b26cc43b..bcd2c71f84 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_channel.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_channel.cc
@@ -42,20 +42,6 @@ string MakeAddress(const string& job, int task) {
   return strings::StrCat("/job:", job, "/replica:0/task:", task);
 }
 
-}  // namespace
-
-SharedGrpcChannelPtr NewHostPortGrpcChannel(const string& target) {
-  // TODO(mrry): Implement secure channels.
-  ::grpc::ChannelArguments args;
-  args.SetInt(GRPC_ARG_MAX_MESSAGE_LENGTH, std::numeric_limits<int32>::max());
-  // NOTE(mrry): Some versions of gRPC use a 20-second minimum backoff
-  // on connection failure, which makes our tests time out.
-  args.SetInt("grpc.testing.fixed_reconnect_backoff_ms", 1000);
-  return ::grpc::CreateCustomChannel(
-      target, ::grpc::InsecureChannelCredentials(), args);
-}
-
-namespace {
 Status ValidateHostPortPair(const string& host_port) {
   uint32 port;
   std::vector<string> parts = str_util::Split(host_port, ':');
@@ -69,6 +55,35 @@ Status ValidateHostPortPair(const string& host_port) {
 }
 }  // namespace
 
+Status NewHostPortGrpcChannel(const string& target,
+                              SharedGrpcChannelPtr* channel_pointer) {
+  // Minimally ensure that the target is valid
+  TF_RETURN_IF_ERROR(ValidateHostPortPair(target));
+
+  // TODO(mrry): Implement secure channels.
+  ::grpc::ChannelArguments args;
+  args.SetInt(GRPC_ARG_MAX_MESSAGE_LENGTH, std::numeric_limits<int32>::max());
+  // NOTE(mrry): Some versions of gRPC use a 20-second minimum backoff
+  // on connection failure, which makes our tests time out.
+  args.SetInt("grpc.testing.fixed_reconnect_backoff_ms", 1000);
+  *channel_pointer = ::grpc::CreateCustomChannel(
+      target, ::grpc::InsecureChannelCredentials(), args);
+  return Status::OK();
+}
+
+ChannelCreationFunction ConvertToChannelCreationFunction(
+    const std::function<Status(string, SharedGrpcChannelPtr*)>&
+        new_channel_func_ptr) {
+  return [new_channel_func_ptr](const string& target) -> SharedGrpcChannelPtr {
+    SharedGrpcChannelPtr channel_ptr;
+    if (new_channel_func_ptr(target, &channel_ptr).ok()) {
+      return channel_ptr;
+    } else {
+      return nullptr;
+    }
+  };
+}
+
 Status GrpcChannelSpec::AddHostPortsJob(const string& job_id,
                                         const std::vector<string>& host_ports) {
   std::map<int, string> host_ports_map;
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_channel.h b/tensorflow/core/distributed_runtime/rpc/grpc_channel.h
index 8d97523a5b..c662cde9be 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_channel.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_channel.h
@@ -84,7 +84,12 @@ GrpcChannelCache* NewGrpcChannelCache(const GrpcChannelSpec& channel_spec,
 
 // Below here are internal-only functions.
 
-SharedGrpcChannelPtr NewHostPortGrpcChannel(const string& target);
+ChannelCreationFunction ConvertToChannelCreationFunction(
+    const std::function<Status(string, SharedGrpcChannelPtr*)>&
+        new_channel_func_ptr);
+
+Status NewHostPortGrpcChannel(const string& target,
+                              SharedGrpcChannelPtr* channel_pointer);
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_channel_test.cc b/tensorflow/core/distributed_runtime/rpc/grpc_channel_test.cc
index 1d09b2ffb2..c975563a21 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_channel_test.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_channel_test.cc
@@ -59,8 +59,10 @@ TEST(GrpcChannelTest, HostPorts) {
   GrpcChannelSpec spec;
   TF_EXPECT_OK(spec.AddHostPortsJob(
       "mnist", {"a:1", "b:2", "c:3", "d:4", "e:5", "f:6"}));
-  std::unique_ptr<GrpcChannelCache> cc(
-      NewGrpcChannelCache(spec, NewHostPortGrpcChannel));
+  ChannelCreationFunction channel_func =
+      ConvertToChannelCreationFunction(NewHostPortGrpcChannel);
+  std::unique_ptr<GrpcChannelCache> cc(NewGrpcChannelCache(spec, channel_func));
+
   EXPECT_EQ(nullptr, cc->FindWorkerChannel("invalid_target"));
   EXPECT_EQ(nullptr, cc->FindWorkerChannel("/job:other/replica:0/task:0"));
   EXPECT_EQ(nullptr, cc->FindWorkerChannel("/job:mnist/replica:0/task:6"));
@@ -100,8 +102,10 @@ TEST(GrpcChannelTest, SparseHostPorts) {
   GrpcChannelSpec spec;
   TF_EXPECT_OK(
       spec.AddHostPortsJob("mnist", {{0, "a:1"}, {3, "d:4"}, {4, "e:5"}}));
-  std::unique_ptr<GrpcChannelCache> cc(
-      NewGrpcChannelCache(spec, NewHostPortGrpcChannel));
+  ChannelCreationFunction channel_func =
+      ConvertToChannelCreationFunction(NewHostPortGrpcChannel);
+  std::unique_ptr<GrpcChannelCache> cc(NewGrpcChannelCache(spec, channel_func));
+
   EXPECT_EQ(nullptr, cc->FindWorkerChannel("invalid_target"));
   EXPECT_EQ(nullptr, cc->FindWorkerChannel("/job:other/replica:0/task:0"));
   EXPECT_EQ(nullptr, cc->FindWorkerChannel("/job:mnist/replica:0/task:1"));
@@ -140,4 +144,16 @@ TEST(GrpcChannelTest, SparseHostPorts) {
             workers);
 }
 
+TEST(GrpcChannelTest, NewHostPortGrpcChannelValidation) {
+  SharedGrpcChannelPtr mock_ptr;
+
+  EXPECT_TRUE(NewHostPortGrpcChannel("127.0.0.1:2222", &mock_ptr).ok());
+  EXPECT_TRUE(NewHostPortGrpcChannel("example.com:2222", &mock_ptr).ok());
+  EXPECT_TRUE(NewHostPortGrpcChannel("fqdn.example.com.:2222", &mock_ptr).ok());
+
+  EXPECT_FALSE(NewHostPortGrpcChannel("example.com/abc:2222", &mock_ptr).ok());
+  EXPECT_FALSE(NewHostPortGrpcChannel("127.0.0.1:2222/", &mock_ptr).ok());
+  EXPECT_FALSE(NewHostPortGrpcChannel("example.com/abc:", &mock_ptr).ok());
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
index ffe54ab9fb..00d2870660 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
@@ -334,7 +334,9 @@ std::shared_ptr<::grpc::ServerCredentials> GrpcServer::GetServerCredentials(
 
 ChannelCreationFunction GrpcServer::GetChannelCreationFunction(
     const ServerDef& server_def) const {
-  return NewHostPortGrpcChannel;
+  // We can do this because SparseGrpcChannelCache is robust to nullptr being
+  // returned by the channel creation function
+  return ConvertToChannelCreationFunction(NewHostPortGrpcChannel);
 }
 
 std::unique_ptr<Master> GrpcServer::CreateMaster(MasterEnv* master_env) {
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_session.cc b/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
index 4e2f5de213..5df4209682 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
@@ -51,8 +51,9 @@ Status GrpcSession::Create(const SessionOptions& options,
     master = LocalMaster::Lookup(options.target);
   }
   if (!master) {
-    SharedGrpcChannelPtr master_channel =
-        NewHostPortGrpcChannel(options.target.substr(kSchemePrefixLength));
+    SharedGrpcChannelPtr master_channel;
+    TF_RETURN_IF_ERROR(NewHostPortGrpcChannel(
+        options.target.substr(kSchemePrefixLength), &master_channel));
     master.reset(NewGrpcMaster(master_channel));
   }
   ret->SetRemoteMaster(std::move(master));
@@ -344,8 +345,9 @@ void GrpcSession::SetRemoteMaster(std::unique_ptr<MasterInterface> master) {
 // Static method.
 Status GrpcSession::Reset(const SessionOptions& options,
                           const std::vector<string>& containers) {
-  SharedGrpcChannelPtr master_channel =
-      NewHostPortGrpcChannel(options.target.substr(kSchemePrefixLength));
+  SharedGrpcChannelPtr master_channel;
+  TF_RETURN_IF_ERROR(NewHostPortGrpcChannel(
+      options.target.substr(kSchemePrefixLength), &master_channel));
   auto master = NewGrpcMaster(master_channel);
   ResetRequest req;
   for (const auto& c : containers) req.add_container(c);
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc b/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc
index a6e9ce5e09..368468093e 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc
@@ -814,7 +814,7 @@ TEST(SessionTest, ExtendValidation) {
 // Tests that Create() with "operation_timeout_in_ms" set times out.
 TEST(SessionTest, CreateTimeoutWithSessionOptions) {
   // Creates a RemoteSession with "operation_timeout_in_ms" set to 100.
-  SessionOptions options = Options("example.org", 1);
+  SessionOptions options = Options("example.org:2222", 1);
   options.config.set_operation_timeout_in_ms(100);
   std::unique_ptr<Session> session(NewRemote(options));
 
@@ -832,7 +832,7 @@ TEST(SessionTest, CreateTimeoutWithSessionOptions) {
 
 // Tests that Create() with "timeout_in_ms" in RunOptions set times out.
 TEST(SessionTest, CreateTimeoutWithRunOptions) {
-  SessionOptions options = Options("example.org", 1);
+  SessionOptions options = Options("example.org:2222", 1);
   std::unique_ptr<Session> session(NewRemote(options));
 
   // Creates a long running op.
-- 
GitLab


From 1f210ad7c2a81fe27196dd1a85c9bb92f19bc94a Mon Sep 17 00:00:00 2001
From: Brennan Saeta <saeta@google.com>
Date: Wed, 19 Apr 2017 09:06:46 -0800
Subject: [PATCH 0534/1563] Rejigger locking in master_session &
 ReffedClientGraph

This change simplifies locking and avoids reader-writer contention
in MasterSession::Extend by allowing to execute without waiting
for all concurrent Execute calls to quiesce.

Fixes #9136
Change: 153600372
---
 .../distributed_runtime/master_session.cc     | 98 +++++++------------
 .../core/distributed_runtime/master_session.h |  2 +-
 tensorflow/python/training/server_lib_test.py | 16 +++
 3 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index e8e4b09c2c..b7c696dd14 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -73,25 +73,9 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
 
     stats_publisher_ = stats_publisher_factory(handle, bopts, session_opts);
 
-    // If this is a partial run we need to initialize a name to node map for
-    // testing that fetches are reachable.
-    if (is_partial) {
-      std::unordered_set<StringPiece, StringPiece::Hasher> names;
-      for (const string& input : bopts.feed_endpoints) {
-        TensorId id(ParseTensorName(input));
-        names.emplace(id.first);
-      }
-      for (const string& output : bopts.fetch_endpoints) {
-        TensorId id(ParseTensorName(output));
-        names.emplace(id.first);
-      }
-      // We use the graph from the execution_state because we want the graph
-      // nodes before they are rewritten replaced by the rewriter.
-      for (Node* n : execution_state->full_graph()->nodes()) {
-        if (names.count(n->name()) > 0) {
-          name_to_node_.insert({n->name(), n});
-        }
-      }
+    // Initialize a name to node map for testing that fetches are reachable.
+    for (Node* n : execution_state->full_graph()->nodes()) {
+      name_to_node_.insert({n->name(), n});
     }
   }
 
@@ -146,8 +130,9 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
       for (auto& p : partitions_) {
         LoggingResponse* resp = new LoggingResponse;
         p.worker->LoggingAsync(
-            &req, resp, [step_id, ss, resp, &scoped_mu, &waiting_for,
-                         &all_done](const Status& s) {
+            &req, resp,
+            [step_id, ss, resp, &scoped_mu, &waiting_for,
+             &all_done](const Status& s) {
               {
                 mutex_lock l(scoped_mu);
                 if (s.ok()) {
@@ -179,10 +164,8 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
 
   // Runs one step of all partitions.
   Status RunPartitions(const MasterEnv* env, int64 step_id,
-                       int64 execution_count,
-                       SimpleGraphExecutionState* execution_state,
-                       PerStepState* pss, CallOptions* opts,
-                       const RunStepRequestWrapper& req,
+                       int64 execution_count, PerStepState* pss,
+                       CallOptions* opts, const RunStepRequestWrapper& req,
                        MutableRunStepResponseWrapper* resp,
                        CancellationManager* cm, const bool is_last_partial_run);
 
@@ -192,11 +175,9 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
 
   // Post-processing of any runtime statistics gathered during execution.
   void ProcessStats(int64 step_id, PerStepState* pss,
-                    SimpleGraphExecutionState* execution_state,
                     ProfileHandler* ph, const RunOptions& options,
                     RunMetadata* resp);
   void ProcessDeviceStats(ProfileHandler* ph,
-                          const SimpleGraphExecutionState* execution_state,
                           const DeviceStepStats& ds, bool is_rpc);
   // Checks that the requested fetches can be computed from the provided feeds.
   Status CheckFetches(const RunStepRequestWrapper& req,
@@ -498,8 +479,7 @@ class RunManyGraphs {
 
 Status MasterSession::ReffedClientGraph::RunPartitions(
     const MasterEnv* env, int64 step_id, int64 execution_count,
-    SimpleGraphExecutionState* execution_state, PerStepState* pss,
-    CallOptions* call_opts, const RunStepRequestWrapper& req,
+    PerStepState* pss, CallOptions* call_opts, const RunStepRequestWrapper& req,
     MutableRunStepResponseWrapper* resp, CancellationManager* cm,
     const bool is_last_partial_run) {
   VLOG(2) << "RunPartitions step_id " << step_id << " execution_count "
@@ -723,10 +703,11 @@ void MasterSession::ReffedClientGraph::CleanupPartitionsAsync(
   }
 }
 
-void MasterSession::ReffedClientGraph::ProcessStats(
-    int64 step_id, PerStepState* pss,
-    SimpleGraphExecutionState* execution_state, ProfileHandler* ph,
-    const RunOptions& options, RunMetadata* resp) {
+void MasterSession::ReffedClientGraph::ProcessStats(int64 step_id,
+                                                    PerStepState* pss,
+                                                    ProfileHandler* ph,
+                                                    const RunOptions& options,
+                                                    RunMetadata* resp) {
   if (!pss->collect_costs && !pss->collect_timeline) return;
 
   // Out-of-band logging data is collected now, during post-processing.
@@ -738,13 +719,13 @@ void MasterSession::ReffedClientGraph::ProcessStats(
     const StepStats& ss = pss->step_stats[i];
     if (ph) {
       for (const auto& ds : ss.dev_stats()) {
-        ProcessDeviceStats(ph, execution_state, ds, false /*is_rpc*/);
+        ProcessDeviceStats(ph, ds, false /*is_rpc*/);
       }
     }
   }
   if (ph) {
     for (const auto& ds : pss->rpc_stats.dev_stats()) {
-      ProcessDeviceStats(ph, execution_state, ds, true /*is_rpc*/);
+      ProcessDeviceStats(ph, ds, true /*is_rpc*/);
     }
     ph->StepDone(pss->start_micros, pss->end_micros,
                  Microseconds(0) /*cleanup_time*/, 0 /*total_runops*/,
@@ -768,8 +749,7 @@ void MasterSession::ReffedClientGraph::ProcessStats(
 }
 
 void MasterSession::ReffedClientGraph::ProcessDeviceStats(
-    ProfileHandler* ph, const SimpleGraphExecutionState* execution_state,
-    const DeviceStepStats& ds, bool is_rpc) {
+    ProfileHandler* ph, const DeviceStepStats& ds, bool is_rpc) {
   const string& dev_name = ds.device();
   VLOG(1) << "Device " << dev_name << " reports stats for "
           << ds.node_stats_size() << " nodes";
@@ -780,7 +760,7 @@ void MasterSession::ReffedClientGraph::ProcessDeviceStats(
       ph->RecordOneOp(dev_name, ns, true /*is_copy*/, "", ns.node_name(),
                       ns.timeline_label());
     } else {
-      const Node* node = execution_state->get_node_by_name(ns.node_name());
+      const Node* node = name_to_node_[ns.node_name()];
       const bool found_node_in_graph = node != nullptr;
       if (!found_node_in_graph && ns.timeline_label().empty()) {
         // The counter incrementing is not thread-safe. But we don't really
@@ -815,6 +795,8 @@ void MasterSession::ReffedClientGraph::ProcessDeviceStats(
 // TODO(suharsh,mrry): Build a map from fetch target to set of feeds it depends
 // on once at setup time to prevent us from computing the dependencies
 // everytime.
+// TODO(suharshs,mrry): Consider removing the need for execution_state to reduce
+// contention.
 Status MasterSession::ReffedClientGraph::CheckFetches(
     const RunStepRequestWrapper& req, const RunState* run_state,
     SimpleGraphExecutionState* execution_state) {
@@ -1020,8 +1002,11 @@ Status MasterSession::Create(GraphDef* graph_def) {
   SimpleGraphExecutionStateOptions options;
   options.device_set = &devices_;
   options.session_options = &session_opts_;
-  TF_RETURN_IF_ERROR(SimpleGraphExecutionState::MakeForBaseGraph(
-      graph_def, options, &execution_state_));
+  {
+    mutex_lock l(mu_);
+    TF_RETURN_IF_ERROR(SimpleGraphExecutionState::MakeForBaseGraph(
+        graph_def, options, &execution_state_));
+  }
   return Status::OK();
 }
 
@@ -1035,15 +1020,6 @@ Status MasterSession::Extend(const ExtendSessionRequest* req,
       return errors::FailedPrecondition("Session is closed.");
     }
 
-    // TODO(mrry): Redesign the locking with reader/writer locks to prevent
-    //   starvation due to concurrent steps being issued. This is not
-    //   immediately important because we expect Extend to be used in
-    //   development/interactive exploration, and not during high-throughput
-    //   training.
-    while (num_running_ != 0) {
-      num_running_is_zero_.wait(l);
-    }
-
     if (graph_version_ != req->current_graph_version()) {
       return errors::Aborted("Current version is ", graph_version_,
                              " but caller expected ",
@@ -1289,8 +1265,11 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
   }
 
   // Ensure that the requested fetches can be computed from the provided feeds.
-  TF_RETURN_IF_ERROR(
-      run_state->rcg->CheckFetches(req, run_state, execution_state_.get()));
+  {
+    mutex_lock l(mu_);
+    TF_RETURN_IF_ERROR(
+        run_state->rcg->CheckFetches(req, run_state, execution_state_.get()));
+  }
 
   // Determine if this partial run satisfies all the pending inputs and ouputs.
   for (size_t i = 0; i < req.num_feeds(); ++i) {
@@ -1303,9 +1282,8 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
       (run_state->pending_inputs.empty() && run_state->pending_outputs.empty());
 
   Status s = run_state->rcg->RunPartitions(
-      env_, run_state->step_id, run_state->count, execution_state_.get(),
-      &run_state->pss, opts, req, resp, &cancellation_manager_,
-      is_last_partial_run);
+      env_, run_state->step_id, run_state->count, &run_state->pss, opts, req,
+      resp, &cancellation_manager_, is_last_partial_run);
 
   // Delete the run state if there is an error or all fetches are done.
   if (!s.ok() || is_last_partial_run) {
@@ -1313,8 +1291,7 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
     run_state->pss.end_micros = Env::Default()->NowMicros();
     // Schedule post-processing and cleanup to be done asynchronously.
     rcg->Ref();
-    rcg->ProcessStats(run_state->step_id, &run_state->pss,
-                      execution_state_.get(), run_state->ph.get(),
+    rcg->ProcessStats(run_state->step_id, &run_state->pss, run_state->ph.get(),
                       req.options(), resp->mutable_metadata());
     rcg->CleanupPartitionsAsync(
         run_state->step_id, [this, rcg, prun_handle](const Status& s) {
@@ -1373,15 +1350,14 @@ Status MasterSession::DoRunWithLocalExecution(
     pss.collect_rpcs = ph->should_collect_rpcs();
   }
 
-  Status s =
-      rcg->RunPartitions(env_, step_id, count, execution_state_.get(), &pss,
-                         opts, req, resp, &cancellation_manager_, false);
+  Status s = rcg->RunPartitions(env_, step_id, count, &pss, opts, req, resp,
+                                &cancellation_manager_, false);
   if (s.ok()) {
     pss.end_micros = Env::Default()->NowMicros();
 
     // Schedule post-processing and cleanup to be done asynchronously.
-    rcg->ProcessStats(step_id, &pss, execution_state_.get(), ph.get(),
-                      req.options(), resp->mutable_metadata());
+    rcg->ProcessStats(step_id, &pss, ph.get(), req.options(),
+                      resp->mutable_metadata());
   } else if (errors::IsCancelled(s)) {
     mutex_lock l(mu_);
     if (closed_) {
diff --git a/tensorflow/core/distributed_runtime/master_session.h b/tensorflow/core/distributed_runtime/master_session.h
index 8e0460bd14..c593f84f03 100644
--- a/tensorflow/core/distributed_runtime/master_session.h
+++ b/tensorflow/core/distributed_runtime/master_session.h
@@ -116,7 +116,7 @@ class MasterSession : public core::RefCounted {
   std::atomic<int64> partial_run_handle_counter_ = {0};
 
   mutex mu_;
-  std::unique_ptr<SimpleGraphExecutionState> execution_state_;
+  std::unique_ptr<SimpleGraphExecutionState> execution_state_ GUARDED_BY(mu_);
   int64 graph_version_;
 
   // We keep a map from a signature of a run request to the
diff --git a/tensorflow/python/training/server_lib_test.py b/tensorflow/python/training/server_lib_test.py
index 591488b60d..0a8ec4901c 100644
--- a/tensorflow/python/training/server_lib_test.py
+++ b/tensorflow/python/training/server_lib_test.py
@@ -34,6 +34,8 @@ from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
+from tensorflow.python.training import input as input_ops
+from tensorflow.python.training import queue_runner_impl
 from tensorflow.python.training import server_lib
 
 
@@ -225,6 +227,20 @@ class GrpcServerTest(test.TestCase):
       _ = server_lib.Server(
           {"local_2": [server.target[len("grpc://"):]]})
 
+  def testExtendAfterQueueRunners(self):
+    server = self._cached_server
+    with session.Session(server.target) as sess:
+      input_queue = input_ops.input_producer(constant_op.constant(
+          [0.], dtype=dtypes.float32))
+      self.assertIsNotNone(input_queue)
+
+      var = variables.Variable(1., dtype=dtypes.float32, trainable=False,
+                               name="var")
+
+      sess.run(variables.global_variables_initializer())
+      queue_runner_impl.start_queue_runners(sess)
+      sess.run(var.assign(3.0))
+
 
 class ServerDefTest(test.TestCase):
 
-- 
GitLab


From b663f5245e7d80417e653fa09104505190ed0789 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 09:33:08 -0800
Subject: [PATCH 0535/1563] Add _log_cdf method to distributions.Mixture.
 Change: 153603802

---
 .../python/kernel_tests/mixture_test.py       | 100 ++++++++++++++++++
 .../distributions/python/ops/mixture.py       |  13 +++
 2 files changed, 113 insertions(+)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mixture_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mixture_test.py
index e8ef52547d..aa523a9511 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mixture_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mixture_test.py
@@ -21,6 +21,8 @@ from __future__ import print_function
 import contextlib
 
 import numpy as np
+from scipy import stats
+
 from tensorflow.contrib import distributions
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
@@ -523,6 +525,104 @@ class MixtureTest(test.TestCase):
 
         self.assertAllClose(true_entropy_lower_bound, entropy_lower_bound_value)
 
+  def testCdfScalarUnivariate(self):
+    """Tests CDF against scipy for a mixture of seven gaussians."""
+    # Construct a mixture of gaussians with seven components.
+    n_components = 7
+
+    # pre-softmax mixture probabilities.
+    mixture_weight_logits = np.random.uniform(
+        low=-1, high=1, size=(n_components,)).astype(np.float32)
+
+    def _scalar_univariate_softmax(x):
+      e_x = np.exp(x - np.max(x))
+      return e_x / e_x.sum()
+
+    # Construct the distributions_py.Mixture object.
+    mixture_weights = _scalar_univariate_softmax(mixture_weight_logits)
+    means = [np.random.uniform(low=-10, high=10, size=()).astype(np.float32)
+             for _ in range(n_components)]
+    sigmas = [np.ones(shape=(), dtype=np.float32) for _ in range(n_components)]
+    cat_tf = distributions_py.Categorical(probs=mixture_weights)
+    components_tf = [distributions_py.Normal(loc=mu, scale=sigma)
+                     for (mu, sigma) in zip(means, sigmas)]
+    mixture_tf = distributions_py.Mixture(cat=cat_tf, components=components_tf)
+
+    x_tensor = array_ops.placeholder(shape=(), dtype=dtypes.float32)
+
+    # These are two test cases to verify.
+    xs_to_check = [
+        np.array(1.0, dtype=np.float32),
+        np.array(np.random.randn()).astype(np.float32)
+    ]
+
+    # Carry out the test for both d.cdf and exp(d.log_cdf).
+    x_cdf_tf = mixture_tf.cdf(x_tensor)
+    x_log_cdf_tf = mixture_tf.log_cdf(x_tensor)
+
+    with self.test_session() as sess:
+      for x_feed in xs_to_check:
+        x_cdf_tf_result, x_log_cdf_tf_result = sess.run(
+            [x_cdf_tf, x_log_cdf_tf], feed_dict={x_tensor: x_feed})
+
+        # Compute the cdf with scipy.
+        scipy_component_cdfs = [stats.norm.cdf(x=x_feed, loc=mu, scale=sigma)
+                                for (mu, sigma) in zip(means, sigmas)]
+        scipy_cdf_result = np.dot(mixture_weights,
+                                  np.array(scipy_component_cdfs))
+        self.assertAllClose(x_cdf_tf_result, scipy_cdf_result)
+        self.assertAllClose(np.exp(x_log_cdf_tf_result), scipy_cdf_result)
+
+  def testCdfBatchUnivariate(self):
+    """Tests against scipy for a (batch of) mixture(s) of seven gaussians."""
+    n_components = 7
+    batch_size = 5
+    mixture_weight_logits = np.random.uniform(
+        low=-1, high=1, size=(batch_size, n_components)).astype(np.float32)
+
+    def _batch_univariate_softmax(x):
+      e_x = np.exp(x)
+      e_x_sum = np.expand_dims(np.sum(e_x, axis=1), axis=1)
+      return e_x / np.tile(e_x_sum, reps=[1, x.shape[1]])
+
+    psize = (batch_size,)
+    mixture_weights = _batch_univariate_softmax(mixture_weight_logits)
+    means = [np.random.uniform(low=-10, high=10, size=psize).astype(np.float32)
+             for _ in range(n_components)]
+    sigmas = [np.ones(shape=psize, dtype=np.float32)
+              for _ in range(n_components)]
+    cat_tf = distributions_py.Categorical(probs=mixture_weights)
+    components_tf = [distributions_py.Normal(loc=mu, scale=sigma)
+                     for (mu, sigma) in zip(means, sigmas)]
+    mixture_tf = distributions_py.Mixture(cat=cat_tf, components=components_tf)
+
+    x_tensor = array_ops.placeholder(shape=psize, dtype=dtypes.float32)
+    xs_to_check = [
+        np.array([1.0, 5.9, -3, 0.0, 0.0], dtype=np.float32),
+        np.random.randn(batch_size).astype(np.float32)
+    ]
+
+    x_cdf_tf = mixture_tf.cdf(x_tensor)
+    x_log_cdf_tf = mixture_tf.log_cdf(x_tensor)
+
+    with self.test_session() as sess:
+      for x_feed in xs_to_check:
+        x_cdf_tf_result, x_log_cdf_tf_result = sess.run(
+            [x_cdf_tf, x_log_cdf_tf],
+            feed_dict={x_tensor: x_feed})
+
+        # Compute the cdf with scipy.
+        scipy_component_cdfs = [stats.norm.cdf(x=x_feed, loc=mu, scale=sigma)
+                                for (mu, sigma) in zip(means, sigmas)]
+        weights_and_cdfs = zip(np.transpose(mixture_weights, axes=[1, 0]),
+                               scipy_component_cdfs)
+        final_cdf_probs_per_component = [
+            np.multiply(c_p_value, d_cdf_value)
+            for (c_p_value, d_cdf_value) in weights_and_cdfs]
+        scipy_cdf_result = np.sum(final_cdf_probs_per_component, axis=0)
+        self.assertAllClose(x_cdf_tf_result, scipy_cdf_result)
+        self.assertAllClose(np.exp(x_log_cdf_tf_result), scipy_cdf_result)
+
 
 class MixtureBenchmark(test.Benchmark):
 
diff --git a/tensorflow/contrib/distributions/python/ops/mixture.py b/tensorflow/contrib/distributions/python/ops/mixture.py
index 6417d7bd6d..3e29ce7500 100644
--- a/tensorflow/contrib/distributions/python/ops/mixture.py
+++ b/tensorflow/contrib/distributions/python/ops/mixture.py
@@ -229,6 +229,19 @@ class Mixture(distribution.Distribution):
       log_sum_exp = math_ops.reduce_logsumexp(concat_log_probs, [0])
       return log_sum_exp
 
+  def _log_cdf(self, x):
+    with ops.control_dependencies(self._assertions):
+      x = ops.convert_to_tensor(x, name="x")
+      distribution_log_cdfs = [d.log_cdf(x) for d in self.components]
+      cat_log_probs = self._cat_probs(log_probs=True)
+      final_log_cdfs = [
+          cat_lp + d_lcdf
+          for (cat_lp, d_lcdf) in zip(cat_log_probs, distribution_log_cdfs)
+      ]
+      concatted_log_cdfs = array_ops.stack(final_log_cdfs, axis=0)
+      mixture_log_cdf = math_ops.reduce_logsumexp(concatted_log_cdfs, [0])
+      return mixture_log_cdf
+
   def _prob(self, x):
     return math_ops.exp(self._log_prob(x))
 
-- 
GitLab


From 2e307b457dfc4df1d82d568b71f9a796bd218084 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 19 Apr 2017 09:35:12 -0800
Subject: [PATCH 0536/1563] [TF:XLA] Avoid expanding large constants during
 compilation. Recognize constants that consist of a repeated scalar, and
 generate an XLA Broadcast of a scalar instead.

Split tf2xla/kernels/declaration_op.cc into two separate files (arg_op.cc and const_op.cc).
Change: 153604131
---
 tensorflow/compiler/tf2xla/kernels/BUILD      |   3 +-
 .../kernels/{declaration_op.cc => arg_op.cc}  |  52 --------
 .../compiler/tf2xla/kernels/const_op.cc       | 111 ++++++++++++++++++
 3 files changed, 113 insertions(+), 53 deletions(-)
 rename tensorflow/compiler/tf2xla/kernels/{declaration_op.cc => arg_op.cc} (56%)
 create mode 100644 tensorflow/compiler/tf2xla/kernels/const_op.cc

diff --git a/tensorflow/compiler/tf2xla/kernels/BUILD b/tensorflow/compiler/tf2xla/kernels/BUILD
index 14d2a72f7c..81b065689d 100644
--- a/tensorflow/compiler/tf2xla/kernels/BUILD
+++ b/tensorflow/compiler/tf2xla/kernels/BUILD
@@ -14,6 +14,7 @@ tf_kernel_library(
     name = "xla_ops",
     srcs = [
         "aggregate_ops.cc",
+        "arg_op.cc",
         "batch_matmul_op.cc",
         "batchtospace_op.cc",
         "bcast_ops.cc",
@@ -21,9 +22,9 @@ tf_kernel_library(
         "binary_ops.cc",
         "cast_op.cc",
         "concat_op.cc",
+        "const_op.cc",
         "conv_ops.cc",
         "cwise_ops.cc",
-        "declaration_op.cc",
         "depthwise_conv_ops.cc",
         "diag_op.cc",
         "dynamic_stitch_op.cc",
diff --git a/tensorflow/compiler/tf2xla/kernels/declaration_op.cc b/tensorflow/compiler/tf2xla/kernels/arg_op.cc
similarity index 56%
rename from tensorflow/compiler/tf2xla/kernels/declaration_op.cc
rename to tensorflow/compiler/tf2xla/kernels/arg_op.cc
index be2ce03801..d6897d6e33 100644
--- a/tensorflow/compiler/tf2xla/kernels/declaration_op.cc
+++ b/tensorflow/compiler/tf2xla/kernels/arg_op.cc
@@ -23,58 +23,6 @@ limitations under the License.
 namespace tensorflow {
 namespace {
 
-// This OpKernel implements the Constant Op for XLA JIT
-// devices. It extracts the constant Tensor from the Proto at kernel
-// construction time, and then every time the Constant Op is executed
-// an expression containing the constant is compiled.
-class ConstantDeclarationOp : public XlaOpKernel {
- public:
-  explicit ConstantDeclarationOp(OpKernelConstruction* ctx)
-      : XlaOpKernel(ctx), tensor_(ctx->output_type(0)) {
-    const TensorProto* proto = nullptr;
-    OP_REQUIRES_OK(ctx, ctx->GetAttr("value", &proto));
-    // MakeTensorFromProto uses the cpu_allocator, so tensor_ is a
-    // "real" tensor backed by CPU memory, holding the value of the
-    // constant.
-    OP_REQUIRES_OK(ctx, MakeTensorFromProto(*proto, &tensor_));
-    OP_REQUIRES(
-        ctx, ctx->output_type(0) == tensor_.dtype(),
-        errors::InvalidArgument(
-            "Type mismatch between value (", DataTypeString(tensor_.dtype()),
-            ") and dtype (", DataTypeString(ctx->output_type(0)), ")"));
-  }
-
-  void Compile(XlaOpKernelContext* ctx) override {
-    ctx->SetConstantOutput(0, tensor_);
-  }
-
- private:
-  // Extract the value of the constant from the Proto during Op kernel
-  // construction. The constant must be stored in a Tensor allocated
-  // using the cpu_allocator so that it is backed by real memory. The
-  // OpKernelConstruction's default allocator is the JITAllocator
-  // which only allocates enough space for metadata for each Tensor.
-  static Status MakeTensorFromProto(const TensorProto& tensor_proto,
-                                    Tensor* tensor) {
-    Tensor parsed(tensor_proto.dtype());
-    if (!parsed.FromProto(cpu_allocator(), tensor_proto)) {
-      return errors::InvalidArgument("Cannot parse tensor from proto: ",
-                                     tensor_proto.DebugString());
-    }
-    *tensor = parsed;
-    return Status::OK();
-  }
-
-  // This is a "real" tensor backed by CPU memory, containing the
-  // constant values.
-  Tensor tensor_;
-  TF_DISALLOW_COPY_AND_ASSIGN(ConstantDeclarationOp);
-};
-
-// XLA_* devices also register a "real" Identity operator so we suppress the
-// dummy operator using CompilationOnly().
-REGISTER_XLA_OP(Name("Const").CompilationOnly(), ConstantDeclarationOp);
-
 // This OpKernel implements the _Arg Op for XLA JIT devices. It
 // associates its output with one of the arguments to a
 // subcomputation.
diff --git a/tensorflow/compiler/tf2xla/kernels/const_op.cc b/tensorflow/compiler/tf2xla/kernels/const_op.cc
new file mode 100644
index 0000000000..ad676e7a2b
--- /dev/null
+++ b/tensorflow/compiler/tf2xla/kernels/const_op.cc
@@ -0,0 +1,111 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/tf2xla/type_util.h"
+#include "tensorflow/compiler/tf2xla/xla_compiler.h"
+#include "tensorflow/compiler/tf2xla/xla_op_kernel.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
+#include "tensorflow/core/framework/kernel_def_builder.h"
+
+namespace tensorflow {
+namespace {
+
+class ConstOp : public XlaOpKernel {
+ public:
+  explicit ConstOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {
+    const TensorProto* proto = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("value", &proto));
+    proto_ = *proto;
+    OP_REQUIRES(
+        ctx, ctx->output_type(0) == proto_.dtype(),
+        errors::InvalidArgument("Type mismatch between value (",
+                                DataTypeString(proto_.dtype()), ") and dtype (",
+                                DataTypeString(ctx->output_type(0)), ")"));
+    OP_REQUIRES_OK(ctx, TensorShape::IsValidShape(proto_.tensor_shape()));
+  }
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    TensorShape shape(proto_.tensor_shape());
+
+    xla::ComputationBuilder* b = ctx->builder();
+
+    // To avoid blowups for large constants filled with the same value,
+    // recognize that case and emit a scalar broadcast instead.
+    if (shape.num_elements() > 1) {
+      switch (proto_.dtype()) {
+        case DT_BOOL:
+          if (proto_.bool_val_size() == 1) {
+            ctx->SetOutput(0,
+                           b->Broadcast(b->ConstantR0<bool>(proto_.bool_val(0)),
+                                        shape.dim_sizes()));
+            return;
+          }
+          break;
+        case DT_FLOAT:
+          if (proto_.float_val_size() == 1) {
+            ctx->SetOutput(
+                0, b->Broadcast(b->ConstantR0<float>(proto_.float_val(0)),
+                                shape.dim_sizes()));
+            return;
+          }
+          break;
+        case DT_DOUBLE:
+          if (proto_.double_val_size() == 1) {
+            ctx->SetOutput(
+                0, b->Broadcast(b->ConstantR0<double>(proto_.double_val(0)),
+                                shape.dim_sizes()));
+            return;
+          }
+          break;
+        case DT_INT32:
+          if (proto_.int_val_size() == 1) {
+            ctx->SetOutput(0,
+                           b->Broadcast(b->ConstantR0<int32>(proto_.int_val(0)),
+                                        shape.dim_sizes()));
+            return;
+          }
+          break;
+        case DT_INT64:
+          if (proto_.int64_val_size() == 1) {
+            ctx->SetOutput(
+                0, b->Broadcast(b->ConstantR0<int64>(proto_.int64_val(0)),
+                                shape.dim_sizes()));
+            return;
+          }
+          break;
+        default:
+          break;
+      }
+    }
+
+    // General case
+    Tensor tensor(proto_.dtype());
+    OP_REQUIRES(ctx, tensor.FromProto(cpu_allocator(), proto_),
+                errors::InvalidArgument("Cannot parse tensor from proto: ",
+                                        proto_.DebugString()));
+    ctx->SetConstantOutput(0, tensor);
+  }
+
+ private:
+  TensorProto proto_;
+  TF_DISALLOW_COPY_AND_ASSIGN(ConstOp);
+};
+
+// XLA_* devices also register a "real" Const operator so we suppress the
+// dummy operator using CompilationOnly().
+REGISTER_XLA_OP(Name("Const").CompilationOnly(), ConstOp);
+
+}  // namespace
+}  // namespace tensorflow
-- 
GitLab


From 779aae1211204422636f468e8fcbbf3a1ab632db Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Wed, 19 Apr 2017 09:58:27 -0800
Subject: [PATCH 0537/1563] [tf contrib rnn] Bugfix: DeviceWrapper's zero_state
 gets created on self.device. Change: 153607222

---
 .../python/kernel_tests/core_rnn_cell_test.py | 29 +++++++++++++++++++
 .../rnn/python/ops/core_rnn_cell_impl.py      |  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
index 697f803b24..f10db377c3 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
@@ -27,6 +27,7 @@ import numpy as np
 
 from tensorflow.contrib.rnn.python.ops import core_rnn_cell_impl
 from tensorflow.contrib.rnn.python.ops.core_rnn_cell_impl import _linear as linear
+from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -340,6 +341,34 @@ class RNNCellTest(test.TestCase):
       outputs, _ = cell(x, m)
       self.assertTrue("cpu:14159" in outputs.device.lower())
 
+  def testDeviceWrapperDynamicExecutionNodesAreAllProperlyLocated(self):
+    if not test.is_gpu_available():
+      # Can't perform this test w/o a GPU
+      return
+
+    with self.test_session(use_gpu=True) as sess:
+      with variable_scope.variable_scope(
+          "root", initializer=init_ops.constant_initializer(0.5)):
+        x = array_ops.zeros([1, 1, 3])
+        cell = core_rnn_cell_impl.DeviceWrapper(
+            core_rnn_cell_impl.GRUCell(3), "/gpu:0")
+        with ops.device("/cpu:0"):
+          outputs, _ = rnn.dynamic_rnn(
+              cell=cell, inputs=x, dtype=dtypes.float32)
+        run_metadata = config_pb2.RunMetadata()
+        opts = config_pb2.RunOptions(
+            trace_level=config_pb2.RunOptions.FULL_TRACE)
+
+        sess.run([variables_lib.global_variables_initializer()])
+        _ = sess.run(outputs, options=opts, run_metadata=run_metadata)
+
+      step_stats = run_metadata.step_stats
+      ix = 0 if "gpu" in step_stats.dev_stats[0].device else 1
+      gpu_stats = step_stats.dev_stats[ix].node_stats
+      cpu_stats = step_stats.dev_stats[1 - ix].node_stats
+      self.assertEmpty([s for s in cpu_stats if "gru_cell" in s.node_name])
+      self.assertNotEmpty([s for s in gpu_stats if "gru_cell" in s.node_name])
+
   def testUsingSecondCellInScopeWithExistingVariablesFails(self):
     # This test should go away when this behavior is no longer an
     # error (Approx. May 2017)
diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index d828a337f3..3d1b482afd 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -811,7 +811,8 @@ class DeviceWrapper(RNNCell):
 
   def zero_state(self, batch_size, dtype):
     with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
-      return self._cell.zero_state(batch_size, dtype)
+      with ops.device(self._device):
+        return self._cell.zero_state(batch_size, dtype)
 
   def __call__(self, inputs, state, scope=None):
     """Run the cell on specified device."""
-- 
GitLab


From b4ca33dbc708b778cf170c47342a963335eb5956 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 10:00:27 -0800
Subject: [PATCH 0538/1563] Disable invalid buffer forwarding in GPU kernel for
 matrix_triangular_solve. Extend test coverage to include 1x1 matrices and
 placeholders. Change: 153607435

---
 .../kernels/matrix_triangular_solve_op.cc     | 69 +++++++------------
 .../matrix_triangular_solve_op_test.py        | 42 +++++++----
 2 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/tensorflow/core/kernels/matrix_triangular_solve_op.cc b/tensorflow/core/kernels/matrix_triangular_solve_op.cc
index 32aa7a8008..8017672119 100644
--- a/tensorflow/core/kernels/matrix_triangular_solve_op.cc
+++ b/tensorflow/core/kernels/matrix_triangular_solve_op.cc
@@ -124,12 +124,25 @@ class MatrixTriangularSolveOp : public LinearAlgebraOp<Scalar> {
   TF_DISALLOW_COPY_AND_ASSIGN(MatrixTriangularSolveOp);
 };
 
+REGISTER_LINALG_OP_CPU("MatrixTriangularSolve",
+                       (MatrixTriangularSolveOp<float>), float);
+REGISTER_LINALG_OP_CPU("MatrixTriangularSolve",
+                       (MatrixTriangularSolveOp<double>), double);
+REGISTER_LINALG_OP_CPU("BatchMatrixTriangularSolve",
+                       (MatrixTriangularSolveOp<float>), float);
+REGISTER_LINALG_OP_CPU("BatchMatrixTriangularSolve",
+                       (MatrixTriangularSolveOp<double>), double);
 
 #ifdef GOOGLE_CUDA
+
+// TODO(rmlarsen): Re-factor to
+// 1. Enable buffer forwarding from rhs->out.
+// 2. Save Memcpy when buffer forwarding is used.
+// 3. Copy entire rhs in a single Memcpy when forwarding is not used.
 template <class Scalar>
 class MatrixTriangularSolveOpGPU : public LinearAlgebraOp<Scalar> {
  public:
-  typedef LinearAlgebraOp<Scalar> Base;
+  INHERIT_LINALG_TYPEDEFS(Scalar);
 
   explicit MatrixTriangularSolveOpGPU(OpKernelConstruction* context)
       : Base(context), lower_(true), adjoint_(false) {
@@ -137,13 +150,6 @@ class MatrixTriangularSolveOpGPU : public LinearAlgebraOp<Scalar> {
     OP_REQUIRES_OK(context, context->GetAttr("adjoint", &adjoint_));
   }
 
-  using TensorShapes = typename Base::TensorShapes;
-  using Matrix = typename Base::Matrix;
-  using MatrixMap = typename Base::MatrixMap;
-  using MatrixMaps = typename Base::MatrixMaps;
-  using ConstMatrixMap = typename Base::ConstMatrixMap;
-  using ConstMatrixMaps = typename Base::ConstMatrixMaps;
-
   virtual void ValidateInputMatrixShapes(
       OpKernelContext* context,
       const TensorShapes& input_matrix_shapes) const final {
@@ -166,6 +172,8 @@ class MatrixTriangularSolveOpGPU : public LinearAlgebraOp<Scalar> {
                                                   : static_cast<int64>(cost);
   }
 
+  bool EnableInputForwarding() const final { return false; }
+
   void ComputeMatrix(OpKernelContext* context, const ConstMatrixMaps& inputs,
                      MatrixMaps* outputs) final {
     const ConstMatrixMap& matrix = inputs[0];
@@ -186,7 +194,7 @@ class MatrixTriangularSolveOpGPU : public LinearAlgebraOp<Scalar> {
     uint64 rhs_elems = rhs.rows() * rhs.cols();
     bool copy_status =
         stream->ThenMemcpyD2D(&out_ptr, rhs_ptr, sizeof(Scalar) * rhs_elems)
-        .ok();
+            .ok();
     if (!copy_status) {
       context->SetStatus(
           errors::Internal("Failed to copy rhs into output before solve"));
@@ -236,41 +244,16 @@ class MatrixTriangularSolveOpGPU : public LinearAlgebraOp<Scalar> {
 
   TF_DISALLOW_COPY_AND_ASSIGN(MatrixTriangularSolveOpGPU);
 };
-#endif  // GOOGLE_CUDA
 
-REGISTER_LINALG_OP("MatrixTriangularSolve", (MatrixTriangularSolveOp<float>),
-                   float);
-REGISTER_LINALG_OP("MatrixTriangularSolve", (MatrixTriangularSolveOp<double>),
-                   double);
-REGISTER_LINALG_OP("BatchMatrixTriangularSolve",
-                   (MatrixTriangularSolveOp<float>), float);
-REGISTER_LINALG_OP("BatchMatrixTriangularSolve",
-                   (MatrixTriangularSolveOp<double>), double);
+REGISTER_LINALG_OP_GPU("MatrixTriangularSolve",
+                       (MatrixTriangularSolveOpGPU<float>), float);
+REGISTER_LINALG_OP_GPU("MatrixTriangularSolve",
+                       (MatrixTriangularSolveOpGPU<double>), double);
+REGISTER_LINALG_OP_GPU("BatchMatrixTriangularSolve",
+                       (MatrixTriangularSolveOpGPU<float>), float);
+REGISTER_LINALG_OP_GPU("BatchMatrixTriangularSolve",
+                       (MatrixTriangularSolveOpGPU<double>), double);
 
-#ifdef GOOGLE_CUDA
-REGISTER_KERNEL_BUILDER(
-    Name("MatrixTriangularSolve")
-        .Device(DEVICE_GPU)
-        .TypeConstraint<float>("T"),
-    MatrixTriangularSolveOpGPU<float>);
-
-REGISTER_KERNEL_BUILDER(
-    Name("MatrixTriangularSolve")
-        .Device(DEVICE_GPU)
-        .TypeConstraint<double>("T"),
-    MatrixTriangularSolveOpGPU<double>);
-
-REGISTER_KERNEL_BUILDER(
-    Name("BatchMatrixTriangularSolve")
-        .Device(DEVICE_GPU)
-        .TypeConstraint<float>("T"),
-    MatrixTriangularSolveOpGPU<float>);
-
-REGISTER_KERNEL_BUILDER(
-    Name("BatchMatrixTriangularSolve")
-        .Device(DEVICE_GPU)
-        .TypeConstraint<double>("T"),
-    MatrixTriangularSolveOpGPU<double>);
-#endif  //GOOGLE_CUDA
+#endif  // GOOGLE_CUDA
 
 }  // namespace tensorflow
diff --git a/tensorflow/python/kernel_tests/matrix_triangular_solve_op_test.py b/tensorflow/python/kernel_tests/matrix_triangular_solve_op_test.py
index cdf828f3ca..262c197480 100644
--- a/tensorflow/python/kernel_tests/matrix_triangular_solve_op_test.py
+++ b/tensorflow/python/kernel_tests/matrix_triangular_solve_op_test.py
@@ -20,6 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
+from tensorflow.python.framework import constant_op
+from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.platform import test
 
@@ -27,16 +29,16 @@ from tensorflow.python.platform import test
 class MatrixTriangularSolveOpTest(test.TestCase):
 
   def _verifySolveAllWays(self, x, y, batch_dims=None):
-    for use_gpu in True, False:
-      for lower in True, False:
-        for adjoint in True, False:
+    for lower in True, False:
+      for adjoint in True, False:
+        for use_placeholder in True, False:
           self._verifySolve(
               x,
               y,
               lower=lower,
               adjoint=adjoint,
               batch_dims=batch_dims,
-              use_gpu=use_gpu)
+              use_placeholder=use_placeholder)
 
   def _verifySolve(self,
                    x,
@@ -44,7 +46,7 @@ class MatrixTriangularSolveOpTest(test.TestCase):
                    lower=True,
                    adjoint=False,
                    batch_dims=None,
-                   use_gpu=False):
+                   use_placeholder=False):
     for np_type in [np.float32, np.float64]:
       a = x.astype(np_type)
       b = y.astype(np_type)
@@ -64,16 +66,30 @@ class MatrixTriangularSolveOpTest(test.TestCase):
         a_np = np.tile(a_np, batch_dims + [1, 1])
         b = np.tile(b, batch_dims + [1, 1])
 
-      with self.test_session(use_gpu=use_gpu):
-        tf_ans = linalg_ops.matrix_triangular_solve(
-            a, b, lower=lower, adjoint=adjoint)
-        out = tf_ans.eval()
-        np_ans = np.linalg.solve(a_np, b)
-        self.assertEqual(np_ans.shape, tf_ans.get_shape())
-        self.assertEqual(np_ans.shape, out.shape)
-        self.assertAllClose(np_ans, out)
+      with self.test_session(use_gpu=True) as sess:
+        if use_placeholder:
+          a_tf = array_ops.placeholder(a.dtype)
+          b_tf = array_ops.placeholder(b.dtype)
+          tf_ans = linalg_ops.matrix_triangular_solve(
+              a_tf, b_tf, lower=lower, adjoint=adjoint)
+          tf_val = sess.run(tf_ans, feed_dict={a_tf: a, b_tf: b})
+          np_ans = np.linalg.solve(a_np, b)
+        else:
+          a_tf = constant_op.constant(a)
+          b_tf = constant_op.constant(b)
+          tf_ans = linalg_ops.matrix_triangular_solve(
+              a_tf, b_tf, lower=lower, adjoint=adjoint)
+          tf_val = tf_ans.eval()
+          np_ans = np.linalg.solve(a_np, b)
+          self.assertEqual(np_ans.shape, tf_ans.get_shape())
+        self.assertEqual(np_ans.shape, tf_val.shape)
+        self.assertAllClose(np_ans, tf_val)
 
   def testSolve(self):
+    # 1x1 matrix, single rhs.
+    matrix = np.array([[0.1]])
+    rhs0 = np.array([[1.]])
+    self._verifySolveAllWays(matrix, rhs0)
     # 2x2 matrices, single right-hand side.
     matrix = np.array([[1., 2.], [3., 4.]])
     rhs0 = np.array([[1.], [1.]])
-- 
GitLab


From c0f6357c4a080edb10dd089151dd523834ea80fc Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 10:21:48 -0800
Subject: [PATCH 0539/1563] [TF-XLA] Preserve op names when instantiating
 TensorFlow functions.

o Introduced a helper class for instantiating functions.
o Still use index to track new nodes but also build a side index that keeps the
  actual node names.
o Use indexes to store node inputs when building the graph and only add the actual node inputs (as strings) after all nodes are instantiated.
Change: 153610547
---
 .../core/common_runtime/function_test.cc      | 130 ++---
 tensorflow/core/framework/function.cc         | 511 ++++++++++--------
 tensorflow/core/framework/function_test.cc    |  62 +--
 tensorflow/python/framework/function_test.py  |   4 +-
 4 files changed, 386 insertions(+), 321 deletions(-)

diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index f86a8ed5dc..29ce157349 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -700,14 +700,14 @@ TEST(OptimizationTest, RemoveDeadNodes) {
        // y = Add<T>(a, o)
        {{"y"}, "Add", {"a", "o"}, {{"T", T}}}});
   const char* e0 = R"S(
-(n0:int32) -> (n7:int32) {
-  n2 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  n6 = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](n2)
-  n3 = Add[T=int32](n2, n2)
-  n1 = Square[T=int32](n0)
-  n7 = Add[T=int32](n1, n2)
-  n4 = Mul[T=int32](n1, n3)
-  n5 = Mul[T=int32](n3, n4)
+(x:int32) -> (y:int32) {
+  o = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
+  keep_me = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](o)
+  x1 = Add[T=int32](o, o)
+  a = Square[T=int32](x)
+  y = Add[T=int32](a, o)
+  x2 = Mul[T=int32](a, x1)
+  x3 = Mul[T=int32](x1, x2)
 }
 )S";
   EXPECT_EQ(Optimize(DoNothing, func), e0);
@@ -735,19 +735,19 @@ TEST(OptimizationTest, RemoveIdentityNodes_Ref) {
        // returns v + v
        {{"ret"}, "Add", {"v_read", "v_read"}, {{"T", T}}}});
   const char* e0 = R"S(
-() -> (n2:float) {
-  n0 = VariableV2[container="", dtype=float, shape=[], shared_name=""]()
-  n1 = Identity[T=float](n0)
-  n2 = Add[T=float](n1, n1)
+() -> (ret:float) {
+  v = VariableV2[container="", dtype=float, shape=[], shared_name=""]()
+  v_read = Identity[T=float](v)
+  ret = Add[T=float](v_read, v_read)
 }
 )S";
   EXPECT_EQ(Optimize(DoNothing, func), e0);
 
   const char* e1 = R"S(
-() -> (n2:float) {
-  n0 = VariableV2[container="", dtype=float, shape=[], shared_name=""]()
-  n1 = Identity[T=float](n0)
-  n2 = Add[T=float](n1, n1)
+() -> (ret:float) {
+  v = VariableV2[container="", dtype=float, shape=[], shared_name=""]()
+  v_read = Identity[T=float](v)
+  ret = Add[T=float](v_read, v_read)
 }
 )S";
   EXPECT_EQ(Optimize(::tensorflow::RemoveIdentityNodes, func), e1);
@@ -782,24 +782,24 @@ TEST(OptimizationTest, RemoveIdentityNodes) {
        // y = Add<T>(a, o)
        {{"y"}, "Add", {"a", "o"}, {{"T", T}}}});
   const char* e0 = R"S(
-(n0:int32) -> (n7:int32) {
-  n2 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  n1 = Square[T=int32](n0)
-  n7 = Add[T=int32](n1, n2)
-  n3 = Identity[T=int32](n1)
-  n4 = Identity[T=int32](n3)
-  n5 = Identity[T=int32](n4)
-  n6 = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](n2) @ n5
+(x:int32) -> (y:int32) {
+  o = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
+  a = Square[T=int32](x)
+  y = Add[T=int32](a, o)
+  x1 = Identity[T=int32](a)
+  x2 = Identity[T=int32](x1)
+  x3 = Identity[T=int32](x2)
+  keep_me = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](o) @ x3
 }
 )S";
   EXPECT_EQ(Optimize(DoNothing, func), e0);
 
   const char* e1 = R"S(
-(n0:int32) -> (n7:int32) {
-  n2 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  n1 = Square[T=int32](n0)
-  n7 = Add[T=int32](n1, n2)
-  n6 = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](n2) @ n1
+(x:int32) -> (y:int32) {
+  o = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
+  a = Square[T=int32](x)
+  y = Add[T=int32](a, o)
+  keep_me = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](o) @ a
 }
 )S";
   EXPECT_EQ(Optimize(::tensorflow::RemoveIdentityNodes, func), e1);
@@ -840,42 +840,42 @@ TEST(OptimizationTest, RemoveListArrayConverter) {
       {{"o", "o:sum"}});
 
   const char* e0 = R"P(
-(n0:float) -> (n7:float) {
-  n1 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n2 = Split[T=float, num_split=4](n1, n0)
-  n3 = _ArrayToList[N=4, T=float, out_types={float, float, float, float}](n2, n2:1, n2:2, n2:3)
-  n5 = Mul[T=float](n3:2, n3:3)
-  n4 = Mul[T=float](n3, n3:1)
-  n6 = _ListToArray[N=2, T=float, Tin={float, float}](n4, n5)
-  n7 = AddN[N=2, T=float](n6, n6:1)
+(i:float) -> (o:float) {
+  zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
+  s = Split[T=float, num_split=4](zero, i)
+  a = _ArrayToList[N=4, T=float, out_types={float, float, float, float}](s, s:1, s:2, s:3)
+  r = Mul[T=float](a:2, a:3)
+  l = Mul[T=float](a, a:1)
+  x = _ListToArray[N=2, T=float, Tin={float, float}](l, r)
+  o = AddN[N=2, T=float](x, x:1)
 }
 )P";
   EXPECT_EQ(Optimize(DoNothing, func), e0);
 
   const char* e1 = R"P(
-(n0:float) -> (n7:float) {
-  n1 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n2 = Split[T=float, num_split=4](n1, n0)
-  n5 = Mul[T=float](Func/_2, Func/_3)
-  n4 = Mul[T=float](Func/_0, Func/_1)
-  n7 = AddN[N=2, T=float](Func/_4, Func/_5)
-  Func/_0 = Identity[T=float](n2)
-  Func/_1 = Identity[T=float](n2:1)
-  Func/_2 = Identity[T=float](n2:2)
-  Func/_3 = Identity[T=float](n2:3)
-  Func/_4 = Identity[T=float](n4)
-  Func/_5 = Identity[T=float](n5)
+(i:float) -> (o:float) {
+  zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
+  s = Split[T=float, num_split=4](zero, i)
+  r = Mul[T=float](Func/_2, Func/_3)
+  l = Mul[T=float](Func/_0, Func/_1)
+  o = AddN[N=2, T=float](Func/_4, Func/_5)
+  Func/_0 = Identity[T=float](s)
+  Func/_1 = Identity[T=float](s:1)
+  Func/_2 = Identity[T=float](s:2)
+  Func/_3 = Identity[T=float](s:3)
+  Func/_4 = Identity[T=float](l)
+  Func/_5 = Identity[T=float](r)
 }
 )P";
   EXPECT_EQ(Optimize(RemoveListArrayConverter, func), e1);
 
   const char* e2 = R"P(
-(n0:float) -> (n7:float) {
-  n1 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n2 = Split[T=float, num_split=4](n1, n0)
-  n5 = Mul[T=float](n2:2, n2:3)
-  n4 = Mul[T=float](n2, n2:1)
-  n7 = AddN[N=2, T=float](n4, n5)
+(i:float) -> (o:float) {
+  zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
+  s = Split[T=float, num_split=4](zero, i)
+  r = Mul[T=float](s:2, s:3)
+  l = Mul[T=float](s, s:1)
+  o = AddN[N=2, T=float](l, r)
 }
 )P";
   auto remove_listarray_and_identity = [](Graph* g) {
@@ -911,21 +911,21 @@ TEST(OptimizationTest, RemoveListArrayConverter_WithContolDeps) {
       {{"o", "o:sum"}});
 
   const char* e0 = R"P(
-(n0:float) -> (n3:float) {
-  n1 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n2 = _ListToArray[N=2, T=float, Tin={float, float}](n0, n0) @ n1
-  n3 = AddN[N=2, T=float](n2, n2:1) @ n2
+(i:float) -> (o:float) {
+  dummy = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
+  x = _ListToArray[N=2, T=float, Tin={float, float}](i, i) @ dummy
+  o = AddN[N=2, T=float](x, x:1) @ x
 }
 )P";
   EXPECT_EQ(Optimize(DoNothing, func), e0);
 
   const char* e1 = R"P(
-(n0:float) -> (n3:float) {
-  n1 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n3 = AddN[N=2, T=float](Func/_0, Func/_1) @ Func/_3
-  Func/_0 = Identity[T=float](n0) @ Func/_2
-  Func/_1 = Identity[T=float](n0) @ Func/_2
-  Func/_2 = NoOp() @ n1
+(i:float) -> (o:float) {
+  dummy = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
+  o = AddN[N=2, T=float](Func/_0, Func/_1) @ Func/_3
+  Func/_0 = Identity[T=float](i) @ Func/_2
+  Func/_1 = Identity[T=float](i) @ Func/_2
+  Func/_2 = NoOp() @ dummy
   Func/_3 = NoOp() @ Func/_0, Func/_1
 }
 )P";
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index eba649458c..edb52737d9 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -86,18 +86,6 @@ Status ArgNumType(const InstantiateAttrValueMap& attrs,
   return Status::OK();
 }
 
-string Name(int node_index) { return strings::StrCat("n", node_index); }
-
-string Name(int node_index, int output_index) {
-  if (output_index == 0) {
-    return Name(node_index);
-  } else {
-    return strings::StrCat("n", node_index, ":", output_index);
-  }
-}
-
-string Dep(int node_index) { return strings::StrCat("^", Name(node_index)); }
-
 template <typename T>
 void AddAttr(const string& name, const T& val, NodeDef* ndef) {
   SetAttrValue(val, &((*ndef->mutable_attr())[name]));
@@ -145,230 +133,307 @@ Status ValidateSignatureWithAttrs(const OpDef& sig,
   return Status::OK();
 }
 
-// We build a small index for all names that can be used as a node's
-// input arguments.
-//
-// If is_func_arg is true, the name is a function's argument.  In
-// this case, the produced graph def has gdef.node[nid ... nid +
-// dtype.size()).
-//
-// Otherwise, the name is a function body's node return value.  In
-// this case, the produced graph def has one node gdef.node[nid] and
-// the node's output index [idx ... idx + num) corresponds to the
-// named outputs.
-//
-// In all cases, "dtype" specifies the data type.
-struct NameInfoItem {
-  bool is_func_arg;
-  int nid;
-  int idx;
-  bool is_type_list;
-  DataTypeVector dtypes;
-};
-typedef std::unordered_map<string, NameInfoItem> NameInfoIndex;
-
-Status AddArgName(NameInfoIndex* name_info, const string& arg,
-                  const NameInfoItem& item) {
-  if (!name_info->insert({arg, item}).second) {
-    return errors::InvalidArgument("Duplicated arg name: ", arg);
-  }
-  return Status::OK();
-}
-
-Status BuildInputArgIndex(const OpDef::ArgDef& arg_def,
-                          const InstantiateAttrValueMap& attr_values,
-                          NameInfoIndex* name_info,
-                          InstantiationResult* result) {
-  bool is_type_list;
-  DataTypeVector dtypes;
-  TF_RETURN_IF_ERROR(ArgNumType(attr_values, arg_def, &is_type_list, &dtypes));
-  CHECK_GE(dtypes.size(), size_t{1});
-  GraphDef* gdef = &result->gdef;
-  int arg_index = gdef->node_size();
-  TF_RETURN_IF_ERROR(AddArgName(name_info, arg_def.name(),
-                                {true, arg_index, 0, is_type_list, dtypes}));
-  // Creates dtypes.size() nodes in the gdef.
-  for (size_t i = 0; i < dtypes.size(); ++i) {
-    TF_RETURN_IF_ERROR(AddArgName(name_info,
-                                  strings::StrCat(arg_def.name(), ":", i),
-                                  {true, arg_index, 0, false, {dtypes[i]}}));
-    DCHECK_EQ(arg_index, gdef->node_size());
-    NodeDef* gnode = gdef->add_node();
-    gnode->set_name(Name(arg_index));
-    gnode->set_op("_Arg");
-    AddAttr("T", dtypes[i], gnode);
-    AddAttr("index", arg_index, gnode);
-    result->arg_types.push_back(dtypes[i]);
-    ++arg_index;
-  }
-  return Status::OK();
-}
-
-Status AddRetName(NameInfoIndex* name_info, const string& ret,
-                  const NameInfoItem& item) {
-  if (!name_info->insert({ret, item}).second) {
-    return errors::InvalidArgument("Duplicated ret name: ", ret);
+// A helper class for instantiating functions. This contains shared information
+// like the resulting graph and node name index.
+class FunctionInstantiationHelper {
+ public:
+  FunctionInstantiationHelper(GetFunctionSignature get_function,
+                              InstantiationResult* result)
+      : get_function_(std ::move(get_function)), result_(*result) {
+    result_.gdef.Clear();
+  }
+
+  // Builds index for nodes that can be used as node's input arguments.
+  Status BuildInputArgIndex(const OpDef::ArgDef& arg_def,
+                            const InstantiateAttrValueMap& attr_values) {
+    bool is_type_list;
+    DataTypeVector dtypes;
+    TF_RETURN_IF_ERROR(
+        ArgNumType(attr_values, arg_def, &is_type_list, &dtypes));
+    CHECK_GE(dtypes.size(), size_t{1});
+    GraphDef* gdef = &result_.gdef;
+    int arg_index = gdef->node_size();
+    TF_RETURN_IF_ERROR(
+        AddItem(arg_def.name(), {true, arg_index, 0, is_type_list, dtypes}));
+    // Creates dtypes.size() nodes in the gdef.
+    for (size_t i = 0; i < dtypes.size(); ++i) {
+      TF_RETURN_IF_ERROR(AddItem(strings::StrCat(arg_def.name(), ":", i),
+                                 {true, arg_index, 0, false, {dtypes[i]}}));
+      DCHECK_EQ(arg_index, gdef->node_size());
+      string name = arg_def.name();
+      if (dtypes.size() > 1) {
+        strings::StrAppend(&name, "_", i);
+      }
+      NodeDef* gnode = AddNode(name);
+      gnode->set_op("_Arg");
+      AddAttr("T", dtypes[i], gnode);
+      AddAttr("index", arg_index, gnode);
+      result_.arg_types.push_back(dtypes[i]);
+      ++arg_index;
+    }
+    return Status::OK();
   }
-  return Status::OK();
-}
 
-Status BuildNodeOutputIndex(const NodeDef& node,
-                            const InstantiateAttrValueMap& attrs,
-                            GetFunctionSignature get_function,
-                            const int arg_index, NameInfoIndex* name_info) {
-  const OpDef* node_sig = nullptr;
-  TF_RETURN_IF_ERROR(get_function(node.op(), &node_sig));
-  if (node_sig->output_arg_size() == 0) {
-    return AddRetName(name_info, node.name(), {false, arg_index, 0, false, {}});
-  }
-  const int num_retval = node_sig->output_arg_size();
-  int start = 0;
-  bool is_type_list;
-  DataTypeVector dtypes;
-  for (int i = 0; i < num_retval; ++i) {
-    TF_RETURN_IF_ERROR(
-        ArgNumType(attrs, node_sig->output_arg(i), &is_type_list, &dtypes));
-    // Note that we rely on the backwards-compatibility test enforcing
-    // that output_arg(*).name() doesn't change here.
-    const string base_name =
-        strings::StrCat(node.name(), ":", node_sig->output_arg(i).name());
-    TF_RETURN_IF_ERROR(AddRetName(
-        name_info, base_name, {false, arg_index, start, is_type_list, dtypes}));
-    for (int j = 0; j < static_cast<int>(dtypes.size()); ++j) {
+  Status BuildNodeOutputIndex(const NodeDef& node,
+                              const InstantiateAttrValueMap& attrs,
+                              const int arg_index) {
+    const OpDef* node_sig = nullptr;
+    TF_RETURN_IF_ERROR(get_function_(node.op(), &node_sig));
+    if (node_sig->output_arg_size() == 0) {
+      return AddItem(node.name(), {false, arg_index, 0, false, {}});
+    }
+    const int num_retval = node_sig->output_arg_size();
+    int start = 0;
+    bool is_type_list;
+    DataTypeVector dtypes;
+    for (int i = 0; i < num_retval; ++i) {
       TF_RETURN_IF_ERROR(
-          AddRetName(name_info, strings::StrCat(base_name, ":", j),
-                     {false, arg_index, start + j, false, {dtypes[j]}}));
+          ArgNumType(attrs, node_sig->output_arg(i), &is_type_list, &dtypes));
+      // Note that we rely on the backwards-compatibility test enforcing
+      // that output_arg(*).name() doesn't change here.
+      const string base_name =
+          strings::StrCat(node.name(), ":", node_sig->output_arg(i).name());
+      TF_RETURN_IF_ERROR(
+          AddItem(base_name, {false, arg_index, start, is_type_list, dtypes}));
+      for (int j = 0; j < static_cast<int>(dtypes.size()); ++j) {
+        TF_RETURN_IF_ERROR(
+            AddItem(strings::StrCat(base_name, ":", j),
+                    {false, arg_index, start + j, false, {dtypes[j]}}));
+      }
+      start += dtypes.size();
     }
-    start += dtypes.size();
+    return Status::OK();
   }
-  return Status::OK();
-}
 
-Status InstantiateNode(const NodeDef& fnode,
-                       const InstantiateAttrValueMap& attrs,
-                       GetFunctionSignature get_function,
-                       const NameInfoIndex& name_info, GraphDef* gdef) {
-  const OpDef* fnode_sig = nullptr;
-  TF_CHECK_OK(get_function(fnode.op(), &fnode_sig));
-  NodeDef* gnode = gdef->add_node();
-  gnode->set_name(Name(gdef->node_size() - 1));
-  gnode->set_op(fnode.op());
-  gnode->set_device(fnode.device());
-
-  // Input
-  const int num_args = fnode_sig->input_arg_size();
-  bool is_type_list;  // ignored
-  DataTypeVector dtypes;
-  int fnode_arg_index = 0;
-  for (int i = 0; i < num_args; ++i) {
-    TF_RETURN_IF_ERROR(
-        ArgNumType(attrs, fnode_sig->input_arg(i), &is_type_list, &dtypes));
-    // Consume inputs (indexed by fnode_arg_index) until we have
-    // matched each element of dtypes (indexed by j).
-    for (size_t j = 0; j < dtypes.size(); ++fnode_arg_index) {
-      if (fnode_arg_index >= fnode.input_size()) {
-        // Should never happen if we computed dtypes correctly.
-        return errors::InvalidArgument("Attempt to access beyond input size: ",
-                                       fnode_arg_index, " >= ",
-                                       fnode.input_size());
-      }
-      // Look up the next input.
-      const string& input_name = fnode.input(fnode_arg_index);
-      const NameInfoItem* item = gtl::FindOrNull(name_info, input_name);
-      if (item == nullptr) {
-        return errors::InvalidArgument("input ", input_name, " is not found: ",
-                                       SummarizeNodeDef(fnode));
-      }
-      if (item->dtypes.size() > dtypes.size() - j) {
-        return errors::InvalidArgument("Input ", input_name, " too long for ",
-                                       fnode_sig->input_arg(i).name());
-      }
-      // Match up all the elements of this input (indexed by k) with
-      // elements of dtypes (advancing j).
-      for (int k = 0; k < item->dtypes.size(); ++k, ++j) {
-        if (item->dtypes[k] != dtypes[j]) {
+  Status InstantiateNode(const NodeDef& fnode,
+                         const InstantiateAttrValueMap& attrs) {
+    const OpDef* fnode_sig = nullptr;
+    TF_CHECK_OK(get_function_(fnode.op(), &fnode_sig));
+    NodeDef* gnode = AddNode(fnode.name());
+    gnode->set_op(fnode.op());
+    gnode->set_device(fnode.device());
+    int gnode_idx = nodes_.size() - 1;
+
+    // Input
+    const int num_args = fnode_sig->input_arg_size();
+    bool is_type_list;  // ignored
+    DataTypeVector dtypes;
+    int fnode_arg_index = 0;
+    for (int i = 0; i < num_args; ++i) {
+      TF_RETURN_IF_ERROR(
+          ArgNumType(attrs, fnode_sig->input_arg(i), &is_type_list, &dtypes));
+      // Consume inputs (indexed by fnode_arg_index) until we have
+      // matched each element of dtypes (indexed by j).
+      for (size_t j = 0; j < dtypes.size(); ++fnode_arg_index) {
+        if (fnode_arg_index >= fnode.input_size()) {
+          // Should never happen if we computed dtypes correctly.
           return errors::InvalidArgument(
-              "input ", fnode_sig->input_arg(i).name(), "[", j,
-              "] expected type ", DataTypeString(dtypes[j]), " != ",
-              DataTypeString(item->dtypes[k]), ", the type of ", input_name,
-              "[", k, "]");
+              "Attempt to access beyond input size: ", fnode_arg_index,
+              " >= ", fnode.input_size());
         }
-        if (item->is_func_arg) {
-          gnode->add_input(Name(item->nid + k));
-        } else {
-          gnode->add_input(Name(item->nid, item->idx + k));
+        // Look up the next input.
+        const string& input_name = fnode.input(fnode_arg_index);
+        const auto* item = GetItemOrNull(input_name);
+        if (item == nullptr) {
+          return errors::InvalidArgument(
+              "input ", input_name, " is not found: ", SummarizeNodeDef(fnode));
+        }
+        if (item->dtypes.size() > dtypes.size() - j) {
+          return errors::InvalidArgument("Input ", input_name, " too long for ",
+                                         fnode_sig->input_arg(i).name());
+        }
+        // Match up all the elements of this input (indexed by k) with
+        // elements of dtypes (advancing j).
+        for (int k = 0; k < item->dtypes.size(); ++k, ++j) {
+          if (item->dtypes[k] != dtypes[j]) {
+            return errors::InvalidArgument(
+                "input ", fnode_sig->input_arg(i).name(), "[", j,
+                "] expected type ", DataTypeString(dtypes[j]),
+                " != ", DataTypeString(item->dtypes[k]), ", the type of ",
+                input_name, "[", k, "]");
+          }
+          if (item->is_func_arg) {
+            AddInput(gnode_idx, item->nid + k, 0);
+          } else {
+            AddInput(gnode_idx, item->nid, item->idx + k);
+          }
+        }
+      }
+    }
+
+    // Control deps.
+    for (int i = fnode_arg_index; i < fnode.input_size(); ++i) {
+      const string& input = fnode.input(i);
+      if (input.empty() || input[0] != '^') {
+        return errors::InvalidArgument("Expected input[", i, "] == '", input,
+                                       "' to be a control input.");
+      }
+      int nid = -1;
+      const string node_name = input.substr(1);
+      const string node_colon = node_name + ":";
+      for (const auto& p : index_) {
+        if (p.first == node_name ||
+            tensorflow::StringPiece(p.first).starts_with(node_colon)) {
+          nid = p.second.nid;
+          break;
         }
       }
+      if (nid == -1) {
+        return errors::InvalidArgument("input[", i, "] == '", input,
+                                       "', is not found.");
+      }
+      AddDep(gnode_idx, nid);
     }
+
+    // Attrs.
+    for (const auto& p : attrs) {
+      (*gnode->mutable_attr())[p.first] = p.second;
+    }
+
+    return Status::OK();
   }
 
-  // Control deps.
-  for (int i = fnode_arg_index; i < fnode.input_size(); ++i) {
-    const string& input = fnode.input(i);
-    if (input.empty() || input[0] != '^') {
-      return errors::InvalidArgument("Expected input[", i, "] == '", input,
-                                     "' to be a control input.");
+  Status AddReturnNode(
+      const OpDef::ArgDef& ret_def, const InstantiateAttrValueMap& attrs,
+      const ::tensorflow::protobuf::Map<string, string>& ret_map,
+      int* ret_index) {
+    auto ret_iter = ret_map.find(ret_def.name());
+    if (ret_iter == ret_map.end()) {
+      return errors::InvalidArgument("Return ", ret_def.name(), " missing.");
+    }
+    bool is_type_list;
+    DataTypeVector dtypes;
+    TF_RETURN_IF_ERROR(ArgNumType(attrs, ret_def, &is_type_list, &dtypes));
+    CHECK_GE(dtypes.size(), size_t{1});
+    const auto* item = GetItemOrNull(ret_iter->second);
+    if (item == nullptr) {
+      return errors::InvalidArgument("Return ", ret_def.name(), " -> ",
+                                     ret_iter->second, " is not found.");
+    }
+    if (dtypes != item->dtypes) {
+      return errors::InvalidArgument("Invalid ret types ", ret_def.name(),
+                                     " : ", DataTypeVectorString(dtypes),
+                                     " vs. ",
+                                     DataTypeVectorString(item->dtypes));
     }
-    int nid = -1;
-    const string node_name = input.substr(1);
-    const string node_colon = node_name + ":";
-    for (const auto& p : name_info) {
-      if (p.first == node_name ||
-          tensorflow::StringPiece(p.first).starts_with(node_colon)) {
-        nid = p.second.nid;
-        break;
+    for (size_t i = 0; i < dtypes.size(); ++i) {
+      string name = strings::StrCat(ret_def.name(), "_RetVal");
+      if (dtypes.size() > 1) {
+        strings::StrAppend(&name, "_", i);
       }
+      NodeDef* gnode = AddNode(name);
+      gnode->set_op("_Retval");
+      AddInput(nodes_.size() - 1, item->nid, item->idx + i);
+      AddAttr("T", dtypes[i], gnode);
+      AddAttr("index", (*ret_index)++, gnode);
+      result_.ret_types.push_back(dtypes[i]);
     }
-    if (nid == -1) {
-      return errors::InvalidArgument("input[", i, "] == '", input,
-                                     "', is not found.");
+    return Status::OK();
+  }
+
+  // Adds the actual node inputs to the result graph by converting indexes to
+  // the node names.
+  void AddNodeInputs() {
+    for (int i = 0; i < result_.gdef.node_size(); i++) {
+      NodeInfo& node_info = nodes_[i];
+      for (const auto& p : node_info.data_inputs) {
+        result_.gdef.mutable_node(i)->add_input(Name(p.first, p.second));
+      }
+      for (int index : node_info.control_inputs) {
+        result_.gdef.mutable_node(i)->add_input(Dep(index));
+      }
     }
-    gnode->add_input(Dep(nid));
   }
 
-  // Attrs.
-  for (const auto& p : attrs) {
-    (*gnode->mutable_attr())[p.first] = p.second;
+ private:
+  // This is used to build a small index for all names that can be used as a
+  // node's input arguments.
+  //
+  // If is_func_arg is true, the name is a function's argument.  In
+  // this case, the produced graph def has gdef.node[nid ... nid +
+  // dtype.size()).
+  //
+  // Otherwise, the name is a function body's node return value.  In
+  // this case, the produced graph def has one node gdef.node[nid] and
+  // the node's output index [idx ... idx + num) corresponds to the
+  // named outputs.
+  //
+  // In all cases, "dtype" specifies the data type.
+  struct NameInfoItem {
+    bool is_func_arg;
+    int nid;
+    int idx;
+    bool is_type_list;
+    DataTypeVector dtypes;
+  };
+
+  // Adds an item into the input name index.
+  Status AddItem(const string& name, const NameInfoItem& item) {
+    if (!index_.insert({name, item}).second) {
+      return errors::InvalidArgument(
+          strings::StrCat("Duplicated ", item.is_func_arg ? "arg" : "ret",
+                          " name: "),
+          name);
+    }
+    return Status::OK();
   }
 
-  return Status::OK();
-}
+  const NameInfoItem* GetItemOrNull(const string& name) const {
+    return gtl::FindOrNull(index_, name);
+  }
 
-Status AddReturnNode(const OpDef::ArgDef& ret_def,
-                     const InstantiateAttrValueMap& attrs,
-                     const ::tensorflow::protobuf::Map<string, string>& ret_map,
-                     const NameInfoIndex& name_info, int* ret_index,
-                     InstantiationResult* result) {
-  auto ret_iter = ret_map.find(ret_def.name());
-  if (ret_iter == ret_map.end()) {
-    return errors::InvalidArgument("Return ", ret_def.name(), " missing.");
-  }
-  bool is_type_list;
-  DataTypeVector dtypes;
-  TF_RETURN_IF_ERROR(ArgNumType(attrs, ret_def, &is_type_list, &dtypes));
-  CHECK_GE(dtypes.size(), size_t{1});
-  const NameInfoItem* item = gtl::FindOrNull(name_info, ret_iter->second);
-  if (item == nullptr) {
-    return errors::InvalidArgument("Return ", ret_def.name(), " -> ",
-                                   ret_iter->second, " is not found.");
-  }
-  if (dtypes != item->dtypes) {
-    return errors::InvalidArgument("Invalid ret types ", ret_def.name(), " : ",
-                                   DataTypeVectorString(dtypes), " vs. ",
-                                   DataTypeVectorString(item->dtypes));
-  }
-  GraphDef* gdef = &result->gdef;
-  for (size_t i = 0; i < dtypes.size(); ++i) {
-    NodeDef* gnode = gdef->add_node();
-    gnode->set_name(Name(gdef->node_size() - 1));
-    gnode->set_op("_Retval");
-    gnode->add_input(Name(item->nid, item->idx + i));
-    AddAttr("T", dtypes[i], gnode);
-    AddAttr("index", (*ret_index)++, gnode);
-    result->ret_types.push_back(dtypes[i]);
+  string Dep(int node_index) const {
+    return strings::StrCat("^", Name(node_index));
+  }
+
+  string Name(int node_index) const {
+    CHECK_LT(node_index, nodes_.size());
+    return nodes_[node_index].name;
   }
-  return Status::OK();
-}
+
+  string Name(int node_index, int output_index) const {
+    if (output_index == 0) {
+      return Name(node_index);
+    } else {
+      return strings::StrCat(Name(node_index), ":", output_index);
+    }
+  }
+
+  NodeDef* AddNode(const string& name) {
+    NodeDef* gnode = result_.gdef.add_node();
+    gnode->set_name(name);
+    nodes_.push_back({name, {}, {}});
+    CHECK_EQ(result_.gdef.node_size(), nodes_.size());
+    return gnode;
+  }
+
+  void AddInput(int node_index, int output_node, int output_index) {
+    CHECK_LT(node_index, nodes_.size());
+    nodes_[node_index].data_inputs.push_back(
+        std::make_pair(output_node, output_index));
+  }
+
+  void AddDep(int node_index, int dep_index) {
+    CHECK_LT(node_index, nodes_.size());
+    nodes_[node_index].control_inputs.push_back(dep_index);
+  }
+
+  GetFunctionSignature get_function_;
+  InstantiationResult& result_;
+  // A small index for all names that can be used as a node's input arguments.
+  std::unordered_map<string, NameInfoItem> index_;
+  // This contains information about a node in the new graph including the node
+  // names and input nodes' indexes.
+  struct NodeInfo {
+    string name;
+    // Data inputs where <n, k> means arg k of node n.
+    std::vector<std::pair<int, int>> data_inputs;
+    // Control inputs (dependencies).
+    std::vector<int> control_inputs;
+  };
+  // nodes_[i] is the information about result_.gdef.node(i).
+  std::vector<NodeInfo> nodes_;
+};
 
 // Various helpers Print(proto) to print relevant protos to ascii.
 string Print(const OpDef::ArgDef& arg) {
@@ -560,15 +625,12 @@ Status InstantiateFunction(const FunctionDef& fdef,
   VLOG(3) << "Instantiation Function: " << Print(fdef);
 
   const OpDef& sig = fdef.signature();
-  GraphDef* gdef = &result->gdef;
-  gdef->Clear();
-
   TF_RETURN_IF_ERROR(ValidateSignatureWithAttrs(sig, attr_values));
 
-  NameInfoIndex name_info;
+  FunctionInstantiationHelper helper(get_function, result);
   Status s;
   for (const OpDef::ArgDef& arg_def : sig.input_arg()) {
-    s = BuildInputArgIndex(arg_def, attr_values, &name_info, result);
+    s = helper.BuildInputArgIndex(arg_def, attr_values);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", Print(arg_def));
       return s;
@@ -604,8 +666,8 @@ Status InstantiateFunction(const FunctionDef& fdef,
   }
 
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = BuildNodeOutputIndex(fdef.node_def(i), node_attrs[i], get_function,
-                             gdef->node_size() + i, &name_info);
+    s = helper.BuildNodeOutputIndex(fdef.node_def(i), node_attrs[i],
+                                    result->gdef.node_size() + i);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
       return s;
@@ -613,8 +675,7 @@ Status InstantiateFunction(const FunctionDef& fdef,
   }
   // Emits one gdef.node for each fdef.node_def.
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = InstantiateNode(fdef.node_def(i), node_attrs[i], get_function,
-                        name_info, gdef);
+    s = helper.InstantiateNode(fdef.node_def(i), node_attrs[i]);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
       return s;
@@ -624,14 +685,16 @@ Status InstantiateFunction(const FunctionDef& fdef,
   // Emits nodes for the function's return values.
   int ret_index = 0;
   for (const OpDef::ArgDef& ret_def : sig.output_arg()) {
-    s = AddReturnNode(ret_def, attr_values, fdef.ret(), name_info, &ret_index,
-                      result);
+    s = helper.AddReturnNode(ret_def, attr_values, fdef.ret(), &ret_index);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In function output ", Print(ret_def));
       return s;
     }
   }
 
+  // Adds the actual node inputs using the input indexes.
+  helper.AddNodeInputs();
+
   return Status::OK();
 }
 
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index 4cd9dce0de..efc6a2edcc 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -83,10 +83,10 @@ SquarePlusOne[T:{float, double, int32, int64}](x:T) -> (y:T) {
   InstantiationResult result;
   TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
   const char* e2 = R"P(
-(n0:float) -> (n3:float) {
-  n1 = Square[T=float](n0)
-  n2 = One[T=float]()
-  n3 = Add[T=float](n1, n2)
+(x:float) -> (y:float) {
+  a = Square[T=float](x)
+  o = One[T=float]()
+  y = Add[T=float](a, o)
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector({DT_FLOAT}));
@@ -128,10 +128,10 @@ ControlDep(x:int32) -> (y:int32) {
   InstantiationResult result;
   TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
   const char* e2 = R"P(
-(n0:int32) -> (n3:int32) {
-  n1 = Identity[T=int32](n0)
-  n2 = NoOp() @ n1
-  n3 = Identity[T=int32](n1) @ n2
+(x:int32) -> (y:int32) {
+  a = Identity[T=int32](x)
+  o = NoOp() @ a
+  y = Identity[T=int32](a) @ o
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector({DT_INT32}));
@@ -175,8 +175,8 @@ BackCompat() -> (y:float) {
       InstantiateFunction(fdef, InstantiateAttrValueMap{}, GetOpSig, &result));
   // Should get T=float from Op's default.
   const char* e2 = R"P(
-() -> (n0:float) {
-  n0 = HasDefaultType[T=float]()
+() -> (a:float) {
+  a = HasDefaultType[T=float]()
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector());
@@ -211,8 +211,8 @@ NTimesT(x:float, y:float) -> (z:float) {
   InstantiationResult result;
   TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
-(n0:float, n1:float) -> (n2:float) {
-  n2 = AddN[N=2, T=float](n0, n1)
+(x:float, y:float) -> (a:float) {
+  a = AddN[N=2, T=float](x, y)
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector({DT_FLOAT, DT_FLOAT}));
@@ -275,9 +275,9 @@ AddSquared[N:int, T:{float, double, int32, int64}](x:N*T) -> (y:T) {
   TF_ASSERT_OK(InstantiateFunction(fdef, {{"N", 3}, {"T", DT_FLOAT}}, GetOpSig,
                                    &result));
   const char* e2 = R"P(
-(n0:float, n1:float, n2:float) -> (n4:float) {
-  n3 = Map[N=3, T=float, U=float, func=Square[T=float]](n0, n1, n2)
-  n4 = AddN[N=3, T=float](n3, n3:1, n3:2)
+(x_0:float, x_1:float, x_2:float) -> (y:float) {
+  a = Map[N=3, T=float, U=float, func=Square[T=float]](x_0, x_1, x_2)
+  y = AddN[N=3, T=float](a, a:1, a:2)
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector({DT_FLOAT, DT_FLOAT, DT_FLOAT}));
@@ -317,12 +317,12 @@ ControlDeps(x:float) -> () {
   InstantiationResult result;
   TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
-(n0:float) -> () {
-  n1 = One[T=float]() @ n0
-  n2 = NoOp() @ n1
-  n3 = One[T=float]() @ n2
-  n4 = NoOp() @ n3
-  n5 = One[T=float]() @ n1, n4
+(x:float) -> () {
+  a = One[T=float]() @ x
+  u = NoOp() @ a
+  b = One[T=float]() @ u
+  v = NoOp() @ b
+  c = One[T=float]() @ a, v
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector({DT_FLOAT}));
@@ -397,13 +397,13 @@ Test(i:float) -> (o:float) {
   InstantiationResult result;
   TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
-(n0:float) -> (n6:float) {
-  n1 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n2 = Split[T=float, num_split=4](n1, n0)
-  n3 = Mul[T=float](n2, n2:1)
-  n4 = Mul[T=float](n2:2, n2:3)
-  n5 = _ListToArray[N=2, T=float, Tin={float, float}](n3, n4)
-  n6 = AddN[N=2, T=float](n5, n5:1)
+(i:float) -> (o:float) {
+  zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
+  s = Split[T=float, num_split=4](zero, i)
+  l = Mul[T=float](s, s:1)
+  r = Mul[T=float](s:2, s:3)
+  x = _ListToArray[N=2, T=float, Tin={float, float}](l, r)
+  o = AddN[N=2, T=float](x, x:1)
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector({DT_FLOAT}));
@@ -469,9 +469,9 @@ MySelect(x:float) -> (z:float) {
   InstantiationResult result;
   TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
-(n0:float) -> (n2:float) {
-  n1 = Cond[Tin={float}, cond=MyCond, else_branch=MyElse, out_types={float}, then_branch=MyThen](n0)
-  n2 = Cond[Tin={float, float}, cond=MyCond2, else_branch=MyElse2, out_types={float}, then_branch=MyThen2](n1, n1)
+(x:float) -> (z:float) {
+  y = Cond[Tin={float}, cond=MyCond, else_branch=MyElse, out_types={float}, then_branch=MyThen](x)
+  z = Cond[Tin={float, float}, cond=MyCond2, else_branch=MyElse2, out_types={float}, then_branch=MyThen2](y, y)
 }
 )P";
   EXPECT_EQ(result.arg_types, DataTypeVector({DT_FLOAT}));
diff --git a/tensorflow/python/framework/function_test.py b/tensorflow/python/framework/function_test.py
index 51a9215ac4..39f00e5216 100644
--- a/tensorflow/python/framework/function_test.py
+++ b/tensorflow/python/framework/function_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import re
 import time
 
 import numpy as np
@@ -1154,6 +1155,7 @@ class FunctionInlineControlTest(test.TestCase):
             do_common_subexpression_elimination=True,
             do_function_inlining=True,
             do_constant_folding=True)))
+    cell_func_call_pattern = re.compile(r"Cell[^/]*\(")
     for noinline in [False, True]:
 
       @function.Defun(dtype, noinline=noinline)
@@ -1192,7 +1194,7 @@ class FunctionInlineControlTest(test.TestCase):
       def MetadataHasCell(run_metadata):
         for dev_stats in run_metadata.step_stats.dev_stats:
           for node_stats in dev_stats.node_stats:
-            if "Cell" in node_stats.timeline_label:
+            if cell_func_call_pattern.search(node_stats.timeline_label):
               return True
         return False
 
-- 
GitLab


From 721c48c611058aa2d43f7d3b99f5b445741765be Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 10:52:51 -0800
Subject: [PATCH 0540/1563] Expand pip_smoke test to contrib. Change: 153614629

---
 tensorflow/tools/pip_package/pip_smoke_test.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index 10ab871b02..8de639e855 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -31,7 +31,8 @@ PIP_PACKAGE_QUERY = """bazel query \
 PY_TEST_QUERY = """bazel query 'filter("^((?!(benchmark|manual|no_pip)).)*$", \
   deps(kind(py_test,\
   //tensorflow/python/... + \
-  //tensorflow/tensorboard/...), 1))'"""
+  //tensorflow/tensorboard/... + \
+  //tensorflow/contrib/...), 1))'"""
 
 # Hard-coded blacklist of files if not included in pip package
 # TODO(amitpatankar): Clean up blacklist.
@@ -43,7 +44,16 @@ BLACKLIST = [
     "//tensorflow/python:compare_test_proto_py",
     "//tensorflow/core:image_testdata",
     "//tensorflow/core/kernels/cloud:bigquery_reader_ops",
-    "//tensorflow/python:framework/test_file_system.so"
+    "//tensorflow/python:framework/test_file_system.so",
+    # contrib
+    "//tensorflow/contrib/session_bundle:session_bundle_half_plus_two",
+    "//tensorflow/contrib/keras:testing_utils",
+    "//tensorflow/contrib/ffmpeg:test_data",
+    "//tensorflow/contrib/factorization/examples:mnist",
+    "//tensorflow/contrib/factorization/examples:mnist.py",
+    "//tensorflow/contrib/factorization:factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",  # pylint:disable=line-too-long
+    "//tensorflow/contrib/bayesflow:reinforce_simple_example",
+    "//tensorflow/contrib/bayesflow:examples/reinforce_simple/reinforce_simple_example.py"  # pylint:disable=line-too-long
 ]
 
 
-- 
GitLab


From 2152312bacdc3c1146fabf3563310b5fd0bf02c8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 11:37:39 -0800
Subject: [PATCH 0541/1563] Add
 tensorflow/contrib/saved_model/cc/saved_model/signature_def_util.h with
 utilities to find SignatureDefs and the tensor endpoints referenced by them,
 using tensorflow::Status to make it easy to forward errors. Change: 153620106

---
 tensorflow/BUILD                              |  1 +
 .../contrib/saved_model/cc/saved_model/BUILD  | 55 +++++++++++
 .../cc/saved_model/signature_def_utils.cc     | 77 ++++++++++++++++
 .../cc/saved_model/signature_def_utils.h      | 69 ++++++++++++++
 .../saved_model/signature_def_utils_test.cc   | 92 +++++++++++++++++++
 5 files changed, 294 insertions(+)
 create mode 100644 tensorflow/contrib/saved_model/cc/saved_model/BUILD
 create mode 100644 tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.cc
 create mode 100644 tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.h
 create mode 100644 tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils_test.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 08850d6e83..31c6977a55 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -229,6 +229,7 @@ filegroup(
         "//tensorflow/contrib/opt:all_files",
         "//tensorflow/contrib/rnn:all_files",
         "//tensorflow/contrib/saved_model:all_files",
+        "//tensorflow/contrib/saved_model/cc/saved_model:all_files",
         "//tensorflow/contrib/seq2seq:all_files",
         "//tensorflow/contrib/session_bundle:all_files",
         "//tensorflow/contrib/session_bundle/example:all_files",
diff --git a/tensorflow/contrib/saved_model/cc/saved_model/BUILD b/tensorflow/contrib/saved_model/cc/saved_model/BUILD
new file mode 100644
index 0000000000..f3d98cfbbe
--- /dev/null
+++ b/tensorflow/contrib/saved_model/cc/saved_model/BUILD
@@ -0,0 +1,55 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+# Description:
+# SavedModel contrib libraries for C++.
+
+package(default_visibility = ["//tensorflow:__subpackages__"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+cc_library(
+    name = "signature_def_utils",
+    srcs = ["signature_def_utils.cc"],
+    hdrs = ["signature_def_utils.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_proto_parsing",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
+cc_test(
+    name = "signature_def_utils_test",
+    srcs = ["signature_def_utils_test.cc"],
+    deps = [
+        ":signature_def_utils",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_proto_parsing",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["*"]),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.cc b/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.cc
new file mode 100644
index 0000000000..a45908d272
--- /dev/null
+++ b/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.cc
@@ -0,0 +1,77 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.h"
+
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/platform/protobuf.h"
+
+namespace tensorflow {
+
+namespace {
+template <class T>
+Status FindInProtobufMap(StringPiece description,
+                         const protobuf::Map<string, T>& map, const string& key,
+                         const T** value) {
+  const auto it = map.find(key);
+  if (it == map.end()) {
+    return errors::NotFound("Could not find ", description, " for key: ", key);
+  }
+  *value = &it->second;
+  return Status::OK();
+}
+}  // namespace
+
+Status FindSignatureDefByKey(const MetaGraphDef& meta_graph_def,
+                             const string& signature_def_key,
+                             const SignatureDef** signature_def) {
+  return FindInProtobufMap("SignatureDef", meta_graph_def.signature_def(),
+                           signature_def_key, signature_def);
+}
+
+Status FindInputTensorInfoByKey(const SignatureDef& signature_def,
+                                const string& tensor_info_key,
+                                const TensorInfo** tensor_info) {
+  return FindInProtobufMap("input TensorInfo", signature_def.inputs(),
+                           tensor_info_key, tensor_info);
+}
+
+Status FindOutputTensorInfoByKey(const SignatureDef& signature_def,
+                                 const string& tensor_info_key,
+                                 const TensorInfo** tensor_info) {
+  return FindInProtobufMap("output TensorInfo", signature_def.outputs(),
+                           tensor_info_key, tensor_info);
+}
+
+Status FindInputTensorNameByKey(const SignatureDef& signature_def,
+                                const string& tensor_info_key, string* name) {
+  const TensorInfo* tensor_info;
+  TF_RETURN_IF_ERROR(
+      FindInputTensorInfoByKey(signature_def, tensor_info_key, &tensor_info));
+  *name = tensor_info->name();
+  return Status::OK();
+}
+
+Status FindOutputTensorNameByKey(const SignatureDef& signature_def,
+                                 const string& tensor_info_key, string* name) {
+  const TensorInfo* tensor_info;
+  TF_RETURN_IF_ERROR(
+      FindOutputTensorInfoByKey(signature_def, tensor_info_key, &tensor_info));
+  *name = tensor_info->name();
+  return Status::OK();
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.h b/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.h
new file mode 100644
index 0000000000..c0df224bc8
--- /dev/null
+++ b/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.h
@@ -0,0 +1,69 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Helpers for working with the SignatureDefs of TensorFlow SavedModels.
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_SAVED_MODEL_CC_SAVED_MODEL_SIGNATURE_DEF_UTILS_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_SAVED_MODEL_CC_SAVED_MODEL_SIGNATURE_DEF_UTILS_H_
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/protobuf/meta_graph.pb.h"
+
+namespace tensorflow {
+
+// Finds the entry in meta_graph_def.signature_def with the given key, or
+// returns NotFound and leaves *signature_def unchanged. NOTE: The output
+// SignatureDef* points into meta_graph_def and may be invalidated by changes
+// to that protocol buffer, as usual.
+Status FindSignatureDefByKey(const MetaGraphDef& meta_graph_def,
+                             const string& signature_def_key,
+                             const SignatureDef** signature_def);
+
+// Finds the entry in signature_def.inputs with the given key, or returns
+// NotFound and leaves *tensor_info unchanged. NOTE: The output TensorInfo*
+// points into signature_def and may be invalidated by changes to that protocol
+// buffer, as usual.
+Status FindInputTensorInfoByKey(const SignatureDef& signature_def,
+                                const string& tensor_info_key,
+                                const TensorInfo** tensor_info);
+
+// Finds the entry in signature_def.outputs with the given key, or returns
+// NotFound and leaves *tensor_info unchanged. NOTE: The output TensorInfo*
+// points into signature_def and may be invalidated by changes to that protocol
+// buffer, as usual.
+Status FindOutputTensorInfoByKey(const SignatureDef& signature_def,
+                                 const string& tensor_info_key,
+                                 const TensorInfo** tensor_info);
+
+// Finds the entry in signature_def.inputs with the given key and copies out
+// the name of this Tensor in the graph, or returns NotFound and leaves *name
+// unchanged.
+Status FindInputTensorNameByKey(const SignatureDef& signature_def,
+                                const string& tensor_info_key, string* name);
+
+// Finds the entry in signature_def.outputs with the given key and copies out
+// the name of this Tensor in the graph, or returns NotFound and leaves *name
+// unchanged.
+Status FindOutputTensorNameByKey(const SignatureDef& signature_def,
+                                 const string& tensor_info_key, string* name);
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_SAVED_MODEL_CC_SAVED_MODEL_SIGNATURE_DEF_UTILS_H_
diff --git a/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils_test.cc b/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils_test.cc
new file mode 100644
index 0000000000..a063e95696
--- /dev/null
+++ b/tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils_test.cc
@@ -0,0 +1,92 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/saved_model/cc/saved_model/signature_def_utils.h"
+
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+class SignatureDefUtilsTest : public ::testing::Test {
+ protected:
+  MetaGraphDef MakeSampleMetaGraphDef() {
+    MetaGraphDef result;
+    (*result.mutable_signature_def())["blah"].set_method_name("foo");
+    (*result.mutable_signature_def())[kSignatureKey] = MakeSampleSignatureDef();
+    (*result.mutable_signature_def())["gnarl"].set_method_name("blah");
+    return result;
+  }
+
+  SignatureDef MakeSampleSignatureDef() {
+    SignatureDef result;
+    result.set_method_name(kMethodName);
+    (*result.mutable_inputs())[kInput1Key].set_name(kInput1Name);
+    (*result.mutable_inputs())[kInput2Key].set_name(kInput2Name);
+    (*result.mutable_outputs())[kOutput1Key].set_name(kOutput1Name);
+    (*result.mutable_outputs())[kOutput2Key].set_name(kOutput2Name);
+    return result;
+  }
+
+  const string kSignatureKey = "my_signature";
+  const string kMethodName = "my_method";
+  const string kInput1Key = "input_one_key";
+  const string kInput1Name = "input_one";
+  const string kInput2Key = "input_two_key";
+  const string kInput2Name = "input_two";
+  const string kOutput1Key = "output_one_key";
+  const string kOutput1Name = "output_one";
+  const string kOutput2Key = "output_two_key";
+  const string kOutput2Name = "output_two";
+};
+
+TEST_F(SignatureDefUtilsTest, FindSignatureDefByKey) {
+  const MetaGraphDef meta_graph_def = MakeSampleMetaGraphDef();
+  const SignatureDef* signature_def;
+  // Succeeds for an existing signature.
+  TF_ASSERT_OK(
+      FindSignatureDefByKey(meta_graph_def, kSignatureKey, &signature_def));
+  EXPECT_EQ(kMethodName, signature_def->method_name());
+  // Fails for a missing signature.
+  EXPECT_FALSE(
+      FindSignatureDefByKey(meta_graph_def, "nonexistent", &signature_def)
+          .ok());
+}
+
+TEST_F(SignatureDefUtilsTest, FindInputTensorNameByKey) {
+  const SignatureDef signature_def = MakeSampleSignatureDef();
+  string name;
+  // Succeeds for an existing input.
+  TF_ASSERT_OK(FindInputTensorNameByKey(signature_def, kInput2Key, &name));
+  EXPECT_EQ(kInput2Name, name);
+  // Fails for a missing input.
+  EXPECT_FALSE(
+      FindInputTensorNameByKey(signature_def, "nonexistent", &name).ok());
+}
+
+TEST_F(SignatureDefUtilsTest, FindOutputTensorNameByKey) {
+  const SignatureDef signature_def = MakeSampleSignatureDef();
+  string name;
+  // Succeeds for an existing output.
+  TF_ASSERT_OK(FindOutputTensorNameByKey(signature_def, kOutput2Key, &name));
+  EXPECT_EQ(kOutput2Name, name);
+  // Fails for a missing output.
+  EXPECT_FALSE(
+      FindOutputTensorNameByKey(signature_def, "nonexistent", &name).ok());
+}
+
+}  // namespace tensorflow
-- 
GitLab


From 07242db8cf31f9b7e9619650029dd25cc779a079 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Wed, 19 Apr 2017 11:38:34 -0800
Subject: [PATCH 0542/1563] Remove possibly-incompatible colocation constraints
 from ResourceVariable.value() Change: 153620204

---
 tensorflow/python/ops/resource_variable_ops.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 77f0468c01..22a7e3e1b9 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -278,9 +278,10 @@ class ResourceVariable(object):
     """A cached operation which reads the value of this variable."""
     if self._cached_value is not None:
       return self._cached_value
-    with ops.device(self._handle.device):
-      return gen_resource_variable_ops.read_variable_op(
-          self._handle, dtype=self._dtype)
+    with ops.colocate_with(None, ignore_existing=True):
+      with ops.device(self._handle.device):
+        return gen_resource_variable_ops.read_variable_op(
+            self._handle, dtype=self._dtype)
 
   def _as_graph_element(self):
     """Conversion function for Graph.as_graph_element()."""
-- 
GitLab


From ceb500b30059a13d640f00ca754b1d0368b4ebcd Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Wed, 19 Apr 2017 12:01:33 -0800
Subject: [PATCH 0543/1563] C API: Export functions in Windows

Adds visibility attributes to function declarations so that the symbols are
visible in the shared library (tensorflow.dll) built on Windows.
Change: 153622880
---
 tensorflow/c/c_api.h | 637 ++++++++++++++++++++++++-------------------
 1 file changed, 351 insertions(+), 286 deletions(-)

diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h
index 88438a3585..e2aeef0d88 100644
--- a/tensorflow/c/c_api.h
+++ b/tensorflow/c/c_api.h
@@ -64,6 +64,25 @@ limitations under the License.
 //   and the API just provides high level controls over the number of
 //   devices of each type.
 
+// Macro to control visibility of exported symbols in the shared library (.so,
+// .dylib, .dll).
+// This duplicates the TF_EXPORT macro definition in
+// tensorflow/core/platform/macros.h in order to keep this .h file independent
+// of any other includes.$a
+#ifdef SWIG
+#define TF_CAPI_EXPORT
+#else
+#if defined(COMPILER_MSVC)
+#ifdef TF_COMPILE_LIBRARY
+#define TF_CAPI_EXPORT __declspec(dllexport)
+#else
+#define TF_CAPI_EXPORT __declspec(dllimport)
+#endif  // TF_COMPILE_LIBRARY
+#else
+#define TF_CAPI_EXPORT __attribute__((visibility("default")))
+#endif  // COMPILER_MSVC
+#endif  // SWIG
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -71,7 +90,7 @@ extern "C" {
 // --------------------------------------------------------------------------
 // TF_Version returns a string describing version information of the
 // TensorFlow library. TensorFlow using semantic versioning.
-extern const char* TF_Version();
+TF_CAPI_EXPORT extern const char* TF_Version();
 
 // --------------------------------------------------------------------------
 // TF_DataType holds the type for a scalar value.  E.g., one slot in a tensor.
@@ -103,7 +122,7 @@ typedef enum {
 // TF_DataTypeSize returns the sizeof() for the underlying type corresponding
 // to the given TF_DataType enum value. Returns 0 for variable length types
 // (eg. TF_STRING) or on failure.
-extern size_t TF_DataTypeSize(TF_DataType dt);
+TF_CAPI_EXPORT extern size_t TF_DataTypeSize(TF_DataType dt);
 
 // --------------------------------------------------------------------------
 // TF_Code holds an error code.  The enum values here are identical to
@@ -134,23 +153,24 @@ typedef enum {
 typedef struct TF_Status TF_Status;
 
 // Return a new status object.
-extern TF_Status* TF_NewStatus();
+TF_CAPI_EXPORT extern TF_Status* TF_NewStatus();
 
 // Delete a previously created status object.
-extern void TF_DeleteStatus(TF_Status*);
+TF_CAPI_EXPORT extern void TF_DeleteStatus(TF_Status*);
 
 // Record <code, msg> in *s.  Any previous information is lost.
 // A common use is to clear a status: TF_SetStatus(s, TF_OK, "");
-extern void TF_SetStatus(TF_Status* s, TF_Code code, const char* msg);
+TF_CAPI_EXPORT extern void TF_SetStatus(TF_Status* s, TF_Code code,
+                                        const char* msg);
 
 // Return the code record in *s.
-extern TF_Code TF_GetCode(const TF_Status* s);
+TF_CAPI_EXPORT extern TF_Code TF_GetCode(const TF_Status* s);
 
 // Return a pointer to the (null-terminated) error message in *s.  The
 // return value points to memory that is only usable until the next
 // mutation to *s.  Always returns an empty string if TF_GetCode(s) is
 // TF_OK.
-extern const char* TF_Message(const TF_Status* s);
+TF_CAPI_EXPORT extern const char* TF_Message(const TF_Status* s);
 
 // --------------------------------------------------------------------------
 // TF_Buffer holds a pointer to a block of data and its associated length.
@@ -168,14 +188,15 @@ typedef struct TF_Buffer {
 
 // Makes a copy of the input and sets an appropriate deallocator.  Useful for
 // passing in read-only, input protobufs.
-extern TF_Buffer* TF_NewBufferFromString(const void* proto, size_t proto_len);
+TF_CAPI_EXPORT extern TF_Buffer* TF_NewBufferFromString(const void* proto,
+                                                        size_t proto_len);
 
 // Useful for passing *out* a protobuf.
-extern TF_Buffer* TF_NewBuffer();
+TF_CAPI_EXPORT extern TF_Buffer* TF_NewBuffer();
 
-extern void TF_DeleteBuffer(TF_Buffer*);
+TF_CAPI_EXPORT extern void TF_DeleteBuffer(TF_Buffer*);
 
-extern TF_Buffer TF_GetBuffer(TF_Buffer* buffer);
+TF_CAPI_EXPORT extern TF_Buffer TF_GetBuffer(TF_Buffer* buffer);
 
 // --------------------------------------------------------------------------
 // TF_Tensor holds a multi-dimensional array of elements of a single data type.
@@ -202,11 +223,10 @@ typedef struct TF_Tensor TF_Tensor;
 //      (*deallocator)(data, len, deallocator_arg)
 // Clients must provide a custom deallocator function so they can pass in
 // memory managed by something like numpy.
-extern TF_Tensor* TF_NewTensor(TF_DataType, const int64_t* dims, int num_dims,
-                               void* data, size_t len,
-                               void (*deallocator)(void* data, size_t len,
-                                                   void* arg),
-                               void* deallocator_arg);
+TF_CAPI_EXPORT extern TF_Tensor* TF_NewTensor(
+    TF_DataType, const int64_t* dims, int num_dims, void* data, size_t len,
+    void (*deallocator)(void* data, size_t len, void* arg),
+    void* deallocator_arg);
 
 // Allocate and return a new Tensor.
 //
@@ -217,31 +237,32 @@ extern TF_Tensor* TF_NewTensor(TF_DataType, const int64_t* dims, int num_dims,
 //
 // The caller must set the Tensor values by writing them to the pointer returned
 // by TF_TensorData with length TF_TensorByteSize.
-extern TF_Tensor* TF_AllocateTensor(TF_DataType, const int64_t* dims,
-                                    int num_dims, size_t len);
+TF_CAPI_EXPORT extern TF_Tensor* TF_AllocateTensor(TF_DataType,
+                                                   const int64_t* dims,
+                                                   int num_dims, size_t len);
 
 // Deletes `tensor` and returns a new TF_Tensor with the same content if
 // possible. Returns nullptr and leaves `tensor` untouched if not.
-extern TF_Tensor* TF_TensorMaybeMove(TF_Tensor* tensor);
+TF_CAPI_EXPORT extern TF_Tensor* TF_TensorMaybeMove(TF_Tensor* tensor);
 
 // Destroy a tensor.
-extern void TF_DeleteTensor(TF_Tensor*);
+TF_CAPI_EXPORT extern void TF_DeleteTensor(TF_Tensor*);
 
 // Return the type of a tensor element.
-extern TF_DataType TF_TensorType(const TF_Tensor*);
+TF_CAPI_EXPORT extern TF_DataType TF_TensorType(const TF_Tensor*);
 
 // Return the number of dimensions that the tensor has.
-extern int TF_NumDims(const TF_Tensor*);
+TF_CAPI_EXPORT extern int TF_NumDims(const TF_Tensor*);
 
 // Return the length of the tensor in the "dim_index" dimension.
 // REQUIRES: 0 <= dim_index < TF_NumDims(tensor)
-extern int64_t TF_Dim(const TF_Tensor* tensor, int dim_index);
+TF_CAPI_EXPORT extern int64_t TF_Dim(const TF_Tensor* tensor, int dim_index);
 
 // Return the size of the underlying data in bytes.
-extern size_t TF_TensorByteSize(const TF_Tensor*);
+TF_CAPI_EXPORT extern size_t TF_TensorByteSize(const TF_Tensor*);
 
 // Return a pointer to the underlying data buffer.
-extern void* TF_TensorData(const TF_Tensor*);
+TF_CAPI_EXPORT extern void* TF_TensorData(const TF_Tensor*);
 
 // --------------------------------------------------------------------------
 // Encode the string `src` (`src_len` bytes long) into `dst` in the format
@@ -251,8 +272,9 @@ extern void* TF_TensorData(const TF_Tensor*);
 //
 // On success returns the size in bytes of the encoded string.
 // Returns an error into `status` otherwise.
-extern size_t TF_StringEncode(const char* src, size_t src_len, char* dst,
-                              size_t dst_len, TF_Status* status);
+TF_CAPI_EXPORT extern size_t TF_StringEncode(const char* src, size_t src_len,
+                                             char* dst, size_t dst_len,
+                                             TF_Status* status);
 
 // Decode a string encoded using TF_StringEncode.
 //
@@ -262,19 +284,20 @@ extern size_t TF_StringEncode(const char* src, size_t src_len, char* dst,
 // `*dst` and `*dst_len` are undefined and an error is set in `status`.
 //
 // Does not read memory more than `src_len` bytes beyond `src`.
-extern size_t TF_StringDecode(const char* src, size_t src_len, const char** dst,
-                              size_t* dst_len, TF_Status* status);
+TF_CAPI_EXPORT extern size_t TF_StringDecode(const char* src, size_t src_len,
+                                             const char** dst, size_t* dst_len,
+                                             TF_Status* status);
 
 // Return the size in bytes required to encode a string `len` bytes long into a
 // TF_STRING tensor.
-extern size_t TF_StringEncodedSize(size_t len);
+TF_CAPI_EXPORT extern size_t TF_StringEncodedSize(size_t len);
 
 // --------------------------------------------------------------------------
 // TF_SessionOptions holds options that can be passed during session creation.
 typedef struct TF_SessionOptions TF_SessionOptions;
 
 // Return a new options object.
-extern TF_SessionOptions* TF_NewSessionOptions();
+TF_CAPI_EXPORT extern TF_SessionOptions* TF_NewSessionOptions();
 
 // Set the target in TF_SessionOptions.options.
 // target can be empty, a single entry, or a comma separated list of entries.
@@ -282,17 +305,19 @@ extern TF_SessionOptions* TF_NewSessionOptions();
 // "local"
 // ip:port
 // host:port
-extern void TF_SetTarget(TF_SessionOptions* options, const char* target);
+TF_CAPI_EXPORT extern void TF_SetTarget(TF_SessionOptions* options,
+                                        const char* target);
 
 // Set the config in TF_SessionOptions.options.
 // config should be a serialized tensorflow.ConfigProto proto.
 // If config was not parsed successfully as a ConfigProto, record the
 // error information in *status.
-extern void TF_SetConfig(TF_SessionOptions* options, const void* proto,
-                         size_t proto_len, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_SetConfig(TF_SessionOptions* options,
+                                        const void* proto, size_t proto_len,
+                                        TF_Status* status);
 
 // Destroy an options object.
-extern void TF_DeleteSessionOptions(TF_SessionOptions*);
+TF_CAPI_EXPORT extern void TF_DeleteSessionOptions(TF_SessionOptions*);
 
 // TODO(jeff,sanjay):
 // - export functions to set Config fields
@@ -305,11 +330,11 @@ extern void TF_DeleteSessionOptions(TF_SessionOptions*);
 typedef struct TF_Graph TF_Graph;
 
 // Return a new graph object.
-extern TF_Graph* TF_NewGraph();
+TF_CAPI_EXPORT extern TF_Graph* TF_NewGraph();
 
 // Destroy an options object.  Graph will be deleted once no more
 // TFSession's are referencing it.
-extern void TF_DeleteGraph(TF_Graph*);
+TF_CAPI_EXPORT extern void TF_DeleteGraph(TF_Graph*);
 
 // Operation being built. The underlying graph must outlive this.
 typedef struct TF_OperationDescription TF_OperationDescription;
@@ -347,9 +372,11 @@ typedef struct TF_Output {
 //   * `output` is not in `graph`.
 //   * An invalid shape is being set (e.g., the shape being set
 //     is incompatible with the existing shape).
-extern void TF_GraphSetTensorShape(TF_Graph* graph, TF_Output output,
-                                   const int64_t* dims, const int num_dims,
-                                   TF_Status* status);
+TF_CAPI_EXPORT extern void TF_GraphSetTensorShape(TF_Graph* graph,
+                                                  TF_Output output,
+                                                  const int64_t* dims,
+                                                  const int num_dims,
+                                                  TF_Status* status);
 
 // Returns the number of dimensions of the Tensor referenced by `output`
 // in `graph`.
@@ -358,8 +385,9 @@ extern void TF_GraphSetTensorShape(TF_Graph* graph, TF_Output output,
 //
 // Returns an error into `status` if:
 //   * `output` is not in `graph`.
-extern int TF_GraphGetTensorNumDims(TF_Graph* graph, TF_Output output,
-                                    TF_Status* status);
+TF_CAPI_EXPORT extern int TF_GraphGetTensorNumDims(TF_Graph* graph,
+                                                   TF_Output output,
+                                                   TF_Status* status);
 
 // Returns the shape of the Tensor referenced by `output` in `graph`
 // into `dims`. `dims` must be an array large enough to hold `num_dims`
@@ -373,20 +401,21 @@ extern int TF_GraphGetTensorNumDims(TF_Graph* graph, TF_Output output,
 // Returns an error into `status` if:
 //   * `output` is not in `graph`.
 //   * `num_dims` does not match the actual number of dimensions.
-extern void TF_GraphGetTensorShape(TF_Graph* graph, TF_Output output,
-                                   int64_t* dims, int num_dims,
-                                   TF_Status* status);
+TF_CAPI_EXPORT extern void TF_GraphGetTensorShape(TF_Graph* graph,
+                                                  TF_Output output,
+                                                  int64_t* dims, int num_dims,
+                                                  TF_Status* status);
 
 // Operation will only be added to *graph when TF_FinishOperation() is
 // called (assuming TF_FinishOperation() does not return an error).
 // *graph must not be deleted until after TF_FinishOperation() is
 // called.
-extern TF_OperationDescription* TF_NewOperation(TF_Graph* graph,
-                                                const char* op_type,
-                                                const char* oper_name);
+TF_CAPI_EXPORT extern TF_OperationDescription* TF_NewOperation(
+    TF_Graph* graph, const char* op_type, const char* oper_name);
 
 // Specify the device for `desc`.  Defaults to empty, meaning unconstrained.
-extern void TF_SetDevice(TF_OperationDescription* desc, const char* device);
+TF_CAPI_EXPORT extern void TF_SetDevice(TF_OperationDescription* desc,
+                                        const char* device);
 
 // The calls to TF_AddInput and TF_AddInputList must match (in number,
 // order, and type) the op declaration.  For example, the "Concat" op
@@ -409,101 +438,115 @@ extern void TF_SetDevice(TF_OperationDescription* desc, const char* device);
 //   TF_AddInputList(desc, values_inputs, 5);
 
 // For inputs that take a single tensor.
-extern void TF_AddInput(TF_OperationDescription* desc, TF_Output input);
+TF_CAPI_EXPORT extern void TF_AddInput(TF_OperationDescription* desc,
+                                       TF_Output input);
 
 // For inputs that take a list of tensors.
 // inputs must point to TF_Output[num_inputs].
-extern void TF_AddInputList(TF_OperationDescription* desc,
-                            const TF_Output* inputs, int num_inputs);
+TF_CAPI_EXPORT extern void TF_AddInputList(TF_OperationDescription* desc,
+                                           const TF_Output* inputs,
+                                           int num_inputs);
 
 // Call once per control input to `desc`.
-extern void TF_AddControlInput(TF_OperationDescription* desc,
-                               TF_Operation* input);
+TF_CAPI_EXPORT extern void TF_AddControlInput(TF_OperationDescription* desc,
+                                              TF_Operation* input);
 
 // Request that `desc` be co-located on the device where `op`
 // is placed.
 //
 // Use of this is discouraged since the implementation of device placement is
 // subject to change. Primarily intended for internal libraries
-extern void TF_ColocateWith(TF_OperationDescription* desc, TF_Operation* op);
+TF_CAPI_EXPORT extern void TF_ColocateWith(TF_OperationDescription* desc,
+                                           TF_Operation* op);
 
 // Call some TF_SetAttr*() function for every attr that is not
 // inferred from an input and doesn't have a default value you wish to
 // keep.
 
 // `value` must point to a string of length `length` bytes.
-extern void TF_SetAttrString(TF_OperationDescription* desc,
-                             const char* attr_name, const void* value,
-                             size_t length);
+TF_CAPI_EXPORT extern void TF_SetAttrString(TF_OperationDescription* desc,
+                                            const char* attr_name,
+                                            const void* value, size_t length);
 // `values` and `lengths` each must have lengths `num_values`.
 // `values[i]` must point to a string of length `lengths[i]` bytes.
-extern void TF_SetAttrStringList(TF_OperationDescription* desc,
-                                 const char* attr_name,
-                                 const void* const* values,
-                                 const size_t* lengths, int num_values);
-extern void TF_SetAttrInt(TF_OperationDescription* desc, const char* attr_name,
-                          int64_t value);
-extern void TF_SetAttrIntList(TF_OperationDescription* desc,
-                              const char* attr_name, const int64_t* values,
-                              int num_values);
-extern void TF_SetAttrFloat(TF_OperationDescription* desc,
-                            const char* attr_name, float value);
-extern void TF_SetAttrFloatList(TF_OperationDescription* desc,
-                                const char* attr_name, const float* values,
-                                int num_values);
-extern void TF_SetAttrBool(TF_OperationDescription* desc, const char* attr_name,
-                           unsigned char value);
-extern void TF_SetAttrBoolList(TF_OperationDescription* desc,
-                               const char* attr_name,
-                               const unsigned char* values, int num_values);
-extern void TF_SetAttrType(TF_OperationDescription* desc, const char* attr_name,
-                           TF_DataType value);
-extern void TF_SetAttrTypeList(TF_OperationDescription* desc,
-                               const char* attr_name, const TF_DataType* values,
-                               int num_values);
+TF_CAPI_EXPORT extern void TF_SetAttrStringList(TF_OperationDescription* desc,
+                                                const char* attr_name,
+                                                const void* const* values,
+                                                const size_t* lengths,
+                                                int num_values);
+TF_CAPI_EXPORT extern void TF_SetAttrInt(TF_OperationDescription* desc,
+                                         const char* attr_name, int64_t value);
+TF_CAPI_EXPORT extern void TF_SetAttrIntList(TF_OperationDescription* desc,
+                                             const char* attr_name,
+                                             const int64_t* values,
+                                             int num_values);
+TF_CAPI_EXPORT extern void TF_SetAttrFloat(TF_OperationDescription* desc,
+                                           const char* attr_name, float value);
+TF_CAPI_EXPORT extern void TF_SetAttrFloatList(TF_OperationDescription* desc,
+                                               const char* attr_name,
+                                               const float* values,
+                                               int num_values);
+TF_CAPI_EXPORT extern void TF_SetAttrBool(TF_OperationDescription* desc,
+                                          const char* attr_name,
+                                          unsigned char value);
+TF_CAPI_EXPORT extern void TF_SetAttrBoolList(TF_OperationDescription* desc,
+                                              const char* attr_name,
+                                              const unsigned char* values,
+                                              int num_values);
+TF_CAPI_EXPORT extern void TF_SetAttrType(TF_OperationDescription* desc,
+                                          const char* attr_name,
+                                          TF_DataType value);
+TF_CAPI_EXPORT extern void TF_SetAttrTypeList(TF_OperationDescription* desc,
+                                              const char* attr_name,
+                                              const TF_DataType* values,
+                                              int num_values);
 
 // Set `num_dims` to -1 to represent "unknown rank".  Otherwise,
 // `dims` points to an array of length `num_dims`.  `dims[i]` must be
 // >= -1, with -1 meaning "unknown dimension".
-extern void TF_SetAttrShape(TF_OperationDescription* desc,
-                            const char* attr_name, const int64_t* dims,
-                            int num_dims);
+TF_CAPI_EXPORT extern void TF_SetAttrShape(TF_OperationDescription* desc,
+                                           const char* attr_name,
+                                           const int64_t* dims, int num_dims);
 // `dims` and `num_dims` must point to arrays of length `num_shapes`.
 // Set `num_dims[i]` to -1 to represent "unknown rank".  Otherwise,
 // `dims[i]` points to an array of length `num_dims[i]`.  `dims[i][j]`
 // must be >= -1, with -1 meaning "unknown dimension".
-extern void TF_SetAttrShapeList(TF_OperationDescription* desc,
-                                const char* attr_name,
-                                const int64_t* const* dims, const int* num_dims,
-                                int num_shapes);
+TF_CAPI_EXPORT extern void TF_SetAttrShapeList(TF_OperationDescription* desc,
+                                               const char* attr_name,
+                                               const int64_t* const* dims,
+                                               const int* num_dims,
+                                               int num_shapes);
 // `proto` must point to an array of `proto_len` bytes representing a
 // binary-serialized TensorShapeProto.
-extern void TF_SetAttrTensorShapeProto(TF_OperationDescription* desc,
-                                       const char* attr_name, const void* proto,
-                                       size_t proto_len, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_SetAttrTensorShapeProto(
+    TF_OperationDescription* desc, const char* attr_name, const void* proto,
+    size_t proto_len, TF_Status* status);
 // `protos` and `proto_lens` must point to arrays of length `num_shapes`.
 // `protos[i]` must point to an array of `proto_lens[i]` bytes
 // representing a binary-serialized TensorShapeProto.
-extern void TF_SetAttrTensorShapeProtoList(TF_OperationDescription* desc,
-                                           const char* attr_name,
-                                           const void* const* protos,
-                                           const size_t* proto_lens,
-                                           int num_shapes, TF_Status* status);
-
-extern void TF_SetAttrTensor(TF_OperationDescription* desc,
-                             const char* attr_name, TF_Tensor* value,
-                             TF_Status* status);
-extern void TF_SetAttrTensorList(TF_OperationDescription* desc,
-                                 const char* attr_name,
-                                 TF_Tensor* const* values, int num_values,
-                                 TF_Status* status);
+TF_CAPI_EXPORT extern void TF_SetAttrTensorShapeProtoList(
+    TF_OperationDescription* desc, const char* attr_name,
+    const void* const* protos, const size_t* proto_lens, int num_shapes,
+    TF_Status* status);
+
+TF_CAPI_EXPORT extern void TF_SetAttrTensor(TF_OperationDescription* desc,
+                                            const char* attr_name,
+                                            TF_Tensor* value,
+                                            TF_Status* status);
+TF_CAPI_EXPORT extern void TF_SetAttrTensorList(TF_OperationDescription* desc,
+                                                const char* attr_name,
+                                                TF_Tensor* const* values,
+                                                int num_values,
+                                                TF_Status* status);
 
 // `proto` should point to a sequence of bytes of length `proto_len`
 // representing a binary serialization of an AttrValue protocol
 // buffer.
-extern void TF_SetAttrValueProto(TF_OperationDescription* desc,
-                                 const char* attr_name, const void* proto,
-                                 size_t proto_len, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_SetAttrValueProto(TF_OperationDescription* desc,
+                                                const char* attr_name,
+                                                const void* proto,
+                                                size_t proto_len,
+                                                TF_Status* status);
 
 // If this function succeeds:
 //   * *status is set to an OK value,
@@ -515,37 +558,38 @@ extern void TF_SetAttrValueProto(TF_OperationDescription* desc,
 //   * the graph is not modified,
 //   * a null value is returned.
 // In either case, it deletes `desc`.
-extern TF_Operation* TF_FinishOperation(TF_OperationDescription* desc,
-                                        TF_Status* status);
+TF_CAPI_EXPORT extern TF_Operation* TF_FinishOperation(
+    TF_OperationDescription* desc, TF_Status* status);
 
 // TF_Operation functions.  Operations are immutable once created, so
 // these are all query functions.
 
-extern const char* TF_OperationName(TF_Operation* oper);
-extern const char* TF_OperationOpType(TF_Operation* oper);
-extern const char* TF_OperationDevice(TF_Operation* oper);
+TF_CAPI_EXPORT extern const char* TF_OperationName(TF_Operation* oper);
+TF_CAPI_EXPORT extern const char* TF_OperationOpType(TF_Operation* oper);
+TF_CAPI_EXPORT extern const char* TF_OperationDevice(TF_Operation* oper);
 
-extern int TF_OperationNumOutputs(TF_Operation* oper);
-extern TF_DataType TF_OperationOutputType(TF_Output oper_out);
-extern int TF_OperationOutputListLength(TF_Operation* oper,
-                                        const char* arg_name,
-                                        TF_Status* status);
+TF_CAPI_EXPORT extern int TF_OperationNumOutputs(TF_Operation* oper);
+TF_CAPI_EXPORT extern TF_DataType TF_OperationOutputType(TF_Output oper_out);
+TF_CAPI_EXPORT extern int TF_OperationOutputListLength(TF_Operation* oper,
+                                                       const char* arg_name,
+                                                       TF_Status* status);
 
-extern int TF_OperationNumInputs(TF_Operation* oper);
-extern TF_DataType TF_OperationInputType(TF_Input oper_in);
-extern int TF_OperationInputListLength(TF_Operation* oper, const char* arg_name,
-                                       TF_Status* status);
+TF_CAPI_EXPORT extern int TF_OperationNumInputs(TF_Operation* oper);
+TF_CAPI_EXPORT extern TF_DataType TF_OperationInputType(TF_Input oper_in);
+TF_CAPI_EXPORT extern int TF_OperationInputListLength(TF_Operation* oper,
+                                                      const char* arg_name,
+                                                      TF_Status* status);
 
 // In this code:
 //   TF_Output producer = TF_OperationInput(consumer);
 // There is an edge from producer.oper's output (given by
 // producer.index) to consumer.oper's input (given by consumer.index).
-extern TF_Output TF_OperationInput(TF_Input oper_in);
+TF_CAPI_EXPORT extern TF_Output TF_OperationInput(TF_Input oper_in);
 
 // Get the number of current consumers of a specific output of an
 // operation.  Note that this number can change when new operations
 // are added to the graph.
-extern int TF_OperationOutputNumConsumers(TF_Output oper_out);
+TF_CAPI_EXPORT extern int TF_OperationOutputNumConsumers(TF_Output oper_out);
 
 // Get list of all current consumers of a specific output of an
 // operation.  `consumers` must point to an array of length at least
@@ -554,24 +598,24 @@ extern int TF_OperationOutputNumConsumers(TF_Output oper_out);
 // modification of the graph can increase the number of consumers of
 // an operation.  Returns the number of output consumers (should match
 // TF_OperationOutputNumConsumers(oper_out)).
-extern int TF_OperationOutputConsumers(TF_Output oper_out, TF_Input* consumers,
-                                       int max_consumers);
+TF_CAPI_EXPORT extern int TF_OperationOutputConsumers(TF_Output oper_out,
+                                                      TF_Input* consumers,
+                                                      int max_consumers);
 
 // Get the number of control inputs to an operation.
-extern int TF_OperationNumControlInputs(TF_Operation* oper);
+TF_CAPI_EXPORT extern int TF_OperationNumControlInputs(TF_Operation* oper);
 
 // Get list of all control inputs to an operation.  `control_inputs` must
 // point to an array of length `max_control_inputs` (ideally set to
 // TF_OperationNumControlInputs(oper)).  Returns the number of control
 // inputs (should match TF_OperationNumControlInputs(oper)).
-extern int TF_OperationGetControlInputs(TF_Operation* oper,
-                                        TF_Operation** control_inputs,
-                                        int max_control_inputs);
+TF_CAPI_EXPORT extern int TF_OperationGetControlInputs(
+    TF_Operation* oper, TF_Operation** control_inputs, int max_control_inputs);
 
 // Get the number of operations that have `*oper` as a control input.
 // Note that this number can change when new operations are added to
 // the graph.
-extern int TF_OperationNumControlOutputs(TF_Operation* oper);
+TF_CAPI_EXPORT extern int TF_OperationNumControlOutputs(TF_Operation* oper);
 
 // Get the list of operations that have `*oper` as a control input.
 // `control_outputs` must point to an array of length at least
@@ -580,9 +624,9 @@ extern int TF_OperationNumControlOutputs(TF_Operation* oper);
 // modification of the graph can increase the number of control
 // outputs.  Returns the number of control outputs (should match
 // TF_OperationNumControlOutputs(oper)).
-extern int TF_OperationGetControlOutputs(TF_Operation* oper,
-                                         TF_Operation** control_outputs,
-                                         int max_control_outputs);
+TF_CAPI_EXPORT extern int TF_OperationGetControlOutputs(
+    TF_Operation* oper, TF_Operation** control_outputs,
+    int max_control_outputs);
 
 // TF_AttrType describes the type of the value of an attribute on an operation.
 typedef enum {
@@ -629,17 +673,18 @@ typedef struct TF_AttrMetadata {
 } TF_AttrMetadata;
 
 // Returns metadata about the value of the attribute `attr_name` of `oper`.
-extern TF_AttrMetadata TF_OperationGetAttrMetadata(TF_Operation* oper,
-                                                   const char* attr_name,
-                                                   TF_Status* status);
+TF_CAPI_EXPORT extern TF_AttrMetadata TF_OperationGetAttrMetadata(
+    TF_Operation* oper, const char* attr_name, TF_Status* status);
 
 // Fills in `value` with the value of the attribute `attr_name`.  `value` must
 // point to an array of length at least `max_length` (ideally set to
 // TF_AttrMetadata.total_size from TF_OperationGetAttrMetadata(oper,
 // attr_name)).
-extern void TF_OperationGetAttrString(TF_Operation* oper, const char* attr_name,
-                                      void* value, size_t max_length,
-                                      TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrString(TF_Operation* oper,
+                                                     const char* attr_name,
+                                                     void* value,
+                                                     size_t max_length,
+                                                     TF_Status* status);
 
 // Get the list of strings in the value of the attribute `attr_name`.  Fills in
 // `values` and `lengths`, each of which must point to an array of length at
@@ -652,64 +697,78 @@ extern void TF_OperationGetAttrString(TF_Operation* oper, const char* attr_name,
 // attr_name).
 //
 // Fails if storage_size is too small to hold the requested number of strings.
-extern void TF_OperationGetAttrStringList(TF_Operation* oper,
-                                          const char* attr_name, void** values,
-                                          size_t* lengths, int max_values,
-                                          void* storage, size_t storage_size,
-                                          TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrStringList(
+    TF_Operation* oper, const char* attr_name, void** values, size_t* lengths,
+    int max_values, void* storage, size_t storage_size, TF_Status* status);
 
-extern void TF_OperationGetAttrInt(TF_Operation* oper, const char* attr_name,
-                                   int64_t* value, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrInt(TF_Operation* oper,
+                                                  const char* attr_name,
+                                                  int64_t* value,
+                                                  TF_Status* status);
 
 // Fills in `values` with the value of the attribute `attr_name` of `oper`.
 // `values` must point to an array of length at least `max_values` (ideally set
 // TF_AttrMetadata.list_size from TF_OperationGetAttrMetadata(oper,
 // attr_name)).
-extern void TF_OperationGetAttrIntList(TF_Operation* oper,
-                                       const char* attr_name, int64_t* values,
-                                       int max_values, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrIntList(TF_Operation* oper,
+                                                      const char* attr_name,
+                                                      int64_t* values,
+                                                      int max_values,
+                                                      TF_Status* status);
 
-extern void TF_OperationGetAttrFloat(TF_Operation* oper, const char* attr_name,
-                                     float* value, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrFloat(TF_Operation* oper,
+                                                    const char* attr_name,
+                                                    float* value,
+                                                    TF_Status* status);
 
 // Fills in `values` with the value of the attribute `attr_name` of `oper`.
 // `values` must point to an array of length at least `max_values` (ideally set
 // to TF_AttrMetadata.list_size from TF_OperationGetAttrMetadata(oper,
 // attr_name)).
-extern void TF_OperationGetAttrFloatList(TF_Operation* oper,
-                                         const char* attr_name, float* values,
-                                         int max_values, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrFloatList(TF_Operation* oper,
+                                                        const char* attr_name,
+                                                        float* values,
+                                                        int max_values,
+                                                        TF_Status* status);
 
-extern void TF_OperationGetAttrBool(TF_Operation* oper, const char* attr_name,
-                                    unsigned char* value, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrBool(TF_Operation* oper,
+                                                   const char* attr_name,
+                                                   unsigned char* value,
+                                                   TF_Status* status);
 
 // Fills in `values` with the value of the attribute `attr_name` of `oper`.
 // `values` must point to an array of length at least `max_values` (ideally set
 // to TF_AttrMetadata.list_size from TF_OperationGetAttrMetadata(oper,
 // attr_name)).
-extern void TF_OperationGetAttrBoolList(TF_Operation* oper,
-                                        const char* attr_name,
-                                        unsigned char* values, int max_values,
-                                        TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrBoolList(TF_Operation* oper,
+                                                       const char* attr_name,
+                                                       unsigned char* values,
+                                                       int max_values,
+                                                       TF_Status* status);
 
-extern void TF_OperationGetAttrType(TF_Operation* oper, const char* attr_name,
-                                    TF_DataType* value, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrType(TF_Operation* oper,
+                                                   const char* attr_name,
+                                                   TF_DataType* value,
+                                                   TF_Status* status);
 
 // Fills in `values` with the value of the attribute `attr_name` of `oper`.
 // `values` must point to an array of length at least `max_values` (ideally set
 // to TF_AttrMetadata.list_size from TF_OperationGetAttrMetadata(oper,
 // attr_name)).
-extern void TF_OperationGetAttrTypeList(TF_Operation* oper,
-                                        const char* attr_name,
-                                        TF_DataType* values, int max_values,
-                                        TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrTypeList(TF_Operation* oper,
+                                                       const char* attr_name,
+                                                       TF_DataType* values,
+                                                       int max_values,
+                                                       TF_Status* status);
 
 // Fills in `value` with the value of the attribute `attr_name` of `oper`.
 // `values` must point to an array of length at least `num_dims` (ideally set to
 // TF_Attr_Meta.size from TF_OperationGetAttrMetadata(oper, attr_name)).
-extern void TF_OperationGetAttrShape(TF_Operation* oper, const char* attr_name,
-                                     int64_t* value, int num_dims,
-                                     TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrShape(TF_Operation* oper,
+                                                    const char* attr_name,
+                                                    int64_t* value,
+                                                    int num_dims,
+                                                    TF_Status* status);
 
 // Fills in `dims` with the list of shapes in the attribute `attr_name` of
 // `oper` and `num_dims` with the corresponding number of dimensions. On return,
@@ -724,35 +783,32 @@ extern void TF_OperationGetAttrShape(TF_Operation* oper, const char* attr_name,
 // attr_name).
 //
 // Fails if storage_size is insufficient to hold the requested shapes.
-extern void TF_OperationGetAttrShapeList(TF_Operation* oper,
-                                         const char* attr_name, int64_t** dims,
-                                         int* num_dims, int num_shapes,
-                                         int64_t* storage, int storage_size,
-                                         TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrShapeList(
+    TF_Operation* oper, const char* attr_name, int64_t** dims, int* num_dims,
+    int num_shapes, int64_t* storage, int storage_size, TF_Status* status);
 
 // Sets `value` to the binary-serialized TensorShapeProto of the value of
 // `attr_name` attribute of `oper`'.
-extern void TF_OperationGetAttrTensorShapeProto(TF_Operation* oper,
-                                                const char* attr_name,
-                                                TF_Buffer* value,
-                                                TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrTensorShapeProto(
+    TF_Operation* oper, const char* attr_name, TF_Buffer* value,
+    TF_Status* status);
 
 // Fills in `values` with binary-serialized TensorShapeProto values of the
 // attribute `attr_name` of `oper`. `values` must point to an array of length at
 // least `num_values` (ideally set to TF_AttrMetadata.list_size from
 // TF_OperationGetAttrMetadata(oper, attr_name)).
-extern void TF_OperationGetAttrTensorShapeProtoList(TF_Operation* oper,
-                                                    const char* attr_name,
-                                                    TF_Buffer** values,
-                                                    int max_values,
-                                                    TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrTensorShapeProtoList(
+    TF_Operation* oper, const char* attr_name, TF_Buffer** values,
+    int max_values, TF_Status* status);
 
 // Gets the TF_Tensor valued attribute of `attr_name` of `oper`.
 //
 // Allocates a new TF_Tensor which the caller is expected to take
 // ownership of (and can deallocate using TF_DeleteTensor).
-extern void TF_OperationGetAttrTensor(TF_Operation* oper, const char* attr_name,
-                                      TF_Tensor** value, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrTensor(TF_Operation* oper,
+                                                     const char* attr_name,
+                                                     TF_Tensor** value,
+                                                     TF_Status* status);
 
 // Fills in `values` with the TF_Tensor values of the attribute `attr_name` of
 // `oper`. `values` must point to an array of TF_Tensor* of length at least
@@ -761,22 +817,22 @@ extern void TF_OperationGetAttrTensor(TF_Operation* oper, const char* attr_name,
 //
 // The caller takes ownership of all the non-null TF_Tensor* entries in `values`
 // (which can be deleted using TF_DeleteTensor(values[i])).
-extern void TF_OperationGetAttrTensorList(TF_Operation* oper,
-                                          const char* attr_name,
-                                          TF_Tensor** values, int max_values,
-                                          TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrTensorList(TF_Operation* oper,
+                                                         const char* attr_name,
+                                                         TF_Tensor** values,
+                                                         int max_values,
+                                                         TF_Status* status);
 
 // Sets `output_attr_value` to the binary-serialized AttrValue proto
 // representation of the value of the `attr_name` attr of `oper`.
-extern void TF_OperationGetAttrValueProto(TF_Operation* oper,
-                                          const char* attr_name,
-                                          TF_Buffer* output_attr_value,
-                                          TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationGetAttrValueProto(
+    TF_Operation* oper, const char* attr_name, TF_Buffer* output_attr_value,
+    TF_Status* status);
 
 // Returns the operation in the graph with `oper_name`. Returns nullptr if
 // no operation found.
-extern TF_Operation* TF_GraphOperationByName(TF_Graph* graph,
-                                             const char* oper_name);
+TF_CAPI_EXPORT extern TF_Operation* TF_GraphOperationByName(
+    TF_Graph* graph, const char* oper_name);
 
 // Iterate through the operations of a graph.  To use:
 // size_t pos = 0;
@@ -784,7 +840,8 @@ extern TF_Operation* TF_GraphOperationByName(TF_Graph* graph,
 // while ((oper = TF_GraphNextOperation(graph, &pos)) != nullptr) {
 //   DoSomethingWithOperation(oper);
 // }
-extern TF_Operation* TF_GraphNextOperation(TF_Graph* graph, size_t* pos);
+TF_CAPI_EXPORT extern TF_Operation* TF_GraphNextOperation(TF_Graph* graph,
+                                                          size_t* pos);
 
 // Write out a serialized representation of `graph` (as a GraphDef protocol
 // message) to `output_graph_def` (allocated by TF_NewBuffer()).
@@ -792,25 +849,27 @@ extern TF_Operation* TF_GraphNextOperation(TF_Graph* graph, size_t* pos);
 // is called.
 //
 // May fail on very large graphs in the future.
-extern void TF_GraphToGraphDef(TF_Graph* graph, TF_Buffer* output_graph_def,
-                               TF_Status* status);
+TF_CAPI_EXPORT extern void TF_GraphToGraphDef(TF_Graph* graph,
+                                              TF_Buffer* output_graph_def,
+                                              TF_Status* status);
 
 // TF_ImportGraphDefOptions holds options that can be passed to
 // TF_GraphImportGraphDef.
 typedef struct TF_ImportGraphDefOptions TF_ImportGraphDefOptions;
 
-extern TF_ImportGraphDefOptions* TF_NewImportGraphDefOptions();
-extern void TF_DeleteImportGraphDefOptions(TF_ImportGraphDefOptions* opts);
+TF_CAPI_EXPORT extern TF_ImportGraphDefOptions* TF_NewImportGraphDefOptions();
+TF_CAPI_EXPORT extern void TF_DeleteImportGraphDefOptions(
+    TF_ImportGraphDefOptions* opts);
 
 // Set the prefix to be prepended to the names of nodes in `graph_def` that will
 // be imported into `graph`.
-extern void TF_ImportGraphDefOptionsSetPrefix(TF_ImportGraphDefOptions* opts,
-                                              const char* prefix);
+TF_CAPI_EXPORT extern void TF_ImportGraphDefOptionsSetPrefix(
+    TF_ImportGraphDefOptions* opts, const char* prefix);
 
 // Set any imported nodes with input `src_name:src_index` to have that input
 // replaced with `dst`. `src_name` refers to a node in the graph to be imported,
 // `dst` references a node already existing in the graph being imported into.
-extern void TF_ImportGraphDefOptionsAddInputMapping(
+TF_CAPI_EXPORT extern void TF_ImportGraphDefOptionsAddInputMapping(
     TF_ImportGraphDefOptions* opts, const char* src_name, int src_index,
     TF_Output dst);
 
@@ -818,23 +877,23 @@ extern void TF_ImportGraphDefOptionsAddInputMapping(
 // replaced with `dst`. `src_name` refers to a node in the graph to be imported,
 // `dst` references an operation already existing in the graph being imported
 // into.
-extern void TF_ImportGraphDefOptionsRemapControlDependency(
+TF_CAPI_EXPORT extern void TF_ImportGraphDefOptionsRemapControlDependency(
     TF_ImportGraphDefOptions* opts, const char* src_name, TF_Operation* dst);
 
 // Cause the imported graph to have a control dependency on `oper`. `oper`
 // should exist in the graph being imported into.
-extern void TF_ImportGraphDefOptionsAddControlDependency(
+TF_CAPI_EXPORT extern void TF_ImportGraphDefOptionsAddControlDependency(
     TF_ImportGraphDefOptions* opts, TF_Operation* oper);
 
 // Add an output in `graph_def` to be returned via the `return_outputs` output
 // parameter of TF_GraphImportGraphDef(). If the output is remapped via an input
 // mapping, the corresponding existing tensor in `graph` will be returned.
-extern void TF_ImportGraphDefOptionsAddReturnOutput(
+TF_CAPI_EXPORT extern void TF_ImportGraphDefOptionsAddReturnOutput(
     TF_ImportGraphDefOptions* opts, const char* oper_name, int index);
 
 // Returns the number of return outputs added via
 // TF_ImportGraphDefOptionsAddReturnOutput().
-extern int TF_ImportGraphDefOptionsNumReturnOutputs(
+TF_CAPI_EXPORT extern int TF_ImportGraphDefOptionsNumReturnOutputs(
     const TF_ImportGraphDefOptions* opts);
 
 // Import the graph serialized in `graph_def` into `graph`.
@@ -843,22 +902,22 @@ extern int TF_ImportGraphDefOptionsNumReturnOutputs(
 // result of TF_ImportGraphDefOptionsNumReturnOutputs()).  If
 // `num_return_outputs` is non-zero, `return_outputs` must be of length
 // `num_return_outputs`. Otherwise it can be null.
-extern void TF_GraphImportGraphDefWithReturnOutputs(
+TF_CAPI_EXPORT extern void TF_GraphImportGraphDefWithReturnOutputs(
     TF_Graph* graph, const TF_Buffer* graph_def,
     const TF_ImportGraphDefOptions* options, TF_Output* return_outputs,
     int num_return_outputs, TF_Status* status);
 
 // Import the graph serialized in `graph_def` into `graph`.
 // Convenience function for when no return outputs have been added.
-extern void TF_GraphImportGraphDef(TF_Graph* graph, const TF_Buffer* graph_def,
-                                   const TF_ImportGraphDefOptions* options,
-                                   TF_Status* status);
+TF_CAPI_EXPORT extern void TF_GraphImportGraphDef(
+    TF_Graph* graph, const TF_Buffer* graph_def,
+    const TF_ImportGraphDefOptions* options, TF_Status* status);
 
 // Note: The following function may fail on very large protos in the future.
 
-extern void TF_OperationToNodeDef(TF_Operation* oper,
-                                  TF_Buffer* output_node_def,
-                                  TF_Status* status);
+TF_CAPI_EXPORT extern void TF_OperationToNodeDef(TF_Operation* oper,
+                                                 TF_Buffer* output_node_def,
+                                                 TF_Status* status);
 
 typedef struct TF_WhileParams {
   // The number of inputs to the while loop, i.e. the number of loop variables.
@@ -955,8 +1014,9 @@ typedef struct TF_Session TF_Session;
 // *graph must be a valid graph (not deleted or nullptr).  This function will
 // prevent the graph from being deleted until TF_DeleteSession() is called.
 // Does not take ownership of opts.
-extern TF_Session* TF_NewSession(TF_Graph* graph, const TF_SessionOptions* opts,
-                                 TF_Status* status);
+TF_CAPI_EXPORT extern TF_Session* TF_NewSession(TF_Graph* graph,
+                                                const TF_SessionOptions* opts,
+                                                TF_Status* status);
 
 // This function creates a new TF_Session (which is created on success) using
 // `session_options`, and then initializes state (restoring tensors and other
@@ -981,7 +1041,7 @@ TF_Session* TF_LoadSessionFromSavedModel(
 //
 // Contacts any other processes associated with the session, if applicable.
 // May not be called after TF_DeleteSession().
-extern void TF_CloseSession(TF_Session*, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_CloseSession(TF_Session*, TF_Status* status);
 
 // Destroy a session object.
 //
@@ -989,7 +1049,7 @@ extern void TF_CloseSession(TF_Session*, TF_Status* status);
 // local resources associated with the session.  The session may not be used
 // during or after this call (and the session drops its reference to the
 // corresponding graph).
-extern void TF_DeleteSession(TF_Session*, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_DeleteSession(TF_Session*, TF_Status* status);
 
 // Run the graph associated with the session starting with the supplied inputs
 // (inputs[0,ninputs-1] with corresponding values in input_values[0,ninputs-1]).
@@ -1015,21 +1075,20 @@ extern void TF_DeleteSession(TF_Session*, TF_Status* status);
 // to the caller, which must eventually call TF_DeleteTensor on them.
 //
 // On failure, output_values[] contains NULLs.
-extern void TF_SessionRun(TF_Session* session,
-                          // RunOptions
-                          const TF_Buffer* run_options,
-                          // Input tensors
-                          const TF_Output* inputs,
-                          TF_Tensor* const* input_values, int ninputs,
-                          // Output tensors
-                          const TF_Output* outputs, TF_Tensor** output_values,
-                          int noutputs,
-                          // Target operations
-                          const TF_Operation* const* target_opers, int ntargets,
-                          // RunMetadata
-                          TF_Buffer* run_metadata,
-                          // Output status
-                          TF_Status*);
+TF_CAPI_EXPORT extern void TF_SessionRun(
+    TF_Session* session,
+    // RunOptions
+    const TF_Buffer* run_options,
+    // Input tensors
+    const TF_Output* inputs, TF_Tensor* const* input_values, int ninputs,
+    // Output tensors
+    const TF_Output* outputs, TF_Tensor** output_values, int noutputs,
+    // Target operations
+    const TF_Operation* const* target_opers, int ntargets,
+    // RunMetadata
+    TF_Buffer* run_metadata,
+    // Output status
+    TF_Status*);
 
 // Set up the graph with the intended feeds (inputs) and fetches (outputs) for a
 // sequence of partial run calls.
@@ -1041,38 +1100,36 @@ extern void TF_SessionRun(TF_Session* session,
 // On failure, out_status contains a tensorflow::Status with an error
 // message.
 // NOTE: This is EXPERIMENTAL and subject to change.
-extern void TF_SessionPRunSetup(TF_Session*,
-                                // Input names
-                                const TF_Output* inputs, int ninputs,
-                                // Output names
-                                const TF_Output* outputs, int noutputs,
-                                // Target operations
-                                const TF_Operation* const* target_opers,
-                                int ntargets,
-                                // Output handle
-                                const char** handle,
-                                // Output status
-                                TF_Status*);
+TF_CAPI_EXPORT extern void TF_SessionPRunSetup(
+    TF_Session*,
+    // Input names
+    const TF_Output* inputs, int ninputs,
+    // Output names
+    const TF_Output* outputs, int noutputs,
+    // Target operations
+    const TF_Operation* const* target_opers, int ntargets,
+    // Output handle
+    const char** handle,
+    // Output status
+    TF_Status*);
 
 // Continue to run the graph with additional feeds and fetches. The
 // execution state is uniquely identified by the handle.
 // NOTE: This is EXPERIMENTAL and subject to change.
-extern void TF_SessionPRun(TF_Session*, const char* handle,
-                           // Input tensors
-                           const TF_Output* inputs,
-                           TF_Tensor* const* input_values, int ninputs,
-                           // Output tensors
-                           const TF_Output* outputs, TF_Tensor** output_values,
-                           int noutputs,
-                           // Target operations
-                           const TF_Operation* const* target_opers,
-                           int ntargets,
-                           // Output status
-                           TF_Status*);
+TF_CAPI_EXPORT extern void TF_SessionPRun(
+    TF_Session*, const char* handle,
+    // Input tensors
+    const TF_Output* inputs, TF_Tensor* const* input_values, int ninputs,
+    // Output tensors
+    const TF_Output* outputs, TF_Tensor** output_values, int noutputs,
+    // Target operations
+    const TF_Operation* const* target_opers, int ntargets,
+    // Output status
+    TF_Status*);
 
 // Deletes a handle allocated by TF_SessionPRunSetup.
 // Once called, no more calls to TF_SessionPRun should be made.
-extern void TF_DeletePRunHandle(const char* handle);
+TF_CAPI_EXPORT extern void TF_DeletePRunHandle(const char* handle);
 
 // --------------------------------------------------------------------------
 // The deprecated session API.  Please switch to the above instead of
@@ -1081,39 +1138,47 @@ extern void TF_DeletePRunHandle(const char* handle);
 
 typedef struct TF_DeprecatedSession TF_DeprecatedSession;
 
-extern TF_DeprecatedSession* TF_NewDeprecatedSession(const TF_SessionOptions*,
+TF_CAPI_EXPORT extern TF_DeprecatedSession* TF_NewDeprecatedSession(
+    const TF_SessionOptions*, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_CloseDeprecatedSession(TF_DeprecatedSession*,
                                                      TF_Status* status);
-extern void TF_CloseDeprecatedSession(TF_DeprecatedSession*, TF_Status* status);
-extern void TF_DeleteDeprecatedSession(TF_DeprecatedSession*,
-                                       TF_Status* status);
-extern void TF_Reset(const TF_SessionOptions* opt, const char** containers,
-                     int ncontainers, TF_Status* status);
+TF_CAPI_EXPORT extern void TF_DeleteDeprecatedSession(TF_DeprecatedSession*,
+                                                      TF_Status* status);
+TF_CAPI_EXPORT extern void TF_Reset(const TF_SessionOptions* opt,
+                                    const char** containers, int ncontainers,
+                                    TF_Status* status);
 // Treat the bytes proto[0,proto_len-1] as a serialized GraphDef and
 // add the nodes in that GraphDef to the graph for the session.
 //
 // Prefer use of TF_Session and TF_GraphImportGraphDef over this.
-extern void TF_ExtendGraph(TF_DeprecatedSession*, const void* proto,
-                           size_t proto_len, TF_Status*);
+TF_CAPI_EXPORT extern void TF_ExtendGraph(TF_DeprecatedSession*,
+                                          const void* proto, size_t proto_len,
+                                          TF_Status*);
 
 // See TF_SessionRun() above.
-extern void TF_Run(TF_DeprecatedSession*, const TF_Buffer* run_options,
-                   const char** input_names, TF_Tensor** inputs, int ninputs,
-                   const char** output_names, TF_Tensor** outputs, int noutputs,
-                   const char** target_oper_names, int ntargets,
-                   TF_Buffer* run_metadata, TF_Status*);
+TF_CAPI_EXPORT extern void TF_Run(TF_DeprecatedSession*,
+                                  const TF_Buffer* run_options,
+                                  const char** input_names, TF_Tensor** inputs,
+                                  int ninputs, const char** output_names,
+                                  TF_Tensor** outputs, int noutputs,
+                                  const char** target_oper_names, int ntargets,
+                                  TF_Buffer* run_metadata, TF_Status*);
 
 // See TF_SessionPRunSetup() above.
-extern void TF_PRunSetup(TF_DeprecatedSession*, const char** input_names,
-                         int ninputs, const char** output_names, int noutputs,
-                         const char** target_oper_names, int ntargets,
-                         const char** handle, TF_Status*);
+TF_CAPI_EXPORT extern void TF_PRunSetup(TF_DeprecatedSession*,
+                                        const char** input_names, int ninputs,
+                                        const char** output_names, int noutputs,
+                                        const char** target_oper_names,
+                                        int ntargets, const char** handle,
+                                        TF_Status*);
 
 // See TF_SessionPRun above.
-extern void TF_PRun(TF_DeprecatedSession*, const char* handle,
-                    const char** input_names, TF_Tensor** inputs, int ninputs,
-                    const char** output_names, TF_Tensor** outputs,
-                    int noutputs, const char** target_oper_names, int ntargets,
-                    TF_Status*);
+TF_CAPI_EXPORT extern void TF_PRun(TF_DeprecatedSession*, const char* handle,
+                                   const char** input_names, TF_Tensor** inputs,
+                                   int ninputs, const char** output_names,
+                                   TF_Tensor** outputs, int noutputs,
+                                   const char** target_oper_names, int ntargets,
+                                   TF_Status*);
 
 // --------------------------------------------------------------------------
 // Load plugins containing custom ops and kernels
@@ -1132,19 +1197,19 @@ typedef struct TF_Library TF_Library;
 // The caller owns the library handle.
 //
 // On failure, place an error status in status and return NULL.
-extern TF_Library* TF_LoadLibrary(const char* library_filename,
-                                  TF_Status* status);
+TF_CAPI_EXPORT extern TF_Library* TF_LoadLibrary(const char* library_filename,
+                                                 TF_Status* status);
 
 // Get the OpList of OpDefs defined in the library pointed by lib_handle.
 //
 // Returns a TF_Buffer. The memory pointed to by the result is owned by
 // lib_handle. The data in the buffer will be the serialized OpList proto for
 // ops defined in the library.
-extern TF_Buffer TF_GetOpList(TF_Library* lib_handle);
+TF_CAPI_EXPORT extern TF_Buffer TF_GetOpList(TF_Library* lib_handle);
 
 // Frees the memory associated with the library handle.
 // Does NOT unload the library.
-extern void TF_DeleteLibraryHandle(TF_Library* lib_handle);
+TF_CAPI_EXPORT extern void TF_DeleteLibraryHandle(TF_Library* lib_handle);
 
 // Get the OpList of all OpDefs defined in this address space.
 // Returns a TF_Buffer, ownership of which is transferred to the caller
@@ -1152,7 +1217,7 @@ extern void TF_DeleteLibraryHandle(TF_Library* lib_handle);
 //
 // The data in the buffer will be the serialized OpList proto for ops registered
 // in this address space.
-extern TF_Buffer* TF_GetAllOpList();
+TF_CAPI_EXPORT extern TF_Buffer* TF_GetAllOpList();
 
 #ifdef __cplusplus
 } /* end extern "C" */
-- 
GitLab


From e1d5eb3fc789066d5cbedfffbcde2dbabb7ad98d Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 19 Apr 2017 12:11:04 -0800
Subject: [PATCH 0544/1563] Fix timeout propagation in distributed runtime.

The following fixes were required:
- In grpc_session.cc we use the config.operation_timeout_in_ms value if one is not given in RunOptions.
- We provide the default timeout value from the config in grpc_server_lib to the LocalMaster and GrpcMasterService. This allows them to use this value in the CallOptions.
Change: 153624168
---
 .../core/distributed_runtime/local_master.cc  | 53 +++++++++++++------
 .../core/distributed_runtime/local_master.h   | 14 ++---
 .../rpc/grpc_master_service.cc                | 16 ++++--
 .../rpc/grpc_master_service.h                 |  2 +
 .../rpc/grpc_server_lib.cc                    | 10 ++--
 .../distributed_runtime/rpc/grpc_session.cc   |  7 ++-
 tensorflow/python/client/session_test.py      | 27 ++++++++++
 7 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/local_master.cc b/tensorflow/core/distributed_runtime/local_master.cc
index 1bb706e930..c7ba7abeaf 100644
--- a/tensorflow/core/distributed_runtime/local_master.cc
+++ b/tensorflow/core/distributed_runtime/local_master.cc
@@ -23,9 +23,12 @@ limitations under the License.
 namespace tensorflow {
 
 namespace {
-
-Status WaitForNotification(CallOptions* call_options, Notification* n) {
+Status WaitForNotification(CallOptions* call_options,
+                           const int64 default_timeout_in_ms, Notification* n) {
   int64 timeout_in_ms = call_options->GetTimeout();
+  if (timeout_in_ms == 0) {
+    timeout_in_ms = default_timeout_in_ms;
+  }
   if (timeout_in_ms > 0) {
     int64 timeout_in_us = timeout_in_ms * 1000;
     bool notified = WaitForNotificationWithTimeout(n, timeout_in_us);
@@ -41,9 +44,11 @@ Status WaitForNotification(CallOptions* call_options, Notification* n) {
   }
   return Status::OK();
 }
-}
+}  // namespace
 
-LocalMaster::LocalMaster(Master* master_impl) : master_impl_(master_impl) {}
+LocalMaster::LocalMaster(Master* master_impl, const int64 default_timeout_in_ms)
+    : master_impl_(master_impl),
+      default_timeout_in_ms_(default_timeout_in_ms) {}
 
 Status LocalMaster::CreateSession(CallOptions* call_options,
                                   const CreateSessionRequest* request,
@@ -54,7 +59,8 @@ Status LocalMaster::CreateSession(CallOptions* call_options,
     ret.Update(s);
     n.Notify();
   });
-  TF_RETURN_IF_ERROR(WaitForNotification(call_options, &n));
+  TF_RETURN_IF_ERROR(
+      WaitForNotification(call_options, default_timeout_in_ms_, &n));
   return ret;
 }
 
@@ -67,7 +73,8 @@ Status LocalMaster::ExtendSession(CallOptions* call_options,
     ret.Update(s);
     n.Notify();
   });
-  TF_RETURN_IF_ERROR(WaitForNotification(call_options, &n));
+  TF_RETURN_IF_ERROR(
+      WaitForNotification(call_options, default_timeout_in_ms_, &n));
   return ret;
 }
 
@@ -80,7 +87,8 @@ Status LocalMaster::PartialRunSetup(CallOptions* call_options,
     ret.Update(s);
     n.Notify();
   });
-  TF_RETURN_IF_ERROR(WaitForNotification(call_options, &n));
+  TF_RETURN_IF_ERROR(
+      WaitForNotification(call_options, default_timeout_in_ms_, &n));
   return ret;
 }
 
@@ -94,7 +102,8 @@ Status LocalMaster::RunStep(CallOptions* call_options,
                           ret.Update(s);
                           n.Notify();
                         });
-  TF_RETURN_IF_ERROR(WaitForNotification(call_options, &n));
+  TF_RETURN_IF_ERROR(
+      WaitForNotification(call_options, default_timeout_in_ms_, &n));
   return ret;
 }
 
@@ -115,7 +124,8 @@ Status LocalMaster::CloseSession(CallOptions* call_options,
     ret.Update(s);
     n.Notify();
   });
-  TF_RETURN_IF_ERROR(WaitForNotification(call_options, &n));
+  TF_RETURN_IF_ERROR(
+      WaitForNotification(call_options, default_timeout_in_ms_, &n));
   return ret;
 }
 
@@ -128,7 +138,8 @@ Status LocalMaster::ListDevices(CallOptions* call_options,
     ret.Update(s);
     n.Notify();
   });
-  TF_RETURN_IF_ERROR(WaitForNotification(call_options, &n));
+  TF_RETURN_IF_ERROR(
+      WaitForNotification(call_options, default_timeout_in_ms_, &n));
   return ret;
 }
 
@@ -141,7 +152,8 @@ Status LocalMaster::Reset(CallOptions* call_options,
     ret.Update(s);
     n.Notify();
   });
-  TF_RETURN_IF_ERROR(WaitForNotification(call_options, &n));
+  TF_RETURN_IF_ERROR(
+      WaitForNotification(call_options, default_timeout_in_ms_, &n));
   return ret;
 }
 
@@ -151,7 +163,15 @@ mutex* get_local_master_registry_lock() {
   return &local_master_registry_lock;
 }
 
-typedef std::unordered_map<string, Master*> LocalMasterRegistry;
+struct MasterInfo {
+  Master* master;
+  const int64 default_timeout_in_ms;
+
+  MasterInfo(Master* master, const int64 default_timeout_in_ms)
+      : master(master), default_timeout_in_ms(default_timeout_in_ms) {}
+};
+
+typedef std::unordered_map<string, MasterInfo> LocalMasterRegistry;
 LocalMasterRegistry* local_master_registry() {
   static LocalMasterRegistry* local_master_registry_ = new LocalMasterRegistry;
   return local_master_registry_;
@@ -159,9 +179,11 @@ LocalMasterRegistry* local_master_registry() {
 }  // namespace
 
 /* static */
-void LocalMaster::Register(const string& target, Master* master) {
+void LocalMaster::Register(const string& target, Master* master,
+                           int64 default_timeout_in_ms) {
   mutex_lock l(*get_local_master_registry_lock());
-  local_master_registry()->insert({target, master});
+  local_master_registry()->insert(
+      {target, MasterInfo(master, default_timeout_in_ms)});
 }
 
 /* static */
@@ -170,7 +192,8 @@ std::unique_ptr<LocalMaster> LocalMaster::Lookup(const string& target) {
   mutex_lock l(*get_local_master_registry_lock());
   auto iter = local_master_registry()->find(target);
   if (iter != local_master_registry()->end()) {
-    ret.reset(new LocalMaster(iter->second));
+    ret.reset(new LocalMaster(iter->second.master,
+                              iter->second.default_timeout_in_ms));
   }
   return ret;
 }
diff --git a/tensorflow/core/distributed_runtime/local_master.h b/tensorflow/core/distributed_runtime/local_master.h
index 33b81c33c0..5fc21d3a1e 100644
--- a/tensorflow/core/distributed_runtime/local_master.h
+++ b/tensorflow/core/distributed_runtime/local_master.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_LOCAL_MASTER_REGISTRY_H_
-#define THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_LOCAL_MASTER_REGISTRY_H_
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_LOCAL_MASTER_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_LOCAL_MASTER_H_
 
 #include <memory>
 
@@ -38,7 +38,7 @@ class Master;
 // for cancellation.
 class LocalMaster : public MasterInterface {
  public:
-  ~LocalMaster(){};
+  ~LocalMaster() {}
 
   Status CreateSession(CallOptions* call_options,
                        const CreateSessionRequest* request,
@@ -78,7 +78,8 @@ class LocalMaster : public MasterInterface {
   // any LocalMaster objects that may wrap this master. There is no
   // corresponding deregister method, since clean server shutdown is
   // not currently implemented for any server type.
-  static void Register(const string& target, Master* master);
+  static void Register(const string& target, Master* master,
+                       int64 default_timeout_in_ms);
 
   // Returns a pointer to the local master associated with the given
   // `target`, or nullptr if none exists.
@@ -86,14 +87,15 @@ class LocalMaster : public MasterInterface {
 
  private:
   Master* master_impl_;  // Not owned.
+  const int64 default_timeout_in_ms_;
 
   // See `LocalMaster::Lookup` for the factory function that creates
   // objects of this type.
-  LocalMaster(Master* master_impl);
+  LocalMaster(Master* master_impl, const int64 default_timeout_in_ms);
 
   TF_DISALLOW_COPY_AND_ASSIGN(LocalMaster);
 };
 
 }  // namespace tensorflow
 
-#endif  // THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_LOCAL_MASTER_REGISTRY_H_
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_LOCAL_MASTER_H_
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc b/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc
index c8b3746d18..f0d311b853 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc
@@ -46,8 +46,11 @@ namespace tensorflow {
 
 class GrpcMasterService : public AsyncServiceInterface {
  public:
-  GrpcMasterService(Master* master, ::grpc::ServerBuilder* builder)
-      : master_impl_(master), is_shutdown_(false) {
+  GrpcMasterService(Master* master, int64 default_timeout_in_ms,
+                    ::grpc::ServerBuilder* builder)
+      : master_impl_(master),
+        default_timeout_in_ms_(default_timeout_in_ms),
+        is_shutdown_(false) {
     builder->RegisterService(&master_service_);
     cq_ = builder->AddCompletionQueue();
   }
@@ -127,6 +130,7 @@ class GrpcMasterService : public AsyncServiceInterface {
 
  private:
   Master* master_impl_ = nullptr;  // Not owned.
+  const int64 default_timeout_in_ms_;
   std::unique_ptr<::grpc::ServerCompletionQueue> cq_;
   grpc::MasterService::AsyncService master_service_;
 
@@ -171,6 +175,11 @@ class GrpcMasterService : public AsyncServiceInterface {
   // RPC handler for running one step in a session.
   void RunStepHandler(MasterCall<RunStepRequest, RunStepResponse>* call) {
     CallOptions* call_opts = new CallOptions;
+    if (call->request.options().timeout_in_ms() > 0) {
+      call_opts->SetTimeout(call->request.options().timeout_in_ms());
+    } else {
+      call_opts->SetTimeout(default_timeout_in_ms_);
+    }
     RunStepRequestWrapper* wrapped_request =
         new ProtoRunStepRequest(&call->request);
     MutableRunStepResponseWrapper* wrapped_response =
@@ -221,8 +230,9 @@ class GrpcMasterService : public AsyncServiceInterface {
 };
 
 AsyncServiceInterface* NewGrpcMasterService(Master* master,
+                                            int64 default_timeout_in_ms,
                                             ::grpc::ServerBuilder* builder) {
-  return new GrpcMasterService(master, builder);
+  return new GrpcMasterService(master, default_timeout_in_ms, builder);
 }
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_master_service.h b/tensorflow/core/distributed_runtime/rpc/grpc_master_service.h
index 77ae400bd5..8770dcc3ac 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_master_service.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_master_service.h
@@ -17,6 +17,7 @@ limitations under the License.
 #define THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_RPC_GRPC_MASTER_SERVICE_H_
 
 #include <memory>
+#include "tensorflow/core/platform/types.h"
 
 namespace grpc {
 class ServerBuilder;
@@ -28,6 +29,7 @@ class AsyncServiceInterface;
 class Master;
 
 AsyncServiceInterface* NewGrpcMasterService(Master* master,
+                                            int64 default_timeout_in_ms,
                                             ::grpc::ServerBuilder* builder);
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
index 00d2870660..1aafa862cb 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
@@ -165,9 +165,8 @@ Status GrpcServer::Init() {
   builder.SetOption(
       std::unique_ptr<::grpc::ServerBuilderOption>(new NoReusePortOption));
   master_impl_ = CreateMaster(&master_env_);
-  // TODO(suharshs): Pass the default operation timeout to this, to ensure
-  // timeouts are propagated to GrpcMasterService.
-  master_service_ = NewGrpcMasterService(master_impl_.get(), &builder);
+  master_service_ = NewGrpcMasterService(
+      master_impl_.get(), config.operation_timeout_in_ms(), &builder);
   worker_impl_ = NewGrpcWorker(&worker_env_);
   worker_service_ =
       NewGrpcWorkerService(worker_impl_.get(), &builder).release();
@@ -205,10 +204,9 @@ Status GrpcServer::Init() {
                                  CreateNoOpStatsPublisher);
       };
 
-  // TODO(suharshs): Pass the default operation timeout to this, to ensure
-  // timeouts are propagated to LocalMaster.
   // Provide direct access to the master from in-process clients.
-  LocalMaster::Register(target(), master_impl_.get());
+  LocalMaster::Register(target(), master_impl_.get(),
+                        config.operation_timeout_in_ms());
 
   return Status::OK();
 }
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_session.cc b/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
index 5df4209682..1aacef8a26 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
@@ -177,6 +177,11 @@ Status GrpcSession::RunHelper(
 
   *req->mutable_options() = run_options;
 
+  if (run_options.timeout_in_ms() == 0) {
+    req->mutable_options()->set_timeout_in_ms(
+        options_.config.operation_timeout_in_ms());
+  }
+
   if (!prun_handle.empty()) {
     req->set_partial_run_handle(prun_handle);
   }
@@ -197,7 +202,7 @@ Status GrpcSession::RunHelper(
   }
 
   CallOptions call_options;
-  call_options.SetTimeout(run_options.timeout_in_ms());
+  call_options.SetTimeout(req->options().timeout_in_ms());
   TF_RETURN_IF_ERROR(RunProto(&call_options, req.get(), resp.get()));
 
   if (!output_tensor_names.empty()) {
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 78ba20f0fa..77a2037b88 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -1714,6 +1714,33 @@ class SessionTest(test_util.TensorFlowTestCase):
       # Ensure that we did log device placement.
       self.assertTrue('/job:local/replica:0/task:0/cpu:0' in str(log))
 
+  def testLocalMasterSessionTimeout(self):
+    # Test that the timeout passed in a config to the session works correctly.
+    config = config_pb2.ConfigProto(operation_timeout_in_ms=1000)
+    server = server_lib.Server.create_local_server()
+    q = data_flow_ops.FIFOQueue(1, dtypes.float32)
+    dequeued_t = q.dequeue()
+
+    with session.Session(server.target, config=config) as sess:
+      # Intentionally do not run any enqueue_ops so that dequeue will block
+      # until operation_timeout_in_ms.
+      with self.assertRaises(errors.DeadlineExceededError):
+        sess.run(dequeued_t)
+
+  def testDefaultServerTimeout(self):
+    # Test that the default server config timeout gets used when no Session
+    # config is provided.
+    config = config_pb2.ConfigProto(operation_timeout_in_ms=1000)
+    server = server_lib.Server.create_local_server(config=config)
+    q = data_flow_ops.FIFOQueue(1, dtypes.float32)
+    dequeued_t = q.dequeue()
+
+    with session.Session(server.target) as sess:
+      # Intentionally do not run any enqueue_ops so that dequeue will block
+      # until operation_timeout_in_ms.
+      with self.assertRaises(errors.DeadlineExceededError):
+        sess.run(dequeued_t)
+
 
 if __name__ == '__main__':
   googletest.main()
-- 
GitLab


From 76057bf7cb48d6fa634f7ccf68b4c3d90a7eb887 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <kramerb@google.com>
Date: Wed, 19 Apr 2017 12:24:17 -0800
Subject: [PATCH 0545/1563] Update XLA for the API change in LLVM r300718. This
 will require an LLVM bump. Change: 153625716

---
 tensorflow/compiler/xla/service/cpu/ir_emitter.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
index 3a8d74c21c..1c704fd1ee 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
@@ -1711,8 +1711,7 @@ StatusOr<llvm::Value*> IrEmitter::EmitTargetAddressForOp(
       llvm::AttrBuilder attr_builder;
       attr_builder.addAlignmentAttr(MinimumAlignmentForShape(target_shape));
       attr_builder.addDereferenceableAttr(ByteSizeOf(target_shape));
-      retval->addAttr(llvm::AttributeList::get(
-          retval->getContext(), retval->getArgNo() + 1, attr_builder));
+      retval->addAttrs(attr_builder);
     }
     return ir_builder_.CreateBitCast(retval,
                                      IrShapeType(target_shape)->getPointerTo());
-- 
GitLab


From 242e0fc80a800fb5caec7ebcbea2cad3ec69f598 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Wed, 19 Apr 2017 12:27:48 -0800
Subject: [PATCH 0546/1563] Fix bug in resource variable to/from proto Change:
 153626178

---
 .../python/kernel_tests/resource_variable_ops_test.py    | 9 +++++++++
 tensorflow/python/ops/resource_variable_ops.py           | 1 +
 2 files changed, 10 insertions(+)

diff --git a/tensorflow/python/kernel_tests/resource_variable_ops_test.py b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
index 2fba15801c..71573fa9e9 100644
--- a/tensorflow/python/kernel_tests/resource_variable_ops_test.py
+++ b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
@@ -26,6 +26,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
@@ -151,6 +152,14 @@ class ResourceVariableOpsTest(test_util.TensorFlowTestCase):
       v.assign(2.0).eval()
       self.assertEqual(2.0, v.value().eval())
 
+  def testToFromProto(self):
+    with self.test_session():
+      v = resource_variable_ops.ResourceVariable(1.0)
+      variables.global_variables_initializer().run()
+
+      w = resource_variable_ops.ResourceVariable.from_proto(v.to_proto())
+      self.assertEquals(2, math_ops.add(w, 1).eval())
+
   def testAssignAddMethod(self):
     with self.test_session():
       v = resource_variable_ops.ResourceVariable(1.0)
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 22a7e3e1b9..4b560e62b8 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -244,6 +244,7 @@ class ResourceVariable(object):
       self._save_slice_info = None
     self._caching_device = None
     self._dtype = dtypes.as_dtype(self._handle.op.get_attr("dtype"))
+    self._graph_element = self.value()
 
   @property
   def dtype(self):
-- 
GitLab


From d017a797c4d5247c0ebdfb04227ac431e3923472 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 12:34:03 -0800
Subject: [PATCH 0547/1563] Removed now-obsolete memset call and comment now
 that LIBXSMM can clear its own output buffer. Change: 153627108

---
 tensorflow/core/kernels/sparse_matmul_op.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tensorflow/core/kernels/sparse_matmul_op.cc b/tensorflow/core/kernels/sparse_matmul_op.cc
index 46e743b4cf..22c8bc48b4 100644
--- a/tensorflow/core/kernels/sparse_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_matmul_op.cc
@@ -1489,10 +1489,6 @@ inline void LibxsmmSparseMatMul<TL, TR>::Compute(
     }
   });
   // Do matrix-matrix multiplication
-  // TODO(jewillco): libxsmm doesn't support beta != 1 yet -- remove when
-  // release
-  // includes beta handling
-  memset(output_data, 0, left_dim0 * right_dim1 * sizeof(TR));
   ptrdiff_t total_num_mult_blocks =
       libxsmm_spmdm_get_num_compute_blocks(&entry->handle);
   std::atomic<int> cur_mult_block_number;
-- 
GitLab


From 1fc916d0c16eab89523b1e031854313ab1ba18e2 Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Wed, 19 Apr 2017 13:29:41 -0800
Subject: [PATCH 0548/1563] Silence a call to `print` that occurs in case of
 pydot import error. Change: 153634770

---
 tensorflow/contrib/keras/python/keras/utils/vis_utils.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/keras/python/keras/utils/vis_utils.py b/tensorflow/contrib/keras/python/keras/utils/vis_utils.py
index 49efa6040d..9e2ee86424 100644
--- a/tensorflow/contrib/keras/python/keras/utils/vis_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/vis_utils.py
@@ -18,17 +18,24 @@ from __future__ import division
 from __future__ import print_function
 
 import os
-
+import sys
 
 try:
   # pydot-ng is a fork of pydot that is better maintained.
   import pydot_ng as pydot  # pylint: disable=g-import-not-at-top
 except ImportError:
   # Fall back on pydot if necessary.
+  # Silence a `print` statement that occurs in case of import error,
+  # by temporarily replacing sys.stdout.
+  _stdout = sys.stdout
+  sys.stdout = sys.stderr
   try:
     import pydot  # pylint: disable=g-import-not-at-top
   except ImportError:
     pydot = None
+  finally:
+    # Restore sys.stdout.
+    sys.stdout = _stdout
 
 
 def _check_pydot():
-- 
GitLab


From c6ab1fb225d3d44a9d39666991db0f7eb654c018 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 19 Apr 2017 13:52:40 -0800
Subject: [PATCH 0549/1563] Remove all 64/32 bit warnings in tensorflow/cc
 Change: 153637886

---
 tensorflow/cc/framework/cc_op_gen.cc        |  4 +--
 tensorflow/cc/framework/gradient_checker.cc | 12 ++++----
 tensorflow/cc/framework/gradients.cc        |  6 ++--
 tensorflow/cc/framework/ops.cc              |  6 ++--
 tensorflow/cc/framework/ops.h               | 32 ++++++++++-----------
 tensorflow/cc/training/queue_runner.cc      |  7 ++++-
 tensorflow/cc/tutorials/example_trainer.cc  |  2 +-
 tensorflow/core/graph/graph.h               |  8 +++---
 tensorflow/core/graph/node_builder.cc       |  4 +--
 tensorflow/core/graph/node_builder.h        |  6 ++--
 10 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/tensorflow/cc/framework/cc_op_gen.cc b/tensorflow/cc/framework/cc_op_gen.cc
index 26f15975c1..b7e9948e9d 100644
--- a/tensorflow/cc/framework/cc_op_gen.cc
+++ b/tensorflow/cc/framework/cc_op_gen.cc
@@ -730,7 +730,7 @@ void OpInfo::GetOutput(string* out) const {
     // One output, no need for NameRangeMap
     if (is_list_output[0]) {
       strings::StrAppend(out,
-                         "  for (int64 i = 0; i < ret->num_outputs(); ++i)\n");
+                         "  for (int32 i = 0; i < ret->num_outputs(); ++i)\n");
       strings::StrAppend(out, "    this->", output_names[0],
                          ".push_back(Output(ret, i));\n");
     } else {
@@ -753,7 +753,7 @@ void OpInfo::GetOutput(string* out) const {
     const string arg_range = strings::StrCat(
         "_outputs_range[\"", graph_op_def.output_arg(i).name(), "\"]");
     if (is_list_output[i]) {
-      strings::StrAppend(out, "  for (int64 i = ", arg_range, ".first; i < ",
+      strings::StrAppend(out, "  for (int32 i = ", arg_range, ".first; i < ",
                          arg_range, ".second; ++i)\n");
       strings::StrAppend(out, "    this->", output_names[i],
                          ".push_back(Output(ret, i));\n");
diff --git a/tensorflow/cc/framework/gradient_checker.cc b/tensorflow/cc/framework/gradient_checker.cc
index 849a8eed6f..8f20ff1457 100644
--- a/tensorflow/cc/framework/gradient_checker.cc
+++ b/tensorflow/cc/framework/gradient_checker.cc
@@ -40,8 +40,8 @@ Status ComputeTheoreticalJacobianTranspose(
     const std::vector<Tensor>& x_datas, const OutputList& ys,
     const std::vector<TensorShape>& y_shapes,
     std::vector<Tensor>& jacobian_ts) {
-  int y_num = y_shapes.size();
-  int x_num = x_shapes.size();
+  size_t y_num = y_shapes.size();
+  size_t x_num = x_shapes.size();
   // Call AddSymbolicGradients to get 'dxs' (we will feed 'dys').
   OutputList dys;
   for (const auto& y_shape : y_shapes) {
@@ -130,8 +130,8 @@ Status ComputeNumericJacobianTranspose(const Scope& scope, const OutputList& xs,
                                        const T delta,
                                        std::vector<Tensor>& x_datas,
                                        std::vector<Tensor>& jacobian_ts) {
-  int y_num = y_shapes.size();
-  int x_num = x_shapes.size();
+  size_t y_num = y_shapes.size();
+  size_t x_num = x_shapes.size();
 
   ClientSession session(scope);
   for (int x_idx = 0; x_idx < x_num; x_idx++) {
@@ -176,8 +176,8 @@ void InitJacobians(const OutputList& xs,
                    const std::vector<TensorShape>& x_shapes,
                    const std::vector<TensorShape>& y_shapes,
                    std::vector<Tensor>& jacobians) {
-  int y_num = y_shapes.size();
-  int x_num = x_shapes.size();
+  size_t y_num = y_shapes.size();
+  size_t x_num = x_shapes.size();
 
   jacobians.resize(y_num * x_num);
   for (int x_idx = 0; x_idx < x_num; x_idx++) {
diff --git a/tensorflow/cc/framework/gradients.cc b/tensorflow/cc/framework/gradients.cc
index 4ada9351ca..8c00a6f704 100644
--- a/tensorflow/cc/framework/gradients.cc
+++ b/tensorflow/cc/framework/gradients.cc
@@ -210,8 +210,8 @@ Status SymbolicGradientBuilder::Initialize() {
 
   {
     // Initialize backprop with `grad_inputs_`.
-    const int num_dy = grad_inputs_.size();
-    for (int i = 0; i < num_dy; ++i) {
+    const size_t num_dy = grad_inputs_.size();
+    for (size_t i = 0; i < num_dy; ++i) {
       TF_RETURN_IF_ERROR(BackpropAlongEdge(grad_inputs_[i], outputs_[i]));
     }
   }
@@ -308,7 +308,7 @@ Status SymbolicGradientBuilder::AddGradients() {
       continue;
     }
 
-    const int num_no_grad = no_grad_dy_indices.size();
+    const size_t num_no_grad = no_grad_dy_indices.size();
     if (IsPrimitiveOpWithNoGrad(n->type_string()) || num_no_grad == num_y) {
       // No grad defined for this op, or all outputs returned 'NoGradient':
       // Backprop 'NoGradient' along the in edges.
diff --git a/tensorflow/cc/framework/ops.cc b/tensorflow/cc/framework/ops.cc
index 50df891a4c..920a8e7955 100644
--- a/tensorflow/cc/framework/ops.cc
+++ b/tensorflow/cc/framework/ops.cc
@@ -20,7 +20,7 @@ namespace tensorflow {
 
 Operation::Operation(Node* n) : inputs_(GetInputs(n)), node_(n) {}
 
-Output Operation::input(int i) const {
+Output Operation::input(int32 i) const {
   CHECK_NOTNULL(node_);
   CHECK_GE(i, 0);
   CHECK_LT(i, node_->num_inputs());
@@ -37,14 +37,14 @@ Output Operation::input(int i) const {
   return Output(inputs_[i].first, inputs_[i].second);
 }
 
-Output Operation::output(int i) const {
+Output Operation::output(int32 i) const {
   CHECK_NOTNULL(node_);
   CHECK_GE(i, 0);
   CHECK_LT(i, node_->num_outputs());
   return Output(node_, i);
 }
 
-uint64 Operation::hash(int64 index) const {
+uint64 Operation::hash(int32 index) const {
   return ::tensorflow::Hash64(reinterpret_cast<const char*>(&node_),
                               sizeof(Node*), index);
 }
diff --git a/tensorflow/cc/framework/ops.h b/tensorflow/cc/framework/ops.h
index 889d5db31d..8d4154220c 100644
--- a/tensorflow/cc/framework/ops.h
+++ b/tensorflow/cc/framework/ops.h
@@ -39,22 +39,22 @@ class Operation {
   Operation() : node_(nullptr) {}
   explicit Operation(Node* n);
 
-  int num_inputs() const { return node_->num_inputs(); }
-  DataType input_type(int o) const { return node_->input_type(o); }
-  Output input(int i) const;
+  int32 num_inputs() const { return node_->num_inputs(); }
+  DataType input_type(int32 o) const { return node_->input_type(o); }
+  Output input(int32 i) const;
 
-  int num_outputs() const { return node_->num_outputs(); }
-  DataType output_type(int o) const { return node_->output_type(o); }
-  Output output(int i) const;
+  int32 num_outputs() const { return node_->num_outputs(); }
+  DataType output_type(int32 o) const { return node_->output_type(o); }
+  Output output(int32 i) const;
 
   Node* node() const { return node_; }
 
-  uint64 hash(int64 index) const;
+  uint64 hash(int32 index) const;
 
   bool operator==(const Operation& other) const { return node_ == other.node_; }
 
  private:
-  typedef std::vector<std::pair<Node*, int64>> Inputs;
+  typedef std::vector<std::pair<Node*, int32>> Inputs;
   static Inputs GetInputs(Node* node);
 
   Inputs inputs_;
@@ -66,12 +66,12 @@ class Output {
  public:
   Output() = default;
   explicit Output(Node* n) : op_(n) {}
-  Output(Node* n, int64 index) : op_(n), index_(index) {}
-  Output(const Operation& op, int64 index) : op_(op), index_(index) {}
+  Output(Node* n, int32 index) : op_(n), index_(index) {}
+  Output(const Operation& op, int32 index) : op_(op), index_(index) {}
 
   Operation op() const { return op_; }
   Node* node() const { return op().node(); }
-  int64 index() const { return index_; }
+  int32 index() const { return index_; }
   DataType type() const { return op_.output_type(index_); }
   string name() const { return strings::StrCat(node()->name(), ":", index()); }
   bool operator==(const Output& other) const {
@@ -82,14 +82,14 @@ class Output {
 
  private:
   Operation op_ = Operation(nullptr);
-  int64 index_ = 0;
+  int32 index_ = 0;
 };
 
 /// Hash class that can be used for e.g. storing Outputs in an unordered_map
 struct OutputHash {
   std::size_t operator()(const Output& output) const {
     return Hash64Combine(std::hash<Node*>()(output.node()),
-                         std::hash<int64>()(output.index()));
+                         std::hash<int32>()(output.index()));
   }
 };
 
@@ -230,12 +230,12 @@ class Input {
 
   /// Constructor specifying a node name, index and datatype. This should only
   /// be used for specifying a backward edge, needed by control flow.
-  Input(const string& name, int i, DataType dt)
+  Input(const string& name, int32 i, DataType dt)
       : node_name_(name), index_(i), data_type_(dt) {}
 
   Node* node() const { return output_.node(); }
   string node_name() const { return node_name_; }
-  int index() const { return node_name_.empty() ? output_.index() : index_; }
+  int32 index() const { return node_name_.empty() ? output_.index() : index_; }
   DataType data_type() const { return data_type_; }
   Status status() const { return status_; }
   const Tensor& tensor() const { return tensor_; }
@@ -245,7 +245,7 @@ class Input {
   Output output_ = Output(Operation(nullptr), 0);
   Tensor tensor_;
   const string node_name_ = "";
-  int index_ = 0;
+  int32 index_ = 0;
   DataType data_type_ = DT_INVALID;
 };
 
diff --git a/tensorflow/cc/training/queue_runner.cc b/tensorflow/cc/training/queue_runner.cc
index 324a62e1a9..5aaaa116cf 100644
--- a/tensorflow/cc/training/queue_runner.cc
+++ b/tensorflow/cc/training/queue_runner.cc
@@ -49,7 +49,12 @@ Status QueueRunner::Init(const QueueRunnerDef& queue_runner_def) {
   enqueue_op_names_.insert(enqueue_op_names_.end(),
                            queue_runner_def.enqueue_op_name().begin(),
                            queue_runner_def.enqueue_op_name().end());
-  runs_ = enqueue_op_names_.size();
+  size_t op_names_size = enqueue_op_names_.size();
+  if (op_names_size > kint32max) {
+    return Status(error::INVALID_ARGUMENT,
+                  "Enqueue ops to run cannot exceed kint32max");
+  }
+  runs_ = static_cast<int>(op_names_size);
   if (runs_ == 0) {
     return Status(error::INVALID_ARGUMENT, "Empty enqueue ops to run.");
   }
diff --git a/tensorflow/cc/tutorials/example_trainer.cc b/tensorflow/cc/tutorials/example_trainer.cc
index f2ecd2eddc..49d3cca3a4 100644
--- a/tensorflow/cc/tutorials/example_trainer.cc
+++ b/tensorflow/cc/tutorials/example_trainer.cc
@@ -227,7 +227,7 @@ int main(int argc, char* argv[]) {
     argv[dst++] = f;
   }
   argv[dst++] = nullptr;
-  argc = unknown_flags.size() + 1;
+  argc = static_cast<int>(unknown_flags.size() + 1);
   tensorflow::port::InitMain(argv[0], &argc, &argv);
   tensorflow::example::ConcurrentSessions(opts);
 }
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index 83bb797d1b..a4e0ffa020 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -84,12 +84,12 @@ class Node {
   const OpDef& op_def() const { return *props_->op_def_; }
 
   // input and output types
-  int num_inputs() const { return props_->input_types_.size(); }
-  DataType input_type(int i) const { return props_->input_types_[i]; }
+  int32 num_inputs() const { return props_->input_types_.size(); }
+  DataType input_type(int32 i) const { return props_->input_types_[i]; }
   const DataTypeVector& input_types() const { return props_->input_types_; }
 
-  int num_outputs() const { return props_->output_types_.size(); }
-  DataType output_type(int o) const { return props_->output_types_[o]; }
+  int32 num_outputs() const { return props_->output_types_.size(); }
+  DataType output_type(int32 o) const { return props_->output_types_[o]; }
   const DataTypeVector& output_types() const { return props_->output_types_; }
 
   // This gives the device the runtime has assigned this node to.  If
diff --git a/tensorflow/core/graph/node_builder.cc b/tensorflow/core/graph/node_builder.cc
index 46e54c9eab..500ac129e8 100644
--- a/tensorflow/core/graph/node_builder.cc
+++ b/tensorflow/core/graph/node_builder.cc
@@ -21,14 +21,14 @@ limitations under the License.
 
 namespace tensorflow {
 
-NodeBuilder::NodeOut::NodeOut(Node* n, int i)  // NOLINT(runtime/explicit)
+NodeBuilder::NodeOut::NodeOut(Node* n, int32 i)  // NOLINT(runtime/explicit)
     : node(n),
       error(false),
       name(node != nullptr ? node->name() : (error = true, "")),
       index(i),
       dt(SafeGetOutput(node, i, &error)) {}
 
-NodeBuilder::NodeOut::NodeOut(StringPiece n, int i, DataType t)
+NodeBuilder::NodeOut::NodeOut(StringPiece n, int32 i, DataType t)
     : node(nullptr), error(false), name(n.ToString()), index(i), dt(t) {}
 
 NodeBuilder::NodeOut::NodeOut()
diff --git a/tensorflow/core/graph/node_builder.h b/tensorflow/core/graph/node_builder.h
index 2684e48286..86647a49c1 100644
--- a/tensorflow/core/graph/node_builder.h
+++ b/tensorflow/core/graph/node_builder.h
@@ -49,13 +49,13 @@ class NodeBuilder {
   // ArraySlice.
   struct NodeOut {
     // For referencing an existing Node.
-    NodeOut(Node* n, int i = 0);
+    NodeOut(Node* n, int32 i = 0);
 
     // For referencing Nodes not in the graph being built. It is
     // useful when preparing a graph for ExtendSession or creating a
     // back edge to a node that hasn't been added to the graph yet,
     // but will be.
-    NodeOut(StringPiece name, int i, DataType t);
+    NodeOut(StringPiece name, int32 i, DataType t);
 
     // Default constructor for std::vector<NodeOut>.
     NodeOut();
@@ -67,7 +67,7 @@ class NodeBuilder {
     // * an out-of-range index was passed to the NodeOut constructor.
     bool error;
     string name;
-    int index;
+    int32 index;
     DataType dt;
   };
 
-- 
GitLab


From e69ca1ccebdaf64a624fa293af63a34ea307c280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Wed, 19 Apr 2017 13:58:26 -0800
Subject: [PATCH 0550/1563] Autogenerated Change: Change TensorBoard TAG to 53
 Change: 153638625

---
 tensorflow/tensorboard/TAG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/TAG b/tensorflow/tensorboard/TAG
index 0691f67b20..59343b09ec 100644
--- a/tensorflow/tensorboard/TAG
+++ b/tensorflow/tensorboard/TAG
@@ -1 +1 @@
-52
+53
-- 
GitLab


From 622892cef8f597e617f03850598b92680e007e2e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 14:10:21 -0800
Subject: [PATCH 0551/1563] Update _SparseColumnVocabulary to use
 index_table_from_file (string_to_index_table_from_file is deprecated).
 Change: 153640282

---
 tensorflow/contrib/layers/python/layers/feature_column.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index fe09ebb72c..2ce50b64ea 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -629,7 +629,7 @@ class _SparseColumnVocabulary(_SparseColumn):
     else:
       sparse_string_tensor = st
 
-    table = lookup.string_to_index_table_from_file(
+    table = lookup.index_table_from_file(
         vocabulary_file=self.lookup_config.vocabulary_file,
         num_oov_buckets=self.lookup_config.num_oov_buckets,
         vocab_size=self.lookup_config.vocab_size,
-- 
GitLab


From 1071e2fd4151708d3810d92eb03b7afbb44e932e Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <kramerb@google.com>
Date: Wed, 19 Apr 2017 14:29:53 -0800
Subject: [PATCH 0552/1563] Update LLVM version to upstream revision r300726.
 Change: 153642821

---
 tensorflow/workspace.bzl    | 8 ++++----
 third_party/llvm/llvm.BUILD | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index c1e711260f..c29d1a6cf6 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -477,11 +477,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "llvm",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
-          "https://github.com/llvm-mirror/llvm/archive/5d2b26453d4bca5a13b69b0130e4369d1fcd393d.tar.gz",
+          "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/8a1f075c93565dd665a10ac38490f644b2c02037.tar.gz",
+          "https://github.com/llvm-mirror/llvm/archive/8a1f075c93565dd665a10ac38490f644b2c02037.tar.gz",
       ],
-      sha256 = "3cecf39bf4b3854629d610bb321bb57e0e46bda9110bd51c3bae5a4171c82bab",
-      strip_prefix = "llvm-5d2b26453d4bca5a13b69b0130e4369d1fcd393d",
+      sha256 = "d9ebd0b49544f3b20ee2a412aac18ed8899b8eef376343a6ba8e179563cbfd86",
+      strip_prefix = "llvm-8a1f075c93565dd665a10ac38490f644b2c02037",
       build_file = str(Label("//third_party/llvm:llvm.BUILD")),
       repository = tf_repo_name,
   )
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 5657ef554f..819807220b 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -70,6 +70,7 @@ cmake_vars = {
 
     # Features
     "HAVE_BACKTRACE": 1,
+    "BACKTRACE_HEADER": "execinfo.h",
     "HAVE_DLOPEN": 1,
     "HAVE_FUTIMES": 1,
     "HAVE_GETCWD": 1,
@@ -878,6 +879,7 @@ cc_library(
         ":analysis",
         ":config",
         ":core",
+        ":mc",
         ":support",
     ],
 )
@@ -903,6 +905,7 @@ cc_library(
         ":config",
         ":core",
         ":mc",
+        ":profile_data",
         ":scalar",
         ":support",
         ":target",
-- 
GitLab


From c0e4079b8896c8e7eca79766711b1dd029cd5402 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 19 Apr 2017 14:46:08 -0800
Subject: [PATCH 0553/1563] [TF:XLA] Make IsConstant conservatively consider
 While loops as non-constant. Change: 153644901

---
 tensorflow/compiler/xla/service/user_computation.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/compiler/xla/service/user_computation.cc b/tensorflow/compiler/xla/service/user_computation.cc
index a77788e0b6..34e8ee8aca 100644
--- a/tensorflow/compiler/xla/service/user_computation.cc
+++ b/tensorflow/compiler/xla/service/user_computation.cc
@@ -1510,6 +1510,7 @@ void ConstantVisitor(const SessionComputation& session_computation,
                       is_constant);
       // TODO(b/32495713): We aren't checking the condition and body
       // computations themselves.
+      *is_constant = false;
       break;
     }
 
-- 
GitLab


From dd40e9840da886c2a8b296146c709907c0dd3d85 Mon Sep 17 00:00:00 2001
From: Jun Shi <junshi15@users.noreply.github.com>
Date: Wed, 19 Apr 2017 16:11:23 -0700
Subject: [PATCH 0554/1563] Ibverbs-based RDMA path (#8943)

* initial check-in

* modifications according to review feedback

* fix BUILD file

* Update BUILD

Add missing comma in verbs/BUILD file

* Buildifier fix

* Buildifier fix #2

* added #define TENSORFLOW_USE_VERBS

* fix defines()

* buildifier fix

* link option fix

* fix TENSORFLOW_USE_VERBS
---
 configure                                     |  18 +
 tensorflow/BUILD                              |   6 +
 tensorflow/contrib/verbs/BUILD                | 167 ++++
 tensorflow/contrib/verbs/README.md            |  77 ++
 tensorflow/contrib/verbs/design_diagram.png   | Bin 0 -> 13625 bytes
 tensorflow/contrib/verbs/grpc_verbs_client.cc |  47 +
 tensorflow/contrib/verbs/grpc_verbs_client.h  |  51 +
 .../contrib/verbs/grpc_verbs_service.cc       | 165 ++++
 tensorflow/contrib/verbs/grpc_verbs_service.h |  72 ++
 .../contrib/verbs/grpc_verbs_service_impl.cc  |  68 ++
 .../contrib/verbs/grpc_verbs_service_impl.h   |  89 ++
 tensorflow/contrib/verbs/rdma.cc              | 894 ++++++++++++++++++
 tensorflow/contrib/verbs/rdma.h               | 267 ++++++
 tensorflow/contrib/verbs/rdma_mgr.cc          | 132 +++
 tensorflow/contrib/verbs/rdma_mgr.h           |  55 ++
 .../contrib/verbs/rdma_rendezvous_mgr.cc      | 147 +++
 .../contrib/verbs/rdma_rendezvous_mgr.h       |  64 ++
 tensorflow/contrib/verbs/verbs_server_lib.cc  | 169 ++++
 tensorflow/contrib/verbs/verbs_server_lib.h   |  65 ++
 tensorflow/contrib/verbs/verbs_service.proto  |  60 ++
 tensorflow/contrib/verbs/verbs_util.cc        |  64 ++
 tensorflow/contrib/verbs/verbs_util.h         |  42 +
 tensorflow/core/BUILD                         |   5 +-
 .../rpc/grpc_server_lib.cc                    |  21 +-
 .../distributed_runtime/rpc/grpc_server_lib.h |  19 +-
 .../core/platform/default/build_config.bzl    |   6 +
 .../platform/default/build_config_root.bzl    |   8 +
 tensorflow/python/BUILD                       |   5 +-
 28 files changed, 2775 insertions(+), 8 deletions(-)
 create mode 100644 tensorflow/contrib/verbs/BUILD
 create mode 100644 tensorflow/contrib/verbs/README.md
 create mode 100644 tensorflow/contrib/verbs/design_diagram.png
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_client.cc
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_client.h
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service.cc
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service.h
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service_impl.h
 create mode 100644 tensorflow/contrib/verbs/rdma.cc
 create mode 100644 tensorflow/contrib/verbs/rdma.h
 create mode 100644 tensorflow/contrib/verbs/rdma_mgr.cc
 create mode 100644 tensorflow/contrib/verbs/rdma_mgr.h
 create mode 100644 tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
 create mode 100644 tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
 create mode 100644 tensorflow/contrib/verbs/verbs_server_lib.cc
 create mode 100644 tensorflow/contrib/verbs/verbs_server_lib.h
 create mode 100644 tensorflow/contrib/verbs/verbs_service.proto
 create mode 100644 tensorflow/contrib/verbs/verbs_util.cc
 create mode 100644 tensorflow/contrib/verbs/verbs_util.h

diff --git a/configure b/configure
index 48a4594da6..f0b1a77d70 100755
--- a/configure
+++ b/configure
@@ -241,6 +241,24 @@ if [[ "$TF_ENABLE_XLA" == "1" ]]; then
   write_to_bazelrc 'build --define with_xla_support=true'
 fi
 
+# Verbs configuration
+while [ "$TF_NEED_VERBS" == "" ]; do
+  read -p "Do you wish to build TensorFlow with "\
+"VERBS support? [y/N] " INPUT
+  case $INPUT in
+    [Yy]* ) echo "VERBS support will be enabled for "\
+"TensorFlow"; TF_NEED_VERBS=1;;
+    [Nn]* ) echo "No VERBS support will be enabled for "\
+"TensorFlow"; TF_NEED_VERBS=0;;
+    "" ) echo "No VERBS support will be enabled for "\
+"TensorFlow"; TF_NEED_VERBS=0;;
+    * ) echo "Invalid selection: " $INPUT;;
+  esac
+done
+
+if [[ "$TF_NEED_VERBS" == "1" ]]; then
+  write_to_bazelrc 'build --define with_verbs_support=true'
+fi
 
 # Invoke python_config and set up symlinks to python includes
 ./util/python/python_config.sh --setup "$PYTHON_BIN_PATH"
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 02bf678127..ca8d2dfbe4 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -149,6 +149,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "with_verbs_support",
+    values = {"define": "with_verbs_support=true"},
+    visibility = ["//visibility:public"],
+)
+
 package_group(
     name = "internal",
     packages = ["//tensorflow/..."],
diff --git a/tensorflow/contrib/verbs/BUILD b/tensorflow/contrib/verbs/BUILD
new file mode 100644
index 0000000000..e1302d9903
--- /dev/null
+++ b/tensorflow/contrib/verbs/BUILD
@@ -0,0 +1,167 @@
+# Description:
+#   Verbs RDMA communication interfaces and implementations for TensorFlow.
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+filegroup(
+    name = "c_srcs",
+    data = glob([
+        "**/*.cc",
+        "**/*.h",
+    ]),
+)
+
+# For platform specific build config
+load(
+    "//tensorflow/core:platform/default/build_config.bzl",
+    "tf_proto_library_cc",
+)
+
+package(default_visibility = [
+    "//tensorflow:__subpackages__",
+])
+
+tf_proto_library_cc(
+    name = "verbs_service_proto",
+    srcs = ["verbs_service.proto"],
+    cc_api_version = 2,
+    visibility = [
+        "//tensorflow:__subpackages__",
+    ],
+)
+
+cc_library(
+    name = "verbs_util",
+    srcs = ["verbs_util.cc"],
+    hdrs = ["verbs_util.h"],
+    deps = [
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:gpu_runtime",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+cc_library(
+    name = "grpc_verbs_service",
+    srcs = ["grpc_verbs_service.cc"],
+    hdrs = ["grpc_verbs_service.h"],
+    deps = [
+        ":grpc_verbs_service_impl",
+        ":rdma_mgr",
+        ":verbs_service_proto_cc",
+        "//tensorflow/core:lib",
+        "//tensorflow/core/distributed_runtime:session_mgr",
+        "//tensorflow/core/distributed_runtime:worker_env",
+        "//tensorflow/core/distributed_runtime/rpc:async_service_interface",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_call",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_util",
+        "@grpc//:grpc++_unsecure",
+    ],
+    alwayslink = 1,
+)
+
+cc_library(
+    name = "grpc_verbs_service_impl",
+    srcs = ["grpc_verbs_service_impl.cc"],
+    hdrs = ["grpc_verbs_service_impl.h"],
+    deps = [
+        ":verbs_service_proto_cc",
+        "@grpc//:grpc++_unsecure",
+    ],
+)
+
+cc_library(
+    name = "grpc_verbs_client",
+    srcs = ["grpc_verbs_client.cc"],
+    hdrs = ["grpc_verbs_client.h"],
+    deps = [
+        ":grpc_verbs_service_impl",
+        ":verbs_service_proto_cc",
+        "//tensorflow/core:lib",
+        "//tensorflow/core/distributed_runtime:call_options",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_util",
+    ],
+    alwayslink = 1,
+)
+
+cc_library(
+    name = "rdma_rendezvous_mgr",
+    srcs = ["rdma_rendezvous_mgr.cc"],
+    hdrs = ["rdma_rendezvous_mgr.h"],
+    deps = [
+        ":rdma_mgr",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core/distributed_runtime:base_rendezvous_mgr",
+        "//tensorflow/core/distributed_runtime:worker_env",
+    ],
+)
+
+cc_library(
+    name = "rdma_mgr",
+    srcs = ["rdma_mgr.cc"],
+    hdrs = ["rdma_mgr.h"],
+    deps = [
+        ":grpc_verbs_client",
+        ":rdma",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core/distributed_runtime:worker_env",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_channel",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_worker_cache",
+    ],
+)
+
+cc_library(
+    name = "rdma",
+    srcs = ["rdma.cc"],
+    hdrs = ["rdma.h"],
+    linkopts = select({
+        "//tensorflow:with_verbs_support": ["-libverbs"],
+        "//conditions:default": [],
+    }),
+    deps = [
+        ":verbs_util",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:gpu_runtime",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core/distributed_runtime:rendezvous_mgr_interface",
+        "//tensorflow/core/distributed_runtime:session_mgr",
+        "//tensorflow/core/distributed_runtime:worker_env",
+    ],
+)
+
+cc_library(
+    name = "verbs_server_lib",
+    srcs = ["verbs_server_lib.cc"],
+    hdrs = ["verbs_server_lib.h"],
+    linkstatic = 1,  # Seems to be needed since alwayslink is broken in bazel
+    deps = [
+        ":grpc_verbs_service",
+        ":rdma_mgr",
+        ":rdma_rendezvous_mgr",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib",
+    ],
+    alwayslink = 1,
+)
diff --git a/tensorflow/contrib/verbs/README.md b/tensorflow/contrib/verbs/README.md
new file mode 100644
index 0000000000..37a543dda8
--- /dev/null
+++ b/tensorflow/contrib/verbs/README.md
@@ -0,0 +1,77 @@
+## How to compile and use Rdma-enabled tensorflow
+1. Follow the regular TF compilation instructions. During configure step, if you want ibverbs based Rdma support, answer yes to this question:
+
+    ```Do you wish to build TensorFlow with VERBS-RDMA support [y/N]```
+
+2. To turn on Rdma connection, add the protocol "grpc+verbs" in server definition:
+
+    ```server = tf.train.Server(cluster, job_name="local", task_index=0, protocol='grpc+verbs') # default protocol is 'grpc'```
+
+## Overview
+The design is based on Tensorflow r1.0. An Rdma path is added between servers for tensor transfer (weights, gradients, etc). The existing GRPC path remains and is responsible for "administrative" tasks, such as setting up the Rdma path, exchanging computation graphs, etc.
+
+During the server setup, an Rdma manager is created to manage low-level Rdma components such as Rdma channel and Rdma adapter, an Rdma rendezvous manager is created to oversee send/recv operations between servers. Following the distributed Tensorflow design philosophy, the send operation is passive, i.e. merely placing a tensor in the local out-going table. It is the receive operation that actually initiates the tensor transfer.
+
+Tensorflow dynamically allocates memory for tensors that are to be sent or received. This causes difficulty for Rdma operations where pinned memory is required. Two remedies are possible, either the memory is pinned, transfer, then unpinned for each and every tensor to be transferred, or a buffer is pre-allocated and pinned for each tensor. The former incurs significant operation overhead since pinning and unpinning memory for each dynamically generated tensor is slow. The latter incurs large memory overhead and extra copying from the tensor to its pinned buffer, but may still be faster than the former. The second approach is adopted in this design. Each Rdma channel, representing a Rdma connection to a peer, contains a table of pinned buffers for all the seen tensors that requires transfer. It is assumed that the tensor size rarely changes across different steps. So only one buffer is created for the same tensor across all the steps. In the rare case when the tensor size does increases, the old buffer is discarded and new buffer of larger size is created and pinned.
+
+When a tensor is prepared fro transfer, it is first converted to TensorProto, then the proto is serialized to byte array and copied to the pinned buffer. The content of the buffer is transferred to the remote node via Rdma write. On the remote side, the process is reversed. This is illustrated in the diagram below. The conversion of TensorProto is introduced to simplify transfer of string-tensors. Also since the TensorProto lives in host memory, even if the origin tensor lives in the device, the pinned buffers are all allocated in the host memory.
+![Tensorflow Rdma path](./design_diagram.png)
+
+The following improvements can be made in the future. First, conversion to TensorProto and serialization can be avoided for numeric (float/int) tensors since their internal buffer can be access directly as byte array. Second, the pinned buffer may be allocated on device if the tensor is located in the device. This avoids extra device-to-host copy at the expense of extra device memory consumption.
+## Design details
+
+### Rdma components
+
+* **Rdma adapter:** The base for Rdma communications. It may contain multiple channels and buffers.  It is responsible for handling various incoming Rdma messages.
+* **Rdma channel:** Responsible for Rdma connection to a particular node. It manages multiple buffers. A channel has a callback table which stores all the callbacks for the requested tensors.
+* **Rdma buffer:** Responsible for sending or receiving data. It has a fixed size memory to store the data. It has a queue to store the pending jobs. There are three types of buffers, message buffer, ACK buffer and tensor buffer. A channel has two message buffers, two ack buffers and many tensor buffers.
+* **Rdma manager:** Manages the adapter and channels, including channel creation, channel setup via GRPC service, channel lookup, etc.
+* **Rdma rendezvous manager:** manages multiple rdma rendezvous. 
+* **Rdma rendezvous:** a derived class of BaseRemoteRendezvous. This class is the back end for "send" and "recv" ops. When the sendrecv_op wants to send or receive a tensor, it calls the rendezvous' "send" and "recv" functions respectively. Rendezvous are identified by "step_id", a random number, so that tensors for different iterations don't get mixed up.
+
+### The SEND operation
+
+In tensorflow, when rendezvous sends a tensor, it merely puts a tensor in a local table in the corresponding rendezvous. If the tensor has been requested, a callback exists in the table. "send" will activate the callback, which tries to send the tensor across the node.
+
+
+### The RECV operation
+
+When a tensor is requested, rendezvous' recv function is called. The function first places a callback in the channel's callback table, which will be activated once the tensor is sent from the source. In the next step, a message is sent to notify the source of the requested tensor. Once the source receives the message, it will check locally for the tensor, if not found, a callback is placed in the table, otherwise, the tensor id will be placed at corresponding Rdma buffer's job queue for future transmission. When a tensor is scheduled to be transmitted, the Rdma buffer needs to have the memory allocated and initialized (registered with the remote buffer info). If the memory is not ready, the transmission is deferred, a message is sent to the destination to establish the memory first. The other case a transimssion can be deferred is when the buffer is still being used by an on-going transmission.
+
+### Three types of Rdma buffers
+
+* **Message buffer:** responsible for sending message only.
+* **Ack buffer:** once a message is sent, the recipient needs to send an ack via the ack buffer to free up the message buffer. An ack buffer is exclusively for its coupled message buffer.
+* **Tensor buffer:** responsible for sending tensors. The recipient needs to send back a message to free up the sending buffer.
+
+### Rdma packet format
+
+|type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|data_type|tensor_shape|tensor_bytes|tensor_buffer|
+
+### Six types of Rdma messages
+* RDMA_MESSAGE_ACK
+* RDMA_MESSAGE_BUFFER_IDLE
+* RDMA_MESSAGE_BUFFER_REQUEST
+* RDMA_MESSAGE_BUFFER_RESPONSE
+* RDMA_MESSAGE_TENSOR_REQUEST
+* RDMA_MESSAGE_TENSOR_WRITE
+
+### Actions upon receiving Rdma messages
+* RDMA_MESSAGE_ACK
+  * sender: mark local ack buffer idle.
+  * receiver: mark remote message buffer idle, send next item.
+* RDMA_MESSAGE_BUFFER_IDLE
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, set remote tensor buffer idle, send next item.
+* RDMA_MESSAGE_BUFFER_REQUEST
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, find or create tensor buffer, send BUFFER_RESPONSE.
+* RDMA_MESSAGE_BUFFER_RESPONSE
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, set remote buffer info, set local and remote buffer idle, send next item.
+* RDMA_MESSAGE_TENSOR_REQUEST
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, find or create tensor buffer, enqueue tensor id, send next item.
+* RDMA_MESSAGE_TENSOR_WRITE
+  * sender: mark local message buffer idle, send next item.
+  * receiver: run callback.
diff --git a/tensorflow/contrib/verbs/design_diagram.png b/tensorflow/contrib/verbs/design_diagram.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0ad27455fa72bbdd8018bd3977378d2aee468e7
GIT binary patch
literal 13625
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

literal 0
HcmV?d00001

diff --git a/tensorflow/contrib/verbs/grpc_verbs_client.cc b/tensorflow/contrib/verbs/grpc_verbs_client.cc
new file mode 100644
index 0000000000..be94af1867
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_client.cc
@@ -0,0 +1,47 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/verbs/grpc_verbs_client.h"
+
+#include "tensorflow/core/distributed_runtime/rpc/grpc_util.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow { 
+  
+Status GrpcVerbsClient::GetRemoteAddress(CallOptions* call_options,
+                       const GetRemoteAddressRequest* request,
+                       GetRemoteAddressResponse* response)  {
+  ::grpc::ClientContext ctx;
+  ctx.set_fail_fast(false);
+  SetDeadline(&ctx, call_options->GetTimeout());
+  return FromGrpcStatus(stub_->GetRemoteAddress(&ctx, *request, response));
+}
+
+Status GrpcVerbsClient::GetRemoteAddress(const GetRemoteAddressRequest* request,
+                       GetRemoteAddressResponse* response)  {
+  CallOptions call_options;
+  call_options.SetTimeout(-1); // no time out
+  return GetRemoteAddress(&call_options, request, response);
+}
+
+void GrpcVerbsClient::SetDeadline(::grpc::ClientContext* ctx, 
+        int64 time_in_ms) {
+  if (time_in_ms > 0) {
+    ctx->set_deadline(gpr_time_from_millis(time_in_ms, GPR_TIMESPAN));
+  }
+}
+
+}  // namespace tensorflow
\ No newline at end of file
diff --git a/tensorflow/contrib/verbs/grpc_verbs_client.h b/tensorflow/contrib/verbs/grpc_verbs_client.h
new file mode 100644
index 0000000000..030710726f
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_client.h
@@ -0,0 +1,51 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_CLIENT_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_CLIENT_H_
+
+#include "tensorflow/core/distributed_runtime/call_options.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_util.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/contrib/verbs/grpc_verbs_service_impl.h"
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+
+namespace tensorflow {
+
+// GrpcVerbsClient is a client that uses gRPC to talk to the Verbs service.
+class GrpcVerbsClient {
+ public:
+  explicit GrpcVerbsClient(SharedGrpcChannelPtr client_channel)
+             : stub_(grpc::VerbsService::NewStub(client_channel)) {}
+  ~GrpcVerbsClient() {}
+
+  Status GetRemoteAddress(CallOptions* call_options,
+                       const GetRemoteAddressRequest* request,
+                       GetRemoteAddressResponse* response);
+  Status GetRemoteAddress(const GetRemoteAddressRequest* request,
+                       GetRemoteAddressResponse* response);
+  
+ private:
+  std::unique_ptr<grpc::VerbsService::Stub> stub_;
+
+  void SetDeadline(::grpc::ClientContext* ctx, int64 time_in_ms);
+  
+  TF_DISALLOW_COPY_AND_ASSIGN(GrpcVerbsClient);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_CLIENT_H_
+
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service.cc b/tensorflow/contrib/verbs/grpc_verbs_service.cc
new file mode 100644
index 0000000000..2b1cdec6b9
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service.cc
@@ -0,0 +1,165 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "grpc++/alarm.h"
+#include "grpc++/grpc++.h"
+#include "grpc++/server_builder.h"
+
+#include "tensorflow/contrib/verbs/grpc_verbs_service.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_util.h"
+#include "tensorflow/core/distributed_runtime/session_mgr.h"
+
+namespace tensorflow {
+
+GrpcVerbsService::GrpcVerbsService(const WorkerEnv* worker_env,
+      ::grpc::ServerBuilder* builder)
+      : is_shutdown_(false), worker_env_(worker_env) {
+    builder->RegisterService(&verbs_service_);
+    cq_ = builder->AddCompletionQueue().release();
+}
+
+GrpcVerbsService::~GrpcVerbsService() {
+  delete shutdown_alarm_;
+  delete cq_;
+}
+
+void GrpcVerbsService::Shutdown() {
+  bool did_shutdown = false;
+  {
+    mutex_lock l(shutdown_mu_);
+    if (!is_shutdown_) {
+      LOG(INFO) << "Shutting down GrpcWorkerService.";
+      is_shutdown_ = true;
+      did_shutdown = true;
+    }
+  }
+  if (did_shutdown) {
+    shutdown_alarm_ =
+        new ::grpc::Alarm(cq_, gpr_now(GPR_CLOCK_MONOTONIC), nullptr);
+  }
+}
+  
+// This macro creates a new request for the given RPC method name
+// (e.g., `ENQUEUE_REQUEST(GetRemoteAddress, false);`), and enqueues it on
+// `this->cq_`.
+//
+// This macro is invoked one or more times for each RPC method to
+// ensure that there are sufficient completion queue entries to
+// handle incoming requests without blocking.
+//
+// The implementation of the request handler for each RPC method
+// must ensure that it calls ENQUEUE_REQUEST() for that RPC method,
+// to keep accepting new requests.
+#define ENQUEUE_REQUEST(method, supports_cancel)                              \
+  do {                                                                        \
+    mutex_lock l(shutdown_mu_);                                               \
+    if (!is_shutdown_) {                                                      \
+      Call<GrpcVerbsService, grpc::VerbsService::AsyncService,                \
+           method##Request, method##Response>::                               \
+          EnqueueRequest(&verbs_service_, cq_,                                \
+                         &grpc::VerbsService::AsyncService::Request##method,  \
+                         &GrpcVerbsService::method##Handler,                  \
+                         (supports_cancel));                                  \
+    }                                                                         \
+  } while (0)
+
+// This method blocks forever handling requests from the completion queue.
+void GrpcVerbsService::HandleRPCsLoop() {
+  for (int i = 0; i < 10; ++i) {
+    ENQUEUE_REQUEST(GetRemoteAddress, false);
+  }
+
+  void* tag;
+  bool ok;
+
+  while (cq_->Next(&tag, &ok)) {
+    UntypedCall<GrpcVerbsService>::Tag* callback_tag =
+        static_cast<UntypedCall<GrpcVerbsService>::Tag*>(tag);
+    if (callback_tag) {
+      callback_tag->OnCompleted(this, ok);
+    } else {
+      cq_->Shutdown();
+    }
+  }
+}
+
+void GrpcVerbsService::GetRemoteAddressHandler(WorkerCall
+     <GetRemoteAddressRequest, GetRemoteAddressResponse>* call) {
+  Status s = GetRemoteAddressSync(&call->request, &call->response);
+  call->SendResponse(ToGrpcStatus(s));
+  ENQUEUE_REQUEST(GetRemoteAddress, false);
+}
+
+// synchronous method
+Status GrpcVerbsService::GetRemoteAddressSync(
+                        const GetRemoteAddressRequest* request,
+                        GetRemoteAddressResponse* response) {
+  // analyzing request
+  // the channel setting part is redundant.
+  const string remote_host_name = request->host_name();
+  RdmaChannel* rc = rdma_mgr_->FindChannel(remote_host_name);
+  CHECK(rc);
+  RdmaAddress ra;
+  ra.lid = request->channel().lid();
+  ra.qpn = request->channel().qpn(); 
+  ra.psn = request->channel().psn();
+  rc->SetRemoteAddress(ra, false);
+  rc->Connect();
+  int i = 0;
+  int idx[] = {1, 0, 3, 2};
+  std::vector<RdmaBuffer*> mb(rc->message_buffers());
+  CHECK_EQ(request->mr_size(), 4);
+  for (const auto& mr : request->mr()) {
+    // the connections are crossed, i.e.
+    // local tx_message_buffer <---> remote rx_message_buffer_
+    // local rx_message_buffer <---> remote tx_message_buffer_
+    // local tx_ack_buffer <---> remote rx_ack_buffer_
+    // local rx_ack_buffer <---> remote tx_ack_buffer_
+    // hence idx[] = {1, 0, 3, 2}.
+    RdmaBuffer* rb = mb[idx[i]];
+    RemoteMR rmr;
+    rmr.remote_addr = mr.remote_addr();
+    rmr.rkey = mr.rkey();
+    rb->SetRemoteMR(rmr, false);
+    i++;
+  }
+  CHECK(i == RdmaChannel::kNumMessageBuffers);
+
+  // setting up response
+  response->set_host_name(worker_env_->session_mgr->
+      LegacySession()->worker_name);
+  Channel* channel_info = response->mutable_channel();
+  channel_info->set_lid(rc->self().lid);
+  channel_info->set_qpn(rc->self().qpn);
+  channel_info->set_psn(rc->self().psn);
+  for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
+    MemoryRegion* mr = response->add_mr();
+    mr->set_remote_addr(reinterpret_cast<uint64>(mb[i]->buffer()));
+    mr->set_rkey(mb[i]->self()->rkey);
+  }
+  return Status::OK();     
+}
+
+// Create a GrpcVerbsService, then assign it to a given handle.
+void SetNewVerbsService(GrpcVerbsService** handle, const WorkerEnv* worker_env,
+     ::grpc::ServerBuilder* builder) {
+  *handle = new GrpcVerbsService(worker_env, builder);
+}
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service.h b/tensorflow/contrib/verbs/grpc_verbs_service.h
new file mode 100644
index 0000000000..dcc4518bb5
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service.h
@@ -0,0 +1,72 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_GRPC_VERBS_SERVICE_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_GRPC_VERBS_SERVICE_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/contrib/verbs/grpc_verbs_service_impl.h"
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+#include "tensorflow/core/distributed_runtime/rpc/async_service_interface.h"
+#include "tensorflow/core/lib/core/refcount.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_call.h"
+
+namespace grpc {
+class ServerBuilder;
+class ServerCompletionQueue;
+class Alarm;
+}  // namespace grpc
+
+namespace tensorflow {
+
+class GrpcVerbsService : public AsyncServiceInterface {
+ public:
+  GrpcVerbsService(const WorkerEnv* worker_env, ::grpc::ServerBuilder* builder);
+  ~GrpcVerbsService();
+  void HandleRPCsLoop() override;
+  void Shutdown() override;
+  void SetRdmaMgr(RdmaMgr* rdma_mgr) { rdma_mgr_ = rdma_mgr; }
+
+ private:
+  template <class RequestMessage, class ResponseMessage>
+  using WorkerCall = Call<GrpcVerbsService, grpc::VerbsService::AsyncService,
+                        RequestMessage, ResponseMessage>;
+  void GetRemoteAddressHandler(WorkerCall
+     <GetRemoteAddressRequest, GetRemoteAddressResponse>* call);
+  Status GetRemoteAddressSync(const GetRemoteAddressRequest* request,
+                          GetRemoteAddressResponse* response);
+  
+  ::grpc::ServerCompletionQueue* cq_; 
+  grpc::VerbsService::AsyncService verbs_service_;
+  mutex shutdown_mu_;
+  bool is_shutdown_ GUARDED_BY(shutdown_mu_);
+  ::grpc::Alarm* shutdown_alarm_;
+  // not owned
+  RdmaMgr* rdma_mgr_;
+  const WorkerEnv*  const worker_env_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(GrpcVerbsService);
+};
+
+// Create a GrpcVerbsService, then assign it to a given handle.
+void SetNewVerbsService(GrpcVerbsService** handle, const WorkerEnv* worker_env,
+     ::grpc::ServerBuilder* builder);
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_GRPC_VERBS_SERVICE_H_
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc b/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
new file mode 100644
index 0000000000..7aac8c7ab3
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
@@ -0,0 +1,68 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/verbs/grpc_verbs_service_impl.h"
+
+#include "grpc++/impl/codegen/async_stream.h"
+#include "grpc++/impl/codegen/async_unary_call.h"
+#include "grpc++/impl/codegen/channel_interface.h"
+#include "grpc++/impl/codegen/client_unary_call.h"
+#include "grpc++/impl/codegen/method_handler_impl.h"
+#include "grpc++/impl/codegen/rpc_service_method.h"
+#include "grpc++/impl/codegen/service_type.h"
+#include "grpc++/impl/codegen/sync_stream.h"
+
+namespace tensorflow {
+
+namespace grpc {
+
+static const char* grpcVerbsService_method_names[] = {
+    "/tensorflow.VerbsService/GetRemoteAddress",
+};
+
+std::unique_ptr<VerbsService::Stub> VerbsService::NewStub(
+    const std::shared_ptr< ::grpc::ChannelInterface>& channel,
+    const ::grpc::StubOptions& options) {
+  std::unique_ptr<VerbsService::Stub> stub(new VerbsService::Stub(channel));
+  return stub;
+}
+
+VerbsService::Stub::Stub(
+    const std::shared_ptr< ::grpc::ChannelInterface>& channel)
+    : channel_(channel),
+      rpcmethod_GetRemoteAddress_(grpcVerbsService_method_names[0],
+                               ::grpc::RpcMethod::NORMAL_RPC, channel) {}
+
+::grpc::Status VerbsService::Stub::GetRemoteAddress(
+    ::grpc::ClientContext* context, const GetRemoteAddressRequest& request,
+    GetRemoteAddressResponse* response) {
+  return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_GetRemoteAddress_,
+                                   context, request, response);
+}
+
+VerbsService::AsyncService::AsyncService() {
+  for (int i = 0; i < 1; ++i) {
+    AddMethod(new ::grpc::RpcServiceMethod(grpcVerbsService_method_names[i],
+                                           ::grpc::RpcMethod::NORMAL_RPC,
+                                           nullptr));
+    ::grpc::Service::MarkMethodAsync(i);
+  }
+}
+
+VerbsService::AsyncService::~AsyncService() {}
+
+}  // namespace grpc
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service_impl.h b/tensorflow/contrib/verbs/grpc_verbs_service_impl.h
new file mode 100644
index 0000000000..d9e5856cb3
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service_impl.h
@@ -0,0 +1,89 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_SERVICE_IMPL_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_SERVICE_IMPL_H_
+
+#include "grpc++/impl/codegen/async_stream.h"
+#include "grpc++/impl/codegen/async_unary_call.h"
+#include "grpc++/impl/codegen/proto_utils.h"
+#include "grpc++/impl/codegen/rpc_method.h"
+#include "grpc++/impl/codegen/service_type.h"
+#include "grpc++/impl/codegen/status.h"
+#include "grpc++/impl/codegen/stub_options.h"
+#include "grpc++/impl/codegen/sync_stream.h"
+
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+
+namespace grpc {
+class CompletionQueue;
+class Channel;
+class RpcService;
+class ServerCompletionQueue;
+class ServerContext;
+}  // namespace grpc
+
+namespace tensorflow {
+
+namespace grpc {
+
+// Implementation of `tensorflow.VerbsService`, based on the
+// definition in "//tensorflow/contrib/verbs/verbs_service.proto",
+// and the gRPC generated stub and service classes.
+// See the proto file for the definition of methods and messages.
+class VerbsService GRPC_FINAL {
+ public:
+  class StubInterface {
+   public:
+    virtual ~StubInterface() {}
+    virtual ::grpc::Status GetRemoteAddress(::grpc::ClientContext* context,
+                                       const GetRemoteAddressRequest& request,
+                                       GetRemoteAddressResponse* response) = 0;
+  };
+  class Stub GRPC_FINAL : public StubInterface {
+   public:
+    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
+    ::grpc::Status GetRemoteAddress(::grpc::ClientContext* context,
+                              const GetRemoteAddressRequest& request,
+                              GetRemoteAddressResponse* response) GRPC_OVERRIDE;
+
+   private:
+    std::shared_ptr< ::grpc::ChannelInterface> channel_;
+    const ::grpc::RpcMethod rpcmethod_GetRemoteAddress_;
+  };
+  static std::unique_ptr<Stub> NewStub(
+      const std::shared_ptr< ::grpc::ChannelInterface>& channel,
+      const ::grpc::StubOptions& options = ::grpc::StubOptions());
+
+  class AsyncService : public ::grpc::Service {
+   public:
+    AsyncService();
+    virtual ~AsyncService();
+    void RequestGetRemoteAddress(
+        ::grpc::ServerContext* context, GetRemoteAddressRequest* request,
+        ::grpc::ServerAsyncResponseWriter<GetRemoteAddressResponse>* response,
+        ::grpc::CompletionQueue* new_call_cq,
+        ::grpc::ServerCompletionQueue* notification_cq, void* tag) {
+      ::grpc::Service::RequestAsyncUnary(0, context, request, response,
+                                         new_call_cq, notification_cq, tag);
+    }
+  };
+};
+
+}  // namespace grpc
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_SERVICE_IMPL_H_
diff --git a/tensorflow/contrib/verbs/rdma.cc b/tensorflow/contrib/verbs/rdma.cc
new file mode 100644
index 0000000000..8063b299cd
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma.cc
@@ -0,0 +1,894 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include <cstdlib>
+#include "tensorflow/contrib/verbs/rdma.h"
+#include "tensorflow/contrib/verbs/verbs_util.h"
+#include "tensorflow/core/common_runtime/device_mgr.h"
+#include "tensorflow/core/common_runtime/dma_helper.h"
+#include "tensorflow/core/common_runtime/gpu/gpu_util.h"
+#include "tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h"
+#include "tensorflow/core/distributed_runtime/session_mgr.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/rendezvous.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/hash/hash.h"
+#include "tensorflow/core/lib/random/random.h"
+
+namespace tensorflow {
+
+namespace {
+// hash name to 32-bit integer
+uint32_t NameHash(const string& name) {
+    return Hash32(name.data(), name.size(), 0x1234ABCD);
+}
+
+// convenience function for printing message
+string MessageTypeToString(RdmaMessageType rmt) {
+  switch(rmt){
+    case RDMA_MESSAGE_ACK:
+      return "RDMA_MESSAGE_ACK";
+      break;
+    case RDMA_MESSAGE_BUFFER_IDLE:
+      return "RDMA_MESSAGE_BUFFER_IDLE";
+      break;
+    case RDMA_MESSAGE_BUFFER_REQUEST:
+      return "RDMA_MESSAGE_BUFFER_REQUEST";
+      break;
+    case RDMA_MESSAGE_BUFFER_RESPONSE:
+      return "RDMA_MESSAGE_BUFFER_RESPONSE";
+      break;
+    case RDMA_MESSAGE_TENSOR_REQUEST:
+      return "RDMA_MESSAGE_TENSOR_REQUEST";
+      break;
+    case RDMA_MESSAGE_TENSOR_WRITE:
+      return "RDMA_MESSAGE_TENSOR_WRITE";
+      break;
+    default: 
+      return "UNKNOWN MESSAGE";
+  }
+}
+}
+
+ibv_context* open_default_device() {
+  ibv_device** dev_list;
+  ibv_device* ib_dev;
+  dev_list = ibv_get_device_list(NULL);
+  CHECK(dev_list) << "No InfiniBand device found";
+  ib_dev = dev_list[0];
+  CHECK(ib_dev) << "No InfiniBand device found";
+  ibv_context* context = ibv_open_device(ib_dev);
+  CHECK(context) << "Open context failed for " << ibv_get_device_name(ib_dev);
+  return context;
+}
+
+ibv_pd* alloc_protection_domain(ibv_context* context) {
+  ibv_pd* pd = ibv_alloc_pd(context);
+  CHECK(pd) << "Failed to allocate protection domain";
+  return pd;
+}
+
+RdmaAdapter::RdmaAdapter(const WorkerEnv* worker_env)
+    : context_(open_default_device()),
+      pd_(alloc_protection_domain(context_)),
+      worker_env_(worker_env) {
+  event_channel_ = ibv_create_comp_channel(context_);
+  CHECK(event_channel_) << "Failed to create completion channel";
+  cq_ = ibv_create_cq(context_, MAX_CONCURRENT_WRITES * 2, NULL, event_channel_, 0);
+  CHECK(cq_) << "Failed to create completion queue";
+  CHECK(!ibv_req_notify_cq(cq_, 0)) << "Failed to request CQ notification";
+  polling_thread_.reset(Env::Default()->StartThread(
+                            ThreadOptions(), "RdmaAdapterCQThread",
+                            [this] {Process_CQ(); }));
+  VLOG(2) << "Start RdmaAdapter: " << name(); 
+}
+
+RdmaAdapter::~RdmaAdapter() {
+  polling_thread_.reset();
+  CHECK(!ibv_destroy_cq(cq_)) << "Failed to destroy CQ";
+  CHECK(!ibv_destroy_comp_channel(event_channel_)) << "Failed to destroy channel";
+  CHECK(!ibv_dealloc_pd(pd_)) << "Failed to deallocate PD";
+  CHECK(!ibv_close_device(context_)) << "Failed to release context";
+}
+
+string RdmaAdapter::name() const {
+  return string(context_->device->name);
+}
+
+// Function to process incoming messages
+// There are two types of messages: 
+// 1. IBV_WC_RECV_RDMA_WITH_IMM (receive)
+// 2. IBV_WC_RDMA_WRITE (send))
+void RdmaAdapter::Process_CQ() {
+  while (true) {
+    ibv_cq* cq;
+    void* cq_context;
+    CHECK(!ibv_get_cq_event(event_channel_, &cq, &cq_context));
+    CHECK(cq == cq_);
+    ibv_ack_cq_events(cq, 1);
+    CHECK(!ibv_req_notify_cq(cq_, 0));
+
+    int ne = ibv_poll_cq(cq_, MAX_CONCURRENT_WRITES * 2,
+      static_cast<ibv_wc*>(wc_));
+    CHECK_GE(ne, 0);
+    for (int i = 0; i < ne; ++i) {
+      CHECK(wc_[i].status == IBV_WC_SUCCESS) << "Failed status \n"
+                                             << ibv_wc_status_str(wc_[i].status)
+                                             << " " << wc_[i].status << " "
+                                             << static_cast<int>(wc_[i].wr_id)
+                                             << " "<< wc_[i].vendor_err;
+      if (wc_[i].opcode == IBV_WC_RECV_RDMA_WITH_IMM) {
+        RdmaChannel* rc = reinterpret_cast<RdmaChannel*>(wc_[i].wr_id);
+        // put back a recv wr.
+        rc->Recv();
+        // imm_data is the index of RX buffer in the buffer table.
+        uint32_t imm_data = wc_[i].imm_data;
+        RdmaBuffer* rb = rc->FindBuffer(imm_data);
+        RdmaMessage rm;
+        RdmaMessage::ParseMessage(rm, rb->buffer_);
+        VLOG(2) << "recv RDMA message: " << MessageTypeToString(rm.type_);
+        
+        if (rm.type_ == RDMA_MESSAGE_ACK) { 
+          // receive an ack to a message
+          rb = rc->tx_message_buffer_;
+          rb->SetBufferStatus(remote, idle);
+          rb->SendNextItem();
+        } else if (rm.type_ == RDMA_MESSAGE_TENSOR_REQUEST) {
+          // received a request-for-tensor message
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find or create buffer
+          RdmaBuffer* tb = rc->FindOrCreateBuffer(rm.name_);
+          string key_with_step_id = 
+                  VerbsUtil::AppendStepidToKey(rm.name_, rm.step_id_);
+          tb->EnqueueItem(key_with_step_id);
+          // send the next tensor
+          worker_env_->compute_pool->Schedule([tb](){tb->SendNextItem();});
+        } else if (rm.type_ == RDMA_MESSAGE_BUFFER_IDLE) { 
+          // receive tensor-buffer-ready message
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find buffer
+          RdmaBuffer* tb = rc->FindBuffer(rm.name_);
+          tb->SetBufferStatus(remote, idle);
+          worker_env_->compute_pool->Schedule([tb](){tb->SendNextItem();});
+        } else if (rm.type_ == RDMA_MESSAGE_BUFFER_REQUEST) {
+          // remote host requests to create a tensor buffer;
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find or create the buffer
+          RdmaBuffer* tb = rc->FindOrCreateBuffer(rm.name_, TENSOR);
+          RemoteMR rmr;
+          rmr.remote_addr = rm.remote_addr_;
+          rmr.rkey = rm.rkey_;
+          tb->SetRemoteMR(rmr, true);
+          tb->CreateCPUBuffer(rm.buffer_size_);
+          // create RDMA_MESSAGE_BUFFER_RESPONSE message
+          RdmaMessage br;
+          br.type_ = RDMA_MESSAGE_BUFFER_RESPONSE;
+          br.name_size_ = rm.name_.size();
+          br.name_ = rm.name_;
+          br.buffer_size_ = rm.buffer_size_;
+          br.remote_addr_ = reinterpret_cast<uint64_t>(tb->buffer_);
+          br.rkey_ = tb->self_->rkey;
+          string message = RdmaMessage::CreateMessage(br);
+          RdmaBuffer* mb = rc->tx_message_buffer_;
+          mb->EnqueueItem(message);
+          mb->SendNextItem();
+        } else if (rm.type_ == RDMA_MESSAGE_BUFFER_RESPONSE) {
+          // remote creates a buffer and responds 
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find buffer
+          RdmaBuffer* tb = rc->FindBuffer(rm.name_);
+          CHECK(rm.buffer_size_ == tb->size_) 
+                  << "rm.buffer_size = " << rm.buffer_size_
+                  << "tb->size_ = " << tb->size_ 
+                  << "rm.name_ = " << rm.name_;
+          RemoteMR rmr;
+          rmr.remote_addr = rm.remote_addr_;
+          rmr.rkey = rm.rkey_;
+          tb->SetRemoteMR(rmr, true);
+          tb->SetBufferStatus(local, idle);
+          tb->SetBufferStatus(remote, idle);
+          worker_env_->compute_pool->Schedule([tb](){tb->SendNextItem();});
+        } else if (rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) {
+          // tensor RDMA write completed
+          worker_env_->compute_pool->Schedule([rm, rc](){
+            string key_with_step_id = 
+                  VerbsUtil::AppendStepidToKey(rm.name_, rm.step_id_);
+            rc->RunRecvCallback(key_with_step_id);
+          });          
+        }         
+      } else if (wc_[i].opcode == IBV_WC_RDMA_WRITE) {
+        RdmaBuffer* rb = reinterpret_cast<RdmaBuffer*>(wc_[i].wr_id);
+        rb->SetBufferStatus(local, idle);
+        RdmaMessage rm;
+        RdmaMessage::ParseMessage(rm, rb->buffer_);
+        VLOG(2) << "sent RDMA message: " << MessageTypeToString(rm.type_);
+        if (rm.type_ != RDMA_MESSAGE_ACK) {
+          worker_env_->compute_pool->Schedule([rb](){rb->SendNextItem();});
+        }
+      }
+    }
+  }
+}
+
+RdmaChannel::RdmaChannel(const RdmaAdapter* adapter, const string local_name,
+                         const string remote_name)
+    : adapter_(adapter), 
+      local_name_(local_name), 
+      remote_name_(remote_name) {
+  // Create queue pair
+  {
+    struct ibv_qp_init_attr attr;
+    memset(&attr, 0, sizeof(ibv_qp_init_attr));
+    attr.send_cq = adapter_->cq_;
+    attr.recv_cq = adapter_->cq_;
+    attr.cap.max_send_wr = RdmaAdapter::MAX_CONCURRENT_WRITES;
+    attr.cap.max_recv_wr = RdmaAdapter::MAX_CONCURRENT_WRITES;
+    attr.cap.max_send_sge = 1;
+    attr.cap.max_recv_sge = 1;
+    attr.qp_type = IBV_QPT_RC;
+
+    qp_ = ibv_create_qp(adapter_->pd_, &attr);
+    CHECK(qp_) << "Failed to create queue pair";
+  }
+
+  // Init queue pair
+  {
+    struct ibv_qp_attr attr;
+    memset(&attr, 0, sizeof(ibv_qp_attr));
+    attr.qp_state = IBV_QPS_INIT;
+    attr.pkey_index = 0;
+    attr.port_num = 1;
+    attr.qp_access_flags = IBV_ACCESS_LOCAL_WRITE | IBV_ACCESS_REMOTE_WRITE;
+
+    int mask = IBV_QP_STATE | IBV_QP_PKEY_INDEX | IBV_QP_PORT
+        | IBV_QP_ACCESS_FLAGS;
+    CHECK(!ibv_modify_qp(qp_, &attr, mask)) << "Failed to set QP to INIT";
+  }
+
+  // Local address
+  {
+    struct ibv_port_attr attr;
+    CHECK(!ibv_query_port(adapter_->context_, (uint8_t) 1, &attr))
+        << "Query port";
+    self_.lid = attr.lid;
+    self_.qpn = qp_->qp_num;
+    self_.psn = static_cast<uint32_t>(random::New64()) & 0xffffff;
+  }
+  
+  // create message and ack buffers, then initialize the tables.
+  {
+    const string buffer_names[] = {"tx_message_buffer", "rx_message_buffer",
+                                   "tx_ack_buffer", "rx_ack_buffer"};
+    tx_message_buffer_ = new RdmaMessageBuffer(this, buffer_names[0]);
+    rx_message_buffer_ = new RdmaMessageBuffer(this, buffer_names[1]);
+    tx_ack_buffer_ = new RdmaAckBuffer(this, buffer_names[2]);
+    rx_ack_buffer_ = new RdmaAckBuffer(this, buffer_names[3]);
+    message_buffers_.reserve(kNumMessageBuffers);
+    message_buffers_.push_back(tx_message_buffer_);
+    message_buffers_.push_back(rx_message_buffer_);
+    message_buffers_.push_back(tx_ack_buffer_);
+    message_buffers_.push_back(rx_ack_buffer_);
+    // create buffer on host
+    tx_message_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaMessageBufferSize);
+    rx_message_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaMessageBufferSize);
+    tx_ack_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaAckBufferSize);
+    rx_ack_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaAckBufferSize);
+    // bt_mu_.lock() is not used in constructor.
+    for (int i = 0; i < kNumMessageBuffers; i++) {
+      uint32_t index = NameHash(buffer_names[i]);
+      buffer_table_.insert({index, message_buffers_[i]});
+      buffer_index_name_table_.insert({index, buffer_names[i]});
+      buffer_name_index_table_.insert({buffer_names[i], index});
+    }
+    
+    // Initiate recv
+    for (int i = 0; i < 100; i++) {
+      Recv();
+    }
+  }
+}
+
+RdmaChannel::~RdmaChannel() {
+  CHECK(!ibv_destroy_qp(qp_)) << "Failed to destroy QP";
+  delete tx_message_buffer_;
+  delete rx_message_buffer_;
+  delete tx_ack_buffer_;
+  delete rx_ack_buffer_;
+}
+
+void RdmaChannel::SetRemoteAddress(const RdmaAddress& ra, bool override) {
+    mutex_lock lock{mu_};
+    if ((override) || (!remote_set_)) { 
+      remote_.lid = ra.lid;
+      remote_.qpn = ra.qpn;
+      remote_.psn = ra.psn;
+      remote_set_ = true;
+    } else {
+      CHECK(remote_.lid == ra.lid);
+      CHECK(remote_.qpn == ra.qpn);
+      CHECK(remote_.psn == ra.psn);   
+    }
+}
+
+// Adding tokens to the completion queue
+// Tokens are needed to process future messages.
+void RdmaChannel::Recv() {
+  struct ibv_recv_wr wr;
+  memset(&wr, 0, sizeof(wr));
+  wr.wr_id = (uint64_t) this;
+  struct ibv_recv_wr* bad_wr;
+  CHECK(!ibv_post_recv(qp_, &wr, &bad_wr)) << "Failed to post recv";
+}
+
+// Lookup 32-bit buffer index from buffer name
+// Args:
+//   buffer_name: name of the buffer
+// Returns:
+//   32-bit index     
+uint32_t RdmaChannel::LookupBufferIndex(const string& buffer_name){
+  
+  mutex_lock lock{bt_mu_};
+  BufferNameIndexTable::iterator iter = buffer_name_index_table_.find(
+          buffer_name);
+  CHECK(iter != buffer_name_index_table_.end());
+  return iter->second;
+}
+
+// Find a buffer by its 32-bit index
+// Args:
+//   index: 32-bit hash code of the tensor buffer name
+// Returns:
+//   name of the tensor buffer
+RdmaBuffer* RdmaChannel::FindBuffer(const uint32_t index) {
+  mutex_lock lock{bt_mu_};
+  BufferTable::iterator iter = buffer_table_.find(index);
+  CHECK(iter != buffer_table_.end());
+  return iter->second;
+}
+
+// Find a buffer by its name
+// Args:
+//   name: name of the buffer
+// Returns:
+//   the named rdma buffer
+RdmaBuffer* RdmaChannel::FindBuffer(const string& name) {
+  uint32_t index = LookupBufferIndex(name);
+  return FindBuffer(index);
+}
+
+// Find a buffer if it exists, otherwise create one.
+// The memory inside the created buffer is not allocated. 
+// Args: 
+//   name: the name of the buffer
+//   buffer_type: TENSOR, MESSAGE or ACK.
+// Returns:
+//   the named buffer
+RdmaBuffer* RdmaChannel::FindOrCreateBuffer(const string& name, 
+                                BufferType buffer_type) {
+  mutex_lock lock{bt_mu_};
+  RdmaBuffer* rb;
+  // find index
+  BufferNameIndexTable::iterator iter = buffer_name_index_table_.find(name);
+  if (iter != buffer_name_index_table_.end()) {
+    uint32_t index = iter->second;
+    // find buffer
+    BufferTable::iterator iter = buffer_table_.find(index);
+    CHECK(iter != buffer_table_.end());
+    rb = iter->second;
+  } else {
+    uint32_t index = NameHash(name);
+    if (buffer_type == TENSOR) {
+      rb = new RdmaTensorBuffer(this, name);
+    } else if (buffer_type == MESSAGE) {
+      rb = new RdmaMessageBuffer(this, name);
+    } else if (buffer_type == ACK) {
+      rb = new RdmaAckBuffer(this, name); 
+    }
+    buffer_name_index_table_.insert({name, index});
+    buffer_index_name_table_.insert({index, name});
+    buffer_table_.insert({index, rb});
+  }
+  CHECK(rb);
+  return rb;
+}
+
+// Insert callback to the callback_table.
+// The callback is activated when the corresponding tensor is received.
+// Arg: 
+//   key: the name of the tensor
+//   recv_done: the callback associated with the tensor.
+// Returns:
+//   None
+void RdmaChannel::InsertRecvCallback(const string& key, 
+        std::function<void()> recv_done) {
+  
+  mutex_lock lock{ct_mu_};
+  callback_table_.insert({key, recv_done});
+}
+
+// Remove callback from the callback_table.
+// Arg: 
+//   key: the name of the tensor
+// Returns:
+//   None
+void RdmaChannel::RemoveRecvCallback(const string& key) {
+  mutex_lock lock{ct_mu_};
+  callback_table_.erase(key);
+}
+
+// Run named callback in the callback_table.
+// Arg: 
+//   key: the name of the tensor
+// Returns:
+//   None
+void RdmaChannel::RunRecvCallback(const string& key) {
+  std::function<void()> recv_done;
+  {
+    mutex_lock lock{ct_mu_};
+    CallbackTable::iterator iter = callback_table_.find(key);
+    CHECK(iter != callback_table_.end());
+    recv_done = iter->second;
+  }
+  recv_done();
+}
+
+void RdmaChannel::Connect() {
+  {
+    mutex_lock lock{mu_};
+    CHECK(remote_set_) << "remote channel is not set";
+  }
+  Connect(remote_);
+}
+
+// Setup channel to a remote node
+// Args:
+//   remoteAddr: the rdma address of a remote channel.
+// Returns:
+//   None
+void RdmaChannel::Connect(const RdmaAddress& remoteAddr) {
+  mutex_lock lock{mu_};
+  if (!connected_) {
+    struct ibv_qp_attr attr;
+    memset(&attr, 0, sizeof(ibv_qp_attr));
+    attr.qp_state = IBV_QPS_RTR;
+    attr.path_mtu = IBV_MTU_4096;
+    attr.dest_qp_num = remoteAddr.qpn;
+    attr.rq_psn = remoteAddr.psn;
+    attr.max_dest_rd_atomic = 1;
+    attr.min_rnr_timer = 12;
+    attr.ah_attr.is_global = 0;
+    attr.ah_attr.dlid = remoteAddr.lid;
+    attr.ah_attr.sl = 0;
+    attr.ah_attr.src_path_bits = 0;
+    attr.ah_attr.port_num = 1;
+  
+    int r;
+    CHECK(!(r = ibv_modify_qp(qp_, &attr,
+                IBV_QP_STATE |
+                IBV_QP_AV |
+                IBV_QP_PATH_MTU |
+                IBV_QP_DEST_QPN |
+                IBV_QP_RQ_PSN |
+                IBV_QP_MAX_DEST_RD_ATOMIC |
+                IBV_QP_MIN_RNR_TIMER))) << "QP to Ready to Receive " << r;
+  
+    memset(&attr, 0, sizeof(ibv_qp_attr));
+    attr.qp_state = IBV_QPS_RTS;
+    attr.sq_psn = self_.psn;
+    attr.timeout = 14;
+    attr.retry_cnt = 7;
+    attr.rnr_retry = 7; /* infinite */
+    attr.max_rd_atomic = 1;
+  
+    CHECK(!(r = ibv_modify_qp(qp_, &attr,
+                IBV_QP_STATE |
+                IBV_QP_TIMEOUT |
+                IBV_QP_RETRY_CNT |
+                IBV_QP_RNR_RETRY |
+                IBV_QP_SQ_PSN |
+                IBV_QP_MAX_QP_RD_ATOMIC))) << "QP to Ready to Send " << r;
+    
+    connected_ = true;
+  } else {
+    LOG(INFO) << "channel already connected";
+  }
+}
+
+RdmaBuffer::RdmaBuffer(RdmaChannel* channel, string name)
+           : channel_(channel), name_(name) {}
+
+RdmaBuffer::~RdmaBuffer() {
+  CHECK(!ibv_dereg_mr(self_)) << "ibv_dereg_mr failed";
+  FreeBuffer();
+}
+
+void RdmaBuffer::FreeBuffer() {
+  if ((buffer_ != nullptr) && buffer_on_host_) {
+    free(buffer_);
+  } 
+  // TODO
+  // release buffer if it is on device. 
+  // We don't support RDMABuffer on device at this moment.
+}
+
+// Allocate CPU memory for the Rdma buffer
+// Args:
+//   size: to-be-allocated memory size
+//   lock: whether or not mutex_lock the process to protect concurrency.
+// Returns:
+//   None
+void RdmaBuffer::CreateCPUBuffer(size_t size, bool lock) {
+  CHECK(size > 0);
+  if (lock) {
+    mu_.lock();
+  }
+  if (local_status_ != none) {
+    // delete existing buffer
+    CHECK(!ibv_dereg_mr(self_)) << "ibv_dereg_mr failed";
+    FreeBuffer();    
+  }
+  size_ = size;
+  buffer_ = malloc(size_);
+  self_ = ibv_reg_mr(channel_->adapter_->pd_, 
+            buffer_, size_,
+            IBV_ACCESS_LOCAL_WRITE | 
+            IBV_ACCESS_REMOTE_WRITE);
+  CHECK(self_) << "Failed to register memory region";
+  buffer_on_host_ = true;
+  local_status_ = idle;
+  if (lock) {
+    mu_.unlock();
+  }
+}
+
+// Set address of remote memory region
+// Args:
+//   rmr: address of remote memory region
+//   override: whether override existing information
+// Returns:
+//   None
+void RdmaBuffer::SetRemoteMR(RemoteMR rmr, bool override) {
+  mutex_lock lock{mu_};
+  if ((override) || (remote_status_ == none)) { 
+    remote_.remote_addr = rmr.remote_addr;
+    remote_.rkey = rmr.rkey;
+    remote_status_ = idle;
+  } else {
+    CHECK(remote_.remote_addr == rmr.remote_addr);
+    CHECK(remote_.rkey == rmr.rkey);  
+  } 
+}
+
+// Put a task in the buffer's job queue
+void RdmaBuffer::EnqueueItem(string item){
+  mutex_lock lock{mu_};
+  queue_.push(item);
+}
+
+// Rdma-Write the content of the buffer
+void RdmaBuffer::Write(uint32_t imm_data, size_t buffer_size) {
+  
+  struct ibv_sge list;
+  list.addr = (uint64_t) buffer_;
+  list.length = buffer_size;
+  list.lkey = self_->lkey;
+
+  struct ibv_send_wr wr;
+  memset(&wr, 0, sizeof(wr));
+  wr.wr_id = (uint64_t) this;
+  wr.sg_list = &list;
+  wr.num_sge = 1;
+  wr.opcode = IBV_WR_RDMA_WRITE_WITH_IMM;
+  wr.send_flags = IBV_SEND_SIGNALED;
+  wr.imm_data = imm_data;
+  wr.wr.rdma.remote_addr = (uint64_t) remote_.remote_addr;
+  wr.wr.rdma.rkey = remote_.rkey;
+
+  struct ibv_send_wr *bad_wr;
+  CHECK(!ibv_post_send(channel_->qp_, &wr, &bad_wr)) << "Failed to post send";
+}
+
+RdmaAckBuffer::RdmaAckBuffer(RdmaChannel* channel, string name)
+           : RdmaBuffer(channel, name) {}
+    
+RdmaMessageBuffer::RdmaMessageBuffer(RdmaChannel* channel, string name)
+           : RdmaBuffer(channel, name) {}
+
+RdmaTensorBuffer::RdmaTensorBuffer(RdmaChannel* channel, string name)
+           : RdmaBuffer(channel, name) {}
+
+// Send the next ack from the buffer's job queue.
+void RdmaAckBuffer::SendNextItem() {
+  uint32_t imm_data = LookupBufferIndex("rx_ack_buffer");
+  RdmaMessage rm;
+  rm.name_ = "rx_ack_buffer";
+  rm.type_ = RDMA_MESSAGE_ACK;
+  rm.name_size_ = rm.name_.size();
+  string message = RdmaMessage::CreateMessage(rm);
+  memcpy(buffer_, message.data(), message.size());
+  Write(imm_data, message.size());
+}
+
+// Send the next message from the buffer's job queue.
+void RdmaMessageBuffer::SendNextItem() {
+  uint32_t imm_data = LookupBufferIndex("rx_message_buffer");
+  mu_.lock();
+  if (!queue_.empty() && (local_status_ == idle) 
+          && (remote_status_ == idle)) {
+    local_status_ = busy;
+    remote_status_= busy;    
+    string message = queue_.front();
+    queue_.pop();
+    // local/remote_status_ won't be set back to idle 
+    // unitl Write() is successful
+    mu_.unlock();
+    memcpy(buffer_, message.data(), message.size());
+    Write(imm_data, message.size());
+  } else {
+    mu_.unlock();
+  }
+}
+
+// Send the next tensor from the buffer's job queue.
+void RdmaTensorBuffer::SendNextItem() {
+  // get the key
+  string key_with_step_id = "";
+  {
+    mutex_lock lock{mu_};
+    if (!queue_.empty()) {
+      key_with_step_id = queue_.front();
+      queue_.pop();
+    }
+  }
+  // send the tensor if a key is acquired.
+  if (key_with_step_id != "") {
+    VLOG(2) << "try to send tensor: " << key_with_step_id; 
+    string key;
+    int64 step_id;
+    VerbsUtil::GetKeyAndStepId(key_with_step_id, key, step_id);
+    CHECK(key.compare(name_) == 0);
+    Rendezvous::ParsedKey parsed;
+    Rendezvous::ParseKey(key, &parsed);
+    Rendezvous::DoneCallback cb = [this, key_with_step_id, key, 
+      step_id, parsed](const Status& status,
+                       const Rendezvous::Args& send_args,
+                       const Rendezvous::Args& recv_args,
+                       const Tensor& in, bool is_dead) {
+      CHECK(status.ok()) << "RecvLocalAsync was not ok, key"
+              << key_with_step_id
+              << " error message: " << status.error_message();
+      size_t buffer_size = RdmaMessage::kMessageTotalBytes;
+      size_t tensor_bytes = 0;
+      TensorProto proto;
+      // Figures out which device the tensor is hosted on.
+      Device* src_dev = nullptr;
+      Status s = 
+        channel_->adapter_->worker_env_->
+              device_mgr->LookupDevice(parsed.src_device, &src_dev);
+      CHECK(s.ok()) << "src device not found";
+      // Does the device have the right incarnation number we expect?
+      CHECK(src_dev->attributes().incarnation() == 
+              parsed.src_incarnation)
+            << "RecvTensor expects a different device incarnation: "
+            <<  parsed.src_incarnation
+            << " vs. "
+            << src_dev->attributes().incarnation()
+            << ". Your worker job was probably restarted. Check your "
+            << "worker job for the reason why it was restarted.";  
+      Device* dst_dev = nullptr;
+      // destination is on CPU.
+      s = channel_->adapter_->worker_env_->
+              device_mgr->LookupDevice("CPU:0", &dst_dev);
+      CHECK(s.ok())<< "dst device not found";
+      AllocatorAttributes dst_alloc_attr;
+      dst_alloc_attr.set_on_host(true);
+      // string tensor needs to be serialized
+      if (src_dev->tensorflow_gpu_device_info() && 
+              (!send_args.alloc_attrs.on_host())) {
+        CHECK(send_args.device_context)
+            << "send dev name: " << src_dev->name()
+            << " gpu_info: " << src_dev->tensorflow_gpu_device_info();
+        // "val" is on a GPU. Uses GPUUtil to fill the proto.
+        s = VerbsUtil::SetProtoFromGPUSync(in, src_dev, 
+                         send_args.device_context, 
+                         &proto, is_dead);
+        CHECK(s.ok()) << "set proto from gpu sync";        
+      } else {
+        // tensor is in CPU memory.
+        in.AsProtoTensorContent(&proto);
+      }  
+      tensor_bytes = proto.ByteSize();
+      // maybe some margin for string tensor?
+      buffer_size += tensor_bytes;
+      // prepare message
+      RdmaMessage rm;
+      rm.name_size_ = key.size();
+      rm.name_ = key;
+      rm.tensor_shape_ = in.shape();
+      rm.data_type_ = in.dtype();
+      rm.step_id_ = step_id;
+      rm.is_dead_ = is_dead;
+      rm.tensor_bytes_ = tensor_bytes;
+      rm.buffer_size_ = buffer_size;
+      mu_.lock();
+      if (local_status_ == none || 
+          (buffer_size > size_ && 
+           local_status_ == idle && 
+           remote_status_ == idle)) {
+        if ((local_status_ != none) && (buffer_size > size_)) {
+            CHECK(rm.data_type_ == DT_STRING) 
+                    << "Only string tensor allows to change size";
+        }
+        CreateCPUBuffer(buffer_size, false);
+        mu_.unlock();
+        // put back the key since it is not sent;
+        EnqueueItem(key_with_step_id);
+        // ask the remote to create the same buffer
+        rm.type_ = RDMA_MESSAGE_BUFFER_REQUEST;
+        rm.remote_addr_ = reinterpret_cast<uint64_t>(buffer_);
+        rm.rkey_ = self_->rkey;
+        string message = RdmaMessage::CreateMessage(rm);
+        channel_->tx_message_buffer_->EnqueueItem(message);
+        channel_->tx_message_buffer_->SendNextItem();      
+      } else if((local_status_ == idle) && (remote_status_ == idle)) {
+        // both buffers are ready, send the tensor
+        local_status_ = busy;
+        remote_status_ = busy;
+        // local/remote_status_ won't be set back to idle 
+        // unitl Write() is successful
+        mu_.unlock();
+        CHECK((buffer_size == size_ && rm.data_type_ != DT_STRING) ||
+              (buffer_size <= size_ && rm.data_type_ == DT_STRING))
+                << "tensor and buffer size do not agree!"
+                << " buffer_size = " << size_ 
+                << " requested tensor size = " << buffer_size 
+                << in.DebugString();
+        uint32_t imm_data = LookupBufferIndex(key);
+        rm.type_ = RDMA_MESSAGE_TENSOR_WRITE;
+        string message = RdmaMessage::CreateMessage(rm);
+        memcpy(buffer_, message.data(), message.size());
+        if (!is_dead) {
+          // copy the tensor buffer content
+          void* output = static_cast<void*>(static_cast<char*>(
+                    buffer_) + RdmaMessage::kTensorBufferStartIndex);
+          CHECK(tensor_bytes + RdmaMessage::kTensorBufferStartIndex <=  size_);
+          proto.SerializeToArray(output, tensor_bytes);
+        } else {
+          buffer_size = RdmaMessage::kMessageTotalBytes;
+        }
+        Write(imm_data, buffer_size);
+      } else {
+        mu_.unlock();
+        // put back the key since it is not sent;
+        EnqueueItem(key_with_step_id);
+      }
+    };
+    // Use default session (legacy_session_)
+    // TODO use WorkerSessionForSession
+    // need to pass in session handle
+    channel_->adapter_->worker_env_->session_mgr->
+        LegacySession()->rendezvous_mgr->RecvLocalAsync(step_id, parsed, cb);
+  }
+}
+
+// Create a RdmaMessage according to the pre-defined format
+// Args:
+//   rm: the message structure
+// Returns:
+//   message in string format
+string RdmaMessage::CreateMessage(const RdmaMessage& rm) {
+  // Rdma Message format
+  // type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|...
+  //   1B|    2B   | 512|  8B   |    8B     |       8B  | 4B |    1B |...
+  // ...|data_type|tensor_shape|tensor_bytes|tensor_buffer
+  // ...|   XB    |    XB      |    8B      |...
+  //
+  // ACK:             type|13|"rx_ack_buffer"
+  // TENSOR_REQUEST:  type|name_size|tensor_name|step_id
+  // TENSOR_WRITE:    type|name_size|tensor_name|step_id|...|is_dead
+  //                 |data_type|tensor_shape|tensor_bytes
+  // BUFFER_IDLE:     type|name_size|buffer_name
+  // BUFFER_REQUEST:  type|name_size|buffer_name|...|buffer_size|remote_addr|rkey|
+  // BUFFER_RESPONSE: type|name_size|buffer_name|...|buffer_size|remote_addr|rkey|
+  char message[kMessageTotalBytes];
+  // type
+  message[kTypeStartIndex] = static_cast<char>(rm.type_) & 0xff;
+  // size of name
+  memcpy(&message[kNameSizeStartIndex], &rm.name_size_, sizeof(rm.name_size_));
+  // name
+  memcpy(&message[kNameStartIndex], rm.name_.data(), rm.name_.size());
+  // buffer_size, remote_addr, rkey
+  if ((rm.type_ == RDMA_MESSAGE_BUFFER_REQUEST) || 
+      (rm.type_ == RDMA_MESSAGE_BUFFER_RESPONSE)) {
+    memcpy(&message[kBufferSizeStartIndex], &rm.buffer_size_, 
+            sizeof(rm.buffer_size_));
+    memcpy(&message[kRemoteAddrStartIndex], &rm.remote_addr_, 
+            sizeof(rm.remote_addr_));
+    memcpy(&message[kRkeyStartIndex], &rm.rkey_, sizeof(rm.rkey_)); 
+  }
+  // step_id
+  if ((rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) || 
+      (rm.type_ == RDMA_MESSAGE_TENSOR_REQUEST)) {
+    memcpy(&message[kStepIdStartIndex], &rm.step_id_, sizeof(rm.step_id_));
+  }
+  // is_dead, data_type, tensor_shape, tensor_bytes
+  if (rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) {
+    memcpy(&message[kIsDeadStartIndex], &rm.is_dead_, sizeof(rm.is_dead_));
+    
+    memcpy(&message[kDataTypeStartIndex], &rm.data_type_, 
+            sizeof(rm.data_type_));
+    memcpy(&message[kTensorShapeStartIndex], &rm.tensor_shape_, 
+            sizeof(rm.tensor_shape_));
+    memcpy(&message[kTensorBytesStartIndex], &rm.tensor_bytes_, 
+            sizeof(rm.tensor_bytes_));
+  }
+  return string(message, kMessageTotalBytes);
+} 
+
+// Parse a RdmaMessage according to the pre-defined format
+// Args:
+//   rm: the message structure where the parsed message will be saved
+//   buffer: the place where the raw message is stored
+// Returns:
+//   None
+void RdmaMessage::ParseMessage(RdmaMessage& rm, void* buffer) {
+  char* message = static_cast<char*>(buffer);
+  // type
+  rm.type_ = static_cast<RdmaMessageType>(message[kTypeStartIndex]);
+  // name_size_
+  memcpy(&rm.name_size_, &message[kNameSizeStartIndex], sizeof(rm.name_size_));
+  // name
+  rm.name_ = string(&message[kNameStartIndex], rm.name_size_);
+  // buffer_size, remote_addr, rkey
+  if ((rm.type_ == RDMA_MESSAGE_BUFFER_REQUEST) ||
+      (rm.type_ == RDMA_MESSAGE_BUFFER_RESPONSE)) {
+    memcpy(&rm.buffer_size_, &message[kBufferSizeStartIndex], 
+            sizeof(rm.buffer_size_));
+    memcpy(&rm.remote_addr_, &message[kRemoteAddrStartIndex], 
+            sizeof(rm.remote_addr_));
+    memcpy(&rm.rkey_, &message[kRkeyStartIndex], 
+            sizeof(rm.rkey_));
+  }
+  // step_id
+  if ((rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) || 
+      (rm.type_ == RDMA_MESSAGE_TENSOR_REQUEST)) {
+    memcpy(&rm.step_id_, &message[kStepIdStartIndex], sizeof(rm.step_id_));
+  }
+  // data_type, tensor_bytes, tensor_shape, is_dead  
+  if (rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) {
+    memcpy(&rm.is_dead_, &message[kIsDeadStartIndex], sizeof(rm.is_dead_));
+    memcpy(&rm.data_type_, &message[kDataTypeStartIndex], 
+            sizeof(rm.data_type_));
+    memcpy(&rm.tensor_shape_, &message[kTensorShapeStartIndex],
+            sizeof(rm.tensor_shape_));
+    memcpy(&rm.tensor_bytes_, &message[kTensorBytesStartIndex], 
+            sizeof(rm.tensor_bytes_));
+  }
+}
+
+}  // end namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/rdma.h b/tensorflow/contrib/verbs/rdma.h
new file mode 100644
index 0000000000..2f6cb40295
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma.h
@@ -0,0 +1,267 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include <infiniband/verbs.h>
+#include <memory> // for shared_ptr
+#include <cstring> // for memset
+#include <queue>
+#include <string>
+#include <functional>
+#include <unordered_map>
+#include <vector>
+
+#include "tensorflow/core/distributed_runtime/worker_env.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/mutex.h"
+
+namespace tensorflow {
+
+// structure to save the address of remote channels.
+struct RdmaAddress {
+      uint32_t lid;
+      uint32_t qpn;
+      uint32_t psn;
+};
+// structure to save information for remote memory regions.
+struct RemoteMR{
+    uint64_t remote_addr;
+    uint32_t rkey;
+};
+enum BufferStatus {none, idle, busy};
+enum Location {local, remote};
+enum BufferType {ACK, MESSAGE, TENSOR};
+enum RdmaMessageType {RDMA_MESSAGE_ACK, 
+                      RDMA_MESSAGE_BUFFER_IDLE,
+                      RDMA_MESSAGE_BUFFER_REQUEST,
+                      RDMA_MESSAGE_BUFFER_RESPONSE,
+                      RDMA_MESSAGE_TENSOR_REQUEST,
+                      RDMA_MESSAGE_TENSOR_WRITE}; 
+class RdmaBuffer;
+// Class that represents the Rdma Adapter.
+// Responsible for creation of the completion queue, and handling
+// of work completions. 
+class RdmaAdapter {
+ friend class RdmaChannel;
+ friend class RdmaBuffer;
+ friend class RdmaAckBuffer;
+ friend class RdmaMessageBuffer;
+ friend class RdmaTensorBuffer;
+ friend class RdmaMgr;
+ friend class RdmaRemoteRendezvous;
+ public:
+  RdmaAdapter(const WorkerEnv* worker_env);
+  ~RdmaAdapter();
+  // Adapter name, e.g. mlx5_0.
+  string name() const;
+  void Process_CQ();
+ 
+ protected:
+  static const int MAX_CONCURRENT_WRITES = 1000;
+  ibv_context* context_;
+  // ibverbs protection domain
+  ibv_pd* pd_;
+  // Completion event channel, to wait for work completions
+  ibv_comp_channel* event_channel_;
+  // Completion queue, to poll on work completions
+  ibv_cq* cq_;
+  // Pre-allocated work completions array used for polling
+  ibv_wc wc_[MAX_CONCURRENT_WRITES * 2];
+  // worker env for thread
+  const WorkerEnv* worker_env_;
+  // thread for cq.
+  std::unique_ptr<Thread> polling_thread_;
+};
+
+// Class that represents a connection to a remote Rdma peer.
+// Responsible for connecting queue pairs.
+class RdmaChannel {
+ friend class RdmaAdapter;    
+ friend class RdmaBuffer;
+ friend class RdmaAckBuffer;
+ friend class RdmaMessageBuffer;
+ friend class RdmaTensorBuffer;
+ friend class RdmaMgr; 
+ friend class RdmaRemoteRendezvous;
+ public:
+  explicit RdmaChannel(const RdmaAdapter* adapter, const string local_name, 
+          const string remote_name_);
+  ~RdmaChannel();
+  inline const RdmaAddress& self() { return self_; }
+  RdmaAddress address() const;
+  inline const std::vector<RdmaBuffer*>& message_buffers() const {
+      return message_buffers_;}
+  void Connect(const RdmaAddress& remoteAddr);
+  void Connect();
+  void Recv();
+  RdmaBuffer* FindBuffer(const uint32_t index);
+  RdmaBuffer* FindBuffer(const string& name);
+  RdmaBuffer* FindOrCreateBuffer(const string& name, 
+                                 BufferType buffer_type = TENSOR);
+  uint32_t LookupBufferIndex (const string& buffer_name);
+  void SetRemoteAddress(const RdmaAddress& ra, bool override);
+  void InsertRecvCallback(const string& key, std::function<void()> recv_done);
+  void RemoveRecvCallback(const string& key);
+  void RunRecvCallback(const string& key);
+  static const int kNumMessageBuffers = 4;
+ protected:
+  const RdmaAdapter* adapter_;   
+  RdmaAddress self_;
+  string local_name_;
+  string remote_name_;
+  ibv_qp* qp_;
+  mutex mu_;
+  bool connected_ GUARDED_BY(bt_mu_) = false;
+  RdmaAddress remote_ GUARDED_BY(bt_mu_);
+  bool remote_set_ GUARDED_BY(bt_mu_) = false;
+  mutex ct_mu_;
+  typedef std::unordered_map<string, std::function<void()> > CallbackTable;
+  CallbackTable callback_table_ GUARDED_BY(ct_mu_);
+  mutex bt_mu_;
+  typedef std::unordered_map<unsigned int, RdmaBuffer*> BufferTable;
+  BufferTable buffer_table_ GUARDED_BY(bt_mu_);
+  typedef std::unordered_map<uint32_t, string> BufferIndexNameTable;
+  BufferIndexNameTable buffer_index_name_table_ GUARDED_BY(bt_mu_);
+  typedef std::unordered_map<string, uint32_t> BufferNameIndexTable;
+  BufferNameIndexTable buffer_name_index_table_ GUARDED_BY(bt_mu_);
+  RdmaBuffer* tx_message_buffer_;
+  RdmaBuffer* rx_message_buffer_;
+  RdmaBuffer* tx_ack_buffer_;
+  RdmaBuffer* rx_ack_buffer_;
+  std::vector<RdmaBuffer*> message_buffers_;
+};
+
+// Class that represents a buffer for Rdma writes and reads.
+class RdmaBuffer {
+ friend class RdmaChannel;
+ friend class RdmaAdapter;
+ friend class RdmaMgr;
+ friend class RdmaRemoteRendezvous;
+ public:
+  explicit RdmaBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaBuffer();
+
+  inline void* buffer() const { return buffer_; }
+  inline ibv_mr* self() const { return self_; }
+  inline void SetBufferStatus(Location loc, BufferStatus status) {
+    mu_.lock();
+    if (loc == local) {
+      local_status_ = status;
+    } else {
+      remote_status_ = status;
+    }
+    mu_.unlock();
+  }
+  void FreeBuffer();
+  void EnqueueItem(string Item);
+  virtual void SendNextItem(){};
+  void CreateCPUBuffer(size_t size, bool lock=true);
+  void SetRemoteMR(RemoteMR rmi, bool override);
+  uint32_t LookupBufferIndex (const string& buffer_name) {
+    return const_cast<RdmaChannel*>(channel_)->LookupBufferIndex(buffer_name);}
+  void Write(uint32_t imm_data, size_t buffer_size);
+
+ protected:
+  const RdmaChannel* channel_;
+  void* buffer_ = nullptr;
+  bool buffer_on_host_ = true;
+  size_t size_ = 0;
+  const string name_;
+  ibv_mr* self_ = nullptr;
+  mutex mu_;
+  RemoteMR remote_;
+  std::queue <string> queue_ GUARDED_BY(mu_);
+  BufferStatus local_status_ GUARDED_BY(mu_) = none;
+  BufferStatus remote_status_ GUARDED_BY(mu_) = none;
+};
+
+class RdmaAckBuffer : public RdmaBuffer {
+ public:
+  explicit RdmaAckBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaAckBuffer() override {}
+  void SendNextItem() override;
+};
+
+class RdmaMessageBuffer : public RdmaBuffer {
+ friend class RdmaChannel;
+ friend class RdmaAapater;
+ public:
+  explicit RdmaMessageBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaMessageBuffer() override {}
+  void SendNextItem() override;
+};
+
+class RdmaTensorBuffer : public RdmaBuffer {
+ public:
+  explicit RdmaTensorBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaTensorBuffer() override {}
+  void SendNextItem() override;
+};
+
+struct RdmaMessage {
+  RdmaMessageType type_;
+  uint16_t name_size_;
+  string name_;
+  int64 step_id_;
+  uint64_t buffer_size_;
+  uint64_t remote_addr_;
+  uint32_t rkey_;
+  bool is_dead_;
+  DataType data_type_;
+  TensorShape tensor_shape_;
+  size_t tensor_bytes_;
+  
+// type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|...
+//   1B|    2B   | 512|  8B   |    8B     |       8B  | 4B |    1B |...
+// ...|data_type|tensor_shape|tensor_bytes|tensor_buffer
+// ...|   XB    |    XB      |    8B      |...
+// 
+  static const size_t kNameCapacity = 512;
+  static const size_t kTypeStartIndex = 0;
+  static const size_t kNameSizeStartIndex = kTypeStartIndex + sizeof(type_);
+  static const size_t kNameStartIndex = kNameSizeStartIndex + sizeof(name_size_);
+  static const size_t kStepIdStartIndex = kNameStartIndex + kNameCapacity;
+  static const size_t kBufferSizeStartIndex = kStepIdStartIndex 
+                                            + sizeof(step_id_);
+  static const size_t kRemoteAddrStartIndex = kBufferSizeStartIndex 
+                                            + sizeof(buffer_size_);
+  static const size_t kRkeyStartIndex = kRemoteAddrStartIndex 
+                                      + sizeof(remote_addr_);
+  static const size_t kIsDeadStartIndex = kRkeyStartIndex + sizeof(rkey_);
+  static const size_t kDataTypeStartIndex = kIsDeadStartIndex 
+                                          + sizeof(is_dead_);
+  static const size_t kTensorShapeStartIndex = kDataTypeStartIndex 
+                                            + sizeof(data_type_);
+  static const size_t kTensorBytesStartIndex = kTensorShapeStartIndex 
+                                             + sizeof(TensorShape);
+    static const size_t kTensorBufferStartIndex = kTensorBytesStartIndex 
+                                        + sizeof(tensor_bytes_);
+  static const size_t kMessageTotalBytes = kTensorBufferStartIndex;
+  static const size_t kRdmaMessageBufferSize = kMessageTotalBytes;
+  static const size_t kRdmaAckBufferSize = kMessageTotalBytes;
+  static string CreateMessage(const RdmaMessage & rm);
+  static void ParseMessage(RdmaMessage& rm, void* buffer);
+};
+
+} // namespace tensorflow
+
+#endif // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_H_
diff --git a/tensorflow/contrib/verbs/rdma_mgr.cc b/tensorflow/contrib/verbs/rdma_mgr.cc
new file mode 100644
index 0000000000..7bbdcaf765
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_mgr.cc
@@ -0,0 +1,132 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include<vector>
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/contrib/verbs/grpc_verbs_client.h"
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_worker_cache.h"
+#include "tensorflow/core/distributed_runtime/session_mgr.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+RdmaMgr::RdmaMgr(const WorkerEnv* const worker_env, 
+                 GrpcChannelCache* const channel_cache)
+    : worker_env_(worker_env), channel_cache_(channel_cache) {
+  rdma_adapter_ = new RdmaAdapter(worker_env_);
+  // hardcoded to default session (legacy_session_)
+  // TODO: use WorkerSessionForSession
+  // need to pass in session handle
+  local_worker_ = worker_env_->session_mgr->LegacySession()->worker_name;
+  std::vector<string> workers;
+  worker_env_->session_mgr->LegacySession()->
+      worker_cache->ListWorkers(&workers);
+  num_remote_workers_ = workers.size()-1; 
+  VLOG(2) << "rmda_mgr on local worker: " << local_worker_;
+  for (size_t i = 0; i < workers.size(); i++) {
+    if (local_worker_.compare(workers[i]) != 0) {
+      channel_table_.insert({workers[i], new RdmaChannel(rdma_adapter_, 
+                             local_worker_, workers[i])});
+    }
+  }
+}
+
+// Setup Rdma channels between peers.
+// This is done at the beginning of the server setup.
+
+void RdmaMgr::SetupChannels() { 
+  for (const auto& p : channel_table_) {
+    string worker_name = p.first;
+    LOG(INFO) << "connecting to remote node " << worker_name;
+    RdmaChannel* rc = p.second;
+    GetRemoteAddressRequest req;
+    GetRemoteAddressResponse resp;   
+    // get the channel cache
+    SharedGrpcChannelPtr client_channel = channel_cache_
+            ->FindWorkerChannel(worker_name);
+    GrpcVerbsClient* client = new GrpcVerbsClient(client_channel);
+    CHECK(client != nullptr) << "No worker known as " << worker_name;
+
+    // setting up request
+    req.set_host_name(local_worker_);
+    Channel* channel_info = req.mutable_channel();
+    channel_info->set_lid(rc->self_.lid);
+    channel_info->set_qpn(rc->self_.qpn);
+    channel_info->set_psn(rc->self_.psn);
+    for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
+      MemoryRegion* mr = req.add_mr();
+      mr->set_remote_addr(reinterpret_cast<uint64_t>(
+                           rc->message_buffers_[i]->buffer_));
+      mr->set_rkey(rc->message_buffers_[i]->self_->rkey);
+    }
+    // synchronous call
+    Status s = client->GetRemoteAddress(&req, &resp);
+    // save obtained remote addresses
+    // connect to the remote channel
+    if (s.ok()) {
+      CHECK(worker_name.compare(resp.host_name())==0);
+      RdmaAddress ra;
+      ra.lid = resp.channel().lid();
+      ra.qpn = resp.channel().qpn(); 
+      ra.psn = resp.channel().psn();
+      rc->SetRemoteAddress(ra, false);
+      rc->Connect();
+      int i = 0;
+      int idx[] = {1, 0, 3, 2};
+      for (const auto& mr : resp.mr()) {
+        // the connections are crossed, i.e.
+        // local tx_message_buffer <---> remote rx_message_buffer_
+        // local rx_message_buffer <---> remote tx_message_buffer_
+        // local tx_ack_buffer <---> remote rx_ack_buffer_
+        // local rx_ack_buffer <---> remote tx_ack_buffer_
+        // hence idx[] = {1, 0, 3, 2}.
+        RdmaBuffer* rb = rc->message_buffers_[idx[i]];
+        RemoteMR rmr;
+        rmr.remote_addr = mr.remote_addr();
+        rmr.rkey = mr.rkey();
+        rb->SetRemoteMR(rmr, false);
+        i++;
+      }
+      CHECK(i == RdmaChannel::kNumMessageBuffers);
+    } else {
+      LOG(ERROR) << s.error_message();
+    }
+    delete client;
+  }
+}
+
+RdmaMgr::~RdmaMgr() {
+  for (const auto& p : channel_table_) delete p.second;
+  channel_table_.clear();  
+  delete rdma_adapter_;
+}
+
+// Find a channel via the given name.
+// Args:
+//   name: peer name, e.g. worker1
+// Returns
+//   channel object that is connected to the named peer.
+RdmaChannel* RdmaMgr::FindChannel(const string& name) {
+  ChannelTable::iterator iter = channel_table_.find(name);
+  CHECK(iter != channel_table_.end());
+  return iter->second;
+}
+
+}  // end namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/rdma_mgr.h b/tensorflow/contrib/verbs/rdma_mgr.h
new file mode 100644
index 0000000000..931cc55c0d
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_mgr.h
@@ -0,0 +1,55 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_MGR_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_MGR_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include <string>
+#include <unordered_map>
+
+#include "tensorflow/contrib/verbs/rdma.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_channel.h"
+#include "tensorflow/core/distributed_runtime/worker_env.h"
+
+namespace tensorflow {
+
+class RdmaMgr {
+
+ public:
+  explicit RdmaMgr(const WorkerEnv* const worker_env, 
+                   GrpcChannelCache* const channel_cache);
+  ~RdmaMgr();
+  RdmaChannel* FindChannel(const string& key);
+  void SetupChannels();
+  const string& local_worker() { return local_worker_; }
+
+ private:
+  string local_worker_;
+  size_t num_remote_workers_;
+  const WorkerEnv* const worker_env_;
+  GrpcChannelCache* const channel_cache_;
+  RdmaAdapter* rdma_adapter_;
+  typedef std::unordered_map<string, RdmaChannel*> ChannelTable;
+  ChannelTable channel_table_;
+  
+  TF_DISALLOW_COPY_AND_ASSIGN(RdmaMgr);
+};
+
+} // namespace tensorflow
+
+#endif // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_MGR_H_
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
new file mode 100644
index 0000000000..2cfe7565ad
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
@@ -0,0 +1,147 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include <unordered_set>
+#include "tensorflow/contrib/verbs/rdma_rendezvous_mgr.h"
+#include "tensorflow/contrib/verbs/verbs_util.h"
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/common_runtime/device_mgr.h"
+#include "tensorflow/core/common_runtime/dma_helper.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/strings/numbers.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+
+namespace tensorflow {
+
+class RdmaRemoteRendezvous : public BaseRemoteRendezvous {
+ public:
+  RdmaRemoteRendezvous(const WorkerEnv* env, const string& worker_name, 
+                       int64 step_id, RdmaMgr* rdma_mgr)
+      : BaseRemoteRendezvous(env, worker_name, step_id, true), 
+        rdma_mgr_(rdma_mgr) {}
+ protected:
+  void RecvFromRemoteAsync(const Rendezvous::ParsedKey& parsed,
+                           const Rendezvous::Args& args,
+                           DoneCallback done) override;
+ private:
+  ~RdmaRemoteRendezvous() override {}
+  RdmaMgr* rdma_mgr_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(RdmaRemoteRendezvous);
+};
+
+void RdmaRemoteRendezvous::RecvFromRemoteAsync(
+    const Rendezvous::ParsedKey& parsed, const Rendezvous::Args& recv_args, 
+    DoneCallback done) { 
+  Status s;
+  // parse src_name and dst_name
+  string src_name, dst_name, unused;
+  if (!DeviceNameUtils::SplitDeviceName(parsed.src_device,
+                                        &src_name, &unused)) {
+    s = errors::Internal("Could not parse src name.");
+  }
+  CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+  if (!s.ok()) {
+    done(s, Args(), recv_args, Tensor{}, false);
+    return;
+  }
+  if (!DeviceNameUtils::SplitDeviceName(parsed.dst_device,
+                                        &dst_name, &unused)) {
+    s = errors::Internal("Could not parse dst name.");
+  }
+  CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+  if (!s.ok()) {
+    done(s, Args(), recv_args, Tensor{}, false);
+    return;
+  }
+  CHECK(dst_name.compare(rdma_mgr_->local_worker()) == 0);
+  RdmaChannel* rc = rdma_mgr_->FindChannel(src_name);
+  string key(std::move(parsed.FullKey().ToString()));
+  string key_with_step_id = VerbsUtil::AppendStepidToKey(key, step_id_);
+  // insert callback
+  rc->InsertRecvCallback(key_with_step_id, 
+    [this, key, key_with_step_id, rc, recv_args, parsed, done](){
+      Status s;     
+      Device* src_dev;
+      s = env_->device_mgr->LookupDevice("CPU:0", &src_dev);
+      CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+      if (!s.ok()) {
+        done(s, Args(), recv_args, Tensor(), true);
+        return;
+      }
+      Device* dst_dev;
+      s = env_->device_mgr->LookupDevice(parsed.dst_device, &dst_dev);
+      CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+      if (!s.ok()) {
+        done(s, Args(), recv_args, Tensor(), true);
+        return;
+      }             
+      RdmaBuffer* rb = rc->FindBuffer(key);
+      RdmaMessage rm;
+      CHECK(rb->size_ >= RdmaMessage::kMessageTotalBytes);
+      RdmaMessage::ParseMessage(rm, rb->buffer_);
+      CHECK(rm.type_ == RDMA_MESSAGE_TENSOR_WRITE);
+      Tensor val;
+      if (!rm.is_dead_) {
+        void* input = static_cast<char*>(rb->buffer_) + 
+              RdmaMessage::kTensorBufferStartIndex;
+        TensorProto proto;
+        CHECK(rm.tensor_bytes_ + RdmaMessage::kTensorBufferStartIndex <= rb->size_);
+        CHECK(ParseProtoUnlimited(&proto, input, rm.tensor_bytes_))
+                << "fail to parse proto from array";
+        s = dst_dev->MakeTensorFromProto(proto,
+                       recv_args.alloc_attrs, &val);
+      }
+      
+      rc->RemoveRecvCallback(key_with_step_id);
+      // create message
+      RdmaMessage br;
+      br.type_ = RDMA_MESSAGE_BUFFER_IDLE;
+      br.name_size_ = key.size();
+      br.name_ = key;
+      string message = RdmaMessage::CreateMessage(br);
+      RdmaBuffer* tb = rc->tx_message_buffer_;
+      tb->EnqueueItem(message); 
+      tb->SendNextItem();
+      done(s, Args(), recv_args, val, rm.is_dead_);
+    });
+  // append key to message queue
+  RdmaBuffer* rb = rc->tx_message_buffer_;
+  RdmaMessage rm;
+  rm.type_ = RDMA_MESSAGE_TENSOR_REQUEST;
+  rm.name_size_ = key.size();
+  rm.name_ = key;
+  rm.step_id_ = step_id_;
+  string message = RdmaMessage::CreateMessage(rm);
+  rb->EnqueueItem(message);
+  rb->SendNextItem();
+}
+
+RdmaRendezvousMgr::RdmaRendezvousMgr(const WorkerEnv* env,
+                                     const string& worker_name,
+                                     WorkerCacheInterface* worker_cache)
+    : BaseRendezvousMgr(env, worker_name) {}
+
+BaseRemoteRendezvous* RdmaRendezvousMgr::Create(int64 step_id,
+                                                const WorkerEnv* worker_env,
+                                                const string& worker_name) {
+  return new RdmaRemoteRendezvous(worker_env, worker_name, step_id, rdma_mgr_);
+}
+ 
+}  // end namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
new file mode 100644
index 0000000000..f23c31e793
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
@@ -0,0 +1,64 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_RENDEZVOUS_MGR_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_RENDEZVOUS_MGR_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/core/distributed_runtime/base_rendezvous_mgr.h"
+#include "tensorflow/core/distributed_runtime/worker_env.h"
+#include "tensorflow/core/platform/macros.h"
+
+namespace tensorflow {
+
+// RendezvousMgr keeps track of a set of local rendezvous instances.
+// All tensors sent by this worker are buffered in a RendezvousMgr
+// until the tensor is received.  Each global unique "step_id"
+// corresponds to one local rendezvous instance managed by a
+// RendezvousMgr.
+//
+// E.g.,
+//   Rendezvous* rendez = worker_env->rendezvous_mgr->Find(0x8935);
+//   fork execution of an graph executor using "rendez"  on thread 1;
+//   fork execution of another graph executor using "rendez" on thread 2;
+//   ...
+//   join threads 1 and 2;
+//
+// In the example above, execution in thread 1 and 2 communicates with
+// each other by send/recv operations through the "rend".
+//
+// Tensors sent and recved through rendezvous managed by this
+// RendezvousMgr must have keys generated by Rendezvous::CreateKey.
+class RdmaRendezvousMgr : public BaseRendezvousMgr {
+ public:
+  explicit RdmaRendezvousMgr(const WorkerEnv* env, const string& worker_name,
+                             WorkerCacheInterface* worker_cache);
+  void SetRdmaMgr(RdmaMgr* rdma_mgr) {
+      rdma_mgr_ = rdma_mgr;
+  }
+ protected:
+  BaseRemoteRendezvous* Create(int64 step_id, const WorkerEnv* worker_env,
+                                const string& worker_name) override;
+ private:
+  RdmaMgr* rdma_mgr_;
+  TF_DISALLOW_COPY_AND_ASSIGN(RdmaRendezvousMgr);
+};
+
+}  // end namespace tensorflow
+
+#endif // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_RENDEZVOUS_MGR_H_
diff --git a/tensorflow/contrib/verbs/verbs_server_lib.cc b/tensorflow/contrib/verbs/verbs_server_lib.cc
new file mode 100644
index 0000000000..bb385d8fb9
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_server_lib.cc
@@ -0,0 +1,169 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/verbs_server_lib.h"
+
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/contrib/verbs/rdma_rendezvous_mgr.h"
+#include "tensorflow/core/distributed_runtime/server_lib.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/env.h"
+
+namespace tensorflow {
+
+namespace {
+// static utility function
+RendezvousMgrInterface* NewRdmaRendezvousMgr(const WorkerEnv* env, 
+    const string& worker_name, WorkerCacheInterface* worker_cache) {
+  return new RdmaRendezvousMgr(env, worker_name, worker_cache);
+}
+
+}  // namespace
+
+VerbsServer::VerbsServer(const ServerDef& server_def, Env* env)
+    : GrpcServer(server_def, env), verbs_state_(DISCONNECTED) {}
+
+VerbsServer::~VerbsServer() {
+  TF_CHECK_OK(Stop());
+  TF_CHECK_OK(Join());
+  delete rdma_mgr_;
+  delete verbs_service_;
+  delete channel_cache_;
+}
+
+Status VerbsServer::ChannelCacheFactory(const ServerDef& server_def,
+                                      GrpcChannelCache** channel_cache) {
+  string name_prefix =
+      strings::StrCat("/job:", server_def.job_name(), "/replica:0",
+                      "/task:", server_def.task_index());
+
+  GrpcChannelSpec channel_spec;
+  TF_RETURN_IF_ERROR(ParseChannelSpec(server_def, &channel_spec));
+
+  *channel_cache = NewGrpcChannelCache(channel_spec, 
+          GetChannelCreationFunction(server_def));
+  
+  const string host_port = (*channel_cache)->TranslateTask(name_prefix);
+  int requested_port;
+
+  if (!strings::safe_strto32(str_util::Split(host_port, ':')[1],
+                             &requested_port)) {
+    return errors::Internal("Could not parse port for local server from \"",
+                            (*channel_cache)->TranslateTask(name_prefix), "\".");
+  }
+  if (requested_port != bound_port()) {
+    return errors::InvalidArgument("Requested port ", requested_port,
+                                   " differs from expected port ", bound_port());
+  }
+  
+  return Status::OK();
+}
+
+Status VerbsServer::Init(ServiceInitFunction service_func,
+              RendezvousMgrCreationFunction rendezvous_mgr_func) {
+  Status s = GrpcServer::Init(service_func, rendezvous_mgr_func);
+  {
+    mutex_lock l(mu_);
+    CHECK_EQ(verbs_state_, DISCONNECTED);
+    CHECK(ChannelCacheFactory(server_def(), &channel_cache_).ok());
+    rdma_mgr_ = new RdmaMgr(worker_env(), channel_cache_);
+    // set rdma_mgr for verbs_service and rdma_rendezvous_mgr 
+    verbs_service_->SetRdmaMgr(rdma_mgr_);
+    // hardcoded to default session (legacy_session_)
+    // TODO: use WorkerSessionForSession
+    // need to pass in session handle
+    dynamic_cast<RdmaRendezvousMgr*>(worker_env()->session_mgr->
+            LegacySession()->rendezvous_mgr.get())
+            ->SetRdmaMgr(rdma_mgr_);
+  }
+  return s;
+}
+
+Status VerbsServer::Start() {
+  Status s = GrpcServer::Start();
+  {
+    mutex_lock l(mu_);
+    if (verbs_state_ == DISCONNECTED) {
+      // verbs_thread needs to be initiated
+      // before rdma_mgr sets up the rdma channels.
+      verbs_thread_.reset(
+        worker_env()->env->StartThread(ThreadOptions(), "TF_verbs_service",
+                            [this] { verbs_service_->HandleRPCsLoop(); }));
+      rdma_mgr_->SetupChannels();
+      verbs_state_ = CONNECTED;
+    }
+  }
+  return s;
+}
+
+Status VerbsServer::Join() {
+  Status s = GrpcServer::Join();
+  {
+    mutex_lock l(mu_);
+    if (verbs_state_ == CONNECTED) {
+      verbs_state_ = DISCONNECTED;
+      verbs_thread_.reset();
+    }
+  }
+  return s;
+}
+
+/* static */
+Status VerbsServer::Create(const ServerDef& server_def, Env* env,
+                          std::unique_ptr<ServerInterface>* out_server) {
+  std::unique_ptr<VerbsServer> ret(new VerbsServer(server_def, Env::Default()));
+  ServiceInitFunction service_func = [&ret](const WorkerEnv* worker_env,
+      ::grpc::ServerBuilder* builder) {
+    return SetNewVerbsService(&ret->verbs_service_, worker_env, builder);
+  };
+  TF_RETURN_IF_ERROR(ret->Init(service_func, NewRdmaRendezvousMgr));
+  *out_server = std::move(ret);
+  return Status::OK();
+}
+
+namespace {
+
+class VerbsServerFactory : public ServerFactory {
+ public:
+  bool AcceptsOptions(const ServerDef& server_def) override {
+    return server_def.protocol() == "grpc+verbs";
+  }
+
+  Status NewServer(const ServerDef& server_def,
+                   std::unique_ptr<ServerInterface>* out_server) override {
+    return VerbsServer::Create(server_def, Env::Default(), out_server);
+  }
+};
+
+// Registers a `ServerFactory` for `VerbsServer` instances.
+class VerbsServerRegistrar {
+ public:
+  VerbsServerRegistrar() {
+    gpr_allocation_functions alloc_fns;
+    alloc_fns.malloc_fn = port::Malloc;
+    alloc_fns.realloc_fn = port::Realloc;
+    alloc_fns.free_fn = port::Free;
+    gpr_set_allocation_functions(alloc_fns);
+    ServerFactory::Register("VERBS_SERVER", new VerbsServerFactory());
+  }
+};
+static VerbsServerRegistrar registrar;
+
+}  // namespace
+}  // namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/verbs_server_lib.h b/tensorflow/contrib/verbs/verbs_server_lib.h
new file mode 100644
index 0000000000..4e4f6683f7
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_server_lib.h
@@ -0,0 +1,65 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_VERBS_SERVER_LIB_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_VERBS_SERVER_LIB_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/contrib/verbs/grpc_verbs_service.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h"
+
+namespace tensorflow {
+
+class VerbsServer : public GrpcServer {
+ protected:
+  VerbsServer(const ServerDef& server_def, Env* env);
+  
+ public:
+  static Status Create(const ServerDef& server_def, Env* env,
+                       std::unique_ptr<ServerInterface>* out_server);
+
+  // Destruction is only supported in the factory method. Clean
+  // shutdown is not currently implemented for this server type.
+  virtual ~VerbsServer() override;
+
+  // Implementations of ServerInterface methods.
+  Status Start() override;
+  Status Join() override;
+  
+ protected:
+  Status Init(ServiceInitFunction service_func,
+              RendezvousMgrCreationFunction rendezvous_mgr_func);
+  Status ChannelCacheFactory(const ServerDef& server_def,
+                             GrpcChannelCache** channel_cache);
+ private:
+  RdmaMgr* rdma_mgr_;
+  
+  // Guards state transitions.
+  mutex mu_;
+  
+  enum State { DISCONNECTED, CONNECTED };
+  State verbs_state_ GUARDED_BY(mu_);
+  
+  GrpcVerbsService* verbs_service_ = nullptr;
+  std::unique_ptr<Thread> verbs_thread_ GUARDED_BY(mu_);
+  GrpcChannelCache* channel_cache_ = nullptr;
+};
+
+}  // namespace tensorflow
+
+#endif // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_VERBS_SERVER_LIB_H_
diff --git a/tensorflow/contrib/verbs/verbs_service.proto b/tensorflow/contrib/verbs/verbs_service.proto
new file mode 100644
index 0000000000..a99efc124d
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_service.proto
@@ -0,0 +1,60 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+syntax = "proto3";
+
+package tensorflow;
+option java_outer_classname = "VerbsServiceProtos";
+option java_multiple_files = true;
+option java_package = "org.tensorflow.contrib.verbs";
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// GRPC Helper messages used to exchange RDMA information.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+message Channel {
+  int32 lid = 1;
+  int32 qpn = 2;
+  int32 psn = 3;     
+}
+
+message MemoryRegion {
+  uint64 remote_addr = 1;
+  uint32 rkey = 2;
+}
+message GetRemoteAddressRequest {
+  string host_name = 1;
+  Channel channel = 2;
+  repeated MemoryRegion mr = 3;  
+}
+
+message GetRemoteAddressResponse {
+  string host_name = 1;
+  Channel channel = 2;
+  repeated MemoryRegion mr = 3; 
+} 
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// VerbsService
+//
+////////////////////////////////////////////////////////////////////////////////
+
+service VerbsService {
+  rpc GetRemoteAddress(GetRemoteAddressRequest) returns (GetRemoteAddressResponse);
+}
diff --git a/tensorflow/contrib/verbs/verbs_util.cc b/tensorflow/contrib/verbs/verbs_util.cc
new file mode 100644
index 0000000000..ff4f9219da
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_util.cc
@@ -0,0 +1,64 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/verbs/verbs_util.h"
+
+#include "tensorflow/core/common_runtime/gpu/gpu_util.h"
+#include "tensorflow/core/lib/core/notification.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+namespace tensorflow {
+
+// static sync wrapper:
+Status VerbsUtil::SetProtoFromGPUSync(const Tensor& tensor, Device* dev,
+                              const DeviceContext* device_context,
+                              TensorProto* proto, bool is_dead) {
+  Notification n;
+  Status status;
+  GPUUtil::SetProtoFromGPU(tensor, dev,
+                  device_context,
+                  proto, is_dead,
+                  [&n, &status](const Status& s) {
+                     status = s;
+                     n.Notify();
+                 });
+  n.WaitForNotification();
+  return status;
+}
+
+//static
+string VerbsUtil::AppendStepidToKey(const string& key, 
+        int64 step_id) {
+  return strings::StrCat(key, ";", step_id);
+}
+
+// static
+void VerbsUtil::GetKeyAndStepId(const string& key_with_step_id, 
+        string& key, int64& step_id) {
+  StringPiece s(key_with_step_id);
+  // a key (with step_id) has exact 6 parts if split by ";"
+  // part 1: src_device;
+  // part 2: src_incarnation;
+  // part 3: dst_device;
+  // part 4: name;
+  // part 5: frame_iter.frame_id:frame_iter.iter_id
+  // part 6: step_id
+  std::vector<string> parts = str_util::Split(s, ';');
+  CHECK(parts.size()==6) << "Key with step_id must have 6 parts";
+  strings::safe_strto64(parts[5], &step_id);
+  parts.pop_back(); // remove step_id
+  key.assign(str_util::Join(parts, ";")); // stitch them together
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/verbs/verbs_util.h b/tensorflow/contrib/verbs/verbs_util.h
new file mode 100644
index 0000000000..757e559d96
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_util.h
@@ -0,0 +1,42 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CONTRIB_RDMA_UTIL_H_
+#define TENSORFLOW_CONTRIB_RDMA_UTIL_H_
+
+#include <string>
+
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+class TensorProto;
+
+class VerbsUtil {
+ public:
+
+  // synchronous wrapper of SetProtoFromGPU
+  static Status SetProtoFromGPUSync(const Tensor& tensor, Device* dev,
+                              const DeviceContext* device_context,
+                              TensorProto* proto, bool is_dead);
+  static string AppendStepidToKey(const string& key, int64 step_id);
+  static void GetKeyAndStepId(const string& key_with_step_id, string& key, 
+                        int64& step_id);
+};
+
+}  // namespace tensorflow
+#endif  // TENSORFLOW_CONTRIB_RDMA_UTIL_H_
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index ffe11a8939..bca81a1dc5 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -108,6 +108,7 @@ load(
     "tf_additional_cloud_op_deps",
     "tf_additional_cloud_kernel_deps",
     "tf_lib_proto_parsing_deps",
+    "tf_additional_verbs_lib_defines",
 )
 load(
     "//tensorflow/core:platform/default/build_config_root.bzl",
@@ -1276,7 +1277,9 @@ cc_library(
         "platform/tracing.h",
     ],
     copts = tf_copts(),
-    defines = tf_additional_lib_defines() + ["SNAPPY"],
+    defines = tf_additional_lib_defines() + [
+        "SNAPPY",
+    ] + tf_additional_verbs_lib_defines(),
     linkopts = select({
         "//tensorflow:freebsd": [],
         "//conditions:default": ["-ldl"],
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
index ffe54ab9fb..14d3f70cf9 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
@@ -62,6 +62,12 @@ class NoReusePortOption : public ::grpc::ServerBuilderOption {
                          plugins) override {}
 };
 
+// static utility function
+RendezvousMgrInterface* NewRpcRendezvousMgr(const WorkerEnv* env,
+    const string& worker_name, WorkerCacheInterface* worker_cache) {
+  return new RpcRendezvousMgr(env, worker_name, worker_cache);
+}
+
 }  // namespace
 
 GrpcServer::GrpcServer(const ServerDef& server_def, Env* env)
@@ -70,7 +76,7 @@ GrpcServer::GrpcServer(const ServerDef& server_def, Env* env)
 GrpcServer::~GrpcServer() {
   TF_CHECK_OK(Stop());
   TF_CHECK_OK(Join());
-
+ 
   delete master_service_;
   delete worker_service_;
 
@@ -93,7 +99,8 @@ GrpcServer::~GrpcServer() {
   // - worker_env_.compute_pool
 }
 
-Status GrpcServer::Init() {
+Status GrpcServer::Init(ServiceInitFunction service_func,
+    RendezvousMgrCreationFunction rendevous_mgr_func) {
   mutex_lock l(mu_);
   CHECK_EQ(state_, NEW);
   master_env_.env = env_;
@@ -171,6 +178,10 @@ Status GrpcServer::Init() {
   worker_impl_ = NewGrpcWorker(&worker_env_);
   worker_service_ =
       NewGrpcWorkerService(worker_impl_.get(), &builder).release();
+  // extra service:
+  if (service_func != nullptr) {
+    service_func(&worker_env_, &builder);
+  }
   server_ = builder.BuildAndStart();
 
   if (!server_) {
@@ -183,7 +194,7 @@ Status GrpcServer::Init() {
 
   // Set up worker environment.
   std::unique_ptr<RendezvousMgrInterface> rendezvous_mgr(
-      new RpcRendezvousMgr(&worker_env_, name_prefix, worker_cache));
+      rendevous_mgr_func(&worker_env_, name_prefix, worker_cache));
   worker_env_.session_mgr = new SessionMgr(
       &worker_env_, SessionMgr::WorkerNameFromServerDef(server_def_),
       std::unique_ptr<WorkerCacheInterface>(worker_cache),
@@ -250,6 +261,7 @@ Status GrpcServer::WorkerCacheFactory(const ServerDef& server_def,
       channel_spec, GetChannelCreationFunction(server_def)));
   const string host_port = channel_cache->TranslateTask(name_prefix);
   int requested_port;
+
   if (!strings::safe_strto32(str_util::Split(host_port, ':')[1],
                              &requested_port)) {
     return errors::Internal("Could not parse port for local server from \"",
@@ -346,7 +358,8 @@ Status GrpcServer::Create(const ServerDef& server_def, Env* env,
                           std::unique_ptr<ServerInterface>* out_server) {
   std::unique_ptr<GrpcServer> ret(
       new GrpcServer(server_def, env == nullptr ? Env::Default() : env));
-  TF_RETURN_IF_ERROR(ret->Init());
+  ServiceInitFunction service_func = nullptr;
+  TF_RETURN_IF_ERROR(ret->Init(service_func, NewRpcRendezvousMgr));
   *out_server = std::move(ret);
   return Status::OK();
 }
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
index c6ba260104..7924fbfd45 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
@@ -36,6 +36,16 @@ namespace tensorflow {
 class GrpcWorker;
 class Master;
 
+// function that creates a RendezvousMgr.
+typedef std::function<RendezvousMgrInterface*(const WorkerEnv*, 
+          const std::string& worker_name, WorkerCacheInterface* worker_cache)> 
+        RendezvousMgrCreationFunction;
+
+// function that registers a service to the server. The service needs to
+// be registered before builder.BuildAndStart().
+typedef std::function<void(const WorkerEnv*, ::grpc::ServerBuilder*)> 
+        ServiceInitFunction;
+
 class GrpcServer : public ServerInterface {
  protected:
   GrpcServer(const ServerDef& server_def, Env* env);
@@ -55,7 +65,8 @@ class GrpcServer : public ServerInterface {
   const string target() const override;
 
  protected:
-  Status Init();
+  Status Init(ServiceInitFunction service_func,
+              RendezvousMgrCreationFunction rendezvous_mgr_func);
 
   // A subclass can override this method to support secure credentials.
   virtual std::shared_ptr<::grpc::ServerCredentials> GetServerCredentials(
@@ -78,6 +89,10 @@ class GrpcServer : public ServerInterface {
   // This method may only be called after `this->Init()` returns successfully.
   int bound_port() const { return bound_port_; }
 
+  WorkerEnv* worker_env() { return &worker_env_; }
+  
+  const ServerDef& server_def() const { return server_def_; }
+
  private:
   // The overall server configuration.
   const ServerDef server_def_;
@@ -100,7 +115,7 @@ class GrpcServer : public ServerInterface {
   //            Stop(), Join()
   enum State { NEW, STARTED, STOPPED };
   State state_ GUARDED_BY(mu_);
-
+  
   // Implementation of a TensorFlow master, and RPC polling thread.
   MasterEnv master_env_;
   std::unique_ptr<Master> master_impl_;
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index be2ef32826..10414cbca2 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -248,3 +248,9 @@ def tf_lib_proto_parsing_deps():
       ":protos_all_cc",
       "//tensorflow/core/platform/default/build_config:proto_parsing",
   ]
+
+def tf_additional_verbs_lib_defines():
+  return select({
+      "//tensorflow:with_verbs_support": ["TENSORFLOW_USE_VERBS"],
+      "//conditions:default": [],
+  })
diff --git a/tensorflow/core/platform/default/build_config_root.bzl b/tensorflow/core/platform/default/build_config_root.bzl
index 79f97c1234..eb804bfc78 100644
--- a/tensorflow/core/platform/default/build_config_root.bzl
+++ b/tensorflow/core/platform/default/build_config_root.bzl
@@ -22,3 +22,11 @@ def tf_additional_license_deps():
       "//tensorflow:with_xla_support": ["@llvm//:LICENSE.TXT"],
       "//conditions:default": [],
   })
+
+def tf_additional_verbs_deps():
+  return select({
+      "//tensorflow:with_verbs_support": [
+      "//tensorflow/contrib/verbs:verbs_server_lib",
+      "//tensorflow/contrib/verbs:grpc_verbs_client"], 
+      "//conditions:default": [],
+  })
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index e2b07c1903..a8054a0b44 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -25,6 +25,7 @@ load("//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library_py
 load("//tensorflow/core:platform/default/build_config.bzl", "tf_additional_lib_deps")
 load("//tensorflow/core:platform/default/build_config_root.bzl", "tf_additional_plugin_deps")
 load("//tensorflow/python:build_defs.bzl", "tf_gen_op_wrapper_private_py")
+load("//tensorflow/core:platform/default/build_config_root.bzl", "tf_additional_verbs_deps")
 
 py_library(
     name = "python",
@@ -2576,7 +2577,9 @@ tf_py_wrap_cc(
         "//tensorflow/tools/graph_transforms:transform_graph_lib",
         "//tensorflow/tools/tfprof/internal:print_model_analysis",
         "//util/python:python_headers",
-    ] + tf_additional_lib_deps() + tf_additional_plugin_deps(),
+    ] + (tf_additional_lib_deps() +
+         tf_additional_plugin_deps() +
+         tf_additional_verbs_deps()),
 )
 
 py_library(
-- 
GitLab


From 59b8398c311a72fa742828412350de53724f9c13 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 14:53:13 -0800
Subject: [PATCH 0555/1563] Delete
 tensorflow/python/estimator/checkpoint_utils.py in favor of
 tensorflow/python/training/checkpoint_utils.py Change: 153645825

---
 tensorflow/python/estimator/BUILD             | 28 ------
 .../python/estimator/checkpoint_utils.py      | 85 ------------------
 .../python/estimator/checkpoint_utils_test.py | 90 -------------------
 3 files changed, 203 deletions(-)
 delete mode 100644 tensorflow/python/estimator/checkpoint_utils.py
 delete mode 100644 tensorflow/python/estimator/checkpoint_utils_test.py

diff --git a/tensorflow/python/estimator/BUILD b/tensorflow/python/estimator/BUILD
index f1471a515f..52194973d2 100644
--- a/tensorflow/python/estimator/BUILD
+++ b/tensorflow/python/estimator/BUILD
@@ -17,7 +17,6 @@ py_library(
     srcs = ["estimator_lib.py"],
     srcs_version = "PY2AND3",
     deps = [
-        ":checkpoint_utils",
         ":estimator",
         ":export",
         ":inputs",
@@ -39,33 +38,6 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
-py_library(
-    name = "checkpoint_utils",
-    srcs = ["checkpoint_utils.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        "//tensorflow/python:platform",
-        "//tensorflow/python:training",
-    ],
-)
-
-py_test(
-    name = "checkpoint_utils_test",
-    size = "small",
-    srcs = ["checkpoint_utils_test.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":checkpoint_utils",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:init_ops",
-        "//tensorflow/python:partitioned_variables",
-        "//tensorflow/python:training",
-        "//tensorflow/python:variable_scope",
-        "//tensorflow/python:variables",
-    ],
-)
-
 py_library(
     name = "model_fn",
     srcs = ["model_fn.py"],
diff --git a/tensorflow/python/estimator/checkpoint_utils.py b/tensorflow/python/estimator/checkpoint_utils.py
deleted file mode 100644
index 7ad2730f20..0000000000
--- a/tensorflow/python/estimator/checkpoint_utils.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-"""Tools to work with checkpoints."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from tensorflow.python.platform import gfile
-from tensorflow.python.training import saver
-from tensorflow.python.training import training as train
-
-
-def _get_checkpoint_filename(filepattern):
-  """Returns checkpoint filename given directory or specific filepattern."""
-  if gfile.IsDirectory(filepattern):
-    return saver.latest_checkpoint(filepattern)
-  return filepattern
-
-
-def _load_checkpoint(filepattern):
-  """Returns CheckpointReader for latest checkpoint.
-
-  Args:
-    filepattern: Directory with checkpoints file or path to checkpoint.
-
-  Returns:
-    `CheckpointReader` object.
-
-  Raises:
-    ValueError: if checkpoint_dir doesn't have 'checkpoint' file or checkpoints.
-  """
-  filename = _get_checkpoint_filename(filepattern)
-  if filename is None:
-    raise ValueError("Couldn't find 'checkpoint' file or checkpoints in "
-                     "given directory %s" % filepattern)
-  return train.NewCheckpointReader(filename)
-
-
-def load_variable(checkpoint_dir, name):
-  """Returns a Tensor with the contents of the given variable in the checkpoint.
-
-  Args:
-    checkpoint_dir: Directory with checkpoints file or path to checkpoint.
-    name: Name of the tensor to return.
-
-  Returns:
-    `Tensor` object.
-  """
-  # TODO(b/29227106): Fix this in the right place and remove this.
-  if name.endswith(":0"):
-    name = name[:-2]
-  reader = _load_checkpoint(checkpoint_dir)
-  return reader.get_tensor(name)
-
-
-def list_variables(checkpoint_dir):
-  """Returns list of all variables in the latest checkpoint.
-
-  Args:
-    checkpoint_dir: Directory with checkpoints file or path to checkpoint.
-
-  Returns:
-    List of tuples `(name, shape)`.
-  """
-  reader = _load_checkpoint(checkpoint_dir)
-  variable_map = reader.get_variable_to_shape_map()
-  names = sorted(variable_map.keys())
-  result = []
-  for name in names:
-    result.append((name, variable_map[name]))
-  return result
diff --git a/tensorflow/python/estimator/checkpoint_utils_test.py b/tensorflow/python/estimator/checkpoint_utils_test.py
deleted file mode 100644
index cf11039aa2..0000000000
--- a/tensorflow/python/estimator/checkpoint_utils_test.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Tests for checkpoint_utils.py."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import os
-
-from tensorflow.python.estimator import checkpoint_utils
-from tensorflow.python.framework import errors_impl
-from tensorflow.python.ops import variable_scope
-from tensorflow.python.ops import variables
-from tensorflow.python.platform import test
-from tensorflow.python.training import saver as saver_lib
-
-
-def _create_checkpoints(sess, checkpoint_dir):
-  checkpoint_prefix = os.path.join(checkpoint_dir, "model")
-  checkpoint_state_name = "checkpoint"
-  v1 = variable_scope.get_variable("var1", [1, 10])
-  v2 = variable_scope.get_variable("var2", [10, 10])
-  v3 = variable_scope.get_variable("var3", [100, 100])
-  with variable_scope.variable_scope("useful_scope"):
-    v4 = variable_scope.get_variable("var4", [9, 9])
-  sess.run(variables.global_variables_initializer())
-  v1_value, v2_value, v3_value, v4_value = sess.run([v1, v2, v3, v4])
-  saver = saver_lib.Saver()
-  saver.save(
-      sess,
-      checkpoint_prefix,
-      global_step=0,
-      latest_filename=checkpoint_state_name)
-  return v1_value, v2_value, v3_value, v4_value
-
-
-class CheckpointsTest(test.TestCase):
-
-  def testNoCheckpoints(self):
-    checkpoint_dir = self.get_temp_dir() + "/no_checkpoints"
-    with self.assertRaises(errors_impl.OpError):
-      self.assertAllEqual(
-          checkpoint_utils.load_variable(checkpoint_dir, "var1"), [])
-
-  def testNoTensor(self):
-    checkpoint_dir = self.get_temp_dir()
-    with self.test_session() as session:
-      _, _, _, _ = _create_checkpoints(session, checkpoint_dir)
-    with self.assertRaises(errors_impl.OpError):
-      self.assertAllEqual(
-          checkpoint_utils.load_variable(checkpoint_dir, "var5"), [])
-
-  def testGetTensor(self):
-    checkpoint_dir = self.get_temp_dir()
-    with self.test_session() as session:
-      v1, v2, v3, v4 = _create_checkpoints(session, checkpoint_dir)
-    self.assertAllEqual(
-        checkpoint_utils.load_variable(checkpoint_dir, "var1"), v1)
-    self.assertAllEqual(
-        checkpoint_utils.load_variable(checkpoint_dir, "var2"), v2)
-    self.assertAllEqual(
-        checkpoint_utils.load_variable(checkpoint_dir, "var3"), v3)
-    self.assertAllEqual(
-        checkpoint_utils.load_variable(checkpoint_dir, "useful_scope/var4"), v4)
-
-  def testGetAllVariables(self):
-    checkpoint_dir = self.get_temp_dir()
-    with self.test_session() as session:
-      _create_checkpoints(session, checkpoint_dir)
-    self.assertEqual(
-        checkpoint_utils.list_variables(checkpoint_dir),
-        [("useful_scope/var4", [9, 9]), ("var1", [1, 10]), ("var2", [10, 10]),
-         ("var3", [100, 100])])
-
-
-if __name__ == "__main__":
-  test.main()
-- 
GitLab


From 9b67e0762d97bd85345901d68a607f4f18bb0cdd Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 19 Apr 2017 15:16:20 -0800
Subject: [PATCH 0556/1563] Propagate errors from partition building. Change:
 153648763

---
 .../distributed_runtime/master_session.cc     | 23 ++++++++++---------
 tensorflow/python/client/session_test.py      | 16 +++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index b7c696dd14..cec956ba49 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -278,17 +278,19 @@ Status MasterSession::ReffedClientGraph::RegisterPartitions(
       mu_.unlock();
       std::unordered_map<string, GraphDef> graph_defs;
       Status s = DoBuildPartitions(popts, &graph_defs);
-      // NOTE(mrry): The pointers in `graph_defs_for_publishing` do not remain
-      // valid after the call to DoRegisterPartitions begins, so
-      // `stats_publisher_` must make a copy if it wants to retain the
-      // GraphDef objects.
-      std::vector<const GraphDef*> graph_defs_for_publishing;
-      graph_defs_for_publishing.reserve(partitions_.size());
-      for (const auto& name_def : graph_defs) {
-        graph_defs_for_publishing.push_back(&name_def.second);
+      if (s.ok()) {
+        // NOTE(mrry): The pointers in `graph_defs_for_publishing` do not remain
+        // valid after the call to DoRegisterPartitions begins, so
+        // `stats_publisher_` must make a copy if it wants to retain the
+        // GraphDef objects.
+        std::vector<const GraphDef*> graph_defs_for_publishing;
+        graph_defs_for_publishing.reserve(partitions_.size());
+        for (const auto& name_def : graph_defs) {
+          graph_defs_for_publishing.push_back(&name_def.second);
+        }
+        stats_publisher_->PublishGraphProto(graph_defs_for_publishing);
+        s = DoRegisterPartitions(popts, func_def_lib, std::move(graph_defs));
       }
-      stats_publisher_->PublishGraphProto(graph_defs_for_publishing);
-      s = DoRegisterPartitions(popts, func_def_lib, std::move(graph_defs));
       mu_.lock();
       init_result_ = s;
       init_done_.Notify();
@@ -363,7 +365,6 @@ Status MasterSession::ReffedClientGraph::DoBuildPartitions(
   }
 
   // Partition the graph.
-  Status s;
   return Partition(popts, &client_graph_->graph, out_partitions);
 }
 
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 77a2037b88..e6f1c57c7d 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -1741,6 +1741,22 @@ class SessionTest(test_util.TensorFlowTestCase):
       with self.assertRaises(errors.DeadlineExceededError):
         sess.run(dequeued_t)
 
+  def runTestBuildGraphError(self, sess):
+    # Ensure that errors from building the graph get propagated.
+    data = array_ops.placeholder(dtypes.float32, shape=[])
+    enter_1 = control_flow_ops.enter(data, 'foo_1', False)
+    enter_2 = control_flow_ops.enter(data, 'foo_2', False)
+    res = math_ops.add(enter_1, enter_2)
+    with self.assertRaisesOpError('has inputs from different frames'):
+      sess.run(res, feed_dict={data: 1.0})
+
+  def testBuildGraphErrorDirect(self):
+    self.runTestBuildGraphError(session.Session())
+
+  def testBuildGraphErrorDist(self):
+    server = server_lib.Server.create_local_server()
+    self.runTestBuildGraphError(session.Session(server.target))
+
 
 if __name__ == '__main__':
   googletest.main()
-- 
GitLab


From 4a61e0bf03542c698ea045acb71e8f6e48db60d7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 15:20:58 -0800
Subject: [PATCH 0557/1563] Add ELU to contrib/layers. Change: 153649363

---
 tensorflow/contrib/layers/__init__.py                  | 2 ++
 tensorflow/contrib/layers/python/layers/layers.py      | 2 ++
 tensorflow/contrib/layers/python/layers/layers_test.py | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/tensorflow/contrib/layers/__init__.py b/tensorflow/contrib/layers/__init__.py
index 8e2516dcd5..299a886709 100644
--- a/tensorflow/contrib/layers/__init__.py
+++ b/tensorflow/contrib/layers/__init__.py
@@ -24,6 +24,7 @@ See the @{$python/contrib.layers} guide.
 @@conv2d_transpose
 @@convolution2d_transpose
 @@dropout
+@@elu
 @@embedding_lookup_unique
 @@flatten
 @@fully_connected
@@ -99,6 +100,7 @@ from tensorflow.python.util.all_util import remove_undocumented
 
 _allowed_symbols = ['bias_add',
                     'conv2d',
+                    'elu',
                     'feature_column',
                     'legacy_fully_connected',
                     'legacy_linear',
diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 13cabe6e04..c920764803 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -59,6 +59,7 @@ __all__ = ['avg_pool2d',
            'convolution2d_in_plane',
            'convolution2d_transpose',
            'dropout',
+           'elu',
            'flatten',
            'fully_connected',
            'layer_norm',
@@ -2233,6 +2234,7 @@ def legacy_fully_connected(x,
 
 # TODO(eiderm): Verify and fix autocomplete in colab (also relu6).
 # Simple aliases which remove the activation_fn parameter.
+elu = functools.partial(fully_connected, activation_fn=nn.elu)
 legacy_relu = functools.partial(legacy_fully_connected, activation_fn=nn.relu)
 legacy_linear = functools.partial(legacy_fully_connected, activation_fn=None)
 relu = functools.partial(fully_connected, activation_fn=nn.relu)
diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index ee4ebf2c43..b48ad09e14 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -3117,6 +3117,15 @@ class StackTests(test.TestCase):
       self.assertEqual(output.op.name, 'Stack/fully_connected_3/Relu')
       self.assertListEqual(output.get_shape().as_list(), [5, 30])
 
+  def testStackElu(self):
+    height, width = 3, 3
+    with self.test_session():
+      images = random_ops.random_uniform(
+          (5, height * width * 3), seed=1, name='images')
+      output = _layers.stack(images, layers_lib.elu, [10, 20, 30])
+      self.assertEqual(output.op.name, 'Stack/fully_connected_3/Elu')
+      self.assertListEqual(output.get_shape().as_list(), [5, 30])
+
   def testStackConvolution2d(self):
     height, width = 3, 3
     with self.test_session():
-- 
GitLab


From 72164f00a95eaa8468fe00e84fe356c753e2c164 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 15:22:04 -0800
Subject: [PATCH 0558/1563] BeamSearchDecoder: 1. Implemented in
 contrib/seq2seq. 2. Includes changes to attention_wrapper.py to accommodate
 the batch_size tiling. 3. Includes changes to decoder.py to accommodate
 having a finalize step. Change: 153649516

---
 tensorflow/contrib/seq2seq/BUILD              |  24 +
 tensorflow/contrib/seq2seq/__init__.py        |   9 +-
 .../kernel_tests/beam_search_decoder_test.py  | 307 ++++++++++++
 .../seq2seq/python/ops/attention_wrapper.py   |  57 ++-
 .../seq2seq/python/ops/beam_search_decoder.py | 439 ++++++++++++++++--
 .../contrib/seq2seq/python/ops/decoder.py     |   8 +-
 6 files changed, 781 insertions(+), 63 deletions(-)
 create mode 100644 tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py

diff --git a/tensorflow/contrib/seq2seq/BUILD b/tensorflow/contrib/seq2seq/BUILD
index 011c3ba427..f1e39a1373 100644
--- a/tensorflow/contrib/seq2seq/BUILD
+++ b/tensorflow/contrib/seq2seq/BUILD
@@ -37,11 +37,14 @@ tf_custom_op_py_library(
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform",
         "//tensorflow/python:rnn",
         "//tensorflow/python:rnn_cell",
+        "//tensorflow/python:script_ops",
         "//tensorflow/python:tensor_array_ops",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -155,6 +158,27 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "beam_search_decoder_test",
+    size = "small",
+    srcs = ["python/kernel_tests/beam_search_decoder_test.py"],
+    additional_deps = [
+        ":seq2seq_py",
+        "//third_party/py/numpy",
+        "//tensorflow/contrib/layers:layers_py",
+        "//tensorflow/contrib/rnn:rnn_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:init_ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:rnn",
+        "//tensorflow/python:variable_scope",
+        "//tensorflow/python:variables",
+    ],
+)
+
 cuda_py_test(
     name = "attention_wrapper_test",
     size = "medium",
diff --git a/tensorflow/contrib/seq2seq/__init__.py b/tensorflow/contrib/seq2seq/__init__.py
index 933f5ebe14..064ce00c61 100644
--- a/tensorflow/contrib/seq2seq/__init__.py
+++ b/tensorflow/contrib/seq2seq/__init__.py
@@ -23,6 +23,11 @@ See the @{$python/contrib.seq2seq} guide.
 @@BasicDecoderOutput
 @@BasicDecoder
 
+@@BeamSearchDecoderOutput
+@@BeamSearchDecoderState
+@@BeamSearchDecoder
+@@FinalBeamSearchDecoderOutput
+
 @@Helper
 @@CustomHelper
 @@GreedyEmbeddingHelper
@@ -48,13 +53,13 @@ from __future__ import print_function
 # pylint: disable=unused-import,wildcard-import,line-too-long
 from tensorflow.contrib.seq2seq.python.ops.attention_wrapper import *
 from tensorflow.contrib.seq2seq.python.ops.basic_decoder import *
+from tensorflow.contrib.seq2seq.python.ops.beam_search_decoder import *
 from tensorflow.contrib.seq2seq.python.ops.beam_search_ops import *
 from tensorflow.contrib.seq2seq.python.ops.decoder import *
 from tensorflow.contrib.seq2seq.python.ops.helper import *
 from tensorflow.contrib.seq2seq.python.ops.loss import *
-# pylint: enable=unused-import,widcard-import,line-too-long
-
 from tensorflow.python.util.all_util import remove_undocumented
+# pylint: enable=unused-import,widcard-import,line-too-long
 
 _allowed_symbols = ["sequence_loss"]
 
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
new file mode 100644
index 0000000000..512df18317
--- /dev/null
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
@@ -0,0 +1,307 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for contrib.seq2seq.python.seq2seq.beam_search_decoder."""
+# pylint: disable=unused-import,g-bad-import-order
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+# pylint: enable=unused-import
+
+import numpy as np
+
+from tensorflow.contrib.rnn import core_rnn_cell
+from tensorflow.contrib.seq2seq.python.ops import attention_wrapper
+from tensorflow.contrib.seq2seq.python.ops import beam_search_decoder
+from tensorflow.contrib.seq2seq.python.ops import decoder
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.layers import core as layers_core
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+
+# pylint: enable=g-import-not-at-top
+
+
+class TestGatherTree(test.TestCase):
+  """Tests the gather_tree function."""
+
+  def test_gather_tree(self):
+    predicted_ids = np.array([[[1, 2, 3], [4, 5, 6], [7, 8, 9]],
+                              [[2, 3, 4], [5, 6, 7],
+                               [8, 9, 10]]]).transpose([1, 0, 2])
+    parent_ids = np.array([
+        [[0, 0, 0], [0, 1, 1], [2, 1, 2]],
+        [[0, 0, 0], [1, 2, 0], [2, 1, 1]],
+    ]).transpose([1, 0, 2])
+    expected_result = np.array([[[2, 2, 2], [6, 5, 6], [7, 8, 9]],
+                                [[2, 4, 4], [7, 6, 6],
+                                 [8, 9, 10]]]).transpose([1, 0, 2])
+
+    res = beam_search_decoder._gather_tree(
+        ops.convert_to_tensor(predicted_ids), ops.convert_to_tensor(parent_ids))
+
+    with self.test_session() as sess:
+      res_ = sess.run(res)
+
+    np.testing.assert_array_equal(expected_result, res_)
+
+
+class TestEosMasking(test.TestCase):
+  """Tests EOS masking used in beam search."""
+
+  def test_eos_masking(self):
+    probs = constant_op.constant([
+        [[-.2, -.2, -.2, -.2, -.2], [-.3, -.3, -.3, 3, 0], [5, 6, 0, 0, 0]],
+        [[-.2, -.2, -.2, -.2, 0], [-.3, -.3, -.1, 3, 0], [5, 6, 3, 0, 0]],
+    ])
+
+    eos_token = 0
+    previously_finished = constant_op.constant(
+        [[0, 1, 0], [0, 1, 1]], dtype=dtypes.float32)
+    masked = beam_search_decoder._mask_probs(probs, eos_token,
+                                             previously_finished)
+
+    with self.test_session() as sess:
+      probs = sess.run(probs)
+      masked = sess.run(masked)
+
+      np.testing.assert_array_equal(probs[0][0], masked[0][0])
+      np.testing.assert_array_equal(probs[0][2], masked[0][2])
+      np.testing.assert_array_equal(probs[1][0], masked[1][0])
+
+      np.testing.assert_equal(masked[0][1][0], 0)
+      np.testing.assert_equal(masked[1][1][0], 0)
+      np.testing.assert_equal(masked[1][2][0], 0)
+
+      for i in range(1, 5):
+        np.testing.assert_approx_equal(masked[0][1][i], np.finfo('float32').min)
+        np.testing.assert_approx_equal(masked[1][1][i], np.finfo('float32').min)
+        np.testing.assert_approx_equal(masked[1][2][i], np.finfo('float32').min)
+
+
+class TestBeamStep(test.TestCase):
+  """Tests a single step of beam search."""
+
+  def setUp(self):
+    super(TestBeamStep, self).setUp()
+    self.batch_size = 2
+    self.beam_width = 3
+    self.vocab_size = 5
+    self.end_token = 0
+    self.length_penalty_weight = 0.6
+
+  def test_step(self):
+    dummy_cell_state = array_ops.zeros([self.batch_size, self.beam_width])
+    beam_state = beam_search_decoder.BeamSearchDecoderState(
+        cell_state=dummy_cell_state,
+        log_probs=nn_ops.log_softmax(
+            array_ops.ones([self.batch_size, self.beam_width])),
+        lengths=constant_op.constant(
+            2, shape=[self.batch_size, self.beam_width], dtype=dtypes.int32),
+        finished=array_ops.zeros(
+            [self.batch_size, self.beam_width], dtype=dtypes.bool))
+
+    logits_ = np.full([self.batch_size, self.beam_width, self.vocab_size],
+                      0.0001)
+    logits_[0, 0, 2] = 1.9
+    logits_[0, 0, 3] = 2.1
+    logits_[0, 1, 3] = 3.1
+    logits_[0, 1, 4] = 0.9
+    logits_[1, 0, 1] = 0.5
+    logits_[1, 1, 2] = 2.7
+    logits_[1, 2, 2] = 10.0
+    logits_[1, 2, 3] = 0.2
+    logits = ops.convert_to_tensor(logits_, dtype=dtypes.float32)
+    log_probs = nn_ops.log_softmax(logits)
+
+    outputs, next_beam_state = beam_search_decoder._beam_search_step(
+        time=2,
+        logits=logits,
+        beam_state=beam_state,
+        batch_size=ops.convert_to_tensor(self.batch_size),
+        beam_width=self.beam_width,
+        end_token=self.end_token,
+        length_penalty_weight=self.length_penalty_weight)
+
+    with self.test_session() as sess:
+      outputs_, next_state_, state_, log_probs_ = sess.run(
+          [outputs, next_beam_state, beam_state, log_probs])
+
+    np.testing.assert_array_equal(outputs_.predicted_ids, [[3, 3, 2], [2, 2,
+                                                                       1]])
+    np.testing.assert_array_equal(outputs_.parent_ids, [[1, 0, 0], [2, 1, 0]])
+    np.testing.assert_array_equal(next_state_.lengths, [[3, 3, 3], [3, 3, 3]])
+    np.testing.assert_array_equal(next_state_.finished, [[False, False, False],
+                                                         [False, False, False]])
+
+    expected_log_probs = []
+    expected_log_probs.append(state_.log_probs[0][[1, 0, 0]])
+    expected_log_probs.append(state_.log_probs[1][[2, 1, 0]])  # 0 --> 1
+    expected_log_probs[0][0] += log_probs_[0, 1, 3]
+    expected_log_probs[0][1] += log_probs_[0, 0, 3]
+    expected_log_probs[0][2] += log_probs_[0, 0, 2]
+    expected_log_probs[1][0] += log_probs_[1, 2, 2]
+    expected_log_probs[1][1] += log_probs_[1, 1, 2]
+    expected_log_probs[1][2] += log_probs_[1, 0, 1]
+    np.testing.assert_array_equal(next_state_.log_probs, expected_log_probs)
+
+  def test_step_with_eos(self):
+    dummy_cell_state = array_ops.zeros([self.batch_size, self.beam_width])
+    beam_state = beam_search_decoder.BeamSearchDecoderState(
+        cell_state=dummy_cell_state,
+        log_probs=nn_ops.log_softmax(
+            array_ops.ones([self.batch_size, self.beam_width])),
+        lengths=ops.convert_to_tensor(
+            [[2, 1, 2], [2, 2, 1]], dtype=dtypes.int32),
+        finished=ops.convert_to_tensor(
+            [[False, True, False], [False, False, True]], dtype=dtypes.bool))
+
+    logits_ = np.full([self.batch_size, self.beam_width, self.vocab_size],
+                      0.0001)
+    logits_[0, 0, 2] = 1.9
+    logits_[0, 0, 3] = 2.1
+    logits_[0, 1, 3] = 3.1
+    logits_[0, 1, 4] = 0.9
+    logits_[1, 0, 1] = 0.5
+    logits_[1, 1, 2] = 5.7  # why does this not work when it's 2.7?
+    logits_[1, 2, 2] = 1.0
+    logits_[1, 2, 3] = 0.2
+    logits = ops.convert_to_tensor(logits_, dtype=dtypes.float32)
+    log_probs = nn_ops.log_softmax(logits)
+
+    outputs, next_beam_state = beam_search_decoder._beam_search_step(
+        time=2,
+        logits=logits,
+        beam_state=beam_state,
+        batch_size=ops.convert_to_tensor(self.batch_size),
+        beam_width=self.beam_width,
+        end_token=self.end_token,
+        length_penalty_weight=self.length_penalty_weight)
+
+    with self.test_session() as sess:
+      outputs_, next_state_, state_, log_probs_ = sess.run(
+          [outputs, next_beam_state, beam_state, log_probs])
+
+    np.testing.assert_array_equal(outputs_.parent_ids, [[1, 0, 0], [1, 2, 0]])
+    np.testing.assert_array_equal(outputs_.predicted_ids, [[0, 3, 2], [2, 0,
+                                                                       1]])
+    np.testing.assert_array_equal(next_state_.lengths, [[1, 3, 3], [3, 1, 3]])
+    np.testing.assert_array_equal(next_state_.finished, [[True, False, False],
+                                                         [False, True, False]])
+
+    expected_log_probs = []
+    expected_log_probs.append(state_.log_probs[0][[1, 0, 0]])
+    expected_log_probs.append(state_.log_probs[1][[1, 2, 0]])
+    expected_log_probs[0][1] += log_probs_[0, 0, 3]
+    expected_log_probs[0][2] += log_probs_[0, 0, 2]
+    expected_log_probs[1][0] += log_probs_[1, 1, 2]
+    expected_log_probs[1][2] += log_probs_[1, 0, 1]
+    np.testing.assert_array_equal(next_state_.log_probs, expected_log_probs)
+
+
+class BeamSearchDecoderTest(test.TestCase):
+
+  def _testDynamicDecodeRNN(self, time_major, has_attention):
+    encoder_sequence_length = [3, 2, 3, 1, 0]
+    decoder_sequence_length = [2, 0, 1, 2, 3]
+    batch_size = 5
+    decoder_max_time = 4
+    input_depth = 7
+    cell_depth = 9
+    attention_depth = 6
+    vocab_size = 20
+    end_token = vocab_size - 1
+    start_token = 0
+    embedding_dim = 50
+    max_out = max(decoder_sequence_length)
+    output_layer = layers_core.Dense(vocab_size, use_bias=True, activation=None)
+    beam_width = 3
+
+    with self.test_session() as sess:
+      embedding = np.random.randn(vocab_size, embedding_dim).astype(np.float32)
+      cell = core_rnn_cell.LSTMCell(cell_depth)
+      if has_attention:
+        inputs = np.random.randn(batch_size, decoder_max_time,
+                                 input_depth).astype(np.float32)
+        attention_mechanism = attention_wrapper.BahdanauAttention(
+            num_units=attention_depth,
+            memory=inputs,
+            memory_sequence_length=encoder_sequence_length)
+        cell = attention_wrapper.AttentionWrapper(
+            cell=cell,
+            attention_mechanism=attention_mechanism,
+            attention_size=attention_depth,
+            alignment_history=False)
+      cell_state = cell.zero_state(
+          dtype=dtypes.float32, batch_size=batch_size * beam_width)
+      bsd = beam_search_decoder.BeamSearchDecoder(
+          cell=cell,
+          embedding=embedding,
+          start_tokens=batch_size * [start_token],
+          end_token=end_token,
+          initial_state=cell_state,
+          beam_width=beam_width,
+          output_layer=output_layer,
+          length_penalty_weight=0.0)
+
+      final_outputs, final_state = decoder.dynamic_decode(
+          bsd, output_time_major=time_major, maximum_iterations=max_out)
+
+      def _t(shape):
+        if time_major:
+          return (shape[1], shape[0]) + shape[2:]
+        return shape
+
+      self.assertTrue(
+          isinstance(final_outputs,
+                     beam_search_decoder.FinalBeamSearchDecoderOutput))
+      self.assertTrue(
+          isinstance(final_state, beam_search_decoder.BeamSearchDecoderState))
+
+      beam_search_decoder_output = final_outputs.beam_search_decoder_output
+      self.assertEqual(
+          _t((batch_size, None, beam_width)),
+          tuple(beam_search_decoder_output.scores.get_shape().as_list()))
+      self.assertEqual(
+          _t((batch_size, None, beam_width)),
+          tuple(final_outputs.predicted_ids.get_shape().as_list()))
+
+      sess.run(variables.global_variables_initializer())
+      sess_results = sess.run({
+          'final_outputs': final_outputs,
+          'final_state': final_state
+      })
+
+      # Mostly a smoke test
+      time_steps = max_out
+      self.assertEqual(
+          _t((batch_size, time_steps, beam_width)),
+          sess_results['final_outputs'].beam_search_decoder_output.scores.shape)
+      self.assertEqual(
+          _t((batch_size, time_steps, beam_width)), sess_results[
+              'final_outputs'].beam_search_decoder_output.predicted_ids.shape)
+
+  def testDynamicDecodeRNNBatchMajorNoAttention(self):
+    self._testDynamicDecodeRNN(time_major=False, has_attention=False)
+
+  def testDynamicDecodeRNNBatchMajorYesAttention(self):
+    self._testDynamicDecodeRNN(time_major=False, has_attention=True)
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 3aec58df29..333fa6983c 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""A powerful dynamic attention wrapper object.
-"""
+"""A powerful dynamic attention wrapper object."""
 
 from __future__ import absolute_import
 from __future__ import division
@@ -214,12 +213,14 @@ class LuongAttention(_BaseAttentionMechanism):
     self._scale = scale
     self._name = name
 
-  def __call__(self, query):
+  def __call__(self, query, tiling_factor=1):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
+      tiling_factor: An integer factor for which to tile the batch dimension.
+        Used with BeamSearchDecoder.
 
     Returns:
       score: Tensor of dtype matching `self.values` and shape
@@ -316,12 +317,14 @@ class BahdanauAttention(_BaseAttentionMechanism):
     self._normalize = normalize
     self._name = name
 
-  def __call__(self, query):
+  def __call__(self, query, tiling_factor=1):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
+      tiling_factor: An integer factor for which to tile the batch dimension.
+        Used with BeamSearchDecoder.
 
     Returns:
       score: Tensor of dtype matching `self.values` and shape
@@ -332,6 +335,7 @@ class BahdanauAttention(_BaseAttentionMechanism):
       dtype = processed_query.dtype
       # Reshape from [batch_size, ...] to [batch_size, 1, ...] for broadcasting.
       processed_query = array_ops.expand_dims(processed_query, 1)
+      keys = _maybe_tile_batch(self.keys, tiling_factor)
       v = variable_scope.get_variable(
           "attention_v", [self._num_units], dtype=dtype)
       if self._normalize:
@@ -347,10 +351,10 @@ class BahdanauAttention(_BaseAttentionMechanism):
         normed_v = g * v * math_ops.rsqrt(
             math_ops.reduce_sum(math_ops.square(v)))
         score = math_ops.reduce_sum(
-            normed_v * math_ops.tanh(self.keys + processed_query + b), [2])
+            normed_v * math_ops.tanh(keys + processed_query + b), [2])
       else:
-        score = math_ops.reduce_sum(
-            v * math_ops.tanh(self.keys + processed_query), [2])
+        score = math_ops.reduce_sum(v * math_ops.tanh(keys + processed_query),
+                                    [2])
 
     return score
 
@@ -511,7 +515,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
                                         dtype),
           alignment_history=alignment_history)
 
-  def __call__(self, inputs, state, scope=None):
+  def __call__(self, inputs, state, tiling_factor=1, scope=None):
     """Perform a step of attention-wrapped RNN.
 
     - Step 1: Mix the `inputs` and previous step's `attention` output via
@@ -530,6 +534,8 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       inputs: (Possibly nested tuple of) Tensor, the input at this time step.
       state: An instance of `AttentionWrapperState` containing
         tensors from the previous time step.
+      tiling_factor: An integer factor for which to tile the batch dimension.
+        Used with BeamSearchDecoder.
       scope: Must be `None`.
 
     Returns:
@@ -550,10 +556,9 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       # previous attention value.
       cell_inputs = self._cell_input_fn(inputs, state.attention)
       cell_state = state.cell_state
-
       cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
 
-      score = self._attention_mechanism(cell_output)
+      score = self._attention_mechanism(cell_output, tiling_factor)
       alignments = self._probability_fn(score)
 
       # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
@@ -567,8 +572,10 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       # the batched matmul is over memory_time, so the output shape is
       #   [batch_size, 1, attention_mechanism.num_units].
       # we then squeeze out the singleton dim.
-      context = math_ops.matmul(expanded_alignments,
-                                self._attention_mechanism.values)
+      attention_mechanism_values = _maybe_tile_batch(
+          self._attention_mechanism.values, tiling_factor)
+
+      context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
       context = array_ops.squeeze(context, [1])
 
       attention = self._attention_layer(
@@ -590,3 +597,29 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       return attention, next_state
     else:
       return cell_output, next_state
+
+
+def _maybe_tile_batch(t, tiling_factor):
+  """Tile the tensor's batch by tiling_factor.
+
+  Here, we tile t such that it looks like [b1, b1, ..., ..., bN, bN, ...].
+
+  Args:
+    t: The tensor to tile.
+    tiling_factor: The amount to tile it.
+
+  Returns:
+    The tiled tensor.
+  """
+  if tiling_factor == 1:
+    return t
+
+  shape = t.get_shape().as_list()
+  shape = [shape[0] * tiling_factor] + shape[1:]
+  tile_values = len(shape)*[1]
+  tile_values.insert(1, tiling_factor)
+  t = array_ops.expand_dims(t, 1)
+  t = array_ops.tile(t, tile_values)
+  t = array_ops.reshape(t, shape)
+  t.set_shape(shape)
+  return t
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index 2ad0fd5310..8f1f74ab09 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""A decoder that performs beam search.
-"""
+"""A decoder that performs beam search."""
 
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
 import collections
+import numpy as np
 
 from tensorflow.contrib.rnn import core_rnn_cell
 from tensorflow.contrib.seq2seq.python.ops import decoder
@@ -29,8 +29,11 @@ from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.layers import base as layers_base
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import embedding_ops
-from tensorflow.python.ops import tensor_array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import script_ops
 from tensorflow.python.util import nest
 
 
@@ -38,25 +41,48 @@ __all__ = [
     "BeamSearchDecoderOutput",
     "BeamSearchDecoderState",
     "BeamSearchDecoder",
+    "FinalBeamSearchDecoderOutput",
 ]
 
 
+class BeamSearchDecoderState(
+    collections.namedtuple("BeamSearchDecoderState", ("cell_state", "log_probs",
+                                                      "finished", "lengths"))):
+  pass
+
+
 class BeamSearchDecoderOutput(
-    collections.namedtuple("BeamSearchDecoderOutput", ("rnn_output",))):
+    collections.namedtuple("BeamSearchDecoderOutput",
+                           ("scores", "predicted_ids", "parent_ids"))):
   pass
 
 
-class BeamSearchDecoderState(
-    collections.namedtuple("BeamSearchDecoderState",
-                           ("cell_state", "log_prob", "beam_ids"))):
+class FinalBeamSearchDecoderOutput(
+    collections.namedtuple("FinalBeamDecoderOutput",
+                           ["predicted_ids", "beam_search_decoder_output"])):
+  """Final outputs returned by the beam search after all decoding is finished.
+
+  Args:
+    predicted_ids: The final prediction. A tensor of shape
+      `[T, batch_size, beam_width]`.
+    beam_search_output: An instance of `BeamSearchDecoderOutput` that describes
+      the state of the beam search.
+  """
   pass
 
 
 class BeamSearchDecoder(decoder.Decoder):
   """BeamSearch sampling decoder."""
 
-  def __init__(self, cell, embedding, start_tokens, end_token,
-               initial_state, beam_width, output_layer=None):
+  def __init__(self,
+               cell,
+               embedding,
+               start_tokens,
+               end_token,
+               initial_state,
+               beam_width,
+               output_layer=None,
+               length_penalty_weight=0.0):
     """Initialize BeamSearchDecoder.
 
     Args:
@@ -66,10 +92,11 @@ class BeamSearchDecoder(decoder.Decoder):
       start_tokens: `int32` vector shaped `[batch_size]`, the start tokens.
       end_token: `int32` scalar, the token that marks end of decoding.
       initial_state: A (possibly nested tuple of...) tensors and TensorArrays.
-      beam_width:  Python integer, the number of beams
+      beam_width:  Python integer, the number of beams.
       output_layer: (Optional) An instance of `tf.layers.Layer`, i.e.,
         `tf.layers.Dense`.  Optional layer to apply to the RNN output prior
         to storing the result or sampling.
+      length_penalty_weight: Float weight to penalize length. Disabled with 0.0.
 
     Raises:
       TypeError: if `cell` is not an instance of `RNNCell`,
@@ -84,7 +111,6 @@ class BeamSearchDecoder(decoder.Decoder):
       raise TypeError(
           "output_layer must be a Layer, received: %s" % type(output_layer))
     self._cell = cell
-    self._initial_cell_state = initial_state
     self._output_layer = output_layer
 
     if callable(embedding):
@@ -95,15 +121,23 @@ class BeamSearchDecoder(decoder.Decoder):
 
     self._start_tokens = ops.convert_to_tensor(
         start_tokens, dtype=dtypes.int32, name="start_tokens")
-    self._end_token = ops.convert_to_tensor(
-        end_token, dtype=dtypes.int32, name="end_token")
     if self._start_tokens.get_shape().ndims != 1:
       raise ValueError("start_tokens must be a vector")
-    self._batch_size = array_ops.size(start_tokens)
-    self._beam_width = beam_width
+    self._end_token = ops.convert_to_tensor(
+        end_token, dtype=dtypes.int32, name="end_token")
     if self._end_token.get_shape().ndims != 0:
       raise ValueError("end_token must be a scalar")
+
+    self._batch_size = array_ops.size(start_tokens)
+    self._beam_width = beam_width
+    self._length_penalty_weight = length_penalty_weight
+    self._initial_cell_state = nest.map_structure(self._maybe_split_batch_beams,
+                                                  initial_state)
+    self._start_tokens = array_ops.tile(
+        array_ops.expand_dims(self._start_tokens, 1), [1, self._beam_width])
     self._start_inputs = self._embedding_fn(self._start_tokens)
+    self._finished = array_ops.zeros(
+        [self._batch_size, self._beam_width], dtype=dtypes.bool)
 
   @property
   def batch_size(self):
@@ -130,11 +164,10 @@ class BeamSearchDecoder(decoder.Decoder):
   @property
   def output_size(self):
     # Return the cell output and the id
-    prepend_beam_width = (
-        lambda s: tensor_shape.TensorShape([self._beam_width]).concatenate(s))
     return BeamSearchDecoderOutput(
-        rnn_output=nest.map_structure(
-            prepend_beam_width, self._rnn_output_size()))
+        scores=tensor_shape.TensorShape([self._beam_width]),
+        predicted_ids=tensor_shape.TensorShape([self._beam_width]),
+        parent_ids=tensor_shape.TensorShape([self._beam_width]))
 
   @property
   def output_dtype(self):
@@ -143,7 +176,9 @@ class BeamSearchDecoder(decoder.Decoder):
     # Return that structure and int32 (the id)
     dtype = nest.flatten(self._initial_cell_state)[0].dtype
     return BeamSearchDecoderOutput(
-        rnn_output=nest.map_structure(lambda _: dtype, self._rnn_output_size()))
+        scores=nest.map_structure(lambda _: dtype, self._rnn_output_size()),
+        predicted_ids=dtypes.int32,
+        parent_ids=dtypes.int32)
 
   def initialize(self, name=None):
     """Initialize the decoder.
@@ -152,22 +187,51 @@ class BeamSearchDecoder(decoder.Decoder):
       name: Name scope for any created operations.
 
     Returns:
-      `(finished, first_inputs, initial_state)`.
+      `(finished, start_inputs, initial_state)`.
     """
-    finished, first_inputs = self._finished, self._first_inputs
+    finished, start_inputs = self._finished, self._start_inputs
 
     initial_state = BeamSearchDecoderState(
         cell_state=self._initial_cell_state,
         log_probs=array_ops.zeros(
-            [self.batch_size, self.beam_width],
+            [self._batch_size, self._beam_width],
             dtype=nest.flatten(self._initial_cell_state)[0].dtype),
-        beam_ids=tensor_array_ops.TensorArray(
-            size=0, dynamic_size=True, dtype=dtypes.int32,
-            clear_after_read=False))
+        finished=finished,
+        lengths=array_ops.zeros(
+            [self._batch_size, self._beam_width], dtype=dtypes.int32))
+
+    return (finished, start_inputs, initial_state)
 
-    return (finished, first_inputs, initial_state)
+  def finalize(self, outputs, final_state):
+    """Finalize and return the predicted_ids.
+
+    Args:
+      outputs: An instance of BeamSearchDecoderOutput.
+      final_state: An instance of BeamSearchDecoderState. Passed through to the
+        output.
+
+    Returns:
+      outputs: An instance of FinalBeamSearchDecoderOutput where the
+        predicted_ids are the result of calling _gather_tree.
+      final_state: The same input instance of BeamSearchDecoderState.
+    """
+    predicted_ids = _gather_tree(outputs.predicted_ids, outputs.parent_ids)
+    outputs = FinalBeamSearchDecoderOutput(
+        beam_search_decoder_output=outputs, predicted_ids=predicted_ids)
+    return outputs, final_state
 
   def _merge_batch_beams(self, t):
+    """Merges the tensor from a batch of beams into a batch by beams.
+
+    More exactly, t is a tensor of dimension [batch_size, beam_width, ...]. We
+    reshape this into [batch_size*beam_width, ...]
+
+    Args:
+      t: Tensor of dimension [batch_size, beam_width, ...]
+
+    Returns:
+      A reshaped version of t with dimension [batch_size * beam_width, ...].
+    """
     t_static_shape = t.shape
     t_shape = array_ops.shape(t)
     static_batch_size = tensor_util.constant_value(self._batch_size)
@@ -183,6 +247,17 @@ class BeamSearchDecoder(decoder.Decoder):
     return reshaped_t
 
   def _split_batch_beams(self, t):
+    """Splits the tensor from a batch by beams into a batch of beams.
+
+    More exactly, t is a tensor of dimension [batch_size*beam_width, ...]. We
+    reshape this into [batch_size, beam_width, ...]
+
+    Args:
+      t: Tensor of dimension [batch_size*beam_width, ...]
+
+    Returns:
+      A reshaped version of t with dimension [batch_size, beam_width, ...].
+    """
     t_static_shape = t.shape
     t_shape = array_ops.shape(t)
     reshaped_t = array_ops.reshape(
@@ -194,6 +269,43 @@ class BeamSearchDecoder(decoder.Decoder):
          .concatenate(t_static_shape[1:])))
     return reshaped_t
 
+  def _maybe_split_batch_beams(self, t):
+    """Maybe splits the tensor from a batch by beams into a batch of beams.
+
+    We do this so that we can use nest and not run into problems with shapes.
+
+    Args:
+      t: Tensor of dimension [batch_size*beam_width, ...]
+
+    Returns:
+      Either a reshaped version of t with dimension
+      [batch_size, beam_width, ...] if t's first dimension is of size
+      batch_size*beam_width or t if not.
+    """
+    t_shape = t.get_shape().as_list()
+    if len(t_shape) >= 1:
+      return self._split_batch_beams(t)
+    else:
+      return t
+
+  def _maybe_merge_batch_beams(self, t):
+    """Splits the tensor from a batch by beams into a batch of beams.
+
+    More exactly, t is a tensor of dimension [batch_size*beam_width, ...]. We
+    reshape this into [batch_size, beam_width, ...]
+
+    Args:
+      t: Tensor of dimension [batch_size*beam_width, ...]
+
+    Returns:
+      A reshaped version of t with dimension [batch_size, beam_width, ...].
+    """
+    t_shape = t.get_shape().as_list()
+    if len(t_shape) >= 2:
+      return self._merge_batch_beams(t)
+    else:
+      return t
+
   def step(self, time, inputs, state, name=None):
     """Perform a decoding step.
 
@@ -206,31 +318,266 @@ class BeamSearchDecoder(decoder.Decoder):
     Returns:
       `(outputs, next_state, next_inputs, finished)`.
     """
+    batch_size = self._batch_size
+    beam_width = self._beam_width
+    end_token = self._end_token
+    length_penalty_weight = self._length_penalty_weight
+
     with ops.name_scope(name, "BeamSearchDecoderStep", (time, inputs, state)):
       cell_state = state.cell_state
       inputs = nest.map_structure(self._merge_batch_beams, inputs)
-      cell_state = nest.map_structure(self._merge_batch_beams, cell_state)
-      cell_outputs, next_cell_state = self._cell(inputs, cell_state)
+      cell_state = nest.map_structure(self._maybe_merge_batch_beams, cell_state)
+      try:
+        cell_outputs, next_cell_state = self._cell(
+            inputs, cell_state, tiling_factor=beam_width)
+      except TypeError as e:
+        if "unexpected keyword argument 'tiling_factor'" in str(e):
+          cell_outputs, next_cell_state = self._cell(inputs, cell_state)
+        else:
+          raise
+
       cell_outputs = nest.map_structure(self._split_batch_beams, cell_outputs)
-      next_cell_state = nest.map_structure(self._split_batch_beams,
+      next_cell_state = nest.map_structure(self._maybe_split_batch_beams,
                                            next_cell_state)
 
       if self._output_layer is not None:
         cell_outputs = self._output_layer(cell_outputs)
 
-      # TODO(cinjon): Calculate next_log_probs, next_beam_ids,
-      #   finished, next_inputs, final_cell_state via beam search
-      #   via self._embedding
-      # ....
-      next_beam_ids, next_log_probs, final_cell_state, next_inputs, finished = (
-          None, None, None, None, None)
-
-      beam_ids = state.beam_ids.write(time, next_beam_ids)
-
-      outputs = BeamSearchDecoderOutput(cell_outputs)
-      next_state = BeamSearchDecoderState(
-          log_probs=next_log_probs,
-          beam_ids=beam_ids,
-          cell_state=final_cell_state)
-
-    return (outputs, next_state, next_inputs, finished)
+      beam_search_output, beam_search_state = _beam_search_step(
+          time=time,
+          logits=cell_outputs,
+          beam_state=state,
+          batch_size=batch_size,
+          beam_width=beam_width,
+          end_token=end_token,
+          length_penalty_weight=length_penalty_weight)
+      finished = beam_search_state.finished
+      sample_ids = beam_search_output.predicted_ids
+      next_inputs = control_flow_ops.cond(
+          math_ops.reduce_all(finished), lambda: self._start_inputs,
+          lambda: self._embedding_fn(sample_ids))
+
+    return (beam_search_output, beam_search_state, next_inputs, finished)
+
+
+def _beam_search_step(time, logits, beam_state, batch_size, beam_width,
+                      end_token, length_penalty_weight):
+  """Performs a single step of Beam Search Decoding.
+
+  Args:
+    time: Beam search time step, should start at 0. At time 0 we assume
+      that all beams are equal and consider only the first beam for
+      continuations.
+    logits: Logits at the current time step. A tensor of shape `[B, vocab_size]`
+    beam_state: Current state of the beam search. An instance of `BeamState`
+    batch_size: The batch size for this input.
+    beam_width: The size of the beams.
+    end_token: The int32 end token.
+    length_penalty_weight: Float weight to penalize length. Disabled with 0.0.
+
+  Returns:
+    A new beam state.
+  """
+  static_batch_size = tensor_util.constant_value(batch_size)
+
+  # Calculate the current lengths of the predictions
+  prediction_lengths = beam_state.lengths
+  previously_finished = beam_state.finished
+
+  # Calculate the total log probs for the new hypotheses
+  # Final Shape: [batch_size, beam_width, vocab_size]
+  probs = nn_ops.log_softmax(logits)
+  probs = _mask_probs(probs, end_token, previously_finished)
+  total_probs = array_ops.expand_dims(beam_state.log_probs, 2) + probs
+
+  # Calculate the continuation lengths by adding to all continuing beams.
+  vocab_size = logits.get_shape().as_list()[-1]
+  lengths_to_add = array_ops.one_hot(
+      array_ops.tile(
+          array_ops.reshape(end_token, [1, 1]), [batch_size, beam_width]),
+      vocab_size, 0, 1)
+  add_mask = (1 - math_ops.to_int32(previously_finished))
+  lengths_to_add = array_ops.expand_dims(add_mask, 2) * lengths_to_add
+  new_prediction_lengths = array_ops.expand_dims(prediction_lengths,
+                                                 2) + lengths_to_add
+
+  # Calculate the scores for each beam
+  scores = _get_scores(
+      log_probs=total_probs,
+      sequence_lengths=new_prediction_lengths,
+      length_penalty_weight=length_penalty_weight)
+
+  scores_flat = array_ops.reshape(scores, [batch_size, -1])
+  # During the first time step we only consider the initial beam
+  scores_flat = control_flow_ops.cond(
+      ops.convert_to_tensor(time) > 0, lambda: scores_flat,
+      lambda: scores[:, 0])
+
+  # Pick the next beams according to the specified successors function
+  next_beam_scores, word_indices = nn_ops.top_k(scores_flat, k=beam_width)
+  next_beam_scores.set_shape([static_batch_size, beam_width])
+  word_indices.set_shape([static_batch_size, beam_width])
+
+  # Pick out the probs, beam_ids, and states according to the chosen predictions
+  next_beam_probs = _tensor_gather_helper(
+      gather_indices=word_indices,
+      gather_from=total_probs,
+      range_input=batch_size,
+      range_size=beam_width * vocab_size,
+      final_shape=[static_batch_size, beam_width])
+
+  next_word_ids = math_ops.to_int32(word_indices % vocab_size)
+  next_beam_ids = math_ops.to_int32(word_indices / vocab_size)
+
+  # Append new ids to current predictions
+  previously_finished = _tensor_gather_helper(
+      gather_indices=next_beam_ids,
+      gather_from=previously_finished,
+      range_input=batch_size,
+      range_size=beam_width,
+      final_shape=[static_batch_size, beam_width])
+  next_finished = math_ops.logical_or(previously_finished,
+                                      math_ops.equal(next_word_ids, end_token))
+
+  # Calculate the length of the next predictions.
+  # 1. Finished beams remain unchanged
+  # 2. Beams that are now finished (EOS predicted) remain unchanged
+  # 3. Beams that are not yet finished have their length increased by 1
+  lengths_to_add = math_ops.to_int32(
+      math_ops.not_equal(next_word_ids, end_token))
+  lengths_to_add = (1 - math_ops.to_int32(next_finished)) * lengths_to_add
+  next_prediction_len = _tensor_gather_helper(
+      gather_indices=next_beam_ids,
+      gather_from=beam_state.lengths,
+      range_input=batch_size,
+      range_size=beam_width,
+      final_shape=[static_batch_size, beam_width])
+  next_prediction_len += lengths_to_add
+
+  next_state = BeamSearchDecoderState(
+      cell_state=beam_state.cell_state,
+      log_probs=next_beam_probs,
+      lengths=next_prediction_len,
+      finished=next_finished)
+
+  output = BeamSearchDecoderOutput(
+      scores=next_beam_scores,
+      predicted_ids=next_word_ids,
+      parent_ids=next_beam_ids)
+
+  return output, next_state
+
+
+def _get_scores(log_probs, sequence_lengths, length_penalty_weight):
+  """Calculates scores for beam search hypotheses.
+
+  Args:
+    log_probs: The log probabilities with shape [batch_size, beam_width].
+    sequence_lengths: The array of sequence lengths.
+    length_penalty_weight: Float weight to penalize length. Disabled with 0.0.
+
+  Returns:
+    The scores normalized by the length_penalty.
+  """
+  length_penality_ = _length_penalty(
+      sequence_lengths=sequence_lengths, penalty_factor=length_penalty_weight)
+  return log_probs / length_penality_
+
+
+def _length_penalty(sequence_lengths, penalty_factor):
+  """Calculates the length penalty. See https://arxiv.org/abs/1609.08144.
+
+  Args:
+    sequence_lengths: The sequence length of all hypotheses, a tensor
+      of shape [beam_size, vocab_size].
+    penalty_factor: A scalar that weights the length penalty.
+
+  Returns:
+    The length penalty factor, a tensor fo shape [beam_size].
+  """
+  # TODO(ebrevdo): cleanup based on constant-value of penalty_factor.
+  return math_ops.div((5. + math_ops.to_float(sequence_lengths))
+                      **penalty_factor, (5. + 1.)**penalty_factor)
+
+
+def _mask_probs(probs, eos_token, finished):
+  """Masks log probabilities.
+
+  The result is that finished beams allocate all probability mass to eos and
+  unfinished beams remain unchanged.
+
+  Args:
+    probs: Log probabiltiies of shape `[batch_size, beam_width, vocab_size]`
+    eos_token: An int32 id corresponding to the EOS token to allocate
+      probability to.
+    finished: A boolean tensor of shape `[batch_size, beam_width]` that
+      specifies which
+      elements in the beam are finished already.
+
+  Returns:
+    A tensor of shape `[batch_size, beam_width, vocab_size]`, where unfinished
+    beams stay unchanged and finished beams are replaced with a tensor with all
+    probability on the EOS token.
+  """
+  vocab_size = array_ops.shape(probs)[2]
+  finished_mask = array_ops.expand_dims(
+      math_ops.to_float(1. - math_ops.to_float(finished)), 2)
+  # These examples are not finished and we leave them
+  non_finished_examples = finished_mask * probs
+  # All finished examples are replaced with a vector that has all
+  # probability on EOS
+  finished_row = array_ops.one_hot(
+      eos_token,
+      vocab_size,
+      dtype=dtypes.float32,
+      on_value=0.,
+      off_value=dtypes.float32.min)
+  finished_examples = (1. - finished_mask) * finished_row
+  return finished_examples + non_finished_examples
+
+
+def _gather_tree_py(values, parents):
+  """Gathers path through a tree backwards from the leave nodes.
+
+  Used to reconstruct beams given their parents.
+
+  Args:
+    values: A [T, batch_size, beam_width] tensor of indices.
+    parents: A [T, batch_size, beam_width] tensor of parent beam ids.
+
+  Returns:
+    The [T, batch_size, beam_width] numpy array of paths. For a given batch
+      entry b, the best path is given by ret[:, b, 0].
+  """
+  num_timesteps = values.shape[0]
+  num_beams = values.shape[2]
+  batch_size = values.shape[1]
+  ret = np.zeros_like(values)  # [T, MB, BW]
+  ret[-1, :, :] = values[-1, :, :]
+  for beam_id in range(num_beams):
+    for batch in range(batch_size):
+      parent = parents[-1][batch][beam_id]
+      for timestep in reversed(range(num_timesteps - 1)):
+        ret[timestep, batch, beam_id] = values[timestep][batch][parent]
+        parent = parents[timestep][batch][parent]
+  # now we are going to return ret as a [ts, mb, bw] tensor
+  return np.array(ret).astype(values.dtype)
+
+
+def _gather_tree(values, parents):
+  """Tensor version of _gather_tree_py."""
+  ret = script_ops.py_func(
+      func=_gather_tree_py, inp=[values, parents], Tout=values.dtype)
+  ret.set_shape(values.get_shape().as_list())
+  return ret
+
+
+def _tensor_gather_helper(gather_indices, gather_from, range_input, range_size,
+                          final_shape):
+  range_ = array_ops.expand_dims(math_ops.range(range_input) * range_size, 1)
+  gather_indices = array_ops.reshape(gather_indices + range_, [-1])
+  output = array_ops.gather(
+      array_ops.reshape(gather_from, [-1]), gather_indices)
+  output = array_ops.reshape(output, final_shape)
+  output.set_shape(final_shape)
+  return output
diff --git a/tensorflow/contrib/seq2seq/python/ops/decoder.py b/tensorflow/contrib/seq2seq/python/ops/decoder.py
index 94c9257943..ee287b0cf6 100644
--- a/tensorflow/contrib/seq2seq/python/ops/decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/decoder.py
@@ -12,15 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Seq2seq layer operations for use in neural networks.
-"""
+"""Seq2seq layer operations for use in neural networks."""
 
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
 import abc
-
 import six
 
 from tensorflow.python.framework import constant_op
@@ -36,6 +34,7 @@ from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.util import nest
 
+
 __all__ = ["Decoder", "dynamic_decode"]
 
 
@@ -280,4 +279,7 @@ def dynamic_decode(decoder,
     if not output_time_major:
       final_outputs = nest.map_structure(_transpose_batch_time, final_outputs)
 
+  if hasattr(decoder, "finalize"):
+    final_outputs, final_state = decoder.finalize(final_outputs, final_state)
+
   return final_outputs, final_state
-- 
GitLab


From bcb77007ad9d0be3d6b5e7ff8338f982d99c1a7a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 15:28:15 -0800
Subject: [PATCH 0559/1563] Add new hexagon ops and fix hvx ops support checker
 Change: 153650245

---
 .../hvx_ops_support_checker/hvx_ops_support_checker_main.cc   | 2 +-
 tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
index 200714046c..e905d4b322 100644
--- a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
+++ b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
@@ -37,7 +37,7 @@ static int ParseFlags(int argc, char* argv[], string* in_graph) {
   };
   CHECK(Flags::Parse(&argc, argv, flag_list));
   string usage = Flags::Usage(argv[0], flag_list);
-  CHECK(in_graph->empty()) << "in_graph graph can't be empty.\n" << usage;
+  CHECK(!in_graph->empty()) << "in_graph graph can't be empty.\n" << usage;
 
   return 0;
 }
diff --git a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
index 6a7d6713fd..099ebe8fb6 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
@@ -176,6 +176,10 @@ const std::unordered_map<string, SupportedOpType> OP_NAME_TO_SOC_OP_TYPE_MAP{
     {"RequantizationRange", SupportedOpType::REQUANTIZATION_RANGE_32},
     {"Requantize", SupportedOpType::REQUANTIZE_32_TO_8},
     {"QuantizedReshape", SupportedOpType::QUANTIZED_RESHAPE},
+    {"Add", SupportedOpType::ADD_F},
+    {"Sub", SupportedOpType::SUB_F},
+    {"Reshape", SupportedOpType::RESHAPE},
+    {"Identity", SupportedOpType::NOP},
 };
 
 /* static */ const IGraphTransferOpsDefinitions&
-- 
GitLab


From 82da113f05d6bc70b3751da293c8a82ff91f05ac Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 15:49:03 -0800
Subject: [PATCH 0560/1563] Add SavedModel CLI(Command-line Interface) tool.
 Change: 153652492

---
 tensorflow/python/tools/BUILD                 |  23 +
 tensorflow/python/tools/saved_model_cli.py    | 635 ++++++++++++++++++
 .../python/tools/saved_model_cli_test.py      | 367 ++++++++++
 tensorflow/tools/pip_package/setup.py         |   1 +
 4 files changed, 1026 insertions(+)
 create mode 100644 tensorflow/python/tools/saved_model_cli.py
 create mode 100644 tensorflow/python/tools/saved_model_cli_test.py

diff --git a/tensorflow/python/tools/BUILD b/tensorflow/python/tools/BUILD
index a98f600c40..eaf0a5c837 100644
--- a/tensorflow/python/tools/BUILD
+++ b/tensorflow/python/tools/BUILD
@@ -17,6 +17,7 @@ py_library(
         ":inspect_checkpoint",
         ":optimize_for_inference",
         ":print_selective_registration_header",
+        ":saved_model_cli",
         ":strip_unused",
     ],
 )
@@ -197,6 +198,28 @@ py_test(
     ],
 )
 
+py_binary(
+    name = "saved_model_cli",
+    srcs = ["saved_model_cli.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/saved_model:saved_model_py",
+        "//tensorflow/python",
+    ],
+)
+
+py_test(
+    name = "saved_model_cli_test",
+    srcs = ["saved_model_cli_test.py"],
+    data = [
+        "//tensorflow/cc/saved_model:saved_model_half_plus_two",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":saved_model_cli",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
new file mode 100644
index 0000000000..d14748b492
--- /dev/null
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -0,0 +1,635 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Command-line interface to inspect and execute a graph in a SavedModel.
+
+If TensorFlow is installed on your system through pip, the 'saved_model_cli'
+binary can be invoked directly from command line.
+
+At a high level, SavedModel CLI allows users to both inspect and execute
+computations on a MetaGraphDef in a SavedModel. These are done through `show`
+and `run` commands. Following is the usage of the two commands. SavedModel
+CLI will also display these information with -h option.
+
+'show' command usage: saved_model_cli show [-h] --dir DIR [--tag_set TAG_SET]
+                          [--signature_def SIGNATURE_DEF_KEY]
+Examples:
+To show all available tag-sets in the SavedModel:
+  $saved_model_cli show --dir /tmp/saved_model
+
+To show all available SignatureDef keys in a MetaGraphDef specified by its
+tag-set:
+  $saved_model_cli show --dir /tmp/saved_model --tag_set serve
+For a MetaGraphDef with multiple tags in the tag-set, all tags must be passed
+in, separated by ',':
+  $saved_model_cli show --dir /tmp/saved_model --tag_set serve,gpu
+
+To show all inputs and outputs TensorInfo for a specific SignatureDef specified
+by the SignatureDef key in a MetaGraphDef:
+  $saved_model_cli show --dir /tmp/saved_model --tag_set serve
+  --signature_def serving_default
+Example output:
+  The given SavedModel SignatureDef contains the following input(s):
+  inputs['input0'] tensor_info:
+      dtype: DT_FLOAT
+      shape: (-1, 1)
+  inputs['input1'] tensor_info:
+      dtype: DT_FLOAT
+      shape: (-1, 1)
+  The given SavedModel SignatureDef contains the following output(s):
+  outputs['output'] tensor_info:
+      dtype: DT_FLOAT
+      shape: (-1, 1)
+  Method name is: tensorflow/serving/regress
+
+To show all available information in the SavedModel:
+  $saved_model_cli show --dir /tmp/saved_model --all
+
+'run' command usage: saved_model_cli run [-h] --dir DIR --tag_set TAG_SET
+                         --signature_def SIGNATURE_DEF_KEY --inputs INPUTS
+                         [--outdir OUTDIR] [--overwrite]
+Examples:
+To run input tensors from files through a MetaGraphDef and save the output
+tensors to files:
+  $saved_model_cli run --dir /tmp/saved_model --tag_set serve
+  --signature_def serving_default --inputs x:0=/tmp/124.npz,x2=/tmp/123.npy
+  --outdir /tmp/out
+
+To build this tool from source, run:
+  $bazel build tensorflow/python/tools:saved_model_cli
+
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import os
+import re
+import sys
+import warnings
+
+import numpy as np
+
+from tensorflow.contrib.saved_model.python.saved_model import reader
+from tensorflow.contrib.saved_model.python.saved_model import signature_def_utils
+from tensorflow.core.framework import types_pb2
+from tensorflow.python.client import session
+from tensorflow.python.framework import ops as ops_lib
+from tensorflow.python.platform import app
+from tensorflow.python.saved_model import loader
+
+
+def _show_tag_sets(saved_model_dir):
+  """Prints the tag-sets stored in SavedModel directory.
+
+  Prints all the tag-sets for MetaGraphs stored in SavedModel directory.
+
+  Args:
+    saved_model_dir: Directory containing the SavedModel to inspect.
+  """
+  tag_sets = reader.get_saved_model_tag_sets(saved_model_dir)
+  print('The given SavedModel contains the following tag-sets:')
+  for tag_set in sorted(tag_sets):
+    print(', '.join(sorted(tag_set)))
+
+
+def _show_signature_def_map_keys(saved_model_dir, tag_set):
+  """Prints the keys for each SignatureDef in the SignatureDef map.
+
+  Prints the list of SignatureDef keys from the SignatureDef map specified by
+  the given tag-set and SavedModel directory.
+
+  Args:
+    saved_model_dir: Directory containing the SavedModel to inspect.
+    tag_set: Group of tag(s) of the MetaGraphDef to get SignatureDef map from,
+        in string format, separated by ','. For tag-set contains multiple tags,
+        all tags must be passed in.
+  """
+  signature_def_map = get_signature_def_map(saved_model_dir, tag_set)
+  print('The given SavedModel MetaGraphDef contains SignatureDefs with the '
+        'following keys:')
+  for signature_def_key in sorted(signature_def_map.keys()):
+    print('SignatureDef key: \"%s\"' % signature_def_key)
+
+
+def _get_inputs_tensor_info_from_meta_graph_def(meta_graph_def,
+                                                signature_def_key):
+  """Gets TensorInfo for all inputs of the SignatureDef.
+
+  Returns a dictionary that maps each input key to its TensorInfo for the given
+  signature_def_key in the meta_graph_def
+
+  Args:
+    meta_graph_def: MetaGraphDef protocol buffer with the SignatureDef map to
+        look up SignatureDef key.
+    signature_def_key: A SignatureDef key string.
+
+  Returns:
+    A dictionary that maps input tensor keys to TensorInfos.
+  """
+  return signature_def_utils.get_signature_def_by_key(meta_graph_def,
+                                                      signature_def_key).inputs
+
+
+def _get_outputs_tensor_info_from_meta_graph_def(meta_graph_def,
+                                                 signature_def_key):
+  """Gets TensorInfos for all outputs of the SignatureDef.
+
+  Returns a dictionary that maps each output key to its TensorInfo for the given
+  signature_def_key in the meta_graph_def.
+
+  Args:
+    meta_graph_def: MetaGraphDef protocol buffer with the SignatureDefmap to
+    look up signature_def_key.
+    signature_def_key: A SignatureDef key string.
+
+  Returns:
+    A dictionary that maps output tensor keys to TensorInfos.
+  """
+  return signature_def_utils.get_signature_def_by_key(meta_graph_def,
+                                                      signature_def_key).outputs
+
+
+def _show_inputs_outputs(saved_model_dir, tag_set, signature_def_key):
+  """Prints input and output TensorInfos.
+
+  Prints the details of input and output TensorInfos for the SignatureDef mapped
+  by the given signature_def_key.
+
+  Args:
+    saved_model_dir: Directory containing the SavedModel to inspect.
+    tag_set: Group of tag(s) of the MetaGraphDef, in string format, separated by
+        ','. For tag-set contains multiple tags, all tags must be passed in.
+    signature_def_key: A SignatureDef key string.
+  """
+  meta_graph_def = get_meta_graph_def(saved_model_dir, tag_set)
+  inputs_tensor_info = _get_inputs_tensor_info_from_meta_graph_def(
+      meta_graph_def, signature_def_key)
+  outputs_tensor_info = _get_outputs_tensor_info_from_meta_graph_def(
+      meta_graph_def, signature_def_key)
+
+  print('The given SavedModel SignatureDef contains the following input(s):')
+  for input_key, input_tensor in sorted(inputs_tensor_info.items()):
+    print('inputs[\'%s\'] tensor_info:' % input_key)
+    _print_tensor_info(input_tensor)
+
+  print('The given SavedModel SignatureDef contains the following output(s):')
+  for output_key, output_tensor in sorted(outputs_tensor_info.items()):
+    print('outputs[\'%s\'] tensor_info:' % output_key)
+    _print_tensor_info(output_tensor)
+
+  print('Method name is: %s' %
+        meta_graph_def.signature_def[signature_def_key].method_name)
+
+
+def _print_tensor_info(tensor_info):
+  """Prints details of the given tensor_info.
+
+  Args:
+    tensor_info: TensorInfo object to be printed.
+  """
+  print('    dtype: ' + types_pb2.DataType.keys()[tensor_info.dtype])
+  # Display shape as tuple.
+  if tensor_info.tensor_shape.unknown_rank:
+    shape = 'unknown_rank'
+  else:
+    dims = [str(dim.size) for dim in tensor_info.tensor_shape.dim]
+    shape = ', '.join(dims)
+    shape = '(' + shape + ')'
+  print('    shape: ' + shape)
+
+
+def _show_all(saved_model_dir):
+  """Prints tag-set, SignatureDef and Inputs/Outputs information in SavedModel.
+
+  Prints all tag-set, SignatureDef and Inputs/Outputs information stored in
+  SavedModel directory.
+
+  Args:
+    saved_model_dir: Directory containing the SavedModel to inspect.
+  """
+  tag_sets = reader.get_saved_model_tag_sets(saved_model_dir)
+  for tag_set in sorted(tag_sets):
+    tag_set = ', '.join(tag_set)
+    print('\nMetaGraphDef with tag-set: \'' + tag_set +
+          '\' contains the following SignatureDefs:')
+
+    signature_def_map = get_signature_def_map(saved_model_dir, tag_set)
+    for signature_def_key in sorted(signature_def_map.keys()):
+      print('\nsignature_def[\'' + signature_def_key + '\']:')
+      _show_inputs_outputs(saved_model_dir, tag_set, signature_def_key)
+
+
+def get_meta_graph_def(saved_model_dir, tag_set):
+  """Gets MetaGraphDef from SavedModel.
+
+  Returns the MetaGraphDef for the given tag-set and SavedModel directory.
+
+  Args:
+    saved_model_dir: Directory containing the SavedModel to inspect or execute.
+    tag_set: Group of tag(s) of the MetaGraphDef to load, in string format,
+        separated by ','. For tag-set contains multiple tags, all tags must be
+        passed in.
+
+  Raises:
+    RuntimeError: An error when the given tag-set does not exist in the
+        SavedModel.
+
+  Returns:
+    A MetaGraphDef corresponding to the tag-set.
+  """
+  saved_model = reader.read_saved_model(saved_model_dir)
+  set_of_tags = set(tag_set.split(','))
+  for meta_graph_def in saved_model.meta_graphs:
+    if set(meta_graph_def.meta_info_def.tags) == set_of_tags:
+      return meta_graph_def
+
+  raise RuntimeError('MetaGraphDef associated with tag-set ' + tag_set +
+                     ' could not be found in SavedModel')
+
+
+def get_signature_def_map(saved_model_dir, tag_set):
+  """Gets SignatureDef map from a MetaGraphDef in a SavedModel.
+
+  Returns the SignatureDef map for the given tag-set in the SavedModel
+  directory.
+
+  Args:
+    saved_model_dir: Directory containing the SavedModel to inspect or execute.
+    tag_set: Group of tag(s) of the MetaGraphDef with the SignatureDef map, in
+        string format, separated by ','. For tag-set contains multiple tags, all
+        tags must be passed in.
+
+  Returns:
+    A SignatureDef map that maps from string keys to SignatureDefs.
+  """
+  meta_graph = get_meta_graph_def(saved_model_dir, tag_set)
+  return meta_graph.signature_def
+
+
+def run_saved_model_with_feed_dict(saved_model_dir, tag_set, signature_def_key,
+                                   input_tensor_key_feed_dict, outdir,
+                                   overwrite_flag):
+  """Runs SavedModel and fetch all outputs.
+
+  Runs the input dictionary through the MetaGraphDef within a SavedModel
+  specified by the given tag_set and SignatureDef. Also save the outputs to file
+  if outdir is not None.
+
+  Args:
+    saved_model_dir: Directory containing the SavedModel to execute.
+    tag_set: Group of tag(s) of the MetaGraphDef with the SignatureDef map, in
+        string format, separated by ','. For tag-set contains multiple tags, all
+        tags must be passed in.
+    signature_def_key: A SignatureDef key string.
+    input_tensor_key_feed_dict: A dictionary maps input keys to numpy ndarrays.
+    outdir: A directory to save the outputs to. If the directory doesn't exist,
+        it will be created.
+    overwrite_flag: A boolean flag to allow overwrite output file if file with
+        the same name exists.
+
+  Raises:
+    RuntimeError: An error when output file already exists and overwrite is not
+    enabled.
+  """
+  # Get a list of output tensor names.
+  meta_graph_def = get_meta_graph_def(saved_model_dir, tag_set)
+
+  # Re-create feed_dict based on input tensor name instead of key as session.run
+  # uses tensor name.
+  inputs_tensor_info = _get_inputs_tensor_info_from_meta_graph_def(
+      meta_graph_def, signature_def_key)
+  inputs_feed_dict = {
+      inputs_tensor_info[key].name: tensor
+      for key, tensor in input_tensor_key_feed_dict.items()
+  }
+  # Get outputs
+  outputs_tensor_info = _get_outputs_tensor_info_from_meta_graph_def(
+      meta_graph_def, signature_def_key)
+  # Sort to preserve order because we need to go from value to key later.
+  output_tensor_keys_sorted = sorted(outputs_tensor_info.keys())
+  output_tensor_names_sorted = [
+      outputs_tensor_info[tensor_key].name
+      for tensor_key in output_tensor_keys_sorted
+  ]
+
+  with session.Session(graph=ops_lib.Graph()) as sess:
+    loader.load(sess, tag_set.split(','), saved_model_dir)
+
+    outputs = sess.run(output_tensor_names_sorted, feed_dict=inputs_feed_dict)
+
+    for i, output in enumerate(outputs):
+      output_tensor_key = output_tensor_keys_sorted[i]
+      print('Result for output key %s:\n%s' % (output_tensor_key, output))
+
+      # Only save if outdir is specified.
+      if outdir:
+        # Create directory if outdir does not exist
+        if not os.path.isdir(outdir):
+          os.makedirs(outdir)
+        output_full_path = os.path.join(outdir, output_tensor_key + '.npy')
+
+        # If overwrite not enabled and file already exist, error out
+        if not overwrite_flag and os.path.exists(output_full_path):
+          raise RuntimeError(
+              'Output file %s already exists. Add \"--overwrite\" to overwrite'
+              ' the existing output files.' % output_full_path)
+
+        np.save(output_full_path, output)
+        print('Output %s is saved to %s' % (output_tensor_key,
+                                            output_full_path))
+
+
+def preprocess_input_arg_string(inputs_str):
+  """Parses input arg into dictionary that maps input to file/variable tuple.
+
+  Parses input string in the format of, for example,
+  "input1=filename1[variable_name1],input2=filename2" into a
+  dictionary looks like
+  {'input_key1': (filename1, variable_name1),
+   'input_key2': (file2, None)}
+  , which maps input keys to a tuple of file name and varaible name(None if
+  empty).
+
+  Args:
+    inputs_str: A string that specified where to load inputs. Each input is
+        separated by comma.
+        * If the command line arg for inputs is quoted and contains
+            whitespace(s), all whitespaces will be ignored.
+        * For each input key:
+            'input=filename<[variable_name]>'
+        * The "[variable_name]" key is optional. Will be set to None if not
+            specified.
+
+  Returns:
+    A dictionary that maps input keys to a tuple of file name and varaible name.
+
+  Raises:
+    RuntimeError: An error when the given input is in a bad format.
+  """
+  input_dict = {}
+  inputs_raw = inputs_str.split(',')
+  for input_raw in filter(bool, inputs_raw):  # skip empty strings
+    # Remove quotes and whitespaces
+    input_raw = input_raw.replace('"', '').replace('\'', '').replace(' ', '')
+
+    # Format of input=filename[variable_name]'
+    match = re.match(r'^([\w\-]+)=([\w\-.\/]+)\[([\w\-]+)\]$', input_raw)
+    if match:
+      input_dict[match.group(1)] = (match.group(2), match.group(3))
+    else:
+      # Format of input=filename'
+      match = re.match(r'^([\w\-]+)=([\w\-.\/]+)$', input_raw)
+      if match:
+        input_dict[match.group(1)] = (match.group(2), None)
+      else:
+        raise RuntimeError(
+            'Input \"%s\" format is incorrect. Please follow \"--inputs '
+            'input_key=file_name[variable_name]\" or input_key=file_name' %
+            input_raw)
+
+  return input_dict
+
+
+def load_inputs_from_input_arg_string(inputs_str):
+  """Parses input arg string and load inputs into a dictionary.
+
+  Parses input string in the format of, for example,
+  "input1=filename1[variable_name1],input2=filename2" into a
+  dictionary looks like
+  {'input1:0': ndarray_saved_as_variable_name1_in_filename1 ,
+   'input2:0': ndarray_saved_in_filename2}
+  , which maps input keys to a numpy ndarray loaded from file. See Args section
+  for more details on inputs format.
+
+  Args:
+    inputs_str: A string that specified where to load inputs. Each input is
+        separated by comma.
+        * If the command line arg for inputs is quoted and contains
+            whitespace(s), all whitespaces will be ignored.
+        * For each input key:
+            'input=filename[variable_name]'
+        * File specified by 'filename' will be loaded using numpy.load. Inputs
+            can be loaded from only .npy, .npz or pickle files.
+        * The "[variable_name]" key is optional depending on the input file type
+            as descripted in more details below.
+        When loading from a npy file, which always contains a numpy ndarray, the
+        content will be directly assigned to the specified input tensor. If a
+        varaible_name is specified, it will be ignored and a warning will be
+        issued.
+        When loading from a npz zip file, user can specify which variable within
+        the zip file to load for the input tensor inside the square brackets. If
+        nothing is specified, this function will check that only one file is
+        included in the zip and load it for the specified input tensor.
+        When loading from a pickle file, if no variable_name is specified in the
+        square brackets, whatever that is inside the pickle file will be passed
+        to the specified input tensor, else SavedModel CLI will assume a
+        dictionary is stored in the pickle file and the value corresponding to
+        the variable_name will be used.
+
+  Returns:
+    A dictionary that maps input tensor keys to a numpy ndarray loaded from
+    file.
+
+  Raises:
+    RuntimeError: An error when a key is specified, but the input file contains
+        multiple numpy ndarrays, none of which matches the given key.
+    RuntimeError: An error when no key is specified, but the input file contains
+        more than one numpy ndarrays.
+  """
+  tensor_key_feed_dict = {}
+
+  for input_tensor_key, (
+      filename,
+      variable_name) in preprocess_input_arg_string(inputs_str).items():
+    # When a variable_name key is specified for the input file
+    if variable_name:
+      data = np.load(filename)
+
+      # if file contains a single ndarray, ignore the input name
+      if isinstance(data, np.ndarray):
+        warnings.warn(
+            'Input file %s contains a single ndarray. Name key \"%s\" ignored.'
+            % (filename, variable_name))
+        tensor_key_feed_dict[input_tensor_key] = data
+      else:
+        if variable_name in data:
+          tensor_key_feed_dict[input_tensor_key] = data[variable_name]
+        else:
+          raise RuntimeError(
+              'Input file %s does not contain variable with name \"%s\".' %
+              (filename, variable_name))
+    # When no key is specified for the input file.
+    else:
+      data = np.load(filename)
+      # Check if npz file only contains a single numpy ndarray.
+      if isinstance(data, np.lib.npyio.NpzFile):
+        variable_name_list = data.files
+        if len(variable_name_list) != 1:
+          raise RuntimeError(
+              'Input file %s contains more than one ndarrays. Please specify '
+              'the name of ndarray to use.' % filename)
+        tensor_key_feed_dict[input_tensor_key] = data[variable_name_list[0]]
+      else:
+        tensor_key_feed_dict[input_tensor_key] = data
+
+  return tensor_key_feed_dict
+
+
+def show(args):
+  """Function triggered by show command.
+
+  Args:
+    args: A namespace parsed from command line.
+  """
+  # If all tag is specified, display all information.
+  if args.all:
+    _show_all(args.dir)
+  else:
+    # If no tag is specified, display all tag_set, if no signaure_def key is
+    # specified, display all SignatureDef keys, else show input output tensor
+    # infomation corresponding to the given SignatureDef key
+    if args.tag_set is None:
+      _show_tag_sets(args.dir)
+    else:
+      if args.signature_def is None:
+        _show_signature_def_map_keys(args.dir, args.tag_set)
+      else:
+        _show_inputs_outputs(args.dir, args.tag_set, args.signature_def)
+
+
+def run(args):
+  """Function triggered by run command.
+
+  Args:
+    args: A namespace parsed from command line.
+  """
+  tensor_key_feed_dict = load_inputs_from_input_arg_string(args.inputs)
+  run_saved_model_with_feed_dict(args.dir, args.tag_set, args.signature_def,
+                                 tensor_key_feed_dict, args.outdir,
+                                 args.overwrite)
+
+
+def create_parser():
+  """Creates a parser that parse the command line arguments.
+
+  Returns:
+    A namespace parsed from command line arguments.
+  """
+  parser = argparse.ArgumentParser(
+      description='saved_model_cli: Command-line interface for SavedModel')
+  parser.add_argument('-v', '--version', action='version', version='0.1.0')
+
+  subparsers = parser.add_subparsers(
+      title='commands', description='valid commands', help='additional help')
+
+  # show command
+  show_msg = (
+      'Usage examples:\n'
+      'To show all tag-sets in a SavedModel:\n'
+      '$saved_model_cli show --dir /tmp/saved_model\n'
+      'To show all available SignatureDef keys in a '
+      'MetaGraphDef specified by its tag-set:\n'
+      '$saved_model_cli show --dir /tmp/saved_model --tag_set serve\n'
+      'For a MetaGraphDef with multiple tags in the tag-set, all tags must be '
+      'passed in, separated by \',\':\n'
+      '$saved_model_cli show --dir /tmp/saved_model --tag_set serve,gpu\n\n'
+      'To show all inputs and outputs TensorInfo for a specific'
+      ' SignatureDef specified by the SignatureDef key in a'
+      ' MetaGraph.\n'
+      '$saved_model_cli show --dir /tmp/saved_model --tag_set serve'
+      '--signature_def serving_default\n\n'
+      'To show all available information in the SavedModel\n:'
+      '$saved_model_cli show --dir /tmp/saved_model --all')
+  parser_show = subparsers.add_parser(
+      'show',
+      description=show_msg,
+      formatter_class=argparse.RawTextHelpFormatter)
+  parser_show.add_argument(
+      '--dir',
+      type=str,
+      required=True,
+      help='directory containing the SavedModel to inspect')
+  parser_show.add_argument(
+      '--all',
+      action='store_true',
+      help='if set, will output all infomation in given SavedModel')
+  parser_show.add_argument(
+      '--tag_set',
+      type=str,
+      default=None,
+      help='tag-set of graph in SavedModel to show, separated by \',\'')
+  parser_show.add_argument(
+      '--signature_def',
+      type=str,
+      default=None,
+      metavar='SIGNATURE_DEF_KEY',
+      help='key of SignatureDef to display input(s) and output(s) for')
+  parser_show.set_defaults(func=show)
+
+  # run command
+  run_msg = ('Usage example:\n'
+             'To run input tensors from files through a MetaGraphDef and save'
+             ' the output tensors to files:\n'
+             '$saved_model_cli show --dir /tmp/saved_model --tag_set serve'
+             '--signature_def serving_default '
+             '--inputs x1=/tmp/124.npz[x],x2=/tmp/123.npy'
+             '--outdir=/out\n\n'
+             'For more information about input file format, please see:\n')
+  parser_run = subparsers.add_parser(
+      'run', description=run_msg, formatter_class=argparse.RawTextHelpFormatter)
+  parser_run.add_argument(
+      '--dir',
+      type=str,
+      required=True,
+      help='directory containing the SavedModel to execute')
+  parser_run.add_argument(
+      '--tag_set',
+      type=str,
+      required=True,
+      help='tag-set of graph in SavedModel to load, separated by \',\'')
+  parser_run.add_argument(
+      '--signature_def',
+      type=str,
+      required=True,
+      metavar='SIGNATURE_DEF_KEY',
+      help='key of SignatureDef to run')
+  msg = ('inputs in the format of \'input_key=filename[variable_name]\', '
+         'separated by \',\'. Inputs can only be loaded from .npy, .npz or '
+         'pickle files.')
+  parser_run.add_argument('--inputs', type=str, required=True, help=msg)
+  parser_run.add_argument(
+      '--outdir',
+      type=str,
+      default=None,
+      help='if specified, output tensor(s) will be saved to given directory')
+  parser_run.add_argument(
+      '--overwrite',
+      action='store_true',
+      help='if set, output file will be overwritten if it already exists.')
+  parser_run.set_defaults(func=run)
+
+  return parser
+
+
+def main():
+  parser = create_parser()
+  args = parser.parse_args()
+  args.func(args)
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/tensorflow/python/tools/saved_model_cli_test.py b/tensorflow/python/tools/saved_model_cli_test.py
new file mode 100644
index 0000000000..b9d28794cc
--- /dev/null
+++ b/tensorflow/python/tools/saved_model_cli_test.py
@@ -0,0 +1,367 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for SavedModelCLI tool.
+
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import contextlib
+import os
+import pickle
+import shutil
+import sys
+
+import numpy as np
+from six import StringIO
+
+from tensorflow.python.platform import test
+from tensorflow.python.tools import saved_model_cli
+
+SAVED_MODEL_PATH = ('cc/saved_model/testdata/half_plus_two/00000123')
+
+
+@contextlib.contextmanager
+def captured_output():
+  new_out, new_err = StringIO(), StringIO()
+  old_out, old_err = sys.stdout, sys.stderr
+  try:
+    sys.stdout, sys.stderr = new_out, new_err
+    yield sys.stdout, sys.stderr
+  finally:
+    sys.stdout, sys.stderr = old_out, old_err
+
+
+class SavedModelCLITestCase(test.TestCase):
+
+  def testShowCommandAll(self):
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    self.parser = saved_model_cli.create_parser()
+    args = self.parser.parse_args(['show', '--dir', base_path, '--all'])
+    with captured_output() as (out, err):
+      saved_model_cli.show(args)
+    output = out.getvalue().strip()
+    # pylint: disable=line-too-long
+    exp_out = """MetaGraphDef with tag-set: 'serve' contains the following SignatureDefs:
+
+signature_def['classify_x2_to_y3']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['inputs'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+The given SavedModel SignatureDef contains the following output(s):
+outputs['scores'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+Method name is: tensorflow/serving/classify
+
+signature_def['classify_x_to_y']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['inputs'] tensor_info:
+    dtype: DT_STRING
+    shape: unknown_rank
+The given SavedModel SignatureDef contains the following output(s):
+outputs['scores'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+Method name is: tensorflow/serving/classify
+
+signature_def['regress_x2_to_y3']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['inputs'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+The given SavedModel SignatureDef contains the following output(s):
+outputs['outputs'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+Method name is: tensorflow/serving/regress
+
+signature_def['regress_x_to_y']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['inputs'] tensor_info:
+    dtype: DT_STRING
+    shape: unknown_rank
+The given SavedModel SignatureDef contains the following output(s):
+outputs['outputs'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+Method name is: tensorflow/serving/regress
+
+signature_def['regress_x_to_y2']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['inputs'] tensor_info:
+    dtype: DT_STRING
+    shape: unknown_rank
+The given SavedModel SignatureDef contains the following output(s):
+outputs['outputs'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+Method name is: tensorflow/serving/regress
+
+signature_def['serving_default']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['x'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+The given SavedModel SignatureDef contains the following output(s):
+outputs['y'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+Method name is: tensorflow/serving/predict"""
+    # pylint: enable=line-too-long
+    self.assertMultiLineEqual(output, exp_out)
+    self.assertEqual(err.getvalue().strip(), '')
+
+  def testShowCommandTags(self):
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    self.parser = saved_model_cli.create_parser()
+    args = self.parser.parse_args(['show', '--dir', base_path])
+    with captured_output() as (out, err):
+      saved_model_cli.show(args)
+    output = out.getvalue().strip()
+    exp_out = 'The given SavedModel contains the following tag-sets:\nserve'
+    self.assertMultiLineEqual(output, exp_out)
+    self.assertEqual(err.getvalue().strip(), '')
+
+  def testShowCommandSignature(self):
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    self.parser = saved_model_cli.create_parser()
+    args = self.parser.parse_args(
+        ['show', '--dir', base_path, '--tag_set', 'serve'])
+    with captured_output() as (out, err):
+      saved_model_cli.show(args)
+    output = out.getvalue().strip()
+    exp_header = ('The given SavedModel MetaGraphDef contains SignatureDefs '
+                  'with the following keys:')
+    exp_start = 'SignatureDef key: '
+    exp_keys = [
+        '"classify_x2_to_y3"', '"classify_x_to_y"', '"regress_x2_to_y3"',
+        '"regress_x_to_y"', '"regress_x_to_y2"', '"serving_default"'
+    ]
+    # Order of signatures does not matter
+    self.assertMultiLineEqual(
+        output,
+        '\n'.join([exp_header] + [exp_start + exp_key for exp_key in exp_keys]))
+    self.assertEqual(err.getvalue().strip(), '')
+
+  def testShowCommandErrorNoTagSet(self):
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    self.parser = saved_model_cli.create_parser()
+    args = self.parser.parse_args(
+        ['show', '--dir', base_path, '--tag_set', 'badtagset'])
+    with self.assertRaises(RuntimeError):
+      saved_model_cli.show(args)
+
+  def testShowCommandInputsOutputs(self):
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    self.parser = saved_model_cli.create_parser()
+    args = self.parser.parse_args([
+        'show', '--dir', base_path, '--tag_set', 'serve', '--signature_def',
+        'serving_default'
+    ])
+    with captured_output() as (out, err):
+      saved_model_cli.show(args)
+    output = out.getvalue().strip()
+    expected_output = (
+        'The given SavedModel SignatureDef contains the following input(s):\n'
+        'inputs[\'x\'] tensor_info:\n'
+        '    dtype: DT_FLOAT\n    shape: (-1, 1)\n'
+        'The given SavedModel SignatureDef contains the following output(s):\n'
+        'outputs[\'y\'] tensor_info:\n'
+        '    dtype: DT_FLOAT\n    shape: (-1, 1)\n'
+        'Method name is: tensorflow/serving/predict')
+    self.assertEqual(output, expected_output)
+    self.assertEqual(err.getvalue().strip(), '')
+
+  def testInputPreProcessFormats(self):
+    input_str = 'input1=/path/file.txt[ab3], input2=file2,,'
+    input_dict = saved_model_cli.preprocess_input_arg_string(input_str)
+    self.assertTrue(input_dict['input1'] == ('/path/file.txt', 'ab3'))
+    self.assertTrue(input_dict['input2'] == ('file2', None))
+
+  def testInputPreProcessQuoteAndWhitespace(self):
+    input_str = '\' input1 = file[v_1]\', input2=file ["sd"] '
+    input_dict = saved_model_cli.preprocess_input_arg_string(input_str)
+    self.assertTrue(input_dict['input1'] == ('file', 'v_1'))
+    self.assertTrue(input_dict['input2'] == ('file', 'sd'))
+    self.assertTrue(len(input_dict) == 2)
+
+  def testInputPreProcessErrorBadFormat(self):
+    input_str = 'inputx=file[[v1]v2'
+    with self.assertRaises(RuntimeError):
+      saved_model_cli.preprocess_input_arg_string(input_str)
+    input_str = 'inputx:file'
+    with self.assertRaises(RuntimeError):
+      saved_model_cli.preprocess_input_arg_string(input_str)
+    input_str = 'inputx=file(v_1)'
+    with self.assertRaises(RuntimeError):
+      saved_model_cli.preprocess_input_arg_string(input_str)
+
+  def testInputParserNPY(self):
+    x0 = np.array([[1], [2]])
+    x1 = np.array(range(6)).reshape(2, 3)
+    input0_path = os.path.join(test.get_temp_dir(), 'input0.npy')
+    input1_path = os.path.join(test.get_temp_dir(), 'input1.npy')
+    np.save(input0_path, x0)
+    np.save(input1_path, x1)
+    input_str = 'x0=' + input0_path + '[x0],x1=' + input1_path
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    self.assertTrue(np.all(feed_dict['x0'] == x0))
+    self.assertTrue(np.all(feed_dict['x1'] == x1))
+
+  def testInputParserNPZ(self):
+    x0 = np.array([[1], [2]])
+    input_path = os.path.join(test.get_temp_dir(), 'input.npz')
+    np.savez(input_path, a=x0)
+    input_str = 'x=' + input_path + '[a],y=' + input_path
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    self.assertTrue(np.all(feed_dict['x'] == x0))
+    self.assertTrue(np.all(feed_dict['y'] == x0))
+
+  def testInputParserPickle(self):
+    pkl0 = {'a': 5, 'b': np.array(range(4))}
+    pkl1 = np.array([1])
+    pkl2 = np.array([[1], [3]])
+    input_path0 = os.path.join(test.get_temp_dir(), 'pickle0.pkl')
+    input_path1 = os.path.join(test.get_temp_dir(), 'pickle1.pkl')
+    input_path2 = os.path.join(test.get_temp_dir(), 'pickle2.pkl')
+    with open(input_path0, 'wb') as f:
+      pickle.dump(pkl0, f)
+    with open(input_path1, 'wb') as f:
+      pickle.dump(pkl1, f)
+    with open(input_path2, 'wb') as f:
+      pickle.dump(pkl2, f)
+    input_str = 'x=' + input_path0 + '[b],y=' + input_path1 + '[c],'
+    input_str += 'z=' + input_path2
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    self.assertTrue(np.all(feed_dict['x'] == pkl0['b']))
+    self.assertTrue(np.all(feed_dict['y'] == pkl1))
+    self.assertTrue(np.all(feed_dict['z'] == pkl2))
+
+  def testInputParserQuoteAndWhitespace(self):
+    x0 = np.array([[1], [2]])
+    x1 = np.array(range(6)).reshape(2, 3)
+    input0_path = os.path.join(test.get_temp_dir(), 'input0.npy')
+    input1_path = os.path.join(test.get_temp_dir(), 'input1.npy')
+    np.save(input0_path, x0)
+    np.save(input1_path, x1)
+    input_str = '"x0=' + input0_path + '[x0] , x1 = ' + input1_path + '"'
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    self.assertTrue(np.all(feed_dict['x0'] == x0))
+    self.assertTrue(np.all(feed_dict['x1'] == x1))
+
+  def testInputParserErrorNoName(self):
+    x0 = np.array([[1], [2]])
+    x1 = np.array(range(5))
+    input_path = os.path.join(test.get_temp_dir(), 'input.npz')
+    np.savez(input_path, a=x0, b=x1)
+    input_str = 'x=' + input_path
+    with self.assertRaises(RuntimeError):
+      saved_model_cli.load_inputs_from_input_arg_string(input_str)
+
+  def testInputParserErrorWrongName(self):
+    x0 = np.array([[1], [2]])
+    x1 = np.array(range(5))
+    input_path = os.path.join(test.get_temp_dir(), 'input.npz')
+    np.savez(input_path, a=x0, b=x1)
+    input_str = 'x=' + input_path + '[c]'
+    with self.assertRaises(RuntimeError):
+      saved_model_cli.load_inputs_from_input_arg_string(input_str)
+
+  def testRunCommandExistingOutdir(self):
+    self.parser = saved_model_cli.create_parser()
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    x = np.array([[1], [2]])
+    x_notused = np.zeros((6, 3))
+    input_path = os.path.join(test.get_temp_dir(), 'testRunCommand_inputs.npz')
+    np.savez(input_path, x0=x, x1=x_notused)
+    output_file = os.path.join(test.get_temp_dir(), 'outputs.npy')
+    if os.path.exists(output_file):
+      os.remove(output_file)
+    args = self.parser.parse_args([
+        'run', '--dir', base_path, '--tag_set', 'serve', '--signature_def',
+        'regress_x2_to_y3', '--inputs', 'inputs=' + input_path + '[x0]',
+        '--outdir',
+        test.get_temp_dir()
+    ])
+    saved_model_cli.run(args)
+    y = np.load(output_file)
+    y_exp = np.array([[3.5], [4.0]])
+    self.assertTrue(np.allclose(y, y_exp))
+
+  def testRunCommandNewOutdir(self):
+    self.parser = saved_model_cli.create_parser()
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    x = np.array([[1], [2]])
+    x_notused = np.zeros((6, 3))
+    input_path = os.path.join(test.get_temp_dir(),
+                              'testRunCommandNewOutdir_inputs.npz')
+    output_dir = os.path.join(test.get_temp_dir(), 'new_dir')
+    if os.path.isdir(output_dir):
+      shutil.rmtree(output_dir)
+    np.savez(input_path, x0=x, x1=x_notused)
+    args = self.parser.parse_args([
+        'run', '--dir', base_path, '--tag_set', 'serve', '--signature_def',
+        'serving_default', '--inputs', 'x=' + input_path + '[x0]', '--outdir',
+        output_dir
+    ])
+    saved_model_cli.run(args)
+    y = np.load(os.path.join(output_dir, 'y.npy'))
+    y_exp = np.array([[2.5], [3.0]])
+    self.assertTrue(np.allclose(y, y_exp))
+
+  def testRunCommandOutOverwrite(self):
+    self.parser = saved_model_cli.create_parser()
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    x = np.array([[1], [2]])
+    x_notused = np.zeros((6, 3))
+    input_path = os.path.join(test.get_temp_dir(),
+                              'testRunCommandOutOverwrite_inputs.npz')
+    np.savez(input_path, x0=x, x1=x_notused)
+    output_file = os.path.join(test.get_temp_dir(), 'y.npy')
+    open(output_file, 'a').close()
+    args = self.parser.parse_args([
+        'run', '--dir', base_path, '--tag_set', 'serve', '--signature_def',
+        'serving_default', '--inputs', 'x=' + input_path + '[x0]', '--outdir',
+        test.get_temp_dir(), '--overwrite'
+    ])
+    saved_model_cli.run(args)
+    y = np.load(output_file)
+    y_exp = np.array([[2.5], [3.0]])
+    self.assertTrue(np.allclose(y, y_exp))
+
+  def testRunCommandOutputFileExistError(self):
+    self.parser = saved_model_cli.create_parser()
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    x = np.array([[1], [2]])
+    x_notused = np.zeros((6, 3))
+    input_path = os.path.join(test.get_temp_dir(),
+                              'testRunCommandOutOverwrite_inputs.npz')
+    np.savez(input_path, x0=x, x1=x_notused)
+    output_file = os.path.join(test.get_temp_dir(), 'y.npy')
+    open(output_file, 'a').close()
+    args = self.parser.parse_args([
+        'run', '--dir', base_path, '--tag_set', 'serve', '--signature_def',
+        'serving_default', '--inputs', 'x=' + input_path + '[x0]', '--outdir',
+        test.get_temp_dir()
+    ])
+    with self.assertRaises(RuntimeError):
+      saved_model_cli.run(args)
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 3253440a23..e20d74fd4a 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -59,6 +59,7 @@ else:
 # pylint: disable=line-too-long
 CONSOLE_SCRIPTS = [
     'tensorboard = tensorflow.tensorboard.tensorboard:main',
+    'saved_model_cli = tensorflow.python.tools.saved_model_cli:main',
 ]
 # pylint: enable=line-too-long
 
-- 
GitLab


From 4ef296f0ed175988dfd84ae2f8523c26ba9d835e Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Wed, 19 Apr 2017 16:06:10 -0800
Subject: [PATCH 0561/1563] [XLA] Add a std::initializer_list overload for
 ContainersEqual Change: 153654394

---
 .../xla/service/cpu/conv_canonicalization_test.cc |  9 +++------
 .../xla/service/layout_assignment_test.cc         | 15 +++++++--------
 tensorflow/compiler/xla/util.h                    |  8 ++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc b/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc
index d18141af83..f717d57839 100644
--- a/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc
+++ b/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc
@@ -96,17 +96,14 @@ TEST_F(ConvCanonicalizationTest, NonCanonicalToCanonical) {
 
   // The input is in CNHW order. input_reshape should produce
   // NHWC for the convolution to hit the Eigen fast path.
-  EXPECT_TRUE(ContainersEqual(input_reshape->dimensions(),
-                              std::vector<int64>({1, 2, 3, 0})));
+  EXPECT_TRUE(ContainersEqual(input_reshape->dimensions(), {1, 2, 3, 0}));
   // The kernel is in OIHW order. kernel_reshape should produce
   // HWIO for the convolution to hit the Eigen fast path.
-  EXPECT_TRUE(ContainersEqual(kernel_reshape->dimensions(),
-                              std::vector<int64>({2, 3, 1, 0})));
+  EXPECT_TRUE(ContainersEqual(kernel_reshape->dimensions(), {2, 3, 1, 0}));
   // The output of the canonical convolution is in NHWC order (the same as
   // input_reshape's order). output_reshape should restore that order to the
   // order of the computation root (CNHW).
-  EXPECT_TRUE(ContainersEqual(output_reshape->dimensions(),
-                              std::vector<int64>({3, 0, 1, 2})));
+  EXPECT_TRUE(ContainersEqual(output_reshape->dimensions(), {3, 0, 1, 2}));
 }
 
 TEST_F(ConvCanonicalizationTest, CanonicalStaysTheSame) {
diff --git a/tensorflow/compiler/xla/service/layout_assignment_test.cc b/tensorflow/compiler/xla/service/layout_assignment_test.cc
index 3a3d2d30d7..b6451738bd 100644
--- a/tensorflow/compiler/xla/service/layout_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment_test.cc
@@ -421,8 +421,8 @@ TEST_F(LayoutAssignmentTest, BroadcastAndTranspose) {
       ShapeLayout(output_shape_with_layout);
   AssignLayouts(&module, &computation_layout);
 
-  EXPECT_TRUE(ContainersEqual(broadcast->shape().layout().minor_to_major(),
-                              tensorflow::gtl::ArraySlice<int64>{0, 1, 2}));
+  EXPECT_TRUE(
+      ContainersEqual(broadcast->shape().layout().minor_to_major(), {0, 1, 2}));
 }
 
 TEST_F(LayoutAssignmentTest, ReshapeOperandHasMultipleUsers) {
@@ -474,12 +474,11 @@ TEST_F(LayoutAssignmentTest, ReshapeOperandHasMultipleUsers) {
           {transpose_shape_with_layout, broadcast2_shape_with_layout}));
   AssignLayouts(&module, &computation_layout);
 
-  EXPECT_TRUE(ContainersEqual(broadcast->shape().layout().minor_to_major(),
-                              tensorflow::gtl::ArraySlice<int64>{0, 1}));
-  EXPECT_TRUE(ContainersEqual(transpose->shape().layout().minor_to_major(),
-                              tensorflow::gtl::ArraySlice<int64>{1, 0}));
-  EXPECT_TRUE(ContainersEqual(tanh->shape().layout().minor_to_major(),
-                              tensorflow::gtl::ArraySlice<int64>{0, 1}));
+  EXPECT_TRUE(
+      ContainersEqual(broadcast->shape().layout().minor_to_major(), {0, 1}));
+  EXPECT_TRUE(
+      ContainersEqual(transpose->shape().layout().minor_to_major(), {1, 0}));
+  EXPECT_TRUE(ContainersEqual(tanh->shape().layout().minor_to_major(), {0, 1}));
 }
 
 // Add test which fails due to copy tuple.
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h
index 55a66a7499..8ec4f1b528 100644
--- a/tensorflow/compiler/xla/util.h
+++ b/tensorflow/compiler/xla/util.h
@@ -120,6 +120,14 @@ bool ContainersEqual(const Container1T& c1, const Container2T& c2) {
           std::equal(std::begin(c1), std::end(c1), std::begin(c2)));
 }
 
+template <typename Container1T,
+          typename ElementType = typename Container1T::value_type>
+bool ContainersEqual(const Container1T& c1,
+                     std::initializer_list<ElementType> il) {
+  tensorflow::gtl::ArraySlice<ElementType> c2{il};
+  return ContainersEqual(c1, c2);
+}
+
 // Compares two containers for equality. Returns true iff the two containers
 // have the same size and all their elements compare equal using the predicate
 // p. Like std::equal, but forces size equality.
-- 
GitLab


From 7821dbee6a8b84d31b6feb845a9fd8e3535b32f8 Mon Sep 17 00:00:00 2001
From: Christopher Olston <olston@google.com>
Date: Wed, 19 Apr 2017 16:13:34 -0800
Subject: [PATCH 0562/1563] Correct copyright headers in
 tensorflow/contrib/batching/... following move from tensorflow_serving.
 Change: 153655203

---
 tensorflow/contrib/batching/basic_batch_scheduler.h            | 2 +-
 tensorflow/contrib/batching/basic_batch_scheduler_benchmark.cc | 2 +-
 tensorflow/contrib/batching/basic_batch_scheduler_test.cc      | 2 +-
 tensorflow/contrib/batching/batch_scheduler.h                  | 2 +-
 tensorflow/contrib/batching/batch_scheduler_test.cc            | 2 +-
 tensorflow/contrib/batching/shared_batch_scheduler.h           | 2 +-
 tensorflow/contrib/batching/shared_batch_scheduler_test.cc     | 2 +-
 tensorflow/contrib/batching/test_util/fake_clock_env.cc        | 2 +-
 tensorflow/contrib/batching/test_util/fake_clock_env.h         | 2 +-
 tensorflow/contrib/batching/util/periodic_function.cc          | 2 +-
 tensorflow/contrib/batching/util/periodic_function.h           | 2 +-
 tensorflow/contrib/batching/util/periodic_function_test.cc     | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tensorflow/contrib/batching/basic_batch_scheduler.h b/tensorflow/contrib/batching/basic_batch_scheduler.h
index cfbe765b5d..9d3805fbaf 100644
--- a/tensorflow/contrib/batching/basic_batch_scheduler.h
+++ b/tensorflow/contrib/batching/basic_batch_scheduler.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/basic_batch_scheduler_benchmark.cc b/tensorflow/contrib/batching/basic_batch_scheduler_benchmark.cc
index 259c1d7879..ab6c810433 100644
--- a/tensorflow/contrib/batching/basic_batch_scheduler_benchmark.cc
+++ b/tensorflow/contrib/batching/basic_batch_scheduler_benchmark.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/basic_batch_scheduler_test.cc b/tensorflow/contrib/batching/basic_batch_scheduler_test.cc
index 29081dc48b..e020301795 100644
--- a/tensorflow/contrib/batching/basic_batch_scheduler_test.cc
+++ b/tensorflow/contrib/batching/basic_batch_scheduler_test.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/batch_scheduler.h b/tensorflow/contrib/batching/batch_scheduler.h
index c35b0773ae..7c41ad8818 100644
--- a/tensorflow/contrib/batching/batch_scheduler.h
+++ b/tensorflow/contrib/batching/batch_scheduler.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/batch_scheduler_test.cc b/tensorflow/contrib/batching/batch_scheduler_test.cc
index 90841fce90..f15d8cc8e5 100644
--- a/tensorflow/contrib/batching/batch_scheduler_test.cc
+++ b/tensorflow/contrib/batching/batch_scheduler_test.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/shared_batch_scheduler.h b/tensorflow/contrib/batching/shared_batch_scheduler.h
index 2a49250041..41a3f99137 100644
--- a/tensorflow/contrib/batching/shared_batch_scheduler.h
+++ b/tensorflow/contrib/batching/shared_batch_scheduler.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/shared_batch_scheduler_test.cc b/tensorflow/contrib/batching/shared_batch_scheduler_test.cc
index a793ed3ccd..809958c737 100644
--- a/tensorflow/contrib/batching/shared_batch_scheduler_test.cc
+++ b/tensorflow/contrib/batching/shared_batch_scheduler_test.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/test_util/fake_clock_env.cc b/tensorflow/contrib/batching/test_util/fake_clock_env.cc
index 4a6fa338a1..166d6703bd 100644
--- a/tensorflow/contrib/batching/test_util/fake_clock_env.cc
+++ b/tensorflow/contrib/batching/test_util/fake_clock_env.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/test_util/fake_clock_env.h b/tensorflow/contrib/batching/test_util/fake_clock_env.h
index 78b66bce70..35cafcb73c 100644
--- a/tensorflow/contrib/batching/test_util/fake_clock_env.h
+++ b/tensorflow/contrib/batching/test_util/fake_clock_env.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/util/periodic_function.cc b/tensorflow/contrib/batching/util/periodic_function.cc
index e150847878..b7e4838da5 100644
--- a/tensorflow/contrib/batching/util/periodic_function.cc
+++ b/tensorflow/contrib/batching/util/periodic_function.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/util/periodic_function.h b/tensorflow/contrib/batching/util/periodic_function.h
index b2dde8df7a..2c032d802f 100644
--- a/tensorflow/contrib/batching/util/periodic_function.h
+++ b/tensorflow/contrib/batching/util/periodic_function.h
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tensorflow/contrib/batching/util/periodic_function_test.cc b/tensorflow/contrib/batching/util/periodic_function_test.cc
index ad0a0a1747..1517961116 100644
--- a/tensorflow/contrib/batching/util/periodic_function_test.cc
+++ b/tensorflow/contrib/batching/util/periodic_function_test.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
-- 
GitLab


From fd14d0ac6ab5df924ec63f9cf073b384863d0f17 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Wed, 19 Apr 2017 16:20:42 -0800
Subject: [PATCH 0563/1563] Support the whence parameter in GFile's .seek() to
 match Python's file semantics. Also rename position to offset to match
 Python's file parameter naming.

Fixes numpy.load() from gfile.
Change: 153655962
---
 tensorflow/python/lib/io/file_io.py           | 47 +++++++++++++++++--
 tensorflow/python/lib/io/file_io_test.py      | 34 ++++++++++++++
 .../tensorflow.gfile.-fast-g-file.pbtxt       |  2 +-
 .../api/golden/tensorflow.gfile.-g-file.pbtxt |  2 +-
 .../api/golden/tensorflow.gfile.-open.pbtxt   |  2 +-
 5 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/lib/io/file_io.py b/tensorflow/python/lib/io/file_io.py
index ace03e3d1b..7a91bbd3e0 100644
--- a/tensorflow/python/lib/io/file_io.py
+++ b/tensorflow/python/lib/io/file_io.py
@@ -27,6 +27,7 @@ import uuid
 from tensorflow.python import pywrap_tensorflow
 from tensorflow.python.framework import errors
 from tensorflow.python.util import compat
+from tensorflow.python.util import deprecation
 
 
 class FileIO(object):
@@ -121,11 +122,51 @@ class FileIO(object):
       return self._prepare_value(
           pywrap_tensorflow.ReadFromStream(self._read_buf, length, status))
 
-  def seek(self, position):
-    """Seeks to the position in the file."""
+  @deprecation.deprecated_args(
+      None,
+      "position is deprecated in favor of the offset argument.",
+      "position")
+  def seek(self, offset=None, whence=0, position=None):
+    # TODO(jhseu): Delete later. Used to omit `position` from docs.
+    # pylint: disable=g-doc-args
+    """Seeks to the offset in the file.
+
+    Args:
+      offset: The byte count relative to the whence argument.
+      whence: Valid values for whence are:
+        0: start of the file (default)
+        1: relative to the current position of the file
+        2: relative to the end of file. offset is usually negative.
+    """
+    # pylint: enable=g-doc-args
     self._preread_check()
+    # We needed to make offset a keyword argument for backwards-compatibility.
+    # This check exists so that we can convert back to having offset be a
+    # positional argument.
+    # TODO(jhseu): Make `offset` a positional argument after `position` is
+    # deprecated.
+    if offset is None and position is None:
+      raise TypeError("seek(): offset argument required")
+    if offset is not None and position is not None:
+      raise TypeError("seek(): offset and position may not be set "
+                      "simultaneously.")
+
+    if position is not None:
+      offset = position
+
     with errors.raise_exception_on_not_ok_status() as status:
-      ret_status = self._read_buf.Seek(position)
+      if whence == 0:
+        pass
+      elif whence == 1:
+        offset += self.tell()
+      elif whence == 2:
+        offset += self.size()
+      else:
+        raise errors.InvalidArgumentError(
+            None, None,
+            "Invalid whence argument: {}. Valid values are 0, 1, or 2."
+            .format(whence))
+      ret_status = self._read_buf.Seek(offset)
       pywrap_tensorflow.Set_TF_Status_from_Status(status, ret_status)
 
   def readline(self):
diff --git a/tensorflow/python/lib/io/file_io_test.py b/tensorflow/python/lib/io/file_io_test.py
index 72931217d9..9ad0450855 100644
--- a/tensorflow/python/lib/io/file_io_test.py
+++ b/tensorflow/python/lib/io/file_io_test.py
@@ -392,6 +392,40 @@ class FileIoTest(test.TestCase):
     with self.assertRaises(errors.InvalidArgumentError):
       f.seek(-1)
 
+    with self.assertRaises(TypeError):
+      f.seek()
+
+    # TODO(jhseu): Delete after position deprecation.
+    with self.assertRaises(TypeError):
+      f.seek(offset=0, position=0)
+    f.seek(position=9)
+    self.assertEqual(9, f.tell())
+    self.assertEqual("testing2\n", f.readline())
+
+  def testSeekFromWhat(self):
+    file_path = os.path.join(self._base_dir, "temp_file")
+    with file_io.FileIO(file_path, mode="r+") as f:
+      f.write("testing1\ntesting2\ntesting3\n\ntesting5")
+    self.assertEqual("testing1\n", f.readline())
+    self.assertEqual(9, f.tell())
+
+    # Seek to 18
+    f.seek(9, 1)
+    self.assertEqual(18, f.tell())
+    self.assertEqual("testing3\n", f.readline())
+
+    # Seek back to 9
+    f.seek(9, 0)
+    self.assertEqual(9, f.tell())
+    self.assertEqual("testing2\n", f.readline())
+
+    f.seek(-f.size(), 2)
+    self.assertEqual(0, f.tell())
+    self.assertEqual("testing1\n", f.readline())
+
+    with self.assertRaises(errors.InvalidArgumentError):
+      f.seek(0, 3)
+
   def testReadingIterator(self):
     file_path = os.path.join(self._base_dir, "temp_file")
     data = ["testing1\n", "testing2\n", "testing3\n", "\n", "testing5"]
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
index 41497dc869..4c0a0b2ea0 100644
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
@@ -41,7 +41,7 @@ tf_class {
   }
   member_method {
     name: "seek"
-    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
   }
   member_method {
     name: "size"
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
index bab0f279b2..85d81c4fcb 100644
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
@@ -41,7 +41,7 @@ tf_class {
   }
   member_method {
     name: "seek"
-    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
   }
   member_method {
     name: "size"
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
index 86e577c19a..13f9c203e8 100644
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
@@ -41,7 +41,7 @@ tf_class {
   }
   member_method {
     name: "seek"
-    argspec: "args=[\'self\', \'position\'], varargs=None, keywords=None, defaults=None"
+    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
   }
   member_method {
     name: "size"
-- 
GitLab


From 149553af786d05a7c7c07198acacf3623a2cc3b1 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Wed, 19 Apr 2017 16:29:13 -0800
Subject: [PATCH 0564/1563] libtensorflow: Fix typo

Windows: Fix typo in C API binary release script.
(Not that the C API binary release for Windows is ready to release yet)

Linux/Mac: Fix typo in libtensorflow_proto.zip location
Change: 153656805
---
 tensorflow/tools/ci_build/builds/libtensorflow.sh      | 3 ++-
 tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tensorflow/tools/ci_build/builds/libtensorflow.sh b/tensorflow/tools/ci_build/builds/libtensorflow.sh
index c611695ad8..5052d3626c 100755
--- a/tensorflow/tools/ci_build/builds/libtensorflow.sh
+++ b/tensorflow/tools/ci_build/builds/libtensorflow.sh
@@ -81,5 +81,6 @@ function build_libtensorflow_tarball() {
   cp bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz ${DIR}/libtensorflow${TARBALL_SUFFIX}.tar.gz
   cp bazel-bin/tensorflow/tools/lib_package/libtensorflow_jni.tar.gz ${DIR}/libtensorflow_jni${TARBALL_SUFFIX}.tar.gz
   cp bazel-bin/tensorflow/java/libtensorflow.jar bazel-bin/tensorflow/java/libtensorflow-src.jar ${DIR}
-  cp bazel-bin/tensorflow/tools/lib_package/libtensorflow_proto.zip ${DIR}
+  cp bazel-genfiles/tensorflow/tools/lib_package/libtensorflow_proto.zip ${DIR}
+  chmod -x ${DIR}/*
 }
diff --git a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
index a08a3c2874..9ac3613f27 100755
--- a/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
+++ b/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh
@@ -81,6 +81,6 @@ cp bazel-genfiles/tensorflow/tools/lib_package/include/tensorflow/c/LICENSE ${DI
 cd ${DIR}
 zip -j libtensorflow-cpu-windows-$(uname -m).zip \
   lib/tensorflow.dll \
-  include/c/c_api.h \
-  include/c/LICENSE
+  include/tensorflow/c/c_api.h \
+  include/tensorflow/c/LICENSE
 rm -rf lib include
-- 
GitLab


From 225f4e323e8f76807e6bbc9c3026dcd37d828fed Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 19 Apr 2017 18:25:45 -0800
Subject: [PATCH 0565/1563] [XLA] Change types of InfeedRequest and
 OutfeedRequest configuration fields to "bytes" instead of "string". Change:
 153665746

---
 tensorflow/compiler/xla/xla_data.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/xla_data.proto b/tensorflow/compiler/xla/xla_data.proto
index cf4c9e0fe5..e5b94fcefe 100644
--- a/tensorflow/compiler/xla/xla_data.proto
+++ b/tensorflow/compiler/xla/xla_data.proto
@@ -408,7 +408,7 @@ message InfeedRequest {
   Shape shape = 2;
 
   // Additional infeed configuration for the backend.
-  string config = 3;
+  bytes config = 3;
 }
 
 message OutfeedRequest {
@@ -419,7 +419,7 @@ message OutfeedRequest {
   ComputationDataHandle operand = 2;
 
   // Backend-specific information for how to perform the outfeed.
-  string outfeed_config = 3;
+  bytes outfeed_config = 3;
 }
 
 message CallRequest {
-- 
GitLab


From 0557e8f90c1a2f027f4561c70558c6c836138058 Mon Sep 17 00:00:00 2001
From: weipingpku <630404796@qq.com>
Date: Thu, 20 Apr 2017 11:56:43 +0800
Subject: [PATCH 0566/1563] Fix typo in LINE#471 (#9323)

change cell_input_fn to probability_fn, bug reported in https://github.com/tensorflow/tensorflow/issues/9312
---
 tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 3aec58df29..0f3a5ea72d 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -468,7 +468,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     if probability_fn is None:
       probability_fn = nn_ops.softmax
     else:
-      if not callable(cell_input_fn):
+      if not callable(probability_fn):
         raise TypeError(
             "probability_fn must be callable, saw type: %s"
             % type(probability_fn).__name__)
-- 
GitLab


From 91e4a19c1bbded4430299c636486c86b3fff2ab9 Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Wed, 19 Apr 2017 19:45:54 -0800
Subject: [PATCH 0567/1563] Add REGISTER_SYSTEM_OP and
 REGISTER_SYSTEM_KERNEL_BUILDER macros.

Use these macros to circumvent the selective registration mechanism
and always build the "_Arg" and "_Retval" ops.
Change: 153669926
---
 tensorflow/core/framework/op.h          | 12 ++++++++++
 tensorflow/core/framework/op_kernel.h   | 31 +++++++++++++++++++++++++
 tensorflow/core/kernels/function_ops.cc |  4 ++--
 tensorflow/core/ops/function_ops.cc     |  4 ++--
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/framework/op.h b/tensorflow/core/framework/op.h
index f047ddb12a..892ed9b60b 100644
--- a/tensorflow/core/framework/op.h
+++ b/tensorflow/core/framework/op.h
@@ -293,6 +293,18 @@ struct OpDefBuilderReceiver {
           ::tensorflow::register_op::OpDefBuilderWrapper<SHOULD_REGISTER_OP( \
               name)>(name)
 
+// The `REGISTER_SYSTEM_OP()` macro acts as `REGISTER_OP()` except
+// that the op is registered unconditionally even when selective
+// registration is used.
+#define REGISTER_SYSTEM_OP(name) \
+  REGISTER_SYSTEM_OP_UNIQ_HELPER(__COUNTER__, name)
+#define REGISTER_SYSTEM_OP_UNIQ_HELPER(ctr, name) \
+  REGISTER_SYSTEM_OP_UNIQ(ctr, name)
+#define REGISTER_SYSTEM_OP_UNIQ(ctr, name)                                \
+  static ::tensorflow::register_op::OpDefBuilderReceiver register_op##ctr \
+      TF_ATTRIBUTE_UNUSED =                                               \
+          ::tensorflow::register_op::OpDefBuilderWrapper<true>(name)
+
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_FRAMEWORK_OP_H_
diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index 91e6a98304..48bb69cb4e 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -1194,6 +1194,17 @@ class Name : public KernelDefBuilder {
       : KernelDefBuilder(SHOULD_REGISTER_OP(op) ? op : "_no_register") {}
 };
 
+namespace system {
+
+class Name : public KernelDefBuilder {
+ public:
+  // For system kernels, we ignore selective registration and
+  // unconditionally register the kernel.
+  explicit Name(const char* op) : KernelDefBuilder(op) {}
+};
+
+}  // namespace system
+
 }  // namespace register_kernel
 
 #define REGISTER_KERNEL_BUILDER(kernel_builder, ...) \
@@ -1216,6 +1227,26 @@ class Name : public KernelDefBuilder {
             return new __VA_ARGS__(context);                          \
           });
 
+// The `REGISTER_SYSTEM_KERNEL_BUILDER()` macro acts as
+// `REGISTER_KERNEL_BUILDER()` except that the kernel is registered
+// unconditionally even when selective registration is used.
+#define REGISTER_SYSTEM_KERNEL_BUILDER(kernel_builder, ...)               \
+  REGISTER_SYSTEM_KERNEL_BUILDER_UNIQ_HELPER(__COUNTER__, kernel_builder, \
+                                             __VA_ARGS__)
+
+#define REGISTER_SYSTEM_KERNEL_BUILDER_UNIQ_HELPER(ctr, kernel_builder, ...) \
+  REGISTER_SYSTEM_KERNEL_BUILDER_UNIQ(ctr, kernel_builder, __VA_ARGS__)
+
+#define REGISTER_SYSTEM_KERNEL_BUILDER_UNIQ(ctr, kernel_builder, ...)    \
+  static ::tensorflow::kernel_factory::OpKernelRegistrar                 \
+      registrar__body__##ctr##__object(                                  \
+          ::tensorflow::register_kernel::system::kernel_builder.Build(), \
+          #__VA_ARGS__,                                                  \
+          [](::tensorflow::OpKernelConstruction* context)                \
+              -> ::tensorflow::OpKernel* {                               \
+            return new __VA_ARGS__(context);                             \
+          });
+
 void* GlobalKernelRegistry();
 
 // If node_def has a corresponding kernel registered on device_type,
diff --git a/tensorflow/core/kernels/function_ops.cc b/tensorflow/core/kernels/function_ops.cc
index bcbf7424b1..ba408f3657 100644
--- a/tensorflow/core/kernels/function_ops.cc
+++ b/tensorflow/core/kernels/function_ops.cc
@@ -84,8 +84,8 @@ class RetvalOp : public OpKernel {
   TF_DISALLOW_COPY_AND_ASSIGN(RetvalOp);
 };
 
-REGISTER_KERNEL_BUILDER(Name("_Arg").Device(DEVICE_CPU), ArgOp);
-REGISTER_KERNEL_BUILDER(Name("_Retval").Device(DEVICE_CPU), RetvalOp);
+REGISTER_SYSTEM_KERNEL_BUILDER(Name("_Arg").Device(DEVICE_CPU), ArgOp);
+REGISTER_SYSTEM_KERNEL_BUILDER(Name("_Retval").Device(DEVICE_CPU), RetvalOp);
 
 #if TENSORFLOW_USE_SYCL
 #define REGISTER(type)     \
diff --git a/tensorflow/core/ops/function_ops.cc b/tensorflow/core/ops/function_ops.cc
index 9fbebdb088..ada96fa1d2 100644
--- a/tensorflow/core/ops/function_ops.cc
+++ b/tensorflow/core/ops/function_ops.cc
@@ -18,7 +18,7 @@ limitations under the License.
 
 namespace tensorflow {
 
-REGISTER_OP("_Arg")
+REGISTER_SYSTEM_OP("_Arg")
     .Output("output: T")
     .Attr("T: type")
     .Attr("index: int >= 0")
@@ -34,7 +34,7 @@ output: The argument.
 index: This argument is the index-th argument of the function.
 )doc");
 
-REGISTER_OP("_Retval")
+REGISTER_SYSTEM_OP("_Retval")
     .Input("input: T")
     .Attr("T: type")
     .Attr("index: int >= 0")
-- 
GitLab


From 173a4104edfc5a2e81aff0684607f29c00f417c8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 19 Apr 2017 23:25:23 -0800
Subject: [PATCH 0568/1563] Clarify docstring: tf.Variable(variable_def) does
 not add to the graph. Change: 153680516

---
 tensorflow/python/ops/variables.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/ops/variables.py b/tensorflow/python/ops/variables.py
index 4793cb4a17..8b508e45a4 100644
--- a/tensorflow/python/ops/variables.py
+++ b/tensorflow/python/ops/variables.py
@@ -163,8 +163,9 @@ class Variable(object):
       name: Optional name for the variable. Defaults to `'Variable'` and gets
         uniquified automatically.
       variable_def: `VariableDef` protocol buffer. If not `None`, recreates
-        the Variable object with its contents. `variable_def` and the other
-        arguments are mutually exclusive.
+        the Variable object with its contents, referencing the variable's nodes
+        in the graph, which must already exist. The graph is not changed.
+        `variable_def` and the other arguments are mutually exclusive.
       dtype: If set, initial_value will be converted to the given type.
         If `None`, either the datatype will be kept (if `initial_value` is
         a Tensor), or `convert_to_tensor` will decide.
@@ -320,10 +321,11 @@ class Variable(object):
     self._save_slice_info = None
 
   def _init_from_proto(self, variable_def, import_scope=None):
-    """Creates a new variable from `VariableDef` protocol buffer.
+    """Recreates the Variable object from a `VariableDef` protocol buffer.
 
     Args:
-      variable_def: `VariableDef` protocol buffer.
+      variable_def: `VariableDef` protocol buffer, describing a variable
+          whose nodes already exists in the graph.
       import_scope: Optional `string`. Name scope to add.
     """
     assert isinstance(variable_def, variable_pb2.VariableDef)
-- 
GitLab


From feb7eb905701d691c727c9ce7a32ffb3e2ee028f Mon Sep 17 00:00:00 2001
From: Fei Gao <feiga@users.noreply.github.com>
Date: Thu, 20 Apr 2017 15:55:16 +0800
Subject: [PATCH 0569/1563] Include UGRNNCell and IntersectionRNNCell to the
 tf.contrib.rnn module.

---
 tensorflow/contrib/rnn/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/contrib/rnn/__init__.py b/tensorflow/contrib/rnn/__init__.py
index ce1ed7f491..24406e36ce 100644
--- a/tensorflow/contrib/rnn/__init__.py
+++ b/tensorflow/contrib/rnn/__init__.py
@@ -42,6 +42,8 @@ See @{$python/contrib.rnn} guide.
 @@GridLSTMCell
 @@BidirectionalGridLSTMCell
 @@NASCell
+@@UGRNNCell
+@@IntersectionRNNCell
 @@PhasedLSTMCell
 
 ### RNNCell wrappers
-- 
GitLab


From ed108f7d27a0df53d8ca97dd49660f8d71c47236 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 06:06:39 -0800
Subject: [PATCH 0570/1563] Properly aggregate memcpyH2DAsync in the "per node
 type" summaries in StatSummarizer. Change: 153705191

---
 tensorflow/core/util/stat_summarizer.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/util/stat_summarizer.cc b/tensorflow/core/util/stat_summarizer.cc
index f8f071e0fa..8300ba370e 100644
--- a/tensorflow/core/util/stat_summarizer.cc
+++ b/tensorflow/core/util/stat_summarizer.cc
@@ -271,11 +271,14 @@ void StatSummarizer::ComputeStatsByType(
     std::map<string, int64>* node_type_map_time,
     std::map<string, int64>* node_type_map_memory,
     int64* accumulated_us) const {
+  int64 run_count = run_total_us_.count();
+
   for (const auto& det : details_) {
     const string node_name = det.first;
     const Detail& detail = det.second;
 
-    int64 curr_time_val = detail.rel_end_us.avg();
+    int64 curr_time_val =
+        static_cast<int64>(detail.rel_end_us.sum() / run_count);
     *accumulated_us += curr_time_val;
 
     int64 curr_memory_val = detail.mem_used.newest();
-- 
GitLab


From 3cca863359ae32a69689d51e4133b6f3c5499eb2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 06:35:10 -0800
Subject: [PATCH 0571/1563] removing unused variable LLVM_HOST_COMPILER_PATH
 Change: 153707385

---
 .../crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
index b7d6cc61dd..ceebb1e0e6 100755
--- a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
+++ b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
@@ -51,7 +51,6 @@ GCC_HOST_COMPILER_PATH = ('%{gcc_host_compiler_path}')
 
 CURRENT_DIR = os.path.dirname(sys.argv[0])
 NVCC_PATH = CURRENT_DIR + '/../../../cuda/bin/nvcc'
-LLVM_HOST_COMPILER_PATH = ('/usr/bin/gcc')
 PREFIX_DIR = os.path.dirname(GCC_HOST_COMPILER_PATH)
 NVCC_VERSION = '%{cuda_version}'
 
-- 
GitLab


From 3a95e41426dd0745a772914815e23b997419848e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 06:55:26 -0800
Subject: [PATCH 0572/1563] [TF-XLA] Include TF metedata in HLO GraphDef node's
 attributes.

This includes TF op names and op types.
Change: 153708854
---
 .../xla/service/hlo_tfgraph_builder.cc        |  4 ++
 .../xla/service/hlo_tfgraph_builder_test.cc   | 42 +++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
index 7f2f5bedee..fdc1c0ba2d 100644
--- a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
@@ -121,6 +121,10 @@ void HloTfGraphBuilder::SetNodeAttrs(const HloInstruction* instruction,
   attrs["type"].set_s(
       xla::PrimitiveType_Name(instruction->shape().element_type()));
 
+  // Set the framework op (e.g. Tensorflow op) that generated this XLA op.
+  attrs["tf_op_type"].set_s(instruction->metadata().op_type());
+  attrs["tf_op_name"].set_s(instruction->metadata().op_name());
+
   // Set the shape of the output tensor. "_output_shapes" is a special attribute
   // name used by Tensorboard for shapes of output tensors.
   tensorflow::AttrValue shapes;
diff --git a/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
index 3190f2d703..df66408022 100644
--- a/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
@@ -53,6 +53,13 @@ class HloTfGraphBuilderTest : public HloTestBase {
   Shape r0f32_ = ShapeUtil::MakeShape(PrimitiveType::F32, {});
 };
 
+static const tensorflow::AttrValue &GetNodeAttr(const tensorflow::NodeDef &node,
+                                                const string &attr_name) {
+  auto attr = node.attr().find(attr_name);
+  CHECK(attr != node.attr().end());
+  return attr->second;
+}
+
 TEST_F(HloTfGraphBuilderTest, CheckConcatenateDimsAndShapes) {
   auto builder = HloComputation::Builder("Concatenate");
   Shape shape = ShapeUtil::MakeShape(PrimitiveType::F32, {2, 2});
@@ -69,35 +76,34 @@ TEST_F(HloTfGraphBuilderTest, CheckConcatenateDimsAndShapes) {
   EXPECT_EQ(node.name(), "Concatenate/concatenate");
 
   // Check dimensions.
-  auto dims_value = node.attr().find("dims");
-  CHECK(dims_value != node.attr().end());
-  EXPECT_EQ(dims_value->second.list().i_size(), 1);
-  EXPECT_EQ(dims_value->second.list().i(0), 1);
+  auto dims_value = GetNodeAttr(node, "dims");
+  EXPECT_EQ(dims_value.list().i_size(), 1);
+  EXPECT_EQ(dims_value.list().i(0), 1);
 
   // Check shapes.
-  auto shape_value = node.attr().find("_output_shapes");
-  CHECK(shape_value != node.attr().end());
-  EXPECT_EQ(shape_value->second.list().shape_size(), 1);
-  EXPECT_EQ(shape_value->second.list().shape(0).dim_size(), 2);
-  EXPECT_EQ(shape_value->second.list().shape(0).dim(0).size(), 2);
-  EXPECT_EQ(shape_value->second.list().shape(0).dim(1).size(), 4);
+  auto shape_value = GetNodeAttr(node, "_output_shapes");
+  EXPECT_EQ(shape_value.list().shape_size(), 1);
+  EXPECT_EQ(shape_value.list().shape(0).dim_size(), 2);
+  EXPECT_EQ(shape_value.list().shape(0).dim(0).size(), 2);
+  EXPECT_EQ(shape_value.list().shape(0).dim(1).size(), 4);
 }
 
 TEST_F(HloTfGraphBuilderTest, CheckScalarValue) {
   auto builder = HloComputation::Builder("Const");
-  builder.AddInstruction(
+  HloInstruction *instruction = builder.AddInstruction(
       HloInstruction::CreateConstant(LiteralUtil::CreateR0(123)));
+  OpMetadata metadata;
+  metadata.set_op_name("x");
+  metadata.set_op_type("y");
+  instruction->set_metadata(metadata);
   TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
   GraphDef graph_def = generator_.GetGraphDef();
   EXPECT_EQ(graph_def.node_size(), 1);
   const auto &node = graph_def.node(0);
-  auto value = node.attr().find("value");
-  CHECK(value != node.attr().end());
-  EXPECT_EQ(value->second.s(), "123");
-
-  auto type = node.attr().find("type");
-  CHECK(type != node.attr().end());
-  EXPECT_EQ(type->second.s(), "S32");
+  EXPECT_EQ(GetNodeAttr(node, "value").s(), "123");
+  EXPECT_EQ(GetNodeAttr(node, "type").s(), "S32");
+  EXPECT_EQ(GetNodeAttr(node, "tf_op_name").s(), "x");
+  EXPECT_EQ(GetNodeAttr(node, "tf_op_type").s(), "y");
 }
 
 TEST_F(HloTfGraphBuilderTest, SimpleNegateComputation) {
-- 
GitLab


From 88b81ac944dff7e5c1fa820cc442717bbc75f62a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 07:02:35 -0800
Subject: [PATCH 0573/1563] [XLA:HLO] Also clone metadata when cloning
 instructions e.g. in fusion.

Without the metadata, it's hard to correlate HLO instructions to TF ops after fusion.
Change: 153709552
---
 tensorflow/compiler/xla/service/BUILD         |  1 +
 .../compiler/xla/service/hlo_instruction.cc   |  2 ++
 .../xla/service/hlo_instruction_test.cc       | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 7ca2832ec7..1970b213c9 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -178,6 +178,7 @@ cc_test(
     deps = [
         ":hlo",
         "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:protobuf_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:test",
         "//tensorflow/compiler/xla:test_helpers",
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index d15b8236bb..1ede4e963f 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -435,6 +435,7 @@ HloInstruction::CreateSelectAndScatter(
   auto instruction = WrapUnique(new HloInstruction(HloOpcode::kFusion, shape));
   instruction->fusion_kind_ = fusion_kind;
   instruction->set_parent(fused_root->parent());
+  instruction->set_metadata(fused_root->metadata());
   instruction->CloneAndFuseInternal(fused_root);
   instruction->CheckFusionInstruction();
   return instruction;
@@ -858,6 +859,7 @@ std::unique_ptr<HloInstruction> HloInstruction::Clone(const string& suffix) {
       CloneWithNewOperands(shape_, operands_);
   clone->name_ = name() + "." + suffix;
   clone->set_parent(parent());
+  clone->set_metadata(metadata_);
   return clone;
 }
 
diff --git a/tensorflow/compiler/xla/service/hlo_instruction_test.cc b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
index 050fceca9c..eeabc61ec8 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/protobuf_util.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/shape_util.h"
@@ -609,6 +610,25 @@ TEST_F(HloInstructionTest, ChainFusionOp) {
               UnorderedElementsAre(fusion.get(), exp1.get()));
 }
 
+TEST_F(HloInstructionTest, PreserveMetadataInFusionAndClone) {
+  // Create a chain of fused unary ops.
+  auto constant =
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.1f));
+  auto exp1 =
+      HloInstruction::CreateUnary(r0f32_, HloOpcode::kExp, constant.get());
+  auto exp2 = HloInstruction::CreateUnary(r0f32_, HloOpcode::kExp, exp1.get());
+  OpMetadata metadata;
+  metadata.set_op_name("tf_op");
+  exp1->set_metadata(metadata);
+  exp2->set_metadata(metadata);
+
+  auto fusion = HloInstruction::CreateFusion(
+      r0f32_, HloInstruction::FusionKind::kLoop, exp2.get());
+  auto* fused = fusion->FuseInstruction(exp1.get());
+  EXPECT_TRUE(protobuf_util::ProtobufEquals(metadata, fusion->metadata()));
+  EXPECT_TRUE(protobuf_util::ProtobufEquals(metadata, fused->metadata()));
+}
+
 TEST_F(HloInstructionTest, FusionOpWithCalledComputations) {
   // Create a fusion instruction containing a single unary operation.
   const Shape scalar_shape = ShapeUtil::MakeShape(F32, {});
-- 
GitLab


From 7933420df6700e8037da7f06c9cd8e0121fb769a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 07:05:44 -0800
Subject: [PATCH 0574/1563] Adding python_configure.bzl to (partially) replace
 python_config.sh Change: 153709951

---
 configure                                     |   5 +-
 tensorflow/opensource_only/python.build.tpl   |  53 +++++
 .../opensource_only/python_configure.BUILD    |   0
 .../opensource_only/python_configure.bzl.tpl  | 209 ++++++++++++++++++
 tensorflow/workspace.bzl                      |   2 +
 third_party/py/numpy/BUILD                    |   6 +-
 util/python/BUILD                             |  28 +--
 util/python/python_config.sh                  |  76 +------
 8 files changed, 277 insertions(+), 102 deletions(-)
 create mode 100644 tensorflow/opensource_only/python.build.tpl
 create mode 100644 tensorflow/opensource_only/python_configure.BUILD
 create mode 100644 tensorflow/opensource_only/python_configure.bzl.tpl

diff --git a/configure b/configure
index 48a4594da6..47bdd5d018 100755
--- a/configure
+++ b/configure
@@ -86,6 +86,9 @@ while true; do
   PYTHON_BIN_PATH=""
   # Retry
 done
+export PYTHON_BIN_PATH
+write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
+# TODO(ngiraldo): allow the user to optionally set PYTHON_INCLUDE_PATH and NUMPY_INCLUDE_PATH
 
 ## Set up MKL related environment settings
 if false; then # Disable building with MKL for now
@@ -243,7 +246,7 @@ fi
 
 
 # Invoke python_config and set up symlinks to python includes
-./util/python/python_config.sh --setup "$PYTHON_BIN_PATH"
+./util/python/python_config.sh "$PYTHON_BIN_PATH"
 
 # Append CC optimization flags to bazel.rc
 echo >> tools/bazel.rc
diff --git a/tensorflow/opensource_only/python.build.tpl b/tensorflow/opensource_only/python.build.tpl
new file mode 100644
index 0000000000..157834df4b
--- /dev/null
+++ b/tensorflow/opensource_only/python.build.tpl
@@ -0,0 +1,53 @@
+licenses(["restricted"])
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "python_headers",
+    hdrs = select({
+        "windows" : [
+            "python_include_windows",
+        ],
+        "//conditions:default" : [
+            "python_include",
+        ],
+    }),
+    includes = select({
+        "windows" : [
+            "python_include_windows",
+        ],
+        "//conditions:default" : [
+            "python_include",
+        ],
+    }),
+)
+
+cc_library(
+    name = "numpy_headers",
+    hdrs = select({
+        "windows" : [
+            "numpy_include_windows",
+        ],
+        "//conditions:default" : [
+            "numpy_include",
+        ],
+    }),
+    includes = select({
+        "windows" : [
+            "numpy_include_windows",
+        ],
+        "//conditions:default" : [
+            "numpy_include",
+        ],
+    }),
+)
+
+config_setting(
+    name = "windows",
+    values = {"cpu": "x64_windows"},
+    visibility = ["//visibility:public"],
+)
+
+%{PYTHON_INCLUDE_GENRULE}
+
+%{NUMPY_INCLUDE_GENRULE}
diff --git a/tensorflow/opensource_only/python_configure.BUILD b/tensorflow/opensource_only/python_configure.BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tensorflow/opensource_only/python_configure.bzl.tpl b/tensorflow/opensource_only/python_configure.bzl.tpl
new file mode 100644
index 0000000000..40ba5d1539
--- /dev/null
+++ b/tensorflow/opensource_only/python_configure.bzl.tpl
@@ -0,0 +1,209 @@
+# -*- Python -*-
+"""Repository rule for Python autoconfiguration.
+
+`python_configure` depends on the following environment variables:
+
+  * `NUMPY_INCLUDE_PATH`: Location of Numpy libraries.
+  * `PYTHON_BIN_PATH`: location of python binary.
+  * `PYTHON_INCLUDE_PATH`: Location of python binaries.
+"""
+
+_NUMPY_INCLUDE_PATH = "NUMPY_INCLUDE_PATH"
+_PYTHON_BIN_PATH = "PYTHON_BIN_PATH"
+_PYTHON_INCLUDE_PATH = "PYTHON_INCLUDE_PATH"
+
+
+def _tpl(repository_ctx, tpl, substitutions={}, out=None):
+  if not out:
+    out = tpl
+  repository_ctx.template(
+      out,
+      Label("//third_party/py:%s.tpl" % tpl),
+      substitutions)
+
+
+def _python_configure_warning(msg):
+  """Output warning message during auto configuration."""
+  yellow = "\033[1;33m"
+  no_color = "\033[0m"
+  print("\n%sPython Configuration Warning:%s %s\n" % (yellow, no_color, msg))
+
+
+def _python_configure_fail(msg):
+  """Output failure message when auto configuration fails."""
+  red = "\033[0;31m"
+  no_color = "\033[0m"
+  fail("\n%sPython Configuration Error:%s %s\n" % (red, no_color, msg))
+
+
+def _get_env_var(repository_ctx, name, default = None, enable_warning = True):
+  """Find an environment variable in system path."""
+  if name in repository_ctx.os.environ:
+    return repository_ctx.os.environ[name]
+  if default != None:
+    if enable_warning:
+      _python_configure_warning(
+          "'%s' environment variable is not set, using '%s' as default" % (name, default))
+    return default
+  _python_configure_fail("'%s' environment variable is not set" % name)
+
+
+def _is_windows(repository_ctx):
+  """Returns true if the host operating system is windows."""
+  os_name = repository_ctx.os.name.lower()
+  if os_name.find("windows") != -1:
+    return True
+  return False
+
+
+def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name):
+  """returns a genrule to symlink all files in a directory."""
+  # Get the list of files under this directory
+  find_result = None
+  line_break = None
+  if _is_windows(repository_ctx):
+    line_break = '\r\n'
+    find_result = repository_ctx.execute([
+        "dir", src_dir, "/b", "/s", "/a-d",
+    ])
+  else:
+    line_break = '\n'
+    find_result = repository_ctx.execute([
+        "find", src_dir, "-follow", "-type", "f",
+    ])
+  # Create a list with the src_dir stripped to use for outputs.
+  dest_files = find_result.stdout.replace(src_dir, '').split(line_break)
+  src_files = find_result.stdout.split(line_break)
+  command = []
+  command_windows = []
+  outs = []
+  outs_windows = []
+  for i in range(len(dest_files)):
+    if dest_files[i] != "":
+      command.append('ln -s ' + src_files[i] + ' $(@D)/' +
+                     dest_dir + dest_files[i])
+      # ln -sf is actually implemented as copying in msys since creating
+      # symbolic links is privileged on Windows. But copying is too slow, so
+      # invoke mklink to create junctions on Windows.
+      command_windows.append('mklink /J ' + src_files[i] + ' $(@D)/' +
+                             dest_dir + dest_files[i])
+      outs.append('      "' + dest_dir + dest_files[i] + '",')
+      outs_windows.append('      "' + dest_dir + '_windows' +
+                          dest_files[i] + '",')
+  genrule = _genrule(src_dir, genrule_name, ' && '.join(command),
+                     '\n'.join(outs))
+  genrule_windows = _genrule(src_dir, genrule_name + '_windows',
+                             "cmd /c \"" + ' && '.join(command_windows) + "\"",
+                             '\n'.join(outs_windows))
+  return genrule + '\n' + genrule_windows
+
+
+def _genrule(src_dir, genrule_name, command, outs):
+  """Returns a string with a genrule.
+
+  Genrule executes the given command and produces the given outputs.
+  """
+  return (
+      'genrule(\n' +
+      '    name = "' +
+      genrule_name + '",\n' +
+      '    outs = [\n' +
+      outs +
+      '    ],\n' +
+      '    cmd = """\n' +
+      command +
+      '    """,\n' +
+      ')\n'
+  )
+
+
+def _check_python_bin(repository_ctx, python_bin):
+  """Checks the python bin path."""
+  cmd =  '[[ -x "%s" ]] && [[ ! -d "%s" ]]' % (python_bin, python_bin)
+  result = repository_ctx.execute(["bash", "-c", cmd])
+  if result.return_code == 1:
+    _python_configure_fail(
+        "PYTHON_BIN_PATH is not executable.  Is it the python binary?")
+
+
+def _get_python_include(repository_ctx, python_bin):
+  """Gets the python include path."""
+  result = repository_ctx.execute([python_bin, "-c",
+                                   'from __future__ import print_function;' +
+                                   'from distutils import sysconfig;' +
+                                   'print(sysconfig.get_python_inc())'])
+  if result == "":
+    _python_configure_fail(
+        "Problem getting python include path.  Is distutils installed?")
+  return result.stdout.splitlines()[0]
+
+
+def _get_numpy_include(repository_ctx, python_bin):
+  """Gets the numpy include path."""
+  result = repository_ctx.execute([python_bin, "-c",
+                                   'from __future__ import print_function;' +
+                                   'import numpy;' +
+                                   ' print(numpy.get_include());'])
+  if result == "":
+    _python_configure_fail(
+        "Problem getting numpy include path.  Is numpy installed?")
+  return result.stdout.splitlines()[0]
+
+
+def _create_python_repository(repository_ctx):
+  """Creates the repository containing files set up to build with Python."""
+  python_include = None
+  numpy_include = None
+  # If local checks were requested, the python and numpy include will be auto
+  # detected on the host config (using _PYTHON_BIN_PATH).
+  if repository_ctx.attr.local_checks:
+    python_bin = _get_env_var(repository_ctx, _PYTHON_BIN_PATH)
+    _check_python_bin(repository_ctx, python_bin)
+    python_include = _get_python_include(repository_ctx, python_bin)
+    numpy_include = _get_numpy_include(repository_ctx, python_bin) + '/numpy'
+  else:
+    # Otherwise, we assume user provides all paths (via ENV or attrs)
+    python_include = _get_env_var(repository_ctx, _PYTHON_INCLUDE_PATH,
+                                  repository_ctx.attr.python_include)
+    numpy_include = _get_env_var(repository_ctx, _NUMPY_INCLUDE_PATH,
+                                 repository_ctx.attr.numpy_include) + '/numpy'
+
+  python_include_rule = _symlink_genrule_for_dir(
+      repository_ctx, python_include, 'python_include', 'python_include')
+  numpy_include_rule = _symlink_genrule_for_dir(
+      repository_ctx, numpy_include, 'numpy_include', 'numpy_include')
+  _tpl(repository_ctx, "BUILD", {
+      "%{PYTHON_INCLUDE_GENRULE}": python_include_rule,
+      "%{NUMPY_INCLUDE_GENRULE}": numpy_include_rule,
+  })
+
+
+def _python_autoconf_impl(repository_ctx):
+  """Implementation of the python_autoconf repository rule."""
+  _create_python_repository(repository_ctx)
+
+
+python_configure = repository_rule(
+    implementation = _python_autoconf_impl,
+    attrs = {
+        "local_checks": attr.bool(mandatory = False, default = True),
+        "python_include": attr.string(mandatory = False),
+        "numpy_include": attr.string(mandatory = False),
+    },
+    environ = [
+        _PYTHON_BIN_PATH,
+        _PYTHON_INCLUDE_PATH,
+        _NUMPY_INCLUDE_PATH,
+    ],
+)
+"""Detects and configures the local Python.
+
+Add the following to your WORKSPACE FILE:
+
+```python
+python_configure(name = "local_config_python")
+```
+
+Args:
+  name: A unique name for this workspace rule.
+"""
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index c29d1a6cf6..cec69b427c 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -5,6 +5,7 @@ load("//third_party/sycl:sycl_configure.bzl", "sycl_configure")
 load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
+load("//third_party/py:python_configure.bzl", "python_configure")
 
 
 # Parse the bazel version string from `native.bazel_version`.
@@ -119,6 +120,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   check_version("0.4.5")
   cuda_configure(name="local_config_cuda")
   sycl_configure(name="local_config_sycl")
+  python_configure(name="local_config_python")
   if path_prefix:
     print("path_prefix was specified to tf_workspace but is no longer used " +
           "and will be removed in the future.")
diff --git a/third_party/py/numpy/BUILD b/third_party/py/numpy/BUILD
index 1d461505a6..be8332572b 100644
--- a/third_party/py/numpy/BUILD
+++ b/third_party/py/numpy/BUILD
@@ -8,11 +8,9 @@ py_library(
     srcs_version = "PY2AND3",
 )
 
-cc_library(
+alias(
     name = "headers",
-    hdrs = glob(["numpy_include/**/*.h"]),
-    data = ["//util/python:python_checked"],
-    includes = ["numpy_include"],
+    actual = "@local_config_python//:numpy_headers",
 )
 
 genrule(
diff --git a/util/python/BUILD b/util/python/BUILD
index 29688b875d..96daf9947a 100644
--- a/util/python/BUILD
+++ b/util/python/BUILD
@@ -2,31 +2,7 @@ licenses(["restricted"])
 
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
+alias(
     name = "python_headers",
-    hdrs = glob([
-        "python_include/**/*.h",
-    ]),
-    data = [":python_checked"],
-    includes = ["python_include"],
-)
-
-genrule(
-    name = "python_check",
-    srcs = [
-        "python_config.sh",
-        "configure_files",
-    ],
-    outs = [
-        "python_checked",
-    ],
-    cmd = "OUTPUTDIR=\"$(@D)/\"; $(location :python_config.sh) --check && touch $$OUTPUTDIR/python_checked",
-    local = 1,
-)
-
-filegroup(
-    name = "configure_files",
-    data = glob([
-        "*",
-    ]),
+    actual = "@local_config_python//:python_headers",
 )
diff --git a/util/python/python_config.sh b/util/python/python_config.sh
index 4b18bf3578..d5762ad456 100755
--- a/util/python/python_config.sh
+++ b/util/python/python_config.sh
@@ -26,23 +26,9 @@ else
   script_path=${script_path:-.}
 fi
 
-EXPECTED_PATHS="$script_path/util/python/python_include"\
-" $script_path/util/python/python_lib"\
-" $script_path/third_party/py/numpy/numpy_include"
-
 function main {
-  argument="$1"
-  shift
-  case $argument in
-    --check)
-      check_python
-      exit 0
-      ;;
-    --setup)
-      setup_python "$1"
-      exit 0
-      ;;
-  esac
+  setup_python "$1"
+  exit 0
 }
 
 function python_path {
@@ -93,6 +79,7 @@ END
 function setup_python {
   PYTHON_BIN_PATH="$1";
 
+  # TODO(ngiraldo): move most of these checks to root configure
   if [ -z "$PYTHON_BIN_PATH" ]; then
     echo "PYTHON_BIN_PATH was not provided.  Did you run configure?"
     exit 1
@@ -108,12 +95,7 @@ function setup_python {
     exit 1
   fi
 
-  local python_include="$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; from distutils import sysconfig; print(sysconfig.get_python_inc());')"
-  if [ "$python_include" == "" ]; then
-    echo -e "\n\nERROR: Problem getting python include path.  Is distutils installed?"
-    exit 1
-  fi
-
+  # TODO(ngiraldo): confirm if these checks are really necessary, remove if not
   if [ -z "$PYTHON_LIB_PATH" ]; then
     local python_lib_path
     # Split python_path into an array of paths, this allows path containing spaces
@@ -149,35 +131,12 @@ function setup_python {
     exit 1
   fi
 
-  local numpy_include=$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; import numpy; print(numpy.get_include());')
-  if [ "$numpy_include" == "" ]; then
-    echo -e "\n\nERROR: Problem getting numpy include path.  Is numpy installed?"
-    exit 1
-  fi
-
-  for x in $EXPECTED_PATHS; do
-    if [ -e "$x" ]; then
-      rm -rf "$x"
-    fi
-  done
-
-# ln -sf is actually implemented as copying in msys since creating symbolic
-# links is privileged on Windows. But copying is too slow, so invoke mklink
-# to create junctions on Windows.
-  if is_windows; then
-    cmd /c "mklink /J util\\python\\python_include \"${python_include}\""
-    cmd /c "mklink /J util\\python\\python_lib \"${python_lib}\""
-    cmd /c "mklink /J third_party\\py\\numpy\\numpy_include \"${numpy_include}\""
-  else
-    ln -sf "${python_include}" util/python/python_include
-    ln -sf "${python_lib}" util/python/python_lib
-    ln -sf "${numpy_include}" third_party/py/numpy/numpy_include
-  fi
   # Convert python path to Windows style before writing into bazel.rc
   if is_windows; then
     PYTHON_BIN_PATH="$(cygpath -m "$PYTHON_BIN_PATH")"
   fi
 
+  # TODO(ngiraldo): move all below to root configure
   # Write tools/bazel.rc
   echo "# Autogenerated by configure: DO NOT EDIT" > tools/bazel.rc
   sed -e "s/\$PYTHON_MAJOR_VERSION/$python_major_version/g" \
@@ -197,29 +156,4 @@ function is_windows() {
   fi
 }
 
-function check_python {
-  for x in $EXPECTED_PATHS; do
-    if [ ! -e "$x" ]; then
-      echo -e "\n\nERROR: Cannot find '${x}'.  Did you run configure?\n\n" 1>&2
-      exit 1
-    fi
-    # Don't check symbolic link on Windows
-    if ! is_windows && [ ! -L "${x}" ]; then
-      echo -e "\n\nERROR: '${x}' is not a symbolic link.  Internal error.\n\n" 1>&2
-      exit 1
-    fi
-    if is_windows; then
-      # In msys, readlink <path> doesn't work, because no symbolic link on
-      # Windows. readlink -f <path> returns the real path of a junction.
-      true_path=$(readlink -f "${x}")
-    else
-      true_path=$(readlink "${x}")
-    fi
-    if [ ! -d "${true_path}" ]; then
-      echo -e "\n\nERROR: '${x}' does not refer to an existing directory: ${true_path}.  Do you need to rerun configure?\n\n" 1>&2
-      exit 1
-    fi
-  done
-}
-
 main "$@"
-- 
GitLab


From 79d6be3b86ba32048cac6afd5d1c5d1bb8aee6d9 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Thu, 20 Apr 2017 08:18:28 -0800
Subject: [PATCH 0575/1563] Internal C API headers. Change: 153717143

---
 tensorflow/c/BUILD            |  18 ++++++
 tensorflow/c/c_api.cc         |  85 +------------------------
 tensorflow/c/c_api_internal.h | 116 ++++++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+), 84 deletions(-)
 create mode 100644 tensorflow/c/c_api_internal.h

diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index af96ce70b6..4ad69ae3fb 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -26,6 +26,22 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+tf_cuda_library(
+    name = "c_api_internal",
+    srcs = ["c_api.h"],
+    hdrs = ["c_api_internal.h"],
+    deps = select({
+        "//tensorflow:android": [
+            "//tensorflow/core:android_tensorflow_lib_lite",
+        ],
+        "//conditions:default": [
+            "//tensorflow/core:core_cpu",
+            "//tensorflow/core:framework",
+            "//tensorflow/core:lib",
+        ],
+    }),
+)
+
 tf_cuda_library(
     name = "c_api",
     srcs = ["c_api.cc"],
@@ -34,9 +50,11 @@ tf_cuda_library(
     visibility = ["//visibility:public"],
     deps = select({
         "//tensorflow:android": [
+            ":c_api_internal",
             "//tensorflow/core:android_tensorflow_lib_lite",
         ],
         "//conditions:default": [
+            ":c_api_internal",
             "//tensorflow/cc/saved_model:loader",
             "//tensorflow/cc:gradients",
             "//tensorflow/cc:ops",
diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index 7ef7e3c540..0f66a47b4a 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -26,6 +26,7 @@ limitations under the License.
 #include "tensorflow/cc/framework/scope_internal.h"
 #include "tensorflow/cc/saved_model/loader.h"
 #endif
+#include "tensorflow/c/c_api_internal.h"
 #include "tensorflow/core/common_runtime/shape_refiner.h"
 #include "tensorflow/core/framework/log_memory.h"
 #include "tensorflow/core/framework/node_def_util.h"
@@ -96,9 +97,6 @@ size_t TF_DataTypeSize(TF_DataType dt) {
 }
 
 // --------------------------------------------------------------------------
-struct TF_Status {
-  Status status;
-};
 
 TF_Status* TF_NewStatus() { return new TF_Status; }
 
@@ -182,12 +180,6 @@ Status MessageToBuffer(const tensorflow::protobuf::Message& in,
 
 }  // namespace
 
-struct TF_Tensor {
-  TF_DataType dtype;
-  TensorShape shape;
-  TensorBuffer* buffer;
-};
-
 TF_Tensor* TF_AllocateTensor(TF_DataType dtype, const int64_t* dims,
                              int num_dims, size_t len) {
   void* data = allocate_tensor("TF_AllocateTensor", len);
@@ -292,9 +284,6 @@ size_t TF_StringEncodedSize(size_t len) {
 }
 
 // --------------------------------------------------------------------------
-struct TF_SessionOptions {
-  SessionOptions options;
-};
 TF_SessionOptions* TF_NewSessionOptions() { return new TF_SessionOptions; }
 void TF_DeleteSessionOptions(TF_SessionOptions* opt) { delete opt; }
 
@@ -335,9 +324,6 @@ void TF_DeleteBuffer(TF_Buffer* buffer) {
 TF_Buffer TF_GetBuffer(TF_Buffer* buffer) { return *buffer; }
 
 // --------------------------------------------------------------------------
-struct TF_DeprecatedSession {
-  Session* session;
-};
 
 TF_DeprecatedSession* TF_NewDeprecatedSession(const TF_SessionOptions* opt,
                                               TF_Status* status) {
@@ -701,11 +687,6 @@ void TF_PRun(TF_DeprecatedSession* s, const char* handle,
                 c_outputs, target_oper_names, nullptr, status);
 }
 
-struct TF_Library {
-  void* lib_handle;
-  TF_Buffer op_list;
-};
-
 TF_Library* TF_LoadLibrary(const char* library_filename, TF_Status* status) {
   TF_Library* lib_handle = new TF_Library;
   status->status = tensorflow::LoadLibrary(
@@ -742,66 +723,6 @@ TF_Buffer* TF_GetAllOpList() {
 // --------------------------------------------------------------------------
 // New Graph and Session API
 
-// Structures -----------------------------------------------------------------
-
-extern "C" {
-
-struct TF_Graph {
-  TF_Graph()
-      : graph(OpRegistry::Global()),
-        refiner(graph.versions().producer(), graph.op_registry()),
-        num_sessions(0),
-        delete_requested(false),
-        parent(nullptr),
-        parent_inputs(nullptr) {}
-  mutex mu;
-  Graph graph GUARDED_BY(mu);
-
-  // Runs shape inference.
-  tensorflow::ShapeRefiner refiner GUARDED_BY(mu);
-
-  // Maps from name of an operation to the Node* in 'graph'.
-  std::unordered_map<tensorflow::string, Node*> name_map GUARDED_BY(mu);
-
-  // TF_Graph may only / must be deleted when
-  //   num_sessions == 0 && delete_requested == true
-
-  // num_sessions incremented by TF_NewSession, and decremented by
-  // TF_DeleteSession.
-  int num_sessions GUARDED_BY(mu);
-  bool delete_requested GUARDED_BY(mu);  // set true by TF_DeleteGraph
-
-  // Used to link graphs contained in TF_WhileParams to the parent graph that
-  // will eventually contain the full while loop.
-  TF_Graph* parent;
-  TF_Output* parent_inputs;
-};
-
-struct TF_OperationDescription {
-  TF_OperationDescription(TF_Graph* g, const char* op_type,
-                          const char* node_name)
-      : node_builder(node_name, op_type, g->graph.op_registry()), graph(g) {}
-
-  NodeBuilder node_builder;
-  TF_Graph* graph;
-  std::vector<tensorflow::string> colocation_constraints;
-};
-
-struct TF_Operation {
-  Node node;
-};
-
-struct TF_Session {
-  TF_Session(Session* s, TF_Graph* g)
-      : session(s), graph(g), last_num_graph_nodes(0) {}
-  Session* session;
-  TF_Graph* graph;
-  mutex mu;
-  int last_num_graph_nodes;
-};
-
-}  // end extern "C"
-
 // Helper functions -----------------------------------------------------------
 
 namespace {
@@ -1691,10 +1612,6 @@ void TF_GraphToGraphDef(TF_Graph* graph, TF_Buffer* output_graph_def,
   status->status = MessageToBuffer(def, output_graph_def);
 }
 
-struct TF_ImportGraphDefOptions {
-  tensorflow::ImportGraphDefOptions opts;
-};
-
 TF_ImportGraphDefOptions* TF_NewImportGraphDefOptions() {
   return new TF_ImportGraphDefOptions;
 }
diff --git a/tensorflow/c/c_api_internal.h b/tensorflow/c/c_api_internal.h
new file mode 100644
index 0000000000..b5320d20da
--- /dev/null
+++ b/tensorflow/c/c_api_internal.h
@@ -0,0 +1,116 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/c/c_api.h"
+
+#include <vector>
+#include <unordered_map>
+
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/platform/mutex.h"
+#include "tensorflow/core/public/session.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/graph/graph.h"
+#include "tensorflow/core/graph/graph_constructor.h"
+#include "tensorflow/core/graph/node_builder.h"
+#include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/common_runtime/shape_refiner.h"
+
+
+// Internal structures used by the C API. These are likely to change and should
+// not be depended on.
+
+struct TF_Status {
+  tensorflow::Status status;
+};
+
+struct TF_Tensor {
+  TF_DataType dtype;
+  tensorflow::TensorShape shape;
+  tensorflow::TensorBuffer* buffer;
+};
+
+struct TF_SessionOptions {
+  tensorflow::SessionOptions options;
+};
+
+struct TF_DeprecatedSession {
+  tensorflow::Session* session;
+};
+
+struct TF_Library {
+  void* lib_handle;
+  TF_Buffer op_list;
+};
+
+struct TF_Graph {
+  TF_Graph()
+      : graph(tensorflow::OpRegistry::Global()),
+        refiner(graph.versions().producer(), graph.op_registry()),
+        num_sessions(0),
+        delete_requested(false),
+        parent(nullptr),
+        parent_inputs(nullptr) {}
+  tensorflow::mutex mu;
+  tensorflow::Graph graph GUARDED_BY(mu);
+
+  // Runs shape inference.
+  tensorflow::ShapeRefiner refiner GUARDED_BY(mu);
+
+  // Maps from name of an operation to the Node* in 'graph'.
+  std::unordered_map<tensorflow::string, tensorflow::Node*> name_map
+      GUARDED_BY(mu);
+
+  // TF_Graph may only / must be deleted when
+  //   num_sessions == 0 && delete_requested == true
+
+  // num_sessions incremented by TF_NewSession, and decremented by
+  // TF_DeleteSession.
+  int num_sessions GUARDED_BY(mu);
+  bool delete_requested GUARDED_BY(mu);  // set true by TF_DeleteGraph
+
+  // Used to link graphs contained in TF_WhileParams to the parent graph that
+  // will eventually contain the full while loop.
+  TF_Graph* parent;
+  TF_Output* parent_inputs;
+};
+
+struct TF_OperationDescription {
+  TF_OperationDescription(TF_Graph* g, const char* op_type,
+                          const char* node_name)
+      : node_builder(node_name, op_type, g->graph.op_registry()), graph(g) {}
+
+  tensorflow::NodeBuilder node_builder;
+  TF_Graph* graph;
+  std::vector<tensorflow::string> colocation_constraints;
+};
+
+struct TF_Operation {
+  tensorflow::Node node;
+};
+
+struct TF_Session {
+  TF_Session(tensorflow::Session* s, TF_Graph* g)
+      : session(s), graph(g), last_num_graph_nodes(0) {}
+  tensorflow::Session* session;
+  TF_Graph* graph;
+  tensorflow::mutex mu;
+  int last_num_graph_nodes;
+};
+
+struct TF_ImportGraphDefOptions {
+  tensorflow::ImportGraphDefOptions opts;
+};
-- 
GitLab


From f12c967893eaab978963d9bb887bff7bcd099839 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 20 Apr 2017 08:27:45 -0800
Subject: [PATCH 0576/1563] Create a per session inter op thread pool instead
 of relying on a global thread pool: this ensures that the thread pool is
 reset whenever the session is reset. Change: 153718067

---
 tensorflow/core/grappler/clusters/single_machine.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 9e96cc1e91..219d95acdf 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -41,7 +41,10 @@ SingleMachine::SingleMachine(int timeout_s, int num_cpu_cores, int num_gpus)
   }
   CHECK_GE(num_cpu_cores, 1);
   options_.config.set_intra_op_parallelism_threads(num_cpu_cores);
-  options_.config.set_inter_op_parallelism_threads(num_cpu_cores);
+  // Create a session specific thread pool to ensure the threads are reset when
+  // the session is reset.
+  options_.config.add_session_inter_op_thread_pool()->set_num_threads(
+      num_cpu_cores);
   if (timeout_s > 0) {
     options_.config.set_operation_timeout_in_ms(timeout_s * 1000);
   }
-- 
GitLab


From cbebbc032971e44522d1e76b3be670cc58feaa72 Mon Sep 17 00:00:00 2001
From: Dominic Rossi <swsboarder366@gmail.com>
Date: Thu, 20 Apr 2017 09:47:55 -0700
Subject: [PATCH 0577/1563] Fix no attribute prediction_key error (#8758)

---
 tensorflow/docs_src/get_started/monitors.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tensorflow/docs_src/get_started/monitors.md b/tensorflow/docs_src/get_started/monitors.md
index 99d583b23d..7db88c8981 100644
--- a/tensorflow/docs_src/get_started/monitors.md
+++ b/tensorflow/docs_src/get_started/monitors.md
@@ -282,18 +282,15 @@ validation_metrics = {
     "accuracy":
         tf.contrib.learn.MetricSpec(
             metric_fn=tf.contrib.metrics.streaming_accuracy,
-            prediction_key=tf.contrib.learn.prediction_key.PredictionKey.
-            CLASSES),
+            prediction_key=tf.contrib.learn.PredictionKey.CLASSES),
     "precision":
         tf.contrib.learn.MetricSpec(
             metric_fn=tf.contrib.metrics.streaming_precision,
-            prediction_key=tf.contrib.learn.prediction_key.PredictionKey.
-            CLASSES),
+            prediction_key=tf.contrib.learn.PredictionKey.CLASSES),
     "recall":
         tf.contrib.learn.MetricSpec(
             metric_fn=tf.contrib.metrics.streaming_recall,
-            prediction_key=tf.contrib.learn.prediction_key.PredictionKey.
-            CLASSES)
+            prediction_key=tf.contrib.learn.PredictionKey.CLASSES)
 }
 ```
 
-- 
GitLab


From 900652aed4a3ce3f363b60d9256d7861465aa75d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 08:32:57 -0800
Subject: [PATCH 0578/1563] Automated rollback of change 153358570 Change:
 153718592

---
 tensorflow/contrib/layers/python/layers/optimizers.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/optimizers.py b/tensorflow/contrib/layers/python/layers/optimizers.py
index 9b6666477f..1a6dfc12e9 100644
--- a/tensorflow/contrib/layers/python/layers/optimizers.py
+++ b/tensorflow/contrib/layers/python/layers/optimizers.py
@@ -107,13 +107,8 @@ def optimize_loss(loss,
     gradient_noise_scale: float or None, adds 0-mean normal noise scaled by this
                           value.
     gradient_multipliers: dict of variables or variable names to floats.
-                          Most often it should be an instance of
-                          collections.defaultdict(lambda: 1.0), so that
-                          unspecified variable would still be updated with
-                          normal rate. If a common dict is provided, only
-                          gradients for specified variables will be
-                          multiplied by given constant and unspecified
-                          gradients will be dropped.
+                          If present, gradients for specified
+                          variables will be multiplied by given constant.
     clip_gradients: float, callable or `None`. If float, is provided, a global
       clipping is applied to prevent the norm of the gradient to exceed this
       value. Alternatively, a callable can be provided e.g.: adaptive_clipping.
-- 
GitLab


From 5548a44a49823cde3127dd61a0239b7d7cc03ccd Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Thu, 20 Apr 2017 10:27:38 -0700
Subject: [PATCH 0579/1563] Updating version to 1.1.0 and patching
 update_version to include the extension from version.h

---
 README.md                                     | 12 +++++-----
 tensorflow/core/public/version.h              |  2 +-
 tensorflow/docs_src/install/install_c.md      |  2 +-
 tensorflow/docs_src/install/install_go.md     |  2 +-
 tensorflow/docs_src/install/install_java.md   | 16 +++++++-------
 tensorflow/docs_src/install/install_linux.md  | 22 +++++++++----------
 tensorflow/docs_src/install/install_mac.md    | 14 ++++++------
 .../docs_src/install/install_sources.md       |  4 ++--
 .../docs_src/install/install_windows.md       |  4 ++--
 tensorflow/tools/ci_build/update_version.sh   |  5 ++++-
 tensorflow/tools/pip_package/setup.py         |  2 +-
 11 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index c0e753fa67..e56e73c322 100644
--- a/README.md
+++ b/README.md
@@ -33,12 +33,12 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index 9ad3cb2a39..5ce475abd0 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -24,7 +24,7 @@ limitations under the License.
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
-#define TF_VERSION_SUFFIX "-rc2"
+#define TF_VERSION_SUFFIX ""
 
 #define TF_STR_HELPER(x) #x
 #define TF_STR(x) TF_STR_HELPER(x)
diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index c1581efb4f..c1c7b66546 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index dd713e4786..c9abaf2aca 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc2.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 948f5aa17c..56c4b8d2c5 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc2</version>
+  <version>1.1.0</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0-rc2</version>
+                 <version>1.1.0</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc2.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0-rc2.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -213,7 +213,7 @@ two files are available to the JVM:
 
 For example, the following command line executes the `HelloTF` program:
 
-<pre><b>java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index 67abdae044..9dc27c4a4d 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      virtualenv environment:
 
      <pre>(tensorflow)$ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -268,7 +268,7 @@ take the following steps:
 
      <pre>
      $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl</b>
      </pre>
 
      If this step fails, see
@@ -455,7 +455,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -622,14 +622,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -641,14 +641,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -660,14 +660,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -679,14 +679,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index 4cb1646af1..f7fb210b52 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -286,7 +286,7 @@ take the following steps:
      support, issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b> </pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
      [Common installation problems](#CommonInstallationProblems).
@@ -398,7 +398,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      TensorFlow for Python 2.7:
 
      <pre> (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0-py2-none-any.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -594,13 +594,13 @@ This section documents the relevant values for Mac OS installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0-py2-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0-py2-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
@@ -612,13 +612,13 @@ Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0-py3-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0-py3-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 879eae34df..45b86368f4 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -319,10 +319,10 @@ $ <b>bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pk
 Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
-for TensorFlow 1.1.0rc2 on Linux:
+for TensorFlow 1.1.0 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc2-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index c6bce00d0f..50413107ff 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index e0ca8c3259..682f5329f5 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -73,8 +73,11 @@ OLD_MAJOR=$(cat ${VERSION_H} | grep -E "^#define TF_MAJOR_VERSION [0-9]+" | \
 cut -d ' ' -f 3)
 OLD_MINOR=$(cat ${VERSION_H} | grep -E "^#define TF_MINOR_VERSION [0-9]+" | \
 cut -d ' ' -f 3)
-OLD_PATCH=$(cat ${VERSION_H} | grep -E "^#define TF_PATCH_VERSION [[:alnum:]-]+" | \
+OLD_PATCH_NUM=$(cat ${VERSION_H} | grep -E "^#define TF_PATCH_VERSION [[:alnum:]-]+" | \
 cut -d ' ' -f 3)
+OLD_EXTENSION=$(cat ${VERSION_H} | grep -E "^#define TF_VERSION_SUFFIX \"[[:alnum:]-]+\"" | \
+cut -d ' ' -f 3)
+OLD_PATCH="$OLD_PATCH_NUM${OLD_EXTENSION//\"}"
 OLD_PIP_PATCH="${OLD_PATCH//-}"
 
 sed -i -e "s/^#define TF_MAJOR_VERSION ${OLD_MAJOR}/#define TF_MAJOR_VERSION ${MAJOR}/g" ${VERSION_H}
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 0e528ae63c..7001f7ae89 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc2'
+_VERSION = '1.1.0'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
-- 
GitLab


From a58aabbf1f67bae4af43fe9cd82b7faf6236ab87 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 09:09:57 -0800
Subject: [PATCH 0580/1563] Update nccl to a newer version, removed patching of
 nccl on download. Change: 153722905

---
 tensorflow/workspace.bzl | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index cec69b427c..5ab91b69a1 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -571,14 +571,12 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "nccl_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
-          "https://github.com/nvidia/nccl/archive/024d1e267845f2ed06f3e2e42476d50f04a00ee6.tar.gz",
-      ],
-      sha256 = "6787f0eed88d52ee8e32956fa4947d92c139da469f1d8e311c307f27d641118e",
-      strip_prefix = "nccl-024d1e267845f2ed06f3e2e42476d50f04a00ee6",
-      build_file = str(Label("//third_party/nccl:nccl.BUILD")),
-      # TODO: Remove patching after the fix is merged into nccl(see https://github.com/NVIDIA/nccl/pull/78)
-      patch_file = str(Label("//third_party/nccl:fix_clang_compilation.patch")),
+          "http://bazel-mirror.storage.googleapis.com/github.com/nvidia/nccl/archive/ccfc4567dc3e2a37fb42cfbc64d10eb526e7da7b.tar.gz",
+          "https://github.com/nvidia/nccl/archive/ccfc4567dc3e2a37fb42cfbc64d10eb526e7da7b.tar.gz",
+      ],
+      sha256 = "6c34a0862d9f8ed4ad5984c6a8206b351957bb14cf6ad7822720f285f4aada04",
+      strip_prefix = "nccl-ccfc4567dc3e2a37fb42cfbc64d10eb526e7da7b",
+      build_file = str(Label("//third_party:nccl.BUILD")),
       repository = tf_repo_name,
   )
 
-- 
GitLab


From e8082d5780c8763b3aefd27a90b632eef832eb1c Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Thu, 20 Apr 2017 09:34:42 -0800
Subject: [PATCH 0581/1563] Mention RDMA support in the release notes. Change:
 153726368

---
 RELEASE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE.md b/RELEASE.md
index 33fce86bf4..e05a979c4f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -2,6 +2,7 @@
 
 ## Major Features and Improvements
 * Added `tf.Session.make_callable()`, which provides a lower overhead means of running a similar step multiple times.
+* Added ibverbs-based RDMA support to contrib (courtesy @junshi15 from Yahoo).
 
 
 # Release 1.1.0
-- 
GitLab


From 733af539ea1f847de2f209452e9a6120f56315bd Mon Sep 17 00:00:00 2001
From: Dominic Rossi <swsboarder366@gmail.com>
Date: Thu, 20 Apr 2017 10:56:12 -0700
Subject: [PATCH 0582/1563] Fix uninitialized local variable (#8783)

---
 .../how_tos/reading_data/fully_connected_preloaded_var.py      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py b/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py
index 8cd296d752..e29387ab9d 100644
--- a/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py
+++ b/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py
@@ -88,7 +88,8 @@ def run_training():
     saver = tf.train.Saver()
 
     # Create the op for initializing variables.
-    init_op = tf.global_variables_initializer()
+    init_op = tf.group(tf.global_variables_initializer(),
+                       tf.local_variables_initializer())
 
     # Create a session for running Ops on the Graph.
     sess = tf.Session()
-- 
GitLab


From a977909aeaa28b9883f90f560d3b756675fc12b0 Mon Sep 17 00:00:00 2001
From: Harun Gunaydin <harun@drexel.edu>
Date: Thu, 20 Apr 2017 14:04:18 -0400
Subject: [PATCH 0583/1563] Update resnet_v2.py

I've added "resnet_arg_scope = resnet_utils.resnet_arg_scope" line to make sure that user can call resnet_v2.resnet_arg_scope(is_training). It is also present in resnet_v1.py
---
 tensorflow/contrib/slim/python/slim/nets/resnet_v2.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
index 7e6fe5dfc2..87fd4c76a0 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
@@ -63,6 +63,8 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import variable_scope
 
+resnet_arg_scope = resnet_utils.resnet_arg_scope
+
 
 @add_arg_scope
 def bottleneck(inputs,
-- 
GitLab


From 92bf4b39274d6da59ddf710f5ef5be2e9039a99e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 09:52:05 -0800
Subject: [PATCH 0584/1563] Fix graph_transform documentation:   - remove \
 from within strings   - remove :0 from inputs and outputs, so fold_constants
 works   - make sure fold_(old_)batch_norms runs before quantize_weigths    
 and round_weights. Change: 153728959

---
 tensorflow/tools/graph_transforms/README.md | 96 ++++++++++++---------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index df9191fb96..c9f0a9b222 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -136,15 +136,14 @@ bazel build tensorflow/tools/graph_transforms:transform_graph
 bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --in_graph=tensorflow_inception_graph.pb \
 --out_graph=optimized_inception_graph.pb \
---inputs='Mul:0' \
---outputs='softmax:0' \
---transforms='\
-strip_unused_nodes(type=float, shape="1,299,299,3") \
-remove_nodes(op=Identity, op=CheckNumerics) \
-fold_constants(ignore_errors=true) \
-fold_batch_norms \
-fold_old_batch_norms\
-'
+--inputs='Mul' \
+--outputs='softmax' \
+--transforms='
+  strip_unused_nodes(type=float, shape="1,299,299,3")
+  remove_nodes(op=Identity, op=CheckNumerics)
+  fold_constants(ignore_errors=true)
+  fold_batch_norms
+  fold_old_batch_norms'
 ```
 
 The batch norm folding is included twice because there are two different flavors
@@ -177,14 +176,13 @@ bazel build tensorflow/tools/graph_transforms:transform_graph
 bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --in_graph=tensorflow_inception_graph.pb \
 --out_graph=optimized_inception_graph.pb \
---inputs='Mul:0' \
---outputs='softmax:0' \
---transforms='\
-strip_unused_nodes(type=float, shape="1,299,299,3") \
-fold_constants(ignore_errors=true) \
-fold_batch_norms \
-fold_old_batch_norms\
-'
+--inputs='Mul' \
+--outputs='softmax' \
+--transforms='
+  strip_unused_nodes(type=float, shape="1,299,299,3")
+  fold_constants(ignore_errors=true)
+  fold_batch_norms
+  fold_old_batch_norms'
 ```
 
 ### Shrinking File Size
@@ -212,11 +210,14 @@ bazel build tensorflow/tools/graph_transforms:transform_graph
 bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --in_graph=tensorflow_inception_graph.pb \
 --out_graph=optimized_inception_graph.pb \
---inputs='Mul:0' \
---outputs='softmax:0' \
+--inputs='Mul' \
+--outputs='softmax' \
 --transforms='\
-round_weights(num_steps=256) \
-'
+  strip_unused_nodes(type=float, shape="1,299,299,3")
+  fold_constants(ignore_errors=true)
+  fold_batch_norms
+  fold_old_batch_norms
+  round_weights(num_steps=256)'
 ```
 
 You should see that the `optimized_inception_graph.pb` output file is the same
@@ -236,11 +237,14 @@ bazel build tensorflow/tools/graph_transforms:transform_graph
 bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --in_graph=tensorflow_inception_graph.pb \
 --out_graph=optimized_inception_graph.pb \
---inputs='Mul:0' \
---outputs='softmax:0' \
---transforms='\
-quantize_weights \
-'
+--inputs='Mul' \
+--outputs='softmax' \
+--transforms='
+  strip_unused_nodes(type=float, shape="1,299,299,3")
+  fold_constants(ignore_errors=true)
+  fold_batch_norms
+  fold_old_batch_norms
+  quantize_weights'
 ```
 
 You should see that the size of the output graph is about a quarter of the
@@ -263,9 +267,8 @@ bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --out_graph=optimized_inception_graph.pb \
 --inputs='Mul:0' \
 --outputs='softmax:0' \
---transforms='\
-obfuscate_names \
-'
+--transforms='
+  obfuscate_names'
 ```
 
 ### Eight-bit Calculations
@@ -280,17 +283,19 @@ bazel build tensorflow/tools/graph_transforms:transform_graph
 bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --in_graph=tensorflow_inception_graph.pb \
 --out_graph=optimized_inception_graph.pb \
---inputs='Mul:0' \
---outputs='softmax:0' \
+--inputs='Mul' \
+--outputs='softmax' \
 --transforms='
- add_default_attributes
- strip_unused_nodes(type=float, shape="1,299,299,3")
- remove_nodes(op=Identity, op=CheckNumerics)
- fold_old_batch_norms
- quantize_weights
- quantize_nodes
- strip_unused_nodes
- sort_by_execution_order'
+  add_default_attributes
+  strip_unused_nodes(type=float, shape="1,299,299,3")
+  remove_nodes(op=Identity, op=CheckNumerics)
+  fold_constants(ignore_errors=true)
+  fold_batch_norms
+  fold_old_batch_norms
+  quantize_weights
+  quantize_nodes
+  strip_unused_nodes
+  sort_by_execution_order'
 ```
 
 This process converts all the operations in the graph that have eight-bit
@@ -446,7 +451,7 @@ bazel-bin/tensorflow/examples/label_image/label_image \
 --input_layer=Mul \
 --output_layer=softmax \
 --graph=/tmp/logged_quantized_inception.pb \
---labels=learning/brain/models/image/inception_v3/imagenet_comp_graph_label_strings.txt \
+--labels=${HOME}/Downloads/imagenet_comp_graph_label_strings.txt \
 --logtostderr \
 2>/tmp/min_max_log_small.txt
 ```
@@ -580,7 +585,10 @@ Converts any large (more than 15 element) float Const op into an eight-bit
 equivalent, followed by a float conversion op so that the result is usable by
 subsequent nodes. This is mostly useful for [shrinking file
 sizes](#shrinking-file-size), but also helps with the more advanced
-[quantize_nodes](#quantize_nodes) transform.
+[quantize_nodes](#quantize_nodes) transform. Even though there are no
+prerequesites, it is advisable to run [fold_batch_norms](#fold_batch_norms) or
+[fold_old_batch_norms](#fold_old_batch_norms), because rounding variances down
+to zero may cause significant loss of precision.
 
 ### remove_attribute
 
@@ -665,7 +673,11 @@ Rounds all float values in large Const ops (more than 15 elements) to the given
 number of steps. The unique values are chosen per buffer by linearly allocating
 between the largest and smallest values present. This is useful when you'll be
 deploying on mobile, and you want a model that will compress effectively. See
-[shrinking file size](#shrinking-file-size) for more details.
+[shrinking file size](#shrinking-file-size) for more details. Even though there
+are no prerequesites, it is advisable to run
+[fold_batch_norms](#fold_batch_norms) or
+[fold_old_batch_norms](#fold_old_batch_norms), because rounding variances down
+to zero may cause significant loss of precision.
 
 ### sparsify_gather
 
-- 
GitLab


From 3a39b41b975ce4c508b566d316514b2181e2e166 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 20 Apr 2017 10:42:44 -0800
Subject: [PATCH 0585/1563] Automated rollback of change 153709951 Change:
 153736477

---
 configure                                     |   5 +-
 tensorflow/opensource_only/python.build.tpl   |  53 -----
 .../opensource_only/python_configure.BUILD    |   0
 .../opensource_only/python_configure.bzl.tpl  | 209 ------------------
 tensorflow/workspace.bzl                      |   2 -
 third_party/py/numpy/BUILD                    |   6 +-
 util/python/BUILD                             |  28 ++-
 util/python/python_config.sh                  |  76 ++++++-
 8 files changed, 102 insertions(+), 277 deletions(-)
 delete mode 100644 tensorflow/opensource_only/python.build.tpl
 delete mode 100644 tensorflow/opensource_only/python_configure.BUILD
 delete mode 100644 tensorflow/opensource_only/python_configure.bzl.tpl

diff --git a/configure b/configure
index 47bdd5d018..48a4594da6 100755
--- a/configure
+++ b/configure
@@ -86,9 +86,6 @@ while true; do
   PYTHON_BIN_PATH=""
   # Retry
 done
-export PYTHON_BIN_PATH
-write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
-# TODO(ngiraldo): allow the user to optionally set PYTHON_INCLUDE_PATH and NUMPY_INCLUDE_PATH
 
 ## Set up MKL related environment settings
 if false; then # Disable building with MKL for now
@@ -246,7 +243,7 @@ fi
 
 
 # Invoke python_config and set up symlinks to python includes
-./util/python/python_config.sh "$PYTHON_BIN_PATH"
+./util/python/python_config.sh --setup "$PYTHON_BIN_PATH"
 
 # Append CC optimization flags to bazel.rc
 echo >> tools/bazel.rc
diff --git a/tensorflow/opensource_only/python.build.tpl b/tensorflow/opensource_only/python.build.tpl
deleted file mode 100644
index 157834df4b..0000000000
--- a/tensorflow/opensource_only/python.build.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-licenses(["restricted"])
-
-package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "python_headers",
-    hdrs = select({
-        "windows" : [
-            "python_include_windows",
-        ],
-        "//conditions:default" : [
-            "python_include",
-        ],
-    }),
-    includes = select({
-        "windows" : [
-            "python_include_windows",
-        ],
-        "//conditions:default" : [
-            "python_include",
-        ],
-    }),
-)
-
-cc_library(
-    name = "numpy_headers",
-    hdrs = select({
-        "windows" : [
-            "numpy_include_windows",
-        ],
-        "//conditions:default" : [
-            "numpy_include",
-        ],
-    }),
-    includes = select({
-        "windows" : [
-            "numpy_include_windows",
-        ],
-        "//conditions:default" : [
-            "numpy_include",
-        ],
-    }),
-)
-
-config_setting(
-    name = "windows",
-    values = {"cpu": "x64_windows"},
-    visibility = ["//visibility:public"],
-)
-
-%{PYTHON_INCLUDE_GENRULE}
-
-%{NUMPY_INCLUDE_GENRULE}
diff --git a/tensorflow/opensource_only/python_configure.BUILD b/tensorflow/opensource_only/python_configure.BUILD
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tensorflow/opensource_only/python_configure.bzl.tpl b/tensorflow/opensource_only/python_configure.bzl.tpl
deleted file mode 100644
index 40ba5d1539..0000000000
--- a/tensorflow/opensource_only/python_configure.bzl.tpl
+++ /dev/null
@@ -1,209 +0,0 @@
-# -*- Python -*-
-"""Repository rule for Python autoconfiguration.
-
-`python_configure` depends on the following environment variables:
-
-  * `NUMPY_INCLUDE_PATH`: Location of Numpy libraries.
-  * `PYTHON_BIN_PATH`: location of python binary.
-  * `PYTHON_INCLUDE_PATH`: Location of python binaries.
-"""
-
-_NUMPY_INCLUDE_PATH = "NUMPY_INCLUDE_PATH"
-_PYTHON_BIN_PATH = "PYTHON_BIN_PATH"
-_PYTHON_INCLUDE_PATH = "PYTHON_INCLUDE_PATH"
-
-
-def _tpl(repository_ctx, tpl, substitutions={}, out=None):
-  if not out:
-    out = tpl
-  repository_ctx.template(
-      out,
-      Label("//third_party/py:%s.tpl" % tpl),
-      substitutions)
-
-
-def _python_configure_warning(msg):
-  """Output warning message during auto configuration."""
-  yellow = "\033[1;33m"
-  no_color = "\033[0m"
-  print("\n%sPython Configuration Warning:%s %s\n" % (yellow, no_color, msg))
-
-
-def _python_configure_fail(msg):
-  """Output failure message when auto configuration fails."""
-  red = "\033[0;31m"
-  no_color = "\033[0m"
-  fail("\n%sPython Configuration Error:%s %s\n" % (red, no_color, msg))
-
-
-def _get_env_var(repository_ctx, name, default = None, enable_warning = True):
-  """Find an environment variable in system path."""
-  if name in repository_ctx.os.environ:
-    return repository_ctx.os.environ[name]
-  if default != None:
-    if enable_warning:
-      _python_configure_warning(
-          "'%s' environment variable is not set, using '%s' as default" % (name, default))
-    return default
-  _python_configure_fail("'%s' environment variable is not set" % name)
-
-
-def _is_windows(repository_ctx):
-  """Returns true if the host operating system is windows."""
-  os_name = repository_ctx.os.name.lower()
-  if os_name.find("windows") != -1:
-    return True
-  return False
-
-
-def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name):
-  """returns a genrule to symlink all files in a directory."""
-  # Get the list of files under this directory
-  find_result = None
-  line_break = None
-  if _is_windows(repository_ctx):
-    line_break = '\r\n'
-    find_result = repository_ctx.execute([
-        "dir", src_dir, "/b", "/s", "/a-d",
-    ])
-  else:
-    line_break = '\n'
-    find_result = repository_ctx.execute([
-        "find", src_dir, "-follow", "-type", "f",
-    ])
-  # Create a list with the src_dir stripped to use for outputs.
-  dest_files = find_result.stdout.replace(src_dir, '').split(line_break)
-  src_files = find_result.stdout.split(line_break)
-  command = []
-  command_windows = []
-  outs = []
-  outs_windows = []
-  for i in range(len(dest_files)):
-    if dest_files[i] != "":
-      command.append('ln -s ' + src_files[i] + ' $(@D)/' +
-                     dest_dir + dest_files[i])
-      # ln -sf is actually implemented as copying in msys since creating
-      # symbolic links is privileged on Windows. But copying is too slow, so
-      # invoke mklink to create junctions on Windows.
-      command_windows.append('mklink /J ' + src_files[i] + ' $(@D)/' +
-                             dest_dir + dest_files[i])
-      outs.append('      "' + dest_dir + dest_files[i] + '",')
-      outs_windows.append('      "' + dest_dir + '_windows' +
-                          dest_files[i] + '",')
-  genrule = _genrule(src_dir, genrule_name, ' && '.join(command),
-                     '\n'.join(outs))
-  genrule_windows = _genrule(src_dir, genrule_name + '_windows',
-                             "cmd /c \"" + ' && '.join(command_windows) + "\"",
-                             '\n'.join(outs_windows))
-  return genrule + '\n' + genrule_windows
-
-
-def _genrule(src_dir, genrule_name, command, outs):
-  """Returns a string with a genrule.
-
-  Genrule executes the given command and produces the given outputs.
-  """
-  return (
-      'genrule(\n' +
-      '    name = "' +
-      genrule_name + '",\n' +
-      '    outs = [\n' +
-      outs +
-      '    ],\n' +
-      '    cmd = """\n' +
-      command +
-      '    """,\n' +
-      ')\n'
-  )
-
-
-def _check_python_bin(repository_ctx, python_bin):
-  """Checks the python bin path."""
-  cmd =  '[[ -x "%s" ]] && [[ ! -d "%s" ]]' % (python_bin, python_bin)
-  result = repository_ctx.execute(["bash", "-c", cmd])
-  if result.return_code == 1:
-    _python_configure_fail(
-        "PYTHON_BIN_PATH is not executable.  Is it the python binary?")
-
-
-def _get_python_include(repository_ctx, python_bin):
-  """Gets the python include path."""
-  result = repository_ctx.execute([python_bin, "-c",
-                                   'from __future__ import print_function;' +
-                                   'from distutils import sysconfig;' +
-                                   'print(sysconfig.get_python_inc())'])
-  if result == "":
-    _python_configure_fail(
-        "Problem getting python include path.  Is distutils installed?")
-  return result.stdout.splitlines()[0]
-
-
-def _get_numpy_include(repository_ctx, python_bin):
-  """Gets the numpy include path."""
-  result = repository_ctx.execute([python_bin, "-c",
-                                   'from __future__ import print_function;' +
-                                   'import numpy;' +
-                                   ' print(numpy.get_include());'])
-  if result == "":
-    _python_configure_fail(
-        "Problem getting numpy include path.  Is numpy installed?")
-  return result.stdout.splitlines()[0]
-
-
-def _create_python_repository(repository_ctx):
-  """Creates the repository containing files set up to build with Python."""
-  python_include = None
-  numpy_include = None
-  # If local checks were requested, the python and numpy include will be auto
-  # detected on the host config (using _PYTHON_BIN_PATH).
-  if repository_ctx.attr.local_checks:
-    python_bin = _get_env_var(repository_ctx, _PYTHON_BIN_PATH)
-    _check_python_bin(repository_ctx, python_bin)
-    python_include = _get_python_include(repository_ctx, python_bin)
-    numpy_include = _get_numpy_include(repository_ctx, python_bin) + '/numpy'
-  else:
-    # Otherwise, we assume user provides all paths (via ENV or attrs)
-    python_include = _get_env_var(repository_ctx, _PYTHON_INCLUDE_PATH,
-                                  repository_ctx.attr.python_include)
-    numpy_include = _get_env_var(repository_ctx, _NUMPY_INCLUDE_PATH,
-                                 repository_ctx.attr.numpy_include) + '/numpy'
-
-  python_include_rule = _symlink_genrule_for_dir(
-      repository_ctx, python_include, 'python_include', 'python_include')
-  numpy_include_rule = _symlink_genrule_for_dir(
-      repository_ctx, numpy_include, 'numpy_include', 'numpy_include')
-  _tpl(repository_ctx, "BUILD", {
-      "%{PYTHON_INCLUDE_GENRULE}": python_include_rule,
-      "%{NUMPY_INCLUDE_GENRULE}": numpy_include_rule,
-  })
-
-
-def _python_autoconf_impl(repository_ctx):
-  """Implementation of the python_autoconf repository rule."""
-  _create_python_repository(repository_ctx)
-
-
-python_configure = repository_rule(
-    implementation = _python_autoconf_impl,
-    attrs = {
-        "local_checks": attr.bool(mandatory = False, default = True),
-        "python_include": attr.string(mandatory = False),
-        "numpy_include": attr.string(mandatory = False),
-    },
-    environ = [
-        _PYTHON_BIN_PATH,
-        _PYTHON_INCLUDE_PATH,
-        _NUMPY_INCLUDE_PATH,
-    ],
-)
-"""Detects and configures the local Python.
-
-Add the following to your WORKSPACE FILE:
-
-```python
-python_configure(name = "local_config_python")
-```
-
-Args:
-  name: A unique name for this workspace rule.
-"""
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 5ab91b69a1..8a858fb62a 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -5,7 +5,6 @@ load("//third_party/sycl:sycl_configure.bzl", "sycl_configure")
 load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
-load("//third_party/py:python_configure.bzl", "python_configure")
 
 
 # Parse the bazel version string from `native.bazel_version`.
@@ -120,7 +119,6 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   check_version("0.4.5")
   cuda_configure(name="local_config_cuda")
   sycl_configure(name="local_config_sycl")
-  python_configure(name="local_config_python")
   if path_prefix:
     print("path_prefix was specified to tf_workspace but is no longer used " +
           "and will be removed in the future.")
diff --git a/third_party/py/numpy/BUILD b/third_party/py/numpy/BUILD
index be8332572b..1d461505a6 100644
--- a/third_party/py/numpy/BUILD
+++ b/third_party/py/numpy/BUILD
@@ -8,9 +8,11 @@ py_library(
     srcs_version = "PY2AND3",
 )
 
-alias(
+cc_library(
     name = "headers",
-    actual = "@local_config_python//:numpy_headers",
+    hdrs = glob(["numpy_include/**/*.h"]),
+    data = ["//util/python:python_checked"],
+    includes = ["numpy_include"],
 )
 
 genrule(
diff --git a/util/python/BUILD b/util/python/BUILD
index 96daf9947a..29688b875d 100644
--- a/util/python/BUILD
+++ b/util/python/BUILD
@@ -2,7 +2,31 @@ licenses(["restricted"])
 
 package(default_visibility = ["//visibility:public"])
 
-alias(
+cc_library(
     name = "python_headers",
-    actual = "@local_config_python//:python_headers",
+    hdrs = glob([
+        "python_include/**/*.h",
+    ]),
+    data = [":python_checked"],
+    includes = ["python_include"],
+)
+
+genrule(
+    name = "python_check",
+    srcs = [
+        "python_config.sh",
+        "configure_files",
+    ],
+    outs = [
+        "python_checked",
+    ],
+    cmd = "OUTPUTDIR=\"$(@D)/\"; $(location :python_config.sh) --check && touch $$OUTPUTDIR/python_checked",
+    local = 1,
+)
+
+filegroup(
+    name = "configure_files",
+    data = glob([
+        "*",
+    ]),
 )
diff --git a/util/python/python_config.sh b/util/python/python_config.sh
index d5762ad456..4b18bf3578 100755
--- a/util/python/python_config.sh
+++ b/util/python/python_config.sh
@@ -26,9 +26,23 @@ else
   script_path=${script_path:-.}
 fi
 
+EXPECTED_PATHS="$script_path/util/python/python_include"\
+" $script_path/util/python/python_lib"\
+" $script_path/third_party/py/numpy/numpy_include"
+
 function main {
-  setup_python "$1"
-  exit 0
+  argument="$1"
+  shift
+  case $argument in
+    --check)
+      check_python
+      exit 0
+      ;;
+    --setup)
+      setup_python "$1"
+      exit 0
+      ;;
+  esac
 }
 
 function python_path {
@@ -79,7 +93,6 @@ END
 function setup_python {
   PYTHON_BIN_PATH="$1";
 
-  # TODO(ngiraldo): move most of these checks to root configure
   if [ -z "$PYTHON_BIN_PATH" ]; then
     echo "PYTHON_BIN_PATH was not provided.  Did you run configure?"
     exit 1
@@ -95,7 +108,12 @@ function setup_python {
     exit 1
   fi
 
-  # TODO(ngiraldo): confirm if these checks are really necessary, remove if not
+  local python_include="$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; from distutils import sysconfig; print(sysconfig.get_python_inc());')"
+  if [ "$python_include" == "" ]; then
+    echo -e "\n\nERROR: Problem getting python include path.  Is distutils installed?"
+    exit 1
+  fi
+
   if [ -z "$PYTHON_LIB_PATH" ]; then
     local python_lib_path
     # Split python_path into an array of paths, this allows path containing spaces
@@ -131,12 +149,35 @@ function setup_python {
     exit 1
   fi
 
+  local numpy_include=$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; import numpy; print(numpy.get_include());')
+  if [ "$numpy_include" == "" ]; then
+    echo -e "\n\nERROR: Problem getting numpy include path.  Is numpy installed?"
+    exit 1
+  fi
+
+  for x in $EXPECTED_PATHS; do
+    if [ -e "$x" ]; then
+      rm -rf "$x"
+    fi
+  done
+
+# ln -sf is actually implemented as copying in msys since creating symbolic
+# links is privileged on Windows. But copying is too slow, so invoke mklink
+# to create junctions on Windows.
+  if is_windows; then
+    cmd /c "mklink /J util\\python\\python_include \"${python_include}\""
+    cmd /c "mklink /J util\\python\\python_lib \"${python_lib}\""
+    cmd /c "mklink /J third_party\\py\\numpy\\numpy_include \"${numpy_include}\""
+  else
+    ln -sf "${python_include}" util/python/python_include
+    ln -sf "${python_lib}" util/python/python_lib
+    ln -sf "${numpy_include}" third_party/py/numpy/numpy_include
+  fi
   # Convert python path to Windows style before writing into bazel.rc
   if is_windows; then
     PYTHON_BIN_PATH="$(cygpath -m "$PYTHON_BIN_PATH")"
   fi
 
-  # TODO(ngiraldo): move all below to root configure
   # Write tools/bazel.rc
   echo "# Autogenerated by configure: DO NOT EDIT" > tools/bazel.rc
   sed -e "s/\$PYTHON_MAJOR_VERSION/$python_major_version/g" \
@@ -156,4 +197,29 @@ function is_windows() {
   fi
 }
 
+function check_python {
+  for x in $EXPECTED_PATHS; do
+    if [ ! -e "$x" ]; then
+      echo -e "\n\nERROR: Cannot find '${x}'.  Did you run configure?\n\n" 1>&2
+      exit 1
+    fi
+    # Don't check symbolic link on Windows
+    if ! is_windows && [ ! -L "${x}" ]; then
+      echo -e "\n\nERROR: '${x}' is not a symbolic link.  Internal error.\n\n" 1>&2
+      exit 1
+    fi
+    if is_windows; then
+      # In msys, readlink <path> doesn't work, because no symbolic link on
+      # Windows. readlink -f <path> returns the real path of a junction.
+      true_path=$(readlink -f "${x}")
+    else
+      true_path=$(readlink "${x}")
+    fi
+    if [ ! -d "${true_path}" ]; then
+      echo -e "\n\nERROR: '${x}' does not refer to an existing directory: ${true_path}.  Do you need to rerun configure?\n\n" 1>&2
+      exit 1
+    fi
+  done
+}
+
 main "$@"
-- 
GitLab


From 817533db9b17b5456b85ba9187df7262c2c9c453 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 10:49:50 -0800
Subject: [PATCH 0586/1563] [XLA] Fix incorrect comments Change: 153737501

---
 tensorflow/compiler/xla/service/hlo_instruction.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 4f62be5235..f57b27f605 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -733,9 +733,9 @@ class HloInstruction {
   // instruction to make it a bitcast.
   bool CouldBeBitcast() const;
 
-  // Sets param_no for this Parameter instruction.
+  // Sets the parent fusion instruction for this instruction.
   //
-  // Precondition: opcode() == HloOpcode::kParameter
+  // Precondition: opcode() == HloOpcode::kFusion
   void SetParentFusion(HloInstruction* fusion_instruction) {
     CHECK_EQ(HloOpcode::kFusion, fusion_instruction->opcode());
     parent_fusion_instruction_ = fusion_instruction;
-- 
GitLab


From 90733a8024532f6993d11f0a89deaecb2bba59fe Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 11:03:06 -0800
Subject: [PATCH 0587/1563] Expose tf.contrib.staging.StagingArea. Change:
 153739304

---
 tensorflow/BUILD                              |  1 +
 tensorflow/contrib/BUILD                      |  1 +
 tensorflow/contrib/__init__.py                |  1 +
 tensorflow/contrib/cmake/tf_python.cmake      |  1 +
 tensorflow/contrib/staging/BUILD              | 25 +++++++++++++++++++
 tensorflow/contrib/staging/__init__.py        | 20 +++++++++++++++
 .../api_guides/python/contrib.staging.md      |  6 +++++
 tensorflow/python/ops/data_flow_ops.py        | 10 ++++++--
 8 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 tensorflow/contrib/staging/BUILD
 create mode 100644 tensorflow/contrib/staging/__init__.py
 create mode 100644 tensorflow/docs_src/api_guides/python/contrib.staging.md

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 31c6977a55..f0c1271e89 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -239,6 +239,7 @@ filegroup(
         "//tensorflow/contrib/solvers:all_files",
         "//tensorflow/contrib/sparsemax:all_files",
         "//tensorflow/contrib/specs:all_files",
+        "//tensorflow/contrib/staging:all_files",
         "//tensorflow/contrib/stat_summarizer:all_files",
         "//tensorflow/contrib/stateless:all_files",
         "//tensorflow/contrib/tensor_forest:all_files",
diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index 3ff76c3054..7949f62d19 100755
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -58,6 +58,7 @@ py_library(
         "//tensorflow/contrib/solvers:solvers_py",
         "//tensorflow/contrib/sparsemax:sparsemax_py",
         "//tensorflow/contrib/specs",
+        "//tensorflow/contrib/staging",
         "//tensorflow/contrib/stat_summarizer:stat_summarizer_py",
         "//tensorflow/contrib/stateless",
         "//tensorflow/contrib/tensor_forest:init_py",
diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py
index 44a5874de2..0f0d4a9926 100644
--- a/tensorflow/contrib/__init__.py
+++ b/tensorflow/contrib/__init__.py
@@ -56,6 +56,7 @@ from tensorflow.contrib import seq2seq
 from tensorflow.contrib import slim
 from tensorflow.contrib import solvers
 from tensorflow.contrib import sparsemax
+from tensorflow.contrib import staging
 from tensorflow.contrib import stat_summarizer
 from tensorflow.contrib import stateless
 from tensorflow.contrib import tensor_forest
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 033d54cc1e..6a99db3fbf 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -470,6 +470,7 @@ add_python_module("tensorflow/contrib/sparsemax/python")
 add_python_module("tensorflow/contrib/sparsemax/python/ops")
 add_python_module("tensorflow/contrib/specs")
 add_python_module("tensorflow/contrib/specs/python")
+add_python_module("tensorflow/contrib/staging")
 add_python_module("tensorflow/contrib/stat_summarizer")
 add_python_module("tensorflow/contrib/stateless")
 add_python_module("tensorflow/contrib/tensorboard")
diff --git a/tensorflow/contrib/staging/BUILD b/tensorflow/contrib/staging/BUILD
new file mode 100644
index 0000000000..8ffc96c346
--- /dev/null
+++ b/tensorflow/contrib/staging/BUILD
@@ -0,0 +1,25 @@
+package(default_visibility = [
+    "//visibility:public",
+])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+py_library(
+    name = "staging",
+    srcs = ["__init__.py"],
+    srcs_version = "PY2AND3",
+)
diff --git a/tensorflow/contrib/staging/__init__.py b/tensorflow/contrib/staging/__init__.py
new file mode 100644
index 0000000000..e58ac31918
--- /dev/null
+++ b/tensorflow/contrib/staging/__init__.py
@@ -0,0 +1,20 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""contrib module containing StagingArea."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.ops.data_flow_ops import StagingArea
diff --git a/tensorflow/docs_src/api_guides/python/contrib.staging.md b/tensorflow/docs_src/api_guides/python/contrib.staging.md
new file mode 100644
index 0000000000..b0ac548342
--- /dev/null
+++ b/tensorflow/docs_src/api_guides/python/contrib.staging.md
@@ -0,0 +1,6 @@
+# Staging (contrib)
+[TOC]
+
+This library contains utilities for adding pipelining to a model.
+
+*   @{tf.contrib.staging.StagingArea}
diff --git a/tensorflow/python/ops/data_flow_ops.py b/tensorflow/python/ops/data_flow_ops.py
index bbe765a3af..6395451e2a 100644
--- a/tensorflow/python/ops/data_flow_ops.py
+++ b/tensorflow/python/ops/data_flow_ops.py
@@ -1388,8 +1388,7 @@ class StagingArea(object):
   """Class for staging inputs. No ordering guarantees.
 
   A `StagingArea` is a TensorFlow data structure that stores tensors across
-  multiple steps, and exposes operations that can put and get
-  tensors.
+  multiple steps, and exposes operations that can put and get tensors.
 
   Each `StagingArea` element is a tuple of one or more tensors, where each
   tuple component has a static dtype, and may have a static shape.
@@ -1606,6 +1605,13 @@ class StagingArea(object):
     If the staging area is empty when this operation executes, it will block
     until there is an element to dequeue.
 
+    Note that unlike others ops that can block, like the queue Dequeue
+    operations, this can stop other work from happening.  To avoid this, the
+    intended use is for this to be called only when there will be an element
+    already available.  One method for doing this in a training loop would be to
+    run a `put()` call during a warmup session.run call, and then call both
+    `get()` and `put()` in each subsequent step.
+
     The placement of the returned tensor will be determined by the current
     device scope when this function is called.
 
-- 
GitLab


From 4c493e97fe8ac226b8fbf660b25de0efd34807bf Mon Sep 17 00:00:00 2001
From: Andrew Harp <andrewharp@google.com>
Date: Thu, 20 Apr 2017 11:19:27 -0800
Subject: [PATCH 0588/1563] Android: Create TensorFlow AAR as part of nightly
 build, so that it will be downloadable at
 https://ci.tensorflow.org/view/Nightly/job/nightly-android/

This contains TensorFlowInferenceInterface and the Java API, as well as all of the native prebuilt libraries. This means that TF can be integrated into an Android Studio app simply by downloading the AAR file to e.g. aar/, and then adding the following into a gradle build file:

allprojects {
    repositories {
        jcenter()
        flatDir {
            dirs 'aar'
        }
    }
}

dependencies {
    compile(name:'tensorflow', ext:'aar')
}
Change: 153741338
---
 .../tools/ci_build/builds/android_full.sh     | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/builds/android_full.sh b/tensorflow/tools/ci_build/builds/android_full.sh
index 407562d4ba..63250e0a4d 100755
--- a/tensorflow/tools/ci_build/builds/android_full.sh
+++ b/tensorflow/tools/ci_build/builds/android_full.sh
@@ -31,8 +31,10 @@ configure_android_workspace
 CPUS=armeabi-v7a,arm64-v8a,x86,x86_64
 
 OUT_DIR="$(pwd)/out/"
+AAR_LIB_TMP="$(pwd)/aar_libs"
 
 rm -rf ${OUT_DIR}
+rm -rf ${AAR_LIB_TMP}
 
 # Build all relevant native libraries for each architecture.
 for CPU in ${CPUS//,/ }
@@ -50,6 +52,9 @@ do
     copy_lib bazel-bin/tensorflow/contrib/android/libtensorflow_inference.so
     copy_lib bazel-bin/tensorflow/examples/android/libtensorflow_demo.so
     copy_lib bazel-bin/tensorflow/tools/benchmark/benchmark_model
+
+    mkdir -p ${AAR_LIB_TMP}/jni/${CPU}
+    cp bazel-bin/tensorflow/contrib/android/libtensorflow_inference.so ${AAR_LIB_TMP}/jni/${CPU}
 done
 
 # Build Jar and also demo containing native libs for all architectures.
@@ -60,12 +65,25 @@ echo "========== Building TensorFlow Android Jar and Demo =========="
 bazel --bazelrc=/dev/null build -c opt --fat_apk_cpu=${CPUS} \
     --spawn_strategy=sandboxed --genrule_strategy=sandboxed \
     //tensorflow/contrib/android:android_tensorflow_inference_java \
+    //tensorflow/contrib/android:android_tensorflow_inference_java.aar \
     //tensorflow/examples/android:tensorflow_demo
 
-echo "Copying demo and Jar to ${OUT_DIR}"
+echo "Copying demo, AAR and Jar to ${OUT_DIR}"
 cp bazel-bin/tensorflow/examples/android/tensorflow_demo.apk \
     bazel-bin/tensorflow/contrib/android/libandroid_tensorflow_inference_java.jar ${OUT_DIR}
 
+cp bazel-bin/tensorflow/contrib/android/android_tensorflow_inference_java.aar \
+   ${OUT_DIR}/tensorflow.aar
+
+# TODO(andrewharp): build native libs into AAR directly once
+# https://github.com/bazelbuild/bazel/issues/348 is resolved.
+echo "Adding native libs to AAR"
+chmod +w ${OUT_DIR}/tensorflow.aar
+pushd ${AAR_LIB_TMP}
+zip -ur ${OUT_DIR}/tensorflow.aar $(find jni -name *.so)
+popd
+rm -rf ${AAR_LIB_TMP}
+
 # Test Makefile build just to make sure it still works.
 if [ -z "$NDK_ROOT" ]; then
    export NDK_ROOT=${ANDROID_NDK_HOME}
-- 
GitLab


From 1872e57a3beaa0138bb24a69074da874a37d1943 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 11:22:26 -0800
Subject: [PATCH 0589/1563] Added missing support for uint16 type in the
 queues. Change: 153741673

---
 tensorflow/core/kernels/queue_base.cc             | 2 ++
 tensorflow/python/kernel_tests/fifo_queue_test.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/kernels/queue_base.cc b/tensorflow/core/kernels/queue_base.cc
index a0a0cbb616..07ff70a875 100644
--- a/tensorflow/core/kernels/queue_base.cc
+++ b/tensorflow/core/kernels/queue_base.cc
@@ -375,6 +375,7 @@ Status QueueBase::CopySliceToElement(const Tensor& parent, Tensor* element,
   HANDLE_TYPE(DT_QINT32);
   HANDLE_TYPE(DT_QINT16);
   HANDLE_TYPE(DT_QUINT16);
+  HANDLE_TYPE(DT_UINT16);
 #undef HANDLE_TYPE
   return errors::Unimplemented("CopySliceToElement Unhandled data type: ",
                                parent.dtype());
@@ -405,6 +406,7 @@ Status QueueBase::CopyElementToSlice(const Tensor& element, Tensor* parent,
   HANDLE_TYPE(DT_QINT32);
   HANDLE_TYPE(DT_QINT16);
   HANDLE_TYPE(DT_QUINT16);
+  HANDLE_TYPE(DT_UINT16);
 #undef HANDLE_TYPE
   return errors::Unimplemented("CopyElementToSlice Unhandled data type: ",
                                element.dtype());
diff --git a/tensorflow/python/kernel_tests/fifo_queue_test.py b/tensorflow/python/kernel_tests/fifo_queue_test.py
index dda20e3a93..85e7b635d8 100644
--- a/tensorflow/python/kernel_tests/fifo_queue_test.py
+++ b/tensorflow/python/kernel_tests/fifo_queue_test.py
@@ -1372,7 +1372,8 @@ class FIFOQueueTest(test.TestCase):
       dtypes = [
           dtypes_lib.float32, dtypes_lib.float64, dtypes_lib.int32,
           dtypes_lib.uint8, dtypes_lib.int16, dtypes_lib.int8, dtypes_lib.int64,
-          dtypes_lib.bool, dtypes_lib.complex64, dtypes_lib.complex128
+          dtypes_lib.uint16, dtypes_lib.bool, dtypes_lib.complex64,
+          dtypes_lib.complex128
       ]
       shape = (32, 4, 128)
       q = data_flow_ops.FIFOQueue(32, dtypes, [shape[1:]] * len(dtypes))
-- 
GitLab


From 708f708a458f0a4754094a5a65fb029131b2255d Mon Sep 17 00:00:00 2001
From: Pete Warden <petewarden@google.com>
Date: Thu, 20 Apr 2017 12:14:39 -0800
Subject: [PATCH 0590/1563] Renamed kernel for AudioSpectrogram op to match op
 name Change: 153747523

---
 tensorflow/core/kernels/spectrogram_op.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/kernels/spectrogram_op.cc b/tensorflow/core/kernels/spectrogram_op.cc
index 98d9bb1ad1..8e64596b53 100644
--- a/tensorflow/core/kernels/spectrogram_op.cc
+++ b/tensorflow/core/kernels/spectrogram_op.cc
@@ -26,9 +26,10 @@ limitations under the License.
 namespace tensorflow {
 
 // Create a spectrogram frequency visualization from audio data.
-class SpectrogramOp : public OpKernel {
+class AudioSpectrogramOp : public OpKernel {
  public:
-  explicit SpectrogramOp(OpKernelConstruction* context) : OpKernel(context) {
+  explicit AudioSpectrogramOp(OpKernelConstruction* context)
+      : OpKernel(context) {
     OP_REQUIRES_OK(context, context->GetAttr("window_size", &window_size_));
     OP_REQUIRES_OK(context, context->GetAttr("stride", &stride_));
     OP_REQUIRES_OK(context,
@@ -115,6 +116,6 @@ class SpectrogramOp : public OpKernel {
   bool magnitude_squared_;
 };
 REGISTER_KERNEL_BUILDER(Name("AudioSpectrogram").Device(DEVICE_CPU),
-                        SpectrogramOp);
+                        AudioSpectrogramOp);
 
 }  // namespace tensorflow
-- 
GitLab


From a2dac8bd93b0f4bff2554d05efc7385bbcbf8c4e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 12:22:35 -0800
Subject: [PATCH 0591/1563] Add more tests for broadcast_shape. Change:
 153748425

---
 .../python/framework/common_shapes_test.py    | 179 ++++++++++++++++--
 1 file changed, 161 insertions(+), 18 deletions(-)

diff --git a/tensorflow/python/framework/common_shapes_test.py b/tensorflow/python/framework/common_shapes_test.py
index dc99720e8a..62d9b56804 100644
--- a/tensorflow/python/framework/common_shapes_test.py
+++ b/tensorflow/python/framework/common_shapes_test.py
@@ -18,6 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import numpy as np
+
 from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import test_util
@@ -26,6 +28,38 @@ from tensorflow.python.platform import googletest
 
 class CommonShapesTest(test_util.TensorFlowTestCase):
 
+  # Asserts that we get the same result with numpy (for known shapes), and that
+  # the order of arguments does not matter (i.e., broadcasting is reflexive).
+  def _assert_incompatible_broadcast(self, shape1, shape2):
+    if shape1.dims is not None and shape2.dims is not None:
+      zeros1 = np.zeros(shape1.as_list())
+      zeros2 = np.zeros(shape2.as_list())
+      with self.assertRaises(ValueError):
+        np.broadcast(zeros1, zeros2)
+      with self.assertRaises(ValueError):
+        np.broadcast(zeros2, zeros1)
+    with self.assertRaises(ValueError):
+      common_shapes.broadcast_shape(shape1, shape2)
+    with self.assertRaises(ValueError):
+      common_shapes.broadcast_shape(shape2, shape1)
+
+  # Asserts that we get the same result with numpy (for known shapes), and that
+  # the order of arguments does not matter (i.e., broadcasting is reflexive).
+  def _assert_broadcast(self, expected, shape1, shape2):
+    if shape1.dims is not None and shape2.dims is not None:
+      expected_np = expected.as_list()
+      zeros1 = np.zeros(shape1.as_list())
+      zeros2 = np.zeros(shape2.as_list())
+      self.assertAllEqual(expected_np, np.broadcast(zeros1, zeros2).shape)
+      self.assertAllEqual(expected_np, np.broadcast(zeros2, zeros1).shape)
+      self.assertEqual(
+          expected, common_shapes.broadcast_shape(shape1, shape2))
+      self.assertEqual(
+          expected, common_shapes.broadcast_shape(shape2, shape1))
+    else:
+      self.assertEqual(expected, common_shapes.broadcast_shape(shape1, shape2))
+      self.assertEqual(expected, common_shapes.broadcast_shape(shape2, shape1))
+
   def testBroadcast_one_dimension(self):
     s1 = tensor_shape.vector(5)
     s2 = tensor_shape.vector(7)
@@ -35,29 +69,138 @@ class CommonShapesTest(test_util.TensorFlowTestCase):
     expanded_scalar = tensor_shape.TensorShape([1])
 
     # Tensors with same shape should have the same broadcast result.
-    self.assertEqual(s1, common_shapes.broadcast_shape(s1, s1))
-    self.assertEqual(s2, common_shapes.broadcast_shape(s2, s2))
-    self.assertEqual(unknown, common_shapes.broadcast_shape(unknown, unknown))
-    self.assertEqual(scalar, common_shapes.broadcast_shape(scalar, scalar))
-    self.assertEqual(expanded_scalar, common_shapes.broadcast_shape(
-        expanded_scalar, expanded_scalar))
+    for shape in (s1, s2, unknown, scalar, expanded_scalar):
+      self._assert_broadcast(expected=shape, shape1=shape, shape2=shape)
 
-    # [] acts like an identity.
-    self.assertEqual(s1, common_shapes.broadcast_shape(s1, scalar))
-    self.assertEqual(s2, common_shapes.broadcast_shape(s2, scalar))
+    # [] and [1] act like identity.
+    self._assert_broadcast(expected=s1, shape1=s1, shape2=scalar)
+    self._assert_broadcast(expected=s2, shape1=s2, shape2=scalar)
+    self._assert_broadcast(expected=s1, shape1=s1, shape2=expanded_scalar)
+    self._assert_broadcast(expected=s2, shape1=s2, shape2=expanded_scalar)
 
-    self.assertEqual(s1, common_shapes.broadcast_shape(s1, expanded_scalar))
-    self.assertEqual(s2, common_shapes.broadcast_shape(s2, expanded_scalar))
+    self._assert_broadcast(expected=unknown, shape1=s1, shape2=unknown)
+    self._assert_broadcast(expected=unknown, shape1=s2, shape2=unknown)
 
-    self.assertEqual(unknown, common_shapes.broadcast_shape(s1, unknown))
-    self.assertEqual(unknown, common_shapes.broadcast_shape(s2, unknown))
+    self._assert_broadcast(
+        expected=expanded_scalar, shape1=scalar, shape2=expanded_scalar)
 
-    self.assertEqual(expanded_scalar, common_shapes.broadcast_shape(
-        scalar, expanded_scalar))
+    self._assert_incompatible_broadcast(shape1=s1, shape2=s2)
 
-    with self.assertRaises(ValueError):
-      common_shapes.broadcast_shape(s1, s2)
-      common_shapes.broadcast_shape(s2, s1)
+  def testBroadcast_many_dimensions(self):
+    unknown = tensor_shape.unknown_shape()
+    shape_0 = tensor_shape.scalar()
+    shape_1 = tensor_shape.vector(1)
+    shape_4 = tensor_shape.vector(4)
+    shape_1x4 = tensor_shape.matrix(1, 4)
+    shape_4x1 = tensor_shape.matrix(4, 1)
+    shape_3x4 = tensor_shape.matrix(3, 4)
+    shape_4x3 = tensor_shape.matrix(4, 3)
+
+    # Tensors with same shape should have the same broadcast result.
+    for shape in (
+        shape_0, shape_1, shape_4, shape_1x4, shape_4x1, shape_3x4, shape_4x3):
+      self._assert_broadcast(expected=shape, shape1=shape, shape2=shape)
+
+    # [] and [1] act like identity.
+    for identity in (shape_0, shape_1):
+      for shape in (shape_4, shape_1x4, shape_4x1, shape_3x4, shape_4x3):
+        self._assert_broadcast(expected=shape, shape1=identity, shape2=shape)
+
+    # Unknown in, unknown out.
+    for shape in (shape_4, shape_1x4, shape_4x1, shape_3x4, shape_4x3):
+      self._assert_broadcast(expected=unknown, shape1=shape, shape2=unknown)
+
+    self._assert_broadcast(expected=shape_1x4, shape1=shape_4, shape2=shape_1x4)
+    shape_4x4 = tensor_shape.matrix(4, 4)
+    self._assert_broadcast(expected=shape_4x4, shape1=shape_4, shape2=shape_4x1)
+    self._assert_broadcast(expected=shape_3x4, shape1=shape_4, shape2=shape_3x4)
+    self._assert_incompatible_broadcast(shape1=shape_4, shape2=shape_4x3)
+    self._assert_broadcast(
+        expected=shape_4x4, shape1=shape_1x4, shape2=shape_4x1)
+    self._assert_broadcast(
+        expected=shape_3x4, shape1=shape_1x4, shape2=shape_3x4)
+    self._assert_incompatible_broadcast(shape1=shape_1x4, shape2=shape_4x3)
+    self._assert_incompatible_broadcast(shape1=shape_4x1, shape2=shape_3x4)
+    self._assert_broadcast(
+        expected=shape_4x3, shape1=shape_4x1, shape2=shape_4x3)
+    self._assert_incompatible_broadcast(shape1=shape_3x4, shape2=shape_4x3)
+
+  # Asserts that the order of arguments does not matter (i.e., broadcasting is
+  # reflexive).
+  def _assert_broadcast_with_unknown_dims(self, expected, shape1, shape2):
+    actual_dims = common_shapes.broadcast_shape(shape1, shape2).dims
+    reflexive_actual_dims = common_shapes.broadcast_shape(shape2, shape1).dims
+
+    if actual_dims is None:
+      self.assertIsNone(reflexive_actual_dims)
+    elif reflexive_actual_dims is None:
+      self.assertIsNone(actual_dims)
+    else:
+      self.assertEqual(len(actual_dims), len(reflexive_actual_dims))
+      for actual_dim, reflexive_actual_dim in zip(
+          actual_dims, reflexive_actual_dims):
+        self.assertEqual(actual_dim.value, reflexive_actual_dim.value)
+
+    expected_dims = expected.dims
+    if expected_dims is None:
+      self.assertIsNone(actual_dims)
+    elif actual_dims is None:
+      self.assertIsNone(expected_dims)
+    else:
+      self.assertEqual(len(expected_dims), len(actual_dims))
+      for expected_dim, actual_dim in zip(expected_dims, actual_dims):
+        self.assertEqual(expected_dim.value, actual_dim.value)
+
+  def testBroadcast_unknown_dims(self):
+    unknown = tensor_shape.unknown_shape()
+    shape_0 = tensor_shape.scalar()
+    shape_1 = tensor_shape.vector(1)
+    # pylint: disable=invalid-name
+    shape_U = tensor_shape.vector(None)
+    shape_1xU = tensor_shape.matrix(1, None)
+    shape_Ux1 = tensor_shape.matrix(None, 1)
+    shape_4xU = tensor_shape.matrix(4, None)
+    shape_Ux4 = tensor_shape.matrix(None, 4)
+    # pylint: enable=invalid-name
+
+    # Tensors with same shape should have the same broadcast result.
+    for shape in (shape_U, shape_1xU, shape_Ux1, shape_4xU, shape_Ux4):
+      self._assert_broadcast_with_unknown_dims(
+          expected=shape, shape1=shape, shape2=shape)
+
+    # [] and [1] act like identity.
+    for identity in (shape_0, shape_1):
+      for shape in (shape_U, shape_1xU, shape_Ux1, shape_4xU, shape_Ux4):
+        self._assert_broadcast_with_unknown_dims(
+            expected=shape, shape1=identity, shape2=shape)
+
+    # Unknown in, unknown out.
+    for shape in (shape_U, shape_1xU, shape_Ux1, shape_4xU, shape_Ux4):
+      self._assert_broadcast_with_unknown_dims(
+          expected=unknown, shape1=shape, shape2=unknown)
+
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_1xU, shape1=shape_U, shape2=shape_1xU)
+    shape_UxU = tensor_shape.matrix(None, None)  # pylint: disable=invalid-name
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_UxU, shape1=shape_U, shape2=shape_Ux1)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_4xU, shape1=shape_U, shape2=shape_4xU)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_Ux4, shape1=shape_U, shape2=shape_Ux4)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_UxU, shape1=shape_1xU, shape2=shape_Ux1)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_4xU, shape1=shape_1xU, shape2=shape_4xU)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_Ux4, shape1=shape_1xU, shape2=shape_Ux4)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_4xU, shape1=shape_Ux1, shape2=shape_4xU)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_Ux4, shape1=shape_Ux1, shape2=shape_Ux4)
+    shape_4x4 = tensor_shape.matrix(4, 4)
+    self._assert_broadcast_with_unknown_dims(
+        expected=shape_4x4, shape1=shape_4xU, shape2=shape_Ux4)
 
 
 if __name__ == "__main__":
-- 
GitLab


From 498f3f6cac1b903252d1c8e400e8adf5bd1c7d98 Mon Sep 17 00:00:00 2001
From: Dan Ringwalt <ringwalt@google.com>
Date: Tue, 18 Apr 2017 09:16:55 -0800
Subject: [PATCH 0592/1563] Move weights to be the second argument in
 tf.bincount.

This matches np.bincount(x, weights, minlength).
Change: 153476565
---
 tensorflow/python/kernel_tests/bincount_op_test.py | 4 ++--
 tensorflow/python/ops/math_ops.py                  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/kernel_tests/bincount_op_test.py b/tensorflow/python/kernel_tests/bincount_op_test.py
index 2a1641b10f..7a610debd1 100644
--- a/tensorflow/python/kernel_tests/bincount_op_test.py
+++ b/tensorflow/python/kernel_tests/bincount_op_test.py
@@ -73,13 +73,13 @@ class BincountTest(test_util.TensorFlowTestCase):
         else:
           weights = np.random.random(num_samples)
         self.assertAllEqual(
-            math_ops.bincount(arr, weights=weights).eval(),
+            math_ops.bincount(arr, weights).eval(),
             np.bincount(arr, weights))
 
   def test_zero_weights(self):
     with self.test_session():
       self.assertAllEqual(
-          math_ops.bincount(np.arange(1000), weights=np.zeros(1000)).eval(),
+          math_ops.bincount(np.arange(1000), np.zeros(1000)).eval(),
           np.zeros(1000))
 
   def test_negative(self):
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index fe4a47b9ae..d3931740f2 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -2026,9 +2026,9 @@ def tanh(x, name=None):
 
 
 def bincount(arr,
+             weights=None,
              minlength=None,
              maxlength=None,
-             weights=None,
              dtype=dtypes.int32):
   """Counts the number of occurrences of each value in an integer array.
 
@@ -2040,13 +2040,13 @@ def bincount(arr,
 
   Args:
     arr: An int32 tensor of non-negative values.
+    weights: If non-None, must be the same shape as arr. For each value in
+        `arr`, the bin will be incremented by the corresponding weight instead
+        of 1.
     minlength: If given, ensures the output has length at least `minlength`,
         padding with zeros at the end if necessary.
     maxlength: If given, skips values in `arr` that are equal or greater than
         `maxlength`, ensuring that the output has length at most `maxlength`.
-    weights: If non-None, must be the same shape as arr. For each value in
-        `arr`, the bin will be incremented by the corresponding weight instead
-        of 1.
     dtype: If `weights` is None, determines the type of the output bins.
 
   Returns:
-- 
GitLab


From 60e803ae8a862b6ced7e84c4d9c3077d6297d010 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 18 Apr 2017 11:26:42 -0800
Subject: [PATCH 0593/1563] Vulcanize TensorBoard (for the pip package)

This new version fixes a bug in the graph and embedding projector dashboards. They had been initialized before being added to the DOM, which is problematic because initialization of those dashboards depends on properties of the DOM.
Change: 153495107
---
 .../tensorboard/dist/tf-tensorboard.html      | 52 +++++++++++++------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 10721e41e9..2a0a029ffa 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -4582,7 +4582,7 @@ var VZ;
                 // If b===a, we would create an empty range. We instead select the range
                 // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
                 // extra padding on the top and bottom of the plot.
-                padding = Math.abs(a) * 1.1;
+                padding = Math.abs(a) * 1.1 + 1.1;
             }
             else {
                 padding = span * 0.2;
@@ -5332,7 +5332,7 @@ var VZ;
                 // If b===a, we would create an empty range. We instead select the range
                 // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
                 // extra padding on the top and bottom of the plot.
-                padding = Math.abs(a) * 1.1;
+                padding = Math.abs(a) * 1.1 + 1.1;
             }
             else {
                 padding = span * 0.2;
@@ -17812,11 +17812,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   properties: {
     _datasets: Object,
     _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
-    backend: {type: Object, observer: '_backendChanged'},
+    backend: Object,
     debuggerDataEnabled: Boolean,
     allStepsModeEnabled: Boolean,
     specificHealthPillStep: {type: Number, value: 0},
     healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
+    _isAttached: Boolean,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
     // Whether health pills are currently being loaded, in which case we may want to say show a
     // spinner.
     _areHealthPillsLoading: Boolean,
@@ -17845,7 +17848,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   },
   observers: [
     '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+    '_maybeInitializeDashboard(backend, _isAttached)',
   ],
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
   reload: function() {
     if (!this.debuggerDataEnabled ||
         !this.healthPillsToggledOn ||
@@ -17861,7 +17871,14 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     // would not change across reloads.
     this._requestHealthPills();
   },
-  _backendChanged: function(backend) {
+  _maybeInitializeDashboard: function(backend, isAttached) {
+    if (this._initialized || !backend || !isAttached) {
+      // Either this dashboard is already initialized ... or we are not yet ready to initialize.
+      return;
+    }
+
+    // Set this to true so we only initialize once.
+    this._initialized = true;
     Promise.all([backend.graphRuns(), backend.runMetadataRuns()])
       .then(function(result) {
         var runsWithGraph = result[0].sort(VZ.Sorting.compareTagNames);
@@ -18846,6 +18863,7 @@ paper-dropdown-menu paper-item {
           </p>
           <p>
             One option is using a <a target="_blank" href="https://gist.github.com/">github gist</a>.
+            If you choose this approach, make sure to link directly to the raw file.
           </p>
         </div>
         <div>
@@ -19822,23 +19840,25 @@ TF.Dashboard.VzProjectorDashboard = Polymer({
   },
   properties: {
     dataNotFound: Boolean,
-    routePrefix: String
+    routePrefix: String,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
   },
   behaviors: [
     TF.Dashboard.DashboardBehavior("embeddings"),
   ],
-  observers: [
-    "_routePrefixSet(routePrefix)",
-  ],
   reload: function() {
     // Do not reload the embedding projector. Reloading could take a long time.
   },
-  _routePrefixSet: function(routePrefix) {
-    if (routePrefix === undefined) {
-      // The route prefix has not been set yet.
+  attached: function() {
+    if (this._initialized) {
       return;
     }
-    d3.json(routePrefix + '/runs', (err, runs) => {
+
+    // Set this to true so we only initialize once.
+    this._initialized = true;
+
+    d3.json(this.routePrefix + '/runs', (err, runs) => {
       this.set('dataNotFound', runs.length === 0);
     });
   },
@@ -25619,8 +25639,8 @@ var DataPanel = (function (_super) {
             embeddings: [{
                     tensorName: 'My tensor',
                     tensorShape: [1000, 50],
-                    tensorPath: 'https://gist.github.com/.../tensors.tsv',
-                    metadataPath: 'https://gist.github.com/.../optional.metadata.tsv',
+                    tensorPath: 'https://raw.githubusercontent.com/.../tensors.tsv',
+                    metadataPath: 'https://raw.githubusercontent.com/.../optional.metadata.tsv',
                 }],
         };
         this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
@@ -25642,7 +25662,7 @@ var DataPanel = (function (_super) {
         bookmarksFieldCheckbox.addEventListener('change', function () {
             if (bookmarksFieldCheckbox.checked) {
                 projectorConfigTemplateJson.embeddings[0].bookmarksPath =
-                    'https://gist.github.com/.../bookmarks.txt';
+                    'https://raw.githubusercontent.com/.../bookmarks.txt';
             }
             else {
                 delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
@@ -25653,7 +25673,7 @@ var DataPanel = (function (_super) {
         metadataFieldCheckbox.addEventListener('change', function () {
             if (metadataFieldCheckbox.checked) {
                 projectorConfigTemplateJson.embeddings[0].metadataPath =
-                    'https://gist.github.com/.../optional.metadata.tsv';
+                    'https://raw.githubusercontent.com/.../optional.metadata.tsv';
             }
             else {
                 delete projectorConfigTemplateJson.embeddings[0].metadataPath;
-- 
GitLab


From dcb1e2166ae4cb321e11644acc9bc909c05446e9 Mon Sep 17 00:00:00 2001
From: Brennan Saeta <saeta@google.com>
Date: Thu, 20 Apr 2017 12:44:24 -0800
Subject: [PATCH 0594/1563] Fix const-ness of master_env.

A recent change in grpc_server_lib removed const from
the master_session_factory function. This change fixes
master_env.h to accurately reflect the new type
signature.
Change: 153751309
---
 tensorflow/core/distributed_runtime/master_env.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/distributed_runtime/master_env.h b/tensorflow/core/distributed_runtime/master_env.h
index 01218fb155..a155bd384d 100644
--- a/tensorflow/core/distributed_runtime/master_env.h
+++ b/tensorflow/core/distributed_runtime/master_env.h
@@ -56,7 +56,7 @@ struct MasterEnv {
   // `MasterSession`, which may not be null. Ownership of the
   // `MasterEnv*` is retained by the caller.
   std::function<MasterSession*(
-      const SessionOptions&, MasterEnv*,
+      SessionOptions, MasterEnv*,
       std::unique_ptr<std::vector<std::unique_ptr<Device>>>)>
       master_session_factory;
 };
-- 
GitLab


From 54ce98f636a927eb8685ba743fd29f111f552e93 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 20 Apr 2017 12:46:53 -0800
Subject: [PATCH 0595/1563] Fix missing assertion methods in
 core_rnn_cell_test.py

The assertEmpty and assertNontEmpty methods do not appear to be universally available across the environments that TF is tested on.
Change: 153751634
---
 .../contrib/rnn/python/kernel_tests/core_rnn_cell_test.py     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
index f10db377c3..5fc54f62d7 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
@@ -366,8 +366,8 @@ class RNNCellTest(test.TestCase):
       ix = 0 if "gpu" in step_stats.dev_stats[0].device else 1
       gpu_stats = step_stats.dev_stats[ix].node_stats
       cpu_stats = step_stats.dev_stats[1 - ix].node_stats
-      self.assertEmpty([s for s in cpu_stats if "gru_cell" in s.node_name])
-      self.assertNotEmpty([s for s in gpu_stats if "gru_cell" in s.node_name])
+      self.assertFalse([s for s in cpu_stats if "gru_cell" in s.node_name])
+      self.assertTrue([s for s in gpu_stats if "gru_cell" in s.node_name])
 
   def testUsingSecondCellInScopeWithExistingVariablesFails(self):
     # This test should go away when this behavior is no longer an
-- 
GitLab


From 09097763dc5d578e972b2281c7863eefb0b44522 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 12:47:32 -0800
Subject: [PATCH 0596/1563] Add a subgraph recomputation helper function to
 Grappler's memory optimzer

No optimizations make use of it yet.
Change: 153751713
---
 .../grappler/optimizers/memory_optimizer.cc   | 53 +++++++++++
 .../grappler/optimizers/memory_optimizer.h    | 10 +++
 .../optimizers/memory_optimizer_test.cc       | 89 +++++++++++++++++++
 3 files changed, 152 insertions(+)

diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer.cc b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
index 24c6ab12ef..faf2ce153a 100644
--- a/tensorflow/core/grappler/optimizers/memory_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
@@ -14,7 +14,10 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
+
 #include <unordered_set>
+#include <vector>
+
 #include "tensorflow/core/framework/attr_value.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
 #include "tensorflow/core/grappler/grappler_item.h"
@@ -24,6 +27,56 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+const char* kRecomputedNodePrefix = "Recomputed";
+
+string RecomputedOrOriginalNodeName(
+    const std::unordered_set<string>& recomputed_node_names,
+    const string& original_node_name) {
+  if (recomputed_node_names.find(original_node_name) ==
+      recomputed_node_names.end()) {
+    return original_node_name;
+  } else {
+    return AddPrefixToNodeName(original_node_name, kRecomputedNodePrefix);
+  }
+}
+
+void RecomputeSubgraph(
+    const std::vector<const NodeDef*>& recomputed_source_nodes,
+    const string& recompute_trigger_node_name,
+    const std::vector<NodeDef*>& target_nodes, GraphDef* graph) {
+  std::unordered_set<string> recomputed_node_names;
+  for (const NodeDef* to_recompute : recomputed_source_nodes) {
+    recomputed_node_names.insert(to_recompute->name());
+  }
+  // Create the recomputed sub-graph
+  for (const NodeDef* original_node : recomputed_source_nodes) {
+    NodeDef* copied_node = graph->add_node();
+    copied_node->set_name(
+        AddPrefixToNodeName(original_node->name(), kRecomputedNodePrefix));
+    copied_node->set_op(original_node->op());
+    *copied_node->mutable_attr() = original_node->attr();
+    copied_node->set_device(original_node->device());
+    for (const string& original_input_name : original_node->input()) {
+      // Set inputs which are internal to the copied subgraph to their copied
+      // versions.
+      *copied_node->add_input() = RecomputedOrOriginalNodeName(
+          recomputed_node_names, original_input_name);
+    }
+    // Set control dependencies on the recomputed nodes so that they are not run
+    // until the specified trigger runs.
+    *copied_node->add_input() =
+        strings::StrCat("^", recompute_trigger_node_name);
+  }
+  // Set the inputs of nodes in the target subgraph to the recomputed nodes
+  // where applicable.
+  for (NodeDef* target_node : target_nodes) {
+    for (string& target_input_name : *target_node->mutable_input()) {
+      target_input_name = RecomputedOrOriginalNodeName(recomputed_node_names,
+                                                       target_input_name);
+    }
+  }
+}
+
 std::pair<NodeDef*, NodeDef*> BuildSwapPair(NodeDef* node, int input_to_swap,
                                             GraphDef* graph) {
   string tensor_to_swap = strings::StrCat(node->name(), "_", input_to_swap);
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer.h b/tensorflow/core/grappler/optimizers/memory_optimizer.h
index 463067738b..dfb24c05c9 100644
--- a/tensorflow/core/grappler/optimizers/memory_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
 #define TENSORFLOW_GRAPPLER_OPTIMIZERS_MEMORY_OPTIMIZER_H_
 
+#include <vector>
+
 #include "tensorflow/core/grappler/optimizers/graph_optimizer.h"
 
 namespace tensorflow {
@@ -36,6 +38,14 @@ class MemoryOptimizer : public GraphOptimizer {
                 const GraphDef& pruned_graph, double result) override;
 };
 
+// Helper function to recompute a sub-graph (recomputed_source_nodes) on a
+// trigger. Edges from recomputed_source_nodes to target_nodes are changed to
+// start from the recomputed nodes.
+void RecomputeSubgraph(
+    const std::vector<const NodeDef*>& recomputed_source_nodes,
+    const string& recompute_trigger_node_name,
+    const std::vector<NodeDef*>& target_nodes, GraphDef* graph);
+
 }  // end namespace grappler
 }  // end namespace tensorflow
 
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
index 9defa72cff..18062e26ee 100644
--- a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
@@ -14,6 +14,9 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
+
+#include <vector>
+
 #include "tensorflow/cc/ops/standard_ops.h"
 #include "tensorflow/core/framework/node_def.pb.h"
 #include "tensorflow/core/grappler/grappler_item.h"
@@ -25,6 +28,92 @@ namespace tensorflow {
 namespace grappler {
 namespace {
 
+class RecomputeSubgraphTest : public ::testing::Test {};
+
+TEST_F(RecomputeSubgraphTest, SimpleSubgraph) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+
+  Output a = ops::Const(s.WithOpName("a"), 1.f, {2, 3, 4});
+  Output b = ops::AddN(s.WithOpName("b"), {a});  // Recomputed
+  Output c = ops::AddN(s.WithOpName("c"), {b});
+  Output d = ops::AddN(s.WithOpName("d"), {c});
+  Output e = ops::AddN(s.WithOpName("e"), {d, b});
+  Output f = ops::AddN(s.WithOpName("f"), {e, a});
+
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  EXPECT_EQ(6, item.graph.node_size());
+  NodeMap pre_transform_node_map(&item.graph);
+  std::vector<const NodeDef*> recomputed_source_nodes;
+  recomputed_source_nodes.push_back(pre_transform_node_map.GetNode(b.name()));
+  std::vector<NodeDef*> target_nodes;
+  target_nodes.push_back(pre_transform_node_map.GetNode(e.name()));
+  RecomputeSubgraph(recomputed_source_nodes, d.name(), target_nodes,
+                    &item.graph);
+  NodeMap post_transform_node_map(&item.graph);
+  EXPECT_EQ(7, item.graph.node_size());
+  NodeDef* transformed_e = post_transform_node_map.GetNode(e.name());
+  EXPECT_EQ(2, transformed_e->input_size());
+  EXPECT_EQ("d", transformed_e->input(0));
+  EXPECT_EQ("Recomputed-b", transformed_e->input(1));
+  NodeDef* recomputed_b = post_transform_node_map.GetNode("Recomputed-b");
+  EXPECT_EQ(2, recomputed_b->input_size());
+  EXPECT_EQ("a", recomputed_b->input(0));
+  EXPECT_EQ("^d", recomputed_b->input(1).substr(0, 2));
+}
+
+TEST_F(RecomputeSubgraphTest, MultiNode) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+
+  Output a = ops::Const(s.WithOpName("Conv"), 1.f, {2, 3, 4});
+  Output b = ops::AddN(s.WithOpName("BN"), {a});    // Recomputed
+  Output c = ops::AddN(s.WithOpName("ReLU"), {b});  // Recomputed
+  Output d = ops::AddN(s.WithOpName("Conv1"), {c});
+
+  Output trigger = ops::Const(s.WithOpName("BN1Grad"), 0.f, {2, 3, 4});
+  Output e = ops::AddN(s.WithOpName("Conv1Grad"), {trigger, c});
+  Output f = ops::AddN(s.WithOpName("ReLUGrad"), {e, c});
+  Output g = ops::AddN(s.WithOpName("BNGrad"), {f, a});
+  Output h = ops::AddN(s.WithOpName("ConvGrad"), {g});
+
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  EXPECT_EQ(9, item.graph.node_size());
+  NodeMap pre_transform_node_map(&item.graph);
+  std::vector<const NodeDef*> recomputed_source_nodes;
+  recomputed_source_nodes.push_back(pre_transform_node_map.GetNode(b.name()));
+  recomputed_source_nodes.push_back(pre_transform_node_map.GetNode(c.name()));
+  std::vector<NodeDef*> target_nodes;
+  target_nodes.push_back(pre_transform_node_map.GetNode(e.name()));
+  target_nodes.push_back(pre_transform_node_map.GetNode(f.name()));
+  target_nodes.push_back(pre_transform_node_map.GetNode(g.name()));
+  RecomputeSubgraph(recomputed_source_nodes, trigger.name(), target_nodes,
+                    &item.graph);
+  NodeMap post_transform_node_map(&item.graph);
+  EXPECT_EQ(11, item.graph.node_size());
+  NodeDef* transformed_e = post_transform_node_map.GetNode(e.name());
+  EXPECT_EQ(2, transformed_e->input_size());
+  EXPECT_EQ("BN1Grad", transformed_e->input(0));
+  EXPECT_EQ("Recomputed-ReLU", transformed_e->input(1));
+  NodeDef* transformed_f = post_transform_node_map.GetNode(f.name());
+  EXPECT_EQ(2, transformed_f->input_size());
+  EXPECT_EQ("Conv1Grad", transformed_f->input(0));
+  EXPECT_EQ("Recomputed-ReLU", transformed_f->input(1));
+  NodeDef* transformed_g = post_transform_node_map.GetNode(g.name());
+  EXPECT_EQ(2, transformed_g->input_size());
+  EXPECT_EQ("ReLUGrad", transformed_g->input(0));
+  EXPECT_EQ("Conv", transformed_g->input(1));
+
+  NodeDef* recomputed_b = post_transform_node_map.GetNode("Recomputed-BN");
+  EXPECT_EQ(2, recomputed_b->input_size());
+  EXPECT_EQ("Conv", recomputed_b->input(0));
+  EXPECT_EQ("^BN1Grad", recomputed_b->input(1).substr(0, 8));
+  NodeDef* recomputed_c = post_transform_node_map.GetNode("Recomputed-ReLU");
+  EXPECT_EQ(2, recomputed_c->input_size());
+  EXPECT_EQ("Recomputed-BN", recomputed_c->input(0));
+  EXPECT_EQ("^BN1Grad", recomputed_c->input(1).substr(0, 8));
+}
+
 class MemoryOptimizerTest : public ::testing::Test {};
 
 TEST_F(MemoryOptimizerTest, SimpleSwapping) {
-- 
GitLab


From c0088ae3d2541d8e00fc238377dd802a811624f3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 12:52:35 -0800
Subject: [PATCH 0597/1563] [XLA] Fix the parameter instruction printing issue

Append the parameter number to the fusion parameter name, and use the parameter
name rather the instruction name in creating the new parameter.

Show the paramameter number when printing out parameter instructions.
Change: 153752424
---
 tensorflow/compiler/xla/service/hlo_computation.cc   | 10 +++++++---
 tensorflow/compiler/xla/service/hlo_instruction.cc   |  8 ++++++--
 tensorflow/compiler/xla/service/hlo_instruction.h    |  5 +++++
 tensorflow/compiler/xla/service/hlo_matchers_test.cc |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_computation.cc b/tensorflow/compiler/xla/service/hlo_computation.cc
index 526c1c58b3..0fb8c06f88 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation.cc
@@ -93,6 +93,10 @@ HloInstruction* HloComputation::AddInstructionInternal(
   // Generate a unique name for the instruction.
   instruction->set_name(
       instruction_name_uniquer_.GetUniqueName(instruction->name()));
+  if (instruction->opcode() == HloOpcode::kParameter) {
+    instruction->set_parameter_name(
+        instruction_name_uniquer_.GetUniqueName(instruction->parameter_name()));
+  }
   Reparent(instruction.get());
   HloInstruction* pinst = instruction.get();
   instruction_iterators_[pinst] =
@@ -127,9 +131,9 @@ Status HloComputation::RemoveParameter(int64 param_no) {
 
   while (param_no < param_instructions_.size()) {
     param_instruction = param_instructions_[param_no];
-    HloInstruction* new_instr =
-        AddInstructionInternal(HloInstruction::CreateParameter(
-            param_no, param_instruction->shape(), param_instruction->name()));
+    HloInstruction* new_instr = AddInstructionInternal(
+        HloInstruction::CreateParameter(param_no, param_instruction->shape(),
+                                        param_instruction->parameter_name()));
     TF_RETURN_IF_ERROR(param_instruction->ReplaceAllUsesWith(new_instr));
     new_instr->SetParentFusion(root_instruction_->fusion_instruction());
     param_instructions_[param_no] = new_instr;
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 1ede4e963f..930a4fdf1b 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -577,8 +577,9 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
       // instruction. Add it as an operand and add a corresponding fused
       // parameter instruction.
       int64 param_no = fused_parameters_.size();
-      std::unique_ptr<HloInstruction> param_instruction =
-          CreateParameter(param_no, operand->shape(), "fusion_param");
+      std::unique_ptr<HloInstruction> param_instruction = CreateParameter(
+          param_no, operand->shape(),
+          tensorflow::strings::StrCat("fusion_param.", param_no));
 
       param_instruction->parent_fusion_instruction_ = this;
       fused_param = fused_instructions_computation_->AddParameter(
@@ -1421,6 +1422,8 @@ string HloInstruction::ToString(bool compact_operands) const {
       // Do not show large constants.
       operands = "{...}";
     }
+  } else if (opcode() == HloOpcode::kParameter) {
+    operands = Printf("%lld", parameter_number_);
   } else {
     tensorflow::gtl::ArraySlice<HloInstruction*> slice(operands_);
     const int64 kMaxOperandsToShowIfCompact = 4;
@@ -1482,6 +1485,7 @@ string HloInstruction::ToString(bool compact_operands) const {
       !metadata_.source_file().empty()) {
     StrAppend(&extra, " # metadata=", metadata_.ShortDebugString());
   }
+
   return Printf("%s = %s %s(%s)%s", name().c_str(),
                 ShapeUtil::HumanStringWithLayout(shape()).c_str(),
                 ExtendedOpcodeStr().c_str(), operands.c_str(), extra.c_str());
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index f57b27f605..4647c2ca85 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -421,6 +421,11 @@ class HloInstruction {
     return parameter_name_;
   }
 
+  void set_parameter_name(const string& str) {
+    CHECK_EQ(HloOpcode::kParameter, opcode_);
+    parameter_name_ = str;
+  }
+
   // Returns the dimension sizes or numbers associated with this instruction.
   //
   // Precondition: opcode() is one of: concatenate, reduce, broadcast, reshape,
diff --git a/tensorflow/compiler/xla/service/hlo_matchers_test.cc b/tensorflow/compiler/xla/service/hlo_matchers_test.cc
index 4ff83c2de7..1465d1cacd 100644
--- a/tensorflow/compiler/xla/service/hlo_matchers_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_matchers_test.cc
@@ -62,7 +62,7 @@ TEST(HloMatchersTest, Test) {
          "doesn't match expected:\n\t"
          "multiply(add, add), \n"
          "operand 0:\n\t"
-         "%param = f32[1]{0} parameter()\n"
+         "%param = f32[1]{0} parameter(0)\n"
          "doesn't match expected:\n\t"
          "add"));
 }
-- 
GitLab


From 17fdd80807b817b0940e572fea6e555c02ace71f Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 20 Apr 2017 13:25:52 -0800
Subject: [PATCH 0598/1563] [tf contrib seq2seq] Changes to dynamic decoding

1. dynamic_decode now returns a third parameter: the sequence lengths
   from decoding (minibatch entries that finished earlier have a shorter
   sequence length)

2. beam search decoder now uses the gather_tree C++ op

3. the gather_tree c++ op now expects sequence_length to be a matrix shaped
   `[batch_size, beam_width]` (each beam may have its own sequence length).
Change: 153756869
---
 .../seq2seq/kernels/beam_search_ops.cc        | 40 ++++----
 .../contrib/seq2seq/kernels/beam_search_ops.h |  2 +-
 .../seq2seq/kernels/beam_search_ops_gpu.cu.cc |  4 +-
 .../contrib/seq2seq/ops/beam_search_ops.cc    | 11 ++-
 .../kernel_tests/attention_wrapper_test.py    |  2 +-
 .../kernel_tests/beam_search_decoder_test.py  | 98 ++++++++++---------
 .../kernel_tests/beam_search_ops_test.py      |  9 +-
 .../python/kernel_tests/decoder_test.py       | 14 ++-
 .../seq2seq/python/ops/beam_search_decoder.py | 47 ++-------
 .../contrib/seq2seq/python/ops/decoder.py     | 37 ++++---
 10 files changed, 131 insertions(+), 133 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc
index 3b0568794d..ec493b8463 100644
--- a/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc
+++ b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.cc
@@ -56,14 +56,19 @@ class GatherTreeOp : public OpKernel {
         errors::InvalidArgument("step_ids must be a 3-tensor, saw shape: ",
                                 step_ids_shape.DebugString()));
     OP_REQUIRES(
-        ctx, TensorShapeUtils::IsVector(sequence_length.shape()),
-        errors::InvalidArgument("sequence_length must be a vector, saw shape: ",
+        ctx, TensorShapeUtils::IsMatrix(sequence_length.shape()),
+        errors::InvalidArgument("sequence_length must be a matrix, saw shape: ",
                                 sequence_length.shape().DebugString()));
     OP_REQUIRES(ctx, sequence_length.dim_size(0) == step_ids_shape.dim_size(1),
                 errors::InvalidArgument(
-                    "Inconsistent batch sizes: sequence_length.shape[1] (",
+                    "Inconsistent batch sizes: sequence_length.shape[0] (",
                     sequence_length.dim_size(0), ") != ", "step_ids.shape[1] (",
-                    step_ids_shape.dim_size(0), ")"));
+                    step_ids_shape.dim_size(1), ")"));
+    OP_REQUIRES(ctx, sequence_length.dim_size(1) == step_ids_shape.dim_size(2),
+                errors::InvalidArgument(
+                    "Inconsistent batch sizes: sequence_length.shape[1] (",
+                    sequence_length.dim_size(1), ") != ", "step_ids.shape[2] (",
+                    step_ids_shape.dim_size(2), ")"));
     OP_REQUIRES(
         ctx, step_ids_shape == parent_ids.shape(),
         errors::InvalidArgument(
@@ -74,7 +79,7 @@ class GatherTreeOp : public OpKernel {
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, step_ids_shape, &beams));
     typename TTypes<T, 3>::ConstTensor step_ids_t = step_ids.tensor<T, 3>();
     typename TTypes<T, 3>::ConstTensor parent_ids_t = parent_ids.tensor<T, 3>();
-    typename TTypes<T>::ConstVec seq_len_t = sequence_length.vec<T>();
+    typename TTypes<T>::ConstMatrix seq_len_t = sequence_length.matrix<T>();
     typename TTypes<T, 3>::Tensor beams_t = beams->tensor<T, 3>();
     functor::GatherTree<Device, T>()(ctx, device, step_ids_t, parent_ids_t,
                                      seq_len_t, beams_t);
@@ -96,7 +101,7 @@ struct GatherTree<CPUDevice, int32> {
   void operator()(OpKernelContext* ctx, const CPUDevice& d,
                   typename TTypes<int32, 3>::ConstTensor step_ids,
                   typename TTypes<int32, 3>::ConstTensor parent_ids,
-                  typename TTypes<int32>::ConstVec sequence_length,
+                  typename TTypes<int32>::ConstMatrix sequence_length,
                   typename TTypes<int32, 3>::Tensor beams) {
     const int64 max_time = parent_ids.dimension(0);
     const int64 batch_size = parent_ids.dimension(1);
@@ -104,15 +109,10 @@ struct GatherTree<CPUDevice, int32> {
     beams.setConstant(-1);
 
     auto DoWork = [&, ctx](int start_batch_beam, int limit_batch_beam) {
-      int32 seq_len_b = -1;
-      int32 old_batch = -1;
       for (int32 i = start_batch_beam; i < limit_batch_beam; ++i) {
         const int32 batch = i / beam_width;
         const int32 beam = i % beam_width;
-        if (batch != old_batch) {
-          seq_len_b = sequence_length(batch);
-          old_batch = batch;
-        }
+        int32 seq_len_b = sequence_length(batch, beam);
         if (seq_len_b == 0) {
           continue;
         }
@@ -148,14 +148,14 @@ struct GatherTree<CPUDevice, int32> {
 
 #if GOOGLE_CUDA
 namespace functor {
-#define DECLARE_GPU_SPEC(T)                          \
-  template <>                                        \
-  void GatherTree<GPUDevice, T>::operator()(         \
-      OpKernelContext* ctx, const GPUDevice& d,      \
-      typename TTypes<T, 3>::ConstTensor step_ids,   \
-      typename TTypes<T, 3>::ConstTensor parent_ids, \
-      typename TTypes<T>::ConstVec sequence_length,  \
-      typename TTypes<T, 3>::Tensor beams);          \
+#define DECLARE_GPU_SPEC(T)                            \
+  template <>                                          \
+  void GatherTree<GPUDevice, T>::operator()(           \
+      OpKernelContext* ctx, const GPUDevice& d,        \
+      typename TTypes<T, 3>::ConstTensor step_ids,     \
+      typename TTypes<T, 3>::ConstTensor parent_ids,   \
+      typename TTypes<T>::ConstMatrix sequence_length, \
+      typename TTypes<T, 3>::Tensor beams);            \
   extern template struct GatherTree<GPUDevice, T>;
 
 DECLARE_GPU_SPEC(int32);
diff --git a/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h
index 501a2eae84..124d07264e 100644
--- a/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h
+++ b/tensorflow/contrib/seq2seq/kernels/beam_search_ops.h
@@ -31,7 +31,7 @@ struct GatherTree {
   void operator()(OpKernelContext* ctx, const Device& d,
                   typename TTypes<T, 3>::ConstTensor step_ids,
                   typename TTypes<T, 3>::ConstTensor parent_ids,
-                  typename TTypes<T>::ConstVec sequence_length,
+                  typename TTypes<T>::ConstMatrix sequence_length,
                   typename TTypes<T, 3>::Tensor beams);
 };
 
diff --git a/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc b/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc
index 8d8fc81001..e3c0d0bfa9 100644
--- a/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc
+++ b/tensorflow/contrib/seq2seq/kernels/beam_search_ops_gpu.cu.cc
@@ -33,7 +33,7 @@ __global__ void GatherTreeOpKernel(const int32 batch_size, const int32 max_time,
   CUDA_1D_KERNEL_LOOP(i, batch_size * beam_width) {
     const int32 batch = i / beam_width;
     const int32 beam = i % beam_width;
-    const int32 seq_len_b = ldg(sequence_length + batch);
+    const int32 seq_len_b = ldg(sequence_length + batch * beam_width + beam);
 #define GET_IX(time_ix, beam_ix) \
   (batch_size * beam_width * (time_ix) + beam_width * batch + (beam_ix))
     const int32 initial_beam_ix = GET_IX(seq_len_b - 1, beam);
@@ -59,7 +59,7 @@ struct GatherTree<GPUDevice, T> {
   void operator()(OpKernelContext* ctx, const GPUDevice& d,
                   typename TTypes<T, 3>::ConstTensor step_ids,
                   typename TTypes<T, 3>::ConstTensor parent_ids,
-                  typename TTypes<T>::ConstVec sequence_length,
+                  typename TTypes<T>::ConstMatrix sequence_length,
                   typename TTypes<T, 3>::Tensor beams) {
     const int32 max_time = parent_ids.dimension(0);
     const int32 batch_size = parent_ids.dimension(1);
diff --git a/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc b/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc
index c167736d88..6c445cd460 100644
--- a/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc
+++ b/tensorflow/contrib/seq2seq/ops/beam_search_ops.cc
@@ -32,17 +32,20 @@ REGISTER_OP("GatherTree")
       ShapeHandle step_ids, parent_ids, sequence_length;
 
       // step_ids, parent_ids, and output are all shaped:
-      //   [batch_size, max_time, beam_width].
-      // sequence_length is shaped [batch_size].
+      //   [max_time, batch_size, beam_width].
+      // sequence_length is shaped [batch_size, beam_width].
       TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 3, &step_ids));
       TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 3, &parent_ids));
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(2), 1, &sequence_length));
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(2), 2, &sequence_length));
 
       DimensionHandle batch_size = c->Dim(step_ids, 1);
+      DimensionHandle beam_width = c->Dim(step_ids, 2);
 
       TF_RETURN_IF_ERROR(c->Merge(step_ids, parent_ids, &step_ids));
       TF_RETURN_IF_ERROR(
           c->Merge(batch_size, c->Dim(sequence_length, 0), &batch_size));
+      TF_RETURN_IF_ERROR(
+          c->Merge(beam_width, c->Dim(sequence_length, 1), &beam_width));
 
       c->set_output(0, step_ids);
       return tensorflow::Status::OK();
@@ -58,7 +61,7 @@ TODO(ebrevdo): fill in
 
 step_ids: `[max_time, batch_size, beam_width]`.
 parent_ids: `[max_time, batch_size, beam_width]`.
-sequence_length: `[batch_size]`.
+sequence_length: `[batch_size, beam_width]`.
 beams: `[max_time, batch_size, beam_width]`.
 )doc");
 
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index aa84ae060c..888479e218 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -109,7 +109,7 @@ class AttentionWrapperTest(test.TestCase):
             initial_state=cell.zero_state(
                 dtype=dtypes.float32, batch_size=batch_size))
 
-        final_outputs, final_state = decoder.dynamic_decode(my_decoder)
+        final_outputs, final_state, _ = decoder.dynamic_decode(my_decoder)
 
       self.assertTrue(
           isinstance(final_outputs, basic_decoder.BasicDecoderOutput))
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
index 512df18317..a72d962d78 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
@@ -24,6 +24,7 @@ import numpy as np
 from tensorflow.contrib.rnn import core_rnn_cell
 from tensorflow.contrib.seq2seq.python.ops import attention_wrapper
 from tensorflow.contrib.seq2seq.python.ops import beam_search_decoder
+from tensorflow.contrib.seq2seq.python.ops import beam_search_ops
 from tensorflow.contrib.seq2seq.python.ops import decoder
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -41,24 +42,32 @@ class TestGatherTree(test.TestCase):
   """Tests the gather_tree function."""
 
   def test_gather_tree(self):
-    predicted_ids = np.array([[[1, 2, 3], [4, 5, 6], [7, 8, 9]],
-                              [[2, 3, 4], [5, 6, 7],
-                               [8, 9, 10]]]).transpose([1, 0, 2])
-    parent_ids = np.array([
-        [[0, 0, 0], [0, 1, 1], [2, 1, 2]],
-        [[0, 0, 0], [1, 2, 0], [2, 1, 1]],
-    ]).transpose([1, 0, 2])
-    expected_result = np.array([[[2, 2, 2], [6, 5, 6], [7, 8, 9]],
-                                [[2, 4, 4], [7, 6, 6],
-                                 [8, 9, 10]]]).transpose([1, 0, 2])
-
-    res = beam_search_decoder._gather_tree(
-        ops.convert_to_tensor(predicted_ids), ops.convert_to_tensor(parent_ids))
+    # (max_time = 3, batch_size = 2, beam_width = 3)
+
+    # create (batch_size, max_time, beam_width) matrix and transpose it
+    predicted_ids = np.array(
+        [[[1, 2, 3], [4, 5, 6], [7, 8, 9]],
+         [[2, 3, 4], [5, 6, 7], [8, 9, 10]]],
+        dtype=np.int32).transpose([1, 0, 2])
+    parent_ids = np.array(
+        [[[0, 0, 0], [0, 1, 1], [2, 1, 2]],
+         [[0, 0, 0], [1, 2, 0], [2, 1, 1]]],
+        dtype=np.int32).transpose([1, 0, 2])
+
+    # sequence_lengths is shaped (batch_size = 2, beam_width = 3)
+    sequence_lengths = [[3, 3, 3], [3, 3, 3]]
+
+    expected_result = np.array(
+        [[[2, 2, 2], [6, 5, 6], [7, 8, 9]],
+         [[2, 4, 4], [7, 6, 6], [8, 9, 10]]]).transpose([1, 0, 2])
+
+    res = beam_search_ops.gather_tree(
+        predicted_ids, parent_ids, sequence_lengths)
 
     with self.test_session() as sess:
       res_ = sess.run(res)
 
-    np.testing.assert_array_equal(expected_result, res_)
+    self.assertAllEqual(expected_result, res_)
 
 
 class TestEosMasking(test.TestCase):
@@ -80,18 +89,18 @@ class TestEosMasking(test.TestCase):
       probs = sess.run(probs)
       masked = sess.run(masked)
 
-      np.testing.assert_array_equal(probs[0][0], masked[0][0])
-      np.testing.assert_array_equal(probs[0][2], masked[0][2])
-      np.testing.assert_array_equal(probs[1][0], masked[1][0])
+      self.assertAllEqual(probs[0][0], masked[0][0])
+      self.assertAllEqual(probs[0][2], masked[0][2])
+      self.assertAllEqual(probs[1][0], masked[1][0])
 
-      np.testing.assert_equal(masked[0][1][0], 0)
-      np.testing.assert_equal(masked[1][1][0], 0)
-      np.testing.assert_equal(masked[1][2][0], 0)
+      self.assertEqual(masked[0][1][0], 0)
+      self.assertEqual(masked[1][1][0], 0)
+      self.assertEqual(masked[1][2][0], 0)
 
       for i in range(1, 5):
-        np.testing.assert_approx_equal(masked[0][1][i], np.finfo('float32').min)
-        np.testing.assert_approx_equal(masked[1][1][i], np.finfo('float32').min)
-        np.testing.assert_approx_equal(masked[1][2][i], np.finfo('float32').min)
+        self.assertAllClose(masked[0][1][i], np.finfo('float32').min)
+        self.assertAllClose(masked[1][1][i], np.finfo('float32').min)
+        self.assertAllClose(masked[1][2][i], np.finfo('float32').min)
 
 
 class TestBeamStep(test.TestCase):
@@ -142,12 +151,11 @@ class TestBeamStep(test.TestCase):
       outputs_, next_state_, state_, log_probs_ = sess.run(
           [outputs, next_beam_state, beam_state, log_probs])
 
-    np.testing.assert_array_equal(outputs_.predicted_ids, [[3, 3, 2], [2, 2,
-                                                                       1]])
-    np.testing.assert_array_equal(outputs_.parent_ids, [[1, 0, 0], [2, 1, 0]])
-    np.testing.assert_array_equal(next_state_.lengths, [[3, 3, 3], [3, 3, 3]])
-    np.testing.assert_array_equal(next_state_.finished, [[False, False, False],
-                                                         [False, False, False]])
+    self.assertAllEqual(outputs_.predicted_ids, [[3, 3, 2], [2, 2, 1]])
+    self.assertAllEqual(outputs_.parent_ids, [[1, 0, 0], [2, 1, 0]])
+    self.assertAllEqual(next_state_.lengths, [[3, 3, 3], [3, 3, 3]])
+    self.assertAllEqual(next_state_.finished, [[False, False, False],
+                                               [False, False, False]])
 
     expected_log_probs = []
     expected_log_probs.append(state_.log_probs[0][[1, 0, 0]])
@@ -158,7 +166,7 @@ class TestBeamStep(test.TestCase):
     expected_log_probs[1][0] += log_probs_[1, 2, 2]
     expected_log_probs[1][1] += log_probs_[1, 1, 2]
     expected_log_probs[1][2] += log_probs_[1, 0, 1]
-    np.testing.assert_array_equal(next_state_.log_probs, expected_log_probs)
+    self.assertAllEqual(next_state_.log_probs, expected_log_probs)
 
   def test_step_with_eos(self):
     dummy_cell_state = array_ops.zeros([self.batch_size, self.beam_width])
@@ -197,12 +205,11 @@ class TestBeamStep(test.TestCase):
       outputs_, next_state_, state_, log_probs_ = sess.run(
           [outputs, next_beam_state, beam_state, log_probs])
 
-    np.testing.assert_array_equal(outputs_.parent_ids, [[1, 0, 0], [1, 2, 0]])
-    np.testing.assert_array_equal(outputs_.predicted_ids, [[0, 3, 2], [2, 0,
-                                                                       1]])
-    np.testing.assert_array_equal(next_state_.lengths, [[1, 3, 3], [3, 1, 3]])
-    np.testing.assert_array_equal(next_state_.finished, [[True, False, False],
-                                                         [False, True, False]])
+    self.assertAllEqual(outputs_.parent_ids, [[1, 0, 0], [1, 2, 0]])
+    self.assertAllEqual(outputs_.predicted_ids, [[0, 3, 2], [2, 0, 1]])
+    self.assertAllEqual(next_state_.lengths, [[1, 3, 3], [3, 1, 3]])
+    self.assertAllEqual(next_state_.finished, [[True, False, False],
+                                               [False, True, False]])
 
     expected_log_probs = []
     expected_log_probs.append(state_.log_probs[0][[1, 0, 0]])
@@ -211,7 +218,7 @@ class TestBeamStep(test.TestCase):
     expected_log_probs[0][2] += log_probs_[0, 0, 2]
     expected_log_probs[1][0] += log_probs_[1, 1, 2]
     expected_log_probs[1][2] += log_probs_[1, 0, 1]
-    np.testing.assert_array_equal(next_state_.log_probs, expected_log_probs)
+    self.assertAllEqual(next_state_.log_probs, expected_log_probs)
 
 
 class BeamSearchDecoderTest(test.TestCase):
@@ -259,8 +266,9 @@ class BeamSearchDecoderTest(test.TestCase):
           output_layer=output_layer,
           length_penalty_weight=0.0)
 
-      final_outputs, final_state = decoder.dynamic_decode(
-          bsd, output_time_major=time_major, maximum_iterations=max_out)
+      final_outputs, final_state, final_sequence_lengths = (
+          decoder.dynamic_decode(
+              bsd, output_time_major=time_major, maximum_iterations=max_out))
 
       def _t(shape):
         if time_major:
@@ -284,16 +292,18 @@ class BeamSearchDecoderTest(test.TestCase):
       sess.run(variables.global_variables_initializer())
       sess_results = sess.run({
           'final_outputs': final_outputs,
-          'final_state': final_state
+          'final_state': final_state,
+          'final_sequence_lengths': final_sequence_lengths
       })
 
-      # Mostly a smoke test
-      time_steps = max_out
+      max_sequence_length = np.max(sess_results['final_sequence_lengths'])
+
+      # A smoke test
       self.assertEqual(
-          _t((batch_size, time_steps, beam_width)),
+          _t((batch_size, max_sequence_length, beam_width)),
           sess_results['final_outputs'].beam_search_decoder_output.scores.shape)
       self.assertEqual(
-          _t((batch_size, time_steps, beam_width)), sess_results[
+          _t((batch_size, max_sequence_length, beam_width)), sess_results[
               'final_outputs'].beam_search_decoder_output.predicted_ids.shape)
 
   def testDynamicDecodeRNNBatchMajorNoAttention(self):
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py
index 542254854a..491d87f62d 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_ops_test.py
@@ -38,7 +38,7 @@ class GatherTreeTest(test.TestCase):
         [[[1, 2, 3], [4, 5, 6], [7, 8, 9], [-1, -1, -1]]])
     parent_ids = _transpose_batch_time(
         [[[0, 0, 0], [0, 1, 1], [2, 1, 2], [-1, -1, -1]]])
-    sequence_length = [3]
+    sequence_length = [[3, 3, 3]]
     expected_result = _transpose_batch_time(
         [[[2, 2, 2], [6, 5, 6], [7, 8, 9], [-1, -1, -1]]])
     beams = beam_search_ops.gather_tree(
@@ -54,7 +54,7 @@ class GatherTreeTest(test.TestCase):
         [[[1, 2, 3], [4, 5, 6], [7, 8, 9], [-1, -1, -1]]])
     parent_ids = _transpose_batch_time(
         [[[0, 0, 0], [0, -1, 1], [2, 1, 2], [-1, -1, -1]]])
-    sequence_length = [3]
+    sequence_length = [[3, 3, 3]]
     with ops.device("/cpu:0"):
       beams = beam_search_ops.gather_tree(
           step_ids=step_ids, parent_ids=parent_ids,
@@ -73,7 +73,7 @@ class GatherTreeTest(test.TestCase):
         [[[1, 2, 3], [4, 5, 6], [7, 8, 9], [-1, -1, -1]]])
     parent_ids = _transpose_batch_time(
         [[[0, 0, 0], [0, -1, 1], [2, 1, 2], [-1, -1, -1]]])
-    sequence_length = [3]
+    sequence_length = [[3, 3, 3]]
     expected_result = _transpose_batch_time(
         [[[2, -1, 2], [6, 5, 6], [7, 8, 9], [-1, -1, -1]]])
     with ops.device("/gpu:0"):
@@ -84,7 +84,8 @@ class GatherTreeTest(test.TestCase):
       self.assertAllEqual(expected_result, beams.eval())
 
   def testGatherTreeBatch(self):
-    sequence_length = [0, 1, 2, 3]
+    # sequence_length is [batch_size, beam_width] = [4, 5]
+    sequence_length = [[0] * 5, [1] * 5, [2] * 5, [3] * 5]
 
     with self.test_session(use_gpu=True):
       # (max_time = 4, batch_size = 4, beam_width = 5)
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py
index 340ec9bbb2..96dc7b4bee 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/decoder_test.py
@@ -60,9 +60,9 @@ class DynamicDecodeRNNTest(test.TestCase):
           initial_state=cell.zero_state(
               dtype=dtypes.float32, batch_size=batch_size))
 
-      final_outputs, final_state = decoder.dynamic_decode(
-          my_decoder, output_time_major=time_major,
-          maximum_iterations=maximum_iterations)
+      final_outputs, final_state, final_sequence_length = (
+          decoder.dynamic_decode(my_decoder, output_time_major=time_major,
+                                 maximum_iterations=maximum_iterations))
 
       def _t(shape):
         if time_major:
@@ -73,6 +73,9 @@ class DynamicDecodeRNNTest(test.TestCase):
           isinstance(final_outputs, basic_decoder.BasicDecoderOutput))
       self.assertTrue(isinstance(final_state, core_rnn_cell.LSTMStateTuple))
 
+      self.assertEqual(
+          (batch_size,),
+          tuple(final_sequence_length.get_shape().as_list()))
       self.assertEqual(
           _t((batch_size, None, cell_depth)),
           tuple(final_outputs.rnn_output.get_shape().as_list()))
@@ -83,7 +86,8 @@ class DynamicDecodeRNNTest(test.TestCase):
       sess.run(variables.global_variables_initializer())
       sess_results = sess.run({
           "final_outputs": final_outputs,
-          "final_state": final_state
+          "final_state": final_state,
+          "final_sequence_length": final_sequence_length,
       })
 
       # Mostly a smoke test
@@ -131,7 +135,7 @@ class DynamicDecodeRNNTest(test.TestCase):
       # Match the variable scope of dynamic_rnn below so we end up
       # using the same variables
       with vs.variable_scope("root") as scope:
-        final_decoder_outputs, final_decoder_state = decoder.dynamic_decode(
+        final_decoder_outputs, final_decoder_state, _ = decoder.dynamic_decode(
             my_decoder,
             # impute_finished=True ensures outputs and final state
             # match those of dynamic_rnn called with sequence_length not None
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index 8f1f74ab09..55ef21a5a0 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -19,9 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
-import numpy as np
 
 from tensorflow.contrib.rnn import core_rnn_cell
+from tensorflow.contrib.seq2seq.python.ops import beam_search_ops
 from tensorflow.contrib.seq2seq.python.ops import decoder
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -33,7 +33,6 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
-from tensorflow.python.ops import script_ops
 from tensorflow.python.util import nest
 
 
@@ -202,20 +201,24 @@ class BeamSearchDecoder(decoder.Decoder):
 
     return (finished, start_inputs, initial_state)
 
-  def finalize(self, outputs, final_state):
+  def finalize(self, outputs, final_state, sequence_lengths):
     """Finalize and return the predicted_ids.
 
     Args:
       outputs: An instance of BeamSearchDecoderOutput.
       final_state: An instance of BeamSearchDecoderState. Passed through to the
         output.
+      sequence_lengths: An `int32` tensor shaped `[batch_size, beam_width]`.
+        The sequence lengths determined for each beam during decode.
 
     Returns:
       outputs: An instance of FinalBeamSearchDecoderOutput where the
         predicted_ids are the result of calling _gather_tree.
       final_state: The same input instance of BeamSearchDecoderState.
     """
-    predicted_ids = _gather_tree(outputs.predicted_ids, outputs.parent_ids)
+    predicted_ids = beam_search_ops.gather_tree(
+        outputs.predicted_ids, outputs.parent_ids,
+        sequence_length=sequence_lengths)
     outputs = FinalBeamSearchDecoderOutput(
         beam_search_decoder_output=outputs, predicted_ids=predicted_ids)
     return outputs, final_state
@@ -536,42 +539,6 @@ def _mask_probs(probs, eos_token, finished):
   return finished_examples + non_finished_examples
 
 
-def _gather_tree_py(values, parents):
-  """Gathers path through a tree backwards from the leave nodes.
-
-  Used to reconstruct beams given their parents.
-
-  Args:
-    values: A [T, batch_size, beam_width] tensor of indices.
-    parents: A [T, batch_size, beam_width] tensor of parent beam ids.
-
-  Returns:
-    The [T, batch_size, beam_width] numpy array of paths. For a given batch
-      entry b, the best path is given by ret[:, b, 0].
-  """
-  num_timesteps = values.shape[0]
-  num_beams = values.shape[2]
-  batch_size = values.shape[1]
-  ret = np.zeros_like(values)  # [T, MB, BW]
-  ret[-1, :, :] = values[-1, :, :]
-  for beam_id in range(num_beams):
-    for batch in range(batch_size):
-      parent = parents[-1][batch][beam_id]
-      for timestep in reversed(range(num_timesteps - 1)):
-        ret[timestep, batch, beam_id] = values[timestep][batch][parent]
-        parent = parents[timestep][batch][parent]
-  # now we are going to return ret as a [ts, mb, bw] tensor
-  return np.array(ret).astype(values.dtype)
-
-
-def _gather_tree(values, parents):
-  """Tensor version of _gather_tree_py."""
-  ret = script_ops.py_func(
-      func=_gather_tree_py, inp=[values, parents], Tout=values.dtype)
-  ret.set_shape(values.get_shape().as_list())
-  return ret
-
-
 def _tensor_gather_helper(gather_indices, gather_from, range_input, range_size,
                           final_shape):
   range_ = array_ops.expand_dims(math_ops.range(range_input) * range_size, 1)
diff --git a/tensorflow/contrib/seq2seq/python/ops/decoder.py b/tensorflow/contrib/seq2seq/python/ops/decoder.py
index ee287b0cf6..ff705715e0 100644
--- a/tensorflow/contrib/seq2seq/python/ops/decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/decoder.py
@@ -154,11 +154,11 @@ def dynamic_decode(decoder,
     scope: Optional variable scope to use.
 
   Returns:
-    `(final_outputs, final_state)`.
+    `(final_outputs, final_state, final_sequence_lengths)`.
 
   Raises:
     TypeError: if `decoder` is not an instance of `Decoder`.
-    ValueError: if maximum_iterations is provided but is not a scalar.
+    ValueError: if `maximum_iterations` is provided but is not a scalar.
   """
   if not isinstance(decoder, Decoder):
     raise TypeError("Expected decoder to be type Decoder, but saw: %s" %
@@ -184,6 +184,8 @@ def dynamic_decode(decoder,
     if maximum_iterations is not None:
       initial_finished = math_ops.logical_or(
           initial_finished, 0 >= maximum_iterations)
+    initial_sequence_lengths = array_ops.zeros_like(
+        initial_finished, dtype=dtypes.int32)
     initial_time = constant_op.constant(0, dtype=dtypes.int32)
 
     def _shape(batch_size, from_shape):
@@ -206,10 +208,10 @@ def dynamic_decode(decoder,
                                             decoder.output_dtype)
 
     def condition(unused_time, unused_outputs_ta, unused_state, unused_inputs,
-                  finished):
+                  finished, unused_sequence_lengths):
       return math_ops.logical_not(math_ops.reduce_all(finished))
 
-    def body(time, outputs_ta, state, inputs, finished):
+    def body(time, outputs_ta, state, inputs, finished, sequence_lengths):
       """Internal while_loop body.
 
       Args:
@@ -217,10 +219,13 @@ def dynamic_decode(decoder,
         outputs_ta: structure of TensorArray.
         state: (structure of) state tensors and TensorArrays.
         inputs: (structure of) input tensors.
-        finished: 1-D bool tensor.
+        finished: bool tensor (keeping track of what's finished).
+        sequence_lengths: int32 tensor (keeping track of time of finish).
 
       Returns:
-        `(time + 1, outputs_ta, next_state, next_inputs, next_finished)`.
+        `(time + 1, outputs_ta, next_state, next_inputs, next_finished,
+          next_sequence_lengths)`.
+        ```
       """
       (next_outputs, decoder_state, next_inputs,
        decoder_finished) = decoder.step(time, inputs, state)
@@ -228,6 +233,10 @@ def dynamic_decode(decoder,
       if maximum_iterations is not None:
         next_finished = math_ops.logical_or(
             next_finished, time + 1 >= maximum_iterations)
+      next_sequence_lengths = array_ops.where(
+          math_ops.logical_and(math_ops.logical_not(finished), next_finished),
+          array_ops.fill(array_ops.shape(sequence_lengths), time + 1),
+          sequence_lengths)
 
       nest.assert_same_structure(state, decoder_state)
       nest.assert_same_structure(outputs_ta, next_outputs)
@@ -260,26 +269,30 @@ def dynamic_decode(decoder,
 
       outputs_ta = nest.map_structure(lambda ta, out: ta.write(time, out),
                                       outputs_ta, emit)
-      return (time + 1, outputs_ta, next_state, next_inputs, next_finished)
+      return (time + 1, outputs_ta, next_state, next_inputs, next_finished,
+              next_sequence_lengths)
 
     res = control_flow_ops.while_loop(
         condition,
         body,
         loop_vars=[
             initial_time, initial_outputs_ta, initial_state, initial_inputs,
-            initial_finished
+            initial_finished, initial_sequence_lengths,
         ],
         parallel_iterations=parallel_iterations,
         swap_memory=swap_memory)
 
     final_outputs_ta = res[1]
     final_state = res[2]
+    final_sequence_lengths = res[5]
 
     final_outputs = nest.map_structure(lambda ta: ta.stack(), final_outputs_ta)
+
+    if hasattr(decoder, "finalize"):
+      final_outputs, final_state = decoder.finalize(
+          final_outputs, final_state, final_sequence_lengths)
+
     if not output_time_major:
       final_outputs = nest.map_structure(_transpose_batch_time, final_outputs)
 
-  if hasattr(decoder, "finalize"):
-    final_outputs, final_state = decoder.finalize(final_outputs, final_state)
-
-  return final_outputs, final_state
+  return final_outputs, final_state, final_sequence_lengths
-- 
GitLab


From 20a52139efd7ddf34740db99d993c66976fc94c1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 13:34:58 -0800
Subject: [PATCH 0599/1563] Add unreduced NONE, and reduced MEAN options for
 losses. Remove "WEIGHTED_" prefix from other Reduction constants. Change:
 153758104

---
 tensorflow/python/kernel_tests/losses_test.py | 77 +++++++++++++---
 tensorflow/python/ops/losses/losses_impl.py   | 90 ++++++++++++-------
 .../golden/tensorflow.losses.-reduction.pbtxt | 12 ++-
 3 files changed, 134 insertions(+), 45 deletions(-)

diff --git a/tensorflow/python/kernel_tests/losses_test.py b/tensorflow/python/kernel_tests/losses_test.py
index 15eeb762d8..40fddd76ff 100644
--- a/tensorflow/python/kernel_tests/losses_test.py
+++ b/tensorflow/python/kernel_tests/losses_test.py
@@ -447,7 +447,8 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
                                      [-100.0, -100.0, 100.0]])
       labels = constant_op.constant([[1, 0, 0], [0, 1, 0], [0, 0, 1]])
       loss = losses.sigmoid_cross_entropy(labels, logits)
-      self.assertEquals(loss.op.name, 'sigmoid_cross_entropy_loss/value')
+      self.assertEquals(logits.dtype, loss.dtype)
+      self.assertEquals('sigmoid_cross_entropy_loss/value', loss.op.name)
       self.assertAlmostEqual(0.0, loss.eval(), 3)
 
   def testLossWithSingleDimPlaceholderForLogitsAndWeights1(self):
@@ -456,6 +457,7 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
     weights = array_ops.ones_like(logits, dtype=dtypes.float32)
 
     loss = losses.sigmoid_cross_entropy(labels, logits, weights)
+    self.assertEquals(logits.dtype, loss.dtype)
 
     with self.test_session() as sess:
       loss = sess.run(loss,
@@ -471,6 +473,7 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
     weights = array_ops.ones_like(logits, dtype=dtypes.float32)
 
     loss = losses.sigmoid_cross_entropy(labels, logits, weights)
+    self.assertEquals(logits.dtype, loss.dtype)
 
     with self.test_session() as sess:
       loss = sess.run(loss,
@@ -487,7 +490,8 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
                                      [-100.0, -100.0, 100.0]])
       labels = constant_op.constant([[0, 0, 1], [1, 0, 0], [0, 1, 0]])
       loss = losses.sigmoid_cross_entropy(labels, logits)
-      self.assertEquals(loss.op.name, 'sigmoid_cross_entropy_loss/value')
+      self.assertEquals(logits.dtype, loss.dtype)
+      self.assertEquals('sigmoid_cross_entropy_loss/value', loss.op.name)
       self.assertAlmostEqual(loss.eval(), 600.0 / 9.0, 3)
 
   def testAllWrongSigmoidWithMeasurementSpecificWeights(self):
@@ -498,7 +502,8 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
       labels = constant_op.constant([[0, 0, 1], [1, 0, 0], [0, 1, 0]])
       weights = constant_op.constant([[3, 4, 5], [2, 6, 0], [8, 0, 1]])
       loss = losses.sigmoid_cross_entropy(labels, logits, weights)
-      self.assertEquals(loss.op.name, 'sigmoid_cross_entropy_loss/value')
+      self.assertEquals(logits.dtype, loss.dtype)
+      self.assertEquals('sigmoid_cross_entropy_loss/value', loss.op.name)
       self.assertAlmostEqual(1700.0 / 7.0, loss.eval(), 3)
 
   def testMultiCorrectSigmoid(self):
@@ -507,10 +512,43 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
                                    [-100.0, 100.0, 100.0]])
     labels = constant_op.constant([[1, 0, 1], [1, 1, 0], [0, 1, 1]])
     loss = losses.sigmoid_cross_entropy(labels, logits)
-    self.assertEquals(loss.op.name, 'sigmoid_cross_entropy_loss/value')
+    self.assertEquals(logits.dtype, loss.dtype)
+    self.assertEquals('sigmoid_cross_entropy_loss/value', loss.op.name)
 
     with self.test_session():
-      self.assertAlmostEqual(loss.eval(), 0.0, 3)
+      self.assertAlmostEqual(0.0, loss.eval(), 3)
+
+  def testSigmoidFloat64(self):
+    logits = constant_op.constant((
+        (100.0, -100.0, 100.0),
+        (100.0, -100.0, 100.0),
+        (100.0, 100.0, -100.0)
+    ), dtype=dtypes.float64)
+    labels = constant_op.constant((
+        (1, 0, 1), (1, 1, 0), (0, 1, 1)
+    ), dtype=dtypes.int64)
+    loss = losses.sigmoid_cross_entropy(labels, logits)
+    self.assertEquals(logits.dtype, loss.dtype)
+
+    with self.test_session():
+      self.assertAlmostEqual(44.444, loss.eval(), 3)
+
+  def testSigmoidNoReduction(self):
+    logits = constant_op.constant((
+        (100.0, -100.0, 100.0),
+        (100.0, -100.0, 100.0),
+        (100.0, 100.0, -100.0)))
+    labels = constant_op.constant(((1, 0, 1), (1, 1, 0), (0, 1, 1)))
+    loss = losses.sigmoid_cross_entropy(
+        labels, logits, reduction=losses.Reduction.NONE)
+    self.assertEquals(logits.dtype, loss.dtype)
+
+    with self.test_session():
+      self.assertAllClose((
+          (0., 0., 0.),
+          (0., 100., 100.),
+          (100., 0., 100.)
+      ), loss.eval(), 3)
 
   def testSigmoidLabelSmoothingCorrect(self):
     with self.test_session():
@@ -530,7 +568,8 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
       label_smoothing = 0.1
       loss = losses.sigmoid_cross_entropy(
           labels, logits, label_smoothing=label_smoothing)
-      self.assertEquals(loss.op.name, 'sigmoid_cross_entropy_loss/value')
+      self.assertEquals(logits.dtype, loss.dtype)
+      self.assertEquals('sigmoid_cross_entropy_loss/value', loss.op.name)
       expected_value = (100.0 + 50.0 * label_smoothing) / 3.0
       self.assertAlmostEqual(loss.eval(), expected_value, 3)
 
@@ -541,6 +580,7 @@ class SigmoidCrossEntropyLossTest(test.TestCase):
       sigmoid_labels = constant_op.constant([[1, 0, 1]])
       sigmoid_loss = losses.sigmoid_cross_entropy(
           sigmoid_labels, sigmoid_logits, label_smoothing=label_smoothing)
+      self.assertEquals(sigmoid_logits.dtype, sigmoid_loss.dtype)
 
       softmax_logits = constant_op.constant(
           [[0.0, 100.0], [100.0, 0.0], [100.0, 0.0]])
@@ -1254,10 +1294,14 @@ class ComputeWeightedLossTest(test.TestCase):
         self.assertEqual(9, len(util.get_losses()))
         with self.test_session(g):
           for unweighted_loss in unweighted_losses:
-            if reduction == losses.Reduction.WEIGHTED_SUM:
+            if reduction == losses.Reduction.NONE:
+              self.assertAllClose(self._raw_losses, unweighted_loss.eval())
+            elif reduction == losses.Reduction.SUM:
               self.assertAllClose(
                   np.sum(self._raw_losses), unweighted_loss.eval())
-            else:  # losses.Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS
+            else:
+              # reduction one of losses.Reduction.MEAN and
+              # losses.Reduction.SUM_BY_NONZERO_WEIGHTS.
               self.assertAllClose(
                   np.mean(self._raw_losses), unweighted_loss.eval())
 
@@ -1341,13 +1385,20 @@ class ComputeWeightedLossTest(test.TestCase):
         with self.test_session(g):
           weighted_losses = weights * self._raw_losses
           weighted_sum = np.sum(weighted_losses)
-          if reduction == losses.Reduction.WEIGHTED_SUM:
+          if reduction == losses.Reduction.NONE:
+            self.assertAllClose(weighted_losses, weighted_loss.eval())
+          elif reduction == losses.Reduction.SUM:
             self.assertAllClose(weighted_sum, weighted_loss.eval())
-          else:  # losses.Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS
+          else:
             broadcast_weights = weights * np.ones_like(self._raw_losses)
-            self.assertAllClose(
-                weighted_sum / np.count_nonzero(broadcast_weights),
-                weighted_loss.eval())
+            if reduction == losses.Reduction.MEAN:
+              self.assertAllClose(
+                  weighted_sum / np.sum(broadcast_weights),
+                  weighted_loss.eval())
+            elif reduction == losses.Reduction.SUM_BY_NONZERO_WEIGHTS:
+              self.assertAllClose(
+                  weighted_sum / np.count_nonzero(broadcast_weights),
+                  weighted_loss.eval())
 
   def test1x1x1Weight(self):
     self._test_valid_weights((((17.0,),),))
diff --git a/tensorflow/python/ops/losses/losses_impl.py b/tensorflow/python/ops/losses/losses_impl.py
index 45075d4d3c..fc54553b0c 100644
--- a/tensorflow/python/ops/losses/losses_impl.py
+++ b/tensorflow/python/ops/losses/losses_impl.py
@@ -27,21 +27,31 @@ from tensorflow.python.ops import nn
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import weights_broadcast_ops
 from tensorflow.python.ops.losses import util
+from tensorflow.python.platform import tf_logging as logging
 
 
-# TODO(ptucker): Per-example? Divided by batch_size? Divided by sum of weights?
 class Reduction(object):
   """Types of loss reduction."""
 
-  # Batch sum of weighted losses.
-  WEIGHTED_SUM = "weighted_sum"
+  # Un-reduced weighted losses with the same shape as input.
+  NONE = "none"
 
-  # `WEIGHTED_SUM` divided by number of non-zero weights.
-  WEIGHTED_SUM_BY_NONZERO_WEIGHTS = "weighted_sum_by_nonzero_weights"
+  # Scalar sum of `NONE`.
+  SUM = "weighted_sum"
+
+  # Scalar `SUM` divided by sum of weights.
+  MEAN = "weighted_mean"
+
+  # Scalar `SUM` divided by number of non-zero weights.
+  SUM_BY_NONZERO_WEIGHTS = "weighted_sum_by_nonzero_weights"
 
   @classmethod
   def all(cls):
-    return (cls.WEIGHTED_SUM, cls.WEIGHTED_SUM_BY_NONZERO_WEIGHTS)
+    return (
+        cls.NONE,
+        cls.SUM,
+        cls.MEAN,
+        cls.SUM_BY_NONZERO_WEIGHTS)
 
   @classmethod
   def validate(cls, key):
@@ -127,7 +137,7 @@ def _num_present(losses, weights, per_batch=False):
 
 def compute_weighted_loss(
     losses, weights=1.0, scope=None, loss_collection=ops.GraphKeys.LOSSES,
-    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+    reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Computes the weighted loss.
 
   Args:
@@ -140,7 +150,8 @@ def compute_weighted_loss(
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss `Tensor` of the same type as `losses`. If `reduction` is
+    `NONE`, this has the same shape as `losses`; otherwise, it is scalar.
 
   Raises:
     ValueError: If `weights` is `None` or the shape is not compatible with
@@ -156,9 +167,16 @@ def compute_weighted_loss(
       losses = math_ops.to_float(losses)
       weights = math_ops.to_float(weights)
       weighted_losses = math_ops.multiply(losses, weights)
-      loss = math_ops.reduce_sum(weighted_losses)
-      if reduction == Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS:
-        loss = _safe_mean(loss, _num_present(losses, weights))
+      if reduction == Reduction.NONE:
+        loss = weighted_losses
+      else:
+        loss = math_ops.reduce_sum(weighted_losses)
+        if reduction == Reduction.MEAN:
+          loss = _safe_mean(
+              loss,
+              math_ops.reduce_sum(array_ops.ones_like(losses) * weights))
+        elif reduction == Reduction.SUM_BY_NONZERO_WEIGHTS:
+          loss = _safe_mean(loss, _num_present(losses, weights))
 
       # Convert the result back to the input type.
       loss = math_ops.cast(loss, input_dtype)
@@ -169,7 +187,7 @@ def compute_weighted_loss(
 def absolute_difference(
     labels, predictions, weights=1.0, scope=None,
     loss_collection=ops.GraphKeys.LOSSES,
-    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+    reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Adds an Absolute Difference loss to the training procedure.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided, then
@@ -191,7 +209,8 @@ def absolute_difference(
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss float `Tensor`. If `reduction` is `NONE`, this has the same
+    shape as `labels`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -210,7 +229,7 @@ def absolute_difference(
 def cosine_distance(
     labels, predictions, dim=None, weights=1.0, scope=None,
     loss_collection=ops.GraphKeys.LOSSES,
-    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+    reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Adds a cosine-distance loss to the training procedure.
 
   Note that the function assumes that `predictions` and `labels` are already
@@ -228,7 +247,8 @@ def cosine_distance(
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss float `Tensor`. If `reduction` is `NONE`, this has the same
+    shape as `labels`; otherwise, it is scalar.
 
   Raises:
     ValueError: If `predictions` shape doesn't match `labels` shape, or
@@ -250,7 +270,7 @@ def cosine_distance(
 
 def hinge_loss(labels, logits, weights=1.0, scope=None,
                loss_collection=ops.GraphKeys.LOSSES,
-               reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+               reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Adds a hinge loss to the training procedure.
 
   Args:
@@ -265,7 +285,8 @@ def hinge_loss(labels, logits, weights=1.0, scope=None,
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss float `Tensor`. If `reduction` is `NONE`, this has the same
+    shape as `labels`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shapes of `logits` and `labels` don't match.
@@ -285,7 +306,7 @@ def hinge_loss(labels, logits, weights=1.0, scope=None,
 
 def huber_loss(labels, predictions, weights=1.0, delta=1.0, scope=None,
                loss_collection=ops.GraphKeys.LOSSES,
-               reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+               reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Adds a Huber Loss term to the training procedure.
 
   For each value x in `error=labels-predictions`, the following is calculated:
@@ -320,7 +341,8 @@ def huber_loss(labels, predictions, weights=1.0, delta=1.0, scope=None,
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss float `Tensor`. If `reduction` is `NONE`, this has the same
+    shape as `labels`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -347,7 +369,7 @@ def huber_loss(labels, predictions, weights=1.0, delta=1.0, scope=None,
 
 def log_loss(labels, predictions, weights=1.0, epsilon=1e-7, scope=None,
              loss_collection=ops.GraphKeys.LOSSES,
-             reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+             reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Adds a Log Loss term to the training procedure.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided, then
@@ -370,7 +392,8 @@ def log_loss(labels, predictions, weights=1.0, epsilon=1e-7, scope=None,
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss float `Tensor`. If `reduction` is `NONE`, this has the same
+    shape as `labels`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -474,7 +497,7 @@ def mean_pairwise_squared_error(
 def mean_squared_error(
     labels, predictions, weights=1.0, scope=None,
     loss_collection=ops.GraphKeys.LOSSES,
-    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+    reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Adds a Sum-of-Squares loss to the training procedure.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided, then
@@ -496,7 +519,8 @@ def mean_squared_error(
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss float `Tensor`. If `reduction` is `NONE`, this has the same
+    shape as `labels`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shape of `predictions` doesn't match that of `labels` or
@@ -515,7 +539,7 @@ def mean_squared_error(
 def sigmoid_cross_entropy(
     multi_class_labels, logits, weights=1.0, label_smoothing=0, scope=None,
     loss_collection=ops.GraphKeys.LOSSES,
-    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+    reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Creates a cross-entropy loss using tf.nn.sigmoid_cross_entropy_with_logits.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided,
@@ -531,7 +555,7 @@ def sigmoid_cross_entropy(
   Args:
     multi_class_labels: `[batch_size, num_classes]` target integer labels in
       `(0, 1)`.
-    logits: `[batch_size, num_classes]` logits outputs of the network.
+    logits: Float `[batch_size, num_classes]` logits outputs of the network.
     weights: Optional `Tensor` whose rank is either 0, or the same rank as
       `labels`, and must be broadcastable to `labels` (i.e., all dimensions must
       be either `1`, or the same as the corresponding `losses` dimension).
@@ -541,7 +565,8 @@ def sigmoid_cross_entropy(
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss `Tensor` of the same type as `logits`. If `reduction` is
+    `NONE`, this has the same shape as `logits`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shape of `logits` doesn't match that of
@@ -551,7 +576,9 @@ def sigmoid_cross_entropy(
   with ops.name_scope(scope, "sigmoid_cross_entropy_loss",
                       (logits, multi_class_labels, weights)) as scope:
     logits = ops.convert_to_tensor(logits)
+    logging.info("logits.dtype=%s.", logits.dtype)
     multi_class_labels = math_ops.cast(multi_class_labels, logits.dtype)
+    logging.info("multi_class_labels.dtype=%s.", multi_class_labels.dtype)
     logits.get_shape().assert_is_compatible_with(multi_class_labels.get_shape())
 
     if label_smoothing > 0:
@@ -561,6 +588,7 @@ def sigmoid_cross_entropy(
     losses = nn.sigmoid_cross_entropy_with_logits(labels=multi_class_labels,
                                                   logits=logits,
                                                   name="xentropy")
+    logging.info("losses.dtype=%s.", losses.dtype)
     return compute_weighted_loss(
         losses, weights, scope, loss_collection, reduction=reduction)
 
@@ -568,7 +596,7 @@ def sigmoid_cross_entropy(
 def softmax_cross_entropy(
     onehot_labels, logits, weights=1.0, label_smoothing=0, scope=None,
     loss_collection=ops.GraphKeys.LOSSES,
-    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+    reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Creates a cross-entropy loss using tf.nn.softmax_cross_entropy_with_logits.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided,
@@ -593,7 +621,8 @@ def softmax_cross_entropy(
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss `Tensor` of the same type as `logits`. If `reduction` is
+    `NONE`, this has shape `[batch_size]`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shape of `logits` doesn't match that of `onehot_labels`
@@ -673,7 +702,7 @@ def _remove_squeezable_dimensions(
 def sparse_softmax_cross_entropy(
     labels, logits, weights=1.0, scope=None,
     loss_collection=ops.GraphKeys.LOSSES,
-    reduction=Reduction.WEIGHTED_SUM_BY_NONZERO_WEIGHTS):
+    reduction=Reduction.SUM_BY_NONZERO_WEIGHTS):
   """Cross-entropy loss using `tf.nn.sparse_softmax_cross_entropy_with_logits`.
 
   `weights` acts as a coefficient for the loss. If a scalar is provided,
@@ -696,7 +725,8 @@ def sparse_softmax_cross_entropy(
     reduction: Type of reduction to apply to loss.
 
   Returns:
-    A scalar `Tensor` that returns the weighted loss.
+    Weighted loss `Tensor` of the same type as `logits`. If `reduction` is
+    `NONE`, this has the same shape as `labels`; otherwise, it is scalar.
 
   Raises:
     ValueError: If the shapes of logits, labels, and weight are incompatible, or
diff --git a/tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt b/tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt
index f2fc1f003e..4bdc73370b 100644
--- a/tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.losses.-reduction.pbtxt
@@ -3,11 +3,19 @@ tf_class {
   is_instance: "<class \'tensorflow.python.ops.losses.losses_impl.Reduction\'>"
   is_instance: "<type \'object\'>"
   member {
-    name: "WEIGHTED_SUM"
+    name: "MEAN"
     mtype: "<type \'str\'>"
   }
   member {
-    name: "WEIGHTED_SUM_BY_NONZERO_WEIGHTS"
+    name: "NONE"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUM"
+    mtype: "<type \'str\'>"
+  }
+  member {
+    name: "SUM_BY_NONZERO_WEIGHTS"
     mtype: "<type \'str\'>"
   }
   member_method {
-- 
GitLab


From a08456e39eb4d5a3d80dda922a08c796769da9c6 Mon Sep 17 00:00:00 2001
From: Yuming Wang <wgyumg@gmail.com>
Date: Fri, 21 Apr 2017 06:46:23 +0800
Subject: [PATCH 0600/1563] Fix incorrect comment

---
 tensorflow/docs_src/get_started/tflearn.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/tflearn.md b/tensorflow/docs_src/get_started/tflearn.md
index 0912c7a5b4..4a893e4a45 100644
--- a/tensorflow/docs_src/get_started/tflearn.md
+++ b/tensorflow/docs_src/get_started/tflearn.md
@@ -282,7 +282,7 @@ enough that it can be stored in @{tf.constant TensorFlow constants}. The
 following code produces the simplest possible input pipeline:
 
 ```python
-# Define the test inputs
+# Define the training inputs
 def get_train_inputs():
   x = tf.constant(training_set.data)
   y = tf.constant(training_set.target)
-- 
GitLab


From b853b2172d3811f098d81fd315da483fd5190777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Man=C3=A9?= <danmane@gmail.com>
Date: Thu, 20 Apr 2017 16:21:07 -0700
Subject: [PATCH 0601/1563] Fix issue where TensorBoard run selector can become
 non-responsive.

---
 .../tf_dashboard_common/tf-multi-checkbox.html | 18 +-----------------
 .../tensorboard/dist/tf-tensorboard.html       | 18 +-----------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
index ac407844f0..e2c9977207 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
@@ -183,6 +183,7 @@ handle these situations gracefully.
       // if undefined, default value (enable for first k runs, disable after).
         type: Object,
         value: TF.URIStorage.getObjectInitializer('runSelectionState', {}),
+        observer: "_storeRunToIsCheckedMapping",
       },
       // (Allows state to persist across regex filtering)
       outSelected: {
@@ -231,24 +232,7 @@ handle these situations gracefully.
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
-    _storeRunToIsCheckedMappingWithDefault() {
-      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
-      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
-        return;
-      }
-      var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-              .every(function(n) {return _this.runSelectionState[n]});
-      var allToggledOff = this.namesMatchingRegex
-              .every(function(n) {return !_this.runSelectionState[n]});
-      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
-      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
-        this.runSelectionState = {};
-      }
-      this._storeRunToIsCheckedMapping(this.runSelectionState);
-    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 10721e41e9..36fc6e902d 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -3325,6 +3325,7 @@ var Categorizer;
       // if undefined, default value (enable for first k runs, disable after).
         type: Object,
         value: TF.URIStorage.getObjectInitializer('runSelectionState', {}),
+        observer: "_storeRunToIsCheckedMapping",
       },
       // (Allows state to persist across regex filtering)
       outSelected: {
@@ -3373,24 +3374,7 @@ var Categorizer;
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
-    _storeRunToIsCheckedMappingWithDefault() {
-      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
-      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
-        return;
-      }
-      var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-              .every(function(n) {return _this.runSelectionState[n]});
-      var allToggledOff = this.namesMatchingRegex
-              .every(function(n) {return !_this.runSelectionState[n]});
-      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
-      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
-        this.runSelectionState = {};
-      }
-      this._storeRunToIsCheckedMapping(this.runSelectionState);
-    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
-- 
GitLab


From f942e8c21658e20cdba20b3bba025a71cbb5e60a Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <shoyer@google.com>
Date: Thu, 20 Apr 2017 15:34:26 -0800
Subject: [PATCH 0602/1563] Fix typo in "First TensorFlow program" from open
 source README

This is sort of pedantic, but the Python prompt prints strings with quotes.
Change: 153772799
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd0bffde79..3ab4773681 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ $ python
 >>> hello = tf.constant('Hello, TensorFlow!')
 >>> sess = tf.Session()
 >>> sess.run(hello)
-Hello, TensorFlow!
+'Hello, TensorFlow!'
 >>> a = tf.constant(10)
 >>> b = tf.constant(32)
 >>> sess.run(a+b)
-- 
GitLab


From fa25fcbbc9c3c0b9dea4c6bc0bf26ac10f790125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Man=C3=A9?= <danmane@gmail.com>
Date: Thu, 20 Apr 2017 16:21:07 -0700
Subject: [PATCH 0603/1563] Fix issue where TensorBoard run selector can become
 non-responsive.

---
 .../tf_dashboard_common/tf-multi-checkbox.html |  2 +-
 .../tensorboard/dist/tf-tensorboard.html       | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
index bc15312fc3..be27c353c3 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
@@ -183,6 +183,7 @@ handle these situations gracefully.
       // if undefined, default value (enable for first k runs, disable after).
         type: Object,
         value: TF.URIStorage.getObjectInitializer('runSelectionState', {}),
+        observer: "_storeRunToIsCheckedMapping",
       },
       // (Allows state to persist across regex filtering)
       outSelected: {
@@ -230,7 +231,6 @@ handle these situations gracefully.
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMapping(runSelectionState)",
     ],
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 2a0a029ffa..656a69f836 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -3325,6 +3325,7 @@ var Categorizer;
       // if undefined, default value (enable for first k runs, disable after).
         type: Object,
         value: TF.URIStorage.getObjectInitializer('runSelectionState', {}),
+        observer: "_storeRunToIsCheckedMapping",
       },
       // (Allows state to persist across regex filtering)
       outSelected: {
@@ -3373,24 +3374,7 @@ var Categorizer;
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
-    _storeRunToIsCheckedMappingWithDefault() {
-      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
-      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
-        return;
-      }
-      var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-              .every(function(n) {return _this.runSelectionState[n]});
-      var allToggledOff = this.namesMatchingRegex
-              .every(function(n) {return !_this.runSelectionState[n]});
-      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
-      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
-        this.runSelectionState = {};
-      }
-      this._storeRunToIsCheckedMapping(this.runSelectionState);
-    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
-- 
GitLab


From 7c068a3784d797ebdfb8f768ecb486479cbc4b93 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 16:16:07 -0800
Subject: [PATCH 0604/1563] Fix _get_arguments to work with partials. Change:
 153776958

---
 tensorflow/python/estimator/estimator.py      |  45 ++++---
 tensorflow/python/estimator/estimator_test.py | 115 ++++++++++++++++++
 2 files changed, 142 insertions(+), 18 deletions(-)

diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 449cb54c84..a1b0d9358d 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -524,7 +524,7 @@ class Estimator(object):
     Raises:
       ValueError: if model_fn returns invalid objects.
     """
-    model_fn_args = _get_arguments(self._model_fn).args
+    model_fn_args = _model_fn_args(self._model_fn)
     kwargs = {}
     if 'mode' in model_fn_args:
       kwargs['mode'] = mode
@@ -704,35 +704,44 @@ def _get_replica_device_setter(config):
     return None
 
 
-def _get_arguments(func):
-  """Returns a spec of given func."""
-  if hasattr(func, '__code__'):
-    # Regular function.
-    return inspect.getargspec(func)
-  elif hasattr(func, '__call__'):
-    # Callable object.
-    return _get_arguments(func.__call__)
-  elif hasattr(func, 'func'):
-    # Partial function.
-    return _get_arguments(func.func)
+def _model_fn_args(fn):
+  """Get argument names for function-like object.
+
+  Args:
+    fn: Function, or function-like object (e.g., result of `functools.partial`).
+
+  Returns:
+    `tuple` of string argument names.
+
+  Raises:
+    ValueError: if partial function has positionally bound arguments
+  """
+  if hasattr(fn, 'func') and hasattr(fn, 'keywords') and hasattr(fn, 'args'):
+    # Handle functools.partial and similar objects.
+    return tuple([
+        arg for arg in inspect.getargspec(fn.func).args[len(fn.args):]
+        if arg not in set(fn.keywords.keys())
+    ])
+  # Handle function.
+  return tuple(inspect.getargspec(fn).args)
 
 
 def _verify_model_fn_args(model_fn, params):
   """Verifies model fn arguments."""
-  fn_spec = _get_arguments(model_fn)
-  if 'features' not in fn_spec.args:
+  args = _model_fn_args(model_fn)
+  if 'features' not in args:
     raise ValueError('model_fn (%s) must include features argument.' % model_fn)
-  if 'labels' not in fn_spec.args:
+  if 'labels' not in args:
     raise ValueError('model_fn (%s) must include labels argument.' % model_fn)
-  if params is not None and 'params' not in fn_spec.args:
+  if params is not None and 'params' not in args:
     raise ValueError('model_fn (%s) does not include params argument, '
                      'but params (%s) is passed to Estimator.' % (model_fn,
                                                                   params))
-  if params is None and 'params' in fn_spec.args:
+  if params is None and 'params' in args:
     logging.warning('Estimator\'s model_fn (%s) includes params '
                     'argument, but params are not passed to Estimator.',
                     model_fn)
-  non_valid_args = list(set(fn_spec.args) - _VALID_MODEL_FN_ARGS)
+  non_valid_args = list(set(args) - _VALID_MODEL_FN_ARGS)
   if non_valid_args:
     raise ValueError('model_fn (%s) has following not expected args: %s' %
                      (model_fn, non_valid_args))
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 89a9483e20..3b46db59e3 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -18,10 +18,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import functools
 import os
 import tempfile
 
 import numpy as np
+import six
 
 from google.protobuf import text_format
 
@@ -38,6 +40,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.layers import layers
 from tensorflow.python.lib.io import file_io
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import init_ops
@@ -262,8 +265,120 @@ def model_fn_global_step_incrementer(features, labels, mode):
       train_op=state_ops.assign_add(global_step, 1))
 
 
+def _estimator_spec(
+    expected_features, expected_labels, actual_features, actual_labels, mode):
+  assert_ops = tuple([
+      check_ops.assert_equal(
+          expected_features[k], actual_features[k], name='assert_%s' % k)
+      for k in expected_features
+  ] + [
+      check_ops.assert_equal(
+          expected_labels, actual_labels, name='assert_labels')
+  ])
+  with ops.control_dependencies(assert_ops):
+    return model_fn_lib.EstimatorSpec(
+        mode=mode,
+        predictions=constant_op.constant(0.),
+        loss=constant_op.constant(0.),
+        train_op=constant_op.constant(0.))
+
+
+def _make_input_fn(features, labels):
+  def _input_fn():
+    return {
+        k: constant_op.constant(v)
+        for k, v in six.iteritems(features)
+    }, constant_op.constant(labels)
+  return _input_fn
+
+
 class EstimatorTrainTest(test.TestCase):
 
+  def test_minimal_model_fn_args(self):
+    expected_features = {'x': 42., 'y': 43.}
+    expected_labels = 44.
+
+    # TODO(ptucker): We have to roll our own mock since Estimator._get_arguments
+    # doesn't work with mock fns.
+    model_fn_call_count = [0]
+
+    def _model_fn(features, labels):
+      model_fn_call_count[0] += 1
+      self.assertItemsEqual(expected_features.keys(), features.keys())
+      return _estimator_spec(
+          expected_features, expected_labels, features, labels,
+          model_fn_lib.ModeKeys.TRAIN)
+
+    with self.assertRaisesRegexp(ValueError, 'does not include params'):
+      estimator.Estimator(model_fn=_model_fn, params={'a': 'b'})
+    est = estimator.Estimator(model_fn=_model_fn, config=run_config.RunConfig())
+    self.assertEqual(0, model_fn_call_count[0])
+    est.train(
+        input_fn=_make_input_fn(expected_features, expected_labels), steps=1)
+    self.assertEqual(1, model_fn_call_count[0])
+
+  def test_all_model_fn_args(self):
+    expected_features = {'x': 42., 'y': 43.}
+    expected_labels = 44.
+    expected_params = {'some_param': 'some_value'}
+    expected_config = run_config.RunConfig()
+    expected_config.i_am_test = True
+
+    # TODO(ptucker): We have to roll our own mock since Estimator._get_arguments
+    # doesn't work with mock fns.
+    model_fn_call_count = [0]
+
+    # Note that args are all passed by keyword, so can be in any order.
+    def _model_fn(mode, params, features, labels, config):
+      model_fn_call_count[0] += 1
+      self.assertItemsEqual(expected_features.keys(), features.keys())
+      self.assertEqual(model_fn_lib.ModeKeys.TRAIN, mode)
+      self.assertEqual(expected_params, params)
+      self.assertTrue(config.i_am_test)
+      return _estimator_spec(
+          expected_features, expected_labels, features, labels, mode)
+
+    est = estimator.Estimator(
+        model_fn=_model_fn, params=expected_params, config=expected_config)
+    self.assertEqual(0, model_fn_call_count[0])
+    est.train(
+        input_fn=_make_input_fn(expected_features, expected_labels), steps=1)
+    self.assertEqual(1, model_fn_call_count[0])
+
+  def test_partial_model_fn_args(self):
+    expected_features = {'x': 42., 'y': 43.}
+    expected_labels = 44.
+    expected_params = {'some_param': 'some_value'}
+    expected_config = run_config.RunConfig()
+    expected_config.i_am_test = True
+    expected_foo = 45.
+    expected_bar = 46.
+
+    # TODO(ptucker): We have to roll our own mock since Estimator._get_arguments
+    # doesn't work with mock fns.
+    model_fn_call_count = [0]
+
+    def _model_fn(features, labels, foo, mode, params, config, bar):
+      model_fn_call_count[0] += 1
+      self.assertEqual(expected_foo, foo)
+      self.assertEqual(expected_bar, bar)
+      self.assertItemsEqual(expected_features.keys(), features.keys())
+      self.assertEqual(model_fn_lib.ModeKeys.TRAIN, mode)
+      self.assertEqual(expected_params, params)
+      self.assertTrue(config.i_am_test)
+      return _estimator_spec(
+          expected_features, expected_labels, features, labels, mode)
+    partial_model_fn = functools.partial(
+        _model_fn, foo=expected_foo, bar=expected_bar)
+
+    est = estimator.Estimator(
+        model_fn=partial_model_fn, params=expected_params,
+        config=expected_config)
+    self.assertEqual(0, model_fn_call_count[0])
+    est.train(
+        input_fn=_make_input_fn(expected_features, expected_labels), steps=1)
+    self.assertEqual(1, model_fn_call_count[0])
+
   def test_model_fn_must_return_estimator_spec(self):
 
     def model_fn(features, labels):
-- 
GitLab


From 35d358f92dad1aaafd6afe4995db7b1db0e53d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Thu, 20 Apr 2017 16:57:28 -0800
Subject: [PATCH 0605/1563] Fix serious bug which broke TensorBoard when there
 are many scalar runs and few text runs. Change: 153780710

---
 .../tf_dashboard_common/tf-multi-checkbox.html | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
index ac407844f0..e2c9977207 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-multi-checkbox.html
@@ -183,6 +183,7 @@ handle these situations gracefully.
       // if undefined, default value (enable for first k runs, disable after).
         type: Object,
         value: TF.URIStorage.getObjectInitializer('runSelectionState', {}),
+        observer: "_storeRunToIsCheckedMapping",
       },
       // (Allows state to persist across regex filtering)
       outSelected: {
@@ -231,24 +232,7 @@ handle these situations gracefully.
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
-    _storeRunToIsCheckedMappingWithDefault() {
-      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
-      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
-        return;
-      }
-      var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-              .every(function(n) {return _this.runSelectionState[n]});
-      var allToggledOff = this.namesMatchingRegex
-              .every(function(n) {return !_this.runSelectionState[n]});
-      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
-      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
-        this.runSelectionState = {};
-      }
-      this._storeRunToIsCheckedMapping(this.runSelectionState);
-    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
-- 
GitLab


From 7dba5ab8740064f916bfc127c910c02a01eabe11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Thu, 20 Apr 2017 16:58:00 -0800
Subject: [PATCH 0606/1563] Autogenerated Change: Change TensorBoard TAG to 54
 Change: 153780747

---
 tensorflow/tensorboard/TAG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/TAG b/tensorflow/tensorboard/TAG
index 59343b09ec..fb1e7bc869 100644
--- a/tensorflow/tensorboard/TAG
+++ b/tensorflow/tensorboard/TAG
@@ -1 +1 @@
-53
+54
-- 
GitLab


From c1bd0fe248c63b58b0b663a8c8529791354fdf75 Mon Sep 17 00:00:00 2001
From: Bjarke Hammersholt Roune <broune@google.com>
Date: Thu, 20 Apr 2017 17:20:10 -0800
Subject: [PATCH 0607/1563] - Bug fix in ShapeInference  - CommaSeparatedString
 and VectorString added to xla_util.h  - ReferenceUtil can now do more general
 Pad ops. Change: 153782516

---
 tensorflow/compiler/xla/reference_util.cc     | 35 ++++++++++++++++
 tensorflow/compiler/xla/reference_util.h      |  5 +++
 .../compiler/xla/service/shape_inference.cc   |  6 ++-
 tensorflow/compiler/xla/util.h                | 41 +++++++++++++++++++
 tensorflow/compiler/xla/util_test.cc          | 20 +++++++++
 5 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/reference_util.cc b/tensorflow/compiler/xla/reference_util.cc
index 86c9c3b1ac..5630033ac8 100644
--- a/tensorflow/compiler/xla/reference_util.cc
+++ b/tensorflow/compiler/xla/reference_util.cc
@@ -649,4 +649,39 @@ ReferenceUtil::ReduceToRowArray2D(
   return result;
 }
 
+/* static */ Array4D<float> ReferenceUtil::PadArray4D(
+    const Array4D<float>& operand, const PaddingConfig& padding,
+    const float pad) {
+  CHECK_EQ(padding.dimensions_size(), 4);
+
+  const std::vector<int64> input_bounds = {operand.n1(), operand.n2(),
+                                           operand.n3(), operand.n4()};
+  std::vector<int64> pad_low(4);
+  std::vector<int64> pad_high(4);
+  std::vector<int64> output_bounds(4);
+  for (int64 i = 0; i < 4; ++i) {
+    pad_low[i] = padding.dimensions(i).edge_padding_low();
+    pad_high[i] = padding.dimensions(i).edge_padding_high();
+    CHECK_EQ(padding.dimensions(i).interior_padding(), 0) << "not implemented";
+
+    output_bounds[i] = pad_low[i] + input_bounds[i] + pad_high[i];
+  }
+
+  Array4D<float> result(output_bounds[0], output_bounds[1], output_bounds[2],
+                        output_bounds[3]);
+  result.Each([&](tensorflow::gtl::ArraySlice<int64> indices, float* value) {
+    for (int i = 0; i < 4; ++i) {
+      bool in_low_padding = indices[i] < pad_low[i];
+      bool in_high_padding = indices[i] >= output_bounds[i] - pad_high[i];
+      if (in_low_padding || in_high_padding) {
+        *value = pad;
+        return;
+      }
+    }
+    *value = operand(indices[0] - pad_low[0], indices[1] - pad_low[1],
+                     indices[2] - pad_low[2], indices[3] - pad_low[3]);
+  });
+  return result;
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/reference_util.h b/tensorflow/compiler/xla/reference_util.h
index 9e0f247203..eb1eea7fc4 100644
--- a/tensorflow/compiler/xla/reference_util.h
+++ b/tensorflow/compiler/xla/reference_util.h
@@ -395,6 +395,11 @@ class ReferenceUtil {
       const Array2D<float>& operand, const PaddingConfig& padding,
       const float pad);
 
+  // Returns the result of a 4D pad on an input array.
+  static Array4D<float> PadArray4D(const Array4D<float>& operand,
+                                   const PaddingConfig& padding,
+                                   const float pad);
+
  private:
   TF_DISALLOW_COPY_AND_ASSIGN(ReferenceUtil);
 };
diff --git a/tensorflow/compiler/xla/service/shape_inference.cc b/tensorflow/compiler/xla/service/shape_inference.cc
index 9472086e2b..338d63f1a0 100644
--- a/tensorflow/compiler/xla/service/shape_inference.cc
+++ b/tensorflow/compiler/xla/service/shape_inference.cc
@@ -309,6 +309,10 @@ StatusOr<Shape> InferWindowOutputShape(const Shape& base_shape,
     return InvalidArgument(
         "the rank of the operand and the padding configuration do not match.");
   }
+  if (operand_shape.element_type() != padding_value_shape.element_type()) {
+    return InvalidArgument(
+        "the element types of the operands to pad do not match");
+  }
   std::vector<int64> dimensions(ShapeUtil::Rank(operand_shape));
   for (int64 i = 0; i < operand_shape.dimensions_size(); ++i) {
     dimensions[i] = operand_shape.dimensions(i) +
@@ -338,7 +342,7 @@ StatusOr<Shape> InferWindowOutputShape(const Shape& base_shape,
 
   // Check if both element types are the same.
   if (lhs.element_type() != rhs.element_type()) {
-    return fail("element types mismatch");
+    return fail("element types do not match");
   }
 
   if (ShapeUtil::Rank(lhs) < 1 || ShapeUtil::Rank(lhs) > 2 ||
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h
index 8ec4f1b528..32b5fbba00 100644
--- a/tensorflow/compiler/xla/util.h
+++ b/tensorflow/compiler/xla/util.h
@@ -31,6 +31,7 @@ limitations under the License.
 #include "tensorflow/core/lib/gtl/array_slice.h"
 #include "tensorflow/core/lib/math/math_util.h"
 #include "tensorflow/core/lib/strings/numbers.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/protobuf.h"
@@ -200,6 +201,46 @@ int64 PositionInContainer(const Container& container, int64 value) {
                        std::find(container.begin(), container.end(), value));
 }
 
+// Formats the container as a comma-separated string. StrAppend must support
+// appending the elements of the container. Prefix is prepended and suffix is
+// appended to the returned string.
+template <typename Container>
+string CommaSeparatedString(const Container& c, const char* prefix = "",
+                            const char* suffix = "") {
+  // Not using Join() since the implementation here is simple anyway and this
+  // avoids copying the string to append prefix.
+  string comma_separated = prefix;
+  const char* separator = "";
+  for (const auto& entry : c) {
+    tensorflow::strings::StrAppend(&comma_separated, separator, entry);
+    separator = ", ";
+  }
+  comma_separated += suffix;
+  return comma_separated;
+}
+
+// Overload needed to allow the container to be an initializer list. The default
+// type for T makes an empty initializer list work as well.
+template <typename T = int>
+string CommaSeparatedString(const std::initializer_list<T>& c,
+                            const char* prefix = "", const char* suffix = "") {
+  return CommaSeparatedString<std::initializer_list<T>>(c, prefix, suffix);
+}
+
+// Formats the container in the mathematical notation for a vector, e.g. (1, 3,
+// 7). StrAppend must support appending the elements of c.
+template <typename Container>
+string VectorString(const Container& c) {
+  return CommaSeparatedString(c, "(", ")");
+}
+
+// Overload needed to allow the container to be an initializer list. The default
+// type for T makes an empty initializer list work as well.
+template <typename T = int>
+string VectorString(const std::initializer_list<T>& c) {
+  return VectorString<std::initializer_list<T>>(c);
+}
+
 // Returns a PaddingConfig object that represents no padding for the given rank.
 PaddingConfig MakeNoPaddingConfig(int64 rank);
 
diff --git a/tensorflow/compiler/xla/util_test.cc b/tensorflow/compiler/xla/util_test.cc
index a81014f3b7..547b924180 100644
--- a/tensorflow/compiler/xla/util_test.cc
+++ b/tensorflow/compiler/xla/util_test.cc
@@ -80,6 +80,26 @@ TEST(UtilTest, HumanReadableNumFlopsExample) {
   ASSERT_EQ("1.00GFLOP/s", HumanReadableNumFlops(1e9, 1e9));
 }
 
+TEST(UtilTest, CommaSeparatedString) {
+  EXPECT_EQ(CommaSeparatedString({}), "");
+  EXPECT_EQ(CommaSeparatedString({"hello world"}), "hello world");
+  EXPECT_EQ(CommaSeparatedString({1, 57, 2}, "foo", "bar"), "foo1, 57, 2bar");
+}
+
+TEST(UtilTest, VectorString) {
+  std::list<int64> empty_list;
+  EXPECT_EQ(VectorString(empty_list), "()");
+
+  std::vector<float> float_vector = {5.5};
+  EXPECT_EQ(VectorString(float_vector), "(5.5)");
+
+  std::set<const char*> string_set = {"a", "b"};
+  EXPECT_EQ(VectorString(string_set), "(a, b)");
+
+  EXPECT_EQ(VectorString({}), "()");
+  EXPECT_EQ(VectorString({1, 57, 2}), "(1, 57, 2)");
+}
+
 TEST(UtilTest, LogLines) {
   // Just make sure this code runs (not verifying the output).
   LogLines(tensorflow::INFO, "hello\n\nworld", __FILE__, __LINE__);
-- 
GitLab


From 5f606e4d306f8cd637ff2509326278e6096a6e6f Mon Sep 17 00:00:00 2001
From: ZhipengShen <szpssky@gmail.com>
Date: Fri, 21 Apr 2017 12:07:43 +0800
Subject: [PATCH 0608/1563] fix slim README error

vgg.vgg_16(images) will return two values.
---
 tensorflow/contrib/slim/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md
index c8842dd57b..61148c0b26 100644
--- a/tensorflow/contrib/slim/README.md
+++ b/tensorflow/contrib/slim/README.md
@@ -447,7 +447,7 @@ vgg = tf.contrib.slim.nets.vgg
 images, labels = ...
 
 # Create the model.
-predictions = vgg.vgg_16(images)
+predictions, _ = vgg.vgg_16(images)
 
 # Define the loss functions and get the total loss.
 loss = slim.losses.softmax_cross_entropy(predictions, labels)
-- 
GitLab


From 9fd28d29ebb03597c03d205696213b1d5d7ac4d1 Mon Sep 17 00:00:00 2001
From: wydwww <wydwww@outlook.com>
Date: Fri, 21 Apr 2017 12:29:38 +0800
Subject: [PATCH 0609/1563] fix typos

---
 tensorflow/contrib/verbs/README.md | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tensorflow/contrib/verbs/README.md b/tensorflow/contrib/verbs/README.md
index 37a543dda8..da5f2b0223 100644
--- a/tensorflow/contrib/verbs/README.md
+++ b/tensorflow/contrib/verbs/README.md
@@ -1,54 +1,54 @@
-## How to compile and use Rdma-enabled tensorflow
-1. Follow the regular TF compilation instructions. During configure step, if you want ibverbs based Rdma support, answer yes to this question:
+## How to compile and use RDMA-enabled TensorFlow
+1. Follow the regular TF compilation instructions. During configure step, if you want ibverbs based RDMA support, answer yes to this question:
 
     ```Do you wish to build TensorFlow with VERBS-RDMA support [y/N]```
 
-2. To turn on Rdma connection, add the protocol "grpc+verbs" in server definition:
+2. To turn on RDMA connection, add the protocol "grpc+verbs" in server definition:
 
     ```server = tf.train.Server(cluster, job_name="local", task_index=0, protocol='grpc+verbs') # default protocol is 'grpc'```
 
 ## Overview
-The design is based on Tensorflow r1.0. An Rdma path is added between servers for tensor transfer (weights, gradients, etc). The existing GRPC path remains and is responsible for "administrative" tasks, such as setting up the Rdma path, exchanging computation graphs, etc.
+The design is based on TensorFlow r1.0. An RDMA path is added between servers for tensor transfer (weights, gradients, etc). The existing GRPC path remains and is responsible for "administrative" tasks, such as setting up the RDMA path, exchanging computation graphs, etc.
 
-During the server setup, an Rdma manager is created to manage low-level Rdma components such as Rdma channel and Rdma adapter, an Rdma rendezvous manager is created to oversee send/recv operations between servers. Following the distributed Tensorflow design philosophy, the send operation is passive, i.e. merely placing a tensor in the local out-going table. It is the receive operation that actually initiates the tensor transfer.
+During the server setup, an RDMA manager is created to manage low-level RDMA components such as RDMA channel and RDMA adapter, an RDMA rendezvous manager is created to oversee send/recv operations between servers. Following the distributed TensorFlow design philosophy, the send operation is passive, i.e. merely placing a tensor in the local out-going table. It is the receive operation that actually initiates the tensor transfer.
 
-Tensorflow dynamically allocates memory for tensors that are to be sent or received. This causes difficulty for Rdma operations where pinned memory is required. Two remedies are possible, either the memory is pinned, transfer, then unpinned for each and every tensor to be transferred, or a buffer is pre-allocated and pinned for each tensor. The former incurs significant operation overhead since pinning and unpinning memory for each dynamically generated tensor is slow. The latter incurs large memory overhead and extra copying from the tensor to its pinned buffer, but may still be faster than the former. The second approach is adopted in this design. Each Rdma channel, representing a Rdma connection to a peer, contains a table of pinned buffers for all the seen tensors that requires transfer. It is assumed that the tensor size rarely changes across different steps. So only one buffer is created for the same tensor across all the steps. In the rare case when the tensor size does increases, the old buffer is discarded and new buffer of larger size is created and pinned.
+TensorFlow dynamically allocates memory for tensors that are to be sent or received. This causes difficulty for RDMA operations where pinned memory is required. Two remedies are possible, either the memory is pinned, transfer, then unpinned for each and every tensor to be transferred, or a buffer is pre-allocated and pinned for each tensor. The former incurs significant operation overhead since pinning and unpinning memory for each dynamically generated tensor is slow. The latter incurs large memory overhead and extra copying from the tensor to its pinned buffer, but may still be faster than the former. The second approach is adopted in this design. Each RDMA channel, representing a RDMA connection to a peer, contains a table of pinned buffers for all the seen tensors that requires transfer. It is assumed that the tensor size rarely changes across different steps. So only one buffer is created for the same tensor across all the steps. In the rare case when the tensor size does increases, the old buffer is discarded and new buffer of larger size is created and pinned.
 
-When a tensor is prepared fro transfer, it is first converted to TensorProto, then the proto is serialized to byte array and copied to the pinned buffer. The content of the buffer is transferred to the remote node via Rdma write. On the remote side, the process is reversed. This is illustrated in the diagram below. The conversion of TensorProto is introduced to simplify transfer of string-tensors. Also since the TensorProto lives in host memory, even if the origin tensor lives in the device, the pinned buffers are all allocated in the host memory.
-![Tensorflow Rdma path](./design_diagram.png)
+When a tensor is prepared for transfer, it is first converted to TensorProto, then the proto is serialized to byte array and copied to the pinned buffer. The content of the buffer is transferred to the remote node via RDMA write. On the remote side, the process is reversed. This is illustrated in the diagram below. The conversion of TensorProto is introduced to simplify transfer of string-tensors. Also since the TensorProto lives in host memory, even if the origin tensor lives in the device, the pinned buffers are all allocated in the host memory.
+![TensorFlow RDMA path](./design_diagram.png)
 
 The following improvements can be made in the future. First, conversion to TensorProto and serialization can be avoided for numeric (float/int) tensors since their internal buffer can be access directly as byte array. Second, the pinned buffer may be allocated on device if the tensor is located in the device. This avoids extra device-to-host copy at the expense of extra device memory consumption.
 ## Design details
 
-### Rdma components
+### RDMA components
 
-* **Rdma adapter:** The base for Rdma communications. It may contain multiple channels and buffers.  It is responsible for handling various incoming Rdma messages.
-* **Rdma channel:** Responsible for Rdma connection to a particular node. It manages multiple buffers. A channel has a callback table which stores all the callbacks for the requested tensors.
-* **Rdma buffer:** Responsible for sending or receiving data. It has a fixed size memory to store the data. It has a queue to store the pending jobs. There are three types of buffers, message buffer, ACK buffer and tensor buffer. A channel has two message buffers, two ack buffers and many tensor buffers.
-* **Rdma manager:** Manages the adapter and channels, including channel creation, channel setup via GRPC service, channel lookup, etc.
-* **Rdma rendezvous manager:** manages multiple rdma rendezvous. 
-* **Rdma rendezvous:** a derived class of BaseRemoteRendezvous. This class is the back end for "send" and "recv" ops. When the sendrecv_op wants to send or receive a tensor, it calls the rendezvous' "send" and "recv" functions respectively. Rendezvous are identified by "step_id", a random number, so that tensors for different iterations don't get mixed up.
+* **RDMA adapter:** The base for RDMA communications. It may contain multiple channels and buffers.  It is responsible for handling various incoming RDMA messages.
+* **RDMA channel:** Responsible for RDMA connection to a particular node. It manages multiple buffers. A channel has a callback table which stores all the callbacks for the requested tensors.
+* **RDMA buffer:** Responsible for sending or receiving data. It has a fixed size memory to store the data. It has a queue to store the pending jobs. There are three types of buffers, message buffer, ACK buffer and tensor buffer. A channel has two message buffers, two ack buffers and many tensor buffers.
+* **RDMA manager:** Manages the adapter and channels, including channel creation, channel setup via GRPC service, channel lookup, etc.
+* **RDMA rendezvous manager:** manages multiple rdma rendezvous. 
+* **RDMA rendezvous:** a derived class of BaseRemoteRendezvous. This class is the back end for "send" and "recv" ops. When the sendrecv_op wants to send or receive a tensor, it calls the rendezvous' "send" and "recv" functions respectively. Rendezvous are identified by "step_id", a random number, so that tensors for different iterations don't get mixed up.
 
 ### The SEND operation
 
-In tensorflow, when rendezvous sends a tensor, it merely puts a tensor in a local table in the corresponding rendezvous. If the tensor has been requested, a callback exists in the table. "send" will activate the callback, which tries to send the tensor across the node.
+In TensorFlow, when rendezvous sends a tensor, it merely puts a tensor in a local table in the corresponding rendezvous. If the tensor has been requested, a callback exists in the table. "send" will activate the callback, which tries to send the tensor across the node.
 
 
 ### The RECV operation
 
-When a tensor is requested, rendezvous' recv function is called. The function first places a callback in the channel's callback table, which will be activated once the tensor is sent from the source. In the next step, a message is sent to notify the source of the requested tensor. Once the source receives the message, it will check locally for the tensor, if not found, a callback is placed in the table, otherwise, the tensor id will be placed at corresponding Rdma buffer's job queue for future transmission. When a tensor is scheduled to be transmitted, the Rdma buffer needs to have the memory allocated and initialized (registered with the remote buffer info). If the memory is not ready, the transmission is deferred, a message is sent to the destination to establish the memory first. The other case a transimssion can be deferred is when the buffer is still being used by an on-going transmission.
+When a tensor is requested, rendezvous' recv function is called. The function first places a callback in the channel's callback table, which will be activated once the tensor is sent from the source. In the next step, a message is sent to notify the source of the requested tensor. Once the source receives the message, it will check locally for the tensor, if not found, a callback is placed in the table, otherwise, the tensor id will be placed at corresponding RDMA buffer's job queue for future transmission. When a tensor is scheduled to be transmitted, the RDMA buffer needs to have the memory allocated and initialized (registered with the remote buffer info). If the memory is not ready, the transmission is deferred, a message is sent to the destination to establish the memory first. The other case a transmission can be deferred is when the buffer is still being used by an on-going transmission.
 
-### Three types of Rdma buffers
+### Three types of RDMA buffers
 
 * **Message buffer:** responsible for sending message only.
 * **Ack buffer:** once a message is sent, the recipient needs to send an ack via the ack buffer to free up the message buffer. An ack buffer is exclusively for its coupled message buffer.
 * **Tensor buffer:** responsible for sending tensors. The recipient needs to send back a message to free up the sending buffer.
 
-### Rdma packet format
+### RDMA packet format
 
 |type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|data_type|tensor_shape|tensor_bytes|tensor_buffer|
 
-### Six types of Rdma messages
+### Six types of RDMA messages
 * RDMA_MESSAGE_ACK
 * RDMA_MESSAGE_BUFFER_IDLE
 * RDMA_MESSAGE_BUFFER_REQUEST
@@ -56,7 +56,7 @@ When a tensor is requested, rendezvous' recv function is called. The function fi
 * RDMA_MESSAGE_TENSOR_REQUEST
 * RDMA_MESSAGE_TENSOR_WRITE
 
-### Actions upon receiving Rdma messages
+### Actions upon receiving RDMA messages
 * RDMA_MESSAGE_ACK
   * sender: mark local ack buffer idle.
   * receiver: mark remote message buffer idle, send next item.
-- 
GitLab


From b0594e1b82180efe5b1d0558b4410137f3974b93 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 20 Apr 2017 21:32:47 -0800
Subject: [PATCH 0610/1563] [XLA] Fixes some div-by-zero bugs. Change:
 153795265

---
 .../xla/service/hlo_execution_profile.cc      | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_execution_profile.cc b/tensorflow/compiler/xla/service/hlo_execution_profile.cc
index 447892c8de..9e25f1aceb 100644
--- a/tensorflow/compiler/xla/service/hlo_execution_profile.cc
+++ b/tensorflow/compiler/xla/service/hlo_execution_profile.cc
@@ -70,6 +70,7 @@ string HloExecutionProfile::ToString(
   string result;
   const int64 total_cycles = total_cycles_executed(computation);
   double clock_rate_ghz = device_description.clock_rate_ghz();
+  CHECK_GE(clock_rate_ghz, 1e-9);
 
   const auto cycles_to_microseconds = [&](double cycles) {
     return cycles / clock_rate_ghz / 1000.0;
@@ -80,14 +81,19 @@ string HloExecutionProfile::ToString(
     double nsecs = cycles / clock_rate_ghz;
     string bytes_per_sec;
     string bytes_per_cycle;
-    if (bytes_accessed >= 0) {
+    if (cycles <= 0 || bytes_accessed < 0) {
+      bytes_per_sec = "<unknown>";
+      bytes_per_cycle = "<unknown>";
+    } else {
       bytes_per_sec = tensorflow::strings::HumanReadableNumBytes(
           bytes_accessed / (nsecs / 1e9));
       bytes_per_cycle =
           tensorflow::strings::HumanReadableNumBytes(bytes_accessed / cycles);
-    } else {
-      bytes_per_sec = "<unknown>";
-      bytes_per_cycle = "<unknown>";
+    }
+
+    double cycles_percent = 0;
+    if (total_cycles > 0) {
+      cycles_percent = cycles / static_cast<double>(total_cycles) * 100;
     }
 
     tensorflow::strings::StrAppend(
@@ -97,8 +103,7 @@ string HloExecutionProfile::ToString(
             ":: "
             "%12s/cycle :: "
             "%s",
-            cycles, cycles / static_cast<double>(total_cycles) * 100,
-            cycles_to_microseconds(cycles),
+            cycles, cycles_percent, cycles_to_microseconds(cycles),
             flops <= 0 ? "<none>" : HumanReadableNumFlops(flops, nsecs).c_str(),
             bytes_per_sec.c_str(), bytes_per_cycle.c_str(), name.c_str()));
   };
@@ -114,26 +119,30 @@ string HloExecutionProfile::ToString(
   for (const auto& item : items) {
     const HloInstruction* hlo = item.first;
     tensorflow::strings::StrAppend(&result, "\n\t");
-    int64 flops = hlo == nullptr ? -1 : cost_analysis.flop_count(*hlo);
-    int64 bytes_accessed =
-        hlo == nullptr ? -1 : cost_analysis.bytes_accessed(*hlo);
-    string display = hlo == nullptr ? "<none>" : hlo->ToString();
+    const int64 flops = (hlo == nullptr) ? -1 : cost_analysis.flop_count(*hlo);
+    const int64 bytes_accessed =
+        (hlo == nullptr) ? -1 : cost_analysis.bytes_accessed(*hlo);
+    const string display = (hlo == nullptr) ? "<none>" : hlo->ToString();
     append_item(item.second, flops, bytes_accessed, display);
   }
 
-  MetricTableReport table;
-  table.SetMetricName("microseconds");
-  table.SetEntryName("ops");
-  table.SetShowCategoryTable();
-  for (const auto& item : items) {
-    MetricTableReport::Entry entry;
-    entry.text = item.first->ToString();
-    entry.short_text = item.first->ToString(/*compact_operands=*/true);
-    entry.category_text = item.first->ToCategory();
-    entry.metric = cycles_to_microseconds(item.second);
-    table.AddEntry(std::move(entry));
+  if (total_cycles <= 0) {
+    result += "****** 0 total cycles ******\n";
+  } else {
+    MetricTableReport table;
+    table.SetMetricName("microseconds");
+    table.SetEntryName("ops");
+    table.SetShowCategoryTable();
+    for (const auto& item : items) {
+      MetricTableReport::Entry entry;
+      entry.text = item.first->ToString();
+      entry.short_text = item.first->ToString(/*compact_operands=*/true);
+      entry.category_text = item.first->ToCategory();
+      entry.metric = cycles_to_microseconds(item.second);
+      table.AddEntry(std::move(entry));
+    }
+    result += table.MakeReport(cycles_to_microseconds(total_cycles));
   }
-  result += table.MakeReport(cycles_to_microseconds(total_cycles));
 
   return result;
 }
-- 
GitLab


From 858e0afcc45c39b6428bf82ab1444323e925cfd8 Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Thu, 20 Apr 2017 22:22:29 -0800
Subject: [PATCH 0611/1563] Switch DirectSession to use _Arg and _Retval ops
 for feeding and fetching.

This change reduces the overhead imposed by string processing and
rendezvous invocation in the DirectSession::Run() call by 1--2 microseconds
per value fed or fetched.

RELNOTES: Improved DirectSession::Run() overhead and error checking. Feeding a value of the wrong type will now synchronously raise an INVALID_ARGUMENT error instead of asynchronously raising an INTERNAL error. Code that depends on the (undefined) behavior when feeding a tensor of the wrong type may need to be updated.
Change: 153797943
---
 tensorflow/core/BUILD                         |   1 +
 .../core/common_runtime/build_graph_options.h |   5 +
 .../core/common_runtime/direct_session.cc     | 144 ++++++++++++++----
 .../core/common_runtime/direct_session.h      |  22 ++-
 .../core/common_runtime/graph_runner.cc       |   4 +-
 .../resource_variable_read_optimizer.cc       |   9 +-
 .../simple_graph_execution_state.cc           |  20 ++-
 .../simple_graph_execution_state.h            |  20 ++-
 tensorflow/core/framework/function.cc         |  15 +-
 tensorflow/core/framework/function.h          |   1 +
 tensorflow/core/graph/subgraph.cc             | 111 +++++++++-----
 tensorflow/core/graph/subgraph.h              |  15 +-
 tensorflow/core/graph/subgraph_test.cc        |  96 ++++++++++--
 tensorflow/python/debug/lib/debug_data.py     |   2 +-
 .../kernel_tests/control_flow_ops_py_test.py  |   2 +-
 .../graph_transforms/fold_constants_lib.cc    |   3 +-
 16 files changed, 370 insertions(+), 100 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 1b78b25ff5..d614349387 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1563,6 +1563,7 @@ tf_cuda_library(
         ":lib_internal",
         ":proto_text",
         ":protos_all_cc",
+        "//tensorflow/core/kernels:function_ops",
     ],
     alwayslink = 1,
 )
diff --git a/tensorflow/core/common_runtime/build_graph_options.h b/tensorflow/core/common_runtime/build_graph_options.h
index c6d4bdad9c..49566c8fa8 100644
--- a/tensorflow/core/common_runtime/build_graph_options.h
+++ b/tensorflow/core/common_runtime/build_graph_options.h
@@ -30,6 +30,11 @@ struct BuildGraphOptions {
   // the former via "ref" fetch_endpoints.
   std::vector<string> target_nodes;
 
+  // If `true`, uses Arg/Retval to implement feeds/fetches; otherwise
+  // uses Recv/Send to implement feeds/fetches.
+  // TODO(mrry): Remove this when the distributed runtime supports Arg/Retval.
+  bool use_function_convention = false;
+
   string DebugString() const;
 };
 
diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index c05cceced1..002e246b80 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -361,7 +361,6 @@ Status DirectSession::ExtendLocked(const GraphDef& graph) {
   return Status::OK();
 }
 
-// TODO(yuanbyu): Simplify by treating Run() as "PRunSetup(); PRun()".
 Status DirectSession::Run(const NamedTensorList& inputs,
                           const std::vector<string>& output_names,
                           const std::vector<string>& target_nodes,
@@ -426,13 +425,34 @@ Status DirectSession::Run(const RunOptions& run_options,
         executor_step_count, input_tensor_names, output_names, target_nodes));
   }
 
+  // Configure a call frame for the step, which we use to feed and
+  // fetch values to and from the executors.
+  FunctionCallFrame call_frame(executors_and_keys->input_types,
+                               executors_and_keys->output_types);
+  gtl::InlinedVector<Tensor, 4> feed_args(inputs.size());
+  for (const auto& it : inputs) {
+    if (it.second.dtype() == DT_RESOURCE) {
+      Tensor tensor_from_handle;
+      TF_RETURN_IF_ERROR(
+          ResourceHandleToInputTensor(it.second, &tensor_from_handle));
+      feed_args[executors_and_keys->input_name_to_index[it.first]] =
+          tensor_from_handle;
+    } else {
+      feed_args[executors_and_keys->input_name_to_index[it.first]] = it.second;
+    }
+  }
+  Status s = call_frame.SetArgs(feed_args);
+  if (errors::IsInternal(s)) {
+    return errors::InvalidArgument(s.error_message());
+  } else if (!s.ok()) {
+    return s;
+  }
+
   // Create a run state and start execution.
   RunState run_state(args.step_id, &devices_);
   run_state.rendez = new IntraProcessRendezvous(device_mgr_.get());
   CancellationManager step_cancellation_manager;
-
-  // Send inputs.
-  TF_RETURN_IF_ERROR(SendInputs(inputs, executors_and_keys, run_state.rendez));
+  args.call_frame = &call_frame;
 
   // Start parallel Executors.
   const size_t num_executors = executors_and_keys->items.size();
@@ -535,8 +555,22 @@ Status DirectSession::Run(const RunOptions& run_options,
   }
 
   // Receive outputs.
-  TF_RETURN_IF_ERROR(
-      RecvOutputs(output_names, executors_and_keys, &run_state, outputs));
+  if (outputs) {
+    std::vector<Tensor> sorted_outputs;
+    Status s = call_frame.ConsumeRetvals(&sorted_outputs);
+    if (errors::IsInternal(s)) {
+      return errors::InvalidArgument(s.error_message());
+    } else if (!s.ok()) {
+      return s;
+    }
+    outputs->clear();
+    outputs->reserve(sorted_outputs.size());
+    for (const string& output_name : output_names) {
+      outputs->emplace_back(
+          std::move(sorted_outputs[executors_and_keys
+                                       ->output_name_to_index[output_name]]));
+    }
+  }
 
   // Save the output tensors of this run we choose to keep.
   TF_RETURN_IF_ERROR(
@@ -706,11 +740,11 @@ Status DirectSession::PRun(const string& handle, const NamedTensorList& inputs,
       CheckFetch(inputs, output_names, executors_and_keys, run_state));
 
   // Send inputs.
-  Status s = SendInputs(inputs, executors_and_keys, run_state->rendez);
+  Status s = SendPRunInputs(inputs, executors_and_keys, run_state->rendez);
 
   // Receive outputs.
   if (s.ok()) {
-    s = RecvOutputs(output_names, executors_and_keys, run_state, outputs);
+    s = RecvPRunOutputs(output_names, executors_and_keys, run_state, outputs);
   }
 
   // Save the output tensors of this run we choose to keep.
@@ -770,16 +804,17 @@ Status DirectSession::ResourceHandleToInputTensor(const Tensor& resource_tensor,
   }
 }
 
-Status DirectSession::SendInputs(const NamedTensorList& inputs,
-                                 const ExecutorsAndKeys* executors_and_keys,
-                                 IntraProcessRendezvous* rendez) {
+Status DirectSession::SendPRunInputs(const NamedTensorList& inputs,
+                                     const ExecutorsAndKeys* executors_and_keys,
+                                     IntraProcessRendezvous* rendez) {
   Status s;
   Rendezvous::ParsedKey parsed;
   // Insert the input tensors into the local rendezvous by their
   // rendezvous key.
   for (const auto& input : inputs) {
-    auto it = executors_and_keys->input_keys.find(input.first);
-    if (it == executors_and_keys->input_keys.end()) {
+    auto it =
+        executors_and_keys->input_name_to_rendezvous_key.find(input.first);
+    if (it == executors_and_keys->input_name_to_rendezvous_key.end()) {
       return errors::Internal("'", input.first, "' is not a pre-defined feed.");
     }
     const string& input_key = it->second;
@@ -808,10 +843,10 @@ Status DirectSession::SendInputs(const NamedTensorList& inputs,
   return Status::OK();
 }
 
-Status DirectSession::RecvOutputs(const std::vector<string>& output_names,
-                                  const ExecutorsAndKeys* executors_and_keys,
-                                  RunState* run_state,
-                                  std::vector<Tensor>* outputs) {
+Status DirectSession::RecvPRunOutputs(
+    const std::vector<string>& output_names,
+    const ExecutorsAndKeys* executors_and_keys, RunState* run_state,
+    std::vector<Tensor>* outputs) {
   Status s;
   if (!output_names.empty()) {
     outputs->resize(output_names.size());
@@ -822,8 +857,9 @@ Status DirectSession::RecvOutputs(const std::vector<string>& output_names,
   for (size_t output_offset = 0; output_offset < output_names.size();
        ++output_offset) {
     const string& output_name = output_names[output_offset];
-    auto it = executors_and_keys->output_keys.find(output_name);
-    if (it == executors_and_keys->output_keys.end()) {
+    auto it =
+        executors_and_keys->output_name_to_rendezvous_key.find(output_name);
+    if (it == executors_and_keys->output_name_to_rendezvous_key.end()) {
       return errors::Internal("'", output_name,
                               "' is not a pre-defined fetch.");
     }
@@ -987,14 +1023,16 @@ Status DirectSession::GetOrCreateExecutors(
   options.feed_endpoints = inputs_sorted;
   options.fetch_endpoints = outputs_sorted;
   options.target_nodes = tn_sorted;
+  options.use_function_convention = !run_state_args->is_partial_run;
 
   std::shared_ptr<ExecutorsAndKeys> ek(new ExecutorsAndKeys);
 
   // The executor_lock_ is intentionally released while executor is
   // being created.
   std::unordered_map<string, std::unique_ptr<Graph>> graphs;
-  TF_RETURN_IF_ERROR(
-      CreateGraphs(options, &graphs, &ek->flib_def, run_state_args));
+  TF_RETURN_IF_ERROR(CreateGraphs(options, &graphs, &ek->flib_def,
+                                  run_state_args, &ek->input_types,
+                                  &ek->output_types));
 
   if (run_state_args->is_partial_run) {
     ek->graph = std::move(run_state_args->graph);
@@ -1079,17 +1117,37 @@ Status DirectSession::GetOrCreateExecutors(
     item->executor.reset(executor);
   }
 
-  // Compute the rendezvous keys to avoid recomputing them every time.
-  //
-  // We always use the first device as the device name portion of the
-  // key, even if we're feeding another graph.
-  for (const string& input : inputs) {
-    ek->input_keys[input] = GetRendezvousKey(
-        input, device_set_.client_device()->attributes(), FrameAndIter(0, 0));
-  }
-  for (const string& output : outputs) {
-    ek->output_keys[output] = GetRendezvousKey(
-        output, device_set_.client_device()->attributes(), FrameAndIter(0, 0));
+  // Cache the mapping from input/output names to graph elements to
+  // avoid recomputing it every time.
+  if (!run_state_args->is_partial_run) {
+    // For regular `Run()`, we use the function calling convention, and so
+    // maintain a mapping from input/output names to
+    // argument/return-value ordinal index.
+    for (size_t i = 0; i < inputs_sorted.size(); ++i) {
+      const string& input = inputs_sorted[i];
+      ek->input_name_to_index[input] = i;
+    }
+    for (size_t i = 0; i < outputs_sorted.size(); ++i) {
+      const string& output = outputs_sorted[i];
+      ek->output_name_to_index[output] = i;
+    }
+  } else {
+    // For `PRun()`, we use the rendezvous calling convention, and so
+    // maintain a mapping from input/output names to rendezvous keys.
+    //
+    // We always use the first device as the device name portion of the
+    // key, even if we're feeding another graph.
+    for (size_t i = 0; i < inputs_sorted.size(); ++i) {
+      const string& input = inputs_sorted[i];
+      ek->input_name_to_rendezvous_key[input] = GetRendezvousKey(
+          input, device_set_.client_device()->attributes(), FrameAndIter(0, 0));
+    }
+    for (size_t i = 0; i < outputs_sorted.size(); ++i) {
+      const string& output = outputs_sorted[i];
+      ek->output_name_to_rendezvous_key[output] =
+          GetRendezvousKey(output, device_set_.client_device()->attributes(),
+                           FrameAndIter(0, 0));
+    }
   }
 
   // Reacquire the lock, try to insert into the map.
@@ -1110,7 +1168,8 @@ Status DirectSession::CreateGraphs(
     const BuildGraphOptions& subgraph_options,
     std::unordered_map<string, std::unique_ptr<Graph>>* outputs,
     std::unique_ptr<FunctionLibraryDefinition>* flib_def,
-    RunStateArgs* run_state_args) {
+    RunStateArgs* run_state_args, DataTypeVector* input_types,
+    DataTypeVector* output_types) {
   mutex_lock l(graph_def_lock_);
   std::unique_ptr<SimpleClientGraph> client_graph;
 
@@ -1135,6 +1194,23 @@ Status DirectSession::CreateGraphs(
         execution_state->BuildGraph(subgraph_options, &client_graph));
   }
 
+  if (subgraph_options.feed_endpoints.size() !=
+      client_graph->feed_types.size()) {
+    return errors::Internal(
+        "Graph pruning failed: requested number of feed endpoints = ",
+        subgraph_options.feed_endpoints.size(),
+        " versus number of pruned feed endpoints = ",
+        client_graph->feed_types.size());
+  }
+  if (subgraph_options.fetch_endpoints.size() !=
+      client_graph->fetch_types.size()) {
+    return errors::Internal(
+        "Graph pruning failed: requested number of fetch endpoints = ",
+        subgraph_options.fetch_endpoints.size(),
+        " versus number of pruned fetch endpoints = ",
+        client_graph->fetch_types.size());
+  }
+
   auto current_stateful_placements = execution_state->GetStatefulPlacements();
   // Update our current state based on the execution_state's
   // placements.  If there are any mismatches for a node,
@@ -1240,6 +1316,8 @@ Status DirectSession::CreateGraphs(
     }
   }
   *flib_def = std::move(client_graph->flib_def);
+  std::swap(*input_types, client_graph->feed_types);
+  std::swap(*output_types, client_graph->fetch_types);
   return s;
 }
 
diff --git a/tensorflow/core/common_runtime/direct_session.h b/tensorflow/core/common_runtime/direct_session.h
index b9d22ac522..848ef3bc62 100644
--- a/tensorflow/core/common_runtime/direct_session.h
+++ b/tensorflow/core/common_runtime/direct_session.h
@@ -132,8 +132,13 @@ class DirectSession : public Session {
     NameNodeMap name_to_node;
     std::unique_ptr<FunctionLibraryDefinition> flib_def;
     std::vector<PerPartitionExecutorsAndLib> items;
-    std::unordered_map<string, string> input_keys;
-    std::unordered_map<string, string> output_keys;
+    std::unordered_map<string, size_t> input_name_to_index;
+    std::unordered_map<string, string> input_name_to_rendezvous_key;
+    std::unordered_map<string, size_t> output_name_to_index;
+    std::unordered_map<string, string> output_name_to_rendezvous_key;
+
+    DataTypeVector input_types;
+    DataTypeVector output_types;
   };
 
   // For each live partial execution, the session maintains a RunState.
@@ -187,7 +192,8 @@ class DirectSession : public Session {
       const BuildGraphOptions& options,
       std::unordered_map<string, std::unique_ptr<Graph>>* outputs,
       std::unique_ptr<FunctionLibraryDefinition>* flib_def,
-      RunStateArgs* run_state_args);
+      RunStateArgs* run_state_args, DataTypeVector* input_types,
+      DataTypeVector* output_types);
 
   ::tensorflow::Status ExtendLocked(const GraphDef& graph)
       EXCLUSIVE_LOCKS_REQUIRED(graph_def_lock_);
@@ -196,17 +202,17 @@ class DirectSession : public Session {
       const Tensor& resource_tensor, Tensor* retrieved_tensor);
 
   // Feeds more inputs to the executors, triggering further execution.
-  ::tensorflow::Status SendInputs(
+  ::tensorflow::Status SendPRunInputs(
       const std::vector<std::pair<string, Tensor>>& inputs,
       const ExecutorsAndKeys* executors_and_keys,
       IntraProcessRendezvous* rendez);
 
   // Fetches more outputs from the executors. It waits until the output
   // tensors are computed.
-  ::tensorflow::Status RecvOutputs(const std::vector<string>& output_names,
-                                   const ExecutorsAndKeys* executors_and_keys,
-                                   RunState* run_state,
-                                   std::vector<Tensor>* outputs);
+  ::tensorflow::Status RecvPRunOutputs(
+      const std::vector<string>& output_names,
+      const ExecutorsAndKeys* executors_and_keys, RunState* run_state,
+      std::vector<Tensor>* outputs);
 
   // Check if the specified fetches can be computed from the feeds
   // that we have already provided.
diff --git a/tensorflow/core/common_runtime/graph_runner.cc b/tensorflow/core/common_runtime/graph_runner.cc
index 514a63590b..a85fbbf88f 100644
--- a/tensorflow/core/common_runtime/graph_runner.cc
+++ b/tensorflow/core/common_runtime/graph_runner.cc
@@ -130,9 +130,11 @@ Status GraphRunner::Run(Graph* graph, FunctionLibraryRuntime* function_library,
   }
 
   // Call RewriteGraphForExecution
+  subgraph::RewriteGraphMetadata metadata;
   TF_RETURN_IF_ERROR(subgraph::RewriteGraphForExecution(
       graph_to_run.get(), input_names, output_names, {} /* target nodes */,
-      cpu_device_->attributes()));
+      cpu_device_->attributes(), false /* use_function_convention */,
+      &metadata));
 
   // Create the local executor and the Rendezvous for fetching back the
   // constants.
diff --git a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
index 85a29e11e2..c179e94c36 100644
--- a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
+++ b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
@@ -21,9 +21,9 @@ limitations under the License.
 namespace tensorflow {
 namespace {
 
-// Replaces ReadVariableOp nodes which are only used by Sends and sinks with
-// _UnsafeReadVariable nodes, as this transforamtion is safe and will improve
-// performance.
+// Replaces ReadVariableOp nodes which are only used by Sends, sinks,
+// and function Retvals with _UnsafeReadVariable nodes, as this
+// transformation is safe and will improve performance.
 class ResourceVariableReadPass : public GraphOptimizationPass {
  public:
   Status Run(const GraphOptimizationPassOptions& options) override {
@@ -43,7 +43,8 @@ class ResourceVariableReadPass : public GraphOptimizationPass {
       if (n->type_string() == "ReadVariableOp") {
         bool skip = false;
         for (const Edge* e : n->out_edges()) {
-          if (!e->dst()->IsSend() && e->dst()->name() != "_SINK") {
+          if (!e->dst()->IsSend() && e->dst()->type_string() != "_Retval" &&
+              e->dst()->name() != "_SINK") {
             skip = true;
           }
         }
diff --git a/tensorflow/core/common_runtime/simple_graph_execution_state.cc b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
index c2ac15b345..31e63a9ef7 100644
--- a/tensorflow/core/common_runtime/simple_graph_execution_state.cc
+++ b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
@@ -284,9 +284,11 @@ Status SimpleGraphExecutionState::InitBaseGraph(
   if (session_options_ &&
       session_options_->config.graph_options().place_pruned_graph()) {
     // Rewrite the graph before placement.
+    rewrite_metadata_.reset(new subgraph::RewriteGraphMetadata);
     TF_RETURN_IF_ERROR(subgraph::RewriteGraphForExecution(
         new_graph.get(), options.feed_endpoints, options.fetch_endpoints,
-        options.target_nodes, device_set_->client_device()->attributes()));
+        options.target_nodes, device_set_->client_device()->attributes(),
+        options.use_function_convention, rewrite_metadata_.get()));
   }
 
   // Save stateful placements before placing.
@@ -333,15 +335,26 @@ Status SimpleGraphExecutionState::BuildGraph(
   std::unique_ptr<Graph> ng(new Graph(flib_def_.get()));
   CopyGraph(*graph_, ng.get());
 
+  subgraph::RewriteGraphMetadata rewrite_metadata;
   if (session_options_ == nullptr ||
       !session_options_->config.graph_options().place_pruned_graph()) {
     // Extract the subset of the graph that needs to be run, adding feed/fetch
     // ops as needed.
     TF_RETURN_IF_ERROR(subgraph::RewriteGraphForExecution(
         ng.get(), options.feed_endpoints, options.fetch_endpoints,
-        options.target_nodes, device_set_->client_device()->attributes()));
+        options.target_nodes, device_set_->client_device()->attributes(),
+        options.use_function_convention, &rewrite_metadata));
+  } else {
+    // This SimpleGraphExecutionState represents a graph that was
+    // pruned when this was constructed, so we copy the metadata from
+    // a member variable.
+    CHECK(rewrite_metadata_);
+    rewrite_metadata = *rewrite_metadata_;
   }
 
+  CHECK_EQ(options.feed_endpoints.size(), rewrite_metadata.feed_types.size());
+  CHECK_EQ(options.fetch_endpoints.size(), rewrite_metadata.fetch_types.size());
+
   // Make a fresh copy of the function library for the client graph.
   std::unique_ptr<FunctionLibraryDefinition> flib(
       new FunctionLibraryDefinition(*flib_def_));
@@ -363,7 +376,8 @@ Status SimpleGraphExecutionState::BuildGraph(
   // since the local CostModel used to record its stats is sized by
   // the largest node id.
   std::unique_ptr<SimpleClientGraph> dense_copy(
-      new SimpleClientGraph(std::move(flib)));
+      new SimpleClientGraph(std::move(flib), rewrite_metadata.feed_types,
+                            rewrite_metadata.fetch_types));
   CopyGraph(*ng, &dense_copy->graph);
 
   // TODO(vrv): We should check invariants of the graph here.
diff --git a/tensorflow/core/common_runtime/simple_graph_execution_state.h b/tensorflow/core/common_runtime/simple_graph_execution_state.h
index 3b6ce23c75..00b5509fd7 100644
--- a/tensorflow/core/common_runtime/simple_graph_execution_state.h
+++ b/tensorflow/core/common_runtime/simple_graph_execution_state.h
@@ -39,6 +39,10 @@ struct SessionOptions;
 class StepStats;
 class Timeline;
 
+namespace subgraph {
+struct RewriteGraphMetadata;
+}
+
 struct SimpleGraphExecutionStateOptions {
   const DeviceSet* device_set = nullptr;
   const SessionOptions* session_options = nullptr;
@@ -50,13 +54,19 @@ struct SimpleGraphExecutionStateOptions {
 // A SimpleClientGraph is simply a sub-graph of the full graph as induced by
 // BuildGraphOptions.
 struct SimpleClientGraph {
-  explicit SimpleClientGraph(std::unique_ptr<FunctionLibraryDefinition> flib)
-      : flib_def(std::move(flib)), graph(flib_def.get()) {}
+  explicit SimpleClientGraph(std::unique_ptr<FunctionLibraryDefinition> flib,
+                             DataTypeVector feed_types,
+                             DataTypeVector fetch_types)
+      : flib_def(std::move(flib)),
+        graph(flib_def.get()),
+        feed_types(std::move(feed_types)),
+        fetch_types(std::move(fetch_types)) {}
   // Each client-graph gets its own function library since optimization passes
   // post rewrite for execution might want to introduce new functions.
   std::unique_ptr<FunctionLibraryDefinition> flib_def;
   Graph graph;
-  int32 placement_version;
+  DataTypeVector feed_types;
+  DataTypeVector fetch_types;
 };
 
 // SimpleGraphExecutionState is responsible for generating an
@@ -190,6 +200,10 @@ class SimpleGraphExecutionState {
   // and may be updated by a graph optimization pass.
   std::unique_ptr<FunctionLibraryDefinition> flib_def_;
 
+  // `rewrite_metadata_` is only set for SimpleGraphExecutionState
+  // objects created by `MakeForPrunedGraph()`.
+  std::unique_ptr<subgraph::RewriteGraphMetadata> rewrite_metadata_;
+
   // The dataflow graph owned by this object.
   Graph* graph_;
 
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index edb52737d9..8a7d96c38a 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -789,7 +789,7 @@ Status FunctionCallFrame::GetRetvals(std::vector<Tensor>* rets) const {
   rets->clear();
   rets->reserve(rets_.size());
   for (size_t i = 0; i < rets_.size(); ++i) {
-    auto item = rets_[i];
+    const auto& item = rets_[i];
     if (item.has_val) {
       rets->push_back(item.val);
     } else {
@@ -799,6 +799,19 @@ Status FunctionCallFrame::GetRetvals(std::vector<Tensor>* rets) const {
   return Status::OK();
 }
 
+Status FunctionCallFrame::ConsumeRetvals(std::vector<Tensor>* rets) {
+  rets->clear();
+  rets->reserve(rets_.size());
+  for (size_t i = 0; i < rets_.size(); ++i) {
+    if (rets_[i].has_val) {
+      rets->emplace_back(std::move(rets_[i].val));
+    } else {
+      return errors::Internal("Retval[", i, "] does not have value");
+    }
+  }
+  return Status::OK();
+}
+
 Status FunctionCallFrame::GetArg(int index, Tensor* val) const {
   if (index < 0 || static_cast<size_t>(index) >= args_.size()) {
     return errors::InvalidArgument("GetArg ", index, " is not within [0, ",
diff --git a/tensorflow/core/framework/function.h b/tensorflow/core/framework/function.h
index 63c868ac9b..210e5b949a 100644
--- a/tensorflow/core/framework/function.h
+++ b/tensorflow/core/framework/function.h
@@ -259,6 +259,7 @@ class FunctionCallFrame {
   // Caller methods.
   Status SetArgs(gtl::ArraySlice<Tensor> args);
   Status GetRetvals(std::vector<Tensor>* rets) const;
+  Status ConsumeRetvals(std::vector<Tensor>* rets);
 
   // Callee methods.
   Status GetArg(int index, Tensor* val) const;
diff --git a/tensorflow/core/graph/subgraph.cc b/tensorflow/core/graph/subgraph.cc
index 91292500e1..9849d9a159 100644
--- a/tensorflow/core/graph/subgraph.cc
+++ b/tensorflow/core/graph/subgraph.cc
@@ -55,8 +55,13 @@ namespace {
 // state).
 static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
                          const gtl::ArraySlice<string>& fed_outputs,
-                         subgraph::NameIndex* name_index) {
-  for (const string& t : fed_outputs) {
+                         bool use_function_convention,
+                         subgraph::NameIndex* name_index,
+                         DataTypeVector* out_feed_types) {
+  out_feed_types->clear();
+  out_feed_types->reserve(fed_outputs.size());
+  for (size_t i = 0; i < fed_outputs.size(); ++i) {
+    const string& t = fed_outputs[i];
     TensorId id(ParseTensorName(t));
 
     auto iter = name_index->find(id.first);
@@ -71,17 +76,31 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
     }
 
     Node* recv_node;
-    TF_RETURN_IF_ERROR(
-        NodeBuilder(strings::StrCat("_recv_", id.first, "_", id.second),
-                    "_Recv")
-            .Attr("tensor_type", BaseType(n->output_type(id.second)))
-            .Attr("tensor_name", t)
-            .Attr("send_device", device_info.name())
-            .Attr("recv_device", device_info.name())
-            .Attr("send_device_incarnation",
-                  static_cast<int64>(device_info.incarnation()))
-            .Attr("client_terminated", true)
-            .Finalize(g, &recv_node));
+
+    if (!use_function_convention) {
+      TF_RETURN_IF_ERROR(
+          NodeBuilder(strings::StrCat("_recv_", id.first, "_", id.second),
+                      "_Recv")
+              .Attr("tensor_type", BaseType(n->output_type(id.second)))
+              .Attr("tensor_name", t)
+              .Attr("send_device", device_info.name())
+              .Attr("recv_device", device_info.name())
+              .Attr("send_device_incarnation",
+                    static_cast<int64>(device_info.incarnation()))
+              .Attr("client_terminated", true)
+              .Finalize(g, &recv_node));
+    } else {
+      // NOTE(mrry): We must include the index as part of the node
+      // name, because _Arg is a "stateful" kernel and therefore
+      // its name must uniquely identify a kernel instance across all
+      // graphs in the same session.
+      TF_RETURN_IF_ERROR(NodeBuilder(strings::StrCat("_arg_", id.first, "_",
+                                                     id.second, "_", i),
+                                     "_Arg")
+                             .Attr("T", BaseType(n->output_type(id.second)))
+                             .Attr("index", static_cast<int32>(i))
+                             .Finalize(g, &recv_node));
+    }
     recv_node->set_assigned_device_name(device_info.name());
 
     // Copy the _output_shapes from the original node to the feed node,
@@ -130,6 +149,7 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
       }
       g->RemoveEdge(e);
     }
+    out_feed_types->push_back(BaseType(n->output_type(id.second)));
   }
   return Status::OK();
 }
@@ -181,9 +201,14 @@ namespace subgraph {
 
 Status FetchOutputs(Graph* g, const DeviceAttributes& device_info,
                     const gtl::ArraySlice<string>& fetch_outputs,
-                    NameIndex* name_index, std::vector<Node*>* fetch_nodes) {
-  fetch_nodes->clear();
-  for (const string& t : fetch_outputs) {
+                    bool use_function_convention, NameIndex* name_index,
+                    std::vector<Node*>* out_fetch_nodes,
+                    DataTypeVector* out_fetch_types) {
+  out_fetch_nodes->clear();
+  out_fetch_nodes->reserve(fetch_outputs.size());
+  for (size_t i = 0; i < fetch_outputs.size(); ++i) {
+    const string& t = fetch_outputs[i];
+
     // Parse t into node_name and output_index.
     TensorId id(ParseTensorName(t));
 
@@ -213,25 +238,39 @@ Status FetchOutputs(Graph* g, const DeviceAttributes& device_info,
 
     // Create the fetch Node and connect it up
     Node* send_node;
-    TF_RETURN_IF_ERROR(
-        NodeBuilder(strings::StrCat("_send_", id.first, "_", id.second),
-                    "_Send")
-            .Input(n, id.second)
-            .Attr("tensor_name", t)
-            .Attr("send_device", device_info.name())
-            .Attr("recv_device", device_info.name())
-            .Attr("send_device_incarnation",
-                  static_cast<int64>(device_info.incarnation()))
-            .Attr("client_terminated", true)
-            .Finalize(g, &send_node));
+    if (!use_function_convention) {
+      TF_RETURN_IF_ERROR(
+          NodeBuilder(strings::StrCat("_send_", id.first, "_", id.second),
+                      "_Send")
+              .Input(n, id.second)
+              .Attr("tensor_name", t)
+              .Attr("send_device", device_info.name())
+              .Attr("recv_device", device_info.name())
+              .Attr("send_device_incarnation",
+                    static_cast<int64>(device_info.incarnation()))
+              .Attr("client_terminated", true)
+              .Finalize(g, &send_node));
+    } else {
+      // NOTE(mrry): We must include the index as part of the node
+      // name, because _Retval is a "stateful" kernel and therefore
+      // its name must uniquely identify a kernel instance across all
+      // graphs in the same session.
+      TF_RETURN_IF_ERROR(NodeBuilder(strings::StrCat("_retval_", id.first, "_",
+                                                     id.second, "_", i),
+                                     "_Retval")
+                             .Input(n, id.second)
+                             .Attr("T", BaseType(n->output_type(id.second)))
+                             .Attr("index", static_cast<int32>(i))
+                             .Finalize(g, &send_node));
+    }
     send_node->set_assigned_device_name(device_info.name());
-    VLOG(1) << "Created fetch node: " << SummarizeNodeDef(send_node->def());
 
     // Update the index.
     (*name_index)[send_node->name()] = send_node;
 
     g->AddControlEdge(send_node, g->sink_node());
-    fetch_nodes->push_back(send_node);
+    out_fetch_nodes->push_back(send_node);
+    out_fetch_types->push_back(BaseType(n->output_type(id.second)));
   }
 
   return Status::OK();
@@ -241,7 +280,8 @@ Status RewriteGraphForExecution(
     Graph* g, const gtl::ArraySlice<string>& fed_outputs,
     const gtl::ArraySlice<string>& fetch_outputs,
     const gtl::ArraySlice<string>& target_node_names,
-    const DeviceAttributes& device_info) {
+    const DeviceAttributes& device_info, bool use_function_convention,
+    RewriteGraphMetadata* out_metadata) {
   if (fetch_outputs.empty() && target_node_names.empty()) {
     return errors::InvalidArgument(
         "Must specify at least one target to fetch or execute.");
@@ -274,18 +314,21 @@ Status RewriteGraphForExecution(
   // currently listed in "fetch_nodes".  We pass "name_index" so the index is
   // kept up to date.
   if (!fed_outputs.empty()) {
-    TF_RETURN_IF_ERROR(FeedInputs(g, device_info, fed_outputs, &name_index));
+    TF_RETURN_IF_ERROR(FeedInputs(g, device_info, fed_outputs,
+                                  use_function_convention, &name_index,
+                                  &out_metadata->feed_types));
   }
 
   // Add the fetch nodes, also updating "name_index".
   std::vector<Node*> fetch_nodes;
   if (!fetch_outputs.empty()) {
-    TF_RETURN_IF_ERROR(
-        FetchOutputs(g, device_info, fetch_outputs, &name_index, &fetch_nodes));
+    TF_RETURN_IF_ERROR(FetchOutputs(g, device_info, fetch_outputs,
+                                    use_function_convention, &name_index,
+                                    &fetch_nodes, &out_metadata->fetch_types));
   }
 
   // Prune the graph to only compute what is needed for the fetch nodes and the
-  // targets nodes.
+  // target nodes.
   if (!fetch_nodes.empty() || !target_node_names.empty()) {
     TF_RETURN_IF_ERROR(
         PruneForTargets(g, name_index, fetch_nodes, target_node_names));
diff --git a/tensorflow/core/graph/subgraph.h b/tensorflow/core/graph/subgraph.h
index d94d983d00..8ccc27914b 100644
--- a/tensorflow/core/graph/subgraph.h
+++ b/tensorflow/core/graph/subgraph.h
@@ -26,6 +26,18 @@ limitations under the License.
 namespace tensorflow {
 namespace subgraph {
 
+// Information about a graph rewritten by `RewriteGraphForExecution()`.
+struct RewriteGraphMetadata {
+  // The element type of each tensor fed to this subgraph. The order
+  // of types corresponds to the order of tensor names in
+  // `fed_outputs` when calling `RewriteGraphForExecution()`.
+  DataTypeVector feed_types;
+  // The element type of each tensor fetched from this subgraph. The
+  // order of types corresponds to the order of tensor names in
+  // `fetch_outputs` when calling `RewriteGraphForExecution()`.
+  DataTypeVector fetch_types;
+};
+
 // Rewrite the graph structure of "*g" to deal with feeding node
 // outputs, fetching node outputs, and only running a subset of the
 // graph.  "fed_outputs" and "fetch_outputs" are both lists of
@@ -56,7 +68,8 @@ Status RewriteGraphForExecution(
     Graph* g, const gtl::ArraySlice<string>& fed_outputs,
     const gtl::ArraySlice<string>& fetch_outputs,
     const gtl::ArraySlice<string>& target_node_names,
-    const DeviceAttributes& device_info);
+    const DeviceAttributes& device_info, bool use_function_convention,
+    RewriteGraphMetadata* out_metadata);
 
 typedef std::unordered_map<StringPiece, Node*, StringPiece::Hasher> NameIndex;
 
diff --git a/tensorflow/core/graph/subgraph_test.cc b/tensorflow/core/graph/subgraph_test.cc
index ee4960121f..3dc11b7a16 100644
--- a/tensorflow/core/graph/subgraph_test.cc
+++ b/tensorflow/core/graph/subgraph_test.cc
@@ -104,7 +104,8 @@ class SubgraphTest : public ::testing::Test {
   }
 
   string Subgraph(const string& fed_str, const string& fetch_str,
-                  const string& targets_str) {
+                  const string& targets_str,
+                  bool use_function_convention = false) {
     Graph* subgraph = new Graph(OpRegistry::Global());
     CopyGraph(*g_, subgraph);
     std::vector<string> fed =
@@ -114,13 +115,18 @@ class SubgraphTest : public ::testing::Test {
     std::vector<string> targets =
         str_util::Split(targets_str, ',', str_util::SkipEmpty());
 
-    Status s = subgraph::RewriteGraphForExecution(subgraph, fed, fetch, targets,
-                                                  device_info_);
+    subgraph::RewriteGraphMetadata metadata;
+    Status s = subgraph::RewriteGraphForExecution(
+        subgraph, fed, fetch, targets, device_info_, use_function_convention,
+        &metadata);
     if (!s.ok()) {
       delete subgraph;
       return s.ToString();
     }
 
+    EXPECT_EQ(fed.size(), metadata.feed_types.size());
+    EXPECT_EQ(fetch.size(), metadata.fetch_types.size());
+
     // Replace the graph with the subgraph for the rest of the display program
     g_.reset(subgraph);
     return "OK";
@@ -178,6 +184,20 @@ TEST_F(SubgraphTest, FedOutputs1) {
   ExpectNodes("W1,W2,_recv_input_1,t1,t2");
 }
 
+TEST_F(SubgraphTest, FedOutputs1_FunctionConvention) {
+  ExpectOK(
+      "node { name: 'W1' op: 'TestParams' }"
+      "node { name: 'W2' op: 'TestParams' }"
+      "node { name: 'input' op: 'TestInput' }"
+      "node { name: 't1' op: 'TestMul' input: [ 'W1', 'input:1' ] }"
+      "node { name: 't2' op: 'TestMul' input: [ 'W2', 't1' ] }"
+      "node { name: 't3_a' op: 'TestRelu' input: 't2' }"
+      "node { name: 't3_b' op: 'TestRelu' input: 't2' }");
+  EXPECT_EQ("OK",
+            Subgraph("input:1", "", "t2", true /* use_function_convention */));
+  ExpectNodes("W1,W2,_arg_input_1_0,t1,t2");
+}
+
 TEST_F(SubgraphTest, FedRefNode) {
   ExpectOK(
       "node { name: 'W1' op: 'TestParams' }"
@@ -189,7 +209,19 @@ TEST_F(SubgraphTest, FedRefNode) {
   EXPECT_FALSE(IsRefType(CHECK_NOTNULL(n)->output_type(0)));
 }
 
-TEST_F(SubgraphTest, FedOutputs2) {
+TEST_F(SubgraphTest, FedRefNode_FunctionConvention) {
+  ExpectOK(
+      "node { name: 'W1' op: 'TestParams' }"
+      "node { name: 'W2' op: 'TestParams' }"
+      "node { name: 't1' op: 'TestMul' input: [ 'W2', 'W1' ] }");
+  EXPECT_EQ("OK",
+            Subgraph("W1:0", "", "t1", true /* use_function_convention */));
+  ExpectNodes("_arg_W1_0_0,W2,t1");
+  Node* n = FindNode("_arg_W1_0_0");
+  EXPECT_FALSE(IsRefType(CHECK_NOTNULL(n)->output_type(0)));
+}
+
+TEST_F(SubgraphTest, FedOutputs2_FunctionConvention) {
   ExpectOK(
       "node { name: 'W1' op: 'TestParams' }"
       "node { name: 'W2' op: 'TestParams' }"
@@ -200,8 +232,9 @@ TEST_F(SubgraphTest, FedOutputs2) {
       "node { name: 't3_b' op: 'TestRelu' input: 't2' }");
   // We feed input:1, but nothing connects to it, so the _recv(input:1)
   // node also disappears.
-  EXPECT_EQ("OK", Subgraph("input:1,t1,W2", "", "t2"));
-  ExpectNodes("_recv_t1_0,_recv_W2_0,t2");
+  EXPECT_EQ("OK", Subgraph("input:1,t1,W2", "", "t2",
+                           true /* use_function_convention */));
+  ExpectNodes("_arg_t1_0_1,_arg_W2_0_2,t2");
 }
 
 TEST_F(SubgraphTest, FetchOutputs1) {
@@ -218,6 +251,22 @@ TEST_F(SubgraphTest, FetchOutputs1) {
       "W1,W2,input,t1,t2,_send_W2_0,_send_input_1,_send_t1_0,_send_t2_0");
 }
 
+TEST_F(SubgraphTest, FetchOutputs1_FunctionConvention) {
+  ExpectOK(
+      "node { name: 'W1' op: 'TestParams' }"
+      "node { name: 'W2' op: 'TestParams' }"
+      "node { name: 'input' op: 'TestInput' }"
+      "node { name: 't1' op: 'TestMul' input: [ 'W1', 'input:1' ] }"
+      "node { name: 't2' op: 'TestMul' input: [ 'W2', 't1' ] }"
+      "node { name: 't3_a' op: 'TestRelu' input: 't2' }"
+      "node { name: 't3_b' op: 'TestRelu' input: 't2' }");
+  EXPECT_EQ("OK", Subgraph("", "W2,input:1,t1,t2", "t2",
+                           true /* use_function_convention */));
+  ExpectNodes(
+      "W1,W2,input,t1,t2,_retval_W2_0_0,_retval_input_1_1,_retval_t1_0_2,_"
+      "retval_t2_0_3");
+}
+
 TEST_F(SubgraphTest, FetchOutputs2) {
   ExpectOK(
       "node { name: 'W1' op: 'TestParams' }"
@@ -231,6 +280,20 @@ TEST_F(SubgraphTest, FetchOutputs2) {
   ExpectNodes("W1,W2,input,t1,t2,t3_a,_send_t3_a_0");
 }
 
+TEST_F(SubgraphTest, FetchOutputs2_FunctionConvention) {
+  ExpectOK(
+      "node { name: 'W1' op: 'TestParams' }"
+      "node { name: 'W2' op: 'TestParams' }"
+      "node { name: 'input' op: 'TestInput' }"
+      "node { name: 't1' op: 'TestMul' input: [ 'W1', 'input:1' ] }"
+      "node { name: 't2' op: 'TestMul' input: [ 'W2', 't1' ] }"
+      "node { name: 't3_a' op: 'TestRelu' input: 't2' }"
+      "node { name: 't3_b' op: 'TestRelu' input: 't2' }");
+  EXPECT_EQ("OK",
+            Subgraph("", "t3_a", "t2", true /* use_function_convention */));
+  ExpectNodes("W1,W2,input,t1,t2,t3_a,_retval_t3_a_0_0");
+}
+
 TEST_F(SubgraphTest, ChainOfFools) {
   ExpectOK(
       "node { name: 'a' op: 'TestParams' }"
@@ -315,7 +378,8 @@ TEST_F(SubgraphTest, FedOutputsPreservesOutputShapes) {
 REGISTER_OP("In").Output("o: float");
 REGISTER_OP("Op").Input("i: float").Output("o: float");
 
-static void BM_Subgraph(int iters, int num_nodes) {
+static void BM_SubgraphHelper(int iters, int num_nodes,
+                              bool use_function_convention) {
   DeviceAttributes device_info;
   device_info.set_name("/job:a/replica:0/task:0/cpu:0");
   device_info.set_device_type(DeviceType(DEVICE_CPU).type());
@@ -347,12 +411,26 @@ static void BM_Subgraph(int iters, int num_nodes) {
   while (--iters > 0) {
     Graph* subgraph = new Graph(OpRegistry::Global());
     CopyGraph(g, subgraph);
-    TF_CHECK_OK(subgraph::RewriteGraphForExecution(subgraph, fed, fetch,
-                                                   targets, device_info));
+    subgraph::RewriteGraphMetadata metadata;
+    TF_CHECK_OK(subgraph::RewriteGraphForExecution(
+        subgraph, fed, fetch, targets, device_info, use_function_convention,
+        &metadata));
     delete subgraph;
   }
 }
+
+static void BM_Subgraph(int iters, int num_nodes) {
+  BM_SubgraphHelper(iters, num_nodes, false /* use_function_convention */);
+}
+static void BM_SubgraphFunctionConvention(int iters, int num_nodes) {
+  BM_SubgraphHelper(iters, num_nodes, true /* use_function_convention */);
+}
 BENCHMARK(BM_Subgraph)->Arg(100)->Arg(1000)->Arg(10000)->Arg(100000);
+BENCHMARK(BM_SubgraphFunctionConvention)
+    ->Arg(100)
+    ->Arg(1000)
+    ->Arg(10000)
+    ->Arg(100000);
 
 }  // namespace
 }  // namespace tensorflow
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index a76dd4f6d6..bb457a01b2 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -820,7 +820,7 @@ class DebugDumpDir(object):
     self._node_op_types[node.name] = node.op
 
     for inp in node.input:
-      if is_copy_node(inp) and node.op == "_Send":
+      if is_copy_node(inp) and (node.op == "_Send" or node.op == "_Retval"):
         self._copy_send_nodes.append(node.name)
 
       if inp.startswith("^"):
diff --git a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
index 6c7cbbff9c..00f6cc0d6d 100644
--- a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
+++ b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
@@ -196,7 +196,7 @@ class ControlFlowTest(test.TestCase):
 
       with self.assertRaisesWithPredicateMatch(
           errors_impl.InvalidArgumentError,
-          lambda e: "The tensor returned for" in str(e)):
+          lambda e: "Retval[0] does not have value" in str(e)):
         dead_branch.eval()
 
   def testSwitchMergeLess(self):
diff --git a/tensorflow/tools/graph_transforms/fold_constants_lib.cc b/tensorflow/tools/graph_transforms/fold_constants_lib.cc
index 8d1f19bf30..466e61b42d 100644
--- a/tensorflow/tools/graph_transforms/fold_constants_lib.cc
+++ b/tensorflow/tools/graph_transforms/fold_constants_lib.cc
@@ -147,9 +147,10 @@ Status FoldConstants(const GraphDef& input_graph_def,
   TF_RETURN_IF_ERROR(
       ImportGraphDef(import_opts, cleaned_graph_def, &input_graph, nullptr));
   DeviceAttributes device_attributes;
+  subgraph::RewriteGraphMetadata metadata;
   TF_RETURN_IF_ERROR(subgraph::RewriteGraphForExecution(
       &input_graph, context.input_names, context.output_names, {},
-      device_attributes));
+      device_attributes, false /* use_function_convention */, &metadata));
   bool was_mutated;
   TF_RETURN_IF_ERROR(DoConstantFoldingWithStatus(
       ConstantFoldingOptions(), nullptr, Env::Default(), nullptr, &input_graph,
-- 
GitLab


From 8e0d6f12efec0aeef16a64c6422aa3e90bbf4058 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 06:35:18 -0800
Subject: [PATCH 0612/1563] Automated rollback of change 153736477 Change:
 153825726

---
 configure                           |   5 +-
 tensorflow/workspace.bzl            |   2 +
 third_party/py/BUILD                |   0
 third_party/py/BUILD.tpl            |  53 +++++++
 third_party/py/numpy/BUILD          |   6 +-
 third_party/py/python_configure.bzl | 206 ++++++++++++++++++++++++++++
 util/python/BUILD                   |  28 +---
 util/python/python_config.sh        |  76 +---------
 8 files changed, 274 insertions(+), 102 deletions(-)
 create mode 100644 third_party/py/BUILD
 create mode 100644 third_party/py/BUILD.tpl
 create mode 100644 third_party/py/python_configure.bzl

diff --git a/configure b/configure
index 48a4594da6..47bdd5d018 100755
--- a/configure
+++ b/configure
@@ -86,6 +86,9 @@ while true; do
   PYTHON_BIN_PATH=""
   # Retry
 done
+export PYTHON_BIN_PATH
+write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
+# TODO(ngiraldo): allow the user to optionally set PYTHON_INCLUDE_PATH and NUMPY_INCLUDE_PATH
 
 ## Set up MKL related environment settings
 if false; then # Disable building with MKL for now
@@ -243,7 +246,7 @@ fi
 
 
 # Invoke python_config and set up symlinks to python includes
-./util/python/python_config.sh --setup "$PYTHON_BIN_PATH"
+./util/python/python_config.sh "$PYTHON_BIN_PATH"
 
 # Append CC optimization flags to bazel.rc
 echo >> tools/bazel.rc
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 8a858fb62a..5ab91b69a1 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -5,6 +5,7 @@ load("//third_party/sycl:sycl_configure.bzl", "sycl_configure")
 load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
+load("//third_party/py:python_configure.bzl", "python_configure")
 
 
 # Parse the bazel version string from `native.bazel_version`.
@@ -119,6 +120,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   check_version("0.4.5")
   cuda_configure(name="local_config_cuda")
   sycl_configure(name="local_config_sycl")
+  python_configure(name="local_config_python")
   if path_prefix:
     print("path_prefix was specified to tf_workspace but is no longer used " +
           "and will be removed in the future.")
diff --git a/third_party/py/BUILD b/third_party/py/BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/third_party/py/BUILD.tpl b/third_party/py/BUILD.tpl
new file mode 100644
index 0000000000..157834df4b
--- /dev/null
+++ b/third_party/py/BUILD.tpl
@@ -0,0 +1,53 @@
+licenses(["restricted"])
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "python_headers",
+    hdrs = select({
+        "windows" : [
+            "python_include_windows",
+        ],
+        "//conditions:default" : [
+            "python_include",
+        ],
+    }),
+    includes = select({
+        "windows" : [
+            "python_include_windows",
+        ],
+        "//conditions:default" : [
+            "python_include",
+        ],
+    }),
+)
+
+cc_library(
+    name = "numpy_headers",
+    hdrs = select({
+        "windows" : [
+            "numpy_include_windows",
+        ],
+        "//conditions:default" : [
+            "numpy_include",
+        ],
+    }),
+    includes = select({
+        "windows" : [
+            "numpy_include_windows",
+        ],
+        "//conditions:default" : [
+            "numpy_include",
+        ],
+    }),
+)
+
+config_setting(
+    name = "windows",
+    values = {"cpu": "x64_windows"},
+    visibility = ["//visibility:public"],
+)
+
+%{PYTHON_INCLUDE_GENRULE}
+
+%{NUMPY_INCLUDE_GENRULE}
diff --git a/third_party/py/numpy/BUILD b/third_party/py/numpy/BUILD
index 1d461505a6..be8332572b 100644
--- a/third_party/py/numpy/BUILD
+++ b/third_party/py/numpy/BUILD
@@ -8,11 +8,9 @@ py_library(
     srcs_version = "PY2AND3",
 )
 
-cc_library(
+alias(
     name = "headers",
-    hdrs = glob(["numpy_include/**/*.h"]),
-    data = ["//util/python:python_checked"],
-    includes = ["numpy_include"],
+    actual = "@local_config_python//:numpy_headers",
 )
 
 genrule(
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
new file mode 100644
index 0000000000..d49d4c1781
--- /dev/null
+++ b/third_party/py/python_configure.bzl
@@ -0,0 +1,206 @@
+# -*- Python -*-
+"""Repository rule for Python autoconfiguration.
+
+`python_configure` depends on the following environment variables:
+
+  * `NUMPY_INCLUDE_PATH`: Location of Numpy libraries.
+  * `PYTHON_BIN_PATH`: location of python binary.
+  * `PYTHON_INCLUDE_PATH`: Location of python binaries.
+"""
+
+_NUMPY_INCLUDE_PATH = "NUMPY_INCLUDE_PATH"
+_PYTHON_BIN_PATH = "PYTHON_BIN_PATH"
+_PYTHON_INCLUDE_PATH = "PYTHON_INCLUDE_PATH"
+
+
+def _tpl(repository_ctx, tpl, substitutions={}, out=None):
+  if not out:
+    out = tpl
+  repository_ctx.template(
+      out,
+      Label("//third_party/py:%s.tpl" % tpl),
+      substitutions)
+
+
+def _python_configure_warning(msg):
+  """Output warning message during auto configuration."""
+  yellow = "\033[1;33m"
+  no_color = "\033[0m"
+  print("\n%sPython Configuration Warning:%s %s\n" % (yellow, no_color, msg))
+
+
+def _python_configure_fail(msg):
+  """Output failure message when auto configuration fails."""
+  red = "\033[0;31m"
+  no_color = "\033[0m"
+  fail("\n%sPython Configuration Error:%s %s\n" % (red, no_color, msg))
+
+
+def _get_env_var(repository_ctx, name, default = None, enable_warning = True):
+  """Find an environment variable in system path."""
+  if name in repository_ctx.os.environ:
+    return repository_ctx.os.environ[name]
+  if default != None:
+    if enable_warning:
+      _python_configure_warning(
+          "'%s' environment variable is not set, using '%s' as default" % (name, default))
+    return default
+  _python_configure_fail("'%s' environment variable is not set" % name)
+
+
+def _is_windows(repository_ctx):
+  """Returns true if the host operating system is windows."""
+  os_name = repository_ctx.os.name.lower()
+  if os_name.find("windows") != -1:
+    return True
+  return False
+
+
+def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name):
+  """returns a genrule to symlink all files in a directory."""
+  # Get the list of files under this directory
+  find_result = None
+  if _is_windows(repository_ctx):
+    find_result = repository_ctx.execute([
+        "dir", src_dir, "/b", "/s", "/a-d",
+    ])
+  else:
+    find_result = repository_ctx.execute([
+        "find", src_dir, "-follow", "-type", "f",
+    ])
+  # Create a list with the src_dir stripped to use for outputs.
+  dest_files = find_result.stdout.replace(src_dir, '').splitlines()
+  src_files = find_result.stdout.splitlines()
+  command = []
+  command_windows = []
+  outs = []
+  outs_windows = []
+  for i in range(len(dest_files)):
+    if dest_files[i] != "":
+      command.append('ln -s ' + src_files[i] + ' $(@D)/' +
+                     dest_dir + dest_files[i])
+      # ln -sf is actually implemented as copying in msys since creating
+      # symbolic links is privileged on Windows. But copying is too slow, so
+      # invoke mklink to create junctions on Windows.
+      command_windows.append('mklink /J ' + src_files[i] + ' $(@D)/' +
+                             dest_dir + dest_files[i])
+      outs.append('      "' + dest_dir + dest_files[i] + '",')
+      outs_windows.append('      "' + dest_dir + '_windows' +
+                          dest_files[i] + '",')
+  genrule = _genrule(src_dir, genrule_name, ' && '.join(command),
+                     '\n'.join(outs))
+  genrule_windows = _genrule(src_dir, genrule_name + '_windows',
+                             "cmd /c \"" + ' && '.join(command_windows) + "\"",
+                             '\n'.join(outs_windows))
+  return genrule + '\n' + genrule_windows
+
+
+def _genrule(src_dir, genrule_name, command, outs):
+  """Returns a string with a genrule.
+
+  Genrule executes the given command and produces the given outputs.
+  """
+  return (
+      'genrule(\n' +
+      '    name = "' +
+      genrule_name + '",\n' +
+      '    outs = [\n' +
+      outs +
+      '    ],\n' +
+      '    cmd = """\n' +
+      command +
+      '    """,\n' +
+      ')\n'
+  )
+
+
+def _check_python_bin(repository_ctx, python_bin):
+  """Checks the python bin path."""
+  cmd =  '[[ -x "%s" ]] && [[ ! -d "%s" ]]' % (python_bin, python_bin)
+  result = repository_ctx.execute(["bash", "-c", cmd])
+  if result.return_code == 1:
+    _python_configure_fail(
+        "PYTHON_BIN_PATH is not executable.  Is it the python binary?")
+
+
+def _get_python_include(repository_ctx, python_bin):
+  """Gets the python include path."""
+  result = repository_ctx.execute([python_bin, "-c",
+                                   'from __future__ import print_function;' +
+                                   'from distutils import sysconfig;' +
+                                   'print(sysconfig.get_python_inc())'])
+  if result == "":
+    _python_configure_fail(
+        "Problem getting python include path.  Is distutils installed?")
+  return result.stdout.splitlines()[0]
+
+
+def _get_numpy_include(repository_ctx, python_bin):
+  """Gets the numpy include path."""
+  result = repository_ctx.execute([python_bin, "-c",
+                                   'from __future__ import print_function;' +
+                                   'import numpy;' +
+                                   ' print(numpy.get_include());'])
+  if result == "":
+    _python_configure_fail(
+        "Problem getting numpy include path.  Is numpy installed?")
+  return result.stdout.splitlines()[0]
+
+
+def _create_python_repository(repository_ctx):
+  """Creates the repository containing files set up to build with Python."""
+  python_include = None
+  numpy_include = None
+  # If local checks were requested, the python and numpy include will be auto
+  # detected on the host config (using _PYTHON_BIN_PATH).
+  if repository_ctx.attr.local_checks:
+    python_bin = _get_env_var(repository_ctx, _PYTHON_BIN_PATH)
+    _check_python_bin(repository_ctx, python_bin)
+    python_include = _get_python_include(repository_ctx, python_bin)
+    numpy_include = _get_numpy_include(repository_ctx, python_bin) + '/numpy'
+  else:
+    # Otherwise, we assume user provides all paths (via ENV or attrs)
+    python_include = _get_env_var(repository_ctx, _PYTHON_INCLUDE_PATH,
+                                  repository_ctx.attr.python_include)
+    numpy_include = _get_env_var(repository_ctx, _NUMPY_INCLUDE_PATH,
+                                 repository_ctx.attr.numpy_include) + '/numpy'
+
+  python_include_rule = _symlink_genrule_for_dir(
+      repository_ctx, python_include, 'python_include', 'python_include')
+  numpy_include_rule = _symlink_genrule_for_dir(
+      repository_ctx, numpy_include, 'numpy_include/numpy', 'numpy_include')
+  _tpl(repository_ctx, "BUILD", {
+      "%{PYTHON_INCLUDE_GENRULE}": python_include_rule,
+      "%{NUMPY_INCLUDE_GENRULE}": numpy_include_rule,
+  })
+
+
+def _python_autoconf_impl(repository_ctx):
+  """Implementation of the python_autoconf repository rule."""
+  _create_python_repository(repository_ctx)
+
+
+python_configure = repository_rule(
+    implementation = _python_autoconf_impl,
+    attrs = {
+        "local_checks": attr.bool(mandatory = False, default = True),
+        "python_include": attr.string(mandatory = False),
+        "numpy_include": attr.string(mandatory = False),
+    },
+    environ = [
+        _PYTHON_BIN_PATH,
+        _PYTHON_INCLUDE_PATH,
+        _NUMPY_INCLUDE_PATH,
+    ],
+)
+"""Detects and configures the local Python.
+
+Add the following to your WORKSPACE FILE:
+
+```python
+python_configure(name = "local_config_python")
+```
+
+Args:
+  name: A unique name for this workspace rule.
+"""
diff --git a/util/python/BUILD b/util/python/BUILD
index 29688b875d..96daf9947a 100644
--- a/util/python/BUILD
+++ b/util/python/BUILD
@@ -2,31 +2,7 @@ licenses(["restricted"])
 
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
+alias(
     name = "python_headers",
-    hdrs = glob([
-        "python_include/**/*.h",
-    ]),
-    data = [":python_checked"],
-    includes = ["python_include"],
-)
-
-genrule(
-    name = "python_check",
-    srcs = [
-        "python_config.sh",
-        "configure_files",
-    ],
-    outs = [
-        "python_checked",
-    ],
-    cmd = "OUTPUTDIR=\"$(@D)/\"; $(location :python_config.sh) --check && touch $$OUTPUTDIR/python_checked",
-    local = 1,
-)
-
-filegroup(
-    name = "configure_files",
-    data = glob([
-        "*",
-    ]),
+    actual = "@local_config_python//:python_headers",
 )
diff --git a/util/python/python_config.sh b/util/python/python_config.sh
index 4b18bf3578..d5762ad456 100755
--- a/util/python/python_config.sh
+++ b/util/python/python_config.sh
@@ -26,23 +26,9 @@ else
   script_path=${script_path:-.}
 fi
 
-EXPECTED_PATHS="$script_path/util/python/python_include"\
-" $script_path/util/python/python_lib"\
-" $script_path/third_party/py/numpy/numpy_include"
-
 function main {
-  argument="$1"
-  shift
-  case $argument in
-    --check)
-      check_python
-      exit 0
-      ;;
-    --setup)
-      setup_python "$1"
-      exit 0
-      ;;
-  esac
+  setup_python "$1"
+  exit 0
 }
 
 function python_path {
@@ -93,6 +79,7 @@ END
 function setup_python {
   PYTHON_BIN_PATH="$1";
 
+  # TODO(ngiraldo): move most of these checks to root configure
   if [ -z "$PYTHON_BIN_PATH" ]; then
     echo "PYTHON_BIN_PATH was not provided.  Did you run configure?"
     exit 1
@@ -108,12 +95,7 @@ function setup_python {
     exit 1
   fi
 
-  local python_include="$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; from distutils import sysconfig; print(sysconfig.get_python_inc());')"
-  if [ "$python_include" == "" ]; then
-    echo -e "\n\nERROR: Problem getting python include path.  Is distutils installed?"
-    exit 1
-  fi
-
+  # TODO(ngiraldo): confirm if these checks are really necessary, remove if not
   if [ -z "$PYTHON_LIB_PATH" ]; then
     local python_lib_path
     # Split python_path into an array of paths, this allows path containing spaces
@@ -149,35 +131,12 @@ function setup_python {
     exit 1
   fi
 
-  local numpy_include=$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; import numpy; print(numpy.get_include());')
-  if [ "$numpy_include" == "" ]; then
-    echo -e "\n\nERROR: Problem getting numpy include path.  Is numpy installed?"
-    exit 1
-  fi
-
-  for x in $EXPECTED_PATHS; do
-    if [ -e "$x" ]; then
-      rm -rf "$x"
-    fi
-  done
-
-# ln -sf is actually implemented as copying in msys since creating symbolic
-# links is privileged on Windows. But copying is too slow, so invoke mklink
-# to create junctions on Windows.
-  if is_windows; then
-    cmd /c "mklink /J util\\python\\python_include \"${python_include}\""
-    cmd /c "mklink /J util\\python\\python_lib \"${python_lib}\""
-    cmd /c "mklink /J third_party\\py\\numpy\\numpy_include \"${numpy_include}\""
-  else
-    ln -sf "${python_include}" util/python/python_include
-    ln -sf "${python_lib}" util/python/python_lib
-    ln -sf "${numpy_include}" third_party/py/numpy/numpy_include
-  fi
   # Convert python path to Windows style before writing into bazel.rc
   if is_windows; then
     PYTHON_BIN_PATH="$(cygpath -m "$PYTHON_BIN_PATH")"
   fi
 
+  # TODO(ngiraldo): move all below to root configure
   # Write tools/bazel.rc
   echo "# Autogenerated by configure: DO NOT EDIT" > tools/bazel.rc
   sed -e "s/\$PYTHON_MAJOR_VERSION/$python_major_version/g" \
@@ -197,29 +156,4 @@ function is_windows() {
   fi
 }
 
-function check_python {
-  for x in $EXPECTED_PATHS; do
-    if [ ! -e "$x" ]; then
-      echo -e "\n\nERROR: Cannot find '${x}'.  Did you run configure?\n\n" 1>&2
-      exit 1
-    fi
-    # Don't check symbolic link on Windows
-    if ! is_windows && [ ! -L "${x}" ]; then
-      echo -e "\n\nERROR: '${x}' is not a symbolic link.  Internal error.\n\n" 1>&2
-      exit 1
-    fi
-    if is_windows; then
-      # In msys, readlink <path> doesn't work, because no symbolic link on
-      # Windows. readlink -f <path> returns the real path of a junction.
-      true_path=$(readlink -f "${x}")
-    else
-      true_path=$(readlink "${x}")
-    fi
-    if [ ! -d "${true_path}" ]; then
-      echo -e "\n\nERROR: '${x}' does not refer to an existing directory: ${true_path}.  Do you need to rerun configure?\n\n" 1>&2
-      exit 1
-    fi
-  done
-}
-
 main "$@"
-- 
GitLab


From 41135a11af38dff22676a0138336edf7ab9681bb Mon Sep 17 00:00:00 2001
From: Nikhil Thorat <nsthorat@google.com>
Date: Fri, 21 Apr 2017 08:55:29 -0800
Subject: [PATCH 0613/1563] Branch the projector so that we have a d3v4 version
 with the new typings. Change: 153837827

---
 tensorflow/BUILD                              |   1 +
 .../components/vz_projector_d3v4/BUILD        |  19 +
 .../vz_projector_d3v4/analyticsLogger.ts      |  67 ++
 .../components/vz_projector_d3v4/bh_tsne.ts   | 472 ++++++++++++
 .../vz_projector_d3v4/data-provider-demo.ts   | 127 +++
 .../vz_projector_d3v4/data-provider-proto.ts  |  88 +++
 .../vz_projector_d3v4/data-provider-server.ts | 137 ++++
 .../vz_projector_d3v4/data-provider.ts        | 429 +++++++++++
 .../vz_projector_d3v4/data-provider_test.ts   |  96 +++
 .../components/vz_projector_d3v4/data.ts      | 547 +++++++++++++
 .../components/vz_projector_d3v4/data_test.ts | 104 +++
 .../vz_projector_d3v4/external.d.ts           |  51 ++
 .../components/vz_projector_d3v4/heap.ts      | 146 ++++
 .../components/vz_projector_d3v4/knn.ts       | 235 ++++++
 .../components/vz_projector_d3v4/label.ts     | 151 ++++
 .../components/vz_projector_d3v4/logging.ts   | 103 +++
 .../projectorEventContext.ts                  |  45 ++
 .../projectorScatterPlotAdapter.ts            | 713 +++++++++++++++++
 .../vz_projector_d3v4/renderContext.ts        |  53 ++
 .../vz_projector_d3v4/scatterPlot.ts          | 723 ++++++++++++++++++
 .../scatterPlotRectangleSelector.ts           | 107 +++
 .../scatterPlotRectangleSelector_test.ts      |  69 ++
 .../scatterPlotVisualizer.ts                  |  51 ++
 .../scatterPlotVisualizer3DLabels.ts          | 367 +++++++++
 .../scatterPlotVisualizerCanvasLabels.ts      | 187 +++++
 .../scatterPlotVisualizerPolylines.ts         | 149 ++++
 .../scatterPlotVisualizerSprites.ts           | 435 +++++++++++
 .../components/vz_projector_d3v4/sptree.ts    | 175 +++++
 .../vz_projector_d3v4/sptree_test.ts          | 104 +++
 .../components/vz_projector_d3v4/styles.html  | 185 +++++
 .../components/vz_projector_d3v4/util.ts      | 252 ++++++
 .../components/vz_projector_d3v4/util_test.ts |  42 +
 .../components/vz_projector_d3v4/vector.ts    | 266 +++++++
 .../vz_projector_d3v4/vz-projector-app.html   | 105 +++
 .../vz-projector-bookmark-panel.html          | 205 +++++
 .../vz-projector-bookmark-panel.ts            | 283 +++++++
 .../vz_projector_d3v4/vz-projector-colab.html |  32 +
 .../vz-projector-dashboard.html               |  79 ++
 .../vz-projector-data-panel.html              | 399 ++++++++++
 .../vz-projector-data-panel.ts                | 497 ++++++++++++
 .../vz_projector_d3v4/vz-projector-input.html |  64 ++
 .../vz_projector_d3v4/vz-projector-input.ts   | 113 +++
 .../vz-projector-inspector-panel.html         | 240 ++++++
 .../vz-projector-inspector-panel.ts           | 337 ++++++++
 .../vz-projector-legend.html                  |  76 ++
 .../vz_projector_d3v4/vz-projector-legend.ts  |  98 +++
 .../vz-projector-metadata-card.html           |  97 +++
 .../vz-projector-metadata-card.ts             |  88 +++
 .../vz-projector-projections-panel.html       | 314 ++++++++
 .../vz-projector-projections-panel.ts         | 589 ++++++++++++++
 .../vz-projector-projections-panel_test.ts    | 109 +++
 .../vz_projector_d3v4/vz-projector-util.ts    |  34 +
 .../vz_projector_d3v4/vz-projector.html       | 343 +++++++++
 .../vz_projector_d3v4/vz-projector.ts         | 570 ++++++++++++++
 54 files changed, 11368 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/analyticsLogger.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-demo.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-proto.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-server.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/data-provider.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/data-provider_test.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/data.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/data_test.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/external.d.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/heap.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/knn.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/label.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/logging.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/projectorEventContext.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/renderContext.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlot.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector_test.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerCanvasLabels.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerPolylines.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/sptree.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/sptree_test.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/styles.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/util.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/util_test.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vector.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-app.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-colab.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel_test.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-util.ts
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.ts

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index f0c1271e89..0f7f848cb1 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -297,6 +297,7 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_line_chart:all_files",
         "//tensorflow/tensorboard/components/vz_line_chart/demo:all_files",
         "//tensorflow/tensorboard/components/vz_projector:all_files",
+        "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_sorting:all_files",
         "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/lib:all_files",
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
new file mode 100644
index 0000000000..8c222be10e
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
@@ -0,0 +1,19 @@
+# Description:
+# Package for the Embedding Projector component.
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/analyticsLogger.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/analyticsLogger.ts
new file mode 100644
index 0000000000..aa1f86927d
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/analyticsLogger.ts
@@ -0,0 +1,67 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {ProjectionType} from './data';
+
+export class AnalyticsLogger {
+  private eventLogging: boolean;
+  private pageViewLogging: boolean;
+
+  /**
+   * Constructs an event logger using Google Analytics. It assumes there is a
+   * Google Analytics script added to the page elsewhere. If there is no such
+   * script, the logger acts as a no-op.
+   *
+   * @param pageViewLogging Whether to log page views.
+   * @param eventLogging Whether to log user interaction.
+   */
+  constructor(pageViewLogging: boolean, eventLogging: boolean) {
+    if (typeof ga === 'undefined' || ga == null) {
+      this.eventLogging = false;
+      this.pageViewLogging = false;
+      return;
+    }
+    this.eventLogging = eventLogging;
+    this.pageViewLogging = pageViewLogging;
+  }
+
+  logPageView(pageTitle: string) {
+    if (this.pageViewLogging) {
+      // Always send a page view.
+      ga('send', {hitType: 'pageview', page: `/v/${pageTitle}`});
+    }
+  }
+
+  logProjectionChanged(projection: ProjectionType) {
+    if (this.eventLogging) {
+      ga('send', {
+        hitType: 'event',
+        eventCategory: 'Projection',
+        eventAction: 'click',
+        eventLabel: projection
+      });
+    }
+  }
+
+  logWebGLDisabled() {
+    if (this.eventLogging) {
+      ga('send', {
+        hitType: 'event',
+        eventCategory: 'Error',
+        eventAction: 'PageLoad',
+        eventLabel: 'WebGL_disabled'
+      });
+    }
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts
new file mode 100644
index 0000000000..9d2df65f56
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts
@@ -0,0 +1,472 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * This is a fork of the Karpathy's TSNE.js (original license below).
+ * This fork implements Barnes-Hut approximation and runs in O(NlogN)
+ * time, as opposed to the Karpathy's O(N^2) version.
+ *
+ * @author smilkov@google.com (Daniel Smilkov)
+ */
+
+/**
+ * The MIT License (MIT)
+ * Copyright (c) 2015 Andrej Karpathy
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+import {SPNode, SPTree} from './sptree';
+
+type AugmSPNode = SPNode&{numCells: number, yCell: number[], rCell: number};
+
+/**
+ * Barnes-hut approximation level. Higher means more approximation and faster
+ * results. Recommended value mentioned in the paper is 0.8.
+ */
+const THETA = 0.8;
+
+const MIN_POSSIBLE_PROB = 1E-9;
+
+// Variables used for memorizing the second random number since running
+// gaussRandom() generates two random numbers at the cost of 1 atomic
+// computation. This optimization results in 2X speed-up of the generator.
+let return_v = false;
+let v_val = 0.0;
+
+/** Returns the square euclidean distance between two vectors. */
+export function dist2(a: number[], b: number[]): number {
+  if (a.length !== b.length) {
+    throw new Error('Vectors a and b must be of same length');
+  }
+
+  let result = 0;
+  for (let i = 0; i < a.length; ++i) {
+    let diff = a[i] - b[i];
+    result += diff * diff;
+  }
+  return result;
+}
+
+/** Returns the square euclidean distance between two 2D points. */
+export function dist2_2D(a: number[], b: number[]): number {
+  let dX = a[0] - b[0];
+  let dY = a[1] - b[1];
+  return dX * dX + dY * dY;
+}
+
+/** Returns the square euclidean distance between two 3D points. */
+export function dist2_3D(a: number[], b: number[]): number {
+  let dX = a[0] - b[0];
+  let dY = a[1] - b[1];
+  let dZ = a[2] - b[2];
+  return dX * dX + dY * dY + dZ * dZ;
+}
+
+function gaussRandom(rng: () => number): number {
+  if (return_v) {
+    return_v = false;
+    return v_val;
+  }
+  let u = 2 * rng() - 1;
+  let v = 2 * rng() - 1;
+  let r = u * u + v * v;
+  if (r === 0 || r > 1) {
+    return gaussRandom(rng);
+  }
+  let c = Math.sqrt(-2 * Math.log(r) / r);
+  v_val = v * c;  // cache this for next function call for efficiency
+  return_v = true;
+  return u * c;
+};
+
+// return random normal number
+function randn(rng: () => number, mu: number, std: number) {
+  return mu + gaussRandom(rng) * std;
+};
+
+// utilitity that creates contiguous vector of zeros of size n
+function zeros(n: number): Float64Array {
+  return new Float64Array(n);
+};
+
+// utility that returns a matrix filled with random numbers
+// generated by the provided generator.
+function randnMatrix(n: number, d: number, rng: () => number) {
+  let nd = n * d;
+  let x = zeros(nd);
+  for (let i = 0; i < nd; ++i) {
+    x[i] = randn(rng, 0.0, 1E-4);
+  }
+  return x;
+};
+
+// utility that returns a matrix filled with the provided value.
+function arrayofs(n: number, d: number, val: number) {
+  let x: number[][] = [];
+  for (let i = 0; i < n; ++i) {
+    x.push(d === 3 ? [val, val, val] : [val, val]);
+  }
+  return x;
+};
+
+// compute (p_{i|j} + p_{j|i})/(2n)
+function nearest2P(
+    nearest: {index: number, dist: number}[][], perplexity: number,
+    tol: number) {
+  let N = nearest.length;
+  let Htarget = Math.log(perplexity);  // target entropy of distribution
+  let P = zeros(N * N);                // temporary probability matrix
+  let K = nearest[0].length;
+  let pRow: number[] = new Array(K);  // pij[].
+
+  for (let i = 0; i < N; ++i) {
+    let neighbors = nearest[i];
+    let betaMin = -Infinity;
+    let betaMax = Infinity;
+    let beta = 1;  // initial value of precision
+    let maxTries = 50;
+
+    // perform binary search to find a suitable precision beta
+    // so that the entropy of the distribution is appropriate
+    let numTries = 0;
+    while (true) {
+      // compute entropy and kernel row with beta precision
+      let psum = 0.0;
+      for (let k = 0; k < neighbors.length; ++k) {
+        let neighbor = neighbors[k];
+        let pij = (i === neighbor.index) ? 0 : Math.exp(-neighbor.dist * beta);
+        pij = Math.max(pij, MIN_POSSIBLE_PROB);
+        pRow[k] = pij;
+        psum += pij;
+      }
+      // normalize p and compute entropy
+      let Hhere = 0.0;
+      for (let k = 0; k < pRow.length; ++k) {
+        pRow[k] /= psum;
+        let pij = pRow[k];
+        if (pij > 1E-7) {
+          Hhere -= pij * Math.log(pij);
+        };
+      }
+
+      // adjust beta based on result
+      if (Hhere > Htarget) {
+        // entropy was too high (distribution too diffuse)
+        // so we need to increase the precision for more peaky distribution
+        betaMin = beta;  // move up the bounds
+        if (betaMax === Infinity) {
+          beta = beta * 2;
+        } else {
+          beta = (beta + betaMax) / 2;
+        }
+
+      } else {
+        // converse case. make distrubtion less peaky
+        betaMax = beta;
+        if (betaMin === -Infinity) {
+          beta = beta / 2;
+        } else {
+          beta = (beta + betaMin) / 2;
+        }
+      }
+      numTries++;
+      // stopping conditions: too many tries or got a good precision
+      if (numTries >= maxTries || Math.abs(Hhere - Htarget) < tol) {
+        break;
+      }
+    }
+
+    // copy over the final prow to P at row i
+    for (let k = 0; k < pRow.length; ++k) {
+      let pij = pRow[k];
+      let j = neighbors[k].index;
+      P[i * N + j] = pij;
+    }
+  }  // end loop over examples i
+
+  // symmetrize P and normalize it to sum to 1 over all ij
+  let N2 = N * 2;
+  for (let i = 0; i < N; ++i) {
+    for (let j = i + 1; j < N; ++j) {
+      let i_j = i * N + j;
+      let j_i = j * N + i;
+      let value = (P[i_j] + P[j_i]) / N2;
+      P[i_j] = value;
+      P[j_i] = value;
+    }
+  }
+  return P;
+};
+
+// helper function
+function sign(x: number) {
+  return x > 0 ? 1 : x < 0 ? -1 : 0;
+}
+
+function computeForce_2d(
+    force: number[], mult: number, pointA: number[], pointB: number[]) {
+  force[0] += mult * (pointA[0] - pointB[0]);
+  force[1] += mult * (pointA[1] - pointB[1]);
+}
+
+function computeForce_3d(
+    force: number[], mult: number, pointA: number[], pointB: number[]) {
+  force[0] += mult * (pointA[0] - pointB[0]);
+  force[1] += mult * (pointA[1] - pointB[1]);
+  force[2] += mult * (pointA[2] - pointB[2]);
+}
+
+export interface TSNEOptions {
+  /** How many dimensions. */
+  dim: number;
+  /** Roughly how many neighbors each point influences. */
+  perplexity?: number;
+  /** Learning rate. */
+  epsilon?: number;
+  /** A random number generator. */
+  rng?: () => number;
+}
+
+export class TSNE {
+  private perplexity: number;
+  private epsilon: number;
+  /** Random generator */
+  private rng: () => number;
+  private iter = 0;
+  private Y: Float64Array;
+  private N: number;
+  private P: Float64Array;
+  private gains: number[][];
+  private ystep: number[][];
+  private nearest: {index: number, dist: number}[][];
+  private dim: number;
+  private dist2: (a: number[], b: number[]) => number;
+  private computeForce:
+      (force: number[], mult: number, pointA: number[],
+       pointB: number[]) => void;
+
+  constructor(opt: TSNEOptions) {
+    opt = opt || {dim: 2};
+    this.perplexity = opt.perplexity || 30;
+    this.epsilon = opt.epsilon || 10;
+    this.rng = opt.rng || Math.random;
+    this.dim = opt.dim;
+    if (opt.dim === 2) {
+      this.dist2 = dist2_2D;
+      this.computeForce = computeForce_2d;
+    } else if (opt.dim === 3) {
+      this.dist2 = dist2_3D;
+      this.computeForce = computeForce_3d;
+    } else {
+      throw new Error('Only 2D and 3D is supported');
+    }
+  }
+
+  // this function takes a fattened distance matrix and creates
+  // matrix P from them.
+  // D is assumed to be provided as an array of size N^2.
+  initDataDist(nearest: {index: number, dist: number}[][]) {
+    let N = nearest.length;
+    this.nearest = nearest;
+    this.P = nearest2P(nearest, this.perplexity, 1E-4);
+    this.N = N;
+    this.initSolution();  // refresh this
+  }
+
+  // (re)initializes the solution to random
+  initSolution() {
+    // generate random solution to t-SNE
+    this.Y = randnMatrix(this.N, this.dim, this.rng);  // the solution
+    this.gains = arrayofs(this.N, this.dim, 1.0);      // step gains
+    // to accelerate progress in unchanging directions
+    this.ystep = arrayofs(this.N, this.dim, 0.0);  // momentum accumulator
+    this.iter = 0;
+  }
+
+  // return pointer to current solution
+  getSolution() { return this.Y; }
+
+  // perform a single step of optimization to improve the embedding
+  step() {
+    this.iter += 1;
+    let N = this.N;
+
+    let grad = this.costGrad(this.Y);  // evaluate gradient
+
+    // perform gradient step
+    let ymean = this.dim === 3 ? [0, 0, 0] : [0, 0];
+    for (let i = 0; i < N; ++i) {
+      for (let d = 0; d < this.dim; ++d) {
+        let gid = grad[i][d];
+        let sid = this.ystep[i][d];
+        let gainid = this.gains[i][d];
+
+        // compute gain update
+        let newgain = sign(gid) === sign(sid) ? gainid * 0.8 : gainid + 0.2;
+        if (newgain < 0.01) {
+          newgain = 0.01;  // clamp
+        }
+        this.gains[i][d] = newgain;  // store for next turn
+
+        // compute momentum step direction
+        let momval = this.iter < 250 ? 0.5 : 0.8;
+        let newsid = momval * sid - this.epsilon * newgain * grad[i][d];
+        this.ystep[i][d] = newsid;  // remember the step we took
+
+        // step!
+        let i_d = i * this.dim + d;
+        this.Y[i_d] += newsid;
+        ymean[d] += this.Y[i_d];  // accumulate mean so that we
+                                  // can center later
+      }
+    }
+
+    // reproject Y to be zero mean
+    for (let i = 0; i < N; ++i) {
+      for (let d = 0; d < this.dim; ++d) {
+        this.Y[i * this.dim + d] -= ymean[d] / N;
+      }
+    }
+  }
+
+  // return cost and gradient, given an arrangement
+  costGrad(Y: Float64Array): number[][] {
+    let N = this.N;
+    let P = this.P;
+
+    // Trick that helps with local optima.
+    let alpha = this.iter < 100 ? 4 : 1;
+
+    // Make data for the SP tree.
+    let points: number[][] = new Array(N);  // (x, y)[]
+    for (let i = 0; i < N; ++i) {
+      let iTimesD = i * this.dim;
+      let row = new Array(this.dim);
+      for (let d = 0; d < this.dim; ++d) {
+        row[d] = Y[iTimesD + d];
+      }
+      points[i] = row;
+    }
+
+    // Make a tree.
+    let tree = new SPTree(points);
+    let root = tree.root as AugmSPNode;
+    // Annotate the tree.
+
+    let annotateTree =
+        (node: AugmSPNode): {numCells: number, yCell: number[]} => {
+          let numCells = 1;
+          if (node.children == null) {
+            // Update the current node and tell the parent.
+            node.numCells = numCells;
+            node.yCell = node.point;
+            return {numCells, yCell: node.yCell};
+          }
+          // node.point is a 2 or 3-dim number[], so slice() makes a copy.
+          let yCell = node.point.slice();
+          for (let i = 0; i < node.children.length; ++i) {
+            let child = node.children[i];
+            if (child == null) {
+              continue;
+            }
+            let result = annotateTree(child as AugmSPNode);
+            numCells += result.numCells;
+            for (let d = 0; d < this.dim; ++d) {
+              yCell[d] += result.yCell[d];
+            }
+          }
+          // Update the node and tell the parent.
+          node.numCells = numCells;
+          node.yCell = yCell.map(v => v / numCells);
+          return {numCells, yCell};
+        };
+
+    // Augment the tree with more info.
+    annotateTree(root);
+    tree.visit((node: AugmSPNode, low: number[], high: number[]) => {
+      node.rCell = high[0] - low[0];
+      return false;
+    });
+    // compute current Q distribution, unnormalized first
+    let grad: number[][] = [];
+    let Z = 0;
+    let forces: [number[], number[]][] = new Array(N);
+    for (let i = 0; i < N; ++i) {
+      let pointI = points[i];
+      // Compute the positive forces for the i-th node.
+      let Fpos = this.dim === 3 ? [0, 0, 0] : [0, 0];
+      let neighbors = this.nearest[i];
+      for (let k = 0; k < neighbors.length; ++k) {
+        let j = neighbors[k].index;
+        let pij = P[i * N + j];
+        let pointJ = points[j];
+        let squaredDistItoJ = this.dist2(pointI, pointJ);
+        let premult = pij / (1 + squaredDistItoJ);
+        this.computeForce(Fpos, premult, pointI, pointJ);
+      }
+      // Compute the negative forces for the i-th node.
+      let FnegZ = this.dim === 3 ? [0, 0, 0] : [0, 0];
+      tree.visit((node: AugmSPNode) => {
+        let squaredDistToCell = this.dist2(pointI, node.yCell);
+        // Squared distance from point i to cell.
+        if (node.children == null ||
+            (squaredDistToCell > 0 &&
+             node.rCell / Math.sqrt(squaredDistToCell) < THETA)) {
+          let qijZ = 1 / (1 + squaredDistToCell);
+          let dZ = node.numCells * qijZ;
+          Z += dZ;
+          dZ *= qijZ;
+          this.computeForce(FnegZ, dZ, pointI, node.yCell);
+          return true;
+        }
+        // Cell is too close to approximate.
+        let squaredDistToPoint = this.dist2(pointI, node.point);
+        let qijZ = 1 / (1 + squaredDistToPoint);
+        Z += qijZ;
+        qijZ *= qijZ;
+        this.computeForce(FnegZ, qijZ, pointI, node.point);
+        return false;
+      }, true);
+      forces[i] = [Fpos, FnegZ];
+    }
+    // Normalize the negative forces and compute the gradient.
+    const A = 4 * alpha;
+    const B = 4 / Z;
+    for (let i = 0; i < N; ++i) {
+      let [FPos, FNegZ] = forces[i];
+      let gsum = new Array(this.dim);
+      for (let d = 0; d < this.dim; ++d) {
+        gsum[d] = A * FPos[d] - B * FNegZ[d];
+      }
+      grad.push(gsum);
+    }
+    return grad;
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-demo.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-demo.ts
new file mode 100644
index 0000000000..1410a84a8e
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-demo.ts
@@ -0,0 +1,127 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DataSet, SpriteAndMetadataInfo, State} from './data';
+import {ProjectorConfig, DataProvider, EmbeddingInfo, TENSORS_MSG_ID} from './data-provider';
+import * as dataProvider from './data-provider';
+import * as logging from './logging';
+
+const BYTES_EXTENSION = '.bytes';
+
+/** Data provider that loads data from a demo folder. */
+export class DemoDataProvider implements DataProvider {
+  private projectorConfigPath: string;
+  private projectorConfig: ProjectorConfig;
+
+  constructor(projectorConfigPath: string) {
+    this.projectorConfigPath = projectorConfigPath;
+  }
+
+  private getEmbeddingInfo(tensorName: string): EmbeddingInfo {
+    let embeddings = this.projectorConfig.embeddings;
+    for (let i = 0; i < embeddings.length; i++) {
+      let embedding = embeddings[i];
+      if (embedding.tensorName === tensorName) {
+        return embedding;
+      }
+    }
+    return null;
+  }
+
+  retrieveRuns(callback: (runs: string[]) => void): void {
+    callback(['Demo']);
+  }
+
+  retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void)
+      : void {
+    const msgId = logging.setModalMessage('Fetching projector config...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', this.projectorConfigPath);
+    xhr.onerror = (err) => {
+      let errorMessage = err.message;
+      // If the error is a valid XMLHttpResponse, it's possible this is a
+      // cross-origin error.
+      if (xhr.responseText != null) {
+        errorMessage = 'Cannot fetch projector config, possibly a ' +
+            'Cross-Origin request error.';
+      }
+      logging.setErrorMessage(errorMessage, 'fetching projector config');
+    };
+    xhr.onload = () => {
+      const projectorConfig = JSON.parse(xhr.responseText) as ProjectorConfig;
+      logging.setModalMessage(null, msgId);
+      this.projectorConfig = projectorConfig;
+      callback(projectorConfig);
+    };
+    xhr.send();
+  }
+
+  retrieveTensor(run: string, tensorName: string,
+      callback: (ds: DataSet) => void) {
+    let embedding = this.getEmbeddingInfo(tensorName);
+    let url = `${embedding.tensorPath}`;
+    if (embedding.tensorPath.substr(-1 * BYTES_EXTENSION.length) ===
+        BYTES_EXTENSION) {
+      dataProvider.retrieveTensorAsBytes(
+          this, this.getEmbeddingInfo(tensorName), run, tensorName, url,
+          callback);
+    } else {
+      logging.setModalMessage('Fetching tensors...', TENSORS_MSG_ID);
+      const request = new XMLHttpRequest();
+      request.open('GET', url);
+      request.responseType = 'arraybuffer';
+
+      request.onerror = () => {
+        logging.setErrorMessage(request.responseText, 'fetching tensors');
+      };
+      request.onload = () => {
+        dataProvider.parseTensors(request.response).then(points => {
+          callback(new DataSet(points));
+        });
+      };
+      request.send();
+    }
+  }
+
+  retrieveSpriteAndMetadata(run: string, tensorName: string,
+      callback: (r: SpriteAndMetadataInfo) => void) {
+    let embedding = this.getEmbeddingInfo(tensorName);
+    let spriteImagePath = null;
+    if (embedding.sprite && embedding.sprite.imagePath) {
+      spriteImagePath = embedding.sprite.imagePath;
+    }
+    dataProvider.retrieveSpriteAndMetadataInfo(
+        embedding.metadataPath, spriteImagePath, embedding.sprite, callback);
+  }
+
+  getBookmarks(
+      run: string, tensorName: string, callback: (r: State[]) => void) {
+    let embedding = this.getEmbeddingInfo(tensorName);
+    let msgId = logging.setModalMessage('Fetching bookmarks...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', embedding.bookmarksPath);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText);
+    };
+    xhr.onload = () => {
+      const bookmarks = JSON.parse(xhr.responseText) as State[];
+      logging.setModalMessage(null, msgId);
+      callback(bookmarks);
+    };
+    xhr.send();
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-proto.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-proto.ts
new file mode 100644
index 0000000000..67124a9232
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-proto.ts
@@ -0,0 +1,88 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DataPoint, DataProto, DataSet, SpriteAndMetadataInfo, PointMetadata, State} from './data';
+import {analyzeMetadata, ProjectorConfig, DataProvider} from './data-provider';
+
+
+export class ProtoDataProvider implements DataProvider {
+  private dataProto: DataProto;
+
+  constructor(dataProto: DataProto) {
+    this.dataProto = dataProto;
+  }
+
+  retrieveRuns(callback: (runs: string[]) => void): void {
+    callback(['proto']);
+  }
+
+  retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void) {
+    callback({
+      modelCheckpointPath: 'proto',
+      embeddings: [{
+        tensorName: 'proto',
+        tensorShape: this.dataProto.shape,
+        metadataPath: 'proto'
+      }]
+    });
+  }
+
+  retrieveTensor(run: string, tensorName: string,
+      callback: (ds: DataSet) => void) {
+    callback(this.flatArrayToDataset(this.dataProto.tensor));
+  }
+
+  retrieveSpriteAndMetadata(run: string, tensorName: string,
+      callback: (r: SpriteAndMetadataInfo) => void): void {
+    let columnNames = this.dataProto.metadata.columns.map(c => c.name);
+    let n = this.dataProto.shape[0];
+    let pointsMetadata: PointMetadata[] = new Array(n);
+    this.dataProto.metadata.columns.forEach(c => {
+      let values = c.numericValues || c.stringValues;
+      for (let i = 0; i < n; i++) {
+        pointsMetadata[i] = pointsMetadata[i] || {};
+        pointsMetadata[i][c.name] = values[i];
+      }
+    });
+    callback({
+      stats: analyzeMetadata(columnNames, pointsMetadata),
+      pointsInfo: pointsMetadata
+    });
+  }
+
+  getBookmarks(run: string, tensorName: string,
+      callback: (r: State[]) => void): void {
+    return callback([]);
+  }
+
+  private flatArrayToDataset(tensor: number[]): DataSet {
+    let points: DataPoint[] = [];
+    let n = this.dataProto.shape[0];
+    let d = this.dataProto.shape[1];
+    if (n * d !== tensor.length) {
+      throw 'The shape doesn\'t match the length of the flattened array';
+    }
+    for (let i = 0; i < n; i++) {
+      let offset = i * d;
+      points.push({
+        vector: new Float32Array(tensor.slice(offset, offset + d)),
+        metadata: {},
+        projections: null,
+        index: i
+      });
+    }
+    return new DataSet(points);
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-server.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-server.ts
new file mode 100644
index 0000000000..02720ebf6a
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider-server.ts
@@ -0,0 +1,137 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DataSet, SpriteAndMetadataInfo, State} from './data';
+import * as dataProvider from './data-provider';
+import {DataProvider, EmbeddingInfo, ProjectorConfig} from './data-provider';
+import * as logging from './logging';
+
+// Limit for the number of data points we receive from the server.
+export const LIMIT_NUM_POINTS = 100000;
+
+/**
+ * Data provider that loads data provided by a python server (usually backed
+ * by a checkpoint file).
+ */
+export class ServerDataProvider implements DataProvider {
+  private routePrefix: string;
+  private runProjectorConfigCache: {[run: string]: ProjectorConfig} = {};
+
+  constructor(routePrefix: string) {
+    this.routePrefix = routePrefix;
+  }
+
+  private getEmbeddingInfo(run: string, tensorName: string,
+      callback: (e: EmbeddingInfo) => void): void {
+    this.retrieveProjectorConfig(run, config => {
+      const embeddings = config.embeddings;
+      for (let i = 0; i < embeddings.length; i++) {
+        const embedding = embeddings[i];
+        if (embedding.tensorName === tensorName) {
+          callback(embedding);
+          return;
+        }
+      }
+      callback(null);
+    });
+  }
+
+  retrieveRuns(callback: (runs: string[]) => void): void {
+    const msgId = logging.setModalMessage('Fetching runs...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', `${this.routePrefix}/runs`);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText, 'fetching runs');
+    };
+    xhr.onload = () => {
+      const runs = JSON.parse(xhr.responseText);
+      logging.setModalMessage(null, msgId);
+      callback(runs);
+    };
+    xhr.send();
+  }
+
+  retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void)
+      : void {
+    if (run in this.runProjectorConfigCache) {
+      callback(this.runProjectorConfigCache[run]);
+      return;
+    }
+
+    const msgId = logging.setModalMessage('Fetching projector config...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', `${this.routePrefix}/info?run=${run}`);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText, 'fetching projector config');
+    };
+    xhr.onload = () => {
+      const config = JSON.parse(xhr.responseText) as ProjectorConfig;
+      logging.setModalMessage(null, msgId);
+      this.runProjectorConfigCache[run] = config;
+      callback(config);
+    };
+    xhr.send();
+  }
+
+  retrieveTensor(run: string, tensorName: string,
+      callback: (ds: DataSet) => void) {
+    this.getEmbeddingInfo(run, tensorName, embedding => {
+      dataProvider.retrieveTensorAsBytes(
+          this, embedding, run, tensorName,
+          `${this.routePrefix}/tensor?run=${run}&name=${tensorName}` +
+              `&num_rows=${LIMIT_NUM_POINTS}`,
+          callback);
+    });
+  }
+
+  retrieveSpriteAndMetadata(run: string, tensorName: string,
+      callback: (r: SpriteAndMetadataInfo) => void) {
+    this.getEmbeddingInfo(run, tensorName, embedding => {
+      let metadataPath = null;
+      if (embedding.metadataPath) {
+        metadataPath =
+            `${this.routePrefix}/metadata?` +
+            `run=${run}&name=${tensorName}&num_rows=${LIMIT_NUM_POINTS}`;
+      }
+      let spriteImagePath = null;
+      if (embedding.sprite && embedding.sprite.imagePath) {
+        spriteImagePath =
+            `${this.routePrefix}/sprite_image?run=${run}&name=${tensorName}`;
+      }
+      dataProvider.retrieveSpriteAndMetadataInfo(metadataPath, spriteImagePath,
+          embedding.sprite, callback);
+    });
+  }
+
+  getBookmarks(
+      run: string, tensorName: string, callback: (r: State[]) => void) {
+    const msgId = logging.setModalMessage('Fetching bookmarks...');
+
+    const xhr = new XMLHttpRequest();
+    xhr.open(
+        'GET', `${this.routePrefix}/bookmarks?run=${run}&name=${tensorName}`);
+    xhr.onerror = (err) => {
+      logging.setErrorMessage(xhr.responseText, 'fetching bookmarks');
+    };
+    xhr.onload = () => {
+      logging.setModalMessage(null, msgId);
+      const bookmarks = JSON.parse(xhr.responseText);
+      callback(bookmarks);
+    };
+    xhr.send();
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider.ts
new file mode 100644
index 0000000000..c8eede798c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider.ts
@@ -0,0 +1,429 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {ColumnStats, DataPoint, DataSet, SpriteAndMetadataInfo, PointMetadata, State} from './data';
+import * as logging from './logging';
+import {runAsyncTask} from './util';
+
+/** Maximum number of colors supported in the color map. */
+const NUM_COLORS_COLOR_MAP = 50;
+const MAX_SPRITE_IMAGE_SIZE_PX = 8192;
+
+export const METADATA_MSG_ID = 'metadata';
+export const TENSORS_MSG_ID = 'tensors';
+
+/** Matches the json format of `projector_config.proto` */
+export interface SpriteMetadata {
+  imagePath: string;
+  singleImageDim: [number, number];
+}
+
+/** Matches the json format of `projector_config.proto` */
+export interface EmbeddingInfo {
+  /** Name of the tensor. */
+  tensorName: string;
+  /** The shape of the tensor. */
+  tensorShape: [number, number];
+  /**
+   * The path to the tensors TSV file. If empty, it is assumed that the tensor
+   * is stored in the checkpoint file.
+   */
+  tensorPath?: string;
+  /** The path to the metadata file associated with the tensor. */
+  metadataPath?: string;
+  /** The path to the bookmarks file associated with the tensor. */
+  bookmarksPath?: string;
+  sprite?: SpriteMetadata;
+}
+
+/**
+ * Matches the json format of `projector_config.proto`
+ * This should be kept in sync with the code in vz-projector-data-panel which
+ * holds a template for users to build a projector config JSON object from the
+ * projector UI.
+ */
+export interface ProjectorConfig {
+  embeddings: EmbeddingInfo[];
+  modelCheckpointPath?: string;
+}
+
+export type ServingMode = 'demo' | 'server' | 'proto';
+
+/** Interface between the data storage and the UI. */
+export interface DataProvider {
+  /** Returns a list of run names that have embedding config files. */
+  retrieveRuns(callback: (runs: string[]) => void): void;
+
+  /**
+   * Returns the projector configuration: number of tensors, their shapes,
+   * and their associated metadata files.
+   */
+  retrieveProjectorConfig(run: string,
+      callback: (d: ProjectorConfig) => void): void;
+
+  /** Fetches and returns the tensor with the specified name. */
+  retrieveTensor(run: string, tensorName: string,
+      callback: (ds: DataSet) => void);
+
+  /**
+   * Fetches the metadata for the specified tensor.
+   */
+  retrieveSpriteAndMetadata(run: string, tensorName: string,
+      callback: (r: SpriteAndMetadataInfo) => void): void;
+
+  getBookmarks(run: string, tensorName: string, callback: (r: State[]) => void):
+      void;
+}
+
+export function retrieveTensorAsBytes(
+    dp: DataProvider, embedding: EmbeddingInfo, run: string, tensorName: string,
+    tensorsPath: string, callback: (ds: DataSet) => void) {
+  // Get the tensor.
+  logging.setModalMessage('Fetching tensor values...', TENSORS_MSG_ID);
+  let xhr = new XMLHttpRequest();
+  xhr.open('GET', tensorsPath);
+  xhr.responseType = 'arraybuffer';
+  xhr.onprogress = (ev) => {
+    if (ev.lengthComputable) {
+      let percent = (ev.loaded * 100 / ev.total).toFixed(1);
+      logging.setModalMessage(
+          'Fetching tensor values: ' + percent + '%', TENSORS_MSG_ID);
+    }
+  };
+  xhr.onload = () => {
+    if (xhr.status !== 200) {
+      let msg = String.fromCharCode.apply(null, new Uint8Array(xhr.response));
+      logging.setErrorMessage(msg, 'fetching tensors');
+      return;
+    }
+    let data: Float32Array;
+    try {
+      data = new Float32Array(xhr.response);
+    } catch (e) {
+      logging.setErrorMessage(e, 'parsing tensor bytes');
+      return;
+    }
+
+    let dim = embedding.tensorShape[1];
+    let N = data.length / dim;
+    if (embedding.tensorShape[0] > N) {
+      logging.setWarningMessage(
+          `Showing the first ${N.toLocaleString()}` +
+          ` of ${embedding.tensorShape[0].toLocaleString()} data points`);
+    }
+    parseTensorsFromFloat32Array(data, dim).then(dataPoints => {
+      callback(new DataSet(dataPoints));
+    });
+  };
+  xhr.send();
+}
+
+export function parseRawTensors(
+    content: ArrayBuffer, callback: (ds: DataSet) => void) {
+  parseTensors(content).then(data => {
+    callback(new DataSet(data));
+  });
+}
+
+export function parseRawMetadata(
+    contents: ArrayBuffer, callback: (r: SpriteAndMetadataInfo) => void) {
+  parseMetadata(contents).then(result => callback(result));
+}
+
+/**
+ * Parse an ArrayBuffer in a streaming fashion line by line (or custom delim).
+ * Can handle very large files.
+ *
+ * @param content The array buffer.
+ * @param callback The callback called on each line.
+ * @param chunkSize The size of each read chunk, defaults to ~1MB. (optional)
+ * @param delim The delimiter used to split a line, defaults to '\n'. (optional)
+ * @returns A promise for when it is finished.
+ */
+function streamParse(
+    content: ArrayBuffer, callback: (line: string) => void, chunkSize = 1000000,
+    delim = '\n'): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    let offset = 0;
+    let bufferSize = content.byteLength - 1;
+    let data = '';
+
+    function readHandler(str) {
+      offset += chunkSize;
+      let parts = str.split(delim);
+      let first = data + parts[0];
+      if (parts.length === 1) {
+        data = first;
+        readChunk(offset, chunkSize);
+        return;
+      }
+      data = parts[parts.length - 1];
+      callback(first);
+      for (let i = 1; i < parts.length - 1; i++) {
+        callback(parts[i]);
+      }
+      if (offset >= bufferSize) {
+        if (data) {
+          callback(data);
+        }
+        resolve();
+        return;
+      }
+      readChunk(offset, chunkSize);
+    }
+
+    function readChunk(offset: number, size: number) {
+      const contentChunk = content.slice(offset, offset + size);
+
+      const blob = new Blob([contentChunk]);
+      const file = new FileReader();
+      file.onload = (e: any) => readHandler(e.target.result);
+      file.readAsText(blob);
+    }
+
+    readChunk(offset, chunkSize);
+  });
+}
+
+/** Parses a tsv text file. */
+export function parseTensors(
+    content: ArrayBuffer, valueDelim = '\t'): Promise<DataPoint[]> {
+  logging.setModalMessage('Parsing tensors...', TENSORS_MSG_ID);
+
+  return new Promise<DataPoint[]>((resolve, reject) => {
+    const data: DataPoint[] = [];
+    let numDim: number;
+
+    streamParse(content, (line: string) => {
+      line = line.trim();
+      if (line === '') {
+        return;
+      }
+      const row = line.split(valueDelim);
+      const dataPoint: DataPoint = {
+        metadata: {},
+        vector: null,
+        index: data.length,
+        projections: null,
+      };
+      // If the first label is not a number, take it as the label.
+      if (isNaN(row[0] as any) || numDim === row.length - 1) {
+        dataPoint.metadata['label'] = row[0];
+        dataPoint.vector = new Float32Array(row.slice(1).map(Number));
+      } else {
+        dataPoint.vector = new Float32Array(row.map(Number));
+      }
+      data.push(dataPoint);
+      if (numDim == null) {
+        numDim = dataPoint.vector.length;
+      }
+      if (numDim !== dataPoint.vector.length) {
+        logging.setModalMessage(
+            'Parsing failed. Vector dimensions do not match');
+        throw Error('Parsing failed');
+      }
+      if (numDim <= 1) {
+        logging.setModalMessage(
+            'Parsing failed. Found a vector with only one dimension?');
+        throw Error('Parsing failed');
+      }
+    }).then(() => {
+      logging.setModalMessage(null, TENSORS_MSG_ID);
+      resolve(data);
+    });
+  });
+}
+
+/** Parses a tsv text file. */
+export function parseTensorsFromFloat32Array(data: Float32Array,
+    dim: number): Promise<DataPoint[]> {
+  return runAsyncTask('Parsing tensors...', () => {
+    const N = data.length / dim;
+    const dataPoints: DataPoint[] = [];
+    let offset = 0;
+    for (let i = 0; i < N; ++i) {
+      dataPoints.push({
+        metadata: {},
+        vector: data.subarray(offset, offset + dim),
+        index: i,
+        projections: null,
+      });
+      offset += dim;
+    }
+    return dataPoints;
+  }, TENSORS_MSG_ID).then(dataPoints => {
+    logging.setModalMessage(null, TENSORS_MSG_ID);
+    return dataPoints;
+  });
+}
+
+export function analyzeMetadata(
+    columnNames, pointsMetadata: PointMetadata[]): ColumnStats[] {
+  const columnStats: ColumnStats[] = columnNames.map(name => {
+    return {
+      name: name,
+      isNumeric: true,
+      tooManyUniqueValues: false,
+      min: Number.POSITIVE_INFINITY,
+      max: Number.NEGATIVE_INFINITY
+    };
+  });
+
+  const mapOfValues: [{[value: string]: number}] =
+      columnNames.map(() => new Object());
+
+  pointsMetadata.forEach(metadata => {
+    columnNames.forEach((name: string, colIndex: number) => {
+      const stats = columnStats[colIndex];
+      const map = mapOfValues[colIndex];
+      const value = metadata[name];
+
+      // Skip missing values.
+      if (value == null) {
+        return;
+      }
+
+      if (!stats.tooManyUniqueValues) {
+        if (value in map) {
+          map[value]++;
+        } else {
+          map[value] = 1;
+        }
+        if (Object.keys(map).length > NUM_COLORS_COLOR_MAP) {
+          stats.tooManyUniqueValues = true;
+        }
+      }
+      if (isNaN(value as any)) {
+        stats.isNumeric = false;
+      } else {
+        metadata[name] = +value;
+        stats.min = Math.min(stats.min, +value);
+        stats.max = Math.max(stats.max, +value);
+      }
+    });
+  });
+  columnStats.forEach((stats, colIndex) => {
+    stats.uniqueEntries = Object.keys(mapOfValues[colIndex]).map(label => {
+      return {label, count: mapOfValues[colIndex][label]};
+    });
+  });
+  return columnStats;
+}
+
+export function parseMetadata(content: ArrayBuffer):
+    Promise<SpriteAndMetadataInfo> {
+  logging.setModalMessage('Parsing metadata...', METADATA_MSG_ID);
+
+  return new Promise<SpriteAndMetadataInfo>((resolve, reject) => {
+    let pointsMetadata: PointMetadata[] = [];
+    let hasHeader = false;
+    let lineNumber = 0;
+    let columnNames = ['label'];
+    streamParse(content, (line: string) => {
+      if (line.trim().length === 0) {
+        return;
+      }
+      if (lineNumber === 0) {
+        hasHeader = line.indexOf('\t') >= 0;
+
+        // If the first row doesn't contain metadata keys, we assume that the
+        // values are labels.
+        if (hasHeader) {
+          columnNames = line.split('\t');
+          lineNumber++;
+          return;
+        }
+      }
+
+      lineNumber++;
+
+      let rowValues = line.split('\t');
+      let metadata: PointMetadata = {};
+      pointsMetadata.push(metadata);
+      columnNames.forEach((name: string, colIndex: number) => {
+        let value = rowValues[colIndex];
+        // Normalize missing values.
+        value = (value === '' ? null : value);
+        metadata[name] = value;
+      });
+    }).then(() => {
+      logging.setModalMessage(null, METADATA_MSG_ID);
+      resolve({
+        stats: analyzeMetadata(columnNames, pointsMetadata),
+        pointsInfo: pointsMetadata
+      });
+    });
+  });
+}
+
+export function fetchImage(url: string): Promise<HTMLImageElement> {
+  return new Promise<HTMLImageElement>((resolve, reject) => {
+    let image = new Image();
+    image.onload = () => resolve(image);
+    image.onerror = (err) => reject(err);
+    image.crossOrigin = '';
+    image.src = url;
+  });
+}
+
+export function retrieveSpriteAndMetadataInfo(metadataPath: string,
+    spriteImagePath: string, spriteMetadata: SpriteMetadata,
+    callback: (r: SpriteAndMetadataInfo) => void) {
+  let metadataPromise: Promise<SpriteAndMetadataInfo> = Promise.resolve({});
+  if (metadataPath) {
+    metadataPromise = new Promise<SpriteAndMetadataInfo>((resolve, reject) => {
+      logging.setModalMessage('Fetching metadata...', METADATA_MSG_ID);
+
+      const request = new XMLHttpRequest();
+      request.open('GET', metadataPath);
+      request.responseType = 'arraybuffer';
+
+      request.onerror = () => {
+        logging.setErrorMessage(request.responseText, 'fetching metadata');
+        reject();
+      };
+      request.onload = () => {
+        resolve(parseMetadata(request.response));
+      };
+      request.send(null);
+    });
+  }
+  let spriteMsgId = null;
+  let spritesPromise: Promise<HTMLImageElement> = null;
+  if (spriteImagePath) {
+    spriteMsgId = logging.setModalMessage('Fetching sprite image...');
+    spritesPromise = fetchImage(spriteImagePath);
+  }
+
+  // Fetch the metadata and the image in parallel.
+  Promise.all([metadataPromise, spritesPromise]).then(values => {
+    if (spriteMsgId) {
+      logging.setModalMessage(null, spriteMsgId);
+    }
+    const [metadata, spriteImage] = values;
+
+    if (spriteImage && (spriteImage.height > MAX_SPRITE_IMAGE_SIZE_PX ||
+                        spriteImage.width > MAX_SPRITE_IMAGE_SIZE_PX)) {
+      logging.setModalMessage(
+          `Error: Sprite image of dimensions ${spriteImage.width}px x ` +
+          `${spriteImage.height}px exceeds maximum dimensions ` +
+          `${MAX_SPRITE_IMAGE_SIZE_PX}px x ${MAX_SPRITE_IMAGE_SIZE_PX}px`);
+    } else {
+      metadata.spriteImage = spriteImage;
+      metadata.spriteMetadata = spriteMetadata;
+      callback(metadata);
+    }
+  });
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider_test.ts
new file mode 100644
index 0000000000..01b89ca700
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider_test.ts
@@ -0,0 +1,96 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DataPoint, SpriteAndMetadataInfo} from './data';
+import * as data_provider from './data-provider';
+
+/**
+ * Converts a string to an ArrayBuffer.
+ */
+function stringToArrayBuffer(str: string): Promise<ArrayBuffer> {
+  return new Promise<ArrayBuffer>((resolve, reject) => {
+    let blob = new Blob([str]);
+    let file = new FileReader();
+    file.onload = (e: any) => {
+      resolve(e.target.result);
+    };
+    file.readAsArrayBuffer(blob);
+  });
+}
+
+/**
+ * Converts an data array to TSV format.
+ */
+function dataToTsv(data: string[][]|number[][]) {
+  let lines = [];
+  for (let i = 0; i < data.length; i++) {
+    lines.push(data[i].join('\t'));
+  }
+  return lines.join('\n');
+}
+
+describe('parse tensors', () => {
+  it('parseTensors', (doneFn) => {
+    let tensors = [[1.0, 2.0], [2.0, 3.0]];
+    stringToArrayBuffer(dataToTsv(tensors))
+        .then((tensorsArrayBuffer: ArrayBuffer) => {
+          data_provider.parseTensors(tensorsArrayBuffer)
+              .then((data: DataPoint[]) => {
+                expect(data.length).toBe(2);
+
+                expect(data[0].vector).toEqual(new Float32Array(tensors[0]));
+                expect(data[0].index).toEqual(0);
+                expect(data[0].projections).toBeNull();
+
+                expect(data[1].vector).toEqual(new Float32Array(tensors[1]));
+                expect(data[1].index).toEqual(1);
+                expect(data[1].projections).toBeNull();
+                doneFn();
+              });
+        });
+  });
+  it('parseMetadata', (doneFn) => {
+    let metadata = [['label', 'fakecol'], ['Г', '0'], ['label1', '1']];
+
+    stringToArrayBuffer(dataToTsv(metadata))
+        .then((metadataArrayBuffer: ArrayBuffer) => {
+          data_provider.parseMetadata(metadataArrayBuffer)
+              .then((spriteAndMetadataInfo: SpriteAndMetadataInfo) => {
+                expect(spriteAndMetadataInfo.stats.length).toBe(2);
+                expect(spriteAndMetadataInfo.stats[0].name)
+                    .toBe(metadata[0][0]);
+                expect(spriteAndMetadataInfo.stats[0].isNumeric).toBe(false);
+                expect(spriteAndMetadataInfo.stats[0].tooManyUniqueValues)
+                    .toBe(false);
+                expect(spriteAndMetadataInfo.stats[1].name)
+                    .toBe(metadata[0][1]);
+                expect(spriteAndMetadataInfo.stats[1].isNumeric).toBe(true);
+                expect(spriteAndMetadataInfo.stats[1].tooManyUniqueValues)
+                    .toBe(false);
+
+                expect(spriteAndMetadataInfo.pointsInfo.length).toBe(2);
+                expect(spriteAndMetadataInfo.pointsInfo[0]['label'])
+                    .toBe(metadata[1][0]);
+                expect(spriteAndMetadataInfo.pointsInfo[0]['fakecol'])
+                    .toBe(+metadata[1][1]);
+                expect(spriteAndMetadataInfo.pointsInfo[1]['label'])
+                    .toBe(metadata[2][0]);
+                expect(spriteAndMetadataInfo.pointsInfo[1]['fakecol'])
+                    .toBe(+metadata[2][1]);
+                doneFn();
+              });
+        });
+  });
+});
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/data.ts
new file mode 100644
index 0000000000..c4e81985fc
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/data.ts
@@ -0,0 +1,547 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {TSNE} from './bh_tsne';
+import {SpriteMetadata} from './data-provider';
+import * as knn from './knn';
+import * as logging from './logging';
+import * as scatterPlot from './scatterPlot';
+import * as util from './util';
+import * as vector from './vector';
+
+export type DistanceFunction = (a: number[], b: number[]) => number;
+export type ProjectionComponents3D = [string, string, string];
+
+export interface PointMetadata { [key: string]: number|string; }
+
+export interface DataProto {
+  shape: [number, number];
+  tensor: number[];
+  metadata: {
+    columns: Array<
+        {name: string; stringValues: string[]; numericValues: number[];}>;
+  };
+}
+
+/** Statistics for a metadata column. */
+export interface ColumnStats {
+  name: string;
+  isNumeric: boolean;
+  tooManyUniqueValues: boolean;
+  uniqueEntries?: Array<{label: string, count: number}>;
+  min: number;
+  max: number;
+}
+
+export interface SpriteAndMetadataInfo {
+  stats?: ColumnStats[];
+  pointsInfo?: PointMetadata[];
+  spriteImage?: HTMLImageElement;
+  spriteMetadata?: SpriteMetadata;
+}
+
+/** A single collection of points which make up a sequence through space. */
+export interface Sequence {
+  /** Indices into the DataPoints array in the Data object. */
+  pointIndices: number[];
+}
+
+export interface DataPoint {
+  /** The point in the original space. */
+  vector: Float32Array;
+
+  /*
+   * Metadata for each point. Each metadata is a set of key/value pairs
+   * where the value can be a string or a number.
+   */
+  metadata: PointMetadata;
+
+  /** index of the sequence, used for highlighting on click */
+  sequenceIndex?: number;
+
+  /** index in the original data source */
+  index: number;
+
+  /** This is where the calculated projections space are cached */
+  projections: {[key: string]: number};
+}
+
+const IS_FIREFOX = navigator.userAgent.toLowerCase().indexOf('firefox') >= 0;
+/** Controls whether nearest neighbors computation is done on the GPU or CPU. */
+const KNN_GPU_ENABLED = util.hasWebGLSupport() && !IS_FIREFOX;
+
+export const TSNE_SAMPLE_SIZE = 10000;
+export const PCA_SAMPLE_SIZE = 50000;
+/** Number of dimensions to sample when doing approximate PCA. */
+export const PCA_SAMPLE_DIM = 200;
+/** Number of pca components to compute. */
+const NUM_PCA_COMPONENTS = 10;
+/**
+ * Reserved metadata attributes used for sequence information
+ * NOTE: Use "__seq_next__" as "__next__" is deprecated.
+ */
+const SEQUENCE_METADATA_ATTRS = ['__next__', '__seq_next__'];
+
+function getSequenceNextPointIndex(pointMetadata: PointMetadata): number|null {
+  let sequenceAttr = null;
+  for (let metadataAttr of SEQUENCE_METADATA_ATTRS) {
+    if (metadataAttr in pointMetadata && pointMetadata[metadataAttr] !== '') {
+      sequenceAttr = pointMetadata[metadataAttr];
+      break;
+    }
+  }
+  if (sequenceAttr == null) {
+    return null;
+  }
+  return +sequenceAttr;
+}
+
+/**
+ * Dataset contains a DataPoints array that should be treated as immutable. This
+ * acts as a working subset of the original data, with cached properties
+ * from computationally expensive operations. Because creating a subset
+ * requires normalizing and shifting the vector space, we make a copy of the
+ * data so we can still always create new subsets based on the original data.
+ */
+export class DataSet {
+  points: DataPoint[];
+  sequences: Sequence[];
+
+  shuffledDataIndices: number[] = [];
+
+  /**
+   * This keeps a list of all current projections so you can easily test to see
+   * if it's been calculated already.
+   */
+  projections: {[projection: string]: boolean} = {};
+  nearest: knn.NearestEntry[][];
+  nearestK: number;
+  tSNEIteration: number = 0;
+  tSNEShouldStop = true;
+  dim: [number, number] = [0, 0];
+  hasTSNERun: boolean = false;
+  spriteAndMetadataInfo: SpriteAndMetadataInfo;
+  fracVariancesExplained: number[];
+
+  private tsne: TSNE;
+
+  /** Creates a new Dataset */
+  constructor(
+      points: DataPoint[], spriteAndMetadataInfo?: SpriteAndMetadataInfo) {
+    this.points = points;
+    this.shuffledDataIndices = util.shuffle(util.range(this.points.length));
+    this.sequences = this.computeSequences(points);
+    this.dim = [this.points.length, this.points[0].vector.length];
+    this.spriteAndMetadataInfo = spriteAndMetadataInfo;
+  }
+
+  private computeSequences(points: DataPoint[]) {
+    // Keep a list of indices seen so we don't compute sequences for a given
+    // point twice.
+    let indicesSeen = new Int8Array(points.length);
+    // Compute sequences.
+    let indexToSequence: {[index: number]: Sequence} = {};
+    let sequences: Sequence[] = [];
+    for (let i = 0; i < points.length; i++) {
+      if (indicesSeen[i]) {
+        continue;
+      }
+      indicesSeen[i] = 1;
+
+      // Ignore points without a sequence attribute.
+      let next = getSequenceNextPointIndex(points[i].metadata);
+      if (next == null) {
+        continue;
+      }
+      if (next in indexToSequence) {
+        let existingSequence = indexToSequence[next];
+        // Pushing at the beginning of the array.
+        existingSequence.pointIndices.unshift(i);
+        indexToSequence[i] = existingSequence;
+        continue;
+      }
+      // The current point is pointing to a new/unseen sequence.
+      let newSequence: Sequence = {pointIndices: []};
+      indexToSequence[i] = newSequence;
+      sequences.push(newSequence);
+      let currentIndex = i;
+      while (points[currentIndex]) {
+        newSequence.pointIndices.push(currentIndex);
+        let next = getSequenceNextPointIndex(points[currentIndex].metadata);
+        if (next != null) {
+          indicesSeen[next] = 1;
+          currentIndex = next;
+        } else {
+          currentIndex = -1;
+        }
+      }
+    }
+    return sequences;
+  }
+
+  projectionCanBeRendered(projection: ProjectionType): boolean {
+    if (projection !== 'tsne') {
+      return true;
+    }
+    return this.tSNEIteration > 0;
+  }
+
+  /**
+   * Returns a new subset dataset by copying out data. We make a copy because
+   * we have to modify the vectors by normalizing them.
+   *
+   * @param subset Array of indices of points that we want in the subset.
+   *
+   * @return A subset of the original dataset.
+   */
+  getSubset(subset?: number[]): DataSet {
+    const pointsSubset = ((subset != null) && (subset.length > 0)) ?
+        subset.map(i => this.points[i]) :
+        this.points;
+    let points = pointsSubset.map(dp => {
+      return {
+        metadata: dp.metadata,
+        index: dp.index,
+        vector: dp.vector.slice(),
+        projections: {} as {[key: string]: number}
+      };
+    });
+    return new DataSet(points, this.spriteAndMetadataInfo);
+  }
+
+  /**
+   * Computes the centroid, shifts all points to that centroid,
+   * then makes them all unit norm.
+   */
+  normalize() {
+    // Compute the centroid of all data points.
+    let centroid = vector.centroid(this.points, a => a.vector);
+    if (centroid == null) {
+      throw Error('centroid should not be null');
+    }
+    // Shift all points by the centroid and make them unit norm.
+    for (let id = 0; id < this.points.length; ++id) {
+      let dataPoint = this.points[id];
+      dataPoint.vector = vector.sub(dataPoint.vector, centroid);
+      vector.unit(dataPoint.vector);
+    }
+  }
+
+  /** Projects the dataset onto a given vector and caches the result. */
+  projectLinear(dir: vector.Vector, label: string) {
+    this.projections[label] = true;
+    this.points.forEach(dataPoint => {
+      dataPoint.projections[label] = vector.dot(dataPoint.vector, dir);
+    });
+  }
+
+  /** Projects the dataset along the top 10 principal components. */
+  projectPCA(): Promise<void> {
+    if (this.projections['pca-0'] != null) {
+      return Promise.resolve<void>(null);
+    }
+    return util.runAsyncTask('Computing PCA...', () => {
+      // Approximate pca vectors by sampling the dimensions.
+      let dim = this.points[0].vector.length;
+      let vectors = this.shuffledDataIndices.map(i => this.points[i].vector);
+      if (dim > PCA_SAMPLE_DIM) {
+        vectors = vector.projectRandom(vectors, PCA_SAMPLE_DIM);
+      }
+      let sampledVectors = vectors.slice(0, PCA_SAMPLE_SIZE);
+
+      let sigma = numeric.div(
+          numeric.dot(numeric.transpose(sampledVectors), sampledVectors),
+          sampledVectors.length);
+      let svd = numeric.svd(sigma);
+
+      let variances: number[] = svd.S;
+      let totalVariance = 0;
+      for (let i = 0; i < variances.length; ++i) {
+        totalVariance += variances[i];
+      }
+      for (let i = 0; i < variances.length; ++i) {
+        variances[i] /= totalVariance;
+      }
+      this.fracVariancesExplained = variances;
+
+      let U: number[][] = svd.U;
+      let pcaVectors = vectors.map(vector => {
+        let newV = new Float32Array(NUM_PCA_COMPONENTS);
+        for (let newDim = 0; newDim < NUM_PCA_COMPONENTS; newDim++) {
+          let dot = 0;
+          for (let oldDim = 0; oldDim < vector.length; oldDim++) {
+            dot += vector[oldDim] * U[oldDim][newDim];
+          }
+          newV[newDim] = dot;
+        }
+        return newV;
+      });
+      for (let d = 0; d < NUM_PCA_COMPONENTS; d++) {
+        let label = 'pca-' + d;
+        this.projections[label] = true;
+        for (let i = 0; i < pcaVectors.length; i++) {
+          let pointIndex = this.shuffledDataIndices[i];
+          this.points[pointIndex].projections[label] = pcaVectors[i][d];
+        }
+      }
+    });
+  }
+
+  /** Runs tsne on the data. */
+  projectTSNE(
+      perplexity: number, learningRate: number, tsneDim: number,
+      stepCallback: (iter: number) => void) {
+    this.hasTSNERun = true;
+    let k = Math.floor(3 * perplexity);
+    let opt = {epsilon: learningRate, perplexity: perplexity, dim: tsneDim};
+    this.tsne = new TSNE(opt);
+    this.tSNEShouldStop = false;
+    this.tSNEIteration = 0;
+
+    let sampledIndices = this.shuffledDataIndices.slice(0, TSNE_SAMPLE_SIZE);
+    let step = () => {
+      if (this.tSNEShouldStop) {
+        stepCallback(null);
+        this.tsne = null;
+        return;
+      }
+      this.tsne.step();
+      let result = this.tsne.getSolution();
+      sampledIndices.forEach((index, i) => {
+        let dataPoint = this.points[index];
+
+        dataPoint.projections['tsne-0'] = result[i * tsneDim + 0];
+        dataPoint.projections['tsne-1'] = result[i * tsneDim + 1];
+        if (tsneDim === 3) {
+          dataPoint.projections['tsne-2'] = result[i * tsneDim + 2];
+        }
+      });
+      this.tSNEIteration++;
+      stepCallback(this.tSNEIteration);
+      requestAnimationFrame(step);
+    };
+
+    // Nearest neighbors calculations.
+    let knnComputation: Promise<knn.NearestEntry[][]>;
+
+    if (this.nearest != null && k === this.nearestK) {
+      // We found the nearest neighbors before and will reuse them.
+      knnComputation = Promise.resolve(this.nearest);
+    } else {
+      let sampledData = sampledIndices.map(i => this.points[i]);
+      this.nearestK = k;
+      knnComputation = KNN_GPU_ENABLED ?
+          knn.findKNNGPUCosine(sampledData, k, (d => d.vector)) :
+          knn.findKNN(
+              sampledData, k, (d => d.vector),
+              (a, b, limit) => vector.cosDistNorm(a, b));
+    }
+    knnComputation.then(nearest => {
+      this.nearest = nearest;
+      util.runAsyncTask('Initializing T-SNE...', () => {
+            this.tsne.initDataDist(this.nearest);
+          }).then(step);
+    });
+  }
+
+  /**
+   * Merges metadata to the dataset and returns whether it succeeded.
+   */
+  mergeMetadata(metadata: SpriteAndMetadataInfo): boolean {
+    if (metadata.pointsInfo.length !== this.points.length) {
+      let errorMessage = `Number of tensors (${this.points.length}) do not` +
+          ` match the number of lines in metadata` +
+          ` (${metadata.pointsInfo.length}).`;
+
+      if (metadata.stats.length === 1 &&
+          this.points.length + 1 === metadata.pointsInfo.length) {
+        // If there is only one column of metadata and the number of points is
+        // exactly one less than the number of metadata lines, this is due to an
+        // unnecessary header line in the metadata and we can show a meaningful
+        // error.
+        logging.setErrorMessage(
+            errorMessage + ' Single column metadata should not have a header ' +
+                'row.',
+            'merging metadata');
+        return false;
+      } else if (
+          metadata.stats.length > 1 &&
+          this.points.length - 1 === metadata.pointsInfo.length) {
+        // If there are multiple columns of metadata and the number of points is
+        // exactly one greater than the number of lines in the metadata, this
+        // means there is a missing metadata header.
+        logging.setErrorMessage(
+            errorMessage + ' Multi-column metadata should have a header ' +
+                'row with column labels.',
+            'merging metadata');
+        return false;
+      }
+
+      logging.setWarningMessage(errorMessage);
+    }
+    this.spriteAndMetadataInfo = metadata;
+    metadata.pointsInfo.slice(0, this.points.length)
+        .forEach((m, i) => this.points[i].metadata = m);
+    return true;
+  }
+
+  stopTSNE() {
+    this.tSNEShouldStop = true;
+  }
+
+  /**
+   * Finds the nearest neighbors of the query point using a
+   * user-specified distance metric.
+   */
+  findNeighbors(pointIndex: number, distFunc: DistanceFunction, numNN: number):
+      knn.NearestEntry[] {
+    // Find the nearest neighbors of a particular point.
+    let neighbors = knn.findKNNofPoint(
+        this.points, pointIndex, numNN, (d => d.vector), distFunc);
+    // TODO(smilkov): Figure out why we slice.
+    let result = neighbors.slice(0, numNN);
+    return result;
+  }
+
+  /**
+   * Search the dataset based on a metadata field.
+   */
+  query(query: string, inRegexMode: boolean, fieldName: string): number[] {
+    let predicate = util.getSearchPredicate(query, inRegexMode, fieldName);
+    let matches: number[] = [];
+    this.points.forEach((point, id) => {
+      if (predicate(point)) {
+        matches.push(id);
+      }
+    });
+    return matches;
+  }
+}
+
+export type ProjectionType = 'tsne' | 'pca' | 'custom';
+
+export class Projection {
+  constructor(
+      public projectionType: ProjectionType,
+      public projectionComponents: ProjectionComponents3D,
+      public dimensionality: number, public dataSet: DataSet) {}
+}
+
+export interface ColorOption {
+  name: string;
+  desc?: string;
+  map?: (value: string|number) => string;
+  /** List of items for the color map. Defined only for categorical map. */
+  items?: {label: string, count: number}[];
+  /** Threshold values and their colors. Defined for gradient color map. */
+  thresholds?: {value: number, color: string}[];
+  isSeparator?: boolean;
+  tooManyUniqueValues?: boolean;
+}
+
+/**
+ * An interface that holds all the data for serializing the current state of
+ * the world.
+ */
+export class State {
+  /** A label identifying this state. */
+  label: string = '';
+
+  /** Whether this State is selected in the bookmarks pane. */
+  isSelected: boolean = false;
+
+  /** The selected projection tab. */
+  selectedProjection: ProjectionType;
+
+  /** Dimensions of the DataSet. */
+  dataSetDimensions: [number, number];
+
+  /** t-SNE parameters */
+  tSNEIteration: number = 0;
+  tSNEPerplexity: number = 0;
+  tSNELearningRate: number = 0;
+  tSNEis3d: boolean = true;
+
+  /** PCA projection component dimensions */
+  pcaComponentDimensions: number[] = [];
+
+  /** Custom projection parameters */
+  customSelectedSearchByMetadataOption: string;
+  customXLeftText: string;
+  customXLeftRegex: boolean;
+  customXRightText: string;
+  customXRightRegex: boolean;
+  customYUpText: string;
+  customYUpRegex: boolean;
+  customYDownText: string;
+  customYDownRegex: boolean;
+
+  /** The computed projections of the tensors. */
+  projections: Array<{[key: string]: number}> = [];
+
+  /** Filtered dataset indices. */
+  filteredPoints: number[];
+
+  /** The indices of selected points. */
+  selectedPoints: number[] = [];
+
+  /** Camera state (2d/3d, position, target, zoom, etc). */
+  cameraDef: scatterPlot.CameraDef;
+
+  /** Color by option. */
+  selectedColorOptionName: string;
+  forceCategoricalColoring: boolean;
+
+  /** Label by option. */
+  selectedLabelOption: string;
+}
+
+export function getProjectionComponents(
+    projection: ProjectionType,
+    components: (number|string)[]): ProjectionComponents3D {
+  if (components.length > 3) {
+    throw new RangeError('components length must be <= 3');
+  }
+  const projectionComponents: [string, string, string] = [null, null, null];
+  const prefix = (projection === 'custom') ? 'linear' : projection;
+  for (let i = 0; i < components.length; ++i) {
+    if (components[i] == null) {
+      continue;
+    }
+    projectionComponents[i] = prefix + '-' + components[i];
+  }
+  return projectionComponents;
+}
+
+export function stateGetAccessorDimensions(state: State): Array<number|string> {
+  let dimensions: Array<number|string>;
+  switch (state.selectedProjection) {
+    case 'pca':
+      dimensions = state.pcaComponentDimensions.slice();
+      break;
+    case 'tsne':
+      dimensions = [0, 1];
+      if (state.tSNEis3d) {
+        dimensions.push(2);
+      }
+      break;
+    case 'custom':
+      dimensions = ['x', 'y'];
+      break;
+    default:
+      throw new Error('Unexpected fallthrough');
+  }
+  return dimensions;
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/data_test.ts
new file mode 100644
index 0000000000..924ae3a929
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/data_test.ts
@@ -0,0 +1,104 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DataPoint, DataSet, State, stateGetAccessorDimensions} from './data';
+
+/**
+ * Helper method that makes a list of points given an array of
+ * sequence indexes.
+ *
+ * @param sequences The i-th entry holds the 'next' attribute for the i-th
+ * point.
+ */
+function makePointsWithSequences(
+    sequences: number[], nextAttr = '__seq_next__') {
+  let points: DataPoint[] = [];
+  sequences.forEach((t, i) => {
+    let metadata: {[key: string]: any} = {};
+    metadata[nextAttr] = t >= 0 ? t : null;
+    points.push({
+      vector: new Float32Array(0),
+      metadata: metadata,
+      projections: {},
+      index: i
+    });
+  });
+  return points;
+}
+
+describe('constructor_with_sequences', () => {
+  it('Simple forward pointing sequences, __seq_next__ metadata format', () => {
+    // The input is: 0->2, 1->None, 2->3, 3->None. This should return
+    // one sequence 0->2->3.
+    const points = makePointsWithSequences([2, -1, 3, -1]);
+    let dataset = new DataSet(points);
+    expect(dataset.sequences.length).toEqual(1);
+    expect(dataset.sequences[0].pointIndices).toEqual([0, 2, 3]);
+  });
+
+  it('Simple forward pointing sequences, __next__ metadata format', () => {
+    // The input is: 0->2, 1->None, 2->3, 3->None. This should return
+    // one sequence 0->2->3.
+    const points = makePointsWithSequences([2, -1, 3, -1], '__next__');
+    let dataset = new DataSet(points);
+    expect(dataset.sequences.length).toEqual(1);
+    expect(dataset.sequences[0].pointIndices).toEqual([0, 2, 3]);
+  });
+
+  it('No sequences', () => {
+    let points = makePointsWithSequences([-1, -1, -1, -1]);
+    let dataset = new DataSet(points);
+    expect(dataset.sequences.length).toEqual(0);
+  });
+
+  it('A sequence that goes backwards and forward in the array', () => {
+    // The input is: 0->2, 1->0, 2->nothing, 3->1. This should return
+    // one sequence 3->1->0->2.
+    let points = makePointsWithSequences([2, 0, -1, 1]);
+    let dataset = new DataSet(points);
+    expect(dataset.sequences.length).toEqual(1);
+    expect(dataset.sequences[0].pointIndices).toEqual([3, 1, 0, 2]);
+  });
+});
+
+describe('stateGetAccessorDimensions', () => {
+  it('returns [0, 1] for 2d t-SNE', () => {
+    const state = new State();
+    state.selectedProjection = 'tsne';
+    state.tSNEis3d = false;
+    expect(stateGetAccessorDimensions(state)).toEqual([0, 1]);
+  });
+
+  it('returns [0, 1, 2] for 3d t-SNE', () => {
+    const state = new State();
+    state.selectedProjection = 'tsne';
+    state.tSNEis3d = true;
+    expect(stateGetAccessorDimensions(state)).toEqual([0, 1, 2]);
+  });
+
+  it('returns pca component dimensions array for pca', () => {
+    const state = new State();
+    state.selectedProjection = 'pca';
+    state.pcaComponentDimensions = [13, 12, 11, 10];
+    expect(stateGetAccessorDimensions(state))
+        .toEqual(state.pcaComponentDimensions);
+  });
+
+  it('returns ["x", "y"] for custom projections', () => {
+    const state = new State();
+    state.selectedProjection = 'custom';
+    expect(stateGetAccessorDimensions(state)).toEqual(['x', 'y']);
+  });
+});
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/external.d.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/external.d.ts
new file mode 100644
index 0000000000..cbc1512c21
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/external.d.ts
@@ -0,0 +1,51 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// TODO(smilkov): Split into weblas.d.ts and numeric.d.ts and write
+// typings for numeric.
+interface Tensor {
+  new(size: [number, number], data: Float32Array);
+  transfer(): Float32Array;
+  delete(): void;
+}
+
+interface Weblas {
+  sgemm(M: number, N: number, K: number, alpha: number,
+      A: Float32Array, B: Float32Array, beta: number, C: Float32Array):
+      Float32Array;
+  pipeline: {
+     Tensor: Tensor;
+     sgemm(alpha: number, A: Tensor, B: Tensor, beta: number,
+         C: Tensor): Tensor;
+  };
+  util: {
+    transpose(M: number, N: number, data: Float32Array): Tensor;
+  };
+
+}
+
+declare let numeric: any;
+declare let weblas: Weblas;
+
+interface AnalyticsEventType {
+  hitType: string;
+  page?: string;
+  eventCategory?: string;
+  eventAction?: string;
+  eventLabel?: string;
+  eventValue?: number;
+}
+
+declare let ga: (command: string, eventObj: AnalyticsEventType) => void;
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/heap.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/heap.ts
new file mode 100644
index 0000000000..ac3144e649
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/heap.ts
@@ -0,0 +1,146 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/** Min key heap. */
+export type HeapItem<T> = {
+  key: number,
+  value: T
+};
+
+/**
+ * Min-heap data structure. Provides O(1) for peek, returning the smallest key.
+ */
+// TODO(jart): Rename to Heap and use Comparator.
+export class MinHeap<T> {
+  private arr: HeapItem<T>[] = [];
+
+  /** Push an element with the provided key. */
+  push(key: number, value: T): void {
+    this.arr.push({key, value});
+    this.bubbleUp(this.arr.length - 1);
+  }
+
+  /** Pop the element with the smallest key. */
+  pop(): HeapItem<T> {
+    if (this.arr.length === 0) {
+      throw new Error('pop() called on empty binary heap');
+    }
+    let item = this.arr[0];
+    let last = this.arr.length - 1;
+    this.arr[0] = this.arr[last];
+    this.arr.pop();
+    if (last > 0) {
+      this.bubbleDown(0);
+    }
+    return item;
+  };
+
+  /** Returns, but doesn't remove the element with the smallest key */
+  peek(): HeapItem<T> { return this.arr[0]; }
+
+  /**
+   * Pops the element with the smallest key and at the same time
+   * adds the newly provided element. This is faster than calling
+   * pop() and push() separately.
+   */
+  popPush(key: number, value: T): HeapItem<T> {
+    if (this.arr.length === 0) {
+      throw new Error('pop() called on empty binary heap');
+    }
+    let item = this.arr[0];
+    this.arr[0] = {key, value};
+    if (this.arr.length > 0) {
+      this.bubbleDown(0);
+    }
+    return item;
+  }
+
+  /** Returns the number of elements in the heap. */
+  size(): number { return this.arr.length; }
+
+  /** Returns all the items in the heap. */
+  items(): HeapItem<T>[] { return this.arr; }
+
+  private swap(a: number, b: number) {
+    let temp = this.arr[a];
+    this.arr[a] = this.arr[b];
+    this.arr[b] = temp;
+  }
+
+  private bubbleDown(pos: number) {
+    let left = (pos << 1) + 1;
+    let right = left + 1;
+    let largest = pos;
+    if (left < this.arr.length && this.arr[left].key < this.arr[largest].key) {
+      largest = left;
+    }
+    if (right < this.arr.length &&
+        this.arr[right].key < this.arr[largest].key) {
+      largest = right;
+    }
+    if (largest !== pos) {
+      this.swap(largest, pos);
+      this.bubbleDown(largest);
+    }
+  }
+
+  private bubbleUp(pos: number) {
+    if (pos <= 0) {
+      return;
+    }
+    let parent = ((pos - 1) >> 1);
+    if (this.arr[pos].key < this.arr[parent].key) {
+      this.swap(pos, parent);
+      this.bubbleUp(parent);
+    }
+  }
+}
+
+/** List that keeps the K elements with the smallest keys. */
+export class KMin<T> {
+  private k: number;
+  private maxHeap = new MinHeap<T>();
+
+  /** Constructs a new k-min data structure with the provided k. */
+  constructor(k: number) { this.k = k; }
+
+  /** Adds an element to the list. */
+  add(key: number, value: T) {
+    if (this.maxHeap.size() < this.k) {
+      this.maxHeap.push(-key, value);
+      return;
+    }
+    let largest = this.maxHeap.peek();
+    // If the new element is smaller, replace the largest with the new element.
+    if (key < -largest.key) {
+      this.maxHeap.popPush(-key, value);
+    }
+  }
+
+  /** Returns the k items with the smallest keys. */
+  getMinKItems(): T[] {
+    let items = this.maxHeap.items();
+    items.sort((a, b) => b.key - a.key);
+    return items.map(a => a.value);
+  }
+
+  /** Returns the size of the list. */
+  getSize(): number { return this.maxHeap.size(); }
+
+  /** Returns the largest key in the list. */
+  getLargestKey(): number {
+    return this.maxHeap.size() === 0 ? null : -this.maxHeap.peek().key;
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/knn.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/knn.ts
new file mode 100644
index 0000000000..906e077b5d
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/knn.ts
@@ -0,0 +1,235 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {runAsyncTask} from './util';
+import * as logging from './logging';
+import {KMin} from './heap';
+import {Vector} from './vector';
+import * as vector from './vector';
+
+export type NearestEntry = {
+  index: number,
+  dist: number
+};
+
+/**
+ * Optimal size for the height of the matrix when doing computation on the GPU
+ * using WebGL. This was found experimentally.
+ *
+ * This also guarantees that for computing pair-wise distance for up to 10K
+ * vectors, no more than 40MB will be allocated in the GPU. Without the
+ * allocation limit, we can freeze the graphics of the whole OS.
+ */
+const OPTIMAL_GPU_BLOCK_SIZE = 256;
+/** Id of message box used for knn gpu progress bar. */
+const KNN_GPU_MSG_ID = 'knn-gpu';
+
+/**
+ * Returns the K nearest neighbors for each vector where the distance
+ * computation is done on the GPU (WebGL) using cosine distance.
+ *
+ * @param dataPoints List of data points, where each data point holds an
+ *   n-dimensional vector.
+ * @param k Number of nearest neighbors to find.
+ * @param accessor A method that returns the vector, given the data point.
+ */
+export function findKNNGPUCosine<T>(
+    dataPoints: T[], k: number,
+    accessor: (dataPoint: T) => Float32Array): Promise<NearestEntry[][]> {
+  let N = dataPoints.length;
+  let dim = accessor(dataPoints[0]).length;
+
+  // The goal is to compute a large matrix multiplication A*A.T where A is of
+  // size NxD and A.T is its transpose. This results in a NxN matrix which
+  // could be too big to store on the GPU memory. To avoid memory overflow, we
+  // compute multiple A*partial_A.T where partial_A is of size BxD (B is much
+  // smaller than N). This results in storing only NxB size matrices on the GPU
+  // at a given time.
+
+  // A*A.T will give us NxN matrix holding the cosine distance between every
+  // pair of points, which we sort using KMin data structure to obtain the
+  // K nearest neighbors for each point.
+  let typedArray = vector.toTypedArray(dataPoints, accessor);
+  let bigMatrix = new weblas.pipeline.Tensor([N, dim], typedArray);
+  let nearest: NearestEntry[][] = new Array(N);
+  let numPieces = Math.ceil(N / OPTIMAL_GPU_BLOCK_SIZE);
+  let M = Math.floor(N / numPieces);
+  let modulo = N % numPieces;
+  let offset = 0;
+  let progress = 0;
+  let progressDiff = 1 / (2 * numPieces);
+  let piece = 0;
+
+  function step(resolve: (result: NearestEntry[][]) => void) {
+    let progressMsg =
+        'Finding nearest neighbors: ' + (progress * 100).toFixed() + '%';
+    runAsyncTask(progressMsg, () => {
+      let B = piece < modulo ? M + 1 : M;
+      let typedB = new Float32Array(B * dim);
+      for (let i = 0; i < B; ++i) {
+        let vector = accessor(dataPoints[offset + i]);
+        for (let d = 0; d < dim; ++d) {
+          typedB[i * dim + d] = vector[d];
+        }
+      }
+      let partialMatrix = new weblas.pipeline.Tensor([B, dim], typedB);
+      // Result is N x B matrix.
+      let result =
+          weblas.pipeline.sgemm(1, bigMatrix, partialMatrix, null, null);
+      let partial = result.transfer();
+      partialMatrix.delete();
+      result.delete();
+      progress += progressDiff;
+      for (let i = 0; i < B; i++) {
+        let kMin = new KMin<NearestEntry>(k);
+        let iReal = offset + i;
+        for (let j = 0; j < N; j++) {
+          if (j === iReal) {
+            continue;
+          }
+          let cosDist = 1 - partial[j * B + i];  // [j, i];
+          kMin.add(cosDist, {index: j, dist: cosDist});
+        }
+        nearest[iReal] = kMin.getMinKItems();
+      }
+      progress += progressDiff;
+      offset += B;
+      piece++;
+    }, KNN_GPU_MSG_ID).then(() => {
+      if (piece < numPieces) {
+        step(resolve);
+      } else {
+        logging.setModalMessage(null, KNN_GPU_MSG_ID);
+        bigMatrix.delete();
+        resolve(nearest);
+      }
+    }, error => {
+      // GPU failed. Reverting back to CPU.
+      logging.setModalMessage(null, KNN_GPU_MSG_ID);
+      let distFunc = (a, b, limit) => vector.cosDistNorm(a, b);
+      findKNN(dataPoints, k, accessor, distFunc).then(nearest => {
+        resolve(nearest);
+      });
+    });
+  }
+  return new Promise<NearestEntry[][]>(resolve => step(resolve));
+}
+
+/**
+ * Returns the K nearest neighbors for each vector where the distance
+ * computation is done on the CPU using a user-specified distance method.
+ *
+ * @param dataPoints List of data points, where each data point holds an
+ *   n-dimensional vector.
+ * @param k Number of nearest neighbors to find.
+ * @param accessor A method that returns the vector, given the data point.
+ * @param dist Method that takes two vectors and a limit, and computes the
+ *   distance between two vectors, with the ability to stop early if the
+ *   distance is above the limit.
+ */
+export function findKNN<T>(
+    dataPoints: T[], k: number, accessor: (dataPoint: T) => Float32Array,
+    dist: (a: Vector, b: Vector, limit: number) =>
+        number): Promise<NearestEntry[][]> {
+  return runAsyncTask<NearestEntry[][]>('Finding nearest neighbors...', () => {
+    let N = dataPoints.length;
+    let nearest: NearestEntry[][] = new Array(N);
+    // Find the distances from node i.
+    let kMin: KMin<NearestEntry>[] = new Array(N);
+    for (let i = 0; i < N; i++) {
+      kMin[i] = new KMin<NearestEntry>(k);
+    }
+    for (let i = 0; i < N; i++) {
+      let a = accessor(dataPoints[i]);
+      let kMinA = kMin[i];
+      for (let j = i + 1; j < N; j++) {
+        let kMinB = kMin[j];
+        let limitI = kMinA.getSize() === k ?
+            kMinA.getLargestKey() || Number.MAX_VALUE :
+            Number.MAX_VALUE;
+        let limitJ = kMinB.getSize() === k ?
+            kMinB.getLargestKey() || Number.MAX_VALUE :
+            Number.MAX_VALUE;
+        let limit = Math.max(limitI, limitJ);
+        let dist2ItoJ = dist(a, accessor(dataPoints[j]), limit);
+        if (dist2ItoJ >= 0) {
+          kMinA.add(dist2ItoJ, {index: j, dist: dist2ItoJ});
+          kMinB.add(dist2ItoJ, {index: i, dist: dist2ItoJ});
+        }
+      }
+    }
+    for (let i = 0; i < N; i++) {
+      nearest[i] = kMin[i].getMinKItems();
+    }
+    return nearest;
+  });
+}
+
+/** Calculates the minimum distance between a search point and a rectangle. */
+function minDist(
+    point: [number, number], x1: number, y1: number, x2: number, y2: number) {
+  let x = point[0];
+  let y = point[1];
+  let dx1 = x - x1;
+  let dx2 = x - x2;
+  let dy1 = y - y1;
+  let dy2 = y - y2;
+
+  if (dx1 * dx2 <= 0) {    // x is between x1 and x2
+    if (dy1 * dy2 <= 0) {  // (x,y) is inside the rectangle
+      return 0;            // return 0 as point is in rect
+    }
+    return Math.min(Math.abs(dy1), Math.abs(dy2));
+  }
+  if (dy1 * dy2 <= 0) {  // y is between y1 and y2
+    // We know it is already inside the rectangle
+    return Math.min(Math.abs(dx1), Math.abs(dx2));
+  }
+  let corner: [number, number];
+  if (x > x2) {
+    // Upper-right vs lower-right.
+    corner = y > y2 ? [x2, y2] : [x2, y1];
+  } else {
+    // Upper-left vs lower-left.
+    corner = y > y2 ? [x1, y2] : [x1, y1];
+  }
+  return Math.sqrt(vector.dist22D([x, y], corner));
+}
+
+/**
+ * Returns the nearest neighbors of a particular point.
+ *
+ * @param dataPoints List of data points.
+ * @param pointIndex The index of the point we need the nearest neighbors of.
+ * @param k Number of nearest neighbors to search for.
+ * @param accessor Method that maps a data point => vector (array of numbers).
+ * @param distance Method that takes two vectors and returns their distance.
+ */
+export function findKNNofPoint<T>(
+    dataPoints: T[], pointIndex: number, k: number,
+    accessor: (dataPoint: T) => Float32Array,
+    distance: (a: Vector, b: Vector) => number) {
+  let kMin = new KMin<NearestEntry>(k);
+  let a = accessor(dataPoints[pointIndex]);
+  for (let i = 0; i < dataPoints.length; ++i) {
+    if (i === pointIndex) {
+      continue;
+    }
+    let b = accessor(dataPoints[i]);
+    let dist = distance(a, b);
+    kMin.add(dist, {index: i, dist: dist});
+  }
+  return kMin.getMinKItems();
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/label.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/label.ts
new file mode 100644
index 0000000000..67987f06ea
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/label.ts
@@ -0,0 +1,151 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+export interface BoundingBox {
+  loX: number;
+  loY: number;
+  hiX: number;
+  hiY: number;
+}
+
+/**
+ * Accelerates label placement by dividing the view into a uniform grid.
+ * Labels only need to be tested for collision with other labels that overlap
+ * the same grid cells. This is a fork of {@code amoeba.CollisionGrid}.
+ */
+export class CollisionGrid {
+  private numHorizCells: number;
+  private numVertCells: number;
+  private grid: BoundingBox[][];
+  private bound: BoundingBox;
+  private cellWidth: number;
+  private cellHeight: number;
+
+  /**
+   * Constructs a new Collision grid.
+   *
+   * @param bound The bound of the grid. Labels out of bounds will be rejected.
+   * @param cellWidth Width of a cell in the grid.
+   * @param cellHeight Height of a cell in the grid.
+   */
+  constructor(bound: BoundingBox, cellWidth: number, cellHeight: number) {
+    /** The bound of the grid. Labels out of bounds will be rejected. */
+    this.bound = bound;
+
+    /** Width of a cell in the grid. */
+    this.cellWidth = cellWidth;
+
+    /** Height of a cell in the grid. */
+    this.cellHeight = cellHeight;
+
+    /** Number of grid cells along the x axis. */
+    this.numHorizCells = Math.ceil(this.boundWidth(bound) / cellWidth);
+
+    /** Number of grid cells along the y axis. */
+    this.numVertCells = Math.ceil(this.boundHeight(bound) / cellHeight);
+
+    /**
+     * The 2d grid (stored as a 1d array.) Each cell consists of an array of
+     * BoundingBoxes for objects that are in the cell.
+     */
+    this.grid = new Array(this.numHorizCells * this.numVertCells);
+  }
+
+  private boundWidth(bound: BoundingBox) { return bound.hiX - bound.loX; }
+
+  private boundHeight(bound: BoundingBox) { return bound.hiY - bound.loY; }
+
+  private boundsIntersect(a: BoundingBox, b: BoundingBox) {
+    return !(a.loX > b.hiX || a.loY > b.hiY || a.hiX < b.loX || a.hiY < b.loY);
+  }
+
+  /**
+   * Checks if a given bounding box has any conflicts in the grid and inserts it
+   * if none are found.
+   *
+   * @param bound The bound to insert.
+   * @param justTest If true, just test if it conflicts, without inserting.
+   * @return True if the bound was successfully inserted; false if it
+   *         could not be inserted due to a conflict.
+   */
+  insert(bound: BoundingBox, justTest = false): boolean {
+    // Reject if the label is out of bounds.
+    if ((bound.hiX < this.bound.loX) || (bound.loX > this.bound.hiX) ||
+        (bound.hiY < this.bound.loY) || (bound.loY > this.bound.hiY)) {
+      return false;
+    }
+
+    let minCellX = this.getCellX(bound.loX);
+    let maxCellX = this.getCellX(bound.hiX);
+    let minCellY = this.getCellY(bound.loY);
+    let maxCellY = this.getCellY(bound.hiY);
+
+    // Check all overlapped cells to verify that we can insert.
+    let baseIdx = minCellY * this.numHorizCells + minCellX;
+    let idx = baseIdx;
+    for (let j = minCellY; j <= maxCellY; j++) {
+      for (let i = minCellX; i <= maxCellX; i++) {
+        let cell = this.grid[idx++];
+        if (cell) {
+          for (let k = 0; k < cell.length; k++) {
+            if (this.boundsIntersect(bound, cell[k])) {
+              return false;
+            }
+          }
+        }
+      }
+      idx += this.numHorizCells - (maxCellX - minCellX + 1);
+    }
+
+    if (justTest) {
+      return true;
+    }
+
+    // Insert into the overlapped cells.
+    idx = baseIdx;
+    for (let j = minCellY; j <= maxCellY; j++) {
+      for (let i = minCellX; i <= maxCellX; i++) {
+        if (!this.grid[idx]) {
+          this.grid[idx] = [bound];
+        } else {
+          this.grid[idx].push(bound);
+        }
+        idx++;
+      }
+      idx += this.numHorizCells - (maxCellX - minCellX + 1);
+    }
+    return true;
+  }
+
+  /**
+   * Returns the x index of the grid cell where the given x coordinate falls.
+   *
+   * @param x the coordinate, in world space.
+   * @return the x index of the cell.
+   */
+  private getCellX(x: number) {
+    return Math.floor((x - this.bound.loX) / this.cellWidth);
+  };
+
+  /**
+   * Returns the y index of the grid cell where the given y coordinate falls.
+   *
+   * @param y the coordinate, in world space.
+   * @return the y index of the cell.
+   */
+  private getCellY(y: number) {
+    return Math.floor((y - this.bound.loY) / this.cellHeight);
+  };
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/logging.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/logging.ts
new file mode 100644
index 0000000000..59f3720601
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/logging.ts
@@ -0,0 +1,103 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/** Duration in ms for showing warning messages to the user */
+const WARNING_DURATION_MS = 10000;
+
+let dom: HTMLElement = null;
+let msgId = 0;
+let numActiveMessages = 0;
+
+export function setDomContainer(domElement: HTMLElement) {
+  dom = domElement;
+}
+
+/**
+ * Updates the user message with the provided id.
+ *
+ * @param msg The message shown to the user. If null, the message is removed.
+ * @param id The id of an existing message. If no id is provided, a unique id
+ *     is assigned.
+ * @param title The title of the notification.
+ * @param isErrorMsg If true, the message is error and the dialog will have a
+ *                   close button.
+ * @return The id of the message.
+ */
+export function setModalMessage(
+    msg: string, id: string = null, title = null, isErrorMsg = false): string {
+  if (dom == null) {
+    console.warn('Can\'t show modal message before the dom is initialized');
+    return;
+  }
+  if (id == null) {
+    id = (msgId++).toString();
+  }
+  let dialog = dom.querySelector('#notification-dialog') as any;
+  dialog.querySelector('.close-button').style.display =
+      isErrorMsg ? null : 'none';
+  let spinner = dialog.querySelector('.progress');
+  spinner.style.display = isErrorMsg ? 'none' : null;
+  spinner.active = isErrorMsg ? null : true;
+  dialog.querySelector('#notification-title').innerHTML = title;
+  let msgsContainer = dialog.querySelector('#notify-msgs') as HTMLElement;
+  if (isErrorMsg) {
+    msgsContainer.innerHTML = '';
+  } else {
+    const errors = msgsContainer.querySelectorAll('.error');
+    for (let i = 0; i < errors.length; i++) {
+      msgsContainer.removeChild(errors[i]);
+    }
+  }
+  let divId = `notify-msg-${id}`;
+  let msgDiv = dialog.querySelector('#' + divId) as HTMLDivElement;
+  if (msgDiv == null) {
+    msgDiv = document.createElement('div');
+    msgDiv.className = 'notify-msg ' + (isErrorMsg ? 'error' : '');
+    msgDiv.id = divId;
+
+    msgsContainer.insertBefore(msgDiv, msgsContainer.firstChild);
+
+    if (!isErrorMsg) {
+      numActiveMessages++;
+    } else {
+      numActiveMessages = 0;
+    }
+  }
+  if (msg == null) {
+    numActiveMessages--;
+    if (numActiveMessages === 0) {
+      dialog.close();
+    }
+    msgDiv.remove();
+  } else {
+    msgDiv.innerText = msg;
+    dialog.open();
+  }
+  return id;
+}
+
+export function setErrorMessage(errMsg: string, task?: string) {
+  setModalMessage(errMsg, null, 'Error ' + (task != null ? task : ''), true);
+}
+
+/**
+ * Shows a warning message to the user for a certain amount of time.
+ */
+export function setWarningMessage(msg: string): void {
+  let toast = dom.querySelector('#toast') as any;
+  toast.text = msg;
+  toast.duration = WARNING_DURATION_MS;
+  toast.open();
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/projectorEventContext.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/projectorEventContext.ts
new file mode 100644
index 0000000000..36f5c4c584
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/projectorEventContext.ts
@@ -0,0 +1,45 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DistanceFunction, Projection} from './data';
+import {NearestEntry} from './knn';
+
+export type HoverListener = (index: number) => void;
+export type SelectionChangedListener =
+    (selectedPointIndices: number[], neighborsOfFirstPoint: NearestEntry[]) =>
+        void;
+export type ProjectionChangedListener = (projection: Projection) => void;
+export type DistanceMetricChangedListener =
+    (distanceMetric: DistanceFunction) => void;
+export interface ProjectorEventContext {
+  /** Register a callback to be invoked when the mouse hovers over a point. */
+  registerHoverListener(listener: HoverListener);
+  /** Notify the hover system that a point is under the mouse. */
+  notifyHoverOverPoint(pointIndex: number);
+  /** Registers a callback to be invoked when the selection changes. */
+  registerSelectionChangedListener(listener: SelectionChangedListener);
+  /**
+   * Notify the selection system that a client has changed the selected point
+   * set.
+   */
+  notifySelectionChanged(newSelectedPointIndices: number[]);
+  /** Registers a callback to be invoked when the projection changes. */
+  registerProjectionChangedListener(listener: ProjectionChangedListener);
+  /** Notify listeners that a reprojection occurred. */
+  notifyProjectionChanged(projection: Projection);
+  registerDistanceMetricChangedListener(listener:
+                                            DistanceMetricChangedListener);
+  notifyDistanceMetricChanged(distMetric: DistanceFunction);
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts
new file mode 100644
index 0000000000..bb09e2b153
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts
@@ -0,0 +1,713 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+
+import {DataSet, DistanceFunction, Projection, ProjectionComponents3D, State} from './data';
+import {NearestEntry} from './knn';
+import {ProjectorEventContext} from './projectorEventContext';
+import {LabelRenderParams} from './renderContext';
+import {ScatterPlot} from './scatterPlot';
+import {ScatterPlotVisualizer3DLabels} from './scatterPlotVisualizer3DLabels';
+import {ScatterPlotVisualizerCanvasLabels} from './scatterPlotVisualizerCanvasLabels';
+import {ScatterPlotVisualizerPolylines} from './scatterPlotVisualizerPolylines';
+import {ScatterPlotVisualizerSprites} from './scatterPlotVisualizerSprites';
+import * as vector from './vector';
+
+const LABEL_FONT_SIZE = 10;
+const LABEL_SCALE_DEFAULT = 1.0;
+const LABEL_SCALE_LARGE = 2;
+const LABEL_FILL_COLOR_SELECTED = 0x000000;
+const LABEL_FILL_COLOR_HOVER = 0x000000;
+const LABEL_FILL_COLOR_NEIGHBOR = 0x000000;
+const LABEL_STROKE_COLOR_SELECTED = 0xFFFFFF;
+const LABEL_STROKE_COLOR_HOVER = 0xFFFFFF;
+const LABEL_STROKE_COLOR_NEIGHBOR = 0xFFFFFF;
+
+const POINT_COLOR_UNSELECTED = 0xE3E3E3;
+const POINT_COLOR_NO_SELECTION = 0x7575D9;
+const POINT_COLOR_SELECTED = 0xFA6666;
+const POINT_COLOR_HOVER = 0x760B4F;
+
+const POINT_SCALE_DEFAULT = 1.0;
+const POINT_SCALE_SELECTED = 1.2;
+const POINT_SCALE_NEIGHBOR = 1.2;
+const POINT_SCALE_HOVER = 1.2;
+
+const LABELS_3D_COLOR_UNSELECTED = 0xFFFFFF;
+const LABELS_3D_COLOR_NO_SELECTION = 0xFFFFFF;
+
+const SPRITE_IMAGE_COLOR_UNSELECTED = 0xFFFFFF;
+const SPRITE_IMAGE_COLOR_NO_SELECTION = 0xFFFFFF;
+
+const POLYLINE_START_HUE = 60;
+const POLYLINE_END_HUE = 360;
+const POLYLINE_SATURATION = 1;
+const POLYLINE_LIGHTNESS = .3;
+
+const POLYLINE_DEFAULT_OPACITY = .2;
+const POLYLINE_DEFAULT_LINEWIDTH = 2;
+const POLYLINE_SELECTED_OPACITY = .9;
+const POLYLINE_SELECTED_LINEWIDTH = 3;
+const POLYLINE_DESELECTED_OPACITY = .05;
+
+const SCATTER_PLOT_CUBE_LENGTH = 2;
+
+/** Color scale for nearest neighbors. */
+const NN_COLOR_SCALE =
+    d3.scaleLinear<string, string>()
+        .domain([1, 0.7, 0.4])
+        .range(['hsl(285, 80%, 40%)', 'hsl(0, 80%, 65%)', 'hsl(40, 70%, 60%)'])
+        .clamp(true);
+
+/**
+ * Interprets projector events and assembes the arrays and commands necessary
+ * to use the ScatterPlot to render the current projected data set.
+ */
+export class ProjectorScatterPlotAdapter {
+  public scatterPlot: ScatterPlot;
+  private projection: Projection;
+  private hoverPointIndex: number;
+  private selectedPointIndices: number[];
+  private neighborsOfFirstSelectedPoint: NearestEntry[];
+  private renderLabelsIn3D: boolean = false;
+  private labelPointAccessor: string;
+  private legendPointColorer: (ds: DataSet, index: number) => string;
+  private distanceMetric: DistanceFunction;
+
+  private spriteVisualizer: ScatterPlotVisualizerSprites;
+  private labels3DVisualizer: ScatterPlotVisualizer3DLabels;
+  private canvasLabelsVisualizer: ScatterPlotVisualizerCanvasLabels;
+  private polylineVisualizer: ScatterPlotVisualizerPolylines;
+
+  constructor(
+      private scatterPlotContainer: HTMLElement,
+      projectorEventContext: ProjectorEventContext) {
+    this.scatterPlot =
+        new ScatterPlot(scatterPlotContainer, projectorEventContext);
+    projectorEventContext.registerProjectionChangedListener(projection => {
+      this.projection = projection;
+      this.updateScatterPlotWithNewProjection(projection);
+    });
+    projectorEventContext.registerSelectionChangedListener(
+        (selectedPointIndices, neighbors) => {
+          this.selectedPointIndices = selectedPointIndices;
+          this.neighborsOfFirstSelectedPoint = neighbors;
+          this.updateScatterPlotPositions();
+          this.updateScatterPlotAttributes();
+          this.scatterPlot.render();
+        });
+    projectorEventContext.registerHoverListener(hoverPointIndex => {
+      this.hoverPointIndex = hoverPointIndex;
+      this.updateScatterPlotAttributes();
+      this.scatterPlot.render();
+    });
+    projectorEventContext.registerDistanceMetricChangedListener(
+        distanceMetric => {
+          this.distanceMetric = distanceMetric;
+          this.updateScatterPlotAttributes();
+          this.scatterPlot.render();
+        });
+    this.createVisualizers(false);
+  }
+
+  notifyProjectionPositionsUpdated() {
+    this.updateScatterPlotPositions();
+    this.scatterPlot.render();
+  }
+
+  setDataSet(dataSet: DataSet) {
+    if (this.projection != null) {
+      // TODO(nicholsonc): setDataSet needs to go away, the projection is the
+      // atomic unit of update.
+      this.projection.dataSet = dataSet;
+    }
+    if (this.polylineVisualizer != null) {
+      this.polylineVisualizer.setDataSet(dataSet);
+    }
+    if (this.labels3DVisualizer != null) {
+      this.labels3DVisualizer.setLabelStrings(
+          this.generate3DLabelsArray(dataSet, this.labelPointAccessor));
+    }
+    if (this.spriteVisualizer == null) {
+      return;
+    }
+    this.spriteVisualizer.clearSpriteAtlas();
+    if ((dataSet == null) || (dataSet.spriteAndMetadataInfo == null)) {
+      return;
+    }
+    const metadata = dataSet.spriteAndMetadataInfo;
+    if ((metadata.spriteImage == null) || (metadata.spriteMetadata == null)) {
+      return;
+    }
+    const n = dataSet.points.length;
+    const spriteIndices = new Float32Array(n);
+    for (let i = 0; i < n; ++i) {
+      spriteIndices[i] = dataSet.points[i].index;
+    }
+    this.spriteVisualizer.setSpriteAtlas(
+        metadata.spriteImage, metadata.spriteMetadata.singleImageDim,
+        spriteIndices);
+  }
+
+  set3DLabelMode(renderLabelsIn3D: boolean) {
+    this.renderLabelsIn3D = renderLabelsIn3D;
+    this.createVisualizers(renderLabelsIn3D);
+    this.updateScatterPlotAttributes();
+    this.scatterPlot.render();
+  }
+
+  setLegendPointColorer(
+      legendPointColorer: (ds: DataSet, index: number) => string) {
+    this.legendPointColorer = legendPointColorer;
+  }
+
+  setLabelPointAccessor(labelPointAccessor: string) {
+    this.labelPointAccessor = labelPointAccessor;
+    if (this.labels3DVisualizer != null) {
+      const ds = (this.projection == null) ? null : this.projection.dataSet;
+      this.labels3DVisualizer.setLabelStrings(
+          this.generate3DLabelsArray(ds, labelPointAccessor));
+    }
+  }
+
+  resize() {
+    this.scatterPlot.resize();
+  }
+
+  populateBookmarkFromUI(state: State) {
+    state.cameraDef = this.scatterPlot.getCameraDef();
+  }
+
+  restoreUIFromBookmark(state: State) {
+    this.scatterPlot.setCameraParametersForNextCameraCreation(
+        state.cameraDef, false);
+  }
+
+  updateScatterPlotPositions() {
+    const ds = (this.projection == null) ? null : this.projection.dataSet;
+    const projectionComponents =
+        (this.projection == null) ? null : this.projection.projectionComponents;
+    const newPositions =
+        this.generatePointPositionArray(ds, projectionComponents);
+    this.scatterPlot.setPointPositions(newPositions);
+  }
+
+  updateScatterPlotAttributes() {
+    if (this.projection == null) {
+      return;
+    }
+    const dataSet = this.projection.dataSet;
+    const selectedSet = this.selectedPointIndices;
+    const hoverIndex = this.hoverPointIndex;
+    const neighbors = this.neighborsOfFirstSelectedPoint;
+    const pointColorer = this.legendPointColorer;
+
+    const pointColors = this.generatePointColorArray(
+        dataSet, pointColorer, this.distanceMetric, selectedSet, neighbors,
+        hoverIndex, this.renderLabelsIn3D, this.getSpriteImageMode());
+    const pointScaleFactors = this.generatePointScaleFactorArray(
+        dataSet, selectedSet, neighbors, hoverIndex);
+    const labels = this.generateVisibleLabelRenderParams(
+        dataSet, selectedSet, neighbors, hoverIndex);
+    const polylineColors =
+        this.generateLineSegmentColorMap(dataSet, pointColorer);
+    const polylineOpacities =
+        this.generateLineSegmentOpacityArray(dataSet, selectedSet);
+    const polylineWidths =
+        this.generateLineSegmentWidthArray(dataSet, selectedSet);
+
+    this.scatterPlot.setPointColors(pointColors);
+    this.scatterPlot.setPointScaleFactors(pointScaleFactors);
+    this.scatterPlot.setLabels(labels);
+    this.scatterPlot.setPolylineColors(polylineColors);
+    this.scatterPlot.setPolylineOpacities(polylineOpacities);
+    this.scatterPlot.setPolylineWidths(polylineWidths);
+  }
+
+  render() {
+    this.scatterPlot.render();
+  }
+
+  generatePointPositionArray(
+      ds: DataSet, projectionComponents: ProjectionComponents3D): Float32Array {
+    if (ds == null) {
+      return null;
+    }
+
+    const xScaler = d3.scaleLinear();
+    const yScaler = d3.scaleLinear();
+    let zScaler = null;
+    {
+      // Determine max and min of each axis of our data.
+      const xExtent = d3.extent(
+          ds.points,
+          (p, i) => ds.points[i].projections[projectionComponents[0]]);
+      const yExtent = d3.extent(
+          ds.points,
+          (p, i) => ds.points[i].projections[projectionComponents[1]]);
+
+      const range =
+          [-SCATTER_PLOT_CUBE_LENGTH / 2, SCATTER_PLOT_CUBE_LENGTH / 2];
+
+      xScaler.domain(xExtent).range(range);
+      yScaler.domain(yExtent).range(range);
+
+      if (projectionComponents[2] != null) {
+        const zExtent = d3.extent(
+            ds.points,
+            (p, i) => ds.points[i].projections[projectionComponents[2]]);
+        zScaler = d3.scaleLinear();
+        zScaler.domain(zExtent).range(range);
+      }
+    }
+
+    const positions = new Float32Array(ds.points.length * 3);
+    let dst = 0;
+
+    ds.points.forEach((d, i) => {
+      positions[dst++] =
+          xScaler(ds.points[i].projections[projectionComponents[0]]);
+      positions[dst++] =
+          yScaler(ds.points[i].projections[projectionComponents[1]]);
+      positions[dst++] = 0.0;
+    });
+
+    if (zScaler) {
+      dst = 2;
+      ds.points.forEach((d, i) => {
+        positions[dst] =
+            zScaler(ds.points[i].projections[projectionComponents[2]]);
+        dst += 3;
+      });
+    }
+
+    return positions;
+  }
+
+  generateVisibleLabelRenderParams(
+      ds: DataSet, selectedPointIndices: number[],
+      neighborsOfFirstPoint: NearestEntry[],
+      hoverPointIndex: number): LabelRenderParams {
+    if (ds == null) {
+      return null;
+    }
+
+    const selectedPointCount =
+        (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
+    const neighborCount =
+        (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
+    const n = selectedPointCount + neighborCount +
+        ((hoverPointIndex != null) ? 1 : 0);
+
+    const visibleLabels = new Uint32Array(n);
+    const scale = new Float32Array(n);
+    const opacityFlags = new Int8Array(n);
+    const fillColors = new Uint8Array(n * 3);
+    const strokeColors = new Uint8Array(n * 3);
+    const labelStrings: string[] = [];
+
+    scale.fill(LABEL_SCALE_DEFAULT);
+    opacityFlags.fill(1);
+
+    let dst = 0;
+
+    if (hoverPointIndex != null) {
+      labelStrings.push(
+          this.getLabelText(ds, hoverPointIndex, this.labelPointAccessor));
+      visibleLabels[dst] = hoverPointIndex;
+      scale[dst] = LABEL_SCALE_LARGE;
+      opacityFlags[dst] = 0;
+      const fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_HOVER);
+      packRgbIntoUint8Array(
+          fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
+      const strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_HOVER);
+      packRgbIntoUint8Array(
+          strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[1]);
+      ++dst;
+    }
+
+    // Selected points
+    {
+      const n = selectedPointCount;
+      const fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_SELECTED);
+      const strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_SELECTED);
+      for (let i = 0; i < n; ++i) {
+        const labelIndex = selectedPointIndices[i];
+        labelStrings.push(
+            this.getLabelText(ds, labelIndex, this.labelPointAccessor));
+        visibleLabels[dst] = labelIndex;
+        scale[dst] = LABEL_SCALE_LARGE;
+        opacityFlags[dst] = (n === 1) ? 0 : 1;
+        packRgbIntoUint8Array(
+            fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
+        packRgbIntoUint8Array(
+            strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[2]);
+        ++dst;
+      }
+    }
+
+    // Neighbors
+    {
+      const n = neighborCount;
+      const fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_NEIGHBOR);
+      const strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_NEIGHBOR);
+      for (let i = 0; i < n; ++i) {
+        const labelIndex = neighborsOfFirstPoint[i].index;
+        labelStrings.push(
+            this.getLabelText(ds, labelIndex, this.labelPointAccessor));
+        visibleLabels[dst] = labelIndex;
+        packRgbIntoUint8Array(
+            fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
+        packRgbIntoUint8Array(
+            strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[2]);
+        ++dst;
+      }
+    }
+
+    return new LabelRenderParams(
+        visibleLabels, labelStrings, scale, opacityFlags, LABEL_FONT_SIZE,
+        fillColors, strokeColors);
+  }
+
+  generatePointScaleFactorArray(
+      ds: DataSet, selectedPointIndices: number[],
+      neighborsOfFirstPoint: NearestEntry[],
+      hoverPointIndex: number): Float32Array {
+    if (ds == null) {
+      return new Float32Array(0);
+    }
+
+    const scale = new Float32Array(ds.points.length);
+    scale.fill(POINT_SCALE_DEFAULT);
+
+    const selectedPointCount =
+        (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
+    const neighborCount =
+        (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
+
+    // Scale up all selected points.
+    {
+      const n = selectedPointCount;
+      for (let i = 0; i < n; ++i) {
+        const p = selectedPointIndices[i];
+        scale[p] = POINT_SCALE_SELECTED;
+      }
+    }
+
+    // Scale up the neighbor points.
+    {
+      const n = neighborCount;
+      for (let i = 0; i < n; ++i) {
+        const p = neighborsOfFirstPoint[i].index;
+        scale[p] = POINT_SCALE_NEIGHBOR;
+      }
+    }
+
+    // Scale up the hover point.
+    if (hoverPointIndex != null) {
+      scale[hoverPointIndex] = POINT_SCALE_HOVER;
+    }
+
+    return scale;
+  }
+
+  generateLineSegmentColorMap(
+      ds: DataSet, legendPointColorer: (ds: DataSet, index: number) => string):
+      {[polylineIndex: number]: Float32Array} {
+    let polylineColorArrayMap: {[polylineIndex: number]: Float32Array} = {};
+    if (ds == null) {
+      return polylineColorArrayMap;
+    }
+
+    for (let i = 0; i < ds.sequences.length; i++) {
+      let sequence = ds.sequences[i];
+      let colors = new Float32Array(2 * (sequence.pointIndices.length - 1) * 3);
+      let colorIndex = 0;
+
+      if (legendPointColorer) {
+        for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
+          const c1 =
+              new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j]));
+          const c2 = new THREE.Color(
+              legendPointColorer(ds, sequence.pointIndices[j + 1]));
+          colors[colorIndex++] = c1.r;
+          colors[colorIndex++] = c1.g;
+          colors[colorIndex++] = c1.b;
+          colors[colorIndex++] = c2.r;
+          colors[colorIndex++] = c2.g;
+          colors[colorIndex++] = c2.b;
+        }
+      } else {
+        for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
+          const c1 =
+              getDefaultPointInPolylineColor(j, sequence.pointIndices.length);
+          const c2 = getDefaultPointInPolylineColor(
+              j + 1, sequence.pointIndices.length);
+          colors[colorIndex++] = c1.r;
+          colors[colorIndex++] = c1.g;
+          colors[colorIndex++] = c1.b;
+          colors[colorIndex++] = c2.r;
+          colors[colorIndex++] = c2.g;
+          colors[colorIndex++] = c2.b;
+        }
+      }
+
+      polylineColorArrayMap[i] = colors;
+    }
+
+    return polylineColorArrayMap;
+  }
+
+  generateLineSegmentOpacityArray(ds: DataSet, selectedPoints: number[]):
+      Float32Array {
+    if (ds == null) {
+      return new Float32Array(0);
+    }
+    const opacities = new Float32Array(ds.sequences.length);
+    const selectedPointCount =
+        (selectedPoints == null) ? 0 : selectedPoints.length;
+    if (selectedPointCount > 0) {
+      opacities.fill(POLYLINE_DESELECTED_OPACITY);
+      const i = ds.points[selectedPoints[0]].sequenceIndex;
+      opacities[i] = POLYLINE_SELECTED_OPACITY;
+    } else {
+      opacities.fill(POLYLINE_DEFAULT_OPACITY);
+    }
+    return opacities;
+  }
+
+  generateLineSegmentWidthArray(ds: DataSet, selectedPoints: number[]):
+      Float32Array {
+    if (ds == null) {
+      return new Float32Array(0);
+    }
+    const widths = new Float32Array(ds.sequences.length);
+    widths.fill(POLYLINE_DEFAULT_LINEWIDTH);
+    const selectedPointCount =
+        (selectedPoints == null) ? 0 : selectedPoints.length;
+    if (selectedPointCount > 0) {
+      const i = ds.points[selectedPoints[0]].sequenceIndex;
+      widths[i] = POLYLINE_SELECTED_LINEWIDTH;
+    }
+    return widths;
+  }
+
+  generatePointColorArray(
+      ds: DataSet, legendPointColorer: (ds: DataSet, index: number) => string,
+      distFunc: DistanceFunction, selectedPointIndices: number[],
+      neighborsOfFirstPoint: NearestEntry[], hoverPointIndex: number,
+      label3dMode: boolean, spriteImageMode: boolean): Float32Array {
+    if (ds == null) {
+      return new Float32Array(0);
+    }
+
+    const selectedPointCount =
+        (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
+    const neighborCount =
+        (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
+    const colors = new Float32Array(ds.points.length * 3);
+
+    let unselectedColor = POINT_COLOR_UNSELECTED;
+    let noSelectionColor = POINT_COLOR_NO_SELECTION;
+
+    if (label3dMode) {
+      unselectedColor = LABELS_3D_COLOR_UNSELECTED;
+      noSelectionColor = LABELS_3D_COLOR_NO_SELECTION;
+    }
+
+    if (spriteImageMode) {
+      unselectedColor = SPRITE_IMAGE_COLOR_UNSELECTED;
+      noSelectionColor = SPRITE_IMAGE_COLOR_NO_SELECTION;
+    }
+
+    // Give all points the unselected color.
+    {
+      const n = ds.points.length;
+      let dst = 0;
+      if (selectedPointCount > 0) {
+        const c = new THREE.Color(unselectedColor);
+        for (let i = 0; i < n; ++i) {
+          colors[dst++] = c.r;
+          colors[dst++] = c.g;
+          colors[dst++] = c.b;
+        }
+      } else {
+        if (legendPointColorer != null) {
+          for (let i = 0; i < n; ++i) {
+            const c = new THREE.Color(legendPointColorer(ds, i));
+            colors[dst++] = c.r;
+            colors[dst++] = c.g;
+            colors[dst++] = c.b;
+          }
+        } else {
+          const c = new THREE.Color(noSelectionColor);
+          for (let i = 0; i < n; ++i) {
+            colors[dst++] = c.r;
+            colors[dst++] = c.g;
+            colors[dst++] = c.b;
+          }
+        }
+      }
+    }
+
+    // Color the selected points.
+    {
+      const n = selectedPointCount;
+      const c = new THREE.Color(POINT_COLOR_SELECTED);
+      for (let i = 0; i < n; ++i) {
+        let dst = selectedPointIndices[i] * 3;
+        colors[dst++] = c.r;
+        colors[dst++] = c.g;
+        colors[dst++] = c.b;
+      }
+    }
+
+    // Color the neighbors.
+    {
+      const n = neighborCount;
+      let minDist = n > 0 ? neighborsOfFirstPoint[0].dist : 0;
+      for (let i = 0; i < n; ++i) {
+        const c = new THREE.Color(
+            dist2color(distFunc, neighborsOfFirstPoint[i].dist, minDist));
+        let dst = neighborsOfFirstPoint[i].index * 3;
+        colors[dst++] = c.r;
+        colors[dst++] = c.g;
+        colors[dst++] = c.b;
+      }
+    }
+
+    // Color the hover point.
+    if (hoverPointIndex != null) {
+      const c = new THREE.Color(POINT_COLOR_HOVER);
+      let dst = hoverPointIndex * 3;
+      colors[dst++] = c.r;
+      colors[dst++] = c.g;
+      colors[dst++] = c.b;
+    }
+
+    return colors;
+  }
+
+  generate3DLabelsArray(ds: DataSet, accessor: string) {
+    if ((ds == null) || (accessor == null)) {
+      return null;
+    }
+    let labels: string[] = [];
+    const n = ds.points.length;
+    for (let i = 0; i < n; ++i) {
+      labels.push(this.getLabelText(ds, i, accessor));
+    }
+    return labels;
+  }
+
+  private getLabelText(ds: DataSet, i: number, accessor: string) {
+    return ds.points[i].metadata[accessor].toString();
+  }
+
+  private updateScatterPlotWithNewProjection(projection: Projection) {
+    if (projection == null) {
+      this.createVisualizers(this.renderLabelsIn3D);
+      this.scatterPlot.render();
+      return;
+    }
+    this.setDataSet(projection.dataSet);
+    this.scatterPlot.setDimensions(projection.dimensionality);
+    if (projection.dataSet.projectionCanBeRendered(projection.projectionType)) {
+      this.updateScatterPlotAttributes();
+      this.notifyProjectionPositionsUpdated();
+    }
+    this.scatterPlot.setCameraParametersForNextCameraCreation(null, false);
+  }
+
+  private createVisualizers(inLabels3DMode: boolean) {
+    const ds = (this.projection == null) ? null : this.projection.dataSet;
+    const scatterPlot = this.scatterPlot;
+    scatterPlot.removeAllVisualizers();
+    this.labels3DVisualizer = null;
+    this.canvasLabelsVisualizer = null;
+    this.spriteVisualizer = null;
+    this.polylineVisualizer = null;
+    if (inLabels3DMode) {
+      this.labels3DVisualizer = new ScatterPlotVisualizer3DLabels();
+      this.labels3DVisualizer.setLabelStrings(
+          this.generate3DLabelsArray(ds, this.labelPointAccessor));
+    } else {
+      this.spriteVisualizer = new ScatterPlotVisualizerSprites();
+      scatterPlot.addVisualizer(this.spriteVisualizer);
+      this.canvasLabelsVisualizer =
+          new ScatterPlotVisualizerCanvasLabels(this.scatterPlotContainer);
+    }
+    this.polylineVisualizer = new ScatterPlotVisualizerPolylines();
+    this.setDataSet(ds);
+    if (this.spriteVisualizer) {
+      scatterPlot.addVisualizer(this.spriteVisualizer);
+    }
+    if (this.labels3DVisualizer) {
+      scatterPlot.addVisualizer(this.labels3DVisualizer);
+    }
+    if (this.canvasLabelsVisualizer) {
+      scatterPlot.addVisualizer(this.canvasLabelsVisualizer);
+    }
+    scatterPlot.addVisualizer(this.polylineVisualizer);
+  }
+
+  private getSpriteImageMode(): boolean {
+    if (this.projection == null) {
+      return false;
+    }
+    const ds = this.projection.dataSet;
+    if ((ds == null) || (ds.spriteAndMetadataInfo == null)) {
+      return false;
+    }
+    return ds.spriteAndMetadataInfo.spriteImage != null;
+  }
+}
+
+function packRgbIntoUint8Array(
+    rgbArray: Uint8Array, labelIndex: number, r: number, g: number, b: number) {
+  rgbArray[labelIndex * 3] = r;
+  rgbArray[labelIndex * 3 + 1] = g;
+  rgbArray[labelIndex * 3 + 2] = b;
+}
+
+function styleRgbFromHexColor(hex: number): [number, number, number] {
+  const c = new THREE.Color(hex);
+  return [(c.r * 255) | 0, (c.g * 255) | 0, (c.b * 255) | 0];
+}
+
+function getDefaultPointInPolylineColor(
+    index: number, totalPoints: number): THREE.Color {
+  let hue = POLYLINE_START_HUE +
+      (POLYLINE_END_HUE - POLYLINE_START_HUE) * index / totalPoints;
+
+  let rgb = d3.hsl(hue, POLYLINE_SATURATION, POLYLINE_LIGHTNESS).rgb();
+  return new THREE.Color(rgb.r / 255, rgb.g / 255, rgb.b / 255);
+}
+
+/**
+ * Normalizes the distance so it can be visually encoded with color.
+ * The normalization depends on the distance metric (cosine vs euclidean).
+ */
+export function normalizeDist(
+    distFunc: DistanceFunction, d: number, minDist: number): number {
+  return (distFunc === vector.dist) ? (minDist / d) : (1 - d);
+}
+
+/** Normalizes and encodes the provided distance with color. */
+export function dist2color(
+    distFunc: DistanceFunction, d: number, minDist: number): string {
+  return NN_COLOR_SCALE(normalizeDist(distFunc, d, minDist));
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/renderContext.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/renderContext.ts
new file mode 100644
index 0000000000..8d5232a804
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/renderContext.ts
@@ -0,0 +1,53 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http:www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * LabelRenderParams describes the set of points that should have labels
+ * rendered next to them.
+ */
+export class LabelRenderParams {
+  constructor(
+      public pointIndices: Float32Array, public labelStrings: string[],
+      public scaleFactors: Float32Array, public useSceneOpacityFlags: Int8Array,
+      public defaultFontSize: number, public fillColors: Uint8Array,
+      public strokeColors: Uint8Array) {}
+}
+
+/** Details about the camera projection being used to render the scene. */
+export enum CameraType {
+  Perspective,
+  Orthographic
+}
+
+/**
+ * RenderContext contains all of the state required to color and render the data
+ * set. ScatterPlot passes this to every attached visualizer as part of the
+ * render callback.
+ * TODO(nicholsonc): This should only contain the data that's changed between
+ * each frame. Data like colors / scale factors / labels should be reapplied
+ * only when they change.
+ */
+export class RenderContext {
+  constructor(
+      public camera: THREE.Camera, public cameraType: CameraType,
+      public cameraTarget: THREE.Vector3, public screenWidth: number,
+      public screenHeight: number, public nearestCameraSpacePointZ: number,
+      public farthestCameraSpacePointZ: number, public backgroundColor: number,
+      public pointColors: Float32Array, public pointScaleFactors: Float32Array,
+      public labels: LabelRenderParams,
+      public polylineColors: {[polylineIndex: number]: Float32Array},
+      public polylineOpacities: Float32Array,
+      public polylineWidths: Float32Array) {}
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlot.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlot.ts
new file mode 100644
index 0000000000..283b608e83
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlot.ts
@@ -0,0 +1,723 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {ProjectorEventContext} from './projectorEventContext';
+import {CameraType, LabelRenderParams, RenderContext} from './renderContext';
+import {BoundingBox, ScatterPlotRectangleSelector} from './scatterPlotRectangleSelector';
+import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
+import * as util from './util';
+import {Point2D, Point3D} from './vector';
+
+const BACKGROUND_COLOR = 0xffffff;
+
+/**
+ * The length of the cube (diameter of the circumscribing sphere) where all the
+ * points live.
+ */
+const CUBE_LENGTH = 2;
+const MAX_ZOOM = 5 * CUBE_LENGTH;
+const MIN_ZOOM = 0.025 * CUBE_LENGTH;
+
+// Constants relating to the camera parameters.
+const PERSP_CAMERA_FOV_VERTICAL = 70;
+const PERSP_CAMERA_NEAR_CLIP_PLANE = 0.01;
+const PERSP_CAMERA_FAR_CLIP_PLANE = 100;
+const ORTHO_CAMERA_FRUSTUM_HALF_EXTENT = 1.2;
+
+// Key presses.
+const SHIFT_KEY = 16;
+const CTRL_KEY = 17;
+
+const START_CAMERA_POS_3D = new THREE.Vector3(0.45, 0.9, 1.6);
+const START_CAMERA_TARGET_3D = new THREE.Vector3(0, 0, 0);
+const START_CAMERA_POS_2D = new THREE.Vector3(0, 0, 4);
+const START_CAMERA_TARGET_2D = new THREE.Vector3(0, 0, 0);
+
+const ORBIT_MOUSE_ROTATION_SPEED = 1;
+const ORBIT_ANIMATION_ROTATION_CYCLE_IN_SECONDS = 7;
+
+export type OnCameraMoveListener =
+    (cameraPosition: THREE.Vector3, cameraTarget: THREE.Vector3) => void;
+
+/** Supported modes of interaction. */
+export enum MouseMode {
+  AREA_SELECT,
+  CAMERA_AND_CLICK_SELECT
+}
+
+/** Defines a camera, suitable for serialization. */
+export class CameraDef {
+  orthographic: boolean = false;
+  position: Point3D;
+  target: Point3D;
+  zoom: number;
+}
+
+/**
+ * Maintains a three.js instantiation and context,
+ * animation state, and all other logic that's
+ * independent of how a 3D scatter plot is actually rendered. Also holds an
+ * array of visualizers and dispatches application events to them.
+ */
+export class ScatterPlot {
+  private visualizers: ScatterPlotVisualizer[] = [];
+
+  private onCameraMoveListeners: OnCameraMoveListener[] = [];
+
+  private height: number;
+  private width: number;
+
+  private mouseMode: MouseMode;
+  private backgroundColor: number = BACKGROUND_COLOR;
+
+  private dimensionality: number = 3;
+  private renderer: THREE.WebGLRenderer;
+
+  private scene: THREE.Scene;
+  private pickingTexture: THREE.WebGLRenderTarget;
+  private light: THREE.PointLight;
+
+  private cameraDef: CameraDef = null;
+  private camera: THREE.Camera;
+  private orbitAnimationOnNextCameraCreation: boolean = false;
+  private orbitCameraControls: any;
+  private orbitAnimationId: number;
+
+  private worldSpacePointPositions: Float32Array;
+  private pointColors: Float32Array;
+  private pointScaleFactors: Float32Array;
+  private labels: LabelRenderParams;
+  private polylineColors: {[polylineIndex: number]: Float32Array};
+  private polylineOpacities: Float32Array;
+  private polylineWidths: Float32Array;
+
+  private selecting = false;
+  private nearestPoint: number;
+  private mouseIsDown = false;
+  private isDragSequence = false;
+  private rectangleSelector: ScatterPlotRectangleSelector;
+
+  constructor(
+      private container: HTMLElement,
+      private projectorEventContext: ProjectorEventContext) {
+    this.getLayoutValues();
+
+    this.scene = new THREE.Scene();
+    this.renderer = new THREE.WebGLRenderer(
+        {alpha: true, premultipliedAlpha: false, antialias: false});
+    this.renderer.setClearColor(BACKGROUND_COLOR, 1);
+    this.container.appendChild(this.renderer.domElement);
+    this.light = new THREE.PointLight(0xFFECBF, 1, 0);
+    this.scene.add(this.light);
+
+    this.setDimensions(3);
+    this.recreateCamera(this.makeDefaultCameraDef(this.dimensionality));
+    this.renderer.render(this.scene, this.camera);
+
+    this.rectangleSelector = new ScatterPlotRectangleSelector(
+        this.container,
+        (boundingBox: BoundingBox) => this.selectBoundingBox(boundingBox));
+    this.addInteractionListeners();
+  }
+
+  private addInteractionListeners() {
+    this.container.addEventListener('mousemove', this.onMouseMove.bind(this));
+    this.container.addEventListener('mousedown', this.onMouseDown.bind(this));
+    this.container.addEventListener('mouseup', this.onMouseUp.bind(this));
+    this.container.addEventListener('click', this.onClick.bind(this));
+    window.addEventListener('keydown', this.onKeyDown.bind(this), false);
+    window.addEventListener('keyup', this.onKeyUp.bind(this), false);
+  }
+
+  private addCameraControlsEventListeners(cameraControls: any) {
+    // Start is called when the user stars interacting with
+    // controls.
+    cameraControls.addEventListener('start', () => {
+      this.stopOrbitAnimation();
+      this.onCameraMoveListeners.forEach(
+          l => l(this.camera.position, cameraControls.target));
+    });
+
+    // Change is called everytime the user interacts with the controls.
+    cameraControls.addEventListener('change', () => {
+      this.render();
+    });
+
+    // End is called when the user stops interacting with the
+    // controls (e.g. on mouse up, after dragging).
+    cameraControls.addEventListener('end', () => {});
+  }
+
+  private makeOrbitControls(
+      camera: THREE.Camera, cameraDef: CameraDef, cameraIs3D: boolean) {
+    if (this.orbitCameraControls != null) {
+      this.orbitCameraControls.dispose();
+    }
+    const occ =
+        new (THREE as any).OrbitControls(camera, this.renderer.domElement);
+    occ.target0 = new THREE.Vector3(
+        cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
+    occ.position0 = new THREE.Vector3().copy(camera.position);
+    occ.zoom0 = cameraDef.zoom;
+    occ.enableRotate = cameraIs3D;
+    occ.autoRotate = false;
+    occ.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
+    if (cameraIs3D) {
+      occ.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
+      occ.mouseButtons.PAN = THREE.MOUSE.RIGHT;
+    } else {
+      occ.mouseButtons.ORBIT = null;
+      occ.mouseButtons.PAN = THREE.MOUSE.LEFT;
+    }
+    occ.reset();
+
+    this.camera = camera;
+    this.orbitCameraControls = occ;
+    this.addCameraControlsEventListeners(this.orbitCameraControls);
+  }
+
+  private makeCamera3D(cameraDef: CameraDef, w: number, h: number) {
+    let camera: THREE.PerspectiveCamera;
+    {
+      const aspectRatio = w / h;
+      camera = new THREE.PerspectiveCamera(
+          PERSP_CAMERA_FOV_VERTICAL, aspectRatio, PERSP_CAMERA_NEAR_CLIP_PLANE,
+          PERSP_CAMERA_FAR_CLIP_PLANE);
+      camera.position.set(
+          cameraDef.position[0], cameraDef.position[1], cameraDef.position[2]);
+      const at = new THREE.Vector3(
+          cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
+      camera.lookAt(at);
+      camera.zoom = cameraDef.zoom;
+      camera.updateProjectionMatrix();
+    }
+    this.camera = camera;
+    this.makeOrbitControls(camera, cameraDef, true);
+  }
+
+  private makeCamera2D(cameraDef: CameraDef, w: number, h: number) {
+    let camera: THREE.OrthographicCamera;
+    const target = new THREE.Vector3(
+        cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
+    {
+      const aspectRatio = w / h;
+      let left = -ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
+      let right = ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
+      let bottom = -ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
+      let top = ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
+      // Scale up the larger of (w, h) to match the aspect ratio.
+      if (aspectRatio > 1) {
+        left *= aspectRatio;
+        right *= aspectRatio;
+      } else {
+        top /= aspectRatio;
+        bottom /= aspectRatio;
+      }
+      camera =
+          new THREE.OrthographicCamera(left, right, top, bottom, -1000, 1000);
+      camera.position.set(
+          cameraDef.position[0], cameraDef.position[1], cameraDef.position[2]);
+      camera.up = new THREE.Vector3(0, 1, 0);
+      camera.lookAt(target);
+      camera.zoom = cameraDef.zoom;
+      camera.updateProjectionMatrix();
+    }
+    this.camera = camera;
+    this.makeOrbitControls(camera, cameraDef, false);
+  }
+
+  private makeDefaultCameraDef(dimensionality: number): CameraDef {
+    const def = new CameraDef();
+    def.orthographic = (dimensionality === 2);
+    def.zoom = 1.0;
+    if (def.orthographic) {
+      def.position =
+          [START_CAMERA_POS_2D.x, START_CAMERA_POS_2D.y, START_CAMERA_POS_2D.z];
+      def.target = [
+        START_CAMERA_TARGET_2D.x, START_CAMERA_TARGET_2D.y,
+        START_CAMERA_TARGET_2D.z
+      ];
+    } else {
+      def.position =
+          [START_CAMERA_POS_3D.x, START_CAMERA_POS_3D.y, START_CAMERA_POS_3D.z];
+      def.target = [
+        START_CAMERA_TARGET_3D.x, START_CAMERA_TARGET_3D.y,
+        START_CAMERA_TARGET_3D.z
+      ];
+    }
+    return def;
+  }
+
+  /** Recreate the scatter plot camera from a definition structure. */
+  recreateCamera(cameraDef: CameraDef) {
+    if (cameraDef.orthographic) {
+      this.makeCamera2D(cameraDef, this.width, this.height);
+    } else {
+      this.makeCamera3D(cameraDef, this.width, this.height);
+    }
+    this.orbitCameraControls.minDistance = MIN_ZOOM;
+    this.orbitCameraControls.maxDistance = MAX_ZOOM;
+    this.orbitCameraControls.update();
+    if (this.orbitAnimationOnNextCameraCreation) {
+      this.startOrbitAnimation();
+    }
+  }
+
+  private onClick(e?: MouseEvent, notify = true) {
+    if (e && this.selecting) {
+      return;
+    }
+    // Only call event handlers if the click originated from the scatter plot.
+    if (!this.isDragSequence && notify) {
+      const selection = (this.nearestPoint != null) ? [this.nearestPoint] : [];
+      this.projectorEventContext.notifySelectionChanged(selection);
+    }
+    this.isDragSequence = false;
+    this.render();
+  }
+
+  private onMouseDown(e: MouseEvent) {
+    this.isDragSequence = false;
+    this.mouseIsDown = true;
+    if (this.selecting) {
+      this.orbitCameraControls.enabled = false;
+      this.rectangleSelector.onMouseDown(e.offsetX, e.offsetY);
+      this.setNearestPointToMouse(e);
+    } else if (
+        !e.ctrlKey && this.sceneIs3D() &&
+        this.orbitCameraControls.mouseButtons.ORBIT === THREE.MOUSE.RIGHT) {
+      // The user happened to press the ctrl key when the tab was active,
+      // unpressed the ctrl when the tab was inactive, and now he/she
+      // is back to the projector tab.
+      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
+      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.RIGHT;
+    } else if (
+        e.ctrlKey && this.sceneIs3D() &&
+        this.orbitCameraControls.mouseButtons.ORBIT === THREE.MOUSE.LEFT) {
+      // Similarly to the situation above.
+      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.RIGHT;
+      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.LEFT;
+    }
+  }
+
+  /** When we stop dragging/zooming, return to normal behavior. */
+  private onMouseUp(e: any) {
+    if (this.selecting) {
+      this.orbitCameraControls.enabled = true;
+      this.rectangleSelector.onMouseUp();
+      this.render();
+    }
+    this.mouseIsDown = false;
+  }
+
+  /**
+   * When the mouse moves, find the nearest point (if any) and send it to the
+   * hoverlisteners (usually called from embedding.ts)
+   */
+  private onMouseMove(e: MouseEvent) {
+    this.isDragSequence = this.mouseIsDown;
+    // Depending if we're selecting or just navigating, handle accordingly.
+    if (this.selecting && this.mouseIsDown) {
+      this.rectangleSelector.onMouseMove(e.offsetX, e.offsetY);
+      this.render();
+    } else if (!this.mouseIsDown) {
+      this.setNearestPointToMouse(e);
+      this.projectorEventContext.notifyHoverOverPoint(this.nearestPoint);
+    }
+  }
+
+  /** For using ctrl + left click as right click, and for circle select */
+  private onKeyDown(e: any) {
+    // If ctrl is pressed, use left click to orbit
+    if (e.keyCode === CTRL_KEY && this.sceneIs3D()) {
+      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.RIGHT;
+      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.LEFT;
+    }
+
+    // If shift is pressed, start selecting
+    if (e.keyCode === SHIFT_KEY) {
+      this.selecting = true;
+      this.container.style.cursor = 'crosshair';
+    }
+  }
+
+  /** For using ctrl + left click as right click, and for circle select */
+  private onKeyUp(e: any) {
+    if (e.keyCode === CTRL_KEY && this.sceneIs3D()) {
+      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
+      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.RIGHT;
+    }
+
+    // If shift is released, stop selecting
+    if (e.keyCode === SHIFT_KEY) {
+      this.selecting = (this.getMouseMode() === MouseMode.AREA_SELECT);
+      if (!this.selecting) {
+        this.container.style.cursor = 'default';
+      }
+      this.render();
+    }
+  }
+
+  /**
+   * Returns a list of indices of points in a bounding box from the picking
+   * texture.
+   * @param boundingBox The bounding box to select from.
+   */
+  private getPointIndicesFromPickingTexture(boundingBox: BoundingBox):
+      number[] {
+    if (this.worldSpacePointPositions == null) {
+      return null;
+    }
+    const pointCount = this.worldSpacePointPositions.length / 3;
+    const dpr = window.devicePixelRatio || 1;
+    const x = Math.floor(boundingBox.x * dpr);
+    const y = Math.floor(boundingBox.y * dpr);
+    const width = Math.floor(boundingBox.width * dpr);
+    const height = Math.floor(boundingBox.height * dpr);
+
+    // Create buffer for reading all of the pixels from the texture.
+    let pixelBuffer = new Uint8Array(width * height * 4);
+
+    // Read the pixels from the bounding box.
+    this.renderer.readRenderTargetPixels(
+        this.pickingTexture, x, this.pickingTexture.height - y, width, height,
+        pixelBuffer);
+
+    // Keep a flat list of each point and whether they are selected or not. This
+    // approach is more efficient than using an object keyed by the index.
+    let pointIndicesSelection =
+        new Uint8Array(this.worldSpacePointPositions.length);
+    for (let i = 0; i < width * height; i++) {
+      const id = (pixelBuffer[i * 4] << 16) | (pixelBuffer[i * 4 + 1] << 8) |
+          pixelBuffer[i * 4 + 2];
+      if (id !== 0xffffff && (id < pointCount)) {
+        pointIndicesSelection[id] = 1;
+      }
+    }
+    let pointIndices: number[] = [];
+    for (let i = 0; i < pointIndicesSelection.length; i++) {
+      if (pointIndicesSelection[i] === 1) {
+        pointIndices.push(i);
+      }
+    }
+
+    return pointIndices;
+  }
+
+
+  private selectBoundingBox(boundingBox: BoundingBox) {
+    let pointIndices = this.getPointIndicesFromPickingTexture(boundingBox);
+    this.projectorEventContext.notifySelectionChanged(pointIndices);
+  }
+
+  private setNearestPointToMouse(e: MouseEvent) {
+    if (this.pickingTexture == null) {
+      this.nearestPoint = null;
+      return;
+    }
+    const boundingBox:
+        BoundingBox = {x: e.offsetX, y: e.offsetY, width: 1, height: 1};
+    const pointIndices = this.getPointIndicesFromPickingTexture(boundingBox);
+    this.nearestPoint = (pointIndices != null) ? pointIndices[0] : null;
+  }
+
+  private getLayoutValues(): Point2D {
+    this.width = this.container.offsetWidth;
+    this.height = Math.max(1, this.container.offsetHeight);
+    return [this.width, this.height];
+  }
+
+  private sceneIs3D(): boolean {
+    return this.dimensionality === 3;
+  }
+
+  private remove3dAxisFromScene(): THREE.Object3D {
+    const axes = this.scene.getObjectByName('axes');
+    if (axes != null) {
+      this.scene.remove(axes);
+    }
+    return axes;
+  }
+
+  private add3dAxis() {
+    const axes = new THREE.AxisHelper();
+    axes.name = 'axes';
+    this.scene.add(axes);
+  }
+
+  /** Set 2d vs 3d mode. */
+  setDimensions(dimensionality: number) {
+    if ((dimensionality !== 2) && (dimensionality !== 3)) {
+      throw new RangeError('dimensionality must be 2 or 3');
+    }
+    this.dimensionality = dimensionality;
+
+    const def = this.cameraDef || this.makeDefaultCameraDef(dimensionality);
+    this.recreateCamera(def);
+
+    this.remove3dAxisFromScene();
+    if (dimensionality === 3) {
+      this.add3dAxis();
+    }
+  }
+
+  /** Gets the current camera information, suitable for serialization. */
+  getCameraDef(): CameraDef {
+    const def = new CameraDef();
+    const pos = this.camera.position;
+    const tgt = this.orbitCameraControls.target;
+    def.orthographic = !this.sceneIs3D();
+    def.position = [pos.x, pos.y, pos.z];
+    def.target = [tgt.x, tgt.y, tgt.z];
+    def.zoom = (this.camera as any).zoom;
+    return def;
+  }
+
+  /** Sets parameters for the next camera recreation. */
+  setCameraParametersForNextCameraCreation(
+      def: CameraDef, orbitAnimation: boolean) {
+    this.cameraDef = def;
+    this.orbitAnimationOnNextCameraCreation = orbitAnimation;
+  }
+
+  /** Gets the current camera position. */
+  getCameraPosition(): Point3D {
+    const currPos = this.camera.position;
+    return [currPos.x, currPos.y, currPos.z];
+  }
+
+  /** Gets the current camera target. */
+  getCameraTarget(): Point3D {
+    let currTarget = this.orbitCameraControls.target;
+    return [currTarget.x, currTarget.y, currTarget.z];
+  }
+
+  /** Sets up the camera from given position and target coordinates. */
+  setCameraPositionAndTarget(position: Point3D, target: Point3D) {
+    this.stopOrbitAnimation();
+    this.camera.position.set(position[0], position[1], position[2]);
+    this.orbitCameraControls.target.set(target[0], target[1], target[2]);
+    this.orbitCameraControls.update();
+    this.render();
+  }
+
+  /** Starts orbiting the camera around its current lookat target. */
+  startOrbitAnimation() {
+    if (!this.sceneIs3D()) {
+      return;
+    }
+    if (this.orbitAnimationId != null) {
+      this.stopOrbitAnimation();
+    }
+    this.orbitCameraControls.autoRotate = true;
+    this.orbitCameraControls.rotateSpeed =
+        ORBIT_ANIMATION_ROTATION_CYCLE_IN_SECONDS;
+    this.updateOrbitAnimation();
+  }
+
+  private updateOrbitAnimation() {
+    this.orbitCameraControls.update();
+    this.orbitAnimationId =
+        requestAnimationFrame(() => this.updateOrbitAnimation());
+  }
+
+  /** Stops the orbiting animation on the camera. */
+  stopOrbitAnimation() {
+    this.orbitCameraControls.autoRotate = false;
+    this.orbitCameraControls.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
+    if (this.orbitAnimationId != null) {
+      cancelAnimationFrame(this.orbitAnimationId);
+      this.orbitAnimationId = null;
+    }
+  }
+
+  /** Adds a visualizer to the set, will start dispatching events to it */
+  addVisualizer(visualizer: ScatterPlotVisualizer) {
+    if (this.scene) {
+      visualizer.setScene(this.scene);
+    }
+    visualizer.onResize(this.width, this.height);
+    visualizer.onPointPositionsChanged(this.worldSpacePointPositions);
+    this.visualizers.push(visualizer);
+  }
+
+  /** Removes all visualizers attached to this scatter plot. */
+  removeAllVisualizers() {
+    this.visualizers.forEach(v => v.dispose());
+    this.visualizers = [];
+  }
+
+  /** Update scatter plot with a new array of packed xyz point positions. */
+  setPointPositions(worldSpacePointPositions: Float32Array) {
+    this.worldSpacePointPositions = worldSpacePointPositions;
+    this.visualizers.forEach(
+        v => v.onPointPositionsChanged(worldSpacePointPositions));
+  }
+
+  render() {
+    {
+      const lightPos = this.camera.position.clone();
+      lightPos.x += 1;
+      lightPos.y += 1;
+      this.light.position.set(lightPos.x, lightPos.y, lightPos.z);
+    }
+
+    const cameraType = (this.camera instanceof THREE.PerspectiveCamera) ?
+        CameraType.Perspective :
+        CameraType.Orthographic;
+
+    let cameraSpacePointExtents: [number, number] = [0, 0];
+    if (this.worldSpacePointPositions != null) {
+      cameraSpacePointExtents = util.getNearFarPoints(
+          this.worldSpacePointPositions, this.camera.position,
+          this.orbitCameraControls.target);
+    }
+
+    const rc = new RenderContext(
+        this.camera, cameraType, this.orbitCameraControls.target, this.width,
+        this.height, cameraSpacePointExtents[0], cameraSpacePointExtents[1],
+        this.backgroundColor, this.pointColors, this.pointScaleFactors,
+        this.labels, this.polylineColors, this.polylineOpacities,
+        this.polylineWidths);
+
+    // Render first pass to picking target. This render fills pickingTexture
+    // with colors that are actually point ids, so that sampling the texture at
+    // the mouse's current x,y coordinates will reveal the data point that the
+    // mouse is over.
+    this.visualizers.forEach(v => v.onPickingRender(rc));
+
+    {
+      const axes = this.remove3dAxisFromScene();
+      this.renderer.render(this.scene, this.camera, this.pickingTexture);
+      if (axes != null) {
+        this.scene.add(axes);
+      }
+    }
+
+    // Render second pass to color buffer, to be displayed on the canvas.
+    this.visualizers.forEach(v => v.onRender(rc));
+
+    this.renderer.render(this.scene, this.camera);
+  }
+
+  setMouseMode(mouseMode: MouseMode) {
+    this.mouseMode = mouseMode;
+    if (mouseMode === MouseMode.AREA_SELECT) {
+      this.selecting = true;
+      this.container.style.cursor = 'crosshair';
+    } else {
+      this.selecting = false;
+      this.container.style.cursor = 'default';
+    }
+  }
+
+  /** Set the colors for every data point. (RGB triplets) */
+  setPointColors(colors: Float32Array) {
+    this.pointColors = colors;
+  }
+
+  /** Set the scale factors for every data point. (scalars) */
+  setPointScaleFactors(scaleFactors: Float32Array) {
+    this.pointScaleFactors = scaleFactors;
+  }
+
+  /** Set the labels to rendered */
+  setLabels(labels: LabelRenderParams) {
+    this.labels = labels;
+  }
+
+  /** Set the colors for every data polyline. (RGB triplets) */
+  setPolylineColors(colors: {[polylineIndex: number]: Float32Array}) {
+    this.polylineColors = colors;
+  }
+
+  setPolylineOpacities(opacities: Float32Array) {
+    this.polylineOpacities = opacities;
+  }
+
+  setPolylineWidths(widths: Float32Array) {
+    this.polylineWidths = widths;
+  }
+
+  getMouseMode(): MouseMode {
+    return this.mouseMode;
+  }
+
+  resetZoom() {
+    this.recreateCamera(this.makeDefaultCameraDef(this.dimensionality));
+    this.render();
+  }
+
+  setDayNightMode(isNight: boolean) {
+    const canvases = this.container.querySelectorAll('canvas');
+    const filterValue = isNight ? 'invert(100%)' : null;
+    for (let i = 0; i < canvases.length; i++) {
+      canvases[i].style.filter = filterValue;
+    }
+  }
+
+  resize(render = true) {
+    const [oldW, oldH] = [this.width, this.height];
+    const [newW, newH] = this.getLayoutValues();
+
+    if (this.dimensionality === 3) {
+      const camera = (this.camera as THREE.PerspectiveCamera);
+      camera.aspect = newW / newH;
+      camera.updateProjectionMatrix();
+    } else {
+      const camera = (this.camera as THREE.OrthographicCamera);
+      // Scale the ortho frustum by however much the window changed.
+      const scaleW = newW / oldW;
+      const scaleH = newH / oldH;
+      const newCamHalfWidth = ((camera.right - camera.left) * scaleW) / 2;
+      const newCamHalfHeight = ((camera.top - camera.bottom) * scaleH) / 2;
+      camera.top = newCamHalfHeight;
+      camera.bottom = -newCamHalfHeight;
+      camera.left = -newCamHalfWidth;
+      camera.right = newCamHalfWidth;
+      camera.updateProjectionMatrix();
+    }
+
+    // Accouting for retina displays.
+    const dpr = window.devicePixelRatio || 1;
+    this.renderer.setPixelRatio(dpr);
+    this.renderer.setSize(newW, newH);
+
+    // the picking texture needs to be exactly the same as the render texture.
+    {
+      const renderCanvasSize = this.renderer.getSize();
+      const pixelRatio = this.renderer.getPixelRatio();
+      this.pickingTexture = new THREE.WebGLRenderTarget(
+          renderCanvasSize.width * pixelRatio,
+          renderCanvasSize.height * pixelRatio);
+      this.pickingTexture.texture.minFilter = THREE.LinearFilter;
+    }
+
+    this.visualizers.forEach(v => v.onResize(newW, newH));
+
+    if (render) {
+      this.render();
+    };
+  }
+
+  onCameraMove(listener: OnCameraMoveListener) {
+    this.onCameraMoveListeners.push(listener);
+  }
+
+  clickOnPoint(pointIndex: number) {
+    this.nearestPoint = pointIndex;
+    this.onClick(null, false);
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector.ts
new file mode 100644
index 0000000000..a781877014
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector.ts
@@ -0,0 +1,107 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+const FILL = '#dddddd';
+const FILL_OPACITY = .2;
+const STROKE = '#aaaaaa';
+const STROKE_WIDTH = 2;
+const STROKE_DASHARRAY = '10 5';
+
+export interface BoundingBox {
+  // The bounding box (x, y) position refers to the bottom left corner of the
+  // rect.
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+/**
+ * A class that manages and renders a data selection rectangle.
+ */
+export class ScatterPlotRectangleSelector {
+  private svgElement: SVGElement;
+  private rectElement: SVGRectElement;
+
+  private isMouseDown: boolean;
+  private startCoordinates: [number, number];
+  private lastBoundingBox: BoundingBox;
+
+  private selectionCallback: (boundingBox: BoundingBox) => void;
+
+  /**
+   * @param container The container HTML element that the selection SVG rect
+   *     will be a child of.
+   * @param selectionCallback The callback that accepts a bounding box to be
+   *     called when selection changes. Currently, we only call the callback on
+   *     mouseUp.
+   */
+  constructor(
+      container: HTMLElement,
+      selectionCallback: (boundingBox: BoundingBox) => void) {
+    this.svgElement = container.querySelector('#selector') as SVGElement;
+    this.rectElement =
+        document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+    this.rectElement.style.stroke = STROKE;
+    this.rectElement.style.strokeDasharray = STROKE_DASHARRAY;
+    this.rectElement.style.strokeWidth = '' + STROKE_WIDTH;
+    this.rectElement.style.fill = FILL;
+    this.rectElement.style.fillOpacity = '' + FILL_OPACITY;
+    this.svgElement.appendChild(this.rectElement);
+
+    this.selectionCallback = selectionCallback;
+    this.isMouseDown = false;
+  }
+
+  onMouseDown(offsetX: number, offsetY: number) {
+    this.isMouseDown = true;
+    this.rectElement.style.display = 'block';
+
+    this.startCoordinates = [offsetX, offsetY];
+    this.lastBoundingBox = {
+      x: this.startCoordinates[0],
+      y: this.startCoordinates[1],
+      width: 1,
+      height: 1
+    };
+  }
+
+  onMouseMove(offsetX: number, offsetY: number) {
+    if (!this.isMouseDown) {
+      return;
+    }
+
+    this.lastBoundingBox.x = Math.min(offsetX, this.startCoordinates[0]);
+    this.lastBoundingBox.y = Math.max(offsetY, this.startCoordinates[1]);
+    this.lastBoundingBox.width =
+        Math.max(offsetX, this.startCoordinates[0]) - this.lastBoundingBox.x;
+    this.lastBoundingBox.height =
+        this.lastBoundingBox.y - Math.min(offsetY, this.startCoordinates[1]);
+
+    this.rectElement.setAttribute('x', '' + this.lastBoundingBox.x);
+    this.rectElement.setAttribute(
+        'y', '' + (this.lastBoundingBox.y - this.lastBoundingBox.height));
+    this.rectElement.setAttribute('width', '' + this.lastBoundingBox.width);
+    this.rectElement.setAttribute('height', '' + this.lastBoundingBox.height);
+  }
+
+  onMouseUp() {
+    this.isMouseDown = false;
+    this.rectElement.style.display = 'none';
+    this.rectElement.setAttribute('width', '0');
+    this.rectElement.setAttribute('height', '0');
+    this.selectionCallback(this.lastBoundingBox);
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector_test.ts
new file mode 100644
index 0000000000..91cb10a97e
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector_test.ts
@@ -0,0 +1,69 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {BoundingBox, ScatterPlotRectangleSelector} from './scatterPlotRectangleSelector';
+
+describe('selector callbacks make bounding box start bottom left', () => {
+  let containerElement: HTMLElement;
+  let selectionCallback: (boundingBox: BoundingBox) => void;
+  let selection: ScatterPlotRectangleSelector;
+
+  beforeEach(() => {
+    containerElement = document.createElement('div');
+    const selector = document.createElement('svg');
+    selector.id = 'selector';
+    containerElement.appendChild(selector);
+
+    selectionCallback = jasmine.createSpy('selectionCallback');
+    selection =
+        new ScatterPlotRectangleSelector(containerElement, selectionCallback);
+  });
+
+  it('Simple mouse event starting top left', () => {
+    selection.onMouseDown(0, 0);
+    selection.onMouseMove(10, 10);
+    selection.onMouseUp();
+
+    expect(selectionCallback)
+        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
+  });
+
+  it('Simple mouse event starting bottom left', () => {
+    selection.onMouseDown(0, 10);
+    selection.onMouseMove(10, 0);
+    selection.onMouseUp();
+
+    expect(selectionCallback)
+        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
+  });
+
+  it('Simple mouse event starting top right', () => {
+    selection.onMouseDown(10, 0);
+    selection.onMouseMove(0, 10);
+    selection.onMouseUp();
+
+    expect(selectionCallback)
+        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
+  });
+
+  it('Simple mouse event starting bottom right', () => {
+    selection.onMouseDown(10, 10);
+    selection.onMouseMove(0, 0);
+    selection.onMouseUp();
+
+    expect(selectionCallback)
+        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
+  });
+});
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer.ts
new file mode 100644
index 0000000000..b0974a2053
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer.ts
@@ -0,0 +1,51 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {RenderContext} from './renderContext';
+
+/**
+ * ScatterPlotVisualizer is an interface used by ScatterPlotContainer
+ * to manage and aggregate any number of concurrent visualization behaviors.
+ * To add a new visualization to the 3D scatter plot, create a new class that
+ * implements this interface and attach it to the ScatterPlotContainer.
+ */
+export interface ScatterPlotVisualizer {
+  /** Called to initialize the visualizer with the primary scene. */
+  setScene(scene: THREE.Scene);
+  /**
+   * Called when the main scatter plot tears down the visualizer. Remove all
+   * objects from the scene, and dispose any heavy resources.
+   */
+  dispose();
+  /**
+   * Called when the positions of the scatter plot points have changed.
+   */
+  onPointPositionsChanged(newWorldSpacePointPositions: Float32Array);
+  /**
+   * Called immediately before the main scatter plot performs a picking
+   * (selection) render. Set up render state for any geometry to use picking IDs
+   * instead of visual colors.
+   */
+  onPickingRender(renderContext: RenderContext);
+  /**
+   * Called immediately before the main scatter plot performs a color (visual)
+   * render. Set up render state, lights, etc here.
+   */
+  onRender(renderContext: RenderContext);
+  /**
+   * Called when the canvas size changes.
+   */
+  onResize(newWidth: number, newHeight: number);
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts
new file mode 100644
index 0000000000..cbd9785e2f
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts
@@ -0,0 +1,367 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {RenderContext} from './renderContext';
+import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
+import * as util from './util';
+
+const FONT_SIZE = 80;
+const ONE_OVER_FONT_SIZE = 1 / FONT_SIZE;
+const LABEL_SCALE = 2.2;  // at 1:1 texel/pixel ratio
+const LABEL_COLOR = 'black';
+const LABEL_BACKGROUND = 'white';
+const MAX_CANVAS_DIMENSION = 8192;
+const NUM_GLYPHS = 256;
+const RGB_ELEMENTS_PER_ENTRY = 3;
+const XYZ_ELEMENTS_PER_ENTRY = 3;
+const UV_ELEMENTS_PER_ENTRY = 2;
+const VERTICES_PER_GLYPH = 2 * 3;  // 2 triangles, 3 verts per triangle
+
+/**
+ * Each label is made up of triangles (two per letter.) Each vertex, then, is
+ * the corner of one of these triangles (and thus the corner of a letter
+ * rectangle.)
+ * Each has the following attributes:
+ *    posObj: The (x, y) position of the vertex within the label, where the
+ *            bottom center of the word is positioned at (0, 0);
+ *    position: The position of the label in worldspace.
+ *    vUv: The (u, v) coordinates that index into the glyphs sheet (range 0, 1.)
+ *    color: The color of the label (matches the cooresponding point's color.)
+ *    wordShown: Boolean. Whether or not the label is visible.
+ */
+
+const VERTEX_SHADER = `
+    attribute vec2 posObj;
+    attribute vec3 color;
+    varying vec2 vUv;
+    varying vec3 vColor;
+
+    void main() {
+      vUv = uv;
+      vColor = color;
+
+      // Rotate label to face camera.
+
+      vec4 vRight = vec4(
+        modelViewMatrix[0][0], modelViewMatrix[1][0], modelViewMatrix[2][0], 0);
+
+      vec4 vUp = vec4(
+        modelViewMatrix[0][1], modelViewMatrix[1][1], modelViewMatrix[2][1], 0);
+
+      vec4 vAt = -vec4(
+        modelViewMatrix[0][2], modelViewMatrix[1][2], modelViewMatrix[2][2], 0);
+
+      mat4 pointToCamera = mat4(vRight, vUp, vAt, vec4(0, 0, 0, 1));
+
+      vec2 scaledPos = posObj * ${ONE_OVER_FONT_SIZE} * ${LABEL_SCALE};
+
+      vec4 posRotated = pointToCamera * vec4(scaledPos, 0, 1);
+      vec4 mvPosition = modelViewMatrix * (vec4(position, 0) + posRotated);
+      gl_Position = projectionMatrix * mvPosition;
+    }`;
+
+const FRAGMENT_SHADER = `
+    uniform sampler2D texture;
+    uniform bool picking;
+    varying vec2 vUv;
+    varying vec3 vColor;
+
+    void main() {
+      if (picking) {
+        gl_FragColor = vec4(vColor, 1.0);
+      } else {
+        vec4 fromTexture = texture2D(texture, vUv);
+        gl_FragColor = vec4(vColor, 1.0) * fromTexture;
+      }
+    }`;
+
+type GlyphTexture = {
+  texture: THREE.Texture; lengths: Float32Array; offsets: Float32Array;
+};
+
+/**
+ * Renders the text labels as 3d geometry in the world.
+ */
+export class ScatterPlotVisualizer3DLabels implements ScatterPlotVisualizer {
+  private scene: THREE.Scene;
+  private labelStrings: string[];
+  private geometry: THREE.BufferGeometry;
+  private worldSpacePointPositions: Float32Array;
+  private pickingColors: Float32Array;
+  private renderColors: Float32Array;
+  private material: THREE.ShaderMaterial;
+  private uniforms: Object;
+  private labelsMesh: THREE.Mesh;
+  private positions: THREE.BufferAttribute;
+  private totalVertexCount: number;
+  private labelVertexMap: number[][];
+  private glyphTexture: GlyphTexture;
+
+  private createGlyphTexture(): GlyphTexture {
+    let canvas = document.createElement('canvas');
+    canvas.width = MAX_CANVAS_DIMENSION;
+    canvas.height = FONT_SIZE;
+    let ctx = canvas.getContext('2d');
+    ctx.font = 'bold ' + FONT_SIZE * 0.75 + 'px roboto';
+    ctx.textBaseline = 'top';
+    ctx.fillStyle = LABEL_BACKGROUND;
+    ctx.rect(0, 0, canvas.width, canvas.height);
+    ctx.fill();
+    ctx.fillStyle = LABEL_COLOR;
+    let spaceOffset = ctx.measureText(' ').width;
+    // For each letter, store length, position at the encoded index.
+    let glyphLengths = new Float32Array(NUM_GLYPHS);
+    let glyphOffset = new Float32Array(NUM_GLYPHS);
+    let leftCoord = 0;
+    for (let i = 0; i < NUM_GLYPHS; i++) {
+      let text = ' ' + String.fromCharCode(i);
+      let textLength = ctx.measureText(text).width;
+      glyphLengths[i] = textLength - spaceOffset;
+      glyphOffset[i] = leftCoord;
+      ctx.fillText(text, leftCoord - spaceOffset, 0);
+      leftCoord += textLength;
+    }
+    const tex = util.createTexture(canvas);
+    return {texture: tex, lengths: glyphLengths, offsets: glyphOffset};
+  }
+
+  private processLabelVerts(pointCount: number) {
+    let numTotalLetters = 0;
+    this.labelVertexMap = [];
+    for (let i = 0; i < pointCount; i++) {
+      const label = this.labelStrings[i];
+      let vertsArray: number[] = [];
+      for (let j = 0; j < label.length; j++) {
+        for (let k = 0; k < VERTICES_PER_GLYPH; k++) {
+          vertsArray.push(numTotalLetters * VERTICES_PER_GLYPH + k);
+        }
+        numTotalLetters++;
+      }
+      this.labelVertexMap.push(vertsArray);
+    }
+    this.totalVertexCount = numTotalLetters * VERTICES_PER_GLYPH;
+  }
+
+  private createColorBuffers(pointCount: number) {
+    this.pickingColors =
+        new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
+    this.renderColors =
+        new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
+    for (let i = 0; i < pointCount; i++) {
+      let color = new THREE.Color(i);
+      this.labelVertexMap[i].forEach((j) => {
+        this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j] = color.r;
+        this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j + 1] = color.g;
+        this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j + 2] = color.b;
+        this.renderColors[RGB_ELEMENTS_PER_ENTRY * j] = 1.0;
+        this.renderColors[RGB_ELEMENTS_PER_ENTRY * j + 1] = 1.0;
+        this.renderColors[RGB_ELEMENTS_PER_ENTRY * j + 2] = 1.0;
+      });
+    }
+  }
+
+  private createLabels() {
+    if ((this.labelStrings == null) ||
+        (this.worldSpacePointPositions == null)) {
+      return;
+    }
+    const pointCount =
+        this.worldSpacePointPositions.length / XYZ_ELEMENTS_PER_ENTRY;
+    if (pointCount !== this.labelStrings.length) {
+      return;
+    }
+    this.glyphTexture = this.createGlyphTexture();
+
+    this.uniforms = {
+      texture: {type: 't'},
+      picking: {type: 'bool'},
+    };
+
+    this.material = new THREE.ShaderMaterial({
+      uniforms: this.uniforms,
+      transparent: true,
+      vertexShader: VERTEX_SHADER,
+      fragmentShader: FRAGMENT_SHADER,
+    });
+
+    this.processLabelVerts(pointCount);
+    this.createColorBuffers(pointCount);
+
+    let positionArray =
+        new Float32Array(this.totalVertexCount * XYZ_ELEMENTS_PER_ENTRY);
+    this.positions =
+        new THREE.BufferAttribute(positionArray, XYZ_ELEMENTS_PER_ENTRY);
+
+    let posArray =
+        new Float32Array(this.totalVertexCount * XYZ_ELEMENTS_PER_ENTRY);
+    let uvArray =
+        new Float32Array(this.totalVertexCount * UV_ELEMENTS_PER_ENTRY);
+    let colorsArray =
+        new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
+    let positionObject = new THREE.BufferAttribute(posArray, 2);
+    let uv = new THREE.BufferAttribute(uvArray, UV_ELEMENTS_PER_ENTRY);
+    let colors = new THREE.BufferAttribute(colorsArray, RGB_ELEMENTS_PER_ENTRY);
+
+    this.geometry = new THREE.BufferGeometry();
+    this.geometry.addAttribute('posObj', positionObject);
+    this.geometry.addAttribute('position', this.positions);
+    this.geometry.addAttribute('uv', uv);
+    this.geometry.addAttribute('color', colors);
+
+    let lettersSoFar = 0;
+    for (let i = 0; i < pointCount; i++) {
+      const label = this.labelStrings[i];
+      let leftOffset = 0;
+      // Determine length of word in pixels.
+      for (let j = 0; j < label.length; j++) {
+        let letterCode = label.charCodeAt(j);
+        leftOffset += this.glyphTexture.lengths[letterCode];
+      }
+      leftOffset /= -2;  // centers text horizontally around the origin
+      for (let j = 0; j < label.length; j++) {
+        let letterCode = label.charCodeAt(j);
+        let letterWidth = this.glyphTexture.lengths[letterCode];
+        let scale = FONT_SIZE;
+        let right = (leftOffset + letterWidth) / scale;
+        let left = (leftOffset) / scale;
+        let top = FONT_SIZE / scale;
+
+        // First triangle
+        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 0, left, 0);
+        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 1, right, 0);
+        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 2, left, top);
+
+        // Second triangle
+        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 3, left, top);
+        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 4, right, 0);
+        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 5, right, top);
+
+        // Set UVs based on letter.
+        let uLeft = (this.glyphTexture.offsets[letterCode]);
+        let uRight = (this.glyphTexture.offsets[letterCode] + letterWidth);
+        // Scale so that uvs lie between 0 and 1 on the texture.
+        uLeft /= MAX_CANVAS_DIMENSION;
+        uRight /= MAX_CANVAS_DIMENSION;
+        let vTop = 1;
+        let vBottom = 0;
+        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 0, uLeft, vTop);
+        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 1, uRight, vTop);
+        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 2, uLeft, vBottom);
+        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 3, uLeft, vBottom);
+        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 4, uRight, vTop);
+        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 5, uRight, vBottom);
+
+        lettersSoFar++;
+        leftOffset += letterWidth;
+      }
+    }
+
+    for (let i = 0; i < pointCount; i++) {
+      const p = util.vector3FromPackedArray(this.worldSpacePointPositions, i);
+      this.labelVertexMap[i].forEach((j) => {
+        this.positions.setXYZ(j, p.x, p.y, p.z);
+      });
+    };
+
+    this.labelsMesh = new THREE.Mesh(this.geometry, this.material);
+    this.labelsMesh.frustumCulled = false;
+    this.scene.add(this.labelsMesh);
+  }
+
+  private colorLabels(pointColors: Float32Array) {
+    if (this.labelStrings == null || this.geometry == null ||
+        pointColors == null) {
+      return;
+    }
+
+    const colors = this.geometry.getAttribute('color') as THREE.BufferAttribute;
+    colors.array = this.renderColors;
+
+    const n = pointColors.length / XYZ_ELEMENTS_PER_ENTRY;
+    let src = 0;
+    for (let i = 0; i < n; ++i) {
+      const c = new THREE.Color(
+          pointColors[src], pointColors[src + 1], pointColors[src + 2]);
+      const m = this.labelVertexMap[i].length;
+      for (let j = 0; j < m; ++j) {
+        colors.setXYZ(this.labelVertexMap[i][j], c.r, c.g, c.b);
+      }
+      src += RGB_ELEMENTS_PER_ENTRY;
+    }
+    colors.needsUpdate = true;
+  }
+
+  setScene(scene: THREE.Scene) {
+    this.scene = scene;
+  }
+
+  dispose() {
+    if (this.labelsMesh) {
+      if (this.scene) {
+        this.scene.remove(this.labelsMesh);
+      }
+      this.labelsMesh = null;
+    }
+    if (this.geometry) {
+      this.geometry.dispose();
+      this.geometry = null;
+    }
+    if ((this.glyphTexture != null) && (this.glyphTexture.texture != null)) {
+      this.glyphTexture.texture.dispose();
+      this.glyphTexture.texture = null;
+    }
+  }
+
+  onPickingRender(rc: RenderContext) {
+    if (this.geometry == null) {
+      this.createLabels();
+    }
+    if (this.geometry == null) {
+      return;
+    }
+    this.material.uniforms.texture.value = this.glyphTexture.texture;
+    this.material.uniforms.picking.value = true;
+    const colors = this.geometry.getAttribute('color') as THREE.BufferAttribute;
+    colors.array = this.pickingColors;
+    colors.needsUpdate = true;
+  }
+
+  onRender(rc: RenderContext) {
+    if (this.geometry == null) {
+      this.createLabels();
+    }
+    if (this.geometry == null) {
+      return;
+    }
+    this.colorLabels(rc.pointColors);
+    this.material.uniforms.texture.value = this.glyphTexture.texture;
+    this.material.uniforms.picking.value = false;
+    const colors = this.geometry.getAttribute('color') as THREE.BufferAttribute;
+    colors.array = this.renderColors;
+    colors.needsUpdate = true;
+  }
+
+  onPointPositionsChanged(newPositions: Float32Array) {
+    this.worldSpacePointPositions = newPositions;
+    this.dispose();
+  }
+
+  setLabelStrings(labelStrings: string[]) {
+    this.labelStrings = labelStrings;
+    this.dispose();
+  }
+
+  onResize(newWidth: number, newHeight: number) {}
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerCanvasLabels.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerCanvasLabels.ts
new file mode 100644
index 0000000000..ece4d84ef2
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerCanvasLabels.ts
@@ -0,0 +1,187 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import {BoundingBox, CollisionGrid} from './label';
+import {CameraType, RenderContext} from './renderContext';
+import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
+import * as util from './util';
+
+const MAX_LABELS_ON_SCREEN = 10000;
+const LABEL_STROKE_WIDTH = 3;
+const LABEL_FILL_WIDTH = 6;
+
+/**
+ * Creates and maintains a 2d canvas on top of the GL canvas. All labels, when
+ * active, are rendered to the 2d canvas as part of the visible render pass.
+ */
+export class ScatterPlotVisualizerCanvasLabels implements
+    ScatterPlotVisualizer {
+  private worldSpacePointPositions: Float32Array;
+  private gc: CanvasRenderingContext2D;
+  private canvas: HTMLCanvasElement;
+  private labelsActive: boolean = true;
+
+  constructor(container: HTMLElement) {
+    this.canvas = document.createElement('canvas');
+    container.appendChild(this.canvas);
+
+    this.gc = this.canvas.getContext('2d');
+    this.canvas.style.position = 'absolute';
+    this.canvas.style.left = '0';
+    this.canvas.style.top = '0';
+    this.canvas.style.pointerEvents = 'none';
+  }
+
+  private removeAllLabels() {
+    const pixelWidth = this.canvas.width * window.devicePixelRatio;
+    const pixelHeight = this.canvas.height * window.devicePixelRatio;
+    this.gc.clearRect(0, 0, pixelWidth, pixelHeight);
+  }
+
+  /** Render all of the non-overlapping visible labels to the canvas. */
+  private makeLabels(rc: RenderContext) {
+    if ((rc.labels == null) || (rc.labels.pointIndices.length === 0)) {
+      return;
+    }
+    if (this.worldSpacePointPositions == null) {
+      return;
+    }
+
+    const lrc = rc.labels;
+    const sceneIs3D: boolean = (rc.cameraType === CameraType.Perspective);
+    const labelHeight = parseInt(this.gc.font, 10);
+    const dpr = window.devicePixelRatio;
+
+    let grid: CollisionGrid;
+    {
+      const pixw = this.canvas.width * dpr;
+      const pixh = this.canvas.height * dpr;
+      const bb: BoundingBox = {loX: 0, hiX: pixw, loY: 0, hiY: pixh};
+      grid = new CollisionGrid(bb, pixw / 25, pixh / 50);
+    }
+
+    let opacityMap =
+        d3.scalePow()
+            .exponent(Math.E)
+            .domain([rc.farthestCameraSpacePointZ, rc.nearestCameraSpacePointZ])
+            .range([0.1, 1]);
+
+    const camPos = rc.camera.position;
+    const camToTarget = camPos.clone().sub(rc.cameraTarget);
+    let camToPoint = new THREE.Vector3();
+
+    this.gc.textBaseline = 'middle';
+    this.gc.miterLimit = 2;
+
+    // Have extra space between neighboring labels. Don't pack too tightly.
+    const labelMargin = 2;
+    // Shift the label to the right of the point circle.
+    const xShift = 4;
+
+    const n = Math.min(MAX_LABELS_ON_SCREEN, lrc.pointIndices.length);
+    for (let i = 0; i < n; ++i) {
+      let point: THREE.Vector3;
+      {
+        const pi = lrc.pointIndices[i];
+        point = util.vector3FromPackedArray(this.worldSpacePointPositions, pi);
+      }
+
+      // discard points that are behind the camera
+      camToPoint.copy(camPos).sub(point);
+      if (camToTarget.dot(camToPoint) < 0) {
+        continue;
+      }
+
+      let [x, y] = util.vector3DToScreenCoords(
+          rc.camera, rc.screenWidth, rc.screenHeight, point);
+      x += xShift;
+
+      // Computing the width of the font is expensive,
+      // so we assume width of 1 at first. Then, if the label doesn't
+      // conflict with other labels, we measure the actual width.
+      const textBoundingBox: BoundingBox = {
+        loX: x - labelMargin,
+        hiX: x + 1 + labelMargin,
+        loY: y - labelHeight / 2 - labelMargin,
+        hiY: y + labelHeight / 2 + labelMargin
+      };
+
+      if (grid.insert(textBoundingBox, true)) {
+        const text = lrc.labelStrings[i];
+        const fontSize = lrc.defaultFontSize * lrc.scaleFactors[i] * dpr;
+        this.gc.font = fontSize + 'px roboto';
+
+        // Now, check with properly computed width.
+        textBoundingBox.hiX += this.gc.measureText(text).width - 1;
+        if (grid.insert(textBoundingBox)) {
+          let opacity = 1;
+          if (sceneIs3D && (lrc.useSceneOpacityFlags[i] === 1)) {
+            opacity = opacityMap(camToPoint.length());
+          }
+          this.gc.fillStyle =
+              this.styleStringFromPackedRgba(lrc.fillColors, i, opacity);
+          this.gc.strokeStyle =
+              this.styleStringFromPackedRgba(lrc.strokeColors, i, opacity);
+          this.gc.lineWidth = LABEL_STROKE_WIDTH;
+          this.gc.strokeText(text, x, y);
+          this.gc.lineWidth = LABEL_FILL_WIDTH;
+          this.gc.fillText(text, x, y);
+        }
+      }
+    }
+  }
+
+  private styleStringFromPackedRgba(
+      packedRgbaArray: Uint8Array, colorIndex: number,
+      opacity: number): string {
+    const offset = colorIndex * 3;
+    const r = packedRgbaArray[offset];
+    const g = packedRgbaArray[offset + 1];
+    const b = packedRgbaArray[offset + 2];
+    return 'rgba(' + r + ',' + g + ',' + b + ',' + opacity + ')';
+  }
+
+  onResize(newWidth: number, newHeight: number) {
+    let dpr = window.devicePixelRatio;
+    this.canvas.width = newWidth * dpr;
+    this.canvas.height = newHeight * dpr;
+    this.canvas.style.width = newWidth + 'px';
+    this.canvas.style.height = newHeight + 'px';
+  }
+
+  dispose() {
+    this.removeAllLabels();
+    this.canvas = null;
+    this.gc = null;
+  }
+
+  onPointPositionsChanged(newPositions: Float32Array) {
+    this.worldSpacePointPositions = newPositions;
+    this.removeAllLabels();
+  }
+
+  onRender(rc: RenderContext) {
+    if (!this.labelsActive) {
+      return;
+    }
+
+    this.removeAllLabels();
+    this.makeLabels(rc);
+  }
+
+  setScene(scene: THREE.Scene) {}
+  onPickingRender(renderContext: RenderContext) {}
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerPolylines.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerPolylines.ts
new file mode 100644
index 0000000000..e6d4aeda28
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerPolylines.ts
@@ -0,0 +1,149 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DataSet} from './data';
+import {RenderContext} from './renderContext';
+import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
+import * as util from './util';
+
+const RGB_NUM_ELEMENTS = 3;
+const XYZ_NUM_ELEMENTS = 3;
+
+/**
+ * Renders polylines that connect multiple points in the dataset.
+ */
+export class ScatterPlotVisualizerPolylines implements ScatterPlotVisualizer {
+  private dataSet: DataSet;
+  private scene: THREE.Scene;
+  private polylines: THREE.Line[];
+  private polylinePositionBuffer:
+      {[polylineIndex: number]: THREE.BufferAttribute} = {};
+  private polylineColorBuffer:
+      {[polylineIndex: number]: THREE.BufferAttribute} = {};
+
+  private updateSequenceIndicesInDataSet(ds: DataSet) {
+    for (let i = 0; i < ds.sequences.length; i++) {
+      const sequence = ds.sequences[i];
+      for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
+        ds.points[sequence.pointIndices[j]].sequenceIndex = i;
+        ds.points[sequence.pointIndices[j + 1]].sequenceIndex = i;
+      }
+    }
+  }
+
+  private createPolylines(scene: THREE.Scene) {
+    if (!this.dataSet || !this.dataSet.sequences) {
+      return;
+    }
+
+    this.updateSequenceIndicesInDataSet(this.dataSet);
+    this.polylines = [];
+
+    for (let i = 0; i < this.dataSet.sequences.length; i++) {
+      const geometry = new THREE.BufferGeometry();
+      geometry.addAttribute('position', this.polylinePositionBuffer[i]);
+      geometry.addAttribute('color', this.polylineColorBuffer[i]);
+
+      const material = new THREE.LineBasicMaterial({
+        linewidth: 1,  // unused default, overwritten by width array.
+        opacity: 1.0,  // unused default, overwritten by opacity array.
+        transparent: true,
+        vertexColors: THREE.VertexColors
+      });
+
+      const polyline = new THREE.LineSegments(geometry, material);
+      polyline.frustumCulled = false;
+      this.polylines.push(polyline);
+      scene.add(polyline);
+    }
+  }
+
+  dispose() {
+    if (this.polylines == null) {
+      return;
+    }
+    for (let i = 0; i < this.polylines.length; i++) {
+      this.scene.remove(this.polylines[i]);
+      this.polylines[i].geometry.dispose();
+    }
+    this.polylines = null;
+    this.polylinePositionBuffer = {};
+    this.polylineColorBuffer = {};
+  }
+
+  setScene(scene: THREE.Scene) {
+    this.scene = scene;
+  }
+
+  setDataSet(dataSet: DataSet) {
+    this.dataSet = dataSet;
+  }
+
+  onPointPositionsChanged(newPositions: Float32Array) {
+    if ((newPositions == null) || (this.polylines != null)) {
+      this.dispose();
+    }
+    if ((newPositions == null) || (this.dataSet == null)) {
+      return;
+    }
+    // Set up the position buffer arrays for each polyline.
+    for (let i = 0; i < this.dataSet.sequences.length; i++) {
+      let sequence = this.dataSet.sequences[i];
+      const vertexCount = 2 * (sequence.pointIndices.length - 1);
+
+      let polylines = new Float32Array(vertexCount * XYZ_NUM_ELEMENTS);
+      this.polylinePositionBuffer[i] =
+          new THREE.BufferAttribute(polylines, XYZ_NUM_ELEMENTS);
+
+      let colors = new Float32Array(vertexCount * RGB_NUM_ELEMENTS);
+      this.polylineColorBuffer[i] =
+          new THREE.BufferAttribute(colors, RGB_NUM_ELEMENTS);
+    }
+    for (let i = 0; i < this.dataSet.sequences.length; i++) {
+      const sequence = this.dataSet.sequences[i];
+      let src = 0;
+      for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
+        const p1Index = sequence.pointIndices[j];
+        const p2Index = sequence.pointIndices[j + 1];
+        const p1 = util.vector3FromPackedArray(newPositions, p1Index);
+        const p2 = util.vector3FromPackedArray(newPositions, p2Index);
+        this.polylinePositionBuffer[i].setXYZ(src, p1.x, p1.y, p1.z);
+        this.polylinePositionBuffer[i].setXYZ(src + 1, p2.x, p2.y, p2.z);
+        src += 2;
+      }
+      this.polylinePositionBuffer[i].needsUpdate = true;
+    }
+
+    if (this.polylines == null) {
+      this.createPolylines(this.scene);
+    }
+  }
+
+  onRender(renderContext: RenderContext) {
+    if (this.polylines == null) {
+      return;
+    }
+    for (let i = 0; i < this.polylines.length; i++) {
+      this.polylines[i].material.opacity = renderContext.polylineOpacities[i];
+      (this.polylines[i].material as THREE.LineBasicMaterial).linewidth =
+          renderContext.polylineWidths[i];
+      this.polylineColorBuffer[i].array = renderContext.polylineColors[i];
+      this.polylineColorBuffer[i].needsUpdate = true;
+    }
+  }
+
+  onPickingRender(renderContext: RenderContext) {}
+  onResize(newWidth: number, newHeight: number) {}
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts
new file mode 100644
index 0000000000..8adc9a9bd2
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts
@@ -0,0 +1,435 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {CameraType, RenderContext} from './renderContext';
+import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
+import * as util from './util';
+
+const NUM_POINTS_FOG_THRESHOLD = 5000;
+const MIN_POINT_SIZE = 5.0;
+const IMAGE_SIZE = 30;
+
+// Constants relating to the indices of buffer arrays.
+const RGB_NUM_ELEMENTS = 3;
+const INDEX_NUM_ELEMENTS = 1;
+const XYZ_NUM_ELEMENTS = 3;
+
+const VERTEX_SHADER = `
+  // Index of the specific vertex (passed in as bufferAttribute), and the
+  // variable that will be used to pass it to the fragment shader.
+  attribute float spriteIndex;
+  attribute vec3 color;
+  attribute float scaleFactor;
+
+  varying vec2 xyIndex;
+  varying vec3 vColor;
+
+  uniform bool sizeAttenuation;
+  uniform float pointSize;
+  uniform float spritesPerRow;
+  uniform float spritesPerColumn;
+
+  void main() {
+    // Pass index and color values to fragment shader.
+    vColor = color;
+    xyIndex = vec2(mod(spriteIndex, spritesPerRow),
+              floor(spriteIndex / spritesPerColumn));
+
+    // Transform current vertex by modelViewMatrix (model world position and
+    // camera world position matrix).
+    vec4 cameraSpacePos = modelViewMatrix * vec4(position, 1.0);
+
+    // Project vertex in camera-space to screen coordinates using the camera's
+    // projection matrix.
+    gl_Position = projectionMatrix * cameraSpacePos;
+
+    // Create size attenuation (if we're in 3D mode) by making the size of
+    // each point inversly proportional to its distance to the camera.
+    float outputPointSize = pointSize;
+    if (sizeAttenuation) {
+      outputPointSize = -pointSize / cameraSpacePos.z;
+    }
+
+    gl_PointSize =
+      max(outputPointSize * scaleFactor, ${MIN_POINT_SIZE.toFixed(1)});
+  }`;
+
+const FRAGMENT_SHADER_POINT_TEST_CHUNK = `
+  bool point_in_unit_circle(vec2 spriteCoord) {
+    vec2 centerToP = spriteCoord - vec2(0.5, 0.5);
+    return dot(centerToP, centerToP) < (0.5 * 0.5);
+  }
+
+  bool point_in_unit_equilateral_triangle(vec2 spriteCoord) {
+    vec3 v0 = vec3(0, 1, 0);
+    vec3 v1 = vec3(0.5, 0, 0);
+    vec3 v2 = vec3(1, 1, 0);
+    vec3 p = vec3(spriteCoord, 0);
+    float p_in_v0_v1 = cross(v1 - v0, p - v0).z;
+    float p_in_v1_v2 = cross(v2 - v1, p - v1).z;
+    return (p_in_v0_v1 > 0.0) && (p_in_v1_v2 > 0.0);
+  }
+
+  bool point_in_unit_square(vec2 spriteCoord) {
+    return true;
+  }
+`;
+
+const FRAGMENT_SHADER = `
+  varying vec2 xyIndex;
+  varying vec3 vColor;
+
+  uniform sampler2D texture;
+  uniform float spritesPerRow;
+  uniform float spritesPerColumn;
+  uniform bool isImage;
+
+  ${THREE.ShaderChunk['common']}
+  ${THREE.ShaderChunk['fog_pars_fragment']}
+  ${FRAGMENT_SHADER_POINT_TEST_CHUNK}
+
+  void main() {
+    if (isImage) {
+      // Coordinates of the vertex within the entire sprite image.
+      vec2 coords =
+        (gl_PointCoord + xyIndex) / vec2(spritesPerRow, spritesPerColumn);
+      gl_FragColor = vec4(vColor, 1.0) * texture2D(texture, coords);
+    } else {
+      bool inside = point_in_unit_circle(gl_PointCoord);
+      if (!inside) {
+        discard;
+      }
+      gl_FragColor = vec4(vColor, 1);
+    }
+    ${THREE.ShaderChunk['fog_fragment']}
+  }`;
+
+const FRAGMENT_SHADER_PICKING = `
+  varying vec2 xyIndex;
+  varying vec3 vColor;
+  uniform bool isImage;
+
+  ${FRAGMENT_SHADER_POINT_TEST_CHUNK}
+
+  void main() {
+    xyIndex; // Silence 'unused variable' warning.
+    if (isImage) {
+      gl_FragColor = vec4(vColor, 1);
+    } else {
+      bool inside = point_in_unit_circle(gl_PointCoord);
+      if (!inside) {
+        discard;
+      }
+      gl_FragColor = vec4(vColor, 1);
+    }
+  }`;
+
+/**
+ * Uses GL point sprites to render the dataset.
+ */
+export class ScatterPlotVisualizerSprites implements ScatterPlotVisualizer {
+  private scene: THREE.Scene;
+  private fog: THREE.Fog;
+  private texture: THREE.Texture = null;
+  private standinTextureForPoints: THREE.Texture;
+  private spritesPerRow: number;
+  private spritesPerColumn: number;
+  private spriteDimensions: [number, number];
+  private spriteIndexBufferAttribute: THREE.BufferAttribute;
+  private renderMaterial: THREE.ShaderMaterial;
+  private pickingMaterial: THREE.ShaderMaterial;
+
+  private points: THREE.Points;
+  private worldSpacePointPositions: Float32Array;
+  private pickingColors: Float32Array;
+  private renderColors: Float32Array;
+
+  constructor() {
+    this.standinTextureForPoints =
+        util.createTexture(document.createElement('canvas'));
+    this.renderMaterial = this.createRenderMaterial(false);
+    this.pickingMaterial = this.createPickingMaterial(false);
+  }
+
+  private createTextureFromSpriteAtlas(
+      spriteAtlas: HTMLImageElement, spriteDimensions: [number, number],
+      spriteIndices: Float32Array) {
+    this.texture = util.createTexture(spriteAtlas);
+    this.spritesPerRow = spriteAtlas.width / spriteDimensions[0];
+    this.spritesPerColumn = spriteAtlas.height / spriteDimensions[1];
+    this.spriteDimensions = spriteDimensions;
+    this.spriteIndexBufferAttribute =
+        new THREE.BufferAttribute(spriteIndices, INDEX_NUM_ELEMENTS);
+
+    if (this.points != null) {
+      (this.points.geometry as THREE.BufferGeometry)
+          .addAttribute('spriteIndex', this.spriteIndexBufferAttribute);
+    }
+  }
+
+  private createUniforms(): any {
+    return {
+      texture: {type: 't'},
+      spritesPerRow: {type: 'f'},
+      spritesPerColumn: {type: 'f'},
+      fogColor: {type: 'c'},
+      fogNear: {type: 'f'},
+      fogFar: {type: 'f'},
+      isImage: {type: 'bool'},
+      sizeAttenuation: {type: 'bool'},
+      pointSize: {type: 'f'}
+    };
+  }
+
+  private createRenderMaterial(haveImage: boolean): THREE.ShaderMaterial {
+    const uniforms = this.createUniforms();
+    return new THREE.ShaderMaterial({
+      uniforms: uniforms,
+      vertexShader: VERTEX_SHADER,
+      fragmentShader: FRAGMENT_SHADER,
+      transparent: !haveImage,
+      depthTest: haveImage,
+      depthWrite: haveImage,
+      fog: true,
+      blending: THREE.MultiplyBlending,
+    });
+  }
+
+  private createPickingMaterial(haveImage: boolean): THREE.ShaderMaterial {
+    const uniforms = this.createUniforms();
+    return new THREE.ShaderMaterial({
+      uniforms: uniforms,
+      vertexShader: VERTEX_SHADER,
+      fragmentShader: FRAGMENT_SHADER_PICKING,
+      transparent: true,
+      depthTest: true,
+      depthWrite: true,
+      fog: false,
+      blending: THREE.NormalBlending,
+    });
+  }
+
+  /**
+   * Create points, set their locations and actually instantiate the
+   * geometry.
+   */
+  private createPointSprites(scene: THREE.Scene, positions: Float32Array) {
+    const pointCount =
+        (positions != null) ? (positions.length / XYZ_NUM_ELEMENTS) : 0;
+    const geometry = this.createGeometry(pointCount);
+
+    this.fog = new THREE.Fog(0xFFFFFF);  // unused value, gets overwritten.
+
+    this.points = new THREE.Points(geometry, this.renderMaterial);
+    this.points.frustumCulled = false;
+    if (this.spriteIndexBufferAttribute != null) {
+      (this.points.geometry as THREE.BufferGeometry)
+          .addAttribute('spriteIndex', this.spriteIndexBufferAttribute);
+    }
+    scene.add(this.points);
+  }
+
+  private calculatePointSize(sceneIs3D: boolean): number {
+    if (this.texture != null) {
+      return sceneIs3D ? IMAGE_SIZE : this.spriteDimensions[0];
+    }
+    const n = (this.worldSpacePointPositions != null) ?
+        (this.worldSpacePointPositions.length / XYZ_NUM_ELEMENTS) :
+        1;
+    const SCALE = 200;
+    const LOG_BASE = 8;
+    const DIVISOR = 1.5;
+    // Scale point size inverse-logarithmically to the number of points.
+    const pointSize = SCALE / Math.log(n) / Math.log(LOG_BASE);
+    return sceneIs3D ? pointSize : (pointSize / DIVISOR);
+  }
+
+  /**
+   * Set up buffer attributes to be used for the points/images.
+   */
+  private createGeometry(pointCount: number): THREE.BufferGeometry {
+    const n = pointCount;
+
+    // Fill pickingColors with each point's unique id as its color.
+    this.pickingColors = new Float32Array(n * RGB_NUM_ELEMENTS);
+    {
+      let dst = 0;
+      for (let i = 0; i < n; i++) {
+        const c = new THREE.Color(i);
+        this.pickingColors[dst++] = c.r;
+        this.pickingColors[dst++] = c.g;
+        this.pickingColors[dst++] = c.b;
+      }
+    }
+
+    const geometry = new THREE.BufferGeometry();
+    geometry.addAttribute(
+        'position', new THREE.BufferAttribute(null, XYZ_NUM_ELEMENTS));
+    geometry.addAttribute(
+        'color', new THREE.BufferAttribute(null, RGB_NUM_ELEMENTS));
+    geometry.addAttribute(
+        'scaleFactor', new THREE.BufferAttribute(null, INDEX_NUM_ELEMENTS));
+    return geometry;
+  }
+
+  private setFogDistances(
+      sceneIs3D: boolean, nearestPointZ: number, farthestPointZ: number) {
+    if (sceneIs3D) {
+      const n = this.worldSpacePointPositions.length / XYZ_NUM_ELEMENTS;
+      this.fog.near = nearestPointZ;
+      // If there are fewer points we want less fog. We do this
+      // by making the "far" value (that is, the distance from the camera to the
+      // far edge of the fog) proportional to the number of points.
+      let multiplier =
+          2 - Math.min(n, NUM_POINTS_FOG_THRESHOLD) / NUM_POINTS_FOG_THRESHOLD;
+      this.fog.far = farthestPointZ * multiplier;
+    } else {
+      this.fog.near = Infinity;
+      this.fog.far = Infinity;
+    }
+  }
+
+  dispose() {
+    this.disposeGeometry();
+    this.disposeTextureAtlas();
+  }
+
+  private disposeGeometry() {
+    if (this.points != null) {
+      this.scene.remove(this.points);
+      this.points.geometry.dispose();
+      this.points = null;
+      this.worldSpacePointPositions = null;
+    }
+  }
+
+  private disposeTextureAtlas() {
+    if (this.texture != null) {
+      this.texture.dispose();
+    }
+    this.texture = null;
+    this.renderMaterial = null;
+    this.pickingMaterial = null;
+  }
+
+  setScene(scene: THREE.Scene) {
+    this.scene = scene;
+  }
+
+  setSpriteAtlas(
+      spriteImage: HTMLImageElement, spriteDimensions: [number, number],
+      spriteIndices: Uint8Array) {
+    this.disposeTextureAtlas();
+    this.createTextureFromSpriteAtlas(
+        spriteImage, spriteDimensions, spriteIndices);
+    this.renderMaterial = this.createRenderMaterial(true);
+    this.pickingMaterial = this.createPickingMaterial(true);
+  }
+
+  clearSpriteAtlas() {
+    this.disposeTextureAtlas();
+    this.renderMaterial = this.createRenderMaterial(false);
+    this.pickingMaterial = this.createPickingMaterial(false);
+  }
+
+  onPointPositionsChanged(newPositions: Float32Array) {
+    if ((newPositions == null) || (newPositions.length === 0)) {
+      this.dispose();
+      return;
+    }
+    if (this.points != null) {
+      if (this.worldSpacePointPositions.length !== newPositions.length) {
+        this.disposeGeometry();
+      }
+    }
+
+    this.worldSpacePointPositions = newPositions;
+
+    if (this.points == null) {
+      this.createPointSprites(this.scene, newPositions);
+    }
+
+    const positions = (this.points.geometry as THREE.BufferGeometry)
+                          .getAttribute('position') as THREE.BufferAttribute;
+    positions.array = newPositions;
+    positions.needsUpdate = true;
+  }
+
+  onPickingRender(rc: RenderContext) {
+    if (this.points == null) {
+      return;
+    }
+
+    const sceneIs3D: boolean = (rc.cameraType === CameraType.Perspective);
+
+    this.pickingMaterial.uniforms.spritesPerRow.value = this.spritesPerRow;
+    this.pickingMaterial.uniforms.spritesPerRow.value = this.spritesPerColumn;
+    this.pickingMaterial.uniforms.sizeAttenuation.value = sceneIs3D;
+    this.pickingMaterial.uniforms.pointSize.value =
+        this.calculatePointSize(sceneIs3D);
+    this.points.material = this.pickingMaterial;
+
+    let colors = (this.points.geometry as THREE.BufferGeometry)
+                     .getAttribute('color') as THREE.BufferAttribute;
+    colors.array = this.pickingColors;
+    colors.needsUpdate = true;
+
+    let scaleFactors =
+        (this.points.geometry as THREE.BufferGeometry)
+            .getAttribute('scaleFactor') as THREE.BufferAttribute;
+    scaleFactors.array = rc.pointScaleFactors;
+    scaleFactors.needsUpdate = true;
+  }
+
+  onRender(rc: RenderContext) {
+    if (!this.points) {
+      return;
+    }
+    const sceneIs3D: boolean = (rc.camera instanceof THREE.PerspectiveCamera);
+
+    this.setFogDistances(
+        sceneIs3D, rc.nearestCameraSpacePointZ, rc.farthestCameraSpacePointZ);
+
+    this.scene.fog = this.fog;
+    this.scene.fog.color = new THREE.Color(rc.backgroundColor);
+
+    this.renderMaterial.uniforms.fogColor.value = this.scene.fog.color;
+    this.renderMaterial.uniforms.fogNear.value = this.fog.near;
+    this.renderMaterial.uniforms.fogFar.value = this.fog.far;
+    this.renderMaterial.uniforms.spritesPerRow.value = this.spritesPerRow;
+    this.renderMaterial.uniforms.spritesPerColumn.value = this.spritesPerColumn;
+    this.renderMaterial.uniforms.isImage.value = (this.texture != null);
+    this.renderMaterial.uniforms.texture.value =
+        (this.texture != null) ? this.texture : this.standinTextureForPoints;
+    this.renderMaterial.uniforms.sizeAttenuation.value = sceneIs3D;
+    this.renderMaterial.uniforms.pointSize.value =
+        this.calculatePointSize(sceneIs3D);
+    this.points.material = this.renderMaterial;
+
+    let colors = (this.points.geometry as THREE.BufferGeometry)
+                     .getAttribute('color') as THREE.BufferAttribute;
+    this.renderColors = rc.pointColors;
+    colors.array = this.renderColors;
+    colors.needsUpdate = true;
+
+    let scaleFactors =
+        (this.points.geometry as THREE.BufferGeometry)
+            .getAttribute('scaleFactor') as THREE.BufferAttribute;
+    scaleFactors.array = rc.pointScaleFactors;
+    scaleFactors.needsUpdate = true;
+  }
+
+  onResize(newWidth: number, newHeight: number) {}
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/sptree.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/sptree.ts
new file mode 100644
index 0000000000..991369a335
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/sptree.ts
@@ -0,0 +1,175 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/** N-dimensional point. Usually 2D or 3D. */
+export type Point = number[];
+
+export interface BBox {
+  center: Point;
+  halfDim: number;
+}
+
+/** A node in a space-partitioning tree. */
+export interface SPNode {
+  /** The children of this node. */
+  children?: SPNode[];
+  /** The bounding box of the region this node occupies. */
+  box: BBox;
+  /** One or more points this node has. */
+  point: Point;
+}
+
+/**
+ * A Space-partitioning tree (https://en.wikipedia.org/wiki/Space_partitioning)
+ * that recursively divides the space into regions of equal sizes. This data
+ * structure can act both as a Quad tree and an Octree when the data is 2 or
+ * 3 dimensional respectively. One usage is in t-SNE in order to do Barnes-Hut
+ * approximation.
+ */
+export class SPTree {
+  root: SPNode;
+
+  private masks: number[];
+  private dim: number;
+
+  /**
+   * Constructs a new tree with the provided data.
+   *
+   * @param data List of n-dimensional data points.
+   * @param capacity Number of data points to store in a single node.
+   */
+  constructor(data: Point[]) {
+    if (data.length < 1) {
+      throw new Error('There should be at least 1 data point');
+    }
+    // Make a bounding box based on the extent of the data.
+    this.dim = data[0].length;
+    // Each node has 2^d children, where d is the dimension of the space.
+    // Binary masks (e.g. 000, 001, ... 111 in 3D) are used to determine in
+    // which child (e.g. quadron in 2D) the new point is going to be assigned.
+    // For more details, see the insert() method and its comments.
+    this.masks = new Array(Math.pow(2, this.dim));
+    for (let d = 0; d < this.masks.length; ++d) {
+      this.masks[d] = (1 << d);
+    }
+    let min: Point = new Array(this.dim);
+    fillArray(min, Number.POSITIVE_INFINITY);
+    let max: Point = new Array(this.dim);
+    fillArray(max, Number.NEGATIVE_INFINITY);
+
+    for (let i = 0; i < data.length; ++i) {
+      // For each dim get the min and max.
+      // E.g. For 2-D, get the x_min, x_max, y_min, y_max.
+      for (let d = 0; d < this.dim; ++d) {
+        min[d] = Math.min(min[d], data[i][d]);
+        max[d] = Math.max(max[d], data[i][d]);
+      }
+    }
+    // Create a bounding box with the center of the largest span.
+    let center: Point = new Array(this.dim);
+    let halfDim = 0;
+    for (let d = 0; d < this.dim; ++d) {
+      let span = max[d] - min[d];
+      center[d] = min[d] + span / 2;
+      halfDim = Math.max(halfDim, span / 2);
+    }
+    this.root = {box: {center: center, halfDim: halfDim}, point: data[0]};
+    for (let i = 1; i < data.length; ++i) {
+      this.insert(this.root, data[i]);
+    }
+  }
+
+  /**
+   * Visits every node in the tree. Each node can store 1 or more points,
+   * depending on the node capacity provided in the constructor.
+   *
+   * @param accessor Method that takes the currently visited node, and the
+   * low and high point of the region that this node occupies. E.g. in 2D,
+   * the low and high points will be the lower-left corner and the upper-right
+   * corner.
+   */
+  visit(
+      accessor: (node: SPNode, lowPoint: Point, highPoint: Point) => boolean,
+      noBox = false) {
+    this.visitNode(this.root, accessor, noBox);
+  }
+
+  private visitNode(
+      node: SPNode,
+      accessor: (node: SPNode, lowPoint?: Point, highPoint?: Point) => boolean,
+      noBox: boolean) {
+    let skipChildren: boolean;
+    if (noBox) {
+      skipChildren = accessor(node);
+    } else {
+      let lowPoint = new Array(this.dim);
+      let highPoint = new Array(this.dim);
+      for (let d = 0; d < this.dim; ++d) {
+        lowPoint[d] = node.box.center[d] - node.box.halfDim;
+        highPoint[d] = node.box.center[d] + node.box.halfDim;
+      }
+      skipChildren = accessor(node, lowPoint, highPoint);
+    }
+    if (!node.children || skipChildren) {
+      return;
+    }
+    for (let i = 0; i < node.children.length; ++i) {
+      let child = node.children[i];
+      if (child) {
+        this.visitNode(child, accessor, noBox);
+      }
+    }
+  }
+
+  private insert(node: SPNode, p: Point) {
+    // Subdivide and then add the point to whichever node will accept it.
+    if (node.children == null) {
+      node.children = new Array(this.masks.length);
+    }
+
+    // Decide which child will get the new point by constructing a D-bits binary
+    // signature (D=3 for 3D) where the k-th bit is 1 if the point's k-th
+    // coordinate is greater than the node's k-th coordinate, 0 otherwise.
+    // Then the binary signature in decimal system gives us the index of the
+    // child where the new point should be.
+    let index = 0;
+    for (let d = 0; d < this.dim; ++d) {
+      if (p[d] > node.box.center[d]) {
+        index |= this.masks[d];
+      }
+    }
+    if (node.children[index] == null) {
+      this.makeChild(node, index, p);
+    } else {
+      this.insert(node.children[index], p);
+    }
+  }
+
+  private makeChild(node: SPNode, index: number, p: Point): void {
+    let oldC = node.box.center;
+    let h = node.box.halfDim / 2;
+    let newC: Point = new Array(this.dim);
+    for (let d = 0; d < this.dim; ++d) {
+      newC[d] = (index & (1 << d)) ? oldC[d] + h : oldC[d] - h;
+    }
+    node.children[index] = {box: {center: newC, halfDim: h}, point: p};
+  }
+}
+
+function fillArray<T>(arr: T[], value: T): void {
+  for (let i = 0; i < arr.length; ++i) {
+    arr[i] = value;
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/sptree_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/sptree_test.ts
new file mode 100644
index 0000000000..440680bdf1
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/sptree_test.ts
@@ -0,0 +1,104 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {SPTree} from './sptree';
+
+const assert = chai.assert;
+
+it('simple 2D data', () => {
+  let data = [
+    [0, 1],
+    [1, 0],
+    [1, 1],
+    [0, 0],
+  ];
+  let tree = new SPTree(data);
+  // Check that each point is within the bound.
+  tree.visit((node, low, high) => {
+    assert.equal(low.length, 2);
+    assert.equal(high.length, 2);
+    let point = node.point;
+    assert.equal(point.length, 2);
+    // Each point should be in the node's bounding box.
+    assert.equal(
+        point[0] >= low[0] && point[0] <= high[0] && point[1] >= low[1] &&
+            point[1] <= high[1],
+        true);
+    return false;
+  });
+});
+
+it('simple 3D data', () => {
+  let data = [
+    [0, 1, 0],
+    [1, 0.4, 2],
+    [1, 1, 3],
+    [0, 0, 5],
+  ];
+  let tree = new SPTree(data);
+  // Check that each point is within the bound.
+  tree.visit((node, low, high) => {
+    assert.equal(low.length, 3);
+    assert.equal(high.length, 3);
+    let point = node.point;
+    assert.equal(point.length, 3);
+    // Each point should be in the node's bounding box.
+    assert.equal(
+        point[0] >= low[0] && point[0] <= high[0] && point[1] >= low[1] &&
+            point[1] <= high[1] && point[2] >= low[2] && point[2] <= high[2],
+        true);
+    return false;
+  });
+});
+
+it('Only visit root', () => {
+  let data = [
+    [0, 1, 0],
+    [1, 0.4, 2],
+    [1, 1, 3],
+    [0, 0, 5],
+  ];
+  let tree = new SPTree(data);
+  let numVisits = 0;
+  tree.visit((node, low, high) => {
+    numVisits++;
+    return true;
+  });
+  assert.equal(numVisits, 1);
+});
+
+it('Search in random data', () => {
+  let N = 10000;
+  let data = new Array(N);
+  for (let i = 0; i < N; i++) {
+    data[i] = [Math.random(), Math.random()];
+  }
+  let tree = new SPTree(data);
+  let numVisits = 0;
+  let query = data[Math.floor(Math.random() * N)];
+  let found = false;
+  tree.visit((node, low, high) => {
+    numVisits++;
+    if (node.point === query) {
+      found = true;
+      return true;
+    }
+    let outOfBounds = query[0] < low[0] || query[0] > high[0] ||
+        query[1] < low[1] || query[1] > high[1];
+    return outOfBounds;
+  });
+  assert.equal(found, true);
+  assert.isBelow(numVisits, N / 4);
+});
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/styles.html b/tensorflow/tensorboard/components/vz_projector_d3v4/styles.html
new file mode 100644
index 0000000000..32dc984b5d
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/styles.html
@@ -0,0 +1,185 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<dom-module id="vz-projector-styles">
+<template>
+<style>
+:host {
+  --paper-input-container-label: {
+    font-size: 14px;
+  };
+  --paper-input-container-input: {
+    font-size: 14px;
+  };
+  /* TODO: Figure out why this doesn't work */
+  --paper-dropdown-menu-input: {
+    font-size: 14px;
+  };
+}
+
+paper-button {
+  background: #e3e3e3;
+  margin-left: 0;
+  text-transform: none;
+}
+
+paper-dropdown-menu paper-item {
+  font-size: 13px;
+}
+
+paper-tooltip {
+  max-width: 200px;
+  --paper-tooltip: {
+    font-size: 12px;
+  };
+}
+
+paper-checkbox {
+  --paper-checkbox-checked-color: #880E4F;
+}
+
+paper-toggle-button {
+  --paper-toggle-button-checked-bar-color:  #880E4F;
+  --paper-toggle-button-checked-button-color:  #880E4F;
+  --paper-toggle-button-checked-ink-color: #880E4F;
+}
+
+paper-icon-button {
+  border-radius: 50%;
+}
+
+paper-icon-button[active] {
+  color: white;
+  background-color: #880E4F;
+}
+
+.slider {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  justify-content: space-between;
+}
+
+.slider span {
+  width: 35px;
+  text-align: right;
+}
+
+.slider label {
+  align-items: center;
+  display: flex;
+}
+
+.help-icon {
+  height: 15px;
+  left: 2px;
+  min-width: 15px;
+  min-height: 15px;
+  margin: 0;
+  padding: 0;
+  top: -2px;
+  width: 15px;
+}
+
+.ink-panel {
+  display: flex;
+  flex-direction: column;
+  font-size: 14px;
+}
+
+.ink-panel h4 {
+  border-bottom: 1px solid #ddd;
+  font-size: 14px;
+  font-weight: 500;
+  margin: 0;
+  margin-bottom: 10px;
+  padding-bottom: 5px;
+}
+
+.ink-panel-header {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  height: 50px;
+}
+
+.ink-panel-content {
+  display: none;
+  height: 100%;
+}
+
+.ink-panel-content.active {
+  display: block;
+}
+
+.ink-panel-content h3 {
+  font-weight: 500;
+  font-size: 14px;
+  margin-top: 20px;
+  margin-bottom: 5px;
+  text-transform: uppercase;
+}
+
+.ink-panel-header h3 {
+  font-weight: 500;
+  font-size: 14px;
+  margin: 0;
+  padding: 0 24px;
+  text-transform: uppercase;
+}
+
+
+/* - Tabs */
+.ink-tab-group {
+  align-items: center;
+  box-sizing: border-box;
+  display: flex;
+  height: 100%;
+  justify-content: space-around;
+}
+
+.ink-tab-group .projection-tab {
+  color: rgba(0, 0, 0, 0.5);
+  cursor: pointer;
+  font-weight: 300;
+  line-height: 49px;
+  padding: 0 12px;
+  text-align: center;
+  text-transform: uppercase;
+}
+
+.ink-tab-group .projection-tab:hover {
+  color: black;
+}
+
+.ink-tab-group .projection-tab.active {
+  border-bottom: 2px solid black;
+  color: black;
+  font-weight: 500;
+}
+
+h4 {
+  margin: 30px 0 10px 0;
+}
+
+.dismiss-dialog-note {
+  margin-top: 25px;
+  font-size: 11px;
+  text-align: right;
+}
+</style>
+</template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/util.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/util.ts
new file mode 100644
index 0000000000..bd6df68b1a
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/util.ts
@@ -0,0 +1,252 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DataPoint} from './data';
+import * as logging from './logging';
+import {Point2D} from './vector';
+
+/**
+ * Delay for running expensive tasks, in milliseconds.
+ * The duration was empirically found so that it leaves enough time for the
+ * browser to update its UI state before starting an expensive UI-blocking task.
+ */
+const TASK_DELAY_MS = 200;
+
+/** Shuffles the array in-place in O(n) time using Fisher-Yates algorithm. */
+export function shuffle<T>(array: T[]): T[] {
+  let m = array.length;
+  let t: T;
+  let i: number;
+
+  // While there remain elements to shuffle.
+  while (m) {
+    // Pick a remaining element
+    i = Math.floor(Math.random() * m--);
+    // And swap it with the current element.
+    t = array[m];
+    array[m] = array[i];
+    array[i] = t;
+  }
+  return array;
+}
+
+export function range(count: number): number[] {
+  const rangeOutput: number[] = [];
+  for (let i = 0; i < count; i++) {
+    rangeOutput.push(i);
+  }
+  return rangeOutput;
+}
+
+export function classed(
+    element: HTMLElement, className: string, enabled: boolean) {
+  const classNames = element.className.split(' ');
+  if (enabled) {
+    if (className in classNames) {
+      return;
+    } else {
+      classNames.push(className);
+    }
+  } else {
+    const index = classNames.indexOf(className);
+    if (index === -1) {
+      return;
+    }
+    classNames.splice(index, 1);
+  }
+  element.className = classNames.join(' ');
+}
+
+/** Projects a 3d point into screen space */
+export function vector3DToScreenCoords(
+    cam: THREE.Camera, w: number, h: number, v: THREE.Vector3): Point2D {
+  let dpr = window.devicePixelRatio;
+  let pv = new THREE.Vector3().copy(v).project(cam);
+
+  // The screen-space origin is at the middle of the screen, with +y up.
+  let coords: Point2D =
+      [((pv.x + 1) / 2 * w) * dpr, -((pv.y - 1) / 2 * h) * dpr];
+  return coords;
+}
+
+/** Loads 3 contiguous elements from a packed xyz array into a Vector3. */
+export function vector3FromPackedArray(
+    a: Float32Array, pointIndex: number): THREE.Vector3 {
+  const offset = pointIndex * 3;
+  return new THREE.Vector3(a[offset], a[offset + 1], a[offset + 2]);
+}
+
+/**
+ * Gets the camera-space z coordinates of the nearest and farthest points.
+ * Ignores points that are behind the camera.
+ */
+export function getNearFarPoints(
+    worldSpacePoints: Float32Array, cameraPos: THREE.Vector3,
+    cameraTarget: THREE.Vector3): [number, number] {
+  let shortestDist: number = Infinity;
+  let furthestDist: number = 0;
+  const camToTarget = new THREE.Vector3().copy(cameraTarget).sub(cameraPos);
+  const camPlaneNormal = new THREE.Vector3().copy(camToTarget).normalize();
+  const n = worldSpacePoints.length / 3;
+  let src = 0;
+  let p = new THREE.Vector3();
+  let camToPoint = new THREE.Vector3();
+  for (let i = 0; i < n; i++) {
+    p.x = worldSpacePoints[src];
+    p.y = worldSpacePoints[src + 1];
+    p.z = worldSpacePoints[src + 2];
+    src += 3;
+
+    camToPoint.copy(p).sub(cameraPos);
+    const dist = camPlaneNormal.dot(camToPoint);
+    if (dist < 0) {
+      continue;
+    }
+    furthestDist = (dist > furthestDist) ? dist : furthestDist;
+    shortestDist = (dist < shortestDist) ? dist : shortestDist;
+  }
+  return [shortestDist, furthestDist];
+}
+
+/**
+ * Generate a texture for the points/images and sets some initial params
+ */
+export function createTexture(image: HTMLImageElement|
+                              HTMLCanvasElement): THREE.Texture {
+  let tex = new THREE.Texture(image);
+  tex.needsUpdate = true;
+  // Used if the texture isn't a power of 2.
+  tex.minFilter = THREE.LinearFilter;
+  tex.generateMipmaps = false;
+  tex.flipY = false;
+  return tex;
+}
+
+/**
+ * Assert that the condition is satisfied; if not, log user-specified message
+ * to the console.
+ */
+export function assert(condition: boolean, message?: string) {
+  if (!condition) {
+    message = message || 'Assertion failed';
+    throw new Error(message);
+  }
+}
+
+export type SearchPredicate = (p: DataPoint) => boolean;
+
+export function getSearchPredicate(
+    query: string, inRegexMode: boolean, fieldName: string): SearchPredicate {
+  let predicate: SearchPredicate;
+  if (inRegexMode) {
+    let regExp = new RegExp(query, 'i');
+    predicate = p => regExp.test(p.metadata[fieldName].toString());
+  } else {
+    // Doing a case insensitive substring match.
+    query = query.toLowerCase();
+    predicate = p => {
+      let label = p.metadata[fieldName].toString().toLowerCase();
+      return label.indexOf(query) >= 0;
+    };
+  }
+  return predicate;
+}
+
+/**
+ * Runs an expensive task asynchronously with some delay
+ * so that it doesn't block the UI thread immediately.
+ *
+ * @param message The message to display to the user.
+ * @param task The expensive task to run.
+ * @param msgId Optional. ID of an existing message. If provided, will overwrite
+ *     an existing message and won't automatically clear the message when the
+ *     task is done.
+ * @return The value returned by the task.
+ */
+export function runAsyncTask<T>(
+    message: string, task: () => T, msgId: string = null): Promise<T> {
+  let autoClear = (msgId == null);
+  msgId = logging.setModalMessage(message, msgId);
+  return new Promise<T>((resolve, reject) => {
+    setTimeout(() => {
+      try {
+        let result = task();
+        // Clearing the old message.
+        if (autoClear) {
+          logging.setModalMessage(null, msgId);
+        }
+        resolve(result);
+      } catch (ex) {
+        reject(ex);
+      }
+      return true;
+    }, TASK_DELAY_MS);
+  });
+}
+
+
+/**
+ * Parses the URL for query parameters, e.g. ?foo=1&bar=2 will return
+ *   {'foo': '1', 'bar': '2'}.
+ * @param url The URL to parse.
+ * @return A map of queryParam key to its value.
+ */
+export function getURLParams(url: string): {[key: string]: string} {
+  if (!url) {
+    return {};
+  }
+
+  let queryString = url.indexOf('?') !== -1 ? url.split('?')[1] : url;
+  if (queryString.indexOf('#')) {
+    queryString = queryString.split('#')[0];
+  }
+
+  const queryEntries = queryString.split('&');
+  let queryParams: {[key: string]: string} = {};
+  for (let i = 0; i < queryEntries.length; i++) {
+    let queryEntryComponents = queryEntries[i].split('=');
+    queryParams[queryEntryComponents[0].toLowerCase()] =
+        decodeURIComponent(queryEntryComponents[1]);
+  }
+  return queryParams;
+}
+
+/** List of substrings that auto generated tensors have in their name. */
+const SUBSTR_GEN_TENSORS = ['/Adagrad'];
+
+/** Returns true if the tensor was automatically generated by TF API calls. */
+export function tensorIsGenerated(tensorName: string): boolean {
+  for (let i = 0; i < SUBSTR_GEN_TENSORS.length; i++) {
+    if (tensorName.indexOf(SUBSTR_GEN_TENSORS[i]) >= 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+export function xor(cond1: boolean, cond2: boolean): boolean {
+  return (cond1 || cond2) && !(cond1 && cond2);
+}
+
+/** Checks to see if the browser supports webgl. */
+export function hasWebGLSupport(): boolean {
+  try {
+    let c = document.createElement('canvas');
+    let gl = c.getContext('webgl') || c.getContext('experimental-webgl');
+    return gl != null && typeof weblas !== 'undefined';
+  } catch (e) {
+    return false;
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/util_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/util_test.ts
new file mode 100644
index 0000000000..f7c0027c81
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/util_test.ts
@@ -0,0 +1,42 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import * as util from './util';
+
+describe('getURLParams', () => {
+  it('search query with valid param returns correct object', () => {
+    let urlParams = util.getURLParams('?config=http://google.com/');
+    expect(urlParams).toEqual({'config': 'http://google.com/'});
+  });
+
+  it('search query with multiple valid params returns correct object', () => {
+    let urlParams = util.getURLParams('?config=http://google.com/&foo=bar');
+    expect(urlParams).toEqual({'config': 'http://google.com/', 'foo': 'bar'});
+  });
+
+  it('search query with valid param with URL encoded characters', () => {
+    let urlParams = util.getURLParams('?config=http://google.com/%20search');
+    expect(urlParams).toEqual({'config': 'http://google.com/ search'});
+  });
+
+  it('search query with pound sign', () => {
+    let urlParams = util.getURLParams('?config=http://google.com/#foo');
+    expect(urlParams).toEqual({'config': 'http://google.com/'});
+  });
+
+  it('no search query returns empty object', () => {
+    let urlParams = util.getURLParams('');
+    expect(urlParams).toEqual({});
+  });
+});
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vector.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vector.ts
new file mode 100644
index 0000000000..0de78ad85d
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vector.ts
@@ -0,0 +1,266 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import {assert} from './util';
+
+/**
+ * @fileoverview Useful vector utilities.
+ */
+
+export type Vector = Float32Array | number[];
+export type Point2D = [number, number];
+export type Point3D = [number, number, number];
+
+/** Returns the dot product of two vectors. */
+export function dot(a: Vector, b: Vector): number {
+  assert(a.length === b.length, 'Vectors a and b must be of same length');
+  let result = 0;
+  for (let i = 0; i < a.length; ++i) {
+    result += a[i] * b[i];
+  }
+  return result;
+}
+
+/** Sums all the elements in the vector */
+export function sum(a: Vector): number {
+  let result = 0;
+  for (let i = 0; i < a.length; ++i) {
+    result += a[i];
+  }
+  return result;
+}
+
+/** Returns the sum of two vectors, i.e. a + b */
+export function add(a: Vector, b: Vector): Float32Array {
+  assert(a.length === b.length, 'Vectors a and b must be of same length');
+  let result = new Float32Array(a.length);
+  for (let i = 0; i < a.length; ++i) {
+    result[i] = a[i] + b[i];
+  }
+  return result;
+}
+
+/** Subtracts vector b from vector a, i.e. returns a - b */
+export function sub(a: Vector, b: Vector): Float32Array {
+  assert(a.length === b.length, 'Vectors a and b must be of same length');
+  let result = new Float32Array(a.length);
+  for (let i = 0; i < a.length; ++i) {
+    result[i] = a[i] - b[i];
+  }
+  return result;
+}
+
+/** Returns the square norm of the vector */
+export function norm2(a: Vector): number {
+  let result = 0;
+  for (let i = 0; i < a.length; ++i) {
+    result += a[i] * a[i];
+  }
+  return result;
+}
+
+/** Returns the euclidean distance between two vectors. */
+export function dist(a: Vector, b: Vector): number {
+  return Math.sqrt(dist2(a, b));
+}
+
+/** Returns the square euclidean distance between two vectors. */
+export function dist2(a: Vector, b: Vector): number {
+  assert(a.length === b.length, 'Vectors a and b must be of same length');
+  let result = 0;
+  for (let i = 0; i < a.length; ++i) {
+    let diff = a[i] - b[i];
+    result += diff * diff;
+  }
+  return result;
+}
+
+/** Returns the square euclidean distance between two 2D points. */
+export function dist2_2D(a: Vector, b: Vector): number {
+  let dX = a[0] - b[0];
+  let dY = a[1] - b[1];
+  return dX * dX + dY * dY;
+}
+
+/** Returns the square euclidean distance between two 3D points. */
+export function dist2_3D(a: Vector, b: Vector): number {
+  let dX = a[0] - b[0];
+  let dY = a[1] - b[1];
+  let dZ = a[2] - b[2];
+  return dX * dX + dY * dY + dZ * dZ;
+}
+
+/** Returns the euclidean distance between 2 3D points. */
+export function dist_3D(a: Vector, b: Vector): number {
+  return Math.sqrt(dist2_3D(a, b));
+}
+
+/**
+ * Returns the square euclidean distance between two vectors, with an early
+ * exit (returns -1) if the distance is >= to the provided limit.
+ */
+export function dist2WithLimit(a: Vector, b: Vector, limit: number): number {
+  assert(a.length === b.length, 'Vectors a and b must be of same length');
+  let result = 0;
+  for (let i = 0; i < a.length; ++i) {
+    let diff = a[i] - b[i];
+    result += diff * diff;
+    if (result >= limit) {
+      return -1;
+    }
+  }
+  return result;
+}
+
+/** Returns the square euclidean distance between two 2D points. */
+export function dist22D(a: Point2D, b: Point2D): number {
+  let dX = a[0] - b[0];
+  let dY = a[1] - b[1];
+  return dX * dX + dY * dY;
+}
+
+/** Modifies the vector in-place to have unit norm. */
+export function unit(a: Vector): void {
+  let norm = Math.sqrt(norm2(a));
+  assert(norm >= 0, 'Norm of the vector must be > 0');
+  for (let i = 0; i < a.length; ++i) {
+    a[i] /= norm;
+  }
+}
+
+/**
+ *  Projects the vectors to a lower dimension
+ *
+ * @param vectors Array of vectors to be projected.
+ * @param newDim The resulting dimension of the vectors.
+ */
+export function projectRandom(vectors: Float32Array[], newDim: number):
+    Float32Array[] {
+  let dim = vectors[0].length;
+  let N = vectors.length;
+  let newVectors: Float32Array[] = new Array(N);
+  for (let i = 0; i < N; ++i) {
+    newVectors[i] = new Float32Array(newDim);
+  }
+  // Make nDim projections.
+  for (let k = 0; k < newDim; ++k) {
+    let randomVector = rn(dim);
+    for (let i = 0; i < N; ++i) {
+      newVectors[i][k] = dot(vectors[i], randomVector);
+    }
+  }
+  return newVectors;
+}
+
+/**
+ * Projects a vector onto a 2D plane specified by the two direction vectors.
+ */
+export function project2d(a: Vector, dir1: Vector, dir2: Vector): Point2D {
+  return [dot(a, dir1), dot(a, dir2)];
+}
+
+/**
+ * Computes the centroid of the data points. If the provided data points are not
+ * vectors, an accessor function needs to be provided.
+ */
+export function centroid<T>(dataPoints: T[], accessor?: (a: T) => Vector):
+    Vector {
+  if (dataPoints.length === 0) {
+    return null;
+  }
+  if (accessor == null) {
+    accessor = (a: T) => <any>a;
+  }
+  assert(dataPoints.length >= 0, '`vectors` must be of length >= 1');
+  let centroid = new Float32Array(accessor(dataPoints[0]).length);
+  for (let i = 0; i < dataPoints.length; ++i) {
+    let dataPoint = dataPoints[i];
+    let vector = accessor(dataPoint);
+    for (let j = 0; j < centroid.length; ++j) {
+      centroid[j] += vector[j];
+    }
+  }
+  for (let j = 0; j < centroid.length; ++j) {
+    centroid[j] /= dataPoints.length;
+  }
+  return centroid;
+}
+
+/**
+ * Generates a vector of the specified size where each component is drawn from
+ * a random (0, 1) gaussian distribution.
+ */
+export function rn(size: number): Float32Array {
+  const normal = d3.randomNormal();
+  let result = new Float32Array(size);
+  for (let i = 0; i < size; ++i) {
+    result[i] = normal();
+  }
+  return result;
+}
+
+/**
+ * Returns the cosine distance ([0, 2]) between two vectors
+ * that have been normalized to unit norm.
+ */
+export function cosDistNorm(a: Vector, b: Vector): number {
+  return 1 - dot(a, b);
+}
+
+/**
+ * Returns the cosine distance ([0, 2]) between two vectors.
+ */
+export function cosDist(a: Vector, b: Vector): number {
+  return 1 - cosSim(a, b);
+}
+
+/** Returns the cosine similarity ([-1, 1]) between two vectors. */
+export function cosSim(a: Vector, b: Vector): number {
+  return dot(a, b) / Math.sqrt(norm2(a) * norm2(b));
+}
+
+/**
+ * Converts list of vectors (matrix) into a 1-dimensional
+ * typed array with row-first order.
+ */
+export function toTypedArray<T>(
+    dataPoints: T[], accessor: (dataPoint: T) => Float32Array): Float32Array {
+  let N = dataPoints.length;
+  let dim = accessor(dataPoints[0]).length;
+  let result = new Float32Array(N * dim);
+  for (let i = 0; i < N; ++i) {
+    let vector = accessor(dataPoints[i]);
+    for (let d = 0; d < dim; ++d) {
+      result[i * dim + d] = vector[d];
+    }
+  }
+  return result;
+}
+
+/**
+ * Transposes an RxC matrix represented as a flat typed array
+ * into a CxR matrix, again represented as a flat typed array.
+ */
+export function transposeTypedArray(
+    r: number, c: number, typedArray: Float32Array) {
+  let result = new Float32Array(r * c);
+  for (let i = 0; i < r; ++i) {
+    for (let j = 0; j < c; ++j) {
+      result[j * r + i] = typedArray[i * c + j];
+    }
+  }
+  return result;
+}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-app.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-app.html
new file mode 100644
index 0000000000..34aca77dde
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-app.html
@@ -0,0 +1,105 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+
+<link rel="import" href="vz-projector.html">
+<link rel="import" href="styles.html">
+
+<dom-module id="vz-projector-app">
+<template>
+<style include="vz-projector-styles"></style>
+<style>
+#appbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 24px;
+  height: 60px;
+  color: white;
+  background: #560731;
+}
+
+#appbar .logo {
+  font-size: 18px;
+  font-weight: 300;
+}
+
+.icons {
+  display: flex;
+}
+
+.icons a {
+  color: white;
+}
+
+vz-projector {
+  height: calc(100% - 60px);
+}
+
+#container {
+  height: 100%;
+}
+</style>
+
+<div id="container">
+  <div id="appbar">
+    <div>Embedding Projector</div>
+    <div class="icons">
+      <a title="Documentation" target="_blank" href="[[documentationLink]]">
+        <paper-icon-button icon="help-outline"></paper-icon-button>
+        <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
+          Open documentation
+        </paper-tooltip>
+      </a>
+      <a title="Report bug" target="_blank" href="[[bugReportLink]]">
+        <paper-icon-button icon="bug-report"></paper-icon-button>
+        <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
+          Report a bug
+        </paper-tooltip>
+      </a>
+    </div>
+  </div>
+  <vz-projector route-prefix="[[routePrefix]]"
+      serving-mode="[[servingMode]]"
+      projector-config-json-path="[[projectorConfigJsonPath]]"
+      page-view-logging="[[pageViewLogging]]"
+      event-logging="[[eventLogging]]">
+  </vz-projector>
+</div>
+<!-- Google analytics -->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-46457317-5', 'auto');
+</script>
+</template>
+<script>
+  Polymer({
+    is: 'vz-projector-app',
+    properties: {
+      pageViewLogging: {type: Boolean, value: false},
+      eventLogging: {type: Boolean, value: false}
+    }
+  });
+</script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.html
new file mode 100644
index 0000000000..c37d8d9571
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.html
@@ -0,0 +1,205 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../paper-input/paper-textarea.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+<link rel="import" href="styles.html">
+
+<dom-module id="vz-projector-bookmark-panel">
+<template>
+<style include="vz-projector-styles"></style>
+<style>
+#title {
+  background-color: #fafafa;
+  color: black;
+  font-weight: 500;
+  left: 0;
+  line-height: 60px;
+  padding-left: 24px;
+  position: absolute;
+  width: 276px;
+}
+#bookmark-container {
+  background-color: #fafafa;
+}
+#icon-container {
+  line-height: 60px;
+  position: absolute;
+  right: 0;
+}
+#header {
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  position: relative;
+}
+#panel {
+  background-color: #fafafa;
+  position: relative;
+  overflow-y: scroll;
+  top: 60px;
+  max-height: 50vh;
+}
+
+#save-container {
+  text-align: center;
+}
+
+.state-radio {
+  display: table-cell;
+  vertical-align: middle;
+  padding-top: 16px;
+}
+
+.state-label {
+  display: table-cell;
+  vertical-align: middle;
+  top: 14px;
+}
+
+.state-label-input {
+  width: 194px;
+}
+
+.state-clear {
+  display: table-cell;
+  vertical-align: middle;
+  padding-top: 20px;
+}
+#state-file {
+  display: none;
+}
+#no-bookmarks {
+  padding: 0 24px;
+}
+#action-buttons-container .add-icon-button {
+  background-color: #03a9f4;
+  color: white;
+  margin: 0 4px 4px auto;
+  right: 7px;
+  top: -4px;
+}
+.upload-download-icon-button {
+  padding: 0;
+}
+#action-buttons-container {
+  display: flex;
+  margin-left: 34px;
+  margin-top: 6px;
+}
+.ink-fab {
+  border-radius: 50%;
+  background: white;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+}
+paper-textarea {
+  --paper-input-container-input: {
+    font-size: 12px;
+  }
+  --paper-font-caption: {
+    display: none
+  }
+}
+</style>
+
+<!-- Bookmarking controls -->
+<div id="bookmark-container">
+  <div id="header">
+    <div id="title">
+      BOOKMARKS ([[savedStates.length]])
+      <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+      <paper-tooltip animation-delay="0" position="top" offset="0">
+        Open this drawer to save a set of views of the projection, including
+        selected points. A file containing the bookmarks can then be saved and
+        later loaded to view them.
+      </paper-tooltip>
+    </div>
+    <div id="icon-container">
+      <!-- Icons and event handlers are inverted because the tray expands upwards. -->
+      <paper-icon-button id="expand-more"
+          icon="expand-less"
+          on-tap="_expandMore"></paper-icon-button>
+      <paper-icon-button id="expand-less"
+          style="display: none"
+          icon="expand-more"
+          on-tap="_expandLess"></paper-icon-button>
+    </div>
+  </div>
+  <iron-collapse id="panel">
+    <!-- Saving state section -->
+    <div id="state-section">
+      <template is="dom-if" if="[[!savedStates.length]]">
+        <p id="no-bookmarks">
+            No bookmarks yet, upload a bookmarks file or add a new bookmark by clicking the "+" below.
+        </p>
+      </template>
+
+      <template is="dom-repeat" items="{{savedStates}}">
+        <div class="state-row">
+          <div class="state-radio">
+            <template is="dom-if" if="{{item.isSelected}}">
+              <paper-icon-button icon="radio-button-checked"></paper-icon-button>
+            </template>
+            <template is="dom-if" if="{{!item.isSelected}}">
+              <paper-icon-button
+                  icon="radio-button-unchecked"
+                  data-index$="{{index}}"
+                  on-tap="_radioButtonHandler"></paper-icon-button>
+            </template>
+          </div>
+          <div class="state-label">
+            <paper-textarea value="[[item.label]]"
+                class="state-label-input"
+                on-keyup="_labelChange"
+                data-index$="[[index]]"
+                autoresizing></paper-input>
+          </div>
+          <div class="state-clear">
+            <paper-icon-button
+                icon="clear"
+                data-index$="{{index}}"
+                on-tap="_clearButtonHandler"></paper-icon-button>
+          </div>
+        </div>
+      </template>
+
+      <div id="action-buttons-container">
+        <paper-icon-button
+            class="upload-download-icon-button"
+            icon="save"
+            title="Save bookmarks"
+            disabled="[[!hasStates]]"
+            on-tap="_downloadFile"></paper-icon-button>
+        <paper-icon-button
+            class="upload-download-icon-button"
+            icon="file-upload"
+            title="Load bookmarks"
+            on-tap="_uploadFile"></paper-icon-button>
+        <paper-icon-button
+            class="add-icon-button ink-fab"
+            icon="add"
+            title="Add bookmark"
+            on-tap="_addBookmark"></paper-icon-button>
+        <input type="file" id="state-file" name="state-file"/>
+      </div>
+    </div>
+  </iron-collapse>
+</div>
+
+</template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.ts
new file mode 100644
index 0000000000..53195fa47c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-bookmark-panel.ts
@@ -0,0 +1,283 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {State} from './data';
+import {DataProvider, EmbeddingInfo} from './data-provider';
+import * as logging from './logging';
+import {ProjectorEventContext} from './projectorEventContext';
+import {Projector} from './vz-projector';
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+// tslint:disable-next-line
+export let BookmarkPanelPolymer = PolymerElement({
+  is: 'vz-projector-bookmark-panel',
+  properties: {
+    savedStates: Object,
+    // Keep a separate polymer property because the savedStates doesn't change
+    // when adding and removing states.
+    hasStates: {type: Boolean, value: false},
+    selectedState: Number
+  }
+});
+
+export class BookmarkPanel extends BookmarkPanelPolymer {
+  private projector: Projector;
+
+  // A list containing all of the saved states.
+  private savedStates: State[];
+  private hasStates = false;
+  private selectedState: number;
+  private ignoreNextProjectionEvent: boolean;
+
+  private expandLessButton: HTMLButtonElement;
+  private expandMoreButton: HTMLButtonElement;
+
+  ready() {
+    this.savedStates = [];
+    this.setupUploadButton();
+    this.ignoreNextProjectionEvent = false;
+    this.expandLessButton =
+        this.querySelector('#expand-less') as HTMLButtonElement;
+    this.expandMoreButton =
+        this.querySelector('#expand-more') as HTMLButtonElement;
+  }
+
+  initialize(
+      projector: Projector, projectorEventContext: ProjectorEventContext) {
+    this.projector = projector;
+    projectorEventContext.registerProjectionChangedListener(() => {
+      if (this.ignoreNextProjectionEvent) {
+        this.ignoreNextProjectionEvent = false;
+      } else {
+        this.clearStateSelection();
+      }
+    });
+  }
+
+  setSelectedTensor(
+      run: string, tensorInfo: EmbeddingInfo, dataProvider: DataProvider) {
+    // Clear any existing bookmarks.
+    this.addStates(null);
+    if (tensorInfo && tensorInfo.bookmarksPath) {
+      // Get any bookmarks that may come when the projector starts up.
+      dataProvider.getBookmarks(run, tensorInfo.tensorName, bookmarks => {
+        this.addStates(bookmarks);
+        this._expandMore();
+      });
+    } else {
+      this._expandLess();
+    }
+  }
+
+  /** Handles a click on show bookmarks tray button. */
+  _expandMore() {
+    this.$.panel.show();
+    this.expandMoreButton.style.display = 'none';
+    this.expandLessButton.style.display = '';
+  }
+
+  /** Handles a click on hide bookmarks tray button. */
+  _expandLess() {
+    this.$.panel.hide();
+    this.expandMoreButton.style.display = '';
+    this.expandLessButton.style.display = 'none';
+  }
+
+  /** Handles a click on the add bookmark button. */
+  _addBookmark() {
+    let currentState = this.projector.getCurrentState();
+    currentState.label = 'State ' + this.savedStates.length;
+    currentState.isSelected = true;
+
+    this.selectedState = this.savedStates.length;
+
+    for (let i = 0; i < this.savedStates.length; i++) {
+      this.savedStates[i].isSelected = false;
+      // We have to call notifyPath so that polymer knows this element was
+      // updated.
+      this.notifyPath('savedStates.' + i + '.isSelected', false, false);
+    }
+
+    this.push('savedStates', currentState as any);
+    this.updateHasStates();
+  }
+
+  /** Handles a click on the download bookmarks button. */
+  _downloadFile() {
+    let serializedState = this.serializeAllSavedStates();
+    let blob = new Blob([serializedState], {type: 'text/plain'});
+    let textFile = window.URL.createObjectURL(blob);
+
+    // Force a download.
+    let a = document.createElement('a');
+    document.body.appendChild(a);
+    a.style.display = 'none';
+    a.href = textFile;
+    (a as any).download = 'state';
+    a.click();
+
+    document.body.removeChild(a);
+    window.URL.revokeObjectURL(textFile);
+  }
+
+  /** Handles a click on the upload bookmarks button. */
+  _uploadFile() {
+    let fileInput = this.dom.select('#state-file');
+    (fileInput.node() as HTMLInputElement).click();
+  }
+
+  private setupUploadButton() {
+    // Show and setup the load view button.
+    const fileInput = this.querySelector('#state-file') as HTMLInputElement;
+    fileInput.onchange = () => {
+      const file: File = fileInput.files[0];
+      // Clear out the value of the file chooser. This ensures that if the user
+      // selects the same file, we'll re-read it.
+      fileInput.value = '';
+      const fileReader = new FileReader();
+      fileReader.onload = (evt) => {
+        const str: string = fileReader.result;
+        const savedStates = JSON.parse(str);
+
+        // Verify the bookmarks match.
+        if (this.savedStatesValid(savedStates)) {
+          this.addStates(savedStates);
+          this.loadSavedState(0);
+        } else {
+          logging.setWarningMessage(
+              `Unable to load bookmarks: wrong dataset, expected dataset ` +
+              `with shape (${savedStates[0].dataSetDimensions}).`);
+        }
+      };
+      fileReader.readAsText(file);
+    };
+  }
+
+  addStates(savedStates?: State[]) {
+    if (savedStates == null) {
+      this.savedStates = [];
+    } else {
+      for (let i = 0; i < savedStates.length; i++) {
+        savedStates[i].isSelected = false;
+        this.push('savedStates', savedStates[i] as any);
+      }
+    }
+    this.updateHasStates();
+  }
+
+  /** Deselects any selected state selection. */
+  clearStateSelection() {
+    for (let i = 0; i < this.savedStates.length; i++) {
+      this.setSelectionState(i, false);
+    }
+  }
+
+  /** Handles a radio button click on a saved state. */
+  _radioButtonHandler(evt: Event) {
+    const index = this.getParentDataIndex(evt);
+    this.loadSavedState(index);
+    this.setSelectionState(index, true);
+  }
+
+  loadSavedState(index: number) {
+    for (let i = 0; i < this.savedStates.length; i++) {
+      if (this.savedStates[i].isSelected) {
+        this.setSelectionState(i, false);
+      } else if (index === i) {
+        this.setSelectionState(i, true);
+        this.ignoreNextProjectionEvent = true;
+        this.projector.loadState(this.savedStates[i]);
+      }
+    }
+  }
+
+  private setSelectionState(stateIndex: number, selected: boolean) {
+    this.savedStates[stateIndex].isSelected = selected;
+    const path = 'savedStates.' + stateIndex + '.isSelected';
+    this.notifyPath(path, selected, false);
+  }
+
+  /**
+   * Crawls up the DOM to find an ancestor with a data-index attribute. This is
+   * used to match events to their bookmark index.
+   */
+  private getParentDataIndex(evt: Event) {
+    for (let i = 0; i < (evt as any).path.length; i++) {
+      let dataIndex = (evt as any).path[i].getAttribute('data-index');
+      if (dataIndex != null) {
+        return +dataIndex;
+      }
+    }
+    return -1;
+  }
+
+  /** Handles a clear button click on a bookmark. */
+  _clearButtonHandler(evt: Event) {
+    let index = this.getParentDataIndex(evt);
+    this.splice('savedStates', index, 1);
+    this.updateHasStates();
+  }
+
+  /** Handles a label change event on a bookmark. */
+  _labelChange(evt: Event) {
+    let index = this.getParentDataIndex(evt);
+    this.savedStates[index].label = (evt.target as any).value;
+  }
+
+  /**
+   * Used to determine whether to select the radio button for a given bookmark.
+   */
+  _isSelectedState(index: number) {
+    return index === this.selectedState;
+  }
+  _isNotSelectedState(index: number) {
+    return index !== this.selectedState;
+  }
+
+  /**
+   * Gets all of the saved states as a serialized string.
+   */
+  serializeAllSavedStates(): string {
+    return JSON.stringify(this.savedStates);
+  }
+
+  /**
+   * Loads all of the serialized states and shows them in the list of
+   * viewable states.
+   */
+  loadSavedStates(serializedStates: string) {
+    this.savedStates = JSON.parse(serializedStates);
+    this.updateHasStates();
+  }
+
+  /**
+   * Updates the hasState polymer property.
+   */
+  private updateHasStates() {
+    this.hasStates = (this.savedStates.length !== 0);
+  }
+
+  /** Sanity checks a State array to ensure it matches the current dataset. */
+  private savedStatesValid(states: State[]): boolean {
+    for (let i = 0; i < states.length; i++) {
+      if (states[i].dataSetDimensions[0] !== this.projector.dataSet.dim[0] ||
+          states[i].dataSetDimensions[1] !== this.projector.dataSet.dim[1]) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
+document.registerElement(BookmarkPanel.prototype.is, BookmarkPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-colab.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-colab.html
new file mode 100644
index 0000000000..2acb570b3c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-colab.html
@@ -0,0 +1,32 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="vz-projector.html">
+<dom-module id="vz-projector-colab">
+<template>
+<vz-projector serving-mode="proto" data-proto="[[dataProto]]"></vz-projector>
+</template>
+<script>
+Polymer({
+  is: 'vz-projector-colab',
+  properties: {
+    dataProto: Object
+  }
+});
+</script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html
new file mode 100644
index 0000000000..3857113ac0
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html
@@ -0,0 +1,79 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-dashboard-common/tf-no-data-warning.html">
+<link rel="import" href="vz-projector.html">
+
+<dom-module id="vz-projector-dashboard">
+<template>
+  <tf-no-data-warning
+    data-type="projector"
+    show-warning="[[dataNotFound]]"
+  ></tf-no-data-warning>
+  <template is="dom-if" if="[[!dataNotFound]]">
+    <vz-projector
+      id="projector"
+      route-prefix="[[routePrefix]]"
+      serving-mode="server"
+      page-view-logging
+      event-logging
+    ></vz-projector>
+  </template>
+</template>
+<script>
+(function() {
+TF.Dashboard.VzProjectorDashboard = Polymer({
+  is: 'vz-projector-dashboard',
+  factoryImpl: function(routePrefix) {
+    this.routePrefix = routePrefix;
+  },
+  properties: {
+    dataNotFound: Boolean,
+    routePrefix: String,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
+  },
+  behaviors: [
+    TF.Dashboard.DashboardBehavior("embeddings"),
+  ],
+  reload: function() {
+    // Do not reload the embedding projector. Reloading could take a long time.
+  },
+  attached: function() {
+    if (this._initialized) {
+      return;
+    }
+    let xhr = new XMLHttpRequest();
+    xhr.open('GET', this.routePrefix + '/runs');
+    xhr.onload = () => {
+      // Set this to true so we only initialize once.
+      this._initialized = true;
+
+      let runs = JSON.parse(xhr.responseText);
+      this.set('dataNotFound', runs.length === 0);
+    };
+    xhr.onerror = () => {
+      this.set('dataNotFound', false);
+    };
+    xhr.send();
+  },
+});
+})();
+</script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.html
new file mode 100644
index 0000000000..607d446789
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.html
@@ -0,0 +1,399 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-input/paper-textarea.html">
+<link rel="import" href="../paper-item/paper-item.html">
+<link rel="import" href="../paper-listbox/paper-listbox.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../paper-dialog/paper-dialog.html">
+<link rel="import" href="../paper-dialog-scrollable/paper-dialog-scrollable.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+<link rel="import" href="vz-projector-legend.html">
+<link rel="import" href="styles.html">
+
+<dom-module id="vz-projector-data-panel">
+<template>
+<style include="vz-projector-styles"></style>
+<style>
+.container {
+  padding: 10px 20px 20px 20px;
+}
+
+input[type=file] {
+  display: none;
+}
+
+.file-name {
+  margin-right: 10px;
+}
+
+.dirs {
+  color: rgba(0, 0, 0, 0.7);
+  font-size: 12px;
+}
+
+.dirs table tr {
+  vertical-align: top;
+}
+
+.dirs table tr td {
+  padding-bottom: 10px;
+}
+
+paper-item {
+  --paper-item-disabled: {
+    border-bottom: 1px solid black;
+    justify-content: center;
+    font-size: 12px;
+    line-height: normal;
+    min-height: 0px;
+  };
+}
+
+.item-details {
+  margin-left: 5px;
+  color: gray;
+  font-size: 12px;
+}
+
+paper-dropdown-menu {
+  width: 100%;
+}
+
+paper-dropdown-menu paper-item {
+  justify-content: space-between;
+}
+
+.title {
+  align-items: center;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  color: black;
+  display: flex;
+  font-weight: 500;
+  height: 59px;
+  padding-left: 20px;
+}
+
+#normalize-data-checkbox {
+  margin: 10px 0;
+}
+
+#projector-config-template {
+  --paper-input-container-input: {
+    line-height: 13px;
+    font-family: monospace;
+    font-size: 12px;
+  };
+}
+
+#generate-share-url {
+  padding: 16px;
+  margin-left: 24px;
+}
+
+#projector-share-button-container {
+  margin: 10px 0;
+}
+
+.config-checkbox {
+  display: inline-block;
+  font-size: 11px;
+  margin-left: 10px;
+}
+
+.projector-config-options {
+  margin-top: 12px;
+}
+
+.projector-config-dialog-container {
+  padding: 24px;
+}
+
+.code {
+  background-color: #f7f7f7;
+  display: table;
+  font-family: monospace;
+  margin-top: 7px;
+  padding: 15px;
+}
+
+.delimiter {
+  color: #B71C1C;
+}
+
+.upload-step {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 6px;
+}
+
+.upload-step paper-button {
+  margin-left: 30px;
+}
+
+.step-label {
+  color: rgb(38, 180, 226);
+}
+
+.scrollable-container {
+  margin-top: 0;
+  min-width: 400px;
+}
+
+#projectorConfigDialog p {
+  margin: 8px 0 8px;
+}
+
+.data-step {
+  margin-top: 40px;
+}
+
+.data-step-contents {
+  display: table;
+  width: 100%;
+}
+
+.data-step-contents-contents {
+  display: table-cell;
+  margin-top: 6px;
+}
+
+.data-step-contents-upload {
+  display: table-cell;
+  text-align: right;
+  vertical-align: bottom;
+}
+
+#demo-data-buttons-container {
+  display: none;
+}
+
+.colorby-container {
+  margin-bottom: 10px;
+}
+</style>
+<div class="title">DATA</div>
+<div class="container">
+  <!-- List of runs -->
+  <template is="dom-if" if="[[_hasChoices(runNames)]]">
+    <paper-dropdown-menu no-animations label="[[_getNumRunsLabel(runNames)]] found">
+      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedRun}}">
+        <template is="dom-repeat" items="[[runNames]]">
+          <paper-item value="[[item]]" label="[[item]]">
+            [[item]]
+          </paper-item>
+        </template>
+      </paper-listbox>
+    </paper-dropdown-menu>
+  </template>
+
+  <template is="dom-if" if="[[tensorNames]]">
+    <!-- List of tensors in checkpoint -->
+    <paper-dropdown-menu no-animations label="[[_getNumTensorsLabel(tensorNames)]] found">
+      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedTensor}}">
+        <template is="dom-repeat" items="[[tensorNames]]">
+          <paper-item value="[[item.name]]" label="[[item.name]]">
+            [[item.name]]
+            <span class="item-details">
+              [[item.shape.0]]x[[item.shape.1]]
+            </span>
+          </paper-item>
+        </template>
+      </paper-listbox>
+    </paper-dropdown-menu>
+  </template>
+  <!-- Label by -->
+  <template is="dom-if" if="[[_hasChoices(labelOptions)]]">
+    <paper-dropdown-menu no-animations label="Label by">
+      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedLabelOption}}">
+        <template is="dom-repeat" items="[[labelOptions]]">
+          <paper-item value="[[item]]" label="[[item]]">
+            [[item]]
+          </paper-item>
+        </template>
+      </paper-listbox>
+    </paper-dropdown-menu>
+  </template>
+
+  <!-- Color by -->
+  <div hidden$="[[!_hasChoices(colorOptions)]]" class="colorby-container">
+    <paper-dropdown-menu id="colorby" no-animations label="Color by">
+      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedColorOptionName}}">
+        <template is="dom-repeat" items="[[colorOptions]]">
+          <paper-item class$="[[getSeparatorClass(item.isSeparator)]]" value="[[item.name]]" label="[[item.name]]" disabled="[[item.isSeparator]]">
+            [[item.name]]
+            <span class="item-details">[[item.desc]]</span>
+          </paper-item>
+        </template>
+      </paper-listbox>
+    </paper-dropdown-menu>
+    <div hidden$="[[!showForceCategoricalColorsCheckbox]]">
+      <paper-checkbox id="force-categorical-checkbox"></paper-checkbox>
+      Use categorical coloring
+      <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
+        For metadata fields that have many unique values we use a gradient color map
+        by default. This checkbox allows you to force categorical coloring by a given
+        metadata field.
+      </paper-tooltip>
+    </div>
+    <template dom-if="[[colorLegendRenderInfo]]">
+      <vz-projector-legend render-info="[[colorLegendRenderInfo]]"></vz-projector-legend>
+    </template>
+  </div>
+  <paper-checkbox id="normalize-data-checkbox" checked="{{normalizeData}}">
+    Sphereize data
+    <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+    <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
+      The data is normalized by shifting each point by the centroid and making
+      it unit norm.
+    </paper-tooltip>
+  </paper-checkbox>
+  <p id="demo-data-buttons-container">
+    <span>
+      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
+        Load data from your computer
+      </paper-tooltip>
+      <paper-button id="upload" class="ink-button" onclick="dataDialog.open()">Load data</paper-button>
+    </span>
+    <span id="publish-container">
+      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
+        Publish your embedding visualization and data
+      </paper-tooltip>
+      <paper-button id="host-embedding" class="ink-button" onclick="projectorConfigDialog.open()">Publish</paper-button>
+    </span>
+  </p>
+  <div>
+    <paper-dialog id="dataDialog" with-backdrop>
+      <h2>Load data from your computer</h2>
+      <paper-dialog-scrollable class="scrollable-container">
+        <div class="data-step" id="upload-tensors-step-container">
+          <div class="upload-step">
+            <div>
+                <b><span class="step-label">Step 1:</span> Load a TSV file of vectors.</b>
+            </div>
+          </div>
+          <div class="data-step-contents">
+            <div class="data-step-contents-contents">
+              Example of 3 vectors with dimension 4:
+              <div class="code">
+                0.1<span class="delimiter">\t</span>0.2<span class="delimiter">\t</span>0.5<span class="delimiter">\t</span>0.9<br/>
+                0.2<span class="delimiter">\t</span>0.1<span class="delimiter">\t</span>5.0<span class="delimiter">\t</span>0.2<br/>
+                0.4<span class="delimiter">\t</span>0.1<span class="delimiter">\t</span>7.0<span class="delimiter">\t</span>0.8
+              </div>
+            </div>
+            <div class="data-step-contents-upload">
+              <paper-button id="upload-tensors" title="Choose a TSV tensor file">Choose file</paper-button>
+              <input type="file" id="file" name="file"/>
+            </div>
+          </div>
+        </div>
+        <div class="data-step">
+          <div class="upload-step">
+            <div>
+                <span class="step-label" id="upload-metadata-label"><b>Step 2</b> (optional):</span> <b>Load a TSV file of metadata.</b>
+            </div>
+          </div>
+          <div class="data-step-contents">
+            <div class="data-step-contents-contents">
+              Example of 3 data points and 2 columns.<br/>
+              <i>Note: If there is more than one column, the first row will be parsed as column labels.</i>
+              <div class="code">
+                <b>Pokémon<span class="delimiter">\t</span>Species</b><br/>
+                Wartortle<span class="delimiter">\t</span>Turtle<br/>
+                Venusaur<span class="delimiter">\t</span>Seed<br/>
+                Charmeleon<span class="delimiter">\t</span>Flame
+              </div>
+            </div>
+            <div class="data-step-contents-upload">
+              <paper-button id="upload-metadata" title="Choose a TSV metadata file" class="ink-button">Choose file</paper-button>
+              <input type="file" id="file-metadata" name="file-metadata"/>
+            </div>
+          </div>
+        </div>
+      </paper-dialog-scrollable>
+      <div class="dismiss-dialog-note">Click outside to dismiss.</div>
+    </paper-dialog>
+    <paper-dialog id="projectorConfigDialog" with-backdrop>
+      <h2>Publish your embedding visualization and data</h2>
+      <paper-dialog-scrollable class="scrollable-container">
+        <div>
+          <p>
+            If you'd like to share your visualization with the world, follow these simple steps.
+            See <a target=_blank href="https://www.tensorflow.org/get_started/embedding_viz">this tutorial</a> for more.
+          </p>
+          <h4><span class="step-label">Step 1:</span> Make data public</h4>
+          <p>
+            Host tensors, metadata, sprite image, and bookmarks TSV files <i>publicly</i> on the web.
+          </p>
+          <p>
+            One option is using a <a target=_blank href="https://gist.github.com/">github gist</a>.
+            If you choose this approach, make sure to link directly to the raw file.
+          </p>
+        </div>
+        <div>
+          <h4><span class="step-label">Step 2:</span> Projector config</h4>
+          <div class="projector-config-options">
+            <i>Optional:</i>
+            <div class="config-checkbox">
+              <paper-checkbox id="config-metadata-checkbox" checked>Metadata</paper-checkbox>
+            </div>
+            <div class="config-checkbox">
+              <paper-checkbox id="config-sprite-checkbox">Sprite</paper-checkbox>
+            </div>
+            <div class="config-checkbox">
+              <paper-checkbox id="config-bookmarks-checkbox">Bookmarks</paper-checkbox>
+            </div>
+          </div>
+        </div>
+        <paper-textarea id="projector-config-template" label="template_projector_config.json"></paper-textarea>
+        <div>
+          <h4><span class="step-label">Step 3:</span> Host projector config</h4>
+          After you have hosted the projector config JSON file you built above, paste the URL to the config below.
+        </div>
+        <paper-input id="projector-config-url" label="Path to projector config"></paper-input>
+        <paper-input id="projector-share-url" label="Your shareable URL" readonly></paper-input>
+        <div id="projector-share-button-container">
+          <a target=_blank id="projector-share-url-link">
+            <paper-button title="Test your shareable URL" class="ink-button">Test your shareable URL</paper-button>
+          </a>
+        </div>
+      </paper-dialog-scrollable>
+      <div class="dismiss-dialog-note">Click outside to dismiss.</div>
+    </paper-dialog>
+  </div>
+  <div class="dirs">
+    <table>
+      <tr>
+        <td>Checkpoint:</td>
+        <td><span id="checkpoint-file"></span></td>
+      </tr>
+      <tr>
+        <td>Metadata:</td>
+        <td><span id="metadata-file"></span></td>
+      </tr>
+    </table>
+  </div>
+</div>
+<!-- Closing global template -->
+</template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.ts
new file mode 100644
index 0000000000..a6847ed3c8
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-data-panel.ts
@@ -0,0 +1,497 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import {ColorOption, ColumnStats, SpriteAndMetadataInfo} from './data';
+import {DataProvider, EmbeddingInfo, parseRawMetadata, parseRawTensors, ProjectorConfig} from './data-provider';
+import * as util from './util';
+import {Projector} from './vz-projector';
+import {ColorLegendRenderInfo, ColorLegendThreshold} from './vz-projector-legend';
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+export let DataPanelPolymer = PolymerElement({
+  is: 'vz-projector-data-panel',
+  properties: {
+    selectedTensor: {type: String, observer: '_selectedTensorChanged'},
+    selectedRun: {type: String, observer: '_selectedRunChanged'},
+    selectedColorOptionName: {
+      type: String,
+      notify: true,
+      observer: '_selectedColorOptionNameChanged'
+    },
+    selectedLabelOption:
+        {type: String, notify: true, observer: '_selectedLabelOptionChanged'},
+    normalizeData: Boolean,
+    showForceCategoricalColorsCheckbox: Boolean
+  }
+});
+
+export class DataPanel extends DataPanelPolymer {
+  selectedLabelOption: string;
+  selectedColorOptionName: string;
+  showForceCategoricalColorsCheckbox: boolean;
+
+  private normalizeData: boolean;
+  private labelOptions: string[];
+  private colorOptions: ColorOption[];
+  forceCategoricalColoring: boolean = false;
+
+  private selectedTensor: string;
+  private selectedRun: string;
+  private dataProvider: DataProvider;
+  private tensorNames: {name: string, shape: number[]}[];
+  private runNames: string[];
+  private projector: Projector;
+  private projectorConfig: ProjectorConfig;
+  private colorLegendRenderInfo: ColorLegendRenderInfo;
+  private spriteAndMetadata: SpriteAndMetadataInfo;
+  private metadataFile: string;
+
+  ready() {
+    this.normalizeData = true;
+  }
+
+  initialize(projector: Projector, dp: DataProvider) {
+    this.projector = projector;
+    this.dataProvider = dp;
+    this.setupUploadButtons();
+
+    // Tell the projector whenever the data normalization changes.
+    // Unknown why, but the polymer checkbox button stops working as soon as
+    // you do d3.select() on it.
+    this.querySelector('#normalize-data-checkbox')
+        .addEventListener('change', () => {
+          this.projector.setNormalizeData(this.normalizeData);
+        });
+
+    let forceCategoricalColoringCheckbox =
+        this.querySelector('#force-categorical-checkbox');
+    forceCategoricalColoringCheckbox.addEventListener('change', () => {
+      this.setForceCategoricalColoring(
+          (forceCategoricalColoringCheckbox as HTMLInputElement).checked);
+    });
+
+    // Get all the runs.
+    this.dataProvider.retrieveRuns(runs => {
+      this.runNames = runs;
+      // Choose the first run by default.
+      if (this.runNames.length > 0) {
+        this.selectedRun = runs[0];
+      }
+    });
+  }
+
+  setForceCategoricalColoring(forceCategoricalColoring: boolean) {
+    this.forceCategoricalColoring = forceCategoricalColoring;
+    (this.querySelector('#force-categorical-checkbox') as HTMLInputElement)
+        .checked = this.forceCategoricalColoring;
+
+    this.updateMetadataUI(this.spriteAndMetadata.stats, this.metadataFile);
+
+    // The selected color option name doesn't change when we switch to using
+    // categorical coloring for stats with too many unique values, so we
+    // manually call this polymer observer so that we update the UI.
+    this._selectedColorOptionNameChanged();
+  }
+
+  getSeparatorClass(isSeparator: boolean): string {
+    return isSeparator ? 'separator' : null;
+  }
+
+  metadataChanged(
+      spriteAndMetadata: SpriteAndMetadataInfo, metadataFile: string) {
+    this.spriteAndMetadata = spriteAndMetadata;
+    this.metadataFile = metadataFile;
+
+    this.updateMetadataUI(this.spriteAndMetadata.stats, this.metadataFile);
+    this.selectedColorOptionName = this.colorOptions[0].name;
+  }
+
+  private addWordBreaks(longString: string): string {
+    if (longString == null) {
+      return '';
+    }
+    return longString.replace(/([\/=-_,])/g, '$1<wbr>');
+  }
+
+  private updateMetadataUI(columnStats: ColumnStats[], metadataFile: string) {
+    const metadataFileElement =
+        this.querySelector('#metadata-file') as HTMLSpanElement;
+    metadataFileElement.innerHTML = this.addWordBreaks(metadataFile);
+    metadataFileElement.title = metadataFile;
+
+    // Label by options.
+    let labelIndex = -1;
+    this.labelOptions = columnStats.map((stats, i) => {
+      // Make the default label by the first non-numeric column.
+      if (!stats.isNumeric && labelIndex === -1) {
+        labelIndex = i;
+      }
+      return stats.name;
+    });
+    this.selectedLabelOption = this.labelOptions[Math.max(0, labelIndex)];
+
+    // Color by options.
+    const standardColorOption: ColorOption[] = [
+      {name: 'No color map'},
+      // TODO(smilkov): Implement this.
+      // {name: 'Distance of neighbors',
+      //    desc: 'How far is each point from its neighbors'}
+    ];
+    const metadataColorOption: ColorOption[] =
+        columnStats
+            .filter(stats => {
+              return !stats.tooManyUniqueValues || stats.isNumeric;
+            })
+            .map(stats => {
+              let map;
+              let items: {label: string, count: number}[];
+              let thresholds: ColorLegendThreshold[];
+              let isCategorical =
+                  this.forceCategoricalColoring || !stats.tooManyUniqueValues;
+              if (isCategorical) {
+                const scale = d3.scaleOrdinal(d3.schemeCategory20);
+                let range = scale.range();
+                // Re-order the range.
+                let newRange = range.map((color, i) => {
+                  let index = (i * 3) % range.length;
+                  return range[index];
+                });
+                items = stats.uniqueEntries;
+                scale.range(newRange).domain(items.map(x => x.label));
+                map = scale;
+              } else {
+                thresholds = [
+                  {color: '#ffffdd', value: stats.min},
+                  {color: '#1f2d86', value: stats.max}
+                ];
+                map = d3.scaleLinear<string, string>()
+                          .domain(thresholds.map(t => t.value))
+                          .range(thresholds.map(t => t.color));
+              }
+              let desc = !isCategorical ? 'gradient' :
+                                          stats.uniqueEntries.length +
+                      ((stats.uniqueEntries.length > 20) ? ' non-unique' : '') +
+                      ' colors';
+              return {
+                name: stats.name,
+                desc: desc,
+                map: map,
+                items: items,
+                thresholds: thresholds,
+                tooManyUniqueValues: stats.tooManyUniqueValues
+              };
+            });
+
+    if (metadataColorOption.length > 0) {
+      // Add a separator line between built-in color maps
+      // and those based on metadata columns.
+      standardColorOption.push({name: 'Metadata', isSeparator: true});
+    }
+    this.colorOptions = standardColorOption.concat(metadataColorOption);
+  }
+
+  setNormalizeData(normalizeData: boolean) {
+    this.normalizeData = normalizeData;
+  }
+
+  _selectedTensorChanged() {
+    this.projector.updateDataSet(null, null, null);
+    if (this.selectedTensor == null) {
+      return;
+    }
+    this.dataProvider.retrieveTensor(
+        this.selectedRun, this.selectedTensor, ds => {
+          let metadataFile =
+              this.getEmbeddingInfoByName(this.selectedTensor).metadataPath;
+          this.dataProvider.retrieveSpriteAndMetadata(
+              this.selectedRun, this.selectedTensor, metadata => {
+                this.projector.updateDataSet(ds, metadata, metadataFile);
+              });
+        });
+    this.projector.setSelectedTensor(
+        this.selectedRun, this.getEmbeddingInfoByName(this.selectedTensor));
+  }
+
+  _selectedRunChanged() {
+    this.dataProvider.retrieveProjectorConfig(this.selectedRun, info => {
+      this.projectorConfig = info;
+      let names =
+          this.projectorConfig.embeddings.map(e => e.tensorName)
+              .filter(name => {
+                let shape = this.getEmbeddingInfoByName(name).tensorShape;
+                return shape.length === 2 && shape[0] > 1 && shape[1] > 1;
+              })
+              .sort((a, b) => {
+                let embA = this.getEmbeddingInfoByName(a);
+                let embB = this.getEmbeddingInfoByName(b);
+
+                // Prefer tensors with metadata.
+                if (util.xor(!!embA.metadataPath, !!embB.metadataPath)) {
+                  return embA.metadataPath ? -1 : 1;
+                }
+
+                // Prefer non-generated tensors.
+                let isGenA = util.tensorIsGenerated(a);
+                let isGenB = util.tensorIsGenerated(b);
+                if (util.xor(isGenA, isGenB)) {
+                  return isGenB ? -1 : 1;
+                }
+
+                // Prefer bigger tensors.
+                let sizeA = embA.tensorShape[0];
+                let sizeB = embB.tensorShape[0];
+                if (sizeA !== sizeB) {
+                  return sizeB - sizeA;
+                }
+
+                // Sort alphabetically by tensor name.
+                return a <= b ? -1 : 1;
+              });
+      this.tensorNames = names.map(name => {
+        return {name, shape: this.getEmbeddingInfoByName(name).tensorShape};
+      });
+      const wordBreakablePath =
+          this.addWordBreaks(this.projectorConfig.modelCheckpointPath);
+      const checkpointFile =
+          this.querySelector('#checkpoint-file') as HTMLSpanElement;
+      checkpointFile.innerHTML = wordBreakablePath;
+      checkpointFile.title = this.projectorConfig.modelCheckpointPath;
+
+      // If in demo mode, let the order decide which tensor to load by default.
+      const defaultTensor = this.projector.servingMode === 'demo' ?
+          this.projectorConfig.embeddings[0].tensorName :
+          names[0];
+      if (this.selectedTensor === defaultTensor) {
+        // Explicitly call the observer. Polymer won't call it if the previous
+        // string matches the current string.
+        this._selectedTensorChanged();
+      } else {
+        this.selectedTensor = defaultTensor;
+      }
+    });
+  }
+
+  _selectedLabelOptionChanged() {
+    this.projector.setSelectedLabelOption(this.selectedLabelOption);
+  }
+
+  _selectedColorOptionNameChanged() {
+    let colorOption: ColorOption;
+    for (let i = 0; i < this.colorOptions.length; i++) {
+      if (this.colorOptions[i].name === this.selectedColorOptionName) {
+        colorOption = this.colorOptions[i];
+        break;
+      }
+    }
+    if (!colorOption) {
+      return;
+    }
+
+    this.showForceCategoricalColorsCheckbox = !!colorOption.tooManyUniqueValues;
+
+    if (colorOption.map == null) {
+      this.colorLegendRenderInfo = null;
+    } else if (colorOption.items) {
+      let items = colorOption.items.map(item => {
+        return {
+          color: colorOption.map(item.label),
+          label: item.label,
+          count: item.count
+        };
+      });
+      this.colorLegendRenderInfo = {items, thresholds: null};
+    } else {
+      this.colorLegendRenderInfo = {
+        items: null,
+        thresholds: colorOption.thresholds
+      };
+    }
+    this.projector.setSelectedColorOption(colorOption);
+  }
+
+  private tensorWasReadFromFile(rawContents: ArrayBuffer, fileName: string) {
+    parseRawTensors(rawContents, ds => {
+      const checkpointFile =
+          this.querySelector('#checkpoint-file') as HTMLSpanElement;
+      checkpointFile.innerText = fileName;
+      checkpointFile.title = fileName;
+      this.projector.updateDataSet(ds);
+    });
+  }
+
+  private metadataWasReadFromFile(rawContents: ArrayBuffer, fileName: string) {
+    parseRawMetadata(rawContents, metadata => {
+      this.projector.updateDataSet(this.projector.dataSet, metadata, fileName);
+    });
+  }
+
+  private getEmbeddingInfoByName(tensorName: string): EmbeddingInfo {
+    for (let i = 0; i < this.projectorConfig.embeddings.length; i++) {
+      const e = this.projectorConfig.embeddings[i];
+      if (e.tensorName === tensorName) {
+        return e;
+      }
+    }
+  }
+
+  private setupUploadButtons() {
+    // Show and setup the upload button.
+    const fileInput = this.querySelector('#file') as HTMLInputElement;
+    fileInput.onchange = () => {
+      const file: File = fileInput.files[0];
+      // Clear out the value of the file chooser. This ensures that if the user
+      // selects the same file, we'll re-read it.
+      fileInput.value = '';
+      const fileReader = new FileReader();
+      fileReader.onload = evt => {
+        const content: ArrayBuffer = fileReader.result;
+        this.tensorWasReadFromFile(content, file.name);
+      };
+      fileReader.readAsArrayBuffer(file);
+    };
+
+    const uploadButton =
+        this.querySelector('#upload-tensors') as HTMLButtonElement;
+    uploadButton.onclick = () => {
+      fileInput.click();
+    };
+
+    // Show and setup the upload metadata button.
+    const fileMetadataInput =
+        this.querySelector('#file-metadata') as HTMLInputElement;
+    fileMetadataInput.onchange = () => {
+      const file: File = fileMetadataInput.files[0];
+      // Clear out the value of the file chooser. This ensures that if the user
+      // selects the same file, we'll re-read it.
+      fileMetadataInput.value = '';
+      const fileReader = new FileReader();
+      fileReader.onload = evt => {
+        const contents: ArrayBuffer = fileReader.result;
+        this.metadataWasReadFromFile(contents, file.name);
+      };
+      fileReader.readAsArrayBuffer(file);
+    };
+
+    const uploadMetadataButton =
+        this.querySelector('#upload-metadata') as HTMLButtonElement;
+    uploadMetadataButton.onclick = () => {
+      fileMetadataInput.click();
+    };
+
+    if (this.projector.servingMode !== 'demo') {
+      (this.$$('#publish-container') as HTMLElement).style.display = 'none';
+      (this.$$('#upload-tensors-step-container') as HTMLElement).style.display =
+          'none';
+      (this.$$('#upload-metadata-label') as HTMLElement).style.display = 'none';
+    }
+
+    (this.$$('#demo-data-buttons-container') as HTMLElement).style.display =
+        'block';
+
+    // Fill out the projector config.
+    const projectorConfigTemplate =
+        this.$$('#projector-config-template') as HTMLTextAreaElement;
+    const projectorConfigTemplateJson: ProjectorConfig = {
+      embeddings: [{
+        tensorName: 'My tensor',
+        tensorShape: [1000, 50],
+        tensorPath: 'https://raw.githubusercontent.com/.../tensors.tsv',
+        metadataPath:
+            'https://raw.githubusercontent.com/.../optional.metadata.tsv',
+      }],
+    };
+    this.setProjectorConfigTemplateJson(
+        projectorConfigTemplate, projectorConfigTemplateJson);
+
+    // Set up optional field checkboxes.
+    const spriteFieldCheckbox =
+        this.$$('#config-sprite-checkbox') as HTMLInputElement;
+    spriteFieldCheckbox.onchange = () => {
+      if ((spriteFieldCheckbox as any).checked) {
+        projectorConfigTemplateJson.embeddings[0].sprite = {
+          imagePath: 'https://github.com/.../optional.sprite.png',
+          singleImageDim: [32, 32]
+        };
+      } else {
+        delete projectorConfigTemplateJson.embeddings[0].sprite;
+      }
+      this.setProjectorConfigTemplateJson(
+          projectorConfigTemplate, projectorConfigTemplateJson);
+    };
+    const bookmarksFieldCheckbox =
+        this.$$('#config-bookmarks-checkbox') as HTMLInputElement;
+    bookmarksFieldCheckbox.onchange = () => {
+      if ((bookmarksFieldCheckbox as any).checked) {
+        projectorConfigTemplateJson.embeddings[0].bookmarksPath =
+            'https://raw.githubusercontent.com/.../bookmarks.txt';
+      } else {
+        delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
+      }
+      this.setProjectorConfigTemplateJson(
+          projectorConfigTemplate, projectorConfigTemplateJson);
+    };
+    const metadataFieldCheckbox =
+        this.$$('#config-metadata-checkbox') as HTMLInputElement;
+    metadataFieldCheckbox.onchange = () => {
+      if ((metadataFieldCheckbox as HTMLInputElement).checked) {
+        projectorConfigTemplateJson.embeddings[0].metadataPath =
+            'https://raw.githubusercontent.com/.../optional.metadata.tsv';
+      } else {
+        delete projectorConfigTemplateJson.embeddings[0].metadataPath;
+      }
+      this.setProjectorConfigTemplateJson(
+          projectorConfigTemplate, projectorConfigTemplateJson);
+    };
+
+    // Update the link and the readonly shareable URL.
+    const projectorConfigUrlInput =
+        this.$$('#projector-config-url') as HTMLInputElement;
+    const projectorConfigDemoUrlInput = this.$$('#projector-share-url');
+    const projectorConfigDemoUrlLink = this.$$('#projector-share-url-link');
+    projectorConfigUrlInput.onchange = () => {
+      let projectorDemoUrl = location.protocol + '//' + location.host +
+          location.pathname +
+          '?config=' + (projectorConfigUrlInput as HTMLInputElement).value;
+
+      (projectorConfigDemoUrlInput as HTMLInputElement).value =
+          projectorDemoUrl;
+      (projectorConfigDemoUrlLink as HTMLLinkElement).href = projectorDemoUrl;
+    };
+  }
+
+  private setProjectorConfigTemplateJson(
+      projectorConfigTemplate: HTMLTextAreaElement, config: ProjectorConfig) {
+    projectorConfigTemplate.value =
+        JSON.stringify(config, null, /** replacer */ 2 /** white space */);
+  }
+
+  _getNumTensorsLabel(): string {
+    return this.tensorNames.length === 1 ? '1 tensor' :
+                                           this.tensorNames.length + ' tensors';
+  }
+
+  _getNumRunsLabel(): string {
+    return this.runNames.length === 1 ? '1 run' :
+                                        this.runNames.length + ' runs';
+  }
+
+  _hasChoices(choices: any[]): boolean {
+    return choices.length > 1;
+  }
+}
+
+document.registerElement(DataPanel.prototype.is, DataPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.html
new file mode 100644
index 0000000000..e77694426e
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.html
@@ -0,0 +1,64 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+<link rel="import" href="styles.html">
+
+<dom-module id="vz-projector-input">
+<template>
+<style include="vz-projector-styles"></style>
+<style>
+.info {
+  color: rgba(0, 0, 0, 0.5);
+  display: block;
+  font-size: 11px;
+}
+
+.toggle {
+  font-size: 12px;
+  height: 21px;
+  margin: 0px;
+  min-width: 0px;
+  min-height: 0px;
+  padding: 0;
+  width: 17px;
+}
+
+.toggle[active] {
+  background-color: #880E4F;
+  color: white;
+}
+</style>
+
+<paper-input label="[[label]]">
+  <div class="slash" prefix>/</div>
+  <div class="slash" suffix>/</div>
+  <div suffix>
+    <paper-button id="regex" toggles class="toggle">.*</paper-button>
+  </div>
+</paper-input>
+<paper-tooltip for="regex" position="bottom" animation-delay="0" fit-to-visible-bounds>
+  Enable/disable regex mode.
+</paper-tooltip>
+<span class="info">[[message]]</span>
+
+<!-- Closing global template -->
+</template>
+</dom-module>
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.ts
new file mode 100644
index 0000000000..e11346d327
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-input.ts
@@ -0,0 +1,113 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+// tslint:disable-next-line
+export let PolymerClass = PolymerElement(
+    {is: 'vz-projector-input', properties: {label: String, message: String}});
+
+export interface InputChangedListener {
+  (value: string, inRegexMode: boolean): void;
+}
+
+/** Input control with custom capabilities (e.g. regex). */
+export class ProjectorInput extends PolymerClass {
+  private textChangedListeners: InputChangedListener[];
+  private paperInput: HTMLInputElement;
+  private inRegexModeButton: HTMLButtonElement;
+  private inRegexMode: boolean;
+
+  /** Message that will be displayed at the bottom of the input control. */
+  message: string;
+
+  /** Subscribe to be called everytime the input changes. */
+  registerInputChangedListener(listener: InputChangedListener) {
+    this.textChangedListeners.push(listener);
+  }
+
+  ready() {
+    this.inRegexMode = false;
+    this.textChangedListeners = [];
+    this.paperInput = this.querySelector('paper-input') as HTMLInputElement;
+    this.inRegexModeButton =
+        this.querySelector('paper-button') as HTMLButtonElement;
+    this.paperInput.setAttribute('error-message', 'Invalid regex');
+
+    this.paperInput.addEventListener('input', () => {
+      this.onTextChanged();
+    });
+
+    this.paperInput.addEventListener('keydown', event => {
+      event.stopPropagation();
+    });
+
+    this.inRegexModeButton.addEventListener(
+        'click', () => this.onClickRegexModeButton());
+    this.updateRegexModeDisplaySlashes();
+    this.onTextChanged();
+  }
+
+  private onClickRegexModeButton() {
+    this.inRegexMode = (this.inRegexModeButton as any).active;
+    this.updateRegexModeDisplaySlashes();
+    this.onTextChanged();
+  }
+
+  private notifyInputChanged(value: string, inRegexMode: boolean) {
+    this.textChangedListeners.forEach(l => l(value, inRegexMode));
+  }
+
+  private onTextChanged() {
+    try {
+      if (this.inRegexMode) {
+        new RegExp(this.paperInput.value);
+      }
+    } catch (invalidRegexException) {
+      this.paperInput.setAttribute('invalid', 'true');
+      this.message = '';
+      this.notifyInputChanged(null, true);
+      return;
+    }
+    this.paperInput.removeAttribute('invalid');
+    this.notifyInputChanged(this.paperInput.value, this.inRegexMode);
+  }
+
+  private updateRegexModeDisplaySlashes() {
+    const slashes = this.paperInput.querySelectorAll('.slash');
+    const display = this.inRegexMode ? '' : 'none';
+
+    for (let i = 0; i < slashes.length; i++) {
+      (slashes[i] as HTMLDivElement).style.display = display;
+    }
+  }
+
+  getValue(): string {
+    return this.paperInput.value;
+  }
+
+  getInRegexMode(): boolean {
+    return this.inRegexMode;
+  }
+
+  set(value: string, inRegexMode: boolean) {
+    (this.inRegexModeButton as any).active = inRegexMode;
+    this.paperInput.value = value;
+    this.onClickRegexModeButton();
+  }
+}
+
+document.registerElement(ProjectorInput.prototype.is, ProjectorInput);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html
new file mode 100644
index 0000000000..7554c322ce
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html
@@ -0,0 +1,240 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-slider/paper-slider.html">
+
+<link rel="import" href="styles.html">
+<link rel="import" href="vz-projector-input.html">
+
+<dom-module id="vz-projector-inspector-panel">
+<style include="vz-projector-styles"></style>
+<style>
+:host {
+   display: flex;
+   flex-direction: column;
+   /* Account for the bookmark pane at the bottom */
+   height: calc(100% - 55px);
+}
+
+.container {
+  display: block;
+  padding: 10px 20px 0 20px;
+}
+
+.buttons {
+  display: flex;
+  height: 60px;
+}
+
+.button {
+  margin-right: 10px;
+  border: none;
+  border-radius: 7px;
+  font-size: 13px;
+  padding: 10px;
+  background: #e3e3e3;
+}
+
+.button:last-child {
+  margin-right: 0;
+}
+
+.nn {
+  display: flex;
+  flex-direction: column;
+}
+
+.nn > * {
+  padding: 0 20px;
+}
+
+.nn-list {
+  overflow-y: auto;
+}
+
+.nn-list .neighbor {
+  font-size: 12px;
+  margin-bottom: 8px;
+}
+
+.nn-list .label-and-value {
+  display: flex;
+  justify-content: space-between;
+}
+
+.label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.nn-list .value {
+  color: #666;
+  float: right;
+  font-weight: 300;
+  margin-left: 8px;
+}
+
+.nn-list .bar {
+  position: relative;
+  border-top: 1px solid rgba(0, 0, 0, 0.15);
+  margin: 2px 0;
+}
+
+.nn-list .bar .fill {
+  position: absolute;
+  top: -1px;
+  border-top: 1px solid white;
+}
+
+.nn-list .tick {
+  position: absolute;
+  top: 0px;
+  height: 3px;
+  border-left: 1px solid rgba(0, 0, 0, 0.15);
+}
+
+.nn-list .neighbor-link:hover {
+  cursor: pointer;
+}
+
+.search-by {
+  display: flex;
+}
+
+.search-by vz-projector-input {
+  width: 100%;
+}
+
+.search-by paper-dropdown-menu {
+  margin-left: 10px;
+  width: 100px;
+}
+
+.distance .options {
+  float: right;
+}
+
+.options a {
+  color: #727272;
+  font-size: 13px;
+  margin-left: 12px;
+  text-decoration: none;
+}
+
+.options a.selected {
+  color: #009EFE;
+}
+
+.neighbors {
+  margin-bottom: 30px;
+}
+
+.neighbors-options {
+  margin-top: 6px;
+}
+
+.neighbors-options .option-label, .distance .option-label {
+  color: #727272;
+  margin-right: 2px;
+  width: auto;
+}
+
+.num-neighbors-container {
+  display: inline-block;
+}
+
+#nn-slider {
+  margin: 0 -12px 0 10px;
+}
+
+.euclidian {
+  margin-right: 10px;
+}
+
+.matches-list {
+  padding: 0 20px;
+}
+
+.matches-list .row {
+  border-bottom: 1px solid #ddd;
+  cursor: pointer;
+  display: flex;
+  font-size: 12px;
+  margin: 5px 0;
+  padding: 4px 0;
+}
+
+.results {
+  display: flex;
+  flex-direction: column;
+}
+</style>
+<template>
+<div class="container">
+  <div class="buttons">
+    <button class="button reset-filter">Show All Data</button>
+    <button class="button set-filter">Isolate selection</button>
+    <button class="button clear-selection">Clear selection</button>
+  </div>
+  <div class="search-by">
+    <vz-projector-input id="search-box" label="Search"></vz-projector-input>
+    <paper-dropdown-menu no-animations label="by">
+      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedMetadataField}}">
+        <template is="dom-repeat" items="[[metadataFields]]">
+          <paper-item value="[[item]]" label="[[item]]">
+            [[item]]
+          </paper-item>
+        </template>
+      </paper-listbox>
+    </paper-dropdown-menu>
+  </div>
+</div>
+<div class="results">
+  <div class="nn" style="display: none">
+    <div class="neighbors">
+      <div class="neighbors-options">
+        <div class="slider num-nn">
+          <span class="option-label">neighbors</span>
+          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+          <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
+            The number of neighbors (in the original space) to show when clicking on a point.
+          </paper-tooltip>
+          <paper-slider id="nn-slider" pin min="5" max="1000" value="100"></paper-slider>
+          <span class="nn-count"></span>
+        </div>
+      </div>
+      <div class="distance">
+        <span class="option-label">distance</span>
+        <div class="options">
+          <a class="selected cosine" href="javascript:void(0);">COSINE</a>
+          <a class="euclidean" href="javascript:void(0);">EUCLIDIAN</a>
+        </div>
+      </div>
+    </div>
+    <p>Nearest points in the original space:
+    <div class="nn-list"></div>
+  </div>
+  <div class="matches-list" style="display: none">
+    <div class="list"></div>
+    <div class="limit-msg">Showing only the first 100 results...</div>
+  </div>
+</div>
+<!-- Closing global template -->
+</template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.ts
new file mode 100644
index 0000000000..3ee2c2165f
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.ts
@@ -0,0 +1,337 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {DistanceFunction, SpriteAndMetadataInfo, State} from './data';
+import * as knn from './knn';
+import {ProjectorEventContext} from './projectorEventContext';
+import * as adapter from './projectorScatterPlotAdapter';
+import * as util from './util';
+import * as vector from './vector';
+import {Projector} from './vz-projector';
+import {ProjectorInput} from './vz-projector-input';
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+/** Limit the number of search results we show to the user. */
+const LIMIT_RESULTS = 100;
+
+// tslint:disable-next-line
+export let PolymerClass = PolymerElement({
+  is: 'vz-projector-inspector-panel',
+  properties: {selectedMetadataField: String, metadataFields: Array}
+});
+
+export class InspectorPanel extends PolymerClass {
+  distFunc: DistanceFunction;
+  numNN: number;
+
+  private projectorEventContext: ProjectorEventContext;
+
+  private selectedMetadataField: string;
+  private metadataFields: string[];
+  private projector: Projector;
+  private selectedPointIndices: number[];
+  private neighborsOfFirstPoint: knn.NearestEntry[];
+  private searchBox: ProjectorInput;
+
+  private resetFilterButton: HTMLButtonElement;
+  private setFilterButton: HTMLButtonElement;
+  private clearSelectionButton: HTMLButtonElement;
+  private limitMessage: HTMLDivElement;
+
+  ready() {
+    this.resetFilterButton =
+        this.querySelector('.reset-filter') as HTMLButtonElement;
+    this.setFilterButton =
+        this.querySelector('.set-filter') as HTMLButtonElement;
+    this.clearSelectionButton =
+        this.querySelector('.clear-selection') as HTMLButtonElement;
+    this.limitMessage = this.querySelector('.limit-msg') as HTMLDivElement;
+    this.searchBox = this.querySelector('#search-box') as ProjectorInput;
+    // https://www.polymer-project.org/1.0/docs/devguide/styling#scope-subtree
+    this.scopeSubtree(this, true);
+  }
+
+  initialize(
+      projector: Projector, projectorEventContext: ProjectorEventContext) {
+    this.projector = projector;
+    this.projectorEventContext = projectorEventContext;
+    this.setupUI(projector);
+    projectorEventContext.registerSelectionChangedListener(
+        (selection, neighbors) =>
+            this.updateInspectorPane(selection, neighbors));
+  }
+
+  /** Updates the nearest neighbors list in the inspector. */
+  private updateInspectorPane(
+      indices: number[], neighbors: knn.NearestEntry[]) {
+    this.neighborsOfFirstPoint = neighbors;
+    this.selectedPointIndices = indices;
+
+    this.updateFilterButtons(indices.length + neighbors.length);
+    this.updateNeighborsList(neighbors);
+    if (neighbors.length === 0) {
+      this.updateSearchResults(indices);
+    } else {
+      this.updateSearchResults([]);
+    }
+  }
+
+  private enableResetFilterButton(enabled: boolean) {
+    this.resetFilterButton.disabled = !enabled;
+  }
+
+  restoreUIFromBookmark(bookmark: State) {
+    this.enableResetFilterButton(bookmark.filteredPoints != null);
+  }
+
+  metadataChanged(spriteAndMetadata: SpriteAndMetadataInfo) {
+    let labelIndex = -1;
+    this.metadataFields = spriteAndMetadata.stats.map((stats, i) => {
+      if (!stats.isNumeric && labelIndex === -1) {
+        labelIndex = i;
+      }
+      return stats.name;
+    });
+    labelIndex = Math.max(0, labelIndex);
+    // Make the default label the first non-numeric column.
+    this.selectedMetadataField = spriteAndMetadata.stats[labelIndex].name;
+  }
+
+  datasetChanged() {
+    this.enableResetFilterButton(false);
+  }
+
+  private updateSearchResults(indices: number[]) {
+    const container = this.querySelector('.matches-list') as HTMLDivElement;
+    container.style.display = indices.length ? null : 'none';
+    const list = container.querySelector('.list') as HTMLDivElement;
+    list.innerHTML = '';
+    if (indices.length === 0) {
+      return;
+    }
+
+    this.limitMessage.style.display =
+        indices.length <= LIMIT_RESULTS ? 'none' : null;
+    indices = indices.slice(0, LIMIT_RESULTS);
+
+    for (let i = 0; i < indices.length; i++) {
+      const index = indices[i];
+
+      const row = document.createElement('div');
+      row.className = 'row';
+
+      const label = this.getLabelFromIndex(index);
+      const rowLink = document.createElement('a');
+      rowLink.className = 'label';
+      rowLink.title = label;
+      rowLink.innerText = label;
+
+      rowLink.onmouseenter = () => {
+        this.projectorEventContext.notifyHoverOverPoint(index);
+      };
+      rowLink.onmouseleave = () => {
+        this.projectorEventContext.notifyHoverOverPoint(null);
+      };
+      rowLink.onclick = () => {
+        this.projectorEventContext.notifySelectionChanged([index]);
+      };
+
+      row.appendChild(rowLink);
+      list.appendChild(row);
+    }
+  }
+
+  private getLabelFromIndex(pointIndex: number): string {
+    const point = this.projector.dataSet.points[pointIndex];
+    return point.metadata[this.selectedMetadataField].toString();
+  }
+
+  private updateNeighborsList(neighbors: knn.NearestEntry[]) {
+    const nnlist = this.querySelector('.nn-list') as HTMLDivElement;
+    nnlist.innerHTML = '';
+
+    (this.querySelector('.nn') as HTMLDivElement).style.display =
+        neighbors.length ? null : 'none';
+
+    if (neighbors.length === 0) {
+      return;
+    }
+
+    this.searchBox.message = '';
+    const minDist = neighbors.length > 0 ? neighbors[0].dist : 0;
+
+    for (let i = 0; i < neighbors.length; i++) {
+      const neighbor = neighbors[i];
+
+      const neighborElement = document.createElement('div');
+      neighborElement.className = 'neighbor';
+
+      const neighborElementLink = document.createElement('a');
+      neighborElementLink.className = 'neighbor-link';
+      neighborElementLink.title = this.getLabelFromIndex(neighbor.index);
+
+      const labelValueElement = document.createElement('div');
+      labelValueElement.className = 'label-and-value';
+
+      const labelElement = document.createElement('div');
+      labelElement.className = 'label';
+      labelElement.style.color =
+          adapter.dist2color(this.distFunc, neighbor.dist, minDist);
+      labelElement.innerText = this.getLabelFromIndex(neighbor.index);
+
+      const valueElement = document.createElement('div');
+      valueElement.className = 'value';
+      valueElement.innerText = neighbor.dist.toFixed(3);
+
+      labelValueElement.appendChild(labelElement);
+      labelValueElement.appendChild(valueElement);
+
+      const barElement = document.createElement('div');
+      barElement.className = 'bar';
+
+      const barFillElement = document.createElement('div');
+      barFillElement.className = 'fill';
+      barFillElement.style.borderTopColor =
+          adapter.dist2color(this.distFunc, neighbor.dist, minDist);
+      barFillElement.style.width =
+          adapter.normalizeDist(this.distFunc, neighbor.dist, minDist) * 100 +
+          '%';
+      barElement.appendChild(barFillElement);
+
+      for (let j = 1; j < 4; j++) {
+        const tickElement = document.createElement('div');
+        tickElement.className = 'tick';
+        tickElement.style.left = j * 100 / 4 + '%';
+        barElement.appendChild(tickElement);
+      }
+
+      neighborElementLink.appendChild(labelValueElement);
+      neighborElementLink.appendChild(barElement);
+      neighborElement.appendChild(neighborElementLink);
+      nnlist.appendChild(neighborElement);
+
+      neighborElementLink.onmouseenter = () => {
+        this.projectorEventContext.notifyHoverOverPoint(neighbor.index);
+      };
+      neighborElementLink.onmouseleave = () => {
+        this.projectorEventContext.notifyHoverOverPoint(null);
+      };
+      neighborElementLink.onclick = () => {
+        this.projectorEventContext.notifySelectionChanged([neighbor.index]);
+      };
+    }
+  }
+
+  private updateFilterButtons(numPoints: number) {
+    if (numPoints > 1) {
+      this.setFilterButton.innerText = `Isolate ${numPoints} points`;
+      this.setFilterButton.disabled = null;
+      this.clearSelectionButton.disabled = null;
+    } else {
+      this.setFilterButton.disabled = true;
+      this.clearSelectionButton.disabled = true;
+    }
+  }
+
+  private setupUI(projector: Projector) {
+    this.distFunc = vector.cosDist;
+    const eucDist =
+        this.querySelector('.distance a.euclidean') as HTMLLinkElement;
+    eucDist.onclick = () => {
+      const links = this.querySelectorAll('.distance a');
+      for (let i = 0; i < links.length; i++) {
+        util.classed(links[i] as HTMLElement, 'selected', false);
+      }
+      util.classed(eucDist as HTMLElement, 'selected', true);
+
+      this.distFunc = vector.dist;
+      this.projectorEventContext.notifyDistanceMetricChanged(this.distFunc);
+      const neighbors = projector.dataSet.findNeighbors(
+          this.selectedPointIndices[0], this.distFunc, this.numNN);
+      this.updateNeighborsList(neighbors);
+    };
+
+    const cosDist = this.querySelector('.distance a.cosine') as HTMLLinkElement;
+    cosDist.onclick = () => {
+      const links = this.querySelectorAll('.distance a');
+      for (let i = 0; i < links.length; i++) {
+        util.classed(links[i] as HTMLElement, 'selected', false);
+      }
+      util.classed(cosDist, 'selected', true);
+
+      this.distFunc = vector.cosDist;
+      this.projectorEventContext.notifyDistanceMetricChanged(this.distFunc);
+      const neighbors = projector.dataSet.findNeighbors(
+          this.selectedPointIndices[0], this.distFunc, this.numNN);
+      this.updateNeighborsList(neighbors);
+    };
+
+    // Called whenever the search text input changes.
+    const updateInput = (value: string, inRegexMode: boolean) => {
+      if (value == null || value.trim() === '') {
+        this.searchBox.message = '';
+        this.projectorEventContext.notifySelectionChanged([]);
+        return;
+      }
+      const indices = projector.dataSet.query(
+          value, inRegexMode, this.selectedMetadataField);
+      if (indices.length === 0) {
+        this.searchBox.message = '0 matches.';
+      } else {
+        this.searchBox.message = `${indices.length} matches.`;
+      }
+      this.projectorEventContext.notifySelectionChanged(indices);
+    };
+    this.searchBox.registerInputChangedListener((value, inRegexMode) => {
+      updateInput(value, inRegexMode);
+    });
+
+    // Nearest neighbors controls.
+    const numNNInput = this.$$('#nn-slider') as HTMLInputElement;
+    const updateNumNN = () => {
+      this.numNN = +numNNInput.value;
+      (this.querySelector('.num-nn .nn-count') as HTMLSpanElement).innerText =
+          '' + this.numNN;
+      if (this.selectedPointIndices != null) {
+        this.projectorEventContext.notifySelectionChanged(
+            [this.selectedPointIndices[0]]);
+      }
+    };
+    numNNInput.addEventListener('change', updateNumNN);
+    updateNumNN();
+
+    // Filtering dataset.
+    this.setFilterButton.onclick = () => {
+      const indices = this.selectedPointIndices.concat(
+          this.neighborsOfFirstPoint.map(n => n.index));
+      projector.filterDataset(indices);
+      this.enableResetFilterButton(true);
+      this.updateFilterButtons(0);
+    };
+
+    this.resetFilterButton.onclick = () => {
+      projector.resetFilterDataset();
+      this.enableResetFilterButton(false);
+    };
+
+    this.clearSelectionButton.onclick = () => {
+      projector.adjustSelectionAndHover([]);
+    };
+    this.enableResetFilterButton(false);
+  }
+}
+
+document.registerElement(InspectorPanel.prototype.is, InspectorPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.html
new file mode 100644
index 0000000000..3fc5f4db15
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.html
@@ -0,0 +1,76 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="styles.html">
+
+<dom-module id='vz-projector-legend'>
+<template>
+<style include="vz-projector-styles"></style>
+<style>
+.item {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 10px;
+}
+
+.shape {
+  width: 10px;
+  height: 10px;
+  margin-right: 10px;
+  margin-top: 5px;
+  border-radius: 50%;
+}
+
+.label {
+  flex-grow: 1;
+}
+
+.gradient {
+  width: 100%;
+  height: 10px;
+}
+
+.gradient-boundaries {
+  display: flex;
+  justify-content: space-between;
+}
+</style>
+
+<template is="dom-repeat" items="[[renderInfo.items]]">
+  <div class="item">
+    <div class="shape" style="background-color: [[item.color]];"></div>
+    <div class="label">[[item.label]]</div>
+    <div class="info" style="color: [[item.color]];">[[item.count]]</div>
+  </div>
+</template>
+
+<template is="dom-if" if="[[renderInfo.thresholds]]">
+  <svg class="gradient">
+    <defs>
+      <linearGradient id="gradient" x1="0%" y1="100%" x2="100%" y2="100%"></linearGradient>
+    </defs>
+    <rect height="10" style="fill: url('#gradient');"></rect>
+  </svg>
+  <div class="gradient-boundaries">
+    <div>[[renderInfo.thresholds.0.value]]</div>
+    <div>[[_getLastThreshold(renderInfo.thresholds)]]</div>
+  </div>
+</template>
+<!-- Closing global template -->
+</template>
+</dom-module>
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.ts
new file mode 100644
index 0000000000..1c4ddf940d
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-legend.ts
@@ -0,0 +1,98 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+// tslint:disable-next-line
+export let LegendPolymer = PolymerElement({
+  is: 'vz-projector-legend',
+  properties: {renderInfo: {type: Object, observer: '_renderInfoChanged'}}
+});
+
+export interface ColorLegendRenderInfo {
+  // To be used for categorical map.
+  items: ColorLegendItem[];
+  // To be used for gradient map.
+  thresholds: ColorLegendThreshold[];
+}
+
+/** An item in the categorical color legend. */
+export interface ColorLegendItem {
+  color: string;
+  label: string;
+  count: number;
+}
+
+/** An item in the gradient color legend. */
+export interface ColorLegendThreshold {
+  color: string;
+  value: number;
+}
+
+export class Legend extends LegendPolymer {
+  renderInfo: ColorLegendRenderInfo;
+
+  _renderInfoChanged() {
+    if (this.renderInfo == null) {
+      return;
+    }
+    if (this.renderInfo.thresholds) {
+      // <linearGradient> is under dom-if so we should wait for it to be
+      // inserted in the dom tree using async().
+      this.async(() => this.setupLinearGradient());
+    }
+  }
+
+  _getLastThreshold(): number {
+    if (this.renderInfo == null || this.renderInfo.thresholds == null) {
+      return;
+    }
+    return this.renderInfo.thresholds[this.renderInfo.thresholds.length - 1]
+        .value;
+  }
+
+  private getOffset(value: number): string {
+    const min = this.renderInfo.thresholds[0].value;
+    const max =
+        this.renderInfo.thresholds[this.renderInfo.thresholds.length - 1].value;
+    return (100 * (value - min) / (max - min)).toFixed(2) + '%';
+  }
+
+  private setupLinearGradient() {
+    const linearGradient =
+        this.querySelector('#gradient') as SVGLinearGradientElement;
+
+    const width =
+        (this.querySelector('svg.gradient') as SVGElement).clientWidth;
+
+    // Set the svg <rect> to be the width of its <svg> parent.
+    (this.querySelector('svg.gradient rect') as SVGRectElement).style.width =
+        width + 'px';
+
+    // Remove all <stop> children from before.
+    linearGradient.innerHTML = '';
+
+    // Add a <stop> child in <linearGradient> for each gradient threshold.
+    this.renderInfo.thresholds.forEach(t => {
+      const stopElement =
+          document.createElementNS('http://www.w3.org/2000/svg', 'stop');
+      stopElement.setAttribute('offset', this.getOffset(t.value));
+      stopElement.setAttribute('stop-color', t.color);
+    });
+  }
+}
+
+document.registerElement(Legend.prototype.is, Legend);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.html
new file mode 100644
index 0000000000..ebdcd72c77
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.html
@@ -0,0 +1,97 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+
+<dom-module id="vz-projector-metadata-card">
+<template>
+<style>
+#metadata-card {
+  background-color: rgba(255,255,255,0.9);
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14),
+      0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
+  width: 280px;
+}
+
+#header {
+  background: #e9e9e9;
+}
+
+#icon-container {
+  position: absolute;
+  right: 0;
+  top: 4px;
+}
+
+#metadata-label {
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 24px;
+  padding: 12px 12px 8px;
+  width: 230px;
+}
+
+#metadata-table {
+  display: table;
+  padding: 8px 12px 4px;
+}
+
+.metadata-row {
+  display: table-row;
+}
+
+.metadata-key {
+  font-weight: bold;
+}
+
+.metadata-key, .metadata-value {
+  display: table-cell;
+  font-size: 12px;
+  padding: 3px 3px;
+}
+</style>
+
+<template is="dom-if" if="[[hasMetadata]]">
+  <div id="metadata-card">
+    <div id="icon-container">
+      <paper-icon-button id="expand-more"
+          style="display: none"
+          icon="expand-more"
+          on-tap="_expandMore"></paper-icon-button>
+      <paper-icon-button id="expand-less"
+          on-tap="_expandLess"
+          icon="expand-less"></paper-icon-button>
+    </div>
+    <div id="header">
+      <div id="metadata-label">[[label]]</div>
+    </div>
+    <iron-collapse id="metadata-container" opened>
+      <div id="metadata-table">
+        <template is="dom-repeat" items="[[metadata]]">
+          <div class="metadata-row">
+            <div class="metadata-key">[[item.key]]</div>
+            <div class="metadata-value">[[item.value]]</div>
+          </div>
+        </template>
+      </div>
+    </iron-collapse>
+  </div>
+</template>
+</template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.ts
new file mode 100644
index 0000000000..939300f387
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-metadata-card.ts
@@ -0,0 +1,88 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {PointMetadata} from './data';
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+// tslint:disable-next-line
+export let MetadataCardPolymer = PolymerElement({
+  is: 'vz-projector-metadata-card',
+  properties: {
+    hasMetadata: {type: Boolean, value: false},
+    metadata: {type: Array},
+    label: String
+  }
+});
+
+export class MetadataCard extends MetadataCardPolymer {
+  hasMetadata: boolean;
+  metadata: Array<{key: string, value: string}>;
+  label: string;
+
+  private labelOption: string;
+  private pointMetadata: PointMetadata;
+
+  private expandLessButton: HTMLButtonElement;
+  private expandMoreButton: HTMLButtonElement;
+
+  ready() {
+    this.expandLessButton =
+        this.querySelector('#expand-less') as HTMLButtonElement;
+    this.expandMoreButton =
+        this.querySelector('#expand-more') as HTMLButtonElement;
+  }
+  /** Handles a click on the expand more icon. */
+  _expandMore() {
+    (this.$$('#metadata-container') as any).toggle();
+
+    this.expandMoreButton.style.display = 'none';
+    this.expandLessButton.style.display = '';
+  }
+
+  /** Handles a click on the expand less icon. */
+  _expandLess() {
+    (this.$$('#metadata-container') as any).toggle();
+    this.expandMoreButton.style.display = '';
+    this.expandLessButton.style.display = 'none';
+  }
+
+  updateMetadata(pointMetadata?: PointMetadata) {
+    this.pointMetadata = pointMetadata;
+    this.hasMetadata = (pointMetadata != null);
+
+    if (pointMetadata) {
+      let metadata = [];
+      for (let metadataKey in pointMetadata) {
+        if (!pointMetadata.hasOwnProperty(metadataKey)) {
+          continue;
+        }
+        metadata.push({key: metadataKey, value: pointMetadata[metadataKey]});
+      }
+
+      this.metadata = metadata;
+      this.label = '' + this.pointMetadata[this.labelOption];
+    }
+  }
+
+  setLabelOption(labelOption: string) {
+    this.labelOption = labelOption;
+    if (this.pointMetadata) {
+      this.label = '' + this.pointMetadata[this.labelOption];
+    }
+  }
+}
+
+document.registerElement(MetadataCard.prototype.is, MetadataCard);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.html
new file mode 100644
index 0000000000..cddcb2b7d0
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.html
@@ -0,0 +1,314 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../paper-listbox/paper-listbox.html">
+<link rel="import" href="../paper-item/paper-item.html">
+<link rel="import" href="../paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../iron-icons/iron-icons.html">
+<link rel="import" href="../iron-icons/image-icons.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-slider/paper-slider.html">
+<link rel="import" href="styles.html">
+
+<dom-module id="vz-projector-projections-panel">
+<template>
+<style include="vz-projector-styles"></style>
+<style>
+:host {
+  transition: height 0.2s;
+}
+
+.ink-button, ::shadow .ink-button {
+  border: none;
+  border-radius: 2px;
+  font-size: 13px;
+  padding: 10px;
+  min-width: 100px;
+  flex-shrink: 0;
+  background: #e3e3e3;
+}
+
+.ink-panel-buttons {
+  margin-bottom: 10px;
+}
+
+.two-way-toggle {
+  display: flex;
+  flex-direction: row;
+}
+
+.two-way-toggle span {
+  padding-right: 7px;
+}
+
+.has-border {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.toggle {
+  min-width: 0px;
+  font-size: 12px;
+  width: 17px;
+  min-height: 0px;
+  height: 21px;
+  padding: 0;
+  margin: 0px;
+}
+
+.toggle[active] {
+  background-color: #880E4F;
+  color: white;
+}
+
+.two-columns {
+  display:flex;
+  justify-content: space-between;
+}
+
+.two-columns > :first-child {
+  margin-right: 15px;
+}
+
+.two-columns > div {
+  width: 50%;
+}
+
+.dropdown-item {
+  justify-content: space-between;
+  min-height: 35px;
+}
+
+#z-container {
+  display: flex;
+  align-items: center;
+  width: 50%;
+}
+
+#z-checkbox {
+  margin: 27px 0 0 5px;
+  width: 18px;
+}
+
+#z-dropdown {
+  flex-grow: 1;
+}
+
+.notice {
+  color: #880E4F;
+}
+
+.container {
+  padding: 20px;
+}
+
+.book-icon {
+  height: 20px;
+  color: rgba(0, 0, 0, 0.7);
+}
+
+.item-details {
+  color: gray;
+  font-size: 12px;
+  margin-left: 5px;
+}
+
+.pca-dropdown {
+  width: 100%;
+}
+
+.pca-dropdown paper-listbox {
+  width: 135px;
+}
+
+.dropdown-item.header {
+  border-bottom: 1px solid #aaa;
+  color: #333;
+  font-weight: bold;
+}
+
+#total-variance {
+  color: rgba(0, 0, 0, 0.7);
+}
+</style>
+<div id="main">
+  <div class="ink-panel-header">
+    <div class="ink-tab-group">
+
+      <div data-tab="tsne" id="tsne-tab" class="ink-tab projection-tab">t-SNE</div>
+      <paper-tooltip for="tsne-tab" position="bottom" animation-delay="0" fit-to-visible-bounds>
+        t-distributed stochastic neighbor embedding
+      </paper-tooltip>
+
+      <div data-tab="pca" id="pca-tab" class="ink-tab projection-tab">PCA</div>
+      <paper-tooltip for="pca-tab" position="bottom" animation-delay="0" fit-to-visible-bounds>
+        Principal component analysis
+      </paper-tooltip>
+
+      <div data-tab="custom" id="custom-tab" class="ink-tab projection-tab" title="Linear projection of two custom vectors">Custom</div>
+      <paper-tooltip for="custom-tab" position="bottom" animation-delay="0" fit-to-visible-bounds>
+        Search for two vectors upon which to project all points.
+      </paper-tooltip>
+
+    </div>
+  </div>
+  <div class="container">
+    <!-- TSNE Controls -->
+    <div data-panel="tsne" class="ink-panel-content">
+      <div class="slider">
+        <label>Dimension</label>
+        <div class="two-way-toggle">
+          <span>2D</span>
+          <paper-toggle-button id="tsne-toggle" checked="{{tSNEis3d}}">3D</paper-toggle-button>
+        </div>
+      </div>
+      <div class="slider tsne-perplexity">
+        <label>
+          Perplexity
+          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+          <paper-tooltip position="right" animation-delay="0" fit-to-visible-bounds>
+            The most appropriate perplexity value depends on the density of the
+            data. Loosely speaking, a larger / denser dataset
+            requires a larger perplexity. Typical values for perplexity range
+            between 5 and 50.
+          </paper-tooltip>
+        </label>
+        <paper-slider id="perplexity-slider" pin min="2" max="100" value="30"></paper-slider>
+        <span></span>
+      </div>
+      <div class="slider tsne-learning-rate">
+        <label>
+          Learning rate
+          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+          <paper-tooltip position="right" animation-delay="0" fit-to-visible-bounds>
+            The ideal learning rate often depends on the size of the data,
+            with smaller datasets requiring smaller learning rates.
+          </paper-tooltip>
+        </label>
+        <paper-slider id="learning-rate-slider" snaps min="-3" max="2" step="1"
+            value="1" max-markers="6">
+        </paper-slider>
+        <span></span>
+      </div>
+      <p>
+        <button class="run-tsne ink-button" title="Re-run t-SNE">Re-run</button>
+        <button class="stop-tsne ink-button" title="Stop t-SNE">Stop</button>
+      </p>
+      <p>Iteration: <span class="run-tsne-iter">0</span></p>
+      <p id="tsne-sampling" class="notice">
+        For fast results, the data will be sampled down to [[getTsneSampleSizeText()]] points.
+      </p>
+      <p>
+        <iron-icon icon="book" class="book-icon"></iron-icon>
+        <a target="_blank" href="http://distill.pub/2016/misread-tsne/">
+          How to use t-SNE effectively.
+        </a>
+      </p>
+    </div>
+    <!-- PCA Controls -->
+    <div data-panel="pca" class="ink-panel-content">
+      <div class="two-columns">
+        <div> <!-- Left column -->
+          <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations label="X">
+            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaX}}">
+              <paper-item disabled class="dropdown-item header">
+                  <div>#</div>
+                  <div>Variance (%)</div>
+              </paper-item>
+              <template is="dom-repeat" items="[[pcaComponents]]">
+                <paper-item class="dropdown-item" value="[[item.id]]"
+                            label="Component #[[item.componentNumber]]">
+                  <div>[[item.componentNumber]]</div>
+                  <div class="item-details">[[item.percVariance]]</div>
+                </paper-item>
+              </template>
+            </paper-listbox>
+          </paper-dropdown-menu>
+          <paper-dropdown-menu class="pca-dropdown" no-animations vertical-align="bottom" label="Z" disabled="[[!hasPcaZ]]" id="z-dropdown">
+            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaZ}}">
+              <paper-item disabled class="dropdown-item header">
+                  <div>#</div>
+                  <div>Variance (%)</div>
+              </paper-item>
+              <template is="dom-repeat" items="[[pcaComponents]]">
+                <paper-item class="dropdown-item" value="[[item.id]]"
+                            label="Component #[[item.componentNumber]]">
+                  <div>[[item.componentNumber]]</div>
+                  <div class="item-details">[[item.percVariance]]</div>
+                </paper-item>
+              </template>
+            </paper-listbox>
+          </paper-dropdown-menu>
+        </div>
+        <div> <!-- Right column -->
+          <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations label="Y">
+            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaY}}">
+              <paper-item disabled class="dropdown-item header">
+                  <div>#</div>
+                  <div>Variance (%)</div>
+              </paper-item>
+              <template is="dom-repeat" items="[[pcaComponents]]">
+                <paper-item class="dropdown-item" value="[[item.id]]"
+                            label="Component #[[item.componentNumber]]">
+                  <div>[[item.componentNumber]]</div>
+                  <div class="item-details">[[item.percVariance]]</div>
+                </paper-item>
+              </template>
+            </paper-listbox>
+          </paper-dropdown-menu>
+          <paper-checkbox id="z-checkbox" checked="{{pcaIs3d}}"></paper-checkbox>
+        </div>
+      </div>
+      <p id="pca-sampling" class="notice">
+        PCA is approximate.
+        <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+      </p>
+      <div id="total-variance">Total variance</div>
+      <paper-tooltip for="pca-sampling" position="top" animation-delay="0" fit-to-visible-bounds>
+        For fast results, the data was sampled to [[getPcaSampleSizeText()]] points and randomly projected down to [[getPcaSampledDimText()]] dimensions.
+      </paper-tooltip>
+    </div>
+    <!-- Custom Controls -->
+    <div data-panel="custom" class="ink-panel-content">
+      <paper-dropdown-menu style="width: 100%" no-animations label="Search by">
+        <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{customSelectedSearchByMetadataOption}}">
+          <template is="dom-repeat" items="[[searchByMetadataOptions]]">
+            <paper-item class="dropdown-item" value="[[item]]" label="[[item]]">
+              [[item]]
+            </paper-item>
+          </template>
+        </paper-listbox>
+      </paper-dropdown-menu>
+      <div class="two-columns">
+        <vz-projector-input id="xLeft" label="Left"></vz-projector-input>
+        <vz-projector-input id="xRight" label="Right"></vz-projector-input>
+      </div>
+      <div class="two-columns">
+        <vz-projector-input id="yUp" label="Up"></vz-projector-input>
+        <vz-projector-input id="yDown" label="Down"></vz-projector-input>
+      </div>
+    </div>
+  </div>
+</div>
+</template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.ts
new file mode 100644
index 0000000000..377c6c11ad
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel.ts
@@ -0,0 +1,589 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as data from './data';
+import {DataSet, Projection, ProjectionType, SpriteAndMetadataInfo, State} from './data';
+import * as util from './util';
+import * as vector from './vector';
+import {Vector} from './vector';
+import {Projector} from './vz-projector';
+import {ProjectorInput} from './vz-projector-input';
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+const NUM_PCA_COMPONENTS = 10;
+
+// tslint:disable-next-line
+export let ProjectionsPanelPolymer = PolymerElement({
+  is: 'vz-projector-projections-panel',
+  properties: {
+    pcaIs3d:
+        {type: Boolean, value: true, observer: '_pcaDimensionToggleObserver'},
+    tSNEis3d:
+        {type: Boolean, value: true, observer: '_tsneDimensionToggleObserver'},
+    // PCA projection.
+    pcaComponents: Array,
+    pcaX: {type: Number, value: 0, observer: 'showPCAIfEnabled'},
+    pcaY: {type: Number, value: 1, observer: 'showPCAIfEnabled'},
+    pcaZ: {type: Number, value: 2, observer: 'showPCAIfEnabled'},
+    // Custom projection.
+    customSelectedSearchByMetadataOption: {
+      type: String,
+      observer: '_customSelectedSearchByMetadataOptionChanged'
+    },
+  }
+});
+
+type InputControlName = 'xLeft'|'xRight'|'yUp'|'yDown';
+
+type CentroidResult = {
+  centroid?: Vector; numMatches?: number;
+};
+
+type Centroids = {
+  [key: string]: Vector; xLeft: Vector; xRight: Vector; yUp: Vector;
+  yDown: Vector;
+};
+
+/**
+ * A polymer component which handles the projection tabs in the projector.
+ */
+export class ProjectionsPanel extends ProjectionsPanelPolymer {
+  private projector: Projector;
+  private pcaComponents:
+      Array<{id: number, componentNumber: number, percVariance: string}>;
+  private currentProjection: ProjectionType;
+  private polymerChangesTriggerReprojection: boolean;
+  private dataSet: DataSet;
+  private originalDataSet: DataSet;
+  private dim: number;
+
+  /** T-SNE perplexity. Roughly how many neighbors each point influences. */
+  private perplexity: number;
+  /** T-SNE learning rate. */
+  private learningRate: number;
+
+  private searchByMetadataOptions: string[];
+
+  /** Centroids for custom projections. */
+  private centroidValues: any;
+  private centroids: Centroids;
+  /** The centroid across all points. */
+  private allCentroid: number[];
+
+  /** Polymer properties. */
+  // TODO(nsthorat): Move these to a separate view controller.
+  public tSNEis3d: boolean;
+  public pcaIs3d: boolean;
+  public pcaX: number;
+  public pcaY: number;
+  public pcaZ: number;
+  public customSelectedSearchByMetadataOption: string;
+
+  /** Polymer elements. */
+  private runTsneButton: HTMLButtonElement;
+  private stopTsneButton: HTMLButtonElement;
+  private perplexitySlider: HTMLInputElement;
+  private learningRateInput: HTMLInputElement;
+  private zDropdown: HTMLElement;
+  private iterationLabel: HTMLElement;
+
+  private customProjectionXLeftInput: ProjectorInput;
+  private customProjectionXRightInput: ProjectorInput;
+  private customProjectionYUpInput: ProjectorInput;
+  private customProjectionYDownInput: ProjectorInput;
+
+  initialize(projector: Projector) {
+    this.polymerChangesTriggerReprojection = true;
+    this.projector = projector;
+
+    // Set up TSNE projections.
+    this.perplexity = 30;
+    this.learningRate = 10;
+
+    // Setup Custom projections.
+    this.centroidValues = {xLeft: null, xRight: null, yUp: null, yDown: null};
+    this.clearCentroids();
+
+    this.setupUIControls();
+  }
+
+  ready() {
+    this.zDropdown = this.querySelector('#z-dropdown') as HTMLElement;
+    this.runTsneButton = this.querySelector('.run-tsne') as HTMLButtonElement;
+    this.stopTsneButton = this.querySelector('.stop-tsne') as HTMLButtonElement;
+    this.perplexitySlider =
+        this.querySelector('#perplexity-slider') as HTMLInputElement;
+    this.learningRateInput =
+        this.querySelector('#learning-rate-slider') as HTMLInputElement;
+    this.iterationLabel = this.querySelector('.run-tsne-iter') as HTMLElement;
+  }
+
+  disablePolymerChangesTriggerReprojection() {
+    this.polymerChangesTriggerReprojection = false;
+  }
+
+  enablePolymerChangesTriggerReprojection() {
+    this.polymerChangesTriggerReprojection = true;
+  }
+
+  private updateTSNEPerplexityFromSliderChange() {
+    if (this.perplexitySlider) {
+      this.perplexity = +this.perplexitySlider.value;
+    }
+    (this.querySelector('.tsne-perplexity span') as HTMLSpanElement).innerText =
+        '' + this.perplexity;
+  }
+
+  private updateTSNELearningRateFromUIChange() {
+    if (this.learningRateInput) {
+      this.learningRate = Math.pow(10, +this.learningRateInput.value);
+    }
+    (this.querySelector('.tsne-learning-rate span') as HTMLSpanElement)
+        .innerText = '' + this.learningRate;
+  }
+
+  private setupUIControls() {
+    {
+      const self = this;
+      const inkTabs = this.querySelectorAll('.ink-tab');
+      for (let i = 0; i < inkTabs.length; i++) {
+        inkTabs[i].addEventListener('click', function() {
+          let id = this.getAttribute('data-tab');
+          self.showTab(id);
+        });
+      }
+    }
+
+    this.runTsneButton.addEventListener('click', () => this.runTSNE());
+    this.stopTsneButton.addEventListener(
+        'click', () => this.dataSet.stopTSNE());
+
+    this.perplexitySlider.value = this.perplexity.toString();
+    this.perplexitySlider.addEventListener(
+        'change', () => this.updateTSNEPerplexityFromSliderChange());
+    this.updateTSNEPerplexityFromSliderChange();
+
+    this.learningRateInput.addEventListener(
+        'change', () => this.updateTSNELearningRateFromUIChange());
+    this.updateTSNELearningRateFromUIChange();
+
+    this.setupCustomProjectionInputFields();
+    // TODO: figure out why `--paper-input-container-input` css mixin didn't
+    // work.
+    const inputs =
+        this.querySelectorAll('paper-dropdown-menu paper-input input');
+    for (let i = 0; i < inputs.length; i++) {
+      (inputs[i] as HTMLElement).style.fontSize = '14px';
+    }
+  }
+
+  restoreUIFromBookmark(bookmark: State) {
+    this.disablePolymerChangesTriggerReprojection();
+
+    // PCA
+    this.pcaX = bookmark.pcaComponentDimensions[0];
+    this.pcaY = bookmark.pcaComponentDimensions[1];
+    if (bookmark.pcaComponentDimensions.length === 3) {
+      this.pcaZ = bookmark.pcaComponentDimensions[2];
+    }
+    this.pcaIs3d = (bookmark.pcaComponentDimensions.length === 3);
+
+    // t-SNE
+    if (this.perplexitySlider) {
+      this.perplexitySlider.value = bookmark.tSNEPerplexity.toString();
+    }
+    if (this.learningRateInput) {
+      this.learningRateInput.value = bookmark.tSNELearningRate.toString();
+    }
+    this.tSNEis3d = bookmark.tSNEis3d;
+
+    // custom
+    this.customSelectedSearchByMetadataOption =
+        bookmark.customSelectedSearchByMetadataOption;
+    if (this.customProjectionXLeftInput) {
+      this.customProjectionXLeftInput.set(
+          bookmark.customXLeftText, bookmark.customXLeftRegex);
+    }
+    if (this.customProjectionXRightInput) {
+      this.customProjectionXRightInput.set(
+          bookmark.customXRightText, bookmark.customXRightRegex);
+    }
+    if (this.customProjectionYUpInput) {
+      this.customProjectionYUpInput.set(
+          bookmark.customYUpText, bookmark.customYUpRegex);
+    }
+    if (this.customProjectionYDownInput) {
+      this.customProjectionYDownInput.set(
+          bookmark.customYDownText, bookmark.customYDownRegex);
+    }
+    this.computeAllCentroids();
+
+    this.setZDropdownEnabled(this.pcaIs3d);
+    this.updateTSNEPerplexityFromSliderChange();
+    this.updateTSNELearningRateFromUIChange();
+    if (this.iterationLabel) {
+      this.iterationLabel.innerText = bookmark.tSNEIteration.toString();
+    }
+    if (bookmark.selectedProjection != null) {
+      this.showTab(bookmark.selectedProjection);
+    }
+    this.enablePolymerChangesTriggerReprojection();
+  }
+
+  populateBookmarkFromUI(bookmark: State) {
+    this.disablePolymerChangesTriggerReprojection();
+
+    // PCA
+    bookmark.pcaComponentDimensions = [this.pcaX, this.pcaY];
+    if (this.pcaIs3d) {
+      bookmark.pcaComponentDimensions.push(this.pcaZ);
+    }
+
+    // t-SNE
+    if (this.perplexitySlider != null) {
+      bookmark.tSNEPerplexity = +this.perplexitySlider.value;
+    }
+    if (this.learningRateInput != null) {
+      bookmark.tSNELearningRate = +this.learningRateInput.value;
+    }
+    bookmark.tSNEis3d = this.tSNEis3d;
+
+    // custom
+    bookmark.customSelectedSearchByMetadataOption =
+        this.customSelectedSearchByMetadataOption;
+    if (this.customProjectionXLeftInput != null) {
+      bookmark.customXLeftText = this.customProjectionXLeftInput.getValue();
+      bookmark.customXLeftRegex =
+          this.customProjectionXLeftInput.getInRegexMode();
+    }
+    if (this.customProjectionXRightInput != null) {
+      bookmark.customXRightText = this.customProjectionXRightInput.getValue();
+      bookmark.customXRightRegex =
+          this.customProjectionXRightInput.getInRegexMode();
+    }
+    if (this.customProjectionYUpInput != null) {
+      bookmark.customYUpText = this.customProjectionYUpInput.getValue();
+      bookmark.customYUpRegex = this.customProjectionYUpInput.getInRegexMode();
+    }
+    if (this.customProjectionYDownInput != null) {
+      bookmark.customYDownText = this.customProjectionYDownInput.getValue();
+      bookmark.customYDownRegex =
+          this.customProjectionYDownInput.getInRegexMode();
+    }
+
+    this.enablePolymerChangesTriggerReprojection();
+  }
+
+  // This method is marked as public as it is used as the view method that
+  // abstracts DOM manipulation so we can stub it in a test.
+  // TODO(nsthorat): Move this to its own class as the glue between this class
+  // and the DOM.
+  setZDropdownEnabled(enabled: boolean) {
+    if (this.zDropdown) {
+      if (enabled) {
+        this.zDropdown.removeAttribute('disabled');
+      } else {
+        this.zDropdown.setAttribute('disabled', 'true');
+      }
+    }
+  }
+
+  dataSetUpdated(dataSet: DataSet, originalDataSet: DataSet, dim: number) {
+    this.dataSet = dataSet;
+    this.originalDataSet = originalDataSet;
+    this.dim = dim;
+    const pointCount = (dataSet == null) ? 0 : dataSet.points.length;
+    const perplexity = Math.max(5, Math.ceil(Math.sqrt(pointCount) / 4));
+    this.perplexitySlider.value = perplexity.toString();
+    this.updateTSNEPerplexityFromSliderChange();
+    this.clearCentroids();
+
+    (this.querySelector('#tsne-sampling') as HTMLElement).style.display =
+        pointCount > data.TSNE_SAMPLE_SIZE ? null : 'none';
+    const wasSampled =
+        (dataSet == null) ? false : (dataSet.dim[0] > data.PCA_SAMPLE_DIM ||
+                                     dataSet.dim[1] > data.PCA_SAMPLE_DIM);
+    (this.querySelector('#pca-sampling') as HTMLElement).style.display =
+        wasSampled ? null : 'none';
+    this.showTab('pca');
+  }
+
+  _pcaDimensionToggleObserver() {
+    this.setZDropdownEnabled(this.pcaIs3d);
+    this.beginProjection(this.currentProjection);
+  }
+
+  _tsneDimensionToggleObserver() {
+    this.beginProjection(this.currentProjection);
+  }
+
+  metadataChanged(spriteAndMetadata: SpriteAndMetadataInfo) {
+    // Project by options for custom projections.
+    let searchByMetadataIndex = -1;
+    this.searchByMetadataOptions = spriteAndMetadata.stats.map((stats, i) => {
+      // Make the default label by the first non-numeric column.
+      if (!stats.isNumeric && searchByMetadataIndex === -1) {
+        searchByMetadataIndex = i;
+      }
+      return stats.name;
+    });
+    this.customSelectedSearchByMetadataOption =
+        this.searchByMetadataOptions[Math.max(0, searchByMetadataIndex)];
+  }
+
+  public showTab(id: ProjectionType) {
+    this.currentProjection = id;
+
+    const tab =
+        this.querySelector('.ink-tab[data-tab="' + id + '"]') as HTMLElement;
+    const allTabs = this.querySelectorAll('.ink-tab');
+    for (let i = 0; i < allTabs.length; i++) {
+      util.classed(allTabs[i] as HTMLElement, 'active', false);
+    }
+
+    util.classed(tab, 'active', true);
+
+    const allTabContent = this.querySelectorAll('.ink-panel-content');
+    for (let i = 0; i < allTabContent.length; i++) {
+      util.classed(allTabContent[i] as HTMLElement, 'active', false);
+    }
+
+    util.classed(
+        this.querySelector('.ink-panel-content[data-panel="' + id + '"]') as
+            HTMLElement,
+        'active', true);
+
+    // guard for unit tests, where polymer isn't attached and $ doesn't exist.
+    if (this.$ != null) {
+      const main = this.$['main'];
+      // In order for the projections panel to animate its height, we need to
+      // set it explicitly.
+      requestAnimationFrame(() => {
+        this.style.height = main.clientHeight + 'px';
+      });
+    }
+
+    this.beginProjection(id);
+  }
+
+  private beginProjection(projection: ProjectionType) {
+    if (this.polymerChangesTriggerReprojection === false) {
+      return;
+    }
+    if (projection === 'pca') {
+      if (this.dataSet != null) {
+        this.dataSet.stopTSNE();
+      }
+      this.showPCA();
+    } else if (projection === 'tsne') {
+      this.showTSNE();
+    } else if (projection === 'custom') {
+      if (this.dataSet != null) {
+        this.dataSet.stopTSNE();
+      }
+      this.computeAllCentroids();
+      this.reprojectCustom();
+    }
+  }
+
+  private showTSNE() {
+    const dataSet = this.dataSet;
+    if (dataSet == null) {
+      return;
+    }
+    const accessors =
+        data.getProjectionComponents('tsne', [0, 1, this.tSNEis3d ? 2 : null]);
+    const dimensionality = this.tSNEis3d ? 3 : 2;
+    const projection =
+        new Projection('tsne', accessors, dimensionality, dataSet);
+    this.projector.setProjection(projection);
+
+    if (!this.dataSet.hasTSNERun) {
+      this.runTSNE();
+    } else {
+      this.projector.notifyProjectionPositionsUpdated();
+    }
+  }
+
+  private runTSNE() {
+    this.runTsneButton.disabled = true;
+    this.stopTsneButton.disabled = null;
+    this.dataSet.projectTSNE(
+        this.perplexity, this.learningRate, this.tSNEis3d ? 3 : 2,
+        (iteration: number) => {
+          if (iteration != null) {
+            this.iterationLabel.innerText = '' + iteration;
+            this.projector.notifyProjectionPositionsUpdated();
+          } else {
+            this.runTsneButton.disabled = null;
+            this.stopTsneButton.disabled = true;
+          }
+        });
+  }
+
+  // tslint:disable-next-line:no-unused-variable
+  private showPCAIfEnabled() {
+    if (this.polymerChangesTriggerReprojection) {
+      this.showPCA();
+    }
+  }
+
+  private updateTotalVarianceMessage() {
+    let variances = this.dataSet.fracVariancesExplained;
+    let totalVariance = variances[this.pcaX] + variances[this.pcaY];
+    let msg = 'Total variance described: ';
+    if (this.pcaIs3d) {
+      totalVariance += variances[this.pcaZ];
+    }
+    msg += (totalVariance * 100).toFixed(1) + '%.';
+    (this.querySelector('#total-variance') as HTMLElement).innerHTML = msg;
+  }
+
+  private showPCA() {
+    if (this.dataSet == null) {
+      return;
+    }
+    this.dataSet.projectPCA().then(() => {
+      // Polymer properties are 1-based.
+      const accessors = data.getProjectionComponents(
+          'pca', [this.pcaX, this.pcaY, this.pcaZ]);
+
+      const dimensionality = this.pcaIs3d ? 3 : 2;
+      const projection =
+          new Projection('pca', accessors, dimensionality, this.dataSet);
+      this.projector.setProjection(projection);
+      let numComponents = Math.min(NUM_PCA_COMPONENTS, this.dataSet.dim[1]);
+      this.updateTotalVarianceMessage();
+      this.pcaComponents = util.range(numComponents).map(i => {
+        let fracVariance = this.dataSet.fracVariancesExplained[i];
+        return {
+          id: i,
+          componentNumber: i + 1,
+          percVariance: (fracVariance * 100).toFixed(1)
+        };
+      });
+    });
+  }
+
+  private reprojectCustom() {
+    if (this.centroids == null || this.centroids.xLeft == null ||
+        this.centroids.xRight == null || this.centroids.yUp == null ||
+        this.centroids.yDown == null) {
+      return;
+    }
+    const xDir = vector.sub(this.centroids.xRight, this.centroids.xLeft);
+    this.dataSet.projectLinear(xDir, 'linear-x');
+
+    const yDir = vector.sub(this.centroids.yUp, this.centroids.yDown);
+    this.dataSet.projectLinear(yDir, 'linear-y');
+
+    const accessors = data.getProjectionComponents('custom', ['x', 'y']);
+    const projection = new Projection('custom', accessors, 2, this.dataSet);
+    this.projector.setProjection(projection);
+  }
+
+  clearCentroids(): void {
+    this.centroids = {xLeft: null, xRight: null, yUp: null, yDown: null};
+    this.allCentroid = null;
+  }
+
+  _customSelectedSearchByMetadataOptionChanged(newVal: string, oldVal: string) {
+    if (this.polymerChangesTriggerReprojection === false) {
+      return;
+    }
+    if (this.currentProjection === 'custom') {
+      this.computeAllCentroids();
+      this.reprojectCustom();
+    }
+  }
+
+  private setupCustomProjectionInputFields() {
+    this.customProjectionXLeftInput =
+        this.setupCustomProjectionInputField('xLeft');
+    this.customProjectionXRightInput =
+        this.setupCustomProjectionInputField('xRight');
+    this.customProjectionYUpInput = this.setupCustomProjectionInputField('yUp');
+    this.customProjectionYDownInput =
+        this.setupCustomProjectionInputField('yDown');
+  }
+
+  private computeAllCentroids() {
+    this.computeCentroid('xLeft');
+    this.computeCentroid('xRight');
+    this.computeCentroid('yUp');
+    this.computeCentroid('yDown');
+  }
+
+  private computeCentroid(name: InputControlName) {
+    const input = this.querySelector('#' + name) as ProjectorInput;
+    if (input == null) {
+      return;
+    }
+    const value = input.getValue();
+    if (value == null) {
+      return;
+    }
+    let inRegexMode = input.getInRegexMode();
+    let result = this.getCentroid(value, inRegexMode);
+    if (result.numMatches === 0) {
+      input.message = '0 matches. Using a random vector.';
+      result.centroid = vector.rn(this.dim);
+    } else {
+      input.message = `${result.numMatches} matches.`;
+    }
+    this.centroids[name] = result.centroid;
+    this.centroidValues[name] = value;
+  }
+
+  private setupCustomProjectionInputField(name: InputControlName):
+      ProjectorInput {
+    let input = this.querySelector('#' + name) as ProjectorInput;
+    input.registerInputChangedListener((input, inRegexMode) => {
+      if (this.polymerChangesTriggerReprojection) {
+        this.computeCentroid(name);
+        this.reprojectCustom();
+      }
+    });
+    return input;
+  }
+
+  private getCentroid(pattern: string, inRegexMode: boolean): CentroidResult {
+    if (pattern == null || pattern === '') {
+      return {numMatches: 0};
+    }
+    // Search by the original dataset since we often want to filter and project
+    // only the nearest neighbors of A onto B-C where B and C are not nearest
+    // neighbors of A.
+    let accessor = (i: number) => this.originalDataSet.points[i].vector;
+    let r = this.originalDataSet.query(
+        pattern, inRegexMode, this.customSelectedSearchByMetadataOption);
+    return {centroid: vector.centroid(r, accessor), numMatches: r.length};
+  }
+
+  getPcaSampledDimText() {
+    return data.PCA_SAMPLE_DIM.toLocaleString();
+  }
+
+  getPcaSampleSizeText() {
+    return data.PCA_SAMPLE_SIZE.toLocaleString();
+  }
+
+  getTsneSampleSizeText() {
+    return data.TSNE_SAMPLE_SIZE.toLocaleString();
+  }
+}
+
+document.registerElement(ProjectionsPanel.prototype.is, ProjectionsPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel_test.ts
new file mode 100644
index 0000000000..fd1acf6f08
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel_test.ts
@@ -0,0 +1,109 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {State} from './data';
+import {ProjectionsPanel} from './vz-projector-projections-panel';
+
+const assert = chai.assert;
+
+describe('restoreUIFromBookmark', () => {
+  let projectionsPanel: ProjectionsPanel;
+  beforeEach(() => {
+    projectionsPanel = document.createElement(ProjectionsPanel.prototype.is) as
+        ProjectionsPanel;
+
+    // Set up some of the UI so the elements are found in the production code.
+    const tsnePerplexityContainer = document.createElement('div');
+    tsnePerplexityContainer.className = 'tsne-perplexity';
+    const tsnePerplexity = document.createElement('span');
+    tsnePerplexityContainer.appendChild(tsnePerplexity);
+    projectionsPanel.appendChild(tsnePerplexityContainer);
+
+    const tsneLearningRateContainer = document.createElement('div');
+    tsneLearningRateContainer.className = 'tsne-learning-rate';
+    const tsneLearningRate = document.createElement('span');
+    tsneLearningRateContainer.appendChild(tsneLearningRate);
+    projectionsPanel.appendChild(tsneLearningRateContainer);
+  });
+
+  it('sets the pcaX/Y properties when setting 2D component values', () => {
+    spyOn(projectionsPanel, 'setZDropdownEnabled');
+
+    const s = new State();
+    s.pcaComponentDimensions = [0, 1];
+    projectionsPanel.restoreUIFromBookmark(s);
+
+    assert.equal(0, projectionsPanel.pcaX);
+    assert.equal(1, projectionsPanel.pcaY);
+
+    expect(projectionsPanel.setZDropdownEnabled).toHaveBeenCalledWith(false);
+  });
+
+  it('sets the pcaX/Y properties when setting 3D component values', () => {
+    spyOn(projectionsPanel, 'setZDropdownEnabled');
+
+    const s = new State();
+    s.pcaComponentDimensions = [0, 1, 2];
+    projectionsPanel.restoreUIFromBookmark(s);
+
+    assert.equal(0, projectionsPanel.pcaX);
+    assert.equal(1, projectionsPanel.pcaY);
+    assert.equal(2, projectionsPanel.pcaZ);
+
+    expect(projectionsPanel.setZDropdownEnabled).toHaveBeenCalledWith(true);
+  });
+});
+
+describe('populateBookmarkFromUI', () => {
+  let projectionsPanel: ProjectionsPanel;
+
+  beforeEach(() => {
+    projectionsPanel = document.createElement(ProjectionsPanel.prototype.is) as
+        ProjectionsPanel;
+
+    // Set up some of the UI so the elements are found in the production code.
+    const tsnePerplexityContainer = document.createElement('div');
+    tsnePerplexityContainer.className = 'tsne-perplexity';
+    const tsnePerplexity = document.createElement('span');
+    tsnePerplexityContainer.appendChild(tsnePerplexity);
+    projectionsPanel.appendChild(tsnePerplexityContainer);
+
+    const tsneLearningRateContainer = document.createElement('div');
+    tsneLearningRateContainer.className = 'tsne-learning-rate';
+    const tsneLearningRate = document.createElement('span');
+    tsneLearningRateContainer.appendChild(tsneLearningRate);
+    projectionsPanel.appendChild(tsneLearningRateContainer);
+  });
+
+  it('gets the PCA component UI values from a 2D PCA projection', () => {
+    projectionsPanel.pcaX = 0;
+    projectionsPanel.pcaY = 1;
+    projectionsPanel.pcaIs3d = false;
+
+    const s = new State();
+    projectionsPanel.populateBookmarkFromUI(s);
+    assert.deepEqual([0, 1], s.pcaComponentDimensions);
+  });
+
+  it('gets the PCA component UI values from a 3D PCA projection', () => {
+    projectionsPanel.pcaX = 0;
+    projectionsPanel.pcaY = 1;
+    projectionsPanel.pcaZ = 2;
+    projectionsPanel.pcaIs3d = true;
+
+    const s = new State();
+    projectionsPanel.populateBookmarkFromUI(s);
+    assert.deepEqual([0, 1, 2], s.pcaComponentDimensions);
+  });
+});
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-util.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-util.ts
new file mode 100644
index 0000000000..44062062a3
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-util.ts
@@ -0,0 +1,34 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+export type Spec = {
+  is: string; properties?: {
+    [key: string]:
+        (Function |
+         {
+           type: Function, value?: any;
+           readonly?: boolean;
+           notify?: boolean;
+           observer?: string;
+         })
+  };
+  observers?: string[];
+};
+
+export function PolymerElement(spec: Spec) {
+  return Polymer.Class(spec as any) as{new (): PolymerHTMLElement};
+}
+
+export interface PolymerHTMLElement extends HTMLElement, polymer.Base {}
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.html
new file mode 100644
index 0000000000..d4be2f26a5
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.html
@@ -0,0 +1,343 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../paper-listbox/paper-listbox.html">
+<link rel="import" href="../paper-item/paper-item.html">
+<link rel="import" href="../paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../iron-icons/iron-icons.html">
+<link rel="import" href="../iron-icons/image-icons.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-dialog/paper-dialog.html">
+<link rel="import" href="../paper-toast/paper-toast.html">
+<link rel="import" href="../paper-styles/typography.html">
+<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
+<link rel="import" href="../paper-dialog-scrollable/paper-dialog-scrollable.html">
+
+<link rel="import" href="vz-projector-bookmark-panel.html">
+<link rel="import" href="vz-projector-data-panel.html">
+<link rel="import" href="vz-projector-inspector-panel.html">
+<link rel="import" href="vz-projector-input.html">
+<link rel="import" href="vz-projector-metadata-card.html">
+<link rel="import" href="vz-projector-projections-panel.html">
+<link rel="import" href="styles.html">
+
+<dom-module id="vz-projector">
+<template>
+<style include="vz-projector-styles"></style>
+<style>
+:host {
+  display: flex;
+  width: 100%;
+  height: 100%;
+}
+
+#container {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.hidden {
+  display: none !important;
+}
+
+/* Main */
+
+#main {
+  position: relative;
+  flex-grow: 2;
+}
+
+#main .stage {
+  position: relative;
+  flex-grow: 2;
+}
+
+#scatter {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+#selector {
+  display: none;
+  height: 100%;
+  position: absolute;
+  width: 100%;
+}
+
+#left-pane {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  min-width: 312px;
+  width: 312px;
+  border-right: 1px solid rgba(0, 0, 0, 0.1);
+  background: #fafafa;
+}
+
+#right-pane {
+  border-left: 1px solid rgba(0, 0, 0, 0.1);
+  background: #fafafa;
+  display: flex;
+  height: 100%;
+  min-width: 300px;
+  width: 300px;
+}
+
+.file-name {
+  margin-right: 5px;
+}
+
+.control input[type=text]:focus {
+  outline: none;
+  border-bottom: 1px solid rgba(0, 0, 0, 1);
+}
+
+.control {
+  display: inline-block;
+  width: 45%;
+  vertical-align: top;
+  margin-right: 10px;
+  overflow-x: hidden;
+}
+
+.control.last {
+  margin-right: 0;
+}
+
+#notification-dialog {
+  width: 400px;
+  padding-bottom: 20px;
+}
+
+#notification-dialog paper-button {
+  background: none;
+  text-transform: uppercase;
+}
+
+#notification-dialog .progress {
+  --paper-spinner-color: #880E4F;
+  --paper-spinner-stroke-width: 2px;
+}
+
+#notify-msgs {
+  text-align: center;
+  display: block;
+}
+
+.notify-msg {
+  font-weight: 500;
+  margin: 0;
+  padding: 0;
+}
+
+.notify-msg.error {
+  text-align: left;
+}
+
+.brush .extent {
+  stroke: #fff;
+  fill-opacity: .125;
+  shape-rendering: crispEdges;
+}
+
+.origin text {
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.origin line {
+  stroke: black;
+  stroke-opacity: 0.2;
+}
+
+/* Ink Framework */
+
+/* - Buttons */
+.ink-button, ::shadow .ink-button {
+  border: none;
+  border-radius: 2px;
+  font-size: 13px;
+  padding: 10px;
+  min-width: 100px;
+  flex-shrink: 0;
+  background: #e3e3e3;
+}
+
+.status-bar-panel {
+  display: flex;
+  align-items: center;
+}
+
+.status-bar-entry {
+  border-left: 1px solid rgba(0, 0, 0, 0.5);
+  margin-left: 5px;
+  padding-left: 5px;
+}
+
+/* - Menubar */
+
+.ink-panel-menubar {
+  align-items: center;
+  position: relative;
+  height: 60px;
+  border-bottom: solid 1px #eee;
+  padding: 0 24px;
+  display: flex;
+}
+
+.ink-panel-menubar .ink-fabs {
+  position: absolute;
+  right: 12px;
+  top: 40px;
+  z-index: 1;
+}
+
+#bookmark-panel {
+  bottom: 0;
+  position: absolute;
+  width: 300px;
+}
+#bookmark-panel-container {
+  bottom: 60px;
+  position: absolute;
+}
+
+.ink-fab {
+  margin-left: 8px;
+  border: 1px solid rgba(0, 0, 0, 0.02);
+  background: white;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+}
+
+#metadata-card {
+  position: absolute;
+  right: 5px;
+  top: 25px;
+}
+
+#help-3d-icon {
+  position: absolute;
+  top: 20px;
+  left: 20px;
+}
+
+#help3dDialog .main {
+  margin: 0;
+  padding: 20px;
+}
+
+#help3dDialog h3 {
+  margin-top: 20px;
+  margin-bottom: 5px;
+}
+
+#help3dDialog h3:first-child {
+  margin-top: 0;
+}
+
+#data-panel {
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  overflow-y: auto;
+}
+
+#toast {
+  display: flex;
+  align-items: center;
+  --paper-toast-color: #eeff41;
+}
+</style>
+<paper-dialog id="notification-dialog" modal>
+  <h2 id="notification-title"></h2>
+  <paper-dialog-scrollable>
+    <div id="notify-msgs"></div>
+  </paper-dialog-scrollable>
+  <div style="text-align: center;"><paper-spinner-lite active class="progress"></paper-spinner-lite></div>
+  <div class="buttons">
+    <paper-button class="close-button" dialog-confirm autofocus>Close</paper-button>
+  </div>
+</paper-dialog>
+<div id="container">
+  <div id="left-pane" class="ink-panel">
+    <vz-projector-data-panel id="data-panel"></vz-projector-data-panel>
+    <vz-projector-projections-panel id="projections-panel"></vz-projector-projections-panel>
+  </div>
+  <div id="main" class="ink-panel">
+    <div class="ink-panel-menubar">
+      <paper-icon-button id="selectMode" alt="Bounding box selection" toggles icon="image:photo-size-select-small"></paper-icon-button>
+      <paper-tooltip for="selectMode" position="bottom" animation-delay="0" fit-to-visible-bounds>Bounding box selection</paper-tooltip>
+
+      <paper-icon-button id="nightDayMode" alt="Enable/disable night mode" toggles icon="image:brightness-2"></paper-icon-button>
+      <paper-tooltip for="nightDayMode" position="bottom" animation-delay="0" fit-to-visible-bounds>Enable/disable night mode</paper-tooltip>
+
+      <paper-icon-button id="labels3DMode" alt="Enable/disable 3D labels mode" toggles icon="font-download"></paper-icon-button>
+      <paper-tooltip for="labels3DMode" position="bottom" animation-delay="0" fit-to-visible-bounds>Enable/disable 3D labels mode</paper-tooltip>
+      <div class="status-bar-panel">
+        <div class="status-bar-entry">Points: <span class="numDataPoints">Loading...</span></div>
+        <div class="status-bar-entry">Dimension: <span class="dim">Loading...</span></div>
+        <div id="status-bar" class="status-bar-entry" style="display: none;"></div>
+      </div>
+      <div class="ink-fabs">
+        <paper-icon-button id="reset-zoom" class="ink-fab" alt="Reset zoom to fit all points" icon="home"></paper-icon-button>
+        <paper-tooltip for="reset-zoom" position="left" animation-delay="0">Reset zoom to fit all points</paper-tooltip>
+      </div>
+    </div>
+    <div class="stage">
+      <div id="scatter">
+        <svg id="selector"></svg>
+      </div>
+      <vz-projector-metadata-card id="metadata-card"></vz-projector-metadata-card>
+      <paper-icon-button raised onclick="help3dDialog.open()" icon="help-outline" id="help-3d-icon"></paper-icon-button>
+      <paper-tooltip animation-delay="0" for="help-3d-icon">Help with interaction controls.</paper-tooltip>
+      <paper-dialog id="help3dDialog" with-backdrop>
+        <div class="main" dialog-confirm autofocus>
+          <h3>3D controls</h3>
+            <b>Rotate</b> Mouse left click.<br/>
+            <b>Pan</b> Mouse right click.<br/>
+            <b>Zoom</b> Mouse wheel.<br/>
+            Holding <b>ctrl</b> reverses the mouse clicks.
+          <h3>2D controls</h3>
+            <b>Pan</b> Mouse left click.<br/>
+            <b>Zoom</b> Mouse wheel.
+          <div class="dismiss-dialog-note"> Click anywhere to dismiss.</div>
+        </div>
+      </paper-dialog>
+    </div>
+  </div>
+  <div id="right-pane" class="ink-panel">
+    <div class="ink-panel-content active">
+      <vz-projector-inspector-panel id="inspector-panel"></vz-projector-inspector-panel>
+    </div>
+    <div id="bookmark-panel-container">
+      <vz-projector-bookmark-panel id="bookmark-panel"></vz-projector-bookmark-panel>
+    </div>
+  </div>
+</div>
+<paper-toast id="toast" always-on-top></paper-toast>
+
+</template> <!-- global template -->
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.ts
new file mode 100644
index 0000000000..bf98a4d478
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector.ts
@@ -0,0 +1,570 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {AnalyticsLogger} from './analyticsLogger';
+import * as data from './data';
+import {ColorOption, ColumnStats, DataPoint, DataProto, DataSet, DistanceFunction, PointMetadata, Projection, SpriteAndMetadataInfo, State, stateGetAccessorDimensions} from './data';
+import {DataProvider, EmbeddingInfo, ServingMode} from './data-provider';
+import {DemoDataProvider} from './data-provider-demo';
+import {ProtoDataProvider} from './data-provider-proto';
+import {ServerDataProvider} from './data-provider-server';
+import * as knn from './knn';
+import * as logging from './logging';
+import {DistanceMetricChangedListener, HoverListener, ProjectionChangedListener, ProjectorEventContext, SelectionChangedListener} from './projectorEventContext';
+import {ProjectorScatterPlotAdapter} from './projectorScatterPlotAdapter';
+import {MouseMode} from './scatterPlot';
+import * as util from './util';
+import {BookmarkPanel} from './vz-projector-bookmark-panel';
+import {DataPanel} from './vz-projector-data-panel';
+import {InspectorPanel} from './vz-projector-inspector-panel';
+import {MetadataCard} from './vz-projector-metadata-card';
+import {ProjectionsPanel} from './vz-projector-projections-panel';
+// tslint:disable-next-line:no-unused-variable
+import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
+
+/**
+ * The minimum number of dimensions the data should have to automatically
+ * decide to normalize the data.
+ */
+const THRESHOLD_DIM_NORMALIZE = 50;
+const POINT_COLOR_MISSING = 'black';
+
+export let ProjectorPolymer = PolymerElement({
+  is: 'vz-projector',
+  properties: {
+    routePrefix: String,
+    dataProto: {type: String, observer: '_dataProtoChanged'},
+    servingMode: String,
+    projectorConfigJsonPath: String,
+    pageViewLogging: Boolean,
+    eventLogging: Boolean
+  }
+});
+
+const INDEX_METADATA_FIELD = '__index__';
+
+export class Projector extends ProjectorPolymer implements
+    ProjectorEventContext {
+  // The working subset of the data source's original data set.
+  dataSet: DataSet;
+  servingMode: ServingMode;
+  // The path to the projector config JSON file for demo mode.
+  projectorConfigJsonPath: string;
+
+  private selectionChangedListeners: SelectionChangedListener[];
+  private hoverListeners: HoverListener[];
+  private projectionChangedListeners: ProjectionChangedListener[];
+  private distanceMetricChangedListeners: DistanceMetricChangedListener[];
+
+  private originalDataSet: DataSet;
+  private dataSetBeforeFilter: DataSet;
+  private projectorScatterPlotAdapter: ProjectorScatterPlotAdapter;
+  private dim: number;
+
+  private dataSetFilterIndices: number[];
+  private selectedPointIndices: number[];
+  private neighborsOfFirstPoint: knn.NearestEntry[];
+  private hoverPointIndex: number;
+
+  private dataProvider: DataProvider;
+  private inspectorPanel: InspectorPanel;
+
+  private selectedColorOption: ColorOption;
+  private selectedLabelOption: string;
+  private routePrefix: string;
+  private normalizeData: boolean;
+  private projection: Projection;
+
+  /** Polymer component panels */
+  private dataPanel: DataPanel;
+  private bookmarkPanel: BookmarkPanel;
+  private projectionsPanel: ProjectionsPanel;
+  private metadataCard: MetadataCard;
+
+  private statusBar: HTMLDivElement;
+  private analyticsLogger: AnalyticsLogger;
+  private eventLogging: boolean;
+  private pageViewLogging: boolean;
+
+  ready() {
+    logging.setDomContainer(this);
+
+    this.analyticsLogger =
+        new AnalyticsLogger(this.pageViewLogging, this.eventLogging);
+    this.analyticsLogger.logPageView('embeddings');
+
+    if (!util.hasWebGLSupport()) {
+      this.analyticsLogger.logWebGLDisabled();
+      logging.setErrorMessage(
+          'Your browser or device does not have WebGL enabled. Please enable ' +
+          'hardware acceleration, or use a browser that supports WebGL.');
+      return;
+    }
+
+    this.selectionChangedListeners = [];
+    this.hoverListeners = [];
+    this.projectionChangedListeners = [];
+    this.distanceMetricChangedListeners = [];
+    this.selectedPointIndices = [];
+    this.neighborsOfFirstPoint = [];
+
+    this.dataPanel = this.$['data-panel'] as DataPanel;
+    this.inspectorPanel = this.$['inspector-panel'] as InspectorPanel;
+    this.inspectorPanel.initialize(this, this as ProjectorEventContext);
+    this.projectionsPanel = this.$['projections-panel'] as ProjectionsPanel;
+    this.projectionsPanel.initialize(this);
+    this.bookmarkPanel = this.$['bookmark-panel'] as BookmarkPanel;
+    this.bookmarkPanel.initialize(this, this as ProjectorEventContext);
+    this.metadataCard = this.$['metadata-card'] as MetadataCard;
+    this.statusBar = this.querySelector('#status-bar') as HTMLDivElement;
+    this.scopeSubtree(this.$$('#notification-dialog'), true);
+    this.setupUIControls();
+    this.initializeDataProvider();
+  }
+
+  setSelectedLabelOption(labelOption: string) {
+    this.selectedLabelOption = labelOption;
+    this.metadataCard.setLabelOption(this.selectedLabelOption);
+    this.projectorScatterPlotAdapter.setLabelPointAccessor(labelOption);
+    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
+    this.projectorScatterPlotAdapter.render();
+  }
+
+  setSelectedColorOption(colorOption: ColorOption) {
+    this.selectedColorOption = colorOption;
+    this.projectorScatterPlotAdapter.setLegendPointColorer(
+        this.getLegendPointColorer(colorOption));
+    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
+    this.projectorScatterPlotAdapter.render();
+  }
+
+  setNormalizeData(normalizeData: boolean) {
+    this.normalizeData = normalizeData;
+    this.setCurrentDataSet(this.originalDataSet.getSubset());
+  }
+
+  updateDataSet(
+      ds: DataSet, spriteAndMetadata?: SpriteAndMetadataInfo,
+      metadataFile?: string) {
+    this.dataSetFilterIndices = null;
+    this.originalDataSet = ds;
+    if (ds != null) {
+      this.normalizeData =
+          this.originalDataSet.dim[1] >= THRESHOLD_DIM_NORMALIZE;
+      spriteAndMetadata = spriteAndMetadata || {};
+      if (spriteAndMetadata.pointsInfo == null) {
+        let [pointsInfo, stats] = this.makeDefaultPointsInfoAndStats(ds.points);
+        spriteAndMetadata.pointsInfo = pointsInfo;
+        spriteAndMetadata.stats = stats;
+      }
+      let metadataMergeSucceeded = ds.mergeMetadata(spriteAndMetadata);
+      if (!metadataMergeSucceeded) {
+        return;
+      }
+    }
+    if (this.projectorScatterPlotAdapter != null) {
+      if (ds == null) {
+        this.projectorScatterPlotAdapter.setLabelPointAccessor(null);
+        this.setProjection(null);
+      } else {
+        this.projectorScatterPlotAdapter.updateScatterPlotPositions();
+        this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
+        this.projectorScatterPlotAdapter.resize();
+        this.projectorScatterPlotAdapter.render();
+      }
+    }
+    if (ds != null) {
+      this.dataPanel.setNormalizeData(this.normalizeData);
+      this.setCurrentDataSet(ds.getSubset());
+      this.projectorScatterPlotAdapter.setLabelPointAccessor(
+          this.selectedLabelOption);
+      this.inspectorPanel.datasetChanged();
+
+      this.inspectorPanel.metadataChanged(spriteAndMetadata);
+      this.projectionsPanel.metadataChanged(spriteAndMetadata);
+      this.dataPanel.metadataChanged(spriteAndMetadata, metadataFile);
+      // Set the container to a fixed height, otherwise in Colab the
+      // height can grow indefinitely.
+      const container = this.querySelector('#container') as HTMLDivElement;
+      container.style.height = container.clientHeight + 'px';
+    } else {
+      this.setCurrentDataSet(null);
+    }
+  }
+
+  setSelectedTensor(run: string, tensorInfo: EmbeddingInfo) {
+    this.bookmarkPanel.setSelectedTensor(run, tensorInfo, this.dataProvider);
+  }
+
+  /**
+   * Registers a listener to be called any time the selected point set changes.
+   */
+  registerSelectionChangedListener(listener: SelectionChangedListener) {
+    this.selectionChangedListeners.push(listener);
+  }
+
+  filterDataset(pointIndices: number[]) {
+    const selectionSize = this.selectedPointIndices.length;
+    if (this.dataSetBeforeFilter == null) {
+      this.dataSetBeforeFilter = this.dataSet;
+    }
+    this.setCurrentDataSet(this.dataSet.getSubset(pointIndices));
+    this.dataSetFilterIndices = pointIndices;
+    this.projectorScatterPlotAdapter.updateScatterPlotPositions();
+    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
+    this.adjustSelectionAndHover(util.range(selectionSize));
+  }
+
+  resetFilterDataset() {
+    const originalPointIndices = this.selectedPointIndices.map(
+        filteredIndex => this.dataSet.points[filteredIndex].index);
+    this.setCurrentDataSet(this.dataSetBeforeFilter);
+    if (this.projection != null) {
+      this.projection.dataSet = this.dataSetBeforeFilter;
+    }
+    this.dataSetBeforeFilter = null;
+    this.projectorScatterPlotAdapter.updateScatterPlotPositions();
+    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
+    this.dataSetFilterIndices = [];
+    this.adjustSelectionAndHover(originalPointIndices);
+  }
+
+  /**
+   * Used by clients to indicate that a selection has occurred.
+   */
+  notifySelectionChanged(newSelectedPointIndices: number[]) {
+    this.selectedPointIndices = newSelectedPointIndices;
+    let neighbors: knn.NearestEntry[] = [];
+
+    if (newSelectedPointIndices.length === 1) {
+      neighbors = this.dataSet.findNeighbors(
+          newSelectedPointIndices[0], this.inspectorPanel.distFunc,
+          this.inspectorPanel.numNN);
+      this.metadataCard.updateMetadata(
+          this.dataSet.points[newSelectedPointIndices[0]].metadata);
+    } else {
+      this.metadataCard.updateMetadata(null);
+    }
+
+    this.selectionChangedListeners.forEach(
+        l => l(this.selectedPointIndices, neighbors));
+  }
+
+  /**
+   * Registers a listener to be called any time the mouse hovers over a point.
+   */
+  registerHoverListener(listener: HoverListener) {
+    this.hoverListeners.push(listener);
+  }
+
+  /**
+   * Used by clients to indicate that a hover is occurring.
+   */
+  notifyHoverOverPoint(pointIndex: number) {
+    this.hoverListeners.forEach(l => l(pointIndex));
+  }
+
+  registerProjectionChangedListener(listener: ProjectionChangedListener) {
+    this.projectionChangedListeners.push(listener);
+  }
+
+  notifyProjectionChanged(projection: Projection) {
+    this.projectionChangedListeners.forEach(l => l(projection));
+  }
+
+  registerDistanceMetricChangedListener(l: DistanceMetricChangedListener) {
+    this.distanceMetricChangedListeners.push(l);
+  }
+
+  notifyDistanceMetricChanged(distMetric: DistanceFunction) {
+    this.distanceMetricChangedListeners.forEach(l => l(distMetric));
+  }
+
+  _dataProtoChanged(dataProtoString: string) {
+    let dataProto =
+        dataProtoString ? JSON.parse(dataProtoString) as DataProto : null;
+    this.initializeDataProvider(dataProto);
+  }
+
+  private makeDefaultPointsInfoAndStats(points: DataPoint[]):
+      [PointMetadata[], ColumnStats[]] {
+    let pointsInfo: PointMetadata[] = [];
+    points.forEach(p => {
+      let pointInfo: PointMetadata = {};
+      pointInfo[INDEX_METADATA_FIELD] = p.index;
+      pointsInfo.push(pointInfo);
+    });
+    let stats: ColumnStats[] = [{
+      name: INDEX_METADATA_FIELD,
+      isNumeric: false,
+      tooManyUniqueValues: true,
+      min: 0,
+      max: pointsInfo.length - 1
+    }];
+    return [pointsInfo, stats];
+  }
+
+  private initializeDataProvider(dataProto?: DataProto) {
+    if (this.servingMode === 'demo') {
+      let projectorConfigUrl: string;
+
+      // Only in demo mode do we allow the config being passed via URL.
+      let urlParams = util.getURLParams(window.location.search);
+      if ('config' in urlParams) {
+        projectorConfigUrl = urlParams['config'];
+      } else {
+        projectorConfigUrl = this.projectorConfigJsonPath;
+      }
+      this.dataProvider = new DemoDataProvider(projectorConfigUrl);
+    } else if (this.servingMode === 'server') {
+      if (!this.routePrefix) {
+        throw 'route-prefix is a required parameter';
+      }
+      this.dataProvider = new ServerDataProvider(this.routePrefix);
+    } else if (this.servingMode === 'proto' && dataProto != null) {
+      this.dataProvider = new ProtoDataProvider(dataProto);
+    }
+
+    this.dataPanel.initialize(this, this.dataProvider);
+  }
+
+  private getLegendPointColorer(colorOption: ColorOption):
+      (ds: DataSet, index: number) => string {
+    if ((colorOption == null) || (colorOption.map == null)) {
+      return null;
+    }
+    const colorer = (ds: DataSet, i: number) => {
+      let value = ds.points[i].metadata[this.selectedColorOption.name];
+      if (value == null) {
+        return POINT_COLOR_MISSING;
+      }
+      return colorOption.map(value);
+    };
+    return colorer;
+  }
+
+  private get3DLabelModeButton(): any {
+    return this.querySelector('#labels3DMode');
+  }
+
+  private get3DLabelMode(): boolean {
+    const label3DModeButton = this.get3DLabelModeButton();
+    return (label3DModeButton as any).active;
+  }
+
+  adjustSelectionAndHover(selectedPointIndices: number[], hoverIndex?: number) {
+    this.notifySelectionChanged(selectedPointIndices);
+    this.notifyHoverOverPoint(hoverIndex);
+    this.setMouseMode(MouseMode.CAMERA_AND_CLICK_SELECT);
+  }
+
+  private setMouseMode(mouseMode: MouseMode) {
+    let selectModeButton = this.querySelector('#selectMode');
+    (selectModeButton as any).active = (mouseMode === MouseMode.AREA_SELECT);
+    this.projectorScatterPlotAdapter.scatterPlot.setMouseMode(mouseMode);
+  }
+
+  private setCurrentDataSet(ds: DataSet) {
+    this.adjustSelectionAndHover([]);
+    if (this.dataSet != null) {
+      this.dataSet.stopTSNE();
+    }
+    if ((ds != null) && this.normalizeData) {
+      ds.normalize();
+    }
+    this.dim = (ds == null) ? 0 : ds.dim[1];
+    (this.querySelector('span.numDataPoints') as HTMLSpanElement).innerText =
+        (ds == null) ? '0' : '' + ds.dim[0];
+    (this.querySelector('span.dim') as HTMLSpanElement).innerText =
+        (ds == null) ? '0' : '' + ds.dim[1];
+
+    this.dataSet = ds;
+
+    this.projectionsPanel.dataSetUpdated(
+        this.dataSet, this.originalDataSet, this.dim);
+
+    this.projectorScatterPlotAdapter.setDataSet(this.dataSet);
+    this.projectorScatterPlotAdapter.scatterPlot
+        .setCameraParametersForNextCameraCreation(null, true);
+  }
+
+  private setupUIControls() {
+    // View controls
+    this.querySelector('#reset-zoom').addEventListener('click', () => {
+      this.projectorScatterPlotAdapter.scatterPlot.resetZoom();
+      this.projectorScatterPlotAdapter.scatterPlot.startOrbitAnimation();
+    });
+
+    let selectModeButton = this.querySelector('#selectMode');
+    selectModeButton.addEventListener('click', (event) => {
+      this.setMouseMode(
+          (selectModeButton as any).active ? MouseMode.AREA_SELECT :
+                                             MouseMode.CAMERA_AND_CLICK_SELECT);
+    });
+    let nightModeButton = this.querySelector('#nightDayMode');
+    nightModeButton.addEventListener('click', () => {
+      this.projectorScatterPlotAdapter.scatterPlot.setDayNightMode(
+          (nightModeButton as any).active);
+    });
+
+    const labels3DModeButton = this.get3DLabelModeButton();
+    labels3DModeButton.addEventListener('click', () => {
+      this.projectorScatterPlotAdapter.set3DLabelMode(this.get3DLabelMode());
+    });
+
+    window.addEventListener('resize', () => {
+      const container = this.querySelector('#container') as HTMLDivElement;
+      const parentHeight = (container.parentNode as HTMLElement).clientHeight;
+      container.style.height = parentHeight + 'px';
+      this.projectorScatterPlotAdapter.resize();
+    });
+
+    {
+      this.projectorScatterPlotAdapter = new ProjectorScatterPlotAdapter(
+          this.getScatterContainer(), this as ProjectorEventContext);
+      this.projectorScatterPlotAdapter.setLabelPointAccessor(
+          this.selectedLabelOption);
+    }
+
+    this.projectorScatterPlotAdapter.scatterPlot.onCameraMove(
+        (cameraPosition: THREE.Vector3, cameraTarget: THREE.Vector3) =>
+            this.bookmarkPanel.clearStateSelection());
+
+    this.registerHoverListener(
+        (hoverIndex: number) => this.onHover(hoverIndex));
+
+    this.registerSelectionChangedListener(
+        (selectedPointIndices: number[],
+         neighborsOfFirstPoint: knn.NearestEntry[]) =>
+            this.onSelectionChanged(
+                selectedPointIndices, neighborsOfFirstPoint));
+  }
+
+  private onHover(hoverIndex: number) {
+    this.hoverPointIndex = hoverIndex;
+    let hoverText = null;
+    if (hoverIndex != null) {
+      const point = this.dataSet.points[hoverIndex];
+      if (point.metadata[this.selectedLabelOption]) {
+        hoverText = point.metadata[this.selectedLabelOption].toString();
+      }
+    }
+    if (this.selectedPointIndices.length === 0) {
+      this.statusBar.style.display = hoverText ? null : 'none';
+      this.statusBar.innerText = hoverText;
+    }
+  }
+
+  private getScatterContainer(): HTMLDivElement {
+    return this.querySelector('#scatter') as HTMLDivElement;
+  }
+
+  private onSelectionChanged(
+      selectedPointIndices: number[],
+      neighborsOfFirstPoint: knn.NearestEntry[]) {
+    this.selectedPointIndices = selectedPointIndices;
+    this.neighborsOfFirstPoint = neighborsOfFirstPoint;
+    let totalNumPoints =
+        this.selectedPointIndices.length + neighborsOfFirstPoint.length;
+    this.statusBar.innerText = `Selected ${totalNumPoints} points`;
+    this.statusBar.style.display = totalNumPoints > 0 ? null : 'none';
+  }
+
+  setProjection(projection: Projection) {
+    this.projection = projection;
+    if (projection != null) {
+      this.analyticsLogger.logProjectionChanged(projection.projectionType);
+    }
+    this.notifyProjectionChanged(projection);
+  }
+
+  notifyProjectionPositionsUpdated() {
+    this.projectorScatterPlotAdapter.notifyProjectionPositionsUpdated();
+  }
+
+  /**
+   * Gets the current view of the embedding and saves it as a State object.
+   */
+  getCurrentState(): State {
+    const state = new State();
+
+    // Save the individual datapoint projections.
+    state.projections = [];
+    for (let i = 0; i < this.dataSet.points.length; i++) {
+      const point = this.dataSet.points[i];
+      const projections: {[key: string]: number} = {};
+      const keys = Object.keys(point.projections);
+      for (let j = 0; j < keys.length; ++j) {
+        projections[keys[j]] = point.projections[keys[j]];
+      }
+      state.projections.push(projections);
+    }
+    state.selectedProjection = this.projection.projectionType;
+    state.dataSetDimensions = this.dataSet.dim;
+    state.tSNEIteration = this.dataSet.tSNEIteration;
+    state.selectedPoints = this.selectedPointIndices;
+    state.filteredPoints = this.dataSetFilterIndices;
+    this.projectorScatterPlotAdapter.populateBookmarkFromUI(state);
+    state.selectedColorOptionName = this.dataPanel.selectedColorOptionName;
+    state.forceCategoricalColoring = this.dataPanel.forceCategoricalColoring;
+    state.selectedLabelOption = this.selectedLabelOption;
+    this.projectionsPanel.populateBookmarkFromUI(state);
+    return state;
+  }
+
+  /** Loads a State object into the world. */
+  loadState(state: State) {
+    this.setProjection(null);
+    {
+      this.projectionsPanel.disablePolymerChangesTriggerReprojection();
+      if (this.dataSetBeforeFilter != null) {
+        this.resetFilterDataset();
+      }
+      if (state.filteredPoints != null) {
+        this.filterDataset(state.filteredPoints);
+      }
+      this.projectionsPanel.enablePolymerChangesTriggerReprojection();
+    }
+    for (let i = 0; i < state.projections.length; i++) {
+      const point = this.dataSet.points[i];
+      const projection = state.projections[i];
+      const keys = Object.keys(projection);
+      for (let j = 0; j < keys.length; ++j) {
+        point.projections[keys[j]] = projection[keys[j]];
+      }
+    }
+    this.dataSet.hasTSNERun = (state.selectedProjection === 'tsne');
+    this.dataSet.tSNEIteration = state.tSNEIteration;
+    this.projectionsPanel.restoreUIFromBookmark(state);
+    this.inspectorPanel.restoreUIFromBookmark(state);
+    this.dataPanel.selectedColorOptionName = state.selectedColorOptionName;
+    this.dataPanel.setForceCategoricalColoring(
+        !!state.forceCategoricalColoring);
+    this.selectedLabelOption = state.selectedLabelOption;
+    this.projectorScatterPlotAdapter.restoreUIFromBookmark(state);
+    {
+      const dimensions = stateGetAccessorDimensions(state);
+      const components =
+          data.getProjectionComponents(state.selectedProjection, dimensions);
+      const projection = new Projection(
+          state.selectedProjection, components, dimensions.length,
+          this.dataSet);
+      this.setProjection(projection);
+    }
+    this.notifySelectionChanged(state.selectedPoints);
+  }
+}
+
+document.registerElement(Projector.prototype.is, Projector);
-- 
GitLab


From 7c8fffaf5dca165759862322f868c21eda693da1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 09:41:57 -0800
Subject: [PATCH 0614/1563] Add GrpcDebugWrapperSession to the public debug
 API. Change: 153843609

---
 tensorflow/python/debug/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/debug/__init__.py b/tensorflow/python/debug/__init__.py
index d4a84f62cd..01e36f754c 100644
--- a/tensorflow/python/debug/__init__.py
+++ b/tensorflow/python/debug/__init__.py
@@ -25,6 +25,7 @@ See the @{$python/tfdbg} guide.
 @@has_inf_or_nan
 @@DumpingDebugHook
 @@DumpingDebugWrapperSession
+@@GrpcDebugWrapperSession
 @@LocalCLIDebugHook
 @@LocalCLIDebugWrapperSession
 @@WatchOptions
@@ -46,6 +47,7 @@ from tensorflow.python.debug.lib.debug_utils import watch_graph_with_blacklists
 
 from tensorflow.python.debug.wrappers.dumping_wrapper import DumpingDebugWrapperSession
 from tensorflow.python.debug.wrappers.framework import WatchOptions
+from tensorflow.python.debug.wrappers.grpc_wrapper import GrpcDebugWrapperSession
 from tensorflow.python.debug.wrappers.hooks import DumpingDebugHook
 from tensorflow.python.debug.wrappers.hooks import LocalCLIDebugHook
 from tensorflow.python.debug.wrappers.local_cli_wrapper import LocalCLIDebugWrapperSession
-- 
GitLab


From fa8f9da8f2607bde3701815b27ba1a67d71525ad Mon Sep 17 00:00:00 2001
From: Pete Warden <petewarden@google.com>
Date: Fri, 21 Apr 2017 10:08:59 -0800
Subject: [PATCH 0615/1563] Add Mfcc op to TensorFlow for speech feature
 generation Change: 153847440

---
 tensorflow/core/kernels/BUILD                 | 119 ++++++++++
 tensorflow/core/kernels/mfcc.cc               |  67 ++++++
 tensorflow/core/kernels/mfcc.h                |  76 +++++++
 tensorflow/core/kernels/mfcc_dct.cc           |  82 +++++++
 tensorflow/core/kernels/mfcc_dct.h            |  44 ++++
 tensorflow/core/kernels/mfcc_dct_test.cc      |  55 +++++
 .../core/kernels/mfcc_mel_filterbank.cc       | 204 ++++++++++++++++++
 tensorflow/core/kernels/mfcc_mel_filterbank.h |  65 ++++++
 .../core/kernels/mfcc_mel_filterbank_test.cc  |  92 ++++++++
 tensorflow/core/kernels/mfcc_op.cc            | 111 ++++++++++
 tensorflow/core/kernels/mfcc_op_test.cc       |  77 +++++++
 tensorflow/core/kernels/mfcc_test.cc          |  92 ++++++++
 tensorflow/core/ops/audio_ops.cc              |  50 +++++
 13 files changed, 1134 insertions(+)
 create mode 100644 tensorflow/core/kernels/mfcc.cc
 create mode 100644 tensorflow/core/kernels/mfcc.h
 create mode 100644 tensorflow/core/kernels/mfcc_dct.cc
 create mode 100644 tensorflow/core/kernels/mfcc_dct.h
 create mode 100644 tensorflow/core/kernels/mfcc_dct_test.cc
 create mode 100644 tensorflow/core/kernels/mfcc_mel_filterbank.cc
 create mode 100644 tensorflow/core/kernels/mfcc_mel_filterbank.h
 create mode 100644 tensorflow/core/kernels/mfcc_mel_filterbank_test.cc
 create mode 100644 tensorflow/core/kernels/mfcc_op.cc
 create mode 100644 tensorflow/core/kernels/mfcc_op_test.cc
 create mode 100644 tensorflow/core/kernels/mfcc_test.cc

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index c9ec61328f..e32f51a3a2 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -3692,11 +3692,130 @@ tf_cuda_cc_test(
     ],
 )
 
+cc_library(
+    name = "mfcc_dct",
+    srcs = ["mfcc_dct.cc"],
+    hdrs = ["mfcc_dct.h"],
+    copts = tf_copts(),
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+    ],
+)
+
+tf_cc_test(
+    name = "mfcc_dct_test",
+    size = "small",
+    srcs = ["mfcc_dct_test.cc"],
+    deps = [
+        ":mfcc_dct",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:lib_test_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//third_party/eigen3",
+    ],
+)
+
+cc_library(
+    name = "mfcc_mel_filterbank",
+    srcs = ["mfcc_mel_filterbank.cc"],
+    hdrs = ["mfcc_mel_filterbank.h"],
+    copts = tf_copts(),
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+    ],
+)
+
+tf_cc_test(
+    name = "mfcc_mel_filterbank_test",
+    size = "small",
+    srcs = ["mfcc_mel_filterbank_test.cc"],
+    deps = [
+        ":mfcc_mel_filterbank",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:lib_test_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//third_party/eigen3",
+    ],
+)
+
+cc_library(
+    name = "mfcc",
+    srcs = ["mfcc.cc"],
+    hdrs = ["mfcc.h"],
+    copts = tf_copts(),
+    deps = [
+        ":mfcc_dct",
+        ":mfcc_mel_filterbank",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+    ],
+)
+
+tf_cc_test(
+    name = "mfcc_test",
+    size = "small",
+    srcs = ["mfcc_test.cc"],
+    deps = [
+        ":mfcc",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:lib_test_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//third_party/eigen3",
+    ],
+)
+
+tf_kernel_library(
+    name = "mfcc_op",
+    prefix = "mfcc_op",
+    deps = [
+        ":mfcc",
+        "//tensorflow/core:audio_ops_op_lib",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+    alwayslink = 1,
+)
+
+tf_cuda_cc_test(
+    name = "mfcc_op_test",
+    size = "small",
+    srcs = ["mfcc_op_test.cc"],
+    deps = [
+        ":mfcc_op",
+        ":ops_util",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:client_session",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:framework_internal",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:tensorflow",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+    ],
+)
+
 cc_library(
     name = "audio",
     deps = [
         ":decode_wav_op",
         ":encode_wav_op",
+        ":mfcc_op",
         ":spectrogram_op",
     ],
 )
diff --git a/tensorflow/core/kernels/mfcc.cc b/tensorflow/core/kernels/mfcc.cc
new file mode 100644
index 0000000000..2793005aa2
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc.cc
@@ -0,0 +1,67 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include <math.h>
+
+#include "tensorflow/core/kernels/mfcc.h"
+
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+
+const double kDefaultUpperFrequencyLimit = 4000;
+const double kDefaultLowerFrequencyLimit = 20;
+const double kFilterbankFloor = 1e-12;
+const int kDefaultFilterbankChannelCount = 40;
+const int kDefaultDCTCoefficientCount = 13;
+
+Mfcc::Mfcc() : initialized_(false),
+               lower_frequency_limit_(kDefaultLowerFrequencyLimit),
+               upper_frequency_limit_(kDefaultUpperFrequencyLimit),
+               filterbank_channel_count_(kDefaultFilterbankChannelCount),
+               dct_coefficient_count_(kDefaultDCTCoefficientCount) { }
+
+bool Mfcc::Initialize(int input_length,
+                      double input_sample_rate) {
+  bool initialized = mel_filterbank_.Initialize(input_length,
+                                                input_sample_rate,
+                                                filterbank_channel_count_,
+                                                lower_frequency_limit_,
+                                                upper_frequency_limit_);
+  initialized &= dct_.Initialize(filterbank_channel_count_,
+                                 dct_coefficient_count_);
+  initialized_ = initialized;
+  return initialized;
+}
+
+void Mfcc::Compute(const std::vector<double>& spectrogram_frame,
+                   std::vector<double>* output) const {
+  if (!initialized_) {
+    LOG(ERROR) << "Mfcc not initialized.";
+    return;
+  }
+  std::vector<double> working;
+  mel_filterbank_.Compute(spectrogram_frame, &working);
+  for (int i = 0; i < working.size(); ++i) {
+    double val = working[i];
+    if (val < kFilterbankFloor) {
+      val = kFilterbankFloor;
+    }
+    working[i] = log(val);
+  }
+  dct_.Compute(working, output);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mfcc.h b/tensorflow/core/kernels/mfcc.h
new file mode 100644
index 0000000000..c39f104990
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc.h
@@ -0,0 +1,76 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Basic class for computing MFCCs from spectrogram slices.
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_H_
+
+#include <vector>
+
+#include "tensorflow/core/kernels/mfcc_dct.h"
+#include "tensorflow/core/kernels/mfcc_mel_filterbank.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/framework/op_kernel.h"
+
+namespace tensorflow {
+
+class Mfcc {
+ public:
+  Mfcc();
+  bool Initialize(int input_length,
+                  double input_sample_rate);
+
+  // Input is a single magnitude spectrogram frame. The input spectrum
+  // is filtered into bands using a triangular mel filterbank and a
+  // discrete cosine transform (DCT) of the values is taken. Output is
+  // populated with the lowest dct_coefficient_count of these values.
+  void Compute(const std::vector<double>& spectrogram_frame,
+               std::vector<double>* output) const;
+
+  void set_upper_frequency_limit(double upper_frequency_limit) {
+    CHECK(!initialized_) << "Set frequency limits before calling Initialize.";
+    upper_frequency_limit_ = upper_frequency_limit;
+  }
+
+  void set_lower_frequency_limit(double lower_frequency_limit) {
+    CHECK(!initialized_) << "Set frequency limits before calling Initialize.";
+    lower_frequency_limit_ = lower_frequency_limit;
+  }
+
+  void set_filterbank_channel_count(int filterbank_channel_count) {
+    CHECK(!initialized_) << "Set channel count before calling Initialize.";
+    filterbank_channel_count_ = filterbank_channel_count;
+  }
+
+  void set_dct_coefficient_count(int dct_coefficient_count) {
+    CHECK(!initialized_) << "Set coefficient count before calling Initialize.";
+    dct_coefficient_count_ = dct_coefficient_count;
+  }
+
+ private:
+  MfccMelFilterbank mel_filterbank_;
+  MfccDct dct_;
+  bool initialized_;
+  double lower_frequency_limit_;
+  double upper_frequency_limit_;
+  int filterbank_channel_count_;
+  int dct_coefficient_count_;
+  TF_DISALLOW_COPY_AND_ASSIGN(Mfcc);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_H_
diff --git a/tensorflow/core/kernels/mfcc_dct.cc b/tensorflow/core/kernels/mfcc_dct.cc
new file mode 100644
index 0000000000..aa67a8d649
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_dct.cc
@@ -0,0 +1,82 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/mfcc_dct.h"
+
+#include <math.h>
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+
+MfccDct::MfccDct() : initialized_(false) {}
+
+bool MfccDct::Initialize(int input_length, int coefficient_count) {
+  coefficient_count_ = coefficient_count;
+  input_length_ = input_length;
+
+  if (coefficient_count_ < 1) {
+    LOG(ERROR) << "Coefficient count must be positive.";
+    return false;
+  }
+
+  if (input_length < 1) {
+    LOG(ERROR) << "Input length must be positive.";
+    return false;
+  }
+
+  if (coefficient_count_ > input_length_) {
+    LOG(ERROR) << "Coefficient count must be less than or equal to "
+               << "input length.";
+    return false;
+  }
+
+  cosines_.resize(coefficient_count_);
+  double fnorm = sqrt(2.0 / input_length_);
+  // Some platforms don't have M_PI, so define a local constant here.
+  const double pi = std::atan(1) * 4;
+  double arg = pi / input_length_;
+  for (int i = 0; i < coefficient_count_; ++i) {
+    cosines_[i].resize(input_length_);
+    for (int j = 0; j < input_length_; ++j) {
+      cosines_[i][j] = fnorm * cos(i * arg * (j + 0.5));
+    }
+  }
+  initialized_ = true;
+  return true;
+}
+
+void MfccDct::Compute(const std::vector<double> &input,
+                      std::vector<double> *output) const {
+  if (!initialized_) {
+    LOG(ERROR) << "DCT not initialized.";
+    return;
+  }
+
+  output->resize(coefficient_count_);
+  int length = input.size();
+  if (length > input_length_) {
+    length = input_length_;
+  }
+
+  for (int i = 0; i < coefficient_count_; ++i) {
+    double sum = 0.0;
+    for (int j = 0; j < length; ++j) {
+      sum += cosines_[i][j] * input[j];
+    }
+    (*output)[i] = sum;
+  }
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mfcc_dct.h b/tensorflow/core/kernels/mfcc_dct.h
new file mode 100644
index 0000000000..4fa3c01628
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_dct.h
@@ -0,0 +1,44 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Basic minimal DCT class for MFCC speech processing.
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_DCT_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_DCT_H_
+
+#include <vector>
+
+#include "tensorflow/core/framework/op_kernel.h"
+
+namespace tensorflow {
+
+class MfccDct {
+ public:
+  MfccDct();
+  bool Initialize(int input_length, int coefficient_count);
+  void Compute(const std::vector<double>& input,
+               std::vector<double>* output) const;
+
+ private:
+  bool initialized_;
+  int coefficient_count_;
+  int input_length_;
+  std::vector<std::vector<double> > cosines_;
+  TF_DISALLOW_COPY_AND_ASSIGN(MfccDct);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_DCT_H_
diff --git a/tensorflow/core/kernels/mfcc_dct_test.cc b/tensorflow/core/kernels/mfcc_dct_test.cc
new file mode 100644
index 0000000000..7526278fe9
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_dct_test.cc
@@ -0,0 +1,55 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/mfcc_dct.h"
+
+#include <vector>
+
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+TEST(MfccDctTest, AgreesWithMatlab) {
+  // This test verifies the DCT against MATLAB's dct function.
+  MfccDct dct;
+  std::vector<double> input = {1.0, 2.0, 3.0, 4.0, 5.0, 6.0};
+  const int kCoefficientCount = 6;
+  ASSERT_TRUE(dct.Initialize(input.size(), kCoefficientCount));
+  std::vector<double> output;
+  dct.Compute(input, &output);
+  // Note, the matlab dct function divides the first coefficient by
+  // sqrt(2), whereas we don't, so we multiply the first element of
+  // the matlab result by sqrt(2) to get the expected values below.
+  std::vector<double> expected = {12.1243556530, -4.1625617959, 0.0,
+                                  -0.4082482905, 0.0,           -0.0800788912};
+  ASSERT_EQ(output.size(), kCoefficientCount);
+  for (int i = 0; i < kCoefficientCount; ++i) {
+    EXPECT_NEAR(output[i], expected[i], 1e-10);
+  }
+}
+
+TEST(MfccDctTest, InitializeFailsOnInvalidInput) {
+  MfccDct dct1;
+  EXPECT_FALSE(dct1.Initialize(-50, 1));
+  MfccDct dct2;
+  EXPECT_FALSE(dct1.Initialize(10, -4));
+  MfccDct dct3;
+  EXPECT_FALSE(dct1.Initialize(-1, -1));
+  MfccDct dct4;
+  EXPECT_FALSE(dct1.Initialize(20, 21));
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mfcc_mel_filterbank.cc b/tensorflow/core/kernels/mfcc_mel_filterbank.cc
new file mode 100644
index 0000000000..d68c60280d
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_mel_filterbank.cc
@@ -0,0 +1,204 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// This code resamples the FFT bins, and smooths then with triangle-shaped
+// weights to create a mel-frequency filter bank. For filter i centered at f_i,
+// there is a triangular weighting of the FFT bins that extends from
+// filter f_i-1 (with a value of zero at the left edge of the triangle) to f_i
+// (where the filter value is 1) to f_i+1 (where the filter values returns to
+// zero).
+
+// Note: this code fails if you ask for too many channels.  The algorithm used
+// here assumes that each FFT bin contributes to at most two channels: the
+// right side of a triangle for channel i, and the left side of the triangle
+// for channel i+1.  If you ask for so many channels that some of the
+// resulting mel triangle filters are smaller than a single FFT bin, these
+// channels may end up with no contributing FFT bins.  The resulting mel
+// spectrum output will have some channels that are always zero.
+
+#include "tensorflow/core/kernels/mfcc_mel_filterbank.h"
+
+#include <math.h>
+
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+
+MfccMelFilterbank::MfccMelFilterbank() : initialized_(false) {}
+
+bool MfccMelFilterbank::Initialize(int input_length,
+                               double input_sample_rate,
+                               int output_channel_count,
+                               double lower_frequency_limit,
+                               double upper_frequency_limit) {
+  num_channels_ = output_channel_count;
+  sample_rate_  = input_sample_rate;
+  input_length_ = input_length;
+
+  if (num_channels_ < 1) {
+    LOG(ERROR) << "Number of filterbank channels must be positive.";
+    return false;
+  }
+
+  if (sample_rate_ <= 0) {
+    LOG(ERROR) << "Sample rate must be positive.";
+    return false;
+  }
+
+  if (input_length < 2) {
+    LOG(ERROR) << "Input length must greater than 1.";
+    return false;
+  }
+
+  if (lower_frequency_limit <= 0) {
+    LOG(ERROR) << "Lower frequency limit must be positive.";
+    return false;
+  }
+
+  if (upper_frequency_limit <= lower_frequency_limit) {
+    LOG(ERROR) << "Upper frequency limit must be greater than "
+               << "lower frequency limit.";
+    return false;
+  }
+
+  // An extra center frequency is computed at the top to get the upper
+  // limit on the high side of the final triangular filter.
+  center_frequencies_.resize(num_channels_ + 1);
+  const double mel_low = FreqToMel(lower_frequency_limit);
+  const double mel_hi = FreqToMel(upper_frequency_limit);
+  const double mel_span = mel_hi - mel_low;
+  const double mel_spacing = mel_span / static_cast<double>(num_channels_ + 1);
+  for (int i = 0; i < num_channels_ + 1; ++i) {
+    center_frequencies_[i] = mel_low + (mel_spacing * (i + 1));
+  }
+
+  // Always exclude DC; emulate HTK.
+  const double hz_per_sbin = 0.5 * sample_rate_ /
+      static_cast<double>(input_length_ - 1);
+  start_index_ = static_cast<int>(1.5 + (lower_frequency_limit /
+                                           hz_per_sbin));
+  end_index_ = static_cast<int>(upper_frequency_limit / hz_per_sbin);
+
+  // Maps the input spectrum bin indices to filter bank channels/indices. For
+  // each FFT bin, band_mapper tells us which channel this bin contributes to
+  // on the right side of the triangle.  Thus this bin also contributes to the
+  // left side of the next channel's triangle response.
+  band_mapper_.resize(input_length_);
+  int channel = 0;
+  for (int i = 0; i < input_length_; ++i) {
+    double melf = FreqToMel(i * hz_per_sbin);
+    if ((i < start_index_) || (i > end_index_)) {
+      band_mapper_[i] = -2;  // Indicate an unused Fourier coefficient.
+    } else {
+      while ((center_frequencies_[channel] < melf) &&
+             (channel < num_channels_)) {
+        ++channel;
+      }
+      band_mapper_[i] = channel - 1;  // Can be == -1
+    }
+  }
+
+  // Create the weighting functions to taper the band edges.  The contribution
+  // of any one FFT bin is based on its distance along the continuum between two
+  // mel-channel center frequencies.  This bin contributes weights_[i] to the
+  // current channel and 1-weights_[i] to the next channel.
+  weights_.resize(input_length_);
+  for (int i = 0; i < input_length_; ++i) {
+    channel = band_mapper_[i];
+    if ((i < start_index_) || (i > end_index_)) {
+      weights_[i] = 0.0;
+    } else {
+      if (channel >= 0) {
+        weights_[i] = (center_frequencies_[channel + 1] -
+                       FreqToMel(i * hz_per_sbin)) /
+            (center_frequencies_[channel + 1] - center_frequencies_[channel]);
+      } else {
+        weights_[i] = (center_frequencies_[0] - FreqToMel(i * hz_per_sbin)) /
+            (center_frequencies_[0] - mel_low);
+      }
+    }
+  }
+  // Check the sum of FFT bin weights for every mel band to identify
+  // situations where the mel bands are so narrow that they don't get
+  // significant weight on enough (or any) FFT bins -- i.e., too many
+  // mel bands have been requested for the given FFT size.
+  std::vector<int> bad_channels;
+  for (int c = 0; c < num_channels_; ++c) {
+    float band_weights_sum = 0.0;
+    for (int i = 0; i < input_length_; ++i) {
+      if (band_mapper_[i] == c - 1) {
+        band_weights_sum += (1.0 - weights_[i]);
+      } else if (band_mapper_[i] == c) {
+        band_weights_sum += weights_[i];
+      }
+    }
+    // The lowest mel channels have the fewest FFT bins and the lowest
+    // weights sum.  But given that the target gain at the center frequency
+    // is 1.0, if the total sum of weights is 0.5, we're in bad shape.
+    if (band_weights_sum < 0.5) {
+      bad_channels.push_back(c);
+    }
+  }
+  if (!bad_channels.empty()) {
+    LOG(ERROR) << "Missing " << bad_channels.size() << " bands " <<
+        " starting at " << bad_channels[0] <<
+        " in mel-frequency design. " <<
+        "Perhaps too many channels or " <<
+        "not enough frequency resolution in spectrum. (" <<
+        "input_length: " << input_length <<
+        " input_sample_rate: " << input_sample_rate <<
+        " output_channel_count: " << output_channel_count <<
+        " lower_frequency_limit: " << lower_frequency_limit <<
+        " upper_frequency_limit: " << upper_frequency_limit;
+  }
+  initialized_ = true;
+  return true;
+}
+
+// Compute the mel spectrum from the squared-magnitude FFT input by taking the
+// square root, then summing FFT magnitudes under triangular integration windows
+// whose widths increase with frequency.
+void MfccMelFilterbank::Compute(const std::vector<double> &input,
+                            std::vector<double> *output) const {
+  if (!initialized_) {
+    LOG(ERROR) << "Mel Filterbank not initialized.";
+    return;
+  }
+
+  if (input.size() <= end_index_) {
+    LOG(ERROR) << "Input too short to compute filterbank";
+    return;
+  }
+
+  // Ensure output is right length and reset all values.
+  output->assign(num_channels_, 0.0);
+
+  for (int i = start_index_; i <= end_index_; i++) {  // For each FFT bin
+    double spec_val = sqrt(input[i]);
+    double weighted = spec_val * weights_[i];
+    int channel = band_mapper_[i];
+    if (channel >= 0)
+      (*output)[channel] += weighted;  // Right side of triangle, downward slope
+    channel++;
+    if (channel < num_channels_)
+      (*output)[channel] += spec_val - weighted;  // Left side of triangle
+  }
+}
+
+double MfccMelFilterbank::FreqToMel(double freq) const {
+  return 1127.0 * log(1.0 + (freq / 700.0));
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mfcc_mel_filterbank.h b/tensorflow/core/kernels/mfcc_mel_filterbank.h
new file mode 100644
index 0000000000..33ea1bdb5b
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_mel_filterbank.h
@@ -0,0 +1,65 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Basic class for applying a mel-scale filterbank to an input.
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_MEL_FILTERBANK_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_MEL_FILTERBANK_H_
+
+#include <vector>
+#include "tensorflow/core/framework/op_kernel.h"
+
+namespace tensorflow {
+
+class MfccMelFilterbank {
+ public:
+  MfccMelFilterbank();
+  bool Initialize(int input_length,  // Number of unique FFT bins fftsize/2+1.
+                  double input_sample_rate,
+                  int output_channel_count,
+                  double lower_frequency_limit,
+                  double upper_frequency_limit);
+
+  // Takes a magnitude spectrogram slice as input, computes a
+  // traingular mel filterbank and places the result in output.
+  void Compute(const std::vector<double>& input,
+               std::vector<double>* output) const;
+
+ private:
+  double FreqToMel(double freq) const;
+  bool initialized_;
+  int num_channels_;
+  double sample_rate_;
+  int input_length_;
+  std::vector<double> center_frequencies_;  // In mel, for each mel channel.
+
+  // Each FFT bin b contributes to two triangular mel channels, with
+  // proportion weights_[b] going into mel channel band_mapper_[b], and
+  // proportion (1 - weights_[b]) going into channel band_mapper_[b] + 1.
+  // Thus, weights_ contains the weighting applied to each FFT bin for the
+  // upper-half of the triangular band.
+  std::vector<double> weights_;  // Right-side weight for this fft  bin.
+
+  // FFT bin i contributes to the upper side of mel channel band_mapper_[i]
+  std::vector<int> band_mapper_;
+  int start_index_;  // Lowest FFT bin used to calculate mel spectrum.
+  int end_index_;  // Highest FFT bin used to calculate mel spectrum.
+
+  TF_DISALLOW_COPY_AND_ASSIGN(MfccMelFilterbank);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_MFCC_MEL_FILTERBANK_H_
diff --git a/tensorflow/core/kernels/mfcc_mel_filterbank_test.cc b/tensorflow/core/kernels/mfcc_mel_filterbank_test.cc
new file mode 100644
index 0000000000..c3a7e77940
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_mel_filterbank_test.cc
@@ -0,0 +1,92 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/mfcc_mel_filterbank.h"
+
+#include <vector>
+
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+TEST(MfccMelFilterbankTest, AgreesWithPythonGoldenValues) {
+  // This test verifies the Mel filterbank against "golden values".
+  // Golden values are from an independent Python Mel implementation.
+  MfccMelFilterbank filterbank;
+
+  std::vector<double> input;
+  const int kSampleCount = 513;
+  for (int i = 0; i < kSampleCount; ++i) {
+    input.push_back(i + 1);
+  }
+  const int kChannelCount = 20;
+  filterbank.Initialize(input.size(),
+                        22050 /* sample rate */,
+                        kChannelCount /* channels */,
+                        20.0 /*  lower frequency limit */,
+                        4000.0 /* upper frequency limit */);
+
+  std::vector<double> output;
+  filterbank.Compute(input, &output);
+
+  std::vector<double> expected = {
+      7.38894574,   10.30330648, 13.72703292,  17.24158686,  21.35253118,
+      25.77781089,  31.30624108, 37.05877236,  43.9436536,   51.80306637,
+      60.79867148,  71.14363376, 82.90910141,  96.50069158,  112.08428368,
+      129.96721968, 150.4277597, 173.74997634, 200.86037462, 231.59802942};
+
+  ASSERT_EQ(output.size(), kChannelCount);
+
+  for (int i = 0; i < kChannelCount; ++i) {
+    EXPECT_NEAR(output[i], expected[i], 1e-04);
+  }
+}
+
+TEST(MfccMelFilterbankTest, IgnoresExistingContentOfOutputVector) {
+  // Test for bug where the output vector was not cleared before
+  // accumulating next frame's weighted spectral values.
+  MfccMelFilterbank filterbank;
+
+  const int kSampleCount = 513;
+  std::vector<double> input;
+  std::vector<double> output;
+
+  filterbank.Initialize(kSampleCount,
+                        22050 /* sample rate */,
+                        20 /* channels */,
+                        20.0 /*  lower frequency limit */,
+                        4000.0 /* upper frequency limit */);
+
+
+  // First call with nonzero input value, and an empty output vector,
+  // will resize the output and fill it with the correct, nonzero outputs.
+  input.assign(kSampleCount, 1.0);
+  filterbank.Compute(input, &output);
+  for (const double value : output) {
+    EXPECT_LE(0.0, value);
+  }
+
+  // Second call with zero input should also generate zero output.  However,
+  // the output vector now is already the correct size, but full of nonzero
+  // values.  Make sure these don't affect the output.
+  input.assign(kSampleCount, 0.0);
+  filterbank.Compute(input, &output);
+  for (const double value : output) {
+    EXPECT_EQ(0.0, value);
+  }
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mfcc_op.cc b/tensorflow/core/kernels/mfcc_op.cc
new file mode 100644
index 0000000000..02643857c1
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_op.cc
@@ -0,0 +1,111 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/audio_ops.cc
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/mfcc.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+// Create a speech fingerpring from spectrogram data.
+class MfccOp : public OpKernel {
+ public:
+  explicit MfccOp(OpKernelConstruction* context) : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("upper_frequency_limit",
+                                             &upper_frequency_limit_));
+    OP_REQUIRES_OK(context, context->GetAttr("lower_frequency_limit",
+                                             &lower_frequency_limit_));
+    OP_REQUIRES_OK(context, context->GetAttr("filterbank_channel_count",
+                                             &filterbank_channel_count_));
+    OP_REQUIRES_OK(context, context->GetAttr("dct_coefficient_count",
+                                             &dct_coefficient_count_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& spectrogram = context->input(0);
+    OP_REQUIRES(context, spectrogram.dims() == 3,
+                errors::InvalidArgument("spectrogram must be 3-dimensional",
+                                        spectrogram.shape().DebugString()));
+    const Tensor& sample_rate_tensor = context->input(1);
+    OP_REQUIRES(context, TensorShapeUtils::IsScalar(sample_rate_tensor.shape()),
+                errors::InvalidArgument(
+                    "Input sample_rate should be a scalar tensor, got ",
+                    sample_rate_tensor.shape().DebugString(), " instead."));
+    const int32 sample_rate = sample_rate_tensor.scalar<int32>()();
+
+    const int spectrogram_channels = spectrogram.dim_size(2);
+    const int spectrogram_samples = spectrogram.dim_size(1);
+    const int audio_channels = spectrogram.dim_size(0);
+
+    Mfcc mfcc;
+    mfcc.set_upper_frequency_limit(upper_frequency_limit_);
+    mfcc.set_lower_frequency_limit(lower_frequency_limit_);
+    mfcc.set_filterbank_channel_count(filterbank_channel_count_);
+    mfcc.set_dct_coefficient_count(dct_coefficient_count_);
+    OP_REQUIRES(context, mfcc.Initialize(spectrogram_channels, sample_rate),
+                errors::InvalidArgument(
+                    "Mfcc initialization failed for channel count ",
+                    spectrogram_channels, " and sample rate ", sample_rate));
+
+    Tensor* output_tensor = nullptr;
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(
+                       0,
+                       TensorShape({audio_channels, spectrogram_samples,
+                                    dct_coefficient_count_}),
+                       &output_tensor));
+
+    const float* spectrogram_flat = spectrogram.flat<float>().data();
+    float* output_flat = output_tensor->flat<float>().data();
+
+    for (int audio_channel = 0; audio_channel < audio_channels;
+         ++audio_channel) {
+      for (int spectrogram_sample = 0; spectrogram_sample < spectrogram_samples;
+           ++spectrogram_sample) {
+        const float* sample_data =
+            spectrogram_flat +
+            (audio_channel * spectrogram_samples * spectrogram_channels) +
+            (spectrogram_sample * spectrogram_channels);
+        std::vector<double> mfcc_input(sample_data,
+                                       sample_data + spectrogram_channels);
+        std::vector<double> mfcc_output;
+        mfcc.Compute(mfcc_input, &mfcc_output);
+        DCHECK_EQ(dct_coefficient_count_, mfcc_output.size());
+        float* output_data =
+            output_flat +
+            (audio_channel * spectrogram_samples * dct_coefficient_count_) +
+            (spectrogram_sample * dct_coefficient_count_);
+        for (int i = 0; i < dct_coefficient_count_; ++i) {
+          output_data[i] = mfcc_output[i];
+        }
+      }
+    }
+  }
+
+ private:
+  float upper_frequency_limit_;
+  float lower_frequency_limit_;
+  int32 filterbank_channel_count_;
+  int32 dct_coefficient_count_;
+};
+REGISTER_KERNEL_BUILDER(Name("Mfcc").Device(DEVICE_CPU), MfccOp);
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mfcc_op_test.cc b/tensorflow/core/kernels/mfcc_op_test.cc
new file mode 100644
index 0000000000..d16171d526
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_op_test.cc
@@ -0,0 +1,77 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#define EIGEN_USE_THREADS
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "tensorflow/cc/client/client_session.h"
+#include "tensorflow/cc/ops/audio_ops.h"
+#include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/math_ops.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/framework/types.pb.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+
+using namespace ops;  // NOLINT(build/namespaces)
+
+TEST(MfccOpTest, SimpleTest) {
+  Scope root = Scope::NewRootScope();
+
+  Tensor spectrogram_tensor(DT_FLOAT, TensorShape({1, 1, 513}));
+  test::FillIota<float>(&spectrogram_tensor, 1.0f);
+
+  Output spectrogram_const_op = Const(root.WithOpName("spectrogram_const_op"),
+                                      Input::Initializer(spectrogram_tensor));
+
+  Output sample_rate_const_op =
+      Const(root.WithOpName("sample_rate_const_op"), 22050);
+
+  Mfcc mfcc_op = Mfcc(root.WithOpName("mfcc_op"), spectrogram_const_op,
+                      sample_rate_const_op);
+
+  TF_ASSERT_OK(root.status());
+
+  ClientSession session(root);
+  std::vector<Tensor> outputs;
+
+  TF_EXPECT_OK(
+      session.Run(ClientSession::FeedType(), {mfcc_op.output}, &outputs));
+
+  const Tensor& mfcc_tensor = outputs[0];
+
+  EXPECT_EQ(3, mfcc_tensor.dims());
+  EXPECT_EQ(13, mfcc_tensor.dim_size(2));
+  EXPECT_EQ(1, mfcc_tensor.dim_size(1));
+  EXPECT_EQ(1, mfcc_tensor.dim_size(0));
+
+  test::ExpectTensorNear<float>(
+      mfcc_tensor,
+      test::AsTensor<float>(
+          {29.13970072, -6.41568601, -0.61903012, -0.96778652, -0.26819878,
+           -0.40907028, -0.15614748, -0.23203119, -0.10481487, -0.1543029,
+           -0.0769791, -0.10806114, -0.06047613},
+          TensorShape({1, 1, 13})),
+      1e-3);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mfcc_test.cc b/tensorflow/core/kernels/mfcc_test.cc
new file mode 100644
index 0000000000..9ab726e5b9
--- /dev/null
+++ b/tensorflow/core/kernels/mfcc_test.cc
@@ -0,0 +1,92 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/mfcc.h"
+
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/platform/types.h"
+
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+
+TEST(MfccTest, AgreesWithPythonGoldenValues) {
+  Mfcc mfcc;
+  std::vector<double> input;
+  const int kSampleCount = 513;
+  for (int i = 0; i < kSampleCount; ++i) {
+    input.push_back(i + 1);
+  }
+
+  ASSERT_TRUE(mfcc.Initialize(input.size(), 22050 /*sample rate*/));
+
+  std::vector<double> output;
+  mfcc.Compute(input, &output);
+
+  std::vector<double> expected = {29.13970072, -6.41568601, -0.61903012,
+                             -0.96778652, -0.26819878, -0.40907028,
+                             -0.15614748, -0.23203119, -0.10481487,
+                             -0.1543029,  -0.0769791,  -0.10806114,
+                             -0.06047613};
+
+  ASSERT_EQ(expected.size(), output.size());
+  for (int i = 0; i < output.size(); ++i) {
+    EXPECT_NEAR(output[i], expected[i], 1e-04);
+  }
+}
+
+TEST(MfccTest, AvoidsNansWithZeroInput) {
+  Mfcc mfcc;
+  std::vector<double> input;
+  const int kSampleCount = 513;
+  for (int i = 0; i < kSampleCount; ++i) {
+    input.push_back(0.0);
+  }
+
+  ASSERT_TRUE(mfcc.Initialize(input.size(), 22050 /*sample rate*/));
+
+  std::vector<double> output;
+  mfcc.Compute(input, &output);
+
+  int expected_size = 13;
+  ASSERT_EQ(expected_size, output.size());
+  for (const double value : output) {
+    EXPECT_FALSE(isnan(value));
+  }
+}
+
+TEST(MfccTest, SimpleInputSaneResult) {
+  Mfcc mfcc;
+  mfcc.set_lower_frequency_limit(125.0);
+  mfcc.set_upper_frequency_limit(3800.0);
+  mfcc.set_filterbank_channel_count(40);
+  mfcc.set_dct_coefficient_count(40);
+  const int kSpectrogramSize = 129;
+  std::vector<double> input(kSpectrogramSize, 0.0);
+
+  // Simulate a low-frequency sinusoid from the spectrogram.
+  const int kHotBin = 10;
+  input[kHotBin] = 1.0;
+  ASSERT_TRUE(mfcc.Initialize(input.size(), 8000));
+
+  std::vector<double> output;
+  mfcc.Compute(input, &output);
+
+  // For a single low-frequency input, output beyond c_0 should look like
+  // a slow cosine, with a slight delay.  Largest value will be c_1.
+  EXPECT_EQ(output.begin() + 1, std::max_element(output.begin(), output.end()));
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/ops/audio_ops.cc b/tensorflow/core/ops/audio_ops.cc
index 2f55e45e37..02b13a455c 100644
--- a/tensorflow/core/ops/audio_ops.cc
+++ b/tensorflow/core/ops/audio_ops.cc
@@ -100,6 +100,26 @@ Status SpectrogramShapeFn(InferenceContext* c) {
   return Status::OK();
 }
 
+Status MfccShapeFn(InferenceContext* c) {
+  ShapeHandle spectrogram;
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 3, &spectrogram));
+  ShapeHandle unused;
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 1, &unused));
+
+  int32 dct_coefficient_count;
+  TF_RETURN_IF_ERROR(
+      c->GetAttr("dct_coefficient_count", &dct_coefficient_count));
+
+  DimensionHandle spectrogram_channels = c->Dim(spectrogram, 0);
+  DimensionHandle spectrogram_length = c->Dim(spectrogram, 1);
+
+  DimensionHandle output_channels = c->MakeDim(dct_coefficient_count);
+
+  c->set_output(0, c->MakeShape({spectrogram_channels, spectrogram_length,
+                                 output_channels}));
+  return Status::OK();
+}
+
 }  // namespace
 
 REGISTER_OP("DecodeWav")
@@ -200,4 +220,34 @@ magnitude_squared: Whether to return the squared magnitude or just the
 spectrogram: 3D representation of the audio frequencies as an image.
 )doc");
 
+REGISTER_OP("Mfcc")
+    .Input("spectrogram: float")
+    .Input("sample_rate: int32")
+    .Attr("upper_frequency_limit: float = 4000")
+    .Attr("lower_frequency_limit: float = 20")
+    .Attr("filterbank_channel_count: int = 40")
+    .Attr("dct_coefficient_count: int = 13")
+    .Output("output: float")
+    .SetShapeFn(MfccShapeFn)
+    .Doc(R"doc(
+Transforms a spectrogram into a form that's useful for speech recognition.
+
+Mel Frequency Cepstral Coefficients are a way of representing audio data that's
+been effective as an input feature for machine learning. They are created by
+taking the spectrum of a spectrogram (a 'cepstrum'), and discarding some of the
+higher frequencies that are less significant to the human ear. They have a long
+history in the speech recognition world, and https://en.wikipedia.org/wiki/Mel-frequency_cepstrum
+is a good resource to learn more.
+
+spectrogram: Typically produced by the Spectrogram op, with magnitude_squared
+  set to true.
+sample_rate: How many samples per second the source audio used.
+upper_frequency_limit: The highest frequency to use when calculating the
+  ceptstrum.
+lower_frequency_limit: The lowest frequency to use when calculating the
+  ceptstrum.
+filterbank_channel_count: Resolution of the Mel bank used internally.
+dct_coefficient_count: How many output channels to produce per time slice.
+)doc");
+
 }  // namespace tensorflow
-- 
GitLab


From 19922ea85779961f93ca1d2e1bfdb71a70044a54 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 10:12:29 -0800
Subject: [PATCH 0616/1563] [TF:XLA] This flag is unnecessary, as we can get
 the path to ptxas from tensorflow::CudaRoot(). Change: 153847918

---
 tensorflow/compiler/xla/legacy_flags/gpu_compiler_flags.cc | 1 -
 tensorflow/compiler/xla/service/gpu/gpu_compiler.cc        | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tensorflow/compiler/xla/legacy_flags/gpu_compiler_flags.cc b/tensorflow/compiler/xla/legacy_flags/gpu_compiler_flags.cc
index e79d363509..7d3ad60aea 100644
--- a/tensorflow/compiler/xla/legacy_flags/gpu_compiler_flags.cc
+++ b/tensorflow/compiler/xla/legacy_flags/gpu_compiler_flags.cc
@@ -38,7 +38,6 @@ static void AllocateFlags() {
   flags = new GpuCompilerFlags;
   flags->xla_gpu_embed_ir = false;
   flags->xla_cuda_data_dir = "./cuda_sdk_lib";
-  flags->xla_ptxas_path = "/usr/local/cuda/bin/ptxas";
   flag_list = new std::vector<tensorflow::Flag>({
       tensorflow::Flag(
           "xla_gpu_embed_ir", &flags->xla_gpu_embed_ir,
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index 161d0033a3..43960cd3a8 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -187,8 +187,8 @@ tensorflow::Status PrepareHloModuleForIrEmitting(
 
 // Invokes the ptxas tool on the given PTX string, and dumps its output.
 void DumpPtxasInfo(const string& ptx) {
-  legacy_flags::GpuCompilerFlags* flags = legacy_flags::GetGpuCompilerFlags();
-  const string ptxas_path = flags->xla_ptxas_path;
+  const string ptxas_path =
+      tensorflow::io::JoinPath(tensorflow::CudaRoot(), "bin/ptxas");
   // Do not log PTX stats if ptxas is not found at the given path.
   if (!tensorflow::Env::Default()->FileExists(ptxas_path).ok()) {
     LOG(WARNING)
-- 
GitLab


From d524194bad2cbe0dbd88abec13ef43015c146b23 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 10:32:58 -0800
Subject: [PATCH 0617/1563] Update ops-related pbtxt files. Change: 153850549

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 43 ++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 51 +++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 50e4971314..1781f778b4 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -11316,6 +11316,49 @@ op {
     }
   }
 }
+op {
+  name: "Mfcc"
+  input_arg {
+    name: "spectrogram"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "sample_rate"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "upper_frequency_limit"
+    type: "float"
+    default_value {
+      f: 4000
+    }
+  }
+  attr {
+    name: "lower_frequency_limit"
+    type: "float"
+    default_value {
+      f: 20
+    }
+  }
+  attr {
+    name: "filterbank_channel_count"
+    type: "int"
+    default_value {
+      i: 40
+    }
+  }
+  attr {
+    name: "dct_coefficient_count"
+    type: "int"
+    default_value {
+      i: 13
+    }
+  }
+}
 op {
   name: "Min"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 9725b6538d..6d28cb7e84 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -11539,6 +11539,57 @@ op {
   summary: "V2 format specific: merges the metadata files of sharded checkpoints.  The"
   description: "result is one logical checkpoint, with one physical metadata file and renamed\ndata files.\n\nIntended for \"grouping\" multiple checkpoints in a sharded checkpoint setup.\n\nIf delete_old_dirs is true, attempts to delete recursively the dirname of each\npath in the input checkpoint_prefixes.  This is useful when those paths are non\nuser-facing temporary locations."
 }
+op {
+  name: "Mfcc"
+  input_arg {
+    name: "spectrogram"
+    description: "Typically produced by the Spectrogram op, with magnitude_squared\nset to true."
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "sample_rate"
+    description: "How many samples per second the source audio used."
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "upper_frequency_limit"
+    type: "float"
+    default_value {
+      f: 4000
+    }
+    description: "The highest frequency to use when calculating the\nceptstrum."
+  }
+  attr {
+    name: "lower_frequency_limit"
+    type: "float"
+    default_value {
+      f: 20
+    }
+    description: "The lowest frequency to use when calculating the\nceptstrum."
+  }
+  attr {
+    name: "filterbank_channel_count"
+    type: "int"
+    default_value {
+      i: 40
+    }
+    description: "Resolution of the Mel bank used internally."
+  }
+  attr {
+    name: "dct_coefficient_count"
+    type: "int"
+    default_value {
+      i: 13
+    }
+    description: "How many output channels to produce per time slice."
+  }
+  summary: "Transforms a spectrogram into a form that\'s useful for speech recognition."
+  description: "Mel Frequency Cepstral Coefficients are a way of representing audio data that\'s\nbeen effective as an input feature for machine learning. They are created by\ntaking the spectrum of a spectrogram (a \'cepstrum\'), and discarding some of the\nhigher frequencies that are less significant to the human ear. They have a long\nhistory in the speech recognition world, and https://en.wikipedia.org/wiki/Mel-frequency_cepstrum\nis a good resource to learn more."
+}
 op {
   name: "Min"
   input_arg {
-- 
GitLab


From c3bf39b7a6c3cc41f209ac863c764498b503d4f5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 10:38:34 -0800
Subject: [PATCH 0618/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 153851292

---
 tensorflow/go/op/wrappers.go | 77 ++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index e832690e18..b21e8fd448 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -2456,6 +2456,83 @@ func ParallelConcat(scope *Scope, values []tf.Output, shape tf.Shape) (output tf
 	return op.Output(0)
 }
 
+// MfccAttr is an optional argument to Mfcc.
+type MfccAttr func(optionalAttr)
+
+// MfccUpperFrequencyLimit sets the optional upper_frequency_limit attribute to value.
+//
+// value: The highest frequency to use when calculating the
+// ceptstrum.
+// If not specified, defaults to 4000
+func MfccUpperFrequencyLimit(value float32) MfccAttr {
+	return func(m optionalAttr) {
+		m["upper_frequency_limit"] = value
+	}
+}
+
+// MfccLowerFrequencyLimit sets the optional lower_frequency_limit attribute to value.
+//
+// value: The lowest frequency to use when calculating the
+// ceptstrum.
+// If not specified, defaults to 20
+func MfccLowerFrequencyLimit(value float32) MfccAttr {
+	return func(m optionalAttr) {
+		m["lower_frequency_limit"] = value
+	}
+}
+
+// MfccFilterbankChannelCount sets the optional filterbank_channel_count attribute to value.
+//
+// value: Resolution of the Mel bank used internally.
+// If not specified, defaults to 40
+func MfccFilterbankChannelCount(value int64) MfccAttr {
+	return func(m optionalAttr) {
+		m["filterbank_channel_count"] = value
+	}
+}
+
+// MfccDctCoefficientCount sets the optional dct_coefficient_count attribute to value.
+//
+// value: How many output channels to produce per time slice.
+// If not specified, defaults to 13
+func MfccDctCoefficientCount(value int64) MfccAttr {
+	return func(m optionalAttr) {
+		m["dct_coefficient_count"] = value
+	}
+}
+
+// Transforms a spectrogram into a form that's useful for speech recognition.
+//
+// Mel Frequency Cepstral Coefficients are a way of representing audio data that's
+// been effective as an input feature for machine learning. They are created by
+// taking the spectrum of a spectrogram (a 'cepstrum'), and discarding some of the
+// higher frequencies that are less significant to the human ear. They have a long
+// history in the speech recognition world, and https://en.wikipedia.org/wiki/Mel-frequency_cepstrum
+// is a good resource to learn more.
+//
+// Arguments:
+//	spectrogram: Typically produced by the Spectrogram op, with magnitude_squared
+// set to true.
+//	sample_rate: How many samples per second the source audio used.
+func Mfcc(scope *Scope, spectrogram tf.Output, sample_rate tf.Output, optional ...MfccAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "Mfcc",
+		Input: []tf.Input{
+			spectrogram, sample_rate,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // UniqueAttr is an optional argument to Unique.
 type UniqueAttr func(optionalAttr)
 
-- 
GitLab


From 8e5041918f2e709ded94e63fb1779d6bb363becb Mon Sep 17 00:00:00 2001
From: Charles Nicholson <nicholsonc@google.com>
Date: Fri, 21 Apr 2017 10:59:14 -0800
Subject: [PATCH 0619/1563] Introduce TFDecorator, a base class for Python
 TensorFlow decorators. Provides basic introspection and "unwrap" services,
 allowing tooling code to fully 'understand' the wrapped object. Change:
 153854044

---
 .../distributions/python/ops/distribution.py  |   6 +-
 .../python/ops/kullback_leibler.py            |   7 +-
 .../contrib/framework/python/ops/arg_scope.py |  11 +-
 .../keras/python/keras/backend_test.py        |   5 +-
 .../keras/python/keras/engine/topology.py     |   8 +-
 .../contrib/keras/python/keras/layers/core.py |   4 +-
 .../keras/python/keras/layers/wrappers.py     |   4 +-
 .../keras/python/keras/testing_utils.py       |   5 +-
 .../keras/python/keras/utils/generic_utils.py |   6 +-
 .../python/keras/wrappers/scikit_learn.py     |   6 +-
 .../labeled_tensor/python/ops/_typecheck.py   |   4 +-
 .../learn/python/learn/dataframe/transform.py |   5 +-
 .../python/learn/estimators/estimator.py      |   8 +-
 .../learn/estimators/estimator_test_utils.py  |   4 +-
 .../learn/python/learn/estimators/head.py     |   6 +-
 .../learn/python/learn/export_strategy.py     |  10 +-
 .../contrib/learn/python/learn/metric_spec.py |   6 +-
 .../contrib/learn/python/learn/monitors.py    |   4 +-
 tensorflow/contrib/specs/python/specs.py      |  16 +-
 .../docs_src/api_guides/python/index.md       |   1 +
 tensorflow/python/BUILD                       |  33 ++
 tensorflow/python/__init__.py                 |   4 +-
 tensorflow/python/debug/BUILD                 |   1 +
 .../python/debug/cli/analyzer_cli_test.py     |   6 +-
 .../python/debug/lib/source_utils_test.py     |  90 ++---
 tensorflow/python/estimator/estimator.py      |   9 +-
 tensorflow/python/framework/contrib_test.py   |   9 +-
 tensorflow/python/framework/function.py       |  12 +-
 tensorflow/python/framework/op_def_library.py |   5 +-
 tensorflow/python/framework/ops.py            |  24 +-
 tensorflow/python/layers/base.py              |   1 -
 tensorflow/python/ops/variable_scope.py       |   8 +-
 tensorflow/python/platform/benchmark.py       |   5 +-
 tensorflow/python/platform/googletest.py      |  21 +-
 tensorflow/python/platform/resource_loader.py |   8 +-
 tensorflow/python/util/all_util.py            |   6 +-
 tensorflow/python/util/deprecation.py         |  34 +-
 tensorflow/python/util/tf_contextlib.py       |  36 ++
 tensorflow/python/util/tf_contextlib_test.py  |  92 +++++
 tensorflow/python/util/tf_decorator.py        | 167 +++++++++
 tensorflow/python/util/tf_decorator_test.py   | 243 +++++++++++++
 tensorflow/python/util/tf_inspect.py          | 141 ++++++++
 tensorflow/python/util/tf_inspect_test.py     | 327 ++++++++++++++++++
 .../tools/api/golden/tensorflow.-graph.pbtxt  |  10 +-
 .../tensorflow.gfile.-fast-g-file.pbtxt       |   2 +-
 .../api/golden/tensorflow.gfile.-g-file.pbtxt |   2 +-
 .../api/golden/tensorflow.gfile.-open.pbtxt   |   2 +-
 tensorflow/tools/api/golden/tensorflow.pbtxt  |  18 +-
 .../api/lib/python_object_to_proto_visitor.py |  18 +-
 tensorflow/tools/common/public_api.py         |   5 +-
 tensorflow/tools/common/traverse.py           |  13 +-
 .../tools/docs/doc_generator_visitor.py       |  19 +-
 tensorflow/tools/docs/generate.py             |   5 +-
 tensorflow/tools/docs/generate_1_0.py         |  20 +-
 tensorflow/tools/docs/generate_lib.py         |  63 ++--
 tensorflow/tools/docs/parser.py               |  72 ++--
 tensorflow/tools/docs/parser_test.py          |  32 +-
 57 files changed, 1354 insertions(+), 335 deletions(-)
 create mode 100644 tensorflow/python/util/tf_contextlib.py
 create mode 100644 tensorflow/python/util/tf_contextlib_test.py
 create mode 100644 tensorflow/python/util/tf_decorator.py
 create mode 100644 tensorflow/python/util/tf_decorator_test.py
 create mode 100644 tensorflow/python/util/tf_inspect.py
 create mode 100644 tensorflow/python/util/tf_inspect_test.py

diff --git a/tensorflow/contrib/distributions/python/ops/distribution.py b/tensorflow/contrib/distributions/python/ops/distribution.py
index 95d6c23388..0b7ffbd792 100644
--- a/tensorflow/contrib/distributions/python/ops/distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/distribution.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import abc
 import contextlib
-import inspect
 import types
 
 import numpy as np
@@ -33,6 +32,7 @@ from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.util import tf_inspect
 
 
 _DISTRIBUTION_PUBLIC_METHOD_WRAPPERS = [
@@ -154,12 +154,12 @@ class _DistributionMeta(abc.ABCMeta):
       if class_special_attr_value is None:
         # No _special method available, no need to update the docstring.
         continue
-      class_special_attr_docstring = inspect.getdoc(class_special_attr_value)
+      class_special_attr_docstring = tf_inspect.getdoc(class_special_attr_value)
       if not class_special_attr_docstring:
         # No docstring to append.
         continue
       class_attr_value = _copy_fn(base_attr_value)
-      class_attr_docstring = inspect.getdoc(base_attr_value)
+      class_attr_docstring = tf_inspect.getdoc(base_attr_value)
       if class_attr_docstring is None:
         raise ValueError(
             "Expected base class fn to contain a docstring: %s.%s"
diff --git a/tensorflow/contrib/distributions/python/ops/kullback_leibler.py b/tensorflow/contrib/distributions/python/ops/kullback_leibler.py
index bb94a87680..335fe7a5e2 100644
--- a/tensorflow/contrib/distributions/python/ops/kullback_leibler.py
+++ b/tensorflow/contrib/distributions/python/ops/kullback_leibler.py
@@ -18,12 +18,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
-
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.util import tf_inspect
 
 
 _DIVERGENCES = {}
@@ -31,8 +30,8 @@ _DIVERGENCES = {}
 
 def _registered_kl(type_a, type_b):
   """Get the KL function registered for classes a and b."""
-  hierarchy_a = inspect.getmro(type_a)
-  hierarchy_b = inspect.getmro(type_b)
+  hierarchy_a = tf_inspect.getmro(type_a)
+  hierarchy_b = tf_inspect.getmro(type_b)
   dist_to_children = None
   kl_fn = None
   for mro_to_a, parent_a in enumerate(hierarchy_a):
diff --git a/tensorflow/contrib/framework/python/ops/arg_scope.py b/tensorflow/contrib/framework/python/ops/arg_scope.py
index ad84cd681a..9c194ec202 100644
--- a/tensorflow/contrib/framework/python/ops/arg_scope.py
+++ b/tensorflow/contrib/framework/python/ops/arg_scope.py
@@ -61,8 +61,9 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-import contextlib
-import functools
+
+from tensorflow.python.util import tf_contextlib
+from tensorflow.python.util import tf_decorator
 
 __all__ = ['arg_scope',
            'add_arg_scope',
@@ -106,7 +107,7 @@ def _add_op(op):
     _DECORATED_OPS[key_op] = _kwarg_names(op)
 
 
-@contextlib.contextmanager
+@tf_contextlib.contextmanager
 def arg_scope(list_ops_or_scope, **kwargs):
   """Stores the default arguments for the given set of list_ops.
 
@@ -170,7 +171,6 @@ def add_arg_scope(func):
   Returns:
     A tuple with the decorated function func_with_args().
   """
-  @functools.wraps(func)
   def func_with_args(*args, **kwargs):
     current_scope = _current_arg_scope()
     current_args = kwargs
@@ -181,8 +181,7 @@ def add_arg_scope(func):
     return func(*args, **current_args)
   _add_op(func)
   setattr(func_with_args, '_key_op', _key_op(func))
-  setattr(func_with_args, '__doc__', func.__doc__)
-  return func_with_args
+  return tf_decorator.make_decorator(func, func_with_args)
 
 
 def has_arg_scope(func):
diff --git a/tensorflow/contrib/keras/python/keras/backend_test.py b/tensorflow/contrib/keras/python/keras/backend_test.py
index fd9db1f327..2da5aee58e 100644
--- a/tensorflow/contrib/keras/python/keras/backend_test.py
+++ b/tensorflow/contrib/keras/python/keras/backend_test.py
@@ -18,12 +18,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
-
 import numpy as np
 
 from tensorflow.contrib.keras.python import keras
 from tensorflow.python.platform import test
+from tensorflow.python.util import tf_inspect
 
 
 def compare_single_input_op_to_numpy(keras_op,
@@ -207,7 +206,7 @@ class BackendLinearAlgebraTest(test.TestCase):
         compare_single_input_op_to_numpy(keras_op, np_op, input_shape=(4, 7, 5),
                                          keras_kwargs={'axis': -1},
                                          np_kwargs={'axis': -1})
-        if 'keepdims' in inspect.getargspec(keras_op).args:
+        if 'keepdims' in tf_inspect.getargspec(keras_op).args:
           compare_single_input_op_to_numpy(keras_op, np_op,
                                            input_shape=(4, 7, 5),
                                            keras_kwargs={'axis': 1,
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 0d1812aaa2..7848e5982d 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -20,7 +20,6 @@ from __future__ import division
 from __future__ import print_function
 
 import copy
-import inspect
 import json
 import os
 import re
@@ -35,6 +34,7 @@ from tensorflow.contrib.keras.python.keras.utils import conv_utils
 from tensorflow.contrib.keras.python.keras.utils.io_utils import ask_to_proceed_with_overwrite
 from tensorflow.contrib.keras.python.keras.utils.layer_utils import print_summary as print_layer_summary
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.util import tf_inspect
 
 
 # pylint: disable=g-import-not-at-top
@@ -584,7 +584,7 @@ class Layer(object):
       user_kwargs = copy.copy(kwargs)
       if not _is_all_none(previous_mask):
         # The previous layer generated a mask.
-        if 'mask' in inspect.getargspec(self.call).args:
+        if 'mask' in tf_inspect.getargspec(self.call).args:
           if 'mask' not in kwargs:
             # If mask is explicitly passed to __call__,
             # we should override the default mask.
@@ -2166,7 +2166,7 @@ class Container(Layer):
               kwargs = {}
             if len(computed_data) == 1:
               computed_tensor, computed_mask = computed_data[0]
-              if 'mask' in inspect.getargspec(layer.call).args:
+              if 'mask' in tf_inspect.getargspec(layer.call).args:
                 if 'mask' not in kwargs:
                   kwargs['mask'] = computed_mask
               output_tensors = _to_list(layer.call(computed_tensor, **kwargs))
@@ -2177,7 +2177,7 @@ class Container(Layer):
             else:
               computed_tensors = [x[0] for x in computed_data]
               computed_masks = [x[1] for x in computed_data]
-              if 'mask' in inspect.getargspec(layer.call).args:
+              if 'mask' in tf_inspect.getargspec(layer.call).args:
                 if 'mask' not in kwargs:
                   kwargs['mask'] = computed_masks
               output_tensors = _to_list(layer.call(computed_tensors, **kwargs))
diff --git a/tensorflow/contrib/keras/python/keras/layers/core.py b/tensorflow/contrib/keras/python/keras/layers/core.py
index 8dd55aaa2e..32ada176a4 100644
--- a/tensorflow/contrib/keras/python/keras/layers/core.py
+++ b/tensorflow/contrib/keras/python/keras/layers/core.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 import copy
-import inspect
 import types as python_types
 
 import numpy as np
@@ -35,6 +34,7 @@ from tensorflow.contrib.keras.python.keras.utils.generic_utils import deserializ
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import func_dump
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import func_load
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.util import tf_inspect
 
 
 class Masking(Layer):
@@ -595,7 +595,7 @@ class Lambda(Layer):
 
   def call(self, inputs, mask=None):
     arguments = self.arguments
-    arg_spec = inspect.getargspec(self.function)
+    arg_spec = tf_inspect.getargspec(self.function)
     if 'mask' in arg_spec.args:
       arguments['mask'] = mask
     return self.function(inputs, **arguments)
diff --git a/tensorflow/contrib/keras/python/keras/layers/wrappers.py b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
index a322696514..ce6458fd0c 100644
--- a/tensorflow/contrib/keras/python/keras/layers/wrappers.py
+++ b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
@@ -20,12 +20,12 @@ from __future__ import division
 from __future__ import print_function
 
 import copy
-import inspect
 
 from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras.engine import InputSpec
 from tensorflow.contrib.keras.python.keras.engine import Layer
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.util import tf_inspect
 
 
 class Wrapper(Layer):
@@ -284,7 +284,7 @@ class Bidirectional(Wrapper):
 
   def call(self, inputs, training=None, mask=None):
     kwargs = {}
-    func_args = inspect.getargspec(self.layer.call).args
+    func_args = tf_inspect.getargspec(self.layer.call).args
     if 'training' in func_args:
       kwargs['training'] = training
     if 'mask' in func_args:
diff --git a/tensorflow/contrib/keras/python/keras/testing_utils.py b/tensorflow/contrib/keras/python/keras/testing_utils.py
index baba5447d9..bf6f661adf 100644
--- a/tensorflow/contrib/keras/python/keras/testing_utils.py
+++ b/tensorflow/contrib/keras/python/keras/testing_utils.py
@@ -18,11 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
-
 import numpy as np
 
 from tensorflow.contrib.keras.python import keras
+from tensorflow.python.util import tf_inspect
 
 
 def get_test_data(train_samples,
@@ -98,7 +97,7 @@ def layer_test(layer_cls, kwargs=None, input_shape=None, input_dtype=None,
   layer.set_weights(weights)
 
   # test and instantiation from weights
-  if 'weights' in inspect.getargspec(layer_cls.__init__):
+  if 'weights' in tf_inspect.getargspec(layer_cls.__init__):
     kwargs['weights'] = weights
     layer = layer_cls(**kwargs)
 
diff --git a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
index 4c95c314b1..27cc23f232 100644
--- a/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
+++ b/tensorflow/contrib/keras/python/keras/utils/generic_utils.py
@@ -17,7 +17,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import marshal
 import sys
 import time
@@ -26,6 +25,8 @@ import types as python_types
 import numpy as np
 import six
 
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
 
 _GLOBAL_CUSTOM_OBJECTS = {}
 
@@ -116,6 +117,7 @@ def get_custom_objects():
 
 
 def serialize_keras_object(instance):
+  _, instance = tf_decorator.unwrap(instance)
   if instance is None:
     return None
   if hasattr(instance, 'get_config'):
@@ -149,7 +151,7 @@ def deserialize_keras_object(identifier,
       if cls is None:
         raise ValueError('Unknown ' + printable_module_name + ': ' + class_name)
     if hasattr(cls, 'from_config'):
-      arg_spec = inspect.getargspec(cls.from_config)
+      arg_spec = tf_inspect.getargspec(cls.from_config)
       if 'custom_objects' in arg_spec.args:
         custom_objects = custom_objects or {}
         return cls.from_config(
diff --git a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
index 323c31aee8..9f8cea375b 100644
--- a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
+++ b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
@@ -19,13 +19,13 @@ from __future__ import division
 from __future__ import print_function
 
 import copy
-import inspect
 import types
 
 import numpy as np
 
 from tensorflow.contrib.keras.python.keras.models import Sequential
 from tensorflow.contrib.keras.python.keras.utils.np_utils import to_categorical
+from tensorflow.python.util import tf_inspect
 
 
 class BaseWrapper(object):
@@ -97,7 +97,7 @@ class BaseWrapper(object):
 
     legal_params = []
     for fn in legal_params_fns:
-      legal_params += inspect.getargspec(fn)[0]
+      legal_params += tf_inspect.getargspec(fn)[0]
     legal_params = set(legal_params)
 
     for params_name in params:
@@ -182,7 +182,7 @@ class BaseWrapper(object):
     """
     override = override or {}
     res = {}
-    fn_args = inspect.getargspec(fn)[0]
+    fn_args = tf_inspect.getargspec(fn)[0]
     for name, value in self.sk_params.items():
       if name in fn_args:
         res.update({name: value})
diff --git a/tensorflow/contrib/labeled_tensor/python/ops/_typecheck.py b/tensorflow/contrib/labeled_tensor/python/ops/_typecheck.py
index 4a939cb22c..80fa17ec1f 100644
--- a/tensorflow/contrib/labeled_tensor/python/ops/_typecheck.py
+++ b/tensorflow/contrib/labeled_tensor/python/ops/_typecheck.py
@@ -24,9 +24,9 @@ from __future__ import print_function
 
 import collections
 import functools
-import inspect
 import re
 
+from tensorflow.python.util import tf_inspect
 
 # used for register_type_abbreviation and _type_repr below.
 _TYPE_ABBREVIATIONS = {}
@@ -230,7 +230,7 @@ def accepts(*types):
 
   def check_accepts(f):
     """Check the types."""
-    spec = inspect.getargspec(f)
+    spec = tf_inspect.getargspec(f)
 
     num_function_arguments = len(spec.args)
     if len(types) != num_function_arguments:
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/transform.py b/tensorflow/contrib/learn/python/learn/dataframe/transform.py
index c28da59ac7..33be68e46a 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/transform.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/transform.py
@@ -24,11 +24,12 @@ from abc import abstractmethod
 from abc import abstractproperty
 
 import collections
-import inspect
 
 from .series import Series
 from .series import TransformedSeries
 
+from tensorflow.python.util import tf_inspect
+
 
 def _make_list_of_series(x):
   """Converts `x` into a list of `Series` if possible.
@@ -120,7 +121,7 @@ class Transform(object):
   def parameters(self):
     """A dict of names to values of properties marked with `@parameter`."""
     property_param_names = [name
-                            for name, func in inspect.getmembers(type(self))
+                            for name, func in tf_inspect.getmembers(type(self))
                             if (hasattr(func, "fget") and hasattr(
                                 getattr(func, "fget"), "is_parameter"))]
     return {name: getattr(self, name) for name in property_param_names}
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 89fbe76840..8a92809a0c 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -21,7 +21,6 @@ from __future__ import print_function
 
 import abc
 import copy
-import inspect
 import os
 import tempfile
 
@@ -70,6 +69,8 @@ from tensorflow.python.training import monitored_session
 from tensorflow.python.training import saver
 from tensorflow.python.training import summary_io
 from tensorflow.python.util import compat
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
 
 
 AS_ITERABLE_DATE = '2016-09-15'
@@ -185,14 +186,15 @@ def _model_fn_args(fn):
   Raises:
     ValueError: if partial function has positionally bound arguments
   """
+  _, fn = tf_decorator.unwrap(fn)
   if hasattr(fn, 'func') and hasattr(fn, 'keywords') and hasattr(fn, 'args'):
     # Handle functools.partial and similar objects.
     return tuple([
-        arg for arg in inspect.getargspec(fn.func).args[len(fn.args):]
+        arg for arg in tf_inspect.getargspec(fn.func).args[len(fn.args):]
         if arg not in set(fn.keywords.keys())
     ])
   # Handle function.
-  return tuple(inspect.getargspec(fn).args)
+  return tuple(tf_inspect.getargspec(fn).args)
 
 
 def _get_replica_device_setter(config):
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator_test_utils.py b/tensorflow/contrib/learn/python/learn/estimators/estimator_test_utils.py
index eb0cf51e09..fd47710e30 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator_test_utils.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator_test_utils.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
+from tensorflow.python.util import tf_inspect
 
 
 def assert_estimator_contract(tester, estimator_class):
@@ -31,7 +31,7 @@ def assert_estimator_contract(tester, estimator_class):
     tester: A tf.test.TestCase.
     estimator_class: 'type' object of pre-canned estimator.
   """
-  attributes = inspect.getmembers(estimator_class)
+  attributes = tf_inspect.getmembers(estimator_class)
   attribute_names = [a[0] for a in attributes]
 
   tester.assertTrue('config' in attribute_names)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index ae01c678b6..4f82955684 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 import abc
-import inspect
 
 import six
 
@@ -46,6 +45,8 @@ from tensorflow.python.ops import string_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.summary import summary
 from tensorflow.python.training import training
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
 
 
 class Head(object):
@@ -1697,9 +1698,10 @@ def _check_mode_valid(mode):
 
 def _get_arguments(func):
   """Returns a spec of given func."""
+  _, func = tf_decorator.unwrap(func)
   if hasattr(func, "__code__"):
     # Regular function.
-    return inspect.getargspec(func)
+    return tf_inspect.getargspec(func)
   elif hasattr(func, "__call__"):
     # Callable object.
     return _get_arguments(func.__call__)
diff --git a/tensorflow/contrib/learn/python/learn/export_strategy.py b/tensorflow/contrib/learn/python/learn/export_strategy.py
index c62b8861a1..f276aab0e6 100644
--- a/tensorflow/contrib/learn/python/learn/export_strategy.py
+++ b/tensorflow/contrib/learn/python/learn/export_strategy.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
 """ExportStrategy class represents different flavors of model export."""
 
 from __future__ import absolute_import
@@ -20,13 +19,14 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
-import inspect
+
+from tensorflow.python.util import tf_inspect
 
 __all__ = ['ExportStrategy']
 
 
-class ExportStrategy(collections.namedtuple('ExportStrategy',
-                                            ['name', 'export_fn'])):
+class ExportStrategy(
+    collections.namedtuple('ExportStrategy', ['name', 'export_fn'])):
   """A class representing a type of model export.
 
   Typically constructed by a utility function specific to the exporter, such as
@@ -74,7 +74,7 @@ class ExportStrategy(collections.namedtuple('ExportStrategy',
     """
     # don't break existing export_fns that don't accept checkpoint_path and
     # eval_result
-    export_fn_args = inspect.getargspec(self.export_fn).args
+    export_fn_args = tf_inspect.getargspec(self.export_fn).args
     kwargs = {}
     if 'checkpoint_path' in export_fn_args:
       kwargs['checkpoint_path'] = checkpoint_path
diff --git a/tensorflow/contrib/learn/python/learn/metric_spec.py b/tensorflow/contrib/learn/python/learn/metric_spec.py
index 7be5748fa4..eafc925ad6 100644
--- a/tensorflow/contrib/learn/python/learn/metric_spec.py
+++ b/tensorflow/contrib/learn/python/learn/metric_spec.py
@@ -18,10 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import six
 
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import tf_inspect
 
 
 def _assert_named_args(sentinel):
@@ -43,11 +43,11 @@ def _args(fn):
   if hasattr(fn, 'func') and hasattr(fn, 'keywords'):
     # Handle functools.partial and similar objects.
     return tuple([
-        arg for arg in inspect.getargspec(fn.func).args
+        arg for arg in tf_inspect.getargspec(fn.func).args
         if arg not in set(fn.keywords.keys())
     ])
   # Handle function.
-  return tuple(inspect.getargspec(fn).args)
+  return tuple(tf_inspect.getargspec(fn).args)
 
 
 _CANONICAL_LABELS_ARG = 'labels'
diff --git a/tensorflow/contrib/learn/python/learn/monitors.py b/tensorflow/contrib/learn/python/learn/monitors.py
index fa9f52e922..9f13392666 100644
--- a/tensorflow/contrib/learn/python/learn/monitors.py
+++ b/tensorflow/contrib/learn/python/learn/monitors.py
@@ -35,7 +35,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import os
 import time
 
@@ -53,6 +52,7 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import saver as saver_lib
 from tensorflow.python.training import summary_io
 from tensorflow.python.util import deprecation
+from tensorflow.python.util import tf_inspect
 
 
 # TODO(ptucker): Split each monitor class into a separate file.
@@ -1164,7 +1164,7 @@ class RunHookAdapterForMonitors(session_run_hook.SessionRunHook):
   def end(self, session):
     self._last_step = None
     for m in self._monitors:
-      if "session" in inspect.getargspec(m.end).args:
+      if "session" in tf_inspect.getargspec(m.end).args:
         m.end(session=session)
       else:
         m.end()
diff --git a/tensorflow/contrib/specs/python/specs.py b/tensorflow/contrib/specs/python/specs.py
index a9fba442db..d5223b9b55 100644
--- a/tensorflow/contrib/specs/python/specs.py
+++ b/tensorflow/contrib/specs/python/specs.py
@@ -19,13 +19,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-
-import inspect
-
 from six import exec_
 from tensorflow.contrib.specs.python import params_ops
 from tensorflow.contrib.specs.python import specs_lib
 from tensorflow.contrib.specs.python import specs_ops
+from tensorflow.python.util import tf_inspect
 
 
 def eval_params(params, environment=None):
@@ -44,7 +42,8 @@ def eval_params(params, environment=None):
   """
   specs_lib.check_keywords(params)
   bindings = {}
-  if environment: bindings.update(environment)
+  if environment:
+    bindings.update(environment)
   exec_(params, vars(params_ops), bindings)  # pylint: disable=exec-used
   return bindings
 
@@ -71,7 +70,8 @@ def eval_spec(spec, environment=None):
   """
   specs_lib.check_keywords(spec)
   bindings = {}
-  if environment: bindings.update(environment)
+  if environment:
+    bindings.update(environment)
   exec_(spec, vars(specs_ops), bindings)  # pylint: disable=exec-used
   return bindings
 
@@ -141,7 +141,7 @@ class LocalImport(object):
     self.names = names
 
   def __enter__(self):
-    self.frame = inspect.currentframe()
+    self.frame = tf_inspect.currentframe()
     bindings = self.frame.f_back.f_globals
     self.old = {k: bindings.get(k, None) for k in self.names.keys()}
     bindings.update(self.names)
@@ -151,7 +151,9 @@ class LocalImport(object):
     bindings = self.frame.f_back.f_globals
     bindings.update(self.old)
     for k, v in self.old.items():
-      if v is None: del bindings[k]
+      if v is None:
+        del bindings[k]
     del self.frame
 
+
 ops = LocalImport(specs_ops)
diff --git a/tensorflow/docs_src/api_guides/python/index.md b/tensorflow/docs_src/api_guides/python/index.md
index 0e624df55b..177f19bc80 100644
--- a/tensorflow/docs_src/api_guides/python/index.md
+++ b/tensorflow/docs_src/api_guides/python/index.md
@@ -43,6 +43,7 @@
 *   [Random variable transformations (contrib)](contrib.distributions.bijector.md)
 *   [RNN and Cells (contrib)](contrib.rnn.md)
 *   [Seq2seq Library (contrib)](contrib.seq2seq.md)
+*   [Staging (contrib)](contrib.staging.md)
 *   [Statistical Distributions (contrib)](contrib.distributions.md)
 *   [Training (contrib)](contrib.training.md)
 *   [Utilities (contrib)](contrib.util.md)
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index b9e79ac156..5e2a7abeac 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2379,6 +2379,39 @@ py_test(
     ],
 )
 
+py_test(
+    name = "tf_contextlib_test",
+    size = "small",
+    srcs = ["util/tf_contextlib_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":client_testlib",
+        ":util",
+    ],
+)
+
+py_test(
+    name = "tf_decorator_test",
+    size = "small",
+    srcs = ["util/tf_decorator_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":client_testlib",
+        ":util",
+    ],
+)
+
+py_test(
+    name = "tf_inspect_test",
+    size = "small",
+    srcs = ["util/tf_inspect_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":client_testlib",
+        ":util",
+    ],
+)
+
 py_library(
     name = "util_example_parser_configuration",
     srcs = ["util/example_parser_configuration.py"],
diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py
index d2945adf75..864a96ef34 100644
--- a/tensorflow/python/__init__.py
+++ b/tensorflow/python/__init__.py
@@ -26,11 +26,9 @@ import tensorflow as tf
 
 import ctypes
 import importlib
-import inspect
 import sys
 import traceback
 
-
 # TODO(drpng): write up instructions for editing this file in a doc and point to
 # the doc instead.
 # If you want to edit this file to expose modules in public tensorflow API, you
@@ -170,7 +168,7 @@ _allowed_symbols.extend([
     'parse_single_sequence_example',
     'serialize_many_sparse',
     'serialize_sparse',
-    'sparse_matmul',   ## use tf.matmul instead.
+    'sparse_matmul',  ## use tf.matmul instead.
 ])
 
 # This is needed temporarily because we import it explicitly.
diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 3813aa996b..f7e17f1c53 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -601,6 +601,7 @@ cuda_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:util",
         "//tensorflow/python:variables",
     ],
 )
diff --git a/tensorflow/python/debug/cli/analyzer_cli_test.py b/tensorflow/python/debug/cli/analyzer_cli_test.py
index e62a0f611f..8b191f332e 100644
--- a/tensorflow/python/debug/cli/analyzer_cli_test.py
+++ b/tensorflow/python/debug/cli/analyzer_cli_test.py
@@ -17,7 +17,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import os
 import shutil
 import tempfile
@@ -41,10 +40,11 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
 from tensorflow.python.platform import test
+from tensorflow.python.util import tf_inspect
 
 
 def line_number_above():
-  return inspect.stack()[1][2] - 1
+  return tf_inspect.stack()[1][2] - 1
 
 
 def parse_op_and_node(line):
@@ -503,7 +503,7 @@ class AnalyzerCLISimpleMulAddTest(test_util.TensorFlowTestCase):
       cls._main_device = "/job:localhost/replica:0/task:0/cpu:0"
 
     cls._curr_file_path = os.path.abspath(
-        inspect.getfile(inspect.currentframe()))
+        tf_inspect.getfile(tf_inspect.currentframe()))
 
     cls._sess = session.Session()
     with cls._sess as sess:
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index 6010723d46..a4fb0d9910 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import os
 import shutil
 import tempfile
@@ -37,10 +36,11 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
+from tensorflow.python.util import tf_inspect
 
 
 def line_number_above():
-  return inspect.stack()[1][2] - 1
+  return tf_inspect.stack()[1][2] - 1
 
 
 class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
@@ -52,21 +52,21 @@ class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
     ops.reset_default_graph()
 
   def testGuessedBaseDirIsProbablyCorrect(self):
-    self.assertEqual(
-        "tensorflow", os.path.basename(source_utils._TENSORFLOW_BASEDIR))
+    self.assertEqual("tensorflow",
+                     os.path.basename(source_utils._TENSORFLOW_BASEDIR))
 
   def testUnitTestFileReturnsFalse(self):
-    self.assertFalse(source_utils._guess_is_tensorflow_py_library(
-        self.curr_file_path))
+    self.assertFalse(
+        source_utils._guess_is_tensorflow_py_library(self.curr_file_path))
 
   def testSourceUtilModuleReturnsTrue(self):
-    self.assertTrue(source_utils._guess_is_tensorflow_py_library(
-        source_utils.__file__))
+    self.assertTrue(
+        source_utils._guess_is_tensorflow_py_library(source_utils.__file__))
 
   def testFileInPythonKernelsPathReturnsTrue(self):
     x = constant_op.constant(42.0, name="x")
-    self.assertTrue(source_utils._guess_is_tensorflow_py_library(
-        x.op.traceback[-1][0]))
+    self.assertTrue(
+        source_utils._guess_is_tensorflow_py_library(x.op.traceback[-1][0]))
 
   def testNonPythonFileRaisesException(self):
     with self.assertRaisesRegexp(ValueError, r"is not a Python source file"):
@@ -85,7 +85,7 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
 
     self.dump_root = self.get_temp_dir()
     self.curr_file_path = os.path.abspath(
-        inspect.getfile(inspect.currentframe()))
+        tf_inspect.getfile(tf_inspect.currentframe()))
 
     # Run a simple TF graph to generate some debug dumps that can be used in
     # source annotation.
@@ -135,27 +135,21 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
 
     self.assertIn(self.u_init.op.name,
                   source_annotation[self.u_init_line_number])
-    self.assertIn(self.u.op.name,
-                  source_annotation[self.u_line_number])
+    self.assertIn(self.u.op.name, source_annotation[self.u_line_number])
     self.assertIn(self.v_init.op.name,
                   source_annotation[self.v_init_line_number])
-    self.assertIn(self.v.op.name,
-                  source_annotation[self.v_line_number])
-    self.assertIn(self.w.op.name,
-                  source_annotation[self.w_line_number])
+    self.assertIn(self.v.op.name, source_annotation[self.v_line_number])
+    self.assertIn(self.w.op.name, source_annotation[self.w_line_number])
 
     # In the non-stack-top (default) mode, the helper line should be annotated
     # with all the ops as well.
     self.assertIn(self.u_init.op.name,
                   source_annotation[self.helper_line_number])
-    self.assertIn(self.u.op.name,
-                  source_annotation[self.helper_line_number])
+    self.assertIn(self.u.op.name, source_annotation[self.helper_line_number])
     self.assertIn(self.v_init.op.name,
                   source_annotation[self.helper_line_number])
-    self.assertIn(self.v.op.name,
-                  source_annotation[self.helper_line_number])
-    self.assertIn(self.w.op.name,
-                  source_annotation[self.helper_line_number])
+    self.assertIn(self.v.op.name, source_annotation[self.helper_line_number])
+    self.assertIn(self.w.op.name, source_annotation[self.helper_line_number])
 
   def testAnnotateWithStackTopGivesCorrectResult(self):
     source_annotation = source_utils.annotate_source(
@@ -163,14 +157,11 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
 
     self.assertIn(self.u_init.op.name,
                   source_annotation[self.u_init_line_number])
-    self.assertIn(self.u.op.name,
-                  source_annotation[self.u_line_number])
+    self.assertIn(self.u.op.name, source_annotation[self.u_line_number])
     self.assertIn(self.v_init.op.name,
                   source_annotation[self.v_init_line_number])
-    self.assertIn(self.v.op.name,
-                  source_annotation[self.v_line_number])
-    self.assertIn(self.w.op.name,
-                  source_annotation[self.w_line_number])
+    self.assertIn(self.v.op.name, source_annotation[self.v_line_number])
+    self.assertIn(self.w.op.name, source_annotation[self.w_line_number])
 
     # In the stack-top mode, the helper line should not have been annotated.
     self.assertNotIn(self.helper_line_number, source_annotation)
@@ -182,8 +173,7 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
         min_line=self.u_line_number,
         max_line=self.u_line_number + 1)
 
-    self.assertIn(self.u.op.name,
-                  source_annotation[self.u_line_number])
+    self.assertIn(self.u.op.name, source_annotation[self.u_line_number])
     self.assertNotIn(self.v_line_number, source_annotation)
 
   def testAnnotateDumpedTensorsGivesCorrectResult(self):
@@ -192,26 +182,17 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
 
     # Note: Constant Tensors u_init and v_init may not get dumped due to
     #   constant-folding.
-    self.assertIn(self.u.name,
-                  source_annotation[self.u_line_number])
-    self.assertIn(self.v.name,
-                  source_annotation[self.v_line_number])
-    self.assertIn(self.w.name,
-                  source_annotation[self.w_line_number])
-
-    self.assertNotIn(self.u.op.name,
-                     source_annotation[self.u_line_number])
-    self.assertNotIn(self.v.op.name,
-                     source_annotation[self.v_line_number])
-    self.assertNotIn(self.w.op.name,
-                     source_annotation[self.w_line_number])
-
-    self.assertIn(self.u.name,
-                  source_annotation[self.helper_line_number])
-    self.assertIn(self.v.name,
-                  source_annotation[self.helper_line_number])
-    self.assertIn(self.w.name,
-                  source_annotation[self.helper_line_number])
+    self.assertIn(self.u.name, source_annotation[self.u_line_number])
+    self.assertIn(self.v.name, source_annotation[self.v_line_number])
+    self.assertIn(self.w.name, source_annotation[self.w_line_number])
+
+    self.assertNotIn(self.u.op.name, source_annotation[self.u_line_number])
+    self.assertNotIn(self.v.op.name, source_annotation[self.v_line_number])
+    self.assertNotIn(self.w.op.name, source_annotation[self.w_line_number])
+
+    self.assertIn(self.u.name, source_annotation[self.helper_line_number])
+    self.assertIn(self.v.name, source_annotation[self.helper_line_number])
+    self.assertIn(self.w.name, source_annotation[self.helper_line_number])
 
   def testCallingAnnotateSourceWithoutPythonGraphRaisesException(self):
     self.dump.set_python_graph(None)
@@ -224,8 +205,9 @@ class SourceHelperTest(test_util.TensorFlowTestCase):
     with open(unrelated_source_path, "wt") as source_file:
       source_file.write("print('hello, world')\n")
 
-    self.assertEqual(
-        {}, source_utils.annotate_source(self.dump, unrelated_source_path))
+    self.assertEqual({},
+                     source_utils.annotate_source(self.dump,
+                                                  unrelated_source_path))
 
     # Clean up unrelated source file.
     os.remove(unrelated_source_path)
@@ -238,7 +220,7 @@ class ListSourceAgainstDumpTest(test_util.TensorFlowTestCase):
 
     self.dump_root = self.get_temp_dir()
     self.curr_file_path = os.path.abspath(
-        inspect.getfile(inspect.currentframe()))
+        tf_inspect.getfile(tf_inspect.currentframe()))
 
     # Run a simple TF graph to generate some debug dumps that can be used in
     # source annotation.
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index a1b0d9358d..ac3cda4ff1 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -20,7 +20,6 @@ from __future__ import division
 from __future__ import print_function
 
 import copy
-import inspect
 import os
 import tempfile
 
@@ -48,6 +47,9 @@ from tensorflow.python.training import monitored_session
 from tensorflow.python.training import saver
 from tensorflow.python.training import training
 from tensorflow.python.util import compat
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
+
 
 _VALID_MODEL_FN_ARGS = set(
     ['features', 'labels', 'mode', 'params', 'config'])
@@ -716,14 +718,15 @@ def _model_fn_args(fn):
   Raises:
     ValueError: if partial function has positionally bound arguments
   """
+  _, fn = tf_decorator.unwrap(fn)
   if hasattr(fn, 'func') and hasattr(fn, 'keywords') and hasattr(fn, 'args'):
     # Handle functools.partial and similar objects.
     return tuple([
-        arg for arg in inspect.getargspec(fn.func).args[len(fn.args):]
+        arg for arg in tf_inspect.getargspec(fn.func).args[len(fn.args):]
         if arg not in set(fn.keywords.keys())
     ])
   # Handle function.
-  return tuple(inspect.getargspec(fn).args)
+  return tuple(tf_inspect.getargspec(fn).args)
 
 
 def _verify_model_fn_args(model_fn, params):
diff --git a/tensorflow/python/framework/contrib_test.py b/tensorflow/python/framework/contrib_test.py
index 8ca0c69d77..f2eaf7c2ee 100644
--- a/tensorflow/python/framework/contrib_test.py
+++ b/tensorflow/python/framework/contrib_test.py
@@ -18,9 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
-
 from tensorflow.python.platform import test
+from tensorflow.python.util import tf_inspect
 
 
 class ContribTest(test.TestCase):
@@ -29,17 +28,17 @@ class ContribTest(test.TestCase):
     # pylint: disable=g-import-not-at-top
     import tensorflow as tf
     _ = tf.contrib.layers  # `tf.contrib` is loaded lazily on first use.
-    assert inspect.ismodule(tf.contrib)
+    assert tf_inspect.ismodule(tf.contrib)
 
   def testLayers(self):
     # pylint: disable=g-import-not-at-top
     import tensorflow as tf
-    assert inspect.ismodule(tf.contrib.layers)
+    assert tf_inspect.ismodule(tf.contrib.layers)
 
   def testLinearOptimizer(self):
     # pylint: disable=g-import-not-at-top
     import tensorflow as tf
-    assert inspect.ismodule(tf.contrib.linear_optimizer)
+    assert tf_inspect.ismodule(tf.contrib.linear_optimizer)
 
 
 if __name__ == '__main__':
diff --git a/tensorflow/python/framework/function.py b/tensorflow/python/framework/function.py
index 8b156db6dc..2a1389b91f 100644
--- a/tensorflow/python/framework/function.py
+++ b/tensorflow/python/framework/function.py
@@ -23,7 +23,6 @@ from __future__ import print_function
 
 import collections
 import hashlib
-import inspect
 import re
 
 from tensorflow.core.framework import attr_value_pb2
@@ -36,6 +35,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import variable_scope as vs
 from tensorflow.python.util import compat
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
 
 
 def _make_argname_from_tensor_name(name):
@@ -259,10 +260,11 @@ def _call(sig, *inputs, **kwargs):
 
 
 def _get_func_name(func):
+  _, func = tf_decorator.unwrap(func)
   if callable(func):
-    if inspect.isfunction(func):
+    if tf_inspect.isfunction(func):
       return func.__name__
-    elif inspect.ismethod(func):
+    elif tf_inspect.ismethod(func):
       return "%s.%s" % (func.__self__.__name__, func.__name__)
     else:  # Probably a class instance with __call__
       return type(func)
@@ -955,7 +957,7 @@ class Defun(object):
       raise ValueError("func %s must be callable" % func)
 
     # Func should not use kwargs and defaults.
-    argspec = inspect.getargspec(func)
+    argspec = tf_inspect.getargspec(func)
     if argspec.keywords or argspec.defaults:
       raise ValueError("Functions with argument defaults or keyword "
                        "arguments are not supported.")
@@ -966,7 +968,7 @@ class Defun(object):
     if argspec.varargs:
       max_args = 1000000
     argnames = argspec.args
-    if inspect.ismethod(func):
+    if tf_inspect.ismethod(func):
       # 1st argument is the "class" type.
       min_args -= 1
       argnames = argnames[1:]
diff --git a/tensorflow/python/framework/op_def_library.py b/tensorflow/python/framework/op_def_library.py
index 7f2b03e350..2c39f5b0e3 100644
--- a/tensorflow/python/framework/op_def_library.py
+++ b/tensorflow/python/framework/op_def_library.py
@@ -19,8 +19,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import contextlib
-
 import six
 
 from tensorflow.core.framework import attr_value_pb2
@@ -33,6 +31,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import compat
+from tensorflow.python.util import tf_contextlib
 
 
 def _Attr(op_def, name):
@@ -241,7 +240,7 @@ class _OpInfo(object):
 
 
 # pylint: disable=g-doc-return-or-yield
-@contextlib.contextmanager
+@tf_contextlib.contextmanager
 def _MaybeColocateWith(inputs):
   """A context manager for (maybe) colocating with a list of input tensors.
 
diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index ebab40c0aa..6d2a38b3a6 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -20,7 +20,6 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
-import contextlib
 import copy
 import linecache
 import re
@@ -44,6 +43,7 @@ from tensorflow.python.framework import versions
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import compat
 from tensorflow.python.util import decorator_utils
+from tensorflow.python.util import tf_contextlib
 
 
 def _override_helper(clazz_object, operator, func):
@@ -2725,7 +2725,7 @@ class Graph(object):
       if name in self._collections:
         del self._collections[name]
 
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def _original_op(self, op):
     """Python 'with' handler to help annotate ops with their originator.
 
@@ -2751,7 +2751,7 @@ class Graph(object):
       self._default_original_op = old_original_op
 
   # pylint: disable=g-doc-return-or-yield
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def name_scope(self, name):
     r"""Returns a context manager that creates hierarchical names for operations.
 
@@ -2924,7 +2924,7 @@ class Graph(object):
     """
     return self._name_stack
 
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def colocate_with(self, op, ignore_existing=False):
     """Returns a context manager that specifies an op to colocate with.
 
@@ -2999,7 +2999,7 @@ class Graph(object):
       if ignore_existing:
         self._colocation_stack = current_stack
 
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def device(self, device_name_or_function):
     """Returns a context manager that specifies the default device to use.
 
@@ -3081,7 +3081,7 @@ class Graph(object):
       op._set_device(device_function(op))
 
   # pylint: disable=g-doc-return-or-yield
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def container(self, container_name):
     """Returns a context manager that specifies the resource container to use.
 
@@ -3349,7 +3349,7 @@ class Graph(object):
     return self._ControlDependenciesController(self, control_ops)
 
   # pylint: disable=g-doc-return-or-yield
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def _attr_scope(self, attr_map):
     """EXPERIMENTAL: A context manager for setting attributes on operators.
 
@@ -3414,7 +3414,7 @@ class Graph(object):
   # pylint: enable=g-doc-return-or-yield
 
   # pylint: disable=g-doc-return-or-yield
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def _kernel_label_map(self, op_to_kernel_label_map):
     """EXPERIMENTAL: A context manager for setting kernel labels.
 
@@ -3476,7 +3476,7 @@ class Graph(object):
   # pylint: enable=g-doc-return-or-yield
 
   # pylint: disable=g-doc-return-or-yield
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def gradient_override_map(self, op_type_map):
     """EXPERIMENTAL: A context manager for overriding gradient functions.
 
@@ -3634,7 +3634,7 @@ class _DefaultStack(threading.local):
   def enforce_nesting(self, value):
     self._enforce_nesting = value
 
-  @contextlib.contextmanager
+  @tf_contextlib.contextmanager
   def get_controller(self, default):
     """A context manager for manipulating a default stack."""
     try:
@@ -4137,7 +4137,7 @@ def get_all_collection_keys():
 
 
 # pylint: disable=g-doc-return-or-yield
-@contextlib.contextmanager
+@tf_contextlib.contextmanager
 def name_scope(name, default_name=None, values=None):
   """Returns a context manager for use when defining a Python op.
 
@@ -4227,7 +4227,7 @@ def prepend_name_scope(name, import_scope):
 
 
 # pylint: disable=g-doc-return-or-yield
-@contextlib.contextmanager
+@tf_contextlib.contextmanager
 def op_scope(values, name, default_name=None):
   """DEPRECATED. Same as name_scope above, just different argument order."""
   logging.warn("tf.op_scope(values, name, default_name) is deprecated,"
diff --git a/tensorflow/python/layers/base.py b/tensorflow/python/layers/base.py
index 9b76585f9f..21b0ba7626 100644
--- a/tensorflow/python/layers/base.py
+++ b/tensorflow/python/layers/base.py
@@ -25,7 +25,6 @@ from __future__ import print_function
 
 import copy
 import functools
-import inspect
 import re
 from six.moves import xrange  # pylint: disable=redefined-builtin
 import numpy as np
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index ff9f134a0e..f81837b73a 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -20,7 +20,6 @@ from __future__ import division
 from __future__ import print_function
 
 import collections as collections_lib
-import contextlib
 import copy
 import functools
 import traceback
@@ -36,6 +35,7 @@ from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import tf_contextlib
 
 __all__ = ["VariableScope", "get_variable_scope",
            "get_variable", "get_local_variable", "variable_scope",
@@ -1250,7 +1250,7 @@ def _get_partitioned_variable(name,
   # pylint: enable=protected-access
 
 
-@contextlib.contextmanager
+@tf_contextlib.contextmanager
 def _pure_variable_scope(name_or_scope,
                          reuse=None,
                          initializer=None,
@@ -1409,7 +1409,7 @@ def _get_unique_variable_scope(prefix):
 
 
 # pylint: disable=g-doc-return-or-yield
-@contextlib.contextmanager
+@tf_contextlib.contextmanager
 def variable_scope(name_or_scope,
                    default_name=None,
                    values=None,
@@ -1582,7 +1582,7 @@ def variable_scope(name_or_scope,
 
 
 # pylint: disable=g-doc-return-or-yield
-@contextlib.contextmanager
+@tf_contextlib.contextmanager
 def variable_op_scope(values,
                       name_or_scope,
                       default_name=None,
diff --git a/tensorflow/python/platform/benchmark.py b/tensorflow/python/platform/benchmark.py
index ea29399ed2..aa74a419d8 100644
--- a/tensorflow/python/platform/benchmark.py
+++ b/tensorflow/python/platform/benchmark.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import numbers
 import os
 import re
@@ -33,6 +32,8 @@ from tensorflow.python.client import timeline
 from tensorflow.python.platform import app
 from tensorflow.python.platform import gfile
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import tf_inspect
+
 
 # When a subclass of the Benchmark class is created, it is added to
 # the registry automatically
@@ -135,7 +136,7 @@ class Benchmark(six.with_metaclass(_BenchmarkRegistrar, object)):
     """Returns full name of class and method calling report_benchmark."""
 
     # Find the caller method (outermost Benchmark class)
-    stack = inspect.stack()
+    stack = tf_inspect.stack()
     calling_class = None
     name = None
     for frame in stack[::-1]:
diff --git a/tensorflow/python/platform/googletest.py b/tensorflow/python/platform/googletest.py
index 1e74b1512b..96219faab7 100644
--- a/tensorflow/python/platform/googletest.py
+++ b/tensorflow/python/platform/googletest.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 import atexit
-import inspect
 import itertools
 import os
 import sys
@@ -35,6 +34,9 @@ from tensorflow.python.lib.io import file_io
 from tensorflow.python.platform import app
 from tensorflow.python.platform import benchmark
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
+
 
 Benchmark = benchmark.TensorFlowBenchmark  # pylint: disable=invalid-name
 
@@ -101,9 +103,9 @@ def GetTempDir():
   """Return a temporary directory for tests to use."""
   global _googletest_temp_dir
   if not _googletest_temp_dir:
-    first_frame = inspect.stack()[-1][0]
-    temp_dir = os.path.join(
-        tempfile.gettempdir(), os.path.basename(inspect.getfile(first_frame)))
+    first_frame = tf_inspect.stack()[-1][0]
+    temp_dir = os.path.join(tempfile.gettempdir(),
+                            os.path.basename(tf_inspect.getfile(first_frame)))
     temp_dir = tempfile.mkdtemp(prefix=temp_dir.rstrip('.py'))
 
     def delete_temp_dir(dirname=temp_dir):
@@ -204,15 +206,16 @@ class StubOutForTesting(object):
     Raises:
       AttributeError: If the attribute cannot be found.
     """
-    if (inspect.ismodule(obj) or
-        (not inspect.isclass(obj) and attr_name in obj.__dict__)):
+    _, obj = tf_decorator.unwrap(obj)
+    if (tf_inspect.ismodule(obj) or
+        (not tf_inspect.isclass(obj) and attr_name in obj.__dict__)):
       orig_obj = obj
       orig_attr = getattr(obj, attr_name)
     else:
-      if not inspect.isclass(obj):
-        mro = list(inspect.getmro(obj.__class__))
+      if not tf_inspect.isclass(obj):
+        mro = list(tf_inspect.getmro(obj.__class__))
       else:
-        mro = list(inspect.getmro(obj))
+        mro = list(tf_inspect.getmro(obj))
 
       mro.reverse()
 
diff --git a/tensorflow/python/platform/resource_loader.py b/tensorflow/python/platform/resource_loader.py
index a53fc541cb..2455acb4c0 100644
--- a/tensorflow/python/platform/resource_loader.py
+++ b/tensorflow/python/platform/resource_loader.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
 """Resource management library.
 
 @@get_data_files_path
@@ -25,10 +24,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect as _inspect
 import os as _os
 import sys as _sys
 
+from tensorflow.python.util import tf_inspect as _inspect
 from tensorflow.python.util.all_util import remove_undocumented
 
 
@@ -44,9 +43,8 @@ def load_resource(path):
   Raises:
     IOError: If the path is not found, or the resource can't be opened.
   """
-  tensorflow_root = (
-      _os.path.join(
-          _os.path.dirname(__file__), _os.pardir, _os.pardir))
+  tensorflow_root = (_os.path.join(
+      _os.path.dirname(__file__), _os.pardir, _os.pardir))
   path = _os.path.join(tensorflow_root, path)
   path = _os.path.abspath(path)
   with open(path, 'rb') as f:
diff --git a/tensorflow/python/util/all_util.py b/tensorflow/python/util/all_util.py
index 08f3365751..50d480f870 100644
--- a/tensorflow/python/util/all_util.py
+++ b/tensorflow/python/util/all_util.py
@@ -18,10 +18,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect as _inspect
 import re as _re
 import sys as _sys
 
+from tensorflow.python.util import tf_inspect as _tf_inspect
+
+
 _reference_pattern = _re.compile(r'^@@(\w+)$', flags=_re.MULTILINE)
 
 
@@ -45,7 +47,7 @@ def make_all(module_name, doc_string_modules=None):
   if doc_string_modules is None:
     doc_string_modules = [_sys.modules[module_name]]
   cur_members = set([name for name, _
-                     in _inspect.getmembers(_sys.modules[module_name])])
+                     in _tf_inspect.getmembers(_sys.modules[module_name])])
 
   results = set()
   for doc_module in doc_string_modules:
diff --git a/tensorflow/python/util/deprecation.py b/tensorflow/python/util/deprecation.py
index 60b559b5f4..73fc3e2408 100644
--- a/tensorflow/python/util/deprecation.py
+++ b/tensorflow/python/util/deprecation.py
@@ -20,11 +20,12 @@ from __future__ import print_function
 
 import collections
 import functools
-import inspect
 import re
 
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import decorator_utils
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
 
 
 def _add_deprecated_function_notice_to_docstring(doc, date, instructions):
@@ -59,7 +60,7 @@ def _validate_deprecation_args(date, instructions):
 
 def _call_location():
   """Returns call location given level up from current call."""
-  frame = inspect.currentframe()
+  frame = tf_inspect.currentframe()
   if frame:
     # CPython internals are available, use them for performance.
     # walk back two frames to get to deprecated function caller.
@@ -69,7 +70,7 @@ def _call_location():
     return '%s:%d' % (frame.f_code.co_filename, frame.f_lineno)
   else:
     # Slow fallback path
-    stack = inspect.stack(0)  # 0 avoids generating unused context
+    stack = tf_inspect.stack(0)  # 0 avoids generating unused context
     entry = stack[2]
     return '%s:%d' % (entry[1], entry[2])
 
@@ -119,9 +120,10 @@ def deprecated(date, instructions):
           'in a future version' if date is None else ('after %s' % date),
           instructions)
       return func(*args, **kwargs)
-    new_func.__doc__ = _add_deprecated_function_notice_to_docstring(
-        func.__doc__, date, instructions)
-    return new_func
+    return tf_decorator.make_decorator(
+        func, new_func, 'deprecated',
+        _add_deprecated_function_notice_to_docstring(func.__doc__, date,
+                                                     instructions))
   return deprecated_wrapper
 
 
@@ -193,7 +195,7 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
     Args:
       names_to_ok_vals: dict from string arg_name to a list of values,
         possibly empty, which should not elicit a warning.
-      arg_spec: Output from inspect.getargspec on the called function.
+      arg_spec: Output from tf_inspect.getargspec on the called function.
 
     Returns:
       Dictionary from arg_name to DeprecatedArgSpec.
@@ -213,7 +215,7 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
     decorator_utils.validate_callable(func, 'deprecated_args')
     deprecated_arg_names = _get_arg_names_to_ok_vals()
 
-    arg_spec = inspect.getargspec(func)
+    arg_spec = tf_inspect.getargspec(func)
     deprecated_positions = _get_deprecated_positional_arguments(
         deprecated_arg_names, arg_spec)
 
@@ -260,7 +262,7 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
     def new_func(*args, **kwargs):
       """Deprecation wrapper."""
       invalid_args = []
-      named_args = inspect.getcallargs(func, *args, **kwargs)
+      named_args = tf_inspect.getcallargs(func, *args, **kwargs)
       for arg_name, spec in iter(deprecated_positions.items()):
         if (spec.position < len(args) and
             not (spec.has_ok_value and
@@ -285,9 +287,9 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
             'in a future version' if date is None else ('after %s' % date),
             instructions)
       return func(*args, **kwargs)
-    new_func.__doc__ = _add_deprecated_arg_notice_to_docstring(
-        func.__doc__, date, instructions)
-    return new_func
+    return tf_decorator.make_decorator(func, new_func, 'deprecated',
+                                       _add_deprecated_arg_notice_to_docstring(
+                                           func.__doc__, date, instructions))
   return deprecated_wrapper
 
 
@@ -332,7 +334,7 @@ def deprecated_arg_values(date, instructions, **deprecated_kwargs):
     @functools.wraps(func)
     def new_func(*args, **kwargs):
       """Deprecation wrapper."""
-      named_args = inspect.getcallargs(func, *args, **kwargs)
+      named_args = tf_inspect.getcallargs(func, *args, **kwargs)
       for arg_name, arg_value in deprecated_kwargs.items():
         if arg_name in named_args and named_args[arg_name] == arg_value:
           logging.warning(
@@ -343,9 +345,9 @@ def deprecated_arg_values(date, instructions, **deprecated_kwargs):
               'in a future version' if date is None else ('after %s' % date),
               instructions)
       return func(*args, **kwargs)
-    new_func.__doc__ = _add_deprecated_arg_notice_to_docstring(
-        func.__doc__, date, instructions)
-    return new_func
+    return tf_decorator.make_decorator(func, new_func, 'deprecated',
+                                       _add_deprecated_arg_notice_to_docstring(
+                                           func.__doc__, date, instructions))
   return deprecated_wrapper
 
 
diff --git a/tensorflow/python/util/tf_contextlib.py b/tensorflow/python/util/tf_contextlib.py
new file mode 100644
index 0000000000..3830014d4a
--- /dev/null
+++ b/tensorflow/python/util/tf_contextlib.py
@@ -0,0 +1,36 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""TFDecorator-aware replacements for the contextlib module."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import contextlib as _contextlib
+
+from tensorflow.python.util import tf_decorator
+
+
+def contextmanager(target):
+  """A tf_decorator-aware wrapper for `contextlib.contextmanager`.
+
+  Usage is identical to `contextlib.contextmanager`.
+
+  Args:
+    target: A callable to be wrapped in a contextmanager.
+  Returns:
+    A callable that can be used inside of a `with` statement.
+  """
+  context_manager = _contextlib.contextmanager(target)
+  return tf_decorator.make_decorator(target, context_manager, 'contextmanager')
diff --git a/tensorflow/python/util/tf_contextlib_test.py b/tensorflow/python/util/tf_contextlib_test.py
new file mode 100644
index 0000000000..4a5bf388a6
--- /dev/null
+++ b/tensorflow/python/util/tf_contextlib_test.py
@@ -0,0 +1,92 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Unit tests for tf_contextlib."""
+
+# pylint: disable=unused-import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.platform import test
+from tensorflow.python.util import tf_contextlib
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
+
+
+@tf_contextlib.contextmanager
+def test_yield_append_before_and_after_yield(x, before, after):
+  x.append(before)
+  yield
+  x.append(after)
+
+
+@tf_contextlib.contextmanager
+def test_yield_return_x_plus_1(x):
+  yield x + 1
+
+
+@tf_contextlib.contextmanager
+def test_params_and_defaults(a, b=2, c=True, d='hello'):
+  return [a, b, c, d]
+
+
+class TfContextlibTest(test.TestCase):
+
+  def testRunsCodeBeforeYield(self):
+    x = []
+    with test_yield_append_before_and_after_yield(x, 'before', ''):
+      self.assertEqual('before', x[-1])
+
+  def testRunsCodeAfterYield(self):
+    x = []
+    with test_yield_append_before_and_after_yield(x, '', 'after'):
+      pass
+    self.assertEqual('after', x[-1])
+
+  def testNestedWith(self):
+    x = []
+    with test_yield_append_before_and_after_yield(x, 'before', 'after'):
+      with test_yield_append_before_and_after_yield(x, 'inner', 'outer'):
+        with test_yield_return_x_plus_1(1) as var:
+          x.append(var)
+    self.assertEqual(['before', 'inner', 2, 'outer', 'after'], x)
+
+  def testMultipleCallsOfSeparateInstances(self):
+    x = []
+    with test_yield_append_before_and_after_yield(x, 1, 2):
+      pass
+    with test_yield_append_before_and_after_yield(x, 3, 4):
+      pass
+    self.assertEqual([1, 2, 3, 4], x)
+
+  def testReturnsResultFromYield(self):
+    with test_yield_return_x_plus_1(3) as result:
+      self.assertEqual(4, result)
+
+  def testUnwrapContextManager(self):
+    decorators, target = tf_decorator.unwrap(test_params_and_defaults)
+    self.assertEqual(1, len(decorators))
+    self.assertTrue(isinstance(decorators[0], tf_decorator.TFDecorator))
+    self.assertEqual('contextmanager', decorators[0].decorator_name)
+    self.assertFalse(isinstance(target, tf_decorator.TFDecorator))
+
+  def testGetArgSpecReturnsWrappedArgSpec(self):
+    argspec = tf_inspect.getargspec(test_params_and_defaults)
+    self.assertEqual(['a', 'b', 'c', 'd'], argspec.args)
+    self.assertEqual((2, True, 'hello'), argspec.defaults)
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/util/tf_decorator.py b/tensorflow/python/util/tf_decorator.py
new file mode 100644
index 0000000000..a5d979e376
--- /dev/null
+++ b/tensorflow/python/util/tf_decorator.py
@@ -0,0 +1,167 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Base TFDecorator class and utility functions for working with decorators.
+
+There are two ways to create decorators that TensorFlow can introspect into.
+This is important for documentation generation purposes, so that function
+signatures aren't obscured by the (*args, **kwds) signature that decorators
+often provide.
+
+1. Call `tf_decorator.make_decorator` on your wrapper function. If your
+decorator is stateless, or can capture all of the variables it needs to work
+with through lexical closure, this is the simplest option. Create your wrapper
+function as usual, but instead of returning it, return
+`tf_decorator.make_decorator(your_wrapper)`. This will attach some decorator
+introspection metadata onto your wrapper and return it.
+
+Example:
+
+  def print_hello_before_calling(target):
+    def wrapper(*args, **kwargs):
+      print('hello')
+      return target(*args, **kwargs)
+    return tf_decorator.make_decorator(wrapper)
+
+2. Derive from TFDecorator. If your decorator needs to be stateful, you can
+implement it in terms of a TFDecorator. Store whatever state you need in your
+derived class, and implement the `__call__` method to do your work before
+calling into your target. You can retrieve the target via
+`super(MyDecoratorClass, self).decorated_target`, and call it with whatever
+parameters it needs.
+
+Example:
+
+  class CallCounter(tf_decorator.TFDecorator):
+    def __init__(self, target):
+      super(CallCounter, self).__init__('count_calls', target)
+      self.call_count = 0
+
+    def __call__(self, *args, **kwargs):
+      self.call_count += 1
+      return super(CallCounter, self).decorated_target(*args, **kwargs)
+
+  def count_calls(target):
+    return CallCounter(target)
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import functools as _functools
+import inspect as _inspect
+
+
+def make_decorator(target,
+                   decorator_func,
+                   decorator_name=None,
+                   decorator_doc='',
+                   decorator_argspec=None):
+  """Make a decorator from a wrapper and a target.
+
+  Args:
+    target: The final callable to be wrapped.
+    decorator_func: The wrapper function.
+    decorator_name: The name of the decorator. If `None`, the name of the
+      function calling make_decorator.
+    decorator_doc: Documentation specific to this application of
+      `decorator_func` to `target`.
+    decorator_argspec: The new callable signature of this decorator.
+
+  Returns:
+    The `decorator_func` argument with new metadata attached.
+  """
+  if decorator_name is None:
+    decorator_name = _inspect.stack()[1][3]  # Caller's name.
+  decorator = TFDecorator(decorator_name, target, decorator_doc,
+                          decorator_argspec)
+  setattr(decorator_func, '_tf_decorator', decorator)
+  decorator_func.__name__ = target.__name__
+  decorator_func.__doc__ = decorator.__doc__
+  decorator_func.__wrapped__ = target
+  return decorator_func
+
+
+def unwrap(maybe_tf_decorator):
+  """Unwraps an object into a list of TFDecorators and a final target.
+
+  Args:
+    maybe_tf_decorator: Any callable object.
+
+  Returns:
+    A tuple whose first element is an list of TFDecorator-derived objects that
+    were applied to the final callable target, and whose second element is the
+    final undecorated callable target. If the `maybe_tf_decorator` parameter is
+    not decorated by any TFDecorators, the first tuple element will be an empty
+    list. The `TFDecorator` list is ordered from outermost to innermost
+    decorators.
+  """
+  decorators = []
+  cur = maybe_tf_decorator
+  while True:
+    if isinstance(cur, TFDecorator):
+      decorators.append(cur)
+    elif hasattr(cur, '_tf_decorator'):
+      decorators.append(getattr(cur, '_tf_decorator'))
+    else:
+      break
+    cur = decorators[-1].decorated_target
+  return decorators, cur
+
+
+class TFDecorator(object):
+  """Base class for all TensorFlow decorators.
+
+  TFDecorator captures and exposes the wrapped target, and provides details
+  about the current decorator.
+  """
+
+  def __init__(self,
+               decorator_name,
+               target,
+               decorator_doc='',
+               decorator_argspec=None):
+    self._decorated_target = target
+    self._decorator_name = decorator_name
+    self._decorator_doc = decorator_doc
+    self._decorator_argspec = decorator_argspec
+    self.__name__ = target.__name__
+    if self._decorator_doc:
+      self.__doc__ = self._decorator_doc
+    elif target.__doc__:
+      self.__doc__ = target.__doc__
+    else:
+      self.__doc__ = ''
+
+  def __get__(self, obj, objtype):
+    return _functools.partial(self.__call__, obj)
+
+  def __call__(self, *args, **kwargs):
+    return self._decorated_target(*args, **kwargs)
+
+  @property
+  def decorated_target(self):
+    return self._decorated_target
+
+  @property
+  def decorator_name(self):
+    return self._decorator_name
+
+  @property
+  def decorator_doc(self):
+    return self._decorator_doc
+
+  @property
+  def decorator_argspec(self):
+    return self._decorator_argspec
diff --git a/tensorflow/python/util/tf_decorator_test.py b/tensorflow/python/util/tf_decorator_test.py
new file mode 100644
index 0000000000..3f6a10b440
--- /dev/null
+++ b/tensorflow/python/util/tf_decorator_test.py
@@ -0,0 +1,243 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Unit tests for tf_decorator."""
+
+# pylint: disable=unused-import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
+
+
+def test_tfdecorator(decorator_name, decorator_doc=None):
+
+  def make_tf_decorator(target):
+    return tf_decorator.TFDecorator(decorator_name, target, decorator_doc)
+
+  return make_tf_decorator
+
+
+def test_decorator_increment_first_int_arg(target):
+  """This test decorator skips past `self` as args[0] in the bound case."""
+
+  def wrapper(*args, **kwargs):
+    new_args = []
+    found = False
+    for arg in args:
+      if not found and isinstance(arg, int):
+        new_args.append(arg + 1)
+        found = True
+      else:
+        new_args.append(arg)
+    return target(*new_args, **kwargs)
+
+  return tf_decorator.make_decorator(target, wrapper)
+
+
+def test_function(x):
+  """Test Function Docstring."""
+  return x + 1
+
+
+@test_tfdecorator('decorator 1')
+@test_decorator_increment_first_int_arg
+@test_tfdecorator('decorator 3', 'decorator 3 documentation')
+def test_decorated_function(x):
+  """Test Decorated Function Docstring."""
+  return x * 2
+
+
+@test_tfdecorator('decorator')
+class TestDecoratedClass(object):
+  """Test Decorated Class."""
+
+  def __init__(self, two_attr=2):
+    self.two_attr = two_attr
+
+  @property
+  def two_prop(self):
+    return 2
+
+  def two_func(self):
+    return 2
+
+  @test_decorator_increment_first_int_arg
+  def return_params(self, a, b, c):
+    """Return parameters."""
+    return [a, b, c]
+
+
+class TfDecoratorTest(test.TestCase):
+
+  def testInitCapturesTarget(self):
+    self.assertIs(test_function,
+                  tf_decorator.TFDecorator('', test_function).decorated_target)
+
+  def testInitCapturesDecoratorName(self):
+    self.assertEqual('decorator name',
+                     tf_decorator.TFDecorator('decorator name',
+                                              test_function).decorator_name)
+
+  def testInitCapturesDecoratorDoc(self):
+    self.assertEqual('decorator doc',
+                     tf_decorator.TFDecorator('', test_function,
+                                              'decorator doc').decorator_doc)
+
+  def testInitCapturesNonNoneArgspec(self):
+    argspec = tf_inspect.ArgSpec(
+        args=['a', 'b', 'c'],
+        varargs=None,
+        keywords=None,
+        defaults=(1, 'hello'))
+    self.assertIs(argspec,
+                  tf_decorator.TFDecorator('', test_function, '',
+                                           argspec).decorator_argspec)
+
+  def testInitSetsDecoratorNameToTargetName(self):
+    self.assertEqual('test_function',
+                     tf_decorator.TFDecorator('', test_function).__name__)
+
+  def testInitSetsDecoratorDocToTargetDoc(self):
+    self.assertEqual('Test Function Docstring.',
+                     tf_decorator.TFDecorator('', test_function).__doc__)
+
+  def testCallingATFDecoratorCallsTheTarget(self):
+    self.assertEqual(124, tf_decorator.TFDecorator('', test_function)(123))
+
+  def testCallingADecoratedFunctionCallsTheTarget(self):
+    self.assertEqual((2 + 1) * 2, test_decorated_function(2))
+
+  def testInitializingDecoratedClassWithInitParamsDoesntRaise(self):
+    try:
+      TestDecoratedClass(2)
+    except TypeError:
+      self.assertFail()
+
+  def testReadingClassAttributeOnDecoratedClass(self):
+    self.assertEqual(2, TestDecoratedClass().two_attr)
+
+  def testCallingClassMethodOnDecoratedClass(self):
+    self.assertEqual(2, TestDecoratedClass().two_func())
+
+  def testReadingClassPropertyOnDecoratedClass(self):
+    self.assertEqual(2, TestDecoratedClass().two_prop)
+
+  def testNameOnBoundProperty(self):
+    self.assertEqual('return_params',
+                     TestDecoratedClass().return_params.__name__)
+
+  def testDocstringOnBoundProperty(self):
+    self.assertEqual('Return parameters.',
+                     TestDecoratedClass().return_params.__doc__)
+
+
+def test_wrapper(*args, **kwargs):
+  return test_function(*args, **kwargs)
+
+
+class TfMakeDecoratorTest(test.TestCase):
+
+  def testAttachesATFDecoratorAttr(self):
+    decorated = tf_decorator.make_decorator(test_function, test_wrapper)
+    decorator = getattr(decorated, '_tf_decorator')
+    self.assertIsInstance(decorator, tf_decorator.TFDecorator)
+
+  def testAttachesWrappedAttr(self):
+    decorated = tf_decorator.make_decorator(test_function, test_wrapper)
+    wrapped_attr = getattr(decorated, '__wrapped__')
+    self.assertIs(test_function, wrapped_attr)
+
+  def testSetsTFDecoratorNameToDecoratorNameArg(self):
+    decorated = tf_decorator.make_decorator(test_function, test_wrapper,
+                                            'test decorator name')
+    decorator = getattr(decorated, '_tf_decorator')
+    self.assertEqual('test decorator name', decorator.decorator_name)
+
+  def testSetsTFDecoratorDocToDecoratorDocArg(self):
+    decorated = tf_decorator.make_decorator(
+        test_function, test_wrapper, decorator_doc='test decorator doc')
+    decorator = getattr(decorated, '_tf_decorator')
+    self.assertEqual('test decorator doc', decorator.decorator_doc)
+
+  def testSetsTFDecoratorArgSpec(self):
+    argspec = tf_inspect.ArgSpec(
+        args=['a', 'b', 'c'],
+        varargs=None,
+        keywords=None,
+        defaults=(1, 'hello'))
+    decorated = tf_decorator.make_decorator(test_function, test_wrapper, '', '',
+                                            argspec)
+    decorator = getattr(decorated, '_tf_decorator')
+    self.assertEqual(argspec, decorator.decorator_argspec)
+
+  def testSetsDecoratorNameToFunctionThatCallsMakeDecoratorIfAbsent(self):
+
+    def test_decorator_name(wrapper):
+      return tf_decorator.make_decorator(test_function, wrapper)
+
+    decorated = test_decorator_name(test_wrapper)
+    decorator = getattr(decorated, '_tf_decorator')
+    self.assertEqual('test_decorator_name', decorator.decorator_name)
+
+
+class TfDecoratorUnwrapTest(test.TestCase):
+
+  def testUnwrapReturnsEmptyArrayForUndecoratedFunction(self):
+    decorators, _ = tf_decorator.unwrap(test_function)
+    self.assertEqual(0, len(decorators))
+
+  def testUnwrapReturnsUndecoratedFunctionAsTarget(self):
+    _, target = tf_decorator.unwrap(test_function)
+    self.assertIs(test_function, target)
+
+  def testUnwrapReturnsFinalFunctionAsTarget(self):
+    self.assertEqual((4 + 1) * 2, test_decorated_function(4))
+    _, target = tf_decorator.unwrap(test_decorated_function)
+    self.assertTrue(tf_inspect.isfunction(target))
+    self.assertEqual(4 * 2, target(4))
+
+  def testUnwrapReturnsListOfUniqueTFDecorators(self):
+    decorators, _ = tf_decorator.unwrap(test_decorated_function)
+    self.assertEqual(3, len(decorators))
+    self.assertTrue(isinstance(decorators[0], tf_decorator.TFDecorator))
+    self.assertTrue(isinstance(decorators[1], tf_decorator.TFDecorator))
+    self.assertTrue(isinstance(decorators[2], tf_decorator.TFDecorator))
+    self.assertIsNot(decorators[0], decorators[1])
+    self.assertIsNot(decorators[1], decorators[2])
+    self.assertIsNot(decorators[2], decorators[0])
+
+  def testUnwrapReturnsDecoratorListFromOutermostToInnermost(self):
+    decorators, _ = tf_decorator.unwrap(test_decorated_function)
+    self.assertEqual('decorator 1', decorators[0].decorator_name)
+    self.assertEqual('test_decorator_increment_first_int_arg',
+                     decorators[1].decorator_name)
+    self.assertEqual('decorator 3', decorators[2].decorator_name)
+    self.assertEqual('decorator 3 documentation', decorators[2].decorator_doc)
+
+  def testUnwrapBoundMethods(self):
+    test_decorated_class = TestDecoratedClass()
+    self.assertEqual([2, 2, 3], test_decorated_class.return_params(1, 2, 3))
+    decorators, target = tf_decorator.unwrap(test_decorated_class.return_params)
+    self.assertEqual('test_decorator_increment_first_int_arg',
+                     decorators[0].decorator_name)
+    self.assertEqual([1, 2, 3], target(test_decorated_class, 1, 2, 3))
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/util/tf_inspect.py b/tensorflow/python/util/tf_inspect.py
new file mode 100644
index 0000000000..977b0df08b
--- /dev/null
+++ b/tensorflow/python/util/tf_inspect.py
@@ -0,0 +1,141 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""TFDecorator-aware replacements for the inspect module."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import inspect as _inspect
+
+from tensorflow.python.util import tf_decorator
+
+ArgSpec = _inspect.ArgSpec
+
+
+def currentframe():
+  """TFDecorator-aware replacement for inspect.currentframe."""
+  return _inspect.stack()[1][0]
+
+
+def getargspec(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.getargspec.
+
+  Args:
+    object: A callable, possibly decorated.
+
+  Returns:
+    The `ArgSpec` that describes the signature of the outermost decorator that
+    changes the callable's signature. If the callable is not decorated,
+    `inspect.getargspec()` will be called directly on the callable.
+  """
+  decorators, target = tf_decorator.unwrap(object)
+  return next((d.decorator_argspec for d in decorators
+               if d.decorator_argspec is not None), _inspect.getargspec(target))
+
+
+def getcallargs(func, *positional, **named):
+  """TFDecorator-aware replacement for inspect.getcallargs.
+
+  Args:
+    func: A callable, possibly decorated
+    *positional: The positional arguments that would be passed to `func`.
+    **named: The named argument dictionary that would be passed to `func`.
+
+  Returns:
+    A dictionary mapping `func`'s named arguments to the values they would
+    receive if `func(*positional, **named)` were called.
+
+  `getcallargs` will use the argspec from the outermost decorator that provides
+  it. If no attached decorators modify argspec, the final unwrapped target's
+  argspec will be used.
+  """
+  argspec = getargspec(func)
+  call_args = named.copy()
+  this = getattr(func, 'im_self', None) or getattr(func, '__self__', None)
+  if ismethod(func) and this:
+    positional = (this,) + positional
+  remaining_positionals = [arg for arg in argspec.args if arg not in call_args]
+  call_args.update(dict(zip(remaining_positionals, positional)))
+  default_count = 0 if not argspec.defaults else len(argspec.defaults)
+  if default_count:
+    for arg, value in zip(argspec.args[-default_count:], argspec.defaults):
+      if arg not in call_args:
+        call_args[arg] = value
+  return call_args
+
+
+def getdoc(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.getdoc.
+
+  Args:
+    object: An object, possibly decorated.
+
+  Returns:
+    The docstring associated with the object.
+
+  The outermost-decorated object is intended to have the most complete
+  documentation, so the decorated parameter is not unwrapped.
+  """
+  return _inspect.getdoc(object)
+
+
+def getfile(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.getfile."""
+  return _inspect.getfile(tf_decorator.unwrap(object)[1])
+
+
+def getmembers(object, predicate=None):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.getmembers."""
+  return _inspect.getmembers(object, predicate)
+
+
+def getmro(cls):
+  """TFDecorator-aware replacement for inspect.getmro."""
+  return _inspect.getmro(cls)
+
+
+def getsource(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.getsource."""
+  return _inspect.getsource(tf_decorator.unwrap(object)[1])
+
+
+def isclass(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.isclass."""
+  return _inspect.isclass(tf_decorator.unwrap(object)[1])
+
+
+def isfunction(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.isfunction."""
+  return _inspect.isfunction(tf_decorator.unwrap(object)[1])
+
+
+def ismethod(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.ismethod."""
+  return _inspect.ismethod(tf_decorator.unwrap(object)[1])
+
+
+def ismodule(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.ismodule."""
+  return _inspect.ismodule(tf_decorator.unwrap(object)[1])
+
+
+def isroutine(object):  # pylint: disable=redefined-builtin
+  """TFDecorator-aware replacement for inspect.isroutine."""
+  return _inspect.isroutine(tf_decorator.unwrap(object)[1])
+
+
+def stack(context=1):
+  """TFDecorator-aware replacement for inspect.stack."""
+  return _inspect.stack(context)[1:]
diff --git a/tensorflow/python/util/tf_inspect_test.py b/tensorflow/python/util/tf_inspect_test.py
new file mode 100644
index 0000000000..a9e8ffb30c
--- /dev/null
+++ b/tensorflow/python/util/tf_inspect_test.py
@@ -0,0 +1,327 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Unit tests for tf_inspect."""
+
+# pylint: disable=unused-import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import inspect
+
+from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
+
+
+def test_decorator(decorator_name, decorator_doc=None):
+
+  def make_tf_decorator(target):
+    return tf_decorator.TFDecorator(decorator_name, target, decorator_doc)
+
+  return make_tf_decorator
+
+
+def test_undecorated_function():
+  pass
+
+
+@test_decorator('decorator 1')
+@test_decorator('decorator 2')
+@test_decorator('decorator 3')
+def test_decorated_function(x):
+  """Test Decorated Function Docstring."""
+  return x * 2
+
+
+@test_decorator('decorator')
+def test_decorated_function_with_defaults(a, b=2, c='Hello'):
+  """Test Decorated Function With Defaults Docstring."""
+  return [a, b, c]
+
+
+@test_decorator('decorator')
+class TestDecoratedClass(object):
+  """Test Decorated Class."""
+
+  def __init__(self):
+    pass
+
+  def two(self):
+    return 2
+
+
+class TfInspectTest(test.TestCase):
+
+  def testCurrentFrame(self):
+    self.assertEqual(inspect.currentframe(), tf_inspect.currentframe())
+
+  def testGetArgSpecOnDecoratorsThatDontProvideArgspec(self):
+    argspec = tf_inspect.getargspec(test_decorated_function_with_defaults)
+    self.assertEqual(['a', 'b', 'c'], argspec.args)
+    self.assertEqual((2, 'Hello'), argspec.defaults)
+
+  def testGetArgSpecOnDecoratorThatChangesArgspec(self):
+    argspec = tf_inspect.ArgSpec(
+        args=['a', 'b', 'c'],
+        varargs=None,
+        keywords=None,
+        defaults=(1, 'hello'))
+
+    decorator = tf_decorator.TFDecorator('', test_undecorated_function, '',
+                                         argspec)
+    self.assertEqual(argspec, tf_inspect.getargspec(decorator))
+
+  def testGetArgSpecIgnoresDecoratorsThatDontProvideArgspec(self):
+    argspec = tf_inspect.ArgSpec(
+        args=['a', 'b', 'c'],
+        varargs=None,
+        keywords=None,
+        defaults=(1, 'hello'))
+
+    inner_decorator = tf_decorator.TFDecorator('', test_undecorated_function,
+                                               '', argspec)
+    outer_decorator = tf_decorator.TFDecorator('', inner_decorator)
+    self.assertEqual(argspec, tf_inspect.getargspec(outer_decorator))
+
+  def testGetArgSpecReturnsOutermostDecoratorThatChangesArgspec(self):
+    outer_argspec = tf_inspect.ArgSpec(
+        args=['a'], varargs=None, keywords=None, defaults=None)
+    inner_argspec = tf_inspect.ArgSpec(
+        args=['b'], varargs=None, keywords=None, defaults=None)
+
+    inner_decorator = tf_decorator.TFDecorator('', test_undecorated_function,
+                                               '', inner_argspec)
+    outer_decorator = tf_decorator.TFDecorator('', inner_decorator, '',
+                                               outer_argspec)
+    self.assertEqual(outer_argspec, tf_inspect.getargspec(outer_decorator))
+
+  def testGetDoc(self):
+    self.assertEqual('Test Decorated Function With Defaults Docstring.',
+                     tf_inspect.getdoc(test_decorated_function_with_defaults))
+
+  def testGetFile(self):
+    self.assertTrue('tf_inspect_test.py' in tf_inspect.getfile(
+        test_decorated_function_with_defaults))
+    self.assertTrue('tf_decorator.py' in tf_inspect.getfile(
+        test_decorator('decorator')(tf_decorator.unwrap)))
+
+  def testGetMembers(self):
+    self.assertEqual(
+        inspect.getmembers(TestDecoratedClass),
+        tf_inspect.getmembers(TestDecoratedClass))
+
+  def testGetSource(self):
+    expected = '''@test_decorator('decorator')
+def test_decorated_function_with_defaults(a, b=2, c='Hello'):
+  """Test Decorated Function With Defaults Docstring."""
+  return [a, b, c]
+'''
+    self.assertEqual(
+        expected, tf_inspect.getsource(test_decorated_function_with_defaults))
+
+  def testIsClass(self):
+    self.assertTrue(tf_inspect.isclass(TestDecoratedClass))
+    self.assertFalse(tf_inspect.isclass(test_decorated_function))
+
+  def testIsFunction(self):
+    self.assertTrue(tf_inspect.isfunction(test_decorated_function))
+    self.assertFalse(tf_inspect.isfunction(TestDecoratedClass))
+
+  def testIsMethod(self):
+    self.assertTrue(tf_inspect.ismethod(TestDecoratedClass().two))
+    self.assertFalse(tf_inspect.ismethod(test_decorated_function))
+
+  def testIsModule(self):
+    self.assertTrue(
+        tf_inspect.ismodule(inspect.getmodule(inspect.currentframe())))
+    self.assertFalse(tf_inspect.ismodule(test_decorated_function))
+
+  def testIsRoutine(self):
+    self.assertTrue(tf_inspect.isroutine(len))
+    self.assertFalse(tf_inspect.isroutine(TestDecoratedClass))
+
+  def testStack(self):
+    expected_stack = inspect.stack()
+    actual_stack = tf_inspect.stack()
+    self.assertEqual(len(expected_stack), len(actual_stack))
+    self.assertEqual(expected_stack[0][0], actual_stack[0][0])  # Frame object
+    self.assertEqual(expected_stack[0][1], actual_stack[0][1])  # Filename
+    self.assertEqual(expected_stack[0][2],
+                     actual_stack[0][2] - 1)  # Line number
+    self.assertEqual(expected_stack[0][3], actual_stack[0][3])  # Function name
+    self.assertEqual(expected_stack[1:], actual_stack[1:])
+
+
+class TfInspectGetCallArgsTest(test.TestCase):
+
+  def testReturnsEmptyWhenUnboundFuncHasNoParameters(self):
+
+    def empty():
+      pass
+
+    self.assertEqual({}, tf_inspect.getcallargs(empty))
+
+  def testUnboundFuncWithOneParamPositional(self):
+
+    def func(a):
+      return a
+
+    self.assertEqual({'a': 5}, tf_inspect.getcallargs(func, 5))
+
+  def testUnboundFuncWithTwoParamsPositional(self):
+
+    def func(a, b):
+      return (a, b)
+
+    self.assertEqual({'a': 10, 'b': 20}, tf_inspect.getcallargs(func, 10, 20))
+
+  def testUnboundFuncWithOneParamKeyword(self):
+
+    def func(a):
+      return a
+
+    self.assertEqual({'a': 5}, tf_inspect.getcallargs(func, a=5))
+
+  def testUnboundFuncWithTwoParamsKeyword(self):
+
+    def func(a, b):
+      return (a, b)
+
+    self.assertEqual({'a': 6, 'b': 7}, tf_inspect.getcallargs(func, a=6, b=7))
+
+  def testUnboundFuncWithOneParamDefault(self):
+
+    def func(a=13):
+      return a
+
+    self.assertEqual({'a': 13}, tf_inspect.getcallargs(func))
+
+  def testUnboundFuncWithOneParamDefaultOnePositional(self):
+
+    def func(a=0):
+      return a
+
+    self.assertEqual({'a': 1}, tf_inspect.getcallargs(func, 1))
+
+  def testUnboundFuncWithTwoParamsDefaultOnePositional(self):
+
+    def func(a=1, b=2):
+      return (a, b)
+
+    self.assertEqual({'a': 5, 'b': 2}, tf_inspect.getcallargs(func, 5))
+
+  def testUnboundFuncWithTwoParamsDefaultTwoPositional(self):
+
+    def func(a=1, b=2):
+      return (a, b)
+
+    self.assertEqual({'a': 3, 'b': 4}, tf_inspect.getcallargs(func, 3, 4))
+
+  def testUnboundFuncWithOneParamDefaultOneKeyword(self):
+
+    def func(a=1):
+      return a
+
+    self.assertEqual({'a': 3}, tf_inspect.getcallargs(func, a=3))
+
+  def testUnboundFuncWithTwoParamsDefaultOneKeywordFirst(self):
+
+    def func(a=1, b=2):
+      return (a, b)
+
+    self.assertEqual({'a': 3, 'b': 2}, tf_inspect.getcallargs(func, a=3))
+
+  def testUnboundFuncWithTwoParamsDefaultOneKeywordSecond(self):
+
+    def func(a=1, b=2):
+      return (a, b)
+
+    self.assertEqual({'a': 1, 'b': 4}, tf_inspect.getcallargs(func, b=4))
+
+  def testUnboundFuncWithTwoParamsDefaultTwoKeywords(self):
+
+    def func(a=1, b=2):
+      return (a, b)
+
+    self.assertEqual({'a': 3, 'b': 4}, tf_inspect.getcallargs(func, a=3, b=4))
+
+  def testBoundFuncWithOneParam(self):
+
+    class Test(object):
+
+      def bound(self):
+        pass
+
+    t = Test()
+    self.assertEqual({'self': t}, tf_inspect.getcallargs(t.bound))
+
+  def testBoundFuncWithManyParamsAndDefaults(self):
+
+    class Test(object):
+
+      def bound(self, a, b=2, c='Hello'):
+        return (a, b, c)
+
+    t = Test()
+    self.assertEqual({
+        'self': t,
+        'a': 3,
+        'b': 2,
+        'c': 'Goodbye'
+    }, tf_inspect.getcallargs(t.bound, 3, c='Goodbye'))
+
+  def testClassMethod(self):
+
+    class Test(object):
+
+      @classmethod
+      def test(cls, a, b=3, c='hello'):
+        return (a, b, c)
+
+    self.assertEqual({
+        'cls': Test,
+        'a': 5,
+        'b': 3,
+        'c': 'goodbye'
+    }, tf_inspect.getcallargs(Test.test, 5, c='goodbye'))
+
+  def testUsesOutermostDecoratorsArgSpec(self):
+
+    def func():
+      pass
+
+    def wrapper(*args, **kwargs):
+      return func(*args, **kwargs)
+
+    decorated = tf_decorator.make_decorator(
+        func,
+        wrapper,
+        decorator_argspec=tf_inspect.ArgSpec(
+            args=['a', 'b', 'c'],
+            varargs=None,
+            keywords=None,
+            defaults=(3, 'hello')))
+
+    self.assertEqual({
+        'a': 4,
+        'b': 3,
+        'c': 'goodbye'
+    }, tf_inspect.getcallargs(decorated, 4, c='goodbye'))
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
index 9c70782b12..4460de57aa 100644
--- a/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-graph.pbtxt
@@ -52,11 +52,11 @@ tf_class {
   }
   member_method {
     name: "colocate_with"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'self\', \'op\', \'ignore_existing\'], varargs=None, keywords=None, defaults=[\'False\'], "
   }
   member_method {
     name: "container"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'self\', \'container_name\'], varargs=None, keywords=None, defaults=None"
   }
   member_method {
     name: "control_dependencies"
@@ -68,7 +68,7 @@ tf_class {
   }
   member_method {
     name: "device"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'self\', \'device_name_or_function\'], varargs=None, keywords=None, defaults=None"
   }
   member_method {
     name: "finalize"
@@ -104,7 +104,7 @@ tf_class {
   }
   member_method {
     name: "gradient_override_map"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'self\', \'op_type_map\'], varargs=None, keywords=None, defaults=None"
   }
   member_method {
     name: "is_feedable"
@@ -116,7 +116,7 @@ tf_class {
   }
   member_method {
     name: "name_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'self\', \'name\'], varargs=None, keywords=None, defaults=None"
   }
   member_method {
     name: "prevent_feeding"
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
index 4c0a0b2ea0..eecfaffd0a 100644
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-fast-g-file.pbtxt
@@ -41,7 +41,7 @@ tf_class {
   }
   member_method {
     name: "seek"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
   }
   member_method {
     name: "size"
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
index 85d81c4fcb..305251059d 100644
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-g-file.pbtxt
@@ -41,7 +41,7 @@ tf_class {
   }
   member_method {
     name: "seek"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
   }
   member_method {
     name: "size"
diff --git a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
index 13f9c203e8..6e8894180a 100644
--- a/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.gfile.-open.pbtxt
@@ -41,7 +41,7 @@ tf_class {
   }
   member_method {
     name: "seek"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[\'self\', \'offset\', \'whence\', \'position\'], varargs=None, keywords=None, defaults=[\'None\', \'0\', \'None\'], "
   }
   member_method {
     name: "size"
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index 92ded90834..b0e0924093 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -518,7 +518,7 @@ tf_module {
   }
   member_method {
     name: "all_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
   }
   member_method {
     name: "arg_max"
@@ -1074,19 +1074,19 @@ tf_module {
   }
   member_method {
     name: "initialize_all_tables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[\'name\'], varargs=None, keywords=None, defaults=[\'init_all_tables\'], "
   }
   member_method {
     name: "initialize_all_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
   }
   member_method {
     name: "initialize_local_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[], varargs=None, keywords=None, defaults=None"
   }
   member_method {
     name: "initialize_variables"
-    argspec: "args=[], varargs=args, keywords=kwargs, defaults=None"
+    argspec: "args=[\'var_list\', \'name\'], varargs=None, keywords=None, defaults=[\'init\'], "
   }
   member_method {
     name: "invert_permutation"
@@ -1278,7 +1278,7 @@ tf_module {
   }
   member_method {
     name: "name_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'name\', \'default_name\', \'values\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
   }
   member_method {
     name: "negative"
@@ -1314,7 +1314,7 @@ tf_module {
   }
   member_method {
     name: "op_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'values\', \'name\', \'default_name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
   member_method {
     name: "pad"
@@ -1902,11 +1902,11 @@ tf_module {
   }
   member_method {
     name: "variable_op_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'values\', \'name_or_scope\', \'default_name\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'reuse\', \'dtype\', \'use_resource\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
   }
   member_method {
     name: "variable_scope"
-    argspec: "args=[], varargs=args, keywords=kwds, defaults=None"
+    argspec: "args=[\'name_or_scope\', \'default_name\', \'values\', \'initializer\', \'regularizer\', \'caching_device\', \'partitioner\', \'custom_getter\', \'reuse\', \'dtype\', \'use_resource\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
   }
   member_method {
     name: "variables_initializer"
diff --git a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
index b4ab9f43f5..34edbf61f5 100644
--- a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
+++ b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py
@@ -19,12 +19,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
-
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import tf_decorator
+from tensorflow.python.util import tf_inspect
 from tensorflow.tools.api.lib import api_objects_pb2
 
-
 # Following object need to be handled individually.
 _CORNER_CASES = {
     '': {'tools': {}},
@@ -47,7 +46,7 @@ def _SanitizedArgSpec(obj):
     string, a string representation of the argspec.
   """
   output_string = ''
-  unsanitized_arg_spec = inspect.getargspec(obj)
+  unsanitized_arg_spec = tf_inspect.getargspec(obj)
 
   for clean_attr in ('args', 'varargs', 'keywords'):
     output_string += '%s=%s, ' % (clean_attr,
@@ -76,7 +75,7 @@ def _SanitizedMRO(obj):
   Based on many parameters like python version, OS, protobuf implementation
   or changes in google core libraries the list of superclasses of a class
   can change. We only return the first non-TF class to be robust to non API
-  affecting changes. The Method Resolution Order returned by inspect.getmro
+  affecting changes. The Method Resolution Order returned by `tf_inspect.getmro`
   is still maintained in the return value.
 
   Args:
@@ -86,7 +85,7 @@ def _SanitizedMRO(obj):
     list of strings, string representation of the class names.
   """
   return_list = []
-  for cls in inspect.getmro(obj):
+  for cls in tf_inspect.getmro(obj):
     str_repr = str(cls)
     return_list.append(str_repr)
     if 'tensorflow' not in str_repr:
@@ -114,8 +113,9 @@ class PythonObjectToProtoVisitor(object):
     # A small helper method to construct members(children) protos.
     def _AddMember(member_name, member_obj, proto):
       """Add the child object to the object being constructed."""
+      _, member_obj = tf_decorator.unwrap(member_obj)
       if member_name == '__init__' or not member_name.startswith('_'):
-        if inspect.isroutine(member_obj):
+        if tf_inspect.isroutine(member_obj):
           new_method = proto.member_method.add()
           new_method.name = member_name
           # If member_obj is a python builtin, there is no way to get its
@@ -132,7 +132,7 @@ class PythonObjectToProtoVisitor(object):
 
     if path not in _CORNER_CASES or parent_corner_cases:
       # Decide if we have a module or a class.
-      if inspect.ismodule(parent):
+      if tf_inspect.ismodule(parent):
         # Create a module object.
         module_obj = api_objects_pb2.TFAPIModule()
         for name, child in children:
@@ -146,7 +146,7 @@ class PythonObjectToProtoVisitor(object):
         # Store the constructed module object.
         self._protos[lib_path] = api_objects_pb2.TFAPIObject(
             path=lib_path, tf_module=module_obj)
-      elif inspect.isclass(parent):
+      elif tf_inspect.isclass(parent):
         # Construct a class.
         class_obj = api_objects_pb2.TFAPIClass()
         class_obj.is_instance.extend(_SanitizedMRO(parent))
diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 44c6f24e56..837f11f690 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -18,9 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import re
 
+from tensorflow.python.util import tf_inspect
+
 
 class PublicAPIVisitor(object):
   """Visitor to use with `traverse` to visit exactly the public TF API."""
@@ -93,7 +94,7 @@ class PublicAPIVisitor(object):
     """Visitor interface, see `traverse` for details."""
 
     # Avoid long waits in cases of pretty unambiguous failure.
-    if inspect.ismodule(parent) and len(path.split('.')) > 10:
+    if tf_inspect.ismodule(parent) and len(path.split('.')) > 10:
       raise RuntimeError('Modules nested too deep:\n%s\n\nThis is likely a '
                          'problem with an accidental public import.' % path)
 
diff --git a/tensorflow/tools/common/traverse.py b/tensorflow/tools/common/traverse.py
index 443838d968..9607f80686 100644
--- a/tensorflow/tools/common/traverse.py
+++ b/tensorflow/tools/common/traverse.py
@@ -18,9 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import sys
 
+from tensorflow.python.util import tf_inspect
 
 __all__ = ['traverse']
 
@@ -29,11 +29,11 @@ def _traverse_internal(root, visit, stack, path):
   """Internal helper for traverse."""
 
   # Only traverse modules and classes
-  if not inspect.isclass(root) and not inspect.ismodule(root):
+  if not tf_inspect.isclass(root) and not tf_inspect.ismodule(root):
     return
 
   try:
-    children = inspect.getmembers(root)
+    children = tf_inspect.getmembers(root)
   except ImportError:
     # On some Python installations, some modules do not support enumerating
     # members (six in particular), leading to import errors.
@@ -43,7 +43,8 @@ def _traverse_internal(root, visit, stack, path):
   visit(path, root, children)
   for name, child in children:
     # Do not descend into built-in modules
-    if inspect.ismodule(child) and child.__name__ in sys.builtin_module_names:
+    if tf_inspect.ismodule(
+        child) and child.__name__ in sys.builtin_module_names:
       continue
 
     # Break cycles
@@ -72,8 +73,8 @@ def traverse(root, visit):
   never descends into built-in modules.
 
   `children`, a list of `(name, object)` pairs are determined by
-  `inspect.getmembers`. To avoid visiting parts of the tree, `children` can be
-  modified in place, using `del` or slice assignment.
+  `tf_inspect.getmembers`. To avoid visiting parts of the tree, `children` can
+  be modified in place, using `del` or slice assignment.
 
   Cycles (determined by reference equality, `is`) stop the traversal. A stack of
   objects is kept to find cycles. Objects forming cycles may appear in
diff --git a/tensorflow/tools/docs/doc_generator_visitor.py b/tensorflow/tools/docs/doc_generator_visitor.py
index 178ac0940e..119305bece 100644
--- a/tensorflow/tools/docs/doc_generator_visitor.py
+++ b/tensorflow/tools/docs/doc_generator_visitor.py
@@ -18,10 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
-
 import six
 
+from tensorflow.python.util import tf_inspect
+
 
 class DocGeneratorVisitor(object):
   """A visitor that generates docs for a python object when __call__ed."""
@@ -133,8 +133,8 @@ class DocGeneratorVisitor(object):
       parent_name: The fully qualified name of a symbol found during traversal.
       parent: The Python object referenced by `parent_name`.
       children: A list of `(name, py_object)` pairs enumerating, in alphabetical
-        order, the children (as determined by `inspect.getmembers`) of `parent`.
-        `name` is the local name of `py_object` in `parent`.
+        order, the children (as determined by `tf_inspect.getmembers`) of
+          `parent`. `name` is the local name of `py_object` in `parent`.
 
     Raises:
       RuntimeError: If this visitor is called with a `parent` that is not a
@@ -144,9 +144,9 @@ class DocGeneratorVisitor(object):
     self._index[parent_name] = parent
     self._tree[parent_name] = []
 
-    if not (inspect.ismodule(parent) or inspect.isclass(parent)):
-      raise RuntimeError('Unexpected type in visitor -- %s: %r' %
-                         (parent_name, parent))
+    if not (tf_inspect.ismodule(parent) or tf_inspect.isclass(parent)):
+      raise RuntimeError('Unexpected type in visitor -- %s: %r' % (parent_name,
+                                                                   parent))
 
     for i, (name, child) in enumerate(list(children)):
       # Don't document __metaclass__
@@ -190,9 +190,8 @@ class DocGeneratorVisitor(object):
       # have no usable docstring and won't be documented automatically.
       if (py_object is not None and
           not isinstance(py_object, six.integer_types + six.string_types +
-                         (six.binary_type, six.text_type, float, complex, bool)
-                        ) and
-          py_object is not ()):
+                         (six.binary_type, six.text_type, float, complex, bool))
+          and py_object is not ()):
         object_id = id(py_object)
         if object_id in reverse_index:
           master_name = reverse_index[object_id]
diff --git a/tensorflow/tools/docs/generate.py b/tensorflow/tools/docs/generate.py
index 1217cd331f..fc93085e3e 100644
--- a/tensorflow/tools/docs/generate.py
+++ b/tensorflow/tools/docs/generate.py
@@ -18,16 +18,15 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import os
 import sys
 
 import tensorflow as tf
 
 from tensorflow.python import debug as tf_debug
+from tensorflow.python.util import tf_inspect
 from tensorflow.tools.docs import generate_lib
 
-
 if __name__ == '__main__':
   doc_generator = generate_lib.DocGenerator()
   doc_generator.add_output_dir_argument()
@@ -38,7 +37,7 @@ if __name__ == '__main__':
   # tensorflow/, we can compute the base directory (two levels up), which is
   # valid unless we're trying to apply this to a different code base, or are
   # moving the script around.
-  script_dir = os.path.dirname(inspect.getfile(inspect.currentframe()))
+  script_dir = os.path.dirname(tf_inspect.getfile(tf_inspect.currentframe()))
   default_base_dir = os.path.join(script_dir, '..', '..')
   doc_generator.add_base_dir_argument(default_base_dir)
 
diff --git a/tensorflow/tools/docs/generate_1_0.py b/tensorflow/tools/docs/generate_1_0.py
index 088f8f58dc..ddafcebd11 100644
--- a/tensorflow/tools/docs/generate_1_0.py
+++ b/tensorflow/tools/docs/generate_1_0.py
@@ -18,16 +18,15 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import inspect
 import os
 import sys
 
 import tensorflow as tf
 
 from tensorflow.python import debug as tf_debug
+from tensorflow.python.util import tf_inspect
 from tensorflow.tools.docs import generate_lib
 
-
 if __name__ == '__main__':
   doc_generator = generate_lib.DocGenerator()
   doc_generator.add_output_dir_argument()
@@ -38,7 +37,7 @@ if __name__ == '__main__':
   # tensorflow/, we can compute the base directory (two levels up), which is
   # valid unless we're trying to apply this to a different code base, or are
   # moving the script around.
-  script_dir = os.path.dirname(inspect.getfile(inspect.currentframe()))
+  script_dir = os.path.dirname(tf_inspect.getfile(tf_inspect.currentframe()))
   default_base_dir = os.path.join(script_dir, '..', '..')
   doc_generator.add_base_dir_argument(default_base_dir)
 
@@ -67,21 +66,14 @@ if __name__ == '__main__':
           'tfprof',
       ],
       'contrib.bayesflow': [
-          'entropy', 'monte_carlo',
-          'special_math', 'stochastic_gradient_estimators',
-          'stochastic_graph', 'stochastic_tensor',
-          'stochastic_variables', 'variational_inference'
+          'entropy', 'monte_carlo', 'special_math',
+          'stochastic_gradient_estimators', 'stochastic_graph',
+          'stochastic_tensor', 'stochastic_variables', 'variational_inference'
       ],
       'contrib.distributions': ['bijector'],
       'contrib.ffmpeg': ['ffmpeg_ops'],
       'contrib.graph_editor': [
-          'edit',
-          'match',
-          'reroute',
-          'subgraph',
-          'transform',
-          'select',
-          'util'
+          'edit', 'match', 'reroute', 'subgraph', 'transform', 'select', 'util'
       ],
       'contrib.layers': ['feature_column', 'summaries'],
       'contrib.learn': [
diff --git a/tensorflow/tools/docs/generate_lib.py b/tensorflow/tools/docs/generate_lib.py
index e30cfa8053..8b53185943 100644
--- a/tensorflow/tools/docs/generate_lib.py
+++ b/tensorflow/tools/docs/generate_lib.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 import argparse
-import inspect
 import os
 
 import six
 
+from tensorflow.python.util import tf_inspect
 from tensorflow.tools.common import public_api
 from tensorflow.tools.common import traverse
 from tensorflow.tools.docs import doc_generator_visitor
@@ -32,18 +32,18 @@ from tensorflow.tools.docs import pretty_docs
 from tensorflow.tools.docs import py_guide_parser
 
 
-def  _is_free_function(py_object, full_name, index):
+def _is_free_function(py_object, full_name, index):
   """Check if input is a free function (and not a class- or static method)."""
-  if not inspect.isfunction(py_object):
+  if not tf_inspect.isfunction(py_object):
     return False
 
-  # Static methods are functions to inspect (in 2.7), so check if the parent
+  # Static methods are functions to tf_inspect (in 2.7), so check if the parent
   # is a class. If there is no parent, it's not a function.
   if '.' not in full_name:
     return False
 
   parent_name = full_name.rsplit('.', 1)[0]
-  if inspect.isclass(index[parent_name]):
+  if tf_inspect.isclass(index[parent_name]):
     return False
 
   return True
@@ -87,7 +87,7 @@ def write_docs(output_dir, parser_config, yaml_toc):
       continue
 
     # Methods and some routines are documented only as part of their class.
-    if not (inspect.ismodule(py_object) or inspect.isclass(py_object) or
+    if not (tf_inspect.ismodule(py_object) or tf_inspect.isclass(py_object) or
             _is_free_function(py_object, full_name, parser_config.index)):
       continue
 
@@ -99,7 +99,7 @@ def write_docs(output_dir, parser_config, yaml_toc):
     symbol_to_file[full_name] = sitepath
 
     # For a module, remember the module for the table-of-contents
-    if inspect.ismodule(py_object):
+    if tf_inspect.ismodule(py_object):
       if full_name in parser_config.tree:
         module_children.setdefault(full_name, [])
 
@@ -109,7 +109,7 @@ def write_docs(output_dir, parser_config, yaml_toc):
       subname = str(full_name)
       while True:
         subname = subname[:subname.rindex('.')]
-        if inspect.ismodule(parser_config.index[subname]):
+        if tf_inspect.ismodule(parser_config.index[subname]):
           module_children.setdefault(subname, []).append(full_name)
           break
 
@@ -143,23 +143,23 @@ def write_docs(output_dir, parser_config, yaml_toc):
       f.write('# Automatically generated file; please do not edit\ntoc:\n')
       for module in modules:
         f.write('  - title: ' + module + '\n'
-                '    section:\n' +
-                '    - title: Overview\n' +
-                '      path: /TARGET_DOC_ROOT/VERSION/' +
-                symbol_to_file[module] + '\n')
+                '    section:\n' + '    - title: Overview\n' +
+                '      path: /TARGET_DOC_ROOT/VERSION/' + symbol_to_file[module]
+                + '\n')
 
         symbols_in_module = module_children.get(module, [])
         symbols_in_module.sort(key=lambda a: a.upper())
 
         for full_name in symbols_in_module:
-          f.write('    - title: ' + full_name[len(module)+1:] + '\n'
+          f.write('    - title: ' + full_name[len(module) + 1:] + '\n'
                   '      path: /TARGET_DOC_ROOT/VERSION/' +
                   symbol_to_file[full_name] + '\n')
 
   # Write a global index containing all full names with links.
   with open(os.path.join(output_dir, 'index.md'), 'w') as f:
-    f.write(parser.generate_global_index('TensorFlow', parser_config.index,
-                                         parser_config.reference_resolver))
+    f.write(
+        parser.generate_global_index('TensorFlow', parser_config.index,
+                                     parser_config.reference_resolver))
 
 
 def add_dict_to_dict(add_from, add_to):
@@ -198,13 +198,7 @@ def _get_default_do_not_descend_map():
       ],
       'contrib.ffmpeg': ['ffmpeg_ops'],
       'contrib.graph_editor': [
-          'edit',
-          'match',
-          'reroute',
-          'subgraph',
-          'transform',
-          'select',
-          'util'
+          'edit', 'match', 'reroute', 'subgraph', 'transform', 'select', 'util'
       ],
       'contrib.keras': ['api', 'python'],
       'contrib.layers': ['feature_column', 'summaries'],
@@ -266,7 +260,8 @@ def build_doc_index(src_dir):
   for dirpath, _, filenames in os.walk(src_dir):
     suffix = os.path.relpath(path=dirpath, start=src_dir)
     for base_name in filenames:
-      if not base_name.endswith('.md'): continue
+      if not base_name.endswith('.md'):
+        continue
       title_parser = _GetMarkdownTitle()
       title_parser.process(os.path.join(dirpath, base_name))
       key_parts = os.path.join(suffix, base_name[:-3]).split('/')
@@ -283,8 +278,8 @@ def build_doc_index(src_dir):
 class _GuideRef(object):
 
   def __init__(self, base_name, title, section_title, section_tag):
-    self.url = 'api_guides/python/' + (
-        ('%s#%s' % (base_name, section_tag)) if section_tag else base_name)
+    self.url = 'api_guides/python/' + (('%s#%s' % (base_name, section_tag))
+                                       if section_tag else base_name)
     self.link_text = (('%s > %s' % (title, section_title))
                       if section_title else title)
 
@@ -320,8 +315,9 @@ class _GenerateGuideIndex(py_guide_parser.PyGuideParser):
     """Index @{symbol} references as in the current file & section."""
     for match in parser.SYMBOL_REFERENCE_RE.finditer(line):
       val = self.index.get(match.group(1), [])
-      val.append(_GuideRef(
-          self.base_name, self.title, self.section_title, self.section_tag))
+      val.append(
+          _GuideRef(self.base_name, self.title, self.section_title,
+                    self.section_tag))
       self.index[match.group(1)] = val
 
 
@@ -383,8 +379,8 @@ def _other_docs(src_dir, output_dir, reference_resolver):
         print('Processing doc %s...' % suffix)
         md_string = open(full_in_path).read()
 
-      output = reference_resolver.replace_references(
-          md_string, relative_path_to_root)
+      output = reference_resolver.replace_references(md_string,
+                                                     relative_path_to_root)
       with open(full_out_path, 'w') as f:
         f.write(header + output)
 
@@ -406,8 +402,7 @@ class DocGenerator(object):
         type=str,
         default=None,
         required=True,
-        help='Directory to write docs to.'
-    )
+        help='Directory to write docs to.')
 
   def add_src_dir_argument(self):
     self.argument_parser.add_argument(
@@ -415,16 +410,14 @@ class DocGenerator(object):
         type=str,
         default=None,
         required=True,
-        help='Directory with the source docs.'
-    )
+        help='Directory with the source docs.')
 
   def add_base_dir_argument(self, default_base_dir):
     self.argument_parser.add_argument(
         '--base_dir',
         type=str,
         default=default_base_dir,
-        help='Base directory to to strip from file names referenced in docs.'
-    )
+        help='Base directory to to strip from file names referenced in docs.')
 
   def parse_known_args(self):
     flags, _ = self.argument_parser.parse_known_args()
diff --git a/tensorflow/tools/docs/parser.py b/tensorflow/tools/docs/parser.py
index 3da58d2b3c..526ffe93cd 100644
--- a/tensorflow/tools/docs/parser.py
+++ b/tensorflow/tools/docs/parser.py
@@ -21,7 +21,6 @@ from __future__ import print_function
 import ast
 import collections
 import functools
-import inspect
 import json
 import os
 import re
@@ -30,6 +29,8 @@ import codegen
 import six
 
 from google.protobuf.message import Message as ProtoMessage
+from tensorflow.python.util import tf_inspect
+
 
 # A regular expression capturing a python indentifier.
 IDENTIFIER_RE = '[a-zA-Z_][a-zA-Z0-9_]*'
@@ -71,12 +72,12 @@ def _get_raw_docstring(py_object):
   Returns:
     The docstring, or the empty string if no docstring was found.
   """
-  # For object instances, inspect.getdoc does give us the docstring of their
+  # For object instances, tf_inspect.getdoc does give us the docstring of their
   # type, which is not what we want. Only return the docstring if it is useful.
-  if (inspect.isclass(py_object) or inspect.ismethod(py_object) or
-      inspect.isfunction(py_object) or inspect.ismodule(py_object) or
+  if (tf_inspect.isclass(py_object) or tf_inspect.ismethod(py_object) or
+      tf_inspect.isfunction(py_object) or tf_inspect.ismodule(py_object) or
       isinstance(py_object, property)):
-    return inspect.getdoc(py_object) or ''
+    return tf_inspect.getdoc(py_object) or ''
   else:
     return ''
 
@@ -119,12 +120,12 @@ class ReferenceResolver(object):
       an instance of `ReferenceResolver` ()
     """
     is_class = {
-        name: inspect.isclass(visitor.index[name])
+        name: tf_inspect.isclass(visitor.index[name])
         for name, obj in visitor.index.items()
     }
 
     is_module = {
-        name: inspect.ismodule(visitor.index[name])
+        name: tf_inspect.ismodule(visitor.index[name])
         for name, obj in visitor.index.items()
     }
 
@@ -530,7 +531,7 @@ def _parse_md_docstring(py_object, relative_path_to_root, reference_resolver):
 def _get_arg_spec(func):
   """Extracts signature information from a function or functools.partial object.
 
-  For functions, uses `inspect.getargspec`. For `functools.partial` objects,
+  For functions, uses `tf_inspect.getargspec`. For `functools.partial` objects,
   corrects the signature of the underlying function to take into account the
   removed arguments.
 
@@ -539,11 +540,11 @@ def _get_arg_spec(func):
 
   Returns:
     An `ArgSpec` namedtuple `(args, varargs, keywords, defaults)`, as returned
-    by `inspect.getargspec`.
+    by `tf_inspect.getargspec`.
   """
   # getargspec does not work for functools.partial objects directly.
   if isinstance(func, functools.partial):
-    argspec = inspect.getargspec(func.func)
+    argspec = tf_inspect.getargspec(func.func)
     # Remove the args from the original function that have been used up.
     first_default_arg = (
         len(argspec.args or []) - len(argspec.defaults or []))
@@ -566,12 +567,12 @@ def _get_arg_spec(func):
           argspec_defaults.pop(i-first_default_arg)
         else:
           first_default_arg -= 1
-    return inspect.ArgSpec(args=argspec_args,
-                           varargs=argspec.varargs,
-                           keywords=argspec.keywords,
-                           defaults=tuple(argspec_defaults))
+    return tf_inspect.ArgSpec(args=argspec_args,
+                              varargs=argspec.varargs,
+                              keywords=argspec.keywords,
+                              defaults=tuple(argspec_defaults))
   else:  # Regular function or method, getargspec will work fine.
-    return inspect.getargspec(func)
+    return tf_inspect.getargspec(func)
 
 
 def _remove_first_line_indent(string):
@@ -583,7 +584,7 @@ def _generate_signature(func, reverse_index):
   """Given a function, returns a list of strings representing its args.
 
   This function produces a list of strings representing the arguments to a
-  python function. It uses inspect.getargspec, which
+  python function. It uses tf_inspect.getargspec, which
   does not generalize well to Python 3.x, which is more flexible in how *args
   and **kwargs are handled. This is not a problem in TF, since we have to remain
   compatible to Python 2.7 anyway.
@@ -603,9 +604,6 @@ def _generate_signature(func, reverse_index):
     code.
   """
 
-  # This produces poor signatures for decorated functions.
-  # TODO(wicke): We need to use something like the decorator module to fix it.
-
   args_list = []
 
   argspec = _get_arg_spec(func)
@@ -624,7 +622,7 @@ def _generate_signature(func, reverse_index):
   # Add all args with defaults.
   if argspec.defaults:
     try:
-      source = _remove_first_line_indent(inspect.getsource(func))
+      source = _remove_first_line_indent(tf_inspect.getsource(func))
       func_ast = ast.parse(source)
       ast_defaults = func_ast.body[0].args.defaults
     except IOError:  # If this is a builtin, getsource fails with IOError
@@ -689,7 +687,7 @@ def _get_guides_markdown(duplicate_names, guide_index, relative_path):
 
 
 def _get_defining_class(py_class, name):
-  for cls in inspect.getmro(py_class):
+  for cls in tf_inspect.getmro(py_class):
     if name in cls.__dict__:
       return cls
   return None
@@ -936,15 +934,15 @@ class _ClassPageInfo(object):
       if isinstance(child, property):
         self._add_property(short_name, child_name, child, child_doc)
 
-      elif inspect.isclass(child):
+      elif tf_inspect.isclass(child):
         if defining_class is None:
           continue
         url = parser_config.reference_resolver.reference_to_url(
             child_name, relative_path)
         self._add_class(short_name, child_name, child, child_doc, url)
 
-      elif (inspect.ismethod(child) or inspect.isfunction(child) or
-            inspect.isroutine(child)):
+      elif (tf_inspect.ismethod(child) or tf_inspect.isfunction(child) or
+            tf_inspect.isroutine(child)):
         if defining_class is None:
           continue
 
@@ -967,7 +965,7 @@ class _ClassPageInfo(object):
           child_signature = _generate_signature(child,
                                                 parser_config.reverse_index)
         except TypeError:
-          # If this is a (dynamically created) slot wrapper, inspect will
+          # If this is a (dynamically created) slot wrapper, tf_inspect will
           # raise typeerror when trying to get to the code. Ignore such
           # functions.
           continue
@@ -1106,13 +1104,13 @@ class _ModulePageInfo(object):
       url = parser_config.reference_resolver.reference_to_url(
           member_full_name, relative_path)
 
-      if inspect.ismodule(member):
+      if tf_inspect.ismodule(member):
         self._add_module(name, member_full_name, member, member_doc, url)
 
-      elif inspect.isclass(member):
+      elif tf_inspect.isclass(member):
         self._add_class(name, member_full_name, member, member_doc, url)
 
-      elif inspect.isfunction(member):
+      elif tf_inspect.isfunction(member):
         self._add_function(name, member_full_name, member, member_doc, url)
 
       else:
@@ -1196,17 +1194,17 @@ def docs_for_object(full_name, py_object, parser_config):
   duplicate_names = parser_config.duplicates.get(master_name, [full_name])
 
   # TODO(wicke): Once other pieces are ready, enable this also for partials.
-  if (inspect.ismethod(py_object) or inspect.isfunction(py_object) or
+  if (tf_inspect.ismethod(py_object) or tf_inspect.isfunction(py_object) or
       # Some methods in classes from extensions come in as routines.
-      inspect.isroutine(py_object)):
+      tf_inspect.isroutine(py_object)):
     page_info = _FunctionPageInfo(master_name)
     page_info.set_signature(py_object, parser_config.reverse_index)
 
-  elif inspect.isclass(py_object):
+  elif tf_inspect.isclass(py_object):
     page_info = _ClassPageInfo(master_name)
     page_info.collect_docs_for_class(py_object, parser_config)
 
-  elif inspect.ismodule(py_object):
+  elif tf_inspect.ismodule(py_object):
     page_info = _ModulePageInfo(master_name)
     page_info.collect_docs_for_module(parser_config)
 
@@ -1341,7 +1339,7 @@ def _get_defined_in(py_object, parser_config):
   # TODO(wicke): Only use decorators that support this in TF.
 
   try:
-    path = os.path.relpath(path=inspect.getfile(py_object),
+    path = os.path.relpath(path=tf_inspect.getfile(py_object),
                            start=parser_config.base_dir)
   except TypeError:  # getfile throws TypeError if py_object is a builtin.
     return _PythonBuiltin()
@@ -1384,15 +1382,15 @@ def generate_global_index(library_name, index, reference_resolver):
   """
   symbol_links = []
   for full_name, py_object in six.iteritems(index):
-    if (inspect.ismodule(py_object) or inspect.isfunction(py_object) or
-        inspect.isclass(py_object)):
+    if (tf_inspect.ismodule(py_object) or tf_inspect.isfunction(py_object) or
+        tf_inspect.isclass(py_object)):
       # In Python 3, unbound methods are functions, so eliminate those.
-      if inspect.isfunction(py_object):
+      if tf_inspect.isfunction(py_object):
         if full_name.count('.') == 0:
           parent_name = ''
         else:
           parent_name = full_name[:full_name.rfind('.')]
-        if parent_name in index and inspect.isclass(index[parent_name]):
+        if parent_name in index and tf_inspect.isclass(index[parent_name]):
           # Skip methods (=functions with class parents).
           continue
       symbol_links.append((
diff --git a/tensorflow/tools/docs/parser_test.py b/tensorflow/tools/docs/parser_test.py
index 2bab6b3de4..3e02160130 100644
--- a/tensorflow/tools/docs/parser_test.py
+++ b/tensorflow/tools/docs/parser_test.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 import functools
-import inspect
 import os
 import sys
 
 from tensorflow.python.platform import googletest
+from tensorflow.python.util import tf_inspect
 from tensorflow.tools.docs import parser
 
 
@@ -152,7 +152,7 @@ class ParserTest(googletest.TestCase):
 
     # Make sure the brief docstring is present
     self.assertEqual(
-        inspect.getdoc(TestClass).split('\n')[0], page_info.doc.brief)
+        tf_inspect.getdoc(TestClass).split('\n')[0], page_info.doc.brief)
 
     # Make sure the method is present
     self.assertEqual(TestClass.a_method, page_info.methods[0].obj)
@@ -204,7 +204,8 @@ class ParserTest(googletest.TestCase):
         full_name='TestModule', py_object=module, parser_config=parser_config)
 
     # Make sure the brief docstring is present
-    self.assertEqual(inspect.getdoc(module).split('\n')[0], page_info.doc.brief)
+    self.assertEqual(tf_inspect.getdoc(module).split('\n')[0],
+                     page_info.doc.brief)
 
     # Make sure that the members are there
     funcs = {f_info.obj for f_info in page_info.functions}
@@ -246,7 +247,7 @@ class ParserTest(googletest.TestCase):
 
     # Make sure the brief docstring is present
     self.assertEqual(
-        inspect.getdoc(test_function).split('\n')[0], page_info.doc.brief)
+        tf_inspect.getdoc(test_function).split('\n')[0], page_info.doc.brief)
 
     # Make sure the extracted signature is good.
     self.assertEqual(['unused_arg', "unused_kwarg='default'"],
@@ -285,7 +286,7 @@ class ParserTest(googletest.TestCase):
 
     # Make sure the brief docstring is present
     self.assertEqual(
-        inspect.getdoc(test_function_with_args_kwargs).split('\n')[0],
+        tf_inspect.getdoc(test_function_with_args_kwargs).split('\n')[0],
         page_info.doc.brief)
 
     # Make sure the extracted signature is good.
@@ -402,41 +403,42 @@ class ParserTest(googletest.TestCase):
 
     # pylint: disable=protected-access
     # Make sure everything works for regular functions.
-    expected = inspect.ArgSpec(['arg1', 'arg2', 'kwarg1', 'kwarg2'], None, None,
-                               (1, 2))
+    expected = tf_inspect.ArgSpec(['arg1', 'arg2', 'kwarg1', 'kwarg2'], None,
+                                  None, (1, 2))
     self.assertEqual(expected, parser._get_arg_spec(test_function_for_partial1))
 
     # Make sure doing nothing works.
-    expected = inspect.ArgSpec(['arg1', 'arg2', 'kwarg1', 'kwarg2'], None, None,
-                               (1, 2))
+    expected = tf_inspect.ArgSpec(['arg1', 'arg2', 'kwarg1', 'kwarg2'], None,
+                                  None, (1, 2))
     partial = functools.partial(test_function_for_partial1)
     self.assertEqual(expected, parser._get_arg_spec(partial))
 
     # Make sure setting args from the front works.
-    expected = inspect.ArgSpec(['arg2', 'kwarg1', 'kwarg2'], None, None, (1, 2))
+    expected = tf_inspect.ArgSpec(['arg2', 'kwarg1', 'kwarg2'], None, None,
+                                  (1, 2))
     partial = functools.partial(test_function_for_partial1, 1)
     self.assertEqual(expected, parser._get_arg_spec(partial))
 
-    expected = inspect.ArgSpec(['kwarg2',], None, None, (2,))
+    expected = tf_inspect.ArgSpec(['kwarg2',], None, None, (2,))
     partial = functools.partial(test_function_for_partial1, 1, 2, 3)
     self.assertEqual(expected, parser._get_arg_spec(partial))
 
     # Make sure setting kwargs works.
-    expected = inspect.ArgSpec(['arg1', 'arg2', 'kwarg2'], None, None, (2,))
+    expected = tf_inspect.ArgSpec(['arg1', 'arg2', 'kwarg2'], None, None, (2,))
     partial = functools.partial(test_function_for_partial1, kwarg1=0)
     self.assertEqual(expected, parser._get_arg_spec(partial))
 
-    expected = inspect.ArgSpec(['arg1', 'arg2', 'kwarg1'], None, None, (1,))
+    expected = tf_inspect.ArgSpec(['arg1', 'arg2', 'kwarg1'], None, None, (1,))
     partial = functools.partial(test_function_for_partial1, kwarg2=0)
     self.assertEqual(expected, parser._get_arg_spec(partial))
 
-    expected = inspect.ArgSpec(['arg1'], None, None, ())
+    expected = tf_inspect.ArgSpec(['arg1'], None, None, ())
     partial = functools.partial(test_function_for_partial1,
                                 arg2=0, kwarg1=0, kwarg2=0)
     self.assertEqual(expected, parser._get_arg_spec(partial))
 
     # Make sure *args, *kwargs is accounted for.
-    expected = inspect.ArgSpec([], 'my_args', 'my_kwargs', ())
+    expected = tf_inspect.ArgSpec([], 'my_args', 'my_kwargs', ())
     partial = functools.partial(test_function_for_partial2, 0, 1)
     self.assertEqual(expected, parser._get_arg_spec(partial))
 
-- 
GitLab


From 7ee26f7e144849d07e985b0a1c8abf7bf36adb27 Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Fri, 21 Apr 2017 12:07:16 -0800
Subject: [PATCH 0620/1563] Fix some ClangTidy warnings in
 third_party/tensorflow/core/common_runtime. Change: 153861629

---
 tensorflow/core/common_runtime/constant_folding.cc | 2 +-
 tensorflow/core/common_runtime/copy_tensor.cc      | 3 ++-
 tensorflow/core/common_runtime/executor.cc         | 4 ++--
 tensorflow/core/common_runtime/function.cc         | 6 +++---
 tensorflow/core/common_runtime/function_test.cc    | 5 +++--
 tensorflow/core/common_runtime/rendezvous_mgr.cc   | 5 +++--
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/tensorflow/core/common_runtime/constant_folding.cc b/tensorflow/core/common_runtime/constant_folding.cc
index 8c4085425a..3cd29c8e86 100644
--- a/tensorflow/core/common_runtime/constant_folding.cc
+++ b/tensorflow/core/common_runtime/constant_folding.cc
@@ -43,7 +43,7 @@ namespace tensorflow {
 namespace {
 
 bool IsConstantFoldable(const Node* n,
-                        std::function<bool(const Node*)> consider) {
+                        const std::function<bool(const Node*)>& consider) {
   if (n->op_def().is_stateful()) {
     return false;
   }
diff --git a/tensorflow/core/common_runtime/copy_tensor.cc b/tensorflow/core/common_runtime/copy_tensor.cc
index b25131b07b..ffd37faca4 100644
--- a/tensorflow/core/common_runtime/copy_tensor.cc
+++ b/tensorflow/core/common_runtime/copy_tensor.cc
@@ -71,7 +71,8 @@ void CopyTensor::ViaDMA(StringPiece edge_name, DeviceContext* send_dev_context,
       if (ri.sender_device_type == src_device_type &&
           ri.receiver_device_type == dst_device_type) {
         ri.copy_function(send_dev_context, recv_dev_context, src, dst,
-                         src_alloc_attr, dst_alloc_attr, input, output, done);
+                         src_alloc_attr, dst_alloc_attr, input, output,
+                         std::move(done));
         return;
       }
     }
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc
index 561e185ac4..ed5b87f2f2 100644
--- a/tensorflow/core/common_runtime/executor.cc
+++ b/tensorflow/core/common_runtime/executor.cc
@@ -1434,7 +1434,7 @@ void ExecutorState::RunAsync(Executor::DoneCallback done) {
   } else {
     num_outstanding_ops_ = ready.size();
     root_frame_->iterations[0]->outstanding_ops = ready.size();
-    done_cb_ = done;
+    done_cb_ = std::move(done);
     // Schedule to run all the ready ops in thread pool.
     ScheduleReady(ready, nullptr);
   }
@@ -2560,7 +2560,7 @@ bool ExecutorState::FrameState::CleanupIterations(const GraphView* gview,
 }
 
 void ExecutorImpl::RunAsync(const Args& args, DoneCallback done) {
-  (new ExecutorState(args, this))->RunAsync(done);
+  (new ExecutorState(args, this))->RunAsync(std::move(done));
 }
 
 }  // end namespace
diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 5f011c2ce9..0f2e24690f 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -604,7 +604,7 @@ struct CustomCreatorSingleton {
 
   void Set(CustomKernelCreator cb) {
     mutex_lock l(mu);
-    custom_creator = cb;
+    custom_creator = std::move(cb);
   }
 
   CustomKernelCreator Get() {
@@ -621,7 +621,7 @@ CustomCreatorSingleton* GetCustomCreatorSingleton() {
 }  // end namespace
 
 void RegisterDefaultCustomKernelCreator(CustomKernelCreator cb) {
-  GetCustomCreatorSingleton()->Set(cb);
+  GetCustomCreatorSingleton()->Set(std::move(cb));
 }
 
 FunctionLibraryRuntime* NewFunctionLibraryRuntime(
@@ -631,7 +631,7 @@ FunctionLibraryRuntime* NewFunctionLibraryRuntime(
     CustomKernelCreator custom_kernel_creator) {
   return new FunctionLibraryRuntimeImpl(dmgr, env, device, graph_def_version,
                                         lib_def, optimizer_options,
-                                        custom_kernel_creator);
+                                        std::move(custom_kernel_creator));
 }
 
 FunctionLibraryRuntime* NewFunctionLibraryRuntime(
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index 29ce157349..bbf35590eb 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -44,7 +44,7 @@ Status GetOpSig(const string& op, const OpDef** sig) {
 void FunctionTestSchedClosure(std::function<void()> fn) {
   static thread::ThreadPool* w =
       new thread::ThreadPool(Env::Default(), "Test", 8);
-  w->Schedule(fn);
+  w->Schedule(std::move(fn));
 }
 
 void HasError(const Status& s, const string& substr) {
@@ -654,7 +654,8 @@ namespace {
 
 bool DoNothing(Graph* g) { return false; }
 
-string Optimize(std::function<bool(Graph* g)> pass, const FunctionDef& fdef) {
+string Optimize(const std::function<bool(Graph* g)>& pass,
+                const FunctionDef& fdef) {
   InstantiationResult result;
   InstantiateAttrValueMap empty;
   TF_CHECK_OK(InstantiateFunction(fdef, empty, GetOpSig, &result));
diff --git a/tensorflow/core/common_runtime/rendezvous_mgr.cc b/tensorflow/core/common_runtime/rendezvous_mgr.cc
index 285ac7540c..2a2b10c0cf 100644
--- a/tensorflow/core/common_runtime/rendezvous_mgr.cc
+++ b/tensorflow/core/common_runtime/rendezvous_mgr.cc
@@ -106,7 +106,7 @@ void IntraProcessRendezvous::SameWorkerRecvDone(
   CopyTensor::ViaDMA(parsed.edge_name, send_args.device_context,
                      recv_args.device_context, src_device, dst_device,
                      send_args.alloc_attrs, recv_args.alloc_attrs, &in, out,
-                     done);
+                     std::move(done));
 }
 
 void IntraProcessRendezvous::RecvAsync(const ParsedKey& parsed,
@@ -132,7 +132,8 @@ void IntraProcessRendezvous::RecvAsync(const ParsedKey& parsed,
     };
 
     if (status.ok() && in.IsInitialized()) {
-      SameWorkerRecvDone(parsed, send_args, recv_args, in, out, final_callback);
+      SameWorkerRecvDone(parsed, send_args, recv_args, in, out,
+                         std::move(final_callback));
     } else {
       final_callback(status);
     }
-- 
GitLab


From 8baa229f4f46696c87bfb6f6105a886b3e334c29 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 12:07:41 -0800
Subject: [PATCH 0621/1563] [XLA] Remove unused parameter in copy insertion
 pass. Change: 153861680

---
 tensorflow/compiler/xla/service/copy_insertion.cc | 2 +-
 tensorflow/compiler/xla/service/copy_insertion.h  | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/tensorflow/compiler/xla/service/copy_insertion.cc b/tensorflow/compiler/xla/service/copy_insertion.cc
index 7dae49acad..81f54c26ec 100644
--- a/tensorflow/compiler/xla/service/copy_insertion.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion.cc
@@ -409,7 +409,7 @@ StatusOr<bool> CopyInsertion::Run(HloModule* module) {
       // operand copy insertion above (which will share an allocation).
       TF_RETURN_IF_ERROR(root_copier.RecordIndicesToCopyForColocatingBuffers(
           liveness.get(), computation->parameter_instruction(0)));
-    } else if (copy_param_and_const_) {
+    } else {
       // Record root indices to copy for general computations.
       TF_RETURN_IF_ERROR(root_copier.RecordIndicesWhichPointToParamOrConstant(
           liveness->points_to_analysis()));
diff --git a/tensorflow/compiler/xla/service/copy_insertion.h b/tensorflow/compiler/xla/service/copy_insertion.h
index ce91ac0de5..c20e04b628 100644
--- a/tensorflow/compiler/xla/service/copy_insertion.h
+++ b/tensorflow/compiler/xla/service/copy_insertion.h
@@ -32,9 +32,6 @@ namespace xla {
 // different lifetimes than computation results.
 class CopyInsertion : public HloPassInterface {
  public:
-  explicit CopyInsertion(bool copy_param_and_const = true)
-      : copy_param_and_const_(copy_param_and_const) {}
-  ~CopyInsertion() override {}
   tensorflow::StringPiece name() const override { return "copy-insertion"; }
 
   // Run the pass on the given module. Returns whether the module was changed
@@ -46,10 +43,6 @@ class CopyInsertion : public HloPassInterface {
   // duplicate copies.
   StatusOr<HloInstruction*> FindOrInsertCopy(HloInstruction* hlo);
 
-  // Determines whether to insert copies if the root instruction is, or
-  // points-to, any constant or parameter instruction.
-  const bool copy_param_and_const_;
-
   // A map containing all copies inserted during the copy insertion pass. The
   // key is the copied instruction and the value is the copy.
   std::unordered_map<HloInstruction*, HloInstruction*> inserted_copies_;
-- 
GitLab


From 54cda0a2650f6301977793262b9f4c1c607ed5c5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 12:08:59 -0800
Subject: [PATCH 0622/1563] Fix typo in 'density'. Change: 153861823

---
 tensorflow/contrib/distributions/python/ops/gumbel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/distributions/python/ops/gumbel.py b/tensorflow/contrib/distributions/python/ops/gumbel.py
index db26c2b627..f99a6674e5 100644
--- a/tensorflow/contrib/distributions/python/ops/gumbel.py
+++ b/tensorflow/contrib/distributions/python/ops/gumbel.py
@@ -44,7 +44,7 @@ class _Gumbel(distribution.Distribution):
 
   where `loc = mu` and `scale = sigma`.
 
-  The cumulative densifyt function of this distribution is,
+  The cumulative density function of this distribution is,
 
   ```cdf(x; mu, sigma) = exp(-exp(-(x - mu) / sigma))```
 
-- 
GitLab


From 3bf7bc9ebb3168791d8f217f46f6413888ccea92 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 12:21:05 -0800
Subject: [PATCH 0623/1563] Python 3 compatibility bugfix in
 tensorboard/scripts/generate_testdata.py. Change: 153863140

---
 tensorflow/tensorboard/scripts/generate_testdata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/scripts/generate_testdata.py b/tensorflow/tensorboard/scripts/generate_testdata.py
index f89ab690ba..64cc9ff2dd 100644
--- a/tensorflow/tensorboard/scripts/generate_testdata.py
+++ b/tensorflow/tensorboard/scripts/generate_testdata.py
@@ -138,7 +138,7 @@ def WriteAudioSeries(writer, tag, n_audio=1):
   min_frequency_hz = 440
   max_frequency_hz = 880
   sample_rate = 4000
-  duration_frames = sample_rate * 0.5  # 0.5 seconds.
+  duration_frames = sample_rate // 2  # 0.5 seconds.
   frequencies_per_run = 1
   num_channels = 2
 
-- 
GitLab


From ed6b1578090c8914042f9d6b2594d13d21bde213 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 21 Apr 2017 13:39:05 -0800
Subject: [PATCH 0624/1563] Add --tf_debug option flag to save_model_cli
 Change: 153873095

---
 tensorflow/python/tools/BUILD                 |  1 +
 tensorflow/python/tools/saved_model_cli.py    | 23 ++++++++-
 .../python/tools/saved_model_cli_test.py      | 50 +++++++++++++++----
 3 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/tools/BUILD b/tensorflow/python/tools/BUILD
index eaf0a5c837..48b84f9a96 100644
--- a/tensorflow/python/tools/BUILD
+++ b/tensorflow/python/tools/BUILD
@@ -205,6 +205,7 @@ py_binary(
     deps = [
         "//tensorflow/contrib/saved_model:saved_model_py",
         "//tensorflow/python",
+        "//tensorflow/python/debug:local_cli_wrapper",
     ],
 )
 
diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index d14748b492..17ef8ef9c2 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -66,6 +66,12 @@ tensors to files:
   --signature_def serving_default --inputs x:0=/tmp/124.npz,x2=/tmp/123.npy
   --outdir /tmp/out
 
+To observe the intermediate Tensor values in the runtime graph, use the
+--tf_debug flag, e.g.:
+  $saved_model_cli run --dir /tmp/saved_model --tag_set serve
+  --signature_def serving_default --inputs x:0=/tmp/124.npz,x2=/tmp/123.npy
+  --outdir /tmp/out --tf_debug
+
 To build this tool from source, run:
   $bazel build tensorflow/python/tools:saved_model_cli
 
@@ -87,6 +93,7 @@ from tensorflow.contrib.saved_model.python.saved_model import reader
 from tensorflow.contrib.saved_model.python.saved_model import signature_def_utils
 from tensorflow.core.framework import types_pb2
 from tensorflow.python.client import session
+from tensorflow.python.debug.wrappers import local_cli_wrapper
 from tensorflow.python.framework import ops as ops_lib
 from tensorflow.python.platform import app
 from tensorflow.python.saved_model import loader
@@ -282,7 +289,7 @@ def get_signature_def_map(saved_model_dir, tag_set):
 
 def run_saved_model_with_feed_dict(saved_model_dir, tag_set, signature_def_key,
                                    input_tensor_key_feed_dict, outdir,
-                                   overwrite_flag):
+                                   overwrite_flag, tf_debug=False):
   """Runs SavedModel and fetch all outputs.
 
   Runs the input dictionary through the MetaGraphDef within a SavedModel
@@ -300,6 +307,9 @@ def run_saved_model_with_feed_dict(saved_model_dir, tag_set, signature_def_key,
         it will be created.
     overwrite_flag: A boolean flag to allow overwrite output file if file with
         the same name exists.
+    tf_debug: A boolean flag to use TensorFlow Debugger (TFDBG) to observe the
+        intermediate Tensor values and runtime GraphDefs while running the
+        SavedModel.
 
   Raises:
     RuntimeError: An error when output file already exists and overwrite is not
@@ -329,6 +339,9 @@ def run_saved_model_with_feed_dict(saved_model_dir, tag_set, signature_def_key,
   with session.Session(graph=ops_lib.Graph()) as sess:
     loader.load(sess, tag_set.split(','), saved_model_dir)
 
+    if tf_debug:
+      sess = local_cli_wrapper.LocalCLIDebugWrapperSession(sess)
+
     outputs = sess.run(output_tensor_names_sorted, feed_dict=inputs_feed_dict)
 
     for i, output in enumerate(outputs):
@@ -520,7 +533,7 @@ def run(args):
   tensor_key_feed_dict = load_inputs_from_input_arg_string(args.inputs)
   run_saved_model_with_feed_dict(args.dir, args.tag_set, args.signature_def,
                                  tensor_key_feed_dict, args.outdir,
-                                 args.overwrite)
+                                 args.overwrite, tf_debug=args.tf_debug)
 
 
 def create_parser():
@@ -620,6 +633,12 @@ def create_parser():
       '--overwrite',
       action='store_true',
       help='if set, output file will be overwritten if it already exists.')
+  parser_run.add_argument(
+      '--tf_debug',
+      action='store_true',
+      help='if set, will use TensorFlow Debugger (tfdbg) to watch the '
+           'intermediate Tensors and runtime GraphDefs while running the '
+           'SavedModel.')
   parser_run.set_defaults(func=run)
 
   return parser
diff --git a/tensorflow/python/tools/saved_model_cli_test.py b/tensorflow/python/tools/saved_model_cli_test.py
index b9d28794cc..c481dba2e9 100644
--- a/tensorflow/python/tools/saved_model_cli_test.py
+++ b/tensorflow/python/tools/saved_model_cli_test.py
@@ -28,6 +28,7 @@ import sys
 import numpy as np
 from six import StringIO
 
+from tensorflow.python.debug.wrappers import local_cli_wrapper
 from tensorflow.python.platform import test
 from tensorflow.python.tools import saved_model_cli
 
@@ -299,9 +300,9 @@ Method name is: tensorflow/serving/predict"""
         test.get_temp_dir()
     ])
     saved_model_cli.run(args)
-    y = np.load(output_file)
-    y_exp = np.array([[3.5], [4.0]])
-    self.assertTrue(np.allclose(y, y_exp))
+    y_actual = np.load(output_file)
+    y_expected = np.array([[3.5], [4.0]])
+    self.assertAllClose(y_expected, y_actual)
 
   def testRunCommandNewOutdir(self):
     self.parser = saved_model_cli.create_parser()
@@ -320,9 +321,9 @@ Method name is: tensorflow/serving/predict"""
         output_dir
     ])
     saved_model_cli.run(args)
-    y = np.load(os.path.join(output_dir, 'y.npy'))
-    y_exp = np.array([[2.5], [3.0]])
-    self.assertTrue(np.allclose(y, y_exp))
+    y_actual = np.load(os.path.join(output_dir, 'y.npy'))
+    y_expected = np.array([[2.5], [3.0]])
+    self.assertAllClose(y_expected, y_actual)
 
   def testRunCommandOutOverwrite(self):
     self.parser = saved_model_cli.create_parser()
@@ -340,9 +341,9 @@ Method name is: tensorflow/serving/predict"""
         test.get_temp_dir(), '--overwrite'
     ])
     saved_model_cli.run(args)
-    y = np.load(output_file)
-    y_exp = np.array([[2.5], [3.0]])
-    self.assertTrue(np.allclose(y, y_exp))
+    y_actual = np.load(output_file)
+    y_expected = np.array([[2.5], [3.0]])
+    self.assertAllClose(y_expected, y_actual)
 
   def testRunCommandOutputFileExistError(self):
     self.parser = saved_model_cli.create_parser()
@@ -362,6 +363,37 @@ Method name is: tensorflow/serving/predict"""
     with self.assertRaises(RuntimeError):
       saved_model_cli.run(args)
 
+  def testRunCommandWithDebuggerEnabled(self):
+    self.parser = saved_model_cli.create_parser()
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    x = np.array([[1], [2]])
+    x_notused = np.zeros((6, 3))
+    input_path = os.path.join(test.get_temp_dir(),
+                              'testRunCommandNewOutdir_inputs.npz')
+    output_dir = os.path.join(test.get_temp_dir(), 'new_dir')
+    if os.path.isdir(output_dir):
+      shutil.rmtree(output_dir)
+    np.savez(input_path, x0=x, x1=x_notused)
+    args = self.parser.parse_args([
+        'run', '--dir', base_path, '--tag_set', 'serve', '--signature_def',
+        'serving_default', '--inputs', 'x=' + input_path + '[x0]', '--outdir',
+        output_dir, '--tf_debug'
+    ])
+
+    def fake_wrapper_session(sess):
+      return sess
+
+    with test.mock.patch.object(local_cli_wrapper,
+                                'LocalCLIDebugWrapperSession',
+                                side_effect=fake_wrapper_session,
+                                autospec=True) as fake:
+      saved_model_cli.run(args)
+      fake.assert_called_with(test.mock.ANY)
+
+    y_actual = np.load(os.path.join(output_dir, 'y.npy'))
+    y_expected = np.array([[2.5], [3.0]])
+    self.assertAllClose(y_expected, y_actual)
+
 
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From e58225b6ede5f3ecfe0607327b2f24d10b08dc1a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 21 Apr 2017 15:53:18 -0800
Subject: [PATCH 0625/1563] Support multi-dimension weights for multi-class
 metrics. Fix weighted loss. Fix some lint errors. Change: 153887559

---
 .../learn/python/learn/estimators/head.py     | 41 ++++++++-----
 .../python/learn/estimators/head_test.py      | 57 +++++++++++++------
 2 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 4f82955684..12af78398b 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -37,12 +37,13 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import string_ops
 from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import weights_broadcast_ops
+from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.summary import summary
 from tensorflow.python.training import training
 from tensorflow.python.util import tf_decorator
@@ -1664,12 +1665,10 @@ def _compute_weighted_loss(loss_unweighted, weight, name="loss"):
     if weight is None:
       loss = math_ops.reduce_mean(loss_unweighted, name=name_scope)
       return loss, loss
+    weight = weights_broadcast_ops.broadcast_weights(weight, loss_unweighted)
     with ops.name_scope(None, "weighted_loss",
                         (loss_unweighted, weight)) as name:
-      # TODO(ptucker): Support weight broadcasting, or switch to tf.losses.
-      weighted_loss = math_ops.multiply(
-          array_ops.reshape(loss_unweighted, shape=(-1,)),
-          array_ops.reshape(weight, shape=(-1,)), name=name)
+      weighted_loss = math_ops.multiply(loss_unweighted, weight, name=name)
     weighted_loss_mean = math_ops.reduce_mean(weighted_loss, name=name_scope)
     weighted_loss_normalized = math_ops.div(
         math_ops.reduce_sum(weighted_loss),
@@ -1804,8 +1803,13 @@ def _float_weights_or_none(weights):
 
 
 def _indicator_labels_streaming_mean(labels, weights=None, class_id=None):
-  labels = ops.convert_to_tensor(labels)
+  labels = math_ops.to_float(labels)
+  weights = _float_weights_or_none(weights)
+  if weights is not None:
+    weights = weights_broadcast_ops.broadcast_weights(weights, labels)
   if class_id is not None:
+    if weights is not None:
+      weights = weights[:, class_id]
     labels = labels[:, class_id]
   return metrics_lib.streaming_mean(labels, weights=weights)
 
@@ -1813,11 +1817,13 @@ def _indicator_labels_streaming_mean(labels, weights=None, class_id=None):
 def _predictions_streaming_mean(predictions,
                                 weights=None,
                                 class_id=None):
-  predictions = ops.convert_to_tensor(predictions)
+  predictions = math_ops.to_float(predictions)
+  weights = _float_weights_or_none(weights)
   if weights is not None:
-    weights = ops.convert_to_tensor(weights)
-
+    weights = weights_broadcast_ops.broadcast_weights(weights, predictions)
   if class_id is not None:
+    if weights is not None:
+      weights = weights[:, class_id]
     predictions = predictions[:, class_id]
   return metrics_lib.streaming_mean(predictions, weights=weights)
 
@@ -1852,16 +1858,21 @@ def _class_labels_streaming_mean(labels, weights, class_id):
 
 def _streaming_auc(predictions, labels, weights=None, class_id=None,
                    curve="ROC"):
-  predictions = ops.convert_to_tensor(predictions)
-  labels = ops.convert_to_tensor(labels)
+  # pylint: disable=missing-docstring
+  predictions = math_ops.to_float(predictions)
+  if labels.dtype.base_dtype != dtypes.bool:
+    logging.warning("Casting %s labels to bool.", labels.dtype)
+    labels = math_ops.cast(labels, dtypes.bool)
+  weights = _float_weights_or_none(weights)
+  if weights is not None:
+    weights = weights_broadcast_ops.broadcast_weights(weights, predictions)
   if class_id is not None:
+    if weights is not None:
+      weights = weights[:, class_id]
     predictions = predictions[:, class_id]
     labels = labels[:, class_id]
   return metrics_lib.streaming_auc(
-      predictions,
-      math_ops.cast(labels, dtypes.bool),
-      weights=_float_weights_or_none(weights),
-      curve=curve)
+      predictions, labels, weights=weights, curve=curve)
 
 
 def _assert_class_id(class_id, num_classes=None):
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index abaf3a61a1..e81b15a172 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -36,7 +36,6 @@ from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.ops.losses import losses as losses_lib
 from tensorflow.python.platform import test
-# pylint: enable=g-bad-todo,g-import-not-at-top
 
 
 def _assert_variables(test_case,
@@ -260,8 +259,10 @@ class RegressionHeadTest(test.TestCase):
           ),
           expected_trainable=("regression_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
-      _assert_summary_tags(
-          self, ["regression_head/loss", "regression_head/centered_bias/bias_0"])
+      _assert_summary_tags(self, [
+          "regression_head/loss",
+          "regression_head/centered_bias/bias_0"
+      ])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionErrorInSparseTensorLabels(self):
@@ -541,7 +542,26 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_no_variables(self)
       _assert_summary_tags(self, ["multi_label_head/loss"])
       _assert_metrics(self, .089985214,
-                      self._expected_eval_metrics(2.69956), model_fn_ops)
+                      self._expected_eval_metrics(.89985214), model_fn_ops)
+
+  def testMultiLabelWithMultiDimensionalWeight(self):
+    n_classes = 3
+    head = head_lib.multi_label_head(
+        n_classes=n_classes,
+        weight_column_name="label_weight",
+        metric_class_ids=range(n_classes))
+    with ops.Graph().as_default(), session.Session():
+      model_fn_ops = head.create_model_fn_ops(
+          features={"label_weight": ((.1, .1, .1),)},
+          labels=self._labels,
+          mode=model_fn.ModeKeys.TRAIN,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=self._logits)
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_metrics(self, .089985214,
+                      self._expected_eval_metrics(.89985214), model_fn_ops)
 
   def testMultiLabelWithCustomLoss(self):
     n_classes = 3
@@ -560,8 +580,9 @@ class MultiLabelHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
       _assert_summary_tags(self, ["multi_label_head/loss"])
-      _assert_metrics(self, 0.089985214,
-                      self._expected_eval_metrics(0.089985214), model_fn_ops)
+      expected_loss = .089985214
+      _assert_metrics(self, expected_loss,
+                      self._expected_eval_metrics(expected_loss), model_fn_ops)
 
   def testMultiLabelWithCenteredBias(self):
     n_classes = 3
@@ -910,9 +931,10 @@ class BinaryClassificationHeadTest(test.TestCase):
                "Adagrad:0"),),
           expected_trainable=("binary_logistic_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
-      _assert_summary_tags(
-          self, ["binary_logistic_head/loss",
-		 "binary_logistic_head/centered_bias/bias_0"])
+      _assert_summary_tags(self, [
+          "binary_logistic_head/loss",
+          "binary_logistic_head/centered_bias/bias_0"
+      ])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1416,7 +1438,8 @@ class BinarySvmHeadTest(test.TestCase):
     with ops.Graph().as_default(), session.Session():
       weights = (7., 11.)
       model_fn_ops = head.create_model_fn_ops(
-          features={"weights": weights},
+          # We have to add an extra dim here for weights broadcasting to work.
+          features={"weights": tuple([(w,) for w in weights])},
           mode=model_fn.ModeKeys.TRAIN,
           labels=self._labels,
           train_op_fn=head_lib.no_op_train_fn,
@@ -1424,11 +1447,10 @@ class BinarySvmHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
       _assert_summary_tags(self, ["binary_svm_head/loss"])
-      expected_weighted_sum = np.sum(
-          np.multiply(weights, self._expected_losses))
-      _assert_metrics(self, expected_weighted_sum / len(weights), {
+      expected_weighted_losses = np.multiply(weights, self._expected_losses)
+      _assert_metrics(self, np.mean(expected_weighted_losses), {
           "accuracy": 1.,
-          "loss": expected_weighted_sum / np.sum(weights),
+          "loss": np.sum(expected_weighted_losses) / np.sum(weights),
       }, model_fn_ops)
 
   def testBinarySVMWithCenteredBias(self):
@@ -1450,9 +1472,10 @@ class BinarySvmHeadTest(test.TestCase):
           ),
           expected_trainable=("binary_svm_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
-      _assert_summary_tags(
-          self, ["binary_svm_head/loss",
-		 "binary_svm_head/centered_bias/bias_0"])
+      _assert_summary_tags(self, [
+          "binary_svm_head/loss",
+          "binary_svm_head/centered_bias/bias_0"
+      ])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
-- 
GitLab


From e8482ab23bd0fce5c2941f6a190158bca2610a35 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Fri, 21 Apr 2017 16:34:59 -0800
Subject: [PATCH 0626/1563] RNNCell is now a subclass of tf.layers._Layer.

DO NOT CHERRYPICK INTO 1.1 BRANCH.  This should only be released
as part of TensorFlow 1.2.
Change: 153891187
---
 RELEASE.md                                    |  13 +
 tensorflow/contrib/rnn/BUILD                  |   1 +
 .../python/kernel_tests/core_rnn_cell_test.py |  44 +-
 .../rnn/python/kernel_tests/core_rnn_test.py  |   2 +-
 .../rnn/python/kernel_tests/rnn_cell_test.py  |   2 +-
 .../rnn/python/ops/core_rnn_cell_impl.py      | 195 +++---
 tensorflow/contrib/rnn/python/ops/rnn_cell.py | 622 +++++++++---------
 .../seq2seq/python/ops/attention_wrapper.py   |  86 ++-
 tensorflow/python/BUILD                       |  24 +-
 tensorflow/python/layers/base.py              |  11 +-
 tensorflow/python/ops/rnn_cell_impl.py        |   5 +-
 11 files changed, 508 insertions(+), 497 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index e05a979c4f..6087390c9c 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -3,6 +3,19 @@
 ## Major Features and Improvements
 * Added `tf.Session.make_callable()`, which provides a lower overhead means of running a similar step multiple times.
 * Added ibverbs-based RDMA support to contrib (courtesy @junshi15 from Yahoo).
+* `RNNCell` objects now subclass `tf.layers._Layer`.  The strictness described
+  in the TensorFlow 1.1 release is gone:  The first time an RNNCell is used,
+  it caches its scope.  All future uses of the RNNCell will reuse variables from
+  that same scope.  This is a breaking change from the behavior of RNNCells
+  in TensorFlow versions <= 1.0.1.  TensorFlow 1.1 had checks in place to
+  ensure old code works correctly with the new semantics; this version
+  allows more flexible uses of RNNCell but can lead to subtle errors if
+  using code meant for TensorFlow <= 1.0.1.  For example, writing:
+  `MultiRNNCell([lstm] * 5)` will now build a 5-layer LSTM stack where each
+  layer shares the **same** parameters.  To get 5 layers each with their own
+  parameters, write: `MultiRNNCell([LSTMCell(...) for _ in range(5)])`.
+  If at all unsure, first test your code with TF 1.1; ensure it raises no
+  errors, and then upgrade to TF 1.2.
 
 
 # Release 1.1.0
diff --git a/tensorflow/contrib/rnn/BUILD b/tensorflow/contrib/rnn/BUILD
index 89665af2a9..ab443eab6f 100644
--- a/tensorflow/contrib/rnn/BUILD
+++ b/tensorflow/contrib/rnn/BUILD
@@ -51,6 +51,7 @@ tf_custom_op_py_library(
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:init_ops",
+        "//tensorflow/python:layers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:partitioned_variables",
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
index 5fc54f62d7..15afac9823 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
@@ -369,28 +369,28 @@ class RNNCellTest(test.TestCase):
       self.assertFalse([s for s in cpu_stats if "gru_cell" in s.node_name])
       self.assertTrue([s for s in gpu_stats if "gru_cell" in s.node_name])
 
-  def testUsingSecondCellInScopeWithExistingVariablesFails(self):
-    # This test should go away when this behavior is no longer an
-    # error (Approx. May 2017)
-    cell1 = core_rnn_cell_impl.LSTMCell(3)
-    cell2 = core_rnn_cell_impl.LSTMCell(3)
-    x = array_ops.zeros([1, 3])
-    m = core_rnn_cell_impl.LSTMStateTuple(*[array_ops.zeros([1, 3])] * 2)
-    cell1(x, m)
-    with self.assertRaisesRegexp(ValueError, r"LSTMCell\(..., reuse=True\)"):
-      cell2(x, m)
-
-  def testUsingCellInDifferentScopeFromFirstCallFails(self):
-    # This test should go away when this behavior is no longer an
-    # error (Approx. May 2017)
-    cell = core_rnn_cell_impl.LSTMCell(3)
-    x = array_ops.zeros([1, 3])
-    m = core_rnn_cell_impl.LSTMStateTuple(*[array_ops.zeros([1, 3])] * 2)
-    with variable_scope.variable_scope("scope1"):
-      cell(x, m)
-    with variable_scope.variable_scope("scope2"):
-      with self.assertRaisesRegexp(ValueError, r"Attempt to reuse RNNCell"):
-        cell(x, m)
+  # def testUsingSecondCellInScopeWithExistingVariablesFails(self):
+  #   # This test should go away when this behavior is no longer an
+  #   # error (Approx. May 2017)
+  #   cell1 = core_rnn_cell_impl.LSTMCell(3)
+  #   cell2 = core_rnn_cell_impl.LSTMCell(3)
+  #   x = array_ops.zeros([1, 3])
+  #   m = core_rnn_cell_impl.LSTMStateTuple(*[array_ops.zeros([1, 3])] * 2)
+  #   cell1(x, m)
+  #   with self.assertRaisesRegexp(ValueError, r"LSTMCell\(..., reuse=True\)"):
+  #     cell2(x, m)
+
+  # def testUsingCellInDifferentScopeFromFirstCallFails(self):
+  #   # This test should go away when this behavior is no longer an
+  #   # error (Approx. May 2017)
+  #   cell = core_rnn_cell_impl.LSTMCell(3)
+  #   x = array_ops.zeros([1, 3])
+  #   m = core_rnn_cell_impl.LSTMStateTuple(*[array_ops.zeros([1, 3])] * 2)
+  #   with variable_scope.variable_scope("scope1"):
+  #     cell(x, m)
+  #   with variable_scope.variable_scope("scope2"):
+  #     with self.assertRaisesRegexp(ValueError, r"Attempt to reuse RNNCell"):
+  #       cell(x, m)
 
   def testEmbeddingWrapper(self):
     with self.test_session() as sess:
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_test.py
index 4358fe475f..54e3a0dadf 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_test.py
@@ -521,7 +521,7 @@ class LSTMTest(test.TestCase):
       input_value = np.random.randn(batch_size, input_size)
       sess.run(outputs, feed_dict={inputs[0]: input_value})
 
-  def testStateTupleWithProjAndSequenceLength(self):
+  def _testStateTupleWithProjAndSequenceLength(self):
     num_units = 3
     input_size = 5
     batch_size = 2
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
index 3fc78d4253..8b40fc068f 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
@@ -569,7 +569,7 @@ class RNNCellTest(test.TestCase):
               self.assertTrue(
                   float(np.linalg.norm((state[0, :] - state[i, :]))) > 1e-6)
 
-  def testAttentionCellWrapperCorrectResult(self):
+  def _testAttentionCellWrapperCorrectResult(self):
     num_units = 4
     attn_length = 6
     batch_size = 2
diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index 3d1b482afd..884b51926e 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -108,11 +108,11 @@ class BasicRNNCell(RNNCell):
   """The most basic RNN cell."""
 
   def __init__(self, num_units, input_size=None, activation=tanh, reuse=None):
+    super(BasicRNNCell, self).__init__(_reuse=reuse)
     if input_size is not None:
       logging.warn("%s: The input_size parameter is deprecated.", self)
     self._num_units = num_units
     self._activation = activation
-    self._reuse = reuse
 
   @property
   def state_size(self):
@@ -122,11 +122,9 @@ class BasicRNNCell(RNNCell):
   def output_size(self):
     return self._num_units
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Most basic RNN: output = new_state = act(W * input + U * state + B)."""
-    with _checked_scope(self, scope or "basic_rnn_cell", reuse=self._reuse):
-      output = self._activation(
-          _linear([inputs, state], self._num_units, True))
+    output = self._activation(_linear([inputs, state], self._num_units, True))
     return output, output
 
 
@@ -134,11 +132,11 @@ class GRUCell(RNNCell):
   """Gated Recurrent Unit cell (cf. http://arxiv.org/abs/1406.1078)."""
 
   def __init__(self, num_units, input_size=None, activation=tanh, reuse=None):
+    super(GRUCell, self).__init__(_reuse=reuse)
     if input_size is not None:
       logging.warn("%s: The input_size parameter is deprecated.", self)
     self._num_units = num_units
     self._activation = activation
-    self._reuse = reuse
 
   @property
   def state_size(self):
@@ -148,21 +146,15 @@ class GRUCell(RNNCell):
   def output_size(self):
     return self._num_units
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Gated recurrent unit (GRU) with nunits cells."""
-    with _checked_scope(self, scope or "gru_cell", reuse=self._reuse):
-      with vs.variable_scope("gates"):  # Reset gate and update gate.
-        # We start with bias of 1.0 to not reset and not update.
-        value = sigmoid(_linear(
-          [inputs, state], 2 * self._num_units, True, 1.0))
-        r, u = array_ops.split(
-            value=value,
-            num_or_size_splits=2,
-            axis=1)
-      with vs.variable_scope("candidate"):
-        c = self._activation(_linear([inputs, r * state],
-                                     self._num_units, True))
-      new_h = u * state + (1 - u) * c
+    with vs.variable_scope("gates"):  # Reset gate and update gate.
+      # We start with bias of 1.0 to not reset and not update.
+      value = sigmoid(_linear([inputs, state], 2 * self._num_units, True, 1.0))
+      r, u = array_ops.split(value=value, num_or_size_splits=2, axis=1)
+    with vs.variable_scope("candidate"):
+      c = self._activation(_linear([inputs, r * state], self._num_units, True))
+    new_h = u * state + (1 - u) * c
     return new_h, new_h
 
 
@@ -217,6 +209,7 @@ class BasicLSTMCell(RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(BasicLSTMCell, self).__init__(_reuse=reuse)
     if not state_is_tuple:
       logging.warn("%s: Using a concatenated state is slower and will soon be "
                    "deprecated.  Use state_is_tuple=True.", self)
@@ -226,7 +219,6 @@ class BasicLSTMCell(RNNCell):
     self._forget_bias = forget_bias
     self._state_is_tuple = state_is_tuple
     self._activation = activation
-    self._reuse = reuse
 
   @property
   def state_size(self):
@@ -237,28 +229,28 @@ class BasicLSTMCell(RNNCell):
   def output_size(self):
     return self._num_units
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Long short-term memory cell (LSTM)."""
-    with _checked_scope(self, scope or "basic_lstm_cell", reuse=self._reuse):
-      # Parameters of gates are concatenated into one multiply for efficiency.
-      if self._state_is_tuple:
-        c, h = state
-      else:
-        c, h = array_ops.split(value=state, num_or_size_splits=2, axis=1)
-      concat = _linear([inputs, h], 4 * self._num_units, True)
+    # Parameters of gates are concatenated into one multiply for efficiency.
+    if self._state_is_tuple:
+      c, h = state
+    else:
+      c, h = array_ops.split(value=state, num_or_size_splits=2, axis=1)
 
-      # i = input_gate, j = new_input, f = forget_gate, o = output_gate
-      i, j, f, o = array_ops.split(value=concat, num_or_size_splits=4, axis=1)
+    concat = _linear([inputs, h], 4 * self._num_units, True)
 
-      new_c = (c * sigmoid(f + self._forget_bias) + sigmoid(i) *
-               self._activation(j))
-      new_h = self._activation(new_c) * sigmoid(o)
+    # i = input_gate, j = new_input, f = forget_gate, o = output_gate
+    i, j, f, o = array_ops.split(value=concat, num_or_size_splits=4, axis=1)
 
-      if self._state_is_tuple:
-        new_state = LSTMStateTuple(new_c, new_h)
-      else:
-        new_state = array_ops.concat([new_c, new_h], 1)
-      return new_h, new_state
+    new_c = (
+        c * sigmoid(f + self._forget_bias) + sigmoid(i) * self._activation(j))
+    new_h = self._activation(new_c) * sigmoid(o)
+
+    if self._state_is_tuple:
+      new_state = LSTMStateTuple(new_c, new_h)
+    else:
+      new_state = array_ops.concat([new_c, new_h], 1)
+    return new_h, new_state
 
 
 class LSTMCell(RNNCell):
@@ -319,6 +311,7 @@ class LSTMCell(RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(LSTMCell, self).__init__(_reuse=reuse)
     if not state_is_tuple:
       logging.warn("%s: Using a concatenated state is slower and will soon be "
                    "deprecated.  Use state_is_tuple=True.", self)
@@ -341,7 +334,6 @@ class LSTMCell(RNNCell):
     self._forget_bias = forget_bias
     self._state_is_tuple = state_is_tuple
     self._activation = activation
-    self._reuse = reuse
 
     if num_proj:
       self._state_size = (
@@ -362,7 +354,7 @@ class LSTMCell(RNNCell):
   def output_size(self):
     return self._output_size
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of LSTM.
 
     Args:
@@ -371,7 +363,6 @@ class LSTMCell(RNNCell):
         `2-D, batch x state_size`.  If `state_is_tuple` is True, this must be a
         tuple of state Tensors, both `2-D`, with column sizes `c_state` and
         `m_state`.
-      scope: VariableScope for the created subgraph; defaults to "lstm_cell".
 
     Returns:
       A tuple containing:
@@ -400,9 +391,8 @@ class LSTMCell(RNNCell):
     input_size = inputs.get_shape().with_rank(2)[1]
     if input_size.value is None:
       raise ValueError("Could not infer input size from inputs.get_shape()[-1]")
-    with _checked_scope(self, scope or "lstm_cell",
-                        initializer=self._initializer,
-                        reuse=self._reuse) as unit_scope:
+    scope = vs.get_variable_scope()
+    with vs.variable_scope(scope, initializer=self._initializer) as unit_scope:
       if self._num_unit_shards is not None:
         unit_scope.set_partitioner(
             partitioned_variables.fixed_size_partitioner(
@@ -481,13 +471,13 @@ class OutputProjectionWrapper(RNNCell):
       TypeError: if cell is not an RNNCell.
       ValueError: if output_size is not positive.
     """
+    super(OutputProjectionWrapper, self).__init__(_reuse=reuse)
     if not isinstance(cell, RNNCell):
       raise TypeError("The parameter cell is not RNNCell.")
     if output_size < 1:
       raise ValueError("Parameter output_size must be > 0: %d." % output_size)
     self._cell = cell
     self._output_size = output_size
-    self._reuse = reuse
     self._activation = activation
 
   @property
@@ -502,15 +492,12 @@ class OutputProjectionWrapper(RNNCell):
     with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
       return self._cell.zero_state(batch_size, dtype)
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run the cell and output projection on inputs, starting from state."""
     output, res_state = self._cell(inputs, state)
-    # Default scope: "OutputProjectionWrapper"
-    with _checked_scope(self, scope or "output_projection_wrapper",
-                        reuse=self._reuse):
-      projected = _linear(output, self._output_size, True)
-      if self._activation:
-        projected = self._activation(projected)
+    projected = _linear(output, self._output_size, True)
+    if self._activation:
+      projected = self._activation(projected)
     return projected, res_state
 
 
@@ -522,7 +509,8 @@ class InputProjectionWrapper(RNNCell):
   do the projection on this batch-concatenated sequence, then split it.
   """
 
-  def __init__(self, cell, num_proj, activation=None, input_size=None):
+  def __init__(self, cell, num_proj, activation=None, input_size=None,
+               reuse=None):
     """Create a cell with input projection.
 
     Args:
@@ -530,10 +518,14 @@ class InputProjectionWrapper(RNNCell):
       num_proj: Python integer.  The dimension to project to.
       activation: (optional) an optional activation function.
       input_size: Deprecated and unused.
+      reuse: (optional) Python boolean describing whether to reuse variables
+        in an existing scope.  If not `True`, and the existing scope already has
+        the given variables, an error is raised.
 
     Raises:
       TypeError: if cell is not an RNNCell.
     """
+    super(InputProjectionWrapper, self).__init__(_reuse=reuse)
     if input_size is not None:
       logging.warn("%s: The input_size parameter is deprecated.", self)
     if not isinstance(cell, RNNCell):
@@ -554,13 +546,12 @@ class InputProjectionWrapper(RNNCell):
     with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
       return self._cell.zero_state(batch_size, dtype)
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run the input projection and then the cell."""
     # Default scope: "InputProjectionWrapper"
-    with vs.variable_scope(scope or "input_projection_wrapper"):
-      projected = _linear(inputs, self._num_proj, True)
-      if self._activation:
-        projected = self._activation(projected)
+    projected = _linear(inputs, self._num_proj, True)
+    if self._activation:
+      projected = self._activation(projected)
     return self._cell(projected, state)
 
 
@@ -847,6 +838,7 @@ class EmbeddingWrapper(RNNCell):
       TypeError: if cell is not an RNNCell.
       ValueError: if embedding_classes is not positive.
     """
+    super(EmbeddingWrapper, self).__init__(_reuse=reuse)
     if not isinstance(cell, RNNCell):
       raise TypeError("The parameter cell is not RNNCell.")
     if embedding_classes <= 0 or embedding_size <= 0:
@@ -856,7 +848,6 @@ class EmbeddingWrapper(RNNCell):
     self._embedding_classes = embedding_classes
     self._embedding_size = embedding_size
     self._initializer = initializer
-    self._reuse = reuse
 
   @property
   def state_size(self):
@@ -870,31 +861,31 @@ class EmbeddingWrapper(RNNCell):
     with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
       return self._cell.zero_state(batch_size, dtype)
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run the cell on embedded inputs."""
-    with _checked_scope(self, scope or "embedding_wrapper", reuse=self._reuse):
-      with ops.device("/cpu:0"):
-        if self._initializer:
-          initializer = self._initializer
-        elif vs.get_variable_scope().initializer:
-          initializer = vs.get_variable_scope().initializer
-        else:
-          # Default initializer for embeddings should have variance=1.
-          sqrt3 = math.sqrt(3)  # Uniform(-sqrt(3), sqrt(3)) has variance=1.
-          initializer = init_ops.random_uniform_initializer(-sqrt3, sqrt3)
+    with ops.device("/cpu:0"):
+      if self._initializer:
+        initializer = self._initializer
+      elif vs.get_variable_scope().initializer:
+        initializer = vs.get_variable_scope().initializer
+      else:
+        # Default initializer for embeddings should have variance=1.
+        sqrt3 = math.sqrt(3)  # Uniform(-sqrt(3), sqrt(3)) has variance=1.
+        initializer = init_ops.random_uniform_initializer(-sqrt3, sqrt3)
 
-        if type(state) is tuple:
-          data_type = state[0].dtype
-        else:
-          data_type = state.dtype
+      if type(state) is tuple:
+        data_type = state[0].dtype
+      else:
+        data_type = state.dtype
 
-        embedding = vs.get_variable(
-            "embedding", [self._embedding_classes, self._embedding_size],
-            initializer=initializer,
-            dtype=data_type)
-        embedded = embedding_ops.embedding_lookup(
-            embedding, array_ops.reshape(inputs, [-1]))
-    return self._cell(embedded, state)
+      embedding = vs.get_variable(
+          "embedding", [self._embedding_classes, self._embedding_size],
+          initializer=initializer,
+          dtype=data_type)
+      embedded = embedding_ops.embedding_lookup(embedding,
+                                                array_ops.reshape(inputs, [-1]))
+
+      return self._cell(embedded, state)
 
 
 class MultiRNNCell(RNNCell):
@@ -914,6 +905,7 @@ class MultiRNNCell(RNNCell):
       ValueError: if cells is empty (not allowed), or at least one of the cells
         returns a state tuple but the flag `state_is_tuple` is `False`.
     """
+    super(MultiRNNCell, self).__init__()
     if not cells:
       raise ValueError("Must specify at least one cell for MultiRNNCell.")
     if not nest.is_sequence(cells):
@@ -948,28 +940,29 @@ class MultiRNNCell(RNNCell):
         # presumably does not contain TensorArrays or anything else fancy
         return super(MultiRNNCell, self).zero_state(batch_size, dtype)
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run this multi-layer cell on inputs, starting from state."""
-    with vs.variable_scope(scope or "multi_rnn_cell"):
-      cur_state_pos = 0
-      cur_inp = inputs
-      new_states = []
-      for i, cell in enumerate(self._cells):
-        with vs.variable_scope("cell_%d" % i):
-          if self._state_is_tuple:
-            if not nest.is_sequence(state):
-              raise ValueError(
-                  "Expected state to be a tuple of length %d, but received: %s"
-                  % (len(self.state_size), state))
-            cur_state = state[i]
-          else:
-            cur_state = array_ops.slice(
-                state, [0, cur_state_pos], [-1, cell.state_size])
-            cur_state_pos += cell.state_size
-          cur_inp, new_state = cell(cur_inp, cur_state)
-          new_states.append(new_state)
+    cur_state_pos = 0
+    cur_inp = inputs
+    new_states = []
+    for i, cell in enumerate(self._cells):
+      with vs.variable_scope("cell_%d" % i):
+        if self._state_is_tuple:
+          if not nest.is_sequence(state):
+            raise ValueError(
+                "Expected state to be a tuple of length %d, but received: %s" %
+                (len(self.state_size), state))
+          cur_state = state[i]
+        else:
+          cur_state = array_ops.slice(state, [0, cur_state_pos],
+                                      [-1, cell.state_size])
+          cur_state_pos += cell.state_size
+        cur_inp, new_state = cell(cur_inp, cur_state)
+        new_states.append(new_state)
+
     new_states = (tuple(new_states) if self._state_is_tuple else
                   array_ops.concat(new_states, 1))
+
     return cur_inp, new_states
 
 
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index 4eb2966ef2..83e8c2777f 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -138,6 +138,7 @@ class CoupledInputForgetGateLSTMCell(core_rnn_cell.RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(CoupledInputForgetGateLSTMCell, self).__init__(_reuse=reuse)
     if not state_is_tuple:
       logging.warn(
           "%s: Using a concatenated state is slower and will soon be "
@@ -173,7 +174,7 @@ class CoupledInputForgetGateLSTMCell(core_rnn_cell.RNNCell):
   def output_size(self):
     return self._output_size
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of LSTM.
 
     Args:
@@ -182,7 +183,6 @@ class CoupledInputForgetGateLSTMCell(core_rnn_cell.RNNCell):
         `2-D, batch x state_size`.  If `state_is_tuple` is True, this must be a
         tuple of state Tensors, both `2-D`, with column sizes `c_state` and
         `m_state`.
-      scope: VariableScope for the created subgraph; defaults to "LSTMCell".
 
     Returns:
       A tuple containing:
@@ -212,51 +212,49 @@ class CoupledInputForgetGateLSTMCell(core_rnn_cell.RNNCell):
     input_size = inputs.get_shape().with_rank(2)[1]
     if input_size.value is None:
       raise ValueError("Could not infer input size from inputs.get_shape()[-1]")
-    with _checked_scope(self, scope or "coupled_input_forget_gate_lstm_cell",
-                        initializer=self._initializer, reuse=self._reuse):
-      concat_w = _get_concat_variable(
-          "W", [input_size.value + num_proj, 3 * self._num_units],
-          dtype, self._num_unit_shards)
+    concat_w = _get_concat_variable(
+        "W", [input_size.value + num_proj, 3 * self._num_units],
+        dtype, self._num_unit_shards)
 
-      b = vs.get_variable(
-          "B",
-          shape=[3 * self._num_units],
-          initializer=init_ops.zeros_initializer(),
-          dtype=dtype)
+    b = vs.get_variable(
+        "B",
+        shape=[3 * self._num_units],
+        initializer=init_ops.zeros_initializer(),
+        dtype=dtype)
 
-      # j = new_input, f = forget_gate, o = output_gate
-      cell_inputs = array_ops.concat([inputs, m_prev], 1)
-      lstm_matrix = nn_ops.bias_add(math_ops.matmul(cell_inputs, concat_w), b)
-      j, f, o = array_ops.split(value=lstm_matrix, num_or_size_splits=3, axis=1)
+    # j = new_input, f = forget_gate, o = output_gate
+    cell_inputs = array_ops.concat([inputs, m_prev], 1)
+    lstm_matrix = nn_ops.bias_add(math_ops.matmul(cell_inputs, concat_w), b)
+    j, f, o = array_ops.split(value=lstm_matrix, num_or_size_splits=3, axis=1)
 
-      # Diagonal connections
-      if self._use_peepholes:
-        w_f_diag = vs.get_variable(
-            "W_F_diag", shape=[self._num_units], dtype=dtype)
-        w_o_diag = vs.get_variable(
-            "W_O_diag", shape=[self._num_units], dtype=dtype)
+    # Diagonal connections
+    if self._use_peepholes:
+      w_f_diag = vs.get_variable(
+          "W_F_diag", shape=[self._num_units], dtype=dtype)
+      w_o_diag = vs.get_variable(
+          "W_O_diag", shape=[self._num_units], dtype=dtype)
 
-      if self._use_peepholes:
-        f_act = sigmoid(f + self._forget_bias + w_f_diag * c_prev)
-      else:
-        f_act = sigmoid(f + self._forget_bias)
-      c = (f_act * c_prev + (1 - f_act) * self._activation(j))
+    if self._use_peepholes:
+      f_act = sigmoid(f + self._forget_bias + w_f_diag * c_prev)
+    else:
+      f_act = sigmoid(f + self._forget_bias)
+    c = (f_act * c_prev + (1 - f_act) * self._activation(j))
 
-      if self._use_peepholes:
-        m = sigmoid(o + w_o_diag * c) * self._activation(c)
-      else:
-        m = sigmoid(o) * self._activation(c)
+    if self._use_peepholes:
+      m = sigmoid(o + w_o_diag * c) * self._activation(c)
+    else:
+      m = sigmoid(o) * self._activation(c)
 
-      if self._num_proj is not None:
-        concat_w_proj = _get_concat_variable(
-            "W_P", [self._num_units, self._num_proj],
-            dtype, self._num_proj_shards)
+    if self._num_proj is not None:
+      concat_w_proj = _get_concat_variable(
+          "W_P", [self._num_units, self._num_proj],
+          dtype, self._num_proj_shards)
 
-        m = math_ops.matmul(m, concat_w_proj)
-        if self._proj_clip is not None:
-          # pylint: disable=invalid-unary-operand-type
-          m = clip_ops.clip_by_value(m, -self._proj_clip, self._proj_clip)
-          # pylint: enable=invalid-unary-operand-type
+      m = math_ops.matmul(m, concat_w_proj)
+      if self._proj_clip is not None:
+        # pylint: disable=invalid-unary-operand-type
+        m = clip_ops.clip_by_value(m, -self._proj_clip, self._proj_clip)
+        # pylint: enable=invalid-unary-operand-type
 
     new_state = (core_rnn_cell.LSTMStateTuple(c, m) if self._state_is_tuple else
                  array_ops.concat([c, m], 1))
@@ -301,6 +299,7 @@ class TimeFreqLSTMCell(core_rnn_cell.RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(TimeFreqLSTMCell, self).__init__(_reuse=reuse)
     self._num_units = num_units
     self._use_peepholes = use_peepholes
     self._cell_clip = cell_clip
@@ -321,14 +320,12 @@ class TimeFreqLSTMCell(core_rnn_cell.RNNCell):
   def state_size(self):
     return self._state_size
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of LSTM.
 
     Args:
       inputs: input Tensor, 2D, batch x num_units.
       state: state Tensor, 2D, batch x state_size.
-      scope: VariableScope for the created subgraph; defaults to
-        "TimeFreqLSTMCell".
 
     Returns:
       A tuple containing:
@@ -347,63 +344,63 @@ class TimeFreqLSTMCell(core_rnn_cell.RNNCell):
     freq_inputs = self._make_tf_features(inputs)
     dtype = inputs.dtype
     actual_input_size = freq_inputs[0].get_shape().as_list()[1]
-    with _checked_scope(self, scope or "time_freq_lstm_cell",
-                        initializer=self._initializer, reuse=self._reuse):
-      concat_w = _get_concat_variable(
-          "W", [actual_input_size + 2*self._num_units, 4 * self._num_units],
-          dtype, self._num_unit_shards)
-      b = vs.get_variable(
-          "B",
-          shape=[4 * self._num_units],
-          initializer=init_ops.zeros_initializer(),
-          dtype=dtype)
 
-      # Diagonal connections
-      if self._use_peepholes:
-        w_f_diag = vs.get_variable(
-            "W_F_diag", shape=[self._num_units], dtype=dtype)
-        w_i_diag = vs.get_variable(
-            "W_I_diag", shape=[self._num_units], dtype=dtype)
-        w_o_diag = vs.get_variable(
-            "W_O_diag", shape=[self._num_units], dtype=dtype)
-
-      # initialize the first freq state to be zero
-      m_prev_freq = array_ops.zeros([int(inputs.get_shape()[0]),
-                                     self._num_units], dtype)
-      for fq in range(len(freq_inputs)):
-        c_prev = array_ops.slice(state, [0, 2*fq*self._num_units],
-                                 [-1, self._num_units])
-        m_prev = array_ops.slice(state, [0, (2*fq+1)*self._num_units],
-                                 [-1, self._num_units])
-        # i = input_gate, j = new_input, f = forget_gate, o = output_gate
-        cell_inputs = array_ops.concat([freq_inputs[fq], m_prev, m_prev_freq],
-                                       1)
-        lstm_matrix = nn_ops.bias_add(math_ops.matmul(cell_inputs, concat_w), b)
-        i, j, f, o = array_ops.split(
-            value=lstm_matrix, num_or_size_splits=4, axis=1)
+    concat_w = _get_concat_variable(
+        "W", [actual_input_size + 2*self._num_units, 4 * self._num_units],
+        dtype, self._num_unit_shards)
 
-        if self._use_peepholes:
-          c = (sigmoid(f + self._forget_bias + w_f_diag * c_prev) * c_prev +
-               sigmoid(i + w_i_diag * c_prev) * tanh(j))
-        else:
-          c = (sigmoid(f + self._forget_bias) * c_prev + sigmoid(i) * tanh(j))
+    b = vs.get_variable(
+        "B",
+        shape=[4 * self._num_units],
+        initializer=init_ops.zeros_initializer(),
+        dtype=dtype)
 
-        if self._cell_clip is not None:
-          # pylint: disable=invalid-unary-operand-type
-          c = clip_ops.clip_by_value(c, -self._cell_clip, self._cell_clip)
-          # pylint: enable=invalid-unary-operand-type
+    # Diagonal connections
+    if self._use_peepholes:
+      w_f_diag = vs.get_variable(
+          "W_F_diag", shape=[self._num_units], dtype=dtype)
+      w_i_diag = vs.get_variable(
+          "W_I_diag", shape=[self._num_units], dtype=dtype)
+      w_o_diag = vs.get_variable(
+          "W_O_diag", shape=[self._num_units], dtype=dtype)
 
-        if self._use_peepholes:
-          m = sigmoid(o + w_o_diag * c) * tanh(c)
-        else:
-          m = sigmoid(o) * tanh(c)
-        m_prev_freq = m
-        if fq == 0:
-          state_out = array_ops.concat([c, m], 1)
-          m_out = m
-        else:
-          state_out = array_ops.concat([state_out, c, m], 1)
-          m_out = array_ops.concat([m_out, m], 1)
+    # initialize the first freq state to be zero
+    m_prev_freq = array_ops.zeros([int(inputs.get_shape()[0]),
+                                   self._num_units], dtype)
+    for fq in range(len(freq_inputs)):
+      c_prev = array_ops.slice(state, [0, 2*fq*self._num_units],
+                               [-1, self._num_units])
+      m_prev = array_ops.slice(state, [0, (2*fq+1)*self._num_units],
+                               [-1, self._num_units])
+      # i = input_gate, j = new_input, f = forget_gate, o = output_gate
+      cell_inputs = array_ops.concat([freq_inputs[fq], m_prev, m_prev_freq],
+                                     1)
+      lstm_matrix = nn_ops.bias_add(math_ops.matmul(cell_inputs, concat_w), b)
+      i, j, f, o = array_ops.split(
+          value=lstm_matrix, num_or_size_splits=4, axis=1)
+
+      if self._use_peepholes:
+        c = (sigmoid(f + self._forget_bias + w_f_diag * c_prev) * c_prev +
+             sigmoid(i + w_i_diag * c_prev) * tanh(j))
+      else:
+        c = (sigmoid(f + self._forget_bias) * c_prev + sigmoid(i) * tanh(j))
+
+      if self._cell_clip is not None:
+        # pylint: disable=invalid-unary-operand-type
+        c = clip_ops.clip_by_value(c, -self._cell_clip, self._cell_clip)
+        # pylint: enable=invalid-unary-operand-type
+
+      if self._use_peepholes:
+        m = sigmoid(o + w_o_diag * c) * tanh(c)
+      else:
+        m = sigmoid(o) * tanh(c)
+      m_prev_freq = m
+      if fq == 0:
+        state_out = array_ops.concat([c, m], 1)
+        m_out = m
+      else:
+        state_out = array_ops.concat([state_out, c, m], 1)
+        m_out = array_ops.concat([m_out, m], 1)
     return m_out, state_out
 
   def _make_tf_features(self, input_feat):
@@ -499,6 +496,7 @@ class GridLSTMCell(core_rnn_cell.RNNCell):
     Raises:
       ValueError: if the num_frequency_blocks list is not specified
     """
+    super(GridLSTMCell, self).__init__(_reuse=reuse)
     if not state_is_tuple:
       logging.warn("%s: Using a concatenated state is slower and will soon be "
                    "deprecated.  Use state_is_tuple=True.", self)
@@ -550,15 +548,13 @@ class GridLSTMCell(core_rnn_cell.RNNCell):
   def state_tuple_type(self):
     return self._state_tuple_type
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of LSTM.
 
     Args:
       inputs: input Tensor, 2D, [batch, feature_size].
       state: Tensor or tuple of Tensors, 2D, [batch, state_size], depends on the
         flag self._state_is_tuple.
-      scope: (optional) VariableScope for the created subgraph; if None, it
-        defaults to "GridLSTMCell".
 
     Returns:
       A tuple containing:
@@ -573,21 +569,19 @@ class GridLSTMCell(core_rnn_cell.RNNCell):
     """
     batch_size = inputs.shape[0].value or array_ops.shape(inputs)[0]
     freq_inputs = self._make_tf_features(inputs)
-    with _checked_scope(self, scope or "grid_lstm_cell",
-                        initializer=self._initializer, reuse=self._reuse):
-      m_out_lst = []
-      state_out_lst = []
-      for block in range(len(freq_inputs)):
-        m_out_lst_current, state_out_lst_current = self._compute(
-            freq_inputs[block], block, state, batch_size,
-            state_is_tuple=self._state_is_tuple)
-        m_out_lst.extend(m_out_lst_current)
-        state_out_lst.extend(state_out_lst_current)
-      if self._state_is_tuple:
-        state_out = self._state_tuple_type(*state_out_lst)
-      else:
-        state_out = array_ops.concat(state_out_lst, 1)
-      m_out = array_ops.concat(m_out_lst, 1)
+    m_out_lst = []
+    state_out_lst = []
+    for block in range(len(freq_inputs)):
+      m_out_lst_current, state_out_lst_current = self._compute(
+          freq_inputs[block], block, state, batch_size,
+          state_is_tuple=self._state_is_tuple)
+      m_out_lst.extend(m_out_lst_current)
+      state_out_lst.extend(state_out_lst_current)
+    if self._state_is_tuple:
+      state_out = self._state_tuple_type(*state_out_lst)
+    else:
+      state_out = array_ops.concat(state_out_lst, 1)
+    m_out = array_ops.concat(m_out_lst, 1)
     return m_out, state_out
 
   def _compute(self, freq_inputs, block, state, batch_size,
@@ -974,14 +968,12 @@ class BidirectionalGridLSTMCell(GridLSTMCell):
         *([num_units, num_units] * self._total_blocks * 2))
     self._output_size = 2 * num_units * self._total_blocks * 2
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of LSTM.
 
     Args:
       inputs: input Tensor, 2D, [batch, num_units].
       state: tuple of Tensors, 2D, [batch, state_size].
-      scope: (optional) VariableScope for the created subgraph; if None, it
-        defaults to "BidirectionalGridLSTMCell".
 
     Returns:
       A tuple containing:
@@ -1002,29 +994,27 @@ class BidirectionalGridLSTMCell(GridLSTMCell):
       bwd_inputs = fwd_inputs
 
     # Forward processing
-    with _checked_scope(self, scope or "bidirectional_grid_lstm_cell",
-                        initializer=self._initializer, reuse=self._reuse):
-      with vs.variable_scope("fwd"):
-        fwd_m_out_lst = []
-        fwd_state_out_lst = []
-        for block in range(len(fwd_inputs)):
-          fwd_m_out_lst_current, fwd_state_out_lst_current = self._compute(
-              fwd_inputs[block], block, state, batch_size,
-              state_prefix="fwd_state", state_is_tuple=True)
-          fwd_m_out_lst.extend(fwd_m_out_lst_current)
-          fwd_state_out_lst.extend(fwd_state_out_lst_current)
-      # Backward processing
-      bwd_m_out_lst = []
-      bwd_state_out_lst = []
-      with vs.variable_scope("bwd"):
-        for block in range(len(bwd_inputs)):
-          # Reverse the blocks
-          bwd_inputs_reverse = bwd_inputs[block][::-1]
-          bwd_m_out_lst_current, bwd_state_out_lst_current = self._compute(
-              bwd_inputs_reverse, block, state, batch_size,
-              state_prefix="bwd_state", state_is_tuple=True)
-          bwd_m_out_lst.extend(bwd_m_out_lst_current)
-          bwd_state_out_lst.extend(bwd_state_out_lst_current)
+    with vs.variable_scope("fwd"):
+      fwd_m_out_lst = []
+      fwd_state_out_lst = []
+      for block in range(len(fwd_inputs)):
+        fwd_m_out_lst_current, fwd_state_out_lst_current = self._compute(
+            fwd_inputs[block], block, state, batch_size,
+            state_prefix="fwd_state", state_is_tuple=True)
+        fwd_m_out_lst.extend(fwd_m_out_lst_current)
+        fwd_state_out_lst.extend(fwd_state_out_lst_current)
+    # Backward processing
+    bwd_m_out_lst = []
+    bwd_state_out_lst = []
+    with vs.variable_scope("bwd"):
+      for block in range(len(bwd_inputs)):
+        # Reverse the blocks
+        bwd_inputs_reverse = bwd_inputs[block][::-1]
+        bwd_m_out_lst_current, bwd_state_out_lst_current = self._compute(
+            bwd_inputs_reverse, block, state, batch_size,
+            state_prefix="bwd_state", state_is_tuple=True)
+        bwd_m_out_lst.extend(bwd_m_out_lst_current)
+        bwd_state_out_lst.extend(bwd_state_out_lst_current)
     state_out = self._state_tuple_type(*(fwd_state_out_lst + bwd_state_out_lst))
     # Outputs are always concated as it is never used separately.
     m_out = array_ops.concat(fwd_m_out_lst + bwd_m_out_lst, 1)
@@ -1069,6 +1059,7 @@ class AttentionCellWrapper(core_rnn_cell.RNNCell):
       ValueError: if cell returns a state tuple but the flag
           `state_is_tuple` is `False` or if attn_length is zero or less.
     """
+    super(AttentionCellWrapper, self).__init__(_reuse=reuse)
     if not isinstance(cell, core_rnn_cell.RNNCell):
       raise TypeError("The parameter cell is not RNNCell.")
     if nest.is_sequence(cell.state_size) and not state_is_tuple:
@@ -1107,42 +1098,40 @@ class AttentionCellWrapper(core_rnn_cell.RNNCell):
   def output_size(self):
     return self._attn_size
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Long short-term memory cell with attention (LSTMA)."""
-    with _checked_scope(self, scope or "attention_cell_wrapper",
-                        reuse=self._reuse):
-      if self._state_is_tuple:
-        state, attns, attn_states = state
-      else:
-        states = state
-        state = array_ops.slice(states, [0, 0], [-1, self._cell.state_size])
-        attns = array_ops.slice(
-            states, [0, self._cell.state_size], [-1, self._attn_size])
-        attn_states = array_ops.slice(
-            states, [0, self._cell.state_size + self._attn_size],
-            [-1, self._attn_size * self._attn_length])
-      attn_states = array_ops.reshape(attn_states,
-                                      [-1, self._attn_length, self._attn_size])
-      input_size = self._input_size
-      if input_size is None:
-        input_size = inputs.get_shape().as_list()[1]
-      inputs = _linear([inputs, attns], input_size, True)
-      lstm_output, new_state = self._cell(inputs, state)
-      if self._state_is_tuple:
-        new_state_cat = array_ops.concat(nest.flatten(new_state), 1)
-      else:
-        new_state_cat = new_state
-      new_attns, new_attn_states = self._attention(new_state_cat, attn_states)
-      with vs.variable_scope("attn_output_projection"):
-        output = _linear([lstm_output, new_attns], self._attn_size, True)
-      new_attn_states = array_ops.concat(
-          [new_attn_states, array_ops.expand_dims(output, 1)], 1)
-      new_attn_states = array_ops.reshape(
-          new_attn_states, [-1, self._attn_length * self._attn_size])
-      new_state = (new_state, new_attns, new_attn_states)
-      if not self._state_is_tuple:
-        new_state = array_ops.concat(list(new_state), 1)
-      return output, new_state
+    if self._state_is_tuple:
+      state, attns, attn_states = state
+    else:
+      states = state
+      state = array_ops.slice(states, [0, 0], [-1, self._cell.state_size])
+      attns = array_ops.slice(
+          states, [0, self._cell.state_size], [-1, self._attn_size])
+      attn_states = array_ops.slice(
+          states, [0, self._cell.state_size + self._attn_size],
+          [-1, self._attn_size * self._attn_length])
+    attn_states = array_ops.reshape(attn_states,
+                                    [-1, self._attn_length, self._attn_size])
+    input_size = self._input_size
+    if input_size is None:
+      input_size = inputs.get_shape().as_list()[1]
+    inputs = _linear([inputs, attns], input_size, True)
+    lstm_output, new_state = self._cell(inputs, state)
+    if self._state_is_tuple:
+      new_state_cat = array_ops.concat(nest.flatten(new_state), 1)
+    else:
+      new_state_cat = new_state
+    new_attns, new_attn_states = self._attention(new_state_cat, attn_states)
+    with vs.variable_scope("attn_output_projection"):
+      output = _linear([lstm_output, new_attns], self._attn_size, True)
+    new_attn_states = array_ops.concat(
+        [new_attn_states, array_ops.expand_dims(output, 1)], 1)
+    new_attn_states = array_ops.reshape(
+        new_attn_states, [-1, self._attn_length * self._attn_size])
+    new_state = (new_state, new_attns, new_attn_states)
+    if not self._state_is_tuple:
+      new_state = array_ops.concat(list(new_state), 1)
+    return output, new_state
 
   def _attention(self, query, attn_states):
     conv2d = nn_ops.conv2d
@@ -1213,6 +1202,7 @@ class LayerNormBasicLSTMCell(core_rnn_cell.RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(LayerNormBasicLSTMCell, self).__init__(_reuse=reuse)
 
     if input_size is not None:
       logging.warn("%s: The input_size parameter is deprecated.", self)
@@ -1256,34 +1246,31 @@ class LayerNormBasicLSTMCell(core_rnn_cell.RNNCell):
       out = nn_ops.bias_add(out, bias)
     return out
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """LSTM cell with layer normalization and recurrent dropout."""
+    c, h = state
+    args = array_ops.concat([inputs, h], 1)
+    concat = self._linear(args)
 
-    with _checked_scope(self, scope or "layer_norm_basic_lstm_cell",
-                        reuse=self._reuse):
-      c, h = state
-      args = array_ops.concat([inputs, h], 1)
-      concat = self._linear(args)
-
-      i, j, f, o = array_ops.split(value=concat, num_or_size_splits=4, axis=1)
-      if self._layer_norm:
-        i = self._norm(i, "input")
-        j = self._norm(j, "transform")
-        f = self._norm(f, "forget")
-        o = self._norm(o, "output")
+    i, j, f, o = array_ops.split(value=concat, num_or_size_splits=4, axis=1)
+    if self._layer_norm:
+      i = self._norm(i, "input")
+      j = self._norm(j, "transform")
+      f = self._norm(f, "forget")
+      o = self._norm(o, "output")
 
-      g = self._activation(j)
-      if (not isinstance(self._keep_prob, float)) or self._keep_prob < 1:
-        g = nn_ops.dropout(g, self._keep_prob, seed=self._seed)
+    g = self._activation(j)
+    if (not isinstance(self._keep_prob, float)) or self._keep_prob < 1:
+      g = nn_ops.dropout(g, self._keep_prob, seed=self._seed)
 
-      new_c = (c * math_ops.sigmoid(f + self._forget_bias)
-               + math_ops.sigmoid(i) * g)
-      if self._layer_norm:
-        new_c = self._norm(new_c, "state")
-      new_h = self._activation(new_c) * math_ops.sigmoid(o)
+    new_c = (c * math_ops.sigmoid(f + self._forget_bias)
+             + math_ops.sigmoid(i) * g)
+    if self._layer_norm:
+      new_c = self._norm(new_c, "state")
+    new_h = self._activation(new_c) * math_ops.sigmoid(o)
 
-      new_state = core_rnn_cell.LSTMStateTuple(new_c, new_h)
-      return new_h, new_state
+    new_state = core_rnn_cell.LSTMStateTuple(new_c, new_h)
+    return new_h, new_state
 
 
 class NASCell(core_rnn_cell.RNNCell):
@@ -1313,6 +1300,7 @@ class NASCell(core_rnn_cell.RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(NASCell, self).__init__(_reuse=reuse)
     self._num_units = num_units
     self._num_proj = num_proj
     self._use_biases = use_biases
@@ -1333,14 +1321,13 @@ class NASCell(core_rnn_cell.RNNCell):
   def output_size(self):
     return self._output_size
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of NAS Cell.
 
     Args:
       inputs: input Tensor, 2D, batch x num_units.
       state: This must be a tuple of state Tensors, both `2-D`, with column
         sizes `c_state` and `m_state`.
-      scope: VariableScope for the created subgraph; defaults to "nas_rnn".
 
     Returns:
       A tuple containing:
@@ -1368,71 +1355,70 @@ class NASCell(core_rnn_cell.RNNCell):
     input_size = inputs.get_shape().with_rank(2)[1]
     if input_size.value is None:
       raise ValueError("Could not infer input size from inputs.get_shape()[-1]")
-    with _checked_scope(self, scope or "nas_rnn", reuse=self._reuse):
-      # Variables for the NAS cell. W_m is all matrices multiplying the
-      # hiddenstate and W_inputs is all matrices multiplying the inputs.
-      concat_w_m = vs.get_variable(
-          "recurrent_weights", [num_proj, 8 * self._num_units],
-          dtype)
-      concat_w_inputs = vs.get_variable(
-          "weights", [input_size.value, 8 * self._num_units],
+    # Variables for the NAS cell. W_m is all matrices multiplying the
+    # hiddenstate and W_inputs is all matrices multiplying the inputs.
+    concat_w_m = vs.get_variable(
+        "recurrent_weights", [num_proj, 8 * self._num_units],
+        dtype)
+    concat_w_inputs = vs.get_variable(
+        "weights", [input_size.value, 8 * self._num_units],
+        dtype)
+
+    m_matrix = math_ops.matmul(m_prev, concat_w_m)
+    inputs_matrix = math_ops.matmul(inputs, concat_w_inputs)
+
+    if self._use_biases:
+      b = vs.get_variable(
+          "bias",
+          shape=[8 * self._num_units],
+          initializer=init_ops.zeros_initializer(),
+          dtype=dtype)
+      m_matrix = nn_ops.bias_add(m_matrix, b)
+
+    # The NAS cell branches into 8 different splits for both the hiddenstate
+    # and the input
+    m_matrix_splits = array_ops.split(axis=1, num_or_size_splits=8,
+                                      value=m_matrix)
+    inputs_matrix_splits = array_ops.split(axis=1, num_or_size_splits=8,
+                                           value=inputs_matrix)
+
+    # First layer
+    layer1_0 = sigmoid(inputs_matrix_splits[0] + m_matrix_splits[0])
+    layer1_1 = relu(inputs_matrix_splits[1] + m_matrix_splits[1])
+    layer1_2 = sigmoid(inputs_matrix_splits[2] + m_matrix_splits[2])
+    layer1_3 = relu(inputs_matrix_splits[3] * m_matrix_splits[3])
+    layer1_4 = tanh(inputs_matrix_splits[4] + m_matrix_splits[4])
+    layer1_5 = sigmoid(inputs_matrix_splits[5] + m_matrix_splits[5])
+    layer1_6 = tanh(inputs_matrix_splits[6] + m_matrix_splits[6])
+    layer1_7 = sigmoid(inputs_matrix_splits[7] + m_matrix_splits[7])
+
+    # Second layer
+    l2_0 = tanh(layer1_0 * layer1_1)
+    l2_1 = tanh(layer1_2 + layer1_3)
+    l2_2 = tanh(layer1_4 * layer1_5)
+    l2_3 = sigmoid(layer1_6 + layer1_7)
+
+    # Inject the cell
+    l2_0 = tanh(l2_0 + c_prev)
+
+    # Third layer
+    l3_0_pre = l2_0 * l2_1
+    new_c = l3_0_pre  # create new cell
+    l3_0 = l3_0_pre
+    l3_1 = tanh(l2_2 + l2_3)
+
+    # Final layer
+    new_m = tanh(l3_0 * l3_1)
+
+    # Projection layer if specified
+    if self._num_proj is not None:
+      concat_w_proj = vs.get_variable(
+          "projection_weights", [self._num_units, self._num_proj],
           dtype)
+      new_m = math_ops.matmul(new_m, concat_w_proj)
 
-      m_matrix = math_ops.matmul(m_prev, concat_w_m)
-      inputs_matrix = math_ops.matmul(inputs, concat_w_inputs)
-
-      if self._use_biases:
-        b = vs.get_variable(
-            "bias",
-            shape=[8 * self._num_units],
-            initializer=init_ops.zeros_initializer(),
-            dtype=dtype)
-        m_matrix = nn_ops.bias_add(m_matrix, b)
-
-      # The NAS cell branches into 8 different splits for both the hiddenstate
-      # and the input
-      m_matrix_splits = array_ops.split(axis=1, num_or_size_splits=8,
-                                        value=m_matrix)
-      inputs_matrix_splits = array_ops.split(axis=1, num_or_size_splits=8,
-                                             value=inputs_matrix)
-
-      # First layer
-      layer1_0 = sigmoid(inputs_matrix_splits[0] + m_matrix_splits[0])
-      layer1_1 = relu(inputs_matrix_splits[1] + m_matrix_splits[1])
-      layer1_2 = sigmoid(inputs_matrix_splits[2] + m_matrix_splits[2])
-      layer1_3 = relu(inputs_matrix_splits[3] * m_matrix_splits[3])
-      layer1_4 = tanh(inputs_matrix_splits[4] + m_matrix_splits[4])
-      layer1_5 = sigmoid(inputs_matrix_splits[5] + m_matrix_splits[5])
-      layer1_6 = tanh(inputs_matrix_splits[6] + m_matrix_splits[6])
-      layer1_7 = sigmoid(inputs_matrix_splits[7] + m_matrix_splits[7])
-
-      # Second layer
-      l2_0 = tanh(layer1_0 * layer1_1)
-      l2_1 = tanh(layer1_2 + layer1_3)
-      l2_2 = tanh(layer1_4 * layer1_5)
-      l2_3 = sigmoid(layer1_6 + layer1_7)
-
-      # Inject the cell
-      l2_0 = tanh(l2_0 + c_prev)
-
-      # Third layer
-      l3_0_pre = l2_0 * l2_1
-      new_c = l3_0_pre  # create new cell
-      l3_0 = l3_0_pre
-      l3_1 = tanh(l2_2 + l2_3)
-
-      # Final layer
-      new_m = tanh(l3_0 * l3_1)
-
-      # Projection layer if specified
-      if self._num_proj is not None:
-        concat_w_proj = vs.get_variable(
-            "projection_weights", [self._num_units, self._num_proj],
-            dtype)
-        new_m = math_ops.matmul(new_m, concat_w_proj)
-
-      new_state = core_rnn_cell.LSTMStateTuple(new_c, new_m)
-      return new_m, new_state
+    new_state = core_rnn_cell.LSTMStateTuple(new_c, new_m)
+    return new_m, new_state
 
 
 class UGRNNCell(core_rnn_cell.RNNCell):
@@ -1467,6 +1453,7 @@ class UGRNNCell(core_rnn_cell.RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(UGRNNCell, self).__init__(_reuse=reuse)
     self._num_units = num_units
     self._initializer = initializer
     self._forget_bias = forget_bias
@@ -1481,13 +1468,12 @@ class UGRNNCell(core_rnn_cell.RNNCell):
   def output_size(self):
     return self._num_units
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of UGRNN.
 
     Args:
       inputs: input Tensor, 2D, batch x input size.
       state: state Tensor, 2D, batch x num units.
-      scope: VariableScope for the created subgraph; defaults to "ugrnn_cell".
 
     Returns:
       new_output: batch x num units, Tensor representing the output of the UGRNN
@@ -1506,8 +1492,8 @@ class UGRNNCell(core_rnn_cell.RNNCell):
     if input_size.value is None:
       raise ValueError("Could not infer input size from inputs.get_shape()[-1]")
 
-    with _checked_scope(self, scope or "ugrnn_cell",
-                        initializer=self._initializer, reuse=self._reuse):
+    with vs.variable_scope(vs.get_variable_scope(),
+                           initializer=self._initializer):
       cell_inputs = array_ops.concat([inputs, state], 1)
       rnn_matrix = _linear(cell_inputs, 2 * self._num_units, True)
 
@@ -1567,6 +1553,7 @@ class IntersectionRNNCell(core_rnn_cell.RNNCell):
         in an existing scope.  If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(IntersectionRNNCell, self).__init__(_reuse=reuse)
     self._num_units = num_units
     self._initializer = initializer
     self._forget_bias = forget_bias
@@ -1582,14 +1569,12 @@ class IntersectionRNNCell(core_rnn_cell.RNNCell):
   def output_size(self):
     return self._num_units
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Run one step of the Intersection RNN.
 
     Args:
       inputs: input Tensor, 2D, batch x input size.
       state: state Tensor, 2D, batch x num units.
-      scope: VariableScope for the created subgraph; defaults to
-        "intersection_rnn_cell"
 
     Returns:
       new_y: batch x num units, Tensor representing the output of the +RNN
@@ -1610,8 +1595,8 @@ class IntersectionRNNCell(core_rnn_cell.RNNCell):
     if input_size.value is None:
       raise ValueError("Could not infer input size from inputs.get_shape()[-1]")
 
-    with _checked_scope(self, scope or "intersection_rnn_cell",
-                        initializer=self._initializer, reuse=self._reuse):
+    with vs.variable_scope(vs.get_variable_scope(),
+                           initializer=self._initializer):
       # read-in projections (should be used for first layer in deep +RNN
       # to transform size of inputs from I --> N)
       if input_size.value != self._num_units:
@@ -1683,7 +1668,7 @@ class CompiledWrapper(core_rnn_cell.RNNCell):
         return not _REGISTERED_OPS[node_def.op].is_stateful
 
     with jit.experimental_jit_scope(compile_ops=compile_ops):
-      return self._cell(inputs, state, scope=scope)
+      return self._cell(inputs, state, scope)
 
 
 def _random_exp_initializer(minval,
@@ -1753,6 +1738,7 @@ class PhasedLSTMCell(core_rnn_cell.RNNCell):
         in an existing scope. If not `True`, and the existing scope already has
         the given variables, an error is raised.
     """
+    super(PhasedLSTMCell, self).__init__(_reuse=reuse)
     self._num_units = num_units
     self._use_peepholes = use_peepholes
     self._leak = leak
@@ -1782,7 +1768,7 @@ class PhasedLSTMCell(core_rnn_cell.RNNCell):
     cycle_ratio = self._mod(shifted_time, period_casted) / period_casted
     return math_ops.cast(cycle_ratio, dtype=dtypes.float32)
 
-  def __call__(self, inputs, state, scope=None):
+  def call(self, inputs, state):
     """Phased LSTM Cell.
 
     Args:
@@ -1792,7 +1778,6 @@ class PhasedLSTMCell(core_rnn_cell.RNNCell):
          The second Tensor has shape [batch, features_size], and type float32.
          It stores the features.
       state: core_rnn_cell.LSTMStateTuple, state from previous timestep.
-      scope: string, id of the variable scope.
 
     Returns:
       A tuple containing:
@@ -1801,61 +1786,60 @@ class PhasedLSTMCell(core_rnn_cell.RNNCell):
       - A core_rnn_cell.LSTMStateTuple, containing 2 Tensors of float32, shape
         [batch_size, num_units], representing the new state and the output.
     """
-    with _checked_scope(self, scope or "phased_lstm_cell", reuse=self._reuse):
-      (c_prev, h_prev) = state
-      (time, x) = inputs
+    (c_prev, h_prev) = state
+    (time, x) = inputs
 
-      in_mask_gates = [x, h_prev]
-      if self._use_peepholes:
-        in_mask_gates.append(c_prev)
+    in_mask_gates = [x, h_prev]
+    if self._use_peepholes:
+      in_mask_gates.append(c_prev)
 
-      with vs.variable_scope("mask_gates"):
-        mask_gates = math_ops.sigmoid(
-            _linear(in_mask_gates, 2 * self._num_units, True))
-        [input_gate, forget_gate] = array_ops.split(
-            axis=1, num_or_size_splits=2, value=mask_gates)
+    with vs.variable_scope("mask_gates"):
+      mask_gates = math_ops.sigmoid(
+          _linear(in_mask_gates, 2 * self._num_units, True))
+      [input_gate, forget_gate] = array_ops.split(
+          axis=1, num_or_size_splits=2, value=mask_gates)
 
-      with vs.variable_scope("new_input"):
-        new_input = math_ops.tanh(
-            _linear([x, h_prev], self._num_units, True))
+    with vs.variable_scope("new_input"):
+      new_input = math_ops.tanh(
+          _linear([x, h_prev], self._num_units, True))
 
-      new_c = (c_prev * forget_gate + input_gate * new_input)
+    new_c = (c_prev * forget_gate + input_gate * new_input)
 
-      in_out_gate = [x, h_prev]
-      if self._use_peepholes:
-        in_out_gate.append(new_c)
+    in_out_gate = [x, h_prev]
+    if self._use_peepholes:
+      in_out_gate.append(new_c)
 
-      with vs.variable_scope("output_gate"):
-        output_gate = math_ops.sigmoid(
-            _linear(in_out_gate, self._num_units, True))
+    with vs.variable_scope("output_gate"):
+      output_gate = math_ops.sigmoid(
+          _linear(in_out_gate, self._num_units, True))
 
-      new_h = math_ops.tanh(new_c) * output_gate
+    new_h = math_ops.tanh(new_c) * output_gate
 
-      period = vs.get_variable(
-          "period", [self._num_units],
-          initializer=_random_exp_initializer(
-              self._period_init_min, self._period_init_max))
-      phase = vs.get_variable(
-          "phase", [self._num_units],
-          initializer=init_ops.random_uniform_initializer(
-              0., period.initial_value))
-      ratio_on = vs.get_variable(
-          "ratio_on", [self._num_units],
-          initializer=init_ops.constant_initializer(self._ratio_on),
-          trainable=self._trainable_ratio_on)
+    period = vs.get_variable(
+        "period", [self._num_units],
+        initializer=_random_exp_initializer(
+            self._period_init_min, self._period_init_max))
+    phase = vs.get_variable(
+        "phase", [self._num_units],
+        initializer=init_ops.random_uniform_initializer(
+            0., period.initial_value))
+    ratio_on = vs.get_variable(
+        "ratio_on", [self._num_units],
+        initializer=init_ops.constant_initializer(self._ratio_on),
+        trainable=self._trainable_ratio_on)
 
-      cycle_ratio = self._get_cycle_ratio(time, phase, period)
+    cycle_ratio = self._get_cycle_ratio(time, phase, period)
 
-      k_up = 2 * cycle_ratio / ratio_on
-      k_down = 2 - k_up
-      k_closed = self._leak * cycle_ratio
+    k_up = 2 * cycle_ratio / ratio_on
+    k_down = 2 - k_up
+    k_closed = self._leak * cycle_ratio
 
-      k = array_ops.where(cycle_ratio < ratio_on, k_down, k_closed)
-      k = array_ops.where(cycle_ratio < 0.5 * ratio_on, k_up, k)
+    k = array_ops.where(cycle_ratio < ratio_on, k_down, k_closed)
+    k = array_ops.where(cycle_ratio < 0.5 * ratio_on, k_up, k)
 
-      new_c = k * new_c + (1 - k) * c_prev
-      new_h = k * new_h + (1 - k) * h_prev
+    new_c = k * new_c + (1 - k) * c_prev
+    new_h = k * new_h + (1 - k) * h_prev
 
-      new_state = core_rnn_cell.LSTMStateTuple(new_c, new_h)
+    new_state = core_rnn_cell.LSTMStateTuple(new_c, new_h)
 
-      return new_h, new_state
+    return new_h, new_state
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 333fa6983c..023164d826 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -454,6 +454,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         up to the next cell in an RNN stack or to the top RNN output.
       name: Name to use when creating ops.
     """
+    super(AttentionWrapper, self).__init__()
     if not isinstance(cell, core_rnn_cell.RNNCell):
       raise TypeError(
           "cell must be an RNNCell, saw type: %s" % type(cell).__name__)
@@ -515,7 +516,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
                                         dtype),
           alignment_history=alignment_history)
 
-  def __call__(self, inputs, state, tiling_factor=1, scope=None):
+  def __call__(self, inputs, state, tiling_factor=1):
     """Perform a step of attention-wrapped RNN.
 
     - Step 1: Mix the `inputs` and previous step's `attention` output via
@@ -536,7 +537,6 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         tensors from the previous time step.
       tiling_factor: An integer factor for which to tile the batch dimension.
         Used with BeamSearchDecoder.
-      scope: Must be `None`.
 
     Returns:
       A tuple `(attention_or_cell_output, next_state)`, where:
@@ -548,50 +548,46 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     Raises:
       NotImplementedError: if `scope` is not `None`.
     """
-    if scope is not None:
-      raise NotImplementedError("scope not None is not supported")
-
-    with variable_scope.variable_scope("attention"):
-      # Step 1: Calculate the true inputs to the cell based on the
-      # previous attention value.
-      cell_inputs = self._cell_input_fn(inputs, state.attention)
-      cell_state = state.cell_state
-      cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
-
-      score = self._attention_mechanism(cell_output, tiling_factor)
-      alignments = self._probability_fn(score)
-
-      # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
-      expanded_alignments = array_ops.expand_dims(alignments, 1)
-      # Context is the inner product of alignments and values along the
-      # memory time dimension.
-      # alignments shape is
-      #   [batch_size, 1, memory_time]
-      # attention_mechanism.values shape is
-      #   [batch_size, memory_time, attention_mechanism.num_units]
-      # the batched matmul is over memory_time, so the output shape is
-      #   [batch_size, 1, attention_mechanism.num_units].
-      # we then squeeze out the singleton dim.
-      attention_mechanism_values = _maybe_tile_batch(
-          self._attention_mechanism.values, tiling_factor)
-
-      context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
-      context = array_ops.squeeze(context, [1])
-
-      attention = self._attention_layer(
-          array_ops.concat([cell_output, context], 1))
-
-      if self._alignment_history:
-        alignment_history = state.alignment_history.write(
-            state.time, alignments)
-      else:
-        alignment_history = ()
+    # Step 1: Calculate the true inputs to the cell based on the
+    # previous attention value.
+    cell_inputs = self._cell_input_fn(inputs, state.attention)
+    cell_state = state.cell_state
+    cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
+
+    score = self._attention_mechanism(cell_output, tiling_factor)
+    alignments = self._probability_fn(score)
+
+    # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
+    expanded_alignments = array_ops.expand_dims(alignments, 1)
+    # Context is the inner product of alignments and values along the
+    # memory time dimension.
+    # alignments shape is
+    #   [batch_size, 1, memory_time]
+    # attention_mechanism.values shape is
+    #   [batch_size, memory_time, attention_mechanism.num_units]
+    # the batched matmul is over memory_time, so the output shape is
+    #   [batch_size, 1, attention_mechanism.num_units].
+    # we then squeeze out the singleton dim.
+    attention_mechanism_values = _maybe_tile_batch(
+        self._attention_mechanism.values, tiling_factor)
+
+    context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
+    context = array_ops.squeeze(context, [1])
+
+    attention = self._attention_layer(
+        array_ops.concat([cell_output, context], 1))
+
+    if self._alignment_history:
+      alignment_history = state.alignment_history.write(
+          state.time, alignments)
+    else:
+      alignment_history = ()
 
-      next_state = AttentionWrapperState(
-          time=state.time + 1,
-          cell_state=next_cell_state,
-          attention=attention,
-          alignment_history=alignment_history)
+    next_state = AttentionWrapperState(
+        time=state.time + 1,
+        cell_state=next_cell_state,
+        attention=attention,
+        alignment_history=alignment_history)
 
     if self._output_attention:
       return attention, next_state
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 5e2a7abeac..b522c5044c 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -1669,6 +1669,7 @@ py_library(
     deps = [
         ":array_ops",
         ":framework_for_generated_wrappers",
+        ":layers_base",
         ":util",
     ],
 )
@@ -3240,16 +3241,34 @@ py_tests(
 )
 
 py_library(
-    name = "layers",
+    name = "layers_base",
     srcs = [
         "layers/__init__.py",
         "layers/base.py",
+        "layers/utils.py",
+    ],
+    deps = [
+        ":array_ops",
+        ":control_flow_ops",
+        ":framework",
+        ":framework_for_generated_wrappers",
+        ":init_ops",
+        ":util",
+        ":variable_scope",
+        ":variables",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+    ],
+)
+
+py_library(
+    name = "layers",
+    srcs = [
         "layers/convolutional.py",
         "layers/core.py",
         "layers/layers.py",
         "layers/normalization.py",
         "layers/pooling.py",
-        "layers/utils.py",
     ],
     srcs_version = "PY2AND3",
     deps = [
@@ -3258,6 +3277,7 @@ py_library(
         ":framework",
         ":framework_for_generated_wrappers",
         ":init_ops",
+        ":layers_base",
         ":math_ops",
         ":nn",
         ":standard_ops",
diff --git a/tensorflow/python/layers/base.py b/tensorflow/python/layers/base.py
index 21b0ba7626..ff9a777f19 100644
--- a/tensorflow/python/layers/base.py
+++ b/tensorflow/python/layers/base.py
@@ -35,6 +35,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import variables as tf_variables
 from tensorflow.python.ops import variable_scope as vs
 from tensorflow.python.util import nest
+from tensorflow.python.util import tf_inspect
 
 
 class _Layer(object):
@@ -279,8 +280,7 @@ class _Layer(object):
       inputs: input tensor(s).
       *args: additional positional arguments to be passed to `self.call`.
       **kwargs: additional keyword arguments to be passed to `self.call`.
-        **Note**, the kwarg 'scope' is reserved for use by the Layer.
-
+        **Note**: kwarg `scope` is reserved for use by the layer.
     Returns:
       Output tensor(s).
     """
@@ -328,6 +328,8 @@ class _Layer(object):
           else:
             self.build(input_shapes)
           self._built = True
+        if 'scope' in tf_inspect.getargspec(self.call).args:
+          kwargs['scope'] = scope
         outputs = self.call(inputs, *args, **kwargs)
 
         # Apply activity regularization.
@@ -365,19 +367,20 @@ class _Layer(object):
         setattr(result, k, copy.deepcopy(v, memo))
     return result
 
-  def apply(self, inputs, **kwargs):
+  def apply(self, inputs, *args, **kwargs):
     """Apply the layer on a input.
 
     This simply wraps `self.__call__`.
 
     Arguments:
       inputs: Input tensor(s).
+      *args: additional positional arguments to be passed to `self.call`.
       **kwargs: additional keyword arguments to be passed to `self.call`.
 
     Returns:
       Output tensor(s).
     """
-    return self.__call__(inputs, **kwargs)
+    return self.__call__(inputs, *args, **kwargs)
 
 
 def _to_snake_case(name):
diff --git a/tensorflow/python/ops/rnn_cell_impl.py b/tensorflow/python/ops/rnn_cell_impl.py
index c3dddf85f3..32ebe0c2e8 100644
--- a/tensorflow/python/ops/rnn_cell_impl.py
+++ b/tensorflow/python/ops/rnn_cell_impl.py
@@ -26,6 +26,7 @@ from __future__ import print_function
 
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.layers import base as base_layer
 from tensorflow.python.ops import array_ops
 from tensorflow.python.util import nest
 
@@ -74,7 +75,7 @@ def _zero_state_tensors(state_size, batch_size, dtype):
   return zeros
 
 
-class _RNNCell(object):
+class _RNNCell(base_layer._Layer):  # pylint: disable=protected-access
   """Abstract object representing an RNN cell.
 
   Every `RNNCell` must have the properties below and implement `__call__` with
@@ -111,7 +112,7 @@ class _RNNCell(object):
       - New state: Either a single `2-D` tensor, or a tuple of tensors matching
         the arity and shapes of `state`.
     """
-    raise NotImplementedError("Abstract method")
+    return super(_RNNCell, self).__call__(inputs, state, scope=scope)
 
   @property
   def state_size(self):
-- 
GitLab


From 7bc6271055714f3d4d0b957a2f4c6a910ea20388 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Fri, 21 Apr 2017 17:55:28 -0800
Subject: [PATCH 0627/1563] Copy function def to the optimized graph in the
 autoparallel optimizer. Change: 153896372

---
 tensorflow/core/grappler/op_types.cc          |  7 +++++
 tensorflow/core/grappler/op_types.h           |  1 +
 tensorflow/core/grappler/optimizers/BUILD     |  1 +
 .../core/grappler/optimizers/auto_parallel.cc | 28 +++++++++++--------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/tensorflow/core/grappler/op_types.cc b/tensorflow/core/grappler/op_types.cc
index e928e21264..266d74976f 100644
--- a/tensorflow/core/grappler/op_types.cc
+++ b/tensorflow/core/grappler/op_types.cc
@@ -18,6 +18,13 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+bool IsDequeueOp(const NodeDef& node) {
+  static const std::set<std::string> dequeue_ops = {
+      "QueueDequeueManyV2", "QueueDequeueMany", "QueueDequeueV2",
+      "QueueDequeue"};
+  return dequeue_ops.count(node.op()) > 0;
+}
+
 bool IsPlaceholder(const NodeDef& node) {
   const auto op = node.op();
   return op == "Placeholder" || op == "PlaceholderV2";
diff --git a/tensorflow/core/grappler/op_types.h b/tensorflow/core/grappler/op_types.h
index 2f83325c9d..2f58835628 100644
--- a/tensorflow/core/grappler/op_types.h
+++ b/tensorflow/core/grappler/op_types.h
@@ -21,6 +21,7 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+bool IsDequeueOp(const NodeDef& node);
 bool IsPlaceholder(const NodeDef& node);
 bool IsVariable(const NodeDef& node);
 
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 64d5815bf7..d7a7989dfa 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -40,6 +40,7 @@ cc_library(
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:devices",
         "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:op_types",
         "//tensorflow/core/grappler:utils",
         "//tensorflow/core/grappler/clusters:cluster",
     ],
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.cc b/tensorflow/core/grappler/optimizers/auto_parallel.cc
index 77ab178653..b5497d3594 100644
--- a/tensorflow/core/grappler/optimizers/auto_parallel.cc
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.cc
@@ -14,11 +14,14 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/optimizers/auto_parallel.h"
+
 #include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/function.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
 #include "tensorflow/core/grappler/clusters/cluster.h"
 #include "tensorflow/core/grappler/devices.h"
 #include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/op_types.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 
@@ -94,22 +97,22 @@ Status AutoParallel::Initialize(const GrapplerItem& item) {
     VLOG(2) << "Variable: " << var->name();
   }
 
-  std::set<string> apply_gradients_ops = {"ApplyGradientDescent",
-                                          "ApplyProximalGradientDescent",
-                                          "ApplyAdadelta",
-                                          "ApplyAdagrad",
-                                          "ApplyProximalAdagrad",
-                                          "ApplyAdagradDA",
-                                          "ApplyFtrl",
-                                          "ApplyMomentum",
-                                          "ApplyAdam",
-                                          "ApplyRMSProp",
-                                          "ApplyCenteredRMSProp"};
+  const std::set<string> apply_gradients_ops = {"ApplyGradientDescent",
+                                                "ApplyProximalGradientDescent",
+                                                "ApplyAdadelta",
+                                                "ApplyAdagrad",
+                                                "ApplyProximalAdagrad",
+                                                "ApplyAdagradDA",
+                                                "ApplyFtrl",
+                                                "ApplyMomentum",
+                                                "ApplyAdam",
+                                                "ApplyRMSProp",
+                                                "ApplyCenteredRMSProp"};
   const NodeDef* dequeue_node = nullptr;
   for (int i = 0; i < graph_.node_size(); i++) {
     all_nodes_.insert(
         std::make_pair(graph_.node(i).name(), graph_.mutable_node(i)));
-    if (graph_.node(i).op() == "QueueDequeueManyV2") {
+    if (IsDequeueOp(graph_.node(i))) {
       dequeue_node = graph_.mutable_node(i);
     }
     if (apply_gradients_ops.find(graph_.node(i).op()) !=
@@ -241,6 +244,7 @@ void AutoParallel::BuildGraph(GraphDef* graph) {
   for (const auto& fetch : item_->fetch) {
     AddNodeControl(fetch, {control->name()}, graph);
   }
+  *(graph->mutable_library()) = item_->graph.library();
   LOG(INFO) << "Parallelized graph size: " << graph->node_size();
 }
 
-- 
GitLab


From 3c0900a49c11b7975c7accc026153bbc2001c018 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Fri, 21 Apr 2017 20:16:56 -0800
Subject: [PATCH 0628/1563] Fix python3 build caused by recent RNNCell
 refactor. Change: 153902768

---
 tensorflow/python/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index b522c5044c..cad8ccaaad 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -3247,6 +3247,7 @@ py_library(
         "layers/base.py",
         "layers/utils.py",
     ],
+    srcs_version = "PY2AND3",
     deps = [
         ":array_ops",
         ":control_flow_ops",
-- 
GitLab


From 326942394e69074d50d5889218a24c9371eff259 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Sat, 22 Apr 2017 06:08:17 -0800
Subject: [PATCH 0629/1563] Merge changes from github. Change: 153925676

---
 README.md                                     |   15 +-
 RELEASE.md                                    |    3 +
 configure                                     |   22 +-
 tensorflow/BUILD                              |   24 +-
 tensorflow/compiler/aot/tfcompile.bzl         |    1 +
 .../contrib/ffmpeg/default/ffmpeg_lib.cc      |    2 +-
 .../learn/python/learn/datasets/mnist.py      |   31 +-
 .../python/learn/estimators/estimator_test.py |   14 -
 .../makefile/compile_linux_protobuf.sh        |    2 +-
 .../rnn/python/kernel_tests/lstm_ops_test.py  |    4 +-
 .../seq2seq/python/ops/attention_wrapper.py   |    2 +-
 tensorflow/contrib/slim/README.md             |    2 +-
 tensorflow/contrib/verbs/BUILD                |  168 +++
 tensorflow/contrib/verbs/README.md            |   77 +
 tensorflow/contrib/verbs/design_diagram.png   |  Bin 0 -> 13625 bytes
 tensorflow/contrib/verbs/grpc_verbs_client.cc |   47 +
 tensorflow/contrib/verbs/grpc_verbs_client.h  |   50 +
 .../contrib/verbs/grpc_verbs_service.cc       |  165 +++
 tensorflow/contrib/verbs/grpc_verbs_service.h |   72 +
 .../contrib/verbs/grpc_verbs_service_impl.cc  |   68 +
 .../contrib/verbs/grpc_verbs_service_impl.h   |   89 ++
 tensorflow/contrib/verbs/rdma.cc              |  874 +++++++++++
 tensorflow/contrib/verbs/rdma.h               |  277 ++++
 tensorflow/contrib/verbs/rdma_mgr.cc          |  133 ++
 tensorflow/contrib/verbs/rdma_mgr.h           |   54 +
 .../contrib/verbs/rdma_rendezvous_mgr.cc      |  149 ++
 .../contrib/verbs/rdma_rendezvous_mgr.h       |   64 +
 tensorflow/contrib/verbs/verbs_server_lib.cc  |  172 +++
 tensorflow/contrib/verbs/verbs_server_lib.h   |   66 +
 tensorflow/contrib/verbs/verbs_service.proto  |   60 +
 tensorflow/contrib/verbs/verbs_util.cc        |   61 +
 tensorflow/contrib/verbs/verbs_util.h         |   41 +
 tensorflow/core/BUILD                         |   14 +-
 tensorflow/core/debug/debug_io_utils.cc       |    2 +
 .../rpc/grpc_server_lib.cc                    |   26 +-
 .../distributed_runtime/rpc/grpc_server_lib.h |   18 +
 tensorflow/core/framework/function_testlib.cc |   44 +-
 tensorflow/core/graph/mkl_layout_pass.cc      | 1275 ++++++++++++-----
 tensorflow/core/graph/mkl_layout_pass_test.cc |  561 +++++++-
 tensorflow/core/graph/mkl_optimizer_merge.cc  |  651 ---------
 tensorflow/core/graph/mkl_optimizer_merge.h   |   36 -
 .../core/graph/mkl_optimizer_merge_test.cc    |  470 ------
 .../core/graph/mkl_tfconversion_pass.cc       |   55 +-
 .../core/graph/mkl_tfconversion_pass_test.cc  |  153 +-
 .../core/grappler/optimizers/auto_parallel.cc |    2 +-
 tensorflow/core/kernels/BUILD                 |   32 +
 .../kernels/fixed_length_record_reader_op.cc  |   40 +-
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |   42 +-
 tensorflow/core/kernels/mkl_concat_op.cc      |  458 ++++++
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |   12 +-
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |   12 +-
 .../core/kernels/mkl_conv_grad_input_ops.cc   |   12 +-
 tensorflow/core/kernels/mkl_conv_ops.cc       |   24 +-
 .../core/kernels/mkl_fused_batch_norm_op.cc   |  689 +++++++++
 tensorflow/core/kernels/mkl_lrn_op.cc         |  722 ++++++++++
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |   74 +-
 tensorflow/core/kernels/mkl_relu_op.cc        |   32 +-
 tensorflow/core/kernels/mkl_reshape_op.cc     |  149 ++
 tensorflow/core/kernels/mkl_tfconv_op.cc      |   10 +-
 tensorflow/core/kernels/quantized_conv_ops.cc |    4 +-
 .../kernels/sparse_tensor_dense_matmul_op.cc  |  143 +-
 .../kernels/sparse_tensor_dense_matmul_op.h   |    5 +-
 .../sparse_tensor_dense_matmul_op_gpu.cu.cc   |   37 +-
 tensorflow/core/ops/array_ops.cc              |   58 +
 tensorflow/core/ops/io_ops.cc                 |   12 +
 tensorflow/core/ops/nn_ops.cc                 |  257 +++-
 tensorflow/core/ops/ops.pbtxt                 |   53 +
 tensorflow/core/ops/sparse_ops.cc             |    3 +-
 .../core/platform/default/build_config.bzl    |   12 +-
 .../platform/default/build_config_root.bzl    |    8 +
 tensorflow/core/public/version.h              |    4 +-
 tensorflow/core/util/mkl_util.h               |  271 +++-
 tensorflow/docs_src/community/style_guide.md  |   50 +-
 tensorflow/docs_src/extend/adding_an_op.md    |    6 +-
 .../docs_src/get_started/get_started.md       |    2 +-
 tensorflow/docs_src/get_started/monitors.md   |    9 +-
 tensorflow/docs_src/get_started/tflearn.md    |    2 +-
 tensorflow/docs_src/install/install_c.md      |    2 +-
 tensorflow/docs_src/install/install_go.md     |    2 +-
 tensorflow/docs_src/install/install_java.md   |   16 +-
 tensorflow/docs_src/install/install_linux.md  |   28 +-
 tensorflow/docs_src/install/install_mac.md    |   14 +-
 .../docs_src/install/install_sources.md       |    5 +-
 .../docs_src/install/install_windows.md       |    4 +-
 .../fully_connected_preloaded_var.py          |    3 +-
 .../tutorials/mnist/mnist_with_summaries.py   |   17 +-
 tensorflow/python/BUILD                       |    5 +-
 tensorflow/python/framework/dtypes_test.py    |    2 +-
 .../python/kernel_tests/reader_ops_test.py    |   54 +
 .../sparse_tensor_dense_matmul_grad_test.py   |   42 +-
 .../sparse_tensor_dense_matmul_op_test.py     |   19 +-
 .../python/layers/convolutional_test.py       |    2 +-
 .../python/layers/normalization_test.py       |    2 +-
 tensorflow/python/layers/utils_test.py        |    2 +-
 tensorflow/python/ops/batch_norm_benchmark.py |    2 +-
 tensorflow/python/ops/io_ops.py               |   14 +-
 tensorflow/python/ops/nn_impl.py              |   28 +-
 tensorflow/python/ops/sparse_grad.py          |   14 +-
 tensorflow/python/ops/sparse_ops.py           |    6 +-
 .../stream_executor_internal.h                |    2 +-
 tensorflow/tensorboard/DEVELOPMENT.md         |    2 +-
 .../tensorboard/dist/tf-tensorboard.html      |   20 +-
 tensorflow/tensorboard/gulp_tasks/bower.js    |    4 +-
 tensorflow/tensorboard/gulp_tasks/compile.js  |   34 +-
 tensorflow/tensorboard/gulp_tasks/test.js     |    4 +-
 tensorflow/tensorboard/gulp_tasks/util.js     |    6 +-
 .../tensorboard/gulp_tasks/vulcanize.js       |   27 +-
 tensorflow/tensorboard/gulpfile.js            |   20 +-
 tensorflow/tensorboard/package.json           |    2 +-
 ...nsorflow.-fixed-length-record-reader.pbtxt |    2 +-
 tensorflow/tools/docker/Dockerfile.devel      |    4 +-
 tensorflow/tools/docker/Dockerfile.devel-gpu  |    4 +-
 tensorflow/tools/pip_package/setup.py         |    2 +-
 third_party/jemalloc.BUILD                    |   33 +-
 third_party/llvm/llvm.BUILD                   |    5 +
 115 files changed, 7578 insertions(+), 2236 deletions(-)
 create mode 100644 tensorflow/contrib/verbs/BUILD
 create mode 100644 tensorflow/contrib/verbs/README.md
 create mode 100644 tensorflow/contrib/verbs/design_diagram.png
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_client.cc
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_client.h
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service.cc
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service.h
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
 create mode 100644 tensorflow/contrib/verbs/grpc_verbs_service_impl.h
 create mode 100644 tensorflow/contrib/verbs/rdma.cc
 create mode 100644 tensorflow/contrib/verbs/rdma.h
 create mode 100644 tensorflow/contrib/verbs/rdma_mgr.cc
 create mode 100644 tensorflow/contrib/verbs/rdma_mgr.h
 create mode 100644 tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
 create mode 100644 tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
 create mode 100644 tensorflow/contrib/verbs/verbs_server_lib.cc
 create mode 100644 tensorflow/contrib/verbs/verbs_server_lib.h
 create mode 100644 tensorflow/contrib/verbs/verbs_service.proto
 create mode 100644 tensorflow/contrib/verbs/verbs_util.cc
 create mode 100644 tensorflow/contrib/verbs/verbs_util.h
 delete mode 100644 tensorflow/core/graph/mkl_optimizer_merge.cc
 delete mode 100644 tensorflow/core/graph/mkl_optimizer_merge.h
 delete mode 100644 tensorflow/core/graph/mkl_optimizer_merge_test.cc
 create mode 100644 tensorflow/core/kernels/mkl_concat_op.cc
 create mode 100644 tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
 create mode 100644 tensorflow/core/kernels/mkl_lrn_op.cc
 create mode 100644 tensorflow/core/kernels/mkl_reshape_op.cc

diff --git a/README.md b/README.md
index 3ab4773681..951e7c3b9f 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,13 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
@@ -62,7 +63,7 @@ $ python
 
 ## For more information
 
-* [TensorFlow website](http://tensorflow.org)
+* [TensorFlow website](https://tensorflow.org)
 * [TensorFlow whitepaper](http://download.tensorflow.org/paper/whitepaper2015.pdf)
 * [TensorFlow Model Zoo](https://github.com/tensorflow/models)
 * [TensorFlow MOOC on Udacity](https://www.udacity.com/course/deep-learning--ud730)
diff --git a/RELEASE.md b/RELEASE.md
index 6087390c9c..fe6d052640 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -36,6 +36,7 @@
   * New navigation bar in Curses-based UI
   * NodeStepper (command `invoke_stepper`) now uses intermediate tensor dumps. It also uses `TensorHandles` as direct feeds during successive `cont` calls for improved performance and reduced memory consumption.
 * Initial release of installation guides for Java, C, and Go.
+* Added Text Dashboard to TensorBoard.
 
 ## Deprecations
 
@@ -91,6 +92,8 @@
   * Command history now persists across runs.
   * Bug fix in graph validation related to `tf.while_loops`.
 * Java Maven fixes for bugs with Windows installation.
+* Backport fixes and improvements from external keras.
+* Keras config file handling fix.
 
 ## Thanks to our Contributors
 
diff --git a/configure b/configure
index 47bdd5d018..fad3fdbebd 100755
--- a/configure
+++ b/configure
@@ -94,10 +94,10 @@ write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
 if false; then # Disable building with MKL for now
   while [ "$TF_NEED_MKL" == "" ]; do
     fromuser=""
-    read -p "Do you wish to build TensorFlow with MKL support? [y/N] " INPUT
+    read -p "Do you wish to build TensorFlow with MKL support (experimental)? [y/N] " INPUT
     fromuser="1"
     case $INPUT in
-      [Yy]* ) echo "MKL support will be enabled for TensorFlow"; TF_NEED_MKL=1;;
+      [Yy]* ) echo "MKL support (experimental) (will be enabled for TensorFlow"; TF_NEED_MKL=1;;
       [Nn]* ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
       "" ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
       * ) echo "Invalid selection: " $INPUT;;
@@ -244,6 +244,24 @@ if [[ "$TF_ENABLE_XLA" == "1" ]]; then
   write_to_bazelrc 'build --define with_xla_support=true'
 fi
 
+# Verbs configuration
+while [ "$TF_NEED_VERBS" == "" ]; do
+  read -p "Do you wish to build TensorFlow with "\
+"VERBS support? [y/N] " INPUT
+  case $INPUT in
+    [Yy]* ) echo "VERBS support will be enabled for "\
+"TensorFlow"; TF_NEED_VERBS=1;;
+    [Nn]* ) echo "No VERBS support will be enabled for "\
+"TensorFlow"; TF_NEED_VERBS=0;;
+    "" ) echo "No VERBS support will be enabled for "\
+"TensorFlow"; TF_NEED_VERBS=0;;
+    * ) echo "Invalid selection: " $INPUT;;
+  esac
+done
+
+if [[ "$TF_NEED_VERBS" == "1" ]]; then
+  write_to_bazelrc 'build --define with_verbs_support=true'
+fi
 
 # Invoke python_config and set up symlinks to python includes
 ./util/python/python_config.sh "$PYTHON_BIN_PATH"
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 0f7f848cb1..248b18e020 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -84,6 +84,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "linux_ppc64le",
+    values = {"cpu": "ppc"},
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "debug",
     values = {
@@ -108,7 +114,7 @@ config_setting(
 
 # TODO(jhseu): Enable on other platforms other than Linux.
 config_setting(
-    name = "with_jemalloc",
+    name = "with_jemalloc_linux_x86_64",
     values = {
         "cpu": "k8",
         "define": "with_jemalloc=true",
@@ -116,6 +122,15 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "with_jemalloc_linux_ppc64le",
+    values = {
+        "cpu": "ppc",
+        "define": "with_jemalloc=true",
+    },
+    visibility = ["//visibility:public"],
+)
+
 config_setting(
     name = "with_gcp_support",
     values = {"define": "with_gcp_support=true"},
@@ -134,6 +149,12 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "with_verbs_support",
+    values = {"define": "with_verbs_support=true"},
+    visibility = ["//visibility:public"],
+)
+
 package_group(
     name = "internal",
     packages = ["//tensorflow/..."],
@@ -249,6 +270,7 @@ filegroup(
         "//tensorflow/contrib/tfprof/python/tools/tfprof:all_files",
         "//tensorflow/contrib/training:all_files",
         "//tensorflow/contrib/util:all_files",
+        "//tensorflow/contrib/verbs:all_files",
         "//tensorflow/contrib/xla_tf_graph:all_files",
         "//tensorflow/core:all_files",
         "//tensorflow/core/debug:all_files",
diff --git a/tensorflow/compiler/aot/tfcompile.bzl b/tensorflow/compiler/aot/tfcompile.bzl
index 64e5bfd602..7d61bee8ca 100644
--- a/tensorflow/compiler/aot/tfcompile.bzl
+++ b/tensorflow/compiler/aot/tfcompile.bzl
@@ -282,5 +282,6 @@ def target_llvm_triple():
       "//tensorflow:android_arm": "armv7-none-android",
       "//tensorflow:android_arm64": "aarch64-none-android",
       "//tensorflow:android_x86": "i686-none-android",
+      "//tensorflow:linux_ppc64le": "ppc64le-ibm-linux-gnu",
       "//conditions:default": "x86_64-pc-linux",
   })
diff --git a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
index a758bb92aa..e520139e65 100644
--- a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
+++ b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
@@ -142,7 +142,7 @@ template <typename UInt>
 string LittleEndianData(UInt data) {
   static_assert(std::is_unsigned<UInt>::value, "UInt must be unsigned");
   string str;
-  for (int i = 0; i < sizeof(UInt); ++i) {
+  for (size_t i = 0; i < sizeof(UInt); ++i) {
     const unsigned char bits = static_cast<unsigned char>(data & 0xFFU);
     char ch;
     ::memcpy(&ch, &bits, sizeof(bits));
diff --git a/tensorflow/contrib/learn/python/learn/datasets/mnist.py b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
index fd50070dac..13f213c197 100644
--- a/tensorflow/contrib/learn/python/learn/datasets/mnist.py
+++ b/tensorflow/contrib/learn/python/learn/datasets/mnist.py
@@ -26,6 +26,7 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.contrib.learn.python.learn.datasets import base
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import random_seed
 
 # CVDF mirror of http://yann.lecun.com/exdb/mnist/
 SOURCE_URL = 'https://storage.googleapis.com/cvdf-datasets/mnist/'
@@ -109,12 +110,16 @@ class DataSet(object):
                fake_data=False,
                one_hot=False,
                dtype=dtypes.float32,
-               reshape=True):
+               reshape=True,
+               seed=None):
     """Construct a DataSet.
     one_hot arg is used only if fake_data is true.  `dtype` can be either
     `uint8` to leave the input as `[0, 255]`, or `float32` to rescale into
-    `[0, 1]`.
+    `[0, 1]`.  Seed arg provides for convenient deterministic testing.
     """
+    seed1, seed2 = random_seed.get_seed(seed)
+    # If op level seed is not set, use whatever graph level seed is returned
+    numpy.random.seed(seed1 if seed is None else seed2)
     dtype = dtypes.as_dtype(dtype).base_dtype
     if dtype not in (dtypes.uint8, dtypes.float32):
       raise TypeError('Invalid image dtype %r, expected uint8 or float32' %
@@ -208,11 +213,13 @@ def read_data_sets(train_dir,
                    one_hot=False,
                    dtype=dtypes.float32,
                    reshape=True,
-                   validation_size=5000):
+                   validation_size=5000,
+                   seed=None):
   if fake_data:
 
     def fake():
-      return DataSet([], [], fake_data=True, one_hot=one_hot, dtype=dtype)
+      return DataSet(
+          [], [], fake_data=True, one_hot=one_hot, dtype=dtype, seed=seed)
 
     train = fake()
     validation = fake()
@@ -254,12 +261,16 @@ def read_data_sets(train_dir,
   train_images = train_images[validation_size:]
   train_labels = train_labels[validation_size:]
 
-  train = DataSet(train_images, train_labels, dtype=dtype, reshape=reshape)
-  validation = DataSet(validation_images,
-                       validation_labels,
-                       dtype=dtype,
-                       reshape=reshape)
-  test = DataSet(test_images, test_labels, dtype=dtype, reshape=reshape)
+  train = DataSet(
+      train_images, train_labels, dtype=dtype, reshape=reshape, seed=seed)
+  validation = DataSet(
+      validation_images,
+      validation_labels,
+      dtype=dtype,
+      reshape=reshape,
+      seed=seed)
+  test = DataSet(
+      test_images, test_labels, dtype=dtype, reshape=reshape, seed=seed)
 
   return base.Datasets(train=train, validation=validation, test=test)
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
index ce2eb4e052..6e10fdb977 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
@@ -52,7 +52,6 @@ from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import parsing_ops
 from tensorflow.python.ops import variables as variables_lib
@@ -63,7 +62,6 @@ from tensorflow.python.saved_model import tag_constants
 from tensorflow.python.training import basic_session_run_hooks
 from tensorflow.python.training import input as input_lib
 from tensorflow.python.training import monitored_session
-from tensorflow.python.training import queue_runner_impl
 from tensorflow.python.training import saver as saver_lib
 from tensorflow.python.training import session_run_hook
 from tensorflow.python.util import compat
@@ -82,18 +80,6 @@ def boston_input_fn(num_epochs=None):
   return features, labels
 
 
-def boston_input_fn_with_queue(num_epochs=None):
-  features, labels = boston_input_fn(num_epochs=num_epochs)
-
-  # Create a minimal queue runner.
-  fake_queue = data_flow_ops.FIFOQueue(30, dtypes.int32)
-  queue_runner = queue_runner_impl.QueueRunner(fake_queue,
-                                               [constant_op.constant(0)])
-  queue_runner_impl.add_queue_runner(queue_runner)
-
-  return features, labels
-
-
 def iris_input_fn():
   iris = base.load_iris()
   features = array_ops.reshape(
diff --git a/tensorflow/contrib/makefile/compile_linux_protobuf.sh b/tensorflow/contrib/makefile/compile_linux_protobuf.sh
index 480fbcc215..6eb061a3c9 100755
--- a/tensorflow/contrib/makefile/compile_linux_protobuf.sh
+++ b/tensorflow/contrib/makefile/compile_linux_protobuf.sh
@@ -38,7 +38,7 @@ then
   exit 1
 fi
 
-./configure --prefix="${GENDIR}"
+./configure --prefix="${GENDIR}" --with-pic
 if [ $? -ne 0 ]
 then
   echo "./configure command failed."
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py b/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py
index 9a96d4e856..3a5cbf604d 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/lstm_ops_test.py
@@ -68,8 +68,8 @@ class LSTMBlockCellTest(test.TestCase):
         m3 = array_ops.zeros([1, 2])
         g, ((out_m0, out_m1),
             (out_m2, out_m3)) = core_rnn_cell_impl.MultiRNNCell(
-                [lstm_ops.LSTMBlockCell(2)] * 2, state_is_tuple=True)(x, (
-                    (m0, m1), (m2, m3)))
+                [lstm_ops.LSTMBlockCell(2) for _ in range(2)],
+                state_is_tuple=True)(x, ((m0, m1), (m2, m3)))
         sess.run([variables.global_variables_initializer()])
         res = sess.run([g, out_m0, out_m1, out_m2, out_m3], {
             x.name: np.array([[1., 1.]]),
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 023164d826..37622af59f 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -473,7 +473,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     if probability_fn is None:
       probability_fn = nn_ops.softmax
     else:
-      if not callable(cell_input_fn):
+      if not callable(probability_fn):
         raise TypeError(
             "probability_fn must be callable, saw type: %s"
             % type(probability_fn).__name__)
diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md
index dae50e67c5..c8842dd57b 100644
--- a/tensorflow/contrib/slim/README.md
+++ b/tensorflow/contrib/slim/README.md
@@ -447,7 +447,7 @@ vgg = tf.contrib.slim.nets.vgg
 images, labels = ...
 
 # Create the model.
-predictions = vgg.vgg16(images)
+predictions = vgg.vgg_16(images)
 
 # Define the loss functions and get the total loss.
 loss = slim.losses.softmax_cross_entropy(predictions, labels)
diff --git a/tensorflow/contrib/verbs/BUILD b/tensorflow/contrib/verbs/BUILD
new file mode 100644
index 0000000000..e747fa4c9e
--- /dev/null
+++ b/tensorflow/contrib/verbs/BUILD
@@ -0,0 +1,168 @@
+# Description:
+#   Verbs RDMA communication interfaces and implementations for TensorFlow.
+
+package(default_visibility = [
+    "//tensorflow:__subpackages__",
+])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+filegroup(
+    name = "c_srcs",
+    data = glob([
+        "**/*.cc",
+        "**/*.h",
+    ]),
+)
+
+# For platform specific build config
+load(
+    "//tensorflow/core:platform/default/build_config.bzl",
+    "tf_proto_library_cc",
+)
+
+tf_proto_library_cc(
+    name = "verbs_service_proto",
+    srcs = ["verbs_service.proto"],
+    has_services = 1,
+    cc_api_version = 2,
+    visibility = [
+        "//tensorflow:__subpackages__",
+    ],
+)
+
+cc_library(
+    name = "verbs_util",
+    srcs = ["verbs_util.cc"],
+    hdrs = ["verbs_util.h"],
+    deps = [
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:gpu_runtime",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+cc_library(
+    name = "grpc_verbs_service",
+    srcs = ["grpc_verbs_service.cc"],
+    hdrs = ["grpc_verbs_service.h"],
+    deps = [
+        ":grpc_verbs_service_impl",
+        ":rdma_mgr",
+        ":verbs_service_proto_cc",
+        "//tensorflow/core:lib",
+        "//tensorflow/core/distributed_runtime:session_mgr",
+        "//tensorflow/core/distributed_runtime:worker_env",
+        "//tensorflow/core/distributed_runtime/rpc:async_service_interface",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_call",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_util",
+        "@grpc//:grpc++_unsecure",
+    ],
+    alwayslink = 1,
+)
+
+cc_library(
+    name = "grpc_verbs_service_impl",
+    srcs = ["grpc_verbs_service_impl.cc"],
+    hdrs = ["grpc_verbs_service_impl.h"],
+    deps = [
+        ":verbs_service_proto_cc",
+        "@grpc//:grpc++_unsecure",
+    ],
+)
+
+cc_library(
+    name = "grpc_verbs_client",
+    srcs = ["grpc_verbs_client.cc"],
+    hdrs = ["grpc_verbs_client.h"],
+    deps = [
+        ":grpc_verbs_service_impl",
+        ":verbs_service_proto_cc",
+        "//tensorflow/core:lib",
+        "//tensorflow/core/distributed_runtime:call_options",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_util",
+    ],
+    alwayslink = 1,
+)
+
+cc_library(
+    name = "rdma_rendezvous_mgr",
+    srcs = ["rdma_rendezvous_mgr.cc"],
+    hdrs = ["rdma_rendezvous_mgr.h"],
+    deps = [
+        ":rdma_mgr",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core/distributed_runtime:base_rendezvous_mgr",
+        "//tensorflow/core/distributed_runtime:worker_env",
+    ],
+)
+
+cc_library(
+    name = "rdma_mgr",
+    srcs = ["rdma_mgr.cc"],
+    hdrs = ["rdma_mgr.h"],
+    deps = [
+        ":grpc_verbs_client",
+        ":rdma",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core/distributed_runtime:worker_env",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_channel",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_worker_cache",
+    ],
+)
+
+cc_library(
+    name = "rdma",
+    srcs = ["rdma.cc"],
+    hdrs = ["rdma.h"],
+    linkopts = select({
+        "//tensorflow:with_verbs_support": ["-libverbs"],
+        "//conditions:default": [],
+    }),
+    deps = [
+        ":verbs_util",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:gpu_runtime",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core/distributed_runtime:rendezvous_mgr_interface",
+        "//tensorflow/core/distributed_runtime:session_mgr",
+        "//tensorflow/core/distributed_runtime:worker_env",
+    ],
+)
+
+cc_library(
+    name = "verbs_server_lib",
+    srcs = ["verbs_server_lib.cc"],
+    hdrs = ["verbs_server_lib.h"],
+    linkstatic = 1,  # Seems to be needed since alwayslink is broken in bazel
+    deps = [
+        ":grpc_verbs_service",
+        ":rdma_mgr",
+        ":rdma_rendezvous_mgr",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib",
+    ],
+    alwayslink = 1,
+)
diff --git a/tensorflow/contrib/verbs/README.md b/tensorflow/contrib/verbs/README.md
new file mode 100644
index 0000000000..37a543dda8
--- /dev/null
+++ b/tensorflow/contrib/verbs/README.md
@@ -0,0 +1,77 @@
+## How to compile and use Rdma-enabled tensorflow
+1. Follow the regular TF compilation instructions. During configure step, if you want ibverbs based Rdma support, answer yes to this question:
+
+    ```Do you wish to build TensorFlow with VERBS-RDMA support [y/N]```
+
+2. To turn on Rdma connection, add the protocol "grpc+verbs" in server definition:
+
+    ```server = tf.train.Server(cluster, job_name="local", task_index=0, protocol='grpc+verbs') # default protocol is 'grpc'```
+
+## Overview
+The design is based on Tensorflow r1.0. An Rdma path is added between servers for tensor transfer (weights, gradients, etc). The existing GRPC path remains and is responsible for "administrative" tasks, such as setting up the Rdma path, exchanging computation graphs, etc.
+
+During the server setup, an Rdma manager is created to manage low-level Rdma components such as Rdma channel and Rdma adapter, an Rdma rendezvous manager is created to oversee send/recv operations between servers. Following the distributed Tensorflow design philosophy, the send operation is passive, i.e. merely placing a tensor in the local out-going table. It is the receive operation that actually initiates the tensor transfer.
+
+Tensorflow dynamically allocates memory for tensors that are to be sent or received. This causes difficulty for Rdma operations where pinned memory is required. Two remedies are possible, either the memory is pinned, transfer, then unpinned for each and every tensor to be transferred, or a buffer is pre-allocated and pinned for each tensor. The former incurs significant operation overhead since pinning and unpinning memory for each dynamically generated tensor is slow. The latter incurs large memory overhead and extra copying from the tensor to its pinned buffer, but may still be faster than the former. The second approach is adopted in this design. Each Rdma channel, representing a Rdma connection to a peer, contains a table of pinned buffers for all the seen tensors that requires transfer. It is assumed that the tensor size rarely changes across different steps. So only one buffer is created for the same tensor across all the steps. In the rare case when the tensor size does increases, the old buffer is discarded and new buffer of larger size is created and pinned.
+
+When a tensor is prepared fro transfer, it is first converted to TensorProto, then the proto is serialized to byte array and copied to the pinned buffer. The content of the buffer is transferred to the remote node via Rdma write. On the remote side, the process is reversed. This is illustrated in the diagram below. The conversion of TensorProto is introduced to simplify transfer of string-tensors. Also since the TensorProto lives in host memory, even if the origin tensor lives in the device, the pinned buffers are all allocated in the host memory.
+![Tensorflow Rdma path](./design_diagram.png)
+
+The following improvements can be made in the future. First, conversion to TensorProto and serialization can be avoided for numeric (float/int) tensors since their internal buffer can be access directly as byte array. Second, the pinned buffer may be allocated on device if the tensor is located in the device. This avoids extra device-to-host copy at the expense of extra device memory consumption.
+## Design details
+
+### Rdma components
+
+* **Rdma adapter:** The base for Rdma communications. It may contain multiple channels and buffers.  It is responsible for handling various incoming Rdma messages.
+* **Rdma channel:** Responsible for Rdma connection to a particular node. It manages multiple buffers. A channel has a callback table which stores all the callbacks for the requested tensors.
+* **Rdma buffer:** Responsible for sending or receiving data. It has a fixed size memory to store the data. It has a queue to store the pending jobs. There are three types of buffers, message buffer, ACK buffer and tensor buffer. A channel has two message buffers, two ack buffers and many tensor buffers.
+* **Rdma manager:** Manages the adapter and channels, including channel creation, channel setup via GRPC service, channel lookup, etc.
+* **Rdma rendezvous manager:** manages multiple rdma rendezvous. 
+* **Rdma rendezvous:** a derived class of BaseRemoteRendezvous. This class is the back end for "send" and "recv" ops. When the sendrecv_op wants to send or receive a tensor, it calls the rendezvous' "send" and "recv" functions respectively. Rendezvous are identified by "step_id", a random number, so that tensors for different iterations don't get mixed up.
+
+### The SEND operation
+
+In tensorflow, when rendezvous sends a tensor, it merely puts a tensor in a local table in the corresponding rendezvous. If the tensor has been requested, a callback exists in the table. "send" will activate the callback, which tries to send the tensor across the node.
+
+
+### The RECV operation
+
+When a tensor is requested, rendezvous' recv function is called. The function first places a callback in the channel's callback table, which will be activated once the tensor is sent from the source. In the next step, a message is sent to notify the source of the requested tensor. Once the source receives the message, it will check locally for the tensor, if not found, a callback is placed in the table, otherwise, the tensor id will be placed at corresponding Rdma buffer's job queue for future transmission. When a tensor is scheduled to be transmitted, the Rdma buffer needs to have the memory allocated and initialized (registered with the remote buffer info). If the memory is not ready, the transmission is deferred, a message is sent to the destination to establish the memory first. The other case a transimssion can be deferred is when the buffer is still being used by an on-going transmission.
+
+### Three types of Rdma buffers
+
+* **Message buffer:** responsible for sending message only.
+* **Ack buffer:** once a message is sent, the recipient needs to send an ack via the ack buffer to free up the message buffer. An ack buffer is exclusively for its coupled message buffer.
+* **Tensor buffer:** responsible for sending tensors. The recipient needs to send back a message to free up the sending buffer.
+
+### Rdma packet format
+
+|type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|data_type|tensor_shape|tensor_bytes|tensor_buffer|
+
+### Six types of Rdma messages
+* RDMA_MESSAGE_ACK
+* RDMA_MESSAGE_BUFFER_IDLE
+* RDMA_MESSAGE_BUFFER_REQUEST
+* RDMA_MESSAGE_BUFFER_RESPONSE
+* RDMA_MESSAGE_TENSOR_REQUEST
+* RDMA_MESSAGE_TENSOR_WRITE
+
+### Actions upon receiving Rdma messages
+* RDMA_MESSAGE_ACK
+  * sender: mark local ack buffer idle.
+  * receiver: mark remote message buffer idle, send next item.
+* RDMA_MESSAGE_BUFFER_IDLE
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, set remote tensor buffer idle, send next item.
+* RDMA_MESSAGE_BUFFER_REQUEST
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, find or create tensor buffer, send BUFFER_RESPONSE.
+* RDMA_MESSAGE_BUFFER_RESPONSE
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, set remote buffer info, set local and remote buffer idle, send next item.
+* RDMA_MESSAGE_TENSOR_REQUEST
+  * sender: mark local message buffer idle, send next item.
+  * receiver: send ack, find or create tensor buffer, enqueue tensor id, send next item.
+* RDMA_MESSAGE_TENSOR_WRITE
+  * sender: mark local message buffer idle, send next item.
+  * receiver: run callback.
diff --git a/tensorflow/contrib/verbs/design_diagram.png b/tensorflow/contrib/verbs/design_diagram.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0ad27455fa72bbdd8018bd3977378d2aee468e7
GIT binary patch
literal 13625
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

literal 0
HcmV?d00001

diff --git a/tensorflow/contrib/verbs/grpc_verbs_client.cc b/tensorflow/contrib/verbs/grpc_verbs_client.cc
new file mode 100644
index 0000000000..608a9140d3
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_client.cc
@@ -0,0 +1,47 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/verbs/grpc_verbs_client.h"
+
+#include "tensorflow/core/distributed_runtime/rpc/grpc_util.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+Status GrpcVerbsClient::GetRemoteAddress(CallOptions* call_options,
+                                         const GetRemoteAddressRequest* request,
+                                         GetRemoteAddressResponse* response) {
+  ::grpc::ClientContext ctx;
+  ctx.set_fail_fast(false);
+  SetDeadline(&ctx, call_options->GetTimeout());
+  return FromGrpcStatus(stub_->GetRemoteAddress(&ctx, *request, response));
+}
+
+Status GrpcVerbsClient::GetRemoteAddress(const GetRemoteAddressRequest* request,
+                                         GetRemoteAddressResponse* response) {
+  CallOptions call_options;
+  call_options.SetTimeout(-1);  // no time out
+  return GetRemoteAddress(&call_options, request, response);
+}
+
+void GrpcVerbsClient::SetDeadline(::grpc::ClientContext* ctx,
+                                  int64 time_in_ms) {
+  if (time_in_ms > 0) {
+    ctx->set_deadline(gpr_time_from_millis(time_in_ms, GPR_TIMESPAN));
+  }
+}
+
+}  // namespace tensorflow
\ No newline at end of file
diff --git a/tensorflow/contrib/verbs/grpc_verbs_client.h b/tensorflow/contrib/verbs/grpc_verbs_client.h
new file mode 100644
index 0000000000..358977f925
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_client.h
@@ -0,0 +1,50 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_CLIENT_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_CLIENT_H_
+
+#include "tensorflow/contrib/verbs/grpc_verbs_service_impl.h"
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+#include "tensorflow/core/distributed_runtime/call_options.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_util.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+// GrpcVerbsClient is a client that uses gRPC to talk to the Verbs service.
+class GrpcVerbsClient {
+ public:
+  explicit GrpcVerbsClient(SharedGrpcChannelPtr client_channel)
+      : stub_(grpc::VerbsService::NewStub(client_channel)) {}
+  ~GrpcVerbsClient() {}
+
+  Status GetRemoteAddress(CallOptions* call_options,
+                          const GetRemoteAddressRequest* request,
+                          GetRemoteAddressResponse* response);
+  Status GetRemoteAddress(const GetRemoteAddressRequest* request,
+                          GetRemoteAddressResponse* response);
+
+ private:
+  std::unique_ptr<grpc::VerbsService::Stub> stub_;
+
+  void SetDeadline(::grpc::ClientContext* ctx, int64 time_in_ms);
+
+  TF_DISALLOW_COPY_AND_ASSIGN(GrpcVerbsClient);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_CLIENT_H_
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service.cc b/tensorflow/contrib/verbs/grpc_verbs_service.cc
new file mode 100644
index 0000000000..e73b2700bd
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service.cc
@@ -0,0 +1,165 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "grpc++/alarm.h"
+#include "grpc++/grpc++.h"
+#include "grpc++/server_builder.h"
+
+#include "tensorflow/contrib/verbs/grpc_verbs_service.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_util.h"
+#include "tensorflow/core/distributed_runtime/session_mgr.h"
+
+namespace tensorflow {
+
+GrpcVerbsService::GrpcVerbsService(const WorkerEnv* worker_env,
+                                   ::grpc::ServerBuilder* builder)
+    : is_shutdown_(false), worker_env_(worker_env) {
+  builder->RegisterService(&verbs_service_);
+  cq_ = builder->AddCompletionQueue().release();
+}
+
+GrpcVerbsService::~GrpcVerbsService() {
+  delete shutdown_alarm_;
+  delete cq_;
+}
+
+void GrpcVerbsService::Shutdown() {
+  bool did_shutdown = false;
+  {
+    mutex_lock l(shutdown_mu_);
+    if (!is_shutdown_) {
+      LOG(INFO) << "Shutting down GrpcWorkerService.";
+      is_shutdown_ = true;
+      did_shutdown = true;
+    }
+  }
+  if (did_shutdown) {
+    shutdown_alarm_ =
+        new ::grpc::Alarm(cq_, gpr_now(GPR_CLOCK_MONOTONIC), nullptr);
+  }
+}
+
+// This macro creates a new request for the given RPC method name
+// (e.g., `ENQUEUE_REQUEST(GetRemoteAddress, false);`), and enqueues it on
+// `this->cq_`.
+//
+// This macro is invoked one or more times for each RPC method to
+// ensure that there are sufficient completion queue entries to
+// handle incoming requests without blocking.
+//
+// The implementation of the request handler for each RPC method
+// must ensure that it calls ENQUEUE_REQUEST() for that RPC method,
+// to keep accepting new requests.
+#define ENQUEUE_REQUEST(method, supports_cancel)                             \
+  do {                                                                       \
+    mutex_lock l(shutdown_mu_);                                              \
+    if (!is_shutdown_) {                                                     \
+      Call<GrpcVerbsService, grpc::VerbsService::AsyncService,               \
+           method##Request, method##Response>::                              \
+          EnqueueRequest(&verbs_service_, cq_,                               \
+                         &grpc::VerbsService::AsyncService::Request##method, \
+                         &GrpcVerbsService::method##Handler,                 \
+                         (supports_cancel));                                 \
+    }                                                                        \
+  } while (0)
+
+// This method blocks forever handling requests from the completion queue.
+void GrpcVerbsService::HandleRPCsLoop() {
+  for (int i = 0; i < 10; ++i) {
+    ENQUEUE_REQUEST(GetRemoteAddress, false);
+  }
+
+  void* tag;
+  bool ok;
+
+  while (cq_->Next(&tag, &ok)) {
+    UntypedCall<GrpcVerbsService>::Tag* callback_tag =
+        static_cast<UntypedCall<GrpcVerbsService>::Tag*>(tag);
+    if (callback_tag) {
+      callback_tag->OnCompleted(this, ok);
+    } else {
+      cq_->Shutdown();
+    }
+  }
+}
+
+void GrpcVerbsService::GetRemoteAddressHandler(
+    WorkerCall<GetRemoteAddressRequest, GetRemoteAddressResponse>* call) {
+  Status s = GetRemoteAddressSync(&call->request, &call->response);
+  call->SendResponse(ToGrpcStatus(s));
+  ENQUEUE_REQUEST(GetRemoteAddress, false);
+}
+
+// synchronous method
+Status GrpcVerbsService::GetRemoteAddressSync(
+    const GetRemoteAddressRequest* request,
+    GetRemoteAddressResponse* response) {
+  // analyzing request
+  // the channel setting part is redundant.
+  const string remote_host_name = request->host_name();
+  RdmaChannel* rc = rdma_mgr_->FindChannel(remote_host_name);
+  CHECK(rc);
+  RdmaAddress ra;
+  ra.lid = request->channel().lid();
+  ra.qpn = request->channel().qpn();
+  ra.psn = request->channel().psn();
+  rc->SetRemoteAddress(ra, false);
+  rc->Connect();
+  int i = 0;
+  int idx[] = {1, 0, 3, 2};
+  std::vector<RdmaBuffer*> mb(rc->message_buffers());
+  CHECK_EQ(request->mr_size(), 4);
+  for (const auto& mr : request->mr()) {
+    // the connections are crossed, i.e.
+    // local tx_message_buffer <---> remote rx_message_buffer_
+    // local rx_message_buffer <---> remote tx_message_buffer_
+    // local tx_ack_buffer <---> remote rx_ack_buffer_
+    // local rx_ack_buffer <---> remote tx_ack_buffer_
+    // hence idx[] = {1, 0, 3, 2}.
+    RdmaBuffer* rb = mb[idx[i]];
+    RemoteMR rmr;
+    rmr.remote_addr = mr.remote_addr();
+    rmr.rkey = mr.rkey();
+    rb->SetRemoteMR(rmr, false);
+    i++;
+  }
+  CHECK(i == RdmaChannel::kNumMessageBuffers);
+
+  // setting up response
+  response->set_host_name(
+      worker_env_->session_mgr->LegacySession()->worker_name);
+  Channel* channel_info = response->mutable_channel();
+  channel_info->set_lid(rc->self().lid);
+  channel_info->set_qpn(rc->self().qpn);
+  channel_info->set_psn(rc->self().psn);
+  for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
+    MemoryRegion* mr = response->add_mr();
+    mr->set_remote_addr(reinterpret_cast<uint64>(mb[i]->buffer()));
+    mr->set_rkey(mb[i]->self()->rkey);
+  }
+  return Status::OK();
+}
+
+// Create a GrpcVerbsService, then assign it to a given handle.
+void SetNewVerbsService(GrpcVerbsService** handle, const WorkerEnv* worker_env,
+                        ::grpc::ServerBuilder* builder) {
+  *handle = new GrpcVerbsService(worker_env, builder);
+}
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service.h b/tensorflow/contrib/verbs/grpc_verbs_service.h
new file mode 100644
index 0000000000..aa509602b5
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service.h
@@ -0,0 +1,72 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_GRPC_VERBS_SERVICE_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_GRPC_VERBS_SERVICE_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/grpc_verbs_service_impl.h"
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+#include "tensorflow/core/distributed_runtime/rpc/async_service_interface.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_call.h"
+#include "tensorflow/core/lib/core/refcount.h"
+
+namespace grpc {
+class ServerBuilder;
+class ServerCompletionQueue;
+class Alarm;
+}  // namespace grpc
+
+namespace tensorflow {
+
+class GrpcVerbsService : public AsyncServiceInterface {
+ public:
+  GrpcVerbsService(const WorkerEnv* worker_env, ::grpc::ServerBuilder* builder);
+  ~GrpcVerbsService();
+  void HandleRPCsLoop() override;
+  void Shutdown() override;
+  void SetRdmaMgr(RdmaMgr* rdma_mgr) { rdma_mgr_ = rdma_mgr; }
+
+ private:
+  template <class RequestMessage, class ResponseMessage>
+  using WorkerCall = Call<GrpcVerbsService, grpc::VerbsService::AsyncService,
+                          RequestMessage, ResponseMessage>;
+  void GetRemoteAddressHandler(
+      WorkerCall<GetRemoteAddressRequest, GetRemoteAddressResponse>* call);
+  Status GetRemoteAddressSync(const GetRemoteAddressRequest* request,
+                              GetRemoteAddressResponse* response);
+
+  ::grpc::ServerCompletionQueue* cq_;
+  grpc::VerbsService::AsyncService verbs_service_;
+  mutex shutdown_mu_;
+  bool is_shutdown_ GUARDED_BY(shutdown_mu_);
+  ::grpc::Alarm* shutdown_alarm_;
+  // not owned
+  RdmaMgr* rdma_mgr_;
+  const WorkerEnv* const worker_env_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(GrpcVerbsService);
+};
+
+// Create a GrpcVerbsService, then assign it to a given handle.
+void SetNewVerbsService(GrpcVerbsService** handle, const WorkerEnv* worker_env,
+                        ::grpc::ServerBuilder* builder);
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_GRPC_VERBS_SERVICE_H_
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc b/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
new file mode 100644
index 0000000000..e0ba78dbfd
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
@@ -0,0 +1,68 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/verbs/grpc_verbs_service_impl.h"
+
+#include "grpc++/impl/codegen/async_stream.h"
+#include "grpc++/impl/codegen/async_unary_call.h"
+#include "grpc++/impl/codegen/channel_interface.h"
+#include "grpc++/impl/codegen/client_unary_call.h"
+#include "grpc++/impl/codegen/method_handler_impl.h"
+#include "grpc++/impl/codegen/rpc_service_method.h"
+#include "grpc++/impl/codegen/service_type.h"
+#include "grpc++/impl/codegen/sync_stream.h"
+
+namespace tensorflow {
+
+namespace grpc {
+
+static const char* grpcVerbsService_method_names[] = {
+    "/tensorflow.VerbsService/GetRemoteAddress",
+};
+
+std::unique_ptr<VerbsService::Stub> VerbsService::NewStub(
+    const std::shared_ptr< ::grpc::ChannelInterface>& channel,
+    const ::grpc::StubOptions& options) {
+  std::unique_ptr<VerbsService::Stub> stub(new VerbsService::Stub(channel));
+  return stub;
+}
+
+VerbsService::Stub::Stub(
+    const std::shared_ptr< ::grpc::ChannelInterface>& channel)
+    : channel_(channel),
+      rpcmethod_GetRemoteAddress_(grpcVerbsService_method_names[0],
+                                  ::grpc::RpcMethod::NORMAL_RPC, channel) {}
+
+::grpc::Status VerbsService::Stub::GetRemoteAddress(
+    ::grpc::ClientContext* context, const GetRemoteAddressRequest& request,
+    GetRemoteAddressResponse* response) {
+  return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_GetRemoteAddress_,
+                                   context, request, response);
+}
+
+VerbsService::AsyncService::AsyncService() {
+  for (int i = 0; i < 1; ++i) {
+    AddMethod(new ::grpc::RpcServiceMethod(grpcVerbsService_method_names[i],
+                                           ::grpc::RpcMethod::NORMAL_RPC,
+                                           nullptr));
+    ::grpc::Service::MarkMethodAsync(i);
+  }
+}
+
+VerbsService::AsyncService::~AsyncService() {}
+
+}  // namespace grpc
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service_impl.h b/tensorflow/contrib/verbs/grpc_verbs_service_impl.h
new file mode 100644
index 0000000000..f7ea774b66
--- /dev/null
+++ b/tensorflow/contrib/verbs/grpc_verbs_service_impl.h
@@ -0,0 +1,89 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_SERVICE_IMPL_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_SERVICE_IMPL_H_
+
+#include "grpc++/impl/codegen/async_stream.h"
+#include "grpc++/impl/codegen/async_unary_call.h"
+#include "grpc++/impl/codegen/proto_utils.h"
+#include "grpc++/impl/codegen/rpc_method.h"
+#include "grpc++/impl/codegen/service_type.h"
+#include "grpc++/impl/codegen/status.h"
+#include "grpc++/impl/codegen/stub_options.h"
+#include "grpc++/impl/codegen/sync_stream.h"
+
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+
+namespace grpc {
+class CompletionQueue;
+class Channel;
+class RpcService;
+class ServerCompletionQueue;
+class ServerContext;
+}  // namespace grpc
+
+namespace tensorflow {
+
+namespace grpc {
+
+// Implementation of `tensorflow.VerbsService`, based on the
+// definition in "//tensorflow/contrib/verbs/verbs_service.proto",
+// and the gRPC generated stub and service classes.
+// See the proto file for the definition of methods and messages.
+class VerbsService GRPC_FINAL {
+ public:
+  class StubInterface {
+   public:
+    virtual ~StubInterface() {}
+    virtual ::grpc::Status GetRemoteAddress(
+        ::grpc::ClientContext* context, const GetRemoteAddressRequest& request,
+        GetRemoteAddressResponse* response) = 0;
+  };
+  class Stub GRPC_FINAL : public StubInterface {
+   public:
+    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
+    ::grpc::Status GetRemoteAddress(
+        ::grpc::ClientContext* context, const GetRemoteAddressRequest& request,
+        GetRemoteAddressResponse* response) GRPC_OVERRIDE;
+
+   private:
+    std::shared_ptr< ::grpc::ChannelInterface> channel_;
+    const ::grpc::RpcMethod rpcmethod_GetRemoteAddress_;
+  };
+  static std::unique_ptr<Stub> NewStub(
+      const std::shared_ptr< ::grpc::ChannelInterface>& channel,
+      const ::grpc::StubOptions& options = ::grpc::StubOptions());
+
+  class AsyncService : public ::grpc::Service {
+   public:
+    AsyncService();
+    virtual ~AsyncService();
+    void RequestGetRemoteAddress(
+        ::grpc::ServerContext* context, GetRemoteAddressRequest* request,
+        ::grpc::ServerAsyncResponseWriter<GetRemoteAddressResponse>* response,
+        ::grpc::CompletionQueue* new_call_cq,
+        ::grpc::ServerCompletionQueue* notification_cq, void* tag) {
+      ::grpc::Service::RequestAsyncUnary(0, context, request, response,
+                                         new_call_cq, notification_cq, tag);
+    }
+  };
+};
+
+}  // namespace grpc
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_GRPC_VERBS_SERVICE_IMPL_H_
diff --git a/tensorflow/contrib/verbs/rdma.cc b/tensorflow/contrib/verbs/rdma.cc
new file mode 100644
index 0000000000..53d840f5d1
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma.cc
@@ -0,0 +1,874 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/rdma.h"
+#include <cstdlib>
+#include "tensorflow/contrib/verbs/verbs_util.h"
+#include "tensorflow/core/common_runtime/device_mgr.h"
+#include "tensorflow/core/common_runtime/dma_helper.h"
+#include "tensorflow/core/common_runtime/gpu/gpu_util.h"
+#include "tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h"
+#include "tensorflow/core/distributed_runtime/session_mgr.h"
+#include "tensorflow/core/framework/rendezvous.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/hash/hash.h"
+#include "tensorflow/core/lib/random/random.h"
+
+namespace tensorflow {
+
+namespace {
+// hash name to 32-bit integer
+uint32_t NameHash(const string& name) {
+  return Hash32(name.data(), name.size(), 0x1234ABCD);
+}
+
+// convenience function for printing message
+string MessageTypeToString(RdmaMessageType rmt) {
+  switch (rmt) {
+    case RDMA_MESSAGE_ACK:
+      return "RDMA_MESSAGE_ACK";
+      break;
+    case RDMA_MESSAGE_BUFFER_IDLE:
+      return "RDMA_MESSAGE_BUFFER_IDLE";
+      break;
+    case RDMA_MESSAGE_BUFFER_REQUEST:
+      return "RDMA_MESSAGE_BUFFER_REQUEST";
+      break;
+    case RDMA_MESSAGE_BUFFER_RESPONSE:
+      return "RDMA_MESSAGE_BUFFER_RESPONSE";
+      break;
+    case RDMA_MESSAGE_TENSOR_REQUEST:
+      return "RDMA_MESSAGE_TENSOR_REQUEST";
+      break;
+    case RDMA_MESSAGE_TENSOR_WRITE:
+      return "RDMA_MESSAGE_TENSOR_WRITE";
+      break;
+    default:
+      return "UNKNOWN MESSAGE";
+  }
+}
+}  // namespace
+
+ibv_context* open_default_device() {
+  ibv_device** dev_list;
+  ibv_device* ib_dev;
+  dev_list = ibv_get_device_list(NULL);
+  CHECK(dev_list) << "No InfiniBand device found";
+  ib_dev = dev_list[0];
+  CHECK(ib_dev) << "No InfiniBand device found";
+  ibv_context* context = ibv_open_device(ib_dev);
+  CHECK(context) << "Open context failed for " << ibv_get_device_name(ib_dev);
+  return context;
+}
+
+ibv_pd* alloc_protection_domain(ibv_context* context) {
+  ibv_pd* pd = ibv_alloc_pd(context);
+  CHECK(pd) << "Failed to allocate protection domain";
+  return pd;
+}
+
+RdmaAdapter::RdmaAdapter(const WorkerEnv* worker_env)
+    : context_(open_default_device()),
+      pd_(alloc_protection_domain(context_)),
+      worker_env_(worker_env) {
+  event_channel_ = ibv_create_comp_channel(context_);
+  CHECK(event_channel_) << "Failed to create completion channel";
+  cq_ = ibv_create_cq(context_, MAX_CONCURRENT_WRITES * 2, NULL, event_channel_,
+                      0);
+  CHECK(cq_) << "Failed to create completion queue";
+  CHECK(!ibv_req_notify_cq(cq_, 0)) << "Failed to request CQ notification";
+  polling_thread_.reset(Env::Default()->StartThread(
+      ThreadOptions(), "RdmaAdapterCQThread", [this] { Process_CQ(); }));
+  VLOG(2) << "Start RdmaAdapter: " << name();
+}
+
+RdmaAdapter::~RdmaAdapter() {
+  polling_thread_.reset();
+  CHECK(!ibv_destroy_cq(cq_)) << "Failed to destroy CQ";
+  CHECK(!ibv_destroy_comp_channel(event_channel_))
+      << "Failed to destroy channel";
+  CHECK(!ibv_dealloc_pd(pd_)) << "Failed to deallocate PD";
+  CHECK(!ibv_close_device(context_)) << "Failed to release context";
+}
+
+string RdmaAdapter::name() const { return string(context_->device->name); }
+
+// Function to process incoming messages
+// There are two types of messages:
+// 1. IBV_WC_RECV_RDMA_WITH_IMM (receive)
+// 2. IBV_WC_RDMA_WRITE (send))
+void RdmaAdapter::Process_CQ() {
+  while (true) {
+    ibv_cq* cq;
+    void* cq_context;
+    CHECK(!ibv_get_cq_event(event_channel_, &cq, &cq_context));
+    CHECK(cq == cq_);
+    ibv_ack_cq_events(cq, 1);
+    CHECK(!ibv_req_notify_cq(cq_, 0));
+
+    int ne =
+        ibv_poll_cq(cq_, MAX_CONCURRENT_WRITES * 2, static_cast<ibv_wc*>(wc_));
+    CHECK_GE(ne, 0);
+    for (int i = 0; i < ne; ++i) {
+      CHECK(wc_[i].status == IBV_WC_SUCCESS)
+          << "Failed status \n"
+          << ibv_wc_status_str(wc_[i].status) << " " << wc_[i].status << " "
+          << static_cast<int>(wc_[i].wr_id) << " " << wc_[i].vendor_err;
+      if (wc_[i].opcode == IBV_WC_RECV_RDMA_WITH_IMM) {
+        RdmaChannel* rc = reinterpret_cast<RdmaChannel*>(wc_[i].wr_id);
+        // put back a recv wr.
+        rc->Recv();
+        // imm_data is the index of RX buffer in the buffer table.
+        uint32_t imm_data = wc_[i].imm_data;
+        RdmaBuffer* rb = rc->FindBuffer(imm_data);
+        RdmaMessage rm;
+        RdmaMessage::ParseMessage(rm, rb->buffer_);
+        VLOG(2) << "recv RDMA message: " << MessageTypeToString(rm.type_);
+
+        if (rm.type_ == RDMA_MESSAGE_ACK) {
+          // receive an ack to a message
+          rb = rc->tx_message_buffer_;
+          rb->SetBufferStatus(remote, idle);
+          rb->SendNextItem();
+        } else if (rm.type_ == RDMA_MESSAGE_TENSOR_REQUEST) {
+          // received a request-for-tensor message
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find or create buffer
+          RdmaBuffer* tb = rc->FindOrCreateBuffer(rm.name_);
+          string key_with_step_id =
+              VerbsUtil::AppendStepidToKey(rm.name_, rm.step_id_);
+          tb->EnqueueItem(key_with_step_id);
+          // send the next tensor
+          worker_env_->compute_pool->Schedule([tb]() { tb->SendNextItem(); });
+        } else if (rm.type_ == RDMA_MESSAGE_BUFFER_IDLE) {
+          // receive tensor-buffer-ready message
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find buffer
+          RdmaBuffer* tb = rc->FindBuffer(rm.name_);
+          tb->SetBufferStatus(remote, idle);
+          worker_env_->compute_pool->Schedule([tb]() { tb->SendNextItem(); });
+        } else if (rm.type_ == RDMA_MESSAGE_BUFFER_REQUEST) {
+          // remote host requests to create a tensor buffer;
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find or create the buffer
+          RdmaBuffer* tb = rc->FindOrCreateBuffer(rm.name_, TENSOR);
+          RemoteMR rmr;
+          rmr.remote_addr = rm.remote_addr_;
+          rmr.rkey = rm.rkey_;
+          tb->SetRemoteMR(rmr, true);
+          tb->CreateCPUBuffer(rm.buffer_size_);
+          // create RDMA_MESSAGE_BUFFER_RESPONSE message
+          RdmaMessage br;
+          br.type_ = RDMA_MESSAGE_BUFFER_RESPONSE;
+          br.name_size_ = rm.name_.size();
+          br.name_ = rm.name_;
+          br.buffer_size_ = rm.buffer_size_;
+          br.remote_addr_ = reinterpret_cast<uint64_t>(tb->buffer_);
+          br.rkey_ = tb->self_->rkey;
+          string message = RdmaMessage::CreateMessage(br);
+          RdmaBuffer* mb = rc->tx_message_buffer_;
+          mb->EnqueueItem(message);
+          mb->SendNextItem();
+        } else if (rm.type_ == RDMA_MESSAGE_BUFFER_RESPONSE) {
+          // remote creates a buffer and responds
+          // send ack to release remote tx message buffer
+          RdmaBuffer* ab = rc->tx_ack_buffer_;
+          ab->SendNextItem();
+          // find buffer
+          RdmaBuffer* tb = rc->FindBuffer(rm.name_);
+          CHECK(rm.buffer_size_ == tb->size_)
+              << "rm.buffer_size = " << rm.buffer_size_
+              << "tb->size_ = " << tb->size_ << "rm.name_ = " << rm.name_;
+          RemoteMR rmr;
+          rmr.remote_addr = rm.remote_addr_;
+          rmr.rkey = rm.rkey_;
+          tb->SetRemoteMR(rmr, true);
+          tb->SetBufferStatus(local, idle);
+          tb->SetBufferStatus(remote, idle);
+          worker_env_->compute_pool->Schedule([tb]() { tb->SendNextItem(); });
+        } else if (rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) {
+          // tensor RDMA write completed
+          worker_env_->compute_pool->Schedule([rm, rc]() {
+            string key_with_step_id =
+                VerbsUtil::AppendStepidToKey(rm.name_, rm.step_id_);
+            rc->RunRecvCallback(key_with_step_id);
+          });
+        }
+      } else if (wc_[i].opcode == IBV_WC_RDMA_WRITE) {
+        RdmaBuffer* rb = reinterpret_cast<RdmaBuffer*>(wc_[i].wr_id);
+        rb->SetBufferStatus(local, idle);
+        RdmaMessage rm;
+        RdmaMessage::ParseMessage(rm, rb->buffer_);
+        VLOG(2) << "sent RDMA message: " << MessageTypeToString(rm.type_);
+        if (rm.type_ != RDMA_MESSAGE_ACK) {
+          worker_env_->compute_pool->Schedule([rb]() { rb->SendNextItem(); });
+        }
+      }
+    }
+  }
+}
+
+RdmaChannel::RdmaChannel(const RdmaAdapter* adapter, const string local_name,
+                         const string remote_name)
+    : adapter_(adapter), local_name_(local_name), remote_name_(remote_name) {
+  // Create queue pair
+  {
+    struct ibv_qp_init_attr attr;
+    memset(&attr, 0, sizeof(ibv_qp_init_attr));
+    attr.send_cq = adapter_->cq_;
+    attr.recv_cq = adapter_->cq_;
+    attr.cap.max_send_wr = RdmaAdapter::MAX_CONCURRENT_WRITES;
+    attr.cap.max_recv_wr = RdmaAdapter::MAX_CONCURRENT_WRITES;
+    attr.cap.max_send_sge = 1;
+    attr.cap.max_recv_sge = 1;
+    attr.qp_type = IBV_QPT_RC;
+
+    qp_ = ibv_create_qp(adapter_->pd_, &attr);
+    CHECK(qp_) << "Failed to create queue pair";
+  }
+
+  // Init queue pair
+  {
+    struct ibv_qp_attr attr;
+    memset(&attr, 0, sizeof(ibv_qp_attr));
+    attr.qp_state = IBV_QPS_INIT;
+    attr.pkey_index = 0;
+    attr.port_num = 1;
+    attr.qp_access_flags = IBV_ACCESS_LOCAL_WRITE | IBV_ACCESS_REMOTE_WRITE;
+
+    int mask =
+        IBV_QP_STATE | IBV_QP_PKEY_INDEX | IBV_QP_PORT | IBV_QP_ACCESS_FLAGS;
+    CHECK(!ibv_modify_qp(qp_, &attr, mask)) << "Failed to set QP to INIT";
+  }
+
+  // Local address
+  {
+    struct ibv_port_attr attr;
+    CHECK(!ibv_query_port(adapter_->context_, (uint8_t)1, &attr))
+        << "Query port";
+    self_.lid = attr.lid;
+    self_.qpn = qp_->qp_num;
+    self_.psn = static_cast<uint32_t>(random::New64()) & 0xffffff;
+  }
+
+  // create message and ack buffers, then initialize the tables.
+  {
+    const string buffer_names[] = {"tx_message_buffer", "rx_message_buffer",
+                                   "tx_ack_buffer", "rx_ack_buffer"};
+    tx_message_buffer_ = new RdmaMessageBuffer(this, buffer_names[0]);
+    rx_message_buffer_ = new RdmaMessageBuffer(this, buffer_names[1]);
+    tx_ack_buffer_ = new RdmaAckBuffer(this, buffer_names[2]);
+    rx_ack_buffer_ = new RdmaAckBuffer(this, buffer_names[3]);
+    message_buffers_.reserve(kNumMessageBuffers);
+    message_buffers_.push_back(tx_message_buffer_);
+    message_buffers_.push_back(rx_message_buffer_);
+    message_buffers_.push_back(tx_ack_buffer_);
+    message_buffers_.push_back(rx_ack_buffer_);
+    // create buffer on host
+    tx_message_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaMessageBufferSize);
+    rx_message_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaMessageBufferSize);
+    tx_ack_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaAckBufferSize);
+    rx_ack_buffer_->CreateCPUBuffer(RdmaMessage::kRdmaAckBufferSize);
+    // bt_mu_.lock() is not used in constructor.
+    for (int i = 0; i < kNumMessageBuffers; i++) {
+      uint32_t index = NameHash(buffer_names[i]);
+      buffer_table_.insert({index, message_buffers_[i]});
+      buffer_index_name_table_.insert({index, buffer_names[i]});
+      buffer_name_index_table_.insert({buffer_names[i], index});
+    }
+
+    // Initiate recv
+    for (int i = 0; i < 100; i++) {
+      Recv();
+    }
+  }
+}
+
+RdmaChannel::~RdmaChannel() {
+  CHECK(!ibv_destroy_qp(qp_)) << "Failed to destroy QP";
+  delete tx_message_buffer_;
+  delete rx_message_buffer_;
+  delete tx_ack_buffer_;
+  delete rx_ack_buffer_;
+}
+
+void RdmaChannel::SetRemoteAddress(const RdmaAddress& ra, bool override) {
+  mutex_lock lock{mu_};
+  if ((override) || (!remote_set_)) {
+    remote_.lid = ra.lid;
+    remote_.qpn = ra.qpn;
+    remote_.psn = ra.psn;
+    remote_set_ = true;
+  } else {
+    CHECK(remote_.lid == ra.lid);
+    CHECK(remote_.qpn == ra.qpn);
+    CHECK(remote_.psn == ra.psn);
+  }
+}
+
+// Adding tokens to the completion queue
+// Tokens are needed to process future messages.
+void RdmaChannel::Recv() {
+  struct ibv_recv_wr wr;
+  memset(&wr, 0, sizeof(wr));
+  wr.wr_id = (uint64_t)this;
+  struct ibv_recv_wr* bad_wr;
+  CHECK(!ibv_post_recv(qp_, &wr, &bad_wr)) << "Failed to post recv";
+}
+
+// Lookup 32-bit buffer index from buffer name
+// Args:
+//   buffer_name: name of the buffer
+// Returns:
+//   32-bit index
+uint32_t RdmaChannel::LookupBufferIndex(const string& buffer_name) {
+  mutex_lock lock{bt_mu_};
+  BufferNameIndexTable::iterator iter =
+      buffer_name_index_table_.find(buffer_name);
+  CHECK(iter != buffer_name_index_table_.end());
+  return iter->second;
+}
+
+// Find a buffer by its 32-bit index
+// Args:
+//   index: 32-bit hash code of the tensor buffer name
+// Returns:
+//   name of the tensor buffer
+RdmaBuffer* RdmaChannel::FindBuffer(const uint32_t index) {
+  mutex_lock lock{bt_mu_};
+  BufferTable::iterator iter = buffer_table_.find(index);
+  CHECK(iter != buffer_table_.end());
+  return iter->second;
+}
+
+// Find a buffer by its name
+// Args:
+//   name: name of the buffer
+// Returns:
+//   the named rdma buffer
+RdmaBuffer* RdmaChannel::FindBuffer(const string& name) {
+  uint32_t index = LookupBufferIndex(name);
+  return FindBuffer(index);
+}
+
+// Find a buffer if it exists, otherwise create one.
+// The memory inside the created buffer is not allocated.
+// Args:
+//   name: the name of the buffer
+//   buffer_type: TENSOR, MESSAGE or ACK.
+// Returns:
+//   the named buffer
+RdmaBuffer* RdmaChannel::FindOrCreateBuffer(const string& name,
+                                            BufferType buffer_type) {
+  mutex_lock lock{bt_mu_};
+  RdmaBuffer* rb;
+  // find index
+  BufferNameIndexTable::iterator iter = buffer_name_index_table_.find(name);
+  if (iter != buffer_name_index_table_.end()) {
+    uint32_t index = iter->second;
+    // find buffer
+    BufferTable::iterator iter = buffer_table_.find(index);
+    CHECK(iter != buffer_table_.end());
+    rb = iter->second;
+  } else {
+    uint32_t index = NameHash(name);
+    if (buffer_type == TENSOR) {
+      rb = new RdmaTensorBuffer(this, name);
+    } else if (buffer_type == MESSAGE) {
+      rb = new RdmaMessageBuffer(this, name);
+    } else if (buffer_type == ACK) {
+      rb = new RdmaAckBuffer(this, name);
+    }
+    buffer_name_index_table_.insert({name, index});
+    buffer_index_name_table_.insert({index, name});
+    buffer_table_.insert({index, rb});
+  }
+  CHECK(rb);
+  return rb;
+}
+
+// Insert callback to the callback_table.
+// The callback is activated when the corresponding tensor is received.
+// Arg:
+//   key: the name of the tensor
+//   recv_done: the callback associated with the tensor.
+// Returns:
+//   None
+void RdmaChannel::InsertRecvCallback(const string& key,
+                                     std::function<void()> recv_done) {
+  mutex_lock lock{ct_mu_};
+  callback_table_.insert({key, recv_done});
+}
+
+// Remove callback from the callback_table.
+// Arg:
+//   key: the name of the tensor
+// Returns:
+//   None
+void RdmaChannel::RemoveRecvCallback(const string& key) {
+  mutex_lock lock{ct_mu_};
+  callback_table_.erase(key);
+}
+
+// Run named callback in the callback_table.
+// Arg:
+//   key: the name of the tensor
+// Returns:
+//   None
+void RdmaChannel::RunRecvCallback(const string& key) {
+  std::function<void()> recv_done;
+  {
+    mutex_lock lock{ct_mu_};
+    CallbackTable::iterator iter = callback_table_.find(key);
+    CHECK(iter != callback_table_.end());
+    recv_done = iter->second;
+  }
+  recv_done();
+}
+
+void RdmaChannel::Connect() {
+  {
+    mutex_lock lock{mu_};
+    CHECK(remote_set_) << "remote channel is not set";
+  }
+  Connect(remote_);
+}
+
+// Setup channel to a remote node
+// Args:
+//   remoteAddr: the rdma address of a remote channel.
+// Returns:
+//   None
+void RdmaChannel::Connect(const RdmaAddress& remoteAddr) {
+  mutex_lock lock{mu_};
+  if (!connected_) {
+    struct ibv_qp_attr attr;
+    memset(&attr, 0, sizeof(ibv_qp_attr));
+    attr.qp_state = IBV_QPS_RTR;
+    attr.path_mtu = IBV_MTU_4096;
+    attr.dest_qp_num = remoteAddr.qpn;
+    attr.rq_psn = remoteAddr.psn;
+    attr.max_dest_rd_atomic = 1;
+    attr.min_rnr_timer = 12;
+    attr.ah_attr.is_global = 0;
+    attr.ah_attr.dlid = remoteAddr.lid;
+    attr.ah_attr.sl = 0;
+    attr.ah_attr.src_path_bits = 0;
+    attr.ah_attr.port_num = 1;
+
+    int r;
+    CHECK(!(r = ibv_modify_qp(qp_, &attr,
+                              IBV_QP_STATE | IBV_QP_AV | IBV_QP_PATH_MTU |
+                                  IBV_QP_DEST_QPN | IBV_QP_RQ_PSN |
+                                  IBV_QP_MAX_DEST_RD_ATOMIC |
+                                  IBV_QP_MIN_RNR_TIMER)))
+        << "QP to Ready to Receive " << r;
+
+    memset(&attr, 0, sizeof(ibv_qp_attr));
+    attr.qp_state = IBV_QPS_RTS;
+    attr.sq_psn = self_.psn;
+    attr.timeout = 14;
+    attr.retry_cnt = 7;
+    attr.rnr_retry = 7; /* infinite */
+    attr.max_rd_atomic = 1;
+
+    CHECK(!(r = ibv_modify_qp(qp_, &attr,
+                              IBV_QP_STATE | IBV_QP_TIMEOUT | IBV_QP_RETRY_CNT |
+                                  IBV_QP_RNR_RETRY | IBV_QP_SQ_PSN |
+                                  IBV_QP_MAX_QP_RD_ATOMIC)))
+        << "QP to Ready to Send " << r;
+
+    connected_ = true;
+  } else {
+    LOG(INFO) << "channel already connected";
+  }
+}
+
+RdmaBuffer::RdmaBuffer(RdmaChannel* channel, string name)
+    : channel_(channel), name_(name) {}
+
+RdmaBuffer::~RdmaBuffer() {
+  CHECK(!ibv_dereg_mr(self_)) << "ibv_dereg_mr failed";
+  FreeBuffer();
+}
+
+void RdmaBuffer::FreeBuffer() {
+  if ((buffer_ != nullptr) && buffer_on_host_) {
+    free(buffer_);
+  }
+  // TODO
+  // release buffer if it is on device.
+  // We don't support RDMABuffer on device at this moment.
+}
+
+// Allocate CPU memory for the Rdma buffer
+// Args:
+//   size: to-be-allocated memory size
+//   lock: whether or not mutex_lock the process to protect concurrency.
+// Returns:
+//   None
+void RdmaBuffer::CreateCPUBuffer(size_t size, bool lock) {
+  CHECK(size > 0);
+  if (lock) {
+    mu_.lock();
+  }
+  if (local_status_ != none) {
+    // delete existing buffer
+    CHECK(!ibv_dereg_mr(self_)) << "ibv_dereg_mr failed";
+    FreeBuffer();
+  }
+  size_ = size;
+  buffer_ = malloc(size_);
+  self_ = ibv_reg_mr(channel_->adapter_->pd_, buffer_, size_,
+                     IBV_ACCESS_LOCAL_WRITE | IBV_ACCESS_REMOTE_WRITE);
+  CHECK(self_) << "Failed to register memory region";
+  buffer_on_host_ = true;
+  local_status_ = idle;
+  if (lock) {
+    mu_.unlock();
+  }
+}
+
+// Set address of remote memory region
+// Args:
+//   rmr: address of remote memory region
+//   override: whether override existing information
+// Returns:
+//   None
+void RdmaBuffer::SetRemoteMR(RemoteMR rmr, bool override) {
+  mutex_lock lock{mu_};
+  if ((override) || (remote_status_ == none)) {
+    remote_.remote_addr = rmr.remote_addr;
+    remote_.rkey = rmr.rkey;
+    remote_status_ = idle;
+  } else {
+    CHECK(remote_.remote_addr == rmr.remote_addr);
+    CHECK(remote_.rkey == rmr.rkey);
+  }
+}
+
+// Put a task in the buffer's job queue
+void RdmaBuffer::EnqueueItem(string item) {
+  mutex_lock lock{mu_};
+  queue_.push(item);
+}
+
+// Rdma-Write the content of the buffer
+void RdmaBuffer::Write(uint32_t imm_data, size_t buffer_size) {
+  struct ibv_sge list;
+  list.addr = (uint64_t)buffer_;
+  list.length = buffer_size;
+  list.lkey = self_->lkey;
+
+  struct ibv_send_wr wr;
+  memset(&wr, 0, sizeof(wr));
+  wr.wr_id = (uint64_t)this;
+  wr.sg_list = &list;
+  wr.num_sge = 1;
+  wr.opcode = IBV_WR_RDMA_WRITE_WITH_IMM;
+  wr.send_flags = IBV_SEND_SIGNALED;
+  wr.imm_data = imm_data;
+  wr.wr.rdma.remote_addr = (uint64_t)remote_.remote_addr;
+  wr.wr.rdma.rkey = remote_.rkey;
+
+  struct ibv_send_wr* bad_wr;
+  CHECK(!ibv_post_send(channel_->qp_, &wr, &bad_wr)) << "Failed to post send";
+}
+
+RdmaAckBuffer::RdmaAckBuffer(RdmaChannel* channel, string name)
+    : RdmaBuffer(channel, name) {}
+
+RdmaMessageBuffer::RdmaMessageBuffer(RdmaChannel* channel, string name)
+    : RdmaBuffer(channel, name) {}
+
+RdmaTensorBuffer::RdmaTensorBuffer(RdmaChannel* channel, string name)
+    : RdmaBuffer(channel, name) {}
+
+// Send the next ack from the buffer's job queue.
+void RdmaAckBuffer::SendNextItem() {
+  uint32_t imm_data = LookupBufferIndex("rx_ack_buffer");
+  RdmaMessage rm;
+  rm.name_ = "rx_ack_buffer";
+  rm.type_ = RDMA_MESSAGE_ACK;
+  rm.name_size_ = rm.name_.size();
+  string message = RdmaMessage::CreateMessage(rm);
+  memcpy(buffer_, message.data(), message.size());
+  Write(imm_data, message.size());
+}
+
+// Send the next message from the buffer's job queue.
+void RdmaMessageBuffer::SendNextItem() {
+  uint32_t imm_data = LookupBufferIndex("rx_message_buffer");
+  mu_.lock();
+  if (!queue_.empty() && (local_status_ == idle) && (remote_status_ == idle)) {
+    local_status_ = busy;
+    remote_status_ = busy;
+    string message = queue_.front();
+    queue_.pop();
+    // local/remote_status_ won't be set back to idle
+    // unitl Write() is successful
+    mu_.unlock();
+    memcpy(buffer_, message.data(), message.size());
+    Write(imm_data, message.size());
+  } else {
+    mu_.unlock();
+  }
+}
+
+// Send the next tensor from the buffer's job queue.
+void RdmaTensorBuffer::SendNextItem() {
+  // get the key
+  string key_with_step_id = "";
+  {
+    mutex_lock lock{mu_};
+    if (!queue_.empty()) {
+      key_with_step_id = queue_.front();
+      queue_.pop();
+    }
+  }
+  // send the tensor if a key is acquired.
+  if (key_with_step_id != "") {
+    VLOG(2) << "try to send tensor: " << key_with_step_id;
+    string key;
+    int64 step_id;
+    VerbsUtil::GetKeyAndStepId(key_with_step_id, key, step_id);
+    CHECK(key.compare(name_) == 0);
+    Rendezvous::ParsedKey parsed;
+    Rendezvous::ParseKey(key, &parsed);
+    Rendezvous::DoneCallback cb = [this, key_with_step_id, key, step_id,
+                                   parsed](const Status& status,
+                                           const Rendezvous::Args& send_args,
+                                           const Rendezvous::Args& recv_args,
+                                           const Tensor& in, bool is_dead) {
+      CHECK(status.ok()) << "RecvLocalAsync was not ok, key" << key_with_step_id
+                         << " error message: " << status.error_message();
+      size_t buffer_size = RdmaMessage::kMessageTotalBytes;
+      size_t tensor_bytes = 0;
+      TensorProto proto;
+      // Figures out which device the tensor is hosted on.
+      Device* src_dev = nullptr;
+      Status s = channel_->adapter_->worker_env_->device_mgr->LookupDevice(
+          parsed.src_device, &src_dev);
+      CHECK(s.ok()) << "src device not found";
+      // Does the device have the right incarnation number we expect?
+      CHECK(src_dev->attributes().incarnation() == parsed.src_incarnation)
+          << "RecvTensor expects a different device incarnation: "
+          << parsed.src_incarnation << " vs. "
+          << src_dev->attributes().incarnation()
+          << ". Your worker job was probably restarted. Check your "
+          << "worker job for the reason why it was restarted.";
+      Device* dst_dev = nullptr;
+      // destination is on CPU.
+      s = channel_->adapter_->worker_env_->device_mgr->LookupDevice("CPU:0",
+                                                                    &dst_dev);
+      CHECK(s.ok()) << "dst device not found";
+      AllocatorAttributes dst_alloc_attr;
+      dst_alloc_attr.set_on_host(true);
+      // string tensor needs to be serialized
+      if (src_dev->tensorflow_gpu_device_info() &&
+          (!send_args.alloc_attrs.on_host())) {
+        CHECK(send_args.device_context)
+            << "send dev name: " << src_dev->name()
+            << " gpu_info: " << src_dev->tensorflow_gpu_device_info();
+        // "val" is on a GPU. Uses GPUUtil to fill the proto.
+        s = VerbsUtil::SetProtoFromGPUSync(
+            in, src_dev, send_args.device_context, &proto, is_dead);
+        CHECK(s.ok()) << "set proto from gpu sync";
+      } else {
+        // tensor is in CPU memory.
+        in.AsProtoTensorContent(&proto);
+      }
+      tensor_bytes = proto.ByteSize();
+      // maybe some margin for string tensor?
+      buffer_size += tensor_bytes;
+      // prepare message
+      RdmaMessage rm;
+      rm.name_size_ = key.size();
+      rm.name_ = key;
+      rm.tensor_shape_ = in.shape();
+      rm.data_type_ = in.dtype();
+      rm.step_id_ = step_id;
+      rm.is_dead_ = is_dead;
+      rm.tensor_bytes_ = tensor_bytes;
+      rm.buffer_size_ = buffer_size;
+      mu_.lock();
+      if (local_status_ == none ||
+          (buffer_size > size_ && local_status_ == idle &&
+           remote_status_ == idle)) {
+        if ((local_status_ != none) && (buffer_size > size_)) {
+          CHECK(rm.data_type_ == DT_STRING)
+              << "Only string tensor allows to change size";
+        }
+        CreateCPUBuffer(buffer_size, false);
+        mu_.unlock();
+        // put back the key since it is not sent;
+        EnqueueItem(key_with_step_id);
+        // ask the remote to create the same buffer
+        rm.type_ = RDMA_MESSAGE_BUFFER_REQUEST;
+        rm.remote_addr_ = reinterpret_cast<uint64_t>(buffer_);
+        rm.rkey_ = self_->rkey;
+        string message = RdmaMessage::CreateMessage(rm);
+        channel_->tx_message_buffer_->EnqueueItem(message);
+        channel_->tx_message_buffer_->SendNextItem();
+      } else if ((local_status_ == idle) && (remote_status_ == idle)) {
+        // both buffers are ready, send the tensor
+        local_status_ = busy;
+        remote_status_ = busy;
+        // local/remote_status_ won't be set back to idle
+        // unitl Write() is successful
+        mu_.unlock();
+        CHECK((buffer_size == size_ && rm.data_type_ != DT_STRING) ||
+              (buffer_size <= size_ && rm.data_type_ == DT_STRING))
+            << "tensor and buffer size do not agree!"
+            << " buffer_size = " << size_
+            << " requested tensor size = " << buffer_size << in.DebugString();
+        uint32_t imm_data = LookupBufferIndex(key);
+        rm.type_ = RDMA_MESSAGE_TENSOR_WRITE;
+        string message = RdmaMessage::CreateMessage(rm);
+        memcpy(buffer_, message.data(), message.size());
+        if (!is_dead) {
+          // copy the tensor buffer content
+          void* output =
+              static_cast<void*>(static_cast<char*>(buffer_) +
+                                 RdmaMessage::kTensorBufferStartIndex);
+          CHECK(tensor_bytes + RdmaMessage::kTensorBufferStartIndex <= size_);
+          proto.SerializeToArray(output, tensor_bytes);
+        } else {
+          buffer_size = RdmaMessage::kMessageTotalBytes;
+        }
+        Write(imm_data, buffer_size);
+      } else {
+        mu_.unlock();
+        // put back the key since it is not sent;
+        EnqueueItem(key_with_step_id);
+      }
+    };
+    // Use default session (legacy_session_)
+    // TODO use WorkerSessionForSession
+    // need to pass in session handle
+    channel_->adapter_->worker_env_->session_mgr->LegacySession()
+        ->rendezvous_mgr->RecvLocalAsync(step_id, parsed, cb);
+  }
+}
+
+// Create a RdmaMessage according to the pre-defined format
+// Args:
+//   rm: the message structure
+// Returns:
+//   message in string format
+string RdmaMessage::CreateMessage(const RdmaMessage& rm) {
+  // Rdma Message format
+  // type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|...
+  //   1B|    2B   | 512|  8B   |    8B     |       8B  | 4B |    1B |...
+  // ...|data_type|tensor_shape|tensor_bytes|tensor_buffer
+  // ...|   XB    |    XB      |    8B      |...
+  //
+  // ACK:             type|13|"rx_ack_buffer"
+  // TENSOR_REQUEST:  type|name_size|tensor_name|step_id
+  // TENSOR_WRITE:    type|name_size|tensor_name|step_id|...|is_dead
+  //                 |data_type|tensor_shape|tensor_bytes
+  // BUFFER_IDLE:     type|name_size|buffer_name
+  // BUFFER_REQUEST:
+  // type|name_size|buffer_name|...|buffer_size|remote_addr|rkey|
+  // BUFFER_RESPONSE:
+  // type|name_size|buffer_name|...|buffer_size|remote_addr|rkey|
+  char message[kMessageTotalBytes];
+  // type
+  message[kTypeStartIndex] = static_cast<char>(rm.type_) & 0xff;
+  // size of name
+  memcpy(&message[kNameSizeStartIndex], &rm.name_size_, sizeof(rm.name_size_));
+  // name
+  memcpy(&message[kNameStartIndex], rm.name_.data(), rm.name_.size());
+  // buffer_size, remote_addr, rkey
+  if ((rm.type_ == RDMA_MESSAGE_BUFFER_REQUEST) ||
+      (rm.type_ == RDMA_MESSAGE_BUFFER_RESPONSE)) {
+    memcpy(&message[kBufferSizeStartIndex], &rm.buffer_size_,
+           sizeof(rm.buffer_size_));
+    memcpy(&message[kRemoteAddrStartIndex], &rm.remote_addr_,
+           sizeof(rm.remote_addr_));
+    memcpy(&message[kRkeyStartIndex], &rm.rkey_, sizeof(rm.rkey_));
+  }
+  // step_id
+  if ((rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) ||
+      (rm.type_ == RDMA_MESSAGE_TENSOR_REQUEST)) {
+    memcpy(&message[kStepIdStartIndex], &rm.step_id_, sizeof(rm.step_id_));
+  }
+  // is_dead, data_type, tensor_shape, tensor_bytes
+  if (rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) {
+    memcpy(&message[kIsDeadStartIndex], &rm.is_dead_, sizeof(rm.is_dead_));
+
+    memcpy(&message[kDataTypeStartIndex], &rm.data_type_,
+           sizeof(rm.data_type_));
+    memcpy(&message[kTensorShapeStartIndex], &rm.tensor_shape_,
+           sizeof(rm.tensor_shape_));
+    memcpy(&message[kTensorBytesStartIndex], &rm.tensor_bytes_,
+           sizeof(rm.tensor_bytes_));
+  }
+  return string(message, kMessageTotalBytes);
+}
+
+// Parse a RdmaMessage according to the pre-defined format
+// Args:
+//   rm: the message structure where the parsed message will be saved
+//   buffer: the place where the raw message is stored
+// Returns:
+//   None
+void RdmaMessage::ParseMessage(RdmaMessage& rm, void* buffer) {
+  char* message = static_cast<char*>(buffer);
+  // type
+  rm.type_ = static_cast<RdmaMessageType>(message[kTypeStartIndex]);
+  // name_size_
+  memcpy(&rm.name_size_, &message[kNameSizeStartIndex], sizeof(rm.name_size_));
+  // name
+  rm.name_ = string(&message[kNameStartIndex], rm.name_size_);
+  // buffer_size, remote_addr, rkey
+  if ((rm.type_ == RDMA_MESSAGE_BUFFER_REQUEST) ||
+      (rm.type_ == RDMA_MESSAGE_BUFFER_RESPONSE)) {
+    memcpy(&rm.buffer_size_, &message[kBufferSizeStartIndex],
+           sizeof(rm.buffer_size_));
+    memcpy(&rm.remote_addr_, &message[kRemoteAddrStartIndex],
+           sizeof(rm.remote_addr_));
+    memcpy(&rm.rkey_, &message[kRkeyStartIndex], sizeof(rm.rkey_));
+  }
+  // step_id
+  if ((rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) ||
+      (rm.type_ == RDMA_MESSAGE_TENSOR_REQUEST)) {
+    memcpy(&rm.step_id_, &message[kStepIdStartIndex], sizeof(rm.step_id_));
+  }
+  // data_type, tensor_bytes, tensor_shape, is_dead
+  if (rm.type_ == RDMA_MESSAGE_TENSOR_WRITE) {
+    memcpy(&rm.is_dead_, &message[kIsDeadStartIndex], sizeof(rm.is_dead_));
+    memcpy(&rm.data_type_, &message[kDataTypeStartIndex],
+           sizeof(rm.data_type_));
+    memcpy(&rm.tensor_shape_, &message[kTensorShapeStartIndex],
+           sizeof(rm.tensor_shape_));
+    memcpy(&rm.tensor_bytes_, &message[kTensorBytesStartIndex],
+           sizeof(rm.tensor_bytes_));
+  }
+}
+
+}  // end namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/rdma.h b/tensorflow/contrib/verbs/rdma.h
new file mode 100644
index 0000000000..ae2aa63e3f
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma.h
@@ -0,0 +1,277 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include <infiniband/verbs.h>
+#include <cstring>  // for memset
+#include <functional>
+#include <memory>  // for shared_ptr
+#include <queue>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "tensorflow/core/distributed_runtime/worker_env.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/mutex.h"
+
+namespace tensorflow {
+
+// structure to save the address of remote channels.
+struct RdmaAddress {
+  uint32_t lid;
+  uint32_t qpn;
+  uint32_t psn;
+};
+// structure to save information for remote memory regions.
+struct RemoteMR {
+  uint64_t remote_addr;
+  uint32_t rkey;
+};
+enum BufferStatus { none, idle, busy };
+enum Location { local, remote };
+enum BufferType { ACK, MESSAGE, TENSOR };
+enum RdmaMessageType {
+  RDMA_MESSAGE_ACK,
+  RDMA_MESSAGE_BUFFER_IDLE,
+  RDMA_MESSAGE_BUFFER_REQUEST,
+  RDMA_MESSAGE_BUFFER_RESPONSE,
+  RDMA_MESSAGE_TENSOR_REQUEST,
+  RDMA_MESSAGE_TENSOR_WRITE
+};
+class RdmaBuffer;
+// Class that represents the Rdma Adapter.
+// Responsible for creation of the completion queue, and handling
+// of work completions.
+class RdmaAdapter {
+  friend class RdmaChannel;
+  friend class RdmaBuffer;
+  friend class RdmaAckBuffer;
+  friend class RdmaMessageBuffer;
+  friend class RdmaTensorBuffer;
+  friend class RdmaMgr;
+  friend class RdmaRemoteRendezvous;
+
+ public:
+  RdmaAdapter(const WorkerEnv* worker_env);
+  ~RdmaAdapter();
+  // Adapter name, e.g. mlx5_0.
+  string name() const;
+  void Process_CQ();
+
+ protected:
+  static const int MAX_CONCURRENT_WRITES = 1000;
+  ibv_context* context_;
+  // ibverbs protection domain
+  ibv_pd* pd_;
+  // Completion event channel, to wait for work completions
+  ibv_comp_channel* event_channel_;
+  // Completion queue, to poll on work completions
+  ibv_cq* cq_;
+  // Pre-allocated work completions array used for polling
+  ibv_wc wc_[MAX_CONCURRENT_WRITES * 2];
+  // worker env for thread
+  const WorkerEnv* worker_env_;
+  // thread for cq.
+  std::unique_ptr<Thread> polling_thread_;
+};
+
+// Class that represents a connection to a remote Rdma peer.
+// Responsible for connecting queue pairs.
+class RdmaChannel {
+  friend class RdmaAdapter;
+  friend class RdmaBuffer;
+  friend class RdmaAckBuffer;
+  friend class RdmaMessageBuffer;
+  friend class RdmaTensorBuffer;
+  friend class RdmaMgr;
+  friend class RdmaRemoteRendezvous;
+
+ public:
+  explicit RdmaChannel(const RdmaAdapter* adapter, const string local_name,
+                       const string remote_name_);
+  ~RdmaChannel();
+  inline const RdmaAddress& self() { return self_; }
+  RdmaAddress address() const;
+  inline const std::vector<RdmaBuffer*>& message_buffers() const {
+    return message_buffers_;
+  }
+  void Connect(const RdmaAddress& remoteAddr);
+  void Connect();
+  void Recv();
+  RdmaBuffer* FindBuffer(const uint32_t index);
+  RdmaBuffer* FindBuffer(const string& name);
+  RdmaBuffer* FindOrCreateBuffer(const string& name,
+                                 BufferType buffer_type = TENSOR);
+  uint32_t LookupBufferIndex(const string& buffer_name);
+  void SetRemoteAddress(const RdmaAddress& ra, bool override);
+  void InsertRecvCallback(const string& key, std::function<void()> recv_done);
+  void RemoveRecvCallback(const string& key);
+  void RunRecvCallback(const string& key);
+  static const int kNumMessageBuffers = 4;
+
+ protected:
+  const RdmaAdapter* adapter_;
+  RdmaAddress self_;
+  string local_name_;
+  string remote_name_;
+  ibv_qp* qp_;
+  mutex mu_;
+  bool connected_ GUARDED_BY(bt_mu_) = false;
+  RdmaAddress remote_ GUARDED_BY(bt_mu_);
+  bool remote_set_ GUARDED_BY(bt_mu_) = false;
+  mutex ct_mu_;
+  typedef std::unordered_map<string, std::function<void()> > CallbackTable;
+  CallbackTable callback_table_ GUARDED_BY(ct_mu_);
+  mutex bt_mu_;
+  typedef std::unordered_map<unsigned int, RdmaBuffer*> BufferTable;
+  BufferTable buffer_table_ GUARDED_BY(bt_mu_);
+  typedef std::unordered_map<uint32_t, string> BufferIndexNameTable;
+  BufferIndexNameTable buffer_index_name_table_ GUARDED_BY(bt_mu_);
+  typedef std::unordered_map<string, uint32_t> BufferNameIndexTable;
+  BufferNameIndexTable buffer_name_index_table_ GUARDED_BY(bt_mu_);
+  RdmaBuffer* tx_message_buffer_;
+  RdmaBuffer* rx_message_buffer_;
+  RdmaBuffer* tx_ack_buffer_;
+  RdmaBuffer* rx_ack_buffer_;
+  std::vector<RdmaBuffer*> message_buffers_;
+};
+
+// Class that represents a buffer for Rdma writes and reads.
+class RdmaBuffer {
+  friend class RdmaChannel;
+  friend class RdmaAdapter;
+  friend class RdmaMgr;
+  friend class RdmaRemoteRendezvous;
+
+ public:
+  explicit RdmaBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaBuffer();
+
+  inline void* buffer() const { return buffer_; }
+  inline ibv_mr* self() const { return self_; }
+  inline void SetBufferStatus(Location loc, BufferStatus status) {
+    mu_.lock();
+    if (loc == local) {
+      local_status_ = status;
+    } else {
+      remote_status_ = status;
+    }
+    mu_.unlock();
+  }
+  void FreeBuffer();
+  void EnqueueItem(string Item);
+  virtual void SendNextItem(){};
+  void CreateCPUBuffer(size_t size, bool lock = true);
+  void SetRemoteMR(RemoteMR rmi, bool override);
+  uint32_t LookupBufferIndex(const string& buffer_name) {
+    return const_cast<RdmaChannel*>(channel_)->LookupBufferIndex(buffer_name);
+  }
+  void Write(uint32_t imm_data, size_t buffer_size);
+
+ protected:
+  const RdmaChannel* channel_;
+  void* buffer_ = nullptr;
+  bool buffer_on_host_ = true;
+  size_t size_ = 0;
+  const string name_;
+  ibv_mr* self_ = nullptr;
+  mutex mu_;
+  RemoteMR remote_;
+  std::queue<string> queue_ GUARDED_BY(mu_);
+  BufferStatus local_status_ GUARDED_BY(mu_) = none;
+  BufferStatus remote_status_ GUARDED_BY(mu_) = none;
+};
+
+class RdmaAckBuffer : public RdmaBuffer {
+ public:
+  explicit RdmaAckBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaAckBuffer() override {}
+  void SendNextItem() override;
+};
+
+class RdmaMessageBuffer : public RdmaBuffer {
+  friend class RdmaChannel;
+  friend class RdmaAapater;
+
+ public:
+  explicit RdmaMessageBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaMessageBuffer() override {}
+  void SendNextItem() override;
+};
+
+class RdmaTensorBuffer : public RdmaBuffer {
+ public:
+  explicit RdmaTensorBuffer(RdmaChannel* channel, string name);
+  virtual ~RdmaTensorBuffer() override {}
+  void SendNextItem() override;
+};
+
+struct RdmaMessage {
+  RdmaMessageType type_;
+  uint16_t name_size_;
+  string name_;
+  int64 step_id_;
+  uint64_t buffer_size_;
+  uint64_t remote_addr_;
+  uint32_t rkey_;
+  bool is_dead_;
+  DataType data_type_;
+  TensorShape tensor_shape_;
+  size_t tensor_bytes_;
+
+  // type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|...
+  //   1B|    2B   | 512|  8B   |    8B     |       8B  | 4B |    1B |...
+  // ...|data_type|tensor_shape|tensor_bytes|tensor_buffer
+  // ...|   XB    |    XB      |    8B      |...
+  //
+  static const size_t kNameCapacity = 512;
+  static const size_t kTypeStartIndex = 0;
+  static const size_t kNameSizeStartIndex = kTypeStartIndex + sizeof(type_);
+  static const size_t kNameStartIndex =
+      kNameSizeStartIndex + sizeof(name_size_);
+  static const size_t kStepIdStartIndex = kNameStartIndex + kNameCapacity;
+  static const size_t kBufferSizeStartIndex =
+      kStepIdStartIndex + sizeof(step_id_);
+  static const size_t kRemoteAddrStartIndex =
+      kBufferSizeStartIndex + sizeof(buffer_size_);
+  static const size_t kRkeyStartIndex =
+      kRemoteAddrStartIndex + sizeof(remote_addr_);
+  static const size_t kIsDeadStartIndex = kRkeyStartIndex + sizeof(rkey_);
+  static const size_t kDataTypeStartIndex =
+      kIsDeadStartIndex + sizeof(is_dead_);
+  static const size_t kTensorShapeStartIndex =
+      kDataTypeStartIndex + sizeof(data_type_);
+  static const size_t kTensorBytesStartIndex =
+      kTensorShapeStartIndex + sizeof(TensorShape);
+  static const size_t kTensorBufferStartIndex =
+      kTensorBytesStartIndex + sizeof(tensor_bytes_);
+  static const size_t kMessageTotalBytes = kTensorBufferStartIndex;
+  static const size_t kRdmaMessageBufferSize = kMessageTotalBytes;
+  static const size_t kRdmaAckBufferSize = kMessageTotalBytes;
+  static string CreateMessage(const RdmaMessage& rm);
+  static void ParseMessage(RdmaMessage& rm, void* buffer);
+};
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_H_
diff --git a/tensorflow/contrib/verbs/rdma_mgr.cc b/tensorflow/contrib/verbs/rdma_mgr.cc
new file mode 100644
index 0000000000..e28b80c6f6
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_mgr.cc
@@ -0,0 +1,133 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include <vector>
+#include "tensorflow/contrib/verbs/grpc_verbs_client.h"
+#include "tensorflow/contrib/verbs/verbs_service.pb.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_worker_cache.h"
+#include "tensorflow/core/distributed_runtime/session_mgr.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+RdmaMgr::RdmaMgr(const WorkerEnv* const worker_env,
+                 GrpcChannelCache* const channel_cache)
+    : worker_env_(worker_env), channel_cache_(channel_cache) {
+  rdma_adapter_ = new RdmaAdapter(worker_env_);
+  // hardcoded to default session (legacy_session_)
+  // TODO: use WorkerSessionForSession
+  // need to pass in session handle
+  local_worker_ = worker_env_->session_mgr->LegacySession()->worker_name;
+  std::vector<string> workers;
+  worker_env_->session_mgr->LegacySession()->worker_cache->ListWorkers(
+      &workers);
+  num_remote_workers_ = workers.size() - 1;
+  VLOG(2) << "rmda_mgr on local worker: " << local_worker_;
+  for (size_t i = 0; i < workers.size(); i++) {
+    if (local_worker_.compare(workers[i]) != 0) {
+      channel_table_.insert(
+          {workers[i],
+           new RdmaChannel(rdma_adapter_, local_worker_, workers[i])});
+    }
+  }
+}
+
+// Setup Rdma channels between peers.
+// This is done at the beginning of the server setup.
+
+void RdmaMgr::SetupChannels() {
+  for (const auto& p : channel_table_) {
+    string worker_name = p.first;
+    LOG(INFO) << "connecting to remote node " << worker_name;
+    RdmaChannel* rc = p.second;
+    GetRemoteAddressRequest req;
+    GetRemoteAddressResponse resp;
+    // get the channel cache
+    SharedGrpcChannelPtr client_channel =
+        channel_cache_->FindWorkerChannel(worker_name);
+    GrpcVerbsClient* client = new GrpcVerbsClient(client_channel);
+    CHECK(client != nullptr) << "No worker known as " << worker_name;
+
+    // setting up request
+    req.set_host_name(local_worker_);
+    Channel* channel_info = req.mutable_channel();
+    channel_info->set_lid(rc->self_.lid);
+    channel_info->set_qpn(rc->self_.qpn);
+    channel_info->set_psn(rc->self_.psn);
+    for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
+      MemoryRegion* mr = req.add_mr();
+      mr->set_remote_addr(
+          reinterpret_cast<uint64_t>(rc->message_buffers_[i]->buffer_));
+      mr->set_rkey(rc->message_buffers_[i]->self_->rkey);
+    }
+    // synchronous call
+    Status s = client->GetRemoteAddress(&req, &resp);
+    // save obtained remote addresses
+    // connect to the remote channel
+    if (s.ok()) {
+      CHECK(worker_name.compare(resp.host_name()) == 0);
+      RdmaAddress ra;
+      ra.lid = resp.channel().lid();
+      ra.qpn = resp.channel().qpn();
+      ra.psn = resp.channel().psn();
+      rc->SetRemoteAddress(ra, false);
+      rc->Connect();
+      int i = 0;
+      int idx[] = {1, 0, 3, 2};
+      for (const auto& mr : resp.mr()) {
+        // the connections are crossed, i.e.
+        // local tx_message_buffer <---> remote rx_message_buffer_
+        // local rx_message_buffer <---> remote tx_message_buffer_
+        // local tx_ack_buffer <---> remote rx_ack_buffer_
+        // local rx_ack_buffer <---> remote tx_ack_buffer_
+        // hence idx[] = {1, 0, 3, 2}.
+        RdmaBuffer* rb = rc->message_buffers_[idx[i]];
+        RemoteMR rmr;
+        rmr.remote_addr = mr.remote_addr();
+        rmr.rkey = mr.rkey();
+        rb->SetRemoteMR(rmr, false);
+        i++;
+      }
+      CHECK(i == RdmaChannel::kNumMessageBuffers);
+    } else {
+      LOG(ERROR) << s.error_message();
+    }
+    delete client;
+  }
+}
+
+RdmaMgr::~RdmaMgr() {
+  for (const auto& p : channel_table_) delete p.second;
+  channel_table_.clear();
+  delete rdma_adapter_;
+}
+
+// Find a channel via the given name.
+// Args:
+//   name: peer name, e.g. worker1
+// Returns
+//   channel object that is connected to the named peer.
+RdmaChannel* RdmaMgr::FindChannel(const string& name) {
+  ChannelTable::iterator iter = channel_table_.find(name);
+  CHECK(iter != channel_table_.end());
+  return iter->second;
+}
+
+}  // end namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/rdma_mgr.h b/tensorflow/contrib/verbs/rdma_mgr.h
new file mode 100644
index 0000000000..b156f64096
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_mgr.h
@@ -0,0 +1,54 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_MGR_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_MGR_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include <string>
+#include <unordered_map>
+
+#include "tensorflow/contrib/verbs/rdma.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_channel.h"
+#include "tensorflow/core/distributed_runtime/worker_env.h"
+
+namespace tensorflow {
+
+class RdmaMgr {
+ public:
+  explicit RdmaMgr(const WorkerEnv* const worker_env,
+                   GrpcChannelCache* const channel_cache);
+  ~RdmaMgr();
+  RdmaChannel* FindChannel(const string& key);
+  void SetupChannels();
+  const string& local_worker() { return local_worker_; }
+
+ private:
+  string local_worker_;
+  size_t num_remote_workers_;
+  const WorkerEnv* const worker_env_;
+  GrpcChannelCache* const channel_cache_;
+  RdmaAdapter* rdma_adapter_;
+  typedef std::unordered_map<string, RdmaChannel*> ChannelTable;
+  ChannelTable channel_table_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(RdmaMgr);
+};
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_MGR_H_
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
new file mode 100644
index 0000000000..8cbdfaa943
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
@@ -0,0 +1,149 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/rdma_rendezvous_mgr.h"
+#include <unordered_set>
+#include "tensorflow/contrib/verbs/verbs_util.h"
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/common_runtime/device_mgr.h"
+#include "tensorflow/core/common_runtime/dma_helper.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/strings/numbers.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+
+namespace tensorflow {
+
+class RdmaRemoteRendezvous : public BaseRemoteRendezvous {
+ public:
+  RdmaRemoteRendezvous(const WorkerEnv* env, const string& worker_name,
+                       int64 step_id, RdmaMgr* rdma_mgr)
+      : BaseRemoteRendezvous(env, worker_name, step_id, true),
+        rdma_mgr_(rdma_mgr) {}
+
+ protected:
+  void RecvFromRemoteAsync(const Rendezvous::ParsedKey& parsed,
+                           const Rendezvous::Args& args,
+                           DoneCallback done) override;
+
+ private:
+  ~RdmaRemoteRendezvous() override {}
+  RdmaMgr* rdma_mgr_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(RdmaRemoteRendezvous);
+};
+
+void RdmaRemoteRendezvous::RecvFromRemoteAsync(
+    const Rendezvous::ParsedKey& parsed, const Rendezvous::Args& recv_args,
+    DoneCallback done) {
+  Status s;
+  // parse src_name and dst_name
+  string src_name, dst_name, unused;
+  if (!DeviceNameUtils::SplitDeviceName(parsed.src_device, &src_name,
+                                        &unused)) {
+    s = errors::Internal("Could not parse src name.");
+  }
+  CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+  if (!s.ok()) {
+    done(s, Args(), recv_args, Tensor{}, false);
+    return;
+  }
+  if (!DeviceNameUtils::SplitDeviceName(parsed.dst_device, &dst_name,
+                                        &unused)) {
+    s = errors::Internal("Could not parse dst name.");
+  }
+  CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+  if (!s.ok()) {
+    done(s, Args(), recv_args, Tensor{}, false);
+    return;
+  }
+  CHECK(dst_name.compare(rdma_mgr_->local_worker()) == 0);
+  RdmaChannel* rc = rdma_mgr_->FindChannel(src_name);
+  string key(std::move(parsed.FullKey().ToString()));
+  string key_with_step_id = VerbsUtil::AppendStepidToKey(key, step_id_);
+  // insert callback
+  rc->InsertRecvCallback(key_with_step_id, [this, key, key_with_step_id, rc,
+                                            recv_args, parsed, done]() {
+    Status s;
+    Device* src_dev;
+    s = env_->device_mgr->LookupDevice("CPU:0", &src_dev);
+    CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+    if (!s.ok()) {
+      done(s, Args(), recv_args, Tensor(), true);
+      return;
+    }
+    Device* dst_dev;
+    s = env_->device_mgr->LookupDevice(parsed.dst_device, &dst_dev);
+    CHECK(s.ok()) << "s is not ok, error code " << s.error_message();
+    if (!s.ok()) {
+      done(s, Args(), recv_args, Tensor(), true);
+      return;
+    }
+    RdmaBuffer* rb = rc->FindBuffer(key);
+    RdmaMessage rm;
+    CHECK(rb->size_ >= RdmaMessage::kMessageTotalBytes);
+    RdmaMessage::ParseMessage(rm, rb->buffer_);
+    CHECK(rm.type_ == RDMA_MESSAGE_TENSOR_WRITE);
+    Tensor val;
+    if (!rm.is_dead_) {
+      void* input = static_cast<char*>(rb->buffer_) +
+                    RdmaMessage::kTensorBufferStartIndex;
+      TensorProto proto;
+      CHECK(rm.tensor_bytes_ + RdmaMessage::kTensorBufferStartIndex <=
+            rb->size_);
+      CHECK(ParseProtoUnlimited(&proto, input, rm.tensor_bytes_))
+          << "fail to parse proto from array";
+      s = dst_dev->MakeTensorFromProto(proto, recv_args.alloc_attrs, &val);
+    }
+
+    rc->RemoveRecvCallback(key_with_step_id);
+    // create message
+    RdmaMessage br;
+    br.type_ = RDMA_MESSAGE_BUFFER_IDLE;
+    br.name_size_ = key.size();
+    br.name_ = key;
+    string message = RdmaMessage::CreateMessage(br);
+    RdmaBuffer* tb = rc->tx_message_buffer_;
+    tb->EnqueueItem(message);
+    tb->SendNextItem();
+    done(s, Args(), recv_args, val, rm.is_dead_);
+  });
+  // append key to message queue
+  RdmaBuffer* rb = rc->tx_message_buffer_;
+  RdmaMessage rm;
+  rm.type_ = RDMA_MESSAGE_TENSOR_REQUEST;
+  rm.name_size_ = key.size();
+  rm.name_ = key;
+  rm.step_id_ = step_id_;
+  string message = RdmaMessage::CreateMessage(rm);
+  rb->EnqueueItem(message);
+  rb->SendNextItem();
+}
+
+RdmaRendezvousMgr::RdmaRendezvousMgr(const WorkerEnv* env,
+                                     const string& worker_name,
+                                     WorkerCacheInterface* worker_cache)
+    : BaseRendezvousMgr(env, worker_name) {}
+
+BaseRemoteRendezvous* RdmaRendezvousMgr::Create(int64 step_id,
+                                                const WorkerEnv* worker_env,
+                                                const string& worker_name) {
+  return new RdmaRemoteRendezvous(worker_env, worker_name, step_id, rdma_mgr_);
+}
+
+}  // end namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
new file mode 100644
index 0000000000..57cd4bf5e4
--- /dev/null
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
@@ -0,0 +1,64 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_RENDEZVOUS_MGR_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_RENDEZVOUS_MGR_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/core/distributed_runtime/base_rendezvous_mgr.h"
+#include "tensorflow/core/distributed_runtime/worker_env.h"
+#include "tensorflow/core/platform/macros.h"
+
+namespace tensorflow {
+
+// RendezvousMgr keeps track of a set of local rendezvous instances.
+// All tensors sent by this worker are buffered in a RendezvousMgr
+// until the tensor is received.  Each global unique "step_id"
+// corresponds to one local rendezvous instance managed by a
+// RendezvousMgr.
+//
+// E.g.,
+//   Rendezvous* rendez = worker_env->rendezvous_mgr->Find(0x8935);
+//   fork execution of an graph executor using "rendez"  on thread 1;
+//   fork execution of another graph executor using "rendez" on thread 2;
+//   ...
+//   join threads 1 and 2;
+//
+// In the example above, execution in thread 1 and 2 communicates with
+// each other by send/recv operations through the "rend".
+//
+// Tensors sent and recved through rendezvous managed by this
+// RendezvousMgr must have keys generated by Rendezvous::CreateKey.
+class RdmaRendezvousMgr : public BaseRendezvousMgr {
+ public:
+  explicit RdmaRendezvousMgr(const WorkerEnv* env, const string& worker_name,
+                             WorkerCacheInterface* worker_cache);
+  void SetRdmaMgr(RdmaMgr* rdma_mgr) { rdma_mgr_ = rdma_mgr; }
+
+ protected:
+  BaseRemoteRendezvous* Create(int64 step_id, const WorkerEnv* worker_env,
+                               const string& worker_name) override;
+
+ private:
+  RdmaMgr* rdma_mgr_;
+  TF_DISALLOW_COPY_AND_ASSIGN(RdmaRendezvousMgr);
+};
+
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_RDMA_RENDEZVOUS_MGR_H_
diff --git a/tensorflow/contrib/verbs/verbs_server_lib.cc b/tensorflow/contrib/verbs/verbs_server_lib.cc
new file mode 100644
index 0000000000..b061c81d2d
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_server_lib.cc
@@ -0,0 +1,172 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/verbs_server_lib.h"
+
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/contrib/verbs/rdma_rendezvous_mgr.h"
+#include "tensorflow/core/distributed_runtime/server_lib.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/env.h"
+
+namespace tensorflow {
+
+namespace {
+// static utility function
+RendezvousMgrInterface* NewRdmaRendezvousMgr(
+    const WorkerEnv* env, const string& worker_name,
+    WorkerCacheInterface* worker_cache) {
+  return new RdmaRendezvousMgr(env, worker_name, worker_cache);
+}
+
+}  // namespace
+
+VerbsServer::VerbsServer(const ServerDef& server_def, Env* env)
+    : GrpcServer(server_def, env), verbs_state_(DISCONNECTED) {}
+
+VerbsServer::~VerbsServer() {
+  TF_CHECK_OK(Stop());
+  TF_CHECK_OK(Join());
+  delete rdma_mgr_;
+  delete verbs_service_;
+  delete channel_cache_;
+}
+
+Status VerbsServer::ChannelCacheFactory(const ServerDef& server_def,
+                                        GrpcChannelCache** channel_cache) {
+  string name_prefix =
+      strings::StrCat("/job:", server_def.job_name(), "/replica:0",
+                      "/task:", server_def.task_index());
+
+  GrpcChannelSpec channel_spec;
+  TF_RETURN_IF_ERROR(ParseChannelSpec(server_def, &channel_spec));
+
+  *channel_cache =
+      NewGrpcChannelCache(channel_spec, GetChannelCreationFunction(server_def));
+
+  const string host_port = (*channel_cache)->TranslateTask(name_prefix);
+  int requested_port;
+
+  if (!strings::safe_strto32(str_util::Split(host_port, ':')[1],
+                             &requested_port)) {
+    return errors::Internal("Could not parse port for local server from \"",
+                            (*channel_cache)->TranslateTask(name_prefix),
+                            "\".");
+  }
+  if (requested_port != bound_port()) {
+    return errors::InvalidArgument("Requested port ", requested_port,
+                                   " differs from expected port ",
+                                   bound_port());
+  }
+
+  return Status::OK();
+}
+
+Status VerbsServer::Init(ServiceInitFunction service_func,
+                         RendezvousMgrCreationFunction rendezvous_mgr_func) {
+  Status s = GrpcServer::Init(service_func, rendezvous_mgr_func);
+  {
+    mutex_lock l(mu_);
+    CHECK_EQ(verbs_state_, DISCONNECTED);
+    CHECK(ChannelCacheFactory(server_def(), &channel_cache_).ok());
+    rdma_mgr_ = new RdmaMgr(worker_env(), channel_cache_);
+    // set rdma_mgr for verbs_service and rdma_rendezvous_mgr
+    verbs_service_->SetRdmaMgr(rdma_mgr_);
+    // hardcoded to default session (legacy_session_)
+    // TODO: use WorkerSessionForSession
+    // need to pass in session handle
+    dynamic_cast<RdmaRendezvousMgr*>(
+        worker_env()->session_mgr->LegacySession()->rendezvous_mgr.get())
+        ->SetRdmaMgr(rdma_mgr_);
+  }
+  return s;
+}
+
+Status VerbsServer::Start() {
+  Status s = GrpcServer::Start();
+  {
+    mutex_lock l(mu_);
+    if (verbs_state_ == DISCONNECTED) {
+      // verbs_thread needs to be initiated
+      // before rdma_mgr sets up the rdma channels.
+      verbs_thread_.reset(worker_env()->env->StartThread(
+          ThreadOptions(), "TF_verbs_service",
+          [this] { verbs_service_->HandleRPCsLoop(); }));
+      rdma_mgr_->SetupChannels();
+      verbs_state_ = CONNECTED;
+    }
+  }
+  return s;
+}
+
+Status VerbsServer::Join() {
+  Status s = GrpcServer::Join();
+  {
+    mutex_lock l(mu_);
+    if (verbs_state_ == CONNECTED) {
+      verbs_state_ = DISCONNECTED;
+      verbs_thread_.reset();
+    }
+  }
+  return s;
+}
+
+/* static */
+Status VerbsServer::Create(const ServerDef& server_def, Env* env,
+                           std::unique_ptr<ServerInterface>* out_server) {
+  std::unique_ptr<VerbsServer> ret(new VerbsServer(server_def, Env::Default()));
+  ServiceInitFunction service_func = [&ret](const WorkerEnv* worker_env,
+                                            ::grpc::ServerBuilder* builder) {
+    return SetNewVerbsService(&ret->verbs_service_, worker_env, builder);
+  };
+  TF_RETURN_IF_ERROR(ret->Init(service_func, NewRdmaRendezvousMgr));
+  *out_server = std::move(ret);
+  return Status::OK();
+}
+
+namespace {
+
+class VerbsServerFactory : public ServerFactory {
+ public:
+  bool AcceptsOptions(const ServerDef& server_def) override {
+    return server_def.protocol() == "grpc+verbs";
+  }
+
+  Status NewServer(const ServerDef& server_def,
+                   std::unique_ptr<ServerInterface>* out_server) override {
+    return VerbsServer::Create(server_def, Env::Default(), out_server);
+  }
+};
+
+// Registers a `ServerFactory` for `VerbsServer` instances.
+class VerbsServerRegistrar {
+ public:
+  VerbsServerRegistrar() {
+    gpr_allocation_functions alloc_fns;
+    alloc_fns.malloc_fn = port::Malloc;
+    alloc_fns.realloc_fn = port::Realloc;
+    alloc_fns.free_fn = port::Free;
+    gpr_set_allocation_functions(alloc_fns);
+    ServerFactory::Register("VERBS_SERVER", new VerbsServerFactory());
+  }
+};
+static VerbsServerRegistrar registrar;
+
+}  // namespace
+}  // namespace tensorflow
+
+#endif
diff --git a/tensorflow/contrib/verbs/verbs_server_lib.h b/tensorflow/contrib/verbs/verbs_server_lib.h
new file mode 100644
index 0000000000..855380129f
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_server_lib.h
@@ -0,0 +1,66 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_VERBS_SERVER_LIB_H_
+#define THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_VERBS_SERVER_LIB_H_
+
+#ifdef TENSORFLOW_USE_VERBS
+
+#include "tensorflow/contrib/verbs/grpc_verbs_service.h"
+#include "tensorflow/contrib/verbs/rdma_mgr.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h"
+
+namespace tensorflow {
+
+class VerbsServer : public GrpcServer {
+ protected:
+  VerbsServer(const ServerDef& server_def, Env* env);
+
+ public:
+  static Status Create(const ServerDef& server_def, Env* env,
+                       std::unique_ptr<ServerInterface>* out_server);
+
+  // Destruction is only supported in the factory method. Clean
+  // shutdown is not currently implemented for this server type.
+  virtual ~VerbsServer() override;
+
+  // Implementations of ServerInterface methods.
+  Status Start() override;
+  Status Join() override;
+
+ protected:
+  Status Init(ServiceInitFunction service_func,
+              RendezvousMgrCreationFunction rendezvous_mgr_func);
+  Status ChannelCacheFactory(const ServerDef& server_def,
+                             GrpcChannelCache** channel_cache);
+
+ private:
+  RdmaMgr* rdma_mgr_;
+
+  // Guards state transitions.
+  mutex mu_;
+
+  enum State { DISCONNECTED, CONNECTED };
+  State verbs_state_ GUARDED_BY(mu_);
+
+  GrpcVerbsService* verbs_service_ = nullptr;
+  std::unique_ptr<Thread> verbs_thread_ GUARDED_BY(mu_);
+  GrpcChannelCache* channel_cache_ = nullptr;
+};
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_USE_VERBS
+#endif  // THIRD_PARTY_TENSORFLOW_CONTRIB_VERBS_VERBS_SERVER_LIB_H_
diff --git a/tensorflow/contrib/verbs/verbs_service.proto b/tensorflow/contrib/verbs/verbs_service.proto
new file mode 100644
index 0000000000..b985febfb8
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_service.proto
@@ -0,0 +1,60 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+syntax = "proto3";
+
+package tensorflow;
+option java_outer_classname = "VerbsServiceProtos";
+option java_multiple_files = true;
+option java_package = "org.tensorflow.contrib.verbs";
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// GRPC Helper messages used to exchange RDMA information.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+message Channel {
+  int32 lid = 1;
+  int32 qpn = 2;
+  int32 psn = 3;
+}
+
+message MemoryRegion {
+  uint64 remote_addr = 1;
+  uint32 rkey = 2;
+}
+message GetRemoteAddressRequest {
+  string host_name = 1;
+  Channel channel = 2;
+  repeated MemoryRegion mr = 3;
+}
+
+message GetRemoteAddressResponse {
+  string host_name = 1;
+  Channel channel = 2;
+  repeated MemoryRegion mr = 3;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// VerbsService
+//
+////////////////////////////////////////////////////////////////////////////////
+
+service VerbsService {
+  rpc GetRemoteAddress(GetRemoteAddressRequest)
+      returns (GetRemoteAddressResponse);
+}
diff --git a/tensorflow/contrib/verbs/verbs_util.cc b/tensorflow/contrib/verbs/verbs_util.cc
new file mode 100644
index 0000000000..c3350f7958
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_util.cc
@@ -0,0 +1,61 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/verbs/verbs_util.h"
+
+#include "tensorflow/core/common_runtime/gpu/gpu_util.h"
+#include "tensorflow/core/lib/core/notification.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+namespace tensorflow {
+
+// static sync wrapper:
+Status VerbsUtil::SetProtoFromGPUSync(const Tensor& tensor, Device* dev,
+                                      const DeviceContext* device_context,
+                                      TensorProto* proto, bool is_dead) {
+  Notification n;
+  Status status;
+  GPUUtil::SetProtoFromGPU(tensor, dev, device_context, proto, is_dead,
+                           [&n, &status](const Status& s) {
+                             status = s;
+                             n.Notify();
+                           });
+  n.WaitForNotification();
+  return status;
+}
+
+// static
+string VerbsUtil::AppendStepidToKey(const string& key, int64 step_id) {
+  return strings::StrCat(key, ";", step_id);
+}
+
+// static
+void VerbsUtil::GetKeyAndStepId(const string& key_with_step_id, string& key,
+                                int64& step_id) {
+  StringPiece s(key_with_step_id);
+  // a key (with step_id) has exact 6 parts if split by ";"
+  // part 1: src_device;
+  // part 2: src_incarnation;
+  // part 3: dst_device;
+  // part 4: name;
+  // part 5: frame_iter.frame_id:frame_iter.iter_id
+  // part 6: step_id
+  std::vector<string> parts = str_util::Split(s, ';');
+  CHECK(parts.size() == 6) << "Key with step_id must have 6 parts";
+  strings::safe_strto64(parts[5], &step_id);
+  parts.pop_back();                        // remove step_id
+  key.assign(str_util::Join(parts, ";"));  // stitch them together
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/verbs/verbs_util.h b/tensorflow/contrib/verbs/verbs_util.h
new file mode 100644
index 0000000000..cbc01adae4
--- /dev/null
+++ b/tensorflow/contrib/verbs/verbs_util.h
@@ -0,0 +1,41 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CONTRIB_RDMA_UTIL_H_
+#define TENSORFLOW_CONTRIB_RDMA_UTIL_H_
+
+#include <string>
+
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+
+class TensorProto;
+
+class VerbsUtil {
+ public:
+  // synchronous wrapper of SetProtoFromGPU
+  static Status SetProtoFromGPUSync(const Tensor& tensor, Device* dev,
+                                    const DeviceContext* device_context,
+                                    TensorProto* proto, bool is_dead);
+  static string AppendStepidToKey(const string& key, int64 step_id);
+  static void GetKeyAndStepId(const string& key_with_step_id, string& key,
+                              int64& step_id);
+};
+
+}  // namespace tensorflow
+#endif  // TENSORFLOW_CONTRIB_RDMA_UTIL_H_
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index d614349387..71fba99aad 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -108,6 +108,7 @@ load(
     "tf_additional_cloud_op_deps",
     "tf_additional_cloud_kernel_deps",
     "tf_lib_proto_parsing_deps",
+    "tf_additional_verbs_lib_defines",
 )
 load(
     "//tensorflow/core:platform/default/build_config_root.bzl",
@@ -732,9 +733,13 @@ cc_library(
         "//tensorflow/core/kernels:math_not_windows",
         "//tensorflow/core/kernels:quantized_ops",
     ]) + if_mkl([
+        "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
+        "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
+        "//tensorflow/core/kernels:mkl_reshape_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
     ]),
 )
@@ -1272,7 +1277,9 @@ cc_library(
         "platform/tracing.h",
     ],
     copts = tf_copts(),
-    defines = tf_additional_lib_defines() + ["SNAPPY"],
+    defines = tf_additional_lib_defines() + [
+        "SNAPPY",
+    ] + tf_additional_verbs_lib_defines(),
     linkopts = select({
         "//tensorflow:freebsd": [],
         "//conditions:default": ["-ldl"],
@@ -2089,7 +2096,6 @@ tf_cc_test_mkl(
     size = "small",
     srcs = [
         "graph/mkl_layout_pass_test.cc",
-        "graph/mkl_optimizer_merge_test.cc",
         "graph/mkl_tfconversion_pass_test.cc",
     ],
     linkstatic = tf_kernel_tests_linkstatic(),
@@ -2110,9 +2116,13 @@ tf_cc_test_mkl(
         "//tensorflow/cc:cc_ops",
         "//tensorflow/cc:scope",
         "//tensorflow/cc:sendrecv_ops",
+        "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
+        "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
+        "//tensorflow/core/kernels:mkl_reshape_op",
         "//tensorflow/core/kernels:mkl_tfconv_op",
         "//tensorflow/core/kernels:ops_util",
         "//third_party/eigen3",
diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc
index 2be510ee9b..a79ea1b45d 100644
--- a/tensorflow/core/debug/debug_io_utils.cc
+++ b/tensorflow/core/debug/debug_io_utils.cc
@@ -17,7 +17,9 @@ limitations under the License.
 
 #include <vector>
 
+#if defined(PLATFORM_GOOGLE)
 #include "grpc++/create_channel.h"
+#endif
 
 #if defined(PLATFORM_WINDOWS)
 // winsock2.h is used in grpc, so Ws2_32.lib is needed
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
index 1aafa862cb..7160962b16 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
@@ -62,6 +62,13 @@ class NoReusePortOption : public ::grpc::ServerBuilderOption {
                          plugins) override {}
 };
 
+// static utility function
+RendezvousMgrInterface* NewRpcRendezvousMgr(
+    const WorkerEnv* env, const string& worker_name,
+    WorkerCacheInterface* worker_cache) {
+  return new RpcRendezvousMgr(env, worker_name, worker_cache);
+}
+
 }  // namespace
 
 GrpcServer::GrpcServer(const ServerDef& server_def, Env* env)
@@ -93,7 +100,8 @@ GrpcServer::~GrpcServer() {
   // - worker_env_.compute_pool
 }
 
-Status GrpcServer::Init() {
+Status GrpcServer::Init(ServiceInitFunction service_func,
+                        RendezvousMgrCreationFunction rendevous_mgr_func) {
   mutex_lock l(mu_);
   CHECK_EQ(state_, NEW);
   master_env_.env = env_;
@@ -170,6 +178,10 @@ Status GrpcServer::Init() {
   worker_impl_ = NewGrpcWorker(&worker_env_);
   worker_service_ =
       NewGrpcWorkerService(worker_impl_.get(), &builder).release();
+  // extra service:
+  if (service_func != nullptr) {
+    service_func(&worker_env_, &builder);
+  }
   server_ = builder.BuildAndStart();
 
   if (!server_) {
@@ -182,7 +194,9 @@ Status GrpcServer::Init() {
 
   // Set up worker environment.
   std::unique_ptr<RendezvousMgrInterface> rendezvous_mgr(
-      new RpcRendezvousMgr(&worker_env_, name_prefix, worker_cache));
+      rendevous_mgr_func == nullptr ?
+      new RpcRendezvousMgr(&worker_env_, name_prefix, worker_cache) :
+      rendevous_mgr_func(&worker_env_, name_prefix, worker_cache));
   worker_env_.session_mgr = new SessionMgr(
       &worker_env_, SessionMgr::WorkerNameFromServerDef(server_def_),
       std::unique_ptr<WorkerCacheInterface>(worker_cache),
@@ -211,6 +225,10 @@ Status GrpcServer::Init() {
   return Status::OK();
 }
 
+Status GrpcServer::Init() {
+  return Init(nullptr, nullptr);
+}
+
 Status GrpcServer::ParseChannelSpec(const ServerDef& server_def,
                                     GrpcChannelSpec* channel_spec) {
   for (const auto& job : server_def.cluster().job()) {
@@ -248,6 +266,7 @@ Status GrpcServer::WorkerCacheFactory(const ServerDef& server_def,
       channel_spec, GetChannelCreationFunction(server_def)));
   const string host_port = channel_cache->TranslateTask(name_prefix);
   int requested_port;
+
   if (!strings::safe_strto32(str_util::Split(host_port, ':')[1],
                              &requested_port)) {
     return errors::Internal("Could not parse port for local server from \"",
@@ -346,7 +365,8 @@ Status GrpcServer::Create(const ServerDef& server_def, Env* env,
                           std::unique_ptr<ServerInterface>* out_server) {
   std::unique_ptr<GrpcServer> ret(
       new GrpcServer(server_def, env == nullptr ? Env::Default() : env));
-  TF_RETURN_IF_ERROR(ret->Init());
+  ServiceInitFunction service_func = nullptr;
+  TF_RETURN_IF_ERROR(ret->Init(service_func, NewRpcRendezvousMgr));
   *out_server = std::move(ret);
   return Status::OK();
 }
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
index c6ba260104..3b66291a9a 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
@@ -36,6 +36,17 @@ namespace tensorflow {
 class GrpcWorker;
 class Master;
 
+// function that creates a RendezvousMgr.
+typedef std::function<RendezvousMgrInterface*(
+    const WorkerEnv*, const std::string& worker_name,
+    WorkerCacheInterface* worker_cache)>
+    RendezvousMgrCreationFunction;
+
+// function that registers a service to the server. The service needs to
+// be registered before builder.BuildAndStart().
+typedef std::function<void(const WorkerEnv*, ::grpc::ServerBuilder*)>
+    ServiceInitFunction;
+
 class GrpcServer : public ServerInterface {
  protected:
   GrpcServer(const ServerDef& server_def, Env* env);
@@ -55,6 +66,9 @@ class GrpcServer : public ServerInterface {
   const string target() const override;
 
  protected:
+  Status Init(ServiceInitFunction service_func,
+              RendezvousMgrCreationFunction rendezvous_mgr_func);
+
   Status Init();
 
   // A subclass can override this method to support secure credentials.
@@ -78,6 +92,10 @@ class GrpcServer : public ServerInterface {
   // This method may only be called after `this->Init()` returns successfully.
   int bound_port() const { return bound_port_; }
 
+  WorkerEnv* worker_env() { return &worker_env_; }
+
+  const ServerDef& server_def() const { return server_def_; }
+
  private:
   // The overall server configuration.
   const ServerDef server_def_;
diff --git a/tensorflow/core/framework/function_testlib.cc b/tensorflow/core/framework/function_testlib.cc
index fb1ad0102f..e45f156e1e 100644
--- a/tensorflow/core/framework/function_testlib.cc
+++ b/tensorflow/core/framework/function_testlib.cc
@@ -126,25 +126,33 @@ FunctionDef XTimes16() {
       {{"y", "y:y:0"}});
 }
 
-FunctionDef WXPlusB() {
-  return FDH::Define(
-      // Name
-      "WXPlusB",
-      // Args
-      {"w: T", "x: T", "b: T"},
-      // Return values
-      {"y: T"},
-      // Attr def
-      {"T: {float, double}"},
-      // Nodes
-      {{{"mm"},
-        "MatMul",
-        {"w", "x"},
-        {{"T", "$T"},
-         {"transpose_a", false},
-         {"transpose_b", false},
+FunctionDef WXPlusB(){return FDH::Define(
+    // Name
+    "WXPlusB",
+    // Args
+    {"w: T", "x: T", "b: T"},
+    // Return values
+    {"y: T"},
+    // Attr def
+    {"T: {float, double}"},
+    // Nodes
+    {
+      {{"mm"},
+       "MatMul",
+       {"w", "x"},
+       {
+           {"T", "$T"}, {"transpose_a", false}, {"transpose_b", false},
+#ifdef INTEL_MKL
+       }},
+#else
          {"_kernel", "eigen"}}},
-       {{"y"}, "Add", {"mm", "b"}, {{"T", "$T"}}}});
+#endif
+      {
+        {"y"}, "Add", {"mm", "b"}, {
+          { "T", "$T" }
+        }
+      }
+    });
 }
 
 FunctionDef Swap() {
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 309c4cd774..09b632a165 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -48,7 +48,7 @@ namespace tensorflow {
 //     1) Propagating Mkl layout as an additional output tensor
 //        (we will loosely call a tensor that carries Mkl layout as Mkl tensor
 //         henceforth.) from every Mkl supported NN layer.
-//     2) Context-based rewrite: This is neded in order to optimize
+//     2) Context-based rewrite: This is needed in order to optimize
 //        gradient ops of Conv2D+AddBias. Gradient op of both the Conv2D and
 //        MatMul is BiasAddGrad, and we need to rewrite BiasAddGrad into
 //        Conv2D-specific BiasAddGrad, and MatMul-specific BiasAddGrad.
@@ -63,12 +63,12 @@ namespace tensorflow {
 //           P = BiasAdd(O, C)
 //
 // We merge them into Conv2DWithBias as:
-//           P = MklConv2DWithBias(A, A_m, B, B_m, C, C_m)
+//           P = _MklConv2DWithBias(A, A_m, B, B_m, C, C_m)
 //
-// Meaning of A_m, B_m and C_m is explained in B.1.
+// The meaning of A_m, B_m and C_m is explained in B.1.
 //
 // Merge rules:
-//  - Merge for Conv2D and BiasAdd happens only when output of Conv2D _only_
+//  - The merge for Conv2D and BiasAdd happens when the output of Conv2D _only_
 //    goes to BiasAdd.
 //  - Also, the intersection of attributes of both the nodes must have same
 //    values.
@@ -76,7 +76,7 @@ namespace tensorflow {
 //
 // Example of B.1 : Rewriting nodes to Mkl nodes
 // ---------------------------------------------
-// Consider Relu layer. Current definition of Relu layer looks like:
+// Consider a Relu node. Current definition of Relu node looks like:
 //
 //           O = Relu(A)
 //
@@ -87,58 +87,59 @@ namespace tensorflow {
 //
 //          O, O_m = MklRelu(A, A_m)
 //
-// MklRelu has 2 inputs (A and A_m) and 2 outputs (O and O_m). Here A input is
-// same as A input of Relu; O output is same as O output of Relu. O_m is the
+// MklRelu has 2 inputs (A and A_m) and 2 outputs (O and O_m). Here input A is
+// same as input A of Relu; output O is same as output O of Relu. O_m is the
 // additional output tensor that will be set by MklRelu, and it represents
 // Mkl tensor corresponding to O -- in other words, O_m is some kind of
 // metadata for O. A_m is additional input of Relu, and it represents metadata
 // for A - as O_m is metadata for O, A_m is metadata for A. MklRelu receives
-// this metadata from previous layer (in the graph).
+// this metadata from previous node in the graph.
 //
-// When previous layer in the graph is Mkl layer, A_m will represent a valid
-// Mkl tensor. But when previous Mkl layer is not an Mkl layer, then A_m
-// represents a dummy Mkl tensor.
+// When a previous node in the graph is an Mkl node, A_m will represent a valid
+// Mkl tensor. But when a previous node is not an Mkl node, A_m will represent
+// a dummy Mkl tensor.
 //
 // Rewriting rules:
-//  - Selection of an op for rewriting happens by registering an op with this
-//     pass. If an op is not registered, then it is not rewritten.
+//  - Selection of a node for rewriting happens by registering the op type of
+//    the node with the rewriting pass. If the op type is not registered, then
+//    all nodes of this op type will not be rewritten.
 //  - Number of inputs after rewriting:
-//      Since for every input Tensorflow tensor, the rewritten layer gets Mkl
-//      tensor, rewritten op gets 2*N inputs, where N is the number of inputs
-//      for original op.
+//      Since for every input Tensorflow tensor, the rewritten node gets Mkl
+//      tensor(s), rewritten node gets 2*N inputs, where N is the number of
+//      inputs for the original node.
 //  - Number of outputs after rewriting:
-//      Since for every output Tensorflow tensor, the rewritten layer generates
-//      Mkl tensor, rewritten op generates 2*N outputs, where N is the number
-//      of outputs of original op.
+//      Since for every output Tensorflow tensor, the rewritten node generates
+//      Mkl tensor(s), the rewritten node generates 2*N outputs, where N is the
+//      number of outputs of the original node.
 //  - Ordering of Tensorflow tensors and Mkl tensors:
-//      Since every op generates twice the number of inputs and outputs, one
-//      could imagine different ordering among Tensorflow tensors and Mkl
-//      tensors. E.g., let's assume an op 'Conv2D' takes (A, B) as input, then
-//      new op 'MklConv2D' can take (A, A_m, B, B_m) as input or it can also
-//      take (A, B, A_m, B_m) as input. Among N inputs one can get N!
-//      permutations.
+//      Since every rewritten node generates twice the number of inputs and
+//      outputs, one could imagine various orderings among Tensorflow tensors
+//      and Mkl tensors. E.g., assume an op 'Conv2D' that takes (A, B) as
+//      inputs, then the new op '_MklConv2D' can take inputs A, B, A_m and B_m
+//      in A, A_m, B, B_m order or it can also take them in A, B, A_m, B_m
+//      order. Among N inputs one can get N! permutations.
 //
-//      So the question is: which one do we follow? Currently, we follow an
-//      intuitive order where Mkl tensor follows a corresponding Tensorflow
-//      tensor immediately. In the context of above example, it will be: (A,
-//      A_m, B, B_m). We follow same ordering rule for output tensors.
-//
-// NOTE: Current rewriting approach rewrites an op to Mkl op without any
-//      conditions. But in the future, it may be possible to consider
-//      conditions such as input shapes and sizes to rewrite an op.
+//      So the question is: which order do we follow? We support 2 types of
+//      orderings: (1) interleaved, and (2) contiguous. Interleaved ordering
+//      follows an intuitive order where an Mkl tensor follows the
+//      corresponding Tensorflow tensor immediately. In the context of the
+//      above example, it will be: A, A_m, B, B_m. Note that the ordering rule
+//      applies to both the inputs and outputs. Contiguous ordering means
+//      all the Tensorflow tensors are contiguous followed by all the Mkl
+//      tensors. We use contiguous ordering as default.
 //
 // Graph rewrite algorithm:
 //      Algorithm: Graph Rewrite
-//      Input: Graph G, Names of nodes to rewrite and their new nodes
-//      Output: Modified Graph G' if nodes are modified, G otherwise.
+//      Input: Graph G, Names of the nodes to rewrite and their new names
+//      Output: Modified Graph G' if the nodes are modified, G otherwise.
 //      Start:
-//        N = Topological_Sort(G) // N is set of nodes in toposort order.
+//        N = Topological_Sort(G) // N is a set of nodes in toposort order.
 //        foreach node n in N
 //        do
-//          if (Is_MKL_Layer(n))  // Can this layer accept Mkl layout as input.
+//          if (Is_MKL_Op(n))  // Can this node accept an Mkl layout as input.
 //          then
 //            E = set of <incoming edge and its src_output slot> of n
-//            E' = {}   // new set of edges for rewritten node
+//            E' = {}   // a new set of edges for rewritten node
 //            foreach <e,s> in E
 //            do
 //              E' U {<e,s>}  // First copy edge which generates Tensorflow
@@ -146,42 +147,44 @@ namespace tensorflow {
 //              m = Source node of edge e
 //              if Is_Rewritten(m)  // Did we rewrite this node in this pass?
 //              then
-//                E' U {<m,s+1>}    // If yes, then m will generate Mkl tensor
-//                                  // as output.
+//                E' U {<m,s+1>}    // If yes, then m will generate an Mkl
+//                                  // tensor as an additional output.
 //              else
-//                d = Generate_Dummy_Mkl_Tensor()  // If not, generate dummy
+//                d = Generate_Dummy_Mkl_Tensor()  // If not, generate a dummy
 //                                                 // Mkl tensor.
-//                E' U {<d,0>}   // Dummy Mkl tensor has only 1 output slot.
+//                E' U {<d,0>}  // The dummy Mkl tensor has only 1 output slot.
 //              fi
 //            done
 //            n' = Build_New_Node(G,new_name,E')
-//            Mark_Rewritten(n')  // Mark new node as being rewritten.
+//            Mark_Rewritten(n')  // Mark the new node as being rewritten.
 //          fi
 //        done
 //
 //      Explanation:
-//        For graph rewrite, we visit nodes of the graph in the topological
-//        sort order. With this ordering, we visit nodes in top-to-bottom
-//        fashion. We need this order because while visiting a node we want
-//        all of its input nodes (parents) visited (and rewritten if
-//        applicable). This is because if we need to rewrite a current node
+//        For graph rewrite, we visit nodes of the input graph in the
+//        topological sort order. With this ordering, we visit nodes in the
+//        top-to-bottom fashion. We need this order because while visiting a
+//        node we want that all of its input nodes are visited and rewritten if
+//        applicable. This is because if we need to rewrite a given node
 //        then all of its input nodes need to be fixed (in other words they
-//        cannot be removed later.)
+//        cannot be deleted later.)
 //
-//        While visiting each node, we first check if it is Mkl layer. If
-//        it is, then we rewrite that node after constructing new inputs to
-//        the node. If it is not Mkl layer, then we do not rewrite the node.
+//        While visiting a node, we first check if the op type of the node is
+//        an Mkl op. If it is, then we rewrite that node after constructing
+//        new inputs to the node. If the op type of the node is not Mkl op,
+//        then we do not rewrite that node.
 //
 // Handling workspace propagation for certain ops:
 //
 //        Certain backward ops in MKL (MaxPool, LRN and BatchNorm) require
-//        passing of workspace from their corresponding forward ops. But
-//        TensorFlow does not have a notion of workspace and as a result
-//        does not allow producing additional outputs from these forward ops.
-//        For these ops, we need to add an additional edge between forward
-//        ops and their corresponding backward ops, and this edge carries
-//        workspace tensor value and another edge carries Mkl tensor for
-//        workspace tensor.
+//        passing of a workspace from their respective forward ops. Workspace
+//        tensors provide memory for storing results of intermediate operations
+//        which are helpful in backward propagation. TensorFlow does not have
+//        a notion of a workspace and as a result does not allow producing
+//        additional outputs from these forward ops. For these ops, we need
+//        to add 2 extra edges between forward ops and their corresponding
+//        backward ops - the first extra edge carries a workspace tensor and
+//        the second one carries an Mkl tensor for the workspace tensor.
 //
 //        Example:
 //
@@ -190,59 +193,61 @@ namespace tensorflow {
 //        A = MaxPool(T)
 //        B = MaxPoolGrad(X, A, Y)
 //
-//        We will transform this graph to propagate workspace as:
+//        We will transform this graph to propagate the workspace as:
+//        (with the contiguous ordering)
 //
-//        A, A_m, W, W_m = MklMaxPool(T, T_m)
-//        B, B_m = MklMaxPoolGrad(X, X_m, A, A_m, Y, Y_m, W, W_m)
+//        A, W, A_m, W_m = MklMaxPool(T, T_m)
+//        B, B_m = MklMaxPoolGrad(X, A, Y, W, X_m, A_m, Y_m, W_m)
 //
-//        Here W is the workspace tensor. Transformed tensors with name
-//        suffix _m are Mkl tensors and this transformation has been done
+//        Here W is the workspace tensor. Transformed tensor names with the
+//        suffix _m are Mkl tensors, and this transformation has been done
 //        using the algorithm discussed earlier. The transformation for
-//        workspace only adds extra outputs (W, W_m) for forward op and
-//        connects them to corresponding backward ops.
+//        workspace propagation only adds extra outputs (W, W_m) for a forward
+//        op and connects them to the corresponding backward ops.
 //
 //        Terms:
 //
 //        Forward op name = name of the op in the forward pass
-//          where workspace originates (MaxPool in this example)
+//          where a workspace tensor originates (MaxPool in this example)
 //        Backward op name = name of the op in the backward pass that receives
-//          workspace from forward op (MaxPoolGrad in the example)
-//        Slot = Number of the output or input slot that will be
-//               used by the workspace (2 for MklMaxPool as W is 3rd
-//               output of MaxPool (0 is 1st); 6 for MklMaxPoolGrad)
+//          a workspace tensor from the forward op (MaxPoolGrad in the example)
+//        Slot = Position of the output or input slot that will be
+//               used by the workspace tensor (1 for MklMaxPool as W is the 2nd
+//               output of MaxPool (0 is 1st); 3 for MklMaxPoolGrad)
 //
 //        Question:
 //
-//        How do we associate backward op to forward op? There can be more
-//        than one op with exact same name.
+//        How do we associate a backward op to a forward op? There can be more
+//        than one op with the exact same name.
 //
-//        In this example we associate MaxPoolGrad with MaxPool. But there
+//        In this example, we associate MaxPoolGrad with MaxPool. But there
 //        could be more than one MaxPool ops. To solve this problem, we look
-//        for _direct_ edge between forward op and backward op (tensor A is
-//        flowing along this edge in the example.)
+//        for _direct_ edge between a forward op and a backward op (tensor A is
+//        flowing along this edge in the example).
 //
-//        How do we transform forward and backward op when there is no direct
-//        edge between them? In such case, we generate dummy tensors as
+//        How do we transform forward and backward ops when there is no direct
+//        edge between them? In such a case, we generate dummy tensors for
 //        workspace tensors. For the example, transformation of MaxPool will
-//        be exactly same --- it is just that MaxPool won't generate any
-//        workspace tensor. For MaxPoolGrad, transformation will also be same,
-//        but instead of connecting W and W_m with outputs of MaxPool, we will
-//        produce dummy tensors for them, and we will set workspace_enabled
-//        attribute to false.
+//        be exactly same as it would be when there is a direct edge between
+//        the forward and the backward op --- it is just that MaxPool won't
+//        generate any workspace tensor. For MaxPoolGrad, the transformation
+//        will also be same, but instead of connecting W and W_m with the
+//        outputs of MaxPool, we will produce dummy tensors for them, and we
+//        will set workspace_enabled attribute to false.
 //
 // Example of B.2 : Context-based node rewrite
 // -------------------------------------------
 // Consider BiasAddGrad op as:
 //
-//           O = MklConv2D(A, A_m, B, B_m, C, C_m)
+//           O = _MklConv2D(A, B, C, A_m, B_m, C_m)
 //           P = BiasAddGrad(O)
 //
-// Then we rewrite is as:
+// Then we rewrite it as:
 //
 //           P = Conv2DWithBiasBackpropBias(O, O_m)
 //
-// 'Distance' between input of BiasAddGrad and MklConv2D in terms of hops is
-// the context matching depth. If MklConv2DWithBias is not within the context
+// 'Distance' between input of BiasAddGrad and _MklConv2D in terms of hops is
+// the context matching depth. If _MklConv2DWithBias is not within the context
 // matching depth, then we do not rewrite BiasAddGrad.
 
 // How many hops do we search for matching node in the backward dataflow graph?
@@ -255,53 +260,85 @@ static size_t kNodeMergeContextMaxDepth = 10;
 class MklLayoutRewritePass : public GraphOptimizationPass {
  public:
   MklLayoutRewritePass() {
+    // NOTE: names are alphabetically sorted.
+    csinfo_.avg_pool = "AvgPool";
+    csinfo_.avg_pool_grad = "AvgPoolGrad";
+    csinfo_.bias_add = "BiasAdd";
+    csinfo_.bias_add_grad = "BiasAddGrad";
+    csinfo_.concat = "Concat";
+    csinfo_.concatv2 = "ConcatV2";
     csinfo_.conv2d = "Conv2D";
-    csinfo_.mklconv2d = "MklConv2D";
-    csinfo_.mklconv2dwithbias = "MklConv2DWithBias";
-    csinfo_.mklconv2dwithbiasbackpropbias = "MklConv2DWithBiasBackpropBias";
-    csinfo_.biasadd = "BiasAdd";
+    csinfo_.conv2d_grad_input = "Conv2DBackpropInput";
+    csinfo_.conv2d_grad_filter = "Conv2DBackpropFilter";
+    csinfo_.fused_batch_norm = "FusedBatchNorm";
+    csinfo_.fused_batch_norm_grad = "FusedBatchNormGrad";
+    csinfo_.lrn = "LRN";
+    csinfo_.lrn_grad = "LRNGrad";
     csinfo_.matmul = "MatMul";
-    csinfo_.biasaddgrad = "BiasAddGrad";
+    csinfo_.max_pool = "MaxPool";
+    csinfo_.max_pool_grad = "MaxPoolGrad";
+    csinfo_.mkl_conv2d = "_MklConv2D";
+    csinfo_.mkl_conv2d_with_bias = "_MklConv2DWithBias";
+    csinfo_.mkl_conv2d_with_bias_backprop_bias =
+        "_MklConv2DWithBiasBackpropBias";
     csinfo_.relu = "Relu";
-    csinfo_.relugrad = "ReluGrad";
-    csinfo_.maxpool = "MaxPool";
-    csinfo_.maxpoolgrad = "MaxPoolGrad";
-    csinfo_.avgpool = "AvgPool";
-    csinfo_.avgpoolgrad = "AvgPoolGrad";
-    csinfo_.conv2dgradinput = "Conv2DBackpropInput";
-    csinfo_.conv2dgradfilter = "Conv2DBackpropFilter";
-
-    rinfo_.push_back(
-        {csinfo_.conv2d, csinfo_.mklconv2d, 2, CopyAttrsConv2D, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.conv2dgradfilter,
-                      GetMklOpName(csinfo_.conv2dgradfilter), 3,
+    csinfo_.reshape = "Reshape";
+    csinfo_.relu_grad = "ReluGrad";
+    csinfo_.split = "Split";
+
+    // NOTE: names are alphabetically sorted.
+    rinfo_.push_back({csinfo_.avg_pool, GetMklOpName(csinfo_.avg_pool), 1,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avg_pool_grad,
+                      GetMklOpName(csinfo_.avg_pool_grad), 2, CopyAttrsPooling,
+                      AlwaysRewrite});
+    rinfo_.push_back({csinfo_.concat, GetMklOpName(csinfo_.concat), 0,
+                      CopyAttrsConcat, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.concatv2, GetMklOpName(csinfo_.concatv2), 0,
+                      CopyAttrsConcatV2, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.conv2d, GetMklOpName(csinfo_.conv2d), 2,
+                      CopyAttrsConv2D, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.conv2d_grad_filter,
+                      GetMklOpName(csinfo_.conv2d_grad_filter), 3,
                       CopyAttrsConv2D, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.conv2dgradinput,
-                      GetMklOpName(csinfo_.conv2dgradinput), 3, CopyAttrsConv2D,
+    rinfo_.push_back({csinfo_.conv2d_grad_input,
+                      GetMklOpName(csinfo_.conv2d_grad_input), 3,
+                      CopyAttrsConv2D, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.fused_batch_norm,
+                      GetMklOpName(csinfo_.fused_batch_norm), 5,
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.fused_batch_norm_grad,
+                      GetMklOpName(csinfo_.fused_batch_norm_grad), 5,
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.lrn, GetMklOpName(csinfo_.lrn), 1, CopyAttrsLRN,
+                      AlwaysRewrite});
+    rinfo_.push_back({csinfo_.lrn_grad, GetMklOpName(csinfo_.lrn_grad), 3,
+                      CopyAttrsLRN, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.max_pool, GetMklOpName(csinfo_.max_pool), 1,
+                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.max_pool_grad,
+                      GetMklOpName(csinfo_.max_pool_grad), 3, CopyAttrsPooling,
                       AlwaysRewrite});
     rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu), 1,
                       CopyAttrsRelu, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.maxpool, GetMklOpName(csinfo_.maxpool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.maxpoolgrad, GetMklOpName(csinfo_.maxpoolgrad), 3,
-                      CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpool, GetMklOpName(csinfo_.avgpool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.avgpoolgrad, GetMklOpName(csinfo_.avgpoolgrad), 2,
-                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.reshape, GetMklOpName(csinfo_.reshape), 2,
+                      CopyAttrsReshape, AlwaysRewrite});
+
+    // TODO(inteltf): we do not support ReluGrad and BiasAddGrad yet.
 
     // Add info about which ops to add workspace edge to and the slots.
-    wsinfo_.push_back({csinfo_.maxpool, csinfo_.maxpoolgrad, 0, 1, 2, 6});
+    wsinfo_.push_back({csinfo_.lrn, csinfo_.lrn_grad, 0, 2, 1, 3});
+    wsinfo_.push_back({csinfo_.max_pool, csinfo_.max_pool_grad, 0, 1, 1, 3});
 
     // Add a rule for merging nodes
-    minfo_.push_back(
-        {csinfo_.mklconv2d, csinfo_.biasadd, 0, csinfo_.mklconv2dwithbias});
+    minfo_.push_back({csinfo_.mkl_conv2d, csinfo_.bias_add, 0,
+                      csinfo_.mkl_conv2d_with_bias});
 
     // We use maxhop of 10 based on empirical observations. Also, these are
     // maxhops in backward data-flow graph. Since input of forward nodes
     // (Conv2D) directly goes to backward nodes, we do not expect the
     // hop-distance would be more than few nodes.
-    cinfo_.push_back({csinfo_.biasaddgrad, csinfo_.mklconv2dwithbias,
+    cinfo_.push_back({csinfo_.bias_add_grad, csinfo_.mkl_conv2d_with_bias,
                       kNodeMergeContextMaxDepth});
   }
 
@@ -318,73 +355,80 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   bool RunPass(std::unique_ptr<Graph>* g);
 
  private:
-  /// Structure to specify name of original op, its new name after rewrite,
-  /// the number of inputs to the original op, and the function to be used
-  /// to copy attributes for the op
+  /// Structure to specify the name of an original node, its new name after
+  /// rewrite, the number of inputs to the original node, the function to
+  /// be used to copy attributes for the op, and the rule (if any) which
+  /// must hold for rewriting the node
   typedef struct {
-    string name;     // Original name of the op in the graph
-    string newname;  // New name of op in the graph
-    int numins;      // Number of inputs to the original op
-    // Function handler to copy attributes from old node to new node.
-    std::function<void(const Node*, NodeBuilder*)> copyattrs;
-    std::function<bool(const Node*)> rewriterule;  // Rule under which to
-                                                   // rewrite this node.
+    string name;      // Original name of op of the node in the graph
+    string new_name;  // New name of the op of the node in the graph
+    int num_ins;      // The number of inputs to the original op type
+    // A function handler to copy attributes from an old node to a new node.
+    std::function<void(const Node*, NodeBuilder*)> copy_attrs;
+    std::function<bool(const Node*)> rewrite_rule;  // A rule under which to
+                                                    // rewrite this node.
   } RewriteInfo;
 
-  /// Structure to specify forward op, backward op, and the slot numbers
-  /// in forward and backward op where we will add workspace edge.
+  /// Structure to specify a forward op, a backward op, and the slot numbers
+  /// in the forward and backward ops where we will add a workspace edge.
   typedef struct {
-    string fwdop;   // Name of the forward op in the graph
-    string bwdop;   // Name of the backward op in the graph
-    int fwdslot;    // Output slot in the forward op node where actual
-                    // output tensor resides
-    int bwdslot;    // Input slot in the backward op node where actual
-                    // input tensor resides
-    int wsfwdslot;  // Output slot in the forward op node where workspace
-                    // edge is added
-    int wsbwdslot;  // Input slot in the backward op node where workspace
-                    // edge is added
+    string fwd_op;    // Name of a forward op in the graph
+    string bwd_op;    // Name of a backward op in the graph
+    int fwd_slot;     // Output slot in the forward op node where actual
+                      // output tensor resides
+    int bwd_slot;     // Input slot in the backward op node where actual
+                      // input tensor resides
+    int ws_fwd_slot;  // Output slot in the forward op node where workspace
+                      // edge is added
+    int ws_bwd_slot;  // Input slot in the backward op node where workspace
+                      // edge is added
   } WorkSpaceInfo;
 
   /// Structure to specify information used in node merge
   typedef struct {
-    string pred;     // Predecessor node string
-    string succ;     // Successor node string
-    int op;          // What operand no the predecessor node corresponds
-                     // to successor node?
-    string newnode;  // Name of the node after merge
+    string pred;      // Predecessor node string
+    string succ;      // Successor node string
+    int op;           // The operand no the predecessor node corresponds
+                      // to the successor node
+    string new_node;  // Name of the node after merge
   } MergeInfo;
 
-  /// Structure to specify the context information used in node rewrite rule
+  /// Structure to specify the context information used in a node rewrite rule
   typedef struct {
-    string node;    // Name of the node to be rewritten
-    string fwd;     // Node name in forward pass that this node
-                    // corresponds to
-    size_t maxhop;  // Maximum number of hops the fwd is located
-                    // from this node. If fwd is farther than maxhop
-                    // then we do not rewrite the node.
+    string node;     // Name of the node to be rewritten
+    string fwd;      // Name of the node in the forward pass that this node
+                     // corresponds to
+    size_t max_hop;  // Maximum number of hops the fwd is located
+                     // from this node. If the fwd is farther than max_hop
+                     // then we do not rewrite the node.
   } ContextInfo;
 
   /// Structure to store all constant strings
+  /// NOTE: names are alphabetically sorted.
   struct {
-    string relu;
-    string relugrad;
-    // Conv ops
+    string avg_pool;
+    string avg_pool_grad;
+    string bias_add;
+    string bias_add_grad;
+    string concat;
+    string concatv2;
     string conv2d;
-    string mklconv2d;
-    string conv2dgradinput;
-    string conv2dgradfilter;
-    string mklconv2dwithbias;
-    string mklconv2dwithbiasbackpropbias;
-    // Pooling ops
-    string maxpool;
-    string maxpoolgrad;
-    string avgpool;
-    string avgpoolgrad;
-    // Others
-    string biasadd;
+    string conv2d_grad_input;
+    string conv2d_grad_filter;
+    string fused_batch_norm;
+    string fused_batch_norm_grad;
+    string lrn;
+    string lrn_grad;
     string matmul;
-    string biasaddgrad;
+    string max_pool;
+    string max_pool_grad;
+    string mkl_conv2d;
+    string mkl_conv2d_with_bias;
+    string mkl_conv2d_with_bias_backprop_bias;
+    string relu;
+    string relu_grad;
+    string split;
+    string reshape;
   } csinfo_;
 
   /// Maintain info about nodes to rewrite
@@ -393,7 +437,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   /// Maintain info about nodes to add workspace edge
   std::vector<WorkSpaceInfo> wsinfo_;
 
-  /// Maintain info  to be merged
+  /// Maintain info about nodes to be merged
   std::vector<MergeInfo> minfo_;
 
   /// Maintain info about nodes to rewrite
@@ -403,7 +447,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   std::unordered_set<const Node*> visited_nodes_;
 
  private:
-  // Predicate to check if we rewrote node 'n'
+  // Check if we rewrote node 'n'
   //
   // If we rewrote the node, then the rewritten node will produce
   // Mkl tensor as output. If we did not rewrite the node, then
@@ -420,12 +464,49 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // Clear all visited nodes
   inline void UnMarkRewrittenNodes() { visited_nodes_.clear(); }
 
+  // Is this a graph node that can accept variable number of inputs?
+  // Return true if yes, false otherwise.
+  //
+  // Concat, Split are vararg nodes.
+  inline bool IsVarArgNode(Node* n) {
+    if (n->type_string() == csinfo_.concat ||
+        n->type_string() == csinfo_.concatv2 ||
+        n->type_string() == csinfo_.split) {
+      return true;
+    }
+    return false;
+  }
+
+  // Is OpDef::ArgDef a list type? It could be N * T or list(type).
+  // Refer to opdef.proto for details of list type.
+  inline bool ArgIsList(const OpDef::ArgDef& arg) const {
+    return !arg.type_list_attr().empty() || !arg.number_attr().empty();
+  }
+
+  // Get length of a list in 'n' if 'arg' is of list type. Refer to
+  // description of ArgIsList for definition of list type.
+  inline int GetTensorListLength(const OpDef::ArgDef& arg, Node* n) {
+    CHECK_EQ(ArgIsList(arg), true);
+    int N = 0;
+    const string attr_name = !arg.type_list_attr().empty()
+                                 ? arg.type_list_attr()
+                                 : arg.number_attr();
+    if (!arg.type_list_attr().empty()) {
+      std::vector<DataType> value;
+      TF_CHECK_OK(GetNodeAttr(n->def(), attr_name, &value));
+      N = value.size();
+    } else {
+      TF_CHECK_OK(GetNodeAttr(n->def(), attr_name, &N));
+    }
+    return N;
+  }
+
   // Get the name of Mkl op from original TensorFlow op
   // We prefix 'Mkl' to the original op to get Mkl op.
   // TODO(nhasabni) We should move this to mkl_util.h.
   inline string GetMklOpName(const string& name) const {
     // Prefix that we add to Tensorflow op name to construct Mkl op name.
-    const char* const kMklOpPrefix = "Mkl";
+    const char* const kMklOpPrefix = "_Mkl";
     return string(kMklOpPrefix) + name;
   }
 
@@ -440,7 +521,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //
   // Input nodes succ and pred may be deleted if the call to
   // this function is successful. Attempt to use the pointers
-  // after the call to function may result is undefined behaviors.
+  // after the call to function may result in undefined behaviors.
   //
   // @input g - input graph, succ - successor node, pred - predecessor node
   // @return Status::OK(), if merging is successful and supported.
@@ -470,13 +551,13 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // gradient op in the backward direction.
   //
   // @input n - Node (gradient op) whose contextinfo is to be searched,
-  //        fwdn - pointer to node from the forward pass that this node
-  //        belongs to. fwdn cannot be NULL.
+  //        fwd_node - pointer to node from the forward pass that this node
+  //        belongs to. fwd_node cannot be NULL.
   // @return Matching contextinfo in case a match is found; null otherwise.
-  //         Also updates *fwdn with pointer to forward node that this context
-  //         matches.
+  //         Also updates *fwd_node with pointer to forward node that this
+  //         context matches.
   static const ContextInfo* SearchMatchingContext(const Node* n,
-                                                  const Node** fwdn);
+                                                  const Node** fwd_node);
 
   // Rewrites input node to a new node specified by its matching rewrite info.
   //
@@ -494,46 +575,132 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   //         Otherwise, it is not updated.
   Status RewriteNode(std::unique_ptr<Graph>* g, Node* n, const RewriteInfo* ri);
 
+  // Get nodes that will feed a list of TF tensors to the new
+  // node that we are constructing.
+  //
+  // @input g - input graph,
+  // @input inputs - inputs to old node that we are using for constructing
+  //                 new inputs,
+  // @input input_idx - the index in the 'inputs' vector pointing to the
+  //                    current input that we have processed so far
+  // @output input_idx - index will be incremented by the number of nodes
+  //                     from 'inputs' that are processed
+  // @input list_length - The expected length of list of TF tensors
+  // @output output_nodes - the list of new nodes creating TF tensors
+  //
+  // @return None
+  void GetNodesProducingTFTensorList(
+      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+      int* input_idx, int list_length,
+      std::vector<NodeBuilder::NodeOut>* output_nodes);
+
+  // Get nodes that will feed a list of Mkl tensors to the new
+  // node that we are constructing.
+  //
+  // @input g - input graph,
+  // @input inputs - inputs to old node that we are using for constructing
+  //                 new inputs,
+  // @input input_idx - the index in the 'inputs' vector pointing to the
+  //                    current input that we have processed so far
+  // @output input_idx - index will be incremented by the number of nodes
+  //                     from 'inputs' that are processed
+  // @input list_length - The expected length of list of Mkl tensors
+  // @output output_nodes - the list of new nodes creating Mkl tensors
+  //
+  // @return None
+  void GetNodesProducingMklTensorList(
+      std::unique_ptr<Graph>* g,
+      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+      int* input_idx, int list_length,
+      std::vector<NodeBuilder::NodeOut>* output_nodes);
+
+  // Get a node that will feed an Mkl tensor to the new
+  // node that we are constructing. The output node could be (1) 'n'
+  // if it is Mkl layer, or (2) a dummy node producing dummy Mkl tensor
+  // if 'n' is not an Mkl layer.
+  //
+  // @input g - input graph,
+  // @input n - Node based on which we are creating Mkl node,
+  // @input n_output_slot - the output slot of node 'n'
+  //            which is feeding to the node that we are constructing
+  // @output mkl_node - the new node that will feed Mkl tensor
+  // @output mkl_node_output_slot - the slot number of mkl_node that
+  //                                will feed the tensor
+  // @return None
+  void GetNodeProducingMklTensor(std::unique_ptr<Graph>* g, Node* n,
+                                 int n_output_slot, Node** mkl_node,
+                                 int* mkl_node_output_slot);
+
   // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
-  // in graph 'g'. Original node is input in 'orign'.
+  // in graph 'g'. Original node is input in 'old_node'. Inputs to 'nb' are
+  // set up in contiguous fashion. 'workspace_tensors' carry graph nodes
+  // producing workspace edges if 'are_workspace_tensors_available' is true.
+  // Otherwise, 'workspace_tensors' is empty vector.
   //
-  // For details, refer to 'Number of inputs after rewriting' section in the
+  // For details, refer to 'Ordering of inputs after rewriting' section in the
   // documentation above.
   //
   // Returns Status::OK() if setting up inputs is successful, otherwise
   // returns appropriate status code.
+  int SetUpContiguousInputs(
+      std::unique_ptr<Graph>* g,
+      const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
+      NodeBuilder* nb, Node* old_node,
+      std::vector<NodeBuilder::NodeOut>* workspace_tensors,
+      bool are_workspace_tensors_available);
+
+  // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
+  // in graph 'g'. Original node is input in 'orig_node'.
+  //
+  // For details, refer to 'Ordering of Tensorflow tensors and Mkl tensors'
+  // section in the documentation above.
+  //
+  // Returns Status::OK() if setting up inputs is successful, otherwise
+  // returns appropriate status code.
   Status SetUpInputs(std::unique_ptr<Graph>* g,
                      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
-                     NodeBuilder* nb, Node* orign);
-
-  // Add workspace edge on the input or output side of Node 'orign' by using
-  // NodeBuilder 'nb' for the new node provided. If 'orign' does not dictate
-  // adding workspace edge then do not add it.
-  void AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g, Node* orign,
-                                NodeBuilder* nb);
+                     NodeBuilder* nb, Node* orig_node);
+
+  // Add workspace edge on the input or output side of Node 'orig_node' by using
+  // NodeBuilder 'nb' for the new node provided. If 'orig_node' does not dictate
+  // adding workspace edge then do not add it. Workspace Tensorflow and Mkl
+  // tensors, if they need to be added, will be set into these tensors.
+  // If we set workspace tensors, then are_ws_tensors_added should be true.
+  void AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g, Node* orig_node,
+                                NodeBuilder* nb,
+                                std::vector<NodeBuilder::NodeOut>* ws_tensors,
+                                bool* are_ws_tensors_added);
 
   // Functions specific to operators to copy attributes
   // We need operator-specific function to copy attributes because the framework
   // does not provide any generic function for it.
-  static void CopyAttrsConv2D(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsBiasAddGrad(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsPooling(const Node* orign, NodeBuilder* nb);
-  static void CopyAttrsRelu(const Node* orign, NodeBuilder* nb);
+  // NOTE: names are alphabetically sorted.
+  static void CopyAttrsBiasAddGrad(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsConcat(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsConcatV2(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsConv2D(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsFusedBatchNorm(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsLRN(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsPooling(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsReshape(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsSplit(const Node* orig_node, NodeBuilder* nb);
 
   // Generate a graph node in graph 'g' representing a dummy Mkl tensor node,
-  // using node for original node 'orign' and return it in '*out'.
+  // using node for original node 'orig_node' and return it in '*out'.
   // TODO(nhasabni) We should move this to mkl_util.h
   void GetDummyMklTensorNode(std::unique_ptr<Graph>* g, Node** out,
-                             Node* orign);
+                             Node* orig_node);
   void GetDummyWorkspaceTensorNode(std::unique_ptr<Graph>* g, Node** out,
-                                   Node* orign);
+                                   Node* orig_node);
 };
 
 std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
 
-// We register Mkl rewrite pass for phase 1 in pre-placement group.
-// Do not change the ordering of the Mkl passes.
-REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 1,
+// We register Mkl rewrite pass for phase 1 in post rewrite group.
+// We register it here so that we get a complete picture of all users of Mkl
+// nodes. Do not change the ordering of the Mkl passes.
+REGISTER_OPTIMIZATION(OptimizationPassRegistry::POST_REWRITE_FOR_EXEC, 1,
                       MklLayoutRewritePass);
 
 //////////////////////////////////////////////////////////////////////////
@@ -543,7 +710,6 @@ REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 1,
 static void FillInputs(const Node* n,
                        gtl::InlinedVector<Node*, 4>* control_edges,
                        gtl::InlinedVector<std::pair<Node*, int>, 4>* in) {
-  DCHECK_EQ(in->size(), n->num_inputs());
   control_edges->clear();
   for (const Edge* e : n->in_edges()) {
     if (e->IsControlEdge()) {
@@ -561,9 +727,43 @@ static void FillInputs(const Node* n,
   }
 }
 
+void MklLayoutRewritePass::GetNodesProducingTFTensorList(
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs, int* input_idx,
+    int list_length, std::vector<NodeBuilder::NodeOut>* output_nodes) {
+  CHECK_LT(*input_idx, inputs.size());
+  CHECK_GT(list_length, 0);
+  CHECK_NOTNULL(output_nodes);
+  output_nodes->reserve(list_length);
+
+  while (list_length != 0) {
+    CHECK_GT(list_length, 0);
+    CHECK_LE(*input_idx, inputs.size());
+    Node* n = inputs[*input_idx].first;
+    int slot = inputs[*input_idx].second;
+    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
+    // If input node 'n' is producing a list/array output at output
+    // slot 'slot' then we need to find out the length of that list/array.
+    if (ArgIsList(arg)) {
+      int N = GetTensorListLength(arg, n);
+      CHECK_LE(N, list_length);
+      for (int j = 0; j < N; j++) {
+        output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
+      }
+      (*input_idx)++;
+      list_length -= N;
+    } else {
+      // But if input node 'n' is just producing a single tensor at
+      // output slot 'slot' then we just add that single node.
+      output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
+      (*input_idx)++;
+      list_length--;
+    }
+  }
+}
+
 // TODO(nhasabni) We should move this to mkl_util.h.
 void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
-                                                 Node** out, Node* orign) {
+                                                 Node** out, Node* orig_node) {
   // We use a tensor of shape {8} and value 0,0,0,0,0,0,0,0 to represent
   // dummy Mkl tensor. 8 = 2*size_t.
   const DataType dt = DataTypeToEnum<uint8>::v();
@@ -574,63 +774,228 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
                            8);
   TensorShape dummy_shape({8});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(
-      NodeBuilder((*g)->NewName("DMT"), "Const")
-          .Attr("value", proto)
-          .Attr("dtype", dt)
-          .Device(orign->def().device())  // We place this node on same
-                                          // device as device of original
-                                          // node.
-          .Finalize(&**g, out));
-  (*out)->set_assigned_device_name(orign->assigned_device_name());
+  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
+                  .Attr("value", proto)
+                  .Attr("dtype", dt)
+                  .Device(orig_node->def().device())  // We place this node on
+                                                      // the same device as the
+                                                      // device of the original
+                                                      // node.
+                  .Finalize(&**g, out));
+  (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
-Status MklLayoutRewritePass::SetUpInputs(
+void MklLayoutRewritePass::GetNodesProducingMklTensorList(
+    std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs, int* input_idx,
+    int list_length, std::vector<NodeBuilder::NodeOut>* output_nodes) {
+  CHECK_LT(*input_idx, inputs.size());
+  CHECK_GT(list_length, 0);
+  CHECK_NOTNULL(output_nodes);
+  output_nodes->reserve(list_length);
+
+  while (list_length != 0) {
+    CHECK_GT(list_length, 0);
+    CHECK_LE(*input_idx, inputs.size());
+    Node* n = inputs[*input_idx].first;
+    int slot = inputs[*input_idx].second;
+    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
+    // We need to check first if the input edge is going to carry a
+    // single tensor or a list of tensors. If it is a list of tensors,
+    // then we need to create list of Mkl dummy nodes.
+    if (ArgIsList(arg)) {
+      // If input node 'n' is producing a list/array output at output
+      // slot 'slot' then we need to find out the length of that list/array.
+      int N = GetTensorListLength(arg, n);
+      CHECK_LE(N, list_length);
+      Node* mkl_node = nullptr;
+      int mkl_node_output_slot = 0;
+      // If it is a list, then create a list of Mkl dummy nodes.
+      for (int j = 0; j < N; j++) {
+        GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
+        output_nodes->push_back(
+            NodeBuilder::NodeOut(mkl_node, mkl_node_output_slot));
+      }
+      (*input_idx)++;
+      list_length -= N;
+    } else {
+      // If it is not a list, then create a single Mkl tensor node.
+      Node* mkl_node = nullptr;
+      int mkl_node_output_slot = 0;
+      GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
+      output_nodes->push_back(
+          NodeBuilder::NodeOut(mkl_node, mkl_node_output_slot));
+      (*input_idx)++;
+      list_length--;
+    }
+  }
+}
+
+// Get an input node that will feed Mkl tensor to the new
+// node that we are constructing. An input node could be (1) 'n'
+// if it is Mkl layer, or (2) a dummy node producing dummy Mkl tensor
+// if 'n' is not an Mkl layer.
+void MklLayoutRewritePass::GetNodeProducingMklTensor(
+    std::unique_ptr<Graph>* g, Node* n, int n_output_slot, Node** mkl_node,
+    int* mkl_node_output_slot) {
+  CHECK_NOTNULL(n);
+  CHECK_NOTNULL(mkl_node);
+  CHECK_NOTNULL(mkl_node_output_slot);
+  if (IsRewrittenNode(n)) {
+    // If we have visited this node and rewritten it, then it will generate
+    // an edge that will receive Mkl tensor from a node.
+    // First, let's assert that this op is Mkl layer.
+    DataType T;
+    TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
+    // If this op has been rewritten, then its name must have been same as
+    // Mkl op.
+    CHECK_EQ(mkl_op_registry::IsMklOp(n->type_string(), T), true);
+    // output slot number for Mkl tensor would be N+slot number of TensorFlow
+    // tensor, where N is total number of TensorFlow tensors.
+    *mkl_node = n;
+    *mkl_node_output_slot =
+        GetTensorMetaDataIndex(n_output_slot, n->num_outputs());
+  } else {
+    // If we have not visited the node and rewritten it, then we need
+    // to create a dummy node that will feed a dummy Mkl tensor to this node.
+    // DummyMklTensor node has no input and generates only 1 output
+    // (dummy Mkl tensor) as output slot number 0.
+    GetDummyMklTensorNode(g, mkl_node, n);
+    CHECK_NOTNULL(*mkl_node);
+    *mkl_node_output_slot = 0;
+  }
+}
+
+int MklLayoutRewritePass::SetUpContiguousInputs(
     std::unique_ptr<Graph>* g,
-    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs, NodeBuilder* nb,
-    Node* orign) {
-  std::vector<NodeBuilder::NodeOut> new_inputs;
-
-  // 1. Let's setup inputs for the new node.
-  for (int i = 0; i < inputs.size(); i++) {
-    Node* n = inputs[i].first;
-    // First let's copy original TF tensor input as it is.
-    new_inputs.push_back(NodeBuilder::NodeOut(n, inputs[i].second));
-
-    // Second, let's add edge to propagate Mkl tensors from input Mkl layers,
-    // or generate a dummy Mkl tensor representing not-mkl-tensor case.
-    if (IsRewrittenNode(n)) {
-      // If we have visited this node and rewritten it, then it will generate
-      // an edge that will receive Mkl tensor from a node.
-      // First, let's assert that this op is Mkl layer.
-      DataType T;
-      TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
-      // If this op has been rewritten, then its name must have been same as
-      // Mkl op.
-      CHECK_EQ(mkl_layer_registry::IsMklLayer(n->type_string(), T), true);
-      // src slot number for Mkl tensor would be the one next to TF tensor
-      // slot number.
-      new_inputs.push_back(NodeBuilder::NodeOut(n, inputs[i].second + 1));
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
+    NodeBuilder* nb, Node* old_node,
+    std::vector<NodeBuilder::NodeOut>* workspace_tensors,
+    bool are_workspace_tensors_available) {
+  CHECK_NOTNULL(workspace_tensors);
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+
+  // Number of input slots to original op
+  // Input slots are represented by .Input() calls in REGISTER_OP.
+  int old_node_input_slots = old_node->op_def().input_arg_size();
+  // Actual number of inputs can be greater than or equal to number
+  // of Input slots because inputs of type list could be unfolded.
+  CHECK_GE(old_node_inputs.size(), old_node_input_slots);
+  int nn_slot_idx = 0;  // slot index for inputs of new node
+
+  // Let's copy all inputs (TF tensors) of original node to new node.
+  int iidx = 0;
+  for (int on_slot_idx = 0; on_slot_idx < old_node_input_slots; on_slot_idx++) {
+    // An input slot could be a single tensor or a list. We need
+    // to handle this case accordingly.
+    CHECK_LT(iidx, old_node_inputs.size());
+    const OpDef::ArgDef& arg = old_node->op_def().input_arg(on_slot_idx);
+    if (ArgIsList(arg)) {
+      std::vector<NodeBuilder::NodeOut> new_node_inputs;
+      int N = GetTensorListLength(arg, old_node);
+      GetNodesProducingTFTensorList(old_node_inputs, &iidx, N,
+                                    &new_node_inputs);
+      nb->Input(new_node_inputs);
+      nn_slot_idx++;
     } else {
-      // If we have not visited the node and rewritten it, then we need
-      // to create a dummy node that will feed a non-Mkl tensor to this node.
-      // DummyMklTensor node has no input and generates only 1 output
-      // (dummy Mkl tensor) as output slot number 0.
-      Node* dmt = nullptr;
-      GetDummyMklTensorNode(g, &dmt, orign);
-      CHECK_NOTNULL(dmt);
-      new_inputs.push_back(NodeBuilder::NodeOut(dmt, 0));
+      nb->Input(old_node_inputs[iidx].first, old_node_inputs[iidx].second);
+      iidx++;
+      nn_slot_idx++;
     }
   }
 
-  // The total number of inputs to new node _must_ be 2 times the number
-  // of inputs to the original node: N original Tensorflow tensors and
-  // N for Mkl tensors corresponding to each Tensorflow tensors.
-  CHECK_EQ(new_inputs.size(), inputs.size() * 2);
+  // If workspace tensors are available for this op and we are using
+  // contiguous ordering then we need to add Tensorflow tensor for
+  // workspace here because Tensorflow tensor for workspace is the
+  // last tensor in the list of Tensorflow tensors.
+  if (are_workspace_tensors_available) {
+    CHECK_EQ(workspace_tensors->size(), 2);
+    // Tensorflow tensor
+    nb->Input((*workspace_tensors)[0].node, (*workspace_tensors)[0].index);
+    nn_slot_idx++;
+  }
+
+  // Let's now setup all Mkl inputs to new node.
+  // Number of Mkl inputs must be same as number of TF inputs.
+  iidx = 0;
+  for (int on_slot_idx = 0; on_slot_idx < old_node_input_slots; on_slot_idx++) {
+    // An input slot could be a single tensor or a list. We need
+    // to handle this case accordingly.
+    CHECK_LT(iidx, old_node_inputs.size());
+    const OpDef::ArgDef& arg = old_node->op_def().input_arg(on_slot_idx);
+    if (ArgIsList(arg)) {
+      std::vector<NodeBuilder::NodeOut> new_node_inputs;
+      int N = GetTensorListLength(arg, old_node);
+      GetNodesProducingMklTensorList(g, old_node_inputs, &iidx, N,
+                                     &new_node_inputs);
+      nb->Input(new_node_inputs);
+      nn_slot_idx++;
+    } else {
+      Node* mkl_node = nullptr;
+      int mkl_node_output_slot = 0;
+      GetNodeProducingMklTensor(g, old_node_inputs[iidx].first,
+                                old_node_inputs[iidx].second, &mkl_node,
+                                &mkl_node_output_slot);
+      nb->Input(mkl_node, mkl_node_output_slot);
+      iidx++;
+      nn_slot_idx++;
+    }
+  }
+
+  // If workspace tensors are available for this op and we are using
+  // contiguous ordering then we need to add Mkl tensor for
+  // workspace here because Mkl tensor for workspace is the
+  // last tensor in the list of Mkl tensors.
+  if (are_workspace_tensors_available) {
+    CHECK_EQ(workspace_tensors->size(), 2);
+    // Mkl tensor
+    nb->Input((*workspace_tensors)[1].node, (*workspace_tensors)[1].index);
+    nn_slot_idx++;
+  }
+
+  return nn_slot_idx;
+}
+
+Status MklLayoutRewritePass::SetUpInputs(
+    std::unique_ptr<Graph>* g,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& old_node_inputs,
+    NodeBuilder* nb, Node* old_node) {
+  // Let's check if we need to add workspace tensors for this node.
+  // We add workspace edge only for MaxPool, LRN and BatchNorm.
+  std::vector<NodeBuilder::NodeOut> workspace_tensors;
+  bool are_workspace_tensors_available = false;
+  AddWorkSpaceEdgeIfNeeded(g, old_node, nb, &workspace_tensors,
+                           &are_workspace_tensors_available);
+
+  int new_node_input_slots = 0;
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    // TODO(nhasabni): implement this function just for same of completion.
+    // We do not use interleaved ordering right now.
+    return Status(
+        error::Code::UNIMPLEMENTED,
+        "Interleaved ordering of tensors is currently not supported.");
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    new_node_input_slots = SetUpContiguousInputs(
+        g, old_node_inputs, nb, old_node, &workspace_tensors,
+        are_workspace_tensors_available);
+  }
 
-  // 2. Let's add the new inputs.
-  for (auto ni : new_inputs) {
-    nb->Input(ni.node, ni.index);
+  // Sanity check
+  int old_node_input_slots = old_node->op_def().input_arg_size();
+  if (!are_workspace_tensors_available) {
+    // If we are not adding workspace tensors for this op, then the total
+    // number of input slots to the new node _must_ be 2 times the number
+    // of input slots to the original node: N original Tensorflow tensors and
+    // N for Mkl tensors corresponding to each Tensorflow tensors.
+    CHECK_EQ(new_node_input_slots, old_node_input_slots * 2);
+  } else {
+    // If we are adding workspace tensors for this op, then the total
+    // The total number of input slots to new node _must_ be 2 times the number
+    // of input slots to the original node: N original Tensorflow tensors and
+    // N for Mkl tensors corresponding to each Tensorflow tensors plus 2
+    // (for workspace Tensorflow tensor and workspace Mkl tensor).
+    CHECK_EQ(new_node_input_slots, old_node_input_slots * 2 + 2);
   }
 
   return Status::OK();
@@ -642,7 +1007,7 @@ Status MklLayoutRewritePass::SetUpInputs(
 
 // TODO(nhasabni) We should move this to mkl_util.h.
 void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
-    std::unique_ptr<Graph>* g, Node** out, Node* orign) {
+    std::unique_ptr<Graph>* g, Node** out, Node* orig_node) {
   // We use a tensor of shape {1} and value 0 to represent
   // dummy float tensor. We need this as a dummy workspace tensor.
   // Workspace tensor has type float.
@@ -654,39 +1019,42 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
                            4);
   TensorShape dummy_shape({1});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(
-      NodeBuilder((*g)->NewName("DMT"), "Const")
-          .Attr("value", proto)
-          .Attr("dtype", dt)
-          .Device(orign->def().device())  // We place this node on same
-                                          // device as device of original
-                                          // node.
-          .Finalize(&**g, out));
-  (*out)->set_assigned_device_name(orign->assigned_device_name());
+  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
+                  .Attr("value", proto)
+                  .Attr("dtype", dt)
+                  .Device(orig_node->def().device())  // We place this node on
+                                                      // same the device as the
+                                                      // device of the original
+                                                      // node.
+                  .Finalize(&**g, out));
+  (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
-void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
-                                                    Node* orign,
-                                                    NodeBuilder* nb) {
-  bool workspace_edge_added = false;
+void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(
+    std::unique_ptr<Graph>* g, Node* orig_node, NodeBuilder* nb,
+    std::vector<NodeBuilder::NodeOut>* ws_tensors, bool* are_ws_tensors_added) {
+  bool workspace_edge_added = false;  // Default initializer
+  CHECK_NOTNULL(are_ws_tensors_added);
+  *are_ws_tensors_added = false;  // Default initializer
+
   DataType T;
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
   for (auto ws : wsinfo_) {
-    if (orign->type_string() == ws.fwdop &&
-        mkl_layer_registry::IsMklLayer(GetMklOpName(orign->type_string()), T)) {
+    if (orig_node->type_string() == ws.fwd_op &&
+        mkl_op_registry::IsMklOp(GetMklOpName(orig_node->type_string()), T)) {
       // If this op is a fwd op, then we need to check if there is an
-      // edge from this node's fwdslot to bwdop's bwdslot. If there is
+      // edge from this node's fwd_slot to bwdop's bwd_slot. If there is
       // an edge, then we just add an attribute on this node for setting
       // workspace_passed to true. We don't add actual workspace edge
       // in this node. Actual workspace edge gets added in the backward
       // op for this node.
-      for (const Edge* e : orign->out_edges()) {
-        if (e->src_output() == ws.fwdslot &&
-            e->dst()->type_string() == ws.bwdop &&
-            e->dst_input() == ws.bwdslot) {
+      for (const Edge* e : orig_node->out_edges()) {
+        if (e->src_output() == ws.fwd_slot &&
+            e->dst()->type_string() == ws.bwd_op &&
+            e->dst_input() == ws.bwd_slot) {
           nb->Attr("workspace_enabled", true);
           VLOG(1) << "MklLayoutRewritePass: workspace_enabled for "
-                  << orign->type_string();
+                  << orig_node->type_string();
           workspace_edge_added = true;
           // We found the edge that we were looking for, so break.
           break;
@@ -698,34 +1066,40 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         // node.
         nb->Attr("workspace_enabled", false);
       }
-    } else if (orign->type_string() == ws.bwdop &&
-               mkl_layer_registry::IsMklLayer(
-                   GetMklOpName(orign->type_string()), T)) {
+    } else if (orig_node->type_string() == ws.bwd_op &&
+               mkl_op_registry::IsMklOp(GetMklOpName(orig_node->type_string()),
+                                        T)) {
       // If this op is a bwd op, then we need to add workspace edge and
       // it's Mkl tensor edge between its corresponding fwd op and this
-      // op. Corresponding fwd op is specified in 'fwdop' field of
-      // workspace info. fwdslot and bwdslot in workspace info specify
+      // op. Corresponding fwd op is specified in 'fwd_op' field of
+      // workspace info. fwd_slot and bwd_slot in workspace info specify
       // an edge between which slots connect forward and backward op.
       // Once all these criteria match, we add a workspace edge between
-      // wsfwdslot and wsbwdslot. It's corresponding Mkl tensor is added
-      // in wsfwdslot+1 and wsbwdslot+1.
-      for (const Edge* e : orign->in_edges()) {
-        if (e->src_output() == ws.fwdslot &&
+      // ws_fwd_slot and ws_bwd_slot. Its corresponding Mkl tensor is
+      // determined by interleaved/contiguous ordering. Function
+      // DataIndexToMetaDataIndex tells us the location of Mkl tensor
+      // from the location of the Tensorflow tensor.
+      for (const Edge* e : orig_node->in_edges()) {
+        if (e->src_output() == ws.fwd_slot &&
             // We would have rewritten the forward op, so we need to use
             // GetMklOpName call to get its Mkl name.
-            e->src()->type_string() == GetMklOpName(ws.fwdop) &&
-            e->dst_input() == ws.bwdslot) {
+            e->src()->type_string() == GetMklOpName(ws.fwd_op) &&
+            e->dst_input() == ws.bwd_slot) {
           nb->Attr("workspace_enabled", true);
+          CHECK_NOTNULL(ws_tensors);
           // Add workspace edge between fwd op and bwd op.
-          nb->Input(e->src(), ws.wsfwdslot);
+          ws_tensors->push_back(NodeBuilder::NodeOut(e->src(), ws.ws_fwd_slot));
           // Add Mkl tensor edge for workspace edge between fwd op and bwd op.
-          nb->Input(e->src(), ws.wsfwdslot + 1);
+          ws_tensors->push_back(NodeBuilder::NodeOut(
+              e->src(), DataIndexToMetaDataIndex(ws.ws_fwd_slot,
+                                                 e->src()->num_outputs())));
+          *are_ws_tensors_added = true;
           // In terms of input ordering, we add these calls to add Input
           // here because workspace edge (and its Mkl tensor) is the last
           // edge in the fwdop and bwdop. So all inputs before workspace
           // tensor have been added by SetUpInputs function.
           VLOG(1) << "MklLayoutRewritePass: workspace_enabled for "
-                  << orign->type_string();
+                  << orig_node->type_string();
           workspace_edge_added = true;
           // We found the edge that we were looking for, so break.
           break;
@@ -740,15 +1114,18 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
         nb->Attr("workspace_enabled", false);
         Node* dmt_ws = nullptr;      // Dummy tensor for workspace
         Node* dmt_mkl_ws = nullptr;  // Dummy Mkl tensor for workspace
-        GetDummyWorkspaceTensorNode(g, &dmt_ws, orign);
-        GetDummyMklTensorNode(g, &dmt_mkl_ws, orign);
+        GetDummyWorkspaceTensorNode(g, &dmt_ws, orig_node);
+        GetDummyMklTensorNode(g, &dmt_mkl_ws, orig_node);
         CHECK_NOTNULL(dmt_ws);
         CHECK_NOTNULL(dmt_mkl_ws);
-        nb->Input(dmt_ws, 0);      // We add dummy tensor as workspace tensor.
-        nb->Input(dmt_mkl_ws, 0);  // We add dummy tensor as Mkl
-                                   // tensor for workspace tensor.
+        CHECK_NOTNULL(ws_tensors);
+        // We add dummy tensor as workspace tensor.
+        ws_tensors->push_back(NodeBuilder::NodeOut(dmt_ws, 0));
+        // We add dummy tensor as Mkl tensor for workspace tensor.
+        ws_tensors->push_back(NodeBuilder::NodeOut(dmt_mkl_ws, 0));
+        *are_ws_tensors_added = true;
         VLOG(1) << "MklLayoutRewritePass: dummy workspace_enabled for "
-                << orign->type_string();
+                << orig_node->type_string();
       }
     } else {
       // If this node does not match any workspace info, then we do not
@@ -761,7 +1138,8 @@ void MklLayoutRewritePass::AddWorkSpaceEdgeIfNeeded(std::unique_ptr<Graph>* g,
 // Op-specific functions to copy attributes from old node to new node
 //////////////////////////////////////////////////////////////////////////
 
-void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orig_node,
+                                           NodeBuilder* nb) {
   DataType T;
   string data_format;
   string padding;
@@ -769,11 +1147,12 @@ void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
   bool use_cudnn_on_gpu;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "padding", &padding));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "use_cudnn_on_gpu", &use_cudnn_on_gpu));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "padding", &padding));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
+  TF_CHECK_OK(
+      GetNodeAttr(orig_node->def(), "use_cudnn_on_gpu", &use_cudnn_on_gpu));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -783,16 +1162,16 @@ void MklLayoutRewritePass::CopyAttrsConv2D(const Node* orign, NodeBuilder* nb) {
   nb->Attr("use_cudnn_on_gpu", use_cudnn_on_gpu);
 }
 
-void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
+void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orig_node,
                                                 NodeBuilder* nb) {
   DataType T;
   string data_format;
   std::vector<int32> strides;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -800,7 +1179,30 @@ void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orign,
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
+void MklLayoutRewritePass::CopyAttrsLRN(const Node* orig_node,
+                                        NodeBuilder* nb) {
+  DataType T;
+  int depth_radius;
+  float bias;
+  float alpha;
+  float beta;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "depth_radius", &depth_radius));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "bias", &bias));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "alpha", &alpha));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "beta", &beta));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("depth_radius", depth_radius);
+  nb->Attr("bias", bias);
+  nb->Attr("alpha", alpha);
+  nb->Attr("beta", beta);
+}
+
+void MklLayoutRewritePass::CopyAttrsPooling(const Node* orig_node,
                                             NodeBuilder* nb) {
   DataType T;
   string data_format;
@@ -808,11 +1210,11 @@ void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
   std::vector<int32> ksize, strides;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "ksize", &ksize));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "strides", &strides));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "padding", &padding));
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "ksize", &ksize));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "strides", &strides));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "padding", &padding));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
 
   // Add attributes to new node.
   nb->Attr("T", T);
@@ -822,14 +1224,97 @@ void MklLayoutRewritePass::CopyAttrsPooling(const Node* orign,
   nb->Attr("data_format", data_format);
 }
 
-void MklLayoutRewritePass::CopyAttrsRelu(const Node* orign, NodeBuilder* nb) {
+void MklLayoutRewritePass::CopyAttrsRelu(const Node* orig_node,
+                                         NodeBuilder* nb) {
+  DataType T;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+}
+
+void MklLayoutRewritePass::CopyAttrsSplit(const Node* orig_node,
+                                          NodeBuilder* nb) {
+  DataType T;
+  string data_format;
+  int num_split;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "num_split", &num_split));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("num_split", num_split);
+  nb->Attr("data_format", data_format);
+}
+
+void MklLayoutRewritePass::CopyAttrsConcat(const Node* orig_node,
+                                           NodeBuilder* nb) {
+  DataType T;
+  int N;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "N", &N));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("N", N);
+}
+
+void MklLayoutRewritePass::CopyAttrsConcatV2(const Node* orig_node,
+                                             NodeBuilder* nb) {
+  DataType T;
+  int N;
+  DataType tidx;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "N", &N));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tidx", &tidx));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("N", N);
+  nb->Attr("Tidx", tidx);
+}
+
+void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orig_node,
+                                                   NodeBuilder* nb) {
+  DataType T;
+  float epsilon;
+  string data_format;
+  bool is_training;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "epsilon", &epsilon));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "data_format", &data_format));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "is_training", &is_training));
+
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("epsilon", epsilon);
+  nb->Attr("data_format", data_format);
+  nb->Attr("is_training", is_training);
+}
+
+void MklLayoutRewritePass::CopyAttrsReshape(const Node* orig_node,
+                                            NodeBuilder* nb) {
   DataType T;
+  DataType Tshape;
 
   // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tshape", &Tshape));
 
   // Add attributes to new node.
   nb->Attr("T", T);
+  nb->Attr("Tshape", Tshape);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -889,8 +1374,8 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
   CHECK_NOTNULL(succ);
   CHECK_NOTNULL(pred);
 
-  if (succ->type_string() == csinfo_.biasadd &&
-      pred->type_string() == csinfo_.mklconv2d) {
+  if (succ->type_string() == csinfo_.bias_add &&
+      pred->type_string() == csinfo_.mkl_conv2d) {
     // 1. Get all attributes from input nodes.
     DataType T_pred, T_succ;
     string padding;
@@ -947,7 +1432,7 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     // 2. Get inputs from both the nodes.
     // Find the 2 inputs from the conv and the bias from the add Bias.
     // Get operand 0, 1 of conv2D and their Mkl tensors.
-    CHECK_EQ(pred->in_edges().size(), 4);  // MklConv2D must have 4 inputs.
+    CHECK_EQ(pred->in_edges().size(), 4);  // _MklConv2D must have 4 inputs.
     // Get operand 1 of add_bias
     // BiasAdd must have 2 inputs: Conv, bias
     CHECK_EQ(succ->in_edges().size(), 2);
@@ -960,13 +1445,29 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     // We will use the node name of BiasAdd as the name of new node
     // Build new node. We use same name as original node, but change the op
     // name.
-    NodeBuilder nb(succ->name(), csinfo_.mklconv2dwithbias);
-    nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
-    nb.Input(pred_in[1].first, pred_in[1].second);  // Mkl for In1
-    nb.Input(pred_in[2].first, pred_in[2].second);  // In2 of Conv2D
-    nb.Input(pred_in[3].first, pred_in[3].second);  // Mkl for In2
-    nb.Input(succ_in[1].first, succ_in[1].second);  // In2 of BiasAdd
-    nb.Input(oper3_mkl, oper3_mkl_slot);            // Mkl for In2 of BiasAdd
+    NodeBuilder nb(succ->name(), csinfo_.mkl_conv2d_with_bias);
+    if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+      nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
+      // pred_in[1] will be Mkl tensor for In1 if we follow interleaved
+      // ordering, and it will be 2nd Tensorflow tensor for Conv2D if
+      // we follow contiguous ordering.
+      nb.Input(pred_in[1].first, pred_in[1].second);  // Mkl for In1
+      nb.Input(pred_in[2].first, pred_in[2].second);  // In2 of Conv2D
+      nb.Input(pred_in[3].first, pred_in[3].second);  // Mkl for In2
+      nb.Input(succ_in[1].first, succ_in[1].second);  // In2 of BiasAdd
+      nb.Input(oper3_mkl, oper3_mkl_slot);            // Mkl for In2 of BiasAdd
+    } else {
+      CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+      nb.Input(pred_in[0].first, pred_in[0].second);  // In1 of Conv2D
+      // pred_in[1] will be Mkl tensor for In1 if we follow interleaved
+      // ordering, and it will be 2nd Tensorflow tensor for Conv2D if
+      // we follow contiguous ordering.
+      nb.Input(pred_in[1].first, pred_in[1].second);  // In2 of Conv2D
+      nb.Input(succ_in[1].first, succ_in[1].second);  // In2 of BiasAdd
+      nb.Input(pred_in[2].first, pred_in[2].second);  // Mkl for In1 of Conv2D
+      nb.Input(pred_in[3].first, pred_in[3].second);  // Mkl for In2 of Conv2D
+      nb.Input(oper3_mkl, oper3_mkl_slot);            // Mkl for In2 of BiasAdd
+    }
 
     // Copy attributes from Conv2D to Conv2DWithBias.
     CopyAttrsConv2D(const_cast<const Node*>(pred), &nb);
@@ -975,30 +1476,30 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     nb.Device(succ->def().device());
 
     // Create node.
-    Node* newn;
-    nb.Finalize(&**g, &newn);
-    CHECK_NOTNULL(newn);
+    Node* new_node;
+    nb.Finalize(&**g, &new_node);
+    CHECK_NOTNULL(new_node);
 
     // Set the Mkl layer label for this op.
-    newn->AddAttr("_kernel", mkl_layer_registry::kMklLayerLabel);
+    new_node->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
     // Incoming edges are fixed, we will fix the outgoing edges now.
     for (const Edge* e : succ->out_edges()) {
-      (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
+      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
     }
 
     // Copy device assigned to old node to new node.
     // It's ok to use pred or succ as we have enforced a check that
     // both have same device assigned.
-    newn->set_assigned_device_name(pred->assigned_device_name());
+    new_node->set_assigned_device_name(pred->assigned_device_name());
 
     VLOG(1) << "MklLayoutRewritePass: Merged old node:" << pred->DebugString()
             << ", and node: " << succ->DebugString()
-            << ", into node:" << newn->DebugString();
+            << ", into node:" << new_node->DebugString();
 
     (*g)->RemoveNode(succ);
     (*g)->RemoveNode(pred);
-    MarkRewrittenNode(newn);
+    MarkRewrittenNode(new_node);
 
     return Status::OK();
   }
@@ -1011,35 +1512,39 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
 //           Helper functions for node rewrite
 //////////////////////////////////////////////////////////////////////////
 
-Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
+Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
+                                         Node* orig_node,
                                          const RewriteInfo* ri) {
   CHECK_NOTNULL(ri);
-  CHECK_NOTNULL(orign);
+  CHECK_NOTNULL(orig_node);
 
-  VLOG(1) << "MklLayoutRewritePass: Original node:" << orign->DebugString();
+  VLOG(1) << "MklLayoutRewritePass: Original node:" << orig_node->DebugString();
 
   // Check if this is scenario 2 (context-based rewrite).
   // Get the matching ContextInfo if it is.
-  const Node* fwdn = nullptr;
+  const Node* fwd_node = nullptr;
   const ContextInfo* ci = nullptr;
   bool is_context_based_rewrite = false;
-  if ((ci = SearchMatchingContext(orign, &fwdn)) != nullptr) {
-    CHECK_NOTNULL(fwdn);
+  if ((ci = SearchMatchingContext(orig_node, &fwd_node)) != nullptr) {
+    CHECK_NOTNULL(fwd_node);
     is_context_based_rewrite = true;
 
     // Sanity checks for context-based rewrite (if any)
-    if (orign->type_string() == csinfo_.biasaddgrad &&
-        ri->newname == csinfo_.mklconv2dwithbiasbackpropbias) {
+    if (orig_node->type_string() == csinfo_.bias_add_grad &&
+        ri->new_name == csinfo_.mkl_conv2d_with_bias_backprop_bias) {
       DataType orig_T, ctx_T;
       string orig_data_format, ctx_data_format;
-      TF_CHECK_OK(GetNodeAttr(orign->def(), "T", &orig_T));
-      TF_CHECK_OK(GetNodeAttr(orign->def(), "data_format", &orig_data_format));
-      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "T", &ctx_T));
-      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "data_format", &ctx_data_format));
+      TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &orig_T));
+      TF_CHECK_OK(
+          GetNodeAttr(orig_node->def(), "data_format", &orig_data_format));
+      TF_CHECK_OK(GetNodeAttr(fwd_node->def(), "T", &ctx_T));
+      TF_CHECK_OK(
+          GetNodeAttr(fwd_node->def(), "data_format", &ctx_data_format));
 
       if (orig_data_format != ctx_data_format || orig_T != ctx_T ||
-          orign->assigned_device_name() != fwdn->assigned_device_name() ||
-          orign->def().device() != fwdn->def().device()) {
+          orig_node->assigned_device_name() !=
+              fwd_node->assigned_device_name() ||
+          orig_node->def().device() != fwd_node->def().device()) {
         return Status(
             error::Code::INVALID_ARGUMENT,
             "data_format or T attribute or devices of BiasAddGrad and "
@@ -1049,18 +1554,22 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   }
 
   // Get all inputs.
-  const int num = orign->num_inputs();
-  CHECK_EQ(num, ri->numins);
+  const int num = orig_node->in_edges().size();
+  // Check the number of inputs against the user-specified value for non-vararg
+  // nodes.
+  if (!IsVarArgNode(orig_node)) {
+    CHECK_EQ(num, ri->num_ins);
+  }
   gtl::InlinedVector<Node*, 4> control_edges;
   gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num);
-  FillInputs(orign, &control_edges, &inputs);
+  FillInputs(orig_node, &control_edges, &inputs);
 
   // Build new node. We use same name as original node, but change the op name.
-  NodeBuilder nb(orign->name().c_str(), ri->newname.c_str());
+  NodeBuilder nb(orig_node->name().c_str(), ri->new_name.c_str());
   // Copy user-specified device assigned to original node to new node.
-  nb.Device(orign->def().device());
+  nb.Device(orig_node->def().device());
   // Set up new inputs to the rewritten node.
-  Status s = SetUpInputs(g, inputs, &nb, orign);
+  Status s = SetUpInputs(g, inputs, &nb, orig_node);
   if (s != Status::OK()) {
     return s;
   }
@@ -1068,62 +1577,63 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* orign,
   // Copy attributes from original node to new node (for scenario 1).
   // For context-based rewrite, we use context to copy the attributes.
   if (is_context_based_rewrite) {
-    if (orign->type_string() == csinfo_.biasaddgrad &&
-        ri->newname == csinfo_.mklconv2dwithbiasbackpropbias) {
-      CHECK_NOTNULL(fwdn);
-      ri->copyattrs(fwdn, &nb);
+    if (orig_node->type_string() == csinfo_.bias_add_grad &&
+        ri->new_name == csinfo_.mkl_conv2d_with_bias_backprop_bias) {
+      CHECK_NOTNULL(fwd_node);
+      ri->copy_attrs(fwd_node, &nb);
     } else {
       return Status(error::Code::UNIMPLEMENTED,
                     "Unimplemented case for node rewrite optimization.");
     }
   } else {
-    ri->copyattrs(const_cast<const Node*>(orign), &nb);
+    ri->copy_attrs(const_cast<const Node*>(orig_node), &nb);
   }
   // Set the Mkl layer label for this op.
-  nb.Attr("_kernel", mkl_layer_registry::kMklLayerLabel);
-
-  // Add workspace edge to this node if needed.
-  // We add workspace edge only for MaxPool, LRN and BatchNorm.
-  AddWorkSpaceEdgeIfNeeded(g, orign, &nb);
+  nb.Attr("_kernel", mkl_op_registry::kMklOpLabel);
 
   // Finalize graph and get new node.
-  Node* newn = nullptr;
-  TF_CHECK_OK(nb.Finalize(&**g, &newn));
-  CHECK_NOTNULL(newn);
-
-  // Incoming edges from 'orign' node to new 'newn' node are already copied
-  // in BuildNode. Copy outgoing edges from 'orign' node to new 'newn' node.
-  // Since the output also follows same ordering among Tensorflow tensors and
-  // Mkl tensors. We need to connect Tensorflow tensors appropriately.
-  // Specifically, nth output of original node will become 2*nth output of
-  // Mkl node. GetTensorDataIndex provides this mapping function.
-  for (const Edge* e : orign->out_edges()) {
+  Node* new_node = nullptr;
+  TF_CHECK_OK(nb.Finalize(&**g, &new_node));
+  CHECK_NOTNULL(new_node);
+
+  // Incoming edges from 'orig_node' node to new 'new_node' node are already
+  // copied in BuildNode. Copy outgoing edges from 'orig_node' node to new
+  // 'new_node' node, since the output also follows same ordering among
+  // Tensorflow tensors and Mkl tensors. We need to connect Tensorflow
+  // tensors appropriately. Specifically, nth output of the original node
+  // will become 2*nth output of the Mkl node for the interleaved ordering
+  // of the tensors. For the contiguous ordering of the tensors, it will be n.
+  // GetTensorDataIndex provides this mapping function.
+  for (const Edge* e : orig_node->out_edges()) {
     // We need to handle control-edges by using their original slot number.
     // Generally, -1 is reserved for control slot.
     if (e->src_output() < 0) {
-      (*g)->AddEdge(newn, e->src_output(), e->dst(), e->dst_input());
+      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
     } else {
-      (*g)->AddEdge(newn, GetTensorDataIndex(e->src_output()), e->dst(),
-                    e->dst_input());
+      (*g)->AddEdge(
+          new_node,
+          GetTensorDataIndex(e->src_output(), e->src()->num_outputs()),
+          e->dst(), e->dst_input());
     }
   }
 
   // Copy the runtime device assigned from original code to new node.
-  newn->set_assigned_device_name(orign->assigned_device_name());
+  new_node->set_assigned_device_name(orig_node->assigned_device_name());
 
   // Delete original node and mark new node as rewritten.
-  (*g)->RemoveNode(orign);
-  MarkRewrittenNode(newn);
+  (*g)->RemoveNode(orig_node);
+  MarkRewrittenNode(new_node);
 
-  VLOG(1) << "MklLayoutRewritePass: New node:" << newn->DebugString();
+  VLOG(1) << "MklLayoutRewritePass: New node:" << new_node->DebugString();
   return Status::OK();
 }
 
 const MklLayoutRewritePass::ContextInfo*
-MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
+MklLayoutRewritePass::SearchMatchingContext(const Node* n,
+                                            const Node** fwd_node) {
   CHECK_NOTNULL(n);
-  CHECK_NOTNULL(fwdn);
-  *fwdn = nullptr;
+  CHECK_NOTNULL(fwd_node);
+  *fwd_node = nullptr;
 
   // Search for matching contextinfo based on node name.
   // There could be more than one matching contextinfos.
@@ -1171,7 +1681,7 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
     // If we find a match, we return immediately.
     for (const ContextInfo* ci : mci) {
       if (curr_node->type_string() == ci->fwd) {
-        *fwdn = curr_node;
+        *fwd_node = curr_node;
         return ci;
       }
     }
@@ -1192,8 +1702,8 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n, const Node** fwdn) {
 }
 
 bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n) {
-  const Node* fwdn = nullptr;
-  return SearchMatchingContext(n, &fwdn) != nullptr;
+  const Node* fwd_node = nullptr;
+  return SearchMatchingContext(n, &fwd_node) != nullptr;
 }
 
 const MklLayoutRewritePass::RewriteInfo*
@@ -1208,7 +1718,8 @@ MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
   if (!GetNodeAttr(n->def(), "T", &T).ok()) {
     return nullptr;
   }
-  if (!mkl_layer_registry::IsMklLayer(GetMklOpName(n->type_string()), T)) {
+
+  if (!mkl_op_registry::IsMklOp(GetMklOpName(n->type_string()), T)) {
     return nullptr;
   }
 
@@ -1219,7 +1730,7 @@ MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
 
   // Find matching RewriteInfo and then check that rewrite rule applies.
   for (auto ri = rinfo_.cbegin(); ri != rinfo_.cend(); ++ri) {
-    if (n->type_string().compare(ri->name) == 0 && ri->rewriterule(n)) {
+    if (n->type_string().compare(ri->name) == 0 && ri->rewrite_rule(n)) {
       return &*ri;
     }
   }
diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc
index 142d60d611..6e72baf84e 100644
--- a/tensorflow/core/graph/mkl_layout_pass_test.cc
+++ b/tensorflow/core/graph/mkl_layout_pass_test.cc
@@ -110,9 +110,11 @@ class MklLayoutPassTest : public ::testing::Test {
 };
 
 REGISTER_OP("Input").Output("o: float").SetIsStateful();
+REGISTER_OP("InputList").Output("o: N * float").Attr("N: int").SetIsStateful();
 REGISTER_OP("HalfInput").Output("o: half").SetIsStateful();
-REGISTER_OP("MklInput").Output("o: uint8").SetIsStateful();
-REGISTER_OP("MklInput2").Output("o: uint8").Output("o1: uint8").SetIsStateful();
+REGISTER_OP("Int32Input").Output("o: int32").SetIsStateful();
+REGISTER_OP("_MklInput").Output("o: uint8").SetIsStateful();
+REGISTER_OP("_MklInput2").Output("o: uint8").Output("o1: uint8").SetIsStateful();
 
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to node merge optiimization
@@ -133,20 +135,22 @@ TEST_F(MklLayoutPassTest, Basic) {
 
 // Test set 1: Conv2D + AddBias
 
-// C=MklConv2D(A,M,B,N); E=BiasAdd(C,D); Z=Sub(E,Y)
+// C=_MklConv2D(A,M,B,N); E=BiasAdd(C,D); Z=Sub(E,Y) (for interleaved ordering)
+// C=_MklConv2D(A,B,M,N); E=BiasAdd(C,D); Z=Sub(E,Y) (for contiguous ordering)
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'BiasAdd'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -157,26 +161,28 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
       " attr {key: 'T'                 value { type: DT_FLOAT } }"
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
-            "M(MklInput);N(MklInput);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
-            "DMT/_0->E:5;E->Z;M->E:1;N->E:3;Y->Z:1");
+            "A(Input);B(Input);D(Input);DMT/_0(Const);E(_MklConv2DWithBias);"
+            "M(_MklInput);N(_MklInput);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
+            "DMT/_0->E:5;E->Z;M->E:3;N->E:4;Y->Z:1");
 }
 
-// C=MklConv2D(A,M:1,B,N:1); E=BiasAdd(C,D); Z=Sub(E,Y)
+// C=_MklConv2D(A,M:1,B,N:1); E=BiasAdd(C,D); Z=Sub(E,Y) (for interleaved)
+// C=_MklConv2D(A,B,M:1,N:1); E=BiasAdd(C,D); Z=Sub(E,Y) (for contiguous)
 // Test for correct output slots selected
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput2'}"
       "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput2'}"
-      "node { name: 'C' op: 'MklConv2D'"
+      "node { name: 'M' op: '_MklInput2'}"
+      "node { name: 'N' op: '_MklInput2'}"
+      "node { name: 'C' op: '_MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M:1', 'B', 'N:1']}"
+      " input: ['A', 'B', 'M:1', 'N:1']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'BiasAdd'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
@@ -187,16 +193,17 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
       " attr {key: 'T'                 value { type: DT_FLOAT } }"
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
-            "M(MklInput2);N(MklInput2);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
-            "DMT/_0->E:5;E->Z;M:1->E:1;N:1->E:3;Y->Z:1");
+            "A(Input);B(Input);D(Input);DMT/_0(Const);E(_MklConv2DWithBias);"
+            "M(_MklInput2);N(_MklInput2);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
+            "DMT/_0->E:5;E->Z;M:1->E:3;N:1->E:4;Y->Z:1");
 }
 
 // C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
 // This is a case of node rewrite followed by node merge.
-// We will first rewrite Conv2D to MklConv2D, and then merge MklConv2D
-// with BiasAdd to produce MklConv2DWithBias.
+// We will first rewrite Conv2D to _MklConv2D, and then merge _MklConv2D
+// with BiasAdd to produce _MklConv2DWithBias.
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
   InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'B' op: 'Input'}"
@@ -218,70 +225,70 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
-            "DMT/_2(Const);E(MklConv2DWithBias);Y(Input);Z(Sub)|"
-            "A->E;B->E:2;D->E:4;DMT/_0->E:1;DMT/_1->E:3;DMT/_2->E:5;"
+            "DMT/_2(Const);E(_MklConv2DWithBias);Y(Input);Z(Sub)|"
+            "A->E;B->E:1;D->E:2;DMT/_0->E:3;DMT/_1->E:4;DMT/_2->E:5;"
             "E->Z;Y->Z:1");
 }
 
-// Graph contains only MklConv2D, no AddBias.
+// Graph contains only _MklConv2D, no AddBias.
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_NoAddBias) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}");
+      " input: ['A', 'B', 'M', 'N']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(MklConv2D);M(MklInput);N(MklInput)|"
-            "A->C;B->C:2;M->C:1;N->C:3");
+            "A(Input);B(Input);C(_MklConv2D);M(_MklInput);N(_MklInput)|"
+            "A->C;B->C:1;M->C:2;N->C:3");
 }
 
-// MklConv2D output does not go to BiasAdd.
+// _MklConv2D output does not go to BiasAdd.
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow1) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'Input'}"
       "node { name: 'F' op: 'BiasAdd'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D', 'E'] }");  // Output of MklConv2D does not go to BiasAdd.
+      " input: ['D', 'E'] }");  // Output of _MklConv2D does not go to BiasAdd.
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "M(MklInput);N(MklInput)|A->C;B->C:2;D->F;E->F:1;M->C:1;N->C:3");
+            "A(Input);B(Input);C(_MklConv2D);D(Input);E(Input);F(BiasAdd);"
+            "M(_MklInput);N(_MklInput)|A->C;B->C:1;D->F;E->F:1;M->C:2;N->C:3");
 }
 
-// MklConv2D has two outgoing edges: BiasAdd and some other dummy node (Add).
+// _MklConv2D has two outgoing edges: BiasAdd and some other dummy node (Add).
 // Merge should not be done in such case.
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'Input'}"
       "node { name: 'F' op: 'BiasAdd'"
@@ -293,9 +300,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " input: ['C', 'E'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "G(Add);M(MklInput);N(MklInput)|A->C;B->C:2;C->G;D->F;"
-            "E->F:1;E->G:1;M->C:1;N->C:3");
+            "A(Input);B(Input);C(_MklConv2D);D(Input);E(Input);F(BiasAdd);"
+            "G(Add);M(_MklInput);N(_MklInput)|A->C;B->C:1;C->G;D->F;"
+            "E->F:1;E->G:1;M->C:2;N->C:3");
 }
 
 // data_format attribute value mismatch. Merge should not be done
@@ -303,43 +310,81 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_Dataflow2) {
 TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_AttrMismatch) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Input'}"
       "node { name: 'E' op: 'BiasAdd'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NHCW' } }"
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(BiasAdd);M(MklInput);"
-            "N(MklInput)|A->C;B->C:2;C->E;D->E:1;M->C:1;N->C:3");
+            "A(Input);B(Input);C(_MklConv2D);D(Input);E(BiasAdd);M(_MklInput);"
+            "N(_MklInput)|A->C;B->C:1;C->E;D->E:1;M->C:2;N->C:3");
 }
 
-// No MklConv2D in context, but Conv2D in context.
-// Only Conv2D would be rewritten to MklConv2D, but no rewrite
+// Disabling Conv2DBackpropBias test for now as we have disabled rewrite
+// of BiasAddGrad into BackpropBias
+#if 0
+// Test set 2: _MklConv2D..BiasAddGrad -> _MklConv2DWithBiasBackpropBias
+// rewrite tests
+
+// D=_MklConv2D(A,M,B,N,C,O); E=Sub(D,A); F=BiasAddGrad(E)
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'O' op: '_MklInput'}"
+      "node { name: 'D' op: '_MklConv2DWithBias'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C', 'M', 'N', 'O']}"
+      "node { name: 'E' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['D', 'A']}"
+      "node { name: 'F' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['E'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(_MklConv2DWithBias);DMT/_0(Const);"
+            "E(Sub);F(_MklConv2DWithBiasBackpropBias);M(_MklInput);N(_MklInput);"
+            "O(_MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;DMT/_0->F:1;E->F;"
+            "M->D:3;N->D:4;O->D:5");
+}
+#endif
+
+// No _MklConv2D in context, but Conv2D in context.
+// Only Conv2D would be rewritten to _MklConv2D, but no rewrite
 // for BiasAddGrad should happen.
-// C=MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
+// C=_MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D) (for interleaved)
+// C=_MklConv2D(A,B,M,N); D=Sub(C,A); E=BiasAddGrad(D) (for contiguous)
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_No_MklConv2DWithBias) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
       "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
       " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
       " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
+      " input: ['A', 'B', 'M', 'N']}"
       "node { name: 'D' op: 'Sub'"
       " attr {key: 'T'                 value { type: DT_FLOAT } }"
       " input: ['C', 'A']}"
@@ -348,9 +393,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
       " attr { key: 'data_format'      value { s: 'NCHW' } }"
       " input: ['D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(MklConv2D);D(Sub);E(BiasAddGrad);"
-            "M(MklInput);N(MklInput)|A->C;A->D:1;B->C:2;C->D;D->E;"
-            "M->C:1;N->C:3");
+            "A(Input);B(Input);C(_MklConv2D);D(Sub);E(BiasAddGrad);"
+            "M(_MklInput);N(_MklInput)|A->C;A->D:1;B->C:1;C->D;D->E;"
+            "M->C:2;N->C:3");
 }
 
 // No Conv2D in the context for BiasAddGrad. No rewrite should happen.
@@ -462,8 +507,8 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Basic) {
       "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['B', 'C'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(MklConv2D);D(Mul);DMT/_0(Const);DMT/_1(Const)|"
-            "A->C;B->C:2;B->D;C->D:1;DMT/_0->C:1;DMT/_1->C:3");
+            "A(Input);B(Input);C(_MklConv2D);D(Mul);DMT/_0(Const);DMT/_1(Const)|"
+            "A->C;B->C:1;B->D;C->D:1;DMT/_0->C:2;DMT/_1->C:3");
 }
 
 // 2 Conv2D Ops in sequence. Both should get transformed and 1st Conv2D will
@@ -489,9 +534,9 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Positive1) {
       "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(MklConv2D);D(MklConv2D);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;B->C:2;C->D:2;C->E;"
-            "C:1->D:3;D->E:1;DMT/_0->C:1;DMT/_1->C:3;DMT/_2->D:1");
+            "A(Input);B(Input);C(_MklConv2D);D(_MklConv2D);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;B->C:1;C->D:1;C->E;"
+            "C:1->D:3;D->E:1;DMT/_0->C:2;DMT/_1->C:3;DMT/_2->D:2");
 }
 
 // Conv2D with INT32 which is not supported by Mkl
@@ -513,10 +558,374 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Negative_UnsupportedType) {
             "A->C;B->C:1;B->D;C->D:1");
 }
 
+// Concat Op test: Concat with no Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Basic) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['A', 'B']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(_MklConcat);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D;B->D:1;B->D:2;C->E;"
+            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+}
+
+// Concat with 2 Mkl layers feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_Mkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['G', 'E', 'F']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(_MklConv2D);"
+            "F(_MklConv2D);G(Const);H(_MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
+            "DMT/_4->H:3;E->H:1;E:1->H:4;F->H:2;F:1->H:5;G->H;H->I:1");
+}
+
+// Concat with 1 Mkl and 1 non-Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_MixedMkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['G', 'E', 'F']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);E(_MklConv2D);F(Mul);G(Const);"
+            "H(_MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "DMT/_1->E:3;DMT/_2->H:3;DMT/_3->H:5;E->H:1;E:1->H:4;F->H:2;"
+            "G->H;H->I:1");
+}
+
+#if 0
+// ConcatV2 Op test: ConcatV2 with no Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Basic) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['B:0', 'B:1', 'A']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(_MklConcat);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D:2;B->D;B:1->D:1;C->E;"
+            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+}
+#endif
+
+// ConcatV2 with 2 Mkl layers feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_Mkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['E', 'F', 'G']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(_MklConv2D);"
+            "F(_MklConv2D);G(Const);H(_MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
+            "DMT/_4->H:5;E->H;E:1->H:3;F->H:1;F:1->H:4;G->H:2;H->I:1");
+}
+
+// ConcatV2 with 1 Mkl and 1 non-Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_MixedMkl) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D']}"
+      "node { name: 'G' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'H' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['E', 'F', 'G']}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'H'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);E(_MklConv2D);F(Mul);G(Const);"
+            "H(_MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "DMT/_1->E:3;DMT/_2->H:4;DMT/_3->H:5;E->H;E:1->H:3;F->H:1;"
+            "G->H:2;H->I:1");
+}
+
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to rewriting node for workspace edges
 /////////////////////////////////////////////////////////////////////
 
+/* Test LRN->MaxPool->MaxPoolGrad->LRNGrad replacement by workspace nodes. */
+TEST_F(MklLayoutPassTest, MaxPoolLRN_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['B'] }"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'MaxPoolGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['B', 'C', 'D'] }"
+      "node { name: 'F' op: 'Input'}"
+      "node { name: 'G' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['E', 'F', 'B'] }"
+      "node { name: 'H' op: 'Input'}"
+      "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['H', 'G'] }");
+  EXPECT_EQ(
+      DoMklLayoutOptimizationPass(),
+      "A(Input);B(_MklLRN);C(_MklMaxPool);D(Input);DMT/_0(Const);DMT/_1(Const);"
+      "DMT/_2(Const);E(_MklMaxPoolGrad);F(Input);G(_MklLRNGrad);H(Input);I(Mul)|"
+      "A->B;B->C;B->E;B->G:2;B:1->G:3;B:2->C:1;B:2->E:4;B:2->G:6;B:3->G:7;"
+      "C->E:1;C:1->E:3;C:2->E:5;C:3->E:7;D->E:2;DMT/_0->B:1;DMT/_1->E:6;"
+      "DMT/_2->G:5;E->G;E:1->G:4;F->G:1;G->I:1;H->I");
+}
+
+/* Test LRN->LRNGrad replacement by workspace nodes. */
+TEST_F(MklLayoutPassTest, LRN_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['C', 'D', 'B'] }"
+      "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'E'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);E(_MklLRNGrad);F(Mul)|"
+            "A->B;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;C->E;C->F;D->E:1;"
+            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:5;E->F:1");
+}
+
+/* Test LRN->LRNGrad replacement when only one of them is present. */
+TEST_F(MklLayoutPassTest, LRN_Negative1) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklLRN);C(Mul);DMT/_0(Const)|"
+            "A->B;A->C;B->C:1;DMT/_0->B:1");
+}
+
+/* Test LRN->LRNGrad replacement when only one of them is present. */
+TEST_F(MklLayoutPassTest, LRN_Negative2) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A', 'B', 'C'] }"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(_MklLRNGrad);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
+            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
+            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+}
+
+/* Test LRN->LRNGrad negative case, where single LRN feeds
+   2 LRNGrad nodes at different slots. */
+TEST_F(MklLayoutPassTest, LRN_Negative3) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'LRN'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['C', 'D', 'B'] }"
+      "node { name: 'F' op: 'LRNGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'alpha'        value { f: 0.001 } }"
+      " attr { key: 'beta'         value { f: 0.75 } }"
+      " attr { key: 'bias'         value { f: 1.0 } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'depth_radius' value { i: 2 } }"
+      " input: ['C', 'B', 'D'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['E', 'F'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);DMT/_5(Const);"
+            "DMT/_6(Const);E(_MklLRNGrad);F(_MklLRNGrad);G(Mul)|A->B;B->E:2;"
+            "B->F:1;B:1->E:3;B:2->E:6;B:2->F:5;B:3->E:7;C->E;C->F;D->E:1;"
+            "D->F:2;DMT/_0->B:1;DMT/_1->F:3;DMT/_2->F:7;DMT/_3->F:4;"
+            "DMT/_4->F:6;DMT/_5->E:4;DMT/_6->E:5;E->G;F->G:1");
+}
+
 /* Test MaxPool->MaxPoolGrad replacement by workspace+rewrite nodes. */
 TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Positive) {
   InitGraph(
@@ -540,10 +949,10 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Positive) {
       "node { name: 'F' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['C', 'E'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(MklMaxPool);C(Input);D(Input);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(MklMaxPoolGrad);F(Mul)|"
-            "A->B;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;C->E;C->F;D->E:4;"
-            "DMT/_0->B:1;DMT/_1->E:1;DMT/_2->E:5;E->F:1");
+            "A(Input);B(_MklMaxPool);C(Input);D(Input);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(_MklMaxPoolGrad);F(Mul)|"
+            "A->B;B->E:1;B:1->E:3;B:2->E:5;B:3->E:7;C->E;C->F;D->E:2;"
+            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:6;E->F:1");
 }
 
 // Test MaxPool>MaxPoolGrad replacement when only one of them is present.
@@ -562,11 +971,11 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative1) {
       "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['A', 'B'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(MklMaxPool);C(Mul);DMT/_0(Const)|"
+            "A(Input);B(_MklMaxPool);C(Mul);DMT/_0(Const)|"
             "A->B;A->C;B->C:1;DMT/_0->B:1");
 }
 
-// Test MaxPool->MaxPoolGrad replacement when only one of them is present.
+// Test MaxPoolGrad replacement when only one of them is present.
 // In this case, we will rewrite MaxPoolGrad and for workspace tensor and
 // its Mkl part, we will generate dummy tensor.
 TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) {
@@ -584,10 +993,10 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) {
       "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['A', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(Input);D(MklMaxPoolGrad);DMT/_0(Const);"
+            "A(Input);B(Input);C(Input);D(_MklMaxPoolGrad);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
-            "A->D;A->E;B->D:2;C->D:4;D->E:1;DMT/_0->D:1;DMT/_1->D:3;"
-            "DMT/_2->D:5;DMT/_3->D:6;DMT/_4->D:7");
+            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
+            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
 }
 
 /////////////////////////////////////////////////////////////////////
diff --git a/tensorflow/core/graph/mkl_optimizer_merge.cc b/tensorflow/core/graph/mkl_optimizer_merge.cc
deleted file mode 100644
index a171a27d8f..0000000000
--- a/tensorflow/core/graph/mkl_optimizer_merge.cc
+++ /dev/null
@@ -1,651 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifdef INTEL_MKL
-// This module implements node merging optimization on the graph.
-// We process the nodes in the graph in reverse postorder
-// (i.e. inputs before their downstream dependencies).
-//
-#include <memory>
-#include <queue>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "tensorflow/core/graph/mkl_optimizer_merge.h"
-
-#include "tensorflow/core/common_runtime/function.h"
-#include "tensorflow/core/common_runtime/optimization_registry.h"
-#include "tensorflow/core/framework/node_def_util.h"
-#include "tensorflow/core/graph/algorithm.h"
-#include "tensorflow/core/graph/graph.h"
-#include "tensorflow/core/graph/node_builder.h"
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/lib/gtl/map_util.h"
-#include "tensorflow/core/lib/hash/hash.h"
-#include "tensorflow/core/platform/logging.h"
-
-namespace tensorflow {
-
-// How many hops do we search for matching node in the backward dataflow graph?
-// We use maxhop of 10 based on empirical observations. Also, these are
-// maxhops in backward data-flow graph. Since input of forward nodes (Conv2D)
-// directly goes to backward nodes, we do not expect the hop-distance
-// would be more than few nodes.
-static size_t kNodeMergeContextMaxDepth = 10;
-
-// This optimization pass performs two tasks: merge
-// nodes in the forward pass, and rewrite the gradient ops
-// corresponding to merged forward ops.
-//
-// Merging nodes in the graph: Currently, it merges Conv2D+AddBias together.
-//
-// Rewriting nodes in the graph: This is neded in order to optimize
-// gradient ops of Conv2D+AddBias. Gradient op of both the Conv2D and
-// MatMul is BiasAddGrad, and we need to rewrite BiasAddGrad into
-// Conv2D-specific BiasAddGrad, and MatMul-specific BiasAddGrad.
-// This is context-specific optimization, where the context is the
-// forward operator that the BiasAddGrad corresponds to.
-class NodeMergeRewritePass : public GraphOptimizationPass {
- public:
-  NodeMergeRewritePass() {
-    csinfo_.conv2d = "MklConv2D";
-    csinfo_.conv2dwithbias = "MklConv2DWithBias";
-    csinfo_.conv2dwithbiasbackpropbias = "Conv2DWithBiasBackpropBias";
-    csinfo_.biasadd = "BiasAdd";
-    csinfo_.matmul = "MatMul";
-    csinfo_.biasaddgrad = "BiasAddGrad";
-
-    minfo_.push_back(
-        {csinfo_.conv2d, csinfo_.biasadd, 0, csinfo_.conv2dwithbias});
-
-// We use maxhop of 10 based on emperical observations. Also, these are
-// maxhops in backward data-flow graph. Since input of forward nodes
-// (Conv2D) directly goes to backward nodes, we do not expect the
-// hop-distance would be more than few nodes.
-// TODO(nhasabni) Temporarily disabling rewrite of BiasAddGrad.
-// Will enable it once we support Conv2DWithBiasBackpropBias op.
-#if 0
-    rinfo_.push_back({csinfo_.biasaddgrad, csinfo_.conv2dwithbiasbackpropbias,
-                  {csinfo_.conv2dwithbias, kNodeMergeContextMaxDepth}});
-    rinfo_.push_back({csinfo_.biasaddgrad, csinfo_.conv2dwithbiasbackpropbias,
-                  {csinfo_.conv2d, kNodeMergeContextMaxDepth}});
-    // For now, we are rewriting BiasAddGrad to BiasAddGrad for MatMul. This is
-    // because we do not have a separate Op for MatMulwithBias.
-    rinfo_.push_back({csinfo_.biasaddgrad, csinfo_.biasaddgrad,
-                      {csinfo_.matmul, kNodeMergeContextMaxDepth}});
-#endif
-  }
-
-  // Standard interface to run optimization pass
-  Status Run(const GraphOptimizationPassOptions& options);
-
-  // Helper function which does most of heavy lifting for node merge
-  //
-  // Extracts common functionality between Run public interface and
-  // test interface.
-  //
-  // @return true, if and only if graph is mutated; false otherwise.
-  bool RunPass(std::unique_ptr<Graph>* g);
-
- private:
-  /// Structure to specify information used in node merge
-  typedef struct {
-    string pred;     // Predecessor node string
-    string succ;     // Successor node string
-    int op;          // What operand no the predecessor node corresponds
-                     // to successor node?
-    string newnode;  // Name of the node after merge
-  } MergeInfo;
-
-  /// Structure to specify information used in node rewrite
-  typedef struct {
-    string node;     // Name of the node to be rewritten
-    string rewrite;  // New name of the node after rewrite
-    typedef struct {
-      string fwd;     // Node name in forward pass that this node
-                      // corresponds to
-      size_t maxhop;  // Maximum number of hops the mfwd_ is located
-                      // from this node. If mfwd_ is farther than mmaxhop_
-                      // then we do not rewrite the node.
-    } ContextInfo;
-    ContextInfo cinfo;  // Context for rewrite
-  } RewriteInfo;
-
-  /// Structure to store all constant strings
-  typedef struct {
-    string conv2d;
-    string conv2dwithbias;
-    string conv2dwithbiasbackpropbias;
-    string biasadd;
-    string matmul;
-    string biasaddgrad;
-  } ConstStringInfo;
-
-  ConstStringInfo csinfo_;
-  std::vector<MergeInfo> minfo_;
-  std::vector<RewriteInfo> rinfo_;
-
- private:
-  // Return a node that can be merged with input node
-  //
-  // @return pointer to the node if we can find such a
-  // node. Otherwise, it returns nullptr.
-  Node* FindNodeForMerge(const Node* a) const;
-
-  // Merge predecessor node with its successor.
-  // Currently, we merge Conv2D with AddBias only.
-  //
-  // Input nodes succ and pred may be deleted if the call to
-  // this function is successful. Attempt to use the pointers
-  // after the call to function may result is undefined behaviors.
-  //
-  // @input g - input graph, succ - successor node, pred - predecessor node
-  // @return Status::OK(), if merging is successful and supported.
-  //         Returns appropriate Status error code otherwise.
-  //         Graph is updated in case nodes are merged. Otherwise, it is
-  //         not updated.
-  Status MergeNode(std::unique_ptr<Graph>* g, Node* succ, Node* pred);
-
-  // Is input node (n) a candidate for rewrite?
-  //
-  // @return true, if it can be rewritten; false, otherwise.
-  bool IsApplicableRewriteNode(const Node* n) const;
-
-  // Rewrites input node to a new node specified by its matching rewrite info.
-  //
-  // Method first searches matching rewrite info for input node and then
-  // uses that info to rewrite.
-  //
-  // Input node may be deleted in case of rewrite. Attempt to use the node
-  // after the call can result in undefined behaviors.
-  //
-  // @input  g - input graph, n - Node to be rewritten
-  // @return Status::OK(), if the input node is rewritten;
-  //         Returns appropriate Status error code otherwise.
-  //         Graph is updated in case the input node is rewritten.
-  //         Otherwise, it is not updated.
-  Status RewriteNode(std::unique_ptr<Graph>* g, Node* n);
-
-  // Helper function that searches the matching rewriteinfo for the node.
-  // Implements depth-first search in the data dependence graph for the
-  // gradient op in backward direction.
-  //
-  // @input n - Node (gradient op) whose rewriteinfo is to be searched,
-  //        fwdn - pointer to node from the forward pass that this node
-  //        belongs to
-  // @return Matching rewriteinfo in case a match is found; null otherwise.
-  const RewriteInfo* FindMatchingRewriteInfo(const Node* n,
-                                             const Node** fwdn) const;
-
-  // Generate a graph node in graph 'g' representing a dummy Mkl tensor node,
-  // and return it in '*out'.
-  // TODO(nhasabni) We should move this to mkl_util.h
-  void GetDummyMklTensorNode(std::unique_ptr<Graph>* g, Node** out);
-};
-
-// We register merge optimizer for phase 2 in pre-placement group.
-// Do not change the ordering of the Mkl passes.
-REGISTER_OPTIMIZATION(OptimizationPassRegistry::PRE_PLACEMENT, 2,
-                      NodeMergeRewritePass);
-
-static void FillInputs(const Node* n,
-                       gtl::InlinedVector<Node*, 4>* control_edges,
-                       gtl::InlinedVector<std::pair<Node*, int>, 4>* in) {
-  DCHECK_EQ(in->size(), n->num_inputs());
-  control_edges->clear();
-  for (const Edge* e : n->in_edges()) {
-    if (e->IsControlEdge()) {
-      control_edges->push_back(e->src());
-    } else {
-      (*in)[e->dst_input()] = std::make_pair(e->src(), e->src_output());
-    }
-  }
-  std::sort(control_edges->begin(), control_edges->end());
-  if (n->op_def().is_commutative()) {
-    // For commutative inputs, we sort the input by the input Node*
-    // to get a canonical ordering (so that add(a,b) and add(b, a) will
-    // hash to the same value if is_commutative is true for 'add').
-    std::sort(in->begin(), in->end());
-  }
-}
-
-Node* NodeMergeRewritePass::FindNodeForMerge(const Node* a) const {
-  // Search for all matching mergeinfo.
-  // We allow more than one match for extensibility.
-  std::vector<const MergeInfo*> matching_mi;
-  for (auto mi = minfo_.cbegin(); mi != minfo_.cend(); ++mi) {
-    if (a->type_string() == mi->succ) {
-      matching_mi.push_back(&*mi);
-    }
-  }
-
-  for (const MergeInfo* mi : matching_mi) {
-    const int N_in = a->num_inputs();
-    if (mi->op >= N_in) {
-      continue;
-    }
-
-    // Get the control edges and input of node
-    gtl::InlinedVector<Node*, 4> a_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> a_in(N_in);
-    FillInputs(a, &a_control_edges, &a_in);
-
-    // Get operand op of the operator
-    Node* b = nullptr;
-    b = a_in[mi->op].first;
-    if (b == nullptr || (b->type_string() != mi->pred)) {
-      // NOTE: Should the first check be assert?
-      continue;
-    }
-
-    gtl::InlinedVector<Node*, 4> b_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> b_in(N_in);
-    FillInputs(b, &b_control_edges, &b_in);
-
-    // Shouldn't merge if a and b have different control edges.
-    if (a_control_edges != b_control_edges) {
-      continue;
-    } else {
-      // We found a match.
-      return b;
-    }
-  }
-
-  return nullptr;
-}
-
-void NodeMergeRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
-                                                 Node** out) {
-  const DataType dt = DataTypeToEnum<uint8>::v();
-  TensorProto proto;
-  proto.set_dtype(dt);
-  uint8 zero[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-  proto.set_tensor_content(const_cast<const void*>(static_cast<void*>(&zero)),
-                           8);
-  TensorShape dummy_shape({8});
-  dummy_shape.AsProto(proto.mutable_tensor_shape());
-  TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                  .Attr("value", proto)
-                  .Attr("dtype", dt)
-                  .Finalize(&**g, out));
-}
-
-Status NodeMergeRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
-                                       Node* pred) {
-  CHECK_NOTNULL(succ);
-  CHECK_NOTNULL(pred);
-
-  if (succ->type_string() == csinfo_.biasadd &&
-      pred->type_string() == csinfo_.conv2d) {
-    // 1. Get all attributes from input nodes.
-    DataType T_pred, T_succ;
-    string padding;
-    std::vector<int32> strides;
-    string data_format_pred, data_format_succ;
-    bool use_cudnn_on_gnu;
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "T", &T_pred));
-    TF_CHECK_OK(GetNodeAttr(succ->def(), "T", &T_succ));
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "padding", &padding));
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "strides", &strides));
-    TF_CHECK_OK(GetNodeAttr(pred->def(), "data_format", &data_format_pred));
-    TF_CHECK_OK(GetNodeAttr(succ->def(), "data_format", &data_format_succ));
-    TF_CHECK_OK(
-        GetNodeAttr(pred->def(), "use_cudnn_on_gpu", &use_cudnn_on_gnu));
-    // We check to ensure that data formats of both succ and pred are same.
-    // We expect them to be same, so we can enforce this as assert.
-    // But assert can be too strict, so we enforce this as a check.
-    // If the check fails, then we do not merge two nodes.
-    // We also do same check for devices.
-    if (data_format_pred != data_format_succ || T_pred != T_succ ||
-        pred->assigned_device_name() != succ->assigned_device_name() ||
-        pred->def().device() != succ->def().device()) {
-      return Status(error::Code::INVALID_ARGUMENT,
-                    "data_format or T attribute or devices of Conv2D and "
-                    "BiasAdd do not match. Will skip node merge optimization");
-    }
-
-    // 2. Get inputs from both the nodes.
-    // Find the 2 inputs from the conv and the bias from the add Bias.
-    Node* oper1 = nullptr;
-    Node* oper1_mkl = nullptr;  // Mkl tensor corresponding to oper1
-    Node* oper2 = nullptr;
-    Node* oper2_mkl = nullptr;  // Mkl tensor corresponding to oper2
-    Node* oper3 = nullptr;
-    Node* oper3_mkl = nullptr;  // Mkl tensor corresponding to oper3
-
-    const int succ_num = succ->num_inputs();
-    gtl::InlinedVector<Node*, 4> succ_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> succ_in(succ_num);
-    FillInputs(succ, &succ_control_edges, &succ_in);
-
-    const int pred_num = pred->num_inputs();
-    gtl::InlinedVector<Node*, 4> pred_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> pred_in(pred_num);
-    FillInputs(pred, &pred_control_edges, &pred_in);
-
-    // We need to ensure that there is only 1 edge between Conv2D and AddBias.
-    // Otherwise, merging is semantically incorrect.
-    if (pred->out_edges().size() != 1) {
-      return Status(error::Code::INVALID_ARGUMENT,
-                    "Conv2D has multiple outputs."
-                    "Will skip node merge optimization");
-    }
-
-    for (const Edge* e : pred->out_edges()) {
-      if (e->dst() != succ) {
-        return Status(error::Code::INVALID_ARGUMENT,
-                      "Conv2D does not feed to BiasAdd."
-                      "Will skip node merge optimization");
-      }
-    }
-
-    // Get operand 0, 1 of conv2D and their Mkl tensors.
-    CHECK_EQ(pred->in_edges().size(), 4);  // MklConv2D must have 4 inputs.
-    oper1 = pred_in[0].first;
-    oper1_mkl = pred_in[1].first;
-    oper2 = pred_in[2].first;
-    oper2_mkl = pred_in[3].first;
-    // Get operand 1 of add_bias
-    // BiasAdd must have 2 inputs: Conv, bias
-    CHECK_EQ(succ->in_edges().size(), 2);
-    oper3 = succ_in[1].first;
-    GetDummyMklTensorNode(g, &oper3_mkl);  // Get dummy Mkl tensor node
-    // as BiasAdd does not have Mkl tensor as input.
-    CHECK_NOTNULL(oper3_mkl);
-
-    Node* ret;
-    // We will use the node name of BiasAdd as the name of new node
-    TF_CHECK_OK(NodeBuilder(succ->name(), csinfo_.conv2dwithbias)
-                    .Input(oper1)
-                    .Input(oper1_mkl)
-                    .Input(oper2)
-                    .Input(oper2_mkl)
-                    .Input(oper3)
-                    .Input(oper3_mkl)
-                    .Attr("T", T_pred)
-                    .Attr("strides", strides)
-                    .Attr("padding", padding)
-                    .Attr("data_format", data_format_pred)
-                    .Attr("use_cudnn_on_gpu", use_cudnn_on_gnu)
-                    .Device(succ->def().device())
-                    .Finalize(&**g, &ret));
-    CHECK_NOTNULL(ret);
-
-    // Incoming edges are fixed, we will fix the outgoing edges now.
-    for (const Edge* e : succ->out_edges()) {
-      (*g)->AddEdge(ret, e->src_output(), e->dst(), e->dst_input());
-    }
-
-    // Copy device assigned to old node to new node.
-    // It's ok to use pred or succ as we have enforced a check that
-    // both have same device assigned.
-    ret->set_assigned_device_name(pred->assigned_device_name());
-
-    VLOG(1) << "NodeMergeRewritePass: Merged old node:" << pred->DebugString()
-            << ", and node: " << succ->DebugString()
-            << ", into node:" << ret->DebugString();
-
-    (*g)->RemoveNode(succ);
-    (*g)->RemoveNode(pred);
-
-    return Status::OK();
-  }
-
-  return Status(error::Code::UNIMPLEMENTED,
-                "Unimplemented case for node merge optimization.");
-}
-
-Status NodeMergeRewritePass::RewriteNode(std::unique_ptr<Graph>* g, Node* n) {
-  CHECK_NOTNULL(n);
-
-  // Get the matching rewriteinfo for the node
-  const Node* fwdn = nullptr;
-  const RewriteInfo* ri = FindMatchingRewriteInfo(n, &fwdn);
-  if (ri == nullptr || fwdn == nullptr) {
-    VLOG(2) << "NodeMergeRewritePass: Rewriteinfo not found for: "
-            << n->type_string();
-    return Status(error::Code::INVALID_ARGUMENT,
-                  "Rewrite info not found for the node."
-                  "Will skip node rewrite optimization");
-  }
-
-  VLOG(1) << "NodeMergeRewritePass: Rewrite called for: " << n->type_string();
-
-  if (n->type_string() == csinfo_.biasaddgrad &&
-      ri->node == csinfo_.biasaddgrad &&
-      (ri->rewrite == csinfo_.conv2dwithbiasbackpropbias ||
-       ri->rewrite == csinfo_.biasaddgrad)) {
-    DataType T;
-    string data_format;
-    TF_CHECK_OK(GetNodeAttr(n->def(), "T", &T));
-    TF_CHECK_OK(GetNodeAttr(n->def(), "data_format", &data_format));
-
-    int n_num = n->num_inputs();  // this must be 1.
-    CHECK_EQ(n_num, 1);
-
-    gtl::InlinedVector<Node*, 4> n_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> n_in(n_num);
-    FillInputs(n, &n_control_edges, &n_in);
-
-    Node *ret = nullptr, *op = n_in[0].first;
-
-    if (ri->rewrite == csinfo_.conv2dwithbiasbackpropbias) {
-      // Get strides info from Conv2D (node in the forward pass that this
-      // node corresponds to).
-      std::vector<int32> strides;
-      TF_CHECK_OK(GetNodeAttr(fwdn->def(), "strides", &strides));
-
-      // We use same name as original node name as there may be fetchoutputs
-      // associated with it.
-      TF_CHECK_OK(NodeBuilder(n->name(), ri->rewrite)
-                      .Input(op)
-                      .Attr("T", T)
-                      .Attr("data_format", data_format)
-                      .Attr("strides", strides)
-                      .Device(n->def().device())
-                      .Finalize(&**g, &ret));
-    } else {
-      CHECK_EQ(ri->rewrite, csinfo_.biasaddgrad);
-      TF_CHECK_OK(NodeBuilder(n->name(), ri->rewrite)
-                      .Input(op)
-                      .Attr("T", T)
-                      .Attr("data_format", data_format)
-                      .Device(n->def().device())
-                      .Finalize(&**g, &ret));
-    }
-
-    CHECK_NOTNULL(ret);
-
-    // Incoming edges are fixed, we will fix the outgoing edges now.
-    for (const Edge* e : n->out_edges()) {
-      (*g)->AddEdge(ret, e->src_output(), e->dst(), e->dst_input());
-    }
-
-    // Copy device assigned to old node to new node.
-    ret->set_assigned_device_name(n->assigned_device_name());
-
-    VLOG(1) << "MKLOptimizerMergePass: Rewrote old node:" << n->DebugString()
-            << ", into node:" << ret->DebugString();
-    (*g)->RemoveNode(n);
-
-    return Status::OK();
-  }
-
-  return Status(error::Code::UNIMPLEMENTED,
-                "Unimplemented case for node rewrite optimization.");
-}
-
-const NodeMergeRewritePass::RewriteInfo*
-NodeMergeRewritePass::FindMatchingRewriteInfo(const Node* n,
-                                              const Node** fwdn) const {
-  CHECK_NOTNULL(n);
-  CHECK_NOTNULL(fwdn);
-  *fwdn = nullptr;
-
-  // Search for matching rewriteinfo based on node name.
-  // There could be more than one matching rewriteinfos.
-  std::vector<const RewriteInfo*> matching_ri;
-  for (auto ri = rinfo_.cbegin(); ri != rinfo_.cend(); ++ri) {
-    if (n->type_string() == ri->node) {
-      matching_ri.push_back(&*ri);
-    }
-  }
-
-  VLOG(1) << "NodeMergeRewritePass: Searching graph for: " << n->type_string()
-          << " in backwards.";
-
-  // Now we will check for forward op name for rewrite info in data
-  // flow graph. Get the max hops we should search for the fwd node
-  // We are now going to search (breadth-first) backwards in data
-  // dependence graph (for up to max hops) from n for the node
-  // specified in fwd.
-  // queue to maintain nodes to be visited and depth info for
-  // breadth-first search
-  std::queue<std::pair<const Node*, int>> nqueue;
-  const Node* curr_node = n;
-  size_t curr_depth = 0;
-  nqueue.push(std::make_pair(curr_node, curr_depth));
-
-  while (curr_depth < kNodeMergeContextMaxDepth && !nqueue.empty()) {
-    std::pair<const Node*, int> curr_pair = nqueue.front();
-    nqueue.pop();
-
-    std::set<const Node*> visited_nodes;
-    curr_node = curr_pair.first;
-    curr_depth = curr_pair.second;
-    CHECK_NOTNULL(curr_node);
-
-    VLOG(1) << "NodeMergeRewritePass: Visiting node: "
-            << curr_node->type_string() << " at depth: " << curr_depth
-            << " for node: " << n->type_string();
-
-    // If we find a match, we return immediately with the matching rewrite
-    // info.
-    for (const RewriteInfo* ri : matching_ri) {
-      if (curr_node->type_string() == ri->cinfo.fwd) {
-        *fwdn = curr_node;
-        return ri;
-      }
-    }
-
-    // Else we explore backward edges from current node.
-    // Add the source nodes of all incoming edges of the node to the queue.
-    for (const Edge* e : curr_node->in_edges()) {
-      // We do not visit already visited node.
-      if (visited_nodes.find(e->src()) == visited_nodes.end()) {
-        // Depth of these nodes is 1 more than the depth of current node.
-        nqueue.push(std::make_pair(e->src(), curr_depth + 1));
-        visited_nodes.insert(e->src());
-      }
-    }
-  } /* while */
-
-  return nullptr;
-}
-
-bool NodeMergeRewritePass::IsApplicableRewriteNode(const Node* n) const {
-  CHECK_NOTNULL(n);
-
-  // Search for matching rewriteinfo
-  // Even if we find one match, we return true.
-  bool match_found = false;
-  for (const RewriteInfo& ri : rinfo_) {
-    if (n->type_string() == ri.node) {
-      match_found = true;
-      break;
-    }
-  }
-
-  return match_found;
-}
-
-bool NodeMergeRewritePass::RunPass(std::unique_ptr<Graph>* g) {
-  bool result = false;
-  CHECK_NOTNULL(g);
-
-  DumpGraph("Before OptimizeMerge", &**g);
-
-  std::vector<Node*> order;
-  GetReversePostOrder(**g, &order);
-  std::vector<std::pair<Node*, Node*>> nodes_to_be_merged;
-  std::vector<Node*> nodes_to_be_rewritten;
-
-  for (Node* n : order) {
-    if (!n->IsOp()) continue;
-    Node* n1 = nullptr;
-    if ((n1 = FindNodeForMerge(n)) != nullptr) {
-      VLOG(1) << "NodeMergeRewritePass: Scheduled nodes " << n->name()
-              << " and " << n1->name() << " for merging";
-      nodes_to_be_merged.push_back(std::make_pair(n, n1));
-    } else if (IsApplicableRewriteNode(n)) {
-      VLOG(1) << "NodeMergeRewritePass: Scheduled node " << n->name()
-              << " for rewrite";
-      nodes_to_be_rewritten.push_back(n);
-    }
-  }
-
-  for (std::pair<Node*, Node*> i : nodes_to_be_merged) {
-    // Even if MergeNode merges single pair of nodes, we
-    // need to return true.
-    string n1_name = i.first->name();
-    string n2_name = i.second->name();
-    if (MergeNode(g, i.first, i.second) == Status::OK()) {
-      VLOG(1) << "NodeMergeRewritePass: Merged nodes " << n1_name << " and "
-              << n2_name;
-      result = true;
-    }
-  }
-
-  DumpGraph("After OptimizeMerge(nodemerge)", &**g);
-
-  for (Node* i : nodes_to_be_rewritten) {
-    string name = i->name();
-    if (RewriteNode(g, i) == Status::OK()) {
-      VLOG(1) << "NodeMergeRewritePass: Rewrite node: " << name
-              << " successful.";
-      result = true;
-    }
-  }
-
-  DumpGraph("After OptimizeMerge(noderewrite)", &**g);
-
-  return result;
-}
-
-bool OptimizeNodeMerge(std::unique_ptr<Graph>* g) {
-  return NodeMergeRewritePass().RunPass(g);
-}
-
-Status NodeMergeRewritePass::Run(const GraphOptimizationPassOptions& options) {
-  if (options.graph == nullptr) {
-    return Status::OK();
-  }
-
-  // Get the ownership of graph
-  std::unique_ptr<Graph>* g = std::move(options.graph);
-
-  RunPass(g);
-
-  // Return the ownership of graph back
-  options.graph->reset(g->release());
-
-  return Status::OK();
-}
-
-}  // namespace tensorflow
-
-#endif
diff --git a/tensorflow/core/graph/mkl_optimizer_merge.h b/tensorflow/core/graph/mkl_optimizer_merge.h
deleted file mode 100644
index b2caec58af..0000000000
--- a/tensorflow/core/graph/mkl_optimizer_merge.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// An optimization pass that performs node merging and rewrite on graph nodes
-
-#ifndef TENSORFLOW_GRAPH_MKL_OPTIMIZER_MERGE_H_
-#define TENSORFLOW_GRAPH_MKL_OPTIMIZER_MERGE_H_
-
-#ifdef INTEL_MKL
-
-#include <sys/types.h>
-#include <memory>
-#include "tensorflow/core/graph/graph.h"
-
-namespace tensorflow {
-// Interface to invoke the pass for unit test
-//
-// Returns true if and only if 'g' is mutated.
-extern bool OptimizeNodeMerge(std::unique_ptr<Graph>* g);
-}  // namespace tensorflow
-
-#endif  // INTEL_MKL
-
-#endif  // TENSORFLOW_GRAPH_MKL_OPTIMIZER_MERGE_H_
diff --git a/tensorflow/core/graph/mkl_optimizer_merge_test.cc b/tensorflow/core/graph/mkl_optimizer_merge_test.cc
deleted file mode 100644
index f752721d6e..0000000000
--- a/tensorflow/core/graph/mkl_optimizer_merge_test.cc
+++ /dev/null
@@ -1,470 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifdef INTEL_MKL
-
-#include "tensorflow/core/graph/mkl_optimizer_merge.h"
-
-#include <vector>
-#include "tensorflow/core/framework/op.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/graph/graph.h"
-#include "tensorflow/core/graph/graph_constructor.h"
-#include "tensorflow/core/graph/testlib.h"
-#include "tensorflow/core/kernels/ops_util.h"
-#include "tensorflow/core/lib/random/simple_philox.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-#include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/protobuf.h"
-#include "tensorflow/core/platform/test.h"
-#include "tensorflow/core/platform/test_benchmark.h"
-
-namespace tensorflow {
-namespace {
-
-class OptimizerMergeTest : public ::testing::Test {
- public:
-  OptimizerMergeTest() : graph_(OpRegistry::Global()) {}
-
-  static void InitGraph(const string& s, Graph* graph) {
-    GraphDef graph_def;
-
-    auto parser = protobuf::TextFormat::Parser();
-    CHECK(parser.MergeFromString(s, &graph_def)) << s;
-    GraphConstructorOptions opts;
-    TF_CHECK_OK(ConvertGraphDefToGraph(opts, graph_def, graph));
-  }
-
-  void InitGraph(const string& s) {
-    InitGraph(s, &graph_);
-    original_ = CanonicalGraphString(&graph_);
-  }
-
-  static bool IncludeNode(const Node* n) { return n->IsOp(); }
-
-  static string EdgeId(const Node* n, int index) {
-    if (index == 0) {
-      return n->name();
-    } else if (index == Graph::kControlSlot) {
-      return strings::StrCat(n->name(), ":control");
-    } else {
-      return strings::StrCat(n->name(), ":", index);
-    }
-  }
-
-  string CanonicalGraphString(Graph* g) {
-    std::vector<string> nodes;
-    std::vector<string> edges;
-    for (const Node* n : g->nodes()) {
-      if (IncludeNode(n)) {
-        nodes.push_back(strings::StrCat(n->name(), "(", n->type_string(), ")"));
-      }
-    }
-    for (const Edge* e : g->edges()) {
-      if (IncludeNode(e->src()) && IncludeNode(e->dst())) {
-        edges.push_back(strings::StrCat(EdgeId(e->src(), e->src_output()), "->",
-                                        EdgeId(e->dst(), e->dst_input())));
-      }
-    }
-    // Canonicalize
-    std::sort(nodes.begin(), nodes.end());
-    std::sort(edges.begin(), edges.end());
-    return strings::StrCat(str_util::Join(nodes, ";"), "|",
-                           str_util::Join(edges, ";"));
-  }
-
-  string DoNodeMerge() {
-    string before = CanonicalGraphString(&graph_);
-    LOG(ERROR) << "Before node merge optimize: " << before;
-
-    std::unique_ptr<Graph>* ug = new std::unique_ptr<Graph>(&graph_);
-    OptimizeNodeMerge(ug);
-
-    string result = CanonicalGraphString(&graph_);
-    LOG(ERROR) << "After node merge optimize:  " << result;
-    return result;
-  }
-
-  const string& OriginalGraph() const { return original_; }
-
-  Graph graph_;
-  string original_;
-};
-
-REGISTER_OP("Input").Output("o: float").SetIsStateful();
-REGISTER_OP("MklInput").Output("o: uint8").SetIsStateful();
-
-TEST_F(OptimizerMergeTest, Basic) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
-      " input: ['A', 'B'] }"
-      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
-      " input: ['A', 'B'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Mul);D(Mul)|"
-            "A->C;A->D;B->C:1;B->D:1");
-}
-
-// Test set 1: Conv2D + AddBias
-
-// C=MklConv2D(A,M,B,N); E=BiasAdd(C,D); Z=Sub(E,Y)
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Positive) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['C', 'D'] }"
-      "node { name: 'Y' op: 'Input'}"
-      "node { name: 'Z' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['E', 'Y']}");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);D(Input);DMT/_0(Const);E(MklConv2DWithBias);"
-            "M(MklInput);N(MklInput);Y(Input);Z(Sub)|A->E;B->E:2;D->E:4;"
-            "DMT/_0->E:5;E->Z;M->E:1;N->E:3;Y->Z:1");
-}
-
-// C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
-// We do not merge in this case as op is Conv2D and not MklConv2D.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_NoMklConv2D) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Conv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['C', 'D'] }"
-      "node { name: 'Y' op: 'Input'}"
-      "node { name: 'Z' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['E', 'Y']}");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Conv2D);D(Input);E(BiasAdd);Y(Input);Z(Sub)|"
-            "A->C;B->C:1;C->E;D->E:1;E->Z;Y->Z:1");
-}
-
-// Graph contains only MklConv2D, no AddBias.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_NoAddBias) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);M(MklInput);N(MklInput)|"
-            "A->C;B->C:2;M->C:1;N->C:3");
-}
-
-// MklConv2D output does not go to BiasAdd.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_Dataflow1) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'Input'}"
-      "node { name: 'F' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D', 'E'] }");  // Output of MklConv2D does not go to BiasAdd.
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "M(MklInput);N(MklInput)|A->C;B->C:2;D->F;E->F:1;M->C:1;N->C:3");
-}
-
-// MklConv2D has two outgoing edges: BiasAdd and some other dummy node (Add).
-// Merge should not be done in such case.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_Dataflow2) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'Input'}"
-      "node { name: 'F' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D', 'E'] }"  // Conv2D has two outputs.
-                              // No merge should happen.
-      "node { name: 'G' op: 'Add'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " input: ['C', 'E'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(Input);F(BiasAdd);"
-            "G(Add);M(MklInput);N(MklInput)|A->C;B->C:2;C->G;D->F;"
-            "E->F:1;E->G:1;M->C:1;N->C:3");
-}
-
-// data_format attribute value mismatch. Merge should not be done
-// in such case.
-TEST_F(OptimizerMergeTest, Conv2DWithBias_Negative_AttrMismatch) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'BiasAdd'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NHCW' } }"
-      " input: ['C', 'D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(BiasAdd);M(MklInput);"
-            "N(MklInput)|A->C;B->C:2;C->E;D->E:1;M->C:1;N->C:3");
-}
-
-#if 0
-// This test set is disabled temporarily as we do not enable node rewrite.
-// This test set will be enabled when we support Mkl-specific kernels for
-// backward bias.
-//
-// Test set 2: MklConv2D..BiasAddGrad -> Conv2DWithBiasBackpropBias
-// rewrite tests
-
-// C=MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Positive) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MklConv2D);D(Sub);E(Conv2DWithBiasBackpropBias);"
-            "M(MklInput);N(MklInput)|A->C;A->D:1;B->C:2;C->D;D->E;M->C:1;N->C:3");
-}
-
-// No MklConv2D in context, but Conv2D in context. No rewrite should happen.
-// C=Conv2D(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Negative_NoMklConv2D) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Conv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Conv2D);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// No Conv2D in the context for BiasAddGrad. No rewrite should happen.
-// C=Add(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Negative_NoConv2D) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Add'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// No Conv2D in the context for BiasAddGrad, but MatMul in context.
-// Rewrite should happen, but name of BiasAddGrad does not change.
-// C=MatMul(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, Conv2DBackprop_Negative_NoConv2D_MatMul) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'MatMul'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'transpose_a'      value { b: false } }"
-      " attr { key: 'transpose_b'      value { b: false } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// Test set 3: MatMul..BiasAddGrad -> BiasAddGrad rewrite tests
-// C=MatMul(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, MatMulBiasAddGrad_Positive) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'MatMul'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'transpose_a'      value { b: false } }"
-      " attr { key: 'transpose_b'      value { b: false } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(MatMul);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-
-// No MatMul in the context for BiasAddGrad. No rewrite should happen.
-// C=Add(A,B); D=Sub(C,A); E=BiasAddGrad(D)
-TEST_F(OptimizerMergeTest, MatMulBiasAddGrad_Negative_NoMatMul) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'C' op: 'Add'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " input: ['A', 'B']}"
-      "node { name: 'D' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'A']}"
-      "node { name: 'E' op: 'BiasAddGrad'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['D'] }");
-  EXPECT_EQ(DoNodeMerge(),
-            "A(Input);B(Input);C(Add);D(Sub);E(BiasAddGrad)|"
-             "A->C;A->D:1;B->C:1;C->D;D->E");
-}
-#endif
-
-static void BM_NodeMerge(int iters, int op_nodes) {
-  testing::StopTiming();
-  string s;
-  for (int in = 0; in < 10; in++) {
-    s += strings::Printf("node { name: 'in%04d' op: 'Input'}", in);
-  }
-  random::PhiloxRandom philox(301, 17);
-  random::SimplePhilox rnd(&philox);
-  for (int op = 0; op < op_nodes; op++) {
-    s += strings::Printf(
-        "node { name: 'op%04d' op: 'Mul' attr { key: 'T' value { "
-        "type: DT_FLOAT } } input: ['in%04d', 'in%04d' ] }",
-        op, rnd.Uniform(10), rnd.Uniform(10));
-  }
-
-  bool first = true;
-  while (iters > 0) {
-    Graph* graph = new Graph(OpRegistry::Global());
-    OptimizerMergeTest::InitGraph(s, graph);
-    int N = graph->num_node_ids();
-    if (first) {
-      testing::SetLabel(strings::StrCat("Per graph node.  Nodes: ", N));
-      first = false;
-    }
-    {
-      testing::StartTiming();
-      std::unique_ptr<Graph> ug(graph);
-      OptimizeNodeMerge(&ug);
-      testing::StopTiming();
-    }
-    iters -= N;  // Our benchmark units are individual graph nodes,
-                 // not whole graphs
-    // delete graph;
-  }
-}
-BENCHMARK(BM_NodeMerge)->Arg(1000)->Arg(10000);
-
-}  // namespace
-}  // namespace tensorflow
-
-#endif /* INTEL_MKL */
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 7c3836b308..55c280719c 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -40,16 +40,16 @@ namespace tensorflow {
 
 // This pass inserts Mkl to Tf tensor conversion nodes (represented by C)
 // in the graph in between A and B, where A and B match any one
-// of the following
-// cases:
-//  1) A = layer/Op that generates output in Mkl format and,
-//     B = layer/Op that does not accept input in Mkl format and,
+// of the following cases:
+//
+//  1) A = a node that generates output in the Mkl format and,
+//     B = a node that does not accept input in the Mkl format and,
 //     A -> B (there is a direct edge between A and B, then
 //     We will insert C such that A->C->B.
 //
-//  2) A = layer/Op that generates output in Mkl format and,
-//     B = NULL (in other words, A is the last layer in the graph), then
-//     We will insert C such that A->C->B. (C will be the last layer.)
+//  2) A = a node that generates output in the Mkl format and,
+//     B = NULL (in other words, A is the last node in the graph), then
+//     We will insert C such that A->C->B. (C will be the last node.)
 //
 //  Note that case 1 applies to all outputs of A that are input to B.
 //  In other words, the conversions will be required for every output
@@ -59,9 +59,9 @@ namespace tensorflow {
 //  do the conversion for A1 and A2 only. We do not need to do any conversion
 //  for A3.
 //
-// This pass relies on layers registering themselves about their Mkl compliant.
-// Mkl compliant layer can accept inputs in Mkl format, and produce output in
-// Mkl format. Non-compliant layer accepts inputs and outputs in
+// This pass relies on ops registering themselves about their Mkl compliance.
+// An Mkl-compliant op can accept inputs in the Mkl format, and produce outputs
+// in the Mkl format. Non-compliant ops accept inputs and outputs in the
 // TensorFlow format.
 //
 class MklToTfConversionPass : public GraphOptimizationPass {
@@ -84,7 +84,7 @@ class MklToTfConversionPass : public GraphOptimizationPass {
   // @input T Datatype to use for checking input op
   // @return true if op is Mkl supported; false, otherwise.
   inline bool IsMklSupportedOp(const string& op_name, DataType T) const {
-    return mkl_layer_registry::IsMklLayer(op_name, T);
+    return mkl_op_registry::IsMklOp(op_name, T);
   }
 
   // Insert layout conversion node on the edge pointed by 'e' from graph 'g'.
@@ -129,14 +129,16 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
     return Status(error::Code::INVALID_ARGUMENT, err_msg.c_str());
   }
 
-  // Lets build the conversion node and specify src as input.
+  // Build the conversion node and specify src as input.
   TF_CHECK_OK(
-      NodeBuilder((*g)->NewName("Mkl2Tf"), "MklToTf")
+      NodeBuilder((*g)->NewName("Mkl2Tf"), "_MklToTf")
           .Input(src, e->src_output())
-          .Input(src, e->src_output() + 1)  // Mkl tensor immediately
-                                            // follows Tf tensor.
-          .Device(src->def().device())      // We want to get conversion node
-                                            // on same device as source node.
+          .Input(src, DataIndexToMetaDataIndex(
+                          e->src_output(),
+                          src->num_outputs()))  // Get an Mkl tensor slot
+                                                // from the Tf tensor slot.
+          .Device(src->def().device())  // We want to get conversion node
+                                        // on same device as source node.
           .Attr("T", src_datatype)
           .Finalize(&**g, &conversion_node));
 
@@ -149,8 +151,8 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
   // We want conversion node to be on the same device as the source node.
   conversion_node->set_assigned_device_name(src->assigned_device_name());
 
-  // Set the Mkl layer label for this op.
-  conversion_node->AddAttr("_kernel", mkl_layer_registry::kMklLayerLabel);
+  // Set the Mkl op label for this op.
+  conversion_node->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
   // Now that we have added edge from src->conversion_node, let's add edge from
   // output of conversion_node to the dest node. Since conversion_node
@@ -173,11 +175,11 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
 
   DumpGraph("Before MklToTfConversionPass", &**g);
 
-  // Since we are looking for mkl-supported op node immediately
-  // followed by non-mkl op node, we will just iterate over edge
+  // Since we are looking for an Mkl-supported op node immediately
+  // followed by a non-Mkl op node, we will just iterate over edge
   // set of the graph.
-  // vector to maintain candiadate edges whose source and destination
-  // are candidate for inserting conversion node
+  // edge set whose source and destination are candidates for
+  // inserting conversion node
   std::vector<Edge*> candidate_edges;
 
   for (const Edge* e : (*g)->edges()) {
@@ -190,9 +192,9 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
     }
 
     // We skip adding MklToTf on an edge between X->MklToTf or
-    // MklToTf->X, where X is any layer.
-    if (src->type_string().compare("MklToTf") == 0 ||
-        dst->type_string().compare("MklToTf") == 0) {
+    // MklToTf->X, where X is any node.
+    if (src->type_string().compare("_MklToTf") == 0 ||
+        dst->type_string().compare("_MklToTf") == 0) {
       continue;
     }
 
@@ -210,7 +212,6 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
     GetNodeAttr(dst->def(), "T", &dst_datatype);
 
     // Check if src with is Mkl-compliant, while dst is not Mkl-compliant.
-
     if (IsMklSupportedOp(src->type_string(), src_datatype) &&
         !IsMklSupportedOp(dst->type_string(), dst_datatype)) {
       VLOG(1) << "MklToTfConversionPass: Scheduled nodes " << src->name()
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
index 7d9237f845..bd2cb0989c 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #ifdef INTEL_MKL
 
 #include "tensorflow/core/graph/mkl_tfconversion_pass.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 #include <algorithm>
 #include <string>
@@ -109,7 +110,7 @@ class MklToTfConversionPass : public ::testing::Test {
 
 REGISTER_OP("Input").Output("o: float").SetIsStateful();
 REGISTER_OP("HalfInput").Output("o: half").SetIsStateful();
-REGISTER_OP("MklInput").Output("o: uint8").SetIsStateful();
+REGISTER_OP("_MklInput").Output("o: uint8").SetIsStateful();
 
 TEST_F(MklToTfConversionPass, Basic) {
   InitGraph(
@@ -125,58 +126,116 @@ TEST_F(MklToTfConversionPass, Basic) {
 }
 
 // MklConv2D followed by Non-Mkl layer
-// C=MklConv2D(A,M,B,N); E=Sub(C,D)
+// C=MklConv2D(A,M,B,N); E=Sub(C,D) (for interleaved ordering)
+// C=MklConv2D(A,B,M,N); E=Sub(C,D) (for contiguous ordering)
 TEST_F(MklToTfConversionPass, Positive) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'Input'}"
-      "node { name: 'E' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['C', 'D']}");
-  EXPECT_EQ(DoRunMklToTfConversionPass(),
-            "A(Input);B(Input);C(MklConv2D);D(Input);E(Sub);M(MklInput);"
-            "Mkl2Tf/_0(MklToTf);N(MklInput)|A->C;B->C:2;C->Mkl2Tf/_0;"
-            "C:1->Mkl2Tf/_0:1;D->E:1;M->C:1;Mkl2Tf/_0->E;N->C:3");
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    InitGraph(
+        "node { name: 'A' op: 'Input'}"
+        "node { name: 'M' op: '_MklInput'}"
+        "node { name: 'B' op: 'Input'}"
+        "node { name: 'N' op: '_MklInput'}"
+        "node { name: 'C' op: '_MklConv2D'"
+        " attr { key: 'T'                value { type: DT_FLOAT } }"
+        " attr { key: 'data_format'      value { s: 'NCHW' } }"
+        " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+        " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } "
+        "}"
+        " attr { key: 'padding'          value { s: 'SAME' } }"
+        " input: ['A', 'M', 'B', 'N']}"
+        "node { name: 'D' op: 'Input'}"
+        "node { name: 'E' op: 'Sub'"
+        " attr {key: 'T'                 value { type: DT_FLOAT } }"
+        " input: ['C', 'D']}");
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
+              "A(Input);B(Input);C(_MklConv2D);D(Input);E(Sub);M(_MklInput);"
+              "_Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:2;C->Mkl2Tf/_0;"
+              "C:1->Mkl2Tf/_0:1;D->E:1;M->C:1;Mkl2Tf/_0->E;N->C:3");
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    InitGraph(
+        "node { name: 'A' op: 'Input'}"
+        "node { name: 'B' op: 'Input'}"
+        "node { name: 'M' op: '_MklInput'}"
+        "node { name: 'N' op: '_MklInput'}"
+        "node { name: 'C' op: '_MklConv2D'"
+        " attr { key: 'T'                value { type: DT_FLOAT } }"
+        " attr { key: 'data_format'      value { s: 'NCHW' } }"
+        " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+        " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } "
+        "}"
+        " attr { key: 'padding'          value { s: 'SAME' } }"
+        " input: ['A', 'B', 'M', 'N']}"
+        "node { name: 'D' op: 'Input'}"
+        "node { name: 'E' op: 'Sub'"
+        " attr {key: 'T'                 value { type: DT_FLOAT } }"
+        " input: ['C', 'D']}");
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
+              "A(Input);B(Input);C(_MklConv2D);D(Input);E(Sub);M(_MklInput);"
+              "_Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:1;C->Mkl2Tf/_0;"
+              "C:1->Mkl2Tf/_0:1;D->E:1;M->C:2;Mkl2Tf/_0->E;N->C:3");
+  }
 }
 
 // MklConv2D followed by MklToTf op followed by Non-Mkl layer.
-// C=MklConv2D(A,M,B,N); D=MklToTf(C:0, C:1) F=Sub(D,E)
+// C=MklConv2D(A,M,B,N); D=MklToTf(C:0, C:1) F=Sub(D,E) (for interleaved)
+// C=MklConv2D(A,B,M,N); D=MklToTf(C:0, C:1) F=Sub(D,E) (for contiguous)
 // MklToTf node should not be inserted again.
 TEST_F(MklToTfConversionPass, Negative_DoubleInsert) {
-  InitGraph(
-      "node { name: 'A' op: 'Input'}"
-      "node { name: 'M' op: 'MklInput'}"
-      "node { name: 'B' op: 'Input'}"
-      "node { name: 'N' op: 'MklInput'}"
-      "node { name: 'C' op: 'MklConv2D'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
-      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
-      " attr { key: 'padding'          value { s: 'SAME' } }"
-      " input: ['A', 'M', 'B', 'N']}"
-      "node { name: 'D' op: 'MklToTf'"
-      " attr { key: 'T'                value { type: DT_FLOAT } }"
-      " attr { key: 'data_format'      value { s: 'NCHW' } }"
-      " input: ['C:0', 'C:1']}"
-      "node { name: 'E' op: 'Input'}"
-      "node { name: 'F' op: 'Sub'"
-      " attr {key: 'T'                 value { type: DT_FLOAT } }"
-      " input: ['D', 'E']}");
-  EXPECT_EQ(DoRunMklToTfConversionPass(),
-            "A(Input);B(Input);C(MklConv2D);D(MklToTf);E(Input);"
-            "F(Sub);M(MklInput);N(MklInput)|"
-            "A->C;B->C:2;C->D;C:1->D:1;D->F;E->F:1;M->C:1;N->C:3");
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    InitGraph(
+        "node { name: 'A' op: 'Input'}"
+        "node { name: 'M' op: '_MklInput'}"
+        "node { name: 'B' op: 'Input'}"
+        "node { name: 'N' op: '_MklInput'}"
+        "node { name: 'C' op: '_MklConv2D'"
+        " attr { key: 'T'                value { type: DT_FLOAT } }"
+        " attr { key: 'data_format'      value { s: 'NCHW' } }"
+        " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+        " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } "
+        "}"
+        " attr { key: 'padding'          value { s: 'SAME' } }"
+        " input: ['A', 'M', 'B', 'N']}"
+        "node { name: 'D' op: '_MklToTf'"
+        " attr { key: 'T'                value { type: DT_FLOAT } }"
+        " attr { key: 'data_format'      value { s: 'NCHW' } }"
+        " input: ['C:0', 'C:1']}"
+        "node { name: 'E' op: 'Input'}"
+        "node { name: 'F' op: 'Sub'"
+        " attr {key: 'T'                 value { type: DT_FLOAT } }"
+        " input: ['D', 'E']}");
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
+              "A(Input);B(Input);C(_MklConv2D);D(_MklToTf);E(Input);"
+              "F(Sub);M(_MklInput);N(_MklInput)|"
+              "A->C;B->C:2;C->D;C:1->D:1;D->F;E->F:1;M->C:1;N->C:3");
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    InitGraph(
+        "node { name: 'A' op: 'Input'}"
+        "node { name: 'B' op: 'Input'}"
+        "node { name: 'M' op: '_MklInput'}"
+        "node { name: 'N' op: '_MklInput'}"
+        "node { name: 'C' op: '_MklConv2D'"
+        " attr { key: 'T'                value { type: DT_FLOAT } }"
+        " attr { key: 'data_format'      value { s: 'NCHW' } }"
+        " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+        " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } "
+        "}"
+        " attr { key: 'padding'          value { s: 'SAME' } }"
+        " input: ['A', 'B', 'M', 'N']}"
+        "node { name: 'D' op: '_MklToTf'"
+        " attr { key: 'T'                value { type: DT_FLOAT } }"
+        " attr { key: 'data_format'      value { s: 'NCHW' } }"
+        " input: ['C:0', 'C:1']}"
+        "node { name: 'E' op: 'Input'}"
+        "node { name: 'F' op: 'Sub'"
+        " attr {key: 'T'                 value { type: DT_FLOAT } }"
+        " input: ['D', 'E']}");
+    EXPECT_EQ(DoRunMklToTfConversionPass(),
+              "A(Input);B(Input);C(_MklConv2D);D(_MklToTf);E(Input);"
+              "F(Sub);M(_MklInput);N(_MklInput)|"
+              "A->C;B->C:1;C->D;C:1->D:1;D->F;E->F:1;M->C:2;N->C:3");
+  }
 }
 
 // C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.cc b/tensorflow/core/grappler/optimizers/auto_parallel.cc
index b5497d3594..078fb10bc9 100644
--- a/tensorflow/core/grappler/optimizers/auto_parallel.cc
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.cc
@@ -230,7 +230,7 @@ void AutoParallel::BuildGraph(GraphDef* graph) {
     AddOneReplica(graph, i);
   }
   std::set<string> fetches;
-  for (int i = 0; i < item_->fetch.size(); i++) {
+  for (size_t i = 0; i < item_->fetch.size(); i++) {
     for (int j = 0; j < num_replicas_; j++) {
       string prefix = strings::StrCat(kAutoParallelPrefix, "-Replica-", j);
       string fetch = AddPrefixToNodeName(item_->fetch[i], prefix);
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index e32f51a3a2..49b12df7aa 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4828,6 +4828,38 @@ tf_mkl_kernel_library(
     ],
 )
 
+tf_mkl_kernel_library(
+    name = "mkl_fused_batch_norm_op",
+    srcs = ["mkl_fused_batch_norm_op.cc"],
+    deps = NN_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
+tf_mkl_kernel_library(
+    name = "mkl_concat_op",
+    prefix = "mkl_concat_op",
+    deps = ARRAY_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
+tf_mkl_kernel_library(
+    name = "mkl_reshape_op",
+    prefix = "mkl_reshape_op",
+    deps = ARRAY_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
+tf_mkl_kernel_library(
+    name = "mkl_lrn_op",
+    prefix = "mkl_lrn_op",
+    deps = NN_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
 # -----------------------------------------------------------------------------
 # Google-internal targets.  These must be at the end for syncrepo.
 
diff --git a/tensorflow/core/kernels/fixed_length_record_reader_op.cc b/tensorflow/core/kernels/fixed_length_record_reader_op.cc
index 637a6cef95..ce7fb9c332 100644
--- a/tensorflow/core/kernels/fixed_length_record_reader_op.cc
+++ b/tensorflow/core/kernels/fixed_length_record_reader_op.cc
@@ -28,12 +28,14 @@ namespace tensorflow {
 class FixedLengthRecordReader : public ReaderBase {
  public:
   FixedLengthRecordReader(const string& node_name, int64 header_bytes,
-                          int64 record_bytes, int64 footer_bytes, Env* env)
+                          int64 record_bytes, int64 footer_bytes,
+                          int64 hop_bytes, Env* env)
       : ReaderBase(
             strings::StrCat("FixedLengthRecordReader '", node_name, "'")),
         header_bytes_(header_bytes),
         record_bytes_(record_bytes),
         footer_bytes_(footer_bytes),
+        hop_bytes_(hop_bytes),
         env_(env),
         file_pos_limit_(-1),
         record_number_(0) {}
@@ -62,14 +64,31 @@ class FixedLengthRecordReader : public ReaderBase {
 
   Status ReadLocked(string* key, string* value, bool* produced,
                     bool* at_end) override {
-    if (input_buffer_->Tell() >= file_pos_limit_) {
+    // The condition `input_buffer_->Tell() + record_bytes_ > file_pos_limit_`
+    // is to confirm that none of record bytes is out of the range of
+    // file_pos_limit_.
+    // This is necessary for the condition `hop_bytes > 0`. For example.
+    // File: "0123456"
+    // Reader setting: `record_bytes=3`, `hop_bytes=2`, `footer_bytes=0`,
+    //     `header_bytes=0`
+    // Without this checking condition, the forth time the reader will at
+    // this position: "012345|6" and the reading operation will result in
+    // an error.
+    if (input_buffer_->Tell() >= file_pos_limit_ ||
+        input_buffer_->Tell() + record_bytes_ > file_pos_limit_) {
       *at_end = true;
       return Status::OK();
     }
+    const int64 pos_before_read = input_buffer_->Tell();
     TF_RETURN_IF_ERROR(input_buffer_->ReadNBytes(record_bytes_, value));
     *key = strings::StrCat(current_work(), ":", record_number_);
     *produced = true;
     ++record_number_;
+
+    if (hop_bytes_ > 0) {
+      input_buffer_->Seek(pos_before_read + hop_bytes_).IgnoreError();
+    }
+
     return Status::OK();
   }
 
@@ -87,6 +106,7 @@ class FixedLengthRecordReader : public ReaderBase {
   const int64 header_bytes_;
   const int64 record_bytes_;
   const int64 footer_bytes_;
+  const int64 hop_bytes_;
   Env* const env_;
   int64 file_pos_limit_;
   int64 record_number_;
@@ -98,10 +118,12 @@ class FixedLengthRecordReaderOp : public ReaderOpKernel {
  public:
   explicit FixedLengthRecordReaderOp(OpKernelConstruction* context)
       : ReaderOpKernel(context) {
-    int64 header_bytes = -1, record_bytes = -1, footer_bytes = -1;
+    int64 header_bytes = -1, record_bytes = -1, footer_bytes = -1,
+          hop_bytes = -1;
     OP_REQUIRES_OK(context, context->GetAttr("header_bytes", &header_bytes));
     OP_REQUIRES_OK(context, context->GetAttr("record_bytes", &record_bytes));
     OP_REQUIRES_OK(context, context->GetAttr("footer_bytes", &footer_bytes));
+    OP_REQUIRES_OK(context, context->GetAttr("hop_bytes", &hop_bytes));
     OP_REQUIRES(context, header_bytes >= 0,
                 errors::InvalidArgument("header_bytes must be >= 0 not ",
                                         header_bytes));
@@ -111,11 +133,15 @@ class FixedLengthRecordReaderOp : public ReaderOpKernel {
     OP_REQUIRES(context, footer_bytes >= 0,
                 errors::InvalidArgument("footer_bytes must be >= 0 not ",
                                         footer_bytes));
+    OP_REQUIRES(
+        context, hop_bytes >= 0,
+        errors::InvalidArgument("hop_bytes must be >= 0 not ", hop_bytes));
     Env* env = context->env();
-    SetReaderFactory([this, header_bytes, record_bytes, footer_bytes, env]() {
-      return new FixedLengthRecordReader(name(), header_bytes, record_bytes,
-                                         footer_bytes, env);
-    });
+    SetReaderFactory(
+        [this, header_bytes, record_bytes, footer_bytes, hop_bytes, env]() {
+          return new FixedLengthRecordReader(name(), header_bytes, record_bytes,
+                                             footer_bytes, hop_bytes, env);
+        });
   }
 };
 
diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
index 71918fe269..8bd1724e32 100644
--- a/tensorflow/core/kernels/mkl_avgpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -29,10 +29,9 @@ namespace tensorflow {
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
 template <typename Device, typename T>
-class MklAvgPoolingOp : public UnaryOp<T> {
+class MklAvgPoolingOp : public OpKernel {
  public:
-  explicit MklAvgPoolingOp(OpKernelConstruction* context)
-      : UnaryOp<T>(context) {
+  explicit MklAvgPoolingOp(OpKernelConstruction* context) : OpKernel(context) {
     string data_format;
     OP_REQUIRES_OK(context, context->GetAttr("data_format", &data_format));
     OP_REQUIRES(context, FormatFromString(data_format, &data_format_),
@@ -78,6 +77,7 @@ class MklAvgPoolingOp : public UnaryOp<T> {
     Tensor mkl_tmp_input_buf_tensor_;
     mkl_context.MklCreateLayoutsAndPrimitives(context,
                                               &mkl_tmp_input_buf_tensor_);
+    OP_REQUIRES_OK(context, context->status());
 
     Tensor workspace_tensor;
     void* workspace_buf;
@@ -120,7 +120,7 @@ class MklAvgPoolingOp : public UnaryOp<T> {
                                 mkl_out_shape.GetMklLayout())) /
                             sizeof(T));
 
-    AllocateOutputSetMklshape(context, 0, &output, tensor_out_shape,
+    AllocateOutputSetMklShape(context, 0, &output, tensor_out_shape,
                               mkl_out_shape);
     mkl_context.pooling_res[dnnResourceDst] =
         static_cast<void*>(output->flat<T>().data());
@@ -138,9 +138,10 @@ class MklAvgPoolingOp : public UnaryOp<T> {
   typedef struct {
     MklPoolingOpParams params;
     MklShape input_shape;
-    dnnPrimitive_t prim_pooling_fwd, convert_input;
-    dnnLayout_t lt_user_input, lt_prim_input, lt_workspace;
-    void* input_buf;
+    dnnPrimitive_t prim_pooling_fwd = nullptr, convert_input = nullptr;
+    dnnLayout_t lt_user_input = nullptr, lt_prim_input = nullptr,
+                lt_workspace = nullptr;
+    void* input_buf = nullptr;
     void* pooling_res[dnnResourceNumber];
 
     void MklCreateLayoutsAndPrimitives(OpKernelContext* context,
@@ -243,6 +244,11 @@ class MklAvgPoolingGradOp : public OpKernel {
     pool_params.Init(context, ksize_, stride_, padding_, data_format_,
                      output_shape);
 
+    if (outbackprop_in_mkl_format == false)
+      mkl_context.params.in_dim = out_backprop.dims();
+    else
+      mkl_context.params.in_dim = mkl_context.out_backprop_shape.GetDimension();
+
     // Extract the parameters for the op from the pooling specs
     ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
 
@@ -250,6 +256,7 @@ class MklAvgPoolingGradOp : public OpKernel {
     Tensor outbackprop_buf_tensor;
     void* outbackprop_buf;
     mkl_context.MklCreateLayoutsAndPrimitives(context);
+    OP_REQUIRES_OK(context, context->status());
 
     // Check if outbackprop layout requires conversion.
     if (!dnnLayoutCompare_F32(mkl_context.lt_user_outbackprop,
@@ -304,7 +311,7 @@ class MklAvgPoolingGradOp : public OpKernel {
                                 mkl_out_shape.GetMklLayout())) /
                             sizeof(T));
 
-    AllocateOutputSetMklshape(context, 0, &output, tensor_out_shape,
+    AllocateOutputSetMklShape(context, 0, &output, tensor_out_shape,
                               mkl_out_shape);
 
     // Set output tensor.
@@ -323,10 +330,10 @@ class MklAvgPoolingGradOp : public OpKernel {
   typedef struct {
     MklPoolingOpParams params;
     MklShape out_backprop_shape;
-    dnnPrimitive_t prim_pooling_bwd, convert_outbackprop;
+    dnnPrimitive_t prim_pooling_bwd = nullptr, convert_outbackprop = nullptr;
     void* pooling_res[dnnResourceNumber];
-    dnnLayout_t lt_user_input, lt_user_outbackprop, lt_prim_outbackprop,
-        lt_workspace;
+    dnnLayout_t lt_user_input = nullptr, lt_user_outbackprop = nullptr,
+                lt_prim_outbackprop = nullptr, lt_workspace = nullptr;
 
     void MklCreateLayoutsAndPrimitives(OpKernelContext* context) {
       const Tensor& tensor_in_shape = MklGetInput(context, 0);
@@ -348,11 +355,6 @@ class MklAvgPoolingGradOp : public OpKernel {
                                             "4-dimensional"));
       } else {
         // Input in MKL format.
-        OP_REQUIRES(
-            context, out_backprop.dims() == 2,
-            errors::InvalidArgument("out_backprop in MKL format must be "
-                                    "2-dimensional"));
-
         // For avgpooling, out_backprop should have 4 dimensions.
         OP_REQUIRES(context, out_backprop_shape.GetDimension() == 4,
                     errors::InvalidArgument("out_backprop must be "
@@ -412,16 +414,16 @@ class MklAvgPoolingGradOp : public OpKernel {
   TensorFormat data_format_;
 };
 
-REGISTER_KERNEL_BUILDER(Name("MklAvgPool")
+REGISTER_KERNEL_BUILDER(Name("_MklAvgPool")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklAvgPoolingOp<CPUDevice, float>);
 
-REGISTER_KERNEL_BUILDER(Name("MklAvgPoolGrad")
+REGISTER_KERNEL_BUILDER(Name("_MklAvgPoolGrad")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklAvgPoolingGradOp<CPUDevice, float>);
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
new file mode 100644
index 0000000000..27930c44a6
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -0,0 +1,458 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef INTEL_MKL
+
+#include <limits>
+#include <vector>
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/kernels/concat_lib.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/types.h"
+
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+namespace tensorflow {
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+enum AxisArgumentName { NAME_IS_AXIS, NAME_IS_CONCAT_DIM };
+
+// TODO(intelft) Check if we can reuse existing EigenConcatOp using Mutable
+// reference inputs.
+// --------------------------------------------------------------------------
+//                      Eigen Concat Op
+// --------------------------------------------------------------------------
+template <typename Device, typename T, AxisArgumentName AxisArgName>
+class EigenConcatBaseOp : public OpKernel {
+ public:
+  typedef std::vector<std::unique_ptr<typename TTypes<T, 2>::ConstMatrix>>
+      ConstMatrixVector;
+
+  explicit EigenConcatBaseOp(OpKernelConstruction* c) : OpKernel(c) {}
+
+  // Although, we modify Compute for this call to accept one extra param,
+  // we need to have empty Compute because Compute is pure virtual function.
+  void Compute(OpKernelContext* c) {}
+
+  void Compute(OpKernelContext* c, const std::vector<Tensor>& values) {
+    const Tensor* concat_dim_tensor;
+    const char* axis_attribute_name =
+        AxisArgName == NAME_IS_AXIS
+            ? "axis"
+            : AxisArgName == NAME_IS_CONCAT_DIM ? "concat_dim" : "<invalid>";
+    OP_REQUIRES_OK(c, c->input(axis_attribute_name, &concat_dim_tensor));
+    OP_REQUIRES(c, IsLegacyScalar(concat_dim_tensor->shape()),
+                errors::InvalidArgument(
+                    axis_attribute_name,
+                    " tensor should be a scalar integer, but got shape ",
+                    concat_dim_tensor->shape().DebugString()));
+    const int32 concat_dim =
+        internal::SubtleMustCopy(concat_dim_tensor->scalar<int32>()());
+    // Instead of accessing values from context, we use input to Compute.
+    const int N = values.size();
+    const int input_dims = values[0].dims();
+    const TensorShape& input_shape = values[0].shape();
+
+    int32 axis = concat_dim < 0 ? concat_dim + input_dims : concat_dim;
+    OP_REQUIRES(c,
+                (0 <= axis && axis < input_dims) ||
+                    (allow_legacy_scalars() && concat_dim == 0),
+                errors::InvalidArgument(
+                    "ConcatOp : Expected concatenating dimensions in the range "
+                    "[",
+                    -input_dims, ", ", input_dims, "), but got ", concat_dim));
+    // Note that we reduce the concat of n-dimensional tensors into a two
+    // dimensional concat. Assuming the dimensions of any input/output
+    // tensor are {x0, x1,...,xn-1, y0, y1,...,ym-1}, where the concat is along
+    // the dimension indicated with size y0, we flatten it to {x, y}, where y =
+    // Prod_i(yi) and x = ((n > 0) ? Prod_i(xi) : 1).
+    ConstMatrixVector inputs_flat;
+    inputs_flat.reserve(N);
+    int64 inputs_flat_dim0 = 1;
+    for (int d = 0; d < axis; ++d) {
+      inputs_flat_dim0 *= input_shape.dim_size(d);
+    }
+    int64 output_concat_dim = 0;
+    const bool input_is_scalar = IsLegacyScalar(input_shape);
+    for (int i = 0; i < N; ++i) {
+      const auto in = values[i];
+      const bool in_is_scalar = IsLegacyScalar(in.shape());
+      OP_REQUIRES(
+          c, in.dims() == input_dims || (input_is_scalar && in_is_scalar),
+          errors::InvalidArgument(
+              "ConcatOp : Ranks of all input tensors should match: shape[0] = ",
+              input_shape.DebugString(), " vs. shape[", i,
+              "] = ", in.shape().DebugString()));
+      for (int j = 0; j < input_dims; ++j) {
+        if (j == axis) {
+          continue;
+        }
+        OP_REQUIRES(
+            c, in.dim_size(j) == input_shape.dim_size(j),
+            errors::InvalidArgument(
+                "ConcatOp : Dimensions of inputs should match: shape[0] = ",
+                input_shape.DebugString(), " vs. shape[", i,
+                "] = ", in.shape().DebugString()));
+      }
+      if (in.NumElements() > 0) {
+        int64 inputs_flat_dim1 = in.NumElements() / inputs_flat_dim0;
+        inputs_flat.emplace_back(new typename TTypes<T, 2>::ConstMatrix(
+            in.shaped<T, 2>({inputs_flat_dim0, inputs_flat_dim1})));
+      }
+      // TODO(irving): Remove check once !allow_legacy_scalars().
+      output_concat_dim += in.dims() > 0 ? in.dim_size(axis) : 1;
+    }
+
+    TensorShape output_shape(input_shape);
+    // TODO(irving): Remove rank 0 case once !allow_legacy_scalars().
+    if (output_shape.dims() == 0) {
+      output_shape.AddDim(output_concat_dim);
+    } else {
+      output_shape.set_dim(axis, output_concat_dim);
+    }
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(c, c->allocate_output(0, output_shape, &output));
+    if (output->NumElements() > 0) {
+      int64 output_dim1 = output->NumElements() / inputs_flat_dim0;
+      auto output_flat = output->shaped<T, 2>({inputs_flat_dim0, output_dim1});
+      ConcatCPU<T>(c->device(), inputs_flat, &output_flat);
+    }
+  }
+};
+
+// --------------------------------------------------------------------------
+//                      Mkl Concat Op
+// --------------------------------------------------------------------------
+
+template <typename Device, typename T, AxisArgumentName AxisArgName>
+class MklConcatOp : public OpKernel {
+ private:
+  TensorFormat data_format_;
+  EigenConcatBaseOp<Device, T, AxisArgName> eigen_concat_op_;
+
+ public:
+  typedef std::vector<std::unique_ptr<typename TTypes<T, 2>::ConstMatrix>>
+      ConstMatrixVector;
+
+  explicit MklConcatOp(OpKernelConstruction* c)
+      : OpKernel(c), eigen_concat_op_(c) {}
+
+  void Compute(OpKernelContext* context) override {
+    MklConcatOpContext mkl_context;
+
+    // Get input tensors.
+    OpInputList input_tensors;
+    GetMklInputList(context, "values", &input_tensors);
+    const int N = input_tensors.size();
+    // Get MKL shapes.
+    MklShapeList input_shapes(N);
+    GetMklShapeList(context, "values", &input_shapes);
+
+    // If this is Concat, then concat_dim is 0th input.
+    // If this is ConcatV2, then axis is Nth input.
+    const Tensor& concat_dim_tensor = AxisArgName == NAME_IS_CONCAT_DIM
+                                          ? MklGetInput(context, 0)
+                                          : MklGetInput(context, N);
+
+    // Sanity checks
+    OP_REQUIRES(
+        context, IsLegacyScalar(concat_dim_tensor.shape()),
+        errors::InvalidArgument(
+            "Concat dim tensor should be a scalar integer, but got shape ",
+            concat_dim_tensor.shape().DebugString()));
+    int32 concat_dim =
+        internal::SubtleMustCopy(concat_dim_tensor.scalar<int32>()());
+
+    MklShape& inpshape0 = input_shapes[0];
+
+    // Check that all tensors are Mkl, if not we call Eigen version.
+    bool invoke_eigen = false;
+    bool is_concat_dim_channel = true;
+    if (!AreAllMklTensors(input_shapes)) {
+      invoke_eigen = true;
+    }
+
+    // Check that total number of dimensions is 4, if not call Eigen.
+    if (!invoke_eigen) {
+      for (auto& s : input_shapes) {
+        if (s.GetDimension() != 4) {
+          invoke_eigen = true;
+          break;
+        }
+      }
+    }
+
+    // check that concat_dim is channel, if not call Eigen version.
+    if (!invoke_eigen) {
+      for (auto& s : input_shapes) {
+        if (!s.IsMklChannelDim(concat_dim)) {
+          invoke_eigen = true;
+          is_concat_dim_channel = false;
+          break;
+        }
+      }
+    }
+
+    if (invoke_eigen) {
+      string msg = std::string("Invoking Eigen version of Concat. Reason:") +
+                   (!is_concat_dim_channel
+                        ? std::string("Concat dimension is not channel")
+                        : std::string("Not all tensors are in Mkl layout"));
+      VLOG(1) << "_MklConcatOp: " << msg;
+      CallEigenVersion(context, input_tensors, input_shapes);
+      return;
+    }
+
+    // For MKL format, the channel is dimension number 2.
+    // So if we are concating over channel and _all_ inputs are in MKL
+    // format, then we set concat_dim to 2.
+    // Since we have reached till here, it means we are concating
+    // over channel.
+    concat_dim = MklDims::C;
+
+    // One more sanity check: check that ranks of all tensors match
+    // and that their shapes match except for concat_dim.
+    int i = 0;
+    for (auto& s : input_shapes) {
+      size_t exp_dims = inpshape0.GetDimension();
+      OP_REQUIRES(context, s.GetDimension() == exp_dims,
+                  errors::InvalidArgument(
+                      "_MklConcatOp : Ranks of all input tensors should match:"
+                      " input dimensions = ",
+                      s.GetDimension(), " vs. expected rank = ", exp_dims));
+
+      for (int d = 0; d < exp_dims; ++d) {
+        if (d == concat_dim) {
+          continue;
+        }
+
+        size_t exp_size = inpshape0.GetSizes()[d];
+        OP_REQUIRES(
+            context, exp_size == s.GetSizes()[d],
+            errors::InvalidArgument("_MklConcatOp : Dimensions of inputs"
+                                    "should match: shape[0][",
+                                    d, "]= ", exp_size, " vs. shape[", i, "][",
+                                    d, "] = ", s.GetSizes()[d]));
+      }
+      ++i;
+    }
+
+    // Use input MKL layout instead of creating new layouts.
+    int64 output_concat_dim_size = 0;
+    for (auto& s : input_shapes) {
+      output_concat_dim_size +=
+          s.GetDimension() > 0 ? s.GetSizes()[concat_dim] : 1;
+    }
+    mkl_context.MklCreateInputLayouts(context, input_shapes);
+
+    CHECK_EQ(dnnConcatCreate_F32(&mkl_context.prim_concat, NULL, N,
+                                 &mkl_context.lt_inputs[0]),
+             E_SUCCESS);
+
+    // Calculate output sizes and strides
+    TensorFormat data_format;
+    if (inpshape0.IsTensorInNHWCFormat()) {
+      data_format = FORMAT_NHWC;
+    } else {
+      OP_REQUIRES(
+          context, inpshape0.IsTensorInNCHWFormat(),
+          errors::InvalidArgument(
+              "_MklConcat only supports all inputs in NCHW or NHWC format "));
+      data_format = FORMAT_NCHW;
+    }
+
+    // Since all tensors are in Mkl layout, we copy sizes from input tensor.
+    mkl_context.out_sizes[MklDims::W] = inpshape0.GetSizes()[MklDims::W];
+    mkl_context.out_sizes[MklDims::H] = inpshape0.GetSizes()[MklDims::H];
+    mkl_context.out_sizes[MklDims::C] = output_concat_dim_size;
+    mkl_context.out_sizes[MklDims::N] = inpshape0.GetSizes()[MklDims::N];
+    GetStridesFromSizes(data_format, mkl_context.out_strides,
+                        mkl_context.out_sizes);
+
+    // Set output Mkl shape.
+    int64 dim = 4;
+    MklShape mkl_output_mkl_shape;
+    mkl_output_mkl_shape.SetMklTensor(true);
+    mkl_output_mkl_shape.SetMklLayout(mkl_context.prim_concat, dnnResourceDst);
+    mkl_output_mkl_shape.SetTfLayout(dim, mkl_context.out_sizes,
+                                     mkl_context.out_strides);
+    mkl_output_mkl_shape.SetTfDimOrder(dim, inpshape0.GetTfToMklDimMap());
+
+    TensorShape mkl_output_tf_shape;
+    mkl_output_tf_shape.AddDim(1);
+    mkl_output_tf_shape.AddDim(
+        dnnLayoutGetMemorySize_F32(
+            static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
+        sizeof(T));
+
+    Tensor* output = nullptr;
+    AllocateOutputSetMklShape(context, 0, &output, mkl_output_tf_shape,
+                              mkl_output_mkl_shape);
+
+    // Set destination resource.
+    mkl_context.concat_res[dnnResourceDst] =
+        const_cast<void*>(static_cast<const void*>(output->flat<T>().data()));
+
+    mkl_context.mkl_tmp_tensors.resize(N);
+    mkl_context.MklPrepareConcatInputs(context, input_tensors);
+
+    // Execute primitive.
+    CHECK_EQ(dnnExecute_F32(mkl_context.prim_concat, mkl_context.concat_res),
+             E_SUCCESS);
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    TensorFormat data_format;
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    dnnPrimitive_t prim_concat;
+    void* concat_res[dnnResourceNumber];
+    std::vector<dnnLayout_t> lt_inputs;
+    std::vector<Tensor> mkl_tmp_tensors;
+
+    // Create MKL dnnLayout_t objects for tensors coming into the layer
+    // We only support case where input tensors are all in Mkl layout.
+    void MklCreateInputLayouts(OpKernelContext* context,
+                               MklShapeList& input_shapes) {
+      for (auto& is : input_shapes) {
+        CHECK_EQ(is.IsMklTensor(), true);
+        lt_inputs.push_back((dnnLayout_t)is.GetCurLayout());
+      }
+    }
+
+    void MklPrepareConcatInputs(OpKernelContext* context,
+                                OpInputList& input_tensors) {
+      CHECK_EQ(lt_inputs.size(), mkl_tmp_tensors.size());
+
+      for (int i = 0; i < lt_inputs.size(); ++i) {
+        dnnPrimitive_t mkl_prim_convert_input;
+        dnnLayout_t mkl_lt_internal_input;
+        void* mkl_buf_convert_input = nullptr;
+
+        CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                     &mkl_lt_internal_input, prim_concat,
+                     (dnnResourceType_t)(dnnResourceMultipleSrc + i)),
+                 E_SUCCESS);
+
+        if (!dnnLayoutCompare_F32(lt_inputs[i], mkl_lt_internal_input)) {
+          CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input,
+                                           lt_inputs[i], mkl_lt_internal_input),
+                   E_SUCCESS);
+
+          AllocTmpBuffer(context, &mkl_tmp_tensors[i], mkl_lt_internal_input,
+                         &mkl_buf_convert_input);
+
+          CHECK_EQ(dnnConversionExecute_F32(
+                       mkl_prim_convert_input,
+                       const_cast<void*>(static_cast<const void*>(
+                           input_tensors[i].flat<T>().data())),
+                       mkl_buf_convert_input),
+                   E_SUCCESS);
+
+          concat_res[dnnResourceMultipleSrc + i] = mkl_buf_convert_input;
+          CHECK_EQ(dnnDelete_F32(mkl_prim_convert_input), E_SUCCESS);
+        } else {
+          concat_res[dnnResourceMultipleSrc + i] = const_cast<void*>(
+              static_cast<const void*>(input_tensors[i].flat<T>().data()));
+        }
+
+        CHECK_EQ(dnnLayoutDelete_F32(mkl_lt_internal_input), E_SUCCESS);
+      }
+    }
+
+    void MklCleanup() {
+      for (auto& lt : lt_inputs) {
+        lt = nullptr;
+      }
+      CHECK_EQ(dnnDelete_F32(prim_concat), E_SUCCESS);
+    }
+  } MklConcatOpContext;
+
+  void CallEigenVersion(OpKernelContext* context, const OpInputList& values,
+                        const MklShapeList& input_shapes) {
+    // Before calling Eigen version, we need to convert Mkl tensors to TF.
+    // First check that the number of input tensors and the number of Mkl
+    // shapes match.
+    CHECK_EQ(values.size(), input_shapes.size());
+
+    std::vector<Tensor> converted_values;
+    for (int i = 0; i < input_shapes.size(); i++) {
+      if (input_shapes[i].IsMklTensor()) {
+        // If input tensor is Mkl, then do the conversion.
+        Tensor tmp_tensor =
+            ConvertMklToTF<T>(context, values[i], input_shapes[i]);
+        converted_values.push_back(tmp_tensor);
+      } else {
+        // If input tensor is TF already, then we do not need any conversion.
+        converted_values.push_back(values[i]);
+      }
+    }
+
+    // Call Eigen concat.
+    eigen_concat_op_.Compute(context, converted_values);
+
+    // Set dummy Mkl tensor as output Mkl tensor for this op.
+    MklShape mkl_tensor_mkl_shape;
+    mkl_tensor_mkl_shape.SetMklTensor(false);
+    mkl_tensor_mkl_shape.SetDimensions(4);
+    mkl_tensor_mkl_shape.SetTfDimOrder(4);  // Dimensions
+    Tensor* mkl_tensor = nullptr;
+    TensorShape mkl_tensor_tf_shape;
+    mkl_tensor_tf_shape.AddDim(
+        SIZE_OF_MKL_SERIAL_DATA(mkl_tensor_mkl_shape.GetDimension()));
+    int tf_output_index = 0;
+    context->allocate_output(
+        GetTensorMetaDataIndex(tf_output_index, context->num_outputs()),
+        mkl_tensor_tf_shape, &mkl_tensor);
+    mkl_tensor_mkl_shape.SerializeMklShape(
+        mkl_tensor->flat<uint8>().data(),
+        mkl_tensor->flat<uint8>().size() * sizeof(uint8));
+  }
+};
+
+/* Use optimized concat for float type only */
+#define REGISTER_MKL_CPU(type)                                              \
+  REGISTER_KERNEL_BUILDER(Name("_MklConcat")                                \
+                              .Device(DEVICE_CPU)                           \
+                              .TypeConstraint<type>("T")                    \
+                              .HostMemory("concat_dim")                     \
+                              .Label(mkl_op_registry::kMklOpLabel),         \
+                          MklConcatOp<CPUDevice, type, NAME_IS_CONCAT_DIM>) \
+  REGISTER_KERNEL_BUILDER(Name("_MklConcatV2")                               \
+                              .Device(DEVICE_CPU)                           \
+                              .TypeConstraint<type>("T")                    \
+                              .TypeConstraint<int32>("Tidx")                \
+                              .HostMemory("axis")                           \
+                              .Label(mkl_op_registry::kMklOpLabel),         \
+                          MklConcatOp<CPUDevice, type, NAME_IS_AXIS>)
+
+TF_CALL_float(REGISTER_MKL_CPU);
+
+#undef REGISTER_CONCAT_MKL
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
index 627fd83b0d..8a1006a8e9 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -87,7 +87,7 @@ class MklConv2DCustomBackpropBiasOp : public OpKernel {
     Tensor* bias_backprop = nullptr;
     MklShape output_mkl_shape;
     output_mkl_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &bias_backprop, output_shape,
+    AllocateOutputSetMklShape(context, 0, &bias_backprop, output_shape,
                               output_mkl_shape);
 
     mkl_context.in_dims = 4;
@@ -251,11 +251,11 @@ class MklConv2DCustomBackpropBiasOp : public OpKernel {
   TF_DISALLOW_COPY_AND_ASSIGN(MklConv2DCustomBackpropBiasOp);
 };
 
-#define REGISTER_CPU_KERNELS(T)                                           \
-  REGISTER_KERNEL_BUILDER(Name("MklConv2DWithBiasBackpropBias")           \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+#define REGISTER_CPU_KERNELS(T)                                     \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBiasBackpropBias")     \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
                           MklConv2DCustomBackpropBiasOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_CPU_KERNELS);
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
index 85198d89f5..6381b527a1 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -217,7 +217,7 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
     mkl_context.grad_filter_shape.SetTfLayout(mkl_context.filter_dims,
                                               mkl_context.filter_sizes,
                                               mkl_context.filter_strides);
-    AllocateOutputSetMklshape(context, 0, &grad_filter, filter_shape,
+    AllocateOutputSetMklShape(context, 0, &grad_filter, filter_shape,
                               mkl_context.grad_filter_shape);
 
     // Need to set member variable for TF layout
@@ -408,11 +408,11 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
   TensorFormat data_format_;
 };
 
-#define REGISTER_MKL_FILTER_KERNELS(T)                                    \
-  REGISTER_KERNEL_BUILDER(Name("MklConv2DBackpropFilter")                 \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+#define REGISTER_MKL_FILTER_KERNELS(T)                              \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropFilter")           \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
                           MklConv2DCustomBackpropFilterOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_MKL_FILTER_KERNELS);
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index c7d95c86bc..638ce4c024 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -202,7 +202,7 @@ class MklConv2DCustomBackpropInputOp : public OpKernel {
     mkl_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                              mklOutputShape.GetMklLayout())) /
                          sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &in_backprop, mkl_out_shape,
+    AllocateOutputSetMklShape(context, 0, &in_backprop, mkl_out_shape,
                               mklOutputShape);
 
     mkl_context.conv_res[dnnResourceDiffSrc] =
@@ -341,11 +341,11 @@ class MklConv2DCustomBackpropInputOp : public OpKernel {
   TensorFormat data_format;
 };
 
-#define REGISTER_MKL_CPU_KERNELS(T)                                       \
-  REGISTER_KERNEL_BUILDER(Name("MklConv2DBackpropInput")                  \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+#define REGISTER_MKL_CPU_KERNELS(T)                                 \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropInput")            \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
                           MklConv2DCustomBackpropInputOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_MKL_CPU_KERNELS);
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index e5c4c21a10..b818819b02 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -178,7 +178,7 @@ class MklConv2DOp : public OpKernel {
       // Nothing to do, allocate output tensor and return
       MklShape mkl_output_mkl_shape;
       mkl_output_mkl_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &output, input.shape(),
+      AllocateOutputSetMklShape(context, 0, &output, input.shape(),
                                 mkl_output_mkl_shape);
       return;
     }
@@ -264,7 +264,7 @@ class MklConv2DOp : public OpKernel {
         dnnLayoutGetMemorySize_F32(
             static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
         sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output, mkl_output_tf_shape,
+    AllocateOutputSetMklShape(context, 0, &output, mkl_output_tf_shape,
                               mkl_output_mkl_shape);
     mkl_context.conv_res[dnnResourceDst] =
         static_cast<void*>(output->flat<T>().data());
@@ -437,16 +437,16 @@ class MklConv2DOp : public OpKernel {
   TensorFormat data_format_;
 };
 
-#define REGISTER_MKL_CPU(T)                                               \
-  REGISTER_KERNEL_BUILDER(Name("MklConv2D")                               \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
-                          MklConv2DOp<CPUDevice, T, false>);              \
-  REGISTER_KERNEL_BUILDER(Name("MklConv2DWithBias")                       \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+#define REGISTER_MKL_CPU(T)                                         \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2D")                         \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklConv2DOp<CPUDevice, T, false>);        \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBias")                 \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
                           MklConv2DOp<CPUDevice, T, true>);
 
 TF_CALL_float(REGISTER_MKL_CPU);
diff --git a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
new file mode 100644
index 0000000000..512e799d15
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
@@ -0,0 +1,689 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifdef INTEL_MKL
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/util/tensor_format.h"
+
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+// TODO(inteltf) Address comments from PR 8968.
+
+namespace tensorflow {
+using CPUDevice = Eigen::ThreadPoolDevice;
+template <typename Device, typename T>
+class MklFusedBatchNormOp : public OpKernel {
+ public:
+  explicit MklFusedBatchNormOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    float epsilon;
+    OP_REQUIRES_OK(context, context->GetAttr("epsilon", &epsilon));
+    epsilon_ = T(epsilon);
+    string tensor_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &tensor_format));
+    OP_REQUIRES(context, FormatFromString(tensor_format, &tensor_format_),
+                errors::InvalidArgument("Invalid data format"));
+    OP_REQUIRES_OK(context, context->GetAttr("is_training", &is_training_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklFusedBatchNormOpContext mkl_context;
+
+    const Tensor& input = MklGetInput(context, 0);
+    const Tensor& scale = MklGetInput(context, 1);
+    const Tensor& shift = MklGetInput(context, 2);
+    const Tensor& est_mean = MklGetInput(context, 3);
+    const Tensor& est_variance = MklGetInput(context, 4);
+
+    GetMklShape(context, 0, &(mkl_context.mkl_shape_input_shape));
+    bool input_in_mkl_format = mkl_context.mkl_shape_input_shape.IsMklTensor();
+    if (!input_in_mkl_format) {
+      OP_REQUIRES(context, input.dims() == 4,
+                  errors::InvalidArgument("input must be 4-dimensional",
+                                          input.shape().DebugString()));
+    }
+    OP_REQUIRES(context, scale.dims() == 1,
+                errors::InvalidArgument("scale must be 1-dimensional",
+                                        scale.shape().DebugString()));
+    OP_REQUIRES(context, shift.dims() == 1,
+                errors::InvalidArgument("offset must be 1-dimensional",
+                                        shift.shape().DebugString()));
+    OP_REQUIRES(context, est_mean.dims() == 1,
+                errors::InvalidArgument("estimated_mean must be 1-dimensional",
+                                        est_mean.shape().DebugString()));
+    OP_REQUIRES(
+        context, est_variance.dims() == 1,
+        errors::InvalidArgument("estimated_variance must be 1-dimensional",
+                                est_variance.shape().DebugString()));
+    if (is_training_) {
+      OP_REQUIRES(context, est_mean.dim_size(0) == 0,
+                  errors::InvalidArgument("estimated_mean empty for training",
+                                          est_mean.shape().DebugString()));
+      OP_REQUIRES(context, est_variance.dim_size(0) == 0,
+                  errors::InvalidArgument(
+                      "estimated_variance must be empty for training",
+                      est_variance.shape().DebugString()));
+    }
+
+    unsigned int flag_batch_norm =
+        is_training_ ? dnnUseScaleShift
+                     : (dnnUseInputMeanVariance | dnnUseScaleShift);
+
+    mkl_context.MklExtractParams(context, tensor_format_);
+
+    // Create layout only for input data as it is used in Op primitive.
+    mkl_context.MklCreateInputLayout(context);
+
+    // Create Op primitive.
+    CHECK_EQ(dnnBatchNormalizationCreateForward_v2_F32(
+                 &(mkl_context.mkl_prim_batchnorm), nullptr,
+                 mkl_context.mkl_lt_input, static_cast<float>(epsilon_),
+                 flag_batch_norm),
+             E_SUCCESS);
+
+    // Temporary tensors with buffers for the context inputs, if
+    // conversion to MKL-Op specific layouts are required. It is assumed here
+    // that TF's 1D tensors (scale, shift, est_mean, and est_variance) won't
+    // require any conversion.
+    // Since scale-shift is combined in MKL, a buffer is required.
+    Tensor mkl_tmp_input_buf_tensor, mkl_tmp_scale_shift_buf_tensor;
+    mkl_context.MklPrepareContextInputs(context, &mkl_tmp_input_buf_tensor,
+                                        &mkl_tmp_scale_shift_buf_tensor);
+
+    // Output data in MKL layout
+    Tensor* output = nullptr;
+    TensorShape tf_shape_output;
+    MklShape mkl_shape_output;
+    mkl_shape_output.SetMklTensor(true);
+    mkl_shape_output.SetMklLayout(mkl_context.mkl_prim_batchnorm,
+                                  dnnResourceDst);
+    mkl_shape_output.SetTfLayout(mkl_context.mkl_params.in_dim,
+                                 mkl_context.mkl_params.in_sizes,
+                                 mkl_context.mkl_params.in_strides);
+    mkl_shape_output.SetTfDimOrder(mkl_context.mkl_params.in_dim,
+                                   tensor_format_);
+    tf_shape_output.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                               mkl_shape_output.GetMklLayout())) /
+                           sizeof(T));
+    AllocateOutputSetMklShape(context, 0, &output, tf_shape_output,
+                              mkl_shape_output);
+    mkl_context.mkl_res_batchnorm[dnnResourceDst] =
+        static_cast<void*>(output->flat<T>().data());
+
+    // Batch mean in TF layout
+    Tensor* batch_mean = nullptr;
+    MklShape mkl_shape_batch_mean;
+    mkl_shape_batch_mean.SetMklTensor(false);
+    AllocateOutputSetMklShape(context, 1, &batch_mean, scale.shape(),
+                              mkl_shape_batch_mean);
+    // Batch variance in TF layout
+    Tensor* batch_variance = nullptr;
+    MklShape mkl_shape_batch_variance;
+    mkl_shape_batch_variance.SetMklTensor(false);
+    AllocateOutputSetMklShape(context, 2, &batch_variance, scale.shape(),
+                              mkl_shape_batch_variance);
+    // If training mode, set dnnResourceMean and dnnResourceVariance to
+    // output tensors for batch mean and variance.
+    // Otherwise, set dnnResourceMean and dnnResourceVariance to
+    // estimated mean and variance.
+    if (is_training_)
+      mkl_context.MklSetMeanVariance(*batch_mean, *batch_variance);
+    else
+      mkl_context.MklSetMeanVariance(est_mean, est_variance);
+
+    // Now that all resources are set, it is ready for dnnExecute
+    CHECK_EQ(dnnExecute_F32(mkl_context.mkl_prim_batchnorm,
+                            mkl_context.mkl_res_batchnorm),
+             E_SUCCESS);
+
+    // Mean and variance (without Bessel's correction) saved for backward
+    // computation to serve as pre-computed mean and variance.
+    Tensor* saved_mean = nullptr;
+    MklShape mkl_shape_saved_mean;
+    mkl_shape_saved_mean.SetMklTensor(false);
+    AllocateOutputSetMklShape(context, 3, &saved_mean, scale.shape(),
+                              mkl_shape_saved_mean);
+    std::memcpy(
+        reinterpret_cast<char*>(saved_mean->flat<float>().data()),
+        reinterpret_cast<char*>(mkl_context.mkl_res_batchnorm[dnnResourceMean]),
+        scale.NumElements() * sizeof(float));
+    Tensor* saved_variance = nullptr;
+    MklShape mkl_shape_saved_variance;
+    mkl_shape_saved_variance.SetMklTensor(false);
+    AllocateOutputSetMklShape(context, 4, &saved_variance, scale.shape(),
+                              mkl_shape_saved_variance);
+    std::memcpy(reinterpret_cast<char*>(saved_variance->flat<float>().data()),
+                reinterpret_cast<char*>(
+                    mkl_context.mkl_res_batchnorm[dnnResourceVariance]),
+                scale.NumElements() * sizeof(float));
+
+    // Bessel's correction on variance, if training mode is on
+    if (is_training_) {
+      float* p_var = static_cast<float*>(batch_variance->flat<T>().data());
+      auto depth = mkl_context.mkl_params.depth;
+      size_t orig_size = mkl_context.mkl_params.in_sizes[0] *
+                         mkl_context.mkl_params.in_sizes[1] *
+                         mkl_context.mkl_params.in_sizes[3];
+      size_t adjust_size = orig_size - 1;
+      float adjust_factor = (static_cast<float>(orig_size)) / adjust_size;
+      for (int i = 0; i < depth; i++) p_var[i] = adjust_factor * p_var[i];
+    }
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  T epsilon_;
+  TensorFormat tensor_format_;
+  bool is_training_;
+
+  // Structure containing all info for MklOp
+  typedef struct {
+    // Parameters used for input and output layouts
+    struct MklBatchNormParams {
+      // BatchNormOp src and
+      size_t in_dim;
+      size_t in_sizes[4];
+      size_t in_strides[4];
+      size_t depth;  // Batch normalization is done for per channel.
+    } mkl_params;
+
+    MklShape mkl_shape_input_shape;
+
+    // MKL primitive and resources for BatchNormOp
+    dnnPrimitive_t mkl_prim_batchnorm = nullptr;
+    void* mkl_res_batchnorm[dnnResourceNumber];
+
+    // MKL layouts for inputs in the context
+    dnnLayout_t mkl_lt_input = nullptr;
+
+    void MklCleanup() {
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      if (!input_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_input);
+      if (mkl_prim_batchnorm != nullptr) dnnDelete_F32(mkl_prim_batchnorm);
+    }
+
+    void MklExtractParams(OpKernelContext* context,
+                          const TensorFormat& tensor_format) {
+      const Tensor& input = MklGetInput(context, 0);
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      mkl_params.in_dim = input_in_mkl_format
+                              ? mkl_shape_input_shape.GetDimension()
+                              : input.dims();
+      mkl_params.in_sizes[0] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[0]
+                              : GetTensorDim(input, tensor_format, 'W'));
+      mkl_params.in_sizes[1] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[1]
+                              : GetTensorDim(input, tensor_format, 'H'));
+      mkl_params.in_sizes[2] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[2]
+                              : GetTensorDim(input, tensor_format, 'C'));
+      mkl_params.in_sizes[3] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[3]
+                              : GetTensorDim(input, tensor_format, 'N'));
+      mkl_params.depth = mkl_params.in_sizes[2];
+      GetStridesFromSizes(tensor_format, mkl_params.in_strides,
+                          mkl_params.in_sizes);
+    }
+
+    void MklCreateInputLayout(OpKernelContext* context) {
+      const Tensor& input = MklGetInput(context, 0);
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      if (input_in_mkl_format) {
+        mkl_lt_input =
+            static_cast<dnnLayout_t>(mkl_shape_input_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&mkl_lt_input, mkl_params.in_dim,
+                                mkl_params.in_sizes, mkl_params.in_strides),
+            E_SUCCESS);
+      }
+    }
+
+    void MklPrepareContextInputs(OpKernelContext* context,
+                                 Tensor* mkl_tmp_input_buf_tensor,
+                                 Tensor* mkl_tmp_scale_shift_buf_tensor) {
+      bool mkl_convert_input;
+      dnnPrimitive_t mkl_prim_convert_input = nullptr;
+      dnnLayout_t mkl_lt_internal_input = nullptr;
+      void* mkl_buf_converted_input = nullptr;
+      // Compare with internal layouts and convert if needed
+      const Tensor& input = MklGetInput(context, 0);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
+                   &mkl_lt_internal_input, mkl_prim_batchnorm, dnnResourceSrc),
+               E_SUCCESS);
+      mkl_convert_input =
+          !dnnLayoutCompare_F32(mkl_lt_internal_input, mkl_lt_input);
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input, mkl_lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &mkl_buf_converted_input);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input, mkl_buf_input,
+                                          mkl_buf_converted_input),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_input);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
+      mkl_res_batchnorm[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_converted_input : mkl_buf_input;
+
+      // scale-shift layout is created from primitive. So no conversion
+      // is needed, however, a buffer has to be allocated.
+      dnnLayout_t mkl_lt_scale_shift = nullptr;
+      void* mkl_buf_scale_shift = nullptr;
+      CHECK_EQ(
+          dnnLayoutCreateFromPrimitive_F32(
+              &mkl_lt_scale_shift, mkl_prim_batchnorm, dnnResourceScaleShift),
+          E_SUCCESS);
+      AllocTmpBuffer(context, mkl_tmp_scale_shift_buf_tensor,
+                     mkl_lt_scale_shift, &mkl_buf_scale_shift);
+      // Fill the scale-shift buffer with data, presumably buffer is 2D array
+      const Tensor& scale = MklGetInput(context, 1);
+      const Tensor& shift = MklGetInput(context, 2);
+      float* buf_scale_shift = static_cast<float*>(mkl_buf_scale_shift);
+      float* buf_scale = const_cast<float*>(
+          static_cast<const float*>(scale.flat<float>().data()));
+      float* buf_shift = const_cast<float*>(
+          static_cast<const float*>(shift.flat<float>().data()));
+      auto depth = mkl_params.depth;
+      for (int i = 0; i < depth; i++) {
+        buf_scale_shift[i] = buf_scale[i];
+        buf_scale_shift[i + depth] = buf_shift[i];
+      }
+      mkl_res_batchnorm[dnnResourceScaleShift] = mkl_buf_scale_shift;
+    }
+
+    inline void MklSetMeanVariance(const Tensor& mean, const Tensor& variance) {
+      mkl_res_batchnorm[dnnResourceMean] = const_cast<void*>(
+          static_cast<const void*>(mean.flat<float>().data()));
+      mkl_res_batchnorm[dnnResourceVariance] = const_cast<void*>(
+          static_cast<const void*>(variance.flat<float>().data()));
+    }
+  } MklFusedBatchNormOpContext;
+};
+
+#define REGISTER_MKL_CPU(T)                                         \
+  REGISTER_KERNEL_BUILDER(Name("_MklFusedBatchNorm")                 \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklFusedBatchNormOp<CPUDevice, T>);
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+
+template <typename Device, typename T>
+class MklFusedBatchNormGradOp : public OpKernel {
+ public:
+  explicit MklFusedBatchNormGradOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    float epsilon;
+    OP_REQUIRES_OK(context, context->GetAttr("epsilon", &epsilon));
+    epsilon_ = T(epsilon);
+    string tensor_format;
+    OP_REQUIRES_OK(context, context->GetAttr("data_format", &tensor_format));
+    OP_REQUIRES(context, FormatFromString(tensor_format, &tensor_format_),
+                errors::InvalidArgument("Invalid data format"));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklFusedBatchNormGradOpContext mkl_context;
+
+    const Tensor& out_backprop = MklGetInput(context, 0);
+    const Tensor& input = MklGetInput(context, 1);
+    const Tensor& scale = MklGetInput(context, 2);
+    const Tensor& saved_mean = MklGetInput(context, 3);
+    const Tensor& saved_var = MklGetInput(context, 4);
+
+    // Here scale, mean, and variance are 1D and considered
+    // those having same layout in MKL and TF
+    GetMklShape(context, 0, &(mkl_context.mkl_shape_out_backprop));
+    GetMklShape(context, 1, &(mkl_context.mkl_shape_input_shape));
+
+    bool input_in_mkl_format = mkl_context.mkl_shape_input_shape.IsMklTensor();
+    bool out_backprop_in_mkl_format =
+        mkl_context.mkl_shape_out_backprop.IsMklTensor();
+    if (!out_backprop_in_mkl_format) {
+      OP_REQUIRES(context, out_backprop.dims() == 4,
+                  errors::InvalidArgument("input must be 4-dimensional",
+                                          out_backprop.shape().DebugString()));
+    }
+    if (!input_in_mkl_format) {
+      OP_REQUIRES(context, input.dims() == 4,
+                  errors::InvalidArgument("input must be 4-dimensional",
+                                          input.shape().DebugString()));
+    }
+    OP_REQUIRES(context, scale.dims() == 1,
+                errors::InvalidArgument("scale must be 1-dimensional",
+                                        scale.shape().DebugString()));
+    OP_REQUIRES(context, saved_mean.dims() == 1,
+                errors::InvalidArgument("saved mean must be 1-dimensional",
+                                        saved_mean.shape().DebugString()));
+    OP_REQUIRES(context, saved_var.dims() == 1,
+                errors::InvalidArgument("saved variance must be 1-dimensional",
+                                        saved_var.shape().DebugString()));
+
+    mkl_context.MklExtractParams(context, tensor_format_);
+
+    mkl_context.MklCreateInputLayout(context);
+
+    unsigned int flag_batch_norm_grad = dnnUseScaleShift;
+
+    // Create Backward Op primitive.
+    CHECK_EQ(dnnBatchNormalizationCreateBackward_v2_F32(
+                 &(mkl_context.mkl_prim_batchnorm_bwd), nullptr,
+                 mkl_context.mkl_lt_input, static_cast<float>(epsilon_),
+                 flag_batch_norm_grad),
+             E_SUCCESS);
+
+    // Temporary tensors and their buffers if conversion is required
+    Tensor mkl_tmp_input_buf_tensor, mkl_tmp_outbackprop_buf_tensor,
+        mkl_tmp_scaleshift_buf_tensor;
+    mkl_context.MklPrepareContextInputs(context, &mkl_tmp_input_buf_tensor,
+                                        &mkl_tmp_outbackprop_buf_tensor,
+                                        &mkl_tmp_scaleshift_buf_tensor);
+
+    // Allocate tensor for grad w.r.t. input(x)
+    Tensor* in_backprop = nullptr;
+    TensorShape tf_shape_in_backprop;
+    MklShape mkl_shape_in_backprop;
+    mkl_shape_in_backprop.SetMklTensor(true);
+    mkl_shape_in_backprop.SetMklLayout(mkl_context.mkl_prim_batchnorm_bwd,
+                                       dnnResourceDiffSrc);
+    mkl_shape_in_backprop.SetTfLayout(mkl_context.mkl_params.in_dims,
+                                      mkl_context.mkl_params.in_sizes,
+                                      mkl_context.mkl_params.in_strides);
+    mkl_shape_in_backprop.SetTfDimOrder(mkl_context.mkl_params.in_dims,
+                                        tensor_format_);
+    tf_shape_in_backprop.AddDim(
+        dnnLayoutGetMemorySize_F32(
+            static_cast<dnnLayout_t>(mkl_shape_in_backprop.GetMklLayout())) /
+        sizeof(T));
+    AllocateOutputSetMklShape(context, 0, &in_backprop, tf_shape_in_backprop,
+                              mkl_shape_in_backprop);
+    mkl_context.mkl_res_batchnorm_bwd[dnnResourceDiffSrc] =
+        static_cast<void*>(in_backprop->flat<T>().data());
+
+    // grad_scale and grad_shift are combined together in MKL
+    // So create a single temporary buffer for those.
+    // Also set dnnResourceDiffScaleShift to the temporary buffer
+    Tensor mkl_tmp_grad_scale_shift_buf_tensor;
+    mkl_context.MklPrepareGradScaleShift(context,
+                                         &mkl_tmp_grad_scale_shift_buf_tensor);
+
+    // All dnn resources are set now, ready to execute
+    CHECK_EQ(dnnExecute_F32(mkl_context.mkl_prim_batchnorm_bwd,
+                            mkl_context.mkl_res_batchnorm_bwd),
+             E_SUCCESS);
+
+    // Now separate out scale and shift grad and copy to individual tensors
+    const TensorShape& tf_shape_scale_shift = scale.shape();
+    // Allocate tensor for grad w.r.t. scale (beta)
+    Tensor* scale_backprop = nullptr;
+    MklShape mkl_shape_scale_backprop;
+    AllocateOutputSetMklShape(context, 1, &scale_backprop, tf_shape_scale_shift,
+                              mkl_shape_scale_backprop);
+
+    // Allocate tensor for grad w.r.t. shift(gamma)
+    Tensor* shift_backprop = nullptr;
+    MklShape mkl_shape_shift_backprop;
+    AllocateOutputSetMklShape(context, 2, &shift_backprop, tf_shape_scale_shift,
+                              mkl_shape_shift_backprop);
+
+    // copy scale and shift grads to tensors
+    float* mkl_buf_scale_shift = const_cast<float*>(static_cast<const float*>(
+        mkl_tmp_grad_scale_shift_buf_tensor.flat<T>().data()));
+    float* tf_buf_scale = const_cast<float*>(
+        static_cast<const float*>(scale_backprop->flat<T>().data()));
+    float* tf_buf_shift = const_cast<float*>(
+        static_cast<const float*>(shift_backprop->flat<T>().data()));
+    auto depth = mkl_context.mkl_params.depth;
+    for (int i = 0; i < depth; i++) {
+      tf_buf_scale[i] = mkl_buf_scale_shift[i];
+      tf_buf_shift[i] = mkl_buf_scale_shift[i + depth];
+    }
+
+    // Two placeholders for estimated_mean and estimated_variance, which are
+    // used for inference and thus not needed here for gradient computation.
+    Tensor* placeholder_1 = nullptr;
+    MklShape mkl_shape_placeholder_1;
+    AllocateOutputSetMklShape(context, 3, &placeholder_1, TensorShape({}),
+                              mkl_shape_placeholder_1);
+    Tensor* placeholder_2 = nullptr;
+    MklShape mkl_shape_placeholder_2;
+    AllocateOutputSetMklShape(context, 4, &placeholder_2, TensorShape({}),
+                              mkl_shape_placeholder_2);
+
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  T epsilon_;
+  TensorFormat tensor_format_;
+
+  // Structure containing all info for MklOp
+  typedef struct {
+    // Parameters used for input and output layouts
+    struct MklBatchNormParams {
+      // BatchNormOp src and
+      size_t in_dims;
+      size_t in_sizes[4];
+      size_t in_strides[4];
+      size_t depth;  // Batch normalization is done for per channel.
+    } mkl_params;
+
+    MklShape mkl_shape_out_backprop;
+    MklShape mkl_shape_input_shape;
+
+    // MKL primitive and resources for BatchNormOp
+    dnnPrimitive_t mkl_prim_batchnorm_bwd = nullptr;
+    void* mkl_res_batchnorm_bwd[dnnResourceNumber];
+
+    // MKL layouts for inputs in the context
+    dnnLayout_t mkl_lt_out_backprop = nullptr;
+    dnnLayout_t mkl_lt_input = nullptr;
+
+    void MklCleanup() {
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      bool out_backprop_in_mkl_format = mkl_shape_out_backprop.IsMklTensor();
+      if (!input_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_input);
+      if (!out_backprop_in_mkl_format) dnnLayoutDelete_F32(mkl_lt_out_backprop);
+
+      dnnDelete_F32(mkl_prim_batchnorm_bwd);
+    }
+
+    void MklExtractParams(OpKernelContext* context,
+                          const TensorFormat& tensor_format) {
+      const Tensor& input = MklGetInput(context, 1);
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      mkl_params.in_dims = input_in_mkl_format
+                               ? mkl_shape_input_shape.GetDimension()
+                               : input.dims();
+      mkl_params.in_sizes[0] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[0]
+                              : GetTensorDim(input, tensor_format, 'W'));
+      mkl_params.in_sizes[1] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[1]
+                              : GetTensorDim(input, tensor_format, 'H'));
+      mkl_params.in_sizes[2] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[2]
+                              : GetTensorDim(input, tensor_format, 'C'));
+      mkl_params.in_sizes[3] = static_cast<size_t>(
+          input_in_mkl_format ? mkl_shape_input_shape.GetSizes()[3]
+                              : GetTensorDim(input, tensor_format, 'N'));
+      mkl_params.depth = mkl_params.in_sizes[2];
+      GetStridesFromSizes(tensor_format, mkl_params.in_strides,
+                          mkl_params.in_sizes);
+    }
+
+    void MklCreateInputLayout(OpKernelContext* context) {
+      bool input_in_mkl_format = mkl_shape_input_shape.IsMklTensor();
+      if (input_in_mkl_format) {
+        mkl_lt_input =
+            static_cast<dnnLayout_t>(mkl_shape_input_shape.GetCurLayout());
+      } else {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&mkl_lt_input, mkl_params.in_dims,
+                                mkl_params.in_sizes, mkl_params.in_strides),
+            E_SUCCESS);
+      }
+
+      bool out_backprop_in_mkl_format = mkl_shape_out_backprop.IsMklTensor();
+      if (out_backprop_in_mkl_format) {
+        mkl_lt_out_backprop =
+            static_cast<dnnLayout_t>(mkl_shape_out_backprop.GetCurLayout());
+      } else {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&mkl_lt_out_backprop, mkl_params.in_dims,
+                                mkl_params.in_sizes, mkl_params.in_strides),
+            E_SUCCESS);
+      }
+    }
+
+    void MklPrepareContextInputs(OpKernelContext* context,
+                                 Tensor* mkl_tmp_input_buf_tensor,
+                                 Tensor* mkl_tmp_outbackprop_buf_tensor,
+                                 Tensor* mkl_tmp_scaleshift_buf_tensor) {
+      bool mkl_convert_input;
+      dnnPrimitive_t mkl_prim_convert_input = nullptr;
+      dnnLayout_t mkl_lt_internal_input = nullptr;
+      void* mkl_buf_converted_input = nullptr;
+      // Compare with internal layouts and convert if needed
+      const Tensor& input = MklGetInput(context, 1);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+      CHECK_EQ(
+          dnnLayoutCreateFromPrimitive_F32(
+              &mkl_lt_internal_input, mkl_prim_batchnorm_bwd, dnnResourceSrc),
+          E_SUCCESS);
+      mkl_convert_input =
+          !dnnLayoutCompare_F32(mkl_lt_internal_input, mkl_lt_input);
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_input, mkl_lt_input,
+                                         mkl_lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
+                       &mkl_buf_converted_input);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_input, mkl_buf_input,
+                                          mkl_buf_converted_input),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_input);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_input);
+      mkl_res_batchnorm_bwd[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_converted_input : mkl_buf_input;
+
+      bool mkl_convert_out_backprop;
+      dnnPrimitive_t mkl_prim_convert_out_backprop = nullptr;
+      dnnLayout_t mkl_lt_internal_out_backprop = nullptr;
+      void* mkl_buf_converted_out_backprop = nullptr;
+      // Compare with internal layouts and convert if needed
+      const Tensor& out_backprop = MklGetInput(context, 0);
+      void* mkl_buf_out_backprop = const_cast<void*>(
+          static_cast<const void*>(out_backprop.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_out_backprop,
+                                                mkl_prim_batchnorm_bwd,
+                                                dnnResourceDiffDst),
+               E_SUCCESS);
+      mkl_convert_out_backprop = !dnnLayoutCompare_F32(
+          mkl_lt_internal_out_backprop, mkl_lt_out_backprop);
+      if (mkl_convert_out_backprop) {
+        CHECK_EQ(dnnConversionCreate_F32(&mkl_prim_convert_out_backprop,
+                                         mkl_lt_out_backprop,
+                                         mkl_lt_internal_out_backprop),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_outbackprop_buf_tensor,
+                       mkl_lt_internal_out_backprop,
+                       &mkl_buf_converted_out_backprop);
+        CHECK_EQ(dnnConversionExecute_F32(mkl_prim_convert_out_backprop,
+                                          mkl_buf_out_backprop,
+                                          mkl_buf_converted_out_backprop),
+                 E_SUCCESS);
+        dnnDelete_F32(mkl_prim_convert_out_backprop);
+      }
+      dnnLayoutDelete_F32(mkl_lt_internal_out_backprop);
+      mkl_res_batchnorm_bwd[dnnResourceDiffDst] =
+          (mkl_convert_out_backprop) ? mkl_buf_converted_out_backprop
+                                     : mkl_buf_out_backprop;
+
+      // Set dnnResourceMean and dnnResourceVariance
+      const Tensor& saved_mean = MklGetInput(context, 3);
+      const Tensor& saved_var = MklGetInput(context, 4);
+      void* mkl_buf_saved_mean = const_cast<void*>(
+          static_cast<const void*>(saved_mean.flat<T>().data()));
+      void* mkl_buf_saved_var = const_cast<void*>(
+          static_cast<const void*>(saved_var.flat<T>().data()));
+      mkl_res_batchnorm_bwd[dnnResourceMean] = mkl_buf_saved_mean;
+      mkl_res_batchnorm_bwd[dnnResourceVariance] = mkl_buf_saved_var;
+
+      // Set dnnResourceScaleShift
+      // Note backward Op needs only current values of scale parameters,
+      // shift parameters could be garbage and won't be used
+      const Tensor& scale = MklGetInput(context, 2);
+      dnnLayout_t mkl_lt_scale_shift = nullptr;
+      void* mkl_buf_scale_shift = nullptr;
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_scale_shift,
+                                                mkl_prim_batchnorm_bwd,
+                                                dnnResourceScaleShift),
+               E_SUCCESS);
+      AllocTmpBuffer(context, mkl_tmp_scaleshift_buf_tensor, mkl_lt_scale_shift,
+                     &mkl_buf_scale_shift);
+      float* pscale =
+          const_cast<float*>(static_cast<const float*>(scale.flat<T>().data()));
+      float* pscale_shift = static_cast<float*>(mkl_buf_scale_shift);
+      auto depth = mkl_params.depth;
+      for (int i = 0; i < depth; i++) pscale_shift[i] = pscale[i];
+      mkl_res_batchnorm_bwd[dnnResourceScaleShift] = mkl_buf_scale_shift;
+      dnnLayoutDelete_F32(mkl_lt_scale_shift);
+    }
+
+    void MklPrepareGradScaleShift(OpKernelContext* context,
+                                  Tensor* mkl_tmp_grad_scale_shift_buf_tensor) {
+      dnnLayout_t mkl_lt_grad_scaleshift = nullptr;
+      void* mkl_buf_grad_scaleshift = nullptr;
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_grad_scaleshift,
+                                                mkl_prim_batchnorm_bwd,
+                                                dnnResourceDiffScaleShift),
+               E_SUCCESS);
+      AllocTmpBuffer(context, mkl_tmp_grad_scale_shift_buf_tensor,
+                     mkl_lt_grad_scaleshift, &mkl_buf_grad_scaleshift);
+      mkl_res_batchnorm_bwd[dnnResourceDiffScaleShift] =
+          mkl_buf_grad_scaleshift;
+      dnnLayoutDelete_F32(mkl_lt_grad_scaleshift);
+    }
+  } MklFusedBatchNormGradOpContext;
+};
+
+#define REGISTER_MKL_CPU(T)                                         \
+  REGISTER_KERNEL_BUILDER(Name("_MklFusedBatchNormGrad")             \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklFusedBatchNormGradOp<CPUDevice, T>);
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
new file mode 100644
index 0000000000..edca8e2553
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -0,0 +1,722 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// LRN = Local Response Normalization
+// See docs in ../ops/nn_ops.cc. This opkernel uses MKL library, create MKL
+// layout and primitives, use MKL dnn primitives to compute local
+// response normalization
+
+#ifdef INTEL_MKL
+
+#define EIGEN_USE_THREADS
+#include <vector>
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/util/mkl_util.h"
+#include "tensorflow/core/util/tensor_format.h"
+
+#if !defined(IS_MOBILE_PLATFORM)
+#include "tensorflow/core/util/work_sharder.h"
+#endif
+
+namespace tensorflow {
+
+namespace {
+// Create a depth-by-depth band matrix with 1s along a swath of size (2 *
+// depth_radius + 1) around the diagonal.
+template <typename T>
+void GetBandMatrix(int depth, int depth_radius,
+                   Eigen::Tensor<T, 2, Eigen::RowMajor>* result) {
+  result->setZero();
+  for (int row = 0; row < depth; ++row) {
+    const int begin = std::max<int>(0, row - depth_radius);
+    const int end = std::min<int>(depth, row + depth_radius + 1);
+    Eigen::DSizes<Eigen::DenseIndex, 2> start(row, begin);
+    Eigen::DSizes<Eigen::DenseIndex, 2> sizes(1, end - begin);
+    result->slice(start, sizes).setConstant(T(1));
+  }
+}
+
+}  // namespace
+
+template <typename T>
+class MklLRNOp : public OpKernel {
+ public:
+  ~MklLRNOp() {}
+
+  explicit MklLRNOp(OpKernelConstruction* context) : OpKernel(context) {
+    int64 depth_radius64;
+    OP_REQUIRES_OK(context, context->GetAttr("depth_radius", &depth_radius64));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(depth_radius64, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("depth_radius = ", depth_radius64,
+                                " larger than int max"));
+    depth_radius_ = static_cast<size_t>(depth_radius64);
+
+    OP_REQUIRES_OK(context, context->GetAttr("bias", &bias_));
+    OP_REQUIRES_OK(context, context->GetAttr("alpha", &alpha_));
+    OP_REQUIRES_OK(context, context->GetAttr("beta", &beta_));
+    workspace_enabled_ = false;
+    context->GetAttr("workspace_enabled", &workspace_enabled_);
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklLRNOpContext mkl_context;
+
+    const Tensor& input = MklGetInput(context, 0);
+    GetMklShape(context, 0, &mkl_context.input_shape);
+    bool input_in_mkl_format = mkl_context.input_shape.IsMklTensor();
+
+    // Sanity checks
+    mkl_context.in_dims = input_in_mkl_format
+                              ? mkl_context.input_shape.GetDimension()
+                              : input.dims();
+    OP_REQUIRES(context, mkl_context.in_dims == 4,
+                errors::InvalidArgument("input must be 4-dimensional"));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(input.NumElements(), std::numeric_limits<int>::max()),
+        errors::InvalidArgument("argument to LRN too large"));
+
+    if (!input_in_mkl_format) {
+      mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
+                                    beta_, input);
+      return;
+    }
+
+    if (input_in_mkl_format) {
+      // MKL supports normalization over channel dimension only
+      if (mkl_context.input_shape.tf_dim_idx(mkl_context.in_dims - 1) ==
+          MklDims::C) {
+        mkl_context.lt_input =
+            static_cast<dnnLayout_t>(mkl_context.input_shape.GetCurLayout());
+        workspace_enabled_ = true;
+      } else {
+        mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
+                                      beta_, input);
+        return;
+      }
+    }
+
+    int kernel_size = 2 * depth_radius_ + 1;
+
+    CHECK_EQ(dnnLRNCreateForward_F32(
+                 &mkl_context.lrn_fwd, NULL, mkl_context.lt_input, kernel_size,
+                 static_cast<float>(alpha_ * kernel_size), beta_, bias_),
+             E_SUCCESS);
+
+    // Allocate output tensor and shape
+    Tensor* output = nullptr;
+    Tensor* workspace = nullptr;
+
+    // Convert Inputs if needed
+    Tensor mkl_tmp_input_buf_tensor;
+    mkl_context.MklPrepareLRNInputs(context, &mkl_tmp_input_buf_tensor);
+
+    // Allocate Layer Outputs
+    mkl_context.MklAllocateOutputs(context, &output, &workspace,
+                                   workspace_enabled_);
+
+    Tensor mkl_tmp_workspace_buf_tensor;
+    mkl_context.MklPrepareLRNOutputs(context, output, workspace,
+                                     &mkl_tmp_workspace_buf_tensor,
+                                     workspace_enabled_);
+
+    // Execute LRN.
+    CHECK_EQ(dnnExecute_F32(mkl_context.lrn_fwd, mkl_context.lrn_res),
+             E_SUCCESS);
+
+    // Release MKL resources.
+    mkl_context.MklCleanup();
+  }
+
+ private:
+  typedef struct {
+    size_t in_dims;
+    size_t in_sizes[4];
+    size_t in_strides[4];
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    MklShape input_shape;
+    dnnPrimitive_t lrn_fwd = nullptr;
+    dnnPrimitive_t convert_input = nullptr;
+    /* dnnPrimitive_t convert_output; */
+    dnnLayout_t lt_input = nullptr;
+    /* dnnLayout_t lt_output; */
+    dnnLayout_t lt_internal_input = nullptr;
+    dnnLayout_t lt_internal_workspace = nullptr;
+    dnnLayout_t lt_internal_output = nullptr;
+    void* lrn_res[dnnResourceNumber];
+
+    // Convert Inputs if needed
+    void MklPrepareLRNInputs(OpKernelContext* context,
+                             Tensor* mkl_tmp_input_buf_tensor) {
+      const Tensor& input = MklGetInput(context, 0);
+      void* mkl_buf_input =
+          const_cast<void*>(static_cast<const void*>(input.flat<T>().data()));
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_internal_input, lrn_fwd,
+                                                dnnResourceSrc),
+               E_SUCCESS);
+
+      void* mkl_buf_convert_input = nullptr;
+      bool mkl_convert_input = false;
+      mkl_convert_input = !dnnLayoutCompare_F32(lt_internal_input, lt_input);
+
+      if (mkl_convert_input) {
+        CHECK_EQ(dnnConversionCreate_F32(&convert_input, lt_input,
+                                         lt_internal_input),
+                 E_SUCCESS);
+        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, lt_internal_input,
+                       &mkl_buf_convert_input);
+        CHECK_EQ(dnnConversionExecute_F32(convert_input, mkl_buf_input,
+                                          mkl_buf_convert_input),
+                 E_SUCCESS);
+        dnnDelete_F32(convert_input);
+      }
+
+      lrn_res[dnnResourceSrc] =
+          (mkl_convert_input) ? mkl_buf_convert_input : mkl_buf_input;
+    }
+
+    // Allocate Layer Outputs
+    void MklAllocateOutputs(OpKernelContext* context, Tensor** output,
+                            Tensor** workspace, bool workspace_enabled_) {
+      TensorShape mkl_output_tf_shape; /* First tensor */
+      MklShape mkl_output_mkl_shape;   /* Second tensor */
+
+      mkl_output_mkl_shape.SetMklTensor(true);
+      mkl_output_mkl_shape.SetMklLayout(lrn_fwd, dnnResourceDst);
+      mkl_output_mkl_shape.SetTfLayout(in_dims, input_shape.GetSizes(),
+                                       input_shape.GetStrides());
+      mkl_output_mkl_shape.SetTfDimOrder(in_dims,
+                                         input_shape.GetTfToMklDimMap());
+      mkl_output_tf_shape.AddDim(
+          dnnLayoutGetMemorySize_F32(
+              static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
+          sizeof(T));
+      AllocateOutputSetMklShape(context, 0, output,
+                                mkl_output_tf_shape /* First tensor */,
+                                mkl_output_mkl_shape /* Second Tensor */);
+
+      if (workspace_enabled_) {
+        TensorShape mkl_workspace_tf_shape; /* First tensor */
+        MklShape mkl_workspace_mkl_shape;   /* Second tensor */
+        mkl_workspace_mkl_shape.SetMklTensor(false);
+        mkl_workspace_mkl_shape.SetMklLayout(lrn_fwd, dnnResourceWorkspace);
+        // Assumes workspace has same TF layout and TF dim order as input
+        mkl_workspace_mkl_shape.SetTfLayout(in_dims, input_shape.GetSizes(),
+                                            input_shape.GetStrides());
+        mkl_workspace_mkl_shape.SetTfDimOrder(in_dims,
+                                              input_shape.GetTfToMklDimMap());
+        mkl_workspace_tf_shape.AddDim(
+            dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                mkl_workspace_mkl_shape.GetMklLayout())) /
+            sizeof(T));
+        AllocateOutputSetMklShape(context, 1, workspace,
+                                  mkl_workspace_tf_shape /* First tensor */,
+                                  mkl_workspace_mkl_shape /* Second Tensor */);
+      }
+    }
+
+    void MklPrepareLRNOutputs(OpKernelContext* context, Tensor* output,
+                              Tensor* workspace,
+                              Tensor* mkl_tmp_workspace_buf_tensor,
+                              bool workspace_enabled_) {
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_internal_workspace, lrn_fwd,
+                                                dnnResourceWorkspace),
+               E_SUCCESS);
+
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_internal_output, lrn_fwd,
+                                                dnnResourceDst),
+               E_SUCCESS);
+
+      void* mkl_buf_output =
+          const_cast<void*>(static_cast<const void*>(output->flat<T>().data()));
+      lrn_res[dnnResourceDst] = mkl_buf_output;
+
+      void* mkl_buf_workspace = nullptr;
+      if (workspace_enabled_) {
+        mkl_buf_workspace = const_cast<void*>(
+            static_cast<const void*>(workspace->flat<T>().data()));
+      } else {
+        AllocTmpBuffer(context, mkl_tmp_workspace_buf_tensor,
+                       lt_internal_workspace, &mkl_buf_workspace);
+      }
+      lrn_res[dnnResourceWorkspace] = mkl_buf_workspace;
+    }
+
+    // Fallback implementation - Taken from lrn_op.cc
+    // TODO(intelft) Check if we can use EigenLRNOp directly instead of making a
+    // copy.
+    void MklDefaultToEigen(OpKernelContext* context, int depth_radius_,
+                           float bias_, float alpha_, float beta_,
+                           const Tensor& input) {
+      const int batch = static_cast<int>(input.dim_size(0));
+      const int rows = static_cast<int>(input.dim_size(1));
+      const int cols = static_cast<int>(input.dim_size(2));
+      const int depth = static_cast<int>(input.dim_size(3));
+      const int nodes = cols * rows;
+
+      auto in_shaped = input.shaped<T, 2>({nodes * batch, depth});
+      // Multiplying the input with the band matrix has the effect of reducing
+      // the
+      // correct patch along the depth.
+      Eigen::Tensor<T, 2, Eigen::RowMajor> multiplier(depth, depth);
+      GetBandMatrix<T>(depth, depth_radius_, &multiplier);
+
+      Tensor *output, *workspace;
+      MklShape mkl_output_mkl_shape, mkl_workspace_mkl_shape;
+      mkl_output_mkl_shape.SetMklTensor(false);
+      mkl_output_mkl_shape.SetDimensions(4);
+      AllocateOutputSetMklShape(context, 0, &output, input.shape(),
+                                mkl_output_mkl_shape);
+
+      mkl_workspace_mkl_shape.SetMklTensor(false);
+      mkl_workspace_mkl_shape.SetDimensions(4);
+      AllocateOutputSetMklShape(context, 1, &workspace, input.shape(),
+                                mkl_workspace_mkl_shape);
+
+      auto out_shaped = output->shaped<T, 2>({nodes * batch, depth});
+      Eigen::array<DimPair, 1> dims = {{DimPair(1, 0)}};
+      auto tmp = in_shaped.square().contract(multiplier, dims) * alpha_ + bias_;
+      if (beta_ == T(1)) {
+        out_shaped.device(context->eigen_cpu_device()) =
+            in_shaped * tmp.inverse();
+      } else if (beta_ == T(0.5)) {
+        out_shaped.device(context->eigen_cpu_device()) =
+            in_shaped * tmp.rsqrt();
+      } else {
+        out_shaped.device(context->eigen_cpu_device()) =
+            in_shaped * (tmp.log() * -beta_).exp();
+      }
+    }
+
+    // Release MKL resources.
+    void MklCleanup() {
+      dnnDelete_F32(lrn_fwd);
+      dnnLayoutDelete_F32(lt_internal_input);
+      dnnLayoutDelete_F32(lt_internal_workspace);
+      dnnLayoutDelete_F32(lt_internal_output);
+    }
+  } MklLRNOpContext;
+
+  typedef typename Eigen::Tensor<T, 1, Eigen::RowMajor>::DimensionPair DimPair;
+
+  bool workspace_enabled_;
+  int depth_radius_;
+  float bias_;
+  float alpha_;
+  float beta_;
+};
+
+template <typename T>
+class MklLRNGradOp : public OpKernel {
+ public:
+  explicit MklLRNGradOp(OpKernelConstruction* context) : OpKernel(context) {
+    int64 depth_radius64;
+    OP_REQUIRES_OK(context, context->GetAttr("depth_radius", &depth_radius64));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(depth_radius64, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("depth_radius = ", depth_radius64,
+                                " larger than int max"));
+    depth_radius_ = static_cast<int>(depth_radius64);
+    OP_REQUIRES_OK(context, context->GetAttr("bias", &bias_));
+    OP_REQUIRES_OK(context, context->GetAttr("alpha", &alpha_));
+    OP_REQUIRES_OK(context, context->GetAttr("beta", &beta_));
+    workspace_enabled_ = false;
+    context->GetAttr("workspace_enabled", &workspace_enabled_);
+  }
+
+  void Compute(OpKernelContext* context) override {
+    MklLRNGradOpContext mkl_context;
+    mkl_context.depth_radius_ = depth_radius_;
+    mkl_context.bias_ = bias_;
+    mkl_context.alpha_ = alpha_;
+    mkl_context.beta_ = beta_;
+
+    const Tensor& in_grads = MklGetInput(context, 0);
+    const Tensor& in_image = MklGetInput(context, 1);
+    const Tensor& out_image = MklGetInput(context, 2);
+
+    GetMklShape(context, 0, &mkl_context.ingrad_shape);
+    GetMklShape(context, 1, &mkl_context.inimage_shape);
+    GetMklShape(context, 2, &mkl_context.outimage_shape);
+
+    bool ingrad_in_mkl_format = mkl_context.ingrad_shape.IsMklTensor();
+    bool inimage_in_mkl_format = mkl_context.inimage_shape.IsMklTensor();
+    bool outimage_in_mkl_format = mkl_context.outimage_shape.IsMklTensor();
+
+    mkl_context.in_dims = inimage_in_mkl_format
+                              ? mkl_context.inimage_shape.GetDimension()
+                              : in_image.dims();
+    OP_REQUIRES(context, mkl_context.in_dims == 4,
+                errors::InvalidArgument("input images must be 4-dimensional"));
+
+    if (!workspace_enabled_) {
+      mkl_context.MklDefaultToEigen(context);
+      return;
+    }
+    if (ingrad_in_mkl_format || inimage_in_mkl_format) {
+      const MklShape* tmp_mkl_shape = (ingrad_in_mkl_format)
+                                          ? &mkl_context.ingrad_shape
+                                          : &mkl_context.inimage_shape;
+      if (tmp_mkl_shape->tf_dim_idx(mkl_context.in_dims - 1) != MklDims::C) {
+        // Fallback to eigen
+        mkl_context.MklDefaultToEigen(context);
+        return;
+      } else {  // MKL supports normalization over channel dimension only
+        for (int i = 0; i < mkl_context.in_dims; i++) {
+          mkl_context.in_sizes[i] = mkl_context.out_sizes[i] =
+              tmp_mkl_shape->GetSizes()[i];
+          mkl_context.in_strides[i] = mkl_context.out_strides[i] =
+              tmp_mkl_shape->GetStrides()[i];
+        }
+      }
+    } else {
+      // Fallback to eigen
+      mkl_context.MklDefaultToEigen(context);
+      return;
+    }
+
+    // Dimensions check for sanity purpose
+    if (ingrad_in_mkl_format) {
+      OP_REQUIRES(
+          context, mkl_context.ingrad_shape.GetDimension() == 4,
+          errors::InvalidArgument("input gradient must be 4-dimensional"));
+    } else {
+      OP_REQUIRES(
+          context, in_grads.dims() == 4,
+          errors::InvalidArgument("input gradient must be 4-dimensional"));
+    }
+
+    if (outimage_in_mkl_format) {
+      OP_REQUIRES(
+          context, mkl_context.outimage_shape.GetDimension() == 4,
+          errors::InvalidArgument("Output image must be 4-dimensional"));
+    } else {
+      OP_REQUIRES(
+          context, out_image.dims() == 4,
+          errors::InvalidArgument("Output image must be 4-dimensional"));
+    }
+
+    // Prepare mkl input layout
+    mkl_context.MklPrepareLRNInputsLayouts(context);
+    int ksize = 2 * depth_radius_ + 1;
+
+    CHECK_EQ(dnnLRNCreateBackward_F32(
+                 &mkl_context.lrn_bwd, NULL, mkl_context.lt_input,
+                 mkl_context.lt_output, ksize,
+                 static_cast<float>(alpha_ * ksize), beta_, bias_),
+             E_SUCCESS);
+
+    // Allocate output tensor and shape.
+    TensorShape mkl_output_tf_shape; /* First tensor */
+    MklShape mkl_output_mkl_shape;   /* Second tensor */
+    mkl_output_mkl_shape.SetMklTensor(true);
+    CHECK_NE(mkl_context.lrn_bwd, nullptr);
+    mkl_output_mkl_shape.SetMklLayout(mkl_context.lrn_bwd, dnnResourceDiffSrc);
+    mkl_output_mkl_shape.SetTfLayout(mkl_context.in_dims, mkl_context.out_sizes,
+                                     mkl_context.out_strides);
+    if (ingrad_in_mkl_format) {
+      mkl_output_mkl_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.ingrad_shape.GetTfToMklDimMap());
+    } else {
+      mkl_output_mkl_shape.SetTfDimOrder(
+          mkl_context.in_dims, mkl_context.inimage_shape.GetTfToMklDimMap());
+    }
+    mkl_output_tf_shape.AddDim(
+        dnnLayoutGetMemorySize_F32(
+            static_cast<dnnLayout_t>(mkl_output_mkl_shape.GetMklLayout())) /
+        sizeof(T));
+    Tensor* output = nullptr;
+    AllocateOutputSetMklShape(context, 0, &output, mkl_output_tf_shape,
+                              mkl_output_mkl_shape);
+
+    // Get pointers to output data.
+    void* user_output =
+        const_cast<void*>(static_cast<const void*>(output->flat<T>().data()));
+
+    Tensor mkl_tmp_input_buf_tensor, mkl_tmp_image_buf_tensor,
+        mkl_tmp_outimage_buf_tensor, mkl_tmp_workspace_buf_tensor;
+    // Convert Inputs if needed
+    mkl_context.MklPrepareLRNGradInput(
+        context, &mkl_tmp_input_buf_tensor, &mkl_tmp_image_buf_tensor,
+        &mkl_tmp_outimage_buf_tensor, &mkl_tmp_workspace_buf_tensor);
+
+    // We do not do any conversion for output. But we simply emit it
+    // in MKL format.
+    mkl_context.res_lrn_bwd[dnnResourceDiffSrc] = user_output;
+    // Execute LRN backward using dnnExecute
+    CHECK_EQ(dnnExecute_F32(mkl_context.lrn_bwd, mkl_context.res_lrn_bwd),
+             E_SUCCESS);
+    // Release MKL resources.
+    mkl_context.Mklcleanup();
+  }
+
+ private:
+  typedef struct {
+    int depth_radius_;
+    float bias_;
+    float alpha_;
+    float beta_;
+    size_t in_dims;
+    size_t in_sizes[4];
+    size_t in_strides[4];
+    size_t out_sizes[4];
+    size_t out_strides[4];
+    MklShape ingrad_shape, inimage_shape, outimage_shape;
+    dnnPrimitive_t lrn_bwd = nullptr;
+    dnnPrimitive_t convert_input = nullptr;
+    /* dnnPrimitive_t convert_output; */
+    dnnLayout_t lt_input = nullptr;
+    dnnLayout_t lt_output = nullptr;
+    dnnLayout_t lt_bdw_input = nullptr;
+    dnnLayout_t lt_workspace = nullptr;
+    dnnLayout_t lt_internal_input = nullptr;
+    /* dnnLayout_t lt_internal_workspace;
+    dnnLayout_t lt_internal_output; */
+    void* res_lrn_bwd[dnnResourceNumber];
+
+    // prepare mkl input
+    void MklPrepareLRNInputsLayouts(OpKernelContext* context) {
+      bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
+      bool inimage_in_mkl_format = inimage_shape.IsMklTensor();
+      if (!ingrad_in_mkl_format) {
+        CHECK_EQ(dnnLayoutCreate_F32(&lt_input, in_dims, in_sizes, in_strides),
+                 E_SUCCESS);
+      } else {
+        lt_input = static_cast<dnnLayout_t>(ingrad_shape.GetCurLayout());
+      }
+
+      if (!inimage_in_mkl_format) {
+        CHECK_EQ(
+            dnnLayoutCreate_F32(&lt_output, in_dims, out_sizes, out_strides),
+            E_SUCCESS);
+      } else {
+        lt_output = static_cast<dnnLayout_t>(inimage_shape.GetCurLayout());
+      }
+    }
+
+    // convert input if needed
+    void MklPrepareLRNGradInput(OpKernelContext* context,
+                                Tensor* mkl_tmp_input_buf_tensor,
+                                Tensor* mkl_tmp_image_buf_tensor,
+                                Tensor* mkl_tmp_outimage_buf_tensor,
+                                Tensor* mkl_tmp_workspace_buf_tensor) {
+      const Tensor& in_grads = MklGetInput(context, 0);
+      const Tensor& in_image = MklGetInput(context, 1);
+      const Tensor& out_image = MklGetInput(context, 2);
+
+      void* user_input = const_cast<void*>(
+          static_cast<const void*>(in_grads.flat<T>().data()));
+      void* user_fwd_input = const_cast<void*>(
+          static_cast<const void*>(in_image.flat<T>().data()));
+      void* user_fwd_output = const_cast<void*>(
+          static_cast<const void*>(out_image.flat<T>().data()));
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_workspace, lrn_bwd,
+                                                dnnResourceWorkspace),
+               E_SUCCESS);
+      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_bdw_input, lrn_bwd,
+                                                dnnResourceDiffDst),
+               E_SUCCESS);
+
+      bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
+      if (ingrad_in_mkl_format) {
+        if (!dnnLayoutCompare_F32(lt_bdw_input, lt_input)) {
+          AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, lt_bdw_input,
+                         &res_lrn_bwd[dnnResourceDiffDst]);
+          ingrad_shape.GetConvertedFlatData(lt_bdw_input, user_input,
+                                            res_lrn_bwd[dnnResourceDiffDst]);
+        } else {
+          res_lrn_bwd[dnnResourceDiffDst] = user_input;
+        }
+      } else {
+        if (!dnnLayoutCompare_F32(lt_bdw_input, lt_input)) {
+          CHECK_EQ(
+              dnnConversionCreate_F32(&convert_input, lt_input, lt_bdw_input),
+              E_SUCCESS);
+
+          AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, lt_bdw_input,
+                         &res_lrn_bwd[dnnResourceDiffDst]);
+          CHECK_EQ(dnnConversionExecute_F32(convert_input, user_input,
+                                            res_lrn_bwd[dnnResourceDiffDst]),
+                   E_SUCCESS);
+          dnnDelete_F32(convert_input);
+        } else {
+          res_lrn_bwd[dnnResourceDiffDst] = user_input;
+        }
+      }
+
+// Although MKL documentation for LRN does not specify setting/getting
+// of dnnResourceSrc and dnnResourceDst, Caffe code sets dnnResourceSrc.
+// So we set dnnResourceSrc here. But we do not know why we are setting
+// dnnResourceDst.
+#if 0
+    // NOTE: The code below is kept just so that we know how we should handle
+    // dnnResourceSrc if the primitive layout for dnnResourceSrc was supported.
+
+    if (!dnnLayoutCompare_F32(lt_internal_input,
+         static_cast<dnnLayout_t>inimage_shape.GetCurLayout())) {
+      AllocTmpBuffer(context, mkl_tmp_image_buf_tensor, lt_internal_input,
+                     &res_lrn_bwd[dnnResourceSrc]);
+      inimage_shape.GetConvertedFlatData(lt_internal_input,
+                                           user_fwd_input,
+                                           res_lrn_bwd[dnnResourceSrc]);
+    } else {
+      res_lrn_bwd[dnnResourceSrc] = user_fwd_input;
+    }
+#endif
+
+      // Since we cannot get expected layout for dnnResourceSrc, we construct
+      // buffer using
+      // MKL format if input is in MKL format.
+      if (inimage_shape.IsMklTensor()) {
+        AllocTmpBuffer(context, mkl_tmp_image_buf_tensor,
+                       (dnnLayout_t)inimage_shape.GetCurLayout(),
+                       &res_lrn_bwd[dnnResourceSrc]);
+      } else {
+        res_lrn_bwd[dnnResourceSrc] = user_fwd_input;
+      }
+
+      // Same comment as above.
+      if (outimage_shape.IsMklTensor()) {
+        AllocTmpBuffer(context, mkl_tmp_outimage_buf_tensor,
+                       (dnnLayout_t)outimage_shape.GetCurLayout(),
+                       &res_lrn_bwd[dnnResourceDst]);
+      } else {
+        res_lrn_bwd[dnnResourceDst] = user_fwd_output;
+      }
+
+      // Allocate buffer for workspace.
+      AllocTmpBuffer(context, mkl_tmp_workspace_buf_tensor, lt_workspace,
+                     &res_lrn_bwd[dnnResourceWorkspace]);
+    }
+
+    // Fallback implementation - Taken from lrn_op.cc
+    // TODO(intelft) Check if we can use EigenLRNOp directly instead of making a
+    // copy.
+    void MklDefaultToEigen(OpKernelContext* context) {
+      // CHECK(false);
+      Tensor in_grads = MklGetInput(context, 0);
+      Tensor in_image = MklGetInput(context, 1);
+      Tensor out_image = MklGetInput(context, 2);
+
+      GetMklShape(context, 0, &ingrad_shape);
+      GetMklShape(context, 1, &inimage_shape);
+      GetMklShape(context, 2, &outimage_shape);
+
+      const int64 batch = static_cast<int64>(in_grads.dim_size(0));
+      const int64 rows = static_cast<int64>(in_grads.dim_size(1));
+      const int64 cols = static_cast<int64>(in_grads.dim_size(2));
+      const int64 depth = static_cast<int64>(in_grads.dim_size(3));
+      const auto nodes = cols * rows;
+
+      auto grads_shaped = in_grads.shaped<T, 2>({nodes * batch, depth});
+      auto in_shaped = in_image.shaped<T, 2>({nodes * batch, depth});
+      auto activations = out_image.shaped<T, 2>({nodes * batch, depth});
+
+      Tensor* output;
+      MklShape mkl_output_mkl_shape;
+      mkl_output_mkl_shape.SetMklTensor(false);
+      mkl_output_mkl_shape.SetDimensions(4);
+      AllocateOutputSetMklShape(context, 0, &output, in_grads.shape(),
+                                mkl_output_mkl_shape);
+
+      auto out_shaped = output->shaped<T, 2>({nodes * batch, depth});
+      out_shaped.setZero();
+      auto shard = [this, activations, in_shaped, grads_shaped, out_shaped,
+                    depth](int64 begin, int64 end) {
+        for (int64 i = begin; i < end; ++i) {
+          for (int64 j = 0; j < depth; ++j) {
+            int64 depth_begin = std::max<int64>(0, j - depth_radius_);
+            int64 depth_end = std::min<int64>(depth, j + depth_radius_ + 1);
+
+            T norm(0);
+            for (int64 k = depth_begin; k < depth_end; ++k) {
+              norm += in_shaped(i, k) * in_shaped(i, k);
+            }
+            norm = alpha_ * norm + bias_;
+            DCHECK_GT(norm, T(1e-6));
+            for (int64 k = depth_begin; k < depth_end; ++k) {
+              T dyi = T(-2) * alpha_ * beta_ * in_shaped(i, k) *
+                      activations(i, j) / norm;
+              if (k == j) {
+                dyi += Eigen::numext::pow(norm, -beta_);
+              }
+              dyi *= grads_shaped(i, j);
+              const_cast<typename TTypes<T, 2>::Tensor&>(out_shaped)(i, k) +=
+                  dyi;
+            }
+          }
+        }
+      };
+      auto worker_threads =
+          *(context->device()->tensorflow_cpu_worker_threads());
+      Shard(worker_threads.num_threads, worker_threads.workers, nodes * batch,
+            depth * depth, shard);
+    }
+
+    // release mkl resources
+    void Mklcleanup() {
+      bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
+      bool inimage_in_mkl_format = inimage_shape.IsMklTensor();
+      if (!ingrad_in_mkl_format) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_input), E_SUCCESS);
+      }
+
+      if (!inimage_in_mkl_format) {
+        CHECK_EQ(dnnLayoutDelete_F32(lt_output), E_SUCCESS);
+      }
+      dnnDelete_F32(lrn_bwd);
+      dnnLayoutDelete_F32(lt_bdw_input);
+      dnnLayoutDelete_F32(lt_workspace);
+    }
+  } MklLRNGradOpContext;
+
+  typedef typename Eigen::Tensor<T, 1, Eigen::RowMajor>::DimensionPair DimPair;
+  bool workspace_enabled_;
+  int depth_radius_;
+  float bias_;
+  float alpha_;
+  float beta_;
+};
+
+#define REGISTER_MKL_LRN_CPU(T)                                     \
+  REGISTER_KERNEL_BUILDER(Name("_MklLRN")                            \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklLRNOp<T>);                             \
+  REGISTER_KERNEL_BUILDER(Name("_MklLRNGrad")                        \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklLRNGradOp<T>);
+
+TF_CALL_float(REGISTER_MKL_LRN_CPU);
+
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index 9d6cfb0c97..e27881f882 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -83,10 +83,11 @@ class MklMaxPoolingOp : public OpKernel {
     ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
 
     mkl_context.MklCreateLayoutsAndPrimitives(context);
+    OP_REQUIRES_OK(context, context->status());
 
     // Declare output tensor
     TensorShape tensor_out_shape;
-    MklShape mkl_out_shape;
+    MklShape mkl_out_shape, mkl_workspace_shape;
     mkl_out_shape.SetMklTensor(true);
     mkl_out_shape.SetMklLayout(mkl_context.prim_pooling_fwd, dnnResourceDst);
     mkl_out_shape.SetTfLayout(mkl_context.params.in_dim,
@@ -98,31 +99,22 @@ class MklMaxPoolingOp : public OpKernel {
     tensor_out_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                                 mkl_out_shape.GetMklLayout())) /
                             sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output_tensor, tensor_out_shape,
+    AllocateOutputSetMklShape(context, 0, &output_tensor, tensor_out_shape,
                               mkl_out_shape);
 
-    if (!workspace_enabled_) {
-      mkl_out_shape.SetMklTensor(false);
-    }
-
     Tensor* workspace_tensor;
     void* workspace_buf = nullptr;
-    if (workspace_enabled_) {
-      TensorShape workspace_shape;
-      workspace_shape.AddDim(
-          dnnLayoutGetMemorySize_F32(
-              static_cast<dnnLayout_t>(mkl_context.lt_workspace)) /
-          sizeof(T));
-      AllocateOutputSetMklshape(context, 1, &workspace_tensor, workspace_shape,
-                                mkl_out_shape);
-      mkl_context.pooling_res[dnnResourceWorkspace] = const_cast<void*>(
-          static_cast<const void*>(workspace_tensor->flat<T>().data()));
-    } else {
-      AllocTmpBuffer(context, workspace_tensor, mkl_context.lt_workspace,
-                     &workspace_buf);
-      mkl_context.pooling_res[dnnResourceWorkspace] = workspace_buf;
-    }
 
+    TensorShape workspace_shape;
+    mkl_workspace_shape.SetMklTensor(false);
+    workspace_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
+                               mkl_context.lt_workspace)) /
+                           sizeof(T));
+    AllocateOutputSetMklShape(context, 1, &workspace_tensor, workspace_shape,
+                              mkl_workspace_shape);
+
+    mkl_context.pooling_res[dnnResourceWorkspace] = const_cast<void*>(
+        static_cast<const void*>(workspace_tensor->flat<T>().data()));
     mkl_context.pooling_res[dnnResourceSrc] =
         const_cast<void*>(static_cast<const void*>(tensor_in.flat<T>().data()));
     mkl_context.pooling_res[dnnResourceDst] = const_cast<void*>(
@@ -140,8 +132,8 @@ class MklMaxPoolingOp : public OpKernel {
     MklPoolingOpParams params;
     MklShape input_shape;
     void* pooling_res[dnnResourceNumber];
-    dnnPrimitive_t prim_pooling_fwd;
-    dnnLayout_t lt_user_input, lt_workspace;
+    dnnPrimitive_t prim_pooling_fwd = nullptr;
+    dnnLayout_t lt_user_input = nullptr, lt_workspace = nullptr;
 
     void MklCreateLayoutsAndPrimitives(OpKernelContext* context) {
       bool input_in_mkl_format = input_shape.IsMklTensor();
@@ -256,8 +248,13 @@ class MklMaxPoolingGradOp : public OpKernel {
     ExtractMklOpParams(context, data_format_, pool_params, &mkl_context.params);
 
     mkl_context.MklCreateLayouts(context);
+    OP_REQUIRES_OK(context, context->status());
+
     mkl_context.MklCreatePrimitives(context, workspace_enabled_);
+    OP_REQUIRES_OK(context, context->status());
+
     mkl_context.MklPrepareInputs(context, workspace_enabled_);
+    OP_REQUIRES_OK(context, context->status());
 
     // Create shape for the input back prop output
     TensorShape mkl_input_backprop;
@@ -274,7 +271,7 @@ class MklMaxPoolingGradOp : public OpKernel {
         dnnLayoutGetMemorySize_F32(
             static_cast<dnnLayout_t>(mkl_output_shape.GetMklLayout())) /
         sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output_tensor, mkl_input_backprop,
+    AllocateOutputSetMklShape(context, 0, &output_tensor, mkl_input_backprop,
                               mkl_output_shape);
     mkl_context.pooling_res[dnnResourceDiffSrc] = const_cast<void*>(
         static_cast<const void*>(output_tensor->flat<T>().data()));
@@ -297,12 +294,15 @@ class MklMaxPoolingGradOp : public OpKernel {
     MklShape input_shape, output_backprop_shape;
     void* pooling_resfwd[dnnResourceNumber];
     void* pooling_res[dnnResourceNumber];
-    dnnPrimitive_t prim_pooling_fwd, prim_pooling_bwd, convert_input,
-        convert_outbackprop;
-    dnnLayout_t lt_outbackprop_user, lt_outbackprop_prim, lt_input_user,
-        lt_input_prim;
+    dnnPrimitive_t prim_pooling_fwd = nullptr, prim_pooling_bwd = nullptr,
+                   convert_input = nullptr, convert_outbackprop = nullptr;
+    dnnLayout_t lt_outbackprop_user = nullptr, lt_outbackprop_prim = nullptr,
+                lt_input_user = nullptr, lt_input_prim = nullptr;
     void* input_buf;
     void* outbackprop_buf;
+    Tensor tmp_output_buf_tensor;
+    Tensor workspace_buf_tensor;
+    Tensor input_buf_tensor, outbackprop_buf_tensor;
 
     void MklCreateLayouts(OpKernelContext* context) {
       bool input_in_mkl_format = input_shape.IsMklTensor();
@@ -351,9 +351,6 @@ class MklMaxPoolingGradOp : public OpKernel {
                    &lt_outbackprop_prim, prim_pooling_bwd, dnnResourceDiffDst),
                E_SUCCESS);
 
-      // Tensors needed to create temporary buffers
-      Tensor input_buf_tensor, outbackprop_buf_tensor;
-
       if (workspace_enabled == false) {
         CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
                      &lt_input_prim, prim_pooling_fwd, dnnResourceSrc),
@@ -384,11 +381,8 @@ class MklMaxPoolingGradOp : public OpKernel {
       bool input_in_mkl_format = input_shape.IsMklTensor();
       bool outbackprop_in_mkl_format = output_backprop_shape.IsMklTensor();
 
-      void* tmp_output_buf;
-      Tensor tmp_output_buf_tensor;
-
-      void* workspace_buf;
-      Tensor workspace_buf_tensor;
+      void* tmp_output_buf = nullptr;
+      void* workspace_buf = nullptr;
 
       if (workspace_enabled == false) {
         if (convert_input != nullptr) {
@@ -490,16 +484,16 @@ class MklMaxPoolingGradOp : public OpKernel {
   bool workspace_enabled_;
 };
 
-REGISTER_KERNEL_BUILDER(Name("MklMaxPool")
+REGISTER_KERNEL_BUILDER(Name("_MklMaxPool")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklMaxPoolingOp<CPUDevice, float>);
 
-REGISTER_KERNEL_BUILDER(Name("MklMaxPoolGrad")
+REGISTER_KERNEL_BUILDER(Name("_MklMaxPoolGrad")
                             .Device(DEVICE_CPU)
                             .TypeConstraint<float>("T")
-                            .Label(mkl_layer_registry::kMklLayerLabel),
+                            .Label(mkl_op_registry::kMklOpLabel),
                         MklMaxPoolingGradOp<CPUDevice, float>);
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc
index 7809711524..25c8359cc5 100644
--- a/tensorflow/core/kernels/mkl_relu_op.cc
+++ b/tensorflow/core/kernels/mkl_relu_op.cc
@@ -63,7 +63,7 @@ class MklReluOp : public OpKernel {
       const TensorShape& o_shape = input.shape();
       Tensor* out_tensor = nullptr;
       mkl_context.output_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &out_tensor, o_shape,
+      AllocateOutputSetMklShape(context, 0, &out_tensor, o_shape,
                                 mkl_context.output_shape);
       void* out_o = static_cast<void*>(out_tensor->flat<T>().data());
       (static_cast<T*>(out_o))[0] =
@@ -114,12 +114,12 @@ class MklReluOp : public OpKernel {
       tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                           mkl_context.output_shape.GetMklLayout())) /
                       sizeof(T));
-      AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+      AllocateOutputSetMklShape(context, 0, &output, tf_shape,
                                 mkl_context.output_shape);
     } else {
       const TensorShape& o_shape = input.shape();
       mkl_context.output_shape.SetMklTensor(false);
-      AllocateOutputSetMklshape(context, 0, &output, o_shape,
+      AllocateOutputSetMklShape(context, 0, &output, o_shape,
                                 mkl_context.output_shape);
     }
 
@@ -293,7 +293,7 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
     // Allocate space for g and
     const TensorShape& g_shape = g.shape();
     mkl_context.output_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &output, g_shape,
+    AllocateOutputSetMklShape(context, 0, &output, g_shape,
                               mkl_context.output_shape);
     void* out_o = static_cast<void*>(output->flat<T>().data());
     (static_cast<T*>(out_o))[0] =
@@ -359,13 +359,13 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
     tf_shape.AddDim(dnnLayoutGetMemorySize_F32(static_cast<dnnLayout_t>(
                         mkl_context.output_shape.GetMklLayout())) /
                     sizeof(T));
-    AllocateOutputSetMklshape(context, 0, &output, tf_shape,
+    AllocateOutputSetMklShape(context, 0, &output, tf_shape,
                               mkl_context.output_shape);
 
   } else {
     const TensorShape& o_shape = g.shape();
     mkl_context.output_shape.SetMklTensor(false);
-    AllocateOutputSetMklshape(context, 0, &output, o_shape,
+    AllocateOutputSetMklShape(context, 0, &output, o_shape,
                               mkl_context.output_shape);
   }
 
@@ -379,16 +379,16 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
 
 /* Register DNN kernels for supported operations and supported types - right now
  * it is only Relu and f32*/
-#define REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES(type)                   \
-  REGISTER_KERNEL_BUILDER(Name("MklRelu")                                 \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<type>("T")                  \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
-                          MklReluOp<CPUDevice, type>);                    \
-  REGISTER_KERNEL_BUILDER(Name("MklReluGrad")                             \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<type>("T")                  \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+#define REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES(type)             \
+  REGISTER_KERNEL_BUILDER(Name("_MklRelu")                           \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<type>("T")            \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklReluOp<CPUDevice, type>);              \
+  REGISTER_KERNEL_BUILDER(Name("_MklReluGrad")                       \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<type>("T")            \
+                              .Label(mkl_op_registry::kMklOpLabel), \
                           MklReluGradOp<CPUDevice, type>);
 TF_CALL_float(REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES);
 
diff --git a/tensorflow/core/kernels/mkl_reshape_op.cc b/tensorflow/core/kernels/mkl_reshape_op.cc
new file mode 100644
index 0000000000..753a8b52b4
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_reshape_op.cc
@@ -0,0 +1,149 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifdef INTEL_MKL
+
+#include <memory>
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/logging.h"
+
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
+
+namespace tensorflow {
+using CPUDevice = Eigen::ThreadPoolDevice;
+template <typename Device, typename T>
+class MklReshapeOp : public OpKernel {
+ public:
+  explicit MklReshapeOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input = MklGetInput(context, 0);
+    const Tensor& sizes = MklGetInput(context, 1);
+
+    // Preliminary validation of sizes.
+    OP_REQUIRES(context, IsLegacyVector(sizes.shape()),
+                errors::InvalidArgument("sizes input must be 1-D, not shape ",
+                                        sizes.shape().DebugString()));
+    const int64 num_dims = sizes.NumElements();
+
+    // Compute the output shape.  Determine product of specified
+    // dimensions, and find the index of the unspecified one.
+    TensorShape shape;
+    int64 product = 1;
+    int unknown_index = -1;
+    auto vec_size = sizes.flat<int32>();
+    for (int d = 0; d < num_dims; ++d) {
+      const int32 size = vec_size(d);
+      if (size == -1) {
+        OP_REQUIRES(
+            context, unknown_index == -1,
+            errors::InvalidArgument("only one input size may be -1, not both ",
+                                    unknown_index, " and ", d));
+        unknown_index = d;
+        shape.AddDim(1);
+      } else {
+        OP_REQUIRES(context, size >= 0,
+                    errors::InvalidArgument(
+                        "size ", d, " must be non-negative, not ", size));
+        shape.AddDim(size);
+        product *= size;
+      }
+    }
+    if (unknown_index != -1) {
+      OP_REQUIRES(
+          context, product > 0,
+          errors::InvalidArgument("Reshape cannot infer the missing input size "
+                                  "for an empty tensor unless all specified "
+                                  "input sizes are non-zero"));
+      const int64 missing = input.NumElements() / product;
+      OP_REQUIRES(
+          context, product * missing == input.NumElements(),
+          errors::InvalidArgument(
+              "Input to reshape is a tensor with ", input.NumElements(),
+              " values, but the requested shape requires a multiple of ",
+              product));
+      shape.set_dim(unknown_index, missing);
+    }
+    OP_REQUIRES(context, shape.num_elements() == input.NumElements(),
+                errors::InvalidArgument("Input to reshape is a tensor with ",
+                                        input.NumElements(),
+                                        " values, but the requested shape has ",
+                                        shape.num_elements()));
+
+    MklShape mkl_shape_input;
+    GetMklShape(context, 0, &mkl_shape_input);
+    bool input_in_mkl_format = mkl_shape_input.IsMklTensor();
+    if (input_in_mkl_format) {
+      TensorShape& shape_to = shape;
+      TensorShape shape_from;
+      for (size_t i = 0; i < mkl_shape_input.GetDimension(); i++) {
+        // Outermost to innermost dimension
+        shape_from.AddDim(
+            mkl_shape_input.GetSizes()[mkl_shape_input.tf_dim_idx(i)]);
+      }
+
+      if (shape_from == shape_to) {
+        CopyMklTensorInToOut(context, 0, 0);
+        return;
+      } else {
+        // Allocate output tensor.
+        Tensor* output_tensor = NULL;
+        MklShape mkl_shape_output;
+        mkl_shape_output.SetMklTensor(false);
+        AllocateOutputSetMklShape(context, 0, &output_tensor, shape_to,
+                                  mkl_shape_output);
+
+        // Get output layout pointer.
+        dnnLayout_t output_layout =
+            static_cast<dnnLayout_t>(mkl_shape_input.GetTfLayout());
+
+        // Execute DNNConversion.
+        // Note: we  assume an MKL tensor always have float as its data type.
+        void* input_buffer =
+            static_cast<void*>(const_cast<float*>(input.flat<float>().data()));
+        void* output_buffer = static_cast<void*>(
+            const_cast<float*>(output_tensor->flat<float>().data()));
+        mkl_shape_input.GetConvertedFlatData(output_layout, input_buffer,
+                                             output_buffer);
+
+        VLOG(1) << "MKLToTFConversion complete successfully.";
+        return;
+      }
+    } else {
+      CopyTFTensorInToOut(context, 0, 0, shape);
+    }
+  }
+};
+
+#define REGISTER_MKL_CPU(T)                                         \
+  REGISTER_KERNEL_BUILDER(Name("_MklReshape")                       \
+                              .Device(DEVICE_CPU)                   \
+                              .HostMemory("shape")                  \
+                              .TypeConstraint<T>("T")               \
+                              .TypeConstraint<int32>("Tshape")      \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklReshapeOp<CPUDevice, T>);
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+}  // namespace tensorflow
+
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_tfconv_op.cc b/tensorflow/core/kernels/mkl_tfconv_op.cc
index 51f90b3f90..c31ef5c255 100644
--- a/tensorflow/core/kernels/mkl_tfconv_op.cc
+++ b/tensorflow/core/kernels/mkl_tfconv_op.cc
@@ -105,11 +105,11 @@ class MklToTfOp : public OpKernel {
 //               Register kernel
 ///////////////////////////////////////////////////////////
 
-#define REGISTER_CPU(T)                                                   \
-  REGISTER_KERNEL_BUILDER(Name("MklToTf")                                 \
-                              .Device(DEVICE_CPU)                         \
-                              .TypeConstraint<T>("T")                     \
-                              .Label(mkl_layer_registry::kMklLayerLabel), \
+#define REGISTER_CPU(T)                                             \
+  REGISTER_KERNEL_BUILDER(Name("MklToTf")                           \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
                           MklToTfOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_CPU);
diff --git a/tensorflow/core/kernels/quantized_conv_ops.cc b/tensorflow/core/kernels/quantized_conv_ops.cc
index afa1f65aef..56a7e161df 100644
--- a/tensorflow/core/kernels/quantized_conv_ops.cc
+++ b/tensorflow/core/kernels/quantized_conv_ops.cc
@@ -233,9 +233,9 @@ class Im2ColConvFunctor {
     int filter_top_offset;
     if (padding == VALID) {
       filter_left_offset =
-          ((output_width - 1) * stride + filter_width - input_width) / 2;
+          ((output_width - 1) * stride + filter_width - input_width + 1) / 2;
       filter_top_offset =
-          ((output_height - 1) * stride + filter_height - input_height) / 2;
+          ((output_height - 1) * stride + filter_height - input_height + 1) / 2;
     } else {
       filter_left_offset =
           ((output_width - 1) * stride + filter_width - input_width) / 2;
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
index 2bcc7f407d..30026f222a 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
@@ -29,7 +29,7 @@ namespace tensorflow {
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
 
-template <typename Device, typename T>
+template <typename Device, typename T, typename Tindices>
 class SparseTensorDenseMatMulOp : public OpKernel {
  public:
   explicit SparseTensorDenseMatMulOp(OpKernelConstruction* ctx)
@@ -139,15 +139,14 @@ class SparseTensorDenseMatMulOp : public OpKernel {
                                              TensorShape({0}), &scratch));
     }
 
-#define MAYBE_ADJOINT(ADJ_A, ADJ_B)                                           \
-  if (adjoint_a_ == ADJ_A && adjoint_b_ == ADJ_B) {                           \
-    Status functor_status = functor::SparseTensorDenseMatMulFunctor<          \
-        Device, T, ADJ_A, ADJ_B>::Compute(ctx->eigen_device<Device>(),        \
-                                          out->matrix<T>(),                   \
-                                          a_indices->matrix<int64>(),         \
-                                          a_values->vec<T>(), b->matrix<T>(), \
-                                          scratch.vec<T>());                  \
-    OP_REQUIRES_OK(ctx, functor_status);                                      \
+#define MAYBE_ADJOINT(ADJ_A, ADJ_B)                                        \
+  if (adjoint_a_ == ADJ_A && adjoint_b_ == ADJ_B) {                        \
+    Status functor_status = functor::SparseTensorDenseMatMulFunctor<       \
+        Device, T, Tindices, ADJ_A,                                        \
+        ADJ_B>::Compute(ctx->eigen_device<Device>(), out->matrix<T>(),     \
+                        a_indices->matrix<Tindices>(), a_values->vec<T>(), \
+                        b->matrix<T>(), scratch.vec<T>());                 \
+    OP_REQUIRES_OK(ctx, functor_status);                                   \
   }
 
     MAYBE_ADJOINT(false, false);
@@ -163,53 +162,73 @@ class SparseTensorDenseMatMulOp : public OpKernel {
   bool adjoint_b_;
 };
 
-#define REGISTER_CPU(T)                                   \
-  REGISTER_KERNEL_BUILDER(Name("SparseTensorDenseMatMul") \
-                              .Device(DEVICE_CPU)         \
-                              .TypeConstraint<T>("T")     \
-                              .HostMemory("a_shape"),     \
-                          SparseTensorDenseMatMulOp<CPUDevice, T>);
-
-REGISTER_CPU(float);
-REGISTER_CPU(double);
-REGISTER_CPU(int32);
-REGISTER_CPU(complex64);
-REGISTER_CPU(complex128);
+#define REGISTER_CPU(TypeT, TypeIndex)           \
+  REGISTER_KERNEL_BUILDER(                       \
+      Name("SparseTensorDenseMatMul")            \
+          .Device(DEVICE_CPU)                    \
+          .TypeConstraint<TypeT>("T")            \
+          .TypeConstraint<TypeIndex>("Tindices") \
+          .HostMemory("a_shape"),                \
+      SparseTensorDenseMatMulOp<CPUDevice, TypeT, TypeIndex>);
+
+#define REGISTER_KERNELS_CPU(T) \
+  REGISTER_CPU(T, int64);       \
+  REGISTER_CPU(T, int32)
+
+REGISTER_KERNELS_CPU(float);
+REGISTER_KERNELS_CPU(double);
+REGISTER_KERNELS_CPU(int32);
+REGISTER_KERNELS_CPU(complex64);
+REGISTER_KERNELS_CPU(complex128);
 
 #if GOOGLE_CUDA
 
 namespace functor {
-#define DECLARE_GPU_SPEC(T, ADJ_A, ADJ_B)                                     \
-  template <>                                                                 \
-  Status SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B>::Compute( \
-      const GPUDevice& d, typename TTypes<T>::Matrix out,                     \
-      TTypes<int64>::ConstMatrix a_indices,                                   \
-      typename TTypes<T>::ConstVec a_values,                                  \
-      typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);    \
-  extern template struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A,  \
-                                                        ADJ_B>;
-
-#define DECLARE_ADJOINT_GPU_SPEC(T) \
-  DECLARE_GPU_SPEC(T, false, false) \
-  DECLARE_GPU_SPEC(T, false, true)  \
-  DECLARE_GPU_SPEC(T, true, false)  \
-  DECLARE_GPU_SPEC(T, true, true)
+#define DECLARE_GPU_SPEC(T, Tindices, ADJ_A, ADJ_B)                       \
+  template <>                                                             \
+  Status SparseTensorDenseMatMulFunctor<                                  \
+      GPUDevice, T, Tindices, ADJ_A,                                      \
+      ADJ_B>::Compute(const GPUDevice& d, typename TTypes<T>::Matrix out, \
+                      typename TTypes<Tindices>::ConstMatrix a_indices,   \
+                      typename TTypes<T>::ConstVec a_values,              \
+                      typename TTypes<T>::ConstMatrix b,                  \
+                      typename TTypes<T>::Vec scratch);                   \
+  extern template struct SparseTensorDenseMatMulFunctor<                  \
+      GPUDevice, T, Tindices, ADJ_A, ADJ_B>;
+
+#define REGISTER_GPU_SPEC(T, ADJ_A, ADJ_B)  \
+  DECLARE_GPU_SPEC(T, int32, ADJ_A, ADJ_B); \
+  DECLARE_GPU_SPEC(T, int64, ADJ_A, ADJ_B)
+
+#define DECLARE_ADJOINT_GPU_SPEC(T)  \
+  REGISTER_GPU_SPEC(T, false, false) \
+  REGISTER_GPU_SPEC(T, false, true)  \
+  REGISTER_GPU_SPEC(T, true, false)  \
+  REGISTER_GPU_SPEC(T, true, true)
 
 DECLARE_ADJOINT_GPU_SPEC(float);
 #undef DECLARE_ADJOINT_GPU_SPEC
 #undef DECLARE_GPU_SPEC
+#undef REGISTER_GPU_SPEC
 
 }  // namespace functor
 
-#define REGISTER_GPU(T)                                   \
-  REGISTER_KERNEL_BUILDER(Name("SparseTensorDenseMatMul") \
-                              .Device(DEVICE_GPU)         \
-                              .TypeConstraint<T>("T")     \
-                              .HostMemory("a_shape"),     \
-                          SparseTensorDenseMatMulOp<GPUDevice, T>);
+#define REGISTER_GPU(TypeT, TypeIndex)           \
+  REGISTER_KERNEL_BUILDER(                       \
+      Name("SparseTensorDenseMatMul")            \
+          .Device(DEVICE_GPU)                    \
+          .TypeConstraint<TypeT>("T")            \
+          .TypeConstraint<TypeIndex>("Tindices") \
+          .HostMemory("a_shape"),                \
+      SparseTensorDenseMatMulOp<GPUDevice, TypeT, TypeIndex>);
+
+#define REGISTER_KERNELS_GPU(T) \
+  REGISTER_GPU(T, int64);       \
+  REGISTER_GPU(T, int32)
 
-REGISTER_GPU(float);
+REGISTER_KERNELS_GPU(float);
 #undef REGISTER_GPU
+#undef REGISTER_KERNELS_GPU
 #endif  // GOOGLE_CUDA
 
 namespace functor {
@@ -228,13 +247,13 @@ Status MOutOfBoundsError(int64 m, std::size_t i, int lhs_index_a,
 }
 }  // namespace
 
-template <typename T, bool ADJ_A, bool ADJ_B>
-struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
+template <typename T, typename Tindices, bool ADJ_A, bool ADJ_B>
+struct SparseTensorDenseMatMulFunctor<CPUDevice, T, Tindices, ADJ_A, ADJ_B> {
   // Vectorize certain operations above this size.
   static const std::size_t kNumVectorize = 32;
 
   static Status Compute(const CPUDevice& d, typename TTypes<T>::Matrix out,
-                        TTypes<int64>::ConstMatrix a_indices,
+                        typename TTypes<Tindices>::ConstMatrix a_indices,
                         typename TTypes<T>::ConstVec a_values,
                         typename TTypes<T>::ConstMatrix b,
                         typename TTypes<T>::Vec scratch) {
@@ -255,8 +274,8 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
       auto maybe_adjoint_b = MaybeAdjoint<decltype(b), ADJ_B>(b);
 
       for (std::size_t i = 0; i < nnz; ++i) {
-        const int64 m = internal::SubtleMustCopy(a_indices(i, lhs_index_a));
-        const int64 k = internal::SubtleMustCopy(a_indices(i, rhs_index_a));
+        const Tindices m = internal::SubtleMustCopy(a_indices(i, lhs_index_a));
+        const Tindices k = internal::SubtleMustCopy(a_indices(i, rhs_index_a));
         if (!FastBoundsCheck(k, lhs_right)) {
           return KOutOfBoundsError(k, i, rhs_index_a, lhs_right);
         }
@@ -273,19 +292,19 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, ADJ_A, ADJ_B> {
       // Vectorization via Eigen.
       const int b_chip_index = ADJ_B ? 1 : 0;
 
-#define LOOP_NNZ(b_passed)                                               \
-  for (std::size_t i = 0; i < nnz; ++i) {                                \
-    const int64 m = internal::SubtleMustCopy(a_indices(i, lhs_index_a)); \
-    const int64 k = internal::SubtleMustCopy(a_indices(i, rhs_index_a)); \
-    const T a_value = (ADJ_A) ? MaybeConj(a_values(i)) : a_values(i);    \
-    if (!FastBoundsCheck(k, lhs_right)) {                                \
-      return KOutOfBoundsError(k, i, rhs_index_a, lhs_right);            \
-    }                                                                    \
-    if (!FastBoundsCheck(m, out.dimension(0))) {                         \
-      return MOutOfBoundsError(m, i, lhs_index_a, out.dimension(0));     \
-    }                                                                    \
-    out.template chip<0>(m) +=                                           \
-        b_passed.template chip<b_chip_index>(k) * a_value;               \
+#define LOOP_NNZ(b_passed)                                                  \
+  for (std::size_t i = 0; i < nnz; ++i) {                                   \
+    const Tindices m = internal::SubtleMustCopy(a_indices(i, lhs_index_a)); \
+    const Tindices k = internal::SubtleMustCopy(a_indices(i, rhs_index_a)); \
+    const T a_value = (ADJ_A) ? MaybeConj(a_values(i)) : a_values(i);       \
+    if (!FastBoundsCheck(k, lhs_right)) {                                   \
+      return KOutOfBoundsError(k, i, rhs_index_a, lhs_right);               \
+    }                                                                       \
+    if (!FastBoundsCheck(m, out.dimension(0))) {                            \
+      return MOutOfBoundsError(m, i, lhs_index_a, out.dimension(0));        \
+    }                                                                       \
+    out.template chip<0>(m) +=                                              \
+        b_passed.template chip<b_chip_index>(k) * a_value;                  \
   }
 
       if (ADJ_B) {
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
index bcb836367b..e707743f78 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
@@ -25,11 +25,12 @@ namespace tensorflow {
 
 namespace functor {
 
-template <typename Device, typename T, bool ADJ_A, bool ADJ_B>
+template <typename Device, typename T, typename Tindices, bool ADJ_A,
+          bool ADJ_B>
 struct SparseTensorDenseMatMulFunctor {
   static EIGEN_ALWAYS_INLINE Status
   Compute(const Device& d, typename TTypes<T>::Matrix out,
-          TTypes<int64>::ConstMatrix a_indices,
+          typename TTypes<Tindices>::ConstMatrix a_indices,
           typename TTypes<T>::ConstVec a_values,
           typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);
 };
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
index 07d218311e..7266e0cf81 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
@@ -27,12 +27,12 @@ typedef Eigen::GpuDevice GPUDevice;
 
 namespace generator {
 
-template <typename T, bool ADJ_A, bool ADJ_B>
+template <typename T, typename Tindices, bool ADJ_A, bool ADJ_B>
 class SparseTensorDenseMatMulGPUGenerator {
  public:
   EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE SparseTensorDenseMatMulGPUGenerator(
       typename TTypes<T, 2>::Tensor32Bit out,
-      TTypes<const int64, 2>::Tensor32Bit a_indices,
+      typename TTypes<const Tindices, 2>::Tensor32Bit a_indices,
       typename TTypes<const T, 1>::Tensor32Bit a_values,
       typename TTypes<const T, 2>::Tensor32Bit b)
       : out_(out),
@@ -77,7 +77,7 @@ class SparseTensorDenseMatMulGPUGenerator {
   mutable typename TTypes<T, 2>::Tensor32Bit out_;
   const int lhs_index_a_;
   const int rhs_index_a_;
-  TTypes<const int64, 2>::Tensor32Bit a_indices_;
+  typename TTypes<const Tindices, 2>::Tensor32Bit a_indices_;
   typename TTypes<const T, 1>::Tensor32Bit a_values_;
   const int lhs_right_size;
   functor::MaybeAdjoint<typename TTypes<const T, 2>::Tensor32Bit, ADJ_B>
@@ -88,14 +88,14 @@ class SparseTensorDenseMatMulGPUGenerator {
 
 namespace functor {
 
-template <typename T, bool ADJ_A, bool ADJ_B>
-struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B> {
+template <typename T, typename Tindices, bool ADJ_A, bool ADJ_B>
+struct SparseTensorDenseMatMulFunctor<GPUDevice, T, Tindices, ADJ_A, ADJ_B> {
   static EIGEN_ALWAYS_INLINE Status
   Compute(const GPUDevice& d, typename TTypes<T>::Matrix out,
-          TTypes<int64>::ConstMatrix a_indices,
+          typename TTypes<Tindices>::ConstMatrix a_indices,
           typename TTypes<T>::ConstVec a_values,
           typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch) {
-    generator::SparseTensorDenseMatMulGPUGenerator<T, ADJ_A, ADJ_B>
+    generator::SparseTensorDenseMatMulGPUGenerator<T, Tindices, ADJ_A, ADJ_B>
         sparse_tensor_dense_matmul_generator(To32Bit(out), To32Bit(a_indices),
                                              To32Bit(a_values), To32Bit(b));
     To32Bit(out).device(d) = To32Bit(out).constant(T(0));
@@ -146,17 +146,18 @@ struct SparseTensorDenseMatMulFunctor<GPUDevice, T, ADJ_A, ADJ_B> {
 
 }  // namespace functor
 
-#define DEFINE(T)                                                              \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, false, \
-                                                          false>;              \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, false, \
-                                                          true>;               \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, true,  \
-                                                          false>;              \
-  template struct functor::SparseTensorDenseMatMulFunctor<GPUDevice, T, true,  \
-                                                          true>;
-
-DEFINE(float);
+#define DEFINE(T, Tindices)                                \
+  template struct functor::SparseTensorDenseMatMulFunctor< \
+      GPUDevice, T, Tindices, false, false>;               \
+  template struct functor::SparseTensorDenseMatMulFunctor< \
+      GPUDevice, T, Tindices, false, true>;                \
+  template struct functor::SparseTensorDenseMatMulFunctor< \
+      GPUDevice, T, Tindices, true, false>;                \
+  template struct functor::SparseTensorDenseMatMulFunctor< \
+      GPUDevice, T, Tindices, true, true>;
+
+DEFINE(float, int32);
+DEFINE(float, int64);
 #undef DEFINE
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 11df3c43c7..e540ecfa8d 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -394,6 +394,28 @@ output: A `Tensor` with the concatenation of values stacked along the
   in `concat_dim` where it has the sum of the sizes.
 )doc");
 
+// TODO(vivek.v.rane@intel.com): Prefix the op names with underscore if the ops
+// are not to be made user-accessible.
+#ifdef INTEL_MKL
+REGISTER_OP("_MklConcatV2")
+    .Input("values: N * T")
+    .Input("axis: Tidx")
+    .Input("mkl_values: N * uint8")
+    .Input("mkl_axis: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("N: int >= 2")
+    .Attr("T: type")
+    .Attr("Tidx: {int32, int64} = DT_INT32")
+    .SetShapeFn(shape_inference::ConcatV2Shape)
+    .Doc(R"doc(
+MKL version of ConcatV2 operator. Uses MKL DNN APIs to perform concatenation.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+#endif
+
 REGISTER_OP("ConcatOffset")
     .Input("concat_dim: int32")
     .Input("shape: N * int32")
@@ -1638,6 +1660,21 @@ reshape(t, []) ==> 7
 shape: Defines the shape of the output tensor.
 )Doc");
 
+#ifdef INTEL_MKL
+REGISTER_OP("_MklReshape")
+    .Input("tensor: T")
+    .Input("shape: Tshape")
+    .Input("mkl_tensor: uint8")
+    .Input("mkl_shape: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("T: type")
+    .Attr("Tshape: {int32, int64} = DT_INT32")
+    .SetShapeFn([](InferenceContext* c) { return SetOutputShapeForReshape(c); })
+    .Doc(R"Doc( MKL implementation of ReshapeOp.
+)Doc");
+#endif  // INTEL_MKL
+
 // --------------------------------------------------------------------------
 REGISTER_OP("InvertPermutation")
     .Input("x: T")
@@ -4965,6 +5002,27 @@ backprop_wrt_max: Backpropagated gradients w.r.t. max parameter, shape `[d]`:
   `sum_per_d(gradients * (inputs > max))`.
 )doc");
 
+#ifdef INTEL_MKL
+REGISTER_OP("_MklConcat")
+    .Input("concat_dim: int32")
+    .Input("values: N * T")
+    .Input("mkl_concat_dim: uint8")
+    .Input("mkl_values: N * uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("N: int >= 2")
+    .Attr("T: type")
+    .SetShapeFn([](InferenceContext* c) {
+      return shape_inference::ConcatShape(c, c->num_inputs() - 3);
+    })
+    .Doc(R"doc(
+MKL version of Concat operator. Uses MKL DNN APIs to perform concatenation.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+#endif
+
 // Deprecated op registrations:
 
 // The following can be deleted after 10mar2017.
diff --git a/tensorflow/core/ops/io_ops.cc b/tensorflow/core/ops/io_ops.cc
index 3e2583f706..0bce6fc0ea 100644
--- a/tensorflow/core/ops/io_ops.cc
+++ b/tensorflow/core/ops/io_ops.cc
@@ -440,6 +440,7 @@ REGISTER_OP("FixedLengthRecordReader")
     .Attr("header_bytes: int = 0")
     .Attr("record_bytes: int")
     .Attr("footer_bytes: int = 0")
+    .Attr("hop_bytes: int = 0")
     .Attr("container: string = ''")
     .Attr("shared_name: string = ''")
     .SetIsStateful()
@@ -448,6 +449,11 @@ REGISTER_OP("FixedLengthRecordReader")
 A Reader that outputs fixed-length records from a file.
 
 reader_handle: The handle to reference the Reader.
+header_bytes: Number of bytes in the header, defaults to 0.
+record_bytes: Number of bytes in the record.
+footer_bytes: Number of bytes in the footer, defaults to 0.
+hop_bytes: Number of bytes to hop before each read. Default of 0 means using
+        record_bytes.
 container: If non-empty, this reader is placed in the given container.
         Otherwise, a default container is used.
 shared_name: If non-empty, this reader is named in the given bucket
@@ -459,6 +465,7 @@ REGISTER_OP("FixedLengthRecordReaderV2")
     .Attr("header_bytes: int = 0")
     .Attr("record_bytes: int")
     .Attr("footer_bytes: int = 0")
+    .Attr("hop_bytes: int = 0")
     .Attr("container: string = ''")
     .Attr("shared_name: string = ''")
     .SetIsStateful()
@@ -467,6 +474,11 @@ REGISTER_OP("FixedLengthRecordReaderV2")
 A Reader that outputs fixed-length records from a file.
 
 reader_handle: The handle to reference the Reader.
+header_bytes: Number of bytes in the header, defaults to 0.
+record_bytes: Number of bytes in the record.
+footer_bytes: Number of bytes in the footer, defaults to 0.
+hop_bytes: Number of bytes to hop before each read. Default of 0 means using
+        record_bytes.
 container: If non-empty, this reader is placed in the given container.
         Otherwise, a default container is used.
 shared_name: If non-empty, this reader is named in the given bucket
diff --git a/tensorflow/core/ops/nn_ops.cc b/tensorflow/core/ops/nn_ops.cc
index e9d5897af0..932113bf2c 100644
--- a/tensorflow/core/ops/nn_ops.cc
+++ b/tensorflow/core/ops/nn_ops.cc
@@ -2612,10 +2612,10 @@ scale_after_normalization: A bool indicating whether the resulted tensor
 )doc");
 
 #ifdef INTEL_MKL
-REGISTER_OP("MklConv2D")
+REGISTER_OP("_MklConv2D")
     .Input("input: T")
-    .Input("mkl_input: uint8")
     .Input("filter: T")
+    .Input("mkl_input: uint8")
     .Input("mkl_filter: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2632,12 +2632,12 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklConv2DWithBias")
+REGISTER_OP("_MklConv2DWithBias")
     .Input("input: T")
-    .Input("mkl_input: uint8")
     .Input("filter: T")
-    .Input("mkl_filter: uint8")
     .Input("bias: T")
+    .Input("mkl_input: uint8")
+    .Input("mkl_filter: uint8")
     .Input("mkl_bias: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2654,12 +2654,12 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklConv2DBackpropFilter")
+REGISTER_OP("_MklConv2DBackpropFilter")
     .Input("input: T")
-    .Input("mkl_input: uint8")
     .Input("filter_sizes: int32")
-    .Input("mkl_filter_size: uint8")
     .Input("out_backprop: T")
+    .Input("mkl_input: uint8")
+    .Input("mkl_filter_size: uint8")
     .Input("mkl_out_backprop: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2669,7 +2669,7 @@ REGISTER_OP("MklConv2DBackpropFilter")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
     .SetShapeFn([](InferenceContext* c) {
-      return InputTensorShapeOrUnknown(c, 2 /* input_idx */, 4 /* ndims */);
+      return InputTensorShapeOrUnknown(c, 1 /* input_idx */, 4 /* ndims */);
     })
     .Doc(R"doc(
 MKL version of Conv2DBackpropFilter. Uses MKL DNN APIs to compute the
@@ -2679,7 +2679,7 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklConv2DWithBiasBackpropBias")
+REGISTER_OP("_MklConv2DWithBiasBackpropBias")
     .Input("out_backprop: T")
     .Input("mkl_out_backprop: uint8")
     .Output("output: T")
@@ -2695,12 +2695,12 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklConv2DBackpropInput")
+REGISTER_OP("_MklConv2DBackpropInput")
     .Input("input_sizes: int32")
-    .Input("mkl_input_sizes: uint8")
     .Input("filter: T")
-    .Input("mkl_filter: uint8")
     .Input("out_backprop: T")
+    .Input("mkl_input_sizes: uint8")
+    .Input("mkl_filter: uint8")
     .Input("mkl_out_backprop: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2720,7 +2720,7 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklRelu")
+REGISTER_OP("_MklRelu")
     .Input("features: T")
     .Input("mkl_features: uint8")
     .Output("activations: T")
@@ -2734,10 +2734,10 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklReluGrad")
+REGISTER_OP("_MklReluGrad")
     .Input("gradients: T")
-    .Input("mkl_gradients: uint8")
     .Input("features: T")
+    .Input("mkl_gradients: uint8")
     .Input("mkl_features: uint8")
     .Output("backprops: T")
     .Output("mkl_backprops: uint8")
@@ -2751,7 +2751,7 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklMaxPool")
+REGISTER_OP("_MklMaxPool")
     .Attr("T: {float, half} = DT_FLOAT")
     .Attr("ksize: list(int) >= 4")
     .Attr("strides: list(int) >= 4")
@@ -2761,8 +2761,8 @@ REGISTER_OP("MklMaxPool")
     .Input("input: T")
     .Input("mkl_input: uint8")
     .Output("output: T")
-    .Output("mkl_output: uint8")
     .Output("workspace: T")
+    .Output("mkl_output: uint8")
     .Output("mkl_workspace: uint8")
     .SetShapeFn(shape_inference::MaxPoolShape)
     .Doc(R"doc(
@@ -2773,7 +2773,7 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklMaxPoolGrad")
+REGISTER_OP("_MklMaxPoolGrad")
     .Attr("T: {float, half} = DT_FLOAT")
     .Attr("ksize: list(int) >= 4")
     .Attr("strides: list(int) >= 4")
@@ -2781,12 +2781,12 @@ REGISTER_OP("MklMaxPoolGrad")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
     .Input("orig_input: T")
-    .Input("mkl_orig_input: uint8")
     .Input("orig_output: T")
-    .Input("mkl_orig_output: uint8")
     .Input("grad: T")
-    .Input("mkl_grad: uint8")
     .Input("workspace: T")
+    .Input("mkl_orig_input: uint8")
+    .Input("mkl_orig_output: uint8")
+    .Input("mkl_grad: uint8")
     .Input("mkl_workspace: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2801,7 +2801,7 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklAvgPool")
+REGISTER_OP("_MklAvgPool")
     .Input("value: T")
     .Input("mkl_input: uint8")
     .Output("output: T")
@@ -2820,10 +2820,10 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklAvgPoolGrad")
+REGISTER_OP("_MklAvgPoolGrad")
     .Input("orig_input_shape: int32")
-    .Input("mkl_orig_input: uint8")
     .Input("grad: T")
+    .Input("mkl_orig_input: uint8")
     .Input("mkl_grad: uint8")
     .Output("output: T")
     .Output("mkl_output: uint8")
@@ -2843,7 +2843,212 @@ NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
 expected to invoke these operators.
 )doc");
 
-REGISTER_OP("MklToTf")
+REGISTER_OP("_MklLRN")
+    .Input("input: T")
+    .Input("mkl_input: uint8")
+    .Output("output: T")
+    .Output("workspace: T")
+    .Output("mkl_output: uint8")
+    .Output("mkl_workspace: uint8")
+    .Attr("depth_radius: int = 5")
+    .Attr("bias: float = 1.0")
+    .Attr("alpha: float = 1.0")
+    .Attr("beta: float = 0.5")
+    .Attr("workspace_enabled: bool = false")
+    .Attr("T: {float, half} = DT_FLOAT")
+    .SetShapeFn([](InferenceContext* c) {
+      return UnchangedShapeWithRank(c, 4);
+    })
+    .Doc(R"doc(
+MKL version of LRN operator. Uses MKL DNN APIs to perform local response
+normalization.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("_MklLRNGrad")
+    .Input("input_grads: T")
+    .Input("input_image: T")
+    .Input("output_image: T")
+    .Input("workspace: T")
+    .Input("mkl_input_grads: uint8")
+    .Input("mkl_input_image: uint8")
+    .Input("mkl_output_image: uint8")
+    .Input("mkl_workspace: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("depth_radius: int = 5")
+    .Attr("bias: float = 1.0")
+    .Attr("alpha: float = 1.0")
+    .Attr("beta: float = 0.5")
+    .Attr("workspace_enabled: bool = false")
+    .Attr("T: {float, half} = DT_FLOAT")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle s;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 4, &s));  // input_grads
+      TF_RETURN_IF_ERROR(c->Merge(s, c->input(1), &s));     // input_image
+      TF_RETURN_IF_ERROR(c->Merge(s, c->input(2), &s));     // output_image
+      c->set_output(0, s);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+MKL version of LRNGrad operator. Uses MKL DNN APIs to compute gradient for
+local response normalization.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("_MklFusedBatchNorm")
+    .Input("x: T")
+    .Input("scale: T")
+    .Input("offset: T")
+    .Input("mean: T")
+    .Input("variance: T")
+    .Input("mkl_x: uint8")
+    .Input("mkl_scale: uint8")
+    .Input("mkl_offset: uint8")
+    .Input("mkl_mean: uint8")
+    .Input("mkl_variance: uint8")
+    .Output("y: T")
+    .Output("batch_mean: T")
+    .Output("batch_variance: T")
+    .Output("reserve_space_1: T")
+    .Output("reserve_space_2: T")
+    .Output("mkl_y: uint8")
+    .Output("mkl_batch_mean: uint8")
+    .Output("mkl_batch_variance: uint8")
+    .Output("mkl_reserve_space_1: uint8")
+    .Output("mkl_reserve_space_2: uint8")
+    .Attr("T: numbertype")
+    .Attr("epsilon: float = 0.0001")
+    .Attr("data_format: string = 'NHWC'")
+    .Attr("is_training: bool = true")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle x;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 4, &x));
+
+      bool is_training;
+      c->GetAttr("is_training", &is_training);
+      int number_inputs = (is_training) ? 3 : 5;
+      string data_format;
+      c->GetAttr("data_format", &data_format);
+      DimensionHandle channel_dim =
+          (data_format == "NHWC") ? c->Dim(x, 3) : c->Dim(x, 1);
+
+      // covers scale, offset, and if is_training is false, mean, variance
+      for (int i = 1; i < number_inputs; ++i) {
+        ShapeHandle vec;
+        TF_RETURN_IF_ERROR(c->WithRank(c->input(i), 1, &vec));
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(vec, 0), &channel_dim));
+      }
+
+      ShapeHandle y;
+      if (data_format == "NHWC") {
+        TF_RETURN_IF_ERROR(c->ReplaceDim(x, 3, channel_dim, &y));
+      } else {
+        TF_RETURN_IF_ERROR(c->ReplaceDim(x, 1, channel_dim, &y));
+      }
+      c->set_output(0, y);
+      ShapeHandle vector_shape = c->Vector(channel_dim);
+      c->set_output(1, vector_shape);
+      c->set_output(2, vector_shape);
+      c->set_output(3, vector_shape);
+      c->set_output(4, vector_shape);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+MKL version of FusedBatchNorm operator. Uses MKL DNN APIs to perform fused
+batch normalization.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("_MklFusedBatchNormGrad")
+    .Input("y_backprop: T")
+    .Input("x: T")
+    .Input("scale: T")
+    .Input("reserve_space_1: T")
+    .Input("reserve_space_2: T")
+    .Input("mkl_y_backprop: uint8")
+    .Input("mkl_x: uint8")
+    .Input("mkl_scale: uint8")
+    .Input("mkl_reserve_space_1: uint8")
+    .Input("mkl_reserve_space_2: uint8")
+    .Output("x_backprop: T")
+    .Output("scale_backprop: T")
+    .Output("offset_backprop: T")
+    .Output("reserve_space_3: T")
+    .Output("reserve_space_4: T")
+    .Output("mkl_x_backprop: uint8")
+    .Output("mkl_scale_backprop: uint8")
+    .Output("mkl_offset_backprop: uint8")
+    .Output("mkl_reserve_space_3: uint8")
+    .Output("mkl_reserve_space_4: uint8")
+    .Attr("T: numbertype")
+    .Attr("epsilon: float = 0.0001")
+    .Attr("data_format: string = 'NHWC'")
+    .Attr("is_training: bool = true")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle y_backprop;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 4, &y_backprop));
+      ShapeHandle x;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 4, &x));
+
+      bool is_training;
+      string data_format;
+      c->GetAttr("is_training", &is_training);
+      c->GetAttr("data_format", &data_format);
+      DimensionHandle channel_dim = (data_format == "NHWC")
+                                        ? c->Dim(y_backprop, 3)
+                                        : c->Dim(y_backprop, 1);
+      if (data_format == "NHWC") {
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(x, 3), &channel_dim));
+      } else {
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(x, 1), &channel_dim));
+      }
+
+      // covers scale, mean (reserve_space_1), variance (reserve_space_2)
+      for (int i = 2; i < 5; ++i) {
+        ShapeHandle vec;
+        TF_RETURN_IF_ERROR(c->WithRank(c->input(i), 1, &vec));
+        TF_RETURN_IF_ERROR(c->Merge(channel_dim, c->Dim(vec, 0), &channel_dim));
+      }
+
+      ShapeHandle x_backprop;
+      if (data_format == "NHWC") {
+        TF_RETURN_IF_ERROR(
+            c->ReplaceDim(y_backprop, 3, channel_dim, &x_backprop));
+      } else {
+        TF_RETURN_IF_ERROR(
+            c->ReplaceDim(y_backprop, 1, channel_dim, &x_backprop));
+      }
+      c->set_output(0, x_backprop);
+      c->set_output(1, c->Vector(channel_dim));
+      c->set_output(2, c->Vector(channel_dim));
+      // Set the correct shapes for reserve_spaces
+      // so that gradients can be performed when
+      // the op is in a symbolic condition.
+      if (is_training) {
+        c->set_output(3, c->Vector(0));
+        c->set_output(4, c->Vector(0));
+      } else {
+        c->set_output(3, c->Vector(channel_dim));
+        c->set_output(4, c->Vector(channel_dim));
+      }
+      return Status::OK();
+    })
+    .Doc(R"doc(
+MKL version of FusedBatchNormGrad operator. Uses MKL DNN APIs to compute
+gradients for fused batch normalization.
+
+NOTE Do not invoke this operator directly in Python. Graph rewrite pass is
+expected to invoke these operators.
+)doc");
+
+REGISTER_OP("_MklToTf")
     .Input("input: T")
     .Input("mkl_input: uint8")
     .Output("output: T")
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 6d28cb7e84..cbbabe0b87 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -26416,6 +26416,59 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
+op {
+  name: "UnsortedSegmentSum"
+  input_arg {
+    name: "data"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "segment_ids"
+    description: "A tensor whose shape is a prefix of `data.shape`."
+    type_attr: "Tindices"
+  }
+  input_arg {
+    name: "num_segments"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "output"
+    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "Tindices"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  summary: "Computes the max along segments of a tensor."
+  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
+}
 op {
   name: "Unstage"
   output_arg {
diff --git a/tensorflow/core/ops/sparse_ops.cc b/tensorflow/core/ops/sparse_ops.cc
index 860b3475e9..b90f7a5dfb 100644
--- a/tensorflow/core/ops/sparse_ops.cc
+++ b/tensorflow/core/ops/sparse_ops.cc
@@ -128,12 +128,13 @@ pair takes space.
 )doc");
 
 REGISTER_OP("SparseTensorDenseMatMul")
-    .Input("a_indices: int64")
+    .Input("a_indices: Tindices")
     .Input("a_values: T")
     .Input("a_shape: int64")
     .Input("b: T")
     .Output("product: T")
     .Attr("T: type")
+    .Attr("Tindices: {int32,int64} = DT_INT64")
     .Attr("adjoint_a: bool = false")
     .Attr("adjoint_b: bool = false")
     .SetShapeFn([](InferenceContext* c) {
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index 58ccda5c9b..10414cbca2 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -194,13 +194,15 @@ def tf_kernel_tests_linkstatic():
 
 def tf_additional_lib_defines():
   return select({
-      "//tensorflow:with_jemalloc": ["TENSORFLOW_USE_JEMALLOC"],
+      "//tensorflow:with_jemalloc_linux_x86_64": ["TENSORFLOW_USE_JEMALLOC"],
+      "//tensorflow:with_jemalloc_linux_ppc64le":["TENSORFLOW_USE_JEMALLOC"],
       "//conditions:default": [],
   })
 
 def tf_additional_lib_deps():
   return select({
-      "//tensorflow:with_jemalloc": ["@jemalloc"],
+      "//tensorflow:with_jemalloc_linux_x86_64": ["@jemalloc"],
+      "//tensorflow:with_jemalloc_linux_ppc64le": ["@jemalloc"],
       "//conditions:default": [],
   })
 
@@ -246,3 +248,9 @@ def tf_lib_proto_parsing_deps():
       ":protos_all_cc",
       "//tensorflow/core/platform/default/build_config:proto_parsing",
   ]
+
+def tf_additional_verbs_lib_defines():
+  return select({
+      "//tensorflow:with_verbs_support": ["TENSORFLOW_USE_VERBS"],
+      "//conditions:default": [],
+  })
diff --git a/tensorflow/core/platform/default/build_config_root.bzl b/tensorflow/core/platform/default/build_config_root.bzl
index 79f97c1234..eb804bfc78 100644
--- a/tensorflow/core/platform/default/build_config_root.bzl
+++ b/tensorflow/core/platform/default/build_config_root.bzl
@@ -22,3 +22,11 @@ def tf_additional_license_deps():
       "//tensorflow:with_xla_support": ["@llvm//:LICENSE.TXT"],
       "//conditions:default": [],
   })
+
+def tf_additional_verbs_deps():
+  return select({
+      "//tensorflow:with_verbs_support": [
+      "//tensorflow/contrib/verbs:verbs_server_lib",
+      "//tensorflow/contrib/verbs:grpc_verbs_client"], 
+      "//conditions:default": [],
+  })
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index dfffbfa396..df33cf38c9 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -20,11 +20,11 @@ limitations under the License.
 
 #define TF_MAJOR_VERSION 1
 #define TF_MINOR_VERSION 1
-#define TF_PATCH_VERSION 0-rc1
+#define TF_PATCH_VERSION 0
 
 // TF_VERSION_SUFFIX is non-empty for pre-releases (e.g. "-alpha", "-alpha.1",
 // "-beta", "-rc", "-rc.1")
-#define TF_VERSION_SUFFIX ""
+#define TF_VERSION_SUFFIX "-rc2"
 
 #define TF_STR_HELPER(x) #x
 #define TF_STR(x) TF_STR_HELPER(x)
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index ebbe195bbc..897b174eff 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -75,7 +75,6 @@ class MklShape {
   void SetTfLayout(const size_t dimension, const size_t* sizes,
                    const size_t* strides) {
     dimension_ = dimension;
-
     if (dimension > 0) {  // MKl doesn't support zero dimension tensors
       sizes_ = new size_t[dimension];
       strides_ = new size_t[dimension];
@@ -140,6 +139,39 @@ class MklShape {
   const size_t* GetTfToMklDimMap() const { return tf_to_mkl_dim_map_; }
   size_t tf_dim_idx(int index) const { return tf_to_mkl_dim_map_[index]; }
 
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Channel dimension.
+  bool IsMklChannelDim(int d) const { return tf_dim_idx(d) == MklDims::C; }
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Batch dimension.
+  bool IsMklBatchDim(int d) const { return tf_dim_idx(d) == MklDims::N; }
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Width dimension.
+  bool IsMklWidthDim(int d) const { return tf_dim_idx(d) == MklDims::W; }
+  // Query TF-MKL dimension ordering map and check if Tensorflow dimension 'd'
+  // corresponds to MKL's Height dimension.
+  bool IsMklHeightDim(int d) const { return tf_dim_idx(d) == MklDims::H; }
+
+  // Check if the TF-Mkl dimension ordering map specifies if the input
+  // tensor is in NCHW format.
+  bool IsTensorInNCHWFormat() const {
+    TensorFormat data_format = FORMAT_NCHW;
+    return (IsMklBatchDim(GetTensorDimIndex<2>(data_format, 'N')) &&
+            IsMklChannelDim(GetTensorDimIndex<2>(data_format, 'C')) &&
+            IsMklHeightDim(GetTensorDimIndex<2>(data_format, 'H')) &&
+            IsMklWidthDim(GetTensorDimIndex<2>(data_format, 'W')));
+  }
+
+  // Check if the TF-Mkl dimension ordering map specifies if the input
+  // tensor is in NHWC format.
+  bool IsTensorInNHWCFormat() const {
+    TensorFormat data_format = FORMAT_NHWC;
+    return (IsMklBatchDim(GetTensorDimIndex<2>(data_format, 'N')) &&
+            IsMklChannelDim(GetTensorDimIndex<2>(data_format, 'C')) &&
+            IsMklHeightDim(GetTensorDimIndex<2>(data_format, 'H')) &&
+            IsMklWidthDim(GetTensorDimIndex<2>(data_format, 'W')));
+  }
+
   void GetConvertedFlatData(dnnLayout_t targetLayout, void* input,
                             void* output) const {
     dnnLayout_t curLayout;
@@ -194,9 +226,9 @@ class MklShape {
   (STRIDES_OFFSET(dims) + dims * sizeof(size_t))  // Location of mklLayout_
 #define TF_LAYOUT_OFFSET(dims) \
   (MKL_LAYOUT_OFFSET(dims) + SIZE_OF_MKL_DNN_BUF)  // Location of tfLayout_
-// Location of tf_to_mkl_dim_map_
 #define TF_TO_MKL_DIM_MAP_OFFSET(dims) \
-  (TF_LAYOUT_OFFSET(dims) + SIZE_OF_MKL_DNN_BUF)
+  (TF_LAYOUT_OFFSET(dims) +            \
+   SIZE_OF_MKL_DNN_BUF)  // Location of tf_to_mkl_dim_map_
 
   // TODO(agramesh1) make sure to create a const to share with rewrite pass
   // for min size of MKL metadata tensor.
@@ -265,45 +297,166 @@ class MklShape {
   size_t dimension_ = 0;
   size_t* sizes_ = nullptr;    // Required by MKL for conversions
   size_t* strides_ = nullptr;  // Required by MKL for conversions
-  // TF dimension corresponding to this MKL dimension
-  size_t* tf_to_mkl_dim_map_ = nullptr;
+  size_t* tf_to_mkl_dim_map_ =
+      nullptr;  // TF dimension corresponding to this MKL dimension
 };
 
-int inline GetTensorDataIndex(int n) {
-  return 2 * n;  // index corresponding to nth input/output tensor
+// List of MklShape objects. Used in Concat/Split layers.
+typedef std::vector<MklShape> MklShapeList;
+
+// Check if all tensors specified by MklShapes are MKL tensors.
+inline bool AreAllMklTensors(const MklShapeList& shapes) {
+  for (auto& s : shapes) {
+    if (!s.IsMklTensor()) {
+      return false;
+    }
+  }
+  return true;
+}
+
+template <typename T>
+inline Tensor ConvertMklToTF(OpKernelContext* context, const Tensor& mkl_tensor,
+                             const MklShape& mkl_shape) {
+  Tensor output_tensor;
+  TensorShape output_shape;
+
+  for (size_t j = 0; j < mkl_shape.GetDimension(); j++) {
+    // Outermost to innermost dimension
+    output_shape.AddDim(mkl_shape.GetSizes()[mkl_shape.tf_dim_idx(j)]);
+  }
+
+  // Allocate output tensor.
+  context->allocate_temp(DataTypeToEnum<T>::v(), output_shape, &output_tensor);
+
+  dnnLayout_t output_layout = static_cast<dnnLayout_t>(mkl_shape.GetTfLayout());
+  void* input_buffer = const_cast<T*>(mkl_tensor.flat<T>().data());
+  void* output_buffer = const_cast<T*>(output_tensor.flat<T>().data());
+
+  if (mkl_tensor.NumElements() != 0) {
+    mkl_shape.GetConvertedFlatData(output_layout, input_buffer, output_buffer);
+  }
+
+  return output_tensor;
 }
 
-int inline GetTensorMetaDataIndex(int n) {
-  // index corresponding to meta data of nth input/output tensor
-  return 2 * n + 1;
+// Since our ops are going to produce and also consume N addition tensors
+// (Mkl) for N Tensorflow tensors, we can have following different
+// orderings among these 2N tensors.
+//
+// E.g., for Tensorflow tensors A, B, and C, our ops will produce and
+// consume A_m, B_m, and C_m additionally.
+//
+// INTERLEAVED: in this case 2N tensors are interleaved. So for above
+//              example, the ordering looks like: A, A_m, B, B_m, C, C_m.
+//
+// CONTIGUOUS: in thi case N Tensorflow tensors are contiguous followed
+//             by N Mkl tensors. So for above example, the ordering looks
+//             like: A, B, C, A_m, B_m, C_m
+//
+// Following APIs map index of original Tensorflow tensors to their appropriate
+// position based on selected ordering. For contiguous ordering, we need to know
+// the total number of tensors (parameter total).
+//
+typedef enum { TENSORS_INTERLEAVED, TENSORS_CONTIGUOUS } MklTfTensorOrdering;
+// NOTE: Currently, we use contiguous ordering. If you change this, then you
+// would need to change Mkl op definitions in nn_ops.cc.
+static MklTfTensorOrdering kTensorOrdering = TENSORS_CONTIGUOUS;
+
+// Get index of MetaData tensor from index 'n' of Data tensor.
+inline int DataIndexToMetaDataIndex(int n, int total_tensors) {
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    // For interleaved ordering, Mkl tensor follows immediately after
+    // Tensorflow tensor.
+    return n + 1;
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    // For contiguous ordering, Mkl tensor is n+total_tensors / 2 away.
+    return n + total_tensors / 2;
+  }
 }
+
+int inline GetTensorDataIndex(int n, int total_tensors) {
+  if (kTensorOrdering == MklTfTensorOrdering::TENSORS_INTERLEAVED) {
+    return 2 * n;  // index corresponding to nth input/output tensor
+  } else {
+    CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+    return n;
+  }
+}
+
+int inline GetTensorMetaDataIndex(int n, int total_tensors) {
+  // Get index for TensorData first and then use mapping function
+  // to get TensorMetaData index from TensorData index.
+  int tidx = GetTensorDataIndex(n, total_tensors);
+  return DataIndexToMetaDataIndex(tidx, total_tensors);
+}
+
 // Get the MKL shape from the second string tensor
 inline void GetMklShape(OpKernelContext* ctext, int n, MklShape* mklshape) {
   mklshape->DeSerializeMklShape(
-      ctext->input(GetTensorMetaDataIndex(n)).flat<uint8>().data(),
-      ctext->input(GetTensorMetaDataIndex(n)).flat<uint8>().size() *
+      ctext->input(GetTensorMetaDataIndex(n, ctext->num_inputs()))
+          .flat<uint8>()
+          .data(),
+      ctext->input(GetTensorMetaDataIndex(n, ctext->num_inputs()))
+              .flat<uint8>()
+              .size() *
           sizeof(uint8));
 }
 
 // Gets the actual input
 inline const Tensor& MklGetInput(OpKernelContext* ctext, int n) {
-  return ctext->input(GetTensorDataIndex(n));
+  return ctext->input(GetTensorDataIndex(n, ctext->num_inputs()));
+}
+
+inline void GetMklInputList(OpKernelContext* ctext, StringPiece name,
+                            OpInputList* input_tensors) {
+  CHECK_NOTNULL(input_tensors);
+  ctext->input_list(name, input_tensors);
+}
+
+inline void GetMklShapeList(OpKernelContext* ctext, StringPiece name,
+                            MklShapeList* mkl_shapes) {
+  OpInputList input_mkl_tensors;
+  GetMklInputList(ctext, strings::StrCat("mkl_", name), &input_mkl_tensors);
+
+  for (int i = 0; i < input_mkl_tensors.size(); i++) {
+    (*mkl_shapes)[i].DeSerializeMklShape(
+        input_mkl_tensors[i].flat<uint8>().data(),
+        input_mkl_tensors[i].flat<uint8>().size() * sizeof(uint8));
+  }
+}
+
+// Allocate the second output tensor that will contain
+// the MKL shape serialized
+inline void AllocateOutputSetMklShape(OpKernelContext* ctext, int n,
+                                      const MklShape& mkl_shape) {
+  Tensor* second_tensor = nullptr;
+  TensorShape second_shape;
+  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mkl_shape.GetDimension()));
+  OP_REQUIRES_OK(ctext, ctext->allocate_output(
+                            GetTensorMetaDataIndex(n, ctext->num_outputs()),
+                            second_shape, &second_tensor));
+  mkl_shape.SerializeMklShape(
+      second_tensor->flat<uint8>().data(),
+      second_tensor->flat<uint8>().size() * sizeof(uint8));
 }
 
 // Allocate the output tensor, create a second output tensor that will contain
 // the MKL shape serialized
-inline void AllocateOutputSetMklshape(OpKernelContext* ctext, int n,
+inline void AllocateOutputSetMklShape(OpKernelContext* ctext, int n,
                                       Tensor** output,
-                                      const TensorShape& tfshape,
-                                      const MklShape& mklshape) {
+                                      const TensorShape& tf_shape,
+                                      const MklShape& mkl_shape) {
   Tensor* second_tensor = nullptr;
   TensorShape second_shape;
-  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mklshape.GetDimension()));
+  second_shape.AddDim(SIZE_OF_MKL_SERIAL_DATA(mkl_shape.GetDimension()));
   OP_REQUIRES_OK(
-      ctext, ctext->allocate_output(GetTensorDataIndex(n), tfshape, output));
-  OP_REQUIRES_OK(ctext, ctext->allocate_output(GetTensorMetaDataIndex(n),
-                                               second_shape, &second_tensor));
-  mklshape.SerializeMklShape(
+      ctext, ctext->allocate_output(GetTensorDataIndex(n, ctext->num_outputs()),
+                                    tf_shape, output));
+  OP_REQUIRES_OK(ctext, ctext->allocate_output(
+                            GetTensorMetaDataIndex(n, ctext->num_outputs()),
+                            second_shape, &second_tensor));
+  mkl_shape.SerializeMklShape(
       second_tensor->flat<uint8>().data(),
       second_tensor->flat<uint8>().size() * sizeof(uint8));
 }
@@ -342,12 +495,11 @@ inline void GetStridesFromSizes(TensorFormat data_format, size_t* strides,
 
 inline void MklSizesToTFSizes(OpKernelContext* context,
                               TensorFormat data_format_,
-                              const MklShape& mklshape, TensorShape* tfshape) {
-  size_t tf_dim = mklshape.GetDimension();
-  const size_t* tf_sizes = mklshape.GetSizes();
+                              const MklShape& mkl_shape,
+                              TensorShape* tf_shape) {
+  size_t tf_dim = mkl_shape.GetDimension();
+  const size_t* tf_sizes = mkl_shape.GetSizes();
 
-  // TODO(agramesh1): check if this constraint is applicable in other cases
-  // (besides BackpropInput, BackpropFilter).
   OP_REQUIRES(context, tf_dim == 4,
               errors::InvalidArgument("MKLSizesToTFSizes: size must be 4-dim"));
   std::vector<int32> sizes;
@@ -364,7 +516,7 @@ inline void MklSizesToTFSizes(OpKernelContext* context,
     sizes.push_back(tf_sizes[0]);
   }
 
-  OP_REQUIRES_OK(context, TensorShapeUtils::MakeShape(sizes, tfshape));
+  OP_REQUIRES_OK(context, TensorShapeUtils::MakeShape(sizes, tf_shape));
 }
 
 inline int32 GetMklTensorDimIndex(char dimension) {
@@ -383,38 +535,71 @@ inline int32 GetMklTensorDimIndex(char dimension) {
   }
 }
 
-inline int64 GetMklTensorDim(const MklShape& mklshape, char dimension) {
+inline int64 GetMklTensorDim(const MklShape& mkl_shape, char dimension) {
   int index = GetMklTensorDimIndex(dimension);
-  CHECK(index >= 0 && index < mklshape.GetDimension())
+  CHECK(index >= 0 && index < mkl_shape.GetDimension())
       << "Invalid index from the dimension: " << index << ", " << dimension;
-  return mklshape.dim_size(index);
+  return mkl_shape.dim_size(index);
 }
 
-namespace mkl_layer_registry {
+inline void CopyMklTensorInToOut(OpKernelContext* context, int idx_in,
+                                 int idx_out) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_meta_in = GetTensorMetaDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+  int idx_meta_out = GetTensorMetaDataIndex(idx_out, num_outputs);
+
+  const Tensor& data = context->input(idx_data_in);
+  const Tensor& meta = context->input(idx_meta_in);
+  Tensor output(data.dtype());
+  Tensor meta_output(meta.dtype());
+
+  // TODO(intel_tf): alternatively, call forward_input_to_output_with_shape(...)
+  CHECK(output.CopyFrom(data, data.shape()));
+  CHECK(meta_output.CopyFrom(meta, meta.shape()));
+  context->set_output(idx_data_out, output);
+  context->set_output(idx_meta_out, meta_output);
+}
+
+inline void CopyTFTensorInToOut(OpKernelContext* context, int idx_in,
+                                int idx_out, const TensorShape& shape) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+
+  const Tensor& data = context->input(idx_data_in);
+  MklShape mkl_shape_output;
+  mkl_shape_output.SetMklTensor(false);
+  AllocateOutputSetMklShape(context, idx_out, mkl_shape_output);
+  Tensor output(data.dtype());
+  // TODO(intel_tf): alternatively, call forward_input_to_output_with_shape(...)
+  CHECK(output.CopyFrom(data, shape));
+  context->set_output(idx_data_out, output);
+}
 
-static const char* kMklLayerLabel = "MklLayer";
-static const char* kMklLayerLabelPattern = "label='MklLayer'";
+namespace mkl_op_registry {
+static const char* kMklOpLabel = "MklOp";
+static const char* kMklOpLabelPattern = "label='MklOp'";
 
 // Check whether opname with type T is registered as MKL-compliant.
 //
 // @input: name of the op
 // @input: T datatype to be used for checking op
-// @return: true if opname is registered as Mkl layer op
-static inline bool IsMklLayer(const std::string& op_name, DataType T) {
+// @return: true if opname is registered as Mkl op
+static inline bool IsMklOp(const std::string& op_name, DataType T) {
   string kernel = KernelsRegisteredForOp(op_name);
-  // Currently, MKL only supports float type for ops. So we check if
-  // the type is float. Actually, we should query kernel registration and
-  // find out if op is supported for type T. But there is no API to query
-  // kernel registration using name and type.
   bool result =
-      (kernel.find(kMklLayerLabelPattern) != string::npos) && (T == DT_FLOAT);
-  if (result == true) {
-    VLOG(1) << "mkl_layer_registry::" << op_name << " is " << kMklLayerLabel;
+      kernel.find(kMklOpLabelPattern) != string::npos && (T == DT_FLOAT);
+  if (result) {
+    VLOG(1) << "mkl_op_registry::" << op_name << " is " << kMklOpLabel;
   }
   return result;
 }
 
-}  // namespace mkl_layer_registry
+}  // namespace mkl_op_registry
 
 }  // namespace tensorflow
 #endif  // INTEL_MKL
diff --git a/tensorflow/docs_src/community/style_guide.md b/tensorflow/docs_src/community/style_guide.md
index a2df61bc80..767e33c3d0 100644
--- a/tensorflow/docs_src/community/style_guide.md
+++ b/tensorflow/docs_src/community/style_guide.md
@@ -115,31 +115,31 @@ Example:
 
     def my_op(tensor_in, other_tensor_in, my_param, other_param=0.5,
               output_collections=(), name=None):
-    """My operation that adds two tensors with given coefficients.
-
-    Args:
-      tensor_in: `Tensor`, input tensor.
-      other_tensor_in: `Tensor`, same shape as `tensor_in`, other input tensor.
-      my_param: `float`, coefficient for `tensor_in`.
-      other_param: `float`, coefficient for `other_tensor_in`.
-      output_collections: `tuple` of `string`s, name of the collection to
-                          collect result of this op.
-      name: `string`, name of the operation.
-
-    Returns:
-      `Tensor` of same shape as `tensor_in`, sum of input values with coefficients.
-
-    Example:
-      >>> my_op([1., 2.], [3., 4.], my_param=0.5, other_param=0.6,
-                output_collections=['MY_OPS'], name='add_t1t2')
-      [2.3, 3.4]
-    """
-    with tf.name_scope(name, "my_op", [tensor_in, other_tensor_in]):
-      tensor_in = tf.convert_to_tensor(tensor_in)
-      other_tensor_in = tf.convert_to_tensor(other_tensor_in)
-      result = my_param * tensor_in + other_param * other_tensor_in
-      tf.add_to_collections(output_collections, result)
-      return result
+      """My operation that adds two tensors with given coefficients.
+
+      Args:
+        tensor_in: `Tensor`, input tensor.
+        other_tensor_in: `Tensor`, same shape as `tensor_in`, other input tensor.
+        my_param: `float`, coefficient for `tensor_in`.
+        other_param: `float`, coefficient for `other_tensor_in`.
+        output_collections: `tuple` of `string`s, name of the collection to
+                            collect result of this op.
+        name: `string`, name of the operation.
+
+      Returns:
+        `Tensor` of same shape as `tensor_in`, sum of input values with coefficients.
+
+      Example:
+        >>> my_op([1., 2.], [3., 4.], my_param=0.5, other_param=0.6,
+                  output_collections=['MY_OPS'], name='add_t1t2')
+        [2.3, 3.4]
+      """
+      with tf.name_scope(name, "my_op", [tensor_in, other_tensor_in]):
+        tensor_in = tf.convert_to_tensor(tensor_in)
+        other_tensor_in = tf.convert_to_tensor(other_tensor_in)
+        result = my_param * tensor_in + other_param * other_tensor_in
+        tf.add_to_collection(output_collections, result)
+        return result
 
 Usage:
 
diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index c75c7f111d..f54f79cbf4 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -121,16 +121,16 @@ class ZeroOutOp : public OpKernel {
     Tensor* output_tensor = NULL;
     OP_REQUIRES_OK(context, context->allocate_output(0, input_tensor.shape(),
                                                      &output_tensor));
-    auto output = output_tensor->flat<int32>();
+    auto output_flat = output_tensor->flat<int32>();
 
     // Set all but the first element of the output tensor to 0.
     const int N = input.size();
     for (int i = 1; i < N; i++) {
-      output(i) = 0;
+      output_flat(i) = 0;
     }
 
     // Preserve the first input value if possible.
-    if (N > 0) output(0) = input(0);
+    if (N > 0) output_flat(0) = input(0);
   }
 };
 ```
diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 33ff1d87d5..6bee7529d0 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -323,7 +323,7 @@ for i in range(1000):
   sess.run(train, {x:x_train, y:y_train})
 
 # evaluate training accuracy
-curr_W, curr_b, curr_loss  = sess.run([W, b, loss], {x:x_train, y:y_train})
+curr_W, curr_b, curr_loss = sess.run([W, b, loss], {x:x_train, y:y_train})
 print("W: %s b: %s loss: %s"%(curr_W, curr_b, curr_loss))
 ```
 When run, it produces
diff --git a/tensorflow/docs_src/get_started/monitors.md b/tensorflow/docs_src/get_started/monitors.md
index 99d583b23d..7db88c8981 100644
--- a/tensorflow/docs_src/get_started/monitors.md
+++ b/tensorflow/docs_src/get_started/monitors.md
@@ -282,18 +282,15 @@ validation_metrics = {
     "accuracy":
         tf.contrib.learn.MetricSpec(
             metric_fn=tf.contrib.metrics.streaming_accuracy,
-            prediction_key=tf.contrib.learn.prediction_key.PredictionKey.
-            CLASSES),
+            prediction_key=tf.contrib.learn.PredictionKey.CLASSES),
     "precision":
         tf.contrib.learn.MetricSpec(
             metric_fn=tf.contrib.metrics.streaming_precision,
-            prediction_key=tf.contrib.learn.prediction_key.PredictionKey.
-            CLASSES),
+            prediction_key=tf.contrib.learn.PredictionKey.CLASSES),
     "recall":
         tf.contrib.learn.MetricSpec(
             metric_fn=tf.contrib.metrics.streaming_recall,
-            prediction_key=tf.contrib.learn.prediction_key.PredictionKey.
-            CLASSES)
+            prediction_key=tf.contrib.learn.PredictionKey.CLASSES)
 }
 ```
 
diff --git a/tensorflow/docs_src/get_started/tflearn.md b/tensorflow/docs_src/get_started/tflearn.md
index 0912c7a5b4..4a893e4a45 100644
--- a/tensorflow/docs_src/get_started/tflearn.md
+++ b/tensorflow/docs_src/get_started/tflearn.md
@@ -282,7 +282,7 @@ enough that it can be stored in @{tf.constant TensorFlow constants}. The
 following code produces the simplest possible input pipeline:
 
 ```python
-# Define the test inputs
+# Define the training inputs
 def get_train_inputs():
   x = tf.constant(training_set.data)
   y = tf.constant(training_set.target)
diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index 0f3914d52d..c1581efb4f 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index 6874a1f03f..dd713e4786 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc2.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 127d8fd029..1abf3b69f5 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc1</version>
+  <version>1.1.0-rc2</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0-rc1</version>
+                 <version>1.1.0-rc2</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc1.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc1.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc1.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc2.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0-rc1.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0-rc2.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -213,7 +213,7 @@ two files are available to the JVM:
 
 For example, the following command line executes the `HelloTF` program:
 
-<pre><b>java -cp libtensorflow-1.1.0-rc1.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index 4a5d63f337..8ee31fe692 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -165,8 +165,8 @@ Take the following steps to install TensorFlow with Virtualenv:
      issue the following command to install TensorFlow in the active
      virtualenv environment:
 
-     <pre> (tensorflow)$ <b>pip install --upgrade \\
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
+     <pre>(tensorflow)$ <b>pip3 install --upgrade \
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#common_installation_problems).
@@ -269,8 +269,10 @@ take the following steps:
      install TensorFlow for Linux, Python 2.7, and CPU-only support, issue
      the following command:
 
-     <pre> $ <b>sudo pip install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
+     <pre>
+     $ <b>sudo pip3 install --upgrade \
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b>
+     </pre>
 
      If this step fails, see
      [Common Installation Problems](#common_installation_problems).
@@ -456,7 +458,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -624,14 +626,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -643,14 +645,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -662,14 +664,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -681,14 +683,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc1-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index ccfe9ada6d..0882422e4d 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -163,7 +163,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#CommonInstallationProblems).
@@ -286,7 +286,7 @@ take the following steps:
      support, issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b> </pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
      [Common installation problems](#CommonInstallationProblems).
@@ -398,7 +398,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      TensorFlow for Python 2.7:
 
      <pre> (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -604,13 +604,13 @@ This section documents the relevant values for Mac OS installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py2-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py2-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
@@ -622,13 +622,13 @@ Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py3-none-any.whl
 </pre>
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc1-py3-none-any.whl
+https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py3-none-any.whl
 </pre>
 
 Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 5f351c40b4..88268ba62f 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -319,10 +319,11 @@ $ <b>bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pk
 Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
-for TensorFlow 1.1.0rc1 on Linux:
+
+for TensorFlow 1.1.0rc2 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc1-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc2-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 7d3d13c34a..5f7c27c028 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc1-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
diff --git a/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py b/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py
index 8cd296d752..e29387ab9d 100644
--- a/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py
+++ b/tensorflow/examples/how_tos/reading_data/fully_connected_preloaded_var.py
@@ -88,7 +88,8 @@ def run_training():
     saver = tf.train.Saver()
 
     # Create the op for initializing variables.
-    init_op = tf.global_variables_initializer()
+    init_op = tf.group(tf.global_variables_initializer(),
+                       tf.local_variables_initializer())
 
     # Create a session for running Ops on the Graph.
     sess = tf.Session()
diff --git a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
index 698c97ca1d..dc0d870315 100644
--- a/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
+++ b/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
@@ -135,7 +135,8 @@ def train():
       accuracy = tf.reduce_mean(tf.cast(correct_prediction, tf.float32))
   tf.summary.scalar('accuracy', accuracy)
 
-  # Merge all the summaries and write them out to /tmp/tensorflow/mnist/logs/mnist_with_summaries (by default)
+  # Merge all the summaries and write them out to
+  # /tmp/tensorflow/mnist/logs/mnist_with_summaries (by default)
   merged = tf.summary.merge_all()
   train_writer = tf.summary.FileWriter(FLAGS.log_dir + '/train', sess.graph)
   test_writer = tf.summary.FileWriter(FLAGS.log_dir + '/test')
@@ -196,9 +197,15 @@ if __name__ == '__main__':
                       help='Initial learning rate')
   parser.add_argument('--dropout', type=float, default=0.9,
                       help='Keep probability for training dropout.')
-  parser.add_argument('--data_dir', type=str, default='/tmp/tensorflow/mnist/input_data',
-                      help='Directory for storing input data')
-  parser.add_argument('--log_dir', type=str, default='/tmp/tensorflow/mnist/logs/mnist_with_summaries',
-                      help='Summaries log directory')
+  parser.add_argument(
+      '--data_dir',
+      type=str,
+      default='/tmp/tensorflow/mnist/input_data',
+      help='Directory for storing input data')
+  parser.add_argument(
+      '--log_dir',
+      type=str,
+      default='/tmp/tensorflow/mnist/logs/mnist_with_summaries',
+      help='Summaries log directory')
   FLAGS, unparsed = parser.parse_known_args()
   tf.app.run(main=main, argv=[sys.argv[0]] + unparsed)
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index cad8ccaaad..c367d20f81 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -25,6 +25,7 @@ load("//tensorflow/core:platform/default/build_config.bzl", "tf_proto_library_py
 load("//tensorflow/core:platform/default/build_config.bzl", "tf_additional_lib_deps")
 load("//tensorflow/core:platform/default/build_config_root.bzl", "tf_additional_plugin_deps")
 load("//tensorflow/python:build_defs.bzl", "tf_gen_op_wrapper_private_py")
+load("//tensorflow/core:platform/default/build_config_root.bzl", "tf_additional_verbs_deps")
 
 py_library(
     name = "python",
@@ -2610,7 +2611,9 @@ tf_py_wrap_cc(
         "//tensorflow/tools/graph_transforms:transform_graph_lib",
         "//tensorflow/tools/tfprof/internal:print_model_analysis",
         "//util/python:python_headers",
-    ] + tf_additional_lib_deps() + tf_additional_plugin_deps(),
+    ] + (tf_additional_lib_deps() +
+         tf_additional_plugin_deps() +
+         tf_additional_verbs_deps()),
 )
 
 py_library(
diff --git a/tensorflow/python/framework/dtypes_test.py b/tensorflow/python/framework/dtypes_test.py
index fac2cf4def..f04f67ffed 100644
--- a/tensorflow/python/framework/dtypes_test.py
+++ b/tensorflow/python/framework/dtypes_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tensorflow.python.framework.importer."""
+"""Tests for tensorflow.python.framework.dtypes."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/kernel_tests/reader_ops_test.py b/tensorflow/python/kernel_tests/reader_ops_test.py
index 5e8f8e8673..10f34751d0 100644
--- a/tensorflow/python/kernel_tests/reader_ops_test.py
+++ b/tensorflow/python/kernel_tests/reader_ops_test.py
@@ -352,9 +352,20 @@ class FixedLengthRecordReaderTest(test.TestCase):
     self._record_bytes = 3
     self._footer_bytes = 2
 
+    self._hop_bytes = 2
+    self._num_overlapped_records = 3
+
   def _Record(self, f, r):
     return compat.as_bytes(str(f * 2 + r) * self._record_bytes)
 
+  def _OverlappedRecord(self, f, r):
+    record_str = "".join([
+        str(i)[0]
+        for i in range(r * self._hop_bytes,
+                       r * self._hop_bytes + self._record_bytes)
+    ])
+    return compat.as_bytes(record_str)
+
   def _CreateFiles(self):
     filenames = []
     for i in range(self._num_files):
@@ -367,6 +378,23 @@ class FixedLengthRecordReaderTest(test.TestCase):
         f.write(b"F" * self._footer_bytes)
     return filenames
 
+  def _CreateOverlappedRecordFiles(self):
+    filenames = []
+    for i in range(self._num_files):
+      fn = os.path.join(self.get_temp_dir(),
+                        "fixed_length_overlapped_record.%d.txt" % i)
+      filenames.append(fn)
+      with open(fn, "wb") as f:
+        f.write(b"H" * self._header_bytes)
+        all_records_str = "".join([
+            str(i)[0]
+            for i in range(self._record_bytes + self._hop_bytes *
+                           (self._num_overlapped_records - 1))
+        ])
+        f.write(compat.as_bytes(all_records_str))
+        f.write(b"F" * self._footer_bytes)
+    return filenames
+
   def testOneEpoch(self):
     files = self._CreateFiles()
     with self.test_session() as sess:
@@ -374,6 +402,7 @@ class FixedLengthRecordReaderTest(test.TestCase):
           header_bytes=self._header_bytes,
           record_bytes=self._record_bytes,
           footer_bytes=self._footer_bytes,
+          hop_bytes=0,
           name="test_reader")
       queue = data_flow_ops.FIFOQueue(99, [dtypes.string], shapes=())
       key, value = reader.read(queue)
@@ -390,6 +419,31 @@ class FixedLengthRecordReaderTest(test.TestCase):
                                     "\\(requested 1, current size 0\\)"):
         k, v = sess.run([key, value])
 
+  def testOneEpochWithHopBytes(self):
+    files = self._CreateOverlappedRecordFiles()
+    with self.test_session() as sess:
+      reader = io_ops.FixedLengthRecordReader(
+          header_bytes=self._header_bytes,
+          record_bytes=self._record_bytes,
+          footer_bytes=self._footer_bytes,
+          hop_bytes=self._hop_bytes,
+          name="test_reader")
+      queue = data_flow_ops.FIFOQueue(99, [dtypes.string], shapes=())
+      key, value = reader.read(queue)
+
+      queue.enqueue_many([files]).run()
+      queue.close().run()
+      for i in range(self._num_files):
+        for j in range(self._num_overlapped_records):
+          k, v = sess.run([key, value])
+          print(v)
+          self.assertAllEqual("%s:%d" % (files[i], j), compat.as_text(k))
+          self.assertAllEqual(self._OverlappedRecord(i, j), v)
+
+      with self.assertRaisesOpError("is closed and has insufficient elements "
+                                    "\\(requested 1, current size 0\\)"):
+        k, v = sess.run([key, value])
+
 
 class TFRecordReaderTest(test.TestCase):
 
diff --git a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py
index df5462dd2d..e8b94294b1 100644
--- a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py
+++ b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py
@@ -30,34 +30,44 @@ from tensorflow.python.platform import test
 
 class SparseTensorDenseMatMulGradientTest(test.TestCase):
 
-  def _sparsify(self, x):
+  def _sparsify(self, x, indices_dtype=np.int64):
     x[x < 0.5] = 0
 
     non_zero = np.where(x)
-    x_indices = np.vstack(non_zero).astype(np.int64).T
+    x_indices = np.vstack(non_zero).astype(indices_dtype).T
     x_values = x[non_zero]
     x_shape = x.shape
 
     return sparse_tensor.SparseTensor(
         indices=x_indices, values=x_values, dense_shape=x_shape), len(x_values)
 
-  def _randomTensor(self, size, np_dtype, adjoint=False, sparse=False):
+  def _randomTensor(self,
+                    size,
+                    values_dtype,
+                    adjoint=False,
+                    sparse=False,
+                    indices_dtype=np.int64):
     n, m = size
-    x = np.random.randn(n, m).astype(np_dtype)
+    x = np.random.randn(n, m).astype(values_dtype)
 
     if adjoint:
       x = x.transpose()
 
     if sparse:
-      return self._sparsify(x)
+      return self._sparsify(x, indices_dtype=indices_dtype)
     else:
-      return constant_op.constant(x, dtype=np_dtype)
+      return constant_op.constant(x, dtype=values_dtype)
 
-  def _testGradients(self, adjoint_a, adjoint_b, name, np_dtype):
+  def _testGradients(self, adjoint_a, adjoint_b, name, values_dtype,
+                     indices_dtype):
     n, k, m = np.random.randint(1, 10, size=3)
     sp_t, nnz = self._randomTensor(
-        [n, k], np_dtype, adjoint=adjoint_a, sparse=True)
-    dense_t = self._randomTensor([k, m], np_dtype, adjoint=adjoint_b)
+        [n, k],
+        values_dtype,
+        adjoint=adjoint_a,
+        sparse=True,
+        indices_dtype=indices_dtype)
+    dense_t = self._randomTensor([k, m], values_dtype, adjoint=adjoint_b)
 
     matmul = sparse_ops.sparse_tensor_dense_matmul(
         sp_t, dense_t, adjoint_a=adjoint_a, adjoint_b=adjoint_b, name=name)
@@ -71,17 +81,19 @@ class SparseTensorDenseMatMulGradientTest(test.TestCase):
       print("%s gradient err = %s" % (name, err))
       self.assertLess(err, 1e-3)
 
-  def _testGradientsType(self, np_dtype):
+  def _testGradientsType(self, values_dtype, indices_dtype):
     for adjoint_a in [True, False]:
       for adjoint_b in [True, False]:
-        name = "sparse_tensor_dense_matmul_%s_%s_%s" % (adjoint_a, adjoint_b,
-                                                        np_dtype.__name__)
-        self._testGradients(adjoint_a, adjoint_b, name, np_dtype)
+        name = "sparse_tensor_dense_matmul_%s_%s_%s_%s" % (
+            adjoint_a, adjoint_b, values_dtype.__name__, indices_dtype.__name__)
+        self._testGradients(adjoint_a, adjoint_b, name, values_dtype,
+                            indices_dtype)
 
   def testGradients(self):
     np.random.seed(5)  # Fix seed to avoid flakiness
-    self._testGradientsType(np.float32)
-    self._testGradientsType(np.float64)
+    self._testGradientsType(np.float32, np.int64)
+    self._testGradientsType(np.float64, np.int64)
+    self._testGradientsType(np.float32, np.int32)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
index da72803ee7..8099175186 100644
--- a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
@@ -45,7 +45,12 @@ def _maybe_complex(x):
 
 class SparseTensorDenseMatMulTest(test.TestCase):
 
-  def _testMatmul(self, x, y, adjoint_a=False, adjoint_b=False):
+  def _testMatmul(self,
+                  x,
+                  y,
+                  adjoint_a=False,
+                  adjoint_b=False,
+                  indices_dtype=np.int64):
     x_mat = np.matrix(x)
     if adjoint_a:
       x_mat = x_mat.H
@@ -55,7 +60,7 @@ class SparseTensorDenseMatMulTest(test.TestCase):
 
     np_ans = x_mat * y_mat
 
-    x_indices = np.vstack(np.where(x)).astype(np.int64).T
+    x_indices = np.vstack(np.where(x)).astype(indices_dtype).T
     x_values = x[np.where(x)]
     x_shape = x.shape
 
@@ -82,13 +87,13 @@ class SparseTensorDenseMatMulTest(test.TestCase):
         else:
           self.assertAllClose(np_ans, out, rtol=1e-4, atol=1e-4)
 
-  def _testBasic(self, np_dtype):
-    x = _maybe_complex(np.random.rand(10, 10).astype(np_dtype))
+  def _testBasic(self, value_dtype, indices_dtype=np.int64):
+    x = _maybe_complex(np.random.rand(10, 10).astype(value_dtype))
     x[np.abs(x) < 0.5] = 0  # Make it sparse
 
-    y = _maybe_complex(np.random.randn(10, 20).astype(np_dtype))
+    y = _maybe_complex(np.random.randn(10, 20).astype(value_dtype))
 
-    self._testMatmul(x, y)
+    self._testMatmul(x, y, indices_dtype=indices_dtype)
 
   def testBasic(self):
     np.random.seed(127)  # Repeatable results
@@ -97,6 +102,8 @@ class SparseTensorDenseMatMulTest(test.TestCase):
     self._testBasic(np.float64)
     self._testBasic(np.complex64)
     self._testBasic(np.complex128)
+    self._testBasic(np.int32, indices_dtype=np.int32)
+    self._testBasic(np.float32, indices_dtype=np.int32)
 
   def testShapeInference(self):
     x = np.random.rand(10, 10)
diff --git a/tensorflow/python/layers/convolutional_test.py b/tensorflow/python/layers/convolutional_test.py
index c3e133d08b..da962b2f99 100644
--- a/tensorflow/python/layers/convolutional_test.py
+++ b/tensorflow/python/layers/convolutional_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tf.layers.core."""
+"""Tests for tf.layers.convolutional."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/layers/normalization_test.py b/tensorflow/python/layers/normalization_test.py
index 0f82f73ea4..933f196e01 100644
--- a/tensorflow/python/layers/normalization_test.py
+++ b/tensorflow/python/layers/normalization_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tf.layers.core."""
+"""Tests for tf.layers.normalization."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/layers/utils_test.py b/tensorflow/python/layers/utils_test.py
index ace8046a0b..54e757c112 100644
--- a/tensorflow/python/layers/utils_test.py
+++ b/tensorflow/python/layers/utils_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tf.layers.core."""
+"""Tests for tf.layers.utils."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/ops/batch_norm_benchmark.py b/tensorflow/python/ops/batch_norm_benchmark.py
index 397ed91078..c2ee2b3832 100644
--- a/tensorflow/python/ops/batch_norm_benchmark.py
+++ b/tensorflow/python/ops/batch_norm_benchmark.py
@@ -198,7 +198,7 @@ class BatchNormBenchmark(test.Benchmark):
     if FLAGS.use_gpu:
       t1 = self._run_graph("gpu", shape, axes, 10, "op", True, True, 50)
       t2 = self._run_graph("gpu", shape, axes, 10, "py", True, True, 50)
-      t2 = self._run_graph("gpu", shape, axes, 10, "slow", True, True, 50)
+      t3 = self._run_graph("gpu", shape, axes, 10, "slow", True, True, 50)
       print_difference("op vs py", t1, t2)
       print_difference("py vs slow", t2, t3)
     print("Forward convolution (higher layers).")
diff --git a/tensorflow/python/ops/io_ops.py b/tensorflow/python/ops/io_ops.py
index ae45c40aec..68ecc219e4 100644
--- a/tensorflow/python/ops/io_ops.py
+++ b/tensorflow/python/ops/io_ops.py
@@ -391,7 +391,11 @@ class FixedLengthRecordReader(ReaderBase):
   """
   # TODO(josh11b): Support serializing and restoring state.
 
-  def __init__(self, record_bytes, header_bytes=None, footer_bytes=None,
+  def __init__(self,
+               record_bytes,
+               header_bytes=None,
+               footer_bytes=None,
+               hop_bytes=None,
                name=None):
     """Create a FixedLengthRecordReader.
 
@@ -399,11 +403,15 @@ class FixedLengthRecordReader(ReaderBase):
       record_bytes: An int.
       header_bytes: An optional int. Defaults to 0.
       footer_bytes: An optional int. Defaults to 0.
+      hop_bytes: An optional int. Defaults to 0.
       name: A name for the operation (optional).
     """
     rr = gen_io_ops._fixed_length_record_reader_v2(
-        record_bytes=record_bytes, header_bytes=header_bytes,
-        footer_bytes=footer_bytes, name=name)
+        record_bytes=record_bytes,
+        header_bytes=header_bytes,
+        footer_bytes=footer_bytes,
+        hop_bytes=hop_bytes,
+        name=name)
     super(FixedLengthRecordReader, self).__init__(rr)
 
 
diff --git a/tensorflow/python/ops/nn_impl.py b/tensorflow/python/ops/nn_impl.py
index 118ade45ec..7c17cf2cb6 100644
--- a/tensorflow/python/ops/nn_impl.py
+++ b/tensorflow/python/ops/nn_impl.py
@@ -639,18 +639,22 @@ def moments(x, axes, shift=None, name=None, keep_dims=False):
           math_ops.reduce_mean(y, axes, keep_dims=True))
     else:
       shift = math_ops.cast(shift, y.dtype)
-    counts, m_ss, v_ss, shift = sufficient_statistics(
-        y, axes, shift=shift, keep_dims=keep_dims, name=name)
-    # Reshape shift as needed.
-    shift = array_ops.reshape(shift, array_ops.shape(m_ss))
-    shift.set_shape(m_ss.get_shape())
-    with ops.control_dependencies([counts, m_ss, v_ss]):
-      mean, variance = normalize_moments(counts, m_ss, v_ss, shift, name=name)
-      if x.dtype == dtypes.float16:
-        return (math_ops.cast(mean, dtypes.float16),
-                math_ops.cast(variance, dtypes.float16))
-      else:
-        return (mean, variance)
+    shifted_mean = math_ops.reduce_mean(
+        math_ops.subtract(y, shift), axes, keep_dims=True, name="shifted_mean")
+    variance = math_ops.subtract(
+        math_ops.reduce_mean(
+            math_ops.squared_difference(y, shift), axes, keep_dims=True),
+        math_ops.square(shifted_mean),
+        name="variance")
+    mean = math_ops.add(shifted_mean, shift, name="mean")
+    if not keep_dims:
+      mean = array_ops.squeeze(mean, axes)
+      variance = array_ops.squeeze(variance, axes)
+    if x.dtype == dtypes.float16:
+      return (math_ops.cast(mean, dtypes.float16), math_ops.cast(
+          variance, dtypes.float16))
+    else:
+      return (mean, variance)
 
 
 def weighted_moments(x, axes, frequency_weights, name=None, keep_dims=False):
diff --git a/tensorflow/python/ops/sparse_grad.py b/tensorflow/python/ops/sparse_grad.py
index fa015856ce..b8e356c78c 100644
--- a/tensorflow/python/ops/sparse_grad.py
+++ b/tensorflow/python/ops/sparse_grad.py
@@ -136,12 +136,13 @@ def _SparseTensorDenseMatMulGrad(op, grad):
   Raises:
     TypeError: When the two operands don't have the same type.
   """
-  sp_t = sparse_tensor.SparseTensor(*op.inputs[:3])
+  a_indices, a_values, a_shape = op.inputs[:3]
+  b = op.inputs[3]
   adj_a = op.get_attr("adjoint_a")
   adj_b = op.get_attr("adjoint_b")
 
-  a_type = sp_t.values.dtype.base_dtype
-  b_type = op.inputs[3].dtype.base_dtype
+  a_type = a_values.dtype.base_dtype
+  b_type = b.dtype.base_dtype
   if a_type != b_type:
     raise TypeError("SparseTensorDenseMatMul op received operands with "
                     "different types: ", a_type, " and ", b_type)
@@ -150,15 +151,12 @@ def _SparseTensorDenseMatMulGrad(op, grad):
                               "complex gradients.")
 
   # gradient w.r.t. dense
-  b_grad = sparse_ops.sparse_tensor_dense_matmul(sp_t, grad,
-                                                 adjoint_a=not adj_a)
+  b_grad = gen_sparse_ops._sparse_tensor_dense_mat_mul(  # pylint: disable=protected-access
+      a_indices, a_values, a_shape, grad, adjoint_a=not adj_a)
   if adj_b:
     b_grad = array_ops.transpose(b_grad)
 
   # gradient w.r.t. sparse values
-  a_indices = op.inputs[0]
-  b = op.inputs[3]
-
   rows = a_indices[:, 0]
   cols = a_indices[:, 1]
 
diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 9f4e6607d1..af7abf5251 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -1239,7 +1239,7 @@ def sparse_tensor_dense_matmul(sp_a,
     A should be sorted in order of increasing dimension 1 (i.e., "column major"
     order instead of "row major" order).
 
-  Deciding when to use sparse_tensor_dense_matmul vs. matmul(sp_a=True):
+  Deciding when to use sparse_tensor_dense_matmul vs. matmul(a_is_sparse=True):
 
   There are a number of questions to ask in the decision process, including:
 
@@ -1249,14 +1249,14 @@ def sparse_tensor_dense_matmul(sp_a,
 
   If the answer to several of these questions is yes, consider
   converting the `SparseTensor` to a dense one and using `tf.matmul` with
-  `sp_a=True`.
+  `a_is_sparse=True`.
 
   This operation tends to perform well when A is more sparse, if the column size
   of the product is small (e.g. matrix-vector multiplication), if
   `sp_a.dense_shape` takes on large values.
 
   Below is a rough speed comparison between sparse_tensor_dense_matmul,
-  labelled 'sparse', and matmul(sp_a=True), labelled 'dense'.  For purposes of
+  labelled 'sparse', and matmul(a_is_sparse=True), labelled 'dense'.  For purposes of
   the comparison, the time spent converting from a SparseTensor to a dense
   Tensor is not included, so it is overly conservative with respect to
   the time ratio.
diff --git a/tensorflow/stream_executor/stream_executor_internal.h b/tensorflow/stream_executor/stream_executor_internal.h
index 751ccd3d0e..9d3ac4ed9e 100644
--- a/tensorflow/stream_executor/stream_executor_internal.h
+++ b/tensorflow/stream_executor/stream_executor_internal.h
@@ -319,7 +319,7 @@ class StreamExecutorInterface {
   // Creates a new DnnSupport object, ownership is transferred to the caller.
   // If SupportsDnn() is false, this will always return null.
   //
-  // If SupportsDnn() is true, this may return null, for example, if the RNG
+  // If SupportsDnn() is true, this may return null, for example, if the DNN
   // initialization fails.
   virtual dnn::DnnSupport *CreateDnn() { return nullptr; }
 
diff --git a/tensorflow/tensorboard/DEVELOPMENT.md b/tensorflow/tensorboard/DEVELOPMENT.md
index 0a35dec42f..3ff2c87dab 100644
--- a/tensorflow/tensorboard/DEVELOPMENT.md
+++ b/tensorflow/tensorboard/DEVELOPMENT.md
@@ -21,7 +21,7 @@ Then, cd into the TensorBoard directory:
 
 and install dependencies:
 
-`npm run prepare`
+`npm run prep`
 
 Then, run gulp: `gulp`
 
diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 2a0a029ffa..8610940ac3 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -3325,6 +3325,7 @@ var Categorizer;
       // if undefined, default value (enable for first k runs, disable after).
         type: Object,
         value: TF.URIStorage.getObjectInitializer('runSelectionState', {}),
+        observer: "_storeRunToIsCheckedMapping",
       },
       // (Allows state to persist across regex filtering)
       outSelected: {
@@ -3373,24 +3374,7 @@ var Categorizer;
     },
     observers: [
       "_setIsolatorIcon(runSelectionState, names)",
-      "_storeRunToIsCheckedMappingWithDefault(runSelectionState, namesMatchingRegex)",
     ],
-    _storeRunToIsCheckedMappingWithDefault() {
-      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
-      if (runSelectionStateIsDefault || this.namesMatchingRegex == null) {
-        return;
-      }
-      var _this = this;
-      var allToggledOn = this.namesMatchingRegex
-              .every(function(n) {return _this.runSelectionState[n]});
-      var allToggledOff = this.namesMatchingRegex
-              .every(function(n) {return !_this.runSelectionState[n]});
-      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
-      if (defaultOff && allToggledOff || !defaultOff && allToggledOn) {
-        this.runSelectionState = {};
-      }
-      this._storeRunToIsCheckedMapping(this.runSelectionState);
-    },
     _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
     _makeRegex: function(regex) {
       try {
@@ -27156,4 +27140,4 @@ arguments[4][8][0].apply(exports,arguments)
 },{"dup":8}]},{},[35,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34]);
 </script>
 </dom-module>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tensorflow/tensorboard/gulp_tasks/bower.js b/tensorflow/tensorboard/gulp_tasks/bower.js
index 7c0e515c6c..8f4666a8c1 100644
--- a/tensorflow/tensorboard/gulp_tasks/bower.js
+++ b/tensorflow/tensorboard/gulp_tasks/bower.js
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var bower = require('gulp-bower');
+const gulp = require('gulp');
+const bower = require('gulp-bower');
 
 module.exports = function() {
   return function() {
diff --git a/tensorflow/tensorboard/gulp_tasks/compile.js b/tensorflow/tensorboard/gulp_tasks/compile.js
index 3d0d725cfb..01af60eba7 100644
--- a/tensorflow/tensorboard/gulp_tasks/compile.js
+++ b/tensorflow/tensorboard/gulp_tasks/compile.js
@@ -13,25 +13,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var ts = require('gulp-typescript');
-var typescript = require('typescript');
-var gutil = require('gulp-util');
-var filter = require('gulp-filter');
-var merge = require('merge2');
-var browserify = require('browserify');
-var tsify = require('tsify');
-var source = require('vinyl-source-stream');
-var glob = require('glob').sync;
-var concat = require('gulp-concat');
+const gulp = require('gulp');
+const ts = require('gulp-typescript');
+const typescript = require('typescript');
+const gutil = require('gulp-util');
+const filter = require('gulp-filter');
+const merge = require('merge2');
+const browserify = require('browserify');
+const tsify = require('tsify');
+const source = require('vinyl-source-stream');
+const glob = require('glob').sync;
+const concat = require('gulp-concat');
 
-var tsProject = ts.createProject('./tsconfig.json', {
+const tsProject = ts.createProject('./tsconfig.json', {
   typescript: typescript,
-  noExternalResolve: true, // opt-in for faster compilation!
+  noExternalResolve: true,  // opt-in for faster compilation!
 });
 
 /** List of components (and their external deps) that are using es6 modules. */
-var ES6_COMPONENTS = [{
+const ES6_COMPONENTS = [{
   name: 'vz_projector',
   deps: [
     'd3/d3.min.js', 'weblas/dist/weblas.js', 'three.js/build/three.min.js',
@@ -44,8 +44,8 @@ module.exports = function(includeDeps) {
   return function() {
     // Compile all components that are using ES6 modules into a bundle.js
     // using browserify.
-    var entries = ['typings/index.d.ts'];
-    var deps = {};
+    const entries = ['typings/index.d.ts'];
+    const deps = {};
     ES6_COMPONENTS.forEach(function(component) {
       // Collect all the typescript files across the components.
       entries = entries.concat(glob(
@@ -79,7 +79,7 @@ module.exports = function(includeDeps) {
 
     // Compile components that are using global namespaces producing 1 js file
     // for each ts file.
-    var isComponent = filter([
+    const isComponent = filter([
       'components/tf_*/**/*.ts', 'components/vz_*/**/*.ts', 'typings/**/*.ts',
       'components/plottable/plottable.d.ts'
       // Ignore components that use es6 modules.
diff --git a/tensorflow/tensorboard/gulp_tasks/test.js b/tensorflow/tensorboard/gulp_tasks/test.js
index ffa8122c7b..0c8b14a4cd 100644
--- a/tensorflow/tensorboard/gulp_tasks/test.js
+++ b/tensorflow/tensorboard/gulp_tasks/test.js
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var tester = require('web-component-tester').test;
+const gulp = require('gulp');
+const tester = require('web-component-tester').test;
 
 module.exports = function(done) {
   tester({}, function(error) {
diff --git a/tensorflow/tensorboard/gulp_tasks/util.js b/tensorflow/tensorboard/gulp_tasks/util.js
index 7a1d2a58ab..0d73f69c73 100644
--- a/tensorflow/tensorboard/gulp_tasks/util.js
+++ b/tensorflow/tensorboard/gulp_tasks/util.js
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var fs = require('fs');
-var path = require('path');
+const fs = require('fs');
+const path = require('path');
 
 /**
  * Returns a list of web components inside the components directory for which
@@ -34,6 +34,6 @@ exports.getComponents = function(namePredicate) {
  * directory.
  */
 exports.tbComponents = exports.getComponents(function(name) {
-  var prefix = name.slice(0, 3);
+  const prefix = name.slice(0, 3);
   return prefix == 'tf_' || prefix == 'vz_';
 });
diff --git a/tensorflow/tensorboard/gulp_tasks/vulcanize.js b/tensorflow/tensorboard/gulp_tasks/vulcanize.js
index 89700e1d4c..d2286f1d6c 100644
--- a/tensorflow/tensorboard/gulp_tasks/vulcanize.js
+++ b/tensorflow/tensorboard/gulp_tasks/vulcanize.js
@@ -13,15 +13,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var path = require('path');
-var util = require('./util');
-var vulcanize = require('gulp-vulcanize');
-var replace = require('gulp-replace');
-var rename = require('gulp-rename');
-var header = require('gulp-header');
+const gulp = require('gulp');
+const path = require('path');
+const util = require('./util');
+const vulcanize = require('gulp-vulcanize');
+const replace = require('gulp-replace');
+const rename = require('gulp-rename');
+const header = require('gulp-header');
 
-var HEADER_STR = '<!-- Copyright 2015 The TensorFlow Authors. All Rights Reserved.\n\
+const HEADER_STR =
+    '<!-- Copyright 2015 The TensorFlow Authors. All Rights Reserved.\n\
 \n\
 Licensed under the Apache License, Version 2.0 (the "License");\n\
 you may not use this file except in compliance with the License.\n\
@@ -40,16 +41,16 @@ This file is generated by `gulp` & `vulcanize`. Do not directly change it.\n\
 Instead, use `gulp regenerate` to create a new version with your changes.\n\
 -->\n\n'
 
-var base = path.join(__dirname, '../components');
+const base = path.join(__dirname, '../components');
 // List of redirects of the form path1|path2 for every tensorboard component
 // in order to replace dashes with underscores.
 // E.g. .../tf-tensorboard|.../tf_tensorboard
-var redirects = util.tbComponents.map(function(dir) {
+const redirects = util.tbComponents.map(function(dir) {
   return path.join(base, dir.replace(/_/g, '-')) + '|' + path.join(base, dir);
 });
 
-var nonTBComponents = util.getComponents(function(name) {
-  var prefix = name.slice(0, 3);
+const nonTBComponents = util.getComponents(function(name) {
+  const prefix = name.slice(0, 3);
   return prefix !== 'tf_'  && prefix !== 'vz_';
 });
 
@@ -65,7 +66,7 @@ nonTBComponents.push('/tf-imports/plottable.js');
 
 module.exports = function(overwrite) {
   return function() {
-    var suffix = overwrite ? '' : '.OPENSOURCE';
+    const suffix = overwrite ? '' : '.OPENSOURCE';
     // Vulcanize TensorBoard without external libraries.
     gulp.src('components/tf_tensorboard/tf-tensorboard.html')
         .pipe(vulcanize({
diff --git a/tensorflow/tensorboard/gulpfile.js b/tensorflow/tensorboard/gulpfile.js
index 257ee0ab83..c03c4faebc 100644
--- a/tensorflow/tensorboard/gulpfile.js
+++ b/tensorflow/tensorboard/gulpfile.js
@@ -13,15 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-var gulp = require('gulp');
-var server = require('gulp-server-livereload');
-var minimist = require('minimist');
-var util = require('./gulp_tasks/util');
+const gulp = require('gulp');
+const server = require('gulp-server-livereload');
+const minimist = require('minimist');
+const util = require('./gulp_tasks/util');
 
-var options = minimist(process.argv.slice(2), {
+const options = minimist(process.argv.slice(2), {
   default: {
-    p: 8000,  // port for gulp server
-    h: '0.0.0.0', // host to serve on
+    p: 8000,       // port for gulp server
+    h: '0.0.0.0',  // host to serve on
   }
 });
 
@@ -43,8 +43,8 @@ gulp.task('watch', [], function() {
       {ignoreInitial: true}, ['compile']);
 });
 
-var httpPrefix = 'http://' + options.h + ':' + options.p + '/components';
-var proxies = util.tbComponents.map(function(component) {
+const httpPrefix = 'http://' + options.h + ':' + options.p + '/components';
+const proxies = util.tbComponents.map(function(component) {
   return {
     source: '/components' + component.replace(/_/g, '-'),
     target: httpPrefix + component
@@ -84,7 +84,7 @@ gulp.task(
 gulp.task('default', ['watch', 'server']);
 
 // Clean all compiled JS files.
-var cleanCompiledTypeScript = require('gulp-clean-compiled-typescript');
+const cleanCompiledTypeScript = require('gulp-clean-compiled-typescript');
 gulp.task('clean', function () {
   return gulp.src(['./components/**/*.ts', '!./components/**/deps.d.ts'])
       .pipe(cleanCompiledTypeScript());
diff --git a/tensorflow/tensorboard/package.json b/tensorflow/tensorboard/package.json
index 5dcf2f21e9..69f08495a3 100644
--- a/tensorflow/tensorboard/package.json
+++ b/tensorflow/tensorboard/package.json
@@ -4,7 +4,7 @@
   "description": "Visualizers for TensorFlow",
   "scripts": {
     "test": "gulp test",
-    "prepare": "npm install && bower install && typings install",
+    "prep": "npm install && bower install && typings install",
     "compile": "gulp compile"
   },
   "keywords": [
diff --git a/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
index e7e36e2bb3..5c77b3dd5c 100644
--- a/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-fixed-length-record-reader.pbtxt
@@ -13,7 +13,7 @@ tf_class {
   }
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'record_bytes\', \'header_bytes\', \'footer_bytes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+    argspec: "args=[\'self\', \'record_bytes\', \'header_bytes\', \'footer_bytes\', \'hop_bytes\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
   }
   member_method {
     name: "num_records_produced"
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index 7bf7fd5719..bfac54c601 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -71,8 +71,8 @@ ENV BAZEL_VERSION 0.4.5
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
-    curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
-    curl -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE.txt && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
     chmod +x bazel-*.sh && \
     ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
     cd / && \
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 769731974a..7726cbdfbf 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -71,8 +71,8 @@ ENV BAZEL_VERSION 0.4.5
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
-    curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
-    curl -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE.txt && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
     chmod +x bazel-*.sh && \
     ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
     cd / && \
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index e20d74fd4a..3ee99d5d31 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc1'
+_VERSION = '1.1.0-rc2'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
diff --git a/third_party/jemalloc.BUILD b/third_party/jemalloc.BUILD
index aabff39d7b..8ed13c51a5 100644
--- a/third_party/jemalloc.BUILD
+++ b/third_party/jemalloc.BUILD
@@ -89,6 +89,14 @@ cc_library(
         "-D_REENTRANT",
     ],
     includes = ["include"],
+    # pthread_atfork() is called for PPC.
+    linkopts = select({
+        "@%ws%//tensorflow:linux_ppc64le": [
+            "-lpthread",
+        ],
+        "//conditions:default": [
+        ],
+    }),
     visibility = ["//visibility:public"],
 )
 
@@ -183,12 +191,17 @@ sh_binary(
     srcs = ["include/jemalloc/internal/size_classes.sh"],
 )
 
-# Size classes for Linux x86_64. Update if adding builds for other
+# Size classes for Linux x86_64 and ppc64le. Update if adding builds for other
 # architectures. See size_classes.sh for details on the arguments.
+# For default case, kept the arguments same as that of  x86_64 for now.
 genrule(
     name = "size_classes_h",
     outs = ["include/jemalloc/internal/size_classes.h"],
-    cmd = "$(location :size_classes_sh) \"3 4\" 3 12 2 >$@",
+    cmd = select({
+        "@%ws%//tensorflow:linux_ppc64le": "$(location :size_classes_sh) \"3 4\" 3 16 2 >$@",
+        "@%ws%//tensorflow:linux_x86_64": "$(location :size_classes_sh) \"3 4\" 3 12 2 >$@",
+        "//conditions:default": "$(location :size_classes_sh) \"3 4\" 3 12 2 >$@",
+    }),
     tools = [":size_classes_sh"],
 )
 
@@ -210,7 +223,13 @@ template_rule(
         "#undef JEMALLOC_PREFIX": "#define JEMALLOC_PREFIX \"jemalloc_\"",
         "#undef JEMALLOC_CPREFIX": "#define JEMALLOC_CPREFIX \"JEMALLOC_\"",
         "#undef JEMALLOC_PRIVATE_NAMESPACE": "#define JEMALLOC_PRIVATE_NAMESPACE je_",
-        "#undef CPU_SPINWAIT": "#define CPU_SPINWAIT __asm__ volatile(\"pause\")",
+        "#undef CPU_SPINWAIT": "\n".join([
+            "#if defined(__powerpc64__) || defined(__powerpc__)",
+            "#define CPU_SPINWAIT __asm__ volatile(\"or 27,27,27\")",
+            "#else",
+            "#define CPU_SPINWAIT __asm__ volatile(\"pause\")",
+            "#endif",
+        ]),
         "#undef JEMALLOC_HAVE_BUILTIN_CLZ": "#define JEMALLOC_HAVE_BUILTIN_CLZ",
         "#undef JEMALLOC_USE_SYSCALL": "#define JEMALLOC_USE_SYSCALL",
         "#undef JEMALLOC_HAVE_SECURE_GETENV": "#define JEMALLOC_HAVE_SECURE_GETENV",
@@ -226,7 +245,13 @@ template_rule(
         "#undef JEMALLOC_DSS": "#define JEMALLOC_DSS",
         "#undef JEMALLOC_FILL": "#define JEMALLOC_FILL",
         "#undef LG_TINY_MIN": "#define LG_TINY_MIN 3",
-        "#undef LG_PAGE": "#define LG_PAGE 12",
+        "#undef LG_PAGE": "\n".join([
+            "#if defined(__powerpc64__) || defined(__powerpc__)",
+            "#define LG_PAGE 16",
+            "#else",
+            "#define LG_PAGE 12",
+            "#endif",
+        ]),
         "#undef JEMALLOC_MAPS_COALESCE": "#define JEMALLOC_MAPS_COALESCE",
         "#undef JEMALLOC_TLS": "#define JEMALLOC_TLS",
         "#undef JEMALLOC_INTERNAL_UNREACHABLE": "#define JEMALLOC_INTERNAL_UNREACHABLE __builtin_unreachable",
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 819807220b..d5ab326283 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -152,6 +152,11 @@ all_cmake_vars = select({
         cmake_vars + llvm_target_cmake_vars("X86", "x86_64-apple-darwin") +
         darwin_cmake_vars,
     ),
+    "@%ws%//tensorflow:linux_ppc64le": cmake_var_string(
+        cmake_vars +
+        llvm_target_cmake_vars("PowerPC", "powerpc64le-unknown-linux_gnu") +
+        linux_cmake_vars,
+    ),
     "//conditions:default": cmake_var_string(
         cmake_vars +
         llvm_target_cmake_vars("X86", "x86_64-unknown-linux_gnu") +
-- 
GitLab


From 7a6b29fa3c1b63f48b6d8655de303ccf37b65600 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 22 Apr 2017 06:48:18 -0800
Subject: [PATCH 0630/1563] Update ops-related pbtxt files. Change: 153926910

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 149 ++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |  90 +++++------
 2 files changed, 185 insertions(+), 54 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 1781f778b4..dfec411ca5 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -7453,6 +7453,54 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "FixedLengthRecordReader"
+  output_arg {
+    name: "reader_handle"
+    type: DT_STRING
+    is_ref: true
+  }
+  attr {
+    name: "header_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "record_bytes"
+    type: "int"
+  }
+  attr {
+    name: "footer_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "hop_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "FixedLengthRecordReaderV2"
   output_arg {
@@ -7493,6 +7541,53 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "FixedLengthRecordReaderV2"
+  output_arg {
+    name: "reader_handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "header_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "record_bytes"
+    type: "int"
+  }
+  attr {
+    name: "footer_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "hop_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "FixedUnigramCandidateSampler"
   input_arg {
@@ -21628,6 +21723,60 @@ op {
     }
   }
 }
+op {
+  name: "SparseTensorDenseMatMul"
+  input_arg {
+    name: "a_indices"
+    type_attr: "Tindices"
+  }
+  input_arg {
+    name: "a_values"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "a_shape"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "b"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "product"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "Tindices"
+    type: "type"
+    default_value {
+      type: DT_INT64
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "adjoint_a"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "adjoint_b"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+}
 op {
   name: "SparseToDense"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index cbbabe0b87..d3c1ec1abc 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -7623,10 +7623,12 @@ op {
     default_value {
       i: 0
     }
+    description: "Number of bytes in the header, defaults to 0."
   }
   attr {
     name: "record_bytes"
     type: "int"
+    description: "Number of bytes in the record."
   }
   attr {
     name: "footer_bytes"
@@ -7634,6 +7636,15 @@ op {
     default_value {
       i: 0
     }
+    description: "Number of bytes in the footer, defaults to 0."
+  }
+  attr {
+    name: "hop_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+    description: "Number of bytes to hop before each read. Default of 0 means using\nrecord_bytes."
   }
   attr {
     name: "container"
@@ -7667,10 +7678,12 @@ op {
     default_value {
       i: 0
     }
+    description: "Number of bytes in the header, defaults to 0."
   }
   attr {
     name: "record_bytes"
     type: "int"
+    description: "Number of bytes in the record."
   }
   attr {
     name: "footer_bytes"
@@ -7678,6 +7691,15 @@ op {
     default_value {
       i: 0
     }
+    description: "Number of bytes in the footer, defaults to 0."
+  }
+  attr {
+    name: "hop_bytes"
+    type: "int"
+    default_value {
+      i: 0
+    }
+    description: "Number of bytes to hop before each read. Default of 0 means using\nrecord_bytes."
   }
   attr {
     name: "container"
@@ -23120,7 +23142,7 @@ op {
   input_arg {
     name: "a_indices"
     description: "2-D.  The `indices` of the `SparseTensor`, size `[nnz, 2]` Matrix."
-    type: DT_INT64
+    type_attr: "Tindices"
   }
   input_arg {
     name: "a_values"
@@ -23145,6 +23167,19 @@ op {
     name: "T"
     type: "type"
   }
+  attr {
+    name: "Tindices"
+    type: "type"
+    default_value {
+      type: DT_INT64
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
   attr {
     name: "adjoint_a"
     type: "bool"
@@ -26416,59 +26451,6 @@ op {
   summary: "Computes the sum along segments of a tensor."
   description: "Read @{$math_ops#segmentation$the section on segmentation} for an explanation of\nsegments.\n\nComputes a tensor such that\n`(output[i] = sum_{j...} data[j...]` where the sum is over tuples `j...` such\nthat `segment_ids[j...] == i`.  Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\nrange of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/UnsortedSegmentSum.png\" alt>\n</div>"
 }
-op {
-  name: "UnsortedSegmentSum"
-  input_arg {
-    name: "data"
-    type_attr: "T"
-  }
-  input_arg {
-    name: "segment_ids"
-    description: "A tensor whose shape is a prefix of `data.shape`."
-    type_attr: "Tindices"
-  }
-  input_arg {
-    name: "num_segments"
-    type: DT_INT32
-  }
-  output_arg {
-    name: "output"
-    description: "Has same shape as data, except for the first `segment_ids.rank`\ndimensions, which are replaced with a single dimension which has size\n`num_segments`."
-    type_attr: "T"
-  }
-  attr {
-    name: "T"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
-      }
-    }
-  }
-  attr {
-    name: "Tindices"
-    type: "type"
-    allowed_values {
-      list {
-        type: DT_INT32
-        type: DT_INT64
-      }
-    }
-  }
-  summary: "Computes the max along segments of a tensor."
-  description: "Read [the section on\nSegmentation](../../api_docs/python/math_ops.md#segmentation) for an explanation\nof segments.\n\nComputes a tensor such that\n\\\\(output_i = \\sum_j data_j\\\\) where sum is over `j` such\nthat `segment_ids[j] == i`. Unlike `SegmentSum`, `segment_ids`\nneed not be sorted and need not cover all values in the full\n  range of valid values.\n\nIf the sum is empty for a given segment ID `i`, `output[i] = 0`.\n\n`num_segments` should equal the number of distinct segment IDs.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/UnsortedSegmentSum.png\" alt>\n</div>"
-}
 op {
   name: "Unstage"
   output_arg {
-- 
GitLab


From 4b48638fc51674bb117e955481027a557eea9a99 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 22 Apr 2017 06:53:20 -0800
Subject: [PATCH 0631/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 153927049

---
 tensorflow/go/op/wrappers.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index b21e8fd448..d9c168803a 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -11265,6 +11265,8 @@ func QuantizedRelu6(scope *Scope, features tf.Output, min_features tf.Output, ma
 type FixedLengthRecordReaderV2Attr func(optionalAttr)
 
 // FixedLengthRecordReaderV2HeaderBytes sets the optional header_bytes attribute to value.
+//
+// value: Number of bytes in the header, defaults to 0.
 // If not specified, defaults to 0
 func FixedLengthRecordReaderV2HeaderBytes(value int64) FixedLengthRecordReaderV2Attr {
 	return func(m optionalAttr) {
@@ -11273,6 +11275,8 @@ func FixedLengthRecordReaderV2HeaderBytes(value int64) FixedLengthRecordReaderV2
 }
 
 // FixedLengthRecordReaderV2FooterBytes sets the optional footer_bytes attribute to value.
+//
+// value: Number of bytes in the footer, defaults to 0.
 // If not specified, defaults to 0
 func FixedLengthRecordReaderV2FooterBytes(value int64) FixedLengthRecordReaderV2Attr {
 	return func(m optionalAttr) {
@@ -11280,6 +11284,17 @@ func FixedLengthRecordReaderV2FooterBytes(value int64) FixedLengthRecordReaderV2
 	}
 }
 
+// FixedLengthRecordReaderV2HopBytes sets the optional hop_bytes attribute to value.
+//
+// value: Number of bytes to hop before each read. Default of 0 means using
+// record_bytes.
+// If not specified, defaults to 0
+func FixedLengthRecordReaderV2HopBytes(value int64) FixedLengthRecordReaderV2Attr {
+	return func(m optionalAttr) {
+		m["hop_bytes"] = value
+	}
+}
+
 // FixedLengthRecordReaderV2Container sets the optional container attribute to value.
 //
 // value: If non-empty, this reader is placed in the given container.
@@ -11304,6 +11319,9 @@ func FixedLengthRecordReaderV2SharedName(value string) FixedLengthRecordReaderV2
 
 // A Reader that outputs fixed-length records from a file.
 //
+// Arguments:
+//	record_bytes: Number of bytes in the record.
+//
 // Returns The handle to reference the Reader.
 func FixedLengthRecordReaderV2(scope *Scope, record_bytes int64, optional ...FixedLengthRecordReaderV2Attr) (reader_handle tf.Output) {
 	if scope.Err() != nil {
-- 
GitLab


From ed3beaa249e961055919776092b31f65d6ab0b9d Mon Sep 17 00:00:00 2001
From: Dan Smilkov <smilkov@google.com>
Date: Sat, 22 Apr 2017 08:09:08 -0800
Subject: [PATCH 0632/1563] Add analytics tracking ONLY for internal users
 (googlers) of graph visualizer.

Concretely: log a pageview the first time the graph tab was selected.
Change: 153929672
---
 .../components/tf_graph_dashboard/tf-graph-dashboard.html     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
index 050e7cb74a..573c3dfa60 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
@@ -182,7 +182,9 @@ TF.Dashboard.TfGraphDashboard = Polymer({
       // Either this dashboard is already initialized ... or we are not yet ready to initialize.
       return;
     }
-
+    if (typeof ga !== 'undefined' && ga != null) {
+      ga('send', {hitType: 'pageview', page: '/v/graph'});
+    }
     // Set this to true so we only initialize once.
     this._initialized = true;
     Promise.all([backend.graphRuns(), backend.runMetadataRuns()])
-- 
GitLab


From 11d7a2bbd33db7485d403d23b4b0e6489e7bbf90 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Sat, 22 Apr 2017 11:45:38 -0800
Subject: [PATCH 0633/1563] tfdbg: Python interface, implementation and tests
 for gRPC debug ops gating Change: 153936962

---
 tensorflow/core/kernels/debug_ops.h            |  2 +-
 tensorflow/python/debug/lib/debug_data.py      | 10 +++++-----
 tensorflow/python/debug/lib/debug_data_test.py | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tensorflow/core/kernels/debug_ops.h b/tensorflow/core/kernels/debug_ops.h
index 080c3ac3fe..353b837e04 100644
--- a/tensorflow/core/kernels/debug_ops.h
+++ b/tensorflow/core/kernels/debug_ops.h
@@ -107,10 +107,10 @@ class BaseDebugOp : public OpKernel {
   explicit BaseDebugOp(const string& debug_op_name,
                        OpKernelConstruction* context)
       : OpKernel(context), debug_op_name_(debug_op_name) {
-    watch_key_ = strings::StrCat(tensor_name_, ":", debug_op_name_);
     OP_REQUIRES_OK(context, context->GetAttr("tensor_name", &tensor_name_));
     OP_REQUIRES_OK(context, context->GetAttr("debug_urls", &debug_urls_));
     OP_REQUIRES_OK(context, context->GetAttr("gated_grpc", &gated_grpc_));
+    watch_key_ = strings::StrCat(tensor_name_, ":", debug_op_name_);
   }
 
   bool IsExpensive() override { return false; }
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index bb457a01b2..2b11039215 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -215,7 +215,7 @@ def is_copy_node(node_name):
   return node_name.startswith("__copy_")
 
 
-def _is_debug_node(node_name):
+def is_debug_node(node_name):
   """Determine whether a node name is that of a debug node.
 
   Such nodes are inserted by TensorFlow core upon request in
@@ -230,7 +230,7 @@ def _is_debug_node(node_name):
   return node_name.startswith("__dbg_")
 
 
-def _parse_debug_node_name(node_name):
+def parse_debug_node_name(node_name):
   """Parse the name of a debug node.
 
   Args:
@@ -791,12 +791,12 @@ class DebugDumpDir(object):
       ValueError: If duplicate node names are encountered.
     """
 
-    if _is_debug_node(node.name):
+    if is_debug_node(node.name):
       # This is a debug node. Parse the node name and retrieve the
       # information about debug watches on tensors. But do not include
       # the node in the graph.
       (watched_node_name, watched_output_slot, _,
-       debug_op) = _parse_debug_node_name(node.name)
+       debug_op) = parse_debug_node_name(node.name)
 
       self._debug_watches[watched_node_name][watched_output_slot].add(
           debug_op)
@@ -878,7 +878,7 @@ class DebugDumpDir(object):
       ctrl_inputs = self._node_ctrl_inputs[node]
       debug_op_inputs = []
       for ctrl_inp in ctrl_inputs:
-        if _is_debug_node(ctrl_inp):
+        if is_debug_node(ctrl_inp):
           debug_op_inputs.append(ctrl_inp)
       for debug_op_inp in debug_op_inputs:
         ctrl_inputs.remove(debug_op_inp)
diff --git a/tensorflow/python/debug/lib/debug_data_test.py b/tensorflow/python/debug/lib/debug_data_test.py
index 2bb423bd2c..2f6822331d 100644
--- a/tensorflow/python/debug/lib/debug_data_test.py
+++ b/tensorflow/python/debug/lib/debug_data_test.py
@@ -56,15 +56,15 @@ class NodeNameChecksTest(test_util.TensorFlowTestCase):
 
   def testIsDebugNode(self):
     self.assertTrue(
-        debug_data._is_debug_node("__dbg_ns1/ns2/node3:0_0_DebugIdentity"))
+        debug_data.is_debug_node("__dbg_ns1/ns2/node3:0_0_DebugIdentity"))
 
     self.assertFalse(
-        debug_data._is_debug_node("dbg_ns1/ns2/node3:0_0_DebugIdentity"))
+        debug_data.is_debug_node("dbg_ns1/ns2/node3:0_0_DebugIdentity"))
     self.assertFalse(
-        debug_data._is_debug_node("_dbg_ns1/ns2/node3:0_0_DebugIdentity"))
+        debug_data.is_debug_node("_dbg_ns1/ns2/node3:0_0_DebugIdentity"))
     self.assertFalse(
-        debug_data._is_debug_node("_dbgns1/ns2/node3:0_0_DebugIdentity"))
-    self.assertFalse(debug_data._is_debug_node("__copy_ns1/ns2/node3_0"))
+        debug_data.is_debug_node("_dbgns1/ns2/node3:0_0_DebugIdentity"))
+    self.assertFalse(debug_data.is_debug_node("__copy_ns1/ns2/node3_0"))
 
 
 class ParseDebugNodeNameTest(test_util.TensorFlowTestCase):
@@ -72,7 +72,7 @@ class ParseDebugNodeNameTest(test_util.TensorFlowTestCase):
   def testParseDebugNodeName_valid(self):
     debug_node_name_1 = "__dbg_ns_a/ns_b/node_c:1_0_DebugIdentity"
     (watched_node, watched_output_slot, debug_op_index,
-     debug_op) = debug_data._parse_debug_node_name(debug_node_name_1)
+     debug_op) = debug_data.parse_debug_node_name(debug_node_name_1)
 
     self.assertEqual("ns_a/ns_b/node_c", watched_node)
     self.assertEqual(1, watched_output_slot)
@@ -83,20 +83,20 @@ class ParseDebugNodeNameTest(test_util.TensorFlowTestCase):
     invalid_debug_node_name_1 = "__copy_ns_a/ns_b/node_c:1_0_DebugIdentity"
 
     with self.assertRaisesRegexp(ValueError, "Invalid prefix"):
-      debug_data._parse_debug_node_name(invalid_debug_node_name_1)
+      debug_data.parse_debug_node_name(invalid_debug_node_name_1)
 
   def testParseDebugNodeName_missingDebugOpIndex(self):
     invalid_debug_node_name_1 = "__dbg_node1:0_DebugIdentity"
 
     with self.assertRaisesRegexp(ValueError, "Invalid debug node name"):
-      debug_data._parse_debug_node_name(invalid_debug_node_name_1)
+      debug_data.parse_debug_node_name(invalid_debug_node_name_1)
 
   def testParseDebugNodeName_invalidWatchedTensorName(self):
     invalid_debug_node_name_1 = "__dbg_node1_0_DebugIdentity"
 
     with self.assertRaisesRegexp(ValueError,
                                  "Invalid tensor name in debug node name"):
-      debug_data._parse_debug_node_name(invalid_debug_node_name_1)
+      debug_data.parse_debug_node_name(invalid_debug_node_name_1)
 
 
 class HasNanOrInfTest(test_util.TensorFlowTestCase):
-- 
GitLab


From 092172c32cba7e38d6308191cc6e4f6b46a64a1f Mon Sep 17 00:00:00 2001
From: Spencer Schaber <schaber@gmail.com>
Date: Sat, 22 Apr 2017 17:27:12 -0500
Subject: [PATCH 0634/1563] Fix typo in encoders.py documentation

---
 tensorflow/contrib/layers/python/layers/encoders.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/layers/python/layers/encoders.py b/tensorflow/contrib/layers/python/layers/encoders.py
index 8b6abb4b45..3afdbb1827 100644
--- a/tensorflow/contrib/layers/python/layers/encoders.py
+++ b/tensorflow/contrib/layers/python/layers/encoders.py
@@ -121,7 +121,7 @@ def embed_sequence(ids,
     `Tensor` of `[batch_size, doc_length, embed_dim]` with embedded sequences.
 
   Raises:
-    ValueError: if `embed_dim` or `vocab_size` are not specified when not
+    ValueError: if `embed_dim` or `vocab_size` are not specified when 
       `reuse` is `None` or `False`.
   """
   if not (reuse or (vocab_size and embed_dim)):
-- 
GitLab


From 0c2af47618aeb87cb22c883b0c68664c70e33d14 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 22 Apr 2017 15:23:15 -0800
Subject: [PATCH 0635/1563] Exposed GrpcDebugHook in the public TF debug API.
 Change: 153944319

---
 tensorflow/python/debug/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/debug/__init__.py b/tensorflow/python/debug/__init__.py
index 01e36f754c..750d21f80d 100644
--- a/tensorflow/python/debug/__init__.py
+++ b/tensorflow/python/debug/__init__.py
@@ -25,6 +25,7 @@ See the @{$python/tfdbg} guide.
 @@has_inf_or_nan
 @@DumpingDebugHook
 @@DumpingDebugWrapperSession
+@@GrpcDebugHook
 @@GrpcDebugWrapperSession
 @@LocalCLIDebugHook
 @@LocalCLIDebugWrapperSession
@@ -49,6 +50,7 @@ from tensorflow.python.debug.wrappers.dumping_wrapper import DumpingDebugWrapper
 from tensorflow.python.debug.wrappers.framework import WatchOptions
 from tensorflow.python.debug.wrappers.grpc_wrapper import GrpcDebugWrapperSession
 from tensorflow.python.debug.wrappers.hooks import DumpingDebugHook
+from tensorflow.python.debug.wrappers.hooks import GrpcDebugHook
 from tensorflow.python.debug.wrappers.hooks import LocalCLIDebugHook
 from tensorflow.python.debug.wrappers.local_cli_wrapper import LocalCLIDebugWrapperSession
 
-- 
GitLab


From 921947028277dd1dbbed0ac1e64a41fcce12cc61 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Sat, 22 Apr 2017 21:23:39 -0400
Subject: [PATCH 0636/1563] Improve ISSUE_TEMPLATE.md (#9385)

* Improve ISSUE_TEMPLATE.md

* Fix system information section
---
 ISSUE_TEMPLATE.md | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index d0979e87f7..e653ed2fa3 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,33 +1,41 @@
-Please go to Stack Overflow for help and support. http://stackoverflow.com/questions/tagged/tensorflow
+Please go to Stack Overflow for help and support.
+http://stackoverflow.com/questions/tagged/tensorflow
+
 If you open a GitHub issue, here is our policy:
 
-1. It must be a bug or feature request.
+1. It must be a bug or a feature request.
 2. The form below must be filled out.
 
-**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g. fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
+**Here's why we have that policy**: TensorFlow developers respond to issues.
+We want to focus on work that benefits the whole community, e.g., fixing
+bugs and adding features. Support only helps individuals. GitHub also notifies
+thousands of people when issues are filed. We want them to see you communicating
+an interesting problem, rather than being redirected to Stack Overflow.
 
 ------------------------
 
-Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
+### System information
+- **Have I written custom code (as opposed to using a stock example script provided in TensorFlow)**:
+- **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
+- **TensorFlow installed from (source or binary)**:
+- **TensorFlow version (use command below)**:
+- **Bazel version (if compiling from source)**:
+- **CUDA/cuDNN version**:
+- **GPU model and memory**:
+- **Exact command to reproduce**:
 
-### System Information
-- *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
-- *OS Platform and Distribution (i.e. Linux Ubuntu 16.0)*:
-- *TensorFlow installed from (source or binary)?*:
-- *TensorFlow version* (use command below):
-- *Bazel version (if compiling from source)*:
-- *CUDA/cuDNN version*:
-- *GPU Model and Memory*:
-- *Exact command to reproduce*:
+You can collect some of this information using our environment capture script:
+https://github.com/tensorflow/tensorflow/tree/master/tools/tf_env_collect.sh
 
-You can collect some of this information using our environment capture script https://github.com/tensorflow/tensorflow/blob/master/tools/
 You can collect the TensorFlow version with
 ```sh
 python -c "import tensorflow as tf; print (tf.GIT_VERSION, tf.VERSION)"
 ```
 
+### Describe the problem
 
-### Describe the problem clearly
-
-### Source Code / Logs
-Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full-traceback. Large logs and files should be attached. Try to reproducible test-case code the bare-minimum necessary to generate the problem
+### Source code / logs
+Include any logs or source code that would be helpful to diagnose the problem.
+If including tracebacks, please include the full traceback. Large logs and files
+should be attached. Try to provide a reproducible test case that is the minimum
+necessary to generate the problem.
-- 
GitLab


From 4fa785e5d016bad7f2cca9bb5fc69ee2ed9f38c5 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Sat, 22 Apr 2017 22:36:09 -0800
Subject: [PATCH 0637/1563] Use slash after node prefix. It produces better
 organized graphs in tensorboard. Change: 153959030

---
 .../grappler/optimizers/auto_parallel_test.cc | 34 +++++++++----------
 .../optimizers/constant_folding_test.cc       | 12 +++----
 .../optimizers/memory_optimizer_test.cc       | 14 ++++----
 tensorflow/core/grappler/utils.cc             |  4 +--
 tensorflow/core/grappler/utils_test.cc        |  6 ++--
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/auto_parallel_test.cc b/tensorflow/core/grappler/optimizers/auto_parallel_test.cc
index b7786ccd14..3d1b4a34bf 100644
--- a/tensorflow/core/grappler/optimizers/auto_parallel_test.cc
+++ b/tensorflow/core/grappler/optimizers/auto_parallel_test.cc
@@ -54,7 +54,7 @@ TEST_F(AutoParallelTest, SimpleParallel) {
 
   const NodeDef& node_assign = output.node(0);
   EXPECT_EQ("assign", node_assign.name());
-  EXPECT_EQ("AutoParallel-Replica-0-constant_a", node_assign.input(1));
+  EXPECT_EQ("AutoParallel-Replica-0/constant_a", node_assign.input(1));
 
   const NodeDef& node_constant_b = output.node(1);
   EXPECT_EQ("constant_b", node_constant_b.name());
@@ -66,54 +66,54 @@ TEST_F(AutoParallelTest, SimpleParallel) {
   EXPECT_EQ("var", node_var.name());
 
   const NodeDef& node_div_const0 = output.node(4);
-  EXPECT_EQ("AutoParallel-Replica-0-AutoParallel-Div-Const",
+  EXPECT_EQ("AutoParallel-Replica-0/AutoParallel-Div-Const",
             node_div_const0.name());
 
   const NodeDef& node_div0 = output.node(5);
-  EXPECT_EQ("AutoParallel-Replica-0-AutoParallel-Div-apply_gradient",
+  EXPECT_EQ("AutoParallel-Replica-0/AutoParallel-Div-apply_gradient",
             node_div0.name());
   const NodeDef& node_add0 = output.node(6);
-  EXPECT_EQ("AutoParallel-Replica-0-add", node_add0.name());
+  EXPECT_EQ("AutoParallel-Replica-0/add", node_add0.name());
 
   const NodeDef& node_gradient0 = output.node(7);
-  EXPECT_EQ("AutoParallel-Replica-0-apply_gradient", node_gradient0.name());
+  EXPECT_EQ("AutoParallel-Replica-0/apply_gradient", node_gradient0.name());
 
   const NodeDef& node_constant_a0 = output.node(8);
-  EXPECT_EQ("AutoParallel-Replica-0-constant_a", node_constant_a0.name());
+  EXPECT_EQ("AutoParallel-Replica-0/constant_a", node_constant_a0.name());
 
   const NodeDef& node_dequeue0 = output.node(9);
-  EXPECT_EQ("AutoParallel-Replica-0-dequeue", node_dequeue0.name());
+  EXPECT_EQ("AutoParallel-Replica-0/dequeue", node_dequeue0.name());
 
   const NodeDef& node_learning_rate0 = output.node(10);
-  EXPECT_EQ("AutoParallel-Replica-0-learning_rate", node_learning_rate0.name());
+  EXPECT_EQ("AutoParallel-Replica-0/learning_rate", node_learning_rate0.name());
 
   const NodeDef& node_div_const1 = output.node(11);
-  EXPECT_EQ("AutoParallel-Replica-1-AutoParallel-Div-Const",
+  EXPECT_EQ("AutoParallel-Replica-1/AutoParallel-Div-Const",
             node_div_const1.name());
 
   const NodeDef& node_div1 = output.node(12);
-  EXPECT_EQ("AutoParallel-Replica-1-AutoParallel-Div-apply_gradient",
+  EXPECT_EQ("AutoParallel-Replica-1/AutoParallel-Div-apply_gradient",
             node_div1.name());
 
   const NodeDef& node_add1 = output.node(13);
-  EXPECT_EQ("AutoParallel-Replica-1-add", node_add1.name());
+  EXPECT_EQ("AutoParallel-Replica-1/add", node_add1.name());
 
   const NodeDef& node_gradient1 = output.node(14);
-  EXPECT_EQ("AutoParallel-Replica-1-apply_gradient", node_gradient1.name());
+  EXPECT_EQ("AutoParallel-Replica-1/apply_gradient", node_gradient1.name());
 
   const NodeDef& node_constant_a1 = output.node(15);
-  EXPECT_EQ("AutoParallel-Replica-1-constant_a", node_constant_a1.name());
+  EXPECT_EQ("AutoParallel-Replica-1/constant_a", node_constant_a1.name());
 
   const NodeDef& node_dequeue1 = output.node(16);
-  EXPECT_EQ("AutoParallel-Replica-1-dequeue", node_dequeue1.name());
+  EXPECT_EQ("AutoParallel-Replica-1/dequeue", node_dequeue1.name());
 
   const NodeDef& node_learning_rate1 = output.node(17);
-  EXPECT_EQ("AutoParallel-Replica-1-learning_rate", node_learning_rate1.name());
+  EXPECT_EQ("AutoParallel-Replica-1/learning_rate", node_learning_rate1.name());
 
   const NodeDef& node_fetch = output.node(18);
   EXPECT_EQ("AutoParallel-Control-Fetch", node_fetch.name());
-  EXPECT_EQ("^AutoParallel-Replica-0-apply_gradient", node_fetch.input(0));
-  EXPECT_EQ("^AutoParallel-Replica-1-apply_gradient", node_fetch.input(1));
+  EXPECT_EQ("^AutoParallel-Replica-0/apply_gradient", node_fetch.input(0));
+  EXPECT_EQ("^AutoParallel-Replica-1/apply_gradient", node_fetch.input(1));
 
   const NodeDef& node_gradient = output.node(19);
   EXPECT_EQ("apply_gradient", node_gradient.name());
diff --git a/tensorflow/core/grappler/optimizers/constant_folding_test.cc b/tensorflow/core/grappler/optimizers/constant_folding_test.cc
index ab79e74103..93e2a79746 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding_test.cc
+++ b/tensorflow/core/grappler/optimizers/constant_folding_test.cc
@@ -64,7 +64,7 @@ TEST_F(ConstantFoldingTest, SimpleFolding) {
   EXPECT_EQ(5, output.node_size());
 
   const NodeDef& new_c = output.node(0);
-  EXPECT_EQ("ConstantFolding-c", new_c.name());
+  EXPECT_EQ("ConstantFolding/c", new_c.name());
   EXPECT_EQ("Const", new_c.op());
 
   const NodeDef& new_a = output.node(1);
@@ -78,7 +78,7 @@ TEST_F(ConstantFoldingTest, SimpleFolding) {
 
   const NodeDef& new_d = output.node(4);
   EXPECT_EQ("d", new_d.name());
-  EXPECT_EQ("ConstantFolding-c", new_d.input(1));
+  EXPECT_EQ("ConstantFolding/c", new_d.input(1));
 
   std::vector<string> fetch = {"a", "b", "c", "d"};
   auto tensors_expected = EvaluateNodes(item.graph, fetch);
@@ -112,11 +112,11 @@ TEST_F(ConstantFoldingTest, FoldingNodeWithTwoOutputs) {
   EXPECT_EQ(6, output.node_size());
 
   const NodeDef& new_b_0 = output.node(0);
-  EXPECT_EQ("ConstantFolding-b-0", new_b_0.name());
+  EXPECT_EQ("ConstantFolding/b-0", new_b_0.name());
   EXPECT_EQ("Const", new_b_0.op());
 
   const NodeDef& new_b_1 = output.node(1);
-  EXPECT_EQ("ConstantFolding-b-1", new_b_1.name());
+  EXPECT_EQ("ConstantFolding/b-1", new_b_1.name());
   EXPECT_EQ("Const", new_b_1.op());
 
   const NodeDef& new_a = output.node(2);
@@ -127,11 +127,11 @@ TEST_F(ConstantFoldingTest, FoldingNodeWithTwoOutputs) {
 
   const NodeDef& new_c = output.node(4);
   EXPECT_EQ("c", new_c.name());
-  EXPECT_EQ("ConstantFolding-b-0", new_c.input(0));
+  EXPECT_EQ("ConstantFolding/b-0", new_c.input(0));
 
   const NodeDef& new_d = output.node(5);
   EXPECT_EQ("d", new_d.name());
-  EXPECT_EQ("ConstantFolding-b-1", new_d.input(0));
+  EXPECT_EQ("ConstantFolding/b-1", new_d.input(0));
 
   std::vector<string> fetch = {"a", "b", "c", "d"};
   auto tensors_expected = EvaluateNodes(item.graph, fetch);
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
index 18062e26ee..c230a40fe5 100644
--- a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
@@ -55,8 +55,8 @@ TEST_F(RecomputeSubgraphTest, SimpleSubgraph) {
   NodeDef* transformed_e = post_transform_node_map.GetNode(e.name());
   EXPECT_EQ(2, transformed_e->input_size());
   EXPECT_EQ("d", transformed_e->input(0));
-  EXPECT_EQ("Recomputed-b", transformed_e->input(1));
-  NodeDef* recomputed_b = post_transform_node_map.GetNode("Recomputed-b");
+  EXPECT_EQ("Recomputed/b", transformed_e->input(1));
+  NodeDef* recomputed_b = post_transform_node_map.GetNode("Recomputed/b");
   EXPECT_EQ(2, recomputed_b->input_size());
   EXPECT_EQ("a", recomputed_b->input(0));
   EXPECT_EQ("^d", recomputed_b->input(1).substr(0, 2));
@@ -94,23 +94,23 @@ TEST_F(RecomputeSubgraphTest, MultiNode) {
   NodeDef* transformed_e = post_transform_node_map.GetNode(e.name());
   EXPECT_EQ(2, transformed_e->input_size());
   EXPECT_EQ("BN1Grad", transformed_e->input(0));
-  EXPECT_EQ("Recomputed-ReLU", transformed_e->input(1));
+  EXPECT_EQ("Recomputed/ReLU", transformed_e->input(1));
   NodeDef* transformed_f = post_transform_node_map.GetNode(f.name());
   EXPECT_EQ(2, transformed_f->input_size());
   EXPECT_EQ("Conv1Grad", transformed_f->input(0));
-  EXPECT_EQ("Recomputed-ReLU", transformed_f->input(1));
+  EXPECT_EQ("Recomputed/ReLU", transformed_f->input(1));
   NodeDef* transformed_g = post_transform_node_map.GetNode(g.name());
   EXPECT_EQ(2, transformed_g->input_size());
   EXPECT_EQ("ReLUGrad", transformed_g->input(0));
   EXPECT_EQ("Conv", transformed_g->input(1));
 
-  NodeDef* recomputed_b = post_transform_node_map.GetNode("Recomputed-BN");
+  NodeDef* recomputed_b = post_transform_node_map.GetNode("Recomputed/BN");
   EXPECT_EQ(2, recomputed_b->input_size());
   EXPECT_EQ("Conv", recomputed_b->input(0));
   EXPECT_EQ("^BN1Grad", recomputed_b->input(1).substr(0, 8));
-  NodeDef* recomputed_c = post_transform_node_map.GetNode("Recomputed-ReLU");
+  NodeDef* recomputed_c = post_transform_node_map.GetNode("Recomputed/ReLU");
   EXPECT_EQ(2, recomputed_c->input_size());
-  EXPECT_EQ("Recomputed-BN", recomputed_c->input(0));
+  EXPECT_EQ("Recomputed/BN", recomputed_c->input(0));
   EXPECT_EQ("^BN1Grad", recomputed_c->input(1).substr(0, 8));
 }
 
diff --git a/tensorflow/core/grappler/utils.cc b/tensorflow/core/grappler/utils.cc
index a56961cd95..924feeae54 100644
--- a/tensorflow/core/grappler/utils.cc
+++ b/tensorflow/core/grappler/utils.cc
@@ -97,10 +97,10 @@ int NodePosition(const string& name) {
 string AddPrefixToNodeName(const string& name, const string& prefix) {
   if (!name.empty()) {
     if (name[0] == '^') {
-      return strings::StrCat("^", prefix, "-", name.substr(1));
+      return strings::StrCat("^", prefix, "/", name.substr(1));
     }
   }
-  return strings::StrCat(prefix, "-", name);
+  return strings::StrCat(prefix, "/", name);
 }
 
 bool ExecuteWithTimeout(std::function<void()> fn, const int64 timeout_in_ms,
diff --git a/tensorflow/core/grappler/utils_test.cc b/tensorflow/core/grappler/utils_test.cc
index 4ef9f8e4e5..f055eb776b 100644
--- a/tensorflow/core/grappler/utils_test.cc
+++ b/tensorflow/core/grappler/utils_test.cc
@@ -59,9 +59,9 @@ TEST_F(UtilsTest, NodePosition) {
 }
 
 TEST_F(UtilsTest, AddNodeNamePrefix) {
-  EXPECT_EQ("OPTIMIZED-abc", AddPrefixToNodeName("abc", "OPTIMIZED"));
-  EXPECT_EQ("^OPTIMIZED-abc", AddPrefixToNodeName("^abc", "OPTIMIZED"));
-  EXPECT_EQ("OPTIMIZED-", AddPrefixToNodeName("", "OPTIMIZED"));
+  EXPECT_EQ("OPTIMIZED/abc", AddPrefixToNodeName("abc", "OPTIMIZED"));
+  EXPECT_EQ("^OPTIMIZED/abc", AddPrefixToNodeName("^abc", "OPTIMIZED"));
+  EXPECT_EQ("OPTIMIZED/", AddPrefixToNodeName("", "OPTIMIZED"));
 }
 
 TEST_F(UtilsTest, ExecuteWithTimeout) {
-- 
GitLab


From ccddcbaccdd0c2bb50cbb2a4fb5de0fc9ade70d8 Mon Sep 17 00:00:00 2001
From: Daniel Trebbien <dtrebbien@gmail.com>
Date: Sun, 23 Apr 2017 16:31:17 -0400
Subject: [PATCH 0638/1563] Delete unnecessary forward declarations

These are made in tensorflow/stream_executor/stream_executor_internal.h
Additionally, RngSupport is within perftools::gputools::rng rather than
perftools::gputools::internal.
---
 tensorflow/stream_executor/cuda/cuda_gpu_executor.cc |  8 --------
 tensorflow/stream_executor/cuda/cuda_gpu_executor.h  | 11 -----------
 2 files changed, 19 deletions(-)

diff --git a/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc b/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
index 1bb90afd63..c1e72bb565 100644
--- a/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
+++ b/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
@@ -67,14 +67,6 @@ limitations under the License.
 extern bool FLAGS_check_gpu_leaks;
 bool FLAGS_prefer_cubin_to_ptx = true;
 
-namespace perftools {
-namespace gputools {
-namespace rng {
-class RngSupport;
-}  // namespace rng
-}  // namespace gputools
-}  // namespace perftools
-
 namespace perftools {
 namespace gputools {
 namespace cuda {
diff --git a/tensorflow/stream_executor/cuda/cuda_gpu_executor.h b/tensorflow/stream_executor/cuda/cuda_gpu_executor.h
index 9d386b5ed9..6c5b9dca90 100644
--- a/tensorflow/stream_executor/cuda/cuda_gpu_executor.h
+++ b/tensorflow/stream_executor/cuda/cuda_gpu_executor.h
@@ -35,17 +35,6 @@ limitations under the License.
 #include "tensorflow/stream_executor/platform/thread_annotations.h"
 #include "tensorflow/stream_executor/stream_executor_internal.h"
 
-namespace perftools {
-namespace gputools {
-namespace blas {
-class BlasSupport;
-}
-namespace internal {
-class RngSupport;
-}  // namespace internal
-}  // namespace gputools
-}  // namespace perftools
-
 namespace perftools {
 namespace gputools {
 namespace cuda {
-- 
GitLab


From 7cc3f9eb24516b70e80a2d679729843e00860df6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 23 Apr 2017 20:52:11 -0800
Subject: [PATCH 0639/1563] Migrate the tf_graph_common component to use
 webfiles

Move all TypeScript files to be within the same directory. Otherwise, the build tool outputs JS files in subdirectories, which breaks links in HTML files.

Fixed some type-related issues to allow for compilation.

Added the noResolve flag to the TypeScript compilation command. This prevents the compiler from following triple slash references within typings (such as the one in polymer.d.ts).
Change: 154009186
---
 tensorflow/BUILD                              |  1 +
 .../components/tf_graph/tf-graph-minimap.html |  2 +-
 .../components/tf_graph_common/BUILD          | 65 +++++++++++++++++++
 .../{lib/scene => }/annotation.ts             |  0
 .../tf_graph_common/{lib => }/colors.ts       |  0
 .../tf_graph_common/{lib => }/common.ts       |  0
 .../{lib/scene => }/contextmenu.ts            |  0
 .../tf_graph_common/{lib/scene => }/edge.ts   |  0
 .../tf_graph_common/{lib => }/externs.ts      |  0
 .../tf_graph_common/{lib => }/graph.ts        | 26 ++++----
 .../tf_graph_common/{lib => }/hierarchy.ts    |  0
 .../tf_graph_common/{lib => }/layout.ts       |  0
 .../{lib/scene => }/minimap.ts                |  0
 .../tf_graph_common/{lib/scene => }/node.ts   |  0
 .../tf_graph_common/{lib => }/parser.ts       |  0
 .../tf_graph_common/{lib => }/proto.ts        |  0
 .../tf_graph_common/{lib => }/render.ts       |  4 +-
 .../tf_graph_common/{lib/scene => }/scene.ts  |  0
 .../tf_graph_common/{lib => }/template.ts     |  0
 .../tf_graph_common/test/graph-test.ts        |  2 +-
 .../tf_graph_common/tf-graph-common.html      | 32 ++++-----
 .../tf_graph_common/{lib => }/util.ts         |  3 +-
 .../tf_graph_info/tf-node-info.html           |  9 ++-
 tensorflow/tensorboard/defs.bzl               |  2 +
 tensorflow/workspace.bzl                      |  8 +++
 25 files changed, 119 insertions(+), 35 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common/BUILD
 rename tensorflow/tensorboard/components/tf_graph_common/{lib/scene => }/annotation.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/colors.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/common.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib/scene => }/contextmenu.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib/scene => }/edge.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/externs.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/graph.ts (99%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/hierarchy.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/layout.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib/scene => }/minimap.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib/scene => }/node.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/parser.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/proto.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/render.ts (99%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib/scene => }/scene.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/template.ts (100%)
 rename tensorflow/tensorboard/components/tf_graph_common/{lib => }/util.ts (99%)

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 248b18e020..e4451a92d4 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -314,6 +314,7 @@ filegroup(
         "//tensorflow/tensorboard/backend:all_files",
         "//tensorflow/tensorboard/backend/event_processing:all_files",
         "//tensorflow/tensorboard/components:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_common:all_files",
         "//tensorflow/tensorboard/components/tf_text_dashboard:all_files",
         "//tensorflow/tensorboard/components/vz_data_summary:all_files",
         "//tensorflow/tensorboard/components/vz_line_chart:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html
index cdbee3af5e..5fc16c0520 100644
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html
+++ b/tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 
 <link rel="import" href="../polymer/polymer.html">
-<script src="../tf-graph-common/lib/scene/minimap.js"></script>
+<script src="../tf-graph-common/minimap.js"></script>
 
 <dom-module id="tf-graph-minimap">
 <template>
diff --git a/tensorflow/tensorboard/components/tf_graph_common/BUILD b/tensorflow/tensorboard/components/tf_graph_common/BUILD
new file mode 100644
index 0000000000..1931d7b536
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common/BUILD
@@ -0,0 +1,65 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_common",
+    srcs = [
+        "tf-graph-common.html",
+        ":ts",
+    ],
+    path = "/tf-graph-common",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "//tensorflow/tensorboard/components/tf_imports:dagre",
+        "//tensorflow/tensorboard/components/tf_imports:graphlib",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = glob(["*.ts"]),
+    typings = [
+        "@org_definitelytyped//:d3.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-common.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-graph-common",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = glob(["*.ts"]),
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/annotation.ts b/tensorflow/tensorboard/components/tf_graph_common/annotation.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/scene/annotation.ts
rename to tensorflow/tensorboard/components/tf_graph_common/annotation.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/colors.ts b/tensorflow/tensorboard/components/tf_graph_common/colors.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/colors.ts
rename to tensorflow/tensorboard/components/tf_graph_common/colors.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/common.ts b/tensorflow/tensorboard/components/tf_graph_common/common.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/common.ts
rename to tensorflow/tensorboard/components/tf_graph_common/common.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/contextmenu.ts b/tensorflow/tensorboard/components/tf_graph_common/contextmenu.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/scene/contextmenu.ts
rename to tensorflow/tensorboard/components/tf_graph_common/contextmenu.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/edge.ts b/tensorflow/tensorboard/components/tf_graph_common/edge.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/scene/edge.ts
rename to tensorflow/tensorboard/components/tf_graph_common/edge.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/externs.ts b/tensorflow/tensorboard/components/tf_graph_common/externs.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/externs.ts
rename to tensorflow/tensorboard/components/tf_graph_common/externs.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/graph.ts b/tensorflow/tensorboard/components/tf_graph_common/graph.ts
similarity index 99%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/graph.ts
rename to tensorflow/tensorboard/components/tf_graph_common/graph.ts
index 12a92e3955..1b0abcfd85 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/lib/graph.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/graph.ts
@@ -509,16 +509,7 @@ export class NodeStats {
    * if it is a Group node.
    */
   totalBytes = 0;
-  /**
-   * Total number of compute time in microseconds used for the node.
-   * Sum of all children if it is a Group node. Null if it is unknown.
-   */
-  get totalMicros(): number {
-    if (this.startTime == null || this.endTime == null) {
-      return null;
-    }
-    return this.endTime - this.startTime;
-  }
+
   /**
    * The shape of each output tensors, if there are any.
    * Empty if it is a Group node.
@@ -534,10 +525,23 @@ export class NodeStats {
     if (stats.totalBytes != null) {
       this.totalBytes += stats.totalBytes;
     }
-    if (stats.totalMicros != null) {
+    if (stats.getTotalMicros() != null) {
       this.addExecutionTime(stats.startTime, stats.endTime);
     }
   }
+
+  /**
+   * Total number of compute time in microseconds used for the node.
+   * Sum of all children if it is a Group node. Null if it is unknown.
+   * This method can not be scaffolded under a getter attribute because
+   * ECMAScript 5 does not support getter attributes.
+   */
+  getTotalMicros(): number {
+    if (this.startTime == null || this.endTime == null) {
+      return null;
+    }
+    return this.endTime - this.startTime;
+  }
 }
 
 export class MetanodeImpl implements Metanode {
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/hierarchy.ts b/tensorflow/tensorboard/components/tf_graph_common/hierarchy.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/hierarchy.ts
rename to tensorflow/tensorboard/components/tf_graph_common/hierarchy.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/layout.ts b/tensorflow/tensorboard/components/tf_graph_common/layout.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/layout.ts
rename to tensorflow/tensorboard/components/tf_graph_common/layout.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/minimap.ts b/tensorflow/tensorboard/components/tf_graph_common/minimap.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/scene/minimap.ts
rename to tensorflow/tensorboard/components/tf_graph_common/minimap.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/node.ts b/tensorflow/tensorboard/components/tf_graph_common/node.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/scene/node.ts
rename to tensorflow/tensorboard/components/tf_graph_common/node.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/parser.ts b/tensorflow/tensorboard/components/tf_graph_common/parser.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/parser.ts
rename to tensorflow/tensorboard/components/tf_graph_common/parser.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/proto.ts b/tensorflow/tensorboard/components/tf_graph_common/proto.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/proto.ts
rename to tensorflow/tensorboard/components/tf_graph_common/proto.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/render.ts b/tensorflow/tensorboard/components/tf_graph_common/render.ts
similarity index 99%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/render.ts
rename to tensorflow/tensorboard/components/tf_graph_common/render.ts
index 1c20b40027..6536012c8b 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/lib/render.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/render.ts
@@ -228,7 +228,7 @@ export class RenderGraphInfo {
       let node = topLevelGraph.node(nodeName);
       // Some ops don't have stats at all.
       if (node.stats != null) {
-        return node.stats.totalMicros;
+        return node.stats.getTotalMicros();
       }
     });
     this.computeTimeScale = d3.scale.linear<string, string>()
@@ -286,7 +286,7 @@ export class RenderGraphInfo {
     if (node.stats) {
       renderInfo.memoryColor = this.memoryUsageScale(node.stats.totalBytes);
       renderInfo.computeTimeColor =
-        this.computeTimeScale(node.stats.totalMicros);
+          this.computeTimeScale(node.stats.getTotalMicros());
     }
 
     if (!node.isGroupNode) {
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/scene/scene.ts b/tensorflow/tensorboard/components/tf_graph_common/scene.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/scene/scene.ts
rename to tensorflow/tensorboard/components/tf_graph_common/scene.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/template.ts b/tensorflow/tensorboard/components/tf_graph_common/template.ts
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/template.ts
rename to tensorflow/tensorboard/components/tf_graph_common/template.ts
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts b/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
index c633a65978..af3030197e 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
@@ -75,7 +75,7 @@ suite('graph', () => {
 
             tf.graph.parser.parseStatsPbTxt(statsPbtxt).then(stepStats => {
               tf.graph.joinStatsInfoWithGraph(slimGraph, stepStats);
-              assert.equal(slimGraph.nodes['Q'].stats.totalMicros, 6);
+              assert.equal(slimGraph.nodes['Q'].stats.getTotalMicros(), 6);
               done();
             });
           });
diff --git a/tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html b/tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html
index f4f98c8b9a..a460072a38 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html
+++ b/tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html
@@ -20,19 +20,19 @@ limitations under the License.
 <link rel="import" href="../tf-imports/graphlib.html">
 <link rel="import" href="../tf-imports/lodash.html">
 
-<script src="lib/colors.js"></script>
-<script src="lib/common.js"></script>
-<script src="lib/externs.js"></script>
-<script src="lib/graph.js"></script>
-<script src="lib/hierarchy.js"></script>
-<script src="lib/layout.js"></script>
-<script src="lib/parser.js"></script>
-<script src="lib/proto.js"></script>
-<script src="lib/render.js"></script>
-<script src="lib/scene/annotation.js"></script>
-<script src="lib/scene/contextmenu.js"></script>
-<script src="lib/scene/edge.js"></script>
-<script src="lib/scene/node.js"></script>
-<script src="lib/scene/scene.js"></script>
-<script src="lib/template.js"></script>
-<script src="lib/util.js"></script>
+<script src="colors.js"></script>
+<script src="common.js"></script>
+<script src="externs.js"></script>
+<script src="graph.js"></script>
+<script src="hierarchy.js"></script>
+<script src="layout.js"></script>
+<script src="parser.js"></script>
+<script src="proto.js"></script>
+<script src="render.js"></script>
+<script src="annotation.js"></script>
+<script src="contextmenu.js"></script>
+<script src="edge.js"></script>
+<script src="node.js"></script>
+<script src="scene.js"></script>
+<script src="template.js"></script>
+<script src="util.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_graph_common/lib/util.ts b/tensorflow/tensorboard/components/tf_graph_common/util.ts
similarity index 99%
rename from tensorflow/tensorboard/components/tf_graph_common/lib/util.ts
rename to tensorflow/tensorboard/components/tf_graph_common/util.ts
index 8a8a29ca08..7f4d329e79 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/lib/util.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/util.ts
@@ -228,7 +228,8 @@ module tf.graph.util {
 
   export function hasDisplayableNodeStats(stats: NodeStats) {
     if (stats &&
-        (stats.totalBytes > 0 || stats.totalMicros > 0 || stats.outputSize)) {
+        (stats.totalBytes > 0 || stats.getTotalMicros() > 0 ||
+         stats.outputSize)) {
       return true;
     }
     return false;
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html b/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
index 1e60cda66a..c3e470b123 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
+++ b/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
@@ -315,7 +315,7 @@ limitations under the License.
                   <div class="sub-list-table-cell">[[_nodeStatsFormattedBytes]]</div>
                 </div>
               </template>
-              <template is="dom-if" if="{{_nodeStats.totalMicros}}">
+              <template is="dom-if" if="{{_getTotalMicros(_nodeStats)}}">
                 <div class="sub-list-table-row">
                   <div class="sub-list-table-cell">Compute Time</div>
                   <div class="sub-list-table-cell">[[_nodeStatsFormattedComputeTime]]</div>
@@ -456,6 +456,9 @@ limitations under the License.
           }
           return null;
         },
+        _getTotalMicros: function(stats) {
+          return stats.getTotalMicros();
+        },
         _getHasDisplayableNodeStats: function(stats) {
           return tf.graph.util.hasDisplayableNodeStats(stats);
         },
@@ -468,12 +471,12 @@ limitations under the License.
               stats.totalBytes, tf.graph.util.MEMORY_UNITS);
         },
         _getNodeStatsFormattedComputeTime: function(stats) {
-          if (!stats || !stats.totalMicros) {
+          if (!stats || !stats.getTotalMicros()) {
             return;
           }
 
           return tf.graph.util.convertUnitsToHumanReadable(
-              stats.totalMicros, tf.graph.util.TIME_UNITS);
+              stats.getTotalMicros(), tf.graph.util.TIME_UNITS);
         },
         _getNodeStatsFormattedOutputSizes: function(stats) {
           if (!stats || !stats.outputSize || !stats.outputSize.length) {
diff --git a/tensorflow/tensorboard/defs.bzl b/tensorflow/tensorboard/defs.bzl
index bae7078c5b..7bb5f961c9 100644
--- a/tensorflow/tensorboard/defs.bzl
+++ b/tensorflow/tensorboard/defs.bzl
@@ -46,6 +46,8 @@ def tensorboard_typescript_genrule(name, srcs, typings=[], **kwargs):
       cmd = "$(location @com_microsoft_typescript//:tsc.sh)" +
             " --inlineSourceMap" +
             " --inlineSources" +
+            # Do not follow triple slash references within typings.
+            " --noResolve" +
             " --declaration" +
             " --outDir $(@D) " +
             " ".join(["$(locations %s)" % i for i in inputs]),
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 5ab91b69a1..0f69d53ba4 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -817,6 +817,14 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
           ],
+          "44eba36339bd1c0792072b7b204ee926fe5ffe1e9e2da916e67ac55548e3668a": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
+          ],
+          "691756a6eb455f340c9e834de0d49fff269e7b8c1799c2454465dcd6a4435b80": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/46719185c564694c5583c4b7ad94dbb786ecad46/webcomponents.js/webcomponents.js.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/46719185c564694c5583c4b7ad94dbb786ecad46/webcomponents.js/webcomponents.js.d.ts",
+          ],
       },
   )
 
-- 
GitLab


From 3328b3a54104deec858cb73aa88a586430e3e425 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 09:04:58 -0800
Subject: [PATCH 0640/1563] Adding layer summary to linear logits in
 _dnn_linear_combined_model_fn. Change: 154062018

---
 .../learn/python/learn/estimators/dnn_linear_combined.py   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
index 37fe6faa31..b525213eb7 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
@@ -99,7 +99,7 @@ def _linear_learning_rate(num_linear_feature_columns):
   return min(_LINEAR_LEARNING_RATE, default_learning_rate)
 
 
-def _add_hidden_layer_summary(value, tag):
+def _add_layer_summary(value, tag):
   logging_ops.scalar_summary("%s/fraction_of_zero_values" % tag,
                              nn.zero_fraction(value))
   logging_ops.histogram_summary("%s/activation" % tag, value)
@@ -247,7 +247,7 @@ def _dnn_linear_combined_model_fn(features, labels, mode, params, config=None):
                 net,
                 keep_prob=(1.0 - dnn_dropout))
         # TODO(b/31209633): Consider adding summary before dropout.
-        _add_hidden_layer_summary(net, dnn_hidden_layer_scope.name)
+        _add_layer_summary(net, dnn_hidden_layer_scope.name)
 
       with variable_scope.variable_scope(
           "logits",
@@ -258,7 +258,7 @@ def _dnn_linear_combined_model_fn(features, labels, mode, params, config=None):
             activation_fn=None,
             variables_collections=[dnn_parent_scope],
             scope=dnn_logits_scope)
-      _add_hidden_layer_summary(dnn_logits, dnn_logits_scope.name)
+      _add_layer_summary(dnn_logits, dnn_logits_scope.name)
 
   # Build Linear logits.
   linear_parent_scope = "linear"
@@ -287,6 +287,7 @@ def _dnn_linear_combined_model_fn(features, labels, mode, params, config=None):
             num_outputs=head.logits_dimension,
             weight_collections=[linear_parent_scope],
             scope=scope)
+      _add_layer_summary(linear_logits, scope.name)
 
   # Combine logits and build full model.
   if dnn_logits is not None and linear_logits is not None:
-- 
GitLab


From 08003496a8b96146f59964f4d22d890b2d7e1941 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 09:12:19 -0800
Subject: [PATCH 0641/1563] Add an option to allow use context vector as
 attention in Attention Wrapper. Change: 154062886

---
 .../kernel_tests/attention_wrapper_test.py    | 128 +++++++++++++++++-
 .../kernel_tests/beam_search_decoder_test.py  |   2 +-
 .../seq2seq/python/ops/attention_wrapper.py   |  31 +++--
 3 files changed, 148 insertions(+), 13 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index 888479e218..4054b51412 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -70,6 +70,7 @@ class AttentionWrapperTest(test.TestCase):
                          attention_mechanism_depth=3,
                          alignment_history=False,
                          expected_final_alignment_history=None,
+                         attention_layer_size=6,
                          name=""):
     encoder_sequence_length = [3, 2, 3, 1, 0]
     decoder_sequence_length = [2, 0, 1, 2, 3]
@@ -79,7 +80,11 @@ class AttentionWrapperTest(test.TestCase):
     input_depth = 7
     encoder_output_depth = 10
     cell_depth = 9
-    attention_depth = 6
+
+    if attention_layer_size is not None:
+      attention_depth = attention_layer_size
+    else:
+      attention_depth = encoder_output_depth
 
     decoder_inputs = np.random.randn(batch_size, decoder_max_time,
                                      input_depth).astype(np.float32)
@@ -99,7 +104,7 @@ class AttentionWrapperTest(test.TestCase):
         cell = wrapper.AttentionWrapper(
             cell,
             attention_mechanism,
-            attention_size=attention_depth,
+            attention_layer_size=attention_layer_size,
             alignment_history=alignment_history)
         helper = helper_py.TrainingHelper(decoder_inputs,
                                           decoder_sequence_length)
@@ -734,6 +739,125 @@ class AttentionWrapperTest(test.TestCase):
         attention_mechanism_depth=9,
         name="testLuongScaled")
 
+  def testNotUseAttentionLayer(self):
+    create_attention_mechanism = wrapper.BahdanauAttention
+
+    expected_final_output = BasicDecoderOutput(
+        rnn_output=array(
+            [[[
+                -0.24277855, -0.07872247, 0.15671003, 0.24866608, 0.30515286,
+                -0.24618624, 0.0507621, 0.18785201, -0.16496147, -0.138405
+            ], [
+                -0.24277849, -0.07872227, 0.15671015, 0.24866594, 0.30515245,
+                -0.24618617, 0.05076224, 0.18785192, -0.16496134, -0.13840486
+            ], [
+                -0.24277903, -0.07872239, 0.15671065, 0.24866652, 0.30515283,
+                -0.24618667, 0.05076243, 0.18785232, -0.16496192, -0.13840519
+            ]], [[
+                0.39683789, 0.12260036, -0.06023827, -0.09247135, 0.11370862,
+                -0.1547074, 0.00654875, -0.26491123, 0.08399884, 0.1876322
+            ], [
+                0.39683688, 0.12260011, -0.06023812, -0.09247123, 0.11370841,
+                -0.15470725, 0.00654882, -0.26491043, 0.08399857, 0.18763176
+            ], [
+                0.39683694, 0.12260016, -0.06023812, -0.09247129, 0.11370847,
+                -0.1547074, 0.00654885, -0.2649104, 0.08399855, 0.18763182
+            ]], [[
+                -0.432805, 0.07398784, -0.01561836, 0.19199517, -0.02651545,
+                -0.21643993, -0.02017856, 0.00162333, 0.21297953, 0.25590748
+            ], [
+                -0.43280441, 0.07398778, -0.01561838, 0.19199494, -0.02651539,
+                -0.2164396, -0.02017859, 0.00162333, 0.2129792, 0.25590718
+            ], [
+                -0.43280473, 0.07398786, -0.01561838, 0.19199508, -0.02651543,
+                -0.21643978, -0.02017862, 0.00162333, 0.21297936, 0.25590736
+            ]], [[
+                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
+                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+            ], [
+                0.07059769, 0.16451195, 0.01174642, 0.04646424, 0.14275652,
+                0.07944378, -0.10852744, 0.15305838, 0.02151344, -0.05589932
+            ], [
+                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
+                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+            ]], [[0., 0., 0., 0., 0., 0., 0., 0., 0.,
+                  0.], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.],
+                 [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]]],
+            dtype=float32),
+        sample_id=array(
+            [[4, 4, 4], [0, 0, 0], [9, 9, 9], [1, 1, 1], [0, 0, 0]],
+            dtype=int32))
+
+    expected_final_state = AttentionWrapperState(
+        cell_state=LSTMStateTuple(
+            c=array(
+                [[
+                    -0.01816516, -0.01675301, -0.00513183, 0.01560374,
+                    -0.01254231, -0.00434179, -0.01262734, -0.01721472,
+                    0.02279618
+                ], [
+                    0.01265936, -0.00846189, -0.00376618, 0.0313628,
+                    -0.03488337, -0.02464793, -0.00498007, -0.00459409,
+                    -0.02097382
+                ], [
+                    -0.00780995, 0.00314269, -0.01383716, -0.01147376,
+                    0.00483319, -0.01340735, 0.00865264, -0.00632812,
+                    -0.01053766
+                ], [
+                    -0.04184838, -0.01223641, 0.00094449, 0.03911438,
+                    0.00432476, 0.0222066, -0.0300624, -0.05418365, -0.0261539
+                ], [
+                    0.02282745, -0.00143833, 0.01918138, 0.00545033,
+                    -0.01258384, -0.00303765, -0.00511231, 0.02166323,
+                    0.01638841
+                ]],
+                dtype=float32),
+            h=array(
+                [[
+                    -0.00912324, -0.00827531, -0.00261125, 0.00765155,
+                    -0.00636977, -0.00217171, -0.00643897, -0.00876094,
+                    0.01136858
+                ], [
+                    0.00629574, -0.00427225, -0.00182555, 0.01597121,
+                    -0.01734862, -0.01224119, -0.00245434, -0.0023048,
+                    -0.01077694
+                ], [
+                    -0.00391358, 0.00161294, -0.00683057, -0.00569066,
+                    0.0024297, -0.00658555, 0.00429511, -0.00309842, -0.00520863
+                ], [
+                    -0.02087489, -0.00603306, 0.00047561, 0.01920064,
+                    0.00213868, 0.01115329, -0.01526589, -0.02687524,
+                    -0.01297526
+                ], [
+                    0.01138975, -0.00070959, 0.00986007, 0.0027323, -0.00645386,
+                    -0.00152054, -0.00257339, 0.01103063, 0.00800891
+                ]],
+                dtype=float32)),
+        attention=array(
+            [[
+                -0.24277903, -0.07872239, 0.15671065, 0.24866652, 0.30515283,
+                -0.24618667, 0.05076243, 0.18785232, -0.16496192, -0.13840519
+            ], [
+                0.39683694, 0.12260016, -0.06023812, -0.09247129, 0.11370847,
+                -0.1547074, 0.00654885, -0.2649104, 0.08399855, 0.18763182
+            ], [
+                -0.43280473, 0.07398786, -0.01561838, 0.19199508, -0.02651543,
+                -0.21643978, -0.02017862, 0.00162333, 0.21297936, 0.25590736
+            ], [
+                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
+                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+            ], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]],
+            dtype=float32),
+        time=3,
+        alignment_history=())
+
+    self._testWithAttention(
+        create_attention_mechanism,
+        expected_final_output,
+        expected_final_state,
+        attention_layer_size=None,
+        name="testNotUseAttentionLayer")
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
index a72d962d78..732b0db930 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
@@ -252,7 +252,7 @@ class BeamSearchDecoderTest(test.TestCase):
         cell = attention_wrapper.AttentionWrapper(
             cell=cell,
             attention_mechanism=attention_mechanism,
-            attention_size=attention_depth,
+            attention_layer_size=attention_depth,
             alignment_history=False)
       cell_state = cell.zero_state(
           dtype=dtypes.float32, batch_size=batch_size * beam_width)
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 37622af59f..3a3d0b8aec 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -423,7 +423,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
   def __init__(self,
                cell,
                attention_mechanism,
-               attention_size,
+               attention_layer_size=None,
                alignment_history=False,
                cell_input_fn=None,
                probability_fn=None,
@@ -434,8 +434,10 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     Args:
       cell: An instance of `RNNCell`.
       attention_mechanism: An instance of `AttentionMechanism`.
-      attention_size: Python integer, the depth of the attention (output)
-        tensor.
+      attention_layer_size: Python integer, the depth of the attention (output)
+        layer. If None (default), use the context as attention at each time
+        step. Otherwise, feed the context and cell output into the attention
+        layer to generate attention at each time step.
       alignment_history: Python boolean, whether to store alignment history
         from all time steps in the final output state (currently stored as a
         time major `TensorArray` on which you must call `stack()`).
@@ -477,11 +479,17 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         raise TypeError(
             "probability_fn must be callable, saw type: %s"
             % type(probability_fn).__name__)
+
+    if attention_layer_size is not None:
+      self._attention_layer = layers_core.Dense(
+          attention_layer_size, name="attention_layer", use_bias=False)
+      self._attention_size = attention_layer_size
+    else:
+      self._attention_layer = None
+      self._attention_size = attention_mechanism.values.get_shape()[-1].value
+
     self._cell = cell
     self._attention_mechanism = attention_mechanism
-    self._attention_size = attention_size
-    self._attention_layer = layers_core.Dense(
-        attention_size, name="attention_layer", use_bias=False)
     self._cell_input_fn = cell_input_fn
     self._probability_fn = probability_fn
     self._output_attention = output_attention
@@ -564,9 +572,9 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     # alignments shape is
     #   [batch_size, 1, memory_time]
     # attention_mechanism.values shape is
-    #   [batch_size, memory_time, attention_mechanism.num_units]
+    #   [batch_size, memory_time, attention_values_dim]
     # the batched matmul is over memory_time, so the output shape is
-    #   [batch_size, 1, attention_mechanism.num_units].
+    #   [batch_size, 1, attention_values_dim].
     # we then squeeze out the singleton dim.
     attention_mechanism_values = _maybe_tile_batch(
         self._attention_mechanism.values, tiling_factor)
@@ -574,8 +582,11 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
     context = array_ops.squeeze(context, [1])
 
-    attention = self._attention_layer(
-        array_ops.concat([cell_output, context], 1))
+    if self._attention_layer is not None:
+      attention = self._attention_layer(
+          array_ops.concat([cell_output, context], 1))
+    else:
+      attention = context
 
     if self._alignment_history:
       alignment_history = state.alignment_history.write(
-- 
GitLab


From c3041c54d92d39ed89bb838424e60e8c5ad5349c Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 24 Apr 2017 10:00:13 -0800
Subject: [PATCH 0642/1563] Temporarily disable xla_tf_graph_util_test on mac
 Change: 154069552

---
 tensorflow/contrib/xla_tf_graph/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/xla_tf_graph/BUILD b/tensorflow/contrib/xla_tf_graph/BUILD
index aef277bc6e..7e501d6b32 100644
--- a/tensorflow/contrib/xla_tf_graph/BUILD
+++ b/tensorflow/contrib/xla_tf_graph/BUILD
@@ -42,6 +42,7 @@ cc_library(
 cc_test(
     name = "xla_tf_graph_util_test",
     srcs = ["xla_tf_graph_util_test.cc"],
+    tags = ["nomac"],  # b/37622704
     deps = [
         ":xla_tf_graph_util",
         "//tensorflow/cc:cc_ops",
-- 
GitLab


From e9857abe3fe2bfd6f2313f177a42d6c687ebd540 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 10:22:00 -0800
Subject: [PATCH 0643/1563] Allow padded Tensors to be parsed directly for
 _real_valued_var_len_columns. Also move support for SparseTensor from
 real_valued_column to real_valued_var_len_column. Marked as experimental
 because it may confuse users of DNNEstimators. Change: 154072829

---
 .../layers/python/layers/feature_column.py    | 197 ++++++++++++++----
 .../python/layers/feature_column_ops_test.py  |  71 ++++---
 .../python/layers/feature_column_test.py      | 158 ++++++++------
 3 files changed, 287 insertions(+), 139 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 2ce50b64ea..d6d5bf2294 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -131,6 +131,7 @@ import math
 import six
 
 from tensorflow.contrib import lookup
+from tensorflow.contrib.framework.python.framework import experimental
 from tensorflow.contrib.layers.python.layers import layers
 from tensorflow.contrib.layers.python.ops import bucketization_op
 from tensorflow.contrib.layers.python.ops import sparse_feature_cross_op
@@ -316,7 +317,7 @@ class _SparseColumn(_FeatureColumn,
         * "mean": do l1 normalization on features in the column
         * "sqrtn": do l2 normalization on features in the column
       For more information: `tf.embedding_lookup_sparse`.
-    dtype: Type of features, such as `tf.string` or `tf.int64`.
+    dtype: Type of features, either `tf.string` or `tf.int64`.
 
   Raises:
     TypeError: if lookup_config is not a _SparseIdLookupConfig.
@@ -1367,17 +1368,143 @@ def _reshape_real_valued_tensor(input_tensor, output_rank, column_name=None):
   return layers._inner_flatten(input_tensor, output_rank)  # pylint: disable=protected-access
 
 
+class _RealValuedVarLenColumn(_FeatureColumn, collections.namedtuple(
+    "_RealValuedVarLenColumn",
+    ["column_name", "default_value", "dtype", "normalizer", "is_sparse"])):
+  """Represents a real valued feature column for variable length Features.
+
+  Instances of this class are immutable.
+  If is_sparse=False, the dictionary returned by InputBuilder contains a
+  ("column_name", Tensor) pair with a Tensor shape of (batch_size, dimension).
+  If is_sparse=True, the dictionary contains a ("column_name", SparseTensor)
+  pair instead with shape inferred after parsing.
+  """
+
+  @property
+  def name(self):
+    return self.column_name
+
+  @property
+  def config(self):
+    if self.is_sparse:
+      return {self.column_name: parsing_ops.VarLenFeature(self.dtype)}
+    else:
+      return {self.column_name: parsing_ops.FixedLenSequenceFeature(
+          [], self.dtype, allow_missing=True,
+          default_value=self.default_value)}
+
+  @property
+  def key(self):
+    """Returns a string which will be used as a key when we do sorting."""
+    return self._key_without_properties(["normalizer"])
+
+  @property
+  def normalizer_fn(self):
+    """Returns the function used to normalize the column."""
+    return self.normalizer
+
+  def _normalized_input_tensor(self, input_tensor):
+    """Returns the input tensor after custom normalization is applied."""
+    if self.normalizer is None:
+      return input_tensor
+    if self.is_sparse:
+      return sparse_tensor_py.SparseTensor(
+          input_tensor.indices,
+          self.normalizer(input_tensor.values),
+          input_tensor.dense_shape)
+    else:
+      return self.normalizer(input_tensor)
+
+  def insert_transformed_feature(self, columns_to_tensors):
+    """Apply transformation and inserts it into columns_to_tensors.
+
+    Args:
+      columns_to_tensors: A mapping from feature columns to tensors. 'string'
+        key means a base feature (not-transformed). It can have _FeatureColumn
+        as a key too. That means that _FeatureColumn is already transformed.
+    """
+    # Transform the input tensor according to the normalizer function.
+    input_tensor = self._normalized_input_tensor(columns_to_tensors[self.name])
+    columns_to_tensors[self] = math_ops.to_float(input_tensor)
+
+  def _to_dense_tensor(self, input_tensor):
+    if not self.is_sparse:
+      return input_tensor
+    raise ValueError("Set is_sparse to False if you want a dense Tensor for "
+                     "column_name: {}".format(self.name))
+
+
+@experimental
+def _real_valued_var_len_column(column_name,
+                                default_value=None,
+                                dtype=dtypes.float32,
+                                normalizer=None,
+                                is_sparse=False):
+  """Creates a `_RealValuedVarLenColumn` for variable-length numeric data.
+
+  Note, this is not integrated with any of the DNNEstimators, except the RNN
+  ones DynamicRNNEstimator and the StateSavingRNNEstimator.
+
+  It can either create a parsing config for a SparseTensor (with is_sparse=True)
+  or a padded Tensor.
+  The (dense_)shape of the result will be [batch_size, None], which can be used
+  with is_sparse=False as input into an RNN (see DynamicRNNEstimator or
+  StateSavingRNNEstimator) or with is_sparse=True as input into a tree (see
+  gtflow).
+
+  Use real_valued_column if the Feature has a fixed length. Use some
+  SparseColumn for columns to be embedded / one-hot-encoded.
+
+  Args:
+    column_name: A string defining real valued column name.
+    default_value: A scalar value compatible with dtype. Needs to be specified
+      if is_sparse=False.
+    dtype: Defines the type of values. Default value is tf.float32. Needs to be
+      convertible to tf.float32.
+    normalizer: If not None, a function that can be used to normalize the value
+      of the real valued column after default_value is applied for parsing.
+      Normalizer function takes the input tensor as its argument, and returns
+      the output tensor. (e.g. lambda x: (x - 3.0) / 4.2). Note that for
+      is_sparse=False, the normalizer will be run on the values of the
+      `SparseTensor`.
+    is_sparse: A boolean defining whether to create a SparseTensor or a Tensor.
+  Returns:
+    A _RealValuedSparseColumn.
+  Raises:
+    TypeError: if default_value is not a scalar value compatible with dtype.
+    TypeError: if dtype is not convertible to tf.float32.
+    ValueError: if default_value is None and is_sparse is False.
+  """
+  if not (dtype.is_integer or dtype.is_floating):
+    raise TypeError("dtype must be convertible to float. "
+                    "dtype: {}, column_name: {}".format(dtype, column_name))
+
+  if default_value is None and not is_sparse:
+    raise ValueError("default_value must be provided when is_sparse=False to "
+                     "parse a padded Tensor. "
+                     "column_name: {}".format(column_name))
+  if isinstance(default_value, list):
+    raise ValueError(
+        "Only scalar default value. default_value: {}, column_name: {}".format(
+            default_value, column_name))
+  if default_value is not None:
+    if dtype.is_integer:
+      default_value = int(default_value)
+    elif dtype.is_floating:
+      default_value = float(default_value)
+
+  return _RealValuedVarLenColumn(column_name, default_value, dtype, normalizer,
+                                 is_sparse)
+
+
 class _RealValuedColumn(_FeatureColumn, collections.namedtuple(
     "_RealValuedColumn",
     ["column_name", "dimension", "default_value", "dtype", "normalizer"])):
   """Represents a real valued feature column also known as continuous features.
 
-  Instances of this class are immutable. A real valued column with a specified
-  dimension means features are dense, otherwise they're sparse.
-  In the dense case, the dictionary returned by InputBuilder contains a
-  ("column_name", Tensor) pair with a Tensor shape of (batch_size, dimension).
-  In the sparse shape, the dictionary contains a ("column_name", SparseTensor)
-  pair instead with shape inferred after parsing.
+  Instances of this class are immutable. The dictionary returned by InputBuilder
+  contains a ("column_name", Tensor) pair with a Tensor shape of
+  (batch_size, dimension).
   """
 
   def __new__(cls, column_name, dimension, default_value,
@@ -1394,15 +1521,12 @@ class _RealValuedColumn(_FeatureColumn, collections.namedtuple(
 
   @property
   def config(self):
-    if self.dimension is None:
-      return {self.column_name: parsing_ops.VarLenFeature(self.dtype)}
-    else:
-      default_value = self.default_value
-      if default_value is not None:
-        default_value = list(default_value)
-      return {self.column_name: parsing_ops.FixedLenFeature([self.dimension],
-                                                            self.dtype,
-                                                            default_value)}
+    default_value = self.default_value
+    if default_value is not None:
+      default_value = list(default_value)
+    return {self.column_name: parsing_ops.FixedLenFeature([self.dimension],
+                                                          self.dtype,
+                                                          default_value)}
 
   @property
   def key(self):
@@ -1443,11 +1567,6 @@ class _RealValuedColumn(_FeatureColumn, collections.namedtuple(
     return _reshape_real_valued_tensor(input_tensor, output_rank, self.name)
 
   def _to_dense_tensor(self, input_tensor):
-    if isinstance(input_tensor, sparse_tensor_py.SparseTensor):
-      default_value = (self.default_value[0] if self.default_value is not None
-                       else 0)
-      return sparse_ops.sparse_tensor_to_dense(
-          input_tensor, default_value=default_value)
     return input_tensor
 
 
@@ -1461,10 +1580,7 @@ def real_valued_column(column_name,
   Args:
     column_name: A string defining real valued column name.
     dimension: An integer specifying dimension of the real valued column.
-      The default is 1. When dimension is not None, the Tensor representing
-      the _RealValuedColumn will have the shape of [batch_size, dimension].
-      A None dimension means the feature column should be treat as variable
-      length and will be parsed as a `SparseTensor`.
+      The default is 1.
     default_value: A single value compatible with dtype or a list of values
       compatible with dtype which the column takes on during tf.Example parsing
       if data is missing. When dimension is not None, a default value of None
@@ -1492,15 +1608,19 @@ def real_valued_column(column_name,
     ValueError: if dtype is not convertible to tf.float32.
   """
 
-  if dimension is not None:
-    if not isinstance(dimension, int):
-      raise TypeError("dimension must be an integer. "
-                      "dimension: {}, column_name: {}".format(dimension,
-                                                              column_name))
-    if dimension < 1:
-      raise ValueError("dimension must be greater than 0. "
-                       "dimension: {}, column_name: {}".format(dimension,
-                                                               column_name))
+  if dimension is None:
+    raise TypeError("dimension must be an integer. Use the "
+                    "_real_valued_var_len_column for variable length features."
+                    "dimension: {}, column_name: {}".format(dimension,
+                                                            column_name))
+  if not isinstance(dimension, int):
+    raise TypeError("dimension must be an integer. "
+                    "dimension: {}, column_name: {}".format(dimension,
+                                                            column_name))
+  if dimension < 1:
+    raise ValueError("dimension must be greater than 0. "
+                     "dimension: {}, column_name: {}".format(dimension,
+                                                             column_name))
 
   if not (dtype.is_integer or dtype.is_floating):
     raise ValueError("dtype must be convertible to float. "
@@ -1531,11 +1651,6 @@ def real_valued_column(column_name,
                                normalizer)
 
   if isinstance(default_value, list):
-    if dimension is None:
-      raise ValueError(
-          "Only scalar default value is supported when dimension is None. "
-          "default_value: {}, column_name: {}".format(
-              default_value, column_name))
     if len(default_value) != dimension:
       raise ValueError(
           "The length of default_value must be equal to dimension. "
@@ -2028,6 +2143,7 @@ def _get_feature_config(feature_column):
         "Given column is {}".format(feature_column))
   if isinstance(feature_column, (_SparseColumn, _WeightedSparseColumn,
                                  _EmbeddingColumn, _RealValuedColumn,
+                                 _RealValuedVarLenColumn,
                                  _BucketizedColumn, _CrossedColumn,
                                  _OneHotColumn, _ScatteredEmbeddingColumn)):
     return feature_column.config
@@ -2097,7 +2213,8 @@ def _create_sequence_feature_spec_for_parsing(sequence_feature_columns,
   feature_spec = create_feature_spec_for_parsing(sequence_feature_columns)
   sequence_feature_spec = {}
   for key, feature in feature_spec.items():
-    if isinstance(feature, parsing_ops.VarLenFeature):
+    if (isinstance(feature, parsing_ops.VarLenFeature) or
+        isinstance(feature, parsing_ops.FixedLenSequenceFeature)):
       sequence_feature = feature
     elif isinstance(feature, parsing_ops.FixedLenFeature):
       default_is_set = feature.default_value is not None
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index 01c54f77d6..632836fee4 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -52,8 +52,8 @@ class TransformerTest(test.TestCase):
       self.assertAllEqual(output.eval(), [[20.], [110], [-3]])
 
   def testSparseRealValuedColumnIdentityTransformation(self):
-    sparse_real_valued = feature_column.real_valued_column(
-        "rating", dimension=None)
+    sparse_real_valued = feature_column._real_valued_var_len_column(
+        "rating", is_sparse=True)
     rating_tensor = sparse_tensor.SparseTensor(
         values=[2.0, 5.0], indices=[[0, 0], [2, 0]], dense_shape=[3, 1])
     features = {"rating": rating_tensor}
@@ -68,11 +68,10 @@ class TransformerTest(test.TestCase):
   def testSparseRealValuedColumnWithTransformation(self):
 
     def square_fn(x):
-      return sparse_tensor.SparseTensor(
-          values=x.values**2, indices=x.indices, dense_shape=x.dense_shape)
+      return x**2
 
-    sparse_real_valued = feature_column.real_valued_column(
-        "rating", dimension=None, normalizer=square_fn)
+    sparse_real_valued = feature_column._real_valued_var_len_column(
+        "rating", normalizer=square_fn, is_sparse=True)
     rating_tensor = sparse_tensor.SparseTensor(
         values=[2.0, 5.0], indices=[[0, 0], [2, 0]], dense_shape=[3, 1])
     features = {"rating": rating_tensor}
@@ -561,13 +560,31 @@ class CreateInputLayersForDNNsTest(test.TestCase):
       feature_column_ops.input_from_feature_columns(
           features, {"feature": real_valued})
 
+  def testSparseTensorRealValuedColumn(self):
+    var_len_sparse_real_valued_column = (
+        feature_column._real_valued_var_len_column("rating", is_sparse=True))
+    features = {
+        "ids":
+            sparse_tensor.SparseTensor(
+                values=["c", "b", "a"],
+                indices=[[0, 0], [1, 0], [2, 0]],
+                dense_shape=[3, 1]),
+        "income":
+            constant_op.constant([[20.3, 10], [110.3, 0.4], [-3.0, 30.4]]),
+        "rating":
+            sparse_tensor.SparseTensor(
+                values=[3.5, 5.0], indices=[[0, 0], [2, 0]], dense_shape=[3, 1])
+    }
+    with self.assertRaisesRegexp(
+        ValueError,
+        "dd"):
+      feature_column_ops.input_from_feature_columns(
+          features, [var_len_sparse_real_valued_column])
+
   def testAllDNNColumns(self):
     sparse_column = feature_column.sparse_column_with_keys(
         "ids", ["a", "b", "c", "unseen"])
-
     real_valued_column = feature_column.real_valued_column("income", 2)
-    sparse_real_valued_column = feature_column.real_valued_column(
-        "rating", dimension=None)
     one_hot_column = feature_column.one_hot_column(sparse_column)
     embedding_column = feature_column.embedding_column(sparse_column, 10)
     features = {
@@ -578,18 +595,13 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                 dense_shape=[3, 1]),
         "income":
             constant_op.constant([[20.3, 10], [110.3, 0.4], [-3.0, 30.4]]),
-        "rating":
-            sparse_tensor.SparseTensor(
-                values=[3.5, 5.0], indices=[[0, 0], [2, 0]], dense_shape=[3, 1])
     }
     output = feature_column_ops.input_from_feature_columns(features, [
-        one_hot_column, embedding_column, real_valued_column,
-        sparse_real_valued_column
-    ])
+        one_hot_column, embedding_column, real_valued_column])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       data_flow_ops.tables_initializer().run()
-      self.assertAllEqual(output.eval().shape, [3, 3 + 4 + 10])
+      self.assertAllEqual(output.eval().shape, [3, 2 + 4 + 10])
 
   def testRealValuedColumn(self):
     real_valued = feature_column.real_valued_column("price")
@@ -610,15 +622,15 @@ class CreateInputLayersForDNNsTest(test.TestCase):
       self.assertAllClose(output.eval(), features["price"].eval())
 
   def testRealValuedColumnSparse(self):
-    sparse_real_valued = feature_column.real_valued_column(
-        "rating", dimension=None, default_value=-1)
-    rating_tensor = sparse_tensor.SparseTensor(
-        values=[2.0, 5.0], indices=[[0, 0], [2, 0]], dense_shape=[3, 1])
-    features = {"rating": rating_tensor}
-    output = feature_column_ops.input_from_feature_columns(features,
-                                                           [sparse_real_valued])
-    with self.test_session():
-      self.assertAllClose(output.eval(), [[2.0], [-1.0], [5.0]])
+    sparse_real_valued = feature_column._real_valued_var_len_column(
+        "rating", default_value=-1)
+    rating = [[2.0], [-1.0], [5.0]]
+    features = {"rating": constant_op.constant(rating)}
+    with self.assertRaisesRegexp(
+        ValueError,
+        "Error creating input layer for column: rating.*"):
+      feature_column_ops.input_from_feature_columns(features,
+                                                    [sparse_real_valued])
 
   def testRealValuedColumnWithNormalizer(self):
     real_valued = feature_column.real_valued_column(
@@ -2033,7 +2045,9 @@ class WeightedSumTest(test.TestCase):
     age = feature_column.real_valued_column("age")
     # The following RealValuedColumn has no predefined dimension so it
     # can be missing.
-    height = feature_column.real_valued_column("height", dimension=None)
+    height = feature_column._real_valued_var_len_column("height",
+                                                        default_value=0,
+                                                        is_sparse=False)
     # The following RealValuedColumn has 3 dimensions.
     incomes = feature_column.real_valued_column("incomes", 3)
     with ops.Graph().as_default():
@@ -2043,10 +2057,7 @@ class WeightedSumTest(test.TestCase):
           "incomes":
               constant_op.constant([[100., 200., 300.], [10., 20., 30.]]),
           "height":
-              sparse_tensor.SparseTensor(
-                  values=[5.0, 4.0, 6.0],
-                  indices=[[0, 0], [0, 1], [1, 1]],
-                  dense_shape=[2, 2]),
+              constant_op.constant([[5., 4.], [0., 6.]]),
           "country":
               sparse_tensor.SparseTensor(
                   values=["US", "SV"],
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_test.py b/tensorflow/contrib/layers/python/layers/feature_column_test.py
index dc706d24f2..aa3912a408 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_test.py
@@ -287,6 +287,51 @@ class FeatureColumnTest(test.TestCase):
     self.assertEqual(column.name, "a_one_hot")
     self.assertEqual(column.length, 4)
 
+  def testRealValuedVarLenColumn(self):
+    c = fc._real_valued_var_len_column("ccc", is_sparse=True)
+    self.assertTrue(c.is_sparse)
+    self.assertTrue(c.default_value is None)
+    # default_value is an integer.
+    c5 = fc._real_valued_var_len_column("c5", default_value=2)
+    self.assertEqual(c5.default_value, 2)
+    # default_value is a float.
+    d4 = fc._real_valued_var_len_column("d4", is_sparse=True)
+    self.assertEqual(d4.default_value, None)
+    self.assertEqual(d4.is_sparse, True)
+    # Default value is a list but dimension is None.
+    with self.assertRaisesRegexp(ValueError,
+                                 "Only scalar default value.*"):
+      fc._real_valued_var_len_column("g5", default_value=[2., 3.])
+
+  def testRealValuedVarLenColumnDtypes(self):
+    rvc = fc._real_valued_var_len_column("rvc", is_sparse=True)
+    self.assertDictEqual(
+        {
+            "rvc": parsing_ops.VarLenFeature(dtype=dtypes.float32)
+        }, rvc.config)
+
+    rvc = fc._real_valued_var_len_column("rvc", default_value=0,
+                                         is_sparse=False)
+    self.assertDictEqual(
+        {
+            "rvc": parsing_ops.FixedLenSequenceFeature(shape=[],
+                                                       dtype=dtypes.float32,
+                                                       allow_missing=True,
+                                                       default_value=0.0)
+        }, rvc.config)
+
+    rvc = fc._real_valued_var_len_column("rvc", dtype=dtypes.int32,
+                                         default_value=0, is_sparse=True)
+    self.assertDictEqual(
+        {
+            "rvc": parsing_ops.VarLenFeature(dtype=dtypes.int32)
+        }, rvc.config)
+
+    with self.assertRaisesRegexp(TypeError,
+                                 "dtype must be convertible to float"):
+      fc._real_valued_var_len_column("rvc", dtype=dtypes.string,
+                                     default_value="", is_sparse=True)
+
   def testRealValuedColumn(self):
     a = fc.real_valued_column("aaa")
     self.assertEqual(a.name, "aaa")
@@ -294,9 +339,6 @@ class FeatureColumnTest(test.TestCase):
     b = fc.real_valued_column("bbb", 10)
     self.assertEqual(b.dimension, 10)
     self.assertTrue(b.default_value is None)
-    c = fc.real_valued_column("ccc", dimension=None)
-    self.assertIsNone(c.dimension)
-    self.assertTrue(c.default_value is None)
 
     with self.assertRaisesRegexp(TypeError, "dimension must be an integer"):
       fc.real_valued_column("d3", dimension=1.0)
@@ -319,8 +361,6 @@ class FeatureColumnTest(test.TestCase):
     c4 = fc.real_valued_column(
         "c4", dimension=4, default_value=2, dtype=dtypes.int32)
     self.assertListEqual(list(c4.default_value), [2, 2, 2, 2])
-    c5 = fc.real_valued_column("c5", dimension=None, default_value=2)
-    self.assertListEqual(list(c5.default_value), [2])
 
     # default_value is a float.
     d1 = fc.real_valued_column("d1", default_value=2.)
@@ -330,8 +370,6 @@ class FeatureColumnTest(test.TestCase):
     with self.assertRaisesRegexp(TypeError,
                                  "default_value must be compatible with dtype"):
       fc.real_valued_column("d3", default_value=2., dtype=dtypes.int32)
-    d4 = fc.real_valued_column("d4", dimension=None, default_value=2.)
-    self.assertListEqual(list(d4.default_value), [2.])
 
     # default_value is neither integer nor float.
     with self.assertRaisesRegexp(TypeError,
@@ -362,12 +400,6 @@ class FeatureColumnTest(test.TestCase):
         ValueError, "The length of default_value must be equal to dimension"):
       fc.real_valued_column("g4", dimension=3, default_value=[2.])
 
-    # Default value is a list but dimension is None.
-    with self.assertRaisesRegexp(ValueError,
-                                 "Only scalar default value is supported "
-                                 "when dimension is None"):
-      fc.real_valued_column("g5", dimension=None, default_value=[2., 3.])
-
     # Test that the normalizer_fn gets stored for a real_valued_column
     normalizer = lambda x: x - 1
     h1 = fc.real_valued_column("h1", normalizer=normalizer)
@@ -404,30 +436,13 @@ class FeatureColumnTest(test.TestCase):
   def testRealValuedColumnDensification(self):
     """Tests densification behavior of `RealValuedColumn`."""
     # No default value, dimension 1 float.
-    real_valued_column = fc.real_valued_column(
-        "sparse_real_valued1", dimension=None)
+    real_valued_column = fc._real_valued_var_len_column(
+        "sparse_real_valued1", is_sparse=True)
     sparse_tensor = sparse_tensor_lib.SparseTensor(
         values=[2.0, 5.0], indices=[[0, 0], [2, 0]], dense_shape=[3, 1])
-    densified_output = real_valued_column._to_dnn_input_layer(sparse_tensor)
-
-    # With default value, dimension 2 int.
-    real_valued_column_with_default = fc.real_valued_column(
-        "sparse_real_valued2",
-        dimension=None,
-        default_value=-1,
-        dtype=dtypes.int32)
-    sparse_tensor2 = sparse_tensor_lib.SparseTensor(
-        values=[2, 5, 9, 0],
-        indices=[[0, 0], [1, 1], [2, 0], [2, 1]],
-        dense_shape=[3, 2])
-    densified_output2 = real_valued_column_with_default._to_dnn_input_layer(
-        sparse_tensor2)
-
-    with self.test_session() as sess:
-      densified_output_eval, densified_output_eval2 = sess.run(
-          [densified_output, densified_output2])
-      self.assertAllEqual(densified_output_eval, [[2.0], [0.0], [5.0]])
-      self.assertAllEqual(densified_output_eval2, [[2, -1], [-1, 5], [9, 0]])
+    with self.assertRaisesRegexp(
+        ValueError, "Calling an abstract method."):
+      real_valued_column._to_dnn_input_layer(sparse_tensor)
 
   def testRealValuedColumnDeepCopy(self):
     column = fc.real_valued_column(
@@ -452,9 +467,11 @@ class FeatureColumnTest(test.TestCase):
               column_name="bbb", bucket_size=10), [0])
 
   def testBucketizedColumnRequiresRealValuedColumnDimension(self):
-    with self.assertRaisesRegexp(ValueError,
-                                 "source_column must have a defined dimension"):
-      fc.bucketized_column(fc.real_valued_column("bbb", dimension=None), [0])
+    with self.assertRaisesRegexp(
+        TypeError, "source_column must be an instance of _RealValuedColumn.*"):
+      fc.bucketized_column(fc._real_valued_var_len_column("bbb",
+                                                          is_sparse=True),
+                           [0])
 
   def testBucketizedColumnRequiresSortedBuckets(self):
     with self.assertRaisesRegexp(ValueError,
@@ -564,12 +581,6 @@ class FeatureColumnTest(test.TestCase):
         },
         rvc.config)
 
-    rvc = fc.real_valued_column("rvc", dimension=None)
-    self.assertDictEqual(
-        {
-            "rvc": parsing_ops.VarLenFeature(dtype=dtypes.float32)
-        }, rvc.config)
-
     rvc = fc.real_valued_column("rvc", dtype=dtypes.int32)
     self.assertDictEqual(
         {
@@ -578,20 +589,10 @@ class FeatureColumnTest(test.TestCase):
         },
         rvc.config)
 
-    rvc = fc.real_valued_column("rvc", dimension=None, dtype=dtypes.int32)
-    self.assertDictEqual(
-        {
-            "rvc": parsing_ops.VarLenFeature(dtype=dtypes.int32)
-        }, rvc.config)
-
     with self.assertRaisesRegexp(ValueError,
                                  "dtype must be convertible to float"):
       fc.real_valued_column("rvc", dtype=dtypes.string)
 
-    with self.assertRaisesRegexp(ValueError,
-                                 "dtype must be convertible to float"):
-      fc.real_valued_column("rvc", dimension=None, dtype=dtypes.string)
-
   def testSparseColumnDtypes(self):
     sc = fc.sparse_column_with_integerized_feature("sc", 10)
     self.assertDictEqual(
@@ -696,8 +697,11 @@ class FeatureColumnTest(test.TestCase):
                                                 "str_id_weights_column")
     real_valued_col1 = fc.real_valued_column("real_valued_column1")
     real_valued_col2 = fc.real_valued_column("real_valued_column2", 5)
-    real_valued_col3 = fc.real_valued_column(
-        "real_valued_column3", dimension=None)
+    real_valued_col3 = fc._real_valued_var_len_column(
+        "real_valued_column3", is_sparse=True)
+    real_valued_col4 = fc._real_valued_var_len_column(
+        "real_valued_column4", dtype=dtypes.int64, default_value=0,
+        is_sparse=False)
     bucketized_col1 = fc.bucketized_column(
         fc.real_valued_column("real_valued_column_for_bucketization1"), [0, 4])
     bucketized_col2 = fc.bucketized_column(
@@ -713,8 +717,8 @@ class FeatureColumnTest(test.TestCase):
     feature_columns = set([
         sparse_col, embedding_col, weighted_id_col, int32_sparse_id_col,
         int64_sparse_id_col, real_valued_col1, real_valued_col2,
-        real_valued_col3, bucketized_col1, bucketized_col2, cross_col,
-        one_hot_col, scattered_embedding_col
+        real_valued_col3, real_valued_col4, bucketized_col1, bucketized_col2,
+        cross_col, one_hot_col, scattered_embedding_col
     ])
     expected_config = {
         "sparse_column":
@@ -737,6 +741,9 @@ class FeatureColumnTest(test.TestCase):
                 [5], dtype=dtypes.float32),
         "real_valued_column3":
             parsing_ops.VarLenFeature(dtype=dtypes.float32),
+        "real_valued_column4":
+            parsing_ops.FixedLenSequenceFeature(
+                [], dtype=dtypes.int64, allow_missing=True, default_value=0),
         "real_valued_column_for_bucketization1":
             parsing_ops.FixedLenFeature(
                 [1], dtype=dtypes.float32),
@@ -773,14 +780,17 @@ class FeatureColumnTest(test.TestCase):
         "real_valued_column3", default_value=[8])
     real_valued_col4 = fc.real_valued_column(
         "real_valued_column4", 3, default_value=[1, 0, 6])
-    real_valued_col5 = fc.real_valued_column(
-        "real_valued_column5", dimension=None, default_value=2)
+    real_valued_col5 = fc._real_valued_var_len_column(
+        "real_valued_column5", default_value=2, is_sparse=True)
+    real_valued_col6 = fc._real_valued_var_len_column(
+        "real_valued_column6", dtype=dtypes.int64, default_value=1,
+        is_sparse=False)
     feature_columns = [
         real_valued_col1, real_valued_col2, real_valued_col3, real_valued_col4,
-        real_valued_col5
+        real_valued_col5, real_valued_col6
     ]
     config = fc.create_feature_spec_for_parsing(feature_columns)
-    self.assertEqual(5, len(config))
+    self.assertEqual(6, len(config))
     self.assertDictEqual(
         {
             "real_valued_column1":
@@ -798,7 +808,11 @@ class FeatureColumnTest(test.TestCase):
                 parsing_ops.FixedLenFeature(
                     [3], dtype=dtypes.float32, default_value=[1., 0., 6.]),
             "real_valued_column5":
-                parsing_ops.VarLenFeature(dtype=dtypes.float32)
+                parsing_ops.VarLenFeature(dtype=dtypes.float32),
+            "real_valued_column6":
+                parsing_ops.FixedLenSequenceFeature(
+                    [], dtype=dtypes.int64, allow_missing=True,
+                    default_value=1)
         },
         config)
 
@@ -816,12 +830,14 @@ class FeatureColumnTest(test.TestCase):
     real_valued_col1 = fc.real_valued_column("real_valued_column", dimension=2)
     real_valued_col2 = fc.real_valued_column(
         "real_valued_default_column", dimension=5, default_value=3.0)
-    real_valued_col3 = fc.real_valued_column(
-        "real_valued_var_len_column", dimension=None, default_value=3.0)
+    real_valued_col3 = fc._real_valued_var_len_column(
+        "real_valued_var_len_column", default_value=3.0, is_sparse=True)
+    real_valued_col4 = fc._real_valued_var_len_column(
+        "real_valued_var_len_dense_column", default_value=4.0, is_sparse=False)
 
     feature_columns = set([
         sparse_col, embedding_col, weighted_id_col, real_valued_col1,
-        real_valued_col2, real_valued_col3
+        real_valued_col2, real_valued_col3, real_valued_col4
     ])
 
     feature_spec = fc._create_sequence_feature_spec_for_parsing(feature_columns)
@@ -842,7 +858,11 @@ class FeatureColumnTest(test.TestCase):
             parsing_ops.FixedLenSequenceFeature(
                 shape=[5], dtype=dtypes.float32, allow_missing=True),
         "real_valued_var_len_column":
-            parsing_ops.VarLenFeature(dtype=dtypes.float32)
+            parsing_ops.VarLenFeature(dtype=dtypes.float32),
+        "real_valued_var_len_dense_column":
+            parsing_ops.FixedLenSequenceFeature(
+                shape=[], dtype=dtypes.float32, allow_missing=True,
+                default_value=4.0),
     }
 
     self.assertDictEqual(expected_feature_spec, feature_spec)
@@ -851,8 +871,8 @@ class FeatureColumnTest(test.TestCase):
     sparse_col = fc.sparse_column_with_hash_bucket(
         "sparse_column", hash_bucket_size=100)
     real_valued_col = fc.real_valued_column("real_valued_column", 5)
-    vlen_real_valued_col = fc.real_valued_column(
-        "vlen_real_valued_column", dimension=None)
+    vlen_real_valued_col = fc._real_valued_var_len_column(
+        "vlen_real_valued_column", is_sparse=True)
 
     bucketized_col = fc.bucketized_column(
         fc.real_valued_column("real_valued_column_for_bucketization"), [0, 4])
-- 
GitLab


From f6cb79b53c6d26173d1d596d75a9da415f5ebcd0 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Mon, 24 Apr 2017 11:30:33 -0800
Subject: [PATCH 0644/1563] Fix persistent memory tracking for queue ops.
 Change: 154081725

---
 tensorflow/core/kernels/queue_op.h   | 11 +++++++++++
 tensorflow/core/kernels/queue_ops.cc |  8 --------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tensorflow/core/kernels/queue_op.h b/tensorflow/core/kernels/queue_op.h
index e13ea46e56..99d2d19bfd 100644
--- a/tensorflow/core/kernels/queue_op.h
+++ b/tensorflow/core/kernels/queue_op.h
@@ -56,6 +56,13 @@ class TypedQueueOp : public QueueOp {
  public:
   using QueueOp::QueueOp;
 
+  void Compute(OpKernelContext* context) override {
+    QueueOp::Compute(context);
+    if (queue_ && context->track_allocations()) {
+      context->record_host_persistent_memory_allocation(queue_->MemoryUsed());
+    }
+  }
+
  protected:
   template <typename TypedQueue>
   Status CreateTypedQueue(TypedQueue* queue, QueueInterface** ret) {
@@ -63,8 +70,12 @@ class TypedQueueOp : public QueueOp {
       return errors::ResourceExhausted("Failed to allocate queue.");
     }
     *ret = queue;
+    queue_ = queue;
     return queue->Initialize();
   }
+
+ private:
+  QueueInterface* queue_ = nullptr;
 };
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/queue_ops.cc b/tensorflow/core/kernels/queue_ops.cc
index 8251615386..301d1420a4 100644
--- a/tensorflow/core/kernels/queue_ops.cc
+++ b/tensorflow/core/kernels/queue_ops.cc
@@ -103,11 +103,6 @@ class EnqueueOp : public QueueAccessOpKernel {
     }
 
     OP_REQUIRES_OK_ASYNC(ctx, queue->ValidateTuple(tuple), callback);
-    if (ctx->track_allocations()) {
-      // We can get persistent memory size of the queue when it is kept full, no
-      // matter whether it is before or after the enqueue.
-      ctx->record_host_persistent_memory_allocation(queue->MemoryUsed());
-    }
     queue->TryEnqueue(tuple, ctx, callback);
   }
 
@@ -160,9 +155,6 @@ class EnqueueManyOp : public QueueAccessOpKernel {
     }
 
     OP_REQUIRES_OK_ASYNC(ctx, queue->ValidateManyTuple(tuple), callback);
-    if (ctx->track_allocations()) {
-      ctx->record_host_persistent_memory_allocation(queue->MemoryUsed());
-    }
     queue->TryEnqueueMany(tuple, ctx, callback);
   }
 
-- 
GitLab


From fc197e6c77e336700a22e04df2b1f20e0fc72fd5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 11:35:06 -0800
Subject: [PATCH 0645/1563] [XLA:HLO] Reduce copy and get-tuple-element
 instructions added by CopyInsertion.

CopyInsertion adds copies to while init operand elements to maintain correctness
for in-place while loops; e.g. if an element is updated in the loop, it must be
copied before entering the loop to avoid corrupting the state of other users of
the same buffer. However these copies are unnecessary if the element is
read-only in the while body. That is the general idea behind this CL; to remove
copies of read-only elements.

But there are some details. E.g. if any of these read-only elements are entry
parameters, they still must be copied (at least once). The problem here is that
entry parameter buffers are managed by the caller, and cannot (currently) share
the same allocation with other buffers. We add an optimization such that if the
same entry parameter is used by multiple while loops in a read-only fashion, it
is only copied once.

Also, the way the original code was adding the copies was sub-optimal. We'd end
up with this type of accordian pattern:
   tuple -> (gte, gte, gte) -> tuple
This CL also removes many of the extra gte+tuple ops.
Change: 154082222
---
 .../compiler/xla/service/buffer_assignment.cc |  34 +-
 .../xla/service/buffer_assignment_test.cc     |   5 +-
 .../compiler/xla/service/copy_insertion.cc    | 481 ++++++++++++------
 .../compiler/xla/service/copy_insertion.h     |   3 +-
 .../xla/service/copy_insertion_test.cc        | 269 ++++++----
 .../compiler/xla/service/cpu/cpu_compiler.cc  |  11 +-
 .../compiler/xla/service/gpu/gpu_compiler.cc  |   5 +-
 .../xla/service/gpu/while_transformer.cc      |  43 +-
 .../xla/service/gpu/while_transformer_test.cc |   8 +-
 .../compiler/xla/service/hlo_instruction.cc   |  55 +-
 .../compiler/xla/service/hlo_instruction.h    |  11 +-
 11 files changed, 616 insertions(+), 309 deletions(-)

diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index fa834c2ebd..6efa73b121 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -889,6 +889,8 @@ void BufferAssigner::AddWhileSetToColocatedBufferSets(
     const HloComputation& computation, const BufferLiveness& buffer_liveness,
     std::vector<ColocatedBufferSet>* colocated_buffer_sets) {
   CHECK(!colocated_set.empty());
+  const TuplePointsToAnalysis& points_to_analysis =
+      buffer_liveness.points_to_analysis();
 
   // Parallel while loops cannot safely share colocated buffer sets.
   if (buffer_liveness.hlo_ordering().SequentialOrder(computation) == nullptr) {
@@ -919,13 +921,26 @@ void BufferAssigner::AddWhileSetToColocatedBufferSets(
       continue;
     }
 
-    // Build vector of predecessor while result buffers.
+    // Build vector of predecessor while result and init buffers, which are
+    // checked for liveness interference below. We must check both the result
+    // and init buffers because they're aliased together, but
+    // TuplePointsToAnalysis is unaware of this aliasing.
     std::vector<const LogicalBuffer*> predecessor_while_buffers;
     for (const LogicalBuffer* buffer : predecessor_set) {
-      if (buffer->instruction()->opcode() == HloOpcode::kWhile &&
+      const HloInstruction* instruction = buffer->instruction();
+      if (instruction->opcode() == HloOpcode::kWhile &&
           buffer_size_(*buffer) == init_buffer_size &&
-          buffer->instruction()->parent() == &computation) {
+          instruction->parent() == &computation) {
         predecessor_while_buffers.push_back(buffer);
+        // Add the init buffer at the same index, which must also exist in the
+        // predecessor set, and must be unambiguous.
+        const PointsToSet& init_points_to =
+            points_to_analysis.GetPointsToSet(instruction->operand(0));
+        const std::vector<const LogicalBuffer*>& init_buffers =
+            init_points_to.element(buffer->index());
+        CHECK_EQ(init_buffers.size(), 1);
+        CHECK_GT(predecessor_set.count(init_buffers[0]), 0);
+        predecessor_while_buffers.push_back(init_buffers[0]);
       }
     }
     if (predecessor_while_buffers.empty()) {
@@ -1070,6 +1085,19 @@ void BufferAssigner::AssignColocatedBufferSets(
                                   buffer_size_(*buffer));
       }
       colocated_buffers->insert(buffer);
+
+      // Each entry parameter must reside in its own BufferAllocation. As a
+      // result, it doesn't make sense for entry parameters to appear in a
+      // colocated buffer set, since the only correct scenario would be a
+      // degenerate colocated set that only contains the entry parameter.
+      const HloInstruction* instruction = buffer->instruction();
+      const HloComputation* computation = instruction->parent();
+      const bool is_entry_parameter =
+          instruction->opcode() == HloOpcode::kParameter &&
+          computation == computation->parent()->entry_computation();
+      CHECK(!is_entry_parameter)
+          << "allocation: " << *allocation << " instruction: " << *buffer << " "
+          << instruction->ToString();
     }
   }
 }
diff --git a/tensorflow/compiler/xla/service/buffer_assignment_test.cc b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
index e6f02030aa..0d6e89c5c6 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
@@ -1403,10 +1403,13 @@ TEST_F(WhileBufferAssignmentTest, OneForwardBackwardWhileLoopSet) {
   RunCopyInsertion(module.get());
   auto assignment = RunBufferAssignment(module.get());
 
-  EXPECT_EQ(assignment->GetUniqueSlice(while0, {2}).ConsumeValueOrDie(),
+  // while0 and while1 buffers should be completely aligned.
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {0}).ConsumeValueOrDie(),
             assignment->GetUniqueSlice(while1, {0}).ConsumeValueOrDie());
   EXPECT_EQ(assignment->GetUniqueSlice(while0, {1}).ConsumeValueOrDie(),
             assignment->GetUniqueSlice(while1, {1}).ConsumeValueOrDie());
+  EXPECT_EQ(assignment->GetUniqueSlice(while0, {2}).ConsumeValueOrDie(),
+            assignment->GetUniqueSlice(while1, {2}).ConsumeValueOrDie());
 }
 
 TEST_F(BufferAssignmentTest, TwoCalls) {
diff --git a/tensorflow/compiler/xla/service/copy_insertion.cc b/tensorflow/compiler/xla/service/copy_insertion.cc
index 81f54c26ec..7db28aed3c 100644
--- a/tensorflow/compiler/xla/service/copy_insertion.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion.cc
@@ -16,8 +16,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/copy_insertion.h"
 
 #include <memory>
-#include <set>
-#include <string>
 
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
@@ -29,6 +27,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/util.h"
+#include "tensorflow/core/lib/gtl/flatmap.h"
+#include "tensorflow/core/lib/gtl/flatset.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/logging.h"
 
@@ -36,6 +36,9 @@ namespace xla {
 
 namespace {
 
+using tensorflow::gtl::FlatMap;
+using tensorflow::gtl::FlatSet;
+
 // InstructionCopier encapsulates indices at which to copy 'instruction'.
 // All 'instruction' users in 'copy_users' are updated to use the copy.
 //
@@ -52,7 +55,7 @@ namespace {
 //
 //      Example two-element tuple with one element that needs a copy:
 //
-//                    Tuple  // instruction
+//             original-instruction
 //                   /    \
 //                GTE(0)  GTE(1)
 //                  |       |
@@ -60,23 +63,54 @@ namespace {
 //                   \     /
 //                    Tuple  // copied-instruction
 //
+//      As an optimization, if the original instruction is itself a Tuple
+//      instruction, we elide the unnecessary extra GTE and Tuple instructions,
+//      and just insert the copy into a new Tuple instruction, with control
+//      dependencies to ensure the copy occurs after any possible interference.
 class InstructionCopier {
  public:
-  InstructionCopier(const bool init_value, HloInstruction* instruction,
-                    const std::vector<HloInstruction*>& copy_users);
+  InstructionCopier(HloInstruction* instruction,
+                    const std::vector<HloInstruction*>& copy_users)
+      : instruction_(instruction),
+        copy_users_(copy_users),
+        indices_to_copy_(instruction->shape()),
+        control_predecessors_(instruction->shape()) {}
+
+  // Sets indices that are read-only, and thus do not need to be copied.
+  void SetReadOnlyIndices(const ShapeTree<bool>& read_only_indices) {
+    read_only_indices_ = read_only_indices;
+  }
+
+  // Sets copy overrides, which are copy instructions to use at each index. This
+  // is used to share a single copy of read-only entry parameters and constants
+  // between multiple While loops.
+  void SetCopyOverrides(const ShapeTree<HloInstruction*>& copy_overrides) {
+    copy_overrides_ = copy_overrides;
+  }
 
   // Returns true if all recorded indices are false (returns true otherwise).
   bool HasAllIndicesFalse() const;
 
   // Records instruction buffer indices which point-to a Parameter or Constant.
-  tensorflow::Status RecordIndicesWhichPointToParamOrConstant(
+  Status RecordIndicesWhichPointToParamOrConstant(
       const TuplePointsToAnalysis& points_to_analysis);
 
   // Records instruction buffer indices to copy which are necessary to ensure:
   // *) PointsToSet of 'instruction_' is unambiguous and distinct.
   // *) No liveness interference between 'instruction_' and 'other_instruction'.
-  tensorflow::Status RecordIndicesToCopyForColocatingBuffers(
-      BufferLiveness* liveness, HloInstruction* other_instruction);
+  //
+  // If 'read_only_indices_out' is non-null, read-only indices are set to true.
+  Status RecordIndicesToCopyForColocatingBuffers(
+      const BufferLiveness& liveness, const HloInstruction* other_instruction,
+      ShapeTree<bool>* read_only_indices_out);
+
+  // Records control predecessors to add for inserted copy instructions.
+  // 'parameter' must have the same shape as the instruction that will be
+  // copied, and must define all buffers in the shape. Control predecessors are
+  // only recorded for indices that have already been marked for copying.
+  Status RecordControlPredecessors(
+      const TuplePointsToAnalysis& points_to_analysis,
+      HloInstruction* parameter);
 
   // Inserts copies of 'instruction' buffers at indices in 'indices_to_copy',
   // and replaces all uses for instructions in 'copy_users_' with copy.
@@ -88,15 +122,29 @@ class InstructionCopier {
   const std::vector<HloInstruction*>& copy_users() const { return copy_users_; }
 
  private:
+  // Does the given index represent a read-only buffer?
+  bool IsReadOnlyIndex(const ShapeIndex& index) const {
+    return !ShapeUtil::IsNil(read_only_indices_.shape()) &&
+           read_only_indices_.element(index);
+  }
+
+  // Returns the copy override at the given index, or nullptr.
+  HloInstruction* GetCopyOverride(const ShapeIndex& index) const {
+    return ShapeUtil::IsNil(copy_overrides_.shape())
+               ? nullptr
+               : copy_overrides_.element(index);
+  }
+
   // Records instruction buffer indices which have ambiguous or non-distinct
   // points-to sets.
-  tensorflow::Status RecordAmbiguousOrNonDistinctIndices(
+  Status RecordAmbiguousOrNonDistinctIndices(
       const TuplePointsToAnalysis& points_to_analysis);
 
   // Records instruction buffer indices which have interferring live ranges
   // with 'other_instruction' buffers at same index.
-  tensorflow::Status RecordIndicesWhichInterfereWithOtherInstruction(
-      BufferLiveness* liveness, HloInstruction* other_instruction);
+  Status RecordIndicesWhichInterfereWithOtherInstruction(
+      const BufferLiveness& liveness, const HloInstruction* other_instruction,
+      ShapeTree<bool>* read_only_indices_out);
 
   // Recursively inserts copies of 'instruction' tuple elements at indices
   // specified in 'indices_to_copy', and returns the copy of 'instruction'.
@@ -107,28 +155,25 @@ class InstructionCopier {
   }
 
   HloInstruction* instruction_;
-  std::vector<HloInstruction*> copy_users_;
+  const std::vector<HloInstruction*> copy_users_;
   ShapeTree<bool> indices_to_copy_;
+  ShapeTree<std::vector<HloInstruction*>> control_predecessors_;
+  ShapeTree<bool> read_only_indices_;
+  ShapeTree<HloInstruction*> copy_overrides_;
 };
 
-InstructionCopier::InstructionCopier(
-    const bool init_value, HloInstruction* instruction,
-    const std::vector<HloInstruction*>& copy_users)
-    : instruction_(instruction),
-      copy_users_(copy_users),
-      indices_to_copy_(instruction->shape(), init_value) {}
-
 bool InstructionCopier::HasAllIndicesFalse() const {
   bool all_indices_false = true;
-  TF_CHECK_OK(indices_to_copy_.ForEachElement([&all_indices_false](
-      const ShapeIndex& /*index*/, bool /*is_leaf*/, const bool& data) {
-    if (data) all_indices_false = false;
-    return tensorflow::Status::OK();
-  }));
+  TF_CHECK_OK(indices_to_copy_.ForEachElement(
+      [&all_indices_false](const ShapeIndex& /*index*/, bool /*is_leaf*/,
+                           bool data) {
+        if (data) all_indices_false = false;
+        return tensorflow::Status::OK();
+      }));
   return all_indices_false;
 }
 
-tensorflow::Status InstructionCopier::RecordIndicesWhichPointToParamOrConstant(
+Status InstructionCopier::RecordIndicesWhichPointToParamOrConstant(
     const TuplePointsToAnalysis& points_to_analysis) {
   const PointsToSet& points_to =
       points_to_analysis.GetPointsToSet(instruction_);
@@ -141,41 +186,47 @@ tensorflow::Status InstructionCopier::RecordIndicesWhichPointToParamOrConstant(
 
   // Multiple buffers within a parameter/constant may be live out, so collect
   // a set of indices at which to copy first.
-  TF_RETURN_IF_ERROR(points_to.ForEachElement([this](
-      const ShapeIndex& index, bool /*is_leaf*/,
-      const std::vector<const LogicalBuffer*>& buffers) {
-    for (auto buffer : buffers) {
-      // pointee is the HloInstruction producing the buffer which may be
-      // liveout.
-      HloInstruction* pointee = buffer->instruction();
-      if (pointee->opcode() == HloOpcode::kParameter ||
-          pointee->opcode() == HloOpcode::kConstant) {
-        VLOG(2) << "Parameter or constant buffer " << buffer->ToString()
-                << " index: " << tensorflow::str_util::Join(index, ",")
-                << " may be live out of computation: " << pointee->ToString();
-        RecordIndex(index);
-      }
-    }
-    return tensorflow::Status::OK();
-  }));
-  return tensorflow::Status::OK();
+  TF_RETURN_IF_ERROR(points_to.ForEachElement(
+      [this](const ShapeIndex& index, bool /*is_leaf*/,
+             const std::vector<const LogicalBuffer*>& buffers) {
+        if (IsReadOnlyIndex(index)) {
+          return Status::OK();
+        }
+        for (const LogicalBuffer* buffer : buffers) {
+          // pointee is the HloInstruction producing the buffer which may be
+          // liveout.
+          HloInstruction* pointee = buffer->instruction();
+          if (pointee->opcode() == HloOpcode::kParameter ||
+              pointee->opcode() == HloOpcode::kConstant) {
+            VLOG(2) << "Parameter or constant buffer " << buffer->ToString()
+                    << " index: " << tensorflow::str_util::Join(index, ",")
+                    << " may be live out of computation: "
+                    << pointee->ToString();
+            RecordIndex(index);
+            break;
+          }
+        }
+        return Status::OK();
+      }));
+  return Status::OK();
 }
 
-tensorflow::Status InstructionCopier::RecordIndicesToCopyForColocatingBuffers(
-    BufferLiveness* liveness, HloInstruction* other_instruction) {
+Status InstructionCopier::RecordIndicesToCopyForColocatingBuffers(
+    const BufferLiveness& liveness, const HloInstruction* other_instruction,
+    ShapeTree<bool>* read_only_indices_out) {
   TF_RETURN_IF_ERROR(
-      RecordAmbiguousOrNonDistinctIndices(liveness->points_to_analysis()));
+      RecordAmbiguousOrNonDistinctIndices(liveness.points_to_analysis()));
   TF_RETURN_IF_ERROR(RecordIndicesWhichInterfereWithOtherInstruction(
-      liveness, other_instruction));
-  return tensorflow::Status::OK();
+      liveness, other_instruction, read_only_indices_out));
+  return Status::OK();
 }
 
-tensorflow::Status InstructionCopier::RecordAmbiguousOrNonDistinctIndices(
+Status InstructionCopier::RecordAmbiguousOrNonDistinctIndices(
     const TuplePointsToAnalysis& points_to_analysis) {
   const PointsToSet& points_to =
       points_to_analysis.GetPointsToSet(instruction_);
   // Mapping from LogicalBuffer to index (used to detect non-distinct indices).
-  std::unordered_map<const LogicalBuffer*, std::vector<ShapeIndex>>
+  FlatMap<const LogicalBuffer*, std::vector<ShapeIndex>>
       buffer_to_source_indices;
   TF_RETURN_IF_ERROR(points_to.ForEachElement([this, &buffer_to_source_indices](
       const ShapeIndex& index, bool /*is_leaf*/,
@@ -191,22 +242,18 @@ tensorflow::Status InstructionCopier::RecordAmbiguousOrNonDistinctIndices(
       }
     }
     // For each 'buffer': record a mapping from 'buffer' to 'index'.
-    for (auto& buffer : buffers) {
-      auto it = buffer_to_source_indices.find(buffer);
-      if (it == buffer_to_source_indices.end()) {
-        buffer_to_source_indices.insert({buffer, std::vector<ShapeIndex>()});
-      }
+    for (const LogicalBuffer* buffer : buffers) {
       buffer_to_source_indices[buffer].push_back(index);
     }
-    return tensorflow::Status::OK();
+    return Status::OK();
   }));
 
   // Record all non-distinct indices detected in 'buffer_to_source_indices'.
-  for (auto& buff_to_src : buffer_to_source_indices) {
+  for (const auto& buff_to_src : buffer_to_source_indices) {
     if (buff_to_src.second.size() == 1) {
       continue;
     }
-    for (auto& src_index : buff_to_src.second) {
+    for (const ShapeIndex& src_index : buff_to_src.second) {
       // Record non-distinct points-to set at 'src_index'.
       if (!indices_to_copy_.element(src_index)) {
         VLOG(2) << "Adding copy of buffer for instruction: "
@@ -217,23 +264,26 @@ tensorflow::Status InstructionCopier::RecordAmbiguousOrNonDistinctIndices(
       }
     }
   }
-  return tensorflow::Status::OK();
+  return Status::OK();
 }
 
-tensorflow::Status
-InstructionCopier::RecordIndicesWhichInterfereWithOtherInstruction(
-    BufferLiveness* liveness, HloInstruction* other_instruction) {
+Status InstructionCopier::RecordIndicesWhichInterfereWithOtherInstruction(
+    const BufferLiveness& liveness, const HloInstruction* other_instruction,
+    ShapeTree<bool>* read_only_indices_out) {
   // Record all buffer indices for 'instruction_', which interfere with
   // 'other_instruction' at the same index.
   TF_RETURN_IF_ERROR(ShapeUtil::ForEachSubshape(
       instruction_->shape(),
-      [this, &liveness, &other_instruction](const Shape& /*subshape*/,
-                                            const ShapeIndex& index) {
+      [this, &liveness, other_instruction, read_only_indices_out](
+          const Shape& /*subshape*/, const ShapeIndex& index) {
+        if (IsReadOnlyIndex(index)) {
+          return Status::OK();
+        }
         if (indices_to_copy_.element(index)) {
           // Return if previous pass already set index.
-          return tensorflow::Status::OK();
+          return Status::OK();
         }
-        auto& points_to_analysis = liveness->points_to_analysis();
+        const auto& points_to_analysis = liveness.points_to_analysis();
         // Lookup buffers for 'instruction_' and 'other_instruction'.
         const std::vector<const LogicalBuffer*> instruction_buffers =
             points_to_analysis.GetPointsToSet(instruction_).element(index);
@@ -252,18 +302,21 @@ InstructionCopier::RecordIndicesWhichInterfereWithOtherInstruction(
         // then that buffer is not updated on the path between the two
         // instructions. Therefore, any other (possibly interference-causing)
         // users of that buffer from 'other_instruction' will see the same data,
-        // irrespecive of whether we insert a copy of this buffer at
+        // irrespective of whether we insert a copy of this buffer at
         // 'instruction_' or not.
         if (other_instruction_buffers.size() == 1 &&
             other_instruction_buffers[0]->id() == instruction_buffer->id()) {
-          return tensorflow::Status::OK();
+          if (read_only_indices_out != nullptr) {
+            *read_only_indices_out->mutable_element(index) = true;
+          }
+          return Status::OK();
         }
-        // We cant say anything about the ambiguity of 'other_instruction' at
+        // We can't say anything about the ambiguity of 'other_instruction' at
         // this point, so we need to check interference between the single
         // buffer in the points-to set of 'instruction_' and all buffers in
         // 'other_instruction_buffers'.
-        for (auto& other_buffer : other_instruction_buffers) {
-          if (liveness->MayInterfere(*instruction_buffer, *other_buffer)) {
+        for (const LogicalBuffer* other_buffer : other_instruction_buffers) {
+          if (liveness.MayInterfere(*instruction_buffer, *other_buffer)) {
             VLOG(2) << "Adding copy of buffer for instruction: "
                     << instruction_->name()
                     << " at index: " << tensorflow::str_util::Join(index, ",")
@@ -273,40 +326,84 @@ InstructionCopier::RecordIndicesWhichInterfereWithOtherInstruction(
             break;
           }
         }
-        return tensorflow::Status::OK();
+        return Status::OK();
       }));
-  return tensorflow::Status::OK();
+  return Status::OK();
+}
+
+// This is called when 'instruction_' is a while body root, and 'parameter' is
+// the while body parameter. We record all users of all aliases of 'parameter'
+// as control predecessors, so that when we add a copy of 'instruction_', we can
+// mark the control dependencies. This is necessary because points-to and
+// liveness analysis doesn't know about the aliasing between the while body root
+// and param. Without these control dependencies, the copy might get scheduled
+// to run at a point that interferes with users of the buffer.
+Status InstructionCopier::RecordControlPredecessors(
+    const TuplePointsToAnalysis& points_to_analysis,
+    HloInstruction* parameter) {
+  return indices_to_copy_.ForEachElement(
+      [this, &points_to_analysis, parameter](const ShapeIndex& index,
+                                             bool /*is_leaf*/, bool will_copy) {
+        if (will_copy) {
+          TF_ASSIGN_OR_RETURN(
+              const LogicalBuffer* buffer,
+              points_to_analysis.GetBufferDefinedAt(parameter, index));
+          for (const BufferAlias& alias :
+               points_to_analysis.GetBufferAliases(*buffer)) {
+            for (HloInstruction* user : alias.instruction()->users()) {
+              if (user != instruction_) {
+                control_predecessors_.mutable_element(index)->push_back(user);
+              }
+            }
+          }
+        }
+        return Status::OK();
+      });
 }
 
 // Recursively inserts copies of 'instruction' tuple element buffers at
 // indices in 'indices_to_copy_', expanding tuples as needed.
-// TODO(b/31159897) Remove superfluous Tuple->GTE->Tuple expressions.
 HloInstruction* InstructionCopier::CopyTuple(HloInstruction* instruction,
                                              ShapeIndex* index) {
-  std::vector<HloInstruction*> element_copies;
   const int64 num_tuple_elements =
       ShapeUtil::TupleElementCount(instruction->shape());
+  std::vector<HloInstruction*> elem_copies(num_tuple_elements);
   for (int64 i = 0; i < num_tuple_elements; ++i) {
-    HloInstruction* gte = instruction->parent()->AddInstruction(
-        HloInstruction::CreateGetTupleElement(
-            ShapeUtil::GetSubshape(instruction->shape(), {i}), instruction, i));
-    HloInstruction* element_copy;
+    HloInstruction* elem;
+    if (instruction->opcode() == HloOpcode::kTuple) {
+      // If the instruction is already a Tuple instruction, we know that the
+      // element buffers are aliased, so we can just grab the operand directly.
+      elem = instruction->mutable_operand(i);
+    } else {
+      // Otherwise we need to add a GTE to unpack the element out of the tuple.
+      elem = instruction->parent()->AddInstruction(
+          HloInstruction::CreateGetTupleElement(
+              ShapeUtil::GetSubshape(instruction->shape(), {i}), instruction,
+              i));
+    }
     index->push_back(i);
-    if (ShapeUtil::IsTuple(gte->shape())) {
-      element_copy = CopyTuple(gte, index);
+    if (ShapeUtil::IsTuple(elem->shape())) {
+      elem_copies[i] = CopyTuple(elem, index);
+    } else if (!indices_to_copy_.element(*index)) {
+      elem_copies[i] = elem;
+    } else if (HloInstruction* copy_override = GetCopyOverride(*index)) {
+      elem_copies[i] = copy_override;
     } else {
-      if (indices_to_copy_.element(*index)) {
-        element_copy = gte->parent()->AddInstruction(
-            HloInstruction::CreateUnary(gte->shape(), HloOpcode::kCopy, gte));
-      } else {
-        element_copy = gte;
+      HloInstruction* elem_copy = elem->parent()->AddInstruction(
+          HloInstruction::CreateUnary(elem->shape(), HloOpcode::kCopy, elem));
+      for (HloInstruction* control_predecessor :
+           control_predecessors_.element(*index)) {
+        VLOG(2) << "Adding control dependency from "
+                << control_predecessor->ToString() << " to "
+                << elem_copy->ToString();
+        TF_CHECK_OK(control_predecessor->AddControlDependencyTo(elem_copy));
       }
+      elem_copies[i] = elem_copy;
     }
     index->pop_back();
-    element_copies.push_back(element_copy);
   }
   return instruction->parent()->AddInstruction(
-      HloInstruction::CreateTuple(element_copies));
+      HloInstruction::CreateTuple(elem_copies));
 }
 
 // Inserts copies of 'instruction_' buffers at indices in 'indices_to_copy_'.
@@ -327,8 +424,85 @@ HloInstruction* InstructionCopier::Copy() {
   return copy;
 }
 
+// The 'read_only_indices' are initalized based on points-to analysis on the
+// while body corresponding to 'while_hlo'. If the init buffer corresponding to
+// a read-only index aliases with an entry parameter (or constant), it cannot be
+// considered read-only, and must be copied. This is necessary because some
+// backends don't support entry-parameter (or constant) aliasing with regular
+// instructions. This function performs this fix-up of 'read_only_indices'.
+//
+// Returns a ShapeTree of copy_overrides, which implements an optimization to
+// allow multiple while loops that share the same read-only entry parameters to
+// share a single copy.
+StatusOr<ShapeTree<HloInstruction*>>
+RevertReadOnlyIndicesForEntryParamsAndConstants(
+    const HloInstruction* while_hlo,
+    const TuplePointsToAnalysis& points_to_analysis,
+    ShapeTree<bool>* read_only_indices,
+    FlatMap<const HloInstruction*, HloInstruction*>* shared_copies) {
+  const HloInstruction* init_hlo = while_hlo->operand(0);
+  const PointsToSet& points_to = points_to_analysis.GetPointsToSet(init_hlo);
+  ShapeTree<HloInstruction*> copy_overrides(init_hlo->shape());
+  TF_RETURN_IF_ERROR(points_to.ForEachElement(
+      [init_hlo, read_only_indices, shared_copies, &copy_overrides](
+          const ShapeIndex& index, bool /*is_leaf*/,
+          const std::vector<const LogicalBuffer*>& buffers) {
+        // Look for read-only entry parameters.
+        if (!read_only_indices->element(index)) {
+          return Status::OK();
+        }
+        for (const LogicalBuffer* buffer : buffers) {
+          HloInstruction* pointee = buffer->instruction();
+          const HloComputation* computation = pointee->parent();
+          const bool is_entry_parameter =
+              pointee->opcode() == HloOpcode::kParameter &&
+              computation == computation->parent()->entry_computation();
+          const bool is_constant = pointee->opcode() == HloOpcode::kConstant;
+          if (!is_entry_parameter && !is_constant) {
+            continue;
+          }
+          // We have found an entry parameter or constant that is read-only in
+          // the while body. These buffers are managed by the caller, and cannot
+          // be aliased with non-parameter buffers. Revert this read-only index,
+          // to allow it to be copied.
+          *read_only_indices->mutable_element(index) = false;
+
+          // Optimization to allow multiple while loops that share the same
+          // read-only entry parameters (or constants) to share a single copy.
+          // Only unambiguous array-shaped buffers are allowed, to reduce code
+          // complexity. The shape of the entry parameter must be identical to
+          // the shape of the init_hlo at this index, to ensure there were no
+          // intervening bitcast or GTE instructions, which are also hard to
+          // handle.
+          const Shape& pointee_shape = pointee->shape();
+          const Shape& init_shape =
+              ShapeUtil::GetSubshape(init_hlo->shape(), index);
+          if (buffers.size() == 1 && ShapeUtil::IsArray(pointee_shape) &&
+              ShapeUtil::Equal(pointee_shape, init_shape)) {
+            HloInstruction** copy = &(*shared_copies)[pointee];
+            if (*copy == nullptr) {
+              *copy =
+                  pointee->parent()->AddInstruction(HloInstruction::CreateUnary(
+                      pointee_shape, HloOpcode::kCopy, pointee));
+            }
+            // Add the copy as an override.
+            *copy_overrides.mutable_element(index) = *copy;
+          }
+
+          // We've already reverted the read-only index and handled the
+          // single-copy optimization above, so there's nothing more to do.
+          break;
+        }
+        return Status::OK();
+      }));
+  return copy_overrides;
+}
+
 }  // anonymous namespace
 
+// NOTE: This is only called by gpu::CopyInsertion. It's not called here in the
+// base class, since the regular CopyInsertion logic above selectively copies
+// tuple elements, while this method assumes all buffers need to be deep copied.
 StatusOr<HloInstruction*> CopyInsertion::FindOrInsertCopy(HloInstruction* hlo) {
   auto copy_it = inserted_copies_.find(hlo);
   if (copy_it == inserted_copies_.end()) {
@@ -347,85 +521,96 @@ StatusOr<bool> CopyInsertion::Run(HloModule* module) {
   TF_ASSIGN_OR_RETURN(
       std::unique_ptr<BufferLiveness> liveness,
       BufferLiveness::Run(module, MakeUnique<DependencyHloOrdering>(module)));
-  auto& points_to_analysis = liveness->points_to_analysis();
+  const auto& points_to_analysis = liveness->points_to_analysis();
   XLA_VLOG_LINES(2, points_to_analysis.ToString());
   XLA_VLOG_LINES(2, module->ToString());
 
-  // Gather references to all while body computations in 'module'.
-  std::unordered_set<const HloComputation*> while_body_computations;
-  // Gather references to all while instructions in 'module' by computation.
-  std::unordered_map<const HloComputation*, std::vector<HloInstruction*>>
-      while_instructions;
+  // Gather all while body computations and while instructions.
+  FlatSet<const HloComputation*> while_body_computations;
+  std::vector<HloInstruction*> while_instructions;
   for (auto& computation : module->computations()) {
     for (auto& instruction : computation->instructions()) {
-      if (instruction->opcode() != HloOpcode::kWhile) {
-        continue;
-      }
-      while_body_computations.insert(instruction->while_body());
-      auto it = while_instructions.find(computation.get());
-      if (it == while_instructions.end()) {
-        while_instructions.insert(
-            {computation.get(), std::vector<HloInstruction*>()});
+      if (instruction->opcode() == HloOpcode::kWhile) {
+        while_body_computations.insert(instruction->while_body());
+        while_instructions.push_back(instruction.get());
       }
-      while_instructions[computation.get()].emplace_back(instruction.get());
     }
   }
 
+  // Collect instruction buffer indices to copy in 'instructions_to_copy'.
+  std::vector<InstructionCopier> instructions_to_copy;
+
+  // Add copies of computation root instructions, if needed.
+  FlatMap<const HloComputation*, ShapeTree<bool>> while_body_read_only_indices;
   for (auto& computation : module->computations()) {
     VLOG(2) << "computation " << computation->name();
-
-    // Collect instruction buffer indices to copy in 'instructions_to_copy'.
-    std::vector<InstructionCopier> instructions_to_copy;
-
-    // Add copies of while 'init' operand instructions (if needed).
-    // TODO(b/33301720) Remove redundant while instruction copies.
-    auto it = while_instructions.find(computation.get());
-    if (it != while_instructions.end()) {
-      for (auto& while_hlo : it->second) {
-        // Create InstructionCopier for init operand of while instruction.
-        HloInstruction* init_hlo = while_hlo->mutable_operand(0);
-        instructions_to_copy.push_back(
-            InstructionCopier(/*init_value=*/false, init_hlo, {while_hlo}));
-        InstructionCopier& init_copier = instructions_to_copy.back();
-        // Record 'init' buffer indices which point-to a Constant or Parameter.
-        TF_RETURN_IF_ERROR(init_copier.RecordIndicesWhichPointToParamOrConstant(
-            liveness->points_to_analysis()));
-        // Record indices necessary to colocate while and init operand buffers.
-        TF_RETURN_IF_ERROR(init_copier.RecordIndicesToCopyForColocatingBuffers(
-            liveness.get(), while_hlo));
-      }
-    }
-
-    // Create InstructionCopier for computation root instruction.
-    instructions_to_copy.push_back(InstructionCopier(
-        /*init_value=*/false, computation->root_instruction(), {}));
-    InstructionCopier& root_copier = instructions_to_copy.back();
-
+    InstructionCopier root_copier(computation->root_instruction(),
+                                  /*copy_users=*/{});
     if (while_body_computations.count(computation.get()) > 0) {
-      // Record root indices to copy for while body sub-computations.
-      // We do not need to call RecordIndicesWhichPointToParamOrConstant for
-      // the while root instruction here, because any neccessary copies needed
-      // to avoid constant or parameters in the output are handled by while.init
-      // operand copy insertion above (which will share an allocation).
+      // Record root indices to copy for while body sub-computations. We do not
+      // need to call RecordIndicesWhichPointToParamOrConstant for the while
+      // body root instruction here, because any necessary copies needed to
+      // avoid constants or parameters in the output are handled by while.init
+      // operand copy insertion below (which will share an allocation).
+      HloInstruction* while_body_param = computation->parameter_instruction(0);
+      ShapeTree<bool> read_only_indices(while_body_param->shape());
       TF_RETURN_IF_ERROR(root_copier.RecordIndicesToCopyForColocatingBuffers(
-          liveness.get(), computation->parameter_instruction(0)));
+          *liveness, while_body_param, &read_only_indices));
+      while_body_read_only_indices[computation.get()] = read_only_indices;
+
+      // Mark control predecessors, based on the body param, for any copies
+      // we'll be inserting. This ensures the copy doesn't run too early.
+      TF_RETURN_IF_ERROR(root_copier.RecordControlPredecessors(
+          points_to_analysis, while_body_param));
     } else {
       // Record root indices to copy for general computations.
       TF_RETURN_IF_ERROR(root_copier.RecordIndicesWhichPointToParamOrConstant(
-          liveness->points_to_analysis()));
+          points_to_analysis));
     }
+    instructions_to_copy.push_back(root_copier);
+  }
 
-    for (auto& to_copy : instructions_to_copy) {
-      if (to_copy.HasAllIndicesFalse()) {
-        continue;
-      }
-      changed = true;
+  // Add copies of while 'init' operand instructions, if needed. 'shared_copies'
+  // is used to ensure that multiple while loops can share a single copy of the
+  // same entry parameter or constant, if all loops use it read-only.
+  //
+  // TODO(b/33301720) Remove redundant while instruction copies.
+  FlatMap<const HloInstruction*, HloInstruction*> shared_copies;
+  for (HloInstruction* while_hlo : while_instructions) {
+    // Fix read_only_indices to account for entry parameters and constants. Also
+    // initialize copy_overrides, which ensures a single copy for each read-only
+    // entry parameter or constant that is used in multiple while loops.
+    ShapeTree<bool>* read_only_indices =
+        &while_body_read_only_indices[while_hlo->while_body()];
+    TF_ASSIGN_OR_RETURN(
+        const ShapeTree<HloInstruction*> copy_overrides,
+        RevertReadOnlyIndicesForEntryParamsAndConstants(
+            while_hlo, points_to_analysis, read_only_indices, &shared_copies));
+    // Create InstructionCopier for init operand of while instruction.
+    HloInstruction* init_hlo = while_hlo->mutable_operand(0);
+    InstructionCopier init_copier(init_hlo, {while_hlo});
+    init_copier.SetReadOnlyIndices(*read_only_indices);
+    init_copier.SetCopyOverrides(copy_overrides);
+    // Record 'init' buffer indices which point-to a Constant or Parameter.
+    TF_RETURN_IF_ERROR(init_copier.RecordIndicesWhichPointToParamOrConstant(
+        points_to_analysis));
+    // Record indices necessary to colocate while and init operand buffers.
+    TF_RETURN_IF_ERROR(init_copier.RecordIndicesToCopyForColocatingBuffers(
+        *liveness, while_hlo, /*read_only_indices_out=*/nullptr));
+    instructions_to_copy.push_back(init_copier);
+  }
 
-      // Copy instruction at recorded buffer indices.
-      HloInstruction* copy = to_copy.Copy();
-      if (to_copy.instruction() == computation->root_instruction()) {
-        computation->set_root_instruction(copy);
-      }
+  for (InstructionCopier& to_copy : instructions_to_copy) {
+    if (to_copy.HasAllIndicesFalse()) {
+      continue;
+    }
+    changed = true;
+
+    // Copy instruction at recorded buffer indices.
+    HloComputation* computation = to_copy.instruction()->parent();
+    HloInstruction* copy = to_copy.Copy();
+    if (to_copy.instruction() == computation->root_instruction()) {
+      computation->set_root_instruction(copy);
     }
   }
 
diff --git a/tensorflow/compiler/xla/service/copy_insertion.h b/tensorflow/compiler/xla/service/copy_insertion.h
index c20e04b628..28bb62e40c 100644
--- a/tensorflow/compiler/xla/service/copy_insertion.h
+++ b/tensorflow/compiler/xla/service/copy_insertion.h
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_pass_interface.h"
+#include "tensorflow/core/lib/gtl/flatmap.h"
 
 namespace xla {
 
@@ -45,7 +46,7 @@ class CopyInsertion : public HloPassInterface {
 
   // A map containing all copies inserted during the copy insertion pass. The
   // key is the copied instruction and the value is the copy.
-  std::unordered_map<HloInstruction*, HloInstruction*> inserted_copies_;
+  tensorflow::gtl::FlatMap<HloInstruction*, HloInstruction*> inserted_copies_;
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/copy_insertion_test.cc b/tensorflow/compiler/xla/service/copy_insertion_test.cc
index 89b7b6e23d..4a14fc5397 100644
--- a/tensorflow/compiler/xla/service/copy_insertion_test.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion_test.cc
@@ -74,7 +74,7 @@ TEST_F(CopyInsertionTest, SingleParameter) {
   InsertCopies(&module);
 
   EXPECT_THAT(module.entry_computation()->root_instruction(),
-              op::Tuple(op::Copy(op::GetTupleElement(old_root))));
+              op::Tuple(op::Copy(old_root->operand(0))));
 }
 
 TEST_F(CopyInsertionTest, SingleConstant) {
@@ -93,7 +93,7 @@ TEST_F(CopyInsertionTest, SingleConstant) {
   InsertCopies(&module);
 
   EXPECT_THAT(module.entry_computation()->root_instruction(),
-              op::Tuple(op::Copy(op::GetTupleElement(old_root))));
+              op::Tuple(op::Copy(old_root->operand(0))));
 }
 
 TEST_F(CopyInsertionTest, MultipleConstantsAndParameters) {
@@ -124,9 +124,8 @@ TEST_F(CopyInsertionTest, MultipleConstantsAndParameters) {
   InsertCopies(&module);
 
   EXPECT_THAT(module.entry_computation()->root_instruction(),
-              op::Tuple(op::Copy(op::GetTupleElement(old_root)),
-                        op::Copy(op::GetTupleElement(old_root)),
-                        op::GetTupleElement(old_root)));
+              op::Tuple(op::Copy(old_root->operand(0)),
+                        op::Copy(old_root->operand(1)), old_root->operand(2)));
 }
 
 TEST_F(CopyInsertionTest, AmbiguousPointsToSet) {
@@ -226,7 +225,7 @@ TEST_F(CopyInsertionTest, BitcastTupleElementParameter) {
   InsertCopies(&module);
 
   EXPECT_THAT(module.entry_computation()->root_instruction(),
-              op::Tuple(op::Copy(op::GetTupleElement(old_root))));
+              op::Tuple(op::Copy(old_root->operand(0))));
 }
 
 TEST_F(CopyInsertionTest, NestedTupleParameter) {
@@ -392,7 +391,6 @@ class WhileCopyInsertionTest : public CopyInsertionTest {
   }
 
   // Builds a While body computation with read-only tuple element 0.
-  // both input tuple elements.
   // EX:
   // Body({in0, in1})
   //   out0 = in0
@@ -427,11 +425,14 @@ class WhileCopyInsertionTest : public CopyInsertionTest {
   //   out0 = Add(in0, 1)
   //   out1 = Add(in1, {1, 1, 1, 1, 1, 1, 1, 1})
   //   Tuple(out0, out1)
-  std::unique_ptr<HloComputation> BuildIndependentBodyComputation() {
+  std::unique_ptr<HloComputation> BuildIndependentBodyComputation(
+      bool nested = false) {
     auto builder = HloComputation::Builder(TestName() + ".Body");
     // Create param instruction to access loop state.
+    const Shape& loop_state_shape =
+        nested ? nested_loop_state_shape_ : loop_state_shape_;
     auto loop_state = builder.AddInstruction(
-        HloInstruction::CreateParameter(0, loop_state_shape_, "loop_state"));
+        HloInstruction::CreateParameter(0, loop_state_shape, "loop_state"));
     // Update the induction variable GTE(0).
     auto induction_variable =
         builder.AddInstruction(HloInstruction::CreateGetTupleElement(
@@ -442,16 +443,30 @@ class WhileCopyInsertionTest : public CopyInsertionTest {
     auto add0 = builder.AddInstruction(HloInstruction::CreateBinary(
         induction_variable->shape(), HloOpcode::kAdd, induction_variable, inc));
     // Update data GTE(1).
-    auto data = builder.AddInstruction(
-        HloInstruction::CreateGetTupleElement(data_shape_, loop_state, 1));
+    HloInstruction* data = nullptr;
+    if (nested) {
+      data = builder.AddInstruction(HloInstruction::CreateGetTupleElement(
+          nested_tuple_shape_, loop_state, 1));
+      data = builder.AddInstruction(
+          HloInstruction::CreateGetTupleElement(data_shape_, data, 0));
+    } else {
+      data = builder.AddInstruction(
+          HloInstruction::CreateGetTupleElement(data_shape_, loop_state, 1));
+    }
     auto update = builder.AddInstruction(
         HloInstruction::CreateConstant(LiteralUtil::CreateR1<float>(
             {1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f})));
-    // add0 = Add(in1, {1, 1, 1, 1, 1, 1, 1, 1})
+    // add1 = Add(in1, {1, 1, 1, 1, 1, 1, 1, 1})
     auto add1 = builder.AddInstruction(HloInstruction::CreateBinary(
         data_shape_, HloOpcode::kAdd, data, update));
     // Create output Tuple.
-    builder.AddInstruction(HloInstruction::CreateTuple({add0, add1}));
+    if (nested) {
+      auto nested_tuple =
+          builder.AddInstruction(HloInstruction::CreateTuple({add1, add1}));
+      builder.AddInstruction(HloInstruction::CreateTuple({add0, nested_tuple}));
+    } else {
+      builder.AddInstruction(HloInstruction::CreateTuple({add0, add1}));
+    }
     return builder.Build();
   }
 
@@ -504,8 +519,9 @@ class WhileCopyInsertionTest : public CopyInsertionTest {
 
   // Builds a While instruction using 'condition' and 'body' sub-computations.
   // Init operand is initialized to zeros of appropriate shape.
-  void BuildWhileInstruction(HloComputation* condition, HloComputation* body,
-                             bool nested = false) {
+  HloInstruction* BuildWhileInstruction(HloComputation* condition,
+                                        HloComputation* body,
+                                        bool nested = false) {
     auto builder = HloComputation::Builder(TestName() + ".While");
     auto induction_var_init = builder.AddInstruction(
         HloInstruction::CreateConstant(LiteralUtil::CreateR0<int32>(0)));
@@ -519,17 +535,18 @@ class WhileCopyInsertionTest : public CopyInsertionTest {
           HloInstruction::CreateTuple({data_init, data_init}));
       auto loop_state_init = builder.AddInstruction(
           HloInstruction::CreateTuple({induction_var_init, inner_init}));
-      builder.AddInstruction(HloInstruction::CreateWhile(
+      auto while_hlo = builder.AddInstruction(HloInstruction::CreateWhile(
           loop_state_shape_, condition, body, loop_state_init));
       module_.AddEntryComputation(builder.Build());
-      return;
+      return while_hlo;
     }
 
     auto loop_state_init = builder.AddInstruction(
         HloInstruction::CreateTuple({induction_var_init, data_init}));
-    builder.AddInstruction(HloInstruction::CreateWhile(
+    auto while_hlo = builder.AddInstruction(HloInstruction::CreateWhile(
         loop_state_shape_, condition, body, loop_state_init));
     module_.AddEntryComputation(builder.Build());
+    return while_hlo;
   }
 
   HloInstruction* BuildWhileInstruction_InitPointsToConstant() {
@@ -607,12 +624,14 @@ class WhileCopyInsertionTest : public CopyInsertionTest {
   HloInstruction* BuildWhileInstructionWithCustomInit(
       const Shape& loop_state_shape, HloInstruction* data_init,
       HloComputation::Builder* builder) {
+    const bool nested =
+        ShapeUtil::Equal(loop_state_shape, nested_loop_state_shape_);
     auto induction_var_init = builder->AddInstruction(
         HloInstruction::CreateConstant(LiteralUtil::CreateR0<int32>(0)));
     auto condition =
-        module_.AddEmbeddedComputation(BuildConditionComputation());
+        module_.AddEmbeddedComputation(BuildConditionComputation(nested));
     auto body =
-        module_.AddEmbeddedComputation(BuildIndependentBodyComputation());
+        module_.AddEmbeddedComputation(BuildIndependentBodyComputation(nested));
     auto loop_state_init = builder->AddInstruction(
         HloInstruction::CreateTuple({induction_var_init, data_init}));
     auto while_hlo = builder->AddInstruction(HloInstruction::CreateWhile(
@@ -645,14 +664,20 @@ class WhileCopyInsertionTest : public CopyInsertionTest {
 TEST_F(WhileCopyInsertionTest, IndependentTupleElements) {
   auto condition = module_.AddEmbeddedComputation(BuildConditionComputation());
   auto body = module_.AddEmbeddedComputation(BuildIndependentBodyComputation());
-  BuildWhileInstruction(condition, body);
+  auto while_hlo = BuildWhileInstruction(condition, body);
 
+  const HloInstruction* old_init = while_hlo->operand(0);
   HloInstruction* old_root = body->root_instruction();
   InsertCopies(&module_);
   HloInstruction* new_root = body->root_instruction();
+  const HloInstruction* new_init = while_hlo->operand(0);
 
   // No copies should be inserted so root should not be updated.
   EXPECT_EQ(old_root, new_root);
+
+  // Both init indices need copies.
+  EXPECT_THAT(new_init, op::Tuple(op::Copy(old_init->operand(0)),
+                                  op::Copy(old_init->operand(1))));
 }
 
 // Tests while body computation with dependent tuple elements:
@@ -662,27 +687,25 @@ TEST_F(WhileCopyInsertionTest, IndependentTupleElements) {
 //     out1 = Add(BCast(in0), in1)
 //     Tuple(out0, out1)
 //
-// CopyInsertion pass should generate:
+// CopyInsertion pass should convert the root instruction to:
 //
-//                    Tuple  // old root
-//                   /    \
-//                GTE(0)  GTE(1)
-//                  |       |
-//                 Copy     |
-//                   \     /
-//                    Tuple  // new root
+//     Tuple(Copy(out0), out1)
 //
 TEST_F(WhileCopyInsertionTest, DependentTupleElements) {
   auto condition = module_.AddEmbeddedComputation(BuildConditionComputation());
   auto body = module_.AddEmbeddedComputation(BuildDependentBodyComputation());
-  BuildWhileInstruction(condition, body);
+  auto while_hlo = BuildWhileInstruction(condition, body);
 
+  const HloInstruction* old_init = while_hlo->operand(0);
   HloInstruction* old_root = body->root_instruction();
   InsertCopies(&module_);
+  HloInstruction* new_root = body->root_instruction();
+  const HloInstruction* new_init = while_hlo->operand(0);
 
-  EXPECT_THAT(body->root_instruction(),
-              op::Tuple(op::Copy(op::GetTupleElement(old_root)),
-                        op::GetTupleElement(old_root)));
+  EXPECT_THAT(new_root,
+              op::Tuple(op::Copy(old_root->operand(0)), old_root->operand(1)));
+  EXPECT_THAT(new_init, op::Tuple(op::Copy(old_init->operand(0)),
+                                  op::Copy(old_init->operand(1))));
 }
 
 // Tests while body computation with read-only tuple element 0:
@@ -698,20 +721,110 @@ TEST_F(WhileCopyInsertionTest, DependentTupleElements) {
 //                         \      /
 //                           TUPLE (root)
 //
-// CopyInsertion pass should not generate any copies.
-//
+// CopyInsertion pass should not generate any copies for the while body.
 TEST_F(WhileCopyInsertionTest, DependentTupleElements_OneReadOnly) {
   auto condition = module_.AddEmbeddedComputation(BuildConditionComputation());
   auto body = module_.AddEmbeddedComputation(
       BuildDependentBodyOneReadOnlyComputation());
-  BuildWhileInstruction(condition, body);
+  auto while_hlo = BuildWhileInstruction(condition, body);
 
+  const HloInstruction* old_init = while_hlo->operand(0);
   HloInstruction* old_root = body->root_instruction();
   InsertCopies(&module_);
   HloInstruction* new_root = body->root_instruction();
+  const HloInstruction* new_init = while_hlo->operand(0);
 
-  // No copies should be inserted so root should not be updated.
+  // No copies should be inserted in the body, so root should not be updated.
   EXPECT_EQ(old_root, new_root);
+
+  // Both indices need copies, even though Index 0 is read-only, since both are
+  // constants, which must be copied.
+  EXPECT_THAT(new_init, op::Tuple(op::Copy(old_init->operand(0)),
+                                  op::Copy(old_init->operand(1))));
+}
+
+// Same as above, but with two while loops, sharing entry parameters.
+TEST_F(WhileCopyInsertionTest,
+       DependentTupleElements_OneReadOnly_TwoLoops_EntryParams) {
+  auto condition1 = module_.AddEmbeddedComputation(BuildConditionComputation());
+  auto condition2 = module_.AddEmbeddedComputation(BuildConditionComputation());
+  auto body1 = module_.AddEmbeddedComputation(
+      BuildDependentBodyOneReadOnlyComputation());
+  auto body2 = module_.AddEmbeddedComputation(
+      BuildDependentBodyOneReadOnlyComputation());
+
+  auto builder = HloComputation::Builder(TestName() + ".While");
+  auto iter_param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, induction_variable_shape_, "iter"));
+  auto data_param = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, data_shape_, "data"));
+  auto loop_init = builder.AddInstruction(
+      HloInstruction::CreateTuple({iter_param, data_param}));
+
+  auto while_hlo1 = builder.AddInstruction(HloInstruction::CreateWhile(
+      loop_state_shape_, condition1, body1, loop_init));
+  auto while_hlo2 = builder.AddInstruction(HloInstruction::CreateWhile(
+      loop_state_shape_, condition2, body2, loop_init));
+  module_.AddEntryComputation(builder.Build());
+
+  InsertCopies(&module_);
+
+  // Both while loops share a single copy of iter_param, since index 0 is
+  // read-only in the body.
+  EXPECT_EQ(while_hlo1->operand(0)->operand(0),
+            while_hlo2->operand(0)->operand(0));
+  EXPECT_THAT(while_hlo1->operand(0)->operand(0), op::Copy(iter_param));
+
+  // Each while loop gets its own copy of data_param, since index 1 is not
+  // read-only in the body.
+  EXPECT_NE(while_hlo1->operand(0)->operand(1),
+            while_hlo2->operand(0)->operand(1));
+  EXPECT_THAT(while_hlo1->operand(0)->operand(1), op::Copy(data_param));
+  EXPECT_THAT(while_hlo2->operand(0)->operand(1), op::Copy(data_param));
+}
+
+// Same as above, but with two while loops, sharing non-parameters.
+TEST_F(WhileCopyInsertionTest,
+       DependentTupleElements_OneReadOnly_TwoLoops_NonParams) {
+  auto condition1 = module_.AddEmbeddedComputation(BuildConditionComputation());
+  auto condition2 = module_.AddEmbeddedComputation(BuildConditionComputation());
+  auto body1 = module_.AddEmbeddedComputation(
+      BuildDependentBodyOneReadOnlyComputation());
+  auto body2 = module_.AddEmbeddedComputation(
+      BuildDependentBodyOneReadOnlyComputation());
+
+  auto builder = HloComputation::Builder(TestName() + ".While");
+  auto iter_param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, induction_variable_shape_, "iter"));
+  auto data_param = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, data_shape_, "data"));
+  // Add dummy ops to ensure loop_init elements aren't entry parameters.
+  auto iter_value = builder.AddInstruction(HloInstruction::CreateUnary(
+      iter_param->shape(), HloOpcode::kExp, iter_param));
+  auto data_value = builder.AddInstruction(HloInstruction::CreateUnary(
+      data_param->shape(), HloOpcode::kExp, data_param));
+  auto loop_init = builder.AddInstruction(
+      HloInstruction::CreateTuple({iter_value, data_value}));
+
+  auto while_hlo1 = builder.AddInstruction(HloInstruction::CreateWhile(
+      loop_state_shape_, condition1, body1, loop_init));
+  auto while_hlo2 = builder.AddInstruction(HloInstruction::CreateWhile(
+      loop_state_shape_, condition2, body2, loop_init));
+  module_.AddEntryComputation(builder.Build());
+
+  InsertCopies(&module_);
+
+  // No copies of iter_value are necessary, since index 0 is read-only in both
+  // while bodies.
+  EXPECT_EQ(while_hlo1->operand(0)->operand(0), iter_value);
+  EXPECT_EQ(while_hlo2->operand(0)->operand(0), iter_value);
+
+  // Each while loop gets its own copy of data_value, since index 1 is not
+  // read-only in the body.
+  EXPECT_NE(while_hlo1->operand(0)->operand(1),
+            while_hlo2->operand(0)->operand(1));
+  EXPECT_THAT(while_hlo1->operand(0)->operand(1), op::Copy(data_value));
+  EXPECT_THAT(while_hlo2->operand(0)->operand(1), op::Copy(data_value));
 }
 
 // Tests while body computation with nested tuple elements:
@@ -724,7 +837,8 @@ TEST_F(WhileCopyInsertionTest, DependentTupleElements_OneReadOnly) {
 //          Add                           Reverse
 //           |                              |
 //
-// CopyInsertion pass should generate:
+// CopyInsertion pass will conceptually generate the following, but with the
+// actual GTE and Tuple instructions optimized away:
 //
 //                    Tuple  // old root
 //                   /     \
@@ -751,60 +865,40 @@ TEST_F(WhileCopyInsertionTest, NestedTupleElements) {
   HloInstruction* old_root = body->root_instruction();
   InsertCopies(&module_);
 
-  EXPECT_THAT(
-      body->root_instruction(),
-      op::Tuple(op::GetTupleElement(old_root),
-                op::Tuple(op::GetTupleElement(op::GetTupleElement(old_root)),
-                          op::Copy(op::GetTupleElement(
-                              op::GetTupleElement(old_root))))));
+  EXPECT_THAT(body->root_instruction(),
+              op::Tuple(old_root->operand(0),
+                        op::Tuple(old_root->operand(1)->operand(0),
+                                  op::Copy(old_root->operand(1)->operand(1)))));
 }
 
 // Tests while init instruction which points-to a constant.
 //
 //     init = Tuple(Constant(S32, {}), Constant(F32, {8}))
 //
-// CopyInsertion pass should generate:
-//
-//                    Tuple  // old init
-//                   /    \
-//                GTE(0)  GTE(1)
-//                  |       |
-//                 Copy    Copy
-//                   \     /
-//                    Tuple  // new init
+// CopyInsertion pass should add copies for both constants.
 //
 TEST_F(WhileCopyInsertionTest, InitPointsToConstant) {
   auto while_hlo = BuildWhileInstruction_InitPointsToConstant();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
 
-  EXPECT_THAT(while_hlo->operand(0),
-              op::Tuple(op::Copy(op::GetTupleElement(old_init)),
-                        op::Copy(op::GetTupleElement(old_init))));
+  EXPECT_THAT(while_hlo->operand(0), op::Tuple(op::Copy(old_init->operand(0)),
+                                               op::Copy(old_init->operand(1))));
 }
 
 // Tests while init instruction which points-to a parameter.
 //
 //     init = Tuple(Constant(S32, {}), Parameter(F32, {8}))
 //
-// CopyInsertion pass should generate:
-//
-//                    Tuple  // old init
-//                   /    \
-//                GTE(0)  GTE(1)
-//                  |       |
-//                 Copy    Copy
-//                   \     /
-//                    Tuple  // new init
+// CopyInsertion pass should add copies for both the constant and parameter.
 //
 TEST_F(WhileCopyInsertionTest, InitPointsToParameter) {
   auto while_hlo = BuildWhileInstruction_InitPointsToParameter();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
 
-  EXPECT_THAT(while_hlo->operand(0),
-              op::Tuple(op::Copy(op::GetTupleElement(old_init)),
-                        op::Copy(op::GetTupleElement(old_init))));
+  EXPECT_THAT(while_hlo->operand(0), op::Tuple(op::Copy(old_init->operand(0)),
+                                               op::Copy(old_init->operand(1))));
 }
 
 // Tests while init instruction which has an ambiguous points-to set.
@@ -812,7 +906,8 @@ TEST_F(WhileCopyInsertionTest, InitPointsToParameter) {
 //     select = Select(pred, tuple1, tuple2)
 //     init = Tuple(Constant(S32, {}), Parameter(F32, {8}))
 //
-// CopyInsertion pass should generate:
+// CopyInsertion pass will conceptually generate the following, but with some of
+// the actual GTE and Tuple instructions optimized away:
 //
 //                    Tuple  // old init
 //                   /     \
@@ -838,17 +933,17 @@ TEST_F(WhileCopyInsertionTest, InitPointsToAmbiguous) {
   EXPECT_THAT(
       while_hlo->operand(0),
       op::Tuple(
-          op::Copy(op::GetTupleElement(old_init)),
-          op::Tuple(
-              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))),
-              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))))));
+          op::Copy(old_init->operand(0)),
+          op::Tuple(op::Copy(op::GetTupleElement(old_init->operand(1))),
+                    op::Copy(op::GetTupleElement(old_init->operand(1))))));
 }
 
 // Tests while init instruction which has a non-distinct points-to set.
 //
 //     init = Tuple(Constant(S32, {}), Tuple({vec_one, vec_one}))
 //
-// CopyInsertion pass should generate:
+// CopyInsertion pass will conceptually generate the following, but with some of
+// the actual GTE and Tuple instructions optimized away:
 //
 //                    Tuple  // old init
 //                   /     \
@@ -871,13 +966,10 @@ TEST_F(WhileCopyInsertionTest, InitPointsToNonDistinct) {
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
 
-  EXPECT_THAT(
-      while_hlo->operand(0),
-      op::Tuple(
-          op::Copy(op::GetTupleElement(old_init)),
-          op::Tuple(
-              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))),
-              op::Copy(op::GetTupleElement(op::GetTupleElement(old_init))))));
+  EXPECT_THAT(while_hlo->operand(0),
+              op::Tuple(op::Copy(old_init->operand(0)),
+                        op::Tuple(op::Copy(old_init->operand(1)->operand(0)),
+                                  op::Copy(old_init->operand(1)->operand(0)))));
 }
 
 // Tests while init instruction buffer which interfers with while result buffer.
@@ -886,24 +978,15 @@ TEST_F(WhileCopyInsertionTest, InitPointsToNonDistinct) {
 //     add_unrelated = Add(init_data) // takes a reference to cause interference
 //     init = Tuple(Constant(S32, {}), init_data))
 //
-// CopyInsertion pass should generate:
-//
-//                    Tuple  // old init
-//                   /    \
-//                GTE(0)  GTE(1)
-//                  |       |
-//                 Copy    Copy
-//                   \     /
-//                    Tuple  // new init
+// CopyInsertion pass should copy both operands.
 //
 TEST_F(WhileCopyInsertionTest, InitPointsToInterfering) {
   auto while_hlo = BuildWhileInstruction_InitPointsToInterfering();
   auto old_init = while_hlo->operand(0);
   InsertCopies(&module_);
 
-  EXPECT_THAT(while_hlo->operand(0),
-              op::Tuple(op::Copy(op::GetTupleElement(old_init)),
-                        op::Copy(op::GetTupleElement(old_init))));
+  EXPECT_THAT(while_hlo->operand(0), op::Tuple(op::Copy(old_init->operand(0)),
+                                               op::Copy(old_init->operand(1))));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
index 14f69a362e..3e6be5a7a2 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
@@ -257,10 +257,13 @@ Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
   if (flags->xla_cpu_parallel) {
     pipeline.AddPass<ParallelizationPreparation>();
   }
-  // Copy insertion should be performed immediately before IR emission to
-  // avoid inserting unnecessary copies (later pass adds an instruction which
-  // materializes the value) or missing a necessary copy (later pass removes
-  // an instruction which materializes a value).
+  // Copy insertion should be performed immediately before IR emission to avoid
+  // inserting unnecessary copies (later pass adds an instruction which
+  // materializes the value) or missing a necessary copy (later pass removes an
+  // instruction which materializes a value). DCE must be run immediately before
+  // (and sometime after) copy insertion, to avoid dead code from interfering
+  // with the rewrites.
+  pipeline.AddPass<HloDCE>();
   pipeline.AddPass<CopyInsertion>();
   if (flags->xla_cpu_parallel) {
     // Re-run the outlining, in case any copies were inserted into the entry
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index 43960cd3a8..dc3a289a71 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -178,7 +178,10 @@ tensorflow::Status PrepareHloModuleForIrEmitting(
   // Copy insertion should be performed immediately before IR emission to avoid
   // inserting unnecessary copies (later pass adds an instruction which
   // materializes the value) or missing a necessary copy (later pass removes an
-  // instruction which materializes a value).
+  // instruction which materializes a value). DCE must be run immediately before
+  // (and sometime after) copy insertion, to avoid dead code from interfering
+  // with the rewrites.
+  pipeline.AddPass<HloDCE>();
   pipeline.AddPass<GpuCopyInsertion>();
   pipeline.AddPass<HloDCE>();
   pipeline.AddPass<FlattenCallGraph>();
diff --git a/tensorflow/compiler/xla/service/gpu/while_transformer.cc b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
index ec75e13581..46a5d303b7 100644
--- a/tensorflow/compiler/xla/service/gpu/while_transformer.cc
+++ b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
@@ -122,10 +122,12 @@ class ExprTree {
   Status Match(const HloInstruction* instruction,
                TaggedInstructionMap* tagged_instructions) const {
     if (opcode_ != instruction->opcode()) {
-      return InvalidArgument("Unexpected opcode: %s",
-                             HloOpcodeString(instruction->opcode()).c_str());
+      return InvalidArgument("got opcode %s, want %s",
+                             HloOpcodeString(instruction->opcode()).c_str(),
+                             HloOpcodeString(opcode_).c_str());
     }
 
+    VLOG(2) << "Matched " << HloOpcodeString(opcode_) << ": " << tag_;
     if (!tag_.empty()) {
       tagged_instructions->insert({tag_, instruction});
     }
@@ -275,6 +277,7 @@ class WhileConditionComputationMatcher : public MatcherBase {
   }
 
   Status MatchExprTree(const ExprTree& expr_tree) override {
+    VLOG(2) << "MATCHING while condition";
     ExprTree::TaggedInstructionMap tagged_instructions;
     TF_RETURN_IF_ERROR(expr_tree.Match(computation_->root_instruction(),
                                        &tagged_instructions));
@@ -344,10 +347,6 @@ class WhileInitOperandMatcher : public MatcherBase {
   //
   //             Const
   //               |
-  //             Tuple1
-  //               |
-  //             GTE0
-  //               |
   //             Copy
   //               |
   //             Tuple0
@@ -355,15 +354,15 @@ class WhileInitOperandMatcher : public MatcherBase {
   //             While
   //
   ExprTree BuildInitExprTree() {
-    ExprTree gte0(HloOpcode::kGetTupleElement, "gte",
-                  ExprTree(HloOpcode::kTuple, tuple_index_,
-                           ExprTree(HloOpcode::kConstant, "loop_start")));
-    return ExprTree(HloOpcode::kWhile, "while",
-                    ExprTree(HloOpcode::kTuple, tuple_index_,
-                             ExprTree(HloOpcode::kCopy, gte0)));
+    return ExprTree(
+        HloOpcode::kWhile, "while",
+        ExprTree(HloOpcode::kTuple, tuple_index_,
+                 ExprTree(HloOpcode::kCopy,
+                          ExprTree(HloOpcode::kConstant, "loop_start"))));
   }
 
   Status MatchExprTree(const ExprTree& expr_tree) override {
+    VLOG(2) << "MATCHING while init";
     ExprTree::TaggedInstructionMap tagged_instructions;
     TF_RETURN_IF_ERROR(expr_tree.Match(while_hlo_, &tagged_instructions));
 
@@ -375,14 +374,6 @@ class WhileInitOperandMatcher : public MatcherBase {
                              while_hlo->name().c_str());
     }
 
-    // Get tagged GTE instruction and check 'tuple_index_'.
-    TF_ASSIGN_OR_RETURN(const HloInstruction* gte,
-                        GetTaggedInstruction("gte", tagged_instructions));
-    if (gte->tuple_index() != tuple_index_) {
-      return InvalidArgument("Unexpected tuple index instruction : %s",
-                             gte->name().c_str());
-    }
-
     // Get tagged Constant instruction and parse 'loop_start_'.
     TF_ASSIGN_OR_RETURN(
         const HloInstruction* const_hlo,
@@ -427,10 +418,6 @@ class WhileBodyComputationMatcher : public MatcherBase {
   //                     \  /              \  /
   //                    Fusion -----------> Add
   //                      |
-  //                     Tuple1
-  //                      |
-  //                     GTE0
-  //                      |
   //                     Copy
   //                      |
   //                     Tuple0
@@ -450,15 +437,13 @@ class WhileBodyComputationMatcher : public MatcherBase {
     fusion.SetFusedRoot(fused_root);
 
     // Build top-level computation.
-    ExprTree tuple0(
-        HloOpcode::kTuple, tuple_index_,
-        ExprTree(HloOpcode::kCopy,
-                 ExprTree(HloOpcode::kGetTupleElement, "gte",
-                          ExprTree(HloOpcode::kTuple, tuple_index_, fusion))));
+    ExprTree tuple0(HloOpcode::kTuple, tuple_index_,
+                    ExprTree(HloOpcode::kCopy, fusion));
     return tuple0;
   }
 
   Status MatchExprTree(const ExprTree& expr_tree) override {
+    VLOG(2) << "MATCHING while body";
     ExprTree::TaggedInstructionMap tagged_instructions;
     TF_RETURN_IF_ERROR(expr_tree.Match(computation_->root_instruction(),
                                        &tagged_instructions));
diff --git a/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc b/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
index fcf99fe00a..a315b9ad11 100644
--- a/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
+++ b/tensorflow/compiler/xla/service/gpu/while_transformer_test.cc
@@ -139,7 +139,7 @@ TEST_F(WhileTransformerTest, InductionVariableAtTupleElement0) {
   RunCopyInsertionPass();
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
-  EXPECT_TRUE(result.ok());
+  ASSERT_TRUE(result.ok());
   // Check results.
   EXPECT_THAT(result.ConsumeValueOrDie(),
               Eq(std::tuple<int64, int64, int64>(0, 10, 1)));
@@ -156,7 +156,7 @@ TEST_F(WhileTransformerTest, InductionVariableAtTupleElement1) {
   RunCopyInsertionPass();
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
-  EXPECT_TRUE(result.ok());
+  ASSERT_TRUE(result.ok());
   // Check results.
   EXPECT_THAT(result.ConsumeValueOrDie(),
               Eq(std::tuple<int64, int64, int64>(0, 10, 1)));
@@ -173,7 +173,7 @@ TEST_F(WhileTransformerTest, InvalidLoopLimit) {
   RunCopyInsertionPass();
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
-  EXPECT_FALSE(result.ok());
+  ASSERT_FALSE(result.ok());
   EXPECT_THAT(result.status().error_message(),
               HasSubstr("Loop start must be less than loop limit."));
 }
@@ -189,7 +189,7 @@ TEST_F(WhileTransformerTest, InvalidLoopIncrement) {
   RunCopyInsertionPass();
   // Run WhileTransformer.
   auto result = gpu::CanTransformWhileToFor(while_hlo);
-  EXPECT_FALSE(result.ok());
+  ASSERT_FALSE(result.ok());
   EXPECT_THAT(result.status().error_message(),
               HasSubstr("Loop increment must greater than zero."));
 }
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 930a4fdf1b..2b668f1b8a 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -1786,7 +1786,8 @@ Status HloInstruction::Visit(DfsHloVisitor* visitor) {
 }
 
 Status HloInstruction::AcceptInternal(DfsHloVisitor* visitor,
-                                      const CompareFunction* operand_order) {
+                                      const CompareFunction* operand_order,
+                                      bool ignore_control_predecessors) {
   // Do not visit this HLO node again if it is already visited.
   if (visitor->DidVisit(*this)) {
     VLOG(3) << "Not visiting HLO " << name() << " as it was already visited.";
@@ -1801,34 +1802,41 @@ Status HloInstruction::AcceptInternal(DfsHloVisitor* visitor,
   }
   visitor->SetVisiting(*this);
 
-  // Sort operands and control predecessors, if an ordering was provided.  Note
-  // that 'temp_sorted_operands' must live at this scope, since 'operands' will
-  // point to it if the operands are sorted.  The point of the 'operands'
-  // pointer is to avoid copying the operands in the common case where the
-  // operands are not sorted.
+  // Sort operands, if an ordering was provided. 'temp_sorted_operands' must
+  // live at this scope, since 'operands' will point to it if the operands are
+  // sorted.  The purpose of the 'operands' pointer is to avoid copying the
+  // operands in the common case where the operands are not sorted.
   std::vector<HloInstruction*>* operands = &operands_;
   std::vector<HloInstruction*> temp_sorted_operands;
-  std::vector<HloInstruction*> predecessors(control_predecessors_.begin(),
-                                            control_predecessors_.end());
   if (operand_order != nullptr) {
     temp_sorted_operands = operands_;
     std::sort(temp_sorted_operands.begin(), temp_sorted_operands.end(),
               *operand_order);
-    std::sort(predecessors.begin(), predecessors.end(), *operand_order);
     operands = &temp_sorted_operands;
   }
-
-  for (auto operand : *operands) {
+  for (HloInstruction* operand : *operands) {
     VLOG(3) << "Going to visit HLO " << operand->name() << " as operand of HLO "
             << name();
-    TF_RETURN_IF_ERROR(operand->AcceptInternal(visitor, operand_order));
-  }
-
-  for (auto control_predecessor : predecessors) {
-    VLOG(3) << "Going to visit HLO " << control_predecessor->name()
-            << " as a control predecessor of HLO " << name();
-    TF_RETURN_IF_ERROR(
-        control_predecessor->AcceptInternal(visitor, operand_order));
+    TF_RETURN_IF_ERROR(operand->AcceptInternal(visitor, operand_order,
+                                               ignore_control_predecessors));
+  }
+
+  if (!ignore_control_predecessors) {
+    // This uses the same pointer/vector sorting to avoid extra copies as above.
+    std::vector<HloInstruction*>* predecessors = &control_predecessors_;
+    std::vector<HloInstruction*> temp_sorted_predecessors;
+    if (operand_order != nullptr) {
+      temp_sorted_predecessors = control_predecessors_;
+      std::sort(temp_sorted_predecessors.begin(),
+                temp_sorted_predecessors.end(), *operand_order);
+      predecessors = &temp_sorted_predecessors;
+    }
+    for (HloInstruction* control_predecessor : *predecessors) {
+      VLOG(3) << "Going to visit HLO " << control_predecessor->name()
+              << " as a control predecessor of HLO " << name();
+      TF_RETURN_IF_ERROR(control_predecessor->AcceptInternal(
+          visitor, operand_order, ignore_control_predecessors));
+    }
   }
 
   TF_RETURN_IF_ERROR(visitor->Preprocess(this));
@@ -1838,9 +1846,11 @@ Status HloInstruction::AcceptInternal(DfsHloVisitor* visitor,
   return visitor->Postprocess(this);
 }
 
-Status HloInstruction::Accept(DfsHloVisitor* visitor, bool call_finish_visit) {
+Status HloInstruction::Accept(DfsHloVisitor* visitor, bool call_finish_visit,
+                              bool ignore_control_predecessors) {
   VLOG(2) << "HloInstruction::Accept(" << name() << ")";
-  TF_RETURN_IF_ERROR(AcceptInternal(visitor, nullptr));
+  TF_RETURN_IF_ERROR(
+      AcceptInternal(visitor, nullptr, ignore_control_predecessors));
   if (call_finish_visit) {
     TF_RETURN_IF_ERROR(visitor->FinishVisit(this));
   }
@@ -1851,7 +1861,8 @@ Status HloInstruction::AcceptWithOperandOrder(
     DfsHloVisitor* visitor, const CompareFunction& operand_order,
     bool call_finish_visit) {
   VLOG(2) << "HloInstruction::AcceptWithOperandOrder(" << name() << ")";
-  TF_RETURN_IF_ERROR(AcceptInternal(visitor, &operand_order));
+  TF_RETURN_IF_ERROR(AcceptInternal(visitor, &operand_order,
+                                    /*ignore_control_predecessors=*/false));
   if (call_finish_visit) {
     TF_RETURN_IF_ERROR(visitor->FinishVisit(this));
   }
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 4647c2ca85..3a03f28975 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -374,8 +374,12 @@ class HloInstruction {
 
   // Performs a postorder DFS visit using this node as the root. If
   // call_finish_visit is true, then DfsHloVisitor::FinishVisit is called when
-  // complete.
-  Status Accept(DfsHloVisitor* visitor, bool call_finish_visit = true);
+  // complete. If ignore_control_predecessors is true, instructions only
+  // reachable via control dependencies will not be visited, and the postorder
+  // will not take control dependencies into account. It is as if the control
+  // dependencies didn't exist in the graph at all.
+  Status Accept(DfsHloVisitor* visitor, bool call_finish_visit = true,
+                bool ignore_control_predecessors = false);
 
   // Same as Accept() above, but the order of operand and control predecessor
   // visitation is determined by the given operand order; if compare(A, B) ==
@@ -782,7 +786,8 @@ class HloInstruction {
   // Inner DFS traversal function -- this function being called (rather than
   // Accept above) allows us to distinguish the root of the traversal.
   Status AcceptInternal(DfsHloVisitor* visitor,
-                        const CompareFunction* operand_order);
+                        const CompareFunction* operand_order,
+                        bool ignore_control_predecessors);
 
   // CHECKs various invariants of a fusion instruction.
   void CheckFusionInstruction() const;
-- 
GitLab


From 28091dce41045570b7d92eb912eddce0079c0234 Mon Sep 17 00:00:00 2001
From: Neal Wu <neal@nealwu.com>
Date: Mon, 24 Apr 2017 13:01:19 -0700
Subject: [PATCH 0646/1563] Full set of changes to ISSUE_TEMPLATE.md (#9390)

* Full set of changes to ISSUE_TEMPLATE.md

* Put links on separate lines

* Remove extra newline
---
 ISSUE_TEMPLATE.md | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index e653ed2fa3..6f4c048ce8 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,4 +1,5 @@
-Please go to Stack Overflow for help and support.
+Please go to Stack Overflow for help and support:
+
 http://stackoverflow.com/questions/tagged/tensorflow
 
 If you open a GitHub issue, here is our policy:
@@ -6,11 +7,7 @@ If you open a GitHub issue, here is our policy:
 1. It must be a bug or a feature request.
 2. The form below must be filled out.
 
-**Here's why we have that policy**: TensorFlow developers respond to issues.
-We want to focus on work that benefits the whole community, e.g., fixing
-bugs and adding features. Support only helps individuals. GitHub also notifies
-thousands of people when issues are filed. We want them to see you communicating
-an interesting problem, rather than being redirected to Stack Overflow.
+**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g., fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
 
 ------------------------
 
@@ -25,17 +22,15 @@ an interesting problem, rather than being redirected to Stack Overflow.
 - **Exact command to reproduce**:
 
 You can collect some of this information using our environment capture script:
+
 https://github.com/tensorflow/tensorflow/tree/master/tools/tf_env_collect.sh
 
-You can collect the TensorFlow version with
-```sh
-python -c "import tensorflow as tf; print (tf.GIT_VERSION, tf.VERSION)"
-```
+You can obtain the TensorFlow version with
+
+python -c "import tensorflow as tf; print(tf.GIT_VERSION, tf.VERSION)"
 
 ### Describe the problem
+Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
 
 ### Source code / logs
-Include any logs or source code that would be helpful to diagnose the problem.
-If including tracebacks, please include the full traceback. Large logs and files
-should be attached. Try to provide a reproducible test case that is the minimum
-necessary to generate the problem.
+Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached. Try to provide a reproducible test case that is the bare minimum necessary to generate the problem.
-- 
GitLab


From fc53153f1e950ed60f7df8ea2a4e59b24b1f7311 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 12:12:01 -0800
Subject: [PATCH 0647/1563] Change hooks lists to immutable tuples, and allow
 any iterable for the associated arguments. Change: 154086738

---
 .../learn/python/learn/estimators/model_fn_test.py   |  8 ++++----
 tensorflow/python/estimator/estimator.py             |  5 +++--
 tensorflow/python/estimator/model_fn.py              | 12 +++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
index 4f76013a2a..6ebfeb0f16 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn_test.py
@@ -56,7 +56,6 @@ class ModelFnopsTest(test.TestCase):
             "metric_key": (constant_op.constant(1.), control_flow_ops.no_op()),
             "loss": (constant_op.constant(1.), control_flow_ops.no_op()),
         },
-        # zzz
         training_chief_hooks=[basic_session_run_hooks.StepCounterHook()],
         training_hooks=[basic_session_run_hooks.StepCounterHook()],
         output_alternatives=output_alternatives,
@@ -73,9 +72,10 @@ class ModelFnopsTest(test.TestCase):
     self.assertEqual(model_fn_ops.train_op, estimator_spec.train_op)
     self.assertEqual(expected_eval_metric_ops,
                      estimator_spec.eval_metric_ops)
-    self.assertEqual(model_fn_ops.training_chief_hooks,
-                     estimator_spec.training_chief_hooks)
-    self.assertEqual(model_fn_ops.training_hooks, estimator_spec.training_hooks)
+    self.assertAllEqual(model_fn_ops.training_chief_hooks,
+                        estimator_spec.training_chief_hooks)
+    self.assertAllEqual(model_fn_ops.training_hooks,
+                        estimator_spec.training_hooks)
     self.assertEqual(model_fn_ops.scaffold, estimator_spec.scaffold)
 
   def testEstimatorSpec_except_export(self):
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index ac3cda4ff1..d32caa8ac7 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -579,7 +579,7 @@ class Estimator(object):
         saver_hook_exists = any([
             isinstance(h, training.CheckpointSaverHook)
             for h in (all_hooks + chief_hooks +
-                      estimator_spec.training_chief_hooks)
+                      list(estimator_spec.training_chief_hooks))
         ])
         if not saver_hook_exists:
           chief_hooks = [
@@ -595,7 +595,8 @@ class Estimator(object):
           checkpoint_dir=self._model_dir,
           scaffold=estimator_spec.scaffold,
           hooks=all_hooks,
-          chief_only_hooks=chief_hooks + estimator_spec.training_chief_hooks,
+          chief_only_hooks=(
+              tuple(chief_hooks) + tuple(estimator_spec.training_chief_hooks)),
           save_checkpoint_secs=0,  # Saving is handled by a hook.
           save_summaries_steps=self._config.save_summary_steps,
           config=self._session_config) as mon_sess:
diff --git a/tensorflow/python/estimator/model_fn.py b/tensorflow/python/estimator/model_fn.py
index a9d044fcfe..8d4bcca619 100644
--- a/tensorflow/python/estimator/model_fn.py
+++ b/tensorflow/python/estimator/model_fn.py
@@ -143,10 +143,10 @@ class EstimatorSpec(
         Multi-headed models should specify one entry for each head, one of
         which must be named using
         signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY.
-      training_chief_hooks: A list of `tf.train.SessionRunHook` objects to
+      training_chief_hooks: Iterable of `tf.train.SessionRunHook` objects to
         run on the chief worker during training.
-      training_hooks: A list of `tf.train.SessionRunHook` objects that to run on
-        all workers during training.
+      training_hooks: Iterable of `tf.train.SessionRunHook` objects that to run
+        on all workers during training.
       scaffold: A `tf.train.Scaffold` object that can be used to set
         initialization, saver, and more to be used in training.
 
@@ -252,10 +252,8 @@ class EstimatorSpec(
             'eval_metric_ops values must be from the default graph.')
 
     # Validate hooks.
-    if training_chief_hooks is None:
-      training_chief_hooks = []
-    if training_hooks is None:
-      training_hooks = []
+    training_chief_hooks = tuple(training_chief_hooks or [])
+    training_hooks = tuple(training_hooks or [])
     for hook in training_hooks + training_chief_hooks:
       if not isinstance(hook, session_run_hook.SessionRunHook):
         raise TypeError(
-- 
GitLab


From 866087d2257dc80695a29a04d48b2331570fe819 Mon Sep 17 00:00:00 2001
From: "David Y. Zhang" <dzhang21@gmail.com>
Date: Mon, 24 Apr 2017 16:39:50 -0400
Subject: [PATCH 0648/1563] Clarify scope argument documentation
 tf.get_collection. Fixes #9314. (#9418)

---
 tensorflow/python/framework/ops.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 6d2a38b3a6..bba77d8929 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -2682,11 +2682,11 @@ class Graph(object):
     Args:
       name: The key for the collection. For example, the `GraphKeys` class
         contains many standard names for collections.
-      scope: (Optional.) If supplied, the resulting list is filtered to include
-        only items whose `name` attribute matches using `re.match`. Items
-        without a `name` attribute are never returned if a scope is supplied and
-        the choice or `re.match` means that a `scope` without special tokens
-        filters by prefix.
+      scope: (Optional.) A string. If supplied, the resulting list is filtered
+        to include only items whose `name` attribute matches `scope` using
+        `re.match`. Items without a `name` attribute are never returned if a
+        scope is supplied. The choice of `re.match` means that a `scope` without
+        special tokens filters by prefix.
 
     Returns:
       The list of values in the collection with the given `name`, or
-- 
GitLab


From a2276eefa2770e69298f7a03180de2505d791826 Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Mon, 24 Apr 2017 13:18:00 -0800
Subject: [PATCH 0649/1563] [XLA:HLO] Avoid stuttering the clone suffix in
 HloInstruction names. Previously an HloInstruction cloned multiple times
 would have a name like "foo.clone.clone.clone.". Change this to "foo.clone3"
 where the number is the number of times the instruction has been cloned.
 Change: 154095902

---
 .../compiler/xla/service/hlo_instruction.cc   | 55 ++++++++++++++-----
 .../xla/service/hlo_instruction_test.cc       | 34 ++++++++++++
 2 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 2b668f1b8a..c9722b942b 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -44,9 +44,10 @@ limitations under the License.
 
 namespace xla {
 
-using ::tensorflow::strings::StrAppend;
 using ::tensorflow::str_util::Join;
 using ::tensorflow::strings::Printf;
+using ::tensorflow::strings::StrAppend;
+using ::tensorflow::strings::StrCat;
 
 /* static */ std::unique_ptr<HloInstruction> HloInstruction::CreateParameter(
     int64 parameter_number, const Shape& shape, const string& name) {
@@ -578,8 +579,7 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
       // parameter instruction.
       int64 param_no = fused_parameters_.size();
       std::unique_ptr<HloInstruction> param_instruction = CreateParameter(
-          param_no, operand->shape(),
-          tensorflow::strings::StrCat("fusion_param.", param_no));
+          param_no, operand->shape(), StrCat("fusion_param.", param_no));
 
       param_instruction->parent_fusion_instruction_ = this;
       fused_param = fused_instructions_computation_->AddParameter(
@@ -858,7 +858,35 @@ HloInstruction::~HloInstruction() {}
 std::unique_ptr<HloInstruction> HloInstruction::Clone(const string& suffix) {
   std::unique_ptr<HloInstruction> clone =
       CloneWithNewOperands(shape_, operands_);
-  clone->name_ = name() + "." + suffix;
+  // If an instruction is cloned multiple times avoid names like
+  // foo.suffix.suffix.suffix. Instead of repeating the suffix add a numeric
+  // suffix. Specifically, the clone of foo.suffix is named foo.suffix2, the
+  // clone of foo.suffix2 is named foo.suffix3 and so on.
+  const string dot_suffix = "." + suffix;
+  size_t index = name().rfind(dot_suffix);
+  if (index == string::npos) {
+    // Existing name does not include ".suffix".
+    clone->name_ = name() + dot_suffix;
+  } else {
+    // Existing name includes ".suffix". Determine if substring after ".suffix"
+    // is numeric and should be replaced with an incremented number.
+    string after_suffix = name().substr(index + dot_suffix.size());
+    if (after_suffix.empty()) {
+      // Existing name ends in ".suffix". New name should end in ".suffix2".
+      clone->name_ = name() + "2";
+    } else {
+      // If names ends with .suffix[0-9]+ then replace with a suffix with the
+      // numeric value incremented.
+      int64 numeric_suffix;
+      if (tensorflow::strings::safe_strto64(after_suffix, &numeric_suffix)) {
+        clone->name_ =
+            StrCat(name().substr(0, index), dot_suffix, numeric_suffix + 1);
+      } else {
+        // Substring after ".suffix" is non-numeric.
+        clone->name_ = name() + dot_suffix;
+      }
+    }
+  }
   clone->set_parent(parent());
   clone->set_metadata(metadata_);
   return clone;
@@ -1387,8 +1415,7 @@ string HloInstruction::SignatureString() const {
       Join(operands_, ", ", [](string* out, HloInstruction* operand) {
         StrAppend(out, ShapeUtil::HumanString(operand->shape()));
       });
-  return tensorflow::strings::StrCat("(", operands, ") -> ",
-                                     ShapeUtil::HumanString(shape()));
+  return StrCat("(", operands, ") -> ", ShapeUtil::HumanString(shape()));
 }
 
 string HloInstruction::ExtendedOpcodeStr() const {
@@ -1454,8 +1481,8 @@ string HloInstruction::ToString(bool compact_operands) const {
   if (!slice_starts_.empty() && !slice_limits_.empty()) {
     std::vector<string> bounds;
     for (int i = 0; i < slice_starts_.size(); ++i) {
-      bounds.push_back(tensorflow::strings::StrCat("[", slice_starts_[i], ":",
-                                                   slice_limits_[i], "]"));
+      bounds.push_back(
+          StrCat("[", slice_starts_[i], ":", slice_limits_[i], "]"));
     }
     StrAppend(&extra, ", slice={", Join(bounds, ", "), "}");
   }
@@ -1556,11 +1583,10 @@ string HloInstruction::ToCategory() const {
 
 string HloInstruction::FullyQualifiedName() const {
   if (IsFused()) {
-    return tensorflow::strings::StrCat(fusion_instruction()->parent()->name(),
-                                       "::", fusion_instruction()->name(),
-                                       "::", name_);
+    return StrCat(fusion_instruction()->parent()->name(),
+                  "::", fusion_instruction()->name(), "::", name_);
   }
-  return tensorflow::strings::StrCat(parent_->name(), "::", name_);
+  return StrCat(parent_->name(), "::", name_);
 }
 
 HloInstruction* HloInstruction::tracing() const { return trace_instruction_; }
@@ -2194,15 +2220,14 @@ string HloInstruction::ConvolutionDimensionNumbersToString() const {
   lhs_dims[dnums.batch_dimension()] = 'b';
   lhs_dims[dnums.feature_dimension()] = 'f';
   for (int64 i = 0; i < dnums.spatial_dimensions().size(); ++i) {
-    lhs_dims[dnums.spatial_dimensions(i)] = tensorflow::strings::StrCat(i);
+    lhs_dims[dnums.spatial_dimensions(i)] = StrCat(i);
   }
 
   std::vector<string> rhs_dims(2 + dnums.kernel_spatial_dimensions().size());
   rhs_dims[dnums.kernel_input_feature_dimension()] = "i";
   rhs_dims[dnums.kernel_output_feature_dimension()] = "o";
   for (int64 i = 0; i < dnums.spatial_dimensions().size(); ++i) {
-    rhs_dims[dnums.kernel_spatial_dimensions(i)] =
-        tensorflow::strings::StrCat(i);
+    rhs_dims[dnums.kernel_spatial_dimensions(i)] = StrCat(i);
   }
 
   result += "dim_labels=";
diff --git a/tensorflow/compiler/xla/service/hlo_instruction_test.cc b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
index eeabc61ec8..d0101ef19c 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
@@ -962,5 +962,39 @@ TEST_F(HloInstructionTest, CloneOfFusionPreservesShape) {
                                root2->operand(1)->operand(0)->shape()));
 }
 
+TEST_F(HloInstructionTest, CloneSuffixNames) {
+  // Test that the suffix string added to cloned instructions is not
+  // duplicated. Rather a numeric incrementing value should be appended. That
+  // is, we want "foo.clone2", not "foo.clone.clone".
+  auto foo = HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.f));
+  foo->set_name("foo");
+
+  // Test cloning the same instruction multiple times.
+  EXPECT_EQ(foo->Clone()->name(), "foo.clone");
+  EXPECT_EQ(foo->Clone()->Clone()->name(), "foo.clone2");
+  EXPECT_EQ(foo->Clone()->Clone()->Clone()->name(), "foo.clone3");
+
+  // Test custom suffixes.
+  EXPECT_EQ(foo->Clone("bar")->name(), "foo.bar");
+  EXPECT_EQ(foo->Clone("bar")->Clone("bar")->name(), "foo.bar2");
+  EXPECT_EQ(foo->Clone("bar")->Clone("bar")->Clone()->name(), "foo.bar2.clone");
+
+  // Test instruction name with a dot.
+  foo->set_name("foo.baz");
+  EXPECT_EQ(foo->Clone()->name(), "foo.baz.clone");
+
+  // Test incrementing a large number after the suffix.
+  foo->set_name("foo.clone234");
+  EXPECT_EQ(foo->Clone()->name(), "foo.clone235");
+
+  // Test a non-numeric string after the cloning suffix.
+  foo->set_name("foo.clonexyz");
+  EXPECT_EQ(foo->Clone()->name(), "foo.clonexyz.clone");
+
+  // Test a name with multiple appearances of the suffix.
+  foo->set_name("foo.clone.clone3");
+  EXPECT_EQ(foo->Clone()->name(), "foo.clone.clone4");
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 05349e6fe7b2395f541e11a9eacbeff04270e4c6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 13:46:22 -0800
Subject: [PATCH 0650/1563] [XLA:HLO] Ensure Copy never reuses its operand
 buffer.

Also add a comment to HeapSimulator describing explicitly why ignoring control
dependencies is correct.

Minor update to HeapSimulator to compute output_source_buffers once per
computation, rather than once for every instruction in a computation.
Change: 154100075
---
 .../compiler/xla/service/heap_simulator.cc    | 13 +++++++++----
 .../compiler/xla/service/liveness_util.cc     | 10 ++++++++--
 .../xla/service/liveness_util_test.cc         | 19 +++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/tensorflow/compiler/xla/service/heap_simulator.cc b/tensorflow/compiler/xla/service/heap_simulator.cc
index 46c0d8edea..9c4899a67d 100644
--- a/tensorflow/compiler/xla/service/heap_simulator.cc
+++ b/tensorflow/compiler/xla/service/heap_simulator.cc
@@ -70,19 +70,24 @@ StatusOr<HeapSimulator::Result> HeapSimulator::Run(
   HeapSimulator heap(std::move(algorithm), size_fn, buffers_to_assign);
   FlatMap<const LogicalBuffer*, FlatSet<const HloInstruction*>> live_buffers;
 
+  const HloInstruction* root = computation.root_instruction();
+  FlatSet<const LogicalBuffer*> output_source_buffers =
+      points_to_analysis.GetPointsToSet(root).CreateFlattenedSet();
+
   for (const HloInstruction* instruction : instruction_sequence) {
     const std::vector<const LogicalBuffer*>& buffers_defined_by_instruction =
         points_to_analysis.GetBuffersDefinedByInstruction(instruction);
 
-    const HloInstruction* root = computation.root_instruction();
-    FlatSet<const LogicalBuffer*> output_source_buffers =
-        points_to_analysis.GetPointsToSet(root).CreateFlattenedSet();
-
     // Initialize live_buffers for each buffer that we're going to assign.  The
     // set of instructions that need to be visited contains all users of all
     // aliases.  The alias itself is not necessary; if it has users, the users
     // are necessarily scheduled after the alias.  And if it has no users, it is
     // either a dead value or an output, both of which are handled below.
+    //
+    // We ignore control dependencies here. The reasoning is that the control
+    // dependencies have already been accounted for in the ordering of the given
+    // 'instruction_sequence', and should not otherwise artificially extend the
+    // lifetime of buffers that aren't already connected by a data dependency.
     std::vector<const LogicalBuffer*> dead_buffers_to_free;
     for (const LogicalBuffer* buffer : buffers_defined_by_instruction) {
       if (heap.IgnoreBuffer(buffer)) {
diff --git a/tensorflow/compiler/xla/service/liveness_util.cc b/tensorflow/compiler/xla/service/liveness_util.cc
index 1f625ae0e2..6c5f185ed1 100644
--- a/tensorflow/compiler/xla/service/liveness_util.cc
+++ b/tensorflow/compiler/xla/service/liveness_util.cc
@@ -120,6 +120,11 @@ bool CanShareOperandBufferWithUser(
   if (!ShapeUtil::Equal(operand_subshape, user_subshape)) {
     return false;
   }
+  // Copy instructions are explicitly added by CopyInsertion to prevent liveness
+  // issues, so they should never re-use their operand buffer.
+  if (user->opcode() == HloOpcode::kCopy) {
+    return false;
+  }
   // Check if 'user' is a loop fusion instruction with a kDynamicUpdateSlice
   // fused root instruction.
   if (user->opcode() == HloOpcode::kFusion &&
@@ -144,8 +149,9 @@ bool CanShareOperandBufferWithUser(
       break;
     }
     return false;
-  } else if (user->opcode() == HloOpcode::kDynamicUpdateSlice ||
-             user->opcode() == HloOpcode::kWhile) {
+  }
+  if (user->opcode() == HloOpcode::kDynamicUpdateSlice ||
+      user->opcode() == HloOpcode::kWhile) {
     // We eliminated other users in BufferLiveness::live_range_strictly_before,
     // so here we just need to check that the use is at operand index 0.
     std::vector<int64> operand_indices = user->OperandIndices(operand);
diff --git a/tensorflow/compiler/xla/service/liveness_util_test.cc b/tensorflow/compiler/xla/service/liveness_util_test.cc
index 079b59265b..1ee0292511 100644
--- a/tensorflow/compiler/xla/service/liveness_util_test.cc
+++ b/tensorflow/compiler/xla/service/liveness_util_test.cc
@@ -150,6 +150,25 @@ TEST_F(CanShareOperandBufferWithUserTest, ElementWiseDifferentShape) {
                                              *points_to_analysis_));
 }
 
+TEST_F(CanShareOperandBufferWithUserTest, CopyNeverShares) {
+  auto builder = HloComputation::Builder(TestName());
+
+  Shape shape = ShapeUtil::MakeShape(F32, {8});
+  auto param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, shape, "param"));
+  auto exp = builder.AddInstruction(
+      HloInstruction::CreateUnary(shape, HloOpcode::kExp, param));
+  auto copy = builder.AddInstruction(
+      HloInstruction::CreateUnary(shape, HloOpcode::kCopy, exp));
+
+  BuildModuleAndRunAnalysis(builder.Build());
+
+  EXPECT_TRUE(
+      CanShareOperandBufferWithUser(param, {}, exp, {}, *points_to_analysis_));
+  EXPECT_FALSE(
+      CanShareOperandBufferWithUser(exp, {}, copy, {}, *points_to_analysis_));
+}
+
 TEST_F(CanShareOperandBufferWithUserTest, FusedDynamicUpdateSlice) {
   auto builder = HloComputation::Builder(TestName());
 
-- 
GitLab


From 73aa0538755ff9aadfcc34bb815182790d5195c8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 13:59:43 -0800
Subject: [PATCH 0651/1563] Print tensor_name for saved_model_cli show command.
 Change: 154101984

---
 tensorflow/python/tools/saved_model_cli.py      |  5 +++--
 tensorflow/python/tools/saved_model_cli_test.py | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index 17ef8ef9c2..1c55c5bf53 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -217,6 +217,7 @@ def _print_tensor_info(tensor_info):
     shape = ', '.join(dims)
     shape = '(' + shape + ')'
   print('    shape: ' + shape)
+  print('    name: ' + tensor_info.name)
 
 
 def _show_all(saved_model_dir):
@@ -599,7 +600,7 @@ def create_parser():
              ' the output tensors to files:\n'
              '$saved_model_cli show --dir /tmp/saved_model --tag_set serve'
              '--signature_def serving_default '
-             '--inputs x1=/tmp/124.npz[x],x2=/tmp/123.npy'
+             '--inputs input1_key=/tmp/124.npz[x],input2_key=/tmp/123.npy'
              '--outdir=/out\n\n'
              'For more information about input file format, please see:\n')
   parser_run = subparsers.add_parser(
@@ -622,7 +623,7 @@ def create_parser():
       help='key of SignatureDef to run')
   msg = ('inputs in the format of \'input_key=filename[variable_name]\', '
          'separated by \',\'. Inputs can only be loaded from .npy, .npz or '
-         'pickle files.')
+         'pickle files. Please use input keys instead of input names.')
   parser_run.add_argument('--inputs', type=str, required=True, help=msg)
   parser_run.add_argument(
       '--outdir',
diff --git a/tensorflow/python/tools/saved_model_cli_test.py b/tensorflow/python/tools/saved_model_cli_test.py
index c481dba2e9..a321ada2dd 100644
--- a/tensorflow/python/tools/saved_model_cli_test.py
+++ b/tensorflow/python/tools/saved_model_cli_test.py
@@ -63,10 +63,12 @@ The given SavedModel SignatureDef contains the following input(s):
 inputs['inputs'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: x2:0
 The given SavedModel SignatureDef contains the following output(s):
 outputs['scores'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: y3:0
 Method name is: tensorflow/serving/classify
 
 signature_def['classify_x_to_y']:
@@ -74,10 +76,12 @@ The given SavedModel SignatureDef contains the following input(s):
 inputs['inputs'] tensor_info:
     dtype: DT_STRING
     shape: unknown_rank
+    name: tf_example:0
 The given SavedModel SignatureDef contains the following output(s):
 outputs['scores'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: y:0
 Method name is: tensorflow/serving/classify
 
 signature_def['regress_x2_to_y3']:
@@ -85,10 +89,12 @@ The given SavedModel SignatureDef contains the following input(s):
 inputs['inputs'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: x2:0
 The given SavedModel SignatureDef contains the following output(s):
 outputs['outputs'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: y3:0
 Method name is: tensorflow/serving/regress
 
 signature_def['regress_x_to_y']:
@@ -96,10 +102,12 @@ The given SavedModel SignatureDef contains the following input(s):
 inputs['inputs'] tensor_info:
     dtype: DT_STRING
     shape: unknown_rank
+    name: tf_example:0
 The given SavedModel SignatureDef contains the following output(s):
 outputs['outputs'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: y:0
 Method name is: tensorflow/serving/regress
 
 signature_def['regress_x_to_y2']:
@@ -107,10 +115,12 @@ The given SavedModel SignatureDef contains the following input(s):
 inputs['inputs'] tensor_info:
     dtype: DT_STRING
     shape: unknown_rank
+    name: tf_example:0
 The given SavedModel SignatureDef contains the following output(s):
 outputs['outputs'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: y2:0
 Method name is: tensorflow/serving/regress
 
 signature_def['serving_default']:
@@ -118,10 +128,12 @@ The given SavedModel SignatureDef contains the following input(s):
 inputs['x'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: x:0
 The given SavedModel SignatureDef contains the following output(s):
 outputs['y'] tensor_info:
     dtype: DT_FLOAT
     shape: (-1, 1)
+    name: y:0
 Method name is: tensorflow/serving/predict"""
     # pylint: enable=line-too-long
     self.assertMultiLineEqual(output, exp_out)
@@ -180,10 +192,10 @@ Method name is: tensorflow/serving/predict"""
     expected_output = (
         'The given SavedModel SignatureDef contains the following input(s):\n'
         'inputs[\'x\'] tensor_info:\n'
-        '    dtype: DT_FLOAT\n    shape: (-1, 1)\n'
+        '    dtype: DT_FLOAT\n    shape: (-1, 1)\n    name: x:0\n'
         'The given SavedModel SignatureDef contains the following output(s):\n'
         'outputs[\'y\'] tensor_info:\n'
-        '    dtype: DT_FLOAT\n    shape: (-1, 1)\n'
+        '    dtype: DT_FLOAT\n    shape: (-1, 1)\n    name: y:0\n'
         'Method name is: tensorflow/serving/predict')
     self.assertEqual(output, expected_output)
     self.assertEqual(err.getvalue().strip(), '')
-- 
GitLab


From 5bda2224b53c864db6c7efbda135c054282d481e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Mon, 24 Apr 2017 14:29:05 -0800
Subject: [PATCH 0652/1563] Fork vz-line-chart, vz-distribution-chart,
 vz-histogram-timeseries to d3v4.

This creates the following new d3v4_fork components:
tf_imports_d3v4
vz_line_chart_d3v4
vz_distribution_chart_d3v4
vz_histogram_timeseries_d3v4

Also contains code modifications to accommodate API differences between v3 and v4.
Note: This migrates all of the Plottable code in TensorBoard.
Change: 154106475
---
 .../components/tf_imports_d3v4/BUILD          |  57 ++
 .../components/tf_imports_d3v4/README.md      |   2 +
 .../components/tf_imports_d3v4/d3.html        |  18 +
 .../components/tf_imports_d3v4/dagre.html     |  24 +
 .../components/tf_imports_d3v4/graphlib.html  |  19 +
 .../components/tf_imports_d3v4/lodash.html    |  18 +
 .../components/tf_imports_d3v4/plottable.html |  20 +
 .../vz_distribution_chart_d3v4/BUILD          |  67 ++
 .../vz_distribution_chart_d3v4/demo.html      |  62 ++
 .../vz-distribution-chart.html                |  43 +
 .../vz-distribution-chart.ts                  | 242 ++++++
 .../vz_histogram_timeseries_d3v4/BUILD        |  60 ++
 .../vz_histogram_timeseries_d3v4/demo.html    |  84 ++
 .../vz-histogram-timeseries.html              | 707 ++++++++++++++++
 .../components/vz_line_chart_d3v4/BUILD       |  67 ++
 .../components/vz_line_chart_d3v4/demo.html   |  73 ++
 .../vz_line_chart_d3v4/dragZoomInteraction.ts | 205 +++++
 .../vz_line_chart_d3v4/vz-chart-helpers.ts    | 219 +++++
 .../vz_line_chart_d3v4/vz-line-chart.html     | 125 +++
 .../vz_line_chart_d3v4/vz-line-chart.ts       | 777 ++++++++++++++++++
 20 files changed, 2889 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/README.md
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/d3.html
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
 create mode 100644 tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_distribution_chart_d3v4/demo.html
 create mode 100644 tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html
 create mode 100644 tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.ts
 create mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/demo.html
 create mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/demo.html
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/dragZoomInteraction.ts
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-chart-helpers.ts
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.ts

diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
new file mode 100644
index 0000000000..8d8542c447
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -0,0 +1,57 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "d3",
+    srcs = [
+        "d3.html",
+        "//third_party/javascript/d3/v4:d3.js",
+    ],
+    path = "/tf-imports-d3v4",
+)
+
+webfiles(
+    name = "lodash",
+    srcs = [
+        "lodash.html",
+        "@com_lodash",
+    ],
+    path = "/tf-imports-d3v4",
+)
+
+webfiles(
+    name = "graphlib",
+    srcs = [
+        "graphlib.html",
+        "@io_github_cpettitt_graphlib",
+    ],
+    path = "/tf-imports-d3v4",
+    deps = [":lodash"],
+)
+
+webfiles(
+    name = "dagre",
+    srcs = [
+        "dagre.html",
+        "@io_github_cpettitt_dagre",
+    ],
+    path = "/tf-imports-d3v4",
+    deps = [
+        ":graphlib",
+        ":lodash",
+    ],
+)
+
+webfiles(
+    name = "plottable",
+    srcs = [
+        "plottable.html",
+        "//third_party/javascript/plottable/v3:plottable.css",
+        "//third_party/javascript/plottable/v3:plottable.js",
+    ],
+    path = "/tf-imports-d3v4",
+    deps = [":d3"],
+)
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/README.md b/tensorflow/tensorboard/components/tf_imports_d3v4/README.md
new file mode 100644
index 0000000000..b1cabc61b9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/README.md
@@ -0,0 +1,2 @@
+This file acts as import routers for third party javascript libraries,
+e.g. Plottable and D3.
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/d3.html b/tensorflow/tensorboard/components/tf_imports_d3v4/d3.html
new file mode 100644
index 0000000000..d2c6cd8b5f
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/d3.html
@@ -0,0 +1,18 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="d3.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html b/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
new file mode 100644
index 0000000000..48fe39da79
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
@@ -0,0 +1,24 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!--
+HTML imports are non-blocking thus getting the dependency 'graphlib'
+and 'lodash' via script imports instead.
+-->
+<script src="lodash.js"></script>
+<script src="graphlib.core.js"></script>
+<script src="dagre.core.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html b/tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html
new file mode 100644
index 0000000000..4e19f7b008
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html
@@ -0,0 +1,19 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="lodash.js"></script>
+<script src="graphlib.core.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html b/tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html
new file mode 100644
index 0000000000..f92aa80879
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html
@@ -0,0 +1,18 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="lodash.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html b/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
new file mode 100644
index 0000000000..57f9c1d6d3
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
@@ -0,0 +1,20 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="d3.html">
+<script src="plottable.js"></script>
+<link rel="stylesheet" type="text/css" href="plottable.css">
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
new file mode 100644
index 0000000000..aa84b75863
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
@@ -0,0 +1,67 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load(
+    "//javascript/typescript:build_defs.bzl",
+    "ts_development_sources",
+    "ts_library",
+    "ts_devserver",
+)
+load(
+    "//third_party/javascript/polymer/build_defs:build_defs.bzl",
+    "webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+ts_library(
+    name = "ts",
+    srcs = [
+        "vz-distribution-chart.ts",
+    ],
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps_d3v4",
+        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:ts",
+        "//third_party/javascript/lodash:lodash-module",
+        "//third_party/javascript/plottable/v3:bundle",
+    ],
+)
+
+webcomponent_library(
+    name = "vz_distribution_chart",
+    srcs = [
+        "demo.html",
+        "vz-distribution-chart.html",
+    ],
+    ts_lib_deps = [":ts"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/plottable/v3:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+webcomponent_library(
+    name = "demo",
+    srcs = ["demo.html"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":vz_distribution_chart",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+    ],
+)
+
+ts_devserver(
+    name = "devserver",
+    manifest = ":dev_sources",
+    serving_path = "/demo_out/bundle.js",
+    static_files = [":demo"],
+)
+
+ts_development_sources(
+    name = "dev_sources",
+    deps = [
+        ":ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/demo.html b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/demo.html
new file mode 100644
index 0000000000..0a1a344056
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/demo.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>vz-distribution chart demo</title>
+    <link rel="import" href="vz-distribution-chart.html">
+    <link rel="import" href="iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="paper-styles/typography.html">
+    <script src="bundle.js"></script>
+
+    <style type="text/css">
+      body {
+        font-family: "Roboto";
+      }
+
+      vz-distribution-chart {
+        height: 400px;
+      }
+    </style>
+  </head>
+  <body>
+    <h3>Simple distribution chart</h3>
+    <script>
+      var data = [[1716.20,0,[[0,0.10],[668,0.10],[1587,0.10],[3085,0.10],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1720.60,10,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1724.90,20,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1729.18,30,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1733.55,40,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1737.84,50,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1742.35,60,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1746.75,70,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1751.15,80,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1755.44,90,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1759.99,100,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1764.40,110,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1768.70,120,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1773.00,130,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1777.57,140,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1781.96,150,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1786.34,160,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1790.67,170,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1794.96,180,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1799.29,190,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1803.68,200,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1808.88,210,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1813.33,220,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1817.66,230,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1821.95,240,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1826.97,250,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1831.64,260,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1836.01,270,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1840.31,280,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1844.63,290,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]]];
+    </script>
+    <demo-snippet>
+      <template>
+        <vz-distribution-chart id="demo"></vz-distribution-chart>
+        <script>
+          var elem = document.querySelector('#demo');
+          elem.setVisibleSeries(['demo']);
+          // The data format is strange. We don't expect you to use this chart.
+          var xform = data.map(function(x) {
+            var out = x[2];
+            out.wall_time = x[0];
+            out.step = x[1];
+            return out;
+          });
+          elem.setSeriesData('demo', xform);
+        </script>
+      </template>
+    </demo-snippet>
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html
new file mode 100644
index 0000000000..f274a4c24c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html
@@ -0,0 +1,43 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="plottable-library/plottable_css.html">
+
+<dom-module id="vz-distribution-chart">
+  <template>
+    <div id="chartdiv"></div>
+    <style>
+      :host {
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        flex-shrink: 1;
+        position: relative;
+      }
+      #chartdiv {
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        flex-grow: 1;
+        flex-shrink: 1;
+      }
+
+    </style>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.ts b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.ts
new file mode 100644
index 0000000000..01def47383
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.ts
@@ -0,0 +1,242 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+/* tslint:disable:no-namespace variable-name */
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import * as _ from 'lodash'
+import * as Plottable from 'Plottable/plottable';  // from //third_party/javascript/plottable/v3
+import {Dataset} from 'Plottable/plottable';
+
+import * as ChartHelpers from '../vz_line_chart_d3v4/vz-chart-helpers'
+
+export class DistributionChart {
+  private run2datasets: {[run: string]: Plottable.Dataset};
+  protected runs: string[];
+
+  protected xAccessor: Plottable.IAccessor<number|Date>;
+  protected xScale: Plottable.QuantitativeScale<number|Date>;
+  protected yScale: Plottable.QuantitativeScale<number>;
+  protected gridlines: Plottable.Components.Gridlines;
+  protected center: Plottable.Components.Group;
+  protected xAxis: Plottable.Axes.Numeric|Plottable.Axes.Time;
+  protected yAxis: Plottable.Axes.Numeric;
+  protected xLabel: Plottable.Components.AxisLabel;
+  protected yLabel: Plottable.Components.AxisLabel;
+  protected outer: Plottable.Components.Table;
+  protected colorScale: Plottable.Scales.Color;
+  private plots: Plottable.XYPlot<number|Date, number>[];
+
+  private targetSVG: d3.Selection<any, any, any, any>;
+
+  constructor(xType: string, colorScale: Plottable.Scales.Color) {
+    this.run2datasets = {};
+    this.colorScale = colorScale;
+    this.buildChart(xType);
+  }
+
+  protected getDataset(run: string) {
+    if (this.run2datasets[run] === undefined) {
+      this.run2datasets[run] = new Plottable.Dataset([], {run: run});
+    }
+    return this.run2datasets[run];
+  }
+
+  protected buildChart(xType: string) {
+    if (this.outer) {
+      this.outer.destroy();
+    }
+    let xComponents = ChartHelpers.getXComponents(xType);
+    this.xAccessor = xComponents.accessor;
+    this.xScale = xComponents.scale;
+    this.xAxis = xComponents.axis;
+    this.xAxis.margin(0).tickLabelPadding(3);
+    this.yScale = new Plottable.Scales.Linear();
+    this.yAxis = new Plottable.Axes.Numeric(this.yScale, 'left');
+    let yFormatter = ChartHelpers.multiscaleFormatter(
+        ChartHelpers.Y_AXIS_FORMATTER_PRECISION);
+    this.yAxis.margin(0).tickLabelPadding(5).formatter(yFormatter);
+    this.yAxis.usesTextWidthApproximation(true);
+
+    let center = this.buildPlot(this.xAccessor, this.xScale, this.yScale);
+
+    this.gridlines =
+        new Plottable.Components.Gridlines(this.xScale, this.yScale);
+
+    this.center = new Plottable.Components.Group([this.gridlines, center]);
+    this.outer = new Plottable.Components.Table(
+        [[this.yAxis, this.center], [null, this.xAxis]]);
+  }
+
+  protected buildPlot(xAccessor, xScale, yScale): Plottable.Component {
+    let percents = [0, 228, 1587, 3085, 5000, 6915, 8413, 9772, 10000];
+    let opacities = _.range(percents.length - 1)
+                        .map((i) => (percents[i + 1] - percents[i]) / 2500);
+    let accessors = percents.map((p, i) => (datum) => datum[i][1]);
+    let median = 4;
+    let medianAccessor = accessors[median];
+
+    let plots = _.range(accessors.length - 1).map((i) => {
+      let p = new Plottable.Plots.Area<number|Date>();
+      p.x(xAccessor, xScale);
+
+      let y0 = i > median ? accessors[i] : accessors[i + 1];
+      let y = i > median ? accessors[i + 1] : accessors[i];
+      p.y(y, yScale);
+      p.y0(y0);
+      p.attr(
+          'fill',
+          (d: any, i: number, dataset: Plottable.Dataset) =>
+              this.colorScale.scale(dataset.metadata().run));
+      p.attr(
+          'stroke',
+          (d: any, i: number, dataset: Plottable.Dataset) =>
+              this.colorScale.scale(dataset.metadata().run));
+      p.attr('stroke-weight', (d: any, i: number, m: any) => '0.5px');
+      p.attr('stroke-opacity', () => opacities[i]);
+      p.attr('fill-opacity', () => opacities[i]);
+      return p;
+    });
+
+    let medianPlot = new Plottable.Plots.Line<number|Date>();
+    medianPlot.x(xAccessor, xScale);
+    medianPlot.y(medianAccessor, yScale);
+    medianPlot.attr(
+        'stroke', (d: any, i: number, m: any) => this.colorScale.scale(m.run));
+
+    this.plots = plots;
+    return new Plottable.Components.Group(plots);
+  }
+
+  public setVisibleSeries(runs: string[]) {
+    this.runs = runs;
+    let datasets = runs.map((r) => this.getDataset(r));
+    this.plots.forEach((p) => p.datasets(datasets));
+  }
+
+  /**
+   * Set the data of a series on the chart.
+   */
+  public setSeriesData(name: string, data: any) {
+    this.getDataset(name).data(data);
+  }
+
+  public renderTo(targetSVG: d3.Selection<any, any, any, any>) {
+    this.targetSVG = targetSVG;
+    this.outer.renderTo(targetSVG);
+  }
+
+  public redraw() {
+    this.outer.redraw();
+  }
+
+  protected destroy() {
+    this.outer.destroy();
+  }
+}
+
+
+Polymer({
+  is: 'vz-distribution-chart',
+  properties: {
+    /**
+     * Scale that maps series names to colors. The default colors are from
+     * d3.d3.schemeCategory10. Use this property to replace the default
+     * line colors with colors of your own choice.
+     * @type {Plottable.Scales.Color}
+     * @required
+     */
+    colorScale: {
+      type: Object,
+      value: function() {
+        return new Plottable.Scales.Color().range(d3.schemeCategory10);
+      }
+    },
+    /**
+     * The way to display the X values. Allows:
+     * - "step" - Linear scale using the  "step" property of the datum.
+     * - "wall_time" - Temporal scale using the "wall_time" property of the
+     * datum.
+     * - "relative" - Temporal scale using the "relative" property of the
+     * datum if it is present or calculating from "wall_time" if it isn't.
+     */
+    xType: {type: String, value: 'step'},
+    _attached: Boolean,
+    _chart: Object,
+    _visibleSeriesCache: {
+      type: Array,
+      value: function() {
+        return []
+      }
+    },
+    _seriesDataCache: {
+      type: Object,
+      value: function() {
+        return {}
+      }
+    },
+    _makeChartAsyncCallbackId: {type: Number, value: null}
+  },
+  observers: [
+    '_makeChart(xType, colorScale, _attached)',
+    '_reloadFromCache(_chart)',
+  ],
+  setVisibleSeries: function(names) {
+    this._visibleSeriesCache = names;
+    if (this._chart) {
+      this._chart.setVisibleSeries(names);
+      this.redraw();
+    }
+  },
+  setSeriesData: function(name, data) {
+    this._seriesDataCache[name] = data;
+    if (this._chart) {
+      this._chart.setSeriesData(name, data);
+    }
+  },
+  redraw: function() {
+    this._chart.redraw();
+  },
+  ready: function() {
+    this.scopeSubtree(this.$.chartdiv, true);
+  },
+  _makeChart: function(xType, colorScale, _attached) {
+    if (this._makeChartAsyncCallbackId === null) {
+      this.cancelAsync(this._makeChartAsyncCallbackId);
+    }
+
+    this._makeChartAsyncCallbackId = this.async(function() {
+      this._makeChartAsyncCallbackId = null;
+      if (!_attached) return;
+      if (this._chart) this._chart.destroy();
+      var chart = new DistributionChart(xType, colorScale);
+      var svg = d3.select(this.$.chartdiv);
+      chart.renderTo(svg);
+      this._chart = chart;
+    }, 350);
+  },
+  _reloadFromCache: function() {
+    if (this._chart) {
+      this._chart.setVisibleSeries(this._visibleSeriesCache);
+      this._visibleSeriesCache.forEach(function(name) {
+        this._chart.setSeriesData(name, this._seriesDataCache[name] || []);
+      }.bind(this));
+    }
+  },
+  attached: function() {
+    this._attached = true;
+  },
+  detached: function() {
+    this._attached = false;
+  }
+});
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
new file mode 100644
index 0000000000..24463e6ac6
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
@@ -0,0 +1,60 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "vz_histogram_timeseries",
+    srcs = [
+        "vz-histogram-timeseries.html",
+    ],
+    path = "/vz-histogram-timeseries",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+# bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
+webfiles(
+    name = "demo",
+    srcs = ["demo.html"],
+    path = "/vz-histogram-timeseries",
+    deps = [
+        ":vz_histogram_timeseries",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "vz-histogram-timeseries.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "vz-histogram-timeseries",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/demo.html b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/demo.html
new file mode 100644
index 0000000000..42efa83eb0
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/demo.html
@@ -0,0 +1,84 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>vz-histogram-timeseries demo</title>
+    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+    <link rel="import" href="vz-histogram-timeseries.html">
+    <link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="../paper-styles/typography.html">
+    <link rel="import" href="../paper-button/paper-button.html">
+    <style type="text/css">
+      body {
+        font-family: "Roboto";
+      }
+
+      vz-histogram-timeseries {
+        height: 300px;
+        width: 500px;
+      }
+    </style>
+  </head>
+  <body>
+    <h3>vz-histogram-timeseries mode</h3>
+    <demo-snippet>
+      <template>
+        <paper-button id="offsetButton">Offset</paper-button>
+        <paper-button id="overlayButton">Overlay</paper-button>
+        <vz-histogram-timeseries id="histo1"></vz-histogram-timeseries>
+        <script>
+          var histo1 = document.querySelector('#histo1'),
+            offsetButton = document.querySelector('#offsetButton'),
+            overlayButton = document.querySelector('#overlayButton');
+
+          histo1.setSeriesData('data', data);
+          offsetButton.addEventListener('click', function() { histo1.mode = 'offset' });
+          overlayButton.addEventListener('click', function() { histo1.mode = 'overlay' });
+        </script>
+      </template>
+    </demo-snippet>
+
+    <h3>vz-histogram-timeseries axis</h3>
+    <demo-snippet>
+      <template>
+        <paper-button id="stepButton">Step</paper-button>
+        <paper-button id="relativeButton">Relative</paper-button>
+        <paper-button id="wallTimeButton">Wall Time</paper-button>
+        <vz-histogram-timeseries id="histo2"></vz-histogram-timeseries>
+        <script>
+          var histo2 = document.querySelector('#histo2'),
+            stepButton = document.querySelector('#stepButton'),
+            relativeButton = document.querySelector('#relativeButton'),
+            wallTimeButton = document.querySelector('#wallTimeButton');
+
+          histo2.setSeriesData('data', data);
+          stepButton.addEventListener('click', function() { histo2.timeProperty = 'step' });
+          relativeButton.addEventListener('click', function() { histo2.timeProperty = 'relative' });
+          wallTimeButton.addEventListener('click', function() { histo2.timeProperty = 'wall_time' });
+        </script>
+      </template>
+    </demo-snippet>
+
+    <script>
+      var data = [{"wall_time":new Date("2016-06-24T04:13:11.455Z"),"step":28,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":0},{"x":0.0752,"dx":0.0054,"y":3.2512},{"x":0.0805,"dx":0.0054,"y":19.1043},{"x":0.0859,"dx":0.0054,"y":66.4758},{"x":0.0913,"dx":0.0054,"y":89.9105},{"x":0.0966,"dx":0.0054,"y":102.4476},{"x":0.102,"dx":0.0054,"y":83.8924},{"x":0.1073,"dx":0.0054,"y":81.9883},{"x":0.1127,"dx":0.0054,"y":25.21},{"x":0.1181,"dx":0.0054,"y":25.21},{"x":0.1234,"dx":0.0054,"y":2.51},{"x":0.1288,"dx":0.0054,"y":0},{"x":0.1341,"dx":0.0054,"y":0},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:13:32.817Z"),"step":74,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":0.7448},{"x":0.0752,"dx":0.0054,"y":14.6532},{"x":0.0805,"dx":0.0054,"y":30.3488},{"x":0.0859,"dx":0.0054,"y":59.5117},{"x":0.0913,"dx":0.0054,"y":75.1098},{"x":0.0966,"dx":0.0054,"y":83.4545},{"x":0.102,"dx":0.0054,"y":74.1291},{"x":0.1073,"dx":0.0054,"y":73.1618},{"x":0.1127,"dx":0.0054,"y":40.9067},{"x":0.1181,"dx":0.0054,"y":40.9067},{"x":0.1234,"dx":0.0054,"y":5.241},{"x":0.1288,"dx":0.0054,"y":1.2973},{"x":0.1341,"dx":0.0054,"y":0.5347},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:04.265Z"),"step":148,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":1.4897},{"x":0.0752,"dx":0.0054,"y":19.5529},{"x":0.0805,"dx":0.0054,"y":36.5817},{"x":0.0859,"dx":0.0054,"y":63.3103},{"x":0.0913,"dx":0.0054,"y":68.1847},{"x":0.0966,"dx":0.0054,"y":70.7925},{"x":0.102,"dx":0.0054,"y":68.2578},{"x":0.1073,"dx":0.0054,"y":67.9546},{"x":0.1127,"dx":0.0054,"y":44.712},{"x":0.1181,"dx":0.0054,"y":44.712},{"x":0.1234,"dx":0.0054,"y":8.3454},{"x":0.1288,"dx":0.0054,"y":4.3242},{"x":0.1341,"dx":0.0054,"y":1.7822},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:17.166Z"),"step":172,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":2.2345},{"x":0.0752,"dx":0.0054,"y":22.1303},{"x":0.0805,"dx":0.0054,"y":37.9432},{"x":0.0859,"dx":0.0054,"y":57.6124},{"x":0.0913,"dx":0.0054,"y":63.9491},{"x":0.0966,"dx":0.0054,"y":67.3392},{"x":0.102,"dx":0.0054,"y":70.352},{"x":0.1073,"dx":0.0054,"y":70.5635},{"x":0.1127,"dx":0.0054,"y":44.712},{"x":0.1181,"dx":0.0054,"y":44.712},{"x":0.1234,"dx":0.0054,"y":9.5135},{"x":0.1288,"dx":0.0054,"y":5.6214},{"x":0.1341,"dx":0.0054,"y":2.5479},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:30.696Z"),"step":202,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":5.2139},{"x":0.0752,"dx":0.0054,"y":22.6865},{"x":0.0805,"dx":0.0054,"y":37.4077},{"x":0.0859,"dx":0.0054,"y":57.6124},{"x":0.0913,"dx":0.0054,"y":62.0743},{"x":0.0966,"dx":0.0054,"y":64.4614},{"x":0.102,"dx":0.0054,"y":69.1481},{"x":0.1073,"dx":0.0054,"y":69.5186},{"x":0.1127,"dx":0.0054,"y":44.2364},{"x":0.1181,"dx":0.0054,"y":44.2364},{"x":0.1234,"dx":0.0054,"y":11.4129},{"x":0.1288,"dx":0.0054,"y":7.7835},{"x":0.1341,"dx":0.0054,"y":3.439},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:39.713Z"),"step":224,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":5.9588},{"x":0.0752,"dx":0.0054,"y":21.5483},{"x":0.0805,"dx":0.0054,"y":37.556},{"x":0.0859,"dx":0.0054,"y":65.2096},{"x":0.0913,"dx":0.0054,"y":61.7226},{"x":0.0966,"dx":0.0054,"y":59.857},{"x":0.102,"dx":0.0054,"y":65.4045},{"x":0.1073,"dx":0.0054,"y":65.8728},{"x":0.1127,"dx":0.0054,"y":46.6147},{"x":0.1181,"dx":0.0054,"y":46.6147},{"x":0.1234,"dx":0.0054,"y":12.0391},{"x":0.1288,"dx":0.0054,"y":8.2159},{"x":0.1341,"dx":0.0054,"y":3.3861},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:15:16.226Z"),"step":309,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0.134},{"x":0.0645,"dx":0.0054,"y":0.8427},{"x":0.0698,"dx":0.0054,"y":13.4305},{"x":0.0752,"dx":0.0054,"y":25.0288},{"x":0.0805,"dx":0.0054,"y":37.6034},{"x":0.0859,"dx":0.0054,"y":60.7779},{"x":0.0913,"dx":0.0054,"y":61.3028},{"x":0.0966,"dx":0.0054,"y":61.5837},{"x":0.102,"dx":0.0054,"y":57.9013},{"x":0.1073,"dx":0.0054,"y":57.5244},{"x":0.1127,"dx":0.0054,"y":46.6147},{"x":0.1181,"dx":0.0054,"y":46.6147},{"x":0.1234,"dx":0.0054,"y":13.9859},{"x":0.1288,"dx":0.0054,"y":10.378},{"x":0.1341,"dx":0.0054,"y":4.7394},{"x":0.1395,"dx":0.0054,"y":0.7862},{"x":0.1449,"dx":0.0054,"y":0.7516},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:15:47.102Z"),"step":377,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0.67},{"x":0.0645,"dx":0.0054,"y":4.2133},{"x":0.0698,"dx":0.0054,"y":17.9929},{"x":0.0752,"dx":0.0054,"y":30.2753},{"x":0.0805,"dx":0.0054,"y":39.6941},{"x":0.0859,"dx":0.0054,"y":51.2814},{"x":0.0913,"dx":0.0054,"y":57.993},{"x":0.0966,"dx":0.0054,"y":61.5837},{"x":0.102,"dx":0.0054,"y":56.9449},{"x":0.1073,"dx":0.0054,"y":56.4756},{"x":0.1127,"dx":0.0054,"y":44.712},{"x":0.1181,"dx":0.0054,"y":44.712},{"x":0.1234,"dx":0.0054,"y":15.3539},{"x":0.1288,"dx":0.0054,"y":12.1077},{"x":0.1341,"dx":0.0054,"y":5.2212},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:16:13.835Z"),"step":433,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0.9381},{"x":0.0645,"dx":0.0054,"y":5.8986},{"x":0.0698,"dx":0.0054,"y":14.3154},{"x":0.0752,"dx":0.0054,"y":32.7152},{"x":0.0805,"dx":0.0054,"y":43.8322},{"x":0.0859,"dx":0.0054,"y":50.6483},{"x":0.0913,"dx":0.0054,"y":56.6475},{"x":0.0966,"dx":0.0054,"y":59.857},{"x":0.102,"dx":0.0054,"y":59.1875},{"x":0.1073,"dx":0.0054,"y":59.0805},{"x":0.1127,"dx":0.0054,"y":43.285},{"x":0.1181,"dx":0.0054,"y":43.285},{"x":0.1234,"dx":0.0054,"y":14.0438},{"x":0.1288,"dx":0.0054,"y":10.8105},{"x":0.1341,"dx":0.0054,"y":4.6865},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:16:18.632Z"),"step":445,"bins":[{"x":0.0537,"dx":0.0054,"y":0.2205},{"x":0.0591,"dx":0.0054,"y":1.5836},{"x":0.0645,"dx":0.0054,"y":5.056},{"x":0.0698,"dx":0.0054,"y":18.0162},{"x":0.0752,"dx":0.0054,"y":32.1331},{"x":0.0805,"dx":0.0054,"y":41.2513},{"x":0.0859,"dx":0.0054,"y":48.7489},{"x":0.0913,"dx":0.0054,"y":57.1104},{"x":0.0966,"dx":0.0054,"y":61.5837},{"x":0.102,"dx":0.0054,"y":57.9013},{"x":0.1073,"dx":0.0054,"y":57.5178},{"x":0.1127,"dx":0.0054,"y":44.2364},{"x":0.1181,"dx":0.0054,"y":44.2364},{"x":0.1234,"dx":0.0054,"y":13.7491},{"x":0.1288,"dx":0.0054,"y":10.378},{"x":0.1341,"dx":0.0054,"y":4.5083},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3973},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:36.297Z"),"step":484,"bins":[{"x":0.0537,"dx":0.0054,"y":0.441},{"x":0.0591,"dx":0.0054,"y":3.3011},{"x":0.0645,"dx":0.0054,"y":10.9546},{"x":0.0698,"dx":0.0054,"y":13.7105},{"x":0.0752,"dx":0.0054,"y":32.9245},{"x":0.0805,"dx":0.0054,"y":43.1978},{"x":0.0859,"dx":0.0054,"y":45.5834},{"x":0.0913,"dx":0.0054,"y":55.2572},{"x":0.0966,"dx":0.0054,"y":60.4326},{"x":0.102,"dx":0.0054,"y":53.4983},{"x":0.1073,"dx":0.0054,"y":52.8206},{"x":0.1127,"dx":0.0054,"y":43.7607},{"x":0.1181,"dx":0.0054,"y":43.7607},{"x":0.1234,"dx":0.0054,"y":15.6486},{"x":0.1288,"dx":0.0054,"y":12.5401},{"x":0.1341,"dx":0.0054,"y":6.5549},{"x":0.1395,"dx":0.0054,"y":2.3586},{"x":0.1449,"dx":0.0054,"y":2.2763},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:41.053Z"),"step":496,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.5922},{"x":0.0645,"dx":0.0054,"y":9.2693},{"x":0.0698,"dx":0.0054,"y":14.4087},{"x":0.0752,"dx":0.0054,"y":31.3218},{"x":0.0805,"dx":0.0054,"y":41.9331},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":53.5815},{"x":0.0966,"dx":0.0054,"y":55.8282},{"x":0.102,"dx":0.0054,"y":55.0152},{"x":0.1073,"dx":0.0054,"y":54.901},{"x":0.1127,"dx":0.0054,"y":41.3824},{"x":0.1181,"dx":0.0054,"y":41.3824},{"x":0.1234,"dx":0.0054,"y":18.1373},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":7.5713},{"x":0.1395,"dx":0.0054,"y":1.9655},{"x":0.1449,"dx":0.0054,"y":1.9005},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:41.186Z"),"step":497,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.4581},{"x":0.0645,"dx":0.0054,"y":8.4266},{"x":0.0698,"dx":0.0054,"y":15.1302},{"x":0.0752,"dx":0.0054,"y":31.577},{"x":0.0805,"dx":0.0054,"y":42.2256},{"x":0.0859,"dx":0.0054,"y":50.6483},{"x":0.0913,"dx":0.0054,"y":53.2729},{"x":0.0966,"dx":0.0054,"y":54.6771},{"x":0.102,"dx":0.0054,"y":53.4815},{"x":0.1073,"dx":0.0054,"y":53.3397},{"x":0.1127,"dx":0.0054,"y":42.8094},{"x":0.1181,"dx":0.0054,"y":42.8094},{"x":0.1234,"dx":0.0054,"y":18.6688},{"x":0.1288,"dx":0.0054,"y":15.9995},{"x":0.1341,"dx":0.0054,"y":7.5184},{"x":0.1395,"dx":0.0054,"y":1.5724},{"x":0.1449,"dx":0.0054,"y":1.5247},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:49.690Z"),"step":513,"bins":[{"x":0.0537,"dx":0.0054,"y":1.4385},{"x":0.0591,"dx":0.0054,"y":3.8126},{"x":0.0645,"dx":0.0054,"y":9.2693},{"x":0.0698,"dx":0.0054,"y":15.8984},{"x":0.0752,"dx":0.0054,"y":33.6899},{"x":0.0805,"dx":0.0054,"y":44.0753},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":51.3318},{"x":0.0966,"dx":0.0054,"y":52.3749},{"x":0.102,"dx":0.0054,"y":57.1094},{"x":0.1073,"dx":0.0054,"y":57.5073},{"x":0.1127,"dx":0.0054,"y":40.4311},{"x":0.1181,"dx":0.0054,"y":40.4311},{"x":0.1234,"dx":0.0054,"y":18.0426},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":6.878},{"x":0.1395,"dx":0.0054,"y":0.7862},{"x":0.1449,"dx":0.0054,"y":0.7731},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:07.617Z"),"step":551,"bins":[{"x":0.0537,"dx":0.0054,"y":0.441},{"x":0.0591,"dx":0.0054,"y":3.4351},{"x":0.0645,"dx":0.0054,"y":11.7972},{"x":0.0698,"dx":0.0054,"y":21.1823},{"x":0.0752,"dx":0.0054,"y":30.8315},{"x":0.0805,"dx":0.0054,"y":38.4273},{"x":0.0859,"dx":0.0054,"y":48.1158},{"x":0.0913,"dx":0.0054,"y":49.7656},{"x":0.0966,"dx":0.0054,"y":50.6483},{"x":0.102,"dx":0.0054,"y":56.0044},{"x":0.1073,"dx":0.0054,"y":56.4716},{"x":0.1127,"dx":0.0054,"y":43.285},{"x":0.1181,"dx":0.0054,"y":43.285},{"x":0.1234,"dx":0.0054,"y":19.1055},{"x":0.1288,"dx":0.0054,"y":16.4319},{"x":0.1341,"dx":0.0054,"y":7.4655},{"x":0.1395,"dx":0.0054,"y":1.1793},{"x":0.1449,"dx":0.0054,"y":1.1489},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:17.407Z"),"step":577,"bins":[{"x":0.0537,"dx":0.0054,"y":0.6614},{"x":0.0591,"dx":0.0054,"y":4.3487},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":15.2469},{"x":0.0752,"dx":0.0054,"y":32.5059},{"x":0.0805,"dx":0.0054,"y":42.1267},{"x":0.0859,"dx":0.0054,"y":45.5834},{"x":0.0913,"dx":0.0054,"y":48.883},{"x":0.0966,"dx":0.0054,"y":50.6483},{"x":0.102,"dx":0.0054,"y":58.3955},{"x":0.1073,"dx":0.0054,"y":59.0752},{"x":0.1127,"dx":0.0054,"y":41.3824},{"x":0.1181,"dx":0.0054,"y":41.3824},{"x":0.1234,"dx":0.0054,"y":19.3054},{"x":0.1288,"dx":0.0054,"y":16.8643},{"x":0.1341,"dx":0.0054,"y":7.8748},{"x":0.1395,"dx":0.0054,"y":1.5724},{"x":0.1449,"dx":0.0054,"y":1.5032},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:17:21.105Z"),"step":581,"bins":[{"x":0.0537,"dx":0.0054,"y":0.6614},{"x":0.0591,"dx":0.0054,"y":4.4827},{"x":0.0645,"dx":0.0054,"y":13.4826},{"x":0.0698,"dx":0.0054,"y":15.2702},{"x":0.0752,"dx":0.0054,"y":30.6481},{"x":0.0805,"dx":0.0054,"y":40.862},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":48.3322},{"x":0.0966,"dx":0.0054,"y":47.7705},{"x":0.102,"dx":0.0054,"y":58.6263},{"x":0.1073,"dx":0.0054,"y":59.6023},{"x":0.1127,"dx":0.0054,"y":43.285},{"x":0.1181,"dx":0.0054,"y":43.285},{"x":0.1234,"dx":0.0054,"y":18.3268},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":7.3402},{"x":0.1395,"dx":0.0054,"y":1.5724},{"x":0.1449,"dx":0.0054,"y":1.5032},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:17:30.677Z"),"step":602,"bins":[{"x":0.0537,"dx":0.0054,"y":0.441},{"x":0.0591,"dx":0.0054,"y":3.5692},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":16.7365},{"x":0.0752,"dx":0.0054,"y":31.1584},{"x":0.0805,"dx":0.0054,"y":40.4233},{"x":0.0859,"dx":0.0054,"y":47.4827},{"x":0.0913,"dx":0.0054,"y":46.9203},{"x":0.0966,"dx":0.0054,"y":46.6194},{"x":0.102,"dx":0.0054,"y":57.0926},{"x":0.1073,"dx":0.0054,"y":58.0436},{"x":0.1127,"dx":0.0054,"y":45.6633},{"x":0.1181,"dx":0.0054,"y":45.6633},{"x":0.1234,"dx":0.0054,"y":18.5636},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":7.8024},{"x":0.1395,"dx":0.0054,"y":2.3586},{"x":0.1449,"dx":0.0054,"y":2.2763},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:30.960Z"),"step":604,"bins":[{"x":0.0537,"dx":0.0054,"y":0.6614},{"x":0.0591,"dx":0.0054,"y":4.0807},{"x":0.0645,"dx":0.0054,"y":10.9546},{"x":0.0698,"dx":0.0054,"y":17.4347},{"x":0.0752,"dx":0.0054,"y":31.878},{"x":0.0805,"dx":0.0054,"y":40.8126},{"x":0.0859,"dx":0.0054,"y":46.8496},{"x":0.0913,"dx":0.0054,"y":46.6997},{"x":0.0966,"dx":0.0054,"y":46.6194},{"x":0.102,"dx":0.0054,"y":57.0926},{"x":0.1073,"dx":0.0054,"y":58.0423},{"x":0.1127,"dx":0.0054,"y":45.1877},{"x":0.1181,"dx":0.0054,"y":45.1877},{"x":0.1234,"dx":0.0054,"y":18.5162},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":8.0335},{"x":0.1395,"dx":0.0054,"y":2.7518},{"x":0.1449,"dx":0.0054,"y":2.6521},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:45.074Z"),"step":637,"bins":[{"x":0.0537,"dx":0.0054,"y":1.1024},{"x":0.0591,"dx":0.0054,"y":4.8356},{"x":0.0645,"dx":0.0054,"y":5.8986},{"x":0.0698,"dx":0.0054,"y":20.2741},{"x":0.0752,"dx":0.0054,"y":34.292},{"x":0.0805,"dx":0.0054,"y":41.5418},{"x":0.0859,"dx":0.0054,"y":43.051},{"x":0.0913,"dx":0.0054,"y":48.0004},{"x":0.0966,"dx":0.0054,"y":50.6483},{"x":0.102,"dx":0.0054,"y":56.0044},{"x":0.1073,"dx":0.0054,"y":56.4862},{"x":0.1127,"dx":0.0054,"y":48.5173},{"x":0.1181,"dx":0.0054,"y":48.5173},{"x":0.1234,"dx":0.0054,"y":15.7328},{"x":0.1288,"dx":0.0054,"y":12.1077},{"x":0.1341,"dx":0.0054,"y":6.6077},{"x":0.1395,"dx":0.0054,"y":2.7518},{"x":0.1449,"dx":0.0054,"y":2.6521},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:18:17.117Z"),"step":702,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.3241},{"x":0.0645,"dx":0.0054,"y":7.5839},{"x":0.0698,"dx":0.0054,"y":20.3208},{"x":0.0752,"dx":0.0054,"y":36.1498},{"x":0.0805,"dx":0.0054,"y":44.7076},{"x":0.0859,"dx":0.0054,"y":47.4827},{"x":0.0913,"dx":0.0054,"y":46.1704},{"x":0.0966,"dx":0.0054,"y":45.4683},{"x":0.102,"dx":0.0054,"y":50.2984},{"x":0.1073,"dx":0.0054,"y":50.748},{"x":0.1127,"dx":0.0054,"y":48.993},{"x":0.1181,"dx":0.0054,"y":48.993},{"x":0.1234,"dx":0.0054,"y":17.727},{"x":0.1288,"dx":0.0054,"y":14.2698},{"x":0.1341,"dx":0.0054,"y":7.961},{"x":0.1395,"dx":0.0054,"y":3.538},{"x":0.1449,"dx":0.0054,"y":3.4037},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:18:21.750Z"),"step":714,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.7262},{"x":0.0645,"dx":0.0054,"y":10.1119},{"x":0.0698,"dx":0.0054,"y":19.6459},{"x":0.0752,"dx":0.0054,"y":35.4302},{"x":0.0805,"dx":0.0054,"y":44.3183},{"x":0.0859,"dx":0.0054,"y":48.1158},{"x":0.0913,"dx":0.0054,"y":46.3911},{"x":0.0966,"dx":0.0054,"y":45.4683},{"x":0.102,"dx":0.0054,"y":50.2984},{"x":0.1073,"dx":0.0054,"y":50.7374},{"x":0.1127,"dx":0.0054,"y":45.1877},{"x":0.1181,"dx":0.0054,"y":45.1877},{"x":0.1234,"dx":0.0054,"y":19.6843},{"x":0.1288,"dx":0.0054,"y":16.8643},{"x":0.1341,"dx":0.0054,"y":9.0303},{"x":0.1395,"dx":0.0054,"y":3.538},{"x":0.1449,"dx":0.0054,"y":3.4037},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:18:40.691Z"),"step":758,"bins":[{"x":0.0537,"dx":0.0054,"y":1.2181},{"x":0.0591,"dx":0.0054,"y":3.4351},{"x":0.0645,"dx":0.0054,"y":11.7972},{"x":0.0698,"dx":0.0054,"y":19.6926},{"x":0.0752,"dx":0.0054,"y":34.0368},{"x":0.0805,"dx":0.0054,"y":43.0042},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":44.9576},{"x":0.0966,"dx":0.0054,"y":42.5906},{"x":0.102,"dx":0.0054,"y":52.9203},{"x":0.1073,"dx":0.0054,"y":53.8615},{"x":0.1127,"dx":0.0054,"y":42.8094},{"x":0.1181,"dx":0.0054,"y":42.8094},{"x":0.1234,"dx":0.0054,"y":21.005},{"x":0.1288,"dx":0.0054,"y":18.594},{"x":0.1341,"dx":0.0054,"y":9.5121},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0495},{"x":0.1502,"dx":0.0054,"y":0.9785},{"x":0.1556,"dx":0.0054,"y":0.9785}]},{"wall_time":new Date("2016-06-24T04:18:44.566Z"),"step":762,"bins":[{"x":0.0537,"dx":0.0054,"y":1.2181},{"x":0.0591,"dx":0.0054,"y":3.5692},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":18.9711},{"x":0.0752,"dx":0.0054,"y":34.7106},{"x":0.0805,"dx":0.0054,"y":43.929},{"x":0.0859,"dx":0.0054,"y":48.7489},{"x":0.0913,"dx":0.0054,"y":43.6121},{"x":0.0966,"dx":0.0054,"y":40.8639},{"x":0.102,"dx":0.0054,"y":53.25},{"x":0.1073,"dx":0.0054,"y":54.3819},{"x":0.1127,"dx":0.0054,"y":42.3337},{"x":0.1181,"dx":0.0054,"y":42.3337},{"x":0.1234,"dx":0.0054,"y":21.7363},{"x":0.1288,"dx":0.0054,"y":19.4588},{"x":0.1341,"dx":0.0054,"y":9.8685},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0495},{"x":0.1502,"dx":0.0054,"y":0.9785},{"x":0.1556,"dx":0.0054,"y":0.9785}]},{"wall_time":new Date("2016-06-24T04:18:48.972Z"),"step":771,"bins":[{"x":0.0537,"dx":0.0054,"y":1.4385},{"x":0.0591,"dx":0.0054,"y":4.4827},{"x":0.0645,"dx":0.0054,"y":13.4826},{"x":0.0698,"dx":0.0054,"y":17.5047},{"x":0.0752,"dx":0.0054,"y":34.2003},{"x":0.0805,"dx":0.0054,"y":43.3441},{"x":0.0859,"dx":0.0054,"y":46.2165},{"x":0.0913,"dx":0.0054,"y":43.1044},{"x":0.0966,"dx":0.0054,"y":41.4395},{"x":0.102,"dx":0.0054,"y":52.8213},{"x":0.1073,"dx":0.0054,"y":53.8641},{"x":0.1127,"dx":0.0054,"y":43.7607},{"x":0.1181,"dx":0.0054,"y":43.7607},{"x":0.1234,"dx":0.0054,"y":22.2678},{"x":0.1288,"dx":0.0054,"y":19.8912},{"x":0.1341,"dx":0.0054,"y":10.0467},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0495},{"x":0.1502,"dx":0.0054,"y":0.9785},{"x":0.1556,"dx":0.0054,"y":0.9785}]},{"wall_time":new Date("2016-06-24T04:19:18.102Z"),"step":836,"bins":[{"x":0.0537,"dx":0.0054,"y":1.8795},{"x":0.0591,"dx":0.0054,"y":6.4437},{"x":0.0645,"dx":0.0054,"y":16.0105},{"x":0.0698,"dx":0.0054,"y":18.3196},{"x":0.0752,"dx":0.0054,"y":30.2753},{"x":0.0805,"dx":0.0054,"y":39.2554},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":44.5826},{"x":0.0966,"dx":0.0054,"y":42.015},{"x":0.102,"dx":0.0054,"y":53.349},{"x":0.1073,"dx":0.0054,"y":54.3793},{"x":0.1127,"dx":0.0054,"y":41.3824},{"x":0.1181,"dx":0.0054,"y":41.3824},{"x":0.1234,"dx":0.0054,"y":22.031},{"x":0.1288,"dx":0.0054,"y":19.8912},{"x":0.1341,"dx":0.0054,"y":10.0467},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.071},{"x":0.1502,"dx":0.0054,"y":1.4677},{"x":0.1556,"dx":0.0054,"y":1.4677}]},{"wall_time":new Date("2016-06-24T04:19:26.881Z"),"step":854,"bins":[{"x":0.0537,"dx":0.0054,"y":1.8795},{"x":0.0591,"dx":0.0054,"y":6.3097},{"x":0.0645,"dx":0.0054,"y":15.1679},{"x":0.0698,"dx":0.0054,"y":19.0411},{"x":0.0752,"dx":0.0054,"y":29.1371},{"x":0.0805,"dx":0.0054,"y":37.795},{"x":0.0859,"dx":0.0054,"y":50.0152},{"x":0.0913,"dx":0.0054,"y":45.1782},{"x":0.0966,"dx":0.0054,"y":42.5906},{"x":0.102,"dx":0.0054,"y":51.0074},{"x":0.1073,"dx":0.0054,"y":51.781},{"x":0.1127,"dx":0.0054,"y":45.1877},{"x":0.1181,"dx":0.0054,"y":45.1877},{"x":0.1234,"dx":0.0054,"y":20.8524},{"x":0.1288,"dx":0.0054,"y":18.1616},{"x":0.1341,"dx":0.0054,"y":9.796},{"x":0.1395,"dx":0.0054,"y":3.9311},{"x":0.1449,"dx":0.0054,"y":3.8226},{"x":0.1502,"dx":0.0054,"y":1.4677},{"x":0.1556,"dx":0.0054,"y":1.4677}]},{"wall_time":new Date("2016-06-24T04:20:06.833Z"),"step":947,"bins":[{"x":0.0537,"dx":0.0054,"y":3.6542},{"x":0.0591,"dx":0.0054,"y":6.8212},{"x":0.0645,"dx":0.0054,"y":13.4826},{"x":0.0698,"dx":0.0054,"y":15.2702},{"x":0.0752,"dx":0.0054,"y":32.0414},{"x":0.0805,"dx":0.0054,"y":41.1524},{"x":0.0859,"dx":0.0054,"y":43.6841},{"x":0.0913,"dx":0.0054,"y":43.7216},{"x":0.0966,"dx":0.0054,"y":43.7417},{"x":0.102,"dx":0.0054,"y":46.8023},{"x":0.1073,"dx":0.0054,"y":47.089},{"x":0.1127,"dx":0.0054,"y":46.6147},{"x":0.1181,"dx":0.0054,"y":46.6147},{"x":0.1234,"dx":0.0054,"y":24.8881},{"x":0.1288,"dx":0.0054,"y":22.4857},{"x":0.1341,"dx":0.0054,"y":11.116},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0926},{"x":0.1502,"dx":0.0054,"y":1.9569},{"x":0.1556,"dx":0.0054,"y":1.9569}]},{"wall_time":new Date("2016-06-24T04:20:20.058Z"),"step":974,"bins":[{"x":0.0537,"dx":0.0054,"y":3.5385},{"x":0.0591,"dx":0.0054,"y":9.0258},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":17.4814},{"x":0.0752,"dx":0.0054,"y":30.9491},{"x":0.0805,"dx":0.0054,"y":39.7415},{"x":0.0859,"dx":0.0054,"y":46.8496},{"x":0.0913,"dx":0.0054,"y":42.9501},{"x":0.0966,"dx":0.0054,"y":40.8639},{"x":0.102,"dx":0.0054,"y":51.8154},{"x":0.1073,"dx":0.0054,"y":52.8153},{"x":0.1127,"dx":0.0054,"y":41.8581},{"x":0.1181,"dx":0.0054,"y":41.8581},{"x":0.1234,"dx":0.0054,"y":22.8571},{"x":0.1288,"dx":0.0054,"y":20.7561},{"x":0.1341,"dx":0.0054,"y":11.0964},{"x":0.1395,"dx":0.0054,"y":4.3242},{"x":0.1449,"dx":0.0054,"y":4.22},{"x":0.1502,"dx":0.0054,"y":1.9569},{"x":0.1556,"dx":0.0054,"y":1.9569}]},{"wall_time":new Date("2016-06-24T04:20:29.637Z"),"step":999,"bins":[{"x":0.0537,"dx":0.0054,"y":5.2083},{"x":0.0591,"dx":0.0054,"y":6.5532},{"x":0.0645,"dx":0.0054,"y":11.7972},{"x":0.0698,"dx":0.0054,"y":18.9477},{"x":0.0752,"dx":0.0054,"y":30.5305},{"x":0.0805,"dx":0.0054,"y":39.1091},{"x":0.0859,"dx":0.0054,"y":48.7489},{"x":0.0913,"dx":0.0054,"y":39.4876},{"x":0.0966,"dx":0.0054,"y":34.5329},{"x":0.102,"dx":0.0054,"y":55.0967},{"x":0.1073,"dx":0.0054,"y":57},{"x":0.1127,"dx":0.0054,"y":45.6633},{"x":0.1181,"dx":0.0054,"y":45.6633},{"x":0.1234,"dx":0.0054,"y":18.5636},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":10.3444},{"x":0.1395,"dx":0.0054,"y":6.6828},{"x":0.1449,"dx":0.0054,"y":6.4532},{"x":0.1502,"dx":0.0054,"y":1.4677},{"x":0.1556,"dx":0.0054,"y":1.4677}]}];
+    </script>
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html
new file mode 100644
index 0000000000..88def1710c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html
@@ -0,0 +1,707 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports-d3v4/d3.html">
+
+<!--
+vz-histogram-timeseries creates an element that draws beautiful histograms for
+displaying how data is distributed over time.
+
+This histogram supports changing the time axis type and different modes of
+visualization.
+
+@element vz-histogram-timeseries
+@demo demo/index.html
+-->
+<dom-module id="vz-histogram-timeseries">
+    <template>
+      <div id="tooltip"><span></span></div>
+      <svg id="svg">
+        <g>
+          <g class="axis x"></g>
+          <g class="axis y"></g>
+          <g class="axis y slice"></g>
+          <g class="stage">
+            <rect class="background"></rect>
+          </g>
+          <g class="x-axis-hover"></g>
+          <g class="y-axis-hover"></g>
+          <g class="y-slice-axis-hover"></g>
+        </g>
+      </svg>
+
+      <style>
+        :host {
+          display: flex;
+          flex-direction: column;
+          flex-grow: 1;
+          flex-shrink: 1;
+          position: relative;
+        }
+
+        svg {
+          font-family: roboto, sans-serif;
+          overflow: visible;
+          display: block;
+          width: 100%;
+          flex-grow: 1;
+          flex-shrink: 1;
+        }
+
+        #tooltip {
+          position: absolute;
+          display: block;
+          opacity: 0;
+          font-weight: bold;
+          font-size: 11px;
+        }
+
+        .background {
+          fill-opacity: 0;
+          fill: red;
+        }
+
+        .histogram {
+          pointer-events: none;
+        }
+
+        .hover {
+          font-size: 9px;
+          dominant-baseline: middle;
+          opacity: 0;
+        }
+
+        .hover circle {
+          stroke: white;
+          stroke-opacity: 0.5;
+          stroke-width: 1px;
+        }
+
+        .hover text {
+          fill: black;
+          opacity: 0;
+        }
+
+        .hover.hover-closest circle {
+          fill: black!important;
+        }
+
+        .hover.hover-closest text {
+          opacity: 1;
+        }
+
+        .baseline {
+          stroke: black;
+          stroke-opacity: 0.1;
+        }
+
+        .outline {
+          fill: none;
+          stroke: white;
+          stroke-opacity: 0.5;
+        }
+
+        .outline.outline-hover {
+          stroke: black!important;
+          stroke-opacity: 1;
+        }
+
+        .x-axis-hover,
+        .y-axis-hover,
+        .y-slice-axis-hover {
+          pointer-events: none;
+        }
+
+        .x-axis-hover .label,
+        .y-axis-hover .label,
+        .y-slice-axis-hover .label {
+          opacity: 0;
+          font-weight: bold;
+          font-size: 11px;
+          text-anchor: end;
+        }
+
+        .x-axis-hover text {
+          text-anchor: middle;
+        }
+
+        .y-axis-hover text,
+        .y-slice-axis-hover text {
+          text-anchor: start;
+        }
+
+        .x-axis-hover line,
+        .y-axis-hover line,
+        .y-slice-axis-hover line {
+          stroke: black;
+        }
+
+        .x-axis-hover rect,
+        .y-axis-hover rect,
+        .y-slice-axis-hover rect {
+          fill: white;
+        }
+
+        .axis {
+          font-size: 11px;
+        }
+
+        .axis path.domain {
+          fill: none;
+        }
+
+        .axis .tick line {
+          stroke: #ddd;
+        }
+
+        .axis.slice {
+          opacity: 0;
+        }
+
+        .axis.slice .tick line {
+          stroke-dasharray: 2;
+        }
+
+        .small .axis text { display: none; }
+        .small .axis .tick:first-of-type text { display: block; }
+        .small .axis .tick:last-of-type text { display: block; }
+        .medium .axis text { display: none; }
+        .medium .axis .tick:nth-child(2n + 1) text { display: block; }
+        .large .axis text { display: none; }
+        .large .axis .tick:nth-child(2n + 1) text { display: block; }
+
+      </style>
+    </template>
+
+    <script>
+    Polymer({
+      is: "vz-histogram-timeseries",
+      properties: {
+        /**
+         * Defines which view mode is being used by the chart. Supported values
+         * are:
+         * - "offset" - Offset view of the data showing all timesteps.
+         * - "overlay" - Overlays all timesteps into one 2D view, with the
+         * brighter lines representing the newer timesteps.
+         */
+        mode: {
+          type: String,
+          value: "offset"
+        },
+
+        /*
+         * The name of the datum's property that contains the time values.
+         * Allows:
+         * - "step" - Linear scale using the "step" property of the datum.
+         * - "wall_time" - Temporal scale using the "wall_time" property of the
+         * datum.
+         * - "relative" - Temporal scale starting at 0 created by using
+         * the "wall_time" property of the datum.
+         */
+        timeProperty: {
+          type: String,
+          value: "step"
+        },
+
+        /**
+         * The name of the data's property that contains the bins.
+         */
+        bins: {
+          type: String,
+          value: "bins"
+        },
+
+        /**
+         * The name of the datum's property that contains the x values.
+         */
+        x: {
+          type: String,
+          value: "x"
+        },
+
+        /**
+         * The name of the datum's property that contains the bin width values.
+         */
+        dx: {
+          type: String,
+          value: "dx"
+        },
+
+        /**
+         * The name of the datum's property that contains the bin height.
+         */
+        y: {
+          type: String,
+          value: "y"
+        },
+
+        /**
+         * Scale that maps series names to colors. The default colors are from
+         * d3.schemeCategory10() scale. Use this property to replace the default
+         * line colors with colors of your own choice.
+         */
+        colorScale: {
+          type: Object,
+          value: function() {
+            return d3.scaleOrdinal(d3.schemeCategory10);
+          }
+        },
+
+        /**
+         * Duration of the transition between histogram modes.
+         */
+        modeTransitionDuration: {
+          type: Number,
+          value: 500
+        },
+
+        _attached: Boolean,
+        _name: { type: String, value: null },
+        _data: { type: Array, value: null },
+      },
+      observers: [
+        'redraw(timeProperty, _attached)',
+        '_modeRedraw(mode)'
+      ],
+      ready: function() {
+        // Polymer's way of scoping styles on nodes that d3 created
+        this.scopeSubtree(this.$.svg, true);
+      },
+      attached: function() {
+        this._attached = true;
+      },
+      detached: function() {
+        this._attached = false;
+      },
+      setVisibleSeries: function(names) {
+        // Do nothing.
+      },
+      setSeriesData: function(name, data) {
+        this._name = name;
+        this._data = data;
+        this.redraw();
+      },
+
+      /**
+       * Redraws the chart. This is only called if the chart is attached to the
+       * screen and if the chart has data.
+       */
+      redraw: function() {
+        this._draw(0);
+      },
+
+      _modeRedraw: function() {
+        this._draw(this.modeTransitionDuration);
+      },
+
+      _draw: function(duration) {
+        if (!this._attached || !this._data) {
+          return;
+        }
+
+        //
+        // Data verification
+        //
+        if (duration === undefined) throw(new Error("vz-histogram-timeseries _draw needs duration"));
+        if (this._data.length <= 0) throw(new Error("Not enough steps in the data"));
+        if (!this._data[0].hasOwnProperty(this.bins)) throw(new Error("No bins property of '" + this.bins + "' in data"));
+        if (this._data[0][this.bins].length <= 0) throw(new Error("Must have at least one bin in bins in data"));
+        if (!this._data[0][this.bins][0].hasOwnProperty(this.x)) throw(new Error("No x property '" + this.x + "' on bins data"));
+        if (!this._data[0][this.bins][0].hasOwnProperty(this.dx)) throw(new Error("No dx property '" + this.dx + "' on bins data"));
+        if (!this._data[0][this.bins][0].hasOwnProperty(this.y)) throw(new Error("No y property '" + this.y + "' on bins data"));
+
+        //
+        // Initialization
+        //
+        var timeProp = this.timeProperty;
+        var xProp = this.x;
+        var binsProp = this.bins;
+        var dxProp = this.dx;
+        var yProp = this.y;
+
+        var data = this._data;
+        var name = this._name;
+        var mode = this.mode;
+        var color = d3.hcl(this.colorScale(name));
+        var tooltip = d3.select(this.$.tooltip);
+
+        var xAccessor = function(d) { return d[xProp] };
+        var yAccessor = function(d) { return d[yProp] };
+        var dxAccessor = function(d) { return d[dxProp] };
+        var xRightAccessor = function(d) { return d[xProp] + d[dxProp] };
+        var timeAccessor = function(d) { return d[timeProp] };
+
+        if (timeProp === "relative") {
+          timeAccessor = function(d) { return d.wall_time - data[0].wall_time };
+        }
+
+        var brect = this.$.svg.getBoundingClientRect();
+        var outerWidth = brect.width,
+            outerHeight = brect.height;
+
+        var sliceHeight,
+            margin = {top: 5, right: 60, bottom: 20, left: 24};
+
+        if (mode === "offset") {
+          sliceHeight = outerHeight / 2.5;
+          margin.top = sliceHeight + 5;
+        } else {
+          sliceHeight = outerHeight - margin.top - margin.bottom;
+        }
+
+        var width = outerWidth - margin.left - margin.right,
+            height = outerHeight - margin.top - margin.bottom;
+
+        var leftMin = d3.min(data, xAccessor),
+            rightMax = d3.max(data, xRightAccessor);
+
+        //
+        // Text formatters
+        //
+        var format = d3.format(".3n");
+        var yAxisFormat = d3.format(".0f");
+
+        if (timeProp === "wall_time") {
+          yAxisFormat = d3.timeFormat("%m/%d %X");
+        } else if (timeProp === "relative") {
+          yAxisFormat = function(d) {
+            return d3.format(".1r")(d / 3.6e6) + 'h'; // Convert to hours.
+          };
+        }
+
+        //
+        // Calculate the extents
+        //
+        var xExtents = data.map(function(d, i) {
+          return [
+            d3.min(d[binsProp], xAccessor),
+            d3.max(d[binsProp], xRightAccessor)
+          ];
+        });
+        var yExtents = data.map(function(d) {
+          return d3.extent(d[binsProp], yAccessor);
+        });
+
+        //
+        // Scales and axis
+        //
+        var outlineCanvasSize = 500;
+
+        var extent = d3.extent(data, timeAccessor);
+
+        var yScale = (timeProp === "wall_time" ? d3.scaleTime() : d3.scaleLinear())
+            .domain(extent)
+            .range([0, (mode === "offset" ? height : 0)]);
+
+        var ySliceScale = d3.scaleLinear()
+            .domain([0, d3.max(data, function(d, i) { return yExtents[i][1]; })])
+            .range([sliceHeight, 0]);
+
+        var yLineScale = d3.scaleLinear()
+            .domain(ySliceScale.domain())
+            .range([outlineCanvasSize, 0]);
+
+        var xScale = d3.scaleLinear()
+            .domain([
+              d3.min(data, function(d, i) { return xExtents[i][0]; }),
+              d3.max(data, function(d, i) { return xExtents[i][1]; })
+            ])
+            .nice()
+            .range([0, width]);
+
+        var xLineScale = d3.scaleLinear()
+            .domain(xScale.domain())
+            .range([0, outlineCanvasSize]);
+
+        var outlineColor = d3.scaleLinear()
+            .domain(d3.extent(data, timeAccessor))
+            .range([color.darker(), color.brighter()])
+            .interpolate(d3.interpolateHcl);
+
+        var xAxis = d3.axisBottom(xScale).ticks(Math.max(2, width / 20));
+
+        var yAxis = d3.axisRight(yScale)
+            .ticks(Math.max(2, height / 15))
+            .tickFormat(yAxisFormat);
+
+
+
+        var ySliceAxis = d3.axisRight(ySliceScale)
+            .ticks(Math.max(2, height / 15))
+            .tickSize(width + 5)
+            .tickFormat(format);
+
+        var xBinCentroid = function(d) {
+          return d[xProp] + d[dxProp] / 2;
+        };
+
+        var linePath = d3.line()
+            .x(function(d) { return xLineScale(xBinCentroid(d)); })
+            .y(function(d) { return yLineScale(d[yProp]); });
+
+        var path = function(d) {
+          // Draw a line from 0 to the first point and from the last point to 0.
+          return 'M' + xLineScale(xBinCentroid(d[0])) + ',' + yLineScale(0) +
+              'L' + linePath(d).slice(1) +
+              "L" + xLineScale(xBinCentroid(d[d.length - 1])) + "," + yLineScale(0);
+        };
+
+        //
+        // Render
+        //
+        var svgNode = this.$.svg;
+
+        var svg = d3.select(svgNode)
+
+        var svgTransition = svg.transition().duration(duration);
+
+        var g = svg.select("g")
+            .classed("small", function() { return (width > 0 && width <= 150); })
+            .classed("medium", function() { return (width > 150 && width <= 300); })
+            .classed("large", function() { return (width > 300); })
+
+        var gTransition = svgTransition.select("g")
+            .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+        var bisect = d3.bisector(xRightAccessor).left;
+        var stage = g.select(".stage")
+            .on("mouseover", function() {
+              hoverUpdate.style("opacity", 1);
+              xAxisHoverUpdate.style("opacity", 1);
+              yAxisHoverUpdate.style("opacity", 1);
+              ySliceAxisHoverUpdate.style("opacity", 1);
+              tooltip.style("opacity", 1);
+            })
+            .on("mouseout", function() {
+              hoverUpdate.style("opacity", 0);
+              xAxisHoverUpdate.style("opacity", 0);
+              yAxisHoverUpdate.style("opacity", 0);
+              ySliceAxisHoverUpdate.style("opacity", 0);
+              hoverUpdate.classed("hover-closest", false);
+              outlineUpdate.classed("outline-hover", false);
+              tooltip.style("opacity", 0);
+            })
+            .on("mousemove", onMouseMove);
+
+        var background = stage.select(".background")
+            .attr("transform", "translate(" + -margin.left + "," + -margin.top + ")")
+            .attr("width", outerWidth)
+            .attr("height", outerHeight);
+
+        var histogram = stage.selectAll(".histogram").data(data),
+            histogramExit = histogram.exit().remove(),
+            histogramEnter = histogram.enter().append("g").attr("class", "histogram"),
+            histogramUpdate = histogramEnter.merge(histogram)
+                .sort(function(a, b) { return timeAccessor(a) - timeAccessor(b); }),
+            histogramTransition = gTransition.selectAll(".histogram")
+                .attr("transform", function(d) {
+                  return "translate(0, " +
+                    (mode === "offset" ? (yScale(timeAccessor(d)) - sliceHeight) : 0) + ")";
+                });
+
+        var baselineEnter = histogramEnter.append("line").attr("class", "baseline"),
+            baselineUpdate = histogramTransition.select(".baseline")
+                .style("stroke-opacity", function(d) { return (mode === "offset" ? 0.1 : 0); })
+                .attr("y1", sliceHeight)
+                .attr("y2", sliceHeight)
+                .attr("x2", width);
+
+        var outlineEnter = histogramEnter.append("path").attr("class", "outline"),
+            outlineUpdate = histogramUpdate.select(".outline")
+                .attr("vector-effect", "non-scaling-stroke")
+                .attr("d", function(d) { return path(d[binsProp]); })
+                .style("stroke-width", 1),
+            outlineTransition = histogramTransition.select(".outline")
+                .attr("transform", "scale(" + width / outlineCanvasSize + ", " +
+                      sliceHeight / outlineCanvasSize + ")")
+                .style("stroke", function(d) {
+                  return (mode === "offset" ? "white" : outlineColor(timeAccessor(d)));
+                })
+                .style("fill-opacity", function(d) { return (mode === "offset" ? 1 : 0); })
+                .style("fill", function(d) { return outlineColor(timeAccessor(d)); });
+
+        var hoverEnter = histogramEnter.append("g")
+                .attr("class", "hover")
+                .style("fill", function(d) { return outlineColor(timeAccessor(d)); }),
+            hoverUpdate = histogramUpdate.select(".hover");
+
+        hoverEnter.append("circle")
+            .attr("r", 2);
+
+        hoverEnter.append("text")
+            .style("display", "none")
+            .attr("dx", 4);
+
+        var xAxisHover = g.select(".x-axis-hover").selectAll(".label").data(["x"]),
+            xAxisHoverEnter = xAxisHover.enter().append("g").attr("class", "label"),
+            xAxisHoverUpdate = xAxisHover.merge(xAxisHoverEnter);
+
+        xAxisHoverEnter.append("rect")
+            .attr("x", -20)
+            .attr("y", 6)
+            .attr("width", 40)
+            .attr("height", 14)
+
+        xAxisHoverEnter.append("line")
+            .attr("x1", 0)
+            .attr("x2", 0)
+            .attr("y1", 0)
+            .attr("y2", 6);
+
+        xAxisHoverEnter.append("text")
+            .attr("dy", 18);
+
+        var yAxisHover = g.select(".y-axis-hover").selectAll(".label").data(["y"]),
+            yAxisHoverEnter = yAxisHover.enter().append("g").attr("class", "label"),
+            yAxisHoverUpdate = yAxisHover.merge(yAxisHoverEnter);
+
+        yAxisHoverEnter.append("rect")
+            .attr("x", 8)
+            .attr("y", -6)
+            .attr("width", 40)
+            .attr("height", 14)
+
+        yAxisHoverEnter.append("line")
+            .attr("x1", 0)
+            .attr("x2", 6)
+            .attr("y1", 0)
+            .attr("y2", 0);
+
+        yAxisHoverEnter.append("text")
+            .attr("dx", 8)
+            .attr("dy", 4);
+
+        var ySliceAxisHover = g.select(".y-slice-axis-hover").selectAll(".label").data(["y"]),
+            ySliceAxisHoverEnter = ySliceAxisHover.enter().append("g").attr("class", "label"),
+            ySliceAxisHoverUpdate = ySliceAxisHover.merge(ySliceAxisHoverEnter);
+
+        ySliceAxisHoverEnter.append("rect")
+            .attr("x", 8)
+            .attr("y", -6)
+            .attr("width", 40)
+            .attr("height", 14)
+
+        ySliceAxisHoverEnter.append("line")
+            .attr("x1", 0)
+            .attr("x2", 6)
+            .attr("y1", 0)
+            .attr("y2", 0);
+
+        ySliceAxisHoverEnter.append("text")
+            .attr("dx", 8)
+            .attr("dy", 4);
+
+        gTransition.select(".y.axis.slice")
+            .style("opacity", mode === "offset" ? 0 : 1)
+            .attr("transform", "translate(0, " + (mode === "offset" ? -sliceHeight : 0) + ")")
+            .call(ySliceAxis);
+
+        gTransition.select(".x.axis")
+            .attr("transform", "translate(0, " + height + ")")
+            .call(xAxis);
+
+        gTransition.select(".y.axis")
+            .style("opacity", mode === "offset" ? 1 : 0)
+            .attr("transform", "translate(" + width + ", " + (mode === "offset" ? 0 : height) + ")")
+            .call(yAxis);
+
+        gTransition.selectAll(".tick text")
+            .attr("fill", "#aaa");
+        gTransition.selectAll(".axis path.domain").attr("stroke", "none");
+
+
+        function onMouseMove() {
+          var m = d3.mouse(this),
+              v = xScale.invert(m[0]),
+              t = yScale.invert(m[1]);
+
+          function hoverXIndex(d) {
+            return Math.min(d[binsProp].length - 1, bisect(d[binsProp], v));
+          }
+          var closestSliceData;
+          var closestSliceDistance = Infinity;
+          var lastSliceData;
+          hoverUpdate
+            .attr("transform", function(d, i) {
+              var index = hoverXIndex(d);
+              lastSliceData = d;
+              var x = xScale(d[binsProp][index][xProp] + d[binsProp][index][dxProp] / 2);
+              var y = ySliceScale(d[binsProp][index][yProp]);
+              var globalY = (mode === "offset" ? yScale(timeAccessor(d)) - (sliceHeight - y) : y);
+              var dist = Math.abs(m[1] - globalY);
+              if (dist < closestSliceDistance) {
+                closestSliceDistance = dist;
+                closestSliceData = d;
+              }
+              return "translate(" + x + "," + y + ")";
+            });
+          hoverUpdate.select("text").text(function(d) {
+            var index = hoverXIndex(d);
+            return d[binsProp][index][yProp];
+          })
+          hoverUpdate.classed("hover-closest", function(d) { return d === closestSliceData; });
+          outlineUpdate.classed("outline-hover", function(d) { return d === closestSliceData; });
+
+          var index = hoverXIndex(lastSliceData);
+
+          xAxisHoverUpdate
+              .attr("transform", function(d) {
+                return "translate(" +
+                  xScale(lastSliceData[binsProp][index][xProp] +
+                         lastSliceData[binsProp][index][dxProp] / 2) + ", " +
+                  height + ")";
+              })
+            .select("text")
+              .text(function(d) { return format(lastSliceData[binsProp][index][xProp] +
+                                                lastSliceData[binsProp][index][dxProp] / 2); });
+
+          var fy = yAxis.tickFormat();
+          yAxisHoverUpdate
+              .attr("transform", function(d) {
+                return "translate(" + width + ", " +
+                  (mode === "offset" ? yScale(timeAccessor(closestSliceData)) : 0) + ")";
+              })
+              .style("display", mode === "offset" ? "" : "none")
+            .select("text")
+              .text(function(d) { return fy(timeAccessor(closestSliceData));});
+
+          var fsy = ySliceAxis.tickFormat();
+          ySliceAxisHoverUpdate
+              .attr("transform", function(d) {
+                return "translate(" + width + ", " +
+                  (mode === "offset" ? 0 : ySliceScale(closestSliceData[binsProp][index][yProp])) +
+                  ")";
+              })
+              .style("display", mode === "offset" ? "none" : "")
+            .select("text")
+              .text(function(d) { return fsy(closestSliceData[binsProp][index][yProp]); });
+
+          var svgMouse = d3.mouse(svgNode);
+          tooltip.style("transform", "translate(" + (svgMouse[0] + 15) + "px," +
+              (svgMouse[1] - 15) + "px)")
+            .select('span')
+            .text(mode === "offset" ?
+                fsy(closestSliceData[binsProp][index][yProp]) :
+                (timeProp === "step" ? "step " : "") +
+                fy(timeAccessor(closestSliceData)));
+        }
+      }
+    });
+    </script>
+
+  </dom-module>
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
new file mode 100644
index 0000000000..39c60886cd
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
@@ -0,0 +1,67 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load(
+    "//javascript/typescript:build_defs.bzl",
+    "ts_development_sources",
+    "ts_library",
+    "ts_devserver",
+)
+load(
+    "//third_party/javascript/polymer/build_defs:build_defs.bzl",
+    "webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+ts_library(
+    name = "ts",
+    srcs = [
+        "dragZoomInteraction.ts",
+        "vz-chart-helpers.ts",
+        "vz-line-chart.ts",
+    ],
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps_d3v4",
+        "//third_party/javascript/lodash:lodash-module",
+        "//third_party/javascript/plottable/v3:bundle",
+    ],
+)
+
+webcomponent_library(
+    name = "vz_line_chart",
+    srcs = [
+        "vz-line-chart.html",
+    ],
+    ts_lib_deps = [":ts"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/plottable/v3:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+webcomponent_library(
+    name = "demo",
+    srcs = ["demo.html"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":vz_line_chart",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+    ],
+)
+
+ts_devserver(
+    name = "devserver",
+    manifest = ":dev_sources",
+    serving_path = "/demo_out/bundle.js",
+    static_files = [":demo"],
+)
+
+ts_development_sources(
+    name = "dev_sources",
+    deps = [
+        ":ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/demo.html b/tensorflow/tensorboard/components/vz_line_chart_d3v4/demo.html
new file mode 100644
index 0000000000..4293e9791e
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/demo.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>vz-line-chart demo</title>
+    <link rel="import" href="vz-line-chart.html">
+    <link rel="import" href="iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="paper-styles/typography.html">
+    <script src="bundle.js"></script>
+    <style type="text/css">
+      body {
+        font-family: "Roboto";
+      }
+
+      vz-line-chart {
+        height: 400px;
+      }
+    </style>
+  </head>
+  <body>
+    <h3>Simple line chart</h3>
+    <demo-snippet>
+      <template>
+        <vz-line-chart id="simpleline"></vz-line-chart>
+        <script>
+          var elem = document.querySelector('#simpleline');
+          elem.setVisibleSeries(['test', 'train']);
+          elem.setSeriesData('test', data.test);
+          elem.setSeriesData('train', data.train);
+        </script>
+      </template>
+    </demo-snippet>
+
+    <h3>Exponential Smoothing enabled</h3>
+    <demo-snippet>
+      <template>
+        <vz-line-chart id="smoothedline"></vz-line-chart>
+        <script>
+          var elem = document.querySelector('#smoothedline');
+          elem.smoothingEnabled = true;
+          elem.setVisibleSeries(['test', 'train']);
+          elem.setSeriesData('test', data.test);
+          elem.setSeriesData('train', data.train);
+        </script>
+      </template>
+    </demo-snippet>
+
+    <script>
+      var data = {
+        "test": [{"scalar":0.07039999961853027,"wall_time":new Date("2016-06-24T04:13:01.295Z"),"step":0},{"scalar":0.6891000270843506,"wall_time":new Date("2016-06-24T04:13:05.909Z"),"step":10},{"scalar":0.8208000063896179,"wall_time":new Date("2016-06-24T04:13:10.318Z"),"step":20},{"scalar":0.8554999828338623,"wall_time":new Date("2016-06-24T04:13:14.794Z"),"step":30},{"scalar":0.8776000142097473,"wall_time":new Date("2016-06-24T04:13:19.166Z"),"step":40},{"scalar":0.8848999738693237,"wall_time":new Date("2016-06-24T04:13:23.603Z"),"step":50},{"scalar":0.8906000256538391,"wall_time":new Date("2016-06-24T04:13:27.931Z"),"step":60},{"scalar":0.8853999972343445,"wall_time":new Date("2016-06-24T04:13:32.281Z"),"step":70},{"scalar":0.8848999738693237,"wall_time":new Date("2016-06-24T04:13:36.636Z"),"step":80},{"scalar":0.8985999822616577,"wall_time":new Date("2016-06-24T04:13:41.070Z"),"step":90},{"scalar":0.9057000279426575,"wall_time":new Date("2016-06-24T04:13:45.475Z"),"step":100},{"scalar":0.9136000275611877,"wall_time":new Date("2016-06-24T04:13:49.947Z"),"step":110},{"scalar":0.919700026512146,"wall_time":new Date("2016-06-24T04:13:54.384Z"),"step":120},{"scalar":0.9182000160217285,"wall_time":new Date("2016-06-24T04:13:58.790Z"),"step":130},{"scalar":0.9282000064849854,"wall_time":new Date("2016-06-24T04:14:03.180Z"),"step":140},{"scalar":0.9218999743461609,"wall_time":new Date("2016-06-24T04:14:08.060Z"),"step":150},{"scalar":0.9294000267982483,"wall_time":new Date("2016-06-24T04:14:12.520Z"),"step":160},{"scalar":0.9261000156402588,"wall_time":new Date("2016-06-24T04:14:16.893Z"),"step":170},{"scalar":0.9236999750137329,"wall_time":new Date("2016-06-24T04:14:21.653Z"),"step":180},{"scalar":0.925000011920929,"wall_time":new Date("2016-06-24T04:14:26.065Z"),"step":190},{"scalar":0.9319000244140625,"wall_time":new Date("2016-06-24T04:14:30.430Z"),"step":200},{"scalar":0.933899998664856,"wall_time":new Date("2016-06-24T04:14:34.815Z"),"step":210},{"scalar":0.9347000122070312,"wall_time":new Date("2016-06-24T04:14:39.179Z"),"step":220},{"scalar":0.9341999888420105,"wall_time":new Date("2016-06-24T04:14:43.562Z"),"step":230},{"scalar":0.933899998664856,"wall_time":new Date("2016-06-24T04:14:47.953Z"),"step":240},{"scalar":0.9254000186920166,"wall_time":new Date("2016-06-24T04:14:52.322Z"),"step":250},{"scalar":0.9383000135421753,"wall_time":new Date("2016-06-24T04:14:56.703Z"),"step":260},{"scalar":0.9391999840736389,"wall_time":new Date("2016-06-24T04:15:01.046Z"),"step":270},{"scalar":0.9336000084877014,"wall_time":new Date("2016-06-24T04:15:05.458Z"),"step":280},{"scalar":0.9404000043869019,"wall_time":new Date("2016-06-24T04:15:10.438Z"),"step":290},{"scalar":0.944100022315979,"wall_time":new Date("2016-06-24T04:15:15.026Z"),"step":300},{"scalar":0.9401000142097473,"wall_time":new Date("2016-06-24T04:15:19.417Z"),"step":310},{"scalar":0.9394999742507935,"wall_time":new Date("2016-06-24T04:15:23.985Z"),"step":320},{"scalar":0.9438999891281128,"wall_time":new Date("2016-06-24T04:15:28.418Z"),"step":330},{"scalar":0.9478999972343445,"wall_time":new Date("2016-06-24T04:15:32.844Z"),"step":340},{"scalar":0.9470999836921692,"wall_time":new Date("2016-06-24T04:15:37.359Z"),"step":350},{"scalar":0.9423999786376953,"wall_time":new Date("2016-06-24T04:15:41.803Z"),"step":360},{"scalar":0.9472000002861023,"wall_time":new Date("2016-06-24T04:15:46.167Z"),"step":370},{"scalar":0.9491999745368958,"wall_time":new Date("2016-06-24T04:15:50.558Z"),"step":380},{"scalar":0.9458000063896179,"wall_time":new Date("2016-06-24T04:15:54.942Z"),"step":390},{"scalar":0.9442999958992004,"wall_time":new Date("2016-06-24T04:15:59.343Z"),"step":400},{"scalar":0.946399986743927,"wall_time":new Date("2016-06-24T04:16:03.703Z"),"step":410},{"scalar":0.947700023651123,"wall_time":new Date("2016-06-24T04:16:08.102Z"),"step":420},{"scalar":0.9451000094413757,"wall_time":new Date("2016-06-24T04:16:13.379Z"),"step":430},{"scalar":0.9532999992370605,"wall_time":new Date("2016-06-24T04:16:17.962Z"),"step":440},{"scalar":0.9496999979019165,"wall_time":new Date("2016-06-24T04:16:22.320Z"),"step":450},{"scalar":0.9513000249862671,"wall_time":new Date("2016-06-24T04:16:26.712Z"),"step":460},{"scalar":0.9488999843597412,"wall_time":new Date("2016-06-24T04:16:31.099Z"),"step":470},{"scalar":0.9520000219345093,"wall_time":new Date("2016-06-24T04:16:35.760Z"),"step":480},{"scalar":0.9516000151634216,"wall_time":new Date("2016-06-24T04:16:40.239Z"),"step":490},{"scalar":0.9537000060081482,"wall_time":new Date("2016-06-24T04:16:44.620Z"),"step":500},{"scalar":0.9528999924659729,"wall_time":new Date("2016-06-24T04:16:49.273Z"),"step":510},{"scalar":0.9502999782562256,"wall_time":new Date("2016-06-24T04:16:53.640Z"),"step":520},{"scalar":0.9573000073432922,"wall_time":new Date("2016-06-24T04:16:58.612Z"),"step":530},{"scalar":0.9550999999046326,"wall_time":new Date("2016-06-24T04:17:03.089Z"),"step":540},{"scalar":0.9563000202178955,"wall_time":new Date("2016-06-24T04:17:07.481Z"),"step":550},{"scalar":0.9563000202178955,"wall_time":new Date("2016-06-24T04:17:11.866Z"),"step":560},{"scalar":0.9599000215530396,"wall_time":new Date("2016-06-24T04:17:16.456Z"),"step":570},{"scalar":0.9588000178337097,"wall_time":new Date("2016-06-24T04:17:20.983Z"),"step":580},{"scalar":0.9569000005722046,"wall_time":new Date("2016-06-24T04:17:25.996Z"),"step":590},{"scalar":0.9585999846458435,"wall_time":new Date("2016-06-24T04:17:30.417Z"),"step":600},{"scalar":0.9555000066757202,"wall_time":new Date("2016-06-24T04:17:35.164Z"),"step":610},{"scalar":0.9567999839782715,"wall_time":new Date("2016-06-24T04:17:39.714Z"),"step":620},{"scalar":0.9616000056266785,"wall_time":new Date("2016-06-24T04:17:44.105Z"),"step":630},{"scalar":0.9603999853134155,"wall_time":new Date("2016-06-24T04:17:48.826Z"),"step":640},{"scalar":0.9605000019073486,"wall_time":new Date("2016-06-24T04:17:53.419Z"),"step":650},{"scalar":0.9627000093460083,"wall_time":new Date("2016-06-24T04:17:58.026Z"),"step":660},{"scalar":0.9639999866485596,"wall_time":new Date("2016-06-24T04:18:02.698Z"),"step":670},{"scalar":0.9613999724388123,"wall_time":new Date("2016-06-24T04:18:07.960Z"),"step":680},{"scalar":0.9599000215530396,"wall_time":new Date("2016-06-24T04:18:12.458Z"),"step":690},{"scalar":0.9617999792098999,"wall_time":new Date("2016-06-24T04:18:16.835Z"),"step":700},{"scalar":0.9635000228881836,"wall_time":new Date("2016-06-24T04:18:21.232Z"),"step":710},{"scalar":0.9641000032424927,"wall_time":new Date("2016-06-24T04:18:25.888Z"),"step":720},{"scalar":0.9628000259399414,"wall_time":new Date("2016-06-24T04:18:30.372Z"),"step":730},{"scalar":0.9656000137329102,"wall_time":new Date("2016-06-24T04:18:34.751Z"),"step":740},{"scalar":0.9642000198364258,"wall_time":new Date("2016-06-24T04:18:39.368Z"),"step":750},{"scalar":0.9646000266075134,"wall_time":new Date("2016-06-24T04:18:44.267Z"),"step":760},{"scalar":0.9617000222206116,"wall_time":new Date("2016-06-24T04:18:48.829Z"),"step":770},{"scalar":0.9657999873161316,"wall_time":new Date("2016-06-24T04:18:53.466Z"),"step":780},{"scalar":0.9667999744415283,"wall_time":new Date("2016-06-24T04:18:57.893Z"),"step":790},{"scalar":0.967199981212616,"wall_time":new Date("2016-06-24T04:19:02.601Z"),"step":800},{"scalar":0.9646999835968018,"wall_time":new Date("2016-06-24T04:19:07.657Z"),"step":810},{"scalar":0.9670000076293945,"wall_time":new Date("2016-06-24T04:19:12.331Z"),"step":820},{"scalar":0.96670001745224,"wall_time":new Date("2016-06-24T04:19:17.223Z"),"step":830},{"scalar":0.9668999910354614,"wall_time":new Date("2016-06-24T04:19:21.980Z"),"step":840},{"scalar":0.965399980545044,"wall_time":new Date("2016-06-24T04:19:26.352Z"),"step":850},{"scalar":0.9671000242233276,"wall_time":new Date("2016-06-24T04:19:30.764Z"),"step":860},{"scalar":0.9671000242233276,"wall_time":new Date("2016-06-24T04:19:35.244Z"),"step":870},{"scalar":0.9642000198364258,"wall_time":new Date("2016-06-24T04:19:39.620Z"),"step":880},{"scalar":0.9666000008583069,"wall_time":new Date("2016-06-24T04:19:43.979Z"),"step":890},{"scalar":0.9664999842643738,"wall_time":new Date("2016-06-24T04:19:48.337Z"),"step":900},{"scalar":0.9678000211715698,"wall_time":new Date("2016-06-24T04:19:52.688Z"),"step":910},{"scalar":0.9678999781608582,"wall_time":new Date("2016-06-24T04:19:57.058Z"),"step":920},{"scalar":0.9674999713897705,"wall_time":new Date("2016-06-24T04:20:01.415Z"),"step":930},{"scalar":0.9684000015258789,"wall_time":new Date("2016-06-24T04:20:05.887Z"),"step":940},{"scalar":0.9672999978065491,"wall_time":new Date("2016-06-24T04:20:10.261Z"),"step":950},{"scalar":0.9696000218391418,"wall_time":new Date("2016-06-24T04:20:14.610Z"),"step":960},{"scalar":0.9706000089645386,"wall_time":new Date("2016-06-24T04:20:19.526Z"),"step":970},{"scalar":0.9688000082969666,"wall_time":new Date("2016-06-24T04:20:23.881Z"),"step":980},{"scalar":0.9699000120162964,"wall_time":new Date("2016-06-24T04:20:28.415Z"),"step":990,"name":"test","relative":0.1242}],
+        "train": [{"scalar":0.05999999865889549,"wall_time":new Date("2016-06-24T04:13:01.556Z"),"step":1},{"scalar":0.18000000715255737,"wall_time":new Date("2016-06-24T04:13:01.693Z"),"step":2},{"scalar":0.25,"wall_time":new Date("2016-06-24T04:13:01.833Z"),"step":3},{"scalar":0.28999999165534973,"wall_time":new Date("2016-06-24T04:13:01.964Z"),"step":4},{"scalar":0.3400000035762787,"wall_time":new Date("2016-06-24T04:13:02.109Z"),"step":5},{"scalar":0.5099999904632568,"wall_time":new Date("2016-06-24T04:13:02.249Z"),"step":6},{"scalar":0.550000011920929,"wall_time":new Date("2016-06-24T04:13:02.387Z"),"step":7},{"scalar":0.5600000023841858,"wall_time":new Date("2016-06-24T04:13:02.515Z"),"step":8},{"scalar":0.6700000166893005,"wall_time":new Date("2016-06-24T04:13:02.650Z"),"step":9},{"scalar":0.7599999904632568,"wall_time":new Date("2016-06-24T04:13:06.061Z"),"step":11},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:06.202Z"),"step":12},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:06.343Z"),"step":13},{"scalar":0.7599999904632568,"wall_time":new Date("2016-06-24T04:13:06.480Z"),"step":14},{"scalar":0.75,"wall_time":new Date("2016-06-24T04:13:06.618Z"),"step":15},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:06.763Z"),"step":16},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:06.897Z"),"step":17},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:07.027Z"),"step":18},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:07.167Z"),"step":19},{"scalar":0.7599999904632568,"wall_time":new Date("2016-06-24T04:13:10.461Z"),"step":21},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:10.602Z"),"step":22},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:10.748Z"),"step":23},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:10.894Z"),"step":24},{"scalar":0.6899999976158142,"wall_time":new Date("2016-06-24T04:13:11.034Z"),"step":25},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:11.173Z"),"step":26},{"scalar":0.8100000023841858,"wall_time":new Date("2016-06-24T04:13:11.315Z"),"step":27},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:11.455Z"),"step":28},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:11.590Z"),"step":29},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:14.931Z"),"step":31},{"scalar":0.8199999928474426,"wall_time":new Date("2016-06-24T04:13:15.069Z"),"step":32},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:15.199Z"),"step":33},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:13:15.329Z"),"step":34},{"scalar":0.8199999928474426,"wall_time":new Date("2016-06-24T04:13:15.466Z"),"step":35},{"scalar":0.7699999809265137,"wall_time":new Date("2016-06-24T04:13:15.610Z"),"step":36},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:15.746Z"),"step":37},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:15.876Z"),"step":38},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:16.010Z"),"step":39},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:19.296Z"),"step":41},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:19.435Z"),"step":42},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:19.567Z"),"step":43},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:19.696Z"),"step":44},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:19.833Z"),"step":45},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:19.972Z"),"step":46},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:20.111Z"),"step":47},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:20.239Z"),"step":48},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:20.370Z"),"step":49},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:23.731Z"),"step":51},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:23.869Z"),"step":52},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:24.000Z"),"step":53},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:24.129Z"),"step":54},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:24.256Z"),"step":55},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:24.391Z"),"step":56},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:24.529Z"),"step":57},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:24.663Z"),"step":58},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:24.792Z"),"step":59},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:13:28.072Z"),"step":61},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:13:28.212Z"),"step":62},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:28.340Z"),"step":63},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:28.477Z"),"step":64},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:13:28.610Z"),"step":65},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:28.751Z"),"step":66},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:13:28.875Z"),"step":67},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:29.003Z"),"step":68},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:29.137Z"),"step":69},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:32.418Z"),"step":71},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:32.552Z"),"step":72},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:32.685Z"),"step":73},{"scalar":0.8100000023841858,"wall_time":new Date("2016-06-24T04:13:32.817Z"),"step":74},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:32.942Z"),"step":75},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:33.077Z"),"step":76},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:33.213Z"),"step":77},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:33.347Z"),"step":78},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:33.489Z"),"step":79},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:36.766Z"),"step":81},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:36.902Z"),"step":82},{"scalar":0.8199999928474426,"wall_time":new Date("2016-06-24T04:13:37.042Z"),"step":83},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:37.187Z"),"step":84},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:37.319Z"),"step":85},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:37.460Z"),"step":86},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:37.595Z"),"step":87},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:37.730Z"),"step":88},{"scalar":0.7400000095367432,"wall_time":new Date("2016-06-24T04:13:37.866Z"),"step":89},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:41.201Z"),"step":91},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:41.334Z"),"step":92},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:41.480Z"),"step":93},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:41.618Z"),"step":94},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:41.755Z"),"step":95},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:41.885Z"),"step":96},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:42.022Z"),"step":97},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:42.145Z"),"step":98},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:42.271Z"),"step":99},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:45.616Z"),"step":101},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:45.751Z"),"step":102},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:45.882Z"),"step":103},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:46.031Z"),"step":104},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:46.169Z"),"step":105},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:46.302Z"),"step":106},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:46.443Z"),"step":107},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:46.578Z"),"step":108},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:46.720Z"),"step":109},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:50.080Z"),"step":111},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:50.219Z"),"step":112},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:50.351Z"),"step":113},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:50.495Z"),"step":114},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:50.622Z"),"step":115},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:50.761Z"),"step":116},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:50.894Z"),"step":117},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:13:51.027Z"),"step":118},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:51.167Z"),"step":119},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:54.523Z"),"step":121},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:54.649Z"),"step":122},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:54.813Z"),"step":123},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:54.958Z"),"step":124},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:13:55.097Z"),"step":125},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:13:55.232Z"),"step":126},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:13:55.363Z"),"step":127},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:55.491Z"),"step":128},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:55.619Z"),"step":129},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:58.923Z"),"step":131},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:59.051Z"),"step":132},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:59.183Z"),"step":133},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:13:59.316Z"),"step":134},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:59.443Z"),"step":135},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:13:59.583Z"),"step":136},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:13:59.712Z"),"step":137},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:59.840Z"),"step":138},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:59.978Z"),"step":139},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:03.306Z"),"step":141},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:03.443Z"),"step":142},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:14:03.572Z"),"step":143},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:03.700Z"),"step":144},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:03.834Z"),"step":145},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:03.964Z"),"step":146},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:04.104Z"),"step":147},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:04.265Z"),"step":148},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:04.470Z"),"step":149},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:08.189Z"),"step":151},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:08.328Z"),"step":152},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:08.462Z"),"step":153},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:08.594Z"),"step":154},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:08.725Z"),"step":155},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:08.859Z"),"step":156},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:08.998Z"),"step":157},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:09.132Z"),"step":158},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:09.268Z"),"step":159},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:12.667Z"),"step":161},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:12.803Z"),"step":162},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:12.935Z"),"step":163},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:13.068Z"),"step":164},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:13.199Z"),"step":165},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:13.333Z"),"step":166},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:13.462Z"),"step":167},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:13.591Z"),"step":168},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:13.719Z"),"step":169},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:17.038Z"),"step":171},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:17.166Z"),"step":172},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:17.302Z"),"step":173},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:17.430Z"),"step":174},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:17.565Z"),"step":175},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:14:17.700Z"),"step":176},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:14:17.844Z"),"step":177},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:18.013Z"),"step":178},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:18.164Z"),"step":179},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:21.786Z"),"step":181},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:21.915Z"),"step":182},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:22.054Z"),"step":183},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:22.187Z"),"step":184},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:22.317Z"),"step":185},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:22.442Z"),"step":186},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:22.583Z"),"step":187},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:22.718Z"),"step":188},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:22.849Z"),"step":189},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:14:26.199Z"),"step":191},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:26.327Z"),"step":192},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:26.462Z"),"step":193},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:26.591Z"),"step":194},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:14:26.721Z"),"step":195},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:26.857Z"),"step":196},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:26.989Z"),"step":197},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:27.118Z"),"step":198},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:27.251Z"),"step":199},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:30.566Z"),"step":201},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:30.696Z"),"step":202},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:30.831Z"),"step":203},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:30.965Z"),"step":204},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:31.105Z"),"step":205},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:31.234Z"),"step":206},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:31.369Z"),"step":207},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:31.498Z"),"step":208},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:31.646Z"),"step":209},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:34.956Z"),"step":211},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:35.097Z"),"step":212},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:35.225Z"),"step":213},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:35.361Z"),"step":214},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:35.486Z"),"step":215},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:35.618Z"),"step":216},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:35.747Z"),"step":217},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:14:35.879Z"),"step":218},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:14:36.019Z"),"step":219},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:39.310Z"),"step":221},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:39.439Z"),"step":222},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:39.580Z"),"step":223},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:39.713Z"),"step":224},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:39.854Z"),"step":225},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:39.988Z"),"step":226},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:40.117Z"),"step":227},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:40.244Z"),"step":228},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:40.376Z"),"step":229},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:43.701Z"),"step":231},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:43.852Z"),"step":232},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:43.988Z"),"step":233},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:44.127Z"),"step":234},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:44.261Z"),"step":235},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:44.394Z"),"step":236},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:44.535Z"),"step":237},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:44.663Z"),"step":238},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:44.803Z"),"step":239},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:48.092Z"),"step":241},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:14:48.234Z"),"step":242},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:48.374Z"),"step":243},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:48.503Z"),"step":244},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:48.635Z"),"step":245},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:14:48.768Z"),"step":246},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:48.895Z"),"step":247},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:49.037Z"),"step":248},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:49.169Z"),"step":249},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:52.450Z"),"step":251},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:52.582Z"),"step":252},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:52.712Z"),"step":253},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:52.850Z"),"step":254},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:52.982Z"),"step":255},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:53.112Z"),"step":256},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:53.244Z"),"step":257},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:53.377Z"),"step":258},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:53.501Z"),"step":259},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:56.842Z"),"step":261},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:56.973Z"),"step":262},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:57.101Z"),"step":263},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:57.229Z"),"step":264},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:57.360Z"),"step":265},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:57.491Z"),"step":266},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:57.629Z"),"step":267},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:14:57.770Z"),"step":268},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:57.898Z"),"step":269},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:01.199Z"),"step":271},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:01.330Z"),"step":272},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:01.455Z"),"step":273},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:01.579Z"),"step":274},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:01.716Z"),"step":275},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:01.838Z"),"step":276},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:01.966Z"),"step":277},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:02.103Z"),"step":278},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:02.233Z"),"step":279},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:05.608Z"),"step":281},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:05.733Z"),"step":282},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:05.870Z"),"step":283},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:05.999Z"),"step":284},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:06.136Z"),"step":285},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:06.266Z"),"step":286},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:06.397Z"),"step":287},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:06.525Z"),"step":288},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:06.656Z"),"step":289},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:10.573Z"),"step":291},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:10.702Z"),"step":292},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:15:10.837Z"),"step":293},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:10.968Z"),"step":294},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:11.109Z"),"step":295},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:11.242Z"),"step":296},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:11.376Z"),"step":297},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:11.505Z"),"step":298},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:11.645Z"),"step":299},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:15.160Z"),"step":301},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:15.308Z"),"step":302},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:15.440Z"),"step":303},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:15:15.565Z"),"step":304},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:15:15.696Z"),"step":305},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:15.826Z"),"step":306},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:15.961Z"),"step":307},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:16.097Z"),"step":308},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:16.226Z"),"step":309},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:19.556Z"),"step":311},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:19.686Z"),"step":312},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:19.826Z"),"step":313},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:19.954Z"),"step":314},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:15:20.093Z"),"step":315},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:20.230Z"),"step":316},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:20.358Z"),"step":317},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:15:20.490Z"),"step":318},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:20.621Z"),"step":319},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:15:24.128Z"),"step":321},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:24.259Z"),"step":322},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:24.399Z"),"step":323},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:24.536Z"),"step":324},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:24.663Z"),"step":325},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:24.792Z"),"step":326},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:24.924Z"),"step":327},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:25.055Z"),"step":328},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:25.192Z"),"step":329},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:28.553Z"),"step":331},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:28.709Z"),"step":332},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:28.848Z"),"step":333},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:28.980Z"),"step":334},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:29.109Z"),"step":335},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:29.243Z"),"step":336},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:29.375Z"),"step":337},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:29.515Z"),"step":338},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:29.655Z"),"step":339},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:32.974Z"),"step":341},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:33.098Z"),"step":342},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:33.234Z"),"step":343},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:33.383Z"),"step":344},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:33.544Z"),"step":345},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:33.710Z"),"step":346},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:33.860Z"),"step":347},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:34.008Z"),"step":348},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:34.150Z"),"step":349},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:37.499Z"),"step":351},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:37.638Z"),"step":352},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:37.775Z"),"step":353},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:37.908Z"),"step":354},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:38.042Z"),"step":355},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:38.174Z"),"step":356},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:38.313Z"),"step":357},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:38.444Z"),"step":358},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:15:38.581Z"),"step":359},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:15:41.935Z"),"step":361},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:42.074Z"),"step":362},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:42.194Z"),"step":363},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:42.325Z"),"step":364},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:42.463Z"),"step":365},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:42.605Z"),"step":366},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:42.730Z"),"step":367},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:42.858Z"),"step":368},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:42.998Z"),"step":369},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:46.303Z"),"step":371},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:15:46.436Z"),"step":372},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:46.568Z"),"step":373},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:46.708Z"),"step":374},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:46.839Z"),"step":375},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:46.971Z"),"step":376},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:47.102Z"),"step":377},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:47.236Z"),"step":378},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:47.379Z"),"step":379},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:50.684Z"),"step":381},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:15:50.815Z"),"step":382},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:50.956Z"),"step":383},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:51.090Z"),"step":384},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:51.232Z"),"step":385},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:51.365Z"),"step":386},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:51.503Z"),"step":387},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:51.643Z"),"step":388},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:51.777Z"),"step":389},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:55.084Z"),"step":391},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:55.220Z"),"step":392},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:55.354Z"),"step":393},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:55.486Z"),"step":394},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:55.625Z"),"step":395},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:55.763Z"),"step":396},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:55.899Z"),"step":397},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:56.036Z"),"step":398},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:56.180Z"),"step":399},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:59.479Z"),"step":401},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:59.604Z"),"step":402},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:59.745Z"),"step":403},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:59.875Z"),"step":404},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:00.005Z"),"step":405},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:00.138Z"),"step":406},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:00.277Z"),"step":407},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:00.402Z"),"step":408},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:00.538Z"),"step":409},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:03.851Z"),"step":411},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:03.985Z"),"step":412},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:04.118Z"),"step":413},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:04.248Z"),"step":414},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:04.376Z"),"step":415},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:04.515Z"),"step":416},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:04.641Z"),"step":417},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:04.770Z"),"step":418},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:04.905Z"),"step":419},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:08.228Z"),"step":421},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:16:08.358Z"),"step":422},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:08.500Z"),"step":423},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:08.639Z"),"step":424},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:08.766Z"),"step":425},{"scalar":1,"wall_time":new Date("2016-06-24T04:16:08.903Z"),"step":426},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:09.042Z"),"step":427},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:09.172Z"),"step":428},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:09.310Z"),"step":429},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:13.517Z"),"step":431},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:13.682Z"),"step":432},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:13.835Z"),"step":433},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:13.975Z"),"step":434},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:14.131Z"),"step":435},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:14.280Z"),"step":436},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:14.434Z"),"step":437},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:14.584Z"),"step":438},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:14.730Z"),"step":439},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:18.093Z"),"step":441},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:18.230Z"),"step":442},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:18.359Z"),"step":443},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:18.501Z"),"step":444},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:18.632Z"),"step":445},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:18.765Z"),"step":446},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:18.894Z"),"step":447},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:19.032Z"),"step":448},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:19.160Z"),"step":449},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:16:22.445Z"),"step":451},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:22.584Z"),"step":452},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:22.711Z"),"step":453},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:22.858Z"),"step":454},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:23.006Z"),"step":455},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:23.138Z"),"step":456},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:23.274Z"),"step":457},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:23.417Z"),"step":458},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:23.543Z"),"step":459},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:26.832Z"),"step":461},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:26.962Z"),"step":462},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:27.093Z"),"step":463},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:27.230Z"),"step":464},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:27.371Z"),"step":465},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:27.495Z"),"step":466},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:27.620Z"),"step":467},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:27.759Z"),"step":468},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:27.885Z"),"step":469},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:31.227Z"),"step":471},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:16:31.354Z"),"step":472},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:31.484Z"),"step":473},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:31.629Z"),"step":474},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:31.764Z"),"step":475},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:31.898Z"),"step":476},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:32.032Z"),"step":477},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:32.157Z"),"step":478},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:32.288Z"),"step":479},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:35.896Z"),"step":481},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:36.024Z"),"step":482},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:36.163Z"),"step":483},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:36.297Z"),"step":484},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:36.428Z"),"step":485},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:36.561Z"),"step":486},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:36.695Z"),"step":487},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:36.828Z"),"step":488},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:16:36.959Z"),"step":489},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:40.381Z"),"step":491},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:40.508Z"),"step":492},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:40.647Z"),"step":493},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:40.782Z"),"step":494},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:16:40.920Z"),"step":495},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:41.053Z"),"step":496},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:41.186Z"),"step":497},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:41.311Z"),"step":498},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:41.458Z"),"step":499},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:44.767Z"),"step":501},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:44.902Z"),"step":502},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:45.039Z"),"step":503},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:45.170Z"),"step":504},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:45.306Z"),"step":505},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:45.440Z"),"step":506},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:45.584Z"),"step":507},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:45.718Z"),"step":508},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:45.853Z"),"step":509},{"scalar":1,"wall_time":new Date("2016-06-24T04:16:49.414Z"),"step":511},{"scalar":1,"wall_time":new Date("2016-06-24T04:16:49.556Z"),"step":512},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:49.690Z"),"step":513},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:49.821Z"),"step":514},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:49.950Z"),"step":515},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:50.080Z"),"step":516},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:50.209Z"),"step":517},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:50.344Z"),"step":518},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:50.476Z"),"step":519},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:53.771Z"),"step":521},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:53.903Z"),"step":522},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:54.039Z"),"step":523},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:54.178Z"),"step":524},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:54.303Z"),"step":525},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:54.430Z"),"step":526},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:54.553Z"),"step":527},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:54.687Z"),"step":528},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:54.811Z"),"step":529},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:58.763Z"),"step":531},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:58.904Z"),"step":532},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:59.050Z"),"step":533},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:59.178Z"),"step":534},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:59.314Z"),"step":535},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:59.446Z"),"step":536},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:59.585Z"),"step":537},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:59.712Z"),"step":538},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:59.844Z"),"step":539},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:03.217Z"),"step":541},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:03.350Z"),"step":542},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:03.480Z"),"step":543},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:17:03.612Z"),"step":544},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:03.742Z"),"step":545},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:03.889Z"),"step":546},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:04.032Z"),"step":547},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:04.171Z"),"step":548},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:04.306Z"),"step":549},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:07.617Z"),"step":551},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:07.751Z"),"step":552},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:07.887Z"),"step":553},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:08.024Z"),"step":554},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:08.164Z"),"step":555},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:08.296Z"),"step":556},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:08.433Z"),"step":557},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:08.568Z"),"step":558},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:08.692Z"),"step":559},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:12.001Z"),"step":561},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:12.156Z"),"step":562},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:12.290Z"),"step":563},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:12.464Z"),"step":564},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:12.604Z"),"step":565},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:12.741Z"),"step":566},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:12.882Z"),"step":567},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:13.029Z"),"step":568},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:17:13.164Z"),"step":569},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:16.594Z"),"step":571},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:16.730Z"),"step":572},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:16.871Z"),"step":573},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:17.004Z"),"step":574},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:17.140Z"),"step":575},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:17.276Z"),"step":576},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:17.407Z"),"step":577},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:17.543Z"),"step":578},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:17.671Z"),"step":579},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:21.105Z"),"step":581},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:21.234Z"),"step":582},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:21.367Z"),"step":583},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:21.506Z"),"step":584},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:21.631Z"),"step":585},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:21.761Z"),"step":586},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:21.899Z"),"step":587},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:22.036Z"),"step":588},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:22.175Z"),"step":589},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:26.130Z"),"step":591},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:26.271Z"),"step":592},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:26.402Z"),"step":593},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:26.537Z"),"step":594},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:26.669Z"),"step":595},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:26.807Z"),"step":596},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:26.935Z"),"step":597},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:27.072Z"),"step":598},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:27.216Z"),"step":599},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:30.550Z"),"step":601},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:30.677Z"),"step":602},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:30.816Z"),"step":603},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:30.960Z"),"step":604},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:31.094Z"),"step":605},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:31.243Z"),"step":606},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:31.383Z"),"step":607},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:17:31.525Z"),"step":608},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:31.650Z"),"step":609},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:35.299Z"),"step":611},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:35.636Z"),"step":612},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:35.773Z"),"step":613},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:35.907Z"),"step":614},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:36.037Z"),"step":615},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:36.169Z"),"step":616},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:36.302Z"),"step":617},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:36.427Z"),"step":618},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:36.567Z"),"step":619},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:39.851Z"),"step":621},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:39.982Z"),"step":622},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.120Z"),"step":623},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.256Z"),"step":624},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.394Z"),"step":625},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.529Z"),"step":626},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:40.667Z"),"step":627},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.807Z"),"step":628},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:40.938Z"),"step":629},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:44.244Z"),"step":631},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:44.385Z"),"step":632},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:44.525Z"),"step":633},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:44.657Z"),"step":634},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:44.800Z"),"step":635},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:44.935Z"),"step":636},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:45.074Z"),"step":637},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:45.208Z"),"step":638},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:45.351Z"),"step":639},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:48.960Z"),"step":641},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:49.090Z"),"step":642},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:49.219Z"),"step":643},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:49.361Z"),"step":644},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:49.502Z"),"step":645},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:49.634Z"),"step":646},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:49.770Z"),"step":647},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:49.908Z"),"step":648},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:50.033Z"),"step":649},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:53.566Z"),"step":651},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:53.699Z"),"step":652},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:53.829Z"),"step":653},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:53.958Z"),"step":654},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:54.102Z"),"step":655},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:54.244Z"),"step":656},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:54.377Z"),"step":657},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:54.518Z"),"step":658},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:54.649Z"),"step":659},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:58.186Z"),"step":661},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:58.343Z"),"step":662},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:58.479Z"),"step":663},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:58.620Z"),"step":664},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:58.749Z"),"step":665},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:58.876Z"),"step":666},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:59.023Z"),"step":667},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:59.157Z"),"step":668},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:59.297Z"),"step":669},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:02.835Z"),"step":671},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:02.987Z"),"step":672},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:03.126Z"),"step":673},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:03.266Z"),"step":674},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:03.399Z"),"step":675},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:18:03.545Z"),"step":676},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:03.696Z"),"step":677},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:03.841Z"),"step":678},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:03.974Z"),"step":679},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:08.117Z"),"step":681},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:08.271Z"),"step":682},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:08.410Z"),"step":683},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:08.557Z"),"step":684},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:08.696Z"),"step":685},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:08.848Z"),"step":686},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:08.987Z"),"step":687},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:09.119Z"),"step":688},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:09.261Z"),"step":689},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:12.588Z"),"step":691},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:12.719Z"),"step":692},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:12.854Z"),"step":693},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:12.986Z"),"step":694},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:13.118Z"),"step":695},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:13.253Z"),"step":696},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:13.392Z"),"step":697},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:13.524Z"),"step":698},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:13.659Z"),"step":699},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:16.970Z"),"step":701},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.117Z"),"step":702},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.250Z"),"step":703},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.382Z"),"step":704},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.517Z"),"step":705},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:17.653Z"),"step":706},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:17.782Z"),"step":707},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:17.915Z"),"step":708},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:18.056Z"),"step":709},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:21.361Z"),"step":711},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:21.478Z"),"step":712},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:21.610Z"),"step":713},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:21.750Z"),"step":714},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:21.880Z"),"step":715},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:22.018Z"),"step":716},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:22.147Z"),"step":717},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:22.283Z"),"step":718},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:22.410Z"),"step":719},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:26.058Z"),"step":721},{"scalar":1,"wall_time":new Date("2016-06-24T04:18:26.204Z"),"step":722},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:26.350Z"),"step":723},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:26.498Z"),"step":724},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:18:26.636Z"),"step":725},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:26.787Z"),"step":726},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:26.919Z"),"step":727},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:27.051Z"),"step":728},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:27.183Z"),"step":729},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:30.500Z"),"step":731},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:30.634Z"),"step":732},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:30.769Z"),"step":733},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:30.904Z"),"step":734},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:31.043Z"),"step":735},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:31.176Z"),"step":736},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:31.311Z"),"step":737},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:31.438Z"),"step":738},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:31.577Z"),"step":739},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:34.889Z"),"step":741},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:35.026Z"),"step":742},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:35.160Z"),"step":743},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:35.299Z"),"step":744},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:35.436Z"),"step":745},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:35.573Z"),"step":746},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:35.713Z"),"step":747},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:35.845Z"),"step":748},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:35.978Z"),"step":749},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:39.520Z"),"step":751},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:39.679Z"),"step":752},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:39.844Z"),"step":753},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:40.006Z"),"step":754},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:40.142Z"),"step":755},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:40.337Z"),"step":756},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:40.487Z"),"step":757},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:40.691Z"),"step":758},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:40.855Z"),"step":759},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:44.438Z"),"step":761},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:44.566Z"),"step":762},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:44.698Z"),"step":763},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:44.832Z"),"step":764},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:44.974Z"),"step":765},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:45.115Z"),"step":766},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:45.258Z"),"step":767},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:45.392Z"),"step":768},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:45.525Z"),"step":769},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:18:48.972Z"),"step":771},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:49.116Z"),"step":772},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:49.257Z"),"step":773},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:49.387Z"),"step":774},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:49.512Z"),"step":775},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:49.653Z"),"step":776},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:49.787Z"),"step":777},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:49.922Z"),"step":778},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:50.062Z"),"step":779},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:53.610Z"),"step":781},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:53.745Z"),"step":782},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:53.887Z"),"step":783},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:54.025Z"),"step":784},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:54.156Z"),"step":785},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:54.281Z"),"step":786},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:54.417Z"),"step":787},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:54.560Z"),"step":788},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:54.691Z"),"step":789},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:58.048Z"),"step":791},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:18:58.192Z"),"step":792},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:58.324Z"),"step":793},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:58.449Z"),"step":794},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:58.584Z"),"step":795},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:58.720Z"),"step":796},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:58.846Z"),"step":797},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:58.991Z"),"step":798},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:59.124Z"),"step":799},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:02.737Z"),"step":801},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:02.880Z"),"step":802},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:03.021Z"),"step":803},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:03.166Z"),"step":804},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:03.308Z"),"step":805},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:03.436Z"),"step":806},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:03.574Z"),"step":807},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:03.702Z"),"step":808},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:03.842Z"),"step":809},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:07.794Z"),"step":811},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:07.946Z"),"step":812},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:08.081Z"),"step":813},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:08.215Z"),"step":814},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:08.347Z"),"step":815},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:08.490Z"),"step":816},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:08.625Z"),"step":817},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:08.750Z"),"step":818},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:19:08.877Z"),"step":819},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:12.481Z"),"step":821},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:12.643Z"),"step":822},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:12.810Z"),"step":823},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:12.982Z"),"step":824},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:13.116Z"),"step":825},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:13.254Z"),"step":826},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:13.425Z"),"step":827},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:13.570Z"),"step":828},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:13.707Z"),"step":829},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:17.381Z"),"step":831},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:17.518Z"),"step":832},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:17.657Z"),"step":833},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:17.815Z"),"step":834},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:17.959Z"),"step":835},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:18.102Z"),"step":836},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:18.249Z"),"step":837},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:18.389Z"),"step":838},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:18.519Z"),"step":839},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:22.125Z"),"step":841},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:22.257Z"),"step":842},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.393Z"),"step":843},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.524Z"),"step":844},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.657Z"),"step":845},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.791Z"),"step":846},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:22.926Z"),"step":847},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:23.060Z"),"step":848},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:23.192Z"),"step":849},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:26.487Z"),"step":851},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:26.617Z"),"step":852},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:26.744Z"),"step":853},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:26.881Z"),"step":854},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:19:27.016Z"),"step":855},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:27.157Z"),"step":856},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:27.288Z"),"step":857},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:27.412Z"),"step":858},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:27.549Z"),"step":859},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:30.933Z"),"step":861},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:31.071Z"),"step":862},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:31.211Z"),"step":863},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:31.350Z"),"step":864},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:31.508Z"),"step":865},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:31.653Z"),"step":866},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:31.795Z"),"step":867},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:31.941Z"),"step":868},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:32.077Z"),"step":869},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:35.373Z"),"step":871},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:35.499Z"),"step":872},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:35.634Z"),"step":873},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:35.780Z"),"step":874},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:35.906Z"),"step":875},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:36.045Z"),"step":876},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:36.176Z"),"step":877},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:36.319Z"),"step":878},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:36.449Z"),"step":879},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:39.764Z"),"step":881},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:39.896Z"),"step":882},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:40.028Z"),"step":883},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:40.158Z"),"step":884},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:40.296Z"),"step":885},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:40.422Z"),"step":886},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:40.561Z"),"step":887},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:40.688Z"),"step":888},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:40.822Z"),"step":889},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:44.112Z"),"step":891},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.247Z"),"step":892},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:44.384Z"),"step":893},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.516Z"),"step":894},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:44.643Z"),"step":895},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.778Z"),"step":896},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.914Z"),"step":897},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:45.051Z"),"step":898},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:45.179Z"),"step":899},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:48.465Z"),"step":901},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:48.593Z"),"step":902},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:48.728Z"),"step":903},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:48.866Z"),"step":904},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:48.998Z"),"step":905},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:49.130Z"),"step":906},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:49.256Z"),"step":907},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:49.393Z"),"step":908},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:49.521Z"),"step":909},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:52.825Z"),"step":911},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:52.956Z"),"step":912},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:53.101Z"),"step":913},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:53.235Z"),"step":914},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:53.368Z"),"step":915},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:53.500Z"),"step":916},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:19:53.623Z"),"step":917},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:53.768Z"),"step":918},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:53.899Z"),"step":919},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:57.197Z"),"step":921},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:57.333Z"),"step":922},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:57.467Z"),"step":923},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:57.594Z"),"step":924},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:57.731Z"),"step":925},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:57.866Z"),"step":926},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:57.991Z"),"step":927},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:58.128Z"),"step":928},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:58.260Z"),"step":929},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:01.545Z"),"step":931},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:01.681Z"),"step":932},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:01.814Z"),"step":933},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:01.950Z"),"step":934},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:02.111Z"),"step":935},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:02.255Z"),"step":936},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:02.399Z"),"step":937},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:02.542Z"),"step":938},{"scalar":1,"wall_time":new Date("2016-06-24T04:20:02.672Z"),"step":939},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:06.030Z"),"step":941},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:06.172Z"),"step":942},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:06.314Z"),"step":943},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:06.436Z"),"step":944},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:06.572Z"),"step":945},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:06.704Z"),"step":946},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:06.833Z"),"step":947},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:06.966Z"),"step":948},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:07.105Z"),"step":949},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:10.389Z"),"step":951},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:10.522Z"),"step":952},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:10.660Z"),"step":953},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:10.806Z"),"step":954},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:10.939Z"),"step":955},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:11.073Z"),"step":956},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:11.204Z"),"step":957},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:11.339Z"),"step":958},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:11.465Z"),"step":959},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:14.750Z"),"step":961},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:14.879Z"),"step":962},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:15.017Z"),"step":963},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:20:15.152Z"),"step":964},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:15.288Z"),"step":965},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:15.415Z"),"step":966},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:15.550Z"),"step":967},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:15.679Z"),"step":968},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:15.815Z"),"step":969},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:19.650Z"),"step":971},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:20:19.786Z"),"step":972},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:19.922Z"),"step":973},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:20.058Z"),"step":974},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:20.198Z"),"step":975},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:20.326Z"),"step":976},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:20.461Z"),"step":977},{"scalar":1,"wall_time":new Date("2016-06-24T04:20:20.588Z"),"step":978},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:20.718Z"),"step":979},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:24.015Z"),"step":981},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:24.151Z"),"step":982},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:24.300Z"),"step":983},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:24.447Z"),"step":984},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:24.576Z"),"step":985},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:24.701Z"),"step":986},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:20:24.830Z"),"step":987},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:24.977Z"),"step":988},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:25.134Z"),"step":989},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:28.551Z"),"step":991},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:28.681Z"),"step":992},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:28.812Z"),"step":993},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:28.949Z"),"step":994},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:29.086Z"),"step":995},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:29.219Z"),"step":996},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:29.351Z"),"step":997},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:29.497Z"),"step":998},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:29.637Z"),"step":999,"name":"train","relative":0.12446694444444445}]
+      };
+    </script>
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/dragZoomInteraction.ts b/tensorflow/tensorboard/components/vz_line_chart_d3v4/dragZoomInteraction.ts
new file mode 100644
index 0000000000..d374a71a88
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/dragZoomInteraction.ts
@@ -0,0 +1,205 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import * as Plottable from 'Plottable/plottable';  // from //third_party/javascript/plottable/v3
+
+
+export class DragZoomLayer extends Plottable.Components.SelectionBoxLayer {
+  private _dragInteraction: Plottable.Interactions.Drag;
+  private _doubleClickInteraction: Plottable.Interactions.Click;
+  private isZoomed = false;
+  private easeFn: (t: number) => number = d3.easeCubicInOut;
+  private _animationTime = 750;
+  private onStart: Function;
+  private onEnd: Function;
+  private unzoomMethod: Function;
+
+  /**
+   * Constructs a SelectionBoxLayer with an attached DragInteraction and
+   * ClickInteraction. On drag, it triggers an animated zoom into the box
+   * that was dragged. On double click, it zooms back out to the original
+   * view, before any zooming.
+   * The zoom animation uses an easing function (default
+   * d3.ease('cubic-in-out')) and is customizable.
+   * Usage: Construct the selection box layer and attach x and y scales,
+   * and then add the layer over the plot you are zooming on using a
+   * Component Group.
+   * TODO(danmane) - merge this into Plottable
+   */
+  constructor(
+      xScale: Plottable.QuantitativeScale<number|{valueOf(): number}>,
+      yScale: Plottable.QuantitativeScale<number|{valueOf(): number}>,
+      unzoomMethod: Function) {
+    super();
+    this.xScale(xScale);
+    this.yScale(yScale);
+    this._dragInteraction = new Plottable.Interactions.Drag();
+    this._dragInteraction.attachTo(this);
+    this._doubleClickInteraction = new Plottable.Interactions.Click();
+    this._doubleClickInteraction.attachTo(this);
+    this.setupCallbacks();
+    this.unzoomMethod = unzoomMethod;
+  }
+
+  /**
+   * Register a method that calls when the DragZoom interaction starts.
+   */
+  public interactionStart(cb: Function) {
+    this.onStart = cb;
+  }
+
+  /**
+   * Register a method that calls when the DragZoom interaction ends.
+   */
+  public interactionEnd(cb: Function) {
+    this.onEnd = cb;
+  }
+
+  private setupCallbacks() {
+    let dragging = false;
+    this._dragInteraction.onDragStart((startPoint: Plottable.Point) => {
+      this.bounds({
+        topLeft: startPoint,
+        bottomRight: startPoint,
+      });
+      this.onStart();
+    });
+    this._dragInteraction.onDrag((startPoint, endPoint) => {
+      this.bounds({topLeft: startPoint, bottomRight: endPoint});
+      this.boxVisible(true);
+      dragging = true;
+    });
+    this._dragInteraction.onDragEnd((startPoint, endPoint) => {
+      this.boxVisible(false);
+      this.bounds({topLeft: startPoint, bottomRight: endPoint});
+      if (dragging) {
+        this.zoom();
+      } else {
+        this.onEnd();
+      }
+      dragging = false;
+    });
+
+    this._doubleClickInteraction.onDoubleClick(this.unzoom.bind(this));
+  }
+
+  /* Set the time (in ms) over which the zoom will interpolate.
+   * 0 implies no interpolation. (ie zoom is instant)
+   */
+  public animationTime(): number;
+  public animationTime(animationTime: number): DragZoomLayer;
+  public animationTime(animationTime?: number): any {
+    if (animationTime == null) {
+      return this._animationTime;
+    }
+    if (animationTime < 0) {
+      throw new Error('animationTime cannot be negative');
+    }
+    this._animationTime = animationTime;
+    return this;
+  }
+
+  /**
+   * Set the easing function, which determines how the zoom interpolates
+   * over time.
+   */
+  public ease(fn: (t: number) => number): DragZoomLayer {
+    if (typeof(fn) !== 'function') {
+      throw new Error('ease function must be a function');
+    }
+    if (fn(0) !== 0 || fn(1) !== 1) {
+      Plottable.Utils.Window.warn(
+          'Easing function does not maintain invariant ' +
+          'f(0)==0 && f(1)==1. Bad behavior may result.');
+    }
+    this.easeFn = fn;
+    return this;
+  }
+
+  // Zoom into extent of the selection box bounds
+  private zoom() {
+    let x0: number = this.xExtent()[0].valueOf();
+    let x1: number = this.xExtent()[1].valueOf();
+    let y0: number = this.yExtent()[1].valueOf();
+    let y1: number = this.yExtent()[0].valueOf();
+
+    if (x0 === x1 || y0 === y1) {
+      return;
+    }
+
+    if (!this.isZoomed) {
+      this.isZoomed = true;
+    }
+    this.interpolateZoom(x0, x1, y0, y1);
+  }
+
+  // Restore the scales to their state before any zoom
+  private unzoom() {
+    if (!this.isZoomed) {
+      return;
+    }
+    this.isZoomed = false;
+    let xScale = this.xScale() as any;
+    xScale._domainMin = null;
+    xScale._domainMax = null;
+    let xDomain = xScale._getExtent();
+    this.xScale().domain(xDomain);
+    this.unzoomMethod();
+  }
+
+  // If we are zooming, disable interactions, to avoid contention
+  private isZooming(isZooming: boolean) {
+    this._dragInteraction.enabled(!isZooming);
+    this._doubleClickInteraction.enabled(!isZooming);
+  }
+
+  private interpolateZoom(x0f: number, x1f: number, y0f: number, y1f: number) {
+    let x0s: number = this.xScale().domain()[0].valueOf();
+    let x1s: number = this.xScale().domain()[1].valueOf();
+    let y0s: number = this.yScale().domain()[0].valueOf();
+    let y1s: number = this.yScale().domain()[1].valueOf();
+
+    // Copy a ref to the ease fn, so that changing ease wont affect zooms in
+    // progress.
+    let ease = this.easeFn;
+    let interpolator = (a: number, b: number, p: number) =>
+        d3.interpolateNumber(a, b)(ease(p));
+
+    this.isZooming(true);
+    let start = Date.now();
+    let draw = () => {
+      let now = Date.now();
+      let passed = now - start;
+      let p = this._animationTime === 0 ?
+          1 :
+          Math.min(1, passed / this._animationTime);
+      let x0 = interpolator(x0s, x0f, p);
+      let x1 = interpolator(x1s, x1f, p);
+      let y0 = interpolator(y0s, y0f, p);
+      let y1 = interpolator(y1s, y1f, p);
+      this.xScale().domain([x0, x1]);
+      this.yScale().domain([y0, y1]);
+      if (p < 1) {
+        Plottable.Utils.DOM.requestAnimationFramePolyfill(draw);
+      } else {
+        this.onEnd();
+        this.isZooming(false);
+      }
+    };
+    draw();
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-chart-helpers.ts b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-chart-helpers.ts
new file mode 100644
index 0000000000..84e2d528d7
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-chart-helpers.ts
@@ -0,0 +1,219 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+/* tslint:disable:no-namespace variable-name */
+
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import * as Plottable from 'Plottable/plottable';  // from //third_party/javascript/plottable/v3
+import {Dataset} from 'Plottable/plottable';
+
+export interface Datum {
+  wall_time: Date;
+  step: number;
+}
+
+export interface Scalar {
+  scalar: number;
+  smoothed: number;
+}
+
+export type ScalarDatum = Datum & Scalar;
+
+export type DataFn = (run: string, tag: string) => Promise<Array<Datum>>;
+
+export let Y_TOOLTIP_FORMATTER_PRECISION = 4;
+export let STEP_FORMATTER_PRECISION = 4;
+export let Y_AXIS_FORMATTER_PRECISION = 3;
+export let TOOLTIP_Y_PIXEL_OFFSET = 20;
+export let TOOLTIP_CIRCLE_SIZE = 4;
+export let NAN_SYMBOL_SIZE = 6;
+
+export interface Point {
+  x: number;  // pixel space
+  y: number;  // pixel space
+  datum: ScalarDatum;
+  dataset: Plottable.Dataset;
+}
+
+/* Create a formatter function that will switch between exponential and
+ * regular display depending on the scale of the number being formatted,
+ * and show `digits` significant digits.
+ */
+export function multiscaleFormatter(digits: number): ((v: number) => string) {
+  return (v: number) => {
+    let absv = Math.abs(v);
+    if (absv < 1E-15) {
+      // Sometimes zero-like values get an annoying representation
+      absv = 0;
+    }
+    let f: (x: number) => string;
+    if (absv >= 1E4) {
+      f = d3.format('.' + digits + 'e');
+    } else if (absv > 0 && absv < 0.01) {
+      f = d3.format('.' + digits + 'e');
+    } else {
+      f = d3.format('.' + digits + 'g');
+    }
+    return f(v);
+  };
+}
+
+/* Compute an appropriate domain given an array of all the values that are
+ * going to be displayed. If ignoreOutliers is true, it will ignore the
+ * lowest 10% and highest 10% of the data when computing a domain.
+ * It has n log n performance when ignoreOutliers is true, as it needs to
+ * sort the data.
+ */
+export function computeDomain(values: number[], ignoreOutliers: boolean) {
+  if (values.length === 0) {
+    return [-0.1, 1.1];
+  }
+  let a: number;
+  let b: number;
+  if (ignoreOutliers) {
+    let sorted = _.sortBy(values);
+    a = d3.quantile(sorted, 0.05);
+    b = d3.quantile(sorted, 0.95);
+  } else {
+    a = d3.min(values);
+    b = d3.max(values);
+  }
+
+  let padding: number;
+  let span = b - a;
+  if (span === 0) {
+    // If b===a, we would create an empty range. We instead select the range
+    // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
+    // extra padding on the top and bottom of the plot.
+    padding = Math.abs(a) * 1.1 + 1.1;
+  } else {
+    padding = span * 0.2;
+  }
+
+  let lower: number;
+  if (a >= 0 && a < span) {
+    // We include the intercept (y = 0) if doing so less than doubles the span
+    // of the y-axis. (We actually select a lower bound that's slightly less
+    // than 0 so that 0.00 will clearly be written on the lower edge of the
+    // chart. The label on the lowest tick is often filtered out.)
+    lower = -0.1 * b;
+  } else {
+    lower = a - padding;
+  }
+
+
+  let domain = [lower, b + padding];
+  domain = d3.scaleLinear().domain(domain).nice().domain();
+  return domain;
+}
+
+export function accessorize(key: string): Plottable.IAccessor<number> {
+  return (d: any, index: number, dataset: Plottable.Dataset) => d[key];
+}
+
+export interface XComponents {
+  /* tslint:disable */
+  scale: Plottable.Scales.Linear|Plottable.Scales.Time,
+      axis: Plottable.Axes.Numeric|Plottable.Axes.Time,
+      accessor: Plottable.IAccessor<number|Date>,
+  /* tslint:enable */
+}
+
+export let stepFormatter =
+    Plottable.Formatters.siSuffix(STEP_FORMATTER_PRECISION);
+export function stepX(): XComponents {
+  let scale = new Plottable.Scales.Linear();
+  let axis = new Plottable.Axes.Numeric(scale, 'bottom');
+  axis.formatter(stepFormatter);
+  return {
+    scale: scale,
+    axis: axis,
+    accessor: (d: Datum) => d.step,
+  };
+}
+
+export let timeFormatter = Plottable.Formatters.time('%a %b %e, %H:%M:%S');
+
+export function wallX(): XComponents {
+  let scale = new Plottable.Scales.Time();
+  return {
+    scale: scale,
+    axis: new Plottable.Axes.Time(scale, 'bottom'),
+    accessor: (d: Datum) => d.wall_time,
+  };
+}
+export let relativeAccessor = (d: any, index: number, dataset: Dataset) => {
+  // We may be rendering the final-point datum for scatterplot.
+  // If so, we will have already provided the 'relative' property
+  if (d.relative != null) {
+    return d.relative;
+  }
+  let data = dataset.data();
+  // I can't imagine how this function would be called when the data is
+  // empty (after all, it iterates over the data), but lets guard just
+  // to be safe.
+  let first = data.length > 0 ? +data[0].wall_time : 0;
+  return (+d.wall_time - first) / (60 * 60 * 1000);  // ms to hours
+};
+
+export let relativeFormatter = (n: number) => {
+  // we will always show 2 units of precision, e.g days and hours, or
+  // minutes and seconds, but not hours and minutes and seconds
+  let ret = '';
+  let days = Math.floor(n / 24);
+  n -= (days * 24);
+  if (days) {
+    ret += days + 'd ';
+  }
+  let hours = Math.floor(n);
+  n -= hours;
+  n *= 60;
+  if (hours || days) {
+    ret += hours + 'h ';
+  }
+  let minutes = Math.floor(n);
+  n -= minutes;
+  n *= 60;
+  if (minutes || hours || days) {
+    ret += minutes + 'm ';
+  }
+  let seconds = Math.floor(n);
+  return ret + seconds + 's';
+};
+export function relativeX(): XComponents {
+  let scale = new Plottable.Scales.Linear();
+  return {
+    scale: scale,
+    axis: new Plottable.Axes.Numeric(scale, 'bottom'),
+    accessor: relativeAccessor,
+  };
+}
+
+// a very literal definition of NaN: true for NaN for a non-number type
+// or null, etc. False for Infinity or -Infinity
+export let isNaN = (x) => +x !== x;
+
+export function getXComponents(xType: string): XComponents {
+  switch (xType) {
+    case 'step':
+      return stepX();
+    case 'wall_time':
+      return wallX();
+    case 'relative':
+      return relativeX();
+    default:
+      throw new Error('invalid xType: ' + xType);
+  }
+}
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html
new file mode 100644
index 0000000000..13b46d8bbf
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html
@@ -0,0 +1,125 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="plottable-library/plottable_css.html">
+<!--
+vz-line-chart creates an element that draws a line chart for
+displaying event values.
+
+This line chart supports drawing multiple lines at the same time, with features
+such as different X scales (linear and temporal), tooltips and smoothing.
+
+@element vz-line-chart
+@demo demo/index.html
+-->
+<dom-module id="vz-line-chart">
+  <template>
+    <div id="tooltip">
+      <table>
+        <thead>
+          <tr>
+            <th></th>
+            <th>Name</th>
+            <template is="dom-if" if="{{smoothingEnabled}}">
+              <th>Smoothed</th>
+            </template>
+            <th>Value</th>
+            <th>Step</th>
+            <th>Time</th>
+            <th>Relative</th>
+          </tr>
+        </thead>
+        <tbody>
+        </tbody>
+      </table>
+    </div>
+    <div id="chartdiv"></div>
+    <style>
+      :host {
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        flex-shrink: 1;
+        position: relative;
+        outline: none;
+      }
+      div {
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        flex-grow: 1;
+        flex-shrink: 1;
+      }
+      td {
+        padding-left: 5px;
+        padding-right: 5px;
+        font-size: 13px;
+        opacity: 1;
+      }
+      #tooltip {
+        pointer-events: none;
+        position: absolute;
+        opacity: 0;
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+        font-size: 14px;
+        background: rgba(0, 0, 0, 0.8);
+        color: white;
+        border-radius: 4px;
+        line-height: 1.4em;
+        padding: 8px;
+        z-index: 5;
+        cursor: none;
+        margin-top: 10px;
+      }
+      .swatch {
+        border-radius: 50%;
+        width: 14px;
+        height: 14px;
+        display: block;
+        border: 2px solid rgba(0,0,0,0);
+      }
+      .closest .swatch {
+        border: 2px solid white;
+      }
+      th {
+        padding-left: 5px;
+        padding-right: 5px;
+        text-align: left;
+      }
+      .distant td {
+        opacity: 0.8;
+      }
+
+      .distant td.swatch {
+        opacity: 1;
+      }
+
+      .ghost {
+        opacity: 0.2;
+        stroke-width: 1px;
+      }
+
+      #chartdiv line.guide-line {
+        stroke: #999;
+        stroke-width: 1.5px;
+      }
+
+    </style>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.ts b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.ts
new file mode 100644
index 0000000000..1bce0e33f0
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.ts
@@ -0,0 +1,777 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+/* tslint:disable:no-namespace variable-name */
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import * as _ from 'lodash'
+import * as Plottable from 'Plottable/plottable';  // from //third_party/javascript/plottable/v3
+
+import {DragZoomLayer} from './dragZoomInteraction'
+import * as ChartHelpers from './vz-chart-helpers'
+
+Polymer({
+  is: 'vz-line-chart',
+  properties: {
+    /**
+     * Scale that maps series names to colors. The default colors are from
+     * d3.schemeCategory10. Use this property to replace the default line
+     * colors with colors of your own choice.
+     * @type {Plottable.Scales.Color}
+     * @required
+     */
+    colorScale: {
+      type: Object,
+      value: function() {
+        return new Plottable.Scales.Color().range(d3.schemeCategory10);
+      }
+    },
+
+    /**
+     * Whether smoothing is enabled or not. If true, smoothed lines will be
+     * plotted in the chart while the unsmoothed lines will be ghosted in
+     * the background.
+     *
+     * The smoothing algorithm is a simple moving average, which, given a
+     * point p and a window w, replaces p with a simple average of the
+     * points in the [p - floor(w/2), p + floor(w/2)] range.  If there
+     * aren't enough points to cover the entire window to the left, the
+     * window is reduced to fit exactly the amount of elements available.
+     * This means that the smoothed line will be less in and gradually
+     * become more smooth until the desired window is reached. However when
+     * there aren't enough points on the right, the line stops being
+     * rendered at all.
+     */
+    smoothingEnabled: {type: Boolean, value: false},
+
+    /**
+     * Weight (between 0.0 and 1.0) of the smoothing. This weight controls
+     * the window size, and a weight of 1.0 means using 50% of the entire
+     * dataset as the window, while a weight of 0.0 means using a window of
+     * 0 (and thus replacing each point with themselves).
+     *
+     * The growth between 0.0 and 1.0 is not linear though. Because
+     * changing the window from 0% to 30% of the dataset smooths the line a
+     * lot more than changing the window from 70% to 100%, an exponential
+     * function is used instead: http://i.imgur.com/bDrhEZU.png. This
+     * function increases the size of the window slowly at the beginning
+     * and gradually speeds up the growth, but 0.0 still means a window of
+     * 0 and 1.0 still means a window of the dataset's length.
+     */
+    smoothingWeight: {type: Number, value: 0.6},
+
+    /**
+     * The way to display the X values. Allows:
+     * - "step" - Linear scale using the  "step" property of the datum.
+     * - "wall_time" - Temporal scale using the "wall_time" property of the
+     * datum.
+     * - "relative" - Temporal scale using the "relative" property of the
+     * datum if it is present or calculating from "wall_time" if it isn't.
+     */
+    xType: {type: String, value: 'step'},
+
+    /**
+     * The scale for the y-axis. Allows:
+     * - "linear" - linear scale (Plottable.Scales.Linear)
+     * - "log" - modified-log scale (Plottable.Scales.ModifiedLog)
+     */
+    yScaleType: {type: String, value: 'linear'},
+
+    /**
+     * Whether to ignore outlier data when computing the yScale domain.
+     */
+
+    ignoreYOutliers: {
+      type: Boolean,
+      value: false,
+    },
+
+    /**
+     * Change how the tooltip is sorted. Allows:
+     * - "default" - Sort the tooltip by input order.
+     * - "ascending" - Sort the tooltip by ascending value.
+     * - "descending" - Sort the tooltip by descending value.
+     * - "nearest" - Sort the tooltip by closest to cursor.
+     */
+    tooltipSortingMethod: {type: String, value: 'default'},
+
+    /**
+     * Change how the tooltip is positioned. Allows:
+     * - "bottom" - Position the tooltip on the bottom of the chart.
+     * - "right" - Position the tooltip to the right of the chart.
+     */
+    tooltipPosition: {type: String, value: 'bottom'},
+
+    _attached: Boolean,
+    _chart: Object,
+    _visibleSeriesCache: {
+      type: Array,
+      value: function() {
+        return []
+      }
+    },
+    _seriesDataCache: {
+      type: Object,
+      value: function() {
+        return {}
+      }
+    },
+    _makeChartAsyncCallbackId: {type: Number, value: null}
+  },
+  observers: [
+    '_makeChart(xType, yScaleType, colorScale, _attached)',
+    '_reloadFromCache(_chart)',
+    '_smoothingChanged(smoothingEnabled, smoothingWeight, _chart)',
+    '_tooltipSortingMethodChanged(tooltipSortingMethod, _chart)',
+    '_tooltipPositionChanged(tooltipPosition, _chart)',
+    '_outliersChanged(ignoreYOutliers, _chart)'
+  ],
+
+  /**
+   * Sets the series that the chart displays. Series with other names will
+   * not be displayed.
+   *
+   * @param {String[]} names Array with the names of the series to
+   * display.
+   */
+  setVisibleSeries: function(names) {
+    this._visibleSeriesCache = names;
+    if (this._chart) {
+      this._chart.setVisibleSeries(names);
+      this.redraw();
+    }
+  },
+
+  /**
+   * Sets the data of one of the series. Note that to display this series
+   * its name must be in the setVisibleSeries() array.
+   *
+   * @param {String} name Name of the series.
+   * @param {VZ.ChartHelpers.ScalarDatum[]} data Data of the series. This is
+   * an array of objects with at least the following properties:
+   * - step: (Number) - index of the datum.
+   * - wall_time: (Date) - Date object with the datum's time.
+   * - scalar: (Number) - Value of the datum.
+   */
+  setSeriesData: function(name, data) {
+    this._seriesDataCache[name] = data;
+    if (this._chart) {
+      this._chart.setSeriesData(name, data);
+    }
+  },
+
+  /**
+   * Re-renders the chart. Useful if e.g. the container size changed.
+   */
+  redraw: function() {
+    this._chart.redraw();
+  },
+  attached: function() {
+    this._attached = true;
+  },
+  detached: function() {
+    this._attached = false;
+  },
+  ready: function() {
+    this.scopeSubtree(this.$.tooltip, true);
+    this.scopeSubtree(this.$.chartdiv, true);
+  },
+  _makeChart: function(xType, yScaleType, colorScale, _attached) {
+    if (this._makeChartAsyncCallbackId !== null) {
+      this.cancelAsync(this._makeChartAsyncCallbackId);
+      this._makeChartAsyncCallbackId = null;
+    }
+
+    this._makeChartAsyncCallbackId = this.async(function() {
+      this._makeChartAsyncCallbackId = null;
+      if (!this._attached) return;
+      if (this._chart) this._chart.destroy();
+      var tooltip = d3.select(this.$.tooltip);
+      var chart = new LineChart(xType, yScaleType, colorScale, tooltip);
+      var div = d3.select(this.$.chartdiv);
+      chart.renderTo(div);
+      this._chart = chart;
+    }, 350);
+  },
+  _reloadFromCache: function() {
+    if (this._chart) {
+      this._chart.setVisibleSeries(this._visibleSeriesCache);
+      this._visibleSeriesCache.forEach(function(name) {
+        this._chart.setSeriesData(name, this._seriesDataCache[name] || []);
+      }.bind(this));
+    }
+  },
+  _smoothingChanged: function() {
+    if (!this._chart) {
+      return;
+    }
+    if (this.smoothingEnabled) {
+      this._chart.smoothingUpdate(this.smoothingWeight);
+    } else {
+      this._chart.smoothingDisable();
+    }
+  },
+  _outliersChanged: function() {
+    if (!this._chart) {
+      return;
+    }
+    this._chart.ignoreYOutliers(this.ignoreYOutliers);
+  },
+  _tooltipSortingMethodChanged: function() {
+    if (this._chart) {
+      this._chart.setTooltipSortingMethod(this.tooltipSortingMethod);
+    }
+  },
+  _tooltipPositionChanged: function() {
+    if (this._chart) {
+      this._chart.setTooltipPosition(this.tooltipPosition);
+    }
+  }
+});
+
+class LineChart {
+  private name2datasets: {[name: string]: Plottable.Dataset};
+  private seriesNames: string[];
+
+  private xAccessor: Plottable.IAccessor<number|Date>;
+  private xScale: Plottable.QuantitativeScale<number|Date>;
+  private yScale: Plottable.QuantitativeScale<number>;
+  private gridlines: Plottable.Components.Gridlines;
+  private center: Plottable.Components.Group;
+  private xAxis: Plottable.Axes.Numeric|Plottable.Axes.Time;
+  private yAxis: Plottable.Axes.Numeric;
+  private outer: Plottable.Components.Table;
+  private colorScale: Plottable.Scales.Color;
+  private tooltip: d3.Selection<any, any, any, any>;
+  private dzl: DragZoomLayer;
+
+  private linePlot: Plottable.Plots.Line<number|Date>;
+  private smoothLinePlot: Plottable.Plots.Line<number|Date>;
+  private scatterPlot: Plottable.Plots.Scatter<number|Date, Number>;
+  private nanDisplay: Plottable.Plots.Scatter<number|Date, Number>;
+  private scalarAccessor: Plottable.IAccessor<number>;
+  private smoothedAccessor: Plottable.IAccessor<number>;
+  private lastPointsDataset: Plottable.Dataset;
+  private datasets: Plottable.Dataset[];
+  private onDatasetChanged: (dataset: Plottable.Dataset) => void;
+  private nanDataset: Plottable.Dataset;
+  private smoothingWeight: number;
+  private smoothingEnabled: Boolean;
+  private tooltipSortingMethod: string;
+  private tooltipPosition: string;
+  private _ignoreYOutliers: boolean;
+
+  private targetSVG: d3.Selection<any, any, any, any>;
+
+  constructor(
+      xType: string, yScaleType: string, colorScale: Plottable.Scales.Color,
+      tooltip: d3.Selection<any, any, any, any>) {
+    this.seriesNames = [];
+    this.name2datasets = {};
+    this.colorScale = colorScale;
+    this.tooltip = tooltip;
+    this.datasets = [];
+    this._ignoreYOutliers = false;
+    // lastPointDataset is a dataset that contains just the last point of
+    // every dataset we're currently drawing.
+    this.lastPointsDataset = new Plottable.Dataset();
+    this.nanDataset = new Plottable.Dataset();
+    // need to do a single bind, so we can deregister the callback from
+    // old Plottable.Datasets. (Deregistration is done by identity checks.)
+    this.onDatasetChanged = this._onDatasetChanged.bind(this);
+    this.buildChart(xType, yScaleType);
+  }
+
+  private buildChart(xType: string, yScaleType: string) {
+    if (this.outer) {
+      this.outer.destroy();
+    }
+    let xComponents = ChartHelpers.getXComponents(xType);
+    this.xAccessor = xComponents.accessor;
+    this.xScale = xComponents.scale;
+    this.xAxis = xComponents.axis;
+    this.xAxis.margin(0).tickLabelPadding(3);
+    this.yScale = LineChart.getYScaleFromType(yScaleType);
+    this.yAxis = new Plottable.Axes.Numeric(this.yScale, 'left');
+    let yFormatter = ChartHelpers.multiscaleFormatter(
+        ChartHelpers.Y_AXIS_FORMATTER_PRECISION);
+    this.yAxis.margin(0).tickLabelPadding(5).formatter(yFormatter);
+    this.yAxis.usesTextWidthApproximation(true);
+
+    this.dzl = new DragZoomLayer(
+        this.xScale, this.yScale, this.updateSpecialDatasets.bind(this));
+
+    let center = this.buildPlot(this.xAccessor, this.xScale, this.yScale);
+
+    this.gridlines =
+        new Plottable.Components.Gridlines(this.xScale, this.yScale);
+
+    let xZeroLine = new Plottable.Components.GuideLineLayer('horizontal');
+    xZeroLine.scale(this.yScale).value(0);
+    let yZeroLine = new Plottable.Components.GuideLineLayer('vertical');
+    yZeroLine.scale(this.xScale).value(0);
+
+    this.center = new Plottable.Components.Group(
+        [this.gridlines, xZeroLine, yZeroLine, center, this.dzl]);
+    this.outer = new Plottable.Components.Table(
+        [[this.yAxis, this.center], [null, this.xAxis]]);
+  }
+
+  private buildPlot(xAccessor, xScale, yScale): Plottable.Component {
+    this.scalarAccessor = (d: ChartHelpers.ScalarDatum) => d.scalar;
+    this.smoothedAccessor = (d: ChartHelpers.ScalarDatum) => d.smoothed;
+    let linePlot = new Plottable.Plots.Line<number|Date>();
+    linePlot.x(xAccessor, xScale);
+    linePlot.y(this.scalarAccessor, yScale);
+    linePlot.attr(
+        'stroke',
+        (d: ChartHelpers.Datum, i: number, dataset: Plottable.Dataset) =>
+            this.colorScale.scale(dataset.metadata().name));
+    this.linePlot = linePlot;
+    let group = this.setupTooltips(linePlot);
+
+    let smoothLinePlot = new Plottable.Plots.Line<number|Date>();
+    smoothLinePlot.x(xAccessor, xScale);
+    smoothLinePlot.y(this.smoothedAccessor, yScale);
+    smoothLinePlot.attr(
+        'stroke',
+        (d: ChartHelpers.Datum, i: number, dataset: Plottable.Dataset) =>
+            this.colorScale.scale(dataset.metadata().name));
+    this.smoothLinePlot = smoothLinePlot;
+
+    // The scatterPlot will display the last point for each dataset.
+    // This way, if there is only one datum for the series, it is still
+    // visible. We hide it when tooltips are active to keep things clean.
+    let scatterPlot = new Plottable.Plots.Scatter<number|Date, number>();
+    scatterPlot.x(xAccessor, xScale);
+    scatterPlot.y(this.scalarAccessor, yScale);
+    scatterPlot.attr('fill', (d: any) => this.colorScale.scale(d.name));
+    scatterPlot.attr('opacity', 1);
+    scatterPlot.size(ChartHelpers.TOOLTIP_CIRCLE_SIZE * 2);
+    scatterPlot.datasets([this.lastPointsDataset]);
+    this.scatterPlot = scatterPlot;
+
+    let nanDisplay = new Plottable.Plots.Scatter<number|Date, number>();
+    nanDisplay.x(xAccessor, xScale);
+    nanDisplay.y((x) => x.displayY, yScale);
+    nanDisplay.attr('fill', (d: any) => this.colorScale.scale(d.name));
+    nanDisplay.attr('opacity', 1);
+    nanDisplay.size(ChartHelpers.NAN_SYMBOL_SIZE * 2);
+    nanDisplay.datasets([this.nanDataset]);
+    nanDisplay.symbol(Plottable.SymbolFactories.triangle);
+    this.nanDisplay = nanDisplay;
+
+    return new Plottable.Components.Group(
+        [nanDisplay, scatterPlot, smoothLinePlot, group]);
+  }
+
+  /** Updates the chart when a dataset changes. Called every time the data of
+   * a dataset changes to update the charts.
+   */
+  private _onDatasetChanged(dataset: Plottable.Dataset) {
+    if (this.smoothingEnabled) {
+      this.resmoothDataset(dataset);
+    }
+    this.updateSpecialDatasets();
+  }
+
+  public ignoreYOutliers(ignoreYOutliers: boolean) {
+    if (ignoreYOutliers !== this._ignoreYOutliers) {
+      this._ignoreYOutliers = ignoreYOutliers;
+      this.updateSpecialDatasets();
+    }
+  }
+
+  private updateSpecialDatasets() {
+    if (this.smoothingEnabled) {
+      this.updateSpecialDatasetsWithAccessor(this.smoothedAccessor);
+    } else {
+      this.updateSpecialDatasetsWithAccessor(this.scalarAccessor);
+    }
+  }
+
+  /** Constructs special datasets. Each special dataset contains exceptional
+   * values from all of the regular datasets, e.g. last points in series, or
+   * NaN values. Those points will have a `name` and `relative` property added
+   * (since usually those are context in the surrounding dataset).
+   * The accessor will point to the correct data to access.
+   */
+  private updateSpecialDatasetsWithAccessor(accessor:
+                                                Plottable.IAccessor<number>) {
+    let lastPointsData =
+        this.datasets
+            .map((d) => {
+              let datum = null;
+              // filter out NaNs to ensure last point is a clean one
+              let nonNanData =
+                  d.data().filter((x) => !isNaN(accessor(x, -1, d)));
+              if (nonNanData.length > 0) {
+                let idx = nonNanData.length - 1;
+                datum = nonNanData[idx];
+                datum.name = d.metadata().name;
+                datum.relative = ChartHelpers.relativeAccessor(datum, -1, d);
+              }
+              return datum;
+            })
+            .filter((x) => x != null);
+    this.lastPointsDataset.data(lastPointsData);
+
+    // Take a dataset, return an array of NaN data points
+    // the NaN points will have a "displayY" property which is the
+    // y-value of a nearby point that was not NaN (0 if all points are NaN)
+    let datasetToNaNData = (d: Plottable.Dataset) => {
+      let displayY = null;
+      let data = d.data();
+      let i = 0;
+      while (i < data.length && displayY == null) {
+        if (!isNaN(accessor(data[i], -1, d))) {
+          displayY = accessor(data[i], -1, d);
+        }
+        i++;
+      }
+      if (displayY == null) {
+        displayY = 0;
+      }
+      let nanData = [];
+      for (i = 0; i < data.length; i++) {
+        if (!isNaN(accessor(data[i], -1, d))) {
+          displayY = accessor(data[i], -1, d);
+        } else {
+          data[i].name = d.metadata().name;
+          data[i].displayY = displayY;
+          data[i].relative = ChartHelpers.relativeAccessor(data[i], -1, d);
+          nanData.push(data[i]);
+        }
+      }
+      return nanData;
+    };
+    let nanData = _.flatten(this.datasets.map(datasetToNaNData));
+    this.nanDataset.data(nanData);
+
+    let datasetToValues: (d: Plottable.Dataset) => number[] = (d) => {
+      return d.data().map((x) => accessor(x, -1, d));
+    };
+    let vals = _.flatten(this.datasets.map(datasetToValues));
+    vals = vals.filter((x) => x === x && x !== Infinity && x !== -Infinity);
+    let domain = ChartHelpers.computeDomain(vals, this._ignoreYOutliers);
+    this.yScale.domain(domain);
+  }
+
+  private setupTooltips(plot: Plottable.XYPlot<number|Date, number>):
+      Plottable.Components.Group {
+    let pi = new Plottable.Interactions.Pointer();
+    pi.attachTo(plot);
+    // PointsComponent is a Plottable Component that will hold the little
+    // circles we draw over the closest data points
+    let pointsComponent = new Plottable.Component();
+    let group = new Plottable.Components.Group([plot, pointsComponent]);
+
+    let hideTooltips = () => {
+      this.tooltip.style('opacity', 0);
+      this.scatterPlot.attr('opacity', 1);
+      pointsComponent.content().selectAll('.point').remove();
+    };
+
+    let enabled = true;
+    let disableTooltips = () => {
+      enabled = false;
+      hideTooltips();
+    };
+    let enableTooltips = () => {
+      enabled = true;
+    };
+
+    this.dzl.interactionStart(disableTooltips);
+    this.dzl.interactionEnd(enableTooltips);
+
+    pi.onPointerMove((p: Plottable.Point) => {
+      if (!enabled) {
+        return;
+      }
+      let target: ChartHelpers.Point = {
+        x: p.x,
+        y: p.y,
+        datum: null,
+        dataset: null,
+      };
+
+
+      let bbox: SVGRect = (<any>this.gridlines.content().node()).getBBox();
+
+      // pts is the closets point to the tooltip for each dataset
+      let pts = plot.datasets()
+                    .map((dataset) => this.findClosestPoint(target, dataset))
+                    .filter(x => x != null);
+      let intersectsBBox = Plottable.Utils.DOM.intersectsBBox;
+      // We draw tooltips for points that are NaN, or are currently visible
+      let ptsForTooltips = pts.filter(
+          (p) => intersectsBBox(p.x, p.y, bbox) || isNaN(p.datum.scalar));
+      // Only draw little indicator circles for the non-NaN points
+      let ptsToCircle = ptsForTooltips.filter((p) => !isNaN(p.datum.scalar));
+
+      let ptsSelection: any =
+          pointsComponent.content().selectAll('.point').data(
+              ptsToCircle,
+              (p: ChartHelpers.Point) => p.dataset.metadata().name);
+      if (pts.length !== 0) {
+        ptsSelection.enter().append('circle').classed('point', true);
+        ptsSelection.attr('r', ChartHelpers.TOOLTIP_CIRCLE_SIZE)
+            .attr('cx', (p) => p.x)
+            .attr('cy', (p) => p.y)
+            .style('stroke', 'none')
+            .attr(
+                'fill',
+                (p) => this.colorScale.scale(p.dataset.metadata().name));
+        ptsSelection.exit().remove();
+        this.drawTooltips(ptsForTooltips, target);
+      } else {
+        hideTooltips();
+      }
+    });
+
+    pi.onPointerExit(hideTooltips);
+
+    return group;
+  }
+
+  private drawTooltips(
+      points: ChartHelpers.Point[], target: ChartHelpers.Point) {
+    // Formatters for value, step, and wall_time
+    this.scatterPlot.attr('opacity', 0);
+    let valueFormatter = ChartHelpers.multiscaleFormatter(
+        ChartHelpers.Y_TOOLTIP_FORMATTER_PRECISION);
+
+    let dist = (p: ChartHelpers.Point) =>
+        Math.pow(p.x - target.x, 2) + Math.pow(p.y - target.y, 2);
+    let closestDist = _.min(points.map(dist));
+
+    let valueSortMethod = this.scalarAccessor;
+    if (this.smoothingEnabled) {
+      valueSortMethod = this.smoothedAccessor;
+    }
+
+    if (this.tooltipSortingMethod === 'ascending') {
+      points = _.sortBy(points, (d) => valueSortMethod(d.datum, -1, d.dataset));
+    } else if (this.tooltipSortingMethod === 'descending') {
+      points = _.sortBy(points, (d) => valueSortMethod(d.datum, -1, d.dataset))
+                   .reverse();
+    } else if (this.tooltipSortingMethod === 'nearest') {
+      points = _.sortBy(points, dist);
+    } else {
+      // The 'default' sorting method maintains the order of names passed to
+      // setVisibleSeries(). However we reverse that order when defining the
+      // datasets. So we must call reverse again to restore the order.
+      points = points.slice(0).reverse();
+    }
+
+    let rows = this.tooltip.select('tbody')
+                   .html('')
+                   .selectAll('tr')
+                   .data(points)
+                   .enter()
+                   .append('tr');
+    // Grey out the point if any of the following are true:
+    // - The cursor is outside of the x-extent of the dataset
+    // - The point's y value is NaN
+    rows.classed('distant', (d) => {
+      let firstPoint = d.dataset.data()[0];
+      let lastPoint = _.last(d.dataset.data());
+      let firstX = this.xScale.scale(this.xAccessor(firstPoint, 0, d.dataset));
+      let lastX = this.xScale.scale(this.xAccessor(lastPoint, 0, d.dataset));
+      let s = this.smoothingEnabled ? d.datum.smoothed : d.datum.scalar;
+      return target.x < firstX || target.x > lastX || isNaN(s);
+    });
+    rows.classed('closest', (p) => dist(p) === closestDist);
+    // It is a bit hacky that we are manually applying the width to the swatch
+    // and the nowrap property to the text here. The reason is as follows:
+    // the style gets updated asynchronously by Polymer scopeSubtree observer.
+    // Which means we would get incorrect sizing information since the text
+    // would wrap by default. However, we need correct measurements so that
+    // we can stop the text from falling off the edge of the screen.
+    // therefore, we apply the size-critical styles directly.
+    rows.style('white-space', 'nowrap');
+    rows.append('td')
+        .append('span')
+        .classed('swatch', true)
+        .style(
+            'background-color',
+            (d) => this.colorScale.scale(d.dataset.metadata().name));
+    rows.append('td').text((d) => d.dataset.metadata().name);
+    if (this.smoothingEnabled) {
+      rows.append('td').text(
+          (d) => isNaN(d.datum.smoothed) ? 'NaN' :
+                                           valueFormatter(d.datum.smoothed));
+    }
+    rows.append('td').text(
+        (d) => isNaN(d.datum.scalar) ? 'NaN' : valueFormatter(d.datum.scalar));
+    rows.append('td').text((d) => ChartHelpers.stepFormatter(d.datum.step));
+    rows.append('td').text(
+        (d) => ChartHelpers.timeFormatter(d.datum.wall_time));
+    rows.append('td').text(
+        (d) => ChartHelpers.relativeFormatter(
+            ChartHelpers.relativeAccessor(d.datum, -1, d.dataset)));
+
+    // compute left position
+    let documentWidth = document.body.clientWidth;
+    let node: any = this.tooltip.node();
+    let parentRect = node.parentElement.getBoundingClientRect();
+    let nodeRect = node.getBoundingClientRect();
+    // prevent it from falling off the right side of the screen
+    let left = documentWidth - parentRect.left - nodeRect.width - 60, top = 0;
+
+    if (this.tooltipPosition === 'right') {
+      left = Math.min(parentRect.width, left);
+    } else {  // 'bottom'
+      left = Math.min(0, left);
+      top = parentRect.height + ChartHelpers.TOOLTIP_Y_PIXEL_OFFSET;
+    }
+
+    this.tooltip.style('transform', 'translate(' + left + 'px,' + top + 'px)');
+    this.tooltip.style('opacity', 1);
+  }
+
+  private findClosestPoint(
+      target: ChartHelpers.Point,
+      dataset: Plottable.Dataset): ChartHelpers.Point {
+    let points: ChartHelpers.Point[] = dataset.data().map((d, i) => {
+      let x = this.xAccessor(d, i, dataset);
+      let y = this.smoothingEnabled ? this.smoothedAccessor(d, i, dataset) :
+                                      this.scalarAccessor(d, i, dataset);
+      return {
+        x: this.xScale.scale(x),
+        y: this.yScale.scale(y),
+        datum: d,
+        dataset: dataset,
+      };
+    });
+    let idx: number =
+        _.sortedIndex(points, target, (p: ChartHelpers.Point) => p.x);
+    if (idx === points.length) {
+      return points[points.length - 1];
+    } else if (idx === 0) {
+      return points[0];
+    } else {
+      let prev = points[idx - 1];
+      let next = points[idx];
+      let prevDist = Math.abs(prev.x - target.x);
+      let nextDist = Math.abs(next.x - target.x);
+      return prevDist < nextDist ? prev : next;
+    }
+  }
+
+  private resmoothDataset(dataset: Plottable.Dataset) {
+    let data = dataset.data();
+    const smoothingWeight = this.smoothingWeight;
+    let last = data.length > 0 ? data[0].scalar : NaN;
+    data.forEach((d) => {
+      if (!_.isFinite(last)) {
+        d.smoothed = d.scalar;
+      } else {
+        // 1st-order IIR low-pass filter to attenuate the higher-
+        // frequency components of the time-series.
+        d.smoothed = last * smoothingWeight + (1 - smoothingWeight) * d.scalar;
+      }
+      last = d.smoothed;
+    });
+  }
+
+  private getDataset(name: string) {
+    if (this.name2datasets[name] === undefined) {
+      this.name2datasets[name] = new Plottable.Dataset([], {name: name});
+    }
+    return this.name2datasets[name];
+  }
+
+  static getYScaleFromType(yScaleType: string):
+      Plottable.QuantitativeScale<number> {
+    if (yScaleType === 'log') {
+      return new Plottable.Scales.ModifiedLog();
+    } else if (yScaleType === 'linear') {
+      return new Plottable.Scales.Linear();
+    } else {
+      throw new Error('Unrecognized yScale type ' + yScaleType);
+    }
+  }
+
+  /**
+   * Update the selected series on the chart.
+   */
+  public setVisibleSeries(names: string[]) {
+    names = names.sort();
+    this.seriesNames = names;
+
+    names.reverse();  // draw first series on top
+    this.datasets.forEach((d) => d.offUpdate(this.onDatasetChanged));
+    this.datasets = names.map((r) => this.getDataset(r));
+    this.datasets.forEach((d) => d.onUpdate(this.onDatasetChanged));
+    this.linePlot.datasets(this.datasets);
+
+    if (this.smoothingEnabled) {
+      this.smoothLinePlot.datasets(this.datasets);
+    }
+    this.updateSpecialDatasets();
+  }
+
+  /**
+   * Set the data of a series on the chart.
+   */
+  public setSeriesData(name: string, data: ChartHelpers.ScalarDatum[]) {
+    this.getDataset(name).data(data);
+  }
+
+  public smoothingUpdate(weight: number) {
+    this.smoothingWeight = weight;
+    this.datasets.forEach((d) => this.resmoothDataset(d));
+
+    if (!this.smoothingEnabled) {
+      this.linePlot.addClass('ghost');
+      this.scatterPlot.y(this.smoothedAccessor, this.yScale);
+      this.smoothingEnabled = true;
+      this.smoothLinePlot.datasets(this.datasets);
+    }
+
+    this.updateSpecialDatasetsWithAccessor(this.smoothedAccessor);
+  }
+
+  public smoothingDisable() {
+    if (this.smoothingEnabled) {
+      this.linePlot.removeClass('ghost');
+      this.scatterPlot.y(this.scalarAccessor, this.yScale);
+      this.smoothLinePlot.datasets([]);
+      this.smoothingEnabled = false;
+      this.updateSpecialDatasetsWithAccessor(this.scalarAccessor);
+    }
+  }
+
+  public setTooltipSortingMethod(method: string) {
+    this.tooltipSortingMethod = method;
+  }
+
+  public setTooltipPosition(position: string) {
+    this.tooltipPosition = position;
+  }
+
+  public renderTo(targetSVG: d3.Selection<any, any, any, any>) {
+    this.targetSVG = targetSVG;
+    this.outer.renderTo(targetSVG);
+  }
+
+  public redraw() {
+    this.outer.redraw();
+  }
+
+  public destroy() {
+    this.outer.destroy();
+  }
+}
-- 
GitLab


From ec1672fbb2b4d26e1d8aced87ac47098b5afb165 Mon Sep 17 00:00:00 2001
From: Yuan Yu <yuanbyu@google.com>
Date: Mon, 24 Apr 2017 14:57:45 -0800
Subject: [PATCH 0653/1563] Add a test. Change: 154110196

---
 tensorflow/python/kernel_tests/rnn_test.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/kernel_tests/rnn_test.py b/tensorflow/python/kernel_tests/rnn_test.py
index c5d26408c2..5f61c54c78 100644
--- a/tensorflow/python/kernel_tests/rnn_test.py
+++ b/tensorflow/python/kernel_tests/rnn_test.py
@@ -402,7 +402,7 @@ def dynamic_rnn_swap_memory_benchmark(batch_size, max_time, num_units):
 
 
 def rnn_long_sequence_benchmark(batch_size, seqlen, num_units, dynamic,
-                                swap_memory):
+                                swap_memory, nn):
   config = config_pb2.ConfigProto()
   config.allow_soft_placement = True
 
@@ -415,7 +415,7 @@ def rnn_long_sequence_benchmark(batch_size, seqlen, num_units, dynamic,
   ]
   inputs = np.dstack(inputs_list).transpose([0, 2, 1])  # batch x time x depth
 
-  for _ in range(5):
+  for _ in range(nn):
     if dynamic:
       with session.Session(config=config, graph=ops_lib.Graph()) as sess:
         inputs_t = variables_lib.Variable(inputs, trainable=False).value()
@@ -548,6 +548,23 @@ class BenchmarkRNN(test.Benchmark):
                 iters=20,
                 wall_time=t_dt)
 
+  def _benchmarkDynamicLSTMMemorySwapLongSeq(self):
+    """The memory swapping test for the SOSP submission."""
+    print("Calculation: Long LSTM Sequence")
+    print("batch \t len \t units \t dynamic \t elapsed_t \t elapsed_t/len")
+    batch_size = 512
+    seqlen = 800
+    num_units = 512
+    dynamic = True
+    swap_memory = True
+    # Some warming up.
+    if swap_memory:
+      rnn_long_sequence_benchmark(batch_size, seqlen, num_units,
+                                  dynamic, swap_memory, 2)
+    # Measure the performance.
+    for slen in xrange(100, 1100, 100):
+      rnn_long_sequence_benchmark(batch_size, slen, num_units, dynamic,
+                                  swap_memory, 3)
 
 if __name__ == "__main__":
   test.main()
-- 
GitLab


From 1c287dbaae348846477d70c85cbc5b6985dba77b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 24 Apr 2017 15:06:59 -0800
Subject: [PATCH 0654/1563] Added docker containers to ci_build that use clang
 as a CUDA compiler Change: 154111461

---
 .../tools/ci_build/Dockerfile.gpu_clang       | 36 ++++++++++++++
 tensorflow/tools/ci_build/builds/configured   |  4 ++
 tensorflow/tools/ci_build/ci_build.sh         |  6 +--
 .../tools/ci_build/ci_parameterized_build.sh  | 13 +++--
 .../install/build_and_install_clang.sh        | 49 +++++++++++++++++++
 .../install/install_cmake_for_clang.sh        | 19 +++++++
 .../ci_build/install/install_deb_packages.sh  | 17 ++++++-
 7 files changed, 136 insertions(+), 8 deletions(-)
 create mode 100644 tensorflow/tools/ci_build/Dockerfile.gpu_clang
 create mode 100755 tensorflow/tools/ci_build/install/build_and_install_clang.sh
 create mode 100755 tensorflow/tools/ci_build/install/install_cmake_for_clang.sh

diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu_clang b/tensorflow/tools/ci_build/Dockerfile.gpu_clang
new file mode 100644
index 0000000000..00aaa9f760
--- /dev/null
+++ b/tensorflow/tools/ci_build/Dockerfile.gpu_clang
@@ -0,0 +1,36 @@
+FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu14.04
+
+MAINTAINER Ilya Biryukov <ibiryukov@google.com>
+
+# In the Ubuntu 14.04 images, cudnn is placed in system paths. Move them to
+# /usr/local/cuda
+RUN cp /usr/include/cudnn.h /usr/local/cuda/include
+RUN cp /usr/lib/x86_64-linux-gnu/libcudnn* /usr/local/cuda/lib64
+
+# Copy and run the install scripts.
+COPY install/*.sh /install/
+RUN /install/install_bootstrap_deb_packages.sh
+RUN add-apt-repository -y ppa:openjdk-r/ppa
+
+# LLVM requires cmake version 3.4.3, but ppa:george-edison55/cmake-3.x only
+# provides version 3.2.2.
+# So we skip it in `install_deb_packages.sh`, and later install it from
+# https://cmake.org in `install_cmake_for_clang.sh`.
+RUN /install/install_deb_packages.sh --without_cmake
+RUN /install/install_pip_packages.sh
+RUN /install/install_bazel.sh
+RUN /install/install_golang.sh
+
+# Install cmake and build clang
+RUN /install/install_cmake_for_clang.sh
+RUN /install/build_and_install_clang.sh
+
+# Set up the master bazelrc configuration file.
+COPY install/.bazelrc /etc/bazel.bazelrc
+ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
+
+# Configure the build for our CUDA configuration.
+ENV TF_NEED_CUDA 1
+ENV TF_CUDA_CLANG 1
+ENV CLANG_CUDA_COMPILER_PATH /usr/local/bin/clang
+ENV TF_CUDA_COMPUTE_CAPABILITIES 3.0
diff --git a/tensorflow/tools/ci_build/builds/configured b/tensorflow/tools/ci_build/builds/configured
index f813d6c13f..25cb51ea7c 100755
--- a/tensorflow/tools/ci_build/builds/configured
+++ b/tensorflow/tools/ci_build/builds/configured
@@ -47,6 +47,10 @@ export CI_BUILD_PYTHON="${CI_BUILD_PYTHON:-python}"
 export PYTHON_BIN_PATH="${PYTHON_BIN_PATH:-$(which ${CI_BUILD_PYTHON})}"
 if [ "${CONTAINER_TYPE}" == "gpu" ]; then
   export TF_NEED_CUDA=1
+elif [ "${CONTAINER_TYPE}" == "gpu_clang" ]; then
+  export TF_NEED_CUDA=1
+  export TF_CUDA_CLANG=1
+  export CLANG_CUDA_COMPILER_PATH="/usr/local/bin/clang"
 else
   export TF_NEED_CUDA=0
 fi
diff --git a/tensorflow/tools/ci_build/ci_build.sh b/tensorflow/tools/ci_build/ci_build.sh
index f0fa8a9381..3b640dd5e8 100755
--- a/tensorflow/tools/ci_build/ci_build.sh
+++ b/tensorflow/tools/ci_build/ci_build.sh
@@ -18,7 +18,7 @@
 #                    <COMMAND>
 #
 # CONTAINER_TYPE: Type of the docker container used the run the build:
-#                 e.g., (cpu | gpu | android | tensorboard)
+#                 e.g., (cpu | gpu | gpu_clang | android | tensorboard)
 #
 # DOCKERFILE_PATH: (Optional) Path to the Dockerfile used for docker build.
 #                  If this optional value is not supplied (via the
@@ -84,7 +84,7 @@ if [[ "${CONTAINER_TYPE}" == "cmake" ]]; then
 fi
 
 # Use nvidia-docker if the container is GPU.
-if [[ "${CONTAINER_TYPE}" == "gpu" ]]; then
+if [[ "${CONTAINER_TYPE}" == "gpu" ]] || [[ "${CONTAINER_TYPE}" == "gpu_clang" ]]; then
   DOCKER_BINARY="nvidia-docker"
 else
   DOCKER_BINARY="docker"
@@ -104,7 +104,7 @@ BUILD_TAG="${BUILD_TAG:-tf_ci}"
 
 # Add extra params for cuda devices and libraries for GPU container.
 # And clear them if we are not building for GPU.
-if [ "${CONTAINER_TYPE}" != "gpu" ]; then
+if [[ "${CONTAINER_TYPE}" != "gpu" ]] && [[ "${CONTAINER_TYPE}" != "gpu_clang" ]]; then
   GPU_EXTRA_PARAMS=""
 fi
 
diff --git a/tensorflow/tools/ci_build/ci_parameterized_build.sh b/tensorflow/tools/ci_build/ci_parameterized_build.sh
index 5d262aa91a..fd3eff4ee6 100755
--- a/tensorflow/tools/ci_build/ci_parameterized_build.sh
+++ b/tensorflow/tools/ci_build/ci_parameterized_build.sh
@@ -18,7 +18,7 @@
 #   ci_parameterized_build.sh
 #
 # The script obeys the following required environment variables:
-#   TF_BUILD_CONTAINER_TYPE:   (CPU | GPU | ANDROID | ANDROID_FULL)
+#   TF_BUILD_CONTAINER_TYPE:   (CPU | GPU | GPU_CLANG | ANDROID | ANDROID_FULL)
 #   TF_BUILD_PYTHON_VERSION:   (PYTHON2 | PYTHON3 | PYTHON3.5)
 #   TF_BUILD_IS_PIP:           (NO_PIP | PIP | BOTH)
 #
@@ -224,8 +224,13 @@ fi
 # Process container type
 if [[ ${CTYPE} == "cpu" ]] || [[ ${CTYPE} == "debian.jessie.cpu" ]]; then
   :
-elif [[ ${CTYPE} == "gpu" ]]; then
-  OPT_FLAG="${OPT_FLAG} --config=cuda"
+elif [[ ${CTYPE} == "gpu" ]] || [[ ${CTYPE} == "gpu_clang" ]]; then
+  if [[ ${CTYPE} == "gpu" ]]; then
+    OPT_FLAG="${OPT_FLAG} --config=cuda"
+  else # ${CTYPE} == "gpu_clang"
+    OPT_FLAG="${OPT_FLAG} --config=cuda_clang"
+  fi
+
 
   # Attempt to determine CUDA capability version automatically and use it if
   # CUDA capability version is not specified by the environment variables.
@@ -363,7 +368,7 @@ if [[ ${TF_BUILD_IS_PIP} == "no_pip" ]] ||
     # CPU only command, fully parallel.
     NO_PIP_MAIN_CMD="${MAIN_CMD} ${BAZEL_CMD} ${OPT_FLAG} ${EXTRA_ARGS} -- "\
 "${BAZEL_TARGET}"
-  elif [[ ${CTYPE} == "gpu" ]]; then
+  elif [[ ${CTYPE} == "gpu" ]] || [[ ${CTYPE} == "gpu_clang" ]]; then
     # GPU only command, run as many jobs as the GPU count only.
     NO_PIP_MAIN_CMD="${BAZEL_CMD} ${OPT_FLAG} "\
 "--local_test_jobs=${TF_GPU_COUNT} "\
diff --git a/tensorflow/tools/ci_build/install/build_and_install_clang.sh b/tensorflow/tools/ci_build/install/build_and_install_clang.sh
new file mode 100755
index 0000000000..3fb9964948
--- /dev/null
+++ b/tensorflow/tools/ci_build/install/build_and_install_clang.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+set -ex
+
+LLVM_SVN_REVISION="299268"
+CLANG_TMP_DIR=/tmp/clang-build
+
+mkdir "$CLANG_TMP_DIR"
+
+pushd "$CLANG_TMP_DIR"
+
+# Checkout llvm+clang
+svn co -q -r$LLVM_SVN_REVISION http://llvm.org/svn/llvm-project/llvm/trunk "$CLANG_TMP_DIR/llvm"
+svn co -q -r$LLVM_SVN_REVISION http://llvm.org/svn/llvm-project/cfe/trunk "$CLANG_TMP_DIR/llvm/tools/clang"
+
+# Build 1st stage. Compile clang with system compiler
+mkdir "$CLANG_TMP_DIR/build-1"
+cd "$CLANG_TMP_DIR/build-1"
+cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release "$CLANG_TMP_DIR/llvm"
+make -j `nproc` clang clang-headers
+
+# Build 2nd stage. Compile clang with clang built in stage 1
+mkdir "$CLANG_TMP_DIR/build-2"
+cd "$CLANG_TMP_DIR/build-2"
+
+CC="$CLANG_TMP_DIR/build-1/bin/clang" \
+CXX="$CLANG_TMP_DIR/build-1/bin/clang++" \
+cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local "$CLANG_TMP_DIR/llvm"
+
+make -j `nproc` install-clang install-clang-headers
+
+popd
+
+# Cleanup
+rm -rf "$CLANG_TMP_DIR"
diff --git a/tensorflow/tools/ci_build/install/install_cmake_for_clang.sh b/tensorflow/tools/ci_build/install/install_cmake_for_clang.sh
new file mode 100755
index 0000000000..3e626a69ab
--- /dev/null
+++ b/tensorflow/tools/ci_build/install/install_cmake_for_clang.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
+
+wget -O - "${CMAKE_URL}" | tar xzf - -C /usr/local --strip-components=1
diff --git a/tensorflow/tools/ci_build/install/install_deb_packages.sh b/tensorflow/tools/ci_build/install/install_deb_packages.sh
index a62a6f8a3c..6b160bbe03 100755
--- a/tensorflow/tools/ci_build/install/install_deb_packages.sh
+++ b/tensorflow/tools/ci_build/install/install_deb_packages.sh
@@ -13,11 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
+#
+# Usage:
+#     ./install_deb_packages [--without_cmake]
+# Pass --without_cmake to prevent cmake from being installed with apt-get
 
 set -e
 ubuntu_version=$(cat /etc/issue | grep -i ubuntu | awk '{print $2}' | \
   awk -F'.' '{print $1}')
 
+if [[ "$1" != "" ]] && [[ "$1" != "--without_cmake" ]]; then
+  echo "Unknown argument '$1'"
+  exit 1
+fi
+
 # Install dependencies from ubuntu deb repository.
 apt-get update
 
@@ -32,7 +41,6 @@ apt-get install -y --no-install-recommends \
     autoconf \
     automake \
     build-essential \
-    cmake \
     curl \
     ffmpeg \
     git \
@@ -48,12 +56,19 @@ apt-get install -y --no-install-recommends \
     python3-setuptools \
     rsync \
     sudo \
+    subversion \
     swig \
     unzip \
     wget \
     zip \
     zlib1g-dev
 
+if [[ "$1" != "--without_cmake" ]]; then
+  apt-get install -y --no-install-recommends \
+    cmake
+fi
+
+
 # Install ca-certificates, and update the certificate store.
 apt-get install -y ca-certificates-java
 update-ca-certificates -f
-- 
GitLab


From cc73a445657a48a422b949d8259797d7373a099d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Mon, 24 Apr 2017 16:30:17 -0800
Subject: [PATCH 0655/1563] Remove the tensorboard component BUILD files from
 opensource, as they are not yet well supported. Change: 154121093

---
 tensorflow/BUILD                              |   9 --
 .../components/tf_audio_dashboard/BUILD       |  61 -----------
 .../components/tf_audio_dashboard/demo/BUILD  |  26 -----
 .../tf_audio_dashboard/demo/data/BUILD        |  17 ---
 .../tensorboard/components/tf_backend/BUILD   |  79 --------------
 .../components/tf_color_scale/BUILD           |  63 -----------
 .../components/tf_color_scale/demo/BUILD      |  26 -----
 .../components/tf_dashboard_common/BUILD      | 100 ------------------
 .../components/tf_dashboard_common/demo/BUILD |  31 ------
 .../tf_distribution_dashboard/BUILD           |  60 -----------
 .../tf_distribution_dashboard/demo/BUILD      |  26 -----
 .../tf_distribution_dashboard/demo/data/BUILD |  17 ---
 .../tensorboard/components/tf_globals/BUILD   |  49 ---------
 .../components/tf_graph_common/BUILD          |  65 ------------
 .../components/tf_histogram_dashboard/BUILD   |  60 -----------
 .../tf_histogram_dashboard/demo/BUILD         |  26 -----
 .../tf_histogram_dashboard/demo/data/BUILD    |  17 ---
 .../components/tf_image_dashboard/BUILD       |  56 ----------
 .../components/tf_image_dashboard/demo/BUILD  |  25 -----
 .../tf_image_dashboard/demo/data/BUILD        |  17 ---
 .../tensorboard/components/tf_imports/BUILD   |  57 ----------
 .../components/tf_imports_d3v4/BUILD          |  57 ----------
 .../components/tf_scalar_dashboard/BUILD      |  75 -------------
 .../components/tf_scalar_dashboard/demo/BUILD |  26 -----
 .../tf_scalar_dashboard/demo/data/BUILD       |  17 ---
 .../tensorboard/components/tf_storage/BUILD   |  70 ------------
 .../components/tf_text_dashboard/BUILD        |  58 ----------
 .../components/tf_text_dashboard/demo/BUILD   |  25 -----
 .../tf_text_dashboard/demo/data/BUILD         |  17 ---
 .../components/vz_distribution_chart/BUILD    |  71 -------------
 .../vz_distribution_chart/demo/BUILD          |  24 -----
 .../vz_distribution_chart_d3v4/BUILD          |  67 ------------
 .../components/vz_histogram_timeseries/BUILD  |  47 --------
 .../vz_histogram_timeseries/demo/BUILD        |  25 -----
 .../vz_histogram_timeseries_d3v4/BUILD        |  60 -----------
 .../components/vz_line_chart/BUILD            |  71 -------------
 .../components/vz_line_chart/demo/BUILD       |  24 -----
 .../components/vz_line_chart_d3v4/BUILD       |  67 ------------
 .../tensorboard/components/vz_sorting/BUILD   |  48 ---------
 .../components/vz_sorting/test/BUILD          |  35 ------
 40 files changed, 1771 deletions(-)
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_globals/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_imports/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_storage/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_sorting/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_sorting/test/BUILD

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index e4451a92d4..d55228bf50 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -314,15 +314,6 @@ filegroup(
         "//tensorflow/tensorboard/backend:all_files",
         "//tensorflow/tensorboard/backend/event_processing:all_files",
         "//tensorflow/tensorboard/components:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_common:all_files",
-        "//tensorflow/tensorboard/components/tf_text_dashboard:all_files",
-        "//tensorflow/tensorboard/components/vz_data_summary:all_files",
-        "//tensorflow/tensorboard/components/vz_line_chart:all_files",
-        "//tensorflow/tensorboard/components/vz_line_chart/demo:all_files",
-        "//tensorflow/tensorboard/components/vz_projector:all_files",
-        "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_sorting:all_files",
-        "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
deleted file mode 100644
index aebf9152b1..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_audio_dashboard",
-    srcs = [
-        "tf-audio-dashboard.html",
-        "tf-audio-grid.html",
-        "tf-audio-loader.html",
-    ],
-    path = "/tf-audio-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-audio-dashboard.html",
-        "tf-audio-grid.html",
-        "tf-audio-loader.html",
-    ],
-    destdir = "tf-audio-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-    ],
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
-)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
deleted file mode 100644
index 383ea8d1b6..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_audio_dashboard/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-audio-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_audio_dashboard",
-        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo/data",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
deleted file mode 100644
index c3824a923d..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-audio-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_backend/BUILD b/tensorflow/tensorboard/components/tf_backend/BUILD
deleted file mode 100644
index 22ab1faff0..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/BUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# TODO(dandelion): Add webfiles support for the test code.
-
-webfiles(
-    name = "tf_backend",
-    srcs = [
-        "tf-backend.html",
-        ":ts",
-    ],
-    path = "/tf-backend",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_sorting",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "backend.ts",
-        "behavior.ts",
-        "requestManager.ts",
-        "router.ts",
-        "urlPathHelpers.ts",
-    ],
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-        "//tensorflow/tensorboard/components/vz_sorting:ts_typings",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-backend.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "tf-backend",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "backend.ts",
-        "behavior.ts",
-        "requestManager.ts",
-        "router.ts",
-        "urlPathHelpers.ts",
-    ],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_color_scale/BUILD b/tensorflow/tensorboard/components/tf_color_scale/BUILD
deleted file mode 100644
index 75bf812fe5..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/BUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# TODO(dandelion): Add webfiles support for the test code.
-
-webfiles(
-    name = "tf_color_scale",
-    srcs = [
-        "tf-color-scale.html",
-        ":ts",
-    ],
-    path = "/tf-color-scale",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "colorScale.ts",
-        "palettes.ts",
-    ],
-    typings = ["@org_definitelytyped//:d3.d.ts"],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-color-scale.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-color-scale",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "colorScale.ts",
-        "palettes.ts",
-    ],
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
-)
diff --git a/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD b/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
deleted file mode 100644
index 00b8a033b8..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_color_scale/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-color-scale/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
deleted file mode 100644
index fd43970fc0..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_dashboard_common",
-    srcs = glob(["*.html"]) + [
-        ":ts",
-    ],
-    path = "/tf-dashboard-common",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/tf_imports:plottable",
-        "//tensorflow/tensorboard/components/tf_storage",
-        "//tensorflow/tensorboard/components/vz_sorting",
-        "@org_polymer",
-        "@org_polymer_iron_ajax",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_iron_icons",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_checkbox",
-        "@org_polymer_paper_dialog",
-        "@org_polymer_paper_dropdown_menu",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_input",
-        "@org_polymer_paper_item",
-        "@org_polymer_paper_menu",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-        "@org_polymer_paper_styles",
-        "@org_polymer_paper_toggle_button",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "categorizer.ts",
-        "dashboard-behavior.ts",
-        "reload-behavior.ts",
-    ],
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "//tensorflow/tensorboard/components/vz_sorting:ts_typings",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = glob(["*.html"]) + [":legacy_ts"],
-    destdir = "tf-dashboard-common",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/tf_storage:legacy",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/polymer/v1/iron-ajax:lib",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/iron-icons:lib",
-        "//third_party/javascript/polymer/v1/paper-button:lib",
-        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
-        "//third_party/javascript/polymer/v1/paper-dialog:lib",
-        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-input:lib",
-        "//third_party/javascript/polymer/v1/paper-item:lib",
-        "//third_party/javascript/polymer/v1/paper-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-slider:lib",
-        "//third_party/javascript/polymer/v1/paper-spinner:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "categorizer.ts",
-        "dashboard-behavior.ts",
-        "reload-behavior.ts",
-    ],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
deleted file mode 100644
index 05cfe34e72..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_dashboard_common/demo
-webfiles(
-    name = "demo",
-    srcs = [
-        "tf-categorizer-demo.html",
-        "tf-collapsable-pane-demo.html",
-        "tf-multi-checkbox-demo.html",
-        "tf-regex-group-demo.html",
-    ],
-    path = "/tf-dashboard-common/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_flex_layout",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
deleted file mode 100644
index 726fdbca93..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_distribution_dashboard",
-    srcs = [
-        "tf-distribution-dashboard.html",
-    ],
-    path = "/tf-distribution-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_distribution_chart",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-distribution-dashboard.html",
-    ],
-    destdir = "tf-distribution-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/vz_distribution_chart:legacy",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-    ],
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
-)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
deleted file mode 100644
index 238937c0c2..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_distribution_dashboard/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-distribution-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard",
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
deleted file mode 100644
index 589c1980e4..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-distribution-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_globals/BUILD b/tensorflow/tensorboard/components/tf_globals/BUILD
deleted file mode 100644
index 21724aa26b..0000000000
--- a/tensorflow/tensorboard/components/tf_globals/BUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# TODO(dandelion): Add webfiles support for the test code.
-
-webfiles(
-    name = "tf_globals",
-    srcs = [
-        "tf-globals.html",
-        ":ts",
-    ],
-    path = "/tf-globals",
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = ["globals.ts"],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-globals.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-globals",
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "globals.ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_common/BUILD b/tensorflow/tensorboard/components/tf_graph_common/BUILD
deleted file mode 100644
index 1931d7b536..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/BUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_graph_common",
-    srcs = [
-        "tf-graph-common.html",
-        ":ts",
-    ],
-    path = "/tf-graph-common",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:dagre",
-        "//tensorflow/tensorboard/components/tf_imports:graphlib",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = glob(["*.ts"]),
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-        "@org_definitelytyped//:polymer.d.ts",
-        "@org_definitelytyped//:webcomponents.js.d.ts",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-common.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-graph-common",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = glob(["*.ts"]),
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
deleted file mode 100644
index 2c7d0ea6e0..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_histogram_dashboard",
-    srcs = [
-        "tf-histogram-dashboard.html",
-    ],
-    path = "/tf-histogram-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-histogram-dashboard.html",
-    ],
-    destdir = "tf-histogram-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries:legacy",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-    ],
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
-)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
deleted file mode 100644
index 8350084874..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_histogram_dashboard/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-histogram-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard",
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
deleted file mode 100644
index d396efab73..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-histogram-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
deleted file mode 100644
index 58c7cf8cd5..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_image_dashboard",
-    srcs = [
-        "tf-image-dashboard.html",
-        "tf-image-loader.html",
-    ],
-    path = "/tf-image-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-        "@org_polymer_paper_dialog",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-image-dashboard.html",
-        "tf-image-loader.html",
-    ],
-    destdir = "tf-image-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
deleted file mode 100644
index 3a42342ca0..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_image_dashboard/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-image-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_image_dashboard",
-        "//tensorflow/tensorboard/components/tf_image_dashboard/demo/data",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
deleted file mode 100644
index a613ac66c7..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-image-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_imports/BUILD b/tensorflow/tensorboard/components/tf_imports/BUILD
deleted file mode 100644
index 5655407b30..0000000000
--- a/tensorflow/tensorboard/components/tf_imports/BUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "d3",
-    srcs = [
-        "d3.html",
-        "@org_d3js",
-    ],
-    path = "/tf-imports",
-)
-
-webfiles(
-    name = "lodash",
-    srcs = [
-        "lodash.html",
-        "@com_lodash",
-    ],
-    path = "/tf-imports",
-)
-
-webfiles(
-    name = "graphlib",
-    srcs = [
-        "graphlib.html",
-        "@io_github_cpettitt_graphlib",
-    ],
-    path = "/tf-imports",
-    deps = [":lodash"],
-)
-
-webfiles(
-    name = "dagre",
-    srcs = [
-        "dagre.html",
-        "@io_github_cpettitt_dagre",
-    ],
-    path = "/tf-imports",
-    deps = [
-        ":graphlib",
-        ":lodash",
-    ],
-)
-
-webfiles(
-    name = "plottable",
-    srcs = [
-        "plottable.html",
-        "@com_palantir_plottable//:plottable.css",
-        "@com_palantir_plottable//:plottable.js",
-    ],
-    path = "/tf-imports",
-    deps = [":d3"],
-)
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
deleted file mode 100644
index 8d8542c447..0000000000
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "d3",
-    srcs = [
-        "d3.html",
-        "//third_party/javascript/d3/v4:d3.js",
-    ],
-    path = "/tf-imports-d3v4",
-)
-
-webfiles(
-    name = "lodash",
-    srcs = [
-        "lodash.html",
-        "@com_lodash",
-    ],
-    path = "/tf-imports-d3v4",
-)
-
-webfiles(
-    name = "graphlib",
-    srcs = [
-        "graphlib.html",
-        "@io_github_cpettitt_graphlib",
-    ],
-    path = "/tf-imports-d3v4",
-    deps = [":lodash"],
-)
-
-webfiles(
-    name = "dagre",
-    srcs = [
-        "dagre.html",
-        "@io_github_cpettitt_dagre",
-    ],
-    path = "/tf-imports-d3v4",
-    deps = [
-        ":graphlib",
-        ":lodash",
-    ],
-)
-
-webfiles(
-    name = "plottable",
-    srcs = [
-        "plottable.html",
-        "//third_party/javascript/plottable/v3:plottable.css",
-        "//third_party/javascript/plottable/v3:plottable.js",
-    ],
-    path = "/tf-imports-d3v4",
-    deps = [":d3"],
-)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
deleted file mode 100644
index 57bad96af6..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_scalar_dashboard",
-    srcs = [
-        "tf-scalar-dashboard.html",
-        "tf-smoothing-input.html",
-    ],
-    path = "/tf-scalar-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_line_chart",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_paper_checkbox",
-        "@org_polymer_paper_dropdown_menu",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_input",
-        "@org_polymer_paper_item",
-        "@org_polymer_paper_menu",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-scalar-dashboard.html",
-        "tf-smoothing-input.html",
-    ],
-    destdir = "tf-scalar-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_color_scale:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/vz_line_chart:legacy",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
-        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-input:lib",
-        "//third_party/javascript/polymer/v1/paper-item:lib",
-        "//third_party/javascript/polymer/v1/paper-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-slider:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-    ],
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
-)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
deleted file mode 100644
index 218fda3fdb..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_scalar_dashboard/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-scalar-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
deleted file mode 100644
index 7f39d27f60..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-scalar-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_storage/BUILD b/tensorflow/tensorboard/components/tf_storage/BUILD
deleted file mode 100644
index b97c98ae4b..0000000000
--- a/tensorflow/tensorboard/components/tf_storage/BUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# TODO(dandelion): Add webfiles support for the test code.
-
-webfiles(
-    name = "tf_storage",
-    srcs = [
-        "tf-storage.html",
-        ":ts",
-    ],
-    path = "/tf-storage",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_globals",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "storage.ts",
-    ],
-    typings = [
-        "@org_definitelytyped//:lodash.d.ts",
-        "//tensorflow/tensorboard/components/tf_globals:ts_typings",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-storage.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "tf-storage",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/tf_globals:legacy",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "storage.ts",
-    ],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps",
-        "//tensorflow/tensorboard/components/tf_globals:legacy_ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
deleted file mode 100644
index 9e4cd3614d..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "tf_text_dashboard",
-    srcs = [
-        "tf-text-dashboard.html",
-        "tf-text-loader.html",
-    ],
-    path = "/tf-text-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-        "@org_polymer_paper_dialog",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_material",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-text-dashboard.html",
-        "tf-text-loader.html",
-    ],
-    destdir = "tf-text-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//third_party/javascript/polymer/v1/paper-material:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
deleted file mode 100644
index 6cd6702e4b..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_text_dashboard/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-text-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_text_dashboard",
-        "//tensorflow/tensorboard/components/tf_text_dashboard/demo/data",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
deleted file mode 100644
index 8adf661396..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-text-dashboard/demo/data/plugin/text",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
deleted file mode 100644
index 225afe79d6..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "vz_distribution_chart",
-    srcs = [
-        "vz-distribution-chart.html",
-        ":ts",
-    ],
-    path = "/vz-distribution-chart",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/tf_imports:plottable",
-        "//tensorflow/tensorboard/components/vz_line_chart",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "vz-distribution-chart.ts",
-    ],
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@com_palantir_plottable//:plottable.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-        "//tensorflow/tensorboard/components/vz_line_chart:ts_typings",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "vz-distribution-chart.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-distribution-chart",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "vz-distribution-chart.ts",
-    ],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps",
-        "//tensorflow/tensorboard/components/vz_line_chart:legacy_ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
deleted file mode 100644
index 77f05aa2d4..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_distribution_chart/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/vz-distribution-chart/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_distribution_chart",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
deleted file mode 100644
index aa84b75863..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load(
-    "//javascript/typescript:build_defs.bzl",
-    "ts_development_sources",
-    "ts_library",
-    "ts_devserver",
-)
-load(
-    "//third_party/javascript/polymer/build_defs:build_defs.bzl",
-    "webcomponent_library",
-)
-
-licenses(["notice"])  # Apache 2.0
-
-ts_library(
-    name = "ts",
-    srcs = [
-        "vz-distribution-chart.ts",
-    ],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps_d3v4",
-        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:ts",
-        "//third_party/javascript/lodash:lodash-module",
-        "//third_party/javascript/plottable/v3:bundle",
-    ],
-)
-
-webcomponent_library(
-    name = "vz_distribution_chart",
-    srcs = [
-        "demo.html",
-        "vz-distribution-chart.html",
-    ],
-    ts_lib_deps = [":ts"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/plottable/v3:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-webcomponent_library(
-    name = "demo",
-    srcs = ["demo.html"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":vz_distribution_chart",
-        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    manifest = ":dev_sources",
-    serving_path = "/demo_out/bundle.js",
-    static_files = [":demo"],
-)
-
-ts_development_sources(
-    name = "dev_sources",
-    deps = [
-        ":ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
deleted file mode 100644
index 49920b11a1..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "vz_histogram_timeseries",
-    srcs = [
-        "vz-histogram-timeseries.html",
-    ],
-    path = "/vz-histogram-timeseries",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "index.html",
-        "vz-histogram-timeseries.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-histogram-timeseries",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
deleted file mode 100644
index 894de95be6..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/vz-histogram-timeseries/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
deleted file mode 100644
index 24463e6ac6..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "vz_histogram_timeseries",
-    srcs = [
-        "vz-histogram-timeseries.html",
-    ],
-    path = "/vz-histogram-timeseries",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
-        "@org_polymer",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
-webfiles(
-    name = "demo",
-    srcs = ["demo.html"],
-    path = "/vz-histogram-timeseries",
-    deps = [
-        ":vz_histogram_timeseries",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "vz-histogram-timeseries.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-histogram-timeseries",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-)
diff --git a/tensorflow/tensorboard/components/vz_line_chart/BUILD b/tensorflow/tensorboard/components/vz_line_chart/BUILD
deleted file mode 100644
index 967d86596f..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/BUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "vz_line_chart",
-    srcs = [
-        "vz-line-chart.html",
-        ":ts",
-    ],
-    path = "/vz-line-chart",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/tf_imports:plottable",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "dragZoomInteraction.ts",
-        "vz-chart-helpers.ts",
-        "vz-line-chart.ts",
-    ],
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@com_palantir_plottable//:plottable.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "index.html",
-        "vz-line-chart.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-line-chart",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "dragZoomInteraction.ts",
-        "vz-chart-helpers.ts",
-        "vz-line-chart.ts",
-    ],
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
-)
diff --git a/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
deleted file mode 100644
index 84699b67b6..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_line_chart/demo
-webfiles(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/vz-line-chart/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_line_chart",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
deleted file mode 100644
index 39c60886cd..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load(
-    "//javascript/typescript:build_defs.bzl",
-    "ts_development_sources",
-    "ts_library",
-    "ts_devserver",
-)
-load(
-    "//third_party/javascript/polymer/build_defs:build_defs.bzl",
-    "webcomponent_library",
-)
-
-licenses(["notice"])  # Apache 2.0
-
-ts_library(
-    name = "ts",
-    srcs = [
-        "dragZoomInteraction.ts",
-        "vz-chart-helpers.ts",
-        "vz-line-chart.ts",
-    ],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps_d3v4",
-        "//third_party/javascript/lodash:lodash-module",
-        "//third_party/javascript/plottable/v3:bundle",
-    ],
-)
-
-webcomponent_library(
-    name = "vz_line_chart",
-    srcs = [
-        "vz-line-chart.html",
-    ],
-    ts_lib_deps = [":ts"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/plottable/v3:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-webcomponent_library(
-    name = "demo",
-    srcs = ["demo.html"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":vz_line_chart",
-        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-    ],
-)
-
-ts_devserver(
-    name = "devserver",
-    manifest = ":dev_sources",
-    serving_path = "/demo_out/bundle.js",
-    static_files = [":demo"],
-)
-
-ts_development_sources(
-    name = "dev_sources",
-    deps = [
-        ":ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/vz_sorting/BUILD b/tensorflow/tensorboard/components/vz_sorting/BUILD
deleted file mode 100644
index ae3f6e2777..0000000000
--- a/tensorflow/tensorboard/components/vz_sorting/BUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-webfiles(
-    name = "vz_sorting",
-    srcs = [
-        "vz-sorting.html",
-        ":ts",
-    ],
-    path = "/vz-sorting",
-    visibility = ["//visibility:public"],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = ["sorting.ts"],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "vz-sorting.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-sorting",
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = ["sorting.ts"],
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
-)
diff --git a/tensorflow/tensorboard/components/vz_sorting/test/BUILD b/tensorflow/tensorboard/components/vz_sorting/test/BUILD
deleted file mode 100644
index f8b01b61f2..0000000000
--- a/tensorflow/tensorboard/components/vz_sorting/test/BUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_wct_test_suite")
-
-licenses(["notice"])  # Apache 2.0
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_wct_test_suite(
-    name = "legacy_test",
-    size = "medium",
-    srcs = ["index.html"],
-    deps = [
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/polymer/v1/webcomponentsjs:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    testonly = 1,
-    srcs = ["sortingTests.ts"],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
-    ],
-)
-- 
GitLab


From 3ceea6d6965306916c354ae196507b3ad0181533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Mon, 24 Apr 2017 17:26:11 -0800
Subject: [PATCH 0656/1563] No change. Change: 154126081

---
 .../{BUILD => BUILD.OPENSOURCE}               |  0
 .../vz_projector/{BUILD => BUILD.OPENSOURCE}  |  0
 .../components/vz_projector_d3v4/BUILD        | 19 -------------------
 3 files changed, 19 deletions(-)
 rename tensorflow/tensorboard/components/vz_data_summary/{BUILD => BUILD.OPENSOURCE} (100%)
 rename tensorflow/tensorboard/components/vz_projector/{BUILD => BUILD.OPENSOURCE} (100%)
 delete mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/BUILD

diff --git a/tensorflow/tensorboard/components/vz_data_summary/BUILD b/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
similarity index 100%
rename from tensorflow/tensorboard/components/vz_data_summary/BUILD
rename to tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
diff --git a/tensorflow/tensorboard/components/vz_projector/BUILD b/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
similarity index 100%
rename from tensorflow/tensorboard/components/vz_projector/BUILD
rename to tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
deleted file mode 100644
index 8c222be10e..0000000000
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description:
-# Package for the Embedding Projector component.
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
-- 
GitLab


From 486ab9a308ed5563d4400d473ed29fd8e9dac8f1 Mon Sep 17 00:00:00 2001
From: Manjunath Kudlur <keveman@google.com>
Date: Mon, 24 Apr 2017 19:55:03 -0800
Subject: [PATCH 0657/1563] Rename android_srcs to mobile_srcs Change:
 154134342

---
 tensorflow/core/BUILD                               | 8 +++++++-
 tensorflow/core/grappler/BUILD                      | 8 +++++++-
 tensorflow/core/grappler/clusters/BUILD             | 8 +++++++-
 tensorflow/core/grappler/inputs/BUILD               | 8 +++++++-
 tensorflow/core/grappler/optimizers/BUILD           | 8 +++++++-
 tensorflow/core/kernels/BUILD                       | 7 ++++++-
 tensorflow/core/platform/default/build_config/BUILD | 8 +++++++-
 tensorflow/core/util/ctc/BUILD                      | 7 ++++++-
 tensorflow/core/util/tensor_bundle/BUILD            | 9 +++++++--
 9 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 71fba99aad..0d2b0192e1 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -841,7 +841,7 @@ filegroup(
 
 # Core sources for Android builds.
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = [
         ":proto_text_srcs_all",
         "//tensorflow/core/kernels:android_srcs",
@@ -2757,3 +2757,9 @@ filegroup(
     ),
     visibility = ["//tensorflow:__subpackages__"],
 )
+
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+    visibility = ["//visibility:public"],
+)
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index 6fcb6b9dda..8836f2ffa7 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -15,7 +15,7 @@ filegroup(
 )
 
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = [
         "devices.cc",
         "devices.h",
@@ -32,6 +32,12 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
 cc_library(
     name = "op_types",
     srcs = ["op_types.cc"],
diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index 00ec279891..34ad404856 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -13,7 +13,7 @@ filegroup(
 )
 
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = glob(
         [
             "cluster.*",
@@ -22,6 +22,12 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
 cc_library(
     name = "cluster",
     srcs = ["cluster.cc"],
diff --git a/tensorflow/core/grappler/inputs/BUILD b/tensorflow/core/grappler/inputs/BUILD
index 8700196475..0cbcf48271 100644
--- a/tensorflow/core/grappler/inputs/BUILD
+++ b/tensorflow/core/grappler/inputs/BUILD
@@ -13,7 +13,7 @@ filegroup(
 )
 
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = glob(
         [
             "utils.*",
@@ -22,6 +22,12 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
 cc_library(
     name = "utils",
     srcs = [
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index d7a7989dfa..e3b36c8412 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -13,7 +13,7 @@ filegroup(
 )
 
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = glob(
         [
             "*_optimizer.*",
@@ -26,6 +26,12 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
 cc_library(
     name = "auto_parallel",
     srcs = ["auto_parallel.cc"],
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 49b12df7aa..de947e5877 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -3826,7 +3826,7 @@ cc_library(
 # tensorflow/contrib/makefile/tf_op_files.txt
 # LINT.IfChange
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = [
         "avgpooling_op.h",
         "bounds_check.h",
@@ -3855,6 +3855,11 @@ filegroup(
     ],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+)
+
 # Core kernels we want on Android. Only a subset of kernels to keep
 # base library small.
 filegroup(
diff --git a/tensorflow/core/platform/default/build_config/BUILD b/tensorflow/core/platform/default/build_config/BUILD
index 62af852173..8bc412c5d8 100644
--- a/tensorflow/core/platform/default/build_config/BUILD
+++ b/tensorflow/core/platform/default/build_config/BUILD
@@ -171,11 +171,17 @@ cc_library(
 )
 
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = glob(["*.h"]),
     visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+    visibility = ["//visibility:public"],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/core/util/ctc/BUILD b/tensorflow/core/util/ctc/BUILD
index 6dfb0bd731..357b253551 100644
--- a/tensorflow/core/util/ctc/BUILD
+++ b/tensorflow/core/util/ctc/BUILD
@@ -9,7 +9,7 @@ licenses(["notice"])  # Apache 2.0
 load("//tensorflow:tensorflow.bzl", "tf_cc_tests")
 
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = [
         "ctc_beam_entry.h",
         "ctc_beam_scorer.h",
@@ -19,6 +19,11 @@ filegroup(
     ],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/core/util/tensor_bundle/BUILD b/tensorflow/core/util/tensor_bundle/BUILD
index f93e0b5e46..77b75a3628 100644
--- a/tensorflow/core/util/tensor_bundle/BUILD
+++ b/tensorflow/core/util/tensor_bundle/BUILD
@@ -9,9 +9,9 @@ licenses(["notice"])  # Apache 2.0
 
 load("//tensorflow:tensorflow.bzl", "tf_copts")
 
-# To be exported to tensorflow/core:android_srcs.
+# To be exported to tensorflow/core:mobile_srcs.
 filegroup(
-    name = "android_srcs",
+    name = "mobile_srcs",
     srcs = [
         "naming.cc",
         "naming.h",
@@ -20,6 +20,11 @@ filegroup(
     ],
 )
 
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+)
+
 cc_library(
     name = "tensor_bundle",
     srcs = ["tensor_bundle.cc"],
-- 
GitLab


From b6bafadd51a471daa7157f515598e08e8f9f1611 Mon Sep 17 00:00:00 2001
From: Liangliang He <lliang.he@gmail.com>
Date: Tue, 25 Apr 2017 12:22:51 +0800
Subject: [PATCH 0658/1563] Include refcount.h in grpc_call.h (#9425)

---
 tensorflow/core/distributed_runtime/rpc/grpc_call.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_call.h b/tensorflow/core/distributed_runtime/rpc/grpc_call.h
index 35f849c7a5..3b45e7e8a7 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_call.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_call.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_RPC_GRPC_CALL_H_
 #define THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_RPC_GRPC_CALL_H_
 
+#include "tensorflow/core/lib/core/refcount.h"
 #include "tensorflow/core/platform/macros.h"
 
 #include "grpc++/grpc++.h"
-- 
GitLab


From f92984aa894193e2a2892e5f9e814eb46fd91a53 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 08:52:58 -0800
Subject: [PATCH 0659/1563] When running "convert_variables_to_constants"
 preserve the graphdef's library field. Change: 154184194

---
 .../python/framework/graph_util_impl.py       |  2 ++
 .../python/framework/graph_util_test.py       | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/tensorflow/python/framework/graph_util_impl.py b/tensorflow/python/framework/graph_util_impl.py
index b52f4e3772..65bd3dce2e 100644
--- a/tensorflow/python/framework/graph_util_impl.py
+++ b/tensorflow/python/framework/graph_util_impl.py
@@ -241,6 +241,8 @@ def convert_variables_to_constants(sess, input_graph_def, output_node_names,
     else:
       output_node.CopyFrom(input_node)
     output_graph_def.node.extend([output_node])
+
+  output_graph_def.library.CopyFrom(inference_graph.library)
   print("Converted %d variables to const ops." % how_many_converted)
   return output_graph_def
 
diff --git a/tensorflow/python/framework/graph_util_test.py b/tensorflow/python/framework/graph_util_test.py
index 4d8cb6daae..f6e9bc9dad 100644
--- a/tensorflow/python/framework/graph_util_test.py
+++ b/tensorflow/python/framework/graph_util_test.py
@@ -24,6 +24,7 @@ from tensorflow.core.framework import node_def_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import function
 from tensorflow.python.framework import graph_util
 from tensorflow.python.framework import importer
 from tensorflow.python.framework import ops
@@ -187,6 +188,36 @@ class DeviceFunctionsTest(test.TestCase):
     self.assertEqual("n3", sub_graph.node[2].name)
     self.assertEqual("n5", sub_graph.node[3].name)
 
+  def testConvertVariablesToConstsWithFunctions(self):
+    @function.Defun(dtypes.float32)
+    def plus_one(x):
+      return x + 1.0
+
+    with ops.Graph().as_default():
+      variable_node = variables.Variable(1.0, name="variable_node")
+      _ = variables.Variable(1.0, name="unused_variable_node")
+      defun_node = plus_one(variable_node)
+      output_node = math_ops_lib.multiply(
+          defun_node, 2.0, name="output_node")
+
+      with session.Session() as sess:
+        init = variables.initialize_variables([variable_node])
+        sess.run(init)
+        output = sess.run(output_node)
+        self.assertNear(4.0, output, 0.00001)
+        variable_graph_def = sess.graph.as_graph_def()
+
+        # First get the constant_graph_def when variable_names_whitelist is set,
+        # note that if variable_names_whitelist is not set an error will be
+        # thrown because unused_variable_node is not initialized.
+        constant_graph_def = graph_util.convert_variables_to_constants(
+            sess,
+            variable_graph_def, ["output_node"],
+            variable_names_whitelist=set(["variable_node"]))
+
+        self.assertEqual(variable_graph_def.library,
+                         constant_graph_def.library)
+
   def testConvertVariablesToConsts(self):
     with ops.Graph().as_default():
       variable_node = variables.Variable(1.0, name="variable_node")
-- 
GitLab


From 314fd704f504c2d40efa5559d3234337adeedf7e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 08:56:48 -0800
Subject: [PATCH 0660/1563] Adding community links. Change: 154184628

---
 tensorflow/docs_src/community/welcome.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tensorflow/docs_src/community/welcome.md b/tensorflow/docs_src/community/welcome.md
index 7c9717189b..4c8c4e1a97 100644
--- a/tensorflow/docs_src/community/welcome.md
+++ b/tensorflow/docs_src/community/welcome.md
@@ -26,6 +26,21 @@ The TensorFlow community has created many great projects around TensorFlow, incl
 * [Rust language bindings](https://github.com/google/tensorflow-rust)
 * [Operator Vectorization Library](https://github.com/opveclib/opveclib)
 
+## TensorFlow Communities Around the World
+
+Asia:
+
+* [TensorFlow Korea (TF-KR) User Group](https://www.facebook.com/groups/TensorFlowKR/) _(Korean language)_
+* [TensorFlow User Group Tokyo](https://tfug-tokyo.connpass.com/) _(Japanese Language)_
+* [Soleil Data Dojo](https://soleildatadojo.connpass.com/) _(Japanese language)_
+
+
+Europe:
+
+* [TensorFlow Barcelona](https://www.meetup.com/Barcelona-Machine-Learning-Meetup/)
+* [TensorFlow Madrid](https://www.meetup.com/TensorFlow-Madrid/)
+
+
 
 ## Support
 
@@ -45,3 +60,5 @@ please read the following list carefully:
     [TensorFlow issues tracker](https://github.com/tensorflow/tensorflow/issues)
     on GitHub.  For example, use the issue tracker to request a
     new operation in TensorFlow.
+    
+
-- 
GitLab


From d48ef8f6b743c715e8209e7faf4d2c46ace57046 Mon Sep 17 00:00:00 2001
From: Alexandre Caulier <alexandre.caulier@orange.fr>
Date: Tue, 25 Apr 2017 19:36:16 +0200
Subject: [PATCH 0661/1563] Fix doc for CTC_Greedy (#8690)

* Fix doc for CTC_Greedy

 The output is the minus the sum of the logits and the logprobs

* Corrext sentence
---
 tensorflow/python/ops/ctc_ops.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/ops/ctc_ops.py b/tensorflow/python/ops/ctc_ops.py
index b0a1fc3dd1..bd23a66e0c 100644
--- a/tensorflow/python/ops/ctc_ops.py
+++ b/tensorflow/python/ops/ctc_ops.py
@@ -197,7 +197,7 @@ def ctc_greedy_decoder(inputs, sequence_length, merge_repeated=True):
     merge_repeated: Boolean.  Default: True.
 
   Returns:
-    A tuple `(decoded, log_probabilities)` where
+    A tuple `(decoded, neg_sum_logits)` where
     decoded: A single-element list. `decoded[0]`
       is an `SparseTensor` containing the decoded outputs s.t.:
       `decoded.indices`: Indices matrix `(total_decoded_outputs x 2)`.
@@ -206,8 +206,8 @@ def ctc_greedy_decoder(inputs, sequence_length, merge_repeated=True):
         The vector stores the decoded classes.
       `decoded.shape`: Shape vector, size `(2)`.
         The shape values are: `[batch_size, max_decoded_length]`
-    log_probability: A `float` matrix `(batch_size x 1)` containing sequence
-        log-probabilities.
+    neg_sum_logits: A `float` matrix `(batch_size x 1)` containing, for the
+        sequence found, the negative of the sum of the greatest logit at each timeframe.
   """
   outputs = gen_ctc_ops._ctc_greedy_decoder(
       inputs, sequence_length, merge_repeated=merge_repeated)
-- 
GitLab


From 311734a965b374ceb7a22d3b7331477c2402edec Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Tue, 25 Apr 2017 09:39:38 -0800
Subject: [PATCH 0662/1563] Fix bug with optimizer not propagated from
 KernelLinearClassifier constructor. Change: 154190471

---
 tensorflow/contrib/kernel_methods/python/kernel_estimators.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/kernel_methods/python/kernel_estimators.py b/tensorflow/contrib/kernel_methods/python/kernel_estimators.py
index 0ae88b22b4..de7530231d 100644
--- a/tensorflow/contrib/kernel_methods/python/kernel_estimators.py
+++ b/tensorflow/contrib/kernel_methods/python/kernel_estimators.py
@@ -176,7 +176,7 @@ class _KernelEstimator(estimator.Estimator):
         "head": head,
         _FEATURE_COLUMNS: feature_columns or [],
         _OPTIMIZER: optimizer,
-        _KERNEL_MAPPERS: kernel_mappers
+        _KERNEL_MAPPERS: kernel_mappers,
     }
     super(_KernelEstimator, self).__init__(
         model_fn=_kernel_model_fn,
@@ -303,6 +303,7 @@ class KernelLinearClassifier(_KernelEstimator):
         weight_column_name=weight_column_name,
         head=head_lib.multi_class_head(
             n_classes=n_classes, weight_column_name=weight_column_name),
+        optimizer=optimizer,
         kernel_mappers=kernel_mappers,
         config=config)
 
-- 
GitLab


From ec71b8cf29a78d5e2918d00e491123db3633959e Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Tue, 25 Apr 2017 09:43:02 -0800
Subject: [PATCH 0663/1563] [XLA:HLO] Don't remove HLO instructions with
 control dependencies in DCE. Removing instructions with control dependencies
 may result in a violation of the ordering constraint which the control
 dependency is intended to enforce. Change: 154190963

---
 tensorflow/compiler/xla/service/BUILD         |  1 +
 .../compiler/xla/service/hlo_computation.cc   | 16 +++--
 .../compiler/xla/service/hlo_computation.h    |  8 +--
 tensorflow/compiler/xla/service/hlo_dce.cc    |  2 +-
 .../compiler/xla/service/hlo_dce_test.cc      | 61 +++++++++++++++++++
 5 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 1970b213c9..e5a921674f 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1297,6 +1297,7 @@ cc_test(
         "//tensorflow/compiler/xla/tests:literal_test_util",
         "//tensorflow/compiler/xla/tests:test_utils",
         "//tensorflow/core:lib",
+        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/service/hlo_computation.cc b/tensorflow/compiler/xla/service/hlo_computation.cc
index 0fb8c06f88..89371e4497 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation.cc
@@ -148,7 +148,15 @@ void HloComputation::Reparent(HloInstruction* instruction) {
   instruction->set_parent(this);
 }
 
-bool HloComputation::IsRemovable(const HloOpcode& opcode) {
+bool HloComputation::IsRemovable(const HloInstruction* instruction) {
+  // If the instruction has control predecessors or successors then we cannot
+  // remove the instruction without violating ordering constraints (added, for
+  // example, to avert interference due to buffer aliasing).
+  if (!instruction->control_predecessors().empty() ||
+      !instruction->control_successors().empty()) {
+    return false;
+  }
+  const HloOpcode opcode = instruction->opcode();
   return !((opcode == HloOpcode::kParameter && !is_fusion_computation_) ||
            opcode == HloOpcode::kRecv || opcode == HloOpcode::kSend ||
            opcode == HloOpcode::kTrace || opcode == HloOpcode::kOutfeed);
@@ -159,7 +167,7 @@ Status HloComputation::RemoveInstructionAndUnusedOperands(
   TF_RET_CHECK(root_instruction() != instruction);
 
   TF_RET_CHECK(instruction->user_count() == 0);
-  TF_RET_CHECK(IsRemovable(instruction->opcode()));
+  TF_RET_CHECK(IsRemovable(instruction));
   std::unordered_set<HloInstruction*> removed;
   std::queue<HloInstruction*> worklist;
   worklist.push(instruction);
@@ -168,7 +176,7 @@ Status HloComputation::RemoveInstructionAndUnusedOperands(
     worklist.pop();
 
     if (removed.count(item) != 0 || item->user_count() != 0 ||
-        item == root_instruction() || !IsRemovable(item->opcode())) {
+        item == root_instruction() || !IsRemovable(item)) {
       continue;
     }
     for (int i = 0; i < item->operand_count(); ++i) {
@@ -184,7 +192,7 @@ Status HloComputation::RemoveInstructionAndUnusedOperands(
 Status HloComputation::RemoveInstruction(HloInstruction* instruction) {
   VLOG(2) << "Removing instruction " << instruction->name()
           << " from computation " << name();
-  TF_RET_CHECK(IsRemovable(instruction->opcode()));
+  TF_RET_CHECK(IsRemovable(instruction));
   TF_RET_CHECK(root_instruction() != instruction)
       << "cannot remove root instruction " << instruction->name();
   TF_RET_CHECK(instruction->user_count() == 0)
diff --git a/tensorflow/compiler/xla/service/hlo_computation.h b/tensorflow/compiler/xla/service/hlo_computation.h
index 4e20c6c8ef..fa274cfc63 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.h
+++ b/tensorflow/compiler/xla/service/hlo_computation.h
@@ -236,12 +236,12 @@ class HloComputation {
   // Returns a deep copy of this computation including all instructions.
   std::unique_ptr<HloComputation> Clone(const string& suffix = "clone");
 
-  // Returns true if instructions of the given opcode can be removed from the
+  // Returns true if the given instruction can be removed from the
   // computation. Instructions such as parameters and send/receive instructions
   // cannot be removed without violating invariants of the HLO computation or
-  // module with the exception of fusion computation.
-  // A parameter instruction is removable for a fusion computation.
-  bool IsRemovable(const HloOpcode& opcode);
+  // module with the exception of fusion computation.  A parameter instruction
+  // is removable for a fusion computation.
+  bool IsRemovable(const HloInstruction* instruction);
 
   // Returns if this computation is a fusion computation.
   bool IsFusionComputation() const { return is_fusion_computation_; }
diff --git a/tensorflow/compiler/xla/service/hlo_dce.cc b/tensorflow/compiler/xla/service/hlo_dce.cc
index dbf5bf28c8..3755b9e4c0 100644
--- a/tensorflow/compiler/xla/service/hlo_dce.cc
+++ b/tensorflow/compiler/xla/service/hlo_dce.cc
@@ -52,7 +52,7 @@ StatusOr<bool> HloDCE::Run(HloModule* module) {
     for (auto& instruction : computation->instructions()) {
       if (instruction->user_count() == 0 &&
           live_instructions.count(instruction.get()) == 0 &&
-          computation->IsRemovable(instruction->opcode())) {
+          computation->IsRemovable(instruction.get())) {
         dead_roots.push_back(instruction.get());
       }
     }
diff --git a/tensorflow/compiler/xla/service/hlo_dce_test.cc b/tensorflow/compiler/xla/service/hlo_dce_test.cc
index dcd9e00c56..4191eaaad0 100644
--- a/tensorflow/compiler/xla/service/hlo_dce_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_dce_test.cc
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/test_utils.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -93,5 +94,65 @@ TEST_F(HloDceTest, DeadParameters) {
   EXPECT_EQ(0, dead_param1->user_count());
 }
 
+TEST_F(HloDceTest, ControlDependencies) {
+  // Verify that instructions with control dependencies are not removed.
+  auto builder = HloComputation::Builder(TestName());
+  auto constant1 = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
+  auto constant2 = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(123.0f)));
+
+  // Create two dead instructions: a negate and an add.
+  auto dead_negate = builder.AddInstruction(HloInstruction::CreateUnary(
+      constant1->shape(), HloOpcode::kNegate, constant1));
+  auto dead_add = builder.AddInstruction(HloInstruction::CreateBinary(
+      constant1->shape(), HloOpcode::kAdd, constant1, constant2));
+
+  // Create the same two instructions again, but these will have a control
+  // dependency added.
+  auto dead_negate_with_control_dep =
+      builder.AddInstruction(HloInstruction::CreateUnary(
+          constant1->shape(), HloOpcode::kNegate, constant1));
+  auto dead_add_with_control_dep =
+      builder.AddInstruction(HloInstruction::CreateBinary(
+          constant1->shape(), HloOpcode::kAdd, constant1, constant2));
+
+  // Create a root so the previously added instruction is dead.
+  builder.AddInstruction(HloInstruction::CreateBinary(
+      constant1->shape(), HloOpcode::kAdd, constant1, constant2));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  // Add a control dependency between two instructions.
+  TF_ASSERT_OK(dead_negate_with_control_dep->AddControlDependencyTo(
+      dead_add_with_control_dep));
+
+  // Returns whether the given instruction exists in the test computation.
+  auto has_instruction = [computation](const HloInstruction* instruction) {
+    for (auto& inst : computation->instructions()) {
+      if (inst.get() == instruction) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  EXPECT_EQ(7, computation->instruction_count());
+  EXPECT_TRUE(has_instruction(dead_negate));
+  EXPECT_TRUE(has_instruction(dead_add));
+  EXPECT_TRUE(has_instruction(dead_negate_with_control_dep));
+  EXPECT_TRUE(has_instruction(dead_add_with_control_dep));
+
+  HloDCE dce;
+  EXPECT_TRUE(dce.Run(module.get()).ValueOrDie());
+
+  EXPECT_EQ(5, computation->instruction_count());
+  EXPECT_FALSE(has_instruction(dead_negate));
+  EXPECT_FALSE(has_instruction(dead_add));
+  EXPECT_TRUE(has_instruction(dead_negate_with_control_dep));
+  EXPECT_TRUE(has_instruction(dead_add_with_control_dep));
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 538628d7a18bcdd97ebd715785cf9520b6a6dd5f Mon Sep 17 00:00:00 2001
From: Yuan Yu <yuanbyu@google.com>
Date: Tue, 25 Apr 2017 11:32:39 -0800
Subject: [PATCH 0664/1563] Internal change. Change: 154205930

---
 tensorflow/python/training/optimizer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/training/optimizer.py b/tensorflow/python/training/optimizer.py
index 94cadbe55f..3c5130d42a 100644
--- a/tensorflow/python/training/optimizer.py
+++ b/tensorflow/python/training/optimizer.py
@@ -143,7 +143,7 @@ class _StreamingModelPortProcessor(_OptimizableVariable):
     return self._v
 
   def update_op(self, optimizer, g):
-    return self._v
+    return g
 
 
 def _get_processor(v):
-- 
GitLab


From a5cc879abb1209f40b9079c49810a95eff326593 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 12:25:39 -0800
Subject: [PATCH 0665/1563] Upgrade buildifier to the latest. Change: 154212512

---
 tensorflow/tools/ci_build/install/install_buildifier.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/install/install_buildifier.sh b/tensorflow/tools/ci_build/install/install_buildifier.sh
index 5420934c6b..b2dfcf8db7 100755
--- a/tensorflow/tools/ci_build/install/install_buildifier.sh
+++ b/tensorflow/tools/ci_build/install/install_buildifier.sh
@@ -17,7 +17,7 @@
 set -e
 BUILDIFIER_DIR="buildifier"
 mkdir ${BUILDIFIER_DIR}
-curl -Ls https://github.com/bazelbuild/buildifier/archive/0.4.3.tar.gz | \
+curl -Ls https://github.com/bazelbuild/buildifier/archive/0.4.5.tar.gz | \
     tar -C "${BUILDIFIER_DIR}" --strip-components=1 -xz
 pushd ${BUILDIFIER_DIR}
 
-- 
GitLab


From f213edbe471c2d22ceff6c5d2ef5e626e555d90b Mon Sep 17 00:00:00 2001
From: Martin Wicke <martin.wicke@gmail.com>
Date: Tue, 25 Apr 2017 14:15:15 -0700
Subject: [PATCH 0666/1563] Close FileWriterCache before moving training
 directory in estimator_test (#9281)

Fixes #9185
* Make sure clear() close()s filewriters.
* clear FileWriterCache before moving training directory
* Add close() to FakeSummaryWriter
---
 .../testing/python/framework/fake_summary_writer.py        | 3 +++
 tensorflow/python/estimator/estimator_test.py              | 7 ++++++-
 tensorflow/python/summary/writer/writer_cache.py           | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/testing/python/framework/fake_summary_writer.py b/tensorflow/contrib/testing/python/framework/fake_summary_writer.py
index 02f2d7fae8..c6fe518bbb 100644
--- a/tensorflow/contrib/testing/python/framework/fake_summary_writer.py
+++ b/tensorflow/contrib/testing/python/framework/fake_summary_writer.py
@@ -127,3 +127,6 @@ class FakeSummaryWriter(object):
 
   def reopen(self):
     pass
+  
+  def close(self):
+    pass
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 3b46db59e3..77f7bd36ef 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -54,6 +54,7 @@ from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.saved_model import loader
 from tensorflow.python.saved_model import tag_constants
+from tensorflow.python.summary.writer import writer_cache
 from tensorflow.python.training import checkpoint_state_pb2
 from tensorflow.python.training import saver
 from tensorflow.python.training import saver_test_utils
@@ -435,9 +436,13 @@ class EstimatorTrainTest(test.TestCase):
         model_dir=model_dir1,
         model_fn=model_fn_global_step_incrementer)
     est1.train(dummy_input_fn, steps=5)
-
+    
+    # We have to clear the cache before we can rename the directory,
+    # otherwise open file handles will prevent the delete on Windows.
+    writer_cache.FileWriterCache.clear()
     model_dir2 = os.path.join(tmpdir, 'model_dir2')
     os.renames(model_dir1, model_dir2)
+    
     est2 = estimator.Estimator(
         model_dir=model_dir2,
         model_fn=model_fn_global_step_incrementer)
diff --git a/tensorflow/python/summary/writer/writer_cache.py b/tensorflow/python/summary/writer/writer_cache.py
index 21870e788e..bad289303c 100644
--- a/tensorflow/python/summary/writer/writer_cache.py
+++ b/tensorflow/python/summary/writer/writer_cache.py
@@ -39,6 +39,10 @@ class FileWriterCache(object):
   def clear():
     """Clear cached summary writers. Currently only used for unit tests."""
     with FileWriterCache._lock:
+      # Make sure all the writers are closed now (otherwise open file handles
+      # may hang around, blocking deletions on Windows).
+      for item in FileWriterCache._cache.values():
+        item.close()
       FileWriterCache._cache = {}
 
   @staticmethod
-- 
GitLab


From 2c5a65b9b3cae3f08f32715712bd7b59877fcaf6 Mon Sep 17 00:00:00 2001
From: "Yuan (Terry) Tang" <terrytangyuan@users.noreply.github.com>
Date: Tue, 25 Apr 2017 16:16:01 -0500
Subject: [PATCH 0667/1563] Added StateSavingRnnEstimator in __init__ of
 contrib.learn (#9388)

---
 tensorflow/contrib/learn/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/learn/__init__.py b/tensorflow/contrib/learn/__init__.py
index bd56066b1b..05c4024d0b 100644
--- a/tensorflow/contrib/learn/__init__.py
+++ b/tensorflow/contrib/learn/__init__.py
@@ -38,6 +38,7 @@ See the @{$python/contrib.learn} guide.
 @@LinearEstimator
 @@LinearRegressor
 @@LogisticRegressor
+@@StateSavingRnnEstimator
 @@SVM
 @@SKCompat
 
-- 
GitLab


From 9509cda97d3f4af8ffc1b3aff5fbddc158ff7440 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 13:22:44 -0800
Subject: [PATCH 0668/1563] Add ProfileAnalyzer class to tfdbg. Change:
 154220704

---
 tensorflow/python/debug/BUILD                 |  35 ++
 tensorflow/python/debug/cli/cli_shared.py     |  10 +
 .../python/debug/cli/cli_shared_test.py       |  15 +
 tensorflow/python/debug/cli/command_parser.py |  25 +-
 .../python/debug/cli/command_parser_test.py   |  19 +
 .../python/debug/cli/profile_analyzer_cli.py  | 459 ++++++++++++++++++
 .../debug/cli/profile_analyzer_cli_test.py    | 264 ++++++++++
 tensorflow/python/debug/lib/source_utils.py   |   4 +-
 .../python/debug/lib/source_utils_test.py     |   8 +-
 9 files changed, 830 insertions(+), 9 deletions(-)
 create mode 100644 tensorflow/python/debug/cli/profile_analyzer_cli.py
 create mode 100644 tensorflow/python/debug/cli/profile_analyzer_cli_test.py

diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index f7e17f1c53..e738c86a1f 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -147,6 +147,22 @@ py_library(
     ],
 )
 
+py_library(
+    name = "profile_analyzer_cli",
+    srcs = ["cli/profile_analyzer_cli.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":cli_shared",
+        ":command_parser",
+        ":debug_data",
+        ":debugger_cli_common",
+        ":source_utils",
+        ":ui_factory",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+    ],
+)
+
 py_library(
     name = "stepper_cli",
     srcs = ["cli/stepper_cli.py"],
@@ -241,6 +257,7 @@ py_library(
         ":debug_data",
         ":debugger_cli_common",
         ":framework",
+        ":profile_analyzer_cli",
         ":stepper_cli",
         ":ui_factory",
     ],
@@ -606,6 +623,24 @@ cuda_py_test(
     ],
 )
 
+py_test(
+    name = "profile_analyzer_cli_test",
+    size = "small",
+    srcs = [
+        "cli/profile_analyzer_cli_test.py",
+    ],
+    deps = [
+        ":command_parser",
+        ":profile_analyzer_cli",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 cuda_py_test(
     name = "stepper_cli_test",
     size = "small",
diff --git a/tensorflow/python/debug/cli/cli_shared.py b/tensorflow/python/debug/cli/cli_shared.py
index 8ff0916761..3deb6dbad6 100644
--- a/tensorflow/python/debug/cli/cli_shared.py
+++ b/tensorflow/python/debug/cli/cli_shared.py
@@ -17,6 +17,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import math
+
 import numpy as np
 import six
 
@@ -73,6 +75,14 @@ def bytes_to_readable_str(num_bytes, include_b=False):
   return result
 
 
+def time_to_readable_str(value):
+  if not value:
+    return "0"
+  suffixes = ["us", "ms", "s"]
+  order = min(len(suffixes) - 1, int(math.log(value, 10) / 3))
+  return "{:.3g}{}".format(value / math.pow(10.0, 3*order), suffixes[order])
+
+
 def parse_ranges_highlight(ranges_string):
   """Process ranges highlight string.
 
diff --git a/tensorflow/python/debug/cli/cli_shared_test.py b/tensorflow/python/debug/cli/cli_shared_test.py
index 1ef3c34254..fde1d66998 100644
--- a/tensorflow/python/debug/cli/cli_shared_test.py
+++ b/tensorflow/python/debug/cli/cli_shared_test.py
@@ -70,6 +70,21 @@ class BytesToReadableStrTest(test_util.TensorFlowTestCase):
             1024**3, include_b=True))
 
 
+class TimeToReadableStrTest(test_util.TensorFlowTestCase):
+
+  def testNoneTimeWorks(self):
+    self.assertEqual("0", cli_shared.time_to_readable_str(None))
+
+  def testMicrosecondsTime(self):
+    self.assertEqual("40us", cli_shared.time_to_readable_str(40))
+
+  def testMillisecondTime(self):
+    self.assertEqual("40ms", cli_shared.time_to_readable_str(40e3))
+
+  def testSecondTime(self):
+    self.assertEqual("40s", cli_shared.time_to_readable_str(40e6))
+
+
 class GetRunStartIntroAndDescriptionTest(test_util.TensorFlowTestCase):
 
   def setUp(self):
diff --git a/tensorflow/python/debug/cli/command_parser.py b/tensorflow/python/debug/cli/command_parser.py
index a71982f86a..143c104519 100644
--- a/tensorflow/python/debug/cli/command_parser.py
+++ b/tensorflow/python/debug/cli/command_parser.py
@@ -18,7 +18,6 @@ from __future__ import division
 from __future__ import print_function
 
 import ast
-from collections import namedtuple
 import re
 import sys
 
@@ -29,8 +28,28 @@ _WHITESPACE_PATTERN = re.compile(r"\s+")
 
 _NUMBER_PATTERN = re.compile(r"[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?")
 
-Interval = namedtuple("Interval",
-                      ["start", "start_included", "end", "end_included"])
+
+class Interval(object):
+  """Represents an interval between a start and end value."""
+
+  def __init__(self, start, start_included, end, end_included):
+    self.start = start
+    self.start_included = start_included
+    self.end = end
+    self.end_included = end_included
+
+  def contains(self, value):
+    if value < self.start or value == self.start and not self.start_included:
+      return False
+    if value > self.end or value == self.end and not self.end_included:
+      return False
+    return True
+
+  def __eq__(self, other):
+    return (self.start == other.start and
+            self.start_included == other.start_included and
+            self.end == other.end and
+            self.end_included == other.end_included)
 
 
 def parse_command(command):
diff --git a/tensorflow/python/debug/cli/command_parser_test.py b/tensorflow/python/debug/cli/command_parser_test.py
index ab9b3245dc..1ea890be8c 100644
--- a/tensorflow/python/debug/cli/command_parser_test.py
+++ b/tensorflow/python/debug/cli/command_parser_test.py
@@ -490,6 +490,25 @@ class ParseInterval(test_util.TensorFlowTestCase):
         "equal to end of interval."):
       command_parser.parse_memory_interval("[5k, 3k]")
 
+  def testIntervalContains(self):
+    interval = command_parser.Interval(
+        start=1, start_included=True, end=10, end_included=True)
+    self.assertTrue(interval.contains(1))
+    self.assertTrue(interval.contains(10))
+    self.assertTrue(interval.contains(5))
+
+    interval.start_included = False
+    self.assertFalse(interval.contains(1))
+    self.assertTrue(interval.contains(10))
+
+    interval.end_included = False
+    self.assertFalse(interval.contains(1))
+    self.assertFalse(interval.contains(10))
+
+    interval.start_included = True
+    self.assertTrue(interval.contains(1))
+    self.assertFalse(interval.contains(10))
+
 
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
new file mode 100644
index 0000000000..42440521eb
--- /dev/null
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli.py
@@ -0,0 +1,459 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Formats and displays profiling information."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import os
+import re
+
+from tensorflow.python.debug.cli import cli_shared
+from tensorflow.python.debug.cli import command_parser
+from tensorflow.python.debug.cli import debugger_cli_common
+from tensorflow.python.debug.cli import ui_factory
+from tensorflow.python.debug.lib import source_utils
+
+
+SORT_OPS_BY_OP_NAME = "node"
+SORT_OPS_BY_OP_TIME = "op_time"
+SORT_OPS_BY_EXEC_TIME = "exec_time"
+SORT_OPS_BY_START_TIME = "start_time"
+SORT_OPS_BY_LINE = "line"
+
+
+class ProfileDatum(object):
+  """Profile data point."""
+
+  def __init__(self, node_exec_stats, file_line, op_type):
+    """Constructor.
+
+    Args:
+      node_exec_stats: `NodeExecStats` proto.
+      file_line: A `string` formatted as <file_name>:<line_number>.
+      op_type: (string) Operation type.
+    """
+    self.node_exec_stats = node_exec_stats
+    self.file_line = file_line
+    self.op_type = op_type
+    self.op_time = (self.node_exec_stats.op_end_rel_micros -
+                    self.node_exec_stats.op_start_rel_micros)
+
+  @property
+  def exec_time(self):
+    """Measures compute function exection time plus pre- and post-processing."""
+    return self.node_exec_stats.all_end_rel_micros
+
+
+class ProfileDataTableView(object):
+  """Table View of profiling data."""
+
+  def __init__(self, profile_datum_list):
+    """Constructor.
+
+    Args:
+      profile_datum_list: List of `ProfileDatum` objects.
+    """
+    self._profile_datum_list = profile_datum_list
+    self.formatted_op_time = [
+        cli_shared.time_to_readable_str(datum.op_time)
+        for datum in profile_datum_list]
+    self.formatted_exec_time = [
+        cli_shared.time_to_readable_str(
+            datum.node_exec_stats.all_end_rel_micros)
+        for datum in profile_datum_list]
+    self._column_sort_ids = [SORT_OPS_BY_OP_NAME, SORT_OPS_BY_OP_TIME,
+                             SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE]
+
+  def value(self, row, col):
+    if col == 0:
+      return self._profile_datum_list[row].node_exec_stats.node_name
+    elif col == 1:
+      return self.formatted_op_time[row]
+    elif col == 2:
+      return self.formatted_exec_time[row]
+    elif col == 3:
+      return self._profile_datum_list[row].file_line
+    else:
+      raise IndexError("Invalid column index %d." % col)
+
+  def row_count(self):
+    return len(self._profile_datum_list)
+
+  def column_count(self):
+    return 4
+
+  def column_names(self):
+    return ["Node", "Op Time", "Exec Time", "Filename:Lineno(function)"]
+
+  def column_sort_id(self, col):
+    return self._column_sort_ids[col]
+
+
+def _list_profile_filter(
+    profile_datum, node_name_regex, file_name_regex, op_type_regex,
+    op_time_interval, exec_time_interval):
+  """Filter function for list_profile command.
+
+  Args:
+    profile_datum: A `ProfileDatum` object.
+    node_name_regex: Regular expression pattern object to filter by name.
+    file_name_regex: Regular expression pattern object to filter by file.
+    op_type_regex: Regular expression pattern object to filter by op type.
+    op_time_interval: `Interval` for filtering op time.
+    exec_time_interval: `Interval` for filtering exec time.
+
+  Returns:
+    True if profile_datum should be included.
+  """
+  if not node_name_regex.match(
+      profile_datum.node_exec_stats.node_name):
+    return False
+  if profile_datum.file_line is not None and not file_name_regex.match(
+      profile_datum.file_line):
+    return False
+  if profile_datum.op_type is not None and not op_type_regex.match(
+      profile_datum.op_type):
+    return False
+  if op_time_interval is not None and not op_time_interval.contains(
+      profile_datum.op_time):
+    return False
+  if exec_time_interval and not exec_time_interval.contains(
+      profile_datum.node_exec_stats.all_end_rel_micros):
+    return False
+  return True
+
+
+def _list_profile_sort_key(profile_datum, sort_by):
+  """Get a profile_datum property to sort by in list_profile command.
+
+  Args:
+    profile_datum: A `ProfileDatum` object.
+    sort_by: (string) indicates a value to sort by.
+      Must be one of SORT_BY* constants.
+
+  Returns:
+    profile_datum property to sort by.
+  """
+  if sort_by == SORT_OPS_BY_OP_NAME:
+    return profile_datum.node_exec_stats.node_name
+  elif sort_by == SORT_OPS_BY_LINE:
+    return profile_datum.file_line
+  elif sort_by == SORT_OPS_BY_OP_TIME:
+    return profile_datum.op_time
+  elif sort_by == SORT_OPS_BY_EXEC_TIME:
+    return profile_datum.node_exec_stats.all_end_rel_micros
+  else:  # sort by start time
+    return profile_datum.node_exec_stats.all_start_micros
+
+
+class ProfileAnalyzer(object):
+  """Analyzer for profiling data."""
+
+  def __init__(self, graph, run_metadata):
+    """ProfileAnalyzer constructor.
+
+    Args:
+      graph: (tf.Graph) Python graph object.
+      run_metadata: A `RunMetadata` protobuf object.
+
+    Raises:
+      ValueError: If run_metadata is None.
+    """
+    self._graph = graph
+    if not run_metadata:
+      raise ValueError("No RunMetadata passed for profile analysis.")
+    self._run_metadata = run_metadata
+    self._arg_parsers = {}
+    ap = argparse.ArgumentParser(
+        description="List nodes profile information.",
+        usage=argparse.SUPPRESS)
+    ap.add_argument(
+        "-d",
+        "--device_name_filter",
+        dest="device_name_filter",
+        type=str,
+        default="",
+        help="filter device name by regex.")
+    ap.add_argument(
+        "-n",
+        "--node_name_filter",
+        dest="node_name_filter",
+        type=str,
+        default="",
+        help="filter node name by regex.")
+    ap.add_argument(
+        "-t",
+        "--op_type_filter",
+        dest="op_type_filter",
+        type=str,
+        default="",
+        help="filter op type by regex.")
+    # TODO(annarev): allow file filtering at non-stack top position.
+    ap.add_argument(
+        "-f",
+        "--file_name_filter",
+        dest="file_name_filter",
+        type=str,
+        default="",
+        help="filter by file name at the top position of node's creation "
+             "stack that does not belong to TensorFlow library.")
+    ap.add_argument(
+        "-e",
+        "--execution_time",
+        dest="execution_time",
+        type=str,
+        default="",
+        help="Filter by execution time interval "
+             "(includes compute plus pre- and post -processing time). "
+             "Supported units are s, ms and us (default). "
+             "E.g. -e >100s, -e <100, -e [100us,1000ms]")
+    ap.add_argument(
+        "-o",
+        "--op_time",
+        dest="op_time",
+        type=str,
+        default="",
+        help="Filter by op time interval (only includes compute time). "
+             "Supported units are s, ms and us (default). "
+             "E.g. -e >100s, -e <100, -e [100us,1000ms]")
+    ap.add_argument(
+        "-s",
+        "--sort_by",
+        dest="sort_by",
+        type=str,
+        default=SORT_OPS_BY_START_TIME,
+        help=("the field to sort the data by: (%s | %s | %s | %s | %s)" %
+              (SORT_OPS_BY_OP_NAME, SORT_OPS_BY_START_TIME,
+               SORT_OPS_BY_OP_TIME, SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE)))
+    ap.add_argument(
+        "-r",
+        "--reverse",
+        dest="reverse",
+        action="store_true",
+        help="sort the data in reverse (descending) order")
+
+    self._arg_parsers["list_profile"] = ap
+
+  def list_profile(self, args, screen_info=None):
+    """Command handler for list_profile.
+
+    List per-operation profile information.
+
+    Args:
+      args: Command-line arguments, excluding the command prefix, as a list of
+        str.
+      screen_info: Optional dict input containing screen information such as
+        cols.
+
+    Returns:
+      Output text lines as a RichTextLines object.
+    """
+    del screen_info
+
+    parsed = self._arg_parsers["list_profile"].parse_args(args)
+    op_time_interval = (command_parser.parse_time_interval(parsed.op_time)
+                        if parsed.op_time else None)
+    exec_time_interval = (
+        command_parser.parse_time_interval(parsed.execution_time)
+        if parsed.execution_time else None)
+    node_name_regex = re.compile(parsed.node_name_filter)
+    file_name_regex = re.compile(parsed.file_name_filter)
+    op_type_regex = re.compile(parsed.op_type_filter)
+
+    output = debugger_cli_common.RichTextLines([""])
+    device_name_regex = re.compile(parsed.device_name_filter)
+    data_generator = self._get_profile_data_generator()
+    device_count = len(self._run_metadata.step_stats.dev_stats)
+    for index in range(device_count):
+      device_stats = self._run_metadata.step_stats.dev_stats[index]
+      if device_name_regex.match(device_stats.device):
+        profile_data = [
+            datum for datum in data_generator(device_stats)
+            if _list_profile_filter(
+                datum, node_name_regex, file_name_regex, op_type_regex,
+                op_time_interval, exec_time_interval)]
+        profile_data = sorted(
+            profile_data,
+            key=lambda datum: _list_profile_sort_key(datum, parsed.sort_by),
+            reverse=parsed.reverse)
+        output.extend(
+            self._get_list_profile_lines(
+                device_stats.device, index, device_count,
+                profile_data, parsed.sort_by, parsed.reverse))
+    return output
+
+  def _get_profile_data_generator(self):
+    """Get function that generates `ProfileDatum` objects.
+
+    Returns:
+      A function that generates `ProfileDatum` objects.
+    """
+    node_to_file_line = {}
+    node_to_op_type = {}
+    for op in self._graph.get_operations():
+      file_line = ""
+      for trace_entry in reversed(op.traceback):
+        filepath = trace_entry[0]
+        file_line = "%s:%d(%s)" % (
+            os.path.basename(filepath), trace_entry[1], trace_entry[2])
+        if not source_utils.guess_is_tensorflow_py_library(filepath):
+          break
+      node_to_file_line[op.name] = file_line
+      node_to_op_type[op.name] = op.type
+
+    def profile_data_generator(device_step_stats):
+      for node_stats in device_step_stats.node_stats:
+        if node_stats.node_name == "_SOURCE" or node_stats.node_name == "_SINK":
+          continue
+        yield ProfileDatum(
+            node_stats,
+            node_to_file_line.get(node_stats.node_name, ""),
+            node_to_op_type.get(node_stats.node_name, ""))
+    return profile_data_generator
+
+  def _get_list_profile_lines(
+      self, device_name, device_index, device_count,
+      profile_datum_list, sort_by, sort_reverse):
+    """Get `RichTextLines` object for list_profile command for a given device.
+
+    Args:
+      device_name: (string) Device name.
+      device_index: (int) Device index.
+      device_count: (int) Number of devices.
+      profile_datum_list: List of `ProfileDatum` objects.
+      sort_by: (string) Identifier of column to sort. Sort identifier
+          must match value of SORT_OPS_BY_OP_NAME, SORT_OPS_BY_EXEC_TIME,
+          SORT_OPS_BY_MEMORY or SORT_OPS_BY_LINE.
+      sort_reverse: (bool) Whether to sort in descending instead of default
+          (ascending) order.
+
+    Returns:
+      `RichTextLines` object containing a table that displays profiling
+      information for each op.
+    """
+    profile_data = ProfileDataTableView(profile_datum_list)
+
+    # Calculate total time early to calculate column widths.
+    total_op_time = sum(datum.op_time for datum in profile_datum_list)
+    total_exec_time = sum(datum.node_exec_stats.all_end_rel_micros
+                          for datum in profile_datum_list)
+    device_total_row = [
+        "Device Total", cli_shared.time_to_readable_str(total_op_time),
+        cli_shared.time_to_readable_str(total_exec_time)]
+
+    # Calculate column widths.
+    column_widths = [
+        len(column_name) for column_name in profile_data.column_names()]
+    for col in range(len(device_total_row)):
+      column_widths[col] = max(column_widths[col], len(device_total_row[col]))
+    for col in range(len(column_widths)):
+      for row in range(profile_data.row_count()):
+        column_widths[col] = max(
+            column_widths[col], len(str(profile_data.value(row, col))))
+      column_widths[col] += 2  # add margin between columns
+
+    # Add device name.
+    output = debugger_cli_common.RichTextLines(["-"*80])
+    device_row = "Device %d of %d: %s" % (
+        device_index + 1, device_count, device_name)
+    output.extend(debugger_cli_common.RichTextLines([device_row, ""]))
+
+    # Add headers.
+    base_command = "list_profile"
+    attr_segs = {0: []}
+    row = ""
+    for col in range(profile_data.column_count()):
+      column_name = profile_data.column_names()[col]
+      sort_id = profile_data.column_sort_id(col)
+      command = "%s -s %s" % (base_command, sort_id)
+      if sort_by == sort_id and not sort_reverse:
+        command += " -r"
+      curr_row = ("{:<%d}" % column_widths[col]).format(column_name)
+      prev_len = len(row)
+      row += curr_row
+      attr_segs[0].append(
+          (prev_len, prev_len + len(column_name),
+           [debugger_cli_common.MenuItem(None, command), "bold"]))
+
+    output.extend(
+        debugger_cli_common.RichTextLines([row], font_attr_segs=attr_segs))
+
+    # Add data rows.
+    for row in range(profile_data.row_count()):
+      row_str = ""
+      for col in range(profile_data.column_count()):
+        row_str += ("{:<%d}" % column_widths[col]).format(
+            profile_data.value(row, col))
+      output.extend(debugger_cli_common.RichTextLines([row_str]))
+
+    # Add stat totals.
+    row_str = ""
+    for col in range(len(device_total_row)):
+      row_str += ("{:<%d}" % column_widths[col]).format(device_total_row[col])
+    output.extend(debugger_cli_common.RichTextLines(""))
+    output.extend(debugger_cli_common.RichTextLines(row_str))
+    return output
+
+  def _measure_list_profile_column_widths(self, profile_data):
+    """Determine the maximum column widths for each data list.
+
+    Args:
+      profile_data: list of ProfileDatum objects.
+
+    Returns:
+      List of column widths in the same order as columns in data.
+    """
+    num_columns = len(profile_data.column_names())
+    widths = [len(column_name) for column_name in profile_data.column_names()]
+    for row in range(profile_data.row_count()):
+      for col in range(num_columns):
+        widths[col] = max(
+            widths[col], len(str(profile_data.row_values(row)[col])) + 2)
+    return widths
+
+  def get_help(self, handler_name):
+    return self._arg_parsers[handler_name].format_help()
+
+
+def create_profiler_ui(graph,
+                       run_metadata,
+                       ui_type="curses",
+                       on_ui_exit=None):
+  """Create an instance of CursesUI based on a `tf.Graph` and `RunMetadata`.
+
+  Args:
+    graph: Python `Graph` object.
+    run_metadata: A `RunMetadata` protobuf object.
+    ui_type: (str) requested UI type, e.g., "curses", "readline".
+    on_ui_exit: (`Callable`) the callback to be called when the UI exits.
+
+  Returns:
+    (base_ui.BaseUI) A BaseUI subtype object with a set of standard analyzer
+      commands and tab-completions registered.
+  """
+
+  analyzer = ProfileAnalyzer(graph, run_metadata)
+
+  cli = ui_factory.get_ui(ui_type, on_ui_exit=on_ui_exit)
+  cli.register_command_handler(
+      "list_profile",
+      analyzer.list_profile,
+      analyzer.get_help("list_profile"),
+      prefix_aliases=["lp"])
+
+  return cli
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
new file mode 100644
index 0000000000..7b34d87c99
--- /dev/null
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
@@ -0,0 +1,264 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for profile_analyzer_cli."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import re
+
+from tensorflow.core.framework import step_stats_pb2
+from tensorflow.core.protobuf import config_pb2
+from tensorflow.python.client import session
+from tensorflow.python.debug.cli import profile_analyzer_cli
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import test_util
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import googletest
+from tensorflow.python.platform import test
+
+
+class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
+
+  def testNodeInfoEmpty(self):
+    graph = ops.Graph()
+    run_metadata = config_pb2.RunMetadata()
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+    prof_output = prof_analyzer.list_profile([]).lines
+    self.assertEquals([""], prof_output)
+
+  def testSingleDevice(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    node2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        op_start_rel_micros=1,
+        op_end_rel_micros=2,
+        all_end_rel_micros=3)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1, node2])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = "Add/123"
+    op1.traceback = [("a/b/file1", 10, "some_var")]
+    op1.type = "add"
+    op2 = test.mock.MagicMock()
+    op2.name = "Mul/456"
+    op2.traceback = [("a/b/file1", 11, "some_var")]
+    op2.type = "mul"
+    graph.get_operations.return_value = [op1, op2]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+    prof_output = prof_analyzer.list_profile([]).lines
+
+    self._assertAtLeastOneLineMatches(r"Device 1 of 1: deviceA", prof_output)
+    self._assertAtLeastOneLineMatches(r"^Add/123.*2us.*4us", prof_output)
+    self._assertAtLeastOneLineMatches(r"^Mul/456.*1us.*3us", prof_output)
+
+  def testMultipleDevices(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=3)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1])
+
+    device2 = run_metadata.step_stats.dev_stats.add()
+    device2.device = "deviceB"
+    device2.node_stats.extend([node1])
+
+    graph = test.mock.MagicMock()
+    op = test.mock.MagicMock()
+    op.name = "Add/123"
+    op.traceback = [("a/b/file1", 10, "some_var")]
+    op.type = "abc"
+    graph.get_operations.return_value = [op]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+    prof_output = prof_analyzer.list_profile([]).lines
+
+    self._assertAtLeastOneLineMatches(r"Device 1 of 2: deviceA", prof_output)
+    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
+
+    # Try filtering by device.
+    prof_output = prof_analyzer.list_profile(["-d", "deviceB"]).lines
+    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
+    self._assertNoLinesMatch(r"Device 1 of 2: deviceA", prof_output)
+
+  def testWithSession(self):
+    options = config_pb2.RunOptions()
+    options.trace_level = config_pb2.RunOptions.FULL_TRACE
+    run_metadata = config_pb2.RunMetadata()
+
+    with session.Session() as sess:
+      a = constant_op.constant([1, 2, 3])
+      b = constant_op.constant([2, 2, 1])
+      result = math_ops.add(a, b)
+
+      sess.run(result, options=options, run_metadata=run_metadata)
+
+      prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(
+          sess.graph, run_metadata)
+      prof_output = prof_analyzer.list_profile([]).lines
+
+      self._assertAtLeastOneLineMatches("Device 1 of 1:", prof_output)
+      expected_headers = [
+          "Node", "Op Time", "Exec Time", r"Filename:Lineno\(function\)"]
+      self._assertAtLeastOneLineMatches(
+          ".*".join(expected_headers), prof_output)
+      self._assertAtLeastOneLineMatches(r"^Add/", prof_output)
+      self._assertAtLeastOneLineMatches(r"Device Total", prof_output)
+
+  def testSorting(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        all_start_micros=123,
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    node2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        all_start_micros=122,
+        op_start_rel_micros=1,
+        op_end_rel_micros=2,
+        all_end_rel_micros=5)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1, node2])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = "Add/123"
+    op1.traceback = [("a/b/file2", 10, "some_var")]
+    op1.type = "add"
+    op2 = test.mock.MagicMock()
+    op2.name = "Mul/456"
+    op2.traceback = [("a/b/file1", 11, "some_var")]
+    op2.type = "mul"
+    graph.get_operations.return_value = [op1, op2]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+
+    # Default sort by start time (i.e. all_start_micros).
+    prof_output = prof_analyzer.list_profile([]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
+    # Default sort in reverse.
+    prof_output = prof_analyzer.list_profile(["-r"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
+    # Sort by name.
+    prof_output = prof_analyzer.list_profile(["-s", "node"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
+    # Sort by op time (i.e. op_end_rel_micros - op_start_rel_micros).
+    prof_output = prof_analyzer.list_profile(["-s", "op_time"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
+    # Sort by exec time (i.e. all_end_rel_micros).
+    prof_output = prof_analyzer.list_profile(["-s", "exec_time"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
+    # Sort by line number.
+    prof_output = prof_analyzer.list_profile(["-s", "line"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
+
+  def testFiltering(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        all_start_micros=123,
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    node2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        all_start_micros=122,
+        op_start_rel_micros=1,
+        op_end_rel_micros=2,
+        all_end_rel_micros=5)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1, node2])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = "Add/123"
+    op1.traceback = [("a/b/file2", 10, "some_var")]
+    op1.type = "add"
+    op2 = test.mock.MagicMock()
+    op2.name = "Mul/456"
+    op2.traceback = [("a/b/file1", 11, "some_var")]
+    op2.type = "mul"
+    graph.get_operations.return_value = [op1, op2]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+
+    # Filter by name
+    prof_output = prof_analyzer.list_profile(["-n", "Add"]).lines
+    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
+    self._assertNoLinesMatch(r"Mul/456", prof_output)
+    # Filter by op_type
+    prof_output = prof_analyzer.list_profile(["-t", "mul"]).lines
+    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
+    self._assertNoLinesMatch(r"Add/123", prof_output)
+    # Filter by file name.
+    prof_output = prof_analyzer.list_profile(["-f", "file2"]).lines
+    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
+    self._assertNoLinesMatch(r"Mul/456", prof_output)
+    # Fitler by execution time.
+    prof_output = prof_analyzer.list_profile(["-e", "[5, 10]"]).lines
+    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
+    self._assertNoLinesMatch(r"Add/123", prof_output)
+    # Fitler by op time.
+    prof_output = prof_analyzer.list_profile(["-o", ">=2"]).lines
+    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
+    self._assertNoLinesMatch(r"Mul/456", prof_output)
+
+  def _atLeastOneLineMatches(self, pattern, lines):
+    pattern_re = re.compile(pattern)
+    for line in lines:
+      if pattern_re.match(line):
+        return True
+    return False
+
+  def _assertAtLeastOneLineMatches(self, pattern, lines):
+    if not self._atLeastOneLineMatches(pattern, lines):
+      raise AssertionError(
+          "%s does not match any line in %s." % (pattern, str(lines)))
+
+  def _assertNoLinesMatch(self, pattern, lines):
+    if self._atLeastOneLineMatches(pattern, lines):
+      raise AssertionError(
+          "%s matched at least one line in %s." % (pattern, str(lines)))
+
+
+if __name__ == "__main__":
+  googletest.main()
diff --git a/tensorflow/python/debug/lib/source_utils.py b/tensorflow/python/debug/lib/source_utils.py
index 580bdc054b..f610d05b83 100644
--- a/tensorflow/python/debug/lib/source_utils.py
+++ b/tensorflow/python/debug/lib/source_utils.py
@@ -44,7 +44,7 @@ def _convert_watch_key_to_tensor_name(watch_key):
   return watch_key[:watch_key.rfind(":")]
 
 
-def _guess_is_tensorflow_py_library(py_file_path):
+def guess_is_tensorflow_py_library(py_file_path):
   """Guess whether a Python source file is a part of the tensorflow library.
 
   Special cases:
@@ -231,7 +231,7 @@ def list_source_files_against_dump(dump,
   for file_path in path_to_node_names:
     output.append((
         file_path,
-        _guess_is_tensorflow_py_library(file_path),
+        guess_is_tensorflow_py_library(file_path),
         len(path_to_node_names.get(file_path, {})),
         len(path_to_tensor_names.get(file_path, {})),
         path_to_num_dumps.get(file_path, 0),
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index a4fb0d9910..f6195b6a5d 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -57,20 +57,20 @@ class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
 
   def testUnitTestFileReturnsFalse(self):
     self.assertFalse(
-        source_utils._guess_is_tensorflow_py_library(self.curr_file_path))
+        source_utils.guess_is_tensorflow_py_library(self.curr_file_path))
 
   def testSourceUtilModuleReturnsTrue(self):
     self.assertTrue(
-        source_utils._guess_is_tensorflow_py_library(source_utils.__file__))
+        source_utils.guess_is_tensorflow_py_library(source_utils.__file__))
 
   def testFileInPythonKernelsPathReturnsTrue(self):
     x = constant_op.constant(42.0, name="x")
     self.assertTrue(
-        source_utils._guess_is_tensorflow_py_library(x.op.traceback[-1][0]))
+        source_utils.guess_is_tensorflow_py_library(x.op.traceback[-1][0]))
 
   def testNonPythonFileRaisesException(self):
     with self.assertRaisesRegexp(ValueError, r"is not a Python source file"):
-      source_utils._guess_is_tensorflow_py_library(
+      source_utils.guess_is_tensorflow_py_library(
           os.path.join(os.path.dirname(self.curr_file_path), "foo.cc"))
 
 
-- 
GitLab


From c19dd491e57c6ed8f4aedec69d6653478f5824ee Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Tue, 25 Apr 2017 13:49:14 -0800
Subject: [PATCH 0669/1563] Fix queue runner test flakiness. The cost graph may
 be requested before cost_graph_ is stored. Change: 154224628

---
 tensorflow/cc/training/queue_runner_test.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/cc/training/queue_runner_test.cc b/tensorflow/cc/training/queue_runner_test.cc
index e814be8630..da2fc03b6c 100644
--- a/tensorflow/cc/training/queue_runner_test.cc
+++ b/tensorflow/cc/training/queue_runner_test.cc
@@ -379,6 +379,9 @@ TEST(QueueRunnerTest, RunMetaDataTest) {
   // race condition where we close the queue before it was populated.
   std::vector<Tensor> dq0;
   TF_EXPECT_OK(session->Run({}, {kDequeueOp0}, {}, &dq0));
+  // Second call to run dequeue op is to make sure the cost graph has been
+  // stored.
+  TF_EXPECT_OK(session->Run({}, {kDequeueOp0}, {}, &dq0));
 
   CostGraphDef cost_graph;
   TF_CHECK_OK(qr->ExportCostGraph(&cost_graph));
-- 
GitLab


From 0a583aae32d62ac66be962694dcedc0193e8bffa Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 13:52:13 -0800
Subject: [PATCH 0670/1563] Automated rollback of change 154220704 Change:
 154225030

---
 tensorflow/python/debug/BUILD                 |  35 --
 tensorflow/python/debug/cli/cli_shared.py     |  10 -
 .../python/debug/cli/cli_shared_test.py       |  15 -
 tensorflow/python/debug/cli/command_parser.py |  25 +-
 .../python/debug/cli/command_parser_test.py   |  19 -
 .../python/debug/cli/profile_analyzer_cli.py  | 459 ------------------
 .../debug/cli/profile_analyzer_cli_test.py    | 264 ----------
 tensorflow/python/debug/lib/source_utils.py   |   4 +-
 .../python/debug/lib/source_utils_test.py     |   8 +-
 9 files changed, 9 insertions(+), 830 deletions(-)
 delete mode 100644 tensorflow/python/debug/cli/profile_analyzer_cli.py
 delete mode 100644 tensorflow/python/debug/cli/profile_analyzer_cli_test.py

diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index e738c86a1f..f7e17f1c53 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -147,22 +147,6 @@ py_library(
     ],
 )
 
-py_library(
-    name = "profile_analyzer_cli",
-    srcs = ["cli/profile_analyzer_cli.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":cli_shared",
-        ":command_parser",
-        ":debug_data",
-        ":debugger_cli_common",
-        ":source_utils",
-        ":ui_factory",
-        "//third_party/py/numpy",
-        "@six_archive//:six",
-    ],
-)
-
 py_library(
     name = "stepper_cli",
     srcs = ["cli/stepper_cli.py"],
@@ -257,7 +241,6 @@ py_library(
         ":debug_data",
         ":debugger_cli_common",
         ":framework",
-        ":profile_analyzer_cli",
         ":stepper_cli",
         ":ui_factory",
     ],
@@ -623,24 +606,6 @@ cuda_py_test(
     ],
 )
 
-py_test(
-    name = "profile_analyzer_cli_test",
-    size = "small",
-    srcs = [
-        "cli/profile_analyzer_cli_test.py",
-    ],
-    deps = [
-        ":command_parser",
-        ":profile_analyzer_cli",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:control_flow_ops",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "stepper_cli_test",
     size = "small",
diff --git a/tensorflow/python/debug/cli/cli_shared.py b/tensorflow/python/debug/cli/cli_shared.py
index 3deb6dbad6..8ff0916761 100644
--- a/tensorflow/python/debug/cli/cli_shared.py
+++ b/tensorflow/python/debug/cli/cli_shared.py
@@ -17,8 +17,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import math
-
 import numpy as np
 import six
 
@@ -75,14 +73,6 @@ def bytes_to_readable_str(num_bytes, include_b=False):
   return result
 
 
-def time_to_readable_str(value):
-  if not value:
-    return "0"
-  suffixes = ["us", "ms", "s"]
-  order = min(len(suffixes) - 1, int(math.log(value, 10) / 3))
-  return "{:.3g}{}".format(value / math.pow(10.0, 3*order), suffixes[order])
-
-
 def parse_ranges_highlight(ranges_string):
   """Process ranges highlight string.
 
diff --git a/tensorflow/python/debug/cli/cli_shared_test.py b/tensorflow/python/debug/cli/cli_shared_test.py
index fde1d66998..1ef3c34254 100644
--- a/tensorflow/python/debug/cli/cli_shared_test.py
+++ b/tensorflow/python/debug/cli/cli_shared_test.py
@@ -70,21 +70,6 @@ class BytesToReadableStrTest(test_util.TensorFlowTestCase):
             1024**3, include_b=True))
 
 
-class TimeToReadableStrTest(test_util.TensorFlowTestCase):
-
-  def testNoneTimeWorks(self):
-    self.assertEqual("0", cli_shared.time_to_readable_str(None))
-
-  def testMicrosecondsTime(self):
-    self.assertEqual("40us", cli_shared.time_to_readable_str(40))
-
-  def testMillisecondTime(self):
-    self.assertEqual("40ms", cli_shared.time_to_readable_str(40e3))
-
-  def testSecondTime(self):
-    self.assertEqual("40s", cli_shared.time_to_readable_str(40e6))
-
-
 class GetRunStartIntroAndDescriptionTest(test_util.TensorFlowTestCase):
 
   def setUp(self):
diff --git a/tensorflow/python/debug/cli/command_parser.py b/tensorflow/python/debug/cli/command_parser.py
index 143c104519..a71982f86a 100644
--- a/tensorflow/python/debug/cli/command_parser.py
+++ b/tensorflow/python/debug/cli/command_parser.py
@@ -18,6 +18,7 @@ from __future__ import division
 from __future__ import print_function
 
 import ast
+from collections import namedtuple
 import re
 import sys
 
@@ -28,28 +29,8 @@ _WHITESPACE_PATTERN = re.compile(r"\s+")
 
 _NUMBER_PATTERN = re.compile(r"[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?")
 
-
-class Interval(object):
-  """Represents an interval between a start and end value."""
-
-  def __init__(self, start, start_included, end, end_included):
-    self.start = start
-    self.start_included = start_included
-    self.end = end
-    self.end_included = end_included
-
-  def contains(self, value):
-    if value < self.start or value == self.start and not self.start_included:
-      return False
-    if value > self.end or value == self.end and not self.end_included:
-      return False
-    return True
-
-  def __eq__(self, other):
-    return (self.start == other.start and
-            self.start_included == other.start_included and
-            self.end == other.end and
-            self.end_included == other.end_included)
+Interval = namedtuple("Interval",
+                      ["start", "start_included", "end", "end_included"])
 
 
 def parse_command(command):
diff --git a/tensorflow/python/debug/cli/command_parser_test.py b/tensorflow/python/debug/cli/command_parser_test.py
index 1ea890be8c..ab9b3245dc 100644
--- a/tensorflow/python/debug/cli/command_parser_test.py
+++ b/tensorflow/python/debug/cli/command_parser_test.py
@@ -490,25 +490,6 @@ class ParseInterval(test_util.TensorFlowTestCase):
         "equal to end of interval."):
       command_parser.parse_memory_interval("[5k, 3k]")
 
-  def testIntervalContains(self):
-    interval = command_parser.Interval(
-        start=1, start_included=True, end=10, end_included=True)
-    self.assertTrue(interval.contains(1))
-    self.assertTrue(interval.contains(10))
-    self.assertTrue(interval.contains(5))
-
-    interval.start_included = False
-    self.assertFalse(interval.contains(1))
-    self.assertTrue(interval.contains(10))
-
-    interval.end_included = False
-    self.assertFalse(interval.contains(1))
-    self.assertFalse(interval.contains(10))
-
-    interval.start_included = True
-    self.assertTrue(interval.contains(1))
-    self.assertFalse(interval.contains(10))
-
 
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
deleted file mode 100644
index 42440521eb..0000000000
--- a/tensorflow/python/debug/cli/profile_analyzer_cli.py
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Formats and displays profiling information."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import argparse
-import os
-import re
-
-from tensorflow.python.debug.cli import cli_shared
-from tensorflow.python.debug.cli import command_parser
-from tensorflow.python.debug.cli import debugger_cli_common
-from tensorflow.python.debug.cli import ui_factory
-from tensorflow.python.debug.lib import source_utils
-
-
-SORT_OPS_BY_OP_NAME = "node"
-SORT_OPS_BY_OP_TIME = "op_time"
-SORT_OPS_BY_EXEC_TIME = "exec_time"
-SORT_OPS_BY_START_TIME = "start_time"
-SORT_OPS_BY_LINE = "line"
-
-
-class ProfileDatum(object):
-  """Profile data point."""
-
-  def __init__(self, node_exec_stats, file_line, op_type):
-    """Constructor.
-
-    Args:
-      node_exec_stats: `NodeExecStats` proto.
-      file_line: A `string` formatted as <file_name>:<line_number>.
-      op_type: (string) Operation type.
-    """
-    self.node_exec_stats = node_exec_stats
-    self.file_line = file_line
-    self.op_type = op_type
-    self.op_time = (self.node_exec_stats.op_end_rel_micros -
-                    self.node_exec_stats.op_start_rel_micros)
-
-  @property
-  def exec_time(self):
-    """Measures compute function exection time plus pre- and post-processing."""
-    return self.node_exec_stats.all_end_rel_micros
-
-
-class ProfileDataTableView(object):
-  """Table View of profiling data."""
-
-  def __init__(self, profile_datum_list):
-    """Constructor.
-
-    Args:
-      profile_datum_list: List of `ProfileDatum` objects.
-    """
-    self._profile_datum_list = profile_datum_list
-    self.formatted_op_time = [
-        cli_shared.time_to_readable_str(datum.op_time)
-        for datum in profile_datum_list]
-    self.formatted_exec_time = [
-        cli_shared.time_to_readable_str(
-            datum.node_exec_stats.all_end_rel_micros)
-        for datum in profile_datum_list]
-    self._column_sort_ids = [SORT_OPS_BY_OP_NAME, SORT_OPS_BY_OP_TIME,
-                             SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE]
-
-  def value(self, row, col):
-    if col == 0:
-      return self._profile_datum_list[row].node_exec_stats.node_name
-    elif col == 1:
-      return self.formatted_op_time[row]
-    elif col == 2:
-      return self.formatted_exec_time[row]
-    elif col == 3:
-      return self._profile_datum_list[row].file_line
-    else:
-      raise IndexError("Invalid column index %d." % col)
-
-  def row_count(self):
-    return len(self._profile_datum_list)
-
-  def column_count(self):
-    return 4
-
-  def column_names(self):
-    return ["Node", "Op Time", "Exec Time", "Filename:Lineno(function)"]
-
-  def column_sort_id(self, col):
-    return self._column_sort_ids[col]
-
-
-def _list_profile_filter(
-    profile_datum, node_name_regex, file_name_regex, op_type_regex,
-    op_time_interval, exec_time_interval):
-  """Filter function for list_profile command.
-
-  Args:
-    profile_datum: A `ProfileDatum` object.
-    node_name_regex: Regular expression pattern object to filter by name.
-    file_name_regex: Regular expression pattern object to filter by file.
-    op_type_regex: Regular expression pattern object to filter by op type.
-    op_time_interval: `Interval` for filtering op time.
-    exec_time_interval: `Interval` for filtering exec time.
-
-  Returns:
-    True if profile_datum should be included.
-  """
-  if not node_name_regex.match(
-      profile_datum.node_exec_stats.node_name):
-    return False
-  if profile_datum.file_line is not None and not file_name_regex.match(
-      profile_datum.file_line):
-    return False
-  if profile_datum.op_type is not None and not op_type_regex.match(
-      profile_datum.op_type):
-    return False
-  if op_time_interval is not None and not op_time_interval.contains(
-      profile_datum.op_time):
-    return False
-  if exec_time_interval and not exec_time_interval.contains(
-      profile_datum.node_exec_stats.all_end_rel_micros):
-    return False
-  return True
-
-
-def _list_profile_sort_key(profile_datum, sort_by):
-  """Get a profile_datum property to sort by in list_profile command.
-
-  Args:
-    profile_datum: A `ProfileDatum` object.
-    sort_by: (string) indicates a value to sort by.
-      Must be one of SORT_BY* constants.
-
-  Returns:
-    profile_datum property to sort by.
-  """
-  if sort_by == SORT_OPS_BY_OP_NAME:
-    return profile_datum.node_exec_stats.node_name
-  elif sort_by == SORT_OPS_BY_LINE:
-    return profile_datum.file_line
-  elif sort_by == SORT_OPS_BY_OP_TIME:
-    return profile_datum.op_time
-  elif sort_by == SORT_OPS_BY_EXEC_TIME:
-    return profile_datum.node_exec_stats.all_end_rel_micros
-  else:  # sort by start time
-    return profile_datum.node_exec_stats.all_start_micros
-
-
-class ProfileAnalyzer(object):
-  """Analyzer for profiling data."""
-
-  def __init__(self, graph, run_metadata):
-    """ProfileAnalyzer constructor.
-
-    Args:
-      graph: (tf.Graph) Python graph object.
-      run_metadata: A `RunMetadata` protobuf object.
-
-    Raises:
-      ValueError: If run_metadata is None.
-    """
-    self._graph = graph
-    if not run_metadata:
-      raise ValueError("No RunMetadata passed for profile analysis.")
-    self._run_metadata = run_metadata
-    self._arg_parsers = {}
-    ap = argparse.ArgumentParser(
-        description="List nodes profile information.",
-        usage=argparse.SUPPRESS)
-    ap.add_argument(
-        "-d",
-        "--device_name_filter",
-        dest="device_name_filter",
-        type=str,
-        default="",
-        help="filter device name by regex.")
-    ap.add_argument(
-        "-n",
-        "--node_name_filter",
-        dest="node_name_filter",
-        type=str,
-        default="",
-        help="filter node name by regex.")
-    ap.add_argument(
-        "-t",
-        "--op_type_filter",
-        dest="op_type_filter",
-        type=str,
-        default="",
-        help="filter op type by regex.")
-    # TODO(annarev): allow file filtering at non-stack top position.
-    ap.add_argument(
-        "-f",
-        "--file_name_filter",
-        dest="file_name_filter",
-        type=str,
-        default="",
-        help="filter by file name at the top position of node's creation "
-             "stack that does not belong to TensorFlow library.")
-    ap.add_argument(
-        "-e",
-        "--execution_time",
-        dest="execution_time",
-        type=str,
-        default="",
-        help="Filter by execution time interval "
-             "(includes compute plus pre- and post -processing time). "
-             "Supported units are s, ms and us (default). "
-             "E.g. -e >100s, -e <100, -e [100us,1000ms]")
-    ap.add_argument(
-        "-o",
-        "--op_time",
-        dest="op_time",
-        type=str,
-        default="",
-        help="Filter by op time interval (only includes compute time). "
-             "Supported units are s, ms and us (default). "
-             "E.g. -e >100s, -e <100, -e [100us,1000ms]")
-    ap.add_argument(
-        "-s",
-        "--sort_by",
-        dest="sort_by",
-        type=str,
-        default=SORT_OPS_BY_START_TIME,
-        help=("the field to sort the data by: (%s | %s | %s | %s | %s)" %
-              (SORT_OPS_BY_OP_NAME, SORT_OPS_BY_START_TIME,
-               SORT_OPS_BY_OP_TIME, SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE)))
-    ap.add_argument(
-        "-r",
-        "--reverse",
-        dest="reverse",
-        action="store_true",
-        help="sort the data in reverse (descending) order")
-
-    self._arg_parsers["list_profile"] = ap
-
-  def list_profile(self, args, screen_info=None):
-    """Command handler for list_profile.
-
-    List per-operation profile information.
-
-    Args:
-      args: Command-line arguments, excluding the command prefix, as a list of
-        str.
-      screen_info: Optional dict input containing screen information such as
-        cols.
-
-    Returns:
-      Output text lines as a RichTextLines object.
-    """
-    del screen_info
-
-    parsed = self._arg_parsers["list_profile"].parse_args(args)
-    op_time_interval = (command_parser.parse_time_interval(parsed.op_time)
-                        if parsed.op_time else None)
-    exec_time_interval = (
-        command_parser.parse_time_interval(parsed.execution_time)
-        if parsed.execution_time else None)
-    node_name_regex = re.compile(parsed.node_name_filter)
-    file_name_regex = re.compile(parsed.file_name_filter)
-    op_type_regex = re.compile(parsed.op_type_filter)
-
-    output = debugger_cli_common.RichTextLines([""])
-    device_name_regex = re.compile(parsed.device_name_filter)
-    data_generator = self._get_profile_data_generator()
-    device_count = len(self._run_metadata.step_stats.dev_stats)
-    for index in range(device_count):
-      device_stats = self._run_metadata.step_stats.dev_stats[index]
-      if device_name_regex.match(device_stats.device):
-        profile_data = [
-            datum for datum in data_generator(device_stats)
-            if _list_profile_filter(
-                datum, node_name_regex, file_name_regex, op_type_regex,
-                op_time_interval, exec_time_interval)]
-        profile_data = sorted(
-            profile_data,
-            key=lambda datum: _list_profile_sort_key(datum, parsed.sort_by),
-            reverse=parsed.reverse)
-        output.extend(
-            self._get_list_profile_lines(
-                device_stats.device, index, device_count,
-                profile_data, parsed.sort_by, parsed.reverse))
-    return output
-
-  def _get_profile_data_generator(self):
-    """Get function that generates `ProfileDatum` objects.
-
-    Returns:
-      A function that generates `ProfileDatum` objects.
-    """
-    node_to_file_line = {}
-    node_to_op_type = {}
-    for op in self._graph.get_operations():
-      file_line = ""
-      for trace_entry in reversed(op.traceback):
-        filepath = trace_entry[0]
-        file_line = "%s:%d(%s)" % (
-            os.path.basename(filepath), trace_entry[1], trace_entry[2])
-        if not source_utils.guess_is_tensorflow_py_library(filepath):
-          break
-      node_to_file_line[op.name] = file_line
-      node_to_op_type[op.name] = op.type
-
-    def profile_data_generator(device_step_stats):
-      for node_stats in device_step_stats.node_stats:
-        if node_stats.node_name == "_SOURCE" or node_stats.node_name == "_SINK":
-          continue
-        yield ProfileDatum(
-            node_stats,
-            node_to_file_line.get(node_stats.node_name, ""),
-            node_to_op_type.get(node_stats.node_name, ""))
-    return profile_data_generator
-
-  def _get_list_profile_lines(
-      self, device_name, device_index, device_count,
-      profile_datum_list, sort_by, sort_reverse):
-    """Get `RichTextLines` object for list_profile command for a given device.
-
-    Args:
-      device_name: (string) Device name.
-      device_index: (int) Device index.
-      device_count: (int) Number of devices.
-      profile_datum_list: List of `ProfileDatum` objects.
-      sort_by: (string) Identifier of column to sort. Sort identifier
-          must match value of SORT_OPS_BY_OP_NAME, SORT_OPS_BY_EXEC_TIME,
-          SORT_OPS_BY_MEMORY or SORT_OPS_BY_LINE.
-      sort_reverse: (bool) Whether to sort in descending instead of default
-          (ascending) order.
-
-    Returns:
-      `RichTextLines` object containing a table that displays profiling
-      information for each op.
-    """
-    profile_data = ProfileDataTableView(profile_datum_list)
-
-    # Calculate total time early to calculate column widths.
-    total_op_time = sum(datum.op_time for datum in profile_datum_list)
-    total_exec_time = sum(datum.node_exec_stats.all_end_rel_micros
-                          for datum in profile_datum_list)
-    device_total_row = [
-        "Device Total", cli_shared.time_to_readable_str(total_op_time),
-        cli_shared.time_to_readable_str(total_exec_time)]
-
-    # Calculate column widths.
-    column_widths = [
-        len(column_name) for column_name in profile_data.column_names()]
-    for col in range(len(device_total_row)):
-      column_widths[col] = max(column_widths[col], len(device_total_row[col]))
-    for col in range(len(column_widths)):
-      for row in range(profile_data.row_count()):
-        column_widths[col] = max(
-            column_widths[col], len(str(profile_data.value(row, col))))
-      column_widths[col] += 2  # add margin between columns
-
-    # Add device name.
-    output = debugger_cli_common.RichTextLines(["-"*80])
-    device_row = "Device %d of %d: %s" % (
-        device_index + 1, device_count, device_name)
-    output.extend(debugger_cli_common.RichTextLines([device_row, ""]))
-
-    # Add headers.
-    base_command = "list_profile"
-    attr_segs = {0: []}
-    row = ""
-    for col in range(profile_data.column_count()):
-      column_name = profile_data.column_names()[col]
-      sort_id = profile_data.column_sort_id(col)
-      command = "%s -s %s" % (base_command, sort_id)
-      if sort_by == sort_id and not sort_reverse:
-        command += " -r"
-      curr_row = ("{:<%d}" % column_widths[col]).format(column_name)
-      prev_len = len(row)
-      row += curr_row
-      attr_segs[0].append(
-          (prev_len, prev_len + len(column_name),
-           [debugger_cli_common.MenuItem(None, command), "bold"]))
-
-    output.extend(
-        debugger_cli_common.RichTextLines([row], font_attr_segs=attr_segs))
-
-    # Add data rows.
-    for row in range(profile_data.row_count()):
-      row_str = ""
-      for col in range(profile_data.column_count()):
-        row_str += ("{:<%d}" % column_widths[col]).format(
-            profile_data.value(row, col))
-      output.extend(debugger_cli_common.RichTextLines([row_str]))
-
-    # Add stat totals.
-    row_str = ""
-    for col in range(len(device_total_row)):
-      row_str += ("{:<%d}" % column_widths[col]).format(device_total_row[col])
-    output.extend(debugger_cli_common.RichTextLines(""))
-    output.extend(debugger_cli_common.RichTextLines(row_str))
-    return output
-
-  def _measure_list_profile_column_widths(self, profile_data):
-    """Determine the maximum column widths for each data list.
-
-    Args:
-      profile_data: list of ProfileDatum objects.
-
-    Returns:
-      List of column widths in the same order as columns in data.
-    """
-    num_columns = len(profile_data.column_names())
-    widths = [len(column_name) for column_name in profile_data.column_names()]
-    for row in range(profile_data.row_count()):
-      for col in range(num_columns):
-        widths[col] = max(
-            widths[col], len(str(profile_data.row_values(row)[col])) + 2)
-    return widths
-
-  def get_help(self, handler_name):
-    return self._arg_parsers[handler_name].format_help()
-
-
-def create_profiler_ui(graph,
-                       run_metadata,
-                       ui_type="curses",
-                       on_ui_exit=None):
-  """Create an instance of CursesUI based on a `tf.Graph` and `RunMetadata`.
-
-  Args:
-    graph: Python `Graph` object.
-    run_metadata: A `RunMetadata` protobuf object.
-    ui_type: (str) requested UI type, e.g., "curses", "readline".
-    on_ui_exit: (`Callable`) the callback to be called when the UI exits.
-
-  Returns:
-    (base_ui.BaseUI) A BaseUI subtype object with a set of standard analyzer
-      commands and tab-completions registered.
-  """
-
-  analyzer = ProfileAnalyzer(graph, run_metadata)
-
-  cli = ui_factory.get_ui(ui_type, on_ui_exit=on_ui_exit)
-  cli.register_command_handler(
-      "list_profile",
-      analyzer.list_profile,
-      analyzer.get_help("list_profile"),
-      prefix_aliases=["lp"])
-
-  return cli
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
deleted file mode 100644
index 7b34d87c99..0000000000
--- a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Tests for profile_analyzer_cli."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import re
-
-from tensorflow.core.framework import step_stats_pb2
-from tensorflow.core.protobuf import config_pb2
-from tensorflow.python.client import session
-from tensorflow.python.debug.cli import profile_analyzer_cli
-from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import ops
-from tensorflow.python.framework import test_util
-from tensorflow.python.ops import math_ops
-from tensorflow.python.platform import googletest
-from tensorflow.python.platform import test
-
-
-class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
-
-  def testNodeInfoEmpty(self):
-    graph = ops.Graph()
-    run_metadata = config_pb2.RunMetadata()
-
-    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
-    prof_output = prof_analyzer.list_profile([]).lines
-    self.assertEquals([""], prof_output)
-
-  def testSingleDevice(self):
-    node1 = step_stats_pb2.NodeExecStats(
-        node_name="Add/123",
-        op_start_rel_micros=3,
-        op_end_rel_micros=5,
-        all_end_rel_micros=4)
-
-    node2 = step_stats_pb2.NodeExecStats(
-        node_name="Mul/456",
-        op_start_rel_micros=1,
-        op_end_rel_micros=2,
-        all_end_rel_micros=3)
-
-    run_metadata = config_pb2.RunMetadata()
-    device1 = run_metadata.step_stats.dev_stats.add()
-    device1.device = "deviceA"
-    device1.node_stats.extend([node1, node2])
-
-    graph = test.mock.MagicMock()
-    op1 = test.mock.MagicMock()
-    op1.name = "Add/123"
-    op1.traceback = [("a/b/file1", 10, "some_var")]
-    op1.type = "add"
-    op2 = test.mock.MagicMock()
-    op2.name = "Mul/456"
-    op2.traceback = [("a/b/file1", 11, "some_var")]
-    op2.type = "mul"
-    graph.get_operations.return_value = [op1, op2]
-
-    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
-    prof_output = prof_analyzer.list_profile([]).lines
-
-    self._assertAtLeastOneLineMatches(r"Device 1 of 1: deviceA", prof_output)
-    self._assertAtLeastOneLineMatches(r"^Add/123.*2us.*4us", prof_output)
-    self._assertAtLeastOneLineMatches(r"^Mul/456.*1us.*3us", prof_output)
-
-  def testMultipleDevices(self):
-    node1 = step_stats_pb2.NodeExecStats(
-        node_name="Add/123",
-        op_start_rel_micros=3,
-        op_end_rel_micros=5,
-        all_end_rel_micros=3)
-
-    run_metadata = config_pb2.RunMetadata()
-    device1 = run_metadata.step_stats.dev_stats.add()
-    device1.device = "deviceA"
-    device1.node_stats.extend([node1])
-
-    device2 = run_metadata.step_stats.dev_stats.add()
-    device2.device = "deviceB"
-    device2.node_stats.extend([node1])
-
-    graph = test.mock.MagicMock()
-    op = test.mock.MagicMock()
-    op.name = "Add/123"
-    op.traceback = [("a/b/file1", 10, "some_var")]
-    op.type = "abc"
-    graph.get_operations.return_value = [op]
-
-    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
-    prof_output = prof_analyzer.list_profile([]).lines
-
-    self._assertAtLeastOneLineMatches(r"Device 1 of 2: deviceA", prof_output)
-    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
-
-    # Try filtering by device.
-    prof_output = prof_analyzer.list_profile(["-d", "deviceB"]).lines
-    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
-    self._assertNoLinesMatch(r"Device 1 of 2: deviceA", prof_output)
-
-  def testWithSession(self):
-    options = config_pb2.RunOptions()
-    options.trace_level = config_pb2.RunOptions.FULL_TRACE
-    run_metadata = config_pb2.RunMetadata()
-
-    with session.Session() as sess:
-      a = constant_op.constant([1, 2, 3])
-      b = constant_op.constant([2, 2, 1])
-      result = math_ops.add(a, b)
-
-      sess.run(result, options=options, run_metadata=run_metadata)
-
-      prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(
-          sess.graph, run_metadata)
-      prof_output = prof_analyzer.list_profile([]).lines
-
-      self._assertAtLeastOneLineMatches("Device 1 of 1:", prof_output)
-      expected_headers = [
-          "Node", "Op Time", "Exec Time", r"Filename:Lineno\(function\)"]
-      self._assertAtLeastOneLineMatches(
-          ".*".join(expected_headers), prof_output)
-      self._assertAtLeastOneLineMatches(r"^Add/", prof_output)
-      self._assertAtLeastOneLineMatches(r"Device Total", prof_output)
-
-  def testSorting(self):
-    node1 = step_stats_pb2.NodeExecStats(
-        node_name="Add/123",
-        all_start_micros=123,
-        op_start_rel_micros=3,
-        op_end_rel_micros=5,
-        all_end_rel_micros=4)
-
-    node2 = step_stats_pb2.NodeExecStats(
-        node_name="Mul/456",
-        all_start_micros=122,
-        op_start_rel_micros=1,
-        op_end_rel_micros=2,
-        all_end_rel_micros=5)
-
-    run_metadata = config_pb2.RunMetadata()
-    device1 = run_metadata.step_stats.dev_stats.add()
-    device1.device = "deviceA"
-    device1.node_stats.extend([node1, node2])
-
-    graph = test.mock.MagicMock()
-    op1 = test.mock.MagicMock()
-    op1.name = "Add/123"
-    op1.traceback = [("a/b/file2", 10, "some_var")]
-    op1.type = "add"
-    op2 = test.mock.MagicMock()
-    op2.name = "Mul/456"
-    op2.traceback = [("a/b/file1", 11, "some_var")]
-    op2.type = "mul"
-    graph.get_operations.return_value = [op1, op2]
-
-    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
-
-    # Default sort by start time (i.e. all_start_micros).
-    prof_output = prof_analyzer.list_profile([]).lines
-    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
-    # Default sort in reverse.
-    prof_output = prof_analyzer.list_profile(["-r"]).lines
-    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
-    # Sort by name.
-    prof_output = prof_analyzer.list_profile(["-s", "node"]).lines
-    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
-    # Sort by op time (i.e. op_end_rel_micros - op_start_rel_micros).
-    prof_output = prof_analyzer.list_profile(["-s", "op_time"]).lines
-    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
-    # Sort by exec time (i.e. all_end_rel_micros).
-    prof_output = prof_analyzer.list_profile(["-s", "exec_time"]).lines
-    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
-    # Sort by line number.
-    prof_output = prof_analyzer.list_profile(["-s", "line"]).lines
-    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
-
-  def testFiltering(self):
-    node1 = step_stats_pb2.NodeExecStats(
-        node_name="Add/123",
-        all_start_micros=123,
-        op_start_rel_micros=3,
-        op_end_rel_micros=5,
-        all_end_rel_micros=4)
-
-    node2 = step_stats_pb2.NodeExecStats(
-        node_name="Mul/456",
-        all_start_micros=122,
-        op_start_rel_micros=1,
-        op_end_rel_micros=2,
-        all_end_rel_micros=5)
-
-    run_metadata = config_pb2.RunMetadata()
-    device1 = run_metadata.step_stats.dev_stats.add()
-    device1.device = "deviceA"
-    device1.node_stats.extend([node1, node2])
-
-    graph = test.mock.MagicMock()
-    op1 = test.mock.MagicMock()
-    op1.name = "Add/123"
-    op1.traceback = [("a/b/file2", 10, "some_var")]
-    op1.type = "add"
-    op2 = test.mock.MagicMock()
-    op2.name = "Mul/456"
-    op2.traceback = [("a/b/file1", 11, "some_var")]
-    op2.type = "mul"
-    graph.get_operations.return_value = [op1, op2]
-
-    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
-
-    # Filter by name
-    prof_output = prof_analyzer.list_profile(["-n", "Add"]).lines
-    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
-    self._assertNoLinesMatch(r"Mul/456", prof_output)
-    # Filter by op_type
-    prof_output = prof_analyzer.list_profile(["-t", "mul"]).lines
-    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
-    self._assertNoLinesMatch(r"Add/123", prof_output)
-    # Filter by file name.
-    prof_output = prof_analyzer.list_profile(["-f", "file2"]).lines
-    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
-    self._assertNoLinesMatch(r"Mul/456", prof_output)
-    # Fitler by execution time.
-    prof_output = prof_analyzer.list_profile(["-e", "[5, 10]"]).lines
-    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
-    self._assertNoLinesMatch(r"Add/123", prof_output)
-    # Fitler by op time.
-    prof_output = prof_analyzer.list_profile(["-o", ">=2"]).lines
-    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
-    self._assertNoLinesMatch(r"Mul/456", prof_output)
-
-  def _atLeastOneLineMatches(self, pattern, lines):
-    pattern_re = re.compile(pattern)
-    for line in lines:
-      if pattern_re.match(line):
-        return True
-    return False
-
-  def _assertAtLeastOneLineMatches(self, pattern, lines):
-    if not self._atLeastOneLineMatches(pattern, lines):
-      raise AssertionError(
-          "%s does not match any line in %s." % (pattern, str(lines)))
-
-  def _assertNoLinesMatch(self, pattern, lines):
-    if self._atLeastOneLineMatches(pattern, lines):
-      raise AssertionError(
-          "%s matched at least one line in %s." % (pattern, str(lines)))
-
-
-if __name__ == "__main__":
-  googletest.main()
diff --git a/tensorflow/python/debug/lib/source_utils.py b/tensorflow/python/debug/lib/source_utils.py
index f610d05b83..580bdc054b 100644
--- a/tensorflow/python/debug/lib/source_utils.py
+++ b/tensorflow/python/debug/lib/source_utils.py
@@ -44,7 +44,7 @@ def _convert_watch_key_to_tensor_name(watch_key):
   return watch_key[:watch_key.rfind(":")]
 
 
-def guess_is_tensorflow_py_library(py_file_path):
+def _guess_is_tensorflow_py_library(py_file_path):
   """Guess whether a Python source file is a part of the tensorflow library.
 
   Special cases:
@@ -231,7 +231,7 @@ def list_source_files_against_dump(dump,
   for file_path in path_to_node_names:
     output.append((
         file_path,
-        guess_is_tensorflow_py_library(file_path),
+        _guess_is_tensorflow_py_library(file_path),
         len(path_to_node_names.get(file_path, {})),
         len(path_to_tensor_names.get(file_path, {})),
         path_to_num_dumps.get(file_path, 0),
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index f6195b6a5d..a4fb0d9910 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -57,20 +57,20 @@ class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
 
   def testUnitTestFileReturnsFalse(self):
     self.assertFalse(
-        source_utils.guess_is_tensorflow_py_library(self.curr_file_path))
+        source_utils._guess_is_tensorflow_py_library(self.curr_file_path))
 
   def testSourceUtilModuleReturnsTrue(self):
     self.assertTrue(
-        source_utils.guess_is_tensorflow_py_library(source_utils.__file__))
+        source_utils._guess_is_tensorflow_py_library(source_utils.__file__))
 
   def testFileInPythonKernelsPathReturnsTrue(self):
     x = constant_op.constant(42.0, name="x")
     self.assertTrue(
-        source_utils.guess_is_tensorflow_py_library(x.op.traceback[-1][0]))
+        source_utils._guess_is_tensorflow_py_library(x.op.traceback[-1][0]))
 
   def testNonPythonFileRaisesException(self):
     with self.assertRaisesRegexp(ValueError, r"is not a Python source file"):
-      source_utils.guess_is_tensorflow_py_library(
+      source_utils._guess_is_tensorflow_py_library(
           os.path.join(os.path.dirname(self.curr_file_path), "foo.cc"))
 
 
-- 
GitLab


From bea22beffffd5c9fb4c8bac679b5b753d80a30f6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 13:54:06 -0800
Subject: [PATCH 0671/1563] Add utilities to a sample script to run hexagon
 tests Change: 154225239

---
 tensorflow/contrib/makefile/build_helper.subr | 24 +++++++---
 .../build_and_run_inception_hexagon.sh        | 45 +++++++++++++++----
 .../hexagon_graph_execution/Makefile.in       |  1 +
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/tensorflow/contrib/makefile/build_helper.subr b/tensorflow/contrib/makefile/build_helper.subr
index 717e459beb..f0452944e2 100644
--- a/tensorflow/contrib/makefile/build_helper.subr
+++ b/tensorflow/contrib/makefile/build_helper.subr
@@ -59,12 +59,22 @@ make_host_protoc() {
 }
 
 download_and_push() {
-    URL="$1"
-    LOCAL_DEST="$2"
-    ANDROID_DEST="$3"
-    curl -Ls "${URL}" -o "${LOCAL_DEST}"
-    if [[ ! -z "${ANDROID_DEST}" ]]; then
-        adb shell mkdir -p "${ANDROID_DEST}"
-        adb push "${LOCAL_DEST}" "${ANDROID_DEST}"
+  URL="$1"
+  LOCAL_DEST="$2"
+  ANDROID_DEST="$3"
+  SKIP_DOWNLOAD_IF_EXIST="$4"
+  if [[ "${SKIP_DOWNLOAD_IF_EXIST}" == "true" ]]; then
+    ANDROID_DEST_FILE_PATH="${ANDROID_DEST}/$(basename "${LOCAL_DEST}")"
+    if adb shell test -f "${ANDROID_DEST_FILE_PATH}"; then
+        echo "${ANDROID_DEST_FILE_PATH} already existins, skip download" 1>&2
+      return 0
     fi
+  fi
+
+  curl -Ls "${URL}" -o "${LOCAL_DEST}"
+
+  if [[ ! -z "${ANDROID_DEST}" ]]; then
+    adb shell mkdir -p "${ANDROID_DEST}"
+    adb push "${LOCAL_DEST}" "${ANDROID_DEST}"
+  fi
 }
diff --git a/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh b/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh
index 3d72247cd8..8ec2c8d034 100755
--- a/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh
+++ b/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh
@@ -19,15 +19,23 @@ set -e
 
 usage() {
   echo "Usage: QUALCOMM_SDK=<path to qualcomm sdk. Not needed if you specify -p> NDK_ROOT=<path to ndk root> $(basename "$0")"
+  echo "Optional: NNLIB_DIR=<path to downloaded nnlib dir>"
   echo "-b build only"
+  echo "-c test count"
   echo "-p use prebuilt hexagon binaries"
+  echo "-s skip download if files already exist"
   exit 1
 }
 
-while getopts "bp" opt_name; do
+TEST_COUNT=1
+SKIP_DOWNLOAD_IF_EXIST=false
+
+while getopts "bc:ps" opt_name; do
   case "$opt_name" in
+    c) TEST_COUNT="${OPTARG}";;
     b) BUILD_ONLY="true";;
     p) USE_PREBUILT_HEXAOGON_BINARIES="true";;
+    s) SKIP_DOWNLOAD_IF_EXIST="true";;
     *) usage;;
   esac
 done
@@ -79,14 +87,27 @@ if [[ "${USE_PREBUILT_HEXAOGON_BINARIES}" == "true" ]]; then
         NN_LIB_PUSH_DEST="/vendor/lib/rfsa/adsp"
     fi
     download_and_push "${URL_BASE}/deps/hexagon/libhexagon_controller.so" \
-"${GEN_LIBS_DIR}/libhexagon_controller.so" "${CONTROLLER_PUSH_DEST}"
+"${GEN_LIBS_DIR}/libhexagon_controller.so" "${CONTROLLER_PUSH_DEST}" \
+"${SKIP_DOWNLOAD_IF_EXIST}"
 
     download_and_push "${URL_BASE}/deps/hexagon/libhexagon_nn_skel.so" \
-"${GEN_LIBS_DIR}/libhexagon_nn_skel.so" "${NN_LIB_PUSH_DEST}"
+"${GEN_LIBS_DIR}/libhexagon_nn_skel.so" "${NN_LIB_PUSH_DEST}" \
+"${SKIP_DOWNLOAD_IF_EXIST}"
 else
     echo "Build hexagon binaries from source code"
     cd "${GEN_DIR}"
-    git clone https://source.codeaurora.org/quic/hexagon_nn/nnlib
+    if [[ -z "${NNLIB_DIR}" ]]; then
+      git clone https://source.codeaurora.org/quic/hexagon_nn/nnlib
+    else
+      if [[ ! -f "${NNLIB_DIR}/Makefile" ]]; then
+        echo "Couldn't locate ${NNLIB_DIR}/Makefile" 1>&2
+        exit 1
+      fi
+      echo "Use nnlib in ${NNLIB_DIR}" 1>&2
+      GEN_NNLIB_DIR="${GEN_DIR}/nnlib"
+      mkdir -p "${GEN_NNLIB_DIR}"
+      cp -af "${NNLIB_DIR}/"* "${GEN_NNLIB_DIR}"
+    fi
 
     cd "${QUALCOMM_SDK}"
     source "${QUALCOMM_SDK}/setup_sdk_env.sh"
@@ -160,15 +181,18 @@ if [[ "${BUILD_ONLY}" != "true" ]]; then
 fi
 
 download_and_push "${URL_BASE}/example_images/img_299x299.bmp" \
-"${GEN_DOWNLOAD_DIR}/img_299x299.bmp" "${BIN_PUSH_DEST}"
+"${GEN_DOWNLOAD_DIR}/img_299x299.bmp" "${BIN_PUSH_DEST}" \
+"${SKIP_DOWNLOAD_IF_EXIST}"
 
 download_and_push \
 "${URL_BASE}/models/tensorflow_inception_v3_stripped_optimized_quantized.pb" \
 "${GEN_DOWNLOAD_DIR}/tensorflow_inception_v3_stripped_optimized_quantized.pb" \
-"${BIN_PUSH_DEST}"
+"${BIN_PUSH_DEST}" \
+"${SKIP_DOWNLOAD_IF_EXIST}"
 
 download_and_push "${URL_BASE}/models/imagenet_comp_graph_label_strings.txt" \
-"${GEN_DOWNLOAD_DIR}/imagenet_comp_graph_label_strings.txt" "${BIN_PUSH_DEST}"
+"${GEN_DOWNLOAD_DIR}/imagenet_comp_graph_label_strings.txt" "${BIN_PUSH_DEST}" \
+"${SKIP_DOWNLOAD_IF_EXIST}"
 
 # By default this script runs a test to fuse and run the model
 gtest_args+=("--gtest_filter=GraphTransferer.RunInceptionV3OnHexagonExampleWithTfRuntime")
@@ -195,6 +219,9 @@ if [[ "${BUILD_ONLY}" != "true" ]]; then
     adb shell chmod "${ANDROID_EXEC_FILE_MODE}" \
         "/data/local/tmp/hexagon_graph_execution"
     adb wait-for-device
-    adb shell 'LD_LIBRARY_PATH=/data/local/tmp:$LD_LIBRARY_PATH' \
-        "/data/local/tmp/hexagon_graph_execution" ${gtest_args[@]}
+
+    for i in $(seq 1 "${TEST_COUNT}"); do
+      adb shell 'LD_LIBRARY_PATH=/data/local/tmp:$LD_LIBRARY_PATH' \
+          "/data/local/tmp/hexagon_graph_execution" ${gtest_args[@]}
+    done
 fi
diff --git a/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in b/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
index 2a6f66edcb..ccbbfa4132 100644
--- a/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
+++ b/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
@@ -47,6 +47,7 @@ GRAPH_TRANSFER_SRCS := \
 tensorflow/cc/framework/scope.cc \
 tensorflow/cc/framework/ops.cc \
 tensorflow/cc/ops/const_op.cc \
+tensorflow/core/kernels/function_ops.cc \
 tensorflow/core/kernels/hexagon/graph_transfer_utils.cc \
 tensorflow/core/kernels/hexagon/graph_transferer.cc \
 tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc \
-- 
GitLab


From 71425b5713494546cf0e2471d24dcd83e5765473 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Tue, 25 Apr 2017 13:58:56 -0800
Subject: [PATCH 0672/1563] Split graph_to_functiondef into its own library.
 Add a non-const overload of Graph::input_node(). Fix comment in description
 of Merge op. Change: 154225918

---
 tensorflow/compiler/jit/BUILD           | 16 ++++++++++++++--
 tensorflow/core/graph/graph.cc          |  9 ++++++++-
 tensorflow/core/graph/graph.h           |  1 +
 tensorflow/core/ops/control_flow_ops.cc |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/tensorflow/compiler/jit/BUILD b/tensorflow/compiler/jit/BUILD
index 03bad214d4..e56f173d51 100644
--- a/tensorflow/compiler/jit/BUILD
+++ b/tensorflow/compiler/jit/BUILD
@@ -175,22 +175,33 @@ cc_library(
     alwayslink = 1,
 )
 
+cc_library(
+    name = "graph_to_functiondef",
+    srcs = ["graph_to_functiondef.cc"],
+    hdrs = ["graph_to_functiondef.h"],
+    deps = [
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "compilation_passes",
     srcs = [
         "build_xla_launch_ops_pass.cc",
         "encapsulate_subgraphs_pass.cc",
-        "graph_to_functiondef.cc",
         "mark_for_compilation_pass.cc",
     ],
     hdrs = [
         "build_xla_launch_ops_pass.h",
         "encapsulate_subgraphs_pass.h",
-        "graph_to_functiondef.h",
         "mark_for_compilation_pass.h",
     ],
     deps = [
         ":common",
+        ":graph_to_functiondef",
         "//tensorflow/compiler/jit/graphcycles",
         "//tensorflow/compiler/jit/kernels:parallel_check_op",
         "//tensorflow/compiler/jit/kernels:xla_local_launch_op",
@@ -221,6 +232,7 @@ cc_test(
     deps = [
         ":common",
         ":compilation_passes",
+        ":graph_to_functiondef",
         "//tensorflow/cc:cc_ops",
         "//tensorflow/cc:cc_ops_internal",
         "//tensorflow/cc:function_ops",
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index c19764d082..fae9f26f76 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -199,7 +199,7 @@ Status Node::input_edges(std::vector<const Edge*>* input_edges) const {
   return Status::OK();
 }
 
-Status Node::input_node(int idx, const Node** n) const {
+Status Node::input_node(int idx, Node** n) const {
   const Edge* e;
   TF_RETURN_IF_ERROR(input_edge(idx, &e));
   if (e == nullptr) {
@@ -210,6 +210,13 @@ Status Node::input_node(int idx, const Node** n) const {
   return Status::OK();
 }
 
+Status Node::input_node(int idx, const Node** const_n) const {
+  Node* n;
+  TF_RETURN_IF_ERROR(input_node(idx, &n));
+  *const_n = n;
+  return Status::OK();
+}
+
 // Node::Properties
 
 Node::Properties::Properties(const OpDef* op_def, const NodeDef& node_def,
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index a4e0ffa020..11a49ec3b3 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -159,6 +159,7 @@ class Node {
   // Returns into '*n' the node that has an output connected to the
   // 'idx' input of this Node.
   Status input_node(int idx, const Node** n) const;
+  Status input_node(int idx, Node** n) const;
 
  private:
   friend class Graph;
diff --git a/tensorflow/core/ops/control_flow_ops.cc b/tensorflow/core/ops/control_flow_ops.cc
index 71520f3caa..57224c365d 100644
--- a/tensorflow/core/ops/control_flow_ops.cc
+++ b/tensorflow/core/ops/control_flow_ops.cc
@@ -159,7 +159,7 @@ Forwards the value of an available tensor from `inputs` to `output`.
 `Merge` waits for at least one of the tensors in `inputs` to become available.
 It is usually combined with `Switch` to implement branching.
 
-`Merge` forwards the first tensor for become available to `output`, and sets
+`Merge` forwards the first tensor to become available to `output`, and sets
 `value_index` to its index in `inputs`.
 
 inputs: The input tensors, exactly one of which will become available.
-- 
GitLab


From 1d8ac37322983c71f02d0300766740172ad00485 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 14:00:05 -0800
Subject: [PATCH 0673/1563] Fix link way in xla_tf_util_test Change: 154226057

---
 tensorflow/contrib/xla_tf_graph/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/xla_tf_graph/BUILD b/tensorflow/contrib/xla_tf_graph/BUILD
index 7e501d6b32..865df73699 100644
--- a/tensorflow/contrib/xla_tf_graph/BUILD
+++ b/tensorflow/contrib/xla_tf_graph/BUILD
@@ -42,7 +42,7 @@ cc_library(
 cc_test(
     name = "xla_tf_graph_util_test",
     srcs = ["xla_tf_graph_util_test.cc"],
-    tags = ["nomac"],  # b/37622704
+    linkstatic = 1,
     deps = [
         ":xla_tf_graph_util",
         "//tensorflow/cc:cc_ops",
-- 
GitLab


From fa7f79541d1ba1fa6f54ea3474cbf3ce1411bfb4 Mon Sep 17 00:00:00 2001
From: Jonathan Shen <jonathanasdf@google.com>
Date: Tue, 25 Apr 2017 14:03:45 -0800
Subject: [PATCH 0674/1563] Deprecate the use of is_training in
 resnet_arg_scope. is_training should be directly passed to the network
 instead. Change: 154226768

---
 .../contrib/slim/python/slim/nets/BUILD       |  20 +++
 .../slim/nets/resnet_is_training_test.py      | 154 ++++++++++++++++++
 .../slim/python/slim/nets/resnet_utils.py     |  10 +-
 .../slim/python/slim/nets/resnet_v1.py        |  72 +++++---
 .../slim/python/slim/nets/resnet_v1_test.py   |  78 +++++----
 .../slim/python/slim/nets/resnet_v2.py        |  89 ++++++----
 .../slim/python/slim/nets/resnet_v2_test.py   |  78 +++++----
 7 files changed, 366 insertions(+), 135 deletions(-)
 create mode 100644 tensorflow/contrib/slim/python/slim/nets/resnet_is_training_test.py

diff --git a/tensorflow/contrib/slim/python/slim/nets/BUILD b/tensorflow/contrib/slim/python/slim/nets/BUILD
index 8077818216..737bbbe57b 100644
--- a/tensorflow/contrib/slim/python/slim/nets/BUILD
+++ b/tensorflow/contrib/slim/python/slim/nets/BUILD
@@ -286,6 +286,26 @@ py_test(
     ],
 )
 
+py_test(
+    name = "resnet_is_training_test",
+    size = "medium",
+    srcs = ["resnet_is_training_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":resnet_utils",
+        ":resnet_v1",
+        ":resnet_v2",
+        "//tensorflow/contrib/framework:framework_py",
+        "//tensorflow/contrib/layers:layers_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//third_party/py/numpy",
+    ],
+)
+
 py_library(
     name = "vgg",
     srcs = ["vgg.py"],
diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_is_training_test.py b/tensorflow/contrib/slim/python/slim/nets/resnet_is_training_test.py
new file mode 100644
index 0000000000..9a165577b6
--- /dev/null
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_is_training_test.py
@@ -0,0 +1,154 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Specifying is_training in resnet_arg_scope is being deprecated.
+
+Test that everything behaves as expected in the meantime.
+
+Note: This test modifies the layers.batch_norm function.
+Other tests that use layers.batch_norm may not work if added to this file.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib import layers
+from tensorflow.contrib.framework.python.ops import add_arg_scope
+from tensorflow.contrib.framework.python.ops import arg_scope
+from tensorflow.contrib.slim.python.slim.nets import resnet_utils
+from tensorflow.contrib.slim.python.slim.nets import resnet_v1
+from tensorflow.contrib.slim.python.slim.nets import resnet_v2
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+def create_test_input(batch, height, width, channels):
+  """Create test input tensor."""
+  if None in [batch, height, width, channels]:
+    return array_ops.placeholder(dtypes.float32, (batch, height, width,
+                                                  channels))
+  else:
+    return math_ops.to_float(
+        np.tile(
+            np.reshape(
+                np.reshape(np.arange(height), [height, 1]) +
+                np.reshape(np.arange(width), [1, width]),
+                [1, height, width, 1]),
+            [batch, 1, 1, channels]))
+
+
+class ResnetIsTrainingTest(test.TestCase):
+
+  def _testDeprecatingIsTraining(self, network_fn):
+    batch_norm_fn = layers.batch_norm
+
+    @add_arg_scope
+    def batch_norm_expect_is_training(*args, **kwargs):
+      assert kwargs['is_training']
+      return batch_norm_fn(*args, **kwargs)
+
+    @add_arg_scope
+    def batch_norm_expect_is_not_training(*args, **kwargs):
+      assert not kwargs['is_training']
+      return batch_norm_fn(*args, **kwargs)
+
+    global_pool = True
+    num_classes = 10
+    inputs = create_test_input(2, 224, 224, 3)
+
+    # Default argument for resnet_arg_scope
+    layers.batch_norm = batch_norm_expect_is_training
+    with arg_scope(resnet_utils.resnet_arg_scope()):
+      network_fn(inputs, num_classes, global_pool=global_pool, scope='resnet1')
+
+    layers.batch_norm = batch_norm_expect_is_training
+    with arg_scope(resnet_utils.resnet_arg_scope()):
+      network_fn(
+          inputs,
+          num_classes,
+          is_training=True,
+          global_pool=global_pool,
+          scope='resnet2')
+
+    layers.batch_norm = batch_norm_expect_is_not_training
+    with arg_scope(resnet_utils.resnet_arg_scope()):
+      network_fn(
+          inputs,
+          num_classes,
+          is_training=False,
+          global_pool=global_pool,
+          scope='resnet3')
+
+    # resnet_arg_scope with is_training set to True (deprecated)
+    layers.batch_norm = batch_norm_expect_is_training
+    with arg_scope(resnet_utils.resnet_arg_scope(is_training=True)):
+      network_fn(inputs, num_classes, global_pool=global_pool, scope='resnet4')
+
+    layers.batch_norm = batch_norm_expect_is_training
+    with arg_scope(resnet_utils.resnet_arg_scope(is_training=True)):
+      network_fn(
+          inputs,
+          num_classes,
+          is_training=True,
+          global_pool=global_pool,
+          scope='resnet5')
+
+    layers.batch_norm = batch_norm_expect_is_not_training
+    with arg_scope(resnet_utils.resnet_arg_scope(is_training=True)):
+      network_fn(
+          inputs,
+          num_classes,
+          is_training=False,
+          global_pool=global_pool,
+          scope='resnet6')
+
+    # resnet_arg_scope with is_training set to False (deprecated)
+    layers.batch_norm = batch_norm_expect_is_not_training
+    with arg_scope(resnet_utils.resnet_arg_scope(is_training=False)):
+      network_fn(inputs, num_classes, global_pool=global_pool, scope='resnet7')
+
+    layers.batch_norm = batch_norm_expect_is_training
+    with arg_scope(resnet_utils.resnet_arg_scope(is_training=False)):
+      network_fn(
+          inputs,
+          num_classes,
+          is_training=True,
+          global_pool=global_pool,
+          scope='resnet8')
+
+    layers.batch_norm = batch_norm_expect_is_not_training
+    with arg_scope(resnet_utils.resnet_arg_scope(is_training=False)):
+      network_fn(
+          inputs,
+          num_classes,
+          is_training=False,
+          global_pool=global_pool,
+          scope='resnet9')
+
+    layers.batch_norm = batch_norm_fn
+
+  def testDeprecatingIsTrainingResnetV1(self):
+    self._testDeprecatingIsTraining(resnet_v1.resnet_v1_50)
+
+  def testDeprecatingIsTrainingResnetV2(self):
+    self._testDeprecatingIsTraining(resnet_v2.resnet_v2_50)
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_utils.py b/tensorflow/contrib/slim/python/slim/nets/resnet_utils.py
index 89d27438e5..58614a998a 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_utils.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_utils.py
@@ -41,6 +41,7 @@ from __future__ import print_function
 import collections
 
 from tensorflow.contrib import layers as layers_lib
+from tensorflow.contrib.framework import deprecated_args
 from tensorflow.contrib.framework.python.ops import add_arg_scope
 from tensorflow.contrib.framework.python.ops import arg_scope
 from tensorflow.contrib.layers.python.layers import initializers
@@ -222,6 +223,10 @@ def stack_blocks_dense(net,
   return net
 
 
+@deprecated_args(
+    '2017-08-01',
+    'Pass is_training directly to the network instead of the arg_scope.',
+    'is_training')
 def resnet_arg_scope(is_training=True,
                      weight_decay=0.0001,
                      batch_norm_decay=0.997,
@@ -236,7 +241,7 @@ def resnet_arg_scope(is_training=True,
 
   Args:
     is_training: Whether or not we are training the parameters in the batch
-      normalization layers of the model.
+      normalization layers of the model. (deprecated)
     weight_decay: The weight decay to use for regularizing the model.
     batch_norm_decay: The moving average decay when estimating layer activation
       statistics in batch normalization.
@@ -261,8 +266,7 @@ def resnet_arg_scope(is_training=True,
       weights_regularizer=regularizers.l2_regularizer(weight_decay),
       weights_initializer=initializers.variance_scaling_initializer(),
       activation_fn=nn_ops.relu,
-      normalizer_fn=layers.batch_norm,
-      normalizer_params=batch_norm_params):
+      normalizer_fn=layers.batch_norm):
     with arg_scope([layers.batch_norm], **batch_norm_params):
       # The following implies padding='SAME' for pool1, which makes feature
       # alignment easier for dense prediction tasks. This is also used in
diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_v1.py b/tensorflow/contrib/slim/python/slim/nets/resnet_v1.py
index fe13ce1b0e..90f93d46e3 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_v1.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_v1.py
@@ -40,15 +40,16 @@ Typical use:
 ResNet-101 for image classification into 1000 classes:
 
    # inputs has shape [batch, 224, 224, 3]
-   with slim.arg_scope(resnet_v1.resnet_arg_scope(is_training)):
-      net, end_points = resnet_v1.resnet_v1_101(inputs, 1000)
+   with slim.arg_scope(resnet_v1.resnet_arg_scope()):
+      net, end_points = resnet_v1.resnet_v1_101(inputs, 1000, is_training=False)
 
 ResNet-101 for semantic segmentation into 21 classes:
 
    # inputs has shape [batch, 513, 513, 3]
-   with slim.arg_scope(resnet_v1.resnet_arg_scope(is_training)):
+   with slim.arg_scope(resnet_v1.resnet_arg_scope()):
       net, end_points = resnet_v1.resnet_v1_101(inputs,
                                                 21,
+                                                is_training=False,
                                                 global_pool=False,
                                                 output_stride=16)
 """
@@ -127,6 +128,7 @@ def bottleneck(inputs,
 def resnet_v1(inputs,
               blocks,
               num_classes=None,
+              is_training=None,
               global_pool=True,
               output_stride=None,
               include_root_block=True,
@@ -161,6 +163,8 @@ def resnet_v1(inputs,
       is a resnet_utils.Block object describing the units in the block.
     num_classes: Number of predicted classes for classification tasks. If None
       we return the features before the logit layer.
+    is_training: whether is training or not. If None, the value inherited from
+      the resnet_arg_scope is used. Specifying value None is deprecated.
     global_pool: If True, we perform global average pooling before computing the
       logits. Set to True for image classification, False for dense prediction.
     output_stride: If None, then the output will be computed at the nominal
@@ -192,30 +196,36 @@ def resnet_v1(inputs,
     with arg_scope(
         [layers.conv2d, bottleneck, resnet_utils.stack_blocks_dense],
         outputs_collections=end_points_collection):
-      net = inputs
-      if include_root_block:
-        if output_stride is not None:
-          if output_stride % 4 != 0:
-            raise ValueError('The output_stride needs to be a multiple of 4.')
-          output_stride /= 4
-        net = resnet_utils.conv2d_same(net, 64, 7, stride=2, scope='conv1')
-        net = layers_lib.max_pool2d(net, [3, 3], stride=2, scope='pool1')
-      net = resnet_utils.stack_blocks_dense(net, blocks, output_stride)
-      if global_pool:
-        # Global average pooling.
-        net = math_ops.reduce_mean(net, [1, 2], name='pool5', keep_dims=True)
-      if num_classes is not None:
-        net = layers.conv2d(
-            net,
-            num_classes, [1, 1],
-            activation_fn=None,
-            normalizer_fn=None,
-            scope='logits')
-      # Convert end_points_collection into a dictionary of end_points.
-      end_points = utils.convert_collection_to_dict(end_points_collection)
-      if num_classes is not None:
-        end_points['predictions'] = layers_lib.softmax(net, scope='predictions')
-      return net, end_points
+      if is_training is not None:
+        bn_scope = arg_scope([layers.batch_norm], is_training=is_training)
+      else:
+        bn_scope = arg_scope([])
+      with bn_scope:
+        net = inputs
+        if include_root_block:
+          if output_stride is not None:
+            if output_stride % 4 != 0:
+              raise ValueError('The output_stride needs to be a multiple of 4.')
+            output_stride /= 4
+          net = resnet_utils.conv2d_same(net, 64, 7, stride=2, scope='conv1')
+          net = layers_lib.max_pool2d(net, [3, 3], stride=2, scope='pool1')
+        net = resnet_utils.stack_blocks_dense(net, blocks, output_stride)
+        if global_pool:
+          # Global average pooling.
+          net = math_ops.reduce_mean(net, [1, 2], name='pool5', keep_dims=True)
+        if num_classes is not None:
+          net = layers.conv2d(
+              net,
+              num_classes, [1, 1],
+              activation_fn=None,
+              normalizer_fn=None,
+              scope='logits')
+        # Convert end_points_collection into a dictionary of end_points.
+        end_points = utils.convert_collection_to_dict(end_points_collection)
+        if num_classes is not None:
+          end_points['predictions'] = layers_lib.softmax(
+              net, scope='predictions')
+        return net, end_points
 resnet_v1.default_image_size = 224
 
 
@@ -245,6 +255,7 @@ def resnet_v1_block(scope, base_depth, num_units, stride):
 
 def resnet_v1_50(inputs,
                  num_classes=None,
+                 is_training=None,
                  global_pool=True,
                  output_stride=None,
                  reuse=None,
@@ -260,6 +271,7 @@ def resnet_v1_50(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
@@ -269,6 +281,7 @@ def resnet_v1_50(inputs,
 
 def resnet_v1_101(inputs,
                   num_classes=None,
+                  is_training=None,
                   global_pool=True,
                   output_stride=None,
                   reuse=None,
@@ -284,6 +297,7 @@ def resnet_v1_101(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
@@ -293,6 +307,7 @@ def resnet_v1_101(inputs,
 
 def resnet_v1_152(inputs,
                   num_classes=None,
+                  is_training=None,
                   global_pool=True,
                   output_stride=None,
                   reuse=None,
@@ -308,6 +323,7 @@ def resnet_v1_152(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
@@ -317,6 +333,7 @@ def resnet_v1_152(inputs,
 
 def resnet_v1_200(inputs,
                   num_classes=None,
+                  is_training=None,
                   global_pool=True,
                   output_stride=None,
                   reuse=None,
@@ -332,6 +349,7 @@ def resnet_v1_200(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_v1_test.py b/tensorflow/contrib/slim/python/slim/nets/resnet_v1_test.py
index dffd29f920..d510337fef 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_v1_test.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_v1_test.py
@@ -219,28 +219,29 @@ class ResnetUtilsTest(test.TestCase):
     # Test both odd and even input dimensions.
     height = 30
     width = 31
-    with arg_scope(resnet_utils.resnet_arg_scope(is_training=False)):
-      for output_stride in [1, 2, 4, 8, None]:
-        with ops.Graph().as_default():
-          with self.test_session() as sess:
-            random_seed.set_random_seed(0)
-            inputs = create_test_input(1, height, width, 3)
-            # Dense feature extraction followed by subsampling.
-            output = resnet_utils.stack_blocks_dense(inputs, blocks,
-                                                     output_stride)
-            if output_stride is None:
-              factor = 1
-            else:
-              factor = nominal_stride // output_stride
-
-            output = resnet_utils.subsample(output, factor)
-            # Make the two networks use the same weights.
-            variable_scope.get_variable_scope().reuse_variables()
-            # Feature extraction at the nominal network rate.
-            expected = self._stack_blocks_nondense(inputs, blocks)
-            sess.run(variables.global_variables_initializer())
-            output, expected = sess.run([output, expected])
-            self.assertAllClose(output, expected, atol=1e-4, rtol=1e-4)
+    with arg_scope(resnet_utils.resnet_arg_scope()):
+      with arg_scope([layers.batch_norm], is_training=False):
+        for output_stride in [1, 2, 4, 8, None]:
+          with ops.Graph().as_default():
+            with self.test_session() as sess:
+              random_seed.set_random_seed(0)
+              inputs = create_test_input(1, height, width, 3)
+              # Dense feature extraction followed by subsampling.
+              output = resnet_utils.stack_blocks_dense(inputs, blocks,
+                                                       output_stride)
+              if output_stride is None:
+                factor = 1
+              else:
+                factor = nominal_stride // output_stride
+
+              output = resnet_utils.subsample(output, factor)
+              # Make the two networks use the same weights.
+              variable_scope.get_variable_scope().reuse_variables()
+              # Feature extraction at the nominal network rate.
+              expected = self._stack_blocks_nondense(inputs, blocks)
+              sess.run(variables.global_variables_initializer())
+              output, expected = sess.run([output, expected])
+              self.assertAllClose(output, expected, atol=1e-4, rtol=1e-4)
 
 
 class ResnetCompleteNetworkTest(test.TestCase):
@@ -249,6 +250,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
   def _resnet_small(self,
                     inputs,
                     num_classes=None,
+                    is_training=None,
                     global_pool=True,
                     output_stride=None,
                     include_root_block=True,
@@ -262,8 +264,9 @@ class ResnetCompleteNetworkTest(test.TestCase):
         block('block3', base_depth=4, num_units=3, stride=2),
         block('block4', base_depth=8, num_units=2, stride=1),
     ]
-    return resnet_v1.resnet_v1(inputs, blocks, num_classes, global_pool,
-                               output_stride, include_root_block, reuse, scope)
+    return resnet_v1.resnet_v1(inputs, blocks, num_classes, is_training,
+                               global_pool, output_stride, include_root_block,
+                               reuse, scope)
 
   def testClassificationEndPoints(self):
     global_pool = True
@@ -271,7 +274,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(2, 224, 224, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       logits, end_points = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
     self.assertTrue(logits.op.name.startswith('resnet/logits'))
     self.assertListEqual(logits.get_shape().as_list(), [2, 1, 1, num_classes])
     self.assertTrue('predictions' in end_points)
@@ -284,7 +287,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(2, 224, 224, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       _, end_points = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
       endpoint_to_shape = {
           'resnet/block1': [2, 28, 28, 4],
           'resnet/block2': [2, 14, 14, 8],
@@ -301,7 +304,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(2, 321, 321, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       _, end_points = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
       endpoint_to_shape = {
           'resnet/block1': [2, 41, 41, 4],
           'resnet/block2': [2, 21, 21, 8],
@@ -320,7 +323,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
       _, end_points = self._resnet_small(
           inputs,
           num_classes,
-          global_pool,
+          global_pool=global_pool,
           include_root_block=False,
           scope='resnet')
       endpoint_to_shape = {
@@ -342,7 +345,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
       _, end_points = self._resnet_small(
           inputs,
           num_classes,
-          global_pool,
+          global_pool=global_pool,
           output_stride=output_stride,
           scope='resnet')
       endpoint_to_shape = {
@@ -359,14 +362,18 @@ class ResnetCompleteNetworkTest(test.TestCase):
     """Verify dense feature extraction with atrous convolution."""
     nominal_stride = 32
     for output_stride in [4, 8, 16, 32, None]:
-      with arg_scope(resnet_utils.resnet_arg_scope(is_training=False)):
+      with arg_scope(resnet_utils.resnet_arg_scope()):
         with ops.Graph().as_default():
           with self.test_session() as sess:
             random_seed.set_random_seed(0)
             inputs = create_test_input(2, 81, 81, 3)
             # Dense feature extraction followed by subsampling.
             output, _ = self._resnet_small(
-                inputs, None, global_pool=False, output_stride=output_stride)
+                inputs,
+                None,
+                is_training=False,
+                global_pool=False,
+                output_stride=output_stride)
             if output_stride is None:
               factor = 1
             else:
@@ -375,7 +382,8 @@ class ResnetCompleteNetworkTest(test.TestCase):
             # Make the two networks use the same weights.
             variable_scope.get_variable_scope().reuse_variables()
             # Feature extraction at the nominal network rate.
-            expected, _ = self._resnet_small(inputs, None, global_pool=False)
+            expected, _ = self._resnet_small(
+                inputs, None, is_training=False, global_pool=False)
             sess.run(variables.global_variables_initializer())
             self.assertAllClose(
                 output.eval(), expected.eval(), atol=1e-4, rtol=1e-4)
@@ -388,7 +396,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(None, height, width, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       logits, _ = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
     self.assertTrue(logits.op.name.startswith('resnet/logits'))
     self.assertListEqual(logits.get_shape().as_list(),
                          [None, 1, 1, num_classes])
@@ -404,7 +412,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     global_pool = False
     inputs = create_test_input(batch, None, None, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
-      output, _ = self._resnet_small(inputs, None, global_pool)
+      output, _ = self._resnet_small(inputs, None, global_pool=global_pool)
     self.assertListEqual(output.get_shape().as_list(), [batch, None, None, 32])
     images = create_test_input(batch, height, width, 3)
     with self.test_session() as sess:
@@ -420,7 +428,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(batch, None, None, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       output, _ = self._resnet_small(
-          inputs, None, global_pool, output_stride=output_stride)
+          inputs, None, global_pool=global_pool, output_stride=output_stride)
     self.assertListEqual(output.get_shape().as_list(), [batch, None, None, 32])
     images = create_test_input(batch, height, width, 3)
     with self.test_session() as sess:
diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
index 7e6fe5dfc2..f260ede348 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
@@ -36,15 +36,16 @@ Typical use:
 ResNet-101 for image classification into 1000 classes:
 
    # inputs has shape [batch, 224, 224, 3]
-   with slim.arg_scope(resnet_v2.resnet_arg_scope(is_training)):
-      net, end_points = resnet_v2.resnet_v2_101(inputs, 1000)
+   with slim.arg_scope(resnet_v2.resnet_arg_scope()):
+      net, end_points = resnet_v2.resnet_v2_101(inputs, 1000, is_training=False)
 
 ResNet-101 for semantic segmentation into 21 classes:
 
    # inputs has shape [batch, 513, 513, 3]
-   with slim.arg_scope(resnet_v2.resnet_arg_scope(is_training)):
+   with slim.arg_scope(resnet_v2.resnet_arg_scope()):
       net, end_points = resnet_v2.resnet_v2_101(inputs,
                                                 21,
+                                                is_training=False,
                                                 global_pool=False,
                                                 output_stride=16)
 """
@@ -129,6 +130,7 @@ def bottleneck(inputs,
 def resnet_v2(inputs,
               blocks,
               num_classes=None,
+              is_training=None,
               global_pool=True,
               output_stride=None,
               include_root_block=True,
@@ -163,6 +165,8 @@ def resnet_v2(inputs,
       is a resnet_utils.Block object describing the units in the block.
     num_classes: Number of predicted classes for classification tasks. If None
       we return the features before the logit layer.
+    is_training: whether is training or not. If None, the value inherited from
+      the resnet_arg_scope is used. Specifying value None is deprecated.
     global_pool: If True, we perform global average pooling before computing the
       logits. Set to True for image classification, False for dense prediction.
     output_stride: If None, then the output will be computed at the nominal
@@ -196,38 +200,45 @@ def resnet_v2(inputs,
     with arg_scope(
         [layers_lib.conv2d, bottleneck, resnet_utils.stack_blocks_dense],
         outputs_collections=end_points_collection):
-      net = inputs
-      if include_root_block:
-        if output_stride is not None:
-          if output_stride % 4 != 0:
-            raise ValueError('The output_stride needs to be a multiple of 4.')
-          output_stride /= 4
-        # We do not include batch normalization or activation functions in conv1
-        # because the first ResNet unit will perform these. Cf. Appendix of [2].
-        with arg_scope(
-            [layers_lib.conv2d], activation_fn=None, normalizer_fn=None):
-          net = resnet_utils.conv2d_same(net, 64, 7, stride=2, scope='conv1')
-        net = layers.max_pool2d(net, [3, 3], stride=2, scope='pool1')
-      net = resnet_utils.stack_blocks_dense(net, blocks, output_stride)
-      # This is needed because the pre-activation variant does not have batch
-      # normalization or activation functions in the residual unit output. See
-      # Appendix of [2].
-      net = layers.batch_norm(net, activation_fn=nn_ops.relu, scope='postnorm')
-      if global_pool:
-        # Global average pooling.
-        net = math_ops.reduce_mean(net, [1, 2], name='pool5', keep_dims=True)
-      if num_classes is not None:
-        net = layers_lib.conv2d(
-            net,
-            num_classes, [1, 1],
-            activation_fn=None,
-            normalizer_fn=None,
-            scope='logits')
-      # Convert end_points_collection into a dictionary of end_points.
-      end_points = utils.convert_collection_to_dict(end_points_collection)
-      if num_classes is not None:
-        end_points['predictions'] = layers.softmax(net, scope='predictions')
-      return net, end_points
+      if is_training is not None:
+        bn_scope = arg_scope([layers.batch_norm], is_training=is_training)
+      else:
+        bn_scope = arg_scope([])
+      with bn_scope:
+        net = inputs
+        if include_root_block:
+          if output_stride is not None:
+            if output_stride % 4 != 0:
+              raise ValueError('The output_stride needs to be a multiple of 4.')
+            output_stride /= 4
+          # We do not include batch normalization or activation functions in
+          # conv1 because the first ResNet unit will perform these. Cf.
+          # Appendix of [2].
+          with arg_scope(
+              [layers_lib.conv2d], activation_fn=None, normalizer_fn=None):
+            net = resnet_utils.conv2d_same(net, 64, 7, stride=2, scope='conv1')
+          net = layers.max_pool2d(net, [3, 3], stride=2, scope='pool1')
+        net = resnet_utils.stack_blocks_dense(net, blocks, output_stride)
+        # This is needed because the pre-activation variant does not have batch
+        # normalization or activation functions in the residual unit output. See
+        # Appendix of [2].
+        net = layers.batch_norm(
+            net, activation_fn=nn_ops.relu, scope='postnorm')
+        if global_pool:
+          # Global average pooling.
+          net = math_ops.reduce_mean(net, [1, 2], name='pool5', keep_dims=True)
+        if num_classes is not None:
+          net = layers_lib.conv2d(
+              net,
+              num_classes, [1, 1],
+              activation_fn=None,
+              normalizer_fn=None,
+              scope='logits')
+        # Convert end_points_collection into a dictionary of end_points.
+        end_points = utils.convert_collection_to_dict(end_points_collection)
+        if num_classes is not None:
+          end_points['predictions'] = layers.softmax(net, scope='predictions')
+        return net, end_points
 resnet_v2.default_image_size = 224
 
 
@@ -257,6 +268,7 @@ def resnet_v2_block(scope, base_depth, num_units, stride):
 
 def resnet_v2_50(inputs,
                  num_classes=None,
+                 is_training=None,
                  global_pool=True,
                  output_stride=None,
                  reuse=None,
@@ -272,6 +284,7 @@ def resnet_v2_50(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
@@ -282,6 +295,7 @@ def resnet_v2_50(inputs,
 def resnet_v2_101(inputs,
                   num_classes=None,
                   global_pool=True,
+                  is_training=None,
                   output_stride=None,
                   reuse=None,
                   scope='resnet_v2_101'):
@@ -296,6 +310,7 @@ def resnet_v2_101(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
@@ -305,6 +320,7 @@ def resnet_v2_101(inputs,
 
 def resnet_v2_152(inputs,
                   num_classes=None,
+                  is_training=None,
                   global_pool=True,
                   output_stride=None,
                   reuse=None,
@@ -320,6 +336,7 @@ def resnet_v2_152(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
@@ -329,6 +346,7 @@ def resnet_v2_152(inputs,
 
 def resnet_v2_200(inputs,
                   num_classes=None,
+                  is_training=None,
                   global_pool=True,
                   output_stride=None,
                   reuse=None,
@@ -344,6 +362,7 @@ def resnet_v2_200(inputs,
       inputs,
       blocks,
       num_classes,
+      is_training,
       global_pool,
       output_stride,
       include_root_block=True,
diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_v2_test.py b/tensorflow/contrib/slim/python/slim/nets/resnet_v2_test.py
index 1c09bcbb5a..c4f3b071fd 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_v2_test.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_v2_test.py
@@ -223,28 +223,29 @@ class ResnetUtilsTest(test.TestCase):
     # Test both odd and even input dimensions.
     height = 30
     width = 31
-    with arg_scope(resnet_utils.resnet_arg_scope(is_training=False)):
-      for output_stride in [1, 2, 4, 8, None]:
-        with ops.Graph().as_default():
-          with self.test_session() as sess:
-            random_seed.set_random_seed(0)
-            inputs = create_test_input(1, height, width, 3)
-            # Dense feature extraction followed by subsampling.
-            output = resnet_utils.stack_blocks_dense(inputs, blocks,
-                                                     output_stride)
-            if output_stride is None:
-              factor = 1
-            else:
-              factor = nominal_stride // output_stride
-
-            output = resnet_utils.subsample(output, factor)
-            # Make the two networks use the same weights.
-            variable_scope.get_variable_scope().reuse_variables()
-            # Feature extraction at the nominal network rate.
-            expected = self._stack_blocks_nondense(inputs, blocks)
-            sess.run(variables.global_variables_initializer())
-            output, expected = sess.run([output, expected])
-            self.assertAllClose(output, expected, atol=1e-4, rtol=1e-4)
+    with arg_scope(resnet_utils.resnet_arg_scope()):
+      with arg_scope([layers.batch_norm], is_training=False):
+        for output_stride in [1, 2, 4, 8, None]:
+          with ops.Graph().as_default():
+            with self.test_session() as sess:
+              random_seed.set_random_seed(0)
+              inputs = create_test_input(1, height, width, 3)
+              # Dense feature extraction followed by subsampling.
+              output = resnet_utils.stack_blocks_dense(inputs, blocks,
+                                                       output_stride)
+              if output_stride is None:
+                factor = 1
+              else:
+                factor = nominal_stride // output_stride
+
+              output = resnet_utils.subsample(output, factor)
+              # Make the two networks use the same weights.
+              variable_scope.get_variable_scope().reuse_variables()
+              # Feature extraction at the nominal network rate.
+              expected = self._stack_blocks_nondense(inputs, blocks)
+              sess.run(variables.global_variables_initializer())
+              output, expected = sess.run([output, expected])
+              self.assertAllClose(output, expected, atol=1e-4, rtol=1e-4)
 
 
 class ResnetCompleteNetworkTest(test.TestCase):
@@ -253,6 +254,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
   def _resnet_small(self,
                     inputs,
                     num_classes=None,
+                    is_training=None,
                     global_pool=True,
                     output_stride=None,
                     include_root_block=True,
@@ -266,8 +268,9 @@ class ResnetCompleteNetworkTest(test.TestCase):
         block('block3', base_depth=4, num_units=3, stride=2),
         block('block4', base_depth=8, num_units=2, stride=1),
     ]
-    return resnet_v2.resnet_v2(inputs, blocks, num_classes, global_pool,
-                               output_stride, include_root_block, reuse, scope)
+    return resnet_v2.resnet_v2(inputs, blocks, num_classes, is_training,
+                               global_pool, output_stride, include_root_block,
+                               reuse, scope)
 
   def testClassificationEndPoints(self):
     global_pool = True
@@ -275,7 +278,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(2, 224, 224, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       logits, end_points = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
     self.assertTrue(logits.op.name.startswith('resnet/logits'))
     self.assertListEqual(logits.get_shape().as_list(), [2, 1, 1, num_classes])
     self.assertTrue('predictions' in end_points)
@@ -288,7 +291,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(2, 224, 224, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       _, end_points = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
       endpoint_to_shape = {
           'resnet/block1': [2, 28, 28, 4],
           'resnet/block2': [2, 14, 14, 8],
@@ -305,7 +308,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(2, 321, 321, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       _, end_points = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
       endpoint_to_shape = {
           'resnet/block1': [2, 41, 41, 4],
           'resnet/block2': [2, 21, 21, 8],
@@ -324,7 +327,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
       _, end_points = self._resnet_small(
           inputs,
           num_classes,
-          global_pool,
+          global_pool=global_pool,
           include_root_block=False,
           scope='resnet')
       endpoint_to_shape = {
@@ -346,7 +349,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
       _, end_points = self._resnet_small(
           inputs,
           num_classes,
-          global_pool,
+          global_pool=global_pool,
           output_stride=output_stride,
           scope='resnet')
       endpoint_to_shape = {
@@ -363,14 +366,18 @@ class ResnetCompleteNetworkTest(test.TestCase):
     """Verify dense feature extraction with atrous convolution."""
     nominal_stride = 32
     for output_stride in [4, 8, 16, 32, None]:
-      with arg_scope(resnet_utils.resnet_arg_scope(is_training=False)):
+      with arg_scope(resnet_utils.resnet_arg_scope()):
         with ops.Graph().as_default():
           with self.test_session() as sess:
             random_seed.set_random_seed(0)
             inputs = create_test_input(2, 81, 81, 3)
             # Dense feature extraction followed by subsampling.
             output, _ = self._resnet_small(
-                inputs, None, global_pool=False, output_stride=output_stride)
+                inputs,
+                None,
+                is_training=False,
+                global_pool=False,
+                output_stride=output_stride)
             if output_stride is None:
               factor = 1
             else:
@@ -379,7 +386,8 @@ class ResnetCompleteNetworkTest(test.TestCase):
             # Make the two networks use the same weights.
             variable_scope.get_variable_scope().reuse_variables()
             # Feature extraction at the nominal network rate.
-            expected, _ = self._resnet_small(inputs, None, global_pool=False)
+            expected, _ = self._resnet_small(
+                inputs, None, is_training=False, global_pool=False)
             sess.run(variables.global_variables_initializer())
             self.assertAllClose(
                 output.eval(), expected.eval(), atol=1e-4, rtol=1e-4)
@@ -392,7 +400,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(None, height, width, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       logits, _ = self._resnet_small(
-          inputs, num_classes, global_pool, scope='resnet')
+          inputs, num_classes, global_pool=global_pool, scope='resnet')
     self.assertTrue(logits.op.name.startswith('resnet/logits'))
     self.assertListEqual(logits.get_shape().as_list(),
                          [None, 1, 1, num_classes])
@@ -408,7 +416,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     global_pool = False
     inputs = create_test_input(batch, None, None, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
-      output, _ = self._resnet_small(inputs, None, global_pool)
+      output, _ = self._resnet_small(inputs, None, global_pool=global_pool)
     self.assertListEqual(output.get_shape().as_list(), [batch, None, None, 32])
     images = create_test_input(batch, height, width, 3)
     with self.test_session() as sess:
@@ -424,7 +432,7 @@ class ResnetCompleteNetworkTest(test.TestCase):
     inputs = create_test_input(batch, None, None, 3)
     with arg_scope(resnet_utils.resnet_arg_scope()):
       output, _ = self._resnet_small(
-          inputs, None, global_pool, output_stride=output_stride)
+          inputs, None, global_pool=global_pool, output_stride=output_stride)
     self.assertListEqual(output.get_shape().as_list(), [batch, None, None, 32])
     images = create_test_input(batch, height, width, 3)
     with self.test_session() as sess:
-- 
GitLab


From c81e746c658ed749d0086944c9aba645ca8ee6b8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 14:19:04 -0800
Subject: [PATCH 0675/1563] Update ops-related pbtxt files. Change: 154228857

---
 tensorflow/core/ops/ops.pbtxt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index d3c1ec1abc..bd90336e6d 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -11514,7 +11514,7 @@ op {
     minimum: 1
   }
   summary: "Forwards the value of an available tensor from `inputs` to `output`."
-  description: "`Merge` waits for at least one of the tensors in `inputs` to become available.\nIt is usually combined with `Switch` to implement branching.\n\n`Merge` forwards the first tensor for become available to `output`, and sets\n`value_index` to its index in `inputs`."
+  description: "`Merge` waits for at least one of the tensors in `inputs` to become available.\nIt is usually combined with `Switch` to implement branching.\n\n`Merge` forwards the first tensor to become available to `output`, and sets\n`value_index` to its index in `inputs`."
 }
 op {
   name: "MergeSummary"
-- 
GitLab


From 0777da4faf9e5a1bed1c29356a7d129ec1d33340 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 14:23:39 -0800
Subject: [PATCH 0676/1563] Bug fix to checkpoint_utils.init_from_checkpoint().

Prior to this change, attempting to restore variables under a specific scope
would also restore variables under other scopes whose names shared the same
prefix, mangling the names slightly. For example, if a client tried to restore
variables under 'my_scope/' and there was a variable named 'my_scope_1/foo' then
the function would try to restore a variable with the mangled name 'my_scope/1/foo'.
Change: 154229485
---
 .../python/framework/checkpoint_utils.py      |  2 +-
 .../python/framework/checkpoint_utils_test.py | 19 +++++++++++++++++++
 .../python/training/checkpoint_utils.py       |  2 +-
 .../python/training/checkpoint_utils_test.py  | 19 +++++++++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/framework/python/framework/checkpoint_utils.py b/tensorflow/contrib/framework/python/framework/checkpoint_utils.py
index 5d078236ac..36de1e3f82 100644
--- a/tensorflow/contrib/framework/python/framework/checkpoint_utils.py
+++ b/tensorflow/contrib/framework/python/framework/checkpoint_utils.py
@@ -272,7 +272,7 @@ def init_from_checkpoint(checkpoint_dir, assignment_map):
       # and create variable to variable mapping.
       scope_variables = set()
       for var_name in var_scope._vars:
-        if var_name.startswith(scopes):
+        if not scopes or var_name.startswith(scopes + "/"):
           # Consume /part_ if partitioned variable.
           if "/part_" in var_name:
             var_name = var_name[:var_name.index("/part_")]
diff --git a/tensorflow/contrib/framework/python/framework/checkpoint_utils_test.py b/tensorflow/contrib/framework/python/framework/checkpoint_utils_test.py
index 51ca5ec125..9396f027d3 100644
--- a/tensorflow/contrib/framework/python/framework/checkpoint_utils_test.py
+++ b/tensorflow/contrib/framework/python/framework/checkpoint_utils_test.py
@@ -144,6 +144,25 @@ class CheckpointsTest(test.TestCase):
         # Check that tensors are not explicitly in the graph.
         self.assertLess(len(str(session.graph.as_graph_def())), 27000)
 
+  def testInitWithScopeDoesNotCaptureSuffixes(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      _, _, _, v4 = _create_checkpoints(session, checkpoint_dir)
+
+    with ops.Graph().as_default() as g:
+      with variable_scope.variable_scope("useful_scope"):
+        my4 = variable_scope.get_variable("var4", [9, 9])
+      with variable_scope.variable_scope("useful_scope_1"):
+        my5_init = [[1.0, 2.0], [3.0, 4.0]]
+        my5 = variable_scope.get_variable("var5", initializer=my5_init)
+
+      checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                            {"useful_scope/": "useful_scope/"})
+      with self.test_session(graph=g) as session:
+        session.run(variables.global_variables_initializer())
+        self.assertAllEqual(my4.eval(session), v4)
+        self.assertAllEqual(my5.eval(session), my5_init)
+
   def testInitFromRootCheckpoint(self):
     checkpoint_dir = self.get_temp_dir()
     with self.test_session() as session:
diff --git a/tensorflow/python/training/checkpoint_utils.py b/tensorflow/python/training/checkpoint_utils.py
index 9bb435f6f7..35d1a069d8 100644
--- a/tensorflow/python/training/checkpoint_utils.py
+++ b/tensorflow/python/training/checkpoint_utils.py
@@ -227,7 +227,7 @@ def init_from_checkpoint(ckpt_dir_or_file, assignment_map):
       # and create variable to variable mapping.
       scope_variables = set()
       for var_name in store_vars:
-        if var_name.startswith(scopes):
+        if not scopes or var_name.startswith(scopes + "/"):
           # Consume /part_ if partitioned variable.
           if "/part_" in var_name:
             var_name = var_name[:var_name.index("/part_")]
diff --git a/tensorflow/python/training/checkpoint_utils_test.py b/tensorflow/python/training/checkpoint_utils_test.py
index a73972f5cc..b0af922c0c 100644
--- a/tensorflow/python/training/checkpoint_utils_test.py
+++ b/tensorflow/python/training/checkpoint_utils_test.py
@@ -145,6 +145,25 @@ class CheckpointsTest(test.TestCase):
         # Check that tensors are not explicitly in the graph.
         self.assertLess(len(str(session.graph.as_graph_def())), 27000)
 
+  def testInitWithScopeDoesNotCaptureSuffixes(self):
+    checkpoint_dir = self.get_temp_dir()
+    with self.test_session() as session:
+      _, _, _, v4 = _create_checkpoints(session, checkpoint_dir)
+
+    with ops.Graph().as_default() as g:
+      with variable_scope.variable_scope("useful_scope"):
+        my4 = variable_scope.get_variable("var4", [9, 9])
+      with variable_scope.variable_scope("useful_scope_1"):
+        my5_init = [[1.0, 2.0], [3.0, 4.0]]
+        my5 = variable_scope.get_variable("var5", initializer=my5_init)
+
+      checkpoint_utils.init_from_checkpoint(checkpoint_dir,
+                                            {"useful_scope/": "useful_scope/"})
+      with self.test_session(graph=g) as session:
+        session.run(variables.global_variables_initializer())
+        self.assertAllEqual(my4.eval(session), v4)
+        self.assertAllEqual(my5.eval(session), my5_init)
+
   def testInitFromRootCheckpoint(self):
     checkpoint_dir = self.get_temp_dir()
     with self.test_session() as session:
-- 
GitLab


From 546befc40895749bc81b8d59c24fdf375a9a5034 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 14:25:14 -0800
Subject: [PATCH 0677/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154229675

---
 tensorflow/go/op/wrappers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index d9c168803a..4dc4b40e97 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -3284,7 +3284,7 @@ func Enter(scope *Scope, data tf.Output, frame_name string, optional ...EnterAtt
 // `Merge` waits for at least one of the tensors in `inputs` to become available.
 // It is usually combined with `Switch` to implement branching.
 //
-// `Merge` forwards the first tensor for become available to `output`, and sets
+// `Merge` forwards the first tensor to become available to `output`, and sets
 // `value_index` to its index in `inputs`.
 //
 // Arguments:
-- 
GitLab


From 58fe576e207705929794968535735cbb9ac65db0 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 25 Apr 2017 14:49:17 -0800
Subject: [PATCH 0678/1563] Added a python API to the meta graph optimizer
 Change: 154232702

---
 tensorflow/contrib/cmake/tf_python.cmake      |  1 +
 tensorflow/python/BUILD                       | 29 ++++++
 tensorflow/python/grappler/tf_optimizer.i     | 91 +++++++++++++++++++
 tensorflow/python/grappler/tf_optimizer.py    | 35 +++++++
 .../python/grappler/tf_optimizer_test.py      | 53 +++++++++++
 tensorflow/python/tensorflow.i                |  2 +
 .../tools/pip_package/pip_smoke_test.py       |  1 +
 7 files changed, 212 insertions(+)
 create mode 100644 tensorflow/python/grappler/tf_optimizer.i
 create mode 100644 tensorflow/python/grappler/tf_optimizer.py
 create mode 100644 tensorflow/python/grappler/tf_optimizer_test.py

diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 6a99db3fbf..eaa6a9a6ab 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -204,6 +204,7 @@ add_python_module("tensorflow/python/estimator/export")
 add_python_module("tensorflow/python/estimator/inputs")
 add_python_module("tensorflow/python/estimator/inputs/queues")
 add_python_module("tensorflow/python/framework")
+add_python_module("tensorflow/python/grappler")
 add_python_module("tensorflow/python/kernel_tests")
 add_python_module("tensorflow/python/layers")
 add_python_module("tensorflow/python/lib")
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index c367d20f81..ec0a34008a 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2576,6 +2576,7 @@ tf_py_wrap_cc(
         "client/tf_session.i",
         "framework/cpp_shape_inference.i",
         "framework/python_op_gen.i",
+        "grappler/tf_optimizer.i",
         "lib/core/py_func.i",
         "lib/core/strings.i",
         "lib/io/file_io.i",
@@ -2604,6 +2605,9 @@ tf_py_wrap_cc(
         "//tensorflow/c:tf_status_helper",
         "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib",
         "//tensorflow/core/distributed_runtime/rpc:grpc_session",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:grappler_item_builder",
+        "//tensorflow/core/grappler/optimizers:meta_optimizer",
         "//tensorflow/core:lib",
         "//tensorflow/core:reader_base",
         "//tensorflow/core/debug",
@@ -3539,3 +3543,28 @@ cuda_py_test(
     ],
     main = "client/session_benchmark.py",
 )
+
+py_library(
+    name = "tf_optimizer",
+    srcs = [
+        "grappler/tf_optimizer.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [":pywrap_tensorflow_internal"],
+)
+
+py_test(
+    name = "tf_optimizer_test",
+    size = "small",
+    srcs = ["grappler/tf_optimizer_test.py"],
+    srcs_version = "PY2AND3",
+    tags = ["no_pip"],  # tf_optimizer is not available in pip.
+    deps = [
+        ":client_testlib",
+        ":framework_for_generated_wrappers",
+        ":math_ops",
+        ":tf_optimizer",
+        "//tensorflow/core:protos_all_py",
+        "//third_party/py/numpy",
+    ],
+)
diff --git a/tensorflow/python/grappler/tf_optimizer.i b/tensorflow/python/grappler/tf_optimizer.i
new file mode 100644
index 0000000000..ab887e63e5
--- /dev/null
+++ b/tensorflow/python/grappler/tf_optimizer.i
@@ -0,0 +1,91 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+
+%include "tensorflow/python/platform/base.i"
+
+%typemap(in) const tensorflow::MetaGraphDef& (tensorflow::MetaGraphDef temp) {
+  char* c_string;
+  Py_ssize_t py_size;
+  if (PyBytes_AsStringAndSize($input, &c_string, &py_size) == -1) {
+    // Python has raised an error (likely TypeError or UnicodeEncodeError).
+    SWIG_fail;
+  }
+
+  if (!temp.ParseFromString(string(c_string, py_size))) {
+    PyErr_SetString(
+        PyExc_TypeError,
+        "The MetaGraphDef could not be parsed as a valid protocol buffer");
+    SWIG_fail;
+  }
+  $1 = &temp;
+}
+
+%typemap(in) const tensorflow::RewriterConfig& (
+    tensorflow::RewriterConfig temp) {
+  char* c_string;
+  Py_ssize_t py_size;
+  if (PyBytes_AsStringAndSize($input, &c_string, &py_size) == -1) {
+    // Python has raised an error (likely TypeError or UnicodeEncodeError).
+    SWIG_fail;
+  }
+
+  if (!temp.ParseFromString(string(c_string, py_size))) {
+    PyErr_SetString(
+        PyExc_TypeError,
+        "The RewriterConfig could not be parsed as a valid protocol buffer");
+    SWIG_fail;
+  }
+  $1 = &temp;
+}
+
+%{
+  #include <memory>
+  #include "tensorflow/c/tf_status_helper.h"
+  #include "tensorflow/core/lib/core/status.h"
+  #include "tensorflow/core/framework/graph.pb.h"
+  #include "tensorflow/core/grappler/grappler_item.h"
+  #include "tensorflow/core/grappler/grappler_item_builder.h"
+  #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
+  #include "tensorflow/core/protobuf/meta_graph.pb.h"
+  #include "tensorflow/core/protobuf/rewriter_config.pb.h"
+
+PyObject* TF_OptimizeGraph(
+      const tensorflow::RewriterConfig& rewriter_config,
+      const tensorflow::MetaGraphDef& metagraph,
+      const string& graph_id, TF_Status* out_status) {
+    const tensorflow::grappler::ItemConfig item_config;
+    std::unique_ptr<tensorflow::grappler::GrapplerItem> grappler_item =
+        tensorflow::grappler::GrapplerItemFromMetaGraphDef(graph_id, metagraph, item_config);
+    tensorflow::GraphDef out_graph;
+    tensorflow::Status status = tensorflow::grappler::RunMetaOptimizer(
+        *grappler_item, rewriter_config, &out_graph);
+    tensorflow::Set_TF_Status_from_Status(out_status, status);
+    string out_graph_str = out_graph.SerializeAsString();
+    PyObject* ret = PyBytes_FromStringAndSize(out_graph_str.data(),
+                                              out_graph_str.size());
+    return ret;
+  }
+%}
+
+
+// Wrap this function
+PyObject* TF_OptimizeGraph(
+    const tensorflow::RewriterConfig& rewriter_config,
+    const tensorflow::MetaGraphDef& metagraph,
+    const string& graph_id, TF_Status* out_status);
+
+
+
diff --git a/tensorflow/python/grappler/tf_optimizer.py b/tensorflow/python/grappler/tf_optimizer.py
new file mode 100644
index 0000000000..d0464c6054
--- /dev/null
+++ b/tensorflow/python/grappler/tf_optimizer.py
@@ -0,0 +1,35 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# =============================================================================
+"""Provides a proper python API for the symbols exported through swig."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.core.framework import graph_pb2
+from tensorflow.python import pywrap_tensorflow as tf_opt
+from tensorflow.python.framework import errors
+
+
+def OptimizeGraph(rewriter_config, metagraph, graph_id=b'graph_to_optimize'):
+  """Optimize the provided metagraph."""
+  with errors.raise_exception_on_not_ok_status() as status:
+    ret_from_swig = tf_opt.TF_OptimizeGraph(rewriter_config.SerializeToString(),
+                                            metagraph.SerializeToString(),
+                                            graph_id, status)
+  if ret_from_swig is None:
+    return None
+  out_graph = graph_pb2.GraphDef().FromString(ret_from_swig)
+  return out_graph
diff --git a/tensorflow/python/grappler/tf_optimizer_test.py b/tensorflow/python/grappler/tf_optimizer_test.py
new file mode 100644
index 0000000000..b1efc2dbfb
--- /dev/null
+++ b/tensorflow/python/grappler/tf_optimizer_test.py
@@ -0,0 +1,53 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the swig wrapper tf_optimizer."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.core.protobuf import rewriter_config_pb2
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import meta_graph
+from tensorflow.python.framework import ops
+from tensorflow.python.grappler import tf_optimizer
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class PyWrapOptimizeGraphTest(test.TestCase):
+
+  def testBasic(self):
+    """Make sure arguments can be passed correctly."""
+    a = constant_op.constant(10, name='a')
+    b = constant_op.constant(20, name='b')
+    c = math_ops.add_n([a, b], name='c')
+    d = math_ops.add_n([b, c], name='d')
+    train_op = ops.get_collection_ref(ops.GraphKeys.TRAIN_OP)
+    train_op.append(d)
+    mg = meta_graph.create_meta_graph_def(graph=ops.get_default_graph())
+
+    rewriter_config = rewriter_config_pb2.RewriterConfig()
+    rewriter_config.optimizers.append('constfold')
+
+    graph = tf_optimizer.OptimizeGraph(rewriter_config, mg)
+
+    self.assertEqual(len(graph.node), 5)
+    self.assertItemsEqual([node.name for node in graph.node],
+                          ['a', 'b', 'c', 'd', 'ConstantFolding/c'])
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/tensorflow.i b/tensorflow/python/tensorflow.i
index a0009031ac..5c2ad417e2 100644
--- a/tensorflow/python/tensorflow.i
+++ b/tensorflow/python/tensorflow.i
@@ -40,3 +40,5 @@ limitations under the License.
 %include "tensorflow/python/util/kernel_registry.i"
 
 %include "tensorflow/python/util/transform_graph.i"
+
+%include "tensorflow/python/grappler/tf_optimizer.i"
diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index 8de639e855..61c3fe5540 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -41,6 +41,7 @@ BLACKLIST = [
     "//tensorflow/cc/saved_model:saved_model_half_plus_two",
     "//tensorflow:no_tensorflow_py_deps",
     "//tensorflow/python:test_ops_2",
+    "//tensorflow/python:tf_optimizer",
     "//tensorflow/python:compare_test_proto_py",
     "//tensorflow/core:image_testdata",
     "//tensorflow/core/kernels/cloud:bigquery_reader_ops",
-- 
GitLab


From 0555d089a0be69b0c7f2139706d795fdcfef6f49 Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Tue, 25 Apr 2017 15:03:49 -0800
Subject: [PATCH 0679/1563] [XLA] Use "box" instead of "boxed" in the Graphviz
 dumper

Running dot on an XLA graph somtimes shows:
  Warning: using box for unknown shape boxed

According to the Graphviz sources, there is no such shape:
https://github.com/ellson/graphviz/blob/3ccbd94343d65ca489ce8568539f39c21a6c6131/lib/common/shapes.c#L233
Change: 154234632
---
 tensorflow/compiler/xla/service/hlo_graph_dumper.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
index fc8fcfce9e..5ce52af5b4 100644
--- a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
+++ b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
@@ -191,7 +191,7 @@ string InstructionSequenceGraph(
                   RandomDistribution_Name(instruction->random_distribution()));
         break;
       case HloOpcode::kConstant:
-        shape = "boxed";
+        shape = "box";
         color = "palegreen";
         if (ShapeUtil::IsScalar(instruction->shape())) {
           StrAppend(&name, "\\n", "value=", LiteralUtil::GetAsString(
-- 
GitLab


From 7536c7edde208b028519bfb70b52ad7cc1da1c1a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 15:07:52 -0800
Subject: [PATCH 0680/1563] Use pylint 1.6.4 for sanity for now. Change:
 154235161

---
 tensorflow/tools/ci_build/install/install_pip_packages.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/ci_build/install/install_pip_packages.sh b/tensorflow/tools/ci_build/install/install_pip_packages.sh
index 5ebd69bd3d..b8f9fc8453 100755
--- a/tensorflow/tools/ci_build/install/install_pip_packages.sh
+++ b/tensorflow/tools/ci_build/install/install_pip_packages.sh
@@ -73,8 +73,8 @@ pip2 install py-cpuinfo
 pip3 install py-cpuinfo
 
 # pylint tests require the following:
-pip2 install pylint
-pip3 install pylint
+pip2 install pylint==1.6.4
+pip3 install pylint==1.6.4
 
 # pep8 tests require the following:
 pip2 install pep8
-- 
GitLab


From d133dc0aa766571967d68c1a9eff5e3a3aa4f79d Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Tue, 25 Apr 2017 15:09:23 -0800
Subject: [PATCH 0681/1563] Usability bug fix: Print out expected input types,
 output types, and name of op in error message.

Before, you got:
TypeError: Inputs are not compatible with input types

But you have no idea what the type mismatch is, or even worse,
what the op is.

Now you get:

TypeError: In op 'Foo', inputs are not compatible with input types. expected types: [tf.string_ref, tf.string, tf.int64], input types: [tf.string, tf.string, tf.int64]
Change: 154235334
---
 tensorflow/python/framework/ops.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 6d2a38b3a6..2a094203d7 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -1206,7 +1206,11 @@ class Operation(object):
     else:
       if not all(x.is_compatible_with(i.dtype)
                  for i, x in zip(self._inputs, input_types)):
-        raise TypeError("Inputs are not compatible with input types")
+        raise TypeError("In op '%s', input types (%s) are not compatible "
+                        "with expected types (%s)" % (
+                            self.node_def.name,
+                            [i.dtype for i in self._inputs],
+                            input_types))
     self._input_types = input_types
 
     # Build the list of control inputs.
-- 
GitLab


From 9d21a5ffead7cffae5d95e4665623e4988829b91 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 25 Apr 2017 15:26:58 -0800
Subject: [PATCH 0682/1563] Add helper utilities:
 tf_should_use.should_use_result etc. Change: 154237321

---
 tensorflow/python/BUILD                      |  11 ++
 tensorflow/python/util/tf_should_use.py      | 145 +++++++++++++++++++
 tensorflow/python/util/tf_should_use_test.py | 108 ++++++++++++++
 3 files changed, 264 insertions(+)
 create mode 100644 tensorflow/python/util/tf_should_use.py
 create mode 100644 tensorflow/python/util/tf_should_use_test.py

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index ec0a34008a..15845506d9 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2403,6 +2403,17 @@ py_test(
     ],
 )
 
+py_test(
+    name = "tf_should_use_test",
+    size = "small",
+    srcs = ["util/tf_should_use_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":client_testlib",
+        ":util",
+    ],
+)
+
 py_test(
     name = "tf_inspect_test",
     size = "small",
diff --git a/tensorflow/python/util/tf_should_use.py b/tensorflow/python/util/tf_should_use.py
new file mode 100644
index 0000000000..a6a1ad4892
--- /dev/null
+++ b/tensorflow/python/util/tf_should_use.py
@@ -0,0 +1,145 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Decorator that provides a warning if the wrapped object is never used."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import functools
+import traceback
+import types
+
+from tensorflow.python.platform import tf_logging
+
+
+def _add_should_use_warning(x, fatal_error=False):
+  """Wraps object x so that if it is never used, a warning is logged.
+
+  Args:
+    x: Python object.
+    fatal_error: Python bool.  If `True`, tf.logging.fatal is raised
+      if the returned value is never used.
+
+  Returns:
+    An instance of `TFShouldUseWarningWrapper` which subclasses `type(x)`
+    and is a very shallow wrapper for `x` which logs access into `x`.
+  """
+  def override_method(method):
+    def fn(self, *args, **kwargs):
+      self._tf_object_has_been_used = True  # pylint: disable=protected-access
+      return method(self, *args, **kwargs)
+    return fn
+
+  class TFShouldUseWarningWrapper(type(x)):
+    """Wrapper for objects that keeps track of their use."""
+
+    def __init__(self, true_self):
+      self.__dict__ = true_self.__dict__
+      stack = [x.strip() for x in traceback.format_stack()]
+      # Remove top three stack entries from adding the wrapper
+      self._tf_object_creation_stack = '\n'.join(stack[:-3])
+      self._tf_object_has_been_used = False
+
+    # Not sure why this pylint warning is being used; this is not an
+    # old class form.
+    # pylint: disable=super-on-old-class
+    def __getattribute__(self, name):
+      if name != '_tf_object_has_been_used':
+        self._tf_object_has_been_used = True
+      return super(TFShouldUseWarningWrapper, self).__getattribute__(name)
+
+    def __del__(self):
+      if not self._tf_object_has_been_used:
+        if fatal_error:
+          logger = tf_logging.fatal
+        else:
+          logger = tf_logging.error
+        logger(
+            'Object was never used: %s.\nIt was originally created here:\n%s'
+            % (self, self._tf_object_creation_stack))
+
+      if hasattr(super(TFShouldUseWarningWrapper, self), '__del__'):
+        return super(TFShouldUseWarningWrapper, self).__del__()
+    # pylint: enable=super-on-old-class
+
+  for name in dir(TFShouldUseWarningWrapper):
+    method = getattr(TFShouldUseWarningWrapper, name)
+    if not isinstance(method, types.FunctionType):
+      continue
+    if name in ('__init__', '__getattribute__', '__del__'):
+      continue
+    setattr(TFShouldUseWarningWrapper, name,
+            functools.wraps(method)(override_method(method)))
+
+  wrapped = TFShouldUseWarningWrapper(x)
+  wrapped.__doc__ = x.__doc__  # functools.wraps fails on some objects.
+  wrapped._tf_object_has_been_used = False   # pylint: disable=protected-access
+  return wrapped
+
+
+def should_use_result(fn):
+  """Function wrapper that ensures the function's output is used.
+
+  If the output is not used, a `tf.logging.error` is logged.
+
+  An output is marked as used if any of its attributes are read, modified, or
+  updated.  Examples when the output is a `Tensor` include:
+
+  - Using it in any capacity (e.g. `y = t + 0`, `sess.run(t)`)
+  - Accessing a property (e.g. getting `t.name` or `t.op`).
+
+  Note, certain behaviors cannot be tracked - for these the object may not
+  be marked as used.  Examples include:
+
+  - `t != 0`.  In this case, comparison is done on types / ids.
+  - `isinstance(t, tf.Tensor)`.  Similar to above.
+
+  Args:
+    fn: The function to wrap.
+
+  Returns:
+    The wrapped function.
+  """
+  def wrapped(*args, **kwargs):
+    return _add_should_use_warning(fn(*args, **kwargs))
+  return functools.wraps(fn)(wrapped)
+
+
+def must_use_result_or_fatal(fn):
+  """Function wrapper that ensures the function's output is used.
+
+  If the output is not used, a `tf.logging.fatal` error is raised.
+
+  An output is marked as used if any of its attributes are read, modified, or
+  updated.  Examples when the output is a `Tensor` include:
+
+  - Using it in any capacity (e.g. `y = t + 0`, `sess.run(t)`)
+  - Accessing a property (e.g. getting `t.name` or `t.op`).
+
+  Note, certain behaviors cannot be tracked - for these the object may not
+  be marked as used.  Examples include:
+
+  - `t != 0`.  In this case, comparison is done on types / ids.
+  - `isinstance(t, tf.Tensor)`.  Similar to above.
+
+  Args:
+    fn: The function to wrap.
+
+  Returns:
+    The wrapped function.
+  """
+  def wrapped(*args, **kwargs):
+    return _add_should_use_warning(fn(*args, **kwargs), fatal_error=True)
+  return functools.wraps(fn)(wrapped)
diff --git a/tensorflow/python/util/tf_should_use_test.py b/tensorflow/python/util/tf_should_use_test.py
new file mode 100644
index 0000000000..09130eed3a
--- /dev/null
+++ b/tensorflow/python/util/tf_should_use_test.py
@@ -0,0 +1,108 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Unit tests for tf_should_use."""
+
+# pylint: disable=unused-import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import contextlib
+import sys
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+from tensorflow.python.util import tf_should_use
+
+
+@contextlib.contextmanager
+def reroute_error(captured):
+  """Temporarily reroute errors written to tf_logging.error into `captured`."""
+  del captured[:]
+  true_logger = tf_logging.error
+  def capture_errors(*args, **unused_kwargs):
+    captured.extend(args)
+  tf_logging.error = capture_errors
+  try:
+    yield
+  finally:
+    tf_logging.error = true_logger
+
+
+class TfShouldUseTest(test.TestCase):
+
+  def testAddShouldUseWarningWhenNotUsed(self):
+    c = constant_op.constant(0, name='blah')
+    captured = []
+    with reroute_error(captured):
+      def in_this_function():
+        h = tf_should_use._add_should_use_warning(c)
+        del h
+      in_this_function()
+    self.assertIn('Object was never used:', '\n'.join(captured))
+    self.assertIn('blah:0', '\n'.join(captured))
+    self.assertIn('in_this_function', '\n'.join(captured))
+
+  def _testAddShouldUseWarningWhenUsed(self, fn):
+    c = constant_op.constant(0, name='blah')
+    captured = []
+    with reroute_error(captured):
+      h = tf_should_use._add_should_use_warning(c)
+      fn(h)
+      del h
+    self.assertNotIn('Object was never used:', '\n'.join(captured))
+    self.assertNotIn('blah:0', '\n'.join(captured))
+
+  def testAddShouldUseWarningWhenUsedWithAdd(self):
+    def add(h):
+      _ = h + 1
+    self._testAddShouldUseWarningWhenUsed(add)
+
+  def testAddShouldUseWarningWhenUsedWithGetName(self):
+    def get_name(h):
+      _ = h.name
+    self._testAddShouldUseWarningWhenUsed(get_name)
+
+  def testShouldUseResult(self):
+    @tf_should_use.should_use_result
+    def return_const(value):
+      return constant_op.constant(value, name='blah')
+    captured = []
+    with reroute_error(captured):
+      return_const(0.0)
+    self.assertIn('Object was never used:', '\n'.join(captured))
+    self.assertIn('blah:0', '\n'.join(captured))
+    self.assertIn('return_const', '\n'.join(captured))
+
+  def testShouldUseResultWhenNotReallyUsed(self):
+    @tf_should_use.should_use_result
+    def return_const(value):
+      return constant_op.constant(value, name='blah')
+    captured = []
+    with reroute_error(captured):
+      with self.test_session():
+        return_const(0.0)
+        # Creating another op and executing it does not mark the
+        # unused op as being "used".
+        v = constant_op.constant(1.0, name='meh')
+        v.eval()
+    self.assertIn('Object was never used:', '\n'.join(captured))
+    self.assertIn('blah:0', '\n'.join(captured))
+    self.assertIn('return_const', '\n'.join(captured))
+
+
+if __name__ == '__main__':
+  test.main()
-- 
GitLab


From fd955a05a16b7a18c15a1d4f723efa05b130f920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Tue, 25 Apr 2017 15:43:58 -0800
Subject: [PATCH 0683/1563] Migrate tf_backend, tf_color_scale, and vz_sorting
 to d3v4. Change: 154239235

---
 .../components/tf_backend_d3v4/backend.ts     | 486 ++++++++++++++++++
 .../tf_backend_d3v4/backendTests.ts           | 299 +++++++++++
 .../components/tf_backend_d3v4/behavior.ts    | 145 ++++++
 .../tf_backend_d3v4/behaviorTests.ts          | 164 ++++++
 .../data/audio_run_run1_tag_audio1.json       |   1 +
 ...pressedHistograms_run_run1_tag_histo1.json |   1 +
 .../tf_backend_d3v4/data/example.json         |   4 +
 .../data/histograms_run_run1_tag_histo1.json  |   1 +
 .../data/images_run_run1_tag_im1.json         |   1 +
 ...dividualImage_index_0_tag_im1_run_run1.png | Bin 0 -> 42 bytes
 .../run_metadata_run_step99_tag_train.pbtxt   |  17 +
 .../components/tf_backend_d3v4/data/runs.json |  32 ++
 .../tf_backend_d3v4/data/scalars.json         |   1 +
 ...rs_run_run1_tag_cross_entropy__281_29.json |   1 +
 .../tf_backend_d3v4/requestManager.ts         | 177 +++++++
 .../tf_backend_d3v4/requestManagerTests.ts    | 293 +++++++++++
 .../components/tf_backend_d3v4/router.ts      | 112 ++++
 .../components/tf_backend_d3v4/tests.html     |  46 ++
 .../tf_backend_d3v4/urlPathHelpers.ts         |  40 ++
 .../tf_color_scale_d3v4/colorScale.ts         |  87 ++++
 .../tf_color_scale_d3v4/colorScaleTests.ts    |  48 ++
 .../components/tf_color_scale_d3v4/demo.html  |  93 ++++
 .../tf_color_scale_d3v4/palettes.ts           |  76 +++
 .../components/tf_color_scale_d3v4/tests.html |  31 ++
 .../tf_color_scale_d3v4/tf-color-scale.html   |  31 ++
 .../components/vz_sorting_d3v4/sorting.ts     | 107 ++++
 .../vz_sorting_d3v4/sortingTests.ts           |  78 +++
 .../components/vz_sorting_d3v4/tests.html     |  23 +
 28 files changed, 2395 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/backendTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/behaviorTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/audio_run_run1_tag_audio1.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/compressedHistograms_run_run1_tag_histo1.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/example.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/histograms_run_run1_tag_histo1.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/images_run_run1_tag_im1.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/individualImage_index_0_tag_im1_run_run1.png
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/run_metadata_run_step99_tag_train.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars_run_run1_tag_cross_entropy__281_29.json
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/requestManager.ts
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/requestManagerTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/router.ts
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/tests.html
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/urlPathHelpers.ts
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScaleTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/demo.html
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/palettes.ts
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/tests.html
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
 create mode 100644 tensorflow/tensorboard/components/vz_sorting_d3v4/sorting.ts
 create mode 100644 tensorflow/tensorboard/components/vz_sorting_d3v4/sortingTests.ts
 create mode 100644 tensorflow/tensorboard/components/vz_sorting_d3v4/tests.html

diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts
new file mode 100644
index 0000000000..2f3b561d87
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts
@@ -0,0 +1,486 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+
+import {compareTagNames} from '../vz_sorting_d3v4/sorting';
+
+import {RequestManager} from './requestManager';
+import {Router} from './router';
+
+export interface RunEnumeration {
+  histograms: string[];
+  compressedHistogramTuples: string[];
+  scalars: string[];
+  images: string[];
+  audio: string[];
+  graph: boolean;
+  run_metadata: string[];
+}
+
+export interface LogdirResponse { logdir: string; }
+
+export interface RunsResponse { [runName: string]: RunEnumeration; }
+
+export type RunToTag = {
+  [run: string]: string[];
+};
+
+export interface Datum {
+  wall_time: Date;
+  step: number;
+}
+
+export type ScalarDatum = Datum & Scalar;
+export interface Scalar { scalar: number; }
+
+export interface Text { text: string; }
+export type TextDatum = Datum & Text;
+
+export type HistogramDatum = Datum & Histogram;
+export interface Histogram {
+  min: number;
+  max: number;
+  nItems?: number;
+  sum?: number;
+  sumSquares?: number;
+  bucketRightEdges: number[];
+  bucketCounts: number[];
+}
+
+export interface HistogramBin {
+  x: number;
+  dx: number;
+  y: number;
+}
+export type HistogramSeriesDatum = HistogramSeries & Datum;
+export interface HistogramSeries { bins: HistogramBin[]; }
+
+export type ImageDatum = Datum & Image;
+export interface Image {
+  width: number;
+  height: number;
+  url: string;
+}
+
+export type AudioDatum = Datum & Audio;
+export interface Audio {
+  content_type: string;
+  url: string;
+}
+
+// A health pill encapsulates an overview of tensor element values. The value
+// field is a list of 12 numbers that shed light on the status of the tensor.
+export interface HealthPill {
+  node_name: string;
+  output_slot: number;
+  value: number[];
+}
+
+// When updating this type, keep it consistent with the HealthPill interface
+// in tf_graph_common/lib/scene/scene.ts.
+export type HealthPillDatum = Datum & HealthPill;
+// A health pill response is a mapping from node name to a list of health pill
+// data entries.
+export interface HealthPillsResponse { [key: string]: HealthPillDatum[]; }
+
+
+export const TYPES = [
+  'scalar', 'histogram', 'compressedHistogram', 'graph', 'image', 'audio',
+  'runMetadata', 'text'
+];
+/**
+ * The Backend class provides a convenient and typed interface to the backend.
+ *
+ * It provides methods corresponding to the different data sources on the
+ * TensorBoard backend. These methods return a promise containing the data
+ * from the backend. This class does some post-processing on the data; for
+ * example, converting data elements tuples into js objects so that they can
+ * be accessed in a more convenient and clearly-documented fashion.
+ */
+export class Backend {
+  public router: Router;
+  public requestManager: RequestManager;
+
+  /**
+   * Construct a Backend instance.
+   * @param router the Router with info on what urls to get data from
+   * @param requestManager The RequestManager, overwritable so you may
+   * manually clear request queue, etc. Defaults to a new RequestManager.
+   */
+  constructor(router: Router, requestManager?: RequestManager) {
+    this.router = router;
+    this.requestManager = requestManager || new RequestManager();
+  }
+
+  /**
+   * Returns a promise for requesting the logdir string.
+   */
+  public logdir(): Promise<LogdirResponse> {
+    return this.requestManager.request(this.router.logdir());
+  }
+
+  /**
+   * Returns a listing of all the available data in the TensorBoard backend.
+   */
+  public runs(): Promise<RunsResponse> {
+    return this.requestManager.request(this.router.runs());
+  }
+
+  /**
+   * Return a promise showing the Run-to-Tag mapping for scalar data.
+   */
+  public scalarRuns(): Promise<RunToTag> {
+    return this.runs().then((x) => _.mapValues(x, 'scalars'));
+  }
+
+  /**
+   * Return a promise showing the Run-to-Tag mapping for histogram data.
+   */
+  public histogramRuns(): Promise<RunToTag> {
+    return this.runs().then((x) => _.mapValues(x, 'histograms'));
+  }
+
+  /**
+   * Return a promise showing the Run-to-Tag mapping for image data.
+   */
+  public imageRuns(): Promise<RunToTag> {
+    return this.runs().then((x) => _.mapValues(x, 'images'));
+  }
+
+  /**
+   * Return a promise showing the Run-to-Tag mapping for audio data.
+   */
+  public audioRuns(): Promise<RunToTag> {
+    return this.runs().then((x) => _.mapValues(x, 'audio'));
+  }
+
+  /**
+   * Return a promise showing the Run-to-Tag mapping for compressedHistogram
+   * data.
+   */
+  public compressedHistogramRuns(): Promise<RunToTag> {
+    return this.runs().then((x) => _.mapValues(x, 'compressedHistograms'));
+  }
+
+  /**
+   * Return a promise showing list of runs that contain graphs.
+   */
+  public graphRuns(): Promise<string[]> {
+    return this.runs().then((x) => {
+      return _.keys(x).filter((k) => x[k].graph);
+    });
+  }
+
+  /**
+   * Return a promise showing the Run-to-Tag mapping for run_metadata objects.
+   */
+  public runMetadataRuns(): Promise<RunToTag> {
+    return this.runs().then((x) => _.mapValues(x, 'run_metadata'));
+  }
+
+
+  /**
+   * Returns a promise showing the Run-to-Tag mapping for text data.
+   */
+  public textRuns(): Promise<RunToTag> {
+    return this.requestManager.request(this.router.textRuns());
+  }
+
+
+  /**
+   * Returns a promise containing TextDatums for given run and tag.
+   */
+  public text(tag: string, run: string): Promise<TextDatum[]> {
+    const url = this.router.text(tag, run);
+    // tslint:disable-next-line:no-any it's convenient and harmless here
+    return this.requestManager.request(url).then(map((x: any) => {
+      x.wall_time = timeToDate(x.wall_time);
+      return x;
+    }));
+  }
+
+  /**
+   * Return a promise of a graph string from the backend.
+   */
+  public graph(tag: string, limitAttrSize?: number, largeAttrKeys?: string):
+      Promise<string> {
+    const url = this.router.graph(tag, limitAttrSize, largeAttrKeys);
+    return this.requestManager.request(url);
+  }
+
+  /**
+   * Return a promise containing ScalarDatums for given run and tag.
+   */
+  public scalar(tag: string, run: string): Promise<Array<ScalarDatum>> {
+    let p: Promise<TupleData<number>[]>;
+    const url = this.router.scalars(tag, run);
+    p = this.requestManager.request(url);
+    return p.then(map(detupler(createScalar)));
+  }
+
+  /**
+   * Returns a promise for requesting the health pills for a list of nodes.
+   */
+  public healthPills(nodeNames: string[], step?: number):
+      Promise<HealthPillsResponse> {
+    const postData = {'node_names': JSON.stringify(nodeNames)};
+    if (step !== undefined) {
+      // The user requested health pills for a specific step. This request
+      // might be slow since the backend reads events sequentially from disk.
+      postData['step'] = step;
+    }
+    return this.requestManager.request(this.router.healthPills(), postData);
+  }
+
+  /**
+   * Return a promise containing HistogramDatums for given run and tag.
+   */
+  public histogram(tag: string, run: string):
+      Promise<Array<HistogramSeriesDatum>> {
+    let p: Promise<TupleData<HistogramTuple>[]>;
+    let url = this.router.histograms(tag, run);
+    p = this.requestManager.request(url);
+    return p.then(map(detupler(createHistogram))).then(function(histos) {
+      // Get the minimum and maximum values across all histograms so that the
+      // visualization is aligned for all timesteps.
+      const min = d3.min(histos, d => d.min);
+      const max = d3.max(histos, d => d.max);
+
+      return histos.map(function(histo, i) {
+        return {
+          wall_time: histo.wall_time,
+          step: histo.step,
+          bins: convertBins(histo, min, max)
+        };
+      });
+    });
+  }
+
+  /**
+   * Return a promise containing ImageDatums for given run and tag.
+   */
+  public image(tag: string, run: string): Promise<Array<ImageDatum>> {
+    const url = this.router.images(tag, run);
+    let p: Promise<ImageMetadata[]>;
+    p = this.requestManager.request(url);
+    return p.then(map(this.createImage.bind(this)));
+  }
+
+  /**
+   * Return a promise containing AudioDatums for given run and tag.
+   */
+  public audio(tag: string, run: string): Promise<Array<AudioDatum>> {
+    const url = this.router.audio(tag, run);
+    let p: Promise<AudioMetadata[]>;
+    p = this.requestManager.request(url);
+    return p.then(map(this.createAudio.bind(this)));
+  }
+
+  /**
+   * Returns a promise to load the string RunMetadata for given run/tag.
+   */
+  public runMetadata(tag: string, run: string): Promise<string> {
+    const url = this.router.runMetadata(tag, run);
+    return this.requestManager.request(url);
+  }
+
+  /**
+   * Get compressedHistogram data.
+   * Unlike other methods, don't bother reprocessing this data into a nicer
+   * format. This is because we will deprecate this route.
+   */
+  private compressedHistogram(tag: string, run: string):
+      Promise<Array<Datum&CompressedHistogramTuple>> {
+    const url = this.router.compressedHistograms(tag, run);
+    let p: Promise<TupleData<CompressedHistogramTuple>[]>;
+    p = this.requestManager.request(url);
+    return p.then(map(detupler((x) => x)));
+  }
+
+  private createImage(x: ImageMetadata): Image&Datum {
+    return {
+      width: x.width,
+      height: x.height,
+      wall_time: timeToDate(x.wall_time),
+      step: x.step,
+      url: this.router.individualImage(x.query, x.wall_time),
+    };
+  }
+
+  private createAudio(x: AudioMetadata): Audio&Datum {
+    return {
+      content_type: x.content_type,
+      wall_time: timeToDate(x.wall_time),
+      step: x.step,
+      url: this.router.individualAudio(x.query),
+    };
+  }
+}
+
+/** Given a RunToTag, return sorted array of all runs */
+export function getRuns(r: RunToTag): string[] {
+  return _.keys(r).sort(compareTagNames);
+}
+
+/** Given a RunToTag, return array of all tags (sorted + dedup'd) */
+export function getTags(r: RunToTag): string[] {
+  return _.union.apply(null, _.values(r)).sort(compareTagNames);
+}
+
+/**
+ * Given a RunToTag and an array of runs, return every tag that appears for
+ * at least one run.
+ * Sorted, deduplicated.
+ */
+export function filterTags(r: RunToTag, runs: string[]): string[] {
+  let result = [];
+  runs.forEach((x) => result = result.concat(r[x]));
+  return _.uniq(result).sort(compareTagNames);
+}
+
+function timeToDate(x: number): Date {
+  return new Date(x * 1000);
+};
+
+/**  Just a curryable map to make things cute and tidy. */
+function map<T, U>(f: (x: T) => U): (arr: T[]) => U[] {
+  return function(arr: T[]): U[] {
+    return arr.map(f);
+  };
+};
+
+/**
+ * This is a higher order function that takes a function that transforms a
+ * T into a G, and returns a function that takes TupleData<T>s and converts
+ * them into the intersection of a G and a Datum.
+ */
+function detupler<T, G>(xform: (x: T) => G): (t: TupleData<T>) => Datum & G {
+  return function(x: TupleData<T>): Datum & G {
+    // Create a G, assert it has type <G & Datum>
+    let obj = <G&Datum>xform(x[2]);
+    // ... patch in the properties of datum
+    obj.wall_time = timeToDate(x[0]);
+    obj.step = x[1];
+    return obj;
+  };
+};
+
+function createScalar(x: number): Scalar {
+  return {scalar: x};
+}
+
+function createHistogram(x: HistogramTuple): Histogram {
+  return {
+    min: x[0],
+    max: x[1],
+    nItems: x[2],
+    sum: x[3],
+    sumSquares: x[4],
+    bucketRightEdges: x[5],
+    bucketCounts: x[6],
+  };
+}
+
+/**
+ * Takes histogram data as stored by tensorboard backend and converts it to
+ * the standard d3 histogram data format to make it more compatible and easier
+ * to visualize. When visualizing histograms, having the left edge and width
+ * makes things quite a bit easier. The bins are also converted to have an
+ * uniform width, what makes the visualization easier to understand.
+ *
+ * @param histogram A histogram from tensorboard backend.
+ * @param min The leftmost edge. The binning will start on it.
+ * @param max The rightmost edge. The binning will end on it.
+ * @param numBins The number of bins of the converted data. The default of 30
+ * is a sensible default, using more starts to get artifacts because the event
+ * data is stored in buckets, and you start being able to see the aliased
+ * borders between each bucket.
+ * @return A histogram bin. Each bin has an x (left edge), a dx (width),
+ *     and a y (count).
+ *
+ * If given rightedges are inclusive, then these left edges (x) are exclusive.
+ */
+export function convertBins(
+    histogram: Histogram, min: number, max: number, numBins = 30) {
+  if (histogram.bucketRightEdges.length !== histogram.bucketCounts.length) {
+    throw(new Error('Edges and counts are of different lengths.'));
+  }
+
+  if (max === min) {
+    // Create bins even if all the data has a single value.
+    max = min * 1.1 + 1;
+    min = min / 1.1 - 1;
+  }
+  const binWidth = (max - min) / numBins;
+  let bucketLeft = min;  // Use the min as the starting point for the bins.
+  let bucketPos = 0;
+  return d3.range(min, max, binWidth).map((binLeft) => {
+    const binRight = binLeft + binWidth;
+
+    // Take the count of each existing bucket, multiply it by the proportion
+    // of overlap with the new bin, then sum and store as the count for the
+    // new bin. If no overlap, will add to zero, if 100% overlap, will include
+    // the full count into new bin.
+    let binY = 0;
+    while (bucketPos < histogram.bucketRightEdges.length) {
+      // Clip the right edge because right-most edge can be infinite-sized.
+      const bucketRight = Math.min(max, histogram.bucketRightEdges[bucketPos]);
+
+      const intersect =
+          Math.min(bucketRight, binRight) - Math.max(bucketLeft, binLeft);
+      const count = (intersect / (bucketRight - bucketLeft)) *
+          histogram.bucketCounts[bucketPos];
+
+      binY += intersect > 0 ? count : 0;
+
+      // If bucketRight is bigger than binRight, than this bin is finished and
+      // there is data for the next bin, so don't increment bucketPos.
+      if (bucketRight > binRight) {
+        break;
+      }
+      bucketLeft = Math.max(min, bucketRight);
+      bucketPos++;
+    }
+
+    return {x: binLeft, dx: binWidth, y: binY};
+  });
+}
+
+/**
+ * The following interfaces (TupleData, HistogramTuple,
+ * CompressedHistogramTuple, ImageMetadata, and AudioMetadata) describe how
+ * the data is sent over from the backend.
+ */
+type TupleData<T> = [number, number, T];  // wall_time, step
+
+// Min, Max, nItems, Sum, Sum_Squares, right edges of buckets, nItems in
+// buckets
+type HistogramTuple =
+    [number, number, number, number, number, number[], number[]];
+type CompressedHistogramTuple = [number, number][];  // percentile, value
+interface ImageMetadata {
+  width: number;
+  height: number;
+  wall_time: number;
+  step: number;
+  query: string;
+}
+interface AudioMetadata {
+  content_type: string;
+  wall_time: number;
+  step: number;
+  query: string;
+}
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/backendTests.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/backendTests.ts
new file mode 100644
index 0000000000..180c1f5298
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/backendTests.ts
@@ -0,0 +1,299 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {Backend, convertBins, filterTags, getRuns, getTags, RunToTag, TYPES} from './backend';
+import {RequestManager} from './requestManager';
+import {Router, router} from './router';
+import {BAD_CHARACTERS, demoify, queryEncoder} from './urlPathHelpers';
+
+describe('urlPathHelpers', () => {
+  it('demoify works as expected', () => {
+    const demoified = demoify(BAD_CHARACTERS);
+    let allClean = '';
+    for (let i = 0; i < BAD_CHARACTERS.length; i++) {
+      allClean += '_';
+    }
+    chai.assert.equal(demoified, allClean, 'cleaning the BAD_CHARACTERS works');
+    chai.assert.equal(demoify('foozod'), 'foozod', 'doesnt change safe string');
+    chai.assert.equal(demoify('foo zod (2)'), 'foo_zod__2_', 'simple case');
+  });
+
+  it('queryEncoder works with demoify on spaces and parens', () => {
+    const params = {foo: 'something with spaces and (parens)'};
+    const actual = demoify(queryEncoder(params));
+    const expected = '_foo_something_with_spaces_and__28parens_29';
+    chai.assert.equal(actual, expected);
+  });
+});
+
+function assertIsDatum(x) {
+  chai.assert.isNumber(x.step);
+  chai.assert.instanceOf(x.wall_time, Date);
+}
+
+describe('backend tests', () => {
+  let backend: Backend;
+  let rm: RequestManager;
+  const base = 'data';
+  const demoRouter = router(base, true);
+  beforeEach(() => {
+    // Construct a demo Backend (third param is true)
+    backend = new Backend(demoRouter);
+    rm = new RequestManager();
+  });
+
+  it('runs are loaded properly', (done) => {
+    const runsResponse = backend.runs();
+    const actualRuns = rm.request(demoRouter.runs());
+    Promise.all([runsResponse, actualRuns]).then((values) => {
+      chai.assert.deepEqual(values[0], values[1]);
+      done();
+    });
+  });
+
+  it('scalars are loaded properly', (done) => {
+    backend.scalar('cross_entropy (1)', 'run1').then((s) => {
+      // just check the data got reformatted properly
+      const aScalar = s[s.length - 1];
+      assertIsDatum(aScalar);
+      chai.assert.isNumber(aScalar.scalar);
+      // verify date conversion works
+      chai.assert.equal(aScalar.wall_time.valueOf(), 40000);
+      done();
+    });
+  });
+
+  it('histograms are loaded properly', (done) => {
+    backend.histogram('histo1', 'run1').then((histos) => {
+      const histo = histos[0];
+      assertIsDatum(histo);
+      chai.assert.instanceOf(histo.bins, Array);
+      done();
+    });
+  });
+
+  it('all registered types have handlers', () => {
+    TYPES.forEach((t: string) => {
+      chai.assert.isDefined(backend[t], t);
+      chai.assert.isDefined(backend[t + 'Runs'], t + 'Runs');
+    });
+  });
+
+  it('images are loaded properly', (done) => {
+    backend.image('im1', 'run1').then((images) => {
+      const image = images[0];
+      assertIsDatum(image);
+      chai.assert.isNumber(image.width);
+      chai.assert.isNumber(image.height);
+      const nonDemoQuery = 'index=0&tag=im1&run=run1';
+      const expectedUrl = demoRouter.individualImage(nonDemoQuery, 10.0);
+      chai.assert.equal(image.url, expectedUrl);
+      done();
+    });
+  });
+
+  it('audio is loaded properly', (done) => {
+    backend.audio('audio1', 'run1').then((audioClips) => {
+      const audio = audioClips[0];
+      assertIsDatum(audio);
+      chai.assert.equal(audio.content_type, 'audio/wav');
+      const nonDemoQuery = 'index=0&tag=audio1&run=run1';
+      const expectedUrl = demoRouter.individualAudio(nonDemoQuery);
+      chai.assert.equal(audio.url, expectedUrl);
+      done();
+    });
+  });
+
+  it('trailing slash removed from base route', () => {
+    const r = router('foo/');
+    chai.assert.equal(r.runs(), 'foo/runs');
+  });
+
+  it('run helper methods work', (done) => {
+    const scalar = {run1: ['cross_entropy (1)'], fake_run_no_data: ['scalar2']};
+    const image = {run1: ['im1'], fake_run_no_data: ['im1', 'im2']};
+    const audio = {run1: ['audio1'], fake_run_no_data: ['audio1', 'audio2']};
+    const runMetadata = {run1: ['step99'], fake_run_no_data: ['step99']};
+    const graph = ['fake_run_no_data'];
+    let count = 0;
+    function next() {
+      count++;
+      if (count === 4) {
+        done();
+      }
+    }
+    backend.scalarRuns().then((x) => {
+      chai.assert.deepEqual(x, scalar);
+      next();
+    });
+    backend.imageRuns().then((x) => {
+      chai.assert.deepEqual(x, image);
+      next();
+    });
+    backend.audioRuns().then((x) => {
+      chai.assert.deepEqual(x, audio);
+      next();
+    });
+    backend.runMetadataRuns().then((x) => {
+      chai.assert.deepEqual(x, runMetadata);
+      next();
+    });
+    backend.graphRuns().then((x) => {
+      chai.assert.deepEqual(x, graph);
+      next();
+    });
+  });
+
+  it('runToTag helpers work', () => {
+    const r2t: RunToTag = {
+      run1: ['foo', 'bar', 'zod'],
+      run2: ['zod', 'zoink'],
+      a: ['foo', 'zod']
+    };
+    const empty1: RunToTag = {};
+    const empty2: RunToTag = {run1: [], run2: []};
+    chai.assert.deepEqual(getRuns(r2t), ['a', 'run1', 'run2']);
+    chai.assert.deepEqual(getTags(r2t), ['bar', 'foo', 'zod', 'zoink']);
+    chai.assert.deepEqual(filterTags(r2t, ['run1', 'run2']), getTags(r2t));
+    chai.assert.deepEqual(filterTags(r2t, ['run1']), ['bar', 'foo', 'zod']);
+    chai.assert.deepEqual(
+        filterTags(r2t, ['run2', 'a']), ['foo', 'zod', 'zoink']);
+
+    chai.assert.deepEqual(getRuns(empty1), []);
+    chai.assert.deepEqual(getTags(empty1), []);
+
+    chai.assert.deepEqual(getRuns(empty2), ['run1', 'run2']);
+    chai.assert.deepEqual(getTags(empty2), []);
+  });
+});
+
+describe('Verify that the histogram format conversion works.', () => {
+
+  function assertHistogramEquality(h1, h2) {
+    h1.forEach((b1, i) => {
+      const b2 = h2[i];
+      chai.assert.closeTo(b1.x, b2.x, 1e-10);
+      chai.assert.closeTo(b1.dx, b2.dx, 1e-10);
+      chai.assert.closeTo(b1.y, b2.y, 1e-10);
+    });
+  }
+
+  it('Throws and error if the inputs are of different lengths', () => {
+    chai.assert.throws(() => {
+      convertBins(
+          {bucketRightEdges: [0], bucketCounts: [1, 2], min: 1, max: 2}, 1, 2,
+          2);
+    }, 'Edges and counts are of different lengths.');
+  });
+
+  it('Handles data with no bins', () => {
+    chai.assert.deepEqual(
+        convertBins(
+            {bucketRightEdges: [], bucketCounts: [], min: 0, max: 0}, 0, 0, 0),
+        []);
+  });
+
+  it('Handles data with one bin', () => {
+    const counts = [1];
+    const rightEdges = [1.21e-12];
+    const histogram = [{x: 1.1e-12, dx: 1.21e-12 - 1.1e-12, y: 1}];
+    const newHistogram = convertBins(
+        {
+          bucketRightEdges: rightEdges,
+          bucketCounts: counts,
+          min: 1.1e-12,
+          max: 1.21e-12
+        },
+        1.1e-12, 1.21e-12, 1);
+    assertHistogramEquality(newHistogram, histogram);
+  });
+
+  it('Handles data with two bins.', () => {
+    const counts = [1, 2];
+    const rightEdges = [1.1e-12, 1.21e-12];
+    const histogram = [
+      {x: 1.0e-12, dx: 1.05e-13, y: 1.09090909090909},
+      {x: 1.105e-12, dx: 1.05e-13, y: 1.9090909090909}
+    ];
+    const newHistogram = convertBins(
+        {
+          bucketRightEdges: rightEdges,
+          bucketCounts: counts,
+          min: 1.0e-12,
+          max: 1.21e-12
+        },
+        1.0e-12, 1.21e-12, 2);
+    assertHistogramEquality(newHistogram, histogram);
+  });
+
+  it('Handles a domain that crosses zero, but doesn\'t include zero as ' +
+         'an edge.',
+     () => {
+       const counts = [1, 2];
+       const rightEdges = [-1.0e-12, 1.0e-12];
+       const histogram = [
+         {x: -1.1e-12, dx: 1.05e-12, y: 1.95},
+         {x: -0.5e-13, dx: 1.05e-12, y: 1.05}
+       ];
+       const newHistogram = convertBins(
+           {
+             bucketRightEdges: rightEdges,
+             bucketCounts: counts,
+             min: -1.1e-12,
+             max: 1.0e-12
+           },
+           -1.1e-12, 1.0e-12, 2);
+       assertHistogramEquality(newHistogram, histogram);
+     });
+
+  it('Handles a histogram of all zeros', () => {
+    const h = {
+      min: 0,
+      max: 0,
+      nItems: 51200,
+      sum: 0,
+      sumSquares: 0,
+      bucketRightEdges: [0, 1e-12, 1.7976931348623157e+308],
+      bucketCounts: [0, 51200, 0],
+      wall_time: '2017-01-25T02:30:11.257Z',
+      step: 0
+    };
+    const newHistogram = convertBins(h, 0, 0, 5);
+    const expectedHistogram = [
+      {x: -1, dx: 0.4, y: 0}, {x: -0.6, dx: 0.4, y: 0},
+      {x: -0.2, dx: 0.4, y: 51200}, {x: 0.2, dx: 0.4, y: 0},
+      {x: 0.6, dx: 0.4, y: 0}
+    ];
+    assertHistogramEquality(newHistogram, expectedHistogram);
+  });
+
+  it('Handles a right-most right edge that extends to very large number.',
+     () => {
+       const counts = [1, 2, 3];
+       const rightEdges = [0, 1.0e-12, 1.0e14];
+       const histogram = [
+         {x: -1.0e-12, dx: 0.7e-12, y: 0.7}, {x: -0.3e-12, dx: 0.7e-12, y: 1.1},
+         {x: 0.4e-12, dx: 0.7e-12, y: 4.2}
+       ];
+       const newHistogram = convertBins(
+           {
+             bucketRightEdges: rightEdges,
+             bucketCounts: counts,
+             min: -1.0e-12,
+             max: 1.1e-12
+           },
+           -1.0e-12, 1.1e-12, 3);
+       assertHistogramEquality(newHistogram, histogram);
+     });
+});
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts
new file mode 100644
index 0000000000..ab8a64b7b1
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts
@@ -0,0 +1,145 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {getRuns, getTags, TYPES} from './backend';
+
+export const BackendBehavior = {
+  properties: {
+    /** *** Required properties *** */
+    /** Data type. One of Backend.TYPES */
+    dataType: {
+      type: String,
+      observer: '_throwErrorOnUnrecognizedType',
+    },
+
+    /** Backend for data loading. */
+    backend: {
+      type: Object,
+    },
+
+    /** Should it automatically load when configured ready? Default true. */
+    autoLoad: {
+      type: Boolean,
+      value: true,
+    },
+
+    /** *** Component-provided properties *** */
+    /** Every tag available for data type (sorted, dedpulicated) */
+    tags: {
+      type: Array,
+      readOnly: true,
+      notify: true,
+    },
+
+    /** Every run available for data type (sorted) */
+    runs: {
+      type: Array,
+      readOnly: true,
+      notify: true,
+    },
+
+    /** Mapping from runs to tags for the data type */
+    run2tag: {
+      type: Object,
+      readOnly: true,
+      notify: true,
+    },
+
+    /** Promise provider for the data. Useful for passing to subcomponents */
+    dataProvider:
+        {type: Function, computed: '_getDataProvider(dataType, backend)'},
+
+    /** Has the dashboard loaded yet? */
+    loadState: {
+      type: String,
+      value: 'noload',  // [noload, pending, loaded, failure]
+      readOnly: true,
+    },
+
+    /**
+     * True if dashboard has loaded, and no tags were found.
+     * Persists through subsequent reloads (ie. still true while
+     * next load is pending) so warning won't flash away every reload
+     * when there is no data.
+     */
+    dataNotFound: {
+      type: Boolean,
+      value: false,
+      readOnly: true,
+    }
+
+  },
+  observers: ['_do_autoLoad(dataType, backend, autoLoad)'],
+  /**
+   * Reloading works in two steps:
+   * Backend reload, which gets metadata on available runs, tags, etc from
+   *   the backend.
+   * Frontend reload, which loads new data for each chart or visual display.
+   * Backend reload logic is provided by this behaivor. The frontend reload
+   *   logic should be provided elsewhere, since it is component-specific.
+   * To keep things simple and consistent, we do the backend reload first,
+   *   and the frontend reload afterwards.
+   */
+  reload() {
+    return this.backendReload().then((x) => {
+      return this.frontendReload();
+    });
+  },
+  /**
+   * Load data from backend and then set run2tag, tags, runs, and loadState.
+   * Returns a promise that resolves/rejects when data is loaded.
+   */
+  backendReload() {
+    if (this.dataType == null) {
+      throw new Error('BackendBehavior: Need a dataType to reload.');
+    }
+    if (this.backend == null) {
+      throw new Error('BackendBehavior: Need a backend to reload.');
+    }
+    const runsRoute = this.backend[this.dataType + 'Runs'].bind(this.backend);
+    this._setLoadState('pending');
+    return runsRoute().then(
+        (x) => {
+          this._setLoadState('loaded');
+          if (_.isEqual(x, this.run2tag)) {
+            // If x and run2tag are equal, let's avoid updating everything
+            // since that can needlessly trigger run changes, reloads, etc
+            return x;
+          }
+          this._setRun2tag(x);
+          const tags = getTags(x);
+          this._setDataNotFound(tags.length === 0);
+          this._setTags(tags);
+          this._setRuns(getRuns(x));
+          return x;
+        },
+        (fail) => {
+          this._setLoadState('failure');
+          return fail;
+        });
+  },
+  _do_autoLoad(type, backend, autoLoad) {
+    if (autoLoad) {
+      this.reload();
+    }
+  },
+  _getDataProvider(dataType, backend) {
+    return this.backend[this.dataType].bind(this.backend);
+  },
+  _throwErrorOnUnrecognizedType(dataType) {
+    if (TYPES.indexOf(dataType) === -1) {
+      throw new Error('BackendBehavior: Unknown dataType ' + dataType);
+    }
+  },
+};
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/behaviorTests.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/behaviorTests.ts
new file mode 100644
index 0000000000..6d55aca5f8
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/behaviorTests.ts
@@ -0,0 +1,164 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {Backend, getRuns, getTags, RunToTag} from './backend'
+import {BackendBehavior} from './behavior'
+
+declare function fixture(id: string): void;
+
+window.addEventListener('WebComponentsReady', function() {
+  Polymer({
+    is: 'test-element',
+    behaviors: [BackendBehavior],
+    frontendReload: function() {
+      // no-op
+    },
+  });
+});
+
+describe('data-behavior', function() {
+  var testElement;
+  var resolve;
+  var reject;
+  var fakeBackend = {
+    scalarRuns: function() {
+      return new Promise(function(_resolve, _reject) {
+        resolve = (x) => _resolve(x);
+        reject = (x) => _reject(x);
+      });
+    },
+    scalar: function(x) {
+      return this;
+    },
+  };
+  beforeEach(function() {
+    testElement = fixture('testElementFixture');
+    testElement.autoLoad = false;
+    testElement.backend = fakeBackend;
+    testElement.dataType = 'scalar';
+  });
+
+  it('load states work as expected', function(done) {
+    chai.assert.equal(testElement.loadState, 'noload');
+    var reloaded = testElement.reload();
+    chai.assert.equal(testElement.loadState, 'pending');
+    resolve();
+    reloaded
+        .then(function() {
+          chai.assert.equal(testElement.loadState, 'loaded');
+          var reloaded2 = testElement.reload();
+          chai.assert.equal(testElement.loadState, 'pending');
+          reject();
+          return reloaded2;
+        })
+        .then(function() {
+          chai.assert.equal(testElement.loadState, 'failure');
+          done();
+        });
+  });
+
+  it('data provider set appropriately', function() {
+    chai.assert.deepEqual(testElement.dataProvider(), testElement.backend);
+  });
+
+  it('loads data as expected', function(done) {
+    var r2t: RunToTag = {
+      run1: ['foo', 'bar', 'zod'],
+      run2: ['zoink', 'zow'],
+      run3: ['.'],
+    };
+    var tags = getTags(r2t);
+    var runs = getRuns(r2t);
+    testElement.backend = fakeBackend;
+    testElement.dataType = 'scalar';
+    testElement.reload().then(function(x) {
+      chai.assert.deepEqual(testElement.run2tag, r2t);
+      chai.assert.deepEqual(testElement.runs, runs);
+      chai.assert.deepEqual(testElement.tags, tags);
+      done();
+    });
+    resolve(r2t);
+  });
+
+  it('errors thrown on bad data types', function() {
+    testElement.backend = undefined;
+    chai.assert.throws(function() {
+      testElement.dataType = 'foo';
+    });
+    testElement.dataType = 'scalar';
+    testElement.dataType = 'graph';
+    testElement.dataType = 'histogram';
+  });
+
+  it('dataNotFound flag works', function(done) {
+    chai.assert.isFalse(testElement.dataNotFound, 'initially false');
+    var next = testElement.reload();
+    chai.assert.isFalse(testElement.dataNotFound, 'still false while pending');
+    resolve({foo: [], bar: []});
+    next.then(() => {
+      chai.assert.isTrue(testElement.dataNotFound, 'true on empty data');
+      var last = testElement.reload();
+      chai.assert.isTrue(testElement.dataNotFound, 'still true while pending');
+      resolve({foo: ['bar'], bar: ['zod']});
+      last.then(() => {
+        chai.assert.isFalse(
+            testElement.dataNotFound, 'false now that we have data');
+        done();
+      });
+    });
+  });
+
+  it('reloads as soon as setup, if autoReload is true', function(done) {
+    var r2t = {foo: [], bar: []};
+    var fakeBackend = {
+      scalarRuns: () => Promise.resolve(r2t),
+      scalar: () => null,
+    };
+    testElement = fixture('testElementFixture');
+    testElement.dataType = 'scalar';
+    testElement.backend = fakeBackend;
+    setTimeout(() => {
+      chai.assert.equal(testElement.run2tag, r2t);
+      done();
+    });
+  });
+
+  it('doesn\'t mutate props if backend returns same data', function(done) {
+    var r2t_1 = {foo: ['1', '2'], bar: ['3', '4']};
+    var r2t_2 = {foo: ['1', '2'], bar: ['3', '4']};
+    var fakeBackend = {
+      scalarRuns: () => Promise.resolve(r2t_1),
+      scalar: () => null,
+    };
+    testElement.backend = fakeBackend;
+    testElement.reload().then(() => {
+      fakeBackend.scalarRuns = () => Promise.resolve(r2t_2);
+      var tags = testElement.tags;
+      testElement.reload().then(() => {
+        // shallow equality ensures it wasn't recomputed
+        chai.assert.equal(tags, testElement.tags, 'tags was not recomputed');
+        done();
+      });
+    });
+  });
+
+  it('reload calls frontendReload', function(done) {
+    testElement.frontendReload = function() {
+      done();
+    };
+    testElement.reload();
+  });
+
+});
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/audio_run_run1_tag_audio1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/audio_run_run1_tag_audio1.json
new file mode 100644
index 0000000000..21a00f198d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/audio_run_run1_tag_audio1.json
@@ -0,0 +1 @@
+[{"wall_time": 0, "step": 0, "query": "index=0&tag=audio1&run=run1", "content_type": "audio/wav"}]
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/compressedHistograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/compressedHistograms_run_run1_tag_histo1.json
new file mode 100644
index 0000000000..8b4c088392
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/compressedHistograms_run_run1_tag_histo1.json
@@ -0,0 +1 @@
+[[0, 0, [[0, -2.3150592308536755], [668, -2.0967547155036605], [1587, -1.4326244423655616], [3085, -0.8871306575801902], [5000, -0.09312398815580714], [6915, 0.2584093405812282], [8413, 0.8895470642005087], [9332, 1.3198979614453679], [10000, 1.6793308878855118]]], [100.0, 10, [[0, -1.3417572789138936], [668, -1.183563374619141], [1587, -0.48920418783271574], [3085, 0.29326906896076954], [5000, 0.56953784145381], [6915, 0.8684655583499333], [8413, 1.4133127368907181], [9332, 1.906140650457873], [10000, 2.135771998171255]]], [200.0, 20, [[0, -1.5066917525035333], [668, -1.3910909571770793], [1587, -0.902737218885874], [3085, -0.3807791904765027], [5000, 0.38900200905253046], [6915, 0.8209734209339482], [8413, 1.302385856695965], [9332, 1.9324626053521639], [10000, 2.957505317875451]]], [300.0, 30, [[0, -0.5430457051469562], [668, -0.4626161834245273], [1587, 0.21573949543027715], [3085, 0.37353741100174215], [5000, 0.6891407881591103], [6915, 1.0927156232630852], [8413, 1.2745337159550916], [9332, 1.4321116832891605], [10000, 2.1913774993059034]]], [400.0, 40, [[0, -0.3584790755077172], [668, -0.33301611509753215], [1587, -0.1089466072951948], [3085, 0.5792199847585249], [5000, 1.220854943811942], [6915, 1.759829438421432], [8413, 2.3072559906741614], [9332, 2.753036118353921], [10000, 3.0267252195784047]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/example.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/example.json
new file mode 100644
index 0000000000..8adc6fb896
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/example.json
@@ -0,0 +1,4 @@
+{
+  "foo": 3,
+  "bar": "zoidberg"
+}
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/histograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/histograms_run_run1_tag_histo1.json
new file mode 100644
index 0000000000..a5600a356e
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/histograms_run_run1_tag_histo1.json
@@ -0,0 +1 @@
+[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/images_run_run1_tag_im1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/images_run_run1_tag_im1.json
new file mode 100644
index 0000000000..fd2a96b62f
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/images_run_run1_tag_im1.json
@@ -0,0 +1 @@
+[{"wall_time": 0, "step": 0, "query": "index=0&tag=im1&run=run1", "width": 1, "height": 1}]
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/individualImage_index_0_tag_im1_run_run1.png b/tensorflow/tensorboard/components/tf_backend_d3v4/data/individualImage_index_0_tag_im1_run_run1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f191b280ce91e6cb8c387735c10ef9bc5da6c83b
GIT binary patch
literal 42
ocmZ?wbhEHbWMp7uXkY+=|Ns9h{$ybUF?B!$NQQxl(S^Yp0J!f4_W%F@

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/run_metadata_run_step99_tag_train.pbtxt b/tensorflow/tensorboard/components/tf_backend_d3v4/data/run_metadata_run_step99_tag_train.pbtxt
new file mode 100644
index 0000000000..07ce4fad53
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/run_metadata_run_step99_tag_train.pbtxt
@@ -0,0 +1,17 @@
+step_stats {
+  dev_stats {
+    device: "/job:localhost/replica:0/task:0/cpu:0"
+    node_stats {
+      node_name: "_SOURCE"
+      all_start_micros: 1459365298611334
+      op_start_rel_micros: 29
+      op_end_rel_micros: 30
+      all_end_rel_micros: 52
+      memory {
+        allocator_name: "cpu"
+      }
+      timeline_label: "_SOURCE = NoOp()"
+      scheduled_micros: 1459365298611291
+    }
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/runs.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/runs.json
new file mode 100644
index 0000000000..413ddb9ab3
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/runs.json
@@ -0,0 +1,32 @@
+{
+  "run1": {
+    "images": [
+      "im1"
+    ],
+    "audio": [
+      "audio1"
+    ],
+    "scalars": [
+      "cross_entropy (1)"
+    ],
+    "histograms": [
+      "histo1"
+    ],
+    "compressedHistograms": [
+      "histo1"
+    ],
+    "run_metadata": [
+      "step99"
+    ],
+    "graph": false
+  },
+  "fake_run_no_data": {
+    "images": ["im1", "im2"],
+    "audio": ["audio1", "audio2"],
+    "scalars": ["scalar2"],
+    "histograms": ["histo1"],
+    "compressedHistograms": ["histo1"],
+    "run_metadata": ["step99"],
+    "graph": true
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars.json
new file mode 100644
index 0000000000..bc9d3353d5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars.json
@@ -0,0 +1 @@
+{"run1": {"cross_entropy (1)": [[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]}}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars_run_run1_tag_cross_entropy__281_29.json b/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars_run_run1_tag_cross_entropy__281_29.json
new file mode 100644
index 0000000000..97b0062f0f
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars_run_run1_tag_cross_entropy__281_29.json
@@ -0,0 +1 @@
+[[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/requestManager.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/requestManager.ts
new file mode 100644
index 0000000000..c943268cec
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/requestManager.ts
@@ -0,0 +1,177 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+interface ResolveReject {
+  resolve: Function;
+  reject: Function;
+}
+/**
+ * Manages many fetch requests. Launches up to nSimultaneousRequests
+ * simultaneously, and maintains a LIFO queue of requests to process when
+ * more urls are requested than can be handled at once. The queue can be
+ * cleared.
+ *
+ * When a request is made, a Promise is returned which resolves with the
+ * parsed JSON result from the request.
+ */
+export class RequestCancellationError extends Error {
+  public name = 'RequestCancellationError';
+}
+
+export class RequestNetworkError extends Error {
+  public name: string;
+  public req: XMLHttpRequest;
+  public url: string;
+
+  constructor(req: XMLHttpRequest, url) {
+    super();
+    this.message = `RequestNetworkError: ${req.status} at ${url}`;
+    this.name = 'RequestNetworkError';
+    this.req = req;
+    this.url = url;
+  }
+}
+
+export class RequestManager {
+  private _queue: ResolveReject[];
+  private _maxRetries: number;
+  private _nActiveRequests: number;
+  private _nSimultaneousRequests: number;
+
+  constructor(nSimultaneousRequests = 10, maxRetries = 3) {
+    this._queue = [];
+    this._nActiveRequests = 0;
+    this._nSimultaneousRequests = nSimultaneousRequests;
+    this._maxRetries = maxRetries;
+  }
+
+  /**
+   * Gives a promise that loads assets from given url (respects queuing). If
+   * postData is provided, this request will use POST, not GET. This is an
+   * object mapping POST keys to string values.
+   */
+  public request(url: string, postData?: {[key: string]: string}):
+      Promise<any> {
+    const promise =
+        new Promise((resolve, reject) => {
+          const resolver = {resolve: resolve, reject: reject};
+          this._queue.push(resolver);
+          this.launchRequests();
+        })
+            .then(() => {
+              return this.promiseWithRetries(url, this._maxRetries, postData);
+            })
+            .then(
+                (response) => {
+                  // Success - Let's free space for another active
+                  // reqest, and launch it
+                  this._nActiveRequests--;
+                  this.launchRequests();
+                  return response;
+                },
+                (rejection) => {
+                  if (rejection.name === 'RequestNetworkError') {
+                    // If we failed due to network error, we should
+                    // decrement
+                    // _nActiveRequests because this request was
+                    // active
+                    this._nActiveRequests--;
+                    this.launchRequests();
+                  }
+                  return Promise.reject(rejection);
+                });
+    return promise;
+  }
+
+  public clearQueue() {
+    while (this._queue.length > 0) {
+      this._queue.pop().reject(
+          new RequestCancellationError('Request cancelled by clearQueue'));
+    }
+  }
+
+  /* Return number of currently pending requests */
+  public activeRequests(): number {
+    return this._nActiveRequests;
+  }
+
+  /* Return total number of outstanding requests (includes queue) */
+  public outstandingRequests(): number {
+    return this._nActiveRequests + this._queue.length;
+  }
+
+  private launchRequests() {
+    while (this._nActiveRequests < this._nSimultaneousRequests &&
+           this._queue.length > 0) {
+      this._nActiveRequests++;
+      this._queue.pop().resolve();
+    }
+  }
+
+  /**
+   * Try to request a given URL using overwritable _promiseFromUrl method.
+   * If the request fails for any reason, we will retry up to maxRetries
+   * times. In practice, this will help us paper over transient network issues
+   * like '502 Bad Gateway'.
+   * By default, Chrome displays network errors in console, so
+   * the user will be able to tell when the requests are failing. I think this
+   * is a feature, if the request failures and retries are causing any
+   * pain to users, they can see it and file issues.
+   */
+  private promiseWithRetries(
+      url: string, maxRetries: number, postData?: {[key: string]: string}) {
+    var success = (x) => x;
+    var failure = (x) => {
+      if (maxRetries > 0) {
+        return this.promiseWithRetries(url, maxRetries - 1, postData);
+      } else {
+        return Promise.reject(x);
+      }
+    };
+    return this._promiseFromUrl(url, postData).then(success, failure);
+  }
+
+  /* Actually get promise from url using XMLHttpRequest */
+  protected _promiseFromUrl(url: string, postData?: {[key: string]: string}) {
+    return new Promise((resolve, reject) => {
+      let req = new XMLHttpRequest();
+      req.open(postData ? 'POST' : 'GET', url);
+
+      let formData;
+      if (postData) {
+        // We are to make a POST request.
+        formData = new FormData();
+        for (let postKey in postData) {
+          if (postKey) {
+            // The linter requires 'for in' loops to be filtered by an if
+            // condition.
+            formData.append(postKey, postData[postKey]);
+          }
+        }
+      }
+      req.onload = function() {
+        if (req.status === 200) {
+          resolve(JSON.parse(req.responseText));
+        } else {
+          reject(new RequestNetworkError(req, url));
+        }
+      };
+      req.onerror = function() {
+        reject(new RequestNetworkError(req, url));
+      };
+      req.send(formData);
+    });
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/requestManagerTests.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/requestManagerTests.ts
new file mode 100644
index 0000000000..8bd46744f5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/requestManagerTests.ts
@@ -0,0 +1,293 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {RequestManager, RequestNetworkError} from './requestManager';
+interface MockRequest {
+  resolve: Function;
+  reject: Function;
+  id: number;
+  url: string;
+}
+class MockedRequestManager extends RequestManager {
+  private resolvers: Function[];
+  private rejectors: Function[];
+  public requestsDispatched: number;
+  constructor(maxRequests = 10, maxRetries = 3) {
+    super(maxRequests, maxRetries);
+    this.resolvers = [];
+    this.rejectors = [];
+    this.requestsDispatched = 0;
+  }
+  protected _promiseFromUrl(url) {
+    return new Promise((resolve, reject) => {
+      const mockJSON = {
+        ok: true,
+        json() {
+          return url;
+        },
+        url,
+        status: 200,
+      };
+      const mockFailedRequest: any = {
+        ok: false,
+        url,
+        status: 502,
+      };
+      const mockFailure = new RequestNetworkError(mockFailedRequest, url);
+      this.resolvers.push(() => {
+        resolve(mockJSON);
+      });
+      this.rejectors.push(() => {
+        reject(mockFailure);
+      });
+      this.requestsDispatched++;
+    });
+  }
+  public resolveFakeRequest() {
+    this.resolvers.pop()();
+  }
+  public rejectFakeRequest() {
+    this.rejectors.pop()();
+  }
+  public dispatchAndResolve() {
+    // Wait for at least one request to be dispatched, then resolve it.
+    this.waitForDispatch(1).then(() => this.resolveFakeRequest());
+  }
+  public waitForDispatch(num) {
+    return waitForCondition(() => {
+      return this.requestsDispatched >= num;
+    });
+  }
+}
+
+/** Create a promise that returns when *check* returns true.
+ * May cause a test timeout if check never becomes true.
+ */
+
+function waitForCondition(check: () => boolean): Promise<any> {
+  return new Promise((resolve, reject) => {
+    const go = () => {
+      if (check()) {
+        resolve();
+      }
+      setTimeout(go, 2);
+    };
+    go();
+  });
+}
+
+describe('backend', () => {
+  describe('request manager', () => {
+    it('request loads JSON properly', (done) => {
+      const rm = new RequestManager();
+      const promise = rm.request('data/example.json');
+      promise.then(
+          (response) => {
+            chai.assert.deepEqual(response, {foo: 3, bar: 'zoidberg'});
+            done();
+          },
+          (reject) => {
+            throw new Error(reject);
+          });
+    });
+
+    it('rejects on bad url', (done) => {
+      const rm = new RequestManager(5, 0);
+      const badUrl = '_bad_url_which_doesnt_exist.json';
+      const promise = rm.request(badUrl);
+      promise.then(
+          (success) => {
+            done(new Error('the promise should have rejected'));
+          },
+          (reject: RequestNetworkError) => {
+            chai.assert.instanceOf(reject, RequestNetworkError);
+            chai.assert.include(reject.message, '404');
+            chai.assert.include(reject.message, badUrl);
+            chai.assert.equal(reject.req.status, 404);
+            done();
+          });
+    });
+
+    it('can retry if requests fail', (done) => {
+      const rm = new MockedRequestManager(3, 5);
+      const r = rm.request('foo');
+      rm.waitForDispatch(1)
+          .then(() => {
+            rm.rejectFakeRequest();
+            return rm.waitForDispatch(2);
+          })
+          .then(() => rm.resolveFakeRequest());
+      r.then((success) => done());
+    });
+
+    it('retries at most maxRetries times', (done) => {
+      const MAX_RETRIES = 2;
+      const rm = new MockedRequestManager(3, MAX_RETRIES);
+      const r = rm.request('foo');
+      rm.waitForDispatch(1)
+          .then(() => {
+            rm.rejectFakeRequest();
+            return rm.waitForDispatch(2);
+          })
+          .then(() => {
+            rm.rejectFakeRequest();
+            return rm.waitForDispatch(3);
+          })
+          .then(() => {
+            rm.rejectFakeRequest();
+          });
+
+      r.then(
+          (success) => done(new Error('The reqest should have failed')),
+          (failure) => done());
+    });
+
+    it('requestManager only sends maxRequests requests at a time', (done) => {
+      const rm = new MockedRequestManager(3);
+      const r0 = rm.request('1');
+      const r1 = rm.request('2');
+      const r2 = rm.request('3');
+      const r3 = rm.request('4');
+      chai.assert.equal(rm.activeRequests(), 3, 'three requests are active');
+      chai.assert.equal(
+          rm.outstandingRequests(), 4, 'four requests are pending');
+      rm.waitForDispatch(3)
+          .then(() => {
+            chai.assert.equal(
+                rm.activeRequests(), 3, 'three requests are still active (1)');
+            chai.assert.equal(
+                rm.requestsDispatched, 3, 'three requests were dispatched');
+            rm.resolveFakeRequest();
+            return rm.waitForDispatch(4);
+          })
+          .then(() => {
+            chai.assert.equal(
+                rm.activeRequests(), 3, 'three requests are still active (2)');
+            chai.assert.equal(
+                rm.requestsDispatched, 4, 'four requests were dispatched');
+            chai.assert.equal(
+                rm.outstandingRequests(), 3, 'three requests are pending');
+            rm.resolveFakeRequest();
+            rm.resolveFakeRequest();
+            rm.resolveFakeRequest();
+            return r3;
+          })
+          .then(() => {
+            chai.assert.equal(rm.activeRequests(), 0, 'all requests finished');
+            chai.assert.equal(
+                rm.outstandingRequests(), 0, 'no requests pending');
+            done();
+          });
+    });
+
+    it('queue continues after failures', (done) => {
+      const rm = new MockedRequestManager(1, 0);
+      const r0 = rm.request('1');
+      const r1 = rm.request('2');
+      rm.waitForDispatch(1).then(() => {
+        rm.rejectFakeRequest();
+      });
+
+      r0.then(
+            (success) => done(new Error('r0 should have failed')),
+            (failure) => 'unused_argument')
+          .then(() => rm.resolveFakeRequest());
+
+      // When the first request rejects, it should decrement nActiveRequests
+      // and then launch remaining requests in queue (i.e. this one)
+      r1.then((success) => done(), (failure) => done(new Error(failure)));
+    });
+
+    it('queue is LIFO', (done) => {
+      /* This test is a bit tricky.
+       * We want to verify that the RequestManager queue has LIFO semantics.
+       * So we construct three requests off the bat: A, B, C.
+       * So LIFO semantics ensure these will resolve in order A, C, B.
+       * (Because the A request launches immediately when we create it, it's
+       * not in queue)
+       * Then after resolving A, C moves out of queue, and we create X.
+       * So expected final order is A, C, X, B.
+       * We verify this with an external var that counts how many requests were
+       * resolved.
+       */
+      const rm = new MockedRequestManager(1);
+      let nResolved = 0;
+      function assertResolutionOrder(expectedSpotInSequence) {
+        return () => {
+          nResolved++;
+          chai.assert.equal(expectedSpotInSequence, nResolved);
+        };
+      }
+
+      function launchThirdRequest() {
+        rm.request('started late but goes third')
+            .then(assertResolutionOrder(3))
+            .then(() => rm.dispatchAndResolve());
+      }
+
+      rm.request('first')
+          .then(
+              assertResolutionOrder(1))  // Assert that this one resolved first
+          .then(launchThirdRequest)
+          .then(() => rm.dispatchAndResolve());  // then trigger the next one
+
+      rm.request('this one goes fourth')  // created second, will go last
+          .then(assertResolutionOrder(
+              4))       // assert it was the fourth to get resolved
+          .then(done);  // finish the test
+
+      rm.request('second')
+          .then(assertResolutionOrder(2))
+          .then(() => rm.dispatchAndResolve());
+
+      rm.dispatchAndResolve();
+    });
+
+    it('requestManager can clear queue', (done) => {
+      const rm = new MockedRequestManager(1);
+      let requestsResolved = 0;
+      let requestsRejected = 0;
+      const success = () => requestsResolved++;
+      const failure = (err) => {
+        chai.assert.equal(err.name, 'RequestCancellationError');
+        requestsRejected++;
+      };
+      const finishTheTest = () => {
+        chai.assert.equal(rm.activeRequests(), 0, 'no requests still active');
+        chai.assert.equal(
+            rm.requestsDispatched, 1, 'only one req was ever dispatched');
+        chai.assert.equal(rm.outstandingRequests(), 0, 'no pending requests');
+        chai.assert.equal(requestsResolved, 1, 'one request got resolved');
+        chai.assert.equal(
+            requestsRejected, 4, 'four were cancelled and threw errors');
+        done();
+      };
+      rm.request('0').then(success, failure).then(finishTheTest);
+      rm.request('1').then(success, failure);
+      rm.request('2').then(success, failure);
+      rm.request('3').then(success, failure);
+      rm.request('4').then(success, failure);
+      chai.assert.equal(rm.activeRequests(), 1, 'one req is active');
+      rm.waitForDispatch(1).then(() => {
+        chai.assert.equal(rm.activeRequests(), 1, 'one req is active');
+        chai.assert.equal(rm.requestsDispatched, 1, 'one req was dispatched');
+        chai.assert.equal(rm.outstandingRequests(), 5, 'five reqs outstanding');
+        rm.clearQueue();
+        rm.resolveFakeRequest();
+        // resolving the first request triggers finishTheTest
+      });
+    });
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/router.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/router.ts
new file mode 100644
index 0000000000..319514f3f6
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/router.ts
@@ -0,0 +1,112 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {demoify, queryEncoder} from './urlPathHelpers'
+
+export type RunTagUrlFn = (tag: string, run: string) => string;
+
+export interface Router {
+  logdir: () => string;
+  runs: () => string;
+  scalars: RunTagUrlFn;
+  histograms: RunTagUrlFn;
+  compressedHistograms: RunTagUrlFn;
+  images: RunTagUrlFn;
+  individualImage: (query: string, wallTime: number) => string;
+  audio: RunTagUrlFn;
+  individualAudio: (query: string) => string;
+  graph:
+      (run: string, limit_attr_size?: number,
+       large_attrs_key?: string) => string;
+  runMetadata: RunTagUrlFn;
+  textRuns: () => string;
+  text: RunTagUrlFn;
+  healthPills: () => string;
+}
+;
+
+/**
+ * The standard router for communicating with the TensorBoard backend
+ * @param dataDir {string} The base prefix for finding data on server.
+ * @param demoMode {boolean} Whether to modify urls for filesystem demo usage.
+ */
+export function router(dataDir = 'data', demoMode = false): Router {
+  var clean = demoMode ? demoify : (x) => x;
+  if (dataDir[dataDir.length - 1] === '/') {
+    dataDir = dataDir.slice(0, dataDir.length - 1);
+  }
+  function standardRoute(route: string, demoExtension = '.json'):
+      ((tag: string, run: string) => string) {
+    return function(tag: string, run: string): string {
+      var url =
+          dataDir + '/' + route + clean(queryEncoder({tag: tag, run: run}));
+      if (demoMode) {
+        url += demoExtension;
+      }
+      return url;
+    };
+  }
+  function individualImageUrl(query: string, wallTime: number) {
+    var url = dataDir + '/' + clean('individualImage?' + query);
+    // Include wall_time just to disambiguate the URL and force the browser
+    // to reload the image when the URL changes. The backend doesn't care
+    // about the value.
+    url += demoMode ? '.png' : '&ts=' + wallTime;
+    return url;
+  }
+  function individualAudioUrl(query: string) {
+    var url = dataDir + '/' + clean('individualAudio?' + query);
+    if (demoMode) {
+      url += '.wav';
+    }
+    return url;
+  }
+  function graphUrl(
+      run: string, limit_attr_size?: number, large_attrs_key?: string) {
+    let query_params = [['run', clean(run)]];
+    if (limit_attr_size != null && !demoMode) {
+      query_params.push(['limit_attr_size', String(limit_attr_size)]);
+    }
+    if (large_attrs_key != null && !demoMode) {
+      query_params.push(['large_attrs_key', large_attrs_key]);
+    }
+    let query = query_params
+                    .map(param => {
+                      return param[0] + '=' + encodeURIComponent(param[1]);
+                    })
+                    .join('&');
+    var url = dataDir + '/graph' + clean('?' + query);
+    if (demoMode) {
+      url += '.pbtxt';
+    }
+    return url;
+  }
+  return {
+    logdir: () => dataDir + '/logdir',
+    runs: () => dataDir + '/runs' + (demoMode ? '.json' : ''),
+    individualImage: individualImageUrl,
+    individualAudio: individualAudioUrl,
+    graph: graphUrl,
+    scalars: standardRoute('scalars'),
+    histograms: standardRoute('histograms'),
+    compressedHistograms: standardRoute('compressedHistograms'),
+    images: standardRoute('images'),
+    audio: standardRoute('audio'),
+    runMetadata: standardRoute('run_metadata', '.pbtxt'),
+    healthPills: () => dataDir + '/plugin/debugger/health_pills',
+    textRuns: () => dataDir + '/plugin/text/runs' + (demoMode ? '.json' : ''),
+    text: standardRoute('plugin/text/text'),
+  };
+};
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/tests.html b/tensorflow/tensorboard/components/tf_backend_d3v4/tests.html
new file mode 100644
index 0000000000..7f51861d25
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/tests.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../../polymer/polymer.html">
+  <link rel="import" href="../../tf-imports/d3.html">
+  <link rel="import" href="../../vz-sorting/vz-sorting.html">
+</head>
+<body>
+  <test-fixture id="testElementFixture">
+    <template>
+      <test-element
+        id="test"
+      ></test-element>
+    </template>
+  </test-fixture>
+    <script src="../requestManager.js"></script>
+    <script src="../urlPathHelpers.js"></script>
+    <script src="../router.js"></script>
+    <script src="../backend.js"></script>
+    <script src="../behavior.js"></script>
+
+    <script src="requestManagerTest.js"></script>
+    <script src="backendTests.js"></script>
+    <script src="behaviorTests.js"></script>
+</body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/urlPathHelpers.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/urlPathHelpers.ts
new file mode 100644
index 0000000000..62519dac5c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/urlPathHelpers.ts
@@ -0,0 +1,40 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+export const BAD_CHARACTERS = '#%&{}\\/<>*? $!\'":@+`|=() ';
+/** Cleanup a url so that it can be loaded from a filesystem. */
+export function demoify(s) {
+  // for consistency with python's urllib.urlencode
+  s = s.replace(new RegExp('%20', 'g'), '+');
+  for (let i = 0; i < BAD_CHARACTERS.length; i++) {
+    const c = BAD_CHARACTERS[i];
+    s = s.replace(new RegExp('\\' + c, 'g'), '_');
+  }
+  return s;
+}
+
+export function queryEncoder(params?: any): string {
+  // It's important that the keys be sorted, so we always grab the right file
+  // if we are talking to the backend generated by serialze_tensorboard.py
+  if (params == null) {
+    return '';
+  }
+  const components = _.keys(params)
+                       .sort()
+                       .filter((k) => params[k] !== undefined)
+                       .map((k) => k + '=' + encodeURIComponent(params[k]));
+  const result = components.length ? '?' + components.join('&') : '';
+  // Replace parens for consistency with urllib.urlencode
+  return result.replace(/\(/g, '%28').replace(/\)/g, '%29');
+}
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts b/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts
new file mode 100644
index 0000000000..d10e753445
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts
@@ -0,0 +1,87 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Example usage:
+// runs = ["train", "test", "test1", "test2"]
+// ccs = new ColorScale();
+// ccs.domain(runs);
+// ccs.getColor("train");
+// ccs.getColor("test1");
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import {palettes} from './palettes'
+
+
+export class ColorScale {
+  private palette: string[];
+  private identifiers = d3.map();
+
+  /**
+   * Creates a color scale with optional custom palette.
+   *  @param {string[]} [palette=palettes.googleColorBlind] - The color
+   *                 palette you want as an Array of hex strings.
+   */
+  constructor(palette: string[] = palettes.googleColorBlindAssist) {
+    this.palette = palette;
+  }
+
+  /**
+   * Set the domain of strings.
+   * @param {string[]} strings - An array of possible strings to use as the
+   *                             domain for your scale.
+   */
+  public domain(strings: string[]): this {
+    this.identifiers = d3.map();
+    strings.forEach((s, i) => {
+      this.identifiers.set(s, this.palette[i % this.palette.length]);
+    });
+    return this;
+  }
+
+  /**
+   * Use the color scale to transform an element in the domain into a color.
+   * @param {string} The input string to map to a color.
+   * @return {string} The color corresponding to that input string.
+   * @throws Will error if input string is not in the scale's domain.
+   */
+  public scale(s: string): string {
+    if (!this.identifiers.has(s)) {
+      throw new Error('String was not in the domain.');
+    }
+    return this.identifiers.get(s) as string;
+  }
+}
+
+
+
+Polymer({
+  is: 'tf-color-scale',
+  properties: {
+    runs: {
+      type: Array,
+    },
+    outColorScale: {
+      type: Object,
+      readOnly: true,
+      notify: true,
+      value: function() {
+        return new ColorScale();
+      },
+    },
+  },
+  observers: ['updateColorScale(runs.*)'],
+  updateColorScale: function(runsChange) {
+    this.outColorScale.domain(this.runs);
+  },
+});
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScaleTests.ts b/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScaleTests.ts
new file mode 100644
index 0000000000..aa9c601385
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScaleTests.ts
@@ -0,0 +1,48 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+let assert = chai.assert;
+
+import {ColorScale} from './colorScale'
+
+describe('ColorScale', function() {
+  let ccs: ColorScale;
+
+  beforeEach(function() {
+    ccs = new ColorScale();
+  });
+
+  it('Returns consistent colors', function() {
+    ccs.domain(['train', 'eval', 'test']);
+    let trainColor = ccs.scale('train');
+    let trainColor2 = ccs.scale('train');
+    assert.equal(trainColor, trainColor2);
+  });
+
+  it('Returns consistent colors after new domain', function() {
+    ccs.domain(['train', 'eval']);
+    let trainColor = ccs.scale('train');
+    ccs.domain(['train', 'eval', 'test']);
+    let trainColor2 = ccs.scale('train');
+    assert.equal(trainColor, trainColor2);
+  });
+
+  it('Throws an error if string is not in the domain', function() {
+    ccs.domain(['red', 'yellow', 'green']);
+    assert.throws(function() {
+      ccs.scale('not in domain');
+    }, 'String was not in the domain.');
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/demo.html b/tensorflow/tensorboard/components/tf_color_scale_d3v4/demo.html
new file mode 100644
index 0000000000..341ce18452
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/demo.html
@@ -0,0 +1,93 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>tf-color-scale demo</title>
+<link rel="import" href="tf-color-scale.html">
+<link rel="import" href="iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="paper-styles/typography.html">
+<link rel="import" href="paper-button/paper-button.html">
+<script src="bundle.js"></script>
+
+<style> body {font-family: "Roboto";}</style>
+<demo-snippet>
+  <template>
+    <dom-module id="color-scale-demo">
+      <template>
+        <paper-button raised id="button" on-tap="change">Change Runs</paper-button>
+        <tf-color-scale runs="[[runs]]" out-color-scale="{{scale}}"></tf-color-scale>
+        <div class="container">
+          <template is="dom-repeat" items="[[runs]]">
+            <div class="row">
+              <div class="circle" style$=[[_makeStyle(item)]]></div>
+              <span>[[item]]</span>
+            </div>
+          </template>
+        </div>
+        <style>
+          .circle {
+            width: 20px;
+            height: 20px;
+            border-radius: 10px;
+            display: inline-block;
+          }
+          .row {
+            height: 35px;
+            width: 200px;
+            display: inline-block;
+          }
+          .container {
+            height: 200px;
+          }
+          #button {
+            margin: 20px;
+          }
+        </style>
+      </template>
+      <script>
+        let fellowship = ["aragorn", "legolas", "gimli", "frodo", 
+                          "gandalf", "boromir", "merry", "pippin", "sam"];
+        let gems = ["garnet", "amethyst", "pearl", "and steven!"];
+        let numbers = d3.range(30).map(function(x) {return x.toString();});
+        let examples = [numbers, fellowship, gems];
+        Polymer({
+          is: "color-scale-demo",
+          properties: {
+            runs: {
+              type: Array,
+              value: examples[0],
+            },
+            i: {
+              type: Number,
+              value: 0,
+            },
+          },
+          _makeStyle: function(item) {
+            return "background-color: " + this.scale.scale(item);
+          },
+          change: function() {
+            this.i = (this.i + 1) % 3;
+            this.runs = examples[this.i];
+          },
+        });
+      </script>
+    </dom-module>
+    <color-scale-demo id="demo"></color-scale-demo>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/palettes.ts b/tensorflow/tensorboard/components/tf_color_scale_d3v4/palettes.ts
new file mode 100644
index 0000000000..ce42a11545
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/palettes.ts
@@ -0,0 +1,76 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+export const palettes = {
+  googleStandard: [
+    '#db4437',  // google red 500
+    '#ff7043',  // deep orange 400
+    '#f4b400',  // google yellow 500
+    '#0f9d58',  // google green 500
+    '#00796b',  // teal 700
+    '#00acc1',  // cyan 600
+    '#4285f4',  // google blue 500
+    '#5c6bc0',  // indigo 400
+    '#ab47bc'   // purple 400
+  ],
+  googleCool: [
+    '#9e9d24',  // lime 800
+    '#0f9d58',  // google green 500
+    '#00796b',  // teal 700
+    '#00acc1',  // cyan 600
+    '#4285f4',  // google blue 500
+    '#5c6bc0',  // indigo 400
+    '#607d8b'   // blue gray 500
+  ],
+  googleWarm: [
+    '#795548',  // brown 500
+    '#ab47bc',  // purple 400
+    '#f06292',  // pink 300
+    '#c2185b',  // pink 700
+    '#db4437',  // google red 500
+    '#ff7043',  // deep orange 400
+    '#f4b400'   // google yellow 700
+  ],
+  googleColorBlindAssist: [
+    '#ff7043',  // orange
+    '#00ACC1',  // dark cyan
+    '#AB47BC',  // bright purple
+    '#2A56C6',  // dark blue
+    '#0b8043',  // green
+    '#F7CB4D',  // yellow
+    '#c0ca33',  // lime
+    '#5e35b1',  // purple
+    '#A52714',  // red
+  ],
+  // These palettes try to be better for color differentiation.
+  // https://personal.sron.nl/~pault/
+  colorBlindAssist1:
+      ['#4477aa', '#44aaaa', '#aaaa44', '#aa7744', '#aa4455', '#aa4488'],
+  colorBlindAssist2: [
+    '#88ccee', '#44aa99', '#117733', '#999933', '#ddcc77', '#cc6677', '#882255',
+    '#aa4499'
+  ],
+  colorBlindAssist3: [
+    '#332288', '#6699cc', '#88ccee', '#44aa99', '#117733', '#999933', '#ddcc77',
+    '#cc6677', '#aa4466', '#882255', '#661100', '#aa4499'
+  ],
+  // based on this palette: http://mkweb.bcgsc.ca/biovis2012/
+  colorBlindAssist4: [
+    '#FF6DB6', '#920000', '#924900', '#DBD100', '#24FF24', '#006DDB', '#490092'
+  ],
+  mldash: [
+    '#E47EAD', '#F4640D', '#FAA300', '#F5E636', '#00A077', '#0077B8', '#00B7ED'
+  ]
+};
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tests.html b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tests.html
new file mode 100644
index 0000000000..9a2a174349
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tests.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../web-component-tester/browser.js"></script>
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <link rel="import" href="../../tf-imports/d3.html">
+</head>
+<body>
+    <script src="../colorScale.js"></script>
+    <script src="../palettes.js"></script>
+    <script src="colorScaleTests.js"></script>
+</body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
new file mode 100644
index 0000000000..7d2cb8bafd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
@@ -0,0 +1,31 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+
+<!--
+tf-color-scale is a plumbing component that takes in an array of runs, and produces
+an upward-bindable outColorScale, which is a color scale mapping from those runs to
+a set of colors.
+
+@element tf-color-scale
+-->
+<dom-module id="tf-color-scale">
+  <script>
+
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/sorting.ts b/tensorflow/tensorboard/components/vz_sorting_d3v4/sorting.ts
new file mode 100644
index 0000000000..061184d24b
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/sorting.ts
@@ -0,0 +1,107 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * Compares tag names asciinumerically broken into components.
+ *
+ * <p>This is the comparison function used for sorting most string values in
+ * TensorBoard. Unlike the standard asciibetical comparator, this function
+ * knows that 'a10b' > 'a2b'. Fixed point and engineering notation are
+ * supported. This function also splits the input by slash and underscore to
+ * perform array comparison. Therefore it knows that 'a/a' < 'a+/a' even
+ * though '+' < '/' in the ASCII table.
+ */
+export function compareTagNames(a, b: string): number {
+  let ai = 0;
+  let bi = 0;
+  while (true) {
+    if (ai === a.length) {
+      return bi === b.length ? 0 : -1;
+    }
+    if (bi === b.length) {
+      return 1;
+    }
+    if (isDigit(a[ai]) && isDigit(b[bi])) {
+      const ais = ai;
+      const bis = bi;
+      ai = consumeNumber(a, ai + 1);
+      bi = consumeNumber(b, bi + 1);
+      const an = parseFloat(a.slice(ais, ai));
+      const bn = parseFloat(b.slice(bis, bi));
+      if (an < bn) {
+        return -1;
+      }
+      if (an > bn) {
+        return 1;
+      }
+      continue;
+    }
+    if (isBreak(a[ai])) {
+      if (!isBreak(b[bi])) {
+        return -1;
+      }
+    } else if (isBreak(b[bi])) {
+      return 1;
+    } else if (a[ai] < b[bi]) {
+      return -1;
+    } else if (a[ai] > b[bi]) {
+      return 1;
+    }
+    ai++;
+    bi++;
+  }
+}
+
+function consumeNumber(s: string, i: number): number {
+  enum State { NATURAL, REAL, EXPONENT_SIGN, EXPONENT }
+  let state = State.NATURAL;
+  for (; i < s.length; i++) {
+    if (state === State.NATURAL) {
+      if (s[i] === '.') {
+        state = State.REAL;
+      } else if (s[i] === 'e' || s[i] === 'E') {
+        state = State.EXPONENT_SIGN;
+      } else if (!isDigit(s[i])) {
+        break;
+      }
+    } else if (state === State.REAL) {
+      if (s[i] === 'e' || s[i] === 'E') {
+        state = State.EXPONENT_SIGN;
+      } else if (!isDigit(s[i])) {
+        break;
+      }
+    } else if (state === State.EXPONENT_SIGN) {
+      if (isDigit(s[i]) || s[i] === '+' || s[i] === '-') {
+        state = State.EXPONENT;
+      } else {
+        break;
+      }
+    } else if (state === State.EXPONENT) {
+      if (!isDigit(s[i])) {
+        break;
+      }
+    }
+  }
+  return i;
+}
+
+function isDigit(c: string): boolean {
+  return '0' <= c && c <= '9';
+}
+
+function isBreak(c: string): boolean {
+  // TODO(jart): Remove underscore when people stop using it like a slash.
+  return c === '/' || c === '_' || isDigit(c);
+}
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/sortingTests.ts b/tensorflow/tensorboard/components/vz_sorting_d3v4/sortingTests.ts
new file mode 100644
index 0000000000..4cfbfeb4ea
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/sortingTests.ts
@@ -0,0 +1,78 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {compareTagNames} from './sorting';
+
+const assert = chai.assert;
+
+describe('compareTagNames', () => {
+
+  const sortTagNames = (a) => a.sort(compareTagNames);
+
+  it('is asciibetical', () => {
+    assert.deepEqual(sortTagNames(['a', 'b']), ['a', 'b']);
+    assert.deepEqual(sortTagNames(['a', 'B']), ['B', 'a']);
+  });
+
+  it('sorts integer portions', () => {
+    assert.deepEqual(['03', '1'].sort(), ['03', '1']);
+    assert.deepEqual(sortTagNames(['03', '1']), ['1', '03']);
+    assert.deepEqual(sortTagNames(['a03', 'a1']), ['a1', 'a03']);
+    assert.deepEqual(sortTagNames(['a03', 'b1']), ['a03', 'b1']);
+    assert.deepEqual(sortTagNames(['x0a03', 'x0a1']), ['x0a1', 'x0a03']);
+    assert.deepEqual(sortTagNames(['a/b/03', 'a/b/1']), ['a/b/1', 'a/b/03']);
+  });
+
+  it('sorts fixed point numbers', () => {
+    assert.deepEqual(sortTagNames(['a0.1', 'a0.01']), ['a0.01', 'a0.1']);
+  });
+
+  it('sorts engineering notation', () => {
+    assert.deepEqual(sortTagNames(['a1e9', 'a9e8']), ['a9e8', 'a1e9']);
+    assert.deepEqual(sortTagNames(['a1e+9', 'a9e+8']), ['a9e+8', 'a1e+9']);
+    assert.deepEqual(sortTagNames(['a1e+5', 'a9e-6']), ['a9e-6', 'a1e+5']);
+    assert.deepEqual(sortTagNames(['a1.0e9', 'a9.0e8']), ['a9.0e8', 'a1.0e9']);
+    assert.deepEqual(
+        sortTagNames(['a1.0e+9', 'a9.0e+8']), ['a9.0e+8', 'a1.0e+9']);
+  });
+
+  it('is componentized by slash', () => {
+    assert.deepEqual(['a+/a', 'a/a', 'ab/a'].sort(), ['a+/a', 'a/a', 'ab/a']);
+    assert.deepEqual(
+        sortTagNames(['a+/a', 'a/a', 'ab/a']), ['a/a', 'a+/a', 'ab/a']);
+  });
+
+  it('is componentized by underscore', () => {
+    assert.deepEqual(
+        sortTagNames(['a+_a', 'a_a', 'ab_a']), ['a_a', 'a+_a', 'ab_a']);
+    assert.deepEqual(
+        sortTagNames(['a+/a', 'a_a', 'ab_a']), ['a_a', 'a+/a', 'ab_a']);
+  });
+
+  it('is componentized by number boundaries', () => {
+    assert.deepEqual(
+        sortTagNames(['a+0a', 'a0a', 'ab0a']), ['a0a', 'a+0a', 'ab0a']);
+  });
+
+  it('empty comes first', () => {
+    assert.deepEqual(sortTagNames(['a', '//', '/', '']), ['', '/', '//', 'a']);
+  });
+
+  it('decimal parsed correctly', () => {
+    assert.deepEqual(sortTagNames(['0.2', '0.03']), ['0.03', '0.2']);
+    assert.deepEqual(sortTagNames(['0..2', '0..03']), ['0..2', '0..03']);
+    assert.deepEqual(sortTagNames(['.2', '.03']), ['.2', '.03']);
+  });
+});
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/tests.html b/tensorflow/tensorboard/components/vz_sorting_d3v4/tests.html
new file mode 100644
index 0000000000..7148bfb418
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/tests.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta charset="utf-8">
+<script src="../../web-component-tester/browser.js"></script>
+<body>
+<script src="../sorting.js"></script>
+<script src="sortingTests.js"></script>
-- 
GitLab


From 84fe4b527ea51fb674f99c3c418bfe9d74dade98 Mon Sep 17 00:00:00 2001
From: Zongheng Yang <zongheng@google.com>
Date: Tue, 25 Apr 2017 15:53:47 -0800
Subject: [PATCH 0684/1563] tensor_bundle: remove an excessively intrusive
 CHECK().

Before this change, the BundleWriter dtor CHECK against whether a file handle
is properly closed (hence nullptr).  However, there exists legitimate scenarios
where this file handle could not be created in the first place, which can
happen in BundleWriter ctor.  In such failure cases, the right thing to do is
for the status() method to propagate any errors upstream, instead of a
CHECK-failure.

This change thus removes the dtor and relies on RAII-style cleanup of the
members.
Change: 154240283
---
 tensorflow/core/util/tensor_bundle/tensor_bundle.cc | 2 --
 tensorflow/core/util/tensor_bundle/tensor_bundle.h  | 1 -
 2 files changed, 3 deletions(-)

diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
index 80a910e689..5c2bda4770 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.cc
@@ -263,8 +263,6 @@ BundleWriter::BundleWriter(Env* env, StringPiece prefix)
   VLOG(1) << "Writing to file " << tmp_data_path_;
 }
 
-BundleWriter::~BundleWriter() { CHECK(out_ == nullptr); }
-
 Status BundleWriter::Add(StringPiece key, const Tensor& val) {
   if (!status_.ok()) return status_;
   CHECK_NE(key, kHeaderEntryKey);
diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.h b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
index 676bfe4df6..3ca243966f 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.h
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
@@ -108,7 +108,6 @@ extern const char* const kHeaderEntryKey;
 class BundleWriter {
  public:
   BundleWriter(Env* env, StringPiece prefix);
-  ~BundleWriter();
 
   // Adds the tensor "val" under key "key".
   // Across calls "key" must be unique but can be added in any order.
-- 
GitLab


From 7c4549bc393c0b8be2390e49528a8e207617d66e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 25 Apr 2017 17:01:59 -0800
Subject: [PATCH 0685/1563] Automated rollback of change 154225030 Change:
 154247352

---
 tensorflow/python/debug/BUILD                 |  36 ++
 tensorflow/python/debug/cli/cli_shared.py     |  10 +
 .../python/debug/cli/cli_shared_test.py       |  15 +
 tensorflow/python/debug/cli/command_parser.py |  25 +-
 .../python/debug/cli/command_parser_test.py   |  19 +
 .../python/debug/cli/profile_analyzer_cli.py  | 459 ++++++++++++++++++
 .../debug/cli/profile_analyzer_cli_test.py    | 264 ++++++++++
 tensorflow/python/debug/lib/source_utils.py   |   4 +-
 .../python/debug/lib/source_utils_test.py     |   8 +-
 9 files changed, 831 insertions(+), 9 deletions(-)
 create mode 100644 tensorflow/python/debug/cli/profile_analyzer_cli.py
 create mode 100644 tensorflow/python/debug/cli/profile_analyzer_cli_test.py

diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index f7e17f1c53..2c8fa53501 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -147,6 +147,22 @@ py_library(
     ],
 )
 
+py_library(
+    name = "profile_analyzer_cli",
+    srcs = ["cli/profile_analyzer_cli.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":cli_shared",
+        ":command_parser",
+        ":debug_data",
+        ":debugger_cli_common",
+        ":source_utils",
+        ":ui_factory",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+    ],
+)
+
 py_library(
     name = "stepper_cli",
     srcs = ["cli/stepper_cli.py"],
@@ -241,6 +257,7 @@ py_library(
         ":debug_data",
         ":debugger_cli_common",
         ":framework",
+        ":profile_analyzer_cli",
         ":stepper_cli",
         ":ui_factory",
     ],
@@ -606,6 +623,25 @@ cuda_py_test(
     ],
 )
 
+py_test(
+    name = "profile_analyzer_cli_test",
+    size = "small",
+    srcs = [
+        "cli/profile_analyzer_cli_test.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":command_parser",
+        ":profile_analyzer_cli",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 cuda_py_test(
     name = "stepper_cli_test",
     size = "small",
diff --git a/tensorflow/python/debug/cli/cli_shared.py b/tensorflow/python/debug/cli/cli_shared.py
index 8ff0916761..3deb6dbad6 100644
--- a/tensorflow/python/debug/cli/cli_shared.py
+++ b/tensorflow/python/debug/cli/cli_shared.py
@@ -17,6 +17,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import math
+
 import numpy as np
 import six
 
@@ -73,6 +75,14 @@ def bytes_to_readable_str(num_bytes, include_b=False):
   return result
 
 
+def time_to_readable_str(value):
+  if not value:
+    return "0"
+  suffixes = ["us", "ms", "s"]
+  order = min(len(suffixes) - 1, int(math.log(value, 10) / 3))
+  return "{:.3g}{}".format(value / math.pow(10.0, 3*order), suffixes[order])
+
+
 def parse_ranges_highlight(ranges_string):
   """Process ranges highlight string.
 
diff --git a/tensorflow/python/debug/cli/cli_shared_test.py b/tensorflow/python/debug/cli/cli_shared_test.py
index 1ef3c34254..fde1d66998 100644
--- a/tensorflow/python/debug/cli/cli_shared_test.py
+++ b/tensorflow/python/debug/cli/cli_shared_test.py
@@ -70,6 +70,21 @@ class BytesToReadableStrTest(test_util.TensorFlowTestCase):
             1024**3, include_b=True))
 
 
+class TimeToReadableStrTest(test_util.TensorFlowTestCase):
+
+  def testNoneTimeWorks(self):
+    self.assertEqual("0", cli_shared.time_to_readable_str(None))
+
+  def testMicrosecondsTime(self):
+    self.assertEqual("40us", cli_shared.time_to_readable_str(40))
+
+  def testMillisecondTime(self):
+    self.assertEqual("40ms", cli_shared.time_to_readable_str(40e3))
+
+  def testSecondTime(self):
+    self.assertEqual("40s", cli_shared.time_to_readable_str(40e6))
+
+
 class GetRunStartIntroAndDescriptionTest(test_util.TensorFlowTestCase):
 
   def setUp(self):
diff --git a/tensorflow/python/debug/cli/command_parser.py b/tensorflow/python/debug/cli/command_parser.py
index a71982f86a..143c104519 100644
--- a/tensorflow/python/debug/cli/command_parser.py
+++ b/tensorflow/python/debug/cli/command_parser.py
@@ -18,7 +18,6 @@ from __future__ import division
 from __future__ import print_function
 
 import ast
-from collections import namedtuple
 import re
 import sys
 
@@ -29,8 +28,28 @@ _WHITESPACE_PATTERN = re.compile(r"\s+")
 
 _NUMBER_PATTERN = re.compile(r"[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?")
 
-Interval = namedtuple("Interval",
-                      ["start", "start_included", "end", "end_included"])
+
+class Interval(object):
+  """Represents an interval between a start and end value."""
+
+  def __init__(self, start, start_included, end, end_included):
+    self.start = start
+    self.start_included = start_included
+    self.end = end
+    self.end_included = end_included
+
+  def contains(self, value):
+    if value < self.start or value == self.start and not self.start_included:
+      return False
+    if value > self.end or value == self.end and not self.end_included:
+      return False
+    return True
+
+  def __eq__(self, other):
+    return (self.start == other.start and
+            self.start_included == other.start_included and
+            self.end == other.end and
+            self.end_included == other.end_included)
 
 
 def parse_command(command):
diff --git a/tensorflow/python/debug/cli/command_parser_test.py b/tensorflow/python/debug/cli/command_parser_test.py
index ab9b3245dc..1ea890be8c 100644
--- a/tensorflow/python/debug/cli/command_parser_test.py
+++ b/tensorflow/python/debug/cli/command_parser_test.py
@@ -490,6 +490,25 @@ class ParseInterval(test_util.TensorFlowTestCase):
         "equal to end of interval."):
       command_parser.parse_memory_interval("[5k, 3k]")
 
+  def testIntervalContains(self):
+    interval = command_parser.Interval(
+        start=1, start_included=True, end=10, end_included=True)
+    self.assertTrue(interval.contains(1))
+    self.assertTrue(interval.contains(10))
+    self.assertTrue(interval.contains(5))
+
+    interval.start_included = False
+    self.assertFalse(interval.contains(1))
+    self.assertTrue(interval.contains(10))
+
+    interval.end_included = False
+    self.assertFalse(interval.contains(1))
+    self.assertFalse(interval.contains(10))
+
+    interval.start_included = True
+    self.assertTrue(interval.contains(1))
+    self.assertFalse(interval.contains(10))
+
 
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
new file mode 100644
index 0000000000..42440521eb
--- /dev/null
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli.py
@@ -0,0 +1,459 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Formats and displays profiling information."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import os
+import re
+
+from tensorflow.python.debug.cli import cli_shared
+from tensorflow.python.debug.cli import command_parser
+from tensorflow.python.debug.cli import debugger_cli_common
+from tensorflow.python.debug.cli import ui_factory
+from tensorflow.python.debug.lib import source_utils
+
+
+SORT_OPS_BY_OP_NAME = "node"
+SORT_OPS_BY_OP_TIME = "op_time"
+SORT_OPS_BY_EXEC_TIME = "exec_time"
+SORT_OPS_BY_START_TIME = "start_time"
+SORT_OPS_BY_LINE = "line"
+
+
+class ProfileDatum(object):
+  """Profile data point."""
+
+  def __init__(self, node_exec_stats, file_line, op_type):
+    """Constructor.
+
+    Args:
+      node_exec_stats: `NodeExecStats` proto.
+      file_line: A `string` formatted as <file_name>:<line_number>.
+      op_type: (string) Operation type.
+    """
+    self.node_exec_stats = node_exec_stats
+    self.file_line = file_line
+    self.op_type = op_type
+    self.op_time = (self.node_exec_stats.op_end_rel_micros -
+                    self.node_exec_stats.op_start_rel_micros)
+
+  @property
+  def exec_time(self):
+    """Measures compute function exection time plus pre- and post-processing."""
+    return self.node_exec_stats.all_end_rel_micros
+
+
+class ProfileDataTableView(object):
+  """Table View of profiling data."""
+
+  def __init__(self, profile_datum_list):
+    """Constructor.
+
+    Args:
+      profile_datum_list: List of `ProfileDatum` objects.
+    """
+    self._profile_datum_list = profile_datum_list
+    self.formatted_op_time = [
+        cli_shared.time_to_readable_str(datum.op_time)
+        for datum in profile_datum_list]
+    self.formatted_exec_time = [
+        cli_shared.time_to_readable_str(
+            datum.node_exec_stats.all_end_rel_micros)
+        for datum in profile_datum_list]
+    self._column_sort_ids = [SORT_OPS_BY_OP_NAME, SORT_OPS_BY_OP_TIME,
+                             SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE]
+
+  def value(self, row, col):
+    if col == 0:
+      return self._profile_datum_list[row].node_exec_stats.node_name
+    elif col == 1:
+      return self.formatted_op_time[row]
+    elif col == 2:
+      return self.formatted_exec_time[row]
+    elif col == 3:
+      return self._profile_datum_list[row].file_line
+    else:
+      raise IndexError("Invalid column index %d." % col)
+
+  def row_count(self):
+    return len(self._profile_datum_list)
+
+  def column_count(self):
+    return 4
+
+  def column_names(self):
+    return ["Node", "Op Time", "Exec Time", "Filename:Lineno(function)"]
+
+  def column_sort_id(self, col):
+    return self._column_sort_ids[col]
+
+
+def _list_profile_filter(
+    profile_datum, node_name_regex, file_name_regex, op_type_regex,
+    op_time_interval, exec_time_interval):
+  """Filter function for list_profile command.
+
+  Args:
+    profile_datum: A `ProfileDatum` object.
+    node_name_regex: Regular expression pattern object to filter by name.
+    file_name_regex: Regular expression pattern object to filter by file.
+    op_type_regex: Regular expression pattern object to filter by op type.
+    op_time_interval: `Interval` for filtering op time.
+    exec_time_interval: `Interval` for filtering exec time.
+
+  Returns:
+    True if profile_datum should be included.
+  """
+  if not node_name_regex.match(
+      profile_datum.node_exec_stats.node_name):
+    return False
+  if profile_datum.file_line is not None and not file_name_regex.match(
+      profile_datum.file_line):
+    return False
+  if profile_datum.op_type is not None and not op_type_regex.match(
+      profile_datum.op_type):
+    return False
+  if op_time_interval is not None and not op_time_interval.contains(
+      profile_datum.op_time):
+    return False
+  if exec_time_interval and not exec_time_interval.contains(
+      profile_datum.node_exec_stats.all_end_rel_micros):
+    return False
+  return True
+
+
+def _list_profile_sort_key(profile_datum, sort_by):
+  """Get a profile_datum property to sort by in list_profile command.
+
+  Args:
+    profile_datum: A `ProfileDatum` object.
+    sort_by: (string) indicates a value to sort by.
+      Must be one of SORT_BY* constants.
+
+  Returns:
+    profile_datum property to sort by.
+  """
+  if sort_by == SORT_OPS_BY_OP_NAME:
+    return profile_datum.node_exec_stats.node_name
+  elif sort_by == SORT_OPS_BY_LINE:
+    return profile_datum.file_line
+  elif sort_by == SORT_OPS_BY_OP_TIME:
+    return profile_datum.op_time
+  elif sort_by == SORT_OPS_BY_EXEC_TIME:
+    return profile_datum.node_exec_stats.all_end_rel_micros
+  else:  # sort by start time
+    return profile_datum.node_exec_stats.all_start_micros
+
+
+class ProfileAnalyzer(object):
+  """Analyzer for profiling data."""
+
+  def __init__(self, graph, run_metadata):
+    """ProfileAnalyzer constructor.
+
+    Args:
+      graph: (tf.Graph) Python graph object.
+      run_metadata: A `RunMetadata` protobuf object.
+
+    Raises:
+      ValueError: If run_metadata is None.
+    """
+    self._graph = graph
+    if not run_metadata:
+      raise ValueError("No RunMetadata passed for profile analysis.")
+    self._run_metadata = run_metadata
+    self._arg_parsers = {}
+    ap = argparse.ArgumentParser(
+        description="List nodes profile information.",
+        usage=argparse.SUPPRESS)
+    ap.add_argument(
+        "-d",
+        "--device_name_filter",
+        dest="device_name_filter",
+        type=str,
+        default="",
+        help="filter device name by regex.")
+    ap.add_argument(
+        "-n",
+        "--node_name_filter",
+        dest="node_name_filter",
+        type=str,
+        default="",
+        help="filter node name by regex.")
+    ap.add_argument(
+        "-t",
+        "--op_type_filter",
+        dest="op_type_filter",
+        type=str,
+        default="",
+        help="filter op type by regex.")
+    # TODO(annarev): allow file filtering at non-stack top position.
+    ap.add_argument(
+        "-f",
+        "--file_name_filter",
+        dest="file_name_filter",
+        type=str,
+        default="",
+        help="filter by file name at the top position of node's creation "
+             "stack that does not belong to TensorFlow library.")
+    ap.add_argument(
+        "-e",
+        "--execution_time",
+        dest="execution_time",
+        type=str,
+        default="",
+        help="Filter by execution time interval "
+             "(includes compute plus pre- and post -processing time). "
+             "Supported units are s, ms and us (default). "
+             "E.g. -e >100s, -e <100, -e [100us,1000ms]")
+    ap.add_argument(
+        "-o",
+        "--op_time",
+        dest="op_time",
+        type=str,
+        default="",
+        help="Filter by op time interval (only includes compute time). "
+             "Supported units are s, ms and us (default). "
+             "E.g. -e >100s, -e <100, -e [100us,1000ms]")
+    ap.add_argument(
+        "-s",
+        "--sort_by",
+        dest="sort_by",
+        type=str,
+        default=SORT_OPS_BY_START_TIME,
+        help=("the field to sort the data by: (%s | %s | %s | %s | %s)" %
+              (SORT_OPS_BY_OP_NAME, SORT_OPS_BY_START_TIME,
+               SORT_OPS_BY_OP_TIME, SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE)))
+    ap.add_argument(
+        "-r",
+        "--reverse",
+        dest="reverse",
+        action="store_true",
+        help="sort the data in reverse (descending) order")
+
+    self._arg_parsers["list_profile"] = ap
+
+  def list_profile(self, args, screen_info=None):
+    """Command handler for list_profile.
+
+    List per-operation profile information.
+
+    Args:
+      args: Command-line arguments, excluding the command prefix, as a list of
+        str.
+      screen_info: Optional dict input containing screen information such as
+        cols.
+
+    Returns:
+      Output text lines as a RichTextLines object.
+    """
+    del screen_info
+
+    parsed = self._arg_parsers["list_profile"].parse_args(args)
+    op_time_interval = (command_parser.parse_time_interval(parsed.op_time)
+                        if parsed.op_time else None)
+    exec_time_interval = (
+        command_parser.parse_time_interval(parsed.execution_time)
+        if parsed.execution_time else None)
+    node_name_regex = re.compile(parsed.node_name_filter)
+    file_name_regex = re.compile(parsed.file_name_filter)
+    op_type_regex = re.compile(parsed.op_type_filter)
+
+    output = debugger_cli_common.RichTextLines([""])
+    device_name_regex = re.compile(parsed.device_name_filter)
+    data_generator = self._get_profile_data_generator()
+    device_count = len(self._run_metadata.step_stats.dev_stats)
+    for index in range(device_count):
+      device_stats = self._run_metadata.step_stats.dev_stats[index]
+      if device_name_regex.match(device_stats.device):
+        profile_data = [
+            datum for datum in data_generator(device_stats)
+            if _list_profile_filter(
+                datum, node_name_regex, file_name_regex, op_type_regex,
+                op_time_interval, exec_time_interval)]
+        profile_data = sorted(
+            profile_data,
+            key=lambda datum: _list_profile_sort_key(datum, parsed.sort_by),
+            reverse=parsed.reverse)
+        output.extend(
+            self._get_list_profile_lines(
+                device_stats.device, index, device_count,
+                profile_data, parsed.sort_by, parsed.reverse))
+    return output
+
+  def _get_profile_data_generator(self):
+    """Get function that generates `ProfileDatum` objects.
+
+    Returns:
+      A function that generates `ProfileDatum` objects.
+    """
+    node_to_file_line = {}
+    node_to_op_type = {}
+    for op in self._graph.get_operations():
+      file_line = ""
+      for trace_entry in reversed(op.traceback):
+        filepath = trace_entry[0]
+        file_line = "%s:%d(%s)" % (
+            os.path.basename(filepath), trace_entry[1], trace_entry[2])
+        if not source_utils.guess_is_tensorflow_py_library(filepath):
+          break
+      node_to_file_line[op.name] = file_line
+      node_to_op_type[op.name] = op.type
+
+    def profile_data_generator(device_step_stats):
+      for node_stats in device_step_stats.node_stats:
+        if node_stats.node_name == "_SOURCE" or node_stats.node_name == "_SINK":
+          continue
+        yield ProfileDatum(
+            node_stats,
+            node_to_file_line.get(node_stats.node_name, ""),
+            node_to_op_type.get(node_stats.node_name, ""))
+    return profile_data_generator
+
+  def _get_list_profile_lines(
+      self, device_name, device_index, device_count,
+      profile_datum_list, sort_by, sort_reverse):
+    """Get `RichTextLines` object for list_profile command for a given device.
+
+    Args:
+      device_name: (string) Device name.
+      device_index: (int) Device index.
+      device_count: (int) Number of devices.
+      profile_datum_list: List of `ProfileDatum` objects.
+      sort_by: (string) Identifier of column to sort. Sort identifier
+          must match value of SORT_OPS_BY_OP_NAME, SORT_OPS_BY_EXEC_TIME,
+          SORT_OPS_BY_MEMORY or SORT_OPS_BY_LINE.
+      sort_reverse: (bool) Whether to sort in descending instead of default
+          (ascending) order.
+
+    Returns:
+      `RichTextLines` object containing a table that displays profiling
+      information for each op.
+    """
+    profile_data = ProfileDataTableView(profile_datum_list)
+
+    # Calculate total time early to calculate column widths.
+    total_op_time = sum(datum.op_time for datum in profile_datum_list)
+    total_exec_time = sum(datum.node_exec_stats.all_end_rel_micros
+                          for datum in profile_datum_list)
+    device_total_row = [
+        "Device Total", cli_shared.time_to_readable_str(total_op_time),
+        cli_shared.time_to_readable_str(total_exec_time)]
+
+    # Calculate column widths.
+    column_widths = [
+        len(column_name) for column_name in profile_data.column_names()]
+    for col in range(len(device_total_row)):
+      column_widths[col] = max(column_widths[col], len(device_total_row[col]))
+    for col in range(len(column_widths)):
+      for row in range(profile_data.row_count()):
+        column_widths[col] = max(
+            column_widths[col], len(str(profile_data.value(row, col))))
+      column_widths[col] += 2  # add margin between columns
+
+    # Add device name.
+    output = debugger_cli_common.RichTextLines(["-"*80])
+    device_row = "Device %d of %d: %s" % (
+        device_index + 1, device_count, device_name)
+    output.extend(debugger_cli_common.RichTextLines([device_row, ""]))
+
+    # Add headers.
+    base_command = "list_profile"
+    attr_segs = {0: []}
+    row = ""
+    for col in range(profile_data.column_count()):
+      column_name = profile_data.column_names()[col]
+      sort_id = profile_data.column_sort_id(col)
+      command = "%s -s %s" % (base_command, sort_id)
+      if sort_by == sort_id and not sort_reverse:
+        command += " -r"
+      curr_row = ("{:<%d}" % column_widths[col]).format(column_name)
+      prev_len = len(row)
+      row += curr_row
+      attr_segs[0].append(
+          (prev_len, prev_len + len(column_name),
+           [debugger_cli_common.MenuItem(None, command), "bold"]))
+
+    output.extend(
+        debugger_cli_common.RichTextLines([row], font_attr_segs=attr_segs))
+
+    # Add data rows.
+    for row in range(profile_data.row_count()):
+      row_str = ""
+      for col in range(profile_data.column_count()):
+        row_str += ("{:<%d}" % column_widths[col]).format(
+            profile_data.value(row, col))
+      output.extend(debugger_cli_common.RichTextLines([row_str]))
+
+    # Add stat totals.
+    row_str = ""
+    for col in range(len(device_total_row)):
+      row_str += ("{:<%d}" % column_widths[col]).format(device_total_row[col])
+    output.extend(debugger_cli_common.RichTextLines(""))
+    output.extend(debugger_cli_common.RichTextLines(row_str))
+    return output
+
+  def _measure_list_profile_column_widths(self, profile_data):
+    """Determine the maximum column widths for each data list.
+
+    Args:
+      profile_data: list of ProfileDatum objects.
+
+    Returns:
+      List of column widths in the same order as columns in data.
+    """
+    num_columns = len(profile_data.column_names())
+    widths = [len(column_name) for column_name in profile_data.column_names()]
+    for row in range(profile_data.row_count()):
+      for col in range(num_columns):
+        widths[col] = max(
+            widths[col], len(str(profile_data.row_values(row)[col])) + 2)
+    return widths
+
+  def get_help(self, handler_name):
+    return self._arg_parsers[handler_name].format_help()
+
+
+def create_profiler_ui(graph,
+                       run_metadata,
+                       ui_type="curses",
+                       on_ui_exit=None):
+  """Create an instance of CursesUI based on a `tf.Graph` and `RunMetadata`.
+
+  Args:
+    graph: Python `Graph` object.
+    run_metadata: A `RunMetadata` protobuf object.
+    ui_type: (str) requested UI type, e.g., "curses", "readline".
+    on_ui_exit: (`Callable`) the callback to be called when the UI exits.
+
+  Returns:
+    (base_ui.BaseUI) A BaseUI subtype object with a set of standard analyzer
+      commands and tab-completions registered.
+  """
+
+  analyzer = ProfileAnalyzer(graph, run_metadata)
+
+  cli = ui_factory.get_ui(ui_type, on_ui_exit=on_ui_exit)
+  cli.register_command_handler(
+      "list_profile",
+      analyzer.list_profile,
+      analyzer.get_help("list_profile"),
+      prefix_aliases=["lp"])
+
+  return cli
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
new file mode 100644
index 0000000000..6cc043e1cb
--- /dev/null
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
@@ -0,0 +1,264 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for profile_analyzer_cli."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import re
+
+from tensorflow.core.framework import step_stats_pb2
+from tensorflow.core.protobuf import config_pb2
+from tensorflow.python.client import session
+from tensorflow.python.debug.cli import profile_analyzer_cli
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import test_util
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import googletest
+from tensorflow.python.platform import test
+
+
+class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
+
+  def testNodeInfoEmpty(self):
+    graph = ops.Graph()
+    run_metadata = config_pb2.RunMetadata()
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+    prof_output = prof_analyzer.list_profile([]).lines
+    self.assertEquals([""], prof_output)
+
+  def testSingleDevice(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    node2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        op_start_rel_micros=1,
+        op_end_rel_micros=2,
+        all_end_rel_micros=3)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1, node2])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = "Add/123"
+    op1.traceback = [("a/b/file1", 10, "some_var")]
+    op1.type = "add"
+    op2 = test.mock.MagicMock()
+    op2.name = "Mul/456"
+    op2.traceback = [("a/b/file1", 11, "some_var")]
+    op2.type = "mul"
+    graph.get_operations.return_value = [op1, op2]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+    prof_output = prof_analyzer.list_profile([]).lines
+
+    self._assertAtLeastOneLineMatches(r"Device 1 of 1: deviceA", prof_output)
+    self._assertAtLeastOneLineMatches(r"^Add/123.*2us.*4us", prof_output)
+    self._assertAtLeastOneLineMatches(r"^Mul/456.*1us.*3us", prof_output)
+
+  def testMultipleDevices(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=3)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1])
+
+    device2 = run_metadata.step_stats.dev_stats.add()
+    device2.device = "deviceB"
+    device2.node_stats.extend([node1])
+
+    graph = test.mock.MagicMock()
+    op = test.mock.MagicMock()
+    op.name = "Add/123"
+    op.traceback = [("a/b/file1", 10, "some_var")]
+    op.type = "abc"
+    graph.get_operations.return_value = [op]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+    prof_output = prof_analyzer.list_profile([]).lines
+
+    self._assertAtLeastOneLineMatches(r"Device 1 of 2: deviceA", prof_output)
+    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
+
+    # Try filtering by device.
+    prof_output = prof_analyzer.list_profile(["-d", "deviceB"]).lines
+    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
+    self._assertNoLinesMatch(r"Device 1 of 2: deviceA", prof_output)
+
+  def testWithSession(self):
+    options = config_pb2.RunOptions()
+    options.trace_level = config_pb2.RunOptions.FULL_TRACE
+    run_metadata = config_pb2.RunMetadata()
+
+    with session.Session() as sess:
+      a = constant_op.constant([1, 2, 3])
+      b = constant_op.constant([2, 2, 1])
+      result = math_ops.add(a, b)
+
+      sess.run(result, options=options, run_metadata=run_metadata)
+
+      prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(
+          sess.graph, run_metadata)
+      prof_output = prof_analyzer.list_profile([]).lines
+
+      self._assertAtLeastOneLineMatches("Device 1 of", prof_output)
+      expected_headers = [
+          "Node", "Op Time", "Exec Time", r"Filename:Lineno\(function\)"]
+      self._assertAtLeastOneLineMatches(
+          ".*".join(expected_headers), prof_output)
+      self._assertAtLeastOneLineMatches(r"^Add/", prof_output)
+      self._assertAtLeastOneLineMatches(r"Device Total", prof_output)
+
+  def testSorting(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        all_start_micros=123,
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    node2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        all_start_micros=122,
+        op_start_rel_micros=1,
+        op_end_rel_micros=2,
+        all_end_rel_micros=5)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1, node2])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = "Add/123"
+    op1.traceback = [("a/b/file2", 10, "some_var")]
+    op1.type = "add"
+    op2 = test.mock.MagicMock()
+    op2.name = "Mul/456"
+    op2.traceback = [("a/b/file1", 11, "some_var")]
+    op2.type = "mul"
+    graph.get_operations.return_value = [op1, op2]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+
+    # Default sort by start time (i.e. all_start_micros).
+    prof_output = prof_analyzer.list_profile([]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
+    # Default sort in reverse.
+    prof_output = prof_analyzer.list_profile(["-r"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
+    # Sort by name.
+    prof_output = prof_analyzer.list_profile(["-s", "node"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
+    # Sort by op time (i.e. op_end_rel_micros - op_start_rel_micros).
+    prof_output = prof_analyzer.list_profile(["-s", "op_time"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
+    # Sort by exec time (i.e. all_end_rel_micros).
+    prof_output = prof_analyzer.list_profile(["-s", "exec_time"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Add/123.*Mul/456")
+    # Sort by line number.
+    prof_output = prof_analyzer.list_profile(["-s", "line"]).lines
+    self.assertRegexpMatches("".join(prof_output), r"Mul/456.*Add/123")
+
+  def testFiltering(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        all_start_micros=123,
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    node2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        all_start_micros=122,
+        op_start_rel_micros=1,
+        op_end_rel_micros=2,
+        all_end_rel_micros=5)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1, node2])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = "Add/123"
+    op1.traceback = [("a/b/file2", 10, "some_var")]
+    op1.type = "add"
+    op2 = test.mock.MagicMock()
+    op2.name = "Mul/456"
+    op2.traceback = [("a/b/file1", 11, "some_var")]
+    op2.type = "mul"
+    graph.get_operations.return_value = [op1, op2]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+
+    # Filter by name
+    prof_output = prof_analyzer.list_profile(["-n", "Add"]).lines
+    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
+    self._assertNoLinesMatch(r"Mul/456", prof_output)
+    # Filter by op_type
+    prof_output = prof_analyzer.list_profile(["-t", "mul"]).lines
+    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
+    self._assertNoLinesMatch(r"Add/123", prof_output)
+    # Filter by file name.
+    prof_output = prof_analyzer.list_profile(["-f", "file2"]).lines
+    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
+    self._assertNoLinesMatch(r"Mul/456", prof_output)
+    # Fitler by execution time.
+    prof_output = prof_analyzer.list_profile(["-e", "[5, 10]"]).lines
+    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
+    self._assertNoLinesMatch(r"Add/123", prof_output)
+    # Fitler by op time.
+    prof_output = prof_analyzer.list_profile(["-o", ">=2"]).lines
+    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
+    self._assertNoLinesMatch(r"Mul/456", prof_output)
+
+  def _atLeastOneLineMatches(self, pattern, lines):
+    pattern_re = re.compile(pattern)
+    for line in lines:
+      if pattern_re.match(line):
+        return True
+    return False
+
+  def _assertAtLeastOneLineMatches(self, pattern, lines):
+    if not self._atLeastOneLineMatches(pattern, lines):
+      raise AssertionError(
+          "%s does not match any line in %s." % (pattern, str(lines)))
+
+  def _assertNoLinesMatch(self, pattern, lines):
+    if self._atLeastOneLineMatches(pattern, lines):
+      raise AssertionError(
+          "%s matched at least one line in %s." % (pattern, str(lines)))
+
+
+if __name__ == "__main__":
+  googletest.main()
diff --git a/tensorflow/python/debug/lib/source_utils.py b/tensorflow/python/debug/lib/source_utils.py
index 580bdc054b..f610d05b83 100644
--- a/tensorflow/python/debug/lib/source_utils.py
+++ b/tensorflow/python/debug/lib/source_utils.py
@@ -44,7 +44,7 @@ def _convert_watch_key_to_tensor_name(watch_key):
   return watch_key[:watch_key.rfind(":")]
 
 
-def _guess_is_tensorflow_py_library(py_file_path):
+def guess_is_tensorflow_py_library(py_file_path):
   """Guess whether a Python source file is a part of the tensorflow library.
 
   Special cases:
@@ -231,7 +231,7 @@ def list_source_files_against_dump(dump,
   for file_path in path_to_node_names:
     output.append((
         file_path,
-        _guess_is_tensorflow_py_library(file_path),
+        guess_is_tensorflow_py_library(file_path),
         len(path_to_node_names.get(file_path, {})),
         len(path_to_tensor_names.get(file_path, {})),
         path_to_num_dumps.get(file_path, 0),
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index a4fb0d9910..f6195b6a5d 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -57,20 +57,20 @@ class GuessIsTensorFlowLibraryTest(test_util.TensorFlowTestCase):
 
   def testUnitTestFileReturnsFalse(self):
     self.assertFalse(
-        source_utils._guess_is_tensorflow_py_library(self.curr_file_path))
+        source_utils.guess_is_tensorflow_py_library(self.curr_file_path))
 
   def testSourceUtilModuleReturnsTrue(self):
     self.assertTrue(
-        source_utils._guess_is_tensorflow_py_library(source_utils.__file__))
+        source_utils.guess_is_tensorflow_py_library(source_utils.__file__))
 
   def testFileInPythonKernelsPathReturnsTrue(self):
     x = constant_op.constant(42.0, name="x")
     self.assertTrue(
-        source_utils._guess_is_tensorflow_py_library(x.op.traceback[-1][0]))
+        source_utils.guess_is_tensorflow_py_library(x.op.traceback[-1][0]))
 
   def testNonPythonFileRaisesException(self):
     with self.assertRaisesRegexp(ValueError, r"is not a Python source file"):
-      source_utils._guess_is_tensorflow_py_library(
+      source_utils.guess_is_tensorflow_py_library(
           os.path.join(os.path.dirname(self.curr_file_path), "foo.cc"))
 
 
-- 
GitLab


From 6fc08c69abe9d37e2bd3fd62460a1dc23d7c6791 Mon Sep 17 00:00:00 2001
From: Aaron Schumacher <ajschumacher@gmail.com>
Date: Tue, 25 Apr 2017 22:30:31 -0400
Subject: [PATCH 0686/1563] typo: "serialize" -> "serialized"

---
 tensorflow/python/ops/parsing_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/parsing_ops.py b/tensorflow/python/ops/parsing_ops.py
index b1994acdc4..796ea20eb7 100644
--- a/tensorflow/python/ops/parsing_ops.py
+++ b/tensorflow/python/ops/parsing_ops.py
@@ -845,7 +845,7 @@ def parse_single_sequence_example(
   Parses a single serialized [`SequenceExample`](https://www.tensorflow.org/code/tensorflow/core/example/example.proto)
   proto given in `serialized`.
 
-  This op parses a serialize sequence example into a tuple of dictionaries
+  This op parses a serialized sequence example into a tuple of dictionaries
   mapping keys to `Tensor` and `SparseTensor` objects respectively.
   The first dictionary contains mappings for keys appearing in
   `context_features`, and the second dictionary contains mappings for keys
-- 
GitLab


From f3ec1cc35f883f06ec917369d3229c61a1bd9b35 Mon Sep 17 00:00:00 2001
From: Xiang Gao <qasdfgtyuiop@gmail.com>
Date: Wed, 26 Apr 2017 00:29:19 -0400
Subject: [PATCH 0687/1563] add support for flat both inner and outer dims

---
 tensorflow/core/framework/tensor.cc      |  44 +++----
 tensorflow/core/framework/tensor.h       |  38 +++++-
 tensorflow/core/framework/tensor_test.cc | 155 +++++++++++++++++++++++
 3 files changed, 203 insertions(+), 34 deletions(-)

diff --git a/tensorflow/core/framework/tensor.cc b/tensorflow/core/framework/tensor.cc
index ecb9810d83..b11934a8a2 100644
--- a/tensorflow/core/framework/tensor.cc
+++ b/tensorflow/core/framework/tensor.cc
@@ -902,43 +902,31 @@ void Tensor::FillDescription(TensorDescription* description) const {
 }
 
 gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
-    int64 num_out_dims) const {
-  if (num_out_dims == dims()) {
-    return shape_.dim_sizes();
+    gtl::InlinedVector<int64, 4> orig, int64 num_out_dims) {
+  if (num_out_dims == orig.size()) {
+    return orig;
   }
   gtl::InlinedVector<int64, 4> out_dims(num_out_dims, 0);
-  const int64 num_elements = NumElements();
-  int64 prod_out_dims = 1;
-  for (int64 out_dim = num_out_dims - 1; out_dim > 0; --out_dim) {
-    const int64 in_dim = out_dim + (dims() - num_out_dims);
-    out_dims[out_dim] = (in_dim >= dims() || in_dim < 0) ? 1 : dim_size(in_dim);
-    prod_out_dims *= out_dims[out_dim];
-  }
-  if (prod_out_dims != 0) {
-    out_dims[0] = num_elements / prod_out_dims;
-  } else {
-    out_dims[0] = 0;
+  int64 offset = orig.size() - num_out_dims;
+  for (int64 out_dim = num_out_dims - 1; out_dim >= 0; --out_dim) {
+    const int64 in_dim = out_dim + offset;
+    out_dims[out_dim] = in_dim < 0 ? 1 : orig[in_dim];
   }
+  for (int64 in_dim = 0; in_dim < offset; ++in_dim)
+    out_dims[0] *= orig[in_dim];
   return out_dims;
 }
 
 gtl::InlinedVector<int64, 4> Tensor::ComputeFlatOuterDims(
-    int64 num_out_dims) const {
-  if (num_out_dims == dims()) {
-    return shape_.dim_sizes();
+    gtl::InlinedVector<int64, 4> orig, int64 num_out_dims) {
+  if (num_out_dims == orig.size()) {
+    return orig;
   }
   gtl::InlinedVector<int64, 4> out_dims(num_out_dims, 0);
-  const int64 num_elements = NumElements();
-  int64 prod_out_dims = 1;
-  for (int64 out_dim = 0; out_dim < num_out_dims - 1; ++out_dim) {
-    out_dims[out_dim] = out_dim >= dims() ? 1 : dim_size(out_dim);
-    prod_out_dims *= out_dims[out_dim];
-  }
-  if (prod_out_dims != 0) {
-    out_dims[num_out_dims - 1] = num_elements / prod_out_dims;
-  } else {
-    out_dims[num_out_dims - 1] = 0;
-  }
+  for (int64 out_dim = 0; out_dim <= num_out_dims - 1; ++out_dim)
+    out_dims[out_dim] = out_dim >= orig.size() ? 1 : orig[out_dim];
+  for (int64 in_dim = num_out_dims; in_dim < orig.size(); ++in_dim)
+    out_dims[num_out_dims - 1] *= orig[in_dim];
   return out_dims;
 }
 
diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 103da4c1b3..08508fab3b 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -304,6 +304,15 @@ class Tensor {
   template <typename T, size_t NDIMS = 2>
   typename TTypes<T, NDIMS>::Tensor flat_outer_dims();
 
+  /// Returns the data as an Eigen::Tensor with END-START dimensions, collapsing
+  /// Tensor dimensions of the first START into the first dimension of the
+  /// result and the Tensor dimensions of the last dims()-END into the last dimension
+  /// of the result. If START < 0 then the the |START| leading dimensions of size 1 will be
+  /// added. If END > dims() then END - dims() trailing dimensions of size 1 will be
+  /// added.
+  template <typename T, size_t BEGIN, size_t END>
+  typename TTypes<T, END-BEGIN>::Tensor flat_inner_outer_dims();
+
   template <typename T, size_t NDIMS>
   typename TTypes<T, NDIMS>::Tensor shaped(gtl::ArraySlice<int64> new_sizes);
 
@@ -386,6 +395,9 @@ class Tensor {
   template <typename T, size_t NDIMS = 2>
   typename TTypes<T, NDIMS>::ConstTensor flat_outer_dims() const;
 
+  template <typename T, size_t BEGIN, size_t END>
+  typename TTypes<T, END-BEGIN>::Tensor flat_inner_outer_dims() const;
+
   /// Render the first `max_entries` values in `*this` into a string.
   string SummarizeValue(int64 max_entries) const;
 
@@ -431,8 +443,10 @@ class Tensor {
 
   // TODO(rmlarsen): These shouldn't hardcode '4' so that it lines up with
   // TensorShape's InlineVector.
-  gtl::InlinedVector<int64, 4> ComputeFlatInnerDims(int64 num_out_dims) const;
-  gtl::InlinedVector<int64, 4> ComputeFlatOuterDims(int64 num_out_dims) const;
+  static gtl::InlinedVector<int64, 4> ComputeFlatInnerDims(
+      gtl::InlinedVector<int64, 4> orig, int64 num_out_dims);
+  static gtl::InlinedVector<int64, 4> ComputeFlatOuterDims(
+      gtl::InlinedVector<int64, 4> orig, int64 num_out_dims);
 
   TensorShape shape_;
   TensorBuffer* buf_;
@@ -638,22 +652,34 @@ typename TTypes<T>::ConstScalar Tensor::scalar() const {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_dims() {
-  return shaped<T, NDIMS>(ComputeFlatInnerDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(shape_.dim_sizes(), NDIMS));
 }
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_outer_dims() {
-  return shaped<T, NDIMS>(ComputeFlatOuterDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatOuterDims(shape_.dim_sizes(), NDIMS));
+}
+
+template <typename T, size_t BEGIN, size_t END>
+typename TTypes<T, END-BEGIN>::Tensor Tensor::flat_inner_outer_dims() {
+  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), END);
+  return shaped<T, END-BEGIN>(ComputeFlatInnerDims(o, END-BEGIN));
 }
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_inner_dims() const {
-  return shaped<T, NDIMS>(ComputeFlatInnerDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(shape_.dim_sizes(), NDIMS));
 }
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_outer_dims() const {
-  return shaped<T, NDIMS>(ComputeFlatOuterDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatOuterDims(shape_.dim_sizes(), NDIMS));
+}
+
+template <typename T, size_t BEGIN, size_t END>
+typename TTypes<T, END-BEGIN>::Tensor Tensor::flat_inner_outer_dims() const {
+  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), END);
+  return shaped<T, END-BEGIN>(ComputeFlatInnerDims(o, END-BEGIN));
 }
 
 inline Tensor::Tensor(const Tensor& other)
diff --git a/tensorflow/core/framework/tensor_test.cc b/tensorflow/core/framework/tensor_test.cc
index c907bbb69f..8f6d397607 100644
--- a/tensorflow/core/framework/tensor_test.cc
+++ b/tensorflow/core/framework/tensor_test.cc
@@ -218,12 +218,14 @@ TEST(Tensor_Float, Reshape) {
     tensor(1, 2, 3, 4) = 0.02f;
   }
   {
+    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 1>({120});
     EXPECT_EQ(120, shaped.dimension(0));
     EXPECT_EQ(shaped(0), 0.01f);
     EXPECT_EQ(shaped(119), 0.02f);
   }
   {
+    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 2>({6, 20});
     EXPECT_EQ(6, shaped.dimension(0));
     EXPECT_EQ(20, shaped.dimension(1));
@@ -231,6 +233,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(shaped(5, 19), 0.02f);
   }
   {
+    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 3>({6, 4, 5});
     EXPECT_EQ(6, shaped.dimension(0));
     EXPECT_EQ(4, shaped.dimension(1));
@@ -239,6 +242,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(shaped(5, 3, 4), 0.02f);
   }
   {
+    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 4>({2, 3, 4, 5});
     EXPECT_EQ(2, shaped.dimension(0));
     EXPECT_EQ(3, shaped.dimension(1));
@@ -249,6 +253,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(shaped(1, 2, 3, 4), 0.02f);
   }
   {
+    LOG(INFO) << "flat";
     auto flat = t.flat<float>();
     EXPECT_EQ(flat(0), 0.01f);
     EXPECT_EQ(120, flat.dimension(0));
@@ -256,6 +261,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat(119), 0.02f);
   }
   {
+    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = t.flat_inner_dims<float>();
     EXPECT_EQ(24, flat_inner_dims.dimension(0));
     EXPECT_EQ(5, flat_inner_dims.dimension(1));
@@ -263,6 +269,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(23, 4), 0.02f);
   }
   {
+    LOG(INFO) << "flat_outer_dims";
     auto flat_outer_dims = t.flat_outer_dims<float>();
     EXPECT_EQ(2, flat_outer_dims.dimension(0));
     EXPECT_EQ(60, flat_outer_dims.dimension(1));
@@ -270,6 +277,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_outer_dims(1, 59), 0.02f);
   }
   {
+    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = t.flat_inner_dims<float, 3>();
     EXPECT_EQ(6, flat_inner_dims.dimension(0));
     EXPECT_EQ(4, flat_inner_dims.dimension(1));
@@ -278,6 +286,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(5, 3, 4), 0.02f);
   }
   {
+    LOG(INFO) << "flat_outer_dims";
     auto flat_outer_dims = t.flat_outer_dims<float, 3>();
     EXPECT_EQ(2, flat_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_outer_dims.dimension(1));
@@ -286,6 +295,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_outer_dims(1, 2, 19), 0.02f);
   }
   {
+    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = t.flat_inner_dims<float, 5>();
     EXPECT_EQ(1, flat_inner_dims.dimension(0));
     EXPECT_EQ(2, flat_inner_dims.dimension(1));
@@ -296,6 +306,7 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(0, 1, 2, 3, 4), 0.02f);
   }
   {
+    LOG(INFO) << "flat_outer_dims";
     auto flat_outer_dims = t.flat_outer_dims<float, 5>();
     EXPECT_EQ(2, flat_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_outer_dims.dimension(1));
@@ -305,20 +316,119 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_outer_dims(0, 0, 0, 0, 0), 0.01f);
     EXPECT_EQ(flat_outer_dims(1, 2, 3, 4, 0), 0.02f);
   }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 0, 4>();
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(1, 2, 3, 4), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, -2, 4>();
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(5));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 3, 4), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 0, 6>();
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(5));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(1, 2, 3, 4, 0, 0), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, -2, 6>();
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(5));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(6));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(7));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 3, 4, 0, 0), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 1, 4>();
+    EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(5, 3, 4), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 1, 6>();
+    EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(5, 3, 4, 0, 0), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 0, 3>();
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(20, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(1, 2, 19), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, -2, 3>();
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(20, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 19), 0.02f);
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 1, 3>();
+    EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(20, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(5, 19), 0.02f);
+  }
 
   Tensor zero_t(DT_FLOAT, TensorShape({3, 0, 2, 0, 5}));
   {
+    LOG(INFO) << "flat_outer_dims";
     auto flat_outer_dims = zero_t.flat_outer_dims<float>();
     EXPECT_EQ(3, flat_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_outer_dims.dimension(1));
   }
   {
+    LOG(INFO) << "flat_outer_dims";
     auto flat_outer_dims = zero_t.flat_outer_dims<float, 3>();
     EXPECT_EQ(3, flat_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_outer_dims.dimension(1));
     EXPECT_EQ(0, flat_outer_dims.dimension(2));
   }
   {
+    LOG(INFO) << "flat_outer_dims";
     auto flat_outer_dims = zero_t.flat_outer_dims<float, 5>();
     EXPECT_EQ(3, flat_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_outer_dims.dimension(1));
@@ -327,17 +437,20 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(5, flat_outer_dims.dimension(4));
   }
   {
+    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = zero_t.flat_inner_dims<float>();
     EXPECT_EQ(0, flat_inner_dims.dimension(0));
     EXPECT_EQ(5, flat_inner_dims.dimension(1));
   }
   {
+    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = zero_t.flat_inner_dims<float, 3>();
     EXPECT_EQ(0, flat_inner_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_dims.dimension(1));
     EXPECT_EQ(5, flat_inner_dims.dimension(2));
   }
   {
+    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = zero_t.flat_inner_dims<float, 5>();
     EXPECT_EQ(3, flat_inner_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_dims.dimension(1));
@@ -345,6 +458,48 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(0, flat_inner_dims.dimension(3));
     EXPECT_EQ(5, flat_inner_dims.dimension(4));
   }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 0, 2>();
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 0, 3>();
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(2));
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 0, 5>();
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(4));
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3, 5>();
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(1));
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2, 5>();
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
+  }
+  {
+    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 1, 4>();
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(2));
+  }
 }
 
 TEST(Tensor_Scalar, Basics) {
-- 
GitLab


From eb6d9d9685c0a4be542522acf5cb3f6226a7858a Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Tue, 25 Apr 2017 20:01:20 -0800
Subject: [PATCH 0688/1563] tfdbg: add thread_name_filter to all existing
 session wrappers and hooks Change: 154257269

---
 .../docs_src/programmers_guide/debugger.md    | 19 +++++
 .../python/debug/wrappers/dumping_wrapper.py  | 12 +++-
 .../debug/wrappers/dumping_wrapper_test.py    | 20 ++++++
 tensorflow/python/debug/wrappers/framework.py | 30 +++++++-
 .../python/debug/wrappers/framework_test.py   | 71 +++++++++++++++++--
 .../python/debug/wrappers/grpc_wrapper.py     |  6 +-
 tensorflow/python/debug/wrappers/hooks.py     | 29 +++++++-
 .../debug/wrappers/local_cli_wrapper.py       |  8 ++-
 8 files changed, 180 insertions(+), 15 deletions(-)

diff --git a/tensorflow/docs_src/programmers_guide/debugger.md b/tensorflow/docs_src/programmers_guide/debugger.md
index 10eebf6f42..7801fadb47 100644
--- a/tensorflow/docs_src/programmers_guide/debugger.md
+++ b/tensorflow/docs_src/programmers_guide/debugger.md
@@ -409,6 +409,25 @@ python -m tensorflow.python.debug.examples.debug_errors \
     --error uninitialized_variable --debug
 ```
 
+**Q**: _How can I let my tfdbg-wrapped Sessions or Hooks run the debug mode
+only from the main thread?_
+
+**A**:
+This is a common use case, in which the `Session` object is used from multiple
+threads concurrently. Typically, the child threads take care of background tasks
+such as running enqueue operations. Oftentimes, you want to debug only the main
+thread (or less frequently, only one of the child threads). You can use the
+`thread_name_filter` keyword argument of `LocalCLIDebugWrapperSession` to
+achieve this type of thread-selective debugging. For example, if you would like
+to debug from only the main thread, you can do:
+
+```python
+sess = tf_debug.LocalCLIDebugWrapperSession(sess, thread_name_filter="MainThread$")
+```
+
+The above example relies on the fact that main threads in Python have the
+default name `MainThread`.
+
 **Q**: _The model I am debugging is very large. The data dumped by tfdbg
 fills up the free space of my disk. What can I do?_
 
diff --git a/tensorflow/python/debug/wrappers/dumping_wrapper.py b/tensorflow/python/debug/wrappers/dumping_wrapper.py
index 15f30e6f97..0d9b3cfa7e 100644
--- a/tensorflow/python/debug/wrappers/dumping_wrapper.py
+++ b/tensorflow/python/debug/wrappers/dumping_wrapper.py
@@ -31,7 +31,12 @@ from tensorflow.python.platform import gfile
 class DumpingDebugWrapperSession(framework.NonInteractiveDebugWrapperSession):
   """Debug Session wrapper that dumps debug data to filesystem."""
 
-  def __init__(self, sess, session_root, watch_fn=None, log_usage=True):
+  def __init__(self,
+               sess,
+               session_root,
+               watch_fn=None,
+               thread_name_filter=None,
+               log_usage=True):
     """Constructor of DumpingDebugWrapperSession.
 
     Args:
@@ -48,6 +53,9 @@ class DumpingDebugWrapperSession(framework.NonInteractiveDebugWrapperSession):
       watch_fn: (`Callable`) A Callable that can be used to define per-run
         debug ops and watched tensors. See the doc of
         `NonInteractiveDebugWrapperSession.__init__()` for details.
+      thread_name_filter: Regular-expression white list for threads on which the
+        wrapper session will be active. See doc of `BaseDebugWrapperSession` for
+        more details.
       log_usage: (`bool`) whether the usage of this class is to be logged.
 
     Raises:
@@ -59,7 +67,7 @@ class DumpingDebugWrapperSession(framework.NonInteractiveDebugWrapperSession):
       pass  # No logging for open-source.
 
     framework.NonInteractiveDebugWrapperSession.__init__(
-        self, sess, watch_fn=watch_fn)
+        self, sess, watch_fn=watch_fn, thread_name_filter=thread_name_filter)
 
     if gfile.Exists(session_root):
       if not gfile.IsDirectory(session_root):
diff --git a/tensorflow/python/debug/wrappers/dumping_wrapper_test.py b/tensorflow/python/debug/wrappers/dumping_wrapper_test.py
index 54bffd689a..c9ddd47984 100644
--- a/tensorflow/python/debug/wrappers/dumping_wrapper_test.py
+++ b/tensorflow/python/debug/wrappers/dumping_wrapper_test.py
@@ -21,6 +21,7 @@ import glob
 import os
 import shutil
 import tempfile
+import threading
 
 from tensorflow.python.client import session
 from tensorflow.python.debug.lib import debug_data
@@ -335,6 +336,25 @@ class DumpingDebugWrapperSessionTest(test_util.TensorFlowTestCase):
       self.assertEqual(repr(self.inc_v), dump.run_fetches_info)
       self.assertEqual(repr(None), dump.run_feed_keys_info)
 
+  def testDumpingFromMultipleThreadsObeysThreadNameFilter(self):
+    sess = dumping_wrapper.DumpingDebugWrapperSession(
+        self.sess, session_root=self.session_root, log_usage=False,
+        thread_name_filter=r"MainThread$")
+
+    self.assertAllClose(1.0, sess.run(self.delta))
+    def child_thread_job():
+      sess.run(sess.run(self.eta))
+
+    thread = threading.Thread(name="ChildThread", target=child_thread_job)
+    thread.start()
+    thread.join()
+
+    dump_dirs = glob.glob(os.path.join(self.session_root, "run_*"))
+    self.assertEqual(1, len(dump_dirs))
+    dump = debug_data.DebugDumpDir(dump_dirs[0])
+    self.assertEqual(1, dump.size)
+    self.assertEqual("delta", dump.dumped_tensor_data[0].node_name)
+
   def testCallingInvokeNodeStepperOnDumpingWrapperRaisesException(self):
     sess = dumping_wrapper.DumpingDebugWrapperSession(
         self.sess, session_root=self.session_root, log_usage=False)
diff --git a/tensorflow/python/debug/wrappers/framework.py b/tensorflow/python/debug/wrappers/framework.py
index b487671e90..50645c1c87 100644
--- a/tensorflow/python/debug/wrappers/framework.py
+++ b/tensorflow/python/debug/wrappers/framework.py
@@ -112,6 +112,8 @@ from __future__ import division
 from __future__ import print_function
 
 import abc
+import re
+import threading
 
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
@@ -327,11 +329,17 @@ class BaseDebugWrapperSession(session.SessionInterface):
   # TODO(cais): Add on_cont_start and on_cont_end callbacks once the stepper is
   # is available.
 
-  def __init__(self, sess):
+  def __init__(self, sess, thread_name_filter=None):
     """Constructor of `BaseDebugWrapperSession`.
 
     Args:
       sess: An (unwrapped) TensorFlow session instance.
+      thread_name_filter: Regular-expression filter (whitelist) for name(s) of
+        thread(s) on which the wrapper session will be active. This regular
+        expression is used in a start-anchored fashion on the thread name, i.e.,
+        by applying the `match` method of the compiled pattern. The default
+        `None` means that the wrapper session will be active on all threads.
+        E.g., r"MainThread$", r"QueueRunnerThread.*".
 
     Raises:
       ValueError: On invalid `OnSessionInitAction` value.
@@ -348,6 +356,8 @@ class BaseDebugWrapperSession(session.SessionInterface):
 
     # The session being wrapped.
     self._sess = sess
+    self._thread_name_filter_pattern = (re.compile(thread_name_filter)
+                                        if thread_name_filter else None)
 
     # Keeps track of number of run calls that have been performed on this
     # debug-wrapper session.
@@ -404,6 +414,11 @@ class BaseDebugWrapperSession(session.SessionInterface):
     """
 
     self._run_call_count += 1
+    if self._is_disabled_thread():
+      return self._sess.run(fetches,
+                            feed_dict=feed_dict,
+                            options=options,
+                            run_metadata=run_metadata)
 
     # Invoke on-run-start callback and obtain response.
     run_start_resp = self.on_run_start(
@@ -473,6 +488,11 @@ class BaseDebugWrapperSession(session.SessionInterface):
 
     return retvals
 
+  def _is_disabled_thread(self):
+    thread_name = threading.current_thread().name or ""
+    return (self._thread_name_filter_pattern and
+            not self._thread_name_filter_pattern.match(thread_name))
+
   def partial_run_setup(self, fetches, feeds=None):
     """Sets up the feeds and fetches for partial runs in the session."""
     raise NotImplementedError(
@@ -656,7 +676,7 @@ class WatchOptions(object):
 class NonInteractiveDebugWrapperSession(BaseDebugWrapperSession):
   """Base class for non-interactive (i.e., non-CLI) debug wrapper sessions."""
 
-  def __init__(self, sess, watch_fn=None):
+  def __init__(self, sess, watch_fn=None, thread_name_filter=None):
     """Constructor of DumpingDebugWrapperSession.
 
     Args:
@@ -672,11 +692,15 @@ class NonInteractiveDebugWrapperSession(BaseDebugWrapperSession):
            the debug ops to use, the node names, op types and/or tensor data
            types to watch, etc. See the documentation of `tf_debug.WatchOptions`
            for more details.
+      thread_name_filter: Regular-expression white list for threads on which the
+        wrapper session will be active. See doc of `BaseDebugWrapperSession` for
+        more details.
     Raises:
        TypeError: If a non-None `watch_fn` is specified and it is not callable.
     """
 
-    BaseDebugWrapperSession.__init__(self, sess)
+    BaseDebugWrapperSession.__init__(
+        self, sess, thread_name_filter=thread_name_filter)
 
     self._watch_fn = None
     if watch_fn is not None:
diff --git a/tensorflow/python/debug/wrappers/framework_test.py b/tensorflow/python/debug/wrappers/framework_test.py
index 0b2f73d412..1d69c7769a 100644
--- a/tensorflow/python/debug/wrappers/framework_test.py
+++ b/tensorflow/python/debug/wrappers/framework_test.py
@@ -17,8 +17,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import os
 import shutil
 import tempfile
+import threading
 
 import numpy as np
 
@@ -39,7 +41,7 @@ from tensorflow.python.platform import googletest
 class TestDebugWrapperSession(framework.BaseDebugWrapperSession):
   """A concrete implementation of BaseDebugWrapperSession for test."""
 
-  def __init__(self, sess, dump_root, observer):
+  def __init__(self, sess, dump_root, observer, thread_name_filter=None):
     # Supply dump root.
     self._dump_root = dump_root
 
@@ -47,7 +49,8 @@ class TestDebugWrapperSession(framework.BaseDebugWrapperSession):
     self._obs = observer
 
     # Invoke superclass constructor.
-    framework.BaseDebugWrapperSession.__init__(self, sess)
+    framework.BaseDebugWrapperSession.__init__(
+        self, sess, thread_name_filter=thread_name_filter)
 
   def on_session_init(self, request):
     """Override abstract on-session-init callback method."""
@@ -155,7 +158,7 @@ class DebugWrapperSessionTest(test_util.TensorFlowTestCase):
     self._c_val = np.array([[-4.0], [6.0]])
 
     self._a_init = constant_op.constant(
-        self._a_init_val, shape=[2, 2], name="a1_init")
+        self._a_init_val, shape=[2, 2], name="a_init")
     self._b_init = constant_op.constant(
         self._b_init_val, shape=[2, 1], name="b_init")
 
@@ -180,7 +183,8 @@ class DebugWrapperSessionTest(test_util.TensorFlowTestCase):
 
   def tearDown(self):
     # Tear down temporary dump directory.
-    shutil.rmtree(self._dump_root)
+    if os.path.isdir(self._dump_root):
+      shutil.rmtree(self._dump_root)
 
     ops.reset_default_graph()
 
@@ -321,6 +325,65 @@ class DebugWrapperSessionTest(test_util.TensorFlowTestCase):
                                       self._observer)
     wrapper.close()
 
+  def testWrapperThreadNameFilterMainThread(self):
+    wrapper = TestDebugWrapperSession(
+        self._sess, self._dump_root, self._observer,
+        thread_name_filter="MainThread")
+
+    child_run_output = []
+    def child_thread_job():
+      child_run_output.append(wrapper.run(self._b_init))
+
+    thread = threading.Thread(name="ChildThread", target=child_thread_job)
+    thread.start()
+    self.assertAllClose(self._a_init_val, wrapper.run(self._a_init))
+    thread.join()
+    self.assertAllClose([self._b_init_val], child_run_output)
+
+    dump = debug_data.DebugDumpDir(self._dump_root)
+    self.assertEqual(1, dump.size)
+    self.assertEqual("a_init", dump.dumped_tensor_data[0].node_name)
+
+  def testWrapperThreadNameFilterChildThread(self):
+    wrapper = TestDebugWrapperSession(
+        self._sess, self._dump_root, self._observer,
+        thread_name_filter=r"Child.*")
+
+    child_run_output = []
+    def child_thread_job():
+      child_run_output.append(wrapper.run(self._b_init))
+
+    thread = threading.Thread(name="ChildThread", target=child_thread_job)
+    thread.start()
+    self.assertAllClose(self._a_init_val, wrapper.run(self._a_init))
+    thread.join()
+    self.assertAllClose([self._b_init_val], child_run_output)
+
+    dump = debug_data.DebugDumpDir(self._dump_root)
+    self.assertEqual(1, dump.size)
+    self.assertEqual("b_init", dump.dumped_tensor_data[0].node_name)
+
+  def testWrapperThreadNameFilterBothThreads(self):
+    wrapper = TestDebugWrapperSession(
+        self._sess, self._dump_root, self._observer,
+        thread_name_filter=None)
+
+    child_run_output = []
+    def child_thread_job():
+      child_run_output.append(wrapper.run(self._b_init))
+
+    thread = threading.Thread(name="ChildThread", target=child_thread_job)
+    thread.start()
+    self.assertAllClose(self._a_init_val, wrapper.run(self._a_init))
+    thread.join()
+    self.assertAllClose([self._b_init_val], child_run_output)
+
+    dump = debug_data.DebugDumpDir(self._dump_root, validate=False)
+    self.assertEqual(2, dump.size)
+    self.assertItemsEqual(
+        ["a_init", "b_init"],
+        [datum.node_name for datum in dump.dumped_tensor_data])
+
   def testUsingNonDirectSessionRaisesNotImplementedError(self):
     # TODO(cais): Remove this test once tfdbg is integrated with GrpcSession.
     fake_non_direct_session = session.Session()
diff --git a/tensorflow/python/debug/wrappers/grpc_wrapper.py b/tensorflow/python/debug/wrappers/grpc_wrapper.py
index ec328e7dd6..4062016607 100644
--- a/tensorflow/python/debug/wrappers/grpc_wrapper.py
+++ b/tensorflow/python/debug/wrappers/grpc_wrapper.py
@@ -30,6 +30,7 @@ class GrpcDebugWrapperSession(framework.NonInteractiveDebugWrapperSession):
                sess,
                grpc_debug_server_addresses,
                watch_fn=None,
+               thread_name_filter=None,
                log_usage=True):
     """Constructor of DumpingDebugWrapperSession.
 
@@ -43,6 +44,9 @@ class GrpcDebugWrapperSession(framework.NonInteractiveDebugWrapperSession):
       watch_fn: (`Callable`) A Callable that can be used to define per-run
         debug ops and watched tensors. See the doc of
         `NonInteractiveDebugWrapperSession.__init__()` for details.
+      thread_name_filter: Regular-expression white list for threads on which the
+        wrapper session will be active. See doc of `BaseDebugWrapperSession` for
+        more details.
       log_usage: (`bool`) whether the usage of this class is to be logged.
 
     Raises:
@@ -54,7 +58,7 @@ class GrpcDebugWrapperSession(framework.NonInteractiveDebugWrapperSession):
       pass  # No logging for open-source.
 
     framework.NonInteractiveDebugWrapperSession.__init__(
-        self, sess, watch_fn=watch_fn)
+        self, sess, watch_fn=watch_fn, thread_name_filter=thread_name_filter)
 
     if isinstance(grpc_debug_server_addresses, str):
       self._grpc_debug_server_urls = [
diff --git a/tensorflow/python/debug/wrappers/hooks.py b/tensorflow/python/debug/wrappers/hooks.py
index c86cc413c1..65713f0b71 100644
--- a/tensorflow/python/debug/wrappers/hooks.py
+++ b/tensorflow/python/debug/wrappers/hooks.py
@@ -39,7 +39,10 @@ class LocalCLIDebugHook(session_run_hook.SessionRunHook,
   `tf.contrib.learn`'s `Estimator`s and `Experiment`s.
   """
 
-  def __init__(self, ui_type="curses", dump_root=None):
+  def __init__(self,
+               ui_type="curses",
+               dump_root=None,
+               thread_name_filter=None):
     """Create a local debugger command-line interface (CLI) hook.
 
     Args:
@@ -48,10 +51,14 @@ class LocalCLIDebugHook(session_run_hook.SessionRunHook,
         directory that does not exist or an empty directory. If the directory
         does not exist, it will be created by the debugger core during debug
         `run()` calls and removed afterwards.
+      thread_name_filter: Regular-expression white list for threads on which the
+        wrapper session will be active. See doc of `BaseDebugWrapperSession` for
+        more details.
     """
 
     self._ui_type = ui_type
     self._dump_root = dump_root
+    self._thread_name_filter = thread_name_filter
     self._wrapper_initialized = False
     self._pending_tensor_filters = {}
 
@@ -85,7 +92,8 @@ class LocalCLIDebugHook(session_run_hook.SessionRunHook,
           self,
           run_context.session,
           ui_type=self._ui_type,
-          dump_root=self._dump_root)
+          dump_root=self._dump_root,
+          thread_name_filter=self._thread_name_filter)
 
       # Actually register tensor filters registered prior to the construction
       # of the underlying LocalCLIDebugWrapperSession object.
@@ -168,7 +176,11 @@ class DumpingDebugHook(session_run_hook.SessionRunHook,
   `tf.contrib.learn`'s `Estimator`s and `Experiment`s.
   """
 
-  def __init__(self, session_root, watch_fn=None, log_usage=True):
+  def __init__(self,
+               session_root,
+               watch_fn=None,
+               thread_name_filter=None,
+               log_usage=True):
     """Create a local debugger command-line interface (CLI) hook.
 
     Args:
@@ -176,11 +188,15 @@ class DumpingDebugHook(session_run_hook.SessionRunHook,
         `dumping_wrapper.DumpingDebugWrapperSession.__init__`.
       watch_fn: See doc of
         `dumping_wrapper.DumpingDebugWrapperSession.__init__`.
+      thread_name_filter: Regular-expression white list for threads on which the
+        wrapper session will be active. See doc of `BaseDebugWrapperSession` for
+        more details.
       log_usage: (bool) Whether usage is to be logged.
     """
 
     self._session_root = session_root
     self._watch_fn = watch_fn
+    self._thread_name_filter = thread_name_filter
     self._log_usage = log_usage
     self._wrapper_initialized = False
 
@@ -196,6 +212,7 @@ class DumpingDebugHook(session_run_hook.SessionRunHook,
           run_context.session,
           self._session_root,
           watch_fn=self._watch_fn,
+          thread_name_filter=self._thread_name_filter,
           log_usage=self._log_usage)
       self._wrapper_initialized = True
 
@@ -240,6 +257,7 @@ class GrpcDebugHook(session_run_hook.SessionRunHook):
   def __init__(self,
                grpc_debug_server_addresses,
                watch_fn=None,
+               thread_name_filter=None,
                log_usage=True):
     """Constructs a GrpcDebugHook.
 
@@ -250,6 +268,9 @@ class GrpcDebugHook(session_run_hook.SessionRunHook):
       watch_fn: A function that allows for customizing which ops to watch at
         which specific steps. See doc of
         `dumping_wrapper.DumpingDebugWrapperSession.__init__` for details.
+      thread_name_filter: Regular-expression white list for threads on which the
+        wrapper session will be active. See doc of `BaseDebugWrapperSession` for
+        more details.
       log_usage: (bool) Whether usage is to be logged.
 
     Raises:
@@ -265,6 +286,7 @@ class GrpcDebugHook(session_run_hook.SessionRunHook):
 
     # A wrapper session responsible for GRPC communication.
     self._grpc_debug_wrapper_session = None
+    self._thread_name_filter = thread_name_filter
 
     self._grpc_debug_server_addresses = grpc_debug_server_addresses
     self._watch_fn = watch_fn
@@ -286,6 +308,7 @@ class GrpcDebugHook(session_run_hook.SessionRunHook):
           run_context.session,
           self._grpc_debug_server_addresses,
           watch_fn=self._watch_fn,
+          thread_name_filter=self._thread_name_filter,
           log_usage=self._log_usage)
 
     fetches = run_context.original_args.fetches
diff --git a/tensorflow/python/debug/wrappers/local_cli_wrapper.py b/tensorflow/python/debug/wrappers/local_cli_wrapper.py
index b29259c901..0ba31f986b 100644
--- a/tensorflow/python/debug/wrappers/local_cli_wrapper.py
+++ b/tensorflow/python/debug/wrappers/local_cli_wrapper.py
@@ -48,7 +48,8 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
                sess,
                dump_root=None,
                log_usage=True,
-               ui_type="curses"):
+               ui_type="curses",
+               thread_name_filter=None):
     """Constructor of LocalCLIDebugWrapperSession.
 
     Args:
@@ -61,6 +62,8 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
       log_usage: (`bool`) whether the usage of this class is to be logged.
       ui_type: (`str`) requested UI type. Currently supported:
         (curses | readline)
+      thread_name_filter: Regular-expression white list for thread name. See
+        the doc of `BaseDebugWrapperSession` for details.
 
     Raises:
       ValueError: If dump_root is an existing and non-empty directory or if
@@ -70,7 +73,8 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
     if log_usage:
       pass  # No logging for open-source.
 
-    framework.BaseDebugWrapperSession.__init__(self, sess)
+    framework.BaseDebugWrapperSession.__init__(
+        self, sess, thread_name_filter=thread_name_filter)
 
     if not dump_root:
       self._dump_root = tempfile.mktemp(prefix=_DUMP_ROOT_PREFIX)
-- 
GitLab


From 5cdce84e0c14c7a922d78d449b3d20bab46c5ddf Mon Sep 17 00:00:00 2001
From: Xiang Gao <qasdfgtyuiop@gmail.com>
Date: Wed, 26 Apr 2017 02:00:48 -0400
Subject: [PATCH 0689/1563] use NDIMS as template and begin as argument

---
 tensorflow/core/framework/tensor.h       | 36 ++++++++++++------------
 tensorflow/core/framework/tensor_test.cc | 30 ++++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 08508fab3b..86500d5666 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -304,14 +304,14 @@ class Tensor {
   template <typename T, size_t NDIMS = 2>
   typename TTypes<T, NDIMS>::Tensor flat_outer_dims();
 
-  /// Returns the data as an Eigen::Tensor with END-START dimensions, collapsing
-  /// Tensor dimensions of the first START into the first dimension of the
-  /// result and the Tensor dimensions of the last dims()-END into the last dimension
-  /// of the result. If START < 0 then the the |START| leading dimensions of size 1 will be
-  /// added. If END > dims() then END - dims() trailing dimensions of size 1 will be
-  /// added.
-  template <typename T, size_t BEGIN, size_t END>
-  typename TTypes<T, END-BEGIN>::Tensor flat_inner_outer_dims();
+  /// Returns the data as an Eigen::Tensor with NDIMS dimensions, collapsing the
+  /// first 'begin' Tensor dimensions into the first dimension of the result and
+  /// the Tensor dimensions of the last dims() - 'begin' - NDIMS into the last
+  /// dimension of the result. If 'begin' < 0 then the the |'begin'| leading
+  /// dimensions of size 1 will be added. If 'begin' + NDIMS > dims() then
+  /// 'begin' + NDIMS - dims() trailing dimensions of size 1 will be added.
+  template <typename T, size_t NDIMS = 3>
+  typename TTypes<T, NDIMS>::Tensor flat_inner_outer_dims(int64 begin);
 
   template <typename T, size_t NDIMS>
   typename TTypes<T, NDIMS>::Tensor shaped(gtl::ArraySlice<int64> new_sizes);
@@ -395,8 +395,8 @@ class Tensor {
   template <typename T, size_t NDIMS = 2>
   typename TTypes<T, NDIMS>::ConstTensor flat_outer_dims() const;
 
-  template <typename T, size_t BEGIN, size_t END>
-  typename TTypes<T, END-BEGIN>::Tensor flat_inner_outer_dims() const;
+  template <typename T, size_t NDIMS = 3>
+  typename TTypes<T, NDIMS>::Tensor flat_inner_outer_dims(int64 begin) const;
 
   /// Render the first `max_entries` values in `*this` into a string.
   string SummarizeValue(int64 max_entries) const;
@@ -660,10 +660,10 @@ typename TTypes<T, NDIMS>::Tensor Tensor::flat_outer_dims() {
   return shaped<T, NDIMS>(ComputeFlatOuterDims(shape_.dim_sizes(), NDIMS));
 }
 
-template <typename T, size_t BEGIN, size_t END>
-typename TTypes<T, END-BEGIN>::Tensor Tensor::flat_inner_outer_dims() {
-  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), END);
-  return shaped<T, END-BEGIN>(ComputeFlatInnerDims(o, END-BEGIN));
+template <typename T, size_t NDIMS>
+typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) {
+  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), begin+NDIMS);
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(o, NDIMS));
 }
 
 template <typename T, size_t NDIMS>
@@ -676,10 +676,10 @@ typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_outer_dims() const {
   return shaped<T, NDIMS>(ComputeFlatOuterDims(shape_.dim_sizes(), NDIMS));
 }
 
-template <typename T, size_t BEGIN, size_t END>
-typename TTypes<T, END-BEGIN>::Tensor Tensor::flat_inner_outer_dims() const {
-  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), END);
-  return shaped<T, END-BEGIN>(ComputeFlatInnerDims(o, END-BEGIN));
+template <typename T, size_t NDIMS>
+typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) const {
+  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), begin+NDIMS);
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(o, NDIMS));
 }
 
 inline Tensor::Tensor(const Tensor& other)
diff --git a/tensorflow/core/framework/tensor_test.cc b/tensorflow/core/framework/tensor_test.cc
index 8f6d397607..3e4179101f 100644
--- a/tensorflow/core/framework/tensor_test.cc
+++ b/tensorflow/core/framework/tensor_test.cc
@@ -318,7 +318,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 0, 4>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 4>(0);
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(4, flat_inner_outer_dims.dimension(2));
@@ -328,7 +328,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, -2, 4>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 6>(-2);
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
@@ -340,7 +340,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 0, 6>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 6>(0);
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(4, flat_inner_outer_dims.dimension(2));
@@ -352,7 +352,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, -2, 6>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 8>(-2);
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
@@ -366,7 +366,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 1, 4>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 3>(1);
     EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
@@ -375,7 +375,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 1, 6>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 5>(1);
     EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
@@ -386,7 +386,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 0, 3>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 3>(0);
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(20, flat_inner_outer_dims.dimension(2));
@@ -395,7 +395,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, -2, 3>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 5>(-2);
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
@@ -406,7 +406,7 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 1, 3>();
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 2>(1);
     EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(20, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(flat_inner_outer_dims(0, 0), 0.01f);
@@ -460,20 +460,20 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 0, 2>();
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2>(0);
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 0, 3>();
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(0);
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(2));
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 0, 5>();
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 5>(0);
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
@@ -482,20 +482,20 @@ TEST(Tensor_Float, Reshape) {
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3, 5>();
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2>(3);
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(5, flat_inner_outer_dims.dimension(1));
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2, 5>();
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(2);
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
   }
   {
     LOG(INFO) << "flat_inner_outer_dims";
-    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 1, 4>();
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(1);
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(2));
-- 
GitLab


From 7bd133cd21be98eaf261f664c81bbd8c1837d1c5 Mon Sep 17 00:00:00 2001
From: Derek Murray <derek.murray@gmail.com>
Date: Wed, 26 Apr 2017 08:28:09 -0700
Subject: [PATCH 0690/1563] Add tensorflow/core/kernels/function_ops.cc to
 Makefile (#9459)

This should fix the breakage in Makefile-based builds after 858e0afcc45c39b6428bf82ab1444323e925cfd8.
---
 tensorflow/contrib/makefile/tf_op_files.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index 4a119f7ffc..974d3f3287 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -101,6 +101,7 @@ tensorflow/core/kernels/identity_op.cc
 tensorflow/core/kernels/gather_op.cc
 tensorflow/core/kernels/gather_functor.cc
 tensorflow/core/kernels/fused_batch_norm_op.cc
+tensorflow/core/kernels/function_ops.cc
 tensorflow/core/kernels/fill_functor.cc
 tensorflow/core/kernels/fifo_queue.cc
 tensorflow/core/kernels/fake_quant_ops.cc
-- 
GitLab


From b3d1b4e2207cf8b0910eccf84995731243cb71f4 Mon Sep 17 00:00:00 2001
From: Karan Desai <karandesai_96@live.com>
Date: Wed, 26 Apr 2017 21:42:23 +0530
Subject: [PATCH 0691/1563] Introduce conv3d_transpose in tf.layers (#8461)

* Add Conv3DTranspose class implementation.

- Overrides call method of base class, still lacks
  documentation and tests.

* Add functional interface for conv3d transpose layer.

* Add tests for conv 3d transpose layer.

* Declare aliases and add docstrings for Conv3DTranspose.

* Shift Conv3DTranspose's get_deconv_dim to layers/utils.py

* Make one-line docstrings fit in one line.

* Add RELEASE.md entry and expose layer through tf.layers

* Restore edited conv3d_transpose docstring.
---
 RELEASE.md                                    |   1 +
 tensorflow/python/layers/convolutional.py     | 266 ++++++++++++++++--
 .../python/layers/convolutional_test.py       | 170 +++++++++++
 tensorflow/python/layers/layers.py            |   2 +
 tensorflow/python/layers/utils.py             |  26 ++
 tensorflow/python/layers/utils_test.py        |   7 +
 tensorflow/python/ops/nn_ops.py               |   7 +-
 7 files changed, 459 insertions(+), 20 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index fe6d052640..f078d336ab 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,6 +1,7 @@
 # Changes since the last release
 
 ## Major Features and Improvements
+* Added `tf.layers.conv3d_transpose` layer for spatio temporal deconvolution.
 * Added `tf.Session.make_callable()`, which provides a lower overhead means of running a similar step multiple times.
 * Added ibverbs-based RDMA support to contrib (courtesy @junshi15 from Yahoo).
 * `RNNCell` objects now subclass `tf.layers._Layer`.  The strictness described
diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py
index 3b8959e210..04fec38b21 100644
--- a/tensorflow/python/layers/convolutional.py
+++ b/tensorflow/python/layers/convolutional.py
@@ -970,7 +970,7 @@ def separable_conv2d(inputs,
 
 
 class Conv2DTranspose(Conv2D):
-  """Transposed convolution layer (sometimes called Deconvolution).
+  """Transposed 2D convolution layer (sometimes called 2D Deconvolution).
 
   The need for transposed convolutions generally arises
   from the desire to use a transformation going in the opposite direction
@@ -1083,19 +1083,9 @@ class Conv2DTranspose(Conv2D):
     kernel_h, kernel_w = self.kernel_size
     stride_h, stride_w = self.strides
 
-    def get_deconv_dim(dim_size, stride_size, kernel_size, padding):
-      if isinstance(dim_size, ops.Tensor):
-        dim_size = math_ops.multiply(dim_size, stride_size)
-      elif dim_size is not None:
-        dim_size *= stride_size
-
-      if padding == 'valid' and dim_size is not None:
-        dim_size += max(kernel_size - stride_size, 0)
-      return dim_size
-
     # Infer the dynamic output shape:
-    out_height = get_deconv_dim(height, stride_h, kernel_h, self.padding)
-    out_width = get_deconv_dim(width, stride_w, kernel_w, self.padding)
+    out_height = utils.get_deconv_dim(height, stride_h, kernel_h, self.padding)
+    out_width = utils.get_deconv_dim(width, stride_w, kernel_w, self.padding)
 
     if self.data_format == 'channels_first':
       output_shape = (batch_size, self.filters, out_height, out_width)
@@ -1116,9 +1106,9 @@ class Conv2DTranspose(Conv2D):
     # Infer the static output shape:
     out_shape = inputs.get_shape().as_list()
     out_shape[c_axis] = self.filters
-    out_shape[h_axis] = get_deconv_dim(
+    out_shape[h_axis] = utils.get_deconv_dim(
         out_shape[h_axis], stride_h, kernel_h, self.padding)
-    out_shape[w_axis] = get_deconv_dim(
+    out_shape[w_axis] = utils.get_deconv_dim(
         out_shape[w_axis], stride_w, kernel_w, self.padding)
     outputs.set_shape(out_shape)
 
@@ -1149,7 +1139,7 @@ def conv2d_transpose(inputs,
                      trainable=True,
                      name=None,
                      reuse=None):
-  """Transposed convolution layer (sometimes called Deconvolution).
+  """Functional interface for transposed 2D convolution layer.
 
   The need for transposed convolutions generally arises
   from the desire to use a transformation going in the opposite direction
@@ -1169,6 +1159,246 @@ def conv2d_transpose(inputs,
       of the convolution. Can be a single integer to specify the same value for
       all spatial dimensions.
     padding: one of `"valid"` or `"same"` (case-insensitive).
+    data_format: A string, one of `channels_last` (default) or `channels_first`.
+      The ordering of the dimensions in the inputs.
+      `channels_last` corresponds to inputs with shape
+      `(batch, height, width, channels)` while `channels_first` corresponds to
+      inputs with shape `(batch, channels, height, width)`.
+    activation: Activation function. Set it to `None` to maintain a
+      linear activation.
+    use_bias: Boolean, whether the layer uses a bias.
+    kernel_initializer: An initializer for the convolution kernel.
+    bias_initializer: An initializer for the bias vector. If `None`, then no
+      bias will be applied.
+    kernel_regularizer: Optional regularizer for the convolution kernel.
+    bias_regularizer: Optional regularizer for the bias vector.
+    activity_regularizer: Regularizer function for the output.
+    trainable: Boolean, if `True` also add variables to the graph collection
+      `GraphKeys.TRAINABLE_VARIABLES` (see `tf.Variable`).
+    name: A string, the name of the layer.
+    reuse: Boolean, whether to reuse the weights of a previous layer
+      by the same name.
+
+  Returns:
+    Output tensor.
+  """
+  layer = Conv2DTranspose(
+      filters=filters,
+      kernel_size=kernel_size,
+      strides=strides,
+      padding=padding,
+      data_format=data_format,
+      activation=activation,
+      use_bias=use_bias,
+      kernel_initializer=kernel_initializer,
+      bias_initializer=bias_initializer,
+      kernel_regularizer=kernel_regularizer,
+      bias_regularizer=bias_regularizer,
+      activity_regularizer=activity_regularizer,
+      trainable=trainable,
+      name=name,
+      _reuse=reuse,
+      _scope=name)
+  return layer.apply(inputs)
+
+
+class Conv3DTranspose(Conv3D):
+  """Transposed 3D convolution layer (sometimes called 3D Deconvolution).
+
+  Arguments:
+    filters: Integer, the dimensionality of the output space (i.e. the number
+      of filters in the convolution).
+    kernel_size: An integer or tuple/list of 3 integers, specifying the
+      depth, height and width of the 3D convolution window.
+      Can be a single integer to specify the same value for all spatial
+      dimensions.
+    strides: An integer or tuple/list of 3 integers, specifying the strides
+      of the convolution along the depth, height and width.
+      Can be a single integer to specify the same value for all spatial
+      dimensions.
+    padding: One of `"valid"` or `"same"` (case-insensitive).
+    data_format: A string, one of `channels_last` (default) or `channels_first`.
+      The ordering of the dimensions in the inputs.
+      `channels_last` corresponds to inputs with shape
+      `(batch, depth, height, width, channels)` while `channels_first`
+      corresponds to inputs with shape
+      `(batch, channels, depth, height, width)`.
+    activation: Activation function. Set it to `None` to maintain a
+      linear activation.
+    use_bias: Boolean, whether the layer uses a bias.
+    kernel_initializer: An initializer for the convolution kernel.
+    bias_initializer: An initializer for the bias vector. If `None`, then no
+      bias will be applied.
+    kernel_regularizer: Optional regularizer for the convolution kernel.
+    bias_regularizer: Optional regularizer for the bias vector.
+    activity_regularizer: Regularizer function for the output.
+    trainable: Boolean, if `True` also add variables to the graph collection
+      `GraphKeys.TRAINABLE_VARIABLES` (see `tf.Variable`).
+    name: A string, the name of the layer.
+  """
+
+  def __init__(self, filters,
+               kernel_size,
+               strides=(1, 1, 1),
+               padding='valid',
+               data_format='channels_last',
+               activation=None,
+               use_bias=True,
+               kernel_initializer=None,
+               bias_initializer=init_ops.zeros_initializer(),
+               kernel_regularizer=None,
+               bias_regularizer=None,
+               activity_regularizer=None,
+               trainable=True,
+               name=None,
+               **kwargs):
+    super(Conv3DTranspose, self).__init__(
+        filters=filters,
+        kernel_size=kernel_size,
+        strides=strides,
+        padding=padding,
+        data_format=data_format,
+        activation=activation,
+        use_bias=use_bias,
+        kernel_initializer=kernel_initializer,
+        bias_initializer=bias_initializer,
+        kernel_regularizer=kernel_regularizer,
+        bias_regularizer=bias_regularizer,
+        activity_regularizer=activity_regularizer,
+        trainable=trainable,
+        name=name, **kwargs)
+
+  def build(self, input_shape):
+    if len(input_shape) != 5:
+      raise ValueError('Inputs should have rank 5, ' +
+                       'received input shape:', str(input_shape))
+    if self.data_format == 'channels_first':
+      channel_axis = 1
+    else:
+      channel_axis = -1
+    if input_shape[channel_axis] is None:
+      raise ValueError('The channel dimension of the inputs '
+                       'should be defined, found None: ' + str(input_shape))
+    input_dim = input_shape[channel_axis]
+    kernel_shape = self.kernel_size + (self.filters, input_dim)
+
+    self.kernel = vs.get_variable('kernel',
+                                  shape=kernel_shape,
+                                  initializer=self.kernel_initializer,
+                                  regularizer=self.kernel_regularizer,
+                                  trainable=True,
+                                  dtype=self.dtype)
+    if self.use_bias:
+      self.bias = vs.get_variable('bias',
+                                  shape=(self.filters,),
+                                  initializer=self.bias_initializer,
+                                  regularizer=self.bias_regularizer,
+                                  trainable=True,
+                                  dtype=self.dtype)
+    else:
+      self.bias = None
+
+  def call(self, inputs):
+    inputs_shape = array_ops.shape(inputs)
+    batch_size = inputs_shape[0]
+    if self.data_format == 'channels_first':
+      c_axis, d_axis, h_axis, w_axis = 1, 2, 3, 4
+    else:
+      c_axis, d_axis, h_axis, w_axis = 4, 1, 2, 3
+
+    depth = inputs_shape[d_axis]
+    height = inputs_shape[h_axis]
+    width = inputs_shape[w_axis]
+
+    kernel_d, kernel_h, kernel_w = self.kernel_size
+    stride_d, stride_h, stride_w = self.strides
+
+    # Infer the dynamic output shape:
+    out_depth = utils.get_deconv_dim(depth, stride_d, kernel_d, self.padding)
+    out_height = utils.get_deconv_dim(height, stride_h, kernel_h, self.padding)
+    out_width = utils.get_deconv_dim(width, stride_w, kernel_w, self.padding)
+
+    if self.data_format == 'channels_first':
+      output_shape = (batch_size, self.filters, out_depth, out_height,
+                      out_width)
+      strides = (1, 1, stride_d, stride_h, stride_w)
+    else:
+      output_shape = (batch_size, out_depth, out_height, out_width,
+                      self.filters)
+      strides = (1, stride_d, stride_h, stride_w, 1)
+
+    output_shape_tensor = array_ops.stack(output_shape)
+    outputs = nn.conv3d_transpose(
+        inputs,
+        self.kernel,
+        output_shape_tensor,
+        strides,
+        data_format=utils.convert_data_format(self.data_format, ndim=5),
+        padding=self.padding.upper())
+
+    # Infer the static output shape:
+    out_shape = inputs.get_shape().as_list()
+    out_shape[c_axis] = self.filters
+    out_shape[d_axis] = utils.get_deconv_dim(
+        out_shape[d_axis], stride_d, kernel_d, self.padding)
+    out_shape[h_axis] = utils.get_deconv_dim(
+        out_shape[h_axis], stride_h, kernel_h, self.padding)
+    out_shape[w_axis] = utils.get_deconv_dim(
+        out_shape[w_axis], stride_w, kernel_w, self.padding)
+    outputs.set_shape(out_shape)
+
+    if self.bias:
+      outputs_shape = outputs.shape.as_list()
+      if self.data_format == 'channels_first':
+        outputs_4d = array_ops.reshape(outputs,
+                                       [outputs_shape[0], outputs_shape[1],
+                                        outputs_shape[2] * outputs_shape[3],
+                                        outputs_shape[4]])
+      else:
+        outputs_4d = array_ops.reshape(outputs,
+                                       [outputs_shape[0],
+                                        outputs_shape[1] * outputs_shape[2],
+                                        outputs_shape[3], outputs_shape[4]])
+      outputs_4d = nn.bias_add(
+          outputs_4d,
+          self.bias,
+          data_format=utils.convert_data_format(self.data_format, ndim=4))
+      outputs = array_ops.reshape(outputs_4d, outputs_shape)
+
+    if self.activation is not None:
+      return self.activation(outputs)
+    return outputs
+
+
+def conv3d_transpose(inputs,
+                     filters,
+                     kernel_size,
+                     strides=(1, 1, 1),
+                     padding='valid',
+                     data_format='channels_last',
+                     activation=None,
+                     use_bias=True,
+                     kernel_initializer=None,
+                     bias_initializer=init_ops.zeros_initializer(),
+                     kernel_regularizer=None,
+                     bias_regularizer=None,
+                     activity_regularizer=None,
+                     trainable=True,
+                     name=None,
+                     reuse=None):
+  """Functional interface for transposed 3D convolution layer.
+
+  Arguments:
+    inputs: Input tensor.
+    filters: Integer, the dimensionality of the output space (i.e. the number
+      of filters in the convolution).
+    kernel_size: A tuple or list of 3 positive integers specifying the spatial
+      dimensions of of the filters. Can be a single integer to specify the same
+      value for all spatial dimensions.
+    strides: A tuple or list of 3 positive integers specifying the strides
+      of the convolution. Can be a single integer to specify the same value for
+      all spatial dimensions.
+    padding: one of `"valid"` or `"same"` (case-insensitive).
     data_format: A string, one of `channels_last` (default) or `channels_first`.
       The ordering of the dimensions in the inputs.
       `channels_last` corresponds to inputs with shape
@@ -1192,7 +1422,7 @@ def conv2d_transpose(inputs,
   Returns:
     Output tensor.
   """
-  layer = Conv2DTranspose(
+  layer = Conv3DTranspose(
       filters=filters,
       kernel_size=kernel_size,
       strides=strides,
@@ -1219,9 +1449,11 @@ Convolution2D = Conv2D
 Convolution3D = Conv3D
 SeparableConvolution2D = SeparableConv2D
 Convolution2DTranspose = Deconvolution2D = Deconv2D = Conv2DTranspose
+Convolution3DTranspose = Deconvolution3D = Deconv3D = Conv3DTranspose
 convolution1d = conv1d
 convolution2d = conv2d
 convolution3d = conv3d
 separable_convolution2d = separable_conv2d
 convolution2d_transpose = deconvolution2d = deconv2d = conv2d_transpose
+convolution3d_transpose = deconvolution3d = deconv3d = conv3d_transpose
 
diff --git a/tensorflow/python/layers/convolutional_test.py b/tensorflow/python/layers/convolutional_test.py
index da962b2f99..635cc24714 100644
--- a/tensorflow/python/layers/convolutional_test.py
+++ b/tensorflow/python/layers/convolutional_test.py
@@ -651,5 +651,175 @@ class Conv2DTransposeTest(test.TestCase):
     self.assertEqual(len(variables.trainable_variables()), 4)
 
 
+class Conv3DTransposeTest(test.TestCase):
+
+  def testInvalidDataFormat(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    with self.assertRaisesRegexp(ValueError, 'data_format'):
+      conv_layers.conv3d_transpose(volumes, 4, 3, data_format='invalid')
+
+  def testInvalidStrides(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    with self.assertRaisesRegexp(ValueError, 'strides'):
+      conv_layers.conv3d_transpose(volumes, 4, 3, strides=(1, 2))
+
+    with self.assertRaisesRegexp(ValueError, 'strides'):
+      conv_layers.conv3d_transpose(volumes, 4, 3, strides=None)
+
+  def testInvalidKernelSize(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    with self.assertRaisesRegexp(ValueError, 'kernel_size'):
+      conv_layers.conv3d_transpose(volumes, 4, (1, 2))
+
+    with self.assertRaisesRegexp(ValueError, 'kernel_size'):
+      conv_layers.conv3d_transpose(volumes, 4, None)
+
+  def testCreateConv3DTranspose(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], activation=nn_ops.relu)
+    output = layer.apply(volumes)
+    self.assertEqual(output.op.name, 'conv3d_transpose/Relu')
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth + 2, height + 2, width + 2, 4])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertListEqual(layer.bias.get_shape().as_list(), [4])
+
+  def testCreateConv3DTransposeIntegerKernelSize(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    layer = conv_layers.Conv3DTranspose(4, 3)
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth + 2, height + 2, width + 2, 4])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertListEqual(layer.bias.get_shape().as_list(), [4])
+
+  def testCreateConv3DTransposeChannelsFirst(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, 32, depth, height, width))
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], data_format='channels_first')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, 4, depth + 2, height + 2, width + 2])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertListEqual(layer.bias.get_shape().as_list(), [4])
+
+  def testConv3DTransposePaddingSame(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 64), seed=1)
+    layer = conv_layers.Conv3DTranspose(
+        32, volumes.get_shape()[1:4], padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(), [5, depth, height,
+                                                        width, 32])
+
+  def testCreateConv3DTransposeWithStrides(self):
+    depth, height, width = 4, 6, 8
+    # Test strides tuple.
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], strides=(2, 2, 2), padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth * 2, height * 2, width * 2, 4])
+
+    # Test strides integer.
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], strides=2,
+                                        padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth * 2, height * 2, width * 2, 4])
+
+    # Test unequal strides.
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], strides=(2, 1, 1), padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth * 2, height, width, 4])
+
+  def testConv3DTransposeKernelRegularizer(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    reg = lambda x: 0.1 * math_ops.reduce_sum(x)
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], kernel_regularizer=reg)
+    layer.apply(volumes)
+    loss_keys = ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)
+    self.assertEqual(len(loss_keys), 1)
+    self.assertListEqual(layer.losses, loss_keys)
+
+  def testConv3DTransposeBiasRegularizer(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    reg = lambda x: 0.1 * math_ops.reduce_sum(x)
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], bias_regularizer=reg)
+    layer.apply(volumes)
+    loss_keys = ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)
+    self.assertEqual(len(loss_keys), 1)
+    self.assertListEqual(layer.losses, loss_keys)
+
+  def testConv3DTransposeNoBias(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], activation=nn_ops.relu, use_bias=False)
+    output = layer.apply(volumes)
+    self.assertEqual(output.op.name, 'conv3d_transpose/Relu')
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth + 2, height + 2, width + 2, 4])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertEqual(layer.bias, None)
+
+  def testFunctionalConv3DTransposeReuse(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+    self.assertEqual(len(variables.trainable_variables()), 2)
+    conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1', reuse=True)
+    self.assertEqual(len(variables.trainable_variables()), 2)
+
+  def testFunctionalConv3DTransposeReuseFromScope(self):
+    with variable_scope.variable_scope('scope'):
+      depth, height, width = 5, 7, 9
+      volumes = random_ops.random_uniform((5, depth, height, width, 32),
+                                          seed=1)
+      conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+      self.assertEqual(len(variables.trainable_variables()), 2)
+    with variable_scope.variable_scope('scope', reuse=True):
+      conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+      self.assertEqual(len(variables.trainable_variables()), 2)
+
+  def testFunctionalConv3DTransposeInitializerFromScope(self):
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          'scope', initializer=init_ops.ones_initializer()):
+        depth, height, width = 5, 7, 9
+        volumes = random_ops.random_uniform((5, depth, height, width, 32),
+                                            seed=1)
+        conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+        weights = variables.trainable_variables()
+        # Check the names of weights in order.
+        self.assertTrue('kernel' in weights[0].name)
+        self.assertTrue('bias' in weights[1].name)
+        sess.run(variables.global_variables_initializer())
+        weights = sess.run(weights)
+        # Check that the kernel weights got initialized to ones (from scope)
+        self.assertAllClose(weights[0], np.ones((3, 3, 3, 4, 32)))
+        # Check that the bias still got initialized to zeros.
+        self.assertAllClose(weights[1], np.zeros((4)))
+
+  def testFunctionalConv3DTransposeNoReuse(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3])
+    self.assertEqual(len(variables.trainable_variables()), 2)
+    conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3])
+    self.assertEqual(len(variables.trainable_variables()), 4)
+
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/layers/layers.py b/tensorflow/python/layers/layers.py
index 9f02757d5b..aa46eb5d27 100644
--- a/tensorflow/python/layers/layers.py
+++ b/tensorflow/python/layers/layers.py
@@ -23,6 +23,7 @@
 @@conv3d
 @@separable_conv2d
 @@conv2d_transpose
+@@conv3d_transpose
 @@average_pooling1d
 @@max_pooling1d
 @@average_pooling2d
@@ -50,6 +51,7 @@ from tensorflow.python.layers.convolutional import conv2d
 from tensorflow.python.layers.convolutional import conv3d
 from tensorflow.python.layers.convolutional import separable_conv2d
 from tensorflow.python.layers.convolutional import conv2d_transpose
+from tensorflow.python.layers.convolutional import conv3d_transpose
 
 # Pooling layers.
 from tensorflow.python.layers.pooling import average_pooling1d
diff --git a/tensorflow/python/layers/utils.py b/tensorflow/python/layers/utils.py
index 666d475690..64b948c70f 100644
--- a/tensorflow/python/layers/utils.py
+++ b/tensorflow/python/layers/utils.py
@@ -26,6 +26,7 @@ import numpy as np
 
 from tensorflow.python.ops import variables
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import math_ops
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_util
 
@@ -164,3 +165,28 @@ def constant_value(pred):
   else:
     raise TypeError('`pred` must be a Tensor, a Variable, or a Python bool.')
   return pred_value
+
+
+def get_deconv_dim(dim_size, stride_size, kernel_size, padding):
+  """Return output dimension of a deconv layer, based on input dimension.
+
+  Arguments:
+    dim_size: An int representing size of dimension, can be height, width
+      or depth.
+    stride_size: An int representing the stride of deconvolution filters
+      along the same dimension.
+    kernel_size: An int representing size of deconv kernel (filter) along
+      the same dimension.
+    padding: one of `"valid"` or `"same"` (case-insensitive).
+
+  Returns:
+    An int representing the size of output dimension of the layer.
+  """
+  if isinstance(dim_size, ops.Tensor):
+    dim_size = math_ops.multiply(dim_size, stride_size)
+  elif dim_size is not None:
+    dim_size *= stride_size
+
+  if padding == 'valid' and dim_size is not None:
+    dim_size += max(kernel_size - stride_size, 0)
+  return dim_size
diff --git a/tensorflow/python/layers/utils_test.py b/tensorflow/python/layers/utils_test.py
index 54e757c112..7969e957d8 100644
--- a/tensorflow/python/layers/utils_test.py
+++ b/tensorflow/python/layers/utils_test.py
@@ -62,6 +62,13 @@ class ConvUtilsTest(test.TestCase):
     with self.assertRaises(ValueError):
       utils.normalize_padding('invalid')
 
+  def testGetDeconvDim(self):
+    self.assertEqual(utils.get_deconv_dim(30, 1, 3, 'valid'), 32)
+    self.assertEqual(utils.get_deconv_dim(28, 1, 5, 'valid'), 32)
+    self.assertEqual(utils.get_deconv_dim(28, 2, 5, 'valid'), 59)
+    self.assertEqual(utils.get_deconv_dim(32, 1, 3, 'same'), 32)
+    self.assertEqual(utils.get_deconv_dim(32, 1, 5, 'same'), 32)
+    self.assertEqual(utils.get_deconv_dim(32, 2, 5, 'same'), 64)
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index ccce9402c7..9b54b93754 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -1272,7 +1272,7 @@ def conv3d_transpose(value,
                      output_shape,
                      strides,
                      padding="SAME",
-                     data_format=None,
+                     data_format="NDHWC",
                      name=None):
   """The transpose of `conv3d`.
 
@@ -1308,9 +1308,10 @@ def conv3d_transpose(value,
                       [value, filter, output_shape]) as name:
     value = ops.convert_to_tensor(value, name="value")
     filter = ops.convert_to_tensor(filter, name="filter")
-    if not value.get_shape()[4].is_compatible_with(filter.get_shape()[4]):
+    axis = 1 if data_format == "NCDHW" else 4
+    if not value.get_shape()[axis].is_compatible_with(filter.get_shape()[4]):
       raise ValueError("input channels does not match filter's input channels, "
-                       "{} != {}".format(value.get_shape()[4], filter.get_shape(
+                       "{} != {}".format(value.get_shape()[axis], filter.get_shape(
                        )[4]))
 
     output_shape_ = ops.convert_to_tensor(output_shape, name="output_shape")
-- 
GitLab


From 377eca1517f783ca171698aa056a7329d48e88b8 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 26 Apr 2017 08:05:47 -0800
Subject: [PATCH 0692/1563] Improved support for lookup tables. These tables
 are often initialized from large files stored on disk, and can take tens of
 minutes to load: increased the initialization timeout to give grappler enough
 time to load them. Change: 154303608

---
 .../core/grappler/clusters/single_machine.cc  | 19 +++++++++++++++----
 .../core/grappler/clusters/single_machine.h   |  4 ++++
 tensorflow/core/grappler/grappler_item.h      |  2 ++
 .../core/grappler/grappler_item_builder.cc    | 15 ++++++++++-----
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 219d95acdf..09c8d55efd 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -31,6 +31,7 @@ namespace grappler {
 SingleMachine::SingleMachine(int timeout_s, int num_cpu_cores, int num_gpus)
     : Cluster(timeout_s),
       num_gpus_(num_gpus),
+      expected_init_time_s_(0),
       closing_(false) {
   thread_pool_.reset(new thread::ThreadPool(
       Env::Default(), SanitizeThreadSuffix("single_machine"), 2));
@@ -82,6 +83,7 @@ Status SingleMachine::Initialize(const GrapplerItem& item) {
   mutex_lock l(this->last_graph_mu_);
   if (last_graph_ != &item.graph || last_graph_id_ != item.id) {
     init_ops_ = item.init_ops;
+    expected_init_time_s_ = item.expected_init_time;
     last_graph_ = nullptr;
     queue_runner_defs_ = item.queue_runners;
     last_graph_id_ = item.id;
@@ -100,7 +102,9 @@ Status SingleMachine::Run(const GraphDef& graph_def,
       TF_RETURN_IF_ERROR(session_->Create(graph_def));
       if (!init_ops_.empty()) {
         init_metadata_ = RunMetadata();
-        TF_RETURN_IF_ERROR(RunWithTimeout({}, init_ops_, &init_metadata_));
+        int64 timeout_s = timeout_s_ + expected_init_time_s_;
+        TF_RETURN_IF_ERROR(
+            RunWithTimeout({}, init_ops_, &init_metadata_, timeout_s));
         // The compute cost for init ops is likely to be pessimistic since init
         // ops are run only once before warmup. Therefore we only keep their
         // memory costs.
@@ -143,6 +147,13 @@ Status SingleMachine::Run(const GraphDef& graph_def,
 Status SingleMachine::RunWithTimeout(
     const std::vector<std::pair<string, Tensor>>& feed,
     const std::vector<string>& fetch, RunMetadata* run_metadata) {
+  return RunWithTimeout(feed, fetch, run_metadata, timeout_s_);
+}
+
+Status SingleMachine::RunWithTimeout(
+    const std::vector<std::pair<string, Tensor>>& feed,
+    const std::vector<string>& fetch, RunMetadata* run_metadata,
+    int64 timeout_s) {
   // We shouldn't be running or closing the session at this point.
   {
     mutex_lock l(close_mu_);
@@ -155,10 +166,10 @@ Status SingleMachine::RunWithTimeout(
         *status = session_->Run(run_options_, feed, {}, fetch, nullptr,
                                 local_metadata.get());
       },
-      timeout_s_ * 1000, thread_pool_.get());
+      timeout_s * 1000, thread_pool_.get());
   if (!executed_in_time) {
-    return errors::DeadlineExceeded("Failed to run the graph after ",
-                                    timeout_s_, " seconds, aborting");
+    return errors::DeadlineExceeded("Failed to run the graph after ", timeout_s,
+                                    " seconds, aborting");
   } else if (run_metadata && status->ok()) {
     *run_metadata = *local_metadata;
   }
diff --git a/tensorflow/core/grappler/clusters/single_machine.h b/tensorflow/core/grappler/clusters/single_machine.h
index b739b39f2c..f69b11df5d 100644
--- a/tensorflow/core/grappler/clusters/single_machine.h
+++ b/tensorflow/core/grappler/clusters/single_machine.h
@@ -42,6 +42,9 @@ class SingleMachine : public Cluster {
   Status RunWithTimeout(const std::vector<std::pair<string, Tensor>>& feed,
                         const std::vector<string>& fetch,
                         RunMetadata* run_metadata);
+  Status RunWithTimeout(const std::vector<std::pair<string, Tensor>>& feed,
+                        const std::vector<string>& fetch,
+                        RunMetadata* run_metadata, int64 timeout_s);
   Status ResetSession();
   Status CloseSession(bool use_timeout);
 
@@ -52,6 +55,7 @@ class SingleMachine : public Cluster {
   mutex last_graph_mu_;
   const GraphDef* last_graph_ GUARDED_BY(last_graph_mu_) = nullptr;
   std::vector<string> init_ops_;
+  int64 expected_init_time_s_;
   std::unique_ptr<Coordinator> coordinator_;
   std::unique_ptr<thread::ThreadPool> thread_pool_;
 
diff --git a/tensorflow/core/grappler/grappler_item.h b/tensorflow/core/grappler/grappler_item.h
index cb21ae54f0..e0709c682b 100644
--- a/tensorflow/core/grappler/grappler_item.h
+++ b/tensorflow/core/grappler/grappler_item.h
@@ -42,6 +42,8 @@ struct GrapplerItem {
 
   // Initialization op(s).
   std::vector<string> init_ops;
+  // Expected initialization time in seconds, or 0 if unknown
+  int64 expected_init_time = 0;
 
   // Queue runner(s) required to run the queue(s) of this model.
   std::vector<QueueRunnerDef> queue_runners;
diff --git a/tensorflow/core/grappler/grappler_item_builder.cc b/tensorflow/core/grappler/grappler_item_builder.cc
index e37b908fc6..88799ba881 100644
--- a/tensorflow/core/grappler/grappler_item_builder.cc
+++ b/tensorflow/core/grappler/grappler_item_builder.cc
@@ -86,11 +86,6 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
   }
 
   for (auto& node : *new_item->graph.mutable_node()) {
-    // Delete user specified placement if requested.
-    if (cfg.ignore_user_placement) {
-      node.clear_device();
-    }
-
     if (IsPlaceholder(node)) {
       if (node.attr().count("dtype") == 0) {
         LOG(ERROR) << "Unknown type for placeholder " << node.name()
@@ -142,6 +137,11 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
       new_item->feed.emplace_back(node.name(), fake_input);
     }
 
+    // Delete user specified placement if requested.
+    if (cfg.ignore_user_placement) {
+      node.clear_device();
+    }
+    // Delete colocation constraints if requested.
     if (cfg.ignore_colocation) {
       auto attr = node.mutable_attr();
       auto it = attr->find("_class");
@@ -173,6 +173,11 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
     if (inits.has_node_list()) {
       for (const auto& node : inits.node_list().value()) {
         new_item->init_ops.push_back(node);
+        // Tables are initialized from files, which can take a long time. Add 30
+        // minutes to the initialization time for each table to avoid timing
+        // out.
+        // TODO(bsteiner): adjust the timeout based on the file size.
+        new_item->expected_init_time += 30 * 60;
       }
     }
   }
-- 
GitLab


From cfbeafe11d9b86f8685c1c0f97d285885b5a5f1f Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Wed, 26 Apr 2017 08:13:38 -0800
Subject: [PATCH 0693/1563] Add eager (static) checking to assert_equal when
 constant values are available.

This raises errors during graph creation, when possible, instead of at runtime.
Change: 154304392
---
 .../python/kernel_tests/binomial_test.py      |  7 ++-
 .../dirichlet_multinomial_test.py             |  4 +-
 .../kernel_tests/distribution_util_test.py    | 44 +++++++------
 .../python/kernel_tests/geometric_test.py     |  7 ++-
 .../python/kernel_tests/multinomial_test.py   |  4 +-
 .../kernel_tests/negative_binomial_test.py    |  8 ++-
 .../python/kernel_tests/poisson_test.py       |  9 ++-
 .../quantized_distribution_test.py            |  5 +-
 .../python/kernel_tests/check_ops_test.py     | 24 ++++++--
 tensorflow/python/ops/check_ops.py            | 61 +++++++++++++------
 10 files changed, 116 insertions(+), 57 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
index c473d54f47..d30f6e418d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
@@ -19,7 +19,9 @@ from __future__ import print_function
 import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import binomial
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
 
@@ -97,13 +99,14 @@ class BinomialTest(test.TestCase):
       binom.prob([3., 1, 2]).eval()
       binom.cdf([2., 3, 2]).eval()
       binom.cdf([3., 1, 2]).eval()
+      placeholder = array_ops.placeholder(dtypes.float32)
       # Both equality and integer checking fail.
       with self.assertRaisesOpError(
           "cannot contain fractional components."):
-        binom.prob([1.0, 2.5, 1.5]).eval()
+        binom.prob(placeholder).eval(feed_dict={placeholder: [1.0, 2.5, 1.5]})
       with self.assertRaisesOpError(
           "cannot contain fractional components."):
-        binom.cdf([1.0, 2.5, 1.5]).eval()
+        binom.cdf(placeholder).eval(feed_dict={placeholder: [1.0, 2.5, 1.5]})
 
       binom = binomial.Binomial(total_count=n, probs=p, validate_args=False)
       binom.prob([1., 2., 3.]).eval()
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
index 54691d2095..bc25366cfa 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
@@ -18,6 +18,7 @@ from __future__ import print_function
 
 import numpy as np
 from tensorflow.contrib import distributions
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -87,9 +88,10 @@ class DirichletMultinomialTest(test.TestCase):
       dist.prob([3., 0, 2]).eval()
       dist.prob([3.0, 0, 2.0]).eval()
       # Both equality and integer checking fail.
+      placeholder = array_ops.placeholder(dtypes.float32)
       with self.assertRaisesOpError(
           "counts cannot contain fractional components"):
-        dist.prob([1.0, 2.5, 1.5]).eval()
+        dist.prob(placeholder).eval(feed_dict={placeholder: [1.0, 2.5, 1.5]})
       dist = ds.DirichletMultinomial(n, alpha, validate_args=False)
       dist.prob([1., 2., 3.]).eval()
       # Non-integer arguments work.
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
index 5a4a6720f7..2b28392d35 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
@@ -41,42 +41,44 @@ from tensorflow.python.platform import tf_logging as logging
 class AssertCloseTest(test.TestCase):
 
   def testAssertCloseIntegerDtype(self):
-    x = [1, 5, 10, 15, 20]
+    x = array_ops.placeholder(dtypes.int32)
     y = x
-    z = [2, 5, 10, 15, 20]
+    z = array_ops.placeholder(dtypes.int32)
+    feed_dict = {x: [1, 5, 10, 15, 20], z: [2, 5, 10, 15, 20]}
     with self.test_session():
       with ops.control_dependencies([distribution_util.assert_close(x, y)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with ops.control_dependencies([distribution_util.assert_close(y, x)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(x, z)]):
-          array_ops.identity(x).eval()
+          array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(y, z)]):
-          array_ops.identity(y).eval()
+          array_ops.identity(y).eval(feed_dict=feed_dict)
 
   def testAssertCloseNonIntegerDtype(self):
-    x = np.array([1., 5, 10, 15, 20], dtype=np.float32)
+    x = array_ops.placeholder(dtypes.float32)
     y = x + 1e-8
-    z = [2., 5, 10, 15, 20]
+    z = array_ops.placeholder(dtypes.float32)
+    feed_dict = {x: [1., 5, 10, 15, 20], z: [2., 5, 10, 15, 20]}
     with self.test_session():
       with ops.control_dependencies([distribution_util.assert_close(x, y)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with ops.control_dependencies([distribution_util.assert_close(y, x)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(x, z)]):
-          array_ops.identity(x).eval()
+          array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(y, z)]):
-          array_ops.identity(y).eval()
+          array_ops.identity(y).eval(feed_dict=feed_dict)
 
   def testAssertCloseEpsilon(self):
     x = [0., 5, 10, 15, 20]
@@ -98,30 +100,32 @@ class AssertCloseTest(test.TestCase):
 
   def testAssertIntegerForm(self):
     # This should only be detected as an integer.
-    x = [1., 5, 10, 15, 20]
-    y = [1.1, 5, 10, 15, 20]
+    x = array_ops.placeholder(dtypes.float32)
+    y = array_ops.placeholder(dtypes.float32)
     # First component isn't less than float32.eps = 1e-7
-    z = [1.0001, 5, 10, 15, 20]
+    z = array_ops.placeholder(dtypes.float32)
     # This shouldn"t be detected as an integer.
-    w = [1e-8, 5, 10, 15, 20]
+    w = array_ops.placeholder(dtypes.float32)
+    feed_dict = {x: [1., 5, 10, 15, 20], y: [1.1, 5, 10, 15, 20],
+                 z: [1.0001, 5, 10, 15, 20], w: [1e-8, 5, 10, 15, 20]}
     with self.test_session():
       with ops.control_dependencies([distribution_util.assert_integer_form(x)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("x has non-integer components"):
         with ops.control_dependencies(
             [distribution_util.assert_integer_form(y)]):
-          array_ops.identity(y).eval()
+          array_ops.identity(y).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("x has non-integer components"):
         with ops.control_dependencies(
             [distribution_util.assert_integer_form(z)]):
-          array_ops.identity(z).eval()
+          array_ops.identity(z).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("x has non-integer components"):
         with ops.control_dependencies(
             [distribution_util.assert_integer_form(w)]):
-          array_ops.identity(w).eval()
+          array_ops.identity(w).eval(feed_dict=feed_dict)
 
 
 class GetLogitsAndProbsTest(test.TestCase):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py b/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py
index 3dbad7b607..9ef68c4c2c 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py
@@ -22,7 +22,9 @@ import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import geometric
 from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
 
@@ -74,12 +76,13 @@ class GeometricTest(test.TestCase):
     with self.test_session():
       batch_size = 6
       probs = constant_op.constant([.9] * batch_size)
-      x = np.array([2.5, 3.2, 4.3, 5.1, 6., 7.], dtype=np.float32)
+      x = array_ops.placeholder(dtypes.float32, shape=[6])
+      feed_dict = {x: [2.5, 3.2, 4.3, 5.1, 6., 7.]}
       geom = geometric.Geometric(probs=probs)
 
       with self.assertRaisesOpError("Condition x == y"):
         log_prob = geom.log_prob(x)
-        log_prob.eval()
+        log_prob.eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x >= 0"):
         log_prob = geom.log_prob(np.array([-1.], dtype=np.float32))
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
index 169498be24..b1c0c9f7a9 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
@@ -18,6 +18,7 @@ from __future__ import print_function
 
 import numpy as np
 from tensorflow.contrib import distributions
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -100,9 +101,10 @@ class MultinomialTest(test.TestCase):
       with self.assertRaisesOpError("counts must sum to `self.total_count`"):
         multinom.prob([2., 3, 2]).eval()
       # Counts are non-integers.
+      x = array_ops.placeholder(dtypes.float32)
       with self.assertRaisesOpError(
           "cannot contain fractional components."):
-        multinom.prob([1.0, 2.5, 1.5]).eval()
+        multinom.prob(x).eval(feed_dict={x: [1.0, 2.5, 1.5]})
 
       multinom = ds.Multinomial(total_count=n, probs=p, validate_args=False)
       multinom.prob([1., 2., 2.]).eval()
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py
index f55de99396..c1a74c6483 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py
@@ -21,6 +21,7 @@ import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import negative_binomial
 from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -140,17 +141,18 @@ class NegativeBinomialTest(test.TestCase):
       batch_size = 6
       probs = [.9] * batch_size
       total_count = 5.
-      x = np.array([2.5, 3.2, 4.3, 5.1, 6., 7.], dtype=np.float32)
+      x = array_ops.placeholder(dtypes.float32, shape=[6])
+      feed_dict = {x: [2.5, 3.2, 4.3, 5.1, 6., 7.]}
       negbinom = negative_binomial.NegativeBinomial(
           total_count=total_count, probs=probs, validate_args=True)
 
       with self.assertRaisesOpError("Condition x == y"):
         log_pmf = negbinom.log_prob(x)
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x >= 0"):
         log_pmf = negbinom.log_prob([-1.])
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       negbinom = negative_binomial.NegativeBinomial(
           total_count=total_count, probs=probs, validate_args=False)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py b/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py
index b1a9478b43..f157c0d3ed 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py
@@ -21,7 +21,9 @@ import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import poisson as poisson_lib
 from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
 
@@ -64,17 +66,18 @@ class PoissonTest(test.TestCase):
     with self.test_session():
       batch_size = 6
       lam = constant_op.constant([3.0] * batch_size)
-      x = [2.5, 3.2, 4.3, 5.1, 6., 7.]
+      x = array_ops.placeholder(dtypes.float32, shape=[6])
+      feed_dict = {x: [2.5, 3.2, 4.3, 5.1, 6., 7.]}
       poisson = poisson_lib.Poisson(rate=lam, validate_args=True)
 
       # Non-integer
       with self.assertRaisesOpError("cannot contain fractional components"):
         log_pmf = poisson.log_prob(x)
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x >= 0"):
         log_pmf = poisson.log_prob([-1.])
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       poisson = poisson_lib.Poisson(rate=lam, validate_args=False)
       log_pmf = poisson.log_prob(x)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py b/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py
index 0e2d143732..6a7ee3a8bf 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py
@@ -373,15 +373,16 @@ class QuantizedDistributionTest(test.TestCase):
 
   def testCutoffsMustBeIntegerValuedIfValidateArgsTrue(self):
     with self.test_session():
+      low = array_ops.placeholder(dtypes.float32)
       qdist = distributions.QuantizedDistribution(
           distribution=distributions.Normal(loc=0., scale=1.),
-          low=1.5,
+          low=low,
           high=10.,
           validate_args=True)
 
       self.assertTrue(qdist.validate_args)  # Default is True.
       with self.assertRaisesOpError("has non-integer components"):
-        qdist.sample().eval()
+        qdist.sample().eval(feed_dict={low: 1.5})
 
   def testCutoffsCanBeFloatValuedIfValidateArgsFalse(self):
     with self.test_session():
diff --git a/tensorflow/python/kernel_tests/check_ops_test.py b/tensorflow/python/kernel_tests/check_ops_test.py
index d688b16478..ed859e3774 100644
--- a/tensorflow/python/kernel_tests/check_ops_test.py
+++ b/tensorflow/python/kernel_tests/check_ops_test.py
@@ -80,23 +80,35 @@ class AssertEqualTest(test.TestCase):
 
   def test_raises_when_greater(self):
     with self.test_session():
-      small = constant_op.constant([1, 2], name="small")
-      big = constant_op.constant([3, 4], name="big")
+      # Static check
+      static_small = constant_op.constant([1, 2], name="small")
+      static_big = constant_op.constant([3, 4], name="big")
+      with self.assertRaisesRegexp(ValueError, "fail"):
+        check_ops.assert_equal(static_big, static_small, message="fail")
+      # Dynamic check
+      small = array_ops.placeholder(dtypes.int32, name="small")
+      big = array_ops.placeholder(dtypes.int32, name="big")
       with ops.control_dependencies(
           [check_ops.assert_equal(
               big, small, message="fail")]):
         out = array_ops.identity(small)
       with self.assertRaisesOpError("fail.*big.*small"):
-        out.eval()
+        out.eval(feed_dict={small: [1, 2], big: [3, 4]})
 
   def test_raises_when_less(self):
     with self.test_session():
-      small = constant_op.constant([3, 1], name="small")
-      big = constant_op.constant([4, 2], name="big")
+      # Static check
+      static_small = constant_op.constant([3, 1], name="small")
+      static_big = constant_op.constant([4, 2], name="big")
+      with self.assertRaisesRegexp(ValueError, "fail"):
+        check_ops.assert_equal(static_big, static_small, message="fail")
+      # Dynamic check
+      small = array_ops.placeholder(dtypes.int32, name="small")
+      big = array_ops.placeholder(dtypes.int32, name="big")
       with ops.control_dependencies([check_ops.assert_equal(small, big)]):
         out = array_ops.identity(small)
       with self.assertRaisesOpError("small.*big"):
-        out.eval()
+        out.eval(feed_dict={small: [3, 1], big: [4, 2]})
 
   def test_doesnt_raise_when_equal_and_broadcastable_shapes(self):
     with self.test_session():
diff --git a/tensorflow/python/ops/check_ops.py b/tensorflow/python/ops/check_ops.py
index 8401f5493b..753999a672 100644
--- a/tensorflow/python/ops/check_ops.py
+++ b/tensorflow/python/ops/check_ops.py
@@ -84,6 +84,22 @@ __all__ = [
 ]
 
 
+def _maybe_constant_value_string(t):
+  if not isinstance(t, ops.Tensor):
+    return str(t)
+  const_t = tensor_util.constant_value(t)
+  if const_t is not None:
+    return str(const_t)
+  return t
+
+
+def _assert_static(condition, data):
+  """Raises a static ValueError with as much information as possible."""
+  if not condition:
+    data_static = [_maybe_constant_value_string(x) for x in data]
+    raise ValueError('\n'.join(data_static))
+
+
 def assert_proper_iterable(values):
   """Static assert that values is a "proper" iterable.
 
@@ -140,7 +156,9 @@ def assert_negative(x, data=None, summarize=None, message=None, name=None):
     x = ops.convert_to_tensor(x, name='x')
     if data is None:
       data = [
-          message, 'Condition x < 0 did not hold element-wise: x = ', x.name, x]
+          message,
+          'Condition x < 0 did not hold element-wise:',
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less(x, zero, data=data, summarize=summarize)
 
@@ -174,7 +192,8 @@ def assert_positive(x, data=None, summarize=None, message=None, name=None):
     x = ops.convert_to_tensor(x, name='x')
     if data is None:
       data = [
-          message, 'Condition x > 0 did not hold element-wise: x = ', x.name, x]
+          message, 'Condition x > 0 did not hold element-wise:',
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less(zero, x, data=data, summarize=summarize)
 
@@ -210,7 +229,8 @@ def assert_non_negative(x, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x >= 0 did not hold element-wise: x = ', x.name, x]
+          'Condition x >= 0 did not hold element-wise:',
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less_equal(zero, x, data=data, summarize=summarize)
 
@@ -246,7 +266,8 @@ def assert_non_positive(x, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x <= 0 did not hold element-wise: x = ', x.name, x]
+          'Condition x <= 0 did not hold element-wise:'
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less_equal(x, zero, data=data, summarize=summarize)
 
@@ -284,10 +305,16 @@ def assert_equal(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x == y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x == y did not hold element-wise:',
+          'x (%s) = ' % x.name, x,
+          'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.equal(x, y))
+    x_static = tensor_util.constant_value(x)
+    y_static = tensor_util.constant_value(y)
+    if x_static is not None and y_static is not None:
+      condition_static = (x_static == y_static).all()
+      _assert_static(condition_static, data)
     return control_flow_ops.Assert(condition, data, summarize=summarize)
 
 
@@ -326,9 +353,9 @@ def assert_none_equal(
     if data is None:
       data = [
           message,
-          'Condition x != y did not hold for every single element: x = ',
-          x.name, x,
-          'y = ', y.name, y
+          'Condition x != y did not hold for every single element:'
+          'x (%s) = ' % x.name, x,
+          'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.not_equal(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -367,8 +394,8 @@ def assert_less(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x < y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x < y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.less(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -407,8 +434,8 @@ def assert_less_equal(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x <= y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x <= y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.less_equal(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -447,8 +474,8 @@ def assert_greater(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x > y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x > y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.greater(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -489,8 +516,8 @@ def assert_greater_equal(x, y, data=None, summarize=None, message=None,
     if data is None:
       data = [
           message,
-          'Condition x >= y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x >= y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.greater_equal(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
-- 
GitLab


From 9845d0e822f1a8ec455507f48541b379c9778829 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Wed, 26 Apr 2017 08:53:36 -0800
Subject: [PATCH 0694/1563] Add tf.log_sigmoid

This is a numerically stable version of tf.log(tf.sigmoid(x)).  It's just
-tf.nn.softplus(-x), but it's easy to add and the identity is easy to mistype.

RELNOTES: Add tf.log_sigmoid(x) = tf.log(tf.sigmoid(x)) = -tf.nn.softplus(-x).

Fixes #3719.
Change: 154308666
---
 tensorflow/python/BUILD                       |  1 +
 tensorflow/python/kernel_tests/BUILD          |  1 +
 .../python/kernel_tests/cwise_ops_test.py     |  5 +++++
 tensorflow/python/ops/math_ops.py             | 19 +++++++++++++++++++
 tensorflow/python/ops/nn.py                   |  1 +
 tensorflow/python/ops/standard_ops.py         |  1 +
 tensorflow/tools/api/golden/tensorflow.pbtxt  |  4 ++++
 7 files changed, 32 insertions(+)

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 15845506d9..2a61735bb5 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -1499,6 +1499,7 @@ py_library(
         ":framework_ops",
         ":graph_util",
         ":math_ops_gen",
+        ":nn_ops_gen",
         ":sparse_ops_gen",
         ":sparse_tensor",
         ":spectral_ops_gen",
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index cdb15e0a91..06a0aa468a 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2347,6 +2347,7 @@ cuda_py_test(
         "//tensorflow/python:gradients",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:math_ops_gen",
+        "//tensorflow/python:nn_grad",
         "//tensorflow/python:platform",
         "//tensorflow/python:variables",
     ],
diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py
index 9cd42d8851..cd0d33ecf3 100644
--- a/tensorflow/python/kernel_tests/cwise_ops_test.py
+++ b/tensorflow/python/kernel_tests/cwise_ops_test.py
@@ -31,6 +31,7 @@ from tensorflow.python.ops import gen_math_ops
 from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn_grad  # pylint: disable=unused-import
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging
@@ -165,6 +166,9 @@ class UnaryOpTest(test.TestCase):
   def _sigmoid(self, x):
     return 1.0 / (1.0 + np.exp(-x))
 
+  def _log_sigmoid(self, x):
+    return np.log(self._sigmoid(x))
+
   def _replace_domain_error_with_inf(self, fn):
 
     def func(x):
@@ -198,6 +202,7 @@ class UnaryOpTest(test.TestCase):
     self._compareBoth(z, np.log1p, math_ops.log1p)
     self._compareBoth(x, np.tanh, math_ops.tanh)
     self._compareBoth(x, self._sigmoid, math_ops.sigmoid)
+    self._compareBoth(x, self._log_sigmoid, math_ops.log_sigmoid)
     self._compareBoth(y, np.sign, math_ops.sign)
     self._compareBoth(x, np.sin, math_ops.sin)
     self._compareBoth(x, np.cos, math_ops.cos)
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 36a4184950..5f4ce63f31 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -151,6 +151,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gen_control_flow_ops
 from tensorflow.python.ops import gen_data_flow_ops
 from tensorflow.python.ops import gen_math_ops
+from tensorflow.python.ops import gen_nn_ops
 from tensorflow.python.ops import gen_sparse_ops
 from tensorflow.python.ops import gen_spectral_ops
 from tensorflow.python.ops import gen_state_ops
@@ -2004,6 +2005,24 @@ def sigmoid(x, name=None):
     return gen_math_ops._sigmoid(x, name=name)
 
 
+def log_sigmoid(x, name=None):
+  """Computes log sigmoid of `x` element-wise.
+
+  Specifically, `y = log(1 / (1 + exp(-x)))`.  For numerical stability,
+  we use `y = -tf.nn.softplus(-x)`.
+
+  Args:
+    x: A Tensor with type `float32` or `float64`.
+    name: A name for the operation (optional).
+
+  Returns:
+    A Tensor with the same type as `x`.
+  """
+  with ops.name_scope(name, "LogSigmoid", [x]) as name:
+    x = ops.convert_to_tensor(x, name="x")
+    return gen_math_ops._neg(gen_nn_ops.softplus(-x), name=name)
+
+
 def tanh(x, name=None):
   """Computes hyperbolic tangent of `x` element-wise.
 
diff --git a/tensorflow/python/ops/nn.py b/tensorflow/python/ops/nn.py
index c5c5169231..7b6494e0c9 100644
--- a/tensorflow/python/ops/nn.py
+++ b/tensorflow/python/ops/nn.py
@@ -27,6 +27,7 @@ See the @{$python/nn} guide.
 @@dropout
 @@bias_add
 @@sigmoid
+@@log_sigmoid
 @@tanh
 @@convolution
 @@conv2d
diff --git a/tensorflow/python/ops/standard_ops.py b/tensorflow/python/ops/standard_ops.py
index 9d24eb242d..09e04d4247 100644
--- a/tensorflow/python/ops/standard_ops.py
+++ b/tensorflow/python/ops/standard_ops.py
@@ -145,6 +145,7 @@ _allowed_symbols_math_ops = [
     # These are documented in nn.
     # We are are not importing nn because it would create a circular dependency.
     "sigmoid",
+    "log_sigmoid",
     "tanh",
 ]
 
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index b0e0924093..a8d3dd65c7 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -1168,6 +1168,10 @@ tf_module {
     name: "log1p"
     argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
+  member_method {
+    name: "log_sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "logical_and"
     argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-- 
GitLab


From 59258116924451bfc8ed5eba9d3efa4d12df47f1 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 26 Apr 2017 10:12:14 -0800
Subject: [PATCH 0695/1563] GrapplerItem is a struct and not a class Change:
 154319534

---
 .../core/grappler/inputs/trivial_test_graph_input_yielder.h     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h b/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h
index 4c5600c816..434b660614 100644
--- a/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h
+++ b/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h
@@ -24,7 +24,7 @@ namespace tensorflow {
 namespace grappler {
 
 class Cluster;
-class GrapplerItem;
+struct GrapplerItem;
 
 class TrivialTestGraphInputYielder : public InputYielder {
  public:
-- 
GitLab


From 320719d76483fba26fc92dfc3cda1736201efd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Wed, 26 Apr 2017 10:13:05 -0800
Subject: [PATCH 0696/1563] Migrate tf_storage and tf_globals to d3v4. Change:
 154319656

---
 .../components/tf_globals_d3v4/globals.ts     |  38 ++
 .../components/tf_storage_d3v4/storage.ts     | 400 ++++++++++++++++++
 .../tf_storage_d3v4/storageTests.ts           |  64 +++
 .../components/tf_storage_d3v4/tests.html     |  30 ++
 4 files changed, 532 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/tests.html

diff --git a/tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts b/tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts
new file mode 100644
index 0000000000..42c73708cd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts
@@ -0,0 +1,38 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+
+
+// The names of TensorBoard tabs.
+export const TABS = [
+  'scalars', 'images', 'audio', 'graphs', 'distributions', 'histograms',
+  'embeddings', 'text'
+];
+
+// If true, TensorBoard stores its hash in the URI state.
+// If false, tab switching in TensorBoard will not update location hash,
+// because hash updates interfere with wct_tests.
+export let USE_HASH = false;
+
+let _fakeHash = '';
+
+export function setFakeHash(h: string) {
+  _fakeHash = h;
+}
+
+export function getFakeHash() {
+  return _fakeHash;
+}
+
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts b/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
new file mode 100644
index 0000000000..19a27b9cbd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
@@ -0,0 +1,400 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {USE_HASH, setFakeHash, getFakeHash, TABS} from '../tf_globals_d3v4/globals';
+import * as _ from 'lodash';
+
+
+/* tslint:disable:no-namespace variable-name */
+/**
+ * The Storage Module provides storage for URL parameters, and an API for
+ * getting and setting TensorBoard's stateful URI.
+ *
+ * It generates URI components like: events&runPrefix=train*
+ * which TensorBoard uses after like localhost:8000/#events&runPrefix=train*
+ * to store state in the URI.
+ *
+ * It also allows saving the values to localStorage for long-term persistance.
+ */
+type StringDict = {[key: string]: string};
+
+/**
+ * A key that users cannot use, since TensorBoard uses this to store info
+ * about the active tab.
+ */
+export let TAB = '__tab__';
+
+/**
+ * The name of the property for users to set on a Polymer component
+ * in order for its stored properties to be stored in the URI unambiguously.
+ * (No need to set this if you want mutliple instances of the component to
+ * share URI state)
+ *
+ * Example:
+ * <my-component disambiguator="0"></my-component>
+ *
+ * The disambiguator should be set to any unique value so that multiple
+ * instances of the component can store properties in URI storage.
+ *
+ * Because it's hard to dereference this variable in HTML property bindings,
+ * it is NOT safe to change the disambiguator string without find+replace
+ * across the codebase.
+ */
+export let DISAMBIGUATOR = 'disambiguator';
+
+/**
+ * Return a string stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getString(key: string, useLocalStorage: boolean): string {
+  if (useLocalStorage) {
+    return window.localStorage.getItem(key);
+  } else {
+    return _componentToDict(_readComponent())[key];
+  }
+}
+
+/**
+ * Set a string in URI or localStorage.
+ */
+export function setString(
+    key: string, value: string, useLocalStorage: boolean) {
+  if (useLocalStorage) {
+    window.localStorage.setItem(key, value);
+  } else {
+    const items = _componentToDict(_readComponent());
+    items[key] = value;
+    _writeComponent(_dictToComponent(items));
+  }
+}
+
+/**
+ * Return a boolean stored in stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getBoolean(key: string, useLocalStorage: boolean): boolean {
+  const item = getString(key, useLocalStorage);
+  return item === 'true' ? true : item === 'false' ? false : undefined;
+}
+
+/**
+ * Store a boolean in URI or localStorage.
+ */
+export function setBoolean(
+    key: string, value: boolean, useLocalStorage = false) {
+  setString(key, value.toString(), useLocalStorage);
+}
+
+/**
+ * Return a number stored in stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getNumber(key: string, useLocalStorage: boolean): number {
+  const item = getString(key, useLocalStorage);
+  return item === undefined ? undefined : +item;
+}
+
+/**
+ * Store a number in URI or localStorage.
+ */
+export function setNumber(
+    key: string, value: number, useLocalStorage: boolean) {
+  setString(key, '' + value, useLocalStorage);
+}
+
+/**
+ * Return an object stored in stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getObject(key: string, useLocalStorage: boolean): {} {
+  const item = getString(key, useLocalStorage);
+  return item === undefined ? undefined : JSON.parse(atob(item));
+}
+
+/**
+ * Store an object in URI or localStorage.
+ */
+export function setObject(key: string, value: {}, useLocalStorage: boolean) {
+  setString(key, btoa(JSON.stringify(value)), useLocalStorage);
+}
+
+/**
+ * Get a unique storage name for a (Polymer component, propertyName) tuple.
+ *
+ * DISAMBIGUATOR must be set on the component, if other components use the
+ * same propertyName.
+ */
+export function getURIStorageName(
+    component: {}, propertyName: string): string {
+  const d = component[DISAMBIGUATOR];
+  const components = d == null ? [propertyName] : [d, propertyName];
+  return components.join('.');
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer boolean property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+export function getBooleanInitializer(
+    propertyName: string, defaultVal: boolean,
+    useLocalStorage = false): Function {
+  return _getInitializer(
+      getBoolean, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer string property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+export function getStringInitializer(
+    propertyName: string, defaultVal: string,
+    useLocalStorage = false): Function {
+  return _getInitializer(
+      getString, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer number property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+export function getNumberInitializer(
+    propertyName: string, defaultVal: number,
+    useLocalStorage = false): Function {
+  return _getInitializer(
+      getNumber, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer Object property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ *
+ * Generates a deep clone of the defaultVal to avoid mutation issues.
+ */
+export function getObjectInitializer(
+    propertyName: string, defaultVal: {}, useLocalStorage = false): Function {
+  return _getInitializer(
+      getObject, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when a string property changes.
+ */
+export function getBooleanObserver(
+    propertyName: string, defaultVal: boolean,
+    useLocalStorage = false): Function {
+  return _getObserver(
+      getBoolean, setBoolean, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when a string property changes.
+ */
+export function getStringObserver(
+    propertyName: string, defaultVal: string,
+    useLocalStorage = false): Function {
+  return _getObserver(
+      getString, setString, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when a number property changes.
+ */
+export function getNumberObserver(
+    propertyName: string, defaultVal: number,
+    useLocalStorage = false): Function {
+  return _getObserver(
+      getNumber, setNumber, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when an object property changes.
+ * Generates a deep clone of the defaultVal to avoid mutation issues.
+ */
+export function getObjectObserver(
+    propertyName: string, defaultVal: {}, useLocalStorage = false): Function {
+  const clone = _.cloneDeep(defaultVal);
+  return _getObserver(
+      getObject, setObject, propertyName, clone, useLocalStorage);
+}
+
+/**
+ * Read component from URI (e.g. returns "events&runPrefix=train*").
+ */
+function _readComponent(): string {
+  return USE_HASH ? window.location.hash.slice(1) : getFakeHash();
+}
+
+/**
+ * Write component to URI.
+ */
+function _writeComponent(component: string) {
+  if (USE_HASH) {
+    window.location.hash = component;
+  } else {
+    setFakeHash(component);
+  }
+}
+
+/**
+ * Convert dictionary of strings into a URI Component.
+ * All key value entries get added as key value pairs in the component,
+ * with the exception of a key with the TAB value, which if present
+ * gets prepended to the URI Component string for backwards comptability
+ * reasons.
+ */
+function _dictToComponent(items: StringDict): string {
+  let component = '';
+
+  // Add the tab name e.g. 'events', 'images', 'histograms' as a prefix
+  // for backwards compatbility.
+  if (items[TAB] !== undefined) {
+    component += items[TAB];
+  }
+
+  // Join other strings with &key=value notation
+  const nonTab = _.pairs(items)
+                   .filter((pair) =>  pair[0] !== TAB)
+                   .map((pair) => {
+                     return encodeURIComponent(pair[0]) + '=' +
+                         encodeURIComponent(pair[1]);
+                   })
+                   .join('&');
+
+  return nonTab.length > 0 ? (component + '&' + nonTab) : component;
+}
+
+/**
+ * Convert a URI Component into a dictionary of strings.
+ * Component should consist of key-value pairs joined by a delimiter
+ * with the exception of the tabName.
+ * Returns dict consisting of all key-value pairs and
+ * dict[TAB] = tabName
+ */
+function _componentToDict(component: string): StringDict {
+  const items = {} as StringDict;
+
+  const tokens = component.split('&');
+  tokens.forEach((token) => {
+    const kv = token.split('=');
+    // Special backwards compatibility for URI components like #events
+    if (kv.length === 1 && _.contains(TABS, kv[0])) {
+      items[TAB] = kv[0];
+    } else if (kv.length === 2) {
+      items[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
+    }
+  });
+  return items;
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+function _getInitializer<T>(
+    get: (name: string, useLocalStorage: boolean) => T, propertyName: string,
+    defaultVal: T, useLocalStorage): Function {
+  return function() {
+    const URIStorageName = getURIStorageName(this, propertyName);
+    // setComponentValue will be called every time the hash changes, and is
+    // responsible for ensuring that new state in the hash will be propagated
+    // to the component with that property.
+    // It is important that this function does not re-assign needlessly,
+    // to avoid Polymer observer churn.
+    const setComponentValue = () => {
+      const uriValue = get(URIStorageName, false);
+      const currentValue = this[propertyName];
+      // if uriValue is undefined, we will ensure that the property has the
+      // default value
+      if (uriValue === undefined) {
+        let valueToSet: T;
+        // if we are using localStorage, we will set the value to the value
+        // from localStorage. Then, the corresponding observer will proxy
+        // the localStorage value into URI storage.
+        // in this way, localStorage takes precedence over the default val
+        // but not over the URI value.
+        if (useLocalStorage) {
+          const useLocalStorageValue = get(URIStorageName, true);
+          valueToSet = useLocalStorageValue === undefined ?
+              defaultVal :
+              useLocalStorageValue;
+        } else {
+          valueToSet = defaultVal;
+        }
+        if (!_.isEqual(currentValue, valueToSet)) {
+          // If we don't have an explicit URI value, then we need to ensure
+          // the property value is equal to the default value.
+          // We will assign a clone rather than the canonical default, because
+          // the component receiving this property may mutate it, and we need
+          // to keep a pristine copy of the default.
+          this[propertyName] = _.clone(valueToSet);
+        }
+        // In this case, we have an explicit URI value, so we will ensure that
+        // the component has an equivalent value.
+      } else {
+        if (!_.isEqual(uriValue, currentValue)) {
+          this[propertyName] = uriValue;
+        }
+      }
+    };
+    // Set the value on the property.
+    setComponentValue();
+    // Update it when the hashchanges.
+    window.addEventListener('hashchange', setComponentValue);
+  };
+}
+
+/**
+ * Return a function that updates URIStorage when a property changes.
+ */
+function _getObserver<T>(
+    get: (name: string, useLocalStorage: boolean) => T,
+    set: (name: string, newVal: T, useLocalStorage: boolean) => void,
+    propertyName: string, defaultVal: T, useLocalStorage: boolean): Function {
+  return function() {
+    const URIStorageName = getURIStorageName(this, propertyName);
+    const newVal = this[propertyName];
+    // if this is a localStorage property, we always synchronize the value
+    // in localStorage to match the one currently in the URI.
+    if (useLocalStorage) {
+      set(URIStorageName, newVal, true);
+    }
+    if (!_.isEqual(newVal, get(URIStorageName, false))) {
+      if (_.isEqual(newVal, defaultVal)) {
+        _unsetFromURI(URIStorageName);
+      } else {
+        set(URIStorageName, newVal, false);
+      }
+    }
+  };
+}
+
+/**
+ * Delete a key from the URI.
+ */
+function _unsetFromURI(key) {
+  const items = _componentToDict(_readComponent());
+  delete items[key];
+  _writeComponent(_dictToComponent(items));
+}
+
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts b/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
new file mode 100644
index 0000000000..adc4dde716
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
@@ -0,0 +1,64 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {TAB, getString, getNumber, getObject, setString, setNumber, setObject} from './storage';
+import {TABS} from '../tf_globals_d3v4/globals';
+
+/* tslint:disable:no-namespace */
+describe('URIStorage', () => {
+  it('get/setString', () => {
+    setString('key_a', 'hello', false);
+    setString('key_b', 'there', false);
+    chai.assert.equal('hello', getString('key_a', false));
+    chai.assert.equal('there', getString('key_b', false));
+    chai.assert.equal(null, getString('key_c', false));
+  });
+
+  it('get/setNumber', () => {
+    setNumber('key_a', 12, false);
+    setNumber('key_b', 3.4, false);
+    chai.assert.equal(12, getNumber('key_a', false));
+    chai.assert.equal(3.4, getNumber('key_b', false));
+    chai.assert.equal(null, getNumber('key_c', false));
+  });
+
+  it('get/setObject', () => {
+    const obj = {'foo': 2.3, 'bar': 'barstr'};
+    setObject('key_a', obj, false);
+    chai.assert.deepEqual(obj, getObject('key_a', false));
+  });
+
+  it('get/setWeirdValues', () => {
+    setNumber('key_a', NaN, false);
+    chai.assert.deepEqual(NaN, getNumber('key_a', false));
+
+    setNumber('key_a', +Infinity, false);
+    chai.assert.equal(+Infinity, getNumber('key_a', false));
+
+    setNumber('key_a', -Infinity, false);
+    chai.assert.equal(-Infinity, getNumber('key_a', false));
+
+    setNumber('key_a', 1 / 3, false);
+    chai.assert.equal(1 / 3, getNumber('key_a', false));
+
+    setNumber('key_a', -0, false);
+    chai.assert.equal(-0, getNumber('key_a', false));
+  });
+
+  it('set/getTab', () => {
+    setString(TAB, TABS[0], false);
+    chai.assert.equal(TABS[0], getString(TAB, false));
+  });
+});
+
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html b/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html
new file mode 100644
index 0000000000..6d395b0702
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../../polymer/polymer.html">
+  <link rel="import" href="../tf-storage.html">
+</head>
+<body>
+  <script src="storageTests.js"></script>
+</body>
+</html>
-- 
GitLab


From 7c5defbff92d51bc43ca9c918179c0c29e8a8243 Mon Sep 17 00:00:00 2001
From: Vu Pham <phvu@users.noreply.github.com>
Date: Wed, 26 Apr 2017 20:51:14 +0200
Subject: [PATCH 0697/1563] GridRNN cell uses tuples for output and states
 (#6832)

* use tuple for states and output of gridRNN cells

* code style update, change LSTMCell to use state_as_tuple

* fix line continuations and example code in doc string

* checking for None explicitly
---
 .../python/kernel_tests/grid_rnn_test.py      | 709 +++++++++++-------
 .../grid_rnn/python/ops/grid_rnn_cell.py      | 423 +++++++----
 2 files changed, 702 insertions(+), 430 deletions(-)

diff --git a/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py b/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py
index 758e0bcc07..6455e01894 100644
--- a/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py
+++ b/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py
@@ -34,356 +34,429 @@ from tensorflow.python.platform import test
 class GridRNNCellTest(test.TestCase):
 
   def testGrid2BasicLSTMCell(self):
-    with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.2)) as root_scope:
+    with self.test_session(use_gpu=False) as sess:
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.2)) as root_scope:
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2BasicLSTMCell(2)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
-        })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.36617181, 0.36617181]])
-        self.assertAllClose(res[1], [[0.71053141, 0.71053141, 0.36617181,
-                                      0.36617181, 0.72320831, 0.80555487,
-                                      0.39102408, 0.42150158]])
+        res_g, res_s = sess.run(
+            [g, s], {x: np.array([[1., 1., 1.]]),
+                     m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                         (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+
+        self.assertAllClose(res_g, ([[0.36617181, 0.36617181]], ))
+        self.assertAllClose(res_s, (([[0.71053141, 0.71053141]],
+                                     [[0.36617181, 0.36617181]]),
+                                    ([[0.72320831, 0.80555487]],
+                                     [[0.39102408, 0.42150158]])))
 
         # emulate a loop through the input sequence,
         # where we call cell() multiple times
         root_scope.reuse_variables()
         g2, s2 = cell(x, m)
-        self.assertEqual(g2.get_shape(), (1, 2))
-        self.assertEqual(s2.get_shape(), (1, 8))
-
-        res = sess.run([g2, s2], {x: np.array([[2., 2., 2.]]), m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.58847463, 0.58847463]])
-        self.assertAllClose(res[1], [[1.40469193, 1.40469193, 0.58847463,
-                                      0.58847463, 0.97726452, 1.04626071,
-                                      0.4927212, 0.51137757]])
+        self.assertEqual(g2[0].get_shape(), (1, 2))
+        self.assertEqual(s2[0].c.get_shape(), (1, 2))
+        self.assertEqual(s2[0].h.get_shape(), (1, 2))
+        self.assertEqual(s2[1].c.get_shape(), (1, 2))
+        self.assertEqual(s2[1].h.get_shape(), (1, 2))
+
+        res_g2, res_s2 = sess.run([g2, s2],
+                                  {x: np.array([[2., 2., 2.]]), m: res_s})
+        self.assertEqual(res_g2[0].shape, (1, 2))
+        self.assertEqual(res_s2[0].c.shape, (1, 2))
+        self.assertEqual(res_s2[0].h.shape, (1, 2))
+        self.assertEqual(res_s2[1].c.shape, (1, 2))
+        self.assertEqual(res_s2[1].h.shape, (1, 2))
+        self.assertAllClose(res_g2[0], [[0.58847463, 0.58847463]])
+        self.assertAllClose(res_s2, (([[1.40469193, 1.40469193]],
+                                      [[0.58847463, 0.58847463]]),
+                                     ([[0.97726452, 1.04626071]],
+                                      [[0.4927212, 0.51137757]])))
 
   def testGrid2BasicLSTMCellTied(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=False) as sess:
       with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.2)):
+              'root', initializer=init_ops.constant_initializer(0.2)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2BasicLSTMCell(2, tied=True)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
-        })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.36617181, 0.36617181]])
-        self.assertAllClose(res[1], [[0.71053141, 0.71053141, 0.36617181,
-                                      0.36617181, 0.72320831, 0.80555487,
-                                      0.39102408, 0.42150158]])
-
-        res = sess.run([g, s], {x: np.array([[1., 1., 1.]]), m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.36703536, 0.36703536]])
-        self.assertAllClose(res[1], [[0.71200621, 0.71200621, 0.36703536,
-                                      0.36703536, 0.80941606, 0.87550586,
-                                      0.40108523, 0.42199609]])
+        res_g, res_s = sess.run(
+            [g, s], {x: np.array([[1., 1., 1.]]),
+                     m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                         (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+
+        self.assertAllClose(res_g[0], [[0.36617181, 0.36617181]])
+        self.assertAllClose(res_s, (([[0.71053141, 0.71053141]],
+                                     [[0.36617181, 0.36617181]]),
+                                    ([[0.72320831, 0.80555487]],
+                                     [[0.39102408, 0.42150158]])))
+
+        res_g, res_s = sess.run([g, s], {x: np.array([[1., 1., 1.]]), m: res_s})
+        self.assertEqual(res_g[0].shape, (1, 2))
+
+        self.assertAllClose(res_g[0], [[0.36703536, 0.36703536]])
+        self.assertAllClose(res_s, (([[0.71200621, 0.71200621]],
+                                     [[0.36703536, 0.36703536]]),
+                                    ([[0.80941606, 0.87550586]],
+                                     [[0.40108523, 0.42199609]])))
 
   def testGrid2BasicLSTMCellWithRelu(self):
-    with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.2)):
+    with self.test_session(use_gpu=False) as sess:
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.2)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),)
         cell = grid_rnn_cell.Grid2BasicLSTMCell(
             2, tied=False, non_recurrent_fn=nn_ops.relu)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, ((2, 2), ))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1., 1.]]),
-             m: np.array([[0.1, 0.2, 0.3, 0.4]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.31667367, 0.31667367]])
-        self.assertAllClose(res[1], [[0.29530135, 0.37520045, 0.17044567,
-                                      0.21292259]])
+        res_g, res_s = sess.run(
+          [g, s], {x: np.array([[1., 1., 1.]]),
+                   m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])), )})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertAllClose(res_g[0], [[0.31667367, 0.31667367]])
+        self.assertAllClose(res_s, (([[0.29530135, 0.37520045]],
+                                     [[0.17044567, 0.21292259]]), ))
 
   """LSTMCell
   """
 
   def testGrid2LSTMCell(self):
-    with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+    with self.test_session(use_gpu=False) as sess:
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2LSTMCell(2, use_peepholes=True)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
-        })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.95686918, 0.95686918]])
-        self.assertAllClose(res[1], [[2.41515064, 2.41515064, 0.95686918,
-                                      0.95686918, 1.38917875, 1.49043763,
-                                      0.83884692, 0.86036491]])
+        res_g, res_s = sess.run(
+            [g, s], {x: np.array([[1., 1., 1.]]),
+                     m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                         (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+
+        self.assertAllClose(res_g[0], [[0.95686918, 0.95686918]])
+        self.assertAllClose(res_s, (([[2.41515064, 2.41515064]],
+                                     [[0.95686918, 0.95686918]]),
+                                    ([[1.38917875, 1.49043763]],
+                                     [[0.83884692, 0.86036491]])))
 
   def testGrid2LSTMCellTied(self):
-    with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+    with self.test_session(use_gpu=False) as sess:
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2LSTMCell(2, tied=True, use_peepholes=True)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
-        })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.95686918, 0.95686918]])
-        self.assertAllClose(res[1], [[2.41515064, 2.41515064, 0.95686918,
-                                      0.95686918, 1.38917875, 1.49043763,
-                                      0.83884692, 0.86036491]])
+        res_g, res_s = sess.run(
+            [g, s], {x: np.array([[1., 1., 1.]]),
+                     m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                         (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+
+        self.assertAllClose(res_g[0], [[0.95686918, 0.95686918]])
+        self.assertAllClose(res_s, (([[2.41515064, 2.41515064]],
+                                     [[0.95686918, 0.95686918]]),
+                                    ([[1.38917875, 1.49043763]],
+                                     [[0.83884692, 0.86036491]])))
 
   def testGrid2LSTMCellWithRelu(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),)
         cell = grid_rnn_cell.Grid2LSTMCell(
             2, use_peepholes=True, non_recurrent_fn=nn_ops.relu)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, ((2, 2),))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1., 1.]]),
-             m: np.array([[0.1, 0.2, 0.3, 0.4]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[2.1831727, 2.1831727]])
-        self.assertAllClose(res[1], [[0.92270052, 1.02325559, 0.66159075,
-                                      0.70475441]])
+        res_g, res_s = sess.run(
+          [g, s], {x: np.array([[1., 1., 1.]]),
+                   m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])), )})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertAllClose(res_g[0], [[2.1831727, 2.1831727]])
+        self.assertAllClose(res_s, (([[0.92270052, 1.02325559]],
+                                     [[0.66159075, 0.70475441]]), ))
 
   """RNNCell
   """
 
   def testGrid2BasicRNNCell(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([2, 2])
-        m = array_ops.zeros([2, 4])
+        m = (array_ops.zeros([2, 2]), array_ops.zeros([2, 2]))
         cell = grid_rnn_cell.Grid2BasicRNNCell(2)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, (2, 2))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (2, 2))
-        self.assertEqual(s.get_shape(), (2, 4))
+        self.assertEqual(g[0].get_shape(), (2, 2))
+        self.assertEqual(s[0].get_shape(), (2, 2))
+        self.assertEqual(s[1].get_shape(), (2, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1.], [2., 2.]]),
-            m: np.array([[0.1, 0.1, 0.1, 0.1], [0.2, 0.2, 0.2, 0.2]])
-        })
-        self.assertEqual(res[0].shape, (2, 2))
-        self.assertEqual(res[1].shape, (2, 4))
-        self.assertAllClose(res[0], [[0.94685763, 0.94685763],
-                                     [0.99480951, 0.99480951]])
-        self.assertAllClose(res[1],
-                            [[0.94685763, 0.94685763, 0.80049908, 0.80049908],
-                             [0.99480951, 0.99480951, 0.97574311, 0.97574311]])
+        res_g, res_s = sess.run(
+            [g, s], {x: np.array([[1., 1.], [2., 2.]]),
+                     m: (np.array([[0.1, 0.1], [0.2, 0.2]]),
+                         np.array([[0.1, 0.1], [0.2, 0.2]]))})
+        self.assertEqual(res_g[0].shape, (2, 2))
+        self.assertEqual(res_s[0].shape, (2, 2))
+        self.assertEqual(res_s[1].shape, (2, 2))
+
+        self.assertAllClose(res_g, ([[0.94685763, 0.94685763],
+                                    [0.99480951, 0.99480951]], ))
+        self.assertAllClose(res_s,
+                            ([[0.94685763, 0.94685763],
+                              [0.99480951, 0.99480951]],
+                             [[0.80049908, 0.80049908],
+                              [0.97574311, 0.97574311]]))
 
   def testGrid2BasicRNNCellTied(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([2, 2])
-        m = array_ops.zeros([2, 4])
+        m = (array_ops.zeros([2, 2]), array_ops.zeros([2, 2]))
         cell = grid_rnn_cell.Grid2BasicRNNCell(2, tied=True)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, (2, 2))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (2, 2))
-        self.assertEqual(s.get_shape(), (2, 4))
+        self.assertEqual(g[0].get_shape(), (2, 2))
+        self.assertEqual(s[0].get_shape(), (2, 2))
+        self.assertEqual(s[1].get_shape(), (2, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1.], [2., 2.]]),
-            m: np.array([[0.1, 0.1, 0.1, 0.1], [0.2, 0.2, 0.2, 0.2]])
-        })
-        self.assertEqual(res[0].shape, (2, 2))
-        self.assertEqual(res[1].shape, (2, 4))
-        self.assertAllClose(res[0], [[0.94685763, 0.94685763],
-                                     [0.99480951, 0.99480951]])
-        self.assertAllClose(res[1],
-                            [[0.94685763, 0.94685763, 0.80049908, 0.80049908],
-                             [0.99480951, 0.99480951, 0.97574311, 0.97574311]])
+        res_g, res_s = sess.run(
+            [g, s], {x: np.array([[1., 1.], [2., 2.]]),
+                     m: (np.array([[0.1, 0.1], [0.2, 0.2]]),
+                         np.array([[0.1, 0.1], [0.2, 0.2]]))})
+        self.assertEqual(res_g[0].shape, (2, 2))
+        self.assertEqual(res_s[0].shape, (2, 2))
+        self.assertEqual(res_s[1].shape, (2, 2))
+
+        self.assertAllClose(res_g, ([[0.94685763, 0.94685763],
+                                     [0.99480951, 0.99480951]], ))
+        self.assertAllClose(res_s,
+                            ([[0.94685763, 0.94685763],
+                              [0.99480951, 0.99480951]],
+                             [[0.80049908, 0.80049908],
+                              [0.97574311, 0.97574311]]))
 
   def testGrid2BasicRNNCellWithRelu(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 2])
-        m = array_ops.zeros([1, 2])
-        cell = grid_rnn_cell.Grid2BasicRNNCell(2, non_recurrent_fn=nn_ops.relu)
-        self.assertEqual(cell.state_size, 2)
+        m = (array_ops.zeros([1, 2]), )
+        cell = grid_rnn_cell.Grid2BasicRNNCell(
+            2, non_recurrent_fn=nn_ops.relu)
+        self.assertEqual(cell.state_size, (2, ))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 2))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s],
-                       {x: np.array([[1., 1.]]),
-                        m: np.array([[0.1, 0.1]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 2))
-        self.assertAllClose(res[0], [[1.80049896, 1.80049896]])
-        self.assertAllClose(res[1], [[0.80049896, 0.80049896]])
+        res_g, res_s = sess.run([g, s], {x: np.array([[1., 1.]]),
+                                         m: np.array([[0.1, 0.1]])})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].shape, (1, 2))
+        self.assertAllClose(res_g, ([[1.80049896, 1.80049896]], ))
+        self.assertAllClose(res_s, ([[0.80049896, 0.80049896]], ))
 
   """1-LSTM
   """
 
   def testGrid1LSTMCell(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)) as root_scope:
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)) as root_scope:
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])), )
         cell = grid_rnn_cell.Grid1LSTMCell(2, use_peepholes=True)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, ((2, 2), ))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1., 1.]]),
-             m: np.array([[0.1, 0.2, 0.3, 0.4]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.91287315, 0.91287315]])
-        self.assertAllClose(res[1],
-                            [[2.26285243, 2.26285243, 0.91287315, 0.91287315]])
+        res_g, res_s = sess.run(
+          [g, s], {x: np.array([[1., 1., 1.]]),
+                   m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])), )})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+
+        self.assertAllClose(res_g, ([[0.91287315, 0.91287315]], ))
+        self.assertAllClose(res_s,
+                            (([[2.26285243, 2.26285243]],
+                              [[0.91287315, 0.91287315]]), ))
 
         root_scope.reuse_variables()
 
         x2 = array_ops.zeros([0, 0])
         g2, s2 = cell(x2, m)
-        self.assertEqual(g2.get_shape(), (1, 2))
-        self.assertEqual(s2.get_shape(), (1, 4))
+        self.assertEqual(g2[0].get_shape(), (1, 2))
+        self.assertEqual(s2[0].c.get_shape(), (1, 2))
+        self.assertEqual(s2[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g2, s2], {m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.9032144, 0.9032144]])
-        self.assertAllClose(res[1],
-                            [[2.79966092, 2.79966092, 0.9032144, 0.9032144]])
+        res_g2, res_s2 = sess.run([g2, s2], {m: res_s})
+        self.assertEqual(res_g2[0].shape, (1, 2))
+        self.assertEqual(res_s2[0].c.shape, (1, 2))
+        self.assertEqual(res_s2[0].h.shape, (1, 2))
+
+        self.assertAllClose(res_g2, ([[0.9032144, 0.9032144]], ))
+        self.assertAllClose(res_s2,
+                            (([[2.79966092, 2.79966092]],
+                              [[0.9032144, 0.9032144]]), ))
 
         g3, s3 = cell(x2, m)
-        self.assertEqual(g3.get_shape(), (1, 2))
-        self.assertEqual(s3.get_shape(), (1, 4))
+        self.assertEqual(g3[0].get_shape(), (1, 2))
+        self.assertEqual(s3[0].c.get_shape(), (1, 2))
+        self.assertEqual(s3[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g3, s3], {m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.92727238, 0.92727238]])
-        self.assertAllClose(res[1],
-                            [[3.3529923, 3.3529923, 0.92727238, 0.92727238]])
+        res_g3, res_s3 = sess.run([g3, s3], {m: res_s2})
+        self.assertEqual(res_g3[0].shape, (1, 2))
+        self.assertEqual(res_s3[0].c.shape, (1, 2))
+        self.assertEqual(res_s3[0].h.shape, (1, 2))
+        self.assertAllClose(res_g3, ([[0.92727238, 0.92727238]], ))
+        self.assertAllClose(res_s3,
+                            (([[3.3529923, 3.3529923]],
+                              [[0.92727238, 0.92727238]]), ))
 
   """3-LSTM
   """
 
   def testGrid3LSTMCell(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 12])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid3LSTMCell(2, use_peepholes=True)
-        self.assertEqual(cell.state_size, 12)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 12))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
+        self.assertEqual(s[2].c.get_shape(), (1, 2))
+        self.assertEqual(s[2].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x:
-                np.array([[1., 1., 1.]]),
-            m:
-                np.array([[
-                    0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, -0.1, -0.2, -0.3,
-                    -0.4
-                ]])
-        })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 12))
-
-        self.assertAllClose(res[0], [[0.96892911, 0.96892911]])
-        self.assertAllClose(res[1], [[2.45227885, 2.45227885, 0.96892911,
-                                      0.96892911, 1.33592629, 1.4373529,
-                                      0.80867189, 0.83247656, 0.7317788,
-                                      0.63205892, 0.56548983, 0.50446129]])
+        res_g, res_s = sess.run(
+          [g, s], {x: np.array([[1., 1., 1.]]),
+                   m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                       (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])),
+                       (np.array([[-0.1, -0.2]]), np.array([[-0.3, -0.4]])))})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+        self.assertEqual(res_s[2].c.shape, (1, 2))
+        self.assertEqual(res_s[2].h.shape, (1, 2))
+
+        self.assertAllClose(res_g, ([[0.96892911, 0.96892911]], ))
+        self.assertAllClose(res_s, (([[2.45227885, 2.45227885]],
+                                     [[0.96892911, 0.96892911]]),
+                                    ([[1.33592629, 1.4373529]],
+                                     [[0.80867189, 0.83247656]]),
+                                    ([[0.7317788, 0.63205892]],
+                                     [[0.56548983, 0.50446129]])))
 
   """Edge cases
   """
 
   def testGridRNNEdgeCasesLikeRelu(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([3, 2])
-        m = array_ops.zeros([0, 0])
+        m = ()
 
         # this is equivalent to relu
         cell = grid_rnn_cell.GridRNNCell(
@@ -394,21 +467,22 @@ class GridRNNCellTest(test.TestCase):
             non_recurrent_dims=0,
             non_recurrent_fn=nn_ops.relu)
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (3, 2))
-        self.assertEqual(s.get_shape(), (0, 0))
+        self.assertEqual(g[0].get_shape(), (3, 2))
+        self.assertEqual(s, ())
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {x: np.array([[1., -1.], [-2, 1], [2, -1]])})
-        self.assertEqual(res[0].shape, (3, 2))
-        self.assertEqual(res[1].shape, (0, 0))
-        self.assertAllClose(res[0], [[0, 0], [0, 0], [0.5, 0.5]])
+        res_g, res_s = sess.run(
+          [g, s], {x: np.array([[1., -1.], [-2, 1], [2, -1]])})
+        self.assertEqual(res_g[0].shape, (3, 2))
+        self.assertEqual(res_s, ())
+        self.assertAllClose(res_g, ([[0, 0], [0, 0], [0.5, 0.5]], ))
 
   def testGridRNNEdgeCasesNoOutput(self):
     with self.test_session() as sess:
-      with variable_scope.variable_scope(
-          'root', initializer=init_ops.constant_initializer(0.5)):
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 2])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])), )
 
         # This cell produces no output
         cell = grid_rnn_cell.GridRNNCell(
@@ -419,16 +493,17 @@ class GridRNNCellTest(test.TestCase):
             non_recurrent_dims=0,
             non_recurrent_fn=nn_ops.relu)
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (0, 0))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g, ())
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1.]]),
-             m: np.array([[0.1, 0.1, 0.1, 0.1]])})
-        self.assertEqual(res[0].shape, (0, 0))
-        self.assertEqual(res[1].shape, (1, 4))
+        res_g, res_s = sess.run(
+          [g, s], {x: np.array([[1., 1.]]),
+                   m: ((np.array([[0.1, 0.1]]), np.array([[0.1, 0.1]])), )})
+        self.assertEqual(res_g, ())
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
 
   """Test with tf.nn.rnn
   """
@@ -451,20 +526,29 @@ class GridRNNCellTest(test.TestCase):
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 8))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape()[0], inp.get_shape()[0])
-      self.assertEqual(out.get_shape()[1], num_units)
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape()[0], inp.get_shape()[0])
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
 
   def testGrid2LSTMCellReLUWithRNN(self):
     batch_size = 3
@@ -477,28 +561,33 @@ class GridRNNCellTest(test.TestCase):
       cell = grid_rnn_cell.Grid2LSTMCell(
           num_units=num_units, non_recurrent_fn=nn_ops.relu)
 
-      inputs = max_length * [
-          array_ops.placeholder(
-              dtypes.float32, shape=(batch_size, input_size))
-      ]
+      inputs = max_length * [array_ops.placeholder(
+        dtypes.float32, shape=(batch_size, input_size))]
 
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 4))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape()[0], inp.get_shape()[0])
-      self.assertEqual(out.get_shape()[1], num_units)
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape()[0], inp.get_shape()[0])
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
 
   def testGrid3LSTMCellReLUWithRNN(self):
     batch_size = 3
@@ -511,28 +600,35 @@ class GridRNNCellTest(test.TestCase):
       cell = grid_rnn_cell.Grid3LSTMCell(
           num_units=num_units, non_recurrent_fn=nn_ops.relu)
 
-      inputs = max_length * [
-          array_ops.placeholder(
-              dtypes.float32, shape=(batch_size, input_size))
-      ]
+      inputs = max_length * [array_ops.placeholder(
+        dtypes.float32, shape=(batch_size, input_size))]
 
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 8))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape()[0], inp.get_shape()[0])
-      self.assertEqual(out.get_shape()[1], num_units)
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape()[0], inp.get_shape()[0])
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
 
   def testGrid1LSTMCellWithRNN(self):
     batch_size = 3
@@ -553,20 +649,95 @@ class GridRNNCellTest(test.TestCase):
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 4))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape(), (3, num_units))
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape(), (3, num_units))
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
+
+  def testGrid2LSTMCellWithRNNAndDynamicBatchSize(self):
+    """Test for #4296
+    """
+    input_size = 5
+    max_length = 6  # unrolled up to this length
+    num_units = 2
 
+    with variable_scope.variable_scope('root',
+                           initializer=init_ops.constant_initializer(0.5)):
+      cell = grid_rnn_cell.Grid2LSTMCell(num_units=num_units)
+
+      inputs = max_length * [
+        array_ops.placeholder(
+          dtypes.float32, shape=(None, input_size))
+      ]
+
+      outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
+
+    self.assertEqual(len(outputs), len(inputs))
+
+    for out, inp in zip(outputs, inputs):
+      self.assertEqual(len(out), 1)
+      self.assertTrue(out[0].get_shape()[0].value is None)
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
+
+    with self.test_session() as sess:
+      sess.run(variables.global_variables_initializer())
+
+      input_value = np.ones((3, input_size))
+      values = sess.run(outputs + [state],
+                        feed_dict={inputs[0]: input_value})
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
+
+
+  def testGrid2LSTMCellLegacy(self):
+    """Test for legacy case (when state_is_tuple=False)
+    """
+    with self.test_session() as sess:
+      with variable_scope.variable_scope('root',
+          initializer=init_ops.constant_initializer(0.5)):
+        x = array_ops.zeros([1, 3])
+        m = array_ops.zeros([1, 8])
+        cell = grid_rnn_cell.Grid2LSTMCell(2, use_peepholes=True,
+                                           state_is_tuple=False,
+                                           output_is_tuple=False)
+        self.assertEqual(cell.state_size, 8)
+
+        g, s = cell(x, m)
+        self.assertEqual(g.get_shape(), (1, 2))
+        self.assertEqual(s.get_shape(), (1, 8))
+
+        sess.run([variables.global_variables_initializer()])
+        res = sess.run(
+            [g, s], {x: np.array([[1., 1., 1.]]),
+                     m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])})
+        self.assertEqual(res[0].shape, (1, 2))
+        self.assertEqual(res[1].shape, (1, 8))
+        self.assertAllClose(res[0], [[0.95686918, 0.95686918]])
+        self.assertAllClose(res[1], [[2.41515064, 2.41515064, 0.95686918,
+                                      0.95686918, 1.38917875, 1.49043763,
+                                      0.83884692, 0.86036491]])
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py b/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py
index 269b224581..269ad0a384 100644
--- a/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py
+++ b/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py
@@ -25,6 +25,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import variable_scope as vs
+
+from tensorflow.python.platform import tf_logging as logging
 from tensorflow.contrib import layers
 from tensorflow.contrib import rnn
 
@@ -53,7 +55,9 @@ class GridRNNCell(rnn.RNNCell):
                non_recurrent_dims=None,
                tied=False,
                cell_fn=None,
-               non_recurrent_fn=None):
+               non_recurrent_fn=None,
+               state_is_tuple=True,
+               output_is_tuple=True):
     """Initialize the parameters of a Grid RNN cell
 
     Args:
@@ -68,26 +72,47 @@ class GridRNNCell(rnn.RNNCell):
       non_recurrent_dims: int or list, List of dimensions that are not
         recurrent.
               The transfer function for non-recurrent dimensions is specified
-                via `non_recurrent_fn`,
-              which is default to be `tensorflow.nn.relu`.
+                via `non_recurrent_fn`, which is
+                default to be `tensorflow.nn.relu`.
       tied: bool, Whether to share the weights among the dimensions of this
         GridRNN cell.
               If there are non-recurrent dimensions in the grid, weights are
-                shared between each
-              group of recurrent and non-recurrent dimensions.
-      cell_fn: function, a function which returns the recurrent cell object. Has
-        to be in the following signature:
-              def cell_func(num_units, input_size):
+                shared between each group of recurrent and non-recurrent
+                dimensions.
+      cell_fn: function, a function which returns the recurrent cell object.
+        Has to be in the following signature:
+              ```
+              def cell_func(num_units):
                 # ...
-
+              ```
               and returns an object of type `RNNCell`. If None, LSTMCell with
                 default parameters will be used.
+        Note that if you use a custom RNNCell (with `cell_fn`), it is your
+        responsibility to make sure the inner cell use `state_is_tuple=True`.
+
       non_recurrent_fn: a tensorflow Op that will be the transfer function of
         the non-recurrent dimensions
+      state_is_tuple: If True, accepted and returned states are tuples of the
+        states of the recurrent dimensions. If False, they are concatenated
+        along the column axis. The latter behavior will soon be deprecated.
+
+        Note that if you use a custom RNNCell (with `cell_fn`), it is your
+        responsibility to make sure the inner cell use `state_is_tuple=True`.
 
+      output_is_tuple: If True, the output is a tuple of the outputs of the
+        recurrent dimensions. If False, they are concatenated along the
+        column axis. The later behavior will soon be deprecated.
+        
     Raises:
       TypeError: if cell_fn does not return an RNNCell instance.
     """
+    if not state_is_tuple:
+      logging.warning("%s: Using a concatenated state is slower and will "
+                      "soon be deprecated.  Use state_is_tuple=True.", self)
+    if not output_is_tuple:
+      logging.warning("%s: Using a concatenated output is slower and will"
+                      "soon be deprecated.  Use output_is_tuple=True.", self)
+
     if num_dims < 1:
       raise ValueError('dims must be >= 1: {}'.format(num_dims))
 
@@ -96,37 +121,44 @@ class GridRNNCell(rnn.RNNCell):
                                      non_recurrent_fn or nn.relu, tied,
                                      num_units)
 
-    cell_input_size = (self._config.num_dims - 1) * num_units
+    self._state_is_tuple = state_is_tuple
+    self._output_is_tuple = output_is_tuple
+
     if cell_fn is None:
       my_cell_fn = functools.partial(
-          rnn.LSTMCell,
-          num_units=num_units, input_size=cell_input_size,
-          state_is_tuple=False)
+        rnn.LSTMCell,
+        num_units=num_units,
+        state_is_tuple=state_is_tuple)
     else:
-      my_cell_fn = lambda: cell_fn(num_units, cell_input_size)
+      my_cell_fn = lambda: cell_fn(num_units)
     if tied:
       self._cells = [my_cell_fn()] * num_dims
     else:
       self._cells = [my_cell_fn() for _ in range(num_dims)]
     if not isinstance(self._cells[0], rnn.RNNCell):
       raise TypeError(
-          'cell_fn must return an RNNCell instance, saw: %s'
-          % type(self._cells[0]))
+        'cell_fn must return an RNNCell instance, saw: %s'
+        % type(self._cells[0]))
 
-  @property
-  def input_size(self):
-    # temporarily using num_units as the input_size of each dimension.
-    # The actual input size only determined when this cell get invoked,
-    # so this information can be considered unreliable.
-    return self._config.num_units * len(self._config.inputs)
+    if self._output_is_tuple:
+      self._output_size = tuple(self._cells[0].output_size
+                                for _ in self._config.outputs)
+    else:
+      self._output_size = self._cells[0].output_size * len(self._config.outputs)
+
+    if self._state_is_tuple:
+      self._state_size = tuple(self._cells[0].state_size
+                               for _ in self._config.recurrents)
+    else:
+      self._state_size = self._cell_state_size() * len(self._config.recurrents)
 
   @property
   def output_size(self):
-    return self._cells[0].output_size * len(self._config.outputs)
+    return self._output_size
 
   @property
   def state_size(self):
-    return self._cells[0].state_size * len(self._config.recurrents)
+    return self._state_size
 
   def __call__(self, inputs, state, scope=None):
     """Run one step of GridRNN.
@@ -145,76 +177,125 @@ class GridRNNCell(rnn.RNNCell):
       - A 2D, batch x state_size, Tensor representing the new state of the cell
         after reading "inputs" when previous state was "state".
     """
-    state_sz = state.get_shape().as_list()[1]
-    if self.state_size != state_sz:
-      raise ValueError(
-          'Actual state size not same as specified: {} vs {}.'.format(
-              state_sz, self.state_size))
-
     conf = self._config
-    dtype = inputs.dtype if inputs is not None else state.dtype
+    dtype = inputs.dtype
 
-    # c_prev is `m`, and m_prev is `h` in the paper.
-    # Keep c and m here for consistency with the codebase
-    c_prev = [None] * self._config.num_dims
-    m_prev = [None] * self._config.num_dims
-    cell_output_size = self._cells[0].state_size - conf.num_units
-
-    # for LSTM   : state = memory cell + output, hence cell_output_size > 0
-    # for GRU/RNN: state = output (whose size is equal to _num_units),
-    #              hence cell_output_size = 0
-    for recurrent_dim, start_idx in zip(self._config.recurrents, range(
-        0, self.state_size, self._cells[0].state_size)):
-      if cell_output_size > 0:
-        c_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
-                                                [-1, conf.num_units])
-        m_prev[recurrent_dim] = array_ops.slice(
-            state, [0, start_idx + conf.num_units], [-1, cell_output_size])
-      else:
-        m_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
-                                                [-1, conf.num_units])
+    c_prev, m_prev, cell_output_size = self._extract_states(state)
 
     new_output = [None] * conf.num_dims
     new_state = [None] * conf.num_dims
 
     with vs.variable_scope(scope or type(self).__name__):  # GridRNNCell
+      # project input, populate c_prev and m_prev
+      self._project_input(inputs, c_prev, m_prev, cell_output_size > 0)
 
-      # project input
-      if inputs is not None and sum(inputs.get_shape().as_list()) > 0 and len(
-          conf.inputs) > 0:
-        input_splits = array_ops.split(
-            value=inputs, num_or_size_splits=len(conf.inputs), axis=1)
-        input_sz = input_splits[0].get_shape().as_list()[1]
-
-        for i, j in enumerate(conf.inputs):
-          input_project_m = vs.get_variable(
-              'project_m_{}'.format(j), [input_sz, conf.num_units], dtype=dtype)
-          m_prev[j] = math_ops.matmul(input_splits[i], input_project_m)
-
-          if cell_output_size > 0:
-            input_project_c = vs.get_variable(
-                'project_c_{}'.format(j), [input_sz, conf.num_units],
-                dtype=dtype)
-            c_prev[j] = math_ops.matmul(input_splits[i], input_project_c)
-
+      # propagate along dimensions, first for non-priority dimensions
+      # then priority dimensions
       _propagate(conf.non_priority, conf, self._cells, c_prev, m_prev,
                  new_output, new_state, True)
       _propagate(conf.priority, conf, self._cells,
                  c_prev, m_prev, new_output, new_state, False)
 
+      # collect outputs and states
       output_tensors = [new_output[i] for i in self._config.outputs]
-      output = array_ops.zeros(
-          [0, 0], dtype) if len(output_tensors) == 0 else array_ops.concat(
-              output_tensors, 1)
+      if self._output_is_tuple:
+        output = tuple(output_tensors)
+      else:
+        if len(output_tensors) == 0:
+          output = array_ops.zeros([0, 0], dtype)
+        else:
+          output = array_ops.concat(output_tensors, 1)
 
-      state_tensors = [new_state[i] for i in self._config.recurrents]
-      states = array_ops.zeros(
-          [0, 0],
-          dtype) if len(state_tensors) == 0 else array_ops.concat(state_tensors,
-                                                                  1)
+      if self._state_is_tuple:
+        states = tuple(new_state[i] for i in self._config.recurrents)
+      else:
+        # concat each state first, then flatten the whole thing
+        state_tensors = [x for i in self._config.recurrents
+                         for x in new_state[i]]
+        if len(state_tensors) == 0:
+          states = array_ops.zeros([0, 0], dtype)
+        else:
+          states = array_ops.concat(state_tensors, 1)
 
     return output, states
 
+  def _extract_states(self, state):
+    """Extract the cell and previous output tensors from the given state
+    """
+    conf = self._config
+
+    # c_prev is `m` (cell value), and
+    # m_prev is `h` (previous output) in the paper.
+    # Keeping c and m here for consistency with the codebase
+    c_prev = [None] * conf.num_dims
+    m_prev = [None] * conf.num_dims
+
+    # for LSTM   : state = memory cell + output, hence cell_output_size > 0
+    # for GRU/RNN: state = output (whose size is equal to _num_units),
+    #              hence cell_output_size = 0
+    total_cell_state_size = self._cell_state_size()
+    cell_output_size = total_cell_state_size - conf.num_units
+
+    if self._state_is_tuple:
+      if len(conf.recurrents) != len(state):
+        raise ValueError("Expected state as a tuple of {} "
+                         "element".format(len(conf.recurrents)))
+
+      for recurrent_dim, recurrent_state in zip(conf.recurrents, state):
+        if cell_output_size > 0:
+          c_prev[recurrent_dim], m_prev[recurrent_dim] = recurrent_state
+        else:
+          m_prev[recurrent_dim] = recurrent_state
+    else:
+      for recurrent_dim, start_idx in zip(conf.recurrents, range(
+          0, self.state_size, total_cell_state_size)):
+        if cell_output_size > 0:
+          c_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
+                                                  [-1, conf.num_units])
+          m_prev[recurrent_dim] = array_ops.slice(
+            state, [0, start_idx + conf.num_units], [-1, cell_output_size])
+        else:
+          m_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
+                                                  [-1, conf.num_units])
+    return c_prev, m_prev, cell_output_size
+
+  def _project_input(self, inputs, c_prev, m_prev, with_c):
+    """Fills in c_prev and m_prev with projected input, for input dimensions
+    """
+    conf = self._config
+
+    if (inputs is not None and inputs.get_shape().with_rank(2)[1].value > 0
+        and len(conf.inputs) > 0):
+      if isinstance(inputs, tuple):
+        if len(conf.inputs) != len(inputs):
+          raise ValueError("Expect inputs as a tuple of {} "
+                           "tensors".format(len(conf.inputs)))
+        input_splits = inputs
+      else:
+        input_splits = array_ops.split(
+          value=inputs, num_or_size_splits=len(conf.inputs), axis=1)
+      input_sz = input_splits[0].get_shape().with_rank(2)[1].value
+
+      for i, j in enumerate(conf.inputs):
+        input_project_m = vs.get_variable(
+          'project_m_{}'.format(j), [input_sz, conf.num_units],
+          dtype=inputs.dtype)
+        m_prev[j] = math_ops.matmul(input_splits[i], input_project_m)
+
+        if with_c:
+          input_project_c = vs.get_variable(
+            'project_c_{}'.format(j), [input_sz, conf.num_units],
+            dtype=inputs.dtype)
+          c_prev[j] = math_ops.matmul(input_splits[i], input_project_c)
+
+  def _cell_state_size(self):
+    """Total size of the state of the inner cell used in this grid
+    """
+    state_sizes = self._cells[0].state_size
+    if isinstance(state_sizes, tuple):
+      return sum(state_sizes)
+    return state_sizes
+
 
 """Specialized cells, for convenience
 """
@@ -223,11 +304,12 @@ class GridRNNCell(rnn.RNNCell):
 class Grid1BasicRNNCell(GridRNNCell):
   """1D BasicRNN cell"""
 
-  def __init__(self, num_units):
+  def __init__(self, num_units, state_is_tuple=True, output_is_tuple=True):
     super(Grid1BasicRNNCell, self).__init__(
-        num_units=num_units, num_dims=1,
-        input_dims=0, output_dims=0, priority_dims=0, tied=False,
-        cell_fn=lambda n, i: rnn.BasicRNNCell(num_units=n, input_size=i))
+      num_units=num_units, num_dims=1,
+      input_dims=0, output_dims=0, priority_dims=0, tied=False,
+      cell_fn=lambda n: rnn.BasicRNNCell(num_units=n),
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 class Grid2BasicRNNCell(GridRNNCell):
@@ -240,26 +322,28 @@ class Grid2BasicRNNCell(GridRNNCell):
   specified.
   """
 
-  def __init__(self, num_units, tied=False, non_recurrent_fn=None):
+  def __init__(self, num_units, tied=False, non_recurrent_fn=None,
+               state_is_tuple=True, output_is_tuple=True):
     super(Grid2BasicRNNCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
-        non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.BasicRNNCell(num_units=n, input_size=i),
-        non_recurrent_fn=non_recurrent_fn)
+      num_units=num_units, num_dims=2,
+      input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+      non_recurrent_dims=None if non_recurrent_fn is None else 0,
+      cell_fn=lambda n: rnn.BasicRNNCell(num_units=n),
+      non_recurrent_fn=non_recurrent_fn,
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 class Grid1BasicLSTMCell(GridRNNCell):
   """1D BasicLSTM cell"""
 
-  def __init__(self, num_units, forget_bias=1):
+  def __init__(self, num_units, forget_bias=1,
+               state_is_tuple=True, output_is_tuple=True):
     super(Grid1BasicLSTMCell, self).__init__(
-        num_units=num_units, num_dims=1,
-        input_dims=0, output_dims=0, priority_dims=0, tied=False,
-        cell_fn=lambda n, i: rnn.BasicLSTMCell(
-            num_units=n,
-            forget_bias=forget_bias, input_size=i,
-            state_is_tuple=False))
+      num_units=num_units, num_dims=1,
+      input_dims=0, output_dims=0, priority_dims=0, tied=False,
+      cell_fn=lambda n: rnn.BasicLSTMCell(
+        num_units=n, forget_bias=forget_bias),
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 class Grid2BasicLSTMCell(GridRNNCell):
@@ -276,15 +360,17 @@ class Grid2BasicLSTMCell(GridRNNCell):
                num_units,
                tied=False,
                non_recurrent_fn=None,
-               forget_bias=1):
+               forget_bias=1,
+               state_is_tuple=True,
+               output_is_tuple=True):
     super(Grid2BasicLSTMCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
-        non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.BasicLSTMCell(
-            num_units=n, forget_bias=forget_bias, input_size=i,
-            state_is_tuple=False),
-        non_recurrent_fn=non_recurrent_fn)
+      num_units=num_units, num_dims=2,
+      input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+      non_recurrent_dims=None if non_recurrent_fn is None else 0,
+      cell_fn=lambda n: rnn.BasicLSTMCell(
+        num_units=n, forget_bias=forget_bias),
+      non_recurrent_fn=non_recurrent_fn,
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 class Grid1LSTMCell(GridRNNCell):
@@ -294,13 +380,15 @@ class Grid1LSTMCell(GridRNNCell):
     specify the forget bias and enabling peepholes
   """
 
-  def __init__(self, num_units, use_peepholes=False, forget_bias=1.0):
+  def __init__(self, num_units, use_peepholes=False, forget_bias=1.0,
+               state_is_tuple=True, output_is_tuple=True):
     super(Grid1LSTMCell, self).__init__(
-        num_units=num_units, num_dims=1,
-        input_dims=0, output_dims=0, priority_dims=0,
-        cell_fn=lambda n, i: rnn.LSTMCell(
-            num_units=n, input_size=i, use_peepholes=use_peepholes,
-            forget_bias=forget_bias, state_is_tuple=False))
+      num_units=num_units, num_dims=1,
+      input_dims=0, output_dims=0, priority_dims=0,
+      cell_fn=lambda n: rnn.LSTMCell(
+        num_units=n, use_peepholes=use_peepholes,
+        forget_bias=forget_bias),
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 class Grid2LSTMCell(GridRNNCell):
@@ -317,15 +405,18 @@ class Grid2LSTMCell(GridRNNCell):
                tied=False,
                non_recurrent_fn=None,
                use_peepholes=False,
-               forget_bias=1.0):
+               forget_bias=1.0,
+               state_is_tuple=True,
+               output_is_tuple=True):
     super(Grid2LSTMCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
-        non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.LSTMCell(
-            num_units=n, input_size=i, forget_bias=forget_bias,
-            use_peepholes=use_peepholes, state_is_tuple=False),
-        non_recurrent_fn=non_recurrent_fn)
+      num_units=num_units, num_dims=2,
+      input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+      non_recurrent_dims=None if non_recurrent_fn is None else 0,
+      cell_fn=lambda n: rnn.LSTMCell(
+        num_units=n, forget_bias=forget_bias,
+        use_peepholes=use_peepholes),
+      non_recurrent_fn=non_recurrent_fn,
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 class Grid3LSTMCell(GridRNNCell):
@@ -343,15 +434,18 @@ class Grid3LSTMCell(GridRNNCell):
                tied=False,
                non_recurrent_fn=None,
                use_peepholes=False,
-               forget_bias=1.0):
+               forget_bias=1.0,
+               state_is_tuple=True,
+               output_is_tuple=True):
     super(Grid3LSTMCell, self).__init__(
-        num_units=num_units, num_dims=3,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
-        non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.LSTMCell(
-            num_units=n, input_size=i, forget_bias=forget_bias,
-            use_peepholes=use_peepholes, state_is_tuple=False),
-        non_recurrent_fn=non_recurrent_fn)
+      num_units=num_units, num_dims=3,
+      input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+      non_recurrent_dims=None if non_recurrent_fn is None else 0,
+      cell_fn=lambda n: rnn.LSTMCell(
+        num_units=n, forget_bias=forget_bias,
+        use_peepholes=use_peepholes),
+      non_recurrent_fn=non_recurrent_fn,
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 class Grid2GRUCell(GridRNNCell):
@@ -363,21 +457,23 @@ class Grid2GRUCell(GridRNNCell):
     specified.
   """
 
-  def __init__(self, num_units, tied=False, non_recurrent_fn=None):
+  def __init__(self, num_units, tied=False, non_recurrent_fn=None,
+               state_is_tuple=True, output_is_tuple=True):
     super(Grid2GRUCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
-        non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.GRUCell(num_units=n, input_size=i),
-        non_recurrent_fn=non_recurrent_fn)
+      num_units=num_units, num_dims=2,
+      input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+      non_recurrent_dims=None if non_recurrent_fn is None else 0,
+      cell_fn=lambda n: rnn.GRUCell(num_units=n),
+      non_recurrent_fn=non_recurrent_fn,
+      state_is_tuple=state_is_tuple, output_is_tuple=output_is_tuple)
 
 
 """Helpers
 """
 
 _GridRNNDimension = namedtuple(
-    '_GridRNNDimension',
-    ['idx', 'is_input', 'is_output', 'is_priority', 'non_recurrent_fn'])
+  '_GridRNNDimension',
+  ['idx', 'is_input', 'is_output', 'is_priority', 'non_recurrent_fn'])
 
 _GridRNNConfig = namedtuple('_GridRNNConfig',
                             ['num_dims', 'dims', 'inputs', 'outputs',
@@ -387,7 +483,6 @@ _GridRNNConfig = namedtuple('_GridRNNConfig',
 
 def _parse_rnn_config(num_dims, ls_input_dims, ls_output_dims, ls_priority_dims,
                       ls_non_recurrent_dims, non_recurrent_fn, tied, num_units):
-
   def check_dim_list(ls):
     if ls is None:
       ls = []
@@ -407,23 +502,23 @@ def _parse_rnn_config(num_dims, ls_input_dims, ls_output_dims, ls_priority_dims,
   rnn_dims = []
   for i in range(num_dims):
     rnn_dims.append(
-        _GridRNNDimension(
-            idx=i,
-            is_input=(i in input_dims),
-            is_output=(i in output_dims),
-            is_priority=(i in priority_dims),
-            non_recurrent_fn=non_recurrent_fn if i in non_recurrent_dims else
-            None))
+      _GridRNNDimension(
+        idx=i,
+        is_input=(i in input_dims),
+        is_output=(i in output_dims),
+        is_priority=(i in priority_dims),
+        non_recurrent_fn=non_recurrent_fn if i in non_recurrent_dims else
+        None))
   return _GridRNNConfig(
-      num_dims=num_dims,
-      dims=rnn_dims,
-      inputs=input_dims,
-      outputs=output_dims,
-      recurrents=[x for x in range(num_dims) if x not in non_recurrent_dims],
-      priority=priority_dims,
-      non_priority=[x for x in range(num_dims) if x not in priority_dims],
-      tied=tied,
-      num_units=num_units)
+    num_dims=num_dims,
+    dims=rnn_dims,
+    inputs=input_dims,
+    outputs=output_dims,
+    recurrents=[x for x in range(num_dims) if x not in non_recurrent_dims],
+    priority=priority_dims,
+    non_priority=[x for x in range(num_dims) if x not in priority_dims],
+    tied=tied,
+    num_units=num_units)
 
 
 def _propagate(dim_indices, conf, cells, c_prev, m_prev, new_output, new_state,
@@ -440,34 +535,40 @@ def _propagate(dim_indices, conf, cells, c_prev, m_prev, new_output, new_state,
   if conf.num_dims > 1:
     ls_cell_inputs = [None] * (conf.num_dims - 1)
     for d in conf.dims[:-1]:
-      ls_cell_inputs[d.idx] = new_output[d.idx] if new_output[
-          d.idx] is not None else m_prev[d.idx]
+      if new_output[d.idx] is None:
+        ls_cell_inputs[d.idx] = m_prev[d.idx]
+      else:
+        ls_cell_inputs[d.idx] = new_output[d.idx]
     cell_inputs = array_ops.concat(ls_cell_inputs, 1)
   else:
     cell_inputs = array_ops.zeros([m_prev[0].get_shape().as_list()[0], 0],
                                   m_prev[0].dtype)
 
-  last_dim_output = new_output[-1] if new_output[-1] is not None else m_prev[-1]
+  last_dim_output = (new_output[-1] if new_output[-1] is not None
+                     else m_prev[-1])
 
   for i in dim_indices:
     d = conf.dims[i]
     if d.non_recurrent_fn:
-      linear_args = array_ops.concat(
-          [cell_inputs, last_dim_output],
-          1) if conf.num_dims > 1 else last_dim_output
+      if conf.num_dims > 1:
+        linear_args = array_ops.concat([cell_inputs, last_dim_output], 1)
+      else:
+        linear_args = last_dim_output
       with vs.variable_scope('non_recurrent' if conf.tied else
                              'non_recurrent/cell_{}'.format(i)):
         if conf.tied and not (first_call and i == dim_indices[0]):
           vs.get_variable_scope().reuse_variables()
-        new_output[d.idx] = layers.legacy_fully_connected(
-            linear_args,
-            num_output_units=conf.num_units,
-            activation_fn=d.non_recurrent_fn,
-            weight_init=vs.get_variable_scope().initializer or
-            layers.initializers.xavier_initializer)
+
+        new_output[d.idx] = layers.fully_connected(
+          linear_args,
+          num_outputs=conf.num_units,
+          activation_fn=d.non_recurrent_fn,
+          weights_initializer=vs.get_variable_scope().initializer or
+                              layers.initializers.xavier_initializer,
+          weights_regularizer=vs.get_variable_scope().regularizer)
     else:
       if c_prev[i] is not None:
-        cell_state = array_ops.concat([c_prev[i], last_dim_output], 1)
+        cell_state = (c_prev[i], last_dim_output)
       else:
         # for GRU/RNN, the state is just the previous output
         cell_state = last_dim_output
-- 
GitLab


From ca5aa8a3c2ab96c7ebb050314c5a904f43a88046 Mon Sep 17 00:00:00 2001
From: Sergio Guadarrama <sguada@google.com>
Date: Wed, 26 Apr 2017 11:02:17 -0800
Subject: [PATCH 0698/1563] Allow SVStepCounter to measure progress for other
 counters beyond global_step. Change: 154326389

---
 tensorflow/python/training/supervisor.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/training/supervisor.py b/tensorflow/python/training/supervisor.py
index 9435bdfa1c..93e64b4ab0 100644
--- a/tensorflow/python/training/supervisor.py
+++ b/tensorflow/python/training/supervisor.py
@@ -1001,28 +1001,32 @@ class SVSummaryThread(coordinator.LooperThread):
 class SVStepCounterThread(coordinator.LooperThread):
   """Threads to count steps and measure their duration."""
 
-  def __init__(self, sv, sess):
+  def __init__(self, sv, sess, step_counter=None):
     """Create a `SVStepCounterThread`.
 
     Args:
       sv: A `Supervisor`.
       sess: A `Session`.
+      step_counter: A `Tensor` holding the step counter. By defaults, it uses
+        sv.global_step.
     """
     super(SVStepCounterThread, self).__init__(sv.coord, sv.save_summaries_secs)
     self._sv = sv
     self._sess = sess
     self._last_time = 0.0
     self._last_step = 0
-    self._summary_tag = "%s/sec" % self._sv.global_step.op.name
+    step_counter = sv.global_step if step_counter is None else step_counter
+    self._step_counter = step_counter
+    self._summary_tag = "%s/sec" % self._step_counter.op.name
 
   def start_loop(self):
     self._last_time = time.time()
     self._last_step = training_util.global_step(
-        self._sess, self._sv.global_step)
+        self._sess, self._step_counter)
 
   def run_loop(self):
     # Count the steps.
-    current_step = training_util.global_step(self._sess, self._sv.global_step)
+    current_step = training_util.global_step(self._sess, self._step_counter)
     added_steps = current_step - self._last_step
     self._last_step = current_step
     # Measure the elapsed time.
@@ -1030,7 +1034,10 @@ class SVStepCounterThread(coordinator.LooperThread):
     elapsed_time = current_time - self._last_time
     self._last_time = current_time
     # Reports the number of steps done per second
-    steps_per_sec = added_steps / elapsed_time if elapsed_time != 0. else float("inf")
+    if elapsed_time > 0.:
+      steps_per_sec = added_steps / elapsed_time
+    else:
+      steps_per_sec = float("inf")
     summary = Summary(value=[Summary.Value(tag=self._summary_tag,
                                            simple_value=steps_per_sec)])
     if self._sv.summary_writer:
-- 
GitLab


From deca449d2419464e30ab4c7baf5b727f497aea8e Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 26 Apr 2017 11:44:11 -0800
Subject: [PATCH 0699/1563] Provide a user-defined default constructor to
 grappler::ItemConfig to avoid compiler error Change: 154331360

---
 tensorflow/core/grappler/grappler_item_builder.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/grappler/grappler_item_builder.h b/tensorflow/core/grappler/grappler_item_builder.h
index 7088636994..ed75749009 100644
--- a/tensorflow/core/grappler/grappler_item_builder.h
+++ b/tensorflow/core/grappler/grappler_item_builder.h
@@ -27,13 +27,18 @@ class MetaGraphDef;
 namespace grappler {
 
 struct ItemConfig {
+  ItemConfig()
+      : ignore_user_placement(true),
+        ignore_colocation(true),
+        placeholder_unknown_output_shape_dim(-1) {}
+
   // If true, ignore all user specified node placement.
-  bool ignore_user_placement = true;
+  bool ignore_user_placement;
   // If true, ignore all user specified colocation attributes.
-  bool ignore_colocation = true;
+  bool ignore_colocation;
   // Dimension to use if a placeholder node has an _output_shapes attribute with
   // a dimension of -1.
-  int placeholder_unknown_output_shape_dim = -1;
+  int placeholder_unknown_output_shape_dim;
 };
 
 // Factory method for creating a GrapplerItem from a MetaGraphDef.
-- 
GitLab


From aa1f99845dacba0f37f1b6fad5e51ce7688ee1c3 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Wed, 26 Apr 2017 12:02:40 -0800
Subject: [PATCH 0700/1563] [tf contrib seq2seq] Update BeamSearchDecoder +
 AttentionWrapper API: * BeamSearchDecoder no longer tries to pass a tiling
 operator to the cell. * Instead the cell must "know" about the fact that
 batch_size is now bigger. * Much more explicit and careful error messages if
 batch sizes don't match. * Added helper function to tile the batch by
 beam_width. * AttentionWrapper now accepts an initial_cell_state argument
 (it'll pass the value back through when zero_state() is called). Change:
 154333600

---
 tensorflow/contrib/seq2seq/__init__.py        |   2 +
 .../kernel_tests/attention_wrapper_test.py    | 600 +++++++++---------
 .../kernel_tests/beam_search_decoder_test.py  |   8 +-
 .../seq2seq/python/ops/attention_wrapper.py   | 220 ++++---
 .../seq2seq/python/ops/beam_search_decoder.py | 175 +++--
 5 files changed, 568 insertions(+), 437 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/__init__.py b/tensorflow/contrib/seq2seq/__init__.py
index 064ce00c61..dd497197e3 100644
--- a/tensorflow/contrib/seq2seq/__init__.py
+++ b/tensorflow/contrib/seq2seq/__init__.py
@@ -44,6 +44,8 @@ See the @{$python/contrib.seq2seq} guide.
 @@AttentionWrapper
 
 @@gather_tree
+
+@@tile_batch
 """
 
 from __future__ import absolute_import
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index 4054b51412..40b50338ad 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -159,7 +159,7 @@ class AttentionWrapperTest(test.TestCase):
             sess_results["final_state"])
       sys.stdout.flush()
       print("Copy/paste (%s)\nexpected_final_alignment_history = " % name,
-            sess_results["state_alignment_history"])
+            np.asarray(sess_results["state_alignment_history"]))
       sys.stdout.flush()
       nest.map_structure(self.assertAllClose, expected_final_output,
                          sess_results["final_outputs"])
@@ -177,41 +177,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                1.89980457e-03, 1.89681584e-03, 2.05339328e-03, -3.83376027e-03,
-                -4.31808922e-03, -6.45466987e-03
+                2.04633363e-03, 1.89259532e-03, 2.09550979e-03, -3.81628517e-03,
+                -4.36160620e-03, -6.43933658e-03
             ], [
-                2.27232254e-03, 2.02509761e-03, 2.01666891e-03, -3.87230632e-03,
-                -3.47119337e-03, -6.15991233e-03
+                2.41885195e-03, 2.02089013e-03, 2.05879519e-03, -3.85483308e-03,
+                -3.51473060e-03, -6.14458136e-03
             ], [
-                1.87640532e-03, 2.07374478e-03, 2.30582547e-03, -3.64564802e-03,
-                -3.75995948e-03, -6.28685066e-03
+                2.02294230e-03, 2.06955452e-03, 2.34797411e-03, -3.62816593e-03,
+                -3.80352931e-03, -6.27150526e-03
             ]], [[
-                4.89835022e-03, -1.94158917e-03, 3.32316267e-03,
-                -2.82446202e-03, 3.63192149e-03, -4.80734091e-03
+                4.89025004e-03, -1.97221269e-03, 3.34283570e-03,
+                -2.79326970e-03, 3.63148772e-03, -4.79645561e-03
             ], [
-                5.14256489e-03, -2.00877781e-03, 3.49807227e-03,
-                -2.86567654e-03, 3.14202951e-03, -5.32575324e-03
+                5.13446378e-03, -2.03941623e-03, 3.51774949e-03,
+                -2.83448119e-03, 3.14159272e-03, -5.31486655e-03
             ], [
-                5.21511910e-03, -2.18198029e-03, 3.56219849e-03,
-                -2.88951304e-03, 3.20866983e-03, -5.21918852e-03
+                5.20701287e-03, -2.21262546e-03, 3.58187454e-03,
+                -2.85831164e-03, 3.20822699e-03, -5.20829484e-03
             ]], [[
-                -1.34951377e-03, -9.68646549e-04, -2.11444520e-03,
-                -1.85243192e-03, -5.27541339e-03, -9.10969637e-03
+                -1.34046993e-03, -9.99792013e-04, -2.11631414e-03,
+                -1.85202830e-03, -5.26227616e-03, -9.08544939e-03
             ], [
-                -1.36390887e-03, -1.01293903e-03, -1.96592091e-03,
-                -1.80044665e-03, -5.62618347e-03, -9.36636236e-03
+                -1.35486713e-03, -1.04408595e-03, -1.96779310e-03,
+                -1.80004584e-03, -5.61304903e-03, -9.34211537e-03
             ], [
-                -1.13357347e-03, -7.37126335e-04, -1.99582824e-03,
-                -1.88097963e-03, -5.03196474e-03, -9.34652984e-03
+                -1.12452905e-03, -7.68281636e-04, -1.99770415e-03,
+                -1.88058324e-03, -5.01882844e-03, -9.32228006e-03
             ]], [[
-                1.52963377e-03, -3.97205260e-03, -9.64675564e-04,
-                8.51404853e-04, -1.29804458e-03, 6.56467676e-03
+                1.52967637e-03, -3.97213362e-03, -9.64699371e-04,
+                8.51419638e-04, -1.29806029e-03, 6.56482670e-03
             ], [
-                1.22557906e-03, -4.56343032e-03, -1.08188344e-03,
-                8.27252632e-04, -2.10058759e-03, 6.43082103e-03
+                1.22562144e-03, -4.56351135e-03, -1.08190742e-03,
+                8.27267300e-04, -2.10060296e-03, 6.43097097e-03
             ], [
-                9.93478228e-04, -4.37378604e-03, -1.41531695e-03,
-                6.44775166e-04, -2.16480484e-03, 6.68286439e-03
+                9.93521884e-04, -4.37386986e-03, -1.41534151e-03,
+                6.44790183e-04, -2.16482091e-03, 6.68301852e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -231,21 +231,21 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.18963176e-02, -8.04424379e-03, -1.48289464e-03,
-                    1.61068402e-02, -1.37983467e-02, -7.57976994e-03,
-                    -8.28560349e-03, -1.18737305e-02, 1.78835373e-02
+                    -2.18977481e-02, -8.04181397e-03, -1.48273818e-03,
+                    1.61075518e-02, -1.37986457e-02, -7.57964421e-03,
+                    -8.28644261e-03, -1.18742418e-02, 1.78838037e-02
                 ], [
-                    1.74205080e-02, -1.41929444e-02, -3.88092734e-03,
-                    3.19708064e-02, -3.54689620e-02, -2.14698724e-02,
-                    -6.21716119e-03, -1.69295724e-03, -1.94495302e-02
+                    1.74201727e-02, -1.41931782e-02, -3.88098788e-03,
+                    3.19711640e-02, -3.54694054e-02, -2.14694049e-02,
+                    -6.21706853e-03, -1.69323490e-03, -1.94494929e-02
                 ], [
-                    -1.14528481e-02, 8.77819210e-03, -1.62970200e-02,
-                    -1.39963552e-02, 1.34831406e-02, -1.04494914e-02,
-                    6.16127765e-03, -9.41022579e-03, -6.57590060e-03
+                    -1.14532551e-02, 8.77828151e-03, -1.62972715e-02,
+                    -1.39963031e-02, 1.34832524e-02, -1.04488730e-02,
+                    6.16201758e-03, -9.41041857e-03, -6.57599326e-03
                 ], [
                     -4.74753827e-02, -1.19123599e-02, -7.40140676e-05,
-                    4.10552323e-02, -1.36711076e-03, 2.11795457e-02,
-                    -2.80460119e-02, -5.44509329e-02, -2.91906092e-02
+                    4.10552323e-02, -1.36711076e-03, 2.11795494e-02,
+                    -2.80460101e-02, -5.44509329e-02, -2.91906092e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -254,20 +254,20 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.09840557e-02, -3.97477299e-03, -7.54582870e-04,
-                    7.91188516e-03, -7.02184858e-03, -3.80711886e-03,
-                    -4.22059745e-03, -6.05464494e-03, 8.92061181e-03
+                    -1.09847616e-02, -3.97357112e-03, -7.54502777e-04,
+                    7.91223347e-03, -7.02199014e-03, -3.80705344e-03,
+                    -4.22102772e-03, -6.05491130e-03, 8.92073940e-03
                 ], [
-                    8.68131686e-03, -7.16938032e-03, -1.88384682e-03,
-                    1.62678920e-02, -1.76827926e-02, -1.06622791e-02,
-                    -3.07528162e-03, -8.45885137e-04, -9.99388192e-03
+                    8.68115202e-03, -7.16950046e-03, -1.88387593e-03,
+                    1.62680726e-02, -1.76830068e-02, -1.06620435e-02,
+                    -3.07523785e-03, -8.46023730e-04, -9.99386702e-03
                 ], [
-                    -5.71205560e-03, 4.50050412e-03, -8.07640795e-03,
-                    -6.94844872e-03, 6.75682165e-03, -5.12113515e-03,
-                    3.06208082e-03, -4.61743120e-03, -3.23931244e-03
+                    -5.71225956e-03, 4.50055022e-03, -8.07653368e-03,
+                    -6.94842264e-03, 6.75687613e-03, -5.12083014e-03,
+                    3.06244940e-03, -4.61752573e-03, -3.23935854e-03
                 ], [
                     -2.37231534e-02, -5.88526297e-03, -3.72226204e-05,
-                    2.01789513e-02, -6.75848918e-04, 1.06686354e-02,
+                    2.01789513e-02, -6.75848918e-04, 1.06686372e-02,
                     -1.42624676e-02, -2.69628745e-02, -1.45034352e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
@@ -277,17 +277,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00187641, 0.00207374, 0.00230583, -0.00364565, -0.00375996,
-                -0.00628685
+                0.00202294, 0.00206955, 0.00234797, -0.00362817, -0.00380353,
+                -0.00627151
             ], [
-                0.00521512, -0.00218198, 0.0035622, -0.00288951, 0.00320867,
-                -0.00521919
+                0.00520701, -0.00221263, 0.00358187, -0.00285831, 0.00320823,
+                -0.00520829
             ], [
-                -0.00113357, -0.00073713, -0.00199583, -0.00188098, -0.00503196,
-                -0.00934653
+                -0.00112453, -0.00076828, -0.0019977, -0.00188058, -0.00501883,
+                -0.00932228
             ], [
-                0.00099348, -0.00437379, -0.00141532, 0.00064478, -0.0021648,
-                0.00668286
+                0.00099352, -0.00437387, -0.00141534, 0.00064479, -0.00216482,
+                0.00668302
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -297,41 +297,41 @@ class AttentionWrapperTest(test.TestCase):
         alignment_history=())
 
     expected_final_alignment_history = [[[
-        0.12525459, 0.12438694, 0.12613983, 0.12484372, 0.12484372, 0.12484372,
-        0.12484372, 0.12484372
+        0.12586178, 0.12272788, 0.1271652, 0.12484902, 0.12484902, 0.12484902,
+        0.12484902, 0.12484902
     ], [
-        0.12648369, 0.12322279, 0.12504892, 0.12504892, 0.12504892, 0.12504892,
-        0.12504892, 0.12504892
+        0.12612638, 0.12516938, 0.12478404, 0.12478404, 0.12478404, 0.12478404,
+        0.12478404, 0.12478404
     ], [
-        0.12611018, 0.12528601, 0.12638952, 0.12444285, 0.12444285, 0.12444285,
-        0.12444285, 0.12444285
+        0.12595113, 0.12515794, 0.1255464, 0.1246689, 0.1246689, 0.1246689,
+        0.1246689, 0.1246689
     ], [
-        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
-        0.12501054, 0.12501054
+        0.12492912, 0.12501013, 0.12501013, 0.12501013, 0.12501013, 0.12501013,
+        0.12501013, 0.12501013
     ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
-        0.12525459, 0.12438691, 0.1261397, 0.12484375, 0.12484375, 0.12484375,
-        0.12484375, 0.12484375
+        0.12586173, 0.12272781, 0.12716517, 0.12484905, 0.12484905, 0.12484905,
+        0.12484905, 0.12484905
     ], [
-        0.12648349, 0.12322238, 0.12504902, 0.12504902, 0.12504902, 0.12504902,
-        0.12504902, 0.12504902
+        0.12612617, 0.1251694, 0.12478408, 0.12478408, 0.12478408, 0.12478408,
+        0.12478408, 0.12478408
     ], [
-        0.12611009, 0.12528586, 0.12638941, 0.12444293, 0.12444293, 0.12444293,
-        0.12444293, 0.12444293
+        0.12595108, 0.12515777, 0.1255464, 0.12466895, 0.12466895, 0.12466895,
+        0.12466895, 0.12466895
     ], [
-        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
-        0.12501054, 0.12501054
+        0.12492914, 0.12501012, 0.12501012, 0.12501012, 0.12501012, 0.12501012,
+        0.12501012, 0.12501012
     ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
-        0.12525487, 0.12438726, 0.12613991, 0.12484358, 0.12484358, 0.12484358,
-        0.12484358, 0.12484358
+        0.12586181, 0.12272815, 0.12716556, 0.12484891, 0.12484891, 0.12484891,
+        0.12484891, 0.12484891
     ], [
-        0.12648354, 0.12322233, 0.12504901, 0.12504901, 0.12504901, 0.12504901,
-        0.12504901, 0.12504901
+        0.12612608, 0.12516941, 0.12478409, 0.12478409, 0.12478409, 0.12478409,
+        0.12478409, 0.12478409
     ], [
-        0.12611021, 0.125286, 0.12638955, 0.12444286, 0.12444286, 0.12444286,
-        0.12444286, 0.12444286
+        0.12595116, 0.12515792, 0.12554643, 0.1246689, 0.1246689, 0.1246689,
+        0.1246689, 0.1246689
     ], [
-        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
-        0.12501054, 0.12501054
+        0.1249292, 0.12501012, 0.12501012, 0.12501012, 0.12501012, 0.12501012,
+        0.12501012, 0.12501012
     ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]]]
 
     self._testWithAttention(
@@ -349,41 +349,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                6.64783875e-03, 2.94425711e-03, 5.26542449e-03, -2.64955591e-03,
-                -7.95925129e-03, -5.02286293e-03
+                1.27064800e-02, 3.57783446e-03, 8.22613202e-03, -1.61504047e-03,
+                -1.12555185e-02, -3.92740499e-03
             ], [
-                7.01954123e-03, 3.07301106e-03, 5.22849336e-03, -2.68844375e-03,
-                -7.11239874e-03, -4.72904276e-03
+                1.30781950e-02, 3.70747922e-03, 8.18992872e-03, -1.65389013e-03,
+                -1.04098395e-02, -3.63383139e-03
             ], [
-                6.62360899e-03, 3.12234787e-03, 5.51807694e-03, -2.46222341e-03,
-                -7.40198931e-03, -4.85701021e-03
+                1.26833543e-02, 3.75790196e-03, 8.48123431e-03, -1.42690970e-03,
+                -1.07016256e-02, -3.76088684e-03
             ]], [[
-                7.37589924e-03, -1.02620223e-03, 3.61374952e-03,
-                -5.74620720e-03, 5.05625410e-03, -7.45209027e-03
+                6.88417302e-03, -2.04071682e-03, 4.17768257e-03,
+                -4.51408979e-03, 4.90086433e-03, -6.85973791e-03
             ], [
-                7.61946291e-03, -1.09287468e-03, 3.78817180e-03,
-                -5.78709645e-03, 4.56611114e-03, -7.96987582e-03
+                7.12782983e-03, -2.10783770e-03, 4.35227761e-03,
+                -4.55496181e-03, 4.41066315e-03, -7.37757795e-03
             ], [
-                7.69207766e-03, -1.26582675e-03, 3.85218812e-03,
-                -5.81111759e-03, 4.63287206e-03, -7.86337163e-03
+                7.20011396e-03, -2.28102156e-03, 4.41620918e-03,
+                -4.57867794e-03, 4.47713351e-03, -7.27072079e-03
             ]], [[
-                -2.69413739e-03, 3.47183552e-04, -1.82145904e-03,
-                -1.39805069e-03, -8.05486552e-03, -1.08372131e-02
+                -2.20676698e-03, -1.43745833e-03, -1.99429039e-03,
+                -1.44722988e-03, -7.45461835e-03, -9.80243273e-03
             ], [
-                -2.70848931e-03, 3.03293345e-04, -1.67230750e-03,
-                -1.34555507e-03, -8.40565283e-03, -1.10935047e-02
+                -2.22120387e-03, -1.48139545e-03, -1.84528576e-03,
+                -1.39490096e-03, -7.80559657e-03, -1.00586927e-02
             ], [
-                -2.47822329e-03, 5.79408603e-04, -1.70188327e-03,
-                -1.42583530e-03, -7.81180616e-03, -1.10740755e-02
+                -1.99079141e-03, -1.20571791e-03, -1.87507609e-03,
+                -1.47541985e-03, -7.21158786e-03, -1.00391749e-02
             ]], [[
-                1.48582947e-03, -3.88786104e-03, -9.39912978e-04,
-                8.36255029e-04, -1.28223014e-03, 6.40908210e-03
+                1.48755650e-03, -3.89118027e-03, -9.40889120e-04,
+                8.36852356e-04, -1.28285377e-03, 6.41521579e-03
             ], [
-                1.18177081e-03, -4.47923271e-03, -1.05711201e-03,
-                8.12121783e-04, -2.08477327e-03, 6.27523474e-03
+                1.18351437e-03, -4.48258361e-03, -1.05809816e-03,
+                8.12723883e-04, -2.08540238e-03, 6.28142804e-03
             ], [
-                9.49664740e-04, -4.28957958e-03, -1.39053771e-03,
-                6.29657647e-04, -2.14899099e-03, 6.52727811e-03
+                9.51444614e-04, -4.29300033e-03, -1.39154412e-03,
+                6.30271854e-04, -2.14963360e-03, 6.53359853e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -396,28 +396,28 @@ class AttentionWrapperTest(test.TestCase):
             ]]],
             dtype=float32),
         sample_id=array(
-            [[0, 0, 0], [0, 0, 0], [1, 1, 1], [5, 5, 5], [3, 3, 2]],
+            [[0, 0, 0], [0, 0, 0], [1, 3, 1], [5, 5, 5], [3, 3, 2]],
             dtype=int32))
 
     expected_final_state = AttentionWrapperState(
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.19389871e-02, -7.93421268e-03, -1.45148858e-03,
-                    1.61569901e-02, -1.38310911e-02, -7.59426132e-03,
-                    -8.35836027e-03, -1.18763093e-02, 1.78797375e-02
+                    -2.19953191e-02, -7.81358499e-03, -1.42740645e-03,
+                    1.62037201e-02, -1.38600282e-02, -7.60386931e-03,
+                    -8.42390209e-03, -1.18884994e-02, 1.78821683e-02
                 ], [
-                    1.74194798e-02, -1.41677596e-02, -3.89095861e-03,
-                    3.19508761e-02, -3.54519747e-02, -2.15105712e-02,
-                    -6.20894879e-03, -1.72719418e-03, -1.94605980e-02
+                    1.74096227e-02, -1.41773149e-02, -3.89175024e-03,
+                    3.19635086e-02, -3.54669318e-02, -2.14924756e-02,
+                    -6.20695669e-03, -1.73213519e-03, -1.94583312e-02
                 ], [
-                    -1.14357909e-02, 8.76635592e-03, -1.62690803e-02,
-                    -1.39883338e-02, 1.34323873e-02, -1.04959216e-02,
-                    6.09614328e-03, -9.38197412e-03, -6.57159975e-03
+                    -1.14590004e-02, 8.76899902e-03, -1.62825100e-02,
+                    -1.39863417e-02, 1.34333782e-02, -1.04652103e-02,
+                    6.13503950e-03, -9.39247012e-03, -6.57595927e-03
                 ], [
-                    -4.74738739e-02, -1.19136795e-02, -7.36564398e-05,
-                    4.10547666e-02, -1.36771239e-03, 2.11771261e-02,
-                    -2.80481018e-02, -5.44515178e-02, -2.91903559e-02
+                    -4.74739373e-02, -1.19136302e-02, -7.36713409e-05,
+                    4.10547927e-02, -1.36768632e-03, 2.11772211e-02,
+                    -2.80480143e-02, -5.44514954e-02, -2.91903671e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -426,21 +426,21 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.10049099e-02, -3.92028037e-03, -7.38571223e-04,
-                    7.93652050e-03, -7.03821564e-03, -3.81436548e-03,
-                    -4.25778655e-03, -6.05606195e-03, 8.91851448e-03
+                    -1.10325804e-02, -3.86056723e-03, -7.26287195e-04,
+                    7.95945339e-03, -7.05253659e-03, -3.81913339e-03,
+                    -4.29130904e-03, -6.06246945e-03, 8.91948957e-03
                 ], [
-                    8.68070032e-03, -7.15647917e-03, -1.88874488e-03,
-                    1.62575077e-02, -1.76745858e-02, -1.06826536e-02,
-                    -3.07105901e-03, -8.63034453e-04, -9.99918394e-03
+                    8.67583323e-03, -7.16136536e-03, -1.88911252e-03,
+                    1.62639488e-02, -1.76817775e-02, -1.06735229e-02,
+                    -3.07015004e-03, -8.65494134e-04, -9.99815390e-03
                 ], [
-                    -5.70359221e-03, 4.49446775e-03, -8.06238409e-03,
-                    -6.94446685e-03, 6.73149945e-03, -5.14409645e-03,
-                    3.02969781e-03, -4.60351165e-03, -3.23720207e-03
+                    -5.71519835e-03, 4.49585915e-03, -8.06909613e-03,
+                    -6.94347266e-03, 6.73189852e-03, -5.12895826e-03,
+                    3.04909074e-03, -4.60868096e-03, -3.23936995e-03
                 ], [
-                    -2.37224046e-02, -5.88591257e-03, -3.70427515e-05,
-                    2.01787166e-02, -6.76146999e-04, 1.06674293e-02,
-                    -1.42635051e-02, -2.69631781e-02, -1.45033030e-02
+                    -2.37224363e-02, -5.88588836e-03, -3.70502457e-05,
+                    2.01787297e-02, -6.76134136e-04, 1.06674768e-02,
+                    -1.42634623e-02, -2.69631669e-02, -1.45033086e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
                     2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
@@ -449,17 +449,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00662361, 0.00312235, 0.00551808, -0.00246222, -0.00740199,
-                -0.00485701
+                0.01268335, 0.0037579, 0.00848123, -0.00142691, -0.01070163,
+                -0.00376089
             ], [
-                0.00769208, -0.00126583, 0.00385219, -0.00581112, 0.00463287,
-                -0.00786337
+                0.00720011, -0.00228102, 0.00441621, -0.00457868, 0.00447713,
+                -0.00727072
             ], [
-                -0.00247822, 0.00057941, -0.00170188, -0.00142584, -0.00781181,
-                -0.01107408
+                -0.00199079, -0.00120572, -0.00187508, -0.00147542, -0.00721159,
+                -0.01003917
             ], [
-                0.00094966, -0.00428958, -0.00139054, 0.00062966, -0.00214899,
-                0.00652728
+                0.00095144, -0.004293, -0.00139154, 0.00063027, -0.00214963,
+                0.0065336
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -480,41 +480,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                1.74749165e-03, 1.95862399e-03, 2.12293095e-03, -3.75889172e-03,
-                -4.39571124e-03, -6.32379763e-03
+                1.74922391e-03, 1.85935036e-03, 1.90880906e-03, -3.96941090e-03,
+                -4.17229906e-03, -6.65769773e-03
             ], [
-                2.33045570e-03, 1.99094601e-03, 1.98377599e-03, -3.87950847e-03,
-                -3.42792575e-03, -6.17497414e-03
+                1.99638237e-03, 1.91135216e-03, 1.73234346e-03, -4.00905171e-03,
+                -3.15058464e-03, -6.34974428e-03
             ], [
-                1.65032526e-03, 1.96972815e-03, 2.03462853e-03, -3.82007333e-03,
-                -3.46369296e-03, -6.54224353e-03
+                2.08854163e-03, 2.13832827e-03, 2.49780947e-03, -3.52849509e-03,
+                -3.96897132e-03, -6.12034509e-03
             ]], [[
-                4.77780215e-03, -1.98677275e-03, 3.30950436e-03,
-                -2.68179504e-03, 3.56271653e-03, -4.67860466e-03
+                4.76492243e-03, -1.97180966e-03, 3.29327444e-03,
+                -2.68205139e-03, 3.55229783e-03, -4.66645230e-03
             ], [
-                5.13039157e-03, -2.02797214e-03, 3.50760575e-03,
-                -2.83981953e-03, 3.13726603e-03, -5.31156827e-03
+                5.24956919e-03, -2.00631656e-03, 3.53828911e-03,
+                -2.96283513e-03, 3.20920302e-03, -5.43697737e-03
             ], [
-                5.17205056e-03, -2.16446724e-03, 3.53219034e-03,
-                -2.86490913e-03, 3.17879021e-03, -5.17592067e-03
+                5.30424621e-03, -2.17913301e-03, 3.59509978e-03,
+                -2.97106663e-03, 3.26450402e-03, -5.31189423e-03
             ]], [[
-                -1.38538703e-03, -6.40910701e-04, -2.02864106e-03,
-                -1.79018872e-03, -5.18789608e-03, -8.95875692e-03
+                -1.36440888e-03, -9.75572329e-04, -2.11284542e-03,
+                -1.84616144e-03, -5.31351101e-03, -9.12462734e-03
             ], [
-                -1.38620089e-03, -7.92010222e-04, -1.91070826e-03,
-                -1.76206254e-03, -5.56525169e-03, -9.27332044e-03
+                -1.41863467e-03, -1.11081311e-03, -1.94056751e-03,
+                -1.74311269e-03, -5.76282106e-03, -9.29267984e-03
             ], [
-                -1.11966045e-03, -6.07630936e-04, -1.96643686e-03,
-                -1.86803937e-03, -4.93048411e-03, -9.25842486e-03
+                -1.12129003e-03, -8.15156149e-04, -2.01535341e-03,
+                -1.89556007e-03, -5.04226238e-03, -9.37188603e-03
             ]], [[
-                1.50820788e-03, -3.93087184e-03, -9.52563598e-04,
-                8.43994785e-04, -1.29030924e-03, 6.48857141e-03
+                1.55163277e-03, -4.01433324e-03, -9.77111282e-04,
+                8.59013060e-04, -1.30598655e-03, 6.64281659e-03
             ], [
-                1.17029145e-03, -4.45716921e-03, -1.05062663e-03,
-                8.08141369e-04, -2.08062865e-03, 6.23444980e-03
+                1.26811734e-03, -4.64518648e-03, -1.10593368e-03,
+                8.41954607e-04, -2.11594440e-03, 6.58190623e-03
             ], [
-                9.67921398e-04, -4.32466762e-03, -1.40085898e-03,
-                6.35969569e-04, -2.15558149e-03, 6.59212377e-03
+                1.02682540e-03, -4.43787826e-03, -1.43417739e-03,
+                6.56281307e-04, -2.17684195e-03, 6.80128345e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -534,21 +534,21 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.18960866e-02, -8.04429129e-03, -1.48267671e-03,
-                    1.61071159e-02, -1.37981661e-02, -7.57933082e-03,
-                    -8.28570686e-03, -1.18733812e-02, 1.78834442e-02
+                    -2.18942575e-02, -8.05099495e-03, -1.48526859e-03,
+                    1.61030665e-02, -1.37967104e-02, -7.57982396e-03,
+                    -8.28088820e-03, -1.18743815e-02, 1.78839806e-02
                 ], [
-                    1.74204130e-02, -1.41935758e-02, -3.88074201e-03,
-                    3.19713727e-02, -3.54694910e-02, -2.14688145e-02,
-                    -6.21731905e-03, -1.69229065e-03, -1.94492843e-02
+                    1.74203254e-02, -1.41929490e-02, -3.88103351e-03,
+                    3.19709182e-02, -3.54691371e-02, -2.14697979e-02,
+                    -6.21709181e-03, -1.69324467e-03, -1.94495786e-02
                 ], [
-                    -1.14494488e-02, 8.77974741e-03, -1.62960067e-02,
-                    -1.39961652e-02, 1.34879015e-02, -1.04502086e-02,
-                    6.15879148e-03, -9.40956455e-03, -6.57592434e-03
+                    -1.14536462e-02, 8.77809525e-03, -1.62965059e-02,
+                    -1.39955431e-02, 1.34810507e-02, -1.04491040e-02,
+                    6.16097450e-03, -9.40943789e-03, -6.57613343e-03
                 ], [
-                    -4.74739634e-02, -1.19136050e-02, -7.36759976e-05,
-                    4.10547927e-02, -1.36767328e-03, 2.11772677e-02,
-                    -2.80479677e-02, -5.44514805e-02, -2.91903690e-02
+                    -4.74765450e-02, -1.19113335e-02, -7.42897391e-05,
+                    4.10555862e-02, -1.36665069e-03, 2.11814232e-02,
+                    -2.80444007e-02, -5.44504896e-02, -2.91908123e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -557,21 +557,21 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.09839402e-02, -3.97479767e-03, -7.54472159e-04,
-                    7.91201927e-03, -7.02175125e-03, -3.80689627e-03,
-                    -4.22065007e-03, -6.05447078e-03, 8.92056432e-03
+                    -1.09830676e-02, -3.97811923e-03, -7.55793473e-04,
+                    7.91002903e-03, -7.02103321e-03, -3.80714820e-03,
+                    -4.21818346e-03, -6.05497835e-03, 8.92084371e-03
                 ], [
-                    8.68127123e-03, -7.16970162e-03, -1.88375649e-03,
-                    1.62681788e-02, -1.76830534e-02, -1.06617520e-02,
-                    -3.07536125e-03, -8.45551898e-04, -9.99375992e-03
+                    8.68122280e-03, -7.16937613e-03, -1.88389909e-03,
+                    1.62679367e-02, -1.76828820e-02, -1.06622437e-02,
+                    -3.07524228e-03, -8.46030540e-04, -9.99389403e-03
                 ], [
-                    -5.71034756e-03, 4.50129062e-03, -8.07590690e-03,
-                    -6.94835978e-03, 6.75921654e-03, -5.12148207e-03,
-                    3.06083867e-03, -4.61710012e-03, -3.23932176e-03
+                    -5.71245840e-03, 4.50045895e-03, -8.07614625e-03,
+                    -6.94804778e-03, 6.75577158e-03, -5.12094703e-03,
+                    3.06193763e-03, -4.61703911e-03, -3.23943049e-03
                 ], [
-                    -2.37224493e-02, -5.88587578e-03, -3.70525813e-05,
-                    2.01787278e-02, -6.76127791e-04, 1.06675029e-02,
-                    -1.42634306e-02, -2.69631632e-02, -1.45033058e-02
+                    -2.37237271e-02, -5.88475820e-03, -3.73612711e-05,
+                    2.01791357e-02, -6.75620860e-04, 1.06695695e-02,
+                    -1.42616741e-02, -2.69626491e-02, -1.45035451e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
                     2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
@@ -580,17 +580,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00165033, 0.00196973, 0.00203463, -0.00382007, -0.00346369,
-                -0.00654224
+                0.00208854, 0.00213833, 0.00249781, -0.0035285, -0.00396897,
+                -0.00612035
             ], [
-                0.00517205, -0.00216447, 0.00353219, -0.00286491, 0.00317879,
-                -0.00517592
+                0.00530425, -0.00217913, 0.0035951, -0.00297107, 0.0032645,
+                -0.00531189
             ], [
-                -0.00111966, -0.00060763, -0.00196644, -0.00186804, -0.00493048,
-                -0.00925842
+                -0.00112129, -0.00081516, -0.00201535, -0.00189556, -0.00504226,
+                -0.00937189
             ], [
-                0.00096792, -0.00432467, -0.00140086, 0.00063597, -0.00215558,
-                0.00659212
+                0.00102683, -0.00443788, -0.00143418, 0.00065628, -0.00217684,
+                0.00680128
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -613,41 +613,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                1.74749165e-03, 1.95862399e-03, 2.12293095e-03, -3.75889172e-03,
-                -4.39571124e-03, -6.32379763e-03
+                1.74922391e-03, 1.85935036e-03, 1.90880906e-03, -3.96941090e-03,
+                -4.17229906e-03, -6.65769773e-03
             ], [
-                2.33045570e-03, 1.99094601e-03, 1.98377599e-03, -3.87950847e-03,
-                -3.42792575e-03, -6.17497414e-03
+                1.99638237e-03, 1.91135216e-03, 1.73234346e-03, -4.00905171e-03,
+                -3.15058464e-03, -6.34974428e-03
             ], [
-                1.65032526e-03, 1.96972815e-03, 2.03462853e-03, -3.82007333e-03,
-                -3.46369296e-03, -6.54224353e-03
+                2.08854163e-03, 2.13832827e-03, 2.49780947e-03, -3.52849509e-03,
+                -3.96897132e-03, -6.12034509e-03
             ]], [[
-                4.77780215e-03, -1.98677275e-03, 3.30950436e-03,
-                -2.68179504e-03, 3.56271653e-03, -4.67860466e-03
+                4.76492243e-03, -1.97180966e-03, 3.29327444e-03,
+                -2.68205139e-03, 3.55229783e-03, -4.66645230e-03
             ], [
-                5.13039157e-03, -2.02797214e-03, 3.50760575e-03,
-                -2.83981953e-03, 3.13726603e-03, -5.31156827e-03
+                5.24956919e-03, -2.00631656e-03, 3.53828911e-03,
+                -2.96283513e-03, 3.20920302e-03, -5.43697737e-03
             ], [
-                5.17205056e-03, -2.16446724e-03, 3.53219034e-03,
-                -2.86490913e-03, 3.17879021e-03, -5.17592067e-03
+                5.30424621e-03, -2.17913301e-03, 3.59509978e-03,
+                -2.97106663e-03, 3.26450402e-03, -5.31189423e-03
             ]], [[
-                -1.38538703e-03, -6.40910701e-04, -2.02864106e-03,
-                -1.79018872e-03, -5.18789608e-03, -8.95875692e-03
+                -1.36440888e-03, -9.75572329e-04, -2.11284542e-03,
+                -1.84616144e-03, -5.31351101e-03, -9.12462734e-03
             ], [
-                -1.38620089e-03, -7.92010222e-04, -1.91070826e-03,
-                -1.76206254e-03, -5.56525169e-03, -9.27332044e-03
+                -1.41863467e-03, -1.11081311e-03, -1.94056751e-03,
+                -1.74311269e-03, -5.76282106e-03, -9.29267984e-03
             ], [
-                -1.11966045e-03, -6.07630936e-04, -1.96643686e-03,
-                -1.86803937e-03, -4.93048411e-03, -9.25842486e-03
+                -1.12129003e-03, -8.15156149e-04, -2.01535341e-03,
+                -1.89556007e-03, -5.04226238e-03, -9.37188603e-03
             ]], [[
-                1.50820788e-03, -3.93087184e-03, -9.52563598e-04,
-                8.43994785e-04, -1.29030924e-03, 6.48857141e-03
+                1.55163277e-03, -4.01433324e-03, -9.77111282e-04,
+                8.59013060e-04, -1.30598655e-03, 6.64281659e-03
             ], [
-                1.17029145e-03, -4.45716921e-03, -1.05062663e-03,
-                8.08141369e-04, -2.08062865e-03, 6.23444980e-03
+                1.26811734e-03, -4.64518648e-03, -1.10593368e-03,
+                8.41954607e-04, -2.11594440e-03, 6.58190623e-03
             ], [
-                9.67921398e-04, -4.32466762e-03, -1.40085898e-03,
-                6.35969569e-04, -2.15558149e-03, 6.59212377e-03
+                1.02682540e-03, -4.43787826e-03, -1.43417739e-03,
+                6.56281307e-04, -2.17684195e-03, 6.80128345e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -667,21 +667,21 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.18960866e-02, -8.04429129e-03, -1.48267671e-03,
-                    1.61071159e-02, -1.37981661e-02, -7.57933082e-03,
-                    -8.28570686e-03, -1.18733812e-02, 1.78834442e-02
+                    -2.18942575e-02, -8.05099495e-03, -1.48526859e-03,
+                    1.61030665e-02, -1.37967104e-02, -7.57982396e-03,
+                    -8.28088820e-03, -1.18743815e-02, 1.78839806e-02
                 ], [
-                    1.74204130e-02, -1.41935758e-02, -3.88074201e-03,
-                    3.19713727e-02, -3.54694910e-02, -2.14688145e-02,
-                    -6.21731905e-03, -1.69229065e-03, -1.94492843e-02
+                    1.74203254e-02, -1.41929490e-02, -3.88103351e-03,
+                    3.19709182e-02, -3.54691371e-02, -2.14697979e-02,
+                    -6.21709181e-03, -1.69324467e-03, -1.94495786e-02
                 ], [
-                    -1.14494488e-02, 8.77974741e-03, -1.62960067e-02,
-                    -1.39961652e-02, 1.34879015e-02, -1.04502086e-02,
-                    6.15879148e-03, -9.40956455e-03, -6.57592434e-03
+                    -1.14536462e-02, 8.77809525e-03, -1.62965059e-02,
+                    -1.39955431e-02, 1.34810507e-02, -1.04491040e-02,
+                    6.16097450e-03, -9.40943789e-03, -6.57613343e-03
                 ], [
-                    -4.74739634e-02, -1.19136050e-02, -7.36759976e-05,
-                    4.10547927e-02, -1.36767328e-03, 2.11772677e-02,
-                    -2.80479677e-02, -5.44514805e-02, -2.91903690e-02
+                    -4.74765450e-02, -1.19113335e-02, -7.42897391e-05,
+                    4.10555862e-02, -1.36665069e-03, 2.11814232e-02,
+                    -2.80444007e-02, -5.44504896e-02, -2.91908123e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -690,21 +690,21 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.09839402e-02, -3.97479767e-03, -7.54472159e-04,
-                    7.91201927e-03, -7.02175125e-03, -3.80689627e-03,
-                    -4.22065007e-03, -6.05447078e-03, 8.92056432e-03
+                    -1.09830676e-02, -3.97811923e-03, -7.55793473e-04,
+                    7.91002903e-03, -7.02103321e-03, -3.80714820e-03,
+                    -4.21818346e-03, -6.05497835e-03, 8.92084371e-03
                 ], [
-                    8.68127123e-03, -7.16970162e-03, -1.88375649e-03,
-                    1.62681788e-02, -1.76830534e-02, -1.06617520e-02,
-                    -3.07536125e-03, -8.45551898e-04, -9.99375992e-03
+                    8.68122280e-03, -7.16937613e-03, -1.88389909e-03,
+                    1.62679367e-02, -1.76828820e-02, -1.06622437e-02,
+                    -3.07524228e-03, -8.46030540e-04, -9.99389403e-03
                 ], [
-                    -5.71034756e-03, 4.50129062e-03, -8.07590690e-03,
-                    -6.94835978e-03, 6.75921654e-03, -5.12148207e-03,
-                    3.06083867e-03, -4.61710012e-03, -3.23932176e-03
+                    -5.71245840e-03, 4.50045895e-03, -8.07614625e-03,
+                    -6.94804778e-03, 6.75577158e-03, -5.12094703e-03,
+                    3.06193763e-03, -4.61703911e-03, -3.23943049e-03
                 ], [
-                    -2.37224493e-02, -5.88587578e-03, -3.70525813e-05,
-                    2.01787278e-02, -6.76127791e-04, 1.06675029e-02,
-                    -1.42634306e-02, -2.69631632e-02, -1.45033058e-02
+                    -2.37237271e-02, -5.88475820e-03, -3.73612711e-05,
+                    2.01791357e-02, -6.75620860e-04, 1.06695695e-02,
+                    -1.42616741e-02, -2.69626491e-02, -1.45035451e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
                     2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
@@ -713,17 +713,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00165033, 0.00196973, 0.00203463, -0.00382007, -0.00346369,
-                -0.00654224
+                0.00208854, 0.00213833, 0.00249781, -0.0035285, -0.00396897,
+                -0.00612035
             ], [
-                0.00517205, -0.00216447, 0.00353219, -0.00286491, 0.00317879,
-                -0.00517592
+                0.00530425, -0.00217913, 0.0035951, -0.00297107, 0.0032645,
+                -0.00531189
             ], [
-                -0.00111966, -0.00060763, -0.00196644, -0.00186804, -0.00493048,
-                -0.00925842
+                -0.00112129, -0.00081516, -0.00201535, -0.00189556, -0.00504226,
+                -0.00937189
             ], [
-                0.00096792, -0.00432467, -0.00140086, 0.00063597, -0.00215558,
-                0.00659212
+                0.00102683, -0.00443788, -0.00143418, 0.00065628, -0.00217684,
+                0.00680128
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -745,41 +745,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                -0.24277855, -0.07872247, 0.15671003, 0.24866608, 0.30515286,
-                -0.24618624, 0.0507621, 0.18785201, -0.16496147, -0.138405
+                -0.24223405, -0.07791166, 0.15451428, 0.24738294, 0.30900395,
+                -0.24685201, 0.04992372, 0.18749543, -0.15878429, -0.13678923
             ], [
-                -0.24277849, -0.07872227, 0.15671015, 0.24866594, 0.30515245,
-                -0.24618617, 0.05076224, 0.18785192, -0.16496134, -0.13840486
+                -0.2422339, -0.07791159, 0.15451418, 0.24738279, 0.30900383,
+                -0.24685188, 0.04992369, 0.18749531, -0.15878411, -0.13678911
             ], [
-                -0.24277903, -0.07872239, 0.15671065, 0.24866652, 0.30515283,
-                -0.24618667, 0.05076243, 0.18785232, -0.16496192, -0.13840519
+                -0.2422343, -0.07791215, 0.15451413, 0.24738336, 0.30900475,
+                -0.2468522, 0.04992349, 0.18749571, -0.158785, -0.13678965
             ]], [[
-                0.39683789, 0.12260036, -0.06023827, -0.09247135, 0.11370862,
-                -0.1547074, 0.00654875, -0.26491123, 0.08399884, 0.1876322
+                0.40035266, 0.12299616, -0.06085059, -0.09197108, 0.11368551,
+                -0.15302914, 0.00566157, -0.26885766, 0.08546552, 0.18886778
             ], [
-                0.39683688, 0.12260011, -0.06023812, -0.09247123, 0.11370841,
-                -0.15470725, 0.00654882, -0.26491043, 0.08399857, 0.18763176
+                0.40035242, 0.12299603, -0.06085056, -0.09197091, 0.11368536,
+                -0.15302882, 0.0056615, -0.26885763, 0.08546554, 0.18886763
             ], [
-                0.39683694, 0.12260016, -0.06023812, -0.09247129, 0.11370847,
-                -0.1547074, 0.00654885, -0.2649104, 0.08399855, 0.18763182
+                0.40035242, 0.122996, -0.06085056, -0.09197087, 0.11368532,
+                -0.1530287, 0.00566146, -0.26885769, 0.08546556, 0.18886761
             ]], [[
-                -0.432805, 0.07398784, -0.01561836, 0.19199517, -0.02651545,
-                -0.21643993, -0.02017856, 0.00162333, 0.21297953, 0.25590748
+                -0.4311333, 0.07519469, -0.01551808, 0.1913045, -0.02693807,
+                -0.21668895, -0.02155721, 0.0013397, 0.21180844, 0.25578707
             ], [
-                -0.43280441, 0.07398778, -0.01561838, 0.19199494, -0.02651539,
-                -0.2164396, -0.02017859, 0.00162333, 0.2129792, 0.25590718
+                -0.43113309, 0.07519454, -0.01551818, 0.19130446, -0.0269379,
+                -0.21668854, -0.021557, 0.00133975, 0.21180828, 0.25578681
             ], [
-                -0.43280473, 0.07398786, -0.01561838, 0.19199508, -0.02651543,
-                -0.21643978, -0.02017862, 0.00162333, 0.21297936, 0.25590736
+                -0.43113324, 0.07519463, -0.01551815, 0.1913045, -0.02693798,
+                -0.21668874, -0.02155712, 0.00133973, 0.21180835, 0.25578696
             ]], [[
-                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
-                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+                0.07059932, 0.16451572, 0.01174669, 0.04646531, 0.1427598,
+                0.0794456, -0.10852993, 0.15306188, 0.02151393, -0.05590061
             ], [
-                0.07059769, 0.16451195, 0.01174642, 0.04646424, 0.14275652,
-                0.07944378, -0.10852744, 0.15305838, 0.02151344, -0.05589932
+                0.07059933, 0.16451576, 0.01174669, 0.04646532, 0.14275983,
+                0.07944562, -0.10852996, 0.15306193, 0.02151394, -0.05590062
             ], [
-                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
-                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+                0.07059937, 0.16451585, 0.0117467, 0.04646534, 0.1427599,
+                0.07944567, -0.10853001, 0.153062, 0.02151395, -0.05590065
             ]], [[0., 0., 0., 0., 0., 0., 0., 0., 0.,
                   0.], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.],
                  [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]]],
@@ -792,20 +792,19 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -0.01816516, -0.01675301, -0.00513183, 0.01560374,
-                    -0.01254231, -0.00434179, -0.01262734, -0.01721472,
-                    0.02279618
+                    -0.0181195, -0.01675365, -0.00510353, 0.01559796,
+                    -0.01251448, -0.00437002, -0.01243257, -0.01720199,
+                    0.02274928
                 ], [
-                    0.01265936, -0.00846189, -0.00376618, 0.0313628,
-                    -0.03488337, -0.02464793, -0.00498007, -0.00459409,
-                    -0.02097382
+                    0.01259979, -0.00839985, -0.00374037, 0.03136262,
+                    -0.03486227, -0.02466441, -0.00496157, -0.00461032,
+                    -0.02098336
                 ], [
-                    -0.00780995, 0.00314269, -0.01383716, -0.01147376,
-                    0.00483319, -0.01340735, 0.00865264, -0.00632812,
-                    -0.01053766
+                    -0.00781067, 0.00315682, -0.0138283, -0.01149793,
+                    0.00485562, -0.01343193, 0.0085915, -0.00632846, -0.01052086
                 ], [
-                    -0.04184838, -0.01223641, 0.00094449, 0.03911438,
-                    0.00432476, 0.0222066, -0.0300624, -0.05418365, -0.0261539
+                    -0.04184828, -0.01223641, 0.0009445, 0.03911434, 0.0043249,
+                    0.02220661, -0.03006243, -0.05418363, -0.02615385
                 ], [
                     0.02282745, -0.00143833, 0.01918138, 0.00545033,
                     -0.01258384, -0.00303765, -0.00511231, 0.02166323,
@@ -814,20 +813,19 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -0.00912324, -0.00827531, -0.00261125, 0.00765155,
-                    -0.00636977, -0.00217171, -0.00643897, -0.00876094,
-                    0.01136858
+                    -0.00910065, -0.00827571, -0.00259689, 0.00764857,
+                    -0.00635579, -0.00218579, -0.00633918, -0.00875511,
+                    0.01134532
                 ], [
-                    0.00629574, -0.00427225, -0.00182555, 0.01597121,
-                    -0.01734862, -0.01224119, -0.00245434, -0.0023048,
-                    -0.01077694
+                    0.00626597, -0.004241, -0.00181303, 0.01597157, -0.0173375,
+                    -0.01224921, -0.00244522, -0.00231299, -0.0107822
                 ], [
-                    -0.00391358, 0.00161294, -0.00683057, -0.00569066,
-                    0.0024297, -0.00658555, 0.00429511, -0.00309842, -0.00520863
+                    -0.00391383, 0.00162017, -0.00682621, -0.00570264,
+                    0.00244099, -0.00659772, 0.00426475, -0.00309861,
+                    -0.00520028
                 ], [
-                    -0.02087489, -0.00603306, 0.00047561, 0.01920064,
-                    0.00213868, 0.01115329, -0.01526589, -0.02687524,
-                    -0.01297526
+                    -0.02087484, -0.00603306, 0.00047561, 0.01920062,
+                    0.00213875, 0.01115329, -0.0152659, -0.02687523, -0.01297523
                 ], [
                     0.01138975, -0.00070959, 0.00986007, 0.0027323, -0.00645386,
                     -0.00152054, -0.00257339, 0.01103063, 0.00800891
@@ -835,17 +833,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                -0.24277903, -0.07872239, 0.15671065, 0.24866652, 0.30515283,
-                -0.24618667, 0.05076243, 0.18785232, -0.16496192, -0.13840519
+                -0.2422343, -0.07791215, 0.15451413, 0.24738336, 0.30900475,
+                -0.2468522, 0.04992349, 0.18749571, -0.158785, -0.13678965
             ], [
-                0.39683694, 0.12260016, -0.06023812, -0.09247129, 0.11370847,
-                -0.1547074, 0.00654885, -0.2649104, 0.08399855, 0.18763182
+                0.40035242, 0.122996, -0.06085056, -0.09197087, 0.11368532,
+                -0.1530287, 0.00566146, -0.26885769, 0.08546556, 0.18886761
             ], [
-                -0.43280473, 0.07398786, -0.01561838, 0.19199508, -0.02651543,
-                -0.21643978, -0.02017862, 0.00162333, 0.21297936, 0.25590736
+                -0.43113324, 0.07519463, -0.01551815, 0.1913045, -0.02693798,
+                -0.21668874, -0.02155712, 0.00133973, 0.21180835, 0.25578696
             ], [
-                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
-                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+                0.07059937, 0.16451585, 0.0117467, 0.04646534, 0.1427599,
+                0.07944567, -0.10853001, 0.153062, 0.02151395, -0.05590065
             ], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]],
             dtype=float32),
         time=3,
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
index 732b0db930..cb0cb4f8c3 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
@@ -245,10 +245,14 @@ class BeamSearchDecoderTest(test.TestCase):
       if has_attention:
         inputs = np.random.randn(batch_size, decoder_max_time,
                                  input_depth).astype(np.float32)
+        tiled_inputs = beam_search_decoder.tile_batch(
+            inputs, multiplier=beam_width)
+        tiled_sequence_length = beam_search_decoder.tile_batch(
+            encoder_sequence_length, multiplier=beam_width)
         attention_mechanism = attention_wrapper.BahdanauAttention(
             num_units=attention_depth,
-            memory=inputs,
-            memory_sequence_length=encoder_sequence_length)
+            memory=tiled_inputs,
+            memory_sequence_length=tiled_sequence_length)
         cell = attention_wrapper.AttentionWrapper(
             cell=cell,
             attention_mechanism=attention_mechanism,
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 3a3d0b8aec..04b38159bb 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -28,6 +28,7 @@ from tensorflow.python.framework import tensor_shape
 from tensorflow.python.layers import base as layers_base
 from tensorflow.python.layers import core as layers_core
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
@@ -72,6 +73,8 @@ def _prepare_memory(memory, memory_sequence_length, check_inner_dims_defined):
   """
   memory = nest.map_structure(
       lambda m: ops.convert_to_tensor(m, name="memory"), memory)
+  memory_sequence_length = ops.convert_to_tensor(
+      memory_sequence_length, name="memory_sequence_length")
   if check_inner_dims_defined:
     def _check_dims(m):
       if not m.get_shape()[2:].is_fully_defined():
@@ -85,15 +88,24 @@ def _prepare_memory(memory, memory_sequence_length, check_inner_dims_defined):
         memory_sequence_length,
         maxlen=array_ops.shape(nest.flatten(memory)[0])[1],
         dtype=nest.flatten(memory)[0].dtype)
+    seq_len_batch_size = (
+        memory_sequence_length.shape[0].value
+        or array_ops.shape(memory_sequence_length)[0])
   def _maybe_mask(m, seq_len_mask):
     rank = m.get_shape().ndims
     rank = rank if rank is not None else array_ops.rank(m)
     extra_ones = array_ops.ones(rank - 2, dtype=dtypes.int32)
+    m_batch_size = m.shape[0].value or array_ops.shape(m)[0]
     if memory_sequence_length is not None:
-      seq_len_mask = array_ops.reshape(
-          seq_len_mask,
-          array_ops.concat((array_ops.shape(seq_len_mask), extra_ones), 0))
-      return m * seq_len_mask
+      message = ("memory_sequence_length and memory tensor batch sizes do not "
+                 "match.")
+      with ops.control_dependencies([
+          check_ops.assert_equal(
+              seq_len_batch_size, m_batch_size, message=message)]):
+        seq_len_mask = array_ops.reshape(
+            seq_len_mask,
+            array_ops.concat((array_ops.shape(seq_len_mask), extra_ones), 0))
+        return m * seq_len_mask
     else:
       return m
   return nest.map_structure(lambda m: _maybe_mask(m, seq_len_mask), memory)
@@ -108,7 +120,8 @@ class _BaseAttentionMechanism(AttentionMechanism):
   """
 
   def __init__(self, query_layer, memory, memory_sequence_length=None,
-               memory_layer=None, check_inner_dims_defined=True, name=None):
+               memory_layer=None, check_inner_dims_defined=True,
+               name=None):
     """Construct base AttentionMechanism class.
 
     Args:
@@ -147,6 +160,8 @@ class _BaseAttentionMechanism(AttentionMechanism):
       self._keys = (
           self.memory_layer(self._values) if self.memory_layer  # pylint: disable=not-callable
           else self._values)
+      self._batch_size = (
+          self._keys.shape[0].value or array_ops.shape(self._keys)[0])
 
   @property
   def memory_layer(self):
@@ -164,6 +179,10 @@ class _BaseAttentionMechanism(AttentionMechanism):
   def keys(self):
     return self._keys
 
+  @property
+  def batch_size(self):
+    return self._batch_size
+
 
 class LuongAttention(_BaseAttentionMechanism):
   """Implements Luong-style (multiplicative) attention scoring.
@@ -213,14 +232,12 @@ class LuongAttention(_BaseAttentionMechanism):
     self._scale = scale
     self._name = name
 
-  def __call__(self, query, tiling_factor=1):
+  def __call__(self, query):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
-      tiling_factor: An integer factor for which to tile the batch dimension.
-        Used with BeamSearchDecoder.
 
     Returns:
       score: Tensor of dtype matching `self.values` and shape
@@ -317,14 +334,12 @@ class BahdanauAttention(_BaseAttentionMechanism):
     self._normalize = normalize
     self._name = name
 
-  def __call__(self, query, tiling_factor=1):
+  def __call__(self, query):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
-      tiling_factor: An integer factor for which to tile the batch dimension.
-        Used with BeamSearchDecoder.
 
     Returns:
       score: Tensor of dtype matching `self.values` and shape
@@ -335,7 +350,7 @@ class BahdanauAttention(_BaseAttentionMechanism):
       dtype = processed_query.dtype
       # Reshape from [batch_size, ...] to [batch_size, 1, ...] for broadcasting.
       processed_query = array_ops.expand_dims(processed_query, 1)
-      keys = _maybe_tile_batch(self.keys, tiling_factor)
+      keys = self._keys
       v = variable_scope.get_variable(
           "attention_v", [self._num_units], dtype=dtype)
       if self._normalize:
@@ -428,6 +443,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
                cell_input_fn=None,
                probability_fn=None,
                output_attention=True,
+               initial_cell_state=None,
                name=None):
     """Construct the `AttentionWrapper`.
 
@@ -454,6 +470,11 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         propagated to the next time step via the state and is used there.
         This flag only controls whether the attention mechanism is propagated
         up to the next cell in an RNN stack or to the top RNN output.
+      initial_cell_state: The initial state value to use for the cell when
+        the user calls `zero_state()`.  Note that if this value is provided
+        now, and the user uses a `batch_size` argument of `zero_state` which
+        does not match the batch size of `initial_cell_state`, proper
+        behavior is not guaranteed.
       name: Name to use when creating ops.
     """
     super(AttentionWrapper, self).__init__()
@@ -475,7 +496,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     if probability_fn is None:
       probability_fn = nn_ops.softmax
     else:
-      if not callable(probability_fn):
+      if not callable(cell_input_fn):
         raise TypeError(
             "probability_fn must be callable, saw type: %s"
             % type(probability_fn).__name__)
@@ -494,6 +515,28 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     self._probability_fn = probability_fn
     self._output_attention = output_attention
     self._alignment_history = alignment_history
+    with ops.name_scope(name, "AttentionWrapperInit"):
+      if initial_cell_state is None:
+        self._initial_cell_state = None
+      else:
+        final_state_tensor = nest.flatten(initial_cell_state)[-1]
+        state_batch_size = (
+            final_state_tensor.shape[0].value
+            or array_ops.shape(final_state_tensor)[0])
+        error_message = (
+            "When constructing AttentionWrapper %s: " % self._base_name +
+            "Non-matching batch sizes between the memory "
+            "(encoder output) and initial_cell_state.  Are you using "
+            "the BeamSearchDecoder?  You may need to tile your initial state "
+            "via the tf.contrib.seq2seq.tile_batch function with argument "
+            "multiple=beam_width.")
+        with ops.control_dependencies(
+            [check_ops.assert_equal(state_batch_size,
+                                    self._attention_mechanism.batch_size,
+                                    message=error_message)]):
+          self._initial_cell_state = nest.map_structure(
+              lambda s: array_ops.identity(s, name="check_initial_cell_state"),
+              initial_cell_state)
 
   @property
   def output_size(self):
@@ -512,19 +555,38 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
 
   def zero_state(self, batch_size, dtype):
     with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
+      if self._initial_cell_state is not None:
+        cell_state = self._initial_cell_state
+      else:
+        cell_state = self._cell.zero_state(batch_size, dtype)
+      error_message = (
+          "When calling zero_state of AttentionWrapper %s: " % self._base_name +
+          "Non-matching batch sizes between the memory "
+          "(encoder output) and the requested batch size.  Are you using "
+          "the BeamSearchDecoder?  If so, make sure your encoder output has "
+          "been tiled to beam_width via tf.contrib.seq2seq.tile_batch, and "
+          "the batch_size= argument passed to zero_state is "
+          "batch_size * beam_width.")
+      with ops.control_dependencies(
+          [check_ops.assert_equal(batch_size,
+                                  self._attention_mechanism.batch_size,
+                                  message=error_message)]):
+        cell_state = nest.map_structure(
+            lambda s: array_ops.identity(s, name="checked_cell_state"),
+            cell_state)
       if self._alignment_history:
         alignment_history = tensor_array_ops.TensorArray(
             dtype=dtype, size=0, dynamic_size=True)
       else:
         alignment_history = ()
       return AttentionWrapperState(
-          cell_state=self._cell.zero_state(batch_size, dtype),
+          cell_state=cell_state,
           time=array_ops.zeros([], dtype=dtypes.int32),
           attention=_zero_state_tensors(self._attention_size, batch_size,
                                         dtype),
           alignment_history=alignment_history)
 
-  def __call__(self, inputs, state, tiling_factor=1):
+  def call(self, inputs, state):
     """Perform a step of attention-wrapped RNN.
 
     - Step 1: Mix the `inputs` and previous step's `attention` output via
@@ -543,8 +605,6 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       inputs: (Possibly nested tuple of) Tensor, the input at this time step.
       state: An instance of `AttentionWrapperState` containing
         tensors from the previous time step.
-      tiling_factor: An integer factor for which to tile the batch dimension.
-        Used with BeamSearchDecoder.
 
     Returns:
       A tuple `(attention_or_cell_output, next_state)`, where:
@@ -552,81 +612,67 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       - `attention_or_cell_output` depending on `output_attention`.
       - `next_state` is an instance of `DynamicAttentionWrapperState`
          containing the state calculated at this time step.
-
-    Raises:
-      NotImplementedError: if `scope` is not `None`.
     """
-    # Step 1: Calculate the true inputs to the cell based on the
-    # previous attention value.
-    cell_inputs = self._cell_input_fn(inputs, state.attention)
-    cell_state = state.cell_state
-    cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
-
-    score = self._attention_mechanism(cell_output, tiling_factor)
-    alignments = self._probability_fn(score)
-
-    # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
-    expanded_alignments = array_ops.expand_dims(alignments, 1)
-    # Context is the inner product of alignments and values along the
-    # memory time dimension.
-    # alignments shape is
-    #   [batch_size, 1, memory_time]
-    # attention_mechanism.values shape is
-    #   [batch_size, memory_time, attention_values_dim]
-    # the batched matmul is over memory_time, so the output shape is
-    #   [batch_size, 1, attention_values_dim].
-    # we then squeeze out the singleton dim.
-    attention_mechanism_values = _maybe_tile_batch(
-        self._attention_mechanism.values, tiling_factor)
-
-    context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
-    context = array_ops.squeeze(context, [1])
-
-    if self._attention_layer is not None:
-      attention = self._attention_layer(
-          array_ops.concat([cell_output, context], 1))
-    else:
-      attention = context
+    with variable_scope.variable_scope("attention"):
+      # Step 1: Calculate the true inputs to the cell based on the
+      # previous attention value.
+      cell_inputs = self._cell_input_fn(inputs, state.attention)
+      cell_state = state.cell_state
+      cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
+
+      cell_batch_size = (
+          cell_output.shape[0].value or array_ops.shape(cell_output)[0])
+      error_message = (
+          "When applying AttentionWrapper %s: " % self.name +
+          "Non-matching batch sizes between the memory "
+          "(encoder output) and the query (decoder output).  Are you using "
+          "the BeamSearchDecoder?  You may need to tile your memory input via "
+          "the tf.contrib.seq2seq.tile_batch function with argument "
+          "multiple=beam_width.")
+      with ops.control_dependencies(
+          [check_ops.assert_equal(cell_batch_size,
+                                  self._attention_mechanism.batch_size,
+                                  message=error_message)]):
+        cell_output = array_ops.identity(
+            cell_output, name="checked_cell_output")
+
+      score = self._attention_mechanism(cell_output)
+      alignments = self._probability_fn(score)
+
+      # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
+      expanded_alignments = array_ops.expand_dims(alignments, 1)
+      # Context is the inner product of alignments and values along the
+      # memory time dimension.
+      # alignments shape is
+      #   [batch_size, 1, memory_time]
+      # attention_mechanism.values shape is
+      #   [batch_size, memory_time, attention_mechanism.num_units]
+      # the batched matmul is over memory_time, so the output shape is
+      #   [batch_size, 1, attention_mechanism.num_units].
+      # we then squeeze out the singleton dim.
+      attention_mechanism_values = self._attention_mechanism.values
+      context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
+      context = array_ops.squeeze(context, [1])
+
+      if self._attention_layer is not None:
+        attention = self._attention_layer(
+            array_ops.concat([cell_output, context], 1))
+      else:
+        attention = context
 
-    if self._alignment_history:
-      alignment_history = state.alignment_history.write(
-          state.time, alignments)
-    else:
-      alignment_history = ()
+      if self._alignment_history:
+        alignment_history = state.alignment_history.write(
+            state.time, alignments)
+      else:
+        alignment_history = ()
 
-    next_state = AttentionWrapperState(
-        time=state.time + 1,
-        cell_state=next_cell_state,
-        attention=attention,
-        alignment_history=alignment_history)
+      next_state = AttentionWrapperState(
+          time=state.time + 1,
+          cell_state=next_cell_state,
+          attention=attention,
+          alignment_history=alignment_history)
 
     if self._output_attention:
       return attention, next_state
     else:
       return cell_output, next_state
-
-
-def _maybe_tile_batch(t, tiling_factor):
-  """Tile the tensor's batch by tiling_factor.
-
-  Here, we tile t such that it looks like [b1, b1, ..., ..., bN, bN, ...].
-
-  Args:
-    t: The tensor to tile.
-    tiling_factor: The amount to tile it.
-
-  Returns:
-    The tiled tensor.
-  """
-  if tiling_factor == 1:
-    return t
-
-  shape = t.get_shape().as_list()
-  shape = [shape[0] * tiling_factor] + shape[1:]
-  tile_values = len(shape)*[1]
-  tile_values.insert(1, tiling_factor)
-  t = array_ops.expand_dims(t, 1)
-  t = array_ops.tile(t, tile_values)
-  t = array_ops.reshape(t, shape)
-  t.set_shape(shape)
-  return t
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index 55ef21a5a0..289da8e6ae 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -33,6 +33,7 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.util import nest
 
 
@@ -41,6 +42,7 @@ __all__ = [
     "BeamSearchDecoderState",
     "BeamSearchDecoder",
     "FinalBeamSearchDecoderOutput",
+    "tile_batch",
 ]
 
 
@@ -70,6 +72,44 @@ class FinalBeamSearchDecoderOutput(
   pass
 
 
+def tile_batch(t, multiplier, name=None):
+  """Tile the batch dimension of tensor t.
+
+  This function takes a tensor t shaped `[batch_size, s0, s1, ...]` composed of
+  minibatch entries `t[0], ..., t[batch_size - 1]` and tiles it to have a shape
+  `[batch_size * multiplier, s0, s1, ...]` composed of minibatch entries
+  `t[0], t[0], ..., t[1], t[1], ...` where each minibatch entry is repeated
+  `multiplier` times.
+
+  Args:
+    t: `Tensor` shaped `[batch_size, ...]`.
+    multiplier: Python int.
+    name: Name scope for any created operations.
+
+  Returns:
+    A `Tensor` shaped `[batch_size * multiplier, ...]`.
+
+  Raises:
+    ValueError: if `t` does not have a statically known rank or it's < 1.
+  """
+  with ops.name_scope(name, "tile_batch", [t, multiplier]):
+    t = ops.convert_to_tensor(t, name="t")
+    shape_t = array_ops.shape(t)
+    if t.shape.ndims is None or t.shape.ndims < 1:
+      raise ValueError("t must have statically known rank")
+    tiling = [1] * (t.shape.ndims + 1)
+    tiling[1] = multiplier
+    tiled_static_batch_size = (
+        t.shape[0].value * multiplier if t.shape[0].value is not None else None)
+    tiled = array_ops.tile(array_ops.expand_dims(t, 1), tiling)
+    tiled = array_ops.reshape(
+        tiled, array_ops.concat(([shape_t[0] * multiplier], shape_t[1:]), 0))
+    tiled.set_shape(
+        tensor_shape.TensorShape(
+            [tiled_static_batch_size]).concatenate(t.shape[1:]))
+    return tiled
+
+
 class BeamSearchDecoder(decoder.Decoder):
   """BeamSearch sampling decoder."""
 
@@ -130,8 +170,9 @@ class BeamSearchDecoder(decoder.Decoder):
     self._batch_size = array_ops.size(start_tokens)
     self._beam_width = beam_width
     self._length_penalty_weight = length_penalty_weight
-    self._initial_cell_state = nest.map_structure(self._maybe_split_batch_beams,
-                                                  initial_state)
+    self._initial_cell_state = nest.map_structure(
+        self._maybe_split_batch_beams,
+        initial_state, self._cell.state_size)
     self._start_tokens = array_ops.tile(
         array_ops.expand_dims(self._start_tokens, 1), [1, self._beam_width])
     self._start_inputs = self._embedding_fn(self._start_tokens)
@@ -223,19 +264,23 @@ class BeamSearchDecoder(decoder.Decoder):
         beam_search_decoder_output=outputs, predicted_ids=predicted_ids)
     return outputs, final_state
 
-  def _merge_batch_beams(self, t):
+  def _merge_batch_beams(self, t, s=None):
     """Merges the tensor from a batch of beams into a batch by beams.
 
-    More exactly, t is a tensor of dimension [batch_size, beam_width, ...]. We
-    reshape this into [batch_size*beam_width, ...]
+    More exactly, t is a tensor of dimension [batch_size, beam_width, s]. We
+    reshape this into [batch_size*beam_width, s]
 
     Args:
-      t: Tensor of dimension [batch_size, beam_width, ...]
+      t: Tensor of dimension [batch_size, beam_width, s]
+      s: (Possibly known) depth shape.
 
     Returns:
-      A reshaped version of t with dimension [batch_size * beam_width, ...].
+      A reshaped version of t with dimension [batch_size * beam_width, s].
     """
-    t_static_shape = t.shape
+    if isinstance(s, ops.Tensor):
+      s = tensor_util.constant_value_as_shape(s)
+    else:
+      s = tensor_shape.TensorShape(s)
     t_shape = array_ops.shape(t)
     static_batch_size = tensor_util.constant_value(self._batch_size)
     batch_size_beam_width = (
@@ -245,67 +290,105 @@ class BeamSearchDecoder(decoder.Decoder):
         t, array_ops.concat(
             ([self._batch_size * self._beam_width], t_shape[2:]), 0))
     reshaped_t.set_shape(
-        (tensor_shape.TensorShape([batch_size_beam_width])
-         .concatenate(t_static_shape[2:])))
+        (tensor_shape.TensorShape([batch_size_beam_width]).concatenate(s)))
     return reshaped_t
 
-  def _split_batch_beams(self, t):
+  def _split_batch_beams(self, t, s=None):
     """Splits the tensor from a batch by beams into a batch of beams.
 
-    More exactly, t is a tensor of dimension [batch_size*beam_width, ...]. We
-    reshape this into [batch_size, beam_width, ...]
+    More exactly, t is a tensor of dimension [batch_size*beam_width, s]. We
+    reshape this into [batch_size, beam_width, s]
 
     Args:
-      t: Tensor of dimension [batch_size*beam_width, ...]
+      t: Tensor of dimension [batch_size*beam_width, s].
+      s: (Possibly known) depth shape.
 
     Returns:
-      A reshaped version of t with dimension [batch_size, beam_width, ...].
+      A reshaped version of t with dimension [batch_size, beam_width, s].
+
+    Raises:
+      ValueError: If, after reshaping, the new tensor is not shaped
+        `[batch_size, beam_width, s]` (assuming batch_size and beam_width
+        are known statically).
     """
-    t_static_shape = t.shape
+    if isinstance(s, ops.Tensor):
+      s = tensor_util.constant_value_as_shape(s)
+    else:
+      s = tensor_shape.TensorShape(s)
     t_shape = array_ops.shape(t)
     reshaped_t = array_ops.reshape(
         t, array_ops.concat(
             ([self._batch_size, self._beam_width], t_shape[1:]), 0))
     static_batch_size = tensor_util.constant_value(self._batch_size)
-    reshaped_t.set_shape(
-        (tensor_shape.TensorShape([static_batch_size, self._beam_width])
-         .concatenate(t_static_shape[1:])))
+    expected_reshaped_shape = tensor_shape.TensorShape(
+        [static_batch_size, self._beam_width]).concatenate(s)
+    if not reshaped_t.shape.is_compatible_with(expected_reshaped_shape):
+      raise ValueError("Unexpected behavior when reshaping between beam width "
+                       "and batch size.  The reshaped tensor has shape: %s.  "
+                       "We expected it to have shape "
+                       "(batch_size, beam_width, depth) == %s.  Perhaps you "
+                       "forgot to create a zero_state with "
+                       "batch_size=encoder_batch_size * beam_width?"
+                       % (reshaped_t.shape, expected_reshaped_shape))
+    reshaped_t.set_shape(expected_reshaped_shape)
     return reshaped_t
 
-  def _maybe_split_batch_beams(self, t):
+  def _maybe_split_batch_beams(self, t, s):
     """Maybe splits the tensor from a batch by beams into a batch of beams.
 
     We do this so that we can use nest and not run into problems with shapes.
 
     Args:
-      t: Tensor of dimension [batch_size*beam_width, ...]
+      t: Tensor of dimension [batch_size*beam_width, s]
+      s: Tensor, Python int, or TensorShape.
 
     Returns:
       Either a reshaped version of t with dimension
-      [batch_size, beam_width, ...] if t's first dimension is of size
+      [batch_size, beam_width, s] if t's first dimension is of size
       batch_size*beam_width or t if not.
+
+    Raises:
+      TypeError: If t is an instance of TensorArray.
+      ValueError: If the rank of t is not statically known.
     """
-    t_shape = t.get_shape().as_list()
-    if len(t_shape) >= 1:
-      return self._split_batch_beams(t)
+    if isinstance(t, tensor_array_ops.TensorArray):
+      raise TypeError(
+          "TensorArray state is not supported by BeamSearchDecoder: %s"
+          % t.name)
+    if t.shape.ndims is None:
+      raise ValueError(
+          "Expected tensor (%s) to have known rank, but ndims == None." % t)
+    if t.shape.ndims >= 1:
+      return self._split_batch_beams(t, s)
     else:
       return t
 
-  def _maybe_merge_batch_beams(self, t):
+  def _maybe_merge_batch_beams(self, t, s):
     """Splits the tensor from a batch by beams into a batch of beams.
 
-    More exactly, t is a tensor of dimension [batch_size*beam_width, ...]. We
-    reshape this into [batch_size, beam_width, ...]
+    More exactly, t is a tensor of dimension [batch_size*beam_width, s]. We
+    reshape this into [batch_size, beam_width, s]
 
     Args:
-      t: Tensor of dimension [batch_size*beam_width, ...]
+      t: Tensor of dimension [batch_size*beam_width, s]
+      s: Tensor, Python int, or TensorShape.
 
     Returns:
-      A reshaped version of t with dimension [batch_size, beam_width, ...].
+      A reshaped version of t with dimension [batch_size, beam_width, s].
+
+    Raises:
+      TypeError: If t is an instance of TensorArray.
+      ValueError:  If the rank of t is not statically known.
     """
-    t_shape = t.get_shape().as_list()
-    if len(t_shape) >= 2:
-      return self._merge_batch_beams(t)
+    if isinstance(t, tensor_array_ops.TensorArray):
+      raise TypeError(
+          "TensorArray state is not supported by BeamSearchDecoder: %s"
+          % t.name)
+    if t.shape.ndims is None:
+      raise ValueError(
+          "Expected tensor (%s) to have known rank, but ndims == None." % t)
+    if t.shape.ndims >= 2:
+      return self._merge_batch_beams(t, s)
     else:
       return t
 
@@ -328,20 +411,18 @@ class BeamSearchDecoder(decoder.Decoder):
 
     with ops.name_scope(name, "BeamSearchDecoderStep", (time, inputs, state)):
       cell_state = state.cell_state
-      inputs = nest.map_structure(self._merge_batch_beams, inputs)
-      cell_state = nest.map_structure(self._maybe_merge_batch_beams, cell_state)
-      try:
-        cell_outputs, next_cell_state = self._cell(
-            inputs, cell_state, tiling_factor=beam_width)
-      except TypeError as e:
-        if "unexpected keyword argument 'tiling_factor'" in str(e):
-          cell_outputs, next_cell_state = self._cell(inputs, cell_state)
-        else:
-          raise
-
-      cell_outputs = nest.map_structure(self._split_batch_beams, cell_outputs)
-      next_cell_state = nest.map_structure(self._maybe_split_batch_beams,
-                                           next_cell_state)
+      inputs = nest.map_structure(
+          lambda inp: self._merge_batch_beams(inp, s=inp.shape[2:]), inputs)
+      cell_state = nest.map_structure(
+          self._maybe_merge_batch_beams,
+          cell_state, self._cell.state_size)
+      cell_outputs, next_cell_state = self._cell(inputs, cell_state)
+
+      cell_outputs = nest.map_structure(
+          lambda out: self._split_batch_beams(out, out.shape[1:]), cell_outputs)
+      next_cell_state = nest.map_structure(
+          self._maybe_split_batch_beams,
+          next_cell_state, self._cell.state_size)
 
       if self._output_layer is not None:
         cell_outputs = self._output_layer(cell_outputs)
-- 
GitLab


From 1ed03f85921e36f20b0a27174a5b2d7f103c271d Mon Sep 17 00:00:00 2001
From: Gautam <gautamrbharadwaj@gmail.com>
Date: Thu, 27 Apr 2017 02:02:36 +0530
Subject: [PATCH 0701/1563] Update gmm_ops.py (#7614)

* Update gmm_ops.py

It should be int64 instead of int32

* Remove cast altogether

* cast num_data into int64

As per ashish's comment
---
 tensorflow/contrib/factorization/python/ops/gmm_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/factorization/python/ops/gmm_ops.py b/tensorflow/contrib/factorization/python/ops/gmm_ops.py
index 42544ff884..fc5270078c 100644
--- a/tensorflow/contrib/factorization/python/ops/gmm_ops.py
+++ b/tensorflow/contrib/factorization/python/ops/gmm_ops.py
@@ -85,7 +85,7 @@ def _init_clusters_random(data, num_clusters, random_seed):
         maxval=math_ops.cast(num_data, dtypes.int64),
         seed=random_seed,
         dtype=dtypes.int64)
-  indices = math_ops.cast(indices, dtypes.int32) % num_data
+  indices = indices % math_ops.cast(num_data, dtypes.int64)
   clusters_init = embedding_lookup(data, indices, partition_strategy='div')
   return clusters_init
 
-- 
GitLab


From 0293b46e724b85546a2175fdcb3992f44f3c0ef4 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Wed, 26 Apr 2017 12:03:45 -0800
Subject: [PATCH 0702/1563] AllocationRegistry: only check fail if two
 different allocator types are defined for the same name and priority. Change:
 154333776

---
 .../core/framework/allocator_registry.cc      | 27 ++++++++++++++-----
 .../core/framework/allocator_registry.h       |  7 +++--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/tensorflow/core/framework/allocator_registry.cc b/tensorflow/core/framework/allocator_registry.cc
index 946050687d..486be39ae3 100644
--- a/tensorflow/core/framework/allocator_registry.cc
+++ b/tensorflow/core/framework/allocator_registry.cc
@@ -26,22 +26,37 @@ AllocatorRegistry* AllocatorRegistry::Global() {
   return global_allocator_registry;
 }
 
-bool AllocatorRegistry::CheckForDuplicates(const string& name, int priority) {
+Allocator* AllocatorRegistry::GetRegisteredAllocator(const string& name,
+                                                     int priority) {
   for (auto entry : allocators_) {
     if (!name.compare(entry.name) && priority == entry.priority) {
-      return true;
+      return entry.allocator;
     }
   }
-  return false;
+  return nullptr;
 }
 
 void AllocatorRegistry::Register(const string& name, int priority,
                                  Allocator* allocator) {
   CHECK(!name.empty()) << "Need a valid name for Allocator";
   CHECK_GE(priority, 0) << "Priority needs to be non-negative";
-  CHECK(!CheckForDuplicates(name, priority))
-      << "Allocator with name: [" << name << "] and priority: [" << priority
-      << "] already registered";
+
+  Allocator* existing = GetRegisteredAllocator(name, priority);
+  if (existing != nullptr) {
+    // A duplicate is if the registration name and priority match
+    // but the Allocator::Name()'s don't match.
+    CHECK_EQ(existing->Name(), allocator->Name())
+        << "Allocator with name: [" << name << "], type [" << existing->Name()
+        << "], priority: [" << priority
+        << "] already registered.  Choose a different name to register "
+        << "an allocator of type " << allocator->Name();
+
+    // The allocator names match, so we can just return.
+    // It should be safe to delete the allocator since the caller
+    // gives up ownership of it.
+    delete allocator;
+    return;
+  }
 
   AllocatorRegistryEntry tmp_entry;
   tmp_entry.name = name;
diff --git a/tensorflow/core/framework/allocator_registry.h b/tensorflow/core/framework/allocator_registry.h
index c419366ae1..b26e79ac3b 100644
--- a/tensorflow/core/framework/allocator_registry.h
+++ b/tensorflow/core/framework/allocator_registry.h
@@ -27,7 +27,8 @@ namespace tensorflow {
 // A global AllocatorRegistry is used to hold allocators for CPU backends
 class AllocatorRegistry {
  public:
-  // Add an allocator to the registry.
+  // Add an allocator to the registry.  Caller releases ownership of
+  // 'allocator'.
   void Register(const string& name, int priority, Allocator* allocator);
 
   // Return allocator with highest priority
@@ -44,7 +45,9 @@ class AllocatorRegistry {
     Allocator* allocator;  // not owned
   } AllocatorRegistryEntry;
 
-  bool CheckForDuplicates(const string& name, int priority);
+  // Returns the Allocator registered for 'name' and 'priority',
+  // or 'nullptr' if not found.
+  Allocator* GetRegisteredAllocator(const string& name, int priority);
 
   std::vector<AllocatorRegistryEntry> allocators_;
   Allocator* m_curr_allocator_;  // not owned
-- 
GitLab


From 4f0dacd1f1995414b6656f9398aca133cda1c860 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 12:36:21 -0800
Subject: [PATCH 0703/1563] Add a conversion from xla session module to a list
 of node structure as a step of xla computation transformation Change:
 154337650

---
 .../contrib/xla_tf_graph/xla_tf_graph_util.cc | 183 +++++++++++++++++-
 .../contrib/xla_tf_graph/xla_tf_graph_util.h  |  29 +++
 .../xla_tf_graph/xla_tf_graph_util_test.cc    |  80 +++++++-
 3 files changed, 289 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
index 3bad9b8067..f0dabc08a4 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
@@ -17,13 +17,182 @@ limitations under the License.
 
 #include "tensorflow/compiler/tf2xla/xla_op_registry.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
+#include "tensorflow/core/platform/protobuf.h"
 
 namespace tensorflow {
 namespace xla_tf_graph {
 
 namespace {
 
-constexpr const char* const GRAPH_NAME = "xla_tf_graph_util";
+constexpr const char* const GRAPH_NAME = "xla_tf_graph";
+constexpr const char* const NODE_NAME_PREFIX = "xla";
+
+Status ConvertPrimitiveTypeToDataType(const xla::PrimitiveType p_type,
+                                      DataType* d_type) {
+  switch (p_type) {
+    case xla::PRED:
+      *d_type = DT_BOOL;
+      return Status::OK();
+    case xla::S8:
+      *d_type = DT_INT8;
+      return Status::OK();
+    case xla::S16:
+      *d_type = DT_INT16;
+      return Status::OK();
+    case xla::S32:
+      *d_type = DT_INT32;
+      return Status::OK();
+    case xla::S64:
+      *d_type = DT_INT64;
+      return Status::OK();
+    case xla::U8:
+      *d_type = DT_UINT8;
+      return Status::OK();
+    case xla::U16:
+      *d_type = DT_UINT16;
+      return Status::OK();
+    case xla::F16:
+      *d_type = DT_HALF;
+      return Status::OK();
+    case xla::F32:
+      *d_type = DT_FLOAT;
+      return Status::OK();
+    case xla::F64:
+      *d_type = DT_DOUBLE;
+      return Status::OK();
+    default:
+      return errors::InvalidArgument(
+          "Unsupported PrimitiveType in ConvertPrimitiveTypeToDataType ",
+          xla::PrimitiveType_Name(p_type));
+  }
+}
+
+Status ConvertXlaShapeToTensorShapeType(const xla::Shape& xla_shape,
+                                        std::vector<TensorShape>* tensor_shapes,
+                                        std::vector<DataType>* data_types) {
+  switch (xla_shape.element_type()) {
+    case xla::TUPLE: {
+      for (const xla::Shape& element_shape : xla_shape.tuple_shapes()) {
+        if (element_shape.element_type() == xla::TUPLE) {
+          return errors::InvalidArgument("Nested tuple is not allowed.");
+        }
+        TF_RETURN_IF_ERROR(ConvertXlaShapeToTensorShapeType(
+            element_shape, tensor_shapes, data_types));
+      }
+      return Status::OK();
+    }
+    case xla::PRED:
+    case xla::S8:
+    case xla::S16:
+    case xla::S32:
+    case xla::S64:
+    case xla::U8:
+    case xla::U16:
+    case xla::U32:
+    case xla::U64:
+    case xla::F16:
+    case xla::F32:
+    case xla::F64: {
+      TensorShape shape;
+      DataType type;
+      TF_RETURN_IF_ERROR(
+          ConvertPrimitiveTypeToDataType(xla_shape.element_type(), &type));
+      for (const int64& dim : xla_shape.dimensions()) {
+        shape.AddDim(dim);
+      }
+      tensor_shapes->emplace_back(shape);
+      data_types->emplace_back(type);
+      return Status::OK();
+    }
+    default:
+      return errors::InvalidArgument(
+          "Unsupported PrimitiveType in ConvertXlaShapeToTensorShapeType ",
+          xla::PrimitiveType_Name(xla_shape.element_type()));
+  }
+}
+
+string BuildXlaNodeName(const xla::OperationRequest& operation_request,
+                        const string& xla_op_type, const string& suffix) {
+  const string name = strings::StrCat(
+      NODE_NAME_PREFIX, "/", operation_request.output_handle().handle(), "/",
+      xla_op_type);
+  if (suffix.empty()) {
+    return name;
+  } else {
+    return strings::StrCat(name, "/", suffix);
+  }
+}
+
+string BuildXlaNodeName(const xla::OperationRequest& operation_request,
+                        const string& xla_op_type) {
+  return BuildXlaNodeName(operation_request, xla_op_type, "");
+}
+
+string BuildXlaNodeOp(const protobuf::Message& msg, const string& suffix) {
+  return strings::StrCat(msg.GetDescriptor()->name(), "/", suffix);
+}
+
+string BuildXlaNodeOp(const protobuf::Message& msg) {
+  return BuildXlaNodeOp(msg, "");
+}
+
+Status ConvertOpRequestToXlaNode(const xla::OperationRequest& operation_request,
+                                 XlaNode* xla_node) {
+  const xla::OpRequest& op_request = operation_request.request();
+  switch (op_request.op_case()) {
+    case xla::OpRequest::kBinaryOpRequest: {
+      const xla::BinaryOpRequest& op = op_request.binary_op_request();
+      xla_node->op_type =
+          BuildXlaNodeOp(op, xla::BinaryOperation_Name(op.binop()));
+      xla_node->name = BuildXlaNodeName(operation_request, xla_node->op_type);
+      xla_node->input_ids.emplace_back(std::make_tuple(op.lhs().handle(), 0));
+      xla_node->input_ids.emplace_back(std::make_tuple(op.rhs().handle(), 0));
+      for (const int64& dim : op.broadcast_dimensions()) {
+        xla_node->broadcast_dimensions.emplace_back(dim);
+      }
+      break;
+    }
+    case xla::OpRequest::kParameterRequest: {
+      const xla::ParameterRequest& op = op_request.parameter_request();
+      xla_node->op_type = BuildXlaNodeOp(op, "");
+      xla_node->name =
+          BuildXlaNodeName(operation_request, xla_node->op_type, op.name());
+      break;
+    }
+    case xla::OpRequest::kVariadicOpRequest: {
+      const xla::VariadicOpRequest& op = op_request.variadic_op_request();
+      xla_node->op_type =
+          BuildXlaNodeOp(op, xla::VariadicOperation_Name(op.varop()));
+      xla_node->name = BuildXlaNodeName(operation_request, xla_node->op_type);
+      for (const xla::ComputationDataHandle& handle : op.operands()) {
+        xla_node->input_ids.emplace_back(std::make_tuple(handle.handle(), 0));
+      }
+      break;
+    }
+    case xla::OpRequest::kGetTupleElementRequest: {
+      const xla::GetTupleElementRequest& op =
+          op_request.get_tuple_element_request();
+      xla_node->op_type = BuildXlaNodeOp(op);
+      xla_node->name = BuildXlaNodeName(operation_request, xla_node->op_type);
+      xla_node->input_ids.emplace_back(
+          std::make_tuple(op.operand().handle(), op.index()));
+      break;
+    }
+    default:
+      // TODO(satok): Implement all possible cases.
+      LOG(FATAL) << "Op request: " << op_request.op_case()
+                 << " is not supported yet.";
+      break;
+  }
+
+  CHECK(!xla_node->name.empty());
+  CHECK(!xla_node->op_type.empty());
+
+  TF_RETURN_IF_ERROR(ConvertXlaShapeToTensorShapeType(
+      operation_request.output_shape(), &xla_node->output_shapes,
+      &xla_node->output_data_types));
+  return Status::OK();
+}
 
 void SetupXlaCpuClient(std::unique_ptr<FunctionLibraryDefinition>* flib_def,
                        std::unique_ptr<FunctionLibraryRuntime>* flr,
@@ -67,5 +236,17 @@ ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
   return result.computation.Snapshot();
 }
 
+xla::StatusOr<std::unordered_map<int64, XlaNode>>
+ConvertXlaSessionModuleToXlaNodes(const xla::SessionModule& session_module) {
+  std::unordered_map<int64, XlaNode> xla_nodes;
+  for (const auto& operation_request : session_module.entry().requests()) {
+    XlaNode xla_node;
+    TF_RETURN_IF_ERROR(
+        ConvertOpRequestToXlaNode(operation_request.second, &xla_node));
+    xla_nodes.emplace(operation_request.first, xla_node);
+  }
+  return std::move(xla_nodes);
+}
+
 }  // namespace xla_tf_graph
 }  // namespace tensorflow
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
index 89dca876b0..e635290851 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_CONTRIB_XLA_TF_GRAPH_XLA_TF_GRAPH_UTIL_H_
 #define TENSORFLOW_CONTRIB_XLA_TF_GRAPH_XLA_TF_GRAPH_UTIL_H_
 
+#include <unordered_map>
+
 #include "tensorflow/compiler/tf2xla/xla_compiler.h"
 #include "tensorflow/compiler/xla/client/client.h"
 #include "tensorflow/compiler/xla/status_macros.h"
@@ -32,11 +34,38 @@ namespace xla_tf_graph {
 // implementing xla computations so that they can do experiments on their
 // specialized environments.
 
+// A structure to represent typed attributes of TensorFlow graph node.
+// This structure contains op specific attributes as members so that
+// we can treat them explicitly.
+struct XlaNode {
+  // Unique node name
+  string name;
+  // Op type of xla computation
+  string op_type;
+  // List of pair of unique id and port of input node.
+  // We store this value instead
+  // of node name in order not to wait for all XlaNodes to be constructed.
+  std::vector<std::tuple<int64, int>> input_ids;
+  // Oputput shapes
+  std::vector<TensorShape> output_shapes;
+  // Output data types
+  std::vector<DataType> output_data_types;
+
+  //---------------------------
+  // Op specific attributes
+  // #xla::OpRequest::kBinaryOpRequest
+  std::vector<int64> broadcast_dimensions;
+};
+
 // Convert a tf graph to a xla session module
 xla::StatusOr<std::unique_ptr<xla::SessionModule>>
 ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
                                  std::unique_ptr<Graph> graph);
 
+// Convert a xla session module to a map to XlaNode from unique id
+xla::StatusOr<std::unordered_map<int64, XlaNode>>
+ConvertXlaSessionModuleToXlaNodes(const xla::SessionModule& session_module);
+
 }  // namespace xla_tf_graph
 }  // namespace tensorflow
 
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
index bab4256187..23649957f3 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
 #include "tensorflow/cc/framework/scope.h"
 #include "tensorflow/cc/ops/function_ops.h"
 #include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/core/platform/test.h"
 
@@ -27,6 +28,7 @@ static std::unique_ptr<Graph> BuildAddGraph() {
   Scope scope = Scope::NewRootScope().ExitOnError();
   auto a = ops::_Arg(scope.WithOpName("A"), DT_INT32, 0);
   auto b = ops::_Arg(scope.WithOpName("B"), DT_INT32, 1);
+  // See tf2xla/kernels/binary_ops.cc
   auto c = ops::Add(scope.WithOpName("C"), a, b);
   auto d = ops::_Retval(scope.WithOpName("D"), c, 0);
   std::unique_ptr<Graph> graph(new Graph(OpRegistry::Global()));
@@ -34,16 +36,75 @@ static std::unique_ptr<Graph> BuildAddGraph() {
   return graph;
 }
 
-TEST(XlaTfGraphUtil, ConvertTfGraphToHloModule) {
+static std::vector<XlaCompiler::Argument> BuildAddGraphArguments() {
   // Builds a description of the arguments.
   std::vector<XlaCompiler::Argument> args(2);
   args[0].kind = XlaCompiler::Argument::kParameter;
   args[0].type = DT_INT32;
-  args[0].shape = TensorShape({2});
+  // Difference of dimension will add extra broadcast_dimensions.
+  // broadcast_dimension generates an additional HloInstruction
+  // in user_computation.cc
+  args[0].shape = TensorShape({2, 2});
   args[1].kind = XlaCompiler::Argument::kParameter;
   args[1].type = DT_INT32;
   args[1].shape = TensorShape({2});
+  return args;
+}
+
+// CAVEAT: Debug purpose only.
+// This function dumps a protobuf string format of HloModule.
+static void DumpHloGraphForDebug(const std::vector<XlaCompiler::Argument>& args,
+                                 std::unique_ptr<Graph> graph) {
+  std::unique_ptr<FunctionLibraryDefinition> flib_def;
+  std::unique_ptr<FunctionLibraryRuntime> flr;
+  std::unique_ptr<XlaCompiler> compiler;
+
+  xla::Client* client = xla::ClientLibrary::LocalClientOrDie();
+  XlaOpRegistry::RegisterCompilationKernels();
+
+  FunctionDefLibrary flib;
+  flib_def.reset(new FunctionLibraryDefinition(OpRegistry::Global(), flib));
+
+  // Compiles the graph.
+  XlaCompiler::Options options;
+  options.device_type = DeviceType("XLA_CPU_JIT");
+  options.client = client;
+  compiler.reset(new XlaCompiler(options));
 
+  flr.reset(NewFunctionLibraryRuntime(compiler->device_mgr(), /*env=*/nullptr,
+                                      compiler->device(), TF_GRAPH_DEF_VERSION,
+                                      flib_def.get(), OptimizerOptions(),
+                                      /*custom_kernel_creator=*/nullptr));
+
+  // Compile graph
+  XlaCompiler::CompilationResult result;
+  TF_CHECK_OK(compiler->CompileGraph("dump", std::move(graph), flr.get(), args,
+                                     &result));
+
+  // Convert to hlo
+  xla::Computation& computation = result.computation;
+
+  xla::Service* service(
+      static_cast<xla::Service*>(xla::ClientLibrary::GetXlaService(
+          static_cast<xla::LocalClient*>(client)->platform())));
+  const xla::ComputationTracker& computation_tracker =
+      service->computation_tracker();
+
+  auto user_computation_status =
+      computation_tracker.Resolve(computation.handle());
+  TF_CHECK_OK(user_computation_status.status());
+  auto user_computation = user_computation_status.ConsumeValueOrDie();
+  xla::VersionedComputationHandle versioned_handle =
+      user_computation->GetVersionedHandle();
+  std::unique_ptr<xla::HloModule> hlo_module = std::move(
+      computation_tracker.BuildHloModule(versioned_handle).ValueOrDie());
+  VLOG(1) << "--- DUMP HLO ---";
+  VLOG(1) << hlo_module->ToString();
+}
+
+TEST(XlaTfGraphUtil, ConvertTfGraphToSessionModule) {
+  // Builds a description of the arguments.
+  std::vector<XlaCompiler::Argument> args = BuildAddGraphArguments();
   std::unique_ptr<Graph> graph = BuildAddGraph();
 
   TF_ASSIGN_OR_ASSERT_OK(
@@ -51,6 +112,21 @@ TEST(XlaTfGraphUtil, ConvertTfGraphToHloModule) {
       ConvertTfGraphToXlaSessionModule(args, std::move(graph)));
 
   ASSERT_EQ(5, session_module->entry().requests_size());
+
+  VLOG(1) << "--- DUMP ---";
+  VLOG(1) << session_module->DebugString();
+  DumpHloGraphForDebug(args, BuildAddGraph());
+}
+
+TEST(XlaTfGraphUtil, ConvertXlaSessionModuleToXlaNodes) {
+  std::vector<XlaCompiler::Argument> args = BuildAddGraphArguments();
+  std::unique_ptr<Graph> graph = BuildAddGraph();
+  TF_ASSIGN_OR_ASSERT_OK(
+      std::unique_ptr<xla::SessionModule> session_module,
+      ConvertTfGraphToXlaSessionModule(args, std::move(graph)));
+  TF_ASSIGN_OR_ASSERT_OK(auto xla_nodes,
+                         ConvertXlaSessionModuleToXlaNodes(*session_module));
+  EXPECT_EQ(session_module->entry().requests_size(), xla_nodes.size());
 }
 
 }  // namespace xla_tf_graph
-- 
GitLab


From 05c77baecdafb2a44d3788b369a92cec66157162 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 26 Apr 2017 12:40:12 -0800
Subject: [PATCH 0704/1563] tfdbg: Improve the way uninitialized tensor values
 and DT_RESOURCE tensor values are displayed

1. Fix the bug wherein DT_RESOURCE tensors are displayed as "Uninitialized tensor", even if they are initialized.
2. For truly uninitialized tensors, provide more information by printing the TensorProto, which contains the dtype and shape.
Change: 154338128
---
 tensorflow/python/debug/BUILD                 |  1 +
 tensorflow/python/debug/cli/tensor_format.py  |  5 +-
 .../python/debug/cli/tensor_format_test.py    | 38 ++++++++++++--
 tensorflow/python/debug/lib/debug_data.py     | 49 ++++++++++++++-----
 .../python/debug/lib/debug_data_test.py       | 13 +++--
 .../python/debug/lib/session_debug_testlib.py | 11 +++--
 6 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 2c8fa53501..f9c908f538 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -111,6 +111,7 @@ py_library(
     srcs = ["cli/tensor_format.py"],
     srcs_version = "PY2AND3",
     deps = [
+        ":debug_data",
         ":debugger_cli_common",
         "//third_party/py/numpy",
     ],
diff --git a/tensorflow/python/debug/cli/tensor_format.py b/tensorflow/python/debug/cli/tensor_format.py
index c3c4bcf215..bb7ac31430 100644
--- a/tensorflow/python/debug/cli/tensor_format.py
+++ b/tensorflow/python/debug/cli/tensor_format.py
@@ -24,6 +24,7 @@ import numpy as np
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.python.debug.cli import debugger_cli_common
+from tensorflow.python.debug.lib import debug_data
 
 _NUMPY_OMISSION = "...,"
 _NUMPY_DEFAULT_EDGE_ITEMS = 3
@@ -112,10 +113,10 @@ def format_tensor(tensor,
           (8 + proper_len + 1, 8 + proper_len + 1 + debug_op_len, "yellow")
       ]
 
-  if tensor is None:
+  if isinstance(tensor, debug_data.InconvertibleTensorProto):
     if lines:
       lines.append("")
-    lines.append("Uninitialized tensor")
+    lines.extend(str(tensor).split("\n"))
     return debugger_cli_common.RichTextLines(lines)
   elif not isinstance(tensor, np.ndarray):
     # If tensor is not a np.ndarray, return simple text-line representation of
diff --git a/tensorflow/python/debug/cli/tensor_format_test.py b/tensorflow/python/debug/cli/tensor_format_test.py
index 8392a87367..ec80bb998e 100644
--- a/tensorflow/python/debug/cli/tensor_format_test.py
+++ b/tensorflow/python/debug/cli/tensor_format_test.py
@@ -20,7 +20,11 @@ from __future__ import print_function
 import numpy as np
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
+from tensorflow.core.framework import tensor_pb2
+from tensorflow.core.framework import tensor_shape_pb2
+from tensorflow.core.framework import types_pb2
 from tensorflow.python.debug.cli import tensor_format
+from tensorflow.python.debug.lib import debug_data
 from tensorflow.python.framework import test_util
 from tensorflow.python.platform import googletest
 
@@ -363,10 +367,28 @@ class RichTextLinesTest(test_util.TensorFlowTestCase):
       if i < 1:
         self.assertNotIn(p + i * 6 + 5, out.annotations)
 
-  def testFormatNone(self):
-    out = tensor_format.format_tensor(None, "a")
+  def testFormatUninitializedTensor(self):
+    tensor_proto = tensor_pb2.TensorProto(
+        dtype=types_pb2.DataType.Value("DT_FLOAT"),
+        tensor_shape=tensor_shape_pb2.TensorShapeProto(
+            dim=[tensor_shape_pb2.TensorShapeProto.Dim(size=1)]))
+    out = tensor_format.format_tensor(
+        debug_data.InconvertibleTensorProto(tensor_proto, False), "a")
+
+    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor:"],
+                     out.lines[:3])
+    self.assertEqual(str(tensor_proto).split("\n"), out.lines[3:])
 
-    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor"], out.lines)
+  def testFormatResourceTypeTensor(self):
+    tensor_proto = tensor_pb2.TensorProto(
+        dtype=types_pb2.DataType.Value("DT_RESOURCE"),
+        tensor_shape=tensor_shape_pb2.TensorShapeProto(
+            dim=[tensor_shape_pb2.TensorShapeProto.Dim(size=1)]))
+    out = tensor_format.format_tensor(
+        debug_data.InconvertibleTensorProto(tensor_proto), "a")
+
+    self.assertEqual(["Tensor \"a\":", ""], out.lines[:2])
+    self.assertEqual(str(tensor_proto).split("\n"), out.lines[2:])
 
   def testLocateTensorElement1DNoEllipsis(self):
     a = np.zeros(20)
@@ -821,9 +843,15 @@ class RichTextLinesTest(test_util.TensorFlowTestCase):
     self.assertEqual([12, None], end_cols)
 
   def testLocateTensorElementAnnotationsUnavailable(self):
-    out = tensor_format.format_tensor(None, "a")
+    tensor_proto = tensor_pb2.TensorProto(
+        dtype=types_pb2.DataType.Value("DT_FLOAT"),
+        tensor_shape=tensor_shape_pb2.TensorShapeProto(
+            dim=[tensor_shape_pb2.TensorShapeProto.Dim(size=1)]))
+    out = tensor_format.format_tensor(
+        debug_data.InconvertibleTensorProto(tensor_proto, False), "a")
 
-    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor"], out.lines)
+    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor:"],
+                     out.lines[:3])
 
     with self.assertRaisesRegexp(
         AttributeError, "tensor_metadata is not available in annotations"):
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index 2b11039215..ce4bc82e0a 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -39,6 +39,30 @@ FETCHES_INFO_FILE_TAG = "fetches_info_"
 FEED_KEYS_INFO_FILE_TAG = "feed_keys_info_"
 
 
+class InconvertibleTensorProto(object):
+  """Represents a TensorProto that cannot be converted to np.ndarray."""
+
+  def __init__(self, tensor_proto, initialized=True):
+    """Constructor.
+
+    Args:
+      tensor_proto: the `TensorProto` object that cannot be represented as a
+        `np.ndarray` object.
+      initialized: (`bool`) whether the Tensor is initialized.
+    """
+    self._tensor_proto = tensor_proto
+    self._initialized = initialized
+
+  def __str__(self):
+    output = "" if self._initialized else "Uninitialized tensor:\n"
+    output += str(self._tensor_proto)
+    return output
+
+  @property
+  def initialized(self):
+    return self._initialized
+
+
 def load_tensor_from_event_file(event_file_path):
   """Load a tensor from an event file.
 
@@ -69,26 +93,27 @@ def load_tensor_from_event(event):
         summary.value[0] field.
 
   Returns:
-    The tensor value loaded from the event file, as a `numpy.ndarray`. For
-    uninitialized Tensors, returns `None`. For Tensors of data types that
-    cannot be converted to `numpy.ndarray` (e.g., `tf.resource`), return
-    `None`.
+    The tensor value loaded from the event file, as a `numpy.ndarray`, if
+    representation of the tensor value by a `numpy.ndarray` is possible.
+    For uninitialized Tensors, returns `None`. For Tensors of data types that
+    cannot be represented as `numpy.ndarray` (e.g., `tf.resource`), return
+    the `TensorProto` protobuf object without converting it to a
+    `numpy.ndarray`.
   """
 
-  if (event.summary.value[0].tensor.tensor_content or
-      event.summary.value[0].tensor.string_val):
+  tensor_proto = event.summary.value[0].tensor
+  if tensor_proto.tensor_content or tensor_proto.string_val:
     # Initialized tensor.
-    tensor_proto = event.summary.value[0].tensor
     if tensor_proto.dtype == types_pb2.DT_RESOURCE:
-      return None
+      tensor_value = InconvertibleTensorProto(tensor_proto)
     else:
       try:
         tensor_value = tensor_util.MakeNdarray(tensor_proto)
       except KeyError:
-        tensor_value = None
+        tensor_value = InconvertibleTensorProto(tensor_proto)
   else:
     # Uninitialized tensor or tensor of unconvertible data type.
-    tensor_value = None
+    tensor_value = InconvertibleTensorProto(tensor_proto, False)
 
   return tensor_value
 
@@ -290,8 +315,10 @@ def has_inf_or_nan(datum, tensor):
 
   _ = datum  # Datum metadata is unused in this predicate.
 
-  if tensor is None:
+  if isinstance(tensor, InconvertibleTensorProto):
     # Uninitialized tensor doesn't have bad numerical values.
+    # Also return False for data types that cannot be represented as numpy
+    # arrays.
     return False
   elif (np.issubdtype(tensor.dtype, np.float) or
         np.issubdtype(tensor.dtype, np.complex) or
diff --git a/tensorflow/python/debug/lib/debug_data_test.py b/tensorflow/python/debug/lib/debug_data_test.py
index 2f6822331d..dc45e8df6c 100644
--- a/tensorflow/python/debug/lib/debug_data_test.py
+++ b/tensorflow/python/debug/lib/debug_data_test.py
@@ -23,6 +23,7 @@ import tempfile
 
 import numpy as np
 
+from tensorflow.core.framework import tensor_pb2
 from tensorflow.python.debug.lib import debug_data
 from tensorflow.python.framework import test_util
 from tensorflow.python.platform import googletest
@@ -125,9 +126,15 @@ class HasNanOrInfTest(test_util.TensorFlowTestCase):
     a = np.array([])
     self.assertFalse(debug_data.has_inf_or_nan(self._dummy_datum, a))
 
-  def testNone(self):
-    a = None
-    self.assertFalse(debug_data.has_inf_or_nan(self._dummy_datum, a))
+  def testInconvertibleTensorProto(self):
+    self.assertFalse(debug_data.has_inf_or_nan(
+        self._dummy_datum,
+        debug_data.InconvertibleTensorProto(tensor_pb2.TensorProto(),
+                                            initialized=False)))
+    self.assertFalse(debug_data.has_inf_or_nan(
+        self._dummy_datum,
+        debug_data.InconvertibleTensorProto(tensor_pb2.TensorProto(),
+                                            initialized=True)))
 
   def testDTypeComplexWorks(self):
     a = np.array([1j, 3j, 3j, 7j], dtype=np.complex128)
diff --git a/tensorflow/python/debug/lib/session_debug_testlib.py b/tensorflow/python/debug/lib/session_debug_testlib.py
index acebb2297f..deb8249343 100644
--- a/tensorflow/python/debug/lib/session_debug_testlib.py
+++ b/tensorflow/python/debug/lib/session_debug_testlib.py
@@ -358,9 +358,11 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
       u_vals = dump.get_tensors(u_name, 0, "DebugIdentity")
       s_vals = dump.get_tensors(s_name, 0, "DebugIdentity")
       self.assertEqual(1, len(u_vals))
-      self.assertIsNone(u_vals[0])
+      self.assertIsInstance(u_vals[0], debug_data.InconvertibleTensorProto)
+      self.assertFalse(u_vals[0].initialized)
       self.assertEqual(1, len(s_vals))
-      self.assertIsNone(s_vals[0])
+      self.assertIsInstance(s_vals[0], debug_data.InconvertibleTensorProto)
+      self.assertFalse(s_vals[0].initialized)
 
       # Call run() again, to check that u is initialized properly.
       self.assertAllClose(u_init_val, sess.run(u))
@@ -1422,7 +1424,10 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
           self._dump_root, partition_graphs=run_metadata.partition_graphs)
       self.assertTrue(dump.loaded_partition_graphs())
 
-      self.assertIsNone(dump.get_tensors("fifo_queue", 0, "DebugIdentity")[0])
+      fifo_queue_tensor = dump.get_tensors("fifo_queue", 0, "DebugIdentity")[0]
+      self.assertIsInstance(fifo_queue_tensor,
+                            debug_data.InconvertibleTensorProto)
+      self.assertTrue(fifo_queue_tensor.initialized)
       self.assertAllClose(
           [101.0, 202.0, 303.0],
           dump.get_tensors("enqueue_many/component_0", 0, "DebugIdentity")[0])
-- 
GitLab


From 0f30fd374f0ad00bfeca434f544cc52f6f559499 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Wed, 26 Apr 2017 12:45:41 -0800
Subject: [PATCH 0705/1563] Release the Python GIL around all file_io
 operations. Change: 154338968

---
 tensorflow/python/lib/io/file_io.i | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tensorflow/python/lib/io/file_io.i b/tensorflow/python/lib/io/file_io.i
index c0c4e035fc..a6fe802597 100644
--- a/tensorflow/python/lib/io/file_io.i
+++ b/tensorflow/python/lib/io/file_io.i
@@ -31,6 +31,13 @@ limitations under the License.
 #include "tensorflow/core/protobuf/meta_graph.pb.h"
 %}
 
+// Release the Python GIL for the duration of all methods.
+%exception {
+  Py_BEGIN_ALLOW_THREADS;
+  $action
+  Py_END_ALLOW_THREADS;
+}
+
 %{
 inline void FileExists(const string& filename, TF_Status* out_status) {
   tensorflow::Status status = tensorflow::Env::Default()->FileExists(filename);
@@ -299,3 +306,6 @@ string ReadFromStream(tensorflow::io::BufferedInputStream* stream,
 %include "tensorflow/core/lib/io/path.h"
 
 %include "tensorflow/core/platform/file_statistics.h"
+
+// Delete the previously defined default handler that releases the Python GIL.
+%noexception;
-- 
GitLab


From b82cb8e93245b0de66794f8986db453d022ae341 Mon Sep 17 00:00:00 2001
From: Rohan Jain <rohanj@google.com>
Date: Wed, 26 Apr 2017 13:15:06 -0800
Subject: [PATCH 0706/1563] Moving _read_keyed_batch_{features,
 examples}_shared_queue from private to public. Change: 154343093

---
 .../learn/python/learn/learn_io/__init__.py   |  4 +-
 .../learn/python/learn/learn_io/graph_io.py   | 48 +++++++++----------
 .../python/learn/learn_io/graph_io_test.py    |  7 ++-
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/learn_io/__init__.py b/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
index 4567928358..06c3782a47 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
@@ -21,14 +21,14 @@ from __future__ import print_function
 from tensorflow.contrib.learn.python.learn.learn_io.dask_io import extract_dask_data
 from tensorflow.contrib.learn.python.learn.learn_io.dask_io import extract_dask_labels
 from tensorflow.contrib.learn.python.learn.learn_io.dask_io import HAS_DASK
-from tensorflow.contrib.learn.python.learn.learn_io.graph_io import _read_keyed_batch_examples_shared_queue
-from tensorflow.contrib.learn.python.learn.learn_io.graph_io import _read_keyed_batch_features_shared_queue
 from tensorflow.contrib.learn.python.learn.learn_io.graph_io import queue_parsed_features
 from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_batch_examples
 from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_batch_features
 from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_batch_record_features
 from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_keyed_batch_examples
+from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_keyed_batch_examples_shared_queue
 from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_keyed_batch_features
+from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_keyed_batch_features_shared_queue
 from tensorflow.contrib.learn.python.learn.learn_io.numpy_io import numpy_input_fn
 from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import extract_pandas_data
 from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import extract_pandas_labels
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
index 9bdd3206b2..6b552f59d0 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
@@ -174,17 +174,17 @@ def read_keyed_batch_examples(file_pattern,
       seed=seed)
 
 
-def _read_keyed_batch_examples_shared_queue(file_pattern,
-                                            batch_size,
-                                            reader,
-                                            randomize_input=True,
-                                            num_epochs=None,
-                                            queue_capacity=10000,
-                                            num_threads=1,
-                                            read_batch_size=1,
-                                            parse_fn=None,
-                                            name=None,
-                                            seed=None):
+def read_keyed_batch_examples_shared_queue(file_pattern,
+                                           batch_size,
+                                           reader,
+                                           randomize_input=True,
+                                           num_epochs=None,
+                                           queue_capacity=10000,
+                                           num_threads=1,
+                                           read_batch_size=1,
+                                           parse_fn=None,
+                                           name=None,
+                                           seed=None):
   """Adds operations to read, queue, batch `Example` protos.
 
   Given file pattern (or list of files), will setup a shared queue for file
@@ -512,18 +512,18 @@ def read_keyed_batch_features(file_pattern,
         name=scope)
 
 
-def _read_keyed_batch_features_shared_queue(file_pattern,
-                                            batch_size,
-                                            features,
-                                            reader,
-                                            randomize_input=True,
-                                            num_epochs=None,
-                                            queue_capacity=10000,
-                                            reader_num_threads=1,
-                                            feature_queue_capacity=100,
-                                            num_queue_runners=2,
-                                            parse_fn=None,
-                                            name=None):
+def read_keyed_batch_features_shared_queue(file_pattern,
+                                           batch_size,
+                                           features,
+                                           reader,
+                                           randomize_input=True,
+                                           num_epochs=None,
+                                           queue_capacity=10000,
+                                           reader_num_threads=1,
+                                           feature_queue_capacity=100,
+                                           num_queue_runners=2,
+                                           parse_fn=None,
+                                           name=None):
   """Adds operations to read, queue, batch and parse `Example` protos.
 
   Given file pattern (or list of files), will setup a shared queue for file
@@ -571,7 +571,7 @@ def _read_keyed_batch_features_shared_queue(file_pattern,
   """
 
   with ops.name_scope(name, 'read_batch_features', [file_pattern]) as scope:
-    keys, examples = _read_keyed_batch_examples_shared_queue(
+    keys, examples = read_keyed_batch_examples_shared_queue(
         file_pattern,
         batch_size,
         reader,
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
index 542aaabc95..f25f7caf61 100644
--- a/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
@@ -26,7 +26,6 @@ import tempfile
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.contrib.learn.python.learn.learn_io import graph_io
-from tensorflow.contrib.learn.python.learn.learn_io.graph_io import _read_keyed_batch_examples_shared_queue
 from tensorflow.python.client import session as session_lib
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes as dtypes_lib
@@ -464,7 +463,7 @@ class GraphIOTest(test.TestCase):
     name = "my_batch"
 
     with ops.Graph().as_default() as g, self.test_session(graph=g) as session:
-      keys, inputs = _read_keyed_batch_examples_shared_queue(
+      keys, inputs = graph_io.read_keyed_batch_examples_shared_queue(
           filenames,
           batch_size,
           reader=io_ops.TextLineReader,
@@ -528,7 +527,7 @@ class GraphIOTest(test.TestCase):
 
     with ops.Graph().as_default() as g1, session_lib.Session(
         server.target, graph=g1) as session:
-      keys, inputs = _read_keyed_batch_examples_shared_queue(
+      keys, inputs = graph_io.read_keyed_batch_examples_shared_queue(
           filenames,
           batch_size,
           reader=io_ops.TextLineReader,
@@ -557,7 +556,7 @@ class GraphIOTest(test.TestCase):
 
     with ops.Graph().as_default() as g2, session_lib.Session(
         server.target, graph=g2) as session:
-      keys, inputs = _read_keyed_batch_examples_shared_queue(
+      keys, inputs = graph_io.read_keyed_batch_examples_shared_queue(
           filenames,
           batch_size,
           reader=io_ops.TextLineReader,
-- 
GitLab


From 0ad55c0ffdb3a2c86881e791d34fbdf1aacb359f Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Wed, 26 Apr 2017 13:19:33 -0800
Subject: [PATCH 0707/1563] [XLA] Run transpose_folding on nested computations

We only ran the pass on the entry computation which would make us lose out on
optimization opportunities. Visit all computations to find any potential
transpose folding opportunities.
Change: 154343660
---
 .../xla/service/gpu/ir_emission_utils.cc      | 10 ++++
 .../compiler/xla/service/transpose_folding.cc | 23 +++++----
 .../xla/service/transpose_folding_test.cc     | 48 +++++++++++++++++--
 3 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/tensorflow/compiler/xla/service/gpu/ir_emission_utils.cc b/tensorflow/compiler/xla/service/gpu/ir_emission_utils.cc
index e8378a7f44..c6e8a2f78b 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emission_utils.cc
+++ b/tensorflow/compiler/xla/service/gpu/ir_emission_utils.cc
@@ -59,6 +59,11 @@ bool AreValidGemmShapes(const Shape& lhs_shape, const Shape& rhs_shape,
 }  // namespace
 
 bool ImplementedAsGemm(const HloInstruction& hlo) {
+  // We can only do this if the HLO is unnested.
+  if (hlo.parent() != hlo.GetModule()->entry_computation()) {
+    return false;
+  }
+
   // For certain types of Dot, we can call pre-canned BLAS gemm.
   if (hlo.opcode() == HloOpcode::kDot) {
     const Shape& lhs_shape = hlo.operand(0)->shape();
@@ -85,6 +90,11 @@ bool ImplementedAsGemm(const HloInstruction& hlo) {
 }
 
 bool ImplementedAsDnnConvolution(const HloInstruction& hlo) {
+  // We can only do this if the HLO is unnested.
+  if (hlo.parent() != hlo.GetModule()->entry_computation()) {
+    return false;
+  }
+
   // Forward convolution.
   if (hlo.opcode() == HloOpcode::kConvolution) {
     const ConvolutionDimensionNumbers& dnums =
diff --git a/tensorflow/compiler/xla/service/transpose_folding.cc b/tensorflow/compiler/xla/service/transpose_folding.cc
index cfb90e6e1d..a0c88c6bbc 100644
--- a/tensorflow/compiler/xla/service/transpose_folding.cc
+++ b/tensorflow/compiler/xla/service/transpose_folding.cc
@@ -76,8 +76,7 @@ using InstructionOperandsPair =
 // the parent HLO computation of `dot`.
 //
 // Returns whether the module is changed.
-bool FoldTransposeIntoDot(InstructionOperandsPair pair,
-                          HloComputation* computation) {
+bool FoldTransposeIntoDot(InstructionOperandsPair pair) {
   auto* dot = pair.first;
   std::vector<HloInstruction*> instructions_to_fuse(1, dot);
   for (const int64 operand_index : pair.second) {
@@ -89,7 +88,7 @@ bool FoldTransposeIntoDot(InstructionOperandsPair pair,
     return false;
   }
 
-  computation->CreateFusionInstruction(
+  dot->parent()->CreateFusionInstruction(
       instructions_to_fuse, HloInstruction::FusionKind::kTransposeDot);
   return true;
 }
@@ -98,8 +97,7 @@ bool FoldTransposeIntoDot(InstructionOperandsPair pair,
 // `computation` is the parent HLO computation of `convolution`.
 //
 // Returns whether the module is changed.
-bool FoldTransposeIntoConvolution(InstructionOperandsPair pair,
-                                  HloComputation* computation) {
+bool FoldTransposeIntoConvolution(InstructionOperandsPair pair) {
   auto& convolution = *pair.first;
 
   // We only support fusing the RHS transpose into convolution.
@@ -135,8 +133,8 @@ bool FoldTransposeIntoConvolution(InstructionOperandsPair pair,
   auto new_conv = HloInstruction::CreateConvolve(
       convolution.shape(), convolution.mutable_operand(0), &transpose_operand,
       convolution.window(), new_dnums);
-  TF_CHECK_OK(computation->ReplaceWithNewInstruction(&convolution,
-                                                     std::move(new_conv)));
+  TF_CHECK_OK(convolution.parent()->ReplaceWithNewInstruction(
+      &convolution, std::move(new_conv)));
 
   return true;
 }
@@ -152,8 +150,6 @@ TransposeFolding::TransposeFolding(
 StatusOr<bool> TransposeFolding::Run(HloModule* module) {
   // Modifying the graph while traversing is dangerous, so we find all folding
   // opportunities before actually folding them.
-  HloComputation* entry_computation = module->entry_computation();
-
   std::vector<std::pair<HloInstruction*, OperandIndices>> foldable_dots;
   std::vector<std::pair<HloInstruction*, OperandIndices>> foldable_convolutions;
   auto visit_fn = [this, &foldable_dots,
@@ -175,14 +171,17 @@ StatusOr<bool> TransposeFolding::Run(HloModule* module) {
     }
     return tensorflow::Status::OK();
   };
-  TF_RETURN_IF_ERROR(entry_computation->root_instruction()->Accept(visit_fn));
+
+  for (auto& comp : module->computations()) {
+    TF_RETURN_IF_ERROR(comp->Accept(visit_fn));
+  }
 
   bool changed = false;
   for (InstructionOperandsPair& pair : foldable_dots) {
-    changed |= FoldTransposeIntoDot(pair, entry_computation);
+    changed |= FoldTransposeIntoDot(pair);
   }
   for (InstructionOperandsPair& pair : foldable_convolutions) {
-    changed |= FoldTransposeIntoConvolution(pair, entry_computation);
+    changed |= FoldTransposeIntoConvolution(pair);
   }
   return changed;
 }
diff --git a/tensorflow/compiler/xla/service/transpose_folding_test.cc b/tensorflow/compiler/xla/service/transpose_folding_test.cc
index 6643f541da..c72d127ea8 100644
--- a/tensorflow/compiler/xla/service/transpose_folding_test.cc
+++ b/tensorflow/compiler/xla/service/transpose_folding_test.cc
@@ -41,9 +41,7 @@ class TransposeFoldingTest : public ::testing::Test {
     TransposeFolding transpose_folding(
         [](const HloInstruction& dot,
            const TransposeFolding::OperandIndices& candidate_operands) {
-          return gpu::ImplementedAsGemm(dot)
-                     ? candidate_operands
-                     : TransposeFolding::OperandIndices{};
+          return candidate_operands;
         },
         [](const HloInstruction& convolution,
            const TransposeFolding::OperandIndices& candidate_operands) {
@@ -159,6 +157,50 @@ TEST_F(TransposeFoldingTest, FuseDotWithConstantOperands) {
   EXPECT_EQ(6, callee_computation->instructions().size());
 }
 
+TEST_F(TransposeFoldingTest, FoldDotTransposeInWhile) {
+  auto builder = HloComputation::Builder("entry_computation");
+  HloInstruction* x = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/0, ShapeUtil::MakeShape(F32, {2, 3}),
+      /*name=*/"x"));
+  HloInstruction* y = builder.AddInstruction(HloInstruction::CreateParameter(
+      /*parameter_number=*/1, ShapeUtil::MakeShape(F32, {2, 3}),
+      /*name=*/"y"));
+  HloInstruction* transpose_y =
+      builder.AddInstruction(HloInstruction::CreateTranspose(
+          ShapeUtil::MakeShape(F32, {3, 2}), y, {1, 0}));
+  HloInstruction* dot = builder.AddInstruction(HloInstruction::CreateBinary(
+      ShapeUtil::MakeShape(F32, {2, 2}), /*opcode=*/HloOpcode::kDot,
+      /*lhs=*/x, /*rhs=*/transpose_y));
+
+  HloModule module("test_module");
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build(dot));
+
+  HloInstruction* call = module.OutlineExpressionFromComputation(
+      {transpose_y, dot}, "outlined", entry_computation);
+
+  FoldTranspose(&module);
+
+  // Instructions after folding: x, y, and the fusion.
+  std::unordered_set<HloInstruction*> instruction_set;
+  for (auto& instruction : entry_computation->instructions()) {
+    instruction_set.insert(instruction.get());
+  }
+  CHECK_EQ(1, instruction_set.erase(x)) << "x is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(y)) << "y is not in entry_computation.";
+  CHECK_EQ(1, instruction_set.erase(call))
+      << "call is not in entry_computation.";
+  CHECK(instruction_set.empty())
+      << "entry_computation should contain exactly 3 instructions.";
+  HloInstruction* fusion =
+      call->called_computations().front()->root_instruction();
+  EXPECT_EQ(HloOpcode::kFusion, fusion->opcode());
+
+  // The fusion instruction should contain two parameters, one transpose and
+  // one dot.
+  EXPECT_EQ(4, fusion->fused_instructions().size());
+}
+
 // Test that a two dimension swap of the kernel gets folded into convolution.
 TEST_F(TransposeFoldingTest, FoldConvDimSwapTransposeRhs) {
   auto builder = HloComputation::Builder("entry_computation");
-- 
GitLab


From 028e19ace26b676e7d136b98639296a1160110ff Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Wed, 26 Apr 2017 13:33:29 -0800
Subject: [PATCH 0708/1563] Add an option for shape inference requirement to
 C++ Shape Refiner. Change: 154345494

---
 .../core/common_runtime/shape_refiner.cc      | 16 +++++++++++---
 .../core/common_runtime/shape_refiner.h       |  6 ++++++
 .../core/common_runtime/shape_refiner_test.cc | 21 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index f2dff0bf75..5135355a94 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -19,6 +19,7 @@ limitations under the License.
 #include <unordered_set>
 #include <vector>
 
+#include "tensorflow/core/framework/common_shape_fns.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/stl_util.h"
@@ -79,7 +80,8 @@ Status ShapeRefiner::AddNode(const Node* node) {
   // Get the shape function for this node
   const OpRegistrationData* op_reg_data;
   TF_RETURN_IF_ERROR(ops_registry_->LookUp(node->type_string(), &op_reg_data));
-  if (op_reg_data->shape_inference_fn == nullptr) {
+  if (op_reg_data->shape_inference_fn == nullptr &&
+      require_shape_inference_fns_) {
     return errors::InvalidArgument(
         "No shape inference function exists for op '", node->type_string(),
         "', did you forget to define it?");
@@ -102,7 +104,11 @@ Status ShapeRefiner::AddNode(const Node* node) {
   }
 
   // Run the shape inference function, and return if there was an error.
-  TF_RETURN_IF_ERROR(c->Run(op_reg_data->shape_inference_fn));
+  if (op_reg_data->shape_inference_fn) {
+    TF_RETURN_IF_ERROR(c->Run(op_reg_data->shape_inference_fn));
+  } else {
+    TF_RETURN_IF_ERROR(c->Run(shape_inference::UnknownShape));
+  }
 
   // We must run the shape function repeatedly, in case users write
   // shape functions where they only conditionally call input_tensor()
@@ -163,7 +169,11 @@ Status ShapeRefiner::AddNode(const Node* node) {
       // so re-run shape inference.
       c->set_input_tensors(input_tensors);
       c->set_input_tensors_as_shapes(input_tensors_as_shapes);
-      TF_RETURN_IF_ERROR(op_reg_data->shape_inference_fn(c.get()));
+      if (op_reg_data->shape_inference_fn) {
+        TF_RETURN_IF_ERROR(op_reg_data->shape_inference_fn(c.get()));
+      } else {
+        TF_RETURN_IF_ERROR(shape_inference::UnknownShape(c.get()));
+      }
     }
   } while (rerun_shape_fn);
 
diff --git a/tensorflow/core/common_runtime/shape_refiner.h b/tensorflow/core/common_runtime/shape_refiner.h
index f23f9361eb..2d04ea1505 100644
--- a/tensorflow/core/common_runtime/shape_refiner.h
+++ b/tensorflow/core/common_runtime/shape_refiner.h
@@ -68,6 +68,10 @@ class ShapeRefiner {
   int32 graph_def_version() { return graph_def_version_; }
   void set_graph_def_version(int32 version) { graph_def_version_ = version; }
 
+  void set_require_shape_inference_fns(bool require_shape_inference_fns) {
+    require_shape_inference_fns_ = require_shape_inference_fns;
+  }
+
  private:
   // Extracts the subgraph ending at 'node' that is statically
   // computable and inserts into 'out_graph'. If statically computable,
@@ -129,6 +133,8 @@ class ShapeRefiner {
   static constexpr int64 kMaxTensorSize = 1024;
   std::unordered_map<string, Tensor> const_tensor_map_;
 
+  bool require_shape_inference_fns_ = true;
+
   TF_DISALLOW_COPY_AND_ASSIGN(ShapeRefiner);
 };
 
diff --git a/tensorflow/core/common_runtime/shape_refiner_test.cc b/tensorflow/core/common_runtime/shape_refiner_test.cc
index 05274ff311..d7e7c3b5ad 100644
--- a/tensorflow/core/common_runtime/shape_refiner_test.cc
+++ b/tensorflow/core/common_runtime/shape_refiner_test.cc
@@ -126,6 +126,27 @@ TEST(ShapeRefinerTest, SetShape) {
   ASSERT_FALSE(m.SetShape(a.node(), 0, h).ok());
 }
 
+namespace {
+
+// An op with no shape function.
+REGISTER_OP("TestOpWithNoShapeFn").Input("a: int32").Output("o: int32");
+
+}  // namespace
+
+TEST(ShapeRefinerTest, MissingShapeInferenceFns) {
+  Scope root = Scope::NewRootScope();
+  auto a = ops::Const(root, 42);
+  Node* b;
+  TF_ASSERT_OK(NodeBuilder("b", "TestOpWithNoShapeFn")
+                   .Input(a.node())
+                   .Finalize(root.graph(), &b));
+  ShapeRefiner m(TF_GRAPH_DEF_VERSION, OpRegistry::Global());
+  TF_ASSERT_OK(m.AddNode(a.node()));
+  EXPECT_FALSE(m.AddNode(b).ok());
+  m.set_require_shape_inference_fns(false);
+  TF_EXPECT_OK(m.AddNode(b));
+}
+
 TEST(ShapeRefinerTest, PropagateConstants) {
   // Reduction dimension is a variable, so we don't know its value.
   // So the output shape value is unknown (though its rank is known).
-- 
GitLab


From 5c2c39d19e64634dc9a3d33fec183cf324289355 Mon Sep 17 00:00:00 2001
From: James Qin <jamesqin@google.com>
Date: Wed, 26 Apr 2017 13:46:31 -0800
Subject: [PATCH 0709/1563] Fix two tiny bugs in cudnn_rnn_ops

1. test cudnn_rnn_ops_test.py:testSaveRestore was broken.
2. a tiny bug that hardcoded is_training in GRU model.
Change: 154347435
---
 .../python/kernel_tests/cudnn_rnn_ops_test.py          |  5 ++---
 .../contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py      | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py b/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
index 945791578a..b6047c531c 100644
--- a/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
+++ b/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
@@ -58,9 +58,8 @@ class CudnnRNNTest(TensorFlowTestCase):
       params: a Variable for weight and bias parameters.
       model: a CudnnRNN model.
     """
-    params_saveable = cudnn_rnn_ops.RNNParamsSaveable(model.params_to_canonical,
-                                                      model.canonical_to_params,
-                                                      params)
+    params_saveable = cudnn_rnn_ops.RNNParamsSaveable(
+        model.params_to_canonical, model.canonical_to_params, [params])
     ops.add_to_collection(ops.GraphKeys.SAVEABLE_OBJECTS, params_saveable)
 
   def _testSaveRestoreVariable(self, rnn_mode):
diff --git a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
index 9ab337df15..c23d4cd4e3 100644
--- a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
+++ b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
@@ -48,8 +48,8 @@ class RNNParamsSaveable(saver.BaseSaverBuilder.SaveableObject):
   def __init__(self,
                params_to_canonical,
                canonical_to_params,
-               name="params_canonical",
-               *param_variables):
+               param_variables,
+               name="params_canonical"):
     """Creates a RNNParamsSaveable object.
 
        RNNParamsSaveable is saveable/restorable in a checkpoint file and is used
@@ -83,11 +83,11 @@ class RNNParamsSaveable(saver.BaseSaverBuilder.SaveableObject):
           must return a scalar (e.g. in the case of cuDNN) or a tuple. This
           function could be _CudnnRNN.canonical_to_params() or a
           user-defined function.
-      name: the name of the RNNParamsSaveable object.
-      *param_variables: a list of Variables for parameters in a specific form.
+      param_variables: a list of Variables for parameters in a specific form.
           For cuDNN RNN ops, this is a single merged variable for both weights
           and biases; for other RNN ops, this might be multiple unmerged or
           partially merged variables respectively for weights and biases.
+      name: the name of the RNNParamsSaveable object.
     """
     # There is only a single merged parameter variable for cuDNN when saving.
     weights, biases = params_to_canonical(param_variables[0])
@@ -411,7 +411,7 @@ class _CudnnRNNNoInputC(_CudnnRNN):
       output_h: the final state for h.
     """
     output, output_h, _ = super(_CudnnRNNNoInputC, self).__call__(
-        input_data, input_h, None, params, is_training=True)
+        input_data, input_h, None, params, is_training=is_training)
     return (output, output_h)
 
 
-- 
GitLab


From 341141a48bea3e39c76ed36e9015bd9ab67a6463 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 13:56:44 -0800
Subject: [PATCH 0710/1563] [XLA] Eliminate empty operands of concat operations
 at the HLO level Change: 154348912

---
 .../xla/service/algebraic_simplifier.cc       | 23 +++++++
 .../xla/service/algebraic_simplifier_test.cc  | 62 +++++++++++++++++++
 tensorflow/compiler/xla/tests/concat_test.cc  |  9 +++
 3 files changed, 94 insertions(+)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 6acb9bdcba..ee265c6688 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -307,6 +307,29 @@ Status AlgebraicSimplifierVisitor::HandleConcatenate(
   // Unary concatenates are useless.
   if (operands.size() == 1) {
     ReplaceInstructionIfSameShape(concatenate, operands[0]);
+    return Status::OK();
+  }
+  // Filter out and remove empty operands.
+  std::vector<HloInstruction*> nonempty_operands;
+  for (HloInstruction* operand : operands) {
+    if (!ShapeUtil::HasZeroElements(operand->shape())) {
+      nonempty_operands.push_back(operand);
+    }
+  }
+  if (nonempty_operands.size() < operands.size()) {
+    HloInstruction* replacement;
+    if (nonempty_operands.empty()) {
+      replacement = operands[0];
+    } else if (nonempty_operands.size() == 1) {
+      replacement = nonempty_operands[0];
+    } else {
+      replacement =
+          computation_->AddInstruction(concatenate->CloneWithNewOperands(
+              concatenate->shape(), nonempty_operands));
+    }
+    VLOG(10) << "trying to replace " << concatenate->ToString() << " with "
+             << replacement->ToString();
+    ReplaceInstructionIfSameShape(concatenate, replacement);
   }
   return Status::OK();
 }
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 3123ee4f87..77b8fca1a9 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -531,6 +531,68 @@ TEST_F(AlgebraicSimplifierTest, RemoveUnaryConcatenate) {
   EXPECT_THAT(computation->root_instruction(), param0);
 }
 
+// Test that empty operands of concatenates are removed.
+TEST_F(AlgebraicSimplifierTest, RemoveEmptyConcatenateOperands) {
+  const int kParamLength = 100;
+  Shape r1f32 = ShapeUtil::MakeShape(F32, {kParamLength});
+  HloComputation::Builder builder(TestName());
+  HloInstruction* param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r1f32, "param0"));
+  HloInstruction* param1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, r1f32, "param1"));
+  HloInstruction* empty_literal = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR1<float>({})));
+  HloInstruction* empty_slice =
+      builder.AddInstruction(HloInstruction::CreateSlice(
+          ShapeUtil::MakeShape(F32, {0}), param1, {42}, {42}));
+  Shape result_shape = ShapeUtil::MakeShape(F32, {3 * kParamLength});
+  builder.AddInstruction(HloInstruction::CreateConcatenate(
+      result_shape, {empty_literal, param0, param0, empty_slice, param1}, 0));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(
+      computation->root_instruction(),
+      op::Concatenate(empty_literal, param0, param0, empty_slice, param1));
+
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Concatenate(param0, param0, param1));
+}
+
+// Test a concatenate with only empty operands is removed.
+TEST_F(AlgebraicSimplifierTest, OnlyEmptyConcatenateOperands) {
+  const int kParamLength = 100;
+  Shape r1f32 = ShapeUtil::MakeShape(F32, {kParamLength});
+  HloComputation::Builder builder(TestName());
+  HloInstruction* param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r1f32, "param0"));
+  HloInstruction* empty_literal = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR1<float>({})));
+  HloInstruction* empty_slice =
+      builder.AddInstruction(HloInstruction::CreateSlice(
+          ShapeUtil::MakeShape(F32, {0}), param0, {42}, {42}));
+  Shape result_shape = ShapeUtil::MakeShape(F32, {0});
+  builder.AddInstruction(HloInstruction::CreateConcatenate(
+      result_shape, {empty_literal, empty_slice}, 0));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Concatenate(empty_literal, empty_slice));
+
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_EQ(computation->root_instruction(), empty_literal);
+}
+
 // Test that a simplification which changes layouts is not performed if layout
 // sensitive is true.
 TEST_F(AlgebraicSimplifierTest, CopyWithDifferentLayout) {
diff --git a/tensorflow/compiler/xla/tests/concat_test.cc b/tensorflow/compiler/xla/tests/concat_test.cc
index e645e23361..63bfac441d 100644
--- a/tensorflow/compiler/xla/tests/concat_test.cc
+++ b/tensorflow/compiler/xla/tests/concat_test.cc
@@ -57,6 +57,15 @@ XLA_TEST_F(ConcatTest, Concat_R1_With_Nothing) {
   ComputeAndCompareR1<float>(&builder, expected, {}, ErrorSpec(0.0001));
 }
 
+XLA_TEST_F(ConcatTest, Concat_R1_L0_With_Nothing) {
+  ComputationBuilder builder(client_, TestName());
+  auto a = builder.ConstantR1<float>({});
+  auto concatenated = builder.ConcatInDim({a}, 0);
+
+  std::vector<float> expected = {};
+  ComputeAndCompareR1<float>(&builder, expected, {}, ErrorSpec(0.0001));
+}
+
 // Show that we can't concatenate R0 with R0 because we can't name the dimension
 // to concatenate on.
 XLA_TEST_F(ConcatTest, CannotConcatR0WithR0) {
-- 
GitLab


From a62d489db24365435ae046dbbb4e6616c16d283e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dandelion=20Man=C3=A9?= <dandelion@google.com>
Date: Wed, 26 Apr 2017 14:12:03 -0800
Subject: [PATCH 0711/1563] Migrate tf_dashboard_common to d3v4. (No externally
 visible change, yet.) Change: 154351373

---
 .../tf_color_scale_d3v4/colorScale.ts         |   2 -
 .../tf_color_scale_d3v4/tf-color-scale.html   |   3 -
 .../dashboard-behavior.ts                     |  38 ++
 .../dashboard-style.html                      |  53 +++
 .../reload-behavior.ts                        |  39 ++
 .../run-color-style.html                      |  79 ++++
 .../scrollbar-style.html                      |  46 +++
 .../tensorboard-color.html                    |  32 ++
 .../tf_dashboard_common_d3v4/tests.html       |  31 ++
 .../tf-categorizer-demo.html                  | 108 ++++++
 .../tf-categorizer-tests.ts                   | 143 +++++++
 .../tf-categorizer.html                       |  59 +++
 .../tf-categorizer.ts                         | 183 +++++++++
 .../tf-chart-scaffold.html                    | 150 ++++++++
 .../tf-collapsable-pane-demo.html             |  34 ++
 .../tf-collapsable-pane.html                  | 109 ++++++
 .../tf-dashboard-layout.html                  |  67 ++++
 .../tf-dashboard.html                         |  24 ++
 .../tf-downloader.html                        |  99 +++++
 .../tf-multi-checkbox-demo.html               | 177 +++++++++
 .../tf-multi-checkbox.html                    | 157 ++++++++
 .../tf-multi-checkbox.ts                      | 206 ++++++++++
 .../tf-no-data-warning.html                   | 129 +++++++
 .../tf-option-selector.html                   |  94 +++++
 .../tf-panes-helper.html                      | 352 ++++++++++++++++++
 .../tf-regex-group-demo.html                  |  46 +++
 .../tf-regex-group.html                       |  97 +++++
 .../tf-regex-group.ts                         |  84 +++++
 .../tf-run-selector.html                      | 188 ++++++++++
 .../tf-sidebar-helper.html                    | 164 ++++++++
 30 files changed, 2988 insertions(+), 5 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-behavior.ts
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/reload-behavior.ts
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tests.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-tests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html

diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts b/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts
index d10e753445..ff90d46aa2 100644
--- a/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScale.ts
@@ -63,8 +63,6 @@ export class ColorScale {
   }
 }
 
-
-
 Polymer({
   is: 'tf-color-scale',
   properties: {
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
index 7d2cb8bafd..e3ef6cf630 100644
--- a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
@@ -25,7 +25,4 @@ a set of colors.
 @element tf-color-scale
 -->
 <dom-module id="tf-color-scale">
-  <script>
-
-  </script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-behavior.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-behavior.ts
new file mode 100644
index 0000000000..3e40da1452
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-behavior.ts
@@ -0,0 +1,38 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * A behavior that TensorBoard dashboards must implement. This behavior serves
+ * the purpose of an interface.
+ */
+export function DashboardBehavior(dashboardName) {
+  return {
+    properties: {
+      name: {
+        type: String,
+        value: dashboardName,
+        readOnly: true,
+      },
+    },
+    // This method is called when the dashboard reloads, either when the
+    // dashboard is first visited, periodically reloaded, or manually reloaded
+    // via the user clicking the button. Note that dashboard custom elements
+    // that use TF.Dashboard.ReloadBehavior already implement a reload method.
+    reload() {
+      throw Error(
+          'The ' + dashboardName + ' dashboard does not implement reload.');
+    },
+  };
+}
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html
new file mode 100644
index 0000000000..1eccc020eb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html
@@ -0,0 +1,53 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="paper-styles/paper-styles.html">
+<link rel="import" href="tensorboard-color.html">
+
+<dom-module id="dashboard-style">
+  <template>
+    <style>
+      .sidebar {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        margin-right: 20px;
+      }
+
+      .sidebar-section {
+        border-top: solid 1px rgba(0, 0, 0, 0.12);
+        padding: 15px 0px 15px 30px;
+      }
+
+      .sidebar-section:first-child {
+        border: none;
+      }
+
+      .sidebar-section:last-child {
+        flex-grow: 1;
+        display: flex;
+      }
+
+      paper-checkbox {
+        --paper-checkbox-checked-color: var(--tb-ui-dark-accent);
+        --paper-checkbox-unchecked-color: var(--tb-ui-dark-accent);
+        font-size: 14px;
+        margin-top: 5px;
+      }
+    </style>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/reload-behavior.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/reload-behavior.ts
new file mode 100644
index 0000000000..8b5ca120d6
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/reload-behavior.ts
@@ -0,0 +1,39 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * ReloadBehavior: A simple behavior for dashboards where the
+ * frontendReload() function should find every child element with a
+ * given tag name (e.g. "tf-line-chart" or "tf-image-loader")
+ * and call a `reload` method on that child.
+ * May later extend it so it has more sophisticated logic, e.g. reloading
+ * only tags that are in view.
+ */
+export function ReloadBehavior(tagName) {
+  return {
+    properties: {
+      reloadTag: {
+        type: String,
+        value: tagName,
+      },
+    },
+    frontendReload: function() {
+      var elements = this.getElementsByTagName(this.reloadTag);
+      Array.prototype.forEach.call(elements, function(x) {
+        x.reload();
+      });
+    },
+  };
+}
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html
new file mode 100644
index 0000000000..ff4cfacc91
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html
@@ -0,0 +1,79 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="paper-styles/paper-styles.html">
+
+<dom-module id="run-color-style">
+  <template>
+    <style>
+    [color-class="light-blue"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-light-blue-500);
+      --paper-checkbox-checked-ink-color: var(--paper-light-blue-500);
+      --paper-checkbox-unchecked-color: var(--paper-light-blue-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-light-blue-900);
+    }
+    [color-class="red"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-red-500);
+      --paper-checkbox-checked-ink-color: var(--paper-red-500);
+      --paper-checkbox-unchecked-color: var(--paper-red-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-red-900);
+    }
+    [color-class="green"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-green-500);
+      --paper-checkbox-checked-ink-color: var(--paper-green-500);
+      --paper-checkbox-unchecked-color: var(--paper-green-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-green-900);
+    }
+    [color-class="purple"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-purple-500);
+      --paper-checkbox-checked-ink-color: var(--paper-purple-500);
+      --paper-checkbox-unchecked-color: var(--paper-purple-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-purple-900);
+    }
+    [color-class="teal"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-teal-500);
+      --paper-checkbox-checked-ink-color: var(--paper-teal-500);
+      --paper-checkbox-unchecked-color: var(--paper-teal-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-teal-900);
+    }
+    [color-class="pink"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-pink-500);
+      --paper-checkbox-checked-ink-color: var(--paper-pink-500);
+      --paper-checkbox-unchecked-color: var(--paper-pink-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-pink-900);
+    }
+    [color-class="orange"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-orange-500);
+      --paper-checkbox-checked-ink-color: var(--paper-orange-500);
+      --paper-checkbox-unchecked-color: var(--paper-orange-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-orange-900);
+    }
+    [color-class="brown"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-brown-500);
+      --paper-checkbox-checked-ink-color: var(--paper-brown-500);
+      --paper-checkbox-unchecked-color: var(--paper-brown-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-brown-900);
+    }
+    [color-class="indigo"] paper-checkbox {
+      --paper-checkbox-checked-color: var(--paper-indigo-500);
+      --paper-checkbox-checked-ink-color: var(--paper-indigo-500);
+      --paper-checkbox-unchecked-color: var(--paper-indigo-900);
+      --paper-checkbox-unchecked-ink-color: var(--paper-indigo-900);
+    }
+    </style>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html
new file mode 100644
index 0000000000..b345781e2e
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html
@@ -0,0 +1,46 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="paper-styles/paper-styles.html">
+
+<dom-module id="scrollbar-style">
+  <template>
+    <style>
+      .scrollbar::-webkit-scrollbar-track
+      {
+        visibility: hidden;
+      }
+
+      .scrollbar::-webkit-scrollbar
+      {
+        width: 10px;
+      }
+
+      .scrollbar::-webkit-scrollbar-thumb
+      {
+        border-radius: 10px;
+        -webkit-box-shadow: inset 0 0 2px rgba(0,0,0,.3);
+        background-color: var(--paper-grey-500);
+        color: var(--paper-grey-900);
+      }
+      .scrollbar {
+        box-sizing: border-box;
+      }
+    </style>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html
new file mode 100644
index 0000000000..4d95351edb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html
@@ -0,0 +1,32 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+
+<style is="custom-style">
+
+  :root {
+    --tb-orange-weak: #ffa726;
+    --tb-orange-strong: #f57c00;
+    --tb-grey-darker: #e2e2e2;
+    --tb-grey-lighter: #f3f3f3;
+    --tb-ui-dark-accent: #757575;
+    --tb-ui-light-accent: #e0e0e0;
+    --tb-graph-faded: #e0d4b3;
+  }
+
+</style>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tests.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tests.html
new file mode 100644
index 0000000000..270a2522b9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tests.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../../tf-imports/d3.html">
+  <link rel="import" href="../../vz-sorting/vz-sorting.html">
+</head>
+<body>
+  <script src="../categorizer.js"></script>
+  <script src="categorizerTest.js"></script>
+</body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
new file mode 100644
index 0000000000..6692962763
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
@@ -0,0 +1,108 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+ <head>
+  <link rel="import" href="tf-categorizer.html">
+  <script src="bundle.js"></script>
+
+ </head>
+ <body>
+  <style>
+  </style>
+  <dom-module id="x-demo">
+    <style>
+      .container {
+        width: 255px;
+        padding: 10px;
+        border: 1px solid var(--paper-indigo-900);
+        border-radius: 5px;
+        position: fixed;
+      }
+      :host {
+        margin: 0px;
+      }
+
+      .categories {
+        font-family: "RobotoDraft",Helvetica;
+        margin-left: 300px;
+        width: 500px;
+        border: 1px solid var(--paper-indigo-500);
+        border-radius: 5px;
+      }
+
+      .category {
+        background-color: var(--paper-indigo-50);
+        margin: 20px;
+        padding: 20px;
+        border-radius: 5px;
+      }
+
+      .cat-name {
+        font-size: 20px;
+      }
+
+      .tag {
+        border-radius: 5px;
+        padding: 5px;
+        margin: 5px;
+        background-color: var(--paper-indigo-900);
+        color: white;
+      }
+    </style>
+    <template>
+      <div class="container">
+        <tf-categorizer categories="{{categories}}" tags="[[tags]]" id="demo"></tf-categorizer>
+      </div>
+      <div class="categories">
+        <template is="dom-repeat" items="[[categories]]">
+          <div class="category">
+            <p class="cat-name">Category: <span>[[item.name]]</span></p>
+            <div class="tags-container layout horizontal wrap">
+              <template is="dom-repeat" items="[[item.tags]]">
+                <span class="tag layout vertical center-center">[[item]]</span>
+              </template>
+            </div>
+          </div>
+        </template>
+      </div>
+    </template>
+    <script>
+
+    function tagsGenerator() {
+      var tags = ["special1", "special2", "special3", "special4", "special5"];
+      ["l1", "l2", "l3", "l4", "l5"].forEach(function(l) {
+        ["foo", "bar", "baz", "boink", "zod", "specialx"].forEach(function(x) {
+          tags.push(l + "/" + x);
+        });
+      });
+      return tags;
+    }
+
+    Polymer({
+      is: "x-demo",
+      properties: {
+        tags: { type: Array, value: tagsGenerator },
+      },
+    });
+    </script>
+  </dom-module>
+
+  <x-demo id="demo"></x-demo>
+ </body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-tests.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-tests.ts
new file mode 100644
index 0000000000..bf70d9d4bb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-tests.ts
@@ -0,0 +1,143 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {topLevelNamespaceCategorizer, Category, Categorizer, defineCategory, _categorizer} from './tf-categorizer'
+
+let assert = chai.assert;
+
+describe('categorizer', () => {
+  describe('topLevelNamespaceCategorizer', () => {
+    it('returns empty array on empty tags', () => {
+      assert.lengthOf(topLevelNamespaceCategorizer([]), 0);
+    });
+
+    it('handles a simple case', () => {
+      let simple = [
+        'foo1/bar', 'foo1/zod', 'foo2/bar', 'foo2/zod', 'gosh/lod/mar',
+        'gosh/lod/ned'
+      ];
+      let expected = [
+        {name: 'foo1', tags: ['foo1/bar', 'foo1/zod']},
+        {name: 'foo2', tags: ['foo2/bar', 'foo2/zod']},
+        {name: 'gosh', tags: ['gosh/lod/mar', 'gosh/lod/ned']},
+      ];
+      assert.deepEqual(topLevelNamespaceCategorizer(simple), expected);
+    });
+
+    it('orders the categories', () => {
+      let test = ['e', 'f', 'g', 'a', 'b', 'c'];
+      let expected = [
+        {name: 'a', tags: ['a']},
+        {name: 'b', tags: ['b']},
+        {name: 'c', tags: ['c']},
+        {name: 'e', tags: ['e']},
+        {name: 'f', tags: ['f']},
+        {name: 'g', tags: ['g']},
+      ];
+      assert.deepEqual(topLevelNamespaceCategorizer(test), expected);
+    });
+
+    it('handles cases where category names overlap node names', () => {
+      let test = ['a', 'a/a', 'a/b', 'a/c', 'b', 'b/a'];
+      let actual = topLevelNamespaceCategorizer(test);
+      let expected = [
+        {name: 'a', tags: ['a', 'a/a', 'a/b', 'a/c']},
+        {name: 'b', tags: ['b', 'b/a']},
+      ];
+      assert.deepEqual(actual, expected);
+    });
+
+    it('handles singleton case', () => {
+      assert.deepEqual(
+          topLevelNamespaceCategorizer(['a']), [{name: 'a', tags: ['a']}]);
+    });
+  });
+
+  describe('customCategorizer', () => {
+    function noFallbackCategorizer(tags: string[]): Category[] {
+      return [];
+    }
+
+    function testCategorizer(
+        defs: string[], fallback: Categorizer, tags: string[]): Category[] {
+      let catDefs = defs.map(defineCategory);
+      return _categorizer(catDefs, fallback)(tags);
+    }
+
+    it('categorizes by regular expression', () => {
+      let defs = ['foo..', 'bar..'];
+      let tags = ['fooab', 'fooxa', 'barts', 'barms'];
+      let actual = testCategorizer(defs, noFallbackCategorizer, tags);
+      let expected = [
+        {name: 'foo..', tags: ['fooab', 'fooxa']},
+        {name: 'bar..', tags: ['barms', 'barts']},
+      ];
+      assert.deepEqual(actual, expected);
+    });
+
+    it('matches non-exclusively', () => {
+      let tags = ['abc', 'bar', 'zod'];
+      let actual =
+          testCategorizer(['...', 'bar'], noFallbackCategorizer, tags);
+      let expected = [
+        {name: '...', tags: ['abc', 'bar', 'zod']},
+        {name: 'bar', tags: ['bar']},
+      ];
+      assert.deepEqual(actual, expected);
+    });
+
+    it('creates categories for unmatched rules', () => {
+      let actual =
+          testCategorizer(['a', 'b', 'c'], noFallbackCategorizer, []);
+      let expected = [
+        {name: 'a', tags: []},
+        {name: 'b', tags: []},
+        {name: 'c', tags: []},
+      ];
+      assert.deepEqual(actual, expected);
+    });
+
+    it('category regexs work with special characters', () => {
+      let defs = ['^\\w+$', '^\\d+$', '^\\/..$'];
+      let tags = ['foo', '3243', '/xa'];
+      let actual = testCategorizer(defs, noFallbackCategorizer, tags);
+      let expected = [
+        {name: '^\\w+$', tags: ['3243', 'foo']},
+        {name: '^\\d+$', tags: ['3243']},
+        {name: '^\\/..$', tags: ['/xa']},
+      ];
+      assert.deepEqual(actual, expected);
+    });
+
+    it('category tags are sorted', () => {
+      let tags = ['a', 'z', 'c', 'd', 'e', 'x', 'f', 'y', 'g'];
+      let sorted = tags.slice().sort();
+      let expected = [{name: '.*', tags: sorted}];
+      let actual = testCategorizer(['.*'], noFallbackCategorizer, tags);
+      assert.deepEqual(actual, expected);
+    });
+
+    it('if nonexclusive: all tags passed to fallback', () => {
+      let passedToDefault = null;
+      function defaultCategorizer(tags: string[]): Category[] {
+        passedToDefault = tags;
+        return [];
+      }
+      let tags = ['foo', 'bar', 'foo123'];
+      testCategorizer(['foo'], defaultCategorizer, tags);
+      assert.deepEqual(passedToDefault, tags);
+    });
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
new file mode 100644
index 0000000000..0b563fa4bd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
@@ -0,0 +1,59 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="tf-regex-group.html">
+<link rel="import" href="tensorboard-color.html">
+
+<!--
+`tf-categorizer` turns an array of tags into an array of categories
+
+The transformation from tags to categories is controlled by the user, through
+interacting with the categorizer widget.
+
+(See type signatures in categorizer.ts)
+
+Example:
+  <tf-categorizer tags="[[tags]]" categories="{{categories}}"></tf-categorizer>
+
+Public Properties:
+`tags` - Array of strings that are the tags to categorize. Should be one-way bound downward.
+`categories` - Array of Categorizer.Category objects that are generated by the Categorizer.
+  Are readOnly and notify: True. Expected to be one-way bound upward.
+
+The categorizer provides inputs for adding regular expression rules and toggling whether
+categories are exclusive.
+-->
+<dom-module id="tf-categorizer">
+  <template>
+    <div class="inputs">
+      <tf-regex-group id="regexGroup" regexes="{{regexes}}"></tf-regex-group>
+    </div>
+    <style>
+      :host {
+        display: block;
+        padding-bottom: 5px;
+      }
+      paper-checkbox {
+        --paper-checkbox-checked-color: var(--paper-grey-600);
+        --paper-checkbox-unchecked-color: var(--paper-grey-600);
+        font-size: 14px;
+      }
+    </style>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
new file mode 100644
index 0000000000..10271d2c08
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
@@ -0,0 +1,183 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import {compareTagNames} from '../vz_sorting_d3v4/sorting'
+
+/**
+ * This module contains methods that allow sorting tags into 'categories'.
+ * A category contains a name and a list of tags.
+ * The sorting strategy is defined by a 'CustomCategorization', which contains
+ * 'categoryDefinitions' which are regex rules used to construct a category.
+ * E.g. the regex rule 'xent' will create a category called 'xent' that
+ * contains values whose tags match the regex.
+ *
+ * After custom categories are evaluated, the tags are sorted by a hardcoded
+ * fallback categorizer, which may, for example, group tags into categories
+ * based on their top namespace.
+ */
+
+export interface Category {
+  // Categories that data is sorted into
+  name: string;
+  tags: string[];
+}
+
+export interface CustomCategorization {
+  // Defines a categorization strategy
+  categoryDefinitions: string[];
+  fallbackCategorizer: string;
+  /* {'TopLevelNamespaceCategorizer',
+      'LegacyUnderscoreCategorizer'} */
+}
+
+export interface Categorizer {
+  // Function that generates categories
+  (tags: string[]): Category[];
+}
+
+/* Canonical TensorFlow ops are namespaced using forward slashes.
+ * This fallback categorizer categorizes by the top-level namespace.
+ */
+export var topLevelNamespaceCategorizer: Categorizer = splitCategorizer(/\//);
+
+export function fallbackCategorizer(s: string): Categorizer {
+  switch (s) {
+    case 'TopLevelNamespaceCategorizer':
+      return topLevelNamespaceCategorizer;
+    default:
+      throw new Error('Unrecognized categorization strategy: ' + s);
+  }
+}
+
+/* An 'extractor' is a function that takes a tag name, and 'extracts' a
+ * category name.
+ * This function takes an extractor, and produces a categorizer.
+ * Currently, it is just used for the fallbackCategorizer, but we may want to
+ * refactor the general categorization logic to use the concept of extractors.
+ */
+function extractorToCategorizer(extractor: (s: string) => string): Categorizer {
+  return (tags: string[]): Category[] => {
+    if (tags.length === 0) {
+      return [];
+    }
+    let sortedTags = tags.slice().sort(compareTagNames);
+    let categories: Category[] = [];
+    let currentCategory = {
+      name: extractor(sortedTags[0]),
+      tags: [],
+    };
+    sortedTags.forEach((t: string) => {
+      let topLevel = extractor(t);
+      if (currentCategory.name !== topLevel) {
+        categories.push(currentCategory);
+        currentCategory = {
+          name: topLevel,
+          tags: [],
+        };
+      }
+      currentCategory.tags.push(t);
+    });
+    categories.push(currentCategory);
+    return categories;
+  };
+}
+
+function splitCategorizer(r: RegExp): Categorizer {
+  let extractor = (t: string) => {
+    return t.split(r)[0];
+  };
+  return extractorToCategorizer(extractor);
+}
+
+export interface CategoryDefinition {
+  name: string;
+  matches: (t: string) => boolean;
+}
+
+export function defineCategory(ruledef: string): CategoryDefinition {
+  let r = new RegExp(ruledef);
+  let f = function(tag: string): boolean {
+    return r.test(tag);
+  };
+  return {name: ruledef, matches: f};
+}
+
+export function _categorizer(
+    rules: CategoryDefinition[], fallback: Categorizer) {
+  return function(tags: string[]): Category[] {
+    let remaining: d3.Set = d3.set(tags);
+    let userSpecified = rules.map((def: CategoryDefinition) => {
+      let tags: string[] = [];
+      remaining.each((t: string) => {
+        if (def.matches(t)) {
+          tags.push(t);
+        }
+      });
+      let cat = {name: def.name, tags: tags.sort(compareTagNames)};
+      return cat;
+    });
+    let defaultCategories = fallback(remaining.values());
+    return userSpecified.concat(defaultCategories);
+  };
+}
+
+export function categorizer(s: CustomCategorization): Categorizer {
+  let rules = s.categoryDefinitions.map(defineCategory);
+  let fallback = fallbackCategorizer(s.fallbackCategorizer);
+  return _categorizer(rules, fallback);
+};
+
+Polymer({
+  is: 'tf-categorizer',
+  properties: {
+    regexes: {type: Array},
+    tags: {type: Array},
+    categoriesAreExclusive: {type: Boolean, value: true},
+    fallbackCategorizer: {
+      type: String,
+      value: 'TopLevelNamespaceCategorizer',
+    },
+    categorizer: {
+      type: Object,
+      computed:
+          'computeCategorization(regexes.*, categoriesAreExclusive, fallbackCategorizer)',
+    },
+    categories: {
+      type: Array,
+      value: function() {
+        return [];
+      },
+      notify: true,
+      readOnly: true
+    },
+  },
+  observers: ['recategorize(tags.*, categorizer)'],
+  computeCategorization: function(
+      regexes, categoriesAreExclusive, fallbackCategorizer) {
+    var categorizationStrategy = {
+      categoryDefinitions: regexes.base,
+      categoriesAreExclusive: categoriesAreExclusive,
+      fallbackCategorizer: fallbackCategorizer,
+    };
+    return categorizer(categorizationStrategy);
+  },
+  recategorize: function() {
+    this.debounce('tf-categorizer-recategorize', function() {
+      var categories = this.categorizer(this.tags);
+      this._setCategories(categories);
+    })
+  },
+});
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
new file mode 100644
index 0000000000..402f909287
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
@@ -0,0 +1,150 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+
+<!--
+tf-chart-scaffold is responsible for providing data from TensorBoard to charts.
+It has the following settable properties:
+tag: (required, string) - the name of the tag to load for this chart
+visibleSeries: (required, string[]) - the names of the series the chart should
+    display.
+dataProvider: (required, VZ.ChartHelpers.DataFn) - function that takes (tag,
+    run) and returns a promise containing an array of VZ.ChartHelpers.Datum,
+    compatible with TF.Backend.Datum.
+
+It exposes the following methods:
+chart() - Returns the underlying chart element.
+reload() - Reloads the data and sends it to the underlying chart.
+
+This element should have a compatible chart plugin element as it's content. The
+plugin is requred to implement two functions:
+- setVisibleSeries(names: string[]): a function that receives an array of series
+    names as the first parameter, responsible for changing the series currently
+    being displayed to only the series in this array.
+- setSeriesData(name: string, data: VZ.ChartHelpers.Datum[]): sets the data of
+    the series with the given name to the data given in the second parameter.
+-->
+<dom-module id="tf-chart-scaffold">
+  <template>
+    <content></content>
+    <style>
+      :host {
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        flex-shrink: 1;
+        position: relative;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-chart-scaffold",
+      properties: {
+        tag: String,
+        dataProvider: Function,
+        visibleSeries: Array,
+        _attached: {
+          type: Boolean,
+          value: false
+        },
+
+        // Storing the update ID of the previous request for data enables us to determine if a
+        // data response is outdated. We rely on an increasing ID instead of timestamp because
+        // successive updates often fire within the same millisecond.
+        _dataUpdateIdOfLastRequest: Number,
+        _nextAvailableDataUpdateId: {
+          type: Number,
+          value: 1,
+        },
+      },
+      observers: [
+        "reload(tag, dataProvider)",
+        "_changeSeries(visibleSeries.*)"
+      ],
+      ready: function() {
+        this.fire('ready');
+      },
+      attached: function() {
+        this._attached = true;
+        this._changeSeries();
+      },
+      detached: function() {
+        this._attached = false;
+      },
+      reload: function() {
+        if (!this._attached) {
+          return;
+        }
+        else if (!this.dataProvider) {
+          throw new Error('tf-chart-scaffold requires a dataProvider.');
+        }
+        else if (!this.tag) {
+          throw new Error('tf-chart-scaffold requires a tag.');
+        }
+
+        // TODO(chizeng): At this point, notify effective children that the previous data has been
+        // invalidated. For instance, the image dashboard may want to clear its images. Today, the
+        // chart scaffold only informs children when the new image URLs response finishes loading.
+
+        const dataUpdateId = this._nextAvailableDataUpdateId++;
+        this._dataUpdateIdOfLastRequest = dataUpdateId;
+
+        this.visibleSeries.forEach(function(name) {
+          this.dataProvider(this.tag, name).then(function(data) {
+            if (dataUpdateId != this._dataUpdateIdOfLastRequest) {
+              // This response is outdated. Ignore it.
+              // TODO(chizeng): Explore canceling an outdated request before we even receive its
+              // response. This involves creating hooks into the request manager and might introduce
+              // some complexity that may not be worth it; Tensorboard frankly does not seem
+              // bottlenecked by the network (It is often run in fast corp networks or locally.).
+              return;
+            }
+            this.chart().setSeriesData(name, data);
+          }.bind(this));
+        }.bind(this));
+      },
+      _changeSeries: function() {
+        if (!this._attached) {
+           return;
+        }
+        else if (!this.visibleSeries) {
+          throw new Error('tf-chart-scaffold requires a visibleSeries.');
+        }
+
+        this.chart().setVisibleSeries(this.visibleSeries);
+        this.reload();
+      },
+      chart: function() {
+        var children = this.getEffectiveChildren();
+        if (!children.length) {
+          throw new Error('tf-chart-scaffold has no children');
+        }
+
+        var child = children[0];
+        if (!child.setVisibleSeries || !child.setSeriesData) {
+          throw new Error("tf-chart-scaffold's content doesn't implement the " +
+              "required interface");
+        }
+        return child;
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
new file mode 100644
index 0000000000..6c8bdb92ee
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+ <head>
+   <link rel="import" href="tf-collapsable-pane.html">
+   
+ </head>
+ <body>
+  <style>
+  </style>
+  <tf-collapsable-pane name="foo">
+    <h1>This is content inside the pane.</h1>
+  </tf-collapsable-pane>
+ </body>
+ <script>
+
+ </script>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html
new file mode 100644
index 0000000000..96b4337668
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html
@@ -0,0 +1,109 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="iron-collapse/iron-collapse.html">
+
+<dom-module id="tf-collapsable-pane">
+  <template>
+    <button
+      class="heading"
+      on-tap="togglePane"
+      open-button$="[[opened]]"
+    >
+    <span class="name">[[name]]</span>
+    <span class="count">
+      <span>[[count]]</span>
+    </span>
+  </button>
+    <iron-collapse opened="[[opened]]">
+      <div class="content">
+        <template is="dom-if" if="[[opened]]" restamp="[[restamp]]">
+          <content></content>
+        </template>
+      </div>
+    </iron-collapse>
+    <style>
+      :host {
+        display: block;
+        margin: 0 5px 1px 10px;
+      }
+
+      :host:first-of-type {
+        margin-top: 20px;
+      }
+      
+      :host:last-of-type {
+        margin-bottom: 20px;
+      }
+
+      .heading {
+        background-color: white;
+        border: none;
+        cursor: pointer;
+        width: 100%;
+        font-size: 15px;
+        line-height: 1;
+        box-shadow: 0 1px 5px rgba(0,0,0,0.2);
+        padding: 10px 15px;
+      }
+
+      .content {
+        padding: 15px;
+        border: 1px solid #dedede;
+        border-top: none;
+        border-bottom-left-radius: 2px;
+        border-bottom-right-radius: 2px;
+        background: white;
+      }
+
+      [open-button] {
+        border-bottom-left-radius: 0px !important;
+        border-bottom-right-radius: 0px !important;
+      }
+
+      .name {
+        float: left;
+      }
+
+      .count {
+        float: right;
+        margin-right: 5px;
+        font-size: 12px;
+        color: var(--paper-grey-500);
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-collapsable-pane",
+      properties: {
+        opened: {type: Boolean, value: false},
+        restamp: {type: Boolean, value: true},
+        name: {type: String, observer: "hide"},
+        count: {type: Number},
+      },
+      hide: function() {
+        this.opened = false;
+      },
+      togglePane: function() {
+        this.opened = !this.opened;
+      }
+    });
+  </script>
+
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html
new file mode 100644
index 0000000000..058b0d5946
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html
@@ -0,0 +1,67 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="scrollbar-style.html">
+<link rel="import" href="tensorboard-color.html">
+
+<!--
+Generic layout for a dashboard.
+-->
+<dom-module id="tf-dashboard-layout">
+  <template>
+    <div id="sidebar">
+      <content select=".sidebar"></content>
+    </div>
+
+    <div id="center" class="scrollbar">
+      <content select=".center"></content>
+    </div>
+    <style include="scrollbar-style"></style>
+    <style>
+      #sidebar {
+        width: inherit;
+        height: 100%;
+        overflow: ellipsis;
+        flex-grow: 0;
+        flex-shrink: 0;
+      }
+
+      #center {
+        height: 100%;
+        overflow-y: auto;
+        flex-grow: 1;
+        flex-shrink: 1;
+      }
+
+      .tf-graph-dashboard #center {
+        background: white;
+      }
+
+      :host {
+        display: flex;
+        flex-direction: row;
+        height: 100%;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-dashboard-layout",
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
new file mode 100644
index 0000000000..039da39ecb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
@@ -0,0 +1,24 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="tf-dashboard-layout.html">
+<link rel="import" href="tensorboard-color.html">
+<link rel="import" href="dashboard-style.html">
+<link rel="import" href="tf-downloader.html">
+<link rel="import" href="tf-no-data-warning.html">
+
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html
new file mode 100644
index 0000000000..dd87a47222
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html
@@ -0,0 +1,99 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="paper-menu/paper-menu.html">
+<link rel="import" href="paper-item/paper-item.html">
+
+<dom-module id="tf-downloader">
+  <template>
+    <paper-dropdown-menu
+      no-label-float="true"
+      label="run to download"
+      selected-item-label="{{_run}}"
+    >
+      <paper-menu class="dropdown-content">
+        <template is="dom-repeat" items="[[runs]]">
+          <paper-item no-label-float=true>[[item]]</paper-item>
+        </template>
+      </paper-menu>
+    </paper-dropdown-menu>
+    <div class="center">
+      <span>
+        <a
+          download="[[_csvName(_run)]]"
+          href="[[_csvUrl(_run, urlFn)]]"
+          >CSV</a>
+        <a
+          download="[[_jsonName(_run)]]"
+          href="[[_jsonUrl(_run, urlFn)]]"
+          >JSON</a>
+      </span>
+    </div>
+    <style>
+      :host {
+        display: flex;
+        height: 32px;
+      }
+      .center {
+        display: flex;
+        align-self: center;
+      }
+      paper-dropdown-menu {
+        width: 100px;
+        --paper-input-container-label: {
+          font-size: 10px;
+        }
+        --paper-input-container-input: {
+          font-size: 10px;
+        }
+      }
+      a {
+        font-size: 10px;
+        border-radius: 3px;
+        border: 1px solid #EEE;
+      }
+      paper-input {
+        font-size: 22px;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-downloader",
+      properties: {
+        _run: String,
+        runs: Array,
+        tag: String,
+        urlFn: Function,
+      },
+      _csvUrl: function(_run, urlFn) {
+        return urlFn(this.tag, _run) + "&format=csv";
+      },
+      _jsonUrl: function(_run, urlFn) {
+        return urlFn(this.tag, _run);
+      },
+      _csvName: function(_run) {
+        return "run_" + _run + ",tag_" + this.tag + ".csv";
+      },
+      _jsonName: function(_run) {
+        return "run-" + _run + "-tag-" + this.tag + ".json";
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
new file mode 100644
index 0000000000..2877a2364f
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
@@ -0,0 +1,177 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+<link rel="import" href="tf-multi-checkbox.html">
+<link rel="import" href="tf-color-scale.html">
+<script src="bundle.js"></script>
+
+</head>
+<body>
+<script>
+var seed = 1;
+function random() {
+  var x = Math.sin(seed++) * 10000;
+  return x - Math.floor(x);
+}
+</script>
+<style>
+</style>
+
+<dom-module id="mc-demo">
+  <template>
+    <tf-multi-checkbox
+      id="multiCheckbox"
+      names="[[names]]"
+      tooltips="[[_tooltips]]"
+      class-scale="[[classScale]]"
+      highlights="[[highlights]]"
+    ></tf-multi-checkbox>
+    <tf-color-scale
+      id="colorScale"
+      runs="[[names]]"
+      out-class-scale="{{classScale}}"
+    ></tf-color-scale>
+  <style>
+  </style>
+  </template>
+  <script>
+
+  function randomTooltip() {
+    var s = "";
+    while (random() < 0.8) {
+      s += String(10*random())[0];
+    }
+    return s;
+  }
+  Polymer({
+    is: "mc-demo",
+    properties: {
+      names: Array,
+      tooltips: Object,
+      autoGenerateTooltips: {value: true},
+      _tooltips: Object,
+      classScale: Function,
+      highlights: Array,
+    },
+    observers: [
+      'autogenerate(names, autoGenerateTooltips)',
+      'randomHighlights(names)'
+    ],
+    autogenerate: function(names, autoGenerateTooltips) {
+      if (autoGenerateTooltips) {
+        var tooltips = {};
+        names.forEach(function(n) {
+        if (random() > 0.5) {
+          tooltips[n] = randomTooltip();
+        }
+      });
+      this._tooltips = tooltips;
+      }
+    },
+    randomHighlights: function(names) {
+      var h = [];
+      names.forEach(function(n) {
+        if (random() > 0.6) {
+          h.push(n);
+        }
+      });
+      this.highlights = h;
+    }
+  });
+  </script>
+</dom-module>
+
+<dom-module id="x-demo">
+<style>
+.small {
+  width: 200px;
+  height: 500px;
+}
+.large {
+  width: 500px;
+  height: 900px;
+}
+html,body {
+  height: 100%;
+}
+mc-demo {
+  padding: 5px;
+  border: 1px solid var(--paper-red-500);
+  display: inline-block;
+}
+</style>
+<template>
+  <div class="demo-block">
+    <mc-demo id="demo1" class="small" names="[[long_names]]"></mc-demo>
+    <mc-demo class="small" names="[[many_names]]"></mc-demo>
+    <mc-demo class="small" names="[[many_long_names]]"></mc-demo>
+  </div>
+
+  <div class="demo-block">
+    <mc-demo class="large" names="[[long_names]]"></mc-demo>
+    <mc-demo class="large" names="[[many_names]]"></mc-demo>
+    <mc-demo class="large" names="[[many_long_names]]"></mc-demo>
+  </div>
+
+</template>
+<script>
+
+function long_names() {
+  return [
+    "foo_bar very long name with spaces",
+    "the quick brown fox jumped over the lazy dog",
+    "supercalifragilisticexpialodcious/bar/foo/zod/longer/longer",
+  ];
+}
+
+function many_names() {
+  var out = [];
+  for (var i=0; i<20; i++) {
+    out.push("foo_bar-" + i);
+    out.push("bar_zod_bing-" + i);
+    out.push("lol-" + i);
+  }
+  return out;
+}
+
+function many_long_names() {
+  var out = [];
+  for (var i=0; i<20; i++) {
+    out.push("foo_bar very very very long some spaces though-" + i);
+    out.push("bar_zod_bing_bas_womp_wub_wub_dub_wub_wub-" + i);
+    out.push("rightly_to_be_great_is_not_to_stir_without_great_argument_but_greatly_to_find_quarrel_in_a_straw_when_honors_at_the_stake-" + i);
+  }
+  return out;
+}
+
+Polymer({
+  is: "x-demo",
+  properties: {
+  long_names: {type: Array, value: long_names},
+  many_names: {type: Array, value: many_names},
+  many_long_names: {type: Array, value: many_long_names},
+},
+});
+</script>
+</dom-module>
+
+<x-demo id="demo"></x-demo>
+</body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
new file mode 100644
index 0000000000..b45657f7d8
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
@@ -0,0 +1,157 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="iron-icons/iron-icons.html">
+<link rel="import" href="paper-checkbox/paper-checkbox.html">
+<link rel="import" href="paper-icon-button/paper-icon-button.html">
+<link rel="import" href="paper-input/paper-input.html">
+<link rel="import" href="scrollbar-style.html">
+<link rel="import" href="run-color-style.html">
+
+<!--
+tf-multi-checkbox creates a list of checkboxes that can be used to toggle on or off
+a large number of values. Each checkbox displays a name, and may also have an
+associated tooltip value. Checkboxes can be highlighted, hidden, and re-ordered.
+
+tf-multi-checkbox assumes that the names may be very long compared to the width
+of the checkbox, and the number of names may also be very large, and works to
+handle these situations gracefully.
+-->
+<dom-module id="tf-multi-checkbox">
+  <style include="scrollbar-style"></style>
+  <style include="run-color-style"></style>
+
+  <template>
+      <paper-input
+        id="runs-regex"
+        no-label-float
+        label="Write a regex to filter runs"
+        value="[[regexInput]]"
+        on-bind-value-changed="_debouncedRegexChange"
+      ></paper-input>
+    <div id="outer-container" class="scrollbar">
+      <template
+        is="dom-repeat"
+        items="[[namesMatchingRegex]]"
+      >
+        <div
+          class="run-row"
+        >
+          <div class="icon-container checkbox-container vertical-align-container">
+            <paper-checkbox
+              class="checkbox vertical-align-center"
+              name="[[item]]"
+              checked$="[[_isChecked(item, runSelectionState.*)]]"
+              on-change="_checkboxChange"
+            ></paper-checkbox>
+
+          </div>
+          <div class="icon-container isolator-container vertical-align-container">
+            <paper-icon-button
+              icon="radio-button-unchecked"
+              class="isolator vertical-align-center"
+              on-tap="_isolateRun"
+              name="[[item]]"
+            ></paper-icon-button>
+          </div>
+          <div class="item-label-container">
+            <span>[[item]]</span>
+          </div>
+        </div>
+      </template>
+    </div>
+  <style>
+    paper-input {
+      --paper-input-container-focus-color: var(--tb-orange-strong);
+      --paper-input-container-input: {
+        font-size: 14px;
+      };
+      --paper-input-container-label: {
+        font-size: 14px;
+      };
+    }
+    :host {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+    }
+    #outer-container {
+      overflow-y: auto;
+      overflow-x: hidden;
+      width: 100%;
+      height: 0; /* Quirk to make firefox add scrolling instead of expand div */
+      flex-grow: 1;
+      flex-shrink: 1;
+      word-wrap: break-word;
+    }
+    .run-row {
+      padding-top: 5px;
+      padding-bottom: 5px;
+      display: flex;
+      flex-direction: row;
+      font-size: 13px;
+    }
+    .icon-container {
+      flex-grow: 0;
+      flex-shrink: 0;
+      padding-left: 2px;
+    }
+    .checkbox {
+      padding-left: 2px;
+      width: 18px;
+      height: 18px;
+    }
+    .isolator {
+      width: 18px;
+      height: 18px;
+      padding: 0px;
+    }
+    .isolator-container {
+      padding-left: 6px;
+      padding-right: 3px;
+    }
+    .checkbox-container {
+      padding-left: 2px;
+    }
+    .item-label-container {
+      padding-left: 5px;
+      flex-grow: 1;
+      flex-shrink: 1;
+      width: 0px; /* hack to get the flex-grow to work properly */
+    }
+    .tooltip-value-container {
+      display: flex;
+      justify-content: center;
+      flex-grow: 0;
+      flex-shrink: 0;
+      text-align:right;
+      padding-left: 2px;
+    }
+    .vertical-align-container {
+      display: flex;
+      justify-content: center;
+    }
+    .vertical-align-container .vertical-align-center {
+      align-self: center;
+    }
+    .vertical-align-container .vertical-align-top {
+      align-self: start;
+    }
+  </style>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts
new file mode 100644
index 0000000000..51206dd18c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts
@@ -0,0 +1,206 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import * as _ from 'lodash'
+
+import {getObjectInitializer, getObjectObserver, getStringInitializer, getStringObserver} from '../tf_storage_d3v4/storage'
+
+Polymer({
+  is: 'tf-multi-checkbox',
+  properties: {
+    names: {
+      type: Array,
+      value: function() {
+        return [];
+      },
+    },  // All the runs in consideration
+    regexInput: {
+      type: String,
+      value: getStringInitializer('regexInput', ''),
+      observer: '_regexInputObserver',
+    },  // Regex for filtering the runs
+    regex: {type: Object, computed: '_makeRegex(regexInput)'},
+    namesMatchingRegex: {
+      type: Array,
+      computed: 'computeNamesMatchingRegex(names.*, regex)'
+    },  // Runs that match the regex
+    runSelectionState: {
+      // if a run is explicitly enabled, True, if explicitly disabled, False.
+      // if undefined, default value (enable for first k runs, disable after).
+      type: Object,
+      value: getObjectInitializer('runSelectionState', {}),
+      observer: '_storeRunToIsCheckedMapping',
+    },
+    // (Allows state to persist across regex filtering)
+    outSelected: {
+      type: Array,
+      notify: true,
+      computed: 'computeOutSelected(namesMatchingRegex.*, runSelectionState.*)'
+    },
+    colorScale: {
+      type: Object,
+      observer: 'synchronizeColors',
+    },  // map from run name to css class
+    maxRunsToEnableByDefault: {
+      // When TB first loads, if it has k or fewer runs, they are all enabled
+      // by default. If there are more, then they are all disabled.
+      type: Number,
+      value: 40,
+    },
+    _debouncedRegexChange: {
+      type: Object,
+      // Updating the regex can be slow, because it involves updating styles
+      // on a large number of Polymer paper-checkboxes. We don't want to do
+      // this while the user is typing, as it may make a bad, laggy UI.
+      // So we debounce the updates that come from user typing.
+      value: function() {
+        const _this = this;
+        var debounced = _.debounce(function(r) {
+          _this.regexInput = r;
+        }, 150, {leading: false});
+        return function() {
+          var r = this.$$('#runs-regex').value;
+          if (r == '') {
+            // If the user cleared the field, they may be done typing, so
+            // update more quickly.
+            this.async(function() {
+              _this.regexInput = r;
+            }, 30);
+          } else {
+            debounced(r);
+          };
+        };
+      },
+    },
+  },
+  listeners: {
+    'dom-change': 'synchronizeColors',
+  },
+  observers: [
+    '_setIsolatorIcon(runSelectionState, names)',
+  ],
+  _storeRunToIsCheckedMapping: getObjectObserver('runSelectionState', {}),
+  _makeRegex: function(regex) {
+    try {
+      return new RegExp(regex)
+    } catch (e) {
+      return null;
+    }
+  },
+  _setIsolatorIcon: function() {
+    var runMap = this.runSelectionState;
+    var numChecked = _.filter(_.values(runMap)).length;
+    var buttons =
+        Array.prototype.slice.call(this.querySelectorAll('.isolator'));
+
+    buttons.forEach(function(b) {
+      if (numChecked === 1 && runMap[b.name]) {
+        b.icon = 'radio-button-checked';
+      } else {
+        b.icon = 'radio-button-unchecked';
+      }
+    });
+  },
+  computeNamesMatchingRegex: function(__, ___) {
+    var regex = this.regex;
+    return this.names.filter(function(n) {
+      return regex == null || regex.test(n);
+    });
+  },
+  computeOutSelected: function(__, ___) {
+    var runSelectionState = this.runSelectionState;
+    var num = this.maxRunsToEnableByDefault;
+    var allEnabled = this.namesMatchingRegex.length <= num;
+    return this.namesMatchingRegex.filter(function(n, i) {
+      return runSelectionState[n] == null ? allEnabled : runSelectionState[n];
+    });
+  },
+  synchronizeColors: function(e) {
+    if (!this.colorScale) return;
+
+    this._setIsolatorIcon();
+
+    var checkboxes =
+        Array.prototype.slice.call(this.querySelectorAll('paper-checkbox'));
+    var scale = this.colorScale;
+    checkboxes.forEach(function(p) {
+      var color = scale.scale(p.name);
+      p.customStyle['--paper-checkbox-checked-color'] = color;
+      p.customStyle['--paper-checkbox-checked-ink-color'] = color;
+      p.customStyle['--paper-checkbox-unchecked-color'] = color;
+      p.customStyle['--paper-checkbox-unchecked-ink-color'] = color;
+    });
+    var buttons =
+        Array.prototype.slice.call(this.querySelectorAll('.isolator'));
+    buttons.forEach(function(p) {
+      var color = scale.scale(p.name);
+      p.style['color'] = color;
+    });
+    // The updateStyles call fails silently if the browser doesn't have focus,
+    // e.g. if TensorBoard was opened into a new tab that isn't visible.
+    // So we wait for requestAnimationFrame.
+    var _this = this;
+    window.requestAnimationFrame(function() {
+      _this.updateStyles();
+    });
+  },
+  _isolateRun: function(e) {
+    // If user clicks on the label for one run, enable it and disable all other
+    // runs.
+
+    var name = (Polymer.dom(e) as any).localTarget.name;
+    var selectionState = {};
+    this.names.forEach(function(n) {
+      selectionState[n] = n == name;
+    });
+    this.runSelectionState = selectionState;
+  },
+  _checkboxChange: function(e) {
+    var target = (Polymer.dom(e) as any).localTarget;
+    this.runSelectionState[target.name] = target.checked;
+    // n.b. notifyPath won't work because run names may have periods.
+    this.runSelectionState = _.clone(this.runSelectionState);
+  },
+  _isChecked: function(item, outSelectedChange) {
+    return this.outSelected.indexOf(item) != -1;
+  },
+  _regexInputObserver: getStringObserver('regexInput', ''),
+  toggleAll: function() {
+    var _this = this;
+    var anyToggledOn = this.namesMatchingRegex.some(function(n) {
+      return _this.runSelectionState[n]
+    });
+
+
+    var runSelectionStateIsDefault =
+        Object.keys(this.runSelectionState).length == 0;
+
+    var defaultOff =
+        this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
+    // We have runs toggled either if some were explicitly toggled on, or if
+    // we are in the default state, and there are few enough that we default
+    // to toggling on.
+    anyToggledOn = anyToggledOn || runSelectionStateIsDefault && !defaultOff;
+
+    // If any are toggled on, we turn everything off. Or, if none are toggled
+    // on, we turn everything on.
+
+    var newRunsDisabled = {};
+    this.names.forEach(function(n) {
+      newRunsDisabled[n] = !anyToggledOn;
+    });
+    this.runSelectionState = newRunsDisabled;
+  },
+});
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html
new file mode 100644
index 0000000000..d22d341590
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html
@@ -0,0 +1,129 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+
+<!--
+Display a warning when there is no data found.
+-->
+<dom-module id="tf-no-data-warning">
+  <template>
+    <template is="dom-if" if="[[showWarning]]">
+      <div class="warning">
+        <template is="dom-if" if="[[_isGraph(dataType)]]">
+          <h3>
+            No graph definition files were found.
+          </h3>
+          <p>
+            To store a graph, create a
+            <code>tf.summary.FileWriter</code>
+            and pass the graph either via the constructor, or by calling its
+            <code>add_graph()</code> method.
+            You may want to check out the
+            <a href="https://www.tensorflow.org/get_started/graph_viz">
+              graph visualizer tutorial
+            </a>.
+          </p>
+        </template>
+        <template is="dom-if" if="[[_isProjector(dataType)]]">
+          <h3>
+            No checkpoint was found.
+          </h3>
+          <p>
+            Probable causes:
+            <ul>
+              <li>
+                No checkpoint has been saved yet. Please refresh the page periodically.
+              </li>
+              <li>
+                You are not saving any checkpoint. To save your model,
+                create a
+                <a href="https://www.tensorflow.org/api_docs/python/tf/train/Saver">
+                  <code>tf.train.Saver</code>
+                </a>
+                and save your model periodically
+                by calling <code>saver.save(session, LOG_DIR/model.ckpt, step)</code>.
+              </li>
+            </ul>
+          </p>
+        </template>
+        <template is="dom-if" if="[[_isOther(dataType)]]">
+          <h3>
+            No <span>[[dataType]]</span> data was found.
+          </h3>
+          <p>
+            Probable causes:
+            <ul>
+              <li>
+                You haven't written any <span>[[dataType]]</span> data
+                to your event files.
+              </li>
+              <li>
+                TensorBoard can't find your event files.
+              </li>
+            </ul>
+          </p>
+        </template>
+        <p>
+          If you're new to using TensorBoard, and want to find out how to add
+          data and set up your event files, check out the
+          <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md">
+            README
+          </a>
+          and perhaps the
+          <a href="https://www.tensorflow.org/get_started/summaries_and_tensorboard">
+            TensorBoard tutorial
+          </a>.
+        </p>
+
+        <p>
+          If you think TensorBoard is configured properly, please see the
+          <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md#my-tensorboard-isnt-showing-any-data-whats-wrong">
+            section of the README devoted to missing data problems
+          </a>
+          and consider filing an issue on GitHub.
+        </p>
+
+      </div>
+    </template>
+    <style>
+      .warning {
+        max-width: 540px;
+        margin: 80px auto 0 auto;
+      }
+    </style>
+  </template>
+
+  <script>
+    Polymer({
+      is: "tf-no-data-warning",
+      properties: {
+        dataType: String,
+        showWarning: Boolean
+      },
+      _isGraph: function(dataType) {
+        return dataType === "graph";
+      },
+      _isProjector: function(dataType) {
+        return dataType === "projector";
+      },
+      _isOther: function(dataType) {
+        return !this._isGraph(dataType) && !this._isProjector(dataType);
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html
new file mode 100644
index 0000000000..d11d43d78a
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html
@@ -0,0 +1,94 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="tensorboard-color.html">
+
+<!--
+tf-option-selector is a simple component that has buttons as content and
+provides a "selectedId" property that is one of the IDs of the buttons inside it.
+-->
+<dom-module id="tf-option-selector">
+  <template>
+    <div id="wrap">
+      <h3>[[name]]</h3>
+      <div class="content-wrapper"><content></content></div>
+    </div>
+    <style>
+      .content-wrapper ::content > * {
+        width: 30%;
+        font-size: 13px;
+        background: none;
+        margin-top: 10px;
+        color: var(--tb-ui-dark-accent);
+      }
+
+      .content-wrapper ::content :first-of-type {
+        margin-left: 0;
+      }
+
+      .content-wrapper ::content .selected {
+        background-color: var(--tb-ui-dark-accent);
+        color: white!important;
+      }
+
+      h3 {
+        color: var(--paper-grey-800);
+        margin: 0;
+        font-weight: normal;
+        font-size: 14px;
+        margin-bottom: 5px;
+        display: block;
+        pointer-events: none;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-option-selector",
+      properties: {
+        name: String,
+        selectedId: {
+          type: String,
+          notify: true,
+          observer: '_selectedIdChanged'
+        }
+      },
+      attached: function() {
+        this.async(function() {
+          this.getEffectiveChildren().forEach(function(node) {
+            this.listen(node, 'tap', '_selectTarget');
+          }.bind(this));
+        });
+      },
+      _selectTarget: function(e) {
+        this.selectedId = e.currentTarget.id;
+      },
+      _selectedIdChanged: function() {
+        var selected = this.queryEffectiveChildren('#' + this.selectedId);
+        if (!selected) {
+          return;
+        }
+
+        this.getEffectiveChildren().forEach(function(node) {
+          node.classList.remove("selected");
+        });
+        selected.classList.add("selected");
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html
new file mode 100644
index 0000000000..1a850c8999
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html
@@ -0,0 +1,352 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="tf-collapsable-pane.html">
+<link rel="import" href="tf-no-data-warning.html">
+<link rel="import" href="tf-chart-scaffold.html">
+
+<!--
+tf-panes-helper is a component that renders the contents of TensorBoard pages.
+It renders a tf-collapsable-pane for each category. Inside each category, the
+provided content template is rendered repeatedly for each tag within that
+category.
+
+This helper also incorporates an expand button and data download utility for
+each card.
+
+To use it, just specify a template inside tf-panes-helper that contains the
+code that will be replicated for each tag.
+
+<tf-panes-helper
+  categories="[[categories]]"
+  data-type="type"
+  data-provider="[[provider]]"
+  run2tag="[[run2tag]]"
+  selected-runs="[[selectedRuns]]"
+  >
+  <template>
+    <Code instantiated for each card>
+  </template>
+</tf-panes-helper>
+
+If you want for the template to be replicated for each tag and run, not only for
+each tag, you can set the repeatForRuns property to true.
+
+You can also set the showDownloadLinks property, which will show a menu with
+options to download JSON and CSV data. For this, you must also set the
+downloadLinkUrlFunction property to an appropriate value.
+
+@element tf-panes-helper
+-->
+<dom-module id="tf-panes-helper">
+  <template>
+    <content></content> <!-- User template will be put here -->
+    <tf-no-data-warning
+      data-type="[[dataType]]"
+      show-warning="[[dataNotFound]]"
+      ></tf-no-data-warning>
+
+    <template is="dom-repeat" items="[[categories]]" as="category">
+      <tf-collapsable-pane
+        name="[[category.name]]"
+        count="[[_count(category.tags, selectedRuns.*)]]"
+        >
+        <div class="layout horizontal wrap">
+          <template is="dom-repeat" items="[[_categoryCards(category, selectedRuns.*, run2tag.*)]]">
+              <div class="card">
+                <div class="card-title-container" style="border-color: [[_titleBorderColor(item.run)]]">
+                  <div class="card-title" inner-h-t-m-l="[[_break(item.tag)]]"></div>
+                  <template is="dom-if" if="[[repeatForRuns]]">
+                    <div class="card-subtitle" title="[[item.run]]">[[item.run]]</div>
+                  </template>
+                </div>
+                <div class="card-content">
+                  <tf-chart-scaffold
+                    tag="[[item.tag]]"
+                    data-provider="[[dataProvider]]"
+                    visible-series="[[item.runs]]"
+                    on-ready="_instantiateTemplate"
+                    >
+                    <!-- Instantiated template will be put here -->
+                  </tf-chart-scaffold>
+                </div>
+                <div class="card-bottom-row">
+                  <paper-icon-button
+                    class="expand-button"
+                    icon="fullscreen"
+                    on-tap="_toggleExpanded"
+                    ></paper-icon-button>
+                  <template is="dom-if" if="[[showDownloadLinks]]">
+                    <tf-downloader
+                      runs="[[item.runs]]"
+                      tag="[[item.tag]]"
+                      url-fn="[[downloadLinkUrlFunction]]"
+                      >
+                    </tf-downloader>
+                  </template>
+                </div>
+              </div>
+          </template>
+        </div>
+      </tf-collapsable-pane>
+    </template>
+
+    <style>
+      .card {
+        height: var(--card-height, 200px);
+        width: var(--card-width, 300px);
+        display: flex;
+        flex-direction: column;
+        margin: 5px;
+        padding: var(--card-padding, 0 30px 35px 0);
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        position: relative;
+      }
+
+      .card-expanded {
+        height: var(--card-expanded-height, 400px);
+        width: var(--card-expanded-width, 100%);
+      }
+
+      .card-title, .card-subtitle {
+        flex-grow: 0;
+        flex-shrink: 0;
+        font-size: 14px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+
+      .card-subtitle {
+        font-size: 12px;
+      }
+
+      .card-content {
+        flex-grow: 1;
+        flex-shrink: 1;
+        display: flex;
+        margin-top: 10px;
+      }
+
+      .card-bottom-row {
+        position: absolute;
+        left: 0px;
+        bottom: 0px;
+        width: 100%;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        pointer-events: none;
+      }
+
+      .card-title-container {
+        border-left: 4px solid;
+        padding-left: 5px;
+      }
+
+      .expand-button {
+        color: #2196F3;
+        width: 32px;
+        height: 32px;
+        padding: 4px;
+        border-radius: 100%;
+        pointer-events: auto;
+        display: var(--show-expand-button, block);
+      }
+
+      .card-expanded .expand-button {
+        background: var(--tb-ui-light-accent);
+      }
+
+      tf-downloader {
+        margin-right: 30px;
+        pointer-events: auto;
+      }
+
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-panes-helper",
+      properties: {
+        /**
+         * Categories that separate the template instances. Each category will
+         * be given its own collapsible pane. The category must be an array of
+         * objects, each with a 'name' property and a 'tags' array of strings.
+         */
+        categories: Array,
+
+        /**
+         * Input of the colors that are used for the user's runs.
+         */
+        colorScale: Object,
+
+        /**
+         * The name of the data type that is used by this dashboard. This will
+         * be used to display what is missing when there is no data available.
+         */
+        dataType: String,
+
+        /**
+         * The function that requests and returns a promise with the data of the
+         * required type for the templates from the backend.
+         */
+        dataProvider: Object,
+
+        /**
+         * If false, instantiates one template for each tag and calls
+         * setVisibleSeries on the first element of the template with all valid
+         * runs the tag has. If true, instantiates one template for each run of
+         * each tag, and calls setVisibleSeries of the first element of the
+         * instantiated template with just the one run.
+         */
+        repeatForRuns: {
+          type: Boolean,
+          value: false
+        },
+
+        /**
+         * Map from runs to the valid tags that have them.
+         */
+        run2tag: Object,
+
+        /**
+         * Array with the runs that are selected by the user (i.e. valid to be
+         * displayed).
+         */
+        selectedRuns: Array,
+
+        /**
+         * If true, shows a menu with download links for the template data.
+         * If this is set to true, urlFn must also be provided.
+         */
+        showDownloadLinks: Boolean,
+
+        /**
+         * Function that returns the route to get data to download. Must be
+         * provided if showDownloadLinks is enabled.
+         */
+        downloadLinkUrlFunction: Function,
+        _contentTemplate: {
+          type: Object,
+          value: null
+        },
+        _stampedTemplates: {
+          type: Array,
+          value: function() { return [] }
+        }
+      },
+      behaviors: [
+        Polymer.Templatizer,
+      ],
+
+      /**
+       * Initializes the Polymer.Templatizer behavior with the template supplied
+       * by the user. With this, all calls to this.stamp() will produce an
+       * instance of the user template.
+       */
+      _initTemplatizer: function() {
+        if (!this._contentTemplate) {
+          // First template is used as the content.
+          this._contentTemplate = Polymer.dom(this).querySelector('template');
+          this.templatize(this._contentTemplate);
+        }
+      },
+
+      /**
+       * Called every time a tf-chart-scaffold is ready, stamps the user
+       * template inside the scaffold element (before it is attached) and
+       * stores the stamped template in an array to use for data binding
+       * (forwardParentProp/Path).
+       */
+      _instantiateTemplate: function(e) {
+        var scaffold = e.target;
+        this._initTemplatizer();
+        var instance = this.stamp();
+        this._stampedTemplates.push(instance);
+        Polymer.dom(scaffold).appendChild(instance.root);
+      },
+      _toggleExpanded: function(e) {
+        var currentTarget = Polymer.dom(e.currentTarget);
+        var card = currentTarget.node.closest('.card');
+        var scaffold = card.querySelector('tf-chart-scaffold');
+        card.classList.toggle('card-expanded');
+        scaffold.chart().redraw();
+      },
+      _count: function(tags) {
+        if (!this.repeatForRuns) {
+          return tags.length;
+        }
+
+        var targetTags = d3.set(tags);
+        var count = 0;
+        this.selectedRuns.forEach(function(r) {
+          this.run2tag[r].forEach(function(t) {
+            if (targetTags.has(t)) {
+              count++;
+            }
+          });
+        }.bind(this));
+        return count;
+      },
+      _categoryCards: function(category) {
+        var cards = [];
+        category.tags.forEach(function(tag) {
+          var runs = this.selectedRuns.filter(function(r) {
+            return this.run2tag[r] && this.run2tag[r].indexOf(tag) !== -1;
+          }.bind(this));
+
+          if (this.repeatForRuns) {
+            runs.forEach(function(run) {
+              cards.push({tag: tag, run: run, runs: [run]});
+            });
+          } else {
+            cards.push({tag: tag, runs: runs});
+          }
+        }.bind(this));
+
+        return cards;
+      },
+      _titleBorderColor: function(run) {
+        return this.repeatForRuns ? this.colorScale.scale(run) : 'white';
+      },
+
+      /*
+       * Polymer data binding forwarding functions. Check the
+       * Polymer.Templatizer documentation for more information.
+       */
+
+      _forwardParentProp: function(property, value) {
+        this._stampedTemplates.forEach(function(instance) {
+          instance[property] = value;
+        });
+      },
+      _forwardParentPath: function(path, value) {
+        this._stampedTemplates.forEach(function(instance) {
+          instance.notifyPath(path, value, true);
+        });
+      },
+      // TODO(renatoutsch): implement the instance forwarding for two-way data
+      // binding.
+      // Add breaks to input so it will wrap nicely
+      _break: function(ipt) {
+        return ipt.replace(/([\/_-])/g, "$1<wbr>")
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
new file mode 100644
index 0000000000..bf4cc03f34
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+ <head>
+   <link rel="import" href="tf-regex-group.html">
+   <script src="bundle.js"></script>
+ </head>
+ <body>
+  <style>
+  .container {
+    width: 255px;
+    padding: 10px;
+    border: 1px solid #3f51b5;
+    border-radius: 5px;
+  }
+  :host {
+    margin: 0px;
+  }
+  </style>
+  <template id="page-template" is="dom-bind">
+    <div class="container">
+      <tf-regex-group regexes="{{regexes}}" id="demo"></tf-regex-group>
+    </div>
+    <p> Regexes:</p>
+    <template is="dom-repeat" items="[[regexes]]">
+      <p>"<span>[[item]]</span>"</p>
+    </template>
+  </template>
+ </body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
new file mode 100644
index 0000000000..60ec40f29d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
@@ -0,0 +1,97 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="paper-icon-button/paper-icon-button.html">
+<link rel="import" href="iron-icons/iron-icons.html">
+<link rel="import" href="paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="paper-input/paper-input.html">
+
+<!--
+`tf-regex-group` provides an input component for a group of regular expressions.
+
+Example:
+  <tf-regex-group regexes="{{regexes}}"></tf-regex-group>
+
+It contains a series of regular expression input fields. From this, it computes
+`regexes', an array in which every element is either a string representing a
+valid, nonempty regular expression, or the value `null`
+
+Public Properties:
+`regexes` a readonly, notifying array of strings, where each string is a regex
+
+It maintains an invariant that the final regex should always be an empty string,
+so the user can easily add more regular expressions. It does this by adding
+a new empty regex when the final one is nonempty.
+
+Pressing "enter" moves focus to the next regex (or just blurs if there are no
+more regexes).
+-->
+<dom-module id="tf-regex-group">
+  <template>
+    <div class="regex-list">
+      <template is="dom-repeat" items="{{rawRegexes}}">
+        <div class="regex-line">
+          <paper-input
+            id="text-input"
+            class="regex-input"
+            label="Write a regex to create a tag group"
+            no-label-float
+            value="{{item.regex}}"
+            invalid="[[!item.valid]]"
+            on-keyup="moveFocus"
+          ></paper-input>
+          <paper-icon-button
+            icon="close"
+            class="delete-button"
+            aria-label="Delete Regex"
+            tabindex="0"
+            on-tap="deleteRegex"
+          ></paper-icon-button>
+        </div>
+        <style>
+          .regex-input {
+            width: 250px;
+            display: inline-block;
+            margin-left: -3px;
+          }
+
+          .delete-button {
+            color: var(--paper-grey-700);
+            width: 40px;
+            height: 40px;
+            margin-right: -10px;
+          }
+
+          .regex-list {
+            margin-bottom: 10px;
+          }
+
+          paper-input {
+            --paper-input-container-focus-color: var(--tb-orange-strong);
+            --paper-input-container-input: {
+              font-size: 14px;
+            };
+            --paper-input-container-label: {
+              font-size: 14px;
+            };
+          }
+        </style>
+      </template>
+    </div>
+  </template>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts
new file mode 100644
index 0000000000..2c11be0e0b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts
@@ -0,0 +1,84 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+import {getObjectInitializer, getObjectObserver} from '../tf_storage_d3v4/storage'
+
+Polymer({
+  is: 'tf-regex-group',
+  properties: {
+    rawRegexes: {
+      type: Array,
+      value: getObjectInitializer('rawRegexes', [{regex: '', valid: true}]),
+    },
+    regexes:
+        {type: Array, computed: 'usableRegexes(rawRegexes.*)', notify: true},
+  },
+  observers: [
+    'addNewRegexIfNeeded(rawRegexes.*)',
+    'checkValidity(rawRegexes.*)',
+    '_uriStoreRegexes(rawRegexes.*)',
+  ],
+  _uriStoreRegexes: getObjectObserver('rawRegexes', [{regex: '', valid: true}]),
+  checkValidity: function(x) {
+    var match = x.path.match(/rawRegexes\.(\d+)\.regex/);
+    if (match) {
+      var idx = match[1];
+      this.set('rawRegexes.' + idx + '.valid', this.isValid(x.value));
+    }
+  },
+  isValid: function(s) {
+    try {
+      new RegExp(s);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  },
+  usableRegexes: function(regexes) {
+    var isValid = this.isValid;
+    return regexes.base
+        .filter(function(r) {
+          // Checking validity here (rather than using the data property)
+          // is necessary because otherwise we might send invalid regexes due
+          // to the fact that this function can call before the observer does
+          return r.regex !== '' && isValid(r.regex);
+        })
+        .map(function(r) {
+          return r.regex;
+        });
+  },
+  addNewRegexIfNeeded: function() {
+    var last = this.rawRegexes[this.rawRegexes.length - 1];
+    if (last.regex !== '') {
+      this.push('rawRegexes', {regex: '', valid: true});
+    }
+  },
+  deleteRegex: function(e) {
+    if (this.rawRegexes.length > 1) {
+      this.splice('rawRegexes', e.model.index, 1);
+    }
+  },
+  moveFocus: function(e) {
+    if (e.keyCode === 13) {
+      var idx = e.model.index;
+      var inputs = Polymer.dom(this.root).querySelectorAll('.regex-input');
+      if (idx < this.rawRegexes.length - 1) {
+        (inputs[idx + 1] as any).$.input.focus();
+      } else {
+        (document.activeElement as HTMLElement).blur();
+      }
+    }
+  }
+});
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html
new file mode 100644
index 0000000000..d2b6b1b194
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html
@@ -0,0 +1,188 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="paper-button/paper-button.html">
+<link rel="import" href="paper-dialog/paper-dialog.html">
+<link rel="import" href="tf-multi-checkbox.html">
+<link rel="import" href="scrollbar-style.html">
+
+<!--
+tf-run-selector creates a set of checkboxes to display which runs are selected.
+It also displays tooltips.
+
+Properties in:
+- runs: Array of strings representing the runs that may be selected
+- colorScale: a TF.ColorScale mapping run names to colors
+
+Properties out:
+- outSelected: The array of run names that are currently checked by the user.
+
+-->
+<dom-module id="tf-run-selector">
+  <template>
+    <paper-dialog with-backdrop id="logdir-dialog">
+      <h2>logdir</h2>
+      <div inner-h-t-m-l="{{_breakString(logdir)}}"></div>
+    </paper-dialog>
+    <div id="top-text">
+      <h3 id="tooltip-help" class="tooltip-container">
+        Runs
+      </h3>
+    </div>
+    <tf-multi-checkbox
+      id="multiCheckbox"
+      names="[[runs]]"
+      out-selected="{{outSelected}}"
+      color-scale="[[colorScale]]"
+    ></tf-multi-checkbox>
+    <paper-button
+      class="x-button"
+      id="toggle-all"
+      on-tap="_toggleAll"
+    >
+    Toggle All Runs
+    </paper-button>
+    <template
+      is="dom-if"
+      if="[[logdir]]">
+      <div id="logdir">
+        <span id="clipped-logdir" inner-h-t-m-l="[[_clippedLogdir]]"></span><!--
+          We use HTML comments to remove spaces before the ellipsis.
+        --><template
+                     is="dom-if"
+                     if="[[_shouldShowExpandLogdirButton(logdir, _logdirClipLength)]]"><!--
+          --><a href="" on-click="_openLogdirDialog">…</a>
+        </template>
+      </div>
+    </template>
+    <style>
+      :host {
+        display: flex;
+        flex-direction: column;
+        padding-bottom: 10px;
+        box-sizing: border-box;
+      }
+      #top-text {
+        width: 100%;
+        flex-grow: 0;
+        flex-shrink: 0;
+        padding-right: 16px;
+        box-sizing: border-box;
+        color: var(--paper-grey-800);
+      }
+      tf-multi-checkbox {
+        display: flex;
+        flex-grow: 1;
+        flex-shrink: 1;
+      }
+      .x-button {
+        font-size: 13px;
+        background-color: var(--tb-ui-light-accent);
+        color: var(--tb-ui-dark-accent);
+      }
+      #tooltip-help {
+        color: var(--paper-grey-800);
+        margin: 0;
+        font-weight: normal;
+        font-size: 14px;
+        margin-bottom: 5px;
+      }
+      paper-button {
+        margin-left: 0;
+      }
+      #logdir {
+        color: var(--tb-ui-dark-accent);
+        font-size: 13px;
+        margin: 5px 0 0 0;
+        max-width: 288px;
+      }
+    </style>
+  </template>
+  <script>
+  Polymer({
+    is: "tf-run-selector",
+    properties: {
+      backend: Object,
+      outSelected: {type: Array, notify: true},
+      // runs: an array of strings, representing the run names that may be chosen
+      runs: Array,
+      colorScale: Object, // TF.ColorScale
+      logdir: {
+        type: String,
+        notify: true,
+      },
+      // This is the potentially clipped portion of the logdir we show at the bottom of the sidebar.
+      _clippedLogdir: {
+        type: String,
+      },
+      _logdirClipLength: {
+        type: Number,
+        value: 250,
+        readOnly: true,
+      },
+    },
+    observers: [
+      "_onBackendUpdate(backend)",
+      "_logdirSet(logdir)",
+    ],
+    _toggleAll: function() {
+      this.$.multiCheckbox.toggleAll();
+    },
+    // Break the string at natural points, including commas, equals, and slashes
+    _breakString: function(originalString) {
+      return originalString.replace(/([\/=\-_,])/g, "$1<wbr>");
+    },
+    _onBackendUpdate: function(backend) {
+      if (backend === undefined) {
+        return;
+      }
+
+      // When the backend is set, the selector can request the logdir.
+      backend.logdir().then(logdirObject => {
+        this.set('logdir', logdirObject.logdir);
+      }).catch(e => {
+        // Fetching the logdir failed. Prevent the exception from logging to
+        // console. The console already logs a 404 network event.
+      });
+    },
+    _logdirSet: function(logdir) {
+      if (logdir === undefined) {
+        // The logdir has not been set yet.
+        return;
+      }
+
+      var lineBrokenText;
+      if (logdir.length > this._logdirClipLength) {
+        // Clip the logdir to avoid blocking the runs selector. Let the user view a more full
+        // version of the logdir.
+        lineBrokenText = this._breakString(logdir.substring(0, this._logdirClipLength));
+      } else {
+        lineBrokenText = this._breakString(logdir);
+      }
+      this.set('_clippedLogdir', lineBrokenText);
+    },
+    _openLogdirDialog: function(event) {
+      event.preventDefault();
+      this.$$('#logdir-dialog').open();
+    },
+    _shouldShowExpandLogdirButton(logdir, _logdirClipLength) {
+      return logdir && logdir.length > _logdirClipLength;
+    },
+  });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html
new file mode 100644
index 0000000000..cde812205b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html
@@ -0,0 +1,164 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="tf-categorizer.html">
+<link rel="import" href="tf-run-selector.html">
+
+<!--
+tf-sidebar-helper is a component that renders a sidebar for configuration
+components, like the tf-categorizer and the tf-run-selector. The component can
+also be extended with more options useful to the dashboards.
+
+To use it, create the tf-sidebar-helper with the required properties. To extend
+it with extra configuration components, add them to the element's component:
+
+<tf-sidebar-helper
+  backend: "[[backend]]",
+  categories: "{{outputCategories}}",
+  colorScale: "[[colorScale]]",
+  run2tag: "[[run2tag]]",
+  runs: "[[runs]]",
+  selectedRuns: "{{outSelectedRuns}}",
+  >
+  <div class="extend-first-section">
+    <my options>
+  </div>
+  <div class="sidebar-section">
+    <my options>
+  </div>
+  ...
+</tf-sidebar-helper>
+
+Elements inside the .extend-first-section div will be put on the first section
+of the sidebar, while the rest of the divs will be put after it and before the
+tf-run-selector.
+
+@element tf-sidebar-helper
+-->
+<dom-module id="tf-sidebar-helper">
+  <template>
+    <div class="sidebar-section">
+      <tf-categorizer
+        id="categorizer"
+        tags="[[tags]]"
+        categories="{{categories}}"
+        ></tf-categorizer>
+      <content select=".extend-first-section"></content>
+    </div>
+    <content></content>
+    <div class="sidebar-section">
+      <tf-run-selector
+        id="runSelector"
+        backend="[[backend]]"
+        runs="[[runs]]"
+        color-scale="[[colorScale]]"
+        out-selected="{{selectedRuns}}"
+        ></tf-run-selector>
+    </div>
+    <style include="dashboard-style"></style>
+    <style>
+      :host {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+      }
+
+      #categorizer {
+        flex-shrink: 0;
+      }
+
+      #runSelector {
+        flex-shrink: 1;
+        flex-grow: 1;
+      }
+
+      .sidebar-section {
+        border-top: solid 1px rgba(0, 0, 0, 0.12);
+        padding: 20px 0px 20px 30px;
+      }
+
+      .sidebar-section:first-child {
+        border: none;
+      }
+
+      .sidebar-section:last-child {
+        flex-grow: 1;
+        display: flex;
+      }
+
+      paper-checkbox {
+        --paper-checkbox-checked-color: var(--tb-ui-dark-accent);
+        --paper-checkbox-unchecked-color: var(--tb-ui-dark-accent);
+        font-size: 14px;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-sidebar-helper",
+      properties: {
+        /**
+         * The backend object used to issue requests.
+         */
+        backend: Object,
+
+        /**
+         * This is an output of the categories that the user selected to
+         * separate the different tags. Each category here should be given its
+         * own collapsible pane.
+         */
+        categories: {
+          type: Array,
+          notify: true,
+        },
+
+        /**
+         * Input of the colors that are used for the user's runs.
+         */
+        colorScale: Object,
+
+        /**
+         * Map from runs to the valid tags that have them.
+         */
+        run2tag: Object,
+
+        /**
+         * Input of all valid runs that can be selected by the user.
+         */
+        runs: Array,
+
+        /**
+         * Outputs an array with the runs that are selected by the user (i.e.
+         * valid to be displayed).
+         */
+        selectedRuns: {
+          type: Array,
+          notify: true,
+        },
+
+        tags: {
+          type: Array,
+          computed: "_getTags(run2tag.*)"
+        },
+      },
+      _getTags: function() {
+        return _.union.apply(null, _.values(this.run2tag));
+      },
+    })
+  </script>
+</dom-module>
-- 
GitLab


From 342d315566211a095a06acb1973b94937dadbc0c Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Wed, 26 Apr 2017 14:21:43 -0800
Subject: [PATCH 0712/1563] Update rematerialization to account for buffer
 aliasing in memory tracking. Previously rematerialization ignored any buffer
 aliasing. For one, this caused significant over-rematerialization with while
 loops. This cl uses points-to analysis to properly account for buffer
 aliasing. This change includes a couple other related changes:

(1) enable a rematerialization to be used by more than one instruction.

(2) Avoid rematerializing instructions with control dependencies to avoid invalid aliasing which was prevented by earlier copy-insertion.

The net result is generally much fewer instructions rematerialized especially with while loops and reduced memory use.
Change: 154352719
---
 tensorflow/compiler/xla/service/BUILD         |    2 +
 .../xla/service/hlo_rematerialization.cc      | 1181 ++++++++++++-----
 .../xla/service/hlo_rematerialization.h       |   18 +
 .../xla/service/hlo_rematerialization_test.cc |  221 ++-
 .../compiler/xla/service/liveness_util.cc     |    5 +-
 .../compiler/xla/service/liveness_util.h      |    5 +-
 6 files changed, 1050 insertions(+), 382 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index e5a921674f..aed3d72440 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1254,6 +1254,7 @@ cc_library(
         ":hlo_cost_analysis",
         ":hlo_dce",
         ":hlo_ordering",
+        ":liveness_util",
         ":logical_buffer",
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:shape_util",
@@ -1271,6 +1272,7 @@ cc_test(
     deps = [
         ":cpu_plugin",
         ":hlo",
+        ":hlo_matchers",
         ":hlo_ordering",
         ":hlo_rematerialization",
         "//tensorflow/compiler/xla:shape_util",
diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization.cc b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
index 101c9076f8..a2c0b52ab2 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
@@ -29,8 +29,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/hlo_ordering.h"
+#include "tensorflow/compiler/xla/service/liveness_util.h"
 #include "tensorflow/compiler/xla/service/logical_buffer.h"
-#include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 #include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/compiler/xla/types.h"
@@ -46,63 +46,58 @@ namespace xla {
 
 namespace {
 
-// Returns a vector of the operands of 'instruction' with repeated elements
-// removed.
-std::vector<HloInstruction*> UniqueOperands(const HloInstruction* instruction) {
-  std::vector<HloInstruction*> unique_operands;
-  for (HloInstruction* operand : instruction->operands()) {
-    if (std::find(unique_operands.begin(), unique_operands.end(), operand) ==
-        unique_operands.end()) {
-      unique_operands.push_back(operand);
-    }
-  }
-  return unique_operands;
-}
-
 // Returns true if the given instruction is rematerializable.
 bool IsRematerializable(const HloInstruction* instruction) {
+  // Conservatively, don't rematerialize instruction with control
+  // dependencies. For one, control dependencies are added to prevent
+  // interference of aliased buffers (say, in while bodies) and
+  // rematerialization is ignorant of liveness and may break the intended
+  // ordering.
+  if (!instruction->control_predecessors().empty() ||
+      !instruction->control_successors().empty()) {
+    return false;
+  }
+
   // Don't rematerialize instructions with side effects, those with a cost that
   // might not be captured by HloCostAnalysis, or instructions which cannot be
   // cloned safely.
   switch (instruction->opcode()) {
     case HloOpcode::kCall:
+    case HloOpcode::kConstant:
     case HloOpcode::kCrossReplicaSum:
     case HloOpcode::kCustomCall:
     case HloOpcode::kOutfeed:
     case HloOpcode::kInfeed:
+    case HloOpcode::kParameter:
     case HloOpcode::kRecv:
     case HloOpcode::kSend:
     case HloOpcode::kTrace:
     case HloOpcode::kWhile:
       return false;
     default:
-      break;
-  }
-
-  // Skip tuple shapes because we do not currently account for buffer aliasing
-  // properly which results in improperly accounting of rematerialization cost
-  // for these shapes.
-  if (ShapeUtil::IsTuple(instruction->shape())) {
-    return false;
-  }
-  for (auto* operand : instruction->operands()) {
-    if (ShapeUtil::IsTuple(operand->shape())) {
-      return false;
-    }
+      return true;
   }
-
-  return true;
 }
 
-// Class which maintains an ordered list of instructions with fast insertion and
-// removal of arbitrary elements.
+// Class which maintains an ordered list of instructions with fast insertion
+// before arbitrary elements.
 class InstructionList {
  public:
   explicit InstructionList(const std::vector<const HloInstruction*> order) {
+    int64 position = 0;
     for (const HloInstruction* inst : order) {
       instructions_.push_back(const_cast<HloInstruction*>(inst));
       instruction_iterators_.insert({const_cast<HloInstruction*>(inst),
                                      std::next(instructions_.end(), -1)});
+      // Initially position numbers are uniquely assigned in order. Later as
+      // instructions are added with InsertBefore* methods, some instructions
+      // may have duplicate position numbers, but the values will be guaranteed
+      // to be monotonically increasing through the list, and so is still useful
+      // for quickly(-ish) determining the order of arbitrary instructions in
+      // the list.
+      position_number_[inst] = position;
+      first_at_position_[position] = inst;
+      position++;
     }
   }
 
@@ -111,22 +106,63 @@ class InstructionList {
     return instructions_;
   }
 
-  // Insert instruction 'to_insert' before instruction 'before' in the list.
-  Status InsertBefore(HloInstruction* to_insert, HloInstruction* before) {
+  // Insert instruction 'to_insert' immediately before instruction 'before' in
+  // the list.
+  void InsertBefore(HloInstruction* to_insert, HloInstruction* before) {
+    VLOG(3) << "InsertBefore: " << to_insert->name() << " before "
+            << before->name();
     auto it = instruction_iterators_.find(before);
-    TF_RET_CHECK(it != instruction_iterators_.end());
+    CHECK(it != instruction_iterators_.end());
     instruction_iterators_.insert(
         {to_insert, instructions_.insert(it->second, to_insert)});
-    return Status::OK();
+    // Assign the same position number to the newly added instruction as
+    // 'before'. This guarantees monotonicity of the position numbers, but not
+    // uniqueness.
+    int64 pos = position_number_.at(before);
+    position_number_[to_insert] = pos;
+    if (first_at_position_.at(pos) == before) {
+      first_at_position_[pos] = to_insert;
+    }
   }
 
-  // Removes instruction from the list.
-  Status Remove(HloInstruction* instruction) {
-    auto it = instruction_iterators_.find(instruction);
-    TF_RET_CHECK(it != instruction_iterators_.end());
-    instructions_.erase(it->second);
-    instruction_iterators_.erase(it);
-    return Status::OK();
+  // Insert instruction 'to_insert' immediately before the earliest instruction
+  // in 'before_instructions'.
+  void InsertBeforeInstructions(
+      HloInstruction* to_insert,
+      tensorflow::gtl::ArraySlice<HloInstruction*> before_instructions) {
+    VLOG(3) << "InsertBeforeInstructions: " << to_insert->name() << " before {"
+            << tensorflow::str_util::Join(
+                   before_instructions, ", ",
+                   [](string* out, HloInstruction* inst) {
+                     tensorflow::strings::StrAppend(out, inst->name());
+                   })
+            << "}";
+
+    // Find the minimal position number of any instruction in
+    // 'before_instructions'.
+    CHECK(!before_instructions.empty());
+    int64 min_position_number = std::numeric_limits<int64>::max();
+    for (const HloInstruction* instruction : before_instructions) {
+      min_position_number =
+          std::min(min_position_number, position_number_.at(instruction));
+    }
+
+    // Because more than one instruction in 'before_instructions' may have a
+    // position number of 'min_position_number', find the first such instruction
+    // with position number 'min_position_number'.
+    for (auto it = instruction_iterators_.at(
+             first_at_position_.at(min_position_number));
+         it != instructions_.end() &&
+         position_number_.at(*it) == min_position_number;
+         ++it) {
+      if (std::find(before_instructions.begin(), before_instructions.end(),
+                    *it) != before_instructions.end()) {
+        return InsertBefore(to_insert, *it);
+      }
+    }
+    LOG(FATAL) << "Expected to find instruction in before_instructions with "
+                  "position number "
+               << min_position_number;
   }
 
  private:
@@ -137,283 +173,626 @@ class InstructionList {
   tensorflow::gtl::FlatMap<const HloInstruction*,
                            std::list<HloInstruction*>::iterator>
       instruction_iterators_;
+
+  // A number assigned to each instruction which increases monotonically through
+  // 'instructions_'. Used to facilitate fast insertion of an instruction before
+  // the earliest instruction in a set of instructions
+  // (InsertBeforeInstructions) by enabling fast-ish ordering queries between
+  // instructions. If position_number_[a] < position_number_[b] then 'a' comes
+  // before 'b' in the list. If the position numbers are the same then nothing
+  // can be said about their order without examining the list.
+  //
+  // On object construction this value is precisely the instruction's ordinal
+  // position in the list. Instructions inserted via InsertBefore receive
+  // duplicate values. However, monotonicity is preserved.
+  tensorflow::gtl::FlatMap<const HloInstruction*, int64> position_number_;
+
+  // The first instruction in the list assigned a particular position number.
+  tensorflow::gtl::FlatMap<int64, const HloInstruction*> first_at_position_;
 };
 
+// Return the HloInstructions which use the given LogicalBuffer. Sets
+// has_indirect_users to whether any of the uses is indirect. A use is indirect
+// if the instruction defining logical_buffer is not an operand of the use. This
+// can happen via buffer aliasing (eg, tuples).
+std::vector<const HloInstruction*> GetUsers(
+    const LogicalBuffer* logical_buffer,
+    const TuplePointsToAnalysis& points_to_analysis, bool* has_indirect_users) {
+  std::vector<const HloInstruction*> users;
+  // To identify uses iterate through all HloInstruction users of the
+  // BufferAliases of the logical buffer.
+  *has_indirect_users = false;
+  for (const BufferAlias& buffer_alias :
+       points_to_analysis.GetBufferAliases(*logical_buffer)) {
+    for (const HloInstruction* user : buffer_alias.instruction()->users()) {
+      if (DoesNotUseOperandBuffer(buffer_alias.instruction(),
+                                  buffer_alias.index(), user,
+                                  points_to_analysis)) {
+        // The alias may be an operand of 'user', but the LogicalBuffer cannot
+        // possibly be used by the instruction so ignore 'user'. This is the
+        // case, for example, for the tuple element buffers in a GetTupleElement
+        // instruction (the GTE instruction only uses the pointer vector).
+        continue;
+      }
+      if (buffer_alias.instruction() != logical_buffer->instruction()) {
+        *has_indirect_users = true;
+      }
+      users.push_back(user);
+    }
+  }
+  return users;
+}
+
 // Class for tracking memory usage of a computation as the instructions are
-// placed sequentially. Memory usage is the sum of live values at the current
-// point in the instruction sequence.
+// placed sequentially. Memory usage is the sum of the sizes of live values
+// (LogicalBuffers) at the current point in the instruction sequence.
 class MemoryUsageTracker {
  public:
   MemoryUsageTracker(
       const HloComputation* computation,
-      const HloRematerialization::ShapeSizeFunction& size_function)
-      : computation_(computation), size_function_(size_function) {
-    for (const std::unique_ptr<HloInstruction>& instruction :
-         computation->instructions()) {
-      // Initially only live-in values occupy memory.
-      if (IsLiveIn(instruction.get())) {
-        memory_usage_ += TotalSizeBytes(instruction->shape());
-      }
-    }
+      const HloRematerialization::ShapeSizeFunction& size_function,
+      const TuplePointsToAnalysis& points_to_analysis,
+      const InstructionList& instruction_list);
+
+  // Starts the placement of the given instruction. This adds the sizes of the
+  // LogicalBuffers defined by the instruction to the current memory
+  // usage. Placement is broken into two steps (BeginInstruction and
+  // EndInstruction) to accurately model memory usage. At BeginInstruction the
+  // memory for the output value(s) of the current instruction is allocated. At
+  // EndInstruction memory for dead operand(s) is freed.
+  Status BeginInstruction(const HloInstruction* instruction);
+
+  // Finishes the placement of the current instruction. This frees any dead
+  // operands or dead result of the instruction. This must be called after
+  // each call to BeginInstruction.
+  Status EndInstruction();
+
+  // Returns the number of bytes that the current memory usage will be reduced
+  // if the given instruction is rematerialized.
+  int64 MemoryReducedIfRematerialized(const HloInstruction* instruction) const;
+
+  // Adjusts memory usage to account for the rematerialization of
+  // original_instruction for all remaining unplaced uses. The rematerialization
+  // is remat_instruction. This method should be called after the HLO graph has
+  // been transformed (rematerialization instruction created and connected to
+  // uses).
+  Status AddRematerializedInstruction(HloInstruction* original_instruction,
+                                      HloInstruction* remat_instruction);
+
+  // Returns whether the given instruction has been placed (BeginInstruction
+  // has been called with 'instruction' as the argument).
+  bool IsPlaced(const HloInstruction* instruction) const {
+    return ContainsKey(placed_instructions_, instruction);
+  }
+
+  // Returns the current memory usage. This is the sum of sizes of all live
+  // values.
+  int64 memory_usage() const { return memory_usage_; }
+
+  // Returns the current instruction being placed.
+  const HloInstruction* in_progress_instruction() const {
+    return in_progress_instruction_;
   }
 
-  // Starts the placement of the given instruction. This adds the output size of
-  // the instruction to the current memory usage. Placement is broken into two
-  // steps (BeginInstruction and EndInstruction) to accurately model memory
-  // usage. At BeginInstruction the memory for the output value of the current
-  // instruction is allocated. At EndInstruction memory for dead operands is
-  // freed.
-  Status BeginInstruction(const HloInstruction* instruction) {
-    VLOG(3) << "BeginInstruction " << instruction->name();
-    TF_RET_CHECK(in_progress_instruction_ == nullptr);
-    in_progress_instruction_ = instruction;
+  // Check invariants of the data structure. This is expensive to call.
+  bool Check() const;
 
-    // Add instruction to remaining_uses_.
-    TF_RET_CHECK(!ContainsKey(remaining_uses_, instruction));
-    std::vector<HloInstruction*>& instruction_uses =
-        remaining_uses_[instruction];
-    instruction_uses.insert(instruction_uses.begin(),
-                            instruction->users().begin(),
-                            instruction->users().end());
+  string ToString() const;
 
-    if (!IsLiveIn(instruction)) {
-      // Instruction was not previously live so add output size to memory usage.
-      memory_usage_ += TotalSizeBytes(instruction->shape());
+ private:
+  // Type holding a unique identifier for each Buffer object.
+  using BufferId = int64;
+
+  // A Buffer represents a single LogicalBuffer in the computation including
+  // various metadata useful for tracking liveness of the value. A LogicalBuffer
+  // is not used directly because the HLO graph is transformed and
+  // TuplePointsToAnalysis which owns all LogicalBuffers cannot be updated after
+  // HLO graph transformations.
+  struct Buffer {
+    // The unique id of this Buffer. This value is equal to the buffer's index
+    // in the vector buffers_.
+    const BufferId id;
+
+    // The instruction which defines this buffer.
+    const HloInstruction* defining_instruction;
+
+    // The materialized size of the buffer in bytes.
+    const int64 size;
+
+    // Whether this buffer is live-out of the computation.
+    bool live_out;
+
+    // Whether this buffer has indirect uses. Ie, an instruction which is not a
+    // user of defining_instruction uses this buffer. This can occur due to
+    // buffer aliasing (eg, tuples).
+    bool has_indirect_uses;
+
+    // The instructions which use this buffer.
+    std::vector<const HloInstruction*> users;
+
+    // The number of users (HloInstructions) of this buffer which have not yet
+    // been placed in the sequence.
+    int64 unfinished_user_count;
+
+    string ToString() const {
+      return tensorflow::strings::StrCat("Buffer ", id, " (defined by ",
+                                         defining_instruction->name(),
+                                         ", size ", size, " bytes)");
     }
+  };
+
+  // Creates a Buffer representing the given logical buffer. The buffer is added
+  // to buffers_ and a reference is returned.
+  Buffer& CreateBufferFromLogicalBuffer(
+      const LogicalBuffer* logical_buffer,
+      const TuplePointsToAnalysis& points_to_analysis,
+      const HloRematerialization::ShapeSizeFunction& size_function,
+      bool live_out) {
+    bool has_indirect_uses = false;
+    std::vector<const HloInstruction*> users =
+        GetUsers(logical_buffer, points_to_analysis, &has_indirect_uses);
+    return NewBuffer(logical_buffer->instruction(),
+                     size_function(logical_buffer->shape()), std::move(users),
+                     live_out, has_indirect_uses);
+  }
 
-    VLOG(3) << "  memory usage = " << memory_usage_;
-    VLOG(10) << ToString();
-    return Status::OK();
+  // Create a new buffer representing a rematerialization of given buffer for
+  // the given uses.
+  Buffer& RematerializeBuffer(
+      const Buffer& original_buffer, const HloInstruction* remat_instruction,
+      std::vector<const HloInstruction*>&& rematerialized_uses) {
+    CHECK(IsPlaced(original_buffer.defining_instruction));
+    CHECK(!original_buffer.has_indirect_uses);
+    CHECK(!original_buffer.live_out);
+    for (const HloInstruction* use : rematerialized_uses) {
+      CHECK(!IsPlaced(use));
+    }
+    return NewBuffer(remat_instruction, original_buffer.size,
+                     std::move(rematerialized_uses), /*live_out=*/false,
+                     /*has_indirect_uses=*/false);
   }
 
-  // Finishes the placement of the current instruction. This frees any dead
-  // operands or dead result of the instruction. This must be called after each
-  // call to BeginInstruction.
-  Status EndInstruction() {
-    TF_RET_CHECK(in_progress_instruction_ != nullptr);
-    VLOG(3) << "EndInstruction " << in_progress_instruction_->name();
-
-    for (HloInstruction* operand : UniqueOperands(in_progress_instruction_)) {
-      TF_RET_CHECK(ContainsKey(remaining_uses_, operand));
-      std::vector<HloInstruction*>& uses = remaining_uses_.at(operand);
-      auto it = std::find(uses.begin(), uses.end(), in_progress_instruction_);
-      TF_RET_CHECK(it != uses.end());
-      uses.erase(it);
-
-      if (uses.empty()) {
-        // Operand is dead.
-        int64 operand_size = TotalSizeBytes(operand->shape());
-        if (!IsLiveOut(operand)) {
-          VLOG(4) << operand->name() << " ("
-                  << HumanReadableNumBytes(operand_size) << ") is dead";
-          memory_usage_ -= operand_size;
-          TF_RET_CHECK(memory_usage_ >= 0);
-        }
-      }
+  // Return number of bytes allocated for the buffer with the given id. Buffers
+  // allocated by the calling computation (eg, parameter and output buffers) are
+  // considered to have zero bytes because the memory is accounted for in a
+  // different computation.
+  int64 AllocatedSize(BufferId buffer_id) const {
+    const Buffer& buffer = buffers_.at(buffer_id);
+    HloOpcode def_opcode = buffer.defining_instruction->opcode();
+    if (buffer.live_out || def_opcode == HloOpcode::kParameter) {
+      return 0;
+    } else {
+      return buffer.size;
     }
+  }
 
-    // Value is dead if the instruction has no uses and is not live out.
-    if (in_progress_instruction_->users().empty() &&
-        !IsLiveOut(in_progress_instruction_)) {
-      memory_usage_ -= TotalSizeBytes(in_progress_instruction_->shape());
-      TF_RET_CHECK(memory_usage_ >= 0);
+  // Returns true if BeginInstruction and EndInstruction has been called for the
+  // given instruction.
+  bool IsFinished(const HloInstruction* instruction) const {
+    return IsPlaced(instruction) && instruction != in_progress_instruction_;
+  }
+
+  // Returns whether the given buffer is being used by the in-progress
+  // instruction.
+  bool IsInUse(BufferId buffer_id) const {
+    if (in_progress_instruction_ == nullptr) {
+      return false;
     }
+    const std::vector<BufferId>& in_progress_uses =
+        buffers_used_by_instruction_.at(in_progress_instruction_);
+    return std::find(in_progress_uses.begin(), in_progress_uses.end(),
+                     buffer_id) != in_progress_uses.end();
+  }
 
-    in_progress_instruction_ = nullptr;
+  // Returns whether the given instruction is live at the current program
+  // point.
+  bool IsCurrentlyLive(BufferId buffer_id) const {
+    const Buffer& buffer = buffers_[buffer_id];
+    return (IsPlaced(buffer.defining_instruction) &&
+            buffer.unfinished_user_count > 0);
+  }
 
-    VLOG(3) << "  memory usage = " << memory_usage_;
-    VLOG(10) << ToString();
-    return Status::OK();
+  // Create a new buffer, add it to buffers_, and return a reference.
+  Buffer& NewBuffer(const HloInstruction* defining_instruction, int64 size,
+                    std::vector<const HloInstruction*>&& users, bool live_out,
+                    bool has_indirect_uses) {
+    int buffer_id = buffers_.size();
+    buffers_.push_back(Buffer{buffer_id, defining_instruction, size, live_out,
+                              has_indirect_uses, users,
+                              static_cast<int64>(users.size())});
+    return buffers_.back();
   }
 
-  // Adjusts memory usage to account for the rematerialization of
-  // original_instruction for the given use. The rematerialization is
-  // remat_instruction. This method should be called after the HLO graph has
-  // been transformed (rematerialization instruction created and connected to
-  // its use).
-  Status RematerializeInstructionForUse(HloInstruction* original_instruction,
-                                        HloInstruction* remat_instruction,
-                                        HloInstruction* use) {
-    VLOG(3) << "RematerializeInstructionForUse: original_instruction = "
-            << original_instruction->name()
-            << ", remat_instruction = " << remat_instruction->name()
-            << ", use = " << use->name();
-
-    TF_RET_CHECK(in_progress_instruction_ != nullptr);
-    TF_RET_CHECK(IsPlaced(original_instruction));
-    TF_RET_CHECK(!IsPlaced(remat_instruction));
-    TF_RET_CHECK(!IsPlaced(use));
-    TF_RET_CHECK(IsCurrentlyLive(original_instruction));
-
-    // Remove 'use' from remaining uses of original_instruction.
-    auto it = std::find(remaining_uses_[original_instruction].begin(),
-                        remaining_uses_[original_instruction].end(), use);
-    TF_RET_CHECK(it != remaining_uses_[original_instruction].end());
-    remaining_uses_[original_instruction].erase(it);
-
-    // If original_instruction is no longer live ('use' was its last use) then
-    // deduct original_instruction's memory usage.
-    if (!IsCurrentlyLive(original_instruction)) {
-      memory_usage_ -= TotalSizeBytes(original_instruction->shape());
-      TF_RET_CHECK(memory_usage_ >= 0);
-    }
-
-    // Add the new remat_instruction to the remaining uses of its operands.
-    for (auto* operand : UniqueOperands(remat_instruction)) {
-      // Rematerialization may extend the lifetime of the operand so account for
-      // this in memory_usage_.
-      TF_RET_CHECK(IsPlaced(operand));
-      if (!IsCurrentlyLive(operand)) {
-        memory_usage_ += TotalSizeBytes(operand->shape());
+  const HloComputation* computation_;
+
+  // Instruction list containing the ordering of instructions in
+  // computation_. This is the order in which instructions are placed
+  // (BeginInstruction/EndInstruction calls).
+  const InstructionList& instruction_list_;
+
+  // Memory usage at the currently placed instruction.
+  int64 memory_usage_ = 0;
+
+  // The instruction currently being placed. This value is non-null only
+  // between the calling of BeginInstruction and EndInstruction.
+  const HloInstruction* in_progress_instruction_ = nullptr;
+
+  // The buffers defined by each instruction.
+  std::unordered_map<const HloInstruction*, std::vector<BufferId>>
+      buffers_defined_by_instruction_;
+
+  // The buffers used by each instruction.
+  std::unordered_map<const HloInstruction*, std::vector<BufferId>>
+      buffers_used_by_instruction_;
+
+  // The set of instructions which have been placed. That is, BeginInstruction
+  // has been called with the instruction as an argument.
+  tensorflow::gtl::FlatSet<const HloInstruction*> placed_instructions_;
+
+  // All buffers in the computation.
+  std::vector<Buffer> buffers_;
+};
+
+MemoryUsageTracker::MemoryUsageTracker(
+    const HloComputation* computation,
+    const HloRematerialization::ShapeSizeFunction& size_function,
+    const TuplePointsToAnalysis& points_to_analysis,
+    const InstructionList& instruction_list)
+    : computation_(computation), instruction_list_(instruction_list) {
+  // Iterate through all LogicalBuffers in the computation and gather the
+  // instructions which define them in buffers_defined_by_instruction_ and the
+  // instructions which use them in buffers_used_by_instruction_.
+  for (auto& instruction : computation_->instructions()) {
+    // Initialize empty vectors for defs and uses of each instruction.
+    buffers_used_by_instruction_[instruction.get()];
+    buffers_defined_by_instruction_[instruction.get()];
+  }
+
+  tensorflow::gtl::FlatSet<const LogicalBuffer*> live_out_set =
+      points_to_analysis.GetPointsToSet(computation_->root_instruction())
+          .CreateFlattenedSet();
+  tensorflow::gtl::FlatMap<const LogicalBuffer*, BufferId>
+      logical_buffer_to_buffer_id;
+
+  for (const HloInstruction* instruction : instruction_list_.instructions()) {
+    for (const LogicalBuffer* logical_buffer :
+         points_to_analysis.GetBuffersDefinedByInstruction(instruction)) {
+      Buffer* buffer;
+      if (instruction->opcode() == HloOpcode::kWhile) {
+        // The while instruction defines no new buffers. Instead it reuses the
+        // buffers of its operand. Find the Buffer of its operand at the
+        // proper ShapeIndex.
+        const PointsToSet& operand_points_to =
+            points_to_analysis.GetPointsToSet(instruction->operand(0));
+        CHECK_EQ(operand_points_to.element(logical_buffer->index()).size(), 1);
+        const LogicalBuffer* source_logical_buffer =
+            operand_points_to.element(logical_buffer->index())[0];
+        buffer =
+            &buffers_.at(logical_buffer_to_buffer_id.at(source_logical_buffer));
+
+        // Mark buffer as has indirect use and live out.
+        buffer->has_indirect_uses = true;
+        buffer->live_out =
+            buffer->live_out || ContainsKey(live_out_set, logical_buffer);
+
+        // Add users of while to Buffer users.
+        bool unused;
+        for (const HloInstruction* user :
+             GetUsers(logical_buffer, points_to_analysis, &unused)) {
+          if (std::find(buffer->users.begin(), buffer->users.end(), user) ==
+              buffer->users.end()) {
+            buffer->users.push_back(user);
+            buffer->unfinished_user_count++;
+            buffers_used_by_instruction_.at(user).push_back(buffer->id);
+          }
+        }
+      } else {
+        buffer = &CreateBufferFromLogicalBuffer(
+            logical_buffer, points_to_analysis, size_function,
+            ContainsKey(live_out_set, logical_buffer));
+        buffers_defined_by_instruction_.at(instruction).push_back(buffer->id);
+        for (const HloInstruction* user : buffer->users) {
+          buffers_used_by_instruction_.at(user).push_back(buffer->id);
+        }
       }
-      remaining_uses_.at(operand).push_back(remat_instruction);
+
+      logical_buffer_to_buffer_id[logical_buffer] = buffer->id;
     }
+  }
+  XLA_VLOG_LINES(10, ToString());
+  DCHECK(Check());
+}
+
+Status MemoryUsageTracker::BeginInstruction(const HloInstruction* instruction) {
+  VLOG(3) << "BeginInstruction " << instruction->name();
+  TF_RET_CHECK(in_progress_instruction_ == nullptr);
+  in_progress_instruction_ = instruction;
+
+  placed_instructions_.insert(in_progress_instruction_);
 
-    VLOG(3) << "  memory usage = " << memory_usage_;
-    VLOG(10) << ToString();
-    return Status::OK();
+  // All buffers defined by this instruction need memory.
+  for (BufferId buffer_id : buffers_defined_by_instruction_.at(instruction)) {
+    VLOG(3) << "  Buffer " << buffers_.at(buffer_id).ToString()
+            << " is now live.";
+    memory_usage_ += AllocatedSize(buffer_id);
   }
 
-  // Returns the number of bytes that the current memory usage will be reduced
-  // if the given instruction is rematerialized.
-  int64 MemoryReducedIfRematerialized(const HloInstruction* instruction) const {
-    // To reduce memory consumption 'instruction' must be currently live and
-    // rematerialization must make 'instruction' not live.
-    if (IsLiveIn(instruction) || IsLiveOut(instruction) ||
-        !IsCurrentlyLive(instruction)) {
-      return 0;
-    }
+  // TODO(b/37686934): Elementwise instructions can share the buffer of a (dead)
+  // operand. Account for this potential reuse here.
 
-    // If the in-progress instruction is a user of 'instruction' (or
-    // 'instruction' itself) then rematerializing 'instruction' cannot reduce
-    // memory usage because the value is required to be live at this program
-    // point.
-    if (in_progress_instruction_ == instruction ||
-        in_progress_instruction_->IsUserOf(instruction)) {
-      return 0;
-    }
+  VLOG(3) << "  memory usage = " << memory_usage_;
+  VLOG(10) << ToString();
 
-    // Compute the amount of memory reduced (if any) by rematerializing
-    // 'instruction'. 'instruction' will no longer be live at this program
-    // point, so initially set memory_reduced to the size of its output value.
-    int64 memory_reduced = TotalSizeBytes(instruction->shape());
+  DCHECK(Check());
+  return Status::OK();
+}
 
-    // Account for any operands whose live range must be extended across this
-    // program point.
-    for (const HloInstruction* operand : UniqueOperands(instruction)) {
-      if (!IsCurrentlyLive(operand)) {
-        // This operand of candidate is not live at this program
-        // point. Rematerializing 'instruction' will extend the operand's live
-        // range across this program point.
-        memory_reduced -= TotalSizeBytes(operand->shape());
-      }
+Status MemoryUsageTracker::EndInstruction() {
+  TF_RET_CHECK(in_progress_instruction_ != nullptr);
+  VLOG(3) << "EndInstruction " << in_progress_instruction_->name();
+
+  for (BufferId buffer_id :
+       buffers_used_by_instruction_.at(in_progress_instruction_)) {
+    Buffer& buffer = buffers_.at(buffer_id);
+    buffer.unfinished_user_count--;
+    CHECK_GE(buffer.unfinished_user_count, 0)
+        << buffer.ToString() << " has negative unfinished use count.";
+    if (buffer.unfinished_user_count == 0) {
+      // Buffer is now dead.
+      VLOG(3) << "  " << buffer.ToString() << " is now dead.";
+      memory_usage_ -= AllocatedSize(buffer_id);
+      CHECK_GE(memory_usage_, 0);
     }
-    return memory_reduced;
   }
 
-  // Returns the remaining unplaced uses of the given instruction.
-  const std::vector<HloInstruction*>& RemainingUses(
-      const HloInstruction* instruction) const {
-    return remaining_uses_.at(instruction);
+  // If any buffer defined by this instruction has no uses, then memory can be
+  // reclaimed immediately.
+  for (BufferId buffer_id :
+       buffers_defined_by_instruction_.at(in_progress_instruction_)) {
+    const Buffer& buffer = buffers_.at(buffer_id);
+    if (buffer.unfinished_user_count == 0) {
+      VLOG(3) << "  " << buffer.ToString() << " is immediately dead.";
+      memory_usage_ -= AllocatedSize(buffer_id);
+      CHECK_GE(memory_usage_, 0);
+    }
   }
 
-  // Returns whether the given instruction has been placed (BeginInstruction has
-  // been called with 'instruction' as the argument).
-  bool IsPlaced(const HloInstruction* instruction) const {
-    return ContainsKey(remaining_uses_, instruction);
+  in_progress_instruction_ = nullptr;
+
+  VLOG(3) << "  memory usage = " << memory_usage_;
+  VLOG(10) << ToString();
+
+  DCHECK(Check());
+
+  return Status::OK();
+}
+
+int64 MemoryUsageTracker::MemoryReducedIfRematerialized(
+    const HloInstruction* instruction) const {
+  CHECK_NE(in_progress_instruction_, nullptr);
+  if (!IsPlaced(instruction) || instruction == in_progress_instruction_) {
+    return 0;
   }
 
-  // Returns whether the given instruction is live at the current program point.
-  bool IsCurrentlyLive(const HloInstruction* instruction) const {
-    return (!IsPlaced(instruction) && IsLiveIn(instruction)) ||
-           (IsPlaced(instruction) &&
-            (!RemainingUses(instruction).empty() || IsLiveOut(instruction)));
+  // TODO(b/37687140): Rematerialization can increase peak memory consumption at
+  // an earlier point in the program if rematerialization extends the live range
+  // of the operand of the instruction being rematerialized across the live
+  // range of the value of instruction being rematerialized. Don't rematerialize
+  // in this case (ie, return 0 here).
+
+  // Compute the amount of memory reduced (if any) by rematerializing
+  // 'instruction'. The LogicalBuffers defined by 'instruction' will no longer
+  // be live at this program point, so initially set memory_reduced to the
+  // size of its defined values.
+  int64 memory_reduced = 0;
+  for (BufferId buffer_id : buffers_defined_by_instruction_.at(instruction)) {
+    // Avoid rematerializing instructions with indirect uses as it is difficult
+    // to reason about liveness after rematerializing the instruction.
+    // TODO(b/37714814): Consider rematerialzing instructions with indirect
+    // uses.
+    if (buffers_.at(buffer_id).has_indirect_uses) {
+      return 0;
+    }
+
+    if (IsCurrentlyLive(buffer_id) && !IsInUse(buffer_id)) {
+      memory_reduced += AllocatedSize(buffer_id);
+    }
   }
 
-  string ToString() const {
-    string output = tensorflow::strings::StrCat("MemoryUsageTracker for ",
-                                                computation_->name(), "\n");
-    tensorflow::strings::StrAppend(&output, "memory usage = ", memory_usage(),
-                                   "\n");
-    tensorflow::strings::StrAppend(&output, "Live values:\n");
-    for (const auto& pair : remaining_uses_) {
-      const HloInstruction* instruction = pair.first;
-      const std::vector<HloInstruction*>& uses = pair.second;
-      tensorflow::strings::StrAppend(
-          &output, "  ", instruction->name(), "; remaining uses: ",
-          tensorflow::str_util::Join(uses, ", ",
-                                     [](string* out, HloInstruction* use) {
-                                       tensorflow::strings::StrAppend(
-                                           out, use->name());
-                                     }),
-          "\n");
+  // Account for any logical buffers whose live range must be extended across
+  // this program point.
+  for (BufferId buffer_id : buffers_used_by_instruction_.at(instruction)) {
+    if (!IsCurrentlyLive(buffer_id)) {
+      // This logical buffer is used by 'instruction' but is not live at this
+      // program point. Rematerializing 'instruction' will extend the buffer's
+      // live range across this program point.
+      memory_reduced -= AllocatedSize(buffer_id);
     }
-    return output;
   }
 
-  // Returns the current memory usage. This is the sum of sizes of all live
-  // values.
-  int64 memory_usage() const { return memory_usage_; }
+  return memory_reduced;
+}
 
-  // Returns the current instruction being placed.
-  const HloInstruction* in_progress_instruction() const {
-    return in_progress_instruction_;
-  }
+Status MemoryUsageTracker::AddRematerializedInstruction(
+    HloInstruction* original_instruction, HloInstruction* remat_instruction) {
+  VLOG(3) << "AddRematerializedInstruction: original_instruction = "
+          << original_instruction->name()
+          << ", remat_instruction = " << remat_instruction->name();
+
+  TF_RET_CHECK(in_progress_instruction_ != nullptr);
+  TF_RET_CHECK(IsPlaced(original_instruction));
+  TF_RET_CHECK(!IsPlaced(remat_instruction));
+  CHECK(!ContainsKey(buffers_defined_by_instruction_, remat_instruction));
+  CHECK(!ContainsKey(buffers_used_by_instruction_, remat_instruction));
+
+  // Construct the list of buffers used and defined by the rematerialization.
+  buffers_defined_by_instruction_[remat_instruction];
+  buffers_used_by_instruction_[remat_instruction] =
+      buffers_used_by_instruction_.at(original_instruction);
+
+  // Account for the additional buffer uses created by the new rematerialization
+  // instruction. Update memory usage if the rematerialization makes a dead
+  // buffer live again.
+  for (BufferId buffer_id :
+       buffers_used_by_instruction_.at(original_instruction)) {
+    Buffer& buffer = buffers_.at(buffer_id);
+    if (buffer.unfinished_user_count == 0) {
+      // Buffer used by this instruction was dead, now is alive.
+      memory_usage_ += AllocatedSize(buffer.id);
+    }
 
- private:
-  // Returns the total size of the shape (including nested elements) in bytes.
-  int64 TotalSizeBytes(const Shape& shape) const {
-    int64 total_size = 0;
-    ShapeUtil::ForEachSubshape(
-        shape,
-        [this, &total_size](const Shape& subshape,
-                            const ShapeIndex& /*index*/) {
-          total_size += size_function_(subshape);
-          return Status::OK();
-        })
-        .IgnoreError();
-    return total_size;
+    buffer.unfinished_user_count++;
+    buffer.users.push_back(remat_instruction);
   }
 
-  // Returns true if the value of given instruction is live into the
-  // computation.
-  bool IsLiveIn(const HloInstruction* instruction) const {
-    return instruction->opcode() == HloOpcode::kConstant ||
-           instruction->opcode() == HloOpcode::kParameter;
+  // Create a new set of Buffers defined by the new rematerialization
+  // instruction. Update the internal data structures and memory use to account
+  // for them.
+  for (BufferId old_buffer_id :
+       buffers_defined_by_instruction_.at(original_instruction)) {
+    Buffer& old_buffer = buffers_.at(old_buffer_id);
+
+    std::vector<const HloInstruction*> placed_users;
+    std::vector<const HloInstruction*> unplaced_users;
+    for (const HloInstruction* user : old_buffer.users) {
+      if (IsPlaced(user)) {
+        CHECK(IsFinished(user));
+        placed_users.push_back(user);
+      } else {
+        unplaced_users.push_back(user);
+      }
+    }
+    old_buffer.users = std::move(placed_users);
+    old_buffer.unfinished_user_count = 0;
+
+    // Buffer is now dead.
+    memory_usage_ -= AllocatedSize(old_buffer.id);
+
+    Buffer& new_buffer = RematerializeBuffer(old_buffer, remat_instruction,
+                                             std::move(unplaced_users));
+
+    buffers_defined_by_instruction_.at(remat_instruction)
+        .push_back(new_buffer.id);
+    for (const HloInstruction* user : new_buffer.users) {
+      std::vector<BufferId>& buffers_used =
+          buffers_used_by_instruction_.at(user);
+      std::replace(buffers_used.begin(), buffers_used.end(), old_buffer_id,
+                   new_buffer.id);
+    }
   }
 
-  // Returns true if the value of given instruction is live out of the
-  // computation.
-  bool IsLiveOut(const HloInstruction* instruction) const {
-    return instruction->opcode() == HloOpcode::kConstant ||
-           instruction->opcode() == HloOpcode::kParameter ||
-           instruction == instruction->parent()->root_instruction();
+  VLOG(3) << "  memory usage = " << memory_usage_;
+  XLA_VLOG_LINES(10, ToString());
+
+  DCHECK(Check());
+
+  return Status::OK();
+}
+
+string MemoryUsageTracker::ToString() const {
+  string output = tensorflow::strings::StrCat("MemoryUsageTracker for ",
+                                              computation_->name(), "\n");
+  tensorflow::strings::StrAppend(
+      &output, "Memory usage: ", HumanReadableNumBytes(memory_usage()), " (",
+      memory_usage(), " bytes)");
+  for (const HloInstruction* instruction : instruction_list_.instructions()) {
+    string inprogress =
+        instruction == in_progress_instruction_ ? " in-progress" : "";
+    string placed = IsPlaced(instruction) ? " placed" : "";
+    tensorflow::strings::StrAppend(&output, "  ", instruction->name(),
+                                   inprogress, placed, "\n    Defines:\n");
+    for (BufferId buffer_id : buffers_defined_by_instruction_.at(instruction)) {
+      const Buffer& buffer = buffers_[buffer_id];
+      string live = IsCurrentlyLive(buffer_id) ? " live" : "";
+      tensorflow::strings::StrAppend(&output, "      ", buffer.ToString(), live,
+                                     ", ", buffer.unfinished_user_count,
+                                     " unfinished uses\n");
+    }
+    tensorflow::strings::StrAppend(&output, "    Uses:\n");
+    for (BufferId buffer_id : buffers_used_by_instruction_.at(instruction)) {
+      tensorflow::strings::StrAppend(&output, "      ",
+                                     buffers_[buffer_id].ToString(), "\n");
+    }
   }
+  return output;
+}
 
-  const HloComputation* computation_;
+bool MemoryUsageTracker::Check() const {
+  auto elements_are_unique = [](const std::vector<BufferId>& vec) {
+    return vec.size() == std::set<BufferId>(vec.begin(), vec.end()).size();
+  };
+
+  // Verify buffers_defined_by_instruction_.
+  for (auto& instruction : computation_->instructions()) {
+    const std::vector<BufferId>& defined_buffers =
+        buffers_defined_by_instruction_.at(instruction.get());
+    CHECK(elements_are_unique(defined_buffers))
+        << "Instruction " << instruction->name()
+        << " does not have unique defined buffers: "
+        << tensorflow::str_util::Join(
+               defined_buffers, ", ", [this](string* out, BufferId buffer_id) {
+                 tensorflow::strings::StrAppend(
+                     out, buffers_.at(buffer_id).ToString());
+               });
 
-  // Function which computes the size of the top-level buffer of a shape.
-  const HloRematerialization::ShapeSizeFunction size_function_;
+    for (const Buffer& buffer : buffers_) {
+      if (buffer.defining_instruction == instruction.get()) {
+        CHECK(std::find(defined_buffers.begin(), defined_buffers.end(),
+                        buffer.id) != defined_buffers.end())
+            << "Instruction " << instruction->name()
+            << " defined buffers is missing: " << buffer.ToString();
+      }
+    }
+  }
 
-  // Memory usage at the currently placed instruction.
-  int64 memory_usage_ = 0;
+  // Verify buffers_used_by_instruction_.
+  for (auto& instruction : computation_->instructions()) {
+    const std::vector<BufferId>& used_buffers =
+        buffers_used_by_instruction_.at(instruction.get());
+    CHECK(elements_are_unique(used_buffers))
+        << "Instruction " << instruction->name()
+        << " does not have unique used buffers: "
+        << tensorflow::str_util::Join(
+               used_buffers, ", ", [this](string* out, BufferId buffer_id) {
+                 tensorflow::strings::StrAppend(
+                     out, buffers_.at(buffer_id).ToString());
+               });
+  }
+  for (const Buffer& buffer : buffers_) {
+    int64 unfinished_uses = 0;
+    for (const HloInstruction* user : buffer.users) {
+      const std::vector<BufferId>& used_buffers =
+          buffers_used_by_instruction_.at(user);
+      CHECK(std::find(used_buffers.begin(), used_buffers.end(), buffer.id) !=
+            used_buffers.end())
+          << "Instruction " << user->name() << " used buffers is missing "
+          << buffer.ToString();
+      if (!IsFinished(user)) {
+        unfinished_uses++;
+      }
+    }
+    CHECK_EQ(buffer.unfinished_user_count, unfinished_uses)
+        << "Incorrect unplaced use count for " << buffer.ToString();
+  }
 
-  // The instruction currently being placed. This value is non-null only between
-  // the calling of BeginInstruction and EndInstruction.
-  const HloInstruction* in_progress_instruction_ = nullptr;
+  // Verify live set size against memory_usage_.
+  int64 live_size = 0;
+  for (const Buffer& buffer : buffers_) {
+    // The while instruction reuses its input buffers as output buffers so
+    // don't double count its buffers if it is currently executing.
+    if (IsCurrentlyLive(buffer.id) &&
+        !(buffer.defining_instruction == in_progress_instruction_ &&
+          in_progress_instruction_->opcode() == HloOpcode::kWhile)) {
+      live_size += AllocatedSize(buffer.id);
+    }
+  }
+  CHECK_EQ(live_size, memory_usage_);
 
-  // remaining_uses is a vector of uses of the HLO instruction's value which
-  // have not yet been visited by in the rematerialization loop. Use to track
-  // liveness of HLO instructions.
-  // TODO(b/35212854): Track values using logical buffers rather than HLO
-  // instructions. Using HLO instructions over-estimates memory usage because
-  // buffer aliasing is ignored.
-  tensorflow::gtl::FlatMap<const HloInstruction*, std::vector<HloInstruction*>>
-      remaining_uses_;
-};
+  return true;
+}
 
-// Computes and returns the cost of rematerializing the given instruction. Cost
-// per rematerialized instruction is defined as:
+// Computes and returns the cost of rematerializing the given instruction.
+// Cost per rematerialized instruction is defined as:
 //
 // (flop_count + transcendental_count + element_count) / memory_reduced
 //
@@ -425,33 +804,36 @@ class MemoryUsageTracker {
 //     instruction.
 //
 // This is a rough estimate of the extra execution time per byte saved by
-// rematerializing this instruction for its remaining uses. In general, we want
-// the most memory saving for the least latency penalty which is captured by
-// this heuristic.
+// rematerializing this instruction for its remaining uses. In general, we
+// want the most memory saving for the least latency penalty which is captured
+// by this heuristic.
 int64 RematerializationCost(const HloInstruction* instruction,
                             const MemoryUsageTracker& memory_tracker,
                             const HloCostAnalysis& cost_analysis,
                             int64 memory_reduced) {
-  const int64 bytes_accessed = cost_analysis.bytes_accessed(*instruction);
-  const int64 elements_accessed =
-      bytes_accessed /
-      ShapeUtil::ByteSizeOfPrimitiveType(instruction->shape().element_type());
-
-  // A duplicate of the rematerialized instruction will be created at each
-  // remaining use.
-  int64 duplication = memory_tracker.RemainingUses(instruction).size();
-  if (duplication == instruction->users().size()) {
-    // All remaining uses of instruction are after this point so we can remove
-    // the original instruciton after rematerialization.
-    duplication -= 1;
+  // If none of the users of 'instruction' have been placed in the sequence (as
+  // tracked by memory_tracker), then rematerialization of 'instruction' is a
+  // zero-cost move of 'instruction' in the sequence.
+  if (!std::any_of(instruction->users().begin(), instruction->users().end(),
+                   [&memory_tracker](const HloInstruction* inst) {
+                     return memory_tracker.IsPlaced(inst);
+                   })) {
+    return 0;
   }
+
   CHECK_GT(memory_reduced, 0);
+  const int64 bytes_accessed = cost_analysis.bytes_accessed(*instruction);
+  const int64 elements_accessed =
+      ShapeUtil::IsTuple(instruction->shape())
+          ? bytes_accessed
+          : bytes_accessed / ShapeUtil::ByteSizeOfPrimitiveType(
+                                 instruction->shape().element_type());
 
   // Multiply by 256 to improve precision of cost. Without this factor,
   // many instructions such as many elementwise instructions would have
   // zero cost because the bytes reduced can be several times greater than
   // the element count.
-  return 256 * duplication *
+  return 256 *
          (cost_analysis.flop_count(*instruction) +
           cost_analysis.transcendental_count(*instruction) +
           elements_accessed) /
@@ -467,7 +849,7 @@ HloInstruction* PickRematerializationCandidate(
     const MemoryUsageTracker& memory_tracker,
     const InstructionList& instruction_list,
     const HloCostAnalysis& cost_analysis,
-    const tensorflow::gtl::FlatSet<const HloInstruction*>& remat_instructions) {
+    const tensorflow::gtl::FlatSet<const HloInstruction*>& blacklist) {
   HloInstruction* best = nullptr;
   int64 best_cost = 0;
 
@@ -482,11 +864,11 @@ HloInstruction* PickRematerializationCandidate(
     }
     VLOG(5) << "considering rematerialization candidate " << candidate->name();
 
-    if (ContainsKey(remat_instructions, candidate)) {
-      // Skip instructions which are rematerialization clones to avoid infinite
-      // loops of rematerializing the same instruction(s) repeatedly.
+    if (ContainsKey(blacklist, candidate)) {
+      // Skip instructions on the blacklist to avoid infinite loops of
+      // rematerializing the same instruction(s) repeatedly.
       VLOG(5) << "candidate " << candidate->name()
-              << " not viable: is a rematerialized instruction";
+              << " is excluded from rematerialization";
       continue;
     }
 
@@ -525,7 +907,9 @@ HloInstruction* PickRematerializationCandidate(
 StatusOr<int64> HloRematerialization::ComputePeakMemory(
     const HloComputation* computation,
     const std::vector<const HloInstruction*>& order) const {
-  MemoryUsageTracker tracker(computation, size_function_);
+  InstructionList instruction_list(order);
+  MemoryUsageTracker tracker(computation, size_function_, *points_to_analysis_,
+                             instruction_list);
   int64 peak_memory = tracker.memory_usage();
   for (const HloInstruction* instruction : order) {
     TF_RETURN_IF_ERROR(tracker.BeginInstruction(instruction));
@@ -564,15 +948,24 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
           << " with limit " << HumanReadableNumBytes(memory_limit_bytes);
   VLOG(1) << "peak memory usage is "
           << HumanReadableNumBytes(computation_peak_memory_.at(computation));
+  CHECK(!ContainsKey(rematerialized_computations_, computation));
 
   InstructionList instruction_list(sequence->at(computation));
-  MemoryUsageTracker memory_tracker(computation, size_function_);
+  MemoryUsageTracker memory_tracker(computation, size_function_,
+                                    *points_to_analysis_, instruction_list);
   bool changed = false;
 
-  // Set of instruction clones (not the originals) created during
-  // rematerialization. A record is kept to avoid rematerializing an instruction
-  // more than once to avoid looping infinitely during rematerialization.
-  tensorflow::gtl::FlatSet<const HloInstruction*> remat_instructions;
+  // To avoid an infinite loop rematerializing the same set of instructions ad
+  // infinitum, keep a blacklist of instructions which should not be
+  // rematerialized.
+  tensorflow::gtl::FlatSet<const HloInstruction*> blacklist;
+
+  // If the rematerialization makes the source instruction dead, then the
+  // rematerialization is added to 'remat_move_instructions' (the
+  // rematerialization is essentially a move). If the next rematerialization of
+  // the instruction is also a move then the rematerialization is added to the
+  // blacklist.
+  tensorflow::gtl::FlatSet<const HloInstruction*> remat_move_instructions;
 
   // The peak memory of the computation at any point in the instruction
   // sequence.
@@ -590,6 +983,7 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
   // Iterate through all instructions in the sequence. At each instruction
   // (program point) if memory_usage exceeds the specified limit then
   // rematerialize HLO instructions until memory_usage is reduced.
+  int64 instruction_index = 0;
   for (auto list_it = instruction_list.instructions().begin();
        list_it != instruction_list.instructions().end(); ++list_it) {
     HloInstruction* instruction = *list_it;
@@ -599,7 +993,9 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
 
     VLOG(2) << "Program point at " << instruction->name()
             << ", memory usage = " << memory_tracker.memory_usage()
-            << ", callee usage = " << callee_usage;
+            << ", callee usage = " << callee_usage << ", [" << instruction_index
+            << "/" << instruction_list.instructions().size() << "]";
+    instruction_index++;
 
     while (memory_tracker.memory_usage() + callee_usage > memory_limit_bytes) {
       VLOG(2) << "Over memory limit at instruction " << instruction->name()
@@ -609,7 +1005,7 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
               << ", limit is " << HumanReadableNumBytes(memory_limit_bytes);
 
       HloInstruction* best = PickRematerializationCandidate(
-          memory_tracker, instruction_list, cost_analysis_, remat_instructions);
+          memory_tracker, instruction_list, cost_analysis_, blacklist);
 
       if (best == nullptr) {
         VLOG(3) << "Unable to find rematerialization candidate at program "
@@ -620,44 +1016,42 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
         break;
       }
 
-      VLOG(1) << "Rematerializing instruction " << best->name();
+      VLOG(1) << "Rematerializing instruction " << best->name() << " (saving "
+              << memory_tracker.MemoryReducedIfRematerialized(best) << ")";
       changed = true;
       remat_count++;
 
-      // Create a rematerialized copy of the candidate at each remaining use.
-      // Make a copy of remaining uses because RematerializeInstructionForUse
-      // modifies the remaining uses vector in memory_tracker.
-      // TODO(b/35213652): It may be profitable to share one rematerialized copy
-      // amongst more than one use.
-      std::vector<HloInstruction*> remaining_uses_copy =
-          memory_tracker.RemainingUses(best);
-      for (HloInstruction* use : remaining_uses_copy) {
-        // Create a new rematerialized instruction in the HLO graph.
-        HloInstruction* remat =
-            computation->AddInstruction(best->Clone(/*suffix=*/"remat"));
-
-        VLOG(3) << "Replacing use of " << best->name() << " in " << use->name()
-                << " with rematerialization " << remat->name();
-
-        TF_RETURN_IF_ERROR(best->ReplaceUseWith(use, remat));
-
-        // Account for the rematerialization in the memory tracker.
-        TF_RETURN_IF_ERROR(
-            memory_tracker.RematerializeInstructionForUse(best, remat, use));
+      HloInstruction* remat =
+          computation->AddInstruction(best->Clone(/*suffix=*/"remat"));
 
-        // Insert rematerialized instruction right before its use.
-        TF_RETURN_IF_ERROR(instruction_list.InsertBefore(remat, use));
-
-        // Add rematerialized instruction to remat_instructions so the
-        // rematerialized instruction is not rematerialized again.
-        remat_instructions.insert(remat);
-
-        net_instructions_added++;
+      // Replace each remaining use of 'best' with the rematerialization.
+      std::vector<HloInstruction*> best_users_copy = best->users();
+      for (HloInstruction* user : best_users_copy) {
+        if (!memory_tracker.IsPlaced(user)) {
+          VLOG(2) << "  Replacing use of " << best->name() << " in "
+                  << user->name() << " with " << remat->name();
+          TF_RETURN_IF_ERROR(best->ReplaceUseWith(user, remat));
+        }
       }
 
-      // Original instruction should no longer be live at this point. All
-      // of its remaining uses are fed by rematerialized instructions.
-      TF_RET_CHECK(!memory_tracker.IsCurrentlyLive(best));
+      // Account for the rematerialization in the memory tracker.
+      TF_RETURN_IF_ERROR(
+          memory_tracker.AddRematerializedInstruction(best, remat));
+
+      // Insert rematerialized instruction right before the earliest unplaced
+      // use of the instruction *and* the earliest unplaced last use of any
+      // operands of remat. Unplaced uses of the remat's operands are included
+      // because we don't want to extend the live range of remat's operands as
+      // this could increase memory usage.
+      std::vector<HloInstruction*> place_before = remat->users();
+      for (auto* operand : remat->operands()) {
+        for (auto* operand_user : operand->users()) {
+          if (!memory_tracker.IsPlaced(operand_user) && operand_user != remat) {
+            place_before.push_back(operand_user);
+          }
+        }
+      }
+      instruction_list.InsertBeforeInstructions(remat, place_before);
 
       // If the rematerialized instruction is dead then rematerialization is
       // essentially a move. Don't delete the instruction now because we don't
@@ -665,8 +1059,17 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
       // transformation because we keep maps with HloInstruction* values as
       // keys.
       if (best->users().empty()) {
-        VLOG(3) << best->name() << " is now dead";
-        net_instructions_added--;
+        VLOG(2) << best->name() << " is now dead";
+        if (ContainsKey(remat_move_instructions, best)) {
+          // Previously, 'best' was a rematerialization which killed the
+          // instruction it was a copying of. Now 'remat' is a rematerialization
+          // of 'best' and kills 'best'. Stop rematerializing this instruction
+          // to avoid an infinite loop.
+          blacklist.insert(remat);
+        }
+        remat_move_instructions.insert(remat);
+      } else {
+        net_instructions_added++;
       }
 
       VLOG(3) << "memory_usage after rematerialization = "
@@ -687,21 +1090,22 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
 
       // Recompute callee usage to account for any rematerialization performed
       // in the callee computations.
-      callee_usage = 0;
       for (HloComputation* called_computation :
            callsite->called_computations()) {
-        // Memory limit for the subcomputation is the memory limit less the
-        // amount of memory used at this point in the computation.
-        int64 subcomputation_memory_limit_bytes = std::max<int64>(
-            0, memory_limit_bytes - memory_tracker.memory_usage());
-        TF_ASSIGN_OR_RETURN(
-            bool subcomputation_changed,
-            RematerializeComputation(called_computation, sequence,
-                                     subcomputation_memory_limit_bytes));
-        changed |= subcomputation_changed;
-
-        callee_usage += computation_peak_memory_.at(called_computation);
+        if (!ContainsKey(rematerialized_computations_, called_computation)) {
+          // Memory limit for the subcomputation is the memory limit less the
+          // amount of memory used at this point in the computation.
+          int64 subcomputation_memory_limit_bytes = std::max<int64>(
+              0, memory_limit_bytes - memory_tracker.memory_usage());
+          TF_ASSIGN_OR_RETURN(
+              bool subcomputation_changed,
+              RematerializeComputation(called_computation, sequence,
+                                       subcomputation_memory_limit_bytes));
+          changed |= subcomputation_changed;
+        }
       }
+      TF_ASSIGN_OR_RETURN(callee_usage,
+                          CalledComputationsMemoryUsage(instruction));
     }
 
     peak_memory = std::max<int64>(peak_memory,
@@ -711,37 +1115,33 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
     TF_RETURN_IF_ERROR(memory_tracker.EndInstruction());
   }
 
-  if (peak_memory > memory_limit_bytes) {
-    LOG(WARNING) << "Can't reduce memory use of computation "
-                 << computation->name() << " below "
-                 << HumanReadableNumBytes(memory_limit_bytes)
-                 << " by rematerialization (only reduced to "
-                 << HumanReadableNumBytes(peak_memory) << ")";
-  }
-
-  // Verify that there are no more remaining uses.
+  // Verify some invariants on the memory tracker.
+  CHECK_EQ(memory_tracker.memory_usage(), 0);
   for (auto& instruction : computation->instructions()) {
-    auto& remaining_uses = memory_tracker.RemainingUses(instruction.get());
-    CHECK(remaining_uses.empty())
-        << instruction->name() << " has remaining uses: "
-        << tensorflow::str_util::Join(
-               remaining_uses, ", ", [](string* out, HloInstruction* inst) {
-                 tensorflow::strings::StrAppend(out, inst->name());
-               });
+    CHECK(memory_tracker.IsPlaced(instruction.get()));
   }
 
-  VLOG(1) << "Rematerialized " << remat_count << " instructions; "
-          << net_instructions_added << " net instructions added";
-  VLOG(1) << "peak memory usage now " << HumanReadableNumBytes(peak_memory);
+  VLOG(1) << "In computation " << computation->name() << " rematerialized "
+          << remat_count << " instructions; " << net_instructions_added
+          << " net instructions added";
+  VLOG(1) << "  peak memory usage now " << HumanReadableNumBytes(peak_memory)
+          << " (was "
+          << HumanReadableNumBytes(computation_peak_memory_.at(computation))
+          << ")";
 
   // Update peak memory used by computation.
-  computation_peak_memory_[computation] = peak_memory;
+  computation_peak_memory_.at(computation) = peak_memory;
 
   // Update order to include rematerialized instructions.
   sequence->at(computation)
       .assign(instruction_list.instructions().begin(),
               instruction_list.instructions().end());
 
+  rematerialized_computations_.insert(computation);
+
+  instructions_rematerialized_ += remat_count;
+  net_instructions_added_ += net_instructions_added;
+
   return changed;
 }
 
@@ -754,6 +1154,33 @@ StatusOr<bool> HloRematerialization::Run(
   VLOG(1) << "HloRematerialization() with memory limit of "
           << HumanReadableNumBytes(memory_limit_bytes);
 
+  TF_ASSIGN_OR_RETURN(points_to_analysis_,
+                      TuplePointsToAnalysis::Run(
+                          module, /*include_loop_fusion_instructions=*/true));
+
+  // Adjust memory limit to account for the parameter and output of the entry
+  // computation. This is necessary because the per-computation accounting in
+  // MemoryUsageTracker do not include parameters and output as these are
+  // typically allocated by the caller. With this adjustment the memory limit
+  // accounts for the size of all HLO instructions (parameters, output
+  // instructions, etc).
+  auto total_size = [this](const HloInstruction* instruction) {
+    int64 total_size = 0;
+    for (const LogicalBuffer* logical_buffer :
+         points_to_analysis_->GetBuffersDefinedByInstruction(instruction)) {
+      total_size += size_function_(logical_buffer->shape());
+    }
+    return total_size;
+  };
+  const HloComputation* entry_computation = module->entry_computation();
+  memory_limit_bytes -= total_size(entry_computation->root_instruction());
+  for (const HloInstruction* param :
+       entry_computation->parameter_instructions()) {
+    memory_limit_bytes -= total_size(param);
+  }
+  VLOG(1) << "Adjusted memory limit accounting for parameters and output: "
+          << HumanReadableNumBytes(memory_limit_bytes);
+
   XLA_VLOG_LINES(3, "Before HloRematerialization:\n" + module->ToString());
   // Create initial sequence of HLO instructions.
   TF_ASSIGN_OR_RETURN(*sequence,
@@ -761,7 +1188,6 @@ StatusOr<bool> HloRematerialization::Run(
                           *module, [this](const LogicalBuffer& buffer) {
                             return size_function_(buffer.shape());
                           }));
-
   // Compute peak memory usage of all computations in the module called in a
   // sequential context.
   TF_ASSIGN_OR_RETURN(call_graph_, CallGraph::Build(module));
@@ -776,9 +1202,10 @@ StatusOr<bool> HloRematerialization::Run(
         return Status::OK();
       }));
 
+  const int64 before_peak_memory =
+      computation_peak_memory_.at(module->entry_computation());
   VLOG(1) << "Peak memory usage of module (before): "
-          << HumanReadableNumBytes(
-                 computation_peak_memory_[module->entry_computation()]);
+          << HumanReadableNumBytes(before_peak_memory);
 
   // Run cost analysis. Operation cost is used in the heuristic for selecting
   // instructions for rematerialization.
@@ -824,19 +1251,37 @@ StatusOr<bool> HloRematerialization::Run(
                    computation->instruction_count());
     }
   }
-
-  VLOG(1) << "Peak memory usage of module (after): "
-          << HumanReadableNumBytes(
-                 computation_peak_memory_[module->entry_computation()]);
+  VLOG(1) << "Rematerialized " << instructions_rematerialized_
+          << " instructions in module " << module->name() << "; "
+          << net_instructions_added_ << " net instructions added";
+  const int64 current_peak_memory =
+      computation_peak_memory_.at(module->entry_computation());
+  VLOG(1) << "Peak memory usage of module now "
+          << HumanReadableNumBytes(current_peak_memory) << " ("
+          << current_peak_memory << " bytes), was "
+          << HumanReadableNumBytes(before_peak_memory) << " ("
+          << before_peak_memory << " bytes)";
+  const int64 reduced_peak_memory = before_peak_memory - current_peak_memory;
+  VLOG(1) << "Reduced peak memory by "
+          << HumanReadableNumBytes(reduced_peak_memory) << " ("
+          << reduced_peak_memory << " bytes)";
 
   XLA_VLOG_LINES(3, "After HloRematerialization:\n" + module->ToString());
 
+  if (current_peak_memory > memory_limit_bytes) {
+    LOG(WARNING) << "Can't reduce memory use below "
+                 << HumanReadableNumBytes(memory_limit_bytes)
+                 << " by rematerialization (only reduced to "
+                 << HumanReadableNumBytes(current_peak_memory) << ")";
+  }
+
   return changed;
 }
 
 /* static */ StatusOr<bool> HloRematerialization::RematerializeAndSchedule(
-    const ShapeSizeFunction& size_function, int64 memory_limit_bytes,
-    HloModule* hlo_module, SequentialHloOrdering::HloModuleSequence* sequence) {
+    const HloRematerialization::ShapeSizeFunction& size_function,
+    int64 memory_limit_bytes, HloModule* hlo_module,
+    SequentialHloOrdering::HloModuleSequence* sequence) {
   HloRematerialization remat(size_function);
   return remat.Run(hlo_module, sequence, memory_limit_bytes);
 }
diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization.h b/tensorflow/compiler/xla/service/hlo_rematerialization.h
index 86e1998b89..1693f93183 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization.h
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization.h
@@ -21,6 +21,7 @@
 #include "tensorflow/compiler/xla/service/hlo_cost_analysis.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
+#include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 
 namespace xla {
 
@@ -108,6 +109,23 @@ class HloRematerialization {
   // occurs.
   tensorflow::gtl::FlatMap<const HloComputation*, int64>
       computation_peak_memory_;
+
+  std::unique_ptr<TuplePointsToAnalysis> points_to_analysis_;
+
+  // Set of computations which have had rematerialization
+  // applied. Rematerialization is only applied once per computation.
+  tensorflow::gtl::FlatSet<const HloComputation*> rematerialized_computations_;
+
+  // Count of the total instructions rematerialized.
+  int64 instructions_rematerialized_ = 0;
+
+  // Count of the net instructions added to the HLO module by
+  // rematerialization. This can be different than instructions_rematerialized_
+  // because some rematerializations are effectively moves in the HLO
+  // schedule. In these cases, the rematerialization instruction replaces all
+  // uses of the original instruction and the original instruction is
+  // dead. Hence, no net instructions were added.
+  int64 net_instructions_added_ = 0;
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc b/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc
index 0a4f277689..82de1c835b 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc
@@ -20,6 +20,7 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/hlo_ordering.h"
 #include "tensorflow/compiler/xla/shape_util.h"
@@ -27,15 +28,17 @@ limitations under the License.
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
-class HloOrderingTest : public HloTestBase {
+class HloRematerializationTest : public HloTestBase {
  protected:
   // Creates and returns a computation which can benefit from
   // rematerialization. The computation looks like:
   //
-  //   F32[1] %param = {...}
+  //   F32[] %param = {...}
   //   F32[1024] %bcast = broadcast(%param)
   //   F32[1024] %negate = negate(%bcast)
   //   F32[2048] %concat_1 = concat({%negate, %negate})
@@ -52,7 +55,7 @@ class HloOrderingTest : public HloTestBase {
       const string& suffix = "") {
     auto builder = HloComputation::Builder(TestName() + suffix);
     auto param = builder.AddInstruction(
-        HloInstruction::CreateParameter(0, vec1_shape_, "param"));
+        HloInstruction::CreateParameter(0, scalar_shape_, "param"));
     auto bcast = builder.AddInstruction(
         HloInstruction::CreateBroadcast(vec1024_shape_, param, {}));
     auto negate = builder.AddInstruction(
@@ -77,7 +80,7 @@ class HloOrderingTest : public HloTestBase {
   // Creates and returns a computation which includes a while and can benefit
   // from rematerialization. The computation looks like:
   //
-  //   F32[1] %param = {...}
+  //   F32[] %param = {...}
   //   F32[1024] %bcast = broadcast(%param)
   //   F32[1] %slice_1 = slice(%bcast, {0:1})
   //   F32[1] %while = while(%slice_1, while_body, while_cond)
@@ -93,7 +96,7 @@ class HloOrderingTest : public HloTestBase {
       const string& suffix = "") {
     auto builder = HloComputation::Builder(TestName() + suffix);
     auto param = builder.AddInstruction(
-        HloInstruction::CreateParameter(0, vec1_shape_, "param"));
+        HloInstruction::CreateParameter(0, scalar_shape_, "param"));
     auto bcast = builder.AddInstruction(
         HloInstruction::CreateBroadcast(vec1024_shape_, param, {}));
     auto slice_1 = builder.AddInstruction(
@@ -127,13 +130,14 @@ class HloOrderingTest : public HloTestBase {
   }
 
   // Various shapes used in the canned computations.
+  const Shape scalar_shape_ = ShapeUtil::MakeShape(xla::F32, {});
   const Shape vec1_shape_ = ShapeUtil::MakeShape(xla::F32, {1});
   const Shape vec1024_shape_ = ShapeUtil::MakeShape(xla::F32, {1024});
 };
 
 // Test rematerialization of a single computation produced by
 // MakeRematerializableComputation.
-TEST_F(HloOrderingTest, SingleComputation) {
+TEST_F(HloRematerializationTest, SingleComputation) {
   HloModule module(TestName());
   HloComputation* computation =
       module.AddEntryComputation(MakeRematerializableComputation());
@@ -175,7 +179,7 @@ TEST_F(HloOrderingTest, SingleComputation) {
 // Test rematerialization of a single computation produced by
 // MakeRematerializableComputation but with a sufficiently high memory limit
 // such that no instructions are rematerialized.
-TEST_F(HloOrderingTest, SingleComputationNoRematerialization) {
+TEST_F(HloRematerializationTest, SingleComputationNoRematerialization) {
   HloModule module(TestName());
   HloComputation* computation =
       module.AddEntryComputation(MakeRematerializableComputation());
@@ -199,7 +203,7 @@ TEST_F(HloOrderingTest, SingleComputationNoRematerialization) {
 // only one computation needs to have an instruction rematerialized. The entry
 // computation should be the one chosen because rematerialization in the while
 // will presumably be more expensive.
-TEST_F(HloOrderingTest, RematerializeAroundWhile) {
+TEST_F(HloRematerializationTest, RematerializeAroundWhile) {
   HloModule module(TestName());
 
   auto cond_builder = HloComputation::Builder(TestName() + ".cond");
@@ -237,7 +241,7 @@ TEST_F(HloOrderingTest, RematerializeAroundWhile) {
 // Test rematerialization of a computation which calls another computation via a
 // while. Both the entry computation and while body computation should have
 // computations rematerialized.
-TEST_F(HloOrderingTest, RematerializeEntryAndWhileBody) {
+TEST_F(HloRematerializationTest, RematerializeEntryAndWhileBody) {
   HloModule module(TestName());
 
   auto cond_builder = HloComputation::Builder(TestName() + ".cond");
@@ -271,7 +275,7 @@ TEST_F(HloOrderingTest, RematerializeEntryAndWhileBody) {
 
 // Test rematerialization of a doubly nested computation. All computations
 // should have an instruction rematerialized.
-TEST_F(HloOrderingTest, RematerializeNestedComputations) {
+TEST_F(HloRematerializationTest, RematerializeNestedComputations) {
   HloModule module(TestName());
 
   auto cond_builder = HloComputation::Builder(TestName() + ".cond");
@@ -311,6 +315,203 @@ TEST_F(HloOrderingTest, RematerializeNestedComputations) {
   EXPECT_EQ(inner_computation->instruction_count(), 8);
 }
 
+TEST_F(HloRematerializationTest, InstructionRematerializedMultipleTimes) {
+  // Test that a single instruction is rematerialized several times. Module:
+  //
+  // Entry computation:
+  //   F32[] %param = {...}
+  //   F32[1024] %bcast = broadcast(%param)
+  //   F32[1024] %add_1 = add(%bcast, bcast)
+  //   F32[1024] %call_1 = call(Subcomputation, {%add_1})
+  //   F32[1024] %add_2 = add(%bcast, call_1)
+  //   F32[1024] %call_2 = call(SubComputation, {%add_2})
+  //   F32[1024] %add_3 = add(%bcast, call_2)
+  //   F32[1024] %call_3 = call(Subcomputation, {%add_3})
+  //   F32[1024] %add_4 = add(%bcast, call_3)
+  //
+  // Subcomputation:
+  //   F32[1024] %param = {...}
+  //   F32[2048] %concat = concat({%param, %param})
+  //   F32[1024] %slice = slice(%concat)
+  //
+  // The value %bcast is live across each call of Subcomputation (which requires
+  // 8KB) though the value is not used in the calls. Rematerializing %bcast
+  // across these calls reduces peak memory use from ~20KB down to ~16KB.
+  HloModule module(TestName());
+
+  HloComputation* subcomputation = nullptr;
+  {
+    auto builder = HloComputation::Builder(TestName() + ".subcomputation");
+    auto param = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, vec1024_shape_, "param"));
+    auto concat = builder.AddInstruction(HloInstruction::CreateConcatenate(
+        ShapeUtil::MakeShape(xla::F32, {2048}), {param, param},
+        /*dimension=*/0));
+    builder.AddInstruction(HloInstruction::CreateSlice(
+        vec1024_shape_, concat, /*start_indices=*/{0},
+        /*limit_indices=*/{1024}));
+    subcomputation = module.AddEmbeddedComputation(builder.Build());
+  }
+
+  auto builder = HloComputation::Builder(TestName());
+  auto param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, scalar_shape_, "param"));
+  auto bcast = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(vec1024_shape_, param, {}));
+  auto add_1 = builder.AddInstruction(HloInstruction::CreateBinary(
+      vec1024_shape_, HloOpcode::kAdd, bcast, bcast));
+  auto call_1 = builder.AddInstruction(
+      HloInstruction::CreateCall(vec1024_shape_, {add_1}, subcomputation));
+  auto add_2 = builder.AddInstruction(HloInstruction::CreateBinary(
+      vec1024_shape_, HloOpcode::kAdd, bcast, call_1));
+  auto call_2 = builder.AddInstruction(
+      HloInstruction::CreateCall(vec1024_shape_, {add_2}, subcomputation));
+  auto add_3 = builder.AddInstruction(HloInstruction::CreateBinary(
+      vec1024_shape_, HloOpcode::kAdd, bcast, call_2));
+  auto call_3 = builder.AddInstruction(
+      HloInstruction::CreateCall(vec1024_shape_, {add_3}, subcomputation));
+  auto add_4 = builder.AddInstruction(HloInstruction::CreateBinary(
+      vec1024_shape_, HloOpcode::kAdd, bcast, call_3));
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build());
+
+  auto count_broadcasts = [](const HloComputation* computation) {
+    int64 bcast_count = 0;
+    for (auto& instruction : computation->instructions()) {
+      if (instruction->opcode() == HloOpcode::kBroadcast) {
+        bcast_count++;
+      }
+    }
+    return bcast_count;
+  };
+
+  // Before rematerialization there should be a single broadcast instruction in
+  // the graph.
+  EXPECT_EQ(count_broadcasts(entry_computation), 1);
+  EXPECT_EQ(entry_computation->instruction_count(), 9);
+
+  EXPECT_EQ(add_2->operand(0), bcast);
+  EXPECT_EQ(add_3->operand(0), bcast);
+  EXPECT_EQ(add_4->operand(0), bcast);
+
+  SequentialHloOrdering::HloModuleSequence sequence;
+  // Pick a memory limit some where between 24KB (initial peak memory including
+  // parameter and output) and 20KB (peak memory possible with
+  // rematerialization).
+  TF_ASSIGN_OR_ASSERT_OK(
+      bool changed, HloRematerialization::RematerializeAndSchedule(
+                        ByteSizeOf,
+                        /*memory_limit_bytes=*/22 * 1024, &module, &sequence));
+  EXPECT_TRUE(changed);
+
+  // The broadcast should have been rematerialized 3 times.
+  EXPECT_EQ(count_broadcasts(entry_computation), 4);
+  EXPECT_EQ(entry_computation->instruction_count(), 12);
+
+  // The operands of add_2, add_3, and add_4 should all be rematerialized
+  // broadcasts.
+  EXPECT_NE(add_2->operand(0), bcast);
+  EXPECT_THAT(add_2->operand(0), op::Broadcast(param));
+  EXPECT_NE(add_3->operand(0), bcast);
+  EXPECT_THAT(add_3->operand(0), op::Broadcast(param));
+  EXPECT_NE(add_4->operand(0), bcast);
+  EXPECT_THAT(add_4->operand(0), op::Broadcast(param));
+}
+
+class IndirectUseTest : public HloRematerializationTest,
+                        public ::testing::WithParamInterface<bool> {};
+
+TEST_P(IndirectUseTest, IndirectUseNotRematerialized) {
+  // Test that an rematerializable instruction is not rematerialized if it has
+  // an indirect use. Test is parameterized on whether the value has an indirect
+  // use, and the instruction should be rematerialized iff the value has no
+  // indirect use. Module:
+  //
+  // Entry computation:
+  //   F32[] %param = {...}
+  //   F32[1024] %bcast = broadcast(%param)
+  //   F32[1024] %add_1 = add(%bcast, bcast)
+  //   F32[1024] %call = call(Subcomputation, {%add_1})
+  //   F32[1024] %add_2 = add(%bcast, call)
+  //   {F32[1024], F32[1024]} %tuple = tuple(%bcast, %add_2)
+  //   F32[1024] %gte = GetTupleElememt(%tuple, 0)
+  //   F32[1024] %negate = negate(%gte)
+  //
+  // Subcomputation:
+  //   F32[1024] %param = {...}
+  //   F32[2048] %concat = concat({%param, %param})
+  //   F32[1024] %slice = slice(%concat)
+  //
+  // The value %bcast is live across the call and rematerialization of %bcast
+  // across that point would reduce peak memory use by 4KB. However, %bcast is
+  // used indirectly in the %negate so rematerialization should not happen.
+  //
+  // This test is parameterized on whether the broadcast has an indirect use or
+  // not. The indirect use is controlled by the index of the GetTupleElement
+  // instruction. If the element is 0, then the %negate operand aliases %bcast
+  // (ie %bcast is used indirectly by %negate), otherwise the %negate operand
+  // aliases %add_2.
+  const bool indirectly_used = GetParam();
+  HloModule module(TestName());
+
+  HloComputation* subcomputation = nullptr;
+  {
+    auto builder = HloComputation::Builder(TestName() + ".subcomputation");
+    auto param = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, vec1024_shape_, "param"));
+    auto concat = builder.AddInstruction(HloInstruction::CreateConcatenate(
+        ShapeUtil::MakeShape(xla::F32, {2048}), {param, param},
+        /*dimension=*/0));
+    builder.AddInstruction(HloInstruction::CreateSlice(
+        vec1024_shape_, concat, /*start_indices=*/{0},
+        /*limit_indices=*/{1024}));
+    subcomputation = module.AddEmbeddedComputation(builder.Build());
+  }
+
+  auto builder = HloComputation::Builder(TestName());
+  auto param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, scalar_shape_, "param"));
+  auto bcast = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(vec1024_shape_, param, {}));
+  auto add_1 = builder.AddInstruction(HloInstruction::CreateBinary(
+      vec1024_shape_, HloOpcode::kAdd, bcast, bcast));
+  auto call_1 = builder.AddInstruction(
+      HloInstruction::CreateCall(vec1024_shape_, {add_1}, subcomputation));
+  auto add_2 = builder.AddInstruction(HloInstruction::CreateBinary(
+      vec1024_shape_, HloOpcode::kAdd, bcast, call_1));
+  auto tuple =
+      builder.AddInstruction(HloInstruction::CreateTuple({bcast, add_2}));
+  auto gte = builder.AddInstruction(HloInstruction::CreateGetTupleElement(
+      vec1024_shape_, tuple, indirectly_used ? 0 : 1));
+  builder.AddInstruction(
+      HloInstruction::CreateUnary(vec1024_shape_, HloOpcode::kNegate, gte));
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build());
+
+  EXPECT_EQ(entry_computation->instruction_count(), 8);
+
+  SequentialHloOrdering::HloModuleSequence sequence;
+  // Pick a memory limit some where between 24KB (initial peak memory including
+  // parameter and output) and 20KB (peak memory possible with
+  // rematerialization).
+  TF_ASSIGN_OR_ASSERT_OK(
+      bool changed, HloRematerialization::RematerializeAndSchedule(
+                        ByteSizeOf,
+                        /*memory_limit_bytes=*/22 * 1024, &module, &sequence));
+  // Rematerialization should only occur if the rematerializable instruction has
+  // no indirect uses.
+  if (indirectly_used) {
+    EXPECT_FALSE(changed);
+    EXPECT_EQ(entry_computation->instruction_count(), 8);
+  } else {
+    EXPECT_TRUE(changed);
+    EXPECT_EQ(entry_computation->instruction_count(), 9);
+  }
+}
+
+INSTANTIATE_TEST_CASE_P(IndirectUseTestInstantiation, IndirectUseTest,
+                        ::testing::Values(true, false));
+
 }  // namespace
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/liveness_util.cc b/tensorflow/compiler/xla/service/liveness_util.cc
index 6c5f185ed1..e0991fcb76 100644
--- a/tensorflow/compiler/xla/service/liveness_util.cc
+++ b/tensorflow/compiler/xla/service/liveness_util.cc
@@ -28,8 +28,9 @@ limitations under the License.
 
 namespace xla {
 
-bool DoesNotUseOperandBuffer(HloInstruction* operand, const ShapeIndex& index,
-                             HloInstruction* user,
+bool DoesNotUseOperandBuffer(const HloInstruction* operand,
+                             const ShapeIndex& index,
+                             const HloInstruction* user,
                              const TuplePointsToAnalysis& points_to_analysis) {
   CHECK(user->IsUserOf(operand))
       << "user: " << user->ToString() << " operand: " << operand->ToString();
diff --git a/tensorflow/compiler/xla/service/liveness_util.h b/tensorflow/compiler/xla/service/liveness_util.h
index 410a7b1b51..52de282ca6 100644
--- a/tensorflow/compiler/xla/service/liveness_util.h
+++ b/tensorflow/compiler/xla/service/liveness_util.h
@@ -32,8 +32,9 @@ namespace xla {
 // 'operand'. Returns false otherwise.
 //
 // REQUIRES: 'operand' is an operand of 'user'.
-bool DoesNotUseOperandBuffer(HloInstruction* operand, const ShapeIndex& index,
-                             HloInstruction* user,
+bool DoesNotUseOperandBuffer(const HloInstruction* operand,
+                             const ShapeIndex& index,
+                             const HloInstruction* user,
                              const TuplePointsToAnalysis& points_to_analysis);
 
 // Returns true if 'user' (at 'user_index') can share a buffer with its operand
-- 
GitLab


From 7888d8c318e6b0d54d3bfdb44dde47643256a728 Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Wed, 26 Apr 2017 14:29:09 -0800
Subject: [PATCH 0713/1563] Disable the requirement for a shape inference
 function. Change: 154353632

---
 tensorflow/core/grappler/costs/graph_properties.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 4edcdccdfe..06e91af2c2 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -26,6 +26,7 @@ namespace grappler {
 Status GraphProperties::InferStatically() {
   Graph graph(OpRegistry::Global());
   ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
+  shape_refiner.set_require_shape_inference_fns(false);
   ImportGraphDefOptions options;
   Status s = ImportGraphDef(options, item_.graph, &graph, &shape_refiner);
   TF_RETURN_IF_ERROR(s);
-- 
GitLab


From b6c105d23a12b844784a7de37abbadf2bb183ff1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 14:41:33 -0800
Subject: [PATCH 0714/1563] Check if memory_sequence_length is not None before
 converting tensor Change: 154355223

---
 tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 04b38159bb..2e2b2ebe60 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -73,8 +73,9 @@ def _prepare_memory(memory, memory_sequence_length, check_inner_dims_defined):
   """
   memory = nest.map_structure(
       lambda m: ops.convert_to_tensor(m, name="memory"), memory)
-  memory_sequence_length = ops.convert_to_tensor(
-      memory_sequence_length, name="memory_sequence_length")
+  if memory_sequence_length is not None:
+    memory_sequence_length = ops.convert_to_tensor(
+        memory_sequence_length, name="memory_sequence_length")
   if check_inner_dims_defined:
     def _check_dims(m):
       if not m.get_shape()[2:].is_fully_defined():
-- 
GitLab


From a462e0f1911ecbf0650faf5ef7ec543801848c54 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 26 Apr 2017 19:09:06 -0400
Subject: [PATCH 0715/1563] Branch 154338128 (#9468)

* Improved support for lookup tables. These tables are often initialized from large files stored on disk, and can take tens of minutes to load: increased the initialization timeout to give grappler enough time to load them.
Change: 154303608

* Add eager (static) checking to assert_equal when constant values are available.

This raises errors during graph creation, when possible, instead of at runtime.
Change: 154304392

* Add tf.log_sigmoid

This is a numerically stable version of tf.log(tf.sigmoid(x)).  It's just
-tf.nn.softplus(-x), but it's easy to add and the identity is easy to mistype.

RELNOTES: Add tf.log_sigmoid(x) = tf.log(tf.sigmoid(x)) = -tf.nn.softplus(-x).

Fixes #3719.
Change: 154308666

* GrapplerItem is a struct and not a class
Change: 154319534

* Migrate tf_storage and tf_globals to d3v4.
Change: 154319656

* Allow SVStepCounter to measure progress for other counters beyond global_step.
Change: 154326389

* Provide a user-defined default constructor to grappler::ItemConfig to avoid compiler error
Change: 154331360

* [tf contrib seq2seq] Update BeamSearchDecoder + AttentionWrapper API:
* BeamSearchDecoder no longer tries to pass a tiling operator to the cell.
* Instead the cell must "know" about the fact that batch_size is now bigger.
* Much more explicit and careful error messages if batch sizes don't match.
* Added helper function to tile the batch by beam_width.
* AttentionWrapper now accepts an initial_cell_state argument (it'll pass the value back through when zero_state() is called).
Change: 154333600

* AllocationRegistry: only check fail if two different allocator types
are defined for the same name and priority.
Change: 154333776

* Add a conversion from xla session module to a list of node structure as a step of xla computation transformation
Change: 154337650

* tfdbg: Improve the way uninitialized tensor values and DT_RESOURCE tensor values are displayed

1. Fix the bug wherein DT_RESOURCE tensors are displayed as "Uninitialized tensor", even if they are initialized.
2. For truly uninitialized tensors, provide more information by printing the TensorProto, which contains the dtype and shape.
Change: 154338128
---
 .../python/kernel_tests/binomial_test.py      |   7 +-
 .../dirichlet_multinomial_test.py             |   4 +-
 .../kernel_tests/distribution_util_test.py    |  44 +-
 .../python/kernel_tests/geometric_test.py     |   7 +-
 .../python/kernel_tests/multinomial_test.py   |   4 +-
 .../kernel_tests/negative_binomial_test.py    |   8 +-
 .../python/kernel_tests/poisson_test.py       |   9 +-
 .../quantized_distribution_test.py            |   5 +-
 tensorflow/contrib/seq2seq/__init__.py        |   2 +
 .../kernel_tests/attention_wrapper_test.py    | 600 +++++++++---------
 .../kernel_tests/beam_search_decoder_test.py  |   8 +-
 .../seq2seq/python/ops/attention_wrapper.py   | 220 ++++---
 .../seq2seq/python/ops/beam_search_decoder.py | 175 +++--
 .../contrib/xla_tf_graph/xla_tf_graph_util.cc | 183 +++++-
 .../contrib/xla_tf_graph/xla_tf_graph_util.h  |  29 +
 .../xla_tf_graph/xla_tf_graph_util_test.cc    |  80 ++-
 .../core/framework/allocator_registry.cc      |  27 +-
 .../core/framework/allocator_registry.h       |   7 +-
 .../core/grappler/clusters/single_machine.cc  |  19 +-
 .../core/grappler/clusters/single_machine.h   |   4 +
 tensorflow/core/grappler/grappler_item.h      |   2 +
 .../core/grappler/grappler_item_builder.cc    |  15 +-
 .../core/grappler/grappler_item_builder.h     |  11 +-
 .../inputs/trivial_test_graph_input_yielder.h |   2 +-
 tensorflow/python/BUILD                       |   1 +
 tensorflow/python/debug/BUILD                 |   1 +
 tensorflow/python/debug/cli/tensor_format.py  |   5 +-
 .../python/debug/cli/tensor_format_test.py    |  38 +-
 tensorflow/python/debug/lib/debug_data.py     |  49 +-
 .../python/debug/lib/debug_data_test.py       |  13 +-
 .../python/debug/lib/session_debug_testlib.py |  11 +-
 tensorflow/python/kernel_tests/BUILD          |   1 +
 .../python/kernel_tests/check_ops_test.py     |  24 +-
 .../python/kernel_tests/cwise_ops_test.py     |   5 +
 tensorflow/python/ops/check_ops.py            |  61 +-
 tensorflow/python/ops/math_ops.py             |  19 +
 tensorflow/python/ops/nn.py                   |   1 +
 tensorflow/python/ops/standard_ops.py         |   1 +
 tensorflow/python/training/supervisor.py      |  17 +-
 .../components/tf_globals_d3v4/globals.ts     |  38 ++
 .../components/tf_storage_d3v4/storage.ts     | 400 ++++++++++++
 .../tf_storage_d3v4/storageTests.ts           |  64 ++
 .../components/tf_storage_d3v4/tests.html     |  30 +
 tensorflow/tools/api/golden/tensorflow.pbtxt  |   4 +
 44 files changed, 1708 insertions(+), 547 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/tests.html

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
index c473d54f47..d30f6e418d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/binomial_test.py
@@ -19,7 +19,9 @@ from __future__ import print_function
 import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import binomial
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
 
@@ -97,13 +99,14 @@ class BinomialTest(test.TestCase):
       binom.prob([3., 1, 2]).eval()
       binom.cdf([2., 3, 2]).eval()
       binom.cdf([3., 1, 2]).eval()
+      placeholder = array_ops.placeholder(dtypes.float32)
       # Both equality and integer checking fail.
       with self.assertRaisesOpError(
           "cannot contain fractional components."):
-        binom.prob([1.0, 2.5, 1.5]).eval()
+        binom.prob(placeholder).eval(feed_dict={placeholder: [1.0, 2.5, 1.5]})
       with self.assertRaisesOpError(
           "cannot contain fractional components."):
-        binom.cdf([1.0, 2.5, 1.5]).eval()
+        binom.cdf(placeholder).eval(feed_dict={placeholder: [1.0, 2.5, 1.5]})
 
       binom = binomial.Binomial(total_count=n, probs=p, validate_args=False)
       binom.prob([1., 2., 3.]).eval()
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
index 54691d2095..bc25366cfa 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
@@ -18,6 +18,7 @@ from __future__ import print_function
 
 import numpy as np
 from tensorflow.contrib import distributions
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -87,9 +88,10 @@ class DirichletMultinomialTest(test.TestCase):
       dist.prob([3., 0, 2]).eval()
       dist.prob([3.0, 0, 2.0]).eval()
       # Both equality and integer checking fail.
+      placeholder = array_ops.placeholder(dtypes.float32)
       with self.assertRaisesOpError(
           "counts cannot contain fractional components"):
-        dist.prob([1.0, 2.5, 1.5]).eval()
+        dist.prob(placeholder).eval(feed_dict={placeholder: [1.0, 2.5, 1.5]})
       dist = ds.DirichletMultinomial(n, alpha, validate_args=False)
       dist.prob([1., 2., 3.]).eval()
       # Non-integer arguments work.
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
index 5a4a6720f7..2b28392d35 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
@@ -41,42 +41,44 @@ from tensorflow.python.platform import tf_logging as logging
 class AssertCloseTest(test.TestCase):
 
   def testAssertCloseIntegerDtype(self):
-    x = [1, 5, 10, 15, 20]
+    x = array_ops.placeholder(dtypes.int32)
     y = x
-    z = [2, 5, 10, 15, 20]
+    z = array_ops.placeholder(dtypes.int32)
+    feed_dict = {x: [1, 5, 10, 15, 20], z: [2, 5, 10, 15, 20]}
     with self.test_session():
       with ops.control_dependencies([distribution_util.assert_close(x, y)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with ops.control_dependencies([distribution_util.assert_close(y, x)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(x, z)]):
-          array_ops.identity(x).eval()
+          array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(y, z)]):
-          array_ops.identity(y).eval()
+          array_ops.identity(y).eval(feed_dict=feed_dict)
 
   def testAssertCloseNonIntegerDtype(self):
-    x = np.array([1., 5, 10, 15, 20], dtype=np.float32)
+    x = array_ops.placeholder(dtypes.float32)
     y = x + 1e-8
-    z = [2., 5, 10, 15, 20]
+    z = array_ops.placeholder(dtypes.float32)
+    feed_dict = {x: [1., 5, 10, 15, 20], z: [2., 5, 10, 15, 20]}
     with self.test_session():
       with ops.control_dependencies([distribution_util.assert_close(x, y)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with ops.control_dependencies([distribution_util.assert_close(y, x)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(x, z)]):
-          array_ops.identity(x).eval()
+          array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x ~= y"):
         with ops.control_dependencies([distribution_util.assert_close(y, z)]):
-          array_ops.identity(y).eval()
+          array_ops.identity(y).eval(feed_dict=feed_dict)
 
   def testAssertCloseEpsilon(self):
     x = [0., 5, 10, 15, 20]
@@ -98,30 +100,32 @@ class AssertCloseTest(test.TestCase):
 
   def testAssertIntegerForm(self):
     # This should only be detected as an integer.
-    x = [1., 5, 10, 15, 20]
-    y = [1.1, 5, 10, 15, 20]
+    x = array_ops.placeholder(dtypes.float32)
+    y = array_ops.placeholder(dtypes.float32)
     # First component isn't less than float32.eps = 1e-7
-    z = [1.0001, 5, 10, 15, 20]
+    z = array_ops.placeholder(dtypes.float32)
     # This shouldn"t be detected as an integer.
-    w = [1e-8, 5, 10, 15, 20]
+    w = array_ops.placeholder(dtypes.float32)
+    feed_dict = {x: [1., 5, 10, 15, 20], y: [1.1, 5, 10, 15, 20],
+                 z: [1.0001, 5, 10, 15, 20], w: [1e-8, 5, 10, 15, 20]}
     with self.test_session():
       with ops.control_dependencies([distribution_util.assert_integer_form(x)]):
-        array_ops.identity(x).eval()
+        array_ops.identity(x).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("x has non-integer components"):
         with ops.control_dependencies(
             [distribution_util.assert_integer_form(y)]):
-          array_ops.identity(y).eval()
+          array_ops.identity(y).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("x has non-integer components"):
         with ops.control_dependencies(
             [distribution_util.assert_integer_form(z)]):
-          array_ops.identity(z).eval()
+          array_ops.identity(z).eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("x has non-integer components"):
         with ops.control_dependencies(
             [distribution_util.assert_integer_form(w)]):
-          array_ops.identity(w).eval()
+          array_ops.identity(w).eval(feed_dict=feed_dict)
 
 
 class GetLogitsAndProbsTest(test.TestCase):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py b/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py
index 3dbad7b607..9ef68c4c2c 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/geometric_test.py
@@ -22,7 +22,9 @@ import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import geometric
 from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
 
@@ -74,12 +76,13 @@ class GeometricTest(test.TestCase):
     with self.test_session():
       batch_size = 6
       probs = constant_op.constant([.9] * batch_size)
-      x = np.array([2.5, 3.2, 4.3, 5.1, 6., 7.], dtype=np.float32)
+      x = array_ops.placeholder(dtypes.float32, shape=[6])
+      feed_dict = {x: [2.5, 3.2, 4.3, 5.1, 6., 7.]}
       geom = geometric.Geometric(probs=probs)
 
       with self.assertRaisesOpError("Condition x == y"):
         log_prob = geom.log_prob(x)
-        log_prob.eval()
+        log_prob.eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x >= 0"):
         log_prob = geom.log_prob(np.array([-1.], dtype=np.float32))
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
index 169498be24..b1c0c9f7a9 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
@@ -18,6 +18,7 @@ from __future__ import print_function
 
 import numpy as np
 from tensorflow.contrib import distributions
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -100,9 +101,10 @@ class MultinomialTest(test.TestCase):
       with self.assertRaisesOpError("counts must sum to `self.total_count`"):
         multinom.prob([2., 3, 2]).eval()
       # Counts are non-integers.
+      x = array_ops.placeholder(dtypes.float32)
       with self.assertRaisesOpError(
           "cannot contain fractional components."):
-        multinom.prob([1.0, 2.5, 1.5]).eval()
+        multinom.prob(x).eval(feed_dict={x: [1.0, 2.5, 1.5]})
 
       multinom = ds.Multinomial(total_count=n, probs=p, validate_args=False)
       multinom.prob([1., 2., 2.]).eval()
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py b/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py
index f55de99396..c1a74c6483 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/negative_binomial_test.py
@@ -21,6 +21,7 @@ import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import negative_binomial
 from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
@@ -140,17 +141,18 @@ class NegativeBinomialTest(test.TestCase):
       batch_size = 6
       probs = [.9] * batch_size
       total_count = 5.
-      x = np.array([2.5, 3.2, 4.3, 5.1, 6., 7.], dtype=np.float32)
+      x = array_ops.placeholder(dtypes.float32, shape=[6])
+      feed_dict = {x: [2.5, 3.2, 4.3, 5.1, 6., 7.]}
       negbinom = negative_binomial.NegativeBinomial(
           total_count=total_count, probs=probs, validate_args=True)
 
       with self.assertRaisesOpError("Condition x == y"):
         log_pmf = negbinom.log_prob(x)
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x >= 0"):
         log_pmf = negbinom.log_prob([-1.])
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       negbinom = negative_binomial.NegativeBinomial(
           total_count=total_count, probs=probs, validate_args=False)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py b/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py
index b1a9478b43..f157c0d3ed 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/poisson_test.py
@@ -21,7 +21,9 @@ import numpy as np
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import poisson as poisson_lib
 from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
 
@@ -64,17 +66,18 @@ class PoissonTest(test.TestCase):
     with self.test_session():
       batch_size = 6
       lam = constant_op.constant([3.0] * batch_size)
-      x = [2.5, 3.2, 4.3, 5.1, 6., 7.]
+      x = array_ops.placeholder(dtypes.float32, shape=[6])
+      feed_dict = {x: [2.5, 3.2, 4.3, 5.1, 6., 7.]}
       poisson = poisson_lib.Poisson(rate=lam, validate_args=True)
 
       # Non-integer
       with self.assertRaisesOpError("cannot contain fractional components"):
         log_pmf = poisson.log_prob(x)
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       with self.assertRaisesOpError("Condition x >= 0"):
         log_pmf = poisson.log_prob([-1.])
-        log_pmf.eval()
+        log_pmf.eval(feed_dict=feed_dict)
 
       poisson = poisson_lib.Poisson(rate=lam, validate_args=False)
       log_pmf = poisson.log_prob(x)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py b/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py
index 0e2d143732..6a7ee3a8bf 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/quantized_distribution_test.py
@@ -373,15 +373,16 @@ class QuantizedDistributionTest(test.TestCase):
 
   def testCutoffsMustBeIntegerValuedIfValidateArgsTrue(self):
     with self.test_session():
+      low = array_ops.placeholder(dtypes.float32)
       qdist = distributions.QuantizedDistribution(
           distribution=distributions.Normal(loc=0., scale=1.),
-          low=1.5,
+          low=low,
           high=10.,
           validate_args=True)
 
       self.assertTrue(qdist.validate_args)  # Default is True.
       with self.assertRaisesOpError("has non-integer components"):
-        qdist.sample().eval()
+        qdist.sample().eval(feed_dict={low: 1.5})
 
   def testCutoffsCanBeFloatValuedIfValidateArgsFalse(self):
     with self.test_session():
diff --git a/tensorflow/contrib/seq2seq/__init__.py b/tensorflow/contrib/seq2seq/__init__.py
index 064ce00c61..dd497197e3 100644
--- a/tensorflow/contrib/seq2seq/__init__.py
+++ b/tensorflow/contrib/seq2seq/__init__.py
@@ -44,6 +44,8 @@ See the @{$python/contrib.seq2seq} guide.
 @@AttentionWrapper
 
 @@gather_tree
+
+@@tile_batch
 """
 
 from __future__ import absolute_import
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index 4054b51412..40b50338ad 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -159,7 +159,7 @@ class AttentionWrapperTest(test.TestCase):
             sess_results["final_state"])
       sys.stdout.flush()
       print("Copy/paste (%s)\nexpected_final_alignment_history = " % name,
-            sess_results["state_alignment_history"])
+            np.asarray(sess_results["state_alignment_history"]))
       sys.stdout.flush()
       nest.map_structure(self.assertAllClose, expected_final_output,
                          sess_results["final_outputs"])
@@ -177,41 +177,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                1.89980457e-03, 1.89681584e-03, 2.05339328e-03, -3.83376027e-03,
-                -4.31808922e-03, -6.45466987e-03
+                2.04633363e-03, 1.89259532e-03, 2.09550979e-03, -3.81628517e-03,
+                -4.36160620e-03, -6.43933658e-03
             ], [
-                2.27232254e-03, 2.02509761e-03, 2.01666891e-03, -3.87230632e-03,
-                -3.47119337e-03, -6.15991233e-03
+                2.41885195e-03, 2.02089013e-03, 2.05879519e-03, -3.85483308e-03,
+                -3.51473060e-03, -6.14458136e-03
             ], [
-                1.87640532e-03, 2.07374478e-03, 2.30582547e-03, -3.64564802e-03,
-                -3.75995948e-03, -6.28685066e-03
+                2.02294230e-03, 2.06955452e-03, 2.34797411e-03, -3.62816593e-03,
+                -3.80352931e-03, -6.27150526e-03
             ]], [[
-                4.89835022e-03, -1.94158917e-03, 3.32316267e-03,
-                -2.82446202e-03, 3.63192149e-03, -4.80734091e-03
+                4.89025004e-03, -1.97221269e-03, 3.34283570e-03,
+                -2.79326970e-03, 3.63148772e-03, -4.79645561e-03
             ], [
-                5.14256489e-03, -2.00877781e-03, 3.49807227e-03,
-                -2.86567654e-03, 3.14202951e-03, -5.32575324e-03
+                5.13446378e-03, -2.03941623e-03, 3.51774949e-03,
+                -2.83448119e-03, 3.14159272e-03, -5.31486655e-03
             ], [
-                5.21511910e-03, -2.18198029e-03, 3.56219849e-03,
-                -2.88951304e-03, 3.20866983e-03, -5.21918852e-03
+                5.20701287e-03, -2.21262546e-03, 3.58187454e-03,
+                -2.85831164e-03, 3.20822699e-03, -5.20829484e-03
             ]], [[
-                -1.34951377e-03, -9.68646549e-04, -2.11444520e-03,
-                -1.85243192e-03, -5.27541339e-03, -9.10969637e-03
+                -1.34046993e-03, -9.99792013e-04, -2.11631414e-03,
+                -1.85202830e-03, -5.26227616e-03, -9.08544939e-03
             ], [
-                -1.36390887e-03, -1.01293903e-03, -1.96592091e-03,
-                -1.80044665e-03, -5.62618347e-03, -9.36636236e-03
+                -1.35486713e-03, -1.04408595e-03, -1.96779310e-03,
+                -1.80004584e-03, -5.61304903e-03, -9.34211537e-03
             ], [
-                -1.13357347e-03, -7.37126335e-04, -1.99582824e-03,
-                -1.88097963e-03, -5.03196474e-03, -9.34652984e-03
+                -1.12452905e-03, -7.68281636e-04, -1.99770415e-03,
+                -1.88058324e-03, -5.01882844e-03, -9.32228006e-03
             ]], [[
-                1.52963377e-03, -3.97205260e-03, -9.64675564e-04,
-                8.51404853e-04, -1.29804458e-03, 6.56467676e-03
+                1.52967637e-03, -3.97213362e-03, -9.64699371e-04,
+                8.51419638e-04, -1.29806029e-03, 6.56482670e-03
             ], [
-                1.22557906e-03, -4.56343032e-03, -1.08188344e-03,
-                8.27252632e-04, -2.10058759e-03, 6.43082103e-03
+                1.22562144e-03, -4.56351135e-03, -1.08190742e-03,
+                8.27267300e-04, -2.10060296e-03, 6.43097097e-03
             ], [
-                9.93478228e-04, -4.37378604e-03, -1.41531695e-03,
-                6.44775166e-04, -2.16480484e-03, 6.68286439e-03
+                9.93521884e-04, -4.37386986e-03, -1.41534151e-03,
+                6.44790183e-04, -2.16482091e-03, 6.68301852e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -231,21 +231,21 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.18963176e-02, -8.04424379e-03, -1.48289464e-03,
-                    1.61068402e-02, -1.37983467e-02, -7.57976994e-03,
-                    -8.28560349e-03, -1.18737305e-02, 1.78835373e-02
+                    -2.18977481e-02, -8.04181397e-03, -1.48273818e-03,
+                    1.61075518e-02, -1.37986457e-02, -7.57964421e-03,
+                    -8.28644261e-03, -1.18742418e-02, 1.78838037e-02
                 ], [
-                    1.74205080e-02, -1.41929444e-02, -3.88092734e-03,
-                    3.19708064e-02, -3.54689620e-02, -2.14698724e-02,
-                    -6.21716119e-03, -1.69295724e-03, -1.94495302e-02
+                    1.74201727e-02, -1.41931782e-02, -3.88098788e-03,
+                    3.19711640e-02, -3.54694054e-02, -2.14694049e-02,
+                    -6.21706853e-03, -1.69323490e-03, -1.94494929e-02
                 ], [
-                    -1.14528481e-02, 8.77819210e-03, -1.62970200e-02,
-                    -1.39963552e-02, 1.34831406e-02, -1.04494914e-02,
-                    6.16127765e-03, -9.41022579e-03, -6.57590060e-03
+                    -1.14532551e-02, 8.77828151e-03, -1.62972715e-02,
+                    -1.39963031e-02, 1.34832524e-02, -1.04488730e-02,
+                    6.16201758e-03, -9.41041857e-03, -6.57599326e-03
                 ], [
                     -4.74753827e-02, -1.19123599e-02, -7.40140676e-05,
-                    4.10552323e-02, -1.36711076e-03, 2.11795457e-02,
-                    -2.80460119e-02, -5.44509329e-02, -2.91906092e-02
+                    4.10552323e-02, -1.36711076e-03, 2.11795494e-02,
+                    -2.80460101e-02, -5.44509329e-02, -2.91906092e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -254,20 +254,20 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.09840557e-02, -3.97477299e-03, -7.54582870e-04,
-                    7.91188516e-03, -7.02184858e-03, -3.80711886e-03,
-                    -4.22059745e-03, -6.05464494e-03, 8.92061181e-03
+                    -1.09847616e-02, -3.97357112e-03, -7.54502777e-04,
+                    7.91223347e-03, -7.02199014e-03, -3.80705344e-03,
+                    -4.22102772e-03, -6.05491130e-03, 8.92073940e-03
                 ], [
-                    8.68131686e-03, -7.16938032e-03, -1.88384682e-03,
-                    1.62678920e-02, -1.76827926e-02, -1.06622791e-02,
-                    -3.07528162e-03, -8.45885137e-04, -9.99388192e-03
+                    8.68115202e-03, -7.16950046e-03, -1.88387593e-03,
+                    1.62680726e-02, -1.76830068e-02, -1.06620435e-02,
+                    -3.07523785e-03, -8.46023730e-04, -9.99386702e-03
                 ], [
-                    -5.71205560e-03, 4.50050412e-03, -8.07640795e-03,
-                    -6.94844872e-03, 6.75682165e-03, -5.12113515e-03,
-                    3.06208082e-03, -4.61743120e-03, -3.23931244e-03
+                    -5.71225956e-03, 4.50055022e-03, -8.07653368e-03,
+                    -6.94842264e-03, 6.75687613e-03, -5.12083014e-03,
+                    3.06244940e-03, -4.61752573e-03, -3.23935854e-03
                 ], [
                     -2.37231534e-02, -5.88526297e-03, -3.72226204e-05,
-                    2.01789513e-02, -6.75848918e-04, 1.06686354e-02,
+                    2.01789513e-02, -6.75848918e-04, 1.06686372e-02,
                     -1.42624676e-02, -2.69628745e-02, -1.45034352e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
@@ -277,17 +277,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00187641, 0.00207374, 0.00230583, -0.00364565, -0.00375996,
-                -0.00628685
+                0.00202294, 0.00206955, 0.00234797, -0.00362817, -0.00380353,
+                -0.00627151
             ], [
-                0.00521512, -0.00218198, 0.0035622, -0.00288951, 0.00320867,
-                -0.00521919
+                0.00520701, -0.00221263, 0.00358187, -0.00285831, 0.00320823,
+                -0.00520829
             ], [
-                -0.00113357, -0.00073713, -0.00199583, -0.00188098, -0.00503196,
-                -0.00934653
+                -0.00112453, -0.00076828, -0.0019977, -0.00188058, -0.00501883,
+                -0.00932228
             ], [
-                0.00099348, -0.00437379, -0.00141532, 0.00064478, -0.0021648,
-                0.00668286
+                0.00099352, -0.00437387, -0.00141534, 0.00064479, -0.00216482,
+                0.00668302
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -297,41 +297,41 @@ class AttentionWrapperTest(test.TestCase):
         alignment_history=())
 
     expected_final_alignment_history = [[[
-        0.12525459, 0.12438694, 0.12613983, 0.12484372, 0.12484372, 0.12484372,
-        0.12484372, 0.12484372
+        0.12586178, 0.12272788, 0.1271652, 0.12484902, 0.12484902, 0.12484902,
+        0.12484902, 0.12484902
     ], [
-        0.12648369, 0.12322279, 0.12504892, 0.12504892, 0.12504892, 0.12504892,
-        0.12504892, 0.12504892
+        0.12612638, 0.12516938, 0.12478404, 0.12478404, 0.12478404, 0.12478404,
+        0.12478404, 0.12478404
     ], [
-        0.12611018, 0.12528601, 0.12638952, 0.12444285, 0.12444285, 0.12444285,
-        0.12444285, 0.12444285
+        0.12595113, 0.12515794, 0.1255464, 0.1246689, 0.1246689, 0.1246689,
+        0.1246689, 0.1246689
     ], [
-        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
-        0.12501054, 0.12501054
+        0.12492912, 0.12501013, 0.12501013, 0.12501013, 0.12501013, 0.12501013,
+        0.12501013, 0.12501013
     ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
-        0.12525459, 0.12438691, 0.1261397, 0.12484375, 0.12484375, 0.12484375,
-        0.12484375, 0.12484375
+        0.12586173, 0.12272781, 0.12716517, 0.12484905, 0.12484905, 0.12484905,
+        0.12484905, 0.12484905
     ], [
-        0.12648349, 0.12322238, 0.12504902, 0.12504902, 0.12504902, 0.12504902,
-        0.12504902, 0.12504902
+        0.12612617, 0.1251694, 0.12478408, 0.12478408, 0.12478408, 0.12478408,
+        0.12478408, 0.12478408
     ], [
-        0.12611009, 0.12528586, 0.12638941, 0.12444293, 0.12444293, 0.12444293,
-        0.12444293, 0.12444293
+        0.12595108, 0.12515777, 0.1255464, 0.12466895, 0.12466895, 0.12466895,
+        0.12466895, 0.12466895
     ], [
-        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
-        0.12501054, 0.12501054
+        0.12492914, 0.12501012, 0.12501012, 0.12501012, 0.12501012, 0.12501012,
+        0.12501012, 0.12501012
     ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
-        0.12525487, 0.12438726, 0.12613991, 0.12484358, 0.12484358, 0.12484358,
-        0.12484358, 0.12484358
+        0.12586181, 0.12272815, 0.12716556, 0.12484891, 0.12484891, 0.12484891,
+        0.12484891, 0.12484891
     ], [
-        0.12648354, 0.12322233, 0.12504901, 0.12504901, 0.12504901, 0.12504901,
-        0.12504901, 0.12504901
+        0.12612608, 0.12516941, 0.12478409, 0.12478409, 0.12478409, 0.12478409,
+        0.12478409, 0.12478409
     ], [
-        0.12611021, 0.125286, 0.12638955, 0.12444286, 0.12444286, 0.12444286,
-        0.12444286, 0.12444286
+        0.12595116, 0.12515792, 0.12554643, 0.1246689, 0.1246689, 0.1246689,
+        0.1246689, 0.1246689
     ], [
-        0.12492625, 0.12501054, 0.12501054, 0.12501054, 0.12501054, 0.12501054,
-        0.12501054, 0.12501054
+        0.1249292, 0.12501012, 0.12501012, 0.12501012, 0.12501012, 0.12501012,
+        0.12501012, 0.12501012
     ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]]]
 
     self._testWithAttention(
@@ -349,41 +349,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                6.64783875e-03, 2.94425711e-03, 5.26542449e-03, -2.64955591e-03,
-                -7.95925129e-03, -5.02286293e-03
+                1.27064800e-02, 3.57783446e-03, 8.22613202e-03, -1.61504047e-03,
+                -1.12555185e-02, -3.92740499e-03
             ], [
-                7.01954123e-03, 3.07301106e-03, 5.22849336e-03, -2.68844375e-03,
-                -7.11239874e-03, -4.72904276e-03
+                1.30781950e-02, 3.70747922e-03, 8.18992872e-03, -1.65389013e-03,
+                -1.04098395e-02, -3.63383139e-03
             ], [
-                6.62360899e-03, 3.12234787e-03, 5.51807694e-03, -2.46222341e-03,
-                -7.40198931e-03, -4.85701021e-03
+                1.26833543e-02, 3.75790196e-03, 8.48123431e-03, -1.42690970e-03,
+                -1.07016256e-02, -3.76088684e-03
             ]], [[
-                7.37589924e-03, -1.02620223e-03, 3.61374952e-03,
-                -5.74620720e-03, 5.05625410e-03, -7.45209027e-03
+                6.88417302e-03, -2.04071682e-03, 4.17768257e-03,
+                -4.51408979e-03, 4.90086433e-03, -6.85973791e-03
             ], [
-                7.61946291e-03, -1.09287468e-03, 3.78817180e-03,
-                -5.78709645e-03, 4.56611114e-03, -7.96987582e-03
+                7.12782983e-03, -2.10783770e-03, 4.35227761e-03,
+                -4.55496181e-03, 4.41066315e-03, -7.37757795e-03
             ], [
-                7.69207766e-03, -1.26582675e-03, 3.85218812e-03,
-                -5.81111759e-03, 4.63287206e-03, -7.86337163e-03
+                7.20011396e-03, -2.28102156e-03, 4.41620918e-03,
+                -4.57867794e-03, 4.47713351e-03, -7.27072079e-03
             ]], [[
-                -2.69413739e-03, 3.47183552e-04, -1.82145904e-03,
-                -1.39805069e-03, -8.05486552e-03, -1.08372131e-02
+                -2.20676698e-03, -1.43745833e-03, -1.99429039e-03,
+                -1.44722988e-03, -7.45461835e-03, -9.80243273e-03
             ], [
-                -2.70848931e-03, 3.03293345e-04, -1.67230750e-03,
-                -1.34555507e-03, -8.40565283e-03, -1.10935047e-02
+                -2.22120387e-03, -1.48139545e-03, -1.84528576e-03,
+                -1.39490096e-03, -7.80559657e-03, -1.00586927e-02
             ], [
-                -2.47822329e-03, 5.79408603e-04, -1.70188327e-03,
-                -1.42583530e-03, -7.81180616e-03, -1.10740755e-02
+                -1.99079141e-03, -1.20571791e-03, -1.87507609e-03,
+                -1.47541985e-03, -7.21158786e-03, -1.00391749e-02
             ]], [[
-                1.48582947e-03, -3.88786104e-03, -9.39912978e-04,
-                8.36255029e-04, -1.28223014e-03, 6.40908210e-03
+                1.48755650e-03, -3.89118027e-03, -9.40889120e-04,
+                8.36852356e-04, -1.28285377e-03, 6.41521579e-03
             ], [
-                1.18177081e-03, -4.47923271e-03, -1.05711201e-03,
-                8.12121783e-04, -2.08477327e-03, 6.27523474e-03
+                1.18351437e-03, -4.48258361e-03, -1.05809816e-03,
+                8.12723883e-04, -2.08540238e-03, 6.28142804e-03
             ], [
-                9.49664740e-04, -4.28957958e-03, -1.39053771e-03,
-                6.29657647e-04, -2.14899099e-03, 6.52727811e-03
+                9.51444614e-04, -4.29300033e-03, -1.39154412e-03,
+                6.30271854e-04, -2.14963360e-03, 6.53359853e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -396,28 +396,28 @@ class AttentionWrapperTest(test.TestCase):
             ]]],
             dtype=float32),
         sample_id=array(
-            [[0, 0, 0], [0, 0, 0], [1, 1, 1], [5, 5, 5], [3, 3, 2]],
+            [[0, 0, 0], [0, 0, 0], [1, 3, 1], [5, 5, 5], [3, 3, 2]],
             dtype=int32))
 
     expected_final_state = AttentionWrapperState(
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.19389871e-02, -7.93421268e-03, -1.45148858e-03,
-                    1.61569901e-02, -1.38310911e-02, -7.59426132e-03,
-                    -8.35836027e-03, -1.18763093e-02, 1.78797375e-02
+                    -2.19953191e-02, -7.81358499e-03, -1.42740645e-03,
+                    1.62037201e-02, -1.38600282e-02, -7.60386931e-03,
+                    -8.42390209e-03, -1.18884994e-02, 1.78821683e-02
                 ], [
-                    1.74194798e-02, -1.41677596e-02, -3.89095861e-03,
-                    3.19508761e-02, -3.54519747e-02, -2.15105712e-02,
-                    -6.20894879e-03, -1.72719418e-03, -1.94605980e-02
+                    1.74096227e-02, -1.41773149e-02, -3.89175024e-03,
+                    3.19635086e-02, -3.54669318e-02, -2.14924756e-02,
+                    -6.20695669e-03, -1.73213519e-03, -1.94583312e-02
                 ], [
-                    -1.14357909e-02, 8.76635592e-03, -1.62690803e-02,
-                    -1.39883338e-02, 1.34323873e-02, -1.04959216e-02,
-                    6.09614328e-03, -9.38197412e-03, -6.57159975e-03
+                    -1.14590004e-02, 8.76899902e-03, -1.62825100e-02,
+                    -1.39863417e-02, 1.34333782e-02, -1.04652103e-02,
+                    6.13503950e-03, -9.39247012e-03, -6.57595927e-03
                 ], [
-                    -4.74738739e-02, -1.19136795e-02, -7.36564398e-05,
-                    4.10547666e-02, -1.36771239e-03, 2.11771261e-02,
-                    -2.80481018e-02, -5.44515178e-02, -2.91903559e-02
+                    -4.74739373e-02, -1.19136302e-02, -7.36713409e-05,
+                    4.10547927e-02, -1.36768632e-03, 2.11772211e-02,
+                    -2.80480143e-02, -5.44514954e-02, -2.91903671e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -426,21 +426,21 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.10049099e-02, -3.92028037e-03, -7.38571223e-04,
-                    7.93652050e-03, -7.03821564e-03, -3.81436548e-03,
-                    -4.25778655e-03, -6.05606195e-03, 8.91851448e-03
+                    -1.10325804e-02, -3.86056723e-03, -7.26287195e-04,
+                    7.95945339e-03, -7.05253659e-03, -3.81913339e-03,
+                    -4.29130904e-03, -6.06246945e-03, 8.91948957e-03
                 ], [
-                    8.68070032e-03, -7.15647917e-03, -1.88874488e-03,
-                    1.62575077e-02, -1.76745858e-02, -1.06826536e-02,
-                    -3.07105901e-03, -8.63034453e-04, -9.99918394e-03
+                    8.67583323e-03, -7.16136536e-03, -1.88911252e-03,
+                    1.62639488e-02, -1.76817775e-02, -1.06735229e-02,
+                    -3.07015004e-03, -8.65494134e-04, -9.99815390e-03
                 ], [
-                    -5.70359221e-03, 4.49446775e-03, -8.06238409e-03,
-                    -6.94446685e-03, 6.73149945e-03, -5.14409645e-03,
-                    3.02969781e-03, -4.60351165e-03, -3.23720207e-03
+                    -5.71519835e-03, 4.49585915e-03, -8.06909613e-03,
+                    -6.94347266e-03, 6.73189852e-03, -5.12895826e-03,
+                    3.04909074e-03, -4.60868096e-03, -3.23936995e-03
                 ], [
-                    -2.37224046e-02, -5.88591257e-03, -3.70427515e-05,
-                    2.01787166e-02, -6.76146999e-04, 1.06674293e-02,
-                    -1.42635051e-02, -2.69631781e-02, -1.45033030e-02
+                    -2.37224363e-02, -5.88588836e-03, -3.70502457e-05,
+                    2.01787297e-02, -6.76134136e-04, 1.06674768e-02,
+                    -1.42634623e-02, -2.69631669e-02, -1.45033086e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
                     2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
@@ -449,17 +449,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00662361, 0.00312235, 0.00551808, -0.00246222, -0.00740199,
-                -0.00485701
+                0.01268335, 0.0037579, 0.00848123, -0.00142691, -0.01070163,
+                -0.00376089
             ], [
-                0.00769208, -0.00126583, 0.00385219, -0.00581112, 0.00463287,
-                -0.00786337
+                0.00720011, -0.00228102, 0.00441621, -0.00457868, 0.00447713,
+                -0.00727072
             ], [
-                -0.00247822, 0.00057941, -0.00170188, -0.00142584, -0.00781181,
-                -0.01107408
+                -0.00199079, -0.00120572, -0.00187508, -0.00147542, -0.00721159,
+                -0.01003917
             ], [
-                0.00094966, -0.00428958, -0.00139054, 0.00062966, -0.00214899,
-                0.00652728
+                0.00095144, -0.004293, -0.00139154, 0.00063027, -0.00214963,
+                0.0065336
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -480,41 +480,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                1.74749165e-03, 1.95862399e-03, 2.12293095e-03, -3.75889172e-03,
-                -4.39571124e-03, -6.32379763e-03
+                1.74922391e-03, 1.85935036e-03, 1.90880906e-03, -3.96941090e-03,
+                -4.17229906e-03, -6.65769773e-03
             ], [
-                2.33045570e-03, 1.99094601e-03, 1.98377599e-03, -3.87950847e-03,
-                -3.42792575e-03, -6.17497414e-03
+                1.99638237e-03, 1.91135216e-03, 1.73234346e-03, -4.00905171e-03,
+                -3.15058464e-03, -6.34974428e-03
             ], [
-                1.65032526e-03, 1.96972815e-03, 2.03462853e-03, -3.82007333e-03,
-                -3.46369296e-03, -6.54224353e-03
+                2.08854163e-03, 2.13832827e-03, 2.49780947e-03, -3.52849509e-03,
+                -3.96897132e-03, -6.12034509e-03
             ]], [[
-                4.77780215e-03, -1.98677275e-03, 3.30950436e-03,
-                -2.68179504e-03, 3.56271653e-03, -4.67860466e-03
+                4.76492243e-03, -1.97180966e-03, 3.29327444e-03,
+                -2.68205139e-03, 3.55229783e-03, -4.66645230e-03
             ], [
-                5.13039157e-03, -2.02797214e-03, 3.50760575e-03,
-                -2.83981953e-03, 3.13726603e-03, -5.31156827e-03
+                5.24956919e-03, -2.00631656e-03, 3.53828911e-03,
+                -2.96283513e-03, 3.20920302e-03, -5.43697737e-03
             ], [
-                5.17205056e-03, -2.16446724e-03, 3.53219034e-03,
-                -2.86490913e-03, 3.17879021e-03, -5.17592067e-03
+                5.30424621e-03, -2.17913301e-03, 3.59509978e-03,
+                -2.97106663e-03, 3.26450402e-03, -5.31189423e-03
             ]], [[
-                -1.38538703e-03, -6.40910701e-04, -2.02864106e-03,
-                -1.79018872e-03, -5.18789608e-03, -8.95875692e-03
+                -1.36440888e-03, -9.75572329e-04, -2.11284542e-03,
+                -1.84616144e-03, -5.31351101e-03, -9.12462734e-03
             ], [
-                -1.38620089e-03, -7.92010222e-04, -1.91070826e-03,
-                -1.76206254e-03, -5.56525169e-03, -9.27332044e-03
+                -1.41863467e-03, -1.11081311e-03, -1.94056751e-03,
+                -1.74311269e-03, -5.76282106e-03, -9.29267984e-03
             ], [
-                -1.11966045e-03, -6.07630936e-04, -1.96643686e-03,
-                -1.86803937e-03, -4.93048411e-03, -9.25842486e-03
+                -1.12129003e-03, -8.15156149e-04, -2.01535341e-03,
+                -1.89556007e-03, -5.04226238e-03, -9.37188603e-03
             ]], [[
-                1.50820788e-03, -3.93087184e-03, -9.52563598e-04,
-                8.43994785e-04, -1.29030924e-03, 6.48857141e-03
+                1.55163277e-03, -4.01433324e-03, -9.77111282e-04,
+                8.59013060e-04, -1.30598655e-03, 6.64281659e-03
             ], [
-                1.17029145e-03, -4.45716921e-03, -1.05062663e-03,
-                8.08141369e-04, -2.08062865e-03, 6.23444980e-03
+                1.26811734e-03, -4.64518648e-03, -1.10593368e-03,
+                8.41954607e-04, -2.11594440e-03, 6.58190623e-03
             ], [
-                9.67921398e-04, -4.32466762e-03, -1.40085898e-03,
-                6.35969569e-04, -2.15558149e-03, 6.59212377e-03
+                1.02682540e-03, -4.43787826e-03, -1.43417739e-03,
+                6.56281307e-04, -2.17684195e-03, 6.80128345e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -534,21 +534,21 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.18960866e-02, -8.04429129e-03, -1.48267671e-03,
-                    1.61071159e-02, -1.37981661e-02, -7.57933082e-03,
-                    -8.28570686e-03, -1.18733812e-02, 1.78834442e-02
+                    -2.18942575e-02, -8.05099495e-03, -1.48526859e-03,
+                    1.61030665e-02, -1.37967104e-02, -7.57982396e-03,
+                    -8.28088820e-03, -1.18743815e-02, 1.78839806e-02
                 ], [
-                    1.74204130e-02, -1.41935758e-02, -3.88074201e-03,
-                    3.19713727e-02, -3.54694910e-02, -2.14688145e-02,
-                    -6.21731905e-03, -1.69229065e-03, -1.94492843e-02
+                    1.74203254e-02, -1.41929490e-02, -3.88103351e-03,
+                    3.19709182e-02, -3.54691371e-02, -2.14697979e-02,
+                    -6.21709181e-03, -1.69324467e-03, -1.94495786e-02
                 ], [
-                    -1.14494488e-02, 8.77974741e-03, -1.62960067e-02,
-                    -1.39961652e-02, 1.34879015e-02, -1.04502086e-02,
-                    6.15879148e-03, -9.40956455e-03, -6.57592434e-03
+                    -1.14536462e-02, 8.77809525e-03, -1.62965059e-02,
+                    -1.39955431e-02, 1.34810507e-02, -1.04491040e-02,
+                    6.16097450e-03, -9.40943789e-03, -6.57613343e-03
                 ], [
-                    -4.74739634e-02, -1.19136050e-02, -7.36759976e-05,
-                    4.10547927e-02, -1.36767328e-03, 2.11772677e-02,
-                    -2.80479677e-02, -5.44514805e-02, -2.91903690e-02
+                    -4.74765450e-02, -1.19113335e-02, -7.42897391e-05,
+                    4.10555862e-02, -1.36665069e-03, 2.11814232e-02,
+                    -2.80444007e-02, -5.44504896e-02, -2.91908123e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -557,21 +557,21 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.09839402e-02, -3.97479767e-03, -7.54472159e-04,
-                    7.91201927e-03, -7.02175125e-03, -3.80689627e-03,
-                    -4.22065007e-03, -6.05447078e-03, 8.92056432e-03
+                    -1.09830676e-02, -3.97811923e-03, -7.55793473e-04,
+                    7.91002903e-03, -7.02103321e-03, -3.80714820e-03,
+                    -4.21818346e-03, -6.05497835e-03, 8.92084371e-03
                 ], [
-                    8.68127123e-03, -7.16970162e-03, -1.88375649e-03,
-                    1.62681788e-02, -1.76830534e-02, -1.06617520e-02,
-                    -3.07536125e-03, -8.45551898e-04, -9.99375992e-03
+                    8.68122280e-03, -7.16937613e-03, -1.88389909e-03,
+                    1.62679367e-02, -1.76828820e-02, -1.06622437e-02,
+                    -3.07524228e-03, -8.46030540e-04, -9.99389403e-03
                 ], [
-                    -5.71034756e-03, 4.50129062e-03, -8.07590690e-03,
-                    -6.94835978e-03, 6.75921654e-03, -5.12148207e-03,
-                    3.06083867e-03, -4.61710012e-03, -3.23932176e-03
+                    -5.71245840e-03, 4.50045895e-03, -8.07614625e-03,
+                    -6.94804778e-03, 6.75577158e-03, -5.12094703e-03,
+                    3.06193763e-03, -4.61703911e-03, -3.23943049e-03
                 ], [
-                    -2.37224493e-02, -5.88587578e-03, -3.70525813e-05,
-                    2.01787278e-02, -6.76127791e-04, 1.06675029e-02,
-                    -1.42634306e-02, -2.69631632e-02, -1.45033058e-02
+                    -2.37237271e-02, -5.88475820e-03, -3.73612711e-05,
+                    2.01791357e-02, -6.75620860e-04, 1.06695695e-02,
+                    -1.42616741e-02, -2.69626491e-02, -1.45035451e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
                     2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
@@ -580,17 +580,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00165033, 0.00196973, 0.00203463, -0.00382007, -0.00346369,
-                -0.00654224
+                0.00208854, 0.00213833, 0.00249781, -0.0035285, -0.00396897,
+                -0.00612035
             ], [
-                0.00517205, -0.00216447, 0.00353219, -0.00286491, 0.00317879,
-                -0.00517592
+                0.00530425, -0.00217913, 0.0035951, -0.00297107, 0.0032645,
+                -0.00531189
             ], [
-                -0.00111966, -0.00060763, -0.00196644, -0.00186804, -0.00493048,
-                -0.00925842
+                -0.00112129, -0.00081516, -0.00201535, -0.00189556, -0.00504226,
+                -0.00937189
             ], [
-                0.00096792, -0.00432467, -0.00140086, 0.00063597, -0.00215558,
-                0.00659212
+                0.00102683, -0.00443788, -0.00143418, 0.00065628, -0.00217684,
+                0.00680128
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -613,41 +613,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                1.74749165e-03, 1.95862399e-03, 2.12293095e-03, -3.75889172e-03,
-                -4.39571124e-03, -6.32379763e-03
+                1.74922391e-03, 1.85935036e-03, 1.90880906e-03, -3.96941090e-03,
+                -4.17229906e-03, -6.65769773e-03
             ], [
-                2.33045570e-03, 1.99094601e-03, 1.98377599e-03, -3.87950847e-03,
-                -3.42792575e-03, -6.17497414e-03
+                1.99638237e-03, 1.91135216e-03, 1.73234346e-03, -4.00905171e-03,
+                -3.15058464e-03, -6.34974428e-03
             ], [
-                1.65032526e-03, 1.96972815e-03, 2.03462853e-03, -3.82007333e-03,
-                -3.46369296e-03, -6.54224353e-03
+                2.08854163e-03, 2.13832827e-03, 2.49780947e-03, -3.52849509e-03,
+                -3.96897132e-03, -6.12034509e-03
             ]], [[
-                4.77780215e-03, -1.98677275e-03, 3.30950436e-03,
-                -2.68179504e-03, 3.56271653e-03, -4.67860466e-03
+                4.76492243e-03, -1.97180966e-03, 3.29327444e-03,
+                -2.68205139e-03, 3.55229783e-03, -4.66645230e-03
             ], [
-                5.13039157e-03, -2.02797214e-03, 3.50760575e-03,
-                -2.83981953e-03, 3.13726603e-03, -5.31156827e-03
+                5.24956919e-03, -2.00631656e-03, 3.53828911e-03,
+                -2.96283513e-03, 3.20920302e-03, -5.43697737e-03
             ], [
-                5.17205056e-03, -2.16446724e-03, 3.53219034e-03,
-                -2.86490913e-03, 3.17879021e-03, -5.17592067e-03
+                5.30424621e-03, -2.17913301e-03, 3.59509978e-03,
+                -2.97106663e-03, 3.26450402e-03, -5.31189423e-03
             ]], [[
-                -1.38538703e-03, -6.40910701e-04, -2.02864106e-03,
-                -1.79018872e-03, -5.18789608e-03, -8.95875692e-03
+                -1.36440888e-03, -9.75572329e-04, -2.11284542e-03,
+                -1.84616144e-03, -5.31351101e-03, -9.12462734e-03
             ], [
-                -1.38620089e-03, -7.92010222e-04, -1.91070826e-03,
-                -1.76206254e-03, -5.56525169e-03, -9.27332044e-03
+                -1.41863467e-03, -1.11081311e-03, -1.94056751e-03,
+                -1.74311269e-03, -5.76282106e-03, -9.29267984e-03
             ], [
-                -1.11966045e-03, -6.07630936e-04, -1.96643686e-03,
-                -1.86803937e-03, -4.93048411e-03, -9.25842486e-03
+                -1.12129003e-03, -8.15156149e-04, -2.01535341e-03,
+                -1.89556007e-03, -5.04226238e-03, -9.37188603e-03
             ]], [[
-                1.50820788e-03, -3.93087184e-03, -9.52563598e-04,
-                8.43994785e-04, -1.29030924e-03, 6.48857141e-03
+                1.55163277e-03, -4.01433324e-03, -9.77111282e-04,
+                8.59013060e-04, -1.30598655e-03, 6.64281659e-03
             ], [
-                1.17029145e-03, -4.45716921e-03, -1.05062663e-03,
-                8.08141369e-04, -2.08062865e-03, 6.23444980e-03
+                1.26811734e-03, -4.64518648e-03, -1.10593368e-03,
+                8.41954607e-04, -2.11594440e-03, 6.58190623e-03
             ], [
-                9.67921398e-04, -4.32466762e-03, -1.40085898e-03,
-                6.35969569e-04, -2.15558149e-03, 6.59212377e-03
+                1.02682540e-03, -4.43787826e-03, -1.43417739e-03,
+                6.56281307e-04, -2.17684195e-03, 6.80128345e-03
             ]], [[
                 -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
                 -1.56512906e-04, 9.63474595e-05
@@ -667,21 +667,21 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -2.18960866e-02, -8.04429129e-03, -1.48267671e-03,
-                    1.61071159e-02, -1.37981661e-02, -7.57933082e-03,
-                    -8.28570686e-03, -1.18733812e-02, 1.78834442e-02
+                    -2.18942575e-02, -8.05099495e-03, -1.48526859e-03,
+                    1.61030665e-02, -1.37967104e-02, -7.57982396e-03,
+                    -8.28088820e-03, -1.18743815e-02, 1.78839806e-02
                 ], [
-                    1.74204130e-02, -1.41935758e-02, -3.88074201e-03,
-                    3.19713727e-02, -3.54694910e-02, -2.14688145e-02,
-                    -6.21731905e-03, -1.69229065e-03, -1.94492843e-02
+                    1.74203254e-02, -1.41929490e-02, -3.88103351e-03,
+                    3.19709182e-02, -3.54691371e-02, -2.14697979e-02,
+                    -6.21709181e-03, -1.69324467e-03, -1.94495786e-02
                 ], [
-                    -1.14494488e-02, 8.77974741e-03, -1.62960067e-02,
-                    -1.39961652e-02, 1.34879015e-02, -1.04502086e-02,
-                    6.15879148e-03, -9.40956455e-03, -6.57592434e-03
+                    -1.14536462e-02, 8.77809525e-03, -1.62965059e-02,
+                    -1.39955431e-02, 1.34810507e-02, -1.04491040e-02,
+                    6.16097450e-03, -9.40943789e-03, -6.57613343e-03
                 ], [
-                    -4.74739634e-02, -1.19136050e-02, -7.36759976e-05,
-                    4.10547927e-02, -1.36767328e-03, 2.11772677e-02,
-                    -2.80479677e-02, -5.44514805e-02, -2.91903690e-02
+                    -4.74765450e-02, -1.19113335e-02, -7.42897391e-05,
+                    4.10555862e-02, -1.36665069e-03, 2.11814232e-02,
+                    -2.80444007e-02, -5.44504896e-02, -2.91908123e-02
                 ], [
                     2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
                     5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
@@ -690,21 +690,21 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -1.09839402e-02, -3.97479767e-03, -7.54472159e-04,
-                    7.91201927e-03, -7.02175125e-03, -3.80689627e-03,
-                    -4.22065007e-03, -6.05447078e-03, 8.92056432e-03
+                    -1.09830676e-02, -3.97811923e-03, -7.55793473e-04,
+                    7.91002903e-03, -7.02103321e-03, -3.80714820e-03,
+                    -4.21818346e-03, -6.05497835e-03, 8.92084371e-03
                 ], [
-                    8.68127123e-03, -7.16970162e-03, -1.88375649e-03,
-                    1.62681788e-02, -1.76830534e-02, -1.06617520e-02,
-                    -3.07536125e-03, -8.45551898e-04, -9.99375992e-03
+                    8.68122280e-03, -7.16937613e-03, -1.88389909e-03,
+                    1.62679367e-02, -1.76828820e-02, -1.06622437e-02,
+                    -3.07524228e-03, -8.46030540e-04, -9.99389403e-03
                 ], [
-                    -5.71034756e-03, 4.50129062e-03, -8.07590690e-03,
-                    -6.94835978e-03, 6.75921654e-03, -5.12148207e-03,
-                    3.06083867e-03, -4.61710012e-03, -3.23932176e-03
+                    -5.71245840e-03, 4.50045895e-03, -8.07614625e-03,
+                    -6.94804778e-03, 6.75577158e-03, -5.12094703e-03,
+                    3.06193763e-03, -4.61703911e-03, -3.23943049e-03
                 ], [
-                    -2.37224493e-02, -5.88587578e-03, -3.70525813e-05,
-                    2.01787278e-02, -6.76127791e-04, 1.06675029e-02,
-                    -1.42634306e-02, -2.69631632e-02, -1.45033058e-02
+                    -2.37237271e-02, -5.88475820e-03, -3.73612711e-05,
+                    2.01791357e-02, -6.75620860e-04, 1.06695695e-02,
+                    -1.42616741e-02, -2.69626491e-02, -1.45035451e-02
                 ], [
                     1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
                     2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
@@ -713,17 +713,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                0.00165033, 0.00196973, 0.00203463, -0.00382007, -0.00346369,
-                -0.00654224
+                0.00208854, 0.00213833, 0.00249781, -0.0035285, -0.00396897,
+                -0.00612035
             ], [
-                0.00517205, -0.00216447, 0.00353219, -0.00286491, 0.00317879,
-                -0.00517592
+                0.00530425, -0.00217913, 0.0035951, -0.00297107, 0.0032645,
+                -0.00531189
             ], [
-                -0.00111966, -0.00060763, -0.00196644, -0.00186804, -0.00493048,
-                -0.00925842
+                -0.00112129, -0.00081516, -0.00201535, -0.00189556, -0.00504226,
+                -0.00937189
             ], [
-                0.00096792, -0.00432467, -0.00140086, 0.00063597, -0.00215558,
-                0.00659212
+                0.00102683, -0.00443788, -0.00143418, 0.00065628, -0.00217684,
+                0.00680128
             ], [
                 0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
                 -0.00026981
@@ -745,41 +745,41 @@ class AttentionWrapperTest(test.TestCase):
     expected_final_output = BasicDecoderOutput(
         rnn_output=array(
             [[[
-                -0.24277855, -0.07872247, 0.15671003, 0.24866608, 0.30515286,
-                -0.24618624, 0.0507621, 0.18785201, -0.16496147, -0.138405
+                -0.24223405, -0.07791166, 0.15451428, 0.24738294, 0.30900395,
+                -0.24685201, 0.04992372, 0.18749543, -0.15878429, -0.13678923
             ], [
-                -0.24277849, -0.07872227, 0.15671015, 0.24866594, 0.30515245,
-                -0.24618617, 0.05076224, 0.18785192, -0.16496134, -0.13840486
+                -0.2422339, -0.07791159, 0.15451418, 0.24738279, 0.30900383,
+                -0.24685188, 0.04992369, 0.18749531, -0.15878411, -0.13678911
             ], [
-                -0.24277903, -0.07872239, 0.15671065, 0.24866652, 0.30515283,
-                -0.24618667, 0.05076243, 0.18785232, -0.16496192, -0.13840519
+                -0.2422343, -0.07791215, 0.15451413, 0.24738336, 0.30900475,
+                -0.2468522, 0.04992349, 0.18749571, -0.158785, -0.13678965
             ]], [[
-                0.39683789, 0.12260036, -0.06023827, -0.09247135, 0.11370862,
-                -0.1547074, 0.00654875, -0.26491123, 0.08399884, 0.1876322
+                0.40035266, 0.12299616, -0.06085059, -0.09197108, 0.11368551,
+                -0.15302914, 0.00566157, -0.26885766, 0.08546552, 0.18886778
             ], [
-                0.39683688, 0.12260011, -0.06023812, -0.09247123, 0.11370841,
-                -0.15470725, 0.00654882, -0.26491043, 0.08399857, 0.18763176
+                0.40035242, 0.12299603, -0.06085056, -0.09197091, 0.11368536,
+                -0.15302882, 0.0056615, -0.26885763, 0.08546554, 0.18886763
             ], [
-                0.39683694, 0.12260016, -0.06023812, -0.09247129, 0.11370847,
-                -0.1547074, 0.00654885, -0.2649104, 0.08399855, 0.18763182
+                0.40035242, 0.122996, -0.06085056, -0.09197087, 0.11368532,
+                -0.1530287, 0.00566146, -0.26885769, 0.08546556, 0.18886761
             ]], [[
-                -0.432805, 0.07398784, -0.01561836, 0.19199517, -0.02651545,
-                -0.21643993, -0.02017856, 0.00162333, 0.21297953, 0.25590748
+                -0.4311333, 0.07519469, -0.01551808, 0.1913045, -0.02693807,
+                -0.21668895, -0.02155721, 0.0013397, 0.21180844, 0.25578707
             ], [
-                -0.43280441, 0.07398778, -0.01561838, 0.19199494, -0.02651539,
-                -0.2164396, -0.02017859, 0.00162333, 0.2129792, 0.25590718
+                -0.43113309, 0.07519454, -0.01551818, 0.19130446, -0.0269379,
+                -0.21668854, -0.021557, 0.00133975, 0.21180828, 0.25578681
             ], [
-                -0.43280473, 0.07398786, -0.01561838, 0.19199508, -0.02651543,
-                -0.21643978, -0.02017862, 0.00162333, 0.21297936, 0.25590736
+                -0.43113324, 0.07519463, -0.01551815, 0.1913045, -0.02693798,
+                -0.21668874, -0.02155712, 0.00133973, 0.21180835, 0.25578696
             ]], [[
-                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
-                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+                0.07059932, 0.16451572, 0.01174669, 0.04646531, 0.1427598,
+                0.0794456, -0.10852993, 0.15306188, 0.02151393, -0.05590061
             ], [
-                0.07059769, 0.16451195, 0.01174642, 0.04646424, 0.14275652,
-                0.07944378, -0.10852744, 0.15305838, 0.02151344, -0.05589932
+                0.07059933, 0.16451576, 0.01174669, 0.04646532, 0.14275983,
+                0.07944562, -0.10852996, 0.15306193, 0.02151394, -0.05590062
             ], [
-                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
-                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+                0.07059937, 0.16451585, 0.0117467, 0.04646534, 0.1427599,
+                0.07944567, -0.10853001, 0.153062, 0.02151395, -0.05590065
             ]], [[0., 0., 0., 0., 0., 0., 0., 0., 0.,
                   0.], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.],
                  [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]]],
@@ -792,20 +792,19 @@ class AttentionWrapperTest(test.TestCase):
         cell_state=LSTMStateTuple(
             c=array(
                 [[
-                    -0.01816516, -0.01675301, -0.00513183, 0.01560374,
-                    -0.01254231, -0.00434179, -0.01262734, -0.01721472,
-                    0.02279618
+                    -0.0181195, -0.01675365, -0.00510353, 0.01559796,
+                    -0.01251448, -0.00437002, -0.01243257, -0.01720199,
+                    0.02274928
                 ], [
-                    0.01265936, -0.00846189, -0.00376618, 0.0313628,
-                    -0.03488337, -0.02464793, -0.00498007, -0.00459409,
-                    -0.02097382
+                    0.01259979, -0.00839985, -0.00374037, 0.03136262,
+                    -0.03486227, -0.02466441, -0.00496157, -0.00461032,
+                    -0.02098336
                 ], [
-                    -0.00780995, 0.00314269, -0.01383716, -0.01147376,
-                    0.00483319, -0.01340735, 0.00865264, -0.00632812,
-                    -0.01053766
+                    -0.00781067, 0.00315682, -0.0138283, -0.01149793,
+                    0.00485562, -0.01343193, 0.0085915, -0.00632846, -0.01052086
                 ], [
-                    -0.04184838, -0.01223641, 0.00094449, 0.03911438,
-                    0.00432476, 0.0222066, -0.0300624, -0.05418365, -0.0261539
+                    -0.04184828, -0.01223641, 0.0009445, 0.03911434, 0.0043249,
+                    0.02220661, -0.03006243, -0.05418363, -0.02615385
                 ], [
                     0.02282745, -0.00143833, 0.01918138, 0.00545033,
                     -0.01258384, -0.00303765, -0.00511231, 0.02166323,
@@ -814,20 +813,19 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32),
             h=array(
                 [[
-                    -0.00912324, -0.00827531, -0.00261125, 0.00765155,
-                    -0.00636977, -0.00217171, -0.00643897, -0.00876094,
-                    0.01136858
+                    -0.00910065, -0.00827571, -0.00259689, 0.00764857,
+                    -0.00635579, -0.00218579, -0.00633918, -0.00875511,
+                    0.01134532
                 ], [
-                    0.00629574, -0.00427225, -0.00182555, 0.01597121,
-                    -0.01734862, -0.01224119, -0.00245434, -0.0023048,
-                    -0.01077694
+                    0.00626597, -0.004241, -0.00181303, 0.01597157, -0.0173375,
+                    -0.01224921, -0.00244522, -0.00231299, -0.0107822
                 ], [
-                    -0.00391358, 0.00161294, -0.00683057, -0.00569066,
-                    0.0024297, -0.00658555, 0.00429511, -0.00309842, -0.00520863
+                    -0.00391383, 0.00162017, -0.00682621, -0.00570264,
+                    0.00244099, -0.00659772, 0.00426475, -0.00309861,
+                    -0.00520028
                 ], [
-                    -0.02087489, -0.00603306, 0.00047561, 0.01920064,
-                    0.00213868, 0.01115329, -0.01526589, -0.02687524,
-                    -0.01297526
+                    -0.02087484, -0.00603306, 0.00047561, 0.01920062,
+                    0.00213875, 0.01115329, -0.0152659, -0.02687523, -0.01297523
                 ], [
                     0.01138975, -0.00070959, 0.00986007, 0.0027323, -0.00645386,
                     -0.00152054, -0.00257339, 0.01103063, 0.00800891
@@ -835,17 +833,17 @@ class AttentionWrapperTest(test.TestCase):
                 dtype=float32)),
         attention=array(
             [[
-                -0.24277903, -0.07872239, 0.15671065, 0.24866652, 0.30515283,
-                -0.24618667, 0.05076243, 0.18785232, -0.16496192, -0.13840519
+                -0.2422343, -0.07791215, 0.15451413, 0.24738336, 0.30900475,
+                -0.2468522, 0.04992349, 0.18749571, -0.158785, -0.13678965
             ], [
-                0.39683694, 0.12260016, -0.06023812, -0.09247129, 0.11370847,
-                -0.1547074, 0.00654885, -0.2649104, 0.08399855, 0.18763182
+                0.40035242, 0.122996, -0.06085056, -0.09197087, 0.11368532,
+                -0.1530287, 0.00566146, -0.26885769, 0.08546556, 0.18886761
             ], [
-                -0.43280473, 0.07398786, -0.01561838, 0.19199508, -0.02651543,
-                -0.21643978, -0.02017862, 0.00162333, 0.21297936, 0.25590736
+                -0.43113324, 0.07519463, -0.01551815, 0.1913045, -0.02693798,
+                -0.21668874, -0.02155712, 0.00133973, 0.21180835, 0.25578696
             ], [
-                0.07059769, 0.16451193, 0.01174642, 0.04646424, 0.14275651,
-                0.07944378, -0.10852743, 0.15305836, 0.02151343, -0.05589932
+                0.07059937, 0.16451585, 0.0117467, 0.04646534, 0.1427599,
+                0.07944567, -0.10853001, 0.153062, 0.02151395, -0.05590065
             ], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]],
             dtype=float32),
         time=3,
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
index 732b0db930..cb0cb4f8c3 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/beam_search_decoder_test.py
@@ -245,10 +245,14 @@ class BeamSearchDecoderTest(test.TestCase):
       if has_attention:
         inputs = np.random.randn(batch_size, decoder_max_time,
                                  input_depth).astype(np.float32)
+        tiled_inputs = beam_search_decoder.tile_batch(
+            inputs, multiplier=beam_width)
+        tiled_sequence_length = beam_search_decoder.tile_batch(
+            encoder_sequence_length, multiplier=beam_width)
         attention_mechanism = attention_wrapper.BahdanauAttention(
             num_units=attention_depth,
-            memory=inputs,
-            memory_sequence_length=encoder_sequence_length)
+            memory=tiled_inputs,
+            memory_sequence_length=tiled_sequence_length)
         cell = attention_wrapper.AttentionWrapper(
             cell=cell,
             attention_mechanism=attention_mechanism,
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 3a3d0b8aec..04b38159bb 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -28,6 +28,7 @@ from tensorflow.python.framework import tensor_shape
 from tensorflow.python.layers import base as layers_base
 from tensorflow.python.layers import core as layers_core
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
@@ -72,6 +73,8 @@ def _prepare_memory(memory, memory_sequence_length, check_inner_dims_defined):
   """
   memory = nest.map_structure(
       lambda m: ops.convert_to_tensor(m, name="memory"), memory)
+  memory_sequence_length = ops.convert_to_tensor(
+      memory_sequence_length, name="memory_sequence_length")
   if check_inner_dims_defined:
     def _check_dims(m):
       if not m.get_shape()[2:].is_fully_defined():
@@ -85,15 +88,24 @@ def _prepare_memory(memory, memory_sequence_length, check_inner_dims_defined):
         memory_sequence_length,
         maxlen=array_ops.shape(nest.flatten(memory)[0])[1],
         dtype=nest.flatten(memory)[0].dtype)
+    seq_len_batch_size = (
+        memory_sequence_length.shape[0].value
+        or array_ops.shape(memory_sequence_length)[0])
   def _maybe_mask(m, seq_len_mask):
     rank = m.get_shape().ndims
     rank = rank if rank is not None else array_ops.rank(m)
     extra_ones = array_ops.ones(rank - 2, dtype=dtypes.int32)
+    m_batch_size = m.shape[0].value or array_ops.shape(m)[0]
     if memory_sequence_length is not None:
-      seq_len_mask = array_ops.reshape(
-          seq_len_mask,
-          array_ops.concat((array_ops.shape(seq_len_mask), extra_ones), 0))
-      return m * seq_len_mask
+      message = ("memory_sequence_length and memory tensor batch sizes do not "
+                 "match.")
+      with ops.control_dependencies([
+          check_ops.assert_equal(
+              seq_len_batch_size, m_batch_size, message=message)]):
+        seq_len_mask = array_ops.reshape(
+            seq_len_mask,
+            array_ops.concat((array_ops.shape(seq_len_mask), extra_ones), 0))
+        return m * seq_len_mask
     else:
       return m
   return nest.map_structure(lambda m: _maybe_mask(m, seq_len_mask), memory)
@@ -108,7 +120,8 @@ class _BaseAttentionMechanism(AttentionMechanism):
   """
 
   def __init__(self, query_layer, memory, memory_sequence_length=None,
-               memory_layer=None, check_inner_dims_defined=True, name=None):
+               memory_layer=None, check_inner_dims_defined=True,
+               name=None):
     """Construct base AttentionMechanism class.
 
     Args:
@@ -147,6 +160,8 @@ class _BaseAttentionMechanism(AttentionMechanism):
       self._keys = (
           self.memory_layer(self._values) if self.memory_layer  # pylint: disable=not-callable
           else self._values)
+      self._batch_size = (
+          self._keys.shape[0].value or array_ops.shape(self._keys)[0])
 
   @property
   def memory_layer(self):
@@ -164,6 +179,10 @@ class _BaseAttentionMechanism(AttentionMechanism):
   def keys(self):
     return self._keys
 
+  @property
+  def batch_size(self):
+    return self._batch_size
+
 
 class LuongAttention(_BaseAttentionMechanism):
   """Implements Luong-style (multiplicative) attention scoring.
@@ -213,14 +232,12 @@ class LuongAttention(_BaseAttentionMechanism):
     self._scale = scale
     self._name = name
 
-  def __call__(self, query, tiling_factor=1):
+  def __call__(self, query):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
-      tiling_factor: An integer factor for which to tile the batch dimension.
-        Used with BeamSearchDecoder.
 
     Returns:
       score: Tensor of dtype matching `self.values` and shape
@@ -317,14 +334,12 @@ class BahdanauAttention(_BaseAttentionMechanism):
     self._normalize = normalize
     self._name = name
 
-  def __call__(self, query, tiling_factor=1):
+  def __call__(self, query):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
-      tiling_factor: An integer factor for which to tile the batch dimension.
-        Used with BeamSearchDecoder.
 
     Returns:
       score: Tensor of dtype matching `self.values` and shape
@@ -335,7 +350,7 @@ class BahdanauAttention(_BaseAttentionMechanism):
       dtype = processed_query.dtype
       # Reshape from [batch_size, ...] to [batch_size, 1, ...] for broadcasting.
       processed_query = array_ops.expand_dims(processed_query, 1)
-      keys = _maybe_tile_batch(self.keys, tiling_factor)
+      keys = self._keys
       v = variable_scope.get_variable(
           "attention_v", [self._num_units], dtype=dtype)
       if self._normalize:
@@ -428,6 +443,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
                cell_input_fn=None,
                probability_fn=None,
                output_attention=True,
+               initial_cell_state=None,
                name=None):
     """Construct the `AttentionWrapper`.
 
@@ -454,6 +470,11 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         propagated to the next time step via the state and is used there.
         This flag only controls whether the attention mechanism is propagated
         up to the next cell in an RNN stack or to the top RNN output.
+      initial_cell_state: The initial state value to use for the cell when
+        the user calls `zero_state()`.  Note that if this value is provided
+        now, and the user uses a `batch_size` argument of `zero_state` which
+        does not match the batch size of `initial_cell_state`, proper
+        behavior is not guaranteed.
       name: Name to use when creating ops.
     """
     super(AttentionWrapper, self).__init__()
@@ -475,7 +496,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     if probability_fn is None:
       probability_fn = nn_ops.softmax
     else:
-      if not callable(probability_fn):
+      if not callable(cell_input_fn):
         raise TypeError(
             "probability_fn must be callable, saw type: %s"
             % type(probability_fn).__name__)
@@ -494,6 +515,28 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     self._probability_fn = probability_fn
     self._output_attention = output_attention
     self._alignment_history = alignment_history
+    with ops.name_scope(name, "AttentionWrapperInit"):
+      if initial_cell_state is None:
+        self._initial_cell_state = None
+      else:
+        final_state_tensor = nest.flatten(initial_cell_state)[-1]
+        state_batch_size = (
+            final_state_tensor.shape[0].value
+            or array_ops.shape(final_state_tensor)[0])
+        error_message = (
+            "When constructing AttentionWrapper %s: " % self._base_name +
+            "Non-matching batch sizes between the memory "
+            "(encoder output) and initial_cell_state.  Are you using "
+            "the BeamSearchDecoder?  You may need to tile your initial state "
+            "via the tf.contrib.seq2seq.tile_batch function with argument "
+            "multiple=beam_width.")
+        with ops.control_dependencies(
+            [check_ops.assert_equal(state_batch_size,
+                                    self._attention_mechanism.batch_size,
+                                    message=error_message)]):
+          self._initial_cell_state = nest.map_structure(
+              lambda s: array_ops.identity(s, name="check_initial_cell_state"),
+              initial_cell_state)
 
   @property
   def output_size(self):
@@ -512,19 +555,38 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
 
   def zero_state(self, batch_size, dtype):
     with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
+      if self._initial_cell_state is not None:
+        cell_state = self._initial_cell_state
+      else:
+        cell_state = self._cell.zero_state(batch_size, dtype)
+      error_message = (
+          "When calling zero_state of AttentionWrapper %s: " % self._base_name +
+          "Non-matching batch sizes between the memory "
+          "(encoder output) and the requested batch size.  Are you using "
+          "the BeamSearchDecoder?  If so, make sure your encoder output has "
+          "been tiled to beam_width via tf.contrib.seq2seq.tile_batch, and "
+          "the batch_size= argument passed to zero_state is "
+          "batch_size * beam_width.")
+      with ops.control_dependencies(
+          [check_ops.assert_equal(batch_size,
+                                  self._attention_mechanism.batch_size,
+                                  message=error_message)]):
+        cell_state = nest.map_structure(
+            lambda s: array_ops.identity(s, name="checked_cell_state"),
+            cell_state)
       if self._alignment_history:
         alignment_history = tensor_array_ops.TensorArray(
             dtype=dtype, size=0, dynamic_size=True)
       else:
         alignment_history = ()
       return AttentionWrapperState(
-          cell_state=self._cell.zero_state(batch_size, dtype),
+          cell_state=cell_state,
           time=array_ops.zeros([], dtype=dtypes.int32),
           attention=_zero_state_tensors(self._attention_size, batch_size,
                                         dtype),
           alignment_history=alignment_history)
 
-  def __call__(self, inputs, state, tiling_factor=1):
+  def call(self, inputs, state):
     """Perform a step of attention-wrapped RNN.
 
     - Step 1: Mix the `inputs` and previous step's `attention` output via
@@ -543,8 +605,6 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       inputs: (Possibly nested tuple of) Tensor, the input at this time step.
       state: An instance of `AttentionWrapperState` containing
         tensors from the previous time step.
-      tiling_factor: An integer factor for which to tile the batch dimension.
-        Used with BeamSearchDecoder.
 
     Returns:
       A tuple `(attention_or_cell_output, next_state)`, where:
@@ -552,81 +612,67 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       - `attention_or_cell_output` depending on `output_attention`.
       - `next_state` is an instance of `DynamicAttentionWrapperState`
          containing the state calculated at this time step.
-
-    Raises:
-      NotImplementedError: if `scope` is not `None`.
     """
-    # Step 1: Calculate the true inputs to the cell based on the
-    # previous attention value.
-    cell_inputs = self._cell_input_fn(inputs, state.attention)
-    cell_state = state.cell_state
-    cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
-
-    score = self._attention_mechanism(cell_output, tiling_factor)
-    alignments = self._probability_fn(score)
-
-    # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
-    expanded_alignments = array_ops.expand_dims(alignments, 1)
-    # Context is the inner product of alignments and values along the
-    # memory time dimension.
-    # alignments shape is
-    #   [batch_size, 1, memory_time]
-    # attention_mechanism.values shape is
-    #   [batch_size, memory_time, attention_values_dim]
-    # the batched matmul is over memory_time, so the output shape is
-    #   [batch_size, 1, attention_values_dim].
-    # we then squeeze out the singleton dim.
-    attention_mechanism_values = _maybe_tile_batch(
-        self._attention_mechanism.values, tiling_factor)
-
-    context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
-    context = array_ops.squeeze(context, [1])
-
-    if self._attention_layer is not None:
-      attention = self._attention_layer(
-          array_ops.concat([cell_output, context], 1))
-    else:
-      attention = context
+    with variable_scope.variable_scope("attention"):
+      # Step 1: Calculate the true inputs to the cell based on the
+      # previous attention value.
+      cell_inputs = self._cell_input_fn(inputs, state.attention)
+      cell_state = state.cell_state
+      cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
+
+      cell_batch_size = (
+          cell_output.shape[0].value or array_ops.shape(cell_output)[0])
+      error_message = (
+          "When applying AttentionWrapper %s: " % self.name +
+          "Non-matching batch sizes between the memory "
+          "(encoder output) and the query (decoder output).  Are you using "
+          "the BeamSearchDecoder?  You may need to tile your memory input via "
+          "the tf.contrib.seq2seq.tile_batch function with argument "
+          "multiple=beam_width.")
+      with ops.control_dependencies(
+          [check_ops.assert_equal(cell_batch_size,
+                                  self._attention_mechanism.batch_size,
+                                  message=error_message)]):
+        cell_output = array_ops.identity(
+            cell_output, name="checked_cell_output")
+
+      score = self._attention_mechanism(cell_output)
+      alignments = self._probability_fn(score)
+
+      # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
+      expanded_alignments = array_ops.expand_dims(alignments, 1)
+      # Context is the inner product of alignments and values along the
+      # memory time dimension.
+      # alignments shape is
+      #   [batch_size, 1, memory_time]
+      # attention_mechanism.values shape is
+      #   [batch_size, memory_time, attention_mechanism.num_units]
+      # the batched matmul is over memory_time, so the output shape is
+      #   [batch_size, 1, attention_mechanism.num_units].
+      # we then squeeze out the singleton dim.
+      attention_mechanism_values = self._attention_mechanism.values
+      context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
+      context = array_ops.squeeze(context, [1])
+
+      if self._attention_layer is not None:
+        attention = self._attention_layer(
+            array_ops.concat([cell_output, context], 1))
+      else:
+        attention = context
 
-    if self._alignment_history:
-      alignment_history = state.alignment_history.write(
-          state.time, alignments)
-    else:
-      alignment_history = ()
+      if self._alignment_history:
+        alignment_history = state.alignment_history.write(
+            state.time, alignments)
+      else:
+        alignment_history = ()
 
-    next_state = AttentionWrapperState(
-        time=state.time + 1,
-        cell_state=next_cell_state,
-        attention=attention,
-        alignment_history=alignment_history)
+      next_state = AttentionWrapperState(
+          time=state.time + 1,
+          cell_state=next_cell_state,
+          attention=attention,
+          alignment_history=alignment_history)
 
     if self._output_attention:
       return attention, next_state
     else:
       return cell_output, next_state
-
-
-def _maybe_tile_batch(t, tiling_factor):
-  """Tile the tensor's batch by tiling_factor.
-
-  Here, we tile t such that it looks like [b1, b1, ..., ..., bN, bN, ...].
-
-  Args:
-    t: The tensor to tile.
-    tiling_factor: The amount to tile it.
-
-  Returns:
-    The tiled tensor.
-  """
-  if tiling_factor == 1:
-    return t
-
-  shape = t.get_shape().as_list()
-  shape = [shape[0] * tiling_factor] + shape[1:]
-  tile_values = len(shape)*[1]
-  tile_values.insert(1, tiling_factor)
-  t = array_ops.expand_dims(t, 1)
-  t = array_ops.tile(t, tile_values)
-  t = array_ops.reshape(t, shape)
-  t.set_shape(shape)
-  return t
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index 55ef21a5a0..289da8e6ae 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -33,6 +33,7 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.util import nest
 
 
@@ -41,6 +42,7 @@ __all__ = [
     "BeamSearchDecoderState",
     "BeamSearchDecoder",
     "FinalBeamSearchDecoderOutput",
+    "tile_batch",
 ]
 
 
@@ -70,6 +72,44 @@ class FinalBeamSearchDecoderOutput(
   pass
 
 
+def tile_batch(t, multiplier, name=None):
+  """Tile the batch dimension of tensor t.
+
+  This function takes a tensor t shaped `[batch_size, s0, s1, ...]` composed of
+  minibatch entries `t[0], ..., t[batch_size - 1]` and tiles it to have a shape
+  `[batch_size * multiplier, s0, s1, ...]` composed of minibatch entries
+  `t[0], t[0], ..., t[1], t[1], ...` where each minibatch entry is repeated
+  `multiplier` times.
+
+  Args:
+    t: `Tensor` shaped `[batch_size, ...]`.
+    multiplier: Python int.
+    name: Name scope for any created operations.
+
+  Returns:
+    A `Tensor` shaped `[batch_size * multiplier, ...]`.
+
+  Raises:
+    ValueError: if `t` does not have a statically known rank or it's < 1.
+  """
+  with ops.name_scope(name, "tile_batch", [t, multiplier]):
+    t = ops.convert_to_tensor(t, name="t")
+    shape_t = array_ops.shape(t)
+    if t.shape.ndims is None or t.shape.ndims < 1:
+      raise ValueError("t must have statically known rank")
+    tiling = [1] * (t.shape.ndims + 1)
+    tiling[1] = multiplier
+    tiled_static_batch_size = (
+        t.shape[0].value * multiplier if t.shape[0].value is not None else None)
+    tiled = array_ops.tile(array_ops.expand_dims(t, 1), tiling)
+    tiled = array_ops.reshape(
+        tiled, array_ops.concat(([shape_t[0] * multiplier], shape_t[1:]), 0))
+    tiled.set_shape(
+        tensor_shape.TensorShape(
+            [tiled_static_batch_size]).concatenate(t.shape[1:]))
+    return tiled
+
+
 class BeamSearchDecoder(decoder.Decoder):
   """BeamSearch sampling decoder."""
 
@@ -130,8 +170,9 @@ class BeamSearchDecoder(decoder.Decoder):
     self._batch_size = array_ops.size(start_tokens)
     self._beam_width = beam_width
     self._length_penalty_weight = length_penalty_weight
-    self._initial_cell_state = nest.map_structure(self._maybe_split_batch_beams,
-                                                  initial_state)
+    self._initial_cell_state = nest.map_structure(
+        self._maybe_split_batch_beams,
+        initial_state, self._cell.state_size)
     self._start_tokens = array_ops.tile(
         array_ops.expand_dims(self._start_tokens, 1), [1, self._beam_width])
     self._start_inputs = self._embedding_fn(self._start_tokens)
@@ -223,19 +264,23 @@ class BeamSearchDecoder(decoder.Decoder):
         beam_search_decoder_output=outputs, predicted_ids=predicted_ids)
     return outputs, final_state
 
-  def _merge_batch_beams(self, t):
+  def _merge_batch_beams(self, t, s=None):
     """Merges the tensor from a batch of beams into a batch by beams.
 
-    More exactly, t is a tensor of dimension [batch_size, beam_width, ...]. We
-    reshape this into [batch_size*beam_width, ...]
+    More exactly, t is a tensor of dimension [batch_size, beam_width, s]. We
+    reshape this into [batch_size*beam_width, s]
 
     Args:
-      t: Tensor of dimension [batch_size, beam_width, ...]
+      t: Tensor of dimension [batch_size, beam_width, s]
+      s: (Possibly known) depth shape.
 
     Returns:
-      A reshaped version of t with dimension [batch_size * beam_width, ...].
+      A reshaped version of t with dimension [batch_size * beam_width, s].
     """
-    t_static_shape = t.shape
+    if isinstance(s, ops.Tensor):
+      s = tensor_util.constant_value_as_shape(s)
+    else:
+      s = tensor_shape.TensorShape(s)
     t_shape = array_ops.shape(t)
     static_batch_size = tensor_util.constant_value(self._batch_size)
     batch_size_beam_width = (
@@ -245,67 +290,105 @@ class BeamSearchDecoder(decoder.Decoder):
         t, array_ops.concat(
             ([self._batch_size * self._beam_width], t_shape[2:]), 0))
     reshaped_t.set_shape(
-        (tensor_shape.TensorShape([batch_size_beam_width])
-         .concatenate(t_static_shape[2:])))
+        (tensor_shape.TensorShape([batch_size_beam_width]).concatenate(s)))
     return reshaped_t
 
-  def _split_batch_beams(self, t):
+  def _split_batch_beams(self, t, s=None):
     """Splits the tensor from a batch by beams into a batch of beams.
 
-    More exactly, t is a tensor of dimension [batch_size*beam_width, ...]. We
-    reshape this into [batch_size, beam_width, ...]
+    More exactly, t is a tensor of dimension [batch_size*beam_width, s]. We
+    reshape this into [batch_size, beam_width, s]
 
     Args:
-      t: Tensor of dimension [batch_size*beam_width, ...]
+      t: Tensor of dimension [batch_size*beam_width, s].
+      s: (Possibly known) depth shape.
 
     Returns:
-      A reshaped version of t with dimension [batch_size, beam_width, ...].
+      A reshaped version of t with dimension [batch_size, beam_width, s].
+
+    Raises:
+      ValueError: If, after reshaping, the new tensor is not shaped
+        `[batch_size, beam_width, s]` (assuming batch_size and beam_width
+        are known statically).
     """
-    t_static_shape = t.shape
+    if isinstance(s, ops.Tensor):
+      s = tensor_util.constant_value_as_shape(s)
+    else:
+      s = tensor_shape.TensorShape(s)
     t_shape = array_ops.shape(t)
     reshaped_t = array_ops.reshape(
         t, array_ops.concat(
             ([self._batch_size, self._beam_width], t_shape[1:]), 0))
     static_batch_size = tensor_util.constant_value(self._batch_size)
-    reshaped_t.set_shape(
-        (tensor_shape.TensorShape([static_batch_size, self._beam_width])
-         .concatenate(t_static_shape[1:])))
+    expected_reshaped_shape = tensor_shape.TensorShape(
+        [static_batch_size, self._beam_width]).concatenate(s)
+    if not reshaped_t.shape.is_compatible_with(expected_reshaped_shape):
+      raise ValueError("Unexpected behavior when reshaping between beam width "
+                       "and batch size.  The reshaped tensor has shape: %s.  "
+                       "We expected it to have shape "
+                       "(batch_size, beam_width, depth) == %s.  Perhaps you "
+                       "forgot to create a zero_state with "
+                       "batch_size=encoder_batch_size * beam_width?"
+                       % (reshaped_t.shape, expected_reshaped_shape))
+    reshaped_t.set_shape(expected_reshaped_shape)
     return reshaped_t
 
-  def _maybe_split_batch_beams(self, t):
+  def _maybe_split_batch_beams(self, t, s):
     """Maybe splits the tensor from a batch by beams into a batch of beams.
 
     We do this so that we can use nest and not run into problems with shapes.
 
     Args:
-      t: Tensor of dimension [batch_size*beam_width, ...]
+      t: Tensor of dimension [batch_size*beam_width, s]
+      s: Tensor, Python int, or TensorShape.
 
     Returns:
       Either a reshaped version of t with dimension
-      [batch_size, beam_width, ...] if t's first dimension is of size
+      [batch_size, beam_width, s] if t's first dimension is of size
       batch_size*beam_width or t if not.
+
+    Raises:
+      TypeError: If t is an instance of TensorArray.
+      ValueError: If the rank of t is not statically known.
     """
-    t_shape = t.get_shape().as_list()
-    if len(t_shape) >= 1:
-      return self._split_batch_beams(t)
+    if isinstance(t, tensor_array_ops.TensorArray):
+      raise TypeError(
+          "TensorArray state is not supported by BeamSearchDecoder: %s"
+          % t.name)
+    if t.shape.ndims is None:
+      raise ValueError(
+          "Expected tensor (%s) to have known rank, but ndims == None." % t)
+    if t.shape.ndims >= 1:
+      return self._split_batch_beams(t, s)
     else:
       return t
 
-  def _maybe_merge_batch_beams(self, t):
+  def _maybe_merge_batch_beams(self, t, s):
     """Splits the tensor from a batch by beams into a batch of beams.
 
-    More exactly, t is a tensor of dimension [batch_size*beam_width, ...]. We
-    reshape this into [batch_size, beam_width, ...]
+    More exactly, t is a tensor of dimension [batch_size*beam_width, s]. We
+    reshape this into [batch_size, beam_width, s]
 
     Args:
-      t: Tensor of dimension [batch_size*beam_width, ...]
+      t: Tensor of dimension [batch_size*beam_width, s]
+      s: Tensor, Python int, or TensorShape.
 
     Returns:
-      A reshaped version of t with dimension [batch_size, beam_width, ...].
+      A reshaped version of t with dimension [batch_size, beam_width, s].
+
+    Raises:
+      TypeError: If t is an instance of TensorArray.
+      ValueError:  If the rank of t is not statically known.
     """
-    t_shape = t.get_shape().as_list()
-    if len(t_shape) >= 2:
-      return self._merge_batch_beams(t)
+    if isinstance(t, tensor_array_ops.TensorArray):
+      raise TypeError(
+          "TensorArray state is not supported by BeamSearchDecoder: %s"
+          % t.name)
+    if t.shape.ndims is None:
+      raise ValueError(
+          "Expected tensor (%s) to have known rank, but ndims == None." % t)
+    if t.shape.ndims >= 2:
+      return self._merge_batch_beams(t, s)
     else:
       return t
 
@@ -328,20 +411,18 @@ class BeamSearchDecoder(decoder.Decoder):
 
     with ops.name_scope(name, "BeamSearchDecoderStep", (time, inputs, state)):
       cell_state = state.cell_state
-      inputs = nest.map_structure(self._merge_batch_beams, inputs)
-      cell_state = nest.map_structure(self._maybe_merge_batch_beams, cell_state)
-      try:
-        cell_outputs, next_cell_state = self._cell(
-            inputs, cell_state, tiling_factor=beam_width)
-      except TypeError as e:
-        if "unexpected keyword argument 'tiling_factor'" in str(e):
-          cell_outputs, next_cell_state = self._cell(inputs, cell_state)
-        else:
-          raise
-
-      cell_outputs = nest.map_structure(self._split_batch_beams, cell_outputs)
-      next_cell_state = nest.map_structure(self._maybe_split_batch_beams,
-                                           next_cell_state)
+      inputs = nest.map_structure(
+          lambda inp: self._merge_batch_beams(inp, s=inp.shape[2:]), inputs)
+      cell_state = nest.map_structure(
+          self._maybe_merge_batch_beams,
+          cell_state, self._cell.state_size)
+      cell_outputs, next_cell_state = self._cell(inputs, cell_state)
+
+      cell_outputs = nest.map_structure(
+          lambda out: self._split_batch_beams(out, out.shape[1:]), cell_outputs)
+      next_cell_state = nest.map_structure(
+          self._maybe_split_batch_beams,
+          next_cell_state, self._cell.state_size)
 
       if self._output_layer is not None:
         cell_outputs = self._output_layer(cell_outputs)
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
index 3bad9b8067..f0dabc08a4 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
@@ -17,13 +17,182 @@ limitations under the License.
 
 #include "tensorflow/compiler/tf2xla/xla_op_registry.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
+#include "tensorflow/core/platform/protobuf.h"
 
 namespace tensorflow {
 namespace xla_tf_graph {
 
 namespace {
 
-constexpr const char* const GRAPH_NAME = "xla_tf_graph_util";
+constexpr const char* const GRAPH_NAME = "xla_tf_graph";
+constexpr const char* const NODE_NAME_PREFIX = "xla";
+
+Status ConvertPrimitiveTypeToDataType(const xla::PrimitiveType p_type,
+                                      DataType* d_type) {
+  switch (p_type) {
+    case xla::PRED:
+      *d_type = DT_BOOL;
+      return Status::OK();
+    case xla::S8:
+      *d_type = DT_INT8;
+      return Status::OK();
+    case xla::S16:
+      *d_type = DT_INT16;
+      return Status::OK();
+    case xla::S32:
+      *d_type = DT_INT32;
+      return Status::OK();
+    case xla::S64:
+      *d_type = DT_INT64;
+      return Status::OK();
+    case xla::U8:
+      *d_type = DT_UINT8;
+      return Status::OK();
+    case xla::U16:
+      *d_type = DT_UINT16;
+      return Status::OK();
+    case xla::F16:
+      *d_type = DT_HALF;
+      return Status::OK();
+    case xla::F32:
+      *d_type = DT_FLOAT;
+      return Status::OK();
+    case xla::F64:
+      *d_type = DT_DOUBLE;
+      return Status::OK();
+    default:
+      return errors::InvalidArgument(
+          "Unsupported PrimitiveType in ConvertPrimitiveTypeToDataType ",
+          xla::PrimitiveType_Name(p_type));
+  }
+}
+
+Status ConvertXlaShapeToTensorShapeType(const xla::Shape& xla_shape,
+                                        std::vector<TensorShape>* tensor_shapes,
+                                        std::vector<DataType>* data_types) {
+  switch (xla_shape.element_type()) {
+    case xla::TUPLE: {
+      for (const xla::Shape& element_shape : xla_shape.tuple_shapes()) {
+        if (element_shape.element_type() == xla::TUPLE) {
+          return errors::InvalidArgument("Nested tuple is not allowed.");
+        }
+        TF_RETURN_IF_ERROR(ConvertXlaShapeToTensorShapeType(
+            element_shape, tensor_shapes, data_types));
+      }
+      return Status::OK();
+    }
+    case xla::PRED:
+    case xla::S8:
+    case xla::S16:
+    case xla::S32:
+    case xla::S64:
+    case xla::U8:
+    case xla::U16:
+    case xla::U32:
+    case xla::U64:
+    case xla::F16:
+    case xla::F32:
+    case xla::F64: {
+      TensorShape shape;
+      DataType type;
+      TF_RETURN_IF_ERROR(
+          ConvertPrimitiveTypeToDataType(xla_shape.element_type(), &type));
+      for (const int64& dim : xla_shape.dimensions()) {
+        shape.AddDim(dim);
+      }
+      tensor_shapes->emplace_back(shape);
+      data_types->emplace_back(type);
+      return Status::OK();
+    }
+    default:
+      return errors::InvalidArgument(
+          "Unsupported PrimitiveType in ConvertXlaShapeToTensorShapeType ",
+          xla::PrimitiveType_Name(xla_shape.element_type()));
+  }
+}
+
+string BuildXlaNodeName(const xla::OperationRequest& operation_request,
+                        const string& xla_op_type, const string& suffix) {
+  const string name = strings::StrCat(
+      NODE_NAME_PREFIX, "/", operation_request.output_handle().handle(), "/",
+      xla_op_type);
+  if (suffix.empty()) {
+    return name;
+  } else {
+    return strings::StrCat(name, "/", suffix);
+  }
+}
+
+string BuildXlaNodeName(const xla::OperationRequest& operation_request,
+                        const string& xla_op_type) {
+  return BuildXlaNodeName(operation_request, xla_op_type, "");
+}
+
+string BuildXlaNodeOp(const protobuf::Message& msg, const string& suffix) {
+  return strings::StrCat(msg.GetDescriptor()->name(), "/", suffix);
+}
+
+string BuildXlaNodeOp(const protobuf::Message& msg) {
+  return BuildXlaNodeOp(msg, "");
+}
+
+Status ConvertOpRequestToXlaNode(const xla::OperationRequest& operation_request,
+                                 XlaNode* xla_node) {
+  const xla::OpRequest& op_request = operation_request.request();
+  switch (op_request.op_case()) {
+    case xla::OpRequest::kBinaryOpRequest: {
+      const xla::BinaryOpRequest& op = op_request.binary_op_request();
+      xla_node->op_type =
+          BuildXlaNodeOp(op, xla::BinaryOperation_Name(op.binop()));
+      xla_node->name = BuildXlaNodeName(operation_request, xla_node->op_type);
+      xla_node->input_ids.emplace_back(std::make_tuple(op.lhs().handle(), 0));
+      xla_node->input_ids.emplace_back(std::make_tuple(op.rhs().handle(), 0));
+      for (const int64& dim : op.broadcast_dimensions()) {
+        xla_node->broadcast_dimensions.emplace_back(dim);
+      }
+      break;
+    }
+    case xla::OpRequest::kParameterRequest: {
+      const xla::ParameterRequest& op = op_request.parameter_request();
+      xla_node->op_type = BuildXlaNodeOp(op, "");
+      xla_node->name =
+          BuildXlaNodeName(operation_request, xla_node->op_type, op.name());
+      break;
+    }
+    case xla::OpRequest::kVariadicOpRequest: {
+      const xla::VariadicOpRequest& op = op_request.variadic_op_request();
+      xla_node->op_type =
+          BuildXlaNodeOp(op, xla::VariadicOperation_Name(op.varop()));
+      xla_node->name = BuildXlaNodeName(operation_request, xla_node->op_type);
+      for (const xla::ComputationDataHandle& handle : op.operands()) {
+        xla_node->input_ids.emplace_back(std::make_tuple(handle.handle(), 0));
+      }
+      break;
+    }
+    case xla::OpRequest::kGetTupleElementRequest: {
+      const xla::GetTupleElementRequest& op =
+          op_request.get_tuple_element_request();
+      xla_node->op_type = BuildXlaNodeOp(op);
+      xla_node->name = BuildXlaNodeName(operation_request, xla_node->op_type);
+      xla_node->input_ids.emplace_back(
+          std::make_tuple(op.operand().handle(), op.index()));
+      break;
+    }
+    default:
+      // TODO(satok): Implement all possible cases.
+      LOG(FATAL) << "Op request: " << op_request.op_case()
+                 << " is not supported yet.";
+      break;
+  }
+
+  CHECK(!xla_node->name.empty());
+  CHECK(!xla_node->op_type.empty());
+
+  TF_RETURN_IF_ERROR(ConvertXlaShapeToTensorShapeType(
+      operation_request.output_shape(), &xla_node->output_shapes,
+      &xla_node->output_data_types));
+  return Status::OK();
+}
 
 void SetupXlaCpuClient(std::unique_ptr<FunctionLibraryDefinition>* flib_def,
                        std::unique_ptr<FunctionLibraryRuntime>* flr,
@@ -67,5 +236,17 @@ ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
   return result.computation.Snapshot();
 }
 
+xla::StatusOr<std::unordered_map<int64, XlaNode>>
+ConvertXlaSessionModuleToXlaNodes(const xla::SessionModule& session_module) {
+  std::unordered_map<int64, XlaNode> xla_nodes;
+  for (const auto& operation_request : session_module.entry().requests()) {
+    XlaNode xla_node;
+    TF_RETURN_IF_ERROR(
+        ConvertOpRequestToXlaNode(operation_request.second, &xla_node));
+    xla_nodes.emplace(operation_request.first, xla_node);
+  }
+  return std::move(xla_nodes);
+}
+
 }  // namespace xla_tf_graph
 }  // namespace tensorflow
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
index 89dca876b0..e635290851 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_CONTRIB_XLA_TF_GRAPH_XLA_TF_GRAPH_UTIL_H_
 #define TENSORFLOW_CONTRIB_XLA_TF_GRAPH_XLA_TF_GRAPH_UTIL_H_
 
+#include <unordered_map>
+
 #include "tensorflow/compiler/tf2xla/xla_compiler.h"
 #include "tensorflow/compiler/xla/client/client.h"
 #include "tensorflow/compiler/xla/status_macros.h"
@@ -32,11 +34,38 @@ namespace xla_tf_graph {
 // implementing xla computations so that they can do experiments on their
 // specialized environments.
 
+// A structure to represent typed attributes of TensorFlow graph node.
+// This structure contains op specific attributes as members so that
+// we can treat them explicitly.
+struct XlaNode {
+  // Unique node name
+  string name;
+  // Op type of xla computation
+  string op_type;
+  // List of pair of unique id and port of input node.
+  // We store this value instead
+  // of node name in order not to wait for all XlaNodes to be constructed.
+  std::vector<std::tuple<int64, int>> input_ids;
+  // Oputput shapes
+  std::vector<TensorShape> output_shapes;
+  // Output data types
+  std::vector<DataType> output_data_types;
+
+  //---------------------------
+  // Op specific attributes
+  // #xla::OpRequest::kBinaryOpRequest
+  std::vector<int64> broadcast_dimensions;
+};
+
 // Convert a tf graph to a xla session module
 xla::StatusOr<std::unique_ptr<xla::SessionModule>>
 ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
                                  std::unique_ptr<Graph> graph);
 
+// Convert a xla session module to a map to XlaNode from unique id
+xla::StatusOr<std::unordered_map<int64, XlaNode>>
+ConvertXlaSessionModuleToXlaNodes(const xla::SessionModule& session_module);
+
 }  // namespace xla_tf_graph
 }  // namespace tensorflow
 
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
index bab4256187..23649957f3 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
 #include "tensorflow/cc/framework/scope.h"
 #include "tensorflow/cc/ops/function_ops.h"
 #include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/compiler/tf2xla/xla_op_registry.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/core/platform/test.h"
 
@@ -27,6 +28,7 @@ static std::unique_ptr<Graph> BuildAddGraph() {
   Scope scope = Scope::NewRootScope().ExitOnError();
   auto a = ops::_Arg(scope.WithOpName("A"), DT_INT32, 0);
   auto b = ops::_Arg(scope.WithOpName("B"), DT_INT32, 1);
+  // See tf2xla/kernels/binary_ops.cc
   auto c = ops::Add(scope.WithOpName("C"), a, b);
   auto d = ops::_Retval(scope.WithOpName("D"), c, 0);
   std::unique_ptr<Graph> graph(new Graph(OpRegistry::Global()));
@@ -34,16 +36,75 @@ static std::unique_ptr<Graph> BuildAddGraph() {
   return graph;
 }
 
-TEST(XlaTfGraphUtil, ConvertTfGraphToHloModule) {
+static std::vector<XlaCompiler::Argument> BuildAddGraphArguments() {
   // Builds a description of the arguments.
   std::vector<XlaCompiler::Argument> args(2);
   args[0].kind = XlaCompiler::Argument::kParameter;
   args[0].type = DT_INT32;
-  args[0].shape = TensorShape({2});
+  // Difference of dimension will add extra broadcast_dimensions.
+  // broadcast_dimension generates an additional HloInstruction
+  // in user_computation.cc
+  args[0].shape = TensorShape({2, 2});
   args[1].kind = XlaCompiler::Argument::kParameter;
   args[1].type = DT_INT32;
   args[1].shape = TensorShape({2});
+  return args;
+}
+
+// CAVEAT: Debug purpose only.
+// This function dumps a protobuf string format of HloModule.
+static void DumpHloGraphForDebug(const std::vector<XlaCompiler::Argument>& args,
+                                 std::unique_ptr<Graph> graph) {
+  std::unique_ptr<FunctionLibraryDefinition> flib_def;
+  std::unique_ptr<FunctionLibraryRuntime> flr;
+  std::unique_ptr<XlaCompiler> compiler;
+
+  xla::Client* client = xla::ClientLibrary::LocalClientOrDie();
+  XlaOpRegistry::RegisterCompilationKernels();
+
+  FunctionDefLibrary flib;
+  flib_def.reset(new FunctionLibraryDefinition(OpRegistry::Global(), flib));
+
+  // Compiles the graph.
+  XlaCompiler::Options options;
+  options.device_type = DeviceType("XLA_CPU_JIT");
+  options.client = client;
+  compiler.reset(new XlaCompiler(options));
 
+  flr.reset(NewFunctionLibraryRuntime(compiler->device_mgr(), /*env=*/nullptr,
+                                      compiler->device(), TF_GRAPH_DEF_VERSION,
+                                      flib_def.get(), OptimizerOptions(),
+                                      /*custom_kernel_creator=*/nullptr));
+
+  // Compile graph
+  XlaCompiler::CompilationResult result;
+  TF_CHECK_OK(compiler->CompileGraph("dump", std::move(graph), flr.get(), args,
+                                     &result));
+
+  // Convert to hlo
+  xla::Computation& computation = result.computation;
+
+  xla::Service* service(
+      static_cast<xla::Service*>(xla::ClientLibrary::GetXlaService(
+          static_cast<xla::LocalClient*>(client)->platform())));
+  const xla::ComputationTracker& computation_tracker =
+      service->computation_tracker();
+
+  auto user_computation_status =
+      computation_tracker.Resolve(computation.handle());
+  TF_CHECK_OK(user_computation_status.status());
+  auto user_computation = user_computation_status.ConsumeValueOrDie();
+  xla::VersionedComputationHandle versioned_handle =
+      user_computation->GetVersionedHandle();
+  std::unique_ptr<xla::HloModule> hlo_module = std::move(
+      computation_tracker.BuildHloModule(versioned_handle).ValueOrDie());
+  VLOG(1) << "--- DUMP HLO ---";
+  VLOG(1) << hlo_module->ToString();
+}
+
+TEST(XlaTfGraphUtil, ConvertTfGraphToSessionModule) {
+  // Builds a description of the arguments.
+  std::vector<XlaCompiler::Argument> args = BuildAddGraphArguments();
   std::unique_ptr<Graph> graph = BuildAddGraph();
 
   TF_ASSIGN_OR_ASSERT_OK(
@@ -51,6 +112,21 @@ TEST(XlaTfGraphUtil, ConvertTfGraphToHloModule) {
       ConvertTfGraphToXlaSessionModule(args, std::move(graph)));
 
   ASSERT_EQ(5, session_module->entry().requests_size());
+
+  VLOG(1) << "--- DUMP ---";
+  VLOG(1) << session_module->DebugString();
+  DumpHloGraphForDebug(args, BuildAddGraph());
+}
+
+TEST(XlaTfGraphUtil, ConvertXlaSessionModuleToXlaNodes) {
+  std::vector<XlaCompiler::Argument> args = BuildAddGraphArguments();
+  std::unique_ptr<Graph> graph = BuildAddGraph();
+  TF_ASSIGN_OR_ASSERT_OK(
+      std::unique_ptr<xla::SessionModule> session_module,
+      ConvertTfGraphToXlaSessionModule(args, std::move(graph)));
+  TF_ASSIGN_OR_ASSERT_OK(auto xla_nodes,
+                         ConvertXlaSessionModuleToXlaNodes(*session_module));
+  EXPECT_EQ(session_module->entry().requests_size(), xla_nodes.size());
 }
 
 }  // namespace xla_tf_graph
diff --git a/tensorflow/core/framework/allocator_registry.cc b/tensorflow/core/framework/allocator_registry.cc
index 946050687d..486be39ae3 100644
--- a/tensorflow/core/framework/allocator_registry.cc
+++ b/tensorflow/core/framework/allocator_registry.cc
@@ -26,22 +26,37 @@ AllocatorRegistry* AllocatorRegistry::Global() {
   return global_allocator_registry;
 }
 
-bool AllocatorRegistry::CheckForDuplicates(const string& name, int priority) {
+Allocator* AllocatorRegistry::GetRegisteredAllocator(const string& name,
+                                                     int priority) {
   for (auto entry : allocators_) {
     if (!name.compare(entry.name) && priority == entry.priority) {
-      return true;
+      return entry.allocator;
     }
   }
-  return false;
+  return nullptr;
 }
 
 void AllocatorRegistry::Register(const string& name, int priority,
                                  Allocator* allocator) {
   CHECK(!name.empty()) << "Need a valid name for Allocator";
   CHECK_GE(priority, 0) << "Priority needs to be non-negative";
-  CHECK(!CheckForDuplicates(name, priority))
-      << "Allocator with name: [" << name << "] and priority: [" << priority
-      << "] already registered";
+
+  Allocator* existing = GetRegisteredAllocator(name, priority);
+  if (existing != nullptr) {
+    // A duplicate is if the registration name and priority match
+    // but the Allocator::Name()'s don't match.
+    CHECK_EQ(existing->Name(), allocator->Name())
+        << "Allocator with name: [" << name << "], type [" << existing->Name()
+        << "], priority: [" << priority
+        << "] already registered.  Choose a different name to register "
+        << "an allocator of type " << allocator->Name();
+
+    // The allocator names match, so we can just return.
+    // It should be safe to delete the allocator since the caller
+    // gives up ownership of it.
+    delete allocator;
+    return;
+  }
 
   AllocatorRegistryEntry tmp_entry;
   tmp_entry.name = name;
diff --git a/tensorflow/core/framework/allocator_registry.h b/tensorflow/core/framework/allocator_registry.h
index c419366ae1..b26e79ac3b 100644
--- a/tensorflow/core/framework/allocator_registry.h
+++ b/tensorflow/core/framework/allocator_registry.h
@@ -27,7 +27,8 @@ namespace tensorflow {
 // A global AllocatorRegistry is used to hold allocators for CPU backends
 class AllocatorRegistry {
  public:
-  // Add an allocator to the registry.
+  // Add an allocator to the registry.  Caller releases ownership of
+  // 'allocator'.
   void Register(const string& name, int priority, Allocator* allocator);
 
   // Return allocator with highest priority
@@ -44,7 +45,9 @@ class AllocatorRegistry {
     Allocator* allocator;  // not owned
   } AllocatorRegistryEntry;
 
-  bool CheckForDuplicates(const string& name, int priority);
+  // Returns the Allocator registered for 'name' and 'priority',
+  // or 'nullptr' if not found.
+  Allocator* GetRegisteredAllocator(const string& name, int priority);
 
   std::vector<AllocatorRegistryEntry> allocators_;
   Allocator* m_curr_allocator_;  // not owned
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 219d95acdf..09c8d55efd 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -31,6 +31,7 @@ namespace grappler {
 SingleMachine::SingleMachine(int timeout_s, int num_cpu_cores, int num_gpus)
     : Cluster(timeout_s),
       num_gpus_(num_gpus),
+      expected_init_time_s_(0),
       closing_(false) {
   thread_pool_.reset(new thread::ThreadPool(
       Env::Default(), SanitizeThreadSuffix("single_machine"), 2));
@@ -82,6 +83,7 @@ Status SingleMachine::Initialize(const GrapplerItem& item) {
   mutex_lock l(this->last_graph_mu_);
   if (last_graph_ != &item.graph || last_graph_id_ != item.id) {
     init_ops_ = item.init_ops;
+    expected_init_time_s_ = item.expected_init_time;
     last_graph_ = nullptr;
     queue_runner_defs_ = item.queue_runners;
     last_graph_id_ = item.id;
@@ -100,7 +102,9 @@ Status SingleMachine::Run(const GraphDef& graph_def,
       TF_RETURN_IF_ERROR(session_->Create(graph_def));
       if (!init_ops_.empty()) {
         init_metadata_ = RunMetadata();
-        TF_RETURN_IF_ERROR(RunWithTimeout({}, init_ops_, &init_metadata_));
+        int64 timeout_s = timeout_s_ + expected_init_time_s_;
+        TF_RETURN_IF_ERROR(
+            RunWithTimeout({}, init_ops_, &init_metadata_, timeout_s));
         // The compute cost for init ops is likely to be pessimistic since init
         // ops are run only once before warmup. Therefore we only keep their
         // memory costs.
@@ -143,6 +147,13 @@ Status SingleMachine::Run(const GraphDef& graph_def,
 Status SingleMachine::RunWithTimeout(
     const std::vector<std::pair<string, Tensor>>& feed,
     const std::vector<string>& fetch, RunMetadata* run_metadata) {
+  return RunWithTimeout(feed, fetch, run_metadata, timeout_s_);
+}
+
+Status SingleMachine::RunWithTimeout(
+    const std::vector<std::pair<string, Tensor>>& feed,
+    const std::vector<string>& fetch, RunMetadata* run_metadata,
+    int64 timeout_s) {
   // We shouldn't be running or closing the session at this point.
   {
     mutex_lock l(close_mu_);
@@ -155,10 +166,10 @@ Status SingleMachine::RunWithTimeout(
         *status = session_->Run(run_options_, feed, {}, fetch, nullptr,
                                 local_metadata.get());
       },
-      timeout_s_ * 1000, thread_pool_.get());
+      timeout_s * 1000, thread_pool_.get());
   if (!executed_in_time) {
-    return errors::DeadlineExceeded("Failed to run the graph after ",
-                                    timeout_s_, " seconds, aborting");
+    return errors::DeadlineExceeded("Failed to run the graph after ", timeout_s,
+                                    " seconds, aborting");
   } else if (run_metadata && status->ok()) {
     *run_metadata = *local_metadata;
   }
diff --git a/tensorflow/core/grappler/clusters/single_machine.h b/tensorflow/core/grappler/clusters/single_machine.h
index b739b39f2c..f69b11df5d 100644
--- a/tensorflow/core/grappler/clusters/single_machine.h
+++ b/tensorflow/core/grappler/clusters/single_machine.h
@@ -42,6 +42,9 @@ class SingleMachine : public Cluster {
   Status RunWithTimeout(const std::vector<std::pair<string, Tensor>>& feed,
                         const std::vector<string>& fetch,
                         RunMetadata* run_metadata);
+  Status RunWithTimeout(const std::vector<std::pair<string, Tensor>>& feed,
+                        const std::vector<string>& fetch,
+                        RunMetadata* run_metadata, int64 timeout_s);
   Status ResetSession();
   Status CloseSession(bool use_timeout);
 
@@ -52,6 +55,7 @@ class SingleMachine : public Cluster {
   mutex last_graph_mu_;
   const GraphDef* last_graph_ GUARDED_BY(last_graph_mu_) = nullptr;
   std::vector<string> init_ops_;
+  int64 expected_init_time_s_;
   std::unique_ptr<Coordinator> coordinator_;
   std::unique_ptr<thread::ThreadPool> thread_pool_;
 
diff --git a/tensorflow/core/grappler/grappler_item.h b/tensorflow/core/grappler/grappler_item.h
index cb21ae54f0..e0709c682b 100644
--- a/tensorflow/core/grappler/grappler_item.h
+++ b/tensorflow/core/grappler/grappler_item.h
@@ -42,6 +42,8 @@ struct GrapplerItem {
 
   // Initialization op(s).
   std::vector<string> init_ops;
+  // Expected initialization time in seconds, or 0 if unknown
+  int64 expected_init_time = 0;
 
   // Queue runner(s) required to run the queue(s) of this model.
   std::vector<QueueRunnerDef> queue_runners;
diff --git a/tensorflow/core/grappler/grappler_item_builder.cc b/tensorflow/core/grappler/grappler_item_builder.cc
index e37b908fc6..88799ba881 100644
--- a/tensorflow/core/grappler/grappler_item_builder.cc
+++ b/tensorflow/core/grappler/grappler_item_builder.cc
@@ -86,11 +86,6 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
   }
 
   for (auto& node : *new_item->graph.mutable_node()) {
-    // Delete user specified placement if requested.
-    if (cfg.ignore_user_placement) {
-      node.clear_device();
-    }
-
     if (IsPlaceholder(node)) {
       if (node.attr().count("dtype") == 0) {
         LOG(ERROR) << "Unknown type for placeholder " << node.name()
@@ -142,6 +137,11 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
       new_item->feed.emplace_back(node.name(), fake_input);
     }
 
+    // Delete user specified placement if requested.
+    if (cfg.ignore_user_placement) {
+      node.clear_device();
+    }
+    // Delete colocation constraints if requested.
     if (cfg.ignore_colocation) {
       auto attr = node.mutable_attr();
       auto it = attr->find("_class");
@@ -173,6 +173,11 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
     if (inits.has_node_list()) {
       for (const auto& node : inits.node_list().value()) {
         new_item->init_ops.push_back(node);
+        // Tables are initialized from files, which can take a long time. Add 30
+        // minutes to the initialization time for each table to avoid timing
+        // out.
+        // TODO(bsteiner): adjust the timeout based on the file size.
+        new_item->expected_init_time += 30 * 60;
       }
     }
   }
diff --git a/tensorflow/core/grappler/grappler_item_builder.h b/tensorflow/core/grappler/grappler_item_builder.h
index 7088636994..ed75749009 100644
--- a/tensorflow/core/grappler/grappler_item_builder.h
+++ b/tensorflow/core/grappler/grappler_item_builder.h
@@ -27,13 +27,18 @@ class MetaGraphDef;
 namespace grappler {
 
 struct ItemConfig {
+  ItemConfig()
+      : ignore_user_placement(true),
+        ignore_colocation(true),
+        placeholder_unknown_output_shape_dim(-1) {}
+
   // If true, ignore all user specified node placement.
-  bool ignore_user_placement = true;
+  bool ignore_user_placement;
   // If true, ignore all user specified colocation attributes.
-  bool ignore_colocation = true;
+  bool ignore_colocation;
   // Dimension to use if a placeholder node has an _output_shapes attribute with
   // a dimension of -1.
-  int placeholder_unknown_output_shape_dim = -1;
+  int placeholder_unknown_output_shape_dim;
 };
 
 // Factory method for creating a GrapplerItem from a MetaGraphDef.
diff --git a/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h b/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h
index 4c5600c816..434b660614 100644
--- a/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h
+++ b/tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h
@@ -24,7 +24,7 @@ namespace tensorflow {
 namespace grappler {
 
 class Cluster;
-class GrapplerItem;
+struct GrapplerItem;
 
 class TrivialTestGraphInputYielder : public InputYielder {
  public:
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 15845506d9..2a61735bb5 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -1499,6 +1499,7 @@ py_library(
         ":framework_ops",
         ":graph_util",
         ":math_ops_gen",
+        ":nn_ops_gen",
         ":sparse_ops_gen",
         ":sparse_tensor",
         ":spectral_ops_gen",
diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 2c8fa53501..f9c908f538 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -111,6 +111,7 @@ py_library(
     srcs = ["cli/tensor_format.py"],
     srcs_version = "PY2AND3",
     deps = [
+        ":debug_data",
         ":debugger_cli_common",
         "//third_party/py/numpy",
     ],
diff --git a/tensorflow/python/debug/cli/tensor_format.py b/tensorflow/python/debug/cli/tensor_format.py
index c3c4bcf215..bb7ac31430 100644
--- a/tensorflow/python/debug/cli/tensor_format.py
+++ b/tensorflow/python/debug/cli/tensor_format.py
@@ -24,6 +24,7 @@ import numpy as np
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.python.debug.cli import debugger_cli_common
+from tensorflow.python.debug.lib import debug_data
 
 _NUMPY_OMISSION = "...,"
 _NUMPY_DEFAULT_EDGE_ITEMS = 3
@@ -112,10 +113,10 @@ def format_tensor(tensor,
           (8 + proper_len + 1, 8 + proper_len + 1 + debug_op_len, "yellow")
       ]
 
-  if tensor is None:
+  if isinstance(tensor, debug_data.InconvertibleTensorProto):
     if lines:
       lines.append("")
-    lines.append("Uninitialized tensor")
+    lines.extend(str(tensor).split("\n"))
     return debugger_cli_common.RichTextLines(lines)
   elif not isinstance(tensor, np.ndarray):
     # If tensor is not a np.ndarray, return simple text-line representation of
diff --git a/tensorflow/python/debug/cli/tensor_format_test.py b/tensorflow/python/debug/cli/tensor_format_test.py
index 8392a87367..ec80bb998e 100644
--- a/tensorflow/python/debug/cli/tensor_format_test.py
+++ b/tensorflow/python/debug/cli/tensor_format_test.py
@@ -20,7 +20,11 @@ from __future__ import print_function
 import numpy as np
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
+from tensorflow.core.framework import tensor_pb2
+from tensorflow.core.framework import tensor_shape_pb2
+from tensorflow.core.framework import types_pb2
 from tensorflow.python.debug.cli import tensor_format
+from tensorflow.python.debug.lib import debug_data
 from tensorflow.python.framework import test_util
 from tensorflow.python.platform import googletest
 
@@ -363,10 +367,28 @@ class RichTextLinesTest(test_util.TensorFlowTestCase):
       if i < 1:
         self.assertNotIn(p + i * 6 + 5, out.annotations)
 
-  def testFormatNone(self):
-    out = tensor_format.format_tensor(None, "a")
+  def testFormatUninitializedTensor(self):
+    tensor_proto = tensor_pb2.TensorProto(
+        dtype=types_pb2.DataType.Value("DT_FLOAT"),
+        tensor_shape=tensor_shape_pb2.TensorShapeProto(
+            dim=[tensor_shape_pb2.TensorShapeProto.Dim(size=1)]))
+    out = tensor_format.format_tensor(
+        debug_data.InconvertibleTensorProto(tensor_proto, False), "a")
+
+    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor:"],
+                     out.lines[:3])
+    self.assertEqual(str(tensor_proto).split("\n"), out.lines[3:])
 
-    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor"], out.lines)
+  def testFormatResourceTypeTensor(self):
+    tensor_proto = tensor_pb2.TensorProto(
+        dtype=types_pb2.DataType.Value("DT_RESOURCE"),
+        tensor_shape=tensor_shape_pb2.TensorShapeProto(
+            dim=[tensor_shape_pb2.TensorShapeProto.Dim(size=1)]))
+    out = tensor_format.format_tensor(
+        debug_data.InconvertibleTensorProto(tensor_proto), "a")
+
+    self.assertEqual(["Tensor \"a\":", ""], out.lines[:2])
+    self.assertEqual(str(tensor_proto).split("\n"), out.lines[2:])
 
   def testLocateTensorElement1DNoEllipsis(self):
     a = np.zeros(20)
@@ -821,9 +843,15 @@ class RichTextLinesTest(test_util.TensorFlowTestCase):
     self.assertEqual([12, None], end_cols)
 
   def testLocateTensorElementAnnotationsUnavailable(self):
-    out = tensor_format.format_tensor(None, "a")
+    tensor_proto = tensor_pb2.TensorProto(
+        dtype=types_pb2.DataType.Value("DT_FLOAT"),
+        tensor_shape=tensor_shape_pb2.TensorShapeProto(
+            dim=[tensor_shape_pb2.TensorShapeProto.Dim(size=1)]))
+    out = tensor_format.format_tensor(
+        debug_data.InconvertibleTensorProto(tensor_proto, False), "a")
 
-    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor"], out.lines)
+    self.assertEqual(["Tensor \"a\":", "", "Uninitialized tensor:"],
+                     out.lines[:3])
 
     with self.assertRaisesRegexp(
         AttributeError, "tensor_metadata is not available in annotations"):
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index 2b11039215..ce4bc82e0a 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -39,6 +39,30 @@ FETCHES_INFO_FILE_TAG = "fetches_info_"
 FEED_KEYS_INFO_FILE_TAG = "feed_keys_info_"
 
 
+class InconvertibleTensorProto(object):
+  """Represents a TensorProto that cannot be converted to np.ndarray."""
+
+  def __init__(self, tensor_proto, initialized=True):
+    """Constructor.
+
+    Args:
+      tensor_proto: the `TensorProto` object that cannot be represented as a
+        `np.ndarray` object.
+      initialized: (`bool`) whether the Tensor is initialized.
+    """
+    self._tensor_proto = tensor_proto
+    self._initialized = initialized
+
+  def __str__(self):
+    output = "" if self._initialized else "Uninitialized tensor:\n"
+    output += str(self._tensor_proto)
+    return output
+
+  @property
+  def initialized(self):
+    return self._initialized
+
+
 def load_tensor_from_event_file(event_file_path):
   """Load a tensor from an event file.
 
@@ -69,26 +93,27 @@ def load_tensor_from_event(event):
         summary.value[0] field.
 
   Returns:
-    The tensor value loaded from the event file, as a `numpy.ndarray`. For
-    uninitialized Tensors, returns `None`. For Tensors of data types that
-    cannot be converted to `numpy.ndarray` (e.g., `tf.resource`), return
-    `None`.
+    The tensor value loaded from the event file, as a `numpy.ndarray`, if
+    representation of the tensor value by a `numpy.ndarray` is possible.
+    For uninitialized Tensors, returns `None`. For Tensors of data types that
+    cannot be represented as `numpy.ndarray` (e.g., `tf.resource`), return
+    the `TensorProto` protobuf object without converting it to a
+    `numpy.ndarray`.
   """
 
-  if (event.summary.value[0].tensor.tensor_content or
-      event.summary.value[0].tensor.string_val):
+  tensor_proto = event.summary.value[0].tensor
+  if tensor_proto.tensor_content or tensor_proto.string_val:
     # Initialized tensor.
-    tensor_proto = event.summary.value[0].tensor
     if tensor_proto.dtype == types_pb2.DT_RESOURCE:
-      return None
+      tensor_value = InconvertibleTensorProto(tensor_proto)
     else:
       try:
         tensor_value = tensor_util.MakeNdarray(tensor_proto)
       except KeyError:
-        tensor_value = None
+        tensor_value = InconvertibleTensorProto(tensor_proto)
   else:
     # Uninitialized tensor or tensor of unconvertible data type.
-    tensor_value = None
+    tensor_value = InconvertibleTensorProto(tensor_proto, False)
 
   return tensor_value
 
@@ -290,8 +315,10 @@ def has_inf_or_nan(datum, tensor):
 
   _ = datum  # Datum metadata is unused in this predicate.
 
-  if tensor is None:
+  if isinstance(tensor, InconvertibleTensorProto):
     # Uninitialized tensor doesn't have bad numerical values.
+    # Also return False for data types that cannot be represented as numpy
+    # arrays.
     return False
   elif (np.issubdtype(tensor.dtype, np.float) or
         np.issubdtype(tensor.dtype, np.complex) or
diff --git a/tensorflow/python/debug/lib/debug_data_test.py b/tensorflow/python/debug/lib/debug_data_test.py
index 2f6822331d..dc45e8df6c 100644
--- a/tensorflow/python/debug/lib/debug_data_test.py
+++ b/tensorflow/python/debug/lib/debug_data_test.py
@@ -23,6 +23,7 @@ import tempfile
 
 import numpy as np
 
+from tensorflow.core.framework import tensor_pb2
 from tensorflow.python.debug.lib import debug_data
 from tensorflow.python.framework import test_util
 from tensorflow.python.platform import googletest
@@ -125,9 +126,15 @@ class HasNanOrInfTest(test_util.TensorFlowTestCase):
     a = np.array([])
     self.assertFalse(debug_data.has_inf_or_nan(self._dummy_datum, a))
 
-  def testNone(self):
-    a = None
-    self.assertFalse(debug_data.has_inf_or_nan(self._dummy_datum, a))
+  def testInconvertibleTensorProto(self):
+    self.assertFalse(debug_data.has_inf_or_nan(
+        self._dummy_datum,
+        debug_data.InconvertibleTensorProto(tensor_pb2.TensorProto(),
+                                            initialized=False)))
+    self.assertFalse(debug_data.has_inf_or_nan(
+        self._dummy_datum,
+        debug_data.InconvertibleTensorProto(tensor_pb2.TensorProto(),
+                                            initialized=True)))
 
   def testDTypeComplexWorks(self):
     a = np.array([1j, 3j, 3j, 7j], dtype=np.complex128)
diff --git a/tensorflow/python/debug/lib/session_debug_testlib.py b/tensorflow/python/debug/lib/session_debug_testlib.py
index acebb2297f..deb8249343 100644
--- a/tensorflow/python/debug/lib/session_debug_testlib.py
+++ b/tensorflow/python/debug/lib/session_debug_testlib.py
@@ -358,9 +358,11 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
       u_vals = dump.get_tensors(u_name, 0, "DebugIdentity")
       s_vals = dump.get_tensors(s_name, 0, "DebugIdentity")
       self.assertEqual(1, len(u_vals))
-      self.assertIsNone(u_vals[0])
+      self.assertIsInstance(u_vals[0], debug_data.InconvertibleTensorProto)
+      self.assertFalse(u_vals[0].initialized)
       self.assertEqual(1, len(s_vals))
-      self.assertIsNone(s_vals[0])
+      self.assertIsInstance(s_vals[0], debug_data.InconvertibleTensorProto)
+      self.assertFalse(s_vals[0].initialized)
 
       # Call run() again, to check that u is initialized properly.
       self.assertAllClose(u_init_val, sess.run(u))
@@ -1422,7 +1424,10 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
           self._dump_root, partition_graphs=run_metadata.partition_graphs)
       self.assertTrue(dump.loaded_partition_graphs())
 
-      self.assertIsNone(dump.get_tensors("fifo_queue", 0, "DebugIdentity")[0])
+      fifo_queue_tensor = dump.get_tensors("fifo_queue", 0, "DebugIdentity")[0]
+      self.assertIsInstance(fifo_queue_tensor,
+                            debug_data.InconvertibleTensorProto)
+      self.assertTrue(fifo_queue_tensor.initialized)
       self.assertAllClose(
           [101.0, 202.0, 303.0],
           dump.get_tensors("enqueue_many/component_0", 0, "DebugIdentity")[0])
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index cdb15e0a91..06a0aa468a 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2347,6 +2347,7 @@ cuda_py_test(
         "//tensorflow/python:gradients",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:math_ops_gen",
+        "//tensorflow/python:nn_grad",
         "//tensorflow/python:platform",
         "//tensorflow/python:variables",
     ],
diff --git a/tensorflow/python/kernel_tests/check_ops_test.py b/tensorflow/python/kernel_tests/check_ops_test.py
index d688b16478..ed859e3774 100644
--- a/tensorflow/python/kernel_tests/check_ops_test.py
+++ b/tensorflow/python/kernel_tests/check_ops_test.py
@@ -80,23 +80,35 @@ class AssertEqualTest(test.TestCase):
 
   def test_raises_when_greater(self):
     with self.test_session():
-      small = constant_op.constant([1, 2], name="small")
-      big = constant_op.constant([3, 4], name="big")
+      # Static check
+      static_small = constant_op.constant([1, 2], name="small")
+      static_big = constant_op.constant([3, 4], name="big")
+      with self.assertRaisesRegexp(ValueError, "fail"):
+        check_ops.assert_equal(static_big, static_small, message="fail")
+      # Dynamic check
+      small = array_ops.placeholder(dtypes.int32, name="small")
+      big = array_ops.placeholder(dtypes.int32, name="big")
       with ops.control_dependencies(
           [check_ops.assert_equal(
               big, small, message="fail")]):
         out = array_ops.identity(small)
       with self.assertRaisesOpError("fail.*big.*small"):
-        out.eval()
+        out.eval(feed_dict={small: [1, 2], big: [3, 4]})
 
   def test_raises_when_less(self):
     with self.test_session():
-      small = constant_op.constant([3, 1], name="small")
-      big = constant_op.constant([4, 2], name="big")
+      # Static check
+      static_small = constant_op.constant([3, 1], name="small")
+      static_big = constant_op.constant([4, 2], name="big")
+      with self.assertRaisesRegexp(ValueError, "fail"):
+        check_ops.assert_equal(static_big, static_small, message="fail")
+      # Dynamic check
+      small = array_ops.placeholder(dtypes.int32, name="small")
+      big = array_ops.placeholder(dtypes.int32, name="big")
       with ops.control_dependencies([check_ops.assert_equal(small, big)]):
         out = array_ops.identity(small)
       with self.assertRaisesOpError("small.*big"):
-        out.eval()
+        out.eval(feed_dict={small: [3, 1], big: [4, 2]})
 
   def test_doesnt_raise_when_equal_and_broadcastable_shapes(self):
     with self.test_session():
diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py
index 9cd42d8851..cd0d33ecf3 100644
--- a/tensorflow/python/kernel_tests/cwise_ops_test.py
+++ b/tensorflow/python/kernel_tests/cwise_ops_test.py
@@ -31,6 +31,7 @@ from tensorflow.python.ops import gen_math_ops
 from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn_grad  # pylint: disable=unused-import
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging
@@ -165,6 +166,9 @@ class UnaryOpTest(test.TestCase):
   def _sigmoid(self, x):
     return 1.0 / (1.0 + np.exp(-x))
 
+  def _log_sigmoid(self, x):
+    return np.log(self._sigmoid(x))
+
   def _replace_domain_error_with_inf(self, fn):
 
     def func(x):
@@ -198,6 +202,7 @@ class UnaryOpTest(test.TestCase):
     self._compareBoth(z, np.log1p, math_ops.log1p)
     self._compareBoth(x, np.tanh, math_ops.tanh)
     self._compareBoth(x, self._sigmoid, math_ops.sigmoid)
+    self._compareBoth(x, self._log_sigmoid, math_ops.log_sigmoid)
     self._compareBoth(y, np.sign, math_ops.sign)
     self._compareBoth(x, np.sin, math_ops.sin)
     self._compareBoth(x, np.cos, math_ops.cos)
diff --git a/tensorflow/python/ops/check_ops.py b/tensorflow/python/ops/check_ops.py
index 8401f5493b..753999a672 100644
--- a/tensorflow/python/ops/check_ops.py
+++ b/tensorflow/python/ops/check_ops.py
@@ -84,6 +84,22 @@ __all__ = [
 ]
 
 
+def _maybe_constant_value_string(t):
+  if not isinstance(t, ops.Tensor):
+    return str(t)
+  const_t = tensor_util.constant_value(t)
+  if const_t is not None:
+    return str(const_t)
+  return t
+
+
+def _assert_static(condition, data):
+  """Raises a static ValueError with as much information as possible."""
+  if not condition:
+    data_static = [_maybe_constant_value_string(x) for x in data]
+    raise ValueError('\n'.join(data_static))
+
+
 def assert_proper_iterable(values):
   """Static assert that values is a "proper" iterable.
 
@@ -140,7 +156,9 @@ def assert_negative(x, data=None, summarize=None, message=None, name=None):
     x = ops.convert_to_tensor(x, name='x')
     if data is None:
       data = [
-          message, 'Condition x < 0 did not hold element-wise: x = ', x.name, x]
+          message,
+          'Condition x < 0 did not hold element-wise:',
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less(x, zero, data=data, summarize=summarize)
 
@@ -174,7 +192,8 @@ def assert_positive(x, data=None, summarize=None, message=None, name=None):
     x = ops.convert_to_tensor(x, name='x')
     if data is None:
       data = [
-          message, 'Condition x > 0 did not hold element-wise: x = ', x.name, x]
+          message, 'Condition x > 0 did not hold element-wise:',
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less(zero, x, data=data, summarize=summarize)
 
@@ -210,7 +229,8 @@ def assert_non_negative(x, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x >= 0 did not hold element-wise: x = ', x.name, x]
+          'Condition x >= 0 did not hold element-wise:',
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less_equal(zero, x, data=data, summarize=summarize)
 
@@ -246,7 +266,8 @@ def assert_non_positive(x, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x <= 0 did not hold element-wise: x = ', x.name, x]
+          'Condition x <= 0 did not hold element-wise:'
+          'x (%s) = ' % x.name, x]
     zero = ops.convert_to_tensor(0, dtype=x.dtype)
     return assert_less_equal(x, zero, data=data, summarize=summarize)
 
@@ -284,10 +305,16 @@ def assert_equal(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x == y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x == y did not hold element-wise:',
+          'x (%s) = ' % x.name, x,
+          'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.equal(x, y))
+    x_static = tensor_util.constant_value(x)
+    y_static = tensor_util.constant_value(y)
+    if x_static is not None and y_static is not None:
+      condition_static = (x_static == y_static).all()
+      _assert_static(condition_static, data)
     return control_flow_ops.Assert(condition, data, summarize=summarize)
 
 
@@ -326,9 +353,9 @@ def assert_none_equal(
     if data is None:
       data = [
           message,
-          'Condition x != y did not hold for every single element: x = ',
-          x.name, x,
-          'y = ', y.name, y
+          'Condition x != y did not hold for every single element:'
+          'x (%s) = ' % x.name, x,
+          'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.not_equal(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -367,8 +394,8 @@ def assert_less(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x < y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x < y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.less(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -407,8 +434,8 @@ def assert_less_equal(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x <= y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x <= y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.less_equal(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -447,8 +474,8 @@ def assert_greater(x, y, data=None, summarize=None, message=None, name=None):
     if data is None:
       data = [
           message,
-          'Condition x > y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x > y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.greater(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
@@ -489,8 +516,8 @@ def assert_greater_equal(x, y, data=None, summarize=None, message=None,
     if data is None:
       data = [
           message,
-          'Condition x >= y did not hold element-wise: x = ', x.name, x, 'y = ',
-          y.name, y
+          'Condition x >= y did not hold element-wise:'
+          'x (%s) = ' % x.name, x, 'y (%s) = ' % y.name, y
       ]
     condition = math_ops.reduce_all(math_ops.greater_equal(x, y))
     return control_flow_ops.Assert(condition, data, summarize=summarize)
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 36a4184950..5f4ce63f31 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -151,6 +151,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gen_control_flow_ops
 from tensorflow.python.ops import gen_data_flow_ops
 from tensorflow.python.ops import gen_math_ops
+from tensorflow.python.ops import gen_nn_ops
 from tensorflow.python.ops import gen_sparse_ops
 from tensorflow.python.ops import gen_spectral_ops
 from tensorflow.python.ops import gen_state_ops
@@ -2004,6 +2005,24 @@ def sigmoid(x, name=None):
     return gen_math_ops._sigmoid(x, name=name)
 
 
+def log_sigmoid(x, name=None):
+  """Computes log sigmoid of `x` element-wise.
+
+  Specifically, `y = log(1 / (1 + exp(-x)))`.  For numerical stability,
+  we use `y = -tf.nn.softplus(-x)`.
+
+  Args:
+    x: A Tensor with type `float32` or `float64`.
+    name: A name for the operation (optional).
+
+  Returns:
+    A Tensor with the same type as `x`.
+  """
+  with ops.name_scope(name, "LogSigmoid", [x]) as name:
+    x = ops.convert_to_tensor(x, name="x")
+    return gen_math_ops._neg(gen_nn_ops.softplus(-x), name=name)
+
+
 def tanh(x, name=None):
   """Computes hyperbolic tangent of `x` element-wise.
 
diff --git a/tensorflow/python/ops/nn.py b/tensorflow/python/ops/nn.py
index c5c5169231..7b6494e0c9 100644
--- a/tensorflow/python/ops/nn.py
+++ b/tensorflow/python/ops/nn.py
@@ -27,6 +27,7 @@ See the @{$python/nn} guide.
 @@dropout
 @@bias_add
 @@sigmoid
+@@log_sigmoid
 @@tanh
 @@convolution
 @@conv2d
diff --git a/tensorflow/python/ops/standard_ops.py b/tensorflow/python/ops/standard_ops.py
index 9d24eb242d..09e04d4247 100644
--- a/tensorflow/python/ops/standard_ops.py
+++ b/tensorflow/python/ops/standard_ops.py
@@ -145,6 +145,7 @@ _allowed_symbols_math_ops = [
     # These are documented in nn.
     # We are are not importing nn because it would create a circular dependency.
     "sigmoid",
+    "log_sigmoid",
     "tanh",
 ]
 
diff --git a/tensorflow/python/training/supervisor.py b/tensorflow/python/training/supervisor.py
index 9435bdfa1c..93e64b4ab0 100644
--- a/tensorflow/python/training/supervisor.py
+++ b/tensorflow/python/training/supervisor.py
@@ -1001,28 +1001,32 @@ class SVSummaryThread(coordinator.LooperThread):
 class SVStepCounterThread(coordinator.LooperThread):
   """Threads to count steps and measure their duration."""
 
-  def __init__(self, sv, sess):
+  def __init__(self, sv, sess, step_counter=None):
     """Create a `SVStepCounterThread`.
 
     Args:
       sv: A `Supervisor`.
       sess: A `Session`.
+      step_counter: A `Tensor` holding the step counter. By defaults, it uses
+        sv.global_step.
     """
     super(SVStepCounterThread, self).__init__(sv.coord, sv.save_summaries_secs)
     self._sv = sv
     self._sess = sess
     self._last_time = 0.0
     self._last_step = 0
-    self._summary_tag = "%s/sec" % self._sv.global_step.op.name
+    step_counter = sv.global_step if step_counter is None else step_counter
+    self._step_counter = step_counter
+    self._summary_tag = "%s/sec" % self._step_counter.op.name
 
   def start_loop(self):
     self._last_time = time.time()
     self._last_step = training_util.global_step(
-        self._sess, self._sv.global_step)
+        self._sess, self._step_counter)
 
   def run_loop(self):
     # Count the steps.
-    current_step = training_util.global_step(self._sess, self._sv.global_step)
+    current_step = training_util.global_step(self._sess, self._step_counter)
     added_steps = current_step - self._last_step
     self._last_step = current_step
     # Measure the elapsed time.
@@ -1030,7 +1034,10 @@ class SVStepCounterThread(coordinator.LooperThread):
     elapsed_time = current_time - self._last_time
     self._last_time = current_time
     # Reports the number of steps done per second
-    steps_per_sec = added_steps / elapsed_time if elapsed_time != 0. else float("inf")
+    if elapsed_time > 0.:
+      steps_per_sec = added_steps / elapsed_time
+    else:
+      steps_per_sec = float("inf")
     summary = Summary(value=[Summary.Value(tag=self._summary_tag,
                                            simple_value=steps_per_sec)])
     if self._sv.summary_writer:
diff --git a/tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts b/tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts
new file mode 100644
index 0000000000..42c73708cd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_globals_d3v4/globals.ts
@@ -0,0 +1,38 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+
+
+// The names of TensorBoard tabs.
+export const TABS = [
+  'scalars', 'images', 'audio', 'graphs', 'distributions', 'histograms',
+  'embeddings', 'text'
+];
+
+// If true, TensorBoard stores its hash in the URI state.
+// If false, tab switching in TensorBoard will not update location hash,
+// because hash updates interfere with wct_tests.
+export let USE_HASH = false;
+
+let _fakeHash = '';
+
+export function setFakeHash(h: string) {
+  _fakeHash = h;
+}
+
+export function getFakeHash() {
+  return _fakeHash;
+}
+
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts b/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
new file mode 100644
index 0000000000..19a27b9cbd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
@@ -0,0 +1,400 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {USE_HASH, setFakeHash, getFakeHash, TABS} from '../tf_globals_d3v4/globals';
+import * as _ from 'lodash';
+
+
+/* tslint:disable:no-namespace variable-name */
+/**
+ * The Storage Module provides storage for URL parameters, and an API for
+ * getting and setting TensorBoard's stateful URI.
+ *
+ * It generates URI components like: events&runPrefix=train*
+ * which TensorBoard uses after like localhost:8000/#events&runPrefix=train*
+ * to store state in the URI.
+ *
+ * It also allows saving the values to localStorage for long-term persistance.
+ */
+type StringDict = {[key: string]: string};
+
+/**
+ * A key that users cannot use, since TensorBoard uses this to store info
+ * about the active tab.
+ */
+export let TAB = '__tab__';
+
+/**
+ * The name of the property for users to set on a Polymer component
+ * in order for its stored properties to be stored in the URI unambiguously.
+ * (No need to set this if you want mutliple instances of the component to
+ * share URI state)
+ *
+ * Example:
+ * <my-component disambiguator="0"></my-component>
+ *
+ * The disambiguator should be set to any unique value so that multiple
+ * instances of the component can store properties in URI storage.
+ *
+ * Because it's hard to dereference this variable in HTML property bindings,
+ * it is NOT safe to change the disambiguator string without find+replace
+ * across the codebase.
+ */
+export let DISAMBIGUATOR = 'disambiguator';
+
+/**
+ * Return a string stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getString(key: string, useLocalStorage: boolean): string {
+  if (useLocalStorage) {
+    return window.localStorage.getItem(key);
+  } else {
+    return _componentToDict(_readComponent())[key];
+  }
+}
+
+/**
+ * Set a string in URI or localStorage.
+ */
+export function setString(
+    key: string, value: string, useLocalStorage: boolean) {
+  if (useLocalStorage) {
+    window.localStorage.setItem(key, value);
+  } else {
+    const items = _componentToDict(_readComponent());
+    items[key] = value;
+    _writeComponent(_dictToComponent(items));
+  }
+}
+
+/**
+ * Return a boolean stored in stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getBoolean(key: string, useLocalStorage: boolean): boolean {
+  const item = getString(key, useLocalStorage);
+  return item === 'true' ? true : item === 'false' ? false : undefined;
+}
+
+/**
+ * Store a boolean in URI or localStorage.
+ */
+export function setBoolean(
+    key: string, value: boolean, useLocalStorage = false) {
+  setString(key, value.toString(), useLocalStorage);
+}
+
+/**
+ * Return a number stored in stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getNumber(key: string, useLocalStorage: boolean): number {
+  const item = getString(key, useLocalStorage);
+  return item === undefined ? undefined : +item;
+}
+
+/**
+ * Store a number in URI or localStorage.
+ */
+export function setNumber(
+    key: string, value: number, useLocalStorage: boolean) {
+  setString(key, '' + value, useLocalStorage);
+}
+
+/**
+ * Return an object stored in stored in URI or localStorage.
+ * Undefined if not found.
+ */
+export function getObject(key: string, useLocalStorage: boolean): {} {
+  const item = getString(key, useLocalStorage);
+  return item === undefined ? undefined : JSON.parse(atob(item));
+}
+
+/**
+ * Store an object in URI or localStorage.
+ */
+export function setObject(key: string, value: {}, useLocalStorage: boolean) {
+  setString(key, btoa(JSON.stringify(value)), useLocalStorage);
+}
+
+/**
+ * Get a unique storage name for a (Polymer component, propertyName) tuple.
+ *
+ * DISAMBIGUATOR must be set on the component, if other components use the
+ * same propertyName.
+ */
+export function getURIStorageName(
+    component: {}, propertyName: string): string {
+  const d = component[DISAMBIGUATOR];
+  const components = d == null ? [propertyName] : [d, propertyName];
+  return components.join('.');
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer boolean property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+export function getBooleanInitializer(
+    propertyName: string, defaultVal: boolean,
+    useLocalStorage = false): Function {
+  return _getInitializer(
+      getBoolean, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer string property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+export function getStringInitializer(
+    propertyName: string, defaultVal: string,
+    useLocalStorage = false): Function {
+  return _getInitializer(
+      getString, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer number property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+export function getNumberInitializer(
+    propertyName: string, defaultVal: number,
+    useLocalStorage = false): Function {
+  return _getInitializer(
+      getNumber, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer Object property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ *
+ * Generates a deep clone of the defaultVal to avoid mutation issues.
+ */
+export function getObjectInitializer(
+    propertyName: string, defaultVal: {}, useLocalStorage = false): Function {
+  return _getInitializer(
+      getObject, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when a string property changes.
+ */
+export function getBooleanObserver(
+    propertyName: string, defaultVal: boolean,
+    useLocalStorage = false): Function {
+  return _getObserver(
+      getBoolean, setBoolean, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when a string property changes.
+ */
+export function getStringObserver(
+    propertyName: string, defaultVal: string,
+    useLocalStorage = false): Function {
+  return _getObserver(
+      getString, setString, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when a number property changes.
+ */
+export function getNumberObserver(
+    propertyName: string, defaultVal: number,
+    useLocalStorage = false): Function {
+  return _getObserver(
+      getNumber, setNumber, propertyName, defaultVal, useLocalStorage);
+}
+
+/**
+ * Return a function that updates URIStorage when an object property changes.
+ * Generates a deep clone of the defaultVal to avoid mutation issues.
+ */
+export function getObjectObserver(
+    propertyName: string, defaultVal: {}, useLocalStorage = false): Function {
+  const clone = _.cloneDeep(defaultVal);
+  return _getObserver(
+      getObject, setObject, propertyName, clone, useLocalStorage);
+}
+
+/**
+ * Read component from URI (e.g. returns "events&runPrefix=train*").
+ */
+function _readComponent(): string {
+  return USE_HASH ? window.location.hash.slice(1) : getFakeHash();
+}
+
+/**
+ * Write component to URI.
+ */
+function _writeComponent(component: string) {
+  if (USE_HASH) {
+    window.location.hash = component;
+  } else {
+    setFakeHash(component);
+  }
+}
+
+/**
+ * Convert dictionary of strings into a URI Component.
+ * All key value entries get added as key value pairs in the component,
+ * with the exception of a key with the TAB value, which if present
+ * gets prepended to the URI Component string for backwards comptability
+ * reasons.
+ */
+function _dictToComponent(items: StringDict): string {
+  let component = '';
+
+  // Add the tab name e.g. 'events', 'images', 'histograms' as a prefix
+  // for backwards compatbility.
+  if (items[TAB] !== undefined) {
+    component += items[TAB];
+  }
+
+  // Join other strings with &key=value notation
+  const nonTab = _.pairs(items)
+                   .filter((pair) =>  pair[0] !== TAB)
+                   .map((pair) => {
+                     return encodeURIComponent(pair[0]) + '=' +
+                         encodeURIComponent(pair[1]);
+                   })
+                   .join('&');
+
+  return nonTab.length > 0 ? (component + '&' + nonTab) : component;
+}
+
+/**
+ * Convert a URI Component into a dictionary of strings.
+ * Component should consist of key-value pairs joined by a delimiter
+ * with the exception of the tabName.
+ * Returns dict consisting of all key-value pairs and
+ * dict[TAB] = tabName
+ */
+function _componentToDict(component: string): StringDict {
+  const items = {} as StringDict;
+
+  const tokens = component.split('&');
+  tokens.forEach((token) => {
+    const kv = token.split('=');
+    // Special backwards compatibility for URI components like #events
+    if (kv.length === 1 && _.contains(TABS, kv[0])) {
+      items[TAB] = kv[0];
+    } else if (kv.length === 2) {
+      items[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
+    }
+  });
+  return items;
+}
+
+/**
+ * Return a function that:
+ * (1) Initializes a Polymer property with a default value, if its
+ *     value is not already set
+ * (2) Sets up listener that updates Polymer property on hash change.
+ */
+function _getInitializer<T>(
+    get: (name: string, useLocalStorage: boolean) => T, propertyName: string,
+    defaultVal: T, useLocalStorage): Function {
+  return function() {
+    const URIStorageName = getURIStorageName(this, propertyName);
+    // setComponentValue will be called every time the hash changes, and is
+    // responsible for ensuring that new state in the hash will be propagated
+    // to the component with that property.
+    // It is important that this function does not re-assign needlessly,
+    // to avoid Polymer observer churn.
+    const setComponentValue = () => {
+      const uriValue = get(URIStorageName, false);
+      const currentValue = this[propertyName];
+      // if uriValue is undefined, we will ensure that the property has the
+      // default value
+      if (uriValue === undefined) {
+        let valueToSet: T;
+        // if we are using localStorage, we will set the value to the value
+        // from localStorage. Then, the corresponding observer will proxy
+        // the localStorage value into URI storage.
+        // in this way, localStorage takes precedence over the default val
+        // but not over the URI value.
+        if (useLocalStorage) {
+          const useLocalStorageValue = get(URIStorageName, true);
+          valueToSet = useLocalStorageValue === undefined ?
+              defaultVal :
+              useLocalStorageValue;
+        } else {
+          valueToSet = defaultVal;
+        }
+        if (!_.isEqual(currentValue, valueToSet)) {
+          // If we don't have an explicit URI value, then we need to ensure
+          // the property value is equal to the default value.
+          // We will assign a clone rather than the canonical default, because
+          // the component receiving this property may mutate it, and we need
+          // to keep a pristine copy of the default.
+          this[propertyName] = _.clone(valueToSet);
+        }
+        // In this case, we have an explicit URI value, so we will ensure that
+        // the component has an equivalent value.
+      } else {
+        if (!_.isEqual(uriValue, currentValue)) {
+          this[propertyName] = uriValue;
+        }
+      }
+    };
+    // Set the value on the property.
+    setComponentValue();
+    // Update it when the hashchanges.
+    window.addEventListener('hashchange', setComponentValue);
+  };
+}
+
+/**
+ * Return a function that updates URIStorage when a property changes.
+ */
+function _getObserver<T>(
+    get: (name: string, useLocalStorage: boolean) => T,
+    set: (name: string, newVal: T, useLocalStorage: boolean) => void,
+    propertyName: string, defaultVal: T, useLocalStorage: boolean): Function {
+  return function() {
+    const URIStorageName = getURIStorageName(this, propertyName);
+    const newVal = this[propertyName];
+    // if this is a localStorage property, we always synchronize the value
+    // in localStorage to match the one currently in the URI.
+    if (useLocalStorage) {
+      set(URIStorageName, newVal, true);
+    }
+    if (!_.isEqual(newVal, get(URIStorageName, false))) {
+      if (_.isEqual(newVal, defaultVal)) {
+        _unsetFromURI(URIStorageName);
+      } else {
+        set(URIStorageName, newVal, false);
+      }
+    }
+  };
+}
+
+/**
+ * Delete a key from the URI.
+ */
+function _unsetFromURI(key) {
+  const items = _componentToDict(_readComponent());
+  delete items[key];
+  _writeComponent(_dictToComponent(items));
+}
+
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts b/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
new file mode 100644
index 0000000000..adc4dde716
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
@@ -0,0 +1,64 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+import {TAB, getString, getNumber, getObject, setString, setNumber, setObject} from './storage';
+import {TABS} from '../tf_globals_d3v4/globals';
+
+/* tslint:disable:no-namespace */
+describe('URIStorage', () => {
+  it('get/setString', () => {
+    setString('key_a', 'hello', false);
+    setString('key_b', 'there', false);
+    chai.assert.equal('hello', getString('key_a', false));
+    chai.assert.equal('there', getString('key_b', false));
+    chai.assert.equal(null, getString('key_c', false));
+  });
+
+  it('get/setNumber', () => {
+    setNumber('key_a', 12, false);
+    setNumber('key_b', 3.4, false);
+    chai.assert.equal(12, getNumber('key_a', false));
+    chai.assert.equal(3.4, getNumber('key_b', false));
+    chai.assert.equal(null, getNumber('key_c', false));
+  });
+
+  it('get/setObject', () => {
+    const obj = {'foo': 2.3, 'bar': 'barstr'};
+    setObject('key_a', obj, false);
+    chai.assert.deepEqual(obj, getObject('key_a', false));
+  });
+
+  it('get/setWeirdValues', () => {
+    setNumber('key_a', NaN, false);
+    chai.assert.deepEqual(NaN, getNumber('key_a', false));
+
+    setNumber('key_a', +Infinity, false);
+    chai.assert.equal(+Infinity, getNumber('key_a', false));
+
+    setNumber('key_a', -Infinity, false);
+    chai.assert.equal(-Infinity, getNumber('key_a', false));
+
+    setNumber('key_a', 1 / 3, false);
+    chai.assert.equal(1 / 3, getNumber('key_a', false));
+
+    setNumber('key_a', -0, false);
+    chai.assert.equal(-0, getNumber('key_a', false));
+  });
+
+  it('set/getTab', () => {
+    setString(TAB, TABS[0], false);
+    chai.assert.equal(TABS[0], getString(TAB, false));
+  });
+});
+
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html b/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html
new file mode 100644
index 0000000000..6d395b0702
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../../polymer/polymer.html">
+  <link rel="import" href="../tf-storage.html">
+</head>
+<body>
+  <script src="storageTests.js"></script>
+</body>
+</html>
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index b0e0924093..a8d3dd65c7 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -1168,6 +1168,10 @@ tf_module {
     name: "log1p"
     argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
+  member_method {
+    name: "log_sigmoid"
+    argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "logical_and"
     argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-- 
GitLab


From 958a7eacd62875155d52bef2cbf3263e74850b9c Mon Sep 17 00:00:00 2001
From: Daniel Trebbien <dtrebbien@gmail.com>
Date: Wed, 26 Apr 2017 19:30:06 -0400
Subject: [PATCH 0716/1563] Utilize InlinedVector::emplace_back (#9315)

---
 tensorflow/core/kernels/linalg_ops_common.cc | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tensorflow/core/kernels/linalg_ops_common.cc b/tensorflow/core/kernels/linalg_ops_common.cc
index a38ddf76eb..e4b31514fd 100644
--- a/tensorflow/core/kernels/linalg_ops_common.cc
+++ b/tensorflow/core/kernels/linalg_ops_common.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/linalg_ops_common.h"
 
+#include <utility>
+
 #include "third_party/eigen3/Eigen/Core"
 #include "tensorflow/core/framework/device_base.h"
 #include "tensorflow/core/framework/kernel_def_builder.h"
@@ -153,10 +155,8 @@ void LinearAlgebraOp<Scalar>::AnalyzeInputs(OpKernelContext* context,
     const int col_dimension = input_rank - 1;
     const int64 num_rows = in.dim_size(row_dimension);
     const int64 num_cols = in.dim_size(col_dimension);
-    // TODO(rmlarsen): Use emplace_back when it is added to InlinedVector. Same
-    // in several places below.
-    input_matrix_shapes->push_back(TensorShape({num_rows, num_cols}));
-    inputs->push_back(&in);
+    input_matrix_shapes->emplace_back(std::initializer_list<int64>({num_rows, num_cols}));
+    inputs->emplace_back(&in);
   }
   // Have the derived class validate that the inputs are as expected.
   ValidateInputMatrixShapes(context, *input_matrix_shapes);
@@ -219,7 +219,7 @@ void LinearAlgebraOp<Scalar>::PrepareOutputs(
       OP_REQUIRES_OK(context, context->allocate_output(
                                   output_idx, output_tensor_shape, &out));
     }
-    outputs->push_back(out);
+    outputs->emplace_back(out);
   }
 }
 
@@ -232,11 +232,11 @@ void LinearAlgebraOp<Scalar>::ComputeTensorSlice(
   for (size_t i = 0; i < inputs.size(); ++i) {
     // TODO(kalakris): Handle alignment if possible. Eigen::Map is
     // unaligned by default.
-    matrix_inputs.push_back(
-        ConstMatrixMap(inputs[i]->flat<Scalar>().data() +
-                           matrix_index * input_matrix_shapes[i].num_elements(),
-                       input_matrix_shapes[i].dim_size(0),
-                       input_matrix_shapes[i].dim_size(1)));
+    matrix_inputs.emplace_back(
+        inputs[i]->flat<Scalar>().data() +
+            matrix_index * input_matrix_shapes[i].num_elements(),
+        input_matrix_shapes[i].dim_size(0),
+        input_matrix_shapes[i].dim_size(1));
   }
 
   MatrixMaps matrix_outputs;
@@ -248,10 +248,10 @@ void LinearAlgebraOp<Scalar>::ComputeTensorSlice(
     int num_output_cols = output_matrix_shapes[i].dims() == 2
                               ? output_matrix_shapes[i].dim_size(1)
                               : 1;
-    matrix_outputs.push_back(
-        MatrixMap(outputs[i]->flat<Scalar>().data() +
-                      matrix_index * output_matrix_shapes[i].num_elements(),
-                  num_output_rows, num_output_cols));
+    matrix_outputs.emplace_back(
+        outputs[i]->flat<Scalar>().data() +
+            matrix_index * output_matrix_shapes[i].num_elements(),
+        num_output_rows, num_output_cols);
   }
   ComputeMatrix(context, matrix_inputs, &matrix_outputs);
 }
-- 
GitLab


From 626f5657686cea341ba2200ed0a50479c0a8f3fb Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 15:39:11 -0800
Subject: [PATCH 0717/1563] [XLA] LiteralUtil::EachCellAsString : Pass in
 callback function as reference. Change: 154362604

---
 tensorflow/compiler/xla/literal_util.cc | 5 ++---
 tensorflow/compiler/xla/literal_util.h  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index 7091c324d1..0286b0817c 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -680,9 +680,8 @@ void TransposeLiteralInternal(const Literal& original,
 
 /* static */ void LiteralUtil::EachCellAsString(
     const Literal& literal,
-    std::function<void(tensorflow::gtl::ArraySlice<int64> indices,
-                       const string& value)>
-        per_cell) {
+    const std::function<void(tensorflow::gtl::ArraySlice<int64> indices,
+                             const string& value)>& per_cell) {
   if (ShapeUtil::Rank(literal.shape()) == 1) {
     for (int64 i0 = 0; i0 < literal.shape().dimensions(0); ++i0) {
       per_cell({i0}, GetAsString(literal, {i0}));
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index 21bb2e46cf..ef78b819e3 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -257,9 +257,8 @@ class LiteralUtil {
   // like representation in a protobuf).
   static void EachCellAsString(
       const Literal& literal,
-      std::function<void(tensorflow::gtl::ArraySlice<int64> indices,
-                         const string& value)>
-          per_cell);
+      const std::function<void(tensorflow::gtl::ArraySlice<int64> indices,
+                               const string& value)>& per_cell);
   template <typename NativeT>
   static void EachCell(
       const Literal& literal,
-- 
GitLab


From 21990e2a7c2f563202e95e4e5d78c8b599957f33 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 15:39:55 -0800
Subject: [PATCH 0718/1563] Time out after 30 minutes when waiting for the
 session to be ready. Change: 154362697

---
 tensorflow/python/estimator/estimator_test.py   | 2 ++
 tensorflow/python/training/monitored_session.py | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 3b46db59e3..f70c285f04 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -540,6 +540,8 @@ class EstimatorTrainTest(test.TestCase):
     # Mocking the SessionManager.wait_for_session, so that worker doesn't wait
     # for chief.
     def get_initialized_session(*args, **kwargs):
+      # Session doesn't take 'max_wait_secs' argument.
+      kwargs.pop('max_wait_secs', None)
       scaffold = training.Scaffold().finalize()
       sess = session.Session(*args, **kwargs)
       sess.run(scaffold.init_op)
diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index 6d6128d207..4c81af56ad 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -422,7 +422,9 @@ class WorkerSessionCreator(SessionCreator):
   def create_session(self):
     self._scaffold.finalize()
     return self._get_session_manager().wait_for_session(
-        self._master, config=self._config)
+        self._master, config=self._config,
+        max_wait_secs=30 * 60  # Wait up to 30 mins for the session to be ready.
+    )
 
 
 class _MonitoredSession(object):
-- 
GitLab


From b43c679383bad83ae89200199d35fb316ec84908 Mon Sep 17 00:00:00 2001
From: Daniel Trebbien <dtrebbien@gmail.com>
Date: Wed, 26 Apr 2017 20:11:15 -0400
Subject: [PATCH 0719/1563] Use AppendShape() instead of looping over and
 adding the dims of output_matrix_shape individually (#9395)

---
 tensorflow/core/kernels/linalg_ops_common.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tensorflow/core/kernels/linalg_ops_common.cc b/tensorflow/core/kernels/linalg_ops_common.cc
index e4b31514fd..2a27476b09 100644
--- a/tensorflow/core/kernels/linalg_ops_common.cc
+++ b/tensorflow/core/kernels/linalg_ops_common.cc
@@ -198,9 +198,7 @@ void LinearAlgebraOp<Scalar>::PrepareOutputs(
       // concatenated with the output_matrix_shape (if the output is not
       // scalar).
       output_tensor_shape = batch_shape;
-      for (int dim = 0; dim < output_matrix_shape.dims(); ++dim) {
-        output_tensor_shape.AddDim(output_matrix_shape.dim_size(dim));
-      }
+      output_tensor_shape.AppendShape(output_matrix_shape);
     }
     Tensor* out = nullptr;
     // See if there is an input buffer we can reuse for this output.
-- 
GitLab


From 7314ba8f5d8419892b23a5c89fd809c8d86fdcb8 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Wed, 26 Apr 2017 16:00:30 -0800
Subject: [PATCH 0720/1563] Test that Graphs and Operations are gc'd despite
 cyclic references.

I ran into this working on a patch where I added a __del__ method to
Operation, which caused garbage collection to be disabled for cyclic
references. This triggered a failure in PyOpTest.testCleanup but was
very hard to debug. This test should more clearly guard against making
this mistake.
Change: 154365215
---
 tensorflow/python/framework/ops_test.py | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tensorflow/python/framework/ops_test.py b/tensorflow/python/framework/ops_test.py
index 2cff66dfb7..06d03121a0 100644
--- a/tensorflow/python/framework/ops_test.py
+++ b/tensorflow/python/framework/ops_test.py
@@ -18,7 +18,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import gc
+import weakref
+
 from tensorflow.core.framework import attr_value_pb2
+from tensorflow.python.client import session
 from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import device as pydev
@@ -1298,6 +1302,32 @@ class GraphTest(test_util.TensorFlowTestCase):
     with self.assertRaises(TypeError):
       g.as_graph_element(NonConvertibleObj())
 
+  # Regression test against creating custom __del__ functions in classes
+  # involved in cyclic references, e.g. Graph and Operation. (Python won't gc
+  # cycles that require calling a __del__ method, because the __del__ method can
+  # theoretically increase the object's refcount to "save" it from gc, and any
+  # already-deleted objects in the cycle would have be to restored.)
+  def testGarbageCollected(self):
+    # Create a graph we can delete and a weak reference to monitor if it's gc'd
+    g = ops.Graph()
+    g_ref = weakref.ref(g)
+    # Create some ops
+    with g.as_default():
+      a = constant_op.constant(2.0)
+      b = constant_op.constant(3.0)
+      c = math_ops.add(a, b)
+    # Create a session we can delete
+    with session.Session(graph=g) as sess:
+      sess.run(c)
+    # Delete all references and trigger gc
+    del g
+    del a
+    del b
+    del c
+    del sess
+    gc.collect()
+    self.assertIsNone(g_ref())
+
 
 class AttrScopeTest(test_util.TensorFlowTestCase):
 
-- 
GitLab


From 1e3e5d424eaa6332314f8ad1d54089eb0f9e02e7 Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Wed, 26 Apr 2017 16:12:34 -0800
Subject: [PATCH 0721/1563] Refactor Keras layers to rely on core TF layers.

API change: for users of custom Keras layers built using `tf.contrib.keras`, the method `add_weight` of the Keras base layer has now a new API (synced with the main Keras GitHub repo).
Change: 154366685
---
 tensorflow/contrib/keras/BUILD                |   1 +
 .../contrib/keras/python/keras/backend.py     |  40 +-
 .../keras/python/keras/engine/topology.py     | 348 +++++------------
 .../python/keras/engine/topology_test.py      |   4 +-
 .../keras/layers/advanced_activations.py      |   2 +-
 .../python/keras/layers/convolutional.py      |  14 +-
 .../keras/layers/convolutional_recurrent.py   |   6 +-
 .../contrib/keras/python/keras/layers/core.py |  64 +--
 .../keras/python/keras/layers/core_test.py    |  13 +-
 .../keras/python/keras/layers/embeddings.py   |   2 +-
 .../keras/python/keras/layers/local.py        |   8 +-
 .../keras/python/keras/layers/merge.py        |   1 +
 .../python/keras/layers/normalization.py      |   8 +-
 .../keras/python/keras/layers/recurrent.py    |  20 +-
 .../contrib/keras/python/keras/models.py      |   9 +
 .../seq2seq/python/ops/attention_wrapper.py   |   4 +-
 .../seq2seq/python/ops/basic_decoder.py       |   2 +-
 .../seq2seq/python/ops/beam_search_decoder.py |   2 +-
 .../contrib/seq2seq/python/ops/helper.py      |   2 +-
 tensorflow/python/layers/base.py              | 363 ++++++++++++------
 tensorflow/python/layers/base_test.py         |  84 ++--
 tensorflow/python/layers/convolutional.py     |  70 ++--
 tensorflow/python/layers/core.py              |  28 +-
 tensorflow/python/layers/core_test.py         |  12 +-
 tensorflow/python/layers/normalization.py     |  51 ++-
 tensorflow/python/layers/pooling.py           |   6 +-
 tensorflow/python/ops/rnn_cell_impl.py        |   2 +-
 27 files changed, 568 insertions(+), 598 deletions(-)

diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD
index 5166ba37a3..b1b8fc49b6 100644
--- a/tensorflow/contrib/keras/BUILD
+++ b/tensorflow/contrib/keras/BUILD
@@ -119,6 +119,7 @@ py_library(
         "//tensorflow/python:gradients",
         "//tensorflow/python:image_ops",
         "//tensorflow/python:init_ops",
+        "//tensorflow/python:layers",
         "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn",
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index e52b23843a..905ef13e14 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -21,7 +21,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from collections import defaultdict
 import json
 import os
 import warnings
@@ -245,17 +244,40 @@ def set_image_data_format(data_format):
 
 
 def get_uid(prefix=''):
-  global _GRAPH_UID_DICTS  # pylint: disable=global-variable-not-assigned
-  graph = ops.get_default_graph()
-  if graph not in _GRAPH_UID_DICTS:
-    _GRAPH_UID_DICTS[graph] = defaultdict(int)
-  _GRAPH_UID_DICTS[graph][prefix] += 1
-  return _GRAPH_UID_DICTS[graph][prefix]
+  """Associates a string prefix with an integer counter in a TensorFlow graph.
+
+  Arguments:
+    prefix: String prefix to index.
+
+  Returns:
+    Unique integer ID.
+
+  Example:
+
+  ```
+    >>> get_uid('dense')
+    1
+    >>> get_uid('dense')
+    2
+  ```
+  """
+  layer_name_uids_collection = ops.get_collection('LAYER_NAME_UIDS')
+  if not layer_name_uids_collection:
+    layer_name_uids = {}
+    ops.add_to_collection('LAYER_NAME_UIDS', layer_name_uids)
+  else:
+    layer_name_uids = layer_name_uids_collection[0]
+  if prefix not in layer_name_uids:
+    layer_name_uids[prefix] = 1
+  else:
+    layer_name_uids[prefix] += 1
+  return layer_name_uids[prefix]
 
 
 def reset_uids():
-  global _GRAPH_UID_DICTS
-  _GRAPH_UID_DICTS = {}
+  layer_name_uids_collection = ops.get_collection_ref('LAYER_NAME_UIDS')
+  if layer_name_uids_collection:
+    layer_name_uids_collection.pop()
 
 
 def clear_session():
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 7848e5982d..0336fc4bf4 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -29,11 +29,12 @@ import numpy as np
 from six.moves import zip  # pylint: disable=redefined-builtin
 
 from tensorflow.contrib.keras.python.keras import backend as K
-from tensorflow.contrib.keras.python.keras import initializers
 from tensorflow.contrib.keras.python.keras.utils import conv_utils
 from tensorflow.contrib.keras.python.keras.utils.io_utils import ask_to_proceed_with_overwrite
 from tensorflow.contrib.keras.python.keras.utils.layer_utils import print_summary as print_layer_summary
+from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.layers import base as tf_base_layers
 from tensorflow.python.util import tf_inspect
 
 
@@ -207,7 +208,7 @@ class Node(object):
     }
 
 
-class Layer(object):
+class Layer(tf_base_layers.Layer):
   """Abstract base layer class.
 
   # Properties
@@ -276,24 +277,6 @@ class Layer(object):
   """
 
   def __init__(self, **kwargs):
-    self.input_spec = None
-    self.supports_masking = False
-
-    # These properties will be set upon call of self.build()
-    self._trainable_weights = []
-    self._non_trainable_weights = []
-    self._constraints = {}  # dict {tensor: constraint instance}
-    self._losses = []
-    self._updates = []
-    self._per_input_losses = {}
-    self._per_input_updates = {}
-    self._built = False
-
-    # These lists will be filled via successive calls
-    # to self._add_inbound_node().
-    self.inbound_nodes = []
-    self.outbound_nodes = []
-
     # These properties should be set by the user via keyword arguments.
     # note that 'dtype', 'input_shape' and 'batch_input_shape'
     # are only applicable to input layers: do not pass these keywords
@@ -306,18 +289,38 @@ class Layer(object):
         'name',
         'trainable',
         'weights',
-        'input_dtype',  # legacy
     }
+    # Validate optional keyword arguments.
     for kwarg in kwargs:
       if kwarg not in allowed_kwargs:
         raise TypeError('Keyword argument not understood:', kwarg)
+
+    # Get layer name.
     name = kwargs.get('name')
-    if not name:
-      prefix = self.__class__.__name__
-      name = _to_snake_case(prefix) + '_' + str(K.get_uid(prefix))
-    self.name = name
 
-    self.trainable = kwargs.get('trainable', True)
+    # Get `trainable` status.
+    trainable = kwargs.get('trainable', True)
+
+    # Get `dtype`.
+    dtype = kwargs.get('dtype')
+    if dtype is None:
+      dtype = K.floatx()
+
+    # Call super, which will set all properties common to Keras layers
+    # and core TF layers.
+    super(Layer, self).__init__(name=name, dtype=dtype, trainable=trainable)
+
+    # Add properties that are Keras-only for now.
+    self.input_spec = None
+    self.supports_masking = False
+    self._constraints = {}  # dict {tensor: constraint instance}
+
+    # These lists will be filled via successive calls
+    # to self._add_inbound_node().
+    self.inbound_nodes = []
+    self.outbound_nodes = []
+
+    # Manage input shape information if passed.
     if 'input_shape' in kwargs or 'batch_input_shape' in kwargs:
       # In this case we will later create an input layer
       # to insert before the current layer
@@ -331,35 +334,12 @@ class Layer(object):
         batch_input_shape = (batch_size,) + tuple(kwargs['input_shape'])
       self.batch_input_shape = batch_input_shape
 
-      # Set dtype.
-      dtype = kwargs.get('dtype')
-      if dtype is None:
-        dtype = kwargs.get('input_dtype')
-      if dtype is None:
-        dtype = K.floatx()
-      self.dtype = dtype
-
+    # Manage initial weight values if passed.
     if 'weights' in kwargs:
       self._initial_weights = kwargs['weights']
     else:
       self._initial_weights = None
 
-  @property
-  def losses(self):
-    return self._losses
-
-  @property
-  def updates(self):
-    return self._updates
-
-  @property
-  def built(self):
-    return self._built
-
-  @built.setter
-  def built(self, value):
-    self._built = value
-
   @property
   def constraints(self):
     return self._constraints
@@ -368,63 +348,37 @@ class Layer(object):
   def constraints(self, constraints):
     self._constraints = constraints
 
-  @property
-  def trainable_weights(self):
-    trainable = getattr(self, 'trainable', True)
-    if trainable:
-      return self._trainable_weights
-    else:
-      return []
-
-  @trainable_weights.setter
-  def trainable_weights(self, weights):
-    self._trainable_weights = weights
-
-  @property
-  def non_trainable_weights(self):
-    trainable = getattr(self, 'trainable', True)
-    if not trainable:
-      return self._trainable_weights + self._non_trainable_weights
-    else:
-      return self._non_trainable_weights
-
-  @non_trainable_weights.setter
-  def non_trainable_weights(self, weights):
-    self._non_trainable_weights = weights
-
   def add_weight(self,
+                 name,
                  shape,
-                 initializer,
-                 name=None,
-                 trainable=True,
+                 dtype=None,
+                 initializer=None,
                  regularizer=None,
+                 trainable=True,
                  constraint=None):
     """Adds a weight variable to the layer.
 
     Arguments:
+        name: String, the name for the weight variable.
         shape: The shape tuple of the weight.
+        dtype: The dtype of the weight.
         initializer: An Initializer instance (callable).
-        name: String, the name for the weight variable.
+        regularizer: An optional Regularizer instance.
         trainable: A boolean, whether the weight should
             be trained via backprop or not (assuming
             that the layer itself is also trainable).
-        regularizer: An optional Regularizer instance.
         constraint: An optional Constraint instance.
 
     Returns:
         The created weight variable.
     """
-    shape = tuple(tensor_shape.TensorShape(shape).as_list())
-    initializer = initializers.get(initializer)
-    weight = K.variable(initializer(shape), dtype=K.floatx(), name=name)
-    if regularizer is not None:
-      self.add_loss(regularizer(weight))
+    if dtype is None:
+      dtype = K.floatx()
+    weight = self.add_variable(
+        name, shape, dtype=dtype,
+        initializer=initializer, regularizer=regularizer, trainable=trainable)
     if constraint is not None:
       self.constraints[weight] = constraint
-    if trainable:
-      self._trainable_weights.append(weight)
-    else:
-      self._non_trainable_weights.append(weight)
     return weight
 
   def assert_input_compatibility(self, inputs):
@@ -554,66 +508,46 @@ class Layer(object):
     """
     if isinstance(inputs, list):
       inputs = inputs[:]
+
+    # Raise exceptions in case the input is not compatible
+    # with the input_spec set at build time.
+    # TODO(fchollet): call after the layer is built, too.
+    self.assert_input_compatibility(inputs)
+
+    # Handle mask propagation.
+    previous_mask = _collect_previous_mask(inputs)
+    user_kwargs = copy.copy(kwargs)
+    if not _is_all_none(previous_mask):
+      # The previous layer generated a mask.
+      if 'mask' in tf_inspect.getargspec(self.call).args:
+        if 'mask' not in kwargs:
+          # If mask is explicitly passed to __call__,
+          # we should override the default mask.
+          kwargs['mask'] = previous_mask
+
+    # Actually call the layer (optionally building it).
+    output = super(Layer, self).__call__(inputs, **kwargs)
+
+    # Handle mask computation.
     with K.name_scope(self.name):
-      # Handle laying building (weight creating, input spec locking).
-      if not self.built:
-        # Raise exceptions in case the input is not compatible
-        # with the input_spec specified in the layer constructor.
-        self.assert_input_compatibility(inputs)
-
-        # Collect input shapes to build layer.
-        input_shapes = []
-        for x_elem in _to_list(inputs):
-          input_shapes.append(K.int_shape(x_elem))
-        if len(input_shapes) == 1:
-          self.build(input_shapes[0])
-        else:
-          self.build(input_shapes)
-        self.built = True
-
-        # Load weights that were specified at layer instantiation.
-        if self._initial_weights is not None:
-          self.set_weights(self._initial_weights)
-
-      # Raise exceptions in case the input is not compatible
-      # with the input_spec set at build time.
-      self.assert_input_compatibility(inputs)
-
-      # Handle mask propagation.
-      previous_mask = _collect_previous_mask(inputs)
-      user_kwargs = copy.copy(kwargs)
-      if not _is_all_none(previous_mask):
-        # The previous layer generated a mask.
-        if 'mask' in tf_inspect.getargspec(self.call).args:
-          if 'mask' not in kwargs:
-            # If mask is explicitly passed to __call__,
-            # we should override the default mask.
-            kwargs['mask'] = previous_mask
-
-      # Actually call the layer, collecting output(s), mask(s), and shape(s).
-      output = self.call(inputs, **kwargs)
       output_mask = self.compute_mask(inputs, previous_mask)
 
-      # Add an inbound node to the layer, so that it keeps track
-      # of the call and of all new variables created during the call.
-      # This also updates the layer history of the output tensor(s).
-      # If the input tensor(s) had not previous Keras history,
-      # this does nothing.
-      self._add_inbound_node(
-          input_tensors=inputs,
-          output_tensors=output,
-          input_masks=previous_mask,
-          output_masks=output_mask,
-          arguments=user_kwargs)
-
-      # Apply activity regularizer if any:
-      if hasattr(
-          self,
-          'activity_regularizer') and self.activity_regularizer is not None:
-        regularization_losses = [
-            self.activity_regularizer(x) for x in _to_list(output)
-        ]
-        self.add_loss(regularization_losses, _to_list(inputs))
+    # Add an inbound node to the layer, so that it keeps track
+    # of the call and of all new variables created during the call.
+    # This also updates the layer history of the output tensor(s).
+    # If the input tensor(s) had not previous Keras history,
+    # this does nothing.
+    self._add_inbound_node(
+        input_tensors=inputs,
+        output_tensors=output,
+        input_masks=previous_mask,
+        output_masks=output_mask,
+        arguments=user_kwargs)
+
+    # Optionally load weight values that were specified at layer instantiation.
+    if hasattr(self, '_initial_weights') and self._initial_weights is not None:
+      self.set_weights(self._initial_weights)
+      del self._initial_weights
     return output
 
   def _add_inbound_node(self,
@@ -959,14 +893,14 @@ class Layer(object):
 
   @property
   def input_shape(self):
-    """Retrieves the input shape tuple(s) of a layer.
+    """Retrieves the input shape(s) of a layer.
 
     Only applicable if the layer has exactly one inbound node,
     i.e. if it is connected to one incoming layer.
 
     Returns:
-        Input shape tuple
-        (or list of input shape tuples, one tuple per input tensor).
+        Input shape, as `TensorShape`
+        (or list of `TensorShape`, one tuple per input tensor).
 
     Raises:
         AttributeError: if the layer is connected to
@@ -997,14 +931,14 @@ class Layer(object):
 
   @property
   def output_shape(self):
-    """Retrieves the output shape tuple(s) of a layer.
+    """Retrieves the output shape(s) of a layer.
 
     Only applicable if the layer has one inbound node,
     or if all inbound nodes have the same output shape.
 
     Returns:
-        Output shape tuple
-        (or list of input shape tuples, one tuple per output tensor).
+        Output shape, as `TensorShape`
+        (or list of `TensorShape`, one tuple per output tensor).
 
     Raises:
         AttributeError: if the layer is connected to
@@ -1033,94 +967,6 @@ class Layer(object):
                            'Use `get_output_shape_at(node_index)` '
                            'instead.')
 
-  def add_loss(self, losses, inputs=None):
-    """Add losses to the layer.
-
-    The loss may potentially be conditional on some inputs tensors,
-    for instance activity losses are conditional on the layer's inputs.
-
-    Arguments:
-        losses: loss tensor or list of loss tensors
-            to add to the layer.
-        inputs: input tensor or list of inputs tensors to mark
-            the losses as conditional on these inputs.
-            If None is passed, the loss is assumed unconditional
-            (e.g. L2 weight regularization, which only depends
-            on the layer's weights variables, not on any inputs tensors).
-    """
-    if losses is None or losses == []:  # pylint: disable=g-explicit-bool-comparison
-      return
-    # Update self.losses
-    losses = _to_list(losses)
-    if hasattr(self, '_losses'):
-      self._losses += losses
-    # Update self._per_input_updates
-    if inputs == []:  # pylint: disable=g-explicit-bool-comparison
-      inputs = None
-    if inputs is not None:
-      inputs_hash = _object_list_uid(inputs)
-    else:
-      # Updates indexed by None are unconditional
-      # rather than input-dependent
-      inputs_hash = None
-    if inputs_hash not in self._per_input_losses:
-      self._per_input_losses[inputs_hash] = []
-    self._per_input_losses[inputs_hash] += losses
-
-  def add_update(self, updates, inputs=None):
-    """Add updates to the layer.
-
-    The updates may potentially be conditional on some inputs tensors,
-    for instance batch norm updates are conditional on the layer's inputs.
-
-    Arguments:
-        updates: update op or list of update ops
-            to add to the layer.
-        inputs: input tensor or list of inputs tensors to mark
-            the updates as conditional on these inputs.
-            If None is passed, the updates are assumed unconditional.
-    """
-    if updates is None or updates == []:  # pylint: disable=g-explicit-bool-comparison
-      return
-    # Update self.updates
-    updates = _to_list(updates)
-    if hasattr(self, '_updates'):
-      self._updates += updates
-    # Update self._per_input_updates
-    if inputs == []:  # pylint: disable=g-explicit-bool-comparison
-      inputs = None
-    if inputs is not None:
-      inputs_hash = _object_list_uid(inputs)
-    else:
-      # Updates indexed by None are unconditional
-      # rather than input-dependent
-      inputs_hash = None
-    if inputs_hash not in self._per_input_updates:
-      self._per_input_updates[inputs_hash] = []
-    self._per_input_updates[inputs_hash] += updates
-
-  def get_updates_for(self, inputs):
-    if inputs is not None:
-      inputs_hash = _object_list_uid(inputs)
-    else:
-      inputs_hash = None
-    if inputs_hash in self._per_input_updates:
-      return self._per_input_updates[inputs_hash]
-    return []
-
-  def get_losses_for(self, inputs):
-    if inputs is not None:
-      inputs_hash = _object_list_uid(inputs)
-    else:
-      inputs_hash = None
-    if inputs_hash in self._per_input_losses:
-      return self._per_input_losses[inputs_hash]
-    return []
-
-  @property
-  def weights(self):
-    return self.trainable_weights + self.non_trainable_weights
-
   def set_weights(self, weights):
     """Sets the weights of the layer, from Numpy arrays.
 
@@ -1254,9 +1100,12 @@ class InputLayer(Layer):
     if not name:
       prefix = 'input'
       name = prefix + '_' + str(K.get_uid(prefix))
+    if not dtype:
+      if input_tensor is None:
+        dtype = K.floatx()
+      else:
+        dtype = K.dtype(input_tensor)
     super(InputLayer, self).__init__(dtype=dtype, name=name)
-
-    self.trainable = False
     self.built = True
     self.sparse = sparse
 
@@ -1284,15 +1133,7 @@ class InputLayer(Layer):
         batch_input_shape = (batch_size,) + tuple(input_shape)
     else:
       batch_input_shape = tuple(batch_input_shape)
-
-    if not dtype:
-      if input_tensor is None:
-        dtype = K.floatx()
-      else:
-        dtype = K.dtype(input_tensor)
-
     self.batch_input_shape = batch_input_shape
-    self.dtype = dtype
 
     if input_tensor is None:
       self.is_placeholder = True
@@ -1446,12 +1287,19 @@ class Container(Layer):
       prefix = self.__class__.__name__.lower()
       name = prefix + '_' + str(K.get_uid(prefix))
     self.name = name
-
     self.supports_masking = False
     self.trainable = True
     self._per_input_losses = {}
     self._per_input_updates = {}
 
+    # The following properties are not actually used by Keras;
+    # they exist for compatibility with TF.
+    self._updates = []
+    self._scope = None
+    self._reuse = None
+    self._base_name = name
+    self._graph = ops.get_default_graph()
+
     # Container-specific properties.
     if isinstance(inputs, (list, tuple)):
       self.inputs = list(inputs)  # Tensor or list of tensors.
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology_test.py b/tensorflow/contrib/keras/python/keras/engine/topology_test.py
index eb095b14a9..531ed4be3e 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology_test.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology_test.py
@@ -490,8 +490,8 @@ class TopologyConstructionTest(test.TestCase):
     m, n = model([j, k])
     tf_model = keras.models.Model([j, k], [m, n])
 
-    j_tf = array_ops.placeholder(dtype=dtypes.float32)
-    k_tf = array_ops.placeholder(dtype=dtypes.float32)
+    j_tf = array_ops.placeholder(dtype=dtypes.float32, shape=(None, 32))
+    k_tf = array_ops.placeholder(dtype=dtypes.float32, shape=(None, 32))
     m_tf, n_tf = tf_model([j_tf, k_tf])
     self.assertListEqual(m_tf.get_shape().as_list(), [None, 64])
     self.assertListEqual(n_tf.get_shape().as_list(), [None, 5])
diff --git a/tensorflow/contrib/keras/python/keras/layers/advanced_activations.py b/tensorflow/contrib/keras/python/keras/layers/advanced_activations.py
index b3abfc29d2..2c957ece44 100644
--- a/tensorflow/contrib/keras/python/keras/layers/advanced_activations.py
+++ b/tensorflow/contrib/keras/python/keras/layers/advanced_activations.py
@@ -120,7 +120,7 @@ class PReLU(Layer):
         param_shape[i - 1] = 1
         self.param_broadcast[i - 1] = True
     self.alpha = self.add_weight(
-        param_shape,
+        shape=param_shape,
         name='alpha',
         initializer=self.alpha_initializer,
         regularizer=self.alpha_regularizer,
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional.py b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
index 38b8fe66a3..16f49c3390 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
@@ -140,14 +140,14 @@ class _Conv(Layer):
     kernel_shape = self.kernel_size + (input_dim, self.filters)
 
     self.kernel = self.add_weight(
-        kernel_shape,
+        shape=kernel_shape,
         initializer=self.kernel_initializer,
         name='kernel',
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     if self.use_bias:
       self.bias = self.add_weight(
-          (self.filters,),
+          shape=(self.filters,),
           initializer=self.bias_initializer,
           name='bias',
           regularizer=self.bias_regularizer,
@@ -734,14 +734,14 @@ class Conv2DTranspose(Conv2D):
     kernel_shape = self.kernel_size + (self.filters, input_dim)
 
     self.kernel = self.add_weight(
-        kernel_shape,
+        shape=kernel_shape,
         initializer=self.kernel_initializer,
         name='kernel',
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     if self.use_bias:
       self.bias = self.add_weight(
-          (self.filters,),
+          shape=(self.filters,),
           initializer=self.bias_initializer,
           name='bias',
           regularizer=self.bias_regularizer,
@@ -949,13 +949,13 @@ class SeparableConv2D(Conv2D):
                               self.filters)
 
     self.depthwise_kernel = self.add_weight(
-        depthwise_kernel_shape,
+        shape=depthwise_kernel_shape,
         initializer=self.depthwise_initializer,
         name='depthwise_kernel',
         regularizer=self.depthwise_regularizer,
         constraint=self.depthwise_constraint)
     self.pointwise_kernel = self.add_weight(
-        pointwise_kernel_shape,
+        shape=pointwise_kernel_shape,
         initializer=self.pointwise_initializer,
         name='pointwise_kernel',
         regularizer=self.pointwise_regularizer,
@@ -963,7 +963,7 @@ class SeparableConv2D(Conv2D):
 
     if self.use_bias:
       self.bias = self.add_weight(
-          (self.filters,),
+          shape=(self.filters,),
           initializer=self.bias_initializer,
           name='bias',
           regularizer=self.bias_regularizer,
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py b/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
index 4d8ef44da7..30325b7148 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional_recurrent.py
@@ -369,20 +369,20 @@ class ConvLSTM2D(ConvRecurrent2D):
     recurrent_kernel_shape = self.kernel_size + (self.filters, self.filters * 4)
 
     self.kernel = self.add_weight(
-        kernel_shape,
+        shape=kernel_shape,
         initializer=self.kernel_initializer,
         name='kernel',
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     self.recurrent_kernel = self.add_weight(
-        recurrent_kernel_shape,
+        shape=recurrent_kernel_shape,
         initializer=self.recurrent_initializer,
         name='recurrent_kernel',
         regularizer=self.recurrent_regularizer,
         constraint=self.recurrent_constraint)
     if self.use_bias:
       self.bias = self.add_weight(
-          (self.filters * 4,),
+          shape=(self.filters * 4,),
           initializer=self.bias_initializer,
           name='bias',
           regularizer=self.bias_regularizer,
diff --git a/tensorflow/contrib/keras/python/keras/layers/core.py b/tensorflow/contrib/keras/python/keras/layers/core.py
index 32ada176a4..7a9e0d1736 100644
--- a/tensorflow/contrib/keras/python/keras/layers/core.py
+++ b/tensorflow/contrib/keras/python/keras/layers/core.py
@@ -34,6 +34,7 @@ from tensorflow.contrib.keras.python.keras.utils.generic_utils import deserializ
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import func_dump
 from tensorflow.contrib.keras.python.keras.utils.generic_utils import func_load
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.layers import core as tf_core_layers
 from tensorflow.python.util import tf_inspect
 
 
@@ -643,7 +644,7 @@ class Lambda(Layer):
     return cls(**config)
 
 
-class Dense(Layer):
+class Dense(tf_core_layers.Dense, Layer):
   """Just your regular densely-connected NN layer.
 
   `Dense` implements the operation:
@@ -712,15 +713,20 @@ class Dense(Layer):
                **kwargs):
     if 'input_shape' not in kwargs and 'input_dim' in kwargs:
       kwargs['input_shape'] = (kwargs.pop('input_dim'),)
-    super(Dense, self).__init__(**kwargs)
-    self.units = units
-    self.activation = activations.get(activation)
-    self.use_bias = use_bias
-    self.kernel_initializer = initializers.get(kernel_initializer)
-    self.bias_initializer = initializers.get(bias_initializer)
-    self.kernel_regularizer = regularizers.get(kernel_regularizer)
-    self.bias_regularizer = regularizers.get(bias_regularizer)
-    self.activity_regularizer = regularizers.get(activity_regularizer)
+
+    # Inheritance call order:
+    # 1) tf.layers.Dense, 2) keras.layers.Layer, 3) tf.layers.Layer
+    super(Dense, self).__init__(
+        units,
+        activation=activations.get(activation),
+        use_bias=use_bias,
+        kernel_initializer=initializers.get(kernel_initializer),
+        bias_initializer=initializers.get(bias_initializer),
+        kernel_regularizer=regularizers.get(kernel_regularizer),
+        bias_regularizer=regularizers.get(bias_regularizer),
+        activity_regularizer=regularizers.get(activity_regularizer),
+        **kwargs)
+
     self.kernel_constraint = constraints.get(kernel_constraint)
     self.bias_constraint = constraints.get(bias_constraint)
     self.input_spec = InputSpec(min_ndim=2)
@@ -729,40 +735,12 @@ class Dense(Layer):
   def build(self, input_shape):
     assert len(input_shape) >= 2
     input_dim = input_shape[-1]
-
-    self.kernel = self.add_weight(
-        (input_dim, self.units),
-        initializer=self.kernel_initializer,
-        name='kernel',
-        regularizer=self.kernel_regularizer,
-        constraint=self.kernel_constraint)
-    if self.use_bias:
-      self.bias = self.add_weight(
-          (self.units,),
-          initializer=self.bias_initializer,
-          name='bias',
-          regularizer=self.bias_regularizer,
-          constraint=self.bias_constraint)
-    else:
-      self.bias = None
+    super(Dense, self).build(input_shape)
     self.input_spec = InputSpec(min_ndim=2, axes={-1: input_dim})
-    self.built = True
-
-  def call(self, inputs):
-    output = K.dot(inputs, self.kernel)
-    if self.use_bias:
-      output = K.bias_add(output, self.bias)
-    if self.activation is not None:
-      output = self.activation(output)
-    return output
-
-  def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    assert input_shape and len(input_shape) >= 2
-    assert input_shape[-1]
-    output_shape = list(input_shape)
-    output_shape[-1] = self.units
-    return tensor_shape.TensorShape(output_shape)
+    if self.kernel_constraint:
+      self.constraints[self.kernel] = self.kernel_constraint
+    if self.use_bias and self.bias_constraint:
+      self.constraints[self.bias] = self.bias_constraint
 
   def get_config(self):
     config = {
diff --git a/tensorflow/contrib/keras/python/keras/layers/core_test.py b/tensorflow/contrib/keras/python/keras/layers/core_test.py
index d7aa8413bb..7066af0ef6 100644
--- a/tensorflow/contrib/keras/python/keras/layers/core_test.py
+++ b/tensorflow/contrib/keras/python/keras/layers/core_test.py
@@ -165,24 +165,23 @@ class CoreLayersTest(test.TestCase):
           3,
           kernel_regularizer=keras.regularizers.l1(0.01),
           bias_regularizer='l1',
-          activity_regularizer='l2')
-      layer.build((None, 4))
-      assert len(layer.losses) == 2
+          activity_regularizer='l2',
+          name='dense_reg')
       layer(keras.backend.variable(np.ones((2, 4))))
-      assert len(layer.losses) == 3
+      self.assertEqual(3, len(layer.losses))
 
     # Test constraints
     with self.test_session():
       layer = keras.layers.Dense(
           3, kernel_constraint='max_norm', bias_constraint='max_norm')
-      layer.build((None, 4))
-      assert len(layer.constraints) == 2
+      layer(keras.backend.variable(np.ones((2, 4))))
+      self.assertEqual(2, len(layer.constraints))
 
   def test_activity_regularization(self):
     with self.test_session():
       layer = keras.layers.ActivityRegularization(l1=0.1)
       layer(keras.backend.variable(np.ones((2, 4))))
-      assert len(layer.losses) == 1
+      self.assertEqual(1, len(layer.losses))
 
 
 if __name__ == '__main__':
diff --git a/tensorflow/contrib/keras/python/keras/layers/embeddings.py b/tensorflow/contrib/keras/python/keras/layers/embeddings.py
index 12a2ce39eb..bc0bae67d0 100644
--- a/tensorflow/contrib/keras/python/keras/layers/embeddings.py
+++ b/tensorflow/contrib/keras/python/keras/layers/embeddings.py
@@ -116,7 +116,7 @@ class Embedding(Layer):
   def build(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
     self.embeddings = self.add_weight(
-        (self.input_dim, self.output_dim),
+        shape=(self.input_dim, self.output_dim),
         initializer=self.embeddings_initializer,
         name='embeddings',
         regularizer=self.embeddings_regularizer,
diff --git a/tensorflow/contrib/keras/python/keras/layers/local.py b/tensorflow/contrib/keras/python/keras/layers/local.py
index d96ccc4a63..863674c1cb 100644
--- a/tensorflow/contrib/keras/python/keras/layers/local.py
+++ b/tensorflow/contrib/keras/python/keras/layers/local.py
@@ -130,14 +130,14 @@ class LocallyConnected1D(Layer):
     self.kernel_shape = (output_length, self.kernel_size[0] * input_dim,
                          self.filters)
     self.kernel = self.add_weight(
-        self.kernel_shape,
+        shape=self.kernel_shape,
         initializer=self.kernel_initializer,
         name='kernel',
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     if self.use_bias:
       self.bias = self.add_weight(
-          (output_length, self.filters),
+          shape=(output_length, self.filters),
           initializer=self.bias_initializer,
           name='bias',
           regularizer=self.bias_regularizer,
@@ -340,14 +340,14 @@ class LocallyConnected2D(Layer):
         output_row * output_col,
         self.kernel_size[0] * self.kernel_size[1] * input_filter, self.filters)
     self.kernel = self.add_weight(
-        self.kernel_shape,
+        shape=self.kernel_shape,
         initializer=self.kernel_initializer,
         name='kernel',
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     if self.use_bias:
       self.bias = self.add_weight(
-          (output_row, output_col, self.filters),
+          shape=(output_row, output_col, self.filters),
           initializer=self.bias_initializer,
           name='bias',
           regularizer=self.bias_regularizer,
diff --git a/tensorflow/contrib/keras/python/keras/layers/merge.py b/tensorflow/contrib/keras/python/keras/layers/merge.py
index 7c6482d0de..25921979bd 100644
--- a/tensorflow/contrib/keras/python/keras/layers/merge.py
+++ b/tensorflow/contrib/keras/python/keras/layers/merge.py
@@ -87,6 +87,7 @@ class _Merge(Layer):
       raise ValueError('A merge layer should be called '
                        'on a list of at least 2 inputs. '
                        'Got ' + str(len(input_shape)) + ' inputs.')
+    input_shape = [tensor_shape.TensorShape(s).as_list() for s in input_shape]
     batch_sizes = [s[0] for s in input_shape if s is not None]
     batch_sizes = set(batch_sizes)
     batch_sizes -= set([None])
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index 9a0340aeaf..df77401aee 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -116,7 +116,7 @@ class BatchNormalization(Layer):
 
     if self.scale:
       self.gamma = self.add_weight(
-          shape,
+          shape=shape,
           name='gamma',
           initializer=self.gamma_initializer,
           regularizer=self.gamma_regularizer,
@@ -125,7 +125,7 @@ class BatchNormalization(Layer):
       self.gamma = None
     if self.center:
       self.beta = self.add_weight(
-          shape,
+          shape=shape,
           name='beta',
           initializer=self.beta_initializer,
           regularizer=self.beta_regularizer,
@@ -133,12 +133,12 @@ class BatchNormalization(Layer):
     else:
       self.beta = None
     self.moving_mean = self.add_weight(
-        shape,
+        shape=shape,
         name='moving_mean',
         initializer=self.moving_mean_initializer,
         trainable=False)
     self.moving_variance = self.add_weight(
-        shape,
+        shape=shape,
         name='moving_variance',
         initializer=self.moving_variance_initializer,
         trainable=False)
diff --git a/tensorflow/contrib/keras/python/keras/layers/recurrent.py b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
index 1ea1cb22d9..e608921add 100644
--- a/tensorflow/contrib/keras/python/keras/layers/recurrent.py
+++ b/tensorflow/contrib/keras/python/keras/layers/recurrent.py
@@ -493,20 +493,20 @@ class SimpleRNN(Recurrent):
       self.reset_states()
 
     self.kernel = self.add_weight(
-        (self.input_dim, self.units),
+        shape=(self.input_dim, self.units),
         name='kernel',
         initializer=self.kernel_initializer,
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     self.recurrent_kernel = self.add_weight(
-        (self.units, self.units),
+        shape=(self.units, self.units),
         name='recurrent_kernel',
         initializer=self.recurrent_initializer,
         regularizer=self.recurrent_regularizer,
         constraint=self.recurrent_constraint)
     if self.use_bias:
       self.bias = self.add_weight(
-          (self.units,),
+          shape=(self.units,),
           name='bias',
           initializer=self.bias_initializer,
           regularizer=self.bias_regularizer,
@@ -723,13 +723,13 @@ class GRU(Recurrent):
       self.reset_states()
 
     self.kernel = self.add_weight(
-        (self.input_dim, self.units * 3),
+        shape=(self.input_dim, self.units * 3),
         name='kernel',
         initializer=self.kernel_initializer,
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     self.recurrent_kernel = self.add_weight(
-        (self.units, self.units * 3),
+        shape=(self.units, self.units * 3),
         name='recurrent_kernel',
         initializer=self.recurrent_initializer,
         regularizer=self.recurrent_regularizer,
@@ -737,9 +737,9 @@ class GRU(Recurrent):
 
     if self.use_bias:
       self.bias = self.add_weight(
-          (self.units * 3,),
+          shape=(self.units * 3,),
           name='bias',
-          initializer='zero',
+          initializer=self.bias_initializer,
           regularizer=self.bias_regularizer,
           constraint=self.bias_constraint)
     else:
@@ -1039,13 +1039,13 @@ class LSTM(Recurrent):
       self.reset_states()
 
     self.kernel = self.add_weight(
-        (self.input_dim, self.units * 4),
+        shape=(self.input_dim, self.units * 4),
         name='kernel',
         initializer=self.kernel_initializer,
         regularizer=self.kernel_regularizer,
         constraint=self.kernel_constraint)
     self.recurrent_kernel = self.add_weight(
-        (self.units, self.units * 4),
+        shape=(self.units, self.units * 4),
         name='recurrent_kernel',
         initializer=self.recurrent_initializer,
         regularizer=self.recurrent_regularizer,
@@ -1053,7 +1053,7 @@ class LSTM(Recurrent):
 
     if self.use_bias:
       self.bias = self.add_weight(
-          (self.units * 4,),
+          shape=(self.units * 4,),
           name='bias',
           initializer=self.bias_initializer,
           regularizer=self.bias_regularizer,
diff --git a/tensorflow/contrib/keras/python/keras/models.py b/tensorflow/contrib/keras/python/keras/models.py
index eb0996fa12..52456a4bb5 100644
--- a/tensorflow/contrib/keras/python/keras/models.py
+++ b/tensorflow/contrib/keras/python/keras/models.py
@@ -35,6 +35,7 @@ from tensorflow.contrib.keras.python.keras.engine.topology import Input
 from tensorflow.contrib.keras.python.keras.engine.topology import Layer
 from tensorflow.contrib.keras.python.keras.engine.training import Model
 from tensorflow.contrib.keras.python.keras.utils.io_utils import ask_to_proceed_with_overwrite
+from tensorflow.python.framework import ops
 
 
 # pylint: disable=g-import-not-at-top
@@ -420,6 +421,14 @@ class Sequential(Model):
       name = prefix + str(K.get_uid(prefix))
     self.name = name
 
+    # The following properties are not actually used by Keras;
+    # they exist for compatibility with TF's variable scoping mechanism.
+    self._updates = []
+    self._scope = None
+    self._reuse = None
+    self._base_name = name
+    self._graph = ops.get_default_graph()
+
     # Add to the model any layers passed to the constructor.
     if layers:
       for layer in layers:
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 2e2b2ebe60..6c181fe832 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -144,11 +144,11 @@ class _BaseAttentionMechanism(AttentionMechanism):
       name: Name to use when creating ops.
     """
     if (query_layer is not None
-        and not isinstance(query_layer, layers_base._Layer)):  # pylint: disable=protected-access
+        and not isinstance(query_layer, layers_base.Layer)):
       raise TypeError(
           "query_layer is not a Layer: %s" % type(query_layer).__name__)
     if (memory_layer is not None
-        and not isinstance(memory_layer, layers_base._Layer)):  # pylint: disable=protected-access
+        and not isinstance(memory_layer, layers_base.Layer)):
       raise TypeError(
           "memory_layer is not a Layer: %s" % type(memory_layer).__name__)
     self._query_layer = query_layer
diff --git a/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py b/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
index e73a637027..6231a1fdf9 100644
--- a/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
@@ -65,7 +65,7 @@ class BasicDecoder(decoder.Decoder):
     if not isinstance(helper, helper_py.Helper):
       raise TypeError("helper must be a Helper, received: %s" % type(helper))
     if (output_layer is not None
-        and not isinstance(output_layer, layers_base._Layer)):  # pylint: disable=protected-access
+        and not isinstance(output_layer, layers_base.Layer)):
       raise TypeError(
           "output_layer must be a Layer, received: %s" % type(output_layer))
     self._cell = cell
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index 289da8e6ae..2dbaf746ed 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -146,7 +146,7 @@ class BeamSearchDecoder(decoder.Decoder):
     if not isinstance(cell, core_rnn_cell.RNNCell):
       raise TypeError("cell must be an RNNCell, received: %s" % type(cell))
     if (output_layer is not None
-        and not isinstance(output_layer, layers_base._Layer)):  # pylint: disable=protected-access
+        and not isinstance(output_layer, layers_base.Layer)):
       raise TypeError(
           "output_layer must be a Layer, received: %s" % type(output_layer))
     self._cell = cell
diff --git a/tensorflow/contrib/seq2seq/python/ops/helper.py b/tensorflow/contrib/seq2seq/python/ops/helper.py
index e2d56063a2..d6c0527ad2 100644
--- a/tensorflow/contrib/seq2seq/python/ops/helper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/helper.py
@@ -363,7 +363,7 @@ class ScheduledOutputTrainingHelper(TrainingHelper):
       self._seed = seed
 
       if (next_input_layer is not None and not isinstance(next_input_layer,
-                                                          layers_base._Layer)):  # pylint: disable=protected-access
+                                                          layers_base.Layer)):
         raise TypeError("next_input_layer must be a Layer, received: %s" %
                         type(next_input_layer))
       self._next_input_layer = next_input_layer
diff --git a/tensorflow/python/layers/base.py b/tensorflow/python/layers/base.py
index ff9a777f19..f6b816333e 100644
--- a/tensorflow/python/layers/base.py
+++ b/tensorflow/python/layers/base.py
@@ -38,7 +38,7 @@ from tensorflow.python.util import nest
 from tensorflow.python.util import tf_inspect
 
 
-class _Layer(object):
+class Layer(object):
   """Base layer class.
 
   WARNING: Do not subclass this layer unless you know what you are doing:
@@ -80,23 +80,27 @@ class _Layer(object):
       if kwarg not in allowed_kwargs:
         raise TypeError('Keyword argument not understood:', kwarg)
 
-    self._trainable = trainable
-    self._built = False
-    self._trainable_variables = []
-    self._non_trainable_variables = []
+    self.trainable = trainable
+    self.built = False
+    self._trainable_weights = []
+    self._non_trainable_weights = []
     self._updates = []
     self._losses = []
     self._reuse = kwargs.get('_reuse')
     self._graph = ops.get_default_graph()
-    self.dtype = dtype
+    self._per_input_losses = {}
+    self._per_input_updates = {}
+    self.dtype = dtypes.as_dtype(dtype).name
 
-    # Determine base name (non-unique).
+    # Determine layer name (non-unique).
     if isinstance(name, vs.VariableScope):
       base_name = name.name
     else:
       base_name = name
+      self.name = name
     if not name:
       base_name = _to_snake_case(self.__class__.__name__)
+      self.name = _unique_layer_name(base_name)
     self._base_name = base_name
 
     # Determine variable scope.
@@ -106,45 +110,43 @@ class _Layer(object):
     else:
       self._scope = None
 
-    # Unique name is borrowed from scope to match variable names.
-    if self._scope is not None:
-      self._name = self._scope.name
-    else:
-      # No name available until we see a scope
-      self._name = None
-
-  def __setattr__(self, name, value):
-    if hasattr(self, name):
-      # Only allow private attributes to be set more than once, under the
-      # convention that private attributes should only be set from inside
-      # the class.
-      # All attributes meant to be set several times should be set to private.
-      if name[0] != '_':
-        raise AttributeError('Read-only property cannot be set: %s' % name)
-    super(_Layer, self).__setattr__(name, value)
+  @property
+  def scope_name(self):
+    if not self._scope:
+      raise ValueError('No name available for layer scope because the layer "' +
+                       self.name + '" has not been used yet. The scope name ' +
+                       ' is determined the first time the layer instance is ' +
+                       'called. You must therefore call the layer before ' +
+                       'querying `scope_name`.')
+    return self._scope.name
+
+  @property
+  def trainable_weights(self):
+    return self._trainable_weights if self.trainable else []
 
   @property
-  def name(self):
-    if self._name is None:
-      raise ValueError(
-          'No name available for layer because it has not been used yet.')
-    return self._name
+  def non_trainable_weights(self):
+    if self.trainable:
+      return self._non_trainable_weights
+    else:
+      return self._trainable_weights + self._non_trainable_weights
 
   @property
   def trainable_variables(self):
-    return self._trainable_variables if self.trainable else []
+    return self.trainable_weights
 
   @property
   def non_trainable_variables(self):
-    return self._non_trainable_variables if self.trainable else self.variables
+    return self.non_trainable_weights
 
   @property
-  def trainable_weights(self):
-    return self.trainable_variables
+  def weights(self):
+    """Returns the list of all layer variables/weights.
 
-  @property
-  def non_trainable_weights(self):
-    return self.non_trainable_variables
+    Returns:
+      A list of variables.
+    """
+    return self.trainable_weights + self.non_trainable_weights
 
   @property
   def variables(self):
@@ -153,37 +155,141 @@ class _Layer(object):
     Returns:
       A list of variables.
     """
-    return self._trainable_variables + self._non_trainable_variables
+    return self.weights
 
   @property
   def updates(self):
     return self._updates
 
+  def add_update(self, updates, inputs=None):
+    """Add update op(s), potentially dependent on layer inputs.
+
+    Weight updates (for instance, the updates of the moving mean and variance
+    in a BatchNormalization layer) may be dependent on the inputs passed
+    when calling a layer. Hence, when reusing a same layer on
+    different inputs `a` and `b`, some entries in `layer.updates` may be
+    dependent on `a` and some on `b`. This method automatically keeps track
+    of dependencies.
+
+    The `get_updates_for` method allows to retrieve the updates relevant to a
+    specific set of inputs.
+
+    Arguments:
+      updates: Update op, or list/tuple of update ops.
+      inputs: Optional input tensor(s) that the update(s) depend on. Must
+        match the `inputs` argument passed to the `__call__` method at the time
+        the updates are created. If `None` is passed, the updates are assumed
+        to be unconditional, and will apply across all dataflows of the layer.
+    """
+    updates = _to_list(updates)
+    if not updates:
+      return
+    self._updates += updates
+    if inputs is not None:
+      inputs = _to_list(inputs)
+    if not inputs:
+      inputs = None
+    if inputs is not None:
+      # We compute an ID that uniquely identifies the list of tensors.
+      # This ID is order-sensitive.
+      inputs_hash = _object_list_uid(inputs)
+    else:
+      inputs_hash = None
+    if inputs_hash not in self._per_input_updates:
+      self._per_input_updates[inputs_hash] = []
+    self._per_input_updates[inputs_hash] += updates
+
+  def get_updates_for(self, inputs):
+    """Retrieves updates relevant to a specific set of inputs.
+
+    Arguments:
+      inputs: Input tensor or list/tuple of input tensors.
+        Must match the `inputs` argument passed to the `__call__` method
+        at the time the updates were created.
+        If you pass `inputs=None`, unconditional updates are returned.
+
+    Returns:
+      List of update ops of the layer that depend on `inputs`.
+    """
+    if inputs is not None:
+      inputs = _to_list(inputs)
+    if not inputs:
+      inputs = None
+    if inputs is not None:
+      inputs_hash = _object_list_uid(inputs)
+    else:
+      inputs_hash = None
+    return self._per_input_updates.get(inputs_hash, [])
+
   @property
   def losses(self):
     return self._losses
 
-  @property
-  def built(self):
-    return self._built
+  def add_loss(self, losses, inputs=None):
+    """Add loss tensor(s), potentially dependent on layer inputs.
 
-  @property
-  def trainable(self):
-    return self._trainable
+    Some losses (for instance, activity regularization losses) may be dependent
+    on the inputs passed when calling a layer. Hence, when reusing a same layer
+    on different inputs `a` and `b`, some entries in `layer.losses` may be
+    dependent on `a` and some on `b`. This method automatically keeps track
+    of dependencies.
 
-  @property
-  def weights(self):
-    """Returns the list of all layer variables/weights.
+    The `get_losses_for` method allows to retrieve the losses relevant to a
+    specific set of inputs.
+
+    Arguments:
+      losses: Loss tensor, or list/tuple of tensors.
+      inputs: Optional input tensor(s) that the loss(es) depend on. Must
+        match the `inputs` argument passed to the `__call__` method at the time
+        the losses are created. If `None` is passed, the losses are assumed
+        to be unconditional, and will apply across all dataflows of the layer
+        (e.g. weight regularization losses).
+    """
+    losses = _to_list(losses)
+    if not losses:
+      return
+    self._losses += losses
+    if inputs is not None:
+      inputs = _to_list(inputs)
+    if not inputs:
+      inputs = None
+    if inputs is not None:
+      # We compute an ID that uniquely identifies the list of tensors.
+      # This ID is order-sensitive.
+      inputs_hash = _object_list_uid(inputs)
+    else:
+      inputs_hash = None
+    if inputs_hash not in self._per_input_losses:
+      self._per_input_losses[inputs_hash] = []
+    self._per_input_losses[inputs_hash] += losses
+
+  def get_losses_for(self, inputs):
+    """Retrieves losses relevant to a specific set of inputs.
+
+    Arguments:
+      inputs: Input tensor or list/tuple of input tensors.
+        Must match the `inputs` argument passed to the `__call__`
+        method at the time the losses were created.
+        If you pass `inputs=None`, unconditional losses are returned,
+        such as weight regularization losses.
 
     Returns:
-      A list of variables.
+      List of loss tensors of the layer that depend on `inputs`.
     """
-    return self.variables
+    if inputs is not None:
+      inputs = _to_list(inputs)
+    if not inputs:
+      inputs = None
+    if inputs is not None:
+      inputs_hash = _object_list_uid(inputs)
+    else:
+      inputs_hash = None
+    return self._per_input_losses.get(inputs_hash, [])
 
   def build(self, _):
     """Creates the variables of the layer.
     """
-    self._built = True
+    self.built = True
 
   def call(self, inputs, **kwargs):
     """The logic of the layer lives here.
@@ -217,9 +323,18 @@ class _Layer(object):
     """
     raise NotImplementedError
 
-  def _add_variable(self, name, shape, dtype=None,
-                    initializer=None, regularizer=None, trainable=True,
-                    variable_getter=vs.get_variable):
+  def _set_scope(self, scope=None):
+    if self._scope is None:
+      # If constructed with _scope=None, lazy setting of scope.
+      if self._reuse:
+        self._scope = next(vs.variable_scope(
+            scope if scope is not None else self._base_name).gen)
+      else:
+        self._scope = next(vs.variable_scope(
+            scope, default_name=self._base_name).gen)
+
+  def add_variable(self, name, shape, dtype=None,
+                   initializer=None, regularizer=None, trainable=True):
     """Adds a new variable to the layer.
 
     Arguments:
@@ -231,7 +346,6 @@ class _Layer(object):
       trainable: whether the variable should be part of the layer's
         "trainable_variables" (e.g. variables, biases)
         or "non_trainable_variables" (e.g. BatchNorm mean, stddev).
-      variable_getter: The getter to use for TensorFlow variables.
 
     Returns:
       The created variable.
@@ -239,38 +353,43 @@ class _Layer(object):
     if dtype is None:
       dtype = self.dtype
     existing_variables = set(tf_variables.global_variables())
-    variable = variable_getter(name,
-                               shape=shape,
-                               initializer=initializer,
-                               dtype=dtype,
-                               trainable=trainable and self.trainable)
-    # TODO(sguada) fix name = variable.op.name
-    if variable in existing_variables:
-      return variable
-    if regularizer:
-      # To match the behavior of tf.get_variable(), we only
-      # apply regularization if the variable is newly created.
-      if isinstance(variable, tf_variables.PartitionedVariable):
-        for v in variable:
-          with ops.colocate_with(v.op):
-            with ops.name_scope(name + '/Regularizer'):
-              regularization = regularizer(v)
-          if regularization is not None:
-            self._losses.append(regularization)
-            _add_elements_to_collection(
-                regularization, ops.GraphKeys.REGULARIZATION_LOSSES)
-      else:
-        with ops.colocate_with(variable.op):
-          with ops.name_scope(name + '/Regularizer'):
-            regularization = regularizer(variable)
-        if regularization is not None:
-          self._losses.append(regularization)
-          _add_elements_to_collection(
-              regularization, ops.GraphKeys.REGULARIZATION_LOSSES)
+
+    self._set_scope(None)
+
+    with vs.variable_scope(self._scope,
+                           reuse=self.built or self._reuse) as scope:
+      with ops.name_scope(scope.original_name_scope):
+        variable = vs.get_variable(name,
+                                   shape=shape,
+                                   initializer=initializer,
+                                   dtype=dtypes.as_dtype(dtype),
+                                   trainable=trainable and self.trainable)
+        if variable in existing_variables:
+          return variable
+        if regularizer:
+          # To match the behavior of tf.get_variable(), we only
+          # apply regularization if the variable is newly created.
+          if isinstance(variable, tf_variables.PartitionedVariable):
+            for v in variable:
+              with ops.colocate_with(v.op):
+                with ops.name_scope(name + '/Regularizer'):
+                  regularization = regularizer(v)
+              if regularization is not None:
+                self.add_loss(regularization)
+                _add_elements_to_collection(
+                    regularization, ops.GraphKeys.REGULARIZATION_LOSSES)
+          else:
+            with ops.colocate_with(variable.op):
+              with ops.name_scope(name + '/Regularizer'):
+                regularization = regularizer(variable)
+            if regularization is not None:
+              self.add_loss(regularization)
+              _add_elements_to_collection(
+                  regularization, ops.GraphKeys.REGULARIZATION_LOSSES)
     if trainable:
-      self._trainable_variables.append(variable)
+      self._trainable_weights.append(variable)
     else:
-      self._non_trainable_variables.append(variable)
+      self._non_trainable_weights.append(variable)
     return variable
 
   def __call__(self, inputs, *args, **kwargs):
@@ -284,39 +403,17 @@ class _Layer(object):
     Returns:
       Output tensor(s).
     """
-    scope = kwargs.pop('scope', None)
-
-    # Define a custom getter to override tf.get_variable when creating layer
-    # variables. The current custom getter is nested by the variable scope.
-    def variable_getter(getter, name, shape, dtype=None, initializer=None,
-                        regularizer=None, trainable=True, **getter_kwargs):
-      return self._add_variable(
-          name, shape, initializer=initializer, regularizer=regularizer,
-          dtype=dtype, trainable=trainable,
-          variable_getter=functools.partial(getter, **getter_kwargs))
-
-    if not self._built and self._scope is None:
-      # If constructed with _scope=None, lazy setting of scope.
-      if self._reuse:
-        self._scope = next(vs.variable_scope(
-            scope if scope is not None else self._base_name).gen)
-      else:
-        self._scope = next(vs.variable_scope(
-            scope, default_name=self._base_name).gen)
-      self._name = self._scope.name
+    self._set_scope(kwargs.pop('scope', None))
 
-    # Build (if necessary) and call the layer, inside a variable
-    # scope.
-    with vs.variable_scope(self._scope,
-                           reuse=True if self._built else self._reuse,
-                           custom_getter=variable_getter) as scope:
-      # Ensure the Layer, if being reused, is working with inputs from
-      # the same graph as where it was created.
-      try:
-        ops._get_graph_from_inputs(nest.flatten(inputs), graph=self.graph)  # pylint: disable=protected-access
-      except ValueError as e:
-        raise ValueError("Inputs' and Layer's graphs are not the same: %s" % e)
+    # Ensure the Layer, if being reused, is working with inputs from
+    # the same graph as where it was created.
+    try:
+      ops._get_graph_from_inputs(nest.flatten(inputs), graph=self.graph)  # pylint: disable=protected-access
+    except ValueError as e:
+      raise ValueError('Input graph and Layer graph are not the same: %s' % e)
 
+    with vs.variable_scope(self._scope,
+                           reuse=self.built or self._reuse) as scope:
       with ops.name_scope(scope.original_name_scope):
         if not self.built:
           input_list = [
@@ -327,7 +424,7 @@ class _Layer(object):
             self.build(input_shapes[0])
           else:
             self.build(input_shapes)
-          self._built = True
+          self.built = True
         if 'scope' in tf_inspect.getargspec(self.call).args:
           kwargs['scope'] = scope
         outputs = self.call(inputs, *args, **kwargs)
@@ -340,7 +437,7 @@ class _Layer(object):
           for output in output_list:
             with ops.name_scope('ActivityRegularizer'):
               activity_regularization = self.activity_regularizer(output)
-            self._losses.append(activity_regularization)
+            self.add_loss(activity_regularization)
             _add_elements_to_collection(
                 activity_regularization, ops.GraphKeys.REGULARIZATION_LOSSES)
 
@@ -419,3 +516,39 @@ def _add_elements_to_collection(elements, collections):
     for element in elements:
       if element not in collection_set:
         collection.append(element)
+
+
+def _object_list_uid(object_list):
+  object_list = _to_list(object_list)
+  return ', '.join([str(abs(id(x))) for x in object_list])
+
+
+def _unique_layer_name(name):
+  """Makes a layer name (or arbitrary string) unique within a TensorFlow graph.
+
+  Arguments:
+    name: String name to make unique.
+
+  Returns:
+    Unique string name.
+
+  Example:
+
+  ```
+    >>> _unique_layer_name('dense')
+    dense_1
+    >>> _unique_layer_name('dense')
+    dense_2
+  ```
+  """
+  layer_name_uids_collection = ops.get_collection('LAYER_NAME_UIDS')
+  if not layer_name_uids_collection:
+    layer_name_uids = {}
+    ops.add_to_collection('LAYER_NAME_UIDS', layer_name_uids)
+  else:
+    layer_name_uids = layer_name_uids_collection[0]
+  if name not in layer_name_uids:
+    layer_name_uids[name] = 1
+  else:
+    layer_name_uids[name] += 1
+  return name + '_' + str(layer_name_uids[name])
diff --git a/tensorflow/python/layers/base_test.py b/tensorflow/python/layers/base_test.py
index 83ae1b6e83..9acf1c05e2 100644
--- a/tensorflow/python/layers/base_test.py
+++ b/tensorflow/python/layers/base_test.py
@@ -32,26 +32,24 @@ from tensorflow.python.platform import test
 class BaseLayerTest(test.TestCase):
 
   def testLayerProperties(self):
-    layer = base_layers._Layer(name='my_layer')
+    layer = base_layers.Layer(name='my_layer')
     self.assertListEqual(layer.variables, [])
     self.assertListEqual(layer.trainable_variables, [])
     self.assertListEqual(layer.non_trainable_variables, [])
     self.assertListEqual(layer.updates, [])
     self.assertListEqual(layer.losses, [])
     self.assertEqual(layer.built, False)
-    with self.assertRaisesRegexp(ValueError, 'not been used yet'):
-      _ = layer.name
-    layer = base_layers._Layer(name='my_layer', trainable=False)
+    layer = base_layers.Layer(name='my_layer', trainable=False)
     self.assertEqual(layer.trainable, False)
 
   def testAddWeight(self):
     with self.test_session():
-      layer = base_layers._Layer(name='my_layer')
+      layer = base_layers.Layer(name='my_layer')
 
       # Test basic variable creation.
-      variable = layer._add_variable(
+      variable = layer.add_variable(
           'my_var', [2, 2], initializer=init_ops.zeros_initializer())
-      self.assertEqual(variable.name, 'my_var:0')
+      self.assertEqual(variable.name, 'my_layer/my_var:0')
       self.assertListEqual(layer.variables, [variable])
       self.assertListEqual(layer.trainable_variables, [variable])
       self.assertListEqual(layer.non_trainable_variables, [])
@@ -60,8 +58,8 @@ class BaseLayerTest(test.TestCase):
           ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES))
 
       # Test non-trainable variable creation.
-      # layer._add_variable should work even outside `build` and `call`.
-      variable_2 = layer._add_variable(
+      # layer.add_variable should work even outside `build` and `call`.
+      variable_2 = layer.add_variable(
           'non_trainable_var', [2, 2],
           initializer=init_ops.zeros_initializer(),
           trainable=False)
@@ -73,7 +71,7 @@ class BaseLayerTest(test.TestCase):
 
       # Test with regularizer.
       regularizer = lambda x: math_ops.reduce_sum(x) * 1e-3
-      variable = layer._add_variable(
+      variable = layer.add_variable(
           'reg_var', [2, 2],
           initializer=init_ops.zeros_initializer(),
           regularizer=regularizer)
@@ -81,81 +79,70 @@ class BaseLayerTest(test.TestCase):
 
   def testGetVariable(self):
     with self.test_session():
-      # From inside `build` and `call` it should be possible to use
-      # either tf.get_variable
 
-      class MyLayer(base_layers._Layer):
+      class MyLayer(base_layers.Layer):
 
         def build(self, input_shape):
-          self.my_var = variable_scope.get_variable(
+          self.my_var = self.add_variable(
               'my_var', [2, 2], initializer=init_ops.zeros_initializer())
 
         def call(self, inputs):
-          variable_scope.get_variable(
-              'my_call_var', [2, 2], initializer=init_ops.zeros_initializer())
-          return inputs
+          return inputs * 2
 
       layer = MyLayer(name='my_layer')
       inputs = random_ops.random_uniform((5,), seed=1)
       layer.apply(inputs)
       layer.apply(inputs)
       self.assertListEqual([v.name for v in layer.variables],
-                           ['my_layer/my_var:0', 'my_layer/my_call_var:0'])
+                           ['my_layer/my_var:0'])
 
       # Creating a layer with no scope leads to lazy construction of
       # the scope at apply() time.  It uses scope "<current scope>/base_name"
       lazy_layer = MyLayer(_reuse=True)
       with variable_scope.variable_scope('new_scope'):
-        # This should attempt to reuse 'my_var' and 'my_call_var' in 'new_scope'
+        # This should attempt to reuse 'my_var' in 'new_scope'
         with self.assertRaisesRegexp(
             ValueError, r'new_scope/my_layer/my_var does not exist'):
           lazy_layer.apply(inputs)
         with variable_scope.variable_scope('my_layer'):
           variable_scope.get_variable('my_var', [2, 2])
-        with self.assertRaisesRegexp(
-            ValueError, r'new_scope/my_layer/my_call_var does not exist'):
-          lazy_layer.apply(inputs)
-        with variable_scope.variable_scope('my_layer'):
-          variable_scope.get_variable('my_call_var', [2, 2])
+
         # Smoke test: it runs.
         lazy_layer.apply(inputs)
         # The variables were created outside of the Layer, and
         # reuse=True, so the Layer does not own them and they are not
         # stored in its collection.
         self.assertListEqual(lazy_layer.variables, [])
-        self.assertEqual(lazy_layer.name, 'new_scope/my_layer')
+        self.assertEqual(lazy_layer._scope.name, 'new_scope/my_layer')
 
       # Creating a layer with no scope leads to lazy construction of
       # the scope at apply() time.  If 'scope' argument is passed to
       # apply(), it uses that scope when accessing variables.
       lazy_layer = MyLayer(_reuse=True)
       with variable_scope.variable_scope('new_scope') as new_scope:
-        # This should attempt to reuse 'my_var' and 'my_call_var' in 'new_scope'
+        # This should attempt to reuse 'my_var' in 'new_scope'
         with self.assertRaisesRegexp(
             ValueError, r'new_scope/my_var does not exist'):
           lazy_layer.apply(inputs, scope=new_scope)
         variable_scope.get_variable('my_var', [2, 2])
-        with self.assertRaisesRegexp(
-            ValueError, r'new_scope/my_call_var does not exist'):
-          lazy_layer.apply(inputs, scope=new_scope)
-        variable_scope.get_variable('my_call_var', [2, 2])
+
         # Smoke test: it runs.
         lazy_layer.apply(inputs, scope=new_scope)
         # The variables were created outside of the Layer, and
         # reuse=True, so the Layer does not own them and they are not
         # stored in its collection.
         self.assertListEqual(lazy_layer.variables, [])
-        self.assertEqual(lazy_layer.name, 'new_scope')
+        self.assertEqual(lazy_layer._scope.name, 'new_scope')
 
       with ops.Graph().as_default():
         inputs_ng = random_ops.random_uniform((5,), seed=1)
         with self.assertRaisesRegexp(ValueError,
-                                     r'graphs are not the same'):
+                                     r'graph are not the same'):
           layer.apply(inputs_ng)
 
   def testCall(self):
 
-    class MyLayer(base_layers._Layer):
+    class MyLayer(base_layers.Layer):
 
       def call(self, inputs):
         return math_ops.square(inputs)
@@ -168,7 +155,7 @@ class BaseLayerTest(test.TestCase):
 
   def testDeepCopy(self):
 
-    class MyLayer(base_layers._Layer):
+    class MyLayer(base_layers.Layer):
 
       def call(self, inputs):
         return math_ops.square(inputs)
@@ -184,9 +171,9 @@ class BaseLayerTest(test.TestCase):
     self.assertEqual(layer_copy._scope.name, layer._scope.name)
     self.assertEqual(layer_copy._graph, layer._graph)
 
-  def testNaming(self):
+  def testScopeNaming(self):
 
-    class PrivateLayer(base_layers._Layer):
+    class PrivateLayer(base_layers.Layer):
 
       def call(self, inputs):
         return None
@@ -194,41 +181,42 @@ class BaseLayerTest(test.TestCase):
     inputs = random_ops.random_uniform((5,))
     default_layer = PrivateLayer()
     _ = default_layer.apply(inputs)
-    self.assertEqual(default_layer.name, 'private_layer')
+    self.assertEqual(default_layer._scope.name, 'private_layer')
     default_layer1 = PrivateLayer()
     default_layer1.apply(inputs)
-    self.assertEqual(default_layer1.name, 'private_layer_1')
+    self.assertEqual(default_layer1._scope.name, 'private_layer_1')
     my_layer = PrivateLayer(name='my_layer')
     my_layer.apply(inputs)
-    self.assertEqual(my_layer.name, 'my_layer')
+    self.assertEqual(my_layer._scope.name, 'my_layer')
     my_layer1 = PrivateLayer(name='my_layer')
     my_layer1.apply(inputs)
-    self.assertEqual(my_layer1.name, 'my_layer_1')
+    self.assertEqual(my_layer1._scope.name, 'my_layer_1')
     my_layer2 = PrivateLayer(name='my_layer')
     my_layer2.apply(inputs)
-    self.assertEqual(my_layer2.name, 'my_layer_2')
+    self.assertEqual(my_layer2._scope.name, 'my_layer_2')
     # Name scope shouldn't affect names.
     with ops.name_scope('some_name_scope'):
       default_layer2 = PrivateLayer()
       default_layer2.apply(inputs)
-      self.assertEqual(default_layer2.name, 'private_layer_2')
+      self.assertEqual(default_layer2._scope.name, 'private_layer_2')
       my_layer3 = PrivateLayer(name='my_layer')
       my_layer3.apply(inputs)
-      self.assertEqual(my_layer3.name, 'my_layer_3')
+      self.assertEqual(my_layer3._scope.name, 'my_layer_3')
       other_layer = PrivateLayer(name='other_layer')
       other_layer.apply(inputs)
-      self.assertEqual(other_layer.name, 'other_layer')
-    # Variable scope gets added to names.
+      self.assertEqual(other_layer._scope.name, 'other_layer')
+    # Variable scope gets added to scope names.
     with variable_scope.variable_scope('var_scope'):
       default_layer_scoped = PrivateLayer()
       default_layer_scoped.apply(inputs)
-      self.assertEqual(default_layer_scoped.name, 'var_scope/private_layer')
+      self.assertEqual(default_layer_scoped._scope.name,
+                       'var_scope/private_layer')
       my_layer_scoped = PrivateLayer(name='my_layer')
       my_layer_scoped.apply(inputs)
-      self.assertEqual(my_layer_scoped.name, 'var_scope/my_layer')
+      self.assertEqual(my_layer_scoped._scope.name, 'var_scope/my_layer')
       my_layer_scoped1 = PrivateLayer(name='my_layer')
       my_layer_scoped1.apply(inputs)
-      self.assertEqual(my_layer_scoped1.name, 'var_scope/my_layer_1')
+      self.assertEqual(my_layer_scoped1._scope.name, 'var_scope/my_layer_1')
 
 
 if __name__ == '__main__':
diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py
index 3b8959e210..50709bb51d 100644
--- a/tensorflow/python/layers/convolutional.py
+++ b/tensorflow/python/layers/convolutional.py
@@ -37,7 +37,7 @@ from tensorflow.python.layers import base
 from tensorflow.python.layers import utils
 
 
-class _Conv(base._Layer):  # pylint: disable=protected-access
+class _Conv(base.Layer):
   """Abstract nD convolution layer (private, used as implementation base).
 
   This layer creates a convolution kernel that is convolved
@@ -130,19 +130,19 @@ class _Conv(base._Layer):  # pylint: disable=protected-access
     input_dim = input_shape[channel_axis].value
     kernel_shape = self.kernel_size + (input_dim, self.filters)
 
-    self.kernel = vs.get_variable('kernel',
-                                  shape=kernel_shape,
-                                  initializer=self.kernel_initializer,
-                                  regularizer=self.kernel_regularizer,
-                                  trainable=True,
-                                  dtype=self.dtype)
+    self.kernel = self.add_variable(name='kernel',
+                                    shape=kernel_shape,
+                                    initializer=self.kernel_initializer,
+                                    regularizer=self.kernel_regularizer,
+                                    trainable=True,
+                                    dtype=self.dtype)
     if self.use_bias:
-      self.bias = vs.get_variable('bias',
-                                  shape=(self.filters,),
-                                  initializer=self.bias_initializer,
-                                  regularizer=self.bias_regularizer,
-                                  trainable=True,
-                                  dtype=self.dtype)
+      self.bias = self.add_variable(name='bias',
+                                    shape=(self.filters,),
+                                    initializer=self.bias_initializer,
+                                    regularizer=self.bias_regularizer,
+                                    trainable=True,
+                                    dtype=self.dtype)
     else:
       self.bias = None
 
@@ -814,27 +814,27 @@ class SeparableConv2D(Conv2D):
                               self.depth_multiplier * input_dim,
                               self.filters)
 
-    self.depthwise_kernel = vs.get_variable(
-        'depthwise_kernel',
+    self.depthwise_kernel = self.add_variable(
+        name='depthwise_kernel',
         shape=depthwise_kernel_shape,
         initializer=self.depthwise_initializer,
         regularizer=self.depthwise_regularizer,
         trainable=True,
         dtype=self.dtype)
-    self.pointwise_kernel = vs.get_variable(
-        'pointwise_kernel',
+    self.pointwise_kernel = self.add_variable(
+        name='pointwise_kernel',
         shape=pointwise_kernel_shape,
         initializer=self.pointwise_initializer,
         regularizer=self.pointwise_regularizer,
         trainable=True,
         dtype=self.dtype)
     if self.use_bias:
-      self.bias = vs.get_variable('bias',
-                                  shape=(self.filters,),
-                                  initializer=self.bias_initializer,
-                                  regularizer=self.bias_regularizer,
-                                  trainable=True,
-                                  dtype=self.dtype)
+      self.bias = self.add_variable(name='bias',
+                                    shape=(self.filters,),
+                                    initializer=self.bias_initializer,
+                                    regularizer=self.bias_regularizer,
+                                    trainable=True,
+                                    dtype=self.dtype)
     else:
       self.bias = None
 
@@ -1055,19 +1055,19 @@ class Conv2DTranspose(Conv2D):
     input_dim = input_shape[channel_axis]
     kernel_shape = self.kernel_size + (self.filters, input_dim)
 
-    self.kernel = vs.get_variable('kernel',
-                                  shape=kernel_shape,
-                                  initializer=self.kernel_initializer,
-                                  regularizer=self.kernel_regularizer,
-                                  trainable=True,
-                                  dtype=self.dtype)
+    self.kernel = self.add_variable(name='kernel',
+                                    shape=kernel_shape,
+                                    initializer=self.kernel_initializer,
+                                    regularizer=self.kernel_regularizer,
+                                    trainable=True,
+                                    dtype=self.dtype)
     if self.use_bias:
-      self.bias = vs.get_variable('bias',
-                                  shape=(self.filters,),
-                                  initializer=self.bias_initializer,
-                                  regularizer=self.bias_regularizer,
-                                  trainable=True,
-                                  dtype=self.dtype)
+      self.bias = self.add_variable(name='bias',
+                                    shape=(self.filters,),
+                                    initializer=self.bias_initializer,
+                                    regularizer=self.bias_regularizer,
+                                    trainable=True,
+                                    dtype=self.dtype)
     else:
       self.bias = None
 
diff --git a/tensorflow/python/layers/core.py b/tensorflow/python/layers/core.py
index b5846ae3d2..49f6499ca4 100644
--- a/tensorflow/python/layers/core.py
+++ b/tensorflow/python/layers/core.py
@@ -38,7 +38,7 @@ from tensorflow.python.layers import base
 from tensorflow.python.layers import utils
 
 
-class Dense(base._Layer):  # pylint: disable=protected-access
+class Dense(base.Layer):
   """Densely-connected layer class.
 
   This layer implements the operation:
@@ -115,19 +115,19 @@ class Dense(base._Layer):  # pylint: disable=protected-access
     # weight of the layer. If the layer is not trainable
     # (self.trainable = False), the variable will not be added to
     # tf.trainable_variables(), and self.trainable_weights will be empty.
-    self.kernel = vs.get_variable('kernel',
-                                  shape=[input_shape[-1].value, self.units],
-                                  initializer=self.kernel_initializer,
-                                  regularizer=self.kernel_regularizer,
-                                  dtype=self.dtype,
-                                  trainable=True)
+    self.kernel = self.add_variable('kernel',
+                                    shape=[input_shape[-1].value, self.units],
+                                    initializer=self.kernel_initializer,
+                                    regularizer=self.kernel_regularizer,
+                                    dtype=self.dtype,
+                                    trainable=True)
     if self.use_bias:
-      self.bias = vs.get_variable('bias',
-                                  shape=[self.units,],
-                                  initializer=self.bias_initializer,
-                                  regularizer=self.bias_regularizer,
-                                  dtype=self.dtype,
-                                  trainable=True)
+      self.bias = self.add_variable('bias',
+                                    shape=[self.units,],
+                                    initializer=self.bias_initializer,
+                                    regularizer=self.bias_regularizer,
+                                    dtype=self.dtype,
+                                    trainable=True)
     else:
       self.bias = None
 
@@ -219,7 +219,7 @@ def dense(
   return layer.apply(inputs)
 
 
-class Dropout(base._Layer):  # pylint: disable=protected-access
+class Dropout(base.Layer):
   """Applies Dropout to the input.
 
   Dropout consists in randomly setting a fraction `rate` of input units to 0
diff --git a/tensorflow/python/layers/core_test.py b/tensorflow/python/layers/core_test.py
index df650535d4..3939969159 100644
--- a/tensorflow/python/layers/core_test.py
+++ b/tensorflow/python/layers/core_test.py
@@ -44,16 +44,14 @@ class DenseTest(test.TestCase):
     self.assertEqual(dense.bias_regularizer, None)
     self.assertEqual(dense.activity_regularizer, None)
     self.assertEqual(dense.use_bias, True)
-    with self.assertRaisesRegexp(ValueError, 'not been used yet'):
-      _ = dense.name
 
     # Test auto-naming
     dense = core_layers.Dense(2, activation=nn_ops.relu)
     dense.apply(np.random.randn(0, 2))
-    self.assertEqual(dense.name, 'dense')
+    self.assertEqual(dense.name, 'dense_1')
     dense = core_layers.Dense(2, activation=nn_ops.relu)
     dense.apply(np.random.randn(0, 2))
-    self.assertEqual(dense.name, 'dense_1')
+    self.assertEqual(dense.name, 'dense_2')
 
   def testCall(self):
     dense = core_layers.Dense(2, activation=nn_ops.relu, name='my_dense')
@@ -62,8 +60,6 @@ class DenseTest(test.TestCase):
     self.assertListEqual(dense.variables, [dense.kernel, dense.bias])
     self.assertListEqual(dense.trainable_variables, [dense.kernel, dense.bias])
     self.assertListEqual(dense.non_trainable_variables, [])
-    self.assertListEqual(dense._trainable_variables, [dense.kernel, dense.bias])
-    self.assertListEqual(dense._non_trainable_variables, [])
     self.assertEqual(
         len(ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)), 2)
     self.assertEqual(dense.kernel.name, 'my_dense/kernel:0')
@@ -89,8 +85,6 @@ class DenseTest(test.TestCase):
     self.assertListEqual(dense.non_trainable_variables,
                          [dense.kernel, dense.bias])
     self.assertListEqual(dense.trainable_variables, [])
-    self.assertListEqual(dense._trainable_variables, [dense.kernel, dense.bias])
-    self.assertListEqual(dense._non_trainable_variables, [])
     self.assertEqual(
         len(ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)), 0)
 
@@ -289,7 +283,7 @@ class DenseTest(test.TestCase):
 class DropoutTest(test.TestCase):
 
   def testDropoutProperties(self):
-    dp = core_layers.Dropout(0.5)
+    dp = core_layers.Dropout(0.5, name='dropout')
     self.assertEqual(dp.rate, 0.5)
     self.assertEqual(dp.noise_shape, None)
     dp.apply(np.ones(()))
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 41846ae0cd..2970ddb8ce 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -41,7 +41,7 @@ from tensorflow.python.layers import base
 from tensorflow.python.layers import utils
 
 
-class BatchNormalization(base._Layer):  # pylint: disable=protected-access
+class BatchNormalization(base.Layer):
   """Batch Normalization layer from http://arxiv.org/abs/1502.03167.
 
   "Batch Normalization: Accelerating Deep Network Training by Reducing
@@ -143,33 +143,33 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
                        input_shape)
 
     if self.center:
-      self.beta = vs.get_variable('beta',
-                                  shape=(param_dim,),
-                                  initializer=self.beta_initializer,
-                                  regularizer=self.beta_regularizer,
-                                  trainable=True)
+      self.beta = self.add_variable(name='beta',
+                                    shape=(param_dim,),
+                                    initializer=self.beta_initializer,
+                                    regularizer=self.beta_regularizer,
+                                    trainable=True)
     else:
       self.beta = None
     if self.scale:
-      self.gamma = vs.get_variable('gamma',
-                                   shape=(param_dim,),
-                                   initializer=self.gamma_initializer,
-                                   regularizer=self.gamma_regularizer,
-                                   trainable=True)
+      self.gamma = self.add_variable(name='gamma',
+                                     shape=(param_dim,),
+                                     initializer=self.gamma_initializer,
+                                     regularizer=self.gamma_regularizer,
+                                     trainable=True)
     else:
       self.gamma = None
 
     # Disable variable partitioning when creating the moving mean and variance
-    partitioner = vs.get_variable_scope().partitioner
+    partitioner = self._scope.partitioner
     try:
-      vs.get_variable_scope().set_partitioner(None)
-      self.moving_mean = vs.get_variable(
-          'moving_mean',
+      self._scope.set_partitioner(None)
+      self.moving_mean = self.add_variable(
+          name='moving_mean',
           shape=(param_dim,),
           initializer=self.moving_mean_initializer,
           trainable=False)
-      self.moving_variance = vs.get_variable(
-          'moving_variance',
+      self.moving_variance = self.add_variable(
+          name='moving_variance',
           shape=(param_dim,),
           initializer=self.moving_variance_initializer,
           trainable=False)
@@ -182,10 +182,10 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
         # stack to be cleared. The nested ones use a `lambda` to set the desired
         # device and ignore any devices that may be set by the custom getter.
         def _renorm_variable(name, shape):
-          var = vs.get_variable(name,
-                                shape=shape,
-                                initializer=init_ops.zeros_initializer(),
-                                trainable=False)
+          var = self.add_variable(name=name,
+                                  shape=shape,
+                                  initializer=init_ops.zeros_initializer(),
+                                  trainable=False)
           return var
         with ops.device(None):
           with ops.device(lambda _: self.moving_mean.device):
@@ -200,7 +200,7 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
             self.renorm_stddev_weight = _renorm_variable(
                 'renorm_stddev_weight', ())
     finally:
-      vs.get_variable_scope().set_partitioner(partitioner)
+      self._scope.set_partitioner(partitioner)
 
   def _renorm_correction_and_moments(self, mean, variance, training):
     """Returns the correction and update values for renorm."""
@@ -313,11 +313,8 @@ class BatchNormalization(base._Layer):  # pylint: disable=protected-access
           self.moving_variance, new_variance, decay, zero_debias=False)
 
       if not self.updates:
-        # In the future this should be refactored into a self.add_update
-        # methods in order to allow for instance-based BN layer sharing
-        # across unrelated input streams (e.g. like in Keras).
-        self.updates.append(mean_update)
-        self.updates.append(variance_update)
+        self.add_update(mean_update)
+        self.add_update(variance_update)
 
     else:
       mean, variance = self.moving_mean, self.moving_variance
diff --git a/tensorflow/python/layers/pooling.py b/tensorflow/python/layers/pooling.py
index 3e40423ad6..b819372923 100644
--- a/tensorflow/python/layers/pooling.py
+++ b/tensorflow/python/layers/pooling.py
@@ -36,7 +36,7 @@ from tensorflow.python.layers import base
 from tensorflow.python.layers import utils
 
 
-class _Pooling1D(base._Layer):  # pylint: disable=protected-access
+class _Pooling1D(base.Layer):
   """Pooling layer for arbitrary pooling functions, for 1D inputs.
 
   This class only exists for code reuse. It will never be an exposed API.
@@ -222,7 +222,7 @@ def max_pooling1d(inputs, pool_size, strides,
   return layer.apply(inputs)
 
 
-class _Pooling2D(base._Layer):  # pylint: disable=protected-access
+class _Pooling2D(base.Layer):
   """Pooling layer for arbitrary pooling functions, for 2D inputs (e.g. images).
 
   This class only exists for code reuse. It will never be an exposed API.
@@ -407,7 +407,7 @@ def max_pooling2d(inputs,
   return layer.apply(inputs)
 
 
-class _Pooling3D(base._Layer):  # pylint: disable=protected-access
+class _Pooling3D(base.Layer):
   """Pooling layer for arbitrary pooling functions, for 3D inputs.
 
   This class only exists for code reuse. It will never be an exposed API.
diff --git a/tensorflow/python/ops/rnn_cell_impl.py b/tensorflow/python/ops/rnn_cell_impl.py
index 32ebe0c2e8..4810e97b36 100644
--- a/tensorflow/python/ops/rnn_cell_impl.py
+++ b/tensorflow/python/ops/rnn_cell_impl.py
@@ -75,7 +75,7 @@ def _zero_state_tensors(state_size, batch_size, dtype):
   return zeros
 
 
-class _RNNCell(base_layer._Layer):  # pylint: disable=protected-access
+class _RNNCell(base_layer.Layer):  # pylint: disable=protected-access
   """Abstract object representing an RNN cell.
 
   Every `RNNCell` must have the properties below and implement `__call__` with
-- 
GitLab


From 5d3fd1fbe907a165b24051480bc72457355c9df9 Mon Sep 17 00:00:00 2001
From: Daniel Trebbien <dtrebbien@gmail.com>
Date: Wed, 26 Apr 2017 20:36:48 -0400
Subject: [PATCH 0722/1563] Delete an unnecessary include and define (#9438)

---
 tensorflow/core/kernels/linalg_ops_common.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tensorflow/core/kernels/linalg_ops_common.h b/tensorflow/core/kernels/linalg_ops_common.h
index fcb735bfdb..75d1d29793 100644
--- a/tensorflow/core/kernels/linalg_ops_common.h
+++ b/tensorflow/core/kernels/linalg_ops_common.h
@@ -21,10 +21,7 @@ limitations under the License.
 // computations across different threads if necessary.
 #include <algorithm>
 
-#define EIGEN_USE_THREADS
-
 #include "third_party/eigen3/Eigen/Core"
-#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/kernel_def_builder.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/tensor.h"
-- 
GitLab


From c4ce79d371364a6f10a55e952db1cc718f60f2e5 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Wed, 26 Apr 2017 16:23:55 -0800
Subject: [PATCH 0723/1563] Automated rollback of change 154338968 Change:
 154367968

---
 tensorflow/python/lib/io/file_io.i | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tensorflow/python/lib/io/file_io.i b/tensorflow/python/lib/io/file_io.i
index a6fe802597..c0c4e035fc 100644
--- a/tensorflow/python/lib/io/file_io.i
+++ b/tensorflow/python/lib/io/file_io.i
@@ -31,13 +31,6 @@ limitations under the License.
 #include "tensorflow/core/protobuf/meta_graph.pb.h"
 %}
 
-// Release the Python GIL for the duration of all methods.
-%exception {
-  Py_BEGIN_ALLOW_THREADS;
-  $action
-  Py_END_ALLOW_THREADS;
-}
-
 %{
 inline void FileExists(const string& filename, TF_Status* out_status) {
   tensorflow::Status status = tensorflow::Env::Default()->FileExists(filename);
@@ -306,6 +299,3 @@ string ReadFromStream(tensorflow::io::BufferedInputStream* stream,
 %include "tensorflow/core/lib/io/path.h"
 
 %include "tensorflow/core/platform/file_statistics.h"
-
-// Delete the previously defined default handler that releases the Python GIL.
-%noexception;
-- 
GitLab


From 54b5650eb4445548eb1d0e98346e4563b3db0f10 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Wed, 26 Apr 2017 16:37:52 -0800
Subject: [PATCH 0724/1563] Name enums in C API (in addition to typedefs).

SWIG will sometimes generate type references like "enum TF_DataType", which
doesn't compile if only the typedef is named.
Change: 154369467
---
 tensorflow/c/c_api.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/c/c_api.h b/tensorflow/c/c_api.h
index e2aeef0d88..ec9b01b388 100644
--- a/tensorflow/c/c_api.h
+++ b/tensorflow/c/c_api.h
@@ -95,7 +95,7 @@ TF_CAPI_EXPORT extern const char* TF_Version();
 // --------------------------------------------------------------------------
 // TF_DataType holds the type for a scalar value.  E.g., one slot in a tensor.
 // The enum values here are identical to corresponding values in types.proto.
-typedef enum {
+typedef enum TF_DataType {
   TF_FLOAT = 1,
   TF_DOUBLE = 2,
   TF_INT32 = 3,  // Int32 tensors are always in 'host' memory.
@@ -127,7 +127,7 @@ TF_CAPI_EXPORT extern size_t TF_DataTypeSize(TF_DataType dt);
 // --------------------------------------------------------------------------
 // TF_Code holds an error code.  The enum values here are identical to
 // corresponding values in error_codes.proto.
-typedef enum {
+typedef enum TF_Code {
   TF_OK = 0,
   TF_CANCELLED = 1,
   TF_UNKNOWN = 2,
@@ -629,7 +629,7 @@ TF_CAPI_EXPORT extern int TF_OperationGetControlOutputs(
     int max_control_outputs);
 
 // TF_AttrType describes the type of the value of an attribute on an operation.
-typedef enum {
+typedef enum TF_AttrType {
   TF_ATTR_STRING = 0,
   TF_ATTR_INT = 1,
   TF_ATTR_FLOAT = 2,
-- 
GitLab


From ed37842fe4b1a83922c0042f59775968f350dc8a Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 26 Apr 2017 17:00:54 -0800
Subject: [PATCH 0725/1563] Lower number of parallel jobs to prevent OOM.
 Change: 154371550

---
 tensorflow/contrib/makefile/build_helper.subr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/makefile/build_helper.subr b/tensorflow/contrib/makefile/build_helper.subr
index f0452944e2..d58b2c0a9b 100644
--- a/tensorflow/contrib/makefile/build_helper.subr
+++ b/tensorflow/contrib/makefile/build_helper.subr
@@ -31,7 +31,7 @@ get_cpu_count() {
 }
 
 get_job_count() {
-  echo $(($(get_cpu_count) * 2))
+  echo $(($(get_cpu_count)))
 }
 
 make_host_protoc() {
-- 
GitLab


From f37eb35d82d734504da273fed7a5a0fae358c9bd Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 17:11:54 -0800
Subject: [PATCH 0726/1563] Go back to constructing dashboards via the DOM.
 Change: 154372639

---
 .../tf_tensorboard/tf-tensorboard.html        | 170 +++++++++++-------
 1 file changed, 103 insertions(+), 67 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
index a1925c1f6b..b5b2e2d5a8 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
@@ -57,9 +57,9 @@ allows the user to toggle between various dashboards.
         <div id="toolbar-content">
           <div class="toolbar-title">TensorBoard</div>
           <paper-tabs selected="{{modeIndex}}" noink class="tabs" id="tabs">
-            <template is="dom-repeat" items="[[_dashboards]]">
-              <template is="dom-if" if="[[_isTabEnabled(item.name)]]">
-                <paper-tab data-mode="[[item.name]]">[[item.name]]</paper-tab>
+            <template is="dom-repeat" items="[[tabs]]">
+              <template is="dom-if" if="[[_isTabEnabled(item)]]">
+                <paper-tab data-mode="[[item]]">[[item]]</paper-tab>
               </template>
             </template>
           </paper-tabs>
@@ -82,7 +82,67 @@ allows the user to toggle between various dashboards.
         </div>
       </paper-toolbar>
 
-      <div id="content" class="fit"></div>
+      <div id="content" class="fit">
+        <content id="injected-overview"></content>
+
+        <template is="dom-if" if="[[_modeIsScalars(mode)]]">
+          <tf-scalar-dashboard
+            id="scalars"
+            backend="[[_backend]]"
+            router="[[router]]"
+          ></tf-scalar-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsImages(mode)]]">
+          <tf-image-dashboard
+            id="images"
+            backend="[[_backend]]"
+          ></tf-image-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsAudio(mode)]]">
+          <tf-audio-dashboard
+            id="audio"
+            backend="[[_backend]]"
+          ></tf-audio-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsGraphs(mode)]]">
+          <tf-graph-dashboard
+            id="graphs"
+            backend="[[_backend]]"
+            debugger-data-enabled="[[_debuggerDataEnabled]]"
+          ></tf-graph-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsDistributions(mode)]]">
+          <tf-distribution-dashboard
+            id="distributions"
+            backend="[[_backend]]"
+          ></tf-distribution-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsHistograms(mode)]]">
+          <tf-histogram-dashboard
+            id="histograms"
+            backend="[[_backend]]"
+          ></tf-histogram-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsEmbeddings(mode)]]">
+          <vz-projector-dashboard
+            id="projector"
+            route-prefix="/data/plugin/projector">
+          </vz-projector-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsText(mode)]]">
+          <tf-text-dashboard
+            id="text"
+            backend="[[_backend]]">
+          </tf-text-dashboard>
+        </template>
+      </div>
     </paper-header-panel>
 
     <style>
@@ -173,21 +233,16 @@ allows the user to toggle between various dashboards.
             return match && match.length == 1;
           },
         },
-        _dashboards: {
-          type: Array,
-          computed: "_makeDashboardList(_backend, router, _debuggerDataEnabled)",
-        },
-        // Maps dashboard name to dashboard object.
-        _dashboardMapping: {
-          type: Object,
-          computed: "_makeDashboardMapping(_dashboards)",
-        },
         // Which tab is selected (scalars, graph, images etc).
         mode: {
           type: String,
           computed: '_getModeFromIndex(modeIndex)',
           notify: true,
-          observer: '_modeChanged',
+        },
+        tabs: {
+          type: Array,
+          readOnly: true,
+          value: TF.Globals.TABS,
         },
         // If this is set to a string, TensorBoard will switch to "demo mode"
         // and attempt to load serialized json data from that directory. You can
@@ -212,7 +267,7 @@ allows the user to toggle between various dashboards.
         return true;
       },
       _getModeFromIndex: function(modeIndex) {
-        var mode = this._dashboards[modeIndex].name;
+        var mode = this.tabs[modeIndex];
         TF.URIStorage.setString(TF.URIStorage.TAB, mode);
         return mode;
       },
@@ -224,10 +279,34 @@ allows the user to toggle between various dashboards.
         return new TF.Backend.Backend(router);
       },
       _isReloadDisabled: function(mode) {
-        return !this._debuggerDataEnabled && mode == 'graphs';
+        return !this._debuggerDataEnabled && this._modeIsGraphs(mode);
+      },
+      _modeIsScalars: function(mode) {
+        return mode === "scalars";
+      },
+      _modeIsImages: function(mode) {
+        return mode === "images";
+      },
+      _modeIsAudio: function(mode) {
+        return mode === "audio";
+      },
+      _modeIsGraphs: function(mode) {
+        return mode === "graphs";
+      },
+      _modeIsEmbeddings: function(mode) {
+        return mode === "embeddings";
+      },
+      _modeIsDistributions: function(mode) {
+        return mode === "distributions";
+      },
+      _modeIsHistograms: function(mode) {
+        return mode === "histograms";
+      },
+      _modeIsText: function(mode) {
+        return mode === "text";
       },
       selectedDashboard: function() {
-        var dashboard = this._dashboardMapping[this.mode];
+        var dashboard = this.$$("#" + this.mode);
         if (dashboard == null) {
           throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
         }
@@ -241,67 +320,24 @@ allows the user to toggle between various dashboards.
           this._getModeFromHash();
         }.bind(this));
       },
-      _makeDashboardList: function(backend, router, debuggerDataEnabled) {
-        if (!backend || !router) {
-          // The dashboards require these entities. We are not ready to construct dashboards.
-          return null;
-        }
-
-        return [
-          new TF.Dashboard.TfScalarDashboard(backend, router),
-          new TF.Dashboard.TfImageDashboard(backend),
-          new TF.Dashboard.TfAudioDashboard(backend),
-          new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
-          new TF.Dashboard.TfDistributionDashboard(backend),
-          new TF.Dashboard.TfHistogramDashboard(backend),
-          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
-          new TF.Dashboard.TfTextDashboard(backend),
-        ];
-      },
-      _makeDashboardMapping: function(dashboards) {
-        if (!dashboards) {
-          return null;
-        }
-
-        let mapping = {};
-        dashboards.forEach(function(dashboard) {
-          mapping[dashboard.name] = dashboard;
-        });
-        return mapping;
-      },
       _getModeFromHash: function() {
         var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
-        var modeIndex;
-        for (var i = 0; i < this._dashboards.length; i++) {
-          if (this._dashboards[i].name == tabName) {
-            modeIndex = i;
-            break;
-          }
-        }
-
-        if (modeIndex === undefined && this.modeIndex == null) {
+        var modeIndex = this.tabs.indexOf(tabName);
+        if (modeIndex == -1 && this.modeIndex == null) {
           // Select the first tab as default.
           this.set('modeIndex', 0);
         }
-        if (modeIndex !== undefined && modeIndex != this.modeIndex) {
+        if (modeIndex != -1 && modeIndex != this.modeIndex) {
           this.set('modeIndex', modeIndex);
         }
       },
-      _modeChanged: function(mode) {
-        let currentDashboard = this.$.content.firstChild;
-        if (currentDashboard) {
-          this.$.content.removeChild(currentDashboard);
+      reload: function() {
+        if (this._modeIsEmbeddings(this.mode)) {
+          return;
         }
-
-        if (!mode || !this._dashboardMapping) {
+        if (!this._debuggerDataEnabled && this._modeIsGraphs(this.mode)) {
           return;
         }
-
-        // Append the new dashboard.
-        const newDashboard = this.selectedDashboard();
-        this.$.content.appendChild(newDashboard);
-      },
-      reload: function() {
         this.selectedDashboard().reload();
       },
       openSettings: function() {
-- 
GitLab


From 49132675ca56e9ce9fcaace144570af03005a390 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 17:31:03 -0800
Subject: [PATCH 0727/1563] Internal change. Change: 154373982

---
 tensorflow/core/kernels/BUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index de947e5877..b172dcf2cf 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -17,7 +17,10 @@ licenses(["notice"])  # Apache 2.0
 
 package_group(
     name = "friends",
-    packages = ["//tensorflow/..."],
+    packages = [
+        "//learning/brain/contrib/...",
+        "//tensorflow/...",
+    ],
 )
 
 load(
-- 
GitLab


From 2f3ace946460ec99743668de808d0945dda849a1 Mon Sep 17 00:00:00 2001
From: Mathew Wicks <thesuperzapper@users.noreply.github.com>
Date: Thu, 27 Apr 2017 13:53:58 +1200
Subject: [PATCH 0728/1563] Replace Deprecated logging_ops (#7563)

* Replace Deprecated logging_ops

Replace:
- logging_ops.scalar_summary() with summary.scalar()
- logging_ops.histogram_summary() with summary.histogram()

* Change remaining call to logging_ops into summary
---
 .../learn/python/learn/estimators/dnn_linear_combined.py | 9 ++++++---
 .../contrib/learn/python/learn/estimators/kmeans.py      | 5 ++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
index b525213eb7..789b3b39f3 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
@@ -35,11 +35,11 @@ from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.contrib.learn.python.learn.utils import export
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variable_scope
+from tensorflow.python.summary import summary
 from tensorflow.python.training import sync_replicas_optimizer
 from tensorflow.python.training import training_util
 
@@ -99,10 +99,13 @@ def _linear_learning_rate(num_linear_feature_columns):
   return min(_LINEAR_LEARNING_RATE, default_learning_rate)
 
 
+def _add_hidden_layer_summary(value, tag):
+  summary.scalar("%s/fraction_of_zero_values" % tag, nn.zero_fraction(value))
+  summary.histogram("%s/activation" % tag, value)
 def _add_layer_summary(value, tag):
-  logging_ops.scalar_summary("%s/fraction_of_zero_values" % tag,
+  summary.scalar("%s/fraction_of_zero_values" % tag,
                              nn.zero_fraction(value))
-  logging_ops.histogram_summary("%s/activation" % tag, value)
+  summary.histogram("%s/activation" % tag, value)
 
 
 def _get_embedding_variable(column, collection_key, input_layer_scope):
diff --git a/tensorflow/contrib/learn/python/learn/estimators/kmeans.py b/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
index a0f501dfba..cbbd9671b7 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
@@ -27,9 +27,9 @@ from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators.model_fn import ModelFnOps
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import state_ops
+from tensorflow.python.summary import summary
 from tensorflow.python.ops.control_flow_ops import with_dependencies
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import session_run_hook
@@ -118,7 +118,7 @@ def _kmeans_clustering_model_fn(features, labels, mode, params, config):
            'kmeans_plus_plus_num_retries')).training_graph()
   incr_step = state_ops.assign_add(variables.get_global_step(), 1)
   loss = math_ops.reduce_sum(losses, name=KMeansClustering.LOSS_OP_NAME)
-  logging_ops.scalar_summary('loss/raw', loss)
+  summary.scalar('loss/raw', loss)
   training_op = with_dependencies([training_op, incr_step], loss)
   predictions = {
       KMeansClustering.ALL_SCORES: all_scores[0],
@@ -257,4 +257,3 @@ class KMeansClustering(estimator.Estimator):
   def clusters(self):
     """Returns cluster centers."""
     return super(KMeansClustering, self).get_variable_value(self.CLUSTERS)
-
-- 
GitLab


From fd95f9ce765757ffbf4e362a6638b6308bded45c Mon Sep 17 00:00:00 2001
From: lspvic <lspvic@qq.com>
Date: Wed, 26 Apr 2017 20:54:15 -0500
Subject: [PATCH 0729/1563] rebase and apply change to new master (#8791)

---
 .../tensorboard/components/tf_tensorboard/tf-tensorboard.html   | 2 +-
 tensorflow/tensorboard/dist/tf-tensorboard.html                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
index a1925c1f6b..371dbad1c7 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
@@ -254,7 +254,7 @@ allows the user to toggle between various dashboards.
           new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
           new TF.Dashboard.TfDistributionDashboard(backend),
           new TF.Dashboard.TfHistogramDashboard(backend),
-          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
+          new TF.Dashboard.VzProjectorDashboard('data/plugin/projector'),
           new TF.Dashboard.TfTextDashboard(backend),
         ];
       },
diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 8610940ac3..9f13cdfb47 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -20112,7 +20112,7 @@ var TF;
           new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
           new TF.Dashboard.TfDistributionDashboard(backend),
           new TF.Dashboard.TfHistogramDashboard(backend),
-          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
+          new TF.Dashboard.VzProjectorDashboard('data/plugin/projector'),
           new TF.Dashboard.TfTextDashboard(backend),
         ];
       },
-- 
GitLab


From 4f525819b6fc763d32a5e37d580c8987bbf982b7 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 26 Apr 2017 18:16:50 -0800
Subject: [PATCH 0730/1563] Add support for variable number of bits to
 FakeQuant* ops. Change: 154377062

---
 tensorflow/core/kernels/fake_quant_ops.cc     | 135 ++-
 .../core/kernels/fake_quant_ops_functor.h     |  65 +-
 .../core/kernels/fake_quant_ops_test.cc       | 912 +++++++++++++-----
 tensorflow/core/ops/array_ops.cc              |  11 +
 tensorflow/tools/api/golden/tensorflow.pbtxt  |  12 +-
 5 files changed, 795 insertions(+), 340 deletions(-)

diff --git a/tensorflow/core/kernels/fake_quant_ops.cc b/tensorflow/core/kernels/fake_quant_ops.cc
index 41f9c21843..c198f67bbb 100644
--- a/tensorflow/core/kernels/fake_quant_ops.cc
+++ b/tensorflow/core/kernels/fake_quant_ops.cc
@@ -48,6 +48,10 @@ namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
+namespace {
+bool IsNumBitsValid(int num_bits) { return num_bits >= 2 && num_bits <= 8; }
+}  // namespace
+
 // -----------------------------------------------------------------------------
 // Implementation of FakeQuantWithMinMaxArgsOp, see its documentation in
 // core/ops/array_ops.cc.
@@ -60,19 +64,25 @@ class FakeQuantWithMinMaxArgsOp
       : Base::UnaryElementWiseOp(context) {
     OP_REQUIRES_OK(context, context->GetAttr("min", &min_));
     OP_REQUIRES_OK(context, context->GetAttr("max", &max_));
+    int num_bits;
+    OP_REQUIRES_OK(context, context->GetAttr("num_bits", &num_bits));
     OP_REQUIRES(context, min_ < max_,
                 InvalidArgument("min has to be smaller than max, was: ", min_,
                                 " >= ", max_));
+    OP_REQUIRES(context, IsNumBitsValid(num_bits),
+                InvalidArgument("num_bits must be between 2 and 8, inclusive"));
+    steps_ = (1 << num_bits) - 1;
   }
 
   void Operate(OpKernelContext* context, const Tensor& input, Tensor* output) {
     FakeQuantWithMinMaxArgsFunctor<Device> functor;
     functor(context->eigen_device<Device>(), input.flat<float>(), min_, max_,
-            output->flat<float>());
+            steps_, output->flat<float>());
   }
  private:
   float min_;
   float max_;
+  int steps_;
 };
 
 // Implementation of FakeQuantWithMinMaxArgsGradientOp, see its documentation in
@@ -88,9 +98,14 @@ class FakeQuantWithMinMaxArgsGradientOp
       : Base::BinaryElementWiseOp(context) {
     OP_REQUIRES_OK(context, context->GetAttr("min", &min_));
     OP_REQUIRES_OK(context, context->GetAttr("max", &max_));
+    int num_bits;
+    OP_REQUIRES_OK(context, context->GetAttr("num_bits", &num_bits));
     OP_REQUIRES(context, min_ < max_,
                 InvalidArgument("min has to be smaller than max, was: ", min_,
                                 " >= ", max_));
+    OP_REQUIRES(context, IsNumBitsValid(num_bits),
+                InvalidArgument("num_bits must be between 2 and 8, inclusive"));
+    steps_ = (1 << num_bits) - 1;
   }
 
   template <int NDIMS>
@@ -105,11 +120,12 @@ class FakeQuantWithMinMaxArgsGradientOp
                 InvalidArgument("gradient and input must be the same size"));
     FakeQuantWithMinMaxArgsGradientFunctor<Device> functor;
     functor(context->eigen_device<Device>(), gradient.flat<float>(),
-            input.flat<float>(), min_, max_, output->flat<float>());
+            input.flat<float>(), min_, max_, steps_, output->flat<float>());
   }
  private:
   float min_;
   float max_;
+  int steps_;
 };
 
 REGISTER_KERNEL_BUILDER(Name("FakeQuantWithMinMaxArgs").Device(DEVICE_CPU),
@@ -124,20 +140,16 @@ typedef Eigen::GpuDevice GPUDevice;
 // Forward declarations for functor specializations for GPU.
 template <>
 void FakeQuantWithMinMaxArgsFunctor<GPUDevice>::operator()(
-    const GPUDevice& d,
-    typename TTypes<float>::ConstFlat inputs,
-    const float min, const float max,
-    typename TTypes<float>::Flat outputs);
+    const GPUDevice& d, typename TTypes<float>::ConstFlat inputs, float min,
+    float max, int steps, typename TTypes<float>::Flat outputs);
 extern template struct FakeQuantWithMinMaxArgsFunctor<GPUDevice>;
 REGISTER_KERNEL_BUILDER(Name("FakeQuantWithMinMaxArgs").Device(DEVICE_GPU),
                         FakeQuantWithMinMaxArgsOp<GPUDevice>);
 
 template <>
 void FakeQuantWithMinMaxArgsGradientFunctor<GPUDevice>::operator()(
-    const GPUDevice& d,
-    typename TTypes<float>::ConstFlat gradients,
-    typename TTypes<float>::ConstFlat inputs,
-    const float min, const float max,
+    const GPUDevice& d, typename TTypes<float>::ConstFlat gradients,
+    typename TTypes<float>::ConstFlat inputs, float min, float max, int steps,
     typename TTypes<float>::Flat backprops);
 REGISTER_KERNEL_BUILDER(
     Name("FakeQuantWithMinMaxArgsGradient").Device(DEVICE_GPU),
@@ -152,6 +164,11 @@ class FakeQuantWithMinMaxVarsOp : public OpKernel {
  public:
   explicit FakeQuantWithMinMaxVarsOp(OpKernelConstruction* context)
       : OpKernel::OpKernel(context) {
+    int num_bits;
+    OP_REQUIRES_OK(context, context->GetAttr("num_bits", &num_bits));
+    OP_REQUIRES(context, IsNumBitsValid(num_bits),
+                InvalidArgument("num_bits must be between 2 and 8, inclusive"));
+    steps_ = (1 << num_bits) - 1;
 #ifndef FAKE_QUANT_NO_DEBUG
     OP_REQUIRES_OK(context,
                    context->allocate_persistent(DT_BOOL, {},
@@ -175,7 +192,7 @@ class FakeQuantWithMinMaxVarsOp : public OpKernel {
 
     FakeQuantWithMinMaxVarsFunctor<Device> functor;
     functor(context->eigen_device<Device>(), input.flat<float>(),
-            min.scalar<float>(), max.scalar<float>(),
+            min.scalar<float>(), max.scalar<float>(), steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
             check_min_max->scalar<bool>(),
 #endif
@@ -183,6 +200,7 @@ class FakeQuantWithMinMaxVarsOp : public OpKernel {
   }
 
  private:
+  int steps_;
 #ifndef FAKE_QUANT_NO_DEBUG
   PersistentTensor check_min_max_handle_;
 #endif
@@ -195,6 +213,11 @@ class FakeQuantWithMinMaxVarsGradientOp : public OpKernel {
  public:
   explicit FakeQuantWithMinMaxVarsGradientOp(OpKernelConstruction* context)
       : OpKernel::OpKernel(context) {
+    int num_bits;
+    OP_REQUIRES_OK(context, context->GetAttr("num_bits", &num_bits));
+    OP_REQUIRES(context, IsNumBitsValid(num_bits),
+                InvalidArgument("num_bits must be between 2 and 8, inclusive"));
+    steps_ = (1 << num_bits) - 1;
 #ifndef FAKE_QUANT_NO_DEBUG
     OP_REQUIRES_OK(context,
                    context->allocate_persistent(DT_BOOL, {},
@@ -231,6 +254,7 @@ class FakeQuantWithMinMaxVarsGradientOp : public OpKernel {
     FakeQuantWithMinMaxVarsGradientFunctor<Device> functor;
     functor(context->eigen_device<Device>(), gradient.flat<float>(),
             input.flat<float>(), min.scalar<float>(), max.scalar<float>(),
+            steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
             check_min_max->scalar<bool>(),
 #endif
@@ -239,6 +263,7 @@ class FakeQuantWithMinMaxVarsGradientOp : public OpKernel {
   }
 
  private:
+  int steps_;
 #ifndef FAKE_QUANT_NO_DEBUG
   PersistentTensor check_min_max_handle_;
 #endif
@@ -253,10 +278,9 @@ REGISTER_KERNEL_BUILDER(
 #if GOOGLE_CUDA
 template <>
 void FakeQuantWithMinMaxVarsFunctor<GPUDevice>::operator()(
-    const GPUDevice& d,
-    typename TTypes<float>::ConstFlat inputs,
+    const GPUDevice& d, typename TTypes<float>::ConstFlat inputs,
     typename TTypes<float>::ConstScalar min,
-    typename TTypes<float>::ConstScalar max,
+    typename TTypes<float>::ConstScalar max, int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
@@ -270,11 +294,10 @@ REGISTER_KERNEL_BUILDER(Name("FakeQuantWithMinMaxVars")
 
 template <>
 void FakeQuantWithMinMaxVarsGradientFunctor<GPUDevice>::operator()(
-    const GPUDevice& d,
-    typename TTypes<float>::ConstFlat gradients,
+    const GPUDevice& d, typename TTypes<float>::ConstFlat gradients,
     typename TTypes<float>::ConstFlat inputs,
     typename TTypes<float>::ConstScalar min,
-    typename TTypes<float>::ConstScalar max,
+    typename TTypes<float>::ConstScalar max, int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
@@ -297,6 +320,11 @@ class FakeQuantWithMinMaxVarsPerChannelOp : public OpKernel {
  public:
   explicit FakeQuantWithMinMaxVarsPerChannelOp(OpKernelConstruction* context)
       : OpKernel::OpKernel(context) {
+    int num_bits;
+    OP_REQUIRES_OK(context, context->GetAttr("num_bits", &num_bits));
+    OP_REQUIRES(context, IsNumBitsValid(num_bits),
+                InvalidArgument("num_bits must be between 2 and 8, inclusive"));
+    steps_ = (1 << num_bits) - 1;
 #ifndef FAKE_QUANT_NO_DEBUG
     OP_REQUIRES_OK(context,
                    context->allocate_persistent(DT_BOOL, {},
@@ -330,7 +358,7 @@ class FakeQuantWithMinMaxVarsPerChannelOp : public OpKernel {
         FakeQuant4WithMinMaxVarsPerChannelFunctor<Device> functor;
         functor(context->eigen_device<Device>(), input.dim_size(0),
                 input.dim_size(1), input.dim_size(2), input.dim_size(3),
-                input.flat<float>(), min.vec<float>(), max.vec<float>(),
+                input.flat<float>(), min.vec<float>(), max.vec<float>(), steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
                 check_min_max->scalar<bool>(),
 #endif
@@ -339,9 +367,9 @@ class FakeQuantWithMinMaxVarsPerChannelOp : public OpKernel {
       }
       case 2: {
         FakeQuant2WithMinMaxVarsPerChannelFunctor<Device> functor;
-        functor(context->eigen_device<Device>(),
-                input.dim_size(0), input.dim_size(1),
-                input.flat<float>(), min.vec<float>(), max.vec<float>(),
+        functor(context->eigen_device<Device>(), input.dim_size(0),
+                input.dim_size(1), input.flat<float>(), min.vec<float>(),
+                max.vec<float>(), steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
                 check_min_max->scalar<bool>(),
 #endif
@@ -350,8 +378,8 @@ class FakeQuantWithMinMaxVarsPerChannelOp : public OpKernel {
       }
       case 1: {
         FakeQuant1WithMinMaxVarsPerChannelFunctor<Device> functor;
-        functor(context->eigen_device<Device>(),
-                input.vec<float>(), min.vec<float>(), max.vec<float>(),
+        functor(context->eigen_device<Device>(), input.vec<float>(),
+                min.vec<float>(), max.vec<float>(), steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
                 check_min_max->scalar<bool>(),
 #endif
@@ -366,6 +394,7 @@ class FakeQuantWithMinMaxVarsPerChannelOp : public OpKernel {
   }
 
  private:
+  int steps_;
 #ifndef FAKE_QUANT_NO_DEBUG
   PersistentTensor check_min_max_handle_;
 #endif
@@ -378,6 +407,11 @@ class FakeQuantWithMinMaxVarsPerChannelGradientOp : public OpKernel {
  public:
   explicit FakeQuantWithMinMaxVarsPerChannelGradientOp(
       OpKernelConstruction* context) : OpKernel::OpKernel(context) {
+    int num_bits;
+    OP_REQUIRES_OK(context, context->GetAttr("num_bits", &num_bits));
+    OP_REQUIRES(context, IsNumBitsValid(num_bits),
+                InvalidArgument("num_bits must be between 2 and 8, inclusive"));
+    steps_ = (1 << num_bits) - 1;
 #ifndef FAKE_QUANT_NO_DEBUG
     OP_REQUIRES_OK(context,
                    context->allocate_persistent(DT_BOOL, {},
@@ -423,38 +457,36 @@ class FakeQuantWithMinMaxVarsPerChannelGradientOp : public OpKernel {
         FakeQuant4WithMinMaxVarsPerChannelGradientFunctor<Device> functor;
         functor(context->eigen_device<Device>(), input.dim_size(0),
                 input.dim_size(1), input.dim_size(2), input.dim_size(3),
-                gradient.flat<float>(), input.flat<float>(),
-                min.vec<float>(), max.vec<float>(),
+                gradient.flat<float>(), input.flat<float>(), min.vec<float>(),
+                max.vec<float>(), steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
                 check_min_max->scalar<bool>(),
 #endif
-                grad_wrt_input->flat<float>(),
-                grad_wrt_min->vec<float>(), grad_wrt_max->vec<float>());
+                grad_wrt_input->flat<float>(), grad_wrt_min->vec<float>(),
+                grad_wrt_max->vec<float>());
         break;
       }
       case 2: {
         FakeQuant2WithMinMaxVarsPerChannelGradientFunctor<Device> functor;
-        functor(context->eigen_device<Device>(),
-                input.dim_size(0), input.dim_size(1),
-                gradient.flat<float>(), input.flat<float>(),
-                min.vec<float>(), max.vec<float>(),
+        functor(context->eigen_device<Device>(), input.dim_size(0),
+                input.dim_size(1), gradient.flat<float>(), input.flat<float>(),
+                min.vec<float>(), max.vec<float>(), steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
                 check_min_max->scalar<bool>(),
 #endif
-                grad_wrt_input->flat<float>(),
-                grad_wrt_min->vec<float>(), grad_wrt_max->vec<float>());
+                grad_wrt_input->flat<float>(), grad_wrt_min->vec<float>(),
+                grad_wrt_max->vec<float>());
         break;
       }
       case 1: {
         FakeQuant1WithMinMaxVarsPerChannelGradientFunctor<Device> functor;
-        functor(context->eigen_device<Device>(),
-                gradient.vec<float>(), input.vec<float>(),
-                min.vec<float>(), max.vec<float>(),
+        functor(context->eigen_device<Device>(), gradient.vec<float>(),
+                input.vec<float>(), min.vec<float>(), max.vec<float>(), steps_,
 #ifndef FAKE_QUANT_NO_DEBUG
                 check_min_max->scalar<bool>(),
 #endif
-                grad_wrt_input->vec<float>(),
-                grad_wrt_min->vec<float>(), grad_wrt_max->vec<float>());
+                grad_wrt_input->vec<float>(), grad_wrt_min->vec<float>(),
+                grad_wrt_max->vec<float>());
         break;
       }
       default:
@@ -465,6 +497,7 @@ class FakeQuantWithMinMaxVarsPerChannelGradientOp : public OpKernel {
   }
 
  private:
+  int steps_;
 #ifndef FAKE_QUANT_NO_DEBUG
   PersistentTensor check_min_max_handle_;
 #endif
@@ -480,10 +513,9 @@ REGISTER_KERNEL_BUILDER(Name("FakeQuantWithMinMaxVarsPerChannelGradient")
 #if GOOGLE_CUDA
 template <>
 void FakeQuant1WithMinMaxVarsPerChannelFunctor<GPUDevice>::operator()(
-    const GPUDevice& d,
-    typename TTypes<float>::ConstVec inputs,
-    typename TTypes<float>::ConstVec min,
-    typename TTypes<float>::ConstVec max,
+    const GPUDevice& d, typename TTypes<float>::ConstVec inputs,
+    typename TTypes<float>::ConstVec min, typename TTypes<float>::ConstVec max,
+    int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
@@ -495,7 +527,7 @@ void FakeQuant2WithMinMaxVarsPerChannelFunctor<GPUDevice>::operator()(
     const GPUDevice& d, const Index batch_size, const Index depth,
     typename TTypes<float>::ConstFlat inputs,
     typename TTypes<float>::ConstFlat min,
-    typename TTypes<float>::ConstFlat max,
+    typename TTypes<float>::ConstFlat max, int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
@@ -508,7 +540,7 @@ void FakeQuant4WithMinMaxVarsPerChannelFunctor<GPUDevice>::operator()(
     const Index width, const Index depth,
     typename TTypes<float>::ConstFlat inputs,
     typename TTypes<float>::ConstFlat min,
-    typename TTypes<float>::ConstFlat max,
+    typename TTypes<float>::ConstFlat max, int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
@@ -523,11 +555,10 @@ REGISTER_KERNEL_BUILDER(Name("FakeQuantWithMinMaxVarsPerChannel")
 
 template <>
 void FakeQuant1WithMinMaxVarsPerChannelGradientFunctor<GPUDevice>::operator()(
-    const GPUDevice& d,
-    typename TTypes<float>::ConstVec gradients,
+    const GPUDevice& d, typename TTypes<float>::ConstVec gradients,
     typename TTypes<float>::ConstVec inputs,
-    typename TTypes<float>::ConstVec min,
-    typename TTypes<float>::ConstVec max,
+    typename TTypes<float>::ConstVec min, typename TTypes<float>::ConstVec max,
+    int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
@@ -542,8 +573,8 @@ void FakeQuant2WithMinMaxVarsPerChannelGradientFunctor<GPUDevice>::operator()(
     const GPUDevice& d, const Index batch_size, const Index depth,
     typename TTypes<float>::ConstFlat gradients,
     typename TTypes<float>::ConstFlat inputs,
-    typename TTypes<float>::ConstVec min,
-    typename TTypes<float>::ConstVec max,
+    typename TTypes<float>::ConstVec min, typename TTypes<float>::ConstVec max,
+    int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
@@ -559,8 +590,8 @@ void FakeQuant4WithMinMaxVarsPerChannelGradientFunctor<GPUDevice>::operator()(
     const Index width, const Index depth,
     typename TTypes<float>::ConstFlat gradients,
     typename TTypes<float>::ConstFlat inputs,
-    typename TTypes<float>::ConstVec min,
-    typename TTypes<float>::ConstVec max,
+    typename TTypes<float>::ConstVec min, typename TTypes<float>::ConstVec max,
+    int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
     typename TTypes<bool>::Scalar check_min_max,
 #endif
diff --git a/tensorflow/core/kernels/fake_quant_ops_functor.h b/tensorflow/core/kernels/fake_quant_ops_functor.h
index 242eddfb79..1aefaec691 100644
--- a/tensorflow/core/kernels/fake_quant_ops_functor.h
+++ b/tensorflow/core/kernels/fake_quant_ops_functor.h
@@ -35,31 +35,27 @@ EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE float StdRound(float input) {
 
 namespace tensorflow {
 
-static constexpr int kSteps = 255;
-static constexpr float kStepsFloat = static_cast<float>(kSteps);
-
 // Gymnastics with nudged zero point is to ensure that real zero maps to
 // an integer, which is required for e.g. zero-padding in convolutional layers.
 // Returns (nudged_min, nudged_max, nudged_scale).
-EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE void Nudge(const float min,
-                                                 const float max,
-                                                 float* nudged_min,
-                                                 float* nudged_max,
-                                                 float* scale) {
-  *scale = (max - min) / (kStepsFloat - 0.0f);
+EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE void Nudge(
+    const float min, const float max, const int steps, float* nudged_min,
+    float* nudged_max, float* scale) {
+  const float steps_float = static_cast<float>(steps);
+  *scale = (max - min) / (steps_float - 0.0f);
   const float zero_point_from_min = 0.0f - min / *scale;
-  const uint8 nudged_zero_point = [zero_point_from_min] {
+  const uint8 nudged_zero_point = [zero_point_from_min, steps, steps_float] {
     if (zero_point_from_min < 0.0f) {
       return static_cast<uint8>(0);
-    } else if (zero_point_from_min > kStepsFloat) {
-      return static_cast<uint8>(kSteps);
-    } else {
-      return static_cast<uint8>(StdRound(zero_point_from_min));
     }
+    if (zero_point_from_min > steps_float) {
+      return static_cast<uint8>(steps);
+    }
+    return static_cast<uint8>(StdRound(zero_point_from_min));
   }();
 
   *nudged_min = (0.0f - nudged_zero_point) * (*scale);
-  *nudged_max = (kStepsFloat - nudged_zero_point) * (*scale);
+  *nudged_max = (steps_float - nudged_zero_point) * (*scale);
 }
 
 template <typename T>
@@ -80,13 +76,13 @@ using Flat = typename tensorflow::TTypes<T>::Flat;
 template <typename Device>
 struct FakeQuantWithMinMaxArgsFunctor {
   void operator()(const Device& d, ConstFlat<float> inputs, const float min,
-                  const float max, Flat<float> outputs) {
+                  const float max, const int steps, Flat<float> outputs) {
     eigen_assert(min <= 0.0f && "min should be <= 0.0");
     eigen_assert(max >= 0.0f && "max should be >= 0.0");
     eigen_assert(min < max && "min should be < max");
 
     float nudged_min, nudged_max, nudged_scale;
-    Nudge(min, max, &nudged_min, &nudged_max, &nudged_scale);
+    Nudge(min, max, steps, &nudged_min, &nudged_max, &nudged_scale);
     const float inv_nudged_scale = 1.0f / nudged_scale;
 
     auto clamped = inputs.cwiseMin(nudged_max).cwiseMax(nudged_min);
@@ -103,13 +99,13 @@ template <typename Device>
 struct FakeQuantWithMinMaxArgsGradientFunctor {
   void operator()(const Device& d, ConstFlat<float> gradients,
                   ConstFlat<float> inputs, const float min, const float max,
-                  Flat<float> backprops) {
+                  const int steps, Flat<float> backprops) {
     eigen_assert(min <= 0.0f && "min should be <= 0.0");
     eigen_assert(max >= 0.0f && "max should be >= 0.0");
     eigen_assert(min < max && "min should be < max");
 
     float nudged_min, nudged_max, nudged_scale;
-    Nudge(min, max, &nudged_min, &nudged_max, &nudged_scale);
+    Nudge(min, max, steps, &nudged_min, &nudged_max, &nudged_scale);
 
     auto between_nudged_min_max =
         (inputs >= nudged_min && inputs <= nudged_max)
@@ -124,6 +120,7 @@ template <typename Device>
 struct FakeQuantWithMinMaxVarsFunctor {
   void operator()(const Device& d, ConstFlat<float> inputs,
                   ConstScalar<float> min, ConstScalar<float> max,
+                  const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -138,7 +135,7 @@ struct FakeQuantWithMinMaxVarsFunctor {
 #endif
 
     float nudged_min, nudged_max, nudged_scale;
-    Nudge(min(), max(), &nudged_min, &nudged_max, &nudged_scale);
+    Nudge(min(), max(), steps, &nudged_min, &nudged_max, &nudged_scale);
     const auto nudged_scale_repl = inputs.constant(nudged_scale);
 
     const auto clamped = inputs.cwiseMin(nudged_max).cwiseMax(nudged_min);
@@ -155,7 +152,7 @@ template <typename Device>
 struct FakeQuantWithMinMaxVarsGradientFunctor {
   void operator()(const Device& d, ConstFlat<float> gradients,
                   ConstFlat<float> inputs, ConstScalar<float> min,
-                  ConstScalar<float> max,
+                  ConstScalar<float> max, const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -172,7 +169,7 @@ struct FakeQuantWithMinMaxVarsGradientFunctor {
 #endif
 
     float nudged_min, nudged_max, nudged_scale;
-    Nudge(min(), max(), &nudged_min, &nudged_max, &nudged_scale);
+    Nudge(min(), max(), steps, &nudged_min, &nudged_max, &nudged_scale);
 
     const auto between_min_max =
         (inputs >= nudged_min && inputs <= nudged_max)
@@ -200,7 +197,7 @@ using Index = typename tensorflow::TTypes<float>::ConstTensor::Index;
 template <typename Device>
 struct FakeQuant1WithMinMaxVarsPerChannelFunctor {
   void operator()(const Device& d, ConstVec<float> inputs, ConstVec<float> min,
-                  ConstVec<float> max,
+                  ConstVec<float> max, const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -216,7 +213,7 @@ struct FakeQuant1WithMinMaxVarsPerChannelFunctor {
 
     for (Index i = 0; i < min.size(); ++i) {
       float nudged_min, nudged_max, nudged_scale;
-      Nudge(min(i), max(i), &nudged_min, &nudged_max, &nudged_scale);
+      Nudge(min(i), max(i), steps, &nudged_min, &nudged_max, &nudged_scale);
       const float clamped =
           std::max(std::min(inputs(i), nudged_max), nudged_min);
       const float clamped_shifted = clamped - nudged_min;
@@ -233,7 +230,7 @@ template <typename Device>
 struct FakeQuant2WithMinMaxVarsPerChannelFunctor {
   void operator()(const Device& d, const Index batch_size, const Index depth,
                   ConstFlat<float> inputs, ConstVec<float> min,
-                  ConstVec<float> max,
+                  ConstVec<float> max, const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -251,7 +248,7 @@ struct FakeQuant2WithMinMaxVarsPerChannelFunctor {
     const auto inputs_restored = inputs.reshape(restored);
     for (Index i = 0; i < min.size(); ++i) {
       float nudged_min, nudged_max, nudged_scale;
-      Nudge(min(i), max(i), &nudged_min, &nudged_max, &nudged_scale);
+      Nudge(min(i), max(i), steps, &nudged_min, &nudged_max, &nudged_scale);
       const auto clamped =
           inputs_restored.chip<1>(i).cwiseMin(nudged_max).cwiseMax(nudged_min);
       const auto clamped_shifted = clamped - nudged_min;
@@ -269,7 +266,7 @@ template <typename Device>
 struct FakeQuant4WithMinMaxVarsPerChannelFunctor {
   void operator()(const Device& d, const Index batch_size, const Index height,
                   const Index width, const Index depth, ConstFlat<float> inputs,
-                  ConstVec<float> min, ConstVec<float> max,
+                  ConstVec<float> min, ConstVec<float> max, const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -287,7 +284,7 @@ struct FakeQuant4WithMinMaxVarsPerChannelFunctor {
     const auto inputs_restored = inputs.reshape(restored);
     for (Index i = 0; i < min.size(); ++i) {
       float nudged_min, nudged_max, nudged_scale;
-      Nudge(min(i), max(i), &nudged_min, &nudged_max, &nudged_scale);
+      Nudge(min(i), max(i), steps, &nudged_min, &nudged_max, &nudged_scale);
       const auto clamped =
           inputs_restored.chip<3>(i).cwiseMin(nudged_max).cwiseMax(nudged_min);
       const auto clamped_shifted = clamped - nudged_min;
@@ -308,7 +305,7 @@ template <typename Device>
 struct FakeQuant1WithMinMaxVarsPerChannelGradientFunctor {
   void operator()(const Device& d, ConstVec<float> gradients,
                   ConstVec<float> inputs, ConstVec<float> min,
-                  ConstVec<float> max,
+                  ConstVec<float> max, const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -325,7 +322,7 @@ struct FakeQuant1WithMinMaxVarsPerChannelGradientFunctor {
 
     for (Index i = 0; i < min.size(); ++i) {
       float nudged_min, nudged_max, nudged_scale;
-      Nudge(min(i), max(i), &nudged_min, &nudged_max, &nudged_scale);
+      Nudge(min(i), max(i), steps, &nudged_min, &nudged_max, &nudged_scale);
 
       const bool between_min_max =
           inputs(i) >= nudged_min && inputs(i) <= nudged_max;
@@ -346,7 +343,7 @@ template <typename Device>
 struct FakeQuant2WithMinMaxVarsPerChannelGradientFunctor {
   void operator()(const Device& d, const Index batch_size, const Index depth,
                   ConstFlat<float> gradients, ConstFlat<float> inputs,
-                  ConstVec<float> min, ConstVec<float> max,
+                  ConstVec<float> min, ConstVec<float> max, const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -366,7 +363,7 @@ struct FakeQuant2WithMinMaxVarsPerChannelGradientFunctor {
     const auto inputs_restored = inputs.reshape(restored);
     for (Index i = 0; i < min.size(); ++i) {
       float nudged_min, nudged_max, nudged_scale;
-      Nudge(min(i), max(i), &nudged_min, &nudged_max, &nudged_scale);
+      Nudge(min(i), max(i), steps, &nudged_min, &nudged_max, &nudged_scale);
       const auto gradients_chip = gradients_restored.chip<1>(i);
       const auto inputs_chip = inputs_restored.chip<1>(i);
 
@@ -399,7 +396,7 @@ struct FakeQuant4WithMinMaxVarsPerChannelGradientFunctor {
   void operator()(const Device& d, const Index batch_size, const Index height,
                   const Index width, const Index depth,
                   ConstFlat<float> gradients, ConstFlat<float> inputs,
-                  ConstVec<float> min, ConstVec<float> max,
+                  ConstVec<float> min, ConstVec<float> max, const int steps,
 #ifndef FAKE_QUANT_NO_DEBUG
                   Scalar<bool> check_min_max,
 #endif
@@ -419,7 +416,7 @@ struct FakeQuant4WithMinMaxVarsPerChannelGradientFunctor {
     const auto inputs_restored = inputs.reshape(restored);
     for (Index i = 0; i < min.size(); ++i) {
       float nudged_min, nudged_max, nudged_scale;
-      Nudge(min(i), max(i), &nudged_min, &nudged_max, &nudged_scale);
+      Nudge(min(i), max(i), steps, &nudged_min, &nudged_max, &nudged_scale);
       const auto gradients_chip = gradients_restored.chip<3>(i);
       const auto inputs_chip = inputs_restored.chip<3>(i);
 
diff --git a/tensorflow/core/kernels/fake_quant_ops_test.cc b/tensorflow/core/kernels/fake_quant_ops_test.cc
index 38ad345f0d..2be9226965 100644
--- a/tensorflow/core/kernels/fake_quant_ops_test.cc
+++ b/tensorflow/core/kernels/fake_quant_ops_test.cc
@@ -48,30 +48,94 @@ class QuantOpsTest : public OpsTestBase {
       inputs_.push_back({nullptr, input});
     }
   }
+
+  void RunTestFakeQuantWithMinMaxArgs(const int num_bits, const float min,
+                                      const float max, const TensorShape& shape,
+                                      const gtl::ArraySlice<float>& data,
+                                      gtl::ArraySlice<float> expected_data) {
+    TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxArgs")
+                     .Input(FakeInput(DT_FLOAT))  // inputs
+                     .Attr("min", min)
+                     .Attr("max", max)
+                     .Attr("num_bits", num_bits)
+                     .Finalize(node_def()));
+    TF_EXPECT_OK(InitOp());
+    // Downstream inputs.
+    AddInputFromArray<float>(shape, data);
+
+    // Tested code.
+    TF_ASSERT_OK(RunOpKernel());
+
+    Tensor* output = GetOutput(0);
+    Tensor expected(allocator(), DT_FLOAT, shape);
+    FillValues<float>(&expected, expected_data);
+    ExpectClose(expected, *output);
+  }
+
+  void RunTestFakeQuantWithMinMaxVars(const int num_bits, const float min,
+                                      const float max, const TensorShape& shape,
+                                      const gtl::ArraySlice<float>& data,
+                                      gtl::ArraySlice<float> expected_data) {
+    TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVars")
+                     .Input(FakeInput(DT_FLOAT))  // inputs
+                     .Input(FakeInput(DT_FLOAT))  // min
+                     .Input(FakeInput(DT_FLOAT))  // max
+                     .Attr("num_bits", num_bits)
+                     .Finalize(node_def()));
+    TF_EXPECT_OK(InitOp());
+    // Downstream inputs.
+    AddInputFromArray<float>(shape, data);
+    // Min.
+    AddInputFromArray<float>(TensorShape({}), {min});
+    // Max.
+    AddInputFromArray<float>(TensorShape({}), {max});
+
+    // Tested code.
+    TF_ASSERT_OK(RunOpKernel());
+
+    Tensor* output = GetOutput(0);
+    Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
+    FillValues<float>(&expected, expected_data);
+    ExpectClose(expected, *output);
+  }
+
+  void RunTestFakeQuantWithMinMaxVarsPerChannel(
+      const int num_bits, const TensorShape& minmax_shape,
+      const gtl::ArraySlice<float>& min, const gtl::ArraySlice<float>& max,
+      const TensorShape& shape, const gtl::ArraySlice<float>& data,
+      gtl::ArraySlice<float> expected_data) {
+    TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannel")
+                     .Input(FakeInput(DT_FLOAT))  // inputs
+                     .Input(FakeInput(DT_FLOAT))  // min
+                     .Input(FakeInput(DT_FLOAT))  // max
+                     .Attr("num_bits", num_bits)
+                     .Finalize(node_def()));
+    TF_EXPECT_OK(InitOp());
+    // Downstream inputs.
+    AddInputFromArray<float>(shape, data);
+    // Min.
+    AddInputFromArray<float>(minmax_shape, min);
+    // Max.
+    AddInputFromArray<float>(minmax_shape, max);
+
+    // Tested code.
+    TF_ASSERT_OK(RunOpKernel());
+
+    Tensor* output = GetOutput(0);
+    Tensor expected(allocator(), DT_FLOAT, shape);
+    FillValues<float>(&expected, expected_data);
+    ExpectClose(expected, *output);
+  }
 };
 
 TEST_F(QuantOpsTest, WithArgsNoNudging) {
   // Original quantization range: [-10 + 0 / 4, -10 + 255 / 4], scale: 1/4.
   // Original zero point: 40, no nudging necessary.
-  // Expected quantized values: -10.0, -10.25, ..., 53.75.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxArgs")
-                   .Input(FakeInput(DT_FLOAT))  // inputs
-                   .Attr("min", -10.0f)
-                   .Attr("max", 53.75f)
-                   .Finalize(node_def()));
-  TF_EXPECT_OK(InitOp());
-  // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-10.1f, -10.0f, -9.9f, -9.75f, 53.75f, 53.8f});
-
-  // Tested code.
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected,
-                    {-10.0f, -10.0f, -10.0f, -9.75f, 53.75f, 53.75f});
-  ExpectClose(expected, *output);
+  // Expected quantized values: -10.0, -9.75, ..., 53.75.
+  RunTestFakeQuantWithMinMaxArgs(
+      8, -10.0f, 53.75f, TensorShape({2, 3}),
+      {-10.1f, -10.0f, -9.9f, -9.75f, 53.75f, 53.8f},
+      {-10.0f, -10.0f, -10.0f, -9.75f, 53.75f, 53.75f});
 }
 
 TEST_F(QuantOpsTest, WithArgsNudgedZeroIs0) {
@@ -79,23 +143,9 @@ TEST_F(QuantOpsTest, WithArgsNudgedZeroIs0) {
   // Scale: 1/4,  original zero point: 0.4, nudged to 0.
   // Nudged range: [0.0; 63.75].
   // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxArgs")
-                   .Input(FakeInput(DT_FLOAT))  // inputs
-                   .Attr("min", -0.1f)
-                   .Attr("max", 63.65f)
-                   .Finalize(node_def()));
-  TF_EXPECT_OK(InitOp());
-  // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.1f, 0.0f, 0.1f, 0.25f, 63.75f, 63.8f});
-
-  // Tested code.
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected, {0.0f, 0.0f, 0.0f, 0.25f, 63.75f, 63.75f});
-  ExpectClose(expected, *output);
+  RunTestFakeQuantWithMinMaxArgs(8, -0.1f, 63.65f, TensorShape({2, 3}),
+                                 {-0.1f, 0.0f, 0.1f, 0.25f, 63.75f, 63.8f},
+                                 {0.0f, 0.0f, 0.0f, 0.25f, 63.75f, 63.75f});
 }
 
 TEST_F(QuantOpsTest, WithArgsNudgedZeroIs1) {
@@ -103,23 +153,9 @@ TEST_F(QuantOpsTest, WithArgsNudgedZeroIs1) {
   // Scale: 1/4,  original zero point: 0.5, nudged to 1.
   // Nudged range: [-0.25; 63.5].
   // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxArgs")
-                   .Input(FakeInput(DT_FLOAT))  // inputs
-                   .Attr("min", -0.125f)
-                   .Attr("max", 63.625f)
-                   .Finalize(node_def()));
-  TF_EXPECT_OK(InitOp());
-  // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.26f, -0.25f, -0.24f, 0.0f, 63.5f, 63.6f});
-
-  // Tested code.
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected, {-0.25f, -0.25f, -0.25f, 0.0f, 63.5f, 63.5f});
-  ExpectClose(expected, *output);
+  RunTestFakeQuantWithMinMaxArgs(8, -0.125f, 63.625f, TensorShape({2, 3}),
+                                 {-0.26f, -0.25f, -0.24f, 0.0f, 63.5f, 63.6f},
+                                 {-0.25f, -0.25f, -0.25f, 0.0f, 63.5f, 63.5f});
 }
 
 TEST_F(QuantOpsTest, WithArgsNudgedZeroIs255) {
@@ -127,23 +163,78 @@ TEST_F(QuantOpsTest, WithArgsNudgedZeroIs255) {
   // Scale: 1/4,  original zero point: 254.6, nudged to 255.
   // Nudged range: [-63.75; 0.0].
   // Expected quantized values: -63.75, -63.5, -63.25, ..., 0.0.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxArgs")
-                   .Input(FakeInput(DT_FLOAT))  // inputs
-                   .Attr("min", -63.65f)
-                   .Attr("max", 0.1f)
-                   .Finalize(node_def()));
-  TF_EXPECT_OK(InitOp());
-  // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-63.8f, -63.75f, -63.7f, -63.5f, 0.0f, 0.1f});
+  RunTestFakeQuantWithMinMaxArgs(
+      8, -63.65f, 0.1f, TensorShape({2, 3}),
+      {-63.8f, -63.75f, -63.7f, -63.5f, 0.0f, 0.1f},
+      {-63.75f, -63.75f, -63.75f, -63.5f, 0.0f, 0.0f});
+}
 
-  // Tested code.
-  TF_ASSERT_OK(RunOpKernel());
+TEST_F(QuantOpsTest, WithArgsNoNudging_4Bits) {
+  // Original quantization range: [-6 + 0 / 2, -6 + 15 / 2], scale: 1/2.
+  // Original zero point: 12, no nudging necessary.
+  // Expected quantized values: -6, -5.5, ..., 1.5.
+  RunTestFakeQuantWithMinMaxArgs(4, -6.0f, 1.5f, TensorShape({2, 3}),
+                                 {-6.1f, -6.0f, -5.9f, -5.5f, 1.5f, 1.6f},
+                                 {-6.0f, -6.0f, -6.0f, -5.5f, 1.5f, 1.5f});
+}
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected, {-63.75f, -63.75f, -63.75f, -63.5f, 0.0f, 0.0f});
-  ExpectClose(expected, *output);
+TEST_F(QuantOpsTest, WithArgsNudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
+  RunTestFakeQuantWithMinMaxArgs(4, -0.1f, 7.4f, TensorShape({2, 3}),
+                                 {-0.1f, 0.0f, 0.1f, 0.5f, 7.5f, 7.7f},
+                                 {0.0f, 0.0f, 0.0f, 0.5f, 7.5f, 7.5f});
+}
+
+TEST_F(QuantOpsTest, WithArgsNudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
+  RunTestFakeQuantWithMinMaxArgs(4, -0.4f, 7.1f, TensorShape({2, 3}),
+                                 {-0.51f, -0.5f, -0.24f, 0.0f, 7.0f, 7.1f},
+                                 {-0.5f, -0.5f, 0.0f, 0.0f, 7.0f, 7.0f});
+}
+
+TEST_F(QuantOpsTest, WithArgsNudgedZeroIs15_4Bits) {
+  // Original quantization range: [0.4 / 2 - 15 / 2, 0.4 / 2 + 0 / 2].
+  // Scale: 1/2,  original zero point: 14.6, nudged to 15.
+  // Nudged range: [-7.5; 0.0].
+  // Expected quantized values: -7.5, -7.0, ..., 0.0.
+  RunTestFakeQuantWithMinMaxArgs(4, -7.3f, 0.2f, TensorShape({2, 3}),
+                                 {-7.6f, -7.5f, -7.4f, -7.2f, 0.0f, 0.1f},
+                                 {-7.5f, -7.5f, -7.5f, -7.0f, 0.0f, 0.0f});
+}
+
+TEST_F(QuantOpsTest, WithArgsNoNudging_2Bits) {
+  // Original quantization range: [-1 + 0 / 2, -1 + 3 / 2], scale: 1/2.
+  // Original zero point: 2, no nudging necessary.
+  // Expected quantized values: -1.0, -0.5, 0.0, 0.5.
+  RunTestFakeQuantWithMinMaxArgs(2, -1.0f, 0.5f, TensorShape({2, 3}),
+                                 {-1.1f, -1.0f, -0.9f, -0.3f, 0.1f, 1.0f},
+                                 {-1.0f, -1.0f, -1.0f, -0.5f, 0.0f, 0.5f});
+}
+
+TEST_F(QuantOpsTest, WithArgsNudgedZeroIs0_2Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 3 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 1.5].
+  // Expected quantized values: 0.0, 0.5, 1.0, 1.5.
+  RunTestFakeQuantWithMinMaxArgs(2, -0.1f, 1.4f, TensorShape({2, 3}),
+                                 {-0.2f, 0.1f, 0.7f, 1.0f, 1.3f, 1.6f},
+                                 {0.0f, 0.0f, 0.5f, 1.0f, 1.5f, 1.5f});
+}
+
+TEST_F(QuantOpsTest, WithArgsNudgedZeroIs1_2Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 3 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 1.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, 1.0.
+  RunTestFakeQuantWithMinMaxArgs(2, -0.4f, 1.1f, TensorShape({2, 3}),
+                                 {-0.51f, -0.5f, -0.24f, 0.0f, 1.0f, 1.1f},
+                                 {-0.5f, -0.5f, 0.0f, 0.0f, 1.0f, 1.0f});
 }
 
 TEST_F(QuantOpsTest, WithArgsGradient) {
@@ -176,74 +267,130 @@ TEST_F(QuantOpsTest, WithArgsGradient) {
   ExpectClose(expected, *output);
 }
 
-TEST_F(QuantOpsTest, WithVarsNoNudging) {
-  // Original quantization range: [-10 + 0 / 4, -10 + 255 / 4], scale: 1/4.
-  // Original zero point: 40, no nudging necessary.
-  // Expected quantized values: -10.0, -10.25, ..., 53.75.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVars")
+TEST_F(QuantOpsTest, WithArgsGradient_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxArgsGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradient
                    .Input(FakeInput(DT_FLOAT))  // inputs
-                   .Input(FakeInput(DT_FLOAT))  // min
-                   .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("min", -0.4f)
+                   .Attr("max", 7.1f)
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({2, 3}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-10.1f, -10.0f, -9.9f, -9.75f, 53.75f, 53.8f});
-  // Min.
-  AddInputFromArray<float>(TensorShape({}), {-10.0f});
-  // Max.
-  AddInputFromArray<float>(TensorShape({}), {53.75f});
+                           {-0.6f, -0.5f, -0.4f, 0.0f, 7.0f, 7.1f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
   Tensor* output = GetOutput(0);
+  auto input_flat = GetInput(0).flat<float>();
   Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected,
-                    {-10.0f, -10.0f, -10.0f, -9.75f, 53.75f, 53.75f});
+  FillValues<float>(&expected, {0.0f, input_flat(1), input_flat(2),
+                                input_flat(3), input_flat(4), 0.0f});
   ExpectClose(expected, *output);
 }
 
+TEST_F(QuantOpsTest, WithVarsNoNudging) {
+  // Original quantization range: [-10 + 0 / 4, -10 + 255 / 4], scale: 1/4.
+  // Original zero point: 40, no nudging necessary.
+  // Expected quantized values: -10.0, -10.25, ..., 53.75.
+  RunTestFakeQuantWithMinMaxVars(
+      8, -10.0f, 53.75f, TensorShape({2, 3}),
+      {-10.1f, -10.0f, -9.9f, -9.75f, 53.75f, 53.8f},
+      {-10.0f, -10.0f, -10.0f, -9.75f, 53.75f, 53.75f});
+}
+
 TEST_F(QuantOpsTest, WithVarsNudgedZeroIs0) {
   // Original quantization range: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
   // Scale: 1/4,  original zero point: 0.4, nudged to 0.
   // Nudged range: [0.0; 63.75].
   // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVars")
-                   .Input(FakeInput(DT_FLOAT))  // inputs
-                   .Input(FakeInput(DT_FLOAT))  // min
-                   .Input(FakeInput(DT_FLOAT))  // max
-                   .Finalize(node_def()));
-  TF_EXPECT_OK(InitOp());
-  // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.1f, 0.0f, 0.1f, 0.25f, 63.75f, 63.8f});
-  // Min.
-  AddInputFromArray<float>(TensorShape({}), {-0.1f});
-  // Max.
-  AddInputFromArray<float>(TensorShape({}), {63.65f});
+  RunTestFakeQuantWithMinMaxVars(8, -0.1f, 63.65f, TensorShape({2, 3}),
+                                 {-0.1f, 0.0f, 0.1f, 0.25f, 63.75f, 63.8f},
+                                 {0.0f, 0.0f, 0.0f, 0.25f, 63.75f, 63.75f});
+}
 
-  // Tested code.
-  TF_ASSERT_OK(RunOpKernel());
+TEST_F(QuantOpsTest, WithVarsNudgedZeroIs1) {
+  // Original quantization range: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
+  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
+  // Nudged range: [-0.25; 63.5].
+  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+  RunTestFakeQuantWithMinMaxVars(8, -0.125f, 63.625f, TensorShape({2, 3}),
+                                 {-0.26f, -0.25f, -0.24f, 0.0f, 63.5f, 63.6f},
+                                 {-0.25f, -0.25f, -0.25f, 0.0f, 63.5f, 63.5f});
+}
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected,
-                    {0.0f, 0.0f, 0.0f, 0.25f, 63.75f, 63.75f});
-  ExpectClose(expected, *output);
+TEST_F(QuantOpsTest, WithVarsNudgedZeroIs255) {
+  // Original quantization range: [0.4 / 4 - 255 / 4, 0.4 / 4 + 0 / 4].
+  // Scale: 1/4,  original zero point: 254.6, nudged to 255.
+  // Nudged range: [-63.75; 0.0].
+  // Expected quantized values: -63.75, -63.5, -63.25, ..., 0.0.
+  RunTestFakeQuantWithMinMaxVars(
+      8, -63.65f, 0.1f, TensorShape({2, 3}),
+      {-63.8f, -63.75f, -63.7f, -63.5f, 0.0f, 0.1f},
+      {-63.75f, -63.75f, -63.75f, -63.5f, 0.0f, 0.0f});
 }
 
-TEST_F(QuantOpsTest, WithVarsNudgedZeroIs1) {
+TEST_F(QuantOpsTest, WithVarsNoNudging_4Bits) {
+  // Original quantization range: [-6 + 0 / 2, -6 + 15 / 2], scale: 1/2.
+  // Original zero point: 12, no nudging necessary.
+  // Expected quantized values: -6, -5.5, ..., 1.5.
+  RunTestFakeQuantWithMinMaxVars(4, -6.0f, 1.5f, TensorShape({2, 3}),
+                                 {-6.1f, -6.0f, -5.9f, -5.5f, 1.5f, 1.6f},
+                                 {-6.0f, -6.0f, -6.0f, -5.5f, 1.5f, 1.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsNudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
+  RunTestFakeQuantWithMinMaxVars(4, -0.1f, 7.4f, TensorShape({2, 3}),
+                                 {-0.1f, 0.0f, 0.1f, 0.5f, 7.5f, 7.7f},
+                                 {0.0f, 0.0f, 0.0f, 0.5f, 7.5f, 7.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsNudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
+  RunTestFakeQuantWithMinMaxVars(4, -0.4f, 7.1f, TensorShape({2, 3}),
+                                 {-0.51f, -0.5f, -0.24f, 0.0f, 7.0f, 7.1f},
+                                 {-0.5f, -0.5f, 0.0f, 0.0f, 7.0f, 7.0f});
+}
+
+TEST_F(QuantOpsTest, WithVarsNudgedZeroIs15_4Bits) {
+  // Original quantization range: [0.4 / 2 - 15 / 2, 0.4 / 2 + 0 / 2].
+  // Scale: 1/2,  original zero point: 14.6, nudged to 15.
+  // Nudged range: [-7.5; 0.0].
+  // Expected quantized values: -7.5, -7.0, ..., 0.0.
+  RunTestFakeQuantWithMinMaxVars(4, -7.3f, 0.2f, TensorShape({2, 3}),
+                                 {-7.6f, -7.5f, -7.4f, -7.2f, 0.0f, 0.1f},
+                                 {-7.5f, -7.5f, -7.5f, -7.0f, 0.0f, 0.0f});
+}
+
+TEST_F(QuantOpsTest, WithVarsGradient) {
   // Original quantization range: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
   // Scale: 1/4,  original zero point: 0.5, nudged to 1.
   // Nudged range: [-0.25; 63.5].
   // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVars")
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({2, 3}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({2, 3}),
                            {-0.26f, -0.25f, -0.24f, 0.0f, 63.5f, 63.6f});
@@ -255,34 +402,46 @@ TEST_F(QuantOpsTest, WithVarsNudgedZeroIs1) {
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected,
-                    {-0.25f, -0.25f, -0.25f, 0.0f, 63.5f, 63.5f});
-  ExpectClose(expected, *output);
+  Tensor* output_bprop_wrt_input = GetOutput(0);
+  Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT, TensorShape({2, 3}));
+  auto in_flat = GetInput(0).flat<float>();
+  FillValues<float>(&expected_bprop_wrt_input, {0.0f, in_flat(1), in_flat(2),
+                                                in_flat(3), in_flat(4), 0.0f});
+  ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
+
+  Tensor* output_bprop_wrt_min = GetOutput(1);
+  Tensor expected_bprop_wrt_min(allocator(), DT_FLOAT, TensorShape({}));
+  expected_bprop_wrt_min.flat<float>()(0) = in_flat(0);
+  ExpectClose(expected_bprop_wrt_min, *output_bprop_wrt_min);
+
+  Tensor* output_bprop_wrt_max = GetOutput(2);
+  Tensor expected_bprop_wrt_max(allocator(), DT_FLOAT, TensorShape({}));
+  expected_bprop_wrt_max.flat<float>()(0) = in_flat(5);
+  ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsGradient) {
-  // Original quantization range: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
-  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
-  // Nudged range: [-0.25; 63.5].
-  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+TEST_F(QuantOpsTest, WithVarsGradient_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
   TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsGradient")
                    .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
   // Upstream gradients.
   AddRandomInput(TensorShape({2, 3}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.26f, -0.25f, -0.24f, 0.0f, 63.5f, 63.6f});
+                           {-0.6f, -0.5f, -0.4f, 0.0f, 7.0f, 7.1f});
   // Min.
-  AddInputFromArray<float>(TensorShape({}), {-0.125f});
+  AddInputFromArray<float>(TensorShape({}), {-0.4f});
   // Max.
-  AddInputFromArray<float>(TensorShape({}), {63.625f});
+  AddInputFromArray<float>(TensorShape({}), {7.1f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
@@ -290,10 +449,8 @@ TEST_F(QuantOpsTest, WithVarsGradient) {
   Tensor* output_bprop_wrt_input = GetOutput(0);
   Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT, TensorShape({2, 3}));
   auto in_flat = GetInput(0).flat<float>();
-  FillValues<float>(&expected_bprop_wrt_input,
-                    {0.0f, in_flat(1),
-                     in_flat(2), in_flat(3),
-                     in_flat(4), 0.0f});
+  FillValues<float>(&expected_bprop_wrt_input, {0.0f, in_flat(1), in_flat(2),
+                                                in_flat(3), in_flat(4), 0.0f});
   ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
 
   Tensor* output_bprop_wrt_min = GetOutput(1);
@@ -312,12 +469,182 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim1NudgedZeroIs0) {
   // Scale: 1/4,  original zero point: 0.4, nudged to 0.
   // Nudged ranges: [0.0; 63.75].
   // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannel")
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      8, TensorShape({4}), {-0.1f, -0.1f, -0.1f, -0.1f},
+      {63.65f, 63.65f, 63.65f, 63.65f}, TensorShape({4}),
+      {-0.1f, 0.0f, 63.75f, 63.8f}, {0.0f, 0.0f, 63.75f, 63.75f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim1NudgedZeroIs1) {
+  // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
+  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
+  // Nudged ranges: [-0.25; 63.5].
+  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      8, TensorShape({4}), {-0.125f, -0.125f, -0.125f, -0.125f},
+      {63.625f, 63.625f, 63.625f, 63.625f}, TensorShape({4}),
+      {-0.26f, -0.25f, -0.24f, 63.6f}, {-0.25f, -0.25f, -0.25f, 63.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs0) {
+  // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
+  // Scale: 1/4,  original zero point: 0.4, nudged to 0.
+  // Nudged ranges: [0.0; 63.75].
+  // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      8, TensorShape({3}), {-0.1f, -0.1f, -0.1f}, {63.65f, 63.65f, 63.65f},
+      TensorShape({2, 3}), {-0.1f, 0.0f, 0.1f, 0.25f, 63.75f, 63.8f},
+      {0.0f, 0.0f, 0.0f, 0.25f, 63.75f, 63.75f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs1) {
+  // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
+  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
+  // Nudged ranges: [-0.25; 63.5].
+  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      8, TensorShape({3}), {-0.125f, -0.125f, -0.125f},
+      {63.625f, 63.625f, 63.625f}, TensorShape({2, 3}),
+      {-0.26f, -0.25f, -0.24f, 0.0f, 63.5f, 63.6f},
+      {-0.25f, -0.25f, -0.25f, 0.0f, 63.5f, 63.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs0) {
+  // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
+  // Scale: 1/4,  original zero point: 0.4, nudged to 0.
+  // Nudged ranges: [0.0; 63.75].
+  // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      8, TensorShape({4}), {-0.1f, -0.1f, -0.1f, -0.1f},
+      {63.65f, 63.65f, 63.65f, 63.65f}, TensorShape({1, 2, 3, 4}),
+      {-0.1f, 0.0f,   0.1f,   0.25f,  0.5f,   0.75f,
+       1.0f,  1.25f,  1.5f,   1.75f,  2.0f,   2.25f,
+
+       63.0f, 63.25f, 63.5f,  63.7f,  63.75f, 63.8f,
+       63.9f, 100.0f, 100.0f, 100.0f, 100.0f, 1000.0f},
+      {0.0f,   0.0f,   0.0f,   0.25f,  0.5f,   0.75f,
+       1.0f,   1.25f,  1.5f,   1.75f,  2.0f,   2.25f,
+
+       63.0f,  63.25f, 63.5f,  63.75f, 63.75f, 63.75f,
+       63.75f, 63.75f, 63.75f, 63.75f, 63.75f, 63.75f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs1) {
+  // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
+  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
+  // Nudged ranges: [-0.25; 63.5].
+  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      8, TensorShape({4}), {-0.125f, -0.125f, -0.125f, -0.125f},
+      {63.625f, 63.625f, 63.625f, 63.625f}, TensorShape({1, 2, 3, 4}),
+      {-0.3f,  -0.25f, -0.2f,  0.0f,   0.25f,  0.5f,
+       0.75f,  1.0f,   1.25f,  1.5f,   1.75f,  2.0f,
+
+       63.0f,  63.25f, 63.4f,  63.5f,  63.6f,  63.7f,
+       100.0f, 100.0f, 100.0f, 100.0f, 100.0f, 1000.0f},
+      {-0.25f, -0.25f, -0.25f, 0.0f,  0.25f, 0.5f,
+       0.75f,  1.0f,   1.25f,  1.5f,  1.75f, 2.0f,
+
+       63.0f,  63.25f, 63.5f,  63.5f, 63.5f, 63.5f,
+       63.5f,  63.5f,  63.5f,  63.5f, 63.5f, 63.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim1NudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      4, TensorShape({4}), {-0.1f, -0.1f, -0.1f, -0.1f},
+      {7.4f, 7.4f, 7.4f, 7.4f}, TensorShape({4}), {-0.1f, 0.0f, 7.5f, 7.6f},
+      {0.0f, 0.0f, 7.5f, 7.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim1NudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      4, TensorShape({4}), {-0.4f, -0.4f, -0.4f, -0.4f},
+      {7.1f, 7.1f, 7.1f, 7.1f}, TensorShape({4}), {-0.51f, -0.5f, -0.24f, 7.1f},
+      {-0.5f, -0.5f, -0.0f, 7.0f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      4, TensorShape({3}), {-0.1f, -0.1f, -0.1f}, {7.4f, 7.4f, 7.4f},
+      TensorShape({2, 3}), {-0.1f, 0.0f, 0.1f, 0.5f, 7.5f, 7.6f},
+      {0.0f, 0.0f, 0.0f, 0.5f, 7.5f, 7.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      4, TensorShape({3}), {-0.4f, -0.4f, -0.4f}, {7.1f, 7.1f, 7.1f},
+      TensorShape({2, 3}), {-0.51f, -0.5f, -0.24f, 0.0f, 7.0f, 7.1f},
+      {-0.5f, -0.5f, -0.0f, 0.0f, 7.0f, 7.0f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      4, TensorShape({4}), {-0.1f, -0.1f, -0.1f, -0.1f},
+      {7.4f, 7.4f, 7.4f, 7.4f}, TensorShape({1, 2, 3, 4}),
+      {-0.1f, 0.0f,   0.1f,   0.5f,   1.0f,   1.5f,
+       1.5f,  2.0f,   2.5f,   3.0f,   3.5f,   4.0f,
+
+       6.0f,  6.5f,   7.0f,   7.4f,   7.5f,   7.7f,
+       7.8f,  100.0f, 100.0f, 100.0f, 100.0f, 1000.0f},
+      {0.0f, 0.0f, 0.0f, 0.5f, 1.0f, 1.5f, 1.5f, 2.0f, 2.5f, 3.0f, 3.5f, 4.0f,
+
+       6.0f, 6.5f, 7.0f, 7.5f, 7.5f, 7.5f, 7.5f, 7.5f, 7.5f, 7.5f, 7.5f, 7.5f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
+  RunTestFakeQuantWithMinMaxVarsPerChannel(
+      4, TensorShape({4}), {-0.4f, -0.4f, -0.4f, -0.4f},
+      {7.1f, 7.1f, 7.1f, 7.1f}, TensorShape({1, 2, 3, 4}),
+      {-0.6f,  -0.5f,  -0.4f,  0.0f,   0.5f,   1.0f,
+       1.5f,   2.0f,   2.5f,   3.0f,   3.5f,   4.0f,
+
+       6.0f,   6.5f,   6.9f,   7.0f,   7.1f,   7.7f,
+       100.0f, 100.0f, 100.0f, 100.0f, 100.0f, 1000.0f},
+      {-0.5f, -0.5f, -0.5f, 0.0f, 0.5f, 1.0f,
+       1.5f,  2.0f,  2.5f,  3.0f, 3.5f, 4.0f,
+
+       6.0f,  6.5f,  7.0f,  7.0f, 7.0f, 7.0f,
+       7.0f,  7.0f,  7.0f,  7.0f, 7.0f, 7.0f});
+}
+
+TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs0) {
+  // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
+  // Scale: 1/4,  original zero point: 0.4, nudged to 0.
+  // Nudged ranges: [0.0; 63.75].
+  // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({4}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({4}), {-0.1f, 0.0f, 63.75f, 63.8f});
   // Min.
@@ -328,25 +655,40 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim1NudgedZeroIs0) {
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({4}));
-  FillValues<float>(&expected, {0.0f, 0.0f, 63.75f, 63.75f});
-  ExpectClose(expected, *output);
+  Tensor* output_bprop_wrt_input = GetOutput(0);
+  Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT, TensorShape({4}));
+  auto grad_flat = GetInput(0).flat<float>();
+  FillValues<float>(&expected_bprop_wrt_input,
+                    {0.0f, grad_flat(1), grad_flat(2), 0.0f});
+  ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
+
+  Tensor* output_bprop_wrt_min = GetOutput(1);
+  Tensor expected_bprop_wrt_min(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_min, {grad_flat(0), 0.0f, 0.0f, 0.0f});
+  ExpectClose(expected_bprop_wrt_min, *output_bprop_wrt_min);
+
+  Tensor* output_bprop_wrt_max = GetOutput(2);
+  Tensor expected_bprop_wrt_max(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_max, {0.0f, 0.0f, 0.0f, grad_flat(3)});
+  ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim1NudgedZeroIs1) {
+TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs1) {
   // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
   // Scale: 1/4,  original zero point: 0.5, nudged to 1.
   // Nudged ranges: [-0.25; 63.5].
   // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannel")
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({4}));
   // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({4}), {-0.26f, -0.25f, -0.24f, 63.6f});
+  AddInputFromArray<float>(TensorShape({4}), {-0.3f, -0.25f, 63.5f, 63.6f});
   // Min.
   AddInputFromArray<float>(TensorShape({4}),
                            {-0.125f, -0.125f, -0.125f, -0.125f});
@@ -357,27 +699,41 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim1NudgedZeroIs1) {
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({4}));
-  FillValues<float>(&expected, {-0.25f, -0.25f, -0.25f, 63.5f});
-  ExpectClose(expected, *output);
+  Tensor* output_bprop_wrt_input = GetOutput(0);
+  Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT, TensorShape({4}));
+  auto grad_flat = GetInput(0).flat<float>();
+  FillValues<float>(&expected_bprop_wrt_input,
+                    {0.0f, grad_flat(1), grad_flat(2), 0.0f});
+  ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
+
+  Tensor* output_bprop_wrt_min = GetOutput(1);
+  Tensor expected_bprop_wrt_min(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_min, {grad_flat(0), 0.0f, 0.0f, 0.0f});
+  ExpectClose(expected_bprop_wrt_min, *output_bprop_wrt_min);
+
+  Tensor* output_bprop_wrt_max = GetOutput(2);
+  Tensor expected_bprop_wrt_max(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_max, {0.0f, 0.0f, 0.0f, grad_flat(3)});
+  ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs0) {
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs0) {
   // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
   // Scale: 1/4,  original zero point: 0.4, nudged to 0.
   // Nudged ranges: [0.0; 63.75].
   // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannel")
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({2, 3}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.1f, 0.0f, 0.1f,
-                           0.25f, 63.75f, 63.8f});
+                           {-0.1f, 0.0f, 0.1f, 0.25f, 63.75f, 63.8f});
   // Min.
   AddInputFromArray<float>(TensorShape({3}), {-0.1f, -0.1f, -0.1f});
   // Max.
@@ -386,28 +742,42 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs0) {
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected, {0.0f, 0.0f, 0.0f,
-                                0.25f, 63.75f, 63.75f});
-  ExpectClose(expected, *output);
+  Tensor* output_bprop_wrt_input = GetOutput(0);
+  Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT, TensorShape({2, 3}));
+  auto grad_flat = GetInput(0).flat<float>();
+  FillValues<float>(
+      &expected_bprop_wrt_input,
+      {0.0f, grad_flat(1), grad_flat(2), grad_flat(3), grad_flat(4), 0.0f});
+  ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
+
+  Tensor* output_bprop_wrt_min = GetOutput(1);
+  Tensor expected_bprop_wrt_min(allocator(), DT_FLOAT, TensorShape({3}));
+  FillValues<float>(&expected_bprop_wrt_min, {grad_flat(0), 0.0f, 0.0f});
+  ExpectClose(expected_bprop_wrt_min, *output_bprop_wrt_min);
+
+  Tensor* output_bprop_wrt_max = GetOutput(2);
+  Tensor expected_bprop_wrt_max(allocator(), DT_FLOAT, TensorShape({3}));
+  FillValues<float>(&expected_bprop_wrt_max, {0.0f, 0.0f, grad_flat(5)});
+  ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs1) {
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs1) {
   // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
   // Scale: 1/4,  original zero point: 0.5, nudged to 1.
   // Nudged ranges: [-0.25; 63.5].
   // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannel")
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({2, 3}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.26f, -0.25f, -0.24f,
-                            0.0f, 63.5f, 63.6f});
+                           {-0.3f, -0.25f, -0.2f, 0.0f, 63.5f, 63.6f});
   // Min.
   AddInputFromArray<float>(TensorShape({3}), {-0.125f, -0.125f, -0.125f});
   // Max.
@@ -416,33 +786,46 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim2NudgedZeroIs1) {
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({2, 3}));
-  FillValues<float>(&expected, {-0.25f, -0.25f, -0.25f,
-                                0.0f, 63.5f, 63.5f});
-  ExpectClose(expected, *output);
+  Tensor* output_bprop_wrt_input = GetOutput(0);
+  Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT, TensorShape({2, 3}));
+  auto grad_flat = GetInput(0).flat<float>();
+  FillValues<float>(
+      &expected_bprop_wrt_input,
+      {0.0f, grad_flat(1), grad_flat(2), grad_flat(3), grad_flat(4), 0.0f});
+  ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
+
+  Tensor* output_bprop_wrt_min = GetOutput(1);
+  Tensor expected_bprop_wrt_min(allocator(), DT_FLOAT, TensorShape({3}));
+  FillValues<float>(&expected_bprop_wrt_min, {grad_flat(0), 0.0f, 0.0f});
+  ExpectClose(expected_bprop_wrt_min, *output_bprop_wrt_min);
+
+  Tensor* output_bprop_wrt_max = GetOutput(2);
+  Tensor expected_bprop_wrt_max(allocator(), DT_FLOAT, TensorShape({3}));
+  FillValues<float>(&expected_bprop_wrt_max, {0.0f, 0.0f, grad_flat(5)});
+  ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs0) {
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4GradientNudgedZeroIs0) {
   // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
   // Scale: 1/4,  original zero point: 0.4, nudged to 0.
   // Nudged ranges: [0.0; 63.75].
   // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannel")
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({1, 2, 3, 4}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({1, 2, 3, 4}),
-                           {-0.1f, 0.0f, 0.1f, 0.25f,
-                             0.5f, 0.75f, 1.0f, 1.25f,
-                             1.5f, 1.75f, 2.0f, 2.25f,
+                           {-0.1f,  0.0f,  63.75f, 63.8f, -0.1f,  0.0f,
+                            63.75f, 63.8f, -0.1f,  0.0f,  63.75f, 63.8f,
 
-                             63.0f,  63.25f, 63.5f,   63.7f,
-                             63.75f, 63.8f,  63.9f,  100.0f,
-                            100.0f, 100.0f, 100.0f, 1000.0f});
+                            -0.1f,  0.0f,  63.75f, 63.8f, -0.1f,  0.0f,
+                            63.75f, 63.8f, -0.1f,  0.0f,  63.75f, 63.8f});
   // Min.
   AddInputFromArray<float>(TensorShape({4}), {-0.1f, -0.1f, -0.1f, -0.1f});
   // Max.
@@ -451,39 +834,58 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs0) {
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({1, 2, 3, 4}));
-  FillValues<float>(&expected,
-                    {0.0f, 0.0f,  0.0f, 0.25f,
-                     0.5f, 0.75f, 1.0f, 1.25f,
-                     1.5f, 1.75f, 2.0f, 2.25f,
+  Tensor* output_bprop_wrt_input = GetOutput(0);
+  Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT,
+                                  TensorShape({1, 2, 3, 4}));
+  auto grad_flat = GetInput(0).flat<float>();
+  FillValues<float>(&expected_bprop_wrt_input,
+                    {0.0f, grad_flat(1),  grad_flat(2),  0.0f,
+                     0.0f, grad_flat(5),  grad_flat(6),  0.0f,
+                     0.0f, grad_flat(9),  grad_flat(10), 0.0f,
 
-                     63.0f,  63.25f, 63.5f,  63.75f,
-                     63.75f, 63.75f, 63.75f, 63.75f,
-                     63.75f, 63.75f, 63.75f, 63.75f});
-  ExpectClose(expected, *output);
+                     0.0f, grad_flat(13), grad_flat(14), 0.0f,
+                     0.0f, grad_flat(17), grad_flat(18), 0.0f,
+                     0.0f, grad_flat(21), grad_flat(22), 0.0f});
+  ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
+
+  Tensor* output_bprop_wrt_min = GetOutput(1);
+  Tensor expected_bprop_wrt_min(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_min,
+                    {grad_flat(0) + grad_flat(4) + grad_flat(8) +
+                         grad_flat(12) + grad_flat(16) + grad_flat(20),
+                     0.0f, 0.0f, 0.0f});
+  ExpectClose(expected_bprop_wrt_min, *output_bprop_wrt_min);
+
+  Tensor* output_bprop_wrt_max = GetOutput(2);
+  Tensor expected_bprop_wrt_max(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_max,
+                    {0.0f, 0.0f, 0.0f,
+                     grad_flat(3) + grad_flat(7) + grad_flat(11) +
+                         grad_flat(15) + grad_flat(19) + grad_flat(23)});
+  ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs1) {
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4GradientNudgedZeroIs1) {
   // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
   // Scale: 1/4,  original zero point: 0.5, nudged to 1.
   // Nudged ranges: [-0.25; 63.5].
   // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
-  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannel")
+  TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
+                   .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
+  // Upstream gradients.
+  AddRandomInput(TensorShape({1, 2, 3, 4}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({1, 2, 3, 4}),
-                           {-0.3f, -0.25f, -0.2f,  0.0f,
-                             0.25f, 0.5f,   0.75f, 1.0f,
-                             1.25f, 1.5f,   1.75f, 2.0f,
+                           {-0.3f, -0.25f, 63.5f, 63.6f,  -0.3f, -0.25f,
+                            63.5f, 63.6f,  -0.3f, -0.25f, 63.5f, 63.6f,
 
-                             63.0f,  63.25f, 63.4f,   63.5f,
-                             63.6f,  63.7f, 100.0f,  100.0f,
-                            100.0f, 100.0f, 100.0f, 1000.0f});
+                            -0.3f, -0.25f, 63.5f, 63.6f,  -0.3f, -0.25f,
+                            63.5f, 63.6f,  -0.3f, -0.25f, 63.5f, 63.6f});
   // Min.
   AddInputFromArray<float>(TensorShape({4}),
                            {-0.125f, -0.125f, -0.125f, -0.125f});
@@ -494,39 +896,58 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim4NudgedZeroIs1) {
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
 
-  Tensor* output = GetOutput(0);
-  Tensor expected(allocator(), DT_FLOAT, TensorShape({1, 2, 3, 4}));
-  FillValues<float>(&expected,
-                    {-0.25f, -0.25f, -0.25f, 0.0f,
-                      0.25f,  0.5f,   0.75f, 1.0f,
-                      1.25f,  1.5f,   1.75f, 2.0f,
+  Tensor* output_bprop_wrt_input = GetOutput(0);
+  Tensor expected_bprop_wrt_input(allocator(), DT_FLOAT,
+                                  TensorShape({1, 2, 3, 4}));
+  auto grad_flat = GetInput(0).flat<float>();
+  FillValues<float>(&expected_bprop_wrt_input,
+                    {0.0f, grad_flat(1),  grad_flat(2),  0.0f,
+                     0.0f, grad_flat(5),  grad_flat(6),  0.0f,
+                     0.0f, grad_flat(9),  grad_flat(10), 0.0f,
 
-                      63.0f, 63.25f, 63.5f, 63.5f,
-                      63.5f, 63.5f,  63.5f, 63.5f,
-                      63.5f, 63.5f,  63.5f, 63.5f});
-  ExpectClose(expected, *output);
+                     0.0f, grad_flat(13), grad_flat(14), 0.0f,
+                     0.0f, grad_flat(17), grad_flat(18), 0.0f,
+                     0.0f, grad_flat(21), grad_flat(22), 0.0f});
+  ExpectClose(expected_bprop_wrt_input, *output_bprop_wrt_input);
+
+  Tensor* output_bprop_wrt_min = GetOutput(1);
+  Tensor expected_bprop_wrt_min(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_min,
+                    {grad_flat(0) + grad_flat(4) + grad_flat(8) +
+                         grad_flat(12) + grad_flat(16) + grad_flat(20),
+                     0.0f, 0.0f, 0.0f});
+  ExpectClose(expected_bprop_wrt_min, *output_bprop_wrt_min);
+
+  Tensor* output_bprop_wrt_max = GetOutput(2);
+  Tensor expected_bprop_wrt_max(allocator(), DT_FLOAT, TensorShape({4}));
+  FillValues<float>(&expected_bprop_wrt_max,
+                    {0.0f, 0.0f, 0.0f,
+                     grad_flat(3) + grad_flat(7) + grad_flat(11) +
+                         grad_flat(15) + grad_flat(19) + grad_flat(23)});
+  ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs0) {
-  // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
-  // Scale: 1/4,  original zero point: 0.4, nudged to 0.
-  // Nudged ranges: [0.0; 63.75].
-  // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
+TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
   TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
                    .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
   // Upstream gradients.
   AddRandomInput(TensorShape({4}));
   // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({4}), {-0.1f, 0.0f, 63.75f, 63.8f});
+  AddInputFromArray<float>(TensorShape({4}), {-0.1f, 0.0f, 7.5f, 7.6f});
   // Min.
   AddInputFromArray<float>(TensorShape({4}), {-0.1f, -0.1f, -0.1f, -0.1f});
   // Max.
-  AddInputFromArray<float>(TensorShape({4}), {63.65f, 63.65f, 63.65f, 63.65f});
+  AddInputFromArray<float>(TensorShape({4}), {7.4f, 7.4f, 7.4f, 7.4f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
@@ -551,28 +972,27 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs0) {
   ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs1) {
-  // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
-  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
-  // Nudged ranges: [-0.25; 63.5].
-  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
   TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
                    .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
   // Upstream gradients.
   AddRandomInput(TensorShape({4}));
   // Downstream inputs.
-  AddInputFromArray<float>(TensorShape({4}), {-0.3f, -0.25f, 63.5f, 63.6f});
+  AddInputFromArray<float>(TensorShape({4}), {-0.6f, -0.5f, 7.0f, 7.1f});
   // Min.
-  AddInputFromArray<float>(TensorShape({4}),
-                           {-0.125f, -0.125f, -0.125f, -0.125f});
+  AddInputFromArray<float>(TensorShape({4}), {-0.4f, -0.4f, -0.4f, -0.4f});
   // Max.
-  AddInputFromArray<float>(TensorShape({4}),
-                           {63.625f, 63.625f, 63.625f, 63.625f});
+  AddInputFromArray<float>(TensorShape({4}), {7.1f, 7.1f, 7.1f, 7.1f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
@@ -597,28 +1017,28 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim1GradientNudgedZeroIs1) {
   ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs0) {
-  // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
-  // Scale: 1/4,  original zero point: 0.4, nudged to 0.
-  // Nudged ranges: [0.0; 63.75].
-  // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
   TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
                    .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
   // Upstream gradients.
   AddRandomInput(TensorShape({2, 3}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.1f, 0.0f, 0.1f,
-                            0.25f, 63.75f, 63.8f});
+                           {-0.1f, 0.0f, 0.1f, 0.5f, 7.5f, 7.6f});
   // Min.
   AddInputFromArray<float>(TensorShape({3}), {-0.1f, -0.1f, -0.1f});
   // Max.
-  AddInputFromArray<float>(TensorShape({3}), {63.65f, 63.65f, 63.65f});
+  AddInputFromArray<float>(TensorShape({3}), {7.4f, 7.4f, 7.4f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
@@ -644,28 +1064,28 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs0) {
   ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs1) {
-  // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
-  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
-  // Nudged ranges: [-0.25; 63.5].
-  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
   TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
                    .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
   // Upstream gradients.
   AddRandomInput(TensorShape({2, 3}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({2, 3}),
-                           {-0.3f, -0.25f, -0.2f,
-                            0.0f, 63.5f, 63.6f});
+                           {-0.6f, -0.5f, -0.4f, 0.0f, 7.0f, 7.1f});
   // Min.
-  AddInputFromArray<float>(TensorShape({3}), {-0.125f, -0.125f, -0.125f});
+  AddInputFromArray<float>(TensorShape({3}), {-0.4f, -0.4f, -0.4f});
   // Max.
-  AddInputFromArray<float>(TensorShape({3}), {63.625f, 63.625f, 63.625f});
+  AddInputFromArray<float>(TensorShape({3}), {7.1f, 7.1f, 7.1f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
@@ -691,33 +1111,32 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim2GradientNudgedZeroIs1) {
   ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim4GradientNudgedZeroIs0) {
-  // Original quantization ranges: [-0.4 / 4 + 0 / 4, -0.4 / 4 + 255 / 4].
-  // Scale: 1/4,  original zero point: 0.4, nudged to 0.
-  // Nudged ranges: [0.0; 63.75].
-  // Expected quantized values: 0.0, 0.25, 0.5, ..., 63.75.
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4GradientNudgedZeroIs0_4Bits) {
+  // Original quantization range: [-0.2 / 2 + 0 / 2, -0.2 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.2, nudged to 0.
+  // Nudged range: [0.0; 7.5].
+  // Expected quantized values: 0.0, 0.5, ..., 7.5.
   TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
                    .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
   // Upstream gradients.
   AddRandomInput(TensorShape({1, 2, 3, 4}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({1, 2, 3, 4}),
-                           {-0.1f, 0.0f, 63.75f, 63.8f,
-                            -0.1f, 0.0f, 63.75f, 63.8f,
-                            -0.1f, 0.0f, 63.75f, 63.8f,
+                           {-0.1f, 0.0f, 7.5f,  7.6f, -0.1f, 0.0f,
+                            7.5f,  7.6f, -0.1f, 0.0f, 7.5f,  7.6f,
 
-                            -0.1f, 0.0f, 63.75f, 63.8f,
-                            -0.1f, 0.0f, 63.75f, 63.8f,
-                            -0.1f, 0.0f, 63.75f, 63.8f});
+                            -0.1f, 0.0f, 7.5f,  7.6f, -0.1f, 0.0f,
+                            7.5f,  7.6f, -0.1f, 0.0f, 7.5f,  7.6f});
   // Min.
   AddInputFromArray<float>(TensorShape({4}), {-0.1f, -0.1f, -0.1f, -0.1f});
   // Max.
-  AddInputFromArray<float>(TensorShape({4}), {63.65f, 63.65f, 63.65f, 63.65f});
+  AddInputFromArray<float>(TensorShape({4}), {7.4f, 7.4f, 7.4f, 7.4f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
@@ -754,35 +1173,32 @@ TEST_F(QuantOpsTest, WithVarsPerChannelDim4GradientNudgedZeroIs0) {
   ExpectClose(expected_bprop_wrt_max, *output_bprop_wrt_max);
 }
 
-TEST_F(QuantOpsTest, WithVarsPerChannelDim4GradientNudgedZeroIs1) {
-  // Original quantization ranges: [-0.5 / 4 + 0 / 4, -0.5 / 4 + 255 / 4].
-  // Scale: 1/4,  original zero point: 0.5, nudged to 1.
-  // Nudged ranges: [-0.25; 63.5].
-  // Expected quantized values: -0.25, 0.0, 0.25, ..., 63.5.
+TEST_F(QuantOpsTest, WithVarsPerChannelDim4GradientNudgedZeroIs1_4Bits) {
+  // Original quantization range: [-0.8 / 2 + 0 / 2, -0.8 / 2 + 15 / 2].
+  // Scale: 1/2,  original zero point: 0.8, nudged to 1.
+  // Nudged range: [-0.5; 7.0].
+  // Expected quantized values: -0.5, 0.0, 0.5, ..., 7.0.
   TF_EXPECT_OK(NodeDefBuilder("op", "FakeQuantWithMinMaxVarsPerChannelGradient")
                    .Input(FakeInput(DT_FLOAT))  // gradients
                    .Input(FakeInput(DT_FLOAT))  // inputs
                    .Input(FakeInput(DT_FLOAT))  // min
                    .Input(FakeInput(DT_FLOAT))  // max
+                   .Attr("num_bits", 4)
                    .Finalize(node_def()));
   TF_EXPECT_OK(InitOp());
   // Upstream gradients.
   AddRandomInput(TensorShape({1, 2, 3, 4}));
   // Downstream inputs.
   AddInputFromArray<float>(TensorShape({1, 2, 3, 4}),
-                           {-0.3f, -0.25f, 63.5f, 63.6f,
-                            -0.3f, -0.25f, 63.5f, 63.6f,
-                            -0.3f, -0.25f, 63.5f, 63.6f,
+                           {-0.6f, -0.5f, 7.0f,  7.1f,  -0.6f, -0.5f,
+                            7.0f,  7.1f,  -0.6f, -0.5f, 7.0f,  7.1f,
 
-                            -0.3f, -0.25f, 63.5f, 63.6f,
-                            -0.3f, -0.25f, 63.5f, 63.6f,
-                            -0.3f, -0.25f, 63.5f, 63.6f});
+                            -0.6f, -0.5f, 7.0f,  7.1f,  -0.6f, -0.5f,
+                            7.0f,  7.1f,  -0.6f, -0.5f, 7.0f,  7.1f});
   // Min.
-  AddInputFromArray<float>(TensorShape({4}),
-                           {-0.125f, -0.125f, -0.125f, -0.125f});
+  AddInputFromArray<float>(TensorShape({4}), {-0.4f, -0.4f, -0.4f, -0.4f});
   // Max.
-  AddInputFromArray<float>(TensorShape({4}),
-                           {63.625f, 63.625f, 63.625f, 63.625f});
+  AddInputFromArray<float>(TensorShape({4}), {7.1f, 7.1f, 7.1f, 7.1f});
 
   // Tested code.
   TF_ASSERT_OK(RunOpKernel());
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e540ecfa8d..19087a4afd 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -4839,6 +4839,7 @@ output: A new tensor with the given shape and updates applied according
 REGISTER_OP("FakeQuantWithMinMaxArgs")
     .Attr("min: float = -6.0")
     .Attr("max: float = 6.0")
+    .Attr("num_bits: int = 8")
     .Input("inputs: float")
     .Output("outputs: float")
     .SetShapeFn(shape_inference::UnchangedShape)
@@ -4848,6 +4849,7 @@ Fake-quantize the 'inputs' tensor, type float to 'outputs' tensor of same type.
 Attributes [min; max] define the clamping range for the 'inputs' data.  Op
 divides this range into 255 steps (total of 256 values), then replaces each
 'inputs' value with the closest of the quantized step values.
+'num_bits' is the bitwidth of the quantization; between 2 and 8, inclusive.
 
 Quantization is called fake since the output is still in floating point.
 )doc");
@@ -4855,6 +4857,7 @@ Quantization is called fake since the output is still in floating point.
 REGISTER_OP("FakeQuantWithMinMaxArgsGradient")
     .Attr("min: float = -6.0")
     .Attr("max: float = 6.0")
+    .Attr("num_bits: int = 8")
     .Input("gradients: float")
     .Input("inputs: float")
     .Output("backprops: float")
@@ -4869,6 +4872,7 @@ backprops: Backpropagated gradients below the FakeQuantWithMinMaxArgs operation:
 )doc");
 
 REGISTER_OP("FakeQuantWithMinMaxVars")
+    .Attr("num_bits: int = 8")
     .Input("inputs: float")
     .Input("min: float")
     .Input("max: float")
@@ -4887,11 +4891,13 @@ and `max` to 'outputs' tensor of same shape as `inputs`.
 [min; max] is the clamping range for the 'inputs' data.  Op divides this range
 into 255 steps (total of 256 values), then replaces each 'inputs' value with the
 closest of the quantized step values.
+'num_bits' is the bitwidth of the quantization; between 2 and 8, inclusive.
 
 This operation has a gradient and thus allows for training `min` and `max` values.
 )doc");
 
 REGISTER_OP("FakeQuantWithMinMaxVarsGradient")
+    .Attr("num_bits: int = 8")
     .Input("gradients: float")
     .Input("inputs: float")
     .Input("min: float")
@@ -4920,6 +4926,7 @@ Compute gradients for a FakeQuantWithMinMaxVars operation.
 gradients: Backpropagated gradients above the FakeQuantWithMinMaxVars operation.
 inputs: Values passed as inputs to the FakeQuantWithMinMaxVars operation.
 min, max: Quantization interval, scalar floats.
+num_bits: The bitwidth of the quantization; between 2 and 8, inclusive.
 backprops_wrt_input: Backpropagated gradients w.r.t. inputs:
   `gradients * (inputs >= min && inputs <= max)`.
 backprop_wrt_min: Backpropagated gradients w.r.t. min parameter:
@@ -4929,6 +4936,7 @@ backprop_wrt_max: Backpropagated gradients w.r.t. max parameter:
 )doc");
 
 REGISTER_OP("FakeQuantWithMinMaxVarsPerChannel")
+    .Attr("num_bits: int = 8")
     .Input("inputs: float")
     .Input("min: float")
     .Input("max: float")
@@ -4955,11 +4963,13 @@ to 'outputs' tensor of same shape as `inputs`.
 [min; max] is the clamping range for the 'inputs' data in the corresponding
 depth channel.  Op divides this range into 255 steps (total of 256 values), then
 replaces each 'inputs' value with the closest of the quantized step values.
+'num_bits' is the bitwidth of the quantization; between 2 and 8, inclusive.
 
 This operation has a gradient and thus allows for training `min` and `max` values.
 )doc");
 
 REGISTER_OP("FakeQuantWithMinMaxVarsPerChannelGradient")
+    .Attr("num_bits: int = 8")
     .Input("gradients: float")
     .Input("inputs: float")
     .Input("min: float")
@@ -4993,6 +5003,7 @@ gradients: Backpropagated gradients above the FakeQuantWithMinMaxVars operation,
 inputs: Values passed as inputs to the FakeQuantWithMinMaxVars operation, shape
   same as `gradients`.
 min, max: Quantization interval, floats of shape `[d]`.
+num_bits: The bitwidth of the quantization; between 2 and 8, inclusive.
 backprops_wrt_input: Backpropagated gradients w.r.t. inputs, shape same as
   `inputs`:
     `gradients * (inputs >= min && inputs <= max)`.
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index a8d3dd65c7..c3c4145763 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -890,27 +890,27 @@ tf_module {
   }
   member_method {
     name: "fake_quant_with_min_max_args"
-    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'num_bits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
   }
   member_method {
     name: "fake_quant_with_min_max_args_gradient"
-    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\'], "
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'num_bits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\'], "
   }
   member_method {
     name: "fake_quant_with_min_max_vars"
-    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'num_bits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
   }
   member_method {
     name: "fake_quant_with_min_max_vars_gradient"
-    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'num_bits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
   }
   member_method {
     name: "fake_quant_with_min_max_vars_per_channel"
-    argspec: "args=[\'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+    argspec: "args=[\'inputs\', \'min\', \'max\', \'num_bits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
   }
   member_method {
     name: "fake_quant_with_min_max_vars_per_channel_gradient"
-    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+    argspec: "args=[\'gradients\', \'inputs\', \'min\', \'max\', \'num_bits\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
   }
   member_method {
     name: "fft"
-- 
GitLab


From 6a1825e2369d2537e15dc585705c53c4b763f3f6 Mon Sep 17 00:00:00 2001
From: admcrae <admcrae6@gmail.com>
Date: Wed, 26 Apr 2017 22:32:51 -0400
Subject: [PATCH 0731/1563] Implement atan2 (#9276)

* Add atan2 ops.

* Correct arguments from copied code.

* Fixed CUDA define, changes arguments and docstring.

* Added some tests for atan2.

* Fixed inf for python 2.

* Add atan2 to public API.

* Modify argument names and docstring.
---
 tensorflow/core/kernels/cwise_op_atan2.cc     | 23 ++++++++++++++++
 .../core/kernels/cwise_op_gpu_atan2.cu.cc     | 26 +++++++++++++++++++
 tensorflow/core/kernels/cwise_ops.h           | 16 ++++++++++++
 tensorflow/core/ops/math_ops.cc               | 15 +++++++++++
 .../python/kernel_tests/cwise_ops_test.py     | 25 ++++++++++++++++++
 tensorflow/python/ops/math_grad.py            | 10 +++++++
 tensorflow/python/ops/math_ops.py             |  1 +
 tensorflow/tools/api/golden/tensorflow.pbtxt  |  4 +++
 8 files changed, 120 insertions(+)
 create mode 100644 tensorflow/core/kernels/cwise_op_atan2.cc
 create mode 100644 tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc

diff --git a/tensorflow/core/kernels/cwise_op_atan2.cc b/tensorflow/core/kernels/cwise_op_atan2.cc
new file mode 100644
index 0000000000..5232737857
--- /dev/null
+++ b/tensorflow/core/kernels/cwise_op_atan2.cc
@@ -0,0 +1,23 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/cwise_ops_common.h"
+
+namespace tensorflow {
+REGISTER2(BinaryOp, CPU, "Atan2", functor::atan2, float, double);
+#if GOOGLE_CUDA
+REGISTER2(BinaryOp, GPU, "Atan2", functor::atan2, float, double);
+#endif
+}  // namespace tensorflow
\ No newline at end of file
diff --git a/tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc b/tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc
new file mode 100644
index 0000000000..0f327eaf6c
--- /dev/null
+++ b/tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc
@@ -0,0 +1,26 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#if GOOGLE_CUDA
+
+#include "tensorflow/core/kernels/cwise_ops_gpu_common.cu.h"
+
+namespace tensorflow {
+namespace functor {
+DEFINE_BINARY2(atan2, float, double);
+}  // namespace functor
+}  // namespace tensorflow
+
+#endif  // GOOGLE_CUDA
\ No newline at end of file
diff --git a/tensorflow/core/kernels/cwise_ops.h b/tensorflow/core/kernels/cwise_ops.h
index fb4c649a82..423307fd4c 100644
--- a/tensorflow/core/kernels/cwise_ops.h
+++ b/tensorflow/core/kernels/cwise_ops.h
@@ -658,6 +658,22 @@ struct zeta : base<T, Eigen::internal::scalar_zeta_op<T>> {};
 template <typename T>
 struct polygamma : base<T, Eigen::internal::scalar_polygamma_op<T>> {};
 
+template <typename Scalar>
+struct scalar_atan2_op {
+  EIGEN_EMPTY_STRUCT_CTOR(scalar_atan2_op)
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar
+  operator()(const Scalar& y, const Scalar& x) const {
+#if GOOGLE_CUDA
+    return ::atan2(y, x);
+#else
+    return std::atan2(y, x);
+#endif
+  }
+};
+
+template <typename T>
+struct atan2 : base<T, scalar_atan2_op<T>> {};
+
 template <typename T>
 struct squared_difference
     : base<T, Eigen::internal::scalar_compose_op<
diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index 0942e8ae75..8e762274c9 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -732,6 +732,21 @@ The polygamma function is defined as:
 where \\(\psi(x)\\) is the digamma function.
 )doc");
 
+REGISTER_OP("Atan2")
+    .Input("y: T")
+    .Input("x: T")
+    .Output("z: T")
+    .Attr("T: {float, double}")
+    .SetShapeFn(shape_inference::BroadcastBinaryOpShapeFn)
+    .Doc(R"doc(
+Computes arctangent of `y/x` element-wise, respecting signs of the arguments.
+This is the angle \( \theta \in [-\pi, \pi] \) such that
+\[ x = r \cos(\theta) \]
+and
+\[ y = r \sin(\theta) \]
+where \(r = \sqrt(x^2 + y^2) \).
+)doc");
+
 REGISTER_OP("Betainc")
     .Input("a: T")
     .Input("b: T")
diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py
index cd0d33ecf3..2f2f1da090 100644
--- a/tensorflow/python/kernel_tests/cwise_ops_test.py
+++ b/tensorflow/python/kernel_tests/cwise_ops_test.py
@@ -615,6 +615,13 @@ class BinaryOpTest(test.TestCase):
     self._compareBoth(x, y, np.multiply, _MUL)
     self._compareBoth(x, y + 0.1, np.true_divide, _TRUEDIV)
     self._compareBoth(x, y + 0.1, np.floor_divide, _FLOORDIV)
+    self._compareBoth(x, y, np.arctan2, math_ops.atan2)
+    x1 = np.random.randn(5, 6).astype(np.float32)
+    x2 = np.random.randn(5, 6).astype(np.float32)
+    # Remove tiny values--atan2 gradients are flaky near the origin.
+    x1[np.abs(x1) < 0.05] = 0.05 * np.sign(x1[np.abs(x1) < 0.05])
+    x2[np.abs(x2) < 0.05] = 0.05 * np.sign(x2[np.abs(x2) < 0.05])
+    self._compareBoth(x1, x2, np.arctan2, math_ops.atan2)
     try:
       from scipy import special  # pylint: disable=g-import-not-at-top
       a_pos_small = np.linspace(0.1, 2, 15).reshape(1, 3, 5).astype(np.float32)
@@ -672,6 +679,13 @@ class BinaryOpTest(test.TestCase):
     self._compareBoth(x, y, np.multiply, _MUL)
     self._compareBoth(x, y + 0.1, np.true_divide, _TRUEDIV)
     self._compareBoth(x, y + 0.1, np.floor_divide, _FLOORDIV)
+    self._compareBoth(x, y, np.arctan2, math_ops.atan2)
+    x1 = np.random.randn(7, 4).astype(np.float64)
+    x2 = np.random.randn(7, 4).astype(np.float64)
+    # Remove tiny values--atan2 gradients are flaky near the origin.
+    x1[np.abs(x1) < 0.5] = 0.5 * np.sign(x1[np.abs(x1) < 0.5])
+    x2[np.abs(x2) < 0.5] = 0.5 * np.sign(x2[np.abs(x2) < 0.5])
+    self._compareBoth(x1, x2, np.arctan2, math_ops.atan2)
     try:
       from scipy import special  # pylint: disable=g-import-not-at-top
       a_pos_small = np.linspace(0.1, 2, 15).reshape(1, 3, 5).astype(np.float32)
@@ -1090,6 +1104,17 @@ class BinaryOpTest(test.TestCase):
           error = gradient_checker.compute_gradient_error(y, [], z, [])
           self.assertLess(error, 2e-4)
 
+  def testAtan2SpecialValues(self):
+    x1l, x2l = zip((+0.0, +0.0), (+0.0, -0.0), (-0.0, +0.0), (-0.0, -0.0),
+                    (1.2345, float('inf')), (1.2345, -float('inf')),
+                    (-4.321, float('inf')), (-4.125, -float('inf')),
+                    (float('inf'), float('inf')), (float('inf'), -float('inf')),
+                    (-float('inf'), float('inf')), (-float('inf'), -float('inf')))
+    for dtype in np.float32, np.float64:
+      x1 = np.array(x1l).astype(dtype)
+      x2 = np.array(x2l).astype(dtype)
+      self._compareCpu(x1, x2, np.arctan2, math_ops.atan2)
+      self._compareGpu(x1, x2, np.arctan2, math_ops.atan2)
 
 class ComparisonOpTest(test.TestCase):
 
diff --git a/tensorflow/python/ops/math_grad.py b/tensorflow/python/ops/math_grad.py
index 409e3c5111..024158e709 100644
--- a/tensorflow/python/ops/math_grad.py
+++ b/tensorflow/python/ops/math_grad.py
@@ -613,6 +613,16 @@ def _AtanGrad(op, grad):
     return grad * inv
 
 
+@ops.RegisterGradient("Atan2")
+def _Atan2Grad(op, grad):
+  """Returns grad * x / (x^2 + y^2), grad * -y / (x^2 + y^2)."""
+  y = op.inputs[0]
+  x = op.inputs[1]
+  with ops.control_dependencies([grad.op]):
+    grad_inv = grad / (math_ops.square(x) + math_ops.square(y))
+    return x * grad_inv, -y * grad_inv
+
+
 @ops.RegisterGradient("AddN")
 def _AddNGrad(op, grad):
   """Copies the gradient to all inputs."""
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 5f4ce63f31..61797f0175 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -56,6 +56,7 @@ See the @{$python/math_ops} guide.
 @@acos
 @@asin
 @@atan
+@@atan2
 @@lgamma
 @@digamma
 @@erf
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index a8d3dd65c7..b51b0bf4af 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -636,6 +636,10 @@ tf_module {
     name: "atan"
     argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
+  member_method {
+    name: "atan2"
+    argspec: "args=[\'x1\', \'x2\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "batch_to_space"
     argspec: "args=[\'input\', \'crops\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-- 
GitLab


From 5bb419792eb54c512f5b3e96660150a28ef7403e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 18:49:48 -0800
Subject: [PATCH 0732/1563] Update ops-related pbtxt files. Change: 154378722

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 196 ++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |  50 ++++-
 2 files changed, 243 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index dfec411ca5..5d55edc68c 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -7251,6 +7251,67 @@ op {
     }
   }
 }
+op {
+  name: "FakeQuantWithMinMaxArgs"
+  input_arg {
+    name: "inputs"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "outputs"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "min"
+    type: "float"
+    default_value {
+      f: -6
+    }
+  }
+  attr {
+    name: "max"
+    type: "float"
+    default_value {
+      f: 6
+    }
+  }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
+}
+op {
+  name: "FakeQuantWithMinMaxArgsGradient"
+  input_arg {
+    name: "gradients"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "inputs"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "backprops"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "min"
+    type: "float"
+    default_value {
+      f: -6
+    }
+  }
+  attr {
+    name: "max"
+    type: "float"
+    default_value {
+      f: 6
+    }
+  }
+}
 op {
   name: "FakeQuantWithMinMaxArgsGradient"
   input_arg {
@@ -7279,6 +7340,13 @@ op {
       f: 6
     }
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
 }
 op {
   name: "FakeQuantWithMinMaxVars"
@@ -7299,6 +7367,63 @@ op {
     type: DT_FLOAT
   }
 }
+op {
+  name: "FakeQuantWithMinMaxVars"
+  input_arg {
+    name: "inputs"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "min"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "max"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "outputs"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
+}
+op {
+  name: "FakeQuantWithMinMaxVarsGradient"
+  input_arg {
+    name: "gradients"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "inputs"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "min"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "max"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "backprops_wrt_input"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "backprop_wrt_min"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "backprop_wrt_max"
+    type: DT_FLOAT
+  }
+}
 op {
   name: "FakeQuantWithMinMaxVarsGradient"
   input_arg {
@@ -7329,6 +7454,32 @@ op {
     name: "backprop_wrt_max"
     type: DT_FLOAT
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
+}
+op {
+  name: "FakeQuantWithMinMaxVarsPerChannel"
+  input_arg {
+    name: "inputs"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "min"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "max"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "outputs"
+    type: DT_FLOAT
+  }
 }
 op {
   name: "FakeQuantWithMinMaxVarsPerChannel"
@@ -7348,6 +7499,13 @@ op {
     name: "outputs"
     type: DT_FLOAT
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
 }
 op {
   name: "FakeQuantWithMinMaxVarsPerChannelGradient"
@@ -7380,6 +7538,44 @@ op {
     type: DT_FLOAT
   }
 }
+op {
+  name: "FakeQuantWithMinMaxVarsPerChannelGradient"
+  input_arg {
+    name: "gradients"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "inputs"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "min"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "max"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "backprops_wrt_input"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "backprop_wrt_min"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "backprop_wrt_max"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
+}
 op {
   name: "FakeQueue"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index bd90336e6d..7cabdccb29 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -7420,8 +7420,15 @@ op {
       f: 6
     }
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
   summary: "Fake-quantize the \'inputs\' tensor, type float to \'outputs\' tensor of same type."
-  description: "Attributes [min; max] define the clamping range for the \'inputs\' data.  Op\ndivides this range into 255 steps (total of 256 values), then replaces each\n\'inputs\' value with the closest of the quantized step values.\n\nQuantization is called fake since the output is still in floating point."
+  description: "Attributes [min; max] define the clamping range for the \'inputs\' data.  Op\ndivides this range into 255 steps (total of 256 values), then replaces each\n\'inputs\' value with the closest of the quantized step values.\n\'num_bits\' is the bitwidth of the quantization; between 2 and 8, inclusive.\n\nQuantization is called fake since the output is still in floating point."
 }
 op {
   name: "FakeQuantWithMinMaxArgsGradient"
@@ -7454,6 +7461,13 @@ op {
       f: 6
     }
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
   summary: "Compute gradients for a FakeQuantWithMinMaxArgs operation."
 }
 op {
@@ -7474,8 +7488,15 @@ op {
     name: "outputs"
     type: DT_FLOAT
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
   summary: "Fake-quantize the \'inputs\' tensor of type float via global float scalars `min`"
-  description: "and `max` to \'outputs\' tensor of same shape as `inputs`.\n\n[min; max] is the clamping range for the \'inputs\' data.  Op divides this range\ninto 255 steps (total of 256 values), then replaces each \'inputs\' value with the\nclosest of the quantized step values.\n\nThis operation has a gradient and thus allows for training `min` and `max` values."
+  description: "and `max` to \'outputs\' tensor of same shape as `inputs`.\n\n[min; max] is the clamping range for the \'inputs\' data.  Op divides this range\ninto 255 steps (total of 256 values), then replaces each \'inputs\' value with the\nclosest of the quantized step values.\n\'num_bits\' is the bitwidth of the quantization; between 2 and 8, inclusive.\n\nThis operation has a gradient and thus allows for training `min` and `max` values."
 }
 op {
   name: "FakeQuantWithMinMaxVarsGradient"
@@ -7512,6 +7533,14 @@ op {
     description: "Backpropagated gradients w.r.t. max parameter:\n`sum(gradients * (inputs > max))`."
     type: DT_FLOAT
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+    description: "The bitwidth of the quantization; between 2 and 8, inclusive."
+  }
   summary: "Compute gradients for a FakeQuantWithMinMaxVars operation."
 }
 op {
@@ -7532,8 +7561,15 @@ op {
     name: "outputs"
     type: DT_FLOAT
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+  }
   summary: "Fake-quantize the \'inputs\' tensor of type float and one of the shapes: `[d]`,"
-  description: "`[b, d]` `[b, h, w, d]` via per-channel floats `min` and `max` of shape `[d]`\nto \'outputs\' tensor of same shape as `inputs`.\n\n[min; max] is the clamping range for the \'inputs\' data in the corresponding\ndepth channel.  Op divides this range into 255 steps (total of 256 values), then\nreplaces each \'inputs\' value with the closest of the quantized step values.\n\nThis operation has a gradient and thus allows for training `min` and `max` values."
+  description: "`[b, d]` `[b, h, w, d]` via per-channel floats `min` and `max` of shape `[d]`\nto \'outputs\' tensor of same shape as `inputs`.\n\n[min; max] is the clamping range for the \'inputs\' data in the corresponding\ndepth channel.  Op divides this range into 255 steps (total of 256 values), then\nreplaces each \'inputs\' value with the closest of the quantized step values.\n\'num_bits\' is the bitwidth of the quantization; between 2 and 8, inclusive.\n\nThis operation has a gradient and thus allows for training `min` and `max` values."
 }
 op {
   name: "FakeQuantWithMinMaxVarsPerChannelGradient"
@@ -7570,6 +7606,14 @@ op {
     description: "Backpropagated gradients w.r.t. max parameter, shape `[d]`:\n`sum_per_d(gradients * (inputs > max))`."
     type: DT_FLOAT
   }
+  attr {
+    name: "num_bits"
+    type: "int"
+    default_value {
+      i: 8
+    }
+    description: "The bitwidth of the quantization; between 2 and 8, inclusive."
+  }
   summary: "Compute gradients for a FakeQuantWithMinMaxVarsPerChannel operation."
 }
 op {
-- 
GitLab


From 24316aa70c1c72eae0228771073f4c519488dd21 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 18:55:14 -0800
Subject: [PATCH 0733/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154378999

---
 tensorflow/go/op/wrappers.go | 95 ++++++++++++++++++++++++++++++++++--
 1 file changed, 91 insertions(+), 4 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 4dc4b40e97..ab9331638b 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -195,6 +195,19 @@ func VarHandleOp(scope *Scope, dtype tf.DataType, shape tf.Shape, optional ...Va
 	return op.Output(0)
 }
 
+// FakeQuantWithMinMaxVarsPerChannelGradientAttr is an optional argument to FakeQuantWithMinMaxVarsPerChannelGradient.
+type FakeQuantWithMinMaxVarsPerChannelGradientAttr func(optionalAttr)
+
+// FakeQuantWithMinMaxVarsPerChannelGradientNumBits sets the optional num_bits attribute to value.
+//
+// value: The bitwidth of the quantization; between 2 and 8, inclusive.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxVarsPerChannelGradientNumBits(value int64) FakeQuantWithMinMaxVarsPerChannelGradientAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
+	}
+}
+
 // Compute gradients for a FakeQuantWithMinMaxVarsPerChannel operation.
 //
 // Arguments:
@@ -211,20 +224,36 @@ func VarHandleOp(scope *Scope, dtype tf.DataType, shape tf.Shape, optional ...Va
 //   `gradients * (inputs >= min && inputs <= max)`.Backpropagated gradients w.r.t. min parameter, shape `[d]`:
 // `sum_per_d(gradients * (inputs < min))`.Backpropagated gradients w.r.t. max parameter, shape `[d]`:
 // `sum_per_d(gradients * (inputs > max))`.
-func FakeQuantWithMinMaxVarsPerChannelGradient(scope *Scope, gradients tf.Output, inputs tf.Output, min tf.Output, max tf.Output) (backprops_wrt_input tf.Output, backprop_wrt_min tf.Output, backprop_wrt_max tf.Output) {
+func FakeQuantWithMinMaxVarsPerChannelGradient(scope *Scope, gradients tf.Output, inputs tf.Output, min tf.Output, max tf.Output, optional ...FakeQuantWithMinMaxVarsPerChannelGradientAttr) (backprops_wrt_input tf.Output, backprop_wrt_min tf.Output, backprop_wrt_max tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
 		Type: "FakeQuantWithMinMaxVarsPerChannelGradient",
 		Input: []tf.Input{
 			gradients, inputs, min, max,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
+// FakeQuantWithMinMaxVarsAttr is an optional argument to FakeQuantWithMinMaxVars.
+type FakeQuantWithMinMaxVarsAttr func(optionalAttr)
+
+// FakeQuantWithMinMaxVarsNumBits sets the optional num_bits attribute to value.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxVarsNumBits(value int64) FakeQuantWithMinMaxVarsAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
+	}
+}
+
 // Fake-quantize the 'inputs' tensor of type float via global float scalars `min`
 //
 // and `max` to 'outputs' tensor of same shape as `inputs`.
@@ -232,17 +261,23 @@ func FakeQuantWithMinMaxVarsPerChannelGradient(scope *Scope, gradients tf.Output
 // [min; max] is the clamping range for the 'inputs' data.  Op divides this range
 // into 255 steps (total of 256 values), then replaces each 'inputs' value with the
 // closest of the quantized step values.
+// 'num_bits' is the bitwidth of the quantization; between 2 and 8, inclusive.
 //
 // This operation has a gradient and thus allows for training `min` and `max` values.
-func FakeQuantWithMinMaxVars(scope *Scope, inputs tf.Output, min tf.Output, max tf.Output) (outputs tf.Output) {
+func FakeQuantWithMinMaxVars(scope *Scope, inputs tf.Output, min tf.Output, max tf.Output, optional ...FakeQuantWithMinMaxVarsAttr) (outputs tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
 		Type: "FakeQuantWithMinMaxVars",
 		Input: []tf.Input{
 			inputs, min, max,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -3514,11 +3549,20 @@ func FakeQuantWithMinMaxArgsMax(value float32) FakeQuantWithMinMaxArgsAttr {
 	}
 }
 
+// FakeQuantWithMinMaxArgsNumBits sets the optional num_bits attribute to value.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxArgsNumBits(value int64) FakeQuantWithMinMaxArgsAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
+	}
+}
+
 // Fake-quantize the 'inputs' tensor, type float to 'outputs' tensor of same type.
 //
 // Attributes [min; max] define the clamping range for the 'inputs' data.  Op
 // divides this range into 255 steps (total of 256 values), then replaces each
 // 'inputs' value with the closest of the quantized step values.
+// 'num_bits' is the bitwidth of the quantization; between 2 and 8, inclusive.
 //
 // Quantization is called fake since the output is still in floating point.
 func FakeQuantWithMinMaxArgs(scope *Scope, inputs tf.Output, optional ...FakeQuantWithMinMaxArgsAttr) (outputs tf.Output) {
@@ -5618,6 +5662,14 @@ func FakeQuantWithMinMaxArgsGradientMax(value float32) FakeQuantWithMinMaxArgsGr
 	}
 }
 
+// FakeQuantWithMinMaxArgsGradientNumBits sets the optional num_bits attribute to value.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxArgsGradientNumBits(value int64) FakeQuantWithMinMaxArgsGradientAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
+	}
+}
+
 // Compute gradients for a FakeQuantWithMinMaxArgs operation.
 //
 // Arguments:
@@ -7513,6 +7565,17 @@ func RandomShuffle(scope *Scope, value tf.Output, optional ...RandomShuffleAttr)
 	return op.Output(0)
 }
 
+// FakeQuantWithMinMaxVarsPerChannelAttr is an optional argument to FakeQuantWithMinMaxVarsPerChannel.
+type FakeQuantWithMinMaxVarsPerChannelAttr func(optionalAttr)
+
+// FakeQuantWithMinMaxVarsPerChannelNumBits sets the optional num_bits attribute to value.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxVarsPerChannelNumBits(value int64) FakeQuantWithMinMaxVarsPerChannelAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
+	}
+}
+
 // Fake-quantize the 'inputs' tensor of type float and one of the shapes: `[d]`,
 //
 // `[b, d]` `[b, h, w, d]` via per-channel floats `min` and `max` of shape `[d]`
@@ -7521,17 +7584,23 @@ func RandomShuffle(scope *Scope, value tf.Output, optional ...RandomShuffleAttr)
 // [min; max] is the clamping range for the 'inputs' data in the corresponding
 // depth channel.  Op divides this range into 255 steps (total of 256 values), then
 // replaces each 'inputs' value with the closest of the quantized step values.
+// 'num_bits' is the bitwidth of the quantization; between 2 and 8, inclusive.
 //
 // This operation has a gradient and thus allows for training `min` and `max` values.
-func FakeQuantWithMinMaxVarsPerChannel(scope *Scope, inputs tf.Output, min tf.Output, max tf.Output) (outputs tf.Output) {
+func FakeQuantWithMinMaxVarsPerChannel(scope *Scope, inputs tf.Output, min tf.Output, max tf.Output, optional ...FakeQuantWithMinMaxVarsPerChannelAttr) (outputs tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
 		Type: "FakeQuantWithMinMaxVarsPerChannel",
 		Input: []tf.Input{
 			inputs, min, max,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -18087,6 +18156,19 @@ func Less(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
+// FakeQuantWithMinMaxVarsGradientAttr is an optional argument to FakeQuantWithMinMaxVarsGradient.
+type FakeQuantWithMinMaxVarsGradientAttr func(optionalAttr)
+
+// FakeQuantWithMinMaxVarsGradientNumBits sets the optional num_bits attribute to value.
+//
+// value: The bitwidth of the quantization; between 2 and 8, inclusive.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxVarsGradientNumBits(value int64) FakeQuantWithMinMaxVarsGradientAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
+	}
+}
+
 // Compute gradients for a FakeQuantWithMinMaxVars operation.
 //
 // Arguments:
@@ -18100,15 +18182,20 @@ func Less(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 // `gradients * (inputs >= min && inputs <= max)`.Backpropagated gradients w.r.t. min parameter:
 // `sum(gradients * (inputs < min))`.Backpropagated gradients w.r.t. max parameter:
 // `sum(gradients * (inputs > max))`.
-func FakeQuantWithMinMaxVarsGradient(scope *Scope, gradients tf.Output, inputs tf.Output, min tf.Output, max tf.Output) (backprops_wrt_input tf.Output, backprop_wrt_min tf.Output, backprop_wrt_max tf.Output) {
+func FakeQuantWithMinMaxVarsGradient(scope *Scope, gradients tf.Output, inputs tf.Output, min tf.Output, max tf.Output, optional ...FakeQuantWithMinMaxVarsGradientAttr) (backprops_wrt_input tf.Output, backprop_wrt_min tf.Output, backprop_wrt_max tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
 		Type: "FakeQuantWithMinMaxVarsGradient",
 		Input: []tf.Input{
 			gradients, inputs, min, max,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0), op.Output(1), op.Output(2)
-- 
GitLab


From be43153b21fba4280f0f2a016242614a21d115f3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 26 Apr 2017 19:02:03 -0800
Subject: [PATCH 0734/1563] [XLA:HLO] Change dumped_computation_to_text to dump
 the raw HLO by default.

Added a --compile flag (default false) to enable the old behavior of dumping the
HLO after compilation. It's not clear that the --compile mode is actually
useful; to actually be useful we'd probably want to add a --platform flag to
easily select the backend as well.
Change: 154379349
---
 tensorflow/compiler/xla/tools/BUILD           |  1 +
 .../xla/tools/dumped_computation_to_text.cc   | 58 +++++++++++++------
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/tensorflow/compiler/xla/tools/BUILD b/tensorflow/compiler/xla/tools/BUILD
index 1d9baf5de1..535e5b605b 100644
--- a/tensorflow/compiler/xla/tools/BUILD
+++ b/tensorflow/compiler/xla/tools/BUILD
@@ -153,6 +153,7 @@ cc_binary(
         "//tensorflow/compiler/xla/client:computation",
         "//tensorflow/compiler/xla/client:local_client",
         "//tensorflow/compiler/xla/service",
+        "//tensorflow/compiler/xla/service:computation_tracker",
         "//tensorflow/compiler/xla/service:session_proto",
         "//tensorflow/core:lib",
     ],
diff --git a/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc b/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc
index 8b96e13489..1f0ca31d6d 100644
--- a/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc
+++ b/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/compiler/xla/client/computation.h"
 #include "tensorflow/compiler/xla/client/local_client.h"
+#include "tensorflow/compiler/xla/service/computation_tracker.h"
 #include "tensorflow/compiler/xla/service/service.h"
 #include "tensorflow/compiler/xla/service/session.pb.h"
 #include "tensorflow/compiler/xla/statusor.h"
@@ -34,7 +35,7 @@ limitations under the License.
 namespace xla {
 namespace tools {
 
-void RealMain(tensorflow::gtl::ArraySlice<char*> args) {
+void RealMain(tensorflow::gtl::ArraySlice<char*> args, bool compile) {
   LocalClient* client = ClientLibrary::LocalClientOrDie();
   LocalService* local_service =
       ClientLibrary::GetXlaService(client->platform());
@@ -50,23 +51,35 @@ void RealMain(tensorflow::gtl::ArraySlice<char*> args) {
     }
     Computation computation = computation_status.ConsumeValueOrDie();
 
-    std::unique_ptr<ProgramShape> program_shape =
-        client->GetComputationShape(computation).ConsumeValueOrDie();
+    if (compile) {
+      std::unique_ptr<ProgramShape> program_shape =
+          client->GetComputationShape(computation).ConsumeValueOrDie();
 
-    std::vector<const Shape*> layouts;
-    for (int i = 0; i < program_shape->parameters_size(); ++i) {
-      layouts.push_back(&program_shape->parameters(i));
-    }
-    StatusOr<std::unique_ptr<Executable>> executable =
-        local_service->CompileExecutable(
-            computation.handle(), layouts, &program_shape->result(),
-            /*device_ordinal=*/0, /*has_hybrid_result=*/true);
+      std::vector<const Shape*> layouts;
+      for (int i = 0; i < program_shape->parameters_size(); ++i) {
+        layouts.push_back(&program_shape->parameters(i));
+      }
+      StatusOr<std::unique_ptr<Executable>> executable =
+          local_service->CompileExecutable(
+              computation.handle(), layouts, &program_shape->result(),
+              /*device_ordinal=*/0, /*has_hybrid_result=*/true);
+
+      const HloModule& module = executable.ValueOrDie()->module();
 
-    const HloModule& module = executable.ValueOrDie()->module();
+      fprintf(stdout, "HLO compiled for %s backend:\n%s\n",
+              local_service->backend().platform()->Name().c_str(),
+              module.ToString().c_str());
+    } else {
+      const ComputationTracker& tracker = local_service->computation_tracker();
+      UserComputation* user_computation =
+          tracker.Resolve(computation.handle()).ConsumeValueOrDie();
+      VersionedComputationHandle versioned_handle =
+          user_computation->GetVersionedHandle();
+      std::unique_ptr<HloModule> module =
+          tracker.BuildHloModule(versioned_handle).ConsumeValueOrDie();
 
-    fprintf(stdout, "HLO for %s backend:\n%s\n",
-            local_service->backend().platform()->Name().c_str(),
-            module.ToString().c_str());
+      fprintf(stdout, "%s\n", module->ToString().c_str());
+    }
   }
 }
 
@@ -74,10 +87,21 @@ void RealMain(tensorflow::gtl::ArraySlice<char*> args) {
 }  // namespace xla
 
 int main(int argc, char** argv) {
-  tensorflow::port::InitMain(argv[0], &argc, &argv);
+  bool compile = false;
+  std::vector<tensorflow::Flag> flag_list = {
+      {"compile", &compile,
+       "If true, compile the computation using the default client before "
+       "dumping the HLO. Otherwise dump the raw (uncompiled) HLO."},
+  };
+  const xla::string usage = tensorflow::Flags::Usage(argv[0], flag_list);
+  bool parsed_flags_ok = tensorflow::Flags::Parse(&argc, argv, flag_list);
+  QCHECK(parsed_flags_ok) << "\n" << usage;
+
+  tensorflow::port::InitMain(usage.c_str(), &argc, &argv);
+  QCHECK(argc > 1) << "\nERROR: must specify at least one module\n" << usage;
 
   tensorflow::gtl::ArraySlice<char*> args(argv, argc);
   args.pop_front();  // Pop off the binary name, argv[0]
-  xla::tools::RealMain(args);
+  xla::tools::RealMain(args, compile);
   return 0;
 }
-- 
GitLab


From 95ca363c6caf5d152eef594c7fc3703a5d490070 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Wed, 26 Apr 2017 19:02:10 -0800
Subject: [PATCH 0735/1563] Make error message when explicitly adding an
 invalid device more clear.

Before, you would get something like:

`InvalidArgumentError: Cannot assign a device to node 'save/RestoreV2_45': Could not satisfy explicit device specification '/job:ps/task:1/device:CPU:0' because no devices matching that specification are registered in this process; available devices: /job:localhost/replica:0/task:0/cpu:0 [[Node: save/RestoreV2_45 = RestoreV2[dtypes=[DT_FLOAT], _device="/job:ps/task:1/device:CPU:0"](save/Const, save/RestoreV2_45/tensor_names, save/RestoreV2_45/shape_and_slices)]] Caused by op u'save/RestoreV2_45', defined`

And now this reads:

`InvalidArgumentError: Cannot assign a device for operation 'save/RestoreV2_45':
Operation was explicitly assigned to '/job:ps/task:1/device:CPU:0'
but available devices are [ /job:localhost/replica:0/task:0/cpu:0 ]. Make
sure the device specification refers to a valid device.

This drops the additional debug_info because this condition is tightly
scoped to lack of devices, and so node information is unnecessary.
Change: 154379360
---
 .../core/common_runtime/simple_placer.cc      | 15 +++++-----
 .../core/common_runtime/simple_placer_test.cc | 29 +++++--------------
 tensorflow/python/framework/test_util_test.py |  3 +-
 tensorflow/python/training/saver_test.py      |  4 +--
 4 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc
index f6e6bf0692..5ab3f20648 100644
--- a/tensorflow/core/common_runtime/simple_placer.cc
+++ b/tensorflow/core/common_runtime/simple_placer.cc
@@ -341,11 +341,10 @@ class ColocationGraph {
             std::sort(device_names.begin(), device_names.end());
 
             return errors::InvalidArgument(
-                "Could not satisfy explicit device specification '",
-                node->def().device(),
-                "' because no devices matching that specification "
-                "are registered in this process; available devices: ",
-                str_util::Join(device_names, ", "), debug_info);
+                "Operation was explicitly assigned to ", node->def().device(),
+                " but available devices are [ ",
+                str_util::Join(device_names, ", "), " ]. Make sure ",
+                "the device specification refers to a valid device.");
           } else if (specified_device_name.has_type) {
             return errors::InvalidArgument(
                 "Could not satisfy explicit device specification '",
@@ -741,7 +740,7 @@ Status SimplePlacer::Run() {
     status = colocation_graph.GetDevicesForNode(node, &devices);
     if (!status.ok()) {
       return AttachDef(
-          errors::InvalidArgument("Cannot assign a device to node '",
+          errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
           node->def());
     }
@@ -783,7 +782,7 @@ Status SimplePlacer::Run() {
     status = colocation_graph.GetDevicesForNode(node, &devices);
     if (!status.ok()) {
       return AttachDef(
-          errors::InvalidArgument("Cannot assign a device to node '",
+          errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
           node->def());
     }
@@ -801,7 +800,7 @@ Status SimplePlacer::Run() {
             return e->dst()->assigned_device_name() == output_device_name;
           });
 
-      if (consumers_on_same_device && 
+      if (consumers_on_same_device &&
           CanAssignToDevice(output_device_name, devices)) {
         assigned_device = output_device_name;
       }
diff --git a/tensorflow/core/common_runtime/simple_placer_test.cc b/tensorflow/core/common_runtime/simple_placer_test.cc
index c73ed041ed..bd84417b10 100644
--- a/tensorflow/core/common_runtime/simple_placer_test.cc
+++ b/tensorflow/core/common_runtime/simple_placer_test.cc
@@ -939,10 +939,7 @@ TEST_F(SimplePlacerTest, TestUnknownDevice) {
 
   Status s = Place(&g);
   EXPECT_EQ(error::INVALID_ARGUMENT, s.code());
-  EXPECT_TRUE(
-      StringPiece(s.error_message())
-          .contains(
-              "Could not satisfy explicit device specification '/job:foo'"));
+  EXPECT_TRUE(StringPiece(s.error_message()).contains("/job:foo"));
 }
 
 // Test that placement fails when the combination of partial
@@ -957,10 +954,7 @@ TEST_F(SimplePlacerTest, TestUnknownMergedDevice) {
 
   Status s = Place(&g);
   EXPECT_EQ(error::INVALID_ARGUMENT, s.code());
-  EXPECT_TRUE(
-      StringPiece(s.error_message())
-          .contains(
-              "Could not satisfy explicit device specification '/job:foo'"));
+  EXPECT_TRUE(StringPiece(s.error_message()).contains("/job:foo"));
 }
 
 // Test that placement fails when the previously-assigned device for a
@@ -1107,10 +1101,7 @@ TEST_F(SimplePlacerTest, TestNonexistentGpuNoAllowSoftPlacement) {
   SessionOptions options;
   Status s = Place(&g, &options);
   EXPECT_EQ(error::INVALID_ARGUMENT, s.code());
-  EXPECT_TRUE(StringPiece(s.error_message())
-                  .contains("Could not satisfy explicit "
-                            "device specification "
-                            "'/device:fakegpu:11'"));
+  EXPECT_TRUE(StringPiece(s.error_message()).contains("/device:fakegpu:11"));
 }
 
 // Test that placement fails when a node requests an explicit device that is not
@@ -1127,10 +1118,7 @@ TEST_F(SimplePlacerTest, TestUnsupportedDeviceNoAllowSoftPlacement) {
   SessionOptions options;
   Status s = Place(&g, &options);
   EXPECT_EQ(error::INVALID_ARGUMENT, s.code());
-  EXPECT_TRUE(StringPiece(s.error_message())
-                  .contains("Could not satisfy explicit "
-                            "device specification "
-                            "'/device:fakecpu:0'"));
+  EXPECT_TRUE(StringPiece(s.error_message()).contains("/device:fakecpu:0"));
   EXPECT_TRUE(
       StringPiece(s.error_message())
           .contains("no supported kernel for fakecpu devices is available"));
@@ -1151,12 +1139,9 @@ TEST_F(SimplePlacerTest, TestNonExistentDevice) {
   Status s = Place(&g, &options);
   EXPECT_EQ(error::INVALID_ARGUMENT, s.code());
   LOG(WARNING) << s.error_message();
-  EXPECT_TRUE(
-      StringPiece(s.error_message())
-          .contains("Could not satisfy explicit device specification "
-                    "'/job:foo/replica:17' "
-                    "because no devices matching that specification are "
-                    "registered in this process"));
+  EXPECT_TRUE(StringPiece(s.error_message())
+                  .contains("was explicitly assigned to /job:foo/replica:17 "
+                            "but available devices"));
 }
 
 TEST_F(SimplePlacerTest, TestUnsupportedDeviceAllowSoftPlacement) {
diff --git a/tensorflow/python/framework/test_util_test.py b/tensorflow/python/framework/test_util_test.py
index cccba94fb0..6129fa2e0d 100644
--- a/tensorflow/python/framework/test_util_test.py
+++ b/tensorflow/python/framework/test_util_test.py
@@ -252,8 +252,7 @@ class TestUtilTest(test_util.TensorFlowTestCase):
     self.assertArrayNear(a, b, 0.001)
 
   def testForceGPU(self):
-    with self.assertRaisesRegexp(errors.InvalidArgumentError,
-                                 "Cannot assign a device to node"):
+    with self.assertRaises(errors.InvalidArgumentError):
       with self.test_session(force_gpu=True):
         # this relies on us not having a GPU implementation for assert, which
         # seems sensible
diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py
index ec370afee1..d862244f8f 100644
--- a/tensorflow/python/training/saver_test.py
+++ b/tensorflow/python/training/saver_test.py
@@ -1845,8 +1845,8 @@ class MetaGraphTest(test.TestCase):
     with session.Session(graph=ops_lib.Graph()) as sess:
       saver_module.import_meta_graph(
           meta_graph_def, clear_devices=False, import_scope="new_model")
-      with self.assertRaisesRegexp(errors_impl.InvalidArgumentError,
-                                   "Cannot assign a device to node"):
+      # Device refers to GPU, which is not available here.
+      with self.assertRaises(errors_impl.InvalidArgumentError):
         sess.run(variables.global_variables_initializer())
 
     with session.Session(graph=ops_lib.Graph()) as sess:
-- 
GitLab


From 79789dd5abe59ec525bc3bdffec82b6af8dbd0d8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 04:47:01 -0800
Subject: [PATCH 0736/1563] Removing python_config.sh, moved functionality
 asking users for input to root configure moved lib checks to
 python_configure.bzl Change: 154412830

---
 configure                           | 143 ++++++++++++++++++++++------
 third_party/py/python_configure.bzl |  56 ++++++++---
 2 files changed, 161 insertions(+), 38 deletions(-)

diff --git a/configure b/configure
index fad3fdbebd..75d3e160f5 100755
--- a/configure
+++ b/configure
@@ -51,6 +51,121 @@ function write_action_env_to_bazelrc() {
   write_to_bazelrc "build --action_env $1=\"$2\""
 }
 
+function python_path {
+  "$PYTHON_BIN_PATH" - <<END
+from __future__ import print_function
+import site
+import os
+
+try:
+  input = raw_input
+except NameError:
+  pass
+
+python_paths = []
+if os.getenv('PYTHONPATH') is not None:
+  python_paths = os.getenv('PYTHONPATH').split(':')
+try:
+  library_paths = site.getsitepackages()
+except AttributeError:
+ from distutils.sysconfig import get_python_lib
+ library_paths = [get_python_lib()]
+all_paths = set(python_paths + library_paths)
+
+paths = []
+for path in all_paths:
+  if os.path.isdir(path):
+    paths.append(path)
+
+print(",".join(paths))
+END
+}
+
+function setup_python {
+  ## Set up python-related environment settings:
+  while true; do
+    fromuser=""
+    if [ -z "$PYTHON_BIN_PATH" ]; then
+      default_python_bin_path=$(which python || which python3 || true)
+      read -p "Please specify the location of python. [Default is $default_python_bin_path]: " PYTHON_BIN_PATH
+      fromuser="1"
+      if [ -z "$PYTHON_BIN_PATH" ]; then
+        PYTHON_BIN_PATH=$default_python_bin_path
+      fi
+    fi
+    if [ -e "$PYTHON_BIN_PATH" ]; then
+      break
+    fi
+    echo "Invalid python path. ${PYTHON_BIN_PATH} cannot be found" 1>&2
+    if [ -z "$fromuser" ]; then
+      exit 1
+    fi
+    PYTHON_BIN_PATH=""
+    # Retry
+  done
+
+  if [ -z "$PYTHON_LIB_PATH" ]; then
+    # Split python_path into an array of paths, this allows path containing spaces
+    IFS=','
+    python_lib_path=($(python_path))
+    unset IFS
+
+    if [ 1 = "$USE_DEFAULT_PYTHON_LIB_PATH" ]; then
+      PYTHON_LIB_PATH=${python_lib_path[0]}
+      echo "Using python library path: $PYTHON_LIB_PATH"
+
+    else
+      echo "Found possible Python library paths:"
+      for x in "${python_lib_path[@]}"; do
+        echo "  $x"
+      done
+      set -- "${python_lib_path[@]}"
+      echo "Please input the desired Python library path to use.  Default is ["$1"]"
+      read b || true
+      if [ "$b" == "" ]; then
+        PYTHON_LIB_PATH=${python_lib_path[0]}
+        echo "Using python library path: $PYTHON_LIB_PATH"
+      else
+        PYTHON_LIB_PATH="$b"
+      fi
+    fi
+  fi
+
+  if [ ! -x "$PYTHON_BIN_PATH" ]  || [ -d "$PYTHON_BIN_PATH" ]; then
+    echo "PYTHON_BIN_PATH is not executable.  Is it the python binary?"
+    exit 1
+  fi
+
+  local python_major_version=$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; import sys; print(sys.version_info[0]);')
+  if [ "$python_major_version" == "" ]; then
+    echo -e "\n\nERROR: Problem getting python version.  Is $PYTHON_BIN_PATH the correct python binary?"
+    exit 1
+  fi
+
+  # Convert python path to Windows style before writing into bazel.rc
+  if is_windows; then
+    PYTHON_BIN_PATH="$(cygpath -m "$PYTHON_BIN_PATH")"
+  fi
+
+  # Set-up env variables used by python_configure.bzl
+  write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
+  write_action_env_to_bazelrc "PYTHON_LIB_PATH" "$PYTHON_LIB_PATH"
+  write_to_bazelrc "build --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
+  write_to_bazelrc "build --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
+  write_to_bazelrc "build --force_python=py$python_major_version"
+  write_to_bazelrc "build --host_force_python=py$python_major_version"
+  write_to_bazelrc "build --python${python_major_version}_path=$PYTHON_BIN_PATH"
+  write_to_bazelrc "test --force_python=py$python_major_version"
+  write_to_bazelrc "test --host_force_python=py$python_major_version"
+  write_to_bazelrc "test --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
+  write_to_bazelrc "test --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
+  write_to_bazelrc "run --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
+  write_to_bazelrc "run --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
+
+  # Write tools/python_bin_path.sh
+  echo "export PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\"" > tools/python_bin_path.sh
+}
+
 # This file contains customized config settings.
 rm -f .tf_configure.bazelrc
 touch .tf_configure.bazelrc
@@ -65,30 +180,7 @@ if [ -d "${MAKEFILE_DOWNLOAD_DIR}" ]; then
   find ${MAKEFILE_DOWNLOAD_DIR} -type f -name '*BUILD' -delete
 fi
 
-## Set up python-related environment settings
-while true; do
-  fromuser=""
-  if [ -z "$PYTHON_BIN_PATH" ]; then
-    default_python_bin_path=$(which python || which python3  || true)
-    read -p "Please specify the location of python. [Default is $default_python_bin_path]: " PYTHON_BIN_PATH
-    fromuser="1"
-    if [ -z "$PYTHON_BIN_PATH" ]; then
-      PYTHON_BIN_PATH=$default_python_bin_path
-    fi
-  fi
-  if [ -e "$PYTHON_BIN_PATH" ]; then
-    break
-  fi
-  echo "Invalid python path. ${PYTHON_BIN_PATH} cannot be found" 1>&2
-  if [ -z "$fromuser" ]; then
-    exit 1
-  fi
-  PYTHON_BIN_PATH=""
-  # Retry
-done
-export PYTHON_BIN_PATH
-write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
-# TODO(ngiraldo): allow the user to optionally set PYTHON_INCLUDE_PATH and NUMPY_INCLUDE_PATH
+setup_python
 
 ## Set up MKL related environment settings
 if false; then # Disable building with MKL for now
@@ -263,9 +355,6 @@ if [[ "$TF_NEED_VERBS" == "1" ]]; then
   write_to_bazelrc 'build --define with_verbs_support=true'
 fi
 
-# Invoke python_config and set up symlinks to python includes
-./util/python/python_config.sh "$PYTHON_BIN_PATH"
-
 # Append CC optimization flags to bazel.rc
 echo >> tools/bazel.rc
 for opt in $CC_OPT_FLAGS; do
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index d49d4c1781..460a9b5d05 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -6,11 +6,13 @@
   * `NUMPY_INCLUDE_PATH`: Location of Numpy libraries.
   * `PYTHON_BIN_PATH`: location of python binary.
   * `PYTHON_INCLUDE_PATH`: Location of python binaries.
+  * `PYTHON_LIB_PATH`: Location of python libraries.
 """
 
 _NUMPY_INCLUDE_PATH = "NUMPY_INCLUDE_PATH"
 _PYTHON_BIN_PATH = "PYTHON_BIN_PATH"
 _PYTHON_INCLUDE_PATH = "PYTHON_INCLUDE_PATH"
+_PYTHON_LIB_PATH = "PYTHON_LIB_PATH"
 
 
 def _tpl(repository_ctx, tpl, substitutions={}, out=None):
@@ -114,6 +116,14 @@ def _genrule(src_dir, genrule_name, command, outs):
   )
 
 
+def _check_python_lib(repository_ctx, python_lib):
+  """Checks the python lib path."""
+  cmd = 'test -d "%s" -a -x "%s"' % (python_lib, python_lib)
+  result = repository_ctx.execute(["bash", "-c", cmd])
+  if result.return_code == 1:
+    _python_configure_fail("Invalid python library path:  %s" % python_lib)
+
+
 def _check_python_bin(repository_ctx, python_bin):
   """Checks the python bin path."""
   cmd =  '[[ -x "%s" ]] && [[ ! -d "%s" ]]' % (python_bin, python_bin)
@@ -151,28 +161,51 @@ def _create_python_repository(repository_ctx):
   """Creates the repository containing files set up to build with Python."""
   python_include = None
   numpy_include = None
+  empty_config = False
   # If local checks were requested, the python and numpy include will be auto
   # detected on the host config (using _PYTHON_BIN_PATH).
   if repository_ctx.attr.local_checks:
     python_bin = _get_env_var(repository_ctx, _PYTHON_BIN_PATH)
     _check_python_bin(repository_ctx, python_bin)
-    python_include = _get_python_include(repository_ctx, python_bin)
-    numpy_include = _get_numpy_include(repository_ctx, python_bin) + '/numpy'
+    python_lib = _get_env_var(repository_ctx, _PYTHON_LIB_PATH, '')
+    if python_lib == '':
+      # If we could not find the python lib we will create an empty config that
+      # will allow non-compilation targets to build correctly (e.g., smoke
+      # tests).
+      empty_config = True
+      _python_configure_warning('PYTHON_LIB_PATH was not set;' +
+                                ' python setup cannot complete successfully.' +
+                                ' Please run ./configure.')
+    else:
+      _check_python_lib(repository_ctx, python_lib)
+      python_include = _get_python_include(repository_ctx, python_bin)
+      numpy_include = _get_numpy_include(repository_ctx, python_bin) + '/numpy'
   else:
     # Otherwise, we assume user provides all paths (via ENV or attrs)
     python_include = _get_env_var(repository_ctx, _PYTHON_INCLUDE_PATH,
                                   repository_ctx.attr.python_include)
     numpy_include = _get_env_var(repository_ctx, _NUMPY_INCLUDE_PATH,
                                  repository_ctx.attr.numpy_include) + '/numpy'
-
-  python_include_rule = _symlink_genrule_for_dir(
-      repository_ctx, python_include, 'python_include', 'python_include')
-  numpy_include_rule = _symlink_genrule_for_dir(
-      repository_ctx, numpy_include, 'numpy_include/numpy', 'numpy_include')
-  _tpl(repository_ctx, "BUILD", {
-      "%{PYTHON_INCLUDE_GENRULE}": python_include_rule,
-      "%{NUMPY_INCLUDE_GENRULE}": numpy_include_rule,
-  })
+  if empty_config:
+    _tpl(repository_ctx, "BUILD", {
+        "%{PYTHON_INCLUDE_GENRULE}": ('filegroup(\n' +
+                                      '    name = "python_include",\n' +
+                                      '    srcs = [],\n' +
+                                      ')\n'),
+        "%{NUMPY_INCLUDE_GENRULE}": ('filegroup(\n' +
+                                      '    name = "numpy_include",\n' +
+                                      '    srcs = [],\n' +
+                                      ')\n'),
+    })
+  else:
+    python_include_rule = _symlink_genrule_for_dir(
+        repository_ctx, python_include, 'python_include', 'python_include')
+    numpy_include_rule = _symlink_genrule_for_dir(
+        repository_ctx, numpy_include, 'numpy_include/numpy', 'numpy_include')
+    _tpl(repository_ctx, "BUILD", {
+        "%{PYTHON_INCLUDE_GENRULE}": python_include_rule,
+        "%{NUMPY_INCLUDE_GENRULE}": numpy_include_rule,
+    })
 
 
 def _python_autoconf_impl(repository_ctx):
@@ -190,6 +223,7 @@ python_configure = repository_rule(
     environ = [
         _PYTHON_BIN_PATH,
         _PYTHON_INCLUDE_PATH,
+        _PYTHON_LIB_PATH,
         _NUMPY_INCLUDE_PATH,
     ],
 )
-- 
GitLab


From c83bb86589a6862570e3c68c401c90ab223e2080 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 06:36:29 -0800
Subject: [PATCH 0737/1563] Replaced user defined matchers by gmock matchers.
 Change: 154420642

---
 tensorflow/compiler/xla/service/BUILD         |  1 +
 .../service/cpu/conv_canonicalization_test.cc |  9 ++-
 .../compiler/xla/service/hlo_cse_test.cc      | 75 +++++++++++--------
 .../xla/service/layout_assignment_test.cc     | 14 ++--
 tensorflow/compiler/xla/shape_util_test.cc    | 31 ++++----
 tensorflow/compiler/xla/tests/prng_test.cc    |  5 +-
 6 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index aed3d72440..e17205be23 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1386,6 +1386,7 @@ cc_test(
         ":cpu_plugin",
         ":hlo",
         ":hlo_cse",
+        ":hlo_matchers",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:types",
diff --git a/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc b/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc
index f717d57839..b42702dbe1 100644
--- a/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc
+++ b/tensorflow/compiler/xla/service/cpu/conv_canonicalization_test.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/util.h"
 
@@ -28,6 +29,8 @@ limitations under the License.
 namespace xla {
 namespace cpu {
 
+using ::testing::ElementsAre;
+
 class ConvCanonicalizationTest : public HloTestBase {
  public:
   ConvCanonicalizationTest() {
@@ -96,14 +99,14 @@ TEST_F(ConvCanonicalizationTest, NonCanonicalToCanonical) {
 
   // The input is in CNHW order. input_reshape should produce
   // NHWC for the convolution to hit the Eigen fast path.
-  EXPECT_TRUE(ContainersEqual(input_reshape->dimensions(), {1, 2, 3, 0}));
+  EXPECT_THAT(input_reshape->dimensions(), ElementsAre(1, 2, 3, 0));
   // The kernel is in OIHW order. kernel_reshape should produce
   // HWIO for the convolution to hit the Eigen fast path.
-  EXPECT_TRUE(ContainersEqual(kernel_reshape->dimensions(), {2, 3, 1, 0}));
+  EXPECT_THAT(kernel_reshape->dimensions(), ElementsAre(2, 3, 1, 0));
   // The output of the canonical convolution is in NHWC order (the same as
   // input_reshape's order). output_reshape should restore that order to the
   // order of the computation root (CNHW).
-  EXPECT_TRUE(ContainersEqual(output_reshape->dimensions(), {3, 0, 1, 2}));
+  EXPECT_THAT(output_reshape->dimensions(), ElementsAre(3, 0, 1, 2));
 }
 
 TEST_F(ConvCanonicalizationTest, CanonicalStaysTheSame) {
diff --git a/tensorflow/compiler/xla/service/hlo_cse_test.cc b/tensorflow/compiler/xla/service/hlo_cse_test.cc
index ec8161f55f..9444382b52 100644
--- a/tensorflow/compiler/xla/service/hlo_cse_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_cse_test.cc
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/shape_util.h"
@@ -36,6 +37,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/platform/types.h"
 
+namespace op = xla::testing::opcode_matchers;
+
 namespace xla {
 namespace {
 
@@ -88,13 +91,15 @@ TEST_F(HloCseTest, CombineTwoConstantsDifferentLayoutsAndInsensitive) {
   auto computation = module->AddEntryComputation(builder.Build());
 
   EXPECT_EQ(3, computation->instruction_count());
-  EXPECT_NE(add->operand(0), add->operand(1));
+  EXPECT_THAT(add, op::Add(constant1, constant2));
 
   HloCSE cse(/*is_layout_sensitive=*/false);
   EXPECT_TRUE(cse.Run(module.get()).ValueOrDie());
 
   EXPECT_EQ(2, computation->instruction_count());
-  EXPECT_EQ(add->operand(0), add->operand(1));
+  auto first_operand = add->operand(0);
+  EXPECT_THAT(first_operand, ::testing::AnyOf(constant1, constant2));
+  EXPECT_THAT(add, op::Add(first_operand, first_operand));
 
   auto result = ExecuteAndTransfer(std::move(module), {});
   auto expected = LiteralUtil::CreateR2<float>({{2.0, 4.0}, {6.0, 8.0}});
@@ -118,15 +123,13 @@ TEST_F(HloCseTest, CombineTwoConstantsDifferentLayoutsAndSensitive) {
   auto computation = module->AddEntryComputation(builder.Build());
 
   EXPECT_EQ(3, computation->instruction_count());
-  EXPECT_EQ(constant1, add->operand(0));
-  EXPECT_EQ(constant2, add->operand(1));
+  EXPECT_THAT(add, op::Add(constant1, constant2));
 
   HloCSE cse(/*is_layout_sensitive=*/true);
   EXPECT_FALSE(cse.Run(module.get()).ValueOrDie());
 
   EXPECT_EQ(3, computation->instruction_count());
-  EXPECT_EQ(constant1, add->operand(0));
-  EXPECT_EQ(constant2, add->operand(1));
+  EXPECT_THAT(add, op::Add(constant1, constant2));
 
   auto result = ExecuteAndTransfer(std::move(module), {});
   auto expected = LiteralUtil::CreateR2<float>({{2.0, 4.0}, {6.0, 8.0}});
@@ -185,16 +188,18 @@ TEST_F(HloCseTest, NonscalarConstants) {
   auto computation = module.AddEntryComputation(builder.Build());
 
   EXPECT_EQ(4, computation->instruction_count());
+  EXPECT_THAT(tuple,
+              op::Tuple(common_constant1, common_constant2, uncommon_constant));
 
   HloCSE cse(/*is_layout_sensitive=*/false);
   EXPECT_TRUE(cse.Run(&module).ValueOrDie());
 
   EXPECT_EQ(3, computation->instruction_count());
-
-  EXPECT_EQ(tuple->operand(0), tuple->operand(1));
-  EXPECT_EQ(uncommon_constant, tuple->operand(2));
-  EXPECT_TRUE(tuple->operand(0) == common_constant1 ||
-              tuple->operand(0) == common_constant2);
+  auto first_operand = tuple->operand(0);
+  EXPECT_THAT(first_operand,
+              ::testing::AnyOf(common_constant1, common_constant2));
+  EXPECT_THAT(tuple,
+              op::Tuple(first_operand, first_operand, uncommon_constant));
 }
 
 TEST_F(HloCseTest, IdenticalInstructions) {
@@ -215,16 +220,15 @@ TEST_F(HloCseTest, IdenticalInstructions) {
   auto computation = module.AddEntryComputation(builder.Build());
 
   EXPECT_EQ(5, computation->instruction_count());
-  EXPECT_NE(tuple->operand(0), tuple->operand(1));
-  EXPECT_NE(tuple->operand(1), tuple->operand(2));
-  EXPECT_NE(tuple->operand(0), tuple->operand(2));
+  EXPECT_THAT(tuple, op::Tuple(exp1, exp2, exp3));
 
   HloCSE cse(/*is_layout_sensitive=*/false);
   EXPECT_TRUE(cse.Run(&module).ValueOrDie());
 
   EXPECT_EQ(3, computation->instruction_count());
-  EXPECT_EQ(tuple->operand(0), tuple->operand(1));
-  EXPECT_EQ(tuple->operand(1), tuple->operand(2));
+  auto first_operand = tuple->operand(0);
+  EXPECT_THAT(first_operand, ::testing::AnyOf(exp1, exp2, exp3));
+  EXPECT_THAT(tuple, op::Tuple(first_operand, first_operand, first_operand));
 }
 
 TEST_F(HloCseTest, IdenticalInstructionsDifferentLayoutsSensitive) {
@@ -249,13 +253,13 @@ TEST_F(HloCseTest, IdenticalInstructionsDifferentLayoutsSensitive) {
   auto computation = module.AddEntryComputation(builder.Build());
 
   EXPECT_EQ(4, computation->instruction_count());
-  EXPECT_NE(tuple->operand(0), tuple->operand(1));
+  EXPECT_THAT(tuple, op::Tuple(exp1, exp2));
 
   HloCSE cse(/*is_layout_sensitive=*/true);
   EXPECT_FALSE(cse.Run(&module).ValueOrDie());
 
   EXPECT_EQ(4, computation->instruction_count());
-  EXPECT_NE(tuple->operand(0), tuple->operand(1));
+  EXPECT_THAT(tuple, op::Tuple(exp1, exp2));
 }
 
 TEST_F(HloCseTest, IdenticalInstructionsDifferentLayoutsInsensitive) {
@@ -280,13 +284,15 @@ TEST_F(HloCseTest, IdenticalInstructionsDifferentLayoutsInsensitive) {
   auto computation = module.AddEntryComputation(builder.Build());
 
   EXPECT_EQ(4, computation->instruction_count());
-  EXPECT_NE(tuple->operand(0), tuple->operand(1));
+  EXPECT_THAT(tuple, op::Tuple(exp1, exp2));
 
   HloCSE cse(/*is_layout_sensitive=*/false);
   EXPECT_TRUE(cse.Run(&module).ValueOrDie());
 
   EXPECT_EQ(3, computation->instruction_count());
-  EXPECT_EQ(tuple->operand(0), tuple->operand(1));
+  auto first_operand = tuple->operand(0);
+  EXPECT_THAT(first_operand, ::testing::AnyOf(exp1, exp2));
+  EXPECT_THAT(tuple, op::Tuple(first_operand, first_operand));
 }
 
 TEST_F(HloCseTest, IdenticalExpressions) {
@@ -328,14 +334,15 @@ TEST_F(HloCseTest, IdenticalExpressions) {
   auto computation = module.AddEntryComputation(builder.Build());
 
   EXPECT_EQ(8, computation->instruction_count());
-  EXPECT_NE(tuple->operand(0), tuple->operand(1));
+  EXPECT_THAT(tuple, op::Tuple(op::Add(negate1, exp1), op::Add(negate2, exp2)));
 
   HloCSE cse(/*is_layout_sensitive=*/false);
   EXPECT_TRUE(cse.Run(&module).ValueOrDie());
 
   EXPECT_EQ(5, computation->instruction_count());
-  EXPECT_EQ(tuple->operand(0), tuple->operand(1));
-  EXPECT_EQ(HloOpcode::kAdd, tuple->operand(0)->opcode());
+  auto operand = tuple->operand(0);
+  EXPECT_THAT(tuple, op::Tuple(operand, operand));
+  EXPECT_THAT(operand, op::Add(op::Negate(), op::Exp()));
 }
 
 TEST_F(HloCseTest, DoNotCombineRng) {
@@ -351,12 +358,16 @@ TEST_F(HloCseTest, DoNotCombineRng) {
   auto rng2 = builder.AddInstruction(HloInstruction::CreateRng(
       ShapeUtil::MakeShape(F32, {}), RandomDistribution::RNG_UNIFORM,
       {constant1, constant2}));
+
   builder.AddInstruction(HloInstruction::CreateBinary(
       constant1->shape(), HloOpcode::kAdd, rng1, rng2));
 
   auto module = MakeUnique<HloModule>(TestName());
   auto computation = module->AddEntryComputation(builder.Build());
 
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_THAT(root, op::Add(rng1, rng2));
+
   uint32 count_before = computation->instruction_count();
 
   HloCSE cse(/*is_layout_sensitive=*/false);
@@ -364,11 +375,8 @@ TEST_F(HloCseTest, DoNotCombineRng) {
 
   uint32 count_after = computation->instruction_count();
   EXPECT_EQ(count_before, count_after);
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kAdd);
-  EXPECT_EQ(root->operand(0)->opcode(), HloOpcode::kRng);
-  EXPECT_EQ(root->operand(1)->opcode(), HloOpcode::kRng);
-  EXPECT_NE(root->operand(0), root->operand(1));
+  root = computation->root_instruction();
+  EXPECT_THAT(root, op::Add(rng1, rng2));
 }
 
 // TODO(b/28245743): Handle impure functions correctly in CSE.
@@ -412,16 +420,17 @@ TEST_F(HloCseTest, DISABLED_DoNotCombineCallsToImpureFunctions) {
   }
 
   EXPECT_EQ(4, computation->instruction_count());
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_THAT(root, op::Add(op::Map(), op::Map()));
 
   HloCSE cse(/*is_layout_sensitive=*/false);
   EXPECT_TRUE(cse.Run(module.get()).ValueOrDie());
 
   EXPECT_EQ(4, computation->instruction_count());
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kAdd);
-  EXPECT_EQ(root->operand(0)->opcode(), HloOpcode::kMap);
-  EXPECT_EQ(root->operand(1)->opcode(), HloOpcode::kMap);
-  EXPECT_NE(root->operand(0), root->operand(1));
+  root = computation->root_instruction();
+  auto operand = root->operand(0)->operand(0);
+  EXPECT_THAT(operand, op::Map());
+  EXPECT_THAT(root, op::Add(operand, operand));
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/layout_assignment_test.cc b/tensorflow/compiler/xla/service/layout_assignment_test.cc
index b6451738bd..dd72566ac0 100644
--- a/tensorflow/compiler/xla/service/layout_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment_test.cc
@@ -45,6 +45,8 @@ namespace op = xla::testing::opcode_matchers;
 namespace xla {
 namespace {
 
+using ::testing::ElementsAre;
+
 class LayoutAssignmentTest : public HloTestBase {
  protected:
   void AssignLayouts(HloModule* module,
@@ -421,8 +423,8 @@ TEST_F(LayoutAssignmentTest, BroadcastAndTranspose) {
       ShapeLayout(output_shape_with_layout);
   AssignLayouts(&module, &computation_layout);
 
-  EXPECT_TRUE(
-      ContainersEqual(broadcast->shape().layout().minor_to_major(), {0, 1, 2}));
+  EXPECT_THAT(broadcast->shape().layout().minor_to_major(),
+              ElementsAre(0, 1, 2));
 }
 
 TEST_F(LayoutAssignmentTest, ReshapeOperandHasMultipleUsers) {
@@ -474,11 +476,9 @@ TEST_F(LayoutAssignmentTest, ReshapeOperandHasMultipleUsers) {
           {transpose_shape_with_layout, broadcast2_shape_with_layout}));
   AssignLayouts(&module, &computation_layout);
 
-  EXPECT_TRUE(
-      ContainersEqual(broadcast->shape().layout().minor_to_major(), {0, 1}));
-  EXPECT_TRUE(
-      ContainersEqual(transpose->shape().layout().minor_to_major(), {1, 0}));
-  EXPECT_TRUE(ContainersEqual(tanh->shape().layout().minor_to_major(), {0, 1}));
+  EXPECT_THAT(broadcast->shape().layout().minor_to_major(), ElementsAre(0, 1));
+  EXPECT_THAT(transpose->shape().layout().minor_to_major(), ElementsAre(1, 0));
+  EXPECT_THAT(tanh->shape().layout().minor_to_major(), ElementsAre(0, 1));
 }
 
 // Add test which fails due to copy tuple.
diff --git a/tensorflow/compiler/xla/shape_util_test.cc b/tensorflow/compiler/xla/shape_util_test.cc
index b0a4b0c9a7..1f1f71d97c 100644
--- a/tensorflow/compiler/xla/shape_util_test.cc
+++ b/tensorflow/compiler/xla/shape_util_test.cc
@@ -24,6 +24,8 @@ limitations under the License.
 namespace xla {
 namespace {
 
+using ::testing::ElementsAre;
+
 TEST(ShapeUtilTest, GetDimensionHelperCanNegativeIndex) {
   Shape matrix = ShapeUtil::MakeShape(F32, {2, 3});
   EXPECT_EQ(3, ShapeUtil::GetDimension(matrix, -1));
@@ -446,21 +448,21 @@ TEST(ShapeUtilTest, InsertedOrDeleted1SizedDimensions) {
 TEST(ShapeUtilTest, DimensionsUnmodifiedByReshape_1x1x1x1_to_1x1x1) {
   // All output dimensions should be unmodified. One of the input dimensions is
   // modified because the input rank is larger by one.
-  EXPECT_EQ(3,
-            ShapeUtil::DimensionsUnmodifiedByReshape(
-                ShapeUtil::MakeShape(S32, {1, 1, 1, 1}),
-                ShapeUtil::MakeShape(S32, {1, 1, 1}))
-                .size());
+  EXPECT_THAT(ShapeUtil::DimensionsUnmodifiedByReshape(
+                  ShapeUtil::MakeShape(S32, {1, 1, 1, 1}),
+                  ShapeUtil::MakeShape(S32, {1, 1, 1})),
+              ElementsAre(std::make_pair(0, 0), std::make_pair(1, 1),
+                          std::make_pair(2, 2)));
 }
 
 TEST(ShapeUtilTest, DimensionsUnmodifiedByReshape_1x1x1_to_1x1x1x1) {
   // All input dimensions should be unmodified. One of the output dimensions is
   // modified because the output rank is larger by one.
-  EXPECT_EQ(3,
-            ShapeUtil::DimensionsUnmodifiedByReshape(
-                ShapeUtil::MakeShape(S32, {1, 1, 1}),
-                ShapeUtil::MakeShape(S32, {1, 1, 1, 1}))
-                .size());
+  EXPECT_THAT(ShapeUtil::DimensionsUnmodifiedByReshape(
+                  ShapeUtil::MakeShape(S32, {1, 1, 1}),
+                  ShapeUtil::MakeShape(S32, {1, 1, 1, 1})),
+              ElementsAre(std::make_pair(0, 0), std::make_pair(1, 1),
+                          std::make_pair(2, 2)));
 }
 
 TEST(ShapeUtilTest, DimensionsUnmodifiedByReshape_4x1x3x5x6x7_to_2x6x1x5x1x42) {
@@ -468,11 +470,10 @@ TEST(ShapeUtilTest, DimensionsUnmodifiedByReshape_4x1x3x5x6x7_to_2x6x1x5x1x42) {
   // 4, 1, 3, 5, 6, 7
   //          |
   // 2, 6, 1, 5, 1, 42
-  EXPECT_TRUE(
-      ContainersEqual(ShapeUtil::DimensionsUnmodifiedByReshape(
-                          ShapeUtil::MakeShape(S32, {4, 1, 3, 5, 6, 7}),
-                          ShapeUtil::MakeShape(S32, {2, 6, 1, 5, 1, 42})),
-                      std::vector<std::pair<int64, int64>>({{3, 3}})));
+  EXPECT_THAT(ShapeUtil::DimensionsUnmodifiedByReshape(
+                  ShapeUtil::MakeShape(S32, {4, 1, 3, 5, 6, 7}),
+                  ShapeUtil::MakeShape(S32, {2, 6, 1, 5, 1, 42})),
+              ElementsAre(std::make_pair(3, 3)));
 }
 
 TEST(ShapeUtilTest, ReshapeIsBitcast_3x4_6x2) {
diff --git a/tensorflow/compiler/xla/tests/prng_test.cc b/tensorflow/compiler/xla/tests/prng_test.cc
index 0cd0f97b06..5a6aa467e5 100644
--- a/tensorflow/compiler/xla/tests/prng_test.cc
+++ b/tensorflow/compiler/xla/tests/prng_test.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/primitive_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/util.h"
@@ -55,7 +56,7 @@ void PrngTest::UniformTest(T a, T b, tensorflow::gtl::ArraySlice<int64> dims) {
 
   SetSeed(42);
   auto actual = ExecuteAndTransferOrDie(&builder, /*arguments=*/{});
-  EXPECT_TRUE(ContainersEqual(dims, actual->shape().dimensions()));
+  EXPECT_THAT(dims, ::testing::ElementsAreArray(actual->shape().dimensions()));
   LiteralUtil::EachCell<T>(*actual,
                            [=](tensorflow::gtl::ArraySlice<int64>, T value) {
                              EXPECT_LE(a, value);
@@ -75,7 +76,7 @@ void PrngTest::BernoulliTest(float p, tensorflow::gtl::ArraySlice<int64> dims) {
       auto actual,
       client_->ExecuteAndTransfer(computation, /*arguments=*/{},
                                   &execution_options));
-  EXPECT_TRUE(ContainersEqual(dims, actual->shape().dimensions()));
+  EXPECT_THAT(dims, ::testing::ElementsAreArray(actual->shape().dimensions()));
   int32 sum = 0;
   LiteralUtil::EachCell<uint32>(
       *actual, [&sum](tensorflow::gtl::ArraySlice<int64>, uint32 value) {
-- 
GitLab


From 15a275969af7a8e485bdae9e153484ca5c616108 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 07:17:12 -0800
Subject: [PATCH 0738/1563] [TF:XLA] Added handling for concatenation operation
 constant folding. Change: 154424221

---
 tensorflow/compiler/xla/BUILD                 |   2 +
 tensorflow/compiler/xla/index_util.cc         |  19 +++
 tensorflow/compiler/xla/index_util.h          |   8 ++
 tensorflow/compiler/xla/literal_util.cc       | 111 ++++++++++++++++++
 tensorflow/compiler/xla/literal_util.h        |  49 ++++++++
 tensorflow/compiler/xla/literal_util_test.cc  |  62 ++++++++++
 .../xla/service/algebraic_simplifier.cc       |  72 +++++++++++-
 .../xla/service/algebraic_simplifier_test.cc  |  41 +++++++
 tensorflow/compiler/xla/shape_util.cc         |  25 ++++
 tensorflow/compiler/xla/shape_util.h          |  13 ++
 tensorflow/compiler/xla/util.h                |  12 ++
 11 files changed, 413 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index 7576dff0cd..65d4528421 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -256,6 +256,7 @@ cc_library(
         ":array3d",
         ":array4d",
         ":shape_util",
+        ":status_macros",
         ":types",
         ":util",
         ":xla_data_proto",
@@ -274,6 +275,7 @@ cc_test(
         ":test",
         ":types",
         "//tensorflow/core:lib",
+        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/index_util.cc b/tensorflow/compiler/xla/index_util.cc
index 92aca3cae9..76c0168f37 100644
--- a/tensorflow/compiler/xla/index_util.cc
+++ b/tensorflow/compiler/xla/index_util.cc
@@ -131,4 +131,23 @@ namespace xla {
   return false;
 }
 
+/* static */ int64 IndexUtil::GetDimensionStride(const Shape& shape,
+                                                 int64 dimension) {
+  const Layout& layout = shape.layout();
+  int64 pdim_size = layout.padded_dimensions_size();
+  int64 stride = 1;
+  DCHECK(pdim_size == 0 || pdim_size == shape.dimensions_size());
+  for (auto dim : layout.minor_to_major()) {
+    if (dim == dimension) {
+      break;
+    }
+    if (pdim_size == 0) {
+      stride *= shape.dimensions(dim);
+    } else {
+      stride *= layout.padded_dimensions(dim);
+    }
+  }
+  return stride;
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/index_util.h b/tensorflow/compiler/xla/index_util.h
index e6a26d6220..c9838966a5 100644
--- a/tensorflow/compiler/xla/index_util.h
+++ b/tensorflow/compiler/xla/index_util.h
@@ -61,6 +61,14 @@ class IndexUtil {
   static bool BumpIndices(const Shape& shape,
                           tensorflow::gtl::MutableArraySlice<int64> indices);
 
+  // Calculates the stride size (in number of elements, not byte size) of a
+  // given logical shape dimension (from 0 to rank-1). If available, padded
+  // dimensions are used.
+  // Example:
+  //  GetDimensionStride(F32[5,8,10,4]{3,2,1,0}, 1) ==
+  //    sizeof(dimension(3)) * sizeof(dimension(2)) == 4 * 10
+  static int64 GetDimensionStride(const Shape& shape, int64 dimension);
+
  private:
   TF_DISALLOW_COPY_AND_ASSIGN(IndexUtil);
 };
diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index 0286b0817c..03c9e2c9d7 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -16,12 +16,14 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 
 #include <algorithm>
+#include <functional>
 #include <limits>
 #include <numeric>
 #include <vector>
 
 #include "tensorflow/compiler/xla/index_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/core/lib/core/errors.h"
@@ -33,6 +35,115 @@ limitations under the License.
 
 namespace xla {
 
+/* static */ std::unique_ptr<Literal> LiteralUtil::CreateFromShape(
+    const Shape& shape) {
+  auto literal = MakeUnique<Literal>();
+  *literal->mutable_shape() = shape;
+  Reserve(ShapeUtil::ElementsIn(literal->shape()), literal.get());
+  return literal;
+}
+
+/* static */ std::unique_ptr<Literal> LiteralUtil::CreateFromDimensions(
+    PrimitiveType primitive_type,
+    tensorflow::gtl::ArraySlice<int64> dimensions) {
+  return CreateFromShape(ShapeUtil::MakeShape(primitive_type, dimensions));
+}
+
+template <typename T, typename WT>
+/* static */ Status LiteralUtil::CopyRange(
+    const Literal& src_literal, tensorflow::gtl::ArraySlice<int64> src_base,
+    Literal* dest_literal, tensorflow::gtl::ArraySlice<int64> dest_base,
+    tensorflow::gtl::ArraySlice<int64> copy_size) {
+  const Shape& src_shape = src_literal.shape();
+  const Shape& dest_shape = dest_literal->shape();
+  tensorflow::gtl::ArraySlice<T> src_data = GetArraySlice<T>(src_literal);
+  tensorflow::protobuf::RepeatedField<WT>* dest_data =
+      GetMutableRepeatedField<WT>(dest_literal);
+
+  TF_RET_CHECK(ShapeUtil::Rank(src_shape) == src_base.size());
+  TF_RET_CHECK(ShapeUtil::Rank(dest_shape) == dest_base.size());
+  if (ShapeUtil::Rank(src_shape) == 0 || ShapeUtil::Rank(dest_shape) == 0) {
+    // If any of the two shapes are scalars, we can just call the StridedCopy()
+    // directly, and we know we will be copying only one value.
+    TF_RET_CHECK(copy_size.empty());
+    StridedCopy(dest_data, LinearIndex(*dest_literal, dest_base), 0, src_data,
+                LinearIndex(src_literal, src_base), 0, 1);
+  } else if (!ShapeUtil::HasZeroElements(dest_shape)) {
+    TF_RET_CHECK(!ShapeUtil::HasZeroElements(src_shape));
+    TF_RET_CHECK(src_base.size() == dest_base.size());
+    TF_RET_CHECK(src_base.size() == copy_size.size());
+
+    // Scan the source from minor, stepping in copy size blocks, then within
+    // the index enumaration functor, do a strided copy advancing source index
+    // by one (walking through the minor dimension), and destination index by
+    // proper stride size at the matching dimension.
+    std::vector<int64> src_indexes(src_base.size(), 0);
+    std::vector<int64> dest_indexes(dest_base.size(), 0);
+    std::vector<int64> base(src_base.size(), 0);
+    std::vector<int64> incr(src_base.size(), 1);
+    int64 sdim = src_shape.layout().minor_to_major()[0];
+    int64 dest_stride = IndexUtil::GetDimensionStride(dest_shape, sdim);
+
+    incr[sdim] = copy_size[sdim];
+    auto copy_proc = [&](const std::vector<int64>& indexes) {
+      // Map from multi-dimensional index, to source index.
+      std::copy(indexes.begin(), indexes.end(), src_indexes.begin());
+      std::transform(src_indexes.begin(), src_indexes.end(), src_base.begin(),
+                     src_indexes.begin(), std::plus<int64>());
+      // Map from multi-dimensional index, to destination index.
+      std::copy(indexes.begin(), indexes.end(), dest_indexes.begin());
+      std::transform(dest_indexes.begin(), dest_indexes.end(),
+                     dest_base.begin(), dest_indexes.begin(),
+                     std::plus<int64>());
+
+      int64 src_index = LinearIndex(src_literal, src_indexes);
+      int64 dest_index = LinearIndex(*dest_literal, dest_indexes);
+
+      StridedCopy(dest_data, dest_index, dest_stride, src_data, src_index, 1,
+                  copy_size[sdim]);
+      return true;
+    };
+
+    ShapeUtil::ForEachIndex(src_shape, base, copy_size, incr, copy_proc);
+  }
+  return Status::OK();
+}
+
+/* static */ Status LiteralUtil::Copy(
+    const Literal& src_literal, tensorflow::gtl::ArraySlice<int64> src_base,
+    Literal* dest_literal, tensorflow::gtl::ArraySlice<int64> dest_base,
+    tensorflow::gtl::ArraySlice<int64> copy_size) {
+  TF_RET_CHECK(
+      ShapeUtil::SameElementType(src_literal.shape(), dest_literal->shape()));
+  switch (src_literal.shape().element_type()) {
+    case U32:
+      return CopyRange<uint32>(src_literal, src_base, dest_literal, dest_base,
+                               copy_size);
+    case U64:
+      return CopyRange<uint64, tensorflow::protobuf_uint64>(
+          src_literal, src_base, dest_literal, dest_base, copy_size);
+    case S32:
+      return CopyRange<int32>(src_literal, src_base, dest_literal, dest_base,
+                              copy_size);
+    case S64:
+      return CopyRange<int64, tensorflow::protobuf_int64>(
+          src_literal, src_base, dest_literal, dest_base, copy_size);
+    case F32:
+      return CopyRange<float>(src_literal, src_base, dest_literal, dest_base,
+                              copy_size);
+    case F64:
+      return CopyRange<double>(src_literal, src_base, dest_literal, dest_base,
+                               copy_size);
+    case PRED:
+      return CopyRange<bool>(src_literal, src_base, dest_literal, dest_base,
+                             copy_size);
+    default:
+      break;
+  }
+  return Unimplemented("Unhandled primitive type %d",
+                       src_literal.shape().element_type());
+}
+
 /* static */ Literal LiteralUtil::Zero(PrimitiveType primitive_type) {
   switch (primitive_type) {
     case U8:
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index ef78b819e3..ae3d43e56c 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -100,6 +100,31 @@ class LiteralUtil {
           values,
       const Layout& layout);
 
+  // Create a new Literal object with the shape specified as parameter.
+  // The content of the literal values is the default value of the primitive
+  // type of literal itself (0 for numeric types, and false for predicates).
+  static std::unique_ptr<Literal> CreateFromShape(const Shape& shape);
+
+  // Create a new Literal object with its values havings the primitive_type
+  // type, and with dimensions defined by the dimensions parameter.
+  // The content of the literal values is the default value of the primitive
+  // type of literal itself (0 for numeric types, and false for predicates).
+  static std::unique_ptr<Literal> CreateFromDimensions(
+      PrimitiveType primitive_type,
+      tensorflow::gtl::ArraySlice<int64> dimensions);
+
+  // Copies the values from src_literal, starting at src_base shape indexes,
+  // to dest_literal, starting at dest_base, where the copy size in each
+  // dimension is specified by copy_size.
+  // The src_literal and dest_literal must have the same primitive type,
+  // src_base+copy_size must fit the source literal dimensions, as well as
+  // dest_base+copy_size must fit the destination literal dimensions.
+  static Status Copy(const Literal& src_literal,
+                     tensorflow::gtl::ArraySlice<int64> src_base,
+                     Literal* dest_literal,
+                     tensorflow::gtl::ArraySlice<int64> dest_base,
+                     tensorflow::gtl::ArraySlice<int64> copy_size);
+
   // Creates a new value that has the equivalent value as literal, but conforms
   // to new_layout; e.g. a literal matrix that was in {0, 1} minor-to-major
   // dimension layout can be re-layed-out as {1, 0} minor-to-major dimension
@@ -398,6 +423,30 @@ class LiteralUtil {
   static int64 LinearIndex(const Literal& literal,
                            tensorflow::gtl::ArraySlice<int64> multi_index);
 
+  // Internal template helper for the Copy() API, matching its arguments one by
+  // one.
+  //
+  // The double WT template parameter is pretty ugly, but it comes from one of
+  // the gcc versions used for tests, which seems unable to match templates
+  // types uint64 and int64 with tensorflow::protobuf_uint64 and
+  // tensorflow::protobuf_int64, for the GetArraySlice<>() and
+  // GetMutableRepeatedField<>() APIs.
+  // While for the GetArraySlice<>() case the AsUInt64Slice() and
+  // AsInt64Slice() wrappers are taking care via reinterpret_cast<> of the code
+  // pointer parameters, the protocol buffer repeated fields accessories
+  // return a RepeatedField<> pointer, which is not trivially remappable
+  // (unless pretty ugly API forwarder wrapper).
+  // For that gcc version, this creates a mismatch were either things like the
+  // CopyRange<>() API needs to have both specified, or the Get<>() and Set<>()
+  // APIs having to be called with different types (Get<>() with uint64 and
+  // Set<>() with tensorflow::protobuf_uint64).
+  template <typename T, typename WT = T>
+  static Status CopyRange(const Literal& src_literal,
+                          tensorflow::gtl::ArraySlice<int64> src_base,
+                          Literal* dest_literal,
+                          tensorflow::gtl::ArraySlice<int64> dest_base,
+                          tensorflow::gtl::ArraySlice<int64> copy_size);
+
   TF_DISALLOW_COPY_AND_ASSIGN(LiteralUtil);
 };
 
diff --git a/tensorflow/compiler/xla/literal_util_test.cc b/tensorflow/compiler/xla/literal_util_test.cc
index 91971c3e24..dd4d820bab 100644
--- a/tensorflow/compiler/xla/literal_util_test.cc
+++ b/tensorflow/compiler/xla/literal_util_test.cc
@@ -23,6 +23,8 @@ limitations under the License.
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/types.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -648,5 +650,65 @@ TEST_F(LiteralUtilTest, ReplicateR2U32) {
   EXPECT_TRUE(LiteralUtil::Equal(*output, *expected));
 }
 
+TEST_F(LiteralUtilTest, Copy) {
+  const int64 dimensions[] = {17, 15, 34, 21};
+  const int64 layouts[][4] = {
+      {3, 2, 1, 0}, {0, 2, 1, 3}, {0, 1, 2, 3}, {2, 0, 3, 1}, {1, 3, 0, 2}};
+  for (const auto& layout : layouts) {
+    Shape shape = ShapeUtil::MakeShapeWithLayout(
+        primitive_util::NativeToPrimitiveType<uint32>(), dimensions, layout);
+    auto blank = LiteralUtil::CreateFromShape(shape);
+    auto source = LiteralUtil::CreateFromShape(shape);
+    const int64 sbase[] = {0, 0, 0, 0};
+    const int64 incr[] = {1, 1, 1, 1};
+    uint32 seqnr = 0;
+    auto init_proc = [&](const std::vector<int64>& indexes) {
+      LiteralUtil::Set(source.get(), indexes, ++seqnr);
+      return true;
+    };
+
+    ShapeUtil::ForEachIndex(source->shape(), sbase, dimensions, incr,
+                            init_proc);
+
+    const int64 src_base[] = {3, 1, 5, 7};
+    const int64 dest_base[] = {6, 4, 12, 2};
+    const int64 copy_size[] = {7, 8, 11, 9};
+
+    TF_EXPECT_OK(LiteralUtil::Copy(*source, src_base, blank.get(), dest_base,
+                                   copy_size));
+    std::vector<int64> source_indexes(TF_ARRAYSIZE(dimensions), 0);
+    std::vector<int64> blank_indexes(TF_ARRAYSIZE(dimensions), 0);
+    bool matched = true;
+    auto check_proc = [&](const std::vector<int64>& indexes) {
+      std::copy(indexes.begin(), indexes.end(), source_indexes.begin());
+      std::transform(source_indexes.begin(), source_indexes.end(), src_base,
+                     source_indexes.begin(), std::plus<int64>());
+      std::copy(indexes.begin(), indexes.end(), blank_indexes.begin());
+      std::transform(blank_indexes.begin(), blank_indexes.end(), dest_base,
+                     blank_indexes.begin(), std::plus<int64>());
+      auto bval = LiteralUtil::Get<uint32>(*blank, blank_indexes);
+      matched = (bval != 0 &&
+                 bval == LiteralUtil::Get<uint32>(*source, source_indexes));
+      return matched;
+    };
+    ShapeUtil::ForEachIndex(source->shape(), sbase, copy_size, incr,
+                            check_proc);
+    EXPECT_TRUE(matched);
+  }
+}
+
+TEST_F(LiteralUtilTest, CopyScalars) {
+  auto zero = LiteralUtil::CreateR0<uint32>(0);
+  auto nine = LiteralUtil::CreateR0<uint32>(9);
+  TF_EXPECT_OK(LiteralUtil::Copy(*nine, {}, zero.get(), {}, {}));
+  EXPECT_TRUE(LiteralUtil::Equal(*zero, *nine));
+
+  auto vect = LiteralUtil::CreateR1<uint32>({3, 4, 9, 12, 5, 17, 21});
+  TF_EXPECT_OK(LiteralUtil::Copy(*vect, {5}, zero.get(), {}, {}));
+  EXPECT_EQ(LiteralUtil::Get<uint32>(*zero, {}), 17);
+  TF_EXPECT_OK(LiteralUtil::Copy(*zero, {}, vect.get(), {4}, {}));
+  EXPECT_EQ(LiteralUtil::Get<uint32>(*vect, {4}), 17);
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index ee265c6688..38668856a3 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -209,6 +209,12 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
                                    HloInstruction* operand, HloInstruction* max,
                                    HloInstruction* max_operand);
 
+  // Tries to constant fold a concatenate operation, and returns true if the
+  // operation has been performed. An error status is returned in case of error.
+  StatusOr<bool> TryConcatenateConstantFold(
+      HloInstruction* concatenate,
+      tensorflow::gtl::ArraySlice<HloInstruction*> operands);
+
   // A Reshape or Broadcast that feeds an element-wise operation with a unique
   // non-scalar operand can sink to after the operation.
   StatusOr<bool> TryToSinkReshapeOrBroadcastAfterOpWithUniqueNonScalarOperand(
@@ -301,14 +307,78 @@ Status AlgebraicSimplifierVisitor::HandleCopy(HloInstruction* copy,
   return Status::OK();
 }
 
+StatusOr<bool> AlgebraicSimplifierVisitor::TryConcatenateConstantFold(
+    HloInstruction* concatenate,
+    tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
+  if (operands[0]->opcode() == HloOpcode::kConstant) {
+    // If all the operands of a concatenate are constant, fold them into a
+    // single constant tensor.
+    // The concatenate dimension is going to be the sum of all the concatenate
+    // dimensions.
+    int64 concat_dim = concatenate->dimensions()[0];
+    const Shape& reference_shape = operands[0]->shape();
+    if (ShapeUtil::IsTuple(reference_shape)) {
+      VLOG(5) << "Tuples not currently supported by the concatenate constant"
+                 " folder";
+      return false;
+    }
+    int64 rank = ShapeUtil::Rank(reference_shape);
+    std::vector<int64> concat_dimensions(reference_shape.dimensions().begin(),
+                                         reference_shape.dimensions().end());
+    if (concat_dim < 0) {
+      concat_dim += rank;
+    }
+    for (int64 i = 1; i < operands.size(); ++i) {
+      const Shape& operand_shape = operands[i]->shape();
+      if (operands[i]->opcode() != HloOpcode::kConstant ||
+          ShapeUtil::IsTuple(operand_shape)) {
+        return false;
+      }
+      // Accumulate the concat dimension from all tensors taking part to the
+      // operation.
+      concat_dimensions[concat_dim] +=
+          ShapeUtil::GetDimension(operand_shape, concat_dim);
+    }
+
+    auto literal = LiteralUtil::CreateFromDimensions(
+        reference_shape.element_type(), concat_dimensions);
+    std::vector<int64> source_indices(rank, 0);
+    std::vector<int64> dest_indices(concat_dimensions.size(), 0);
+    for (auto operand : operands) {
+      const Shape& operand_shape = operand->shape();
+      Status status = LiteralUtil::Copy(
+          operand->literal(), source_indices, literal.get(), dest_indices,
+          AsInt64Slice(operand_shape.dimensions()));
+      if (!status.ok()) {
+        VLOG(1) << "Error while creating concatenated literal : " << status;
+        return false;
+      }
+      dest_indices[concat_dim] +=
+          ShapeUtil::GetDimension(operand_shape, concat_dim);
+    }
+    TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
+        concatenate, HloInstruction::CreateConstant(std::move(literal))));
+    changed_ = true;
+    return true;
+  }
+  return false;
+}
+
 Status AlgebraicSimplifierVisitor::HandleConcatenate(
     HloInstruction* concatenate,
     tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
-  // Unary concatenates are useless.
   if (operands.size() == 1) {
+    // Unary concatenates are useless.
     ReplaceInstructionIfSameShape(concatenate, operands[0]);
     return Status::OK();
   }
+  // If all the concatenate operands are constant, this will get folded into a
+  // new constant literal.
+  TF_ASSIGN_OR_RETURN(bool folded,
+                      TryConcatenateConstantFold(concatenate, operands));
+  if (folded) {
+    return Status::OK();
+  }
   // Filter out and remove empty operands.
   std::vector<HloInstruction*> nonempty_operands;
   for (HloInstruction* operand : operands) {
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 77b8fca1a9..8c28ef30ef 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -1620,5 +1620,46 @@ TEST_F(AlgebraicSimplifierTest, IteratorInvalidation) {
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 }
 
+TEST_F(AlgebraicSimplifierTest, Concatenate) {
+  const struct TestConfig {
+    int concat_dimension;
+    tensorflow::gtl::ArraySlice<int64> dimensions;
+    tensorflow::gtl::ArraySlice<int64> concat_sizes;
+  } test_configs[] = {
+      {1, {11, 0, 7, 5, 9}, {2, 5, 7, 11}},
+      {3, {1, 4, 17, 0, 8}, {1, 3, 9, 12}},
+  };
+
+  for (auto& test_config : test_configs) {
+    HloComputation::Builder builder(TestName());
+    std::vector<int64> dimensions(test_config.dimensions.begin(),
+                                  test_config.dimensions.end());
+    int64 concat_size = 0;
+    std::vector<HloInstruction*> operands;
+    for (auto csize : test_config.concat_sizes) {
+      dimensions[test_config.concat_dimension] = csize;
+      concat_size += csize;
+      auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
+      HloInstruction* insn = builder.AddInstruction(
+          HloInstruction::CreateConstant(std::move(literal)));
+      operands.push_back(insn);
+    }
+    dimensions[test_config.concat_dimension] = concat_size;
+    Shape shape = ShapeUtil::MakeShape(F32, dimensions);
+    builder.AddInstruction(HloInstruction::CreateConcatenate(
+        shape, operands, test_config.concat_dimension));
+    HloModule module(TestName());
+    auto computation = module.AddEntryComputation(builder.Build());
+
+    AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                   non_bitcasting_callback());
+    ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+
+    HloInstruction* root = computation->root_instruction();
+    EXPECT_EQ(root->opcode(), HloOpcode::kConstant);
+    EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+  }
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/shape_util.cc b/tensorflow/compiler/xla/shape_util.cc
index 57d91e4bfc..b558e31ee9 100644
--- a/tensorflow/compiler/xla/shape_util.cc
+++ b/tensorflow/compiler/xla/shape_util.cc
@@ -1047,4 +1047,29 @@ ShapeUtil::DimensionsUnmodifiedByReshape(const Shape& input_shape,
   return shape;
 }
 
+/* static */ void ShapeUtil::ForEachIndex(
+    const Shape& shape, tensorflow::gtl::ArraySlice<int64> base,
+    tensorflow::gtl::ArraySlice<int64> count,
+    tensorflow::gtl::ArraySlice<int64> incr,
+    const IndexVisitorFunction& visitor_function) {
+  DCHECK_EQ(Rank(shape), base.size());
+  DCHECK_EQ(incr.size(), base.size());
+  DCHECK_EQ(count.size(), base.size());
+  const Layout& layout = shape.layout();
+  int64 rank = layout.minor_to_major_size();
+  int64 n = 0;
+  std::vector<int64> indexes(base.begin(), base.end());
+  while (n < rank && visitor_function(indexes)) {
+    // Increments dimensions in minor to major order.
+    for (n = 0; n < rank; ++n) {
+      int64 dim = layout.minor_to_major(n);
+      indexes[dim] += incr[dim];
+      if (indexes[dim] < base[dim] + count[dim]) {
+        break;
+      }
+      indexes[dim] = base[dim];
+    }
+  }
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/shape_util.h b/tensorflow/compiler/xla/shape_util.h
index 68e138e6ac..a3da36b7c6 100644
--- a/tensorflow/compiler/xla/shape_util.h
+++ b/tensorflow/compiler/xla/shape_util.h
@@ -390,6 +390,19 @@ class ShapeUtil {
   static Shape FilterDimensions(const std::function<bool(int64)>& p,
                                 Shape shape);
 
+  // Iterates through all the shape indexes, in minor to major order, starting
+  // from the base indexes, incrementing by the incr steps, up to count
+  // (index[i] < base[i] + count[i]), and calls the visitor_function with the
+  // current index.
+  // The visitor_function visitor function should return true if it wants to
+  // continue, or false otherwise.
+  using IndexVisitorFunction = std::function<bool(const std::vector<int64>&)>;
+  static void ForEachIndex(const Shape& shape,
+                           tensorflow::gtl::ArraySlice<int64> base,
+                           tensorflow::gtl::ArraySlice<int64> count,
+                           tensorflow::gtl::ArraySlice<int64> incr,
+                           const IndexVisitorFunction& visitor_function);
+
  private:
   // Validates all of the non-layout properties of the shape -- this is a helper
   // used by both the layout-optional and layout-required public method.
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h
index 32b5fbba00..236728f417 100644
--- a/tensorflow/compiler/xla/util.h
+++ b/tensorflow/compiler/xla/util.h
@@ -139,6 +139,18 @@ bool ContainersEqual(const Container1T& c1, const Container2T& c2,
           std::equal(std::begin(c1), std::end(c1), std::begin(c2), p));
 }
 
+// Performs a copy of count values from src to dest, using different strides for
+// source and destination. The source starting index is src_base, while the
+// destination one is dest_base.
+template <typename D, typename S>
+void StridedCopy(tensorflow::protobuf::RepeatedField<D>* dest, int64 dest_base,
+                 int64 dest_stride, tensorflow::gtl::ArraySlice<S> src,
+                 int64 src_base, int64 src_stride, int64 count) {
+  for (; count > 0; --count, dest_base += dest_stride, src_base += src_stride) {
+    dest->Set(dest_base, static_cast<D>(src[src_base]));
+  }
+}
+
 // Adds some context information to the error message in a
 // Status.  This is useful as Statuses are
 // propagated upwards.
-- 
GitLab


From a362e0d0554f684862746c4c6f88d34308681795 Mon Sep 17 00:00:00 2001
From: "Yuan (Terry) Tang" <terrytangyuan@users.noreply.github.com>
Date: Thu, 27 Apr 2017 10:44:35 -0500
Subject: [PATCH 0739/1563] Removed legacy rnn constructors (#9389)

* Removed legacy rnn constructors

* Remove unused _get_dropout_and_num_units
---
 .../learn/estimators/dynamic_rnn_estimator.py | 350 ------------------
 .../estimators/dynamic_rnn_estimator_test.py  |  50 ---
 .../estimators/state_saving_rnn_estimator.py  | 177 ---------
 .../state_saving_rnn_estimator_test.py        |  51 ---
 4 files changed, 628 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
index 525f84d511..cf80dafc37 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
@@ -540,20 +540,6 @@ def _get_dynamic_rnn_model_fn(
   return _dynamic_rnn_model_fn
 
 
-def _get_dropout_and_num_units(num_units,
-                               num_rnn_layers,
-                               input_keep_probability,
-                               output_keep_probability):
-  """Helper function for deprecated factory functions."""
-  dropout_keep_probabilities = None
-  num_units = [num_units for _ in range(num_rnn_layers)]
-  if input_keep_probability or output_keep_probability:
-    dropout_keep_probabilities = ([input_keep_probability]
-                                  + [1.0] * (num_rnn_layers - 1)
-                                  + [output_keep_probability])
-  return dropout_keep_probabilities, num_units
-
-
 class DynamicRnnEstimator(estimator.Estimator):
 
   def __init__(self,
@@ -704,339 +690,3 @@ class DynamicRnnEstimator(estimator.Estimator):
         model_dir=model_dir,
         config=config,
         feature_engineering_fn=feature_engineering_fn)
-
-
-@deprecated('2017-04-01',
-            'multi_value_rnn_regressor is deprecated. '
-            'Please construct a DynamicRnnEstimator directly.')
-def multi_value_rnn_regressor(num_units,
-                              sequence_feature_columns,
-                              context_feature_columns=None,
-                              cell_type='basic_rnn',
-                              num_rnn_layers=1,
-                              optimizer_type='SGD',
-                              learning_rate=0.1,
-                              momentum=None,
-                              gradient_clipping_norm=5.0,
-                              input_keep_probability=None,
-                              output_keep_probability=None,
-                              model_dir=None,
-                              config=None,
-                              feature_engineering_fn=None):
-  """Creates a `DynamicRnnEstimator` for multi-value regression.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a sequence of continuous values.
-
-  Args:
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.LINEAR_REGRESSION,
-      prediction_type=rnn_common.PredictionType.MULTIPLE_VALUE,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
-
-
-@deprecated('2017-04-01',
-            'multi_value_rnn_classifier is deprecated. '
-            'Please construct a DynamicRNNEstimator directly.')
-def multi_value_rnn_classifier(num_classes,
-                               num_units,
-                               sequence_feature_columns,
-                               context_feature_columns=None,
-                               cell_type='basic_rnn',
-                               num_rnn_layers=1,
-                               optimizer_type='SGD',
-                               learning_rate=0.1,
-                               predict_probabilities=False,
-                               momentum=None,
-                               gradient_clipping_norm=5.0,
-                               input_keep_probability=None,
-                               output_keep_probability=None,
-                               model_dir=None,
-                               config=None,
-                               feature_engineering_fn=None):
-  """Creates a `DynamicRNNEstimator` for multi-value classification.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a sequence of classifications, along with
-  (optionally) a probability distribution over classes.
-
-  Args:
-    num_classes: The number of classes for categorization.
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    predict_probabilities: A boolean indicating whether to predict probabilities
-      for all classes.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.CLASSIFICATION,
-      prediction_type=rnn_common.PredictionType.MULTIPLE_VALUE,
-      num_classes=num_classes,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=predict_probabilities,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
-
-
-@deprecated('2017-04-01',
-            'single_value_rnn_regressor is deprecated. '
-            'Please construct a DynamicRnnEstimator directly.')
-def single_value_rnn_regressor(num_units,
-                               sequence_feature_columns,
-                               context_feature_columns=None,
-                               cell_type='basic_rnn',
-                               num_rnn_layers=1,
-                               optimizer_type='SGD',
-                               learning_rate=0.1,
-                               momentum=None,
-                               gradient_clipping_norm=5.0,
-                               input_keep_probability=None,
-                               output_keep_probability=None,
-                               model_dir=None,
-                               config=None,
-                               feature_engineering_fn=None):
-  """Creates a `DynamicRnnEstimator` for single-value regression.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a single continuous values.
-
-  Args:
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.LINEAR_REGRESSION,
-      prediction_type=rnn_common.PredictionType.SINGLE_VALUE,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
-
-
-@deprecated('2017-04-01',
-            'single_value_rnn_classifier is deprecated. '
-            'Please construct a DynamicRnnEstimator directly.')
-def single_value_rnn_classifier(num_classes,
-                                num_units,
-                                sequence_feature_columns,
-                                context_feature_columns=None,
-                                cell_type='basic_rnn',
-                                num_rnn_layers=1,
-                                optimizer_type='SGD',
-                                learning_rate=0.1,
-                                predict_probabilities=False,
-                                momentum=None,
-                                gradient_clipping_norm=5.0,
-                                input_keep_probability=None,
-                                output_keep_probability=None,
-                                model_dir=None,
-                                config=None,
-                                feature_engineering_fn=None):
-  """Creates a `DynamicRnnEstimator` for single-value classification.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a single classifications, along with
-  (optionally) a probability distribution over classes.
-
-  Args:
-    num_classes: The number of classes for categorization.
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    predict_probabilities: A boolean indicating whether to predict probabilities
-      for all classes.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.CLASSIFICATION,
-      prediction_type=rnn_common.PredictionType.SINGLE_VALUE,
-      num_classes=num_classes,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=predict_probabilities,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
index 43b3d2a78f..61a6168a9e 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
@@ -410,56 +410,6 @@ class DynamicRnnEstimatorTest(test.TestCase):
       state_piece = prediction_dict[dynamic_rnn_estimator._get_state_name(i)]
       self.assertListEqual(list(state_piece.shape), [batch_size, state_size])
 
-  def testLegacyConstructor(self):
-    """Exercise legacy constructor function."""
-    num_units = 16
-    num_layers = 6
-    output_keep_prob = 0.9
-    input_keep_prob = 0.7
-    batch_size = 11
-    learning_rate = 0.1
-    train_sequence_length = 21
-    train_steps = 121
-
-    def get_input_fn(batch_size, sequence_length, state_dict, starting_step=0):
-
-      def input_fn():
-        sequence = constant_op.constant(
-            [[(starting_step + i + j) % 2 for j in range(sequence_length + 1)]
-             for i in range(batch_size)],
-            dtype=dtypes.int32)
-        labels = array_ops.slice(sequence, [0, 0],
-                                 [batch_size, sequence_length])
-        inputs = array_ops.expand_dims(
-            math_ops.to_float(
-                array_ops.slice(sequence, [0, 1], [batch_size, sequence_length
-                                                  ])), 2)
-        input_dict = state_dict
-        input_dict['inputs'] = inputs
-        return input_dict, labels
-
-      return input_fn
-
-    seq_columns = [feature_column.real_valued_column('inputs', dimension=1)]
-    config = run_config.RunConfig(tf_random_seed=21212)
-
-    model_dir = tempfile.mkdtemp()
-    sequence_estimator = dynamic_rnn_estimator.multi_value_rnn_classifier(
-        num_classes=2,
-        num_units=num_units,
-        num_rnn_layers=num_layers,
-        input_keep_probability=input_keep_prob,
-        output_keep_probability=output_keep_prob,
-        sequence_feature_columns=seq_columns,
-        learning_rate=learning_rate,
-        config=config,
-        model_dir=model_dir)
-
-    train_input_fn = get_input_fn(
-        batch_size, train_sequence_length, state_dict={})
-
-    sequence_estimator.fit(input_fn=train_input_fn, steps=train_steps)
-
   def testMultipleRuns(self):
     """Tests resuming training by feeding state."""
     cell_sizes = [4, 7]
diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
index e09278bc63..64a97880c3 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
@@ -652,180 +652,3 @@ class StateSavingRnnEstimator(estimator.Estimator):
         model_dir=model_dir,
         config=config,
         feature_engineering_fn=feature_engineering_fn)
-
-
-@deprecated('2017-04-01', 'multi_value_rnn_regressor is deprecated. '
-            'Please construct a StateSavingRnnEstimator directly.')
-def multi_value_rnn_regressor(num_units,
-                              num_unroll,
-                              batch_size,
-                              sequence_feature_columns,
-                              context_feature_columns=None,
-                              num_rnn_layers=1,
-                              optimizer_type='SGD',
-                              learning_rate=0.1,
-                              momentum=None,
-                              gradient_clipping_norm=5.0,
-                              dropout_keep_probabilities=None,
-                              model_dir=None,
-                              config=None,
-                              feature_engineering_fn=None,
-                              num_threads=3,
-                              queue_capacity=1000,
-                              seed=None):
-  """Creates a RNN `Estimator` that predicts sequences of values.
-
-  Args:
-    num_units: The size of the RNN cells.
-    num_unroll: Python integer, how many time steps to unroll at a time.
-      The input sequences of length `k` are then split into `k / num_unroll`
-      many segments.
-    batch_size: Python integer, the size of the minibatch.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    num_rnn_layers: Number of RNN layers.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer` or a string. Strings must be
-      one of 'Adagrad', 'Momentum' or 'SGD'.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    dropout_keep_probabilities: a list of dropout keep probabilities or `None`.
-        If given a list, it must have length `num_rnn_layers + 1`.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-    num_threads: The Python integer number of threads enqueuing input examples
-      into a queue. Defaults to 3.
-    queue_capacity: The max capacity of the queue in number of examples.
-      Needs to be at least `batch_size`. Defaults to 1000. When iterating
-      over the same input example multiple times reusing their keys the
-      `queue_capacity` must be smaller than the number of examples.
-    seed: Fixes the random seed used for generating input keys by the SQSS.
-  Returns:
-    An initialized `Estimator`.
-  """
-  num_units = [num_units for _ in range(num_rnn_layers)]
-  return StateSavingRnnEstimator(
-      constants.ProblemType.LINEAR_REGRESSION,
-      num_unroll,
-      batch_size,
-      sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_classes=None,
-      num_units=num_units,
-      cell_type='lstm',
-      optimizer_type=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=False,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      config=config,
-      feature_engineering_fn=feature_engineering_fn,
-      num_threads=num_threads,
-      queue_capacity=queue_capacity,
-      seed=seed)
-
-
-@deprecated('2017-04-01', 'multi_value_rnn_classifier is deprecated. '
-            'Please construct a StateSavingRnnEstimator directly.')
-def multi_value_rnn_classifier(num_classes,
-                               num_units,
-                               num_unroll,
-                               batch_size,
-                               sequence_feature_columns,
-                               context_feature_columns=None,
-                               num_rnn_layers=1,
-                               optimizer_type='SGD',
-                               learning_rate=0.1,
-                               predict_probabilities=False,
-                               momentum=None,
-                               gradient_clipping_norm=5.0,
-                               dropout_keep_probabilities=None,
-                               model_dir=None,
-                               config=None,
-                               feature_engineering_fn=None,
-                               num_threads=3,
-                               queue_capacity=1000,
-                               seed=None):
-  """Creates a RNN `Estimator` that predicts sequences of labels.
-
-  Args:
-    num_classes: The number of classes for categorization.
-    num_units: The size of the RNN cells.
-    num_unroll: Python integer, how many time steps to unroll at a time.
-      The input sequences of length `k` are then split into `k / num_unroll`
-      many segments.
-    batch_size: Python integer, the size of the minibatch.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    num_rnn_layers: Number of RNN layers.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer` or a string. Strings must be
-      one of 'Adagrad', 'Momentum' or 'SGD'.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    predict_probabilities: A boolean indicating whether to predict probabilities
-      for all classes.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    dropout_keep_probabilities: a list of dropout keep probabilities or `None`.
-        If given a list, it must have length `num_rnn_layers + 1`.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-    num_threads: The Python integer number of threads enqueuing input examples
-      into a queue. Defaults to 3.
-    queue_capacity: The max capacity of the queue in number of examples.
-      Needs to be at least `batch_size`. Defaults to 1000. When iterating
-      over the same input example multiple times reusing their keys the
-      `queue_capacity` must be smaller than the number of examples.
-    seed: Fixes the random seed used for generating input keys by the SQSS.
-  Returns:
-    An initialized `Estimator`.
-  """
-  num_units = [num_units for _ in range(num_rnn_layers)]
-  return StateSavingRnnEstimator(
-      constants.ProblemType.CLASSIFICATION,
-      num_unroll,
-      batch_size,
-      sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_classes=num_classes,
-      num_units=num_units,
-      cell_type='lstm',
-      optimizer_type=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=predict_probabilities,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      config=config,
-      feature_engineering_fn=feature_engineering_fn,
-      num_threads=num_threads,
-      queue_capacity=queue_capacity,
-      seed=seed)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
index f5bd03429c..e7470a544f 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
@@ -455,57 +455,6 @@ class LegacyConstructorTest(test.TestCase):
       return {'inputs': inputs}, labels
     return input_fn
 
-  def testClassifierConstructor(self):
-    batch_size = 16
-    num_classes = 2
-    num_unroll = 32
-    sequence_length = 32
-    num_units = 4
-    learning_rate = 0.5
-    steps = 100
-    input_fn = self._get_input_fn(sequence_length,
-                                  seed=1234)
-    model_dir = tempfile.mkdtemp()
-    seq_columns = [
-        feature_column.real_valued_column(
-            'inputs', dimension=num_units)
-    ]
-    estimator = ssre.multi_value_rnn_classifier(num_classes,
-                                                num_units,
-                                                num_unroll,
-                                                batch_size,
-                                                seq_columns,
-                                                learning_rate=learning_rate,
-                                                model_dir=model_dir,
-                                                queue_capacity=batch_size+2,
-                                                seed=1234)
-    estimator.fit(input_fn=input_fn, steps=steps)
-
-  def testRegressorConstructor(self):
-    batch_size = 16
-    num_unroll = 32
-    sequence_length = 32
-    num_units = 4
-    learning_rate = 0.5
-    steps = 100
-    input_fn = self._get_input_fn(sequence_length,
-                                  seed=4321)
-    model_dir = tempfile.mkdtemp()
-    seq_columns = [
-        feature_column.real_valued_column(
-            'inputs', dimension=num_units)
-    ]
-    estimator = ssre.multi_value_rnn_regressor(num_units,
-                                               num_unroll,
-                                               batch_size,
-                                               seq_columns,
-                                               learning_rate=learning_rate,
-                                               model_dir=model_dir,
-                                               queue_capacity=batch_size+2,
-                                               seed=1234)
-    estimator.fit(input_fn=input_fn, steps=steps)
-
-
 # TODO(jtbates): move all tests below to a benchmark test.
 class StateSavingRNNEstimatorLearningTest(test.TestCase):
   """Learning tests for state saving RNN Estimators."""
-- 
GitLab


From 0db6371fd87bd9545a81a039258382d7151b309a Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 27 Apr 2017 07:38:14 -0800
Subject: [PATCH 0740/1563] Initial move of tf.contrib.distributions to core: *
 Move distribution_utils * Move base distribution classes * Move Bijector
 class * Move a unit test just to establish the directory structure. Change:
 154426175

---
 tensorflow/BUILD                              |   2 +
 .../python/ops/stochastic_tensor_impl.py      |   2 +-
 .../python/ops/variational_inference_impl.py  |   2 +-
 tensorflow/contrib/cmake/tf_python.cmake      |   2 +
 tensorflow/contrib/distributions/BUILD        |  21 +-
 tensorflow/contrib/distributions/__init__.py  |   4 +-
 .../python/kernel_tests/logistic_test.py      |   2 +-
 .../kernel_tests/operator_pd_cholesky_test.py |   6 +-
 .../distributions/python/ops/bernoulli.py     |   4 +-
 .../contrib/distributions/python/ops/beta.py  |   4 +-
 .../python/ops/bijectors/__init__.py          |   2 +-
 .../python/ops/bijectors/affine_impl.py       |   2 +-
 .../bijectors/affine_linear_operator_impl.py  |   2 +-
 .../python/ops/bijectors/chain_impl.py        |   2 +-
 .../bijectors/cholesky_outer_product_impl.py  |   4 +-
 .../bijectors/conditional_bijector_impl.py    |   4 +-
 .../python/ops/bijectors/identity_impl.py     |   2 +-
 .../python/ops/bijectors/inline_impl.py       |   2 +-
 .../python/ops/bijectors/invert_impl.py       |   2 +-
 .../ops/bijectors/power_transform_impl.py     |   2 +-
 .../python/ops/bijectors/sigmoid_impl.py      |   2 +-
 .../ops/bijectors/softmax_centered_impl.py    |   2 +-
 .../python/ops/bijectors/softplus_impl.py     |   4 +-
 .../distributions/python/ops/binomial.py      |   4 +-
 .../distributions/python/ops/categorical.py   |   4 +-
 .../conditional_transformed_distribution.py   |   4 +-
 .../distributions/python/ops/deterministic.py |   2 +-
 .../distributions/python/ops/dirichlet.py     |   4 +-
 .../python/ops/dirichlet_multinomial.py       |   4 +-
 .../python/ops/distribution_util.py           | 672 +----------------
 .../contrib/distributions/python/ops/gamma.py |   4 +-
 .../distributions/python/ops/geometric.py     |   4 +-
 .../distributions/python/ops/gumbel.py        |   2 +-
 .../distributions/python/ops/inverse_gamma.py |   4 +-
 .../distributions/python/ops/laplace.py       |   2 +-
 .../distributions/python/ops/logistic.py      |   2 +-
 .../distributions/python/ops/mixture.py       |   4 +-
 .../distributions/python/ops/multinomial.py   |   4 +-
 .../python/ops/mvn_linear_operator.py         |   2 +-
 .../distributions/python/ops/mvn_tril.py      |   2 +-
 .../python/ops/negative_binomial.py           |   4 +-
 .../distributions/python/ops/normal.py        |   2 +-
 .../python/ops/onehot_categorical.py          |   4 +-
 .../python/ops/operator_pd_full.py            |   2 +-
 .../distributions/python/ops/poisson.py       |   4 +-
 .../python/ops/quantized_distribution.py      |   4 +-
 .../python/ops/relaxed_bernoulli.py           |   2 +-
 .../python/ops/relaxed_onehot_categorical.py  |   4 +-
 .../contrib/distributions/python/ops/shape.py |   2 +-
 .../distributions/python/ops/student_t.py     |   4 +-
 .../python/ops/transformed_distribution.py    |   4 +-
 .../distributions/python/ops/uniform.py       |   2 +-
 .../python/ops/vector_student_t.py            |   2 +-
 .../distributions/python/ops/wishart.py       |   4 +-
 tensorflow/python/BUILD                       |   1 +
 .../python/kernel_tests/distributions/BUILD   |  42 ++
 .../kernel_tests/distributions/__init__.py    |  18 +
 .../distributions}/bijector_test.py           |   8 +-
 tensorflow/python/ops/distributions/BUILD     |  41 ++
 .../python/ops/distributions/__init__.py      |  18 +
 .../ops/distributions}/bijector.py            |   2 +-
 .../ops/distributions}/bijector_impl.py       |   0
 .../conditional_distribution.py               |   2 +-
 .../ops/distributions}/distribution.py        |   9 +-
 tensorflow/python/ops/distributions/util.py   | 693 ++++++++++++++++++
 65 files changed, 907 insertions(+), 776 deletions(-)
 create mode 100644 tensorflow/python/kernel_tests/distributions/BUILD
 create mode 100644 tensorflow/python/kernel_tests/distributions/__init__.py
 rename tensorflow/{contrib/distributions/python/kernel_tests/bijectors => python/kernel_tests/distributions}/bijector_test.py (95%)
 create mode 100644 tensorflow/python/ops/distributions/BUILD
 create mode 100644 tensorflow/python/ops/distributions/__init__.py
 rename tensorflow/{contrib/distributions/python/ops/bijectors => python/ops/distributions}/bijector.py (92%)
 rename tensorflow/{contrib/distributions/python/ops/bijectors => python/ops/distributions}/bijector_impl.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/conditional_distribution.py (97%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/distribution.py (99%)
 create mode 100644 tensorflow/python/ops/distributions/util.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index d55228bf50..7a706b3b02 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -307,6 +307,8 @@ filegroup(
         "//tensorflow/python/debug:all_files",
         "//tensorflow/python/estimator:all_files",
         "//tensorflow/python/kernel_tests:all_files",
+        "//tensorflow/python/kernel_tests/distributions:all_files",
+        "//tensorflow/python/ops/distributions:all_files",
         "//tensorflow/python/saved_model:all_files",
         "//tensorflow/python/tools:all_files",
         "//tensorflow/tensorboard:all_files",
diff --git a/tensorflow/contrib/bayesflow/python/ops/stochastic_tensor_impl.py b/tensorflow/contrib/bayesflow/python/ops/stochastic_tensor_impl.py
index b810ad3093..ce5fdd98c6 100644
--- a/tensorflow/contrib/bayesflow/python/ops/stochastic_tensor_impl.py
+++ b/tensorflow/contrib/bayesflow/python/ops/stochastic_tensor_impl.py
@@ -48,9 +48,9 @@ import threading
 import six
 
 from tensorflow.contrib.bayesflow.python.ops import stochastic_gradient_estimators as sge
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import distribution
 
 STOCHASTIC_TENSOR_COLLECTION = "_stochastic_tensor_collection_"
 
diff --git a/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py b/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py
index 6a8577234f..3d3533461c 100644
--- a/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py
+++ b/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py
@@ -28,10 +28,10 @@ from __future__ import print_function
 
 from tensorflow.contrib.bayesflow.python.ops import stochastic_graph_impl as sg
 from tensorflow.contrib.bayesflow.python.ops import stochastic_tensor_impl as st
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import distribution
 from tensorflow.python.platform import tf_logging as logging
 
 VI_PRIORS = "__vi_priors__"
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index eaa6a9a6ab..39f5edf25d 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -206,11 +206,13 @@ add_python_module("tensorflow/python/estimator/inputs/queues")
 add_python_module("tensorflow/python/framework")
 add_python_module("tensorflow/python/grappler")
 add_python_module("tensorflow/python/kernel_tests")
+add_python_module("tensorflow/python/kernel_tests/distributions")
 add_python_module("tensorflow/python/layers")
 add_python_module("tensorflow/python/lib")
 add_python_module("tensorflow/python/lib/core")
 add_python_module("tensorflow/python/lib/io")
 add_python_module("tensorflow/python/ops")
+add_python_module("tensorflow/python/ops/distributions")
 add_python_module("tensorflow/python/ops/losses")
 add_python_module("tensorflow/python/platform")
 add_python_module("tensorflow/python/platform/default")
diff --git a/tensorflow/contrib/distributions/BUILD b/tensorflow/contrib/distributions/BUILD
index f55859261b..b58bdc7591 100644
--- a/tensorflow/contrib/distributions/BUILD
+++ b/tensorflow/contrib/distributions/BUILD
@@ -29,6 +29,7 @@ py_library(
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:special_math_ops",
+        "//tensorflow/python/ops/distributions",
         "//third_party/py/numpy",
         "@six_archive//:six",
     ],
@@ -54,6 +55,7 @@ py_library(
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:special_math_ops",
+        "//tensorflow/python/ops/distributions",
         "//third_party/py/numpy",
         "@six_archive//:six",
     ],
@@ -813,25 +815,6 @@ filegroup(
 
 # === Bijector Tests ==========================================================
 
-cuda_py_test(
-    name = "bijector_test",
-    size = "small",
-    srcs = ["python/kernel_tests/bijectors/bijector_test.py"],
-    additional_deps = [
-        ":bijectors_py",
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "@six_archive//:six",
-        "//tensorflow/contrib/linalg:linalg_py",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "conditional_bijector_test",
     size = "small",
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 257aefa857..6d1a0a4390 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -96,12 +96,10 @@ from tensorflow.contrib.distributions.python.ops.beta import *
 from tensorflow.contrib.distributions.python.ops.binomial import *
 from tensorflow.contrib.distributions.python.ops.categorical import *
 from tensorflow.contrib.distributions.python.ops.chi2 import *
-from tensorflow.contrib.distributions.python.ops.conditional_distribution import *
 from tensorflow.contrib.distributions.python.ops.conditional_transformed_distribution import *
 from tensorflow.contrib.distributions.python.ops.deterministic import *
 from tensorflow.contrib.distributions.python.ops.dirichlet import *
 from tensorflow.contrib.distributions.python.ops.dirichlet_multinomial import *
-from tensorflow.contrib.distributions.python.ops.distribution import *
 from tensorflow.contrib.distributions.python.ops.distribution_util import matrix_diag_transform
 from tensorflow.contrib.distributions.python.ops.distribution_util import softplus_inverse
 from tensorflow.contrib.distributions.python.ops.exponential import *
@@ -129,6 +127,8 @@ from tensorflow.contrib.distributions.python.ops.student_t import *
 from tensorflow.contrib.distributions.python.ops.transformed_distribution import *
 from tensorflow.contrib.distributions.python.ops.uniform import *
 from tensorflow.contrib.distributions.python.ops.wishart import *
+from tensorflow.python.ops.distributions.conditional_distribution import *
+from tensorflow.python.ops.distributions.distribution import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/logistic_test.py b/tensorflow/contrib/distributions/python/kernel_tests/logistic_test.py
index 7d7560c3f5..eb9028e5df 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/logistic_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/logistic_test.py
@@ -20,10 +20,10 @@ from __future__ import print_function
 
 import numpy as np
 from scipy import stats
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.contrib.distributions.python.ops import logistic
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.ops.distributions import distribution
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_cholesky_test.py b/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_cholesky_test.py
index 49ece78b0d..6549992633 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_cholesky_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/operator_pd_cholesky_test.py
@@ -19,16 +19,14 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib import distributions as distributions_lib
-from tensorflow.contrib.distributions.python.ops import distribution_util
+from tensorflow.contrib import distributions
 from tensorflow.contrib.distributions.python.ops import operator_pd_cholesky
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import util as distribution_util
 from tensorflow.python.platform import test
 
-distributions = distributions_lib
-
 
 def softplus(x):
   return np.log(1 + np.exp(x))
diff --git a/tensorflow/contrib/distributions/python/ops/bernoulli.py b/tensorflow/contrib/distributions/python/ops/bernoulli.py
index c491cb5d42..7c29b7cdb2 100644
--- a/tensorflow/contrib/distributions/python/ops/bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/bernoulli.py
@@ -18,8 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -30,6 +28,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class Bernoulli(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/beta.py b/tensorflow/contrib/distributions/python/ops/beta.py
index 463808ea9a..2866a7d9ff 100644
--- a/tensorflow/contrib/distributions/python/ops/beta.py
+++ b/tensorflow/contrib/distributions/python/ops/beta.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -33,6 +31,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
index db03705608..e1d31e373c 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
@@ -39,7 +39,6 @@ from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops.bijectors.affine import *
 from tensorflow.contrib.distributions.python.ops.bijectors.affine_linear_operator import *
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector import *
 from tensorflow.contrib.distributions.python.ops.bijectors.chain import *
 from tensorflow.contrib.distributions.python.ops.bijectors.cholesky_outer_product import *
 from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import *
@@ -52,6 +51,7 @@ from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import *
 from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid_centered import *
 from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import *
 from tensorflow.contrib.distributions.python.ops.bijectors.softplus import *
+from tensorflow.python.ops.distributions.bijector import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
 
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/affine_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/affine_impl.py
index 429f7eac4d..d44e258bd2 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/affine_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/affine_impl.py
@@ -22,7 +22,6 @@ from tensorflow.contrib.distributions.python.ops import operator_pd_cholesky
 from tensorflow.contrib.distributions.python.ops import operator_pd_diag
 from tensorflow.contrib.distributions.python.ops import operator_pd_identity
 from tensorflow.contrib.distributions.python.ops import operator_pd_vdvt_update
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.contrib.distributions.python.ops.shape import _DistributionShape
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -32,6 +31,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py
index a8e93bd2c7..c1be9d5a77 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.contrib.distributions.python.ops.shape import _DistributionShape
 from tensorflow.contrib.linalg.python.ops import linear_operator
 from tensorflow.python.framework import constant_op
@@ -27,6 +26,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/chain_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/chain_impl.py
index 0b72c5aadf..defa36a140 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/chain_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/chain_impl.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import itertools
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.python.framework import constant_op
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/cholesky_outer_product_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/cholesky_outer_product_impl.py
index e605aec9c3..dc05b2f611 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/cholesky_outer_product_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/cholesky_outer_product_impl.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
@@ -29,6 +27,8 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import bijector
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/conditional_bijector_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/conditional_bijector_impl.py
index a1b2aef830..ccb1f02927 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/conditional_bijector_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/conditional_bijector_impl.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
+from tensorflow.python.ops.distributions import bijector
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = ["ConditionalBijector"]
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/identity_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/identity_impl.py
index 9438a5226c..f277eda8bb 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/identity_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/identity_impl.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.python.framework import constant_op
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/inline_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/inline_impl.py
index 1f9ec0b171..fab1b22fbf 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/inline_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/inline_impl.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/invert_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/invert_impl.py
index 73d2162ac3..7f28a29857 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/invert_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/invert_impl.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector as bijector_lib
+from tensorflow.python.ops.distributions import bijector as bijector_lib
 
 __all__ = [
     "Invert",
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/power_transform_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/power_transform_impl.py
index 9963d8a7fe..c37db61720 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/power_transform_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/power_transform_impl.py
@@ -18,12 +18,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/sigmoid_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/sigmoid_impl.py
index b8d8152ce3..a640dfe7df 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/sigmoid_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/sigmoid_impl.py
@@ -18,9 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/softmax_centered_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/softmax_centered_impl.py
index 87a5aca1d9..8645cc1b6b 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/softmax_centered_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/softmax_centered_impl.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
@@ -30,6 +29,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import bijector
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
index a1e72ef7f6..5be56e7c8c 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
@@ -18,10 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
-from tensorflow.contrib.distributions.python.ops.bijectors import bijector
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import bijector
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/binomial.py b/tensorflow/contrib/distributions/python/ops/binomial.py
index 78eb44acb2..ecf6a61156 100644
--- a/tensorflow/contrib/distributions/python/ops/binomial.py
+++ b/tensorflow/contrib/distributions/python/ops/binomial.py
@@ -17,8 +17,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -27,6 +25,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 _binomial_sample_note = """
diff --git a/tensorflow/contrib/distributions/python/ops/categorical.py b/tensorflow/contrib/distributions/python/ops/categorical.py
index abdb94b3e9..5848c06769 100644
--- a/tensorflow/contrib/distributions/python/ops/categorical.py
+++ b/tensorflow/contrib/distributions/python/ops/categorical.py
@@ -18,8 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -29,6 +27,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class Categorical(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py b/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py
index 06d0549c35..b0967802bd 100644
--- a/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py
@@ -17,10 +17,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import conditional_distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import conditional_distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 # pylint: disable=protected-access
diff --git a/tensorflow/contrib/distributions/python/ops/deterministic.py b/tensorflow/contrib/distributions/python/ops/deterministic.py
index 6faa272842..850d08d1bd 100644
--- a/tensorflow/contrib/distributions/python/ops/deterministic.py
+++ b/tensorflow/contrib/distributions/python/ops/deterministic.py
@@ -22,7 +22,6 @@ import abc
 
 import six
 
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -32,6 +31,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import distribution
 
 __all__ = [
     "Deterministic",
diff --git a/tensorflow/contrib/distributions/python/ops/dirichlet.py b/tensorflow/contrib/distributions/python/ops/dirichlet.py
index c524f322b0..923696a553 100644
--- a/tensorflow/contrib/distributions/python/ops/dirichlet.py
+++ b/tensorflow/contrib/distributions/python/ops/dirichlet.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
@@ -29,6 +27,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import special_math_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py b/tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py
index e647a4981c..662a765558 100644
--- a/tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py
+++ b/tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py
@@ -18,8 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -28,6 +26,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import special_math_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/distribution_util.py b/tensorflow/contrib/distributions/python/ops/distribution_util.py
index a0872677a9..7ae9c86ee4 100644
--- a/tensorflow/contrib/distributions/python/ops/distribution_util.py
+++ b/tensorflow/contrib/distributions/python/ops/distribution_util.py
@@ -18,619 +18,14 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import functools
-import hashlib
-import math
-import numpy as np
-
 from tensorflow.contrib import linalg
-from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
-from tensorflow.python.framework import tensor_shape
-from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
-from tensorflow.python.ops import nn
-
-
-def assert_close(
-    x, y, data=None, summarize=None, message=None, name="assert_close"):
-  """Assert that that x and y are within machine epsilon of each other.
-
-  Args:
-    x: Floating-point `Tensor`
-    y: Floating-point `Tensor`
-    data: The tensors to print out if the condition is `False`. Defaults to
-      error message and first few entries of `x` and `y`.
-    summarize: Print this many entries of each tensor.
-    message: A string to prefix to the default message.
-    name: A name for this operation (optional).
-
-  Returns:
-    Op raising `InvalidArgumentError` if |x - y| > machine epsilon.
-  """
-  message = message or ""
-  x = ops.convert_to_tensor(x, name="x")
-  y = ops.convert_to_tensor(y, name="y")
-
-  if data is None:
-    data = [
-        message,
-        "Condition x ~= y did not hold element-wise: x = ", x.name, x, "y = ",
-        y.name, y
-    ]
-
-  if x.dtype.is_integer:
-    return check_ops.assert_equal(
-        x, y, data=data, summarize=summarize, message=message, name=name)
-
-  with ops.name_scope(name, "assert_close", [x, y, data]):
-    tol = np.finfo(x.dtype.as_numpy_dtype).eps
-    condition = math_ops.reduce_all(math_ops.less_equal(math_ops.abs(x-y), tol))
-    return control_flow_ops.Assert(
-        condition, data, summarize=summarize)
-
-
-def assert_integer_form(
-    x, data=None, summarize=None, message=None, name="assert_integer_form"):
-  """Assert that x has integer components (or floats equal to integers).
-
-  Args:
-    x: Floating-point `Tensor`
-    data: The tensors to print out if the condition is `False`. Defaults to
-      error message and first few entries of `x` and `y`.
-    summarize: Print this many entries of each tensor.
-    message: A string to prefix to the default message.
-    name: A name for this operation (optional).
-
-  Returns:
-    Op raising `InvalidArgumentError` if round(x) != x.
-  """
-
-  message = message or "x has non-integer components"
-  x = ops.convert_to_tensor(x, name="x")
-  casted_x = math_ops.to_int64(x)
-  return check_ops.assert_equal(
-      x, math_ops.cast(math_ops.round(casted_x), x.dtype),
-      data=data, summarize=summarize, message=message, name=name)
-
-
-def assert_symmetric(matrix):
-  matrix_t = array_ops.matrix_transpose(matrix)
-  return control_flow_ops.with_dependencies(
-      [check_ops.assert_equal(matrix, matrix_t)], matrix)
-
-
-def embed_check_nonnegative_discrete(x, check_integer=True):
-  """Assert x is a non-negative tensor, and optionally of integers."""
-  assertions = [check_ops.assert_non_negative(
-      x, message="x must be non-negative.")]
-  if check_integer:
-    assertions += [assert_integer_form(
-        x, message="x cannot contain fractional components.")]
-  return control_flow_ops.with_dependencies(assertions, x)
-
-
-def same_dynamic_shape(a, b):
-  """Returns whether a and b have the same dynamic shape.
-
-  Args:
-    a: `Tensor`
-    b: `Tensor`
-
-  Returns:
-    `bool` `Tensor` representing if both tensors have the same shape.
-  """
-  a = ops.convert_to_tensor(a, name="a")
-  b = ops.convert_to_tensor(b, name="b")
-
-  # Here we can't just do math_ops.equal(a.shape, b.shape), since
-  # static shape inference may break the equality comparison between
-  # shape(a) and shape(b) in math_ops.equal.
-  def all_shapes_equal():
-    return math_ops.reduce_all(math_ops.equal(
-        array_ops.concat([array_ops.shape(a), array_ops.shape(b)], 0),
-        array_ops.concat([array_ops.shape(b), array_ops.shape(a)], 0)))
-
-  # One of the shapes isn't fully defined, so we need to use the dynamic
-  # shape.
-  return control_flow_ops.cond(
-      math_ops.equal(array_ops.rank(a), array_ops.rank(b)),
-      all_shapes_equal,
-      lambda: constant_op.constant(False))
-
-
-def get_logits_and_probs(logits=None,
-                         probs=None,
-                         multidimensional=False,
-                         validate_args=False,
-                         name="get_logits_and_probs"):
-  """Converts logit to probabilities (or vice-versa), and returns both.
-
-  Args:
-    logits: Floating-point `Tensor` representing log-odds.
-    probs: Floating-point `Tensor` representing probabilities.
-    multidimensional: Python `bool`, default `False`.
-      If `True`, represents whether the last dimension of `logits` or `probs`,
-      a `[N1, N2, ...  k]` dimensional tensor, representing the
-      logit or probability of `shape[-1]` classes.
-    validate_args: Python `bool`, default `False`. When `True`, either assert
-      `0 <= probs <= 1` (if not `multidimensional`) or that the last dimension
-      of `probs` sums to one.
-    name: A name for this operation (optional).
-
-  Returns:
-    logits, probs: Tuple of `Tensor`s. If `probs` has an entry that is `0` or
-      `1`, then the corresponding entry in the returned logit will be `-Inf` and
-      `Inf` respectively.
-
-  Raises:
-    ValueError: if neither `probs` nor `logits` were passed in, or both were.
-  """
-  with ops.name_scope(name, values=[probs, logits]):
-    if (probs is None) == (logits is None):
-      raise ValueError("Must pass probs or logits, but not both.")
-
-    if probs is None:
-      logits = ops.convert_to_tensor(logits, name="logits")
-      if multidimensional:
-        return logits, nn.softmax(logits, name="probs")
-      return logits, math_ops.sigmoid(logits, name="probs")
-
-    probs = ops.convert_to_tensor(probs, name="probs")
-    if validate_args:
-      with ops.name_scope("validate_probs"):
-        one = constant_op.constant(1., probs.dtype)
-        dependencies = [check_ops.assert_non_negative(probs)]
-        if multidimensional:
-          dependencies += [assert_close(math_ops.reduce_sum(probs, -1), one,
-                                        message="probs does not sum to 1.")]
-        else:
-          dependencies += [check_ops.assert_less_equal(
-              probs, one, message="probs has components greater than 1.")]
-        probs = control_flow_ops.with_dependencies(dependencies, probs)
-
-    with ops.name_scope("logits"):
-      if multidimensional:
-        # Here we don't compute the multidimensional case, in a manner
-        # consistent with respect to the unidimensional case. We do so
-        # following the TF convention. Typically, you might expect to see
-        # logits = log(probs) - log(probs[pivot]). A side-effect of
-        # being consistent with the TF approach is that the unidimensional case
-        # implicitly handles the second dimension but the multidimensional case
-        # explicitly keeps the pivot dimension.
-        return math_ops.log(probs), probs
-      return math_ops.log(probs) - math_ops.log1p(-1. * probs), probs
-
-
-def log_combinations(n, counts, name="log_combinations"):
-  """Multinomial coefficient.
-
-  Given `n` and `counts`, where `counts` has last dimension `k`, we compute
-  the multinomial coefficient as:
-
-  ```n! / sum_i n_i!```
-
-  where `i` runs over all `k` classes.
-
-  Args:
-    n: Floating-point `Tensor` broadcastable with `counts`. This represents `n`
-      outcomes.
-    counts: Floating-point `Tensor` broadcastable with `n`. This represents
-      counts in `k` classes, where `k` is the last dimension of the tensor.
-    name: A name for this operation (optional).
-
-  Returns:
-    `Tensor` representing the multinomial coefficient between `n` and `counts`.
-  """
-  # First a bit about the number of ways counts could have come in:
-  # E.g. if counts = [1, 2], then this is 3 choose 2.
-  # In general, this is (sum counts)! / sum(counts!)
-  # The sum should be along the last dimension of counts. This is the
-  # "distribution" dimension. Here n a priori represents the sum of counts.
-  with ops.name_scope(name, values=[n, counts]):
-    n = ops.convert_to_tensor(n, name="n")
-    counts = ops.convert_to_tensor(counts, name="counts")
-    total_permutations = math_ops.lgamma(n + 1)
-    counts_factorial = math_ops.lgamma(counts + 1)
-    redundant_permutations = math_ops.reduce_sum(counts_factorial, axis=[-1])
-    return total_permutations - redundant_permutations
-
-
-def matrix_diag_transform(matrix, transform=None, name=None):
-  """Transform diagonal of [batch-]matrix, leave rest of matrix unchanged.
-
-  Create a trainable covariance defined by a Cholesky factor:
-
-  ```python
-  # Transform network layer into 2 x 2 array.
-  matrix_values = tf.contrib.layers.fully_connected(activations, 4)
-  matrix = tf.reshape(matrix_values, (batch_size, 2, 2))
-
-  # Make the diagonal positive. If the upper triangle was zero, this would be a
-  # valid Cholesky factor.
-  chol = matrix_diag_transform(matrix, transform=tf.nn.softplus)
-
-  # OperatorPDCholesky ignores the upper triangle.
-  operator = OperatorPDCholesky(chol)
-  ```
-
-  Example of heteroskedastic 2-D linear regression.
-
-  ```python
-  # Get a trainable Cholesky factor.
-  matrix_values = tf.contrib.layers.fully_connected(activations, 4)
-  matrix = tf.reshape(matrix_values, (batch_size, 2, 2))
-  chol = matrix_diag_transform(matrix, transform=tf.nn.softplus)
-
-  # Get a trainable mean.
-  mu = tf.contrib.layers.fully_connected(activations, 2)
-
-  # This is a fully trainable multivariate normal!
-  dist = tf.contrib.distributions.MVNCholesky(mu, chol)
-
-  # Standard log loss. Minimizing this will "train" mu and chol, and then dist
-  # will be a distribution predicting labels as multivariate Gaussians.
-  loss = -1 * tf.reduce_mean(dist.log_prob(labels))
-  ```
-
-  Args:
-    matrix:  Rank `R` `Tensor`, `R >= 2`, where the last two dimensions are
-      equal.
-    transform:  Element-wise function mapping `Tensors` to `Tensors`. To
-      be applied to the diagonal of `matrix`. If `None`, `matrix` is returned
-      unchanged. Defaults to `None`.
-    name:  A name to give created ops.
-      Defaults to "matrix_diag_transform".
-
-  Returns:
-    A `Tensor` with same shape and `dtype` as `matrix`.
-  """
-  with ops.name_scope(name, "matrix_diag_transform", [matrix]):
-    matrix = ops.convert_to_tensor(matrix, name="matrix")
-    if transform is None:
-      return matrix
-    # Replace the diag with transformed diag.
-    diag = array_ops.matrix_diag_part(matrix)
-    transformed_diag = transform(diag)
-    transformed_mat = array_ops.matrix_set_diag(matrix, transformed_diag)
-
-  return transformed_mat
-
-
-def rotate_transpose(x, shift, name="rotate_transpose"):
-  """Circularly moves dims left or right.
-
-  Effectively identical to:
-
-  ```python
-  numpy.transpose(x, numpy.roll(numpy.arange(len(x.shape)), shift))
-  ```
-
-  When `validate_args=False` additional graph-runtime checks are
-  performed. These checks entail moving data from to GPU to CPU.
-
-  Example:
-
-    ```python
-    x = ...  # Tensor of shape [1, 2, 3, 4].
-    rotate_transpose(x, -1)  # result shape: [2, 3, 4, 1]
-    rotate_transpose(x, -2)  # result shape: [3, 4, 1, 2]
-    rotate_transpose(x,  1)  # result shape: [4, 1, 2, 3]
-    rotate_transpose(x,  2)  # result shape: [3, 4, 1, 2]
-    rotate_transpose(x, 7) == rotate_transpose(x, 3)
-    rotate_transpose(x, -7) == rotate_transpose(x, -3)
-    ```
-
-  Args:
-    x: `Tensor`.
-    shift: `Tensor`. Number of dimensions to transpose left (shift<0) or
-      transpose right (shift>0).
-    name: Python `str`. The name to give this op.
-
-  Returns:
-    rotated_x: Input `Tensor` with dimensions circularly rotated by shift.
-
-  Raises:
-    TypeError: if shift is not integer type.
-  """
-  with ops.name_scope(name, values=[x, shift]):
-    x = ops.convert_to_tensor(x, name="x")
-    shift = ops.convert_to_tensor(shift, name="shift")
-    # We do not assign back to preserve constant-ness.
-    check_ops.assert_integer(shift)
-    shift_value_static = tensor_util.constant_value(shift)
-    ndims = x.get_shape().ndims
-    if ndims is not None and shift_value_static is not None:
-      if ndims < 2: return x
-      shift_value_static = np.sign(shift_value_static) * (
-          abs(shift_value_static) % ndims)
-      if shift_value_static == 0: return x
-      perm = np.roll(np.arange(ndims), shift_value_static)
-      return array_ops.transpose(x, perm=perm)
-    else:
-      # Consider if we always had a positive shift, and some specified
-      # direction.
-      # When shifting left we want the new array:
-      #   last(x, n-shift) + first(x, shift)
-      # and if shifting right then we want:
-      #   last(x, shift) + first(x, n-shift)
-      # Observe that last(a) == slice(a, n) and first(a) == slice(0, a).
-      # Also, we can encode direction and shift as one: direction * shift.
-      # Combining these facts, we have:
-      #   a = cond(shift<0, -shift, n-shift)
-      #   last(x, n-a) + first(x, a) == x[a:n] + x[0:a]
-      # Finally, we transform shift by modulo length so it can be specified
-      # independently from the array upon which it operates (like python).
-      ndims = array_ops.rank(x)
-      shift = array_ops.where(math_ops.less(shift, 0),
-                              math_ops.mod(-shift, ndims),
-                              ndims - math_ops.mod(shift, ndims))
-      first = math_ops.range(0, shift)
-      last = math_ops.range(shift, ndims)
-      perm = array_ops.concat([last, first], 0)
-      return array_ops.transpose(x, perm=perm)
-
-
-def pick_vector(cond,
-                true_vector,
-                false_vector,
-                name="pick_vector"):
-  """Picks possibly different length row `Tensor`s based on condition.
-
-  Value `Tensor`s should have exactly one dimension.
-
-  If `cond` is a python Boolean or `tf.constant` then either `true_vector` or
-  `false_vector` is immediately returned. I.e., no graph nodes are created and
-  no validation happens.
-
-  Args:
-    cond: `Tensor`. Must have `dtype=tf.bool` and be scalar.
-    true_vector: `Tensor` of one dimension. Returned when cond is `True`.
-    false_vector: `Tensor` of one dimension. Returned when cond is `False`.
-    name: Python `str`. The name to give this op.
-
-  Example:
-
-  ```python
-  pick_vector(tf.less(0, 5), tf.range(10, 12), tf.range(15, 18))
-  # result is tensor: [10, 11].
-  pick_vector(tf.less(5, 0), tf.range(10, 12), tf.range(15, 18))
-  # result is tensor: [15, 16, 17].
-  ```
-
-  Returns:
-    true_or_false_vector: `Tensor`.
-
-  Raises:
-    TypeError: if `cond.dtype != tf.bool`
-    TypeError: if `cond` is not a constant and
-      `true_vector.dtype != false_vector.dtype`
-  """
-  with ops.name_scope(name, values=(cond, true_vector, false_vector)):
-    cond = ops.convert_to_tensor(cond, name="cond")
-    if cond.dtype != dtypes.bool:
-      raise TypeError("%s.dtype=%s which is not %s" %
-                      (cond.name, cond.dtype, dtypes.bool))
-    cond_value_static = tensor_util.constant_value(cond)
-    if cond_value_static is not None:
-      return true_vector if cond_value_static else false_vector
-    true_vector = ops.convert_to_tensor(true_vector, name="true_vector")
-    false_vector = ops.convert_to_tensor(false_vector, name="false_vector")
-    if true_vector.dtype != false_vector.dtype:
-      raise TypeError(
-          "%s.dtype=%s does not match %s.dtype=%s"
-          % (true_vector.name, true_vector.dtype,
-             false_vector.name, false_vector.dtype))
-    n = array_ops.shape(true_vector)[0]
-    return array_ops.slice(
-        array_ops.concat([true_vector, false_vector], 0),
-        [array_ops.where(cond, 0, n)], [array_ops.where(cond, n, -1)])
-
-
-def gen_new_seed(seed, salt):
-  """Generate a new seed, from the given seed and salt."""
-  if seed is None:
-    return None
-  string = (str(seed) + salt).encode("utf-8")
-  return int(hashlib.md5(string).hexdigest()[:8], 16) & 0x7FFFFFFF
-
-
-def fill_lower_triangular(x, validate_args=False, name="fill_lower_triangular"):
-  """Creates a (batch of) lower triangular matrix from a vector of inputs.
-
-  If `x.get_shape()` is `[b1, b2, ..., bK, d]` then the output shape is `[b1,
-  b2, ..., bK, n, n]` where `n` is such that `d = n(n+1)/2`, i.e.,
-  `n = int(0.5 * (math.sqrt(1. + 8. * d) - 1.))`.
-
-  Although the non-batch complexity is O(n**2), large constants and sub-optimal
-  vectorization means the complexity of this function is 5x slower than zeroing
-  out the upper triangular, i.e., `tf.matrix_band_part(X, -1, 0)`. This
-  function becomes competitive only when several matmul/cholesky/etc ops can be
-  ellided in constructing the input. Example: wiring a fully connected layer as
-  a covariance matrix; this function reduces the final layer by 2x and possibly
-  reduces the network arch complexity considerably. In most cases it is better
-  to simply build a full matrix and zero out the upper triangular elements,
-  e.g., `tril = tf.matrix_band_part(full, -1, 0)`, rather than directly
-  construct a lower triangular.
-
-  Example:
-
-  ```python
-  fill_lower_triangular([1, 2, 3, 4, 5, 6])
-  # Returns: [[1, 0, 0],
-  #           [2, 3, 0],
-  #           [4, 5, 6]]
-  ```
-
-  For comparison, a pure numpy version of this function can be found in
-  `distribution_util_test.py`, function `_fill_lower_triangular`.
-
-  Args:
-    x: `Tensor` representing lower triangular elements.
-    validate_args: Python `bool`, default `False`. Whether to ensure the shape
-      of `x` can be mapped to a lower triangular matrix (controls non-static
-      checks only).
-    name: Python `str`. The name to give this op.
-
-  Returns:
-    tril: `Tensor` with lower triangular elements filled from `x`.
-
-  Raises:
-    ValueError: if shape if `x` has static shape which cannot be mapped to a
-      lower triangular matrix.
-  """
-  # TODO(jvdillon): Replace this code with dedicated op when it exists.
-  with ops.name_scope(name, values=[x]):
-    x = ops.convert_to_tensor(x, name="x")
-    if (x.get_shape().ndims is not None and
-        x.get_shape()[-1].value is not None):
-      d = x.get_shape()[-1].value
-      # d = n(n+1)/2 implies n is:
-      n = int(0.5 * (math.sqrt(1. + 8. * d) - 1.))
-      d_inferred = n * (n + 1) /2
-      if d != d_inferred:
-        raise ValueError("Input cannot be mapped to a lower triangular; "
-                         "n*(n+1)/2 = %d != %d" % (d_inferred, d))
-      final_shape = x.get_shape()[:-1].concatenate(
-          tensor_shape.TensorShape([n, n]))
-    else:
-      d = math_ops.cast(array_ops.shape(x)[-1], dtype=dtypes.float32)
-      # d = n(n+1)/2 implies n is:
-      n = math_ops.cast(0.5 * (dtypes.sqrt(1. + 8. * d) - 1.),
-                        dtype=dtypes.int32)
-      if validate_args:
-        is_valid_input_shape = check_ops.assert_equal(
-            n * (n + 1) / 2, d,
-            message="Input cannot be mapped to a lower triangular.")
-        n = control_flow_ops.with_dependencies([is_valid_input_shape], n)
-      final_shape = x.get_shape()[:-1].concatenate(
-          tensor_shape.TensorShape([None, None]))
-
-    def tril_ids(n):
-      """Internal helper to create vector of linear indices into y."""
-      # Build the ids statically; chose 512 because it implies 1MiB.
-      if not tensor_util.is_tensor(n) and n <= 512:
-        ids = np.arange(n**2, dtype=np.int32)
-        rows = (ids / n).astype(np.int32)  # Implicit floor.
-        # We need to stop incrementing the index when we encounter
-        # upper-triangular elements. The idea here is to compute the
-        # lower-right number of zeros then by "symmetry" subtract this from the
-        # total number of zeros, n(n-1)/2.
-        # Then we note that: n(n-1)/2 - (n-r)*(n-r-1)/2 = r(2n-r-1)/2
-        offset = (rows * (2 * n - rows - 1) / 2).astype(np.int32)
-        # We could also zero out when (rows < cols) == (rows < ids-n*rows).
-        # mask = (ids <= (n + 1) * rows).astype(np.int32)
-      else:
-        ids = math_ops.range(n**2)
-        rows = math_ops.cast(ids / n, dtype=dtypes.int32)
-        offset = math_ops.cast(rows * (2 * n - rows - 1) / 2,
-                               dtype=dtypes.int32)
-      return ids - offset
-
-    # Special-case non-batch case.
-    if x.get_shape().ndims == 1:
-      y = array_ops.gather(x, array_ops.reshape(tril_ids(n), [n, n]))
-      y = array_ops.matrix_band_part(y, -1, 0)
-      y.set_shape(y.get_shape().merge_with(final_shape))
-      return y
-
-    # Make ids for each batch dim.
-    if (x.get_shape().ndims is not None and
-        x.get_shape()[:-1].is_fully_defined()):
-      batch_shape = np.asarray(x.get_shape()[:-1].as_list(), dtype=np.int32)
-      m = np.prod(batch_shape).astype(np.int32)
-    else:
-      batch_shape = array_ops.shape(x)[:-1]
-      m = array_ops.reduce_prod(array_ops.shape(x)[:-1])
-    batch_ids = math_ops.range(m)
-
-    # Assemble the tril_ids into batch,tril_id pairs.
-    idx = array_ops.stack([
-        array_ops.tile(array_ops.expand_dims(batch_ids, 1), [1, n * n]),
-        array_ops.tile(array_ops.expand_dims(tril_ids(n), 0), [m, 1])
-    ])
-    idx = array_ops.transpose(idx, [1, 2, 0])
-
-    # Gather up, reshape, and return.
-    y = array_ops.reshape(x, [-1, d])
-    y = array_ops.gather_nd(y, idx)
-    y = array_ops.reshape(y, array_ops.concat([batch_shape, [n, n]], 0))
-    y = array_ops.matrix_band_part(y, -1, 0)
-    y.set_shape(y.get_shape().merge_with(final_shape))
-    return y
-
-
-# TODO(jvdillon): Merge this test back into:
-# tensorflow/python/ops/softplus_op_test.py
-# once TF core is accepting new ops.
-def softplus_inverse(x, name=None):
-  """Computes the inverse softplus, i.e., x = softplus_inverse(softplus(x)).
-
-  Mathematically this op is equivalent to:
-
-  ```none
-  softplus_inverse = log(exp(x) - 1.)
-  ```
-
-  Args:
-    x: `Tensor`. Non-negative (not enforced), floating-point.
-    name: A name for the operation (optional).
-
-  Returns:
-    `Tensor`. Has the same type/shape as input `x`.
-  """
-  with ops.name_scope(name, "softplus_inverse", values=[x]):
-    x = ops.convert_to_tensor(x, name="x")
-    # We begin by deriving a more numerically stable softplus_inverse:
-    # x = softplus(y) = Log[1 + exp{y}], (which means x > 0).
-    # ==> exp{x} = 1 + exp{y}                                (1)
-    # ==> y = Log[exp{x} - 1]                                (2)
-    #       = Log[(exp{x} - 1) / exp{x}] + Log[exp{x}]
-    #       = Log[(1 - exp{-x}) / 1] + Log[exp{x}]
-    #       = Log[1 - exp{-x}] + x                           (3)
-    # (2) is the "obvious" inverse, but (3) is more stable than (2) for large x.
-    # For small x (e.g. x = 1e-10), (3) will become -inf since 1 - exp{-x} will
-    # be zero. To fix this, we use 1 - exp{-x} approx x for small x > 0.
-    #
-    # In addition to the numerically stable derivation above, we clamp
-    # small/large values to be congruent with the logic in:
-    # tensorflow/core/kernels/softplus_op.h
-    #
-    # Finally, we set the input to one whenever the input is too large or too
-    # small. This ensures that no unchosen codepath is +/- inf. This is
-    # necessary to ensure the gradient doesn't get NaNs. Recall that the
-    # gradient of `where` behaves like `pred*pred_true + (1-pred)*pred_false`
-    # thus an `inf` in an unselected path results in `0*inf=nan`. We are careful
-    # to overwrite `x` with ones only when we will never actually use this
-    # value. Note that we use ones and not zeros since `log(expm1(0.)) = -inf`.
-    threshold = np.log(np.finfo(x.dtype.as_numpy_dtype).eps) + 2.
-    is_too_small = math_ops.less(x, np.exp(threshold))
-    is_too_large = math_ops.greater(x, -threshold)
-    too_small_value = math_ops.log(x)
-    too_large_value = x
-    # This `where` will ultimately be a NOP because we won't select this
-    # codepath whenever we used the surrogate `ones_like`.
-    x = array_ops.where(math_ops.logical_or(is_too_small, is_too_large),
-                        array_ops.ones_like(x), x)
-    y = x + math_ops.log(-math_ops.expm1(-x))  # == log(expm1(x))
-    return array_ops.where(is_too_small, too_small_value,
-                           array_ops.where(is_too_large, too_large_value, y))
-
-
-# TODO(b/35290280): Add unit-tests.
-def dimension_size(x, axis):
-  """Returns the size of a specific dimension."""
-  # Since tf.gather isn't "constant-in, constant-out", we must first check the
-  # static shape or fallback to dynamic shape.
-  num_rows = (None if x.get_shape().ndims is None
-              else x.get_shape()[axis].value)
-  if num_rows is not None:
-    return num_rows
-  return array_ops.shape(x)[axis]
+from tensorflow.python.ops.distributions import util
+from tensorflow.python.ops.distributions.util import *  # pylint: disable=wildcard-import
 
 
 # TODO(b/35290280): Add unit-tests.
@@ -678,7 +73,7 @@ def make_diag_scale(loc, scale_diag, scale_identity_multiplier,
       raise ValueError(
           "Cannot infer `event_shape` unless `loc` is specified.")
 
-    num_rows = dimension_size(loc, -1)
+    num_rows = util.dimension_size(loc, -1)
 
     if scale_identity_multiplier is None:
       return linalg.LinearOperatorIdentity(
@@ -695,64 +90,3 @@ def make_diag_scale(loc, scale_diag, scale_identity_multiplier,
         is_self_adjoint=True,
         is_positive_definite=assert_positive,
         assert_proper_shapes=validate_args)
-
-
-class AppendDocstring(object):
-  """Helper class to promote private subclass docstring to public counterpart.
-
-  Example:
-
-  ```python
-  class TransformedDistribution(Distribution):
-    @distribution_util.AppendDocstring(
-      additional_note="A special note!",
-      kwargs_dict={"foo": "An extra arg."})
-    def _prob(self, y, foo=None):
-      pass
-  ```
-
-  In this case, the `AppendDocstring` decorator appends the `additional_note` to
-  the docstring of `prob` (not `_prob`) and adds a new `kwargs`
-  section with each dictionary item as a bullet-point.
-
-  For a more detailed example, see `TransformedDistribution`.
-  """
-
-  def __init__(self, additional_note="", kwargs_dict=None):
-    """Initializes the AppendDocstring object.
-
-    Args:
-      additional_note: Python string added as additional docstring to public
-        version of function.
-      kwargs_dict: Python string/string dictionary representing
-        specific kwargs expanded from the **kwargs input.
-
-    Raises:
-      ValueError: if kwargs_dict.key contains whitespace.
-      ValueError: if kwargs_dict.value contains newlines.
-    """
-    self._additional_note = additional_note
-    if kwargs_dict:
-      bullets = []
-      for key in sorted(kwargs_dict.keys()):
-        value = kwargs_dict[key]
-        if any(x.isspace() for x in key):
-          raise ValueError(
-              "Parameter name \"%s\" contains whitespace." % key)
-        value = value.lstrip()
-        if "\n" in value:
-          raise ValueError(
-              "Parameter description for \"%s\" contains newlines." % key)
-        bullets.append("*  `%s`: %s" % (key, value))
-      self._additional_note += ("\n\n##### `kwargs`:\n\n" +
-                                "\n".join(bullets))
-
-  def __call__(self, fn):
-    @functools.wraps(fn)
-    def _fn(*args, **kwargs):
-      return fn(*args, **kwargs)
-    if _fn.__doc__ is None:
-      _fn.__doc__ = self._additional_note
-    else:
-      _fn.__doc__ += "\n%s" % self._additional_note
-    return _fn
diff --git a/tensorflow/contrib/distributions/python/ops/gamma.py b/tensorflow/contrib/distributions/python/ops/gamma.py
index f46e2116e1..255e8026e8 100644
--- a/tensorflow/contrib/distributions/python/ops/gamma.py
+++ b/tensorflow/contrib/distributions/python/ops/gamma.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -33,6 +31,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/geometric.py b/tensorflow/contrib/distributions/python/ops/geometric.py
index aa7aef6681..918200830c 100644
--- a/tensorflow/contrib/distributions/python/ops/geometric.py
+++ b/tensorflow/contrib/distributions/python/ops/geometric.py
@@ -19,8 +19,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -31,6 +29,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class Geometric(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/gumbel.py b/tensorflow/contrib/distributions/python/ops/gumbel.py
index f99a6674e5..ba8d3c639b 100644
--- a/tensorflow/contrib/distributions/python/ops/gumbel.py
+++ b/tensorflow/contrib/distributions/python/ops/gumbel.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import math
 import numpy as np
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -29,6 +28,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
 
 
 class _Gumbel(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/inverse_gamma.py b/tensorflow/contrib/distributions/python/ops/inverse_gamma.py
index 7b91b00c2c..956dee38a3 100644
--- a/tensorflow/contrib/distributions/python/ops/inverse_gamma.py
+++ b/tensorflow/contrib/distributions/python/ops/inverse_gamma.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -32,6 +30,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/laplace.py b/tensorflow/contrib/distributions/python/ops/laplace.py
index eff4f5f9b8..0a1e3990c4 100644
--- a/tensorflow/contrib/distributions/python/ops/laplace.py
+++ b/tensorflow/contrib/distributions/python/ops/laplace.py
@@ -22,7 +22,6 @@ import math
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.contrib.distributions.python.ops import special_math
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -33,6 +32,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/logistic.py b/tensorflow/contrib/distributions/python/ops/logistic.py
index 6af16041c0..ce1a459cae 100644
--- a/tensorflow/contrib/distributions/python/ops/logistic.py
+++ b/tensorflow/contrib/distributions/python/ops/logistic.py
@@ -21,7 +21,6 @@ from __future__ import print_function
 import math
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -31,6 +30,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
 
 
 class Logistic(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/mixture.py b/tensorflow/contrib/distributions/python/ops/mixture.py
index 3e29ce7500..6d318014ad 100644
--- a/tensorflow/contrib/distributions/python/ops/mixture.py
+++ b/tensorflow/contrib/distributions/python/ops/mixture.py
@@ -21,8 +21,6 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.contrib.distributions.python.ops import categorical
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
@@ -31,6 +29,8 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class Mixture(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/multinomial.py b/tensorflow/contrib/distributions/python/ops/multinomial.py
index e5e24cc87f..a5bea7b4ba 100644
--- a/tensorflow/contrib/distributions/python/ops/multinomial.py
+++ b/tensorflow/contrib/distributions/python/ops/multinomial.py
@@ -18,8 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -27,6 +25,8 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
index 3bb6bb4af2..5e879b4b22 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 from tensorflow.contrib import linalg
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
@@ -30,6 +29,7 @@ from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_tril.py b/tensorflow/contrib/distributions/python/ops/mvn_tril.py
index e2a31c8624..8594b1a4f9 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_tril.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_tril.py
@@ -19,13 +19,13 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib import linalg
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import mvn_linear_operator as mvn_linop
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/negative_binomial.py b/tensorflow/contrib/distributions/python/ops/negative_binomial.py
index 294b733c3c..8895fd8b46 100644
--- a/tensorflow/contrib/distributions/python/ops/negative_binomial.py
+++ b/tensorflow/contrib/distributions/python/ops/negative_binomial.py
@@ -18,8 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
@@ -27,6 +25,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class NegativeBinomial(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/normal.py b/tensorflow/contrib/distributions/python/ops/normal.py
index a8bc918af9..ed12439c44 100644
--- a/tensorflow/contrib/distributions/python/ops/normal.py
+++ b/tensorflow/contrib/distributions/python/ops/normal.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import math
 
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.contrib.distributions.python.ops import special_math
 from tensorflow.python.framework import constant_op
@@ -32,6 +31,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/onehot_categorical.py b/tensorflow/contrib/distributions/python/ops/onehot_categorical.py
index 1679a797e1..378ddc491f 100644
--- a/tensorflow/contrib/distributions/python/ops/onehot_categorical.py
+++ b/tensorflow/contrib/distributions/python/ops/onehot_categorical.py
@@ -18,8 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -29,6 +27,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class OneHotCategorical(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/operator_pd_full.py b/tensorflow/contrib/distributions/python/ops/operator_pd_full.py
index 548374bcde..3ca341bb83 100644
--- a/tensorflow/contrib/distributions/python/ops/operator_pd_full.py
+++ b/tensorflow/contrib/distributions/python/ops/operator_pd_full.py
@@ -18,10 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import operator_pd_cholesky
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import linalg_ops
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/poisson.py b/tensorflow/contrib/distributions/python/ops/poisson.py
index 3c4f1cc1d8..d9929183c1 100644
--- a/tensorflow/contrib/distributions/python/ops/poisson.py
+++ b/tensorflow/contrib/distributions/python/ops/poisson.py
@@ -18,8 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -28,6 +26,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 __all__ = [
     "Poisson",
diff --git a/tensorflow/contrib/distributions/python/ops/quantized_distribution.py b/tensorflow/contrib/distributions/python/ops/quantized_distribution.py
index 6241dbfcf0..ac027f0f43 100644
--- a/tensorflow/contrib/distributions/python/ops/quantized_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/quantized_distribution.py
@@ -20,13 +20,13 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution as distributions
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import distribution as distributions
+from tensorflow.python.ops.distributions import util as distribution_util
 
 __all__ = ["QuantizedDistribution"]
 
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
index 2c7db7214b..581e190f73 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import logistic
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 # Bijectors must be directly imported because `remove_undocumented` prevents
@@ -28,6 +27,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class RelaxedBernoulli(transformed_distribution.TransformedDistribution):
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py b/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py
index e81c5935a1..00415f5e1a 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -31,6 +29,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class ExpRelaxedOneHotCategorical(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/shape.py b/tensorflow/contrib/distributions/python/ops/shape.py
index b1271d61c0..516d7b60fe 100644
--- a/tensorflow/contrib/distributions/python/ops/shape.py
+++ b/tensorflow/contrib/distributions/python/ops/shape.py
@@ -19,7 +19,6 @@ from __future__ import print_function
 
 import contextlib
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_util
@@ -27,6 +26,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class _DistributionShape(object):
diff --git a/tensorflow/contrib/distributions/python/ops/student_t.py b/tensorflow/contrib/distributions/python/ops/student_t.py
index 87f5ecd7ae..7872569a2b 100644
--- a/tensorflow/contrib/distributions/python/ops/student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/student_t.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -33,6 +31,8 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import special_math_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
index 1403adbda2..e146e20d3a 100644
--- a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
@@ -19,8 +19,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution as distribution_lib
-from tensorflow.contrib.distributions.python.ops import distribution_util
 # Bijectors must be directly imported because `remove_undocumented` prevents
 # individual file imports.
 from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
@@ -33,6 +31,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import distribution as distribution_lib
+from tensorflow.python.ops.distributions import util as distribution_util
 
 __all__ = [
     "TransformedDistribution",
diff --git a/tensorflow/contrib/distributions/python/ops/uniform.py b/tensorflow/contrib/distributions/python/ops/uniform.py
index 81a4c8cdef..9b555f87ea 100644
--- a/tensorflow/contrib/distributions/python/ops/uniform.py
+++ b/tensorflow/contrib/distributions/python/ops/uniform.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import math
 
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -29,6 +28,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
 
 
 class Uniform(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/vector_student_t.py b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
index 8d680ab27a..d7115f6f0b 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import student_t
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import constant_op
@@ -27,6 +26,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 # TODO(jvdillon): Add unittests for this once we know where will put this code
diff --git a/tensorflow/contrib/distributions/python/ops/wishart.py b/tensorflow/contrib/distributions/python/ops/wishart.py
index 6ed2c4dfb0..e162a79610 100644
--- a/tensorflow/contrib/distributions/python/ops/wishart.py
+++ b/tensorflow/contrib/distributions/python/ops/wishart.py
@@ -21,8 +21,6 @@ from __future__ import print_function
 import math
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import distribution
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.contrib.distributions.python.ops import operator_pd_cholesky
 from tensorflow.contrib.distributions.python.ops import operator_pd_full
 from tensorflow.python.framework import constant_op
@@ -35,6 +33,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 2a61735bb5..28e1adb518 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -81,6 +81,7 @@ py_library(
         "//third_party/py/numpy",
         "//tensorflow/python/estimator:estimator_py",
         "//tensorflow/python/ops/losses",
+        "//tensorflow/python/ops/distributions",
         "//tensorflow/python/saved_model",
     ] + if_not_windows([
         "//tensorflow/contrib:contrib_py",
diff --git a/tensorflow/python/kernel_tests/distributions/BUILD b/tensorflow/python/kernel_tests/distributions/BUILD
new file mode 100644
index 0000000000..63e213b5e0
--- /dev/null
+++ b/tensorflow/python/kernel_tests/distributions/BUILD
@@ -0,0 +1,42 @@
+# Tests of TensorFlow kernels written using the Python API.
+
+package(
+    default_visibility = ["//tensorflow:internal"],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load("//tensorflow:tensorflow.bzl", "cuda_py_test")
+
+cuda_py_test(
+    name = "bijector_test",
+    size = "small",
+    srcs = ["bijector_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/python/kernel_tests/distributions/__init__.py b/tensorflow/python/kernel_tests/distributions/__init__.py
new file mode 100644
index 0000000000..94dd13c890
--- /dev/null
+++ b/tensorflow/python/kernel_tests/distributions/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Kernel tests for tf.distributions."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py b/tensorflow/python/kernel_tests/distributions/bijector_test.py
similarity index 95%
rename from tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
rename to tensorflow/python/kernel_tests/distributions/bijector_test.py
index 3ba6aa5293..9f9fb5c0bb 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/bijector_test.py
+++ b/tensorflow/python/kernel_tests/distributions/bijector_test.py
@@ -22,9 +22,9 @@ import abc
 
 import six
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector import Bijector
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import bijector
 from tensorflow.python.platform import test
 
 
@@ -36,10 +36,10 @@ class BaseBijectorTest(test.TestCase):
       with self.assertRaisesRegexp(TypeError,
                                    ("Can't instantiate abstract class Bijector "
                                     "with abstract methods __init__")):
-        Bijector()
+        bijector.Bijector()  # pylint: disable=abstract-class-instantiated
 
   def testDefaults(self):
-    class _BareBonesBijector(Bijector):
+    class _BareBonesBijector(bijector.Bijector):
       """Minimal specification of a `Bijector`."""
 
       def __init__(self):
@@ -80,7 +80,7 @@ class IntentionallyMissingError(Exception):
   pass
 
 
-class BrokenBijector(Bijector):
+class BrokenBijector(bijector.Bijector):
   """Forward and inverse are not inverses of each other."""
 
   def __init__(self, forward_missing=False, inverse_missing=False):
diff --git a/tensorflow/python/ops/distributions/BUILD b/tensorflow/python/ops/distributions/BUILD
new file mode 100644
index 0000000000..90d3f04c72
--- /dev/null
+++ b/tensorflow/python/ops/distributions/BUILD
@@ -0,0 +1,41 @@
+package(
+    default_visibility = [
+        "//tensorflow:internal",
+    ],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
+
+load("//tensorflow:tensorflow.bzl", "py_test")
+
+licenses(["notice"])  # Apache 2.0
+
+py_library(
+    name = "distributions",
+    srcs = glob(["*.py"]),
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:util",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/python/ops/distributions/__init__.py b/tensorflow/python/ops/distributions/__init__.py
new file mode 100644
index 0000000000..563b189990
--- /dev/null
+++ b/tensorflow/python/ops/distributions/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Core module for TensorFlow distribution objects and helpers."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/bijector.py b/tensorflow/python/ops/distributions/bijector.py
similarity index 92%
rename from tensorflow/contrib/distributions/python/ops/bijectors/bijector.py
rename to tensorflow/python/ops/distributions/bijector.py
index b0727cd8f3..70e9fdadd2 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/bijector.py
+++ b/tensorflow/python/ops/distributions/bijector.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 # go/tf-wildcard-import
 # pylint: disable=wildcard-import
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_impl import *
+from tensorflow.python.ops.distributions.bijector_impl import *
 # pylint: enable=wildcard-import
 from tensorflow.python.util.all_util import remove_undocumented
 
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/bijector_impl.py b/tensorflow/python/ops/distributions/bijector_impl.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/bijectors/bijector_impl.py
rename to tensorflow/python/ops/distributions/bijector_impl.py
diff --git a/tensorflow/contrib/distributions/python/ops/conditional_distribution.py b/tensorflow/python/ops/distributions/conditional_distribution.py
similarity index 97%
rename from tensorflow/contrib/distributions/python/ops/conditional_distribution.py
rename to tensorflow/python/ops/distributions/conditional_distribution.py
index e3ca5c5468..a04373afbf 100644
--- a/tensorflow/contrib/distributions/python/ops/conditional_distribution.py
+++ b/tensorflow/python/ops/distributions/conditional_distribution.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution
 from tensorflow.contrib.distributions.python.ops import distribution_util
+from tensorflow.python.ops.distributions import distribution
 
 
 class ConditionalDistribution(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/distribution.py b/tensorflow/python/ops/distributions/distribution.py
similarity index 99%
rename from tensorflow/contrib/distributions/python/ops/distribution.py
rename to tensorflow/python/ops/distributions/distribution.py
index 0b7ffbd792..a0be433a61 100644
--- a/tensorflow/contrib/distributions/python/ops/distribution.py
+++ b/tensorflow/python/ops/distributions/distribution.py
@@ -25,13 +25,13 @@ import types
 import numpy as np
 import six
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import util
 from tensorflow.python.util import tf_inspect
 
 
@@ -241,7 +241,7 @@ class Distribution(_BaseDistribution):
   docstrings for their method specializations. For example:
 
   ```python
-  @distribution_util.AppendDocstring("Some other details.")
+  @util.AppendDocstring("Some other details.")
   def _log_prob(self, value):
     ...
   ```
@@ -1033,10 +1033,9 @@ class Distribution(_BaseDistribution):
     if ndims is None:
       # Maybe expand_dims.
       ndims = array_ops.rank(x)
-      expanded_shape = distribution_util.pick_vector(
+      expanded_shape = util.pick_vector(
           math_ops.equal(ndims, 0),
-          np.array([1], dtype=np.int32),
-          array_ops.shape(x))
+          np.array([1], dtype=np.int32), array_ops.shape(x))
       x = array_ops.reshape(x, expanded_shape)
     elif ndims == 0:
       # Definitely expand_dims.
diff --git a/tensorflow/python/ops/distributions/util.py b/tensorflow/python/ops/distributions/util.py
new file mode 100644
index 0000000000..74a7b53a3c
--- /dev/null
+++ b/tensorflow/python/ops/distributions/util.py
@@ -0,0 +1,693 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Utilities for probability distributions."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import functools
+import hashlib
+import math
+import numpy as np
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.framework import tensor_util
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn
+
+
+def assert_close(
+    x, y, data=None, summarize=None, message=None, name="assert_close"):
+  """Assert that that x and y are within machine epsilon of each other.
+
+  Args:
+    x: Floating-point `Tensor`
+    y: Floating-point `Tensor`
+    data: The tensors to print out if the condition is `False`. Defaults to
+      error message and first few entries of `x` and `y`.
+    summarize: Print this many entries of each tensor.
+    message: A string to prefix to the default message.
+    name: A name for this operation (optional).
+
+  Returns:
+    Op raising `InvalidArgumentError` if |x - y| > machine epsilon.
+  """
+  message = message or ""
+  x = ops.convert_to_tensor(x, name="x")
+  y = ops.convert_to_tensor(y, name="y")
+
+  if data is None:
+    data = [
+        message,
+        "Condition x ~= y did not hold element-wise: x = ", x.name, x, "y = ",
+        y.name, y
+    ]
+
+  if x.dtype.is_integer:
+    return check_ops.assert_equal(
+        x, y, data=data, summarize=summarize, message=message, name=name)
+
+  with ops.name_scope(name, "assert_close", [x, y, data]):
+    tol = np.finfo(x.dtype.as_numpy_dtype).eps
+    condition = math_ops.reduce_all(math_ops.less_equal(math_ops.abs(x-y), tol))
+    return control_flow_ops.Assert(
+        condition, data, summarize=summarize)
+
+
+def assert_integer_form(
+    x, data=None, summarize=None, message=None, name="assert_integer_form"):
+  """Assert that x has integer components (or floats equal to integers).
+
+  Args:
+    x: Floating-point `Tensor`
+    data: The tensors to print out if the condition is `False`. Defaults to
+      error message and first few entries of `x` and `y`.
+    summarize: Print this many entries of each tensor.
+    message: A string to prefix to the default message.
+    name: A name for this operation (optional).
+
+  Returns:
+    Op raising `InvalidArgumentError` if round(x) != x.
+  """
+
+  message = message or "x has non-integer components"
+  x = ops.convert_to_tensor(x, name="x")
+  casted_x = math_ops.to_int64(x)
+  return check_ops.assert_equal(
+      x, math_ops.cast(math_ops.round(casted_x), x.dtype),
+      data=data, summarize=summarize, message=message, name=name)
+
+
+def assert_symmetric(matrix):
+  matrix_t = array_ops.matrix_transpose(matrix)
+  return control_flow_ops.with_dependencies(
+      [check_ops.assert_equal(matrix, matrix_t)], matrix)
+
+
+def embed_check_nonnegative_discrete(x, check_integer=True):
+  """Assert x is a non-negative tensor, and optionally of integers."""
+  assertions = [check_ops.assert_non_negative(
+      x, message="x must be non-negative.")]
+  if check_integer:
+    assertions += [assert_integer_form(
+        x, message="x cannot contain fractional components.")]
+  return control_flow_ops.with_dependencies(assertions, x)
+
+
+def same_dynamic_shape(a, b):
+  """Returns whether a and b have the same dynamic shape.
+
+  Args:
+    a: `Tensor`
+    b: `Tensor`
+
+  Returns:
+    `bool` `Tensor` representing if both tensors have the same shape.
+  """
+  a = ops.convert_to_tensor(a, name="a")
+  b = ops.convert_to_tensor(b, name="b")
+
+  # Here we can't just do math_ops.equal(a.shape, b.shape), since
+  # static shape inference may break the equality comparison between
+  # shape(a) and shape(b) in math_ops.equal.
+  def all_shapes_equal():
+    return math_ops.reduce_all(math_ops.equal(
+        array_ops.concat([array_ops.shape(a), array_ops.shape(b)], 0),
+        array_ops.concat([array_ops.shape(b), array_ops.shape(a)], 0)))
+
+  # One of the shapes isn't fully defined, so we need to use the dynamic
+  # shape.
+  return control_flow_ops.cond(
+      math_ops.equal(array_ops.rank(a), array_ops.rank(b)),
+      all_shapes_equal,
+      lambda: constant_op.constant(False))
+
+
+def get_logits_and_probs(logits=None,
+                         probs=None,
+                         multidimensional=False,
+                         validate_args=False,
+                         name="get_logits_and_probs"):
+  """Converts logit to probabilities (or vice-versa), and returns both.
+
+  Args:
+    logits: Floating-point `Tensor` representing log-odds.
+    probs: Floating-point `Tensor` representing probabilities.
+    multidimensional: Python `bool`, default `False`.
+      If `True`, represents whether the last dimension of `logits` or `probs`,
+      a `[N1, N2, ...  k]` dimensional tensor, representing the
+      logit or probability of `shape[-1]` classes.
+    validate_args: Python `bool`, default `False`. When `True`, either assert
+      `0 <= probs <= 1` (if not `multidimensional`) or that the last dimension
+      of `probs` sums to one.
+    name: A name for this operation (optional).
+
+  Returns:
+    logits, probs: Tuple of `Tensor`s. If `probs` has an entry that is `0` or
+      `1`, then the corresponding entry in the returned logit will be `-Inf` and
+      `Inf` respectively.
+
+  Raises:
+    ValueError: if neither `probs` nor `logits` were passed in, or both were.
+  """
+  with ops.name_scope(name, values=[probs, logits]):
+    if (probs is None) == (logits is None):
+      raise ValueError("Must pass probs or logits, but not both.")
+
+    if probs is None:
+      logits = ops.convert_to_tensor(logits, name="logits")
+      if multidimensional:
+        return logits, nn.softmax(logits, name="probs")
+      return logits, math_ops.sigmoid(logits, name="probs")
+
+    probs = ops.convert_to_tensor(probs, name="probs")
+    if validate_args:
+      with ops.name_scope("validate_probs"):
+        one = constant_op.constant(1., probs.dtype)
+        dependencies = [check_ops.assert_non_negative(probs)]
+        if multidimensional:
+          dependencies += [assert_close(math_ops.reduce_sum(probs, -1), one,
+                                        message="probs does not sum to 1.")]
+        else:
+          dependencies += [check_ops.assert_less_equal(
+              probs, one, message="probs has components greater than 1.")]
+        probs = control_flow_ops.with_dependencies(dependencies, probs)
+
+    with ops.name_scope("logits"):
+      if multidimensional:
+        # Here we don't compute the multidimensional case, in a manner
+        # consistent with respect to the unidimensional case. We do so
+        # following the TF convention. Typically, you might expect to see
+        # logits = log(probs) - log(probs[pivot]). A side-effect of
+        # being consistent with the TF approach is that the unidimensional case
+        # implicitly handles the second dimension but the multidimensional case
+        # explicitly keeps the pivot dimension.
+        return math_ops.log(probs), probs
+      return math_ops.log(probs) - math_ops.log1p(-1. * probs), probs
+
+
+def log_combinations(n, counts, name="log_combinations"):
+  """Multinomial coefficient.
+
+  Given `n` and `counts`, where `counts` has last dimension `k`, we compute
+  the multinomial coefficient as:
+
+  ```n! / sum_i n_i!```
+
+  where `i` runs over all `k` classes.
+
+  Args:
+    n: Floating-point `Tensor` broadcastable with `counts`. This represents `n`
+      outcomes.
+    counts: Floating-point `Tensor` broadcastable with `n`. This represents
+      counts in `k` classes, where `k` is the last dimension of the tensor.
+    name: A name for this operation (optional).
+
+  Returns:
+    `Tensor` representing the multinomial coefficient between `n` and `counts`.
+  """
+  # First a bit about the number of ways counts could have come in:
+  # E.g. if counts = [1, 2], then this is 3 choose 2.
+  # In general, this is (sum counts)! / sum(counts!)
+  # The sum should be along the last dimension of counts. This is the
+  # "distribution" dimension. Here n a priori represents the sum of counts.
+  with ops.name_scope(name, values=[n, counts]):
+    n = ops.convert_to_tensor(n, name="n")
+    counts = ops.convert_to_tensor(counts, name="counts")
+    total_permutations = math_ops.lgamma(n + 1)
+    counts_factorial = math_ops.lgamma(counts + 1)
+    redundant_permutations = math_ops.reduce_sum(counts_factorial, axis=[-1])
+    return total_permutations - redundant_permutations
+
+
+def matrix_diag_transform(matrix, transform=None, name=None):
+  """Transform diagonal of [batch-]matrix, leave rest of matrix unchanged.
+
+  Create a trainable covariance defined by a Cholesky factor:
+
+  ```python
+  # Transform network layer into 2 x 2 array.
+  matrix_values = tf.contrib.layers.fully_connected(activations, 4)
+  matrix = tf.reshape(matrix_values, (batch_size, 2, 2))
+
+  # Make the diagonal positive. If the upper triangle was zero, this would be a
+  # valid Cholesky factor.
+  chol = matrix_diag_transform(matrix, transform=tf.nn.softplus)
+
+  # OperatorPDCholesky ignores the upper triangle.
+  operator = OperatorPDCholesky(chol)
+  ```
+
+  Example of heteroskedastic 2-D linear regression.
+
+  ```python
+  # Get a trainable Cholesky factor.
+  matrix_values = tf.contrib.layers.fully_connected(activations, 4)
+  matrix = tf.reshape(matrix_values, (batch_size, 2, 2))
+  chol = matrix_diag_transform(matrix, transform=tf.nn.softplus)
+
+  # Get a trainable mean.
+  mu = tf.contrib.layers.fully_connected(activations, 2)
+
+  # This is a fully trainable multivariate normal!
+  dist = tf.contrib.distributions.MVNCholesky(mu, chol)
+
+  # Standard log loss. Minimizing this will "train" mu and chol, and then dist
+  # will be a distribution predicting labels as multivariate Gaussians.
+  loss = -1 * tf.reduce_mean(dist.log_prob(labels))
+  ```
+
+  Args:
+    matrix:  Rank `R` `Tensor`, `R >= 2`, where the last two dimensions are
+      equal.
+    transform:  Element-wise function mapping `Tensors` to `Tensors`. To
+      be applied to the diagonal of `matrix`. If `None`, `matrix` is returned
+      unchanged. Defaults to `None`.
+    name:  A name to give created ops.
+      Defaults to "matrix_diag_transform".
+
+  Returns:
+    A `Tensor` with same shape and `dtype` as `matrix`.
+  """
+  with ops.name_scope(name, "matrix_diag_transform", [matrix]):
+    matrix = ops.convert_to_tensor(matrix, name="matrix")
+    if transform is None:
+      return matrix
+    # Replace the diag with transformed diag.
+    diag = array_ops.matrix_diag_part(matrix)
+    transformed_diag = transform(diag)
+    transformed_mat = array_ops.matrix_set_diag(matrix, transformed_diag)
+
+  return transformed_mat
+
+
+def rotate_transpose(x, shift, name="rotate_transpose"):
+  """Circularly moves dims left or right.
+
+  Effectively identical to:
+
+  ```python
+  numpy.transpose(x, numpy.roll(numpy.arange(len(x.shape)), shift))
+  ```
+
+  When `validate_args=False` additional graph-runtime checks are
+  performed. These checks entail moving data from to GPU to CPU.
+
+  Example:
+
+    ```python
+    x = ...  # Tensor of shape [1, 2, 3, 4].
+    rotate_transpose(x, -1)  # result shape: [2, 3, 4, 1]
+    rotate_transpose(x, -2)  # result shape: [3, 4, 1, 2]
+    rotate_transpose(x,  1)  # result shape: [4, 1, 2, 3]
+    rotate_transpose(x,  2)  # result shape: [3, 4, 1, 2]
+    rotate_transpose(x, 7) == rotate_transpose(x, 3)
+    rotate_transpose(x, -7) == rotate_transpose(x, -3)
+    ```
+
+  Args:
+    x: `Tensor`.
+    shift: `Tensor`. Number of dimensions to transpose left (shift<0) or
+      transpose right (shift>0).
+    name: Python `str`. The name to give this op.
+
+  Returns:
+    rotated_x: Input `Tensor` with dimensions circularly rotated by shift.
+
+  Raises:
+    TypeError: if shift is not integer type.
+  """
+  with ops.name_scope(name, values=[x, shift]):
+    x = ops.convert_to_tensor(x, name="x")
+    shift = ops.convert_to_tensor(shift, name="shift")
+    # We do not assign back to preserve constant-ness.
+    check_ops.assert_integer(shift)
+    shift_value_static = tensor_util.constant_value(shift)
+    ndims = x.get_shape().ndims
+    if ndims is not None and shift_value_static is not None:
+      if ndims < 2: return x
+      shift_value_static = np.sign(shift_value_static) * (
+          abs(shift_value_static) % ndims)
+      if shift_value_static == 0: return x
+      perm = np.roll(np.arange(ndims), shift_value_static)
+      return array_ops.transpose(x, perm=perm)
+    else:
+      # Consider if we always had a positive shift, and some specified
+      # direction.
+      # When shifting left we want the new array:
+      #   last(x, n-shift) + first(x, shift)
+      # and if shifting right then we want:
+      #   last(x, shift) + first(x, n-shift)
+      # Observe that last(a) == slice(a, n) and first(a) == slice(0, a).
+      # Also, we can encode direction and shift as one: direction * shift.
+      # Combining these facts, we have:
+      #   a = cond(shift<0, -shift, n-shift)
+      #   last(x, n-a) + first(x, a) == x[a:n] + x[0:a]
+      # Finally, we transform shift by modulo length so it can be specified
+      # independently from the array upon which it operates (like python).
+      ndims = array_ops.rank(x)
+      shift = array_ops.where(math_ops.less(shift, 0),
+                              math_ops.mod(-shift, ndims),
+                              ndims - math_ops.mod(shift, ndims))
+      first = math_ops.range(0, shift)
+      last = math_ops.range(shift, ndims)
+      perm = array_ops.concat([last, first], 0)
+      return array_ops.transpose(x, perm=perm)
+
+
+def pick_vector(cond,
+                true_vector,
+                false_vector,
+                name="pick_vector"):
+  """Picks possibly different length row `Tensor`s based on condition.
+
+  Value `Tensor`s should have exactly one dimension.
+
+  If `cond` is a python Boolean or `tf.constant` then either `true_vector` or
+  `false_vector` is immediately returned. I.e., no graph nodes are created and
+  no validation happens.
+
+  Args:
+    cond: `Tensor`. Must have `dtype=tf.bool` and be scalar.
+    true_vector: `Tensor` of one dimension. Returned when cond is `True`.
+    false_vector: `Tensor` of one dimension. Returned when cond is `False`.
+    name: Python `str`. The name to give this op.
+
+  Example:
+
+  ```python
+  pick_vector(tf.less(0, 5), tf.range(10, 12), tf.range(15, 18))
+  # result is tensor: [10, 11].
+  pick_vector(tf.less(5, 0), tf.range(10, 12), tf.range(15, 18))
+  # result is tensor: [15, 16, 17].
+  ```
+
+  Returns:
+    true_or_false_vector: `Tensor`.
+
+  Raises:
+    TypeError: if `cond.dtype != tf.bool`
+    TypeError: if `cond` is not a constant and
+      `true_vector.dtype != false_vector.dtype`
+  """
+  with ops.name_scope(name, values=(cond, true_vector, false_vector)):
+    cond = ops.convert_to_tensor(cond, name="cond")
+    if cond.dtype != dtypes.bool:
+      raise TypeError("%s.dtype=%s which is not %s" %
+                      (cond.name, cond.dtype, dtypes.bool))
+    cond_value_static = tensor_util.constant_value(cond)
+    if cond_value_static is not None:
+      return true_vector if cond_value_static else false_vector
+    true_vector = ops.convert_to_tensor(true_vector, name="true_vector")
+    false_vector = ops.convert_to_tensor(false_vector, name="false_vector")
+    if true_vector.dtype != false_vector.dtype:
+      raise TypeError(
+          "%s.dtype=%s does not match %s.dtype=%s"
+          % (true_vector.name, true_vector.dtype,
+             false_vector.name, false_vector.dtype))
+    n = array_ops.shape(true_vector)[0]
+    return array_ops.slice(
+        array_ops.concat([true_vector, false_vector], 0),
+        [array_ops.where(cond, 0, n)], [array_ops.where(cond, n, -1)])
+
+
+def gen_new_seed(seed, salt):
+  """Generate a new seed, from the given seed and salt."""
+  if seed is None:
+    return None
+  string = (str(seed) + salt).encode("utf-8")
+  return int(hashlib.md5(string).hexdigest()[:8], 16) & 0x7FFFFFFF
+
+
+def fill_lower_triangular(x, validate_args=False, name="fill_lower_triangular"):
+  """Creates a (batch of) lower triangular matrix from a vector of inputs.
+
+  If `x.get_shape()` is `[b1, b2, ..., bK, d]` then the output shape is `[b1,
+  b2, ..., bK, n, n]` where `n` is such that `d = n(n+1)/2`, i.e.,
+  `n = int(0.5 * (math.sqrt(1. + 8. * d) - 1.))`.
+
+  Although the non-batch complexity is O(n**2), large constants and sub-optimal
+  vectorization means the complexity of this function is 5x slower than zeroing
+  out the upper triangular, i.e., `tf.matrix_band_part(X, -1, 0)`. This
+  function becomes competitive only when several matmul/cholesky/etc ops can be
+  ellided in constructing the input. Example: wiring a fully connected layer as
+  a covariance matrix; this function reduces the final layer by 2x and possibly
+  reduces the network arch complexity considerably. In most cases it is better
+  to simply build a full matrix and zero out the upper triangular elements,
+  e.g., `tril = tf.matrix_band_part(full, -1, 0)`, rather than directly
+  construct a lower triangular.
+
+  Example:
+
+  ```python
+  fill_lower_triangular([1, 2, 3, 4, 5, 6])
+  # Returns: [[1, 0, 0],
+  #           [2, 3, 0],
+  #           [4, 5, 6]]
+  ```
+
+  For comparison, a pure numpy version of this function can be found in
+  `distribution_util_test.py`, function `_fill_lower_triangular`.
+
+  Args:
+    x: `Tensor` representing lower triangular elements.
+    validate_args: Python `bool`, default `False`. Whether to ensure the shape
+      of `x` can be mapped to a lower triangular matrix (controls non-static
+      checks only).
+    name: Python `str`. The name to give this op.
+
+  Returns:
+    tril: `Tensor` with lower triangular elements filled from `x`.
+
+  Raises:
+    ValueError: if shape if `x` has static shape which cannot be mapped to a
+      lower triangular matrix.
+  """
+  # TODO(jvdillon): Replace this code with dedicated op when it exists.
+  with ops.name_scope(name, values=[x]):
+    x = ops.convert_to_tensor(x, name="x")
+    if (x.get_shape().ndims is not None and
+        x.get_shape()[-1].value is not None):
+      d = x.get_shape()[-1].value
+      # d = n(n+1)/2 implies n is:
+      n = int(0.5 * (math.sqrt(1. + 8. * d) - 1.))
+      d_inferred = n * (n + 1) /2
+      if d != d_inferred:
+        raise ValueError("Input cannot be mapped to a lower triangular; "
+                         "n*(n+1)/2 = %d != %d" % (d_inferred, d))
+      final_shape = x.get_shape()[:-1].concatenate(
+          tensor_shape.TensorShape([n, n]))
+    else:
+      d = math_ops.cast(array_ops.shape(x)[-1], dtype=dtypes.float32)
+      # d = n(n+1)/2 implies n is:
+      n = math_ops.cast(0.5 * (dtypes.sqrt(1. + 8. * d) - 1.),
+                        dtype=dtypes.int32)
+      if validate_args:
+        is_valid_input_shape = check_ops.assert_equal(
+            n * (n + 1) / 2, d,
+            message="Input cannot be mapped to a lower triangular.")
+        n = control_flow_ops.with_dependencies([is_valid_input_shape], n)
+      final_shape = x.get_shape()[:-1].concatenate(
+          tensor_shape.TensorShape([None, None]))
+
+    def tril_ids(n):
+      """Internal helper to create vector of linear indices into y."""
+      # Build the ids statically; chose 512 because it implies 1MiB.
+      if not tensor_util.is_tensor(n) and n <= 512:
+        ids = np.arange(n**2, dtype=np.int32)
+        rows = (ids / n).astype(np.int32)  # Implicit floor.
+        # We need to stop incrementing the index when we encounter
+        # upper-triangular elements. The idea here is to compute the
+        # lower-right number of zeros then by "symmetry" subtract this from the
+        # total number of zeros, n(n-1)/2.
+        # Then we note that: n(n-1)/2 - (n-r)*(n-r-1)/2 = r(2n-r-1)/2
+        offset = (rows * (2 * n - rows - 1) / 2).astype(np.int32)
+        # We could also zero out when (rows < cols) == (rows < ids-n*rows).
+        # mask = (ids <= (n + 1) * rows).astype(np.int32)
+      else:
+        ids = math_ops.range(n**2)
+        rows = math_ops.cast(ids / n, dtype=dtypes.int32)
+        offset = math_ops.cast(rows * (2 * n - rows - 1) / 2,
+                               dtype=dtypes.int32)
+      return ids - offset
+
+    # Special-case non-batch case.
+    if x.get_shape().ndims == 1:
+      y = array_ops.gather(x, array_ops.reshape(tril_ids(n), [n, n]))
+      y = array_ops.matrix_band_part(y, -1, 0)
+      y.set_shape(y.get_shape().merge_with(final_shape))
+      return y
+
+    # Make ids for each batch dim.
+    if (x.get_shape().ndims is not None and
+        x.get_shape()[:-1].is_fully_defined()):
+      batch_shape = np.asarray(x.get_shape()[:-1].as_list(), dtype=np.int32)
+      m = np.prod(batch_shape).astype(np.int32)
+    else:
+      batch_shape = array_ops.shape(x)[:-1]
+      m = array_ops.reduce_prod(array_ops.shape(x)[:-1])
+    batch_ids = math_ops.range(m)
+
+    # Assemble the tril_ids into batch,tril_id pairs.
+    idx = array_ops.stack([
+        array_ops.tile(array_ops.expand_dims(batch_ids, 1), [1, n * n]),
+        array_ops.tile(array_ops.expand_dims(tril_ids(n), 0), [m, 1])
+    ])
+    idx = array_ops.transpose(idx, [1, 2, 0])
+
+    # Gather up, reshape, and return.
+    y = array_ops.reshape(x, [-1, d])
+    y = array_ops.gather_nd(y, idx)
+    y = array_ops.reshape(y, array_ops.concat([batch_shape, [n, n]], 0))
+    y = array_ops.matrix_band_part(y, -1, 0)
+    y.set_shape(y.get_shape().merge_with(final_shape))
+    return y
+
+
+# TODO(jvdillon): Merge this test back into:
+# tensorflow/python/ops/softplus_op_test.py
+# once TF core is accepting new ops.
+def softplus_inverse(x, name=None):
+  """Computes the inverse softplus, i.e., x = softplus_inverse(softplus(x)).
+
+  Mathematically this op is equivalent to:
+
+  ```none
+  softplus_inverse = log(exp(x) - 1.)
+  ```
+
+  Args:
+    x: `Tensor`. Non-negative (not enforced), floating-point.
+    name: A name for the operation (optional).
+
+  Returns:
+    `Tensor`. Has the same type/shape as input `x`.
+  """
+  with ops.name_scope(name, "softplus_inverse", values=[x]):
+    x = ops.convert_to_tensor(x, name="x")
+    # We begin by deriving a more numerically stable softplus_inverse:
+    # x = softplus(y) = Log[1 + exp{y}], (which means x > 0).
+    # ==> exp{x} = 1 + exp{y}                                (1)
+    # ==> y = Log[exp{x} - 1]                                (2)
+    #       = Log[(exp{x} - 1) / exp{x}] + Log[exp{x}]
+    #       = Log[(1 - exp{-x}) / 1] + Log[exp{x}]
+    #       = Log[1 - exp{-x}] + x                           (3)
+    # (2) is the "obvious" inverse, but (3) is more stable than (2) for large x.
+    # For small x (e.g. x = 1e-10), (3) will become -inf since 1 - exp{-x} will
+    # be zero. To fix this, we use 1 - exp{-x} approx x for small x > 0.
+    #
+    # In addition to the numerically stable derivation above, we clamp
+    # small/large values to be congruent with the logic in:
+    # tensorflow/core/kernels/softplus_op.h
+    #
+    # Finally, we set the input to one whenever the input is too large or too
+    # small. This ensures that no unchosen codepath is +/- inf. This is
+    # necessary to ensure the gradient doesn't get NaNs. Recall that the
+    # gradient of `where` behaves like `pred*pred_true + (1-pred)*pred_false`
+    # thus an `inf` in an unselected path results in `0*inf=nan`. We are careful
+    # to overwrite `x` with ones only when we will never actually use this
+    # value. Note that we use ones and not zeros since `log(expm1(0.)) = -inf`.
+    threshold = np.log(np.finfo(x.dtype.as_numpy_dtype).eps) + 2.
+    is_too_small = math_ops.less(x, np.exp(threshold))
+    is_too_large = math_ops.greater(x, -threshold)
+    too_small_value = math_ops.log(x)
+    too_large_value = x
+    # This `where` will ultimately be a NOP because we won't select this
+    # codepath whenever we used the surrogate `ones_like`.
+    x = array_ops.where(math_ops.logical_or(is_too_small, is_too_large),
+                        array_ops.ones_like(x), x)
+    y = x + math_ops.log(-math_ops.expm1(-x))  # == log(expm1(x))
+    return array_ops.where(is_too_small, too_small_value,
+                           array_ops.where(is_too_large, too_large_value, y))
+
+
+# TODO(b/35290280): Add unit-tests.
+def dimension_size(x, axis):
+  """Returns the size of a specific dimension."""
+  # Since tf.gather isn't "constant-in, constant-out", we must first check the
+  # static shape or fallback to dynamic shape.
+  num_rows = (None if x.get_shape().ndims is None
+              else x.get_shape()[axis].value)
+  if num_rows is not None:
+    return num_rows
+  return array_ops.shape(x)[axis]
+
+
+class AppendDocstring(object):
+  """Helper class to promote private subclass docstring to public counterpart.
+
+  Example:
+
+  ```python
+  class TransformedDistribution(Distribution):
+    @distribution_util.AppendDocstring(
+      additional_note="A special note!",
+      kwargs_dict={"foo": "An extra arg."})
+    def _prob(self, y, foo=None):
+      pass
+  ```
+
+  In this case, the `AppendDocstring` decorator appends the `additional_note` to
+  the docstring of `prob` (not `_prob`) and adds a new `kwargs`
+  section with each dictionary item as a bullet-point.
+
+  For a more detailed example, see `TransformedDistribution`.
+  """
+
+  def __init__(self, additional_note="", kwargs_dict=None):
+    """Initializes the AppendDocstring object.
+
+    Args:
+      additional_note: Python string added as additional docstring to public
+        version of function.
+      kwargs_dict: Python string/string dictionary representing
+        specific kwargs expanded from the **kwargs input.
+
+    Raises:
+      ValueError: if kwargs_dict.key contains whitespace.
+      ValueError: if kwargs_dict.value contains newlines.
+    """
+    self._additional_note = additional_note
+    if kwargs_dict:
+      bullets = []
+      for key in sorted(kwargs_dict.keys()):
+        value = kwargs_dict[key]
+        if any(x.isspace() for x in key):
+          raise ValueError(
+              "Parameter name \"%s\" contains whitespace." % key)
+        value = value.lstrip()
+        if "\n" in value:
+          raise ValueError(
+              "Parameter description for \"%s\" contains newlines." % key)
+        bullets.append("*  `%s`: %s" % (key, value))
+      self._additional_note += ("\n\n##### `kwargs`:\n\n" +
+                                "\n".join(bullets))
+
+  def __call__(self, fn):
+    @functools.wraps(fn)
+    def _fn(*args, **kwargs):
+      return fn(*args, **kwargs)
+    if _fn.__doc__ is None:
+      _fn.__doc__ = self._additional_note
+    else:
+      _fn.__doc__ += "\n%s" % self._additional_note
+    return _fn
-- 
GitLab


From ba1024b5c37f7ef40bea324fb64ae2d54c0ac9d3 Mon Sep 17 00:00:00 2001
From: Yi Liu <liu.yi.pei@gmail.com>
Date: Thu, 27 Apr 2017 09:22:14 -0700
Subject: [PATCH 0741/1563] tf_upgrade.py now handles batch_matmul named args.
 (#9448)

---
 tensorflow/tools/compatibility/tf_upgrade.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/tools/compatibility/tf_upgrade.py b/tensorflow/tools/compatibility/tf_upgrade.py
index 80439f835a..9a4a8ff71d 100644
--- a/tensorflow/tools/compatibility/tf_upgrade.py
+++ b/tensorflow/tools/compatibility/tf_upgrade.py
@@ -34,6 +34,10 @@ class APIChangeSpec(object):
     # Maps from a function name to a dictionary that describes how to
     # map from an old argument keyword to the new argument keyword.
     self.function_keyword_renames = {
+        "tf.batch_matmul": {
+            "adj_x": "adjoint_a",
+            "adj_y": "adjoint_b",
+        },
         "tf.count_nonzero": {
             "reduction_indices": "axis"
         },
-- 
GitLab


From d57c31661e8f76d6c3d91f3969d4d4219c9ea97c Mon Sep 17 00:00:00 2001
From: "Ruizhe Zhao (Vincent)" <kumasento@users.noreply.github.com>
Date: Thu, 27 Apr 2017 17:22:33 +0100
Subject: [PATCH 0742/1563] Quantize Graph - check whether the key exists
 before using it (#9393)

* check whether the key exists before using it

* remove verbose
---
 tensorflow/tools/quantization/quantize_graph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/quantization/quantize_graph.py b/tensorflow/tools/quantization/quantize_graph.py
index d09349a79b..90f1ab4d66 100644
--- a/tensorflow/tools/quantization/quantize_graph.py
+++ b/tensorflow/tools/quantization/quantize_graph.py
@@ -453,7 +453,7 @@ class GraphRewriter(object):
 
   def round_nodes_recursively(self, current_node):
     """The entry point for simple rounding quantization."""
-    if self.already_visited[current_node.name]:
+    if (current_node.name in self.already_visited) and self.already_visited[current_node.name]:
       return
     self.already_visited[current_node.name] = True
     for input_node_name in current_node.input:
-- 
GitLab


From 1fb1a0798ffe6552a62937f6c739e2313d5903cf Mon Sep 17 00:00:00 2001
From: 4F2E4A2E <4F2E4A2E@users.noreply.github.com>
Date: Thu, 27 Apr 2017 18:22:56 +0200
Subject: [PATCH 0743/1563] Fixing anaconda install command (#9277)

3.6 is the standard python version of anaconda. In order to get tensorflow installed correctly, version 3.5 is needed. Passing the exact version of python to the anaconda environment is necessary.
---
 tensorflow/docs_src/install/install_windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 5f7c27c028..a59f2998b1 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -103,7 +103,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
   2. Create a conda environment named <tt>tensorflow</tt>
      by invoking the following command:
 
-     <pre>C:\> <b>conda create -n tensorflow</b> </pre>
+     <pre>C:\> <b>conda create -n tensorflow python=3.5</b> </pre>
 
   3. Activate the conda environment by issuing the following command:
 
-- 
GitLab


From b358fb4bf788b96bf630989d1e5dda8bb5685346 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Thu, 27 Apr 2017 08:17:48 -0800
Subject: [PATCH 0744/1563] Publish PredictionType. Change: 154430246

---
 tensorflow/contrib/learn/python/learn/estimators/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/__init__.py b/tensorflow/contrib/learn/python/learn/estimators/__init__.py
index 118e974c6a..a40cbc0449 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/__init__.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/__init__.py
@@ -323,6 +323,7 @@ from tensorflow.contrib.learn.python.learn.estimators.metric_key import MetricKe
 from tensorflow.contrib.learn.python.learn.estimators.model_fn import ModeKeys
 from tensorflow.contrib.learn.python.learn.estimators.model_fn import ModelFnOps
 from tensorflow.contrib.learn.python.learn.estimators.prediction_key import PredictionKey
+from tensorflow.contrib.learn.python.learn.estimators.rnn_common import PredictionType
 from tensorflow.contrib.learn.python.learn.estimators.run_config import ClusterConfig
 from tensorflow.contrib.learn.python.learn.estimators.run_config import Environment
 from tensorflow.contrib.learn.python.learn.estimators.run_config import RunConfig
-- 
GitLab


From ab3223ef812601f86c611277adef3c33963d5efc Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 08:41:05 -0800
Subject: [PATCH 0745/1563] [TF:XLA] Implemented slice() constant folder.

If the operand of a slice operation is a constant literal, replace the slice HLO instruction with a new constant literal which represents the sliced tensor.
Change: 154432818
---
 .../xla/service/algebraic_simplifier.cc       | 16 +++++++++++++
 .../xla/service/algebraic_simplifier_test.cc  | 23 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 38668856a3..4c80919bb8 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -1142,6 +1142,22 @@ Status AlgebraicSimplifierVisitor::HandleSlice(HloInstruction* slice,
   if (ReplaceInstructionIfSameShape(slice, operand)) {
     return Status::OK();
   }
+  if (operand->opcode() == HloOpcode::kConstant) {
+    const Shape& shape = slice->shape();
+    auto literal = LiteralUtil::CreateFromDimensions(
+        shape.element_type(), AsInt64Slice(shape.dimensions()));
+    std::vector<int64> dest_indices(slice->slice_starts().size(), 0);
+    Status status = LiteralUtil::Copy(operand->literal(), slice->slice_starts(),
+                                      literal.get(), dest_indices,
+                                      AsInt64Slice(shape.dimensions()));
+    if (status.ok()) {
+      TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
+          slice, HloInstruction::CreateConstant(std::move(literal))));
+      changed_ = true;
+    } else {
+      VLOG(1) << "Error while creating sliced literal : " << status;
+    }
+  }
   return Status::OK();
 }
 
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 8c28ef30ef..93ed9da566 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -1661,5 +1661,28 @@ TEST_F(AlgebraicSimplifierTest, Concatenate) {
   }
 }
 
+TEST_F(AlgebraicSimplifierTest, Slice) {
+  HloComputation::Builder builder(TestName());
+  const int64 dimensions[] = {11, 8, 7, 5, 9};
+  const int64 slice_start[] = {4, 2, 3, 1, 5};
+  const int64 slice_limits[] = {10, 8, 6, 5, 9};
+  auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
+  HloInstruction* lit_insn = builder.AddInstruction(
+      HloInstruction::CreateConstant(std::move(literal)));
+  Shape shape = ShapeUtil::MakeShape(F32, {6, 6, 3, 4, 4});
+  builder.AddInstruction(
+      HloInstruction::CreateSlice(shape, lit_insn, slice_start, slice_limits));
+  HloModule module(TestName());
+  auto computation = module.AddEntryComputation(builder.Build());
+
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_EQ(root->opcode(), HloOpcode::kConstant);
+  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 48465ba5c0fef17dfbc3479cce09a7214c9385da Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Thu, 27 Apr 2017 10:02:56 -0700
Subject: [PATCH 0746/1563] Removing duplicate function.

---
 tensorflow/tensorflow.bzl | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index a3056b861b..ddffabd8cb 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -930,18 +930,6 @@ def tf_custom_op_py_library(name,
       deps=deps,)
 
 
-def tf_custom_op_py_library(name, srcs=[], dso=[], kernels=[],
-                            srcs_version="PY2AND3", visibility=None, deps=[]):
-  kernels = kernels  # unused argument
-  native.py_library(
-      name=name,
-      data=dso,
-      srcs=srcs,
-      srcs_version=srcs_version,
-      visibility=visibility,
-      deps=deps,
-  )
-
 def tf_extension_linkopts():
   return []  # No extension link opts
 
-- 
GitLab


From 891de62d0266113b067267ece48ea448665a5fbe Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 27 Apr 2017 08:59:05 -0800
Subject: [PATCH 0747/1563] [tf contrib seq2seq] Minor cleanups to beam search
 decoder. Change: 154435114

---
 .../seq2seq/python/ops/beam_search_decoder.py | 41 +++++++++++--------
 .../contrib/seq2seq/python/ops/decoder.py     |  9 +++-
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index 2dbaf746ed..63ce9dafc0 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -452,10 +452,12 @@ def _beam_search_step(time, logits, beam_state, batch_size, beam_width,
     time: Beam search time step, should start at 0. At time 0 we assume
       that all beams are equal and consider only the first beam for
       continuations.
-    logits: Logits at the current time step. A tensor of shape `[B, vocab_size]`
-    beam_state: Current state of the beam search. An instance of `BeamState`
+    logits: Logits at the current time step. A tensor of shape
+      `[batch_size, beam_width, vocab_size]`
+    beam_state: Current state of the beam search.
+      An instance of `BeamSearchDecoderState`.
     batch_size: The batch size for this input.
-    beam_width: The size of the beams.
+    beam_width: Python int.  The size of the beams.
     end_token: The int32 end token.
     length_penalty_weight: Float weight to penalize length. Disabled with 0.0.
 
@@ -470,20 +472,22 @@ def _beam_search_step(time, logits, beam_state, batch_size, beam_width,
 
   # Calculate the total log probs for the new hypotheses
   # Final Shape: [batch_size, beam_width, vocab_size]
-  probs = nn_ops.log_softmax(logits)
-  probs = _mask_probs(probs, end_token, previously_finished)
-  total_probs = array_ops.expand_dims(beam_state.log_probs, 2) + probs
+  step_log_probs = nn_ops.log_softmax(logits)
+  step_log_probs = _mask_probs(step_log_probs, end_token, previously_finished)
+  total_probs = array_ops.expand_dims(beam_state.log_probs, 2) + step_log_probs
 
   # Calculate the continuation lengths by adding to all continuing beams.
-  vocab_size = logits.get_shape().as_list()[-1]
+  vocab_size = logits.shape[-1].value
   lengths_to_add = array_ops.one_hot(
-      array_ops.tile(
+      indices=array_ops.tile(
           array_ops.reshape(end_token, [1, 1]), [batch_size, beam_width]),
-      vocab_size, 0, 1)
+      depth=vocab_size,
+      on_value=0,
+      off_value=1)
   add_mask = (1 - math_ops.to_int32(previously_finished))
   lengths_to_add = array_ops.expand_dims(add_mask, 2) * lengths_to_add
-  new_prediction_lengths = array_ops.expand_dims(prediction_lengths,
-                                                 2) + lengths_to_add
+  new_prediction_lengths = (
+      lengths_to_add + array_ops.expand_dims(prediction_lengths, 2))
 
   # Calculate the scores for each beam
   scores = _get_scores(
@@ -491,10 +495,11 @@ def _beam_search_step(time, logits, beam_state, batch_size, beam_width,
       sequence_lengths=new_prediction_lengths,
       length_penalty_weight=length_penalty_weight)
 
-  scores_flat = array_ops.reshape(scores, [batch_size, -1])
+  time = ops.convert_to_tensor(time, name="time")
   # During the first time step we only consider the initial beam
   scores_flat = control_flow_ops.cond(
-      ops.convert_to_tensor(time) > 0, lambda: scores_flat,
+      time > 0,
+      lambda: array_ops.reshape(scores, [batch_size, -1]),
       lambda: scores[:, 0])
 
   # Pick the next beams according to the specified successors function
@@ -579,7 +584,11 @@ def _length_penalty(sequence_lengths, penalty_factor):
   Returns:
     The length penalty factor, a tensor fo shape [beam_size].
   """
-  # TODO(ebrevdo): cleanup based on constant-value of penalty_factor.
+  penalty_factor = ops.convert_to_tensor(penalty_factor, name="penalty_factor")
+  penalty_factor.set_shape(())  # penalty should be a scalar.
+  static_penalty = tensor_util.constant_value(penalty_factor)
+  if static_penalty is not None and static_penalty == 0:
+    return 1.0
   return math_ops.div((5. + math_ops.to_float(sequence_lengths))
                       **penalty_factor, (5. + 1.)**penalty_factor)
 
@@ -613,9 +622,9 @@ def _mask_probs(probs, eos_token, finished):
   finished_row = array_ops.one_hot(
       eos_token,
       vocab_size,
-      dtype=dtypes.float32,
+      dtype=probs.dtype,
       on_value=0.,
-      off_value=dtypes.float32.min)
+      off_value=probs.dtype.min)
   finished_examples = (1. - finished_mask) * finished_row
   return finished_examples + non_finished_examples
 
diff --git a/tensorflow/contrib/seq2seq/python/ops/decoder.py b/tensorflow/contrib/seq2seq/python/ops/decoder.py
index ff705715e0..4795dfb8c9 100644
--- a/tensorflow/contrib/seq2seq/python/ops/decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/decoder.py
@@ -107,6 +107,9 @@ class Decoder(object):
     """
     raise NotImplementedError
 
+  def finalize(self, outputs, final_state, sequence_lengths):
+    raise NotImplementedError
+
 
 def _create_zero_outputs(size, dtype, batch_size):
   """Create a zero outputs Tensor structure."""
@@ -164,7 +167,7 @@ def dynamic_decode(decoder,
     raise TypeError("Expected decoder to be type Decoder, but saw: %s" %
                     type(decoder))
 
-  with variable_scope.variable_scope(scope or "decoder") as varscope:
+  with variable_scope.variable_scope(scope, "decoder") as varscope:
     # Properly cache variable values inside the while_loop
     if varscope.caching_device is None:
       varscope.set_caching_device(lambda op: op.device)
@@ -288,9 +291,11 @@ def dynamic_decode(decoder,
 
     final_outputs = nest.map_structure(lambda ta: ta.stack(), final_outputs_ta)
 
-    if hasattr(decoder, "finalize"):
+    try:
       final_outputs, final_state = decoder.finalize(
           final_outputs, final_state, final_sequence_lengths)
+    except NotImplementedError:
+      pass
 
     if not output_time_major:
       final_outputs = nest.map_structure(_transpose_batch_time, final_outputs)
-- 
GitLab


From 7468625dc86721cbdadfbf0aabf6d2e4efe78f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Geron?= <ageron@users.noreply.github.com>
Date: Thu, 27 Apr 2017 19:25:18 +0200
Subject: [PATCH 0748/1563] Make binary ops delegate to rhs when tensor
 conversion fails (#8219)

* Make binary ops delegate to rhs when tensor conversion fails

* Fix test file's doc string

* Add comment
---
 .../kernel_tests/tensor_priority_test.py      | 79 +++++++++++++++++++
 tensorflow/python/ops/math_ops.py             | 11 ++-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/python/kernel_tests/tensor_priority_test.py

diff --git a/tensorflow/python/kernel_tests/tensor_priority_test.py b/tensorflow/python/kernel_tests/tensor_priority_test.py
new file mode 100644
index 0000000000..b6674c3aa5
--- /dev/null
+++ b/tensorflow/python/kernel_tests/tensor_priority_test.py
@@ -0,0 +1,79 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the binary ops priority mechanism."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow import Tensor
+from tensorflow import register_tensor_conversion_function
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test as test_lib
+
+
+class TensorPriorityTest(test_lib.TestCase):
+
+  def testSupportedRhsWithoutDelegation(self):
+    class NumpyArraySubclass(np.ndarray):
+      pass
+    supported_rhs_without_delegation = (
+      3,
+      3.0,
+      [1.0, 2.0],
+      np.array([1.0, 2.0]),
+      NumpyArraySubclass(shape=(1,2), buffer=np.array([1.0, 2.0])),
+      ops.convert_to_tensor([[1.0, 2.0]]))
+    for rhs in supported_rhs_without_delegation:
+      tensor = ops.convert_to_tensor([[10.0, 20.0]])
+      res = tensor + rhs
+      self.assertIsInstance(res, Tensor)
+
+  def testUnsupportedRhsWithoutDelegation(self):
+    class WithoutReverseAdd(object):
+      pass
+    tensor = ops.convert_to_tensor([[10.0, 20.0]])
+    rhs = WithoutReverseAdd()
+    with self.assertRaisesWithPredicateMatch(
+        TypeError, lambda e: "Expected float" in str(e)):
+      res = tensor + rhs
+
+  def testUnsupportedRhsWithDelegation(self):
+    class WithReverseAdd(object):
+      def __radd__(self, lhs):
+        return "Works!"
+    tensor = ops.convert_to_tensor([[10.0, 20.0]])
+    rhs = WithReverseAdd()
+    res = tensor + rhs
+    self.assertEqual(res, "Works!")
+
+  def testFullDelegationControlUsingRegistry(self):
+    class NumpyArraySubclass(np.ndarray):
+      def __radd__(self, lhs):
+        return "Works!"
+    def raise_to_delegate(value, dtype=None, name=None, as_ref=False):
+      raise TypeError
+    register_tensor_conversion_function(NumpyArraySubclass, raise_to_delegate,
+                                        priority=0)
+    tensor = ops.convert_to_tensor([[10.0, 20.0]])
+    rhs = NumpyArraySubclass(shape=(1,2), buffer=np.array([1.0, 2.0]))
+    res = tensor + rhs
+    self.assertEqual(res, "Works!")
+
+
+if __name__ == "__main__":
+  test_lib.main()
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 61797f0175..86e45ac860 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -819,7 +819,16 @@ def _OverrideBinaryOperatorHelper(func, op_name, clazz_object=ops.Tensor):
   def binary_op_wrapper(x, y):
     with ops.name_scope(None, op_name, [x, y]) as name:
       if not isinstance(y, sparse_tensor.SparseTensor):
-        y = ops.convert_to_tensor(y, dtype=x.dtype.base_dtype, name="y")
+        try:
+          y = ops.convert_to_tensor(y, dtype=x.dtype.base_dtype, name="y")
+        except TypeError:
+          # If the RHS is not a tensor, it might be a tensor aware object
+          # that can implement the operator with knowledge of itself
+          # and the tensor.
+          if hasattr(type(y), "__r%s__" % op_name):
+            return NotImplemented
+          else:
+            raise
       return func(x, y, name=name)
 
   def binary_op_wrapper_sparse(sp_x, y):
-- 
GitLab


From eb2fddcf100aa29e18c8d7c3bf7c2ce2e1778c21 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 09:21:36 -0800
Subject: [PATCH 0749/1563] [XLA:HLO] Tiny change to BufferAssigner to dump the
 hlo module at VLOG(2).

It's convenient to be able to dump the hlo module, without dumping all the
liveness and LogicalBuffer information.
Change: 154438050
---
 tensorflow/compiler/xla/service/buffer_assignment.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index 6efa73b121..3cdbf892f7 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -1117,7 +1117,7 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
       VLOG(3) << "  " << hlo->parent()->name() << "::" << hlo->name();
     }
   }
-  XLA_VLOG_LINES(3, module->ToString());
+  XLA_VLOG_LINES(2, module->ToString());
   XLA_VLOG_LINES(3, liveness->ToString());
   XLA_VLOG_LINES(3, liveness->points_to_analysis().ToString());
 
-- 
GitLab


From 9d3da05e042e8621d8a3c69d7802064fcb34ab51 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 09:33:27 -0800
Subject: [PATCH 0750/1563] Expose `prepend_name_scope` and `strip_name_scope`
 in contrib.framework. Change: 154439466

---
 tensorflow/contrib/framework/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tensorflow/contrib/framework/__init__.py b/tensorflow/contrib/framework/__init__.py
index 40234f5b48..d14fc5d685 100644
--- a/tensorflow/contrib/framework/__init__.py
+++ b/tensorflow/contrib/framework/__init__.py
@@ -40,6 +40,9 @@ See the @{$python/contrib.framework} guide.
 @@has_arg_scope
 @@arg_scoped_arguments
 
+@@prepend_name_scope
+@@strip_name_scope
+
 @@add_model_variable
 @@assert_global_step
 @@assert_or_get_global_step
@@ -82,6 +85,9 @@ from tensorflow.contrib.framework.python.framework import *
 from tensorflow.contrib.framework.python.ops import *
 # pylint: enable=unused-import,wildcard-import
 
+from tensorflow.python.framework.ops import prepend_name_scope
+from tensorflow.python.framework.ops import strip_name_scope
+
 from tensorflow.python.util.all_util import remove_undocumented
 
 
-- 
GitLab


From f580727bfdcb1a40d110d2501c51e3d893619e8c Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Thu, 27 Apr 2017 09:40:09 -0800
Subject: [PATCH 0751/1563] Java: Update release artifacts from 1.1.0-rc2 to
 1.1.0 Change: 154440320

---
 tensorflow/java/README.md                     | 28 +++++++++----------
 tensorflow/java/maven/libtensorflow/pom.xml   |  2 +-
 .../java/maven/libtensorflow_jni/pom.xml      |  2 +-
 tensorflow/java/maven/pom.xml                 |  2 +-
 tensorflow/java/maven/proto/pom.xml           |  2 +-
 tensorflow/java/maven/tensorflow/pom.xml      |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tensorflow/java/README.md b/tensorflow/java/README.md
index 81e262db93..e13ad61db0 100644
--- a/tensorflow/java/README.md
+++ b/tensorflow/java/README.md
@@ -24,7 +24,7 @@ your project's `pom.xml`:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc2</version>
+  <version>1.1.0</version>
 </dependency>
 ```
 
@@ -50,7 +50,7 @@ That's all. As an example, to create a Maven project for the
           <dependency>
             <groupId>org.tensorflow</groupId>
             <artifactId>tensorflow</artifactId>
-            <version>1.1.0-rc2</version>
+            <version>1.1.0</version>
           </dependency>
         </dependencies>
     </project>
@@ -75,22 +75,22 @@ That's all. As an example, to create a Maven project for the
 This section describes how to use TensorFlow armed with just a JDK installation.
 
 1.  Download the Java archive (JAR):
-    [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar)
+    [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar)
     (optionally, the Java sources:
-    [libtensorflow-src.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-src-1.1.0-rc2.jar)).
+    [libtensorflow-src.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-src-1.1.0.jar)).
 
 2.  Download the native library. GPU-enabled versions required CUDA 8 and cuDNN
     5.1. For other versions, the native library will need to be built from
     source (see below).
 
     -   Linux:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-linux-x86_64-1.1.0-rc2.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-linux-x86_64-1.1.0-rc2.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-linux-x86_64-1.1.0.tar.gz),
+        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-linux-x86_64-1.1.0.tar.gz)
     -   OS X:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-darwin-x86_64-1.1.0-rc2.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-darwin-x86_64-1.1.0-rc2.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-darwin-x86_64-1.1.0.tar.gz),
+        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-darwin-x86_64-1.1.0.tar.gz)
     -   Windows:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc2.zip)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip)
 
 
     The following shell snippet downloads and extracts the native library on
@@ -101,7 +101,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     OS=$(uname -s | tr '[:upper:]' '[:lower:]')
     mkdir -p ./jni
     curl -L \
-      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
+      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
     tar -xz -C ./jni
     ```
 
@@ -121,7 +121,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     then it should be compiled with:
 
     ```sh
-    javac -cp libtensorflow-1.1.0-rc2.jar MyClass.java
+    javac -cp libtensorflow-1.1.0.jar MyClass.java
     ```
 
     For a more sophisticated example, see
@@ -130,7 +130,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
 
     ```sh
     javac \
-      -cp libtensorflow-1.1.0-rc2.jar \
+      -cp libtensorflow-1.1.0.jar \
       ./src/main/java/org/tensorflow/examples/LabelImage.java
     ```
 
@@ -138,7 +138,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     library path during execution. For example:
 
     ```sh
-    java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni MyClass
+    java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni MyClass
     ```
 
     or for the `LabelImage` example:
@@ -146,7 +146,7 @@ This section describes how to use TensorFlow armed with just a JDK installation.
     ```sh
     java \
       -Djava.library.path=./jni \
-      -cp libtensorflow-1.1.0-rc2.jar:./src/main/java \
+      -cp libtensorflow-1.1.0.jar:./src/main/java \
       org.tensorflow.examples.LabelImage
     ```
 
diff --git a/tensorflow/java/maven/libtensorflow/pom.xml b/tensorflow/java/maven/libtensorflow/pom.xml
index d1ef706732..e8817c3459 100644
--- a/tensorflow/java/maven/libtensorflow/pom.xml
+++ b/tensorflow/java/maven/libtensorflow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc2</version>
+    <version>1.1.0</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>libtensorflow</artifactId>
diff --git a/tensorflow/java/maven/libtensorflow_jni/pom.xml b/tensorflow/java/maven/libtensorflow_jni/pom.xml
index 98e8eba031..65f331979f 100644
--- a/tensorflow/java/maven/libtensorflow_jni/pom.xml
+++ b/tensorflow/java/maven/libtensorflow_jni/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc2</version>
+    <version>1.1.0</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>libtensorflow_jni</artifactId>
diff --git a/tensorflow/java/maven/pom.xml b/tensorflow/java/maven/pom.xml
index 7bb191c7c7..59d798effe 100644
--- a/tensorflow/java/maven/pom.xml
+++ b/tensorflow/java/maven/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.tensorflow</groupId>
   <artifactId>parentpom</artifactId>
-  <version>1.1.0-rc2</version>
+  <version>1.1.0</version>
   <packaging>pom</packaging>
 
   <url>https://www.tensorflow.org</url>
diff --git a/tensorflow/java/maven/proto/pom.xml b/tensorflow/java/maven/proto/pom.xml
index 97feb735a1..a306dd6769 100644
--- a/tensorflow/java/maven/proto/pom.xml
+++ b/tensorflow/java/maven/proto/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc2</version>
+    <version>1.1.0</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>proto</artifactId>
diff --git a/tensorflow/java/maven/tensorflow/pom.xml b/tensorflow/java/maven/tensorflow/pom.xml
index 0789cca40b..74adb35ba8 100644
--- a/tensorflow/java/maven/tensorflow/pom.xml
+++ b/tensorflow/java/maven/tensorflow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.tensorflow</groupId>
     <artifactId>parentpom</artifactId>
-    <version>1.1.0-rc2</version>
+    <version>1.1.0</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>tensorflow</artifactId>
-- 
GitLab


From aa41ea477e3da7dd7c4b820648b3bb6a592232e3 Mon Sep 17 00:00:00 2001
From: David Eng <gnedivad@gmail.com>
Date: Thu, 27 Apr 2017 10:54:30 -0700
Subject: [PATCH 0752/1563] [documentation] Updated comment for tf.multnomial
 (#9158)

---
 tensorflow/python/ops/random_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/random_ops.py b/tensorflow/python/ops/random_ops.py
index 19689622b1..f06980783a 100644
--- a/tensorflow/python/ops/random_ops.py
+++ b/tensorflow/python/ops/random_ops.py
@@ -324,7 +324,7 @@ def multinomial(logits, num_samples, seed=None, name=None):
 
   Args:
     logits: 2-D Tensor with shape `[batch_size, num_classes]`.  Each slice
-      `[i, :]` represents the unnormalized log probabilities for all classes.
+      `[i, :]` represents the log-odds for all classes.
     num_samples: 0-D.  Number of independent samples to draw for each row slice.
     seed: A Python integer. Used to create a random seed for the distribution.
       See
-- 
GitLab


From c5fb636b3ed77265694f1a9235af87e1511e9bed Mon Sep 17 00:00:00 2001
From: GBLin5566 <r04943092@ntu.edu.tw>
Date: Fri, 28 Apr 2017 01:54:49 +0800
Subject: [PATCH 0753/1563] Make orthogonal initializer use qr factorization
 (instead of svd) (#9429)

* Make orthogonal initializer use qr factorization (instead of svd)

* Make q from qr factorization uniformly by random

* Change the testing size of orthogonal initializers
---
 .../keras/python/keras/initializers_test.py   |  2 +-
 tensorflow/python/ops/init_ops.py             | 23 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/initializers_test.py b/tensorflow/contrib/keras/python/keras/initializers_test.py
index c9f50c28ea..0a07eddd89 100644
--- a/tensorflow/contrib/keras/python/keras/initializers_test.py
+++ b/tensorflow/contrib/keras/python/keras/initializers_test.py
@@ -120,7 +120,7 @@ class KerasInitializersTest(test.TestCase):
                    target_mean=0., target_std=None, target_max=2 * scale)
 
   def test_orthogonal(self):
-    tensor_shape = (10, 10)
+    tensor_shape = (20, 20)
     with self.test_session():
       self._runner(keras.initializers.orthogonal(seed=123), tensor_shape,
                    target_mean=0.)
diff --git a/tensorflow/python/ops/init_ops.py b/tensorflow/python/ops/init_ops.py
index 67fff9c803..4d922946ff 100644
--- a/tensorflow/python/ops/init_ops.py
+++ b/tensorflow/python/ops/init_ops.py
@@ -40,6 +40,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import math_ops
 
 
 class Initializer(object):
@@ -487,16 +488,18 @@ class Orthogonal(Initializer):
     flat_shape = (num_rows, num_cols)
 
     # Generate a random matrix
-    a = random_ops.random_uniform(flat_shape, dtype=dtype, seed=self.seed)
-    # Compute the svd
-    _, u, v = linalg_ops.svd(a, full_matrices=False)
-    # Pick the appropriate singular value decomposition
-    if num_rows > num_cols:
-      q = u
-    else:
-      # Tensorflow departs from numpy conventions
-      # such that we need to transpose axes here
-      q = array_ops.transpose(v)
+    a = random_ops.random_normal(flat_shape, dtype=dtype, seed=self.seed)
+    # Compute the qr factorization
+    q, r = linalg_ops.qr(a, full_matrices=False)
+    # Make Q uniform
+    square_len = math_ops.minimum(num_rows, num_cols)
+    d = array_ops.diag_part(r[:square_len, :square_len])
+    ph = d / math_ops.abs(d)
+    q *= ph
+    # Pad zeros to Q (if rows smaller than cols)
+    if num_rows < num_cols:
+      padding = array_ops.zeros([num_rows, num_cols - num_rows], dtype=dtype)
+      q = array_ops.concat([q, padding], 1)
     return self.gain * array_ops.reshape(q, shape)
 
   def get_config(self):
-- 
GitLab


From 9693a8c668790ad003647980420ee95e2af5f27d Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Thu, 27 Apr 2017 09:41:33 -0800
Subject: [PATCH 0754/1563] Softness parameter added to softplus bijector. 
 Changes the bijector to

f_c(x) = c * g(x / c) = c * Log[1 + exp{x / c}]

Called it "softness_parameter."  Note that this type of scaling is specific for the softplus...if we wanted something general, we would just do f_c(x) = g(x / c).  Only in the case of the softplus can you achieve the specific goal of ~ identity for large x by doing the pre-multiplication by "c".
Change: 154440504
---
 .../kernel_tests/bijectors/softplus_test.py   | 37 +++++++++++
 .../python/ops/bijectors/softplus_impl.py     | 63 +++++++++++++++++--
 2 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
index 2c58519fda..e8abde4087 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
@@ -51,6 +51,15 @@ class SoftplusBijectorTest(test.TestCase):
       self.assertAllClose(y, bijector.forward(x).eval())
       self.assertAllClose(x, bijector.inverse(y).eval())
 
+  def testBijectorForwardInverseWithHingeSoftnessEventDimsZero(self):
+    with self.test_session():
+      bijector = Softplus(event_ndims=0, hinge_softness=1.5)
+      x = 2 * rng.randn(2, 10)
+      y = 1.5 * self._softplus(x / 1.5)
+
+      self.assertAllClose(y, bijector.forward(x).eval())
+      self.assertAllClose(x, bijector.inverse(y).eval())
+
   def testBijectorLogDetJacobianEventDimsZero(self):
     with self.test_session():
       bijector = Softplus(event_ndims=0)
@@ -85,6 +94,18 @@ class SoftplusBijectorTest(test.TestCase):
       assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
+  def testScalarCongruencyWithPositiveHingeSoftness(self):
+    with self.test_session():
+      bijector = Softplus(event_ndims=0, hinge_softness=1.3)
+      assert_scalar_congruency(
+          bijector, lower_x=-2., upper_x=2.)
+
+  def testScalarCongruencyWithNegativeHingeSoftness(self):
+    with self.test_session():
+      bijector = Softplus(event_ndims=0, hinge_softness=-1.3)
+      assert_scalar_congruency(
+          bijector, lower_x=-2., upper_x=2.)
+
   def testBijectiveAndFinite32bit(self):
     with self.test_session():
       bijector = Softplus(event_ndims=0)
@@ -93,6 +114,22 @@ class SoftplusBijectorTest(test.TestCase):
       assert_bijective_and_finite(
           bijector, x, y, rtol=1e-2, atol=1e-2)
 
+  def testBijectiveAndFiniteWithPositiveHingeSoftness32Bit(self):
+    with self.test_session():
+      bijector = Softplus(event_ndims=0, hinge_softness=1.23)
+      x = np.linspace(-20., 20., 100).astype(np.float32)
+      y = np.logspace(-10, 10, 100).astype(np.float32)
+      assert_bijective_and_finite(
+          bijector, x, y, rtol=1e-2, atol=1e-2)
+
+  def testBijectiveAndFiniteWithNegativeHingeSoftness32Bit(self):
+    with self.test_session():
+      bijector = Softplus(event_ndims=0, hinge_softness=-0.7)
+      x = np.linspace(-20., 20., 100).astype(np.float32)
+      y = -np.logspace(-10, 10, 100).astype(np.float32)
+      assert_bijective_and_finite(
+          bijector, x, y, rtol=1e-2, atol=1e-2)
+
   def testBijectiveAndFinite16bit(self):
     with self.test_session():
       bijector = Softplus(event_ndims=0)
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
index 5be56e7c8c..364be07920 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
@@ -18,6 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops.distributions import bijector
@@ -38,6 +41,22 @@ class Softplus(bijector.Bijector):
   * `softplus(x) approx x`, for large `x`, so it does not overflow as easily as
     the `Exp` `Bijector`.
 
+  The optional nonzero `hinge_softness` parameter changes the transition at
+  zero.  With `hinge_softness = c`, the bijector is:
+
+    ```f_c(x) := c * g(x / c) = c * Log[1 + exp(x / c)].```
+
+  For large `x >> 1`, `c * Log[1 + exp(x / c)] approx c * Log[exp(x / c)] = x`,
+  so the behavior for large `x` is the same as the standard softplus.
+
+  As `c > 0` approaches 0 from the right, `f_c(x)` becomes less and less soft,
+  approaching `max(0, x)`.
+
+  * `c = 1` is the default.
+  * `c > 0` but small means `f(x) approx ReLu(x) = max(0, x)`.
+  * `c < 0` flips sign and reflects around the `y-axis`: `f_{-c}(x) = -f_c(-x)`.
+  * `c = 0` results in a non-bijective transformation and triggers an exception.
+
     Example Use:
 
     ```python
@@ -45,9 +64,9 @@ class Softplus(bijector.Bijector):
     # batch ndim and 2 event ndims (i.e., vector of matrices).
     softplus = Softplus(event_ndims=2)
     x = [[[1., 2],
-           [3, 4]],
-          [[5, 6],
-           [7, 8]]]
+          [3, 4]],
+         [[5, 6],
+          [7, 8]]]
     log(1 + exp(x)) == softplus.forward(x)
     log(exp(x) - 1) == softplus.inverse(x)
     ```
@@ -56,20 +75,46 @@ class Softplus(bijector.Bijector):
     reduction over the event space.
   """
 
+  @distribution_util.AppendDocstring(
+      kwargs_dict={
+          "hinge_softness": (
+              "Nonzero floating point `Tensor`.  Controls the softness of what "
+              "would otherwise be a kink at the origin.  Default is 1.0")})
   def __init__(self,
                event_ndims=0,
+               hinge_softness=None,
                validate_args=False,
                name="softplus"):
+    with ops.name_scope(name, values=[hinge_softness]):
+      if hinge_softness is not None:
+        self._hinge_softness = ops.convert_to_tensor(
+            hinge_softness, name="hinge_softness")
+      else:
+        self._hinge_softness = None
+      if validate_args:
+        nonzero_check = check_ops.assert_none_equal(
+            ops.convert_to_tensor(
+                0, dtype=self.hinge_softness.dtype), self.hinge_softness)
+        self._hinge_softness = control_flow_ops.with_dependencies(
+            [nonzero_check, self.hinge_softness])
+
     super(Softplus, self).__init__(
         event_ndims=event_ndims,
         validate_args=validate_args,
         name=name)
 
   def _forward(self, x):
-    return nn_ops.softplus(x)
+    if self.hinge_softness is None:
+      return nn_ops.softplus(x)
+    hinge_softness = math_ops.cast(self.hinge_softness, x.dtype)
+    return hinge_softness * nn_ops.softplus(x / hinge_softness)
 
   def _inverse(self, y):
-    return distribution_util.softplus_inverse(y)
+    if self.hinge_softness is None:
+      return distribution_util.softplus_inverse(y)
+    hinge_softness = math_ops.cast(self.hinge_softness, y.dtype)
+    return hinge_softness * distribution_util.softplus_inverse(
+        y / hinge_softness)
 
   def _inverse_log_det_jacobian(self, y):
     # Could also do:
@@ -81,9 +126,17 @@ class Softplus(bijector.Bijector):
     #           = 1 / (1 - exp{-Y}),
     # which is the most stable for large Y > 0. For small Y, we use
     # 1 - exp{-Y} approx Y.
+    if self.hinge_softness is not None:
+      y /= math_ops.cast(self.hinge_softness, y.dtype)
     return -math_ops.reduce_sum(math_ops.log(-math_ops.expm1(-y)),
                                 axis=self._event_dims_tensor(y))
 
   def _forward_log_det_jacobian(self, x):
+    if self.hinge_softness is not None:
+      x /= math_ops.cast(self.hinge_softness, x.dtype)
     return -math_ops.reduce_sum(nn_ops.softplus(-x),
                                 axis=self._event_dims_tensor(x))
+
+  @property
+  def hinge_softness(self):
+    return self._hinge_softness
-- 
GitLab


From 2f9421cfc449d2cad8bdbbce786bcd07d462de66 Mon Sep 17 00:00:00 2001
From: Tim Harley <tharley@google.com>
Date: Thu, 27 Apr 2017 09:49:37 -0800
Subject: [PATCH 0755/1563] Make switches outside of a cond context
 differentiable. Change: 154441734

---
 tensorflow/python/ops/control_flow_ops.py      | 14 +++++++++-----
 tensorflow/python/ops/control_flow_ops_test.py | 10 ++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index 93416140ff..75a537643e 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -1301,11 +1301,15 @@ def ZerosLikeOutsideLoop(op, index):
     return array_ops.zeros_like(val, optimize=False)
   else:
     op_ctxt = op._get_control_flow_context()
-    pred = op_ctxt.pred
-    branch = op_ctxt.branch
-    switch_val = switch(op.inputs[0], pred)[1 - branch]
-    zeros_shape = array_ops.shape_internal(switch_val, optimize=False)
-    return array_ops.zeros(zeros_shape, dtype=val.dtype)
+    if op_ctxt:
+      # We are in a cond context. Use a switch to create zeros only when needed.
+      pred = op_ctxt.pred
+      branch = op_ctxt.branch
+      switch_val = switch(op.inputs[0], pred)[1 - branch]
+      zeros_shape = array_ops.shape_internal(switch_val, optimize=False)
+      return array_ops.zeros(zeros_shape, dtype=val.dtype)
+    else:
+      return array_ops.zeros_like(val, optimize=False)
 
 
 class ControlFlowContext(object):
diff --git a/tensorflow/python/ops/control_flow_ops_test.py b/tensorflow/python/ops/control_flow_ops_test.py
index 21a5afabe0..7704254b01 100644
--- a/tensorflow/python/ops/control_flow_ops_test.py
+++ b/tensorflow/python/ops/control_flow_ops_test.py
@@ -313,6 +313,16 @@ class SwitchTestCase(TensorFlowTestCase):
         self.assertEquals(o, 6)
         self.assertAllEqual(grad, [1] * 3)
 
+  def testGradientThroughSingleBranchOutsideOfContext(self):
+    with self.test_session():
+      x = constant_op.constant(2.)
+      s = constant_op.constant(True)
+      x_false, x_true = control_flow_ops.switch(x, s)
+      grad_x_true = gradients_impl.gradients(x_true, x)[0]
+      grad_x_false = gradients_impl.gradients(x_false, x)[0]
+      self.assertEquals(grad_x_true.eval(), 1.)
+      self.assertEquals(grad_x_false.eval(), 0.)
+
 
 class ContextTest(TensorFlowTestCase):
 
-- 
GitLab


From f7f16be45740f464d31292288fbc4208aae76094 Mon Sep 17 00:00:00 2001
From: Christopher Olston <olston@google.com>
Date: Thu, 27 Apr 2017 10:21:51 -0800
Subject: [PATCH 0756/1563] Introduce ops for batching/unbatching tensors
 across Session::Run() calls. Change: 154446504

---
 tensorflow/BUILD                              |   1 +
 tensorflow/contrib/BUILD                      |   3 +
 tensorflow/contrib/batching/BUILD             | 122 ++-
 tensorflow/contrib/batching/__init__.py       |  26 +
 tensorflow/contrib/batching/kernels/BUILD     |  34 +
 .../contrib/batching/kernels/batch_kernels.cc | 998 ++++++++++++++++++
 tensorflow/contrib/batching/ops/batch_ops.cc  | 164 +++
 .../contrib/batching/python/ops/batch_ops.py  | 138 +++
 .../batching/python/ops/batch_ops_test.py     | 276 +++++
 tensorflow/contrib/batching/util/BUILD        |  12 +-
 tensorflow/core/kernels/BUILD                 |  12 +
 11 files changed, 1773 insertions(+), 13 deletions(-)
 create mode 100644 tensorflow/contrib/batching/__init__.py
 create mode 100644 tensorflow/contrib/batching/kernels/BUILD
 create mode 100644 tensorflow/contrib/batching/kernels/batch_kernels.cc
 create mode 100644 tensorflow/contrib/batching/ops/batch_ops.cc
 create mode 100644 tensorflow/contrib/batching/python/ops/batch_ops.py
 create mode 100644 tensorflow/contrib/batching/python/ops/batch_ops_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 7a706b3b02..d059d227e6 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -205,6 +205,7 @@ filegroup(
         "//tensorflow/contrib:all_files",
         "//tensorflow/contrib/android:all_files",
         "//tensorflow/contrib/batching:all_files",
+        "//tensorflow/contrib/batching/kernels:all_files",
         "//tensorflow/contrib/batching/test_util:all_files",
         "//tensorflow/contrib/batching/util:all_files",
         "//tensorflow/contrib/bayesflow:all_files",
diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index 7949f62d19..edd099a1da 100755
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -13,6 +13,7 @@ py_library(
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
+        "//tensorflow/contrib/batching:batch_py",
         "//tensorflow/contrib/bayesflow:bayesflow_py",
         "//tensorflow/contrib/cloud:cloud_py",
         "//tensorflow/contrib/compiler:compiler_py",
@@ -74,6 +75,7 @@ cc_library(
     name = "contrib_kernels",
     visibility = ["//visibility:public"],
     deps = [
+        "//tensorflow/contrib/batching:batch_ops_kernels",
         "//tensorflow/contrib/factorization/kernels:all_kernels",
         "//tensorflow/contrib/input_pipeline:input_pipeline_ops_kernels",
         "//tensorflow/contrib/layers:bucketization_op_kernel",
@@ -86,6 +88,7 @@ cc_library(
     name = "contrib_ops_op_lib",
     visibility = ["//visibility:public"],
     deps = [
+        "//tensorflow/contrib/batching:batch_ops_op_lib",
         "//tensorflow/contrib/factorization:all_ops",
         "//tensorflow/contrib/framework:all_ops",
         "//tensorflow/contrib/input_pipeline:input_pipeline_ops_op_lib",
diff --git a/tensorflow/contrib/batching/BUILD b/tensorflow/contrib/batching/BUILD
index ff6854426c..93c00b1f0b 100644
--- a/tensorflow/contrib/batching/BUILD
+++ b/tensorflow/contrib/batching/BUILD
@@ -9,23 +9,19 @@ licenses(["notice"])  # Apache 2.0
 
 exports_files(["LICENSE"])
 
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
+cc_library(
+    name = "batch_scheduler_hdrs",
+    hdrs = ["batch_scheduler.h"],
+    deps = [
+        "//tensorflow/core:framework_headers_lib",
+    ],
 )
 
 cc_library(
     name = "batch_scheduler",
-    hdrs = ["batch_scheduler.h"],
     deps = [
+        ":batch_scheduler_hdrs",
         "//tensorflow/core:lib",
-        "//tensorflow/core:tensorflow",
     ],
 )
 
@@ -42,13 +38,24 @@ cc_test(
 )
 
 cc_library(
-    name = "shared_batch_scheduler",
+    name = "shared_batch_scheduler_hdrs",
     hdrs = ["shared_batch_scheduler.h"],
+    deps = [
+        ":batch_scheduler_hdrs",
+        "//tensorflow/contrib/batching/util:periodic_function_dynamic",
+        "//tensorflow/core:framework_headers_lib",
+    ],
+)
+
+cc_library(
+    name = "shared_batch_scheduler",
     deps = [
         ":batch_scheduler",
+        ":shared_batch_scheduler_hdrs",
         "//tensorflow/contrib/batching/util:periodic_function",
         "//tensorflow/core:lib",
     ],
+    alwayslink = 1,
 )
 
 cc_test(
@@ -102,3 +109,94 @@ cc_test(
         "//tensorflow/core:test",
     ],
 )
+
+load(
+    "//tensorflow:tensorflow.bzl",
+    "py_test",
+    "tf_custom_op_library",
+    "tf_gen_op_libs",
+    "tf_gen_op_wrapper_py",
+    "tf_kernel_library",
+)
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
+
+tf_custom_op_library(
+    name = "python/ops/_batch_ops.so",
+    srcs = [
+        "ops/batch_ops.cc",
+    ],
+    deps = [
+        "//tensorflow/contrib/batching/kernels:batch_kernels",
+    ],
+)
+
+tf_gen_op_libs(
+    op_lib_names = ["batch_ops"],
+)
+
+tf_gen_op_wrapper_py(
+    name = "batch_ops",
+    deps = [":batch_ops_op_lib"],
+)
+
+tf_kernel_library(
+    name = "batch_ops_kernels",
+    deps = [
+        "//tensorflow/contrib/batching/kernels:batch_kernels",
+        "//tensorflow/contrib/batching/util:periodic_function",
+        "//tensorflow/core/kernels:concat_lib",
+        "//tensorflow/core/kernels:ops_util",
+        "//tensorflow/core/kernels:split_lib",
+    ],
+    alwayslink = 1,
+)
+
+tf_custom_op_py_library(
+    name = "batch_py",
+    srcs = glob(["python/ops/*.py"]) + ["__init__.py"],
+    dso = [":python/ops/_batch_ops.so"],
+    kernels = [
+        ":batch_ops_kernels",
+        ":batch_ops_op_lib",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":batch_ops",
+        "//tensorflow/contrib/util:util_py",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:state_ops",
+        "//tensorflow/python:variable_scope",
+        "//tensorflow/python:variables",
+    ],
+)
+
+py_test(
+    name = "batch_ops_test",
+    size = "small",
+    srcs = ["python/ops/batch_ops_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":batch_py",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:gradients",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:script_ops",
+        "//tensorflow/python:state_ops",
+        "//tensorflow/python:variables",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+)
diff --git a/tensorflow/contrib/batching/__init__.py b/tensorflow/contrib/batching/__init__.py
new file mode 100644
index 0000000000..44fa5f42a7
--- /dev/null
+++ b/tensorflow/contrib/batching/__init__.py
@@ -0,0 +1,26 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Ops and modules related to batch.
+
+@@batch_function
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.batching.python.ops.batch_ops import batch_function
+
+from tensorflow.python.util.all_util import remove_undocumented
+remove_undocumented(__name__)
diff --git a/tensorflow/contrib/batching/kernels/BUILD b/tensorflow/contrib/batching/kernels/BUILD
new file mode 100644
index 0000000000..6e53dd9a5f
--- /dev/null
+++ b/tensorflow/contrib/batching/kernels/BUILD
@@ -0,0 +1,34 @@
+# Description:
+#   Contains kernels for the batching ops.
+
+package(default_visibility = ["//tensorflow:__subpackages__"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+cc_library(
+    name = "batch_kernels",
+    srcs = ["batch_kernels.cc"],
+    deps = [
+        "//tensorflow/contrib/batching:shared_batch_scheduler_hdrs",
+        "//tensorflow/contrib/batching/util:periodic_function_dynamic",
+        "//tensorflow/core:framework_headers_lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/kernels:concat_lib_hdrs",
+        "//tensorflow/core/kernels:ops_util_hdrs",
+        "//tensorflow/core/kernels:split_lib_hdrs",
+    ],
+    alwayslink = 1,
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+)
diff --git a/tensorflow/contrib/batching/kernels/batch_kernels.cc b/tensorflow/contrib/batching/kernels/batch_kernels.cc
new file mode 100644
index 0000000000..5598d11f75
--- /dev/null
+++ b/tensorflow/contrib/batching/kernels/batch_kernels.cc
@@ -0,0 +1,998 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/contrib/batching/shared_batch_scheduler.h"
+#include "tensorflow/contrib/batching/util/periodic_function.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/resource_mgr.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_util.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/concat_lib.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/kernels/split_lib.h"
+#include "tensorflow/core/lib/random/random.h"
+#include "tensorflow/core/platform/macros.h"
+
+namespace tensorflow {
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+typedef Eigen::GpuDevice GPUDevice;
+#ifdef TENSORFLOW_USE_SYCL
+typedef Eigen::SyclDevice SYCLDevice;
+#endif  // TENSORFLOW_USE_SYCL
+
+// Concatenates 'inputs' into a single tensor along the zeroth dimension.
+// Requires that all elements of 'inputs' have element type T. Writes to the
+// op's output at position 'output_index', using 'context' for the allocation to
+// ensure proper device placement.
+template <typename T>
+Status Concat(OpKernelContext* context, const gtl::ArraySlice<Tensor>& inputs,
+              int output_index) {
+  const int input_dims = inputs[0].dims();
+  const TensorShape& input_shape = inputs[0].shape();
+
+  // Note that we reduce the concat of k-dimensional tensors into a two
+  // dimensional concat. Assuming the dimensions of any input tensor are
+  // {y0, y1,...,ym-1}, we flatten it to {1, y}, where y = Prod_i(yi).
+  std::vector<std::unique_ptr<typename TTypes<T, 2>::ConstMatrix>> inputs_flat;
+  inputs_flat.reserve(inputs.size());
+  int64 output_dim0 = 0;
+  for (int i = 0; i < inputs.size(); ++i) {
+    const Tensor& input = inputs[i];
+    if (input.dims() != input_dims) {
+      return errors::InvalidArgument(
+          "Ranks of all input tensors should match: shape[0] = ",
+          input_shape.DebugString(), " vs. shape[", i,
+          "] = ", input.shape().DebugString());
+    }
+    for (int j = 1; j < input_dims; ++j) {
+      if (input.dim_size(j) != input_shape.dim_size(j)) {
+        return errors::InvalidArgument(
+            "Dimensions of inputs should match: shape[0] = ",
+            input_shape.DebugString(), " vs. shape[", i,
+            "] = ", input.shape().DebugString());
+      }
+    }
+    if (input.NumElements() > 0) {
+      inputs_flat.emplace_back(new typename TTypes<T, 2>::ConstMatrix(
+          input.shaped<T, 2>({1, input.NumElements()})));
+    }
+    output_dim0 += input.dim_size(0);
+  }
+
+  TensorShape output_shape(input_shape);
+  output_shape.set_dim(0, output_dim0);
+  Tensor* output = nullptr;
+  TF_RETURN_IF_ERROR(
+      context->allocate_output(output_index, output_shape, &output));
+  if (output->NumElements() > 0) {
+    auto output_flat = output->shaped<T, 2>({1, output->NumElements()});
+#if GOOGLE_CUDA
+    if (std::is_same<Device, GPUDevice>::value) {
+      ConcatGPU<T>(context, inputs_flat, output, &output_flat);
+      return Status::OK();
+    }
+#endif  // GOOGLE_CUDA
+    ConcatCPU<T>(context->device(), inputs_flat, &output_flat);
+  }
+
+  return Status::OK();
+}
+
+// The Split*() functions split 'input' with element type T into 'sizes.size()'
+// tensors along the zeroth dimension, with the ith split having zeroth-
+// dimension size 'sizes[i]'. They allocate the output tensors using 'context',
+// for proper device placement.
+
+// Handles special cases that are cheap. Sets 'done==true' iff it found an
+// applicable special case and wrote to the outputs. Otherwise acts as a no-op.
+template <typename T>
+Status SplitEasyCases(OpKernelContext* context, const Tensor& input,
+                      const gtl::ArraySlice<int64>& sizes,
+                      std::vector<Tensor>* outputs, bool* done) {
+  *done = false;
+
+  int64 total_size = 0;
+  for (const int64 size : sizes) {
+    total_size += size;
+  }
+  if (total_size > input.shape().dim_size(0)) {
+    return errors::InvalidArgument(
+        "Sum of split sizes must not exceed dim0-size of input tensor");
+  }
+
+  // Special case 0: trivial 1-way split.
+  if (sizes.size() == 1 && sizes.at(0) == input.shape().dim_size(0)) {
+    outputs->push_back(input);
+    *done = true;
+    return Status::OK();
+  }
+
+  // Special case 1: input is aligned.
+  if (IsInnerDimsSizeAligned<T>(input.shape())) {
+    int64 position = 0;
+    for (const int64 size : sizes) {
+      outputs->emplace_back(input.Slice(position, position + size));
+      position += size;
+    }
+    *done = true;
+    return Status::OK();
+  }
+
+  return Status::OK();
+}
+
+// Handles the general case, on CPU.
+template <typename T>
+Status SplitCPU(OpKernelContext* context, const Tensor& input,
+                const gtl::ArraySlice<int64>& sizes,
+                std::vector<Tensor>* outputs) {
+  int64 suffix_dim_size = 1;
+  for (int i = 1; i < input.shape().dims(); ++i) {
+    suffix_dim_size *= input.shape().dim_size(i);
+  }
+  auto input_reshaped =
+      input.shaped<T, 3>({1, input.shape().dim_size(0), suffix_dim_size});
+
+  int64 position = 0;
+  for (const int64 size : sizes) {
+    TensorShape output_shape = input.shape();
+    output_shape.set_dim(0, size);
+    Tensor output;
+    TF_RETURN_IF_ERROR(
+        context->allocate_temp(input.dtype(), output_shape, &output));
+    auto output_shaped = output.shaped<T, 3>({1, size, suffix_dim_size});
+
+    Eigen::DSizes<Eigen::DenseIndex, 3> slice_indices{0, position, 0};
+    Eigen::DSizes<Eigen::DenseIndex, 3> slice_sizes{1, size, suffix_dim_size};
+    functor::Split<CPUDevice, T>()(context->eigen_device<CPUDevice>(),
+                                   output_shaped, input_reshaped, slice_indices,
+                                   slice_sizes);
+
+    outputs->emplace_back(output);
+
+    position += size;
+  }
+
+  return Status::OK();
+}
+
+#if GOOGLE_CUDA
+
+// Handles the general case, on GPU.
+template <typename T>
+Status SplitGPU(OpKernelContext* context, const Tensor& input,
+                const gtl::ArraySlice<int64>& sizes,
+                std::vector<Tensor>* outputs) {
+  // TODO(olston, apassos): Implement this.
+  LOG(FATAL) << "Not yet implemented";  // Crash ok
+}
+
+#endif  // GOOGLE_CUDA
+
+// The outer function that dispatches to the various Split*() functions above.
+template <typename T>
+Status Split(OpKernelContext* context, const Tensor& input,
+             const gtl::ArraySlice<int64>& sizes,
+             std::vector<Tensor>* outputs) {
+  bool easy_cases_done;
+  TF_RETURN_IF_ERROR(
+      SplitEasyCases<T>(context, input, sizes, outputs, &easy_cases_done));
+  if (easy_cases_done) {
+    return Status::OK();
+  }
+
+#if GOOGLE_CUDA
+// TODO(olston, apassos): Handle non-CPU cases.
+// return SplitGPU<T>(context, input, sizes, outputs);
+#endif  // GOOGLE_CUDA
+  return SplitCPU<T>(context, input, sizes, outputs);
+}
+
+// A class encapsulating the state and logic for batching tensors.
+class BatchResource : public ResourceBase {
+ public:
+  static Status Create(int32 num_batch_threads, int32 max_batch_size,
+                       int32 batch_timeout_micros,
+                       const std::vector<int32>& allowed_batch_sizes,
+                       std::unique_ptr<BatchResource>* resource) {
+    std::unique_ptr<BatchResource> new_resource(new BatchResource);
+
+    Batcher::Options batcher_options;
+    batcher_options.num_batch_threads = num_batch_threads;
+    TF_RETURN_IF_ERROR(
+        Batcher::Create(batcher_options, &new_resource->batcher_));
+
+    new_resource->batcher_queue_options_.max_batch_size = max_batch_size;
+    new_resource->batcher_queue_options_.batch_timeout_micros =
+        batch_timeout_micros;
+
+    new_resource->allowed_batch_sizes_ = allowed_batch_sizes;
+
+    *resource = std::move(new_resource);
+    return Status::OK();
+  }
+
+  string DebugString() final { return "BatchResource"; }
+
+  // Ingests data from one invocation of the batch op. The data is enqueued to
+  // be combined with others into a batch, asynchronously.
+  Status RegisterInput(int64 guid, OpKernelContext* context,
+                       const string& batcher_queue_name,
+                       AsyncOpKernel::DoneCallback done_callback) {
+    std::unique_ptr<BatchTask> batch_components(new BatchTask);
+    batch_components->guid = guid;
+    OpInputList tensors;
+    TF_RETURN_IF_ERROR(context->input_list("in_tensors", &tensors));
+    for (int i = 0; i < tensors.size(); ++i) {
+      batch_components->inputs.push_back(tensors[i]);
+    }
+    batch_components->context = context;
+    batch_components->done_callback = std::move(done_callback);
+
+    BatcherQueue* batcher_queue;
+    TF_RETURN_IF_ERROR(
+        LookupOrCreateBatcherQueue(batcher_queue_name, &batcher_queue));
+    return batcher_queue->Schedule(&batch_components);
+  }
+
+ private:
+  BatchResource() = default;
+
+  // One input to be batched. Corresponds to one invocation of the batch op.
+  struct BatchTask : public serving::BatchTask {
+    // A unique ID to identify this invocation of Batch.
+    int64 guid;
+
+    std::vector<Tensor> inputs;
+    OpKernelContext* context;
+    AsyncOpKernel::DoneCallback done_callback;
+
+    size_t size() const override { return inputs[0].shape().dim_size(0); }
+  };
+
+  using Batcher = serving::SharedBatchScheduler<BatchTask>;
+  using BatcherQueue = serving::BatchScheduler<BatchTask>;
+  using Batch = serving::Batch<BatchTask>;
+
+  // Validates that it's legal to combine the tasks in 'batch' into a batch.
+  // Assumes the batch is non-empty.
+  static Status ValidateBatch(const Batch& batch) {
+    for (int task_idx = 0; task_idx < batch.num_tasks(); ++task_idx) {
+      const BatchTask& task = batch.task(task_idx);
+
+      if (task.inputs.size() != batch.task(0).inputs.size()) {
+        return errors::InvalidArgument(
+            "Batching inputs must have equal number of edges");
+      }
+
+      for (int edge = 0; edge < task.inputs.size(); ++edge) {
+        const Tensor& tensor = task.inputs[edge];
+
+        if (tensor.shape().dims() == 0) {
+          return errors::InvalidArgument(
+              "Batching input tensors must have at least one dimension");
+        }
+
+        if (tensor.shape().dim_size(0) != task.inputs[0].shape().dim_size(0)) {
+          return errors::InvalidArgument(
+              "Batching input tensors supplied in a given op invocation must "
+              "have equal 0th-dimension size");
+        }
+      }
+    }
+
+    return Status::OK();
+  }
+
+  // Returns the smallest entry in 'allowed_batch_sizes_' that is greater than
+  // or equal to 'batch_size'. If 'allowed_batch_sizes_' is empty, simply
+  // returns 'batch_size'.
+  int RoundToLowestAllowedBatchSize(int batch_size) const {
+    if (allowed_batch_sizes_.empty()) {
+      return batch_size;
+    }
+    for (int allowed_size : allowed_batch_sizes_) {
+      if (allowed_size >= batch_size) {
+        return allowed_size;
+      }
+    }
+    LOG(ERROR) << "Maximum batch size greater than largest allowed size; "
+                  "ignoring allowed sizes constraint";
+    return batch_size;
+  }
+
+  // Processes a batch of one or more BatchTask entries.
+  void ProcessBatch(std::unique_ptr<Batch> batch) const {
+    if (batch->empty()) {
+      return;
+    }
+    const int padded_batch_size = RoundToLowestAllowedBatchSize(batch->size());
+    const int padding_amount = padded_batch_size - batch->size();
+
+    OpKernelContext* last_task_context =
+        batch->task(batch->num_tasks() - 1).context;
+    AsyncOpKernel::DoneCallback last_task_callback =
+        batch->task(batch->num_tasks() - 1).done_callback;
+
+    OP_REQUIRES_OK_ASYNC(last_task_context, ValidateBatch(*batch),
+                         last_task_callback);
+
+    // All tasks should have the same number of input edges.
+    const int num_input_edges = batch->task(0).inputs.size();
+
+    // Process each input edge one at a time (the typical case has just one).
+    for (int i = 0; i < num_input_edges; ++i) {
+      // Emit batch->num_tasks() - 1 empty output tensors.
+      for (int task_idx = 0; task_idx < batch->num_tasks() - 1; ++task_idx) {
+        const BatchTask& task = batch->task(task_idx);
+        TensorShape output_shape(task.inputs.at(i).shape());
+        output_shape.set_dim(0, 0);
+        Tensor* output = nullptr;
+        OP_REQUIRES_OK_ASYNC(
+            task.context,
+            task.context->allocate_output(i, output_shape, &output),
+            task.done_callback);
+      }
+
+      // Concatenate the tasks ith input tensors into a big output tensor.
+      std::vector<Tensor> to_concatenate;
+      for (int task_idx = 0; task_idx < batch->num_tasks(); ++task_idx) {
+        to_concatenate.push_back(batch->task(task_idx).inputs.at(i));
+      }
+
+      // Add padding as needed. Use the first row of the first task's tensor as
+      // the data for padding.
+      if (padding_amount > 0) {
+        const Tensor& padding_source = batch->task(0).inputs.at(i);
+        Tensor padding;
+        if (padding_source.shape().dim_size(0) == 1) {
+          padding = padding_source;
+        } else {
+          const std::vector<int64> slice_sizes = {1};
+          const DataType type = padding_source.dtype();
+          Status slice_status;
+          std::vector<Tensor> slices;
+          switch (type) {
+#define CASE(type)                                                   \
+  case DataTypeToEnum<type>::value:                                  \
+    slice_status = SplitCPU<type>(last_task_context, padding_source, \
+                                  slice_sizes, &slices);             \
+    break;
+            TF_CALL_ALL_TYPES(CASE);
+#undef CASE
+            default:
+              slice_status =
+                  errors::InvalidArgument("Unsupported data type: ", type);
+              break;
+          }
+          OP_REQUIRES_OK_ASYNC(last_task_context, slice_status,
+                               last_task_callback);
+          padding = slices.at(0);
+        }
+        for (int i = 0; i < padding_amount; ++i) {
+          to_concatenate.push_back(padding);
+        }
+      }
+
+      const DataType type = to_concatenate[0].dtype();
+      Status concat_status;
+      switch (type) {
+#define CASE(type)                                                      \
+  case DataTypeToEnum<type>::value:                                     \
+    concat_status = Concat<type>(last_task_context, to_concatenate, i); \
+    break;
+        TF_CALL_ALL_TYPES(CASE);
+#undef CASE
+        default:
+          concat_status =
+              errors::InvalidArgument("Unsupported data type: ", type);
+          break;
+      }
+      OP_REQUIRES_OK_ASYNC(last_task_context, concat_status,
+                           last_task_callback);
+    }
+
+    // Emit batch->num_tasks() - 1 empty index tensors.
+    for (int task_idx = 0; task_idx < batch->num_tasks() - 1; ++task_idx) {
+      const BatchTask& task = batch->task(task_idx);
+      TensorShape index_shape({0, 3});
+      Tensor* output = nullptr;
+      OP_REQUIRES_OK_ASYNC(
+          task.context,
+          task.context->allocate_output(num_input_edges, index_shape, &output),
+          task.done_callback);
+    }
+    // Emit all ID tensors.
+    for (int task_idx = 0; task_idx < batch->num_tasks(); ++task_idx) {
+      const BatchTask& task = batch->task(task_idx);
+      Tensor* id;
+      OP_REQUIRES_OK_ASYNC(task.context,
+                           task.context->allocate_output(num_input_edges + 1,
+                                                         TensorShape({}), &id),
+                           task.done_callback);
+      id->scalar<int64>()() = task.guid;
+    }
+    OP_REQUIRES_OK_ASYNC(
+        last_task_context,
+        EmitIndexTensor(last_task_context, *batch, num_input_edges),
+        last_task_callback);
+
+    // Signal done for each element of the batch. (At this point, the contexts
+    // are no longer guaranteed to remain live.)
+    for (int task_idx = 0; task_idx < batch->num_tasks(); ++task_idx) {
+      batch->mutable_task(task_idx)->done_callback();
+    }
+  }
+
+  // Emits an index tensor, which the Unbatch op will use to un-concatenate
+  // the tensor and attribute the pieces to the right batch keys. The index
+  // tensor contains, for each input: [batch_key, start_offset, end_offset]
+  // where start_offset and end_offset represent the range of entries in the
+  // concatenated tensors that belong to that input.
+  //
+  // Emits the result to the output at 'output_index' using 'context'.
+  static Status EmitIndexTensor(OpKernelContext* context, const Batch& batch,
+                                int output_index) {
+    const TensorShape index_shape({batch.num_tasks(), 3});
+    Tensor* index = nullptr;
+    TF_RETURN_IF_ERROR(
+        context->allocate_output(output_index, index_shape, &index));
+    auto index_flat = index->shaped<int64, 2>({batch.num_tasks(), 3});
+    size_t offset = 0;
+    for (int task_idx = 0; task_idx < batch.num_tasks(); ++task_idx) {
+      const BatchTask& task = batch.task(task_idx);
+      index_flat(task_idx, 0) = task.guid;
+      index_flat(task_idx, 1) = offset;
+      index_flat(task_idx, 2) = offset + task.size();
+      offset += task.size();
+    }
+    return Status::OK();
+  }
+
+  // Looks up the batcher queue for 'queue_name'. If it did't previously exist,
+  // creates it.
+  Status LookupOrCreateBatcherQueue(const string& queue_name,
+                                    BatcherQueue** queue) {
+    mutex_lock l(batcher_queues_mu_);
+
+    auto it = batcher_queues_.find(queue_name);
+    if (it != batcher_queues_.end()) {
+      *queue = it->second.get();
+      return Status::OK();
+    }
+
+    std::unique_ptr<BatcherQueue> new_queue;
+    auto process_batch_callback = [this](std::unique_ptr<Batch> batch) {
+      ProcessBatch(std::move(batch));
+    };
+    TF_RETURN_IF_ERROR(batcher_->AddQueue(batcher_queue_options_,
+                                          process_batch_callback, &new_queue));
+    *queue = new_queue.get();
+    batcher_queues_[queue_name] = std::move(new_queue);
+    return Status::OK();
+  }
+
+  // A batch scheduler, and options for creating queues.
+  std::shared_ptr<Batcher> batcher_;
+  Batcher::QueueOptions batcher_queue_options_;
+
+  // A collection of batcher queues, keyed on queue name.
+  // TODO(olston): Garbage-collect unused queues (perhaps simply remove empty
+  // ones (with a time delay?); it's okay if they get recreated later).
+  mutable mutex batcher_queues_mu_;
+  std::map<string, std::unique_ptr<BatcherQueue>> batcher_queues_
+      GUARDED_BY(batcher_queues_mu_);
+
+  std::vector<int32> allowed_batch_sizes_;
+};
+
+class BatchKernel : public AsyncOpKernel {
+ public:
+  explicit BatchKernel(OpKernelConstruction* c) : AsyncOpKernel(c) {
+    OP_REQUIRES_OK(c, c->GetAttr("container", &container_));
+    OP_REQUIRES_OK(c, c->GetAttr("shared_name", &shared_name_));
+    // If shared_name is not supplied, use name instead (prevent collisions by
+    // default).
+    if (shared_name_.empty()) {
+      shared_name_ = name();
+    }
+    OP_REQUIRES_OK(c, c->GetAttr("batching_queue", &batcher_queue_));
+    OP_REQUIRES_OK(c, c->GetAttr("num_batch_threads", &num_batch_threads_));
+    OP_REQUIRES_OK(c, c->GetAttr("max_batch_size", &max_batch_size_));
+    OP_REQUIRES_OK(c,
+                   c->GetAttr("batch_timeout_micros", &batch_timeout_micros_));
+    OP_REQUIRES_OK(c, c->GetAttr("allowed_batch_sizes", &allowed_batch_sizes_));
+    OP_REQUIRES_OK(c, ValidateAllowedBatchSizes());
+  }
+
+  void ComputeAsync(OpKernelContext* c, DoneCallback done) final {
+    BatchResource* br;
+    std::function<Status(BatchResource * *r)> creator =
+        [this](BatchResource** r) {
+          std::unique_ptr<BatchResource> new_resource;
+          TF_RETURN_IF_ERROR(BatchResource::Create(
+              num_batch_threads_, max_batch_size_, batch_timeout_micros_,
+              allowed_batch_sizes_, &new_resource));
+          *r = new_resource.release();
+          return Status::OK();
+        };
+    OP_REQUIRES_OK_ASYNC(c,
+                         c->resource_manager()->LookupOrCreate(
+                             container_, shared_name_, &br, creator),
+                         done);
+    const Status status =
+        br->RegisterInput(random::New64(), c, batcher_queue_, done);
+    br->Unref();
+    if (!status.ok()) {
+      OP_REQUIRES_OK_ASYNC(c, status, done);
+    }
+    // Assume br calls done, so nothing to do here.
+  }
+
+  // Validates 'allowed_batch_sizes_'. The entries must increase monotonically,
+  // and the last one must equal 'max_batch_size_'.
+  Status ValidateAllowedBatchSizes() const {
+    if (allowed_batch_sizes_.empty()) {
+      return Status::OK();
+    }
+    int32 last_size = 0;
+    for (int i = 0; i < allowed_batch_sizes_.size(); ++i) {
+      const int32 size = allowed_batch_sizes_.at(i);
+      if (i > 0 && size <= last_size) {
+        return errors::InvalidArgument(
+            "allowed_batch_sizes entries must be monotonically increasing");
+      }
+      if (i == allowed_batch_sizes_.size() - 1 && size != max_batch_size_) {
+        return errors::InvalidArgument(
+            "final entry in allowed_batch_sizes must equal max_batch_size");
+      }
+      last_size = size;
+    }
+    return Status::OK();
+  }
+
+ private:
+  string container_;
+  string shared_name_;
+  string batcher_queue_;
+  int32 num_batch_threads_;
+  int32 max_batch_size_;
+  int32 batch_timeout_micros_;
+  std::vector<int32> allowed_batch_sizes_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("Batch").Device(DEVICE_CPU), BatchKernel);
+
+// A class encapsulating the state and logic for unbatching tensors.
+//
+// UnbatchResource keeps two data structures indexed by batch-key: one which has
+// the continuations for all concurrent kernels which are waiting for tensors
+// and another which has tensors which are waiting for their corresponding
+// kernels to run. Whenever a kernel runs, we either grab its tensor if it's
+// waiting already, or we insert it in the queue and then look at its tensor to
+// see if it can be used to dispatch any stored continuations.
+class UnbatchResource : public ResourceBase {
+ public:
+  explicit UnbatchResource(int32 timeout_micros)
+      : timeout_micros_(timeout_micros),
+        timeout_enforcer_(new serving::PeriodicFunction(
+            [this] { EnforceTimeout(); }, 1000 /* 1 ms */)) {}
+
+  ~UnbatchResource() override {
+    // Tear down 'timeout_enforcer_' first, since it accesses other state in
+    // this class.
+    timeout_enforcer_ = nullptr;
+  }
+
+  string DebugString() final { return "UnbatchResource"; }
+
+  Status Compute(OpKernelContext* context, AsyncOpKernel::DoneCallback done) {
+    const Tensor& data_t = context->input(0);
+    const Tensor& batch_index_t = context->input(1);
+
+    if (batch_index_t.shape().dim_size(0) > data_t.shape().dim_size(0)) {
+      return errors::InvalidArgument(
+          "Wrong shape for index tensor. Expected 0th dimension size to be no "
+          "greater than ",
+          data_t.shape().dim_size(0),
+          "; Got: ", batch_index_t.shape().dim_size(0), ".");
+    }
+    if (batch_index_t.shape().dim_size(1) != 3) {
+      return errors::InvalidArgument(
+          "Wrong shape for index tensor. Expected 1st dimension size to be 3 ; "
+          "Got: ",
+          batch_index_t.shape().dim_size(1), ".");
+    }
+
+    const int64 batch_key = context->input(2).scalar<int64>()();
+    const bool nonempty_input = batch_index_t.dim_size(0) > 0;
+
+    // If we have a non-empty tensor, slice it up.
+    // (It is important to do this outside of the critical section below.)
+    // The following variables are populated iff 'nonempty_input==true'.
+    std::vector<int64> sizes;
+    std::vector<int64> batch_keys;
+    std::vector<Tensor> split_inputs;
+    if (nonempty_input) {
+      auto batch_indices =
+          batch_index_t.shaped<int64, 2>({batch_index_t.dim_size(0), 3});
+      for (int i = 0; i < batch_index_t.dim_size(0); ++i) {
+        sizes.push_back(batch_indices(i, 2) - batch_indices(i, 1));
+        batch_keys.push_back(batch_indices(i, 0));
+      }
+
+      const DataType type = data_t.dtype();
+      switch (type) {
+#define CASE(type)                                                          \
+  case DataTypeToEnum<type>::value:                                         \
+    TF_RETURN_IF_ERROR(Split<type>(context, data_t, sizes, &split_inputs)); \
+    break;
+        TF_CALL_ALL_TYPES(CASE);
+#undef CASE
+        default:
+          return errors::InvalidArgument("Unsupported data type: ", type);
+      }
+    }
+
+    // Critical section.
+    std::vector<AsyncOpKernel::DoneCallback> done_callbacks_to_call;
+    Status status = [&]() -> Status {
+      mutex_lock ml(mu_);
+
+      // Check to see whether the tensor we want is already ready.
+      auto tensor_it = waiting_tensors_.find(batch_key);
+      if (tensor_it != waiting_tensors_.end()) {
+        context->set_output(0, tensor_it->second.tensor);
+        waiting_tensors_.erase(tensor_it);
+        done_callbacks_to_call.push_back(done);
+        return Status::OK();
+      }
+
+      const uint64 deadline_micros =
+          Env::Default()->NowMicros() + timeout_micros_;
+
+      // Add ourselves to the waitlist for tensors.
+      if (!waiting_callbacks_
+               .emplace(batch_key,
+                        WaitingCallback{deadline_micros, context, done})
+               .second) {
+        return errors::AlreadyExists(
+            "Multiple session runs with the same batch key.");
+      }
+
+      // If we have a non-empty tensor, finish the waitlisted runs,
+      // and store any remaining pieces.
+      if (nonempty_input) {
+        for (int i = 0; i < batch_keys.size(); ++i) {
+          auto runs_it = waiting_callbacks_.find(batch_keys[i]);
+          if (runs_it != waiting_callbacks_.end()) {
+            runs_it->second.context->set_output(0, split_inputs[i]);
+            done_callbacks_to_call.push_back(runs_it->second.done);
+            waiting_callbacks_.erase(runs_it);
+          } else {
+            // Note: the deadline here is in case we are arriving late and the
+            // kernel that should rendezvous with this tensor has already waited
+            // and timed out.
+            if (!waiting_tensors_
+                     .emplace(batch_keys[i],
+                              WaitingTensor{deadline_micros, split_inputs[i]})
+                     .second) {
+              return errors::AlreadyExists(
+                  "Multiple tensors returned for same batch key.");
+            }
+          }
+        }
+      }
+
+      return Status::OK();
+    }();
+
+    for (const AsyncOpKernel::DoneCallback& done_callback :
+         done_callbacks_to_call) {
+      done_callback();
+    }
+
+    return status;
+  }
+
+ private:
+  // Evicts waiting tensors and callbacks that have exceeded their deadline.
+  void EnforceTimeout() {
+    const uint64 now = Env::Default()->NowMicros();
+    std::vector<WaitingCallback> evicted_callbacks;
+
+    {
+      mutex_lock ml(mu_);
+
+      for (auto it = waiting_tensors_.begin(); it != waiting_tensors_.end();) {
+        const WaitingTensor& waiting_tensor = it->second;
+        if (waiting_tensor.deadline_micros < now) {
+          it = waiting_tensors_.erase(it);
+        } else {
+          ++it;
+        }
+      }
+
+      for (auto it = waiting_callbacks_.begin();
+           it != waiting_callbacks_.end();) {
+        const WaitingCallback& waiting_callback = it->second;
+        if (waiting_callback.deadline_micros < now) {
+          evicted_callbacks.push_back(waiting_callback);
+          it = waiting_callbacks_.erase(it);
+        } else {
+          ++it;
+        }
+      }
+    }
+
+    for (const WaitingCallback& evicted_callback : evicted_callbacks) {
+      evicted_callback.context->CtxFailureWithWarning(errors::DeadlineExceeded(
+          "Batched data did not arrive within timeout window."));
+      evicted_callback.done();
+    }
+  }
+
+  struct WaitingTensor {
+    uint64 deadline_micros;
+    Tensor tensor;
+  };
+
+  struct WaitingCallback {
+    uint64 deadline_micros;
+    OpKernelContext* context;
+    AsyncOpKernel::DoneCallback done;
+  };
+
+  const int32 timeout_micros_;
+
+  mutex mu_;
+
+  // Maps keyed by BatchKey of tensors waiting for callbacks and callbacks
+  // waiting for tensors.
+  std::unordered_map<int64, WaitingTensor> waiting_tensors_ GUARDED_BY(mu_);
+  std::unordered_map<int64, WaitingCallback> waiting_callbacks_ GUARDED_BY(mu_);
+
+  // A thread that evicts waiting tensors and callbacks that have exceeded their
+  // deadline.
+  std::unique_ptr<serving::PeriodicFunction> timeout_enforcer_;
+};
+
+class UnbatchKernel : public AsyncOpKernel {
+ public:
+  explicit UnbatchKernel(OpKernelConstruction* c) : AsyncOpKernel(c) {
+    OP_REQUIRES_OK(c, c->GetAttr("container", &container_));
+    OP_REQUIRES_OK(c, c->GetAttr("shared_name", &shared_name_));
+    // If shared_name is not supplied, use name instead (prevent collisions by
+    // default).
+    if (shared_name_.empty()) {
+      shared_name_ = name();
+    }
+    OP_REQUIRES_OK(c, c->GetAttr("timeout_micros", &timeout_micros_));
+  }
+
+  void ComputeAsync(OpKernelContext* c, DoneCallback done) final {
+    UnbatchResource* ubr;
+    std::function<Status(UnbatchResource * *r)> creator =
+        [this](UnbatchResource** r) {
+          *r = new UnbatchResource(timeout_micros_);
+          return Status::OK();
+        };
+    OP_REQUIRES_OK_ASYNC(c,
+                         c->resource_manager()->LookupOrCreate(
+                             container_, shared_name_, &ubr, creator),
+                         done);
+    auto status = ubr->Compute(c, done);
+    ubr->Unref();
+    if (!status.ok()) {
+      OP_REQUIRES_OK_ASYNC(c, status, done);
+    }
+    // Assume ubr calls done, so nothing to do here.
+  }
+
+ private:
+  string container_;
+  string shared_name_;
+  int32 timeout_micros_;
+};
+REGISTER_KERNEL_BUILDER(Name("Unbatch").Device(DEVICE_CPU), UnbatchKernel);
+
+// A class encapsulating the state and logic for batching tensors
+// deterministically for the gradient of unbatch.
+class UnbatchGradResource : public ResourceBase {
+ public:
+  UnbatchGradResource() {}
+
+  string DebugString() final { return "UnbatchGradResource"; }
+
+  // Flushes the information for one batch, given its context and done
+  // callback. Clears all information about it from the available_tensors_.
+  Status OutputBatch(OpKernelContext* context, AsyncOpKernel::DoneCallback done)
+      EXCLUSIVE_LOCKS_REQUIRED(mu_) {
+    const Tensor& batch_index_t = context->input(1);
+    auto batch_index =
+        batch_index_t.shaped<int64, 2>({batch_index_t.dim_size(0), 3});
+    std::vector<Tensor> tensors;
+    for (int i = 0; i < batch_index_t.dim_size(0); ++i) {
+      auto available_it = available_tensors_.find(batch_index(i, 0));
+      if (available_it == available_tensors_.end()) {
+        return errors::Internal("bad bookkeeping of available tensors.");
+      }
+      tensors.push_back(available_it->second);
+      available_tensors_.erase(available_it);
+    }
+
+    const DataType type = tensors[0].dtype();
+    switch (type) {
+#define CASE(type)                                         \
+  case DataTypeToEnum<type>::value:                        \
+    TF_RETURN_IF_ERROR(Concat<type>(context, tensors, 0)); \
+    break;
+      TF_CALL_ALL_TYPES(CASE);
+#undef CASE
+      default:
+        return errors::InvalidArgument("Unsupported data type: ", type);
+    }
+    done();
+    return Status::OK();
+  }
+
+  // Ingests data from one invocation of the op.
+  Status Compute(OpKernelContext* context, AsyncOpKernel::DoneCallback done) {
+    const Tensor& data_t = context->input(0);
+    const Tensor& batch_index_t = context->input(1);
+    const Tensor& grad_t = context->input(2);
+
+    mutex_lock ml(mu_);
+
+    const int64 batch_key = context->input(3).scalar<int64>()();
+    // Mark our tensor as available.
+    if (!available_tensors_.emplace(batch_key, grad_t).second) {
+      return errors::InvalidArgument("Two runs with the same batch key.");
+    }
+
+    // Check whether we have a valid input tensor and, if so, create its
+    // dispatch logic.
+    if (data_t.NumElements() > 0) {
+      if (batch_index_t.NumElements() == 0) {
+        return errors::InvalidArgument(
+            "batch_index is empty while the tensor isn't.");
+      }
+      std::unordered_set<int64> missing_tensors;
+      const auto batch_index =
+          batch_index_t.shaped<int64, 2>({batch_index_t.dim_size(0), 3});
+      for (int i = 0; i < batch_index_t.dim_size(0); ++i) {
+        const int64 batch_key = batch_index(i, 0);
+        if (available_tensors_.find(batch_key) == available_tensors_.end()) {
+          missing_tensors.emplace(batch_key);
+        }
+      }
+      if (missing_tensors.empty()) {
+        return OutputBatch(context, done);
+      }
+      if (!available_batches_
+               .emplace(batch_key, Batch{missing_tensors, context, done})
+               .second) {
+        return errors::InvalidArgument(
+            "Batch key with valid batch used twice.");
+      }
+      for (const int64 i : missing_tensors) {
+        if (!desired_tensor_to_batch_map_.emplace(i, batch_key).second) {
+          return errors::InvalidArgument(
+              "Missing tensor wanted by more than one batch.");
+        }
+      }
+    } else {
+      // If we don't have a valid input tensor we can output an empty tensor and
+      // call our done closure.
+      TensorShape output_shape(grad_t.shape());
+      output_shape.set_dim(0, 0);
+      Tensor* output = nullptr;
+      TF_RETURN_IF_ERROR(context->allocate_output(0, output_shape, &output));
+      done();
+    }
+
+    // Search to see whether our tensor is desired by any existing batch.
+    auto desire_it = desired_tensor_to_batch_map_.find(batch_key);
+    if (desire_it != desired_tensor_to_batch_map_.end()) {
+      // Mark our tensor as no longer missing.
+      auto batch_it = available_batches_.find(desire_it->second);
+      desired_tensor_to_batch_map_.erase(desire_it);
+      if (batch_it == available_batches_.end()) {
+        return errors::InvalidArgument("Batch no longer exists.");
+      }
+      batch_it->second.missing_tensors.erase(batch_key);
+      // If all tensors are available we should concatenate them and dispatch
+      // the batch.
+      if (batch_it->second.missing_tensors.empty()) {
+        TF_RETURN_IF_ERROR(
+            OutputBatch(batch_it->second.context, batch_it->second.done));
+        available_batches_.erase(batch_it);
+      }
+    }
+    return Status::OK();
+  }
+
+ private:
+  mutex mu_;
+
+  // Represents a still-incomplete batch of tensors. When all tensors become
+  // available they will be concatenated in the right order and sent through the
+  // context.
+  struct Batch {
+    // Batch keys for tensors which are still missing from this batch. When this
+    // is empty the Tensors can be concatenated and forwarded.
+    std::unordered_set<int64> missing_tensors;
+
+    // Context and callback for the session responsible for finishing this
+    // batch.
+    OpKernelContext* context;
+    AsyncOpKernel::DoneCallback done;
+  };
+
+  // Map from batch key of the session which will output the batched gradients
+  // to still-incomplete batches.
+  std::unordered_map<int64, Batch> available_batches_;
+
+  // Map from batch key to tensors which are waiting for their batches to be
+  // available.
+  std::unordered_map<int64, Tensor> available_tensors_;
+
+  // Map from batch key of a tensor which is not yet available to the batch key
+  // of the batch to which it belongs.
+  std::unordered_map<int64, int64> desired_tensor_to_batch_map_;
+};
+
+class UnbatchGradKernel : public AsyncOpKernel {
+ public:
+  explicit UnbatchGradKernel(OpKernelConstruction* c) : AsyncOpKernel(c) {
+    OP_REQUIRES_OK(c, c->GetAttr("container", &container_));
+    OP_REQUIRES_OK(c, c->GetAttr("shared_name", &shared_name_));
+    // If shared_name is not supplied, use name instead (prevent collisions by
+    // default).
+    if (shared_name_.empty()) {
+      shared_name_ = name();
+    }
+  }
+
+  void ComputeAsync(OpKernelContext* c, DoneCallback done) final {
+    UnbatchGradResource* ubr;
+    std::function<Status(UnbatchGradResource * *r)> creator =
+        [this](UnbatchGradResource** r) {
+          *r = new UnbatchGradResource();
+          return Status::OK();
+        };
+    OP_REQUIRES_OK_ASYNC(c,
+                         c->resource_manager()->LookupOrCreate(
+                             container_, shared_name_, &ubr, creator),
+                         done);
+    Status status = ubr->Compute(c, done);
+    ubr->Unref();
+    if (!status.ok()) {
+      OP_REQUIRES_OK_ASYNC(c, status, done);
+    }
+    // Assume ubr calls done, so nothing to do here.
+  }
+
+ private:
+  string container_;
+  string shared_name_;
+};
+REGISTER_KERNEL_BUILDER(Name("UnbatchGrad").Device(DEVICE_CPU),
+                        UnbatchGradKernel);
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/batching/ops/batch_ops.cc b/tensorflow/contrib/batching/ops/batch_ops.cc
new file mode 100644
index 0000000000..85e0ccba4a
--- /dev/null
+++ b/tensorflow/contrib/batching/ops/batch_ops.cc
@@ -0,0 +1,164 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/common_shape_fns.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+REGISTER_OP("Batch")
+    .Input("in_tensors: T")
+    .Output("batched_tensors: T")
+    .Output("batch_index: int64")
+    .Output("id: int64")
+    .Attr("num_batch_threads: int")
+    .Attr("max_batch_size: int")
+    .Attr("batch_timeout_micros: int")
+    .Attr("allowed_batch_sizes: list(int) = []")
+    .Attr("grad_timeout_micros: int")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("batching_queue: string = ''")
+    .Attr("T: list(type)")
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      std::vector<shape_inference::ShapeHandle> in_shapes;
+      TF_RETURN_IF_ERROR(c->input("in_tensors", &in_shapes));
+      std::vector<shape_inference::ShapeHandle> out_shapes(in_shapes.size());
+      for (int i = 0; i < in_shapes.size(); ++i) {
+        TF_RETURN_IF_ERROR(
+            c->ReplaceDim(in_shapes[i], 0, c->UnknownDim(), &out_shapes[i]));
+      }
+      TF_RETURN_IF_ERROR(c->set_output("batched_tensors", out_shapes));
+      TF_RETURN_IF_ERROR(c->set_output("id", {c->Scalar()}));
+      TF_RETURN_IF_ERROR(c->set_output(
+          "batch_index",
+          {c->MakeShape({shape_inference::DimensionOrConstant(c->UnknownDim()),
+                         shape_inference::DimensionOrConstant(3)})}));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Batches all input tensors nondeterministically.
+
+When many instances of this Op are being run concurrently with the same
+container/shared_name in the same device, some will output zero-shaped Tensors
+and others will output Tensors of size up to max_batch_size.
+
+All Tensors in in_tensors are batched together (so, for example, labels and
+features should be batched with a single instance of this operation.
+
+Each invocation of batch emits an `id` scalar which will be used to identify
+this particular invocation when doing unbatch or its gradient.
+
+Each op which emits a non-empty batch will also emit a non-empty batch_index
+Tensor, which, is a [K, 3] matrix where each row contains the invocation's id,
+start, and length of elements of each set of Tensors present in batched_tensors.
+
+Batched tensors are concatenated along the first dimension, and all tensors in
+in_tensors must have the first dimension of the same size.
+
+in_tensors: The tensors to be batched.
+num_batch_threads: Number of scheduling threads for processing batches of work.
+ Determines the number of batches processed in parallel.
+max_batch_size: Batch sizes will never be bigger than this.
+batch_timeout_micros: Maximum number of microseconds to wait before outputting
+ an incomplete batch.
+allowed_batch_sizes: Optional list of allowed batch sizes. If left empty, does
+ nothing. Otherwise, supplies a list of batch sizes, causing the op to pad
+ batches up to one of those sizes. The entries must increase monotonically, and
+ the final entry must equal max_batch_size.
+grad_timeout_micros: The timeout to use for the gradient. See Unbatch.
+batched_tensors: Either empty tensors or a batch of concatenated Tensors.
+batch_index: If out_tensors is non-empty, has information to invert it.
+container: Controls the scope of sharing of this batch.
+id: always contains a scalar with a unique ID for this invocation of Batch.
+shared_name: Concurrently running instances of batch in the same device with the
+ same container and shared_name will batch their elements together. If left
+ empty, the op name will be used as the shared name.
+T: the types of tensors to be batched.
+)doc");
+
+REGISTER_OP("Unbatch")
+    .Input("batched_tensor: T")
+    .Input("batch_index: int64")
+    .Input("id: int64")
+    .Output("unbatched_tensor: T")
+    .Attr("timeout_micros: int")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("T: type")
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      shape_inference::ShapeHandle out_shape;
+      TF_RETURN_IF_ERROR(
+          c->ReplaceDim(c->input(0), 0, c->UnknownDim(), &out_shape));
+      c->set_output(0, out_shape);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Reverses the operation of Batch for a single output Tensor.
+
+An instance of Unbatch either receives an empty batched_tensor, in which case it
+asynchronously waits until the values become available from a concurrently
+running instance of Unbatch with the same container and shared_name, or receives
+a non-empty batched_tensor in which case it finalizes all other concurrently
+running instances and outputs its own element from the batch.
+
+batched_tensor: The possibly transformed output of Batch. The size of the first
+ dimension should remain unchanged by the transformations for the operation to
+ work.
+batch_index: The matching batch_index obtained from Batch.
+id: The id scalar emitted by Batch.
+unbatched_tensor: The Tensor corresponding to this execution.
+timeout_micros: Maximum amount of time (in microseconds) to wait to receive the
+ batched input tensor associated with a given invocation of the op.
+container: Container to control resource sharing.
+shared_name: Instances of Unbatch with the same container and shared_name are
+ assumed to possibly belong to the same batch. If left empty, the op name will
+ be used as the shared name.
+)doc");
+
+REGISTER_OP("UnbatchGrad")
+    .Input("original_input: T")
+    .Input("batch_index: int64")
+    .Input("grad: T")
+    .Input("id: int64")
+    .Output("batched_grad: T")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("T: type")
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      c->set_output(0, c->UnknownShapeOfRank(c->Rank(c->input(2))));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Gradient of Unbatch.
+
+Acts like Batch but using the given batch_index index of batching things as they
+become available. This ensures that the gradients are propagated back in the
+same session which did the forward pass.
+
+original_input: The input to the Unbatch operation this is the gradient of.
+batch_index: The batch_index given to the Unbatch operation this is the gradient
+of.
+grad: The downstream gradient.
+id: The id scalar emitted by Batch.
+batched_grad: The return value, either an empty tensor or the batched gradient.
+container: Container to control resource sharing.
+shared_name: Instances of UnbatchGrad with the same container and shared_name
+ are assumed to possibly belong to the same batch. If left empty, the op name
+ will be used as the shared name.
+  )doc");
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/batching/python/ops/batch_ops.py b/tensorflow/contrib/batching/python/ops/batch_ops.py
new file mode 100644
index 0000000000..e50c3fdff4
--- /dev/null
+++ b/tensorflow/contrib/batching/python/ops/batch_ops.py
@@ -0,0 +1,138 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""Operations for automatic batching and unbatching."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.batching.ops import gen_batch_ops
+# go/tf-wildcard-import
+# pylint: disable=wildcard-import
+from tensorflow.contrib.batching.ops.gen_batch_ops import *
+# pylint: enable=wildcard-import
+from tensorflow.contrib.util import loader
+from tensorflow.python.framework import ops
+from tensorflow.python.platform import resource_loader
+
+
+_batch_ops = loader.load_op_library(
+    resource_loader.get_path_to_datafile("_batch_ops.so"))
+
+
+@ops.RegisterGradient("Batch")
+def _BatchGrad(op, *out_grads):  # pylint: disable=invalid-name
+  """Gradient for batch op."""
+  gradients = []
+  for i in xrange(len(op.inputs)):
+    gradients.append(
+        gen_batch_ops.unbatch(
+            out_grads[i],
+            op.outputs[-2],
+            op.outputs[-1],
+            timeout_micros=op.get_attr("grad_timeout_micros"),
+            shared_name="batch_gradient_{}_{}".format(op.name, i)))
+  return gradients
+
+
+@ops.RegisterGradient("Unbatch")
+def _UnbatchGrad(op, grad):   # pylint: disable=invalid-name
+  return [
+      gen_batch_ops.unbatch_grad(
+          op.inputs[0],
+          op.inputs[1],
+          grad,
+          op.inputs[2],
+          shared_name="unbatch_gradient_{}".format(op.name)), None, None
+  ]
+
+
+def batch_function(num_batch_threads, max_batch_size, batch_timeout_micros,
+                   allowed_batch_sizes=None,
+                   grad_timeout_micros=60 * 1000 * 1000,
+                   unbatch_timeout_micros=60 * 1000 * 1000):
+  """Batches the computation done by the decorated function.
+
+  So, for example, in the following code
+
+  ```
+  @batch_function(1, 2, 3)
+  def layer(a):
+    return tf.matmul(a, a)
+
+  b = layer(w)
+  ```
+
+  if more than one session.run call is simultaneously trying to compute `b`
+  the values of `w` will be gathered, non-deterministically concatenated
+  along the first axis, and only one thread will run the computation. See the
+  documentation of the `Batch` op for more details.
+
+  Assumes that all arguments of the decorated function are Tensors which will
+  be batched along their first dimension.
+
+  SparseTensor is not supported. The return value of the decorated function
+  must be a Tensor or a list/tuple of Tensors.
+
+  Args:
+    num_batch_threads: Number of scheduling threads for processing batches
+     of work. Determines the number of batches processed in parallel.
+    max_batch_size: Batch sizes will never be bigger than this.
+    batch_timeout_micros: Maximum number of microseconds to wait before
+     outputting an incomplete batch.
+    allowed_batch_sizes: Optional list of allowed batch sizes. If left empty,
+     does nothing. Otherwise, supplies a list of batch sizes, causing the op
+     to pad batches up to one of those sizes. The entries must increase
+     monotonically, and the final entry must equal max_batch_size.
+    grad_timeout_micros: The timeout to use for the gradient. See the
+     documentation of the unbatch op for more details. Defaults to 60s.
+    unbatch_timeout_micros: The timeout to use for unbatching. See the
+     documentation of the unbatch op for more details. Defaults to 60s.
+
+  Returns:
+    The decorated function will return the unbatched computation output Tensors.
+  """
+  def decorator(f):  # pylint: disable=missing-docstring
+    def decorated(*args):
+      with ops.name_scope("batch") as name:
+        for a in args:
+          if not isinstance(a, ops.Tensor):
+            raise ValueError("All arguments to functions decorated with "
+                             "`batch_function`  are supposed to be Tensors; "
+                             "found %s" % repr(a))
+        batched_tensors, batch_index, id_t = gen_batch_ops.batch(
+            args,
+            num_batch_threads=num_batch_threads,
+            max_batch_size=max_batch_size,
+            batch_timeout_micros=batch_timeout_micros,
+            allowed_batch_sizes=allowed_batch_sizes,
+            grad_timeout_micros=grad_timeout_micros,
+            shared_name=name)
+        outputs = f(*batched_tensors)
+        if isinstance(outputs, ops.Tensor):
+          outputs_list = [outputs]
+        else:
+          outputs_list = outputs
+        with ops.name_scope("unbatch") as unbatch_name:
+          unbatched = [
+              gen_batch_ops.unbatch(t, batch_index, id_t,
+                                    timeout_micros=unbatch_timeout_micros,
+                                    shared_name=unbatch_name)
+              for t in outputs_list]
+        if isinstance(outputs, ops.Tensor):
+          return unbatched[0]
+        return unbatched
+    return decorated
+  return decorator
diff --git a/tensorflow/contrib/batching/python/ops/batch_ops_test.py b/tensorflow/contrib/batching/python/ops/batch_ops_test.py
new file mode 100644
index 0000000000..fac7aff29f
--- /dev/null
+++ b/tensorflow/contrib/batching/python/ops/batch_ops_test.py
@@ -0,0 +1,276 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""Tests for the currently experimental in-graph batch ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import threading
+import time
+
+from tensorflow.contrib.batching.python.ops import batch_ops
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gradients_impl
+from tensorflow.python.ops import script_ops
+from tensorflow.python.platform import test
+
+
+def delayed_plus1(x):
+  """Sleeps for 100ms then returns x+1."""
+  time.sleep(0.1)
+  return x + 1
+
+
+class BatchOpsTest(test.TestCase):
+  """Tests for batch_ops.{un,}batch."""
+
+  def testBasicBatch(self):
+    """Tests that a single batched tensor executes together and only once."""
+    with self.test_session() as sess:
+      inp = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      batched, index, _ = batch_ops.batch(
+          [inp], num_batch_threads=1, max_batch_size=2,
+          batch_timeout_micros=36000000, grad_timeout_micros=0,
+          batching_queue="")
+      thread_results = []
+
+      def worker():
+        thread_results.extend(
+            sess.run([batched, index], feed_dict={inp: [1]}))
+
+      worker_thread = threading.Thread(target=worker)
+      worker_thread.start()
+      main_results = sess.run([batched, index], feed_dict={inp: [2]})
+      worker_thread.join()
+
+      # At this point either the thread or the main did the batch and the other
+      # should have empty results.
+      if list(thread_results[0][0]):
+        batch_t = thread_results[0][0]
+        index_t = thread_results[1]
+        empty_b = main_results[0][0]
+        empty_m = main_results[1]
+      else:
+        batch_t = main_results[0][0]
+        index_t = main_results[1]
+        empty_b = thread_results[0][0]
+        empty_m = thread_results[1]
+
+      # Check that both the inputs made it out exactly once.
+      self.assertAllEqual(sorted(batch_t), (1, 2))
+      # Check that we get 2 rows in the index tensor.
+      self.assertEqual(len(index_t), 2)
+      # Check that the other ones are empty.
+      self.assertEqual(len(empty_b), 0)
+      self.assertEqual(len(empty_m), 0)
+
+  def testBatchWithPadding(self):
+    """Test that batching with padding up to an allowed batch size works."""
+    with self.test_session() as sess:
+      inp = array_ops.placeholder(dtype=dtypes.int32, shape=[2])
+      batched, index, _ = batch_ops.batch(
+          [inp], num_batch_threads=1, max_batch_size=10,
+          batch_timeout_micros=100000,  # 100ms
+          allowed_batch_sizes=[5, 10],
+          grad_timeout_micros=0, batching_queue="")
+      thread_results = []
+
+      def worker():
+        thread_results.extend(
+            sess.run([batched, index], feed_dict={inp: [1, 3]}))
+
+      worker_thread = threading.Thread(target=worker)
+      worker_thread.start()
+      main_results = sess.run([batched, index], feed_dict={inp: [2, 4]})
+      worker_thread.join()
+
+      # At this point either the thread or the main did the batch and the other
+      # should have empty results.
+      if list(thread_results[0][0]):
+        batch_t = thread_results[0][0]
+      else:
+        batch_t = main_results[0][0]
+
+      # Check that the batch tensor incorporates the padding.
+      self.assertEqual(len(batch_t), 5)
+
+  def testMultipleBatch(self):
+    """Tests that multiple batched tensors execute together."""
+    with self.test_session() as sess:
+      inp0 = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      inp1 = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      batched, _, _ = batch_ops.batch(
+          [inp0, inp1],
+          num_batch_threads=1,
+          max_batch_size=2,
+          batch_timeout_micros=36000000,
+          grad_timeout_micros=0,
+          batching_queue="")
+      thread_results = []
+
+      def worker():
+        thread_results.extend(
+            sess.run([batched], feed_dict={inp0: [1],
+                                           inp1: [2]}))
+
+      worker_thread = threading.Thread(target=worker)
+      worker_thread.start()
+      main_results = sess.run([batched], feed_dict={inp0: [2], inp1: [3]})
+      worker_thread.join()
+
+      # At this point either the thread or the main did the batch and the other
+      # should have empty results.
+      if list(thread_results[0][0]):
+        batch_t = thread_results[0]
+        empty_t = main_results[0]
+      else:
+        batch_t = main_results[0]
+        empty_t = thread_results[0]
+
+      # Assert that the tensors were batched together.
+      self.assertAllEqual(sorted(batch_t[0]), [1, 2])
+      self.assertAllEqual(sorted(batch_t[1]), [2, 3])
+      self.assertAllEqual(empty_t[0], [])
+      self.assertAllEqual(empty_t[1], [])
+
+  def testIllegalBatchDifferentDim0Sizes(self):
+    """Tests illegally feeding tensors with different dim0 sizes."""
+    with self.test_session() as sess:
+      inp0 = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      inp1 = array_ops.placeholder(dtype=dtypes.int32, shape=[2])
+      batched, index, _ = batch_ops.batch(
+          [inp0, inp1], num_batch_threads=1, max_batch_size=2,
+          batch_timeout_micros=0, grad_timeout_micros=0, batching_queue="")
+      with self.assertRaises(Exception) as raised:
+        _ = sess.run([batched, index], feed_dict={inp0: [0], inp1: [1, 2]})
+      self.assertGreater(
+          raised.exception.message.find("must have equal 0th-dimension size"),
+          0)
+
+  def testBasicUnbatch(self):
+    """Tests that batch and unbatch work together."""
+    with self.test_session() as sess:
+      inp = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      batched, index, id_t = batch_ops.batch(
+          [inp], num_batch_threads=1, max_batch_size=10,
+          batch_timeout_micros=100000,  # 100ms
+          allowed_batch_sizes=[3, 10],
+          grad_timeout_micros=0, batching_queue="")
+      computation = batched[0] + 1
+      result = batch_ops.unbatch(computation, index, id_t,
+                                 timeout_micros=1000000, shared_name="unbatch")
+      thread_results = []
+
+      def worker():
+        thread_results.extend(sess.run([result], feed_dict={inp: [1]}))
+
+      worker_thread = threading.Thread(target=worker)
+      worker_thread.start()
+      main_results = sess.run([result], feed_dict={inp: [2]})
+      worker_thread.join()
+      self.assertEqual(thread_results[0], [2])
+      self.assertEqual(main_results[0], [3])
+
+  def testBasicUnbatchDecorated(self):
+    """Tests that the batch_function decorator works."""
+    with self.test_session() as sess:
+      @batch_ops.batch_function(1, 10, 100000)
+      def computation(in_t):
+        return in_t + 1
+      inp = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      result = computation(inp)
+      thread_results = []
+
+      def worker():
+        thread_results.extend(sess.run([result], feed_dict={inp: [1]}))
+
+      worker_thread = threading.Thread(target=worker)
+      worker_thread.start()
+      main_results = sess.run([result], feed_dict={inp: [2]})
+      worker_thread.join()
+      self.assertEqual(thread_results[0], [2])
+      self.assertEqual(main_results[0], [3])
+
+  def testUnbatchTimeout(self):
+    """Tests that the unbatch timeout works."""
+    with self.test_session() as sess:
+      inp = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      batched, index, id_t = batch_ops.batch(
+          [inp], num_batch_threads=1, max_batch_size=2,
+          batch_timeout_micros=36000000, grad_timeout_micros=0,
+          batching_queue="")
+      computation = batched[0] + 1
+      timeout_micros = 10
+      result = batch_ops.unbatch(computation, index, id_t, timeout_micros,
+                                 shared_name="shared_unbatch")
+      # Set up a parallel pipeline that delays the computation, but uses the
+      # same unbatch resource object as the non-delayed pipeline.
+      computation_delayed = script_ops.py_func(delayed_plus1,
+                                               [batched[0]],
+                                               dtypes.int32)
+      result_delayed = batch_ops.unbatch(computation_delayed,
+                                         index,
+                                         id_t,
+                                         timeout_micros,
+                                         shared_name="shared_unbatch")
+
+      thread_results = []
+      def worker():
+        # A first call using the non-delayed pipeline. The batcher will send an
+        # empty tensor along the non-delayed pipeline.
+        thread_results.extend(sess.run([result], feed_dict={inp: [1]}))
+      worker_thread = threading.Thread(target=worker)
+      worker_thread.start()
+      time.sleep(0.1)  # Ensure the thread's call starts first.
+      # A second call using the delayed pipeline.  The batcher will send the
+      # batched tensor along the delayed pipeline, thus delaying the arrival of
+      # the batched tensor at the unbatch op, relative to the empty tensor.
+      #
+      # TODO(olston, apassos): Avoid relying on the order in which the batch op
+      # emits the empty tensor versus the batched one.
+      _ = sess.run([result_delayed], feed_dict={inp: [2]})
+      worker_thread.join()
+      # The thread's call should hit the timeout, and thus get 0 results.
+      self.assertEqual(len(thread_results), 0)
+
+  def testUnbatchGrad(self):
+    """Tests that batch and unbatch are differentiable."""
+    with self.test_session() as sess:
+      inp = array_ops.placeholder(dtype=dtypes.int32, shape=[1])
+      batched, index, id_t = batch_ops.batch(
+          [inp], num_batch_threads=1, max_batch_size=2,
+          batch_timeout_micros=36000000, grad_timeout_micros=1000000,
+          batching_queue="")
+      computation = batched[0] * batched[0]
+      result = batch_ops.unbatch(computation, index, id_t,
+                                 timeout_micros=1000000, shared_name="unbatch")
+      grad = gradients_impl.gradients(result, inp)
+      thread_results = []
+
+      def worker():
+        thread_results.extend(sess.run([grad], feed_dict={inp: [1]}))
+
+      worker_thread = threading.Thread(target=worker)
+      worker_thread.start()
+      main_results = sess.run([grad], feed_dict={inp: [2]})
+      worker_thread.join()
+      self.assertEqual(thread_results[0], [2])
+      self.assertEqual(main_results[0], [4])
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/batching/util/BUILD b/tensorflow/contrib/batching/util/BUILD
index fe1660ffd1..e69d6ecd8f 100644
--- a/tensorflow/contrib/batching/util/BUILD
+++ b/tensorflow/contrib/batching/util/BUILD
@@ -22,11 +22,21 @@ filegroup(
 )
 
 cc_library(
-    name = "periodic_function",
+    name = "periodic_function_dynamic",
     srcs = ["periodic_function.cc"],
     hdrs = ["periodic_function.h"],
     visibility = ["//visibility:public"],
     deps = [
+        "//tensorflow/core:framework_headers_lib",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
+cc_library(
+    name = "periodic_function",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":periodic_function_dynamic",
         "//tensorflow/core:lib",
     ],
 )
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index b172dcf2cf..be0ac8fc55 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -362,6 +362,18 @@ tf_kernel_library(
     alwayslink = 0,
 )
 
+cc_library(
+    name = "split_lib_hdrs",
+    hdrs = [
+        "split_lib.h",
+    ],
+    deps = [
+        ":eigen_helpers",
+        ":ops_util_hdrs",
+        "//third_party/eigen3",
+    ],
+)
+
 cc_library(
     name = "typed_queue",
     hdrs = ["typed_queue.h"],
-- 
GitLab


From be1556e0e710fd33d6d156ded649e5a7dc39ef46 Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Thu, 27 Apr 2017 10:36:58 -0800
Subject: [PATCH 0757/1563] [XLA]Add additional VLOGing to hlo_pass_pipeline.
 VLOG pass names including skipped passes in the HLO pass pipeline. Change:
 154448662

---
 tensorflow/compiler/xla/service/hlo_pass_pipeline.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc b/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
index eb7fe467b3..78aebe9c36 100644
--- a/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
+++ b/tensorflow/compiler/xla/service/hlo_pass_pipeline.cc
@@ -42,11 +42,17 @@ void DumpModule(const Compiler::HloDumper& dumper_, const HloModule& module,
 StatusOr<bool> HloPassPipeline::Run(HloModule* module) {
   run_called_ = true;
 
+  VLOG(1) << "Running HLO pass pipeline " << name();
+
   legacy_flags::HloPassPipelineFlags* flags =
       legacy_flags::GetHloPassPipelineFlags();
   std::vector<string> tmp =
       tensorflow::str_util::Split(flags->xla_disable_hlo_passes, ',');
   tensorflow::gtl::FlatSet<string> disabled_passes(tmp.begin(), tmp.end());
+  if (!disabled_passes.empty()) {
+    VLOG(1) << "Passes disabled by --xla_disable_hlo_passes: "
+            << tensorflow::str_util::Join(disabled_passes, ", ");
+  }
 
   auto run_invariant_checkers = [this, module]() -> Status {
     for (auto& invariant_checker : invariant_checkers_) {
@@ -62,9 +68,13 @@ StatusOr<bool> HloPassPipeline::Run(HloModule* module) {
   for (auto& pass : passes_) {
     if (!disabled_passes.empty() &&
         disabled_passes.count(pass->name().ToString()) > 0) {
+      VLOG(1) << "  Skipping HLO pass " << pass->name()
+              << ", disabled by --xla_disable_hlo_passes";
       continue;
     }
 
+    VLOG(1) << "  HLO pass " << pass->name();
+
     // Emit label containing: "after foo-pass, before bar-pass".
     message.clear();
     StrAppend(&message, prefix, ", before ", pass->name());
-- 
GitLab


From 6e7f5a232a40b975acebb059e316b71a83f7af28 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 27 Apr 2017 10:46:51 -0800
Subject: [PATCH 0758/1563] Change Tensorflow constant_folding_test.cc to use
 the C++ graph building API instead of deprecated testlib API. Cleanup to test
 code only, no functional changes.

Delete unused Broadcast* methods from testlib.h
Change: 154450120
---
 tensorflow/core/BUILD                         |   2 +
 .../common_runtime/constant_folding_test.cc   | 319 +++++++++---------
 tensorflow/core/graph/testlib.cc              |  18 -
 tensorflow/core/graph/testlib.h               |   6 -
 4 files changed, 169 insertions(+), 176 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 0d2b0192e1..13f666f394 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -2219,6 +2219,8 @@ tf_cc_test(
         ":test_main",
         ":testlib",
         "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:cc_ops_internal",
+        "//tensorflow/cc:sendrecv_ops",
         "//tensorflow/core/kernels:bcast_ops",
         "//tensorflow/core/kernels:cast_op",
         "//tensorflow/core/kernels:concat_op",
diff --git a/tensorflow/core/common_runtime/constant_folding_test.cc b/tensorflow/core/common_runtime/constant_folding_test.cc
index 3a9bdfe144..8fe32a704b 100644
--- a/tensorflow/core/common_runtime/constant_folding_test.cc
+++ b/tensorflow/core/common_runtime/constant_folding_test.cc
@@ -20,6 +20,8 @@ limitations under the License.
 
 #include "tensorflow/core/common_runtime/constant_folding.h"
 
+#include "tensorflow/cc/ops/array_ops_internal.h"
+#include "tensorflow/cc/ops/sendrecv_ops.h"
 #include "tensorflow/cc/ops/standard_ops.h"
 #include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/common_runtime/device_mgr.h"
@@ -30,7 +32,6 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/graph/node_builder.h"
-#include "tensorflow/core/graph/testlib.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
 #include "tensorflow/core/lib/core/threadpool.h"
 #include "tensorflow/core/lib/strings/strcat.h"
@@ -42,19 +43,6 @@ namespace {
 
 class ConstantFoldingTest : public ::testing::Test {
  protected:
-  ConstantFoldingTest() { Reset(); }
-  void Reset() { g_.reset(new Graph(OpRegistry::Global())); }
-
-  template <typename T>
-  Node* Constant(gtl::ArraySlice<T> values, TensorShape shape) {
-    return test::graph::Constant(g_.get(), test::AsTensor(values, shape));
-  }
-
-  template <typename T>
-  Node* Constant(T v) {
-    return test::graph::Constant(g_.get(), test::AsScalar(v));
-  }
-
   template <typename T>
   void ExpectNodeClose(const Node* n, gtl::ArraySlice<T> values,
                        TensorShape shape) {
@@ -81,38 +69,47 @@ class ConstantFoldingTest : public ::testing::Test {
     test::ExpectTensorEqual<T>(t, test::AsTensor(values, shape));
   }
 
-// Construct the following graph
-/*
-      s1  s2
-      |    |
-      m1   m2
-      / \ / \
-     a   b   c
-*/
-#define SIMPLE_GRAPH                                                  \
-  Reset();                                                            \
-  Graph* g = g_.get();                                                \
-  Node* a = Constant<float>({1.0, 0.0, 0.0, 1.0}, {2, 2});            \
-  Node* b = Constant<float>({1.0, 2.0, 3.0, 4.0}, {2, 2});            \
-  Node* c = Constant<float>({0.0, 1.0, 1.0, 0.0}, {2, 2});            \
-  g->AddControlEdge(g->source_node(), a);                             \
-  g->AddControlEdge(g->source_node(), b);                             \
-  g->AddControlEdge(g->source_node(), c);                             \
-  Node* m1 = test::graph::Matmul(g, a, b, false, false);              \
-  Node* s1 = test::graph::Send(g, m1, "m1", "sender", 0, "receiver"); \
-  Node* m2 = test::graph::Matmul(g, b, c, false, false);              \
-  Node* s2 = test::graph::Send(g, m2, "m2", "sender", 0, "receiver"); \
-  g->AddControlEdge(s1, g->sink_node());                              \
-  g->AddControlEdge(s2, g->sink_node());
-
-  std::unique_ptr<Graph> g_;
+  // Builds a map from node name to Node* for `graph`.
+  std::unordered_map<string, Node*> NodeNameIndex(const Graph& graph) {
+    std::unordered_map<string, Node*> index;
+    for (Node* node : graph.nodes()) {
+      index[node->name()] = node;
+    }
+    return index;
+  }
+
+  // Constructs the following graph.
+  /*
+        s1  s2
+        |    |
+        m1   m2
+        / \ / \
+       a   b   c
+  */
+  void BuildSimpleGraph(Scope* scope) {
+    Scope& s = *scope;
+    auto a = ops::Const<float>(s, {1.0, 0.0, 0.0, 1.0}, {2, 2});
+    auto b = ops::Const<float>(s, {1.0, 2.0, 3.0, 4.0}, {2, 2});
+    auto c = ops::Const<float>(s, {0.0, 1.0, 1.0, 0.0}, {2, 2});
+    auto m1 = ops::MatMul(s, a, b);
+    auto s1 = ops::_Send(s.WithOpName("s1"), m1, "m1", "sender", 0, "receiver");
+    auto m2 = ops::MatMul(s.WithOpName("m2"), b, c);
+    auto s2 = ops::_Send(s.WithOpName("s2"), m2, "m2", "sender", 0, "receiver");
+  }
 };
 
 TEST_F(ConstantFoldingTest, Basic) {
-  SIMPLE_GRAPH;
+  Scope s = Scope::NewRootScope();
+  BuildSimpleGraph(&s);
+  Graph g(OpRegistry::Global());
+  TF_ASSERT_OK(s.ToGraph(&g));
+
   EXPECT_TRUE(DoConstantFolding(ConstantFoldingOptions{}, nullptr,
-                                Env::Default(), nullptr, g));
+                                Env::Default(), nullptr, &g));
 
+  std::unordered_map<string, Node*> index = NodeNameIndex(g);
+  Node* s1 = index.at("s1");
+  Node* s2 = index.at("s2");
   // Nodes s1 and s2 now should now have a constant input
   EXPECT_EQ(1, s1->num_inputs());
   ExpectNodeClose<float>(*(s1->in_nodes().begin()), {1.0, 2.0, 3.0, 4.0},
@@ -123,11 +120,20 @@ TEST_F(ConstantFoldingTest, Basic) {
 }
 
 TEST_F(ConstantFoldingTest, ConsiderFunction) {
-  SIMPLE_GRAPH;
+  Scope s = Scope::NewRootScope();
+  BuildSimpleGraph(&s);
+  Graph g(OpRegistry::Global());
+  TF_ASSERT_OK(s.ToGraph(&g));
+
   ConstantFoldingOptions opts;
   // Do not allow constant folding of m2
-  opts.consider = [m2](const Node* n) { return m2 != n; };
-  EXPECT_TRUE(DoConstantFolding(opts, nullptr, Env::Default(), nullptr, g));
+  opts.consider = [](const Node* n) { return "m2" != n->name(); };
+  EXPECT_TRUE(DoConstantFolding(opts, nullptr, Env::Default(), nullptr, &g));
+
+  std::unordered_map<string, Node*> index = NodeNameIndex(g);
+  Node* s1 = index.at("s1");
+  Node* s2 = index.at("s2");
+  Node* m2 = index.at("m2");
 
   // Node s1 now should now have a constant input
   EXPECT_EQ(1, s1->num_inputs());
@@ -139,40 +145,47 @@ TEST_F(ConstantFoldingTest, ConsiderFunction) {
 }
 
 TEST_F(ConstantFoldingTest, TestNoReplaceAnotherConstant) {
-  SIMPLE_GRAPH;
-  Node* d = Constant<float>({1.0, 0.0, 0.0, 1.0}, {2, 2});
-  g->AddControlEdge(g->source_node(), d);
-  Node* s3 = test::graph::Send(g, d, "d", "sender", 0, "receiver");
-  g->AddControlEdge(s3, g->sink_node());
+  Graph g(OpRegistry::Global());
+  {
+    Scope s = Scope::NewRootScope();
+    BuildSimpleGraph(&s);
+    auto d = ops::Const<float>(s.WithOpName("d"), {1.0, 0.0, 0.0, 1.0}, {2, 2});
+    auto s3 = ops::_Send(s.WithOpName("s3"), d, "d", "sender", 0, "receiver");
+    TF_ASSERT_OK(s.ToGraph(&g));
+  }
+
   EXPECT_TRUE(DoConstantFolding(ConstantFoldingOptions{}, nullptr,
-                                Env::Default(), nullptr, g));
+                                Env::Default(), nullptr, &g));
+
+  std::unordered_map<string, Node*> index = NodeNameIndex(g);
+  Node* d = index.at("d");
+  Node* s3 = index.at("s3");
 
   // Nodes s3 should still have d as input
   EXPECT_EQ(1, s3->num_inputs());
   EXPECT_EQ(*(s3->in_nodes().begin()), d);
 }
 
-#undef SIMPLE_GRAPH
-
 TEST_F(ConstantFoldingTest, TwoOutputs) {
-  Reset();
-  Graph* g = g_.get();
-  Node* s0 = Constant<int>({1}, {1});
-  Node* s1 = Constant<int>({2, 2}, {2});
-  g->AddControlEdge(g->source_node(), s0);
-  g->AddControlEdge(g->source_node(), s1);
-  Node* b = test::graph::BroadcastGradientArgs(g, s0, s1);
-  Node* b0 = test::graph::Send(g, test::graph::Identity(g, b, 0),
-                               strings::StrCat(b->name(), "0"), "sender", 0,
-                               "receiver");
-  Node* b1 = test::graph::Send(g, test::graph::Identity(g, b, 1),
-                               strings::StrCat(b->name(), "1"), "sender", 0,
-                               "receiver");
-  g->AddControlEdge(b0, g->sink_node());
-  g->AddControlEdge(b1, g->sink_node());
+  Graph g(OpRegistry::Global());
+  {
+    Scope s = Scope::NewRootScope();
+    auto s0 = ops::Const<int>(s, {1}, {1});
+    auto s1 = ops::Const<int>(s, {2, 2}, {2});
+    auto b = ops::internal::BroadcastGradientArgs(s, s0, s1);
+    auto b0 = ops::_Send(s.WithOpName("b0"), ops::Identity(s, b.r0), "b0",
+                         "sender", 0, "receiver");
+    auto b1 = ops::_Send(s.WithOpName("b1"), ops::Identity(s, b.r1), "b1",
+                         "sender", 0, "receiver");
+    TF_ASSERT_OK(s.ToGraph(&g));
+  }
 
   EXPECT_TRUE(DoConstantFolding(ConstantFoldingOptions{}, nullptr,
-                                Env::Default(), nullptr, g));
+                                Env::Default(), nullptr, &g));
+  std::unordered_map<string, Node*> index = NodeNameIndex(g);
+  Node* b0 = index.at("b0");
+  Node* b1 = index.at("b1");
+
   EXPECT_EQ(1, b0->num_inputs());
   ExpectNodeEqual<int>(*(b0->in_nodes().begin()), {0, 1}, {2});
   EXPECT_EQ(1, b1->num_inputs());
@@ -180,25 +193,29 @@ TEST_F(ConstantFoldingTest, TwoOutputs) {
 }
 
 TEST_F(ConstantFoldingTest, TwoOutputsFoldOneOutput) {
-  Reset();
-  Graph* g = g_.get();
-  Node* s0 = Constant<int>({1}, {1});
-  Node* s1 = Constant<int>({2, 2}, {2});
-  g->AddControlEdge(g->source_node(), s0);
-  g->AddControlEdge(g->source_node(), s1);
-  Node* b = test::graph::BroadcastGradientArgs(g, s0, s1);
-  Node* b0 = test::graph::Send(g, test::graph::Identity(g, b, 0),
-                               strings::StrCat(b->name(), "0"), "sender", 0,
-                               "receiver");
-  Node* b1_ident = test::graph::Identity(g, b, 1);
-  Node* b1 = test::graph::Send(g, b1_ident, strings::StrCat(b->name(), "1"),
-                               "sender", 0, "receiver");
-  g->AddControlEdge(b0, g->sink_node());
-  g->AddControlEdge(b1, g->sink_node());
+  Graph g(OpRegistry::Global());
+  {
+    Scope s = Scope::NewRootScope();
+    auto s0 = ops::Const<int>(s, {1}, {1});
+    auto s1 = ops::Const<int>(s, {2, 2}, {2});
+    auto b = ops::internal::BroadcastGradientArgs(s, s0, s1);
+    auto b0 = ops::_Send(s.WithOpName("b0"), ops::Identity(s, b.r0), "b0",
+                         "sender", 0, "receiver");
+    auto b1_ident = ops::Identity(s.WithOpName("b1_ident"), b.r1);
+    auto b1 =
+        ops::_Send(s.WithOpName("b1"), b1_ident, "b1", "sender", 0, "receiver");
+    TF_ASSERT_OK(s.ToGraph(&g));
+  }
 
   ConstantFoldingOptions opts;
-  opts.consider = [b1_ident](const Node* n) { return b1_ident != n; };
-  EXPECT_TRUE(DoConstantFolding(opts, nullptr, Env::Default(), nullptr, g));
+  opts.consider = [](const Node* n) { return "b1_ident" != n->name(); };
+  EXPECT_TRUE(DoConstantFolding(opts, nullptr, Env::Default(), nullptr, &g));
+
+  std::unordered_map<string, Node*> index = NodeNameIndex(g);
+  Node* b0 = index.at("b0");
+  Node* b1 = index.at("b1");
+  Node* b1_ident = index.at("b1_ident");
+
   // 0th output of b should have been folded.
   EXPECT_EQ(1, b0->num_inputs());
   ExpectNodeEqual<int>(*(b0->in_nodes().begin()), {0, 1}, {2});
@@ -212,94 +229,93 @@ TEST_F(ConstantFoldingTest, TwoOutputsFoldOneOutput) {
 }
 
 TEST_F(ConstantFoldingTest, TestNoReplaceLargeConstant) {
-  Reset();
-  Graph* g = g_.get();
-  Node* s0 =
-      Constant<int>(std::vector<int>(5 * 1024 * 256, 0), {5 * 1024 * 256});
-  Node* s1 = Constant<int>(std::vector<int>(5 * 1024 * 256 + 1, 0),
-                           {5 * 1024 * 256 + 1});
-  Node* concat_dim = Constant<int>(0);
-  g->AddControlEdge(g->source_node(), s0);
-  g->AddControlEdge(g->source_node(), s1);
-  // Concat s0 and s1. The resulting tensor would be of size 10M + 1 bytes
-  Node* concat = test::graph::Concat(g, concat_dim, {s0, s1});
-  Node* concat_send =
-      test::graph::Send(g, concat, "concat_send", "sender", 0, "receiver");
-  g->AddControlEdge(concat_send, g->sink_node());
+  Graph g(OpRegistry::Global());
+  {
+    Scope s = Scope::NewRootScope();
+    auto s0 = ops::Const<int>(s, 0, {5 * 1024 * 256});
+    auto s1 = ops::Const<int>(s, 0, {5 * 1024 * 256 + 1});
+    auto concat_dim = ops::Const<int>(s, 0);
+    auto concat = ops::Concat(s, {s0, s1}, concat_dim);
+    auto concat_send = ops::_Send(s.WithOpName("concat_send"), concat,
+                                  "concat_send", "sender", 0, "receiver");
+    TF_ASSERT_OK(s.ToGraph(&g));
+  }
 
   // The above concat should not have been constant folded.
   bool was_mutated;
   Status status =
       DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, g, &was_mutated);
+                                  Env::Default(), nullptr, &g, &was_mutated);
   EXPECT_FALSE(was_mutated);
   TF_EXPECT_OK(status);
 }
 
 TEST_F(ConstantFoldingTest, TestNoReplaceFunctionCall) {
-  FunctionDefLibrary fdef_lib;
-  *fdef_lib.add_function() = test::function::XTimesTwo();
-
-  FunctionLibraryDefinition flib_def(OpRegistry::Global(), fdef_lib);
-  g_.reset(new Graph(&flib_def));
-
-  Graph* g = g_.get();
-  Node* s =
-      Constant<int>(std::vector<int>(5 * 1024 * 256, 0), {5 * 1024 * 256});
-  g->AddControlEdge(g->source_node(), s);
-
-  NodeDef def;
-  TF_ASSERT_OK(NodeDefBuilder("times_two", "XTimesTwo", g->op_registry())
-                   .Input(s->name(), 0, DT_INT32)
-                   .Finalize(&def));
-  Status status;
-  Node* times_two = g->AddNode(def, &status);
-  TF_ASSERT_OK(status);
-
-  Node* times_two_send = test::graph::Send(g, times_two, "times_two_send",
-                                           "sender", 0, "receiver");
-  g->AddControlEdge(times_two_send, g->sink_node());
+  FunctionDefLibrary flib;
+  *flib.add_function() = test::function::XTimesTwo();
+
+  FunctionLibraryDefinition flib_def(OpRegistry::Global(), flib);
+  Graph g(flib_def);
+  {
+    Scope s = Scope::NewRootScope();
+    auto c = ops::Const<int32>(s.WithOpName("c"), {1}, {1});
+    TF_EXPECT_OK(s.graph()->AddFunctionLibrary(flib));
+
+    // TODO(phawkins): there is no way to make a function call using the C++
+    // graph builder API.
+    NodeDef def;
+    TF_ASSERT_OK(
+        NodeDefBuilder("times_two", "XTimesTwo", s.graph()->op_registry())
+            .Input(c.name(), 0, DT_INT32)
+            .Finalize(&def));
+    Status status;
+    Node* times_two = s.graph()->AddNode(def, &status);
+    TF_ASSERT_OK(status);
+
+    auto times_two_send =
+        ops::_Send(s.WithOpName("times_two_send"), Output(times_two),
+                   "times_two_send", "sender", 0, "receiver");
+    TF_ASSERT_OK(s.ToGraph(&g));
+  }
 
   // The above function call should not have been constant folded.
   bool was_mutated;
-  status =
+  Status status =
       DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, g, &was_mutated);
+                                  Env::Default(), nullptr, &g, &was_mutated);
   EXPECT_FALSE(was_mutated);
   EXPECT_TRUE(status.ok());
-
-  g_ = nullptr;
 }
 
 REGISTER_OP("ConstantFoldingTestOp").Input("a: int64").Output("b: int64");
 
 TEST_F(ConstantFoldingTest, TestNoReplaceNonCPUOp) {
-  Graph* g = g_.get();
-
-  Node* aconst = Constant<int64>(std::vector<int64>(5, 0), {5});
-  g->AddControlEdge(g->source_node(), aconst);
-
-  NodeDef def;
-  TF_ASSERT_OK(
-      NodeDefBuilder("testop", "ConstantFoldingTestOp", g->op_registry())
-          .Input(aconst->name(), 0, DT_INT64)
-          .Finalize(&def));
-  Status status;
-  Node* non_cpu = g->AddNode(def, &status);
-  TF_ASSERT_OK(status);
-  g->AddEdge(aconst, 0, non_cpu, 0);
-
-  Node* non_cpu_send =
-      test::graph::Send(g, non_cpu, "non_cpu_send", "sender", 0, "receiver");
-  g->AddControlEdge(non_cpu_send, g->sink_node());
+  Graph g(OpRegistry::Global());
+  {
+    Scope s = Scope::NewRootScope();
+    auto aconst = ops::Const<int64>(s, 0, {5});
+
+    NodeDef def;
+    TF_ASSERT_OK(NodeDefBuilder("testop", "ConstantFoldingTestOp")
+                     .Input(aconst.name(), 0, DT_INT64)
+                     .Finalize(&def));
+    Status status;
+    Node* non_cpu = s.graph()->AddNode(def, &status);
+    TF_ASSERT_OK(status);
+
+    auto non_cpu_send =
+        ops::_Send(s.WithOpName("non_cpu_send"), Output(non_cpu),
+                   "non_cpu_send", "sender", 0, "receiver");
+    TF_ASSERT_OK(s.ToGraph(&g));
+  }
 
   // The non-CPU op should not have been constant folded.
   bool was_mutated;
-  status =
+  Status status =
       DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, g, &was_mutated);
+                                  Env::Default(), nullptr, &g, &was_mutated);
   EXPECT_FALSE(was_mutated);
-  EXPECT_TRUE(status.ok());
+  TF_EXPECT_OK(status);
 }
 
 namespace {
@@ -365,8 +381,7 @@ class TestTFEnvironment : public ::tensorflow::EnvWrapper {
 }  // namespace
 
 TEST_F(ConstantFoldingTest, TestImmutableConst) {
-  Reset();
-  Graph* g = g_.get();
+  Graph g(OpRegistry::Global());
   Scope root = Scope::NewRootScope();
 
   auto a = ops::ImmutableConst(root, DT_DOUBLE, {2, 2}, kTestMemRegionName);
@@ -374,16 +389,16 @@ TEST_F(ConstantFoldingTest, TestImmutableConst) {
   auto c = ops::RandomGamma(root, {2, 2}, 2.0);
   auto result1 = ops::MatMul(root, a, b);
   auto result2 = ops::MatMul(root, result1, c);
-  TF_ASSERT_OK(root.ToGraph(g));
+  TF_ASSERT_OK(root.ToGraph(&g));
   TestTFEnvironment test_env;
   bool was_mutated;
   Status status =
       DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, g, &was_mutated);
+                                  Env::Default(), nullptr, &g, &was_mutated);
   EXPECT_FALSE(was_mutated);
   EXPECT_FALSE(status.ok());
   status = DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                       &test_env, nullptr, g, &was_mutated);
+                                       &test_env, nullptr, &g, &was_mutated);
   EXPECT_TRUE(was_mutated);
   TF_EXPECT_OK(status);
 }
diff --git a/tensorflow/core/graph/testlib.cc b/tensorflow/core/graph/testlib.cc
index f0ab5520f1..c495b21812 100644
--- a/tensorflow/core/graph/testlib.cc
+++ b/tensorflow/core/graph/testlib.cc
@@ -416,24 +416,6 @@ Node* Cast(Graph* g, Node* in, DataType dst) {
   return ret;
 }
 
-Node* BroadcastArgs(Graph* g, Node* s0, Node* s1) {
-  Node* ret;
-  TF_CHECK_OK(NodeBuilder(g->NewName("n"), "BroadcastArgs")
-                  .Input(s0)
-                  .Input(s1)
-                  .Finalize(g, &ret));
-  return ret;
-}
-
-Node* BroadcastGradientArgs(Graph* g, Node* s0, Node* s1) {
-  Node* ret;
-  TF_CHECK_OK(NodeBuilder(g->NewName("n"), "BroadcastGradientArgs")
-                  .Input(s0)
-                  .Input(s1)
-                  .Finalize(g, &ret));
-  return ret;
-}
-
 Node* Gather(Graph* g, Node* in0, Node* in1) {
   Node* ret;
   TF_CHECK_OK(NodeBuilder(g->NewName("n"), "Gather")
diff --git a/tensorflow/core/graph/testlib.h b/tensorflow/core/graph/testlib.h
index d508f65ada..48250fef0f 100644
--- a/tensorflow/core/graph/testlib.h
+++ b/tensorflow/core/graph/testlib.h
@@ -174,12 +174,6 @@ Node* Cast(Graph* g, Node* in, DataType dst);
 // Perform gather op on params "in0" with indices "in1".
 Node* Gather(Graph* g, Node* in0, Node* in1);
 
-// Computes broadcasted shape from the given input shapes.
-Node* BroadcastArgs(Graph* g, Node* s0, Node* s1);
-
-// Computes the args needed broadcast gradient function.
-Node* BroadcastGradientArgs(Graph* g, Node* s0, Node* s1);
-
 // Gets a tensor stored in the session state.
 Node* GetSessionTensor(Graph* g, Node* in);
 
-- 
GitLab


From 7be3d9ee95e59f28126e3b9370fba738253fdc3b Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Thu, 27 Apr 2017 11:25:18 -0800
Subject: [PATCH 0759/1563] [XLA] Various HLO naming fixes. This change
 includes a number of fixes to HLO instruction especially fusion instructions.
 Specific changes:

(1) Remove HloInstruction::set_name and HloComputation::set_name. These methods were a bit dangerous as it made easy to create non-unique HLO names. Replace it with UniquifyName which renames the object to a unique name based on its current name.

(2) Change the name of the fusion computations to "fused_computation". Previously it was named after the root.

(3) Change naming of fusion parameters. They are now named after the unfused-instructions whose values they represent. Also, previously superfluous ".1", ".2", etc, could be added to the parameter names. This change fixes that.

(4) Change naming of instructions in fusion computations to be identical to the instructions they were cloned from. Previously all fused instructions would end up having a .clone suffix.

(4) If HloInstruction::Clone() is called with an empty suffix, then don't add a "." to the name.
Change: 154454938
---
 .../compiler/xla/service/hlo_computation.cc   | 36 ++++++--
 .../compiler/xla/service/hlo_computation.h    |  5 +-
 .../compiler/xla/service/hlo_instruction.cc   | 82 ++++++++++---------
 .../compiler/xla/service/hlo_instruction.h    | 10 ++-
 .../xla/service/hlo_instruction_test.cc       | 37 +++++----
 tensorflow/compiler/xla/service/hlo_module.cc |  3 +-
 6 files changed, 104 insertions(+), 69 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_computation.cc b/tensorflow/compiler/xla/service/hlo_computation.cc
index 89371e4497..a749814f0d 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation.cc
@@ -35,10 +35,14 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/gtl/flatset.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/logging.h"
 
 namespace xla {
 
+using ::tensorflow::strings::StrCat;
+
 std::unique_ptr<HloComputation> HloComputation::Builder::Build(
     HloInstruction* root_instruction) {
   int parameter_count = 0;
@@ -91,12 +95,7 @@ HloInstruction* HloComputation::AddInstruction(
 HloInstruction* HloComputation::AddInstructionInternal(
     std::unique_ptr<HloInstruction> instruction) {
   // Generate a unique name for the instruction.
-  instruction->set_name(
-      instruction_name_uniquer_.GetUniqueName(instruction->name()));
-  if (instruction->opcode() == HloOpcode::kParameter) {
-    instruction->set_parameter_name(
-        instruction_name_uniquer_.GetUniqueName(instruction->parameter_name()));
-  }
+  instruction->UniquifyName(&instruction_name_uniquer_);
   Reparent(instruction.get());
   HloInstruction* pinst = instruction.get();
   instruction_iterators_[pinst] =
@@ -131,9 +130,24 @@ Status HloComputation::RemoveParameter(int64 param_no) {
 
   while (param_no < param_instructions_.size()) {
     param_instruction = param_instructions_[param_no];
-    HloInstruction* new_instr = AddInstructionInternal(
-        HloInstruction::CreateParameter(param_no, param_instruction->shape(),
-                                        param_instruction->parameter_name()));
+    string param_name = param_instruction->name();
+    // Fusion parameters are named foo.param_1, bar.param_2, etc. We are
+    // renumbering the parameters so replace the final number in the name with
+    // the updated value.
+    const string param_underscore = ".param_";
+    size_t index = param_name.rfind(param_underscore);
+    if (index == string::npos) {
+      string after_param = name().substr(index + param_underscore.size());
+      int64 numeric_suffix;
+      if (tensorflow::strings::safe_strto64(after_param, &numeric_suffix)) {
+        param_name =
+            StrCat(param_name.substr(0, index), param_underscore, param_no);
+      }
+    }
+
+    HloInstruction* new_instr =
+        AddInstructionInternal(HloInstruction::CreateParameter(
+            param_no, param_instruction->shape(), param_name));
     TF_RETURN_IF_ERROR(param_instruction->ReplaceAllUsesWith(new_instr));
     new_instr->SetParentFusion(root_instruction_->fusion_instruction());
     param_instructions_[param_no] = new_instr;
@@ -672,4 +686,8 @@ std::unique_ptr<HloComputation> HloComputation::Clone(const string& suffix) {
   return result;
 }
 
+void HloComputation::UniquifyName(NameUniquer* name_uniquer) {
+  name_ = name_uniquer->GetUniqueName(name_);
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_computation.h b/tensorflow/compiler/xla/service/hlo_computation.h
index fa274cfc63..62e00a24fb 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.h
+++ b/tensorflow/compiler/xla/service/hlo_computation.h
@@ -133,7 +133,10 @@ class HloComputation {
   }
 
   const string& name() const { return name_; }
-  void set_name(const string& name) { name_ = name; }
+
+  // Use the given NameUniquer to select a unique name for the computation based
+  // on the computation's existing name.
+  void UniquifyName(NameUniquer* name_uniquer);
 
   // Return a string representation of the computation.
   string ToString(int nested_level = 0) const;
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index c9722b942b..d8e01f88b9 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -213,10 +213,10 @@ HloInstruction::CreateGetTupleElement(const Shape& shape,
   auto instruction =
       WrapUnique(new HloInstruction(HloOpcode::kConvolution, shape));
   if (window_util::HasBaseDilation(window)) {
-    instruction->set_name(instruction->name() + "-base-dilated");
+    instruction->name_ = instruction->name() + "-base-dilated";
   }
   if (window_util::HasWindowDilation(window)) {
-    instruction->set_name(instruction->name() + "-window-dilated");
+    instruction->name_ = instruction->name() + "-window-dilated";
   }
   instruction->AppendOperand(lhs);
   instruction->AppendOperand(rhs);
@@ -505,16 +505,8 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
   HloInstruction* clone = nullptr;
   if (fused_instructions_computation_ == nullptr) {
     // New fusion instruction.
-    string computation_name;
-    HloModule* module = GetModule();
-    if (module) {
-      computation_name = module->GetUniqueCompuationName(
-          instruction_to_fuse->name() + ".fusion");
-    } else {
-      computation_name = instruction_to_fuse->name() + ".fusion";
-    }
-    auto builder = HloComputation::Builder(computation_name, true);
-    builder.AddInstruction(instruction_to_fuse->Clone());
+    auto builder = HloComputation::Builder("fused_computation", true);
+    builder.AddInstruction(instruction_to_fuse->Clone(/*suffix=*/""));
     fused_instructions_computation_ = builder.Build();
     clone = fused_expression_root();
     clone->parent_fusion_instruction_ = this;
@@ -522,7 +514,7 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
     CHECK(fused_instructions_computation_ != nullptr &&
           fused_instructions_computation_->IsFusionComputation());
     clone = fused_instructions_computation_->AddInstruction(
-        instruction_to_fuse->Clone());
+        instruction_to_fuse->Clone(/*suffix=*/""));
     clone->parent_fusion_instruction_ = this;
     // instruction_to_fuse is necessarily an operand of the fusion instruction.
     // After fusion this will no longer be the case. Remove the operand from the
@@ -578,8 +570,13 @@ HloInstruction* HloInstruction::CloneAndFuseInternal(
       // instruction. Add it as an operand and add a corresponding fused
       // parameter instruction.
       int64 param_no = fused_parameters_.size();
-      std::unique_ptr<HloInstruction> param_instruction = CreateParameter(
-          param_no, operand->shape(), StrCat("fusion_param.", param_no));
+      // Name the parameter after the instruction it represents in the outer
+      // (non-fusion) computation. Strip the leading "%" from the operand name
+      // to avoid a double %%.
+      string param_name =
+          StrCat(operand->name().substr(1), ".param_", param_no);
+      std::unique_ptr<HloInstruction> param_instruction =
+          CreateParameter(param_no, operand->shape(), param_name);
 
       param_instruction->parent_fusion_instruction_ = this;
       fused_param = fused_instructions_computation_->AddParameter(
@@ -858,32 +855,36 @@ HloInstruction::~HloInstruction() {}
 std::unique_ptr<HloInstruction> HloInstruction::Clone(const string& suffix) {
   std::unique_ptr<HloInstruction> clone =
       CloneWithNewOperands(shape_, operands_);
-  // If an instruction is cloned multiple times avoid names like
-  // foo.suffix.suffix.suffix. Instead of repeating the suffix add a numeric
-  // suffix. Specifically, the clone of foo.suffix is named foo.suffix2, the
-  // clone of foo.suffix2 is named foo.suffix3 and so on.
-  const string dot_suffix = "." + suffix;
-  size_t index = name().rfind(dot_suffix);
-  if (index == string::npos) {
-    // Existing name does not include ".suffix".
-    clone->name_ = name() + dot_suffix;
+  if (suffix.empty()) {
+    clone->name_ = name();
   } else {
-    // Existing name includes ".suffix". Determine if substring after ".suffix"
-    // is numeric and should be replaced with an incremented number.
-    string after_suffix = name().substr(index + dot_suffix.size());
-    if (after_suffix.empty()) {
-      // Existing name ends in ".suffix". New name should end in ".suffix2".
-      clone->name_ = name() + "2";
+    // If an instruction is cloned multiple times avoid names like
+    // foo.suffix.suffix.suffix. Instead of repeating the suffix add a numeric
+    // suffix. Specifically, the clone of foo.suffix is named foo.suffix2, the
+    // clone of foo.suffix2 is named foo.suffix3 and so on.
+    const string dot_suffix = "." + suffix;
+    size_t index = name().rfind(dot_suffix);
+    if (index == string::npos) {
+      // Existing name does not include ".suffix".
+      clone->name_ = name() + dot_suffix;
     } else {
-      // If names ends with .suffix[0-9]+ then replace with a suffix with the
-      // numeric value incremented.
-      int64 numeric_suffix;
-      if (tensorflow::strings::safe_strto64(after_suffix, &numeric_suffix)) {
-        clone->name_ =
-            StrCat(name().substr(0, index), dot_suffix, numeric_suffix + 1);
+      // Existing name includes ".suffix". Determine if substring after
+      // ".suffix" is numeric and should be replaced with an incremented number.
+      string after_suffix = name().substr(index + dot_suffix.size());
+      if (after_suffix.empty()) {
+        // Existing name ends in ".suffix". New name should end in ".suffix2".
+        clone->name_ = name() + "2";
       } else {
-        // Substring after ".suffix" is non-numeric.
-        clone->name_ = name() + dot_suffix;
+        // If names ends with .suffix[0-9]+ then replace with a suffix with the
+        // numeric value incremented.
+        int64 numeric_suffix;
+        if (tensorflow::strings::safe_strto64(after_suffix, &numeric_suffix)) {
+          clone->name_ =
+              StrCat(name().substr(0, index), dot_suffix, numeric_suffix + 1);
+        } else {
+          // Substring after ".suffix" is non-numeric.
+          clone->name_ = name() + dot_suffix;
+        }
       }
     }
   }
@@ -2256,4 +2257,9 @@ HloModule* HloInstruction::GetModule() const {
   }
   return nullptr;
 }
+
+void HloInstruction::UniquifyName(NameUniquer* name_uniquer) {
+  name_ = name_uniquer->GetUniqueName(name_);
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 3a03f28975..1c7d4c19b9 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -34,6 +34,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor.h"
 #include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/name_uniquer.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/core/status.h"
@@ -497,7 +498,9 @@ class HloInstruction {
   // or "elementwise".
   string ToCategory() const;
 
-  // Returns the string concatenation of parent name and this instructions name.
+  // Returns the string concatenation of parent name and this instructions
+  // name. This name is guaranteed to be unique among all instructions in the
+  // HloModule.
   string FullyQualifiedName() const;
 
   // Returns a logging instruction, if the output of this instruction is logged.
@@ -721,8 +724,9 @@ class HloInstruction {
   // this instruction.
   const string& name() const { return name_; }
 
-  // Sets the string identifier for this instruction.
-  void set_name(const string& name) { name_ = name; }
+  // Use the given NameUniquer to select a unique name for the instruction based
+  // on the instruction's existing name.
+  void UniquifyName(NameUniquer* name_uniquer);
 
   // Sets the debug metadata for this instruction.
   void set_metadata(const OpMetadata& metadata) { metadata_ = metadata; }
diff --git a/tensorflow/compiler/xla/service/hlo_instruction_test.cc b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
index d0101ef19c..a226ab0d0c 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction_test.cc
@@ -966,34 +966,39 @@ TEST_F(HloInstructionTest, CloneSuffixNames) {
   // Test that the suffix string added to cloned instructions is not
   // duplicated. Rather a numeric incrementing value should be appended. That
   // is, we want "foo.clone2", not "foo.clone.clone".
-  auto foo = HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.f));
-  foo->set_name("foo");
 
   // Test cloning the same instruction multiple times.
-  EXPECT_EQ(foo->Clone()->name(), "foo.clone");
-  EXPECT_EQ(foo->Clone()->Clone()->name(), "foo.clone2");
-  EXPECT_EQ(foo->Clone()->Clone()->Clone()->name(), "foo.clone3");
+  auto foo =
+      HloInstruction::CreateParameter(0, ShapeUtil::MakeShape(F32, {}), "foo");
+  EXPECT_EQ(foo->Clone()->name(), "%foo.clone");
+  EXPECT_EQ(foo->Clone()->Clone()->name(), "%foo.clone2");
+  EXPECT_EQ(foo->Clone()->Clone()->Clone()->name(), "%foo.clone3");
 
   // Test custom suffixes.
-  EXPECT_EQ(foo->Clone("bar")->name(), "foo.bar");
-  EXPECT_EQ(foo->Clone("bar")->Clone("bar")->name(), "foo.bar2");
-  EXPECT_EQ(foo->Clone("bar")->Clone("bar")->Clone()->name(), "foo.bar2.clone");
+  EXPECT_EQ(foo->Clone("bar")->name(), "%foo.bar");
+  EXPECT_EQ(foo->Clone("bar")->Clone("bar")->name(), "%foo.bar2");
+  EXPECT_EQ(foo->Clone("bar")->Clone("bar")->Clone()->name(),
+            "%foo.bar2.clone");
 
   // Test instruction name with a dot.
-  foo->set_name("foo.baz");
-  EXPECT_EQ(foo->Clone()->name(), "foo.baz.clone");
+  auto foo_baz = HloInstruction::CreateParameter(
+      0, ShapeUtil::MakeShape(F32, {}), "foo.baz");
+  EXPECT_EQ(foo_baz->Clone()->name(), "%foo.baz.clone");
 
   // Test incrementing a large number after the suffix.
-  foo->set_name("foo.clone234");
-  EXPECT_EQ(foo->Clone()->name(), "foo.clone235");
+  auto foo_clone234 = HloInstruction::CreateParameter(
+      0, ShapeUtil::MakeShape(F32, {}), "foo.clone234");
+  EXPECT_EQ(foo_clone234->Clone()->name(), "%foo.clone235");
 
   // Test a non-numeric string after the cloning suffix.
-  foo->set_name("foo.clonexyz");
-  EXPECT_EQ(foo->Clone()->name(), "foo.clonexyz.clone");
+  auto foo_clonexyz = HloInstruction::CreateParameter(
+      0, ShapeUtil::MakeShape(F32, {}), "foo.clonexyz");
+  EXPECT_EQ(foo_clonexyz->Clone()->name(), "%foo.clonexyz.clone");
 
   // Test a name with multiple appearances of the suffix.
-  foo->set_name("foo.clone.clone3");
-  EXPECT_EQ(foo->Clone()->name(), "foo.clone.clone4");
+  auto foo_clone_clone3 = HloInstruction::CreateParameter(
+      0, ShapeUtil::MakeShape(F32, {}), "foo.clone.clone3");
+  EXPECT_EQ(foo_clone_clone3->Clone()->name(), "%foo.clone.clone4");
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/hlo_module.cc b/tensorflow/compiler/xla/service/hlo_module.cc
index 8ed672aa9b..f5e13b4367 100644
--- a/tensorflow/compiler/xla/service/hlo_module.cc
+++ b/tensorflow/compiler/xla/service/hlo_module.cc
@@ -46,8 +46,7 @@ HloModule::HloModule(const string& name)
 
 HloComputation* HloModule::AddComputationInternal(
     std::unique_ptr<HloComputation> computation) {
-  computation->set_name(
-      computation_name_uniquer_.GetUniqueName(computation->name()));
+  computation->UniquifyName(&computation_name_uniquer_);
   computation->set_parent(this);
   computations_.push_back(std::move(computation));
   return computations_.back().get();
-- 
GitLab


From abefca5b71257cf38dfdcacac06152f045f06a13 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 11:36:11 -0800
Subject: [PATCH 0760/1563] Improve docstring. Change: 154456077

---
 tensorflow/contrib/lookup/lookup_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/lookup/lookup_ops.py b/tensorflow/contrib/lookup/lookup_ops.py
index eec197782d..9dc7414cd0 100644
--- a/tensorflow/contrib/lookup/lookup_ops.py
+++ b/tensorflow/contrib/lookup/lookup_ops.py
@@ -882,7 +882,7 @@ def index_table_from_file(vocabulary_file=None,
     name: A name for this op (optional).
 
   Returns:
-    The lookup table to map a string `Tensor` to index `int64` `Tensor`.
+    The lookup table to map a `key_dtype` `Tensor` to index `int64` `Tensor`.
 
   Raises:
     ValueError: If `vocabulary_file` is not set.
-- 
GitLab


From b8e4c4485894daa6e4f2bb3206428cb5421689f3 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 27 Apr 2017 11:57:58 -0800
Subject: [PATCH 0761/1563] Fix the shape function of the StackPush op Change:
 154458671

---
 tensorflow/core/ops/data_flow_ops.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index cb886ae8fa..8b9c92859d 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -1043,7 +1043,10 @@ REGISTER_OP("StackPush")
     .Output("output: T")
     .Attr("T: type")
     .Attr("swap_memory: bool = false")
-    .SetShapeFn(shape_inference::UnknownShape)
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      c->set_output(0, c->input(1));
+      return Status::OK();
+    })
     .Doc(R"doc(
 Push an element onto the stack.
 
-- 
GitLab


From 421aaddb0785a05be5443a78ae480aff6050e4f4 Mon Sep 17 00:00:00 2001
From: Christopher Olston <olston@google.com>
Date: Thu, 27 Apr 2017 12:12:21 -0800
Subject: [PATCH 0762/1563] Add headers to targets in
 tensorflow/contrib/batching/BUILD. Change: 154460280

---
 tensorflow/contrib/batching/BUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/contrib/batching/BUILD b/tensorflow/contrib/batching/BUILD
index 93c00b1f0b..1f1e2db69b 100644
--- a/tensorflow/contrib/batching/BUILD
+++ b/tensorflow/contrib/batching/BUILD
@@ -19,6 +19,7 @@ cc_library(
 
 cc_library(
     name = "batch_scheduler",
+    hdrs = ["batch_scheduler.h"],
     deps = [
         ":batch_scheduler_hdrs",
         "//tensorflow/core:lib",
@@ -49,6 +50,7 @@ cc_library(
 
 cc_library(
     name = "shared_batch_scheduler",
+    hdrs = ["shared_batch_scheduler.h"],
     deps = [
         ":batch_scheduler",
         ":shared_batch_scheduler_hdrs",
-- 
GitLab


From 0172ad021573a6497928b54bb31fd64789450b5c Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 27 Apr 2017 12:18:47 -0800
Subject: [PATCH 0763/1563] [tf contrib seq2seq] Remove extra "attention"
 variable scope str in AttentionWrapper.

Now that RNNCell subclasses Layer, the variable scope already gets an extra
"attention_wrapper" string; so this is redundant.
Change: 154461012
---
 .../seq2seq/python/ops/attention_wrapper.py   | 111 +++++++++---------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 6c181fe832..eba1448c85 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -614,64 +614,63 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       - `next_state` is an instance of `DynamicAttentionWrapperState`
          containing the state calculated at this time step.
     """
-    with variable_scope.variable_scope("attention"):
-      # Step 1: Calculate the true inputs to the cell based on the
-      # previous attention value.
-      cell_inputs = self._cell_input_fn(inputs, state.attention)
-      cell_state = state.cell_state
-      cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
-
-      cell_batch_size = (
-          cell_output.shape[0].value or array_ops.shape(cell_output)[0])
-      error_message = (
-          "When applying AttentionWrapper %s: " % self.name +
-          "Non-matching batch sizes between the memory "
-          "(encoder output) and the query (decoder output).  Are you using "
-          "the BeamSearchDecoder?  You may need to tile your memory input via "
-          "the tf.contrib.seq2seq.tile_batch function with argument "
-          "multiple=beam_width.")
-      with ops.control_dependencies(
-          [check_ops.assert_equal(cell_batch_size,
-                                  self._attention_mechanism.batch_size,
-                                  message=error_message)]):
-        cell_output = array_ops.identity(
-            cell_output, name="checked_cell_output")
-
-      score = self._attention_mechanism(cell_output)
-      alignments = self._probability_fn(score)
-
-      # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
-      expanded_alignments = array_ops.expand_dims(alignments, 1)
-      # Context is the inner product of alignments and values along the
-      # memory time dimension.
-      # alignments shape is
-      #   [batch_size, 1, memory_time]
-      # attention_mechanism.values shape is
-      #   [batch_size, memory_time, attention_mechanism.num_units]
-      # the batched matmul is over memory_time, so the output shape is
-      #   [batch_size, 1, attention_mechanism.num_units].
-      # we then squeeze out the singleton dim.
-      attention_mechanism_values = self._attention_mechanism.values
-      context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
-      context = array_ops.squeeze(context, [1])
-
-      if self._attention_layer is not None:
-        attention = self._attention_layer(
-            array_ops.concat([cell_output, context], 1))
-      else:
-        attention = context
+    # Step 1: Calculate the true inputs to the cell based on the
+    # previous attention value.
+    cell_inputs = self._cell_input_fn(inputs, state.attention)
+    cell_state = state.cell_state
+    cell_output, next_cell_state = self._cell(cell_inputs, cell_state)
+
+    cell_batch_size = (
+        cell_output.shape[0].value or array_ops.shape(cell_output)[0])
+    error_message = (
+        "When applying AttentionWrapper %s: " % self.name +
+        "Non-matching batch sizes between the memory "
+        "(encoder output) and the query (decoder output).  Are you using "
+        "the BeamSearchDecoder?  You may need to tile your memory input via "
+        "the tf.contrib.seq2seq.tile_batch function with argument "
+        "multiple=beam_width.")
+    with ops.control_dependencies(
+        [check_ops.assert_equal(cell_batch_size,
+                                self._attention_mechanism.batch_size,
+                                message=error_message)]):
+      cell_output = array_ops.identity(
+          cell_output, name="checked_cell_output")
+
+    score = self._attention_mechanism(cell_output)
+    alignments = self._probability_fn(score)
+
+    # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
+    expanded_alignments = array_ops.expand_dims(alignments, 1)
+    # Context is the inner product of alignments and values along the
+    # memory time dimension.
+    # alignments shape is
+    #   [batch_size, 1, memory_time]
+    # attention_mechanism.values shape is
+    #   [batch_size, memory_time, attention_mechanism.num_units]
+    # the batched matmul is over memory_time, so the output shape is
+    #   [batch_size, 1, attention_mechanism.num_units].
+    # we then squeeze out the singleton dim.
+    attention_mechanism_values = self._attention_mechanism.values
+    context = math_ops.matmul(expanded_alignments, attention_mechanism_values)
+    context = array_ops.squeeze(context, [1])
+
+    if self._attention_layer is not None:
+      attention = self._attention_layer(
+          array_ops.concat([cell_output, context], 1))
+    else:
+      attention = context
 
-      if self._alignment_history:
-        alignment_history = state.alignment_history.write(
-            state.time, alignments)
-      else:
-        alignment_history = ()
+    if self._alignment_history:
+      alignment_history = state.alignment_history.write(
+          state.time, alignments)
+    else:
+      alignment_history = ()
 
-      next_state = AttentionWrapperState(
-          time=state.time + 1,
-          cell_state=next_cell_state,
-          attention=attention,
-          alignment_history=alignment_history)
+    next_state = AttentionWrapperState(
+        time=state.time + 1,
+        cell_state=next_cell_state,
+        attention=attention,
+        alignment_history=alignment_history)
 
     if self._output_attention:
       return attention, next_state
-- 
GitLab


From 163613d82ec6ed0fd08b038bbf3a04104ffdfbf5 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 27 Apr 2017 12:32:09 -0800
Subject: [PATCH 0764/1563] Clean up constant-folder API. No functional
 changes.

Cleanups:
* Remove a deprecated entry point, update callers to use the Status-returning entry point. Rename DoConstantFoldingWithStatus to ConstantFold, now that we have removed the "without Status" API.
* Hide an internal function from the header.
* Move ConstantFoldingOptions into constant_folding.h
Change: 154462306
---
 .../core/common_runtime/constant_folding.cc   | 24 ++++----
 .../core/common_runtime/constant_folding.h    | 34 +++++------
 .../common_runtime/constant_folding_test.cc   | 57 ++++++++++---------
 .../core/common_runtime/graph_optimizer.cc    |  6 +-
 tensorflow/core/graph/graph_constructor.h     |  9 ---
 .../graph_transforms/fold_constants_lib.cc    |  6 +-
 6 files changed, 62 insertions(+), 74 deletions(-)

diff --git a/tensorflow/core/common_runtime/constant_folding.cc b/tensorflow/core/common_runtime/constant_folding.cc
index 3cd29c8e86..5b604189e1 100644
--- a/tensorflow/core/common_runtime/constant_folding.cc
+++ b/tensorflow/core/common_runtime/constant_folding.cc
@@ -122,6 +122,8 @@ void FindConstantFoldableNodes(const Graph* graph,
   }
 }
 
+typedef std::pair<Node*, int> NodeAndOutput;
+
 // Given the constant foldable nodes in 'nodes', returns a new graph 'g'. 'g'
 // will contain copies of the nodes in 'nodes'. In addition, if there is an edge
 // going from a node 'n' in 'nodes' to another node in 'orig_graph' but not in
@@ -170,8 +172,10 @@ int64 UniqueConstantId() {
   return id.fetch_add(1);
 }
 
-}  // namespace
-
+// Replaces the identified Tensor in 'graph' by a 'Const' node with
+// the value supplied in 'constant'. 'partition_device', if non-null
+// is the device where the graph executes. Returns true if the
+// replacement was successful, false otherwise.
 bool ReplaceTensorWithConstant(Graph* graph, Device* partition_device,
                                NodeAndOutput tensor, const Tensor& constant) {
   // Be conservative when replacing a tensor with a constant, when not
@@ -254,19 +258,11 @@ bool ReplaceTensorWithConstant(Graph* graph, Device* partition_device,
   return true;
 }
 
-bool DoConstantFolding(const ConstantFoldingOptions& opts,
-                       FunctionLibraryRuntime* function_library, Env* env,
-                       Device* partition_device, Graph* graph) {
-  bool was_mutated;
-  Status unused_status = DoConstantFoldingWithStatus(
-      opts, function_library, env, partition_device, graph, &was_mutated);
-  return was_mutated;
-}
+}  // namespace
 
-Status DoConstantFoldingWithStatus(const ConstantFoldingOptions& opts,
-                                   FunctionLibraryRuntime* function_library,
-                                   Env* env, Device* partition_device,
-                                   Graph* graph, bool* was_mutated) {
+Status ConstantFold(const ConstantFoldingOptions& opts,
+                    FunctionLibraryRuntime* function_library, Env* env,
+                    Device* partition_device, Graph* graph, bool* was_mutated) {
   DumpGraph("Before", graph);
 
   const FunctionLibraryDefinition* flib_def = nullptr;
diff --git a/tensorflow/core/common_runtime/constant_folding.h b/tensorflow/core/common_runtime/constant_folding.h
index 9e3479e50b..93289b875f 100644
--- a/tensorflow/core/common_runtime/constant_folding.h
+++ b/tensorflow/core/common_runtime/constant_folding.h
@@ -1,4 +1,4 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,12 +17,20 @@ limitations under the License.
 #define TENSORFLOW_COMMON_RUNTIME_CONSTANT_FOLDING_H_
 
 #include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/framework/function.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/graph/graph.h"
-#include "tensorflow/core/graph/graph_constructor.h"
+#include "tensorflow/core/platform/env.h"
 
 namespace tensorflow {
 
+// Options specific to constant folding optimizations.
+struct ConstantFoldingOptions {
+  // If "consider" is not a nullptr, then only constant fold a node "n" if
+  // consider(n) returns true.
+  std::function<bool(const Node*)> consider = nullptr;
+};
+
 // Perform constant folding optimization on "graph".
 // Looks for nodes in "graph" that can be completely evaluated statically, i.e.,
 // that are only dependent on constants. Evaluates those nodes on a CPU device
@@ -32,25 +40,9 @@ namespace tensorflow {
 // Sets `was_mutated` to true if and only if "graph" has been mutated.
 // The status is only set to a non-OK state if an unexpected error is hit
 // running the graph.
-Status DoConstantFoldingWithStatus(const ConstantFoldingOptions& opts,
-                                   FunctionLibraryRuntime* function_library,
-                                   Env* env, Device* partition_device,
-                                   Graph* graph, bool* was_mutated);
-
-// Version of the function that doesn't return a Status, for backwards
-// compatibility.
-bool DoConstantFolding(const ConstantFoldingOptions& opts,
-                       FunctionLibraryRuntime* function_library, Env* env,
-                       Device* partition_device, Graph* graph);
-
-typedef std::pair<Node*, int> NodeAndOutput;
-
-// Replaces the identified Tensor in 'graph' by a 'Const' node with
-// the value supplied in 'constant'. 'partition_device', if non-null
-// is the device where the graph executes. Returns true if the
-// replacement was successful, false otherwise.
-bool ReplaceTensorWithConstant(Graph* graph, Device* partition_device,
-                               NodeAndOutput tensor, const Tensor& constant);
+Status ConstantFold(const ConstantFoldingOptions& opts,
+                    FunctionLibraryRuntime* function_library, Env* env,
+                    Device* partition_device, Graph* graph, bool* was_mutated);
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/common_runtime/constant_folding_test.cc b/tensorflow/core/common_runtime/constant_folding_test.cc
index 8fe32a704b..a4612aba72 100644
--- a/tensorflow/core/common_runtime/constant_folding_test.cc
+++ b/tensorflow/core/common_runtime/constant_folding_test.cc
@@ -104,8 +104,10 @@ TEST_F(ConstantFoldingTest, Basic) {
   Graph g(OpRegistry::Global());
   TF_ASSERT_OK(s.ToGraph(&g));
 
-  EXPECT_TRUE(DoConstantFolding(ConstantFoldingOptions{}, nullptr,
-                                Env::Default(), nullptr, &g));
+  bool was_mutated;
+  TF_ASSERT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, Env::Default(),
+                            nullptr, &g, &was_mutated));
+  EXPECT_TRUE(was_mutated);
 
   std::unordered_map<string, Node*> index = NodeNameIndex(g);
   Node* s1 = index.at("s1");
@@ -128,7 +130,10 @@ TEST_F(ConstantFoldingTest, ConsiderFunction) {
   ConstantFoldingOptions opts;
   // Do not allow constant folding of m2
   opts.consider = [](const Node* n) { return "m2" != n->name(); };
-  EXPECT_TRUE(DoConstantFolding(opts, nullptr, Env::Default(), nullptr, &g));
+  bool was_mutated;
+  TF_ASSERT_OK(
+      ConstantFold(opts, nullptr, Env::Default(), nullptr, &g, &was_mutated));
+  EXPECT_TRUE(was_mutated);
 
   std::unordered_map<string, Node*> index = NodeNameIndex(g);
   Node* s1 = index.at("s1");
@@ -154,8 +159,10 @@ TEST_F(ConstantFoldingTest, TestNoReplaceAnotherConstant) {
     TF_ASSERT_OK(s.ToGraph(&g));
   }
 
-  EXPECT_TRUE(DoConstantFolding(ConstantFoldingOptions{}, nullptr,
-                                Env::Default(), nullptr, &g));
+  bool was_mutated;
+  TF_ASSERT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, Env::Default(),
+                            nullptr, &g, &was_mutated));
+  EXPECT_TRUE(was_mutated);
 
   std::unordered_map<string, Node*> index = NodeNameIndex(g);
   Node* d = index.at("d");
@@ -180,8 +187,11 @@ TEST_F(ConstantFoldingTest, TwoOutputs) {
     TF_ASSERT_OK(s.ToGraph(&g));
   }
 
-  EXPECT_TRUE(DoConstantFolding(ConstantFoldingOptions{}, nullptr,
-                                Env::Default(), nullptr, &g));
+  bool was_mutated;
+  TF_ASSERT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, Env::Default(),
+                            nullptr, &g, &was_mutated));
+  EXPECT_TRUE(was_mutated);
+
   std::unordered_map<string, Node*> index = NodeNameIndex(g);
   Node* b0 = index.at("b0");
   Node* b1 = index.at("b1");
@@ -209,7 +219,10 @@ TEST_F(ConstantFoldingTest, TwoOutputsFoldOneOutput) {
 
   ConstantFoldingOptions opts;
   opts.consider = [](const Node* n) { return "b1_ident" != n->name(); };
-  EXPECT_TRUE(DoConstantFolding(opts, nullptr, Env::Default(), nullptr, &g));
+  bool was_mutated;
+  TF_ASSERT_OK(
+      ConstantFold(opts, nullptr, Env::Default(), nullptr, &g, &was_mutated));
+  EXPECT_TRUE(was_mutated);
 
   std::unordered_map<string, Node*> index = NodeNameIndex(g);
   Node* b0 = index.at("b0");
@@ -243,11 +256,9 @@ TEST_F(ConstantFoldingTest, TestNoReplaceLargeConstant) {
 
   // The above concat should not have been constant folded.
   bool was_mutated;
-  Status status =
-      DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, &g, &was_mutated);
+  TF_EXPECT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, Env::Default(),
+                            nullptr, &g, &was_mutated));
   EXPECT_FALSE(was_mutated);
-  TF_EXPECT_OK(status);
 }
 
 TEST_F(ConstantFoldingTest, TestNoReplaceFunctionCall) {
@@ -280,11 +291,9 @@ TEST_F(ConstantFoldingTest, TestNoReplaceFunctionCall) {
 
   // The above function call should not have been constant folded.
   bool was_mutated;
-  Status status =
-      DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, &g, &was_mutated);
+  TF_EXPECT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, Env::Default(),
+                            nullptr, &g, &was_mutated));
   EXPECT_FALSE(was_mutated);
-  EXPECT_TRUE(status.ok());
 }
 
 REGISTER_OP("ConstantFoldingTestOp").Input("a: int64").Output("b: int64");
@@ -311,11 +320,9 @@ TEST_F(ConstantFoldingTest, TestNoReplaceNonCPUOp) {
 
   // The non-CPU op should not have been constant folded.
   bool was_mutated;
-  Status status =
-      DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, &g, &was_mutated);
+  TF_EXPECT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, Env::Default(),
+                            nullptr, &g, &was_mutated));
   EXPECT_FALSE(was_mutated);
-  TF_EXPECT_OK(status);
 }
 
 namespace {
@@ -392,15 +399,13 @@ TEST_F(ConstantFoldingTest, TestImmutableConst) {
   TF_ASSERT_OK(root.ToGraph(&g));
   TestTFEnvironment test_env;
   bool was_mutated;
-  Status status =
-      DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                  Env::Default(), nullptr, &g, &was_mutated);
+  Status status = ConstantFold(ConstantFoldingOptions{}, nullptr,
+                               Env::Default(), nullptr, &g, &was_mutated);
   EXPECT_FALSE(was_mutated);
   EXPECT_FALSE(status.ok());
-  status = DoConstantFoldingWithStatus(ConstantFoldingOptions{}, nullptr,
-                                       &test_env, nullptr, &g, &was_mutated);
+  TF_EXPECT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, &test_env,
+                            nullptr, &g, &was_mutated));
   EXPECT_TRUE(was_mutated);
-  TF_EXPECT_OK(status);
 }
 
 }  // namespace
diff --git a/tensorflow/core/common_runtime/graph_optimizer.cc b/tensorflow/core/common_runtime/graph_optimizer.cc
index 68496cb729..edfecfae06 100644
--- a/tensorflow/core/common_runtime/graph_optimizer.cc
+++ b/tensorflow/core/common_runtime/graph_optimizer.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/constant_folding.h"
 #include "tensorflow/core/common_runtime/function.h"
 #include "tensorflow/core/graph/algorithm.h"
+#include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/graph/node_builder.h"
 #include "tensorflow/core/graph/optimizer_cse.h"
 
@@ -56,7 +57,10 @@ void GraphOptimizer::Optimize(FunctionLibraryRuntime* runtime, Env* env,
 
     if (opts_.do_constant_folding()) {
       ConstantFoldingOptions cf_opts;
-      if (DoConstantFolding(cf_opts, runtime, env, device, g)) {
+      bool was_mutated;
+      ConstantFold(cf_opts, runtime, env, device, g, &was_mutated)
+          .IgnoreError();
+      if (was_mutated) {
         RemoveDeadNodes(g);
         DumpGraph("ConstFolding", g);
         changed = true;
diff --git a/tensorflow/core/graph/graph_constructor.h b/tensorflow/core/graph/graph_constructor.h
index 186859d132..9b80f211fc 100644
--- a/tensorflow/core/graph/graph_constructor.h
+++ b/tensorflow/core/graph/graph_constructor.h
@@ -24,15 +24,6 @@ limitations under the License.
 namespace tensorflow {
 class ShapeRefiner;
 
-// Options specific to constant folding optimizations.
-//
-// TODO(ashankar,vrv): This should move to where constant folding is done.
-struct ConstantFoldingOptions {
-  // If "consider" is not a nullptr, then only constant fold a node "n" if
-  // consider(n) returns true.
-  std::function<bool(const Node*)> consider = nullptr;
-};
-
 // Construct a Graph *g out of a GraphDef gdef. Returns non-OK on
 // error, in which case *g is left in an incomplete state.
 //
diff --git a/tensorflow/tools/graph_transforms/fold_constants_lib.cc b/tensorflow/tools/graph_transforms/fold_constants_lib.cc
index 466e61b42d..6f44da7ee0 100644
--- a/tensorflow/tools/graph_transforms/fold_constants_lib.cc
+++ b/tensorflow/tools/graph_transforms/fold_constants_lib.cc
@@ -152,9 +152,9 @@ Status FoldConstants(const GraphDef& input_graph_def,
       &input_graph, context.input_names, context.output_names, {},
       device_attributes, false /* use_function_convention */, &metadata));
   bool was_mutated;
-  TF_RETURN_IF_ERROR(DoConstantFoldingWithStatus(
-      ConstantFoldingOptions(), nullptr, Env::Default(), nullptr, &input_graph,
-      &was_mutated));
+  TF_RETURN_IF_ERROR(ConstantFold(ConstantFoldingOptions(), nullptr,
+                                  Env::Default(), nullptr, &input_graph,
+                                  &was_mutated));
   GraphDef folded_graph_def;
   input_graph.ToGraphDef(&folded_graph_def);
   GraphDef send_recvs_replaced;
-- 
GitLab


From 80581f852c784d8dc1aa937d4f5193a79e236a0a Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Thu, 27 Apr 2017 12:56:30 -0800
Subject: [PATCH 0765/1563] support non-list Variable in
 safe_embedding_lookup_sparse. Change: 154465673

---
 tensorflow/contrib/layers/python/layers/embedding_ops.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/layers/python/layers/embedding_ops.py b/tensorflow/contrib/layers/python/layers/embedding_ops.py
index f231ee3859..f8f4122d1d 100644
--- a/tensorflow/contrib/layers/python/layers/embedding_ops.py
+++ b/tensorflow/contrib/layers/python/layers/embedding_ops.py
@@ -100,7 +100,13 @@ def safe_embedding_lookup_sparse(embedding_weights,
     logging.warn("The default value of combiner will change from \"mean\" "
                  "to \"sqrtn\" after 2016/11/01.")
     combiner = "mean"
-  if embedding_weights is None or len(embedding_weights) < 1:
+  if embedding_weights is None:
+    raise ValueError("Missing embedding_weights %s." % embedding_weights)
+  if isinstance(embedding_weights, variables.PartitionedVariable):
+    embedding_weights = list(embedding_weights)  # get underlying Variables.
+  if not isinstance(embedding_weights, list):
+    embedding_weights = [embedding_weights]
+  if len(embedding_weights) < 1:
     raise ValueError("Missing embedding_weights %s." % embedding_weights)
 
   dtype = sparse_weights.dtype if sparse_weights is not None else None
-- 
GitLab


From fa8381593d0cbe354cb54d691e0a8c42bf4b69d0 Mon Sep 17 00:00:00 2001
From: Christopher Olston <olston@google.com>
Date: Thu, 27 Apr 2017 13:32:09 -0800
Subject: [PATCH 0766/1563] Move Batch op input validation before enqueueing to
 the batch scheduler, because earlier error detection is better (and also so
 batch->size() doesn't crash if #dims==0 :). Change: 154470659

---
 .../contrib/batching/kernels/batch_kernels.cc | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/tensorflow/contrib/batching/kernels/batch_kernels.cc b/tensorflow/contrib/batching/kernels/batch_kernels.cc
index 5598d11f75..7f9fc447b1 100644
--- a/tensorflow/contrib/batching/kernels/batch_kernels.cc
+++ b/tensorflow/contrib/batching/kernels/batch_kernels.cc
@@ -239,7 +239,18 @@ class BatchResource : public ResourceBase {
     OpInputList tensors;
     TF_RETURN_IF_ERROR(context->input_list("in_tensors", &tensors));
     for (int i = 0; i < tensors.size(); ++i) {
-      batch_components->inputs.push_back(tensors[i]);
+      const Tensor& tensor = tensors[i];
+      if (tensor.shape().dims() == 0) {
+        return errors::InvalidArgument(
+            "Batching input tensors must have at least one dimension");
+      }
+      if (tensors.size() >= 2 &&
+          tensor.shape().dim_size(0) != tensors[0].shape().dim_size(0)) {
+        return errors::InvalidArgument(
+            "Batching input tensors supplied in a given op invocation must "
+            "have equal 0th-dimension size");
+      }
+      batch_components->inputs.push_back(tensor);
     }
     batch_components->context = context;
     batch_components->done_callback = std::move(done_callback);
@@ -279,21 +290,6 @@ class BatchResource : public ResourceBase {
         return errors::InvalidArgument(
             "Batching inputs must have equal number of edges");
       }
-
-      for (int edge = 0; edge < task.inputs.size(); ++edge) {
-        const Tensor& tensor = task.inputs[edge];
-
-        if (tensor.shape().dims() == 0) {
-          return errors::InvalidArgument(
-              "Batching input tensors must have at least one dimension");
-        }
-
-        if (tensor.shape().dim_size(0) != task.inputs[0].shape().dim_size(0)) {
-          return errors::InvalidArgument(
-              "Batching input tensors supplied in a given op invocation must "
-              "have equal 0th-dimension size");
-        }
-      }
     }
 
     return Status::OK();
-- 
GitLab


From 85827b2356d33e54d2e1413fc2005b08cde72f8b Mon Sep 17 00:00:00 2001
From: Alex Rothberg <agrothberg@gmail.com>
Date: Thu, 27 Apr 2017 17:51:34 -0400
Subject: [PATCH 0767/1563] Cleanup label mapping code in ios_example camera
 app (#9490)

---
 .../ios_examples/camera/CameraExampleViewController.mm        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
index 20c49d5b6a..27df3d3d71 100644
--- a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
+++ b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
@@ -323,10 +323,10 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
       auto predictions = output->flat<float>();
 
       NSMutableDictionary *newValues = [NSMutableDictionary dictionary];
-      for (int index = 0; index < predictions.size(); index += 1) {
+      for (int index = 0; index < predictions.size(); ++index) {
         const float predictionValue = predictions(index);
         if (predictionValue > 0.05f) {
-          std::string label = labels[index % predictions.size()];
+          std::string label = labels[index];
           NSString *labelObject = [NSString stringWithUTF8String:label.c_str()];
           NSNumber *valueObject = [NSNumber numberWithFloat:predictionValue];
           [newValues setObject:valueObject forKey:labelObject];
-- 
GitLab


From 39f51e6366e6cae71a09efb8c8ced2ff2dad15b6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 13:44:05 -0800
Subject: [PATCH 0768/1563] Store the number of trees and layers that were
 attempted to be built. Useful to terminate training. Also can be used as
 seeds for random operations. Change: 154472242

---
 .../contrib/boosted_trees/proto/tree_config.proto    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tensorflow/contrib/boosted_trees/proto/tree_config.proto b/tensorflow/contrib/boosted_trees/proto/tree_config.proto
index 62856b6829..a789966053 100644
--- a/tensorflow/contrib/boosted_trees/proto/tree_config.proto
+++ b/tensorflow/contrib/boosted_trees/proto/tree_config.proto
@@ -117,9 +117,21 @@ message DecisionTreeMetadata {
   bool is_finalized = 3;
 }
 
+message GrowingMetadata {
+  // Number of trees that we have attempted to build. After pruning, these
+  // trees might have been removed.
+  int64 num_trees_attempted = 1;
+  // Number of layers that we have attempted to build. After pruning, these
+  // layers might have been removed.
+  int64 num_layers_attempted = 2;
+}
+
 // DecisionTreeEnsembleConfig describes an ensemble of decision trees.
 message DecisionTreeEnsembleConfig {
   repeated DecisionTreeConfig trees = 1;
   repeated float tree_weights = 2;
   repeated DecisionTreeMetadata tree_metadata = 3;
+
+  // Metadata that is used during the training.
+  GrowingMetadata growing_metadata = 4;
 }
-- 
GitLab


From b282159e438ca1cffb94a44fc21022ca8ffb49fa Mon Sep 17 00:00:00 2001
From: Christopher Olston <olston@google.com>
Date: Thu, 27 Apr 2017 13:50:31 -0800
Subject: [PATCH 0769/1563] Eliminate 'xrange' usage from batch_ops.py, for
 better python version compatibility. Change: 154473140

---
 tensorflow/contrib/batching/python/ops/batch_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/batching/python/ops/batch_ops.py b/tensorflow/contrib/batching/python/ops/batch_ops.py
index e50c3fdff4..867ee6dfbc 100644
--- a/tensorflow/contrib/batching/python/ops/batch_ops.py
+++ b/tensorflow/contrib/batching/python/ops/batch_ops.py
@@ -36,7 +36,7 @@ _batch_ops = loader.load_op_library(
 def _BatchGrad(op, *out_grads):  # pylint: disable=invalid-name
   """Gradient for batch op."""
   gradients = []
-  for i in xrange(len(op.inputs)):
+  for i in range(len(op.inputs)):
     gradients.append(
         gen_batch_ops.unbatch(
             out_grads[i],
-- 
GitLab


From 6fede95a1bbf11349a1c44fd1b85ac326cb43915 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 27 Apr 2017 13:54:18 -0800
Subject: [PATCH 0770/1563] AutoReloadVariable and VarHandleOp are variables.
 Change: 154473636

---
 tensorflow/core/grappler/op_types.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/op_types.cc b/tensorflow/core/grappler/op_types.cc
index 266d74976f..bafbcc200c 100644
--- a/tensorflow/core/grappler/op_types.cc
+++ b/tensorflow/core/grappler/op_types.cc
@@ -32,7 +32,8 @@ bool IsPlaceholder(const NodeDef& node) {
 
 bool IsVariable(const NodeDef& node) {
   const auto op = node.op();
-  return op == "Variable" || op == "VariableV2";
+  return op == "Variable" || op == "VariableV2" || op == "AutoReloadVariable" ||
+         op == "VarHandleOp";
 }
 
 }  // end namespace grappler
-- 
GitLab


From 8154a077e8e6b41c191650125129a9b333cfcfd7 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 27 Apr 2017 14:47:40 -0800
Subject: [PATCH 0771/1563] [TF:XLA] Remove temporary registrations for control
 flow operators on XLA_ devices.

The registrations seem to be causing more trouble than they are worth.
Change: 154480448
---
 tensorflow/compiler/jit/xla_device_ops.h     | 20 ------------
 tensorflow/compiler/tests/xla_device_test.py | 33 --------------------
 2 files changed, 53 deletions(-)

diff --git a/tensorflow/compiler/jit/xla_device_ops.h b/tensorflow/compiler/jit/xla_device_ops.h
index a52239df25..8699006ebc 100644
--- a/tensorflow/compiler/jit/xla_device_ops.h
+++ b/tensorflow/compiler/jit/xla_device_ops.h
@@ -63,30 +63,10 @@ class XlaDeviceDummyOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(Name("PlaceholderV2").Device(DEVICE),                \
                           PlaceholderOp);                                      \
                                                                                \
-  REGISTER_KERNEL_BUILDER(Name("ControlTrigger").Device(DEVICE),               \
-                          ControlTriggerOp);                                   \
-  REGISTER_KERNEL_BUILDER(Name("Enter").Device(DEVICE), EnterOp);              \
-  REGISTER_KERNEL_BUILDER(Name("Exit").Device(DEVICE), ExitOp);                \
-  REGISTER_KERNEL_BUILDER(Name("NextIteration").Device(DEVICE),                \
-                          NextIterationOp);                                    \
-  REGISTER_KERNEL_BUILDER(Name("Switch").Device(DEVICE).HostMemory("pred"),    \
-                          SwitchOp);                                           \
-  REGISTER_KERNEL_BUILDER(                                                     \
-      Name("Merge").Device(DEVICE).HostMemory("value_index"), MergeOp);        \
-  REGISTER_KERNEL_BUILDER(Name("LoopCond")                                     \
-                              .Device(DEVICE)                                  \
-                              .HostMemory("input")                             \
-                              .HostMemory("output"),                           \
-                          IdentityOp);                                         \
-                                                                               \
   REGISTER_KERNEL_BUILDER(                                                     \
       Name("VarHandleOp").Device(DEVICE).HostMemory("resource"),               \
       ResourceHandleOp<Var>);
 
-// TODO(b/32507444): the registrations for the control flow operators are
-// temporary and exist primarily to work around a bug in the graph partitioning
-// code.
-
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_COMPILER_JIT_XLA_DEVICE_OPS_H_
diff --git a/tensorflow/compiler/tests/xla_device_test.py b/tensorflow/compiler/tests/xla_device_test.py
index 1388a892ba..f5c228f830 100644
--- a/tensorflow/compiler/tests/xla_device_test.py
+++ b/tensorflow/compiler/tests/xla_device_test.py
@@ -18,15 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import numpy as np
-
 from tensorflow.python.client import session as session_lib
-from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 
 
@@ -48,34 +43,6 @@ class XlaDeviceTest(test.TestCase):
       result = sess.run(w, {x: [1.5, 0.5]})
     self.assertAllClose(result, [12., 2.], rtol=1e-3)
 
-  def testLoops(self):
-    """Tests that loops work on XLA devices."""
-
-    with session_lib.Session() as session:
-      x = array_ops.placeholder(dtypes.float32)
-      with ops.device("device:XLA_CPU:0"):
-        c = lambda i, _: math_ops.less(i, 5)
-        b = lambda i, x: (i + 1, x * 2.0 + 1.0)
-        _, y = control_flow_ops.while_loop(c, b, (constant_op.constant(0), x))
-
-      result = session.run(y, {x: np.float32(2)})
-      self.assertAllClose(result, np.float32(95), rtol=1e-3)
-
-  def testCond(self):
-    """Tests that tf.cond works on XLA devices."""
-
-    with session_lib.Session() as session:
-      x = array_ops.placeholder(dtypes.float32)
-      y = array_ops.placeholder(dtypes.float32)
-      c = array_ops.placeholder(dtypes.bool)
-      with ops.device("device:XLA_CPU:0"):
-        z = x + 1.0
-        w = control_flow_ops.cond(c, lambda: z, lambda: y)
-        t = math_ops.add(z, w)
-
-      result = session.run(t, {x: np.float32(2), y: np.float32(4), c: True})
-      self.assertAllClose(result, np.float32(6), rtol=1e-3)
-
 
 if __name__ == "__main__":
   test.main()
-- 
GitLab


From 46ac99f4c2f4fed6f6d1cd5156dc8b5e921dc4a8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 14:51:19 -0800
Subject: [PATCH 0772/1563] [XLA:HLO] Make
 MetricTableReport::SetShowAllEntries() show all category entries. Change:
 154480880

---
 tensorflow/compiler/xla/metric_table_report.cc | 18 +++++++++---------
 tensorflow/compiler/xla/metric_table_report.h  |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tensorflow/compiler/xla/metric_table_report.cc b/tensorflow/compiler/xla/metric_table_report.cc
index cd7c42f6e1..0d4ddc2392 100644
--- a/tensorflow/compiler/xla/metric_table_report.cc
+++ b/tensorflow/compiler/xla/metric_table_report.cc
@@ -38,7 +38,8 @@ void MetricTableReport::SetEntryName(string entry_name) {
 
 void MetricTableReport::SetShowAllEntries() {
   max_entries_to_show_ = std::numeric_limits<int64>::max();
-  max_metric_proportion_to_show = 1.1;  // more than 100%
+  max_entries_per_category_to_show_ = std::numeric_limits<int64>::max();
+  max_metric_proportion_to_show_ = 1.1;  // more than 100%
 }
 
 void MetricTableReport::SetShowCategoryTable() { show_category_table_ = true; }
@@ -141,7 +142,7 @@ void MetricTableReport::AppendCategoryTable() {
   int64 categories_shown = 0;
   for (const auto& category : categories) {
     if (categories_shown >= max_entries_to_show_ ||
-        metric_sum / expected_metric_sum_ > max_metric_proportion_to_show) {
+        metric_sum / expected_metric_sum_ > max_metric_proportion_to_show_) {
       break;
     }
     ++categories_shown;
@@ -156,15 +157,14 @@ void MetricTableReport::AppendCategoryTable() {
                                    entry_name_, ")");
     AppendTableRow(text, category.metric_sum, metric_sum);
 
-    // Show the top few entries in the category.
-    const int64 kMaxToShow = 5;
+    // Show the top entries in the category.
     const char* const kIndentPrefix = "                              * ";
-    int64 entries_to_show =
-        std::min<int64>(kMaxToShow, category.entries.size());
-    if (category.entries.size() == kMaxToShow + 1) {
+    int64 entries_to_show = std::min<int64>(max_entries_per_category_to_show_,
+                                            category.entries.size());
+    if (category.entries.size() == entries_to_show + 1) {
       // May as well show the last entry on the line that would otherwise say
       // that there is a single entry not shown.
-      entries_to_show = category.entries.size();
+      ++entries_to_show;
     }
     for (int64 i = 0; i < entries_to_show; ++i) {
       AppendLine(kIndentPrefix, MetricPercent(category.entries[i]->metric), " ",
@@ -193,7 +193,7 @@ void MetricTableReport::AppendEntryTable() {
   int64 entries_shown = 0;
   for (const auto& entry : entries_) {
     if (entries_shown >= max_entries_to_show_ ||
-        metric_sum / expected_metric_sum_ > max_metric_proportion_to_show) {
+        metric_sum / expected_metric_sum_ > max_metric_proportion_to_show_) {
       break;
     }
     ++entries_shown;
diff --git a/tensorflow/compiler/xla/metric_table_report.h b/tensorflow/compiler/xla/metric_table_report.h
index e967627bff..818fb1d3fe 100644
--- a/tensorflow/compiler/xla/metric_table_report.h
+++ b/tensorflow/compiler/xla/metric_table_report.h
@@ -103,6 +103,7 @@ class MetricTableReport {
  private:
   static constexpr double kDefaultMaxMetricProportionToShow = 0.99;
   static constexpr int64 kDefaultMaxEntriesToShow = 100;
+  static constexpr int64 kDefaultMaxEntriesPerCategoryToShow = 5;
 
   // Append all parameters to the report.
   template <typename... Args>
@@ -162,7 +163,8 @@ class MetricTableReport {
 
   // These members control how many categories and entries to show in tables.
   int64 max_entries_to_show_ = kDefaultMaxEntriesToShow;
-  double max_metric_proportion_to_show = kDefaultMaxMetricProportionToShow;
+  int64 max_entries_per_category_to_show_ = kDefaultMaxEntriesPerCategoryToShow;
+  double max_metric_proportion_to_show_ = kDefaultMaxMetricProportionToShow;
 
   // The report that is being created.
   string report_;
-- 
GitLab


From c721b6a275cde794a5a45d505aa25e0cd4abe050 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 14:52:03 -0800
Subject: [PATCH 0773/1563] [TF:XLA] Added ReplaceWithNewInstruction() helper
 function

Refactored the algebraic optimizer to replace many calls to
computation->ReplaceWithNewInstruction() + changed=true, with a single call
to the helper function.
Change: 154480997
---
 .../xla/service/algebraic_simplifier.cc       | 82 ++++++++-----------
 1 file changed, 36 insertions(+), 46 deletions(-)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 4c80919bb8..6cd8c9158c 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -220,6 +220,18 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
   StatusOr<bool> TryToSinkReshapeOrBroadcastAfterOpWithUniqueNonScalarOperand(
       HloInstruction* reshape_or_broadcast);
 
+  // Replaces the existing HLO instruction old_instruction, with
+  // new_instruction, and marks the optimizer status as changed.
+  // Returns the Status representing the result of the replace operation.
+  Status ReplaceWithNewInstruction(
+      HloInstruction* old_instruction,
+      std::unique_ptr<HloInstruction> new_instruction) {
+    TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
+        old_instruction, std::move(new_instruction)));
+    changed_ = true;
+    return Status::OK();
+  }
+
   // Current HloComputation instance the AlgebraicSimplifierVisitor is
   // traversing.
   HloComputation* computation_;
@@ -433,8 +445,7 @@ Status AlgebraicSimplifierVisitor::HandleDivide(HloInstruction* divide,
         computation_->AddInstruction(HloInstruction::CreateBinary(
             divide->shape(), HloOpcode::kSubtract, lhs->mutable_operand(0),
             rhs->mutable_operand(0)));
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         divide, HloInstruction::CreateUnary(divide->shape(), HloOpcode::kExp,
                                             subtract));
   }
@@ -461,8 +472,7 @@ Status AlgebraicSimplifierVisitor::HandleDot(HloInstruction* dot,
       ShapeUtil::HasZeroElements(rhs->shape())) {
     auto zero = computation_->AddInstruction(
         HloInstruction::CreateConstant(LiteralUtil::CreateR0(0.0f)));
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         dot, HloInstruction::CreateBroadcast(dot->shape(), zero, {}));
   }
 
@@ -471,8 +481,7 @@ Status AlgebraicSimplifierVisitor::HandleDot(HloInstruction* dot,
     auto new_dot = computation_->AddInstruction(HloInstruction::CreateBinary(
         ShapeUtil::PermuteDimensions({1, 0}, dot->shape()), HloOpcode::kDot,
         rhs->mutable_operand(0), lhs->mutable_operand(0)));
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         dot, HloInstruction::CreateTranspose(dot->shape(), new_dot, {1, 0}));
   }
 
@@ -480,8 +489,7 @@ Status AlgebraicSimplifierVisitor::HandleDot(HloInstruction* dot,
   //
   // A dot(a[M, 1], b[1, N]) = multiply(a [M,1], b [1, N])
   if (ShapeUtil::Rank(rhs->shape()) == 2 && rhs->shape().dimensions(0) == 1) {
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         dot, HloInstruction::CreateBinary(dot->shape(), HloOpcode::kMultiply,
                                           lhs, rhs));
   }
@@ -505,8 +513,7 @@ Status AlgebraicSimplifierVisitor::HandleDot(HloInstruction* dot,
     auto reduce = computation_->AddInstruction(HloInstruction::CreateReduce(
         ShapeUtil::MakeShape(dot->shape().element_type(), {}), multiply, zero,
         {0}, add_reduce_computation));
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         dot, HloInstruction::CreateReshape(dot->shape(), reduce));
   }
 
@@ -545,8 +552,7 @@ Status AlgebraicSimplifierVisitor::HandleDot(HloInstruction* dot,
                                {rhs->shape().dimensions(1)}),
           multiply, zero, {0}, add_reduce_computation));
     }
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         dot, HloInstruction::CreateReshape(dot->shape(), reduce));
   }
 
@@ -572,8 +578,7 @@ Status AlgebraicSimplifierVisitor::HandleDot(HloInstruction* dot,
         ShapeUtil::MakeShape(dot->shape().element_type(),
                              {lhs->shape().dimensions(0)}),
         multiply, zero, {1}, add_reduce_computation));
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         dot, HloInstruction::CreateReshape(dot->shape(), reduce));
   }
   return Status::OK();
@@ -712,8 +717,7 @@ Status AlgebraicSimplifierVisitor::HandleBroadcast(HloInstruction* broadcast) {
           ShapeUtil::ElementsIn(operand->shape())) {
     VLOG(10) << "transform broadcast(X) -> reshape(X) where "
                 "n(broadcast(X)) == n(X)";
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         broadcast, HloInstruction::CreateReshape(broadcast->shape(), operand));
   }
 
@@ -725,8 +729,7 @@ Status AlgebraicSimplifierVisitor::HandleBroadcast(HloInstruction* broadcast) {
           ShapeUtil::ElementsIn(operand->shape())) {
     VLOG(10) << "transform broadcast(X) -> transpose(X) where "
                 "n(broadcast(X)) == n(X)";
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         broadcast, HloInstruction::CreateTranspose(broadcast->shape(), operand,
                                                    broadcast->dimensions()));
   }
@@ -746,8 +749,7 @@ Status AlgebraicSimplifierVisitor::HandleBroadcast(HloInstruction* broadcast) {
       for (auto inserted_index : inserted_indices) {
         dims.erase(dims.begin() + inserted_index);
       }
-      changed_ = true;
-      return computation_->ReplaceWithNewInstruction(
+      return ReplaceWithNewInstruction(
           broadcast,
           HloInstruction::CreateBroadcast(broadcast->shape(),
                                           operand->mutable_operand(0), dims));
@@ -864,9 +866,7 @@ Status AlgebraicSimplifierVisitor::HandleConvert(HloInstruction* convert,
     const Literal& src_literal = operand->literal();
     std::unique_ptr<HloInstruction> new_constant =
         ConvertIfSrcTypeMatches(src_literal, dest_type);
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(convert,
-                                                   std::move(new_constant));
+    return ReplaceWithNewInstruction(convert, std::move(new_constant));
   }
   return Status::OK();
 }
@@ -952,8 +952,7 @@ Status AlgebraicSimplifierVisitor::HandlePad(HloInstruction* pad) {
 
     std::unique_ptr<HloInstruction> slice = HloInstruction::CreateSlice(
         pad->shape(), nonzero_pad, start_indices, end_indices);
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(pad, std::move(slice));
+    return ReplaceWithNewInstruction(pad, std::move(slice));
   }
 
   return Status::OK();
@@ -973,8 +972,7 @@ Status AlgebraicSimplifierVisitor::HandlePower(HloInstruction* power,
       ones = HloInstruction::CreateBroadcast(
           power->shape(), computation_->AddInstruction(std::move(one)), {});
     }
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(power, std::move(ones));
+    return ReplaceWithNewInstruction(power, std::move(ones));
   }
 
   VLOG(10) << "trying transform [pow(A, 1) => A]: " << power->ToString();
@@ -984,8 +982,7 @@ Status AlgebraicSimplifierVisitor::HandlePower(HloInstruction* power,
 
   VLOG(10) << "trying transform [pow(A, 2) => A*A]: " << power->ToString();
   if (IsLiteralWithValue(rhs, 2)) {
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         power, HloInstruction::CreateBinary(power->shape(),
                                             HloOpcode::kMultiply, lhs, lhs));
   }
@@ -995,8 +992,7 @@ Status AlgebraicSimplifierVisitor::HandlePower(HloInstruction* power,
     auto* one = computation_->AddInstruction(
         HloInstruction::CreateConstant(LiteralUtil::CloneToUnique(
             LiteralUtil::One(rhs->shape().element_type()))));
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         power, HloInstruction::CreateBinary(power->shape(), HloOpcode::kDivide,
                                             one, lhs));
   }
@@ -1083,8 +1079,7 @@ Status AlgebraicSimplifierVisitor::HandleReshape(HloInstruction* reshape) {
 
   // Merge reshapes.
   if (HloOpcode::kReshape == operand->opcode()) {
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         reshape, HloInstruction::CreateReshape(reshape->shape(),
                                                operand->mutable_operand(0)));
   }
@@ -1093,8 +1088,7 @@ Status AlgebraicSimplifierVisitor::HandleReshape(HloInstruction* reshape) {
     auto opt_dims = ReshapeLeavesDimensionsUnmodified(
         reshape, reshape->operand(0)->dimensions());
     if (opt_dims.first) {
-      changed_ = true;
-      return computation_->ReplaceWithNewInstruction(
+      return ReplaceWithNewInstruction(
           reshape,
           HloInstruction::CreateBroadcast(
               reshape->shape(), reshape->mutable_operand(0)->mutable_operand(0),
@@ -1151,9 +1145,8 @@ Status AlgebraicSimplifierVisitor::HandleSlice(HloInstruction* slice,
                                       literal.get(), dest_indices,
                                       AsInt64Slice(shape.dimensions()));
     if (status.ok()) {
-      TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
+      TF_CHECK_OK(ReplaceWithNewInstruction(
           slice, HloInstruction::CreateConstant(std::move(literal))));
-      changed_ = true;
     } else {
       VLOG(1) << "Error while creating sliced literal : " << status;
     }
@@ -1166,7 +1159,7 @@ Status AlgebraicSimplifierVisitor::HandleReduce(
     tensorflow::gtl::ArraySlice<int64> dimensions, HloComputation* function) {
   if (ShapeUtil::HasZeroElements(arg->shape()) ||
       ShapeUtil::HasZeroElements(reduce->shape())) {
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         reduce,
         HloInstruction::CreateBroadcast(reduce->shape(), init_value, {}));
     return Status::OK();
@@ -1179,7 +1172,7 @@ Status AlgebraicSimplifierVisitor::HandleReduce(
     for (auto dim : dimensions) {
       new_reduce_dimensions.push_back(transpose_dimensions[dim]);
     }
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         reduce, HloInstruction::CreateReduce(
                     reduce->shape(), arg->mutable_operand(0), init_value,
                     new_reduce_dimensions, function));
@@ -1223,7 +1216,7 @@ Status AlgebraicSimplifierVisitor::HandleReduce(
           new_reduce_dimensions.push_back(i);
         }
       }
-      return computation_->ReplaceWithNewInstruction(
+      return ReplaceWithNewInstruction(
           reduce, HloInstruction::CreateReduce(
                       reduce->shape(), arg->mutable_operand(0), init_value,
                       new_reduce_dimensions, function));
@@ -1234,8 +1227,7 @@ Status AlgebraicSimplifierVisitor::HandleReduce(
       ShapeUtil::HasZeroElements(arg->shape())) {
     auto reshape = computation_->AddInstruction(
         HloInstruction::CreateReshape(reduce->shape(), arg));
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         reduce, HloInstruction::CreateMap(reduce->shape(),
                                           {reshape, init_value}, function));
   }
@@ -1253,8 +1245,7 @@ Status AlgebraicSimplifierVisitor::HandleTranspose(HloInstruction* transpose) {
   }
 
   if (HloOpcode::kTranspose == operand->opcode()) {
-    changed_ = true;
-    return computation_->ReplaceWithNewInstruction(
+    return ReplaceWithNewInstruction(
         transpose, HloInstruction::CreateTranspose(
                        transpose->shape(), operand->mutable_operand(0),
                        ComposePermutations(operand->dimensions(),
@@ -1397,8 +1388,7 @@ bool AlgebraicSimplifierVisitor::TransformToClampIfSameShape(
 
   auto clamp = HloInstruction::CreateTernary(root->shape(), HloOpcode::kClamp,
                                              max_operand, operand, min_operand);
-  TF_CHECK_OK(computation_->ReplaceWithNewInstruction(root, std::move(clamp)));
-  changed_ = true;
+  TF_CHECK_OK(ReplaceWithNewInstruction(root, std::move(clamp)));
   return true;
 }
 
-- 
GitLab


From db4d5ec4136493a9d96845a1d9d97d6bc5ce2005 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 15:16:51 -0800
Subject: [PATCH 0774/1563] Pass attention_wrapper's name to super. Change:
 154483923

---
 tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index eba1448c85..9fc548aabe 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -478,7 +478,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         behavior is not guaranteed.
       name: Name to use when creating ops.
     """
-    super(AttentionWrapper, self).__init__()
+    super(AttentionWrapper, self).__init__(name=name)
     if not isinstance(cell, core_rnn_cell.RNNCell):
       raise TypeError(
           "cell must be an RNNCell, saw type: %s" % type(cell).__name__)
-- 
GitLab


From 653c7dc2508556a5355a1341196c37d27cba1681 Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Thu, 27 Apr 2017 15:34:02 -0800
Subject: [PATCH 0775/1563] [XLA] Fix CHECK failure in rematerialization.
 cl/154253719 added a CHECK which fails if a value (LogicalBuffer) is used
 more than once by an instruction. This resulted in duplicate values in a list
 of uses. Change: 154485725

---
 tensorflow/compiler/xla/service/hlo_rematerialization.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization.cc b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
index a2c0b52ab2..65c61627a1 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
@@ -217,7 +217,11 @@ std::vector<const HloInstruction*> GetUsers(
       if (buffer_alias.instruction() != logical_buffer->instruction()) {
         *has_indirect_users = true;
       }
-      users.push_back(user);
+      // A buffer may be used by the instruction via more than one alias. For
+      // example, a buffer which appears in more than one element of a tuple.
+      if (std::find(users.begin(), users.end(), user) == users.end()) {
+        users.push_back(user);
+      }
     }
   }
   return users;
-- 
GitLab


From 9d983a97e78b862efc0aaf0627cae19fe2a2b5db Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 16:39:21 -0800
Subject: [PATCH 0776/1563] Fixes alignment issue with nearest neighbor
 interpolation when align_corners=True. In particular, we change floorf() to
 roundf() in discretizing the continuous coordinates when align_corners=True.
 Change: 154492447

---
 tensorflow/core/kernels/BUILD                 |   1 +
 .../kernels/resize_nearest_neighbor_op.cc     | 282 ++++++++----------
 .../core/kernels/resize_nearest_neighbor_op.h |  43 +++
 .../resize_nearest_neighbor_op_gpu.cu.cc      | 172 ++++++-----
 .../kernels/resize_nearest_neighbor_op_gpu.h  |  42 ---
 .../resize_nearest_neighbor_op_test.cc        |  12 +-
 tensorflow/python/ops/image_ops_test.py       |  89 ++++--
 7 files changed, 350 insertions(+), 291 deletions(-)
 create mode 100644 tensorflow/core/kernels/resize_nearest_neighbor_op.h
 delete mode 100644 tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.h

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index be0ac8fc55..f97f336ed0 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4020,6 +4020,7 @@ filegroup(
         "relu_op.h",
         "relu_op_functor.h",
         "resize_bilinear_op.h",
+        "resize_nearest_neighbor_op.h",
         "reverse_op.h",
         "save_restore_tensor.h",
         "softplus_op.h",
diff --git a/tensorflow/core/kernels/resize_nearest_neighbor_op.cc b/tensorflow/core/kernels/resize_nearest_neighbor_op.cc
index a38fb22223..bfd29b7ec8 100644
--- a/tensorflow/core/kernels/resize_nearest_neighbor_op.cc
+++ b/tensorflow/core/kernels/resize_nearest_neighbor_op.cc
@@ -16,6 +16,8 @@ limitations under the License.
 // See docs in ../ops/image_ops.cc
 #define EIGEN_USE_THREADS
 
+#include "tensorflow/core/kernels/resize_nearest_neighbor_op.h"
+
 #include <memory>
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op_kernel.h"
@@ -27,13 +29,10 @@ limitations under the License.
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
 
-#if GOOGLE_CUDA
-#include "tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.h"
-#endif  // GOOGLE_CUDA
-
 namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
+typedef Eigen::GpuDevice GPUDevice;
 
 template <typename Device, typename T>
 class ResizeNearestNeighborOp : public OpKernel {
@@ -54,22 +53,27 @@ class ResizeNearestNeighborOp : public OpKernel {
                 errors::InvalidArgument("nearest neighbor requires max height "
                                         "& width of 2^24"));
 
+    // Return if the output is empty.
+    if (st.output->NumElements() == 0) return;
+
     typename TTypes<T, 4>::ConstTensor input_data = input.tensor<T, 4>();
     typename TTypes<T, 4>::Tensor output_data = st.output->tensor<T, 4>();
 
-    for (int b = 0; b < st.batch_size; ++b) {
-      for (int y = 0; y < st.out_height; ++y) {
-        const int64 in_y =
-            std::min(static_cast<int64>(floorf(y * st.height_scale)),
-                     (st.in_height - 1));
-        for (int x = 0; x < st.out_width; ++x) {
-          const int64 in_x =
-              std::min(static_cast<int64>(floorf(x * st.width_scale)),
-                       (st.in_width - 1));
-          std::copy_n(&input_data(b, in_y, in_x, 0), st.channels,
-                      &output_data(b, y, x, 0));
-        }
-      }
+    bool status;
+    if (align_corners_) {
+      status =
+          functor::ResizeNearestNeighbor<Device, T, /*align_corners=*/true>()(
+              context->eigen_device<Device>(), input_data, st.height_scale,
+              st.width_scale, output_data);
+    } else {
+      status =
+          functor::ResizeNearestNeighbor<Device, T, /*align_corners=*/false>()(
+              context->eigen_device<Device>(), input_data, st.height_scale,
+              st.width_scale, output_data);
+    }
+    if (!status) {
+      context->SetStatus(
+          errors::Internal("Failed launching ResizeNearestNeighbor"));
     }
   }
 
@@ -77,6 +81,41 @@ class ResizeNearestNeighborOp : public OpKernel {
   bool align_corners_;
 };
 
+// Partial specialization of ResizeNearestNeighbor functor for a CPUDevice.
+namespace functor {
+template <typename T, bool align_corners>
+struct ResizeNearestNeighbor<CPUDevice, T, align_corners> {
+  bool operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
+                  const float height_scale, const float width_scale,
+                  typename TTypes<T, 4>::Tensor output) {
+    const int batch_size = input.dimension(0);
+    const int64 in_height = input.dimension(1);
+    const int64 in_width = input.dimension(2);
+    const int channels = input.dimension(3);
+
+    const int64 out_height = output.dimension(1);
+    const int64 out_width = output.dimension(2);
+
+    for (int b = 0; b < batch_size; ++b) {
+      for (int y = 0; y < out_height; ++y) {
+        const int64 in_y = std::min(
+            (align_corners) ? static_cast<int64>(roundf(y * height_scale))
+                            : static_cast<int64>(floorf(y * height_scale)),
+            in_height - 1);
+        for (int x = 0; x < out_width; ++x) {
+          const int64 in_x = std::min(
+              (align_corners) ? static_cast<int64>(roundf(x * width_scale))
+                              : static_cast<int64>(floorf(x * width_scale)),
+              in_width - 1);
+          std::copy_n(&input(b, in_y, in_x, 0), channels, &output(b, y, x, 0));
+        }
+      }
+    }
+    return true;
+  }
+};
+}  // namespace functor
+
 template <typename Device, typename T>
 class ResizeNearestNeighborOpGrad : public OpKernel {
  public:
@@ -105,22 +144,23 @@ class ResizeNearestNeighborOpGrad : public OpKernel {
     OP_REQUIRES(context, sizes(0) > 0 && sizes(1) > 0,
                 errors::InvalidArgument("shape_t's elements must be positive"));
 
-    // Initialize shape to the batch size of the input, then add
-    // the rest of the dimensions
-    Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->allocate_output(
-                                0,
-                                TensorShape({input.dim_size(0), sizes(0),
-                                             sizes(1), input.dim_size(3)}),
-                                &output));
-
     const int64 batch_size = input.dim_size(0);
     const int64 in_height = input.dim_size(1);
     const int64 in_width = input.dim_size(2);
     const int64 channels = input.dim_size(3);
 
-    const int64 out_height = output->dim_size(1);
-    const int64 out_width = output->dim_size(2);
+    const int64 out_height = sizes(0);
+    const int64 out_width = sizes(1);
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(
+        context,
+        context->allocate_output(
+            0, TensorShape({batch_size, out_height, out_width, channels}),
+            &output));
+
+    // Return if the output is empty.
+    if (output->NumElements() == 0) return;
 
     typename TTypes<T, 4>::ConstTensor input_data = input.tensor<T, 4>();
     typename TTypes<T, 4>::Tensor output_data = output->tensor<T, 4>();
@@ -129,28 +169,67 @@ class ResizeNearestNeighborOpGrad : public OpKernel {
         CalculateResizeScale(out_height, in_height, align_corners_);
     const float width_scale =
         CalculateResizeScale(out_width, in_width, align_corners_);
-    output_data.setZero();
 
-    for (int c = 0; c < channels; ++c) {
-      for (int y = 0; y < in_height; ++y) {
-        const int64 out_y = std::min(
-            static_cast<int64>(floorf(y * height_scale)), (out_height - 1));
+    bool status;
+    if (align_corners_) {
+      status = functor::ResizeNearestNeighborGrad<Device, T,
+                                                  /*align_corners=*/true>()(
+          context->eigen_device<Device>(), input_data, height_scale,
+          width_scale, output_data);
+    } else {
+      status = functor::ResizeNearestNeighborGrad<Device, T,
+                                                  /*align_corners=*/false>()(
+          context->eigen_device<Device>(), input_data, height_scale,
+          width_scale, output_data);
+    }
+    if (!status) {
+      context->SetStatus(
+          errors::Internal("Failed launching ResizeNearestNeighborGrad"));
+    }
+  }
 
-        for (int x = 0; x < in_width; ++x) {
-          const int64 out_x = std::min(
-              static_cast<int64>(floorf(x * width_scale)), (out_width - 1));
+ private:
+  bool align_corners_;
+};
 
-          for (int b = 0; b < batch_size; ++b) {
-            output_data(b, out_y, out_x, c) += input_data(b, y, x, c);
+// Partial specialization of ResizeNearestNeighborGrad functor for a CPUDevice.
+namespace functor {
+template <typename T, bool align_corners>
+struct ResizeNearestNeighborGrad<CPUDevice, T, align_corners> {
+  bool operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
+                  const float height_scale, const float width_scale,
+                  typename TTypes<T, 4>::Tensor output) {
+    const int batch_size = input.dimension(0);
+    const int64 in_height = input.dimension(1);
+    const int64 in_width = input.dimension(2);
+    const int channels = input.dimension(3);
+
+    const int64 out_height = output.dimension(1);
+    const int64 out_width = output.dimension(2);
+
+    output.setZero();
+
+    for (int y = 0; y < in_height; ++y) {
+      const int64 out_y = std::min(
+          (align_corners) ? static_cast<int64>(roundf(y * height_scale))
+                          : static_cast<int64>(floorf(y * height_scale)),
+          out_height - 1);
+      for (int x = 0; x < in_width; ++x) {
+        const int64 out_x = std::min(
+            (align_corners) ? static_cast<int64>(roundf(x * width_scale))
+                            : static_cast<int64>(floorf(x * width_scale)),
+            out_width - 1);
+        for (int b = 0; b < batch_size; ++b) {
+          for (int c = 0; c < channels; ++c) {
+            output(b, out_y, out_x, c) += input(b, y, x, c);
           }
         }
       }
     }
+    return true;
   }
-
- private:
-  bool align_corners_;
 };
+}  // namespace functor
 
 #define REGISTER_KERNEL(T)                                        \
   REGISTER_KERNEL_BUILDER(Name("ResizeNearestNeighbor")           \
@@ -170,121 +249,22 @@ TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNEL);
 
 #if GOOGLE_CUDA
 
-template <typename T>
-class ResizeNearestNeighborGPUOp : public OpKernel {
- public:
-  explicit ResizeNearestNeighborGPUOp(OpKernelConstruction* context)
-      : OpKernel(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("align_corners", &align_corners_));
-  }
-
-  void Compute(OpKernelContext* context) override {
-    const Tensor& input = context->input(0);
-    ImageResizerState st(align_corners_);
-    st.ValidateAndCreateOutput(context, input);
-    if (!context->status().ok()) return;
-
-    bool status = ResizeNearestNeighbor<T>(
-        input.flat<T>().data(), st.batch_size, st.in_height, st.in_width,
-        st.channels, st.out_height, st.out_width, st.height_scale,
-        st.width_scale, st.output->flat<T>().data(),
-        context->eigen_gpu_device());
-
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launching ResizeNearestNeighbor"));
-    }
-  }
-
- private:
-  bool align_corners_;
-};
-
-#define REGISTER_KERNEL(T)                              \
-  REGISTER_KERNEL_BUILDER(Name("ResizeNearestNeighbor") \
-                              .Device(DEVICE_GPU)       \
-                              .TypeConstraint<T>("T")   \
-                              .HostMemory("size"),      \
-                          ResizeNearestNeighborGPUOp<T>);
+#define REGISTER_KERNEL(T)                                        \
+  REGISTER_KERNEL_BUILDER(Name("ResizeNearestNeighbor")           \
+                              .Device(DEVICE_GPU)                 \
+                              .TypeConstraint<T>("T")             \
+                              .HostMemory("size"),                \
+                          ResizeNearestNeighborOp<GPUDevice, T>); \
+  REGISTER_KERNEL_BUILDER(Name("ResizeNearestNeighborGrad")       \
+                              .Device(DEVICE_GPU)                 \
+                              .TypeConstraint<T>("T")             \
+                              .HostMemory("size"),                \
+                          ResizeNearestNeighborOpGrad<GPUDevice, T>);
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_KERNEL);
 
 #undef REGISTER_KERNEL
 
-template <typename T>
-class ResizeNearestNeighborGPUOpGrad : public OpKernel {
- public:
-  explicit ResizeNearestNeighborGPUOpGrad(OpKernelConstruction* context)
-      : OpKernel(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("align_corners", &align_corners_));
-  }
-
-  void Compute(OpKernelContext* context) override {
-    // Grab and validate the input:
-    const Tensor& input = context->input(0);
-    OP_REQUIRES(context, input.dims() == 4,
-                errors::InvalidArgument("input must be 4-dimensional",
-                                        input.shape().DebugString()));
-
-    // Grab and validate the output shape:
-    const Tensor& shape_t = context->input(1);
-    OP_REQUIRES(context, shape_t.dims() == 1,
-                errors::InvalidArgument("shape_t must be 1-dimensional",
-                                        shape_t.shape().DebugString()));
-    OP_REQUIRES(context, shape_t.NumElements() == 2,
-                errors::InvalidArgument("shape_t must have two elements",
-                                        shape_t.shape().DebugString()));
-
-    auto sizes = shape_t.vec<int32>();
-    OP_REQUIRES(context, sizes(0) > 0 && sizes(1) > 0,
-                errors::InvalidArgument("shape_t's elements must be positive"));
-
-    // Initialize shape to the batch size of the input, then add
-    // the rest of the dimensions
-    Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->allocate_output(
-                                0,
-                                TensorShape({input.dim_size(0), sizes(0),
-                                             sizes(1), input.dim_size(3)}),
-                                &output));
-
-    const int64 batch_size = input.dim_size(0);
-    const int64 in_height = input.dim_size(1);
-    const int64 in_width = input.dim_size(2);
-    const int64 channels = input.dim_size(3);
-
-    const int64 out_height = output->dim_size(1);
-    const int64 out_width = output->dim_size(2);
-
-    const float height_scale =
-        CalculateResizeScale(out_height, in_height, align_corners_);
-    const float width_scale =
-        CalculateResizeScale(out_width, in_width, align_corners_);
-
-    bool status = ResizeNearestNeighborBackward(
-        input.flat<T>().data(), batch_size, in_height, in_width, channels,
-        out_height, out_width, height_scale, width_scale,
-        output->flat<T>().data(), context->eigen_gpu_device());
-
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launching ResizeNearestNeighborGrad"));
-    }
-  }
-  bool align_corners_;
-};
-
-#define REGISTER_KERNEL(T)                                  \
-  REGISTER_KERNEL_BUILDER(Name("ResizeNearestNeighborGrad") \
-                              .Device(DEVICE_GPU)           \
-                              .TypeConstraint<T>("T")       \
-                              .HostMemory("size"),          \
-                          ResizeNearestNeighborGPUOpGrad<T>);
-
-TF_CALL_GPU_NUMBER_TYPES_NO_HALF(REGISTER_KERNEL);
-
-#undef REGISTER_KERNEL
-
 #endif  // GOOGLE_CUDA
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/resize_nearest_neighbor_op.h b/tensorflow/core/kernels/resize_nearest_neighbor_op.h
new file mode 100644
index 0000000000..9db331ffdc
--- /dev/null
+++ b/tensorflow/core/kernels/resize_nearest_neighbor_op.h
@@ -0,0 +1,43 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CORE_KERNELS_RESIZE_NEAREST_NEIGHBOR_OP_H_
+#define TENSORFLOW_CORE_KERNELS_RESIZE_NEAREST_NEIGHBOR_OP_H_
+
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+namespace functor {
+
+template <typename Device, typename T, bool align_corners>
+struct ResizeNearestNeighbor {
+  bool operator()(const Device& d, typename TTypes<T, 4>::ConstTensor input,
+                  const float height_scale, const float width_scale,
+                  typename TTypes<T, 4>::Tensor output);
+};
+
+template <typename Device, typename T, bool align_corners>
+struct ResizeNearestNeighborGrad {
+  bool operator()(const Device& d,
+                  typename TTypes<T, 4>::ConstTensor input_grad,
+                  const float height_scale, const float width_scale,
+                  typename TTypes<T, 4>::Tensor output_grad);
+};
+
+}  // namespace functor
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_CORE_KERNELS_RESIZE_NEAREST_NEIGHBOR_OP_H_
diff --git a/tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.cu.cc b/tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.cu.cc
index 1a3a64f482..d65c8fb949 100644
--- a/tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.cu.cc
@@ -19,21 +19,25 @@ limitations under the License.
 
 #include <stdio.h>
 
-#include "tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.h"
+#include "tensorflow/core/kernels/resize_nearest_neighbor_op.h"
 
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/util/cuda_kernel_helper.h"
 
 namespace tensorflow {
+
+typedef Eigen::GpuDevice GPUDevice;
+
 namespace {
 
-template <typename T>
-__global__ void ResizeNearestNeighborNHWC(const int nthreads, const T* bottom_data,
-                                          const int in_height, const int in_width,
-                                          const int channels, const int out_height,
-                                          const int out_width, const float height_scale,
-                                          const float width_scale, T* top_data) {
+template <typename T, bool align_corners>
+__global__ void ResizeNearestNeighborNHWC(
+    const int nthreads, const T* bottom_data, const int in_height,
+    const int in_width, const int channels, const int out_height,
+    const int out_width, const float height_scale, const float width_scale,
+    T* top_data) {
   CUDA_1D_KERNEL_LOOP(index, nthreads) {
     int n = index;
     int c = n % channels;
@@ -44,20 +48,25 @@ __global__ void ResizeNearestNeighborNHWC(const int nthreads, const T* bottom_da
     n /= out_height;
 
     const T* bottom_data_n = bottom_data + n * channels * in_height * in_width;
-    const int in_x = min(static_cast<int>(floorf(out_x * width_scale)), in_width - 1);
-    const int in_y = min(static_cast<int>(floorf(out_y * height_scale)), in_height - 1);
+    const int in_y =
+        min((align_corners) ? static_cast<int>(roundf(out_y * height_scale))
+                            : static_cast<int>(floorf(out_y * height_scale)),
+            in_height - 1);
+    const int in_x =
+        min((align_corners) ? static_cast<int>(roundf(out_x * width_scale))
+                            : static_cast<int>(floorf(out_x * width_scale)),
+            in_width - 1);
     const int idx = (in_y * in_width + in_x) * channels + c;
     top_data[index] = ldg(bottom_data_n + idx);
   }
 }
 
-template <typename T>
+template <typename T, bool align_corners>
 __global__ void ResizeNearestNeighborBackwardNHWC(
-                                   const int nthreads, const T* top_diff,
-                                   const int in_height, const int in_width,
-                                   const int channels, const int out_height,
-                                   const int out_width, const float height_scale,
-                                   const float width_scale, T* bottom_diff) {
+    const int nthreads, const T* top_diff, const int in_height,
+    const int in_width, const int channels, const int out_height,
+    const int out_width, const float height_scale, const float width_scale,
+    T* bottom_diff) {
   CUDA_1D_KERNEL_LOOP(index, nthreads) {
     int n = index;
     int c = n % channels;
@@ -68,8 +77,14 @@ __global__ void ResizeNearestNeighborBackwardNHWC(
     n /= in_height;
 
     T* bottom_diff_n = bottom_diff + n * channels * out_height * out_width;
-    const int out_x = min(static_cast<int>(floorf(in_x * width_scale)), out_width - 1);
-    const int out_y = min(static_cast<int>(floorf(in_y * height_scale)), out_height - 1);
+    const int out_y =
+        min((align_corners) ? static_cast<int>(roundf(in_y * height_scale))
+                            : static_cast<int>(floorf(in_y * height_scale)),
+            out_height - 1);
+    const int out_x =
+        min((align_corners) ? static_cast<int>(roundf(in_x * width_scale))
+                            : static_cast<int>(floorf(in_x * width_scale)),
+            out_width - 1);
     const int idx = (out_y * out_width + out_x) * channels + c;
     CudaAtomicAdd(bottom_diff_n + idx, ldg(top_diff + index));
   }
@@ -77,69 +92,86 @@ __global__ void ResizeNearestNeighborBackwardNHWC(
 
 }  // namespace
 
-template <typename T>
-bool ResizeNearestNeighbor(const T* bottom_data, const int batch,
-                           const int in_height, const int in_width,
-                           const int channels, const int out_height,
-                           const int out_width,  const float height_scale,
-                           const float width_scale, T* top_data,
-                           const Eigen::GpuDevice& d) {
-  const int output_size = batch * channels * out_height * out_width;
-  CudaLaunchConfig config = GetCudaLaunchConfig(output_size, d);
-
-  ResizeNearestNeighborNHWC<T>
-      <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-      output_size, bottom_data, in_height, in_width, channels, out_height,
-      out_width, height_scale, width_scale, top_data);
-  return d.ok();
-}
+namespace functor {
+
+// Partial specialization of ResizeNearestNeighbor functor for a GPUDevice.
+template <typename T, bool align_corners>
+struct ResizeNearestNeighbor<GPUDevice, T, align_corners> {
+  bool operator()(const GPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
+                  const float height_scale, const float width_scale,
+                  typename TTypes<T, 4>::Tensor output) {
+    const int batch_size = input.dimension(0);
+    const int64 in_height = input.dimension(1);
+    const int64 in_width = input.dimension(2);
+    const int channels = input.dimension(3);
+
+    const int64 out_height = output.dimension(1);
+    const int64 out_width = output.dimension(2);
+
+    const int output_size = batch_size * out_height * out_width * channels;
+    if (output_size == 0) return true;
+
+    CudaLaunchConfig config = GetCudaLaunchConfig(output_size, d);
+    ResizeNearestNeighborNHWC<T, align_corners>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            output_size, input.data(), in_height, in_width, channels,
+            out_height, out_width, height_scale, width_scale, output.data());
+    return d.ok();
+  }
+};
 
-#define DECLARE_GPU_SPEC(T)                                                        \
-  template bool ResizeNearestNeighbor(const T* bottom_data, const int batch,       \
-                               const int in_height, const int in_width,            \
-                               const int channels, const int out_height,           \
-                               const int out_width,  const float height_scale,     \
-                               const float width_scale, T* top_data,               \
-                               const Eigen::GpuDevice& d);
+#define DECLARE_GPU_SPEC(T)                                   \
+  template struct ResizeNearestNeighbor<GPUDevice, T, false>; \
+  template struct ResizeNearestNeighbor<GPUDevice, T, true>;
 
 TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPEC);
 
 #undef DECLARE_GPU_SPEC
 
-template <typename T>
-bool ResizeNearestNeighborBackward(const T* top_diff, const int batch,
-                                   const int in_height, const int in_width,
-                                   const int channels, const int out_height,
-                                   const int out_width,
-                                   const float height_scale,
-                                   const float width_scale, T* bottom_diff,
-                                   const Eigen::GpuDevice& d) {
-  const int output_size = batch * channels * out_height * out_width;
-  CudaLaunchConfig output_config = GetCudaLaunchConfig(output_size, d);
-  SetZero<<<output_config.block_count,
-            output_config.thread_per_block, 0, d.stream()>>>(output_size, bottom_diff);
-
-  const int input_size = batch * channels * in_height * in_width;
-  CudaLaunchConfig input_config = GetCudaLaunchConfig(input_size, d);
-  ResizeNearestNeighborBackwardNHWC<T><<<
-      input_config.block_count, input_config.thread_per_block, 0, d.stream()>>>(
-      input_config.virtual_thread_count, top_diff, in_height, in_width,
-      channels, out_height, out_width, height_scale, width_scale, bottom_diff);
-  return d.ok();
-}
+// Partial specialization of ResizeNearestNeighborGrad functor for a GPUDevice.
+template <typename T, bool align_corners>
+struct ResizeNearestNeighborGrad<GPUDevice, T, align_corners> {
+  bool operator()(const GPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
+                  const float height_scale, const float width_scale,
+                  typename TTypes<T, 4>::Tensor output) {
+    const int batch_size = input.dimension(0);
+    const int64 in_height = input.dimension(1);
+    const int64 in_width = input.dimension(2);
+    const int channels = input.dimension(3);
+
+    const int64 out_height = output.dimension(1);
+    const int64 out_width = output.dimension(2);
+
+    const int output_size = batch_size * channels * out_height * out_width;
+
+    CudaLaunchConfig output_config = GetCudaLaunchConfig(output_size, d);
+    SetZero<<<output_config.block_count, output_config.thread_per_block, 0,
+              d.stream()>>>(output_size, output.data());
+    if (!d.ok()) return false;
+
+    const int input_size = batch_size * channels * in_height * in_width;
+    if (input_size == 0) return true;
+
+    CudaLaunchConfig input_config = GetCudaLaunchConfig(input_size, d);
+    ResizeNearestNeighborBackwardNHWC<T, align_corners>
+        <<<input_config.block_count, input_config.thread_per_block, 0,
+           d.stream()>>>(input_config.virtual_thread_count, input.data(),
+                         in_height, in_width, channels, out_height, out_width,
+                         height_scale, width_scale, output.data());
+    return d.ok();
+  }
+};
 
-#define DECLARE_GPU_SPEC(T)                                                           \
-  template bool ResizeNearestNeighborBackward(const T* top_diff, const int batch,     \
-                               const int in_height, const int in_width,               \
-                               const int channels, const int out_height,              \
-                               const int out_width, const float height_scale,         \
-                               const float width_scale, T* bottom_diff,               \
-                               const Eigen::GpuDevice& d);
+#define DECLARE_GPU_SPEC(T)                                       \
+  template struct ResizeNearestNeighborGrad<GPUDevice, T, false>; \
+  template struct ResizeNearestNeighborGrad<GPUDevice, T, true>;
 
-TF_CALL_GPU_NUMBER_TYPES_NO_HALF(DECLARE_GPU_SPEC);
+TF_CALL_GPU_NUMBER_TYPES(DECLARE_GPU_SPEC);
 
 #undef DECLARE_GPU_SPEC
 
-}  // end namespace tensorflow
+}  // namespace functor
+
+}  // namespace tensorflow
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.h b/tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.h
deleted file mode 100644
index 0a8fd6e166..0000000000
--- a/tensorflow/core/kernels/resize_nearest_neighbor_op_gpu.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#if !GOOGLE_CUDA
-#error This file must only be included when building with Cuda support
-#endif
-
-#ifndef TENSORFLOW_CORE_KERNELS_RESIZE_NEAREST_NEIGHBOR_OP_GPU_H_
-#define TENSORFLOW_CORE_KERNELS_RESIZE_NEAREST_NEIGHBOR_OP_GPU_H_
-
-#include "tensorflow/core/framework/tensor_types.h"
-#include "tensorflow/core/platform/types.h"
-
-namespace tensorflow {
-
-template <typename T>
-bool ResizeNearestNeighbor(const T* bottom_data, const int batch, const int in_height,
-                           const int in_width, const int channels, const int out_height,
-                           const int out_width, const float height_scale, const float width_scale,
-                           T* top_data, const Eigen::GpuDevice& d);
-
-template <typename T>
-bool ResizeNearestNeighborBackward(const T* top_diff, const int batch, const int in_height,
-                                   const int in_width, const int channels, const int out_height,
-                                   const int out_width, const float height_scale, const float width_scale,
-                                   T* bottom_diff, const Eigen::GpuDevice& d);
-
-}  // namespace tensorflow
-
-#endif  // TENSORFLOW_CORE_KERNELS_RESIZE_NEAREST_NEIGHBOR_OP_GPU_H_
diff --git a/tensorflow/core/kernels/resize_nearest_neighbor_op_test.cc b/tensorflow/core/kernels/resize_nearest_neighbor_op_test.cc
index 34ebff6c68..ecf54c6977 100644
--- a/tensorflow/core/kernels/resize_nearest_neighbor_op_test.cc
+++ b/tensorflow/core/kernels/resize_nearest_neighbor_op_test.cc
@@ -124,9 +124,9 @@ TEST_F(ResizeNearestNeighborOpAlignCornersTest,
 
   // clang-format off
   test::FillValues<float>(&expected,
-    {1, 1, 2,
-     1, 1, 2,
-     3, 3, 4});
+    {1, 2, 2,
+     3, 4, 4,
+     3, 4, 4});
 
   // clang-format on
   test::ExpectTensorEqual<float>(expected, *GetOutput(0));
@@ -235,9 +235,9 @@ TEST_F(ResizeNearestNeighborOpAlignCornersTest,
 
   // clang-format off
   test::FillValues<float>(&expected,
-    { 1,  2,  4,
-      5,  6,  8,
-     13, 14, 16});
+    { 1,  3,  4,
+      9, 11, 12,
+     13, 15, 16});
 
   // clang-format on
   test::ExpectTensorEqual<float>(expected, *GetOutput(0));
diff --git a/tensorflow/python/ops/image_ops_test.py b/tensorflow/python/ops/image_ops_test.py
index 887140c726..716d767b0c 100644
--- a/tensorflow/python/ops/image_ops_test.py
+++ b/tensorflow/python/ops/image_ops_test.py
@@ -1652,8 +1652,8 @@ class ResizeImagesTest(test_util.TensorFlowTestCase):
     self.assertEqual(y.get_shape().as_list(), [None] + post_shape)
 
   def shouldRunOnGPU(self, opt, nptype):
-    if opt == image_ops.ResizeMethod.NEAREST_NEIGHBOR \
-            and nptype in [np.float32, np.float64]:
+    if (opt == image_ops.ResizeMethod.NEAREST_NEIGHBOR and
+        nptype in [np.float32, np.float64]):
       return True
     else:
       return False
@@ -1676,15 +1676,13 @@ class ResizeImagesTest(test_util.TensorFlowTestCase):
       img_np = np.array(data, dtype=nptype).reshape(img_shape)
 
       for opt in self.OPTIONS:
-        if test.is_gpu_available() and self.shouldRunOnGPU(opt, nptype):
-          with self.test_session(use_gpu=True) as sess:
-            image = constant_op.constant(img_np, shape=img_shape)
-            y = image_ops.resize_images(image, [target_height, target_width],
-                                        opt)
-            yshape = array_ops.shape(y)
-            resized, newshape = sess.run([y, yshape])
-            self.assertAllEqual(img_shape, newshape)
-            self.assertAllClose(resized, img_np, atol=1e-5)
+        with self.test_session(use_gpu=True) as sess:
+          image = constant_op.constant(img_np, shape=img_shape)
+          y = image_ops.resize_images(image, [target_height, target_width], opt)
+          yshape = array_ops.shape(y)
+          resized, newshape = sess.run([y, yshape])
+          self.assertAllEqual(img_shape, newshape)
+          self.assertAllClose(resized, img_np, atol=1e-5)
 
       # Resizing with a single image must leave the shape unchanged also.
       with self.test_session(use_gpu=True):
@@ -1822,7 +1820,7 @@ class ResizeImagesTest(test_util.TensorFlowTestCase):
               resized = y.eval()
               self.assertAllClose(resized, expected, atol=1e-5)
 
-  def testResizeUp(self):
+  def testResizeUpAlignCornersFalse(self):
     img_shape = [1, 3, 2, 1]
     data = [64, 32,
             32, 64,
@@ -1857,16 +1855,63 @@ class ResizeImagesTest(test_util.TensorFlowTestCase):
           image_ops.ResizeMethod.BILINEAR,
           image_ops.ResizeMethod.NEAREST_NEIGHBOR,
           image_ops.ResizeMethod.AREA]:
-        if test.is_gpu_available() and self.shouldRunOnGPU(opt, nptype):
-          with self.test_session(use_gpu=True):
-            img_np = np.array(data, dtype=nptype).reshape(img_shape)
-            image = constant_op.constant(img_np, shape=img_shape)
-            y = image_ops.resize_images(
-                image, [target_height, target_width], opt)
-            resized = y.eval()
-            expected = np.array(expected_data[opt]).reshape(
-                [1, target_height, target_width, 1])
-            self.assertAllClose(resized, expected, atol=1e-05)
+        with self.test_session(use_gpu=True):
+          img_np = np.array(data, dtype=nptype).reshape(img_shape)
+          image = constant_op.constant(img_np, shape=img_shape)
+          y = image_ops.resize_images(
+              image, [target_height, target_width], opt, align_corners=False)
+          resized = y.eval()
+          expected = np.array(expected_data[opt]).reshape(
+              [1, target_height, target_width, 1])
+          self.assertAllClose(resized, expected, atol=1e-05)
+
+  def testResizeUpAlignCornersTrue(self):
+    img_shape = [1, 3, 2, 1]
+    data = [6, 3,
+            3, 6,
+            6, 9]
+    target_height = 5
+    target_width = 4
+    expected_data = {}
+    expected_data[image_ops.ResizeMethod.BILINEAR] = [
+        6.0, 5.0, 4.0, 3.0,
+        4.5, 4.5, 4.5, 4.5,
+        3.0, 4.0, 5.0, 6.0,
+        4.5, 5.5, 6.5, 7.5,
+        6.0, 7.0, 8.0, 9.0
+    ]
+    expected_data[image_ops.ResizeMethod.NEAREST_NEIGHBOR] = [
+        6.0, 6.0, 3.0, 3.0,
+        3.0, 3.0, 6.0, 6.0,
+        3.0, 3.0, 6.0, 6.0,
+        6.0, 6.0, 9.0, 9.0,
+        6.0, 6.0, 9.0, 9.0
+    ]
+    # TODO(b/37749740): Improve alignment of ResizeMethod.AREA when
+    # align_corners=True.
+    expected_data[image_ops.ResizeMethod.AREA] = [
+        6.0, 6.0, 6.0, 3.0,
+        6.0, 6.0, 6.0, 3.0,
+        3.0, 3.0, 3.0, 6.0,
+        3.0, 3.0, 3.0, 6.0,
+        6.0, 6.0, 6.0, 9.0
+    ]
+
+    for nptype in self.TYPES:
+      for opt in [
+          image_ops.ResizeMethod.BILINEAR,
+          image_ops.ResizeMethod.NEAREST_NEIGHBOR,
+          image_ops.ResizeMethod.AREA
+      ]:
+        with self.test_session(use_gpu=True):
+          img_np = np.array(data, dtype=nptype).reshape(img_shape)
+          image = constant_op.constant(img_np, shape=img_shape)
+          y = image_ops.resize_images(
+              image, [target_height, target_width], opt, align_corners=True)
+          resized = y.eval()
+          expected = np.array(expected_data[opt]).reshape(
+              [1, target_height, target_width, 1])
+          self.assertAllClose(resized, expected, atol=1e-05)
 
   def testResizeUpBicubic(self):
     img_shape = [1, 6, 6, 1]
-- 
GitLab


From 695490a79bf8058ce3137b79170a4fb0b398c04b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 27 Apr 2017 18:00:14 -0800
Subject: [PATCH 0777/1563] Adds the following ops to
 android_extended_ops_group2:         "reduction_ops_all.cc", Change:
 154499070

---
 tensorflow/contrib/makefile/tf_op_files.txt | 1 +
 tensorflow/core/kernels/BUILD               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index 4a119f7ffc..61fc21b24d 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -73,6 +73,7 @@ tensorflow/core/kernels/reduction_ops_mean.cc
 tensorflow/core/kernels/reduction_ops_max.cc
 tensorflow/core/kernels/reduction_ops_common.cc
 tensorflow/core/kernels/reduction_ops_any.cc
+tensorflow/core/kernels/reduction_ops_all.cc
 tensorflow/core/kernels/queue_ops.cc
 tensorflow/core/kernels/queue_base.cc
 tensorflow/core/kernels/pooling_ops_common.cc
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index f97f336ed0..5702c1b1c0 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4129,6 +4129,7 @@ filegroup(
         "queue_base.cc",
         "queue_ops.cc",
         "random_op.cc",
+        "reduction_ops_all.cc",
         "reduction_ops_any.cc",
         "reduction_ops_common.cc",
         "reduction_ops_max.cc",
-- 
GitLab


From 141e8d652eb113319301fff6d30452b01903b771 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Thu, 27 Apr 2017 18:43:06 -0800
Subject: [PATCH 0778/1563] Fix call to with_dependencies. Change: 154501275

---
 .../contrib/distributions/python/ops/bijectors/softplus_impl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
index 364be07920..baa41cfcbd 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
@@ -96,7 +96,7 @@ class Softplus(bijector.Bijector):
             ops.convert_to_tensor(
                 0, dtype=self.hinge_softness.dtype), self.hinge_softness)
         self._hinge_softness = control_flow_ops.with_dependencies(
-            [nonzero_check, self.hinge_softness])
+            [nonzero_check], self.hinge_softness)
 
     super(Softplus, self).__init__(
         event_ndims=event_ndims,
-- 
GitLab


From d84aacfb7c8b5e561af7414b220a37bb1209ad77 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Thu, 27 Apr 2017 20:50:36 -0800
Subject: [PATCH 0779/1563] Allow FakeQuantWithMinMaxVars to be used with
 quantize_training rewriter. Change: 154507631

---
 tensorflow/core/graph/quantize_training.cc    |  55 +++---
 tensorflow/core/graph/quantize_training.h     |   8 +-
 .../core/graph/quantize_training_test.cc      | 168 ++++++++++++++++--
 .../python/training/quantize_training.i       |   4 +-
 4 files changed, 202 insertions(+), 33 deletions(-)

diff --git a/tensorflow/core/graph/quantize_training.cc b/tensorflow/core/graph/quantize_training.cc
index b241ab6ab3..e3ef5e2f0c 100644
--- a/tensorflow/core/graph/quantize_training.cc
+++ b/tensorflow/core/graph/quantize_training.cc
@@ -526,31 +526,42 @@ Status MakeInputMinMax(Graph* graph, const string& name_prefix,
   return Status::OK();
 }
 
-// Adds a QuantizeAndDequantizeV2Op (and required input nodes) based on edge.
+// Adds a QuantizeAndDequantizeV2 or FakeQuantizeWithMinMaxVars op
+// (and required input nodes) based on edge.
 // The result is stored in convert_node.
-Status MakeQuantizeAndDequantizeV2(Graph* graph, const string& name_prefix,
-                                   const EdgeToConvert& edge,
-                                   std::vector<Node*>* added_variables,
-                                   Node** convert_node) {
+Status MakeQuantizeOp(Graph* graph, const string& name_prefix,
+                      const string& quant_op_type, const EdgeToConvert& edge,
+                      std::vector<Node*>* added_variables,
+                      Node** convert_node) {
   Node* input_min;
   Node* input_max;
   TF_RETURN_IF_ERROR(MakeInputMinMax(graph, name_prefix, edge, added_variables,
                                      &input_min, &input_max));
-
-  string quant_name = strings::StrCat(name_prefix, "/QuantizeAndDequantizeV2");
-  TF_RETURN_IF_ERROR(NodeBuilder(quant_name, "QuantizeAndDequantizeV2")
-                         .Input(edge.edge->src())
-                         .Input(input_min)
-                         .Input(input_max)
-                         .Attr("signed_input", edge.signed_input)
-                         .Attr("num_bits", edge.num_bits)
-                         .Attr("range_given", true)
-                         .Finalize(graph, convert_node));
+  string quant_name = strings::StrCat(name_prefix, "/", quant_op_type);
+  if (quant_op_type == "QuantizeAndDequantizeV2") {
+    TF_RETURN_IF_ERROR(NodeBuilder(quant_name, quant_op_type)
+                           .Input(edge.edge->src())
+                           .Input(input_min)
+                           .Input(input_max)
+                           .Attr("signed_input", edge.signed_input)
+                           .Attr("num_bits", edge.num_bits)
+                           .Attr("range_given", true)
+                           .Finalize(graph, convert_node));
+  } else if (quant_op_type == "FakeQuantWithMinMaxVars") {
+    TF_RETURN_IF_ERROR(NodeBuilder(quant_name, quant_op_type)
+                           .Input(edge.edge->src())
+                           .Input(input_min)
+                           .Input(input_max)
+                           .Attr("num_bits", edge.num_bits)
+                           .Finalize(graph, convert_node));
+  } else {
+    return errors::InvalidArgument("Unknown quant op type: ", quant_op_type);
+  }
   return Status::OK();
 }
 
 // Insert conversion op, connect it to the graph and remove the old edge.
-Status ProcessTargetEdges(Graph* graph,
+Status ProcessTargetEdges(Graph* graph, const string& quant_op_type,
                           const std::vector<EdgeToConvert>& target_edges) {
   // Remember previously converted ops to avoid duplicated conversion on the
   // same input.
@@ -562,8 +573,8 @@ Status ProcessTargetEdges(Graph* graph,
 
     auto iter = name_index.find(name_prefix);
     if (iter == name_index.end()) {
-      TF_RETURN_IF_ERROR(MakeQuantizeAndDequantizeV2(
-          graph, name_prefix, edge, &added_variables, &convert_node));
+      TF_RETURN_IF_ERROR(MakeQuantizeOp(graph, name_prefix, quant_op_type, edge,
+                                        &added_variables, &convert_node));
       name_index[name_prefix] = convert_node;
     } else {
       convert_node = iter->second;
@@ -580,7 +591,8 @@ Status ProcessTargetEdges(Graph* graph,
 
 }  // namespace
 
-Status DoQuantizeTraining(int32 num_bits, Graph* graph) {
+Status DoQuantizeTraining(int32 num_bits, const string& quant_op_type,
+                          Graph* graph) {
   if (graph == nullptr) {
     return errors::InvalidArgument("Cannot accept empty graph pointer.");
   }
@@ -638,13 +650,14 @@ Status DoQuantizeTraining(int32 num_bits, Graph* graph) {
     }
   }
 
-  TF_RETURN_IF_ERROR(ProcessTargetEdges(graph, target_edges));
+  TF_RETURN_IF_ERROR(ProcessTargetEdges(graph, quant_op_type, target_edges));
 
   return Status::OK();
 }
 
 Status DoQuantizeTrainingOnSerializedGraphDef(const string& input_graph,
                                               int32 num_bits,
+                                              const string& quant_op_type,
                                               string* result_graph) {
   // First create the graph from the GraphDef.
   Graph graph(OpRegistry::Global());
@@ -656,7 +669,7 @@ Status DoQuantizeTrainingOnSerializedGraphDef(const string& input_graph,
   TF_RETURN_IF_ERROR(ConvertGraphDefToGraph(opts, input_graphdef, &graph));
 
   // Call the rewriter on the graph.
-  TF_RETURN_IF_ERROR(DoQuantizeTraining(num_bits, &graph));
+  TF_RETURN_IF_ERROR(DoQuantizeTraining(num_bits, quant_op_type, &graph));
 
   // Convert the result graph back to a GraphDef.
   GraphDef output_graphdef;
diff --git a/tensorflow/core/graph/quantize_training.h b/tensorflow/core/graph/quantize_training.h
index 66db0c5bf4..2c1a7e6ae3 100644
--- a/tensorflow/core/graph/quantize_training.h
+++ b/tensorflow/core/graph/quantize_training.h
@@ -24,6 +24,10 @@ namespace tensorflow {
 // the model can learn to deal with such loss and achieve better accuracy when
 // it is quantized later for inference.
 // Note that the num_bits should be in [1, 63] and 'g' must be not null.
+// quant_op_type specifies which quantization op should be used.
+// Current ops supported:
+// - QuantizeAndDequantizeV2.
+// - FakeQuantWithMinMaxVars.
 //
 // On success, returns OK.
 //
@@ -31,12 +35,14 @@ namespace tensorflow {
 //    - num_bits out of range.
 //    - g is null.
 //    - More than 1 unknown ops encountered.
-Status DoQuantizeTraining(int32 num_bits, Graph* g);
+Status DoQuantizeTraining(int32 num_bits, const string& quant_op_type,
+                          Graph* g);
 
 // Converts a input GraphDef and returns a rewritten GraphDef with the
 // quantized training.
 Status DoQuantizeTrainingOnSerializedGraphDef(const string& input_graph,
                                               int32 num_bits,
+                                              const string& quant_op_type,
                                               string* result_graph);
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/graph/quantize_training_test.cc b/tensorflow/core/graph/quantize_training_test.cc
index 867dd8161b..9cbb928c11 100644
--- a/tensorflow/core/graph/quantize_training_test.cc
+++ b/tensorflow/core/graph/quantize_training_test.cc
@@ -103,7 +103,7 @@ TEST_F(QuantizeTrainingTest, SignedInput) {
       a       b
   */
   const int num_bits = 8;
-  TF_ASSERT_OK(DoQuantizeTraining(num_bits, g));
+  TF_ASSERT_OK(DoQuantizeTraining(num_bits, "QuantizeAndDequantizeV2", g));
 
   EXPECT_EQ(63, g->num_nodes());
 
@@ -156,7 +156,7 @@ TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
       a       b
   */
   const int num_bits = 8;
-  TF_ASSERT_OK(DoQuantizeTraining(num_bits, g));
+  TF_ASSERT_OK(DoQuantizeTraining(num_bits, "QuantizeAndDequantizeV2", g));
 
   EXPECT_EQ(38, g->num_nodes());
 
@@ -178,7 +178,7 @@ TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
             SummarizeAttrValue(relu_q.attr().find("range_given")->second));
 }
 
-TEST_F(QuantizeTrainingTest, WithBackwardNodes) {
+TEST_F(QuantizeTrainingTest, WithBackwardNodes_QuantizeAndDequantize) {
   // Construct a graph with an additional backward Matmul.
   Reset();
   Graph* g = g_.get();
@@ -211,11 +211,11 @@ TEST_F(QuantizeTrainingTest, WithBackwardNodes) {
   g->AddControlEdge(backward_m, g->sink_node());
 
   int num_bits = 8;
-  TF_ASSERT_OK(DoQuantizeTraining(num_bits, g));
+  TF_ASSERT_OK(DoQuantizeTraining(num_bits, "QuantizeAndDequantizeV2", g));
 
   EXPECT_EQ(95, g->num_nodes());
 
-  // Ensure that we the backwards matmul input was not quantized.
+  // Ensure that the backwards matmul input was not quantized.
   Node* found_node;
   Status s = FindNode(g, strings::StrCat(d->name(), "/QuantizeAndDequantizeV2"),
                       &found_node);
@@ -232,6 +232,60 @@ TEST_F(QuantizeTrainingTest, WithBackwardNodes) {
       g, strings::StrCat(c->name(), "/QuantizeAndDequantizeV2"), &found_node));
 }
 
+TEST_F(QuantizeTrainingTest, WithBackwardNodes_FakeQuant) {
+  // Construct a graph with an additional backward Matmul.
+  Reset();
+  Graph* g = g_.get();
+  Node* a = Constant<float>({1.0, 2.0, 3.0, 4.0}, {2, 2});
+  Node* b = Constant<float>({1.0, 2.0, 3.0, 4.0}, {2, 2});
+  Node* c = Constant<float>({0.0, 1.0, 1.0, 0.0}, {2, 2});
+  // We will use node d as input to the backwards matmul to ensure that it
+  // isn't quantized.
+  Node* d = Constant<float>({0.0, 1.0, 1.0, 0.0}, {2, 2});
+  g->AddControlEdge(g->source_node(), a);
+  g->AddControlEdge(g->source_node(), b);
+  g->AddControlEdge(g->source_node(), c);
+  g->AddControlEdge(g->source_node(), d);
+  Node* relu = test::graph::Relu(g, a);
+  Node* identity = test::graph::Identity(g, b);
+  Node* m1 = test::graph::Matmul(g, relu, identity, false, false);
+  Node* m2 = test::graph::Matmul(g, identity, c, false, false);
+  g->AddControlEdge(m1, g->sink_node());
+  g->AddControlEdge(m2, g->sink_node());
+
+  // Add a Matmul node with name starting with "gradients". We will check that
+  // its input d was not quantized.
+  Node* backward_m;
+  TF_ASSERT_OK(NodeBuilder(g->NewName("gradients/n"), "MatMul")
+                   .Input(d)
+                   .Input(m2)
+                   .Attr("transpose_a", true)
+                   .Attr("transpose_b", false)
+                   .Finalize(g, &backward_m));
+  g->AddControlEdge(backward_m, g->sink_node());
+
+  int num_bits = 8;
+  TF_ASSERT_OK(DoQuantizeTraining(num_bits, "FakeQuantWithMinMaxVars", g));
+
+  EXPECT_EQ(95, g->num_nodes());
+
+  // Ensure that the backwards matmul input was not quantized.
+  Node* found_node;
+  Status s = FindNode(g, strings::StrCat(d->name(), "/FakeQuantWithMinMaxVars"),
+                      &found_node);
+  EXPECT_TRUE(StringPiece(s.ToString()).contains("not found")) << s;
+
+  // Ensure that m1 and m2's inputs were quantized.
+  TF_ASSERT_OK(
+      FindNode(g, strings::StrCat(relu->name(), "/FakeQuantWithMinMaxVars"),
+               &found_node));
+  TF_ASSERT_OK(
+      FindNode(g, strings::StrCat(identity->name(), "/FakeQuantWithMinMaxVars"),
+               &found_node));
+  TF_ASSERT_OK(FindNode(
+      g, strings::StrCat(c->name(), "/FakeQuantWithMinMaxVars"), &found_node));
+}
+
 TEST_F(QuantizeTrainingTest, QuantizeGraphDef) {
   // Construct a simple graph with 5 nodes.
   Reset();
@@ -254,8 +308,8 @@ TEST_F(QuantizeTrainingTest, QuantizeGraphDef) {
   input_graph.SerializeToString(&input_string);
 
   string result_string;
-  TF_ASSERT_OK(DoQuantizeTrainingOnSerializedGraphDef(input_string, num_bits,
-                                                      &result_string));
+  TF_ASSERT_OK(DoQuantizeTrainingOnSerializedGraphDef(
+      input_string, num_bits, "QuantizeAndDequantizeV2", &result_string));
 
   GraphDef result_graphdef;
   EXPECT_TRUE(ParseProtoUnlimited(&result_graphdef, result_string));
@@ -265,11 +319,105 @@ TEST_F(QuantizeTrainingTest, QuantizeGraphDef) {
   GraphConstructorOptions opts;
   Graph result_graph(OpRegistry::Global());
   TF_ASSERT_OK(ConvertGraphDefToGraph(opts, result_graphdef, &result_graph));
-  TF_ASSERT_OK(DoQuantizeTraining(num_bits, graph));
+  TF_ASSERT_OK(DoQuantizeTraining(num_bits, "QuantizeAndDequantizeV2", graph));
   EXPECT_EQ(graph->num_nodes(), result_graph.num_nodes());
 }
 
-TEST_F(QuantizeTrainingTest, FixedRangeAndEMARange) {
+TEST_F(QuantizeTrainingTest, FixedRangeAndEMARange_QuantizeAndDequantize) {
+  // Construct the following graph
+  // Relu has an unknown range, so we will check if the EMA correctly estimates
+  // the range.
+  /*
+           m1
+        /      \
+      Relu    Relu6
+        |       |
+        a       c
+  */
+  Reset();
+  Graph* g = g_.get();
+  Node* a;
+  TF_ASSERT_OK(Placeholder(g, "a", {2, 2}, &a));
+  Node* c = Constant<float>({2.0, 3.0, 4.0, 5.0}, {2, 2});
+  g->AddControlEdge(g->source_node(), a);
+  g->AddControlEdge(g->source_node(), c);
+  Node* relu = test::graph::Relu(g, a);
+  Node* relu6 = test::graph::Relu6(g, c);
+  Node* m1 = test::graph::Matmul(g, relu, relu6, false, false);
+  g->AddControlEdge(m1, g->sink_node());
+
+  // This is rewritten into the following subgraph, where Q_a and Q_c are
+  // quantize and dequantize subgraphs.
+  // Since relu's range is unknown, we check that the exponential moving average
+  // works correctly.
+  /*
+         m1
+      /      \
+     Q_a     Q_c
+      |       |
+    Relu     Relu6
+      |       |
+      a       c
+  */
+  const int num_bits = 8;
+  TF_ASSERT_OK(DoQuantizeTraining(num_bits, "QuantizeAndDequantizeV2", g));
+
+  SessionOptions options;
+  Session* sess;
+  TF_ASSERT_OK(NewSession(options, &sess));
+  GraphDef gdef;
+  g->ToGraphDef(&gdef);
+  TF_ASSERT_OK(sess->Create(gdef));
+
+  // The min and max values of the relu6 quantization should be constant values
+  // of 0 and 6.
+  string min_const_name = strings::StrCat(relu6->name(), "/InputMin");
+  string max_const_name = strings::StrCat(relu6->name(), "/InputMax");
+  std::vector<Tensor> outputs;
+  TF_ASSERT_OK(sess->Run({}, {min_const_name, max_const_name}, {}, &outputs));
+  EXPECT_EQ(outputs[0].flat<float>()(0), 0.0);
+  EXPECT_EQ(outputs[1].flat<float>()(0), 6.0);
+
+  Tensor a1(DT_FLOAT, TensorShape({2, 2}));
+  test::FillValues<float>(&a1, {0.0, 1.0, 2.0, 3.0});
+  Tensor a2(DT_FLOAT, TensorShape({2, 2}));
+  test::FillValues<float>(&a2, {1.0, 2.0, 3.0, 4.0});
+
+  TF_ASSERT_OK(sess->Run({{"a", a1}}, {m1->name()}, {}, &outputs));
+
+  // The value of the min and max should be set to the min and max of a1 since
+  // this is the first run that initializes the EMA variables.
+  string min_var_name = strings::StrCat(relu->name(), "/Min/Variable");
+  string max_var_name = strings::StrCat(relu->name(), "/Max/Variable");
+  TF_ASSERT_OK(sess->Run({}, {min_var_name, max_var_name}, {}, &outputs));
+  EXPECT_EQ(outputs[0].flat<float>()(0), 0.0);
+  EXPECT_EQ(outputs[1].flat<float>()(0), 3.0);
+
+  // The relu6 quantization range should remain unchanged.
+  TF_ASSERT_OK(sess->Run({}, {min_const_name, max_const_name}, {}, &outputs));
+  EXPECT_EQ(outputs[0].flat<float>()(0), 0.0);
+  EXPECT_EQ(outputs[1].flat<float>()(0), 6.0);
+
+  // Now when we run with new inputs, we should get a moving average for the min
+  // and max variables. They should be equal to:
+  // min_var = old_min_var * decay + min(a2) * (1 - decay)
+  // max_var = old_max_var * decay + max(a2) * (1 - decay)
+  TF_ASSERT_OK(sess->Run({{"a", a2}}, {m1->name()}, {}, &outputs));
+
+  TF_ASSERT_OK(sess->Run({}, {min_var_name, max_var_name}, {}, &outputs));
+  const float decay = 0.999;
+  const float expected_min = 0.0 * decay + 1.0 * (1.0 - decay);
+  const float expected_max = 3.0 * decay + 4.0 * (1.0 - decay);
+  EXPECT_NEAR(outputs[0].flat<float>()(0), expected_min, 1e-4);
+  EXPECT_NEAR(outputs[1].flat<float>()(0), expected_max, 1e-4);
+
+  // The relu6 quantization range should remain unchanged.
+  TF_ASSERT_OK(sess->Run({}, {min_const_name, max_const_name}, {}, &outputs));
+  EXPECT_EQ(outputs[0].flat<float>()(0), 0.0);
+  EXPECT_EQ(outputs[1].flat<float>()(0), 6.0);
+}
+
+TEST_F(QuantizeTrainingTest, FixedRangeAndEMARange_FakeQuant) {
   // Construct the following graph
   // Relu has an unknown range, so we will check if the EMA correctly estimates
   // the range.
@@ -306,7 +454,7 @@ TEST_F(QuantizeTrainingTest, FixedRangeAndEMARange) {
       a       c
   */
   const int num_bits = 8;
-  TF_ASSERT_OK(DoQuantizeTraining(num_bits, g));
+  TF_ASSERT_OK(DoQuantizeTraining(num_bits, "FakeQuantWithMinMaxVars", g));
 
   SessionOptions options;
   Session* sess;
diff --git a/tensorflow/python/training/quantize_training.i b/tensorflow/python/training/quantize_training.i
index 59cc895084..40c6076973 100644
--- a/tensorflow/python/training/quantize_training.i
+++ b/tensorflow/python/training/quantize_training.i
@@ -24,8 +24,10 @@ static PyObject* DoQuantizeTrainingOnGraphDefHelper(
     int num_bits,
     TF_Status* out_status) {
   string result;
+  // TODO(suharshs): Make the QuantizeAndDequantizeV2 configurable.
   tensorflow::Status status =
-      tensorflow::DoQuantizeTrainingOnSerializedGraphDef(input_graph, num_bits, &result);
+      tensorflow::DoQuantizeTrainingOnSerializedGraphDef(input_graph, num_bits,
+      "QuantizeAndDequantizeV2", &result);
   if (!status.ok()) {
     Set_TF_Status_from_Status(out_status, status);
     Py_RETURN_NONE;
-- 
GitLab


From 827e0e2a0b5b6f85ffeae1cb20156ea95cb62a27 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 05:48:18 -0800
Subject: [PATCH 0780/1563] Change creation of symlinks (via skylark method) in
 cuda_configure.bzl.tpl for creation of genrules (via _tpl) that do the
 equivalent symlinks, but during build (not during Skylark execution). Change:
 154535355

---
 third_party/gpus/crosstool/CROSSTOOL_nvcc.tpl |   4 +-
 .../crosstool_wrapper_driver_is_not_gcc.tpl   |   3 +-
 third_party/gpus/cuda/BUILD.tpl               |  35 +++--
 third_party/gpus/cuda_configure.bzl           | 147 +++++++++++++++---
 4 files changed, 146 insertions(+), 43 deletions(-)

diff --git a/third_party/gpus/crosstool/CROSSTOOL_nvcc.tpl b/third_party/gpus/crosstool/CROSSTOOL_nvcc.tpl
index 116f67cbae..05290d647e 100644
--- a/third_party/gpus/crosstool/CROSSTOOL_nvcc.tpl
+++ b/third_party/gpus/crosstool/CROSSTOOL_nvcc.tpl
@@ -121,7 +121,7 @@ toolchain {
   # linker_flag: "-Wl,--detect-odr-violations"
 
   # Include directory for cuda headers.
-  cxx_builtin_include_directory: "%{cuda_include_path}"
+%{cuda_include_path}
 
   compilation_mode_flags {
     mode: DBG
@@ -220,7 +220,7 @@ toolchain {
   linker_flag: "-no-canonical-prefixes"
 
   # Include directory for cuda headers.
-  cxx_builtin_include_directory: "%{cuda_include_path}"
+%{cuda_include_path}
 
   compilation_mode_flags {
     mode: DBG
diff --git a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
index ceebb1e0e6..cab533b9e7 100755
--- a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
+++ b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
@@ -49,8 +49,7 @@ import pipes
 CPU_COMPILER = ('%{cpu_compiler}')
 GCC_HOST_COMPILER_PATH = ('%{gcc_host_compiler_path}')
 
-CURRENT_DIR = os.path.dirname(sys.argv[0])
-NVCC_PATH = CURRENT_DIR + '/../../../cuda/bin/nvcc'
+NVCC_PATH = '%{nvcc_path}'
 PREFIX_DIR = os.path.dirname(GCC_HOST_COMPILER_PATH)
 NVCC_VERSION = '%{cuda_version}'
 
diff --git a/third_party/gpus/cuda/BUILD.tpl b/third_party/gpus/cuda/BUILD.tpl
index 4b996db7a6..279c441255 100644
--- a/third_party/gpus/cuda/BUILD.tpl
+++ b/third_party/gpus/cuda/BUILD.tpl
@@ -41,10 +41,10 @@ config_setting(
 
 cc_library(
     name = "cuda_headers",
-    hdrs = glob([
-        "**/*.h",
-        "**/*.hpp",
-    ]),
+    hdrs = [
+        "cuda_config.h",
+        %{cuda_headers}
+    ],
     includes = [
         ".",
         "include",
@@ -55,7 +55,7 @@ cc_library(
 cc_library(
     name = "cudart_static",
     srcs = ["lib/%{cudart_static_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkopts = select({
         ":freebsd": [],
         "//conditions:default": ["-ldl"],
@@ -69,7 +69,7 @@ cc_library(
 cc_library(
     name = "cuda_driver",
     srcs = ["lib/%{cuda_driver_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     visibility = ["//visibility:public"],
 )
 
@@ -77,7 +77,7 @@ cc_library(
     name = "cudart",
     srcs = ["lib/%{cudart_lib}"],
     data = ["lib/%{cudart_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -86,7 +86,7 @@ cc_library(
     name = "cublas",
     srcs = ["lib/%{cublas_lib}"],
     data = ["lib/%{cublas_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -95,7 +95,7 @@ cc_library(
     name = "cusolver",
     srcs = ["lib/%{cusolver_lib}"],
     data = ["lib/%{cusolver_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     linkopts = ["-lgomp"],
     visibility = ["//visibility:public"],
@@ -105,7 +105,7 @@ cc_library(
     name = "cudnn",
     srcs = ["lib/%{cudnn_lib}"],
     data = ["lib/%{cudnn_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -114,7 +114,7 @@ cc_library(
     name = "cufft",
     srcs = ["lib/%{cufft_lib}"],
     data = ["lib/%{cufft_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -123,7 +123,7 @@ cc_library(
     name = "curand",
     srcs = ["lib/%{curand_lib}"],
     data = ["lib/%{curand_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -143,9 +143,10 @@ cc_library(
 
 cc_library(
     name = "cupti_headers",
-    hdrs = glob([
-        "**/*.h",
-    ]),
+    hdrs = [
+        "cuda_config.h",
+        ":cuda-extras",
+    ],
     includes = [
         ".",
         "extras/CUPTI/include/",
@@ -161,6 +162,8 @@ cc_library(
 
 cc_library(
     name = "libdevice_root",
-    data = glob(["nvvm/libdevice/*.bc"]),
+    data = [":cuda-nvvm"],
     visibility = ["//visibility:public"],
 )
+
+%{cuda_include_genrules}
diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index 60118a95f2..87d6ec1a3b 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -147,6 +147,36 @@ def _host_compiler_includes(repository_ctx, cc):
     inc_entries.append("  cxx_builtin_include_directory: \"%s\"" % inc_dir)
   return "\n".join(inc_entries)
 
+def _cuda_include_path(repository_ctx, cuda_config):
+  """Generates the cxx_builtin_include_directory entries for cuda inc dirs.
+
+  Args:
+    repository_ctx: The repository context.
+    cc: The path to the gcc host compiler.
+
+  Returns:
+    A string containing the cxx_builtin_include_directory for each of the gcc
+    host compiler include directories, which can be added to the CROSSTOOL
+    file.
+  """
+  nvcc_path = repository_ctx.path("%s/bin/nvcc%s" %
+                                  (cuda_config.cuda_toolkit_path,
+                                   ".exe" if cuda_config.cpu_value == "Windows" else ""))
+  result = repository_ctx.execute([nvcc_path, '-v',
+                                  '/dev/null', '-o', '/dev/null'])
+  target_dir = ""
+  for one_line in result.stderr.splitlines():
+    if one_line.startswith('#$ _TARGET_DIR_='):
+      target_dir = (cuda_config.cuda_toolkit_path + '/' +
+                    one_line.replace('#$ _TARGET_DIR_=', '') + "/include")
+  inc_entries = []
+  if target_dir != "":
+    inc_entries.append("  cxx_builtin_include_directory: \"%s\"" % target_dir)
+  default_include = cuda_config.cuda_toolkit_path + '/include'
+  inc_entries.append("  cxx_builtin_include_directory: \"%s\"" %
+                     default_include)
+  return "\n".join(inc_entries)
+
 
 def _enable_cuda(repository_ctx):
   if "TF_NEED_CUDA" in repository_ctx.os.environ:
@@ -699,6 +729,8 @@ def _create_dummy_repository(repository_ctx):
            "%{cufft_lib}": _lib_name("cufft", cpu_value),
            "%{curand_lib}": _lib_name("curand", cpu_value),
            "%{cupti_lib}": _lib_name("cupti", cpu_value),
+           "%{cuda_include_genrules}": '',
+           "%{cuda_headers}": '',
        })
   _tpl(repository_ctx, "cuda:platform.bzl",
        {
@@ -742,17 +774,62 @@ def _create_dummy_repository(repository_ctx):
                       _DUMMY_CROSSTOOL_BZL_FILE)
   repository_ctx.file("crosstool/BUILD", _DUMMY_CROSSTOOL_BUILD_FILE)
 
-def _symlink_dir(repository_ctx, src_dir, dest_dir):
-  """Symlinks all the files in a directory.
 
-  Args:
-    repository_ctx: The repository context.
-    src_dir: The source directory.
-    dest_dir: The destination directory to create the symlinks in.
+def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name,
+    src_files = [], dest_files = []):
+  """Returns a genrule to symlink a set of files.
+
+  If src_dir is passed, files will be read from the given directory; otherwise
+  we assume files are in src_files and dest_files
   """
-  files = repository_ctx.path(src_dir).readdir()
-  for src_file in files:
-    repository_ctx.symlink(src_file, dest_dir + "/" + src_file.basename)
+  if src_dir != None:
+    files = _read_dir(repository_ctx, src_dir)
+    # Create a list with the src_dir stripped to use for outputs.
+    dest_files = files.replace(src_dir, '').splitlines()
+    src_files = files.splitlines()
+  command = []
+  outs = []
+  for i in range(len(dest_files)):
+    if dest_files[i] != "":
+      command.append('ln -s ' + src_files[i] + ' $(@D)/' +
+                     dest_dir + dest_files[i])
+      outs.append('      "' + dest_dir + dest_files[i] + '",')
+  genrule = _genrule(src_dir, genrule_name, " && ".join(command),
+                     "\n".join(outs))
+  return genrule
+
+
+def _genrule(src_dir, genrule_name, command, outs):
+  """Returns a string with a genrule.
+
+  Genrule executes the given command and produces the given outputs.
+  """
+  return (
+      'genrule(\n' +
+      '    name = "' +
+      genrule_name + '",\n' +
+      '    outs = [\n' +
+      outs +
+      '    ],\n' +
+      '    cmd = """\n' +
+      command +
+      '    """,\n' +
+      ')\n\n'
+  )
+
+
+def _read_dir(repository_ctx, src_dir):
+  """Returns a string with all files in a directory.
+
+  Finds all files inside a directory, traversing subfolders and following
+  symlinks. The returned string contains the full path of all files
+  separated by line breaks.
+  """
+  find_result = repository_ctx.execute([
+      "find", src_dir, "-follow", "-type", "f"
+  ])
+  return find_result.stdout
+
 
 def _use_cuda_clang(repository_ctx):
   if "TF_CUDA_CLANG" in repository_ctx.os.environ:
@@ -775,25 +852,42 @@ def _create_cuda_repository(repository_ctx):
   cudnn_header_dir = _find_cudnn_header_dir(repository_ctx,
                                             cuda_config.cudnn_install_basedir)
 
-  # Set up symbolic links for the cuda toolkit. We link at the individual file
-  # level not at the directory level. This is because the external library may
-  # have a different file layout from our desired structure.
+  # Set up symbolic links for the cuda toolkit by creating genrules to do
+  # symlinking. We create one genrule for each directory we want to track under
+  # cuda_toolkit_path
   cuda_toolkit_path = cuda_config.cuda_toolkit_path
-  _symlink_dir(repository_ctx, cuda_toolkit_path + "/include", "cuda/include")
-  _symlink_dir(repository_ctx, cuda_toolkit_path + "/bin", "cuda/bin")
-  _symlink_dir(repository_ctx, cuda_toolkit_path + "/nvvm", "cuda/nvvm")
-  _symlink_dir(repository_ctx, cuda_toolkit_path + "/extras/CUPTI/include",
-               "cuda/extras/CUPTI/include")
+  cuda_include_path = cuda_toolkit_path + "/include"
+  genrules = [_symlink_genrule_for_dir(repository_ctx,
+      cuda_include_path, "include", "cuda-include")]
+  genrules.append(_symlink_genrule_for_dir(repository_ctx,
+      cuda_toolkit_path + "/nvvm", "nvvm", "cuda-nvvm"))
+  genrules.append(_symlink_genrule_for_dir(repository_ctx,
+      cuda_toolkit_path + "/extras/CUPTI/include",
+      "extras/CUPTI/include", "cuda-extras"))
 
   cuda_libs = _find_libs(repository_ctx, cuda_config)
+  cuda_lib_src = []
+  cuda_lib_dest = []
   for lib in cuda_libs.values():
-    repository_ctx.symlink(lib.path, "cuda/lib/" + lib.file_name)
+    cuda_lib_src.append(lib.path)
+    cuda_lib_dest.append("lib/" + lib.file_name)
+  genrules.append(_symlink_genrule_for_dir(repository_ctx, None, "", "cuda-lib",
+                                       cuda_lib_src, cuda_lib_dest))
 
   # Set up the symbolic links for cudnn if cudnn was was not installed to
   # CUDA_TOOLKIT_PATH.
-  if not repository_ctx.path("cuda/include/cudnn.h").exists:
-    repository_ctx.symlink(cudnn_header_dir + "/cudnn.h",
-                           "cuda/include/cudnn.h")
+  included_files = _read_dir(repository_ctx, cuda_include_path).replace(
+      cuda_include_path, '').splitlines()
+  if '/cudnn.h' not in included_files:
+    genrules.append(_symlink_genrule_for_dir(repository_ctx, None, "",
+        "cudnn-include", [cudnn_header_dir + "/cudnn.h"], ["include/cudnn.h"]))
+  else:
+    genrules.append(
+            'filegroup(\n' +
+            '    name = "cudnn-include",\n' +
+            '    srcs = [],\n' +
+            ')\n'
+        )
 
   # Set up BUILD file for cuda/
   _tpl(repository_ctx, "cuda:build_defs.bzl",
@@ -815,8 +909,10 @@ def _create_cuda_repository(repository_ctx):
            "%{cufft_lib}": cuda_libs["cufft"].file_name,
            "%{curand_lib}": cuda_libs["curand"].file_name,
            "%{cupti_lib}": cuda_libs["cupti"].file_name,
+           "%{cuda_include_genrules}": "\n".join(genrules),
+           "%{cuda_headers}": ('":cuda-include",\n' +
+                               '        ":cudnn-include",')
        })
-
   _tpl(repository_ctx, "cuda:platform.bzl",
        {
            "%{cuda_version}": cuda_config.cuda_version,
@@ -829,19 +925,24 @@ def _create_cuda_repository(repository_ctx):
   cc = find_cc(repository_ctx)
   host_compiler_includes = _host_compiler_includes(repository_ctx, cc)
   cuda_defines = {
-           "%{cuda_include_path}": cuda_config.cuda_toolkit_path + '/include',
+           "%{cuda_include_path}": _cuda_include_path(repository_ctx,
+                                                      cuda_config),
            "%{host_compiler_includes}": host_compiler_includes,
        }
   if _use_cuda_clang(repository_ctx):
     cuda_defines["%{clang_path}"] = cc
     _tpl(repository_ctx, "crosstool:CROSSTOOL_clang", cuda_defines, out="crosstool/CROSSTOOL")
   else:
+    nvcc_path = str(repository_ctx.path("%s/bin/nvcc%s" %
+        (cuda_config.cuda_toolkit_path,
+        ".exe" if cuda_config.cpu_value == "Windows" else "")))
     _tpl(repository_ctx, "crosstool:CROSSTOOL_nvcc", cuda_defines, out="crosstool/CROSSTOOL")
     _tpl(repository_ctx,
          "crosstool:clang/bin/crosstool_wrapper_driver_is_not_gcc",
          {
              "%{cpu_compiler}": str(cc),
              "%{cuda_version}": cuda_config.cuda_version,
+             "%{nvcc_path}": nvcc_path,
              "%{gcc_host_compiler_path}": str(cc),
              "%{cuda_compute_capabilities}": ", ".join(
                  ["\"%s\"" % c for c in cuda_config.compute_capabilities]),
-- 
GitLab


From dbc95705e57dd9ab11fd8085b40f4dfef25300c8 Mon Sep 17 00:00:00 2001
From: David Soergel <soergel@google.com>
Date: Fri, 28 Apr 2017 08:24:42 -0800
Subject: [PATCH 0781/1563] Record input feature keys in exported SavedModel as
 a CollectionDef. Change: 154547403

---
 .../contrib/learn/python/learn/estimators/constants.py    | 5 +++++
 .../contrib/learn/python/learn/estimators/estimator.py    | 8 ++++++++
 .../learn/python/learn/estimators/estimator_test.py       | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/constants.py b/tensorflow/contrib/learn/python/learn/estimators/constants.py
index a62f1815b2..fc69e81024 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/constants.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/constants.py
@@ -38,3 +38,8 @@ class ProblemType(object):
   CLASSIFICATION = 1
   LINEAR_REGRESSION = 2
   LOGISTIC_REGRESSION = 3
+
+
+# CollectionDef key for the input feature keys.
+# TODO(b/34388557): This is a stopgap; please follow the bug to learn of changes
+COLLECTION_DEF_KEY_FOR_INPUT_FEATURE_KEYS = "input_feature_keys"
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 8a92809a0c..4ca3120dec 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -40,6 +40,7 @@ from tensorflow.contrib.learn.python.learn import metric_spec
 from tensorflow.contrib.learn.python.learn import monitors as monitor_lib
 from tensorflow.contrib.learn.python.learn import trainable
 from tensorflow.contrib.learn.python.learn.estimators import _sklearn as sklearn
+from tensorflow.contrib.learn.python.learn.estimators import constants
 from tensorflow.contrib.learn.python.learn.estimators import metric_key
 from tensorflow.contrib.learn.python.learn.estimators import model_fn as model_fn_lib
 from tensorflow.contrib.learn.python.learn.estimators import run_config
@@ -1251,6 +1252,13 @@ class Estimator(BaseEstimator):
       input_alternatives, features = (
           saved_model_export_utils.get_input_alternatives(input_ops))
 
+      # TODO(b/34388557) This is a stopgap, pending recording model provenance.
+      # Record which features are expected at serving time.  It is assumed that
+      # these are the features that were used in training.
+      for feature_key in input_ops.features.keys():
+        ops.add_to_collection(
+            constants.COLLECTION_DEF_KEY_FOR_INPUT_FEATURE_KEYS, feature_key)
+
       # Call the model_fn and collect the output alternatives.
       model_fn_ops = self._call_model_fn(features, None,
                                          model_fn_lib.ModeKeys.INFER)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
index 6e10fdb977..8c61ffad55 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
@@ -38,6 +38,7 @@ from tensorflow.contrib.learn.python.learn import models
 from tensorflow.contrib.learn.python.learn import monitors as monitors_lib
 from tensorflow.contrib.learn.python.learn.datasets import base
 from tensorflow.contrib.learn.python.learn.estimators import _sklearn
+from tensorflow.contrib.learn.python.learn.estimators import constants
 from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators import linear
 from tensorflow.contrib.learn.python.learn.estimators import model_fn
@@ -909,6 +910,10 @@ class EstimatorTest(test.TestCase):
         self.assertTrue('input_example_tensor' in graph_ops)
         self.assertTrue('ParseExample/ParseExample' in graph_ops)
         self.assertTrue('linear/linear/feature/matmul' in graph_ops)
+        self.assertSameElements(
+            ['bogus_lookup', 'feature'],
+            graph.get_collection(
+                constants.COLLECTION_DEF_KEY_FOR_INPUT_FEATURE_KEYS))
 
     # cleanup
     gfile.DeleteRecursively(tmpdir)
-- 
GitLab


From 00a8b7b492e8360633b73a033c65edbdb6d1aca9 Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <shoyer@google.com>
Date: Fri, 28 Apr 2017 08:32:06 -0800
Subject: [PATCH 0782/1563] Fix SummaryAtEndHook when used with tf.learn's
 Experiment Change: 154548095

---
 tensorflow/contrib/training/python/training/evaluation.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/training/python/training/evaluation.py b/tensorflow/contrib/training/python/training/evaluation.py
index f4effaf6ef..8a985fe0e2 100644
--- a/tensorflow/contrib/training/python/training/evaluation.py
+++ b/tensorflow/contrib/training/python/training/evaluation.py
@@ -290,17 +290,17 @@ class SummaryAtEndHook(session_run_hook.SessionRunHook):
       ValueError: If both `log_dir` and `summary_writer` are `None`.
     """
     self._summary_op = summary_op
+    self._replace_summary_op = summary_op is None
     self._feed_dict = feed_dict
     self._summary_writer = summary_writer
     self._log_dir = log_dir
-    self._summary_writer = summary_writer
     if self._log_dir is None and self._summary_writer is None:
       raise ValueError('One of log_dir or summary_writer should be used.')
-    self._global_step = variables.get_or_create_global_step()
 
   def begin(self):
-    if self._summary_op is None:
+    if self._replace_summary_op:
       self._summary_op = summary.merge_all()
+    self._global_step = variables.get_or_create_global_step()
 
   def after_create_session(self, session, coord):
     if self._summary_writer is None and self._log_dir:
-- 
GitLab


From 0c08c585591152046ca1e6781d1f2fa573427dfc Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Fri, 28 Apr 2017 09:17:16 -0800
Subject: [PATCH 0783/1563] Fix links to tensorflow/models

Fixes #8809
Change: 154553141
---
 tensorflow/docs_src/deploy/distributed.md          |  2 +-
 .../docs_src/programmers_guide/reading_data.md     |  4 ++--
 tensorflow/docs_src/tutorials/deep_cnn.md          | 14 +++++++-------
 tensorflow/docs_src/tutorials/word2vec.md          | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tensorflow/docs_src/deploy/distributed.md b/tensorflow/docs_src/deploy/distributed.md
index cdfb4672fa..99390f7416 100644
--- a/tensorflow/docs_src/deploy/distributed.md
+++ b/tensorflow/docs_src/deploy/distributed.md
@@ -178,7 +178,7 @@ simplify the work of specifying a replicated model. Possible approaches include:
   values for the current parameters, compute gradients in parallel, and then
   apply them together. It is compatible with in-graph replication (e.g. using
   gradient averaging as in the
-  [CIFAR-10 multi-GPU trainer](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_multi_gpu_train.py)),
+  [CIFAR-10 multi-GPU trainer](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_multi_gpu_train.py)),
   and between-graph replication (e.g. using the
   @{tf.train.SyncReplicasOptimizer}).
 
diff --git a/tensorflow/docs_src/programmers_guide/reading_data.md b/tensorflow/docs_src/programmers_guide/reading_data.md
index 7c3a37417d..c0a50a1518 100644
--- a/tensorflow/docs_src/programmers_guide/reading_data.md
+++ b/tensorflow/docs_src/programmers_guide/reading_data.md
@@ -133,7 +133,7 @@ uses a file format where each record is represented using a fixed number of
 bytes: 1 byte for the label followed by 3072 bytes of image data. Once you have
 a uint8 tensor, standard operations can slice out each piece and reformat as
 needed. For CIFAR-10, you can see how to do the reading and decoding in
-[`tensorflow_models/tutorials/image/cifar10/cifar10_input.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_input.py)
+[`tensorflow_models/tutorials/image/cifar10/cifar10_input.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_input.py)
 and described in
 @{$deep_cnn#prepare-the-data$this tutorial}.
 
@@ -170,7 +170,7 @@ You can then do any preprocessing of these examples you want. This would be any
 processing that doesn't depend on trainable parameters. Examples include
 normalization of your data, picking a random slice, adding noise or distortions,
 etc.  See
-[`tensorflow_models/tutorials/image/cifar10/cifar10_input.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_input.py)
+[`tensorflow_models/tutorials/image/cifar10/cifar10_input.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_input.py)
 for an example.
 
 ### Batching
diff --git a/tensorflow/docs_src/tutorials/deep_cnn.md b/tensorflow/docs_src/tutorials/deep_cnn.md
index ba3fbe1280..bcdeb90ebe 100644
--- a/tensorflow/docs_src/tutorials/deep_cnn.md
+++ b/tensorflow/docs_src/tutorials/deep_cnn.md
@@ -83,21 +83,21 @@ for details.  It consists of 1,068,298 learnable parameters and requires about
 ## Code Organization
 
 The code for this tutorial resides in
-[`tensorflow_models/tutorials/image/cifar10/`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/).
+[`tensorflow_models/tutorials/image/cifar10/`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/).
 
 File | Purpose
 --- | ---
-[`cifar10_input.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_input.py) | Reads the native CIFAR-10 binary file format.
-[`cifar10.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10.py) | Builds the CIFAR-10 model.
-[`cifar10_train.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_train.py) | Trains a CIFAR-10 model on a CPU or GPU.
-[`cifar10_multi_gpu_train.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_multi_gpu_train.py) | Trains a CIFAR-10 model on multiple GPUs.
-[`cifar10_eval.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_eval.py) | Evaluates the predictive performance of a CIFAR-10 model.
+[`cifar10_input.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_input.py) | Reads the native CIFAR-10 binary file format.
+[`cifar10.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10.py) | Builds the CIFAR-10 model.
+[`cifar10_train.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_train.py) | Trains a CIFAR-10 model on a CPU or GPU.
+[`cifar10_multi_gpu_train.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_multi_gpu_train.py) | Trains a CIFAR-10 model on multiple GPUs.
+[`cifar10_eval.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_eval.py) | Evaluates the predictive performance of a CIFAR-10 model.
 
 
 ## CIFAR-10 Model
 
 The CIFAR-10 network is largely contained in
-[`cifar10.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10.py).
+[`cifar10.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10.py).
 The complete training
 graph contains roughly 765 operations. We find that we can make the code most
 reusable by constructing the graph with the following modules:
diff --git a/tensorflow/docs_src/tutorials/word2vec.md b/tensorflow/docs_src/tutorials/word2vec.md
index 3845e67496..1b25cb9e89 100644
--- a/tensorflow/docs_src/tutorials/word2vec.md
+++ b/tensorflow/docs_src/tutorials/word2vec.md
@@ -23,7 +23,7 @@ straight in, feel free to look at the minimalistic implementation in
 This basic example contains the code needed to download some data, train on it a
 bit and visualize the result. Once you get comfortable with reading and running
 the basic version, you can graduate to
-[tensorflow_models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py)
+[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py)
 which is a more serious implementation that showcases some more advanced
 TensorFlow principles about how to efficiently use threads to move data into a
 text model, how to checkpoint during training, etc.
@@ -341,7 +341,7 @@ t-SNE.
 Et voila! As expected, words that are similar end up clustering nearby each
 other. For a more heavyweight implementation of word2vec that showcases more of
 the advanced features of TensorFlow, see the implementation in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py).
+[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
 
 ## Evaluating Embeddings: Analogical Reasoning
 
@@ -357,7 +357,7 @@ Download the dataset for this task from
 
 To see how we do this evaluation, have a look at the `build_eval_graph()` and
 `eval()` functions in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py).
+[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
 
 The choice of hyperparameters can strongly influence the accuracy on this task.
 To achieve state-of-the-art performance on this task requires training over a
@@ -385,13 +385,13 @@ your model is seriously bottlenecked on input data, you may want to implement a
 custom data reader for your problem, as described in
 @{$new_data_formats$New Data Formats}.  For the case of Skip-Gram
 modeling, we've actually already done this for you as an example in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py).
+[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
 
 If your model is no longer I/O bound but you want still more performance, you
 can take things further by writing your own TensorFlow Ops, as described in
 @{$adding_an_op$Adding a New Op}.  Again we've provided an
 example of this for the Skip-Gram case
-[tensorflow_models/tutorials/embedding/word2vec_optimized.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec_optimized.py).
+[tensorflow_models/tutorials/embedding/word2vec_optimized.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec_optimized.py).
 Feel free to benchmark these against each other to measure performance
 improvements at each stage.
 
-- 
GitLab


From 3316ee81de90664e1de32b00a17688036d0f40de Mon Sep 17 00:00:00 2001
From: Adam Roberts <adarob@google.com>
Date: Fri, 28 Apr 2017 09:46:57 -0800
Subject: [PATCH 0784/1563] Catch TypeError and add improved failure message
 for hparam parsing. Change: 154556754

---
 .../training/python/training/hparam.py        | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tensorflow/contrib/training/python/training/hparam.py b/tensorflow/contrib/training/python/training/hparam.py
index 987d2a0b70..1d17782820 100644
--- a/tensorflow/contrib/training/python/training/hparam.py
+++ b/tensorflow/contrib/training/python/training/hparam.py
@@ -84,9 +84,12 @@ def parse_values(values, type_map):
     name = m_dict['name']
     if name not in type_map:
       raise ValueError('Unknown hyperparameter type for %s' % name)
-    def parse_fail():
-      raise ValueError('Could not parse hparam %s in %s' % (name, values))
-    if type_map[name] == bool:
+    type_ = type_map[name]
+    def parse_fail(value):
+      raise ValueError(
+          'Could not parse hparam \'%s\' of type \'%s\' with value \'%s\' in %s'
+          % (name, type_.__name__, value, values))
+    if type_ == bool:
       def parse_bool(value):
         if value == 'true':
           return True
@@ -95,24 +98,24 @@ def parse_values(values, type_map):
         else:
           try:
             return bool(int(value))
-          except ValueError:
-            parse_fail()
+          except (ValueError, TypeError):
+            parse_fail(value)
       parse = parse_bool
     else:
-      parse = type_map[name]
+      parse = type_
     if m_dict['val'] is not None:
       try:
         ret[name] = parse(m_dict['val'])
-      except ValueError:
-        parse_fail()
+      except (ValueError, TypeError):
+        parse_fail(m_dict['val'])
     elif m_dict['vals'] is not None:
       elements = filter(None, re.split('[ ,]', m_dict['vals']))
       try:
         ret[name] = [parse(e) for e in elements]
-      except ValueError:
-        parse_fail()
+      except (ValueError, TypeError):
+        parse_fail(m_dict['vals'])
     else:
-      parse_fail()
+      parse_fail('')
   return ret
 
 
-- 
GitLab


From f635c181204b7e46d07c8f3457b7d1fbd7b95b57 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Fri, 28 Apr 2017 10:29:56 -0800
Subject: [PATCH 0785/1563] Fix formatting on Estimator __init__ docstring.
 Change: 154562449

---
 tensorflow/python/estimator/estimator.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index d32caa8ac7..c04e37eccd 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -91,7 +91,9 @@ class Estimator(object):
 
     Args:
       model_fn: Model function. Follows the signature:
+
         * Args:
+
           * `features`: single `Tensor` or `dict` of `Tensor`s
                  (depending on data passed to `train`),
           * `labels`: `Tensor` or `dict` of `Tensor`s (for multi-head
@@ -111,6 +113,7 @@ class Estimator(object):
 
         * Returns:
           `EstimatorSpec`
+
       model_dir: Directory to save model parameters, graph and etc. This can
         also be used to load checkpoints from the directory into a estimator to
         continue training a previously saved model. If `None`, the model_dir in
-- 
GitLab


From 13afb3d3f92ffe83fbe8d024e3a16a00863da8e0 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Fri, 28 Apr 2017 10:45:04 -0800
Subject: [PATCH 0786/1563] Java: Refer to installation instructions on
 www.tensorflow.org in the README Change: 154564406

---
 tensorflow/java/README.md | 190 ++++++++------------------------------
 1 file changed, 36 insertions(+), 154 deletions(-)

diff --git a/tensorflow/java/README.md b/tensorflow/java/README.md
index e13ad61db0..3838fbef42 100644
--- a/tensorflow/java/README.md
+++ b/tensorflow/java/README.md
@@ -1,154 +1,18 @@
 # TensorFlow for Java
 
-Java bindings for TensorFlow. ([Javadoc](https://www.tensorflow.org/api_docs/java/reference/org/tensorflow/package-summary))
-
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.tensorflow/tensorflow/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.tensorflow/tensorflow)
-
 > *WARNING*: The TensorFlow Java API is not currently covered by the TensorFlow
 > [API stability guarantees](https://www.tensorflow.org/programmers_guide/version_semantics).
 >
 > For using TensorFlow on Android refer to
 > [contrib/android](https://www.tensorflow.org/code/tensorflow/contrib/android),
 > [makefile](https://www.tensorflow.org/code/tensorflow/contrib/makefile#android)
-> and/or the [Android
-> demo](https://www.tensorflow.org/code/tensorflow/examples/android).
-
-## Quickstart: Using [Apache Maven](https://maven.apache.org)
-
-TensorFlow for Java releases are included in
-[Maven Central](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.tensorflow%22%20AND%20a%3A%22tensorflow%22)
-and support Linux, OS X and Windows. To use it, add the following dependency to
-your project's `pom.xml`:
-
-```xml
-<dependency>
-  <groupId>org.tensorflow</groupId>
-  <artifactId>tensorflow</artifactId>
-  <version>1.1.0</version>
-</dependency>
-```
-
-That's all. As an example, to create a Maven project for the
-[label image example](https://www.tensorflow.org/code/tensorflow/java/src/main/java/org/tensorflow/examples/LabelImage.java):
-
-1.  Create a `pom.xml`:
-
-    ```xml
-    <project>
-        <modelVersion>4.0.0</modelVersion>
-        <groupId>org.myorg</groupId>
-        <artifactId>label-image</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <properties>
-          <exec.mainClass>org.tensorflow.examples.LabelImage</exec.mainClass>
-          <!-- The LabelImage example code requires at least JDK 1.7. -->
-          <!-- The maven compiler plugin defaults to a lower version -->
-          <maven.compiler.source>1.7</maven.compiler.source>
-          <maven.compiler.target>1.7</maven.compiler.target>
-        </properties>
-        <dependencies>
-          <dependency>
-            <groupId>org.tensorflow</groupId>
-            <artifactId>tensorflow</artifactId>
-            <version>1.1.0</version>
-          </dependency>
-        </dependencies>
-    </project>
-    ```
-
-2.  Download the [example source](https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/java/src/main/java/org/tensorflow/examples/LabelImage.java)
-    into `src/main/java/org/tensorflow/examples`. On Linux and OS X, the following script should work:
-
-    ```sh
-    mkdir -p src/main/java/org/tensorflow/examples
-    curl -L "https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/java/src/main/java/org/tensorflow/examples/LabelImage.java" -o src/main/java/org/tensorflow/examples/LabelImage.java
-    ```
-
-3.  Compile and execute:
-
-    ```sh
-    mvn compile exec:java
-    ```
-
-## Quickstart: Using `java` and `javac`
-
-This section describes how to use TensorFlow armed with just a JDK installation.
-
-1.  Download the Java archive (JAR):
-    [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar)
-    (optionally, the Java sources:
-    [libtensorflow-src.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-src-1.1.0.jar)).
-
-2.  Download the native library. GPU-enabled versions required CUDA 8 and cuDNN
-    5.1. For other versions, the native library will need to be built from
-    source (see below).
-
-    -   Linux:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-linux-x86_64-1.1.0.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-linux-x86_64-1.1.0.tar.gz)
-    -   OS X:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-darwin-x86_64-1.1.0.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-gpu-darwin-x86_64-1.1.0.tar.gz)
-    -   Windows:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip)
-
-
-    The following shell snippet downloads and extracts the native library on
-    Linux and OS X. For Windows, download and extract manually.
-
-    ```sh
-    TF_TYPE="cpu" # Set to "gpu" to enable GPU support
-    OS=$(uname -s | tr '[:upper:]' '[:lower:]')
-    mkdir -p ./jni
-    curl -L \
-      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
-    tar -xz -C ./jni
-    ```
-
-3.  Include the downloaded `.jar` in the classpath during compilation. For
-    example, if your program looks like the following:
-
-    ```java
-    import org.tensorflow.TensorFlow;
-
-    public class MyClass {
-      public static void main(String[] args) {
-        System.out.println("I'm using TensorFlow version: " +  TensorFlow.version());
-      }
-    }
-    ```
-
-    then it should be compiled with:
+> and/or the [Android demo](https://www.tensorflow.org/code/tensorflow/examples/android).
 
-    ```sh
-    javac -cp libtensorflow-1.1.0.jar MyClass.java
-    ```
+## Quickstart
 
-    For a more sophisticated example, see
-    [LabelImage.java](https://www.tensorflow.org/code/tensorflow/java/src/main/java/org/tensorflow/examples/LabelImage.java),
-    which can be compiled with:
-
-    ```sh
-    javac \
-      -cp libtensorflow-1.1.0.jar \
-      ./src/main/java/org/tensorflow/examples/LabelImage.java
-    ```
-
-4.  Include the downloaded `.jar` in the classpath and the native library in the
-    library path during execution. For example:
-
-    ```sh
-    java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni MyClass
-    ```
-
-    or for the `LabelImage` example:
-
-    ```sh
-    java \
-      -Djava.library.path=./jni \
-      -cp libtensorflow-1.1.0.jar:./src/main/java \
-      org.tensorflow.examples.LabelImage
-    ```
+-   Refer to [Installing TensorFlow for Java](https://www.tensorflow.org/install/install_java)
+-   [Javadoc](https://www.tensorflow.org/api_docs/java/reference/org/tensorflow/package-summary)
+-   [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.tensorflow/tensorflow/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.tensorflow/tensorflow)
 
 ## Building from source
 
@@ -172,7 +36,6 @@ native libraries will need to be built from source.
     brew install swig
     ```
 
-
 3.  [Configure](https://www.tensorflow.org/install/install_sources#configure_the_installation)
     (e.g., enable GPU support) and build:
 
@@ -183,20 +46,39 @@ native libraries will need to be built from source.
       //tensorflow/java:libtensorflow_jni
     ```
 
-The JAR (`libtensorflow.jar`) and native library (`libtensorflow_jni.so` on
-Linux, `libtensorflow_jni.dylib` on OS X, `tensorflow_jni.dll` on Windows) will
-be in `bazel-bin/tensorflow/java`. Using these artifacts follow both steps 3
-and 4 in the previous section in order to get your application
-up and running.
+The command above will produce two files in the `bazel-bin/tensorflow/java`
+directory:
+
+*   An archive of Java classes: `libtensorflow.jar`
+*   A native library: `libtensorflow_jni.so` on Linux, `libtensorflow_jni.dylib`
+    on OS X, or `tensorflow_jni.dll` on Windows.
+
+To compile Java code that uses the TensorFlow Java API, include
+`libtensorflow.jar` in the classpath. For example:
+
+```sh
+javac -cp bazel-bin/tensorflow/java/libtensorflow.jar ...
+```
+
+To execute the compiled program, include `libtensorflow.jar` in the classpath
+and the native library in the library path. For example:
+
+```sh
+java -cp bazel-bin/tensorflow/java/libtensorflow.jar \
+  -Djava.library.path=bazel-bin/tensorflow/java \
+  ...
+```
 
-Installation on Windows requires the more experimental [bazel on Windows](https://bazel.build/versions/master/docs/windows.html).
-Details are elided here, but find inspiration in the script used for
-building the release archive:
+Installation on Windows requires the more experimental [bazel on
+Windows](https://bazel.build/versions/master/docs/windows.html). Details are
+omitted here, but find inspiration in the script used for building the release
+archive:
 [`tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh`](https://www.tensorflow.org/code/tensorflow/tools/ci_build/windows/libtensorflow_cpu.sh).
 
 ### Maven
 
-Details of the release process for Maven Central are in [`maven/README.md`](https://www.tensorflow.org/code/tensorflow/java/maven/README.md).
+Details of the release process for Maven Central are in
+[`maven/README.md`](https://www.tensorflow.org/code/tensorflow/java/maven/README.md).
 However, for development, you can push the library built from source to a local
 Maven repository with:
 
@@ -207,14 +89,14 @@ mvn install:install-file \
   -DpomFile=../../bazel-bin/tensorflow/java/pom.xml
 ```
 
-And then rever to this library in a project's `pom.xml` with:
-(replacing 1.0.head with the appropriate version):
+And then refer to this library in a project's `pom.xml` with: (replacing
+VERSION with the appropriate version of TensorFlow):
 
 ```xml
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>libtensorflow</artifactId>
-  <version>1.0.head</version>
+  <version>VERSION</version>
 </dependency>
 ```
 
-- 
GitLab


From 744112ccf1bd0628c74d1601becd0c00598e8aa3 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Fri, 28 Apr 2017 10:57:13 -0800
Subject: [PATCH 0787/1563] Started to graduate FeatureColumn from contrib to
 core. Change: 154565789

---
 tensorflow/BUILD                              |   1 +
 tensorflow/python/BUILD                       |   1 +
 tensorflow/python/feature_column/BUILD        |  57 +
 .../python/feature_column/feature_column.py   | 972 ++++++++++++++++++
 .../feature_column/feature_column_test.py     | 800 ++++++++++++++
 5 files changed, 1831 insertions(+)
 create mode 100644 tensorflow/python/feature_column/BUILD
 create mode 100644 tensorflow/python/feature_column/feature_column.py
 create mode 100644 tensorflow/python/feature_column/feature_column_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index d059d227e6..a2f7a9fb63 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -307,6 +307,7 @@ filegroup(
         "//tensorflow/python:all_files",
         "//tensorflow/python/debug:all_files",
         "//tensorflow/python/estimator:all_files",
+        "//tensorflow/python/feature_column:all_files",
         "//tensorflow/python/kernel_tests:all_files",
         "//tensorflow/python/kernel_tests/distributions:all_files",
         "//tensorflow/python/ops/distributions:all_files",
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 28e1adb518..bcb837ad8d 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -80,6 +80,7 @@ py_library(
         ":weights_broadcast_ops",
         "//third_party/py/numpy",
         "//tensorflow/python/estimator:estimator_py",
+        "//tensorflow/python/feature_column:feature_column",
         "//tensorflow/python/ops/losses",
         "//tensorflow/python/ops/distributions",
         "//tensorflow/python/saved_model",
diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
new file mode 100644
index 0000000000..d5eb20e997
--- /dev/null
+++ b/tensorflow/python/feature_column/BUILD
@@ -0,0 +1,57 @@
+package(
+    default_visibility = [
+        "//tensorflow:internal",
+    ],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load("//tensorflow:tensorflow.bzl", "py_test")
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+py_library(
+    name = "feature_column",
+    srcs = ["feature_column.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:embedding_ops",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:init_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:parsing_ops",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:sparse_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python:util",
+        "//tensorflow/python:variable_scope",
+        "//tensorflow/python:variables",
+    ],
+)
+
+py_test(
+    name = "feature_column_test",
+    srcs = ["feature_column_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":feature_column",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:training",
+    ],
+)
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
new file mode 100644
index 0000000000..7d8a42080d
--- /dev/null
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -0,0 +1,972 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""This API defines FeatureColumn abstraction.
+
+FeatureColumns provide a high level abstraction for ingesting and representing
+features. FeatureColumns are also the primary way of encoding features for
+canned ${tf.estimator.Estimator}s.
+
+When using FeatureColumns with `Estimators`, the type of feature column you
+should choose depends on (1) the feature type and (2) the model type.
+
+(1) Feature type:
+
+ * Continuous features can be represented by `numeric_column`.
+ * Categorical features can be represented by any `categorical_column_with_*`
+ column:
+  - `categorical_column_with_keys`
+  - `categorical_column_with_vocabulary_file`
+  - `categorical_column_with_hash_bucket`
+  - `categorical_column_with_integerized_feature`
+
+(2) Model type:
+
+ * Deep neural network models (`DNNClassifier`, `DNNRegressor`).
+
+   Continuous features can be directly fed into deep neural network models.
+
+     age_column = numeric_column("age")
+
+   To feed sparse features into DNN models, wrap the column with
+   `embedding_column` or `indicator_column`. `indicator_column` is recommended
+   for features with only a few possible values. For features with many possible
+   values, `embedding_column` is recommended.
+
+     embedded_dept_column = embedding_column(
+       categorical_column_with_keys("department", ["math", "philosphy", ...]),
+       dimension=10)
+
+* Wide (aka linear) models (`LinearClassifier`, `LinearRegressor`).
+
+   Sparse features can be fed directly into linear models. They behave like an
+   indicator column but with an efficient implementation.
+
+     dept_column = categorical_column_with_keys("department",
+       ["math", "philosophy", "english"])
+
+   It is recommended that continuous features be bucketized before being
+   fed into linear models.
+
+     bucketized_age_column = bucketized_column(
+      source_column=age_column,
+      boundaries=[18, 25, 30, 35, 40, 45, 50, 55, 60, 65])
+
+   Sparse features can be crossed (also known as conjuncted or combined) in
+   order to form non-linearities, and then fed into linear models.
+
+    cross_dept_age_column = crossed_column(
+      columns=[department_column, bucketized_age_column],
+      hash_bucket_size=1000)
+
+Example of building canned `Estimator`s using FeatureColumns:
+
+  # Define features and transformations
+  deep_feature_columns = [age_column, embedded_dept_column]
+  wide_feature_columns = [dept_column, bucketized_age_column,
+      cross_dept_age_column]
+
+  # Build deep model
+  estimator = DNNClassifier(
+      feature_columns=deep_feature_columns,
+      hidden_units=[500, 250, 50])
+  estimator.train(...)
+
+  # Or build a wide model
+  estimator = LinearClassifier(
+      feature_columns=wide_feature_columns)
+  estimator.train(...)
+
+  # Or build a wide and deep model!
+  estimator = DNNLinearCombinedClassifier(
+      linear_feature_columns=wide_feature_columns,
+      dnn_feature_columns=deep_feature_columns,
+      dnn_hidden_units=[500, 250, 50])
+  estimator.train(...)
+
+
+FeatureColumns can also be transformed into a generic input layer for
+custom models using `input_from_feature_columns`.
+
+Example of building model using FeatureColumns, this can be used in a
+`model_fn` which is given to the {tf.estimator.Estimator}:
+
+  # Building model via layers
+
+  deep_feature_columns = [age_column, embedded_dept_column]
+  columns_to_tensor = parse_feature_columns_from_examples(
+      serialized=my_data,
+      feature_columns=deep_feature_columns)
+  first_layer = input_from_feature_columns(
+      columns_to_tensors=columns_to_tensor,
+      feature_columns=deep_feature_columns)
+  second_layer = fully_connected(first_layer, ...)
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import abc
+import collections
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import embedding_ops
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import sparse_ops
+from tensorflow.python.ops import string_ops
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import nest
+
+
+def make_linear_model(features,
+                      feature_columns,
+                      units=1,
+                      sparse_combiner='sum',
+                      weight_collections=None,
+                      trainable=True):
+  """Returns a linear prediction `Tensor` based on given `feature_columns`.
+
+  This function generates a weighted sum for each unitss`. Weighted sum
+  refers to logits in classification problems. It refers to the prediction
+  itself for linear regression problems.
+
+  Main difference of `make_linear_model` and `make_input_layer` is handling of
+  categorical columns. `make_linear_model` treats them as `indicator_column`s
+  while `make_input_layer` explicitly requires wrapping each of them with an
+  `embedding_column` or an `indicator_column`.
+
+  Args:
+    features: A mapping from key to tensors. 'string' key means a base feature.
+      It can have `_FeatureColumn` as a key too. That means that FeatureColumn
+      is already transformed by the input pipeline.
+    feature_columns: An iterable containing all the FeatureColumns. All items
+      should be instances of classes derived from FeatureColumn.
+    units: units: An integer, dimensionality of the output space. Default
+      value is 1.
+    sparse_combiner: A string specifying how to reduce if a sparse column is
+      multivalent. Currently "mean", "sqrtn" and "sum" are supported, with "sum"
+      the default. "sqrtn" often achieves good accuracy, in particular with
+      bag-of-words columns. It combines each sparse columns independently.
+        * "sum": do not normalize features in the column
+        * "mean": do l1 normalization on features in the column
+        * "sqrtn": do l2 normalization on features in the column
+    weight_collections: A list of collection names to which the Variable will be
+      added. Note that, variables will also be added to collections
+      `tf.GraphKeys.GLOBAL_VARIABLES` and `ops.GraphKeys.MODEL_VARIABLES`.
+    trainable: If `True` also add the variable to the graph collection
+      `GraphKeys.TRAINABLE_VARIABLES` (see `tf.Variable`).
+
+  Returns:
+    A `Tensor` which represents predictions/logits of a linear model. Its shape
+    is (batch_size, units) and its dtype is `float32`.
+
+  Raises:
+    ValueError: if an item in `feature_columns` is neither a `_DenseColumn`
+      nor `_CategoricalColumn`.
+  """
+  _check_feature_columns(feature_columns)
+  for column in feature_columns:
+    if not isinstance(column, (_DenseColumn, _CategoricalColumn)):
+      raise ValueError('Items of feature_columns must be either a _DenseColumn '
+                       'or _CategoricalColumn. Given: {}'.format(column))
+  weight_collections = list(weight_collections or [])
+  weight_collections += [
+      ops.GraphKeys.GLOBAL_VARIABLES, ops.GraphKeys.MODEL_VARIABLES
+  ]
+  with variable_scope.variable_scope(
+      None, default_name='make_linear_model', values=features.values()):
+    weigthed_sums = []
+    builder = _LazyBuilder(features)
+    for column in sorted(feature_columns, key=lambda x: x.name):
+      with variable_scope.variable_scope(None, default_name=column.name):
+        if isinstance(column, _DenseColumn):
+          weigthed_sums.append(_create_dense_column_weighted_sum(
+              column, builder, units, weight_collections, trainable))
+        else:
+          weigthed_sums.append(_create_categorical_column_weighted_sum(
+              column, builder, units, sparse_combiner, weight_collections,
+              trainable))
+    predictions_no_bias = math_ops.add_n(
+        weigthed_sums, name='weighted_sum_no_bias')
+    bias = variable_scope.get_variable(
+        'bias_weight',
+        shape=[units],
+        initializer=init_ops.zeros_initializer(),
+        trainable=trainable,
+        collections=weight_collections)
+    predictions = nn_ops.bias_add(
+        predictions_no_bias, bias, name='weighted_sum')
+
+    return predictions
+
+
+def numeric_column(key,
+                   shape=(1,),
+                   default_value=None,
+                   dtype=dtypes.float32,
+                   normalizer_fn=None):
+  """Represents real valued or numerical features.
+
+  An example:
+  ```python
+  price = numeric_column('price')
+  all_feature_columns = [price, ...]
+  dense_tensor = make_input_layer(features, all_feature_columns)
+
+  # or
+  bucketized_price = bucketized_column(price, boundaries=[...])
+  all_feature_columns = [bucketized_price, ...]
+  linear_prediction, _, _ = make_linear_model(features, all_feature_columns)
+
+  ```
+
+  Args:
+    key: A string providing key to look up corresponding `Tensor`.
+    shape: An iterable of integers specifies the shape of the `Tensor`. An
+      integer can be given which means a single dimension `Tensor` with given
+      width. The `Tensor` representing the column will have the shape of
+      [batch_size] + `shape`.
+    default_value: A single value compatible with `dtype` or an iterable of
+      values compatible with `dtype` which the column takes on during
+      `tf.Example` parsing if data is missing. A default value of `None` will
+      cause `tf.parse_example` to fail if an example does not contain this
+      column. If a single value is provided, the same value will be applied as
+      the default value for every item. If an iterable of values is provided,
+      the shape of the `default_value` should be equal to the given `shape`.
+    dtype: defines the type of values. Default value is `tf.float32`. Must be a
+      non-quantized, real integer or floating point type.
+    normalizer_fn: If not `None`, a function that can be used to normalize the
+      value of the tensor after `default_value` is applied for parsing.
+      Normalizer function takes the input `Tensor` as its argument, and returns
+      the output `Tensor`. (e.g. lambda x: (x - 3.0) / 4.2). Please note that
+      even though most common use case of this function is normalization, it can
+      be used for any kind of Tensorflow transformations.
+
+  Returns:
+    A _NumericColumn.
+
+  Raises:
+    TypeError: if any dimension in shape is not an int
+    ValueError: if any dimension in shape is not a positive integer
+    TypeError: if `default_value` is an iterable but not compatible with `shape`
+    TypeError: if `default_value` is not compatible with `dtype`.
+    ValueError: if `dtype` is not convertible to `tf.float32`.
+  """
+  shape = _check_shape(shape, key)
+  if not (dtype.is_integer or dtype.is_floating):
+    raise ValueError('dtype must be convertible to float. '
+                     'dtype: {}, key: {}'.format(dtype, key))
+  default_value = _check_default_value(shape, default_value, dtype, key)
+
+  if normalizer_fn is not None and not callable(normalizer_fn):
+    raise TypeError(
+        'normalizer_fn must be a callable. Given: {}'.format(normalizer_fn))
+
+  return _NumericColumn(
+      key,
+      shape=shape,
+      default_value=default_value,
+      dtype=dtype,
+      normalizer_fn=normalizer_fn)
+
+
+def categorical_column_with_hash_bucket(key,
+                                        hash_bucket_size,
+                                        dtype=dtypes.string):
+  """Represents sparse feature where ids are set by hashing.
+
+  Use this when your sparse features are in string or integer format where you
+  want to distribute your inputs into a finite number of buckets by hashing.
+  output_id = Hash(input_feature_string) % bucket_size
+
+  An example:
+  ```python
+  keywords = categorical_column_with_hash_bucket("keywords", 10K)
+  linear_prediction, _, _ = make_linear_model(features, all_feature_columns)
+  all_feature_columns = [keywords, ...]
+
+  # or
+  keywords_embedded = embedding_column(keywords, 16)
+  all_feature_columns = [keywords_embedded, ...]
+  dense_tensor = make_input_layer(features, all_feature_columns)
+  ```
+
+  Args:
+    key: A string providing key to look up corresponding `Tensor`.
+    hash_bucket_size: An int > 1. The number of buckets.
+    dtype: The type of features. Only string and integer types are supported.
+
+  Returns:
+    A `_CategoricalColumnHashed`.
+
+  Raises:
+    ValueError: `hash_bucket_size` is not greater than 1.
+    ValueError: `dtype` is neither string nor integer.
+  """
+  if hash_bucket_size is None:
+    raise ValueError('hash_bucket_size must be set. ' 'key: {}'.format(key))
+
+  if hash_bucket_size < 1:
+    raise ValueError('hash_bucket_size must be at least 1. '
+                     'hash_bucket_size: {}, key: {}'.format(
+                         hash_bucket_size, key))
+
+  if dtype != dtypes.string and not dtype.is_integer:
+    raise ValueError('dtype must be string or integer. '
+                     'dtype: {}, column_name: {}'.format(dtype, key))
+
+  return _CategoricalColumnHashed(key, hash_bucket_size, dtype)
+
+
+class _FeatureColumn(object):
+  """Represents a feature column abstraction.
+
+  WARNING: Do not subclass this layer unless you know what you are doing:
+  the API is subject to future changes.
+
+  To distinguish the concept of a feature family and a specific binary feature
+  within a family, we refer to a feature family like "country" as a feature
+  column. Following is an example feature in a `tf.Example` format:
+    {key: "country",  value: [ "US" ]}
+  In this example the value of feature is "US" and "country" refers to the
+  column of the feature.
+
+  This class is an abstract class. User should not create instances of this.
+  """
+  __metaclass__ = abc.ABCMeta
+
+  @abc.abstractproperty
+  def name(self):
+    """Returns string. used for variable_scope and naming."""
+    pass
+
+  @abc.abstractmethod
+  def _transform_feature(self, inputs):
+    """Returns transformed `Tensor`, uses `inputs` to access input tensors.
+
+    It uses `inputs` to get either raw feature or transformation of other
+    FeatureColumns.
+
+    Example input access:
+    Let's say a Feature column depends on raw feature ('raw') and another
+    `_FeatureColumn` (input_fc). To access corresponding Tensors, inputs will
+    be used as follows:
+
+    ```python
+    raw_tensor = inputs.get('raw')
+    fc_tensor = inputs.get(input_fc)
+    ```
+
+    Args:
+      inputs: A `_LazyBuilder` object to access inputs.
+
+    Returns:
+      Transformed feature `Tensor`.
+    """
+    pass
+
+  @abc.abstractproperty
+  def _parse_example_config(self):
+    """Returns a `tf.Example` parsing spec as dict.
+
+    It is used for get_parsing_spec for `tf.parse_example`. Returned spec is a
+    dict from keys ('string') to `VarLenFeature`, `FixedLenFeature`, and other
+    supported objects. Please check documentation of ${tf.parse_example} for all
+    supported spec objects.
+
+    Let's say a Feature column depends on raw feature ('raw') and another
+    `_FeatureColumn` (input_fc). One possible implementation of
+    _parse_example_config is as follows:
+
+    ```python
+    spec = {'raw': tf.FixedLenFeature(...)}
+    spec.update(input_fc._parse_example_config)
+    return spec
+    ```
+    """
+    pass
+
+
+class _DenseColumn(_FeatureColumn):
+  """Represents a column which can be represented as `Tensor`.
+
+  WARNING: Do not subclass this layer unless you know what you are doing:
+  the API is subject to future changes.
+
+  Some examples of this type are: numeric_column, embedding_column,
+  indicator_column.
+  """
+
+  __metaclass__ = abc.ABCMeta
+
+  @abc.abstractproperty
+  def _variable_shape(self):
+    """Returns shape of variable which is compatible with _get_dense_tensor."""
+    pass
+
+  @abc.abstractmethod
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    """Returns a `Tensor`.
+
+    The output of this function will be used by model-buildier-functions. For
+    example the pseudo code of `make_input_layer` will be like that:
+    ```python
+    def make_input_layer(features, feature_columns, ...):
+      outputs = [fc._get_dense_tensor(...) for fc in feature_columns]
+      return tf.concat(outputs)
+    ```
+
+    Args:
+      inputs: A `_LazyBuilder` object to access inputs.
+      weight_collections: List of graph collections to which Variables (if any
+        will be created) are added.
+      trainable: If `True` also add variables to the graph collection
+        `GraphKeys.TRAINABLE_VARIABLES` (see ${tf.Variable}).
+    """
+    pass
+
+
+def _create_dense_column_weighted_sum(
+    column, builder, units, weight_collections, trainable):
+  """Create a weighted sum of a dense column for make_linear_model."""
+  tensor = column._get_dense_tensor(  # pylint: disable=protected-access
+      builder,
+      weight_collections=weight_collections,
+      trainable=trainable)
+  num_elements = tensor_shape.TensorShape(column._variable_shape).num_elements()  # pylint: disable=protected-access
+  batch_size = array_ops.shape(tensor)[0]
+  tensor = array_ops.reshape(tensor, shape=(batch_size, num_elements))
+  weight = variable_scope.get_variable(
+      name='weight',
+      shape=[num_elements, units],
+      initializer=init_ops.zeros_initializer(),
+      trainable=trainable,
+      collections=weight_collections)
+  return math_ops.matmul(tensor, weight, name='weighted_sum')
+
+
+class _CategoricalColumn(_FeatureColumn):
+  """Represents a categorical feautre.
+
+  WARNING: Do not subclass this layer unless you know what you are doing:
+  the API is subject to future changes.
+
+  A categorical feature typically handled with a ${tf.SparseTensor} of IDs.
+  """
+  __metaclass__ = abc.ABCMeta
+
+  IdWeightPair = collections.namedtuple(  # pylint: disable=invalid-name
+      'IdWeightPair', ['id_tensor', 'weight_tensor'])
+
+  @abc.abstractproperty
+  def _num_buckets(self):
+    """Returns number of buckets in this sparse feature."""
+    pass
+
+  @abc.abstractmethod
+  def _get_sparse_tensors(self,
+                          inputs,
+                          weight_collections=None,
+                          trainable=None):
+    """Returns an IdWeightPair.
+
+    `IdWeightPair` is a pair of `SparseTensor`s which represents ids and
+    weights.
+
+    `IdWeightPair.id_tensor` is typically a `batch_size` x `num_buckets`
+    `SparseTensor` of `int64`. `IdWeightPair.weight_tensor` is either a
+    `SparseTensor` of `float` or `None` to indicate all weights should be
+    taken to be 1. If specified, `weight_tensor` must have exactly the same
+    shape and indices as `sp_ids`. Expected `SparseTensor` is same as parsing
+    output of a `VarLenFeature` which is a ragged matrix.
+
+    Args:
+      inputs: A `LazyBuilder` as a cache to get input tensors required to
+        create `IdWeightPair`.
+      weight_collections: List of graph collections to which variables (if any
+        will be created) are added.
+      trainable: If `True` also add variables to the graph collection
+        `GraphKeys.TRAINABLE_VARIABLES` (see ${tf.get_variable}).
+    """
+    pass
+
+
+def _create_categorical_column_weighted_sum(
+    column, builder, units, sparse_combiner, weight_collections, trainable):
+  """Create a weighted sum of a categorical column for make_linear_model."""
+  sparse_tensors = column._get_sparse_tensors(  # pylint: disable=protected-access
+      builder,
+      weight_collections=weight_collections,
+      trainable=trainable)
+  weight = variable_scope.get_variable(
+      name='weight',
+      shape=[column._num_buckets, units],  # pylint: disable=protected-access
+      initializer=init_ops.zeros_initializer(),
+      trainable=trainable,
+      collections=weight_collections)
+  return _safe_embedding_lookup_sparse(
+      weight,
+      sparse_tensors.id_tensor,
+      sparse_weights=sparse_tensors.weight_tensor,
+      combiner=sparse_combiner,
+      name='weighted_sum')
+
+
+class _LazyBuilder(object):
+  """Handles caching of transformations while building the model.
+
+  `FeatureColumn` specifies how to digest an input column to the network. Some
+  feature columns require data transformations. This class caches those
+  transformations.
+
+  Some features may be used in more than one place. For example, one can use a
+  bucketized feature by itself and a cross with it. In that case we
+  should create only one bucketization op instead of creating ops for each
+  feature column separately. To handle re-use of transformed columns,
+  `_LazyBuilder` caches all previously transformed columns.
+
+  Example:
+  We're trying to use the following `FeatureColumns`:
+
+  ```python
+    bucketized_age = fc.bucketized_column(fc.numeric_column("age"), ...)
+    keywords = fc.categorical_column_with_hash_buckets("keywords", ...)
+    age_X_keywords = fc.crossed_column([bucketized_age, keywords])
+    ... = make_linear_model(features,
+                            [bucketized_age, keywords, age_X_keywords]
+  ```
+
+  If we transform each column independently, then we'll get duplication of
+  bucketization (one for cross, one for bucketization itself).
+  The `_LazyBuilder` eliminates this duplication.
+  """
+
+  def __init__(self, features):
+    """Creates a `_LazyBuilder`.
+
+    Args:
+      features: A mapping from feature column to tensors. A `string` key
+        signifies a base feature (not-transformed). A `FeatureColumn` key
+        means that this `Tensor` is the output of an existing `FeatureColumn`
+        which can be reused.
+    """
+    self._columns_to_tensors = features.copy()
+
+  def get(self, key):
+    """Returns a `Tensor` for the given key.
+
+    A `str` key is used to access a base feature (not-transformed). When a
+    `_FeatureColumn` is passed, the transformed feature is returned if it
+    already exists, otherwise the given `_FeatureColumn` is asked to provide its
+    transformed output, which is then cached.
+
+    Args:
+      key: a `str` or a `_FeatureColumn`.
+
+    Returns:
+      The transformed `Tensor` corresponding to the `key`.
+
+    Raises:
+      ValueError: if key is not found or a transformed `Tensor` cannot be
+        computed.
+    """
+    if key in self._columns_to_tensors:
+      # Feature_column is already transformed or it's a raw feature.
+      return self._columns_to_tensors[key]
+
+    if not isinstance(key, (str, _FeatureColumn)):
+      raise TypeError('"key" must be either a "str" or "_FeatureColumn". '
+                      'Provided: {}'.format(key))
+
+    if not isinstance(key, _FeatureColumn):
+      raise ValueError('Feature {} is not in features dictionary.'.format(key))
+
+    column = key
+    logging.debug('Transforming feature_column %s.', column)
+    transformed = column._transform_feature(self)  # pylint: disable=protected-access
+    if transformed is None:
+      raise ValueError('Column {} is not supported.'.format(column.name))
+    self._columns_to_tensors[column] = transformed
+    return self._columns_to_tensors[column]
+
+
+def _check_feature_columns(feature_columns):
+  if isinstance(feature_columns, dict):
+    raise ValueError('Expected feature_columns to be iterable, found dict.')
+  for column in feature_columns:
+    if not isinstance(column, _FeatureColumn):
+      raise ValueError('Items of feature_columns must be a _FeatureColumn.')
+  name_to_column = dict()
+  for column in feature_columns:
+    if column.name in name_to_column:
+      raise ValueError('Duplicate feature column name found for columns: {} '
+                       'and {}. This usually means that these columns refer to '
+                       'same base feature. Either one must be discarded or a '
+                       'duplicated but renamed item must be inserted in '
+                       'features dict.'.format(column,
+                                               name_to_column[column.name]))
+    name_to_column[column.name] = column
+
+
+class _NumericColumn(_DenseColumn,
+                     collections.namedtuple('_NumericColumn', [
+                         'key', 'shape', 'default_value', 'dtype',
+                         'normalizer_fn'
+                     ])):
+  """see `numeric_column`."""
+
+  @property
+  def name(self):
+    return self.key
+
+  @property
+  def _parse_example_config(self):
+    return {
+        self.key:
+            parsing_ops.FixedLenFeature(self.shape, self.dtype,
+                                        self.default_value)
+    }
+
+  def _transform_feature(self, inputs):
+    input_tensor = inputs.get(self.key)
+    if isinstance(input_tensor, sparse_tensor_lib.SparseTensor):
+      raise ValueError(
+          'The corresponding Tensor of numerical column must be a Tensor. '
+          'SparseTensor is not supported. key: {}'.format(self.key))
+    if self.normalizer_fn is not None:
+      input_tensor = self.normalizer_fn(input_tensor)
+    return math_ops.to_float(input_tensor)
+
+  @property
+  def _variable_shape(self):
+    return self.shape
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    del weight_collections
+    del trainable
+    return inputs.get(self)
+
+
+def _create_tuple(shape, value):
+  """Returns a tuple with given shape and filled with value."""
+  if shape:
+    return tuple([_create_tuple(shape[1:], value) for _ in range(shape[0])])
+  return value
+
+
+def _as_tuple(value):
+  if not nest.is_sequence(value):
+    return value
+  return tuple([_as_tuple(v) for v in value])
+
+
+def _check_shape(shape, key):
+  """Returns shape if it's valid, raises error otherwise."""
+  assert shape is not None
+  if not nest.is_sequence(shape):
+    shape = [shape]
+  shape = tuple(shape)
+  for dimension in shape:
+    if not isinstance(dimension, int):
+      raise TypeError('shape dimensions must be integer. '
+                      'shape: {}, key: {}'.format(shape, key))
+    if dimension < 1:
+      raise ValueError('shape dimensions must be greater than 0. '
+                       'shape: {}, key: {}'.format(shape, key))
+  return shape
+
+
+def _is_shape_and_default_value_compatible(default_value, shape):
+  """Verifies compatibility of shape and default_value."""
+  # Invalid condition:
+  #  * if default_value is not a scalar and shape is empty
+  #  * or if default_value is an iterable and shape is not empty
+  if nest.is_sequence(default_value) != bool(shape):
+    return False
+  if not shape:
+    return True
+  if len(default_value) != shape[0]:
+    return False
+  for i in range(shape[0]):
+    if not _is_shape_and_default_value_compatible(default_value[i], shape[1:]):
+      return False
+  return True
+
+
+def _check_default_value(shape, default_value, dtype, key):
+  """Returns default value as tuple if it's valid, otherwise raises errors.
+
+  This function verifies that `default_value` is compatible with both `shape`
+  and `dtype`. If it is not compatible, it raises an error. If it is compatible,
+  it casts default_value to a tuple and returns it. `key` is used only
+  for error message.
+
+  Args:
+    shape: An iterable of integers specifies the shape of the `Tensor`.
+    default_value: If a single value is provided, the same value will be applied
+      as the default value for every item. If an iterable of values is
+      provided, the shape of the `default_value` should be equal to the given
+      `shape`.
+    dtype: defines the type of values. Default value is `tf.float32`. Must be a
+      non-quantized, real integer or floating point type.
+    key: A string providing key to look up corresponding `Tensor`.
+
+  Returns:
+    A tuple which will be used as default value.
+
+  Raises:
+    TypeError: if `default_value` is an iterable but not compatible with `shape`
+    TypeError: if `default_value` is not compatible with `dtype`.
+    ValueError: if `dtype` is not convertible to `tf.float32`.
+  """
+  if default_value is None:
+    return None
+
+  if isinstance(default_value, int):
+    return _create_tuple(shape, default_value)
+
+  if isinstance(default_value, float) and dtype.is_floating:
+    return _create_tuple(shape, default_value)
+
+  if callable(getattr(default_value, 'tolist', None)):  # Handles numpy arrays
+    default_value = default_value.tolist()
+
+  if nest.is_sequence(default_value):
+    if not _is_shape_and_default_value_compatible(default_value, shape):
+      raise ValueError(
+          'The shape of default_value must be equal to given shape. '
+          'default_value: {}, shape: {}, key: {}'.format(
+              default_value, shape, key))
+    # Check if the values in the list are all integers or are convertible to
+    # floats.
+    is_list_all_int = all(
+        isinstance(v, int) for v in nest.flatten(default_value))
+    is_list_has_float = any(
+        isinstance(v, float) for v in nest.flatten(default_value))
+    if is_list_all_int:
+      return _as_tuple(default_value)
+    if is_list_has_float and dtype.is_floating:
+      return _as_tuple(default_value)
+  raise TypeError('default_value must be compatible with dtype. '
+                  'default_value: {}, dtype: {}, key: {}'.format(
+                      default_value, dtype, key))
+
+
+class _CategoricalColumnHashed(
+    _CategoricalColumn,
+    collections.namedtuple('_CategoricalColumnHashed',
+                           ['key', 'hash_bucket_size', 'dtype'])):
+  """see `categorical_column_with_hash_bucket`."""
+
+  @property
+  def name(self):
+    return self.key
+
+  @property
+  def _parse_example_config(self):
+    return {self.key: parsing_ops.VarLenFeature(self.dtype)}
+
+  def _transform_feature(self, inputs):
+    input_tensor = inputs.get(self.key)
+    if not isinstance(input_tensor, sparse_tensor_lib.SparseTensor):
+      raise ValueError('SparseColumn input must be a SparseTensor.')
+
+    if (input_tensor.dtype != dtypes.string and
+        not input_tensor.dtype.is_integer):
+      raise ValueError('input tensors dtype must be string or integer. '
+                       'dtype: {}, column_name: {}'.format(
+                           input_tensor.dtype, self.key))
+
+    if self.dtype.is_integer != input_tensor.dtype.is_integer:
+      raise ValueError(
+          'Column dtype and SparseTensors dtype must be compatible. '
+          'key: {}, column dtype: {}, tensor dtype: {}'.format(
+              self.key, self.dtype, input_tensor.dtype))
+
+    if self.dtype == dtypes.string:
+      sparse_values = input_tensor.values
+    else:
+      sparse_values = string_ops.as_string(input_tensor.values)
+
+    sparse_id_values = string_ops.string_to_hash_bucket_fast(
+        sparse_values, self.hash_bucket_size, name='lookup')
+    return sparse_tensor_lib.SparseTensor(
+        input_tensor.indices, sparse_id_values, input_tensor.dense_shape)
+
+  @property
+  def _num_buckets(self):
+    """Returns number of buckets in this sparse feature."""
+    return self.hash_bucket_size
+
+  def _get_sparse_tensors(self, inputs, weight_collections=None,
+                          trainable=None):
+    return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
+
+
+# TODO(zakaria): Move this to embedding_ops and make it public.
+def _safe_embedding_lookup_sparse(embedding_weights,
+                                  sparse_ids,
+                                  sparse_weights=None,
+                                  combiner=None,
+                                  default_id=None,
+                                  name=None,
+                                  partition_strategy='div',
+                                  max_norm=None):
+  """Lookup embedding results, accounting for invalid IDs and empty features.
+
+  The partitioned embedding in `embedding_weights` must all be the same shape
+  except for the first dimension. The first dimension is allowed to vary as the
+  vocabulary size is not necessarily a multiple of `P`.  `embedding_weights`
+  may be a `PartitionedVariable` as returned by using `tf.get_variable()` with a
+  partitioner.
+
+  Invalid IDs (< 0) are pruned from input IDs and weights, as well as any IDs
+  with non-positive weight. For an entry with no features, the embedding vector
+  for `default_id` is returned, or the 0-vector if `default_id` is not supplied.
+
+  The ids and weights may be multi-dimensional. Embeddings are always aggregated
+  along the last dimension.
+
+  Args:
+    embedding_weights:  A list of `P` float tensors or values representing
+        partitioned embedding tensors.  Alternatively, a `PartitionedVariable`,
+        created by partitioning along dimension 0.  The total unpartitioned
+        shape should be `[e_0, e_1, ..., e_m]`, where `e_0` represents the
+        vocab size and `e_1, ..., e_m` are the embedding dimensions.
+    sparse_ids: `SparseTensor` of shape `[d_0, d_1, ..., d_n]` containing the
+        ids. `d_0` is typically batch size.
+    sparse_weights: `SparseTensor` of same shape as `sparse_ids`, containing
+        float weights corresponding to `sparse_ids`, or `None` if all weights
+        are be assumed to be 1.0.
+    combiner: A string specifying how to combine embedding results for each
+        entry. Currently "mean", "sqrtn" and "sum" are supported, with "mean"
+        the default.
+    default_id: The id to use for an entry with no features.
+    name: A name for this operation (optional).
+    partition_strategy: A string specifying the partitioning strategy.
+        Currently `"div"` and `"mod"` are supported. Default is `"div"`.
+    max_norm: If not None, all embeddings are l2-normalized to max_norm before
+        combining.
+
+
+  Returns:
+    Dense tensor of shape `[d_0, d_1, ..., d_{n-1}, e_1, ..., e_m]`.
+
+  Raises:
+    ValueError: if `embedding_weights` is empty.
+  """
+  if combiner is None:
+    logging.warn('The default value of combiner will change from \"mean\" '
+                 'to \"sqrtn\" after 2016/11/01.')
+    combiner = 'mean'
+  if embedding_weights is None:
+    raise ValueError('Missing embedding_weights %s.' % embedding_weights)
+  if isinstance(embedding_weights, variables.PartitionedVariable):
+    embedding_weights = list(embedding_weights)  # get underlying Variables.
+  if not isinstance(embedding_weights, list):
+    embedding_weights = [embedding_weights]
+  if len(embedding_weights) < 1:
+    raise ValueError('Missing embedding_weights %s.' % embedding_weights)
+
+  dtype = sparse_weights.dtype if sparse_weights is not None else None
+  if isinstance(embedding_weights, variables.PartitionedVariable):
+    embedding_weights = list(embedding_weights)
+  embedding_weights = [
+      ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights
+  ]
+
+  with ops.name_scope(name, 'embedding_lookup',
+                      embedding_weights + [sparse_ids,
+                                           sparse_weights]) as scope:
+    # Reshape higher-rank sparse ids and weights to linear segment ids.
+    original_shape = sparse_ids.dense_shape
+    original_rank_dim = sparse_ids.dense_shape.get_shape()[0]
+    original_rank = (
+        array_ops.size(original_shape)
+        if original_rank_dim.value is None
+        else original_rank_dim.value)
+    sparse_ids = sparse_ops.sparse_reshape(sparse_ids, [
+        math_ops.reduce_prod(
+            array_ops.slice(original_shape, [0], [original_rank - 1])),
+        array_ops.gather(original_shape, original_rank - 1)])
+    if sparse_weights is not None:
+      sparse_weights = sparse_tensor_lib.SparseTensor(
+          sparse_ids.indices,
+          sparse_weights.values, sparse_ids.dense_shape)
+
+    # Prune invalid ids and weights.
+    sparse_ids, sparse_weights = _prune_invalid_ids(sparse_ids, sparse_weights)
+
+    # Fill in dummy values for empty features, if necessary.
+    sparse_ids, is_row_empty = sparse_ops.sparse_fill_empty_rows(sparse_ids,
+                                                                 default_id or
+                                                                 0)
+    if sparse_weights is not None:
+      sparse_weights, _ = sparse_ops.sparse_fill_empty_rows(sparse_weights, 1.0)
+
+    result = embedding_ops.embedding_lookup_sparse(
+        embedding_weights,
+        sparse_ids,
+        sparse_weights,
+        combiner=combiner,
+        partition_strategy=partition_strategy,
+        name=None if default_id is None else scope,
+        max_norm=max_norm)
+
+    if default_id is None:
+      # Broadcast is_row_empty to the same shape as embedding_lookup_result,
+      # for use in Select.
+      is_row_empty = array_ops.tile(
+          array_ops.reshape(is_row_empty, [-1, 1]),
+          array_ops.stack([1, array_ops.shape(result)[1]]))
+
+      result = array_ops.where(is_row_empty,
+                               array_ops.zeros_like(result),
+                               result,
+                               name=scope)
+
+    # Reshape back from linear ids back into higher-dimensional dense result.
+    final_result = array_ops.reshape(
+        result,
+        array_ops.concat([
+            array_ops.slice(
+                math_ops.cast(original_shape, dtypes.int32), [0],
+                [original_rank - 1]),
+            array_ops.slice(array_ops.shape(result), [1], [-1])
+        ], 0))
+    final_result.set_shape(tensor_shape.unknown_shape(
+        (original_rank_dim - 1).value).concatenate(result.get_shape()[1:]))
+    return final_result
+
+
+def _prune_invalid_ids(sparse_ids, sparse_weights):
+  """Prune invalid IDs (< 0) from the input ids and weights."""
+  is_id_valid = math_ops.greater_equal(sparse_ids.values, 0)
+  if sparse_weights is not None:
+    is_id_valid = math_ops.logical_and(
+        is_id_valid, math_ops.greater(sparse_weights.values, 0))
+  sparse_ids = sparse_ops.sparse_retain(sparse_ids, is_id_valid)
+  if sparse_weights is not None:
+    sparse_weights = sparse_ops.sparse_retain(sparse_weights, is_id_valid)
+  return sparse_ids, sparse_weights
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
new file mode 100644
index 0000000000..eefe3b0297
--- /dev/null
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -0,0 +1,800 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for feature_column."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import copy
+
+import numpy as np
+
+from tensorflow.core.example import example_pb2
+from tensorflow.core.example import feature_pb2
+from tensorflow.python.client import session
+from tensorflow.python.feature_column import feature_column as fc
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import variables as variables_lib
+from tensorflow.python.platform import test
+
+
+def _initialized_session():
+  sess = session.Session()
+  sess.run(variables_lib.global_variables_initializer())
+  sess.run(data_flow_ops.tables_initializer())
+  return sess
+
+
+class LazyColumnTest(test.TestCase):
+
+  def test_transormations_called_once(self):
+
+    class TransformCounter(fc._FeatureColumn):
+
+      def __init__(self):
+        self.num_transform = 0
+
+      @property
+      def name(self):
+        return 'TransformCounter'
+
+      def _transform_feature(self, cache):
+        self.num_transform += 1  # Count transform calls.
+        return cache.get('a')
+
+      @property
+      def _parse_example_config(self):
+        pass
+
+    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    column = TransformCounter()
+    self.assertEqual(0, column.num_transform)
+    builder.get(column)
+    self.assertEqual(1, column.num_transform)
+    builder.get(column)
+    self.assertEqual(1, column.num_transform)
+
+  def test_returns_transform_output(self):
+
+    class Transformer(fc._FeatureColumn):
+
+      @property
+      def name(self):
+        return 'Transformer'
+
+      def _transform_feature(self, cache):
+        return 'Output'
+
+      @property
+      def _parse_example_config(self):
+        pass
+
+    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    column = Transformer()
+    self.assertEqual('Output', builder.get(column))
+    self.assertEqual('Output', builder.get(column))
+
+  def test_does_not_pollute_given_features_dict(self):
+
+    class Transformer(fc._FeatureColumn):
+
+      @property
+      def name(self):
+        return 'Transformer'
+
+      def _transform_feature(self, cache):
+        return 'Output'
+
+      @property
+      def _parse_example_config(self):
+        pass
+
+    features = {'a': constant_op.constant([[2], [3.]])}
+    builder = fc._LazyBuilder(features=features)
+    builder.get(Transformer())
+    self.assertEqual(['a'], list(features.keys()))
+
+  def test_error_if_feature_is_not_found(self):
+    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    with self.assertRaisesRegexp(ValueError,
+                                 'bbb is not in features dictionary'):
+      builder.get('bbb')
+
+  def test_not_supported_feature_column(self):
+
+    class NotAProperColumn(fc._FeatureColumn):
+
+      @property
+      def name(self):
+        return 'NotAProperColumn'
+
+      def _transform_feature(self, cache):
+        # It should return not None.
+        pass
+
+      @property
+      def _parse_example_config(self):
+        pass
+
+    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    with self.assertRaisesRegexp(ValueError,
+                                 'NotAProperColumn is not supported'):
+      builder.get(NotAProperColumn())
+
+  def test_key_should_be_string_or_feature_colum(self):
+
+    class NotAFeatureColumn(object):
+      pass
+
+    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    with self.assertRaisesRegexp(
+        TypeError, '"key" must be either a "str" or "_FeatureColumn".'):
+      builder.get(NotAFeatureColumn())
+
+
+class NumericalColumnTest(test.TestCase):
+
+  def test_defaults(self):
+    a = fc.numeric_column('aaa')
+    self.assertEqual('aaa', a.key)
+    self.assertEqual((1,), a.shape)
+    self.assertIsNone(a.default_value)
+    self.assertEqual(dtypes.float32, a.dtype)
+    self.assertIsNone(a.normalizer_fn)
+
+  def test_shape_saved_as_tuple(self):
+    a = fc.numeric_column('aaa', shape=[1, 2], default_value=[[3, 2.]])
+    self.assertEqual((1, 2), a.shape)
+
+  def test_default_value_saved_as_tuple(self):
+    a = fc.numeric_column('aaa', default_value=4.)
+    self.assertEqual((4.,), a.default_value)
+    a = fc.numeric_column('aaa', shape=[1, 2], default_value=[[3, 2.]])
+    self.assertEqual(((3., 2.),), a.default_value)
+
+  def test_shape_and_default_value_compatibility(self):
+    fc.numeric_column('aaa', shape=[2], default_value=[1, 2.])
+    with self.assertRaisesRegexp(ValueError, 'The shape of default_value'):
+      fc.numeric_column('aaa', shape=[2], default_value=[1, 2, 3.])
+    fc.numeric_column(
+        'aaa', shape=[3, 2], default_value=[[2, 3], [1, 2], [2, 3.]])
+    with self.assertRaisesRegexp(ValueError, 'The shape of default_value'):
+      fc.numeric_column(
+          'aaa', shape=[3, 1], default_value=[[2, 3], [1, 2], [2, 3.]])
+    with self.assertRaisesRegexp(ValueError, 'The shape of default_value'):
+      fc.numeric_column(
+          'aaa', shape=[3, 3], default_value=[[2, 3], [1, 2], [2, 3.]])
+
+  def test_default_value_type_check(self):
+    fc.numeric_column(
+        'aaa', shape=[2], default_value=[1, 2.], dtype=dtypes.float32)
+    fc.numeric_column(
+        'aaa', shape=[2], default_value=[1, 2], dtype=dtypes.int32)
+    with self.assertRaisesRegexp(TypeError, 'must be compatible with dtype'):
+      fc.numeric_column(
+          'aaa', shape=[2], default_value=[1, 2.], dtype=dtypes.int32)
+    with self.assertRaisesRegexp(TypeError,
+                                 'default_value must be compatible with dtype'):
+      fc.numeric_column('aaa', default_value=['string'])
+
+  def test_shape_must_be_positive_integer(self):
+    with self.assertRaisesRegexp(TypeError, 'shape dimensions must be integer'):
+      fc.numeric_column(
+          'aaa', shape=[
+              1.0,
+          ])
+
+    with self.assertRaisesRegexp(ValueError,
+                                 'shape dimensions must be greater than 0'):
+      fc.numeric_column(
+          'aaa', shape=[
+              0,
+          ])
+
+  def test_dtype_is_convertable_to_float(self):
+    with self.assertRaisesRegexp(ValueError,
+                                 'dtype must be convertible to float'):
+      fc.numeric_column('aaa', dtype=dtypes.string)
+
+  def test_scalar_deafult_value_fills_the_shape(self):
+    a = fc.numeric_column('aaa', shape=[2, 3], default_value=2.)
+    self.assertEqual(((2., 2., 2.), (2., 2., 2.)), a.default_value)
+
+  def test_parse_config(self):
+    a = fc.numeric_column('aaa', shape=[2, 3], dtype=dtypes.int32)
+    self.assertEqual({
+        'aaa': parsing_ops.FixedLenFeature((2, 3), dtype=dtypes.int32)
+    }, a._parse_example_config)
+
+  def test_parse_example_no_default_value(self):
+    price = fc.numeric_column('price', shape=[2])
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'price':
+                feature_pb2.Feature(float_list=feature_pb2.FloatList(
+                    value=[20., 110.]))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=price._parse_example_config)
+    self.assertIn('price', features)
+    with self.test_session():
+      self.assertAllEqual([[20., 110.]], features['price'].eval())
+
+  def test_parse_example_with_default_value(self):
+    price = fc.numeric_column('price', shape=[2], default_value=11.)
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'price':
+                feature_pb2.Feature(float_list=feature_pb2.FloatList(
+                    value=[20., 110.]))
+        }))
+    no_data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'something_else':
+                feature_pb2.Feature(float_list=feature_pb2.FloatList(
+                    value=[20., 110.]))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString(),
+                    no_data.SerializeToString()],
+        features=price._parse_example_config)
+    self.assertIn('price', features)
+    with self.test_session():
+      self.assertAllEqual([[20., 110.], [11., 11.]], features['price'].eval())
+
+  def test_normalizer_fn_must_be_callable(self):
+    with self.assertRaisesRegexp(TypeError, 'must be a callable'):
+      fc.numeric_column('price', normalizer_fn='NotACallable')
+
+  def test_normalizer_fn_transform_feature(self):
+
+    def _increment_two(input_tensor):
+      return input_tensor + 2.
+
+    price = fc.numeric_column('price', shape=[2], normalizer_fn=_increment_two)
+    builder = fc._LazyBuilder({
+        'price': constant_op.constant([[1., 2.], [5., 6.]])
+    })
+    output = builder.get(price)
+    with self.test_session():
+      self.assertAllEqual([[3., 4.], [7., 8.]], output.eval())
+
+  def test_get_dense_tensor(self):
+
+    def _increment_two(input_tensor):
+      return input_tensor + 2.
+
+    price = fc.numeric_column('price', shape=[2], normalizer_fn=_increment_two)
+    builder = fc._LazyBuilder({
+        'price': constant_op.constant([[1., 2.], [5., 6.]])
+    })
+    self.assertEqual(builder.get(price), price._get_dense_tensor(builder))
+
+  def test_sparse_tensor_not_supported(self):
+    price = fc.numeric_column('price')
+    builder = fc._LazyBuilder({
+        'price':
+            sparse_tensor.SparseTensor(
+                indices=[[0, 0]], values=[0.3], dense_shape=[1, 1])
+    })
+    with self.assertRaisesRegexp(ValueError, 'must be a Tensor'):
+      price._transform_feature(builder)
+
+  def test_deep_copy(self):
+    a = fc.numeric_column('aaa', shape=[1, 2], default_value=[[3., 2.]])
+    a_copy = copy.deepcopy(a)
+    self.assertEqual(a_copy.name, 'aaa')
+    self.assertEqual(a_copy.shape, (1, 2))
+    self.assertEqual(a_copy.default_value, ((3., 2.),))
+
+  def test_numpy_default_value(self):
+    a = fc.numeric_column(
+        'aaa', shape=[1, 2], default_value=np.array([[3., 2.]]))
+    self.assertEqual(a.default_value, ((3., 2.),))
+
+  def test_make_linear_model(self):
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[1.], [5.]])}
+      predictions = fc.make_linear_model(features, [price])
+      bias = get_linear_model_bias()
+      price_var = get_linear_model_column_var(price)
+      with _initialized_session() as sess:
+        self.assertAllClose([0.], bias.eval())
+        self.assertAllClose([[0.]], price_var.eval())
+        self.assertAllClose([[0.], [0.]], predictions.eval())
+        sess.run(price_var.assign([[10.]]))
+        self.assertAllClose([[10.], [50.]], predictions.eval())
+
+
+class SparseColumnHashedTest(test.TestCase):
+
+  def test_defaults(self):
+    a = fc.categorical_column_with_hash_bucket('aaa', 10)
+    self.assertEqual('aaa', a.name)
+    self.assertEqual('aaa', a.key)
+    self.assertEqual(10, a.hash_bucket_size)
+    self.assertEqual(dtypes.string, a.dtype)
+
+  def test_bucket_size_should_be_given(self):
+    with self.assertRaisesRegexp(ValueError, 'hash_bucket_size must be set.'):
+      fc.categorical_column_with_hash_bucket('aaa', None)
+
+  def test_bucket_size_should_be_positive(self):
+    with self.assertRaisesRegexp(ValueError,
+                                 'hash_bucket_size must be at least 1'):
+      fc.categorical_column_with_hash_bucket('aaa', 0)
+
+  def test_dtype_should_be_string_or_integer(self):
+    fc.categorical_column_with_hash_bucket('aaa', 10, dtype=dtypes.string)
+    fc.categorical_column_with_hash_bucket('aaa', 10, dtype=dtypes.int32)
+    with self.assertRaisesRegexp(ValueError, 'dtype must be string or integer'):
+      fc.categorical_column_with_hash_bucket('aaa', 10, dtype=dtypes.float32)
+
+  def test_deep_copy(self):
+    """Tests deepcopy of categorical_column_with_hash_bucket."""
+    column = fc.categorical_column_with_hash_bucket('aaa', 10)
+    column_copy = copy.deepcopy(column)
+    self.assertEqual('aaa', column_copy.name)
+    self.assertEqual(10, column_copy.hash_bucket_size)
+    self.assertEqual(dtypes.string, column_copy.dtype)
+
+  def test_parse_config(self):
+    a = fc.categorical_column_with_hash_bucket('aaa', 10)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.string)
+    }, a._parse_example_config)
+
+  def test_parse_config_int(self):
+    a = fc.categorical_column_with_hash_bucket('aaa', 10, dtype=dtypes.int32)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.int32)
+    }, a._parse_example_config)
+
+  def test_strings_should_be_hashed(self):
+    hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
+    wire_tensor = sparse_tensor.SparseTensor(
+        values=['omar', 'stringer', 'marlo'],
+        indices=[[0, 0], [1, 0], [1, 1]],
+        dense_shape=[2, 2])
+    builder = fc._LazyBuilder({'wire': wire_tensor})
+    output = builder.get(hashed_sparse)
+    # Check exact hashed output. If hashing changes this test will break.
+    expected_values = [6, 4, 1]
+    with self.test_session():
+      self.assertEqual(dtypes.int64, output.values.dtype)
+      self.assertAllEqual(expected_values, output.values.eval())
+      self.assertAllEqual(wire_tensor.indices.eval(), output.indices.eval())
+      self.assertAllEqual(wire_tensor.dense_shape.eval(),
+                          output.dense_shape.eval())
+
+  def test_tensor_dtype_should_be_string_or_integer(self):
+    string_fc = fc.categorical_column_with_hash_bucket(
+        'a_string', 10, dtype=dtypes.string)
+    int_fc = fc.categorical_column_with_hash_bucket(
+        'a_int', 10, dtype=dtypes.int32)
+    float_fc = fc.categorical_column_with_hash_bucket(
+        'a_float', 10, dtype=dtypes.string)
+    int_tensor = sparse_tensor.SparseTensor(
+        values=constant_op.constant([101]),
+        indices=[[0, 0]],
+        dense_shape=[1, 1])
+    string_tensor = sparse_tensor.SparseTensor(
+        values=constant_op.constant(['101']),
+        indices=[[0, 0]],
+        dense_shape=[1, 1])
+    float_tensor = sparse_tensor.SparseTensor(
+        values=constant_op.constant([101.]),
+        indices=[[0, 0]],
+        dense_shape=[1, 1])
+    builder = fc._LazyBuilder({
+        'a_int': int_tensor,
+        'a_string': string_tensor,
+        'a_float': float_tensor
+    })
+    builder.get(string_fc)
+    builder.get(int_fc)
+    with self.assertRaisesRegexp(ValueError, 'dtype must be string or integer'):
+      builder.get(float_fc)
+
+  def test_dtype_should_match_with_tensor(self):
+    hashed_sparse = fc.categorical_column_with_hash_bucket(
+        'wire', 10, dtype=dtypes.int64)
+    wire_tensor = sparse_tensor.SparseTensor(
+        values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
+    builder = fc._LazyBuilder({'wire': wire_tensor})
+    with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
+      builder.get(hashed_sparse)
+
+  def test_ints_should_be_hashed(self):
+    hashed_sparse = fc.categorical_column_with_hash_bucket(
+        'wire', 10, dtype=dtypes.int64)
+    wire_tensor = sparse_tensor.SparseTensor(
+        values=[101, 201, 301],
+        indices=[[0, 0], [1, 0], [1, 1]],
+        dense_shape=[2, 2])
+    builder = fc._LazyBuilder({'wire': wire_tensor})
+    output = builder.get(hashed_sparse)
+    # Check exact hashed output. If hashing changes this test will break.
+    expected_values = [3, 7, 5]
+    with self.test_session():
+      self.assertAllEqual(expected_values, output.values.eval())
+
+  def test_int32_64_is_compatible(self):
+    hashed_sparse = fc.categorical_column_with_hash_bucket(
+        'wire', 10, dtype=dtypes.int64)
+    wire_tensor = sparse_tensor.SparseTensor(
+        values=constant_op.constant([101, 201, 301], dtype=dtypes.int32),
+        indices=[[0, 0], [1, 0], [1, 1]],
+        dense_shape=[2, 2])
+    builder = fc._LazyBuilder({'wire': wire_tensor})
+    output = builder.get(hashed_sparse)
+    # Check exact hashed output. If hashing changes this test will break.
+    expected_values = [3, 7, 5]
+    with self.test_session():
+      self.assertAllEqual(expected_values, output.values.eval())
+
+  def test_get_sparse_tensors(self):
+    hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
+    wire_tensor = sparse_tensor.SparseTensor(
+        values=['omar', 'stringer', 'marlo'],
+        indices=[[0, 0], [1, 0], [1, 1]],
+        dense_shape=[2, 2])
+    builder = fc._LazyBuilder({'wire': wire_tensor})
+    self.assertEqual(
+        builder.get(hashed_sparse),
+        hashed_sparse._get_sparse_tensors(builder).id_tensor)
+
+
+def get_linear_model_bias():
+  with variable_scope.variable_scope('make_linear_model', reuse=True):
+    return variable_scope.get_variable('bias_weight')
+
+
+def get_linear_model_column_var(column):
+  return ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES,
+                            'make_linear_model/' + column.name)[0]
+
+
+class MakeLinearModelTest(test.TestCase):
+
+  def test_should_be_feature_column(self):
+    with self.assertRaisesRegexp(ValueError, 'must be a _FeatureColumn'):
+      fc.make_linear_model(
+          features={'a': [[0]]}, feature_columns='NotSupported')
+
+  def test_should_be_dense_or_categorical_column(self):
+
+    class NotSupportedColumn(fc._FeatureColumn):
+
+      @property
+      def name(self):
+        return 'NotSupportedColumn'
+
+      def _transform_feature(self, cache):
+        pass
+
+      @property
+      def _parse_example_config(self):
+        pass
+
+    with self.assertRaisesRegexp(
+        ValueError, 'must be either a _DenseColumn or _CategoricalColumn'):
+      fc.make_linear_model(
+          features={'a': [[0]]}, feature_columns=[NotSupportedColumn()])
+
+  def test_does_not_support_dict_columns(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'Expected feature_columns to be iterable, found dict.'):
+      fc.make_linear_model(
+          features={'a': [[0]]}, feature_columns={'a': fc.numeric_column('a')})
+
+  def test_raises_if_duplicate_name(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'Duplicate feature column name found for columns'):
+      fc.make_linear_model(
+          features={'a': [[0]]},
+          feature_columns=[fc.numeric_column('a'),
+                           fc.numeric_column('a')])
+
+  def test_dense_bias(self):
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[1.], [5.]])}
+      predictions = fc.make_linear_model(features, [price])
+      bias = get_linear_model_bias()
+      price_var = get_linear_model_column_var(price)
+      with _initialized_session() as sess:
+        self.assertAllClose([0.], bias.eval())
+        sess.run(price_var.assign([[10.]]))
+        sess.run(bias.assign([5.]))
+        self.assertAllClose([[15.], [55.]], predictions.eval())
+
+  def test_sparse_bias(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default():
+      wire_tensor = sparse_tensor.SparseTensor(
+          values=['omar', 'stringer', 'marlo'],  # hashed to = [2, 0, 3]
+          indices=[[0, 0], [1, 0], [1, 1]],
+          dense_shape=[2, 2])
+      features = {'wire_cast': wire_tensor}
+      predictions = fc.make_linear_model(features, [wire_cast])
+      bias = get_linear_model_bias()
+      wire_cast_var = get_linear_model_column_var(wire_cast)
+      with _initialized_session() as sess:
+        self.assertAllClose([0.], bias.eval())
+        self.assertAllClose([[0.], [0.], [0.], [0.]], wire_cast_var.eval())
+        sess.run(wire_cast_var.assign([[10.], [100.], [1000.], [10000.]]))
+        sess.run(bias.assign([5.]))
+        self.assertAllClose([[1005.], [10015.]], predictions.eval())
+
+  def test_dense_and_sparse_bias(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default():
+      wire_tensor = sparse_tensor.SparseTensor(
+          values=['omar', 'stringer', 'marlo'],  # hashed to = [2, 0, 3]
+          indices=[[0, 0], [1, 0], [1, 1]],
+          dense_shape=[2, 2])
+      features = {'wire_cast': wire_tensor, 'price': [[1.], [5.]]}
+      predictions = fc.make_linear_model(features, [wire_cast, price])
+      bias = get_linear_model_bias()
+      wire_cast_var = get_linear_model_column_var(wire_cast)
+      price_var = get_linear_model_column_var(price)
+      with _initialized_session() as sess:
+        sess.run(wire_cast_var.assign([[10.], [100.], [1000.], [10000.]]))
+        sess.run(bias.assign([5.]))
+        sess.run(price_var.assign([[10.]]))
+        self.assertAllClose([[1015.], [10065.]], predictions.eval())
+
+  def test_dense_multi_output(self):
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[1.], [5.]])}
+      predictions = fc.make_linear_model(features, [price], units=3)
+      bias = get_linear_model_bias()
+      price_var = get_linear_model_column_var(price)
+      with _initialized_session() as sess:
+        self.assertAllClose([0., 0., 0.], bias.eval())
+        self.assertAllClose([[0., 0., 0.]], price_var.eval())
+        sess.run(price_var.assign([[10., 100., 1000.]]))
+        sess.run(bias.assign([5., 6., 7.]))
+        self.assertAllClose([[15., 106., 1007.], [55., 506., 5007.]],
+                            predictions.eval())
+
+  def test_sparse_multi_output(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default():
+      wire_tensor = sparse_tensor.SparseTensor(
+          values=['omar', 'stringer', 'marlo'],  # hashed to = [2, 0, 3]
+          indices=[[0, 0], [1, 0], [1, 1]],
+          dense_shape=[2, 2])
+      features = {'wire_cast': wire_tensor}
+      predictions = fc.make_linear_model(features, [wire_cast], units=3)
+      bias = get_linear_model_bias()
+      wire_cast_var = get_linear_model_column_var(wire_cast)
+      with _initialized_session() as sess:
+        self.assertAllClose([0., 0., 0.], bias.eval())
+        self.assertAllClose([[0.] * 3] * 4, wire_cast_var.eval())
+        sess.run(
+            wire_cast_var.assign([[10., 11., 12.], [100., 110., 120.], [
+                1000., 1100., 1200.
+            ], [10000., 11000., 12000.]]))
+        sess.run(bias.assign([5., 6., 7.]))
+        self.assertAllClose([[1005., 1106., 1207.], [10015., 11017., 12019.]],
+                            predictions.eval())
+
+  def test_dense_multi_dimension(self):
+    price = fc.numeric_column('price', shape=2)
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[1., 2.], [5., 6.]])}
+      predictions = fc.make_linear_model(features, [price])
+      price_var = get_linear_model_column_var(price)
+      with _initialized_session() as sess:
+        self.assertAllClose([[0.], [0.]], price_var.eval())
+        sess.run(price_var.assign([[10.], [100.]]))
+        self.assertAllClose([[210.], [650.]], predictions.eval())
+
+  def test_sparse_combiner(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default():
+      wire_tensor = sparse_tensor.SparseTensor(
+          values=['omar', 'stringer', 'marlo'],  # hashed to = [2, 0, 3]
+          indices=[[0, 0], [1, 0], [1, 1]],
+          dense_shape=[2, 2])
+      features = {'wire_cast': wire_tensor}
+      predictions = fc.make_linear_model(
+          features, [wire_cast], sparse_combiner='mean')
+      bias = get_linear_model_bias()
+      wire_cast_var = get_linear_model_column_var(wire_cast)
+      with _initialized_session() as sess:
+        sess.run(wire_cast_var.assign([[10.], [100.], [1000.], [10000.]]))
+        sess.run(bias.assign([5.]))
+        self.assertAllClose([[1005.], [5010.]], predictions.eval())
+
+  def test_dense_multi_dimension_multi_output(self):
+    price = fc.numeric_column('price', shape=2)
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[1., 2.], [5., 6.]])}
+      predictions = fc.make_linear_model(features, [price], units=3)
+      bias = get_linear_model_bias()
+      price_var = get_linear_model_column_var(price)
+      with _initialized_session() as sess:
+        self.assertAllClose([0., 0., 0.], bias.eval())
+        self.assertAllClose([[0., 0., 0.], [0., 0., 0.]], price_var.eval())
+        sess.run(price_var.assign([[1., 2., 3.], [10., 100., 1000.]]))
+        sess.run(bias.assign([2., 3., 4.]))
+        self.assertAllClose([[23., 205., 2007.], [67., 613., 6019.]],
+                            predictions.eval())
+
+  def test_raises_if_shape_mismatch(self):
+    price = fc.numeric_column('price', shape=2)
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[1.], [5.]])}
+      predictions = fc.make_linear_model(features, [price])
+      with _initialized_session():
+        with self.assertRaisesRegexp(Exception, 'requested shape has 4'):
+          predictions.eval()
+
+  def test_dense_reshaping(self):
+    price = fc.numeric_column('price', shape=[1, 2])
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[[1., 2.]], [[5., 6.]]])}
+      predictions = fc.make_linear_model(features, [price])
+      bias = get_linear_model_bias()
+      price_var = get_linear_model_column_var(price)
+      with _initialized_session() as sess:
+        self.assertAllClose([0.], bias.eval())
+        self.assertAllClose([[0.], [0.]], price_var.eval())
+        self.assertAllClose([[0.], [0.]], predictions.eval())
+        sess.run(price_var.assign([[10.], [100.]]))
+        self.assertAllClose([[210.], [650.]], predictions.eval())
+
+  def test_dense_multi_column(self):
+    price1 = fc.numeric_column('price1', shape=2)
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': constant_op.constant([[1., 2.], [5., 6.]]),
+          'price2': constant_op.constant([[3.], [4.]])
+      }
+      predictions = fc.make_linear_model(features, [price1, price2])
+      bias = get_linear_model_bias()
+      price1_var = get_linear_model_column_var(price1)
+      price2_var = get_linear_model_column_var(price2)
+      with _initialized_session() as sess:
+        self.assertAllClose([0.], bias.eval())
+        self.assertAllClose([[0.], [0.]], price1_var.eval())
+        self.assertAllClose([[0.]], price2_var.eval())
+        self.assertAllClose([[0.], [0.]], predictions.eval())
+        sess.run(price1_var.assign([[10.], [100.]]))
+        sess.run(price2_var.assign([[1000.]]))
+        sess.run(bias.assign([7.]))
+        self.assertAllClose([[3217.], [4657.]], predictions.eval())
+
+  def test_dense_collection(self):
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default() as g:
+      features = {'price': constant_op.constant([[1.], [5.]])}
+      fc.make_linear_model(features, [price], weight_collections=['my-vars'])
+      my_vars = g.get_collection('my-vars')
+      bias = get_linear_model_bias()
+      price_var = get_linear_model_column_var(price)
+      self.assertIn(bias, my_vars)
+      self.assertIn(price_var, my_vars)
+
+  def test_sparse_collection(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default() as g:
+      wire_tensor = sparse_tensor.SparseTensor(
+          values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
+      features = {'wire_cast': wire_tensor}
+      fc.make_linear_model(
+          features, [wire_cast], weight_collections=['my-vars'])
+      my_vars = g.get_collection('my-vars')
+      bias = get_linear_model_bias()
+      wire_cast_var = get_linear_model_column_var(wire_cast)
+      self.assertIn(bias, my_vars)
+      self.assertIn(wire_cast_var, my_vars)
+
+  def test_dense_trainable_default(self):
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default() as g:
+      features = {'price': constant_op.constant([[1.], [5.]])}
+      fc.make_linear_model(features, [price])
+      bias = get_linear_model_bias()
+      price_var = get_linear_model_column_var(price)
+      trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
+      self.assertIn(bias, trainable_vars)
+      self.assertIn(price_var, trainable_vars)
+
+  def test_sparse_trainable_default(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default() as g:
+      wire_tensor = sparse_tensor.SparseTensor(
+          values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
+      features = {'wire_cast': wire_tensor}
+      fc.make_linear_model(features, [wire_cast])
+      trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
+      bias = get_linear_model_bias()
+      wire_cast_var = get_linear_model_column_var(wire_cast)
+      self.assertIn(bias, trainable_vars)
+      self.assertIn(wire_cast_var, trainable_vars)
+
+  def test_dense_trainable_false(self):
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default() as g:
+      features = {'price': constant_op.constant([[1.], [5.]])}
+      fc.make_linear_model(features, [price], trainable=False)
+      trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
+      self.assertEqual([], trainable_vars)
+
+  def test_sparse_trainable_false(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default() as g:
+      wire_tensor = sparse_tensor.SparseTensor(
+          values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
+      features = {'wire_cast': wire_tensor}
+      fc.make_linear_model(features, [wire_cast], trainable=False)
+      trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
+      self.assertEqual([], trainable_vars)
+
+  def test_column_order(self):
+    price_a = fc.numeric_column('price_a')
+    price_b = fc.numeric_column('price_b')
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default() as g:
+      features = {
+          'price_a': [[1.]],
+          'price_b': [[3.]],
+          'wire_cast':
+              sparse_tensor.SparseTensor(
+                  values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
+      }
+      fc.make_linear_model(
+          features, [price_a, wire_cast, price_b],
+          weight_collections=['my-vars'])
+      my_vars = g.get_collection('my-vars')
+      self.assertIn('price_a', my_vars[0].name)
+      self.assertIn('price_b', my_vars[1].name)
+      self.assertIn('wire_cast', my_vars[2].name)
+
+    with ops.Graph().as_default() as g:
+      features = {
+          'price_a': [[1.]],
+          'price_b': [[3.]],
+          'wire_cast':
+              sparse_tensor.SparseTensor(
+                  values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
+      }
+      fc.make_linear_model(
+          features, [wire_cast, price_b, price_a],
+          weight_collections=['my-vars'])
+      my_vars = g.get_collection('my-vars')
+      self.assertIn('price_a', my_vars[0].name)
+      self.assertIn('price_b', my_vars[1].name)
+      self.assertIn('wire_cast', my_vars[2].name)
+
+
+if __name__ == '__main__':
+  test.main()
-- 
GitLab


From 2e1232fe888144b1b05ab8c7b80b44c730929447 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Fri, 28 Apr 2017 11:01:36 -0800
Subject: [PATCH 0788/1563] Clarifies the singular value ordering. Change:
 154566292

---
 tensorflow/python/ops/linalg_ops.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/linalg_ops.py b/tensorflow/python/ops/linalg_ops.py
index e2fd25675e..9b6420317d 100644
--- a/tensorflow/python/ops/linalg_ops.py
+++ b/tensorflow/python/ops/linalg_ops.py
@@ -257,7 +257,9 @@ def svd(tensor, full_matrices=False, compute_uv=True, name=None):
     name: string, optional name of the operation.
 
   Returns:
-    s: Singular values. Shape is `[..., P]`.
+    s: Singular values. Shape is `[..., P]`. The values are sorted in reverse
+      order of magnitude, so s[..., 0] is the largest value, s[..., 1] is the
+      second largest, etc.
     u: Left singular vectors. If `full_matrices` is `False` (default) then
       shape is `[..., M, P]`; if `full_matrices` is `True` then shape is
       `[..., M, M]`. Not returned if `compute_uv` is `False`.
-- 
GitLab


From ac16d8010dbf9df48d91201cc4e7d34cdc5eb406 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 11:16:55 -0800
Subject: [PATCH 0789/1563] [XLA] Check for broadcast literal values in
 addition to constants in simplifier. Change: 154567986

---
 .../xla/service/algebraic_simplifier.cc       | 33 +++++++------
 .../xla/service/algebraic_simplifier_test.cc  | 46 +++++++++++++++++++
 2 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 6cd8c9158c..124a949bac 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -51,6 +51,16 @@ bool IsLiteralWithValue(const HloInstruction* operand, int8 value) {
          LiteralUtil::IsAll(operand->literal(), value);
 }
 
+bool IsAll(const HloInstruction* op, int8 value) {
+  if (IsLiteralWithValue(op, value)) {
+    return true;
+  }
+  if (op->opcode() == HloOpcode::kBroadcast && IsAll(op->operand(0), value)) {
+    return true;
+  }
+  return false;
+}
+
 // Returns whether the given transpose produces a result which is bit-wise
 // identical to its operand and thus may be replaced with a bitcast.
 bool TransposeIsBitcast(const HloInstruction* transpose) {
@@ -300,12 +310,12 @@ Status AlgebraicSimplifierVisitor::HandleAdd(HloInstruction* add,
                                              HloInstruction* rhs) {
   // A + 0 => A
   VLOG(10) << "trying transform [A + 0 => A]: " << add->ToString();
-  if (IsLiteralWithValue(rhs, 0) && ReplaceInstructionIfSameShape(add, lhs)) {
+  if (IsAll(rhs, 0) && ReplaceInstructionIfSameShape(add, lhs)) {
     return Status::OK();
   }
   // 0 + A => A
   VLOG(10) << "trying transform [0 + A => A]: " << add->ToString();
-  if (IsLiteralWithValue(lhs, 0) && ReplaceInstructionIfSameShape(add, rhs)) {
+  if (IsAll(lhs, 0) && ReplaceInstructionIfSameShape(add, rhs)) {
     return Status::OK();
   }
 
@@ -421,7 +431,7 @@ Status AlgebraicSimplifierVisitor::HandleSubtract(HloInstruction* sub,
                                                   HloInstruction* rhs) {
   // A - 0 => A
   VLOG(10) << "trying transform [A - 0 => A]: " << sub->ToString();
-  if (IsLiteralWithValue(rhs, 0) && ReplaceInstructionIfSameShape(sub, lhs)) {
+  if (IsAll(rhs, 0) && ReplaceInstructionIfSameShape(sub, lhs)) {
     return Status::OK();
   }
 
@@ -433,8 +443,7 @@ Status AlgebraicSimplifierVisitor::HandleDivide(HloInstruction* divide,
                                                 HloInstruction* rhs) {
   // A/1 => A
   VLOG(10) << "trying transform [A/1 => A]: " << divide->ToString();
-  if (IsLiteralWithValue(rhs, 1) &&
-      ReplaceInstructionIfSameShape(divide, lhs)) {
+  if (IsAll(rhs, 1) && ReplaceInstructionIfSameShape(divide, lhs)) {
     return Status::OK();
   }
 
@@ -589,14 +598,12 @@ Status AlgebraicSimplifierVisitor::HandleMultiply(HloInstruction* multiply,
                                                   HloInstruction* rhs) {
   // A*1 => A
   VLOG(10) << "trying transform [A*1 => A]: " << multiply->ToString();
-  if (IsLiteralWithValue(rhs, 1) &&
-      ReplaceInstructionIfSameShape(multiply, lhs)) {
+  if (IsAll(rhs, 1) && ReplaceInstructionIfSameShape(multiply, lhs)) {
     return Status::OK();
   }
   // 1*A => A
   VLOG(10) << "trying transform [1*A => A]: " << multiply->ToString();
-  if (IsLiteralWithValue(lhs, 1) &&
-      ReplaceInstructionIfSameShape(multiply, rhs)) {
+  if (IsAll(lhs, 1) && ReplaceInstructionIfSameShape(multiply, rhs)) {
     return Status::OK();
   }
   return Status::OK();
@@ -962,7 +969,7 @@ Status AlgebraicSimplifierVisitor::HandlePower(HloInstruction* power,
                                                HloInstruction* lhs,
                                                HloInstruction* rhs) {
   VLOG(10) << "trying transform [pow(A, 0) => 1]: " << power->ToString();
-  if (IsLiteralWithValue(rhs, 0)) {
+  if (IsAll(rhs, 0)) {
     auto one = HloInstruction::CreateConstant(LiteralUtil::CloneToUnique(
         LiteralUtil::One(power->shape().element_type())));
     std::unique_ptr<HloInstruction> ones;
@@ -976,19 +983,19 @@ Status AlgebraicSimplifierVisitor::HandlePower(HloInstruction* power,
   }
 
   VLOG(10) << "trying transform [pow(A, 1) => A]: " << power->ToString();
-  if (IsLiteralWithValue(rhs, 1) && ReplaceInstructionIfSameShape(power, lhs)) {
+  if (IsAll(rhs, 1) && ReplaceInstructionIfSameShape(power, lhs)) {
     return Status::OK();
   }
 
   VLOG(10) << "trying transform [pow(A, 2) => A*A]: " << power->ToString();
-  if (IsLiteralWithValue(rhs, 2)) {
+  if (IsAll(rhs, 2)) {
     return ReplaceWithNewInstruction(
         power, HloInstruction::CreateBinary(power->shape(),
                                             HloOpcode::kMultiply, lhs, lhs));
   }
 
   VLOG(10) << "trying transform [pow(A, -1) => 1/A]: " << power->ToString();
-  if (IsLiteralWithValue(rhs, -1)) {
+  if (IsAll(rhs, -1)) {
     auto* one = computation_->AddInstruction(
         HloInstruction::CreateConstant(LiteralUtil::CloneToUnique(
             LiteralUtil::One(rhs->shape().element_type()))));
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 93ed9da566..0cce076da5 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -69,6 +69,52 @@ TEST_F(AlgebraicSimplifierTest, AddZero) {
   EXPECT_EQ(root, param0);
 }
 
+TEST_F(AlgebraicSimplifierTest, AddBroadcastZeroR0Operand) {
+  Shape r2f32 = ShapeUtil::MakeShape(F32, {3, 2});
+  HloComputation::Builder builder(TestName());
+  HloInstruction* param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r2f32, "param0"));
+  HloInstruction* zero = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(0.0f)));
+  HloInstruction* bcast = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(r2f32, zero, {0, 1}));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(r2f32, HloOpcode::kAdd, bcast, param0));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_EQ(root->opcode(), HloOpcode::kAdd);
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+  root = computation->root_instruction();
+  EXPECT_EQ(root, param0);
+}
+
+TEST_F(AlgebraicSimplifierTest, AddBroadcastZeroR1Operand) {
+  Shape r2f32 = ShapeUtil::MakeShape(F32, {3, 2});
+  HloComputation::Builder builder(TestName());
+  HloInstruction* param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r2f32, "param0"));
+  HloInstruction* zero = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR1<float>({0, 0, 0})));
+  HloInstruction* bcast =
+      builder.AddInstruction(HloInstruction::CreateBroadcast(r2f32, zero, {1}));
+  builder.AddInstruction(
+      HloInstruction::CreateBinary(r2f32, HloOpcode::kAdd, bcast, param0));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_EQ(root->opcode(), HloOpcode::kAdd);
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+  root = computation->root_instruction();
+  EXPECT_EQ(root, param0);
+}
+
 // Test that A - 0 is simplified to A
 TEST_F(AlgebraicSimplifierTest, SubZero) {
   Shape r0f32 = ShapeUtil::MakeShape(F32, {});
-- 
GitLab


From 39ff1c65e02f105a4202b2c8359f057b2912926a Mon Sep 17 00:00:00 2001
From: Olivia Nordquist <nolivia@google.com>
Date: Fri, 28 Apr 2017 11:24:50 -0800
Subject: [PATCH 0790/1563] updating the gradient descent to be as good as
 promised Change: 154568808

---
 tensorflow/docs_src/get_started/mnist/beginners.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/mnist/beginners.md b/tensorflow/docs_src/get_started/mnist/beginners.md
index b9a85f3f67..2da2c19ea6 100644
--- a/tensorflow/docs_src/get_started/mnist/beginners.md
+++ b/tensorflow/docs_src/get_started/mnist/beginners.md
@@ -362,7 +362,7 @@ minimize. Then it can apply your choice of optimization algorithm to modify the
 variables and reduce the loss.
 
 ```python
-train_step = tf.train.GradientDescentOptimizer(0.5).minimize(cross_entropy)
+train_step = tf.train.GradientDescentOptimizer(0.05).minimize(cross_entropy)
 ```
 
 In this case, we ask TensorFlow to minimize `cross_entropy` using the
-- 
GitLab


From 20d99dcf6f66a2303dd332cf4bfad14521448002 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 11:34:10 -0800
Subject: [PATCH 0791/1563] Doc only change: Describe the purpose of
 accumulate_n Change: 154569724

---
 tensorflow/python/ops/math_ops.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 5f4ce63f31..572e7b71db 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -1920,6 +1920,12 @@ def accumulate_n(inputs, shape=None, tensor_dtype=None, name=None):
   NOTE: This operation is not differentiable and cannot be used if inputs depend
   on trainable variables. Please use `tf.add_n` for such cases.
 
+  Aside from differentiability, `tf.accumulate_n` performs the same operation as
+  `tf.add_n`, but does not wait for all of its inputs to be ready before
+  beginning to sum. This can save memory if inputs are ready at different times,
+  since minimum temporary storage is proportional to the output size rather than
+  the inputs size.
+
   For example:
 
   ```python
-- 
GitLab


From 5b85e8831367d4d02e9bb81d1d7475629b6255a7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 11:50:38 -0800
Subject: [PATCH 0792/1563] We don't promise to keep error messages constant.
 Change: 154571409

---
 tensorflow/docs_src/programmers_guide/version_semantics.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tensorflow/docs_src/programmers_guide/version_semantics.md b/tensorflow/docs_src/programmers_guide/version_semantics.md
index 7903053d5e..efaa3a75de 100644
--- a/tensorflow/docs_src/programmers_guide/version_semantics.md
+++ b/tensorflow/docs_src/programmers_guide/version_semantics.md
@@ -102,6 +102,12 @@ backward incompatible ways between minor releases. These include:
     optimizer. This may break code relying on the wrong behavior for
     convergence. We will note such changes in the release notes.
 
+*   **Error messages:** We reserve the right to change the text of error
+    messages (but not their type). For example, an error condition
+    raising `InvalidArgument` will continue to raise `InvalidArgument`,
+    but the human-readable message contents can change.
+
+
 Furthermore, any API methods marked "deprecated" in the 1.0 release can
 be deleted in any subsequent minor release.
 
-- 
GitLab


From dbef065bec2dc75b499eacef1d20f8311ee95c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Here=C3=B1=C3=BA?= <magallania@gmail.com>
Date: Fri, 28 Apr 2017 17:05:13 -0300
Subject: [PATCH 0793/1563] Minor typo

---
 tensorflow/contrib/learn/python/learn/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/learn/python/learn/README.md b/tensorflow/contrib/learn/python/learn/README.md
index 6a7b0ea614..d0145f5439 100644
--- a/tensorflow/contrib/learn/python/learn/README.md
+++ b/tensorflow/contrib/learn/python/learn/README.md
@@ -5,7 +5,7 @@ TF Learn is a simplified interface for TensorFlow, to get people started on pred
 ### Why *TensorFlow*?
 
 * TensorFlow provides a good backbone for building different shapes of machine learning applications.
-* It will continue to evolve both in the distributed direction and as general pipelinining machinery.
+* It will continue to evolve both in the distributed direction and as general pipelining machinery.
 
 ### Why *TensorFlow Learn*?
 
-- 
GitLab


From 30fdc1a3b36cfd4c8859be9d4f4ef1d951b59c21 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Fri, 28 Apr 2017 12:01:55 -0800
Subject: [PATCH 0794/1563] [TF:XLA] Improve constant folding. Supply a null
 partition_device so the constant folder will constant-fold DT_INT32
 operators.

Tensorflow core: Add support for constant folding of nodes with control dependencies.

Mark candidate sampling ops as stateful; the constant-folder was now constant-folding them where it should not.
Change: 154572578
---
 tensorflow/compiler/tf2xla/xla_compiler.cc    |   7 +-
 tensorflow/core/BUILD                         |   1 +
 .../core/common_runtime/constant_folding.cc   | 140 ++++++++++--------
 .../common_runtime/constant_folding_test.cc   |  43 +++++-
 tensorflow/core/ops/candidate_sampling_ops.cc |   6 +
 5 files changed, 133 insertions(+), 64 deletions(-)

diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index 33b4a43aa1..155fc58577 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -115,11 +115,12 @@ Status XlaCompiler::CompileFunction(
   }
 
   // Optimize the graph before running the compiler.
-  // TODO(pbar): The constant folder currently does not simplify int32
-  // operations for devices other than CPU.
   OptimizerOptions opts;
+  opts.set_do_common_subexpression_elimination(true);
+  opts.set_do_function_inlining(true);
+  opts.set_do_constant_folding(true);
   GraphOptimizer optimizer(opts);
-  OptimizeGraph(flr, &graph);
+  optimizer.Optimize(flr, flr->env(), /*device=*/nullptr, &graph);
 
   if (VLOG_IS_ON(1)) {
     dump_graph::DumpGraphToFile(
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 13f666f394..79fd7ec01e 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -2224,6 +2224,7 @@ tf_cc_test(
         "//tensorflow/core/kernels:bcast_ops",
         "//tensorflow/core/kernels:cast_op",
         "//tensorflow/core/kernels:concat_op",
+        "//tensorflow/core/kernels:cwise_op",
         "//tensorflow/core/kernels:identity_op",
         "//tensorflow/core/kernels:immutable_constant_op",
         "//tensorflow/core/kernels:matmul_op",
diff --git a/tensorflow/core/common_runtime/constant_folding.cc b/tensorflow/core/common_runtime/constant_folding.cc
index 5b604189e1..8fa61d098e 100644
--- a/tensorflow/core/common_runtime/constant_folding.cc
+++ b/tensorflow/core/common_runtime/constant_folding.cc
@@ -35,6 +35,7 @@ limitations under the License.
 #include "tensorflow/core/graph/subgraph.h"
 #include "tensorflow/core/lib/core/threadpool.h"
 #include "tensorflow/core/lib/gtl/cleanup.h"
+#include "tensorflow/core/lib/gtl/flatset.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/public/session_options.h"
 
@@ -44,6 +45,9 @@ namespace {
 
 bool IsConstantFoldable(const Node* n,
                         const std::function<bool(const Node*)>& consider) {
+  if (n->IsConstant()) {
+    return true;
+  }
   if (n->op_def().is_stateful()) {
     return false;
   }
@@ -78,47 +82,60 @@ bool IsConstantFoldable(const Node* n,
   return true;
 }
 
-// Returns the constant foldable nodes in `nodes_result` in data flow order.
-void FindConstantFoldableNodes(const Graph* graph,
-                               const FunctionLibraryDefinition* flib_def,
-                               ConstantFoldingOptions opts,
-                               std::vector<Node*>* nodes_result) {
-  std::set<const Node*> node_set;
-  std::vector<Node*>& nodes = *nodes_result;
+// Returns the constant foldable nodes in `nodes` in topological order.
+// Populates `constant_control_deps` with the non-constant control depedencies
+// of each constant node.
+void FindConstantFoldableNodes(
+    const Graph* graph, ConstantFoldingOptions opts, std::vector<Node*>* nodes,
+    std::unordered_map<const Node*, gtl::FlatSet<Node*>>*
+        constant_control_deps) {
   bool internal_node_inserted = false;
   // Walk the nodes in data flow order
-  ReverseDFS(*graph, nullptr, [&nodes, &node_set, &internal_node_inserted, opts,
-                               flib_def](Node* n) {
-    if (n->IsConstant()) {
-      // Constants with no control inputs (except from _SOURCE node)
-      // are definitely constant foldable.
-      if (n->in_edges().size() == 0 ||
-          (n->in_edges().size() == 1 &&
-           (*n->in_edges().begin())->src()->IsSource())) {
-        node_set.insert(n);
-        nodes.push_back(n);
-      }
-    } else if (IsConstantFoldable(n, opts.consider)) {
-      // Check whether the set of this node's in_nodes is completely
-      // included in the set of constant foldable nodes. If true,
-      // then this node is also constant foldable.
-      bool all_parents_constant = true;
-      for (const Node* parent : n->in_nodes()) {
-        if (node_set.count(parent) == 0 && !parent->IsSource()) {
-          all_parents_constant = false;
-          break;
+  ReverseDFS(
+      *graph, nullptr,
+      [nodes, constant_control_deps, &internal_node_inserted, opts](Node* n) {
+        if (IsConstantFoldable(n, opts.consider)) {
+          // A node is constant provided all of its non-control
+          // incoming Tensors come from constant nodes.
+          //
+          // We allow control dependencies from non-constant nodes to constant
+          // nodes, but to preserve the graph structure we must transfer the
+          // control dependency onto any constant replacement.
+          bool all_parents_constant = true;
+          for (const Edge* in : n->in_edges()) {
+            // Allows non-constant -> constant control edges.
+            if (!in->IsControlEdge() &&
+                constant_control_deps->count(in->src()) == 0) {
+              all_parents_constant = false;
+              break;
+            }
+          }
+          if (all_parents_constant) {
+            gtl::FlatSet<Node*>& control_deps = (*constant_control_deps)[n];
+            for (const Edge* e : n->in_edges()) {
+              if (constant_control_deps->count(e->src()) == 0) {
+                if (!e->src()->IsSource()) {
+                  control_deps.insert(e->src());
+                }
+              } else {
+                // If the parent is constant, add all of its transitive control
+                // deps.
+                const gtl::FlatSet<Node*>& parent_deps =
+                    (*constant_control_deps)[e->src()];
+                control_deps.insert(parent_deps.begin(), parent_deps.end());
+              }
+            }
+            nodes->push_back(n);
+            if (!n->IsConstant()) {
+              internal_node_inserted = true;
+            }
+          }
         }
-      }
-      if (all_parents_constant) {
-        node_set.insert(n);
-        nodes.push_back(n);
-        internal_node_inserted = true;
-      }
-    }
-  });
+      });
   // If we have inserted just leaf level nodes, then there is nothing to fold.
   if (!internal_node_inserted) {
-    nodes.clear();
+    nodes->clear();
+    constant_control_deps->clear();
   }
 }
 
@@ -134,23 +151,21 @@ Graph* GetConstantGraph(const Graph* orig_graph,
                         std::map<NodeAndOutput, Node*>* tensors_to_fetch) {
   Graph* constant_graph = new Graph(orig_graph->op_registry());
   std::unordered_map<Node*, Node*> node_map;
-  std::set<Node*> already_added;
-  already_added.insert(constant_graph->source_node());
-  already_added.insert(constant_graph->sink_node());
   node_map[orig_graph->source_node()] = constant_graph->source_node();
   node_map[orig_graph->sink_node()] = constant_graph->sink_node();
   for (Node* n : nodes) {
     Node* added = constant_graph->CopyNode(n);
     node_map[n] = added;
-    already_added.insert(added);
     for (const Edge* in_edge : n->in_edges()) {
-      Node* in = in_edge->src();
-      CHECK_GT(node_map.count(in), size_t{0}) << n->DebugString() << " <-"
-                                              << in->DebugString();
-      CHECK_GT(already_added.count(node_map[in]), size_t{0})
-          << in->DebugString();
-      constant_graph->AddEdge(node_map[in], in_edge->src_output(), added,
-                              in_edge->dst_input());
+      // Don't copy control edges to the constant graph.
+      if (!in_edge->IsControlEdge()) {
+        Node* in = in_edge->src();
+        auto it = node_map.find(in);
+        CHECK(it != node_map.end())
+            << n->DebugString() << " <-" << in->DebugString();
+        constant_graph->AddEdge(it->second, in_edge->src_output(), added,
+                                in_edge->dst_input());
+      }
     }
   }
 
@@ -176,8 +191,11 @@ int64 UniqueConstantId() {
 // the value supplied in 'constant'. 'partition_device', if non-null
 // is the device where the graph executes. Returns true if the
 // replacement was successful, false otherwise.
+// 'control_deps' is the set of nodes that should be control predecessors of the
+// new constant node.
 bool ReplaceTensorWithConstant(Graph* graph, Device* partition_device,
-                               NodeAndOutput tensor, const Tensor& constant) {
+                               NodeAndOutput tensor, const Tensor& constant,
+                               const gtl::FlatSet<Node*>& control_deps) {
   // Be conservative when replacing a tensor with a constant, when not
   // running on CPU.
   // 1) If the destination tensor is not an int32 tensor, and has HOST_MEMORY
@@ -241,8 +259,8 @@ bool ReplaceTensorWithConstant(Graph* graph, Device* partition_device,
     return false;
   }
 
-  VLOG(1) << "Replacing " << tensor.first->DebugString()
-          << " :: " << tensor.second << " with a constant";
+  VLOG(1) << "Replacing " << tensor.first->name() << " :: " << tensor.second
+          << " with a constant";
 
   if (!NodeBuilder(builder).Finalize(graph, &constant_node).ok()) {
     return false;
@@ -251,7 +269,13 @@ bool ReplaceTensorWithConstant(Graph* graph, Device* partition_device,
     graph->AddEdge(constant_node, 0, edge->dst(), edge->dst_input());
     graph->RemoveEdge(edge);
   }
-  graph->AddEdge(graph->source_node(), -1, constant_node, -1);
+  if (control_deps.empty()) {
+    graph->AddControlEdge(graph->source_node(), constant_node);
+  } else {
+    for (Node* node : control_deps) {
+      graph->AddControlEdge(node, constant_node);
+    }
+  }
   if (partition_device) {
     constant_node->set_assigned_device_name(partition_device->name());
   }
@@ -265,13 +289,10 @@ Status ConstantFold(const ConstantFoldingOptions& opts,
                     Device* partition_device, Graph* graph, bool* was_mutated) {
   DumpGraph("Before", graph);
 
-  const FunctionLibraryDefinition* flib_def = nullptr;
-  if (function_library) {
-    flib_def = function_library->GetFunctionLibraryDefinition();
-  }
-
   std::vector<Node*> constant_foldable_nodes;
-  FindConstantFoldableNodes(graph, flib_def, opts, &constant_foldable_nodes);
+  std::unordered_map<const Node*, gtl::FlatSet<Node*>> constant_control_deps;
+  FindConstantFoldableNodes(graph, opts, &constant_foldable_nodes,
+                            &constant_control_deps);
   if (constant_foldable_nodes.empty()) {
     VLOG(1) << "No constant foldable nodes found";
     *was_mutated = false;
@@ -324,8 +345,11 @@ Status ConstantFold(const ConstantFoldingOptions& opts,
   // original graph with those constants.
   int32 num_nodes_replaced = 0;
   for (size_t c = 0; c < outputs.size(); ++c) {
+    const gtl::FlatSet<Node*>& control_deps =
+        constant_control_deps[tensors_to_replace[c].first];
     if (ReplaceTensorWithConstant(graph, partition_device,
-                                  tensors_to_replace[c], outputs[c])) {
+                                  tensors_to_replace[c], outputs[c],
+                                  control_deps)) {
       ++num_nodes_replaced;
     }
   }
diff --git a/tensorflow/core/common_runtime/constant_folding_test.cc b/tensorflow/core/common_runtime/constant_folding_test.cc
index a4612aba72..e45490ee06 100644
--- a/tensorflow/core/common_runtime/constant_folding_test.cc
+++ b/tensorflow/core/common_runtime/constant_folding_test.cc
@@ -230,14 +230,14 @@ TEST_F(ConstantFoldingTest, TwoOutputsFoldOneOutput) {
   Node* b1_ident = index.at("b1_ident");
 
   // 0th output of b should have been folded.
-  EXPECT_EQ(1, b0->num_inputs());
+  ASSERT_EQ(1, b0->num_inputs());
   ExpectNodeEqual<int>(*(b0->in_nodes().begin()), {0, 1}, {2});
   // 1st output of b should still be b1_ident. However, b1_ident's input must
   // have been replaced with a constant.
-  EXPECT_EQ(1, b1->num_inputs());
+  ASSERT_EQ(1, b1->num_inputs());
   EXPECT_EQ(*(b1->in_nodes().begin()), b1_ident);
 
-  EXPECT_EQ(1, b1_ident->num_inputs());
+  ASSERT_EQ(1, b1_ident->num_inputs());
   ExpectNodeEqual<int>(*(b1_ident->in_nodes().begin()), {}, {0});
 }
 
@@ -325,6 +325,43 @@ TEST_F(ConstantFoldingTest, TestNoReplaceNonCPUOp) {
   EXPECT_FALSE(was_mutated);
 }
 
+TEST_F(ConstantFoldingTest, ControlDependencies) {
+  Graph g(OpRegistry::Global());
+  {
+    Scope s = Scope::NewRootScope();
+    auto c0 = ops::Const<int>(s, 1);
+    auto recv1 = ops::_Recv(s.WithOpName("recv1"), DT_FLOAT, "recv1", "sender",
+                            0, "receiver");
+    auto c1 = ops::Const<int>(s.WithControlDependencies(recv1), 2);
+    auto recv2 = ops::_Recv(s.WithOpName("recv2"), DT_FLOAT, "recv2", "sender",
+                            0, "receiver");
+    auto c2 = ops::Const<int>(s.WithControlDependencies(recv2), 3);
+    auto add = ops::Add(s.WithControlDependencies(c2), c0, c1);
+    auto send =
+        ops::_Send(s.WithOpName("send"), add, "send", "sender", 0, "receiver");
+    TF_ASSERT_OK(s.ToGraph(&g));
+  }
+  bool was_mutated;
+  TF_EXPECT_OK(ConstantFold(ConstantFoldingOptions{}, nullptr, Env::Default(),
+                            nullptr, &g, &was_mutated));
+  EXPECT_TRUE(was_mutated);
+
+  std::unordered_map<string, Node*> index = NodeNameIndex(g);
+  Node* recv1 = index.at("recv1");
+  Node* recv2 = index.at("recv2");
+  Node* send = index.at("send");
+
+  ASSERT_EQ(1, send->num_inputs());
+  Node* p = *(send->in_nodes().begin());
+  ExpectNodeEqual<int>(p, {3}, {});
+
+  ASSERT_EQ(2, p->in_edges().size());
+  for (const Edge* e : p->in_edges()) {
+    EXPECT_TRUE(e->IsControlEdge());
+    EXPECT_TRUE(e->src() == recv1 || e->src() == recv2) << e->src()->name();
+  }
+}
+
 namespace {
 
 const char kTestMemRegionName[] = "test://test";
diff --git a/tensorflow/core/ops/candidate_sampling_ops.cc b/tensorflow/core/ops/candidate_sampling_ops.cc
index 037c393574..945e0b068a 100644
--- a/tensorflow/core/ops/candidate_sampling_ops.cc
+++ b/tensorflow/core/ops/candidate_sampling_ops.cc
@@ -55,6 +55,7 @@ REGISTER_OP("UniformCandidateSampler")
     .Attr("seed: int = 0")
     .Attr("seed2: int = 0")
     .SetShapeFn(CandidateSamplerShapeFn)
+    .SetIsStateful()
     .Doc(R"doc(
 Generates labels for candidate sampling with a uniform distribution.
 
@@ -103,6 +104,7 @@ REGISTER_OP("LogUniformCandidateSampler")
     .Attr("seed: int = 0")
     .Attr("seed2: int = 0")
     .SetShapeFn(CandidateSamplerShapeFn)
+    .SetIsStateful()
     .Doc(R"doc(
 Generates labels for candidate sampling with a log-uniform distribution.
 
@@ -152,6 +154,7 @@ REGISTER_OP("LearnedUnigramCandidateSampler")
     .Attr("seed: int = 0")
     .Attr("seed2: int = 0")
     .SetShapeFn(CandidateSamplerShapeFn)
+    .SetIsStateful()
     .Doc(R"doc(
 Generates labels for candidate sampling with a learned unigram distribution.
 
@@ -200,6 +203,7 @@ REGISTER_OP("ThreadUnsafeUnigramCandidateSampler")
     .Attr("seed: int = 0")
     .Attr("seed2: int = 0")
     .SetShapeFn(CandidateSamplerShapeFn)
+    .SetIsStateful()
     .Doc(R"doc(
 Generates labels for candidate sampling with a learned unigram distribution.
 
@@ -254,6 +258,7 @@ REGISTER_OP("FixedUnigramCandidateSampler")
     .Attr("seed: int = 0")
     .Attr("seed2: int = 0")
     .SetShapeFn(CandidateSamplerShapeFn)
+    .SetIsStateful()
     .Doc(R"doc(
 Generates labels for candidate sampling with a learned unigram distribution.
 
@@ -329,6 +334,7 @@ REGISTER_OP("AllCandidateSampler")
     .Attr("seed: int = 0")
     .Attr("seed2: int = 0")
     .SetShapeFn(CandidateSamplerShapeFn)
+    .SetIsStateful()
     .Doc(R"doc(
 Generates labels for candidate sampling with a learned unigram distribution.
 
-- 
GitLab


From a1a67fcf2862adedefb77c3393901bc6fadeee3d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 12:03:57 -0800
Subject: [PATCH 0795/1563] Update ops-related pbtxt files. Change: 154572855

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 376 ++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |   6 +
 2 files changed, 382 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 5d55edc68c..85309fba78 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -487,6 +487,56 @@ op {
     }
   }
 }
+op {
+  name: "AllCandidateSampler"
+  input_arg {
+    name: "true_classes"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "sampled_candidates"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "true_expected_count"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "sampled_expected_count"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_true"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "num_sampled"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "unique"
+    type: "bool"
+  }
+  attr {
+    name: "seed"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "seed2"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "Any"
   input_arg {
@@ -7885,6 +7935,108 @@ op {
     }
   }
 }
+op {
+  name: "FixedUnigramCandidateSampler"
+  input_arg {
+    name: "true_classes"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "sampled_candidates"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "true_expected_count"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "sampled_expected_count"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_true"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "num_sampled"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "unique"
+    type: "bool"
+  }
+  attr {
+    name: "range_max"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "vocab_file"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "distortion"
+    type: "float"
+    default_value {
+      f: 1
+    }
+  }
+  attr {
+    name: "num_reserved_ids"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "num_shards"
+    type: "int"
+    default_value {
+      i: 1
+    }
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "shard"
+    type: "int"
+    default_value {
+      i: 0
+    }
+    has_minimum: true
+  }
+  attr {
+    name: "unigrams"
+    type: "list(float)"
+    default_value {
+      list {
+      }
+    }
+  }
+  attr {
+    name: "seed"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "seed2"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "Floor"
   input_arg {
@@ -9559,6 +9711,62 @@ op {
     }
   }
 }
+op {
+  name: "LearnedUnigramCandidateSampler"
+  input_arg {
+    name: "true_classes"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "sampled_candidates"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "true_expected_count"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "sampled_expected_count"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_true"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "num_sampled"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "unique"
+    type: "bool"
+  }
+  attr {
+    name: "range_max"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "seed"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "seed2"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "Less"
   input_arg {
@@ -9848,6 +10056,62 @@ op {
     }
   }
 }
+op {
+  name: "LogUniformCandidateSampler"
+  input_arg {
+    name: "true_classes"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "sampled_candidates"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "true_expected_count"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "sampled_expected_count"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_true"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "num_sampled"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "unique"
+    type: "bool"
+  }
+  attr {
+    name: "range_max"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "seed"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "seed2"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "LogicalAnd"
   input_arg {
@@ -24347,6 +24611,62 @@ op {
     }
   }
 }
+op {
+  name: "ThreadUnsafeUnigramCandidateSampler"
+  input_arg {
+    name: "true_classes"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "sampled_candidates"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "true_expected_count"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "sampled_expected_count"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_true"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "num_sampled"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "unique"
+    type: "bool"
+  }
+  attr {
+    name: "range_max"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "seed"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "seed2"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "Tile"
   input_arg {
@@ -24686,6 +25006,62 @@ op {
     }
   }
 }
+op {
+  name: "UniformCandidateSampler"
+  input_arg {
+    name: "true_classes"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "sampled_candidates"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "true_expected_count"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "sampled_expected_count"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "num_true"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "num_sampled"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "unique"
+    type: "bool"
+  }
+  attr {
+    name: "range_max"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "seed"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "seed2"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "Unique"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 7cabdccb29..332dfe18d4 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -565,6 +565,7 @@ op {
   }
   summary: "Generates labels for candidate sampling with a learned unigram distribution."
   description: "See explanations of candidate sampling and the data formats at\ngo/candidate-sampling.\n\nFor each batch, this op picks a single set of sampled candidate labels.\n\nThe advantages of sampling candidates per-batch are simplicity and the\npossibility of efficient dense matrix multiplication. The disadvantage is that\nthe sampled candidates must be chosen independently of the context and of the\ntrue labels."
+  is_stateful: true
 }
 op {
   name: "Any"
@@ -7882,6 +7883,7 @@ op {
   }
   summary: "Generates labels for candidate sampling with a learned unigram distribution."
   description: "A unigram sampler could use a fixed unigram distribution read from a\nfile or passed in as an in-memory array instead of building up the distribution\nfrom data on the fly. There is also an option to skew the distribution by\napplying a distortion power to the weights.\n\nThe vocabulary file should be in CSV-like format, with the last field\nbeing the weight associated with the word.\n\nFor each batch, this op picks a single set of sampled candidate labels.\n\nThe advantages of sampling candidates per-batch are simplicity and the\npossibility of efficient dense matrix multiplication. The disadvantage is that\nthe sampled candidates must be chosen independently of the context and of the\ntrue labels."
+  is_stateful: true
 }
 op {
   name: "Floor"
@@ -9780,6 +9782,7 @@ op {
   }
   summary: "Generates labels for candidate sampling with a learned unigram distribution."
   description: "See explanations of candidate sampling and the data formats at\ngo/candidate-sampling.\n\nFor each batch, this op picks a single set of sampled candidate labels.\n\nThe advantages of sampling candidates per-batch are simplicity and the\npossibility of efficient dense matrix multiplication. The disadvantage is that\nthe sampled candidates must be chosen independently of the context and of the\ntrue labels."
+  is_stateful: true
 }
 op {
   name: "Less"
@@ -10106,6 +10109,7 @@ op {
   }
   summary: "Generates labels for candidate sampling with a log-uniform distribution."
   description: "See explanations of candidate sampling and the data formats at\ngo/candidate-sampling.\n\nFor each batch, this op picks a single set of sampled candidate labels.\n\nThe advantages of sampling candidates per-batch are simplicity and the\npossibility of efficient dense matrix multiplication. The disadvantage is that\nthe sampled candidates must be chosen independently of the context and of the\ntrue labels."
+  is_stateful: true
 }
 op {
   name: "LogicalAnd"
@@ -25891,6 +25895,7 @@ op {
   }
   summary: "Generates labels for candidate sampling with a learned unigram distribution."
   description: "See explanations of candidate sampling and the data formats at\ngo/candidate-sampling.\n\nFor each batch, this op picks a single set of sampled candidate labels.\n\nThe advantages of sampling candidates per-batch are simplicity and the\npossibility of efficient dense matrix multiplication. The disadvantage is that\nthe sampled candidates must be chosen independently of the context and of the\ntrue labels."
+  is_stateful: true
 }
 op {
   name: "Tile"
@@ -26277,6 +26282,7 @@ op {
   }
   summary: "Generates labels for candidate sampling with a uniform distribution."
   description: "See explanations of candidate sampling and the data formats at\ngo/candidate-sampling.\n\nFor each batch, this op picks a single set of sampled candidate labels.\n\nThe advantages of sampling candidates per-batch are simplicity and the\npossibility of efficient dense matrix multiplication. The disadvantage is that\nthe sampled candidates must be chosen independently of the context and of the\ntrue labels."
+  is_stateful: true
 }
 op {
   name: "Unique"
-- 
GitLab


From e4d6e8a3ff414a2688d93d0d2e1b234165a2703e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 12:25:59 -0800
Subject: [PATCH 0796/1563] Update link to docs. Change: 154575206

---
 .../examples/how_tos/reading_data/fully_connected_reader.py    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/examples/how_tos/reading_data/fully_connected_reader.py b/tensorflow/examples/how_tos/reading_data/fully_connected_reader.py
index a9e73def6a..a9ed02dd1a 100644
--- a/tensorflow/examples/how_tos/reading_data/fully_connected_reader.py
+++ b/tensorflow/examples/how_tos/reading_data/fully_connected_reader.py
@@ -17,7 +17,8 @@
 
 This version is like fully_connected_feed.py but uses data converted
 to a TFRecords file containing tf.train.Example protocol buffers.
-See tensorflow/g3doc/how_tos/reading_data.md#reading-from-files
+See:
+https://www.tensorflow.org/programmers_guide/reading_data#reading_from_files
 for context.
 
 YOU MUST run convert_to_records before running this (but you only need to
-- 
GitLab


From f3a86a0818c90e618b3fb3026286dbc2f5b1389c Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Fri, 28 Apr 2017 12:48:46 -0800
Subject: [PATCH 0797/1563] Fixes bug in state_ops.assign for
 PartitionedVariables Change: 154577958

---
 tensorflow/python/ops/state_ops.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/ops/state_ops.py b/tensorflow/python/ops/state_ops.py
index f46f56cbb7..63394d5214 100644
--- a/tensorflow/python/ops/state_ops.py
+++ b/tensorflow/python/ops/state_ops.py
@@ -209,7 +209,7 @@ def assign_sub(ref, value, use_locking=None, name=None):
   if ref.dtype._is_ref_dtype:
     return gen_state_ops.assign_sub(
         ref, value, use_locking=use_locking, name=name)
-  return ref.assign_sub(value, name=name)
+  return ref.assign_sub(value)
 
 
 def assign_add(ref, value, use_locking=None, name=None):
@@ -237,7 +237,7 @@ def assign_add(ref, value, use_locking=None, name=None):
   if ref.dtype._is_ref_dtype:
     return gen_state_ops.assign_add(
         ref, value, use_locking=use_locking, name=name)
-  return ref.assign_add(value, name=name)
+  return ref.assign_add(value)
 
 
 def assign(ref, value, validate_shape=None, use_locking=None, name=None):
@@ -269,4 +269,4 @@ def assign(ref, value, validate_shape=None, use_locking=None, name=None):
     return gen_state_ops.assign(
         ref, value, use_locking=use_locking, name=name,
         validate_shape=validate_shape)
-  return ref.assign(value, name=name)
+  return ref.assign(value)
-- 
GitLab


From 44b15e16061a91461019e564de9eff5aeb918fe3 Mon Sep 17 00:00:00 2001
From: Olivia Nordquist <nolivia@google.com>
Date: Fri, 28 Apr 2017 12:53:50 -0800
Subject: [PATCH 0798/1563] clarify documentation on a deprecated fn Change:
 154578604

---
 tensorflow/contrib/losses/python/losses/loss_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/losses/python/losses/loss_ops.py b/tensorflow/contrib/losses/python/losses/loss_ops.py
index 5ca8c8a18b..f6d3601c7d 100644
--- a/tensorflow/contrib/losses/python/losses/loss_ops.py
+++ b/tensorflow/contrib/losses/python/losses/loss_ops.py
@@ -236,7 +236,7 @@ def get_regularization_losses(scope=None):
     scope: an optional scope for filtering the losses to return.
 
   Returns:
-    A list of loss variables.
+    A list of regularization losses as Tensors.
   """
   return ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES, scope)
 
-- 
GitLab


From 05e2aee131a204c787d9041e117af0948f1cff8c Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 28 Apr 2017 12:54:16 -0800
Subject: [PATCH 0799/1563] Apply the grappler graph optimizations on the
 Inception model: this improves the performance by almost 20% on my GPU (from
 55 images/s to 62 images/s) Change: 154578655

---
 tensorflow/python/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index bcb837ad8d..5e938c73f5 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -42,6 +42,7 @@ py_library(
         "//tensorflow/tools/quantization:__pkg__",  # TODO(b/34059704): remove when fixed
     ],
     deps = [
+        ":tf_optimizer",
         ":array_ops",
         ":check_ops",
         ":client",
-- 
GitLab


From 9663eff309319b7268a7b95d481052d6acc575f4 Mon Sep 17 00:00:00 2001
From: "Gao, Xiang" <qasdfgtyuiop@gmail.com>
Date: Fri, 28 Apr 2017 17:20:13 -0400
Subject: [PATCH 0800/1563] change tensor.h and tensor.cc according to review

---
 tensorflow/core/framework/tensor.cc | 13 ++++++++-----
 tensorflow/core/framework/tensor.h  | 15 ++++++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/tensorflow/core/framework/tensor.cc b/tensorflow/core/framework/tensor.cc
index b11934a8a2..f314d47481 100644
--- a/tensorflow/core/framework/tensor.cc
+++ b/tensorflow/core/framework/tensor.cc
@@ -902,7 +902,7 @@ void Tensor::FillDescription(TensorDescription* description) const {
 }
 
 gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
-    gtl::InlinedVector<int64, 4> orig, int64 num_out_dims) {
+    gtl::ArraySlice<int64>, int64 num_out_dims) {
   if (num_out_dims == orig.size()) {
     return orig;
   }
@@ -912,21 +912,24 @@ gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
     const int64 in_dim = out_dim + offset;
     out_dims[out_dim] = in_dim < 0 ? 1 : orig[in_dim];
   }
-  for (int64 in_dim = 0; in_dim < offset; ++in_dim)
+  for (int64 in_dim = 0; in_dim < offset; ++in_dim) {
     out_dims[0] *= orig[in_dim];
+  }
   return out_dims;
 }
 
 gtl::InlinedVector<int64, 4> Tensor::ComputeFlatOuterDims(
-    gtl::InlinedVector<int64, 4> orig, int64 num_out_dims) {
+    gtl::ArraySlice<int64> orig, int64 num_out_dims) {
   if (num_out_dims == orig.size()) {
     return orig;
   }
   gtl::InlinedVector<int64, 4> out_dims(num_out_dims, 0);
-  for (int64 out_dim = 0; out_dim <= num_out_dims - 1; ++out_dim)
+  for (int64 out_dim = 0; out_dim <= num_out_dims - 1; ++out_dim) {
     out_dims[out_dim] = out_dim >= orig.size() ? 1 : orig[out_dim];
-  for (int64 in_dim = num_out_dims; in_dim < orig.size(); ++in_dim)
+  }
+  for (int64 in_dim = num_out_dims; in_dim < orig.size(); ++in_dim) {
     out_dims[num_out_dims - 1] *= orig[in_dim];
+  }
   return out_dims;
 }
 
diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 86500d5666..8e41f355c6 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -441,12 +441,11 @@ class Tensor {
       gtl::ArraySlice<int64> new_sizes,
       Eigen::array<Eigen::DenseIndex, NDIMS>* dims) const;
 
-  // TODO(rmlarsen): These shouldn't hardcode '4' so that it lines up with
   // TensorShape's InlineVector.
   static gtl::InlinedVector<int64, 4> ComputeFlatInnerDims(
-      gtl::InlinedVector<int64, 4> orig, int64 num_out_dims);
+      gtl::ArraySlice<int64> orig, int64 num_out_dims);
   static gtl::InlinedVector<int64, 4> ComputeFlatOuterDims(
-      gtl::InlinedVector<int64, 4> orig, int64 num_out_dims);
+      gtl::ArraySlice<int64> orig, int64 num_out_dims);
 
   TensorShape shape_;
   TensorBuffer* buf_;
@@ -662,8 +661,9 @@ typename TTypes<T, NDIMS>::Tensor Tensor::flat_outer_dims() {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) {
-  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), begin+NDIMS);
-  return shaped<T, NDIMS>(ComputeFlatInnerDims(o, NDIMS));
+  gtl::InlinedVector<int64, 4> flat_outer = ComputeFlatOuterDims(
+      shape_.dim_sizes(), begin + NDIMS);
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
 
 template <typename T, size_t NDIMS>
@@ -678,8 +678,9 @@ typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_outer_dims() const {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) const {
-  gtl::InlinedVector<int64, 4> o = ComputeFlatOuterDims(shape_.dim_sizes(), begin+NDIMS);
-  return shaped<T, NDIMS>(ComputeFlatInnerDims(o, NDIMS));
+  gtl::InlinedVector<int64, 4> flat_outer = ComputeFlatOuterDims(
+      shape_.dim_sizes(), begin + NDIMS);
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
 
 inline Tensor::Tensor(const Tensor& other)
-- 
GitLab


From bdd03de30351cf2962122b57e9555d87ba7bc860 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Fri, 28 Apr 2017 13:02:38 -0800
Subject: [PATCH 0801/1563] Make Python API TOC sort deterministic. Change:
 154579657

---
 tensorflow/tools/docs/generate_lib.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tools/docs/generate_lib.py b/tensorflow/tools/docs/generate_lib.py
index 8b53185943..1518cd53a3 100644
--- a/tensorflow/tools/docs/generate_lib.py
+++ b/tensorflow/tools/docs/generate_lib.py
@@ -148,7 +148,8 @@ def write_docs(output_dir, parser_config, yaml_toc):
                 + '\n')
 
         symbols_in_module = module_children.get(module, [])
-        symbols_in_module.sort(key=lambda a: a.upper())
+        # Sort case-insensitive, if equal sort case sensitive (upper first)
+        symbols_in_module.sort(key=lambda a: (a.upper(), a))
 
         for full_name in symbols_in_module:
           f.write('    - title: ' + full_name[len(module) + 1:] + '\n'
-- 
GitLab


From 8352c05cc637b2635f326189ba11ce6254129493 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 28 Apr 2017 13:14:41 -0800
Subject: [PATCH 0802/1563] Fix shape documentation for tf.gather_nd and
 tf.scatter_nd

The new version of the shape documentation for both ops is hopefully correct and doesn't introduce temporary variables.  Additionally, tf.scatter_nd warns about nondeterministic behavior if indices contains duplicates.

Fixes #8245.  Fixes #8102.
Change: 154581230
---
 tensorflow/core/ops/array_ops.cc | 71 ++++++++++++++------------------
 1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 19087a4afd..bbdcfd337e 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1396,20 +1396,17 @@ REGISTER_OP("GatherNd")
     .Doc(R"doc(
 Gather values or slices from `params` according to `indices`.
 
-`params` is a Tensor of rank `P` and `indices` is a Tensor of rank `Q`.
+`indices` is an integer tensor containing indices into `params`.  The last
+dimension of `indices` can be at most the rank of `params`:
 
-`indices` must be integer tensor, containing indices into `params`.
-It must be shape `[d_0, ..., d_{Q-2}, K]` where `0 < K <= P`.
+    indices.shape[-1] <= params.rank
 
-The innermost dimension of `indices` (with length `K`) corresponds to
-indices into elements (if `K = P`) or slices (if `K < P`) along the `K`th
-dimension of `params`.
+The last dimension of `indices` corresponds to elements
+(if `indices.shape[-1] = params.rank`) or slices
+(if `indices.shape[-1] < params.rank`) along dimension `indices.shape[-1]`
+of `params`.  The output tensor has shape
 
-Produces an output tensor with shape
-
-```
-[d_0, ..., d_{Q-2}, params.shape[K], ..., params.shape[P-1]].
-```
+    indices.shape[:-1] + params.shape[indices.shape[-1]:]
 
 Some examples below.
 
@@ -1488,10 +1485,10 @@ Batched indexing into a 3-tensor:
     output = [['b0', 'b1'], ['d0', 'c1']]
 ```
 
-params: `P-D`.  The tensor from which to gather values.
-indices: `Q-D`.  Index tensor having shape `[d_0, ..., d_{Q-2}, K]`.
-output: `(P+Q-K-1)-D`.  Values from `params` gathered from indices given by
-  `indices`.
+params: The tensor from which to gather values.
+indices: Index tensor.
+output: Values from `params` gathered from indices given by `indices`, with
+  shape `indices.shape[:-1] + params.shape[indices.shape[-1]:]`.
 )doc");
 
 // --------------------------------------------------------------------------
@@ -4750,30 +4747,28 @@ REGISTER_OP("ScatterNd")
     .Attr("T: type")
     .Attr("Tindices: {int32, int64}")
     .SetShapeFn(ScatterNdShape)
-    .Doc(
-        R"doc(Creates a new tensor by applying sparse `updates` to individual
-values or slices within a zero tensor of the given `shape` tensor according to
+    .Doc(R"doc(
+Scatter `updates` into a new (initially zero) tensor according to `indices`.
+
+Creates a new tensor by applying sparse `updates` to individual
+values or slices within a zero tensor of the given `shape` according to
 indices.  This operator is the inverse of the [tf.gather_nd](#gather_nd)
 operator which extracts values or slices from a given tensor.
 
-TODO(simister): Add a link to Variable.__getitem__ documentation on slice
-syntax.
-
-`shape` is a `TensorShape` with rank `P` and `indices` is a `Tensor` of rank
-`Q`.
+**WARNING**: The order in which updates are applied is nondeterministic, so the
+output will be nondeterministic if `indices` contains duplicates.
 
-`indices` must be integer tensor, containing indices into `shape`.
-It must be shape `[d_0, ..., d_{Q-2}, K]` where `0 < K <= P`.
+`indices` is an integer tensor containing indices into a new tensor of shape
+`shape`.  The last dimension of `indices` can be at most the rank of `shape`:
 
-The innermost dimension of `indices` (with length `K`) corresponds to
-indices into elements (if `K = P`) or slices (if `K < P`) along the `K`th
-dimension of `shape`.
+    indices.shape[-1] <= shape.rank
 
-`updates` is Tensor of rank `Q-1+P-K` with shape:
+The last dimension of `indices` corresponds to indices into elements
+(if `indices.shape[-1] = shape.rank`) or slices
+(if `indices.shape[-1] < shape.rank`) along dimension `indices.shape[-1]` of
+`shape`.  `updates` is a tensor with shape
 
-```
-[d_0, ..., d_{Q-2}, shape[K], ..., shape[P-1]].
-```
+    indices.shape[:-1] + shape[indices.shape[-1]:]
 
 The simplest form of scatter is to insert individual elements in a tensor by
 index. For example, say we want to insert 4 scattered elements in a rank-1
@@ -4791,7 +4786,7 @@ In Python, this scatter operation would look like this:
     shape = tf.constant([8])
     scatter = tf.scatter_nd(indices, updates, shape)
     with tf.Session() as sess:
-      print sess.run(scatter)
+      print(sess.run(scatter))
 ```
 
 The resulting tensor would look like this:
@@ -4817,7 +4812,7 @@ In Python, this scatter operation would look like this:
     shape = tf.constant([4, 4, 4])
     scatter = tf.scatter_nd(indices, updates, shape)
     with tf.Session() as sess:
-      print sess.run(scatter)
+      print(sess.run(scatter))
 ```
 
 The resulting tensor would look like this:
@@ -4827,11 +4822,9 @@ The resulting tensor would look like this:
      [[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],
      [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]]
 
-indices: A Tensor. Must be one of the following types: int32, int64.
-  A tensor of indices into ref.
-updates: A Tensor. Must have the same type as tensor. A tensor of updated values
-  to store in ref.
-shape: A vector. The shape of the resulting tensor.
+indices: Index tensor.
+updates: Updates to scatter into output.
+shape: 1-D. The shape of the resulting tensor.
 output: A new tensor with the given shape and updates applied according
   to the indices.
 )doc");
-- 
GitLab


From d64deb3d8ddb6ba4968b0b8a5d056162f472db30 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 13:22:43 -0800
Subject: [PATCH 0803/1563] Remove broken link. Change: 154582184

---
 tensorflow/docs_src/api_guides/python/contrib.layers.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tensorflow/docs_src/api_guides/python/contrib.layers.md b/tensorflow/docs_src/api_guides/python/contrib.layers.md
index a829c0a02c..d4cda3a254 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.layers.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.layers.md
@@ -20,7 +20,6 @@ common machine learning algorithms.
 *   @{tf.contrib.layers.flatten}
 *   @{tf.contrib.layers.fully_connected}
 *   @{tf.contrib.layers.layer_norm}
-*   @{tf.contrib.layers.linear}
 *   @{tf.contrib.layers.max_pool2d}
 *   @{tf.contrib.layers.one_hot_encoding}
 *   @{tf.nn.relu}
-- 
GitLab


From f6904cd7fed7c9a3015a51cd16d63f0216b5719d Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Fri, 28 Apr 2017 13:25:35 -0800
Subject: [PATCH 0804/1563] [TF:XLA:GPU] Guard the contents of the :xla_gpu_jit
 target with an if_cuda() check. The XLA GPU JIT can only be used if the
 Tensorflow GPU device exists, which requires that we compile with CUDA.
 Change: 154582511

---
 tensorflow/compiler/jit/BUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/jit/BUILD b/tensorflow/compiler/jit/BUILD
index e56f173d51..9b4e872ebe 100644
--- a/tensorflow/compiler/jit/BUILD
+++ b/tensorflow/compiler/jit/BUILD
@@ -19,6 +19,7 @@ package(
 )
 
 load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
+load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
 
 # Target that bundles up the XLA CPU and GPU JIT devices.
 cc_library(
@@ -48,12 +49,12 @@ cc_library(
 cc_library(
     name = "xla_gpu_jit",
     visibility = [":friends"],
-    deps = [
+    deps = if_cuda([
         ":jit_compilation_passes",
         "//tensorflow/compiler/jit/kernels:xla_local_launch_op",
         "//tensorflow/compiler/tf2xla/kernels:xla_ops",
         "//tensorflow/compiler/xla/service:gpu_plugin",
-    ],
+    ]),
     alwayslink = 1,
 )
 
-- 
GitLab


From 52119ba99addc56b41cbcd603fb83db27740c322 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 13:33:27 -0800
Subject: [PATCH 0805/1563] Update ops-related pbtxt files. Change: 154583581

---
 tensorflow/core/ops/ops.pbtxt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 332dfe18d4..1726278139 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -8626,17 +8626,17 @@ op {
   name: "GatherNd"
   input_arg {
     name: "params"
-    description: "`P-D`.  The tensor from which to gather values."
+    description: "The tensor from which to gather values."
     type_attr: "Tparams"
   }
   input_arg {
     name: "indices"
-    description: "`Q-D`.  Index tensor having shape `[d_0, ..., d_{Q-2}, K]`."
+    description: "Index tensor."
     type_attr: "Tindices"
   }
   output_arg {
     name: "output"
-    description: "`(P+Q-K-1)-D`.  Values from `params` gathered from indices given by\n`indices`."
+    description: "Values from `params` gathered from indices given by `indices`, with\nshape `indices.shape[:-1] + params.shape[indices.shape[-1]:]`."
     type_attr: "Tparams"
   }
   attr {
@@ -8654,7 +8654,7 @@ op {
     }
   }
   summary: "Gather values or slices from `params` according to `indices`."
-  description: "`params` is a Tensor of rank `P` and `indices` is a Tensor of rank `Q`.\n\n`indices` must be integer tensor, containing indices into `params`.\nIt must be shape `[d_0, ..., d_{Q-2}, K]` where `0 < K <= P`.\n\nThe innermost dimension of `indices` (with length `K`) corresponds to\nindices into elements (if `K = P`) or slices (if `K < P`) along the `K`th\ndimension of `params`.\n\nProduces an output tensor with shape\n\n```\n[d_0, ..., d_{Q-2}, params.shape[K], ..., params.shape[P-1]].\n```\n\nSome examples below.\n\nSimple indexing into a matrix:\n\n```python\n    indices = [[0, 0], [1, 1]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [\'a\', \'d\']\n```\n\nSlice indexing into a matrix:\n\n```python\n    indices = [[1], [0]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [[\'c\', \'d\'], [\'a\', \'b\']]\n```\n\nIndexing into a 3-tensor:\n\n```python\n    indices = [[1]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n\n\n    indices = [[0, 1], [1, 0]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[\'c0\', \'d0\'], [\'a1\', \'b1\']]\n\n\n    indices = [[0, 0, 1], [1, 0, 1]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [\'b0\', \'b1\']\n```\n\nBatched indexing into a matrix:\n\n```python\n    indices = [[[0, 0]], [[0, 1]]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [[\'a\'], [\'b\']]\n```\n\nBatched slice indexing into a matrix:\n\n```python\n    indices = [[[1]], [[0]]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [[[\'c\', \'d\']], [[\'a\', \'b\']]]\n```\n\nBatched indexing into a 3-tensor:\n\n```python\n    indices = [[[1]], [[0]]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[[[\'a1\', \'b1\'], [\'c1\', \'d1\']]],\n              [[[\'a0\', \'b0\'], [\'c0\', \'d0\']]]]\n\n    indices = [[[0, 1], [1, 0]], [[0, 0], [1, 1]]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[[\'c0\', \'d0\'], [\'a1\', \'b1\']],\n              [[\'a0\', \'b0\'], [\'c1\', \'d1\']]]\n\n\n    indices = [[[0, 0, 1], [1, 0, 1]], [[0, 1, 1], [1, 1, 0]]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[\'b0\', \'b1\'], [\'d0\', \'c1\']]\n```"
+  description: "`indices` is an integer tensor containing indices into `params`.  The last\ndimension of `indices` can be at most the rank of `params`:\n\n    indices.shape[-1] <= params.rank\n\nThe last dimension of `indices` corresponds to elements\n(if `indices.shape[-1] = params.rank`) or slices\n(if `indices.shape[-1] < params.rank`) along dimension `indices.shape[-1]`\nof `params`.  The output tensor has shape\n\n    indices.shape[:-1] + params.shape[indices.shape[-1]:]\n\nSome examples below.\n\nSimple indexing into a matrix:\n\n```python\n    indices = [[0, 0], [1, 1]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [\'a\', \'d\']\n```\n\nSlice indexing into a matrix:\n\n```python\n    indices = [[1], [0]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [[\'c\', \'d\'], [\'a\', \'b\']]\n```\n\nIndexing into a 3-tensor:\n\n```python\n    indices = [[1]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n\n\n    indices = [[0, 1], [1, 0]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[\'c0\', \'d0\'], [\'a1\', \'b1\']]\n\n\n    indices = [[0, 0, 1], [1, 0, 1]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [\'b0\', \'b1\']\n```\n\nBatched indexing into a matrix:\n\n```python\n    indices = [[[0, 0]], [[0, 1]]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [[\'a\'], [\'b\']]\n```\n\nBatched slice indexing into a matrix:\n\n```python\n    indices = [[[1]], [[0]]]\n    params = [[\'a\', \'b\'], [\'c\', \'d\']]\n    output = [[[\'c\', \'d\']], [[\'a\', \'b\']]]\n```\n\nBatched indexing into a 3-tensor:\n\n```python\n    indices = [[[1]], [[0]]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[[[\'a1\', \'b1\'], [\'c1\', \'d1\']]],\n              [[[\'a0\', \'b0\'], [\'c0\', \'d0\']]]]\n\n    indices = [[[0, 1], [1, 0]], [[0, 0], [1, 1]]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[[\'c0\', \'d0\'], [\'a1\', \'b1\']],\n              [[\'a0\', \'b0\'], [\'c1\', \'d1\']]]\n\n\n    indices = [[[0, 0, 1], [1, 0, 1]], [[0, 1, 1], [1, 1, 0]]]\n    params = [[[\'a0\', \'b0\'], [\'c0\', \'d0\']],\n              [[\'a1\', \'b1\'], [\'c1\', \'d1\']]]\n    output = [[\'b0\', \'b1\'], [\'d0\', \'c1\']]\n```"
 }
 op {
   name: "GetSessionHandle"
@@ -19361,17 +19361,17 @@ op {
   name: "ScatterNd"
   input_arg {
     name: "indices"
-    description: "A Tensor. Must be one of the following types: int32, int64.\nA tensor of indices into ref."
+    description: "Index tensor."
     type_attr: "Tindices"
   }
   input_arg {
     name: "updates"
-    description: "A Tensor. Must have the same type as tensor. A tensor of updated values\nto store in ref."
+    description: "Updates to scatter into output."
     type_attr: "T"
   }
   input_arg {
     name: "shape"
-    description: "A vector. The shape of the resulting tensor."
+    description: "1-D. The shape of the resulting tensor."
     type_attr: "Tindices"
   }
   output_arg {
@@ -19393,8 +19393,8 @@ op {
       }
     }
   }
-  summary: "Creates a new tensor by applying sparse `updates` to individual"
-  description: "values or slices within a zero tensor of the given `shape` tensor according to\nindices.  This operator is the inverse of the [tf.gather_nd](#gather_nd)\noperator which extracts values or slices from a given tensor.\n\nTODO(simister): Add a link to Variable.__getitem__ documentation on slice\nsyntax.\n\n`shape` is a `TensorShape` with rank `P` and `indices` is a `Tensor` of rank\n`Q`.\n\n`indices` must be integer tensor, containing indices into `shape`.\nIt must be shape `[d_0, ..., d_{Q-2}, K]` where `0 < K <= P`.\n\nThe innermost dimension of `indices` (with length `K`) corresponds to\nindices into elements (if `K = P`) or slices (if `K < P`) along the `K`th\ndimension of `shape`.\n\n`updates` is Tensor of rank `Q-1+P-K` with shape:\n\n```\n[d_0, ..., d_{Q-2}, shape[K], ..., shape[P-1]].\n```\n\nThe simplest form of scatter is to insert individual elements in a tensor by\nindex. For example, say we want to insert 4 scattered elements in a rank-1\ntensor with 8 elements.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterNd1.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[4], [3], [1], [7]])\n    updates = tf.constant([9, 10, 11, 12])\n    shape = tf.constant([8])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print sess.run(scatter)\n```\n\nThe resulting tensor would look like this:\n\n    [0, 11, 0, 10, 9, 0, 0, 12]\n\nWe can also, insert entire slices of a higher rank tensor all at once. For\nexample, if we wanted to insert two slices in the first dimension of a\nrank-3 tensor with two matrices of new values.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterNd2.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[0], [2]])\n    updates = tf.constant([[[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]],\n                           [[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]]])\n    shape = tf.constant([4, 4, 4])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print sess.run(scatter)\n```\n\nThe resulting tensor would look like this:\n\n    [[[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]],\n     [[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]]"
+  summary: "Scatter `updates` into a new (initially zero) tensor according to `indices`."
+  description: "Creates a new tensor by applying sparse `updates` to individual\nvalues or slices within a zero tensor of the given `shape` according to\nindices.  This operator is the inverse of the [tf.gather_nd](#gather_nd)\noperator which extracts values or slices from a given tensor.\n\n**WARNING**: The order in which updates are applied is nondeterministic, so the\noutput will be nondeterministic if `indices` contains duplicates.\n\n`indices` is an integer tensor containing indices into a new tensor of shape\n`shape`.  The last dimension of `indices` can be at most the rank of `shape`:\n\n    indices.shape[-1] <= shape.rank\n\nThe last dimension of `indices` corresponds to indices into elements\n(if `indices.shape[-1] = shape.rank`) or slices\n(if `indices.shape[-1] < shape.rank`) along dimension `indices.shape[-1]` of\n`shape`.  `updates` is a tensor with shape\n\n    indices.shape[:-1] + shape[indices.shape[-1]:]\n\nThe simplest form of scatter is to insert individual elements in a tensor by\nindex. For example, say we want to insert 4 scattered elements in a rank-1\ntensor with 8 elements.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterNd1.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[4], [3], [1], [7]])\n    updates = tf.constant([9, 10, 11, 12])\n    shape = tf.constant([8])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print(sess.run(scatter))\n```\n\nThe resulting tensor would look like this:\n\n    [0, 11, 0, 10, 9, 0, 0, 12]\n\nWe can also, insert entire slices of a higher rank tensor all at once. For\nexample, if we wanted to insert two slices in the first dimension of a\nrank-3 tensor with two matrices of new values.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterNd2.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[0], [2]])\n    updates = tf.constant([[[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]],\n                           [[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]]])\n    shape = tf.constant([4, 4, 4])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print(sess.run(scatter))\n```\n\nThe resulting tensor would look like this:\n\n    [[[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]],\n     [[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]]"
 }
 op {
   name: "ScatterNdAdd"
-- 
GitLab


From d15a247d764c43679e00b4c33cf6427c9771ae60 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 13:39:54 -0800
Subject: [PATCH 0806/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154584479

---
 tensorflow/go/op/wrappers.go | 68 ++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index ab9331638b..e87000b618 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -1946,20 +1946,17 @@ func Identity(scope *Scope, input tf.Output) (output tf.Output) {
 
 // Gather values or slices from `params` according to `indices`.
 //
-// `params` is a Tensor of rank `P` and `indices` is a Tensor of rank `Q`.
+// `indices` is an integer tensor containing indices into `params`.  The last
+// dimension of `indices` can be at most the rank of `params`:
 //
-// `indices` must be integer tensor, containing indices into `params`.
-// It must be shape `[d_0, ..., d_{Q-2}, K]` where `0 < K <= P`.
+//     indices.shape[-1] <= params.rank
 //
-// The innermost dimension of `indices` (with length `K`) corresponds to
-// indices into elements (if `K = P`) or slices (if `K < P`) along the `K`th
-// dimension of `params`.
+// The last dimension of `indices` corresponds to elements
+// (if `indices.shape[-1] = params.rank`) or slices
+// (if `indices.shape[-1] < params.rank`) along dimension `indices.shape[-1]`
+// of `params`.  The output tensor has shape
 //
-// Produces an output tensor with shape
-//
-// ```
-// [d_0, ..., d_{Q-2}, params.shape[K], ..., params.shape[P-1]].
-// ```
+//     indices.shape[:-1] + params.shape[indices.shape[-1]:]
 //
 // Some examples below.
 //
@@ -2039,11 +2036,11 @@ func Identity(scope *Scope, input tf.Output) (output tf.Output) {
 // ```
 //
 // Arguments:
-//	params: `P-D`.  The tensor from which to gather values.
-//	indices: `Q-D`.  Index tensor having shape `[d_0, ..., d_{Q-2}, K]`.
+//	params: The tensor from which to gather values.
+//	indices: Index tensor.
 //
-// Returns `(P+Q-K-1)-D`.  Values from `params` gathered from indices given by
-// `indices`.
+// Returns Values from `params` gathered from indices given by `indices`, with
+// shape `indices.shape[:-1] + params.shape[indices.shape[-1]:]`.
 func GatherNd(scope *Scope, params tf.Output, indices tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
@@ -3137,30 +3134,27 @@ func SpaceToDepth(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 	return op.Output(0)
 }
 
-// Creates a new tensor by applying sparse `updates` to individual
+// Scatter `updates` into a new (initially zero) tensor according to `indices`.
 //
-// values or slices within a zero tensor of the given `shape` tensor according to
+// Creates a new tensor by applying sparse `updates` to individual
+// values or slices within a zero tensor of the given `shape` according to
 // indices.  This operator is the inverse of the [tf.gather_nd](#gather_nd)
 // operator which extracts values or slices from a given tensor.
 //
-// TODO(simister): Add a link to Variable.__getitem__ documentation on slice
-// syntax.
-//
-// `shape` is a `TensorShape` with rank `P` and `indices` is a `Tensor` of rank
-// `Q`.
+// **WARNING**: The order in which updates are applied is nondeterministic, so the
+// output will be nondeterministic if `indices` contains duplicates.
 //
-// `indices` must be integer tensor, containing indices into `shape`.
-// It must be shape `[d_0, ..., d_{Q-2}, K]` where `0 < K <= P`.
+// `indices` is an integer tensor containing indices into a new tensor of shape
+// `shape`.  The last dimension of `indices` can be at most the rank of `shape`:
 //
-// The innermost dimension of `indices` (with length `K`) corresponds to
-// indices into elements (if `K = P`) or slices (if `K < P`) along the `K`th
-// dimension of `shape`.
+//     indices.shape[-1] <= shape.rank
 //
-// `updates` is Tensor of rank `Q-1+P-K` with shape:
+// The last dimension of `indices` corresponds to indices into elements
+// (if `indices.shape[-1] = shape.rank`) or slices
+// (if `indices.shape[-1] < shape.rank`) along dimension `indices.shape[-1]` of
+// `shape`.  `updates` is a tensor with shape
 //
-// ```
-// [d_0, ..., d_{Q-2}, shape[K], ..., shape[P-1]].
-// ```
+//     indices.shape[:-1] + shape[indices.shape[-1]:]
 //
 // The simplest form of scatter is to insert individual elements in a tensor by
 // index. For example, say we want to insert 4 scattered elements in a rank-1
@@ -3178,7 +3172,7 @@ func SpaceToDepth(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 //     shape = tf.constant([8])
 //     scatter = tf.scatter_nd(indices, updates, shape)
 //     with tf.Session() as sess:
-//       print sess.run(scatter)
+//       print(sess.run(scatter))
 // ```
 //
 // The resulting tensor would look like this:
@@ -3204,7 +3198,7 @@ func SpaceToDepth(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 //     shape = tf.constant([4, 4, 4])
 //     scatter = tf.scatter_nd(indices, updates, shape)
 //     with tf.Session() as sess:
-//       print sess.run(scatter)
+//       print(sess.run(scatter))
 // ```
 //
 // The resulting tensor would look like this:
@@ -3215,11 +3209,9 @@ func SpaceToDepth(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 //      [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]]
 //
 // Arguments:
-//	indices: A Tensor. Must be one of the following types: int32, int64.
-// A tensor of indices into ref.
-//	updates: A Tensor. Must have the same type as tensor. A tensor of updated values
-// to store in ref.
-//	shape: A vector. The shape of the resulting tensor.
+//	indices: Index tensor.
+//	updates: Updates to scatter into output.
+//	shape: 1-D. The shape of the resulting tensor.
 //
 // Returns A new tensor with the given shape and updates applied according
 // to the indices.
-- 
GitLab


From 9e10fc4c311a659eda8e9cfadb7f5192c909db55 Mon Sep 17 00:00:00 2001
From: "Gao, Xiang" <qasdfgtyuiop@gmail.com>
Date: Fri, 28 Apr 2017 18:06:31 -0400
Subject: [PATCH 0807/1563] fix build error

---
 tensorflow/core/framework/tensor.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/framework/tensor.cc b/tensorflow/core/framework/tensor.cc
index f314d47481..bf0f6beed4 100644
--- a/tensorflow/core/framework/tensor.cc
+++ b/tensorflow/core/framework/tensor.cc
@@ -902,7 +902,7 @@ void Tensor::FillDescription(TensorDescription* description) const {
 }
 
 gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
-    gtl::ArraySlice<int64>, int64 num_out_dims) {
+    gtl::ArraySlice<int64> orig, int64 num_out_dims) {
   if (num_out_dims == orig.size()) {
     return orig;
   }
-- 
GitLab


From 31313d83a43ee7cc49cc37fbf5b5fe4f82782181 Mon Sep 17 00:00:00 2001
From: "Gao, Xiang" <qasdfgtyuiop@gmail.com>
Date: Fri, 28 Apr 2017 18:17:41 -0400
Subject: [PATCH 0808/1563] use ArraySlice for return ComputeFlat????Dims

---
 tensorflow/core/framework/tensor.cc | 4 ++--
 tensorflow/core/framework/tensor.h  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/framework/tensor.cc b/tensorflow/core/framework/tensor.cc
index bf0f6beed4..80001cf772 100644
--- a/tensorflow/core/framework/tensor.cc
+++ b/tensorflow/core/framework/tensor.cc
@@ -901,7 +901,7 @@ void Tensor::FillDescription(TensorDescription* description) const {
   }
 }
 
-gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
+gtl::ArraySlice<int64> Tensor::ComputeFlatInnerDims(
     gtl::ArraySlice<int64> orig, int64 num_out_dims) {
   if (num_out_dims == orig.size()) {
     return orig;
@@ -918,7 +918,7 @@ gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
   return out_dims;
 }
 
-gtl::InlinedVector<int64, 4> Tensor::ComputeFlatOuterDims(
+gtl::ArraySlice<int64> Tensor::ComputeFlatOuterDims(
     gtl::ArraySlice<int64> orig, int64 num_out_dims) {
   if (num_out_dims == orig.size()) {
     return orig;
diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 8e41f355c6..3891d0aebd 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -442,9 +442,9 @@ class Tensor {
       Eigen::array<Eigen::DenseIndex, NDIMS>* dims) const;
 
   // TensorShape's InlineVector.
-  static gtl::InlinedVector<int64, 4> ComputeFlatInnerDims(
+  static gtl::ArraySlice<int64> ComputeFlatInnerDims(
       gtl::ArraySlice<int64> orig, int64 num_out_dims);
-  static gtl::InlinedVector<int64, 4> ComputeFlatOuterDims(
+  static gtl::ArraySlice<int64> ComputeFlatOuterDims(
       gtl::ArraySlice<int64> orig, int64 num_out_dims);
 
   TensorShape shape_;
@@ -661,7 +661,7 @@ typename TTypes<T, NDIMS>::Tensor Tensor::flat_outer_dims() {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) {
-  gtl::InlinedVector<int64, 4> flat_outer = ComputeFlatOuterDims(
+  gtl::ArraySlice<int64> flat_outer = ComputeFlatOuterDims(
       shape_.dim_sizes(), begin + NDIMS);
   return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
@@ -678,7 +678,7 @@ typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_outer_dims() const {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) const {
-  gtl::InlinedVector<int64, 4> flat_outer = ComputeFlatOuterDims(
+  gtl::ArraySlice<int64> flat_outer = ComputeFlatOuterDims(
       shape_.dim_sizes(), begin + NDIMS);
   return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
-- 
GitLab


From ccb5dcd2efb8eafcfccbed417a8203066ee878be Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Fri, 28 Apr 2017 13:42:58 -0800
Subject: [PATCH 0809/1563] Improves shared_name documentation for
 string_input_producer Change: 154584844

---
 tensorflow/python/training/input.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/training/input.py b/tensorflow/python/training/input.py
index 9a2880a110..14a7bbc108 100644
--- a/tensorflow/python/training/input.py
+++ b/tensorflow/python/training/input.py
@@ -197,7 +197,10 @@ def string_input_producer(string_tensor,
     seed: An integer (optional). Seed used if shuffle == True.
     capacity: An integer. Sets the queue capacity.
     shared_name: (optional). If set, this queue will be shared under the given
-      name across multiple sessions.
+      name across multiple sessions. All sessions open to the device which has
+      this queue will be able to access it via the shared_name. Using this in
+      a distributed setting means each name will only be seen by one of the
+      sessions which has access to this operation.
     name: A name for the operations (optional).
     cancel_op: Cancel op for the queue (optional).
 
-- 
GitLab


From a6fdccc5be02dd1d3c8a70a6656db94d4d525e76 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 13:43:46 -0800
Subject: [PATCH 0810/1563] Adds support for repeated images when parsing
 examples. Change: 154584953

---
 .../python/slim/data/tfexample_decoder.py     | 13 ++++++-
 .../slim/data/tfexample_decoder_test.py       | 37 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
index 1e24f84b22..9e8168dfce 100644
--- a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
+++ b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
@@ -30,6 +30,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import functional_ops
 from tensorflow.python.ops import image_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import parsing_ops
@@ -274,7 +275,8 @@ class Image(ItemHandler):
                format_key=None,
                shape=None,
                channels=3,
-               dtype=dtypes.uint8):
+               dtype=dtypes.uint8,
+               repeated=False):
     """Initializes the image.
 
     Args:
@@ -292,6 +294,8 @@ class Image(ItemHandler):
           See tf.image.decode_png,
               tf.decode_raw,
               tf.image.decode_jpeg: only supports tf.uint8
+      repeated: if False, decodes a single image. If True, decodes a
+        variable number of image strings from a 1D tensor of strings.
     """
     if not image_key:
       image_key = 'image/encoded'
@@ -304,13 +308,18 @@ class Image(ItemHandler):
     self._shape = shape
     self._channels = channels
     self._dtype = dtype
+    self._repeated = repeated
 
   def tensors_to_item(self, keys_to_tensors):
     """See base class."""
     image_buffer = keys_to_tensors[self._image_key]
     image_format = keys_to_tensors[self._format_key]
 
-    return self._decode(image_buffer, image_format)
+    if self._repeated:
+      return functional_ops.map_fn(lambda x: self._decode(x, image_format),
+                                   image_buffer, dtype=self._dtype)
+    else:
+      return self._decode(image_buffer, image_format)
 
   def _decode(self, image_buffer, image_format):
     """Decodes the image buffer.
diff --git a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py
index dd3c6a39a2..6c83f46e11 100644
--- a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py
+++ b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py
@@ -730,6 +730,43 @@ class TFExampleDecoderTest(test.TestCase):
 
     self.assertAllClose(np_bboxes, bboxes)
 
+  def testDecodeExampleWithRepeatedImages(self):
+    image_shape = (2, 3, 3)
+    image_format = 'png'
+    image, _ = self.GenerateImage(
+        image_format=image_format, image_shape=image_shape)
+    tf_encoded = self._Encoder(image, image_format)
+    with self.test_session():
+      tf_string = tf_encoded.eval()
+
+    example = example_pb2.Example(features=feature_pb2.Features(feature={
+        'image/encoded': feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+            value=[tf_string, tf_string])),
+        'image/format': self._StringFeature(image_format),
+    }))
+    serialized_example = example.SerializeToString()
+
+    with self.test_session():
+      serialized_example = array_ops.reshape(serialized_example, shape=[])
+
+      decoder = tfexample_decoder.TFExampleDecoder(
+          keys_to_features={
+              'image/encoded':
+                  parsing_ops.FixedLenFeature(
+                      (2,), dtypes.string),
+              'image/format':
+                  parsing_ops.FixedLenFeature(
+                      (), dtypes.string, default_value=image_format),
+          },
+          items_to_handlers={'image': tfexample_decoder.Image(repeated=True)})
+      [tf_image] = decoder.decode(serialized_example, ['image'])
+
+      output_image = tf_image.eval()
+
+      self.assertEqual(output_image.shape, (2, 2, 3, 3))
+      self.assertAllEqual(np.squeeze(output_image[0, :, :, :]), image)
+      self.assertAllEqual(np.squeeze(output_image[1, :, :, :]), image)
+
 
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From 56bca499698cee57cfc7424089f0b0c183cd3bfd Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 13:50:53 -0800
Subject: [PATCH 0811/1563] Support label_keys in DNNLinearCombinedClassifier
 and in LinearClassifier. Change: 154585848

---
 .../learn/estimators/dnn_linear_combined.py   | 39 ++++++++++++--
 .../estimators/dnn_linear_combined_test.py    | 53 +++++++++++++++++++
 .../learn/python/learn/estimators/linear.py   | 35 ++++++++++--
 .../python/learn/estimators/linear_test.py    | 43 +++++++++++++++
 4 files changed, 164 insertions(+), 6 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
index b525213eb7..0ff5d6e8dc 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
@@ -500,9 +500,36 @@ class DNNLinearCombinedClassifier(estimator.Estimator):
     ...
   def input_fn_eval: # returns x, y (where y represents label's class index).
     ...
+  def input_fn_predict: # returns x, None.
+    ...
+  estimator.fit(input_fn=input_fn_train)
+  estimator.evaluate(input_fn=input_fn_eval)
+  # predict_classes returns class indices.
+  estimator.predict_classes(input_fn=input_fn_predict)
+  ```
+
+  If the user specifies `label_keys` in constructor, labels must be strings from
+  the `label_keys` vocabulary. Example:
+
+  ```python
+  label_keys = ['label0', 'label1', 'label2']
+  estimator = DNNLinearCombinedClassifier(
+      n_classes=n_classes,
+      linear_feature_columns=[sparse_feature_a_x_sparse_feature_b],
+      dnn_feature_columns=[sparse_feature_a_emb, sparse_feature_b_emb],
+      dnn_hidden_units=[1000, 500, 100],
+      label_keys=label_keys)
+
+  def input_fn_train: # returns x, y (where y is one of label_keys).
+    pass
   estimator.fit(input_fn=input_fn_train)
+
+  def input_fn_eval: # returns x, y (where y is one of label_keys).
+    pass
   estimator.evaluate(input_fn=input_fn_eval)
-  estimator.predict(x=x) # returns predicted labels (i.e. label's class index).
+  def input_fn_predict: # returns x, None
+  # predict_classes returns one of label_keys.
+  estimator.predict_classes(input_fn=input_fn_predict)
   ```
 
   Input of `fit` and `evaluate` should have following features,
@@ -542,6 +569,7 @@ class DNNLinearCombinedClassifier(estimator.Estimator):
                feature_engineering_fn=None,
                embedding_lr_multipliers=None,
                input_layer_min_slice_size=None,
+               label_keys=None,
                fix_global_step_increment_bug=False):
     """Constructs a DNNLinearCombinedClassifier instance.
 
@@ -593,6 +621,8 @@ class DNNLinearCombinedClassifier(estimator.Estimator):
         learning rate for the embedding variables.
       input_layer_min_slice_size: Optional. The min slice size of input layer
         partitions. If not provided, will use the default of 64M.
+      label_keys: Optional list of strings with size `[n_classes]` defining the
+        label vocabulary. Only supported for `n_classes` > 2.
       fix_global_step_increment_bug: If `False`, the estimator needs two fit
         steps to optimize both linear and dnn parts. If `True`, this bug is
         fixed. New users must set this to `True`, but it the default value is
@@ -606,7 +636,8 @@ class DNNLinearCombinedClassifier(estimator.Estimator):
     head = head_lib.multi_class_head(
         n_classes=n_classes,
         weight_column_name=weight_column_name,
-        enable_centered_bias=enable_centered_bias)
+        enable_centered_bias=enable_centered_bias,
+        label_keys=label_keys)
     linear_feature_columns = tuple(linear_feature_columns or [])
     dnn_feature_columns = tuple(dnn_feature_columns or [])
     self._feature_columns = linear_feature_columns + dnn_feature_columns
@@ -817,9 +848,11 @@ class DNNLinearCombinedRegressor(estimator.Estimator):
     ...
   def input_fn_eval: # returns x, y
     ...
+  def input_fn_predict: # returns x, None
+    ...
   estimator.train(input_fn_train)
   estimator.evaluate(input_fn_eval)
-  estimator.predict(x)
+  estimator.predict(input_fn_predict)
   ```
 
   Input of `fit`, `train`, and `evaluate` should have following features,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py
index 301211ee82..14caa0a5b5 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py
@@ -493,6 +493,59 @@ class DNNLinearCombinedClassifierTest(test.TestCase):
         input_fn=test_data.iris_input_multiclass_fn, steps=100)
     _assert_metrics_in_range(('accuracy',), scores)
 
+  def testMultiClassLabelKeys(self):
+    """Tests n_classes > 2 with label_keys vocabulary for labels."""
+    # Byte literals needed for python3 test to pass.
+    label_keys = [b'label0', b'label1', b'label2']
+
+    def _input_fn(num_epochs=None):
+      features = {
+          'age':
+              input_lib.limit_epochs(
+                  constant_op.constant([[.8], [0.2], [.1]]),
+                  num_epochs=num_epochs),
+          'language':
+              sparse_tensor.SparseTensor(
+                  values=input_lib.limit_epochs(
+                      ['en', 'fr', 'zh'], num_epochs=num_epochs),
+                  indices=[[0, 0], [0, 1], [2, 0]],
+                  dense_shape=[3, 2])
+      }
+      labels = constant_op.constant(
+          [[label_keys[1]], [label_keys[0]], [label_keys[0]]],
+          dtype=dtypes.string)
+      return features, labels
+
+    language_column = feature_column.sparse_column_with_hash_bucket(
+        'language', hash_bucket_size=20)
+
+    classifier = dnn_linear_combined.DNNLinearCombinedClassifier(
+        n_classes=3,
+        linear_feature_columns=[language_column],
+        dnn_feature_columns=[
+            feature_column.embedding_column(
+                language_column, dimension=1),
+            feature_column.real_valued_column('age')
+        ],
+        dnn_hidden_units=[3, 3],
+        label_keys=label_keys)
+
+    classifier.fit(input_fn=_input_fn, steps=50)
+
+    scores = classifier.evaluate(input_fn=_input_fn, steps=1)
+    _assert_metrics_in_range(('accuracy',), scores)
+    self.assertIn('loss', scores)
+    predict_input_fn = functools.partial(_input_fn, num_epochs=1)
+    predicted_classes = list(
+        classifier.predict_classes(
+            input_fn=predict_input_fn, as_iterable=True))
+    self.assertEqual(3, len(predicted_classes))
+    for pred in predicted_classes:
+      self.assertIn(pred, label_keys)
+    predictions = list(
+        classifier.predict(input_fn=predict_input_fn, as_iterable=True))
+    self.assertAllEqual(predicted_classes, predictions)
+
   def testLoss(self):
     """Tests loss calculation."""
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/linear.py b/tensorflow/contrib/learn/python/learn/estimators/linear.py
index d1b4aedb81..bff4dc8d63 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/linear.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/linear.py
@@ -333,9 +333,34 @@ class LinearClassifier(estimator.Estimator):
     ...
   def input_fn_eval: # returns x, y (where y represents label's class index).
     ...
+  def input_fn_predict: # returns x, None.
+    ...
   estimator.fit(input_fn=input_fn_train)
   estimator.evaluate(input_fn=input_fn_eval)
-  estimator.predict(x=x) # returns predicted labels (i.e. label's class index).
+  # predict_classes returns class indices.
+  estimator.predict_classes(input_fn=input_fn_predict)
+  ```
+
+  If the user specifies `label_keys` in constructor, labels must be strings from
+  the `label_keys` vocabulary. Example:
+
+  ```python
+  label_keys = ['label0', 'label1', 'label2']
+  estimator = LinearClassifier(
+      n_classes=n_classes,
+      feature_columns=[sparse_column_a, sparse_feature_a_x_sparse_feature_b],
+      label_keys=label_keys)
+
+  def input_fn_train: # returns x, y (where y is one of label_keys).
+    pass
+  estimator.fit(input_fn=input_fn_train)
+
+  def input_fn_eval: # returns x, y (where y is one of label_keys).
+    pass
+  estimator.evaluate(input_fn=input_fn_eval)
+  def input_fn_predict: # returns x, None
+  # predict_classes returns one of label_keys.
+  estimator.predict_classes(input_fn=input_fn_predict)
   ```
 
   Input of `fit` and `evaluate` should have following features,
@@ -363,7 +388,8 @@ class LinearClassifier(estimator.Estimator):
                enable_centered_bias=False,
                _joint_weight=False,
                config=None,
-               feature_engineering_fn=None):
+               feature_engineering_fn=None,
+               label_keys=None):
     """Construct a `LinearClassifier` estimator object.
 
     Args:
@@ -398,6 +424,8 @@ class LinearClassifier(estimator.Estimator):
                         labels which are the output of `input_fn` and
                         returns features and labels which will be fed
                         into the model.
+      label_keys: Optional list of strings with size `[n_classes]` defining the
+        label vocabulary. Only supported for `n_classes` > 2.
 
     Returns:
       A `LinearClassifier` estimator.
@@ -419,7 +447,8 @@ class LinearClassifier(estimator.Estimator):
     head = head_lib.multi_class_head(
         n_classes,
         weight_column_name=weight_column_name,
-        enable_centered_bias=enable_centered_bias)
+        enable_centered_bias=enable_centered_bias,
+        label_keys=label_keys)
     params = {
         "head": head,
         "feature_columns": feature_columns,
diff --git a/tensorflow/contrib/learn/python/learn/estimators/linear_test.py b/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
index fc64377452..ededd3cdb9 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
@@ -172,6 +172,49 @@ class LinearClassifierTest(test.TestCase):
     scores = classifier.evaluate(x=train_x, y=train_y, steps=1)
     self.assertGreater(scores['accuracy'], 0.9)
 
+  def testMultiClassLabelKeys(self):
+    """Tests n_classes > 2 with label_keys vocabulary for labels."""
+    # Byte literals needed for python3 test to pass.
+    label_keys = [b'label0', b'label1', b'label2']
+
+    def _input_fn(num_epochs=None):
+      features = {
+          'language':
+              sparse_tensor.SparseTensor(
+                  values=input_lib.limit_epochs(
+                      ['en', 'fr', 'zh'], num_epochs=num_epochs),
+                  indices=[[0, 0], [0, 1], [2, 0]],
+                  dense_shape=[3, 2])
+      }
+      labels = constant_op.constant(
+          [[label_keys[1]], [label_keys[0]], [label_keys[0]]],
+          dtype=dtypes.string)
+      return features, labels
+
+    language_column = feature_column_lib.sparse_column_with_hash_bucket(
+        'language', hash_bucket_size=20)
+
+    classifier = linear.LinearClassifier(
+        n_classes=3,
+        feature_columns=[language_column],
+        label_keys=label_keys)
+
+    classifier.fit(input_fn=_input_fn, steps=50)
+
+    scores = classifier.evaluate(input_fn=_input_fn, steps=1)
+    self.assertGreater(scores['accuracy'], 0.9)
+    self.assertIn('loss', scores)
+    predict_input_fn = functools.partial(_input_fn, num_epochs=1)
+    predicted_classes = list(
+        classifier.predict_classes(
+            input_fn=predict_input_fn, as_iterable=True))
+    self.assertEqual(3, len(predicted_classes))
+    for pred in predicted_classes:
+      self.assertIn(pred, label_keys)
+    predictions = list(
+        classifier.predict(input_fn=predict_input_fn, as_iterable=True))
+    self.assertAllEqual(predicted_classes, predictions)
+
   def testLogisticRegression_MatrixData(self):
     """Tests binary classification using matrix data as input."""
 
-- 
GitLab


From 59901f8e51bceb48f2e260caad45d633f0f3161b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 13:54:01 -0800
Subject: [PATCH 0812/1563] Small comment fix. Change: 154586226

---
 tensorflow/python/lib/io/file_io.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/lib/io/file_io.py b/tensorflow/python/lib/io/file_io.py
index 7a91bbd3e0..91003b9ff3 100644
--- a/tensorflow/python/lib/io/file_io.py
+++ b/tensorflow/python/lib/io/file_io.py
@@ -144,7 +144,7 @@ class FileIO(object):
     # This check exists so that we can convert back to having offset be a
     # positional argument.
     # TODO(jhseu): Make `offset` a positional argument after `position` is
-    # deprecated.
+    # deleted.
     if offset is None and position is None:
       raise TypeError("seek(): offset argument required")
     if offset is not None and position is not None:
-- 
GitLab


From 6d697fe0c98f75ad734f4f823d07eaf6ba250a13 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Fri, 28 Apr 2017 13:54:36 -0800
Subject: [PATCH 0813/1563] Documented naming insconsistence of variable_scope
 where reuse on and other ops doesn't share the scope. Change: 154586285

---
 tensorflow/python/ops/variable_scope.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index f81837b73a..76719f35b8 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -1487,6 +1487,9 @@ def variable_scope(name_or_scope,
   Note that the `reuse` flag is inherited: if we open a reusing scope,
   then all its sub-scopes become reusing as well.
 
+  A note about name scoping: Setting `reuse` does not impact the naming of other
+  ops such as mult. See related discussion on [github#6189](https://github.com/tensorflow/tensorflow/issues/6189)
+
   Args:
     name_or_scope: `string` or `VariableScope`: the scope to open.
     default_name: The default name to use if the `name_or_scope` argument is
-- 
GitLab


From 71319c58a3436fbd7081e49c52878dd1ba1772b5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 14:06:22 -0800
Subject: [PATCH 0814/1563] Clarify candidate sampling ops documentation

Removes incorrect "per batch" language.

Fixes #3824.
Change: 154587896
---
 tensorflow/core/ops/candidate_sampling_ops.cc   | 12 ++++++------
 tensorflow/python/ops/candidate_sampling_ops.py | 16 ++++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/tensorflow/core/ops/candidate_sampling_ops.cc b/tensorflow/core/ops/candidate_sampling_ops.cc
index 945e0b068a..18700be67a 100644
--- a/tensorflow/core/ops/candidate_sampling_ops.cc
+++ b/tensorflow/core/ops/candidate_sampling_ops.cc
@@ -81,7 +81,7 @@ sampled_expected_count: A vector of length num_sampled, for each sampled
   to occur in a batch of sampled candidates.  If unique=true, then this is a
   probability.
 num_true: Number of true labels per context.
-num_sampled: Number of candidates to randomly sample per batch.
+num_sampled: Number of candidates to randomly sample.
 unique: If unique is true, we sample with rejection, so that all sampled
   candidates in a batch are unique. This requires some approximation to
   estimate the post-rejection sampling probabilities.
@@ -131,7 +131,7 @@ sampled_expected_count: A vector of length num_sampled, for each sampled
   to occur in a batch of sampled candidates.  If unique=true, then this is a
   probability.
 num_true: Number of true labels per context.
-num_sampled: Number of candidates to randomly sample per batch.
+num_sampled: Number of candidates to randomly sample.
 unique: If unique is true, we sample with rejection, so that all sampled
   candidates in a batch are unique. This requires some approximation to
   estimate the post-rejection sampling probabilities.
@@ -180,7 +180,7 @@ sampled_expected_count: A vector of length num_sampled, for each sampled
   to occur in a batch of sampled candidates.  If unique=true, then this is a
   probability.
 num_true: Number of true labels per context.
-num_sampled: Number of candidates to randomly sample per batch.
+num_sampled: Number of candidates to randomly sample.
 unique: If unique is true, we sample with rejection, so that all sampled
   candidates in a batch are unique. This requires some approximation to
   estimate the post-rejection sampling probabilities.
@@ -229,7 +229,7 @@ sampled_expected_count: A vector of length num_sampled, for each sampled
   to occur in a batch of sampled candidates.  If unique=true, then this is a
   probability.
 num_true: Number of true labels per context.
-num_sampled: Number of candidates to randomly sample per batch.
+num_sampled: Number of candidates to randomly sample.
 unique: If unique is true, we sample with rejection, so that all sampled
   candidates in a batch are unique. This requires some approximation to
   estimate the post-rejection sampling probabilities.
@@ -289,7 +289,7 @@ sampled_expected_count: A vector of length num_sampled, for each sampled
   to occur in a batch of sampled candidates.  If unique=true, then this is a
   probability.
 num_true: Number of true labels per context.
-num_sampled: Number of candidates to randomly sample per batch.
+num_sampled: Number of candidates to randomly sample.
 unique: If unique is true, we sample with rejection, so that all sampled
   candidates in a batch are unique. This requires some approximation to
   estimate the post-rejection sampling probabilities.
@@ -360,7 +360,7 @@ sampled_expected_count: A vector of length num_sampled, for each sampled
   to occur in a batch of sampled candidates.  If unique=true, then this is a
   probability.
 num_true: Number of true labels per context.
-num_sampled: Number of candidates to produce per batch.
+num_sampled: Number of candidates to produce.
 unique: If unique is true, we sample with rejection, so that all sampled
   candidates in a batch are unique. This requires some approximation to
   estimate the post-rejection sampling probabilities.
diff --git a/tensorflow/python/ops/candidate_sampling_ops.py b/tensorflow/python/ops/candidate_sampling_ops.py
index 285c199b10..3053a333bf 100644
--- a/tensorflow/python/ops/candidate_sampling_ops.py
+++ b/tensorflow/python/ops/candidate_sampling_ops.py
@@ -53,7 +53,9 @@ def uniform_candidate_sampler(true_classes, num_true, num_sampled, unique,
     true_classes: A `Tensor` of type `int64` and shape `[batch_size,
       num_true]`. The target classes.
     num_true: An `int`.  The number of target classes per training example.
-    num_sampled: An `int`.  The number of classes to randomly sample per batch.
+    num_sampled: An `int`.  The number of classes to randomly sample. The
+      `sampled_candidates` return value will have shape `[num_sampled]`. If
+      `unique=True`, `num_sampled` must be less than or equal to `range_max`.
     unique: A `bool`. Determines whether all sampled classes in a batch are
       unique.
     range_max: An `int`. The number of possible classes.
@@ -61,8 +63,10 @@ def uniform_candidate_sampler(true_classes, num_true, num_sampled, unique,
     name: A name for the operation (optional).
 
   Returns:
-    sampled_candidates: A tensor of type `int64` and shape `[num_sampled]`.
-      The sampled classes.
+    sampled_candidates: A tensor of type `int64` and shape `[num_sampled]`.  The
+      sampled classes, either with possible duplicates (`unique=False`) or all
+      unique (`unique=True`). In either case, `sampled_candidates` is
+      independent of the true classes.
     true_expected_count: A tensor of type `float`.  Same shape as
       `true_classes`. The expected counts under the sampling distribution
       of each of `true_classes`.
@@ -111,7 +115,7 @@ def log_uniform_candidate_sampler(true_classes, num_true, num_sampled, unique,
     true_classes: A `Tensor` of type `int64` and shape `[batch_size,
       num_true]`. The target classes.
     num_true: An `int`.  The number of target classes per training example.
-    num_sampled: An `int`.  The number of classes to randomly sample per batch.
+    num_sampled: An `int`.  The number of classes to randomly sample.
     unique: A `bool`. Determines whether all sampled classes in a batch are
       unique.
     range_max: An `int`. The number of possible classes.
@@ -166,7 +170,7 @@ def learned_unigram_candidate_sampler(true_classes, num_true, num_sampled,
     true_classes: A `Tensor` of type `int64` and shape `[batch_size,
       num_true]`. The target classes.
     num_true: An `int`.  The number of target classes per training example.
-    num_sampled: An `int`.  The number of classes to randomly sample per batch.
+    num_sampled: An `int`.  The number of classes to randomly sample.
     unique: A `bool`. Determines whether all sampled classes in a batch are
       unique.
     range_max: An `int`. The number of possible classes.
@@ -230,7 +234,7 @@ def fixed_unigram_candidate_sampler(true_classes,
     true_classes: A `Tensor` of type `int64` and shape `[batch_size,
       num_true]`. The target classes.
     num_true: An `int`.  The number of target classes per training example.
-    num_sampled: An `int`.  The number of classes to randomly sample per batch.
+    num_sampled: An `int`.  The number of classes to randomly sample.
     unique: A `bool`. Determines whether all sampled classes in a batch are
       unique.
     range_max: An `int`. The number of possible classes.
-- 
GitLab


From 444305975fcd6b47b43a85251bfd436c819dc620 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Fri, 28 Apr 2017 14:16:23 -0800
Subject: [PATCH 0815/1563] Update documentation to drop GPU support on osx for
 1.2 Change: 154589003

---
 tensorflow/docs_src/install/install_mac.md | 129 ++-------------------
 1 file changed, 9 insertions(+), 120 deletions(-)

diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index 0882422e4d..b6a5758afe 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -2,55 +2,7 @@
 
 This guide explains how to install TensorFlow on Mac OS X.
 
-## Determine which TensorFlow to install
-
-You must choose the type of TensorFlow to install.  Your choices are as follows:
-
-  * **TensorFlow with CPU support only**. If your system does not have a
-    NVIDIA CUDA® GPU, you should install this version. Note that TensorFlow
-    with CPU support is typically easier to install than TensorFlow with
-    GPU support. Therefore, even if you have an NVIDIA CUDA GPU, we recommend
-    installing this version first as a diagnostic step just in case you run
-    into problems installing TensorFlow with GPU support.
-  * **TensorFlow with GPU support**. TensorFlow programs typically run
-    significantly faster on a GPU than on a CPU. Therefore, if your system has
-    a NVIDIA CUDA GPU meeting the prerequisites shown below and you need
-    to run performance-critical applications, you should ultimately
-    install this version.
-
-
-### Requirements to run TensorFlow with GPU support
-
-If you are installing TensorFlow with GPU support using one of the mechanisms
-described in this guide, then the following NVIDIA software must be
-installed on your system:
-
-
-  * CUDA Toolkit 8.0. For details, see
-    [NVIDIA's documentation](http://docs.nvidia.com/cuda/cuda-installation-guide-mac-os-x).
-    Ensure that you append the relevant CUDA pathnames to the
-    `LD_LIBRARY_PATH` environment variable as described in the
-    NVIDIA documentation.
-  * The NVIDIA drivers associated with CUDA Toolkit 8.0.
-  * cuDNN v5.1. For details, see
-    [NVIDIA's documentation](https://developer.nvidia.com/cudnn).
-    Ensure that you create the `CUDA_HOME` environment variable as described in
-    the NVIDIA documentation.
-  * GPU card with CUDA Compute Capability 3.0 or higher.  See
-    [NVIDIA documentation](https://developer.nvidia.com/cuda-gpus)
-    for a list of supported GPU cards.
-
-If you have an earlier version of the preceding packages, please upgrade to
-the specified versions. If upgrading is not possible, you may still run
-TensorFlow with GPU support, but only if you do both of the following:
-
-  * Install TensorFlow from sources as described
-    @{$install_sources$here}.
-  * Install or upgrade to at least the following NVIDIA versions:
-    * CUDA toolkit 7.0 or greater
-    * cuDNN v3 or greater
-    * GPU card with CUDA Compute Capability 3.0 or higher.
-
+Note: As of version 1.2, TensorFlow no longer provides GPU support on Mac OS X.
 
 ## Determine how to install TensorFlow
 
@@ -88,10 +40,6 @@ large (hundreds of MBs). You might choose the Docker installation if you are
 incorporating TensorFlow into a larger application architecture that
 already uses Docker.
 
-Important: Docker currently does not support TensorFlow with GPU support
-on Mac OS; that is, on Mac OS, Docker only supports TensorFlow with
-CPU support.
-
 In Anaconda, you may use conda to create a virtual environment.
 However, within Anaconda, we recommend installing TensorFlow with the
 `pip install` command, not with the `conda install` command.
@@ -139,8 +87,6 @@ Take the following steps to install TensorFlow with Virtualenv:
 
      <pre> $ <b>pip install --upgrade tensorflow</b>      # for Python 2.7
      $ <b>pip3 install --upgrade tensorflow</b>     # for Python 3.n
-     $ <b>pip install --upgrade tensorflow-gpu</b>  # for Python 2.7 and GPU
-     $ <b>pip3 install --upgrade tensorflow-gpu</b> # for Python 3.n and GPU </pre>
 
      If the preceding command succeed, skip Step 6. If it failed,
      perform Step 6.
@@ -154,12 +100,12 @@ Take the following steps to install TensorFlow with Virtualenv:
 
      where <i>tfBinaryURL</i> identifies the URL
      of the TensorFlow Python package. The appropriate value of
-     <i>tfBinaryURL</i> depends on the operating system,
-     Python version, and GPU support. Find the appropriate value for
+     <i>tfBinaryURL</i> depends on the operating system and
+     Python version. Find the appropriate value for
      <i>tfBinaryURL</i> for your system
      [here](#the_url_of_the_tensorflow_python_package).
      For example, if you are installing TensorFlow for Mac OS X,
-     Python 2.7, and CPU-only support, the command to install
+     Python 2.7, the command to install
      TensorFlow in the active Virtualenv is as follows:
 
      <pre> $ <b>pip3 install --upgrade \
@@ -263,10 +209,8 @@ take the following steps:
 
   1. Install TensorFlow by invoking **one** of the following commands:
 
-     <pre> $ <b>pip install tensorflow</b>      # Python 2.7; CPU support (no GPU support)
-     $ <b>pip3 install tensorflow</b>     # Python 3.n; CPU support (no GPU support)
-     $ <b>pip install tensorflow-gpu</b>  # Python 2.7;  GPU support
-     $ <b>pip3 install tensorflow-gpu</b> # Python 3.n; GPU support </pre>
+     <pre> $ <b>pip install tensorflow</b>      # Python 2.7; CPU support
+     $ <b>pip3 install tensorflow</b>     # Python 3.n; CPU support
 
      If the preceding command runs to completion, you should now
      [validate your installation](#ValidateYourInstallation).
@@ -279,11 +223,11 @@ take the following steps:
 
      where <i>tfBinaryURL</i> identifies the URL of the TensorFlow Python
      package. The appropriate value of <i>tfBinaryURL</i> depends on the
-     operating system, Python version, and GPU support. Find the appropriate
+     operating system and Python version. Find the appropriate
      value for <i>tfBinaryURL</i>
      [here](#the_url_of_the_tensorflow_python_package).  For example, if
-     you are installing TensorFlow for Mac OS, Python 2.7, and CPU-only
-     support, issue the following command:
+     you are installing TensorFlow for Mac OS and Python 2.7
+     issue the following command:
 
      <pre> $ <b>sudo pip3 install --upgrade \
      https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b> </pre>
@@ -320,9 +264,6 @@ Follow these steps to install TensorFlow through Docker.
 
 The remainder of this section explains how to launch a Docker container.
 
-**Note**: You may only launch a Docker container with CPU support.
-(Docker doesn't provide GPU support on Mac OS.)
-
 To launch a Docker container that holds the TensorFlow binary image,
 enter a command of the following format:
 
@@ -468,17 +409,6 @@ the `tensorflow` tag.
 <table>
 <tr> <th>Stack Overflow Link</th> <th>Error Message</th> </tr>
 
-<tr>
-  <td><a href="https://stackoverflow.com/q/36159194">36159194</a></td>
-  <td><pre>ImportError: libcudart.so.<i>Version</i>: cannot open shared object file:
-  No such file or directory</pre></td>
-</tr>
-
-<tr>
-  <td><a href="https://stackoverflow.com/q/41991101">41991101</a></td>
-  <td><pre>ImportError: libcudnn.<i>Version</i>: cannot open shared object file:
-  No such file or directory</pre></td>
-</tr>
 
 <tr>
   <td><a href="http://stackoverflow.com/q/42006320">42006320</a></td>
@@ -544,17 +474,6 @@ ImportError: cannot import name 'descriptor'</pre>
   </td>
 </tr>
 
-<tr>
-  <td><a href="http://stackoverflow.com/q/42073336">42073336</a></td>
-  <td>An <tt>import tensorflow</tt> statement triggers the following error:
-<pre>
->>> import tensorflow as tf
-I tensorflow/stream_executor/dso_loader.cc:108] successfully opened CUDA library libcublas.dylib locally
-I tensorflow/stream_executor/dso_loader.cc:108] successfully opened CUDA library libcudnn.dylib locally
-I tensorflow/stream_executor/dso_loader.cc:108] successfully opened CUDA library libcufft.dylib locally
-"import tensorflow" terminated by signal SIGSEGV (Address boundary error)
-</pre></td>
-</tr>
 
 <tr>
   <td><a href="http://stackoverflow.com/q/42075397">42075397</a></td>
@@ -572,15 +491,6 @@ Terminal window to review and agree to the Xcode license agreements.
 RuntimeError: Broken toolchain: cannot link a simple C program</pre>
 </td>
 
-<tr>
-  <td><a href="http://stackoverflow.com/questions/42376790/">42376790</a></td>
-  <td>After installing for GPU, an `import tensorflow` statement
-      triggers the following error:
-<pre>tensorflow/stream_executor/dso_loader.cc:135] successfully opened CUDA
-  library libcublas.8.0.dylib locally
-  Segmentation fault: 11
-</pre></td>
-</tr>
 
 </table>
 
@@ -595,45 +505,24 @@ The value you specify depends on three factors:
 
   * operating system
   * Python version
-  * CPU only vs. GPU support
 
 This section documents the relevant values for Mac OS installations.
 
 ### Python 2.7
 
-CPU only:
 
 <pre>
 https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl
 </pre>
 
-GPU support:
-
-<pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py2-none-any.whl
-</pre>
-
-Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
-[Installing TensorFlow from Sources](install_sources.md).
-
 
 ### Python 3.4, 3.5, or 3.6
 
-CPU only:
 
 <pre>
 https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py3-none-any.whl
 </pre>
 
-GPU support:
-
-<pre>
-https://storage.googleapis.com/tensorflow/mac/gpu/tensorflow_gpu-1.1.0rc2-py3-none-any.whl
-</pre>
-
-Requires CUDA toolkit 8.0 and CuDNN v5. For other versions, see
-[Installing TensorFlow from Sources](install_sources.md).
-
 
 
 <a name="Protobuf31"></a>
-- 
GitLab


From fd766b572a796c0ee58f51a5fdad0760455e1dc9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 14:18:14 -0800
Subject: [PATCH 0816/1563] Update ops-related pbtxt files. Change: 154589265

---
 tensorflow/core/ops/ops.pbtxt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 1726278139..10e76748ab 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -538,7 +538,7 @@ op {
   attr {
     name: "num_sampled"
     type: "int"
-    description: "Number of candidates to produce per batch."
+    description: "Number of candidates to produce."
     has_minimum: true
     minimum: 1
   }
@@ -7797,7 +7797,7 @@ op {
   attr {
     name: "num_sampled"
     type: "int"
-    description: "Number of candidates to randomly sample per batch."
+    description: "Number of candidates to randomly sample."
     has_minimum: true
     minimum: 1
   }
@@ -9748,7 +9748,7 @@ op {
   attr {
     name: "num_sampled"
     type: "int"
-    description: "Number of candidates to randomly sample per batch."
+    description: "Number of candidates to randomly sample."
     has_minimum: true
     minimum: 1
   }
@@ -10075,7 +10075,7 @@ op {
   attr {
     name: "num_sampled"
     type: "int"
-    description: "Number of candidates to randomly sample per batch."
+    description: "Number of candidates to randomly sample."
     has_minimum: true
     minimum: 1
   }
@@ -25861,7 +25861,7 @@ op {
   attr {
     name: "num_sampled"
     type: "int"
-    description: "Number of candidates to randomly sample per batch."
+    description: "Number of candidates to randomly sample."
     has_minimum: true
     minimum: 1
   }
@@ -26248,7 +26248,7 @@ op {
   attr {
     name: "num_sampled"
     type: "int"
-    description: "Number of candidates to randomly sample per batch."
+    description: "Number of candidates to randomly sample."
     has_minimum: true
     minimum: 1
   }
-- 
GitLab


From e3e662a768811cadd9c015ac44e6fedc855ad118 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 14:28:28 -0800
Subject: [PATCH 0817/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154590336

---
 tensorflow/go/op/wrappers.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index e87000b618..8a34791fff 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -2721,7 +2721,7 @@ func AllCandidateSamplerSeed2(value int64) AllCandidateSamplerAttr {
 //	true_classes: A batch_size * num_true matrix, in which each row contains the
 // IDs of the num_true target_classes in the corresponding original label.
 //	num_true: Number of true labels per context.
-//	num_sampled: Number of candidates to produce per batch.
+//	num_sampled: Number of candidates to produce.
 //	unique: If unique is true, we sample with rejection, so that all sampled
 // candidates in a batch are unique. This requires some approximation to
 // estimate the post-rejection sampling probabilities.
@@ -2879,7 +2879,7 @@ func FixedUnigramCandidateSamplerSeed2(value int64) FixedUnigramCandidateSampler
 //	true_classes: A batch_size * num_true matrix, in which each row contains the
 // IDs of the num_true target_classes in the corresponding original label.
 //	num_true: Number of true labels per context.
-//	num_sampled: Number of candidates to randomly sample per batch.
+//	num_sampled: Number of candidates to randomly sample.
 //	unique: If unique is true, we sample with rejection, so that all sampled
 // candidates in a batch are unique. This requires some approximation to
 // estimate the post-rejection sampling probabilities.
@@ -2952,7 +2952,7 @@ func UniformCandidateSamplerSeed2(value int64) UniformCandidateSamplerAttr {
 //	true_classes: A batch_size * num_true matrix, in which each row contains the
 // IDs of the num_true target_classes in the corresponding original label.
 //	num_true: Number of true labels per context.
-//	num_sampled: Number of candidates to randomly sample per batch.
+//	num_sampled: Number of candidates to randomly sample.
 //	unique: If unique is true, we sample with rejection, so that all sampled
 // candidates in a batch are unique. This requires some approximation to
 // estimate the post-rejection sampling probabilities.
@@ -3766,7 +3766,7 @@ func LearnedUnigramCandidateSamplerSeed2(value int64) LearnedUnigramCandidateSam
 //	true_classes: A batch_size * num_true matrix, in which each row contains the
 // IDs of the num_true target_classes in the corresponding original label.
 //	num_true: Number of true labels per context.
-//	num_sampled: Number of candidates to randomly sample per batch.
+//	num_sampled: Number of candidates to randomly sample.
 //	unique: If unique is true, we sample with rejection, so that all sampled
 // candidates in a batch are unique. This requires some approximation to
 // estimate the post-rejection sampling probabilities.
@@ -12221,7 +12221,7 @@ func ThreadUnsafeUnigramCandidateSamplerSeed2(value int64) ThreadUnsafeUnigramCa
 //	true_classes: A batch_size * num_true matrix, in which each row contains the
 // IDs of the num_true target_classes in the corresponding original label.
 //	num_true: Number of true labels per context.
-//	num_sampled: Number of candidates to randomly sample per batch.
+//	num_sampled: Number of candidates to randomly sample.
 //	unique: If unique is true, we sample with rejection, so that all sampled
 // candidates in a batch are unique. This requires some approximation to
 // estimate the post-rejection sampling probabilities.
@@ -18098,7 +18098,7 @@ func LogUniformCandidateSamplerSeed2(value int64) LogUniformCandidateSamplerAttr
 //	true_classes: A batch_size * num_true matrix, in which each row contains the
 // IDs of the num_true target_classes in the corresponding original label.
 //	num_true: Number of true labels per context.
-//	num_sampled: Number of candidates to randomly sample per batch.
+//	num_sampled: Number of candidates to randomly sample.
 //	unique: If unique is true, we sample with rejection, so that all sampled
 // candidates in a batch are unique. This requires some approximation to
 // estimate the post-rejection sampling probabilities.
-- 
GitLab


From 3f68ed17518cc3190ac86b38f4268b5d5b7f0b0d Mon Sep 17 00:00:00 2001
From: Andrew Selle <aselle@google.com>
Date: Fri, 28 Apr 2017 14:29:08 -0800
Subject: [PATCH 0818/1563] Improve docstring on strided_slice to refer users
 to easier function.

Fixes #5761
Change: 154590417
---
 tensorflow/python/ops/array_ops.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index e03192508f..77db63dd0f 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -557,7 +557,13 @@ def strided_slice(input_,
                   shrink_axis_mask=0,
                   var=None,
                   name=None):
-  """Extracts a strided slice from a tensor.
+  """Extracts a strided slice of a tensor (generalized python array indexing).
+
+  **Most users will want to use @{tf.Tensor.__getitem__} and
+  @{tf.Variable.__getitem__}.** That allows  NumPy style slicing syntax (i.e.
+  `tensor[..., 3:4:-1, tf.newaxis, 3]`).
+  This op is the low-level interface that are used to implement operators.
+  Those interfaces are much more friendly, and highly recommended.
 
   To a first order, this operation extracts a slice of size `end - begin`
   from a tensor `input`
-- 
GitLab


From 863048121dc594acee3bcd869ab6dfef3109ce93 Mon Sep 17 00:00:00 2001
From: Neal Wu <wun@google.com>
Date: Fri, 28 Apr 2017 14:34:51 -0800
Subject: [PATCH 0819/1563] Documentation fixes for TF Layers tutorial (see
 #8301) Change: 154591046

---
 tensorflow/docs_src/tutorials/layers.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/tutorials/layers.md b/tensorflow/docs_src/tutorials/layers.md
index 2550bd3e42..0429c7f346 100644
--- a/tensorflow/docs_src/tutorials/layers.md
+++ b/tensorflow/docs_src/tutorials/layers.md
@@ -316,11 +316,11 @@ of 2, which indicates that the subregions extracted by the filter should be
 separated by 2 pixels in both the width and height dimensions (for a 2x2 filter,
 this means that none of the regions extracted will overlap). If you want to set
 different stride values for width and height, you can instead specify a tuple or
-list (e.g., `stride=[3,6]`).
+list (e.g., `stride=[3, 6]`).
 
 Our output tensor produced by `max_pooling2d()` (`pool1`) has a shape of
-<code>[<em>batch_size</em>, 14, 14, 1]</code>: the 2x2 filter reduces width and
-height by 50%.
+<code>[<em>batch_size</em>, 14, 14, 32]</code>: the 2x2 filter reduces width and
+height by 50% each.
 
 ### Convolutional Layer #2 and Pooling Layer #2
 
-- 
GitLab


From 998baa0f1fa8aee4382be1a00e4ae9ee70a6b194 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Fri, 28 Apr 2017 14:40:51 -0800
Subject: [PATCH 0820/1563] Added expalanation when to use
 embedding_lookup_sparse instead of sparse_tensor_dense_matmul.

Fixes #8131
Change: 154591681
---
 tensorflow/python/ops/sparse_ops.py | 48 ++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index af7abf5251..f8eb34aa5e 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -1239,7 +1239,45 @@ def sparse_tensor_dense_matmul(sp_a,
     A should be sorted in order of increasing dimension 1 (i.e., "column major"
     order instead of "row major" order).
 
-  Deciding when to use sparse_tensor_dense_matmul vs. matmul(a_is_sparse=True):
+  Using `tf.nn.embedding_lookup_sparse` for sparse multiplication:
+
+  It's not obvious but you can consider `embedding_lookup_sparse` as another
+  sparse and dense multiplication. In some situations, you may prefer to use
+  `embedding_lookup_sparse` even though you're not dealing with embeddings.
+
+  There are two questions to ask in the decision process: Do you need gradients
+  computed as sparse too? Is your sparse data represented as two
+  `SparseTensor`s: ids and values? There is more explanation about data format
+  below. If you answer any of these questions as yes, consider using
+  `tf.nn.embedding_lookup_sparse`.
+
+  Following explains differences between the expected SparseTensors:
+  For example if dense form of your sparse data has shape `[3, 5]` and values:
+
+      [[  a      ]
+       [b       c]
+       [    d    ]]
+
+
+  `SparseTensor` format expected by `sparse_tensor_dense_matmul`:
+   `sp_a` (indices, values):
+
+      [0, 1]: a
+      [1, 0]: b
+      [1, 4]: c
+      [2, 2]: d
+
+  `SparseTensor` format expected by `embedding_lookup_sparse`:
+   `sp_ids`                 `sp_weights`
+
+      [0, 0]: 1                [0, 0]: a
+      [1, 0]: 0                [1, 0]: b
+      [1, 1]: 4                [1, 1]: c
+      [2, 0]: 2                [2, 0]: d
+
+
+  Deciding when to use `sparse_tensor_dense_matmul` vs.
+  `matmul`(a_is_sparse=True):
 
   There are a number of questions to ask in the decision process, including:
 
@@ -1255,10 +1293,10 @@ def sparse_tensor_dense_matmul(sp_a,
   of the product is small (e.g. matrix-vector multiplication), if
   `sp_a.dense_shape` takes on large values.
 
-  Below is a rough speed comparison between sparse_tensor_dense_matmul,
-  labelled 'sparse', and matmul(a_is_sparse=True), labelled 'dense'.  For purposes of
-  the comparison, the time spent converting from a SparseTensor to a dense
-  Tensor is not included, so it is overly conservative with respect to
+  Below is a rough speed comparison between `sparse_tensor_dense_matmul`,
+  labelled 'sparse', and `matmul`(a_is_sparse=True), labelled 'dense'.  For
+  purposes of the comparison, the time spent converting from a `SparseTensor` to
+  a dense `Tensor` is not included, so it is overly conservative with respect to
   the time ratio.
 
   Benchmark system:
-- 
GitLab


From 765d97a4168429a730862c9898cc936b445a054c Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Fri, 28 Apr 2017 14:51:56 -0800
Subject: [PATCH 0821/1563] [XLA] Make HLO ordering module-scoped. Add
 comparison of ordering of HLO instructions which are in different
 computations using the call graph. Previously, instructions in different
 computations were considered unordered. Ordering these instructions improves
 buffer liveness analysis and may enable better buffer sharing between values
 in different computations. Change: 154592912

---
 tensorflow/compiler/xla/service/BUILD         |   3 +-
 .../xla/service/buffer_assignment_test.cc     |   7 +-
 tensorflow/compiler/xla/service/call_graph.cc |  87 +++++-----
 tensorflow/compiler/xla/service/call_graph.h  |  14 +-
 .../compiler/xla/service/call_graph_test.cc   | 159 ++++++++----------
 .../xla/service/flatten_call_graph.cc         |   3 +-
 .../xla/service/flatten_call_graph_test.cc    |  37 ++--
 .../compiler/xla/service/hlo_ordering.cc      | 103 ++++++++++--
 .../compiler/xla/service/hlo_ordering.h       |  46 ++---
 .../compiler/xla/service/hlo_ordering_test.cc |  77 +++++++++
 .../xla/service/hlo_rematerialization.cc      |  12 +-
 11 files changed, 333 insertions(+), 215 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index e17205be23..2137888726 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -195,7 +195,6 @@ cc_library(
     deps = [
         ":hlo",
         "//tensorflow/compiler/xla:status_macros",
-        "//tensorflow/compiler/xla:statusor",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/core:lib",
     ],
@@ -624,6 +623,7 @@ cc_library(
         "buffer_liveness.h",
     ],
     deps = [
+        ":call_graph",
         ":hlo",
         ":hlo_ordering",
         ":liveness_util",
@@ -747,6 +747,7 @@ cc_library(
         "hlo_ordering.h",
     ],
     deps = [
+        ":call_graph",
         ":heap_simulator",
         ":hlo",
         ":logical_buffer",
diff --git a/tensorflow/compiler/xla/service/buffer_assignment_test.cc b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
index 0d6e89c5c6..ac1d769010 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment_test.cc
@@ -856,8 +856,7 @@ TEST_F(BufferAssignmentTest, EmbeddedComputationBuffers) {
   EXPECT_FALSE(map_root_alloc.maybe_live_out());
   EXPECT_TRUE(map_root_alloc.is_thread_local());
 
-  // Allocations for the call computation should not be thread-local and not
-  // live-out.
+  // Allocations for the call computation should not be thread-local.
   auto& call_param_alloc = GetTopLevelAllocation(*assignment, call_param);
   EXPECT_FALSE(call_param_alloc.is_entry_computation_parameter());
   EXPECT_FALSE(call_param_alloc.maybe_live_out());
@@ -865,7 +864,6 @@ TEST_F(BufferAssignmentTest, EmbeddedComputationBuffers) {
 
   auto& call_root_alloc = GetTopLevelAllocation(*assignment, call_root);
   EXPECT_FALSE(call_root_alloc.is_entry_computation_parameter());
-  EXPECT_FALSE(call_root_alloc.maybe_live_out());
   EXPECT_FALSE(call_root_alloc.is_thread_local());
 
   // Entry computation allocations can be marked liveout and
@@ -1445,8 +1443,7 @@ TEST_F(BufferAssignmentTest, TwoCalls) {
     FlattenCallGraph flatten;
     TF_ASSIGN_OR_ASSERT_OK(bool result, flatten.Run(module.get()));
     EXPECT_TRUE(result);
-    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                           CallGraph::Build(module.get()));
+    std::unique_ptr<CallGraph> call_graph = CallGraph::Build(module.get());
   }
 
   RunCopyInsertion(module.get());
diff --git a/tensorflow/compiler/xla/service/call_graph.cc b/tensorflow/compiler/xla/service/call_graph.cc
index 57d69f5b71..fa7b2a3095 100644
--- a/tensorflow/compiler/xla/service/call_graph.cc
+++ b/tensorflow/compiler/xla/service/call_graph.cc
@@ -98,12 +98,12 @@ void CallGraphNode::AddCallerCallSite(const CallSite& caller_callsite) {
   }
 }
 
-Status CallGraphNode::AddCallSiteForInstruction(HloInstruction* instruction) {
-  TF_RET_CHECK(instruction->parent() == computation());
+void CallGraphNode::AddCallSiteForInstruction(HloInstruction* instruction) {
+  CHECK_EQ(instruction->parent(), computation());
   const CallContext context = GetInstructionCallContext(instruction);
   if (!instruction->called_computations().empty()) {
-    TF_RET_CHECK(context == CallContext::kSequential ||
-                 context == CallContext::kParallel);
+    CHECK(context == CallContext::kSequential ||
+          context == CallContext::kParallel);
     callsite_instructions_.insert({instruction, callsites_.size()});
     callsites_.push_back(
         CallSite(instruction, instruction->called_computations(), context));
@@ -116,22 +116,21 @@ Status CallGraphNode::AddCallSiteForInstruction(HloInstruction* instruction) {
       }
     }
   }
-  return Status::OK();
 }
 
 CallGraph::CallGraph(const HloModule* module) : module_(module) {}
 
-StatusOr<const CallGraphNode*> CallGraph::GetNode(
+const CallGraphNode& CallGraph::GetNode(
     const HloComputation* computation) const {
   auto it = node_indices_.find(computation);
-  TF_RET_CHECK(it != node_indices_.end());
-  return &nodes_[it->second];
+  CHECK(it != node_indices_.end());
+  return nodes_[it->second];
 }
 
-StatusOr<CallGraphNode*> CallGraph::GetNode(const HloComputation* computation) {
+CallGraphNode& CallGraph::GetNode(const HloComputation* computation) {
   auto it = node_indices_.find(computation);
-  TF_RET_CHECK(it != node_indices_.end());
-  return &nodes_[it->second];
+  CHECK(it != node_indices_.end());
+  return nodes_[it->second];
 }
 
 namespace {
@@ -154,17 +153,17 @@ CallContext UnionContexts(CallContext a, CallContext b) {
 
 }  // namespace
 
-Status CallGraph::SetCallContexts() {
+void CallGraph::SetCallContexts() {
   std::queue<CallGraphNode*> worklist;
 
   // Initialize worklist with all roots of the call graph (computations without
   // callers).
   for (const std::unique_ptr<HloComputation>& computation :
        module_->computations()) {
-    TF_ASSIGN_OR_RETURN(CallGraphNode * node, GetNode(computation.get()));
-    if (node->callers().empty()) {
-      node->set_context(CallContext::kSequential);
-      worklist.push(node);
+    CallGraphNode& node = GetNode(computation.get());
+    if (node.callers().empty()) {
+      node.set_context(CallContext::kSequential);
+      worklist.push(&node);
     }
   }
 
@@ -174,7 +173,7 @@ Status CallGraph::SetCallContexts() {
 
     for (const CallSite& callsite : node->callsites()) {
       for (const HloComputation* callee : callsite.called_computations()) {
-        TF_ASSIGN_OR_RETURN(CallGraphNode * callee_node, GetNode(callee));
+        CallGraphNode& callee_node = GetNode(callee);
 
         // Update context of callee computation based on the callsite and its
         // current context.
@@ -182,16 +181,16 @@ Status CallGraph::SetCallContexts() {
         if (callsite.context() == CallContext::kParallel) {
           context_to_add = CallContext::kParallel;
         } else {
-          TF_RET_CHECK(callsite.context() == CallContext::kSequential);
+          CHECK_EQ(callsite.context(), CallContext::kSequential);
           context_to_add = node->context();
         }
         CallContext new_context =
-            UnionContexts(context_to_add, callee_node->context());
+            UnionContexts(context_to_add, callee_node.context());
 
-        if (new_context != callee_node->context()) {
+        if (new_context != callee_node.context()) {
           // Context of computation has been changed so add node to worklist.
-          callee_node->set_context(new_context);
-          worklist.push(callee_node);
+          callee_node.set_context(new_context);
+          worklist.push(&callee_node);
         }
       }
     }
@@ -200,14 +199,12 @@ Status CallGraph::SetCallContexts() {
   // No node should have a kNone calling context.
   for (const std::unique_ptr<HloComputation>& computation :
        module_->computations()) {
-    TF_ASSIGN_OR_RETURN(CallGraphNode * node, GetNode(computation.get()));
-    TF_RET_CHECK(node->context() != CallContext::kNone);
+    CHECK_NE(GetNode(computation.get()).context(), CallContext::kNone);
   }
-  return Status::OK();
 }
 
 /* static */
-StatusOr<std::unique_ptr<CallGraph>> CallGraph::Build(const HloModule* module) {
+std::unique_ptr<CallGraph> CallGraph::Build(const HloModule* module) {
   // Constructor for CallGraph is private so MakeUnique can't be used.
   auto call_graph = WrapUnique<CallGraph>(new CallGraph(module));
 
@@ -221,54 +218,49 @@ StatusOr<std::unique_ptr<CallGraph>> CallGraph::Build(const HloModule* module) {
         {computation.get(), call_graph->nodes_.size()});
     // All computations should be unique, so the computation should not already
     // exist in the map.
-    TF_RET_CHECK(it_added.second);
+    CHECK(it_added.second);
     call_graph->nodes_.emplace_back(computation.get());
 
     // Add all callsites in this computation.
     for (const std::unique_ptr<HloInstruction>& instruction :
          computation->instructions()) {
-      TF_RETURN_IF_ERROR(call_graph->nodes_.back().AddCallSiteForInstruction(
-          instruction.get()));
+      call_graph->nodes_.back().AddCallSiteForInstruction(instruction.get());
     }
   }
 
   // Add caller callsites to each node.
   for (const std::unique_ptr<HloComputation>& computation :
        module->computations()) {
-    TF_ASSIGN_OR_RETURN(CallGraphNode * caller_node,
-                        call_graph->GetNode(computation.get()));
-    for (const CallSite& callsite : caller_node->callsites()) {
+    for (const CallSite& callsite :
+         call_graph->GetNode(computation.get()).callsites()) {
       for (auto* callee : callsite.called_computations()) {
         // Add caller callsites.
-        TF_ASSIGN_OR_RETURN(CallGraphNode * callee_node,
-                            call_graph->GetNode(callee));
-        callee_node->AddCallerCallSite(callsite);
+        call_graph->GetNode(callee).AddCallerCallSite(callsite);
       }
     }
   }
 
-  TF_RETURN_IF_ERROR(call_graph->SetCallContexts());
-
+  call_graph->SetCallContexts();
   XLA_VLOG_LINES(1, call_graph->ToString());
 
-  return std::move(call_graph);
+  return call_graph;
 }
 
 Status CallGraph::VisitNodesInternal(
-    const VisitorFunction& visitor_func, const CallGraphNode* node,
+    const VisitorFunction& visitor_func, const CallGraphNode& node,
     tensorflow::gtl::FlatSet<const CallGraphNode*>* visited) const {
-  auto pair = visited->insert(node);
+  auto pair = visited->insert(&node);
   if (!pair.second) {
     // Node was not inserted. Node has already been visited.
     return Status::OK();
   }
 
-  for (const HloComputation* computation : node->callees()) {
-    TF_ASSIGN_OR_RETURN(const CallGraphNode* callee_node, GetNode(computation));
-    TF_RETURN_IF_ERROR(VisitNodesInternal(visitor_func, callee_node, visited));
+  for (const HloComputation* computation : node.callees()) {
+    TF_RETURN_IF_ERROR(
+        VisitNodesInternal(visitor_func, GetNode(computation), visited));
   }
 
-  return visitor_func(*node);
+  return visitor_func(node);
 }
 
 Status CallGraph::VisitNodes(const VisitorFunction& visitor_func,
@@ -278,14 +270,13 @@ Status CallGraph::VisitNodes(const VisitorFunction& visitor_func,
     // Traverse from all roots in the call graph.
     for (const CallGraphNode& node : nodes()) {
       if (node.callers().empty()) {
-        TF_RETURN_IF_ERROR(VisitNodesInternal(visitor_func, &node, &visited));
+        TF_RETURN_IF_ERROR(VisitNodesInternal(visitor_func, node, &visited));
       }
     }
   } else {
     // Traverse only from the entry computation.
-    TF_ASSIGN_OR_RETURN(const CallGraphNode* entry_node,
-                        GetNode(module_->entry_computation()));
-    TF_RETURN_IF_ERROR(VisitNodesInternal(visitor_func, entry_node, &visited));
+    TF_RETURN_IF_ERROR(VisitNodesInternal(
+        visitor_func, GetNode(module_->entry_computation()), &visited));
   }
 
   return Status::OK();
diff --git a/tensorflow/compiler/xla/service/call_graph.h b/tensorflow/compiler/xla/service/call_graph.h
index 62d12f8f91..7f9990f06d 100644
--- a/tensorflow/compiler/xla/service/call_graph.h
+++ b/tensorflow/compiler/xla/service/call_graph.h
@@ -23,7 +23,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/core/lib/gtl/flatmap.h"
 #include "tensorflow/core/lib/gtl/flatset.h"
 
@@ -138,7 +137,7 @@ class CallGraphNode {
   // If instruction calls any computations adds a call site for this instruction
   // to the call graph node. If the instruction calls no computations then no
   // call site is added.
-  Status AddCallSiteForInstruction(HloInstruction* instruction);
+  void AddCallSiteForInstruction(HloInstruction* instruction);
 
   // Computation represented by this call graph node.
   HloComputation* computation_;
@@ -174,12 +173,11 @@ class CallGraph {
   using VisitorFunction = std::function<Status(const CallGraphNode&)>;
 
   // Builds and returns a call graph for the given HLO module.
-  static StatusOr<std::unique_ptr<CallGraph>> Build(const HloModule* module);
+  static std::unique_ptr<CallGraph> Build(const HloModule* module);
 
   // Returns the node associated with the given computation.
-  StatusOr<const CallGraphNode*> GetNode(
-      const HloComputation* computation) const;
-  StatusOr<CallGraphNode*> GetNode(const HloComputation* computation);
+  const CallGraphNode& GetNode(const HloComputation* computation) const;
+  CallGraphNode& GetNode(const HloComputation* computation);
 
   // Returns the vector of all nodes in the call graph.
   const std::vector<CallGraphNode>& nodes() const { return nodes_; }
@@ -197,14 +195,14 @@ class CallGraph {
   CallGraph(const HloModule* module);
 
   // Sets the call contexts for every node in the graph.
-  Status SetCallContexts();
+  void SetCallContexts();
 
   // Helper method for VisitNodes(). Traverses the call graph from 'node' in DFS
   // post order (callee before caller) calling visitor_func on each node. Adds
   // nodes to 'visited' as each node is visited. Skips nodes already in
   // 'visited'.
   Status VisitNodesInternal(
-      const VisitorFunction& visitor_func, const CallGraphNode* node,
+      const VisitorFunction& visitor_func, const CallGraphNode& node,
       tensorflow::gtl::FlatSet<const CallGraphNode*>* visited) const;
 
   // The HLO module represented by this call graph.
diff --git a/tensorflow/compiler/xla/service/call_graph_test.cc b/tensorflow/compiler/xla/service/call_graph_test.cc
index f71a5d01af..ab0ea47d02 100644
--- a/tensorflow/compiler/xla/service/call_graph_test.cc
+++ b/tensorflow/compiler/xla/service/call_graph_test.cc
@@ -95,17 +95,15 @@ TEST_F(CallGraphTest, SingletonComputation) {
   HloModule module(TestName());
   HloComputation* computation =
       module.AddEntryComputation(MakeScalarComputation());
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
   EXPECT_EQ(1, call_graph->nodes().size());
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* node,
-                         call_graph->GetNode(computation));
-  EXPECT_EQ(computation, node->computation());
-  EXPECT_TRUE(node->callsites().empty());
-  EXPECT_TRUE(node->callees().empty());
-  EXPECT_TRUE(node->caller_callsites().empty());
-  EXPECT_TRUE(node->callers().empty());
-  EXPECT_EQ(CallContext::kSequential, node->context());
+  const CallGraphNode& node = call_graph->GetNode(computation);
+  EXPECT_EQ(computation, node.computation());
+  EXPECT_TRUE(node.callsites().empty());
+  EXPECT_TRUE(node.callees().empty());
+  EXPECT_TRUE(node.caller_callsites().empty());
+  EXPECT_TRUE(node.callers().empty());
+  EXPECT_EQ(CallContext::kSequential, node.context());
 }
 
 TEST_F(CallGraphTest, UnreachableComputation) {
@@ -117,19 +115,17 @@ TEST_F(CallGraphTest, UnreachableComputation) {
   HloComputation* unreachable_computation =
       module.AddEmbeddedComputation(MakeScalarComputation());
 
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
   EXPECT_EQ(2, call_graph->nodes().size());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* entry_node,
-                         call_graph->GetNode(entry_computation));
-  EXPECT_EQ(entry_computation, entry_node->computation());
-  EXPECT_EQ(CallContext::kSequential, entry_node->context());
+  const CallGraphNode& entry_node = call_graph->GetNode(entry_computation);
+  EXPECT_EQ(entry_computation, entry_node.computation());
+  EXPECT_EQ(CallContext::kSequential, entry_node.context());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* unreachable_node,
-                         call_graph->GetNode(unreachable_computation));
-  EXPECT_EQ(unreachable_computation, unreachable_node->computation());
-  EXPECT_EQ(CallContext::kSequential, unreachable_node->context());
+  const CallGraphNode& unreachable_node =
+      call_graph->GetNode(unreachable_computation);
+  EXPECT_EQ(unreachable_computation, unreachable_node.computation());
+  EXPECT_EQ(CallContext::kSequential, unreachable_node.context());
 }
 
 TEST_F(CallGraphTest, ParallelComputation) {
@@ -141,27 +137,24 @@ TEST_F(CallGraphTest, ParallelComputation) {
   HloComputation* entry_computation = module.AddEntryComputation(
       MakeMappingComputation(map_computation, /*callsites=*/5));
 
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
   EXPECT_EQ(2, call_graph->nodes().size());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* entry_node,
-                         call_graph->GetNode(entry_computation));
-  EXPECT_EQ(entry_computation, entry_node->computation());
-  EXPECT_EQ(CallContext::kSequential, entry_node->context());
-  EXPECT_EQ(5, entry_node->callsites().size());
-  EXPECT_EQ(1, entry_node->callees().size());
-  EXPECT_TRUE(entry_node->caller_callsites().empty());
-  EXPECT_TRUE(entry_node->callers().empty());
-
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* map_node,
-                         call_graph->GetNode(map_computation));
-  EXPECT_EQ(map_computation, map_node->computation());
-  EXPECT_EQ(CallContext::kParallel, map_node->context());
-  EXPECT_TRUE(map_node->callsites().empty());
-  EXPECT_TRUE(map_node->callees().empty());
-  EXPECT_EQ(5, map_node->caller_callsites().size());
-  EXPECT_EQ(1, map_node->callers().size());
+  const CallGraphNode& entry_node = call_graph->GetNode(entry_computation);
+  EXPECT_EQ(entry_computation, entry_node.computation());
+  EXPECT_EQ(CallContext::kSequential, entry_node.context());
+  EXPECT_EQ(5, entry_node.callsites().size());
+  EXPECT_EQ(1, entry_node.callees().size());
+  EXPECT_TRUE(entry_node.caller_callsites().empty());
+  EXPECT_TRUE(entry_node.callers().empty());
+
+  const CallGraphNode& map_node = call_graph->GetNode(map_computation);
+  EXPECT_EQ(map_computation, map_node.computation());
+  EXPECT_EQ(CallContext::kParallel, map_node.context());
+  EXPECT_TRUE(map_node.callsites().empty());
+  EXPECT_TRUE(map_node.callees().empty());
+  EXPECT_EQ(5, map_node.caller_callsites().size());
+  EXPECT_EQ(1, map_node.callers().size());
 }
 
 TEST_F(CallGraphTest, SequentialComputations) {
@@ -173,27 +166,24 @@ TEST_F(CallGraphTest, SequentialComputations) {
   HloComputation* entry_computation = module.AddEntryComputation(
       MakeCallingComputation(called_computation, /*callsites=*/3));
 
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
   EXPECT_EQ(2, call_graph->nodes().size());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* entry_node,
-                         call_graph->GetNode(entry_computation));
-  EXPECT_EQ(entry_computation, entry_node->computation());
-  EXPECT_EQ(CallContext::kSequential, entry_node->context());
-  EXPECT_EQ(3, entry_node->callsites().size());
-  EXPECT_EQ(1, entry_node->callees().size());
-  EXPECT_TRUE(entry_node->caller_callsites().empty());
-  EXPECT_TRUE(entry_node->callers().empty());
-
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* called_node,
-                         call_graph->GetNode(called_computation));
-  EXPECT_EQ(called_computation, called_node->computation());
-  EXPECT_EQ(CallContext::kSequential, called_node->context());
-  EXPECT_TRUE(called_node->callsites().empty());
-  EXPECT_TRUE(called_node->callees().empty());
-  EXPECT_EQ(3, called_node->caller_callsites().size());
-  EXPECT_EQ(1, called_node->callers().size());
+  const CallGraphNode& entry_node = call_graph->GetNode(entry_computation);
+  EXPECT_EQ(entry_computation, entry_node.computation());
+  EXPECT_EQ(CallContext::kSequential, entry_node.context());
+  EXPECT_EQ(3, entry_node.callsites().size());
+  EXPECT_EQ(1, entry_node.callees().size());
+  EXPECT_TRUE(entry_node.caller_callsites().empty());
+  EXPECT_TRUE(entry_node.callers().empty());
+
+  const CallGraphNode& called_node = call_graph->GetNode(called_computation);
+  EXPECT_EQ(called_computation, called_node.computation());
+  EXPECT_EQ(CallContext::kSequential, called_node.context());
+  EXPECT_TRUE(called_node.callsites().empty());
+  EXPECT_TRUE(called_node.callees().empty());
+  EXPECT_EQ(3, called_node.caller_callsites().size());
+  EXPECT_EQ(1, called_node.callers().size());
 }
 
 TEST_F(CallGraphTest, ContextBothComputations) {
@@ -213,32 +203,29 @@ TEST_F(CallGraphTest, ContextBothComputations) {
   HloComputation* entry_computation =
       module.AddEntryComputation(builder.Build());
 
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
   EXPECT_EQ(2, call_graph->nodes().size());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* entry_node,
-                         call_graph->GetNode(entry_computation));
-  EXPECT_EQ(entry_computation, entry_node->computation());
-  EXPECT_EQ(2, entry_node->callsites().size());
+  const CallGraphNode& entry_node = call_graph->GetNode(entry_computation);
+  EXPECT_EQ(entry_computation, entry_node.computation());
+  EXPECT_EQ(2, entry_node.callsites().size());
 
-  const CallSite& call_callsite = entry_node->callsites()[0];
+  const CallSite& call_callsite = entry_node.callsites()[0];
   EXPECT_EQ(call, call_callsite.instruction());
   EXPECT_THAT(call_callsite.called_computations(),
               UnorderedElementsAre(subcomputation));
   EXPECT_EQ(CallContext::kSequential, call_callsite.context());
-  EXPECT_EQ(entry_node->GetCallSite(call), &call_callsite);
+  EXPECT_EQ(entry_node.GetCallSite(call), &call_callsite);
 
-  const CallSite& map_callsite = entry_node->callsites()[1];
+  const CallSite& map_callsite = entry_node.callsites()[1];
   EXPECT_EQ(map, map_callsite.instruction());
   EXPECT_THAT(map_callsite.called_computations(),
               UnorderedElementsAre(subcomputation));
   EXPECT_EQ(CallContext::kParallel, map_callsite.context());
-  EXPECT_EQ(entry_node->GetCallSite(map), &map_callsite);
+  EXPECT_EQ(entry_node.GetCallSite(map), &map_callsite);
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* sub_node,
-                         call_graph->GetNode(subcomputation));
-  EXPECT_EQ(CallContext::kBoth, sub_node->context());
+  const CallGraphNode& sub_node = call_graph->GetNode(subcomputation);
+  EXPECT_EQ(CallContext::kBoth, sub_node.context());
 }
 
 TEST_F(CallGraphTest, ComplexGraph) {
@@ -284,27 +271,24 @@ TEST_F(CallGraphTest, ComplexGraph) {
     entry_computation = module.AddEntryComputation(builder.Build());
   }
 
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
   EXPECT_EQ(5, call_graph->nodes().size());
 
   // Entry computation has one while instruction calling two computations
   // (cond_computation and a_computation).
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* entry_node,
-                         call_graph->GetNode(entry_computation));
-  ASSERT_EQ(1, entry_node->callsites().size());
+  const CallGraphNode& entry_node = call_graph->GetNode(entry_computation);
+  ASSERT_EQ(1, entry_node.callsites().size());
   const std::vector<HloComputation*>& called_computations =
-      entry_node->callsites()[0].called_computations();
+      entry_node.callsites()[0].called_computations();
   EXPECT_THAT(called_computations,
               UnorderedElementsAre(cond_computation, a_computation));
-  EXPECT_EQ(CallContext::kSequential, entry_node->context());
+  EXPECT_EQ(CallContext::kSequential, entry_node.context());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* c_node,
-                         call_graph->GetNode(c_computation));
-  EXPECT_TRUE(c_node->callsites().empty());
-  EXPECT_THAT(c_node->callers(),
+  const CallGraphNode& c_node = call_graph->GetNode(c_computation);
+  EXPECT_TRUE(c_node.callsites().empty());
+  EXPECT_THAT(c_node.callers(),
               UnorderedElementsAre(a_computation, b_computation));
-  EXPECT_EQ(CallContext::kBoth, c_node->context());
+  EXPECT_EQ(CallContext::kBoth, c_node.context());
 
   // Visit the graph and verify nodes were visited in callee-before-caller
   // order.
@@ -337,8 +321,7 @@ TEST_F(CallGraphTest, VisitSingletonComputation) {
   HloModule module(TestName());
   HloComputation* computation =
       module.AddEntryComputation(MakeScalarComputation());
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
 
   std::vector<HloComputation*> visited;
   TF_ASSERT_OK(call_graph->VisitNodes([&visited](const CallGraphNode& node) {
@@ -355,8 +338,7 @@ TEST_F(CallGraphTest, VisitUnreachableComputation) {
       module.AddEntryComputation(MakeScalarComputation());
   HloComputation* unreachable_computation =
       module.AddEmbeddedComputation(MakeScalarComputation());
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
 
   // Test visitation of only reachable nodes.
   {
@@ -390,8 +372,7 @@ TEST_F(CallGraphTest, VisitWithError) {
   // Test that the call graph visitor properly propagates errors.
   HloModule module(TestName());
   module.AddEntryComputation(MakeScalarComputation());
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
 
   Status status = call_graph->VisitNodes(
       [](const CallGraphNode&) { return InternalError("Visitation failed"); });
diff --git a/tensorflow/compiler/xla/service/flatten_call_graph.cc b/tensorflow/compiler/xla/service/flatten_call_graph.cc
index 3c41fe870f..297a4f7599 100644
--- a/tensorflow/compiler/xla/service/flatten_call_graph.cc
+++ b/tensorflow/compiler/xla/service/flatten_call_graph.cc
@@ -102,8 +102,7 @@ Status FlattenNode(const CallGraphNode& node) {
 StatusOr<bool> FlattenCallGraph::Run(HloModule* module) {
   XLA_VLOG_LINES(3, "Before flatten call graph:\n" + module->ToString());
 
-  TF_ASSIGN_OR_RETURN(std::unique_ptr<CallGraph> call_graph,
-                      CallGraph::Build(module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(module);
   TF_RETURN_IF_ERROR(call_graph->VisitNodes(FlattenNode));
 
   XLA_VLOG_LINES(3, "After flatten call graph:\n" + module->ToString());
diff --git a/tensorflow/compiler/xla/service/flatten_call_graph_test.cc b/tensorflow/compiler/xla/service/flatten_call_graph_test.cc
index 6c4a48bbe8..4e03a96fb3 100644
--- a/tensorflow/compiler/xla/service/flatten_call_graph_test.cc
+++ b/tensorflow/compiler/xla/service/flatten_call_graph_test.cc
@@ -141,11 +141,9 @@ TEST_F(FlattenCallGraphTest, ComplexGraph) {
   {
     TF_ASSIGN_OR_ASSERT_OK(bool result, RunFlattenCallGraph(&module));
     EXPECT_TRUE(result);
-    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> flat_call_graph,
-                           CallGraph::Build(&module));
-    TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* c_node,
-                           flat_call_graph->GetNode(c_computation));
-    EXPECT_EQ(1, c_node->caller_callsites().size());
+    std::unique_ptr<CallGraph> flat_call_graph = CallGraph::Build(&module);
+    const CallGraphNode& c_node = flat_call_graph->GetNode(c_computation);
+    EXPECT_EQ(1, c_node.caller_callsites().size());
   }
 }
 
@@ -178,21 +176,17 @@ TEST_F(FlattenCallGraphTest, SharedWhileConditionAndBody) {
   }
 
   {
-    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                           CallGraph::Build(&module));
-    TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* cond_node,
-                           call_graph->GetNode(cond_computation));
-    EXPECT_EQ(2, cond_node->caller_callsites().size());
+    std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
+    const CallGraphNode& cond_node = call_graph->GetNode(cond_computation);
+    EXPECT_EQ(2, cond_node.caller_callsites().size());
   }
 
   {
     TF_ASSIGN_OR_ASSERT_OK(bool result, RunFlattenCallGraph(&module));
     EXPECT_TRUE(result);
-    TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                           CallGraph::Build(&module));
-    TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* cond_node,
-                           call_graph->GetNode(cond_computation));
-    EXPECT_EQ(1, cond_node->caller_callsites().size());
+    std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
+    const CallGraphNode& cond_node = call_graph->GetNode(cond_computation);
+    EXPECT_EQ(1, cond_node.caller_callsites().size());
   }
 }
 
@@ -219,17 +213,14 @@ TEST_F(FlattenCallGraphTest, FlattenCalls) {
 
   TF_ASSIGN_OR_ASSERT_OK(bool result, RunFlattenCallGraph(&module));
   EXPECT_TRUE(result);
-  TF_ASSIGN_OR_ASSERT_OK(std::unique_ptr<CallGraph> call_graph,
-                         CallGraph::Build(&module));
+  std::unique_ptr<CallGraph> call_graph = CallGraph::Build(&module);
   EXPECT_EQ(7, module.computations().size());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* c_node,
-                         call_graph->GetNode(c_computation));
-  EXPECT_EQ(1, c_node->caller_callsites().size());
+  const CallGraphNode& c_node = call_graph->GetNode(c_computation);
+  EXPECT_EQ(1, c_node.caller_callsites().size());
 
-  TF_ASSIGN_OR_ASSERT_OK(const CallGraphNode* b_node,
-                         call_graph->GetNode(b_computation));
-  EXPECT_EQ(1, b_node->caller_callsites().size());
+  const CallGraphNode& b_node = call_graph->GetNode(b_computation);
+  EXPECT_EQ(1, b_node.caller_callsites().size());
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/service/hlo_ordering.cc b/tensorflow/compiler/xla/service/hlo_ordering.cc
index b3168ed40e..7476b72f02 100644
--- a/tensorflow/compiler/xla/service/hlo_ordering.cc
+++ b/tensorflow/compiler/xla/service/hlo_ordering.cc
@@ -34,15 +34,95 @@ limitations under the License.
 
 namespace xla {
 
-PredecessorHloOrdering::PredecessorHloOrdering(const HloModule* module)
-    : module_(module) {}
+namespace {
 
-bool PredecessorHloOrdering::ExecutesBefore(const HloInstruction* a,
-                                            const HloInstruction* b) const {
-  // Instructions in different computations are unordered.
-  if (a->parent() != b->parent()) {
+// Returns the nearest call graph ancestors of instructions 'a' and 'b' for
+// which the ancestors are in the same computation. An instruction is an call
+// graph ancestor of 'a' if the instruction calls the computation containing 'a'
+// either directly or transitively. Degeneratively an instruction is an ancestor
+// of itself. nullptr is returned if there is no common ancestor or if the
+// caller chain of 'a' or 'b' diverges (has multiple callers) before the nearest
+// common ancestor.
+//
+// Example:
+//
+// Entry computation:
+//   %x = Call(A, {Constant(42.0)})
+//   %y = Call(B, {%x})
+//
+// Computation A:
+//   %a = Negate(Param())
+//
+// Computation B:
+//   %b = Exp(Param());
+//
+// If called with %a and %b, this function would return (%x, %y). %x is an
+// ancestor of %a, and %y is an ancestor of %b, and %x and %y are in the same
+// computation.
+std::pair<const HloInstruction*, const HloInstruction*>
+GetNearestCallGraphAncestorsInSameComputation(const HloInstruction* a,
+                                              const HloInstruction* b,
+                                              const CallGraph& call_graph) {
+  // Lambda which returns the next instruction in the callee->caller chain in
+  // the call graph. This is the unique instruction which calls the computation
+  // containing 'instruction'. If more than one instruction calls the
+  // computation containing 'instruction' or no instructions call the
+  // computation then nullptr is returned.
+  auto next_caller =
+      [&call_graph](
+          const HloInstruction* instruction) -> const HloInstruction* {
+    const CallGraphNode& node = call_graph.GetNode(instruction->parent());
+    if (node.caller_callsites().size() != 1) {
+      return nullptr;
+    }
+    return node.caller_callsites()[0].instruction();
+  };
+
+  // Iterate through the callee->caller chains and find the earliest common
+  // element.
+  for (const HloInstruction* a_ancestor = a; a_ancestor != nullptr;
+       a_ancestor = next_caller(a_ancestor)) {
+    for (const HloInstruction* b_ancestor = b; b_ancestor != nullptr;
+         b_ancestor = next_caller(b_ancestor)) {
+      if (a_ancestor->parent() == b_ancestor->parent()) {
+        return {a_ancestor, b_ancestor};
+      }
+    }
+  }
+  return {nullptr, nullptr};
+}
+
+}  // namespace
+
+bool HloOrdering::ExecutesBefore(const HloInstruction* a,
+                                 const HloInstruction* b) const {
+  // 'a' and 'b' may be in different computations. In this case, find the
+  // callgraph ancestor instructions which call (potentially transitively) the
+  // computations containing 'a' and 'b' and use these ancestor instructions to
+  // compare order.
+  const HloInstruction* a_ancestor;
+  const HloInstruction* b_ancestor;
+  std::tie(a_ancestor, b_ancestor) =
+      GetNearestCallGraphAncestorsInSameComputation(a, b, *call_graph_);
+
+  if (a_ancestor == nullptr) {
+    // Ancestors in a common computation could not be found so consider the
+    // instructions 'a' and 'b' to be unordered.
     return false;
   }
+  // a_ancestor and b_ancestor must be either both null or both non-null.
+  CHECK_NE(b_ancestor, nullptr);
+  CHECK_EQ(a_ancestor->parent(), b_ancestor->parent());
+  return ExecutesBeforeInSameComputation(a_ancestor, b_ancestor);
+}
+
+PredecessorHloOrdering::PredecessorHloOrdering(const HloModule* module)
+    : HloOrdering(module) {}
+
+bool PredecessorHloOrdering::ExecutesBeforeInSameComputation(
+    const HloInstruction* a, const HloInstruction* b) const {
+  CHECK_EQ(a->parent(), b->parent());
+
   // 'a' executes before 'b' if 'a' is in the strict predecessor set of 'b'.
   return strict_predecessors_.at(b->parent())->IsReachable(b, a);
 }
@@ -86,7 +166,7 @@ string DependencyHloOrdering::ToString() const {
 
 SequentialHloOrdering::SequentialHloOrdering(
     const HloModule* module, const HloModuleSequence& module_sequence)
-    : module_(module), module_sequence_(module_sequence) {
+    : HloOrdering(module), module_sequence_(module_sequence) {
   // Create a map from instruction to its order position.
   for (auto computation_order : module_sequence_) {
     const std::vector<const HloInstruction*>& order = computation_order.second;
@@ -97,12 +177,9 @@ SequentialHloOrdering::SequentialHloOrdering(
   }
 }
 
-bool SequentialHloOrdering::ExecutesBefore(const HloInstruction* a,
-                                           const HloInstruction* b) const {
-  // Instructions in different computations are unordered.
-  if (a->parent() != b->parent()) {
-    return false;
-  }
+bool SequentialHloOrdering::ExecutesBeforeInSameComputation(
+    const HloInstruction* a, const HloInstruction* b) const {
+  CHECK_EQ(a->parent(), b->parent());
   // If either instruction is not in the order, then 'a' and 'b' are unordered.
   if (order_position_.count(a) == 0 || order_position_.count(b) == 0) {
     return false;
diff --git a/tensorflow/compiler/xla/service/hlo_ordering.h b/tensorflow/compiler/xla/service/hlo_ordering.h
index e964c4c51a..d2db18be00 100644
--- a/tensorflow/compiler/xla/service/hlo_ordering.h
+++ b/tensorflow/compiler/xla/service/hlo_ordering.h
@@ -20,6 +20,7 @@ limitations under the License.
 #include <string>
 #include <utility>
 
+#include "tensorflow/compiler/xla/service/call_graph.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
@@ -36,13 +37,13 @@ namespace xla {
 // buffers.
 class HloOrdering {
  public:
-  HloOrdering() = default;
+  HloOrdering(const HloModule* module)
+      : module_(module), call_graph_(CallGraph::Build(module)) {}
   virtual ~HloOrdering() = default;
 
   // Returns true if instruction 'a' executes before instruction 'b'. This is
   // not reflexive, that is, an instruction does not execute before itself.
-  virtual bool ExecutesBefore(const HloInstruction* a,
-                              const HloInstruction* b) const = 0;
+  bool ExecutesBefore(const HloInstruction* a, const HloInstruction* b) const;
 
   // Returns the sequential instruction order for the given computation, or
   // nullptr if the computation does not have a sequential ordering.
@@ -50,6 +51,21 @@ class HloOrdering {
       const HloComputation& computation) const = 0;
 
   virtual string ToString() const = 0;
+
+ protected:
+  // Returns true if instruction 'a' executes before instruction 'b'.
+  // Precondition: 'a' and 'b' are in the same computation.
+  //
+  // Derived classes should implement this method for determining order of
+  // instructions in the same comptuation. ExecutesBefore() analyzes the
+  // callgraph and uses this method to determine ordering of instructions in
+  // different computations.
+  virtual bool ExecutesBeforeInSameComputation(
+      const HloInstruction* a, const HloInstruction* b) const = 0;
+
+  const HloModule* module_;
+
+  std::unique_ptr<CallGraph> call_graph_;
 };
 
 // Base class for partial orderings implemented by a map of strict predecessors
@@ -58,11 +74,6 @@ class PredecessorHloOrdering : public HloOrdering {
  public:
   ~PredecessorHloOrdering() override = default;
 
-  // Returns true if instruction 'a' executes before instruction 'b'.
-  // Instructions in different computations are not ordered.
-  bool ExecutesBefore(const HloInstruction* a,
-                      const HloInstruction* b) const override;
-
   // Returns nullptr indicating the computation does not have a sequential
   // ordering.
   const std::vector<const HloInstruction*>* SequentialOrder(
@@ -74,11 +85,12 @@ class PredecessorHloOrdering : public HloOrdering {
   explicit PredecessorHloOrdering(const HloModule* module);
   string ToStringHelper(const string& name) const;
 
-  const HloModule* module_;
+  bool ExecutesBeforeInSameComputation(const HloInstruction* a,
+                                       const HloInstruction* b) const override;
 
-  // For each each computation in the module, this is the set of the
-  // instruction's strict predecessors. An instruction is not an element of its
-  // own strict predecessor set.
+  // For each computation in the module, this is the set of the instruction's
+  // strict predecessors. An instruction is not an element of its own strict
+  // predecessor set.
   //
   // Subclasses should fill this in to define the desired ordering.
   tensorflow::gtl::FlatMap<const HloComputation*,
@@ -150,12 +162,6 @@ class SequentialHloOrdering : public HloOrdering {
                         const HloModuleSequence& module_sequence);
   ~SequentialHloOrdering() override = default;
 
-  // Instruction 'a' executes before 'b' if 'a' appears before 'b' in the
-  // instruction sequence for the computation. Instructions in different
-  // computations are unordered.
-  bool ExecutesBefore(const HloInstruction* a,
-                      const HloInstruction* b) const override;
-
   // Returns the sequential instruction order for the given computation.
   const std::vector<const HloInstruction*>* SequentialOrder(
       const HloComputation& computation) const override;
@@ -163,7 +169,9 @@ class SequentialHloOrdering : public HloOrdering {
   string ToString() const override;
 
  protected:
-  const HloModule* module_;
+  bool ExecutesBeforeInSameComputation(const HloInstruction* a,
+                                       const HloInstruction* b) const override;
+
   const HloModuleSequence module_sequence_;
 
   // The position of every instruction in the HLO module in its respective
diff --git a/tensorflow/compiler/xla/service/hlo_ordering_test.cc b/tensorflow/compiler/xla/service/hlo_ordering_test.cc
index 425bee601a..01b5fd9364 100644
--- a/tensorflow/compiler/xla/service/hlo_ordering_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_ordering_test.cc
@@ -78,6 +78,83 @@ TEST_F(HloOrderingTest, LastUseScheduledFirst) {
   EXPECT_TRUE(ordering.ExecutesBefore(add, negate));
 }
 
+TEST_F(HloOrderingTest, InstructionsInDifferentComputations) {
+  // Tests the ordering of instructions in different computations using the
+  // following HLO code:
+  //
+  // Entry computation:
+  //   %x = Call(A, {})
+  //   %y = Call(B, {%x})
+  //
+  // Computation A:
+  //   %a = Call(C, {})
+  //
+  // Computation B:
+  //   %b = Call(C, {})
+  //
+  // Computation C:
+  //   %c = Constant(42.0f)
+  //
+  // This results in a diamond-shaped callgraph.
+  HloModule module(TestName());
+  const Shape scalar_shape = ShapeUtil::MakeShape(xla::F32, {});
+
+  auto builder_c = HloComputation::Builder("C");
+  HloInstruction* c = builder_c.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
+  HloComputation* computation_c =
+      module.AddEmbeddedComputation(builder_c.Build());
+
+  auto builder_b = HloComputation::Builder("B");
+  builder_b.AddInstruction(
+      HloInstruction::CreateParameter(0, scalar_shape, "param"));
+  HloInstruction* b = builder_b.AddInstruction(
+      HloInstruction::CreateCall(scalar_shape, {}, computation_c));
+  HloComputation* computation_b =
+      module.AddEmbeddedComputation(builder_b.Build());
+
+  auto builder_a = HloComputation::Builder("A");
+  HloInstruction* a = builder_a.AddInstruction(
+      HloInstruction::CreateCall(scalar_shape, {}, computation_c));
+  HloComputation* computation_a =
+      module.AddEmbeddedComputation(builder_a.Build());
+
+  auto builder = HloComputation::Builder(TestName());
+  HloInstruction* x = builder.AddInstruction(
+      HloInstruction::CreateCall(scalar_shape, {}, computation_a));
+  HloInstruction* y = builder.AddInstruction(
+      HloInstruction::CreateCall(scalar_shape, {x}, computation_b));
+  module.AddEntryComputation(builder.Build());
+
+  DependencyHloOrdering ordering(&module);
+  EXPECT_TRUE(ordering.ExecutesBefore(x, y));
+  EXPECT_FALSE(ordering.ExecutesBefore(y, x));
+
+  EXPECT_TRUE(ordering.ExecutesBefore(a, b));
+  EXPECT_FALSE(ordering.ExecutesBefore(b, a));
+
+  EXPECT_FALSE(ordering.ExecutesBefore(a, x));
+  EXPECT_TRUE(ordering.ExecutesBefore(a, y));
+  EXPECT_FALSE(ordering.ExecutesBefore(x, a));
+  EXPECT_FALSE(ordering.ExecutesBefore(y, a));
+
+  EXPECT_FALSE(ordering.ExecutesBefore(b, x));
+  EXPECT_FALSE(ordering.ExecutesBefore(b, y));
+  EXPECT_TRUE(ordering.ExecutesBefore(x, b));
+  EXPECT_FALSE(ordering.ExecutesBefore(y, b));
+
+  // Instruction 'c' is called from multiple callsites and should be unordered
+  // relative to all other instructions in the module.
+  EXPECT_FALSE(ordering.ExecutesBefore(c, a));
+  EXPECT_FALSE(ordering.ExecutesBefore(c, b));
+  EXPECT_FALSE(ordering.ExecutesBefore(c, x));
+  EXPECT_FALSE(ordering.ExecutesBefore(c, y));
+  EXPECT_FALSE(ordering.ExecutesBefore(a, c));
+  EXPECT_FALSE(ordering.ExecutesBefore(b, c));
+  EXPECT_FALSE(ordering.ExecutesBefore(x, c));
+  EXPECT_FALSE(ordering.ExecutesBefore(y, c));
+}
+
 }  // namespace
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization.cc b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
index 65c61627a1..44293f582e 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
@@ -930,9 +930,8 @@ StatusOr<int64> HloRematerialization::ComputePeakMemory(
 
 StatusOr<int64> HloRematerialization::CalledComputationsMemoryUsage(
     const HloInstruction* instruction) const {
-  TF_ASSIGN_OR_RETURN(const CallGraphNode* node,
-                      call_graph_->GetNode(instruction->parent()));
-  const CallSite* callsite = node->GetCallSite(instruction);
+  const CallSite* callsite =
+      call_graph_->GetNode(instruction->parent()).GetCallSite(instruction);
   if (callsite == nullptr || callsite->context() == CallContext::kParallel) {
     return 0;
   }
@@ -981,8 +980,7 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
   // instructions which are dead.
   int64 net_instructions_added = 0;
 
-  TF_ASSIGN_OR_RETURN(const CallGraphNode* call_graph_node,
-                      call_graph_->GetNode(computation));
+  const CallGraphNode& call_graph_node = call_graph_->GetNode(computation);
 
   // Iterate through all instructions in the sequence. At each instruction
   // (program point) if memory_usage exceeds the specified limit then
@@ -1080,7 +1078,7 @@ StatusOr<bool> HloRematerialization::RematerializeComputation(
               << memory_tracker.memory_usage();
     }
 
-    const CallSite* callsite = call_graph_node->GetCallSite(instruction);
+    const CallSite* callsite = call_graph_node.GetCallSite(instruction);
     if (callsite != nullptr &&
         callsite->context() == CallContext::kSequential &&
         memory_tracker.memory_usage() + callee_usage > memory_limit_bytes) {
@@ -1194,7 +1192,7 @@ StatusOr<bool> HloRematerialization::Run(
                           }));
   // Compute peak memory usage of all computations in the module called in a
   // sequential context.
-  TF_ASSIGN_OR_RETURN(call_graph_, CallGraph::Build(module));
+  call_graph_ = CallGraph::Build(module);
   TF_RETURN_IF_ERROR(call_graph_->VisitNodes(
       [this, sequence](const CallGraphNode& node) -> Status {
         if (node.context() == CallContext::kSequential) {
-- 
GitLab


From 4ef4a1231d9db8e965f2319f9aa6af5b61b7580e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 14:55:12 -0800
Subject: [PATCH 0822/1563] Fix losses.get_regularization_losses documentation
 to avoid implying losses are Variables. Change: 154593246

---
 tensorflow/python/ops/losses/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/losses/util.py b/tensorflow/python/ops/losses/util.py
index 15d9d86f01..09ad874fae 100644
--- a/tensorflow/python/ops/losses/util.py
+++ b/tensorflow/python/ops/losses/util.py
@@ -63,7 +63,7 @@ def get_regularization_losses(scope=None):
     scope: An optional scope for filtering the losses to return.
 
   Returns:
-    A list of loss variables.
+    A list of regularization losses as Tensors.
   """
   return ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES, scope)
 
-- 
GitLab


From 561fb9b89f49fe12e594f093a7073568c74910ef Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 28 Apr 2017 15:01:03 -0800
Subject: [PATCH 0823/1563] Document that tf.train.batch is nondeterministic

Fixes #9441.
Change: 154593819
---
 tensorflow/python/training/input.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/training/input.py b/tensorflow/python/training/input.py
index 14a7bbc108..83f1ac4abd 100644
--- a/tensorflow/python/training/input.py
+++ b/tensorflow/python/training/input.py
@@ -885,7 +885,8 @@ def batch(tensors, batch_size, num_threads=1, capacity=32,
   Args:
     tensors: The list or dictionary of tensors to enqueue.
     batch_size: The new batch size pulled from the queue.
-    num_threads: The number of threads enqueuing `tensors`.
+    num_threads: The number of threads enqueuing `tensors`.  The batching will
+      be nondeterministic if `num_threads > 1`.
     capacity: An integer. The maximum number of elements in the queue.
     enqueue_many: Whether each tensor in `tensors` is a single example.
     shapes: (Optional) The shapes for each example.  Defaults to the
@@ -937,7 +938,8 @@ def maybe_batch(tensors, keep_input, batch_size, num_threads=1, capacity=32,
       corresponding value in `keep_input` is `True`. This tensor essentially
       acts as a filtering mechanism.
     batch_size: The new batch size pulled from the queue.
-    num_threads: The number of threads enqueuing `tensors`.
+    num_threads: The number of threads enqueuing `tensors`.  The batching will
+      be nondeterministic if `num_threads > 1`.
     capacity: An integer. The maximum number of elements in the queue.
     enqueue_many: Whether each tensor in `tensors` is a single example.
     shapes: (Optional) The shapes for each example.  Defaults to the
@@ -981,6 +983,9 @@ def batch_join(tensors_list, batch_size, capacity=32, enqueue_many=False,
   dictionaries of tensors.  Each element in the list is treated similarly
   to the `tensors` argument of `tf.train.batch()`.
 
+  WARNING: This function is nondeterministic, since it starts a separate thread
+  for each tensor.
+
   Enqueues a different list of tensors in different threads.
   Implemented using a queue -- a `QueueRunner` for the queue
   is added to the current `Graph`'s `QUEUE_RUNNER` collection.
-- 
GitLab


From be88359aa1cd5e0221427a3626e0f690239b89de Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 28 Apr 2017 15:18:08 -0800
Subject: [PATCH 0824/1563] Remove or warn about nn_ops accidentally registered
 to ints

Several nn_ops were registered for ints accidentally.  Some of these even have
kernel registrations for ints which do very strange things.  The ops without
kernels registered have been restricted to floating point types, and warnings
have been added for those with kernels.  Other ops were registered with more
float types than they had kernels for.

Fixes #9317.  Fixes #5539.
Change: 154595629
---
 .../layers/python/layers/layers_test.py       |  15 +-
 tensorflow/contrib/makefile/tf_op_files.txt   |   2 +-
 tensorflow/core/kernels/BUILD                 |  15 +-
 tensorflow/core/kernels/softplus_op.cc        |  11 +-
 tensorflow/core/kernels/softsign_op.cc        |  11 +-
 tensorflow/core/kernels/warn_about_ints.cc    |  32 ++
 tensorflow/core/kernels/warn_about_ints.h     |  29 ++
 .../core/ops/compat/ops_history.v1.pbtxt      | 298 ------------------
 tensorflow/core/ops/nn_ops.cc                 |  48 +--
 .../python/kernel_tests/softplus_op_test.py   |   6 +
 .../python/kernel_tests/softsign_op_test.py   |   6 +
 11 files changed, 132 insertions(+), 341 deletions(-)
 create mode 100644 tensorflow/core/kernels/warn_about_ints.cc
 create mode 100644 tensorflow/core/kernels/warn_about_ints.h

diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index b48ad09e14..60700c5a65 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -247,7 +247,7 @@ class ConvolutionTest(test.TestCase):
   def testCreateConv(self):
     height, width = 7, 9
     with self.test_session():
-      images = np.random.uniform(size=(5, height, width, 4))
+      images = np.random.uniform(size=(5, height, width, 4)).astype(np.float32)
       output = layers_lib.convolution2d(images, 32, [3, 3])
       self.assertEqual(output.op.name, 'Conv/Relu')
       self.assertListEqual(output.get_shape().as_list(), [5, height, width, 32])
@@ -259,7 +259,7 @@ class ConvolutionTest(test.TestCase):
   def testCreateConvNCHW(self):
     height, width = 7, 9
     with self.test_session():
-      images = np.random.uniform(size=(5, 4, height, width))
+      images = np.random.uniform(size=(5, 4, height, width)).astype(np.float32)
       output = layers_lib.convolution2d(images, 32, [3, 3], data_format='NCHW')
       self.assertEqual(output.op.name, 'Conv/Relu')
       self.assertListEqual(output.get_shape().as_list(), [5, 32, height, width])
@@ -2780,7 +2780,7 @@ class RepeatTests(test.TestCase):
   def testRepeat(self):
     height, width = 3, 3
     with self.test_session():
-      images = np.random.uniform(size=(5, height, width, 3))
+      images = np.random.uniform(size=(5, height, width, 3)).astype(np.float32)
       output = _layers.repeat(images, 3, layers_lib.conv2d, 32, [3, 3])
       self.assertEqual(output.op.name, 'Repeat/convolution_3/Relu')
       self.assertListEqual(output.get_shape().as_list(), [5, 3, 3, 32])
@@ -2815,15 +2815,6 @@ class SeparableConv2dTest(test.TestCase):
       self.assertEqual(output.op.name, 'SeparableConv2d/Relu')
       self.assertListEqual(output.get_shape().as_list(), [5, height, width, 32])
 
-  def testCreateConvFloat64(self):
-    height, width = 3, 3
-    with self.test_session():
-      images = random_ops.random_uniform(
-          (5, height, width, 3), seed=1, dtype=dtypes.float64)
-      output = layers_lib.separable_conv2d(images, 32, [3, 3], 2)
-      self.assertEqual(output.op.name, 'SeparableConv2d/Relu')
-      self.assertListEqual(output.get_shape().as_list(), [5, height, width, 32])
-
   def testCreateDepthwiseConv(self):
     height, width = 3, 3
     with self.test_session():
diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index 61fc21b24d..b727e2b888 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -224,4 +224,4 @@ tensorflow/core/ops/array_grad.cc
 tensorflow/core/kernels/spacetobatch_functor.cc
 tensorflow/core/kernels/spacetobatch_op.cc
 tensorflow/core/kernels/batchtospace_op.cc
-
+tensorflow/core/kernels/warn_about_ints.cc
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 5702c1b1c0..f87e222afa 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -392,6 +392,15 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "warn_about_ints",
+    srcs = ["warn_about_ints.cc"],
+    hdrs = ["warn_about_ints.h"],
+    deps = [
+        "//tensorflow/core:framework",
+    ],
+)
+
 # Private support libraries ---------------------------------------------------
 
 cc_header_only_library(
@@ -2711,13 +2720,13 @@ tf_kernel_library(
 tf_kernel_library(
     name = "softplus_op",
     prefix = "softplus_op",
-    deps = NN_DEPS,
+    deps = NN_DEPS + [":warn_about_ints"],
 )
 
 tf_kernel_library(
     name = "softsign_op",
     prefix = "softsign_op",
-    deps = NN_DEPS,
+    deps = NN_DEPS + [":warn_about_ints"],
 )
 
 tf_kernel_library(
@@ -4033,6 +4042,7 @@ filegroup(
         "training_ops.h",
         "transpose_functor.h",
         "transpose_op.h",
+        "warn_about_ints.h",
         "where_op.h",
         "xent_op.h",
     ],
@@ -4169,6 +4179,7 @@ filegroup(
         "training_ops.cc",
         "transpose_functor_cpu.cc",
         "transpose_op.cc",
+        "warn_about_ints.cc",
         "where_op.cc",
         "xent_op.cc",
         ":android_extended_ops_headers",
diff --git a/tensorflow/core/kernels/softplus_op.cc b/tensorflow/core/kernels/softplus_op.cc
index 5650435781..494a83ed14 100644
--- a/tensorflow/core/kernels/softplus_op.cc
+++ b/tensorflow/core/kernels/softplus_op.cc
@@ -23,6 +23,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/kernels/warn_about_ints.h"
 #include "tensorflow/core/lib/core/errors.h"
 
 namespace tensorflow {
@@ -33,7 +34,10 @@ typedef Eigen::GpuDevice GPUDevice;
 template <typename Device, typename T>
 class SoftplusOp : public UnaryElementWiseOp<T, SoftplusOp<Device, T>> {
  public:
-  using UnaryElementWiseOp<T, SoftplusOp<Device, T>>::UnaryElementWiseOp;
+  explicit SoftplusOp(OpKernelConstruction* context)
+      : UnaryElementWiseOp<T, SoftplusOp<Device, T>>(context) {
+    WarnAboutInts(context);
+  }
 
   void Operate(OpKernelContext* context, const Tensor& input, Tensor* output) {
     functor::Softplus<Device, T> functor;
@@ -46,7 +50,10 @@ template <typename Device, typename T>
 class SoftplusGradOp
     : public BinaryElementWiseOp<T, SoftplusGradOp<Device, T>> {
  public:
-  using BinaryElementWiseOp<T, SoftplusGradOp<Device, T>>::BinaryElementWiseOp;
+  explicit SoftplusGradOp(OpKernelConstruction* context)
+      : BinaryElementWiseOp<T, SoftplusGradOp<Device, T>>(context) {
+    WarnAboutInts(context);
+  }
 
   void OperateNoTemplate(OpKernelContext* context, const Tensor& g,
                          const Tensor& a, Tensor* output);
diff --git a/tensorflow/core/kernels/softsign_op.cc b/tensorflow/core/kernels/softsign_op.cc
index 33b9628b32..00ee649b17 100644
--- a/tensorflow/core/kernels/softsign_op.cc
+++ b/tensorflow/core/kernels/softsign_op.cc
@@ -23,6 +23,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/kernels/warn_about_ints.h"
 #include "tensorflow/core/lib/core/errors.h"
 
 namespace tensorflow {
@@ -33,7 +34,10 @@ typedef Eigen::GpuDevice GPUDevice;
 template <typename Device, typename T>
 class SoftsignOp : public UnaryElementWiseOp<T, SoftsignOp<Device, T>> {
  public:
-  using UnaryElementWiseOp<T, SoftsignOp<Device, T>>::UnaryElementWiseOp;
+  explicit SoftsignOp(OpKernelConstruction* context)
+      : UnaryElementWiseOp<T, SoftsignOp<Device, T>>(context) {
+    WarnAboutInts(context);
+  }
 
   void Operate(OpKernelContext* context, const Tensor& input, Tensor* output) {
     functor::Softsign<Device, T> functor;
@@ -46,7 +50,10 @@ template <typename Device, typename T>
 class SoftsignGradOp
     : public BinaryElementWiseOp<T, SoftsignGradOp<Device, T>> {
  public:
-  using BinaryElementWiseOp<T, SoftsignGradOp<Device, T>>::BinaryElementWiseOp;
+  explicit SoftsignGradOp(OpKernelConstruction* context)
+      : BinaryElementWiseOp<T, SoftsignGradOp<Device, T>>(context) {
+    WarnAboutInts(context);
+  }
 
   void OperateNoTemplate(OpKernelContext* context, const Tensor& g,
                          const Tensor& a, Tensor* output);
diff --git a/tensorflow/core/kernels/warn_about_ints.cc b/tensorflow/core/kernels/warn_about_ints.cc
new file mode 100644
index 0000000000..fd0a889c99
--- /dev/null
+++ b/tensorflow/core/kernels/warn_about_ints.cc
@@ -0,0 +1,32 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/warn_about_ints.h"
+
+namespace tensorflow {
+
+void WarnAboutInts(OpKernelConstruction* context) {
+  DataType dtype;
+  OP_REQUIRES_OK(context, context->GetAttr("T", &dtype));
+  if (DataTypeIsInteger(dtype)) {
+    LOG(WARNING) << "Op " << context->def().name() << " of type "
+                 << context->def().op() << " used with integer dtype "
+                 << DataTypeString(dtype)
+                 << ".  This op was registered with integer support "
+                 << "accidentally, and you won't like the result.";
+  }
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/warn_about_ints.h b/tensorflow/core/kernels/warn_about_ints.h
new file mode 100644
index 0000000000..20666b230e
--- /dev/null
+++ b/tensorflow/core/kernels/warn_about_ints.h
@@ -0,0 +1,29 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_KERNELS_WARN_ABOUT_INTS_H_
+#define TENSORFLOW_KERNELS_WARN_ABOUT_INTS_H_
+
+#include "tensorflow/core/framework/op_kernel.h"
+
+namespace tensorflow {
+
+// Warn if a kernel is being created using ints
+// TODO(irving): Remove in TF 2.0 along with the bad op registrations.
+void WarnAboutInts(OpKernelConstruction* context);
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_KERNELS_WARN_ABOUT_INTS_H_
diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 85309fba78..8e57e811f8 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1910,12 +1910,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -1960,18 +1954,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -2028,18 +2010,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -2087,18 +2057,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -2159,18 +2117,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -2292,12 +2238,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -4090,7 +4030,6 @@ op {
       list {
         type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -4154,7 +4093,6 @@ op {
       list {
         type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -4218,7 +4156,6 @@ op {
       list {
         type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -4278,18 +4215,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4331,18 +4256,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4401,18 +4314,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4461,18 +4362,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4518,18 +4407,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4588,18 +4465,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4648,18 +4513,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4705,18 +4558,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -6646,12 +6487,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -6678,12 +6513,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
         type: DT_HALF
       }
     }
@@ -8400,19 +8229,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -8486,19 +8302,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -8547,9 +8350,7 @@ op {
     type: "type"
     allowed_values {
       list {
-        type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -8605,9 +8406,7 @@ op {
     type: "type"
     allowed_values {
       list {
-        type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -9528,17 +9327,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
         type: DT_HALF
       }
     }
@@ -10782,19 +10570,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -10850,19 +10625,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -10913,19 +10675,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -10989,19 +10738,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -11068,19 +10804,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -11093,19 +10816,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -11169,14 +10879,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
-        type: DT_HALF
       }
     }
   }
diff --git a/tensorflow/core/ops/nn_ops.cc b/tensorflow/core/ops/nn_ops.cc
index 932113bf2c..3e58669e30 100644
--- a/tensorflow/core/ops/nn_ops.cc
+++ b/tensorflow/core/ops/nn_ops.cc
@@ -89,7 +89,7 @@ REGISTER_OP("AvgPool")
     .Attr("strides: list(int) >= 4")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
-    .Attr("T: realnumbertype")
+    .Attr("T: {half, float, double}")
     .SetShapeFn(shape_inference::AvgPoolShape)
     .Doc(R"doc(
 Performs average pooling on the input.
@@ -117,7 +117,7 @@ REGISTER_OP("AvgPoolGrad")
     .Attr("strides: list(int) >= 4")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnetDataFormatAttrString())
-    .Attr("T: realnumbertype")
+    .Attr("T: {half, float, double}")
     .SetShapeFn([](InferenceContext* c) {
       // NOTE(mrry): We could in principle work out the shape from the
       // gradients and the attrs, but if we do not know orig_input_shape
@@ -272,7 +272,7 @@ REGISTER_OP("FusedBatchNorm")
     .Output("batch_variance: T")
     .Output("reserve_space_1: T")
     .Output("reserve_space_2: T")
-    .Attr("T: numbertype")
+    .Attr("T: {float}")
     .Attr("epsilon: float = 0.0001")
     .Attr("data_format: string = 'NHWC'")
     .Attr("is_training: bool = true")
@@ -348,7 +348,7 @@ REGISTER_OP("FusedBatchNormGrad")
     .Output("offset_backprop: T")
     .Output("reserve_space_3: T")
     .Output("reserve_space_4: T")
-    .Attr("T: numbertype")
+    .Attr("T: {float}")
     .Attr("epsilon: float = 0.0001")
     .Attr("data_format: string = 'NHWC'")
     .Attr("is_training: bool = true")
@@ -504,7 +504,7 @@ REGISTER_OP("Conv2D")
     .Input("input: T")
     .Input("filter: T")
     .Output("output: T")
-    .Attr("T: {half, float, double}")
+    .Attr("T: {half, float}")
     .Attr("strides: list(int)")
     .Attr("use_cudnn_on_gpu: bool = true")
     .Attr(GetPaddingAttrString())
@@ -557,7 +557,7 @@ REGISTER_OP("Conv2DBackpropInput")
     .Input("filter: T")
     .Input("out_backprop: T")
     .Output("output: T")
-    .Attr("T: {half, float, double}")
+    .Attr("T: {half, float}")
     .Attr("strides: list(int)")
     .Attr("use_cudnn_on_gpu: bool = true")
     .Attr(GetPaddingAttrString())
@@ -599,7 +599,7 @@ REGISTER_OP("Conv2DBackpropFilter")
     .Input("filter_sizes: int32")
     .Input("out_backprop: T")
     .Output("output: T")
-    .Attr("T: {half, float, double}")
+    .Attr("T: {half, float}")
     .Attr("strides: list(int)")
     .Attr("use_cudnn_on_gpu: bool = true")
     .Attr(GetPaddingAttrString())
@@ -735,7 +735,7 @@ REGISTER_OP("FusedResizeAndPadConv2D")
     .Input("paddings: int32")
     .Input("filter: T")
     .Output("output: T")
-    .Attr("T: {half, float, double}")
+    .Attr("T: {float}")
     .Attr("resize_align_corners: bool = false")
     .Attr(GetMirrorPadModeAttrString())
     .Attr("strides: list(int)")
@@ -777,7 +777,7 @@ REGISTER_OP("FusedPadConv2D")
     .Input("paddings: int32")
     .Input("filter: T")
     .Output("output: T")
-    .Attr("T: {half, float, double}")
+    .Attr("T: {float}")
     .Attr(GetMirrorPadModeAttrString())
     .Attr("strides: list(int)")
     .Attr(GetPaddingAttrString())
@@ -939,7 +939,7 @@ REGISTER_OP("Conv3D")
     .Input("input: T")
     .Input("filter: T")
     .Output("output: T")
-    .Attr("T: numbertype")
+    .Attr("T: {float, double}")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
@@ -971,7 +971,7 @@ REGISTER_OP("Conv3DBackpropInput")
     .Input("filter: T")
     .Input("out_backprop: T")
     .Output("output: T")
-    .Attr("T: numbertype")
+    .Attr("T: {float, double}")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Deprecated(10, "Use Conv3DBackpropInputV2")
@@ -997,7 +997,7 @@ REGISTER_OP("Conv3DBackpropFilter")
     .Input("filter: T")
     .Input("out_backprop: T")
     .Output("output: T")
-    .Attr("T: numbertype")
+    .Attr("T: {float, double}")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Deprecated(10, "Use Conv3DBackpropFilterV2")
@@ -1026,7 +1026,7 @@ REGISTER_OP("Conv3DBackpropInputV2")
     .Input("filter: T")
     .Input("out_backprop: T")
     .Output("output: T")
-    .Attr("T: numbertype")
+    .Attr("T: {float, double}")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
@@ -1063,7 +1063,7 @@ REGISTER_OP("Conv3DBackpropFilterV2")
     .Input("filter_sizes: int32")
     .Input("out_backprop: T")
     .Output("output: T")
-    .Attr("T: numbertype")
+    .Attr("T: {float, double}")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
@@ -1104,7 +1104,7 @@ REGISTER_OP("AvgPool3D")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
-    .Attr("T: numbertype")
+    .Attr("T: {float, double}")
     .SetShapeFn(shape_inference::Pool3DShape)
     .Doc(R"doc(
 Performs 3D average pooling on the input.
@@ -1131,7 +1131,7 @@ REGISTER_OP("AvgPool3DGrad")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
-    .Attr("T: numbertype")
+    .Attr("T: {float, double}")
     .SetShapeFn([](InferenceContext* c) {
       ShapeHandle s;
       TF_RETURN_IF_ERROR(c->MakeShapeFromShapeTensor(0, &s));
@@ -1166,7 +1166,7 @@ REGISTER_OP("MaxPool3D")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
-    .Attr("T: numbertype")
+    .Attr("T: {float}")
     .SetShapeFn(shape_inference::Pool3DShape)
     .Doc(R"doc(
 Performs 3D max pooling on the input.
@@ -1190,12 +1190,12 @@ REGISTER_OP("MaxPool3DGrad")
     .Input("orig_output: TInput")
     .Input("grad: T")
     .Output("output: T")
-    .Attr("ksize: list(int) >= 5 ")
+    .Attr("ksize: list(int) >= 5")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
-    .Attr("T: numbertype = DT_FLOAT")
-    .Attr("TInput: numbertype = DT_FLOAT")
+    .Attr("T: {float} = DT_FLOAT")
+    .Attr("TInput: {float} = DT_FLOAT")
     .SetShapeFn([](InferenceContext* c) {
       return UnchangedShapeWithRank(c, 5);
     })
@@ -1226,7 +1226,7 @@ REGISTER_OP("MaxPool3DGradGrad")
     .Attr("strides: list(int) >= 5")
     .Attr(GetPaddingAttrString())
     .Attr(GetConvnet3dDataFormatAttrString())
-    .Attr("T: realnumbertype")
+    .Attr("T: {float}")
     .SetShapeFn([](InferenceContext* c) {
       TF_RETURN_IF_ERROR(shape_inference::Pool3DShape(c));
       ShapeHandle unused;
@@ -1260,7 +1260,7 @@ data_format: The data format of the input and output data. With the
 REGISTER_OP("L2Loss")
     .Input("t: T")
     .Output("output: T")
-    .Attr("T: numbertype")
+    .Attr("T: {half, float, double}")
     .SetShapeFn(shape_inference::ScalarShape)
     .Doc(R"doc(
 L2 Loss.
@@ -1748,7 +1748,7 @@ backprops: The gradients:
 REGISTER_OP("Elu")
     .Input("features: T")
     .Output("activations: T")
-    .Attr("T: realnumbertype")
+    .Attr("T: {half, float, double}")
     .SetShapeFn(shape_inference::UnchangedShape)
     .Doc(R"doc(
 Computes exponential linear: `exp(features) - 1` if < 0, `features` otherwise.
@@ -1761,7 +1761,7 @@ REGISTER_OP("EluGrad")
     .Input("gradients: T")
     .Input("outputs: T")
     .Output("backprops: T")
-    .Attr("T: realnumbertype")
+    .Attr("T: {half, float, double}")
     .SetShapeFn(shape_inference::MergeBothInputsShapeFn)
     .Doc(R"doc(
 Computes gradients for the exponential linear (Elu) operation.
diff --git a/tensorflow/python/kernel_tests/softplus_op_test.py b/tensorflow/python/kernel_tests/softplus_op_test.py
index f70f60c0f5..7e4f46c46f 100644
--- a/tensorflow/python/kernel_tests/softplus_op_test.py
+++ b/tensorflow/python/kernel_tests/softplus_op_test.py
@@ -85,6 +85,12 @@ class SoftplusTest(test.TestCase):
     print("softplus (float) gradient err = ", err)
     self.assertLess(err, 1e-4)
 
+  def testWarnInts(self):
+    # NOTE(irving): Actually I don't know how to intercept the warning, but
+    # let's make sure it runs.  I promised I've looked, and there was a warning.
+    with self.test_session():
+      nn_ops.softplus(constant_op.constant(7)).eval()
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/kernel_tests/softsign_op_test.py b/tensorflow/python/kernel_tests/softsign_op_test.py
index 5fd5253c09..371f86ff15 100644
--- a/tensorflow/python/kernel_tests/softsign_op_test.py
+++ b/tensorflow/python/kernel_tests/softsign_op_test.py
@@ -65,6 +65,12 @@ class SoftsignTest(test.TestCase):
     print("softsign (float) gradient err = ", err)
     self.assertLess(err, 1e-4)
 
+  def testWarnInts(self):
+    # NOTE(irving): Actually I don't know how to intercept the warning, but
+    # let's make sure it runs.  I promised I've looked, and there was a warning.
+    with self.test_session():
+      nn_ops.softsign(constant_op.constant(7)).eval()
+
 
 if __name__ == "__main__":
   test.main()
-- 
GitLab


From 4f8cc7cb41a80905ec5ceef7536480c18d3c6bec Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 15:49:49 -0800
Subject: [PATCH 0825/1563] Update ops-related pbtxt files. Change: 154598657

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 188 ++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 209 +-----------------
 2 files changed, 193 insertions(+), 204 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 8e57e811f8..8434251f53 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1915,6 +1915,63 @@ op {
     }
   }
 }
+op {
+  name: "AvgPool"
+  input_arg {
+    name: "value"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+}
 op {
   name: "AvgPool3D"
   input_arg {
@@ -2243,6 +2300,67 @@ op {
     }
   }
 }
+op {
+  name: "AvgPoolGrad"
+  input_arg {
+    name: "orig_input_shape"
+    type: DT_INT32
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "ksize"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "strides"
+    type: "list(int)"
+    has_minimum: true
+    minimum: 4
+  }
+  attr {
+    name: "padding"
+    type: "string"
+    allowed_values {
+      list {
+        s: "SAME"
+        s: "VALID"
+      }
+    }
+  }
+  attr {
+    name: "data_format"
+    type: "string"
+    default_value {
+      s: "NHWC"
+    }
+    allowed_values {
+      list {
+        s: "NHWC"
+        s: "NCHW"
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+}
 op {
   name: "Barrier"
   output_arg {
@@ -6492,6 +6610,28 @@ op {
     }
   }
 }
+op {
+  name: "Elu"
+  input_arg {
+    name: "features"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "activations"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+}
 op {
   name: "EluGrad"
   input_arg {
@@ -6518,6 +6658,32 @@ op {
     }
   }
 }
+op {
+  name: "EluGrad"
+  input_arg {
+    name: "gradients"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "outputs"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "backprops"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+}
 op {
   name: "EncodeBase64"
   input_arg {
@@ -9332,6 +9498,28 @@ op {
     }
   }
 }
+op {
+  name: "L2Loss"
+  input_arg {
+    name: "t"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+}
 op {
   name: "LRN"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 10e76748ab..0e1192d3ed 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -2067,15 +2067,9 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
-        type: DT_HALF
       }
     }
   }
@@ -2140,18 +2134,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -2220,18 +2202,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -2298,15 +2268,9 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
-        type: DT_HALF
       }
     }
   }
@@ -4312,7 +4276,6 @@ op {
       list {
         type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -4385,7 +4348,6 @@ op {
       list {
         type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -4457,7 +4419,6 @@ op {
       list {
         type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -4523,18 +4484,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4601,18 +4550,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4668,18 +4605,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4745,18 +4670,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -4812,18 +4725,6 @@ op {
       list {
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -6666,15 +6567,9 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
-        type: DT_HALF
       }
     }
   }
@@ -6703,15 +6598,9 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
-        type: DT_HALF
       }
     }
   }
@@ -8304,19 +8193,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -8406,19 +8282,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -8475,9 +8338,7 @@ op {
     type: "type"
     allowed_values {
       list {
-        type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -8541,9 +8402,7 @@ op {
     type: "type"
     allowed_values {
       list {
-        type: DT_HALF
         type: DT_FLOAT
-        type: DT_DOUBLE
       }
     }
   }
@@ -9568,20 +9427,9 @@ op {
     type: "type"
     allowed_values {
       list {
+        type: DT_HALF
         type: DT_FLOAT
         type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -10839,19 +10687,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -10926,19 +10761,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -10951,19 +10773,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT64
-        type: DT_INT32
-        type: DT_UINT8
-        type: DT_UINT16
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_COMPLEX64
-        type: DT_COMPLEX128
-        type: DT_QINT8
-        type: DT_QUINT8
-        type: DT_QINT32
-        type: DT_HALF
       }
     }
   }
@@ -11036,14 +10845,6 @@ op {
     allowed_values {
       list {
         type: DT_FLOAT
-        type: DT_DOUBLE
-        type: DT_INT32
-        type: DT_INT64
-        type: DT_UINT8
-        type: DT_INT16
-        type: DT_INT8
-        type: DT_UINT16
-        type: DT_HALF
       }
     }
   }
-- 
GitLab


From c383ff9040ee05c648ba5d0e9c65c68b5dd30159 Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Fri, 28 Apr 2017 16:36:42 -0800
Subject: [PATCH 0826/1563] Add bool field inaccurate to Costs. Change:
 154602604

---
 tensorflow/core/grappler/costs/cost_estimator.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/core/grappler/costs/cost_estimator.h b/tensorflow/core/grappler/costs/cost_estimator.h
index 093b7e29dc..27975458d4 100644
--- a/tensorflow/core/grappler/costs/cost_estimator.h
+++ b/tensorflow/core/grappler/costs/cost_estimator.h
@@ -90,6 +90,8 @@ struct Costs {
   int64 max_per_op_buffers;    // Sum of all buffers used by the ops.
   int64 max_per_op_streaming;  // Ignore largest input buffer, assuming it
                                // streams from main memory.
+  // If the time estimation is inaccurate.
+  bool inaccurate = false;
 };
 
 inline std::ostream& operator<<(std::ostream& os, const Costs::MicroSeconds d) {
-- 
GitLab


From 8acd664fa1dfbaafe6399bdbb969eddd9446d6a5 Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <shoyer@google.com>
Date: Fri, 28 Apr 2017 16:42:09 -0800
Subject: [PATCH 0827/1563] Fixup tf.contrib.labeled_tensor.select to handle
 tuples properly

You can use a tuple to label a point along an axis, so tuples should not be
converted into lists of points for indexing.
Change: 154603014
---
 .../contrib/labeled_tensor/python/ops/ops.py  | 34 +++++++++----------
 .../labeled_tensor/python/ops/ops_test.py     |  7 ++++
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/tensorflow/contrib/labeled_tensor/python/ops/ops.py b/tensorflow/contrib/labeled_tensor/python/ops/ops.py
index 98842494fa..c957b41a49 100644
--- a/tensorflow/contrib/labeled_tensor/python/ops/ops.py
+++ b/tensorflow/contrib/labeled_tensor/python/ops/ops.py
@@ -51,8 +51,7 @@ def _gather_1d_on_axis(labeled_tensor, indexer, axis, name=None):
 @tc.returns(core.LabeledTensor)
 @tc.accepts(core.LabeledTensorLike,
             tc.Mapping(string_types,
-                       tc.Union(slice, collections.Hashable,
-                                collections.Sequence)),
+                       tc.Union(slice, collections.Hashable, list)),
             tc.Optional(string_types))
 def select(labeled_tensor, selection, name=None):
   """Slice out a subset of the tensor.
@@ -110,23 +109,22 @@ def select(labeled_tensor, selection, name=None):
 
         slices[axis_name] = slice(start, stop)
 
-      else:
-        # We're allowing anything NumPy treats as a scalar or 1D array.
-        value = np.asarray(value)
-        if value.ndim == 0:
-          slices[axis_name] = axis.index(value.item())
-        elif value.ndim == 1:
-          if indexers:
-            raise NotImplementedError(
-                'select does not yet support more than one list selection at '
-                'the same time')
-          indexer = [axis.index(v) for v in value.tolist()]
-          indexers[axis_name] = ops.convert_to_tensor(
-              indexer, dtype=dtypes.int64)
-        else:
+      # Needs to be after checking for slices, since slice objects claim to be
+      # instances of collections.Hashable but hash() on them fails.
+      elif isinstance(value, collections.Hashable):
+        slices[axis_name] = axis.index(value)
+
+      elif isinstance(value, list):
+        if indexers:
           raise NotImplementedError(
-              'select does not yet support selections with more than one '
-              'dimension: %s on axis %r' % (value, axis_name))
+              'select does not yet support more than one list selection at '
+              'the same time')
+        indexer = [axis.index(v) for v in value]
+        indexers[axis_name] = ops.convert_to_tensor(indexer, dtype=dtypes.int64)
+
+      else:
+        # If type checking is working properly, this shouldn't be possible.
+        raise TypeError('cannot handle arbitrary types')
 
     if indexers and slices:
       raise NotImplementedError(
diff --git a/tensorflow/contrib/labeled_tensor/python/ops/ops_test.py b/tensorflow/contrib/labeled_tensor/python/ops/ops_test.py
index ea5e008752..0727f4cf88 100644
--- a/tensorflow/contrib/labeled_tensor/python/ops/ops_test.py
+++ b/tensorflow/contrib/labeled_tensor/python/ops/ops_test.py
@@ -121,6 +121,13 @@ class SelectTest(Base):
     golden_lt = core.LabeledTensor(self.tensor[1, 1, :, :], [self.a2, self.a3])
     self.assertLabeledTensorsEqual(select_lt, golden_lt)
 
+  def test_tuple(self):
+    original_lt = core.LabeledTensor(constant_op.constant([5, 6]),
+                                     [('x', [(1, 2), (3, 4)])])
+    select_lt = ops.select(original_lt, {'x': (1, 2)})
+    golden_lt = core.LabeledTensor(constant_op.constant(5), [])
+    self.assertLabeledTensorsEqual(select_lt, golden_lt)
+
   def test_invalid_input(self):
     with self.assertRaises(ValueError):
       ops.select(self.original_lt, {'foo': 1})
-- 
GitLab


From 0a9b39caefd437fec742ae48b25061abd6e2699b Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Fri, 28 Apr 2017 16:42:25 -0800
Subject: [PATCH 0828/1563] When allocating GPU constants, check to see if the
 destination tensor is intialized early (because we ran out of memory) and
 report it as such.

Fixes #7025.
Change: 154603030
---
 tensorflow/core/common_runtime/gpu/gpu_device.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index ce2cc604e4..0e2343cfe3 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -465,6 +465,14 @@ Status BaseGPUDevice::MakeTensorFromProto(const TensorProto& tensor_proto,
                               DataTypeString(parsed.dtype()), " tensor");
     }
     Tensor copy(GetAllocator(alloc_attrs), parsed.dtype(), parsed.shape());
+
+    // If the tensor is not initialized, we likely ran out of memory.
+    if (!copy.IsInitialized()) {
+      return errors::ResourceExhausted(
+          "OOM when allocating tensor of shape ", parsed.shape().DebugString(),
+          " and type ", DataTypeString(parsed.dtype()));
+    }
+
     port::Tracing::ScopedAnnotation annotation("MakeTensorFromProto");
     Notification n;
     device_contexts_[0]->CopyCPUTensorToDevice(&parsed, this, &copy,
-- 
GitLab


From f8051d04d982b5877717f1e4145488263aa69c68 Mon Sep 17 00:00:00 2001
From: Bjarke Hammersholt Roune <broune@google.com>
Date: Fri, 28 Apr 2017 16:55:50 -0800
Subject: [PATCH 0829/1563] ReferenceUtil::ReduceWindow4DGeneric() now supports
 arbitrary edge padding. Change: 154603866

---
 tensorflow/compiler/xla/reference_util.cc | 20 +++++++++++++++++---
 tensorflow/compiler/xla/reference_util.h  |  6 ++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/tensorflow/compiler/xla/reference_util.cc b/tensorflow/compiler/xla/reference_util.cc
index 5630033ac8..4194d5fc6b 100644
--- a/tensorflow/compiler/xla/reference_util.cc
+++ b/tensorflow/compiler/xla/reference_util.cc
@@ -180,14 +180,28 @@ ReferenceUtil::ReduceWindow4DGeneric(
     const tensorflow::gtl::ArraySlice<int64>& stride, Padding padding) {
   std::vector<int64> dim_lengths{operand.n1(), operand.n2(), operand.n3(),
                                  operand.n4()};
-  auto padding_both = xla::MakePadding(dim_lengths, window, stride, padding);
+  return ReduceWindow4DGeneric(
+      operand, init, reduce_func, window, stride,
+      xla::MakePadding(dim_lengths, window, stride, padding));
+}
+
+/* static */ std::unique_ptr<Array4D<float>>
+ReferenceUtil::ReduceWindow4DGeneric(
+    const Array4D<float>& operand, float init,
+    const std::function<float(float, float)>& reduce_func,
+    const tensorflow::gtl::ArraySlice<int64>& window,
+    const tensorflow::gtl::ArraySlice<int64>& stride,
+    const tensorflow::gtl::ArraySlice<std::pair<int64, int64>>& padding) {
+  std::vector<int64> dim_lengths{operand.n1(), operand.n2(), operand.n3(),
+                                 operand.n4()};
 
   std::vector<int64> window_counts(window.size(), 0);
   std::vector<int64> pad_low(window.size(), 0);
   for (int64 i = 0; i < window.size(); ++i) {
+    int64 padded_width = padding[i].first + dim_lengths[i] + padding[i].second;
     window_counts[i] =
-        WindowCount(dim_lengths[i], window[i], stride[i], padding);
-    pad_low[i] = padding_both[i].first;
+        window_util::StridedBound(padded_width, window[i], stride[i]);
+    pad_low[i] = padding[i].first;
   }
   auto result = MakeUnique<Array4D<float>>(window_counts[0], window_counts[1],
                                            window_counts[2], window_counts[3]);
diff --git a/tensorflow/compiler/xla/reference_util.h b/tensorflow/compiler/xla/reference_util.h
index eb1eea7fc4..cdcad08c33 100644
--- a/tensorflow/compiler/xla/reference_util.h
+++ b/tensorflow/compiler/xla/reference_util.h
@@ -162,6 +162,12 @@ class ReferenceUtil {
       const std::function<float(float, float)>& reduce_func,
       const tensorflow::gtl::ArraySlice<int64>& window,
       const tensorflow::gtl::ArraySlice<int64>& stride, Padding padding);
+  static std::unique_ptr<Array4D<float>> ReduceWindow4DGeneric(
+      const Array4D<float>& operand, float init,
+      const std::function<float(float, float)>& reduce_func,
+      const tensorflow::gtl::ArraySlice<int64>& window,
+      const tensorflow::gtl::ArraySlice<int64>& stride,
+      const tensorflow::gtl::ArraySlice<std::pair<int64, int64>>& padding);
 
   // Performs select and scatter with Greater Than or equal as the select, plus
   // as the scatter, and Same Padding.
-- 
GitLab


From cf57465dbbbb1adcdba217d2997bc13e63940e6c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 17:13:26 -0800
Subject: [PATCH 0830/1563] Internal Change. Change: 154605009

---
 tensorflow/contrib/BUILD      |  2 +
 tensorflow/contrib/nccl/BUILD | 83 +++++++++++++++++++++--------------
 2 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index edd099a1da..c658508288 100755
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -80,6 +80,7 @@ cc_library(
         "//tensorflow/contrib/input_pipeline:input_pipeline_ops_kernels",
         "//tensorflow/contrib/layers:bucketization_op_kernel",
         "//tensorflow/contrib/layers:sparse_feature_cross_op_kernel",
+        "//tensorflow/contrib/nccl:nccl_kernels",
         "//tensorflow/contrib/tensor_forest:tensor_forest_kernels",
     ],
 )
@@ -94,6 +95,7 @@ cc_library(
         "//tensorflow/contrib/input_pipeline:input_pipeline_ops_op_lib",
         "//tensorflow/contrib/layers:bucketization_op_op_lib",
         "//tensorflow/contrib/layers:sparse_feature_cross_op_op_lib",
+        "//tensorflow/contrib/nccl:nccl_ops_op_lib",
         "//tensorflow/contrib/tensor_forest:tensor_forest_ops_op_lib",
     ],
 )
diff --git a/tensorflow/contrib/nccl/BUILD b/tensorflow/contrib/nccl/BUILD
index c7f32baa2d..b6314079e1 100644
--- a/tensorflow/contrib/nccl/BUILD
+++ b/tensorflow/contrib/nccl/BUILD
@@ -1,10 +1,8 @@
 # Description:
 #   Wrap NVIDIA (https://github.com/NVIDIA/nccl) NCCL with tensorflow ops.
 #   APIs are meant to change over time.
-package(
-    default_visibility = ["//visibility:private"],
-    features = ["-parse_headers"],
-)
+
+package(default_visibility = ["//tensorflow:__subpackages__"])
 
 licenses(["notice"])  # Apache 2.0
 
@@ -19,6 +17,8 @@ load(
 )
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
 load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
+load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
+load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 
 tf_custom_op_library(
     name = "python/ops/_nccl_ops.so",
@@ -34,6 +34,47 @@ tf_custom_op_library(
     ],
 )
 
+tf_cuda_cc_test(
+    name = "nccl_manager_test",
+    size = "medium",
+    srcs = if_cuda(
+        [
+            "kernels/nccl_manager.cc",
+            "kernels/nccl_manager.h",
+            "kernels/nccl_manager_test.cc",
+        ],
+        [],
+    ),
+    tags = ["manual"],  # Disabled until errors finding nvmlShutdown are found.
+    deps = if_cuda(
+        [
+            "@nccl_archive//:nccl",
+            "//tensorflow/core",
+            "//tensorflow/core:cuda",
+        ],
+        [],
+    ) + [
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+    ],
+)
+
+tf_kernel_library(
+    name = "nccl_kernels",
+    srcs = [
+        "kernels/nccl_manager.cc",
+        "kernels/nccl_manager.h",
+        "kernels/nccl_ops.cc",
+    ],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:gpu_headers_lib",
+        "@nccl_archive//:nccl",
+    ],
+    alwayslink = 1,
+)
+
 tf_gen_op_libs(
     op_lib_names = ["nccl_ops"],
     deps = [
@@ -46,15 +87,19 @@ tf_gen_op_wrapper_py(
     deps = [":nccl_ops_op_lib"],
 )
 
-py_library(
+tf_custom_op_py_library(
     name = "nccl_py",
     srcs = [
         "__init__.py",
         "python/ops/nccl_ops.py",
     ],
-    data = [
+    dso = [
         ":python/ops/_nccl_ops.so",
     ],
+    kernels = [
+        ":nccl_kernels",
+        ":nccl_ops_op_lib",
+    ],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
@@ -82,32 +127,6 @@ cuda_py_test(
     ],
 )
 
-tf_cuda_cc_test(
-    name = "nccl_manager_test",
-    size = "medium",
-    srcs = if_cuda(
-        [
-            "kernels/nccl_manager.cc",
-            "kernels/nccl_manager.h",
-            "kernels/nccl_manager_test.cc",
-        ],
-        [],
-    ),
-    tags = ["manual"],  # Disabled until errors finding nvmlShutdown are found.
-    deps = if_cuda(
-        [
-            "@nccl_archive//:nccl",
-            "//tensorflow/core",
-            "//tensorflow/core:cuda",
-        ],
-        [],
-    ) + [
-        "//tensorflow/core:test",
-        "//tensorflow/core:test_main",
-        "//tensorflow/core:testlib",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(
-- 
GitLab


From 736a2eb3de5031e967d88c63f66c812e07fbd26c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 17:30:55 -0800
Subject: [PATCH 0831/1563] Actually, we may change the type of errors too.
 Change: 154605805

---
 tensorflow/docs_src/programmers_guide/version_semantics.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/programmers_guide/version_semantics.md b/tensorflow/docs_src/programmers_guide/version_semantics.md
index efaa3a75de..47fc582387 100644
--- a/tensorflow/docs_src/programmers_guide/version_semantics.md
+++ b/tensorflow/docs_src/programmers_guide/version_semantics.md
@@ -103,9 +103,10 @@ backward incompatible ways between minor releases. These include:
     convergence. We will note such changes in the release notes.
 
 *   **Error messages:** We reserve the right to change the text of error
-    messages (but not their type). For example, an error condition
-    raising `InvalidArgument` will continue to raise `InvalidArgument`,
-    but the human-readable message contents can change.
+    messages. In addition, the type of an error may change unless the type is
+    specified in the documentation. For example, a function that says in some
+    condition it will raise an `InvalidArgument` exception, it will continue to
+    raise `InvalidArgument`, but the human-readable message contents can change.
 
 
 Furthermore, any API methods marked "deprecated" in the 1.0 release can
-- 
GitLab


From ad3c84b58bb42c87ae8f38b81f75447afcc86d5f Mon Sep 17 00:00:00 2001
From: Pete Warden <petewarden@google.com>
Date: Fri, 28 Apr 2017 17:43:15 -0800
Subject: [PATCH 0832/1563] Added graph structure output to summarize_graph
 Change: 154606362

---
 .../graph_transforms/summarize_graph_main.cc  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/graph_transforms/summarize_graph_main.cc b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
index f45dfbba0c..b893465fd9 100644
--- a/tensorflow/tools/graph_transforms/summarize_graph_main.cc
+++ b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
@@ -102,7 +102,18 @@ void PrintBenchmarkUsage(const std::vector<const NodeDef*> placeholders,
   std::cout << std::endl;
 }
 
-Status SummarizeGraph(const GraphDef& graph, const string& graph_path) {
+Status PrintStructure(const GraphDef& graph) {
+  GraphDef sorted_graph;
+  TF_RETURN_IF_ERROR(SortByExecutionOrder(graph, &sorted_graph));
+  for (const NodeDef& node : sorted_graph.node()) {
+    std::cout << node.name() << " (" << node.op() << "): ["
+              << str_util::Join(node.input(), ", ") << "]" << std::endl;
+  }
+  return Status::OK();
+}
+
+Status SummarizeGraph(const GraphDef& graph, const string& graph_path,
+                      bool print_structure) {
   std::vector<const NodeDef*> placeholders;
   std::vector<const NodeDef*> variables;
   for (const NodeDef& node : graph.node()) {
@@ -233,13 +244,20 @@ Status SummarizeGraph(const GraphDef& graph, const string& graph_path) {
 
   PrintBenchmarkUsage(placeholders, variables, outputs, graph_path);
 
+  if (print_structure) {
+    TF_RETURN_IF_ERROR(PrintStructure(graph));
+  }
+
   return Status::OK();
 }
 
 int ParseFlagsAndSummarizeGraph(int argc, char* argv[]) {
   string in_graph = "";
+  bool print_structure = false;
   std::vector<Flag> flag_list = {
       Flag("in_graph", &in_graph, "input graph file name"),
+      Flag("print_structure", &print_structure,
+           "whether to print the network connections of the graph"),
   };
   string usage = Flags::Usage(argv[0], flag_list);
 
@@ -269,7 +287,8 @@ int ParseFlagsAndSummarizeGraph(int argc, char* argv[]) {
     return -1;
   }
 
-  Status summarize_result = SummarizeGraph(graph_def, in_graph);
+  Status summarize_result =
+      SummarizeGraph(graph_def, in_graph, print_structure);
   if (!summarize_result.ok()) {
     LOG(ERROR) << summarize_result.error_message() << "\n" << usage;
     return -1;
-- 
GitLab


From dae9329b0adb1628cd9665543da0c96f7a1fcbce Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Fri, 28 Apr 2017 17:44:46 -0800
Subject: [PATCH 0833/1563] Distinguish between duplicate feed/fetch and
 unspecified feed/fetch errors. Change: 154606429

---
 .../core/common_runtime/direct_session.cc     | 44 +++++++----
 .../core/common_runtime/direct_session.h      |  7 +-
 .../distributed_runtime/master_session.cc     | 46 +++++++----
 .../core/distributed_runtime/master_session.h |  6 +-
 tensorflow/python/client/session_test.py      | 77 +++++++++++++++++++
 5 files changed, 149 insertions(+), 31 deletions(-)

diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index 002e246b80..f208e4b78e 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -720,16 +720,21 @@ Status DirectSession::PRun(const string& handle, const NamedTensorList& inputs,
       if (it == run_state->pending_inputs.end()) {
         return errors::InvalidArgument(
             "The feed ", input.first,
-            " has already been fed or was not specified in partial_run_setup.");
+            " was not specified in partial_run_setup.");
+      } else if (it->second) {
+        return errors::InvalidArgument("The feed ", input.first,
+                                       " has already been fed.");
       }
     }
     // Check that this is a new set of fetches that are still pending.
     for (const auto& output : output_names) {
       auto it = run_state->pending_outputs.find(output);
       if (it == run_state->pending_outputs.end()) {
+        return errors::InvalidArgument(
+            "The fetch ", output, " was not specified in partial_run_setup.");
+      } else if (it->second) {
         return errors::InvalidArgument("The fetch ", output,
-                                       " has already been fetched or was not "
-                                       "specified in partial_run_setup.");
+                                       " has already been fetched.");
       }
     }
   }
@@ -764,14 +769,15 @@ Status DirectSession::PRun(const string& handle, const NamedTensorList& inputs,
                        << run_state->status;
         }
       }
-      for (const auto& it : inputs) {
-        run_state->pending_inputs.erase(it.first);
+      for (const auto& input : inputs) {
+        auto it = run_state->pending_inputs.find(input.first);
+        it->second = true;
       }
       for (const auto& name : output_names) {
-        run_state->pending_outputs.erase(name);
+        auto it = run_state->pending_outputs.find(name);
+        it->second = true;
       }
-      done = (run_state->pending_inputs.size() == 0 &&
-              run_state->pending_outputs.size() == 0);
+      done = run_state->PendingDone();
     }
     if (done) {
       WaitForNotification(run_state, cancellation_manager_,
@@ -900,11 +906,13 @@ Status DirectSession::CheckFetch(const NamedTensorList& feeds,
   std::unordered_set<TensorId, TensorId::Hasher> pending_feeds;
   {
     mutex_lock l(executor_lock_);
-    for (const string& feed : run_state->pending_inputs) {
-      TensorId id(ParseTensorName(feed));
+    for (const auto& input : run_state->pending_inputs) {
+      // Skip if the feed has already been fed.
+      if (input.second) continue;
+      TensorId id(ParseTensorName(input.first));
       auto it = name_to_node->find(id.first);
       if (it == name_to_node->end()) {
-        return errors::NotFound("Feed ", feed, ": not found");
+        return errors::NotFound("Feed ", input.first, ": not found");
       }
       pending_feeds.insert(id);
     }
@@ -1351,10 +1359,10 @@ DirectSession::RunState::RunState(
       }) {
   // Initially all the feeds and fetches are pending.
   for (auto& name : pending_input_names) {
-    pending_inputs.emplace(name);
+    pending_inputs[name] = false;
   }
   for (auto& name : pending_output_names) {
-    pending_outputs.emplace(name);
+    pending_outputs[name] = false;
   }
 }
 
@@ -1372,6 +1380,16 @@ DirectSession::RunState::~RunState() {
   }
 }
 
+bool DirectSession::RunState::PendingDone() const {
+  for (const auto& it : pending_inputs) {
+    if (!it.second) return false;
+  }
+  for (const auto& it : pending_outputs) {
+    if (!it.second) return false;
+  }
+  return true;
+}
+
 void DirectSession::WaitForNotification(RunState* run_state,
                                         CancellationManager* cm,
                                         int64 timeout_in_ms) {
diff --git a/tensorflow/core/common_runtime/direct_session.h b/tensorflow/core/common_runtime/direct_session.h
index 848ef3bc62..061a7fa787 100644
--- a/tensorflow/core/common_runtime/direct_session.h
+++ b/tensorflow/core/common_runtime/direct_session.h
@@ -151,8 +151,8 @@ class DirectSession : public Session {
     IntraProcessRendezvous* rendez = nullptr;
     std::unique_ptr<StepStatsCollector> collector;
     Notification executors_done;
-    std::unordered_set<string> pending_inputs;
-    std::unordered_set<string> pending_outputs;
+    std::unordered_map<string, bool> pending_inputs;   // true if fed
+    std::unordered_map<string, bool> pending_outputs;  // true if fetched
     TensorStore tensor_store;
     ScopedStepContainer step_container;
 
@@ -162,6 +162,9 @@ class DirectSession : public Session {
              const std::vector<string>& pending_output_names, int64 step_id,
              const std::vector<Device*>* devices);
 
+    // Returns true if all pending inputs and outputs have been completed.
+    bool PendingDone() const;
+
     ~RunState();
   };
 
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index cec956ba49..73d4e6ab00 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -803,11 +803,13 @@ Status MasterSession::ReffedClientGraph::CheckFetches(
     SimpleGraphExecutionState* execution_state) {
   // Build the set of pending feeds that we haven't seen.
   std::unordered_set<TensorId, TensorId::Hasher> pending_feeds;
-  for (const string& feed : run_state->pending_inputs) {
-    TensorId id(ParseTensorName(feed));
+  for (const auto& input : run_state->pending_inputs) {
+    // Skip if already fed.
+    if (input.second) continue;
+    TensorId id(ParseTensorName(input.first));
     auto it = name_to_node_.find(id.first);
     if (it == name_to_node_.end()) {
-      return errors::NotFound("Feed ", feed, ": not found");
+      return errors::NotFound("Feed ", input.first, ": not found");
     }
     pending_feeds.insert(id);
   }
@@ -1247,11 +1249,14 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
 
   // Make sure that this is a new set of feeds that are still pending.
   for (size_t i = 0; i < req.num_feeds(); ++i) {
-    auto it = run_state->pending_inputs.find(req.feed_name(i));
+    const string& feed = req.feed_name(i);
+    auto it = run_state->pending_inputs.find(feed);
     if (it == run_state->pending_inputs.end()) {
       return errors::InvalidArgument(
-          "The feed ", req.feed_name(i),
-          " has already been fed or was not specified in partial_run_setup.");
+          "The feed ", feed, " was not specified in partial_run_setup.");
+    } else if (it->second) {
+      return errors::InvalidArgument("The feed ", feed,
+                                     " has already been fed.");
     }
   }
   // Check that this is a new set of fetches that are still pending.
@@ -1259,9 +1264,11 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
     const string& fetch = req.fetch_name(i);
     auto it = run_state->pending_outputs.find(fetch);
     if (it == run_state->pending_outputs.end()) {
+      return errors::InvalidArgument(
+          "The fetch ", fetch, " was not specified in partial_run_setup.");
+    } else if (it->second) {
       return errors::InvalidArgument("The fetch ", fetch,
-                                     " had already been fetched or was not "
-                                     "specified in partial_run_setup.");
+                                     " has already been fetched.");
     }
   }
 
@@ -1274,13 +1281,14 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
 
   // Determine if this partial run satisfies all the pending inputs and ouputs.
   for (size_t i = 0; i < req.num_feeds(); ++i) {
-    run_state->pending_inputs.erase(req.feed_name(i));
+    auto it = run_state->pending_inputs.find(req.feed_name(i));
+    it->second = true;
   }
   for (size_t i = 0; i < req.num_fetches(); ++i) {
-    run_state->pending_outputs.erase(req.fetch_name(i));
+    auto it = run_state->pending_outputs.find(req.fetch_name(i));
+    it->second = true;
   }
-  bool is_last_partial_run =
-      (run_state->pending_inputs.empty() && run_state->pending_outputs.empty());
+  bool is_last_partial_run = run_state->PendingDone();
 
   Status s = run_state->rcg->RunPartitions(
       env_, run_state->step_id, run_state->count, &run_state->pss, opts, req,
@@ -1418,10 +1426,10 @@ MasterSession::RunState::RunState(const std::vector<string>& input_names,
     : rcg(rcg), step_id(step_id), count(count) {
   // Initially all the feeds and fetches are pending.
   for (auto& name : input_names) {
-    pending_inputs.emplace(name);
+    pending_inputs[name] = false;
   }
   for (auto& name : output_names) {
-    pending_outputs.emplace(name);
+    pending_outputs[name] = false;
   }
 }
 
@@ -1429,4 +1437,14 @@ MasterSession::RunState::~RunState() {
   if (rcg) rcg->Unref();
 }
 
+bool MasterSession::RunState::PendingDone() const {
+  for (const auto& it : pending_inputs) {
+    if (!it.second) return false;
+  }
+  for (const auto& it : pending_outputs) {
+    if (!it.second) return false;
+  }
+  return true;
+}
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/master_session.h b/tensorflow/core/distributed_runtime/master_session.h
index c593f84f03..ee1a340c8e 100644
--- a/tensorflow/core/distributed_runtime/master_session.h
+++ b/tensorflow/core/distributed_runtime/master_session.h
@@ -141,8 +141,8 @@ class MasterSession : public core::RefCounted {
   };
 
   struct RunState {
-    std::unordered_set<string> pending_inputs;
-    std::unordered_set<string> pending_outputs;
+    std::unordered_map<string, bool> pending_inputs;   // true if fed
+    std::unordered_map<string, bool> pending_outputs;  // true if fetched
     ReffedClientGraph* rcg = nullptr;
     uint64 step_id;
     int64 count = 0;
@@ -154,6 +154,8 @@ class MasterSession : public core::RefCounted {
              const std::vector<string>& output_names, ReffedClientGraph* rcg,
              const uint64 step_id, const int64 count);
 
+    bool PendingDone() const;
+
     ~RunState();
   };
   std::unordered_map<string, std::unique_ptr<RunState>> partial_runs_
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index e6f1c57c7d..9add5bd3cd 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -1431,6 +1431,55 @@ class SessionTest(test_util.TensorFlowTestCase):
                                  'You must feed a value for placeholder'):
       sess.partial_run(handle, fetches[0])
 
+  def runTestPartialRunUnspecifiedFeed(self, sess):
+    a = array_ops.placeholder(dtypes.float32, shape=[])
+    b = array_ops.placeholder(dtypes.float32, shape=[])
+    c = array_ops.placeholder(dtypes.float32, shape=[])
+    r1 = math_ops.add(a, b)
+
+    h = sess.partial_run_setup([r1], [a, b])
+    with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                 'was not specified in partial_run_setup.$'):
+      sess.partial_run(h, r1, feed_dict={a: 1, b: 2, c: 3})
+
+  def runTestPartialRunUnspecifiedFetch(self, sess):
+    a = array_ops.placeholder(dtypes.float32, shape=[])
+    b = array_ops.placeholder(dtypes.float32, shape=[])
+    c = array_ops.placeholder(dtypes.float32, shape=[])
+    r1 = math_ops.add(a, b)
+    r2 = math_ops.multiply(a, c)
+
+    h = sess.partial_run_setup([r1], [a, b, c])
+    with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                 'was not specified in partial_run_setup.$'):
+      sess.partial_run(h, r2, feed_dict={a: 1, c: 3})
+
+  def runTestPartialRunAlreadyFed(self, sess):
+    a = array_ops.placeholder(dtypes.float32, shape=[])
+    b = array_ops.placeholder(dtypes.float32, shape=[])
+    c = array_ops.placeholder(dtypes.float32, shape=[])
+    r1 = math_ops.add(a, b)
+    r2 = math_ops.multiply(a, c)
+
+    h = sess.partial_run_setup([r1, r2], [a, b, c])
+    sess.partial_run(h, r1, feed_dict={a: 1, b: 2})
+    with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                 'has already been fed.$'):
+      sess.partial_run(h, r2, feed_dict={a: 1, c: 3})
+
+  def runTestPartialRunAlreadyFetched(self, sess):
+    a = array_ops.placeholder(dtypes.float32, shape=[])
+    b = array_ops.placeholder(dtypes.float32, shape=[])
+    c = array_ops.placeholder(dtypes.float32, shape=[])
+    r1 = math_ops.add(a, b)
+    r2 = math_ops.multiply(a, c)
+
+    h = sess.partial_run_setup([r1, r2], [a, b, c])
+    sess.partial_run(h, r1, feed_dict={a: 1, b: 2})
+    with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                 'has already been fetched.$'):
+      sess.partial_run(h, r1, feed_dict={c: 3})
+
   def testInvalidPartialRunSetup(self):
     sess = session.Session()
     x = array_ops.placeholder(dtypes.float32, shape=[])
@@ -1457,6 +1506,18 @@ class SessionTest(test_util.TensorFlowTestCase):
   def testPartialRunMissingPlaceholderFeedExceptionDirect(self):
     self.runTestPartialRunMissingPlaceholderFeedException(session.Session())
 
+  def testPartialRunUnspecifiedFeedDirect(self):
+    self.runTestPartialRunUnspecifiedFeed(session.Session())
+
+  def testPartialRunUnspecifiedFetchDirect(self):
+    self.runTestPartialRunUnspecifiedFetch(session.Session())
+
+  def testPartialRunAlreadyFedDirect(self):
+    self.runTestPartialRunAlreadyFed(session.Session())
+
+  def testPartialRunAlreadyFetchedDirect(self):
+    self.runTestPartialRunAlreadyFetched(session.Session())
+
   def testPartialRunDist(self):
     server = server_lib.Server.create_local_server()
     self.runTestPartialRun(session.Session(server.target))
@@ -1482,6 +1543,22 @@ class SessionTest(test_util.TensorFlowTestCase):
     self.runTestPartialRunMissingPlaceholderFeedException(
         session.Session(server.target))
 
+  def testPartialRunUnspecifiedFeedDist(self):
+    server = server_lib.Server.create_local_server()
+    self.runTestPartialRunUnspecifiedFeed(session.Session(server.target))
+
+  def testPartialRunUnspecifiedFetchDist(self):
+    server = server_lib.Server.create_local_server()
+    self.runTestPartialRunUnspecifiedFetch(session.Session(server.target))
+
+  def testPartialRunAlreadyFedDist(self):
+    server = server_lib.Server.create_local_server()
+    self.runTestPartialRunAlreadyFed(session.Session(server.target))
+
+  def testPartialRunAlreadyFetchedDist(self):
+    server = server_lib.Server.create_local_server()
+    self.runTestPartialRunAlreadyFetched(session.Session(server.target))
+
   def testFeedDictKeyException(self):
     with session.Session() as sess:
       a = constant_op.constant(1.0, dtypes.float32, name='a')
-- 
GitLab


From c2de8f94051e10ceabc5aff6d0ed6f6e3a79ac61 Mon Sep 17 00:00:00 2001
From: "Gao, Xiang" <qasdfgtyuiop@gmail.com>
Date: Fri, 28 Apr 2017 23:05:14 -0400
Subject: [PATCH 0834/1563] use test fixture for all reshape operations

---
 tensorflow/core/framework/tensor_test.cc | 176 +++++++++++------------
 1 file changed, 85 insertions(+), 91 deletions(-)

diff --git a/tensorflow/core/framework/tensor_test.cc b/tensorflow/core/framework/tensor_test.cc
index 3e4179101f..6a845342fb 100644
--- a/tensorflow/core/framework/tensor_test.cc
+++ b/tensorflow/core/framework/tensor_test.cc
@@ -202,11 +202,18 @@ TEST(Tensor_QInt32, Simple) {
   TestCopies<qint32>(t);
 }
 
-TEST(Tensor_Float, Reshape) {
-  Tensor t(DT_FLOAT, TensorShape({2, 3, 4, 5}));
-  EXPECT_TRUE(t.shape().IsSameSize(TensorShape({2, 3, 4, 5})));
+class TensorReshapeTest : public ::testing::Test {
+protected:
+  Tensor t;
+  Tensor zero_t;
+
+  TensorReshapeTest() : t(DT_FLOAT, TensorShape({2, 3, 4, 5})),
+      zero_t(DT_FLOAT, TensorShape({3, 0, 2, 0, 5})) {}
+
+  virtual void SetUp() {
+    EXPECT_TRUE(t.shape().IsSameSize(TensorShape({2, 3, 4, 5})));
+    EXPECT_TRUE(zero_t.shape().IsSameSize(TensorShape({3, 0, 2, 0, 5})));
 
-  {
     auto tensor = t.tensor<float, 4>();
     EXPECT_EQ(2, tensor.dimension(0));
     EXPECT_EQ(3, tensor.dimension(1));
@@ -217,15 +224,18 @@ TEST(Tensor_Float, Reshape) {
     tensor(0, 0, 0, 0) = 0.01f;
     tensor(1, 2, 3, 4) = 0.02f;
   }
+
+};
+
+TEST_F(TensorReshapeTest, Reshape) {
+  LOG(INFO) << "shaped";
   {
-    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 1>({120});
     EXPECT_EQ(120, shaped.dimension(0));
     EXPECT_EQ(shaped(0), 0.01f);
     EXPECT_EQ(shaped(119), 0.02f);
   }
   {
-    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 2>({6, 20});
     EXPECT_EQ(6, shaped.dimension(0));
     EXPECT_EQ(20, shaped.dimension(1));
@@ -233,7 +243,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(shaped(5, 19), 0.02f);
   }
   {
-    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 3>({6, 4, 5});
     EXPECT_EQ(6, shaped.dimension(0));
     EXPECT_EQ(4, shaped.dimension(1));
@@ -242,7 +251,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(shaped(5, 3, 4), 0.02f);
   }
   {
-    LOG(INFO) << "shaped";
     auto shaped = t.shaped<float, 4>({2, 3, 4, 5});
     EXPECT_EQ(2, shaped.dimension(0));
     EXPECT_EQ(3, shaped.dimension(1));
@@ -252,16 +260,22 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(shaped(0, 0, 0, 0), 0.01f);
     EXPECT_EQ(shaped(1, 2, 3, 4), 0.02f);
   }
+}
+
+TEST_F(TensorReshapeTest, Flat) {
+  LOG(INFO) << "flat";
   {
-    LOG(INFO) << "flat";
     auto flat = t.flat<float>();
     EXPECT_EQ(flat(0), 0.01f);
     EXPECT_EQ(120, flat.dimension(0));
     EXPECT_EQ(flat(0), 0.01f);
     EXPECT_EQ(flat(119), 0.02f);
   }
+}
+
+TEST_F(TensorReshapeTest, FlatInnerDims) {
+  LOG(INFO) << "flat_inner_dims";
   {
-    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = t.flat_inner_dims<float>();
     EXPECT_EQ(24, flat_inner_dims.dimension(0));
     EXPECT_EQ(5, flat_inner_dims.dimension(1));
@@ -269,15 +283,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(23, 4), 0.02f);
   }
   {
-    LOG(INFO) << "flat_outer_dims";
-    auto flat_outer_dims = t.flat_outer_dims<float>();
-    EXPECT_EQ(2, flat_outer_dims.dimension(0));
-    EXPECT_EQ(60, flat_outer_dims.dimension(1));
-    EXPECT_EQ(flat_outer_dims(0, 0), 0.01f);
-    EXPECT_EQ(flat_outer_dims(1, 59), 0.02f);
-  }
-  {
-    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = t.flat_inner_dims<float, 3>();
     EXPECT_EQ(6, flat_inner_dims.dimension(0));
     EXPECT_EQ(4, flat_inner_dims.dimension(1));
@@ -286,16 +291,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(5, 3, 4), 0.02f);
   }
   {
-    LOG(INFO) << "flat_outer_dims";
-    auto flat_outer_dims = t.flat_outer_dims<float, 3>();
-    EXPECT_EQ(2, flat_outer_dims.dimension(0));
-    EXPECT_EQ(3, flat_outer_dims.dimension(1));
-    EXPECT_EQ(20, flat_outer_dims.dimension(2));
-    EXPECT_EQ(flat_outer_dims(0, 0, 0), 0.01f);
-    EXPECT_EQ(flat_outer_dims(1, 2, 19), 0.02f);
-  }
-  {
-    LOG(INFO) << "flat_inner_dims";
     auto flat_inner_dims = t.flat_inner_dims<float, 5>();
     EXPECT_EQ(1, flat_inner_dims.dimension(0));
     EXPECT_EQ(2, flat_inner_dims.dimension(1));
@@ -306,7 +301,44 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(0, 1, 2, 3, 4), 0.02f);
   }
   {
-    LOG(INFO) << "flat_outer_dims";
+    auto flat_inner_dims = zero_t.flat_inner_dims<float>();
+    EXPECT_EQ(0, flat_inner_dims.dimension(0));
+    EXPECT_EQ(5, flat_inner_dims.dimension(1));
+  }
+  {
+    auto flat_inner_dims = zero_t.flat_inner_dims<float, 3>();
+    EXPECT_EQ(0, flat_inner_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_dims.dimension(2));
+  }
+  {
+    auto flat_inner_dims = zero_t.flat_inner_dims<float, 5>();
+    EXPECT_EQ(3, flat_inner_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_dims.dimension(2));
+    EXPECT_EQ(0, flat_inner_dims.dimension(3));
+    EXPECT_EQ(5, flat_inner_dims.dimension(4));
+  }
+}
+
+TEST_F(TensorReshapeTest, FlatOuterDims) {
+  LOG(INFO) << "flat_outer_dims";
+  {
+    auto flat_outer_dims = t.flat_outer_dims<float>();
+    EXPECT_EQ(2, flat_outer_dims.dimension(0));
+    EXPECT_EQ(60, flat_outer_dims.dimension(1));
+    EXPECT_EQ(flat_outer_dims(0, 0), 0.01f);
+    EXPECT_EQ(flat_outer_dims(1, 59), 0.02f);
+  }
+  {
+    auto flat_outer_dims = t.flat_outer_dims<float, 3>();
+    EXPECT_EQ(2, flat_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_outer_dims.dimension(1));
+    EXPECT_EQ(20, flat_outer_dims.dimension(2));
+    EXPECT_EQ(flat_outer_dims(0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_outer_dims(1, 2, 19), 0.02f);
+  }
+  {
     auto flat_outer_dims = t.flat_outer_dims<float, 5>();
     EXPECT_EQ(2, flat_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_outer_dims.dimension(1));
@@ -317,7 +349,29 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_outer_dims(1, 2, 3, 4, 0), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
+    auto flat_outer_dims = zero_t.flat_outer_dims<float>();
+    EXPECT_EQ(3, flat_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_outer_dims.dimension(1));
+  }
+  {
+    auto flat_outer_dims = zero_t.flat_outer_dims<float, 3>();
+    EXPECT_EQ(3, flat_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_outer_dims.dimension(1));
+    EXPECT_EQ(0, flat_outer_dims.dimension(2));
+  }
+  {
+    auto flat_outer_dims = zero_t.flat_outer_dims<float, 5>();
+    EXPECT_EQ(3, flat_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_outer_dims.dimension(2));
+    EXPECT_EQ(0, flat_outer_dims.dimension(3));
+    EXPECT_EQ(5, flat_outer_dims.dimension(4));
+  }
+}
+
+TEST_F(TensorReshapeTest, FlatInnerOuterDims) {
+  LOG(INFO) << "flat_inner_outer_dims";
+  {
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 4>(0);
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
@@ -327,7 +381,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(1, 2, 3, 4), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 6>(-2);
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
@@ -339,7 +392,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 3, 4), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 6>(0);
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
@@ -351,7 +403,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(1, 2, 3, 4, 0, 0), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 8>(-2);
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
@@ -365,7 +416,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 3, 4, 0, 0), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 3>(1);
     EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
@@ -374,7 +424,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(5, 3, 4), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 5>(1);
     EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
@@ -385,7 +434,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(5, 3, 4, 0, 0), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 3>(0);
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
@@ -394,7 +442,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(1, 2, 19), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 5>(-2);
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
@@ -405,74 +452,24 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 19), 0.02f);
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 2>(1);
     EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(20, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(flat_inner_outer_dims(0, 0), 0.01f);
     EXPECT_EQ(flat_inner_outer_dims(5, 19), 0.02f);
   }
-
-  Tensor zero_t(DT_FLOAT, TensorShape({3, 0, 2, 0, 5}));
-  {
-    LOG(INFO) << "flat_outer_dims";
-    auto flat_outer_dims = zero_t.flat_outer_dims<float>();
-    EXPECT_EQ(3, flat_outer_dims.dimension(0));
-    EXPECT_EQ(0, flat_outer_dims.dimension(1));
-  }
-  {
-    LOG(INFO) << "flat_outer_dims";
-    auto flat_outer_dims = zero_t.flat_outer_dims<float, 3>();
-    EXPECT_EQ(3, flat_outer_dims.dimension(0));
-    EXPECT_EQ(0, flat_outer_dims.dimension(1));
-    EXPECT_EQ(0, flat_outer_dims.dimension(2));
-  }
-  {
-    LOG(INFO) << "flat_outer_dims";
-    auto flat_outer_dims = zero_t.flat_outer_dims<float, 5>();
-    EXPECT_EQ(3, flat_outer_dims.dimension(0));
-    EXPECT_EQ(0, flat_outer_dims.dimension(1));
-    EXPECT_EQ(2, flat_outer_dims.dimension(2));
-    EXPECT_EQ(0, flat_outer_dims.dimension(3));
-    EXPECT_EQ(5, flat_outer_dims.dimension(4));
-  }
-  {
-    LOG(INFO) << "flat_inner_dims";
-    auto flat_inner_dims = zero_t.flat_inner_dims<float>();
-    EXPECT_EQ(0, flat_inner_dims.dimension(0));
-    EXPECT_EQ(5, flat_inner_dims.dimension(1));
-  }
-  {
-    LOG(INFO) << "flat_inner_dims";
-    auto flat_inner_dims = zero_t.flat_inner_dims<float, 3>();
-    EXPECT_EQ(0, flat_inner_dims.dimension(0));
-    EXPECT_EQ(0, flat_inner_dims.dimension(1));
-    EXPECT_EQ(5, flat_inner_dims.dimension(2));
-  }
-  {
-    LOG(INFO) << "flat_inner_dims";
-    auto flat_inner_dims = zero_t.flat_inner_dims<float, 5>();
-    EXPECT_EQ(3, flat_inner_dims.dimension(0));
-    EXPECT_EQ(0, flat_inner_dims.dimension(1));
-    EXPECT_EQ(2, flat_inner_dims.dimension(2));
-    EXPECT_EQ(0, flat_inner_dims.dimension(3));
-    EXPECT_EQ(5, flat_inner_dims.dimension(4));
-  }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2>(0);
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(0);
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(2));
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 5>(0);
     EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
@@ -481,20 +478,17 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(5, flat_inner_outer_dims.dimension(4));
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2>(3);
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(5, flat_inner_outer_dims.dimension(1));
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(2);
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
     EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
   }
   {
-    LOG(INFO) << "flat_inner_outer_dims";
     auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(1);
     EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
     EXPECT_EQ(2, flat_inner_outer_dims.dimension(1));
-- 
GitLab


From 2d264f38fdf254caa340e7ddf35fd55289f15f69 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 20:56:13 -0800
Subject: [PATCH 0835/1563] Refactor training helper functions to separate
 library. Change: 154613254

---
 tensorflow/contrib/makefile/tf_op_files.txt   |   1 +
 tensorflow/core/kernels/BUILD                 |  16 +
 .../core/kernels/training_op_helpers.cc       |  96 ++++++
 tensorflow/core/kernels/training_op_helpers.h |  36 +++
 tensorflow/core/kernels/training_ops.cc       | 302 +++++++++---------
 tensorflow/core/kernels/training_ops.h        |   1 -
 6 files changed, 294 insertions(+), 158 deletions(-)
 create mode 100644 tensorflow/core/kernels/training_op_helpers.cc
 create mode 100644 tensorflow/core/kernels/training_op_helpers.h

diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index b727e2b888..a6d76548f4 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -4,6 +4,7 @@ tensorflow/core/kernels/variable_ops.cc
 tensorflow/core/kernels/unpack_op.cc
 tensorflow/core/kernels/transpose_op.cc
 tensorflow/core/kernels/transpose_functor_cpu.cc
+tensorflow/core/kernels/training_op_helpers.cc
 tensorflow/core/kernels/training_ops.cc
 tensorflow/core/kernels/topk_op.cc
 tensorflow/core/kernels/tile_ops.cc
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index f87e222afa..8140f5d67e 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -382,6 +382,19 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "training_op_helpers",
+    srcs = ["training_op_helpers.cc"],
+    hdrs = ["training_op_helpers.h"],
+    visibility = [":friends"],
+    deps = [
+        ":variable_ops",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//third_party/eigen3",
+    ],
+)
+
 cc_library(
     name = "bounds_check",
     hdrs = ["bounds_check.h"],
@@ -3498,6 +3511,7 @@ tf_kernel_library(
     prefix = "training_ops",
     deps = [
         ":bounds_check",
+        ":training_op_helpers",
         ":variable_ops",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
@@ -4039,6 +4053,7 @@ filegroup(
         "tensor_array.h",
         "tile_ops_cpu_impl.h",
         "tile_ops_impl.h",
+        "training_op_helpers.h",
         "training_ops.h",
         "transpose_functor.h",
         "transpose_op.h",
@@ -4176,6 +4191,7 @@ filegroup(
         "tile_ops_cpu_impl_6.cc",
         "tile_ops_cpu_impl_7.cc",
         "topk_op.cc",
+        "training_op_helpers.cc",
         "training_ops.cc",
         "transpose_functor_cpu.cc",
         "transpose_op.cc",
diff --git a/tensorflow/core/kernels/training_op_helpers.cc b/tensorflow/core/kernels/training_op_helpers.cc
new file mode 100644
index 0000000000..11d51188fc
--- /dev/null
+++ b/tensorflow/core/kernels/training_op_helpers.cc
@@ -0,0 +1,96 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/training_op_helpers.h"
+#include "tensorflow/core/kernels/variable_ops.h"
+
+namespace tensorflow {
+
+mutex* GetTrainingVariableMutex(OpKernelContext* ctx, int input) {
+  if (ctx->input_dtype(input) == DT_RESOURCE) {
+    Var* var;
+    if (LookupResource(ctx, HandleFromInput(ctx, input), &var).ok()) {
+      return var->mu();
+    } else {
+      ctx->CtxFailureWithWarning(
+          errors::Internal("Invalid variable reference."));
+      return nullptr;
+    }
+  }
+  return ctx->input_ref_mutex(input);
+}
+
+// MaybeLockVariableInputMutexesInOrder is a helper function to acquire mutexes
+// in address order to mitigate deadlock.  Returns a vector of acquired mutexes.
+// Safe to pass duplicates - will only lock each distinct mutex once.  If
+// do_lock is false, returns immediately.  Note that this silently doesn't lock
+// mutexes for invalid variable references; in all usages this is followed by
+// GetInputTensor which will signal a failure.
+std::vector<mutex_lock> MaybeLockVariableInputMutexesInOrder(
+    OpKernelContext* ctx, bool do_lock, const std::vector<int>& input_ids) {
+  std::vector<mutex_lock> locks;
+  if (!do_lock) {
+    return locks;
+  }
+  std::vector<mutex*> mutexes;
+  std::vector<int> acquire_order;
+  for (auto input : input_ids) {
+    mutex* mutex = GetTrainingVariableMutex(ctx, input);
+    // Only lock each mutex once if duplicates exist (n^2 but n is 2 or 3).
+    if (std::find(mutexes.begin(), mutexes.end(), mutex) == mutexes.end()) {
+      acquire_order.push_back(mutexes.size());
+      mutexes.push_back(mutex);
+    }
+  }
+  std::sort(acquire_order.begin(), acquire_order.end(),
+            [&mutexes](int a, int b) { return mutexes[a] < mutexes[b]; });
+
+  for (auto input : acquire_order) {
+    mutex* mu = GetTrainingVariableMutex(ctx, input);
+    if (mu != nullptr) {
+      locks.emplace_back(*mu);
+    }
+  }
+  return locks;
+}
+
+Status GetInputTensorFromVariable(OpKernelContext* ctx, int input,
+                                  bool lock_held, Tensor* out) {
+  if (ctx->input_dtype(input) == DT_RESOURCE) {
+    Var* var;
+    if (LookupResource(ctx, HandleFromInput(ctx, input), &var).ok()) {
+      if (lock_held) {
+        *out = *var->tensor();
+      } else {
+        mutex_lock ml(*var->mu());
+        *out = *var->tensor();
+      }
+      return Status::OK();
+    } else {
+      return errors::Internal("Invalid variable reference.");
+    }
+  }
+  *out = ctx->mutable_input(input, lock_held);
+  return Status::OK();
+}
+
+void MaybeForwardRefInputToRefOutput(OpKernelContext* ctx, int input,
+                                     int output) {
+  if (ctx->input_dtype(input) != DT_RESOURCE) {
+    ctx->forward_ref_input_to_ref_output(input, output);
+  }
+}
+
+}  // end namespace tensorflow
diff --git a/tensorflow/core/kernels/training_op_helpers.h b/tensorflow/core/kernels/training_op_helpers.h
new file mode 100644
index 0000000000..f2577d452f
--- /dev/null
+++ b/tensorflow/core/kernels/training_op_helpers.h
@@ -0,0 +1,36 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_KERNELS_TRAINING_OP_HELPERS_H_
+#define TENSORFLOW_KERNELS_TRAINING_OP_HELPERS_H_
+
+#include "tensorflow/core/framework/op_kernel.h"
+
+namespace tensorflow {
+
+mutex* GetTrainingVariableMutex(OpKernelContext* ctx, int input);
+
+std::vector<mutex_lock> MaybeLockVariableInputMutexesInOrder(
+    OpKernelContext* ctx, bool do_lock, const std::vector<int>& input_ids);
+
+Status GetInputTensorFromVariable(OpKernelContext* ctx, int input,
+                                  bool lock_held, Tensor* out);
+
+void MaybeForwardRefInputToRefOutput(OpKernelContext* ctx, int input,
+                                     int output);
+
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_KERNELS_TRAINING_OP_HELPERS_H_
diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index c7a5ea3a9c..3b2fa29693 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/kernels/training_op_helpers.h"
 #include "tensorflow/core/kernels/variable_ops.h"
 
 namespace tensorflow {
@@ -294,80 +295,6 @@ struct ApplyCenteredRMSProp<CPUDevice, T> {
 
 }  // namespace functor
 
-mutex* GetMutex(OpKernelContext* ctx, int input) {
-  if (ctx->input_dtype(input) == DT_RESOURCE) {
-    Var* var;
-    if (LookupResource(ctx, HandleFromInput(ctx, input), &var).ok()) {
-      return var->mu();
-    } else {
-      ctx->CtxFailureWithWarning(
-          errors::Internal("Invalid variable reference."));
-      return nullptr;
-    }
-  }
-  return ctx->input_ref_mutex(input);
-}
-
-// MaybeLockMutexesInOrder is a helper function to acquire mutexes in address
-// order to mitigate deadlock.  Returns a vector of acquired mutexes.  Safe to
-// pass duplicates - will only lock each distinct mutex once.  If do_lock is
-// false, returns immediately.  Note that this silently doesn't lock mutexes for
-// invalid variable references; in all usages this is followed by GetInputTensor
-// which will signal a failure.
-std::vector<mutex_lock> MaybeLockMutexesInOrder(
-    OpKernelContext* ctx, bool do_lock, const std::vector<int>& input_ids) {
-  std::vector<mutex_lock> locks;
-  if (!do_lock) {
-    return locks;
-  }
-  std::vector<mutex*> mutexes;
-  std::vector<int> acquire_order;
-  for (auto input : input_ids) {
-    mutex* mutex = GetMutex(ctx, input);
-    // Only lock each mutex once if duplicates exist (n^2 but n is 2 or 3).
-    if (std::find(mutexes.begin(), mutexes.end(), mutex) == mutexes.end()) {
-      acquire_order.push_back(input);
-      mutexes.push_back(mutex);
-    }
-  }
-  std::sort(acquire_order.begin(), acquire_order.end(),
-            [&mutexes](int a, int b) { return mutexes[a] < mutexes[b]; });
-
-  for (auto input : acquire_order) {
-    mutex* mu = GetMutex(ctx, input);
-    if (mu != nullptr) {
-      locks.emplace_back(*mu);
-    }
-  }
-  return locks;
-}
-
-Status GetInputTensor(OpKernelContext* ctx, int input, bool lock_held,
-                      Tensor* out) {
-  if (ctx->input_dtype(input) == DT_RESOURCE) {
-    Var* var;
-    if (LookupResource(ctx, HandleFromInput(ctx, input), &var).ok()) {
-      if (lock_held) {
-        *out = *var->tensor();
-      } else {
-        mutex_lock ml(*var->mu());
-        *out = *var->tensor();
-      }
-      return Status::OK();
-    } else {
-      return errors::Internal("Invalid variable reference.");
-    }
-  }
-  *out = ctx->mutable_input(input, lock_held);
-  return Status::OK();
-}
-
-void MaybeForwardRefInputToRefOutput(OpKernelContext* ctx, int input,
-                                     int output) {
-  if (ctx->input_dtype(input) != DT_RESOURCE) {
-    ctx->forward_ref_input_to_ref_output(input, output);
-  }
-}
 
 template <typename Device, typename T>
 class ApplyGradientDescentOp : public OpKernel {
@@ -377,9 +304,11 @@ class ApplyGradientDescentOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
 
     OP_REQUIRES(
         ctx, var.IsInitialized(),
@@ -461,7 +390,7 @@ class ApplyAdadeltaOp : public OpKernel {
 
   void Compute(OpKernelContext* ctx) override {
     if (use_exclusive_lock_) {
-      mutex_lock l1(*GetMutex(ctx, 0));
+      mutex_lock l1(*GetTrainingVariableMutex(ctx, 0));
       // Don't try to acquire a lock on the second ref as they share the same
       // mutex.
       //
@@ -482,12 +411,14 @@ class ApplyAdadeltaOp : public OpKernel {
 
   void DoValidate(OpKernelContext* ctx) {
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     Tensor accum_update;
-    OP_REQUIRES_OK(ctx,
-                   GetInputTensor(ctx, 2, use_exclusive_lock_, &accum_update));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_,
+                                                   &accum_update));
 
     OP_REQUIRES(
         ctx, var.IsInitialized(),
@@ -534,12 +465,14 @@ class ApplyAdadeltaOp : public OpKernel {
   void DoCompute(OpKernelContext* ctx) {
     const Device& device = ctx->template eigen_device<Device>();
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     Tensor accum_update;
-    OP_REQUIRES_OK(ctx,
-                   GetInputTensor(ctx, 2, use_exclusive_lock_, &accum_update));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_,
+                                                   &accum_update));
 
     const Tensor& lr = ctx->input(3);
     const Tensor& rho = ctx->input(4);
@@ -606,7 +539,7 @@ class SparseApplyAdadeltaOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    mutex* mu_var = GetMutex(ctx, 0);
+    mutex* mu_var = GetTrainingVariableMutex(ctx, 0);
     // mu_accum is actually the same mutex as mu_var since currently we use a
     // global mutex.
     //
@@ -615,13 +548,14 @@ class SparseApplyAdadeltaOp : public OpKernel {
       mu_var->lock();
     }
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum_grad;
-    OP_REQUIRES_OK(ctx,
-                   GetInputTensor(ctx, 1, use_exclusive_lock_, &accum_grad));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_,
+                                                   &accum_grad));
     Tensor accum_update;
-    OP_REQUIRES_OK(ctx,
-                   GetInputTensor(ctx, 2, use_exclusive_lock_, &accum_update));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_,
+                                                   &accum_update));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -756,9 +690,11 @@ class ApplyProximalGradientDescentOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
 
     OP_REQUIRES(
         ctx, var.IsInitialized(),
@@ -823,9 +759,11 @@ class SparseApplyProximalGradientDescentOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     OP_REQUIRES(ctx, TensorShapeUtils::IsVectorOrHigher(var.shape()),
                 errors::InvalidArgument("var must be at least 1 dimensional"));
 
@@ -965,11 +903,14 @@ class ApplyAdagradOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -1055,11 +996,14 @@ class ApplyProximalAdagradOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -1159,11 +1103,14 @@ class SparseApplyAdagradOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -1290,11 +1237,14 @@ class SparseApplyProximalAdagradOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -1459,15 +1409,17 @@ class ApplyAdagradDAOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
-    Tensor gradient_accum;
     OP_REQUIRES_OK(
-        ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &gradient_accum));
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
+    Tensor gradient_accum;
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_,
+                                                   &gradient_accum));
     Tensor gradient_squared_accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_,
-                                       &gradient_squared_accum));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_,
+                                                   &gradient_squared_accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -1559,15 +1511,17 @@ class SparseApplyAdagradDAOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
-    Tensor gradient_accum;
     OP_REQUIRES_OK(
-        ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &gradient_accum));
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
+    Tensor gradient_accum;
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_,
+                                                   &gradient_accum));
     Tensor gradient_squared_accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_,
-                                       &gradient_squared_accum));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_,
+                                                   &gradient_squared_accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -1753,14 +1707,18 @@ class ApplyFtrlOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     Tensor linear;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &linear));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_, &linear));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -1864,13 +1822,17 @@ class SparseApplyFtrlOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     Tensor linear;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &linear));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_, &linear));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -2070,12 +2032,15 @@ class ApplyMomentumOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -2170,12 +2135,15 @@ class SparseApplyMomentumOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
+    auto locks =
+        MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 1});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor accum;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &accum));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &accum));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -2283,14 +2251,18 @@ class ApplyAdamOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor m;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &m));
+    OP_REQUIRES_OK(ctx,
+                   GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &m));
     Tensor v;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &v));
+    OP_REQUIRES_OK(ctx,
+                   GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_, &v));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -2423,14 +2395,18 @@ class ApplyRMSPropOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor ms;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &ms));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &ms));
     Tensor mom;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &mom));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_, &mom));
 
     OP_REQUIRES(
         ctx, var.IsInitialized(),
@@ -2501,17 +2477,21 @@ class ApplyCenteredRMSPropOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks =
-        MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2, 3});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2, 3});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor mg;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &mg));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &mg));
     Tensor ms;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &ms));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_, &ms));
     Tensor mom;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 3, use_exclusive_lock_, &mom));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 3, use_exclusive_lock_, &mom));
 
     OP_REQUIRES(
         ctx, var.IsInitialized(),
@@ -2658,14 +2638,18 @@ class SparseApplyRMSPropOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor ms;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &ms));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &ms));
     Tensor mom;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &mom));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_, &mom));
 
     OP_REQUIRES(
         ctx, var.IsInitialized(),
@@ -2783,17 +2767,21 @@ class SparseApplyCenteredRMSPropOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override NO_THREAD_SAFETY_ANALYSIS {
-    auto locks =
-        MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0, 1, 2, 3});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_,
+                                                      {0, 1, 2, 3});
 
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     Tensor mg;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 1, use_exclusive_lock_, &mg));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 1, use_exclusive_lock_, &mg));
     Tensor ms;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 2, use_exclusive_lock_, &ms));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 2, use_exclusive_lock_, &ms));
     Tensor mom;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 3, use_exclusive_lock_, &mom));
+    OP_REQUIRES_OK(
+        ctx, GetInputTensorFromVariable(ctx, 3, use_exclusive_lock_, &mom));
 
     OP_REQUIRES(
         ctx, var.IsInitialized(),
diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index 6b599656ce..c96468b270 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -148,7 +148,6 @@ struct ApplyCenteredRMSProp {
                   typename TTypes<T>::ConstScalar epsilon,
                   typename TTypes<T>::ConstFlat grad);
 };
-
 }  // end namespace functor
 }  // end namespace tensorflow
 
-- 
GitLab


From 629fc4e2596f11f5f80da898bfd6a3828038c743 Mon Sep 17 00:00:00 2001
From: Xiang Gao <qasdfgtyuiop@gmail.com>
Date: Sat, 29 Apr 2017 01:51:25 -0400
Subject: [PATCH 0836/1563] switch back to InlinedVector

---
 tensorflow/core/framework/tensor.cc | 10 ++--------
 tensorflow/core/framework/tensor.h  |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tensorflow/core/framework/tensor.cc b/tensorflow/core/framework/tensor.cc
index 80001cf772..d049da1c9d 100644
--- a/tensorflow/core/framework/tensor.cc
+++ b/tensorflow/core/framework/tensor.cc
@@ -901,11 +901,8 @@ void Tensor::FillDescription(TensorDescription* description) const {
   }
 }
 
-gtl::ArraySlice<int64> Tensor::ComputeFlatInnerDims(
+gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
     gtl::ArraySlice<int64> orig, int64 num_out_dims) {
-  if (num_out_dims == orig.size()) {
-    return orig;
-  }
   gtl::InlinedVector<int64, 4> out_dims(num_out_dims, 0);
   int64 offset = orig.size() - num_out_dims;
   for (int64 out_dim = num_out_dims - 1; out_dim >= 0; --out_dim) {
@@ -918,11 +915,8 @@ gtl::ArraySlice<int64> Tensor::ComputeFlatInnerDims(
   return out_dims;
 }
 
-gtl::ArraySlice<int64> Tensor::ComputeFlatOuterDims(
+gtl::InlinedVector<int64, 4> Tensor::ComputeFlatOuterDims(
     gtl::ArraySlice<int64> orig, int64 num_out_dims) {
-  if (num_out_dims == orig.size()) {
-    return orig;
-  }
   gtl::InlinedVector<int64, 4> out_dims(num_out_dims, 0);
   for (int64 out_dim = 0; out_dim <= num_out_dims - 1; ++out_dim) {
     out_dims[out_dim] = out_dim >= orig.size() ? 1 : orig[out_dim];
diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 3891d0aebd..2e62016e1b 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -442,9 +442,9 @@ class Tensor {
       Eigen::array<Eigen::DenseIndex, NDIMS>* dims) const;
 
   // TensorShape's InlineVector.
-  static gtl::ArraySlice<int64> ComputeFlatInnerDims(
+  static gtl::InlinedVector<int64, 4> ComputeFlatInnerDims(
       gtl::ArraySlice<int64> orig, int64 num_out_dims);
-  static gtl::ArraySlice<int64> ComputeFlatOuterDims(
+  static gtl::InlinedVector<int64, 4> ComputeFlatOuterDims(
       gtl::ArraySlice<int64> orig, int64 num_out_dims);
 
   TensorShape shape_;
-- 
GitLab


From 1d679a04765c4cfa271335483fc28270834f43be Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Fri, 28 Apr 2017 21:26:21 -0800
Subject: [PATCH 0837/1563] Fix broken links to images, make all image links
 absolute.

Fixes #8064, fixes #7685.

(after docs republish)
Change: 154614227
---
 tensorflow/core/ops/array_ops.cc              | 156 +++++++++---------
 tensorflow/core/ops/data_flow_ops.cc          |   4 +-
 tensorflow/core/ops/resource_variable_ops.cc  |   2 +-
 tensorflow/core/ops/state_ops.cc              |   6 +-
 .../api_guides/python/contrib.integrate.md    |   2 +-
 tensorflow/docs_src/extend/architecture.md    |  16 +-
 tensorflow/docs_src/extend/estimators.md      |   2 +-
 .../docs_src/get_started/embedding_viz.md     |  12 +-
 .../docs_src/get_started/get_started.md       |   8 +-
 tensorflow/docs_src/get_started/graph_viz.md  |  48 +++---
 .../docs_src/get_started/mnist/beginners.md   |  16 +-
 .../docs_src/get_started/mnist/mechanics.md   |   6 +-
 tensorflow/docs_src/get_started/monitors.md   |   2 +-
 .../get_started/summaries_and_tensorboard.md  |   2 +-
 tensorflow/docs_src/get_started/tflearn.md    |   2 +-
 .../docs_src/performance/quantization.md      |   6 +-
 tensorflow/docs_src/performance/xla/index.md  |   2 +-
 tensorflow/docs_src/performance/xla/jit.md    |   6 +-
 .../performance/xla/operation_semantics.md    |  18 +-
 .../docs_src/programmers_guide/debugger.md    |  12 +-
 .../programmers_guide/reading_data.md         |   2 +-
 .../programmers_guide/threading_and_queues.md |   2 +-
 tensorflow/docs_src/tutorials/deep_cnn.md     |  14 +-
 .../docs_src/tutorials/image_recognition.md   |   6 +-
 .../docs_src/tutorials/image_retraining.md    |   4 +-
 tensorflow/docs_src/tutorials/layers.md       |   2 +-
 tensorflow/docs_src/tutorials/mandelbrot.md   |   2 +-
 tensorflow/docs_src/tutorials/pdes.md         |   2 +-
 tensorflow/docs_src/tutorials/seq2seq.md      |   4 +-
 .../docs_src/tutorials/wide_and_deep.md       |   3 +-
 tensorflow/docs_src/tutorials/word2vec.md     |  10 +-
 tensorflow/go/op/wrappers.go                  |  12 +-
 32 files changed, 195 insertions(+), 196 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index bbdcfd337e..e528ae47aa 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -209,7 +209,7 @@ The input tensors are all required to have size 1 in the first dimension.
 
 For example:
 
-```prettyprint
+```
 # 'x' is [[1, 4]]
 # 'y' is [[2, 5]]
 # 'z' is [[3, 6]]
@@ -277,7 +277,7 @@ Etc.
 
 For example:
 
-```prettyprint
+```
 # 'x' is [1, 4]
 # 'y' is [2, 5]
 # 'z' is [3, 6]
@@ -432,7 +432,7 @@ Computes offsets of concat inputs within its output.
 
 For example:
 
-```prettyprint
+```
 # 'x' is [2, 2, 7]
 # 'y' is [2, 3, 7]
 # 'z' is [2, 5, 7]
@@ -670,7 +670,7 @@ rank 2k with dimensions [D1,..., Dk, D1,..., Dk] where:
 
 For example:
 
-```prettyprint
+```
 # 'diagonal' is [1, 2, 3, 4]
 tf.diag(diagonal) ==> [[1, 0, 0, 0]
                        [0, 2, 0, 0]
@@ -722,7 +722,7 @@ tensor of rank `k` with dimensions `[D1,..., Dk]` where:
 
 For example:
 
-```prettyprint
+```
 # 'input' is [[1, 0, 0, 0]
               [0, 2, 0, 0]
               [0, 0, 3, 0]
@@ -768,7 +768,7 @@ tensor of rank `k+1` with dimensions [I, J, K, ..., N, N]` where:
 
 For example:
 
-```prettyprint
+```
 # 'diagonal' is [[1, 2, 3, 4], [5, 6, 7, 8]]
 
 and diagonal.shape = (2, 4)
@@ -880,7 +880,7 @@ The input must be at least a matrix.
 
 For example:
 
-```prettyprint
+```
 # 'input' is [[[1, 0, 0, 0]
                [0, 2, 0, 0]
                [0, 0, 3, 0]
@@ -927,7 +927,7 @@ The indicator function
 
 For example:
 
-```prettyprint
+```
 # if 'input' is [[ 0,  1,  2, 3]
                  [-1,  0,  1, 2]
                  [-2, -1,  0, 1]
@@ -946,7 +946,7 @@ tf.matrix_band_part(input, 2, 1) ==> [[ 0,  1,  0, 0]
 
 Useful special cases:
 
-```prettyprint
+```
  tf.matrix_band_part(input, 0, -1) ==> Upper triangular part.
  tf.matrix_band_part(input, -1, 0) ==> Lower triangular part.
  tf.matrix_band_part(input, 0, 0) ==> Diagonal.
@@ -998,7 +998,7 @@ of `tensor` must equal the number of elements in `dims`. In other words:
 
 For example:
 
-```prettyprint
+```
 # tensor 't' is [[[[ 0,  1,  2,  3],
 #                  [ 4,  5,  6,  7],
 #                  [ 8,  9, 10, 11]],
@@ -1074,7 +1074,7 @@ once, a InvalidArgument error is raised.
 
 For example:
 
-```prettyprint
+```
 # tensor 't' is [[[[ 0,  1,  2,  3],
 #                  [ 4,  5,  6,  7],
 #                  [ 8,  9, 10, 11]],
@@ -1245,7 +1245,7 @@ This operation creates a tensor of shape `dims` and fills it with `value`.
 
 For example:
 
-```prettyprint
+```
 # Output tensor has shape [2, 3].
 fill([2, 3], 9) ==> [[9, 9, 9]
                      [9, 9, 9]]
@@ -1354,7 +1354,7 @@ out-of-bound indices result in safe but unspecified behavior, which may include
 raising an error.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../../images/Gather.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/Gather.png" alt>
 </div>
 )doc");
 
@@ -1610,7 +1610,7 @@ implied by `shape` must be the same as the number of elements in `tensor`.
 
 For example:
 
-```prettyprint
+```
 # tensor 't' is [1, 2, 3, 4, 5, 6, 7, 8, 9]
 # tensor 't' has shape [9]
 reshape(t, [3, 3]) ==> [[1, 2, 3],
@@ -1697,7 +1697,7 @@ The values must include 0. There can be no duplicate values or negative values.
 
 For example:
 
-```prettyprint
+```
 # tensor `x` is [3, 4, 0, 2, 1]
 invert_permutation(x) ==> [2, 4, 3, 0, 1]
 ```
@@ -1802,7 +1802,7 @@ in the unique output `y`. In other words:
 
 For example:
 
-```prettyprint
+```
 # tensor 'x' is [1, 1, 2, 4, 4, 4, 7, 8, 8]
 y, idx = unique(x)
 y ==> [1, 2, 4, 7, 8]
@@ -1842,7 +1842,7 @@ contains the count of each element of `y` in `x`. In other words:
 
 For example:
 
-```prettyprint
+```
 # tensor 'x' is [1, 1, 2, 4, 4, 4, 7, 8, 8]
 y, idx, count = unique_with_counts(x)
 y ==> [1, 2, 4, 7, 8]
@@ -1887,7 +1887,7 @@ This operation returns a 1-D integer tensor representing the shape of `input`.
 
 For example:
 
-```prettyprint
+```
 # 't' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]
 shape(t) ==> [2, 2, 3]
 ```
@@ -1968,7 +1968,7 @@ slice `i`, with the first `seq_lengths[i]` slices along dimension
 
 For example:
 
-```prettyprint
+```
 # Given this:
 batch_dim = 0
 seq_dim = 1
@@ -1990,7 +1990,7 @@ output[3, 2:, :, ...] = input[3, 2:, :, ...]
 
 In contrast, if:
 
-```prettyprint
+```
 # Given this:
 batch_dim = 2
 seq_dim = 0
@@ -2031,7 +2031,7 @@ This operation returns an integer representing the rank of `input`.
 
 For example:
 
-```prettyprint
+```
 # 't' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]
 # shape of tensor 't' is [2, 2, 3]
 rank(t) ==> 3
@@ -2057,7 +2057,7 @@ This operation returns an integer representing the number of elements in
 
 For example:
 
-```prettyprint
+```
 # 't' is [[[1, 1,, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]]
 size(t) ==> 12
 ```
@@ -2290,7 +2290,7 @@ encoding is best understand by considering a non-trivial example. In
 particular,
 `foo[1, 2:4, None, ..., :-3:-1, :]` will be encoded as
 
-```prettyprint
+```
 begin = [1, 2, x, x, 0, x] # x denotes don't care (usually 0)
 end = [2, 4, x, x, -3, x]
 strides = [1, 1, x, x, -1, 1]
@@ -2512,7 +2512,7 @@ the output tensor can vary depending on how many true values there are in
 
 For example:
 
-```prettyprint
+```
 # 'input' tensor is [[True, False]
 #                    [True, False]]
 # 'input' has two true values, so output has two coordinates.
@@ -2616,7 +2616,7 @@ The padded size of each dimension D of the output is:
 
 For example:
 
-```prettyprint
+```
 # 't' is [[1, 1], [2, 2]]
 # 'paddings' is [[1, 1], [2, 2]]
 # rank of 't' is 2
@@ -2655,7 +2655,7 @@ The padded size of each dimension D of the output is:
 
 For example:
 
-```prettyprint
+```
 # 't' is [[1, 2, 3], [4, 5, 6]].
 # 'paddings' is [[1, 1]], [2, 2]].
 # 'mode' is SYMMETRIC.
@@ -2751,7 +2751,7 @@ The folded size of each dimension D of the output is:
 
 For example:
 
-```prettyprint
+```
 # 't' is [[1, 2, 3], [4, 5, 6], [7, 8, 9]].
 # 'paddings' is [[0, 1]], [0, 1]].
 # 'mode' is SYMMETRIC.
@@ -2927,7 +2927,7 @@ which will make the shape `[1, height, width, channels]`.
 
 Other examples:
 
-```prettyprint
+```
 # 't' is a tensor of shape [2]
 shape(expand_dims(t, 0)) ==> [1, 2]
 shape(expand_dims(t, 1)) ==> [2, 1]
@@ -3029,14 +3029,14 @@ dimensions, you can remove specific size 1 dimensions by specifying
 
 For example:
 
-```prettyprint
+```
 # 't' is a tensor of shape [1, 2, 1, 3, 1, 1]
 shape(squeeze(t)) ==> [2, 3]
 ```
 
 Or, to remove specific size 1 dimensions:
 
-```prettyprint
+```
 # 't' is a tensor of shape [1, 2, 1, 3, 1, 1]
 shape(squeeze(t, [2, 4])) ==> [1, 2, 3, 1]
 ```
@@ -3079,14 +3079,14 @@ position of each `out` element in `x`. In other words:
 
 For example, given this input:
 
-```prettyprint
+```
 x = [1, 2, 3, 4, 5, 6]
 y = [1, 3, 5]
 ```
 
 This operation would return:
 
-```prettyprint
+```
 out ==> [2, 4, 6]
 idx ==> [1, 3, 5]
 ```
@@ -3345,34 +3345,34 @@ Some examples:
 (1) For the following input of shape `[1, 2, 2, 1]`, `block_shape = [2, 2]`, and
     `paddings = [[0, 0], [0, 0]]`:
 
-```prettyprint
+```
 x = [[[[1], [2]], [[3], [4]]]]
 ```
 
 The output tensor has shape `[4, 1, 1, 1]` and value:
 
-```prettyprint
+```
 [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 ```
 
 (2) For the following input of shape `[1, 2, 2, 3]`, `block_shape = [2, 2]`, and
     `paddings = [[0, 0], [0, 0]]`:
 
-```prettyprint
+```
 x = [[[[1, 2, 3], [4, 5, 6]],
       [[7, 8, 9], [10, 11, 12]]]]
 ```
 
 The output tensor has shape `[4, 1, 1, 3]` and value:
 
-```prettyprint
+```
 [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 ```
 
 (3) For the following input of shape `[1, 4, 4, 1]`, `block_shape = [2, 2]`, and
     `paddings = [[0, 0], [0, 0]]`:
 
-```prettyprint
+```
 x = [[[[1],   [2],  [3],  [4]],
       [[5],   [6],  [7],  [8]],
       [[9],  [10], [11],  [12]],
@@ -3381,7 +3381,7 @@ x = [[[[1],   [2],  [3],  [4]],
 
 The output tensor has shape `[4, 2, 2, 1]` and value:
 
-```prettyprint
+```
 x = [[[[1], [3]], [[9], [11]]],
      [[[2], [4]], [[10], [12]]],
      [[[5], [7]], [[13], [15]]],
@@ -3391,7 +3391,7 @@ x = [[[[1], [3]], [[9], [11]]],
 (4) For the following input of shape `[2, 2, 4, 1]`, block_shape = `[2, 2]`, and
     paddings = `[[0, 0], [2, 0]]`:
 
-```prettyprint
+```
 x = [[[[1],   [2],  [3],  [4]],
       [[5],   [6],  [7],  [8]]],
      [[[9],  [10], [11],  [12]],
@@ -3400,7 +3400,7 @@ x = [[[[1],   [2],  [3],  [4]],
 
 The output tensor has shape `[8, 1, 3, 1]` and value:
 
-```prettyprint
+```
 x = [[[[0], [1], [3]]], [[[0], [9], [11]]],
      [[[0], [2], [4]]], [[[0], [10], [12]]],
      [[[0], [5], [7]]], [[[0], [13], [15]]],
@@ -3474,32 +3474,32 @@ Some examples:
 
 (1) For the following input of shape `[1, 2, 2, 1]` and block_size of 2:
 
-```prettyprint
+```
 x = [[[[1], [2]], [[3], [4]]]]
 ```
 
 The output tensor has shape `[4, 1, 1, 1]` and value:
 
-```prettyprint
+```
 [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 ```
 
 (2) For the following input of shape `[1, 2, 2, 3]` and block_size of 2:
 
-```prettyprint
+```
 x = [[[[1, 2, 3], [4, 5, 6]],
       [[7, 8, 9], [10, 11, 12]]]]
 ```
 
 The output tensor has shape `[4, 1, 1, 3]` and value:
 
-```prettyprint
+```
 [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 ```
 
 (3) For the following input of shape `[1, 4, 4, 1]` and block_size of 2:
 
-```prettyprint
+```
 x = [[[[1],   [2],  [3],  [4]],
       [[5],   [6],  [7],  [8]],
       [[9],  [10], [11],  [12]],
@@ -3508,7 +3508,7 @@ x = [[[[1],   [2],  [3],  [4]],
 
 The output tensor has shape `[4, 2, 2, 1]` and value:
 
-```prettyprint
+```
 x = [[[[1], [3]], [[9], [11]]],
      [[[2], [4]], [[10], [12]]],
      [[[5], [7]], [[13], [15]]],
@@ -3517,7 +3517,7 @@ x = [[[[1], [3]], [[9], [11]]],
 
 (4) For the following input of shape `[2, 2, 4, 1]` and block_size of 2:
 
-```prettyprint
+```
 x = [[[[1],   [2],  [3],  [4]],
       [[5],   [6],  [7],  [8]]],
      [[[9],  [10], [11],  [12]],
@@ -3526,7 +3526,7 @@ x = [[[[1],   [2],  [3],  [4]],
 
 The output tensor has shape `[8, 1, 2, 1]` and value:
 
-```prettyprint
+```
 x = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
      [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
 ```
@@ -3612,26 +3612,26 @@ Some examples:
 (1) For the following input of shape `[4, 1, 1, 1]`, `block_shape = [2, 2]`, and
     `crops = [[0, 0], [0, 0]]`:
 
-```prettyprint
+```
 [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 ```
 
 The output tensor has shape `[1, 2, 2, 1]` and value:
 
-```prettyprint
+```
 x = [[[[1], [2]], [[3], [4]]]]
 ```
 
 (2) For the following input of shape `[4, 1, 1, 3]`, `block_shape = [2, 2]`, and
     `crops = [[0, 0], [0, 0]]`:
 
-```prettyprint
+```
 [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 ```
 
 The output tensor has shape `[1, 2, 2, 3]` and value:
 
-```prettyprint
+```
 x = [[[[1, 2, 3], [4, 5, 6]],
       [[7, 8, 9], [10, 11, 12]]]]
 ```
@@ -3639,7 +3639,7 @@ x = [[[[1, 2, 3], [4, 5, 6]],
 (3) For the following input of shape `[4, 2, 2, 1]`, `block_shape = [2, 2]`, and
     `crops = [[0, 0], [0, 0]]`:
 
-```prettyprint
+```
 x = [[[[1], [3]], [[9], [11]]],
      [[[2], [4]], [[10], [12]]],
      [[[5], [7]], [[13], [15]]],
@@ -3648,7 +3648,7 @@ x = [[[[1], [3]], [[9], [11]]],
 
 The output tensor has shape `[1, 4, 4, 1]` and value:
 
-```prettyprint
+```
 x = [[[1],   [2],  [3],  [4]],
      [[5],   [6],  [7],  [8]],
      [[9],  [10], [11],  [12]],
@@ -3658,7 +3658,7 @@ x = [[[1],   [2],  [3],  [4]],
 (4) For the following input of shape `[8, 1, 3, 1]`, `block_shape = [2, 2]`, and
     `crops = [[0, 0], [2, 0]]`:
 
-```prettyprint
+```
 x = [[[[0], [1], [3]]], [[[0], [9], [11]]],
      [[[0], [2], [4]]], [[[0], [10], [12]]],
      [[[0], [5], [7]]], [[[0], [13], [15]]],
@@ -3667,7 +3667,7 @@ x = [[[[0], [1], [3]]], [[[0], [9], [11]]],
 
 The output tensor has shape `[2, 2, 4, 1]` and value:
 
-```prettyprint
+```
 x = [[[[1],   [2],  [3],  [4]],
       [[5],   [6],  [7],  [8]]],
      [[[9],  [10], [11],  [12]],
@@ -3732,32 +3732,32 @@ Some examples:
 
 (1) For the following input of shape `[4, 1, 1, 1]` and block_size of 2:
 
-```prettyprint
+```
 [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 ```
 
 The output tensor has shape `[1, 2, 2, 1]` and value:
 
-```prettyprint
+```
 x = [[[[1], [2]], [[3], [4]]]]
 ```
 
 (2) For the following input of shape `[4, 1, 1, 3]` and block_size of 2:
 
-```prettyprint
+```
 [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 ```
 
 The output tensor has shape `[1, 2, 2, 3]` and value:
 
-```prettyprint
+```
 x = [[[[1, 2, 3], [4, 5, 6]],
       [[7, 8, 9], [10, 11, 12]]]]
 ```
 
 (3) For the following input of shape `[4, 2, 2, 1]` and block_size of 2:
 
-```prettyprint
+```
 x = [[[[1], [3]], [[9], [11]]],
      [[[2], [4]], [[10], [12]]],
      [[[5], [7]], [[13], [15]]],
@@ -3766,7 +3766,7 @@ x = [[[[1], [3]], [[9], [11]]],
 
 The output tensor has shape `[1, 4, 4, 1]` and value:
 
-```prettyprint
+```
 x = [[[1],   [2],  [3],  [4]],
      [[5],   [6],  [7],  [8]],
      [[9],  [10], [11],  [12]],
@@ -3775,14 +3775,14 @@ x = [[[1],   [2],  [3],  [4]],
 
 (4) For the following input of shape `[8, 1, 2, 1]` and block_size of 2:
 
-```prettyprint
+```
 x = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
      [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
 ```
 
 The output tensor has shape `[2, 2, 4, 1]` and value:
 
-```prettyprint
+```
 x = [[[[1], [3]], [[5], [7]]],
      [[[2], [4]], [[10], [12]]],
      [[[5], [7]], [[13], [15]]],
@@ -3848,14 +3848,14 @@ purely convolutional models.
 
 For example, given this input of shape `[1, 2, 2, 1]`, and block_size of 2:
 
-```prettyprint
+```
 x = [[[[1], [2]],
       [[3], [4]]]]
 ```
 
 This operation will output a tensor of shape `[1, 1, 1, 4]`:
 
-```prettyprint
+```
 [[[[1, 2, 3, 4]]]]
 ```
 
@@ -3866,7 +3866,7 @@ The output element shape is `[1, 1, 4]`.
 
 For an input tensor with larger depth, here of shape `[1, 2, 2, 3]`, e.g.
 
-```prettyprint
+```
 x = [[[[1, 2, 3], [4, 5, 6]],
       [[7, 8, 9], [10, 11, 12]]]]
 ```
@@ -3874,13 +3874,13 @@ x = [[[[1, 2, 3], [4, 5, 6]],
 This operation, for block_size of 2, will return the following tensor of shape
 `[1, 1, 1, 12]`
 
-```prettyprint
+```
 [[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]
 ```
 
 Similarly, for the following input of shape `[1 4 4 1]`, and a block size of 2:
 
-```prettyprint
+```
 x = [[[[1],   [2],  [5],  [6]],
       [[3],   [4],  [7],  [8]],
       [[9],  [10], [13],  [14]],
@@ -3889,7 +3889,7 @@ x = [[[[1],   [2],  [5],  [6]],
 
 the operator will return the following tensor of shape `[1 2 2 4]`:
 
-```prettyprint
+```
 x = [[[[1, 2, 3, 4],
        [5, 6, 7, 8]],
       [[9, 10, 11, 12],
@@ -3958,14 +3958,14 @@ purely convolutional models.
 
 For example, given this input of shape `[1, 1, 1, 4]`, and a block size of 2:
 
-```prettyprint
+```
 x = [[[[1, 2, 3, 4]]]]
 
 ```
 
 This operation will output a tensor of shape `[1, 2, 2, 1]`:
 
-```prettyprint
+```
    [[[[1], [2]],
      [[3], [4]]]]
 ```
@@ -3977,14 +3977,14 @@ The output element shape is `[2, 2, 1]`.
 
 For an input tensor with larger depth, here of shape `[1, 1, 1, 12]`, e.g.
 
-```prettyprint
+```
 x = [[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]
 ```
 
 This operation, for block size of 2, will return the following tensor of shape
 `[1, 2, 2, 3]`
 
-```prettyprint
+```
    [[[[1, 2, 3], [4, 5, 6]],
      [[7, 8, 9], [10, 11, 12]]]]
 
@@ -3992,7 +3992,7 @@ This operation, for block size of 2, will return the following tensor of shape
 
 Similarly, for the following input of shape `[1 2 2 4]`, and a block size of 2:
 
-```prettyprint
+```
 x =  [[[[1, 2, 3, 4],
        [5, 6, 7, 8]],
       [[9, 10, 11, 12],
@@ -4001,7 +4001,7 @@ x =  [[[[1, 2, 3, 4],
 
 the operator will return the following tensor of shape `[1 4 4 1]`:
 
-```prettyprint
+```
 x = [[ [1],   [2],  [5],  [6]],
      [ [3],   [4],  [7],  [8]],
      [ [9],  [10], [13],  [14]],
@@ -4775,7 +4775,7 @@ index. For example, say we want to insert 4 scattered elements in a rank-1
 tensor with 8 elements.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/ScatterNd1.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/ScatterNd1.png" alt>
 </div>
 
 In Python, this scatter operation would look like this:
@@ -4798,7 +4798,7 @@ example, if we wanted to insert two slices in the first dimension of a
 rank-3 tensor with two matrices of new values.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/ScatterNd2.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/ScatterNd2.png" alt>
 </div>
 
 In Python, this scatter operation would look like this:
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index 8b9c92859d..b34dd4ae90 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -102,7 +102,7 @@ For example:
 ```
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/DynamicPartition.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/DynamicPartition.png" alt>
 </div>
 
 partitions: Any shape.  Indices in the range `[0, num_partitions)`.
@@ -190,7 +190,7 @@ For example:
 ```
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/DynamicStitch.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/DynamicStitch.png" alt>
 </div>
 )doc");
 
diff --git a/tensorflow/core/ops/resource_variable_ops.cc b/tensorflow/core/ops/resource_variable_ops.cc
index c190b81dde..c060aa6be9 100644
--- a/tensorflow/core/ops/resource_variable_ops.cc
+++ b/tensorflow/core/ops/resource_variable_ops.cc
@@ -295,7 +295,7 @@ the same location, their contributions add.
 Requires `updates.shape = indices.shape + ref.shape[1:]`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/ScatterAdd.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/ScatterAdd.png" alt>
 </div>
 
 resource: Should be from a `Variable` node.
diff --git a/tensorflow/core/ops/state_ops.cc b/tensorflow/core/ops/state_ops.cc
index cfb3ea7141..0890d5fc7c 100644
--- a/tensorflow/core/ops/state_ops.cc
+++ b/tensorflow/core/ops/state_ops.cc
@@ -288,7 +288,7 @@ for each value is undefined.
 Requires `updates.shape = indices.shape + ref.shape[1:]`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/ScatterUpdate.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/ScatterUpdate.png" alt>
 </div>
 
 ref: Should be from a `Variable` node.
@@ -332,7 +332,7 @@ the same location, their contributions add.
 Requires `updates.shape = indices.shape + ref.shape[1:]`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/ScatterAdd.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/ScatterAdd.png" alt>
 </div>
 
 ref: Should be from a `Variable` node.
@@ -376,7 +376,7 @@ the same location, their (negated) contributions add.
 Requires `updates.shape = indices.shape + ref.shape[1:]`.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/ScatterSub.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/ScatterSub.png" alt>
 </div>
 
 ref: Should be from a `Variable` node.
diff --git a/tensorflow/docs_src/api_guides/python/contrib.integrate.md b/tensorflow/docs_src/api_guides/python/contrib.integrate.md
index e6b730b203..e95b5a2e68 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.integrate.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.integrate.md
@@ -33,7 +33,7 @@ plt.plot(x, z)
 ```
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/lorenz_attractor.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/lorenz_attractor.png" alt>
 </div>
 
 ## Ops
diff --git a/tensorflow/docs_src/extend/architecture.md b/tensorflow/docs_src/extend/architecture.md
index 42721eb488..21816502ac 100644
--- a/tensorflow/docs_src/extend/architecture.md
+++ b/tensorflow/docs_src/extend/architecture.md
@@ -25,7 +25,7 @@ The TensorFlow runtime is a cross-platform library. Figure 1 illustrates its
 general architecture. A C API separates user level code in different languages
 from the core runtime.
 
-![TensorFlow Layers](../images/layers.png){: width="300"}
+![TensorFlow Layers](https://www.tensorflow.org/images/layers.png){: width="300"}
 
 **Figure 1**
 
@@ -57,7 +57,7 @@ Other tasks send updates to these parameters as they work on optimizing the
 parameters. This particular division of labor between tasks is not required, but
 it is common for distributed training.
 
-![TensorFlow Architecture Diagram](../images/diag1.svg){: width="500"}
+![TensorFlow Architecture Diagram](https://www.tensorflow.org/images/diag1.svg){: width="500"}
 
 **Figure 2**
 
@@ -91,7 +91,7 @@ In Figure 3, the client has built a graph that applies weights (w) to a
 feature vector (x), adds a bias term (b) and saves the result in a variable
 (s).
 
-![TensorFlow Architecture Diagram: Client](../images/graph_client.svg){: width="700"}
+![TensorFlow Architecture Diagram: Client](https://www.tensorflow.org/images/graph_client.svg){: width="700"}
 
 **Figure 3**
 
@@ -114,7 +114,7 @@ a step, it applies standard optimizations such as common subexpression
 elimination and constant folding. It then coordinates execution of the
 optimized subgraphs across a set of tasks.
 
-![TensorFlow Architecture Diagram: Master](../images/graph_master_cln.svg){: width="700"}
+![TensorFlow Architecture Diagram: Master](https://www.tensorflow.org/images/graph_master_cln.svg){: width="700"}
 
 **Figure 4**
 
@@ -123,7 +123,7 @@ Figure 5 shows a possible partition of our example graph. The distributed
 master has grouped the model parameters in order to place them together on the
 parameter server.
 
-![Partitioned Graph](../images/graph_split1.svg){: width="700"}
+![Partitioned Graph](https://www.tensorflow.org/images/graph_split1.svg){: width="700"}
 
 **Figure 5**
 
@@ -132,14 +132,14 @@ Where graph edges are cut by the partition, the distributed master inserts
 send and receive nodes to pass information between the distributed tasks
 (Figure 6).
 
-![Partitioned Graph](../images/graph_split2.svg){: width="700"}
+![Partitioned Graph](https://www.tensorflow.org/images/graph_split2.svg){: width="700"}
 
 **Figure 6**
 
 
 The distributed master then ships the graph pieces to the distributed tasks.
 
-![Partitioned Graph](../images/graph_workers_cln.svg){: width="700"}
+![Partitioned Graph](https://www.tensorflow.org/images/graph_workers_cln.svg){: width="700"}
 
 **Figure 7**
 
@@ -181,7 +181,7 @@ We also have preliminary support for NVIDIA's NCCL library for multi-GPU
 communication (see [`tf.contrib.nccl`](
 https://www.tensorflow.org/code/tensorflow/contrib/nccl/python/ops/nccl_ops.py)).
 
-![Partitioned Graph](../images/graph_send_recv.svg){: width="700"}
+![Partitioned Graph](https://www.tensorflow.org/images/graph_send_recv.svg){: width="700"}
 
 **Figure 8**
 
diff --git a/tensorflow/docs_src/extend/estimators.md b/tensorflow/docs_src/extend/estimators.md
index 28f62e01ab..c5444c59ca 100644
--- a/tensorflow/docs_src/extend/estimators.md
+++ b/tensorflow/docs_src/extend/estimators.md
@@ -72,7 +72,7 @@ for abalone:
 
 The label to predict is number of rings, as a proxy for abalone age.
 
-![Abalone shell](../images/abalone_shell.jpg) **[“Abalone
+![Abalone shell](https://www.tensorflow.org/abalone_shell.jpg) **[“Abalone
 shell”](https://www.flickr.com/photos/thenickster/16641048623/) (by [Nicki Dugan
 Pogue](https://www.flickr.com/photos/thenickster/), CC BY-SA 2.0)**
 
diff --git a/tensorflow/docs_src/get_started/embedding_viz.md b/tensorflow/docs_src/get_started/embedding_viz.md
index f512d5d809..84245b11be 100644
--- a/tensorflow/docs_src/get_started/embedding_viz.md
+++ b/tensorflow/docs_src/get_started/embedding_viz.md
@@ -21,7 +21,7 @@ interested in word embeddings,
 gives a good introduction.
 
 <video autoplay loop style="max-width: 100%;">
-  <source src="../images/embedding-mnist.mp4" type="video/mp4">
+  <source src="https://www.tensorflow.org/images/embedding-mnist.mp4" type="video/mp4">
   Sorry, your browser doesn't support HTML5 video in MP4 format.
 </video>
 
@@ -173,7 +173,7 @@ last data point in the bottom right:
 
 Note in the example above that the last row doesn't have to be filled. For a
 concrete example of a sprite, see
-[this sprite image](../images/mnist_10k_sprite.png) of 10,000 MNIST digits
+[this sprite image](https://www.tensorflow.org/images/mnist_10k_sprite.png) of 10,000 MNIST digits
 (100x100).
 
 Note: We currently support sprites up to 8192px X 8192px.
@@ -247,7 +247,7 @@ further analysis on their own with the "Isolate Points" button in the Inspector
 pane on the right hand side.
 
 
-![Selection of nearest neighbors](../images/embedding-nearest-points.png "Selection of nearest neighbors")
+![Selection of nearest neighbors](https://www.tensorflow.org/images/embedding-nearest-points.png "Selection of nearest neighbors")
 *Selection of the nearest neighbors of “important” in a word embedding dataset.*
 
 The combination of filtering with custom projection can be powerful. Below, we filtered
@@ -260,10 +260,10 @@ You can see that on the right side we have “ideas”, “science”, “perspe
 <table width="100%;">
   <tr>
     <td style="width: 30%;">
-      <img src="../images/embedding-custom-controls.png" alt="Custom controls panel" title="Custom controls panel" />
+      <img src="https://www.tensorflow.org/images/embedding-custom-controls.png" alt="Custom controls panel" title="Custom controls panel" />
     </td>
     <td style="width: 70%;">
-      <img src="../images/embedding-custom-projection.png" alt="Custom projection" title="Custom projection" />
+      <img src="https://www.tensorflow.org/images/embedding-custom-projection.png" alt="Custom projection" title="Custom projection" />
     </td>
   </tr>
   <tr>
@@ -284,4 +284,4 @@ projection) as a small file. The Projector can then be pointed to a set of one
 or more of these files, producing the panel below. Other users can then walk
 through a sequence of bookmarks.
 
-<img src="../images/embedding-bookmark.png" alt="Bookmark panel" style="width:300px;">
+<img src="https://www.tensorflow.org/images/embedding-bookmark.png" alt="Bookmark panel" style="width:300px;">
diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index 6bee7529d0..b52adc3790 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -123,7 +123,7 @@ TensorFlow provides a utility called TensorBoard that can display a picture of
 the computational graph. Here is a screenshot showing how TensorBoard
 visualizes the graph:
 
-![TensorBoard screenshot](../images/getting_started_add.png)
+![TensorBoard screenshot](https://www.tensorflow.org/images/getting_started_add.png)
 
 As it stands, this graph is not especially interesting because it always
 produces a constant result. A graph can be parameterized to accept external
@@ -154,7 +154,7 @@ resulting in the output
 
 In TensorBoard, the graph looks like this:
 
-![TensorBoard screenshot](../images/getting_started_adder.png)
+![TensorBoard screenshot](https://www.tensorflow.org/images/getting_started_adder.png)
 
 We can make the computational graph more complex by adding another operation.
 For example,
@@ -170,7 +170,7 @@ produces the output
 
 The preceding computational graph would look as follows in TensorBoard:
 
-![TensorBoard screenshot](../images/getting_started_triple.png)
+![TensorBoard screenshot](https://www.tensorflow.org/images/getting_started_triple.png)
 
 In machine learning we will typically want a model that can take arbitrary
 inputs, such as the one above.  To make the model trainable, we need to be able
@@ -336,7 +336,7 @@ program your loss will not be exactly the same, because the model is initialized
 with random values.
 
 This more complicated program can still be visualized in TensorBoard
-![TensorBoard final model visualization](../images/getting_started_final.png)
+![TensorBoard final model visualization](https://www.tensorflow.org/images/getting_started_final.png)
 
 ## `tf.contrib.learn`
 
diff --git a/tensorflow/docs_src/get_started/graph_viz.md b/tensorflow/docs_src/get_started/graph_viz.md
index b69103299e..06ec427b75 100644
--- a/tensorflow/docs_src/get_started/graph_viz.md
+++ b/tensorflow/docs_src/get_started/graph_viz.md
@@ -2,7 +2,7 @@
 
 TensorFlow computation graphs are powerful but complicated. The graph visualization can help you understand and debug them. Here's an example of the visualization at work.
 
-![Visualization of a TensorFlow graph](../images/graph_vis_animation.gif "Visualization of a TensorFlow graph")
+![Visualization of a TensorFlow graph](https://www.tensorflow.org/images/graph_vis_animation.gif "Visualization of a TensorFlow graph")
 *Visualization of a TensorFlow graph.*
 
 To see your own graph, run TensorBoard pointing it to the log directory of the job, click on the graph tab on the top pane and select the appropriate run using the menu at the upper left corner. For in depth information on how to run TensorBoard and make sure you are logging all the necessary information, see @{$summaries_and_tensorboard$TensorBoard: Visualizing Learning}.
@@ -43,10 +43,10 @@ expanded states.
 <table width="100%;">
   <tr>
     <td style="width: 50%;">
-      <img src="../images/pool1_collapsed.png" alt="Unexpanded name scope" title="Unexpanded name scope" />
+      <img src="https://www.tensorflow.org/images/pool1_collapsed.png" alt="Unexpanded name scope" title="Unexpanded name scope" />
     </td>
     <td style="width: 50%;">
-      <img src="../images/pool1_expanded.png" alt="Expanded name scope" title="Expanded name scope" />
+      <img src="https://www.tensorflow.org/images/pool1_expanded.png" alt="Expanded name scope" title="Expanded name scope" />
     </td>
   </tr>
   <tr>
@@ -87,10 +87,10 @@ and the auxiliary area.
 <table width="100%;">
   <tr>
     <td style="width: 50%;">
-      <img src="../images/conv_1.png" alt="conv_1 is part of the main graph" title="conv_1 is part of the main graph" />
+      <img src="https://www.tensorflow.org/images/conv_1.png" alt="conv_1 is part of the main graph" title="conv_1 is part of the main graph" />
     </td>
     <td style="width: 50%;">
-      <img src="../images/save.png" alt="save is extracted as auxiliary node" title="save is extracted as auxiliary node" />
+      <img src="https://www.tensorflow.org/images/save.png" alt="save is extracted as auxiliary node" title="save is extracted as auxiliary node" />
     </td>
   </tr>
   <tr>
@@ -114,10 +114,10 @@ specific set of nodes.
 <table width="100%;">
   <tr>
     <td style="width: 50%;">
-      <img src="../images/series.png" alt="Sequence of nodes" title="Sequence of nodes" />
+      <img src="https://www.tensorflow.org/images/series.png" alt="Sequence of nodes" title="Sequence of nodes" />
     </td>
     <td style="width: 50%;">
-      <img src="../images/series_expanded.png" alt="Expanded sequence of nodes" title="Expanded sequence of nodes" />
+      <img src="https://www.tensorflow.org/images/series_expanded.png" alt="Expanded sequence of nodes" title="Expanded sequence of nodes" />
     </td>
   </tr>
   <tr>
@@ -135,15 +135,15 @@ for constants and summary nodes. To summarize, here's a table of node symbols:
 
 Symbol | Meaning
 --- | ---
-![Name scope](../images/namespace_node.png "Name scope") | *High-level* node representing a name scope. Double-click to expand a high-level node.
-![Sequence of unconnected nodes](../images/horizontal_stack.png "Sequence of unconnected nodes") | Sequence of numbered nodes that are not connected to each other.
-![Sequence of connected nodes](../images/vertical_stack.png "Sequence of connected nodes") | Sequence of numbered nodes that are connected to each other.
-![Operation node](../images/op_node.png "Operation node") | An individual operation node.
-![Constant node](../images/constant.png "Constant node") | A constant.
-![Summary node](../images/summary.png "Summary node") | A summary node.
-![Data flow edge](../images/dataflow_edge.png "Data flow edge") | Edge showing the data flow between operations.
-![Control dependency edge](../images/control_edge.png "Control dependency edge") | Edge showing the control dependency between operations.
-![Reference edge](../images/reference_edge.png "Reference edge") | A reference edge showing that the outgoing operation node can mutate the incoming tensor.
+![Name scope](https://www.tensorflow.org/images/namespace_node.png "Name scope") | *High-level* node representing a name scope. Double-click to expand a high-level node.
+![Sequence of unconnected nodes](https://www.tensorflow.org/images/horizontal_stack.png "Sequence of unconnected nodes") | Sequence of numbered nodes that are not connected to each other.
+![Sequence of connected nodes](https://www.tensorflow.org/images/vertical_stack.png "Sequence of connected nodes") | Sequence of numbered nodes that are connected to each other.
+![Operation node](https://www.tensorflow.org/images/op_node.png "Operation node") | An individual operation node.
+![Constant node](https://www.tensorflow.org/images/constant.png "Constant node") | A constant.
+![Summary node](https://www.tensorflow.org/images/summary.png "Summary node") | A summary node.
+![Data flow edge](https://www.tensorflow.org/images/dataflow_edge.png "Data flow edge") | Edge showing the data flow between operations.
+![Control dependency edge](https://www.tensorflow.org/images/control_edge.png "Control dependency edge") | Edge showing the control dependency between operations.
+![Reference edge](https://www.tensorflow.org/images/reference_edge.png "Reference edge") | A reference edge showing that the outgoing operation node can mutate the incoming tensor.
 
 ## Interaction {#interaction}
 
@@ -161,10 +161,10 @@ right corner of the visualization.
 <table width="100%;">
   <tr>
     <td style="width: 50%;">
-      <img src="../images/infocard.png" alt="Info card of a name scope" title="Info card of a name scope" />
+      <img src="https://www.tensorflow.org/images/infocard.png" alt="Info card of a name scope" title="Info card of a name scope" />
     </td>
     <td style="width: 50%;">
-      <img src="../images/infocard_op.png" alt="Info card of operation node" title="Info card of operation node" />
+      <img src="https://www.tensorflow.org/images/infocard_op.png" alt="Info card of operation node" title="Info card of operation node" />
     </td>
   </tr>
   <tr>
@@ -207,10 +207,10 @@ The images below give an illustration for a piece of a real-life graph.
 <table width="100%;">
   <tr>
     <td style="width: 50%;">
-      <img src="../images/colorby_structure.png" alt="Color by structure" title="Color by structure" />
+      <img src="https://www.tensorflow.org/images/colorby_structure.png" alt="Color by structure" title="Color by structure" />
     </td>
     <td style="width: 50%;">
-      <img src="../images/colorby_device.png" alt="Color by device" title="Color by device" />
+      <img src="https://www.tensorflow.org/images/colorby_device.png" alt="Color by device" title="Color by device" />
     </td>
   </tr>
   <tr>
@@ -233,7 +233,7 @@ The images below show the CIFAR-10 model with tensor shape information:
 <table width="100%;">
   <tr>
     <td style="width: 100%;">
-      <img src="../images/tensor_shapes.png" alt="CIFAR-10 model with tensor shape information" title="CIFAR-10 model with tensor shape information" />
+      <img src="https://www.tensorflow.org/images/tensor_shapes.png" alt="CIFAR-10 model with tensor shape information" title="CIFAR-10 model with tensor shape information" />
     </td>
   </tr>
   <tr>
@@ -303,13 +303,13 @@ tensor output sizes.
 <table width="100%;">
   <tr style="height: 380px">
     <td>
-      <img src="../images/colorby_compute_time.png" alt="Color by compute time" title="Color by compute time"/>
+      <img src="https://www.tensorflow.org/images/colorby_compute_time.png" alt="Color by compute time" title="Color by compute time"/>
     </td>
     <td>
-      <img src="../images/run_metadata_graph.png" alt="Run metadata graph" title="Run metadata graph" />
+      <img src="https://www.tensorflow.org/images/run_metadata_graph.png" alt="Run metadata graph" title="Run metadata graph" />
     </td>
     <td>
-      <img src="../images/run_metadata_infocard.png" alt="Run metadata info card" title="Run metadata info card" />
+      <img src="https://www.tensorflow.org/images/run_metadata_infocard.png" alt="Run metadata info card" title="Run metadata info card" />
     </td>
   </tr>
 </table>
diff --git a/tensorflow/docs_src/get_started/mnist/beginners.md b/tensorflow/docs_src/get_started/mnist/beginners.md
index 2da2c19ea6..624d916474 100644
--- a/tensorflow/docs_src/get_started/mnist/beginners.md
+++ b/tensorflow/docs_src/get_started/mnist/beginners.md
@@ -15,7 +15,7 @@ MNIST is a simple computer vision dataset. It consists of images of handwritten
 digits like these:
 
 <div style="width:40%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/MNIST.png">
+<img style="width:100%" src="https://www.tensorflow.org/images/MNIST.png">
 </div>
 
 It also includes labels for each image, telling us which digit it is. For
@@ -88,7 +88,7 @@ Each image is 28 pixels by 28 pixels. We can interpret this as a big array of
 numbers:
 
 <div style="width:50%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/MNIST-Matrix.png">
+<img style="width:100%" src="https://www.tensorflow.org/images/MNIST-Matrix.png">
 </div>
 
 We can flatten this array into a vector of 28x28 = 784 numbers. It doesn't
@@ -110,7 +110,7 @@ Each entry in the tensor is a pixel intensity between 0 and 1, for a particular
 pixel in a particular image.
 
 <div style="width:40%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/mnist-train-xs.png">
+<img style="width:100%" src="https://www.tensorflow.org/images/mnist-train-xs.png">
 </div>
 
 Each image in MNIST has a corresponding label, a number between 0 and 9
@@ -124,7 +124,7 @@ vector which is 1 in the \\(n\\)th dimension. For example, 3 would be
 `[55000, 10]` array of floats.
 
 <div style="width:40%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/mnist-train-ys.png">
+<img style="width:100%" src="https://www.tensorflow.org/images/mnist-train-ys.png">
 </div>
 
 We're now ready to actually make our model!
@@ -157,7 +157,7 @@ classes. Red represents negative weights, while blue represents positive
 weights.
 
 <div style="width:40%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/softmax-weights.png">
+<img style="width:100%" src="https://www.tensorflow.org/images/softmax-weights.png">
 </div>
 
 We also add some extra evidence called a bias. Basically, we want to be able
@@ -202,13 +202,13 @@ although with a lot more \\(x\\)s. For each output, we compute a weighted sum of
 the \\(x\\)s, add a bias, and then apply softmax.
 
 <div style="width:55%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/softmax-regression-scalargraph.png">
+<img style="width:100%" src="https://www.tensorflow.org/images/softmax-regression-scalargraph.png">
 </div>
 
 If we write that out as equations, we get:
 
 <div style="width:52%; margin-left:25%; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/softmax-regression-scalarequation.png"
+<img style="width:100%" src="https://www.tensorflow.org/images/softmax-regression-scalarequation.png"
    alt="[y1, y2, y3] = softmax(W11*x1 + W12*x2 + W13*x3 + b1,  W21*x1 + W22*x2 + W23*x3 + b2,  W31*x1 + W32*x2 + W33*x3 + b3)">
 </div>
 
@@ -217,7 +217,7 @@ and vector addition. This is helpful for computational efficiency. (It's also
 a useful way to think.)
 
 <div style="width:50%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../../images/softmax-regression-vectorequation.png"
+<img style="width:100%" src="https://www.tensorflow.org/images/softmax-regression-vectorequation.png"
  alt="[y1, y2, y3] = softmax([[W11, W12, W13], [W21, W22, W23], [W31, W32, W33]]*[x1, x2, x3] + [b1, b2, b3])">
 </div>
 
diff --git a/tensorflow/docs_src/get_started/mnist/mechanics.md b/tensorflow/docs_src/get_started/mnist/mechanics.md
index b55a5c19ff..48d9a395f2 100644
--- a/tensorflow/docs_src/get_started/mnist/mechanics.md
+++ b/tensorflow/docs_src/get_started/mnist/mechanics.md
@@ -34,7 +34,7 @@ MNIST is a classic problem in machine learning. The problem is to look at
 greyscale 28x28 pixel images of handwritten digits and determine which digit
 the image represents, for all the digits from zero to nine.
 
-![MNIST Digits](../../images/mnist_digits.png "MNIST Digits")
+![MNIST Digits](https://www.tensorflow.org/images/mnist_digits.png "MNIST Digits")
 
 For more information, refer to [Yann LeCun's MNIST page](http://yann.lecun.com/exdb/mnist/)
 or [Chris Olah's visualizations of MNIST](http://colah.github.io/posts/2014-10-Visualizing-MNIST/).
@@ -90,7 +90,7 @@ loss.
 and apply gradients.
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../../images/mnist_subgraph.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/mnist_subgraph.png">
 </div>
 
 ### Inference
@@ -384,7 +384,7 @@ summary_writer.add_summary(summary_str, step)
 When the events files are written, TensorBoard may be run against the training
 folder to display the values from the summaries.
 
-![MNIST TensorBoard](../../images/mnist_tensorboard.png "MNIST TensorBoard")
+![MNIST TensorBoard](https://www.tensorflow.org/images/mnist_tensorboard.png "MNIST TensorBoard")
 
 **NOTE**: For more info about how to build and run Tensorboard, please see the accompanying tutorial @{$summaries_and_tensorboard$Tensorboard: Visualizing Learning}.
 
diff --git a/tensorflow/docs_src/get_started/monitors.md b/tensorflow/docs_src/get_started/monitors.md
index 7db88c8981..cb4ef70eeb 100644
--- a/tensorflow/docs_src/get_started/monitors.md
+++ b/tensorflow/docs_src/get_started/monitors.md
@@ -401,6 +401,6 @@ Then navigate to `http://0.0.0.0:`*`<port_number>`* in your browser, where
 If you click on the accuracy field, you'll see an image like the following,
 which shows accuracy plotted against step count:
 
-![Accuracy over step count in TensorBoard](../images/validation_monitor_tensorboard_accuracy.png "Accuracy over step count in TensorBoard")
+![Accuracy over step count in TensorBoard](https://www.tensorflow.org/images/validation_monitor_tensorboard_accuracy.png "Accuracy over step count in TensorBoard")
 
 For more on using TensorBoard, see @{$summaries_and_tensorboard$TensorBoard: Visualizing Learning} and @{$graph_viz$TensorBoard: Graph Visualization}.
diff --git a/tensorflow/docs_src/get_started/summaries_and_tensorboard.md b/tensorflow/docs_src/get_started/summaries_and_tensorboard.md
index 6e06c9e41e..45d43e7a6e 100644
--- a/tensorflow/docs_src/get_started/summaries_and_tensorboard.md
+++ b/tensorflow/docs_src/get_started/summaries_and_tensorboard.md
@@ -8,7 +8,7 @@ your TensorFlow graph, plot quantitative metrics about the execution of your
 graph, and show additional data like images that pass through it. When
 TensorBoard is fully configured, it looks like this:
 
-![MNIST TensorBoard](../images/mnist_tensorboard.png "MNIST TensorBoard")
+![MNIST TensorBoard](https://www.tensorflow.org/images/mnist_tensorboard.png "MNIST TensorBoard")
 
 <div class="video-wrapper">
   <iframe class="devsite-embedded-youtube-video" data-video-id="eBbEDRsCmv4"
diff --git a/tensorflow/docs_src/get_started/tflearn.md b/tensorflow/docs_src/get_started/tflearn.md
index 4a893e4a45..079349be32 100644
--- a/tensorflow/docs_src/get_started/tflearn.md
+++ b/tensorflow/docs_src/get_started/tflearn.md
@@ -118,7 +118,7 @@ The [Iris data set](https://en.wikipedia.org/wiki/Iris_flower_data_set) contains
 150 rows of data, comprising 50 samples from each of three related Iris species:
 *Iris setosa*, *Iris virginica*, and *Iris versicolor*.
 
-![Petal geometry compared for three iris species: Iris setosa, Iris virginica, and Iris versicolor](../images/iris_three_species.jpg) **From left to right,
+![Petal geometry compared for three iris species: Iris setosa, Iris virginica, and Iris versicolor](https://www.tensorflow.org/images/iris_three_species.jpg) **From left to right,
 [*Iris setosa*](https://commons.wikimedia.org/w/index.php?curid=170298) (by
 [Radomil](https://commons.wikimedia.org/wiki/User:Radomil), CC BY-SA 3.0),
 [*Iris versicolor*](https://commons.wikimedia.org/w/index.php?curid=248095) (by
diff --git a/tensorflow/docs_src/performance/quantization.md b/tensorflow/docs_src/performance/quantization.md
index ad23bab443..49c25027fc 100644
--- a/tensorflow/docs_src/performance/quantization.md
+++ b/tensorflow/docs_src/performance/quantization.md
@@ -143,13 +143,13 @@ conversion functions before and after to move the data between float and
 eight-bit. Below is an example of what they look like. First here's the original
 Relu operation, with float inputs and outputs:
 
-![Relu Diagram](https://www.tensorflow.org/../images/quantization0.png)
+![Relu Diagram](https://www.tensorflow.org/images/quantization0.png)
 
 Then, this is the equivalent converted subgraph, still with float inputs and
 outputs, but with internal conversions so the calculations are done in eight
 bit.
 
-![Converted Diagram](https://www.tensorflow.org/../images/quantization1.png)
+![Converted Diagram](https://www.tensorflow.org/images/quantization1.png)
 
 The min and max operations actually look at the values in the input float
 tensor, and then feeds them into the Dequantize operation that converts the
@@ -162,7 +162,7 @@ operations that all have float equivalents, then there will be a lot of adjacent
 Dequantize/Quantize ops. This stage spots that pattern, recognizes that they
 cancel each other out, and removes them, like this:
 
-![Stripping Diagram](https://www.tensorflow.org/../images/quantization2.png)
+![Stripping Diagram](https://www.tensorflow.org/images/quantization2.png)
 
 Applied on a large scale to models where all of the operations have quantized
 equivalents, this gives a graph where all of the tensor calculations are done in
diff --git a/tensorflow/docs_src/performance/xla/index.md b/tensorflow/docs_src/performance/xla/index.md
index 9c23e79845..d2c1843327 100644
--- a/tensorflow/docs_src/performance/xla/index.md
+++ b/tensorflow/docs_src/performance/xla/index.md
@@ -62,7 +62,7 @@ well as the NVIDIA GPU backend are in the TensorFlow source tree.
 The following diagram shows the compilation process in XLA:
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img src="../../images/how-does-xla-work.png">
+  <img src="https://www.tensorflow.org/images/how-does-xla-work.png">
 </div>
 
 XLA comes with several optimizations and analyses that are target-independent,
diff --git a/tensorflow/docs_src/performance/xla/jit.md b/tensorflow/docs_src/performance/xla/jit.md
index 4d2a643b7f..d4dc3e57c8 100644
--- a/tensorflow/docs_src/performance/xla/jit.md
+++ b/tensorflow/docs_src/performance/xla/jit.md
@@ -124,7 +124,7 @@ open the timeline file created when the script finishes: `timeline.ctf.json`.
 The rendered timeline should look similar to the picture below with multiple
 green boxes labeled `MatMul`, possibly across multiple CPUs.
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../../images/jit_timeline_gpu.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/jit_timeline_gpu.png">
 </div>
 
 ### Step #3 Run with XLA
@@ -139,7 +139,7 @@ TF_XLA_FLAGS=--xla_generate_hlo_graph=.* python mnist_softmax_xla.py
 Open the timeline file created (`timeline.ctf.json`).  The rendered timeline
 should look similar to the picture below with one long bar labeled `_XlaLaunch`.
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../../images/jit_timeline_gpu_xla.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/jit_timeline_gpu_xla.png">
 </div>
 
 To understand what is happening in `_XlaLaunch`, look at the console output for
@@ -165,5 +165,5 @@ dot -Tpng hlo_graph_80.dot -o hlo_graph_80.png
 
 The result will look like the following:
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../../images/jit_gpu_xla_graph.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/jit_gpu_xla_graph.png">
 </div>
diff --git a/tensorflow/docs_src/performance/xla/operation_semantics.md b/tensorflow/docs_src/performance/xla/operation_semantics.md
index d5eeb5d7d5..424c994e72 100644
--- a/tensorflow/docs_src/performance/xla/operation_semantics.md
+++ b/tensorflow/docs_src/performance/xla/operation_semantics.md
@@ -178,7 +178,7 @@ Concat({a, b}, 0)
 
 Diagram:
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../../images/ops_concatenate.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/ops_concatenate.png">
 </div>
 
 ## ConvertElementType
@@ -707,7 +707,7 @@ are all 0. Figure below shows examples of different `edge_padding` and
 `interior_padding` values for a two dimensional array.
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../../images/ops_pad.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/ops_pad.png">
 </div>
 
 ## Reduce
@@ -781,13 +781,13 @@ Here's an example of reducing a 2D array (matrix). The shape has rank 2,
 dimension 0 of size 2 and dimension 1 of size 3:
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:35%" src="../../images/ops_2d_matrix.png">
+  <img style="width:35%" src="https://www.tensorflow.org/images/ops_2d_matrix.png">
 </div>
 
 Results of reducing dimensions 0 or 1 with an "add" function:
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:35%" src="../../images/ops_reduce_from_2d_matrix.png">
+  <img style="width:35%" src="https://www.tensorflow.org/images/ops_reduce_from_2d_matrix.png">
 </div>
 
 Note that both reduction results are 1D arrays. The diagram shows one as column
@@ -798,7 +798,7 @@ size 4, dimension 1 of size 2 and dimension 2 of size 3. For simplicity, the
 values 1 to 6 are replicated across dimension 0.
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:35%" src="../../images/ops_reduce_from_3d_matrix.png">
+  <img style="width:35%" src="https://www.tensorflow.org/images/ops_reduce_from_3d_matrix.png">
 </div>
 
 Similarly to the 2D example, we can reduce just one dimension. If we reduce
@@ -890,7 +890,7 @@ builder.ReduceWindow(
 ```
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:35%" src="../../images/ops_reduce_window.png">
+  <img style="width:35%" src="https://www.tensorflow.org/images/ops_reduce_window.png">
 </div>
 
 Stride of 1 in a dimension specifies that the position of a window in the
@@ -902,7 +902,7 @@ are the same as though the input came in with the dimensions it has after
 padding.
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:75%" src="../../images/ops_reduce_window_stride.png">
+  <img style="width:75%" src="https://www.tensorflow.org/images/ops_reduce_window_stride.png">
 </div>
 
 The evaluation order of the reduction function is arbitrary and may be
@@ -1144,7 +1144,7 @@ addition `scatter` function produces the output element of value 8 (2 + 6).
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
   <img style="width:100%"
-    src="../../images/ops_scatter_to_selected_window_element.png">
+    src="https://www.tensorflow.org/images/ops_scatter_to_selected_window_element.png">
 </div>
 
 The evaluation order of the `scatter` function is arbitrary and may be
@@ -1482,5 +1482,5 @@ while (result(0) < 1000) {
 ```
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../../images/ops_while.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/ops_while.png">
 </div>
diff --git a/tensorflow/docs_src/programmers_guide/debugger.md b/tensorflow/docs_src/programmers_guide/debugger.md
index 7801fadb47..78819969b7 100644
--- a/tensorflow/docs_src/programmers_guide/debugger.md
+++ b/tensorflow/docs_src/programmers_guide/debugger.md
@@ -24,7 +24,7 @@ This code trains a simple NN for MNIST digit image recognition. Notice that the
 accuracy increases slightly after the first training step, but then gets stuck
 at a low (near-chance) level:
 
-![debug_mnist training fails](../images/tfdbg_screenshot_mnist_symptom.png)
+![debug_mnist training fails](https://www.tensorflow.org/images/tfdbg_screenshot_mnist_symptom.png)
 
 Scratching your head, you suspect that certain nodes in the training graph
 generated bad numeric values such as `inf`s and `nan`s. The computation-graph
@@ -89,7 +89,7 @@ The debug wrapper session will prompt you when it is about to execute the first
 `run()` call, with information regarding the fetched tensor and feed
 dictionaries displayed on the screen.
 
-![tfdbg run-start UI](../images/tfdbg_screenshot_run_start.png)
+![tfdbg run-start UI](https://www.tensorflow.org/images/tfdbg_screenshot_run_start.png)
 
 This is what we refer to as the *run-start UI*. If the screen size is
 too small to display the content of the message in its entirety, you can resize
@@ -108,7 +108,7 @@ intermediate tensors from the run. (These tensors can also be obtained by
 running the command `lt` after you executed `run`.) This is called the
 **run-end UI**:
 
-![tfdbg run-end UI: accuracy](../images/tfdbg_screenshot_run_end_accuracy.png)
+![tfdbg run-end UI: accuracy](https://www.tensorflow.org/images/tfdbg_screenshot_run_end_accuracy.png)
 
 ### tfdbg CLI Frequently-Used Commands
 
@@ -181,7 +181,7 @@ screen with a red-colored title line indicating **tfdbg** stopped immediately
 after a `run()` call generated intermediate tensors that passed the specified
 filter `has_inf_or_nan`:
 
-![tfdbg run-end UI: infs and nans](../images/tfdbg_screenshot_run_end_inf_nan.png)
+![tfdbg run-end UI: infs and nans](https://www.tensorflow.org/images/tfdbg_screenshot_run_end_inf_nan.png)
 
 As the screen display indicates, the `has_inf_or_nan` filter is first passed
 during the fourth `run()` call: an [Adam optimizer](https://arxiv.org/abs/1412.6980)
@@ -220,7 +220,7 @@ item on the top or entering the equivalent command:
 tfdbg> ni cross_entropy/Log
 ```
 
-![tfdbg run-end UI: infs and nans](../images/tfdbg_screenshot_run_end_node_info.png)
+![tfdbg run-end UI: infs and nans](https://www.tensorflow.org/images/tfdbg_screenshot_run_end_node_info.png)
 
 You can see that this node has the op type `Log`
 and that its input is the node `softmax/Softmax`. Run the following command to
@@ -263,7 +263,7 @@ simply click the underlined line numbers in the stack trace output of the
 `ni -t <op_name>` commands, or use the `ps` (or `print_source`) command such as:
 `ps /path/to/source.py`. See the screenshot below for an example of `ps` output:
 
-![tfdbg run-end UI: annotated Python source file](../images/tfdbg_screenshot_run_end_annotated_source.png)
+![tfdbg run-end UI: annotated Python source file](https://www.tensorflow.org/images/tfdbg_screenshot_run_end_annotated_source.png)
 
 Apply a value clipping on the input to @{tf.log}
 to resolve this problem:
diff --git a/tensorflow/docs_src/programmers_guide/reading_data.md b/tensorflow/docs_src/programmers_guide/reading_data.md
index c0a50a1518..088724337e 100644
--- a/tensorflow/docs_src/programmers_guide/reading_data.md
+++ b/tensorflow/docs_src/programmers_guide/reading_data.md
@@ -309,7 +309,7 @@ operations, so that our training loop can dequeue examples from the example
 queue.
 
 <div style="width:70%; margin-left:12%; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/AnimatedFileQueues.gif">
+<img style="width:100%" src="https://www.tensorflow.org/images/AnimatedFileQueues.gif">
 </div>
 
 The helpers in `tf.train` that create these queues and enqueuing operations add
diff --git a/tensorflow/docs_src/programmers_guide/threading_and_queues.md b/tensorflow/docs_src/programmers_guide/threading_and_queues.md
index 1999cf6941..835e806046 100644
--- a/tensorflow/docs_src/programmers_guide/threading_and_queues.md
+++ b/tensorflow/docs_src/programmers_guide/threading_and_queues.md
@@ -14,7 +14,7 @@ that takes an item off the queue, adds one to that item, and puts it back on the
 end of the queue. Slowly, the numbers on the queue increase.
 
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/IncremeterFifoQueue.gif">
+<img style="width:100%" src="https://www.tensorflow.org/images/IncremeterFifoQueue.gif">
 </div>
 
 `Enqueue`, `EnqueueMany`, and `Dequeue` are special nodes. They take a pointer
diff --git a/tensorflow/docs_src/tutorials/deep_cnn.md b/tensorflow/docs_src/tutorials/deep_cnn.md
index bcdeb90ebe..d6a136fee4 100644
--- a/tensorflow/docs_src/tutorials/deep_cnn.md
+++ b/tensorflow/docs_src/tutorials/deep_cnn.md
@@ -141,7 +141,7 @@ so that we may visualize them in @{$summaries_and_tensorboard$TensorBoard}.
 This is a good practice to verify that inputs are built correctly.
 
 <div style="width:50%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:70%" src="../images/cifar_image_summary.png">
+  <img style="width:70%" src="https://www.tensorflow.org/images/cifar_image_summary.png">
 </div>
 
 Reading images from disk and distorting them can use a non-trivial amount of
@@ -170,7 +170,7 @@ Layer Name | Description
 Here is a graph generated from TensorBoard describing the inference operation:
 
 <div style="width:15%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/cifar_graph.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/cifar_graph.png">
 </div>
 
 > **EXERCISE**: The output of `inference` are un-normalized logits. Try editing
@@ -205,7 +205,7 @@ loss and all these weight decay terms, as returned by the `loss()` function.
 
 We visualize it in TensorBoard with a @{tf.summary.scalar}:
 
-![CIFAR-10 Loss](../images/cifar_loss.png "CIFAR-10 Total Loss")
+![CIFAR-10 Loss](https://www.tensorflow.org/images/cifar_loss.png "CIFAR-10 Total Loss")
 
 We train the model using standard
 [gradient descent](https://en.wikipedia.org/wiki/Gradient_descent)
@@ -214,7 +214,7 @@ with a learning rate that
 @{tf.train.exponential_decay$exponentially decays}
 over time.
 
-![CIFAR-10 Learning Rate Decay](../images/cifar_lr_decay.png "CIFAR-10 Learning Rate Decay")
+![CIFAR-10 Learning Rate Decay](https://www.tensorflow.org/images/cifar_lr_decay.png "CIFAR-10 Learning Rate Decay")
 
 The `train()` function adds the operations needed to minimize the objective by
 calculating the gradient and updating the learned variables (see
@@ -295,8 +295,8 @@ For instance, we can watch how the distribution of activations and degree of
 sparsity in `local3` features evolve during training:
 
 <div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px; display: flex; flex-direction: row">
-  <img style="flex-grow:1; flex-shrink:1;" src="../images/cifar_sparsity.png">
-  <img style="flex-grow:1; flex-shrink:1;" src="../images/cifar_activations.png">
+  <img style="flex-grow:1; flex-shrink:1;" src="https://www.tensorflow.org/images/cifar_sparsity.png">
+  <img style="flex-grow:1; flex-shrink:1;" src="https://www.tensorflow.org/images/cifar_activations.png">
 </div>
 
 Individual loss functions, as well as the total loss, are particularly
@@ -378,7 +378,7 @@ processing a batch of data.
 Here is a diagram of this model:
 
 <div style="width:40%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/Parallelism.png">
+  <img style="width:100%" src="https://www.tensorflow.org/images/Parallelism.png">
 </div>
 
 Note that each GPU computes inference as well as the gradients for a unique
diff --git a/tensorflow/docs_src/tutorials/image_recognition.md b/tensorflow/docs_src/tutorials/image_recognition.md
index bf03427fc5..88ae451cd5 100644
--- a/tensorflow/docs_src/tutorials/image_recognition.md
+++ b/tensorflow/docs_src/tutorials/image_recognition.md
@@ -36,7 +36,7 @@ images into [1000 classes], like "Zebra", "Dalmatian", and "Dishwasher".
 For example, here are the results from [AlexNet] classifying some images:
 
 <div style="width:50%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/AlexClassification.png">
+<img style="width:100%" src="https://www.tensorflow.org/images/AlexClassification.png">
 </div>
 
 To compare models, we examine how often the model fails to predict the
@@ -75,7 +75,7 @@ Start by cloning the [TensorFlow models repo](https://github.com/tensorflow/mode
 The above command will classify a supplied image of a panda bear.
 
 <div style="width:15%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/cropped_panda.jpg">
+  <img style="width:100%" src="https://www.tensorflow.org/images/cropped_panda.jpg">
 </div>
 
 If the model runs correctly, the script will produce the following output:
@@ -137,7 +137,7 @@ score of 0.8.
 
 
 <div style="width:45%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/grace_hopper.jpg">
+  <img style="width:100%" src="https://www.tensorflow.org/images/grace_hopper.jpg">
 </div>
 
 Next, try it out on your own images by supplying the --image= argument, e.g.
diff --git a/tensorflow/docs_src/tutorials/image_retraining.md b/tensorflow/docs_src/tutorials/image_retraining.md
index c42bb8a023..a65b5845cf 100644
--- a/tensorflow/docs_src/tutorials/image_retraining.md
+++ b/tensorflow/docs_src/tutorials/image_retraining.md
@@ -18,7 +18,7 @@ to help control the training process.
 
 ## Training on Flowers
 
-![Daisies by Kelly Sikkema](../images/daisies.jpg)
+![Daisies by Kelly Sikkema](https://www.tensorflow.org/images/daisies.jpg)
 [Image by Kelly Sikkema](https://www.flickr.com/photos/95072945@N05/9922116524/)
 
 Before you start any training, you'll need a set of images to teach the network
@@ -174,7 +174,7 @@ you do that and pass the root folder of the subdirectories as the argument to
 Here's what the folder structure of the flowers archive looks like, to give you
 and example of the kind of layout the script is looking for:
 
-![Folder Structure](../images/folder_structure.png)
+![Folder Structure](https://www.tensorflow.org/images/folder_structure.png)
 
 In practice it may take some work to get the accuracy you want. I'll try to
 guide you through some of the common problems you might encounter below.
diff --git a/tensorflow/docs_src/tutorials/layers.md b/tensorflow/docs_src/tutorials/layers.md
index 0429c7f346..aa8e2cc839 100644
--- a/tensorflow/docs_src/tutorials/layers.md
+++ b/tensorflow/docs_src/tutorials/layers.md
@@ -7,7 +7,7 @@ activation functions, and applying dropout regularization. In this tutorial,
 you'll learn how to use `layers` to build a convolutional neural network model
 to recognize the handwritten digits in the MNIST data set.
 
-![handwritten digits 0–9 from the MNIST data set](../images/mnist_0-9.png)
+![handwritten digits 0–9 from the MNIST data set](https://www.tensorflow.org/images/mnist_0-9.png)
 
 **The [MNIST dataset](http://yann.lecun.com/exdb/mnist/) comprises 60,000
 training examples and 10,000 test examples of the handwritten digits 0–9,
diff --git a/tensorflow/docs_src/tutorials/mandelbrot.md b/tensorflow/docs_src/tutorials/mandelbrot.md
index 7d8abbdcba..1c0a548129 100755
--- a/tensorflow/docs_src/tutorials/mandelbrot.md
+++ b/tensorflow/docs_src/tutorials/mandelbrot.md
@@ -109,7 +109,7 @@ Let's see what we've got.
 DisplayFractal(ns.eval())
 ```
 
-![jpeg](../images/mandelbrot_output.jpg)
+![jpeg](https://www.tensorflow.org/images/mandelbrot_output.jpg)
 
 Not bad!
 
diff --git a/tensorflow/docs_src/tutorials/pdes.md b/tensorflow/docs_src/tutorials/pdes.md
index ec6915074b..425e8d7084 100755
--- a/tensorflow/docs_src/tutorials/pdes.md
+++ b/tensorflow/docs_src/tutorials/pdes.md
@@ -93,7 +93,7 @@ for n in range(40):
 DisplayArray(u_init, rng=[-0.1, 0.1])
 ```
 
-![jpeg](../images/pde_output_1.jpg)
+![jpeg](https://www.tensorflow.org/images/pde_output_1.jpg)
 
 
 Now let's specify the details of the differential equation.
diff --git a/tensorflow/docs_src/tutorials/seq2seq.md b/tensorflow/docs_src/tutorials/seq2seq.md
index a3db3e51cf..6ffe3e8b03 100644
--- a/tensorflow/docs_src/tutorials/seq2seq.md
+++ b/tensorflow/docs_src/tutorials/seq2seq.md
@@ -40,7 +40,7 @@ networks (RNNs): an *encoder* that processes the input and a *decoder* that
 generates the output. This basic architecture is depicted below.
 
 <div style="width:80%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/basic_seq2seq.png" />
+<img style="width:100%" src="https://www.tensorflow.org/images/basic_seq2seq.png" />
 </div>
 
 Each box in the picture above represents a cell of the RNN, most commonly
@@ -62,7 +62,7 @@ decoding step. A multi-layer sequence-to-sequence network with LSTM cells and
 attention mechanism in the decoder looks like this.
 
 <div style="width:80%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/attention_seq2seq.png" />
+<img style="width:100%" src="https://www.tensorflow.org/images/attention_seq2seq.png" />
 </div>
 
 ## TensorFlow seq2seq library
diff --git a/tensorflow/docs_src/tutorials/wide_and_deep.md b/tensorflow/docs_src/tutorials/wide_and_deep.md
index bae934b3f4..fda78f47c4 100644
--- a/tensorflow/docs_src/tutorials/wide_and_deep.md
+++ b/tensorflow/docs_src/tutorials/wide_and_deep.md
@@ -17,8 +17,7 @@ large-scale regression and classification problems with sparse input features
 you're interested in learning more about how Wide & Deep Learning works, please
 check out our [research paper](http://arxiv.org/abs/1606.07792).
 
-![Wide & Deep Spectrum of Models]
-(../images/wide_n_deep.svg "Wide & Deep")
+![Wide & Deep Spectrum of Models](https://www.tensorflow.org/images/wide_n_deep.svg "Wide & Deep")
 
 The figure above shows a comparison of a wide model (logistic regression with
 sparse features and transformations), a deep model (feed-forward neural network
diff --git a/tensorflow/docs_src/tutorials/word2vec.md b/tensorflow/docs_src/tutorials/word2vec.md
index 1b25cb9e89..348e069ed6 100644
--- a/tensorflow/docs_src/tutorials/word2vec.md
+++ b/tensorflow/docs_src/tutorials/word2vec.md
@@ -51,7 +51,7 @@ means that we may need more data in order to successfully train statistical
 models.  Using vector representations can overcome some of these obstacles.
 
 <div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/audio-image-text.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/audio-image-text.png" alt>
 </div>
 
 [Vector space models](https://en.wikipedia.org/wiki/Vector_space_model) (VSMs)
@@ -125,7 +125,7 @@ probability using the score for all other \\(V\\) words \\(w'\\) in the current
 context \\(h\\), *at every training step*.
 
 <div style="width:60%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/softmax-nplm.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/softmax-nplm.png" alt>
 </div>
 
 On the other hand, for feature learning in word2vec we do not need a full
@@ -136,7 +136,7 @@ same context. We illustrate this below for a CBOW model. For skip-gram the
 direction is simply inverted.
 
 <div style="width:60%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/nce-nplm.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/nce-nplm.png" alt>
 </div>
 
 Mathematically, the objective (for each example) is to maximize
@@ -233,7 +233,7 @@ below (see also for example
 [Mikolov et al., 2013](http://www.aclweb.org/anthology/N13-1090)).
 
 <div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/linear-relationships.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/linear-relationships.png" alt>
 </div>
 
 This explains why these vectors are also useful as features for many canonical
@@ -335,7 +335,7 @@ After training has finished we can visualize the learned embeddings using
 t-SNE.
 
 <div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
-<img style="width:100%" src="../images/tsne.png" alt>
+<img style="width:100%" src="https://www.tensorflow.org/images/tsne.png" alt>
 </div>
 
 Et voila! As expected, words that are similar end up clustering nearby each
diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 8a34791fff..eff6719467 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -57,7 +57,7 @@ func makeOutputList(op *tf.Operation, start int, output string) ([]tf.Output, in
 // Requires `updates.shape = indices.shape + ref.shape[1:]`.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/ScatterAdd.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/ScatterAdd.png" alt>
 // </div>
 //
 // Arguments:
@@ -3161,7 +3161,7 @@ func SpaceToDepth(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 // tensor with 8 elements.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/ScatterNd1.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/ScatterNd1.png" alt>
 // </div>
 //
 // In Python, this scatter operation would look like this:
@@ -3184,7 +3184,7 @@ func SpaceToDepth(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 // rank-3 tensor with two matrices of new values.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/ScatterNd2.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/ScatterNd2.png" alt>
 // </div>
 //
 // In Python, this scatter operation would look like this:
@@ -4940,7 +4940,7 @@ func TensorArrayGatherV2(scope *Scope, handle tf.Output, indices tf.Output, flow
 // ```
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/DynamicStitch.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/DynamicStitch.png" alt>
 // </div>
 func DynamicStitch(scope *Scope, indices []tf.Output, data []tf.Output) (merged tf.Output) {
 	if scope.Err() != nil {
@@ -13758,7 +13758,7 @@ func GatherValidateIndices(value bool) GatherAttr {
 // raising an error.
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../../images/Gather.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/Gather.png" alt>
 // </div>
 func Gather(scope *Scope, params tf.Output, indices tf.Output, optional ...GatherAttr) (output tf.Output) {
 	if scope.Err() != nil {
@@ -19994,7 +19994,7 @@ func Sum(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ..
 // ```
 //
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="../../images/DynamicPartition.png" alt>
+// <img style="width:100%" src="https://www.tensorflow.org/images/DynamicPartition.png" alt>
 // </div>
 //
 // Arguments:
-- 
GitLab


From 5652c3418b5b323fd1f386679b2188e2bdbb575c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 21:48:56 -0800
Subject: [PATCH 0838/1563] Update ops-related pbtxt files. Change: 154614872

---
 tensorflow/core/ops/ops.pbtxt | 80 +++++++++++++++++------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 0e1192d3ed..630f255d0f 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -3212,7 +3212,7 @@ op {
   }
   output_arg {
     name: "output"
-    description: "4-D with shape `[batch, height, width, depth]`, where:\n\n      height = height_pad - crop_top - crop_bottom\n      width = width_pad - crop_left - crop_right\n\nThe attr `block_size` must be greater than one. It indicates the block size.\n\nSome examples:\n\n(1) For the following input of shape `[4, 1, 1, 1]` and block_size of 2:\n\n```prettyprint\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 1]` and value:\n\n```prettyprint\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\n(2) For the following input of shape `[4, 1, 1, 3]` and block_size of 2:\n\n```prettyprint\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 3]` and value:\n\n```prettyprint\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\n(3) For the following input of shape `[4, 2, 2, 1]` and block_size of 2:\n\n```prettyprint\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\nThe output tensor has shape `[1, 4, 4, 1]` and value:\n\n```prettyprint\nx = [[[1],   [2],  [3],  [4]],\n     [[5],   [6],  [7],  [8]],\n     [[9],  [10], [11],  [12]],\n     [[13], [14], [15],  [16]]]\n```\n\n(4) For the following input of shape `[8, 1, 2, 1]` and block_size of 2:\n\n```prettyprint\nx = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],\n     [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]\n```\n\nThe output tensor has shape `[2, 2, 4, 1]` and value:\n\n```prettyprint\nx = [[[[1], [3]], [[5], [7]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```"
+    description: "4-D with shape `[batch, height, width, depth]`, where:\n\n      height = height_pad - crop_top - crop_bottom\n      width = width_pad - crop_left - crop_right\n\nThe attr `block_size` must be greater than one. It indicates the block size.\n\nSome examples:\n\n(1) For the following input of shape `[4, 1, 1, 1]` and block_size of 2:\n\n```\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 1]` and value:\n\n```\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\n(2) For the following input of shape `[4, 1, 1, 3]` and block_size of 2:\n\n```\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 3]` and value:\n\n```\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\n(3) For the following input of shape `[4, 2, 2, 1]` and block_size of 2:\n\n```\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\nThe output tensor has shape `[1, 4, 4, 1]` and value:\n\n```\nx = [[[1],   [2],  [3],  [4]],\n     [[5],   [6],  [7],  [8]],\n     [[9],  [10], [11],  [12]],\n     [[13], [14], [15],  [16]]]\n```\n\n(4) For the following input of shape `[8, 1, 2, 1]` and block_size of 2:\n\n```\nx = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],\n     [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]\n```\n\nThe output tensor has shape `[2, 2, 4, 1]` and value:\n\n```\nx = [[[[1], [3]], [[5], [7]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```"
     type_attr: "T"
   }
   attr {
@@ -3255,7 +3255,7 @@ op {
   }
   input_arg {
     name: "crops"
-    description: "2-D with shape `[M, 2]`, all values must be >= 0.\n  `crops[i] = [crop_start, crop_end]` specifies the amount to crop from input\n  dimension `i + 1`, which corresponds to spatial dimension `i`.  It is\n  required that\n  `crop_start[i] + crop_end[i] <= block_shape[i] * input_shape[i + 1]`.\n\nThis operation is equivalent to the following steps:\n\n1. Reshape `input` to `reshaped` of shape:\n     [block_shape[0], ..., block_shape[M-1],\n      batch / prod(block_shape),\n      input_shape[1], ..., input_shape[N-1]]\n\n2. Permute dimensions of `reshaped` to produce `permuted` of shape\n     [batch / prod(block_shape),\n\n      input_shape[1], block_shape[0],\n      ...,\n      input_shape[M], block_shape[M-1],\n\n      input_shape[M+1], ..., input_shape[N-1]]\n\n3. Reshape `permuted` to produce `reshaped_permuted` of shape\n     [batch / prod(block_shape),\n\n      input_shape[1] * block_shape[0],\n      ...,\n      input_shape[M] * block_shape[M-1],\n\n      input_shape[M+1],\n      ...,\n      input_shape[N-1]]\n\n4. Crop the start and end of dimensions `[1, ..., M]` of\n   `reshaped_permuted` according to `crops` to produce the output of shape:\n     [batch / prod(block_shape),\n\n      input_shape[1] * block_shape[0] - crops[0,0] - crops[0,1],\n      ...,\n      input_shape[M] * block_shape[M-1] - crops[M-1,0] - crops[M-1,1],\n\n      input_shape[M+1], ..., input_shape[N-1]]\n\nSome examples:\n\n(1) For the following input of shape `[4, 1, 1, 1]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [0, 0]]`:\n\n```prettyprint\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 1]` and value:\n\n```prettyprint\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\n(2) For the following input of shape `[4, 1, 1, 3]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [0, 0]]`:\n\n```prettyprint\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 3]` and value:\n\n```prettyprint\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\n(3) For the following input of shape `[4, 2, 2, 1]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [0, 0]]`:\n\n```prettyprint\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\nThe output tensor has shape `[1, 4, 4, 1]` and value:\n\n```prettyprint\nx = [[[1],   [2],  [3],  [4]],\n     [[5],   [6],  [7],  [8]],\n     [[9],  [10], [11],  [12]],\n     [[13], [14], [15],  [16]]]\n```\n\n(4) For the following input of shape `[8, 1, 3, 1]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [2, 0]]`:\n\n```prettyprint\nx = [[[[0], [1], [3]]], [[[0], [9], [11]]],\n     [[[0], [2], [4]]], [[[0], [10], [12]]],\n     [[[0], [5], [7]]], [[[0], [13], [15]]],\n     [[[0], [6], [8]]], [[[0], [14], [16]]]]\n```\n\nThe output tensor has shape `[2, 2, 4, 1]` and value:\n\n```prettyprint\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]]],\n     [[[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```"
+    description: "2-D with shape `[M, 2]`, all values must be >= 0.\n  `crops[i] = [crop_start, crop_end]` specifies the amount to crop from input\n  dimension `i + 1`, which corresponds to spatial dimension `i`.  It is\n  required that\n  `crop_start[i] + crop_end[i] <= block_shape[i] * input_shape[i + 1]`.\n\nThis operation is equivalent to the following steps:\n\n1. Reshape `input` to `reshaped` of shape:\n     [block_shape[0], ..., block_shape[M-1],\n      batch / prod(block_shape),\n      input_shape[1], ..., input_shape[N-1]]\n\n2. Permute dimensions of `reshaped` to produce `permuted` of shape\n     [batch / prod(block_shape),\n\n      input_shape[1], block_shape[0],\n      ...,\n      input_shape[M], block_shape[M-1],\n\n      input_shape[M+1], ..., input_shape[N-1]]\n\n3. Reshape `permuted` to produce `reshaped_permuted` of shape\n     [batch / prod(block_shape),\n\n      input_shape[1] * block_shape[0],\n      ...,\n      input_shape[M] * block_shape[M-1],\n\n      input_shape[M+1],\n      ...,\n      input_shape[N-1]]\n\n4. Crop the start and end of dimensions `[1, ..., M]` of\n   `reshaped_permuted` according to `crops` to produce the output of shape:\n     [batch / prod(block_shape),\n\n      input_shape[1] * block_shape[0] - crops[0,0] - crops[0,1],\n      ...,\n      input_shape[M] * block_shape[M-1] - crops[M-1,0] - crops[M-1,1],\n\n      input_shape[M+1], ..., input_shape[N-1]]\n\nSome examples:\n\n(1) For the following input of shape `[4, 1, 1, 1]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [0, 0]]`:\n\n```\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 1]` and value:\n\n```\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\n(2) For the following input of shape `[4, 1, 1, 3]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [0, 0]]`:\n\n```\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\nThe output tensor has shape `[1, 2, 2, 3]` and value:\n\n```\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\n(3) For the following input of shape `[4, 2, 2, 1]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [0, 0]]`:\n\n```\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\nThe output tensor has shape `[1, 4, 4, 1]` and value:\n\n```\nx = [[[1],   [2],  [3],  [4]],\n     [[5],   [6],  [7],  [8]],\n     [[9],  [10], [11],  [12]],\n     [[13], [14], [15],  [16]]]\n```\n\n(4) For the following input of shape `[8, 1, 3, 1]`, `block_shape = [2, 2]`, and\n    `crops = [[0, 0], [2, 0]]`:\n\n```\nx = [[[[0], [1], [3]]], [[[0], [9], [11]]],\n     [[[0], [2], [4]]], [[[0], [10], [12]]],\n     [[[0], [5], [7]]], [[[0], [13], [15]]],\n     [[[0], [6], [8]]], [[[0], [14], [16]]]]\n```\n\nThe output tensor has shape `[2, 2, 4, 1]` and value:\n\n```\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]]],\n     [[[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```"
     type_attr: "Tcrops"
   }
   output_arg {
@@ -4103,7 +4103,7 @@ op {
     minimum: 2
   }
   summary: "Computes offsets of concat inputs within its output."
-  description: "For example:\n\n```prettyprint\n# \'x\' is [2, 2, 7]\n# \'y\' is [2, 3, 7]\n# \'z\' is [2, 5, 7]\nconcat_offset(2, [x, y, z]) => [0, 0, 0], [0, 2, 0], [0, 5, 0]\n```"
+  description: "For example:\n\n```\n# \'x\' is [2, 2, 7]\n# \'y\' is [2, 3, 7]\n# \'z\' is [2, 5, 7]\nconcat_offset(2, [x, y, z]) => [0, 0, 0], [0, 2, 0], [0, 5, 0]\n```"
 }
 op {
   name: "ConcatV2"
@@ -5810,7 +5810,7 @@ op {
     minimum: 2
   }
   summary: "DepthToSpace for tensors of type T."
-  description: "Rearranges data from depth into blocks of spatial data.\nThis is the reverse transformation of SpaceToDepth. More specifically,\nthis op outputs a copy of the input tensor where values from the `depth`\ndimension are moved in spatial blocks to the `height` and `width` dimensions.\nThe attr `block_size` indicates the input block size and how the data is moved.\n\n  * Chunks of data of size `block_size * block_size` from depth are rearranged\n    into non-overlapping blocks of size `block_size x block_size`\n  * The width the output tensor is `input_depth * block_size`, whereas the\n    height is `input_height * block_size`.\n  * The depth of the input tensor must be divisible by\n    `block_size * block_size`.\n\nThat is, assuming the input is in the shape:\n`[batch, height, width, depth]`,\nthe shape of the output will be:\n`[batch, height*block_size, width*block_size, depth/(block_size*block_size)]`\n\nThis operation requires that the input tensor be of rank 4, and that\n`block_size` be >=1 and that `block_size * block_size` be a divisor of the\ninput depth.\n\nThis operation is useful for resizing the activations between convolutions\n(but keeping all data), e.g. instead of pooling. It is also useful for training\npurely convolutional models.\n\nFor example, given this input of shape `[1, 1, 1, 4]`, and a block size of 2:\n\n```prettyprint\nx = [[[[1, 2, 3, 4]]]]\n\n```\n\nThis operation will output a tensor of shape `[1, 2, 2, 1]`:\n\n```prettyprint\n   [[[[1], [2]],\n     [[3], [4]]]]\n```\n\nHere, the input has a batch of 1 and each batch element has shape `[1, 1, 4]`,\nthe corresponding output will have 2x2 elements and will have a depth of\n1 channel (1 = `4 / (block_size * block_size)`).\nThe output element shape is `[2, 2, 1]`.\n\nFor an input tensor with larger depth, here of shape `[1, 1, 1, 12]`, e.g.\n\n```prettyprint\nx = [[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]\n```\n\nThis operation, for block size of 2, will return the following tensor of shape\n`[1, 2, 2, 3]`\n\n```prettyprint\n   [[[[1, 2, 3], [4, 5, 6]],\n     [[7, 8, 9], [10, 11, 12]]]]\n\n```\n\nSimilarly, for the following input of shape `[1 2 2 4]`, and a block size of 2:\n\n```prettyprint\nx =  [[[[1, 2, 3, 4],\n       [5, 6, 7, 8]],\n      [[9, 10, 11, 12],\n       [13, 14, 15, 16]]]]\n```\n\nthe operator will return the following tensor of shape `[1 4 4 1]`:\n\n```prettyprint\nx = [[ [1],   [2],  [5],  [6]],\n     [ [3],   [4],  [7],  [8]],\n     [ [9],  [10], [13],  [14]],\n     [ [11], [12], [15],  [16]]]\n\n```"
+  description: "Rearranges data from depth into blocks of spatial data.\nThis is the reverse transformation of SpaceToDepth. More specifically,\nthis op outputs a copy of the input tensor where values from the `depth`\ndimension are moved in spatial blocks to the `height` and `width` dimensions.\nThe attr `block_size` indicates the input block size and how the data is moved.\n\n  * Chunks of data of size `block_size * block_size` from depth are rearranged\n    into non-overlapping blocks of size `block_size x block_size`\n  * The width the output tensor is `input_depth * block_size`, whereas the\n    height is `input_height * block_size`.\n  * The depth of the input tensor must be divisible by\n    `block_size * block_size`.\n\nThat is, assuming the input is in the shape:\n`[batch, height, width, depth]`,\nthe shape of the output will be:\n`[batch, height*block_size, width*block_size, depth/(block_size*block_size)]`\n\nThis operation requires that the input tensor be of rank 4, and that\n`block_size` be >=1 and that `block_size * block_size` be a divisor of the\ninput depth.\n\nThis operation is useful for resizing the activations between convolutions\n(but keeping all data), e.g. instead of pooling. It is also useful for training\npurely convolutional models.\n\nFor example, given this input of shape `[1, 1, 1, 4]`, and a block size of 2:\n\n```\nx = [[[[1, 2, 3, 4]]]]\n\n```\n\nThis operation will output a tensor of shape `[1, 2, 2, 1]`:\n\n```\n   [[[[1], [2]],\n     [[3], [4]]]]\n```\n\nHere, the input has a batch of 1 and each batch element has shape `[1, 1, 4]`,\nthe corresponding output will have 2x2 elements and will have a depth of\n1 channel (1 = `4 / (block_size * block_size)`).\nThe output element shape is `[2, 2, 1]`.\n\nFor an input tensor with larger depth, here of shape `[1, 1, 1, 12]`, e.g.\n\n```\nx = [[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]\n```\n\nThis operation, for block size of 2, will return the following tensor of shape\n`[1, 2, 2, 3]`\n\n```\n   [[[[1, 2, 3], [4, 5, 6]],\n     [[7, 8, 9], [10, 11, 12]]]]\n\n```\n\nSimilarly, for the following input of shape `[1 2 2 4]`, and a block size of 2:\n\n```\nx =  [[[[1, 2, 3, 4],\n       [5, 6, 7, 8]],\n      [[9, 10, 11, 12],\n       [13, 14, 15, 16]]]]\n```\n\nthe operator will return the following tensor of shape `[1 4 4 1]`:\n\n```\nx = [[ [1],   [2],  [5],  [6]],\n     [ [3],   [4],  [7],  [8]],\n     [ [9],  [10], [13],  [14]],\n     [ [11], [12], [15],  [16]]]\n\n```"
 }
 op {
   name: "DepthwiseConv2dNative"
@@ -6123,7 +6123,7 @@ op {
     }
   }
   summary: "Returns a diagonal tensor with a given diagonal values."
-  description: "Given a `diagonal`, this operation returns a tensor with the `diagonal` and\neverything else padded with zeros. The diagonal is computed as follows:\n\nAssume `diagonal` has dimensions [D1,..., Dk], then the output is a tensor of\nrank 2k with dimensions [D1,..., Dk, D1,..., Dk] where:\n\n`output[i1,..., ik, i1,..., ik] = diagonal[i1, ..., ik]` and 0 everywhere else.\n\nFor example:\n\n```prettyprint\n# \'diagonal\' is [1, 2, 3, 4]\ntf.diag(diagonal) ==> [[1, 0, 0, 0]\n                       [0, 2, 0, 0]\n                       [0, 0, 3, 0]\n                       [0, 0, 0, 4]]\n```"
+  description: "Given a `diagonal`, this operation returns a tensor with the `diagonal` and\neverything else padded with zeros. The diagonal is computed as follows:\n\nAssume `diagonal` has dimensions [D1,..., Dk], then the output is a tensor of\nrank 2k with dimensions [D1,..., Dk, D1,..., Dk] where:\n\n`output[i1,..., ik, i1,..., ik] = diagonal[i1, ..., ik]` and 0 everywhere else.\n\nFor example:\n\n```\n# \'diagonal\' is [1, 2, 3, 4]\ntf.diag(diagonal) ==> [[1, 0, 0, 0]\n                       [0, 2, 0, 0]\n                       [0, 0, 3, 0]\n                       [0, 0, 0, 4]]\n```"
 }
 op {
   name: "DiagPart"
@@ -6152,7 +6152,7 @@ op {
     }
   }
   summary: "Returns the diagonal part of the tensor."
-  description: "This operation returns a tensor with the `diagonal` part\nof the `input`. The `diagonal` part is computed as follows:\n\nAssume `input` has dimensions `[D1,..., Dk, D1,..., Dk]`, then the output is a\ntensor of rank `k` with dimensions `[D1,..., Dk]` where:\n\n`diagonal[i1,..., ik] = input[i1, ..., ik, i1,..., ik]`.\n\nFor example:\n\n```prettyprint\n# \'input\' is [[1, 0, 0, 0]\n              [0, 2, 0, 0]\n              [0, 0, 3, 0]\n              [0, 0, 0, 4]]\n\ntf.diag_part(input) ==> [1, 2, 3, 4]\n```"
+  description: "This operation returns a tensor with the `diagonal` part\nof the `input`. The `diagonal` part is computed as follows:\n\nAssume `input` has dimensions `[D1,..., Dk, D1,..., Dk]`, then the output is a\ntensor of rank `k` with dimensions `[D1,..., Dk]` where:\n\n`diagonal[i1,..., ik] = input[i1, ..., ik, i1,..., ik]`.\n\nFor example:\n\n```\n# \'input\' is [[1, 0, 0, 0]\n              [0, 2, 0, 0]\n              [0, 0, 3, 0]\n              [0, 0, 0, 4]]\n\ntf.diag_part(input) ==> [1, 2, 3, 4]\n```"
 }
 op {
   name: "Digamma"
@@ -6469,7 +6469,7 @@ op {
     type: "type"
   }
   summary: "Partitions `data` into `num_partitions` tensors using indices from `partitions`."
-  description: "For each index tuple `js` of size `partitions.ndim`, the slice `data[js, ...]`\nbecomes part of `outputs[partitions[js]]`.  The slices with `partitions[js] = i`\nare placed in `outputs[i]` in lexicographic order of `js`, and the first\ndimension of `outputs[i]` is the number of entries in `partitions` equal to `i`.\nIn detail,\n\n```python\n    outputs[i].shape = [sum(partitions == i)] + data.shape[partitions.ndim:]\n\n    outputs[i] = pack([data[js, ...] for js if partitions[js] == i])\n```\n\n`data.shape` must start with `partitions.shape`.\n\nFor example:\n\n```python\n    # Scalar partitions.\n    partitions = 1\n    num_partitions = 2\n    data = [10, 20]\n    outputs[0] = []  # Empty with shape [0, 2]\n    outputs[1] = [[10, 20]]\n\n    # Vector partitions.\n    partitions = [0, 0, 1, 1, 0]\n    num_partitions = 2\n    data = [10, 20, 30, 40, 50]\n    outputs[0] = [10, 20, 50]\n    outputs[1] = [30, 40]\n```\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/DynamicPartition.png\" alt>\n</div>"
+  description: "For each index tuple `js` of size `partitions.ndim`, the slice `data[js, ...]`\nbecomes part of `outputs[partitions[js]]`.  The slices with `partitions[js] = i`\nare placed in `outputs[i]` in lexicographic order of `js`, and the first\ndimension of `outputs[i]` is the number of entries in `partitions` equal to `i`.\nIn detail,\n\n```python\n    outputs[i].shape = [sum(partitions == i)] + data.shape[partitions.ndim:]\n\n    outputs[i] = pack([data[js, ...] for js if partitions[js] == i])\n```\n\n`data.shape` must start with `partitions.shape`.\n\nFor example:\n\n```python\n    # Scalar partitions.\n    partitions = 1\n    num_partitions = 2\n    data = [10, 20]\n    outputs[0] = []  # Empty with shape [0, 2]\n    outputs[1] = [[10, 20]]\n\n    # Vector partitions.\n    partitions = [0, 0, 1, 1, 0]\n    num_partitions = 2\n    data = [10, 20, 30, 40, 50]\n    outputs[0] = [10, 20, 50]\n    outputs[1] = [30, 40]\n```\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/DynamicPartition.png\" alt>\n</div>"
 }
 op {
   name: "DynamicStitch"
@@ -6498,7 +6498,7 @@ op {
     type: "type"
   }
   summary: "Interleave the values from the `data` tensors into a single tensor."
-  description: "Builds a merged tensor such that\n\n```python\n    merged[indices[m][i, ..., j], ...] = data[m][i, ..., j, ...]\n```\n\nFor example, if each `indices[m]` is scalar or vector, we have\n\n```python\n    # Scalar indices:\n    merged[indices[m], ...] = data[m][...]\n\n    # Vector indices:\n    merged[indices[m][i], ...] = data[m][i, ...]\n```\n\nEach `data[i].shape` must start with the corresponding `indices[i].shape`,\nand the rest of `data[i].shape` must be constant w.r.t. `i`.  That is, we\nmust have `data[i].shape = indices[i].shape + constant`.  In terms of this\n`constant`, the output shape is\n\n    merged.shape = [max(indices)] + constant\n\nValues are merged in order, so if an index appears in both `indices[m][i]` and\n`indices[n][j]` for `(m,i) < (n,j)` the slice `data[n][j]` will appear in the\nmerged result.\n\nFor example:\n\n```python\n    indices[0] = 6\n    indices[1] = [4, 1]\n    indices[2] = [[5, 2], [0, 3]]\n    data[0] = [61, 62]\n    data[1] = [[41, 42], [11, 12]]\n    data[2] = [[[51, 52], [21, 22]], [[1, 2], [31, 32]]]\n    merged = [[1, 2], [11, 12], [21, 22], [31, 32], [41, 42],\n              [51, 52], [61, 62]]\n```\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/DynamicStitch.png\" alt>\n</div>"
+  description: "Builds a merged tensor such that\n\n```python\n    merged[indices[m][i, ..., j], ...] = data[m][i, ..., j, ...]\n```\n\nFor example, if each `indices[m]` is scalar or vector, we have\n\n```python\n    # Scalar indices:\n    merged[indices[m], ...] = data[m][...]\n\n    # Vector indices:\n    merged[indices[m][i], ...] = data[m][i, ...]\n```\n\nEach `data[i].shape` must start with the corresponding `indices[i].shape`,\nand the rest of `data[i].shape` must be constant w.r.t. `i`.  That is, we\nmust have `data[i].shape = indices[i].shape + constant`.  In terms of this\n`constant`, the output shape is\n\n    merged.shape = [max(indices)] + constant\n\nValues are merged in order, so if an index appears in both `indices[m][i]` and\n`indices[n][j]` for `(m,i) < (n,j)` the slice `data[n][j]` will appear in the\nmerged result.\n\nFor example:\n\n```python\n    indices[0] = 6\n    indices[1] = [4, 1]\n    indices[2] = [[5, 2], [0, 3]]\n    data[0] = [61, 62]\n    data[1] = [[41, 42], [11, 12]]\n    data[2] = [[[51, 52], [21, 22]], [[1, 2], [31, 32]]]\n    merged = [[1, 2], [11, 12], [21, 22], [31, 32], [41, 42],\n              [51, 52], [61, 62]]\n```\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/DynamicStitch.png\" alt>\n</div>"
 }
 op {
   name: "EditDistance"
@@ -6990,7 +6990,7 @@ op {
     }
   }
   summary: "Inserts a dimension of 1 into a tensor\'s shape."
-  description: "Given a tensor `input`, this operation inserts a dimension of 1 at the\ndimension index `dim` of `input`\'s shape. The dimension index `dim` starts at\nzero; if you specify a negative number for `dim` it is counted backward from\nthe end.\n\nThis operation is useful if you want to add a batch dimension to a single\nelement. For example, if you have a single image of shape `[height, width,\nchannels]`, you can make it a batch of 1 image with `expand_dims(image, 0)`,\nwhich will make the shape `[1, height, width, channels]`.\n\nOther examples:\n\n```prettyprint\n# \'t\' is a tensor of shape [2]\nshape(expand_dims(t, 0)) ==> [1, 2]\nshape(expand_dims(t, 1)) ==> [2, 1]\nshape(expand_dims(t, -1)) ==> [2, 1]\n\n# \'t2\' is a tensor of shape [2, 3, 5]\nshape(expand_dims(t2, 0)) ==> [1, 2, 3, 5]\nshape(expand_dims(t2, 2)) ==> [2, 3, 1, 5]\nshape(expand_dims(t2, 3)) ==> [2, 3, 5, 1]\n```\n\nThis operation requires that:\n\n`-1-input.dims() <= dim <= input.dims()`\n\nThis operation is related to `squeeze()`, which removes dimensions of\nsize 1."
+  description: "Given a tensor `input`, this operation inserts a dimension of 1 at the\ndimension index `dim` of `input`\'s shape. The dimension index `dim` starts at\nzero; if you specify a negative number for `dim` it is counted backward from\nthe end.\n\nThis operation is useful if you want to add a batch dimension to a single\nelement. For example, if you have a single image of shape `[height, width,\nchannels]`, you can make it a batch of 1 image with `expand_dims(image, 0)`,\nwhich will make the shape `[1, height, width, channels]`.\n\nOther examples:\n\n```\n# \'t\' is a tensor of shape [2]\nshape(expand_dims(t, 0)) ==> [1, 2]\nshape(expand_dims(t, 1)) ==> [2, 1]\nshape(expand_dims(t, -1)) ==> [2, 1]\n\n# \'t2\' is a tensor of shape [2, 3, 5]\nshape(expand_dims(t2, 0)) ==> [1, 2, 3, 5]\nshape(expand_dims(t2, 2)) ==> [2, 3, 1, 5]\nshape(expand_dims(t2, 3)) ==> [2, 3, 5, 1]\n```\n\nThis operation requires that:\n\n`-1-input.dims() <= dim <= input.dims()`\n\nThis operation is related to `squeeze()`, which removes dimensions of\nsize 1."
 }
 op {
   name: "Expm1"
@@ -7541,7 +7541,7 @@ op {
     type: "type"
   }
   summary: "Creates a tensor filled with a scalar value."
-  description: "This operation creates a tensor of shape `dims` and fills it with `value`.\n\nFor example:\n\n```prettyprint\n# Output tensor has shape [2, 3].\nfill([2, 3], 9) ==> [[9, 9, 9]\n                     [9, 9, 9]]\n```"
+  description: "This operation creates a tensor of shape `dims` and fills it with `value`.\n\nFor example:\n\n```\n# Output tensor has shape [2, 3].\nfill([2, 3], 9) ==> [[9, 9, 9]\n                     [9, 9, 9]]\n```"
 }
 op {
   name: "FixedLengthRecordReader"
@@ -8479,7 +8479,7 @@ op {
     }
   }
   summary: "Gather slices from `params` according to `indices`."
-  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in safe but unspecified behavior, which may include\nraising an error.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../../images/Gather.png\" alt>\n</div>"
+  description: "`indices` must be an integer tensor of any dimension (usually 0-D or 1-D).\nProduces an output tensor with shape `indices.shape + params.shape[1:]` where:\n\n```python\n    # Scalar indices\n    output[:, ..., :] = params[indices, :, ... :]\n\n    # Vector indices\n    output[i, :, ..., :] = params[indices[i], :, ... :]\n\n    # Higher rank indices\n    output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]\n```\n\nIf `indices` is a permutation and `len(indices) == params.shape[0]` then\nthis operation will permute `params` accordingly.\n\n`validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in\n`indices` are always validated to be within range. If assigned to GPU,\nout-of-bound indices result in safe but unspecified behavior, which may include\nraising an error.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/Gather.png\" alt>\n</div>"
 }
 op {
   name: "GatherNd"
@@ -9315,7 +9315,7 @@ op {
     }
   }
   summary: "Computes the inverse permutation of a tensor."
-  description: "This operation computes the inverse of an index permutation. It takes a 1-D\ninteger tensor `x`, which represents the indices of a zero-based array, and\nswaps each value with its index position. In other words, for an output tensor\n`y` and an input tensor `x`, this operation computes the following:\n\n`y[x[i]] = i for i in [0, 1, ..., len(x) - 1]`\n\nThe values must include 0. There can be no duplicate values or negative values.\n\nFor example:\n\n```prettyprint\n# tensor `x` is [3, 4, 0, 2, 1]\ninvert_permutation(x) ==> [2, 4, 3, 0, 1]\n```"
+  description: "This operation computes the inverse of an index permutation. It takes a 1-D\ninteger tensor `x`, which represents the indices of a zero-based array, and\nswaps each value with its index position. In other words, for an output tensor\n`y` and an input tensor `x`, this operation computes the following:\n\n`y[x[i]] = i for i in [0, 1, ..., len(x) - 1]`\n\nThe values must include 0. There can be no duplicate values or negative values.\n\nFor example:\n\n```\n# tensor `x` is [3, 4, 0, 2, 1]\ninvert_permutation(x) ==> [2, 4, 3, 0, 1]\n```"
 }
 op {
   name: "IsFinite"
@@ -9811,7 +9811,7 @@ op {
     }
   }
   summary: "Computes the difference between two lists of numbers or strings."
-  description: "Given a list `x` and a list `y`, this operation returns a list `out` that\nrepresents all values that are in `x` but not in `y`. The returned list `out`\nis sorted in the same order that the numbers appear in `x` (duplicates are\npreserved). This operation also returns a list `idx` that represents the\nposition of each `out` element in `x`. In other words:\n\n`out[i] = x[idx[i]] for i in [0, 1, ..., len(out) - 1]`\n\nFor example, given this input:\n\n```prettyprint\nx = [1, 2, 3, 4, 5, 6]\ny = [1, 3, 5]\n```\n\nThis operation would return:\n\n```prettyprint\nout ==> [2, 4, 6]\nidx ==> [1, 3, 5]\n```"
+  description: "Given a list `x` and a list `y`, this operation returns a list `out` that\nrepresents all values that are in `x` but not in `y`. The returned list `out`\nis sorted in the same order that the numbers appear in `x` (duplicates are\npreserved). This operation also returns a list `idx` that represents the\nposition of each `out` element in `x`. In other words:\n\n`out[i] = x[idx[i]] for i in [0, 1, ..., len(out) - 1]`\n\nFor example, given this input:\n\n```\nx = [1, 2, 3, 4, 5, 6]\ny = [1, 3, 5]\n```\n\nThis operation would return:\n\n```\nout ==> [2, 4, 6]\nidx ==> [1, 3, 5]\n```"
 }
 op {
   name: "Log"
@@ -10245,7 +10245,7 @@ op {
     type: "type"
   }
   summary: "Copy a tensor setting everything outside a central band in each innermost matrix"
-  description: "to zero.\n\nThe `band` part is computed as follows:\nAssume `input` has `k` dimensions `[I, J, K, ..., M, N]`, then the output is a\ntensor with the same shape where\n\n`band[i, j, k, ..., m, n] = in_band(m, n) * input[i, j, k, ..., m, n]`.\n\nThe indicator function\n\n`in_band(m, n) = (num_lower < 0 || (m-n) <= num_lower)) &&\n                 (num_upper < 0 || (n-m) <= num_upper)`.\n\nFor example:\n\n```prettyprint\n# if \'input\' is [[ 0,  1,  2, 3]\n                 [-1,  0,  1, 2]\n                 [-2, -1,  0, 1]\n                 [-3, -2, -1, 0]],\n\ntf.matrix_band_part(input, 1, -1) ==> [[ 0,  1,  2, 3]\n                                       [-1,  0,  1, 2]\n                                       [ 0, -1,  0, 1]\n                                       [ 0,  0, -1, 0]],\n\ntf.matrix_band_part(input, 2, 1) ==> [[ 0,  1,  0, 0]\n                                      [-1,  0,  1, 0]\n                                      [-2, -1,  0, 1]\n                                      [ 0, -2, -1, 0]]\n```\n\nUseful special cases:\n\n```prettyprint\n tf.matrix_band_part(input, 0, -1) ==> Upper triangular part.\n tf.matrix_band_part(input, -1, 0) ==> Lower triangular part.\n tf.matrix_band_part(input, 0, 0) ==> Diagonal.\n```"
+  description: "to zero.\n\nThe `band` part is computed as follows:\nAssume `input` has `k` dimensions `[I, J, K, ..., M, N]`, then the output is a\ntensor with the same shape where\n\n`band[i, j, k, ..., m, n] = in_band(m, n) * input[i, j, k, ..., m, n]`.\n\nThe indicator function\n\n`in_band(m, n) = (num_lower < 0 || (m-n) <= num_lower)) &&\n                 (num_upper < 0 || (n-m) <= num_upper)`.\n\nFor example:\n\n```\n# if \'input\' is [[ 0,  1,  2, 3]\n                 [-1,  0,  1, 2]\n                 [-2, -1,  0, 1]\n                 [-3, -2, -1, 0]],\n\ntf.matrix_band_part(input, 1, -1) ==> [[ 0,  1,  2, 3]\n                                       [-1,  0,  1, 2]\n                                       [ 0, -1,  0, 1]\n                                       [ 0,  0, -1, 0]],\n\ntf.matrix_band_part(input, 2, 1) ==> [[ 0,  1,  0, 0]\n                                      [-1,  0,  1, 0]\n                                      [-2, -1,  0, 1]\n                                      [ 0, -2, -1, 0]]\n```\n\nUseful special cases:\n\n```\n tf.matrix_band_part(input, 0, -1) ==> Upper triangular part.\n tf.matrix_band_part(input, -1, 0) ==> Lower triangular part.\n tf.matrix_band_part(input, 0, 0) ==> Diagonal.\n```"
 }
 op {
   name: "MatrixDeterminant"
@@ -10289,7 +10289,7 @@ op {
     type: "type"
   }
   summary: "Returns a batched diagonal tensor with a given batched diagonal values."
-  description: "Given a `diagonal`, this operation returns a tensor with the `diagonal` and\neverything else padded with zeros. The diagonal is computed as follows:\n\nAssume `diagonal` has `k` dimensions `[I, J, K, ..., N]`, then the output is a\ntensor of rank `k+1` with dimensions [I, J, K, ..., N, N]` where:\n\n`output[i, j, k, ..., m, n] = 1{m=n} * diagonal[i, j, k, ..., n]`.\n\nFor example:\n\n```prettyprint\n# \'diagonal\' is [[1, 2, 3, 4], [5, 6, 7, 8]]\n\nand diagonal.shape = (2, 4)\n\ntf.matrix_diag(diagonal) ==> [[[1, 0, 0, 0]\n                                     [0, 2, 0, 0]\n                                     [0, 0, 3, 0]\n                                     [0, 0, 0, 4]],\n                                    [[5, 0, 0, 0]\n                                     [0, 6, 0, 0]\n                                     [0, 0, 7, 0]\n                                     [0, 0, 0, 8]]]\n\nwhich has shape (2, 4, 4)\n```"
+  description: "Given a `diagonal`, this operation returns a tensor with the `diagonal` and\neverything else padded with zeros. The diagonal is computed as follows:\n\nAssume `diagonal` has `k` dimensions `[I, J, K, ..., N]`, then the output is a\ntensor of rank `k+1` with dimensions [I, J, K, ..., N, N]` where:\n\n`output[i, j, k, ..., m, n] = 1{m=n} * diagonal[i, j, k, ..., n]`.\n\nFor example:\n\n```\n# \'diagonal\' is [[1, 2, 3, 4], [5, 6, 7, 8]]\n\nand diagonal.shape = (2, 4)\n\ntf.matrix_diag(diagonal) ==> [[[1, 0, 0, 0]\n                                     [0, 2, 0, 0]\n                                     [0, 0, 3, 0]\n                                     [0, 0, 0, 4]],\n                                    [[5, 0, 0, 0]\n                                     [0, 6, 0, 0]\n                                     [0, 0, 7, 0]\n                                     [0, 0, 0, 8]]]\n\nwhich has shape (2, 4, 4)\n```"
 }
 op {
   name: "MatrixDiagPart"
@@ -10308,7 +10308,7 @@ op {
     type: "type"
   }
   summary: "Returns the batched diagonal part of a batched tensor."
-  description: "This operation returns a tensor with the `diagonal` part\nof the batched `input`. The `diagonal` part is computed as follows:\n\nAssume `input` has `k` dimensions `[I, J, K, ..., M, N]`, then the output is a\ntensor of rank `k - 1` with dimensions `[I, J, K, ..., min(M, N)]` where:\n\n`diagonal[i, j, k, ..., n] = input[i, j, k, ..., n, n]`.\n\nThe input must be at least a matrix.\n\nFor example:\n\n```prettyprint\n# \'input\' is [[[1, 0, 0, 0]\n               [0, 2, 0, 0]\n               [0, 0, 3, 0]\n               [0, 0, 0, 4]],\n              [[5, 0, 0, 0]\n               [0, 6, 0, 0]\n               [0, 0, 7, 0]\n               [0, 0, 0, 8]]]\n\nand input.shape = (2, 4, 4)\n\ntf.matrix_diag_part(input) ==> [[1, 2, 3, 4], [5, 6, 7, 8]]\n\nwhich has shape (2, 4)\n```"
+  description: "This operation returns a tensor with the `diagonal` part\nof the batched `input`. The `diagonal` part is computed as follows:\n\nAssume `input` has `k` dimensions `[I, J, K, ..., M, N]`, then the output is a\ntensor of rank `k - 1` with dimensions `[I, J, K, ..., min(M, N)]` where:\n\n`diagonal[i, j, k, ..., n] = input[i, j, k, ..., n, n]`.\n\nThe input must be at least a matrix.\n\nFor example:\n\n```\n# \'input\' is [[[1, 0, 0, 0]\n               [0, 2, 0, 0]\n               [0, 0, 3, 0]\n               [0, 0, 0, 4]],\n              [[5, 0, 0, 0]\n               [0, 6, 0, 0]\n               [0, 0, 7, 0]\n               [0, 0, 0, 8]]]\n\nand input.shape = (2, 4, 4)\n\ntf.matrix_diag_part(input) ==> [[1, 2, 3, 4], [5, 6, 7, 8]]\n\nwhich has shape (2, 4)\n```"
 }
 op {
   name: "MatrixInverse"
@@ -11601,7 +11601,7 @@ op {
     }
   }
   summary: "Pads a tensor with mirrored values."
-  description: "This operation pads a `input` with mirrored values according to the `paddings`\nyou specify. `paddings` is an integer tensor with shape `[n, 2]`, where n is\nthe rank of `input`. For each dimension D of `input`, `paddings[D, 0]` indicates\nhow many values to add before the contents of `input` in that dimension, and\n`paddings[D, 1]` indicates how many values to add after the contents of `input`\nin that dimension. Both `paddings[D, 0]` and `paddings[D, 1]` must be no greater\nthan `input.dim_size(D)` (or `input.dim_size(D) - 1`) if `copy_border` is true\n(if false, respectively).\n\nThe padded size of each dimension D of the output is:\n\n`paddings(D, 0) + input.dim_size(D) + paddings(D, 1)`\n\nFor example:\n\n```prettyprint\n# \'t\' is [[1, 2, 3], [4, 5, 6]].\n# \'paddings\' is [[1, 1]], [2, 2]].\n# \'mode\' is SYMMETRIC.\n# rank of \'t\' is 2.\npad(t, paddings) ==> [[2, 1, 1, 2, 3, 3, 2]\n                      [2, 1, 1, 2, 3, 3, 2]\n                      [5, 4, 4, 5, 6, 6, 5]\n                      [5, 4, 4, 5, 6, 6, 5]]\n```"
+  description: "This operation pads a `input` with mirrored values according to the `paddings`\nyou specify. `paddings` is an integer tensor with shape `[n, 2]`, where n is\nthe rank of `input`. For each dimension D of `input`, `paddings[D, 0]` indicates\nhow many values to add before the contents of `input` in that dimension, and\n`paddings[D, 1]` indicates how many values to add after the contents of `input`\nin that dimension. Both `paddings[D, 0]` and `paddings[D, 1]` must be no greater\nthan `input.dim_size(D)` (or `input.dim_size(D) - 1`) if `copy_border` is true\n(if false, respectively).\n\nThe padded size of each dimension D of the output is:\n\n`paddings(D, 0) + input.dim_size(D) + paddings(D, 1)`\n\nFor example:\n\n```\n# \'t\' is [[1, 2, 3], [4, 5, 6]].\n# \'paddings\' is [[1, 1]], [2, 2]].\n# \'mode\' is SYMMETRIC.\n# rank of \'t\' is 2.\npad(t, paddings) ==> [[2, 1, 1, 2, 3, 3, 2]\n                      [2, 1, 1, 2, 3, 3, 2]\n                      [5, 4, 4, 5, 6, 6, 5]\n                      [5, 4, 4, 5, 6, 6, 5]]\n```"
 }
 op {
   name: "MirrorPadGrad"
@@ -11649,7 +11649,7 @@ op {
     }
   }
   summary: "Gradient op for `MirrorPad` op. This op folds a mirror-padded tensor."
-  description: "This operation folds the padded areas of `input` by `MirrorPad` according to the\n`paddings` you specify. `paddings` must be the same as `paddings` argument\ngiven to the corresponding `MirrorPad` op.\n\nThe folded size of each dimension D of the output is:\n\n`input.dim_size(D) - paddings(D, 0) - paddings(D, 1)`\n\nFor example:\n\n```prettyprint\n# \'t\' is [[1, 2, 3], [4, 5, 6], [7, 8, 9]].\n# \'paddings\' is [[0, 1]], [0, 1]].\n# \'mode\' is SYMMETRIC.\n# rank of \'t\' is 2.\npad(t, paddings) ==> [[ 1,  5]\n                      [11, 28]]\n```"
+  description: "This operation folds the padded areas of `input` by `MirrorPad` according to the\n`paddings` you specify. `paddings` must be the same as `paddings` argument\ngiven to the corresponding `MirrorPad` op.\n\nThe folded size of each dimension D of the output is:\n\n`input.dim_size(D) - paddings(D, 0) - paddings(D, 1)`\n\nFor example:\n\n```\n# \'t\' is [[1, 2, 3], [4, 5, 6], [7, 8, 9]].\n# \'paddings\' is [[0, 1]], [0, 1]].\n# \'mode\' is SYMMETRIC.\n# rank of \'t\' is 2.\npad(t, paddings) ==> [[ 1,  5]\n                      [11, 28]]\n```"
 }
 op {
   name: "Mod"
@@ -12229,7 +12229,7 @@ op {
     description: "Dimension along which to pack.  Negative values wrap around, so the\nvalid range is `[-(R+1), R+1)`."
   }
   summary: "Packs a list of `N` rank-`R` tensors into one rank-`(R+1)` tensor."
-  description: "Packs the `N` tensors in `values` into a tensor with rank one higher than each\ntensor in `values`, by packing them along the `axis` dimension.\nGiven a list of tensors of shape `(A, B, C)`;\n\nif `axis == 0` then the `output` tensor will have the shape `(N, A, B, C)`.\nif `axis == 1` then the `output` tensor will have the shape `(A, N, B, C)`.\nEtc.\n\nFor example:\n\n```prettyprint\n# \'x\' is [1, 4]\n# \'y\' is [2, 5]\n# \'z\' is [3, 6]\npack([x, y, z]) => [[1, 4], [2, 5], [3, 6]]  # Pack along first dim.\npack([x, y, z], axis=1) => [[1, 2, 3], [4, 5, 6]]\n```\n\nThis is the opposite of `unpack`."
+  description: "Packs the `N` tensors in `values` into a tensor with rank one higher than each\ntensor in `values`, by packing them along the `axis` dimension.\nGiven a list of tensors of shape `(A, B, C)`;\n\nif `axis == 0` then the `output` tensor will have the shape `(N, A, B, C)`.\nif `axis == 1` then the `output` tensor will have the shape `(A, N, B, C)`.\nEtc.\n\nFor example:\n\n```\n# \'x\' is [1, 4]\n# \'y\' is [2, 5]\n# \'z\' is [3, 6]\npack([x, y, z]) => [[1, 4], [2, 5], [3, 6]]  # Pack along first dim.\npack([x, y, z], axis=1) => [[1, 2, 3], [4, 5, 6]]\n```\n\nThis is the opposite of `unpack`."
 }
 op {
   name: "Pad"
@@ -12263,7 +12263,7 @@ op {
     }
   }
   summary: "Pads a tensor with zeros."
-  description: "This operation pads a `input` with zeros according to the `paddings` you\nspecify. `paddings` is an integer tensor with shape `[Dn, 2]`, where n is the\nrank of `input`. For each dimension D of `input`, `paddings[D, 0]` indicates\nhow many zeros to add before the contents of `input` in that dimension, and\n`paddings[D, 1]` indicates how many zeros to add after the contents of `input`\nin that dimension.\n\nThe padded size of each dimension D of the output is:\n\n`paddings(D, 0) + input.dim_size(D) + paddings(D, 1)`\n\nFor example:\n\n```prettyprint\n# \'t\' is [[1, 1], [2, 2]]\n# \'paddings\' is [[1, 1], [2, 2]]\n# rank of \'t\' is 2\npad(t, paddings) ==> [[0, 0, 0, 0, 0, 0]\n                      [0, 0, 1, 1, 0, 0]\n                      [0, 0, 2, 2, 0, 0]\n                      [0, 0, 0, 0, 0, 0]]\n```"
+  description: "This operation pads a `input` with zeros according to the `paddings` you\nspecify. `paddings` is an integer tensor with shape `[Dn, 2]`, where n is the\nrank of `input`. For each dimension D of `input`, `paddings[D, 0]` indicates\nhow many zeros to add before the contents of `input` in that dimension, and\n`paddings[D, 1]` indicates how many zeros to add after the contents of `input`\nin that dimension.\n\nThe padded size of each dimension D of the output is:\n\n`paddings(D, 0) + input.dim_size(D) + paddings(D, 1)`\n\nFor example:\n\n```\n# \'t\' is [[1, 1], [2, 2]]\n# \'paddings\' is [[1, 1], [2, 2]]\n# rank of \'t\' is 2\npad(t, paddings) ==> [[0, 0, 0, 0, 0, 0]\n                      [0, 0, 1, 1, 0, 0]\n                      [0, 0, 2, 2, 0, 0]\n                      [0, 0, 0, 0, 0, 0]]\n```"
 }
 op {
   name: "PaddingFIFOQueue"
@@ -12399,7 +12399,7 @@ op {
     description: "the final shape of the result; should be equal to the shapes of any input\nbut with the number of input values in the first dimension."
   }
   summary: "Concatenates a list of `N` tensors along the first dimension."
-  description: "The input tensors are all required to have size 1 in the first dimension.\n\nFor example:\n\n```prettyprint\n# \'x\' is [[1, 4]]\n# \'y\' is [[2, 5]]\n# \'z\' is [[3, 6]]\nparallel_concat([x, y, z]) => [[1, 4], [2, 5], [3, 6]]  # Pack along first dim.\n```\n\nThe difference between concat and parallel_concat is that concat requires all\nof the inputs be computed before the operation will begin but doesn\'t require\nthat the input shapes be known during graph construction.  Parallel concat\nwill copy pieces of the input into the output as they become available, in\nsome situations this can provide a performance benefit."
+  description: "The input tensors are all required to have size 1 in the first dimension.\n\nFor example:\n\n```\n# \'x\' is [[1, 4]]\n# \'y\' is [[2, 5]]\n# \'z\' is [[3, 6]]\nparallel_concat([x, y, z]) => [[1, 4], [2, 5], [3, 6]]  # Pack along first dim.\n```\n\nThe difference between concat and parallel_concat is that concat requires all\nof the inputs be computed before the operation will begin but doesn\'t require\nthat the input shapes be known during graph construction.  Parallel concat\nwill copy pieces of the input into the output as they become available, in\nsome situations this can provide a performance benefit."
 }
 op {
   name: "ParameterizedTruncatedNormal"
@@ -15623,7 +15623,7 @@ op {
     type: "type"
   }
   summary: "Returns the rank of a tensor."
-  description: "This operation returns an integer representing the rank of `input`.\n\nFor example:\n\n```prettyprint\n# \'t\' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]\n# shape of tensor \'t\' is [2, 2, 3]\nrank(t) ==> 3\n```\n\n**Note**: The rank of a tensor is not the same as the rank of a matrix. The rank\nof a tensor is the number of indices required to uniquely select each element\nof the tensor. Rank is also known as \"order\", \"degree\", or \"ndims.\""
+  description: "This operation returns an integer representing the rank of `input`.\n\nFor example:\n\n```\n# \'t\' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]\n# shape of tensor \'t\' is [2, 2, 3]\nrank(t) ==> 3\n```\n\n**Note**: The rank of a tensor is not the same as the rank of a matrix. The rank\nof a tensor is the number of indices required to uniquely select each element\nof the tensor. Rank is also known as \"order\", \"degree\", or \"ndims.\""
 }
 op {
   name: "ReadFile"
@@ -16594,7 +16594,7 @@ op {
     }
   }
   summary: "Reshapes a tensor."
-  description: "Given `tensor`, this operation returns a tensor that has the same values\nas `tensor` with shape `shape`.\n\nIf one component of `shape` is the special value -1, the size of that dimension\nis computed so that the total size remains constant.  In particular, a `shape`\nof `[-1]` flattens into 1-D.  At most one component of `shape` can be -1.\n\nIf `shape` is 1-D or higher, then the operation returns a tensor with shape\n`shape` filled with the values of `tensor`. In this case, the number of elements\nimplied by `shape` must be the same as the number of elements in `tensor`.\n\nFor example:\n\n```prettyprint\n# tensor \'t\' is [1, 2, 3, 4, 5, 6, 7, 8, 9]\n# tensor \'t\' has shape [9]\nreshape(t, [3, 3]) ==> [[1, 2, 3],\n                        [4, 5, 6],\n                        [7, 8, 9]]\n\n# tensor \'t\' is [[[1, 1], [2, 2]],\n#                [[3, 3], [4, 4]]]\n# tensor \'t\' has shape [2, 2, 2]\nreshape(t, [2, 4]) ==> [[1, 1, 2, 2],\n                        [3, 3, 4, 4]]\n\n# tensor \'t\' is [[[1, 1, 1],\n#                 [2, 2, 2]],\n#                [[3, 3, 3],\n#                 [4, 4, 4]],\n#                [[5, 5, 5],\n#                 [6, 6, 6]]]\n# tensor \'t\' has shape [3, 2, 3]\n# pass \'[-1]\' to flatten \'t\'\nreshape(t, [-1]) ==> [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6]\n\n# -1 can also be used to infer the shape\n\n# -1 is inferred to be 9:\nreshape(t, [2, -1]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],\n                         [4, 4, 4, 5, 5, 5, 6, 6, 6]]\n# -1 is inferred to be 2:\nreshape(t, [-1, 9]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],\n                         [4, 4, 4, 5, 5, 5, 6, 6, 6]]\n# -1 is inferred to be 3:\nreshape(t, [ 2, -1, 3]) ==> [[[1, 1, 1],\n                              [2, 2, 2],\n                              [3, 3, 3]],\n                             [[4, 4, 4],\n                              [5, 5, 5],\n                              [6, 6, 6]]]\n\n# tensor \'t\' is [7]\n# shape `[]` reshapes to a scalar\nreshape(t, []) ==> 7\n```"
+  description: "Given `tensor`, this operation returns a tensor that has the same values\nas `tensor` with shape `shape`.\n\nIf one component of `shape` is the special value -1, the size of that dimension\nis computed so that the total size remains constant.  In particular, a `shape`\nof `[-1]` flattens into 1-D.  At most one component of `shape` can be -1.\n\nIf `shape` is 1-D or higher, then the operation returns a tensor with shape\n`shape` filled with the values of `tensor`. In this case, the number of elements\nimplied by `shape` must be the same as the number of elements in `tensor`.\n\nFor example:\n\n```\n# tensor \'t\' is [1, 2, 3, 4, 5, 6, 7, 8, 9]\n# tensor \'t\' has shape [9]\nreshape(t, [3, 3]) ==> [[1, 2, 3],\n                        [4, 5, 6],\n                        [7, 8, 9]]\n\n# tensor \'t\' is [[[1, 1], [2, 2]],\n#                [[3, 3], [4, 4]]]\n# tensor \'t\' has shape [2, 2, 2]\nreshape(t, [2, 4]) ==> [[1, 1, 2, 2],\n                        [3, 3, 4, 4]]\n\n# tensor \'t\' is [[[1, 1, 1],\n#                 [2, 2, 2]],\n#                [[3, 3, 3],\n#                 [4, 4, 4]],\n#                [[5, 5, 5],\n#                 [6, 6, 6]]]\n# tensor \'t\' has shape [3, 2, 3]\n# pass \'[-1]\' to flatten \'t\'\nreshape(t, [-1]) ==> [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6]\n\n# -1 can also be used to infer the shape\n\n# -1 is inferred to be 9:\nreshape(t, [2, -1]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],\n                         [4, 4, 4, 5, 5, 5, 6, 6, 6]]\n# -1 is inferred to be 2:\nreshape(t, [-1, 9]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],\n                         [4, 4, 4, 5, 5, 5, 6, 6, 6]]\n# -1 is inferred to be 3:\nreshape(t, [ 2, -1, 3]) ==> [[[1, 1, 1],\n                              [2, 2, 2],\n                              [3, 3, 3]],\n                             [[4, 4, 4],\n                              [5, 5, 5],\n                              [6, 6, 6]]]\n\n# tensor \'t\' is [7]\n# shape `[]` reshapes to a scalar\nreshape(t, []) ==> 7\n```"
 }
 op {
   name: "ResizeArea"
@@ -18516,7 +18516,7 @@ op {
     }
   }
   summary: "Reverses specific dimensions of a tensor."
-  description: "Given a `tensor`, and a `bool` tensor `dims` representing the dimensions\nof `tensor`, this operation reverses each dimension i of `tensor` where\n`dims[i]` is `True`.\n\n`tensor` can have up to 8 dimensions. The number of dimensions\nof `tensor` must equal the number of elements in `dims`. In other words:\n\n`rank(tensor) = size(dims)`\n\nFor example:\n\n```prettyprint\n# tensor \'t\' is [[[[ 0,  1,  2,  3],\n#                  [ 4,  5,  6,  7],\n#                  [ 8,  9, 10, 11]],\n#                 [[12, 13, 14, 15],\n#                  [16, 17, 18, 19],\n#                  [20, 21, 22, 23]]]]\n# tensor \'t\' shape is [1, 2, 3, 4]\n\n# \'dims\' is [False, False, False, True]\nreverse(t, dims) ==> [[[[ 3,  2,  1,  0],\n                        [ 7,  6,  5,  4],\n                        [ 11, 10, 9, 8]],\n                       [[15, 14, 13, 12],\n                        [19, 18, 17, 16],\n                        [23, 22, 21, 20]]]]\n\n# \'dims\' is [False, True, False, False]\nreverse(t, dims) ==> [[[[12, 13, 14, 15],\n                        [16, 17, 18, 19],\n                        [20, 21, 22, 23]\n                       [[ 0,  1,  2,  3],\n                        [ 4,  5,  6,  7],\n                        [ 8,  9, 10, 11]]]]\n\n# \'dims\' is [False, False, True, False]\nreverse(t, dims) ==> [[[[8, 9, 10, 11],\n                        [4, 5, 6, 7],\n                        [0, 1, 2, 3]]\n                       [[20, 21, 22, 23],\n                        [16, 17, 18, 19],\n                        [12, 13, 14, 15]]]]\n```"
+  description: "Given a `tensor`, and a `bool` tensor `dims` representing the dimensions\nof `tensor`, this operation reverses each dimension i of `tensor` where\n`dims[i]` is `True`.\n\n`tensor` can have up to 8 dimensions. The number of dimensions\nof `tensor` must equal the number of elements in `dims`. In other words:\n\n`rank(tensor) = size(dims)`\n\nFor example:\n\n```\n# tensor \'t\' is [[[[ 0,  1,  2,  3],\n#                  [ 4,  5,  6,  7],\n#                  [ 8,  9, 10, 11]],\n#                 [[12, 13, 14, 15],\n#                  [16, 17, 18, 19],\n#                  [20, 21, 22, 23]]]]\n# tensor \'t\' shape is [1, 2, 3, 4]\n\n# \'dims\' is [False, False, False, True]\nreverse(t, dims) ==> [[[[ 3,  2,  1,  0],\n                        [ 7,  6,  5,  4],\n                        [ 11, 10, 9, 8]],\n                       [[15, 14, 13, 12],\n                        [19, 18, 17, 16],\n                        [23, 22, 21, 20]]]]\n\n# \'dims\' is [False, True, False, False]\nreverse(t, dims) ==> [[[[12, 13, 14, 15],\n                        [16, 17, 18, 19],\n                        [20, 21, 22, 23]\n                       [[ 0,  1,  2,  3],\n                        [ 4,  5,  6,  7],\n                        [ 8,  9, 10, 11]]]]\n\n# \'dims\' is [False, False, True, False]\nreverse(t, dims) ==> [[[[8, 9, 10, 11],\n                        [4, 5, 6, 7],\n                        [0, 1, 2, 3]]\n                       [[20, 21, 22, 23],\n                        [16, 17, 18, 19],\n                        [12, 13, 14, 15]]]]\n```"
 }
 op {
   name: "ReverseSequence"
@@ -18566,7 +18566,7 @@ op {
     }
   }
   summary: "Reverses variable length slices."
-  description: "This op first slices `input` along the dimension `batch_dim`, and for each\nslice `i`, reverses the first `seq_lengths[i]` elements along\nthe dimension `seq_dim`.\n\nThe elements of `seq_lengths` must obey `seq_lengths[i] <= input.dims[seq_dim]`,\nand `seq_lengths` must be a vector of length `input.dims[batch_dim]`.\n\nThe output slice `i` along dimension `batch_dim` is then given by input\nslice `i`, with the first `seq_lengths[i]` slices along dimension\n`seq_dim` reversed.\n\nFor example:\n\n```prettyprint\n# Given this:\nbatch_dim = 0\nseq_dim = 1\ninput.dims = (4, 8, ...)\nseq_lengths = [7, 2, 3, 5]\n\n# then slices of input are reversed on seq_dim, but only up to seq_lengths:\noutput[0, 0:7, :, ...] = input[0, 7:0:-1, :, ...]\noutput[1, 0:2, :, ...] = input[1, 2:0:-1, :, ...]\noutput[2, 0:3, :, ...] = input[2, 3:0:-1, :, ...]\noutput[3, 0:5, :, ...] = input[3, 5:0:-1, :, ...]\n\n# while entries past seq_lens are copied through:\noutput[0, 7:, :, ...] = input[0, 7:, :, ...]\noutput[1, 2:, :, ...] = input[1, 2:, :, ...]\noutput[2, 3:, :, ...] = input[2, 3:, :, ...]\noutput[3, 2:, :, ...] = input[3, 2:, :, ...]\n```\n\nIn contrast, if:\n\n```prettyprint\n# Given this:\nbatch_dim = 2\nseq_dim = 0\ninput.dims = (8, ?, 4, ...)\nseq_lengths = [7, 2, 3, 5]\n\n# then slices of input are reversed on seq_dim, but only up to seq_lengths:\noutput[0:7, :, 0, :, ...] = input[7:0:-1, :, 0, :, ...]\noutput[0:2, :, 1, :, ...] = input[2:0:-1, :, 1, :, ...]\noutput[0:3, :, 2, :, ...] = input[3:0:-1, :, 2, :, ...]\noutput[0:5, :, 3, :, ...] = input[5:0:-1, :, 3, :, ...]\n\n# while entries past seq_lens are copied through:\noutput[7:, :, 0, :, ...] = input[7:, :, 0, :, ...]\noutput[2:, :, 1, :, ...] = input[2:, :, 1, :, ...]\noutput[3:, :, 2, :, ...] = input[3:, :, 2, :, ...]\noutput[2:, :, 3, :, ...] = input[2:, :, 3, :, ...]\n```"
+  description: "This op first slices `input` along the dimension `batch_dim`, and for each\nslice `i`, reverses the first `seq_lengths[i]` elements along\nthe dimension `seq_dim`.\n\nThe elements of `seq_lengths` must obey `seq_lengths[i] <= input.dims[seq_dim]`,\nand `seq_lengths` must be a vector of length `input.dims[batch_dim]`.\n\nThe output slice `i` along dimension `batch_dim` is then given by input\nslice `i`, with the first `seq_lengths[i]` slices along dimension\n`seq_dim` reversed.\n\nFor example:\n\n```\n# Given this:\nbatch_dim = 0\nseq_dim = 1\ninput.dims = (4, 8, ...)\nseq_lengths = [7, 2, 3, 5]\n\n# then slices of input are reversed on seq_dim, but only up to seq_lengths:\noutput[0, 0:7, :, ...] = input[0, 7:0:-1, :, ...]\noutput[1, 0:2, :, ...] = input[1, 2:0:-1, :, ...]\noutput[2, 0:3, :, ...] = input[2, 3:0:-1, :, ...]\noutput[3, 0:5, :, ...] = input[3, 5:0:-1, :, ...]\n\n# while entries past seq_lens are copied through:\noutput[0, 7:, :, ...] = input[0, 7:, :, ...]\noutput[1, 2:, :, ...] = input[1, 2:, :, ...]\noutput[2, 3:, :, ...] = input[2, 3:, :, ...]\noutput[3, 2:, :, ...] = input[3, 2:, :, ...]\n```\n\nIn contrast, if:\n\n```\n# Given this:\nbatch_dim = 2\nseq_dim = 0\ninput.dims = (8, ?, 4, ...)\nseq_lengths = [7, 2, 3, 5]\n\n# then slices of input are reversed on seq_dim, but only up to seq_lengths:\noutput[0:7, :, 0, :, ...] = input[7:0:-1, :, 0, :, ...]\noutput[0:2, :, 1, :, ...] = input[2:0:-1, :, 1, :, ...]\noutput[0:3, :, 2, :, ...] = input[3:0:-1, :, 2, :, ...]\noutput[0:5, :, 3, :, ...] = input[5:0:-1, :, 3, :, ...]\n\n# while entries past seq_lens are copied through:\noutput[7:, :, 0, :, ...] = input[7:, :, 0, :, ...]\noutput[2:, :, 1, :, ...] = input[2:, :, 1, :, ...]\noutput[3:, :, 2, :, ...] = input[3:, :, 2, :, ...]\noutput[2:, :, 3, :, ...] = input[2:, :, 3, :, ...]\n```"
 }
 op {
   name: "ReverseV2"
@@ -18617,7 +18617,7 @@ op {
     }
   }
   summary: "Reverses specific dimensions of a tensor."
-  description: "NOTE `tf.reverse` has now changed behavior in preparation for 1.0.\n`tf.reverse_v2` is currently an alias that will be deprecated before TF 1.0.\n\nGiven a `tensor`, and a `int32` tensor `axis` representing the set of\ndimensions of `tensor` to reverse. This operation reverses each dimension\n`i` for which there exists `j` s.t. `axis[j] == i`.\n\n`tensor` can have up to 8 dimensions. The number of dimensions specified\nin `axis` may be 0 or more entries. If an index is specified more than\nonce, a InvalidArgument error is raised.\n\nFor example:\n\n```prettyprint\n# tensor \'t\' is [[[[ 0,  1,  2,  3],\n#                  [ 4,  5,  6,  7],\n#                  [ 8,  9, 10, 11]],\n#                 [[12, 13, 14, 15],\n#                  [16, 17, 18, 19],\n#                  [20, 21, 22, 23]]]]\n# tensor \'t\' shape is [1, 2, 3, 4]\n\n# \'dims\' is [3] or \'dims\' is -1\nreverse(t, dims) ==> [[[[ 3,  2,  1,  0],\n                        [ 7,  6,  5,  4],\n                        [ 11, 10, 9, 8]],\n                       [[15, 14, 13, 12],\n                        [19, 18, 17, 16],\n                        [23, 22, 21, 20]]]]\n\n# \'dims\' is \'[1]\' (or \'dims\' is \'[-3]\')\nreverse(t, dims) ==> [[[[12, 13, 14, 15],\n                        [16, 17, 18, 19],\n                        [20, 21, 22, 23]\n                       [[ 0,  1,  2,  3],\n                        [ 4,  5,  6,  7],\n                        [ 8,  9, 10, 11]]]]\n\n# \'dims\' is \'[2]\' (or \'dims\' is \'[-2]\')\nreverse(t, dims) ==> [[[[8, 9, 10, 11],\n                        [4, 5, 6, 7],\n                        [0, 1, 2, 3]]\n                       [[20, 21, 22, 23],\n                        [16, 17, 18, 19],\n                        [12, 13, 14, 15]]]]\n```"
+  description: "NOTE `tf.reverse` has now changed behavior in preparation for 1.0.\n`tf.reverse_v2` is currently an alias that will be deprecated before TF 1.0.\n\nGiven a `tensor`, and a `int32` tensor `axis` representing the set of\ndimensions of `tensor` to reverse. This operation reverses each dimension\n`i` for which there exists `j` s.t. `axis[j] == i`.\n\n`tensor` can have up to 8 dimensions. The number of dimensions specified\nin `axis` may be 0 or more entries. If an index is specified more than\nonce, a InvalidArgument error is raised.\n\nFor example:\n\n```\n# tensor \'t\' is [[[[ 0,  1,  2,  3],\n#                  [ 4,  5,  6,  7],\n#                  [ 8,  9, 10, 11]],\n#                 [[12, 13, 14, 15],\n#                  [16, 17, 18, 19],\n#                  [20, 21, 22, 23]]]]\n# tensor \'t\' shape is [1, 2, 3, 4]\n\n# \'dims\' is [3] or \'dims\' is -1\nreverse(t, dims) ==> [[[[ 3,  2,  1,  0],\n                        [ 7,  6,  5,  4],\n                        [ 11, 10, 9, 8]],\n                       [[15, 14, 13, 12],\n                        [19, 18, 17, 16],\n                        [23, 22, 21, 20]]]]\n\n# \'dims\' is \'[1]\' (or \'dims\' is \'[-3]\')\nreverse(t, dims) ==> [[[[12, 13, 14, 15],\n                        [16, 17, 18, 19],\n                        [20, 21, 22, 23]\n                       [[ 0,  1,  2,  3],\n                        [ 4,  5,  6,  7],\n                        [ 8,  9, 10, 11]]]]\n\n# \'dims\' is \'[2]\' (or \'dims\' is \'[-2]\')\nreverse(t, dims) ==> [[[[8, 9, 10, 11],\n                        [4, 5, 6, 7],\n                        [0, 1, 2, 3]]\n                       [[20, 21, 22, 23],\n                        [16, 17, 18, 19],\n                        [12, 13, 14, 15]]]]\n```"
 }
 op {
   name: "Rint"
@@ -19022,7 +19022,7 @@ op {
     description: "If True, the addition will be protected by a lock;\notherwise the behavior is undefined, but may exhibit less contention."
   }
   summary: "Adds sparse updates to a variable reference."
-  description: "This operation computes\n\n    # Scalar indices\n    ref[indices, ...] += updates[...]\n\n    # Vector indices (for each i)\n    ref[indices[i], ...] += updates[i, ...]\n\n    # High rank indices (for each i, ..., j)\n    ref[indices[i, ..., j], ...] += updates[i, ..., j, ...]\n\nThis operation outputs `ref` after the update is done.\nThis makes it easier to chain operations that need to use the reset value.\n\nDuplicate entries are handled correctly: if multiple `indices` reference\nthe same location, their contributions add.\n\nRequires `updates.shape = indices.shape + ref.shape[1:]`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterAdd.png\" alt>\n</div>"
+  description: "This operation computes\n\n    # Scalar indices\n    ref[indices, ...] += updates[...]\n\n    # Vector indices (for each i)\n    ref[indices[i], ...] += updates[i, ...]\n\n    # High rank indices (for each i, ..., j)\n    ref[indices[i, ..., j], ...] += updates[i, ..., j, ...]\n\nThis operation outputs `ref` after the update is done.\nThis makes it easier to chain operations that need to use the reset value.\n\nDuplicate entries are handled correctly: if multiple `indices` reference\nthe same location, their contributions add.\n\nRequires `updates.shape = indices.shape + ref.shape[1:]`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/ScatterAdd.png\" alt>\n</div>"
 }
 op {
   name: "ScatterDiv"
@@ -19195,7 +19195,7 @@ op {
     }
   }
   summary: "Scatter `updates` into a new (initially zero) tensor according to `indices`."
-  description: "Creates a new tensor by applying sparse `updates` to individual\nvalues or slices within a zero tensor of the given `shape` according to\nindices.  This operator is the inverse of the [tf.gather_nd](#gather_nd)\noperator which extracts values or slices from a given tensor.\n\n**WARNING**: The order in which updates are applied is nondeterministic, so the\noutput will be nondeterministic if `indices` contains duplicates.\n\n`indices` is an integer tensor containing indices into a new tensor of shape\n`shape`.  The last dimension of `indices` can be at most the rank of `shape`:\n\n    indices.shape[-1] <= shape.rank\n\nThe last dimension of `indices` corresponds to indices into elements\n(if `indices.shape[-1] = shape.rank`) or slices\n(if `indices.shape[-1] < shape.rank`) along dimension `indices.shape[-1]` of\n`shape`.  `updates` is a tensor with shape\n\n    indices.shape[:-1] + shape[indices.shape[-1]:]\n\nThe simplest form of scatter is to insert individual elements in a tensor by\nindex. For example, say we want to insert 4 scattered elements in a rank-1\ntensor with 8 elements.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterNd1.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[4], [3], [1], [7]])\n    updates = tf.constant([9, 10, 11, 12])\n    shape = tf.constant([8])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print(sess.run(scatter))\n```\n\nThe resulting tensor would look like this:\n\n    [0, 11, 0, 10, 9, 0, 0, 12]\n\nWe can also, insert entire slices of a higher rank tensor all at once. For\nexample, if we wanted to insert two slices in the first dimension of a\nrank-3 tensor with two matrices of new values.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterNd2.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[0], [2]])\n    updates = tf.constant([[[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]],\n                           [[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]]])\n    shape = tf.constant([4, 4, 4])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print(sess.run(scatter))\n```\n\nThe resulting tensor would look like this:\n\n    [[[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]],\n     [[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]]"
+  description: "Creates a new tensor by applying sparse `updates` to individual\nvalues or slices within a zero tensor of the given `shape` according to\nindices.  This operator is the inverse of the [tf.gather_nd](#gather_nd)\noperator which extracts values or slices from a given tensor.\n\n**WARNING**: The order in which updates are applied is nondeterministic, so the\noutput will be nondeterministic if `indices` contains duplicates.\n\n`indices` is an integer tensor containing indices into a new tensor of shape\n`shape`.  The last dimension of `indices` can be at most the rank of `shape`:\n\n    indices.shape[-1] <= shape.rank\n\nThe last dimension of `indices` corresponds to indices into elements\n(if `indices.shape[-1] = shape.rank`) or slices\n(if `indices.shape[-1] < shape.rank`) along dimension `indices.shape[-1]` of\n`shape`.  `updates` is a tensor with shape\n\n    indices.shape[:-1] + shape[indices.shape[-1]:]\n\nThe simplest form of scatter is to insert individual elements in a tensor by\nindex. For example, say we want to insert 4 scattered elements in a rank-1\ntensor with 8 elements.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/ScatterNd1.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[4], [3], [1], [7]])\n    updates = tf.constant([9, 10, 11, 12])\n    shape = tf.constant([8])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print(sess.run(scatter))\n```\n\nThe resulting tensor would look like this:\n\n    [0, 11, 0, 10, 9, 0, 0, 12]\n\nWe can also, insert entire slices of a higher rank tensor all at once. For\nexample, if we wanted to insert two slices in the first dimension of a\nrank-3 tensor with two matrices of new values.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/ScatterNd2.png\" alt>\n</div>\n\nIn Python, this scatter operation would look like this:\n\n```python\n    indices = tf.constant([[0], [2]])\n    updates = tf.constant([[[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]],\n                           [[5, 5, 5, 5], [6, 6, 6, 6],\n                            [7, 7, 7, 7], [8, 8, 8, 8]]])\n    shape = tf.constant([4, 4, 4])\n    scatter = tf.scatter_nd(indices, updates, shape)\n    with tf.Session() as sess:\n      print(sess.run(scatter))\n```\n\nThe resulting tensor would look like this:\n\n    [[[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]],\n     [[5, 5, 5, 5], [6, 6, 6, 6], [7, 7, 7, 7], [8, 8, 8, 8]],\n     [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]]"
 }
 op {
   name: "ScatterNdAdd"
@@ -19445,7 +19445,7 @@ op {
     description: "If True, the subtraction will be protected by a lock;\notherwise the behavior is undefined, but may exhibit less contention."
   }
   summary: "Subtracts sparse updates to a variable reference."
-  description: "```python\n    # Scalar indices\n    ref[indices, ...] -= updates[...]\n\n    # Vector indices (for each i)\n    ref[indices[i], ...] -= updates[i, ...]\n\n    # High rank indices (for each i, ..., j)\n    ref[indices[i, ..., j], ...] -= updates[i, ..., j, ...]\n```\n\nThis operation outputs `ref` after the update is done.\nThis makes it easier to chain operations that need to use the reset value.\n\nDuplicate entries are handled correctly: if multiple `indices` reference\nthe same location, their (negated) contributions add.\n\nRequires `updates.shape = indices.shape + ref.shape[1:]`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterSub.png\" alt>\n</div>"
+  description: "```python\n    # Scalar indices\n    ref[indices, ...] -= updates[...]\n\n    # Vector indices (for each i)\n    ref[indices[i], ...] -= updates[i, ...]\n\n    # High rank indices (for each i, ..., j)\n    ref[indices[i, ..., j], ...] -= updates[i, ..., j, ...]\n```\n\nThis operation outputs `ref` after the update is done.\nThis makes it easier to chain operations that need to use the reset value.\n\nDuplicate entries are handled correctly: if multiple `indices` reference\nthe same location, their (negated) contributions add.\n\nRequires `updates.shape = indices.shape + ref.shape[1:]`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/ScatterSub.png\" alt>\n</div>"
 }
 op {
   name: "ScatterUpdate"
@@ -19494,7 +19494,7 @@ op {
     description: "If True, the assignment will be protected by a lock;\notherwise the behavior is undefined, but may exhibit less contention."
   }
   summary: "Applies sparse updates to a variable reference."
-  description: "This operation computes\n\n```python\n    # Scalar indices\n    ref[indices, ...] = updates[...]\n\n    # Vector indices (for each i)\n    ref[indices[i], ...] = updates[i, ...]\n\n    # High rank indices (for each i, ..., j)\n    ref[indices[i, ..., j], ...] = updates[i, ..., j, ...]\n```\n\nThis operation outputs `ref` after the update is done.\nThis makes it easier to chain operations that need to use the reset value.\n\nIf values in `ref` is to be updated more than once, because there are\nduplicate entries in `indices`, the order at which the updates happen\nfor each value is undefined.\n\nRequires `updates.shape = indices.shape + ref.shape[1:]`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"../../images/ScatterUpdate.png\" alt>\n</div>"
+  description: "This operation computes\n\n```python\n    # Scalar indices\n    ref[indices, ...] = updates[...]\n\n    # Vector indices (for each i)\n    ref[indices[i], ...] = updates[i, ...]\n\n    # High rank indices (for each i, ..., j)\n    ref[indices[i, ..., j], ...] = updates[i, ..., j, ...]\n```\n\nThis operation outputs `ref` after the update is done.\nThis makes it easier to chain operations that need to use the reset value.\n\nIf values in `ref` is to be updated more than once, because there are\nduplicate entries in `indices`, the order at which the updates happen\nfor each value is undefined.\n\nRequires `updates.shape = indices.shape + ref.shape[1:]`.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/ScatterUpdate.png\" alt>\n</div>"
 }
 op {
   name: "SdcaFprint"
@@ -20146,7 +20146,7 @@ op {
     }
   }
   summary: "Returns the shape of a tensor."
-  description: "This operation returns a 1-D integer tensor representing the shape of `input`.\n\nFor example:\n\n```prettyprint\n# \'t\' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]\nshape(t) ==> [2, 2, 3]\n```"
+  description: "This operation returns a 1-D integer tensor representing the shape of `input`.\n\nFor example:\n\n```\n# \'t\' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]\nshape(t) ==> [2, 2, 3]\n```"
 }
 op {
   name: "ShapeN"
@@ -20360,7 +20360,7 @@ op {
     }
   }
   summary: "Returns the size of a tensor."
-  description: "This operation returns an integer representing the number of elements in\n`input`.\n\nFor example:\n\n```prettyprint\n# \'t\' is [[[1, 1,, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]]\nsize(t) ==> 12\n```"
+  description: "This operation returns an integer representing the number of elements in\n`input`.\n\nFor example:\n\n```\n# \'t\' is [[[1, 1,, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]]\nsize(t) ==> 12\n```"
 }
 op {
   name: "Skipgram"
@@ -20678,7 +20678,7 @@ op {
   }
   input_arg {
     name: "paddings"
-    description: "2-D tensor of non-negative integers with shape `[2, 2]`. It specifies\n  the padding of the input with zeros across the spatial dimensions as follows:\n\n      paddings = [[pad_top, pad_bottom], [pad_left, pad_right]]\n\n  The effective spatial dimensions of the zero-padded input tensor will be:\n\n      height_pad = pad_top + height + pad_bottom\n      width_pad = pad_left + width + pad_right\n\nThe attr `block_size` must be greater than one. It indicates the block size.\n\n  * Non-overlapping blocks of size `block_size x block size` in the height and\n    width dimensions are rearranged into the batch dimension at each location.\n  * The batch of the output tensor is `batch * block_size * block_size`.\n  * Both height_pad and width_pad must be divisible by block_size.\n\nThe shape of the output will be:\n\n    [batch*block_size*block_size, height_pad/block_size, width_pad/block_size,\n     depth]\n\nSome examples:\n\n(1) For the following input of shape `[1, 2, 2, 1]` and block_size of 2:\n\n```prettyprint\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 1]` and value:\n\n```prettyprint\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\n(2) For the following input of shape `[1, 2, 2, 3]` and block_size of 2:\n\n```prettyprint\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 3]` and value:\n\n```prettyprint\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\n(3) For the following input of shape `[1, 4, 4, 1]` and block_size of 2:\n\n```prettyprint\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]],\n      [[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[4, 2, 2, 1]` and value:\n\n```prettyprint\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\n(4) For the following input of shape `[2, 2, 4, 1]` and block_size of 2:\n\n```prettyprint\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]]],\n     [[[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[8, 1, 2, 1]` and value:\n\n```prettyprint\nx = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],\n     [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]\n```\n\nAmong others, this operation is useful for reducing atrous convolution into\nregular convolution."
+    description: "2-D tensor of non-negative integers with shape `[2, 2]`. It specifies\n  the padding of the input with zeros across the spatial dimensions as follows:\n\n      paddings = [[pad_top, pad_bottom], [pad_left, pad_right]]\n\n  The effective spatial dimensions of the zero-padded input tensor will be:\n\n      height_pad = pad_top + height + pad_bottom\n      width_pad = pad_left + width + pad_right\n\nThe attr `block_size` must be greater than one. It indicates the block size.\n\n  * Non-overlapping blocks of size `block_size x block size` in the height and\n    width dimensions are rearranged into the batch dimension at each location.\n  * The batch of the output tensor is `batch * block_size * block_size`.\n  * Both height_pad and width_pad must be divisible by block_size.\n\nThe shape of the output will be:\n\n    [batch*block_size*block_size, height_pad/block_size, width_pad/block_size,\n     depth]\n\nSome examples:\n\n(1) For the following input of shape `[1, 2, 2, 1]` and block_size of 2:\n\n```\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 1]` and value:\n\n```\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\n(2) For the following input of shape `[1, 2, 2, 3]` and block_size of 2:\n\n```\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 3]` and value:\n\n```\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\n(3) For the following input of shape `[1, 4, 4, 1]` and block_size of 2:\n\n```\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]],\n      [[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[4, 2, 2, 1]` and value:\n\n```\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\n(4) For the following input of shape `[2, 2, 4, 1]` and block_size of 2:\n\n```\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]]],\n     [[[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[8, 1, 2, 1]` and value:\n\n```\nx = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],\n     [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]\n```\n\nAmong others, this operation is useful for reducing atrous convolution into\nregular convolution."
     type_attr: "Tpaddings"
   }
   output_arg {
@@ -20725,7 +20725,7 @@ op {
   }
   input_arg {
     name: "paddings"
-    description: "2-D with shape `[M, 2]`, all values must be >= 0.\n  `paddings[i] = [pad_start, pad_end]` specifies the padding for input dimension\n  `i + 1`, which corresponds to spatial dimension `i`.  It is required that\n  `block_shape[i]` divides `input_shape[i + 1] + pad_start + pad_end`.\n\nThis operation is equivalent to the following steps:\n\n1. Zero-pad the start and end of dimensions `[1, ..., M]` of the\n   input according to `paddings` to produce `padded` of shape `padded_shape`.\n\n2. Reshape `padded` to `reshaped_padded` of shape:\n\n     [batch] +\n     [padded_shape[1] / block_shape[0],\n       block_shape[0],\n      ...,\n      padded_shape[M] / block_shape[M-1],\n      block_shape[M-1]] +\n     remaining_shape\n\n3. Permute dimensions of `reshaped_padded` to produce\n   `permuted_reshaped_padded` of shape:\n\n     block_shape +\n     [batch] +\n     [padded_shape[1] / block_shape[0],\n      ...,\n      padded_shape[M] / block_shape[M-1]] +\n     remaining_shape\n\n4. Reshape `permuted_reshaped_padded` to flatten `block_shape` into the batch\n   dimension, producing an output tensor of shape:\n\n     [batch * prod(block_shape)] +\n     [padded_shape[1] / block_shape[0],\n      ...,\n      padded_shape[M] / block_shape[M-1]] +\n     remaining_shape\n\nSome examples:\n\n(1) For the following input of shape `[1, 2, 2, 1]`, `block_shape = [2, 2]`, and\n    `paddings = [[0, 0], [0, 0]]`:\n\n```prettyprint\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 1]` and value:\n\n```prettyprint\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\n(2) For the following input of shape `[1, 2, 2, 3]`, `block_shape = [2, 2]`, and\n    `paddings = [[0, 0], [0, 0]]`:\n\n```prettyprint\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 3]` and value:\n\n```prettyprint\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\n(3) For the following input of shape `[1, 4, 4, 1]`, `block_shape = [2, 2]`, and\n    `paddings = [[0, 0], [0, 0]]`:\n\n```prettyprint\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]],\n      [[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[4, 2, 2, 1]` and value:\n\n```prettyprint\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\n(4) For the following input of shape `[2, 2, 4, 1]`, block_shape = `[2, 2]`, and\n    paddings = `[[0, 0], [2, 0]]`:\n\n```prettyprint\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]]],\n     [[[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[8, 1, 3, 1]` and value:\n\n```prettyprint\nx = [[[[0], [1], [3]]], [[[0], [9], [11]]],\n     [[[0], [2], [4]]], [[[0], [10], [12]]],\n     [[[0], [5], [7]]], [[[0], [13], [15]]],\n     [[[0], [6], [8]]], [[[0], [14], [16]]]]\n```\n\nAmong others, this operation is useful for reducing atrous convolution into\nregular convolution."
+    description: "2-D with shape `[M, 2]`, all values must be >= 0.\n  `paddings[i] = [pad_start, pad_end]` specifies the padding for input dimension\n  `i + 1`, which corresponds to spatial dimension `i`.  It is required that\n  `block_shape[i]` divides `input_shape[i + 1] + pad_start + pad_end`.\n\nThis operation is equivalent to the following steps:\n\n1. Zero-pad the start and end of dimensions `[1, ..., M]` of the\n   input according to `paddings` to produce `padded` of shape `padded_shape`.\n\n2. Reshape `padded` to `reshaped_padded` of shape:\n\n     [batch] +\n     [padded_shape[1] / block_shape[0],\n       block_shape[0],\n      ...,\n      padded_shape[M] / block_shape[M-1],\n      block_shape[M-1]] +\n     remaining_shape\n\n3. Permute dimensions of `reshaped_padded` to produce\n   `permuted_reshaped_padded` of shape:\n\n     block_shape +\n     [batch] +\n     [padded_shape[1] / block_shape[0],\n      ...,\n      padded_shape[M] / block_shape[M-1]] +\n     remaining_shape\n\n4. Reshape `permuted_reshaped_padded` to flatten `block_shape` into the batch\n   dimension, producing an output tensor of shape:\n\n     [batch * prod(block_shape)] +\n     [padded_shape[1] / block_shape[0],\n      ...,\n      padded_shape[M] / block_shape[M-1]] +\n     remaining_shape\n\nSome examples:\n\n(1) For the following input of shape `[1, 2, 2, 1]`, `block_shape = [2, 2]`, and\n    `paddings = [[0, 0], [0, 0]]`:\n\n```\nx = [[[[1], [2]], [[3], [4]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 1]` and value:\n\n```\n[[[[1]]], [[[2]]], [[[3]]], [[[4]]]]\n```\n\n(2) For the following input of shape `[1, 2, 2, 3]`, `block_shape = [2, 2]`, and\n    `paddings = [[0, 0], [0, 0]]`:\n\n```\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\nThe output tensor has shape `[4, 1, 1, 3]` and value:\n\n```\n[[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]\n```\n\n(3) For the following input of shape `[1, 4, 4, 1]`, `block_shape = [2, 2]`, and\n    `paddings = [[0, 0], [0, 0]]`:\n\n```\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]],\n      [[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[4, 2, 2, 1]` and value:\n\n```\nx = [[[[1], [3]], [[9], [11]]],\n     [[[2], [4]], [[10], [12]]],\n     [[[5], [7]], [[13], [15]]],\n     [[[6], [8]], [[14], [16]]]]\n```\n\n(4) For the following input of shape `[2, 2, 4, 1]`, block_shape = `[2, 2]`, and\n    paddings = `[[0, 0], [2, 0]]`:\n\n```\nx = [[[[1],   [2],  [3],  [4]],\n      [[5],   [6],  [7],  [8]]],\n     [[[9],  [10], [11],  [12]],\n      [[13], [14], [15],  [16]]]]\n```\n\nThe output tensor has shape `[8, 1, 3, 1]` and value:\n\n```\nx = [[[[0], [1], [3]]], [[[0], [9], [11]]],\n     [[[0], [2], [4]]], [[[0], [10], [12]]],\n     [[[0], [5], [7]]], [[[0], [13], [15]]],\n     [[[0], [6], [8]]], [[[0], [14], [16]]]]\n```\n\nAmong others, this operation is useful for reducing atrous convolution into\nregular convolution."
     type_attr: "Tpaddings"
   }
   output_arg {
@@ -20787,7 +20787,7 @@ op {
     minimum: 2
   }
   summary: "SpaceToDepth for tensors of type T."
-  description: "Rearranges blocks of spatial data, into depth. More specifically,\nthis op outputs a copy of the input tensor where values from the `height`\nand `width` dimensions are moved to the `depth` dimension.\nThe attr `block_size` indicates the input block size and how the data is moved.\n\n  * Non-overlapping blocks of size `block_size x block size` are rearranged\n    into depth at each location.\n  * The depth of the output tensor is `input_depth * block_size * block_size`.\n  * The input tensor\'s height and width must be divisible by block_size.\n\nThat is, assuming the input is in the shape:\n`[batch, height, width, depth]`,\nthe shape of the output will be:\n`[batch, height/block_size, width/block_size, depth*block_size*block_size]`\n\nThis operation requires that the input tensor be of rank 4, and that\n`block_size` be >=1 and a divisor of both the input `height` and `width`.\n\nThis operation is useful for resizing the activations between convolutions\n(but keeping all data), e.g. instead of pooling. It is also useful for training\npurely convolutional models.\n\nFor example, given this input of shape `[1, 2, 2, 1]`, and block_size of 2:\n\n```prettyprint\nx = [[[[1], [2]],\n      [[3], [4]]]]\n```\n\nThis operation will output a tensor of shape `[1, 1, 1, 4]`:\n\n```prettyprint\n[[[[1, 2, 3, 4]]]]\n```\n\nHere, the input has a batch of 1 and each batch element has shape `[2, 2, 1]`,\nthe corresponding output will have a single element (i.e. width and height are\nboth 1) and will have a depth of 4 channels (1 * block_size * block_size).\nThe output element shape is `[1, 1, 4]`.\n\nFor an input tensor with larger depth, here of shape `[1, 2, 2, 3]`, e.g.\n\n```prettyprint\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\nThis operation, for block_size of 2, will return the following tensor of shape\n`[1, 1, 1, 12]`\n\n```prettyprint\n[[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]\n```\n\nSimilarly, for the following input of shape `[1 4 4 1]`, and a block size of 2:\n\n```prettyprint\nx = [[[[1],   [2],  [5],  [6]],\n      [[3],   [4],  [7],  [8]],\n      [[9],  [10], [13],  [14]],\n      [[11], [12], [15],  [16]]]]\n```\n\nthe operator will return the following tensor of shape `[1 2 2 4]`:\n\n```prettyprint\nx = [[[[1, 2, 3, 4],\n       [5, 6, 7, 8]],\n      [[9, 10, 11, 12],\n       [13, 14, 15, 16]]]]\n```"
+  description: "Rearranges blocks of spatial data, into depth. More specifically,\nthis op outputs a copy of the input tensor where values from the `height`\nand `width` dimensions are moved to the `depth` dimension.\nThe attr `block_size` indicates the input block size and how the data is moved.\n\n  * Non-overlapping blocks of size `block_size x block size` are rearranged\n    into depth at each location.\n  * The depth of the output tensor is `input_depth * block_size * block_size`.\n  * The input tensor\'s height and width must be divisible by block_size.\n\nThat is, assuming the input is in the shape:\n`[batch, height, width, depth]`,\nthe shape of the output will be:\n`[batch, height/block_size, width/block_size, depth*block_size*block_size]`\n\nThis operation requires that the input tensor be of rank 4, and that\n`block_size` be >=1 and a divisor of both the input `height` and `width`.\n\nThis operation is useful for resizing the activations between convolutions\n(but keeping all data), e.g. instead of pooling. It is also useful for training\npurely convolutional models.\n\nFor example, given this input of shape `[1, 2, 2, 1]`, and block_size of 2:\n\n```\nx = [[[[1], [2]],\n      [[3], [4]]]]\n```\n\nThis operation will output a tensor of shape `[1, 1, 1, 4]`:\n\n```\n[[[[1, 2, 3, 4]]]]\n```\n\nHere, the input has a batch of 1 and each batch element has shape `[2, 2, 1]`,\nthe corresponding output will have a single element (i.e. width and height are\nboth 1) and will have a depth of 4 channels (1 * block_size * block_size).\nThe output element shape is `[1, 1, 4]`.\n\nFor an input tensor with larger depth, here of shape `[1, 2, 2, 3]`, e.g.\n\n```\nx = [[[[1, 2, 3], [4, 5, 6]],\n      [[7, 8, 9], [10, 11, 12]]]]\n```\n\nThis operation, for block_size of 2, will return the following tensor of shape\n`[1, 1, 1, 12]`\n\n```\n[[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]\n```\n\nSimilarly, for the following input of shape `[1 4 4 1]`, and a block size of 2:\n\n```\nx = [[[[1],   [2],  [5],  [6]],\n      [[3],   [4],  [7],  [8]],\n      [[9],  [10], [13],  [14]],\n      [[11], [12], [15],  [16]]]]\n```\n\nthe operator will return the following tensor of shape `[1 2 2 4]`:\n\n```\nx = [[[[1, 2, 3, 4],\n       [5, 6, 7, 8]],\n      [[9, 10, 11, 12],\n       [13, 14, 15, 16]]]]\n```"
 }
 op {
   name: "SparseAccumulatorApplyGradient"
@@ -23399,7 +23399,7 @@ op {
     has_minimum: true
   }
   summary: "Removes dimensions of size 1 from the shape of a tensor."
-  description: "Given a tensor `input`, this operation returns a tensor of the same type with\nall dimensions of size 1 removed. If you don\'t want to remove all size 1\ndimensions, you can remove specific size 1 dimensions by specifying\n`squeeze_dims`.\n\nFor example:\n\n```prettyprint\n# \'t\' is a tensor of shape [1, 2, 1, 3, 1, 1]\nshape(squeeze(t)) ==> [2, 3]\n```\n\nOr, to remove specific size 1 dimensions:\n\n```prettyprint\n# \'t\' is a tensor of shape [1, 2, 1, 3, 1, 1]\nshape(squeeze(t, [2, 4])) ==> [1, 2, 3, 1]\n```"
+  description: "Given a tensor `input`, this operation returns a tensor of the same type with\nall dimensions of size 1 removed. If you don\'t want to remove all size 1\ndimensions, you can remove specific size 1 dimensions by specifying\n`squeeze_dims`.\n\nFor example:\n\n```\n# \'t\' is a tensor of shape [1, 2, 1, 3, 1, 1]\nshape(squeeze(t)) ==> [2, 3]\n```\n\nOr, to remove specific size 1 dimensions:\n\n```\n# \'t\' is a tensor of shape [1, 2, 1, 3, 1, 1]\nshape(squeeze(t, [2, 4])) ==> [1, 2, 3, 1]\n```"
 }
 op {
   name: "Stack"
@@ -23761,7 +23761,7 @@ op {
     description: "a bitmask where bit `i` implies that the `i`th\nspecification should shrink the dimensionality. begin and end\nmust imply a slice of size 1 in the dimension. For example in\npython one might do `foo[:, 3, :]` which would result in\n`shrink_axis_mask` being 2."
   }
   summary: "Return a strided slice from `input`."
-  description: "Note, most python users will want to use the Python `Tensor.__getitem__`\nor `Variable.__getitem__` rather than this op directly.\n\nThe goal of this op is to produce a new tensor with a subset of\nthe elements from the `n` dimensional `input` tensor. The subset is chosen using\na sequence of `m` sparse range specifications encoded into the arguments\nof this function. Note, in some cases\n`m` could be equal to `n`, but this need not be the case. Each\nrange specification entry can be one of the following:\n\n- An ellipsis (...). Ellipses are used to imply zero or more\n  dimensions of full-dimension selection and are produced using\n  `ellipsis_mask`. For example, `foo[...]` is the identity slice.\n\n- A new axis. This is used to insert a new shape=1 dimension and is\n  produced using `new_axis_mask`. For example, `foo[:, ...]` where\n  `foo` is shape `(3, 4)` produces a `(1, 3, 4)` tensor.\n\n\n- A range `begin:end:stride`. This is used to specify how much to choose from\n  a given dimension. `stride` can be any integer but 0.  `begin` is an integer\n  which represents the index of the first value to select while `end` represents\n  the index of the last value to select. The number of values selected in each\n  dimension is `end - begin` if `stride > 0` and `begin - end` if `stride < 0`.\n  `begin` and `end` can be negative where `-1` is the last element, `-2` is\n  the second to last. `begin_mask` controls whether to replace the explicitly\n  given `begin` with an implicit effective value of `0` if `stride > 0` and\n  `-1` if `stride < 0`. `end_mask` is analogous but produces the number\n  required to create the largest open interval. For example, given a shape\n  `(3,)` tensor `foo[:]`, the effective `begin` and `end` are `0` and `3`. Do\n  not assume this is equivalent to `foo[0:-1]` which has an effective `begin`\n  and `end` of `0` and `2`. Another example is `foo[-2::-1]` which reverses the\n  first dimension of a tensor while dropping the last two (in the original\n  order elements). For example `foo = [1,2,3,4]; foo[-2::-1]` is `[4,3]`.\n\n- A single index. This is used to keep only elements that have a given\n  index. For example (`foo[2, :]` on a shape `(5,6)` tensor produces a\n  shape `(6,)` tensor. This is encoded in `begin` and `end` and\n  `shrink_axis_mask`.\n\nEach conceptual range specification is encoded in the op\'s argument. This\nencoding is best understand by considering a non-trivial example. In\nparticular,\n`foo[1, 2:4, None, ..., :-3:-1, :]` will be encoded as\n\n```prettyprint\nbegin = [1, 2, x, x, 0, x] # x denotes don\'t care (usually 0)\nend = [2, 4, x, x, -3, x]\nstrides = [1, 1, x, x, -1, 1]\nbegin_mask = 1<<4 | 1 << 5 = 48\nend_mask = 1<<5 = 32\nellipsis_mask = 1<<3 = 8\nnew_axis_mask = 1<<2 4\nshrink_axis_mask = 1<<0\n```\n\nIn this case if `foo.shape` is (5, 5, 5, 5, 5, 5) the final shape of\nthe slice becomes (2, 1, 5, 5, 2, 5).\nLet us walk step by step through each argument specification.\n\n1.  The first argument in the example slice is turned into `begin = 1` and\n`end = begin + 1 = 2`. To disambiguate from the original spec `2:4` we\nalso set the appropriate bit in `shrink_axis_mask`.\n\n2. `2:4` is contributes 2, 4, 1 to begin, end, and stride. All masks have\nzero bits contributed.\n\n3. None is a synonym for `tf.newaxis`. This means insert a dimension of size 1\ndimension in the final shape. Dummy values are contributed to begin,\nend and stride, while the new_axis_mask bit is set.\n\n4. `...` grab the full ranges from as many dimensions as needed to\nfully specify a slice for every dimension of the input shape.\n\n5. `:-3:-1` shows the use of negative indices. A negative index `i` associated\nwith a dimension that has shape `s` is converted to a positive index\n`s + i`. So `-1` becomes `s-1` (i.e. the last element). This conversion\nis done internally so begin, end and strides receive x, -3, and -1.\nThe appropriate begin_mask bit is set to indicate the start range is the\nfull range (ignoring the x).\n\n6. `:` indicates that the entire contents of the corresponding dimension\nis selected. This is equivalent to `::` or `0::1`. begin, end, and strides\nreceive 0, 0, and 1, respectively. The appropriate bits in `begin_mask` and\n`end_mask` are also set.\n\n*Requirements*:\n  `0 != strides[i] for i in [0, m)`\n  `ellipsis_mask must be a power of two (only one ellipsis)`"
+  description: "Note, most python users will want to use the Python `Tensor.__getitem__`\nor `Variable.__getitem__` rather than this op directly.\n\nThe goal of this op is to produce a new tensor with a subset of\nthe elements from the `n` dimensional `input` tensor. The subset is chosen using\na sequence of `m` sparse range specifications encoded into the arguments\nof this function. Note, in some cases\n`m` could be equal to `n`, but this need not be the case. Each\nrange specification entry can be one of the following:\n\n- An ellipsis (...). Ellipses are used to imply zero or more\n  dimensions of full-dimension selection and are produced using\n  `ellipsis_mask`. For example, `foo[...]` is the identity slice.\n\n- A new axis. This is used to insert a new shape=1 dimension and is\n  produced using `new_axis_mask`. For example, `foo[:, ...]` where\n  `foo` is shape `(3, 4)` produces a `(1, 3, 4)` tensor.\n\n\n- A range `begin:end:stride`. This is used to specify how much to choose from\n  a given dimension. `stride` can be any integer but 0.  `begin` is an integer\n  which represents the index of the first value to select while `end` represents\n  the index of the last value to select. The number of values selected in each\n  dimension is `end - begin` if `stride > 0` and `begin - end` if `stride < 0`.\n  `begin` and `end` can be negative where `-1` is the last element, `-2` is\n  the second to last. `begin_mask` controls whether to replace the explicitly\n  given `begin` with an implicit effective value of `0` if `stride > 0` and\n  `-1` if `stride < 0`. `end_mask` is analogous but produces the number\n  required to create the largest open interval. For example, given a shape\n  `(3,)` tensor `foo[:]`, the effective `begin` and `end` are `0` and `3`. Do\n  not assume this is equivalent to `foo[0:-1]` which has an effective `begin`\n  and `end` of `0` and `2`. Another example is `foo[-2::-1]` which reverses the\n  first dimension of a tensor while dropping the last two (in the original\n  order elements). For example `foo = [1,2,3,4]; foo[-2::-1]` is `[4,3]`.\n\n- A single index. This is used to keep only elements that have a given\n  index. For example (`foo[2, :]` on a shape `(5,6)` tensor produces a\n  shape `(6,)` tensor. This is encoded in `begin` and `end` and\n  `shrink_axis_mask`.\n\nEach conceptual range specification is encoded in the op\'s argument. This\nencoding is best understand by considering a non-trivial example. In\nparticular,\n`foo[1, 2:4, None, ..., :-3:-1, :]` will be encoded as\n\n```\nbegin = [1, 2, x, x, 0, x] # x denotes don\'t care (usually 0)\nend = [2, 4, x, x, -3, x]\nstrides = [1, 1, x, x, -1, 1]\nbegin_mask = 1<<4 | 1 << 5 = 48\nend_mask = 1<<5 = 32\nellipsis_mask = 1<<3 = 8\nnew_axis_mask = 1<<2 4\nshrink_axis_mask = 1<<0\n```\n\nIn this case if `foo.shape` is (5, 5, 5, 5, 5, 5) the final shape of\nthe slice becomes (2, 1, 5, 5, 2, 5).\nLet us walk step by step through each argument specification.\n\n1.  The first argument in the example slice is turned into `begin = 1` and\n`end = begin + 1 = 2`. To disambiguate from the original spec `2:4` we\nalso set the appropriate bit in `shrink_axis_mask`.\n\n2. `2:4` is contributes 2, 4, 1 to begin, end, and stride. All masks have\nzero bits contributed.\n\n3. None is a synonym for `tf.newaxis`. This means insert a dimension of size 1\ndimension in the final shape. Dummy values are contributed to begin,\nend and stride, while the new_axis_mask bit is set.\n\n4. `...` grab the full ranges from as many dimensions as needed to\nfully specify a slice for every dimension of the input shape.\n\n5. `:-3:-1` shows the use of negative indices. A negative index `i` associated\nwith a dimension that has shape `s` is converted to a positive index\n`s + i`. So `-1` becomes `s-1` (i.e. the last element). This conversion\nis done internally so begin, end and strides receive x, -3, and -1.\nThe appropriate begin_mask bit is set to indicate the start range is the\nfull range (ignoring the x).\n\n6. `:` indicates that the entire contents of the corresponding dimension\nis selected. This is equivalent to `::` or `0::1`. begin, end, and strides\nreceive 0, 0, and 1, respectively. The appropriate bits in `begin_mask` and\n`end_mask` are also set.\n\n*Requirements*:\n  `0 != strides[i] for i in [0, m)`\n  `ellipsis_mask must be a power of two (only one ellipsis)`"
 }
 op {
   name: "StridedSliceAssign"
@@ -26120,7 +26120,7 @@ op {
     }
   }
   summary: "Finds unique elements in a 1-D tensor."
-  description: "This operation returns a tensor `y` containing all of the unique elements of `x`\nsorted in the same order that they occur in `x`. This operation also returns a\ntensor `idx` the same size as `x` that contains the index of each value of `x`\nin the unique output `y`. In other words:\n\n`y[idx[i]] = x[i] for i in [0, 1,...,rank(x) - 1]`\n\nFor example:\n\n```prettyprint\n# tensor \'x\' is [1, 1, 2, 4, 4, 4, 7, 8, 8]\ny, idx = unique(x)\ny ==> [1, 2, 4, 7, 8]\nidx ==> [0, 0, 1, 2, 2, 2, 3, 4, 4]\n```"
+  description: "This operation returns a tensor `y` containing all of the unique elements of `x`\nsorted in the same order that they occur in `x`. This operation also returns a\ntensor `idx` the same size as `x` that contains the index of each value of `x`\nin the unique output `y`. In other words:\n\n`y[idx[i]] = x[i] for i in [0, 1,...,rank(x) - 1]`\n\nFor example:\n\n```\n# tensor \'x\' is [1, 1, 2, 4, 4, 4, 7, 8, 8]\ny, idx = unique(x)\ny ==> [1, 2, 4, 7, 8]\nidx ==> [0, 0, 1, 2, 2, 2, 3, 4, 4]\n```"
 }
 op {
   name: "UniqueWithCounts"
@@ -26162,7 +26162,7 @@ op {
     }
   }
   summary: "Finds unique elements in a 1-D tensor."
-  description: "This operation returns a tensor `y` containing all of the unique elements of `x`\nsorted in the same order that they occur in `x`. This operation also returns a\ntensor `idx` the same size as `x` that contains the index of each value of `x`\nin the unique output `y`. Finally, it returns a third tensor `count` that\ncontains the count of each element of `y` in `x`. In other words:\n\n`y[idx[i]] = x[i] for i in [0, 1,...,rank(x) - 1]`\n\nFor example:\n\n```prettyprint\n# tensor \'x\' is [1, 1, 2, 4, 4, 4, 7, 8, 8]\ny, idx, count = unique_with_counts(x)\ny ==> [1, 2, 4, 7, 8]\nidx ==> [0, 0, 1, 2, 2, 2, 3, 4, 4]\ncount ==> [2, 1, 3, 1, 2]\n```"
+  description: "This operation returns a tensor `y` containing all of the unique elements of `x`\nsorted in the same order that they occur in `x`. This operation also returns a\ntensor `idx` the same size as `x` that contains the index of each value of `x`\nin the unique output `y`. Finally, it returns a third tensor `count` that\ncontains the count of each element of `y` in `x`. In other words:\n\n`y[idx[i]] = x[i] for i in [0, 1,...,rank(x) - 1]`\n\nFor example:\n\n```\n# tensor \'x\' is [1, 1, 2, 4, 4, 4, 7, 8, 8]\ny, idx, count = unique_with_counts(x)\ny ==> [1, 2, 4, 7, 8]\nidx ==> [0, 0, 1, 2, 2, 2, 3, 4, 4]\ncount ==> [2, 1, 3, 1, 2]\n```"
 }
 op {
   name: "Unpack"
@@ -26413,7 +26413,7 @@ op {
     type: DT_INT64
   }
   summary: "Returns locations of true values in a boolean tensor."
-  description: "This operation returns the coordinates of true elements in `input`. The\ncoordinates are returned in a 2-D tensor where the first dimension (rows)\nrepresents the number of true elements, and the second dimension (columns)\nrepresents the coordinates of the true elements. Keep in mind, the shape of\nthe output tensor can vary depending on how many true values there are in\n`input`. Indices are output in row-major order.\n\nFor example:\n\n```prettyprint\n# \'input\' tensor is [[True, False]\n#                    [True, False]]\n# \'input\' has two true values, so output has two coordinates.\n# \'input\' has rank of 2, so coordinates have two indices.\nwhere(input) ==> [[0, 0],\n                  [1, 0]]\n\n# `input` tensor is [[[True, False]\n#                     [True, False]]\n#                    [[False, True]\n#                     [False, True]]\n#                    [[False, False]\n#                     [False, True]]]\n# \'input\' has 5 true values, so output has 5 coordinates.\n# \'input\' has rank of 3, so coordinates have three indices.\nwhere(input) ==> [[0, 0, 0],\n                  [0, 1, 0],\n                  [1, 0, 1],\n                  [1, 1, 1],\n                  [2, 1, 1]]\n```"
+  description: "This operation returns the coordinates of true elements in `input`. The\ncoordinates are returned in a 2-D tensor where the first dimension (rows)\nrepresents the number of true elements, and the second dimension (columns)\nrepresents the coordinates of the true elements. Keep in mind, the shape of\nthe output tensor can vary depending on how many true values there are in\n`input`. Indices are output in row-major order.\n\nFor example:\n\n```\n# \'input\' tensor is [[True, False]\n#                    [True, False]]\n# \'input\' has two true values, so output has two coordinates.\n# \'input\' has rank of 2, so coordinates have two indices.\nwhere(input) ==> [[0, 0],\n                  [1, 0]]\n\n# `input` tensor is [[[True, False]\n#                     [True, False]]\n#                    [[False, True]\n#                     [False, True]]\n#                    [[False, False]\n#                     [False, True]]]\n# \'input\' has 5 true values, so output has 5 coordinates.\n# \'input\' has rank of 3, so coordinates have three indices.\nwhere(input) ==> [[0, 0, 0],\n                  [0, 1, 0],\n                  [1, 0, 1],\n                  [1, 1, 1],\n                  [2, 1, 1]]\n```"
 }
 op {
   name: "WholeFileReader"
-- 
GitLab


From ea25bc496e30ecc1f90622906390669913d92e74 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Apr 2017 21:54:15 -0800
Subject: [PATCH 0839/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154614993

---
 tensorflow/go/op/wrappers.go | 150 +++++++++++++++++------------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index eff6719467..d4af263fc6 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -688,14 +688,14 @@ func ExtractImagePatches(scope *Scope, images tf.Output, ksizes []int64, strides
 //
 // For example, given this input of shape `[1, 1, 1, 4]`, and a block size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3, 4]]]]
 //
 // ```
 //
 // This operation will output a tensor of shape `[1, 2, 2, 1]`:
 //
-// ```prettyprint
+// ```
 //    [[[[1], [2]],
 //      [[3], [4]]]]
 // ```
@@ -707,14 +707,14 @@ func ExtractImagePatches(scope *Scope, images tf.Output, ksizes []int64, strides
 //
 // For an input tensor with larger depth, here of shape `[1, 1, 1, 12]`, e.g.
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]
 // ```
 //
 // This operation, for block size of 2, will return the following tensor of shape
 // `[1, 2, 2, 3]`
 //
-// ```prettyprint
+// ```
 //    [[[[1, 2, 3], [4, 5, 6]],
 //      [[7, 8, 9], [10, 11, 12]]]]
 //
@@ -722,7 +722,7 @@ func ExtractImagePatches(scope *Scope, images tf.Output, ksizes []int64, strides
 //
 // Similarly, for the following input of shape `[1 2 2 4]`, and a block size of 2:
 //
-// ```prettyprint
+// ```
 // x =  [[[[1, 2, 3, 4],
 //        [5, 6, 7, 8]],
 //       [[9, 10, 11, 12],
@@ -731,7 +731,7 @@ func ExtractImagePatches(scope *Scope, images tf.Output, ksizes []int64, strides
 //
 // the operator will return the following tensor of shape `[1 4 4 1]`:
 //
-// ```prettyprint
+// ```
 // x = [[ [1],   [2],  [5],  [6]],
 //      [ [3],   [4],  [7],  [8]],
 //      [ [9],  [10], [13],  [14]],
@@ -819,26 +819,26 @@ func DepthToSpace(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 // (1) For the following input of shape `[4, 1, 1, 1]`, `block_shape = [2, 2]`, and
 //     `crops = [[0, 0], [0, 0]]`:
 //
-// ```prettyprint
+// ```
 // [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 // ```
 //
 // The output tensor has shape `[1, 2, 2, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [2]], [[3], [4]]]]
 // ```
 //
 // (2) For the following input of shape `[4, 1, 1, 3]`, `block_shape = [2, 2]`, and
 //     `crops = [[0, 0], [0, 0]]`:
 //
-// ```prettyprint
+// ```
 // [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 // ```
 //
 // The output tensor has shape `[1, 2, 2, 3]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3], [4, 5, 6]],
 //       [[7, 8, 9], [10, 11, 12]]]]
 // ```
@@ -846,7 +846,7 @@ func DepthToSpace(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 // (3) For the following input of shape `[4, 2, 2, 1]`, `block_shape = [2, 2]`, and
 //     `crops = [[0, 0], [0, 0]]`:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [3]], [[9], [11]]],
 //      [[[2], [4]], [[10], [12]]],
 //      [[[5], [7]], [[13], [15]]],
@@ -855,7 +855,7 @@ func DepthToSpace(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 //
 // The output tensor has shape `[1, 4, 4, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[1],   [2],  [3],  [4]],
 //      [[5],   [6],  [7],  [8]],
 //      [[9],  [10], [11],  [12]],
@@ -865,7 +865,7 @@ func DepthToSpace(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 // (4) For the following input of shape `[8, 1, 3, 1]`, `block_shape = [2, 2]`, and
 //     `crops = [[0, 0], [2, 0]]`:
 //
-// ```prettyprint
+// ```
 // x = [[[[0], [1], [3]]], [[[0], [9], [11]]],
 //      [[[0], [2], [4]]], [[[0], [10], [12]]],
 //      [[[0], [5], [7]]], [[[0], [13], [15]]],
@@ -874,7 +874,7 @@ func DepthToSpace(scope *Scope, input tf.Output, block_size int64) (output tf.Ou
 //
 // The output tensor has shape `[2, 2, 4, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1],   [2],  [3],  [4]],
 //       [[5],   [6],  [7],  [8]]],
 //      [[[9],  [10], [11],  [12]],
@@ -932,32 +932,32 @@ func BatchToSpaceND(scope *Scope, input tf.Output, block_shape tf.Output, crops
 //
 // (1) For the following input of shape `[1, 2, 2, 1]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [2]], [[3], [4]]]]
 // ```
 //
 // The output tensor has shape `[4, 1, 1, 1]` and value:
 //
-// ```prettyprint
+// ```
 // [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 // ```
 //
 // (2) For the following input of shape `[1, 2, 2, 3]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3], [4, 5, 6]],
 //       [[7, 8, 9], [10, 11, 12]]]]
 // ```
 //
 // The output tensor has shape `[4, 1, 1, 3]` and value:
 //
-// ```prettyprint
+// ```
 // [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 // ```
 //
 // (3) For the following input of shape `[1, 4, 4, 1]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1],   [2],  [3],  [4]],
 //       [[5],   [6],  [7],  [8]],
 //       [[9],  [10], [11],  [12]],
@@ -966,7 +966,7 @@ func BatchToSpaceND(scope *Scope, input tf.Output, block_shape tf.Output, crops
 //
 // The output tensor has shape `[4, 2, 2, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [3]], [[9], [11]]],
 //      [[[2], [4]], [[10], [12]]],
 //      [[[5], [7]], [[13], [15]]],
@@ -975,7 +975,7 @@ func BatchToSpaceND(scope *Scope, input tf.Output, block_shape tf.Output, crops
 //
 // (4) For the following input of shape `[2, 2, 4, 1]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1],   [2],  [3],  [4]],
 //       [[5],   [6],  [7],  [8]]],
 //      [[[9],  [10], [11],  [12]],
@@ -984,7 +984,7 @@ func BatchToSpaceND(scope *Scope, input tf.Output, block_shape tf.Output, crops
 //
 // The output tensor has shape `[8, 1, 2, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
 //      [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
 // ```
@@ -1177,34 +1177,34 @@ func QuantizeAndDequantizeV2(scope *Scope, input tf.Output, input_min tf.Output,
 // (1) For the following input of shape `[1, 2, 2, 1]`, `block_shape = [2, 2]`, and
 //     `paddings = [[0, 0], [0, 0]]`:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [2]], [[3], [4]]]]
 // ```
 //
 // The output tensor has shape `[4, 1, 1, 1]` and value:
 //
-// ```prettyprint
+// ```
 // [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 // ```
 //
 // (2) For the following input of shape `[1, 2, 2, 3]`, `block_shape = [2, 2]`, and
 //     `paddings = [[0, 0], [0, 0]]`:
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3], [4, 5, 6]],
 //       [[7, 8, 9], [10, 11, 12]]]]
 // ```
 //
 // The output tensor has shape `[4, 1, 1, 3]` and value:
 //
-// ```prettyprint
+// ```
 // [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 // ```
 //
 // (3) For the following input of shape `[1, 4, 4, 1]`, `block_shape = [2, 2]`, and
 //     `paddings = [[0, 0], [0, 0]]`:
 //
-// ```prettyprint
+// ```
 // x = [[[[1],   [2],  [3],  [4]],
 //       [[5],   [6],  [7],  [8]],
 //       [[9],  [10], [11],  [12]],
@@ -1213,7 +1213,7 @@ func QuantizeAndDequantizeV2(scope *Scope, input tf.Output, input_min tf.Output,
 //
 // The output tensor has shape `[4, 2, 2, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [3]], [[9], [11]]],
 //      [[[2], [4]], [[10], [12]]],
 //      [[[5], [7]], [[13], [15]]],
@@ -1223,7 +1223,7 @@ func QuantizeAndDequantizeV2(scope *Scope, input tf.Output, input_min tf.Output,
 // (4) For the following input of shape `[2, 2, 4, 1]`, block_shape = `[2, 2]`, and
 //     paddings = `[[0, 0], [2, 0]]`:
 //
-// ```prettyprint
+// ```
 // x = [[[[1],   [2],  [3],  [4]],
 //       [[5],   [6],  [7],  [8]]],
 //      [[[9],  [10], [11],  [12]],
@@ -1232,7 +1232,7 @@ func QuantizeAndDequantizeV2(scope *Scope, input tf.Output, input_min tf.Output,
 //
 // The output tensor has shape `[8, 1, 3, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[0], [1], [3]]], [[[0], [9], [11]]],
 //      [[[0], [2], [4]]], [[[0], [10], [12]]],
 //      [[[0], [5], [7]]], [[[0], [13], [15]]],
@@ -1278,14 +1278,14 @@ func ListDiffOutIdx(value tf.DataType) ListDiffAttr {
 //
 // For example, given this input:
 //
-// ```prettyprint
+// ```
 // x = [1, 2, 3, 4, 5, 6]
 // y = [1, 3, 5]
 // ```
 //
 // This operation would return:
 //
-// ```prettyprint
+// ```
 // out ==> [2, 4, 6]
 // idx ==> [1, 3, 5]
 // ```
@@ -1339,14 +1339,14 @@ func SqueezeSqueezeDims(value []int64) SqueezeAttr {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 't' is a tensor of shape [1, 2, 1, 3, 1, 1]
 // shape(squeeze(t)) ==> [2, 3]
 // ```
 //
 // Or, to remove specific size 1 dimensions:
 //
-// ```prettyprint
+// ```
 // # 't' is a tensor of shape [1, 2, 1, 3, 1, 1]
 // shape(squeeze(t, [2, 4])) ==> [1, 2, 3, 1]
 // ```
@@ -1461,7 +1461,7 @@ func Placeholder(scope *Scope, dtype tf.DataType, optional ...PlaceholderAttr) (
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 't' is [[1, 2, 3], [4, 5, 6]].
 // # 'paddings' is [[1, 1]], [2, 2]].
 // # 'mode' is SYMMETRIC.
@@ -1545,7 +1545,7 @@ func BroadcastArgs(scope *Scope, s0 tf.Output, s1 tf.Output) (r0 tf.Output) {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'input' tensor is [[True, False]
 // #                    [True, False]]
 // # 'input' has two true values, so output has two coordinates.
@@ -1762,7 +1762,7 @@ func ShapeN(scope *Scope, input []tf.Output, optional ...ShapeNAttr) (output []t
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # tensor 't' is [1, 2, 3, 4, 5, 6, 7, 8, 9]
 // # tensor 't' has shape [9]
 // reshape(t, [3, 3]) ==> [[1, 2, 3],
@@ -2187,7 +2187,7 @@ func MatrixSetDiag(scope *Scope, input tf.Output, diagonal tf.Output) (output tf
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'input' is [[1, 0, 0, 0]
 //               [0, 2, 0, 0]
 //               [0, 0, 3, 0]
@@ -2383,7 +2383,7 @@ func Split(scope *Scope, split_dim tf.Output, value tf.Output, num_split int64)
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'x' is [2, 2, 7]
 // # 'y' is [2, 3, 7]
 // # 'z' is [2, 5, 7]
@@ -2452,7 +2452,7 @@ func Concat(scope *Scope, concat_dim tf.Output, values []tf.Output) (output tf.O
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'x' is [[1, 4]]
 // # 'y' is [[2, 5]]
 // # 'z' is [[3, 6]]
@@ -2587,7 +2587,7 @@ func UniqueOutIdx(value tf.DataType) UniqueAttr {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # tensor 'x' is [1, 1, 2, 4, 4, 4, 7, 8, 8]
 // y, idx = unique(x)
 // y ==> [1, 2, 4, 7, 8]
@@ -3067,14 +3067,14 @@ func ControlTrigger(scope *Scope) (o *tf.Operation) {
 //
 // For example, given this input of shape `[1, 2, 2, 1]`, and block_size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [2]],
 //       [[3], [4]]]]
 // ```
 //
 // This operation will output a tensor of shape `[1, 1, 1, 4]`:
 //
-// ```prettyprint
+// ```
 // [[[[1, 2, 3, 4]]]]
 // ```
 //
@@ -3085,7 +3085,7 @@ func ControlTrigger(scope *Scope) (o *tf.Operation) {
 //
 // For an input tensor with larger depth, here of shape `[1, 2, 2, 3]`, e.g.
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3], [4, 5, 6]],
 //       [[7, 8, 9], [10, 11, 12]]]]
 // ```
@@ -3093,13 +3093,13 @@ func ControlTrigger(scope *Scope) (o *tf.Operation) {
 // This operation, for block_size of 2, will return the following tensor of shape
 // `[1, 1, 1, 12]`
 //
-// ```prettyprint
+// ```
 // [[[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]]]
 // ```
 //
 // Similarly, for the following input of shape `[1 4 4 1]`, and a block size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1],   [2],  [5],  [6]],
 //       [[3],   [4],  [7],  [8]],
 //       [[9],  [10], [13],  [14]],
@@ -3108,7 +3108,7 @@ func ControlTrigger(scope *Scope) (o *tf.Operation) {
 //
 // the operator will return the following tensor of shape `[1 2 2 4]`:
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3, 4],
 //        [5, 6, 7, 8]],
 //       [[9, 10, 11, 12],
@@ -3852,7 +3852,7 @@ func TensorArraySplitV3(scope *Scope, handle tf.Output, value tf.Output, lengths
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'diagonal' is [1, 2, 3, 4]
 // tf.diag(diagonal) ==> [[1, 0, 0, 0]
 //                        [0, 2, 0, 0]
@@ -4087,7 +4087,7 @@ func TensorArrayConcatV2(scope *Scope, handle tf.Output, flow_in tf.Output, dtyp
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'input' is [[[1, 0, 0, 0]
 //                [0, 2, 0, 0]
 //                [0, 0, 3, 0]
@@ -4788,7 +4788,7 @@ func StridedSliceShrinkAxisMask(value int64) StridedSliceAttr {
 // particular,
 // `foo[1, 2:4, None, ..., :-3:-1, :]` will be encoded as
 //
-// ```prettyprint
+// ```
 // begin = [1, 2, x, x, 0, x] # x denotes don't care (usually 0)
 // end = [2, 4, x, x, -3, x]
 // strides = [1, 1, x, x, -1, 1]
@@ -6014,7 +6014,7 @@ func ReverseSequenceBatchDim(value int64) ReverseSequenceAttr {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # Given this:
 // batch_dim = 0
 // seq_dim = 1
@@ -6036,7 +6036,7 @@ func ReverseSequenceBatchDim(value int64) ReverseSequenceAttr {
 //
 // In contrast, if:
 //
-// ```prettyprint
+// ```
 // # Given this:
 // batch_dim = 2
 // seq_dim = 0
@@ -6916,7 +6916,7 @@ func SaveSlices(scope *Scope, filename tf.Output, tensor_names tf.Output, shapes
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 't' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]
 // # shape of tensor 't' is [2, 2, 3]
 // rank(t) ==> 3
@@ -7126,7 +7126,7 @@ func Acos(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # if 'input' is [[ 0,  1,  2, 3]
 //                  [-1,  0,  1, 2]
 //                  [-2, -1,  0, 1]
@@ -7145,7 +7145,7 @@ func Acos(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // Useful special cases:
 //
-// ```prettyprint
+// ```
 //  tf.matrix_band_part(input, 0, -1) ==> Upper triangular part.
 //  tf.matrix_band_part(input, -1, 0) ==> Lower triangular part.
 //  tf.matrix_band_part(input, 0, 0) ==> Diagonal.
@@ -9933,7 +9933,7 @@ func PackAxis(value int64) PackAttr {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'x' is [1, 4]
 // # 'y' is [2, 5]
 // # 'z' is [3, 6]
@@ -10166,7 +10166,7 @@ func WriteFile(scope *Scope, filename tf.Output, contents tf.Output) (o *tf.Oper
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # tensor 't' is [[[[ 0,  1,  2,  3],
 // #                  [ 4,  5,  6,  7],
 // #                  [ 8,  9, 10, 11]],
@@ -10638,7 +10638,7 @@ func SizeOutType(value tf.DataType) SizeAttr {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 't' is [[[1, 1,, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]]
 // size(t) ==> 12
 // ```
@@ -10820,7 +10820,7 @@ func FFT2D(scope *Scope, input tf.Output) (output tf.Output) {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # Output tensor has shape [2, 3].
 // fill([2, 3], 9) ==> [[9, 9, 9]
 //                      [9, 9, 9]]
@@ -11617,7 +11617,7 @@ func SparseAdd(scope *Scope, a_indices tf.Output, a_values tf.Output, a_shape tf
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 't' is [[1, 2, 3], [4, 5, 6], [7, 8, 9]].
 // # 'paddings' is [[0, 1]], [0, 1]].
 // # 'mode' is SYMMETRIC.
@@ -11662,7 +11662,7 @@ func MirrorPadGrad(scope *Scope, input tf.Output, paddings tf.Output, mode strin
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # tensor `x` is [3, 4, 0, 2, 1]
 // invert_permutation(x) ==> [2, 4, 3, 0, 1]
 // ```
@@ -11698,7 +11698,7 @@ func InvertPermutation(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # tensor 't' is [[[[ 0,  1,  2,  3],
 // #                  [ 4,  5,  6,  7],
 // #                  [ 8,  9, 10, 11]],
@@ -13533,7 +13533,7 @@ func LogicalNot(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 't' is [[1, 1], [2, 2]]
 // # 'paddings' is [[1, 1], [2, 2]]
 // # rank of 't' is 2
@@ -15420,7 +15420,7 @@ func UniqueWithCountsOutIdx(value tf.DataType) UniqueWithCountsAttr {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # tensor 'x' is [1, 1, 2, 4, 4, 4, 7, 8, 8]
 // y, idx, count = unique_with_counts(x)
 // y ==> [1, 2, 4, 7, 8]
@@ -15728,7 +15728,7 @@ func NotEqual(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 'diagonal' is [[1, 2, 3, 4], [5, 6, 7, 8]]
 //
 // and diagonal.shape = (2, 4)
@@ -16704,7 +16704,7 @@ func Sqrt(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // Other examples:
 //
-// ```prettyprint
+// ```
 // # 't' is a tensor of shape [2]
 // shape(expand_dims(t, 0)) ==> [1, 2]
 // shape(expand_dims(t, 1)) ==> [2, 1]
@@ -17478,32 +17478,32 @@ func Tan(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // (1) For the following input of shape `[4, 1, 1, 1]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // [[[[1]]], [[[2]]], [[[3]]], [[[4]]]]
 // ```
 //
 // The output tensor has shape `[1, 2, 2, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [2]], [[3], [4]]]]
 // ```
 //
 // (2) For the following input of shape `[4, 1, 1, 3]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // [[[1, 2, 3]], [[4, 5, 6]], [[7, 8, 9]], [[10, 11, 12]]]
 // ```
 //
 // The output tensor has shape `[1, 2, 2, 3]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1, 2, 3], [4, 5, 6]],
 //       [[7, 8, 9], [10, 11, 12]]]]
 // ```
 //
 // (3) For the following input of shape `[4, 2, 2, 1]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [3]], [[9], [11]]],
 //      [[[2], [4]], [[10], [12]]],
 //      [[[5], [7]], [[13], [15]]],
@@ -17512,7 +17512,7 @@ func Tan(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // The output tensor has shape `[1, 4, 4, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[1],   [2],  [3],  [4]],
 //      [[5],   [6],  [7],  [8]],
 //      [[9],  [10], [11],  [12]],
@@ -17521,14 +17521,14 @@ func Tan(scope *Scope, x tf.Output) (y tf.Output) {
 //
 // (4) For the following input of shape `[8, 1, 2, 1]` and block_size of 2:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [3]]], [[[9], [11]]], [[[2], [4]]], [[[10], [12]]],
 //      [[[5], [7]]], [[[13], [15]]], [[[6], [8]]], [[[14], [16]]]]
 // ```
 //
 // The output tensor has shape `[2, 2, 4, 1]` and value:
 //
-// ```prettyprint
+// ```
 // x = [[[[1], [3]], [[5], [7]]],
 //      [[[2], [4]], [[10], [12]]],
 //      [[[5], [7]], [[13], [15]]],
@@ -20468,7 +20468,7 @@ func ShapeOutType(value tf.DataType) ShapeAttr {
 //
 // For example:
 //
-// ```prettyprint
+// ```
 // # 't' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]
 // shape(t) ==> [2, 2, 3]
 // ```
-- 
GitLab


From 3a91499c873eda8e8161bdeeca1a3057670d36d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20Thom=C3=A9?= <carlthome@gmail.com>
Date: Sat, 29 Apr 2017 15:39:11 +0200
Subject: [PATCH 0840/1563] Spelling

---
 tensorflow/tools/tfprof/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index c83cdd45b6..1051a72ed5 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -30,7 +30,7 @@ statistics.
 
 tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
 
-### Examine the shapes and sizes of all trainiable Variables.
+### Examine the shapes and sizes of all trainable Variables.
 ```python
 # Print trainable variable parameter statistics to stdout.
 param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
-- 
GitLab


From f582fdcfe77785522675653591757121dfbe7bd6 Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Sat, 29 Apr 2017 08:38:24 -0700
Subject: [PATCH 0841/1563] Fixed a couple of typos.

This fix fixes a couple of typos:
```
s/unneccessary/unnecessary/
s/accidently/accidentally/
```
---
 tensorflow/tools/graph_transforms/README.md | 2 +-
 tensorflow/tools/tfprof/README.md           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index c9f0a9b222..1fbd636db3 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -169,7 +169,7 @@ then you'll need to make local modifications to the build files to include the
 right .cc file that defines it. In a lot of cases the op is just a vestigial
 remnant from the training process though, and if that's true then you can run
 the [strip_unused_nodes](#strip_unused_nodes), specifying the inputs and outputs
-of your inference usage, to remove those unneccessary nodes:
+of your inference usage, to remove those unnecessary nodes:
 
 ```bash
 bazel build tensorflow/tools/graph_transforms:transform_graph
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index c83cdd45b6..434fc23adf 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -439,7 +439,7 @@ with gfile.Open(os.path.join(output_dir, "run_meta"), "w") as f:
 <b>--op_log_path:</b>
 tensorflow::tfprof::OpLog. A proto used to provide extra op information
 for ops. By giving a group of ops a type name, users can easily aggregate the
-statistics for those ops without accidently missing or including extra ops.
+statistics for those ops without accidentally missing or including extra ops.
 tfprof exposes the following Python API to add op information and logging.
 
 ```python
-- 
GitLab


From a25509eda3e42dddc88155965eaffe4b3c455af5 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Sat, 29 Apr 2017 08:26:06 -0800
Subject: [PATCH 0842/1563] Add TFDBG support to GrpcSession

* Along the way, unify the way the debugger works in DirectSession (non-distributed Sessions) and MasterSession (for distributed Sessions).
  * The SummarizDebugTensorWatches method is invoked in DirectSession::GetOrCreateExecutors() and MasterSession::HashBuildGraphOptions() method to generate keys for partition graphs and executors.
  * The DebugStateInterface::PublishDebugMetadata() method is used to send metadata about the debugged Session::Run() call to debug URLs. This happens in DirectSession::Run() and MasterSession::DoRunWithLocalExecution() respectively.
  * The DebugGraphDecoratorInterface::DecorateGraph() and DebugGraphDecoratorInterface::PublishGraph() methods are used to insert debug ops to the debugged graph and send the modified graph to debug URLs. This happens in DirectSession::GetOrCreateExecutors() and GraphMgr::InitItem(), respectively.
Change: 154631802
---
 tensorflow/core/BUILD                         |   1 +
 .../core/common_runtime/build_graph_options.h |   3 +
 .../debugger_state_interface.cc               |  45 +++
 .../common_runtime/debugger_state_interface.h |  48 ++-
 .../core/common_runtime/direct_session.cc     |  79 +++--
 .../core/common_runtime/direct_session.h      |  14 +-
 tensorflow/core/debug/BUILD                   |  41 ++-
 tensorflow/core/debug/debug.cc                |  10 +-
 tensorflow/core/debug/debug_graph_utils.cc    |  64 ----
 tensorflow/core/debug/debug_graph_utils.h     |  30 --
 tensorflow/core/debug/debug_grpc_testlib.cc   |  47 +--
 tensorflow/core/debug/debug_grpc_testlib.h    |   2 +
 tensorflow/core/debug/debugger_state_impl.cc  |  66 ++++
 tensorflow/core/debug/debugger_state_impl.h   |  61 ++++
 .../core/debug/grpc_session_debug_test.cc     | 288 ++++++++++++++++++
 tensorflow/core/distributed_runtime/BUILD     |   2 +
 .../core/distributed_runtime/graph_mgr.cc     |  31 +-
 .../core/distributed_runtime/graph_mgr.h      |  10 +-
 .../distributed_runtime/master_session.cc     |  62 ++++
 .../core/distributed_runtime/master_session.h |   6 +
 tensorflow/core/distributed_runtime/worker.cc |   2 +-
 tensorflow/core/protobuf/worker.proto         |   4 +
 22 files changed, 761 insertions(+), 155 deletions(-)
 create mode 100644 tensorflow/core/debug/debugger_state_impl.cc
 create mode 100644 tensorflow/core/debug/debugger_state_impl.h
 create mode 100644 tensorflow/core/debug/grpc_session_debug_test.cc

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 79fd7ec01e..1617addba0 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1570,6 +1570,7 @@ tf_cuda_library(
         ":lib_internal",
         ":proto_text",
         ":protos_all_cc",
+        "//tensorflow/core/debug:debug_graph_utils",
         "//tensorflow/core/kernels:function_ops",
     ],
     alwayslink = 1,
diff --git a/tensorflow/core/common_runtime/build_graph_options.h b/tensorflow/core/common_runtime/build_graph_options.h
index 49566c8fa8..5f0e8f170b 100644
--- a/tensorflow/core/common_runtime/build_graph_options.h
+++ b/tensorflow/core/common_runtime/build_graph_options.h
@@ -19,6 +19,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/protobuf/debug.pb.h"
 
 namespace tensorflow {
 
@@ -35,6 +36,8 @@ struct BuildGraphOptions {
   // TODO(mrry): Remove this when the distributed runtime supports Arg/Retval.
   bool use_function_convention = false;
 
+  DebugOptions debug_options;
+
   string DebugString() const;
 };
 
diff --git a/tensorflow/core/common_runtime/debugger_state_interface.cc b/tensorflow/core/common_runtime/debugger_state_interface.cc
index 2e2fbcd7f4..73157ca05d 100644
--- a/tensorflow/core/common_runtime/debugger_state_interface.cc
+++ b/tensorflow/core/common_runtime/debugger_state_interface.cc
@@ -17,8 +17,39 @@ limitations under the License.
 
 namespace tensorflow {
 
+// static
 DebuggerStateFactory* DebuggerStateRegistry::factory_ = nullptr;
 
+// static
+DebugGraphDecoratorFactory* DebugGraphDecoratorRegistry::factory_ = nullptr;
+
+const string SummarizeDebugTensorWatches(
+    const protobuf::RepeatedPtrField<DebugTensorWatch>& watches) {
+  std::ostringstream oss;
+
+  for (const DebugTensorWatch& watch : watches) {
+    string tensor_name =
+        strings::StrCat(watch.node_name(), ":", watch.output_slot());
+    if (watch.tolerate_debug_op_creation_failures()) {
+      oss << "(TOL)";  // Shorthand for "tolerate".
+    }
+    oss << tensor_name << "|";
+
+    for (const string& debug_op : watch.debug_ops()) {
+      oss << debug_op << ",";
+    }
+
+    oss << "@";
+    for (const string& debug_url : watch.debug_urls()) {
+      oss << debug_url << ",";
+    }
+
+    oss << ";";
+  }
+
+  return oss.str();
+}
+
 // static
 void DebuggerStateRegistry::RegisterFactory(
     const DebuggerStateFactory& factory) {
@@ -34,4 +65,18 @@ std::unique_ptr<DebuggerStateInterface> DebuggerStateRegistry::CreateState(
              : (*factory_)(debug_options);
 }
 
+// static
+void DebugGraphDecoratorRegistry::RegisterFactory(
+    const DebugGraphDecoratorFactory& factory) {
+  delete factory_;
+  factory_ = new DebugGraphDecoratorFactory(factory);
+}
+
+// static
+std::unique_ptr<DebugGraphDecoratorInterface>
+DebugGraphDecoratorRegistry::CreateDecorator(const DebugOptions& options) {
+  return (factory_ == nullptr || *factory_ == nullptr) ? nullptr
+                                                       : (*factory_)(options);
+}
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/common_runtime/debugger_state_interface.h b/tensorflow/core/common_runtime/debugger_state_interface.h
index fb72f9fa3e..d182ce7092 100644
--- a/tensorflow/core/common_runtime/debugger_state_interface.h
+++ b/tensorflow/core/common_runtime/debugger_state_interface.h
@@ -18,28 +18,24 @@ limitations under the License.
 
 #include <memory>
 
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/platform/protobuf.h"
+#include "tensorflow/core/protobuf/debug.pb.h"
 
 namespace tensorflow {
 
-class DebugOptions;  // Defined in core/protobuf/debug.h.
-class Device;
-class Graph;
+// Returns a summary string for the list of debug tensor watches.
+const string SummarizeDebugTensorWatches(
+    const protobuf::RepeatedPtrField<DebugTensorWatch>& watches);
 
 // An abstract interface for storing and retrieving debugging information.
 class DebuggerStateInterface {
  public:
   virtual ~DebuggerStateInterface() {}
 
-  // Returns a summary string for RepeatedPtrFields of DebugTensorWatches.
-  virtual const string SummarizeDebugTensorWatches() = 0;
-
-  // Insert special-purpose debug nodes to graph and dump the graph for
-  // record. See the documentation of DebugNodeInserter::InsertNodes() for
-  // details.
-  virtual Status DecorateGraphForDebug(Graph* graph, Device* device) = 0;
-
   // Publish metadata about the debugged Session::Run() call.
   //
   // Args:
@@ -59,6 +55,19 @@ class DebuggerStateInterface {
       const std::vector<string>& target_nodes) = 0;
 };
 
+class DebugGraphDecoratorInterface {
+ public:
+  virtual ~DebugGraphDecoratorInterface() {}
+
+  // Insert special-purpose debug nodes to graph and dump the graph for
+  // record. See the documentation of DebugNodeInserter::InsertNodes() for
+  // details.
+  virtual Status DecorateGraph(Graph* graph, Device* device) = 0;
+
+  // Publish Graph to debug URLs.
+  virtual Status PublishGraph(const Graph& graph) = 0;
+};
+
 typedef std::function<std::unique_ptr<DebuggerStateInterface>(
     const DebugOptions& options)>
     DebuggerStateFactory;
@@ -86,6 +95,23 @@ class DebuggerStateRegistry {
   TF_DISALLOW_COPY_AND_ASSIGN(DebuggerStateRegistry);
 };
 
+typedef std::function<std::unique_ptr<DebugGraphDecoratorInterface>(
+    const DebugOptions& options)>
+    DebugGraphDecoratorFactory;
+
+class DebugGraphDecoratorRegistry {
+ public:
+  static void RegisterFactory(const DebugGraphDecoratorFactory& factory);
+
+  static std::unique_ptr<DebugGraphDecoratorInterface> CreateDecorator(
+      const DebugOptions& options);
+
+ private:
+  static DebugGraphDecoratorFactory* factory_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(DebugGraphDecoratorRegistry);
+};
+
 }  // end namespace tensorflow
 
 #endif  // TENSORFLOW_COMMON_RUNTIME_DEBUGGER_STATE_INTERFACE_H_
diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index f208e4b78e..7c017f9584 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -370,6 +370,43 @@ Status DirectSession::Run(const NamedTensorList& inputs,
              &run_metadata);
 }
 
+Status DirectSession::CreateDebuggerState(
+    const DebugOptions& debug_options, int64 session_run_count,
+    int64 executor_step_count, const std::vector<string>& input_names,
+    const std::vector<string>& output_names,
+    const std::vector<string>& target_names,
+    std::unique_ptr<DebuggerStateInterface>* debugger_state) {
+  std::unique_ptr<DebuggerStateInterface> state =
+      DebuggerStateRegistry::CreateState(debug_options);
+  if (!state) {
+    return errors::Internal(
+        "Debugger options are set, but creation of debugger state failed. "
+        "It appears that debugger is not linked in this TensorFlow build.");
+  }
+
+  TF_RETURN_IF_ERROR(state->PublishDebugMetadata(
+      debug_options.global_step(), session_run_count, executor_step_count,
+      input_names, output_names, target_names));
+
+  *debugger_state = std::move(state);
+  return Status::OK();
+}
+
+Status DirectSession::DecorateAndPublishGraphForDebug(
+    const DebugOptions& debug_options, Graph* graph, Device* device) {
+  std::unique_ptr<DebugGraphDecoratorInterface> decorator =
+      DebugGraphDecoratorRegistry::CreateDecorator(debug_options);
+  if (!decorator) {
+    return errors::Internal(
+        "Debugger options are set, but creation of debug graph publisher ",
+        "failed.");
+  }
+
+  TF_RETURN_IF_ERROR(decorator->DecorateGraph(graph, device));
+  TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph));
+  return Status::OK();
+}
+
 Status DirectSession::Run(const RunOptions& run_options,
                           const NamedTensorList& inputs,
                           const std::vector<string>& output_names,
@@ -402,27 +439,21 @@ Status DirectSession::Run(const RunOptions& run_options,
 
   // Check if we already have an executor for these arguments.
   ExecutorsAndKeys* executors_and_keys;
-  RunStateArgs run_state_args;
+  RunStateArgs run_state_args(run_options.debug_options());
 
   Executor::Args args;
   args.step_id = step_id_counter_.fetch_add(1);
 
-  // EXPERIMENTAL: Options that allow the client to insert nodes into partition
-  // graphs for debugging.
-  if (!run_options.debug_options().debug_tensor_watch_opts().empty()) {
-    run_state_args.debugger_state =
-        DebuggerStateRegistry::CreateState(run_options.debug_options());
-  }
-
   TF_RETURN_IF_ERROR(
       GetOrCreateExecutors(pool, input_tensor_names, output_names, target_nodes,
                            &executors_and_keys, &run_state_args));
   const int64 executor_step_count = executors_and_keys->step_count.fetch_add(1);
 
-  if (run_state_args.debugger_state) {
-    TF_RETURN_IF_ERROR(run_state_args.debugger_state->PublishDebugMetadata(
-        run_options.debug_options().global_step(), args.step_id,
-        executor_step_count, input_tensor_names, output_names, target_nodes));
+  std::unique_ptr<DebuggerStateInterface> debugger_state;
+  if (!run_options.debug_options().debug_tensor_watch_opts().empty()) {
+    TF_RETURN_IF_ERROR(CreateDebuggerState(
+        run_options.debug_options(), args.step_id, executor_step_count,
+        input_tensor_names, output_names, target_nodes, &debugger_state));
   }
 
   // Configure a call frame for the step, which we use to feed and
@@ -629,7 +660,9 @@ Status DirectSession::PRunSetup(const std::vector<string>& input_names,
 
   // Check if we already have an executor for these arguments.
   ExecutorsAndKeys* executors_and_keys;
-  RunStateArgs run_state_args;
+  // TODO(cais): TFDBG support for partial runs.
+  DebugOptions debug_options;
+  RunStateArgs run_state_args(debug_options);
   run_state_args.is_partial_run = true;
   TF_RETURN_IF_ERROR(GetOrCreateExecutors(pool, input_names, output_names,
                                           target_nodes, &executors_and_keys,
@@ -960,14 +993,15 @@ Status DirectSession::GetOrCreateExecutors(
     thread::ThreadPool* pool, gtl::ArraySlice<string> inputs,
     gtl::ArraySlice<string> outputs, gtl::ArraySlice<string> target_nodes,
     ExecutorsAndKeys** executors_and_keys, RunStateArgs* run_state_args) {
-  string debug_tensor_watches_summary;
   int64 handle_name_counter_value = -1;
   if (LogMemory::IsEnabled() || run_state_args->is_partial_run) {
     handle_name_counter_value = handle_name_counter_.fetch_add(1);
   }
-  if (run_state_args->debugger_state) {
-    debug_tensor_watches_summary =
-        run_state_args->debugger_state->SummarizeDebugTensorWatches();
+
+  string debug_tensor_watches_summary;
+  if (!run_state_args->debug_options.debug_tensor_watch_opts().empty()) {
+    debug_tensor_watches_summary = SummarizeDebugTensorWatches(
+        run_state_args->debug_options.debug_tensor_watch_opts());
   }
 
   // Fast lookup path, no sorting.
@@ -1032,6 +1066,9 @@ Status DirectSession::GetOrCreateExecutors(
   options.fetch_endpoints = outputs_sorted;
   options.target_nodes = tn_sorted;
   options.use_function_convention = !run_state_args->is_partial_run;
+  if (!run_state_args->debug_options.debug_tensor_watch_opts().empty()) {
+    options.debug_options = run_state_args->debug_options;
+  }
 
   std::shared_ptr<ExecutorsAndKeys> ek(new ExecutorsAndKeys);
 
@@ -1107,10 +1144,10 @@ Status DirectSession::GetOrCreateExecutors(
 
     optimizer.Optimize(lib, options_.env, device, &iter->second);
 
-    // EXPERIMENTAL: tfdbg inserts debug nodes (i.e., probes) to the graph
-    if (run_state_args->debugger_state) {
-      TF_RETURN_IF_ERROR(run_state_args->debugger_state->DecorateGraphForDebug(
-          partition_graph.get(), params.device));
+    // EXPERIMENTAL: tfdbg inserts debug nodes in the graph.
+    if (!options.debug_options.debug_tensor_watch_opts().empty()) {
+      TF_RETURN_IF_ERROR(DecorateAndPublishGraphForDebug(
+          options.debug_options, partition_graph.get(), params.device));
     }
 
     TF_RETURN_IF_ERROR(EnsureMemoryTypes(DeviceType(device->device_type()),
diff --git a/tensorflow/core/common_runtime/direct_session.h b/tensorflow/core/common_runtime/direct_session.h
index 061a7fa787..cc298b3e57 100644
--- a/tensorflow/core/common_runtime/direct_session.h
+++ b/tensorflow/core/common_runtime/direct_session.h
@@ -169,10 +169,12 @@ class DirectSession : public Session {
   };
 
   struct RunStateArgs {
+    RunStateArgs(const DebugOptions& options) : debug_options(options) {}
+
     bool is_partial_run = false;
     string handle;
     std::unique_ptr<Graph> graph;
-    std::unique_ptr<DebuggerStateInterface> debugger_state;
+    const DebugOptions& debug_options;
   };
 
   // Initializes the base execution state given the 'graph',
@@ -239,6 +241,16 @@ class DirectSession : public Session {
     return ::tensorflow::Status::OK();
   }
 
+  ::tensorflow::Status CreateDebuggerState(
+      const DebugOptions& debug_options, int64 session_run_count,
+      int64 executor_step_count, const std::vector<string>& input_names,
+      const std::vector<string>& output_names,
+      const std::vector<string>& target_names,
+      std::unique_ptr<DebuggerStateInterface>* debugger_state);
+
+  ::tensorflow::Status DecorateAndPublishGraphForDebug(
+      const DebugOptions& debug_options, Graph* graph, Device* device);
+
   const SessionOptions options_;
 
   // Device structures.
diff --git a/tensorflow/core/debug/BUILD b/tensorflow/core/debug/BUILD
index 372ddb168a..c46e9e4c63 100644
--- a/tensorflow/core/debug/BUILD
+++ b/tensorflow/core/debug/BUILD
@@ -58,7 +58,7 @@ cc_library(
     linkstatic = 1,
     visibility = ["//visibility:public"],
     deps = [
-        ":debug_graph_utils",
+        ":debugger_state_impl",
         "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:debug_ops_op_lib",
     ],
@@ -85,6 +85,19 @@ tf_cuda_library(
     alwayslink = 1,
 )
 
+tf_cuda_library(
+    name = "debugger_state_impl",
+    srcs = ["debugger_state_impl.cc"],
+    hdrs = ["debugger_state_impl.h"],
+    copts = tf_copts(),
+    linkstatic = 1,
+    deps = [
+        ":debug_graph_utils",
+        ":debug_io_utils",
+    ],
+    alwayslink = 1,
+)
+
 tf_cuda_library(
     name = "debug_graph_utils",
     srcs = ["debug_graph_utils.cc"],
@@ -92,7 +105,6 @@ tf_cuda_library(
     copts = tf_copts(),
     linkstatic = 1,
     deps = [
-        ":debug_io_utils",
         "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
@@ -135,6 +147,7 @@ tf_cuda_library(
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
         "//tensorflow/core:lib_internal",
+        "//tensorflow/core:protos_all_cc",
         "@grpc//:grpc++_unsecure",
     ],
     alwayslink = 1,
@@ -209,6 +222,30 @@ tf_cc_test(
     ],
 )
 
+tf_cc_test(
+    name = "grpc_session_debug_test",
+    size = "medium",
+    srcs = ["grpc_session_debug_test.cc"],
+    linkstatic = tf_kernel_tests_linkstatic(),
+    deps = [
+        ":debug_grpc_testlib",
+        ":debug_io_utils",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:master_proto_cc",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_session",
+        "//tensorflow/core/distributed_runtime/rpc:grpc_testlib",
+        "//tensorflow/core/kernels:constant_op",
+        "//tensorflow/core/kernels:matmul_op",
+    ],
+)
+
 # TODO(cais): Add the following back in when tfdbg is supported on Android.
 # filegroup(
 #     name = "android_srcs",
diff --git a/tensorflow/core/debug/debug.cc b/tensorflow/core/debug/debug.cc
index c293b285c3..1aedfc2710 100644
--- a/tensorflow/core/debug/debug.cc
+++ b/tensorflow/core/debug/debug.cc
@@ -16,7 +16,7 @@ limitations under the License.
 #include <memory>
 
 #include "tensorflow/core/common_runtime/debugger_state_interface.h"
-#include "tensorflow/core/debug/debug_graph_utils.h"
+#include "tensorflow/core/debug/debugger_state_impl.h"
 
 namespace tensorflow {
 namespace {
@@ -30,10 +30,18 @@ class DebuggerStateRegistration {
     return std::unique_ptr<DebuggerStateInterface>(new DebuggerState(options));
   }
 
+  static std::unique_ptr<DebugGraphDecoratorInterface>
+  CreateDebugGraphDecorator(const DebugOptions& options) {
+    return std::unique_ptr<DebugGraphDecoratorInterface>(
+        new DebugGraphDecorator(options));
+  }
+
   DebuggerStateRegistration() {
     DebuggerStateRegistry::RegisterFactory(CreateDebuggerState);
+    DebugGraphDecoratorRegistry::RegisterFactory(CreateDebugGraphDecorator);
   }
 };
+
 static DebuggerStateRegistration register_debugger_state_implementation;
 
 }  // end namespace
diff --git a/tensorflow/core/debug/debug_graph_utils.cc b/tensorflow/core/debug/debug_graph_utils.cc
index 9061fd39f5..a222dc75d7 100644
--- a/tensorflow/core/debug/debug_graph_utils.cc
+++ b/tensorflow/core/debug/debug_graph_utils.cc
@@ -16,7 +16,6 @@ limitations under the License.
 #include "tensorflow/core/debug/debug_graph_utils.h"
 
 #include "tensorflow/core/common_runtime/memory_types.h"
-#include "tensorflow/core/debug/debug_io_utils.h"
 #include "tensorflow/core/framework/kernel_def.pb.h"
 #include "tensorflow/core/framework/node_def_builder.h"
 #include "tensorflow/core/framework/op_kernel.h"
@@ -45,69 +44,6 @@ Status ParseBoolString(const string& bool_str, bool* bool_val) {
 
 }  // namespace
 
-DebuggerState::DebuggerState(const DebugOptions& debug_options)
-    : watches(debug_options.debug_tensor_watch_opts()), debug_urls_() {
-  for (const DebugTensorWatch& watch : watches) {
-    for (const string& url : watch.debug_urls()) {
-      debug_urls_.insert(url);
-    }
-  }
-}
-
-DebuggerState::~DebuggerState() {
-  for (const string& debug_url : debug_urls_) {
-    DebugIO::CloseDebugURL(debug_url).IgnoreError();
-  }
-}
-
-const string DebuggerState::SummarizeDebugTensorWatches() {
-  std::ostringstream oss;
-
-  for (const DebugTensorWatch& watch : watches) {
-    string tensor_name =
-        strings::StrCat(watch.node_name(), ":", watch.output_slot());
-    if (watch.tolerate_debug_op_creation_failures()) {
-      oss << "(TOL)";  // Shorthand for "tolerate".
-    }
-    oss << tensor_name << "|";
-
-    for (const string& debug_op : watch.debug_ops()) {
-      oss << debug_op << ",";
-    }
-
-    oss << "@";
-    for (const string& debug_url : watch.debug_urls()) {
-      oss << debug_url << ",";
-    }
-
-    oss << ";";
-  }
-
-  return oss.str();
-}
-
-Status DebuggerState::DecorateGraphForDebug(Graph* graph, Device* device) {
-  Status status;
-
-  DebugNodeInserter::DeparallelizeWhileLoops(graph, device);
-  status.Update(DebugNodeInserter::InsertNodes(watches, graph, device));
-  if (status.ok()) {
-    status.Update(DebugIO::PublishGraph(*graph, debug_urls_));
-  }
-
-  return status;
-}
-
-Status DebuggerState::PublishDebugMetadata(
-    const int64 global_step, const int64 session_run_count,
-    const int64 executor_step_count, const std::vector<string>& input_names,
-    const std::vector<string>& output_names,
-    const std::vector<string>& target_nodes) {
-  return DebugIO::PublishDebugMetadata(global_step, session_run_count,
-                                       executor_step_count, input_names,
-                                       output_names, target_nodes, debug_urls_);
-}
-
 // static
 Status DebugNodeInserter::InsertNodes(
     const protobuf::RepeatedPtrField<DebugTensorWatch>& watches, Graph* graph,
diff --git a/tensorflow/core/debug/debug_graph_utils.h b/tensorflow/core/debug/debug_graph_utils.h
index ac97856443..fa8b33b98a 100644
--- a/tensorflow/core/debug/debug_graph_utils.h
+++ b/tensorflow/core/debug/debug_graph_utils.h
@@ -17,7 +17,6 @@ limitations under the License.
 #define TENSORFLOW_DEBUG_NODE_INSERTER_H_
 
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
 #include "tensorflow/core/common_runtime/debugger_state_interface.h"
@@ -29,35 +28,6 @@ limitations under the License.
 
 namespace tensorflow {
 
-class DebuggerState : public DebuggerStateInterface {
- public:
-  DebuggerState(const DebugOptions& debug_options);
-  virtual ~DebuggerState();
-
-  // Returns a summary string for RepeatedPtrFields of DebugTensorWatches.
-  const string SummarizeDebugTensorWatches() override;
-
-  // Insert special-purpose debug nodes to graph. See the documentation of
-  // DebugNodeInserter::InsertNodes() for details.
-  Status DecorateGraphForDebug(Graph* graph, Device* device) override;
-
-  const protobuf::RepeatedPtrField<DebugTensorWatch>& watches;
-
-  // Publish metadata about the debugged Session::Run() call.
-  //
-  // See the doc string of DebuggerStateInterface::PublishDebugMetadata() for
-  // details.
-  Status PublishDebugMetadata(const int64 global_step,
-                              const int64 session_run_count,
-                              const int64 executor_step_count,
-                              const std::vector<string>& input_names,
-                              const std::vector<string>& output_names,
-                              const std::vector<string>& target_names) override;
-
- private:
-  std::unordered_set<string> debug_urls_;
-};
-
 class DebugNodeInserter {
  public:
   // EXPERIMENTAL: Insert special debug ops (e.g., DebugIdentity) to graph for
diff --git a/tensorflow/core/debug/debug_grpc_testlib.cc b/tensorflow/core/debug/debug_grpc_testlib.cc
index 8dfa904489..d9fab87aed 100644
--- a/tensorflow/core/debug/debug_grpc_testlib.cc
+++ b/tensorflow/core/debug/debug_grpc_testlib.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include "tensorflow/core/debug/debug_graph_utils.h"
 #include "tensorflow/core/debug/debug_io_utils.h"
+#include "tensorflow/core/framework/summary.pb.h"
 #include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/env.h"
@@ -33,26 +34,32 @@ namespace test {
   Event event;
 
   while (stream->Read(&event)) {
-    const Summary::Value& val = event.summary().value(0);
-
-    std::vector<string> name_items =
-        tensorflow::str_util::Split(val.node_name(), ':');
-
-    const string node_name = name_items[0];
-    int32 output_slot = 0;
-    tensorflow::strings::safe_strto32(name_items[1], &output_slot);
-    const string debug_op = name_items[2];
-
-    const TensorProto& tensor_proto = val.tensor();
-    Tensor tensor(tensor_proto.dtype());
-    if (!tensor.FromProto(tensor_proto)) {
-      return ::grpc::Status::CANCELLED;
+    if (event.has_log_message()) {
+      debug_metadata_strings.push_back(event.log_message().message());
+    } else if (!event.graph_def().empty()) {
+      encoded_graph_defs.push_back(event.graph_def());
+    } else if (event.has_summary()) {
+      const Summary::Value& val = event.summary().value(0);
+
+      std::vector<string> name_items =
+          tensorflow::str_util::Split(val.node_name(), ':');
+
+      const string node_name = name_items[0];
+      int32 output_slot = 0;
+      tensorflow::strings::safe_strto32(name_items[1], &output_slot);
+      const string debug_op = name_items[2];
+
+      const TensorProto& tensor_proto = val.tensor();
+      Tensor tensor(tensor_proto.dtype());
+      if (!tensor.FromProto(tensor_proto)) {
+        return ::grpc::Status::CANCELLED;
+      }
+
+      node_names.push_back(node_name);
+      output_slots.push_back(output_slot);
+      debug_ops.push_back(debug_op);
+      debug_tensors.push_back(tensor);
     }
-
-    node_names.push_back(node_name);
-    output_slots.push_back(output_slot);
-    debug_ops.push_back(debug_op);
-    debug_tensors.push_back(tensor);
   }
 
   {
@@ -79,6 +86,8 @@ namespace test {
 }
 
 void TestEventListenerImpl::ClearReceivedDebugData() {
+  debug_metadata_strings.clear();
+  encoded_graph_defs.clear();
   node_names.clear();
   output_slots.clear();
   debug_ops.clear();
diff --git a/tensorflow/core/debug/debug_grpc_testlib.h b/tensorflow/core/debug/debug_grpc_testlib.h
index 0e3223dbfe..c2b96e78c5 100644
--- a/tensorflow/core/debug/debug_grpc_testlib.h
+++ b/tensorflow/core/debug/debug_grpc_testlib.h
@@ -47,6 +47,8 @@ class TestEventListenerImpl final : public EventListener::Service {
                                              const int32 output_slot,
                                              const string& debug_op);
 
+  std::vector<string> debug_metadata_strings;
+  std::vector<string> encoded_graph_defs;
   std::vector<string> node_names;
   std::vector<int32> output_slots;
   std::vector<string> debug_ops;
diff --git a/tensorflow/core/debug/debugger_state_impl.cc b/tensorflow/core/debug/debugger_state_impl.cc
new file mode 100644
index 0000000000..d5752c0002
--- /dev/null
+++ b/tensorflow/core/debug/debugger_state_impl.cc
@@ -0,0 +1,66 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/debug/debugger_state_impl.h"
+
+#include "tensorflow/core/debug/debug_graph_utils.h"
+#include "tensorflow/core/debug/debug_io_utils.h"
+
+namespace tensorflow {
+
+DebuggerState::DebuggerState(const DebugOptions& debug_options) {
+  for (const DebugTensorWatch& watch :
+       debug_options.debug_tensor_watch_opts()) {
+    for (const string& url : watch.debug_urls()) {
+      debug_urls_.insert(url);
+    }
+  }
+}
+
+DebuggerState::~DebuggerState() {
+  for (const string& debug_url : debug_urls_) {
+    DebugIO::CloseDebugURL(debug_url).IgnoreError();
+  }
+}
+
+Status DebuggerState::PublishDebugMetadata(
+    const int64 global_step, const int64 session_run_count,
+    const int64 executor_step_count, const std::vector<string>& input_names,
+    const std::vector<string>& output_names,
+    const std::vector<string>& target_names) {
+  return DebugIO::PublishDebugMetadata(global_step, session_run_count,
+                                       executor_step_count, input_names,
+                                       output_names, target_names, debug_urls_);
+}
+
+Status DebugGraphDecorator::DecorateGraph(Graph* graph, Device* device) {
+  DebugNodeInserter::DeparallelizeWhileLoops(graph, device);
+  return DebugNodeInserter::InsertNodes(
+      debug_options_.debug_tensor_watch_opts(), graph, device);
+}
+
+Status DebugGraphDecorator::PublishGraph(const Graph& graph) {
+  std::unordered_set<string> debug_urls;
+  for (const DebugTensorWatch& watch :
+       debug_options_.debug_tensor_watch_opts()) {
+    for (const string& url : watch.debug_urls()) {
+      debug_urls.insert(url);
+    }
+  }
+
+  return DebugIO::PublishGraph(graph, debug_urls);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/debug/debugger_state_impl.h b/tensorflow/core/debug/debugger_state_impl.h
new file mode 100644
index 0000000000..d91aa03426
--- /dev/null
+++ b/tensorflow/core/debug/debugger_state_impl.h
@@ -0,0 +1,61 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_DEBUGGER_STATE_IMPL_H_
+#define TENSORFLOW_DEBUGGER_STATE_IMPL_H_
+
+#include "tensorflow/core/common_runtime/debugger_state_interface.h"
+
+#include <unordered_set>
+#include <vector>
+
+namespace tensorflow {
+
+class DebuggerState : public DebuggerStateInterface {
+ public:
+  DebuggerState(const DebugOptions& debug_options);
+  virtual ~DebuggerState();
+
+  // Publish metadata about the debugged Session::Run() call.
+  //
+  // See the doc string of DebuggerStateInterface::PublishDebugMetadata() for
+  // details.
+  Status PublishDebugMetadata(const int64 global_step,
+                              const int64 session_run_count,
+                              const int64 executor_step_count,
+                              const std::vector<string>& input_names,
+                              const std::vector<string>& output_names,
+                              const std::vector<string>& target_names) override;
+
+ private:
+  std::unordered_set<string> debug_urls_;
+};
+
+class DebugGraphDecorator : public DebugGraphDecoratorInterface {
+ public:
+  DebugGraphDecorator(const DebugOptions& debug_options)
+      : debug_options_(debug_options) {}
+  virtual ~DebugGraphDecorator() {}
+
+  Status DecorateGraph(Graph* graph, Device* device) override;
+  Status PublishGraph(const Graph& graph) override;
+
+ private:
+  DebugOptions debug_options_;
+};
+
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_DEBUGGER_STATE_IMPL_H_
diff --git a/tensorflow/core/debug/grpc_session_debug_test.cc b/tensorflow/core/debug/grpc_session_debug_test.cc
new file mode 100644
index 0000000000..6c68729410
--- /dev/null
+++ b/tensorflow/core/debug/grpc_session_debug_test.cc
@@ -0,0 +1,288 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/distributed_runtime/rpc/grpc_session.h"
+
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/debug/debug_io_utils.h"
+#include "tensorflow/core/distributed_runtime/rpc/grpc_testlib.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/summary.pb.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/graph/default_device.h"
+#include "tensorflow/core/graph/graph.h"
+#include "tensorflow/core/graph/testlib.h"
+#include "tensorflow/core/lib/core/error_codes.pb.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/protobuf/debug.pb.h"
+#include "tensorflow/core/protobuf/master.pb.h"
+#include "tensorflow/core/public/session.h"
+#include "tensorflow/core/util/port.h"
+
+namespace tensorflow {
+
+static SessionOptions Devices(int num_cpus, int num_gpus) {
+  SessionOptions result;
+  (*result.config.mutable_device_count())["CPU"] = num_cpus;
+  (*result.config.mutable_device_count())["GPU"] = num_gpus;
+  return result;
+}
+
+void CreateGraphDef(GraphDef* graph_def, string node_names[3]) {
+  Graph graph(OpRegistry::Global());
+
+  Tensor a_tensor(DT_FLOAT, TensorShape({1, 2}));
+  test::FillValues<float>(&a_tensor, {1.0, 2.0});
+  Node* a = test::graph::Constant(&graph, a_tensor);
+  node_names[0] = a->name();
+
+  Tensor b_tensor(DT_FLOAT, TensorShape({2, 1}));
+  test::FillValues<float>(&b_tensor, {2.0, 1.0});
+  Node* b = test::graph::Constant(&graph, b_tensor);
+  node_names[1] = b->name();
+
+  // c = a * b
+  Node* c = test::graph::Matmul(&graph, a, b, false, false);
+  node_names[2] = c->name();
+
+  test::graph::ToGraphDef(&graph, graph_def);
+}
+
+// Asserts that "val" is a single float tensor. The only float is
+// "expected_val".
+static void IsSingleFloatValue(const Tensor& val, float expected_val) {
+  ASSERT_EQ(val.dtype(), DT_FLOAT);
+  ASSERT_EQ(val.NumElements(), 1);
+  ASSERT_EQ(val.flat<float>()(0), expected_val);
+}
+
+static SessionOptions Options(const string& target, int placement_period) {
+  SessionOptions options;
+  // NOTE(mrry): GrpcSession requires a grpc:// scheme prefix in the target
+  // string.
+  options.target = strings::StrCat("grpc://", target);
+  options.config.set_placement_period(placement_period);
+  options.config.mutable_graph_options()
+      ->mutable_optimizer_options()
+      ->set_opt_level(OptimizerOptions::L0);
+  return options;
+}
+
+static Session* NewRemote(const SessionOptions& options) {
+  return CHECK_NOTNULL(NewSession(options));
+}
+
+class GrpcSessionDebugTest : public ::testing::Test {
+ protected:
+  void SetUp() override { CreateDumpDir(); }
+
+  void TearDown() override { DeleteDumpDir(); }
+
+  void DeleteDumpDir() {
+    if (Env::Default()->IsDirectory(dump_dir_).ok()) {
+      int64 undeleted_files = 0;
+      int64 undeleted_dirs = 0;
+      ASSERT_TRUE(
+          Env::Default()
+              ->DeleteRecursively(dump_dir_, &undeleted_files, &undeleted_dirs)
+              .ok());
+      ASSERT_EQ(0, undeleted_files);
+      ASSERT_EQ(0, undeleted_dirs);
+    }
+  }
+
+  const string GetDebugURL() { return debug_url_; }
+
+  void LoadTensorDumps(const string& subdir, std::vector<Tensor>* tensors) {
+    const string dirpath = io::JoinPath(dump_dir_, subdir);
+    if (!(Env::Default()->IsDirectory(dirpath).ok())) {
+      return;
+    }
+
+    std::vector<string> filenames;
+    TF_ASSERT_OK(Env::Default()->GetChildren(dirpath, &filenames));
+
+    for (const string& filename : filenames) {
+      Event event;
+      TF_ASSERT_OK(ReadEventFromFile(io::JoinPath(dirpath, filename), &event));
+      if (event.summary().value().size() == 1) {
+        Tensor tensor;
+        ASSERT_TRUE(tensor.FromProto(event.summary().value(0).tensor()));
+        tensors->push_back(tensor);
+      }
+    }
+  }
+
+ private:
+  void CreateDumpDir() {
+    char dir_template[] = "/tmp/tfdbg_grpc_sessions_XXXXXX";
+    dump_dir_ = mkdtemp(dir_template);
+    debug_url_ = strings::StrCat("file://", dump_dir_);
+  }
+
+  string dump_dir_;
+  string debug_url_;
+};
+
+TEST_F(GrpcSessionDebugTest, FileDebugURL) {
+  GraphDef graph;
+  string node_names[3];
+  CreateGraphDef(&graph, node_names);
+
+  std::unique_ptr<test::TestCluster> cluster;
+  TF_CHECK_OK(test::TestCluster::MakeTestCluster(Devices(1, 0), 2, &cluster));
+
+  std::unique_ptr<Session> session(
+      NewRemote(Options(cluster->targets()[0], 1)));
+  ASSERT_TRUE(session != nullptr);
+  TF_CHECK_OK(session->Create(graph));
+
+  // Iteration 0: No watch.
+  // Iterations 1 and 2: Watch one Tensor.
+  // Iterations 3 and 4: Watch two Tensors.
+  // Iteration 5: No watch.
+  for (size_t i = 0; i < 6; ++i) {
+    RunOptions options;
+    if (i >= 1 && i < 5) {
+      DebugOptions* debug_options = options.mutable_debug_options();
+      DebugTensorWatch* watch = debug_options->add_debug_tensor_watch_opts();
+      watch->set_node_name(node_names[0]);
+      watch->set_output_slot(0);
+      watch->add_debug_ops("DebugIdentity");
+      watch->add_debug_urls(GetDebugURL());
+
+      if (i >= 3) {
+        watch = debug_options->add_debug_tensor_watch_opts();
+        watch->set_node_name(node_names[1]);
+        watch->set_output_slot(0);
+        watch->add_debug_ops("DebugIdentity");
+        watch->add_debug_urls(GetDebugURL());
+      }
+    }
+
+    RunMetadata metadata;
+    std::vector<Tensor> outputs;
+    TF_CHECK_OK(
+        session->Run(options, {}, {node_names[2]}, {}, &outputs, &metadata));
+    ASSERT_EQ(1, outputs.size());
+    IsSingleFloatValue(outputs[0], 4.0);
+
+    std::vector<Tensor> dumped_tensors;
+    LoadTensorDumps("n", &dumped_tensors);
+
+    if (i == 0 || i == 5) {
+      ASSERT_EQ(0, dumped_tensors.size());
+    } else {
+      if (i == 1 || i == 2) {
+        ASSERT_EQ(1, dumped_tensors.size());
+        ASSERT_EQ(TensorShape({1, 2}), dumped_tensors[0].shape());
+        ASSERT_EQ(1.0, dumped_tensors[0].flat<float>()(0));
+        ASSERT_EQ(2.0, dumped_tensors[0].flat<float>()(1));
+      } else {
+        ASSERT_EQ(2, dumped_tensors.size());
+      }
+      DeleteDumpDir();
+    }
+  }
+  TF_CHECK_OK(session->Close());
+}
+
+void SetDevice(GraphDef* graph, const string& name, const string& dev) {
+  for (size_t i = 0; i < graph->node_size(); ++i) {
+    if (graph->node(i).name() == name) {
+      graph->mutable_node(i)->set_device(dev);
+      return;
+    }
+  }
+  LOG(FATAL) << "Name '" << name << "' not found.";
+}
+
+TEST_F(GrpcSessionDebugTest, MultiDevices_String) {
+  std::unique_ptr<test::TestCluster> cluster;
+  TF_CHECK_OK(test::TestCluster::MakeTestCluster(Devices(1, 1), 2, &cluster));
+  std::unique_ptr<Session> session(
+      NewRemote(Options(cluster->targets()[0], 1000)));
+  ASSERT_TRUE(session != nullptr);
+
+  // b = a
+  Graph graph(OpRegistry::Global());
+  Tensor a_tensor(DT_STRING, TensorShape({2, 2}));
+  for (size_t i = 0; i < 4; ++i) {
+    a_tensor.flat<string>()(i) = "hello, world";
+  }
+  Node* a = test::graph::Constant(&graph, a_tensor);
+  Node* b = test::graph::Identity(&graph, a);
+
+  GraphDef def;
+  test::graph::ToGraphDef(&graph, &def);
+
+  // In this test, we force each node (a, b) on every possible device.
+  // We test all possible cases.
+  for (const auto& a_dev : cluster->devices()) {
+    for (const auto& b_dev : cluster->devices()) {
+      LOG(INFO) << "a: " << a_dev.name() << " b: " << b_dev.name();
+      SetDevice(&def, a->name(), a_dev.name());
+      SetDevice(&def, b->name(), b_dev.name());
+
+      Status s = session->Create(def);
+      if (s.ok()) {
+        std::vector<Tensor> outputs;
+
+        RunOptions options;
+        DebugOptions* debug_options = options.mutable_debug_options();
+        DebugTensorWatch* watch = debug_options->add_debug_tensor_watch_opts();
+        watch->set_node_name(a->name());
+        watch->set_output_slot(0);
+        watch->add_debug_ops("DebugIdentity");
+        watch->add_debug_urls(GetDebugURL());
+
+        RunMetadata metadata;
+        TF_CHECK_OK(
+            session->Run(options, {}, {b->name()}, {}, &outputs, &metadata));
+        ASSERT_EQ(1, outputs.size());
+        ASSERT_EQ(outputs[0].dtype(), DT_STRING);
+        ASSERT_EQ(outputs[0].NumElements(), 4);
+        for (size_t i = 0; i < outputs[0].NumElements(); ++i) {
+          EXPECT_EQ(outputs[0].flat<string>()(i), "hello, world");
+        }
+        TF_CHECK_OK(session->Close());
+
+        std::vector<Tensor> dumped_tensors;
+        LoadTensorDumps("n", &dumped_tensors);
+        ASSERT_EQ(1, dumped_tensors.size());
+        ASSERT_EQ(TensorShape({2, 2}), dumped_tensors[0].shape());
+        for (size_t i = 0; i < 4; ++i) {
+          ASSERT_EQ("hello, world", dumped_tensors[0].flat<string>()(i));
+        }
+
+        DeleteDumpDir();
+      } else {
+        LOG(ERROR) << "Error: " << s;
+        ASSERT_TRUE((a_dev.device_type() == DEVICE_GPU) ||
+                    (b_dev.device_type() == DEVICE_GPU));
+        ASSERT_FALSE(s.ok());
+      }
+    }
+  }
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/BUILD b/tensorflow/core/distributed_runtime/BUILD
index 0c2d2b5d5d..0f5eb0cb32 100644
--- a/tensorflow/core/distributed_runtime/BUILD
+++ b/tensorflow/core/distributed_runtime/BUILD
@@ -259,6 +259,7 @@ cc_library(
         "//tensorflow/core:lib_internal",
         "//tensorflow/core:master_proto_cc",
         "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/debug:debug_graph_utils",
     ],
 )
 
@@ -329,6 +330,7 @@ cc_library(
         "//tensorflow/core:lib_internal",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core:worker_proto_cc",
+        "//tensorflow/core/debug",
     ],
 )
 
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index 36b7b5b628..6051f11fad 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/common_runtime/constant_folding.h"
+#include "tensorflow/core/common_runtime/debugger_state_interface.h"
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/common_runtime/device_mgr.h"
 #include "tensorflow/core/common_runtime/function.h"
@@ -94,6 +95,21 @@ static Status ValidateGraphDefForDevices(const GraphDef& gdef) {
   return Status::OK();
 }
 
+Status GraphMgr::DecorateAndPublishGraphForDebug(
+    const DebugOptions& debug_options, Graph* graph, Device* device) {
+  std::unique_ptr<DebugGraphDecoratorInterface> decorator =
+      DebugGraphDecoratorRegistry::CreateDecorator(debug_options);
+  if (!decorator) {
+    return errors::Internal(
+        "Debugger options are set, but creation of debug graph publisher ",
+        "failed.");
+  }
+  TF_RETURN_IF_ERROR(decorator->DecorateGraph(graph, device));
+  TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph));
+
+  return Status::OK();
+}
+
 // Creates executors given a graph definition "gdef" of a "session".
 // If a node in "gdef" is shared by other graphs in "session", the
 // same op kernel is reused. E.g., typically a params node is shared
@@ -106,7 +122,8 @@ static Status ValidateGraphDefForDevices(const GraphDef& gdef) {
 // "executors" are filled with one executor per device if success and
 // the caller takes the ownership of returned executors.
 Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
-                          const GraphOptions& graph_options, Item* item) {
+                          const GraphOptions& graph_options,
+                          const DebugOptions& debug_options, Item* item) {
   item->session = session;
   item->lib_def =
       new FunctionLibraryDefinition(OpRegistry::Global(), gdef.library());
@@ -232,6 +249,13 @@ Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
     };
 
     optimizer.Optimize(lib, worker_env_->env, params.device, &subgraph);
+
+    // EXPERIMENTAL: tfdbg inserts debug nodes (i.e., probes) to the graph.
+    if (!debug_options.debug_tensor_watch_opts().empty()) {
+      TF_RETURN_IF_ERROR(DecorateAndPublishGraphForDebug(
+          debug_options, subgraph.get(), params.device));
+    }
+
     TF_RETURN_IF_ERROR(
         EnsureMemoryTypes(DeviceType(unit->device->device_type()),
                           unit->device->name(), subgraph.get()));
@@ -247,9 +271,10 @@ Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
 }
 
 Status GraphMgr::Register(const string& session, const GraphDef& gdef,
-                          const GraphOptions& graph_options, string* handle) {
+                          const GraphOptions& graph_options,
+                          const DebugOptions& debug_options, string* handle) {
   Item* item = new Item;
-  Status s = InitItem(session, gdef, graph_options, item);
+  Status s = InitItem(session, gdef, graph_options, debug_options, item);
   if (!s.ok()) {
     item->Unref();
     return s;
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.h b/tensorflow/core/distributed_runtime/graph_mgr.h
index 5f51d63857..349af6c54e 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.h
+++ b/tensorflow/core/distributed_runtime/graph_mgr.h
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/protobuf/config.pb.h"
+#include "tensorflow/core/protobuf/debug.pb.h"
 
 namespace tensorflow {
 
@@ -67,7 +68,8 @@ class GraphMgr {
 
   // Registers a graph. Fills in "handle"
   Status Register(const string& session, const GraphDef& gdef,
-                  const GraphOptions& graph_options, string* handle);
+                  const GraphOptions& graph_options,
+                  const DebugOptions& debug_options, string* handle);
 
   // Executes one step of a registered graph "handle".
   //
@@ -167,7 +169,11 @@ class GraphMgr {
                                       const StatusCallback& done);
 
   Status InitItem(const string& session, const GraphDef& gdef,
-                  const GraphOptions& graph_options, Item* item);
+                  const GraphOptions& graph_options,
+                  const DebugOptions& debug_options, Item* item);
+
+  Status DecorateAndPublishGraphForDebug(const DebugOptions& debug_options,
+                                         Graph* graph, Device* device);
 
   TF_DISALLOW_COPY_AND_ASSIGN(GraphMgr);
 };
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 73d4e6ab00..681933adad 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/process_util.h"
 #include "tensorflow/core/common_runtime/profile_handler.h"
 #include "tensorflow/core/common_runtime/stats_publisher_interface.h"
+#include "tensorflow/core/debug/debug_graph_utils.h"
 #include "tensorflow/core/distributed_runtime/scheduler.h"
 #include "tensorflow/core/distributed_runtime/worker_cache.h"
 #include "tensorflow/core/distributed_runtime/worker_interface.h"
@@ -67,6 +68,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
         client_graph_(std::move(cg)),
         session_opts_(session_opts),
         is_partial_(is_partial),
+        debug_opts_(bopts.debug_options),
         worker_cache_(worker_cache) {
     VLOG(1) << "Created ReffedClientGraph for node with "
             << client_graph_->graph.num_node_ids();
@@ -206,6 +208,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
   const std::unique_ptr<SimpleClientGraph> client_graph_;
   const SessionOptions session_opts_;
   const bool is_partial_;
+  const DebugOptions& debug_opts_;
   WorkerCacheInterface* const worker_cache_;  // Not owned.
   std::unordered_map<StringPiece, Node*, StringPiece::Hasher> name_to_node_;
 
@@ -406,6 +409,7 @@ Status MasterSession::ReffedClientGraph::DoRegisterPartitions(
     // For simplicity, we ship the library completely to every worker.
     *c->req.mutable_graph_def()->mutable_library() = func_def_lib;
     *c->req.mutable_graph_options() = session_opts_.config.graph_options();
+    *c->req.mutable_debug_options() = debug_opts_;
     VLOG(2) << "Register " << c->req.graph_def().DebugString();
     auto cb = [c, &done](const Status& s) {
       c->status = s;
@@ -899,6 +903,10 @@ void BuildBuildGraphOptions(const RunStepRequestWrapper& req,
     opts->target_nodes.push_back(req.target_name(i));
   }
 
+  if (!req.options().debug_options().debug_tensor_watch_opts().empty()) {
+    opts->debug_options = req.options().debug_options();
+  }
+
   std::sort(opts->feed_endpoints.begin(), opts->feed_endpoints.end());
   std::sort(opts->target_nodes.begin(), opts->target_nodes.end());
   std::sort(opts->fetch_endpoints.begin(), opts->fetch_endpoints.end());
@@ -916,6 +924,8 @@ void BuildBuildGraphOptions(const PartialRunSetupRequest& req,
     opts->target_nodes.push_back(target);
   }
 
+  // TODO(cais): Add TFDBG support to partial runs.
+
   std::sort(opts->feed_endpoints.begin(), opts->feed_endpoints.end());
   std::sort(opts->target_nodes.begin(), opts->target_nodes.end());
   std::sort(opts->fetch_endpoints.begin(), opts->fetch_endpoints.end());
@@ -932,6 +942,13 @@ uint64 HashBuildGraphOptions(const BuildGraphOptions& opts) {
   for (const string& name : opts.fetch_endpoints) {
     h = Hash64(name.c_str(), name.size(), h);
   }
+
+  if (!opts.debug_options.debug_tensor_watch_opts().empty()) {
+    const string watch_summary = SummarizeDebugTensorWatches(
+        opts.debug_options.debug_tensor_watch_opts());
+    h = Hash64(watch_summary.c_str(), watch_summary.size(), h);
+  }
+
   return h;
 }
 
@@ -1069,6 +1086,7 @@ Status MasterSession::StartStep(const BuildGraphOptions& opts, int64* count,
           handle_, opts, std::move(client_graph), session_opts_,
           stats_publisher_factory_, execution_state_.get(), is_partial,
           env_->worker_cache);
+
       iter = m->insert({hash, entry}).first;
       VLOG(1) << "Preparing to execute new graph";
     }
@@ -1315,6 +1333,43 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
   return s;
 }
 
+Status MasterSession::CreateDebuggerState(
+    const DebugOptions& debug_options, const RunStepRequestWrapper& req,
+    int64 rcg_execution_count,
+    std::unique_ptr<DebuggerStateInterface>* debugger_state) {
+  std::unique_ptr<DebuggerStateInterface> state =
+      DebuggerStateRegistry::CreateState(debug_options);
+  if (!state) {
+    return errors::Internal(
+        "Debugger options are set, but creation of debugger state failed. "
+        "It appears that debugger is not linked in this TensorFlow build.");
+  }
+
+  std::vector<string> input_names;
+  for (size_t i = 0; i < req.num_feeds(); ++i) {
+    input_names.push_back(req.feed_name(i));
+  }
+  std::vector<string> output_names;
+  for (size_t i = 0; i < req.num_fetches(); ++i) {
+    output_names.push_back(req.fetch_name(i));
+  }
+  std::vector<string> target_names;
+  for (size_t i = 0; i < req.num_targets(); ++i) {
+    target_names.push_back(req.target_name(i));
+  }
+
+  // TODO(cais): We currently use -1 as a dummy value for session run count.
+  // While this counter value is straightforward to define and obtain for
+  // DirectSessions, it is less so for non-direct Sessions. Devise a better
+  // way to get its value when the need arises.
+  TF_RETURN_IF_ERROR(state->PublishDebugMetadata(
+      debug_options.global_step(), -1, rcg_execution_count, input_names,
+      output_names, target_names));
+
+  *debugger_state = std::move(state);
+  return Status::OK();
+}
+
 Status MasterSession::DoRunWithLocalExecution(
     CallOptions* opts, const RunStepRequestWrapper& req,
     MutableRunStepResponseWrapper* resp) {
@@ -1333,6 +1388,13 @@ Status MasterSession::DoRunWithLocalExecution(
   // Unref "rcg" when out of scope.
   core::ScopedUnref unref(rcg);
 
+  std::unique_ptr<DebuggerStateInterface> debugger_state;
+  const DebugOptions& debug_options = req.options().debug_options();
+
+  if (!debug_options.debug_tensor_watch_opts().empty()) {
+    TF_RETURN_IF_ERROR(
+        CreateDebuggerState(debug_options, req, count, &debugger_state));
+  }
   TF_RETURN_IF_ERROR(BuildAndRegisterPartitions(rcg));
 
   // Keeps the highest 8 bits 0x01: we reserve some bits of the
diff --git a/tensorflow/core/distributed_runtime/master_session.h b/tensorflow/core/distributed_runtime/master_session.h
index ee1a340c8e..d47125be99 100644
--- a/tensorflow/core/distributed_runtime/master_session.h
+++ b/tensorflow/core/distributed_runtime/master_session.h
@@ -19,6 +19,7 @@ limitations under the License.
 #include <atomic>
 #include <vector>
 
+#include "tensorflow/core/common_runtime/debugger_state_interface.h"
 #include "tensorflow/core/common_runtime/device_set.h"
 #include "tensorflow/core/common_runtime/simple_graph_execution_state.h"
 #include "tensorflow/core/common_runtime/stats_publisher_interface.h"
@@ -193,6 +194,11 @@ class MasterSession : public core::RefCounted {
 
   Status BuildAndRegisterPartitions(ReffedClientGraph* rcg);
 
+  Status CreateDebuggerState(
+      const DebugOptions& debug_options, const RunStepRequestWrapper& req,
+      int64 rcg_execution_count,
+      std::unique_ptr<DebuggerStateInterface>* debugger_state);
+
   TF_DISALLOW_COPY_AND_ASSIGN(MasterSession);
 };
 
diff --git a/tensorflow/core/distributed_runtime/worker.cc b/tensorflow/core/distributed_runtime/worker.cc
index 1aced4443f..89639e21b5 100644
--- a/tensorflow/core/distributed_runtime/worker.cc
+++ b/tensorflow/core/distributed_runtime/worker.cc
@@ -55,7 +55,7 @@ void Worker::RegisterGraphAsync(const RegisterGraphRequest* request,
       env_->session_mgr->WorkerSessionForSession(request->session_handle());
   Status s = session->graph_mgr->Register(
       request->session_handle(), request->graph_def(), request->graph_options(),
-      response->mutable_graph_handle());
+      request->debug_options(), response->mutable_graph_handle());
   if (s.ok()) {
     env_->session_mgr->AssociateGraphWithSession(request->session_handle(),
                                                  response->graph_handle());
diff --git a/tensorflow/core/protobuf/worker.proto b/tensorflow/core/protobuf/worker.proto
index e3af1119e9..661327847c 100644
--- a/tensorflow/core/protobuf/worker.proto
+++ b/tensorflow/core/protobuf/worker.proto
@@ -28,6 +28,7 @@ import "tensorflow/core/framework/device_attributes.proto";
 import "tensorflow/core/framework/graph.proto";
 import "tensorflow/core/framework/tensor.proto";
 import "tensorflow/core/protobuf/config.proto";
+import "tensorflow/core/protobuf/debug.proto";
 import "tensorflow/core/protobuf/named_tensor.proto";
 import "tensorflow/core/protobuf/tensorflow_server.proto";
 
@@ -92,6 +93,9 @@ message RegisterGraphRequest {
 
   // Configuration options for the session in which this graph was created.
   GraphOptions graph_options = 4;
+
+  // Field(s) used by TensorFlow Debugger (tfdbg).
+  DebugOptions debug_options = 5;
 }
 
 message RegisterGraphResponse {
-- 
GitLab


From 74770749840e1c823a50b743a50637afc3529e3c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 29 Apr 2017 12:03:51 -0800
Subject: [PATCH 0843/1563] [XLA] Make ReshapeMover account for broadcast
 operands, add VLOGging for debug. Change: 154637127

---
 tensorflow/compiler/xla/service/BUILD         |   2 +
 .../compiler/xla/service/hlo_instruction.cc   |  12 +-
 .../compiler/xla/service/hlo_instruction.h    |   5 +-
 .../compiler/xla/service/reshape_mover.cc     | 270 +++++++++++-------
 .../xla/service/reshape_mover_test.cc         |  52 ++++
 5 files changed, 226 insertions(+), 115 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 2137888726..05fc480936 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -859,7 +859,9 @@ cc_library(
         ":hlo_pass",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:status_macros",
         "//tensorflow/compiler/xla:util",
+        "//tensorflow/core:lib",
     ],
 )
 
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index d8e01f88b9..179e183265 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -410,7 +410,9 @@ HloInstruction::CreateSelectAndScatter(
 /* static */ std::unique_ptr<HloInstruction> HloInstruction::CreateReshape(
     const Shape& shape, HloInstruction* operand) {
   CHECK_EQ(ShapeUtil::ElementsIn(shape),
-           ShapeUtil::ElementsIn(operand->shape()));
+           ShapeUtil::ElementsIn(operand->shape()))
+      << "shape: " << ShapeUtil::HumanString(shape)
+      << " operand: " << ShapeUtil::HumanString(operand->shape());
   auto instruction = WrapUnique(new HloInstruction(HloOpcode::kReshape, shape));
   instruction->AppendOperand(operand);
   return instruction;
@@ -1428,7 +1430,8 @@ string HloInstruction::ExtendedOpcodeStr() const {
   return opc_name;
 }
 
-string HloInstruction::ToString(bool compact_operands) const {
+string HloInstruction::ToString(bool compact_operands,
+                                bool include_metadata) const {
   string operands;
   if (opcode() == HloOpcode::kConstant) {
     // For constants, show the actual value in place of an empty operand list.
@@ -1509,8 +1512,9 @@ string HloInstruction::ToString(bool compact_operands) const {
   if (opcode() == HloOpcode::kGetTupleElement) {
     StrAppend(&extra, ", index=", tuple_index());
   }
-  if (!metadata_.op_type().empty() || !metadata_.op_name().empty() ||
-      !metadata_.source_file().empty()) {
+  if (include_metadata &&
+      (!metadata_.op_type().empty() || !metadata_.op_name().empty() ||
+       !metadata_.source_file().empty())) {
     StrAppend(&extra, " # metadata=", metadata_.ShortDebugString());
   }
 
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 1c7d4c19b9..5ec17c8004 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -489,7 +489,10 @@ class HloInstruction {
   string SignatureString() const;
 
   // Returns a debugging string that represents this instruction.
-  string ToString(bool compact_operands = false) const;
+  string ToString(bool compact_operands = false,
+                  bool include_metadata = true) const;
+
+  string ToStringNoMetadata() const { return ToString(false, false); }
 
   // As ToString, but returns a shorter string.
   string ToShortString() const;
diff --git a/tensorflow/compiler/xla/service/reshape_mover.cc b/tensorflow/compiler/xla/service/reshape_mover.cc
index b72ef95a6a..768977ba6b 100644
--- a/tensorflow/compiler/xla/service/reshape_mover.cc
+++ b/tensorflow/compiler/xla/service/reshape_mover.cc
@@ -13,17 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/compiler/xla/service/reshape_mover.h"
-
-#include <algorithm>
-#include "tensorflow/compiler/xla/literal_util.h"
-#include "tensorflow/compiler/xla/shape_util.h"
-#include "tensorflow/compiler/xla/util.h"
-
-namespace xla {
-
-namespace {
-
+// Implementation note:
+//
 // The general idea behind this pass is that we're converting from this:
 //   %param.A = OldShape
 //   %param.B = OldShape
@@ -44,6 +35,19 @@ namespace {
 // only implicit scalar broadcast is on Pred, not on A or B. Since reshapes or
 // transposes to a scalar should be cheap, we simply never move them.
 
+#include "tensorflow/compiler/xla/service/reshape_mover.h"
+
+#include <algorithm>
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/compiler/xla/util.h"
+#include "tensorflow/core/lib/core/errors.h"
+
+namespace xla {
+
+namespace {
+
 // Finds the first non-scalar operand of an instruction that is a reshape or
 // transpose and returns the operand if it is found or nullptr if not found.
 HloInstruction* FirstNonScalarReshapeOperand(const HloInstruction* hlo) {
@@ -51,6 +55,9 @@ HloInstruction* FirstNonScalarReshapeOperand(const HloInstruction* hlo) {
     if (!ShapeUtil::IsScalar(operand->shape()) &&
         (operand->opcode() == HloOpcode::kReshape ||
          operand->opcode() == HloOpcode::kTranspose)) {
+      VLOG(5) << "Found first non-scalar reshape operand of "
+              << hlo->ToStringNoMetadata() << ":\n\t"
+              << operand->ToStringNoMetadata();
       return operand;
     }
   }
@@ -70,6 +77,9 @@ bool OperandCanTrivallyChangeShape(const HloInstruction* instruction,
   // A constant can trivially reshape the literal it holds.
   if (operand->opcode() == HloOpcode::kConstant &&
       ShapeUtil::SameDimensions(operand->shape(), instruction->shape())) {
+    VLOG(5) << "Constant had same dimensions as instruction:\n\toperand: "
+            << operand->ToStringNoMetadata()
+            << "\n\tinstruction: " << instruction->ToStringNoMetadata();
     return true;
   }
 
@@ -116,119 +126,159 @@ bool IsElementwiseOfEquivalentReshapesOrTransposes(
   if (!first_reshape_operand) {
     return false;
   }
-  return (instruction->user_count() > 0 ||
-          instruction == instruction->parent()->root_instruction()) &&
-         instruction->IsElementwise() && !operands.empty() &&
-         // Check whether all operands:
-         //    1. are all reshapes or transposes that have the same input and
-         //    output shapes as all other reshaped or transposed operands.
-         //      or
-         //    2. can be any shape like kConstant, kRng, and scalars.
-         std::all_of(
-             operands.begin(), operands.end(),
-             [instruction,
-              first_reshape_operand](const HloInstruction* operand) {
-               return AreEquivalentReshapes(first_reshape_operand, operand) ||
-                      OperandCanTrivallyChangeShape(instruction, operand);
-             });
+  VLOG(3) << "** Checking whether instruction is an elementwise operation of "
+             "equivalent reshapes/transposes: "
+          << instruction->ToStringNoMetadata();
+  bool result =
+      (instruction->user_count() > 0 ||
+       instruction == instruction->parent()->root_instruction()) &&
+      instruction->IsElementwise() && !operands.empty() &&
+      // Check whether all operands:
+      //    0. Have the same dimensions as the output -- if not, it may be
+      //       implicitly broadcast, which can confound the movement's
+      //       correctness.
+      //    1. Are all reshapes or transposes that have the same input and
+      //       output shapes as all other reshaped or transposed operands.
+      //     or
+      //    2. Can be any shape like kConstant, kRng, and scalars.
+      std::all_of(
+          operands.begin(), operands.end(),
+          [instruction, first_reshape_operand](const HloInstruction* operand) {
+            if (!ShapeUtil::SameDimensions(operand->shape(),
+                                           instruction->shape())) {
+              VLOG(5) << "Operand shape differs from output shape; may be "
+                         "implicitly broadcast, so preventing "
+                         "movement\n\toperand: "
+                      << operand->ToStringNoMetadata() << "\n\tinstruction: "
+                      << instruction->ToStringNoMetadata();
+              return false;
+            }
+            if (AreEquivalentReshapes(first_reshape_operand, operand)) {
+              VLOG(5) << "Are equivalent reshapes:\n\tfirst_reshape_operand: "
+                      << first_reshape_operand->ToStringNoMetadata()
+                      << "\n\toperand: " << operand->ToStringNoMetadata();
+              return true;
+            }
+            if (OperandCanTrivallyChangeShape(instruction, operand)) {
+              VLOG(5) << "Operand can trivially change shape: "
+                      << operand->ToStringNoMetadata();
+              return true;
+            }
+            return false;
+          });
+  VLOG(3) << "ElementwiseOfEquivalentReshapesOrTransposes result for "
+          << instruction->ToStringNoMetadata() << ": " << result;
+  return result;
 }
 
 // Try to sink any reshape or transpose operands of `instruction` across it. We
 // do so if `instruction` is elementwise and all operands are equivalent
 // reshapes or transposes.
-bool TrySinkReshapeOrTranspose(HloComputation* computation,
-                               HloInstruction* instruction) {
-  if (IsElementwiseOfEquivalentReshapesOrTransposes(instruction)) {
-    std::vector<HloInstruction*> operands = instruction->operands();
-    HloInstruction* old_reshape = FirstNonScalarReshapeOperand(instruction);
-    CHECK(old_reshape != nullptr);
-    Shape new_elementwise_shape = old_reshape->operand(0)->shape();
-    for (size_t i = 0; i < operands.size(); ++i) {
-      // All scalar operands remain as-is, even if they're reshape or transpose,
-      // to simplify handling wrt special scalar broadcast rules for ops like
-      // Select. Scalar reshapes should be cheap anyways.
-      if (ShapeUtil::IsScalar(operands[i]->shape())) {
-        continue;
-      }
-      auto element_type = operands[i]->shape().element_type();
-      switch (operands[i]->opcode()) {
-        case HloOpcode::kConstant: {
-          if (old_reshape->opcode() == HloOpcode::kReshape) {
-            operands[i] = instruction->parent()->AddInstruction(
-                HloInstruction::CreateReshape(
-                    ShapeUtil::ChangeElementType(new_elementwise_shape,
-                                                 element_type),
-                    operands[i]));
-          } else {
-            CHECK_EQ(old_reshape->opcode(), HloOpcode::kTranspose);
-            std::vector<int64> inverse_permutation =
-                InversePermutation(old_reshape->dimensions());
-            operands[i] = instruction->parent()->AddInstruction(
-                HloInstruction::CreateTranspose(
-                    ShapeUtil::ChangeElementType(new_elementwise_shape,
-                                                 element_type),
-                    operands[i], inverse_permutation));
-          }
-          break;
-        }
-        case HloOpcode::kRng: {
-          CHECK_EQ(operands[i]->user_count(), 1);
+StatusOr<bool> TrySinkReshapeOrTranspose(HloComputation* computation,
+                                         HloInstruction* instruction) {
+  if (!IsElementwiseOfEquivalentReshapesOrTransposes(instruction)) {
+    return false;
+  }
+
+  std::vector<HloInstruction*> operands = instruction->operands();
+  HloInstruction* old_reshape = FirstNonScalarReshapeOperand(instruction);
+  TF_RET_CHECK(old_reshape != nullptr);
+  Shape new_elementwise_shape = old_reshape->operand(0)->shape();
+
+  VLOG(3) << "** Trying to sink reshape or transpose: "
+          << instruction->ToStringNoMetadata()
+          << "\n\told reshape: " << old_reshape->ToStringNoMetadata()
+          << "\n\tnew elementwise shape: "
+          << ShapeUtil::HumanString(new_elementwise_shape);
+  for (size_t i = 0; i < operands.size(); ++i) {
+    // All scalar operands remain as-is, even if they're reshape or transpose,
+    // to simplify handling wrt special scalar broadcast rules for ops like
+    // Select. Scalar reshapes should be cheap anyways.
+    if (ShapeUtil::IsScalar(operands[i]->shape())) {
+      continue;
+    }
+    PrimitiveType element_type = operands[i]->shape().element_type();
+    switch (operands[i]->opcode()) {
+      case HloOpcode::kConstant: {
+        if (old_reshape->opcode() == HloOpcode::kReshape) {
+          VLOG(3) << "Creating reshape for kConstant operand " << i << ": "
+                  << operands[i]->ToStringNoMetadata();
           operands[i] = instruction->parent()->AddInstruction(
-              operands[i]->CloneWithNewOperands(
+              HloInstruction::CreateReshape(
                   ShapeUtil::ChangeElementType(new_elementwise_shape,
                                                element_type),
-                  operands[i]->operands()));
-          break;
+                  operands[i]));
+        } else {
+          TF_RET_CHECK(old_reshape->opcode() == HloOpcode::kTranspose);
+          std::vector<int64> inverse_permutation =
+              InversePermutation(old_reshape->dimensions());
+          operands[i] = instruction->parent()->AddInstruction(
+              HloInstruction::CreateTranspose(
+                  ShapeUtil::ChangeElementType(new_elementwise_shape,
+                                               element_type),
+                  operands[i], inverse_permutation));
         }
-        case HloOpcode::kReshape:
-        case HloOpcode::kTranspose:
-          operands[i] = operands[i]->mutable_operand(0);
-          break;
-        default:
-          LOG(FATAL) << "Unexpected opcode while trying to sink reshapes or "
-                        "transposes.";
+        break;
       }
-    }
-    if (HloOpcode::kFusion == instruction->opcode()) {
-      // Here we already know `instruction` is elementwise, and no operand is
-      // implicit broadcast as if it were the operands would not be equivalent
-      // reshapes, so all the fused instructions have the same dimensions.
-      for (const auto& fused_instruction : instruction->fused_instructions()) {
-        Shape* shape = fused_instruction->mutable_shape();
-        *shape->mutable_dimensions() = new_elementwise_shape.dimensions();
-        *shape->mutable_layout() = new_elementwise_shape.layout();
+      case HloOpcode::kRng: {
+        CHECK_EQ(operands[i]->user_count(), 1);
+        operands[i] = instruction->parent()->AddInstruction(
+            operands[i]->CloneWithNewOperands(
+                ShapeUtil::ChangeElementType(new_elementwise_shape,
+                                             element_type),
+                operands[i]->operands()));
+        break;
       }
-    }
-    auto new_elementwise =
-        computation->AddInstruction(instruction->CloneWithNewOperands(
-            // `instruction` may change the element type, e.g., from
-            //   operands[0] -> reshape -> convert (`instruction`)
-            // to
-            //   operands[0] -> convert' -> reshape'
-            //
-            // In this case, convert' should have the same element type as
-            // `convert` and the same dimensions as operands[0].
-            ShapeUtil::ChangeElementType(new_elementwise_shape,
-                                         instruction->shape().element_type()),
-            operands));
-    std::unique_ptr<HloInstruction> new_reshape;
-    switch (old_reshape->opcode()) {
       case HloOpcode::kReshape:
-        new_reshape = HloInstruction::CreateReshape(instruction->shape(),
-                                                    new_elementwise);
-        break;
       case HloOpcode::kTranspose:
-        new_reshape = HloInstruction::CreateTranspose(
-            instruction->shape(), new_elementwise, old_reshape->dimensions());
+        operands[i] = operands[i]->mutable_operand(0);
         break;
       default:
-        LOG(FATAL) << "Bad opcode";
+        LOG(FATAL) << "Unexpected opcode while trying to sink reshapes or "
+                      "transposes.";
     }
-    TF_CHECK_OK(computation->ReplaceWithNewInstruction(instruction,
-                                                       std::move(new_reshape)));
-    return true;
   }
-  return false;
+  if (HloOpcode::kFusion == instruction->opcode()) {
+    // Here we already know `instruction` is elementwise, and no operand is
+    // implicit broadcast as if it were the operands would not be equivalent
+    // reshapes, so all the fused instructions have the same dimensions.
+    for (const auto& fused_instruction : instruction->fused_instructions()) {
+      Shape* shape = fused_instruction->mutable_shape();
+      *shape->mutable_dimensions() = new_elementwise_shape.dimensions();
+      *shape->mutable_layout() = new_elementwise_shape.layout();
+    }
+  }
+  HloInstruction* new_elementwise =
+      computation->AddInstruction(instruction->CloneWithNewOperands(
+          // `instruction` may change the element type, e.g., from
+          //   operands[0] -> reshape -> convert (`instruction`)
+          // to
+          //   operands[0] -> convert' -> reshape'
+          //
+          // In this case, convert' should have the same element type as
+          // `convert` and the same dimensions as operands[0].
+          ShapeUtil::ChangeElementType(new_elementwise_shape,
+                                       instruction->shape().element_type()),
+          operands));
+
+  std::unique_ptr<HloInstruction> new_reshape;
+  switch (old_reshape->opcode()) {
+    case HloOpcode::kReshape:
+      VLOG(3) << "Creating new reshape for new elementwise op: "
+              << new_elementwise->ToStringNoMetadata();
+      new_reshape =
+          HloInstruction::CreateReshape(instruction->shape(), new_elementwise);
+      break;
+    case HloOpcode::kTranspose:
+      new_reshape = HloInstruction::CreateTranspose(
+          instruction->shape(), new_elementwise, old_reshape->dimensions());
+      break;
+    default:
+      LOG(FATAL) << "Bad opcode";
+  }
+  TF_RETURN_IF_ERROR(computation->ReplaceWithNewInstruction(
+      instruction, std::move(new_reshape)));
+  return true;
 }
 
 }  // namespace
@@ -237,9 +287,9 @@ StatusOr<bool> ReshapeMover::Run(HloModule* module) {
   bool changed = false;
   for (const auto& comp : module->computations()) {
     for (HloInstruction* instruction : comp->MakeInstructionPostOrder()) {
-      if (TrySinkReshapeOrTranspose(comp.get(), instruction)) {
-        changed = true;
-      }
+      TF_ASSIGN_OR_RETURN(bool did_change,
+                          TrySinkReshapeOrTranspose(comp.get(), instruction));
+      changed |= did_change;
     }
   }
   return changed;
diff --git a/tensorflow/compiler/xla/service/reshape_mover_test.cc b/tensorflow/compiler/xla/service/reshape_mover_test.cc
index 1831d775d4..5217e85d4f 100644
--- a/tensorflow/compiler/xla/service/reshape_mover_test.cc
+++ b/tensorflow/compiler/xla/service/reshape_mover_test.cc
@@ -234,6 +234,58 @@ TEST_F(ReshapeMoverTest, ScalarReshapeNotMovedAcrossSelect) {
   EXPECT_EQ(select, computation->root_instruction());
 }
 
+// Tree looks like:
+//
+// param0 [1,128,1]
+//  |
+// reshape [128,1]          constant [128,1024]
+//   \                         /
+//     multiply w/implicit broadcast [128,1024]
+//
+// The reshape mover would like to sink the reshape below the multiply.
+//
+// Previously we would attempt to insert a reshape of the constant to [1,128,1]
+// (which is unsound, because it has a different number of elements) as
+// preparation for sinking the reshape.
+//
+// To eliminate the unsoundness, we outlaw reshape sinking when one of the
+// operands is implicitly broadcast in the elementwise consumer.
+//
+// TODO(b/37799338) However, it would be possible in this case to do a more
+// in-depth analysis to get reshape movement to occur:
+//
+// 1. Note that the broadcast dimension (logical dimension 1) in the operands
+//    would map back to logical dimension 2 in the param0 node.
+// 2. Match rank of the constant to the param0 node (by prepending a trivial 1
+//    dimension).
+// 3. Reshape to [128,1024] at the root.
+//
+// But this is not currently done.
+TEST_F(ReshapeMoverTest, ImplicitlyBroadcastReshapeIsNotMovedBug37787999) {
+  HloComputation::Builder builder(TestName());
+  auto param0 = builder.AddInstruction(HloInstruction::CreateParameter(
+      0, ShapeUtil::MakeShape(F32, {1, 128, 1}), "param0"));
+  auto reshape = builder.AddInstruction(HloInstruction::CreateReshape(
+      ShapeUtil::MakeShape(F32, {128, 1}), param0));
+  Array2D<float> a(128, 1024);
+  auto literal = LiteralUtil::CreateR2FromArray2D<float>(a);
+  auto constant = builder.AddInstruction(
+      HloInstruction::CreateConstant(std::move(literal)));
+  auto multiply = builder.AddInstruction(HloInstruction::CreateBinary(
+      constant->shape(), HloOpcode::kMultiply, constant, reshape));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+  EXPECT_THAT(computation->root_instruction(),
+              op::Multiply(op::Constant(), op::Reshape(param0)));
+
+  EXPECT_FALSE(ReshapeMover().Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(),
+              op::Multiply(op::Constant(), op::Reshape(param0)));
+  EXPECT_EQ(multiply, computation->root_instruction());
+}
+
 // Tree looks like this:
 //
 // add1
-- 
GitLab


From 9417560c4a03e7fa2d906f59663ed420de70d89b Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Sat, 29 Apr 2017 23:55:57 -0400
Subject: [PATCH 0844/1563] In Conv3DTranspose, replace get_variable with
 add_variable

to conform to the latest layers API.
---
 tensorflow/python/layers/convolutional.py | 25 +++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py
index 71d24d78c4..eebb7fc654 100644
--- a/tensorflow/python/layers/convolutional.py
+++ b/tensorflow/python/layers/convolutional.py
@@ -1282,19 +1282,19 @@ class Conv3DTranspose(Conv3D):
     input_dim = input_shape[channel_axis]
     kernel_shape = self.kernel_size + (self.filters, input_dim)
 
-    self.kernel = vs.get_variable('kernel',
-                                  shape=kernel_shape,
-                                  initializer=self.kernel_initializer,
-                                  regularizer=self.kernel_regularizer,
-                                  trainable=True,
-                                  dtype=self.dtype)
+    self.kernel = self.add_variable('kernel',
+                                    shape=kernel_shape,
+                                    initializer=self.kernel_initializer,
+                                    regularizer=self.kernel_regularizer,
+                                    trainable=True,
+                                    dtype=self.dtype)
     if self.use_bias:
-      self.bias = vs.get_variable('bias',
-                                  shape=(self.filters,),
-                                  initializer=self.bias_initializer,
-                                  regularizer=self.bias_regularizer,
-                                  trainable=True,
-                                  dtype=self.dtype)
+      self.bias = self.add_variable('bias',
+                                    shape=(self.filters,),
+                                    initializer=self.bias_initializer,
+                                    regularizer=self.bias_regularizer,
+                                    trainable=True,
+                                    dtype=self.dtype)
     else:
       self.bias = None
 
@@ -1456,4 +1456,3 @@ convolution3d = conv3d
 separable_convolution2d = separable_conv2d
 convolution2d_transpose = deconvolution2d = deconv2d = conv2d_transpose
 convolution3d_transpose = deconvolution3d = deconv3d = conv3d_transpose
-
-- 
GitLab


From 9627c1acf71e431b48be3b613a7ee6cb252b59a7 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Sun, 30 Apr 2017 06:12:31 -0700
Subject: [PATCH 0845/1563] Create gradient_descent_dc.py

---
 .../python/training/gradient_descent_dc.py    | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 tensorflow/python/training/gradient_descent_dc.py

diff --git a/tensorflow/python/training/gradient_descent_dc.py b/tensorflow/python/training/gradient_descent_dc.py
new file mode 100644
index 0000000000..755166abfd
--- /dev/null
+++ b/tensorflow/python/training/gradient_descent_dc.py
@@ -0,0 +1,66 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""GradientDescentDC for TensorFlow."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
+from tensorflow.python.training import optimizer
+from tensorflow.python.training import training_ops
+
+
+class GradientDescentOptimizerDC(optimizer.Optimizer):
+  """Optimizer that implements the gradient descent algorithm with delay compensation.
+  """
+
+  def __init__(self, learning_rate, variance_parameter, use_locking=False, name="GradientDescentDC"):
+    """Construct a new gradient descent optimizer with delay compensation.
+
+    Args:
+      learning_rate: A Tensor or a floating point value.  The learning
+        rate to use.
+      variance_parameter: A Tensor or a floating point value. The lambda value to use.
+      use_locking: If True use locks for update operations.
+      name: Optional name prefix for the operations created when applying
+        gradients. Defaults to "GradientDescentDC".
+    """
+    super(GradientDescentOptimizerDC, self).__init__(use_locking, name)
+    self._learning_rate = learning_rate
+    self._lambda = variance_parameter
+
+  def _apply_dense(self, grad, var):
+    var_bak = var
+    return training_ops.apply_gradient_descent(
+        var,
+        math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
+        math_ops.add(grad, math_ops.multiply(math_ops.multiply(grad, math_ops.cast(self._lambda_tensor, grad.dtype.base_dtype)), math_ops.subtract(var, var_bak))),
+        use_locking=self._use_locking).op
+
+  def _resource_apply_dense(self, grad, handle):
+    var_bak = handle.handle
+    return training_ops.resource_apply_gradient_descent(
+        handle.handle, math_ops.cast(self._learning_rate_tensor, grad.dtype.base_dtype),
+        math_ops.add(grad, math_ops.multiply(math_ops.multiply(grad, math_ops.cast(self._lambda_tensor, grad.dtype.base_dtype)), math_ops.subtract(handle.handle, var_bak))),
+        use_locking=self._use_locking)
+
+  def _prepare(self):
+    self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
+                                                       name="learning_rate")
+    self._lambda_tensor = ops.convert_to_tensor(self._lambda,
+                                                      name="lambda")
-- 
GitLab


From 11c18751523fbd63c8904f2d56de853e348fdf52 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Sun, 30 Apr 2017 06:18:30 -0700
Subject: [PATCH 0846/1563] Update gradient_descent_dc.py

---
 tensorflow/python/training/gradient_descent_dc.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/training/gradient_descent_dc.py b/tensorflow/python/training/gradient_descent_dc.py
index 755166abfd..5b2b28df86 100644
--- a/tensorflow/python/training/gradient_descent_dc.py
+++ b/tensorflow/python/training/gradient_descent_dc.py
@@ -27,6 +27,8 @@ from tensorflow.python.training import training_ops
 
 class GradientDescentOptimizerDC(optimizer.Optimizer):
   """Optimizer that implements the gradient descent algorithm with delay compensation.
+  See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
+  ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
   """
 
   def __init__(self, learning_rate, variance_parameter, use_locking=False, name="GradientDescentDC"):
-- 
GitLab


From da809cc6e05145a103ce336168e220125e3cd438 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Sun, 30 Apr 2017 09:26:56 -0400
Subject: [PATCH 0847/1563] Disable batch_ops_test on Mac temporarily

See example test failure at:
https://ci.tensorflow.org/job/tensorflow-pull-requests-mac/4709/consoleFull
---
 tensorflow/contrib/batching/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/batching/BUILD b/tensorflow/contrib/batching/BUILD
index 1f1e2db69b..b441906cd4 100644
--- a/tensorflow/contrib/batching/BUILD
+++ b/tensorflow/contrib/batching/BUILD
@@ -181,6 +181,7 @@ py_test(
     size = "small",
     srcs = ["python/ops/batch_ops_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["nomac"],
     deps = [
         ":batch_py",
         "//tensorflow/python:framework_test_lib",
-- 
GitLab


From 2f35da58ae3b087783235314420dcd7f465d8159 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Sun, 30 Apr 2017 12:10:55 -0700
Subject: [PATCH 0848/1563] Put var_bak into a slot

---
 .../python/training/gradient_descent_dc.py    | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/training/gradient_descent_dc.py b/tensorflow/python/training/gradient_descent_dc.py
index 5b2b28df86..4b006d60ea 100644
--- a/tensorflow/python/training/gradient_descent_dc.py
+++ b/tensorflow/python/training/gradient_descent_dc.py
@@ -27,9 +27,12 @@ from tensorflow.python.training import training_ops
 
 class GradientDescentOptimizerDC(optimizer.Optimizer):
   """Optimizer that implements the gradient descent algorithm with delay compensation.
-  See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
-  ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
   """
+  
+  # Values for gate_gradients.
+  GATE_NONE = 0
+  GATE_OP = 1
+  GATE_GRAPH = 2
 
   def __init__(self, learning_rate, variance_parameter, use_locking=False, name="GradientDescentDC"):
     """Construct a new gradient descent optimizer with delay compensation.
@@ -46,8 +49,19 @@ class GradientDescentOptimizerDC(optimizer.Optimizer):
     self._learning_rate = learning_rate
     self._lambda = variance_parameter
 
+  def compute_gradients(self, loss, var_list=None,
+                        gate_gradients=GATE_OP,
+                        aggregation_method=None,
+                        colocate_gradients_with_ops=False,
+                        grad_loss=None):
+    grads_and_vars = super(GradientDescentOptimizerDC, self).compute_gradients(loss, var_list, gate_gradients, aggregation_method, colocate_gradients_with_ops, grad_loss)
+    for _, var in grads_and_vars:
+      var2 = tf.identity(var.initialized_value())
+      self._get_or_make_slot(var, var2, "var_bak", self._name)
+    return grads_and_vars
+
   def _apply_dense(self, grad, var):
-    var_bak = var
+    var_bak = self.get_slot(var, "var_bak")
     return training_ops.apply_gradient_descent(
         var,
         math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
@@ -55,12 +69,17 @@ class GradientDescentOptimizerDC(optimizer.Optimizer):
         use_locking=self._use_locking).op
 
   def _resource_apply_dense(self, grad, handle):
-    var_bak = handle.handle
+    var_bak = self.get_slot(handle.handle, "var_bak")
     return training_ops.resource_apply_gradient_descent(
         handle.handle, math_ops.cast(self._learning_rate_tensor, grad.dtype.base_dtype),
         math_ops.add(grad, math_ops.multiply(math_ops.multiply(grad, math_ops.cast(self._lambda_tensor, grad.dtype.base_dtype)), math_ops.subtract(handle.handle, var_bak))),
         use_locking=self._use_locking)
 
+  def _create_slots(self, var_list):
+    for v in var_list:
+      var2 = tf.identity(v.initialized_value())
+      self._get_or_make_slot(v, var2, "var_bak", self._name)
+
   def _prepare(self):
     self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
                                                        name="learning_rate")
-- 
GitLab


From 263c857164897792488f940d9e288556307cbe1f Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Sun, 30 Apr 2017 12:13:27 -0700
Subject: [PATCH 0849/1563] Add citation

---
 tensorflow/python/training/gradient_descent_dc.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/python/training/gradient_descent_dc.py b/tensorflow/python/training/gradient_descent_dc.py
index 4b006d60ea..26431fbb00 100644
--- a/tensorflow/python/training/gradient_descent_dc.py
+++ b/tensorflow/python/training/gradient_descent_dc.py
@@ -27,6 +27,9 @@ from tensorflow.python.training import training_ops
 
 class GradientDescentOptimizerDC(optimizer.Optimizer):
   """Optimizer that implements the gradient descent algorithm with delay compensation.
+  
+  See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
+  ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
   """
   
   # Values for gate_gradients.
-- 
GitLab


From dac34e886862ab92c7ee37e1abf8970608abde74 Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Sun, 30 Apr 2017 15:36:45 -0800
Subject: [PATCH 0850/1563] Details about performance models and techniques
 Change: 154679628

---
 .../performance/performance_models.md         | 389 ++++++++++++++++++
 1 file changed, 389 insertions(+)
 create mode 100644 tensorflow/docs_src/performance/performance_models.md

diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
new file mode 100644
index 0000000000..18f407c702
--- /dev/null
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -0,0 +1,389 @@
+# TensorFlow High-Performance Models
+
+TensorFlow is a powerful and flexible machine learning platform.
+It can be used to distribute model training and inference across a large number
+of machines and computation devices.
+
+Its software stack is made of a few layers:
+
+* a fast and powerful C++ core
+* low-level Python primitives that sit right above individual kernels
+* a diverse range of high-level libraries that aim to make building real models
+  easier
+
+There are many existing examples and tutorials that explain useful features in
+TensorFlow.  The goal of this set of scripts is to demonstrate that we can build
+flexible and powerful high-performance models using the low-level APIs.
+In the future, many of the high-performance primitives will be incorporated into
+high-level APIs, and made available to more users transparently.
+But meanwhile, we show that it is fairly easy for advanced users to build highly
+scalable models targeting different system types, network topologies, etc.
+
+We divide our effort to build high-performance models into three categories:
+
+1. A fast input pipeline to read data from disk, preprocess it, and make it
+   ready on the GPU.
+2. A high-throughput model that trains on GPU very efficiently.
+3. Fast variable and gradients distribution mechanisms that scale well across
+   many machines and computation devices.
+
+## Input Pipeline
+
+The input pipeline is the part of a tensorflow program that reads input data,
+shuffles it, and preprocesses it.
+
+Among the most important features to build a fast input pipeline:
+
+* Avoid using feed-dictionary to feed a large amount of data for each step.
+  * Instead, use reader ops to get data into TensorFlow directly.
+* Parallelize data processing.
+* Use software pipelining to feed data, so that data is available immediately
+  when needed.
+
+One way to implement software pipelining in TensorFlow is through
+`tf.FifoQueue`, and it is possible to parallelize data processing through
+`tf.train.queue_runner`, which uses Python threads as its underlying
+implementation.
+This lays the foundation for the current Inception input pipeline.
+This design is well built for feeding older generation of GPUs,
+but the overhead of Python threads is too large to feed newer GPUs that are four
+to five times faster.
+
+In this model, we explore an alternative design that uses the native
+parallelism in TensorFlow.  In our example of an image model input pipeline,
+there are a few important parts:
+
+* Choose and read the image files from the disk.
+* Decode the image data into images, transform and add distortion so they are
+ready to be used.
+* Organize the transformed images into a minibatch.
+* Transfer the images from CPU to GPU, so they are ready for model training.
+
+It is important to note that the dominant part of each stage can happen in
+parallel with that of other stages:
+the file IO uses DMA to transfer the data from hard disk to memory;
+image decoding, transformation and distortion are CPU-heavy;
+the data transfer from CPU to GPU uses the GPU's copy-engine unit;
+and the GPU kernels use the main SMs of the GPU.
+It is natural to cut our pipeline into those parts so they can run in parallel
+with each other.
+
+Also, as mentioned earlier, most of the current input pipeline heavily uses
+Python threads.  However, the large overhead introduced by Python threads
+severely limits its scalability when the newer GPUs are a lot faster; we can
+alleviate this by making a single `session.run` call execute all parts of the
+pipeline.
+
+### Parallelize IO Reads
+
+In this new model, we use the native parallelism in TensorFlow: TensorFlow
+subscribes to an eager-execution model, which means that when nodes in the graph
+became available, TensorFlow will try to execute as many of them as possible.
+
+In order to parallelize reading from hard disk, we use `data_flow_ops.RecordInput`
+in this model.
+Given a list of input files of TFRecords, `RecordInput` continuously reads
+records using background threads, placing the records into its own large,
+internal pool of records.
+When it is has loaded at least half of its capacity, it produces output tensors.
+
+Since this op has its internal threads, and is dominated by IO time that doesn’t
+consume much CPU time, it naturally runs in parallel with the rest of the model.
+
+### Parallelize Image Processing
+
+After reading from “RecordInput”, the tensors are passed to the input processing
+pipeline.  For example, if we need to feed 8 GPUs, each with a batch-size of 32,
+then for each step we do the following.
+
+First, read 32x8=256 records, and process them individually, in
+parallel. This starts with 256 independent RecordInput read ops in the graph.
+
+Then, follow each read with identical set of ops for processing. Each set is
+considered independent and will execute in parallel.  The operations include
+image decoding, image distortion, and resizing.
+
+Finally, once the images are ready, they will be concatenated together into 8
+batch-size 32 tensors.
+Note that we can use “tf.concat” for this purpose.
+However, “tf.concat” is implemented as a single op, which waits for all
+the inputs to be ready, and then concatenates them together. Since all
+inputs are produced in parallel, there will be a long tail waiting for all
+inputs to be available; and when concatenation happens, the op becomes memory
+limited as all input tensors compete for memory bandwidth.
+So for the final concatenation, we use `tf.parallel_stack` instead. This
+allocates an uninitialized tensor as an output, and each input tensor is written
+to its designated portion of the output tensor as soon as the input is
+available.  When all the input tensors are finished, the output tensor is passed
+along in the graph. This effectively hides all the memory latency with the long
+tail of producing all the input tensors.
+
+### Parallelize CPU-to-GPU Data Transfer
+
+In our example, once all the input images are processed and concatenated
+together by the CPU, we have 8 tensors, each of which has a batch-size of 32.
+These tensors are then to be used by the GPU for the model training.
+
+In TensorFlow, users can use tensors from one device on any other device
+directly.  TensorFlow inserts implicit copies to make the tensors available on
+any devices where they are used.  The runtime schedules the copy between devices
+to run before the tensors are actually used.  However, if the copy cannot finish
+in time, the computation that needs those tensors will stall.
+
+For high-performance models, it is helpful to explicitly schedule the copy ahead
+of the time in parallel, so when the computation starts on GPU, all the tensors
+are already available on the right device.
+
+### Software Pipelining
+
+With all the stages capable of being driven by different processors, we insert
+`data_flow_ops.StagingArea` in between them so they run in parallel.
+`StagingArea` is a queue-like operator similar to `tf.FifoQueue`.
+But it offers simpler functionalities and can be executed on both CPU and GPU.
+
+Before the model starts running all the stages, we warm up the stages in order
+so the staging buffers in between all have one set of data in them.
+During each run step that follows, we will run all the stages.
+They read one set of data from the staging buffers at the beginning of each
+stage, and push one set at end end.
+
+For example: if there are three stages: A, B and C.
+There are two staging areas in between: S1 and S2.
+During the warmup, we run:
+
+```
+Warm up:
+Step 1: A0
+Step 2: A1  B0
+
+Actual execution:
+Step 3: A2  B1  C0
+Step 4: A3  B2  C1
+Step 5: A4  B3  C2
+```
+
+After the warmup, S1 and S2 each have one set of data in them.
+For each step of the actual execution, one set of data is consumed from each
+staging area, and one set is added to each.
+
+There are a few nice properties about the scheme:
+
+* All the stages are non-blocking, since the staging areas always have one set
+of data after the warmup.
+* Each stage can run in parallel since they can all start immediately.
+* The staging buffers have a fixed memory overhead. They will have at most one
+  extra set of data.
+* Only a single`session.run()` call is needed to run all stages of the step,
+  which makes profiling and debugging much easier.
+
+## Best Practices in Building High-Performance Models
+
+The computation on GPU can happen immediately since the input data have already
+been transferred onto GPU when the step starts.
+But it is still important to build the model that runs as fast as possible.
+Here are some tips for a high-performance convolutional neural network (CNN)
+model:
+
+### Build the model with both NHWC and NCHW
+
+Most TensorFlow operations used by a CNN support both NHWC and NCHW data format.
+On GPU, NCHW is faster.
+But on CPU, NHWC is sometimes faster.
+
+So it is a good idea to build the model that can work in both ways.
+Our model shows a good way to do that effectively.
+For GPU training, we should always use NCHW.
+But if the model needs inference on CPU, we could use NHWC; weights obtained
+from training with NCHW data format can be used for inference in NHWC data
+format.
+
+### Use Fused Batch-Normalization
+
+The default batch-normalization in TensorFlow is implemented as composite
+operations.
+This is very general, but often leads to suboptimal performance.
+An alternative is the fused batch-normalization, and the performance on GPU
+is often much faster.
+
+## Variable Distribution and Gradient Aggregation
+
+During training, training variable values are updated using aggregated gradients
+and deltas.  In this model, we demonstrate that with the flexible and
+general-purpose TensorFlow primitives, it is fairly easy to build a diverse
+range of high-performance distribution and aggregation schemes for different
+types of systems.
+
+For example:
+
+* The standard parameter-server where each replica of the training model reads
+  the variables directly, and updates the variable independently.  When each
+  model needs the variables, they are copied over through the standard implicit
+  copies added by the TensorFlow runtime. It is shown how to use this method
+  in either local training, distributed synchronous training, and distributed
+  asynchronous training.
+* A replicated mode for local training where each GPU has an identical
+  copy of the training parameters.  The forward and backward computation can
+  start immediately as the variable data is immediately available.  Gradients
+  are accumulated across all GPUs, and the aggregated total is applied to
+  each GPU's copy of the variables so that they stay in sync.
+* A distributed replicated mode of training where each GPU has an identical copy
+  of the training parameters, and a master copy of the variables is stored
+  on the parameter-servers.  The forward and backward computation can
+  start immediately as the variable data is immediately available.  Gradients
+  are accumulated across all GPUs on each server and then the per-server
+  aggregated gradients are applied to the master copy. After all workers do
+  this, each worker updates its copy of the variable from the master copy.
+
+We show that most of the variable distribution and aggregation subsystem can
+be implemented through TensorFlow low-level primitives with manageable
+complexity at the model level. Here we discuss some more details.
+
+### Parameter-server Variables
+
+The most common way trainable variables are managed in TensorFlow models is the
+parameter server mode.
+
+In a distributed system, this means that each worker process runs the same
+model, and parameter server processes own the master copies of the variables.
+When a worker needs a variable from a parameter server, it refers to it
+directly.  The TensorFlow runtime adds implicit copies to the graph to make the
+variable value available on the computation device that needs it. When a
+gradient is computed on a worker, it is sent to the parameter server that owns
+the particular variable, and the corresponding optimizer is used to update the
+variable.
+
+There are some techniques to improve throughput:
+
+* The variables are spread among parameter servers based on their size, for load
+  balancing.
+* When each worker has multiple GPUs, gradients are accumulated across the GPUs
+  and a single aggregated gradient is sent to the parameter server. This reduces
+  the network bandwidth and the amount of work done by the parameter servers.
+
+For coordinating between workers, a very common mode is async updates, where
+each worker updates the master copy of the variables without synchronizing with
+other workers.  In our model, we demonstrate that it is fairly easy to introduce
+synchronization across workers so updates for all workers are finished in one
+step before the next step can start.
+
+The parameter-server method can also be used for local training, In this case,
+instead of spreading the master copies of variables across parameters servers,
+they are either on the CPU or spread across the available GPUs.
+
+Due to the simple nature of this setup, this architecture has gained a lot of
+popularity within the community.
+
+This is available in the benchmark scripts as the 'parameter_server'
+variable_update mode.
+
+![parameter_server mode in distributed
+training](../images/perf_parameter_server_mode_doc.png){
+width="900" style="max-width: inherit"}
+
+### Replicated Variables
+
+In this design, each GPU on the server has its own copy of each variable. The
+values are kept in sync across GPUs by applying the fully aggregated gradient to
+each GPU's copy of the variable.
+
+The variables and data are available at the start of training, so the forward
+pass of training can start immediately. Gradients are aggregated across the
+devices and the fully aggregated gradient is then applied to each local copy.
+
+Gradient aggregation across the server can be done in different ways:
+
+* Using standard tensorflow operations to accumulate the total on a single
+  device (CPU or GPU) and then copy it back to all GPUs.
+* Using NVIDIA NCCL, described below in the NCCL section.
+
+This is available in the benchmark scripts for local execution only, as the
+'replicated' variable_update mode.
+
+### Replicated Variables in Distributed Training
+
+The replicated method for variables can be extended to distributed training.
+One way to do this like the replicated mode: aggregate the gradients fully
+across the cluster and apply them to each local copy of the variable. This may
+be shown in a future version of this scripts; the scripts do present a different
+variation, described here.
+
+In this mode, in addition to each GPU's copy of the variables, a master copy is
+stored on the parameter servers. As with the replicated mode, training can start
+immediately using the local copies of the variables.
+
+As the gradients of the weights become available, they are sent back to the
+parameter servers and all local copies are updated:
+
+1. All the gradients from the GPU on the same worker are aggregated together.
+2. Aggregated gradients from each worker are sent to the parameter server that
+   owns the variable, where the specified optimizer is used to update the
+   master copy of the variable.
+3. Each worker updates its local copy of the variable from the master. In
+   the example model, this is done with a cross-replica barrier that waits for
+   all the workers to finish updating the variables, and fetches the new
+   variable only after the barrier has been released by all replicas.  Once the
+   copy finishes for all variables, this marks the end of a training step, and a
+   new step can start.
+
+Although this sounds similar to the standard use of parameter servers, the
+performance is often better in many cases.  This is largely due to the fact the
+computation can happen without any delay, and much of the copy latency of early
+gradients can be hidden by later computation layers.
+
+This is available in the benchmark scripts as the 'distributed_replicated'
+variable_update mode.
+
+![distributed_replicated mode](
+../images/distributed_replicated_mode_doc.png){
+width="900" style="max-width: inherit"}
+
+#### NCCL
+
+In order to broadcast variables and aggregate gradients across different GPUs
+within the same host machine, we can use the default TensorFlow implicit copy
+mechanism.
+
+However, we can instead use the optional NCCL support.  NCCL is an NVIDIA
+library that can efficiently broadcast and aggregate data across different GPUs.
+It schedules a cooperating kernel on each GPU that knows how to best utilize the
+underlying hardware topology; this kernel uses a single SM of the GPU.
+
+In our experiment, we demonstrate that although NCCL often leads to much faster
+data aggregation by itself, it doesn't necessarily lead to faster training.  Our
+hypothesis is that the implicit copies are essentially free since they go to the
+copy engine on GPU, as long as its latency can be hidden by the main computation
+itself.  Although NCCL can transfer data faster, it takes one SM away, and adds
+more pressure to the underlying L2 cache.  Our results show that for 8-GPUs,
+NCCL often leads to better performance.  However, for fewer GPUs, the implicit
+copies often perform better.
+
+#### Staged Variables
+
+We further introduce a staged-variable mode where we use staging areas for both
+the variable reads, and their updates.
+Similar to software pipelining of the input pipeline, this can hide the data
+copy latency.
+If the computation time takes longer than the copy and aggregation, the copy
+itself becomes essentially free.
+
+The downside is that all the weights read are from the previous training step.
+So it is a different algorithm from SGD.
+But it is possible to improve its convergence by adjusting learning rate and
+other hyperparameters.
+
+## Conclusions
+
+In this high-performance model, we present a number of options to build
+high-performance models in TensorFlow.
+Due to the flexible design in TensorFlow, advanced features like this often
+requires no system-level changes, and can be largely achieved through
+model-level changes.
+
+We do not claim which combination works best for a particular model.
+That should be left to the engineers who build the model and the training system.
+Many of the ingredients of the high-performance model will find their ways
+to high-level primitives that become transparent to users.
+However, we have shown that advanced users can easily tune and modify the
+underlying model behavior using low-level primitives.
+This could be very useful when improving performance for particular system
+setups and model configurations.
-- 
GitLab


From e370aa6434ce3e17f8fa2a9df690500a8dc03d4e Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@google.com>
Date: Sun, 30 Apr 2017 19:48:05 -0800
Subject: [PATCH 0851/1563] Add ReferenceUtil::ApplyElementwise2D. Change:
 154687238

---
 tensorflow/compiler/xla/reference_util.h      | 39 ++++++++++++++++
 .../compiler/xla/reference_util_test.cc       | 44 ++++++++++++-------
 2 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/tensorflow/compiler/xla/reference_util.h b/tensorflow/compiler/xla/reference_util.h
index cdcad08c33..0327612129 100644
--- a/tensorflow/compiler/xla/reference_util.h
+++ b/tensorflow/compiler/xla/reference_util.h
@@ -406,7 +406,46 @@ class ReferenceUtil {
                                    const PaddingConfig& padding,
                                    const float pad);
 
+  // ApplyElementwise2D(f, x, y, ...) returns the Array2D formed by running
+  // f(x[i], y[i], ...) for each array element in the Array2Ds x, y, ....
+  //
+  // The given arrays must have the same size and element type, and the return
+  // type of f must be implicitly convertible to the arrays' element type.
+  //
+  // Example usage:
+  //
+  //   Array2D<float> x, y, z = ...;
+  //   std::unique_ptr<Array2D> result = ReferenceUtil::ApplyElementwise2D(
+  //     [](float a, float b, float c) { return a * b + c; }, x, y, z);
+  //
+  template <typename F, typename T1, typename... Ts>
+  static std::unique_ptr<Array2D<T1>> ApplyElementwise2D(
+      F&& f, const Array2D<T1>& array1, const Array2D<Ts>&... arrays) {
+    AssertSameSize2D(array1, arrays...);
+    auto result = MakeUnique<Array2D<T1>>(array1.n1(), array1.n1());
+    for (int64 i = 0; i < array1.n1(); ++i) {
+      for (int64 j = 0; j < array1.n2(); ++j) {
+        (*result)(i, j) = f(array1(i, j), arrays(i, j)...);
+      }
+    }
+    return result;
+  }
+
  private:
+  template <typename T1, typename T2, typename... Ts>
+  static void AssertSameSize2D(const Array2D<T1>& array1,
+                               const Array2D<T2>& array2,
+                               const Array2D<Ts>&... arrays) {
+    static_assert(std::is_same<T1, T2>::value, "Args must be same type.");
+    CHECK_EQ(array1.n1(), array2.n1());
+    CHECK_EQ(array1.n2(), array2.n2());
+    AssertSameSize2D(array2, arrays...);
+  }
+
+  // Recursive base case for AssertSameSize2D.
+  template <typename Array1>
+  static void AssertSameSize2D(const Array1& array1) {}
+
   TF_DISALLOW_COPY_AND_ASSIGN(ReferenceUtil);
 };
 
diff --git a/tensorflow/compiler/xla/reference_util_test.cc b/tensorflow/compiler/xla/reference_util_test.cc
index b0aa558402..f839ac019d 100644
--- a/tensorflow/compiler/xla/reference_util_test.cc
+++ b/tensorflow/compiler/xla/reference_util_test.cc
@@ -52,9 +52,9 @@ class ReferenceUtilTest : public ::testing::Test {
 
 TEST_F(ReferenceUtilTest, TransposeArray2D) {
   auto result = ReferenceUtil::TransposeArray2D(*matrix_);
-  auto result_literal = LiteralUtil::CreateR2FromArray2D(*result);
+  auto actual_literal = LiteralUtil::CreateR2FromArray2D(*result);
   LiteralTestUtil::ExpectR2Near<float>({{1.f, 4.f}, {2.f, 5.f}, {3.f, 6.f}},
-                                       *result_literal, ErrorSpec(0.0001));
+                                       *actual_literal, ErrorSpec(0.0001));
 }
 
 TEST_F(ReferenceUtilTest, MatmulArray2D) {
@@ -62,32 +62,32 @@ TEST_F(ReferenceUtilTest, MatmulArray2D) {
       {7.f, 8.f}, {9.f, 10.f}, {11.f, 12.f},
   });
   auto result = ReferenceUtil::MatmulArray2D(*matrix_, rhs);
-  auto result_literal = LiteralUtil::CreateR2FromArray2D(*result);
+  auto actual_literal = LiteralUtil::CreateR2FromArray2D(*result);
   LiteralTestUtil::ExpectR2Near<float>({{58.f, 64.f}, {139.f, 154.f}},
-                                       *result_literal, ErrorSpec(0.0001));
+                                       *actual_literal, ErrorSpec(0.0001));
 }
 
 TEST_F(ReferenceUtilTest, ReduceToColArray2D) {
   auto add = [](float lhs, float rhs) { return lhs + rhs; };
   auto result = ReferenceUtil::ReduceToColArray2D(*matrix_, 0.0f, add);
-  auto result_literal = LiteralUtil::CreateR1<float>(*result);
-  LiteralTestUtil::ExpectR1Near<float>({6.f, 15.f}, *result_literal,
+  auto actual_literal = LiteralUtil::CreateR1<float>(*result);
+  LiteralTestUtil::ExpectR1Near<float>({6.f, 15.f}, *actual_literal,
                                        ErrorSpec(0.0001));
 }
 
 TEST_F(ReferenceUtilTest, ReduceToRowArray2D) {
   auto add = [](float lhs, float rhs) { return lhs + rhs; };
   auto result = ReferenceUtil::ReduceToRowArray2D(*matrix_, 0.0f, add);
-  auto result_literal = LiteralUtil::CreateR1<float>(*result);
-  LiteralTestUtil::ExpectR1Near<float>({5.f, 7.f, 9.f}, *result_literal,
+  auto actual_literal = LiteralUtil::CreateR1<float>(*result);
+  LiteralTestUtil::ExpectR1Near<float>({5.f, 7.f, 9.f}, *actual_literal,
                                        ErrorSpec(0.0001));
 }
 
 TEST_F(ReferenceUtilTest, MapArray2D) {
   auto identity = [](float value) { return log(exp(value)); };
   auto result = ReferenceUtil::MapArray2D(*matrix_, identity);
-  auto result_literal = LiteralUtil::CreateR2FromArray2D(*result);
-  LiteralTestUtil::ExpectR2NearArray2D(*matrix_, *result_literal,
+  auto actual_literal = LiteralUtil::CreateR2FromArray2D(*result);
+  LiteralTestUtil::ExpectR2NearArray2D(*matrix_, *actual_literal,
                                        ErrorSpec(0.0001));
 }
 
@@ -96,9 +96,9 @@ TEST_F(ReferenceUtilTest, MapWithIndexArray2D) {
     return value + row + col;
   };
   auto result = ReferenceUtil::MapWithIndexArray2D(*matrix_, add_index);
-  auto result_literal = LiteralUtil::CreateR2FromArray2D(*result);
+  auto actual_literal = LiteralUtil::CreateR2FromArray2D(*result);
   LiteralTestUtil::ExpectR2Near<float>({{1.f, 3.f, 5.f}, {5.f, 7.f, 9.f}},
-                                       *result_literal, ErrorSpec(0.0001));
+                                       *actual_literal, ErrorSpec(0.0001));
 }
 
 TEST_F(ReferenceUtilTest, MapArray4D) {
@@ -107,11 +107,11 @@ TEST_F(ReferenceUtilTest, MapArray4D) {
   input->FillWithMultiples(1.0f);
   auto multiply_by_two = [](float value) { return 2 * value; };
   auto result = ReferenceUtil::MapArray4D(*input, multiply_by_two);
-  auto result_literal = LiteralUtil::CreateR4FromArray4D(*result);
+  auto actual_literal = LiteralUtil::CreateR4FromArray4D(*result);
 
   Array4D<float> expected(/*planes=*/2, /*depth=*/3, /*height=*/4, /*width=*/5);
   expected.FillWithMultiples(2.0f);
-  LiteralTestUtil::ExpectR4NearArray4D(expected, *result_literal,
+  LiteralTestUtil::ExpectR4NearArray4D(expected, *actual_literal,
                                        ErrorSpec(0.0001));
 }
 
@@ -124,11 +124,11 @@ TEST_F(ReferenceUtilTest, MapWithIndexArray4D) {
     return value - (3 * 4 * 5 * plane + 4 * 5 * depth + 5 * height + width);
   };
   auto result = ReferenceUtil::MapWithIndexArray4D(*input, subtract_index);
-  auto result_literal = LiteralUtil::CreateR4FromArray4D(*result);
+  auto actual_literal = LiteralUtil::CreateR4FromArray4D(*result);
 
   Array4D<float> expected(/*planes=*/2, /*depth=*/3, /*height=*/4, /*width=*/5);
   expected.Fill(0.0f);
-  LiteralTestUtil::ExpectR4NearArray4D(expected, *result_literal,
+  LiteralTestUtil::ExpectR4NearArray4D(expected, *actual_literal,
                                        ErrorSpec(0.0001));
 }
 
@@ -302,5 +302,17 @@ TEST_F(ReferenceUtilTest, ConvGeneralDimensionsWithValidPadding) {
                                               ErrorSpec(0.0001));
 }
 
+TEST_F(ReferenceUtilTest, ApplyElementwise2D) {
+  Array2D<float> a({{1, 2}, {3, 4}});
+  Array2D<float> b({{10, 20}, {30, 40}});
+  Array2D<float> c({{100, 200}, {300, 400}});
+
+  auto actual = ReferenceUtil::ApplyElementwise2D(
+      [](float x, float y, float z) { return 100 * x + 10 * y + z; }, a, b, c);
+  auto actual_literal = LiteralUtil::CreateR2FromArray2D(*actual);
+  LiteralTestUtil::ExpectR2Near({{300.f, 600.f}, {900.f, 1200.f}},
+                                *actual_literal, ErrorSpec(0.0001));
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 838a607635769c0b851fe7859c0a2f02495b14d0 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Mon, 1 May 2017 04:18:19 -0800
Subject: [PATCH 0852/1563] Clarify docs on unused GraphKeys:

WEIGHTS,
BIASES,
ACTIVTIONS

Closes #7741
Change: 154708825
---
 tensorflow/contrib/layers/README.md |  7 ++-----
 tensorflow/python/framework/ops.py  | 10 +++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tensorflow/contrib/layers/README.md b/tensorflow/contrib/layers/README.md
index 7b374172f5..9310b194df 100644
--- a/tensorflow/contrib/layers/README.md
+++ b/tensorflow/contrib/layers/README.md
@@ -18,17 +18,14 @@ these arguments.
      …,
      weight_init=<DEFAULT>,
      bias_init=<DEFAULT>,
-     weight_collections=(tf.GraphKeys.WEIGHTS,),
-     bias_collections=(tf.GraphKeys.BIASES,),
-     output_collections=(tf.GraphKeys.ACTIVATIONS,),
      weight_regularizer=None,
      bias_regularizer=None,
      name=None) : Tensor`
 
 `x` is the input tensor.
 
-Weights, biases, and activations (i.e., outputs) are, by default, added to the specified collections. Weights and biases are also added to
-`tf.GraphKeys.GLOBAL_VARIABLES` and `tf.GraphKeys.TRAINABLE_VARIABLES`.
+Weights and biases are added to `tf.GraphKeys.GLOBAL_VARIABLES` and
+`tf.GraphKeys.TRAINABLE_VARIABLES`.
 
 ## optimizers.py
 
diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 2a094203d7..93a29d0d8e 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -3981,9 +3981,13 @@ class GraphKeys(object):
     for more details.
   * `REGULARIZATION_LOSSES`: regularization losses collected during graph
     construction.
-  * `WEIGHTS`: weights inside neural network layers
-  * `BIASES`: biases inside neural network layers
-  * `ACTIVATIONS`: activations of neural network layers
+
+  The following standard keys are _defined_, but their collections are **not**
+  automatically populated as many of the others are:
+
+  * `WEIGHTS`
+  * `BIASES`
+  * `ACTIVATIONS`
   """
 
   # Key to collect Variable objects that are global (shared across machines).
-- 
GitLab


From 9a68fb3812477751e5651477281d3eb003d5e509 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Mon, 1 May 2017 05:05:42 -0800
Subject: [PATCH 0853/1563] Docs fix for sdca_ops.cc Change: 154710766

---
 tensorflow/core/ops/sdca_ops.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tensorflow/core/ops/sdca_ops.cc b/tensorflow/core/ops/sdca_ops.cc
index 2029ed7de2..b9a37119b7 100644
--- a/tensorflow/core/ops/sdca_ops.cc
+++ b/tensorflow/core/ops/sdca_ops.cc
@@ -72,17 +72,17 @@ optimizer applies each update one example at a time. Examples are sampled
 uniformly, and the optimizer is learning rate free and enjoys linear convergence
 rate.
 
-Proximal Stochastic Dual Coordinate Ascent, Shalev-Shwartz, Shai; Zhang, Tong.
-2012 arXiv1211.2717S: http://arxiv.org/pdf/1211.2717v1.pdf
+[Proximal Stochastic Dual Coordinate Ascent](http://arxiv.org/pdf/1211.2717v1.pdf).<br>
+Shai Shalev-Shwartz, Tong Zhang. 2012
 
-  Loss objective = \sum f_{i}(wx_{i}) + (l2 / 2) * |w|^2 + l1 * |w|
+$$Loss Objective = \sum f_{i} (wx_{i}) + (l2 / 2) * |w|^2 + l1 * |w|$$
 
-Adding vs. Averaging in Distributed Primal-Dual Optimization.
-Chenxin Ma, Virginia Smith, Martin Jaggi, Michael I. Jordan, Peter Richtarik,
-Martin Takac http://arxiv.org/abs/1502.03508
+[Adding vs. Averaging in Distributed Primal-Dual Optimization](http://arxiv.org/abs/1502.03508).<br>
+Chenxin Ma, Virginia Smith, Martin Jaggi, Michael I. Jordan,
+Peter Richtarik, Martin Takac. 2015
 
-Stochastic Dual Coordinate Ascent with Adaptive Probabilities
-Dominik Csiba, Zheng Qu, Peter Richtarik https://arxiv.org/abs/1502.08053
+[Stochastic Dual Coordinate Ascent with Adaptive Probabilities](https://arxiv.org/abs/1502.08053).<br>
+Dominik Csiba, Zheng Qu, Peter Richtarik. 2015
 
 loss_type: Type of the primal loss. Currently SdcaSolver supports logistic,
   squared and hinge losses.
-- 
GitLab


From 6dd7b9792fc1f081725ec4840fb7e5f083bff7fe Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 05:18:39 -0800
Subject: [PATCH 0854/1563] Update ops-related pbtxt files. Change: 154711274

---
 tensorflow/core/ops/ops.pbtxt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 630f255d0f..bd963a5266 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -19650,7 +19650,7 @@ op {
     minimum: 1
   }
   summary: "Distributed version of Stochastic Dual Coordinate Ascent (SDCA) optimizer for"
-  description: "linear models with L1 + L2 regularization. As global optimization objective is\nstrongly-convex, the optimizer optimizes the dual objective at each step. The\noptimizer applies each update one example at a time. Examples are sampled\nuniformly, and the optimizer is learning rate free and enjoys linear convergence\nrate.\n\nProximal Stochastic Dual Coordinate Ascent, Shalev-Shwartz, Shai; Zhang, Tong.\n2012 arXiv1211.2717S: http://arxiv.org/pdf/1211.2717v1.pdf\n\n  Loss objective = \\sum f_{i}(wx_{i}) + (l2 / 2) * |w|^2 + l1 * |w|\n\nAdding vs. Averaging in Distributed Primal-Dual Optimization.\nChenxin Ma, Virginia Smith, Martin Jaggi, Michael I. Jordan, Peter Richtarik,\nMartin Takac http://arxiv.org/abs/1502.03508\n\nStochastic Dual Coordinate Ascent with Adaptive Probabilities\nDominik Csiba, Zheng Qu, Peter Richtarik https://arxiv.org/abs/1502.08053"
+  description: "linear models with L1 + L2 regularization. As global optimization objective is\nstrongly-convex, the optimizer optimizes the dual objective at each step. The\noptimizer applies each update one example at a time. Examples are sampled\nuniformly, and the optimizer is learning rate free and enjoys linear convergence\nrate.\n\n[Proximal Stochastic Dual Coordinate Ascent](http://arxiv.org/pdf/1211.2717v1.pdf).<br>\nShai Shalev-Shwartz, Tong Zhang. 2012\n\n$$Loss Objective = \\sum f_{i} (wx_{i}) + (l2 / 2) * |w|^2 + l1 * |w|$$\n\n[Adding vs. Averaging in Distributed Primal-Dual Optimization](http://arxiv.org/abs/1502.03508).<br>\nChenxin Ma, Virginia Smith, Martin Jaggi, Michael I. Jordan,\nPeter Richtarik, Martin Takac. 2015\n\n[Stochastic Dual Coordinate Ascent with Adaptive Probabilities](https://arxiv.org/abs/1502.08053).<br>\nDominik Csiba, Zheng Qu, Peter Richtarik. 2015"
 }
 op {
   name: "SdcaShrinkL1"
-- 
GitLab


From 3e06162307e34a574ef8a77b5c552a543c8797d3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 05:26:41 -0800
Subject: [PATCH 0855/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154711571

---
 tensorflow/go/op/wrappers.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index d4af263fc6..74f05c8638 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -7941,17 +7941,17 @@ func SdcaOptimizerAdaptative(value bool) SdcaOptimizerAttr {
 // uniformly, and the optimizer is learning rate free and enjoys linear convergence
 // rate.
 //
-// Proximal Stochastic Dual Coordinate Ascent, Shalev-Shwartz, Shai; Zhang, Tong.
-// 2012 arXiv1211.2717S: http://arxiv.org/pdf/1211.2717v1.pdf
+// [Proximal Stochastic Dual Coordinate Ascent](http://arxiv.org/pdf/1211.2717v1.pdf).<br>
+// Shai Shalev-Shwartz, Tong Zhang. 2012
 //
-//   Loss objective = \sum f_{i}(wx_{i}) + (l2 / 2) * |w|^2 + l1 * |w|
+// $$Loss Objective = \sum f_{i} (wx_{i}) + (l2 / 2) * |w|^2 + l1 * |w|$$
 //
-// Adding vs. Averaging in Distributed Primal-Dual Optimization.
-// Chenxin Ma, Virginia Smith, Martin Jaggi, Michael I. Jordan, Peter Richtarik,
-// Martin Takac http://arxiv.org/abs/1502.03508
+// [Adding vs. Averaging in Distributed Primal-Dual Optimization](http://arxiv.org/abs/1502.03508).<br>
+// Chenxin Ma, Virginia Smith, Martin Jaggi, Michael I. Jordan,
+// Peter Richtarik, Martin Takac. 2015
 //
-// Stochastic Dual Coordinate Ascent with Adaptive Probabilities
-// Dominik Csiba, Zheng Qu, Peter Richtarik https://arxiv.org/abs/1502.08053
+// [Stochastic Dual Coordinate Ascent with Adaptive Probabilities](https://arxiv.org/abs/1502.08053).<br>
+// Dominik Csiba, Zheng Qu, Peter Richtarik. 2015
 //
 // Arguments:
 //	sparse_example_indices: a list of vectors which contain example indices.
-- 
GitLab


From 2a1a0d729fb23ac8758fff64119503e8e3e7b94d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 05:55:07 -0800
Subject: [PATCH 0856/1563] Removing unnecessary cuda:platform.bzl Change:
 154712918

---
 third_party/gpus/cuda/BUILD.tpl     |  2 --
 third_party/gpus/cuda_configure.bzl | 13 -------------
 2 files changed, 15 deletions(-)

diff --git a/third_party/gpus/cuda/BUILD.tpl b/third_party/gpus/cuda/BUILD.tpl
index 279c441255..f7610dd7a9 100644
--- a/third_party/gpus/cuda/BUILD.tpl
+++ b/third_party/gpus/cuda/BUILD.tpl
@@ -1,7 +1,5 @@
 licenses(["restricted"])  # MPL2, portions GPL v3, LGPL v3, BSD-like
 
-load("@local_config_cuda//cuda:platform.bzl", "readlink_command")
-
 package(default_visibility = ["//visibility:public"])
 
 config_setting(
diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index 87d6ec1a3b..0fef94cf9c 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -732,12 +732,6 @@ def _create_dummy_repository(repository_ctx):
            "%{cuda_include_genrules}": '',
            "%{cuda_headers}": '',
        })
-  _tpl(repository_ctx, "cuda:platform.bzl",
-       {
-           "%{cuda_version}": _DEFAULT_CUDA_VERSION,
-           "%{cudnn_version}": _DEFAULT_CUDNN_VERSION,
-           "%{platform}": cpu_value,
-       })
 
   # Create dummy files for the CUDA toolkit since they are still required by
   # tensorflow/core/platform/default/build_config:cuda.
@@ -913,13 +907,6 @@ def _create_cuda_repository(repository_ctx):
            "%{cuda_headers}": ('":cuda-include",\n' +
                                '        ":cudnn-include",')
        })
-  _tpl(repository_ctx, "cuda:platform.bzl",
-       {
-           "%{cuda_version}": cuda_config.cuda_version,
-           "%{cudnn_version}": cuda_config.cudnn_version,
-           "%{platform}": cuda_config.cpu_value,
-       })
-
   # Set up crosstool/
   _file(repository_ctx, "crosstool:BUILD")
   cc = find_cc(repository_ctx)
-- 
GitLab


From 474aba363a85d68fdd8f8ab8b1d9d749a91e6e7a Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Mon, 1 May 2017 07:56:28 -0800
Subject: [PATCH 0857/1563] Make FunctionLibraryDefinition::AddFunctionDef()
 check for conflicting op name

This prevents a function from masking an existing op.
Change: 154720287
---
 tensorflow/core/framework/function.cc      |  6 ++++++
 tensorflow/core/framework/function_test.cc |  9 +++++++++
 tensorflow/core/graph/graph.cc             |  7 -------
 tensorflow/core/graph/graph_test.cc        | 15 +++++++--------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index 8a7d96c38a..c731155924 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -882,6 +882,12 @@ Status FunctionLibraryDefinition::AddFunctionDef(const FunctionDef& fdef) {
                                    fdef.signature().name(),
                                    " already exists in function library.");
   }
+  const OpDef* op_def;
+  if (default_registry_->LookUpOpDef(fdef.signature().name(), &op_def).ok()) {
+    return errors::InvalidArgument(
+        "Cannot add function '", fdef.signature().name(),
+        "' because an op with the same name already exists.");
+  }
   ptr.reset(new FunctionDefAndOpRegistration(fdef));
   return Status::OK();
 }
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index efc6a2edcc..07462a575e 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -944,6 +944,15 @@ TEST(FunctionLibraryDefinitionTest, AddFunctionDef) {
   ASSERT_NE(second, nullptr);
   EXPECT_EQ(second->DebugString(),
             test::function::WXPlusB().signature().DebugString());
+
+  // Can't add function with same name as existing op
+  FunctionDef fdef = test::function::XTimesTwo();
+  fdef.mutable_signature()->set_name("Add");
+  Status s = lib_def.AddFunctionDef(fdef);
+  EXPECT_FALSE(s.ok());
+  EXPECT_EQ(s.error_message(),
+            "Cannot add function 'Add' because an op with the same name "
+            "already exists.");
 }
 
 TEST(FunctionLibraryDefinitionTest, AddGradientDef) {
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index fae9f26f76..e1657cb862 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -380,13 +380,6 @@ Status Graph::AddFunctionLibrary(const FunctionDefLibrary& fdef_lib) {
       // Ignore duplicate FunctionDefs
       continue;
     }
-    // TODO(skyewm): fix test breakages and reenable this check
-    // const OpDef* op_def;
-    // if (ops_.LookUpOpDef(fdef.signature().name(), &op_def).ok()) {
-    //   return errors::InvalidArgument(
-    //       "Cannot add function '", fdef.signature().name(),
-    //       "' because an op with the same name already exists.");
-    // }
     TF_RETURN_IF_ERROR(ops_.AddFunctionDef(fdef));
   }
   for (const GradientDef& grad : fdef_lib.gradient()) {
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index 739ad90efd..502b7b26da 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -412,15 +412,14 @@ TEST_F(GraphTest, AddFunctionLibrary) {
             "Cannot add function 'XTimesTwo' because a different function with "
             "the same name already exists.");
 
-  // TODO(skyewm): reenable along with duplicate op check
   // Function with same name as an existing op triggers an error
-  // error_proto = proto;
-  // error_proto.mutable_function(0)->mutable_signature()->set_name("Add");
-  // s = graph_.AddFunctionLibrary(error_proto);
-  // EXPECT_FALSE(s.ok());
-  // EXPECT_EQ(s.error_message(),
-  //           "Cannot add function 'Add' because an op with the same name "
-  //           "already exists.");
+  error_proto = proto;
+  error_proto.mutable_function(0)->mutable_signature()->set_name("Add");
+  s = graph_.AddFunctionLibrary(error_proto);
+  EXPECT_FALSE(s.ok());
+  EXPECT_EQ(s.error_message(),
+            "Cannot add function 'Add' because an op with the same name "
+            "already exists.");
 
   // Adding a gradient function to an existing function is ok
   GradientDef* grad = proto.add_gradient();
-- 
GitLab


From b1761a2b4309b43a1245beb947677da1e80681e5 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 1 May 2017 07:58:55 -0800
Subject: [PATCH 0858/1563] tfdbg: improve the way in which the
 no-debugger-linked error is raised Change: 154720434

---
 .../debugger_state_interface.cc               | 33 ++++++++++++++-----
 .../common_runtime/debugger_state_interface.h | 14 ++++----
 .../core/common_runtime/direct_session.cc     | 24 ++++----------
 .../core/distributed_runtime/graph_mgr.cc     | 11 ++-----
 .../distributed_runtime/master_session.cc     | 12 ++-----
 5 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/tensorflow/core/common_runtime/debugger_state_interface.cc b/tensorflow/core/common_runtime/debugger_state_interface.cc
index 73157ca05d..c1a92f9a22 100644
--- a/tensorflow/core/common_runtime/debugger_state_interface.cc
+++ b/tensorflow/core/common_runtime/debugger_state_interface.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/common_runtime/debugger_state_interface.h"
 
+#include "tensorflow/core/lib/core/errors.h"
+
 namespace tensorflow {
 
 // static
@@ -58,11 +60,17 @@ void DebuggerStateRegistry::RegisterFactory(
 }
 
 // static
-std::unique_ptr<DebuggerStateInterface> DebuggerStateRegistry::CreateState(
-    const DebugOptions& debug_options) {
-  return (factory_ == nullptr || *factory_ == nullptr)
-             ? nullptr
-             : (*factory_)(debug_options);
+Status DebuggerStateRegistry::CreateState(
+    const DebugOptions& debug_options,
+    std::unique_ptr<DebuggerStateInterface>* state) {
+  if (factory_ == nullptr || *factory_ == nullptr) {
+    return errors::Internal(
+        "Creation of debugger state failed. "
+        "It appears that TFDBG is not linked in this TensorFlow build.");
+  } else {
+    *state = (*factory_)(debug_options);
+    return Status::OK();
+  }
 }
 
 // static
@@ -73,10 +81,17 @@ void DebugGraphDecoratorRegistry::RegisterFactory(
 }
 
 // static
-std::unique_ptr<DebugGraphDecoratorInterface>
-DebugGraphDecoratorRegistry::CreateDecorator(const DebugOptions& options) {
-  return (factory_ == nullptr || *factory_ == nullptr) ? nullptr
-                                                       : (*factory_)(options);
+Status DebugGraphDecoratorRegistry::CreateDecorator(
+    const DebugOptions& options,
+    std::unique_ptr<DebugGraphDecoratorInterface>* decorator) {
+  if (factory_ == nullptr || *factory_ == nullptr) {
+    return errors::Internal(
+        "Creation of graph decorator failed. "
+        "It appears that TFDBG is not linked in this TensorFlow build.");
+  } else {
+    *decorator = (*factory_)(options);
+    return Status::OK();
+  }
 }
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/common_runtime/debugger_state_interface.h b/tensorflow/core/common_runtime/debugger_state_interface.h
index d182ce7092..6f197f372f 100644
--- a/tensorflow/core/common_runtime/debugger_state_interface.h
+++ b/tensorflow/core/common_runtime/debugger_state_interface.h
@@ -83,11 +83,12 @@ class DebuggerStateRegistry {
   // implementation based on DebugOptions.
   static void RegisterFactory(const DebuggerStateFactory& factory);
 
-  // If RegisterFactory() has been called, creates and returns a concrete
+  // If RegisterFactory() has been called, creates and supplies a concrete
   // DebuggerStateInterface implementation using the registered factory,
-  // owned by the caller.  Otherwise returns nullptr.
-  static std::unique_ptr<DebuggerStateInterface> CreateState(
-      const DebugOptions& debug_options);
+  // owned by the caller and return an OK Status. Otherwise returns an error
+  // Status.
+  static Status CreateState(const DebugOptions& debug_options,
+                            std::unique_ptr<DebuggerStateInterface>* state);
 
  private:
   static DebuggerStateFactory* factory_;
@@ -103,8 +104,9 @@ class DebugGraphDecoratorRegistry {
  public:
   static void RegisterFactory(const DebugGraphDecoratorFactory& factory);
 
-  static std::unique_ptr<DebugGraphDecoratorInterface> CreateDecorator(
-      const DebugOptions& options);
+  static Status CreateDecorator(
+      const DebugOptions& options,
+      std::unique_ptr<DebugGraphDecoratorInterface>* decorator);
 
  private:
   static DebugGraphDecoratorFactory* factory_;
diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index 7c017f9584..f1c17d7788 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -376,31 +376,19 @@ Status DirectSession::CreateDebuggerState(
     const std::vector<string>& output_names,
     const std::vector<string>& target_names,
     std::unique_ptr<DebuggerStateInterface>* debugger_state) {
-  std::unique_ptr<DebuggerStateInterface> state =
-      DebuggerStateRegistry::CreateState(debug_options);
-  if (!state) {
-    return errors::Internal(
-        "Debugger options are set, but creation of debugger state failed. "
-        "It appears that debugger is not linked in this TensorFlow build.");
-  }
-
-  TF_RETURN_IF_ERROR(state->PublishDebugMetadata(
+  TF_RETURN_IF_ERROR(
+      DebuggerStateRegistry::CreateState(debug_options, debugger_state));
+  TF_RETURN_IF_ERROR(debugger_state->get()->PublishDebugMetadata(
       debug_options.global_step(), session_run_count, executor_step_count,
       input_names, output_names, target_names));
-
-  *debugger_state = std::move(state);
   return Status::OK();
 }
 
 Status DirectSession::DecorateAndPublishGraphForDebug(
     const DebugOptions& debug_options, Graph* graph, Device* device) {
-  std::unique_ptr<DebugGraphDecoratorInterface> decorator =
-      DebugGraphDecoratorRegistry::CreateDecorator(debug_options);
-  if (!decorator) {
-    return errors::Internal(
-        "Debugger options are set, but creation of debug graph publisher ",
-        "failed.");
-  }
+  std::unique_ptr<DebugGraphDecoratorInterface> decorator;
+  TF_RETURN_IF_ERROR(
+      DebugGraphDecoratorRegistry::CreateDecorator(debug_options, &decorator));
 
   TF_RETURN_IF_ERROR(decorator->DecorateGraph(graph, device));
   TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph));
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index 6051f11fad..ce7ce372e8 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -97,16 +97,11 @@ static Status ValidateGraphDefForDevices(const GraphDef& gdef) {
 
 Status GraphMgr::DecorateAndPublishGraphForDebug(
     const DebugOptions& debug_options, Graph* graph, Device* device) {
-  std::unique_ptr<DebugGraphDecoratorInterface> decorator =
-      DebugGraphDecoratorRegistry::CreateDecorator(debug_options);
-  if (!decorator) {
-    return errors::Internal(
-        "Debugger options are set, but creation of debug graph publisher ",
-        "failed.");
-  }
+  std::unique_ptr<DebugGraphDecoratorInterface> decorator;
+  TF_RETURN_IF_ERROR(
+      DebugGraphDecoratorRegistry::CreateDecorator(debug_options, &decorator));
   TF_RETURN_IF_ERROR(decorator->DecorateGraph(graph, device));
   TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph));
-
   return Status::OK();
 }
 
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 681933adad..f7b422b70e 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -1337,13 +1337,8 @@ Status MasterSession::CreateDebuggerState(
     const DebugOptions& debug_options, const RunStepRequestWrapper& req,
     int64 rcg_execution_count,
     std::unique_ptr<DebuggerStateInterface>* debugger_state) {
-  std::unique_ptr<DebuggerStateInterface> state =
-      DebuggerStateRegistry::CreateState(debug_options);
-  if (!state) {
-    return errors::Internal(
-        "Debugger options are set, but creation of debugger state failed. "
-        "It appears that debugger is not linked in this TensorFlow build.");
-  }
+  TF_RETURN_IF_ERROR(
+      DebuggerStateRegistry::CreateState(debug_options, debugger_state));
 
   std::vector<string> input_names;
   for (size_t i = 0; i < req.num_feeds(); ++i) {
@@ -1362,11 +1357,10 @@ Status MasterSession::CreateDebuggerState(
   // While this counter value is straightforward to define and obtain for
   // DirectSessions, it is less so for non-direct Sessions. Devise a better
   // way to get its value when the need arises.
-  TF_RETURN_IF_ERROR(state->PublishDebugMetadata(
+  TF_RETURN_IF_ERROR(debugger_state->get()->PublishDebugMetadata(
       debug_options.global_step(), -1, rcg_execution_count, input_names,
       output_names, target_names));
 
-  *debugger_state = std::move(state);
   return Status::OK();
 }
 
-- 
GitLab


From fcfb5482da6da3221f8ea843829c24a289c4a4c8 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Mon, 1 May 2017 08:11:42 -0800
Subject: [PATCH 0859/1563] Update "Using TensorFlow via Docker" README to
 mention memory limits.

Fixes #7861
Change: 154721550
---
 tensorflow/tools/ci_build/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/README.md b/tensorflow/tools/ci_build/README.md
index 1fa618e698..ad83669950 100644
--- a/tensorflow/tools/ci_build/README.md
+++ b/tensorflow/tools/ci_build/README.md
@@ -34,7 +34,11 @@ run continuous integration [ci.tensorflow.org](https://ci.tensorflow.org).
    ```bash
    tensorflow/tools/ci_build/ci_build.sh CPU bazel test //tensorflow/...
    ```
-
+   If you are using the Docker image on Windows or OS X, the Docker VM's default
+   memory limit may be too low to build TensorFlow. This can result in
+   strange-looking errors, e.g. the compilation may fail with `gcc: internal
+   compiler error: Killed (program cc1plus)`. Try increasing the memory limit in
+   the Docker preferences.
 
 
 ## Jobs
-- 
GitLab


From 99cc759e0ba0ae056d0d8f991b66e99cf4f2a91a Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <chris.song@kakaocorp.com>
Date: Tue, 2 May 2017 02:17:27 +0900
Subject: [PATCH 0860/1563] Fix misspellings in tensor flow tools (#9574)

---
 tensorflow/tools/common/public_api.py          | 2 +-
 tensorflow/tools/docs/doc_generator_visitor.py | 2 +-
 tensorflow/tools/docs/pretty_docs.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 837f11f690..cab3b2ff6a 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -38,7 +38,7 @@ class PublicAPIVisitor(object):
     self._visitor = visitor
 
     # Modules/classes we do not want to descend into if we hit them. Usually,
-    # sytem modules exposed through platforms for compatibility reasons.
+    # system modules exposed through platforms for compatibility reasons.
     # Each entry maps a module path to a name to ignore in traversal.
     self._do_not_descend_map = {
         '': [
diff --git a/tensorflow/tools/docs/doc_generator_visitor.py b/tensorflow/tools/docs/doc_generator_visitor.py
index 119305bece..8f7b91fa75 100644
--- a/tensorflow/tools/docs/doc_generator_visitor.py
+++ b/tensorflow/tools/docs/doc_generator_visitor.py
@@ -170,7 +170,7 @@ class DocGeneratorVisitor(object):
     master names to a lexicographically sorted list of all aliases for that name
     (incl. the master name).
 
-    All these are computed and set as fields if they haven't aready.
+    All these are computed and set as fields if they haven't already.
     """
     if self._reverse_index is not None:
       return
diff --git a/tensorflow/tools/docs/pretty_docs.py b/tensorflow/tools/docs/pretty_docs.py
index 824f46170e..657d6bf849 100644
--- a/tensorflow/tools/docs/pretty_docs.py
+++ b/tensorflow/tools/docs/pretty_docs.py
@@ -230,7 +230,7 @@ def _build_signature(obj_info):
 
 
 def _build_compatibility(compatibility):
-  """Return the compatability section as an md string."""
+  """Return the compatibility section as an md string."""
   parts = []
   sorted_keys = sorted(compatibility.keys())
   for key in sorted_keys:
-- 
GitLab


From a48d2ae1e5b6fb656839c8c9f2b353b14d842bd2 Mon Sep 17 00:00:00 2001
From: "freedom\" Koan-Sin Tan" <koansin.tan@gmail.com>
Date: Tue, 2 May 2017 01:18:02 +0800
Subject: [PATCH 0861/1563] fix some trivial typos (#9565)

---
 tensorflow/tools/graph_transforms/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index 1fbd636db3..edf20e4782 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -81,10 +81,10 @@ bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --out_graph=optimized_inception_graph.pb \
 --inputs='Mul:0' \
 --outputs='softmax:0' \
---transforms='\
-strip_unused_nodes(type=float, shape="1,299,299,3") \
-remove_nodes(op=Identity, op=CheckNumerics) \
-fold_old_batch_norms \
+--transforms='
+strip_unused_nodes(type=float, shape="1,299,299,3")
+remove_nodes(op=Identity, op=CheckNumerics)
+fold_old_batch_norms
 '
 ```
 
-- 
GitLab


From c71f12cadca136e72c9dcc35d984475c1c9f6497 Mon Sep 17 00:00:00 2001
From: Miguel Flores Ruiz de Eguino <miguel.frde@gmail.com>
Date: Mon, 1 May 2017 10:23:39 -0700
Subject: [PATCH 0862/1563] Fix link in installation docs for OSX (#9556)

* Fix link in installation docs for OSX

* Correct anchor, fix one more place in file.
---
 tensorflow/docs_src/install/install_mac.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index b6a5758afe..73e143b145 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -112,7 +112,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
-[Common Installation Problems](#CommonInstallationProblems).
+[Common Installation Problems](#common-installation-problems).
 
 
 ### Next Steps
@@ -233,7 +233,7 @@ take the following steps:
      https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
-     [Common installation problems](#CommonInstallationProblems).
+     [installation problems](#common-installation-problems).
 
 
 
-- 
GitLab


From 00544564b9438a220c79fb554d39cb0e212bfd27 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Mon, 1 May 2017 09:02:52 -0800
Subject: [PATCH 0863/1563] Remove outdated README. Change: 154726428

---
 .../contrib/learn/python/learn/README.md      | 247 ------------------
 1 file changed, 247 deletions(-)
 delete mode 100644 tensorflow/contrib/learn/python/learn/README.md

diff --git a/tensorflow/contrib/learn/python/learn/README.md b/tensorflow/contrib/learn/python/learn/README.md
deleted file mode 100644
index 6a7b0ea614..0000000000
--- a/tensorflow/contrib/learn/python/learn/README.md
+++ /dev/null
@@ -1,247 +0,0 @@
-# TF Learn
-
-TF Learn is a simplified interface for TensorFlow, to get people started on predictive analytics and data mining. The library covers a variety of needs: from linear models to *Deep Learning* applications like text and image understanding.
-
-### Why *TensorFlow*?
-
-* TensorFlow provides a good backbone for building different shapes of machine learning applications.
-* It will continue to evolve both in the distributed direction and as general pipelinining machinery.
-
-### Why *TensorFlow Learn*?
-
-- To smooth the transition from the [scikit-learn](http://scikit-learn.org/stable/) world of one-liner machine learning into the more open world of building different shapes of ML models. You can start by using [fit](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/Estimator#fit)/[predict](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/Estimator#predict) and slide into TensorFlow APIs as you are getting comfortable.
-- To provide a set of reference models that will be easy to integrate with existing code.
-
-## Installation
-
-[Install TensorFlow](https://www.tensorflow.org/install/), and then simply import `learn` via `from tensorflow.contrib.learn` or use `tf.contrib.learn`.
-
-Optionally you can install [scikit-learn](http://scikit-learn.org/stable/) and [pandas](http://pandas.pydata.org/) for additional functionality.
-
-### Tutorials
-
--   [TF Learn Quickstart](https://www.tensorflow.org/get_started/tflearn). Build,
-    train, and evaluate a neural network with just a few lines of code.
--   [Input Functions](https://www.tensorflow.org/get_started/input_fn). Learn how
-    to create input functions to feed data into your models.
--   [Linear Model](https://www.tensorflow.org/tutorials/wide). Learn the basics
-    of building linear models.
--   [Wide and Deep Learning](https://www.tensorflow.org/tutorials/wide_and_deep).
-    Jointly train a linear model and a deep neural network.
--   [Logging and Monitoring](https://www.tensorflow.org/get_started/monitors).
-    Use the Monitor API to audit training of a neural network.
--   [Custom Estimators](https://www.tensorflow.org/extend/estimators). Learn
-    how to create a custom estimator.
--   More coming soon.
-
-### Community
-
-- Twitter [#tensorflow](https://twitter.com/search?q=tensorflow&src=typd).
-- StackOverflow with [tensorflow tag](http://stackoverflow.com/questions/tagged/tensorflow) for questions and struggles.
-- GitHub [issues](https://github.com/tensorflow/tensorflow/issues) for technical discussions and feature requests.
-
-### Existing Estimator Implementations
-
--   [`LinearClassifier`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/linear.py)
-    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/LinearClassifier))
--   [`LinearRegressor`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/linear.py)
-    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/LinearRegressor))
--   [`DNNClassifier`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn.py)
-    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNClassifier))
--   [`DNNRegressor`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn.py)
-    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNRegressor))
--   [`DNNLinearCombinedClassifier`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py)
-    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNLinearCombinedClassifier))
--   [`DNNLinearCombinedRegressor`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py)
-    ([docs](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/DNNLinearCombinedRegressor))
--   [`SVM`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/svm.py)
-    ([docs](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/g3doc/svm.md))
--   [`GMM`](https://www.tensorflow.org/code/tensorflow/contrib/factorization/python/ops/gmm.py)
-    ([docs](https://www.tensorflow.org/code/tensorflow/contrib/factorization/g3doc/gmm.md))
--   [`KMeansClustering`](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/kmeans.py)
-    ([docs](https://www.tensorflow.org/code/tensorflow/contrib/factorization/g3doc/kmeans.md))
-
-### Usage Examples
-
-Below are a few simple examples of the API. For more examples, please see [examples](https://www.tensorflow.org/code/tensorflow/examples/learn).
-
-General tips:
-
--  It's useful to rescale a dataset to 0 mean and unit standard deviation before passing it to an [`Estimator`](https://www.tensorflow.org/api_docs/python/tf/contrib/learn/Estimator). [Stochastic Gradient Descent](https://en.wikipedia.org/wiki/Stochastic_gradient_descent) doesn't always do the right thing when variable are at very different scales.
-
--  Categorical variables should be managed before passing input to the estimator.
-
-## Linear Classifier
-
-Simple linear classification:
-
-```python
-import tensorflow.contrib.learn.python.learn as learn
-from sklearn import datasets, metrics
-
-iris = datasets.load_iris()
-feature_columns = learn.infer_real_valued_columns_from_input(iris.data)
-classifier = learn.LinearClassifier(n_classes=3, feature_columns=feature_columns)
-classifier.fit(iris.data, iris.target, steps=200, batch_size=32)
-iris_predictions = list(classifier.predict(iris.data, as_iterable=True))
-score = metrics.accuracy_score(iris.target, iris_predictions)
-print("Accuracy: %f" % score)
-```
-
-## Linear Regressor
-
-Simple linear regression:
-
-```python
-import tensorflow.contrib.learn.python.learn as learn
-from sklearn import datasets, metrics, preprocessing
-
-boston = datasets.load_boston()
-x = preprocessing.StandardScaler().fit_transform(boston.data)
-feature_columns = learn.infer_real_valued_columns_from_input(x)
-regressor = learn.LinearRegressor(feature_columns=feature_columns)
-regressor.fit(x, boston.target, steps=200, batch_size=32)
-boston_predictions = list(regressor.predict(x, as_iterable=True))
-score = metrics.mean_squared_error(boston_predictions, boston.target)
-print ("MSE: %f" % score)
-```
-
-## Deep Neural Network
-
-Example of 3 layer network with 10, 20 and 10 hidden units respectively:
-
-```python
-import tensorflow.contrib.learn.python.learn as learn
-from sklearn import datasets, metrics
-
-iris = datasets.load_iris()
-feature_columns = learn.infer_real_valued_columns_from_input(iris.data)
-classifier = learn.DNNClassifier(hidden_units=[10, 20, 10], n_classes=3, feature_columns=feature_columns)
-classifier.fit(iris.data, iris.target, steps=200, batch_size=32)
-iris_predictions = list(classifier.predict(iris.data, as_iterable=True))
-score = metrics.accuracy_score(iris.target, iris_predictions)
-print("Accuracy: %f" % score)
-```
-
-## Custom model
-
-Example of how to pass a custom model to the Estimator:
-
-```python
-from sklearn import datasets
-from sklearn import metrics
-import tensorflow as tf
-import tensorflow.contrib.layers.python.layers as layers
-import tensorflow.contrib.learn.python.learn as learn
-
-iris = datasets.load_iris()
-
-def my_model(features, labels):
-  """DNN with three hidden layers."""
-  # Convert the labels to a one-hot tensor of shape (length of features, 3) and
-  # with a on-value of 1 for each one-hot vector of length 3.
-  labels = tf.one_hot(labels, 3, 1, 0)
-
-  # Create three fully connected layers respectively of size 10, 20, and 10.
-  features = layers.stack(features, layers.fully_connected, [10, 20, 10])
-
-  # Create two tensors respectively for prediction and loss.
-  prediction, loss = (
-      tf.contrib.learn.models.logistic_regression(features, labels)
-  )
-
-  # Create a tensor for training op.
-  train_op = tf.contrib.layers.optimize_loss(
-      loss, tf.contrib.framework.get_global_step(), optimizer='Adagrad',
-      learning_rate=0.1)
-
-  return {'class': tf.argmax(prediction, 1), 'prob': prediction}, loss, train_op
-
-classifier = learn.Estimator(model_fn=my_model)
-classifier.fit(iris.data, iris.target, steps=1000)
-
-y_predicted = [
-  p['class'] for p in classifier.predict(iris.data, as_iterable=True)]
-score = metrics.accuracy_score(iris.target, y_predicted)
-print('Accuracy: {0:f}'.format(score))
-```
-
-## Saving / Restoring models
-
-Each estimator supports a `model_dir` argument, which takes a folder path where all model information will be saved:
-
-```python
-classifier = learn.DNNClassifier(..., model_dir="/tmp/my_model")
-```
-
-If you run multiple `fit` operations on the same `Estimator`, training will resume where the last operation left off, e.g.:
-
-<pre><strong>classifier = learn.DNNClassifier(..., model_dir="/tmp/my_model")
-classifier.fit(..., steps=300)</strong>
-INFO:tensorflow:Create CheckpointSaverHook
-INFO:tensorflow:loss = 2.40115, step = 1
-INFO:tensorflow:Saving checkpoints for 1 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:loss = 0.338706, step = 101
-INFO:tensorflow:loss = 0.159414, step = 201
-INFO:tensorflow:Saving checkpoints for 300 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:Loss for final step: 0.0953846.
-
-<strong>classifier.fit(..., steps=300)</strong>
-INFO:tensorflow:Create CheckpointSaverHook
-INFO:tensorflow:loss = 0.113173, step = 301
-INFO:tensorflow:Saving checkpoints for 301 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:loss = 0.175782, step = 401
-INFO:tensorflow:loss = 0.119735, step = 501
-INFO:tensorflow:Saving checkpoints for 600 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:Loss for final step: 0.0518137.</pre>
-
-To restore checkpoints to a new `Estimator`, just pass it the same `model_dir` argument, e.g.:
-
-<pre><strong>classifier = learn.DNNClassifier(..., model_dir="/tmp/my_model")
-classifier.fit(..., steps=300)</strong>
-INFO:tensorflow:Create CheckpointSaverHook
-INFO:tensorflow:loss = 1.16335, step = 1
-INFO:tensorflow:Saving checkpoints for 1 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:loss = 0.176995, step = 101
-INFO:tensorflow:loss = 0.184573, step = 201
-INFO:tensorflow:Saving checkpoints for 300 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:Loss for final step: 0.0512496.
-
-<strong>classifier2 = learn.DNNClassifier(..., model_dir="/tmp/my_model")
-classifier2.fit(..., steps=300)</strong>
-INFO:tensorflow:Create CheckpointSaverHook
-INFO:tensorflow:loss = 0.0543797, step = 301
-INFO:tensorflow:Saving checkpoints for 301 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:loss = 0.101036, step = 401
-INFO:tensorflow:loss = 0.137956, step = 501
-INFO:tensorflow:Saving checkpoints for 600 into /tmp/leftoff/model.ckpt.
-INFO:tensorflow:Loss for final step: 0.0162506.</pre>
-
-## Summaries
-
-If you supply a `model_dir` argument to your `Estimator`s, TensorFlow will write summaries for ``loss`` and histograms for variables in this directory. (You can also add custom summaries in your custom model function by calling [Summary](https://www.tensorflow.org/api_guides/python/summary) operations.)
-
-To view the summaries in TensorBoard, run the following command, where `logdir` is the `model_dir` for your `Estimator`:
-
-```shell
-tensorboard --logdir=/tmp/tf_examples/my_model_1
-```
-
-and then load the reported URL.
-
-**Graph visualization**
-
-![Text classification RNN Graph](https://raw.githubusercontent.com/tensorflow/skflow/master/g3doc/images/text_classification_rnn_graph.png)
-
-**Loss visualization**
-
-![Text classification RNN Loss](https://raw.githubusercontent.com/tensorflow/skflow/master/g3doc/images/text_classification_rnn_loss.png)
-
-## More examples
-
-See the [examples folder](https://www.tensorflow.org/code/tensorflow/examples/learn) for:
-
--  An easy way to handle [categorical variables](https://www.tensorflow.org/code/tensorflow/examples/learn/text_classification.py) (words are just an example of a categorical variable)
--  Text Classification: see examples for [RNN](https://www.tensorflow.org/code/tensorflow/examples/learn/text_classification_character_rnn.py) and [CNN](https://www.tensorflow.org/code/tensorflow/examples/learn/text_classification_character_cnn.py) on characters
--  [Digit recognition using a CNN](https://www.tensorflow.org/code/tensorflow/examples/learn/mnist.py)
--  And much more!
-- 
GitLab


From a642a6ecf6685a73e7923c94ff69db47d67aa079 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 09:06:26 -0800
Subject: [PATCH 0864/1563] Enabling python configuration to use a remotely
 generated configuration. This will prepare TF for use of Bazel's new remote
 execution api. Change: 154726835

---
 third_party/py/python_configure.bzl | 17 +++++++++++++++--
 third_party/py/remote.BUILD.tpl     | 13 +++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 third_party/py/remote.BUILD.tpl

diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index 460a9b5d05..928bd333c6 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -112,6 +112,7 @@ def _genrule(src_dir, genrule_name, command, outs):
       '    cmd = """\n' +
       command +
       '    """,\n' +
+      '    visibility = ["//visibility:private"],' +
       ')\n'
   )
 
@@ -157,7 +158,7 @@ def _get_numpy_include(repository_ctx, python_bin):
   return result.stdout.splitlines()[0]
 
 
-def _create_python_repository(repository_ctx):
+def _create_local_python_repository(repository_ctx):
   """Creates the repository containing files set up to build with Python."""
   python_include = None
   numpy_include = None
@@ -208,9 +209,20 @@ def _create_python_repository(repository_ctx):
     })
 
 
+def _create_remote_python_repository(repository_ctx):
+  """Creates pointers to a remotely configured repo set up to build with Python.
+  """
+  _tpl(repository_ctx, "remote.BUILD", {
+      "%{REMOTE_PYTHON_REPO}": repository_ctx.attr.remote_config_repo,
+  }, "BUILD")
+
+
 def _python_autoconf_impl(repository_ctx):
   """Implementation of the python_autoconf repository rule."""
-  _create_python_repository(repository_ctx)
+  if repository_ctx.attr.remote_config_repo != "":
+    _create_remote_python_repository(repository_ctx)
+  else:
+    _create_local_python_repository(repository_ctx)
 
 
 python_configure = repository_rule(
@@ -219,6 +231,7 @@ python_configure = repository_rule(
         "local_checks": attr.bool(mandatory = False, default = True),
         "python_include": attr.string(mandatory = False),
         "numpy_include": attr.string(mandatory = False),
+        "remote_config_repo": attr.string(mandatory = False, default =""),
     },
     environ = [
         _PYTHON_BIN_PATH,
diff --git a/third_party/py/remote.BUILD.tpl b/third_party/py/remote.BUILD.tpl
new file mode 100644
index 0000000000..332508ec84
--- /dev/null
+++ b/third_party/py/remote.BUILD.tpl
@@ -0,0 +1,13 @@
+licenses(["restricted"])
+
+package(default_visibility = ["//visibility:public"])
+
+alias(
+    name = "python_headers",
+    actual = "@%{REMOTE_PYTHON_REPO}//:python_headers",
+)
+
+alias(
+    name = "numpy_headers",
+    actual = "@%{REMOTE_PYTHON_REPO}//:numpy_headers",
+)
-- 
GitLab


From 65283e269fac1306089303143daf550b7b1a6658 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 09:50:31 -0800
Subject: [PATCH 0865/1563] Move bucketize op to math_ops. This exposes the
 method as math_op._bucketize, but does not expose it in tf public interface.
 The method is still exposed as tf.contrib.layers.bucketize. Change: 154731971

---
 tensorflow/contrib/BUILD                      |  2 -
 .../contrib/cmake/tf_core_kernels.cmake       |  2 -
 tensorflow/contrib/cmake/tf_core_ops.cmake    |  1 -
 tensorflow/contrib/cmake/tf_python.cmake      |  2 -
 tensorflow/contrib/layers/BUILD               | 49 -------------------
 tensorflow/contrib/layers/kernels/BUILD       | 11 -----
 .../contrib/layers/ops/bucketization_op.cc    | 46 -----------------
 .../layers/python/ops/bucketization_op.py     | 17 ++-----
 tensorflow/core/kernels/BUILD                 |  7 +++
 .../kernels/bucketize_op.cc}                  |  2 +
 tensorflow/core/ops/math_ops.cc               | 31 ++++++++++++
 tensorflow/python/kernel_tests/BUILD          | 12 +++++
 .../kernel_tests/bucketize_op_test.py}        | 36 +++++++++++---
 tensorflow/python/ops/hidden_ops.txt          |  1 +
 tensorflow/python/ops/math_ops.py             |  6 +++
 15 files changed, 91 insertions(+), 134 deletions(-)
 delete mode 100644 tensorflow/contrib/layers/ops/bucketization_op.cc
 rename tensorflow/{contrib/layers/kernels/bucketization_kernel.cc => core/kernels/bucketize_op.cc} (98%)
 rename tensorflow/{contrib/layers/python/kernel_tests/bucketization_op_test.py => python/kernel_tests/bucketize_op_test.py} (55%)

diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index c658508288..616ceb5ca1 100755
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -78,7 +78,6 @@ cc_library(
         "//tensorflow/contrib/batching:batch_ops_kernels",
         "//tensorflow/contrib/factorization/kernels:all_kernels",
         "//tensorflow/contrib/input_pipeline:input_pipeline_ops_kernels",
-        "//tensorflow/contrib/layers:bucketization_op_kernel",
         "//tensorflow/contrib/layers:sparse_feature_cross_op_kernel",
         "//tensorflow/contrib/nccl:nccl_kernels",
         "//tensorflow/contrib/tensor_forest:tensor_forest_kernels",
@@ -93,7 +92,6 @@ cc_library(
         "//tensorflow/contrib/factorization:all_ops",
         "//tensorflow/contrib/framework:all_ops",
         "//tensorflow/contrib/input_pipeline:input_pipeline_ops_op_lib",
-        "//tensorflow/contrib/layers:bucketization_op_op_lib",
         "//tensorflow/contrib/layers:sparse_feature_cross_op_op_lib",
         "//tensorflow/contrib/nccl:nccl_ops_op_lib",
         "//tensorflow/contrib/tensor_forest:tensor_forest_ops_op_lib",
diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index 0c420a0253..a71d9c5869 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -47,9 +47,7 @@ if(tensorflow_BUILD_CONTRIB_KERNELS)
       "${tensorflow_source_dir}/tensorflow/contrib/factorization/ops/factorization_ops.cc"
       #"${tensorflow_source_dir}/tensorflow/contrib/ffmpeg/decode_audio_op.cc"
       #"${tensorflow_source_dir}/tensorflow/contrib/ffmpeg/encode_audio_op.cc"
-      "${tensorflow_source_dir}/tensorflow/contrib/layers/kernels/bucketization_kernel.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/layers/kernels/sparse_feature_cross_kernel.cc"
-      "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/bucketization_op.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/sparse_feature_cross_op.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_manager.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/nccl/kernels/nccl_ops.cc"
diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index 2beb264a54..2a19433a7b 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -70,7 +70,6 @@ GENERATE_CONTRIB_OP_LIBRARY(factorization_factorization "${tensorflow_source_dir
 GENERATE_CONTRIB_OP_LIBRARY(framework_variable "${tensorflow_source_dir}/tensorflow/contrib/framework/ops/variable_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(input_pipeline "${tensorflow_source_dir}/tensorflow/contrib/input_pipeline/ops/input_pipeline_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(image "${tensorflow_source_dir}/tensorflow/contrib/image/ops/image_ops.cc")
-GENERATE_CONTRIB_OP_LIBRARY(layers_bucketization "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/bucketization_op.cc")
 GENERATE_CONTRIB_OP_LIBRARY(layers_sparse_feature_cross "${tensorflow_source_dir}/tensorflow/contrib/layers/ops/sparse_feature_cross_op.cc")
 GENERATE_CONTRIB_OP_LIBRARY(memory_stats "${tensorflow_source_dir}/tensorflow/contrib/memory_stats/ops/memory_stats_ops.cc")
 GENERATE_CONTRIB_OP_LIBRARY(nccl "${tensorflow_source_dir}/tensorflow/contrib/nccl/ops/nccl_ops.cc")
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 39f5edf25d..53ebfbb57d 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -623,8 +623,6 @@ GENERATE_PYTHON_OP_LIB("contrib_input_pipeline_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/input_pipeline/ops/gen_input_pipeline_ops.py)
 GENERATE_PYTHON_OP_LIB("contrib_image_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/image/ops/gen_image_ops.py)
-GENERATE_PYTHON_OP_LIB("contrib_layers_bucketization_ops"
-  DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/layers/ops/gen_bucketization_op.py)
 GENERATE_PYTHON_OP_LIB("contrib_layers_sparse_feature_cross_ops"
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/layers/ops/gen_sparse_feature_cross_op.py)
 GENERATE_PYTHON_OP_LIB("contrib_memory_stats_ops"
diff --git a/tensorflow/contrib/layers/BUILD b/tensorflow/contrib/layers/BUILD
index fc33e4b49e..aba8eabe10 100644
--- a/tensorflow/contrib/layers/BUILD
+++ b/tensorflow/contrib/layers/BUILD
@@ -18,35 +18,6 @@ load("//tensorflow:tensorflow.bzl", "tf_gen_op_libs")
 load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py")
 load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
 
-tf_custom_op_library(
-    # TODO(sibyl-Mooth6ku,ptucker): Understand why 'python/ops/_' is needed and fix it.
-    name = "python/ops/_bucketization_op.so",
-    srcs = [
-        "ops/bucketization_op.cc",
-    ],
-    deps = [
-        "//tensorflow/contrib/layers/kernels:bucketization_kernel",
-    ],
-)
-
-tf_gen_op_libs(
-    op_lib_names = ["bucketization_op"],
-)
-
-tf_gen_op_wrapper_py(
-    name = "bucketization_op",
-    deps = [":bucketization_op_op_lib"],
-)
-
-tf_kernel_library(
-    name = "bucketization_op_kernel",
-    deps = [
-        "//tensorflow/contrib/layers/kernels:bucketization_kernel",
-        "//tensorflow/core:framework",
-    ],
-    alwayslink = 1,
-)
-
 tf_custom_op_library(
     # TODO(sibyl-Mooth6ku,ptucker): Understand why 'python/ops/_' is needed and fix it.
     name = "python/ops/_sparse_feature_cross_op.so",
@@ -97,18 +68,14 @@ tf_custom_op_py_library(
         "python/ops/sparse_ops.py",
     ],
     dso = [
-        ":python/ops/_bucketization_op.so",
         ":python/ops/_sparse_feature_cross_op.so",
     ],
     kernels = [
-        ":bucketization_op_kernel",
         ":sparse_feature_cross_op_kernel",
-        ":bucketization_op_op_lib",
         ":sparse_feature_cross_op_op_lib",
     ],
     srcs_version = "PY2AND3",
     deps = [
-        ":bucketization_op",
         ":sparse_feature_cross_op",
         "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/contrib/lookup:lookup_py",
@@ -315,22 +282,6 @@ py_test(
     ],
 )
 
-py_test(
-    name = "bucketization_op_test",
-    size = "small",
-    srcs = ["python/kernel_tests/bucketization_op_test.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":layers_py",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:platform_test",
-        "//third_party/py/numpy",
-    ],
-)
-
 py_test(
     name = "sparse_feature_cross_op_test",
     size = "medium",
diff --git a/tensorflow/contrib/layers/kernels/BUILD b/tensorflow/contrib/layers/kernels/BUILD
index 7a2d6d8c4f..15b984f938 100644
--- a/tensorflow/contrib/layers/kernels/BUILD
+++ b/tensorflow/contrib/layers/kernels/BUILD
@@ -7,17 +7,6 @@ exports_files(["LICENSE"])
 
 package(default_visibility = ["//tensorflow:__subpackages__"])
 
-cc_library(
-    name = "bucketization_kernel",
-    srcs = ["bucketization_kernel.cc"],
-    deps = [
-        "//tensorflow/core:framework_headers_lib",
-        "//third_party/eigen3",
-        "@protobuf//:protobuf_headers",
-    ],
-    alwayslink = 1,
-)
-
 cc_library(
     name = "sparse_feature_cross_kernel",
     srcs = ["sparse_feature_cross_kernel.cc"],
diff --git a/tensorflow/contrib/layers/ops/bucketization_op.cc b/tensorflow/contrib/layers/ops/bucketization_op.cc
deleted file mode 100644
index d90d47a1eb..0000000000
--- a/tensorflow/contrib/layers/ops/bucketization_op.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/core/framework/common_shape_fns.h"
-#include "tensorflow/core/framework/op.h"
-
-namespace tensorflow {
-
-REGISTER_OP("Bucketize")
-    .Input("input: T")
-    .Output("output: int32")
-    .Attr("T: {int32, int64, float, double}")
-    .Attr("boundaries: list(float)")
-    .SetShapeFn(shape_inference::UnchangedShape)
-    .Doc(R"doc(
-Bucketizes 'input' based on 'boundaries'.
-
-For example, if the inputs are
-    boundaries = [0, 10, 100]
-    input = [[-5, 10000]
-             [150,   10]
-             [5,    100]]
-
-then the output will be
-    output = [[0, 3]
-              [3, 2]
-              [1, 3]]
-
-input: Any shape of Tensor contains with int or float type.
-boundaries: A sorted list of floats gives the boundary of the buckets.
-output: Same shape with 'input', each value of input replaced with bucket index.
-
-)doc");
-}  // namespace tensorflow
diff --git a/tensorflow/contrib/layers/python/ops/bucketization_op.py b/tensorflow/contrib/layers/python/ops/bucketization_op.py
index b941a9b822..f498352855 100644
--- a/tensorflow/contrib/layers/python/ops/bucketization_op.py
+++ b/tensorflow/contrib/layers/python/ops/bucketization_op.py
@@ -17,13 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.layers.ops import gen_bucketization_op
-from tensorflow.contrib.util import loader
-from tensorflow.python.framework import ops
-from tensorflow.python.platform import resource_loader
-
-_bucketization_op = loader.load_op_library(
-    resource_loader.get_path_to_datafile("_bucketization_op.so"))
+from tensorflow.python.ops import math_ops
 
 
 def bucketize(input_tensor, boundaries, name=None):
@@ -43,10 +37,5 @@ def bucketize(input_tensor, boundaries, name=None):
   Raises:
     TypeError: If boundaries is not a list.
   """
-  if not isinstance(boundaries, list):
-    raise TypeError("boundaries must be a list")
-
-  return gen_bucketization_op.bucketize(input_tensor, boundaries, name=name)
-
-
-ops.NotDifferentiable("Bucketize")
+  return math_ops._bucketize(  # pylint: disable=protected-access
+      input_tensor, boundaries=boundaries, name=name)
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 8140f5d67e..231e06d5f4 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -2249,6 +2249,7 @@ cc_library(
         ":batch_matmul_op",
         ":betainc_op",
         ":bincount_op",
+        ":bucketize_op",
         ":cast_op",
         ":check_numerics_op",
         ":cross_op",
@@ -2286,6 +2287,12 @@ tf_kernel_library(
     deps = MATH_DEPS,
 )
 
+tf_kernel_library(
+    name = "bucketize_op",
+    prefix = "bucketize_op",
+    deps = MATH_DEPS,
+)
+
 tf_kernel_library(
     name = "cast_op",
     prefix = "cast_op",
diff --git a/tensorflow/contrib/layers/kernels/bucketization_kernel.cc b/tensorflow/core/kernels/bucketize_op.cc
similarity index 98%
rename from tensorflow/contrib/layers/kernels/bucketization_kernel.cc
rename to tensorflow/core/kernels/bucketize_op.cc
index 5cfa39de76..93c2d01221 100644
--- a/tensorflow/contrib/layers/kernels/bucketization_kernel.cc
+++ b/tensorflow/core/kernels/bucketize_op.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+// See docs in ../ops/math_ops.cc.
+
 #include <algorithm>
 #include <vector>
 
diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index 0942e8ae75..aafbd1b5cc 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -2356,4 +2356,35 @@ output_max: the computed max output.
 
 )doc");
 
+// --------------------------------------------------------------------------
+
+REGISTER_OP("Bucketize")
+    .Input("input: T")
+    .Output("output: int32")
+    .Attr("T: {int32, int64, float, double}")
+    .Attr("boundaries: list(float)")
+    .SetShapeFn(shape_inference::UnchangedShape)
+    .Doc(R"doc(
+Bucketizes 'input' based on 'boundaries'.
+
+For example, if the inputs are
+    boundaries = [0, 10, 100]
+    input = [[-5, 10000]
+             [150,   10]
+             [5,    100]]
+
+then the output will be
+    output = [[0, 3]
+              [3, 2]
+              [1, 3]]
+
+input: Any shape of Tensor contains with int or float type.
+boundaries: A sorted list of floats gives the boundary of the buckets.
+output: Same shape with 'input', each value of input replaced with bucket index.
+
+@compatibility(numpy)
+Equivalent to np.digitize.
+@end_compatibility
+)doc");
+
 }  // namespace tensorflow
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 06a0aa468a..a81e6f5482 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2569,6 +2569,18 @@ tf_py_test(
     ],
 )
 
+tf_py_test(
+    name = "bucketize_op_test",
+    size = "small",
+    srcs = ["bucketize_op_test.py"],
+    additional_deps = [
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/contrib/layers/python/kernel_tests/bucketization_op_test.py b/tensorflow/python/kernel_tests/bucketize_op_test.py
similarity index 55%
rename from tensorflow/contrib/layers/python/kernel_tests/bucketization_op_test.py
rename to tensorflow/python/kernel_tests/bucketize_op_test.py
index abc6cc5674..ed53cc6294 100644
--- a/tensorflow/contrib/layers/python/kernel_tests/bucketization_op_test.py
+++ b/tensorflow/python/kernel_tests/bucketize_op_test.py
@@ -12,35 +12,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for bucketization_op."""
+"""Tests for bucketize_op."""
 
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.layers.python.ops import bucketization_op
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import errors_impl
+from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 
 
 class BucketizationOpTest(test.TestCase):
 
-  def test_normal_usecase(self):
-    op = bucketization_op.bucketize(
+  def testInt(self):
+    op = math_ops._bucketize(
         constant_op.constant([-5, 0, 2, 3, 5, 8, 10, 11, 12]),
         boundaries=[0, 3, 8, 11])
     expected_out = [0, 1, 1, 2, 2, 3, 3, 4, 4]
     with self.test_session() as sess:
       self.assertAllEqual(expected_out, sess.run(op))
 
-  def test_invalid_boundaries_order(self):
-    op = bucketization_op.bucketize(
+  def testFloat(self):
+    op = math_ops._bucketize(
+        constant_op.constant([-5., 0., 2., 3., 5., 8., 10., 11., 12.]),
+        boundaries=[0., 3., 8., 11.])
+    expected_out = [0, 1, 1, 2, 2, 3, 3, 4, 4]
+    with self.test_session() as sess:
+      self.assertAllEqual(expected_out, sess.run(op))
+
+  def test2DInput(self):
+    op = math_ops._bucketize(
+        constant_op.constant([[-5, 0, 2, 3, 5], [8, 10, 11, 12, 0]]),
+        boundaries=[0, 3, 8, 11])
+    expected_out = [[0, 1, 1, 2, 2], [3, 3, 4, 4, 1]]
+    with self.test_session() as sess:
+      self.assertAllEqual(expected_out, sess.run(op))
+
+  def testInvalidBoundariesOrder(self):
+    op = math_ops._bucketize(
         constant_op.constant([-5, 0]), boundaries=[0, 8, 3, 11])
     with self.test_session() as sess:
-      with self.assertRaises(errors_impl.InvalidArgumentError):
+      with self.assertRaisesRegexp(
+          errors_impl.InvalidArgumentError, "Expected sorted boundaries"):
         sess.run(op)
 
+  def testBoundariesNotList(self):
+    with self.assertRaisesRegexp(
+        TypeError, "Expected list for attr boundaries"):
+      math_ops._bucketize(constant_op.constant([-5, 0]), boundaries=0)
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/ops/hidden_ops.txt b/tensorflow/python/ops/hidden_ops.txt
index f302477068..9022e1453d 100644
--- a/tensorflow/python/ops/hidden_ops.txt
+++ b/tensorflow/python/ops/hidden_ops.txt
@@ -220,6 +220,7 @@ BatchFFT3D
 BatchIFFT
 BatchIFFT2D
 BatchIFFT3D
+Bucketize
 Complex
 ComplexAbs
 Conj
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 572e7b71db..92e8723ced 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -241,6 +241,12 @@ def abs(x, name=None):
 # pylint: enable=g-docstring-has-escape
 
 
+# pylint: disable=redefined-builtin
+def _bucketize(input, boundaries, name=None):
+  return gen_math_ops._bucketize(input=input, boundaries=boundaries, name=name)
+# pylint: enable=redefined-builtin
+
+
 class DivideDelegateWithName(object):
   """Use Python2/Python3 division delegation to implement divide for tensors."""
 
-- 
GitLab


From 148df55690df08ad0ca9510bbce601f467c10b81 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 10:00:08 -0800
Subject: [PATCH 0866/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154733347

---
 tensorflow/go/op/wrappers.go | 38 ++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 74f05c8638..001e5f9feb 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -18744,6 +18744,44 @@ func SparseReshape(scope *Scope, input_indices tf.Output, input_shape tf.Output,
 	return op.Output(0), op.Output(1)
 }
 
+// Bucketizes 'input' based on 'boundaries'.
+//
+// For example, if the inputs are
+//     boundaries = [0, 10, 100]
+//     input = [[-5, 10000]
+//              [150,   10]
+//              [5,    100]]
+//
+// then the output will be
+//     output = [[0, 3]
+//               [3, 2]
+//               [1, 3]]
+//
+// Arguments:
+//	input: Any shape of Tensor contains with int or float type.
+//	boundaries: A sorted list of floats gives the boundary of the buckets.
+//
+// Returns Same shape with 'input', each value of input replaced with bucket index.
+//
+// @compatibility(numpy)
+// Equivalent to np.digitize.
+// @end_compatibility
+func Bucketize(scope *Scope, input tf.Output, boundaries []float32) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"boundaries": boundaries}
+	opspec := tf.OpSpec{
+		Type: "Bucketize",
+		Input: []tf.Input{
+			input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes the product along segments of a tensor.
 //
 // Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
-- 
GitLab


From 0d0a36aa3c6ab72ef91a02f7ab301bafcd3bdf60 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 10:22:04 -0800
Subject: [PATCH 0867/1563] call InitMain in hvx ops support checker Change:
 154736553

---
 .../hvx_ops_support_checker/hvx_ops_support_checker_main.cc   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
index e905d4b322..03b4dcbfa8 100644
--- a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
+++ b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/platform/init_main.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/util/command_line_flags.h"
 #include "tensorflow/tools/graph_transforms/transform_utils.h"
@@ -36,6 +37,9 @@ static int ParseFlags(int argc, char* argv[], string* in_graph) {
       Flag("in_graph", in_graph, "input graph file name"),
   };
   CHECK(Flags::Parse(&argc, argv, flag_list));
+  // We need to call this to set up global state for TensorFlow.
+  port::InitMain(argv[0], &argc, &argv);
+
   string usage = Flags::Usage(argv[0], flag_list);
   CHECK(!in_graph->empty()) << "in_graph graph can't be empty.\n" << usage;
 
-- 
GitLab


From 24b049877b8a056200f1c0d125d345c0af637aa1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 10:33:33 -0800
Subject: [PATCH 0868/1563] Update ops-related pbtxt files. Change: 154738165

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 27 ++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 32 +++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 8434251f53..439b022036 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -3592,6 +3592,33 @@ op {
     }
   }
 }
+op {
+  name: "Bucketize"
+  input_arg {
+    name: "input"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    type: DT_INT32
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "boundaries"
+    type: "list(float)"
+  }
+}
 op {
   name: "CTCBeamSearchDecoder"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index bd963a5266..cb313a6c27 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -3633,6 +3633,38 @@ op {
   summary: "Return the reduction indices for computing gradients of s0 op s1 with broadcast."
   description: "This is typically used by gradient computations for a broadcasting operation."
 }
+op {
+  name: "Bucketize"
+  input_arg {
+    name: "input"
+    description: "Any shape of Tensor contains with int or float type."
+    type_attr: "T"
+  }
+  output_arg {
+    name: "output"
+    description: "Same shape with \'input\', each value of input replaced with bucket index.\n\n@compatibility(numpy)\nEquivalent to np.digitize.\n@end_compatibility"
+    type: DT_INT32
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  attr {
+    name: "boundaries"
+    type: "list(float)"
+    description: "A sorted list of floats gives the boundary of the buckets."
+  }
+  summary: "Bucketizes \'input\' based on \'boundaries\'."
+  description: "For example, if the inputs are\n    boundaries = [0, 10, 100]\n    input = [[-5, 10000]\n             [150,   10]\n             [5,    100]]\n\nthen the output will be\n    output = [[0, 3]\n              [3, 2]\n              [1, 3]]"
+}
 op {
   name: "CTCBeamSearchDecoder"
   input_arg {
-- 
GitLab


From 8da0af04109a42db4d4b489f455592e11ce000ec Mon Sep 17 00:00:00 2001
From: zhengjiajin <zhengjiajin2016@gmail.com>
Date: Tue, 2 May 2017 03:13:07 +0800
Subject: [PATCH 0869/1563] update doc (#9534)

---
 tensorflow/docs_src/get_started/input_fn.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/input_fn.md b/tensorflow/docs_src/get_started/input_fn.md
index 74ed5fbebf..a053617b58 100644
--- a/tensorflow/docs_src/get_started/input_fn.md
+++ b/tensorflow/docs_src/get_started/input_fn.md
@@ -12,7 +12,7 @@ When training a neural network using tf.contrib.learn, it's possible to pass
 your feature and target data directly into your `fit`, `evaluate`, or `predict`
 operations. Here's an example taken from the @{$tflearn$tf.contrib.learn quickstart tutorial}:
 
-```py
+```python
 training_set = tf.contrib.learn.datasets.base.load_csv_with_header(
     filename=IRIS_TRAINING, target_dtype=np.int, features_dtype=np.float32)
 test_set = tf.contrib.learn.datasets.base.load_csv_with_header(
-- 
GitLab


From db5d6324480ce76b1eb7d51221aa504f77954e95 Mon Sep 17 00:00:00 2001
From: Martin Wicke <martin.wicke@gmail.com>
Date: Mon, 1 May 2017 12:24:00 -0700
Subject: [PATCH 0870/1563] Add notes about republishing (#9524)

* Add notes about republishing

* Update documentation.md
---
 .../docs_src/community/documentation.md       | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/tensorflow/docs_src/community/documentation.md b/tensorflow/docs_src/community/documentation.md
index be18d3e8be..27b8c8d302 100644
--- a/tensorflow/docs_src/community/documentation.md
+++ b/tensorflow/docs_src/community/documentation.md
@@ -4,12 +4,24 @@ We welcome contributions to the Tensorflow documentation from the community.
 This document explains how you can contribute to that documentation. In
 particular, this document explains the following:
 
-- Where the documentation is located.
-- How to make conformant edits.
-- How to build and test your documentation changes before you submit them.
-
-You can view Tensorflow documentation on tensorflow.org, and you can view and
-edit the raw files on Github.
+* Where the documentation is located.
+* How to make conformant edits.
+* How to build and test your documentation changes before you submit them.
+
+You can view Tensorflow documentation on https://www.tensorflow.org, and you
+can view and edit the raw files on Github. We're publishing our docs on Github
+so everybody can contribute. Whatever gets checked in tensorflow/docs_src will
+be published soon after on https://www.tensorflow.org. 
+
+Republishing TensorFlow documentation in different forms is absolutely allowed,
+but we are unlikely to accept other documentation formats (or the tooling to
+generate them) into our repository. If you do choose to republish our
+documentation in another form, please be sure to include:
+
+* The version of the API this represents (i.e. r1.0, master, etc.)
+* The commit or version from which the documentation was generated
+* Where to get the latest documentation (that is, https://www.tensorflow.org)
+* The Apache 2.0 license.
 
 ## A Note on Versions
 
-- 
GitLab


From 03327190420dd5b1c34a5ffdd0000aff40980ed5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 11:02:10 -0800
Subject: [PATCH 0871/1563] Adding HighwayWrapper for rnn cell that creates a
 highway skip connection between the cell's input and output activations.
 Change: 154741723

---
 tensorflow/contrib/rnn/__init__.py            |  1 +
 .../rnn/python/kernel_tests/rnn_cell_test.py  | 24 ++++++
 tensorflow/contrib/rnn/python/ops/rnn_cell.py | 83 +++++++++++++++++++
 3 files changed, 108 insertions(+)

diff --git a/tensorflow/contrib/rnn/__init__.py b/tensorflow/contrib/rnn/__init__.py
index ce1ed7f491..a744878124 100644
--- a/tensorflow/contrib/rnn/__init__.py
+++ b/tensorflow/contrib/rnn/__init__.py
@@ -43,6 +43,7 @@ See @{$python/contrib.rnn} guide.
 @@BidirectionalGridLSTMCell
 @@NASCell
 @@PhasedLSTMCell
+@@HighwayWrapper
 
 ### RNNCell wrappers
 @@AttentionCellWrapper
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
index 8b40fc068f..55fd7e7a51 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
@@ -882,6 +882,30 @@ class RNNCellTest(test.TestCase):
         self.assertAllClose(res[1].c, expected_state_c)
         self.assertAllClose(res[1].h, expected_state_h)
 
+  def testHighwayWrapper(self):
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "base_cell", initializer=init_ops.constant_initializer(0.5)):
+        x = array_ops.zeros([1, 3])
+        m = array_ops.zeros([1, 3])
+        base_cell = core_rnn_cell_impl.GRUCell(3)
+        g, m_new = base_cell(x, m)
+      with variable_scope.variable_scope(
+          "hw_cell", initializer=init_ops.constant_initializer(0.5)):
+        hw_cell = rnn_cell.HighwayWrapper(
+            core_rnn_cell_impl.GRUCell(3), carry_bias_init=-100.0)
+        g_res, m_new_res = hw_cell(x, m)
+        sess.run([variables.global_variables_initializer()])
+      res = sess.run([g, g_res, m_new, m_new_res], {
+          x: np.array([[1., 1., 1.]]),
+          m: np.array([[0.1, 0.1, 0.1]])
+      })
+      # As carry_bias_init is very negative, the carry gate is 'open' and the
+      # transform gate is 'closed'. This means the output equals the input.
+      self.assertAllClose(res[1], res[0])
+      # States are left untouched
+      self.assertAllClose(res[2], res[3])
+
 
 class LayerNormBasicLSTMCellTest(test.TestCase):
 
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index 83e8c2777f..acba77f0e1 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -1157,6 +1157,89 @@ class AttentionCellWrapper(core_rnn_cell.RNNCell):
       return new_attns, new_attn_states
 
 
+class HighwayWrapper(core_rnn_cell.RNNCell):
+  """RNNCell wrapper that adds highway connection on cell input and output.
+
+  Based on:
+    R. K. Srivastava, K. Greff, and J. Schmidhuber, "Highway networks",
+    arXiv preprint arXiv:1505.00387, 2015.
+    https://arxiv.org/abs/1505.00387
+  """
+
+  def __init__(self, cell,
+               couple_carry_transform_gates=True,
+               carry_bias_init=1.0):
+    """Constructs a `HighwayWrapper` for `cell`.
+
+    Args:
+      cell: An instance of `RNNCell`.
+      couple_carry_transform_gates: boolean, should the Carry and Transform gate
+        be coupled.
+      carry_bias_init: float, carry gates bias initialization.
+    """
+    self._cell = cell
+    self._couple_carry_transform_gates = couple_carry_transform_gates
+    self._carry_bias_init = carry_bias_init
+
+  @property
+  def state_size(self):
+    return self._cell.state_size
+
+  @property
+  def output_size(self):
+    return self._cell.output_size
+
+  def zero_state(self, batch_size, dtype):
+    with ops.name_scope(type(self).__name__ + "ZeroState", values=[batch_size]):
+      return self._cell.zero_state(batch_size, dtype)
+
+  def _highway(self, inp, out):
+    input_size = inp.get_shape().with_rank(2)[1].value
+    carry_weight = vs.get_variable("carry_w", [input_size, input_size])
+    carry_bias = vs.get_variable(
+        "carry_b", [input_size],
+        initializer=init_ops.constant_initializer(
+            self._carry_bias_init))
+    carry = math_ops.sigmoid(nn_ops.xw_plus_b(inp, carry_weight, carry_bias))
+    if self._couple_carry_transform_gates:
+      transform = 1 - carry
+    else:
+      transform_weight = vs.get_variable("transform_w",
+                                         [input_size, input_size])
+      transform_bias = vs.get_variable(
+          "transform_b", [input_size],
+          initializer=init_ops.constant_initializer(
+              -self._carry_bias_init))
+      transform = math_ops.sigmoid(nn_ops.xw_plus_b(inp,
+                                                    transform_weight,
+                                                    transform_bias))
+    return inp * carry + out * transform
+
+  def __call__(self, inputs, state, scope=None):
+    """Run the cell and add its inputs to its outputs.
+
+    Args:
+      inputs: cell inputs.
+      state: cell state.
+      scope: optional cell scope.
+
+    Returns:
+      Tuple of cell outputs and new state.
+
+    Raises:
+      TypeError: If cell inputs and outputs have different structure (type).
+      ValueError: If cell inputs and outputs have different structure (value).
+    """
+    outputs, new_state = self._cell(inputs, state, scope=scope)
+    nest.assert_same_structure(inputs, outputs)
+    # Ensure shapes match
+    def assert_shape_match(inp, out):
+      inp.get_shape().assert_is_compatible_with(out.get_shape())
+    nest.map_structure(assert_shape_match, inputs, outputs)
+    res_outputs = nest.map_structure(self._highway, inputs, outputs)
+    return (res_outputs, new_state)
+
+
 class LayerNormBasicLSTMCell(core_rnn_cell.RNNCell):
   """LSTM unit with layer normalization and recurrent dropout.
 
-- 
GitLab


From 9528658bb51d3a4e14ec1014e8fdd8e0076805e8 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 1 May 2017 11:15:23 -0800
Subject: [PATCH 0872/1563] LookupTable ops go to V2, use resource handles.

There's some duplicate documentation; yutaka will deprecate the old ops
and remove the duplicate docs, update the shape tests to point to the new ops,
and modify lookup_ops.py to use the _v2 ops.
Change: 154743350
---
 tensorflow/core/framework/resource_mgr.cc     |   8 +
 tensorflow/core/framework/resource_mgr.h      |   2 +
 .../core/kernels/lookup_table_init_op.cc      |  13 +-
 tensorflow/core/kernels/lookup_table_op.cc    |  51 ++-
 tensorflow/core/kernels/lookup_table_op.h     |  72 ++--
 tensorflow/core/kernels/lookup_util.cc        |  50 ++-
 tensorflow/core/ops/data_flow_ops.cc          | 312 ++++++++++++++++++
 tensorflow/python/ops/hidden_ops.txt          |  11 +
 8 files changed, 470 insertions(+), 49 deletions(-)

diff --git a/tensorflow/core/framework/resource_mgr.cc b/tensorflow/core/framework/resource_mgr.cc
index 7f9fe084ba..ab7dd0c547 100644
--- a/tensorflow/core/framework/resource_mgr.cc
+++ b/tensorflow/core/framework/resource_mgr.cc
@@ -246,6 +246,14 @@ ResourceHandle HandleFromInput(OpKernelContext* ctx, int input) {
   return ctx->input(input).flat<ResourceHandle>()(0);
 }
 
+Status HandleFromInput(OpKernelContext* ctx, StringPiece input,
+                       ResourceHandle* handle) {
+  const Tensor* tensor;
+  TF_RETURN_IF_ERROR(ctx->input(input, &tensor));
+  *handle = tensor->flat<ResourceHandle>()(0);
+  return Status::OK();
+}
+
 Status DeleteResource(OpKernelContext* ctx, const ResourceHandle& p) {
   TF_RETURN_IF_ERROR(internal::ValidateDevice(ctx, p));
   return ctx->resource_manager()->Delete(p);
diff --git a/tensorflow/core/framework/resource_mgr.h b/tensorflow/core/framework/resource_mgr.h
index fe6e09378f..26a5766569 100644
--- a/tensorflow/core/framework/resource_mgr.h
+++ b/tensorflow/core/framework/resource_mgr.h
@@ -211,6 +211,8 @@ ResourceHandle MakePerStepResourceHandle(OpKernelContext* ctx,
 
 // Returns a resource handle from a numbered op input.
 ResourceHandle HandleFromInput(OpKernelContext* ctx, int input);
+Status HandleFromInput(OpKernelContext* ctx, StringPiece input,
+                       ResourceHandle* handle);
 
 // Create a resource pointed by a given resource handle.
 template <typename T>
diff --git a/tensorflow/core/kernels/lookup_table_init_op.cc b/tensorflow/core/kernels/lookup_table_init_op.cc
index bde1d0360a..ada6fe8d95 100644
--- a/tensorflow/core/kernels/lookup_table_init_op.cc
+++ b/tensorflow/core/kernels/lookup_table_init_op.cc
@@ -367,7 +367,9 @@ class InitializeTableOp : public OpKernel {
                    GetInitializableLookupTable("table_handle", ctx, &table));
     core::ScopedUnref unref_me(table);
 
-    DataTypeVector expected_inputs = {DT_STRING_REF, table->key_dtype(),
+    DataType expected_input_0 =
+        (ctx->input_dtype(0) == DT_RESOURCE) ? DT_RESOURCE : DT_STRING_REF;
+    DataTypeVector expected_inputs = {expected_input_0, table->key_dtype(),
                                       table->value_dtype()};
     DataTypeVector expected_outputs = {};
     OP_REQUIRES_OK(ctx, ctx->MatchSignature(expected_inputs, expected_outputs));
@@ -408,6 +410,8 @@ class InitializeTableOp : public OpKernel {
 
 REGISTER_KERNEL_BUILDER(Name("InitializeTable").Device(DEVICE_CPU),
                         InitializeTableOp);
+REGISTER_KERNEL_BUILDER(Name("InitializeTableV2").Device(DEVICE_CPU),
+                        InitializeTableOp);
 
 // Kernel to initialize a lookup table from a text file.
 //
@@ -433,7 +437,9 @@ class InitializeTableFromTextFileOp : public OpKernel {
                    GetInitializableLookupTable("table_handle", ctx, &table));
     core::ScopedUnref unref_me(table);
 
-    DataTypeVector expected_inputs = {DT_STRING_REF, DT_STRING};
+    DataType expected_input_0 =
+        (ctx->input_dtype(0) == DT_RESOURCE) ? DT_RESOURCE : DT_STRING_REF;
+    DataTypeVector expected_inputs = {expected_input_0, DT_STRING};
     DataTypeVector expected_outputs = {};
     OP_REQUIRES_OK(ctx, ctx->MatchSignature(expected_inputs, expected_outputs));
 
@@ -472,5 +478,8 @@ class InitializeTableFromTextFileOp : public OpKernel {
 
 REGISTER_KERNEL_BUILDER(Name("InitializeTableFromTextFile").Device(DEVICE_CPU),
                         InitializeTableFromTextFileOp);
+REGISTER_KERNEL_BUILDER(
+    Name("InitializeTableFromTextFileV2").Device(DEVICE_CPU),
+    InitializeTableFromTextFileOp);
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/lookup_table_op.cc b/tensorflow/core/kernels/lookup_table_op.cc
index 0a065e37d7..11ce2a71dc 100644
--- a/tensorflow/core/kernels/lookup_table_op.cc
+++ b/tensorflow/core/kernels/lookup_table_op.cc
@@ -624,7 +624,10 @@ class LookupTableFindOp : public OpKernel {
     OP_REQUIRES_OK(ctx, GetLookupTable("table_handle", ctx, &table));
     core::ScopedUnref unref_me(table);
 
-    DataTypeVector expected_inputs = {DT_STRING_REF, table->key_dtype(),
+    // Input 0 could be a STRING_REF or a RESOURCE
+    DataType expected_input_0 =
+        (ctx->input_dtype(0) == DT_RESOURCE) ? DT_RESOURCE : DT_STRING_REF;
+    DataTypeVector expected_inputs = {expected_input_0, table->key_dtype(),
                                       table->value_dtype()};
     DataTypeVector expected_outputs = {table->value_dtype()};
     OP_REQUIRES_OK(ctx, ctx->MatchSignature(expected_inputs, expected_outputs));
@@ -647,6 +650,8 @@ class LookupTableFindOp : public OpKernel {
 
 REGISTER_KERNEL_BUILDER(Name("LookupTableFind").Device(DEVICE_CPU),
                         LookupTableFindOp);
+REGISTER_KERNEL_BUILDER(Name("LookupTableFindV2").Device(DEVICE_CPU),
+                        LookupTableFindOp);
 
 // Table insert op.
 class LookupTableInsertOp : public OpKernel {
@@ -658,7 +663,9 @@ class LookupTableInsertOp : public OpKernel {
     OP_REQUIRES_OK(ctx, GetLookupTable("table_handle", ctx, &table));
     core::ScopedUnref unref_me(table);
 
-    DataTypeVector expected_inputs = {DT_STRING_REF, table->key_dtype(),
+    DataType expected_input_0 =
+        (ctx->input_dtype(0) == DT_RESOURCE) ? DT_RESOURCE : DT_STRING_REF;
+    DataTypeVector expected_inputs = {expected_input_0, table->key_dtype(),
                                       table->value_dtype()};
     OP_REQUIRES_OK(ctx, ctx->MatchSignature(expected_inputs, {}));
 
@@ -680,6 +687,8 @@ class LookupTableInsertOp : public OpKernel {
 
 REGISTER_KERNEL_BUILDER(Name("LookupTableInsert").Device(DEVICE_CPU),
                         LookupTableInsertOp);
+REGISTER_KERNEL_BUILDER(Name("LookupTableInsertV2").Device(DEVICE_CPU),
+                        LookupTableInsertOp);
 
 // Op that returns the size of the given table.
 class LookupTableSizeOp : public OpKernel {
@@ -699,6 +708,8 @@ class LookupTableSizeOp : public OpKernel {
 
 REGISTER_KERNEL_BUILDER(Name("LookupTableSize").Device(DEVICE_CPU),
                         LookupTableSizeOp);
+REGISTER_KERNEL_BUILDER(Name("LookupTableSizeV2").Device(DEVICE_CPU),
+                        LookupTableSizeOp);
 
 // Op that outputs tensors of all keys and all values.
 class LookupTableExportOp : public OpKernel {
@@ -716,6 +727,8 @@ class LookupTableExportOp : public OpKernel {
 
 REGISTER_KERNEL_BUILDER(Name("LookupTableExport").Device(DEVICE_CPU),
                         LookupTableExportOp);
+REGISTER_KERNEL_BUILDER(Name("LookupTableExportV2").Device(DEVICE_CPU),
+                        LookupTableExportOp);
 
 // Clear the table and insert data.
 class LookupTableImportOp : public OpKernel {
@@ -727,7 +740,9 @@ class LookupTableImportOp : public OpKernel {
     OP_REQUIRES_OK(ctx, GetLookupTable("table_handle", ctx, &table));
     core::ScopedUnref unref_me(table);
 
-    DataTypeVector expected_inputs = {DT_STRING_REF, table->key_dtype(),
+    DataType expected_input_0 =
+        (ctx->input_dtype(0) == DT_RESOURCE) ? DT_RESOURCE : DT_STRING_REF;
+    DataTypeVector expected_inputs = {expected_input_0, table->key_dtype(),
                                       table->value_dtype()};
     OP_REQUIRES_OK(ctx, ctx->MatchSignature(expected_inputs, {}));
 
@@ -749,6 +764,8 @@ class LookupTableImportOp : public OpKernel {
 
 REGISTER_KERNEL_BUILDER(Name("LookupTableImport").Device(DEVICE_CPU),
                         LookupTableImportOp);
+REGISTER_KERNEL_BUILDER(Name("LookupTableImportV2").Device(DEVICE_CPU),
+                        LookupTableImportOp);
 
 // Register the HashTable op with the currently supported key and value types.
 #define REGISTER_KERNEL(key_dtype, value_dtype)                           \
@@ -757,6 +774,13 @@ REGISTER_KERNEL_BUILDER(Name("LookupTableImport").Device(DEVICE_CPU),
           .Device(DEVICE_CPU)                                             \
           .TypeConstraint<key_dtype>("key_dtype")                         \
           .TypeConstraint<value_dtype>("value_dtype"),                    \
+      LookupTableOp<lookup::HashTable<key_dtype, value_dtype>, key_dtype, \
+                    value_dtype>)                                         \
+  REGISTER_KERNEL_BUILDER(                                                \
+      Name("HashTableV2")                                                 \
+          .Device(DEVICE_CPU)                                             \
+          .TypeConstraint<key_dtype>("key_dtype")                         \
+          .TypeConstraint<value_dtype>("value_dtype"),                    \
       LookupTableOp<lookup::HashTable<key_dtype, value_dtype>, key_dtype, \
                     value_dtype>)
 
@@ -778,6 +802,13 @@ REGISTER_KERNEL(string, bool);
           .Device(DEVICE_CPU)                                                  \
           .TypeConstraint<key_dtype>("key_dtype")                              \
           .TypeConstraint<value_dtype>("value_dtype"),                         \
+      LookupTableOp<lookup::MutableHashTableOfScalars<key_dtype, value_dtype>, \
+                    key_dtype, value_dtype>)                                   \
+  REGISTER_KERNEL_BUILDER(                                                     \
+      Name("MutableHashTableV2")                                               \
+          .Device(DEVICE_CPU)                                                  \
+          .TypeConstraint<key_dtype>("key_dtype")                              \
+          .TypeConstraint<value_dtype>("value_dtype"),                         \
       LookupTableOp<lookup::MutableHashTableOfScalars<key_dtype, value_dtype>, \
                     key_dtype, value_dtype>)
 
@@ -796,6 +827,13 @@ REGISTER_KERNEL(int64, float);
           .Device(DEVICE_CPU)                                                  \
           .TypeConstraint<key_dtype>("key_dtype")                              \
           .TypeConstraint<value_dtype>("value_dtype"),                         \
+      LookupTableOp<lookup::MutableHashTableOfTensors<key_dtype, value_dtype>, \
+                    key_dtype, value_dtype>)                                   \
+  REGISTER_KERNEL_BUILDER(                                                     \
+      Name("MutableHashTableOfTensorsV2")                                      \
+          .Device(DEVICE_CPU)                                                  \
+          .TypeConstraint<key_dtype>("key_dtype")                              \
+          .TypeConstraint<value_dtype>("value_dtype"),                         \
       LookupTableOp<lookup::MutableHashTableOfTensors<key_dtype, value_dtype>, \
                     key_dtype, value_dtype>)
 
@@ -813,6 +851,13 @@ REGISTER_KERNEL(string, bool);
           .Device(DEVICE_CPU)                                              \
           .TypeConstraint<key_dtype>("key_dtype")                          \
           .TypeConstraint<value_dtype>("value_dtype"),                     \
+      LookupTableOp<lookup::MutableDenseHashTable<key_dtype, value_dtype>, \
+                    key_dtype, value_dtype>)                               \
+  REGISTER_KERNEL_BUILDER(                                                 \
+      Name("MutableDenseHashTableV2")                                      \
+          .Device(DEVICE_CPU)                                              \
+          .TypeConstraint<key_dtype>("key_dtype")                          \
+          .TypeConstraint<value_dtype>("value_dtype"),                     \
       LookupTableOp<lookup::MutableDenseHashTable<key_dtype, value_dtype>, \
                     key_dtype, value_dtype>)
 
diff --git a/tensorflow/core/kernels/lookup_table_op.h b/tensorflow/core/kernels/lookup_table_op.h
index ae253b4dc9..4cd25a3cc6 100644
--- a/tensorflow/core/kernels/lookup_table_op.h
+++ b/tensorflow/core/kernels/lookup_table_op.h
@@ -51,40 +51,52 @@ class LookupTableOp : public OpKernel {
   // ctx is not owned by this function.
   void Compute(OpKernelContext* ctx) override {
     mutex_lock l(mu_);
+
     if (!table_handle_set_) {
       OP_REQUIRES_OK(ctx, cinfo_.Init(ctx->resource_manager(), def(),
                                       use_node_name_sharing_));
-      auto creator = [ctx, this](lookup::LookupInterface** ret) {
-        lookup::LookupInterface* container = new Container(ctx, this);
-        if (!ctx->status().ok()) {
-          container->Unref();
-          return ctx->status();
-        }
-        if (ctx->track_allocations()) {
-          ctx->record_device_persistent_memory_allocation(
-              container->MemoryUsed());
-        }
-        *ret = container;
-        return Status::OK();
-      };
-
-      lookup::LookupInterface* table = nullptr;
-      OP_REQUIRES_OK(
-          ctx, cinfo_.resource_manager()
-                   ->template LookupOrCreate<lookup::LookupInterface>(
-                       cinfo_.container(), cinfo_.name(), &table, creator));
-      core::ScopedUnref unref_me(table);
-
-      OP_REQUIRES_OK(ctx, lookup::CheckTableDataTypes(
-                              *table, DataTypeToEnum<key_dtype>::v(),
-                              DataTypeToEnum<value_dtype>::v(), cinfo_.name()));
-
-      auto h = table_handle_.AccessTensor(ctx)->template flat<string>();
-      h(0) = cinfo_.container();
-      h(1) = cinfo_.name();
-      table_handle_set_ = true;
     }
-    ctx->set_output_ref(0, &mu_, table_handle_.AccessTensor(ctx));
+
+    auto creator = [ctx, this](lookup::LookupInterface** ret) {
+      lookup::LookupInterface* container = new Container(ctx, this);
+      if (!ctx->status().ok()) {
+        container->Unref();
+        return ctx->status();
+      }
+      if (ctx->track_allocations()) {
+        ctx->record_device_persistent_memory_allocation(
+            container->MemoryUsed());
+      }
+      *ret = container;
+      return Status::OK();
+    };
+
+    lookup::LookupInterface* table = nullptr;
+    OP_REQUIRES_OK(ctx,
+                   cinfo_.resource_manager()
+                       ->template LookupOrCreate<lookup::LookupInterface>(
+                           cinfo_.container(), cinfo_.name(), &table, creator));
+    core::ScopedUnref unref_me(table);
+
+    OP_REQUIRES_OK(ctx, lookup::CheckTableDataTypes(
+                            *table, DataTypeToEnum<key_dtype>::v(),
+                            DataTypeToEnum<value_dtype>::v(), cinfo_.name()));
+
+    if (ctx->expected_output_dtype(0) == DT_RESOURCE) {
+      Tensor* handle;
+      OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &handle));
+      handle->scalar<ResourceHandle>()() =
+          MakeResourceHandle<lookup::LookupInterface>(ctx, cinfo_.container(),
+                                                      cinfo_.name());
+    } else {
+      if (!table_handle_set_) {
+        auto h = table_handle_.AccessTensor(ctx)->template flat<string>();
+        h(0) = cinfo_.container();
+        h(1) = cinfo_.name();
+      }
+      ctx->set_output_ref(0, &mu_, table_handle_.AccessTensor(ctx));
+    }
+    table_handle_set_ = true;
   }
 
   ~LookupTableOp() override {
diff --git a/tensorflow/core/kernels/lookup_util.cc b/tensorflow/core/kernels/lookup_util.cc
index f87ce0e6b2..d0f269be23 100644
--- a/tensorflow/core/kernels/lookup_util.cc
+++ b/tensorflow/core/kernels/lookup_util.cc
@@ -49,26 +49,48 @@ Status GetLookupTable(const string& input_name, OpKernelContext* ctx,
                       LookupInterface** table) {
   string container;
   string table_handle;
-  TF_RETURN_IF_ERROR(
-      GetTableHandle(input_name, ctx, &container, &table_handle));
-  return ctx->resource_manager()->Lookup(container, table_handle, table);
+  DataType handle_dtype;
+  TF_RETURN_IF_ERROR(ctx->input_dtype(input_name, &handle_dtype));
+  if (handle_dtype == DT_RESOURCE) {
+    ResourceHandle handle;
+    TF_RETURN_IF_ERROR(HandleFromInput(ctx, input_name, &handle));
+    return LookupResource(ctx, handle, table);
+  } else {
+    TF_RETURN_IF_ERROR(
+        GetTableHandle(input_name, ctx, &container, &table_handle));
+    return ctx->resource_manager()->Lookup(container, table_handle, table);
+  }
 }
 
 Status GetInitializableLookupTable(const string& input_name,
                                    OpKernelContext* ctx,
                                    InitializableLookupTable** table) {
-  string container;
-  string table_handle;
-  TF_RETURN_IF_ERROR(
-      GetTableHandle(input_name, ctx, &container, &table_handle));
   LookupInterface* lookup_table;
-  TF_RETURN_IF_ERROR(
-      ctx->resource_manager()->Lookup(container, table_handle, &lookup_table));
-  *table = lookup_table->GetInitializableLookupTable();
-  if (*table == nullptr) {
-    lookup_table->Unref();
-    return errors::InvalidArgument("Table ", container, " ", table_handle,
-                                   " is not initializable");
+  DataType handle_dtype;
+  TF_RETURN_IF_ERROR(ctx->input_dtype(input_name, &handle_dtype));
+  if (handle_dtype == DT_RESOURCE) {
+    ResourceHandle handle;
+    TF_RETURN_IF_ERROR(HandleFromInput(ctx, input_name, &handle));
+    TF_RETURN_IF_ERROR(LookupResource(ctx, handle, &lookup_table));
+    *table = lookup_table->GetInitializableLookupTable();
+    if (*table == nullptr) {
+      lookup_table->Unref();
+      return errors::InvalidArgument("Table ", handle.container(), " ",
+                                     handle.name(), " is not initializable");
+    }
+  } else {
+    string container;
+    string table_handle;
+    TF_RETURN_IF_ERROR(
+        GetTableHandle(input_name, ctx, &container, &table_handle));
+    TF_RETURN_IF_ERROR(ctx->resource_manager()->Lookup(container, table_handle,
+                                                       &lookup_table));
+    *table = lookup_table->GetInitializableLookupTable();
+    if (*table == nullptr) {
+      lookup_table->Unref();
+      return errors::InvalidArgument("Table ", container, " ", table_handle,
+                                     " is not initializable");
+    }
   }
   return Status::OK();
 }
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index b34dd4ae90..f82e9d1eb7 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -210,10 +210,29 @@ Status TwoElementVectorInputsAndScalarOutputs(InferenceContext* c) {
   return Status::OK();
 }
 
+Status ScalarAndTwoElementVectorInputsAndScalarOutputs(InferenceContext* c) {
+  ShapeHandle handle;
+  DimensionHandle unused_handle;
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+  for (int i = 1; i < c->num_inputs(); ++i) {
+    TF_RETURN_IF_ERROR(c->WithRank(c->input(i), 1, &handle));
+    TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_handle));
+  }
+  for (int i = 0; i < c->num_outputs(); ++i) {
+    c->set_output(i, c->Scalar());
+  }
+  return Status::OK();
+}
+
 Status TwoElementOutput(InferenceContext* c) {
   c->set_output(0, c->Vector(2));
   return Status::OK();
 }
+
+Status ScalarOutput(InferenceContext* c) {
+  c->set_output(0, c->Scalar());
+  return Status::OK();
+}
 }  // namespace
 
 REGISTER_OP("RandomShuffleQueue")
@@ -1881,6 +1900,38 @@ values: Same shape as `keys`.  Values found in the table, or `default_values`
    for missing keys.
 )doc");
 
+REGISTER_OP("LookupTableFindV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tin")
+    .Input("default_value: Tout")
+    .Output("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      // Default value must be scalar or vector.
+      ShapeHandle unused;
+      TF_RETURN_IF_ERROR(c->WithRankAtMost(c->input(2), 1, &unused));
+      c->set_output(0, c->UnknownShape());
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Looks up keys in a table, outputs the corresponding values.
+
+The tensor `keys` must of the same type as the keys of the table.
+The output `values` is of the type of the table values.
+
+The scalar `default_value` is the value output for keys not present in the
+table. It must also be of the same type as the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Same shape as `keys`.  Values found in the table, or `default_values`
+   for missing keys.
+)doc");
+
 REGISTER_OP("LookupTableInsert")
     .Input("table_handle: Ref(string)")
     .Input("keys: Tin")
@@ -1893,6 +1944,30 @@ REGISTER_OP("LookupTableInsert")
       DimensionHandle unused_dim;
       TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
 
+      // TODO(ebrevdo): Validate keys and values shape.
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Updates the table to associates keys with values.
+
+The tensor `keys` must be of the same type as the keys of the table.
+The tensor `values` must be of the type of the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Values to associate with keys.
+)doc");
+
+REGISTER_OP("LookupTableInsertV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tin")
+    .Input("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
       // TODO: Validate keys and values shape.
       return Status::OK();
     })
@@ -1918,6 +1993,17 @@ table_handle: Handle to the table.
 size: Scalar that contains number of elements in the table.
 )doc");
 
+REGISTER_OP("LookupTableSizeV2")
+    .Input("table_handle: resource")
+    .Output("size: int64")
+    .SetShapeFn(ScalarAndTwoElementVectorInputsAndScalarOutputs)
+    .Doc(R"doc(
+Computes the number of elements in the given table.
+
+table_handle: Handle to the table.
+size: Scalar that contains number of elements in the table.
+)doc");
+
 REGISTER_OP("LookupTableExport")
     .Input("table_handle: Ref(string)")
     .Output("keys: Tkeys")
@@ -1945,6 +2031,31 @@ keys: Vector of all keys present in the table.
 values: Tensor of all values in the table. Indexed in parallel with `keys`.
 )doc");
 
+REGISTER_OP("LookupTableExportV2")
+    .Input("table_handle: resource")
+    .Output("keys: Tkeys")
+    .Output("values: Tvalues")
+    .Attr("Tkeys: type")
+    .Attr("Tvalues: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      ShapeHandle values = c->UnknownShape();
+      TF_RETURN_IF_ERROR(c->WithRankAtLeast(values, 1, &values));
+      ShapeHandle keys = c->Vector(c->Dim(values, 0));
+      c->set_output(0, keys);
+      c->set_output(1, values);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Outputs all keys and values in the table.
+
+table_handle: Handle to the table.
+keys: Vector of all keys present in the table.
+values: Tensor of all values in the table. Indexed in parallel with `keys`.
+)doc");
+
 REGISTER_OP("LookupTableImport")
     .Input("table_handle: Ref(string)")
     .Input("keys: Tin")
@@ -1957,6 +2068,30 @@ REGISTER_OP("LookupTableImport")
       DimensionHandle unused_dim;
       TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
 
+      // TODO(ebrevdo): Validate keys and values shape.
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Replaces the contents of the table with the specified keys and values.
+
+The tensor `keys` must be of the same type as the keys of the table.
+The tensor `values` must be of the type of the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Values to associate with keys.
+)doc");
+
+REGISTER_OP("LookupTableImportV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tin")
+    .Input("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
       // TODO: Validate keys and values shape.
       return Status::OK();
     })
@@ -1998,6 +2133,33 @@ key_dtype: Type of the table keys.
 value_dtype: Type of the table values.
 )doc");
 
+REGISTER_OP("HashTableV2")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates a non-initialized hash table.
+
+This op creates a hash table, specifying the type of its keys and values.
+Before using the table you will have to initialize it.  After initialization the
+table will be immutable.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+use_node_name_sharing: If true and shared_name is empty, the table is shared
+  using the node name.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
 REGISTER_OP("MutableHashTable")
     .Output("table_handle: Ref(string)")
     .Attr("container: string = ''")
@@ -2025,6 +2187,33 @@ key_dtype: Type of the table keys.
 value_dtype: Type of the table values.
 )doc");
 
+REGISTER_OP("MutableHashTableV2")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates an empty hash table.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a scalar. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+use_node_name_sharing: If true and shared_name is empty, the table is shared
+  using the node name.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
 REGISTER_OP("MutableHashTableOfTensors")
     .Output("table_handle: Ref(string)")
     .Attr("container: string = ''")
@@ -2051,6 +2240,32 @@ key_dtype: Type of the table keys.
 value_dtype: Type of the table values.
 )doc");
 
+REGISTER_OP("MutableHashTableOfTensorsV2")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .Attr("value_shape: shape = {}")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates an empty hash table.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a vector. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
 REGISTER_OP("MutableDenseHashTable")
     .Input("empty_key: key_dtype")
     .Output("table_handle: Ref(string)")
@@ -2088,6 +2303,43 @@ max_load_factor: The maximum ratio between number of entries and number of
   buckets before growing the table. Must be between 0 and 1.
 )doc");
 
+REGISTER_OP("MutableDenseHashTableV2")
+    .Input("empty_key: key_dtype")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .Attr("value_shape: shape = {}")
+    .Attr("initial_num_buckets: int = 131072")  // 2^17
+    .Attr("max_load_factor: float = 0.8")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates an empty hash table that uses tensors as the backing store. It uses
+"open addressing" with quadratic reprobing to resolve collisions.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a scalar. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+empty_key: The key used to represent empty key buckets internally. Must not
+  be used in insert or lookup operations.
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+value_shape: The shape of each value.
+initial_num_buckets: The initial number of hash table buckets. Must be a power
+  to 2.
+max_load_factor: The maximum ratio between number of entries and number of
+  buckets before growing the table. Must be between 0 and 1.
+)doc");
+
 REGISTER_OP("InitializeTable")
     .Input("table_handle: Ref(string)")
     .Input("keys: Tkey")
@@ -2113,6 +2365,29 @@ keys: Keys of type Tkey.
 values: Values of type Tval.
 )doc");
 
+REGISTER_OP("InitializeTableV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tkey")
+    .Input("values: Tval")
+    .Attr("Tkey: type")
+    .Attr("Tval: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      ShapeHandle keys;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 1, &keys));
+      TF_RETURN_IF_ERROR(c->Merge(keys, c->input(2), &keys));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Table initializer that takes two tensors for keys and values respectively.
+
+table_handle: Handle to a table which will be initialized.
+keys: Keys of type Tkey.
+values: Values of type Tval.
+)doc");
+
 REGISTER_OP("InitializeTableFromTextFile")
     .Input("table_handle: Ref(string)")
     .Input("filename: string")
@@ -2152,6 +2427,43 @@ vocab_size: Number of elements of the file, use -1 if unknown.
 delimiter: Delimiter to separate fields in a line.
 )doc");
 
+REGISTER_OP("InitializeTableFromTextFileV2")
+    .Input("table_handle: resource")
+    .Input("filename: string")
+    .Attr("key_index: int >= -2")
+    .Attr("value_index: int >= -2")
+    .Attr("vocab_size: int >= -1 = -1")
+    .Attr("delimiter: string = '\t'")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &handle));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Initializes a table from a text file.
+
+It inserts one key-value pair into the table for each line of the file.
+The key and value is extracted from the whole line content, elements from the
+split line based on `delimiter` or the line number (starting from zero).
+Where to extract the key and value from a line is specified by `key_index` and
+`value_index`.
+
+- A value of -1 means use the line number(starting from zero), expects `int64`.
+- A value of -2 means use the whole line content, expects `string`.
+- A value >= 0 means use the index (starting at zero) of the split line based
+  on `delimiter`.
+
+table_handle: Handle to a table which will be initialized.
+filename: Filename of a vocabulary text file.
+key_index: Column index in a line to get the table `key` values from.
+value_index: Column index that represents information of a line to get the table
+  `value` values from.
+vocab_size: Number of elements of the file, use -1 if unknown.
+delimiter: Delimiter to separate fields in a line.
+)doc");
+
 REGISTER_OP("GetSessionHandle")
     .Input("value: T")
     .Output("handle: string")
diff --git a/tensorflow/python/ops/hidden_ops.txt b/tensorflow/python/ops/hidden_ops.txt
index 9022e1453d..ec02ee3e03 100644
--- a/tensorflow/python/ops/hidden_ops.txt
+++ b/tensorflow/python/ops/hidden_ops.txt
@@ -63,16 +63,27 @@ GetSessionHandle
 GetSessionHandleV2
 GetSessionTensor
 HashTable
+HashTableV2
 InitializeTable
+InitializeTableV2
 InitializeTableFromTextFile
+InitializeTableFromTextFileV2
 LookupTableExport
+LookupTableExportV2
 LookupTableFind
+LookupTableFindV2
 LookupTableImport
+LookupTableImportV2
 LookupTableInsert
+LookupTableInsertV2
 LookupTableSize
+LookupTableSizeV2
 MutableDenseHashTable
+MutableDenseHashTableV2
 MutableHashTable
+MutableHashTableV2
 MutableHashTableOfTensors
+MutableHashTableOfTensorsV2
 Mutex
 MutexAcquire
 MutexRelease
-- 
GitLab


From 55d232add8bf71122c9123b9186fa66c32aba03b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 11:19:35 -0800
Subject: [PATCH 0873/1563] Update ops-related pbtxt files. Change: 154743864

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 358 +++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 426 ++++++++++++++++++
 2 files changed, 784 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 439b022036..8856a0faaf 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -8905,6 +8905,43 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "HashTableV2"
+  output_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "HistogramSummary"
   input_arg {
@@ -9336,6 +9373,70 @@ op {
     }
   }
 }
+op {
+  name: "InitializeTableFromTextFileV2"
+  input_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "filename"
+    type: DT_STRING
+  }
+  attr {
+    name: "key_index"
+    type: "int"
+    has_minimum: true
+    minimum: -2
+  }
+  attr {
+    name: "value_index"
+    type: "int"
+    has_minimum: true
+    minimum: -2
+  }
+  attr {
+    name: "vocab_size"
+    type: "int"
+    default_value {
+      i: -1
+    }
+    has_minimum: true
+    minimum: -1
+  }
+  attr {
+    name: "delimiter"
+    type: "string"
+    default_value {
+      s: "\t"
+    }
+  }
+  is_stateful: true
+}
+op {
+  name: "InitializeTableV2"
+  input_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    type_attr: "Tkey"
+  }
+  input_arg {
+    name: "values"
+    type_attr: "Tval"
+  }
+  attr {
+    name: "Tkey"
+    type: "type"
+  }
+  attr {
+    name: "Tval"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "Inv"
   input_arg {
@@ -10182,6 +10283,30 @@ op {
     type: "type"
   }
 }
+op {
+  name: "LookupTableExportV2"
+  input_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  output_arg {
+    name: "keys"
+    type_attr: "Tkeys"
+  }
+  output_arg {
+    name: "values"
+    type_attr: "Tvalues"
+  }
+  attr {
+    name: "Tkeys"
+    type: "type"
+  }
+  attr {
+    name: "Tvalues"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "LookupTableFind"
   input_arg {
@@ -10210,6 +10335,34 @@ op {
     type: "type"
   }
 }
+op {
+  name: "LookupTableFindV2"
+  input_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    type_attr: "Tin"
+  }
+  input_arg {
+    name: "default_value"
+    type_attr: "Tout"
+  }
+  output_arg {
+    name: "values"
+    type_attr: "Tout"
+  }
+  attr {
+    name: "Tin"
+    type: "type"
+  }
+  attr {
+    name: "Tout"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "LookupTableImport"
   input_arg {
@@ -10234,6 +10387,30 @@ op {
     type: "type"
   }
 }
+op {
+  name: "LookupTableImportV2"
+  input_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    type_attr: "Tin"
+  }
+  input_arg {
+    name: "values"
+    type_attr: "Tout"
+  }
+  attr {
+    name: "Tin"
+    type: "type"
+  }
+  attr {
+    name: "Tout"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "LookupTableInsert"
   input_arg {
@@ -10258,6 +10435,30 @@ op {
     type: "type"
   }
 }
+op {
+  name: "LookupTableInsertV2"
+  input_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    type_attr: "Tin"
+  }
+  input_arg {
+    name: "values"
+    type_attr: "Tout"
+  }
+  attr {
+    name: "Tin"
+    type: "type"
+  }
+  attr {
+    name: "Tout"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "LookupTableSize"
   input_arg {
@@ -10270,6 +10471,18 @@ op {
     type: DT_INT64
   }
 }
+op {
+  name: "LookupTableSizeV2"
+  input_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  output_arg {
+    name: "size"
+    type: DT_INT64
+  }
+  is_stateful: true
+}
 op {
   name: "LoopCond"
   input_arg {
@@ -12174,6 +12387,69 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "MutableDenseHashTableV2"
+  input_arg {
+    name: "empty_key"
+    type_attr: "key_dtype"
+  }
+  output_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+  }
+  attr {
+    name: "value_shape"
+    type: "shape"
+    default_value {
+      shape {
+      }
+    }
+  }
+  attr {
+    name: "initial_num_buckets"
+    type: "int"
+    default_value {
+      i: 131072
+    }
+  }
+  attr {
+    name: "max_load_factor"
+    type: "float"
+    default_value {
+      f: 0.8
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "MutableHashTable"
   output_arg {
@@ -12258,6 +12534,88 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "MutableHashTableOfTensorsV2"
+  output_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+  }
+  attr {
+    name: "value_shape"
+    type: "shape"
+    default_value {
+      shape {
+      }
+    }
+  }
+  is_stateful: true
+}
+op {
+  name: "MutableHashTableV2"
+  output_arg {
+    name: "table_handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "Neg"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index cb313a6c27..f6eb0cd7a8 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -8745,6 +8745,51 @@ op {
   description: "This op creates a hash table, specifying the type of its keys and values.\nBefore using the table you will have to initialize it.  After initialization the\ntable will be immutable."
   is_stateful: true
 }
+op {
+  name: "HashTableV2"
+  output_arg {
+    name: "table_handle"
+    description: "Handle to a table."
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is placed in the given container.\nOtherwise, a default container is used."
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is shared under the given name across\nmultiple sessions."
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "If true and shared_name is empty, the table is shared\nusing the node name."
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+    description: "Type of the table keys."
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+    description: "Type of the table values."
+  }
+  summary: "Creates a non-initialized hash table."
+  description: "This op creates a hash table, specifying the type of its keys and values.\nBefore using the table you will have to initialize it.  After initialization the\ntable will be immutable."
+  is_stateful: true
+}
 op {
   name: "HistogramSummary"
   input_arg {
@@ -9255,6 +9300,82 @@ op {
   summary: "Initializes a table from a text file."
   description: "It inserts one key-value pair into the table for each line of the file.\nThe key and value is extracted from the whole line content, elements from the\nsplit line based on `delimiter` or the line number (starting from zero).\nWhere to extract the key and value from a line is specified by `key_index` and\n`value_index`.\n\n- A value of -1 means use the line number(starting from zero), expects `int64`.\n- A value of -2 means use the whole line content, expects `string`.\n- A value >= 0 means use the index (starting at zero) of the split line based\n  on `delimiter`."
 }
+op {
+  name: "InitializeTableFromTextFileV2"
+  input_arg {
+    name: "table_handle"
+    description: "Handle to a table which will be initialized."
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "filename"
+    description: "Filename of a vocabulary text file."
+    type: DT_STRING
+  }
+  attr {
+    name: "key_index"
+    type: "int"
+    description: "Column index in a line to get the table `key` values from."
+    has_minimum: true
+    minimum: -2
+  }
+  attr {
+    name: "value_index"
+    type: "int"
+    description: "Column index that represents information of a line to get the table\n`value` values from."
+    has_minimum: true
+    minimum: -2
+  }
+  attr {
+    name: "vocab_size"
+    type: "int"
+    default_value {
+      i: -1
+    }
+    description: "Number of elements of the file, use -1 if unknown."
+    has_minimum: true
+    minimum: -1
+  }
+  attr {
+    name: "delimiter"
+    type: "string"
+    default_value {
+      s: "\t"
+    }
+    description: "Delimiter to separate fields in a line."
+  }
+  summary: "Initializes a table from a text file."
+  description: "It inserts one key-value pair into the table for each line of the file.\nThe key and value is extracted from the whole line content, elements from the\nsplit line based on `delimiter` or the line number (starting from zero).\nWhere to extract the key and value from a line is specified by `key_index` and\n`value_index`.\n\n- A value of -1 means use the line number(starting from zero), expects `int64`.\n- A value of -2 means use the whole line content, expects `string`.\n- A value >= 0 means use the index (starting at zero) of the split line based\n  on `delimiter`."
+  is_stateful: true
+}
+op {
+  name: "InitializeTableV2"
+  input_arg {
+    name: "table_handle"
+    description: "Handle to a table which will be initialized."
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    description: "Keys of type Tkey."
+    type_attr: "Tkey"
+  }
+  input_arg {
+    name: "values"
+    description: "Values of type Tval."
+    type_attr: "Tval"
+  }
+  attr {
+    name: "Tkey"
+    type: "type"
+  }
+  attr {
+    name: "Tval"
+    type: "type"
+  }
+  summary: "Table initializer that takes two tensors for keys and values respectively."
+  is_stateful: true
+}
 op {
   name: "Inv"
   input_arg {
@@ -10067,6 +10188,34 @@ op {
   }
   summary: "Outputs all keys and values in the table."
 }
+op {
+  name: "LookupTableExportV2"
+  input_arg {
+    name: "table_handle"
+    description: "Handle to the table."
+    type: DT_RESOURCE
+  }
+  output_arg {
+    name: "keys"
+    description: "Vector of all keys present in the table."
+    type_attr: "Tkeys"
+  }
+  output_arg {
+    name: "values"
+    description: "Tensor of all values in the table. Indexed in parallel with `keys`."
+    type_attr: "Tvalues"
+  }
+  attr {
+    name: "Tkeys"
+    type: "type"
+  }
+  attr {
+    name: "Tvalues"
+    type: "type"
+  }
+  summary: "Outputs all keys and values in the table."
+  is_stateful: true
+}
 op {
   name: "LookupTableFind"
   input_arg {
@@ -10100,6 +10249,39 @@ op {
   summary: "Looks up keys in a table, outputs the corresponding values."
   description: "The tensor `keys` must of the same type as the keys of the table.\nThe output `values` is of the type of the table values.\n\nThe scalar `default_value` is the value output for keys not present in the\ntable. It must also be of the same type as the table values."
 }
+op {
+  name: "LookupTableFindV2"
+  input_arg {
+    name: "table_handle"
+    description: "Handle to the table."
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    description: "Any shape.  Keys to look up."
+    type_attr: "Tin"
+  }
+  input_arg {
+    name: "default_value"
+    type_attr: "Tout"
+  }
+  output_arg {
+    name: "values"
+    description: "Same shape as `keys`.  Values found in the table, or `default_values`\nfor missing keys."
+    type_attr: "Tout"
+  }
+  attr {
+    name: "Tin"
+    type: "type"
+  }
+  attr {
+    name: "Tout"
+    type: "type"
+  }
+  summary: "Looks up keys in a table, outputs the corresponding values."
+  description: "The tensor `keys` must of the same type as the keys of the table.\nThe output `values` is of the type of the table values.\n\nThe scalar `default_value` is the value output for keys not present in the\ntable. It must also be of the same type as the table values."
+  is_stateful: true
+}
 op {
   name: "LookupTableImport"
   input_arg {
@@ -10129,6 +10311,35 @@ op {
   summary: "Replaces the contents of the table with the specified keys and values."
   description: "The tensor `keys` must be of the same type as the keys of the table.\nThe tensor `values` must be of the type of the table values."
 }
+op {
+  name: "LookupTableImportV2"
+  input_arg {
+    name: "table_handle"
+    description: "Handle to the table."
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    description: "Any shape.  Keys to look up."
+    type_attr: "Tin"
+  }
+  input_arg {
+    name: "values"
+    description: "Values to associate with keys."
+    type_attr: "Tout"
+  }
+  attr {
+    name: "Tin"
+    type: "type"
+  }
+  attr {
+    name: "Tout"
+    type: "type"
+  }
+  summary: "Replaces the contents of the table with the specified keys and values."
+  description: "The tensor `keys` must be of the same type as the keys of the table.\nThe tensor `values` must be of the type of the table values."
+  is_stateful: true
+}
 op {
   name: "LookupTableInsert"
   input_arg {
@@ -10158,6 +10369,35 @@ op {
   summary: "Updates the table to associates keys with values."
   description: "The tensor `keys` must be of the same type as the keys of the table.\nThe tensor `values` must be of the type of the table values."
 }
+op {
+  name: "LookupTableInsertV2"
+  input_arg {
+    name: "table_handle"
+    description: "Handle to the table."
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "keys"
+    description: "Any shape.  Keys to look up."
+    type_attr: "Tin"
+  }
+  input_arg {
+    name: "values"
+    description: "Values to associate with keys."
+    type_attr: "Tout"
+  }
+  attr {
+    name: "Tin"
+    type: "type"
+  }
+  attr {
+    name: "Tout"
+    type: "type"
+  }
+  summary: "Updates the table to associates keys with values."
+  description: "The tensor `keys` must be of the same type as the keys of the table.\nThe tensor `values` must be of the type of the table values."
+  is_stateful: true
+}
 op {
   name: "LookupTableSize"
   input_arg {
@@ -10173,6 +10413,21 @@ op {
   }
   summary: "Computes the number of elements in the given table."
 }
+op {
+  name: "LookupTableSizeV2"
+  input_arg {
+    name: "table_handle"
+    description: "Handle to the table."
+    type: DT_RESOURCE
+  }
+  output_arg {
+    name: "size"
+    description: "Scalar that contains number of elements in the table."
+    type: DT_INT64
+  }
+  summary: "Computes the number of elements in the given table."
+  is_stateful: true
+}
 op {
   name: "LoopCond"
   input_arg {
@@ -11877,6 +12132,80 @@ op {
   description: "\"open addressing\" with quadratic reprobing to resolve collisions.\n\nThis op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a scalar. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
   is_stateful: true
 }
+op {
+  name: "MutableDenseHashTableV2"
+  input_arg {
+    name: "empty_key"
+    description: "The key used to represent empty key buckets internally. Must not\nbe used in insert or lookup operations."
+    type_attr: "key_dtype"
+  }
+  output_arg {
+    name: "table_handle"
+    description: "Handle to a table."
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is placed in the given container.\nOtherwise, a default container is used."
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is shared under the given name across\nmultiple sessions."
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+    description: "Type of the table keys."
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+    description: "Type of the table values."
+  }
+  attr {
+    name: "value_shape"
+    type: "shape"
+    default_value {
+      shape {
+      }
+    }
+    description: "The shape of each value."
+  }
+  attr {
+    name: "initial_num_buckets"
+    type: "int"
+    default_value {
+      i: 131072
+    }
+    description: "The initial number of hash table buckets. Must be a power\nto 2."
+  }
+  attr {
+    name: "max_load_factor"
+    type: "float"
+    default_value {
+      f: 0.8
+    }
+    description: "The maximum ratio between number of entries and number of\nbuckets before growing the table. Must be between 0 and 1."
+  }
+  summary: "Creates an empty hash table that uses tensors as the backing store. It uses"
+  description: "\"open addressing\" with quadratic reprobing to resolve collisions.\n\nThis op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a scalar. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
+  is_stateful: true
+}
 op {
   name: "MutableHashTable"
   output_arg {
@@ -11976,6 +12305,103 @@ op {
   description: "This op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a vector. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
   is_stateful: true
 }
+op {
+  name: "MutableHashTableOfTensorsV2"
+  output_arg {
+    name: "table_handle"
+    description: "Handle to a table."
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is placed in the given container.\nOtherwise, a default container is used."
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is shared under the given name across\nmultiple sessions."
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+    description: "Type of the table keys."
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+    description: "Type of the table values."
+  }
+  attr {
+    name: "value_shape"
+    type: "shape"
+    default_value {
+      shape {
+      }
+    }
+  }
+  summary: "Creates an empty hash table."
+  description: "This op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a vector. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
+  is_stateful: true
+}
+op {
+  name: "MutableHashTableV2"
+  output_arg {
+    name: "table_handle"
+    description: "Handle to a table."
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is placed in the given container.\nOtherwise, a default container is used."
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+    description: "If non-empty, this table is shared under the given name across\nmultiple sessions."
+  }
+  attr {
+    name: "use_node_name_sharing"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "If true and shared_name is empty, the table is shared\nusing the node name."
+  }
+  attr {
+    name: "key_dtype"
+    type: "type"
+    description: "Type of the table keys."
+  }
+  attr {
+    name: "value_dtype"
+    type: "type"
+    description: "Type of the table values."
+  }
+  summary: "Creates an empty hash table."
+  description: "This op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a scalar. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
+  is_stateful: true
+}
 op {
   name: "Neg"
   input_arg {
-- 
GitLab


From a1efebe6289c7876b343162076fa968532dbbfbe Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 11:26:08 -0800
Subject: [PATCH 0874/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154744701

---
 tensorflow/go/op/wrappers.go | 501 +++++++++++++++++++++++++++++++++++
 1 file changed, 501 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 001e5f9feb..4caa75c930 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -3522,6 +3522,256 @@ func Stage(scope *Scope, values []tf.Output, optional ...StageAttr) (o *tf.Opera
 	return scope.AddOperation(opspec)
 }
 
+// Table initializer that takes two tensors for keys and values respectively.
+//
+// Arguments:
+//	table_handle: Handle to a table which will be initialized.
+//	keys: Keys of type Tkey.
+//	values: Values of type Tval.
+//
+// Returns the created operation.
+func InitializeTableV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "InitializeTableV2",
+		Input: []tf.Input{
+			table_handle, keys, values,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// MutableHashTableV2Attr is an optional argument to MutableHashTableV2.
+type MutableHashTableV2Attr func(optionalAttr)
+
+// MutableHashTableV2Container sets the optional container attribute to value.
+//
+// value: If non-empty, this table is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func MutableHashTableV2Container(value string) MutableHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["container"] = value
+	}
+}
+
+// MutableHashTableV2SharedName sets the optional shared_name attribute to value.
+//
+// value: If non-empty, this table is shared under the given name across
+// multiple sessions.
+// If not specified, defaults to ""
+func MutableHashTableV2SharedName(value string) MutableHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["shared_name"] = value
+	}
+}
+
+// MutableHashTableV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
+//
+// value: If true and shared_name is empty, the table is shared
+// using the node name.
+// If not specified, defaults to false
+func MutableHashTableV2UseNodeNameSharing(value bool) MutableHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["use_node_name_sharing"] = value
+	}
+}
+
+// Creates an empty hash table.
+//
+// This op creates a mutable hash table, specifying the type of its keys and
+// values. Each value must be a scalar. Data can be inserted into the table using
+// the insert operations. It does not support the initialization operation.
+//
+// Arguments:
+//	key_dtype: Type of the table keys.
+//	value_dtype: Type of the table values.
+//
+// Returns Handle to a table.
+func MutableHashTableV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...MutableHashTableV2Attr) (table_handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MutableHashTableV2",
+
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// HashTableV2Attr is an optional argument to HashTableV2.
+type HashTableV2Attr func(optionalAttr)
+
+// HashTableV2Container sets the optional container attribute to value.
+//
+// value: If non-empty, this table is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func HashTableV2Container(value string) HashTableV2Attr {
+	return func(m optionalAttr) {
+		m["container"] = value
+	}
+}
+
+// HashTableV2SharedName sets the optional shared_name attribute to value.
+//
+// value: If non-empty, this table is shared under the given name across
+// multiple sessions.
+// If not specified, defaults to ""
+func HashTableV2SharedName(value string) HashTableV2Attr {
+	return func(m optionalAttr) {
+		m["shared_name"] = value
+	}
+}
+
+// HashTableV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
+//
+// value: If true and shared_name is empty, the table is shared
+// using the node name.
+// If not specified, defaults to false
+func HashTableV2UseNodeNameSharing(value bool) HashTableV2Attr {
+	return func(m optionalAttr) {
+		m["use_node_name_sharing"] = value
+	}
+}
+
+// Creates a non-initialized hash table.
+//
+// This op creates a hash table, specifying the type of its keys and values.
+// Before using the table you will have to initialize it.  After initialization the
+// table will be immutable.
+//
+// Arguments:
+//	key_dtype: Type of the table keys.
+//	value_dtype: Type of the table values.
+//
+// Returns Handle to a table.
+func HashTableV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...HashTableV2Attr) (table_handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "HashTableV2",
+
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Replaces the contents of the table with the specified keys and values.
+//
+// The tensor `keys` must be of the same type as the keys of the table.
+// The tensor `values` must be of the type of the table values.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//	keys: Any shape.  Keys to look up.
+//	values: Values to associate with keys.
+//
+// Returns the created operation.
+func LookupTableImportV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "LookupTableImportV2",
+		Input: []tf.Input{
+			table_handle, keys, values,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Outputs all keys and values in the table.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//
+//
+//
+// Returns Vector of all keys present in the table.Tensor of all values in the table. Indexed in parallel with `keys`.
+func LookupTableExportV2(scope *Scope, table_handle tf.Output, Tkeys tf.DataType, Tvalues tf.DataType) (keys tf.Output, values tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"Tkeys": Tkeys, "Tvalues": Tvalues}
+	opspec := tf.OpSpec{
+		Type: "LookupTableExportV2",
+		Input: []tf.Input{
+			table_handle,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1)
+}
+
+// Updates the table to associates keys with values.
+//
+// The tensor `keys` must be of the same type as the keys of the table.
+// The tensor `values` must be of the type of the table values.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//	keys: Any shape.  Keys to look up.
+//	values: Values to associate with keys.
+//
+// Returns the created operation.
+func LookupTableInsertV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "LookupTableInsertV2",
+		Input: []tf.Input{
+			table_handle, keys, values,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Looks up keys in a table, outputs the corresponding values.
+//
+// The tensor `keys` must of the same type as the keys of the table.
+// The output `values` is of the type of the table values.
+//
+// The scalar `default_value` is the value output for keys not present in the
+// table. It must also be of the same type as the table values.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//	keys: Any shape.  Keys to look up.
+//
+//
+// Returns Same shape as `keys`.  Values found in the table, or `default_values`
+// for missing keys.
+func LookupTableFindV2(scope *Scope, table_handle tf.Output, keys tf.Output, default_value tf.Output) (values tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "LookupTableFindV2",
+		Input: []tf.Input{
+			table_handle, keys, default_value,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // FakeQuantWithMinMaxArgsAttr is an optional argument to FakeQuantWithMinMaxArgs.
 type FakeQuantWithMinMaxArgsAttr func(optionalAttr)
 
@@ -10019,6 +10269,70 @@ func QuantizedRelu(scope *Scope, features tf.Output, min_features tf.Output, max
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
+// InitializeTableFromTextFileV2Attr is an optional argument to InitializeTableFromTextFileV2.
+type InitializeTableFromTextFileV2Attr func(optionalAttr)
+
+// InitializeTableFromTextFileV2VocabSize sets the optional vocab_size attribute to value.
+//
+// value: Number of elements of the file, use -1 if unknown.
+// If not specified, defaults to -1
+//
+// REQUIRES: value >= -1
+func InitializeTableFromTextFileV2VocabSize(value int64) InitializeTableFromTextFileV2Attr {
+	return func(m optionalAttr) {
+		m["vocab_size"] = value
+	}
+}
+
+// InitializeTableFromTextFileV2Delimiter sets the optional delimiter attribute to value.
+//
+// value: Delimiter to separate fields in a line.
+// If not specified, defaults to "\t"
+func InitializeTableFromTextFileV2Delimiter(value string) InitializeTableFromTextFileV2Attr {
+	return func(m optionalAttr) {
+		m["delimiter"] = value
+	}
+}
+
+// Initializes a table from a text file.
+//
+// It inserts one key-value pair into the table for each line of the file.
+// The key and value is extracted from the whole line content, elements from the
+// split line based on `delimiter` or the line number (starting from zero).
+// Where to extract the key and value from a line is specified by `key_index` and
+// `value_index`.
+//
+// - A value of -1 means use the line number(starting from zero), expects `int64`.
+// - A value of -2 means use the whole line content, expects `string`.
+// - A value >= 0 means use the index (starting at zero) of the split line based
+//   on `delimiter`.
+//
+// Arguments:
+//	table_handle: Handle to a table which will be initialized.
+//	filename: Filename of a vocabulary text file.
+//	key_index: Column index in a line to get the table `key` values from.
+//	value_index: Column index that represents information of a line to get the table
+// `value` values from.
+//
+// Returns the created operation.
+func InitializeTableFromTextFileV2(scope *Scope, table_handle tf.Output, filename tf.Output, key_index int64, value_index int64, optional ...InitializeTableFromTextFileV2Attr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"key_index": key_index, "value_index": value_index}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "InitializeTableFromTextFileV2",
+		Input: []tf.Input{
+			table_handle, filename,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
 // ResourceSparseApplyProximalGradientDescentAttr is an optional argument to ResourceSparseApplyProximalGradientDescent.
 type ResourceSparseApplyProximalGradientDescentAttr func(optionalAttr)
 
@@ -10875,6 +11189,75 @@ func IFFT2D(scope *Scope, input tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
+// MutableHashTableOfTensorsV2Attr is an optional argument to MutableHashTableOfTensorsV2.
+type MutableHashTableOfTensorsV2Attr func(optionalAttr)
+
+// MutableHashTableOfTensorsV2Container sets the optional container attribute to value.
+//
+// value: If non-empty, this table is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func MutableHashTableOfTensorsV2Container(value string) MutableHashTableOfTensorsV2Attr {
+	return func(m optionalAttr) {
+		m["container"] = value
+	}
+}
+
+// MutableHashTableOfTensorsV2SharedName sets the optional shared_name attribute to value.
+//
+// value: If non-empty, this table is shared under the given name across
+// multiple sessions.
+// If not specified, defaults to ""
+func MutableHashTableOfTensorsV2SharedName(value string) MutableHashTableOfTensorsV2Attr {
+	return func(m optionalAttr) {
+		m["shared_name"] = value
+	}
+}
+
+// MutableHashTableOfTensorsV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
+// If not specified, defaults to false
+func MutableHashTableOfTensorsV2UseNodeNameSharing(value bool) MutableHashTableOfTensorsV2Attr {
+	return func(m optionalAttr) {
+		m["use_node_name_sharing"] = value
+	}
+}
+
+// MutableHashTableOfTensorsV2ValueShape sets the optional value_shape attribute to value.
+// If not specified, defaults to <>
+func MutableHashTableOfTensorsV2ValueShape(value tf.Shape) MutableHashTableOfTensorsV2Attr {
+	return func(m optionalAttr) {
+		m["value_shape"] = value
+	}
+}
+
+// Creates an empty hash table.
+//
+// This op creates a mutable hash table, specifying the type of its keys and
+// values. Each value must be a vector. Data can be inserted into the table using
+// the insert operations. It does not support the initialization operation.
+//
+// Arguments:
+//	key_dtype: Type of the table keys.
+//	value_dtype: Type of the table values.
+//
+// Returns Handle to a table.
+func MutableHashTableOfTensorsV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...MutableHashTableOfTensorsV2Attr) (table_handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MutableHashTableOfTensorsV2",
+
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // ResourceApplyProximalAdagradAttr is an optional argument to ResourceApplyProximalAdagrad.
 type ResourceApplyProximalAdagradAttr func(optionalAttr)
 
@@ -13270,6 +13653,104 @@ func ReaderReadV2(scope *Scope, reader_handle tf.Output, queue_handle tf.Output)
 	return op.Output(0), op.Output(1)
 }
 
+// MutableDenseHashTableV2Attr is an optional argument to MutableDenseHashTableV2.
+type MutableDenseHashTableV2Attr func(optionalAttr)
+
+// MutableDenseHashTableV2Container sets the optional container attribute to value.
+//
+// value: If non-empty, this table is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func MutableDenseHashTableV2Container(value string) MutableDenseHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["container"] = value
+	}
+}
+
+// MutableDenseHashTableV2SharedName sets the optional shared_name attribute to value.
+//
+// value: If non-empty, this table is shared under the given name across
+// multiple sessions.
+// If not specified, defaults to ""
+func MutableDenseHashTableV2SharedName(value string) MutableDenseHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["shared_name"] = value
+	}
+}
+
+// MutableDenseHashTableV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
+// If not specified, defaults to false
+func MutableDenseHashTableV2UseNodeNameSharing(value bool) MutableDenseHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["use_node_name_sharing"] = value
+	}
+}
+
+// MutableDenseHashTableV2ValueShape sets the optional value_shape attribute to value.
+//
+// value: The shape of each value.
+// If not specified, defaults to <>
+func MutableDenseHashTableV2ValueShape(value tf.Shape) MutableDenseHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["value_shape"] = value
+	}
+}
+
+// MutableDenseHashTableV2InitialNumBuckets sets the optional initial_num_buckets attribute to value.
+//
+// value: The initial number of hash table buckets. Must be a power
+// to 2.
+// If not specified, defaults to 131072
+func MutableDenseHashTableV2InitialNumBuckets(value int64) MutableDenseHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["initial_num_buckets"] = value
+	}
+}
+
+// MutableDenseHashTableV2MaxLoadFactor sets the optional max_load_factor attribute to value.
+//
+// value: The maximum ratio between number of entries and number of
+// buckets before growing the table. Must be between 0 and 1.
+// If not specified, defaults to 0.8
+func MutableDenseHashTableV2MaxLoadFactor(value float32) MutableDenseHashTableV2Attr {
+	return func(m optionalAttr) {
+		m["max_load_factor"] = value
+	}
+}
+
+// Creates an empty hash table that uses tensors as the backing store. It uses
+//
+// "open addressing" with quadratic reprobing to resolve collisions.
+//
+// This op creates a mutable hash table, specifying the type of its keys and
+// values. Each value must be a scalar. Data can be inserted into the table using
+// the insert operations. It does not support the initialization operation.
+//
+// Arguments:
+//	empty_key: The key used to represent empty key buckets internally. Must not
+// be used in insert or lookup operations.
+//	value_dtype: Type of the table values.
+//
+// Returns Handle to a table.
+func MutableDenseHashTableV2(scope *Scope, empty_key tf.Output, value_dtype tf.DataType, optional ...MutableDenseHashTableV2Attr) (table_handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"value_dtype": value_dtype}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MutableDenseHashTableV2",
+		Input: []tf.Input{
+			empty_key,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // LRNAttr is an optional argument to LRN.
 type LRNAttr func(optionalAttr)
 
@@ -20554,6 +21035,26 @@ func SoftmaxCrossEntropyWithLogits(scope *Scope, features tf.Output, labels tf.O
 	return op.Output(0), op.Output(1)
 }
 
+// Computes the number of elements in the given table.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//
+// Returns Scalar that contains number of elements in the table.
+func LookupTableSizeV2(scope *Scope, table_handle tf.Output) (size tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "LookupTableSizeV2",
+		Input: []tf.Input{
+			table_handle,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // ResizeBilinearGradAttr is an optional argument to ResizeBilinearGrad.
 type ResizeBilinearGradAttr func(optionalAttr)
 
-- 
GitLab


From bcf7e53d183a97f7139e3e1343eed363b69c2877 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 11:37:14 -0800
Subject: [PATCH 0875/1563] Small fixes to op generation. Change: 154745991

---
 tensorflow/python/framework/op_def_library.py |  2 +-
 tensorflow/python/framework/python_op_gen.cc  | 10 +++++-----
 tensorflow/python/framework/python_op_gen.h   |  7 ++++---
 tensorflow/python/framework/python_op_gen.i   |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tensorflow/python/framework/op_def_library.py b/tensorflow/python/framework/op_def_library.py
index 2c39f5b0e3..662c2c679c 100644
--- a/tensorflow/python/framework/op_def_library.py
+++ b/tensorflow/python/framework/op_def_library.py
@@ -328,7 +328,7 @@ class OpDefLibrary(object):
       # Need to flatten all the arguments into a list.
       # pylint: disable=protected-access
       g = ops._get_graph_from_inputs(_Flatten(keywords.values()))
-      # pyline: enable=protected-access
+      # pylint: enable=protected-access
     except AssertionError as e:
       raise RuntimeError(
           "Cannot determine graph for Op '%s' due to: %s"
diff --git a/tensorflow/python/framework/python_op_gen.cc b/tensorflow/python/framework/python_op_gen.cc
index 64be2c70a1..d6fd750f6f 100644
--- a/tensorflow/python/framework/python_op_gen.cc
+++ b/tensorflow/python/framework/python_op_gen.cc
@@ -629,10 +629,10 @@ static string GetPythonOp(const OpDef& op_def, bool is_hidden, string op_name) {
 }
 
 void GenerateLowerCaseOpName(const string& str, string* result) {
-  char joiner = '_';
-  int last_index = str.size() - 1;
+  const char joiner = '_';
+  const int last_index = str.size() - 1;
   for (int i = 0; i <= last_index; ++i) {
-    char c = str[i];
+    const char c = str[i];
     // Emit a joiner only if a previous-lower-to-now-upper or a
     // now-upper-to-next-lower transition happens.
     if (isupper(c) && (i > 0)) {
@@ -731,8 +731,8 @@ void PrintPythonOps(const OpList& ops, const std::vector<string>& hidden_ops,
   printf("%s", GetPythonOps(ops, hidden_ops, require_shapes).c_str());
 }
 
-string GetPythonWrappers(const char* op_wrapper_buf, size_t op_wrapper_len) {
-  string op_list_str(op_wrapper_buf, op_wrapper_len);
+string GetPythonWrappers(const char* op_list_buf, size_t op_list_len) {
+  string op_list_str(op_list_buf, op_list_len);
   OpList ops;
   ops.ParseFromString(op_list_str);
   return GetPythonOps(ops, {}, false);
diff --git a/tensorflow/python/framework/python_op_gen.h b/tensorflow/python/framework/python_op_gen.h
index 424244fcc5..e51eacbc17 100644
--- a/tensorflow/python/framework/python_op_gen.h
+++ b/tensorflow/python/framework/python_op_gen.h
@@ -33,9 +33,10 @@ string GetPythonOps(const OpList& ops, const std::vector<string>& hidden_ops,
                     bool require_shapes);
 
 // Get the python wrappers for a list of ops in a OpList.
-// buf should be a pointer to a buffer containing the binary encoded OpList
-// proto, and len should be the length of that buffer.
-string GetPythonWrappers(const char* op_wrapper_buf, size_t op_wrapper_len);
+// `op_list_buf` should be a pointer to a buffer containing
+// the binary encoded OpList proto, and `op_list_len` should be the
+// length of that buffer.
+string GetPythonWrappers(const char* op_list_buf, size_t op_list_len);
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/python/framework/python_op_gen.i b/tensorflow/python/framework/python_op_gen.i
index 740eff4ecd..26ec4e8e66 100644
--- a/tensorflow/python/framework/python_op_gen.i
+++ b/tensorflow/python/framework/python_op_gen.i
@@ -25,7 +25,7 @@ limitations under the License.
 // going from python bytes to const char* tries to decode the
 // contents from utf-8 to unicode for Python version >= 3, but
 // we want the bytes to be uninterpreted.
-%typemap(in) (const char* op_wrapper_buf, size_t op_wrapper_len) {
+%typemap(in) (const char* op_list_buf, size_t op_list_len) {
   char* c_string;
   Py_ssize_t py_size;
   if (PyBytes_AsStringAndSize($input, &c_string, &py_size) == -1) {
-- 
GitLab


From bb17b9665c189d1349d783219306100204ef2352 Mon Sep 17 00:00:00 2001
From: Zakaria Haque <zakaria@google.com>
Date: Mon, 1 May 2017 11:37:53 -0800
Subject: [PATCH 0876/1563] Sets tag explicitly for training loss so the
 training and eval losses will show up in the same graph in tensorboard. This
 was inadvertently changed in cl/153426348 Change: 154746092

---
 .../learn/python/learn/estimators/head.py     |  5 +-
 .../python/learn/estimators/head_test.py      | 80 +++++++++----------
 2 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 12af78398b..452f8a901e 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -37,6 +37,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import sparse_ops
@@ -613,7 +614,9 @@ def _create_model_fn_ops(features,
   if (mode != model_fn.ModeKeys.INFER) and (labels is not None):
     weight_tensor = _weight_tensor(features, weight_column_name)
     loss, weighted_average_loss = loss_fn(labels, logits, weight_tensor)
-    summary.scalar(
+    # Uses the deprecated API to set the tag explicitly.
+    # Without it, trianing and eval losses will show up in different graphs.
+    logging_ops.scalar_summary(
         _summary_key(head_name, mkey.LOSS), weighted_average_loss)
 
     if mode == model_fn.ModeKeys.TRAIN:
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index e81b15a172..442530cb5e 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -123,7 +123,7 @@ class PoissonHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=logits)
       self._assert_output_alternatives(model_fn_ops)
-      _assert_summary_tags(self, ["regression_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_no_variables(self)
       loss = self._log_poisson_loss(logits, labels)
       _assert_metrics(self, loss, {"loss": loss}, model_fn_ops)
@@ -149,7 +149,7 @@ class RegressionHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
-      _assert_summary_tags(self, ["regression_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_no_variables(self)
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
@@ -179,7 +179,7 @@ class RegressionHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["regression_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_metrics(self, 2. / 3, {"loss": 2. / 3}, model_fn_ops)
 
   def testRegressionWithLogitsAndLogitsInput(self):
@@ -207,7 +207,7 @@ class RegressionHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["regression_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionWithLabelName(self):
@@ -222,7 +222,7 @@ class RegressionHeadTest(test.TestCase):
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["regression_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
   def testRegressionWithWeights(self):
@@ -237,7 +237,7 @@ class RegressionHeadTest(test.TestCase):
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["regression_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_metrics(self, 2. / len(weights), {"loss": 2. / np.sum(weights)},
                       model_fn_ops)
 
@@ -260,7 +260,7 @@ class RegressionHeadTest(test.TestCase):
           expected_trainable=("regression_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self, [
-          "regression_head/loss",
+          "loss",
           "regression_head/centered_bias/bias_0"
       ])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
@@ -331,7 +331,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -348,7 +348,7 @@ class MultiLabelHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn, logits=logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.00320443
       _assert_metrics(self, expected_loss, {
           "accuracy": 0.,
@@ -388,7 +388,7 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .69314718
       _assert_metrics(self, expected_loss, {
           "accuracy": 2. / 3,
@@ -433,7 +433,7 @@ class MultiLabelHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -452,7 +452,7 @@ class MultiLabelHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.377779
       expected_eval_metrics = {
           "accuracy": 1. / 3,
@@ -520,7 +520,7 @@ class MultiLabelHeadTest(test.TestCase):
           head_lib.no_op_train_fn, logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -540,7 +540,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_metrics(self, .089985214,
                       self._expected_eval_metrics(.89985214), model_fn_ops)
 
@@ -559,7 +559,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       _assert_metrics(self, .089985214,
                       self._expected_eval_metrics(.89985214), model_fn_ops)
 
@@ -579,7 +579,7 @@ class MultiLabelHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .089985214
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -604,7 +604,7 @@ class MultiLabelHeadTest(test.TestCase):
           expected_trainable=("multi_label_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self, (
-          "multi_label_head/loss",
+          "loss",
           "multi_label_head/centered_bias/bias_0",
           "multi_label_head/centered_bias/bias_1",
           "multi_label_head/centered_bias/bias_2"
@@ -629,7 +629,7 @@ class MultiLabelHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=self._logits)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_label_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .89985204
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -695,7 +695,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_logistic_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -723,7 +723,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["binary_logistic_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .69314718
       label_mean = np.mean(self._labels)
       _assert_metrics(self, expected_loss, {
@@ -759,7 +759,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_logistic_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -838,7 +838,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_logistic_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = .81326175
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -859,7 +859,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_logistic_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_total_loss = .31326166
       _assert_metrics(
           self,
@@ -892,7 +892,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_logistic_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       # logloss: z:label, x:logit
       # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
       # expected_loss is (total_weighted_loss)/1 since htere is 1 nonzero
@@ -932,7 +932,7 @@ class BinaryClassificationHeadTest(test.TestCase):
           expected_trainable=("binary_logistic_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self, [
-          "binary_logistic_head/loss",
+          "loss",
           "binary_logistic_head/centered_bias/bias_0"
       ])
       expected_loss = .81326175
@@ -983,7 +983,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_class_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1022,7 +1022,7 @@ class MultiClassHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["multi_class_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.0986123
       _assert_metrics(self, expected_loss, {
           "accuracy": 0.,
@@ -1073,7 +1073,7 @@ class MultiClassHeadTest(test.TestCase):
           expected_trainable=("multi_class_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self,
-                           ["multi_class_head/loss",
+                           ["loss",
                             "multi_class_head/centered_bias/bias_0",
                             "multi_class_head/centered_bias/bias_1",
                             "multi_class_head/centered_bias/bias_2"])
@@ -1091,7 +1091,7 @@ class MultiClassHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_class_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1110,7 +1110,7 @@ class MultiClassHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_class_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 3.1698461
       expected_eval_metrics = {
           "accuracy": 0.,
@@ -1149,7 +1149,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_class_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.5514447
       _assert_metrics(self, expected_loss * weight,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1173,7 +1173,7 @@ class MultiClassHeadTest(test.TestCase):
           logits=self._logits)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["multi_class_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.5514447 * weight
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
@@ -1280,7 +1280,7 @@ class MultiClassHeadTest(test.TestCase):
         data_flow_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
-        _assert_summary_tags(self, ["multi_class_head/loss"])
+        _assert_summary_tags(self, ["loss"])
         expected_loss = 1.5514447
         expected_eval_metrics = {
             "accuracy": 0.,
@@ -1306,7 +1306,7 @@ class MultiClassHeadTest(test.TestCase):
         data_flow_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
-        _assert_summary_tags(self, ["multi_class_head/loss"])
+        _assert_summary_tags(self, ["loss"])
         expected_loss = 0.5514447
         expected_eval_metrics = {
             "accuracy": 1.,
@@ -1345,7 +1345,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_svm_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1375,7 +1375,7 @@ class BinarySvmHeadTest(test.TestCase):
       _assert_variables(
           self, expected_global=w, expected_model=w, expected_trainable=w)
       variables.global_variables_initializer().run()
-      _assert_summary_tags(self, ["binary_svm_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = 1.
       _assert_metrics(self, expected_loss, {
           "accuracy": .5,
@@ -1407,7 +1407,7 @@ class BinarySvmHeadTest(test.TestCase):
       self._assert_output_alternatives(model_fn_ops)
       self.assertIsNone(model_fn_ops.train_op)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_svm_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1426,7 +1426,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_svm_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_loss = np.average(self._expected_losses)
       _assert_metrics(self, expected_loss, {
           "accuracy": 1.,
@@ -1446,7 +1446,7 @@ class BinarySvmHeadTest(test.TestCase):
           logits=self._predictions)
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
-      _assert_summary_tags(self, ["binary_svm_head/loss"])
+      _assert_summary_tags(self, ["loss"])
       expected_weighted_losses = np.multiply(weights, self._expected_losses)
       _assert_metrics(self, np.mean(expected_weighted_losses), {
           "accuracy": 1.,
@@ -1473,7 +1473,7 @@ class BinarySvmHeadTest(test.TestCase):
           expected_trainable=("binary_svm_head/centered_bias_weight:0",))
       variables.global_variables_initializer().run()
       _assert_summary_tags(self, [
-          "binary_svm_head/loss",
+          "loss",
           "binary_svm_head/centered_bias/bias_0"
       ])
       expected_loss = np.average(self._expected_losses)
-- 
GitLab


From f2bab40647d67eb4f486f94cf845ef02e93921af Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <chris.song@kakaocorp.com>
Date: Tue, 2 May 2017 04:59:09 +0900
Subject: [PATCH 0877/1563] Add two unit tests for tensorboard. (#9561)

It checks the number of scalars should be returned.
```
testScalars()
testScalarsCsv()
```
---
 tensorflow/tensorboard/backend/application_test.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index a5181401fa..6a9f7e6079 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -227,6 +227,17 @@ class TensorboardServerTest(test.TestCase):
       response.read()
       connection.close()
 
+  def testScalars(self):
+    """Test the format of /data/scalars."""
+    data = self._getJson('/data/scalars?run=run1&tag=simple_values')
+    self.assertEqual(len(data),self._SCALAR_COUNT)
+
+  def testScalarsCsv(self):
+    """Test the csv format of /data/scalars."""
+    data = self._get('/data/scalars?run=run1&tag=simple_values&format=csv').read()
+    line_count = data.count('\n')
+    self.assertEqual(line_count,self._SCALAR_COUNT + 1) # include 1 more line for header
+
   def testHistograms(self):
     """Test the format of /data/histograms."""
     self.assertEqual(
-- 
GitLab


From 0282080ef3df0187f46fa5972b8cd718d668d4f9 Mon Sep 17 00:00:00 2001
From: Paul Van Eck <pvaneck@us.ibm.com>
Date: Mon, 1 May 2017 12:59:53 -0700
Subject: [PATCH 0878/1563] Fix Community link in README (#9577)

Signed-off-by: Paul Van Eck <pvaneck@us.ibm.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ff1124b99d..2878dab260 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ guidelines](CONTRIBUTING.md).**
 
 **We use [GitHub issues](https://github.com/tensorflow/tensorflow/issues) for
 tracking requests and bugs, but please see
-[Community](tensorflow/docs_src/about/index.md#community) for general questions
+[Community](https://www.tensorflow.org/community/) for general questions
 and discussion.**
 
 ## Installation
-- 
GitLab


From 95f37ebf0bd46c328266f65bbd16d319c0efab3d Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Mon, 1 May 2017 13:01:53 -0700
Subject: [PATCH 0879/1563] Fix build issue when `/usr/bin/python` path is not
 available (#9547)

This fix tries to fix the build error where `PYTHON_BIN_PATH` is not
used in `tf_version_info_genrule()` (which will cause build error
if `python` is not available in the `PATH`).

This could be an issue even if `python` is available yet a different
python location is used in `./configure`.

This fix fixes the issue by passing `$(PYTHON_BIN_PATH)` explicitly
so that same python version could be used:
```udiff
-      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      "$(PYTHON_BIN_PATH) $(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
```

See issue description:

In one of the build machines (Ubuntu 16.04) only python3 is available
(/usr/bin/python3) without python 2:
```
ubuntu@ubuntu:~/tensorflow$ python --version
python: command not found
ubuntu@ubuntu:~/tensorflow$ python3 --version
Python 3.5.2+
ubuntu@ubuntu:~/tensorflow$ which python3
/usr/bin/python3
```

After configure with `/usr/bin/python3`:
```
Please specify the location of python. [Default is /usr/bin/python3]:
...
```

The following is the error:
```
ubuntu@ubuntu:~/tensorflow$ bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
WARNING: /home/ubuntu/tensorflow/tensorflow/contrib/learn/BUILD:15:1: in py_library rule //tensorflow/contrib/learn:learn: target '//tensorflow/contrib/learn:learn' depends on deprecated target '//tensorflow/contrib/session_bundle:exporter': Use SavedModel Builder instead.
WARNING: /home/ubuntu/tensorflow/tensorflow/contrib/learn/BUILD:15:1: in py_library rule //tensorflow/contrib/learn:learn: target '//tensorflow/contrib/learn:learn' depends on deprecated target '//tensorflow/contrib/session_bundle:gc': Use SavedModel instead.
INFO: Found 1 target...
ERROR: /home/ubuntu/tensorflow/tensorflow/core/BUILD:1363:1: Executing genrule //tensorflow/core:version_info_gen failed: bash failed: error executing command /bin/bash -c ... (remaining 1 argument(s) skipped): com.google.devtools.build.lib.shell.BadExitStatusException: Process exited with status 127.
/usr/bin/env: 'python': No such file or directory
Target //tensorflow/tools/pip_package:build_pip_package failed to build
Use --verbose_failures to see the command lines of failed build steps.
INFO: Elapsed time: 3.548s, Critical Path: 0.20s
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
---
 tensorflow/tensorflow.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index ddffabd8cb..7baddf301c 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -1185,7 +1185,7 @@ def tf_version_info_genrule():
       ],
       outs=["util/version_info.cc"],
       cmd=
-      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      "$(PYTHON_BIN_PATH) $(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
       local=1,
       tools=[clean_dep("//tensorflow/tools/git:gen_git_source.py")],)
 
-- 
GitLab


From 99edb91f178bb6814188ece8a8239999976a029d Mon Sep 17 00:00:00 2001
From: Li Chen <li-ch@users.noreply.github.com>
Date: Tue, 2 May 2017 04:02:21 +0800
Subject: [PATCH 0880/1563] Add ibverbs support for RoCEv2 networks (#9432)

* add gid to enable running on roce

* fix typo

* add gid definition in rdma.h

* fix typo

* gid changed to snp and iid

* typo

* increase hop_limit to its upperbound
---
 tensorflow/contrib/verbs/grpc_verbs_service.cc |  4 ++++
 tensorflow/contrib/verbs/rdma.cc               | 16 ++++++++++++++--
 tensorflow/contrib/verbs/rdma.h                |  2 ++
 tensorflow/contrib/verbs/rdma_mgr.cc           |  4 ++++
 tensorflow/contrib/verbs/verbs_service.proto   |  2 ++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/verbs/grpc_verbs_service.cc b/tensorflow/contrib/verbs/grpc_verbs_service.cc
index e73b2700bd..f2af6b79fb 100644
--- a/tensorflow/contrib/verbs/grpc_verbs_service.cc
+++ b/tensorflow/contrib/verbs/grpc_verbs_service.cc
@@ -117,6 +117,8 @@ Status GrpcVerbsService::GetRemoteAddressSync(
   ra.lid = request->channel().lid();
   ra.qpn = request->channel().qpn();
   ra.psn = request->channel().psn();
+  ra.snp = request->channel().snp();
+  ra.iid = request->channel().iid();
   rc->SetRemoteAddress(ra, false);
   rc->Connect();
   int i = 0;
@@ -146,6 +148,8 @@ Status GrpcVerbsService::GetRemoteAddressSync(
   channel_info->set_lid(rc->self().lid);
   channel_info->set_qpn(rc->self().qpn);
   channel_info->set_psn(rc->self().psn);
+  channel_info->set_snp(rc->self().snp);
+  channel_info->set_iid(rc->self().iid);
   for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
     MemoryRegion* mr = response->add_mr();
     mr->set_remote_addr(reinterpret_cast<uint64>(mb[i]->buffer()));
diff --git a/tensorflow/contrib/verbs/rdma.cc b/tensorflow/contrib/verbs/rdma.cc
index 53d840f5d1..de33e5ed83 100644
--- a/tensorflow/contrib/verbs/rdma.cc
+++ b/tensorflow/contrib/verbs/rdma.cc
@@ -271,6 +271,10 @@ RdmaChannel::RdmaChannel(const RdmaAdapter* adapter, const string local_name,
     self_.lid = attr.lid;
     self_.qpn = qp_->qp_num;
     self_.psn = static_cast<uint32_t>(random::New64()) & 0xffffff;
+    union ibv_gid gid;
+    CHECK(!ibv_query_gid(adapter_->context_, (uint8_t) 1, 0, &gid)) << "Query gid";
+    self_.snp = gid.global.subnet_prefix;
+    self_.iid = gid.global.interface_id;
   }
 
   // create message and ack buffers, then initialize the tables.
@@ -320,11 +324,15 @@ void RdmaChannel::SetRemoteAddress(const RdmaAddress& ra, bool override) {
     remote_.lid = ra.lid;
     remote_.qpn = ra.qpn;
     remote_.psn = ra.psn;
+    remote_.snp = ra.snp;
+    remote_.iid = ra.iid;
     remote_set_ = true;
   } else {
     CHECK(remote_.lid == ra.lid);
     CHECK(remote_.qpn == ra.qpn);
     CHECK(remote_.psn == ra.psn);
+    CHECK(remote_.snp == ra.snp);
+    CHECK(remote_.iid == ra.iid);
   }
 }
 
@@ -471,8 +479,12 @@ void RdmaChannel::Connect(const RdmaAddress& remoteAddr) {
     attr.dest_qp_num = remoteAddr.qpn;
     attr.rq_psn = remoteAddr.psn;
     attr.max_dest_rd_atomic = 1;
-    attr.min_rnr_timer = 12;
-    attr.ah_attr.is_global = 0;
+    attr.min_rnr_timer = 12;   
+    attr.ah_attr.is_global = 1;
+    attr.ah_attr.grh.dgid.global.subnet_prefix = remoteAddr.snp;
+    attr.ah_attr.grh.dgid.global.interface_id = remoteAddr.iid;
+    attr.ah_attr.grh.flow_label = 0;
+    attr.ah_attr.grh.hop_limit = 255;
     attr.ah_attr.dlid = remoteAddr.lid;
     attr.ah_attr.sl = 0;
     attr.ah_attr.src_path_bits = 0;
diff --git a/tensorflow/contrib/verbs/rdma.h b/tensorflow/contrib/verbs/rdma.h
index ae2aa63e3f..10cbbe58d9 100644
--- a/tensorflow/contrib/verbs/rdma.h
+++ b/tensorflow/contrib/verbs/rdma.h
@@ -40,6 +40,8 @@ struct RdmaAddress {
   uint32_t lid;
   uint32_t qpn;
   uint32_t psn;
+  uint64_t snp;
+  uint64_t iid;
 };
 // structure to save information for remote memory regions.
 struct RemoteMR {
diff --git a/tensorflow/contrib/verbs/rdma_mgr.cc b/tensorflow/contrib/verbs/rdma_mgr.cc
index e28b80c6f6..09b878843f 100644
--- a/tensorflow/contrib/verbs/rdma_mgr.cc
+++ b/tensorflow/contrib/verbs/rdma_mgr.cc
@@ -69,6 +69,8 @@ void RdmaMgr::SetupChannels() {
     channel_info->set_lid(rc->self_.lid);
     channel_info->set_qpn(rc->self_.qpn);
     channel_info->set_psn(rc->self_.psn);
+    channel_info->set_snp(rc->self_.snp);
+    channel_info->set_iid(rc->self_.iid);
     for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
       MemoryRegion* mr = req.add_mr();
       mr->set_remote_addr(
@@ -85,6 +87,8 @@ void RdmaMgr::SetupChannels() {
       ra.lid = resp.channel().lid();
       ra.qpn = resp.channel().qpn();
       ra.psn = resp.channel().psn();
+      ra.snp = resp.channel().snp();
+      ra.iid = resp.channel().iid();
       rc->SetRemoteAddress(ra, false);
       rc->Connect();
       int i = 0;
diff --git a/tensorflow/contrib/verbs/verbs_service.proto b/tensorflow/contrib/verbs/verbs_service.proto
index b985febfb8..0df1fed4b9 100644
--- a/tensorflow/contrib/verbs/verbs_service.proto
+++ b/tensorflow/contrib/verbs/verbs_service.proto
@@ -30,6 +30,8 @@ message Channel {
   int32 lid = 1;
   int32 qpn = 2;
   int32 psn = 3;
+  uint64 snp = 4;
+  uint64 iid = 5;
 }
 
 message MemoryRegion {
-- 
GitLab


From dbdc9fc2ed2e8f9b247c8b2980b0bcd079e39359 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 1 May 2017 11:55:26 -0800
Subject: [PATCH 0881/1563] Add should-use for commonly misused ops.

Fixed a bunch of invalid callers (by initially using should_use_with_fatal and looking for failing unit tests)
Change: 154748211
---
 .../python/ops/quantized_distribution.py      |  2 +-
 .../python/learn/estimators/estimator.py      |  3 --
 .../kernel_tests/tensor_array_ops_test.py     |  2 +-
 tensorflow/python/ops/control_flow_ops.py     |  2 +
 tensorflow/python/ops/image_ops_impl.py       | 38 ++++++++++--------
 tensorflow/python/ops/image_ops_test.py       | 14 +------
 tensorflow/python/ops/resources.py            |  2 +
 tensorflow/python/ops/tensor_array_ops.py     |  6 +++
 tensorflow/python/ops/variables.py            |  7 ++++
 tensorflow/python/util/tf_should_use.py       | 39 ++++++++++++++++---
 tensorflow/python/util/tf_should_use_test.py  |  8 ++--
 11 files changed, 81 insertions(+), 42 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/ops/quantized_distribution.py b/tensorflow/contrib/distributions/python/ops/quantized_distribution.py
index ac027f0f43..8aebb79b91 100644
--- a/tensorflow/contrib/distributions/python/ops/quantized_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/quantized_distribution.py
@@ -232,7 +232,7 @@ class QuantizedDistribution(distributions.Distribution):
       graph_parents = self._dist._graph_parents  # pylint: disable=protected-access
 
       checks = []
-      if low is not None and high is not None:
+      if validate_args and low is not None and high is not None:
         message = "low must be strictly less than high."
         checks.append(
             check_ops.assert_less(
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 4ca3120dec..123db50d32 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -1287,9 +1287,6 @@ class Estimator(BaseEstimator):
       else:
         saver_for_restore = saver.Saver(sharded=True)
       with tf_session.Session('') as session:
-        variables.initialize_local_variables()
-        data_flow_ops.tables_initializer()
-        resources.initialize_resources(resources.shared_resources())
         saver_for_restore.restore(session, checkpoint_path)
         init_op = control_flow_ops.group(
             variables.local_variables_initializer(),
diff --git a/tensorflow/python/kernel_tests/tensor_array_ops_test.py b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
index 0fec42e1db..41fe29e006 100644
--- a/tensorflow/python/kernel_tests/tensor_array_ops_test.py
+++ b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
@@ -1128,7 +1128,7 @@ class TensorArrayTest(test.TestCase):
           dtype=dtypes.float32, size=0, dynamic_size=False, infer_shape=True)
       self.assertEqual(0, ta.size().eval())
       # Don't actually perform the pack.  This stores the static shape.
-      ta.unstack(array_ops.zeros([0, 3, 5]))
+      ta.unstack(array_ops.zeros([0, 3, 5])).mark_used()
       packed = ta.stack()
       self.assertAllEqual([0, 3, 5], packed.eval().shape)
       # Concatenating zero tensors along their first dimension gives a
diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index 75a537643e..ebe5259de5 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -72,6 +72,7 @@ from tensorflow.python.ops.gen_control_flow_ops import *
 # pylint: enable=wildcard-import
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import nest
+from tensorflow.python.util import tf_should_use
 
 
 # We override the 'tuple' for a control flow op, so we keep python's
@@ -84,6 +85,7 @@ _basetuple = tuple
 
 # Assert and Print are special symbols in python, so we must
 # use an upper-case version of them.
+@tf_should_use.should_use_result
 def Assert(condition, data, summarize=None, name=None):
   """Asserts that the given condition is true.
 
diff --git a/tensorflow/python/ops/image_ops_impl.py b/tensorflow/python/ops/image_ops_impl.py
index 78621d3b57..c79f413c5e 100644
--- a/tensorflow/python/ops/image_ops_impl.py
+++ b/tensorflow/python/ops/image_ops_impl.py
@@ -218,7 +218,8 @@ def random_flip_up_down(image, seed=None):
     ValueError: if the shape of `image` not supported.
   """
   image = ops.convert_to_tensor(image, name='image')
-  _Check3DImage(image, require_static=False)
+  image = control_flow_ops.with_dependencies(
+      _Check3DImage(image, require_static=False), image)
   uniform_random = random_ops.random_uniform([], 0, 1.0, seed=seed)
   mirror_cond = math_ops.less(uniform_random, .5)
   result = control_flow_ops.cond(mirror_cond,
@@ -246,7 +247,8 @@ def random_flip_left_right(image, seed=None):
     ValueError: if the shape of `image` not supported.
   """
   image = ops.convert_to_tensor(image, name='image')
-  _Check3DImage(image, require_static=False)
+  image = control_flow_ops.with_dependencies(
+      _Check3DImage(image, require_static=False), image)
   uniform_random = random_ops.random_uniform([], 0, 1.0, seed=seed)
   mirror_cond = math_ops.less(uniform_random, .5)
   result = control_flow_ops.cond(mirror_cond,
@@ -273,7 +275,8 @@ def flip_left_right(image):
     ValueError: if the shape of `image` not supported.
   """
   image = ops.convert_to_tensor(image, name='image')
-  _Check3DImage(image, require_static=False)
+  image = control_flow_ops.with_dependencies(
+      _Check3DImage(image, require_static=False), image)
   return fix_image_flip_shape(image, array_ops.reverse(image, [1]))
 
 
@@ -295,7 +298,8 @@ def flip_up_down(image):
     ValueError: if the shape of `image` not supported.
   """
   image = ops.convert_to_tensor(image, name='image')
-  _Check3DImage(image, require_static=False)
+  image = control_flow_ops.with_dependencies(
+      _Check3DImage(image, require_static=False), image)
   return fix_image_flip_shape(image, array_ops.reverse(image, [0]))
 
 
@@ -312,7 +316,8 @@ def rot90(image, k=1, name=None):
   """
   with ops.name_scope(name, 'rot90', [image, k]) as scope:
     image = ops.convert_to_tensor(image, name='image')
-    _Check3DImage(image, require_static=False)
+    image = control_flow_ops.with_dependencies(
+        _Check3DImage(image, require_static=False), image)
     k = ops.convert_to_tensor(k, dtype=dtypes.int32, name='k')
     k.get_shape().assert_has_rank(0)
     k = math_ops.mod(k, 4)
@@ -350,7 +355,8 @@ def transpose_image(image):
     ValueError: if the shape of `image` not supported.
   """
   image = ops.convert_to_tensor(image, name='image')
-  _Check3DImage(image, require_static=False)
+  image = control_flow_ops.with_dependencies(
+      _Check3DImage(image, require_static=False), image)
   return array_ops.transpose(image, [1, 0, 2], name='transpose_image')
 
 
@@ -379,12 +385,14 @@ def central_crop(image, central_fraction):
     3-D float Tensor
   """
   image = ops.convert_to_tensor(image, name='image')
-  _Check3DImage(image, require_static=False)
   if central_fraction <= 0.0 or central_fraction > 1.0:
     raise ValueError('central_fraction must be within (0, 1]')
   if central_fraction == 1.0:
     return image
 
+  image = control_flow_ops.with_dependencies(
+      _Check3DImage(image, require_static=False), image)
+
   img_shape = array_ops.shape(image)
   depth = image.get_shape()[2]
   fraction_offset = int(1 / ((1 - central_fraction) / 2.0))
@@ -435,9 +443,6 @@ def pad_to_bounding_box(image, offset_height, offset_width, target_height,
   """
   image = ops.convert_to_tensor(image, name='image')
 
-  assert_ops = []
-  assert_ops += _CheckAtLeast3DImage(image, require_static=False)
-
   is_batch = True
   image_shape = image.get_shape()
   if image_shape.ndims == 3:
@@ -450,6 +455,8 @@ def pad_to_bounding_box(image, offset_height, offset_width, target_height,
   elif image_shape.ndims != 4:
     raise ValueError('\'image\' must have either 3 or 4 dimensions.')
 
+  assert_ops = _CheckAtLeast3DImage(image, require_static=False)
+
   batch, height, width, depth = _ImageDimensions(image, rank=4)
 
   after_padding_width = target_width - offset_width - width
@@ -515,9 +522,6 @@ def crop_to_bounding_box(image, offset_height, offset_width, target_height,
   """
   image = ops.convert_to_tensor(image, name='image')
 
-  assert_ops = []
-  assert_ops += _CheckAtLeast3DImage(image, require_static=False)
-
   is_batch = True
   image_shape = image.get_shape()
   if image_shape.ndims == 3:
@@ -530,6 +534,8 @@ def crop_to_bounding_box(image, offset_height, offset_width, target_height,
   elif image_shape.ndims != 4:
     raise ValueError('\'image\' must have either 3 or 4 dimensions.')
 
+  assert_ops = _CheckAtLeast3DImage(image, require_static=False)
+
   batch, height, width, depth = _ImageDimensions(image, rank=4)
 
   assert_ops += _assert(offset_width >= 0, ValueError,
@@ -602,8 +608,7 @@ def resize_image_with_crop_or_pad(image, target_height, target_width):
   elif image_shape.ndims != 4:
     raise ValueError('\'image\' must have either 3 or 4 dimensions.')
 
-  assert_ops = []
-  assert_ops += _CheckAtLeast3DImage(image, require_static=False)
+  assert_ops = _CheckAtLeast3DImage(image, require_static=False)
   assert_ops += _assert(target_width > 0, ValueError,
                         'target_width must be > 0.')
   assert_ops += _assert(target_height > 0, ValueError,
@@ -800,7 +805,8 @@ def per_image_standardization(image):
     ValueError: if the shape of 'image' is incompatible with this function.
   """
   image = ops.convert_to_tensor(image, name='image')
-  _Check3DImage(image, require_static=False)
+  image = control_flow_ops.with_dependencies(
+      _Check3DImage(image, require_static=False), image)
   num_pixels = math_ops.reduce_prod(array_ops.shape(image))
 
   image = math_ops.cast(image, dtype=dtypes.float32)
diff --git a/tensorflow/python/ops/image_ops_test.py b/tensorflow/python/ops/image_ops_test.py
index 716d767b0c..1a70d46507 100644
--- a/tensorflow/python/ops/image_ops_test.py
+++ b/tensorflow/python/ops/image_ops_test.py
@@ -1175,12 +1175,7 @@ class CropToBoundingBoxTest(test_util.TensorFlowTestCase):
     offset_height, offset_width = [0, 0]
     target_height, target_width = [2, 2]
 
-    for x_shape in ([3, 5],):
-      self._assertRaises(x, x_shape, offset_height, offset_width, target_height,
-                         target_width,
-                         "'image' must be at least three-dimensional.")
-
-    for x_shape in ([1, 3, 5, 1, 1],):
+    for x_shape in ([3, 5], [1, 3, 5, 1, 1]):
       self._assertRaises(x, x_shape, offset_height, offset_width, target_height,
                          target_width,
                          "'image' must have either 3 or 4 dimensions.")
@@ -1426,12 +1421,7 @@ class PadToBoundingBoxTest(test_util.TensorFlowTestCase):
     offset_height, offset_width = [0, 0]
     target_height, target_width = [2, 2]
 
-    for x_shape in ([3, 5],):
-      self._assertRaises(x, x_shape, offset_height, offset_width, target_height,
-                         target_width,
-                         "'image' must be at least three-dimensional")
-
-    for x_shape in ([1, 3, 5, 1, 1],):
+    for x_shape in ([3, 5], [1, 3, 5, 1, 1]):
       self._assertRaises(x, x_shape, offset_height, offset_width, target_height,
                          target_width,
                          "'image' must have either 3 or 4 dimensions.")
diff --git a/tensorflow/python/ops/resources.py b/tensorflow/python/ops/resources.py
index 41fb8a74a9..57ba0084e8 100644
--- a/tensorflow/python/ops/resources.py
+++ b/tensorflow/python/ops/resources.py
@@ -27,6 +27,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.util import tf_should_use
 
 
 _Resource = collections.namedtuple("_Resource",
@@ -98,6 +99,7 @@ def report_uninitialized_resources(resource_list=None,
     return array_ops.boolean_mask(variable_names_tensor, variables_mask)
 
 
+@tf_should_use.should_use_result
 def initialize_resources(resource_list, name="init"):
   """Initializes the resources in the given list.
 
diff --git a/tensorflow/python/ops/tensor_array_ops.py b/tensorflow/python/ops/tensor_array_ops.py
index d1013c53dd..b1c7d74a0c 100644
--- a/tensorflow/python/ops/tensor_array_ops.py
+++ b/tensorflow/python/ops/tensor_array_ops.py
@@ -28,6 +28,7 @@ from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gen_data_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.util import tf_should_use
 
 
 def _maybe_set_device(handle_op, value_t):
@@ -252,6 +253,7 @@ class TensorArray(object):
         value.set_shape(self._element_shape[0].dims)
       return value
 
+  @tf_should_use.should_use_result
   def write(self, index, value, name=None):
     """Write `value` into index `index` of the TensorArray.
 
@@ -358,6 +360,7 @@ class TensorArray(object):
         value.set_shape([None] + self._element_shape[0].dims[1:])
       return value
 
+  @tf_should_use.should_use_result
   def unstack(self, value, name=None):
     """Unstack the values of a `Tensor` in the TensorArray.
 
@@ -380,6 +383,7 @@ class TensorArray(object):
       return self.scatter(
           indices=math_ops.range(0, num_elements), value=value, name=name)
 
+  @tf_should_use.should_use_result
   def scatter(self, indices, value, name=None):
     """Scatter the values of a `Tensor` in specific indices of a `TensorArray`.
 
@@ -418,6 +422,7 @@ class TensorArray(object):
         ta._merge_element_shape(element_shape)
       return ta
 
+  @tf_should_use.should_use_result
   def split(self, value, lengths, name=None):
     """Split the values of a `Tensor` into the TensorArray.
 
@@ -466,6 +471,7 @@ class TensorArray(object):
       return gen_data_flow_ops._tensor_array_size_v3(
           handle=self._handle, flow_in=self.flow, name=name)
 
+  @tf_should_use.should_use_result
   def close(self, name=None):
     """Close the current TensorArray."""
     with ops.colocate_with(self._handle):
diff --git a/tensorflow/python/ops/variables.py b/tensorflow/python/ops/variables.py
index 8b508e45a4..33523f1a71 100644
--- a/tensorflow/python/ops/variables.py
+++ b/tensorflow/python/ops/variables.py
@@ -27,6 +27,7 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.util import compat
+from tensorflow.python.util import tf_should_use
 from tensorflow.python.util.deprecation import deprecated
 
 
@@ -1152,6 +1153,7 @@ def variables_initializer(var_list, name="init"):
   return control_flow_ops.no_op(name=name)
 
 
+@tf_should_use.should_use_result
 @deprecated("2017-03-02", "Use `tf.variables_initializer` instead.")
 def initialize_variables(var_list, name="init"):
   """See `tf.variables_initializer`."""
@@ -1169,6 +1171,7 @@ def global_variables_initializer():
   return variables_initializer(global_variables())
 
 
+@tf_should_use.should_use_result
 @deprecated("2017-03-02", "Use `tf.global_variables_initializer` instead.")
 def initialize_all_variables():
   """See `tf.global_variables_initializer`."""
@@ -1186,12 +1189,14 @@ def local_variables_initializer():
   return variables_initializer(local_variables())
 
 
+@tf_should_use.should_use_result
 @deprecated("2017-03-02", "Use `tf.local_variables_initializer` instead.")
 def initialize_local_variables():
   """See `tf.local_variables_initializer`."""
   return local_variables_initializer()
 
 
+@tf_should_use.should_use_result
 def is_variable_initialized(variable):
   """Tests if a variable has been initialized.
 
@@ -1205,6 +1210,7 @@ def is_variable_initialized(variable):
   return state_ops.is_variable_initialized(variable)
 
 
+@tf_should_use.should_use_result
 def assert_variables_initialized(var_list=None):
   """Returns an Op to check if variables are initialized.
 
@@ -1246,6 +1252,7 @@ def assert_variables_initialized(var_list=None):
       return array_ops.stack(ranks)
 
 
+@tf_should_use.should_use_result
 def report_uninitialized_variables(var_list=None,
                                    name="report_uninitialized_variables"):
   """Adds ops to list the names of uninitialized variables.
diff --git a/tensorflow/python/util/tf_should_use.py b/tensorflow/python/util/tf_should_use.py
index a6a1ad4892..88df3351e6 100644
--- a/tensorflow/python/util/tf_should_use.py
+++ b/tensorflow/python/util/tf_should_use.py
@@ -22,6 +22,7 @@ import traceback
 import types
 
 from tensorflow.python.platform import tf_logging
+from tensorflow.python.util import tf_decorator
 
 
 def _add_should_use_warning(x, fatal_error=False):
@@ -36,6 +37,13 @@ def _add_should_use_warning(x, fatal_error=False):
     An instance of `TFShouldUseWarningWrapper` which subclasses `type(x)`
     and is a very shallow wrapper for `x` which logs access into `x`.
   """
+  if x is None:  # special corner case where x is None
+    return x
+  has_been_used = getattr(x, '_tf_object_has_been_used', None)
+  if has_been_used is not None:
+    x._tf_object_has_been_used = has_been_used  # pylint: disable=protected-access
+    return x
+
   def override_method(method):
     def fn(self, *args, **kwargs):
       self._tf_object_has_been_used = True  # pylint: disable=protected-access
@@ -67,18 +75,27 @@ def _add_should_use_warning(x, fatal_error=False):
         else:
           logger = tf_logging.error
         logger(
-            'Object was never used: %s.\nIt was originally created here:\n%s'
-            % (self, self._tf_object_creation_stack))
+            '==================================\n'
+            'Object was never used (type %s):\n%s\nIf you want to mark it as '
+            'used call its "mark_used()" method.\nIt was originally created '
+            'here:\n%s\n'
+            '==================================' %
+            (type(x), x, self._tf_object_creation_stack))
 
       if hasattr(super(TFShouldUseWarningWrapper, self), '__del__'):
         return super(TFShouldUseWarningWrapper, self).__del__()
+
+    def mark_used(self, *args, **kwargs):
+      self._tf_object_has_been_used = True
+      if hasattr(super(TFShouldUseWarningWrapper, self), 'mark_used'):
+        return super(TFShouldUseWarningWrapper, self).mark_used(*args, **kwargs)
     # pylint: enable=super-on-old-class
 
   for name in dir(TFShouldUseWarningWrapper):
     method = getattr(TFShouldUseWarningWrapper, name)
     if not isinstance(method, types.FunctionType):
       continue
-    if name in ('__init__', '__getattribute__', '__del__'):
+    if name in ('__init__', '__getattribute__', '__del__', 'mark_used'):
       continue
     setattr(TFShouldUseWarningWrapper, name,
             functools.wraps(method)(override_method(method)))
@@ -114,7 +131,13 @@ def should_use_result(fn):
   """
   def wrapped(*args, **kwargs):
     return _add_should_use_warning(fn(*args, **kwargs))
-  return functools.wraps(fn)(wrapped)
+  return tf_decorator.make_decorator(
+      fn, wrapped, 'should_use_result',
+      ((fn.__doc__ or '') +
+       ('\n\n  '
+        '**NOTE** The output of this function should be used.  If it is not, '
+        'a warning will be logged.  To mark the output as used, '
+        'call its .mark_used() method.')))
 
 
 def must_use_result_or_fatal(fn):
@@ -142,4 +165,10 @@ def must_use_result_or_fatal(fn):
   """
   def wrapped(*args, **kwargs):
     return _add_should_use_warning(fn(*args, **kwargs), fatal_error=True)
-  return functools.wraps(fn)(wrapped)
+  return tf_decorator.make_decorator(
+      fn, wrapped, 'must_use_result_or_fatal',
+      ((fn.__doc__ or '') +
+       ('\n\n  '
+        '**NOTE** The output of this function must be used.  If it is not, '
+        'a fatal error will be raised.  To mark the output as used, '
+        'call its .mark_used() method.')))
diff --git a/tensorflow/python/util/tf_should_use_test.py b/tensorflow/python/util/tf_should_use_test.py
index 09130eed3a..71d48e3dde 100644
--- a/tensorflow/python/util/tf_should_use_test.py
+++ b/tensorflow/python/util/tf_should_use_test.py
@@ -52,7 +52,7 @@ class TfShouldUseTest(test.TestCase):
         h = tf_should_use._add_should_use_warning(c)
         del h
       in_this_function()
-    self.assertIn('Object was never used:', '\n'.join(captured))
+    self.assertIn('Object was never used', '\n'.join(captured))
     self.assertIn('blah:0', '\n'.join(captured))
     self.assertIn('in_this_function', '\n'.join(captured))
 
@@ -63,7 +63,7 @@ class TfShouldUseTest(test.TestCase):
       h = tf_should_use._add_should_use_warning(c)
       fn(h)
       del h
-    self.assertNotIn('Object was never used:', '\n'.join(captured))
+    self.assertNotIn('Object was never used', '\n'.join(captured))
     self.assertNotIn('blah:0', '\n'.join(captured))
 
   def testAddShouldUseWarningWhenUsedWithAdd(self):
@@ -83,7 +83,7 @@ class TfShouldUseTest(test.TestCase):
     captured = []
     with reroute_error(captured):
       return_const(0.0)
-    self.assertIn('Object was never used:', '\n'.join(captured))
+    self.assertIn('Object was never used', '\n'.join(captured))
     self.assertIn('blah:0', '\n'.join(captured))
     self.assertIn('return_const', '\n'.join(captured))
 
@@ -99,7 +99,7 @@ class TfShouldUseTest(test.TestCase):
         # unused op as being "used".
         v = constant_op.constant(1.0, name='meh')
         v.eval()
-    self.assertIn('Object was never used:', '\n'.join(captured))
+    self.assertIn('Object was never used', '\n'.join(captured))
     self.assertIn('blah:0', '\n'.join(captured))
     self.assertIn('return_const', '\n'.join(captured))
 
-- 
GitLab


From 0388bb0e2d7c4ddeef7c51d1a1eafebfbd8f2ed4 Mon Sep 17 00:00:00 2001
From: Olivia Nordquist <nolivia@google.com>
Date: Mon, 1 May 2017 12:19:53 -0800
Subject: [PATCH 0882/1563] removing lesser known latin abbreviation Change:
 154751087

---
 tensorflow/docs_src/programmers_guide/variables.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/programmers_guide/variables.md b/tensorflow/docs_src/programmers_guide/variables.md
index 04bfca5f3b..e8d1e519f0 100644
--- a/tensorflow/docs_src/programmers_guide/variables.md
+++ b/tensorflow/docs_src/programmers_guide/variables.md
@@ -62,7 +62,7 @@ with tf.device("/job:ps/task:7"):
   v = tf.Variable(...)
 ```
 
-**N.B.** Operations that mutate a variable, such as
+**NOTE** Operations that mutate a variable, such as
 @{tf.Variable.assign} and the parameter
 update operations in a
 @{tf.train.Optimizer} *must* run on
-- 
GitLab


From cd2789e5e771fd01fa4bc3f00ae93f089ed30b65 Mon Sep 17 00:00:00 2001
From: Nghia Tran <nghiattran3@gmail.com>
Date: Mon, 1 May 2017 16:32:31 -0400
Subject: [PATCH 0883/1563] Add link for Xavier initializer paper and update
 example for zero_faction function (#9426)

* Add link for Xavier initializer paper and update example for zero_faction function

* fixed broken link

* use template instead of path for doc links
---
 .../contrib/layers/python/layers/initializers.py       | 10 ++++------
 tensorflow/python/ops/nn_impl.py                       |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/initializers.py b/tensorflow/contrib/layers/python/layers/initializers.py
index 4359d0c63e..9fb9a3e257 100644
--- a/tensorflow/contrib/layers/python/layers/initializers.py
+++ b/tensorflow/contrib/layers/python/layers/initializers.py
@@ -34,9 +34,9 @@ def xavier_initializer(uniform=True, seed=None, dtype=dtypes.float32):
   This function implements the weight initialization from:
 
   Xavier Glorot and Yoshua Bengio (2010):
-           Understanding the difficulty of training deep feedforward neural
+           [Understanding the difficulty of training deep feedforward neural
            networks. International conference on artificial intelligence and
-           statistics.
+           statistics.](http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.207.2059&rep=rep1&type=pdf)
 
   This initializer is designed to keep the scale of the gradients roughly the
   same in all layers. In uniform distribution this ends up being the range:
@@ -46,8 +46,7 @@ def xavier_initializer(uniform=True, seed=None, dtype=dtypes.float32):
   Args:
     uniform: Whether to use uniform or normal distributed random initialization.
     seed: A Python integer. Used to create random seeds. See
-      [`set_random_seed`](../../api_docs/python/constant_op.md#set_random_seed)
-      for behavior.
+      @{set_random_seed} for behavior.
     dtype: The data type. Only floating point types are supported.
 
   Returns:
@@ -97,8 +96,7 @@ def variance_scaling_initializer(factor=2.0, mode='FAN_IN', uniform=False,
     mode: String.  'FAN_IN', 'FAN_OUT', 'FAN_AVG'.
     uniform: Whether to use uniform or normal distributed random initialization.
     seed: A Python integer. Used to create random seeds. See
-      [`set_random_seed`](../../api_docs/python/constant_op.md#set_random_seed)
-      for behavior.
+      @{set_random_seed} for behavior.
     dtype: The data type. Only floating point types are supported.
 
   Returns:
diff --git a/tensorflow/python/ops/nn_impl.py b/tensorflow/python/ops/nn_impl.py
index 7c17cf2cb6..0a00e3d765 100644
--- a/tensorflow/python/ops/nn_impl.py
+++ b/tensorflow/python/ops/nn_impl.py
@@ -301,9 +301,8 @@ def zero_fraction(value, name=None):
   This is useful in summaries to measure and report sparsity.  For example,
 
   ```python
-      z = tf.Relu(...)
-      summ = tf.contrib.deprecated.scalar_summary('sparsity',
-      tf.nn.zero_fraction(z))
+      z = tf.nn.relu(...)
+      summ = tf.summary.scalar('sparsity', tf.nn.zero_fraction(z))
   ```
 
   Args:
-- 
GitLab


From 3bdea6179da97ce309a48f31ca5f311ebf36506f Mon Sep 17 00:00:00 2001
From: Paul Van Eck <pvaneck@us.ibm.com>
Date: Mon, 1 May 2017 13:42:34 -0700
Subject: [PATCH 0884/1563] Fix TF-Slim TFExampleDecoder link/references in
 README (#9349)

The slim/data README references the tfexample_decoder.py file as
tfexample_data_decoder.py. This commit fixes the corresponding
broken link and adjusts any additional references accordingly.

Signed-off-by: Paul Van Eck <pvaneck@us.ibm.com>
---
 tensorflow/contrib/slim/python/slim/data/README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/data/README.md b/tensorflow/contrib/slim/python/slim/data/README.md
index 858c694990..fe15a10b99 100644
--- a/tensorflow/contrib/slim/python/slim/data/README.md
+++ b/tensorflow/contrib/slim/python/slim/data/README.md
@@ -71,27 +71,27 @@ for item in data_decoder.list_items():
   print(item)
 ```
 
-## Example: TFExampleDataDecoder
+## Example: TFExampleDecoder
 
 The
-[tfexample_data_decoder.py](https://www.tensorflow.org/code/tensorflow/contrib/slim/python/slim/data/tfexample_data_decoder.py)
+[tfexample_decoder.py](https://www.tensorflow.org/code/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py)
 is a data decoder which decodes serialized `TFExample` protocol buffers. A
 `TFExample` protocol buffer is a map from keys (strings) to either a
 `tf.FixedLenFeature` or `tf.VarLenFeature`. Consequently, to decode a
 `TFExample`, one must provide a mapping from one or more `TFExample` fields
-to each of the `items` that the `tfexample_data_decoder` can provide. For
+to each of the `items` that the `tfexample_decoder` can provide. For
 example, a dataset of `TFExamples` might store images in various formats and
 each `TFExample` might contain an `encoding` key and a `format` key which can
 be used to decode the image using the appropriate decoder (jpg, png, etc).
 
-To make this possible, the `tfexample_data_decoder` is constructed by specifying
+To make this possible, the `tfexample_decoder` is constructed by specifying
 the a map of `TFExample` keys to either `tf.FixedLenFeature` or
 `tf.VarLenFeature` as well as a set of `ItemHandlers`. An `ItemHandler`
 provides a mapping from `TFExample` keys to the item being provided. Because a
-`tfexample_data_decoder` might return multiple `items`, one often constructs a
-`tfexample_data_decoder` using multiple `ItemHandlers`.
+`tfexample_decoder` might return multiple `items`, one often constructs a
+`tfexample_decoder` using multiple `ItemHandlers`.
 
-`tfexample_data_decoder` provides some predefined `ItemHandlers` which take care
+`tfexample_decoder` provides some predefined `ItemHandlers` which take care
 of the common cases of mapping `TFExamples` to images, `Tensors` and
 `SparseTensors`. For example, the following specification might be
 used to decode a dataset of images:
-- 
GitLab


From 54d78fdb9461111af31dc2c8d08db833a6402e17 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Mon, 1 May 2017 12:30:30 -0800
Subject: [PATCH 0885/1563] Fixes latex in math ops' documentation. Change:
 154752402

---
 tensorflow/core/ops/math_ops.cc           | 47 +++++++++++------------
 tensorflow/python/ops/special_math_ops.py | 15 ++++----
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index aafbd1b5cc..494358fec6 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -662,13 +662,12 @@ Compute the upper regularized incomplete Gamma function `Q(a, x)`.
 
 The upper regularized incomplete Gamma function is defined as:
 
-```
-Q(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)
-```
+\\(Q(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)\\)
+
 where
-```
-Gamma(a, x) = int_{x}^{\infty} t^{a-1} exp(-t) dt
-```
+
+\\(Gamma(a, x) = int_{x}^{\infty} t^{a-1} exp(-t) dt\\)
+
 is the upper incomplete Gama function.
 
 Note, above `P(a, x)` (`Igamma`) is the lower regularized complete
@@ -686,13 +685,13 @@ Compute the lower regularized incomplete Gamma function `Q(a, x)`.
 
 The lower regularized incomplete Gamma function is defined as:
 
-```
-P(a, x) = gamma(a, x) / Gamma(a) = 1 - Q(a, x)
-```
+
+\\(P(a, x) = gamma(a, x) / Gamma(a) = 1 - Q(a, x)\\)
+
 where
-```
-gamma(a, x) = int_{0}^{x} t^{a-1} exp(-t) dt
-```
+
+\\(gamma(a, x) = int_{0}^{x} t^{a-1} exp(-t) dt\\)
+
 is the lower incomplete Gamma function.
 
 Note, above `Q(a, x)` (`Igammac`) is the upper regularized complete
@@ -710,9 +709,9 @@ Compute the Hurwitz zeta function \\(\zeta(x, q)\\).
 
 The Hurwitz zeta function is defined as:
 
-```
-\zeta(x, q) = \sum_{n=0}^{\infty} (q + n)^{-x}
-```
+
+\\(\zeta(x, q) = \sum_{n=0}^{\infty} (q + n)^{-x}\\)
+
 )doc");
 
 REGISTER_OP("Polygamma")
@@ -726,9 +725,9 @@ Compute the polygamma function \\(\psi^{(n)}(x)\\).
 
 The polygamma function is defined as:
 
-```
-\psi^{(n)}(x) = \frac{d^n}{dx^n} \psi(x)
-```
+
+\\(\psi^{(n)}(x) = \frac{d^n}{dx^n} \psi(x)\\)
+
 where \\(\psi(x)\\) is the digamma function.
 )doc");
 
@@ -775,14 +774,14 @@ Compute the regularized incomplete beta integral \\(I_x(a, b)\\).
 
 The regularized incomplete beta integral is defined as:
 
-```
-I_x(a, b) = \frac{B(x; a, b)}{B(a, b)}
-```
+
+\\(I_x(a, b) = \frac{B(x; a, b)}{B(a, b)}\\)
+
 where
 
-```
-B(x; a, b) = \int_0^x t^{a-1} (1 - t)^{b-1} dt
-```
+
+\\(B(x; a, b) = \int_0^x t^{a-1} (1 - t)^{b-1} dt\\)
+
 
 is the incomplete beta function and \\(B(a, b)\\) is the *complete*
 beta function.
diff --git a/tensorflow/python/ops/special_math_ops.py b/tensorflow/python/ops/special_math_ops.py
index e24246464e..851fba0beb 100644
--- a/tensorflow/python/ops/special_math_ops.py
+++ b/tensorflow/python/ops/special_math_ops.py
@@ -35,19 +35,20 @@ from tensorflow.python.platform import tf_logging as logging
 
 # TODO(b/27419586) Change docstring for required dtype of x once int allowed
 def lbeta(x, name='lbeta'):
-  r"""Computes `ln(|Beta(x)|)`, reducing along the last dimension.
+  r"""Computes \\(ln(|Beta(x)|)\\), reducing along the last dimension.
 
   Given one-dimensional `z = [z_0,...,z_{K-1}]`, we define
 
-  ```Beta(z) = \prod_j Gamma(z_j) / Gamma(\sum_j z_j)```
+  $$Beta(z) = \prod_j Gamma(z_j) / Gamma(\sum_j z_j)$$
 
   And for `n + 1` dimensional `x` with shape `[N1, ..., Nn, K]`, we define
-  `lbeta(x)[i1, ..., in] = Log(|Beta(x[i1, ..., in, :])|)`.  In other words,
-  the last dimension is treated as the `z` vector.
+  $$lbeta(x)[i1, ..., in] = Log(|Beta(x[i1, ..., in, :])|)$$.
+
+  In other words, the last dimension is treated as the `z` vector.
 
   Note that if `z = [u, v]`, then
-  `Beta(z) = int_0^1 t^{u-1} (1 - t)^{v-1} dt`, which defines the traditional
-  bivariate beta function.
+  \\(Beta(z) = int_0^1 t^{u-1} (1 - t)^{v-1} dt\\), which defines the
+  traditional bivariate beta function.
 
   If the last dimension is empty, we follow the convention that the sum over
   the empty set is zero, and the product is one.
@@ -57,7 +58,7 @@ def lbeta(x, name='lbeta'):
     name: A name for the operation (optional).
 
   Returns:
-    The logarithm of `|Beta(x)|` reducing along the last dimension.
+    The logarithm of \\(|Beta(x)|\\) reducing along the last dimension.
   """
   # In the event that the last dimension has zero entries, we return -inf.
   # This is consistent with a convention that the sum over the empty set 0, and
-- 
GitLab


From 02c0a9651cc9d956af866ca40bad4b6c5f129920 Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Mon, 1 May 2017 12:30:33 -0800
Subject: [PATCH 0886/1563] Fixed minor spelling errors and an incorrect link.
 Change: 154752409

---
 .../docs_src/performance/performance_models.md     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index 18f407c702..71c4e6cfe0 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -1,4 +1,4 @@
-# TensorFlow High-Performance Models
+# High-Performance Models
 
 TensorFlow is a powerful and flexible machine learning platform.
 It can be used to distribute model training and inference across a large number
@@ -29,7 +29,7 @@ We divide our effort to build high-performance models into three categories:
 
 ## Input Pipeline
 
-The input pipeline is the part of a tensorflow program that reads input data,
+The input pipeline is the part of a TensorFlow program that reads input data,
 shuffles it, and preprocesses it.
 
 Among the most important features to build a fast input pipeline:
@@ -149,7 +149,7 @@ stage, and push one set at end end.
 
 For example: if there are three stages: A, B and C.
 There are two staging areas in between: S1 and S2.
-During the warmup, we run:
+During the warm up, we run:
 
 ```
 Warm up:
@@ -162,14 +162,14 @@ Step 4: A3  B2  C1
 Step 5: A4  B3  C2
 ```
 
-After the warmup, S1 and S2 each have one set of data in them.
+After the warm up, S1 and S2 each have one set of data in them.
 For each step of the actual execution, one set of data is consumed from each
 staging area, and one set is added to each.
 
 There are a few nice properties about the scheme:
 
 * All the stages are non-blocking, since the staging areas always have one set
-of data after the warmup.
+of data after the warm up.
 * Each stage can run in parallel since they can all start immediately.
 * The staging buffers have a fixed memory overhead. They will have at most one
   extra set of data.
@@ -292,7 +292,7 @@ devices and the fully aggregated gradient is then applied to each local copy.
 
 Gradient aggregation across the server can be done in different ways:
 
-* Using standard tensorflow operations to accumulate the total on a single
+* Using standard TensorFlow operations to accumulate the total on a single
   device (CPU or GPU) and then copy it back to all GPUs.
 * Using NVIDIA NCCL, described below in the NCCL section.
 
@@ -334,7 +334,7 @@ This is available in the benchmark scripts as the 'distributed_replicated'
 variable_update mode.
 
 ![distributed_replicated mode](
-../images/distributed_replicated_mode_doc.png){
+../images/perf_distributed_replicated_mode_doc.png){
 width="900" style="max-width: inherit"}
 
 #### NCCL
-- 
GitLab


From 81eef33cc4d03580d7f3d0636ef5bab878dca909 Mon Sep 17 00:00:00 2001
From: Sebastian Schlecht <sebastian-schlecht@users.noreply.github.com>
Date: Mon, 1 May 2017 22:50:31 +0200
Subject: [PATCH 0887/1563] Added gradients + tests for
 ImageProjectiveTransform (#9533)

* Added gradients and tests for projective_transform

* Lint fixes
---
 .../python/kernel_tests/image_ops_test.py     | 25 ++++++++++++
 .../contrib/image/python/ops/image_ops.py     | 39 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
index 4ce33de24a..6f72ef6adf 100644
--- a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
+++ b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
@@ -26,6 +26,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import gradient_checker
 from tensorflow.python.platform import googletest
 
 _DTYPES = set(
@@ -111,5 +112,29 @@ class ImageOpsTest(test_util.TensorFlowTestCase):
                              [0, 1, 1, 1]])
 
 
+  def _test_grad(self, shape_to_test):
+    with self.test_session():
+      test_image_shape = shape_to_test
+      test_image = np.random.randn(*test_image_shape)
+      test_image_tensor = constant_op.constant(test_image, 
+                                               shape=test_image_shape)
+      test_transform = image_ops.angles_to_projective_transforms(np.pi / 2, 
+                                                                 4, 
+                                                                 4)
+      test_transform_shape = test_transform.shape
+
+      output_shape = test_image_shape
+      output = image_ops.transform(test_image_tensor, test_transform)
+      left_err = gradient_checker.compute_gradient_error(
+          test_image_tensor, test_image_shape, output, output_shape,
+          x_init_value=test_image)
+      self.assertLess(left_err, 1e-10)
+
+  def test_grad(self):
+    self._test_grad([16, 16])
+    self._test_grad([4, 12, 12])
+    self._test_grad([3, 4, 12, 12])
+
+
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/contrib/image/python/ops/image_ops.py b/tensorflow/contrib/image/python/ops/image_ops.py
index 889f361b19..1a15db9c20 100644
--- a/tensorflow/contrib/image/python/ops/image_ops.py
+++ b/tensorflow/contrib/image/python/ops/image_ops.py
@@ -25,6 +25,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import linalg_ops
 from tensorflow.python.platform import resource_loader
 
 _image_ops_so = loader.load_op_library(
@@ -214,4 +215,40 @@ def _transform_matrices_to_flat(transform_matrices):
   return transforms[:, :8]
 
 
-ops.NotDifferentiable("ImageProjectiveTransform")
+@ops.RegisterGradient("ImageProjectiveTransform")
+def _image_projective_transform_grad(op, grad):
+  images = op.inputs[0]
+  transforms = op.inputs[1]
+
+  image_or_images = ops.convert_to_tensor(images, name="images")
+  transform_or_transforms = ops.convert_to_tensor(
+      transforms, name="transforms", dtype=dtypes.float32)
+
+  if image_or_images.dtype.base_dtype not in _IMAGE_DTYPES:
+    raise TypeError("Invalid dtype %s." % image_or_images.dtype)
+  if len(image_or_images.get_shape()) == 2:
+    images = image_or_images[None, :, :, None]
+  elif len(image_or_images.get_shape()) == 3:
+    images = image_or_images[None, :, :, :]
+  elif len(image_or_images.get_shape()) == 4:
+    images = image_or_images
+  else:
+    raise TypeError("Images should have rank between 2 and 4")
+  if len(transform_or_transforms.get_shape()) == 1:
+    transforms = transform_or_transforms[None]
+  elif len(transform_or_transforms.get_shape()) == 2:
+    transforms = transform_or_transforms
+  else:
+    raise TypeError("Transforms should have rank 1 or 2.")
+
+  # Invert transformations
+  transforms = _flat_transforms_to_matrices(transforms=transforms)
+  inverse = linalg_ops.matrix_inverse(transforms)
+  transforms = _transform_matrices_to_flat(inverse)
+  output = gen_image_ops.image_projective_transform(grad, transforms)
+  if len(image_or_images.get_shape()) == 2:
+    return [output[0, :, :, 0], None]
+  elif len(image_or_images.get_shape()) == 3:
+    return [output[0, :, :, :], None]
+  else:
+    return [output, None]
-- 
GitLab


From 4fd0d2b5e340244dc413b23d54605dfcfcf857bb Mon Sep 17 00:00:00 2001
From: Vadim Markovtsev <gmarkhor@gmail.com>
Date: Mon, 1 May 2017 22:58:01 +0200
Subject: [PATCH 0888/1563] tf.train.Saver: be verbose about ckpt load errors
 (#9335)

I've just had an AbortedError which resulted in the following log:
```
WARNING:tensorflow:/path/to/checkpoint
WARNING:tensorflow:/path/to/checkpoint: Checkpoint ignored
```

With this addition, I get

```
WARNING:tensorflow:tensorflow.python.framework.errors_impl.AbortedError: /path/to/checkpoint
WARNING:tensorflow:/path/to/checkpoint: Checkpoint ignored
```

which is a bit nicer.
---
 tensorflow/python/training/saver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/training/saver.py b/tensorflow/python/training/saver.py
index 43b6174246..3ec6692f2c 100644
--- a/tensorflow/python/training/saver.py
+++ b/tensorflow/python/training/saver.py
@@ -935,11 +935,11 @@ def get_checkpoint_state(checkpoint_dir, latest_filename=None):
           ckpt.all_model_checkpoint_paths[i] = os.path.join(checkpoint_dir, p)
   except errors.OpError as e:
     # It's ok if the file cannot be read
-    logging.warning(str(e))
+    logging.warning("%s: %s" % (type(e).__name__, e))
     logging.warning("%s: Checkpoint ignored", coord_checkpoint_filename)
     return None
   except text_format.ParseError as e:
-    logging.warning(str(e))
+    logging.warning("%s: %s" % (type(e).__name__, e))
     logging.warning("%s: Checkpoint ignored", coord_checkpoint_filename)
     return None
   finally:
-- 
GitLab


From 6155cd1ccfd1c5308efbb3691564790295da47fe Mon Sep 17 00:00:00 2001
From: Olivia Nordquist <nolivia@google.com>
Date: Mon, 1 May 2017 12:45:19 -0800
Subject: [PATCH 0889/1563] Fixes #8666 which removes referral to a deleted
 function Change: 154754448

---
 tensorflow/python/ops/rnn.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/ops/rnn.py b/tensorflow/python/ops/rnn.py
index 1051478a7f..f7e98c941a 100644
--- a/tensorflow/python/ops/rnn.py
+++ b/tensorflow/python/ops/rnn.py
@@ -288,11 +288,10 @@ def bidirectional_dynamic_rnn(cell_fw, cell_bw, inputs, sequence_length=None,
                               swap_memory=False, time_major=False, scope=None):
   """Creates a dynamic version of bidirectional recurrent neural network.
 
-  Similar to the unidirectional case above (rnn) but takes input and builds
-  independent forward and backward RNNs. The input_size of forward and
-  backward cell must match. The initial state for both directions is zero by
-  default (but can be set optionally) and no intermediate states are ever
-  returned -- the network is fully unrolled for the given (passed in)
+  Takes input and builds independent forward and backward RNNs. The input_size
+  of forward and backward cell must match. The initial state for both directions
+  is zero by default (but can be set optionally) and no intermediate states are
+  ever returned -- the network is fully unrolled for the given (passed in)
   length(s) of the sequence(s) or completely unrolled if length(s) is not
   given.
 
@@ -419,12 +418,10 @@ def dynamic_rnn(cell, inputs, sequence_length=None, initial_state=None,
                 time_major=False, scope=None):
   """Creates a recurrent neural network specified by RNNCell `cell`.
 
-  This function is functionally identical to the function `rnn` above, but
-  performs fully dynamic unrolling of `inputs`.
+  Performs fully dynamic unrolling of `inputs`.
 
-  Unlike `rnn`, the input `inputs` is not a Python list of `Tensors`, one for
-  each frame.  Instead, `inputs` may be a single `Tensor` where
-  the maximum time is either the first or second dimension (see the parameter
+  `Inputs` may be a single `Tensor` where the maximum time is either the first
+  or second dimension (see the parameter
   `time_major`).  Alternatively, it may be a (possibly nested) tuple of
   Tensors, each of them having matching batch and time dimensions.
   The corresponding output is either a single `Tensor` having the same number
@@ -433,7 +430,7 @@ def dynamic_rnn(cell, inputs, sequence_length=None, initial_state=None,
 
   The parameter `sequence_length` is optional and is used to copy-through state
   and zero-out outputs when past a batch element's sequence length. So it's more
-  for correctness than performance, unlike in rnn().
+  for correctness than performance.
 
   Args:
     cell: An instance of RNNCell.
-- 
GitLab


From 0793ebb84b3463c349db25d2c740c65b10108e45 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 12:48:13 -0800
Subject: [PATCH 0890/1563] Update ops-related pbtxt files. Change: 154754897

---
 tensorflow/core/ops/ops.pbtxt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index f6eb0cd7a8..b452ab7ef5 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -3324,7 +3324,7 @@ op {
     }
   }
   summary: "Compute the regularized incomplete beta integral \\\\(I_x(a, b)\\\\)."
-  description: "The regularized incomplete beta integral is defined as:\n\n```\nI_x(a, b) = \\frac{B(x; a, b)}{B(a, b)}\n```\nwhere\n\n```\nB(x; a, b) = \\int_0^x t^{a-1} (1 - t)^{b-1} dt\n```\n\nis the incomplete beta function and \\\\(B(a, b)\\\\) is the *complete*\nbeta function."
+  description: "The regularized incomplete beta integral is defined as:\n\n\n\\\\(I_x(a, b) = \\frac{B(x; a, b)}{B(a, b)}\\\\)\n\nwhere\n\n\n\\\\(B(x; a, b) = \\int_0^x t^{a-1} (1 - t)^{b-1} dt\\\\)\n\n\nis the incomplete beta function and \\\\(B(a, b)\\\\) is the *complete*\nbeta function."
 }
 op {
   name: "BiasAdd"
@@ -9031,7 +9031,7 @@ op {
     }
   }
   summary: "Compute the lower regularized incomplete Gamma function `Q(a, x)`."
-  description: "The lower regularized incomplete Gamma function is defined as:\n\n```\nP(a, x) = gamma(a, x) / Gamma(a) = 1 - Q(a, x)\n```\nwhere\n```\ngamma(a, x) = int_{0}^{x} t^{a-1} exp(-t) dt\n```\nis the lower incomplete Gamma function.\n\nNote, above `Q(a, x)` (`Igammac`) is the upper regularized complete\nGamma function."
+  description: "The lower regularized incomplete Gamma function is defined as:\n\n\n\\\\(P(a, x) = gamma(a, x) / Gamma(a) = 1 - Q(a, x)\\\\)\n\nwhere\n\n\\\\(gamma(a, x) = int_{0}^{x} t^{a-1} exp(-t) dt\\\\)\n\nis the lower incomplete Gamma function.\n\nNote, above `Q(a, x)` (`Igammac`) is the upper regularized complete\nGamma function."
 }
 op {
   name: "Igammac"
@@ -9058,7 +9058,7 @@ op {
     }
   }
   summary: "Compute the upper regularized incomplete Gamma function `Q(a, x)`."
-  description: "The upper regularized incomplete Gamma function is defined as:\n\n```\nQ(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)\n```\nwhere\n```\nGamma(a, x) = int_{x}^{\\infty} t^{a-1} exp(-t) dt\n```\nis the upper incomplete Gama function.\n\nNote, above `P(a, x)` (`Igamma`) is the lower regularized complete\nGamma function."
+  description: "The upper regularized incomplete Gamma function is defined as:\n\n\\\\(Q(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)\\\\)\n\nwhere\n\n\\\\(Gamma(a, x) = int_{x}^{\\infty} t^{a-1} exp(-t) dt\\\\)\n\nis the upper incomplete Gama function.\n\nNote, above `P(a, x)` (`Igamma`) is the lower regularized complete\nGamma function."
 }
 op {
   name: "Imag"
@@ -13342,7 +13342,7 @@ op {
     }
   }
   summary: "Compute the polygamma function \\\\(\\psi^{(n)}(x)\\\\)."
-  description: "The polygamma function is defined as:\n\n```\n\\psi^{(n)}(x) = \\frac{d^n}{dx^n} \\psi(x)\n```\nwhere \\\\(\\psi(x)\\\\) is the digamma function."
+  description: "The polygamma function is defined as:\n\n\n\\\\(\\psi^{(n)}(x) = \\frac{d^n}{dx^n} \\psi(x)\\\\)\n\nwhere \\\\(\\psi(x)\\\\) is the digamma function."
 }
 op {
   name: "Pow"
@@ -26985,5 +26985,5 @@ op {
     }
   }
   summary: "Compute the Hurwitz zeta function \\\\(\\zeta(x, q)\\\\)."
-  description: "The Hurwitz zeta function is defined as:\n\n```\n\\zeta(x, q) = \\sum_{n=0}^{\\infty} (q + n)^{-x}\n```"
+  description: "The Hurwitz zeta function is defined as:\n\n\n\\\\(\\zeta(x, q) = \\sum_{n=0}^{\\infty} (q + n)^{-x}\\\\)"
 }
-- 
GitLab


From 46c3f9b0af6f223008dfd9dd720905ff9fccfdd8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 12:53:19 -0800
Subject: [PATCH 0891/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 154755628

---
 tensorflow/go/op/wrappers.go | 46 +++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 4caa75c930..c63be8bc5e 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -14316,9 +14316,9 @@ func SoftsignGrad(scope *Scope, gradients tf.Output, features tf.Output) (backpr
 //
 // The polygamma function is defined as:
 //
-// ```
-// \psi^{(n)}(x) = \frac{d^n}{dx^n} \psi(x)
-// ```
+//
+// \\(\psi^{(n)}(x) = \frac{d^n}{dx^n} \psi(x)\\)
+//
 // where \\(\psi(x)\\) is the digamma function.
 func Polygamma(scope *Scope, a tf.Output, x tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
@@ -15540,9 +15540,8 @@ func Any(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ..
 //
 // The Hurwitz zeta function is defined as:
 //
-// ```
-// \zeta(x, q) = \sum_{n=0}^{\infty} (q + n)^{-x}
-// ```
+//
+// \\(\zeta(x, q) = \sum_{n=0}^{\infty} (q + n)^{-x}\\)
 func Zeta(scope *Scope, x tf.Output, q tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
 		return
@@ -18720,13 +18719,12 @@ func Pow(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 //
 // The upper regularized incomplete Gamma function is defined as:
 //
-// ```
-// Q(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)
-// ```
+// \\(Q(a, x) = Gamma(a, x) / Gamma(a) = 1 - P(a, x)\\)
+//
 // where
-// ```
-// Gamma(a, x) = int_{x}^{\infty} t^{a-1} exp(-t) dt
-// ```
+//
+// \\(Gamma(a, x) = int_{x}^{\infty} t^{a-1} exp(-t) dt\\)
+//
 // is the upper incomplete Gama function.
 //
 // Note, above `P(a, x)` (`Igamma`) is the lower regularized complete
@@ -18749,13 +18747,13 @@ func Igammac(scope *Scope, a tf.Output, x tf.Output) (z tf.Output) {
 //
 // The lower regularized incomplete Gamma function is defined as:
 //
-// ```
-// P(a, x) = gamma(a, x) / Gamma(a) = 1 - Q(a, x)
-// ```
+//
+// \\(P(a, x) = gamma(a, x) / Gamma(a) = 1 - Q(a, x)\\)
+//
 // where
-// ```
-// gamma(a, x) = int_{0}^{x} t^{a-1} exp(-t) dt
-// ```
+//
+// \\(gamma(a, x) = int_{0}^{x} t^{a-1} exp(-t) dt\\)
+//
 // is the lower incomplete Gamma function.
 //
 // Note, above `Q(a, x)` (`Igammac`) is the upper regularized complete
@@ -18778,14 +18776,14 @@ func Igamma(scope *Scope, a tf.Output, x tf.Output) (z tf.Output) {
 //
 // The regularized incomplete beta integral is defined as:
 //
-// ```
-// I_x(a, b) = \frac{B(x; a, b)}{B(a, b)}
-// ```
+//
+// \\(I_x(a, b) = \frac{B(x; a, b)}{B(a, b)}\\)
+//
 // where
 //
-// ```
-// B(x; a, b) = \int_0^x t^{a-1} (1 - t)^{b-1} dt
-// ```
+//
+// \\(B(x; a, b) = \int_0^x t^{a-1} (1 - t)^{b-1} dt\\)
+//
 //
 // is the incomplete beta function and \\(B(a, b)\\) is the *complete*
 // beta function.
-- 
GitLab


From a44385dff5c27acd0251a324bc3d5064a25140a2 Mon Sep 17 00:00:00 2001
From: Olivia Nordquist <nolivia@google.com>
Date: Mon, 1 May 2017 13:01:30 -0800
Subject: [PATCH 0892/1563] clarify tf.cond documentation Change: 154756751

---
 tensorflow/python/ops/control_flow_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index ebe5259de5..a22e4819d5 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -1680,7 +1680,7 @@ def _UnpackIfSingleton(res):
 
 
 def cond(pred, fn1, fn2, strict=False, name=None):
-  """Return either `fn1()` or `fn2()` based on the boolean predicate `pred`.
+  """Return `fn1()` if the boolean predicate `pred` is true else `fn2()`.
 
   `fn1` and `fn2` both return lists of output tensors. `fn1` and `fn2` must have
   the same non-zero number and type of outputs.
-- 
GitLab


From 0ab09d2dd09f66bf654934b935806147ef23d535 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 13:17:37 -0800
Subject: [PATCH 0893/1563] Adds access to expected output type from
 OpOutputList. Change: 154759042

---
 tensorflow/core/framework/op_kernel.h       |  7 +++++
 tensorflow/core/framework/op_kernel_test.cc | 30 +++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index 48bb69cb4e..d926d7db19 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -432,6 +432,7 @@ class OpOutputList {
   OpOutputList& operator=(const OpOutputList& other) = default;
   Tensor* operator[](int i);
   bool required(int i) const;
+  DataType expected_output_dtype(int i) const;
   Status allocate(int i, const TensorShape& shape, Tensor** output);
   void set(int i, const Tensor& tensor);
   void set_ref(int i, mutex* mu, Tensor* tensor_for_ref);
@@ -1452,6 +1453,12 @@ inline bool OpOutputList::required(int i) const {
   return ctx_->output_required(start_ + i);
 }
 
+inline DataType OpOutputList::expected_output_dtype(int i) const {
+  DCHECK_GE(i, 0);
+  DCHECK_LT(i, stop_ - start_);
+  return ctx_->expected_output_dtype(start_ + i);
+}
+
 inline Status OpOutputList::allocate(int i, const TensorShape& shape,
                                      Tensor** output) {
   DCHECK_GE(i, 0);
diff --git a/tensorflow/core/framework/op_kernel_test.cc b/tensorflow/core/framework/op_kernel_test.cc
index 1c56189915..46d4dbd86a 100644
--- a/tensorflow/core/framework/op_kernel_test.cc
+++ b/tensorflow/core/framework/op_kernel_test.cc
@@ -613,6 +613,36 @@ TEST_F(OpKernelBuilderTest, BadConstraint) {
                 error::INVALID_ARGUMENT);
 }
 
+REGISTER_OP("ListOut").Output("a: int32").Output("b: T").Attr("T: list(type)");
+REGISTER_KERNEL_BUILDER(Name("ListOut").Device(tensorflow::DEVICE_CPU),
+                        DummyKernel);
+
+TEST_F(OpKernelBuilderTest, OpOutputList) {
+  Env* env = Env::Default();
+  OpKernelContext::Params params;
+  params.record_tensor_accesses = false;
+  std::unique_ptr<DummyDevice> device(
+      new DummyDevice(env, params.record_tensor_accesses));
+  params.device = device.get();
+  Status status;
+  std::unique_ptr<OpKernel> op(CreateOpKernel(
+      DEVICE_CPU, params.device, cpu_allocator(),
+      CreateNodeDef("ListOut", {"T|list(type)|[DT_FLOAT, DT_INT32]"}),
+      TF_GRAPH_DEF_VERSION, &status));
+  EXPECT_TRUE(status.ok()) << status.ToString();
+  params.op_kernel = op.get();
+  gtl::InlinedVector<TensorValue, 4> inputs{};
+  params.inputs = &inputs;
+  std::unique_ptr<OpKernelContext> ctx(new OpKernelContext(&params));
+
+  EXPECT_EQ(DT_INT32, ctx->expected_output_dtype(0));
+  OpOutputList out_list;
+  EXPECT_FALSE(ctx->output_list("non_existent_output", &out_list).ok());
+  ASSERT_TRUE(ctx->output_list("b", &out_list).ok());
+  EXPECT_EQ(DT_FLOAT, out_list.expected_output_dtype(0));
+  EXPECT_EQ(DT_INT32, out_list.expected_output_dtype(1));
+}
+
 class GetAttrKernel : public ::tensorflow::OpKernel {
  public:
   explicit GetAttrKernel(OpKernelConstruction* context) : OpKernel(context) {
-- 
GitLab


From ecbbcc43fa4bc2c3303c44fdc824c98d69b3e774 Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Mon, 1 May 2017 13:29:30 -0800
Subject: [PATCH 0894/1563] First draft of benchmark results. Change: 154760723

---
 tensorflow/docs_src/performance/benchmarks.md | 429 ++++++++++++++++++
 1 file changed, 429 insertions(+)
 create mode 100644 tensorflow/docs_src/performance/benchmarks.md

diff --git a/tensorflow/docs_src/performance/benchmarks.md b/tensorflow/docs_src/performance/benchmarks.md
new file mode 100644
index 0000000000..8c0cff138d
--- /dev/null
+++ b/tensorflow/docs_src/performance/benchmarks.md
@@ -0,0 +1,429 @@
+# TensorFlow Performance Benchmarks
+
+## Overview
+
+A selection of image classification models were tested across multiple platforms
+to create a point of reference for the TensorFlow community. The methodology,
+links to the scripts, and commands to reproduce the results are in the
+[appendix](#appendix).
+
+## Results for image classification models
+
+InceptionV3 ([arXiv:1512.00567](https://arxiv.org/abs/1512.00567)),
+ResNet-50 ([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)),
+ResNet-152 ([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)), VGG16
+([arXiv:1409.1556](https://arxiv.org/abs/1409.1556)), and
+[AlexNet](http://papers.nips.cc/paper/4824-imagenet-classification-with-deep-convolutional-neural-networks.pdf)
+were tested using the [ImageNet](http://www.image-net.org/) data set. Tests were
+run on Google Compute Engine, Amazon Elastic Compute Cloud (Amazon EC2), and an
+NVIDIA® DGX-1™. Most of the tests were run with both synthetic and real data.
+Testing with synthetic data was done by using a `tf.Variable` set to the same
+shape as the data expected by each model for ImageNet. We believe it is
+important to include real data measurements when benchmarking a platform. This
+load tests both the underlying hardware and the framework at preparing data for
+actual training. We start with synthetic data to remove disk I/O as a variable
+and to set a baseline. Real data is then used to verify that the TensorFlow
+input pipeline and the underlying disk I/O are saturating the compute units.
+
+### Training with NVIDIA® DGX-1™ (NVIDIA® Tesla® P100)
+
+<div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" src="../images/perf_summary_p100_single_server.png">
+</div>
+
+Details and additional results are in the [Details for NVIDIA® DGX-1™ (NVIDIA®
+Tesla® P100)](#details-for-nvidia®-dgx-1™-nvidia®-tesla®-p100) section.
+
+### Training with NVIDIA® Tesla® K80
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" src="../images/perf_summary_k80_single_server.png">
+</div>
+
+Details and additional results are in the [Details for Google Compute Engine
+(NVIDIA® Tesla® K80)](#details-for-google-compute-engine-nvidia®-tesla®-k80) and
+[Details for Amazon EC2 (NVIDIA® Tesla®
+K80)](#details-for-amazon-ec2-nvidia®-tesla®-k80) sections.
+
+### Distributed training with NVIDIA® Tesla® K80
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" src="../images/perf_summary_k80_aws_distributed.png">
+</div>
+
+Details and additional results are in the [Details for Amazon EC2 Distributed
+(NVIDIA® Tesla® K80)](#details-for-amazon-ec2-distributed-nvidia®-tesla®-k80)
+section.
+
+### Compare synthetic with real data training
+
+**NVIDIA® Tesla® P100**
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:35%" src="../images/perf_summary_p100_data_compare_inceptionv3.png">
+  <img style="width:35%" src="../images/perf_summary_p100_data_compare_resnet50.png">
+</div>
+
+**NVIDIA® Tesla® K80**
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:35%" src="../images/perf_summary_k80_data_compare_inceptionv3.png">
+  <img style="width:35%" src="../images/perf_summary_k80_data_compare_resnet50.png">
+</div>
+
+## Details for NVIDIA® DGX-1™ (NVIDIA® Tesla® P100)
+
+### Environment
+
+*   **Instance type**: NVIDIA® DGX-1™
+*   **GPU:** 8x NVIDIA® Tesla® P100
+*   **OS:** Ubuntu 16.04 LTS with tests run via Docker
+*   **CUDA / cuDNN:** 8.0 / 5.1
+*   **TensorFlow GitHub hash:** b1e174e
+*   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
+    //tensorflow/tools/pip_package:build_pip_package`
+*   **Disk:** local SSD
+*   **DataSet:** ImageNet
+
+Batch size and optimizer used for each model.
+
+                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+------------------ | ----------- | --------- | ---------- | ------- | -----
+Batch size per GPU | 64          | 64        | 64         | 512     | 64
+Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
+
+Configuration used for each model.
+
+Model       | variable_update        | local_parameter_device
+----------- | ---------------------- | ----------------------
+InceptionV3 | parameter_server       | cpu
+ResNet50    | parameter_server       | cpu
+ResNet152   | parameter_server       | cpu
+AlexNet     | replicated (with NCCL) | n/a
+VGG16       | replicated (with NCCL) | n/a
+
+### Results
+
+Batch size and optimizer used for each model are listed in the table below.
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" src="../images/perf_summary_p100_single_server.png">
+</div>
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:35%" src="../images/perf_dgx1_synth_p100_single_server_scaling.png">
+  <img style="width:35%" src="../images/perf_dgx1_real_p100_single_server_scaling.png">
+</div>
+
+**Training synthetic data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+---- | ----------- | --------- | ---------- | ------- | -----
+1    | 142         | 238       | 95.6       | 2987    | 132
+2    | 284         | 479       | 187        | 5658    | 259
+4    | 569         | 948       | 374        | 10509   | 511
+8    | 1131        | 1886      | 744        | 17822   | 959
+
+**Training real data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+---- | ----------- | --------- | ---------- | ------- | -----
+1    | 142         | 239       | 95.5       | 2890    | 132
+2    | 278         | 468       | 187        | 4448    | 245
+4    | 551         | 938       | 373        | 7105    | 466
+8    | 1079        | 1802      | 721        | N/A     | 794
+
+Training AlexNet with real data on 8 GPUs was excluded from the graph and table
+above due to it maxing out the input pipeline.
+
+## Details for Google Compute Engine (NVIDIA® Tesla® K80)
+
+### Environment
+
+*   **Instance type**: n1-standard-32-k80x8
+*   **GPU:** 8x NVIDIA® Tesla® K80
+*   **OS:** Ubuntu 16.04 LTS
+*   **CUDA / cuDNN:** 8.0 / 5.1
+*   **TensorFlow GitHub hash:** b1e174e
+*   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
+    //tensorflow/tools/pip_package:build_pip_package`
+*   **Disk:** 1.7 TB Shared SSD persistent disk (800 MB/s)
+*   **DataSet:** ImageNet
+*   **Test Date:** April 2017
+
+Batch size and optimizer used for each model are listed in the table below. In
+addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
+tested with a batch size of 32. Those results are in the *other results*
+section.
+
+                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+------------------ | ----------- | --------- | ---------- | ------- | -----
+Batch size per GPU | 64          | 64        | 32         | 512     | 32
+Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
+
+The configuration used for each model was `variable_update` equal to
+`parameter_server` and `local_parameter_device` equal to `cpu`.
+
+### Results
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:35%" src="../images/perf_gce_synth_k80_single_server_scaling.png">
+  <img style="width:35%" src="../images/perf_gce_real_k80_single_server_scaling.png">
+</div>
+
+**Training synthetic data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+---- | ----------- | --------- | ---------- | ------- | -----
+1    | 30.5        | 56.8      | 20.8       | 656     | 30.3
+2    | 57.8        | 107       | 39.1       | 1210    | 56.2
+4    | 116         | 212       | 77.2       | 2330    | 106
+8    | 227         | 419       | 151        | 4640    | 222
+
+**Training real data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+---- | ----------- | --------- | ---------- | ------- | -----
+1    | 30.5        | 56.7      | 20.7       | 639     | 30.2
+2    | 57.8        | 107       | 39         | 1136    | 55.5
+4    | 115         | 211       | 77.3       | 2067    | 106
+8    | 225         | 418       | 150        | 4056    | 213
+
+### Other Results
+
+**Training synthetic data**
+
+GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
+---- | --------------------------- | -------------------------
+1    | 29.3                        | 53.9
+2    | 55.0                        | 101
+4    | 109                         | 200
+8    | 216                         | 398
+
+**Training real data**
+
+GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
+---- | --------------------------- | -------------------------
+1    | 29.3                        | 53.6
+2    | 55                          | 102
+4    | 109                         | 200
+8    | 215                         | 387
+
+## Details for Amazon EC2 (NVIDIA® Tesla® K80)
+
+### Environment
+
+*   **Instance type**: p2.8xlarge
+*   **GPU:** 8x NVIDIA® Tesla® K80
+*   **OS:** Ubuntu 16.04 LTS
+*   **CUDA / cuDNN:** 8.0 / 5.1
+*   **TensorFlow GitHub hash:** b1e174e
+*   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
+    //tensorflow/tools/pip_package:build_pip_package`
+*   **Disk:** 1TB Amazon EFS (burst 100 MiB/sec for 12 hours, continuous 50
+    MiB/sec)
+*   **DataSet:** ImageNet
+*   **Test Date:** April 2017
+
+Batch size and optimizer used for each model are listed in the table below. In
+addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
+tested with a batch size of 32. Those results are in the *other results*
+section.
+
+                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+------------------ | ----------- | --------- | ---------- | ------- | -----
+Batch size per GPU | 64          | 64        | 32         | 512     | 32
+Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
+
+Configuration used for each model.
+
+Model       | variable_update           | local_parameter_device
+----------- | ------------------------- | ----------------------
+InceptionV3 | parameter_server          | cpu
+ResNet-50   | replicated (without NCCL) | gpu
+ResNet-152  | replicated (without NCCL) | gpu
+AlexNet     | parameter_server          | gpu
+VGG16       | parameter_server          | gpu
+
+### Results
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:35%" src="../images/perf_aws_synth_k80_single_server_scaling.png">
+  <img style="width:35%" src="../images/perf_aws_real_k80_single_server_scaling.png">
+</div>
+
+**Training synthetic data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+---- | ----------- | --------- | ---------- | ------- | -----
+1    | 30.8        | 56.3      | 20.9       | 684     | 32.4
+2    | 58.7        | 108       | 39.3       | 1244    | 61.5
+4    | 117         | 217       | 79.1       | 2479    | 123
+8    | 230         | 419       | 156        | 4853    | 234
+
+**Training real data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+---- | ----------- | --------- | ---------- | ------- | -----
+1    | 30.5        | 56.0      | 20.6       | 674     | 32.0
+2    | 58.7        | 107       | 39.0       | 1227    | 61.0
+4    | 118         | 205       | 77.9       | 2201    | 120
+8    | 228         | 405       | 152        | N/A     | 191
+
+Training AlexNet with real data on 8 GPUs was excluded from the graph and table
+above due to our EFS setup not providing enough throughput.
+
+### Other Results
+
+**Training synthetic data**
+
+GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
+---- | --------------------------- | -------------------------
+1    | 29.9                        | 53.5
+2    | 57.5                        | 101
+4    | 114                         | 202
+8    | 216                         | 380
+
+**Training real data**
+
+GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
+---- | --------------------------- | -------------------------
+1    | 30.0                        | 53.6
+2    | 57.5                        | 101
+4    | 113                         | 202
+8    | 212                         | 379
+
+## Details for Amazon EC2 Distributed (NVIDIA® Tesla® K80)
+
+### Environment
+
+*   **Instance type**: p2.8xlarge
+*   **GPU:** 8x NVIDIA® Tesla® K80
+*   **OS:** Ubuntu 16.04 LTS
+*   **CUDA / cuDNN:** 8.0 / 5.1
+*   **TensorFlow GitHub hash:** b1e174e
+*   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
+    //tensorflow/tools/pip_package:build_pip_package`
+*   **Disk:** 1.0 TB EFS (burst 100 MB/sec for 12 hours, continuous 50 MB/sec)
+*   **DataSet:** ImageNet
+*   **Test Date:** April 2017
+
+The batch size and optimizer used for the tests are listed in the table. In
+addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
+tested with a batch size of 32. Those results are in the *other results*
+section.
+
+                   | InceptionV3 | ResNet-50 | ResNet-152
+------------------ | ----------- | --------- | ----------
+Batch size per GPU | 64          | 64        | 32
+Optimizer          | sgd         | sgd       | sgd
+
+Configuration used for each model.
+
+Model       | variable_update        | local_parameter_device
+----------- | ---------------------- | ----------------------
+InceptionV3 | distributed_replicated | n/a
+ResNet-50   | distributed_replicated | n/a
+ResNet-152  | distributed_replicated | n/a
+
+To simplify server setup, EC2 instances (p2.8xlarge) running worker servers also
+ran parameter servers. Equal numbers of parameter servers and work servers were
+used with the following exceptions:
+
+*   InceptionV3: 8 instances / 6 parameter servers
+*   ResNet-50: (batch size 32) 8 instances / 4 parameter servers
+*   ResNet-152: 8 instances / 4 parameter servers
+
+### Results
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:95%" src="../images/perf_summary_k80_aws_distributed.png">
+</div>
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:70%" src="../images/perf_aws_synth_k80_distributed_scaling.png">
+</div>
+
+**Training synthetic data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152
+---- | ----------- | --------- | ----------
+1    | 29.7        | 55.0      | 19.8
+8    | 229         | 410       | 150
+16   | 459         | 825       | 300
+32   | 902         | 1468      | 575
+64   | 1783        | 3051      | 1004
+
+### Other Results
+
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:50%" src="../images/perf_aws_synth_k80_multi_server_batch32.png">
+</div>
+
+**Training synthetic data**
+
+GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
+---- | --------------------------- | -------------------------
+1    | 29.2                        | 53.0
+8    | 219                         | 363
+16   | 427                         | 719
+32   | 820                         | 1265
+64   | 1608                        | 2623
+
+## Appendix
+
+### Executing benchmark tests
+
+The code for the benchmarks was created to be both used for benchmarking
+TensorFlow as well as used as a tool to test hardware platforms. The benchmark
+code includes modes such as `trivial` that run a virtually empty model that is
+useful for testing the maximum possibly samples/sec for the input pipeline among
+other things. Not only does this test TensorFlow but also the throughput of the
+underlying systems. There are two ways to execute the benchmarks in
+[tf_cnn_benchmarks.py](TODO: LINK TO GITHUB):
+
+1.  Execute [tf_cnn_benchmarks.py](TODO: LINK TO GITHUB) directly
+2.  Utilize the [small wrapper](TODO: LINK TO GITHUB) that helps pick the
+    correct config
+
+The wrapper is suggested as a starting point. Then investigate the variety of
+options available in `tf_cnn_benchmarks.py`. While the wrapper extensive
+examples, below are a couple highlights.
+
+Run ResNet-50 on a single instance with 8 GPUs. The `system` argument is used to
+determine the optimal configuration. The supported values are gce, aws, and
+dgx1. If `system` is not passeed, the best config for the most widely available
+hardware is used.
+
+```bash
+python main.py --model=resnet50 --num_gpus=8
+python main.py --system=aws --model=resnet50 --num_gpus=8
+```
+
+Run ResNet-50 on 2 hosts, e.g. host_0 (10.0.0.1) and host_1 (10.0.0.2), with 8
+GPUs each on aws.
+
+```bash
+# Run the following commands on host_0 (10.0.0.1):
+  $  python main.py --system=aws --model=resnet50 --job_name=worker
+     --hosts=10.0.0.1,10.0.0.2 --task_index=0
+
+  $  python main.py --system=aws --model=resnet50 --job_name=ps
+     --hosts=10.0.0.1,10.0.0.2 --task_index=0
+
+# Run the following commands on host_1 (10.0.0.2):
+  $  python main.py --system=aws --model=resnet50 --job_name=worker
+     --hosts=10.0.0.1,10.0.0.2 --task_index=1
+
+  $  python main.py --system=aws --model=resnet50 --job_name=ps
+     --hosts=10.0.0.1,10.0.0.2 --task_index=1
+```
+
+### Methodology
+
+Unless otherwise stated, each test is run 5 times and then the times are
+averaged together. GPUs are run in their default state on the given platform.
+For NVIDIA® Tesla® K80 this means leaving on [GPU
+Boost](https://devblogs.nvidia.com/parallelforall/increase-performance-gpu-boost-k80-autoboost/)
+unless it has been turned off by the provider. For a given test, 10 warmup steps
+are done and then the next 100 steps are averaged.
-- 
GitLab


From 68c514faa9470d2bd8aed797339f048c50ed6317 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 1 May 2017 13:44:57 -0800
Subject: [PATCH 0895/1563] [tf distributions] Move kullback_leibler,
 special_math, and Normal into TF core.

Also, renamed distributions.kl to distributions.kl_divergence.

In core, scipy can't be required for unit tests, so added some lazy importing
and checking for scipy modules in the normal and special_math tests.
Change: 154763133
---
 .../python/kernel_tests/entropy_test.py       |  4 +-
 .../kernel_tests/stochastic_tensor_test.py    |  2 +-
 .../variational_inference_test.py             | 10 +--
 .../bayesflow/python/ops/entropy_impl.py      |  5 +-
 .../python/ops/variational_inference_impl.py  |  4 +-
 tensorflow/contrib/distributions/BUILD        | 46 -----------
 tensorflow/contrib/distributions/__init__.py  |  6 +-
 .../python/kernel_tests/bernoulli_test.py     |  4 +-
 .../python/kernel_tests/beta_test.py          |  6 +-
 .../python/kernel_tests/categorical_test.py   |  6 +-
 .../python/kernel_tests/gamma_test.py         |  4 +-
 .../mvn_diag_plus_low_rank_test.py            | 18 +++--
 .../python/kernel_tests/mvn_tril_test.py      |  8 +-
 .../kernel_tests/onehot_categorical_test.py   |  6 +-
 .../distributions/python/ops/bernoulli.py     |  2 +-
 .../contrib/distributions/python/ops/beta.py  |  2 +-
 .../distributions/python/ops/categorical.py   |  2 +-
 .../contrib/distributions/python/ops/gamma.py |  2 +-
 .../distributions/python/ops/laplace.py       |  2 +-
 .../python/ops/mvn_linear_operator.py         |  4 +-
 .../python/ops/normal_conjugate_posteriors.py | 11 ++-
 .../python/ops/onehot_categorical.py          |  2 +-
 .../python/kernel_tests/distributions/BUILD   | 46 +++++++++++
 .../distributions}/kullback_leibler_test.py   | 30 +++----
 .../distributions}/normal_test.py             | 80 +++++++++++++------
 .../distributions}/special_math_test.py       | 33 +++++++-
 .../ops/distributions}/kullback_leibler.py    | 32 ++++----
 .../ops/distributions}/normal.py              |  4 +-
 .../ops/distributions}/special_math.py        |  0
 29 files changed, 223 insertions(+), 158 deletions(-)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/kullback_leibler_test.py (76%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/normal_test.py (96%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/special_math_test.py (95%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/kullback_leibler.py (82%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/normal.py (98%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/special_math.py (100%)

diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/entropy_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/entropy_test.py
index d98d4e737c..6cdaa31870 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/entropy_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/entropy_test.py
@@ -95,7 +95,7 @@ class ElboRatioTest(test.TestCase):
           n=n_samples,
           form=entropy.ELBOForms.sample,
           seed=42)
-      actual_kl = distributions.kl(q, p)
+      actual_kl = distributions.kl_divergence(q, p)
 
       # Relative tolerance (rtol) chosen 2 times as large as minimim needed to
       # pass.
@@ -123,7 +123,7 @@ class ElboRatioTest(test.TestCase):
           n=n_samples,
           form=entropy.ELBOForms.analytic_entropy,
           seed=42)
-      actual_kl = distributions.kl(q, p)
+      actual_kl = distributions.kl_divergence(q, p)
 
       # Relative tolerance (rtol) chosen 2 times as large as minimim needed to
       # pass.
diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
index 859f0e4b17..6d0cff4678 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_tensor_test.py
@@ -22,11 +22,11 @@ import numpy as np
 
 from tensorflow.contrib.bayesflow.python.ops import stochastic_gradient_estimators
 from tensorflow.contrib.bayesflow.python.ops import stochastic_tensor_impl
-from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import normal
 from tensorflow.python.platform import test
 
 sge = stochastic_gradient_estimators
diff --git a/tensorflow/contrib/bayesflow/python/kernel_tests/variational_inference_test.py b/tensorflow/contrib/bayesflow/python/kernel_tests/variational_inference_test.py
index a46d755897..fff6b74b2e 100644
--- a/tensorflow/contrib/bayesflow/python/kernel_tests/variational_inference_test.py
+++ b/tensorflow/contrib/bayesflow/python/kernel_tests/variational_inference_test.py
@@ -22,12 +22,12 @@ from tensorflow.contrib import distributions as distributions_lib
 from tensorflow.contrib import layers
 from tensorflow.contrib.bayesflow.python.ops import stochastic_tensor
 from tensorflow.contrib.bayesflow.python.ops import variational_inference_impl
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
-from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables
+from tensorflow.python.ops.distributions import kullback_leibler
+from tensorflow.python.ops.distributions import normal
 from tensorflow.python.platform import test
 
 st = stochastic_tensor
@@ -68,7 +68,7 @@ class VariationalInferenceTest(test.TestCase):
   def testDefaultVariationalAndPrior(self):
     _, prior, variational, _, log_likelihood = mini_vae()
     elbo = vi.elbo(log_likelihood)
-    expected_elbo = log_likelihood - kullback_leibler.kl(
+    expected_elbo = log_likelihood - kullback_leibler.kl_divergence(
         variational.distribution, prior)
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
@@ -80,7 +80,7 @@ class VariationalInferenceTest(test.TestCase):
       prior = normal.Normal(loc=3., scale=2.)
       elbo = vi.elbo(
           log_likelihood, variational_with_prior={variational: prior})
-      expected_elbo = log_likelihood - kullback_leibler.kl(
+      expected_elbo = log_likelihood - kullback_leibler.kl_divergence(
           variational.distribution, prior)
       sess.run(variables.global_variables_initializer())
       self.assertAllEqual(*sess.run([expected_elbo, elbo]))
@@ -121,7 +121,7 @@ class VariationalInferenceTest(test.TestCase):
 
     # No analytic KL available between prior and variational distributions.
     with self.assertRaisesRegexp(NotImplementedError, "No KL"):
-      distributions.kl(variational.distribution, prior)
+      distributions.kl_divergence(variational.distribution, prior)
 
     elbo = vi.elbo(
         variational_with_prior={variational: prior},
diff --git a/tensorflow/contrib/bayesflow/python/ops/entropy_impl.py b/tensorflow/contrib/bayesflow/python/ops/entropy_impl.py
index ef9fb73025..f155de5032 100644
--- a/tensorflow/contrib/bayesflow/python/ops/entropy_impl.py
+++ b/tensorflow/contrib/bayesflow/python/ops/entropy_impl.py
@@ -84,8 +84,9 @@ def elbo_ratio(log_p,
   KL[q || p] = E[ Log[q(Z)] - Log[p(Z)] ]
   ```
 
-  Note that if `p` is a `Distribution`, then `distributions.kl(q, p)` may be
-  defined and available as an exact result.
+  Note that if `p` is a `Distribution`, then
+  `distributions.kl_divergence(q, p)` may be defined and available as an
+  exact result.
 
   #### ELBO
 
diff --git a/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py b/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py
index 3d3533461c..8d932a7c34 100644
--- a/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py
+++ b/tensorflow/contrib/bayesflow/python/ops/variational_inference_impl.py
@@ -28,10 +28,10 @@ from __future__ import print_function
 
 from tensorflow.contrib.bayesflow.python.ops import stochastic_graph_impl as sg
 from tensorflow.contrib.bayesflow.python.ops import stochastic_tensor_impl as st
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import tf_logging as logging
 
 VI_PRIORS = "__vi_priors__"
@@ -259,7 +259,7 @@ def _elbo(form, log_likelihood, log_joint, variational_with_prior,
     kl = None
     if log_joint is None and form in {ELBOForms.default, ELBOForms.analytic_kl}:
       try:
-        kl = kullback_leibler.kl(q, p)
+        kl = kullback_leibler.kl_divergence(q, p)
         logging.info("Using analytic KL between q:%s, p:%s", q, p)
       except NotImplementedError as e:
         if form == ELBOForms.analytic_kl:
diff --git a/tensorflow/contrib/distributions/BUILD b/tensorflow/contrib/distributions/BUILD
index b58bdc7591..1b9bd6ad91 100644
--- a/tensorflow/contrib/distributions/BUILD
+++ b/tensorflow/contrib/distributions/BUILD
@@ -496,24 +496,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "normal_test",
-    size = "medium",
-    srcs = ["python/kernel_tests/normal_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:gradients",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-        "//tensorflow/python:variables",
-    ],
-)
-
 cuda_py_test(
     name = "poisson_test",
     size = "small",
@@ -614,18 +596,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "kullback_leibler_test",
-    size = "small",
-    srcs = ["python/kernel_tests/kullback_leibler_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "normal_conjugate_posteriors_test",
     size = "small",
@@ -751,22 +721,6 @@ cuda_py_test(
     tags = ["no_pip"],
 )
 
-cuda_py_test(
-    name = "special_math_test",
-    size = "medium",
-    srcs = ["python/kernel_tests/special_math_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:gradients",
-        "//tensorflow/python:platform_test",
-        "//tensorflow/python:variables",
-    ],
-)
-
 cuda_py_test(
     name = "distribution_util_test",
     size = "small",
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 6d1a0a4390..15e33c2c6f 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -71,7 +71,7 @@ See the @{$python/contrib.distributions} guide.
 @@RelaxedOneHotCategorical
 
 ## Kullback-Leibler Divergence
-@@kl
+@@kl_divergence
 @@RegisterKL
 
 ## Helper Functions
@@ -106,7 +106,6 @@ from tensorflow.contrib.distributions.python.ops.exponential import *
 from tensorflow.contrib.distributions.python.ops.gamma import *
 from tensorflow.contrib.distributions.python.ops.geometric import *
 from tensorflow.contrib.distributions.python.ops.inverse_gamma import *
-from tensorflow.contrib.distributions.python.ops.kullback_leibler import *
 from tensorflow.contrib.distributions.python.ops.laplace import *
 from tensorflow.contrib.distributions.python.ops.logistic import *
 from tensorflow.contrib.distributions.python.ops.mixture import *
@@ -115,7 +114,6 @@ from tensorflow.contrib.distributions.python.ops.mvn_diag import *
 from tensorflow.contrib.distributions.python.ops.mvn_diag_plus_low_rank import *
 from tensorflow.contrib.distributions.python.ops.mvn_tril import *
 from tensorflow.contrib.distributions.python.ops.negative_binomial import *
-from tensorflow.contrib.distributions.python.ops.normal import *
 from tensorflow.contrib.distributions.python.ops.normal_conjugate_posteriors import *
 from tensorflow.contrib.distributions.python.ops.onehot_categorical import *
 from tensorflow.contrib.distributions.python.ops.poisson import *
@@ -129,6 +127,8 @@ from tensorflow.contrib.distributions.python.ops.uniform import *
 from tensorflow.contrib.distributions.python.ops.wishart import *
 from tensorflow.python.ops.distributions.conditional_distribution import *
 from tensorflow.python.ops.distributions.distribution import *
+from tensorflow.python.ops.distributions.kullback_leibler import *
+from tensorflow.python.ops.distributions.normal import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
index 87b2331a1d..e8b0eb4eb8 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
@@ -21,11 +21,11 @@ from __future__ import print_function
 import numpy as np
 import scipy.special
 from tensorflow.contrib.distributions.python.ops import bernoulli
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
 
 
@@ -286,7 +286,7 @@ class BernoulliTest(test.TestCase):
       a = bernoulli.Bernoulli(probs=a_p)
       b = bernoulli.Bernoulli(probs=b_p)
 
-      kl = kullback_leibler.kl(a, b)
+      kl = kullback_leibler.kl_divergence(a, b)
       kl_val = sess.run(kl)
 
       kl_expected = (a_p * np.log(a_p / b_p) + (1. - a_p) * np.log(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py b/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py
index f524986cec..ec16a85991 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py
@@ -20,13 +20,13 @@ import numpy as np
 from scipy import special
 from scipy import stats
 from tensorflow.contrib.distributions.python.ops import beta as beta_lib
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import random_seed
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
 
 
@@ -349,13 +349,13 @@ class BetaTest(test.TestCase):
 
         for dist1 in [d1, d1_sp]:
           for dist2 in [d2, d2_sp]:
-            kl = kullback_leibler.kl(dist1, dist2)
+            kl = kullback_leibler.kl_divergence(dist1, dist2)
             kl_val = sess.run(kl)
             self.assertEqual(kl.get_shape(), shape)
             self.assertAllClose(kl_val, kl_expected)
 
         # Make sure KL(d1||d1) is 0
-        kl_same = sess.run(kullback_leibler.kl(d1, d1))
+        kl_same = sess.run(kullback_leibler.kl_divergence(d1, d1))
         self.assertAllClose(kl_same, np.zeros_like(kl_expected))
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py b/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py
index 0b42581e79..269c02ede3 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py
@@ -21,7 +21,6 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.contrib.distributions.python.ops import categorical
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_util
@@ -30,6 +29,7 @@ from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
 
 
@@ -278,10 +278,10 @@ class CategoricalTest(test.TestCase):
           a = categorical.Categorical(logits=a_logits)
           b = categorical.Categorical(logits=b_logits)
 
-          kl = kullback_leibler.kl(a, b)
+          kl = kullback_leibler.kl_divergence(a, b)
           kl_val = sess.run(kl)
           # Make sure KL(a||a) is 0
-          kl_same = sess.run(kullback_leibler.kl(a, a))
+          kl_same = sess.run(kullback_leibler.kl_divergence(a, a))
 
           prob_a = np_softmax(a_logits)
           prob_b = np_softmax(b_logits)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py b/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py
index fd62710237..5ccf2308a5 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py
@@ -22,12 +22,12 @@ from scipy import special
 from scipy import stats
 
 from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
 
 
@@ -345,7 +345,7 @@ class GammaTest(test.TestCase):
       g1 = gamma_lib.Gamma(concentration=alpha1, rate=beta1)
       x = g0.sample(int(1e4), seed=0)
       kl_sample = math_ops.reduce_mean(g0.log_prob(x) - g1.log_prob(x), 0)
-      kl_actual = kullback_leibler.kl(g0, g1)
+      kl_actual = kullback_leibler.kl_divergence(g0, g1)
 
     # Execute graph.
     [kl_sample_, kl_actual_] = sess.run([kl_sample, kl_actual])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py
index 29cb3eb9b0..e803830a4e 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py
@@ -185,19 +185,19 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
 
       sample_kl_identity = math_ops.reduce_mean(
           dist.log_prob(samps) - mvn_identity.log_prob(samps), 0)
-      analytical_kl_identity = ds.kl(dist, mvn_identity)
+      analytical_kl_identity = ds.kl_divergence(dist, mvn_identity)
 
       sample_kl_scaled = math_ops.reduce_mean(
           dist.log_prob(samps) - mvn_scaled.log_prob(samps), 0)
-      analytical_kl_scaled = ds.kl(dist, mvn_scaled)
+      analytical_kl_scaled = ds.kl_divergence(dist, mvn_scaled)
 
       sample_kl_diag = math_ops.reduce_mean(
           dist.log_prob(samps) - mvn_diag.log_prob(samps), 0)
-      analytical_kl_diag = ds.kl(dist, mvn_diag)
+      analytical_kl_diag = ds.kl_divergence(dist, mvn_diag)
 
       sample_kl_chol = math_ops.reduce_mean(
           dist.log_prob(samps) - mvn_chol.log_prob(samps), 0)
-      analytical_kl_chol = ds.kl(dist, mvn_chol)
+      analytical_kl_chol = ds.kl_divergence(dist, mvn_chol)
 
       n = int(10e3)
       baseline = ds.MultivariateNormalDiag(
@@ -208,19 +208,21 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
 
       sample_kl_identity_diag_baseline = math_ops.reduce_mean(
           baseline.log_prob(samps) - mvn_identity.log_prob(samps), 0)
-      analytical_kl_identity_diag_baseline = ds.kl(baseline, mvn_identity)
+      analytical_kl_identity_diag_baseline = ds.kl_divergence(
+          baseline, mvn_identity)
 
       sample_kl_scaled_diag_baseline = math_ops.reduce_mean(
           baseline.log_prob(samps) - mvn_scaled.log_prob(samps), 0)
-      analytical_kl_scaled_diag_baseline = ds.kl(baseline, mvn_scaled)
+      analytical_kl_scaled_diag_baseline = ds.kl_divergence(
+          baseline, mvn_scaled)
 
       sample_kl_diag_diag_baseline = math_ops.reduce_mean(
           baseline.log_prob(samps) - mvn_diag.log_prob(samps), 0)
-      analytical_kl_diag_diag_baseline = ds.kl(baseline, mvn_diag)
+      analytical_kl_diag_diag_baseline = ds.kl_divergence(baseline, mvn_diag)
 
       sample_kl_chol_diag_baseline = math_ops.reduce_mean(
           baseline.log_prob(samps) - mvn_chol.log_prob(samps), 0)
-      analytical_kl_chol_diag_baseline = ds.kl(baseline, mvn_chol)
+      analytical_kl_chol_diag_baseline = ds.kl_divergence(baseline, mvn_chol)
 
       [
           sample_mean_,
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
index dd7283bb57..11f632f3f4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
@@ -241,7 +241,7 @@ class MultivariateNormalTriLTest(test.TestCase):
           scale_tril=np.linalg.cholesky(sigma_b),
           validate_args=True)
 
-      kl = ds.kl(mvn_a, mvn_b)
+      kl = ds.kl_divergence(mvn_a, mvn_b)
       self.assertEqual(batch_shape, kl.get_shape())
 
       kl_v = kl.eval()
@@ -263,7 +263,7 @@ class MultivariateNormalTriLTest(test.TestCase):
           scale_tril=np.linalg.cholesky(sigma_b),
           validate_args=True)
 
-      kl = ds.kl(mvn_a, mvn_b)
+      kl = ds.kl_divergence(mvn_a, mvn_b)
       self.assertEqual(batch_shape, kl.get_shape())
 
       kl_v = kl.eval()
@@ -285,7 +285,7 @@ class MultivariateNormalTriLTest(test.TestCase):
           validate_args=True)
 
       # Should be zero since KL(p || p) = =.
-      kl = ds.kl(mvn_a, mvn_a)
+      kl = ds.kl_divergence(mvn_a, mvn_a)
       self.assertEqual(batch_shape, kl.get_shape())
 
       kl_v = kl.eval()
@@ -323,7 +323,7 @@ class MultivariateNormalTriLTest(test.TestCase):
 
       sample_kl_chol = math_ops.reduce_mean(
           dist.log_prob(samps) - mvn_chol.log_prob(samps), 0)
-      analytical_kl_chol = ds.kl(dist, mvn_chol)
+      analytical_kl_chol = ds.kl_divergence(dist, mvn_chol)
 
       scale = dist.scale.to_dense()
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/onehot_categorical_test.py b/tensorflow/contrib/distributions/python/kernel_tests/onehot_categorical_test.py
index 56ad4a081b..111f88eeb5 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/onehot_categorical_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/onehot_categorical_test.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.contrib.distributions.python.ops import onehot_categorical
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -27,6 +26,7 @@ from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
 
 
@@ -178,8 +178,8 @@ class OneHotCategoricalTest(test.TestCase):
           kl_expected = np.sum(
               prob_p * (np.log(prob_p) - np.log(prob_q)), axis=-1)
 
-          kl_actual = kullback_leibler.kl(p, q)
-          kl_same = kullback_leibler.kl(p, p)
+          kl_actual = kullback_leibler.kl_divergence(p, q)
+          kl_same = kullback_leibler.kl_divergence(p, p)
           x = p.sample(int(2e4), seed=0)
           x = math_ops.cast(x, dtype=dtypes.float32)
           # Compute empirical KL(p||q).
diff --git a/tensorflow/contrib/distributions/python/ops/bernoulli.py b/tensorflow/contrib/distributions/python/ops/bernoulli.py
index 7c29b7cdb2..3281b57e83 100644
--- a/tensorflow/contrib/distributions/python/ops/bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/bernoulli.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
@@ -29,6 +28,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/beta.py b/tensorflow/contrib/distributions/python/ops/beta.py
index 2866a7d9ff..2b93478cdf 100644
--- a/tensorflow/contrib/distributions/python/ops/beta.py
+++ b/tensorflow/contrib/distributions/python/ops/beta.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -32,6 +31,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/categorical.py b/tensorflow/contrib/distributions/python/ops/categorical.py
index 5848c06769..1b74c2f0ca 100644
--- a/tensorflow/contrib/distributions/python/ops/categorical.py
+++ b/tensorflow/contrib/distributions/python/ops/categorical.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -28,6 +27,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/gamma.py b/tensorflow/contrib/distributions/python/ops/gamma.py
index 255e8026e8..4ac2b9b4ef 100644
--- a/tensorflow/contrib/distributions/python/ops/gamma.py
+++ b/tensorflow/contrib/distributions/python/ops/gamma.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -32,6 +31,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/laplace.py b/tensorflow/contrib/distributions/python/ops/laplace.py
index 0a1e3990c4..5c964ff78a 100644
--- a/tensorflow/contrib/distributions/python/ops/laplace.py
+++ b/tensorflow/contrib/distributions/python/ops/laplace.py
@@ -22,7 +22,6 @@ import math
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import special_math
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -33,6 +32,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import special_math
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
index 5e879b4b22..a66eb1674c 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 from tensorflow.contrib import linalg
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
-from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
@@ -29,6 +27,8 @@ from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import kullback_leibler
+from tensorflow.python.ops.distributions import normal
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/normal_conjugate_posteriors.py b/tensorflow/contrib/distributions/python/ops/normal_conjugate_posteriors.py
index 10e934326a..4025285780 100644
--- a/tensorflow/contrib/distributions/python/ops/normal_conjugate_posteriors.py
+++ b/tensorflow/contrib/distributions/python/ops/normal_conjugate_posteriors.py
@@ -18,9 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.normal import Normal  # pylint: disable=line-too-long
-
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import normal
 
 
 def normal_conjugates_known_scale_posterior(prior, scale, s, n):
@@ -65,7 +64,7 @@ def normal_conjugates_known_scale_posterior(prior, scale, s, n):
     TypeError: if dtype of `s` does not match `dtype`, or `prior` is not a
       Normal object.
   """
-  if not isinstance(prior, Normal):
+  if not isinstance(prior, normal.Normal):
     raise TypeError("Expected prior to be an instance of type Normal")
 
   if s.dtype != prior.dtype:
@@ -77,7 +76,7 @@ def normal_conjugates_known_scale_posterior(prior, scale, s, n):
   scale0_2 = math_ops.square(prior.scale)
   scale_2 = math_ops.square(scale)
   scalep_2 = 1.0/(1/scale0_2 + n/scale_2)
-  return Normal(
+  return normal.Normal(
       loc=(prior.loc/scale0_2 + s/scale_2) * scalep_2,
       scale=math_ops.sqrt(scalep_2))
 
@@ -131,7 +130,7 @@ def normal_conjugates_known_scale_predictive(prior, scale, s, n):
     TypeError: if dtype of `s` does not match `dtype`, or `prior` is not a
       Normal object.
   """
-  if not isinstance(prior, Normal):
+  if not isinstance(prior, normal.Normal):
     raise TypeError("Expected prior to be an instance of type Normal")
 
   if s.dtype != prior.dtype:
@@ -143,6 +142,6 @@ def normal_conjugates_known_scale_predictive(prior, scale, s, n):
   scale0_2 = math_ops.square(prior.scale)
   scale_2 = math_ops.square(scale)
   scalep_2 = 1.0/(1/scale0_2 + n/scale_2)
-  return Normal(
+  return normal.Normal(
       loc=(prior.loc/scale0_2 + s/scale_2) * scalep_2,
       scale=math_ops.sqrt(scalep_2 + scale_2))
diff --git a/tensorflow/contrib/distributions/python/ops/onehot_categorical.py b/tensorflow/contrib/distributions/python/ops/onehot_categorical.py
index 378ddc491f..b76cebf79f 100644
--- a/tensorflow/contrib/distributions/python/ops/onehot_categorical.py
+++ b/tensorflow/contrib/distributions/python/ops/onehot_categorical.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -28,6 +27,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/python/kernel_tests/distributions/BUILD b/tensorflow/python/kernel_tests/distributions/BUILD
index 63e213b5e0..3c1a4d5125 100644
--- a/tensorflow/python/kernel_tests/distributions/BUILD
+++ b/tensorflow/python/kernel_tests/distributions/BUILD
@@ -29,6 +29,52 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "kullback_leibler_test",
+    size = "small",
+    srcs = ["kullback_leibler_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "normal_test",
+    size = "medium",
+    srcs = ["normal_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:gradients",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:variables",
+    ],
+)
+
+cuda_py_test(
+    name = "special_math_test",
+    size = "medium",
+    srcs = ["special_math_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:gradients",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:variables",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/kullback_leibler_test.py b/tensorflow/python/kernel_tests/distributions/kullback_leibler_test.py
similarity index 76%
rename from tensorflow/contrib/distributions/python/kernel_tests/kullback_leibler_test.py
rename to tensorflow/python/kernel_tests/distributions/kullback_leibler_test.py
index 6b3d886e01..b1d8da7716 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/kullback_leibler_test.py
+++ b/tensorflow/python/kernel_tests/distributions/kullback_leibler_test.py
@@ -18,9 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
-from tensorflow.contrib.distributions.python.ops import normal
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import kullback_leibler
+from tensorflow.python.ops.distributions import normal
 from tensorflow.python.platform import test
 
 # pylint: disable=protected-access
@@ -43,7 +43,7 @@ class KLTest(test.TestCase):
       return name
 
     a = MyDist(loc=0.0, scale=1.0)
-    self.assertEqual("OK", kullback_leibler.kl(a, a, name="OK"))
+    self.assertEqual("OK", kullback_leibler.kl_divergence(a, a, name="OK"))
 
   def testDomainErrorExceptions(self):
 
@@ -60,11 +60,11 @@ class KLTest(test.TestCase):
 
     with self.test_session():
       a = MyDistException(loc=0.0, scale=1.0)
-      kl = kullback_leibler.kl(a, a, allow_nan_stats=False)
+      kl = kullback_leibler.kl_divergence(a, a, allow_nan_stats=False)
       with self.assertRaisesOpError(
           "KL calculation between .* and .* returned NaN values"):
         kl.eval()
-      kl_ok = kullback_leibler.kl(a, a)
+      kl_ok = kullback_leibler.kl_divergence(a, a)
       self.assertAllEqual([float("nan")], kl_ok.eval())
 
   def testRegistrationFailures(self):
@@ -116,16 +116,16 @@ class KLTest(test.TestCase):
     sub2 = Sub2(loc=0.0, scale=1.0)
     sub11 = Sub11(loc=0.0, scale=1.0)
 
-    self.assertEqual("sub1-1", kullback_leibler.kl(sub1, sub1))
-    self.assertEqual("sub1-2", kullback_leibler.kl(sub1, sub2))
-    self.assertEqual("sub2-1", kullback_leibler.kl(sub2, sub1))
-    self.assertEqual("sub1-1", kullback_leibler.kl(sub11, sub11))
-    self.assertEqual("sub1-1", kullback_leibler.kl(sub11, sub1))
-    self.assertEqual("sub1-2", kullback_leibler.kl(sub11, sub2))
-    self.assertEqual("sub1-1", kullback_leibler.kl(sub11, sub1))
-    self.assertEqual("sub1-2", kullback_leibler.kl(sub11, sub2))
-    self.assertEqual("sub2-1", kullback_leibler.kl(sub2, sub11))
-    self.assertEqual("sub1-1", kullback_leibler.kl(sub1, sub11))
+    self.assertEqual("sub1-1", kullback_leibler.kl_divergence(sub1, sub1))
+    self.assertEqual("sub1-2", kullback_leibler.kl_divergence(sub1, sub2))
+    self.assertEqual("sub2-1", kullback_leibler.kl_divergence(sub2, sub1))
+    self.assertEqual("sub1-1", kullback_leibler.kl_divergence(sub11, sub11))
+    self.assertEqual("sub1-1", kullback_leibler.kl_divergence(sub11, sub1))
+    self.assertEqual("sub1-2", kullback_leibler.kl_divergence(sub11, sub2))
+    self.assertEqual("sub1-1", kullback_leibler.kl_divergence(sub11, sub1))
+    self.assertEqual("sub1-2", kullback_leibler.kl_divergence(sub11, sub2))
+    self.assertEqual("sub2-1", kullback_leibler.kl_divergence(sub2, sub11))
+    self.assertEqual("sub1-1", kullback_leibler.kl_divergence(sub1, sub11))
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/normal_test.py b/tensorflow/python/kernel_tests/distributions/normal_test.py
similarity index 96%
rename from tensorflow/contrib/distributions/python/kernel_tests/normal_test.py
rename to tensorflow/python/kernel_tests/distributions/normal_test.py
index bda06df0f7..07c7d6d11d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/normal_test.py
+++ b/tensorflow/python/kernel_tests/distributions/normal_test.py
@@ -18,13 +18,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
 import math
 
 import numpy as np
-from scipy import stats
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
-from tensorflow.contrib.distributions.python.ops import normal as normal_lib
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -33,7 +31,21 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import variables
+from tensorflow.python.ops.distributions import kullback_leibler
+from tensorflow.python.ops.distributions import normal as normal_lib
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+stats = try_import("scipy.stats")
 
 
 class NormalTest(test.TestCase):
@@ -90,10 +102,8 @@ class NormalTest(test.TestCase):
       sigma = constant_op.constant([math.sqrt(10.0)] * batch_size)
       x = np.array([-2.5, 2.5, 4.0, 0.0, -1.0, 2.0], dtype=np.float32)
       normal = normal_lib.Normal(loc=mu, scale=sigma)
-      expected_log_pdf = stats.norm(mu.eval(), sigma.eval()).logpdf(x)
 
       log_pdf = normal.log_prob(x)
-      self.assertAllClose(expected_log_pdf, log_pdf.eval())
       self.assertAllEqual(normal.batch_shape_tensor().eval(),
                           log_pdf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(),
@@ -102,12 +112,17 @@ class NormalTest(test.TestCase):
       self.assertAllEqual(normal.batch_shape, log_pdf.eval().shape)
 
       pdf = normal.prob(x)
-      self.assertAllClose(np.exp(expected_log_pdf), pdf.eval())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), pdf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), pdf.eval().shape)
       self.assertAllEqual(normal.batch_shape, pdf.get_shape())
       self.assertAllEqual(normal.batch_shape, pdf.eval().shape)
 
+      if not stats:
+        return
+      expected_log_pdf = stats.norm(mu.eval(), sigma.eval()).logpdf(x)
+      self.assertAllClose(expected_log_pdf, log_pdf.eval())
+      self.assertAllClose(np.exp(expected_log_pdf), pdf.eval())
+
   def testNormalLogPDFMultidimensional(self):
     with self.test_session():
       batch_size = 6
@@ -116,12 +131,10 @@ class NormalTest(test.TestCase):
                                    batch_size)
       x = np.array([[-2.5, 2.5, 4.0, 0.0, -1.0, 2.0]], dtype=np.float32).T
       normal = normal_lib.Normal(loc=mu, scale=sigma)
-      expected_log_pdf = stats.norm(mu.eval(), sigma.eval()).logpdf(x)
 
       log_pdf = normal.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(expected_log_pdf, log_pdf_values)
       self.assertAllEqual(normal.batch_shape_tensor().eval(),
                           log_pdf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(),
@@ -132,12 +145,17 @@ class NormalTest(test.TestCase):
       pdf = normal.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
-      self.assertAllClose(np.exp(expected_log_pdf), pdf_values)
       self.assertAllEqual(normal.batch_shape_tensor().eval(), pdf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), pdf_values.shape)
       self.assertAllEqual(normal.batch_shape, pdf.get_shape())
       self.assertAllEqual(normal.batch_shape, pdf_values.shape)
 
+      if not stats:
+        return
+      expected_log_pdf = stats.norm(mu.eval(), sigma.eval()).logpdf(x)
+      self.assertAllClose(expected_log_pdf, log_pdf_values)
+      self.assertAllClose(np.exp(expected_log_pdf), pdf_values)
+
   def testNormalCDF(self):
     with self.test_session():
       batch_size = 50
@@ -146,14 +164,15 @@ class NormalTest(test.TestCase):
       x = np.linspace(-8.0, 8.0, batch_size).astype(np.float64)
 
       normal = normal_lib.Normal(loc=mu, scale=sigma)
-      expected_cdf = stats.norm(mu, sigma).cdf(x)
-
       cdf = normal.cdf(x)
-      self.assertAllClose(expected_cdf, cdf.eval(), atol=0)
       self.assertAllEqual(normal.batch_shape_tensor().eval(), cdf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), cdf.eval().shape)
       self.assertAllEqual(normal.batch_shape, cdf.get_shape())
       self.assertAllEqual(normal.batch_shape, cdf.eval().shape)
+      if not stats:
+        return
+      expected_cdf = stats.norm(mu, sigma).cdf(x)
+      self.assertAllClose(expected_cdf, cdf.eval(), atol=0)
 
   def testNormalSurvivalFunction(self):
     with self.test_session():
@@ -163,14 +182,16 @@ class NormalTest(test.TestCase):
       x = np.linspace(-8.0, 8.0, batch_size).astype(np.float64)
 
       normal = normal_lib.Normal(loc=mu, scale=sigma)
-      expected_sf = stats.norm(mu, sigma).sf(x)
 
       sf = normal.survival_function(x)
-      self.assertAllClose(expected_sf, sf.eval(), atol=0)
       self.assertAllEqual(normal.batch_shape_tensor().eval(), sf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), sf.eval().shape)
       self.assertAllEqual(normal.batch_shape, sf.get_shape())
       self.assertAllEqual(normal.batch_shape, sf.eval().shape)
+      if not stats:
+        return
+      expected_sf = stats.norm(mu, sigma).sf(x)
+      self.assertAllClose(expected_sf, sf.eval(), atol=0)
 
   def testNormalLogCDF(self):
     with self.test_session():
@@ -180,15 +201,18 @@ class NormalTest(test.TestCase):
       x = np.linspace(-100.0, 10.0, batch_size).astype(np.float64)
 
       normal = normal_lib.Normal(loc=mu, scale=sigma)
-      expected_cdf = stats.norm(mu, sigma).logcdf(x)
 
       cdf = normal.log_cdf(x)
-      self.assertAllClose(expected_cdf, cdf.eval(), atol=0, rtol=1e-5)
       self.assertAllEqual(normal.batch_shape_tensor().eval(), cdf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), cdf.eval().shape)
       self.assertAllEqual(normal.batch_shape, cdf.get_shape())
       self.assertAllEqual(normal.batch_shape, cdf.eval().shape)
 
+      if not stats:
+        return
+      expected_cdf = stats.norm(mu, sigma).logcdf(x)
+      self.assertAllClose(expected_cdf, cdf.eval(), atol=0, rtol=1e-5)
+
   def testFiniteGradientAtDifficultPoints(self):
     for dtype in [np.float32, np.float64]:
       g = ops.Graph()
@@ -217,15 +241,18 @@ class NormalTest(test.TestCase):
       x = np.linspace(-10.0, 100.0, batch_size).astype(np.float64)
 
       normal = normal_lib.Normal(loc=mu, scale=sigma)
-      expected_sf = stats.norm(mu, sigma).logsf(x)
 
       sf = normal.log_survival_function(x)
-      self.assertAllClose(expected_sf, sf.eval(), atol=0, rtol=1e-5)
       self.assertAllEqual(normal.batch_shape_tensor().eval(), sf.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), sf.eval().shape)
       self.assertAllEqual(normal.batch_shape, sf.get_shape())
       self.assertAllEqual(normal.batch_shape, sf.eval().shape)
 
+      if not stats:
+        return
+      expected_sf = stats.norm(mu, sigma).logsf(x)
+      self.assertAllClose(expected_sf, sf.eval(), atol=0, rtol=1e-5)
+
   def testNormalEntropyWithScalarInputs(self):
     # Scipy.stats.norm cannot deal with the shapes in the other test.
     with self.test_session():
@@ -233,16 +260,18 @@ class NormalTest(test.TestCase):
       sigma_v = 4.56
       normal = normal_lib.Normal(loc=mu_v, scale=sigma_v)
 
-      # scipy.stats.norm cannot deal with these shapes.
-      expected_entropy = stats.norm(mu_v, sigma_v).entropy()
       entropy = normal.entropy()
-      self.assertAllClose(expected_entropy, entropy.eval())
       self.assertAllEqual(normal.batch_shape_tensor().eval(),
                           entropy.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(),
                           entropy.eval().shape)
       self.assertAllEqual(normal.batch_shape, entropy.get_shape())
       self.assertAllEqual(normal.batch_shape, entropy.eval().shape)
+      # scipy.stats.norm cannot deal with these shapes.
+      if not stats:
+        return
+      expected_entropy = stats.norm(mu_v, sigma_v).entropy()
+      self.assertAllClose(expected_entropy, entropy.eval())
 
   def testNormalEntropy(self):
     with self.test_session():
@@ -288,15 +317,18 @@ class NormalTest(test.TestCase):
       p = np.hstack((p, np.exp(-33), 1. - np.exp(-33)))
 
       normal = normal_lib.Normal(loc=mu, scale=sigma)
-      expected_x = stats.norm(mu, sigma).ppf(p)
       x = normal.quantile(p)
 
-      self.assertAllClose(expected_x, x.eval(), atol=0.)
       self.assertAllEqual(normal.batch_shape_tensor().eval(), x.get_shape())
       self.assertAllEqual(normal.batch_shape_tensor().eval(), x.eval().shape)
       self.assertAllEqual(normal.batch_shape, x.get_shape())
       self.assertAllEqual(normal.batch_shape, x.eval().shape)
 
+      if not stats:
+        return
+      expected_x = stats.norm(mu, sigma).ppf(p)
+      self.assertAllClose(expected_x, x.eval(), atol=0.)
+
   def _baseQuantileFiniteGradientAtDifficultPoints(self, dtype):
     g = ops.Graph()
     with g.as_default():
@@ -450,7 +482,7 @@ class NormalTest(test.TestCase):
       n_a = normal_lib.Normal(loc=mu_a, scale=sigma_a)
       n_b = normal_lib.Normal(loc=mu_b, scale=sigma_b)
 
-      kl = kullback_leibler.kl(n_a, n_b)
+      kl = kullback_leibler.kl_divergence(n_a, n_b)
       kl_val = sess.run(kl)
 
       kl_expected = ((mu_a - mu_b)**2 / (2 * sigma_b**2) + 0.5 * (
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/special_math_test.py b/tensorflow/python/kernel_tests/distributions/special_math_test.py
similarity index 95%
rename from tensorflow/contrib/distributions/python/kernel_tests/special_math_test.py
rename to tensorflow/python/kernel_tests/distributions/special_math_test.py
index 6ccbeb7122..dc462bae56 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/special_math_test.py
+++ b/tensorflow/python/kernel_tests/distributions/special_math_test.py
@@ -19,18 +19,30 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
+import importlib
 
 import numpy as np
-from scipy import special
-from scipy import stats
 
-from tensorflow.contrib.distributions.python.ops import special_math
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import variables
+from tensorflow.python.ops.distributions import special_math
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
 
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+special = try_import("scipy.special")
+stats = try_import("scipy.stats")
 sm = special_math
 
 
@@ -66,6 +78,9 @@ class NdtriTest(test.TestCase):
   def testNdtri(self):
     """Verifies that ndtri computation is correct."""
     with self.test_session():
+      if not special:
+        return
+
       p = np.linspace(0., 1.0, 50).astype(np.float64)
       # Quantile performs piecewise rational approximation so adding some
       # special input values to make sure we hit all the pieces.
@@ -113,6 +128,9 @@ class NdtrTest(test.TestCase):
       self._test_grid_no_log(dtype, grid_spec, error_spec)
 
   def _test_grid_log(self, dtype, grid_spec, error_spec):
+    if not special:
+      return
+
     with self.test_session():
       grid = _make_grid(dtype, grid_spec)
       actual = sm.log_ndtr(grid).eval()
@@ -137,6 +155,9 @@ class NdtrTest(test.TestCase):
           atol=error_spec.atol)
 
   def _test_grid_no_log(self, dtype, grid_spec, error_spec):
+    if not special:
+      return
+
     with self.test_session():
       grid = _make_grid(dtype, grid_spec)
       actual = sm.ndtr(grid).eval()
@@ -267,6 +288,9 @@ class NdtrGradientTest(test.TestCase):
       self.assert_all_true(np.isfinite(grad_eval))
 
       # Versus scipy.
+      if not (special and stats):
+        return
+
       expected = stats.norm.pdf(raw_grid)
       if self._use_log:
         expected /= special.ndtr(raw_grid)
@@ -323,6 +347,9 @@ class LogCDFLaplaceTest(test.TestCase):
       _check_strictly_increasing(actual)
 
       # Versus scipy.
+      if not stats:
+        return
+
       scipy_dist = stats.laplace(loc=0., scale=1.)
       expected = scipy_dist.logcdf(grid.astype(scipy_dtype))
       self.assertAllClose(
diff --git a/tensorflow/contrib/distributions/python/ops/kullback_leibler.py b/tensorflow/python/ops/distributions/kullback_leibler.py
similarity index 82%
rename from tensorflow/contrib/distributions/python/ops/kullback_leibler.py
rename to tensorflow/python/ops/distributions/kullback_leibler.py
index 335fe7a5e2..9770d82bd8 100644
--- a/tensorflow/contrib/distributions/python/ops/kullback_leibler.py
+++ b/tensorflow/python/ops/distributions/kullback_leibler.py
@@ -44,11 +44,13 @@ def _registered_kl(type_a, type_b):
   return kl_fn
 
 
-def kl(dist_a, dist_b, allow_nan_stats=True, name=None):
-  """Get the KL-divergence KL(dist_a || dist_b).
+def kl_divergence(distribution_a, distribution_b,
+                  allow_nan_stats=True, name=None):
+  """Get the KL-divergence KL(distribution_a || distribution_b).
 
-  If there is no KL method registered specifically for `type(dist_a)` and
-  `type(dist_b)`, then the class hierarchies of these types are searched.
+  If there is no KL method registered specifically for `type(distribution_a)`
+  and `type(distribution_b)`, then the class hierarchies of these types are
+  searched.
 
   If one KL method is registered between any pairs of classes in these two
   parent hierarchies, it is used.
@@ -58,11 +60,11 @@ def kl(dist_a, dist_b, allow_nan_stats=True, name=None):
 
   If more than one such shortest path exists, the first method
   identified in the search is used (favoring a shorter MRO distance to
-  `type(dist_a)`).
+  `type(distribution_a)`).
 
   Args:
-    dist_a: The first distribution.
-    dist_b: The second distribution.
+    distribution_a: The first distribution.
+    distribution_b: The second distribution.
     allow_nan_stats: Python `bool`, default `True`. When `True`,
       statistics (e.g., mean, mode, variance) use the value "`NaN`" to
       indicate the result is undefined. When `False`, an exception is raised
@@ -70,20 +72,22 @@ def kl(dist_a, dist_b, allow_nan_stats=True, name=None):
     name: Python `str` name prefixed to Ops created by this class.
 
   Returns:
-    A Tensor with the batchwise KL-divergence between dist_a and dist_b.
+    A Tensor with the batchwise KL-divergence between `distribution_a`
+    and `distribution_b`.
 
   Raises:
     NotImplementedError: If no KL method is defined for distribution types
-      of dist_a and dist_b.
+      of `distribution_a` and `distribution_b`.
   """
-  kl_fn = _registered_kl(type(dist_a), type(dist_b))
+  kl_fn = _registered_kl(type(distribution_a), type(distribution_b))
   if kl_fn is None:
     raise NotImplementedError(
-        "No KL(dist_a || dist_b) registered for dist_a type %s and dist_b "
-        "type %s" % (type(dist_a).__name__, type(dist_b).__name__))
+        "No KL(distribution_a || distribution_b) registered for distribution_a "
+        "type %s and distribution_b type %s"
+        % (type(distribution_a).__name__, type(distribution_b).__name__))
 
   with ops.name_scope("KullbackLeibler"):
-    kl_t = kl_fn(dist_a, dist_b, name=name)
+    kl_t = kl_fn(distribution_a, distribution_b, name=name)
     if allow_nan_stats:
       return kl_t
 
@@ -96,7 +100,7 @@ def kl(dist_a, dist_b, allow_nan_stats=True, name=None):
                 math_ops.reduce_any(math_ops.is_nan(kl_t))),
             ["KL calculation between %s and %s returned NaN values "
              "(and was called with allow_nan_stats=False). Values:"
-             % (dist_a.name, dist_b.name), kl_t])]):
+             % (distribution_a.name, distribution_b.name), kl_t])]):
       return array_ops.identity(kl_t, name="checked_kl")
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/normal.py b/tensorflow/python/ops/distributions/normal.py
similarity index 98%
rename from tensorflow/contrib/distributions/python/ops/normal.py
rename to tensorflow/python/ops/distributions/normal.py
index ed12439c44..4c531b0378 100644
--- a/tensorflow/contrib/distributions/python/ops/normal.py
+++ b/tensorflow/python/ops/distributions/normal.py
@@ -20,8 +20,6 @@ from __future__ import print_function
 
 import math
 
-from tensorflow.contrib.distributions.python.ops import kullback_leibler
-from tensorflow.contrib.distributions.python.ops import special_math
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -32,6 +30,8 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import kullback_leibler
+from tensorflow.python.ops.distributions import special_math
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/special_math.py b/tensorflow/python/ops/distributions/special_math.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/special_math.py
rename to tensorflow/python/ops/distributions/special_math.py
-- 
GitLab


From 74e9ccc7d5c888a8bd9236bcf0b291f64458ac66 Mon Sep 17 00:00:00 2001
From: Androbin <robin.richtsfeld@gmail.com>
Date: Tue, 2 May 2017 01:04:08 +0200
Subject: [PATCH 0896/1563] add "frames" op to "contrib/signal" (#9236)

* add "frames" op

Added op to slice a tensor into (overlapping) frames.
May be used for signal processing purposes.
Inspired by `python_speech_features.sigproc.framesig`

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Update array_ops.py

* Add files via upload

* Update array_ops.py

* Add files via upload

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Add files via upload

* Delete __init__.py

* Delete BUILD

* Delete __init__.py

* Delete shape_ops_test.py

* Delete __init__.py

* Delete shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops.py

* Update shape_ops_test.py

* Update shape_ops_test.py

* Add files via upload

* Update BUILD

* Update shape_ops.py

* Update BUILD

* Update shape_ops.py

* Update shape_ops.py

* fix buildifier complaint

* Update shape_ops.py

* Fix some expected linting issues

* fix todo colon

* Remove public visibility of signal_py, since it is brought in via contrib API.

* Fix reference to default package visibility to //tensorflow
---
 tensorflow/contrib/signal/BUILD               | 46 +++++++++++
 tensorflow/contrib/signal/__init__.py         | 27 +++++++
 tensorflow/contrib/signal/python/__init__.py  | 18 +++++
 .../python/kernel_tests/shape_ops_test.py     | 68 ++++++++++++++++
 .../contrib/signal/python/ops/__init__.py     | 18 +++++
 .../contrib/signal/python/ops/shape_ops.py    | 81 +++++++++++++++++++
 tensorflow/tools/pip_package/BUILD            |  2 +
 7 files changed, 260 insertions(+)
 create mode 100644 tensorflow/contrib/signal/BUILD
 create mode 100644 tensorflow/contrib/signal/__init__.py
 create mode 100644 tensorflow/contrib/signal/python/__init__.py
 create mode 100644 tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py
 create mode 100644 tensorflow/contrib/signal/python/ops/__init__.py
 create mode 100644 tensorflow/contrib/signal/python/ops/shape_ops.py

diff --git a/tensorflow/contrib/signal/BUILD b/tensorflow/contrib/signal/BUILD
new file mode 100644
index 0000000000..ddcd0a03cf
--- /dev/null
+++ b/tensorflow/contrib/signal/BUILD
@@ -0,0 +1,46 @@
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+package(default_visibility = ["//tensorflow:__subpackages__"])
+
+load("//tensorflow:tensorflow.bzl", "cuda_py_tests")
+
+py_library(
+    name = "signal_py",
+    srcs = ["__init__.py"] + glob(["python/ops/*.py"]),
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:math_ops",
+    ],
+)
+
+cuda_py_tests(
+    name = "shape_ops_test",
+    size = "small",
+    srcs = ["python/kernel_tests/shape_ops_test.py"],
+    additional_deps = [
+        ":signal_py",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/signal/__init__.py b/tensorflow/contrib/signal/__init__.py
new file mode 100644
index 0000000000..33639aa82a
--- /dev/null
+++ b/tensorflow/contrib/signal/__init__.py
@@ -0,0 +1,27 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""
+@@frames
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.signal.python.ops.shape_ops import frames
+
+from tensorflow.python.util.all_util import remove_undocumented
+remove_undocumented(__name__)
diff --git a/tensorflow/contrib/signal/python/__init__.py b/tensorflow/contrib/signal/python/__init__.py
new file mode 100644
index 0000000000..d2b5550aa6
--- /dev/null
+++ b/tensorflow/contrib/signal/python/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
diff --git a/tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py b/tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py
new file mode 100644
index 0000000000..ba6c67c770
--- /dev/null
+++ b/tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py
@@ -0,0 +1,68 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for shape_ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.signal.python.ops import shape_ops
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import test
+
+
+class FramesTest(test.TestCase):
+
+  def test_mapping_of_indices_without_padding(self):
+    with self.test_session():
+      tensor = constant_op.constant(np.arange(9152), dtypes.int32)
+      tensor = array_ops.expand_dims(tensor, 0)
+      
+      result = shape_ops.frames(tensor, 512, 180)
+      result = result.eval()
+      
+      expected = np.tile(np.arange(512), (49, 1))
+      expected += np.tile(np.arange(49) * 180, (512, 1)).T
+      
+      expected = np.expand_dims(expected, axis=0)
+      expected = np.array(expected, dtype=np.int32)
+      
+      self.assertAllEqual(expected, result)
+  
+  def test_mapping_of_indices_with_padding(self):
+    with self.test_session():
+      tensor = constant_op.constant(np.arange(10000), dtypes.int32)
+      tensor = array_ops.expand_dims(tensor, 0)
+      
+      result = shape_ops.frames(tensor, 512, 192)
+      result = result.eval()
+      
+      expected = np.tile(np.arange(512), (51, 1))
+      expected += np.tile(np.arange(51) * 192, (512, 1)).T
+      
+      expected[expected >= 10000] = 0
+      
+      expected = np.expand_dims(expected, axis=0)
+      expected = np.array(expected, dtype=np.int32)
+      
+      self.assertAllEqual(expected, result)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/signal/python/ops/__init__.py b/tensorflow/contrib/signal/python/ops/__init__.py
new file mode 100644
index 0000000000..d2b5550aa6
--- /dev/null
+++ b/tensorflow/contrib/signal/python/ops/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
diff --git a/tensorflow/contrib/signal/python/ops/shape_ops.py b/tensorflow/contrib/signal/python/ops/shape_ops.py
new file mode 100644
index 0000000000..e1d0f977c1
--- /dev/null
+++ b/tensorflow/contrib/signal/python/ops/shape_ops.py
@@ -0,0 +1,81 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+
+def frames(signal, frame_length, frame_step, name=None):
+  """Frame a signal into overlapping frames.
+  May be used in front of spectral functions.
+  
+  For example:
+  
+  ```python
+  pcm = tf.placeholder(tf.float32, [None, 9152])
+  frames = tf.contrib.signal.frames(pcm, 512, 180)
+  magspec = tf.abs(tf.spectral.rfft(frames, [512]))
+  image = tf.expand_dims(magspec, 3)
+  ```
+  
+  Args:
+    signal: A `Tensor` of shape `[batch_size, signal_length]`.
+    frame_length: An `int32` or `int64` `Tensor`. The length of each frame.
+    frame_step: An `int32` or `int64` `Tensor`. The step between frames.
+    name: A name for the operation (optional).
+  
+  Returns:
+    A `Tensor` of frames with shape `[batch_size, num_frames, frame_length]`.
+  """
+  with ops.name_scope(name, "frames", [signal, frame_length, frame_step]):
+    signal = ops.convert_to_tensor(signal, name="signal")
+    frame_length = ops.convert_to_tensor(frame_length, name="frame_length")
+    frame_step = ops.convert_to_tensor(frame_step, name="frame_step")
+    
+    signal_rank = signal.shape.ndims
+    
+    if signal_rank != 2:
+      raise ValueError("expected signal to have rank 2 but was " + signal_rank)
+    
+    signal_length = array_ops.shape(signal)[1]
+    
+    num_frames = math_ops.ceil((signal_length - frame_length) / frame_step)
+    num_frames = 1 + math_ops.cast(num_frames, dtypes.int32)
+    
+    pad_length = (num_frames - 1) * frame_step + frame_length
+    pad_signal = array_ops.pad(
+        signal, [[0, 0], [0, pad_length - signal_length]])
+    
+    indices_frame = array_ops.expand_dims(math_ops.range(frame_length), 0)
+    indices_frames = array_ops.tile(indices_frame, [num_frames, 1])
+    
+    indices_step = array_ops.expand_dims(
+        math_ops.range(num_frames) * frame_step, 1)
+    indices_steps = array_ops.tile(indices_step, [1, frame_length])
+    
+    indices = indices_frames + indices_steps
+    
+    # TODO(Androbin): remove `transpose` when `gather` gets `axis` support
+    pad_signal = array_ops.transpose(pad_signal)
+    frames = array_ops.gather(pad_signal, indices)
+    frames = array_ops.transpose(frames, perm=[2, 0, 1])
+    
+    return frames
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index c17a7f7fb1..83be430e7d 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -68,6 +68,7 @@ py_binary(
         ":included_headers",
         "//tensorflow/contrib/nn:nn_py",
         "//tensorflow/contrib/session_bundle:session_bundle_pip",
+        "//tensorflow/contrib/signal:signal_py",
         "//tensorflow/contrib/slim/python/slim/data:data_pip",
         "//tensorflow/python:util_example_parser_configuration",
         "//tensorflow/python/debug:debug_pip",
@@ -141,6 +142,7 @@ sh_binary(
             "//tensorflow/contrib/ndlstm:ndlstm",
             "//tensorflow/contrib/nn:nn_py",
             "//tensorflow/contrib/session_bundle:session_bundle_pip",
+            "//tensorflow/contrib/signal:signal_py",
             "//tensorflow/contrib/slim:slim",
             "//tensorflow/contrib/slim/python/slim/data:data_pip",
             "//tensorflow/contrib/slim/python/slim/nets:nets_pip",
-- 
GitLab


From 8a123f7d1bca579a1401a10804eb1a45e213d6bc Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 14:59:25 -0800
Subject: [PATCH 0897/1563] Add small test to check hinge_softness != 0 in
 softplus bijector. Change: 154773145

---
 .../python/kernel_tests/bijectors/softplus_test.py          | 6 ++++++
 .../distributions/python/ops/bijectors/softplus_impl.py     | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
index e8abde4087..214b196b54 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
@@ -41,6 +41,12 @@ class SoftplusBijectorTest(test.TestCase):
     """Inverse log det jacobian, before being reduced."""
     return -np.log(1 - np.exp(-y))
 
+  def testHingeSoftnessZeroRaises(self):
+    with self.test_session():
+      bijector = Softplus(event_ndims=0, hinge_softness=0., validate_args=True)
+      with self.assertRaisesOpError("must be non-zero"):
+        bijector.forward([1., 1.]).eval()
+
   def testBijectorForwardInverseEventDimsZero(self):
     with self.test_session():
       bijector = Softplus(event_ndims=0)
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
index baa41cfcbd..81957fcf78 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/softplus_impl.py
@@ -94,7 +94,9 @@ class Softplus(bijector.Bijector):
       if validate_args:
         nonzero_check = check_ops.assert_none_equal(
             ops.convert_to_tensor(
-                0, dtype=self.hinge_softness.dtype), self.hinge_softness)
+                0, dtype=self.hinge_softness.dtype),
+            self.hinge_softness,
+            message="hinge_softness must be non-zero")
         self._hinge_softness = control_flow_ops.with_dependencies(
             [nonzero_check], self.hinge_softness)
 
-- 
GitLab


From 7c561e09c05100fe68f00d66a2d27d1b490ee74e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 15:11:37 -0800
Subject: [PATCH 0898/1563] Explain when callables passed to tf.cond &
 tf.while_loop are run. Rename the parameters to tf.cond. Change: 154774725

---
 tensorflow/python/ops/control_flow_ops.py     | 111 ++++++++++++------
 .../python/ops/control_flow_ops_test.py       |  63 ++++++++++
 tensorflow/tools/api/golden/tensorflow.pbtxt  |   2 +-
 3 files changed, 137 insertions(+), 39 deletions(-)

diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index a22e4819d5..91be9ddbd7 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -71,6 +71,7 @@ from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.ops.gen_control_flow_ops import *
 # pylint: enable=wildcard-import
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.util import deprecation
 from tensorflow.python.util import nest
 from tensorflow.python.util import tf_should_use
 
@@ -1679,14 +1680,20 @@ def _UnpackIfSingleton(res):
     return res
 
 
-def cond(pred, fn1, fn2, strict=False, name=None):
-  """Return `fn1()` if the boolean predicate `pred` is true else `fn2()`.
+# pylint: disable=g-doc-args
+@deprecation.deprecated_args(
+    None,
+    "fn1/fn2 are deprecated in favor of the true_fn/false_fn arguments.",
+    "fn1", "fn2")
+def cond(pred, true_fn=None, false_fn=None, strict=False, name=None,
+         fn1=None, fn2=None):
+  """Return `true_fn()` if the predicate `pred` is true else `false_fn()`.
 
-  `fn1` and `fn2` both return lists of output tensors. `fn1` and `fn2` must have
-  the same non-zero number and type of outputs.
+  `true_fn` and `false_fn` both return lists of output tensors. `true_fn` and
+  `false_fn` must have the same non-zero number and type of outputs.
 
   Note that the conditional execution applies only to the operations defined in
-  `fn1` and `fn2`. Consider the following simple program:
+  `true_fn` and `false_fn`. Consider the following simple program:
 
   ```python
   z = tf.multiply(a, b)
@@ -1700,28 +1707,35 @@ def cond(pred, fn1, fn2, strict=False, name=None):
   Although this behavior is consistent with the dataflow model of TensorFlow,
   it has occasionally surprised some users who expected a lazier semantics.
 
+  Note that `cond` calls `true_fn` and `false_fn` *exactly once* (inside the
+  call to `cond`, and not at all during `Session.run()`). `cond`
+  stitches together the graph fragments created during the `true_fn` and
+  `false_fn` calls with some additional graph nodes to ensure that the right
+  branch gets executed depending on the value of `pred`.
+
   `tf.cond` supports nested structures as implemented in
-  `tensorflow.python.util.nest`. Both `fn1` and `fn2` must return the same
-  (possibly nested) value structure of lists, tuples, and/or named tuples.
+  `tensorflow.python.util.nest`. Both `true_fn` and `false_fn` must return the
+  same (possibly nested) value structure of lists, tuples, and/or named tuples.
   Singleton lists and tuples form the only exceptions to this: when returned by
-  `fn1` and/or `fn2`, they are implicitly unpacked to single values. This
-  behavior is disabled by passing `strict=True`.
+  `true_fn` and/or `false_fn`, they are implicitly unpacked to single values.
+  This behavior is disabled by passing `strict=True`.
 
   Args:
-    pred: A scalar determining whether to return the result of `fn1` or `fn2`.
-    fn1: The callable to be performed if pred is true.
-    fn2: The callable to be performed if pred is false.
+    pred: A scalar determining whether to return the result of `true_fn` or
+      `false_fn`.
+    true_fn: The callable to be performed if pred is true.
+    false_fn: The callable to be performed if pred is false.
     strict: A boolean that enables/disables 'strict' mode; see above.
     name: Optional name prefix for the returned tensors.
 
   Returns:
-    Tensors returned by the call to either `fn1` or `fn2`. If the callables
-    return a singleton list, the element is extracted from the list.
+    Tensors returned by the call to either `true_fn` or `false_fn`. If the
+    callables return a singleton list, the element is extracted from the list.
 
   Raises:
-    TypeError: if `fn1` or `fn2` is not callable.
-    ValueError: if `fn1` and `fn2` do not return the same number of tensors, or
-                return tensors of different types.
+    TypeError: if `true_fn` or `false_fn` is not callable.
+    ValueError: if `true_fn` and `false_fn` do not return the same number of
+      tensors, or return tensors of different types.
 
   Example:
 
@@ -1736,12 +1750,30 @@ def cond(pred, fn1, fn2, strict=False, name=None):
   ```
 
   """
-  with ops.name_scope(name, "cond", [pred]) as name:
-    if not callable(fn1):
-      raise TypeError("fn1 must be callable.")
-    if not callable(fn2):
-      raise TypeError("fn2 must be callable.")
+  # We needed to make true_fn/false_fn keyword arguments for
+  # backwards-compatibility. This check exists so that we can convert back to
+  # having them be positional arguments.
+  # TODO(josh11b): Make `true_fn` and `false_fn` positional arguments after
+  # `fn1` and `fn2` are deleted.
+  if fn1 is not None:
+    if true_fn is not None:
+      raise TypeError("cond(): true_fn and fn1 may not be set simultaneously.")
+    true_fn = fn1
+  elif true_fn is None:
+    raise TypeError("cond(): true_fn argument required")
+  if fn2 is not None:
+    if false_fn is not None:
+      raise TypeError("cond(): false_fn and fn2 may not be set simultaneously.")
+    false_fn = fn2
+  elif false_fn is None:
+    raise TypeError("cond(): false_fn argument required")
+
+  if not callable(true_fn):
+    raise TypeError("true_fn must be callable.")
+  if not callable(false_fn):
+    raise TypeError("false_fn must be callable.")
 
+  with ops.name_scope(name, "cond", [pred]) as name:
     # Add the Switch to the graph.
     if isinstance(pred, bool):
       raise TypeError("pred must not be a Python bool")
@@ -1756,18 +1788,18 @@ def cond(pred, fn1, fn2, strict=False, name=None):
     # Build the graph for the true branch in a new context.
     context_t = CondContext(pred, pivot_1, branch=1)
     context_t.Enter()
-    orig_res_t, res_t = context_t.BuildCondBranch(fn1)
+    orig_res_t, res_t = context_t.BuildCondBranch(true_fn)
     if orig_res_t is None:
-      raise ValueError("fn1 must have a return value.")
+      raise ValueError("true_fn must have a return value.")
     context_t.ExitResult(res_t)
     context_t.Exit()
 
     # Build the graph for the false branch in a new context.
     context_f = CondContext(pred, pivot_2, branch=0)
     context_f.Enter()
-    orig_res_f, res_f = context_f.BuildCondBranch(fn2)
+    orig_res_f, res_f = context_f.BuildCondBranch(false_fn)
     if orig_res_f is None:
-      raise ValueError("fn2 must have a return value.")
+      raise ValueError("false_fn must have a return value.")
     context_f.ExitResult(res_f)
     context_f.Exit()
 
@@ -1780,14 +1812,14 @@ def cond(pred, fn1, fn2, strict=False, name=None):
       nest.assert_same_structure(orig_res_t, orig_res_f)
     except TypeError as e:
       raise TypeError(
-          "Incompatible return types of fn1 and fn2: {}".format(e))
+          "Incompatible return types of true_fn and false_fn: {}".format(e))
     except ValueError as e:
       raise ValueError(
-          "Incompatible return values of fn1 and fn2: {}".format(e))
+          "Incompatible return values of true_fn and false_fn: {}".format(e))
 
     # Add the final merge to the graph.
     if not res_t:
-      raise ValueError("fn1 and fn2 must return at least one result.")
+      raise ValueError("true_fn and false_fn must return at least one result.")
 
     res_t_flat = nest.flatten(res_t)
     res_f_flat = nest.flatten(res_f)
@@ -1801,8 +1833,9 @@ def cond(pred, fn1, fn2, strict=False, name=None):
       val_x = x if isinstance(x, ops.Tensor) else x.values
       val_y = y if isinstance(y, ops.Tensor) else y.values
       if val_x.dtype.base_dtype != val_y.dtype.base_dtype:
-        raise ValueError("Outputs of fn1 and fn2 must have the same type: "
-                         "%s, %s" % (val_x.dtype.name, val_y.dtype.name))
+        raise ValueError(
+            "Outputs of true_fn and false_fn must have the same type: %s, %s" %
+            (val_x.dtype.name, val_y.dtype.name))
 
     merges = [merge(pair)[0] for pair in zip(res_f_flat, res_t_flat)]
     merges = _convert_flows_to_tensorarrays(nest.flatten(orig_res_t), merges)
@@ -1817,6 +1850,7 @@ def cond(pred, fn1, fn2, strict=False, name=None):
     if not strict:
       merges = _UnpackIfSingleton(merges)
     return merges
+# pylint: enable=g-doc-args
 
 
 def _resource_safe_shape(t):
@@ -2548,12 +2582,16 @@ def while_loop(cond, body, loop_vars, shape_invariants=None,
   `cond` and `body`. `cond` and `body` both take as many arguments as there are
   `loop_vars`.
 
-  While `cond` evaluates to true, `body` is executed.
-
   In addition to regular Tensors or IndexedSlices, the body may accept and
   return TensorArray objects.  The flows of the TensorArray objects will
   be appropriately forwarded between loops and during gradient calculations.
 
+  Note that `while_loop` calls `cond` and `body` *exactly once* (inside the
+  call to `while_loop`, and not at all during `Session.run()`). `while_loop`
+  stitches together the graph fragments created during the `cond` and `body`
+  calls with some additional graph nodes to make something the repeats
+  `body` until `cond` returns false.
+
   For correctness, `tf.while_loop()` strictly enforces shape invariants for
   the loop variables. A shape invariant is a (possibly partial) shape that
   is unchanged across the iterations of the loop. An error will be raised
@@ -2882,10 +2920,10 @@ def case(pred_fn_pairs, default, exclusive=False, strict=False, name="case"):
   operation returns the tensors generated by `default`.
 
   `tf.case` supports nested structures as implemented in
-  `tensorflow.python.util.nest`. Both `fn1` and `fn2` must return the same
+  `tensorflow.python.util.nest`. All of the callables must return the same
   (possibly nested) value structure of lists, tuples, and/or named tuples.
   Singleton lists and tuples form the only exceptions to this: when returned by
-  `fn1` and/or `fn2`, they are implicitly unpacked to single values. This
+  a callable, they are implicitly unpacked to single values. This
   behavior is disabled by passing `strict=True`.
 
   Example 1:
@@ -2913,9 +2951,6 @@ def case(pred_fn_pairs, default, exclusive=False, strict=False, name="case"):
 
     Expressions:
     ```
-      x = tf.constant(0)
-      y = tf.constant(1)
-      z = tf.constant(2)
       def f1(): return tf.constant(17)
       def f2(): return tf.constant(23)
       def f3(): return tf.constant(-1)
diff --git a/tensorflow/python/ops/control_flow_ops_test.py b/tensorflow/python/ops/control_flow_ops_test.py
index 7704254b01..4e95783e5a 100644
--- a/tensorflow/python/ops/control_flow_ops_test.py
+++ b/tensorflow/python/ops/control_flow_ops_test.py
@@ -324,6 +324,69 @@ class SwitchTestCase(TensorFlowTestCase):
       self.assertEquals(grad_x_false.eval(), 0.)
 
 
+class CondTest(TensorFlowTestCase):
+
+  def testCondTrue(self):
+    with self.test_session():
+      x = constant_op.constant(2)
+      y = constant_op.constant(5)
+      z = control_flow_ops.cond(
+          math_ops.less(x, y), lambda: math_ops.multiply(x, 17),
+          lambda: math_ops.add(y, 23))
+      self.assertEquals(z.eval(), 34)
+
+  def testCondFalse(self):
+    with self.test_session():
+      x = constant_op.constant(2)
+      y = constant_op.constant(1)
+      z = control_flow_ops.cond(
+          math_ops.less(x, y), lambda: math_ops.multiply(x, 17),
+          lambda: math_ops.add(y, 23))
+      self.assertEquals(z.eval(), 24)
+
+  def testCondTrueLegacy(self):
+    with self.test_session():
+      x = constant_op.constant(2)
+      y = constant_op.constant(5)
+      z = control_flow_ops.cond(
+          math_ops.less(x, y), fn1=lambda: math_ops.multiply(x, 17),
+          fn2=lambda: math_ops.add(y, 23))
+      self.assertEquals(z.eval(), 34)
+
+  def testCondFalseLegacy(self):
+    with self.test_session():
+      x = constant_op.constant(2)
+      y = constant_op.constant(1)
+      z = control_flow_ops.cond(
+          math_ops.less(x, y), fn1=lambda: math_ops.multiply(x, 17),
+          fn2=lambda: math_ops.add(y, 23))
+      self.assertEquals(z.eval(), 24)
+
+  def testCondMissingArg1(self):
+    with self.test_session():
+      x = constant_op.constant(1)
+      with self.assertRaises(TypeError):
+        control_flow_ops.cond(True, false_fn=lambda: x)
+
+  def testCondMissingArg2(self):
+    with self.test_session():
+      x = constant_op.constant(1)
+      with self.assertRaises(TypeError):
+        control_flow_ops.cond(True, lambda: x)
+
+  def testCondDuplicateArg1(self):
+    with self.test_session():
+      x = constant_op.constant(1)
+      with self.assertRaises(TypeError):
+        control_flow_ops.cond(True, lambda: x, lambda: x, fn1=lambda: x)
+
+  def testCondDuplicateArg2(self):
+    with self.test_session():
+      x = constant_op.constant(1)
+      with self.assertRaises(TypeError):
+        control_flow_ops.cond(True, lambda: x, lambda: x, fn2=lambda: x)
+
+
 class ContextTest(TensorFlowTestCase):
 
   def testCondContext(self):
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index c3c4145763..fb636d9525 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -718,7 +718,7 @@ tf_module {
   }
   member_method {
     name: "cond"
-    argspec: "args=[\'pred\', \'fn1\', \'fn2\', \'strict\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
+    argspec: "args=[\'pred\', \'true_fn\', \'false_fn\', \'strict\', \'name\', \'fn1\', \'fn2\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'False\', \'None\', \'None\', \'None\'], "
   }
   member_method {
     name: "confusion_matrix"
-- 
GitLab


From 0135602ffd33f21d702ee7a3a55e86cd85af45ca Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 16:09:21 -0800
Subject: [PATCH 0899/1563] Add doc for saved_model_cli Change: 154781345

---
 .../docs_src/programmers_guide/leftnav_files  |   1 +
 .../programmers_guide/saved_model_cli.md      | 251 ++++++++++++++++++
 tensorflow/python/tools/saved_model_cli.py    |   3 +-
 3 files changed, 254 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/docs_src/programmers_guide/saved_model_cli.md

diff --git a/tensorflow/docs_src/programmers_guide/leftnav_files b/tensorflow/docs_src/programmers_guide/leftnav_files
index d397917219..322e11cbd6 100644
--- a/tensorflow/docs_src/programmers_guide/leftnav_files
+++ b/tensorflow/docs_src/programmers_guide/leftnav_files
@@ -8,6 +8,7 @@ supervisor.md
 debugger.md
 tfdbg-tflearn.md
 meta_graph.md
+saved_model_cli.md
 version_semantics.md
 data_versions.md
 faq.md
diff --git a/tensorflow/docs_src/programmers_guide/saved_model_cli.md b/tensorflow/docs_src/programmers_guide/saved_model_cli.md
new file mode 100644
index 0000000000..eb9e60e42e
--- /dev/null
+++ b/tensorflow/docs_src/programmers_guide/saved_model_cli.md
@@ -0,0 +1,251 @@
+# SavedModel CLI (Command-Line Interface)
+
+[`SavedModel`](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/saved_model/README.md)
+is a universal serialization format for Tensorflow. It provides a
+language-neutral format to save machine-learned models and enables higher-level
+systems and tools to produce, consume and transform TensorFlow models.
+
+We provide SavedModel CLI(command-line interface) as a tool to inspect and
+execute a [`MetaGraph`](https://www.tensorflow.org/programmers_guide/meta_graph)
+in a SavedModel. You can inspect for example, what
+[`SignatureDefs`](https://github.com/tensorflow/serving/blob/master/tensorflow_serving/g3doc/signature_defs.md),
+including their input and output tensors, are in the model without writing any
+code. This can be useful in situations such as when you want to quickly check
+your input dtype and shape match with the model. Moreover, if you want to test
+out the model, it also allows you to do a sanity check by passing in sample
+inputs in the format of for example, python expressions, and fetch the outputs
+simply through command line.
+
+## Get SavedModel CLI
+
+If TensorFlow is installed on your system through pip, the `saved_model_cli`
+binary can be invoked directly from command line.
+
+To build the binary from source, run the following command:
+
+```
+$bazel build tensorflow/python/tools:saved_model_cli
+```
+
+## Commands
+
+SavedModel CLI allows users to both show and run computations on a
+[`MetaGraphDef`](https://www.tensorflow.org/code/tensorflow/core/protobuf/meta_graph.proto)
+in a SavedModel. These are done through `show` and `run` commands. We will
+explain the usages of both commands with detailed examples. SavedModel CLI will
+also display this information with `-h` option.
+
+### `show` command
+
+A SavedModel contains one or more MetaGraphs, identified by their tag-sets. Each
+MetaGraph contains both a TensorFlow GraphDef as well as associated metadata
+necessary for running computation in a graph. In order to serve a model, you
+might wonder what kind of SignatureDefs are in each model, and what are their
+inputs and outputs etc. The `show` command let you examine the content of the
+SavedModel in a hierarchical order.
+
+```
+usage: saved_model_cli show [-h] --dir DIR [--all]
+[--tag_set TAG_SET] [--signature_def SIGNATURE_DEF_KEY]
+```
+
+#### Examples
+
+To show all available MetaGraphDef tag-sets in the SavedModel:
+
+```
+$saved_model_cli show --dir /tmp/saved_model_dir
+The given SavedModel contains the following tag-sets:
+serve
+serve, gpu
+```
+
+To show all available SignatureDef keys in a MetaGraphDef:
+
+```
+$saved_model_cli show --dir /tmp/saved_model_dir --tag_set serve
+The given SavedModel MetaGraphDef contains SignatureDefs with the following keys:
+SignatureDef key: "classify_x2_to_y3"
+SignatureDef key: "classify_x_to_y"
+SignatureDef key: "regress_x2_to_y3"
+SignatureDef key: "regress_x_to_y"
+SignatureDef key: "regress_x_to_y2"
+SignatureDef key: "serving_default"
+```
+
+For a MetaGraphDef with multiple tags in the tag-set, all tags must be passed
+in, separated by ',':
+
+```
+$saved_model_cli show --dir /tmp/saved_model_dir --tag_set serve,gpu
+```
+
+To show all inputs and outputs TensorInfo for a specific SignatureDef, pass in
+the SignatureDef key to `signature_def` option. This is very useful when you
+want to know the tensor key value, dtype and shape of the input tensors for
+executing the computation graph later.
+
+```
+$saved_model_cli show --dir \
+/tmp/saved_model_dir --tag_set serve --signature_def serving_default
+The given SavedModel SignatureDef contains the following input(s):
+inputs['x'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+    name: x:0
+The given SavedModel SignatureDef contains the following output(s):
+outputs['y'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+    name: y:0
+Method name is: tensorflow/serving/predict
+```
+
+To show all available information in the SavedModel, use `--all` option:
+
+```
+$saved_model_cli show --dir /tmp/saved_model_dir --all
+MetaGraphDef with tag-set: 'serve' contains the following SignatureDefs:
+
+signature_def['classify_x2_to_y3']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['inputs'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+    name: x2:0
+The given SavedModel SignatureDef contains the following output(s):
+outputs['scores'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+    name: y3:0
+Method name is: tensorflow/serving/classify
+
+...
+
+signature_def['serving_default']:
+The given SavedModel SignatureDef contains the following input(s):
+inputs['x'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+    name: x:0
+The given SavedModel SignatureDef contains the following output(s):
+outputs['y'] tensor_info:
+    dtype: DT_FLOAT
+    shape: (-1, 1)
+    name: y:0
+Method name is: tensorflow/serving/predict
+```
+
+### `run` command
+
+SavedModel CLI also allows you to run a graph computation by passing in inputs,
+displaying, and saving the outputs.
+
+```
+usage: saved_model_cli run [-h] --dir DIR --tag_set TAG_SET --signature_def
+                           SIGNATURE_DEF_KEY [--inputs INPUTS]
+                           [--input_exprs INPUT_EXPRS] [--outdir OUTDIR]
+                           [--overwrite] [--tf_debug]
+```
+
+Tensor keys are used to specify which input we are passing in the values for.
+There are two ways to pass inputs to the model. With '--inputs' option, you can
+pass in numpy ndarray by files. With '--input_exprs' option, you can use python
+expressions as inputs.
+
+#### Input By File
+
+To pass in inputs by files, use `--inputs` option in the format of
+`<input_key>=<filename>`, or `<input_key>=<filename>[<variable_name>]`. Each
+input is separated by semicolon. File specified by `filename` will be loaded
+using `numpy.load`. Inputs can be loaded from only `.npy`, `.npz` or pickle
+files. The `variable_name` key is optional depending on the input file type as
+descripted in more details below.
+
+When loading from a `.npy` file, which always contains a numpy ndarray, the
+content will be directly assigned to the specified input tensor. If a
+`variable_name` is specified, it will be ignored and a warning will be issued.
+
+When loading from a `.npz` zip file, user can specify which variable within the
+zip file to load for the input tensor key with `variable_name`. If nothing is
+specified, SavedModel CLI will check that only one file is included in the zip
+file and load it for the specified input tensor key.
+
+When loading from a pickle file, if no `variable_name` is specified in the
+square brackets, whatever that is inside the pickle file will be passed to the
+specified input tensor key. Else SavedModel CLI will assume a dictionary is
+stored in the pickle file and the value corresponding to the variable_name will
+be used.
+
+#### Input By Python Expression
+
+To pass in inputs by python expressions, use `--input_exprs` option. `numpy`
+module is available as `np`. For example, `input_key=np.ones((32, 32, 3))` or
+`input_key=[[1], [2], [3]]`. This can be useful for when you don't have data
+files lying around, but still want to sanity check the model with some simple
+inputs that match the dtype and shape of the model signature.
+
+#### Save Output
+
+By default, SavedModel CLI will print outputs to console. If a directory is
+passed to `--outdir` option, the outputs will be saved as npy files named after
+output tensor keys under the given directory. Use `--overwite` to overwrite
+existing output files.
+
+#### TensorFlow Debugger (tfdbg) Integration
+
+If `--tf_debug` option is set, SavedModel CLI will use TensorFlow Debugger
+(tfdbg) to watch the intermediate Tensors and runtime GraphDefs while running
+the SavedModel.
+
+#### Examples
+
+If we have a simple model that adds `x1` and `x2` to get output `y`, where all
+tensors are of shape `(-1, 1)`, and we have two `npz` files. File
+`/tmp/my_data1.npy` contains a numpy ndarray `[[1], [2], [3]]`, file
+`/tmp/my_data2.npy` contains another numpy ndarray `[[0.5], [0.5], [0.5]]`. Now
+let's run these two `npy` files through the model to get `y`:
+
+```
+$saved_model_cli run --dir /tmp/saved_model_dir --tag_set serve \
+--signature_def x1_x2_to_y --inputs x1=/tmp/my_data1.npy;x2=/tmp/my_data2.npy \
+--outdir /tmp/out
+Result for output key y:
+[[ 1.5]
+ [ 2.5]
+ [ 3.5]]
+```
+
+Similarly, we can run input tensors from `npz` file and pickle file, as well as
+overwrite the previous output file:
+
+```
+$saved_model_cli run --dir /tmp/saved_model_dir --tag_set serve \
+--signature_def x1_x2_to_y \
+--inputs x1=/tmp/my_data1.npz[x];x2=/tmp/my_data2.pkl --outdir /tmp/out \
+--overwrite
+Result for output key y:
+[[ 1.5]
+ [ 2.5]
+ [ 3.5]]
+```
+
+You can also use python expression instead of input file. Here we replace input
+`x2` with a python expression:
+
+```
+$saved_model_cli run --dir /tmp/saved_model_dir --tag_set serve \
+--signature_def x1_x2_to_y --inputs x1=/tmp/my_data1.npz[x] \
+--input_exprs 'x2=np.ones((3,1))'
+Result for output key y:
+[[ 2]
+ [ 3]
+ [ 4]]
+```
+
+To run model with TensorFlow Debugger on:
+
+```
+$saved_model_cli run --dir /tmp/saved_model_dir --tag_set serve \
+--signature_def serving_default --inputs x=/tmp/data.npz[x] --tf_debug
+```
diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index 1c55c5bf53..9dfafb77e7 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -602,7 +602,8 @@ def create_parser():
              '--signature_def serving_default '
              '--inputs input1_key=/tmp/124.npz[x],input2_key=/tmp/123.npy'
              '--outdir=/out\n\n'
-             'For more information about input file format, please see:\n')
+             'For more information about input file format, please see:\n'
+             'https://www.tensorflow.org/programmers_guide/saved_model_cli\n')
   parser_run = subparsers.add_parser(
       'run', description=run_msg, formatter_class=argparse.RawTextHelpFormatter)
   parser_run.add_argument(
-- 
GitLab


From 0627928fb49ea03022b001e2e366f7967367eace Mon Sep 17 00:00:00 2001
From: Jamie Cooke <jamie@iamjamiecooke.com>
Date: Tue, 2 May 2017 01:29:41 +0100
Subject: [PATCH 0900/1563] Introduce a new tool/function to visualize a pb
 model as requested by #8854 (#8867)

* Clarify and correct Android Sections

Build Tools version updated to latest version shipping with Android Studio.
Added some comments to clarify both this and NDK Level details that have been causing confusion.

* Update Build Tools Version

Android studio uses 25.0.2 now (I think) and complains about incorrect bulid tools version in gradle. This fixes it. Not sure if this is unique to my android studio though because I have latest version?

* Requested changes to WORKSPACE for Android

Clarification of comments to the android section at the top. Comments added to avoid common confusion.

* Update Dockerfile.android to clarify build tools.

I don't understand this dockerfile too much but I gather that this will download and use the correct build_tools_version regardless? Nonetheless, updated to 25.0.2 as a minimum and added a comment to assist troubleshooters in the future.

* Update build_tools_version and add comment

Added comment to clarify build_tools_version updates and changed it to 25.0.2

* Update WORKSPACE

* Update WORKSPACE

* Update Dockerfile.android

* Update WORKSPACE

* Updated for "the", lines and line wrapping

* Create import_pb_to_tensorboard.py

In response to issue #8851, a quick tool to put a .pb model into tensorboard for visualization until a more friendly means appears.

* Fix issue number

* Improve formatting and style guideline adherence

Action the suggested changes

* Fix code on behalf of user

* Add copyright and __future__ imports

* Typo

* Fix lint error

* Change tab to space and minor MD formatting.
---
 .../python/tools/import_pb_to_tensorboard.py  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 tensorflow/python/tools/import_pb_to_tensorboard.py

diff --git a/tensorflow/python/tools/import_pb_to_tensorboard.py b/tensorflow/python/tools/import_pb_to_tensorboard.py
new file mode 100644
index 0000000000..1c65998756
--- /dev/null
+++ b/tensorflow/python/tools/import_pb_to_tensorboard.py
@@ -0,0 +1,44 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ================================
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import tensorflow as tf
+
+
+def import_to_tensorboard(model_dir, log_dir):
+  """View an imported protobuf model (`.pb` file) as a graph in Tensorboard.
+  
+  Args:
+    model_dir: The location of the protobuf (`pb`) model to visualize
+    log_dir: The location for the Tensorboard log to begin visualisation from.
+    
+  Usage:
+    Call this function with your model location and desired log directory.
+    Launch Tensorboard by pointing it to the log directory.
+    View your imported `.pb` model as a graph.
+  """
+  with tf.Session(graph=tf.Graph()) as sess:
+    with tf.gfile.FastGFile(model_dir, 'rb') as f:
+      graph_def = tf.GraphDef()
+      graph_def.ParseFromString(f.read())
+      g_in = tf.import_graph_def(graph_def)
+
+    pb_visual_writer = tf.summary.FileWriter(log_dir)
+    pb_visual_writer.add_graph(sess.graph)
+    print("Model Imported. Visualize by running: "
+          "> tensorboard --logdir={}".format(log_dir))
-- 
GitLab


From aebaf317ce50ef42ebaab91191224c872389a6f6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 1 May 2017 16:14:06 -0800
Subject: [PATCH 0901/1563] This CL removes the Graph.edge_set_ field.  This
 field stores a set of the Edge* that are in a Graph. However, Graph already
 stores this information, in Graph.edges_.  There's really no good reason to
 keep both of these collections.  To convert everything to use Graph.edges_
 instead of Graph.edge_set_, I defined a class which handled excluding nullptr
 from iteration of the edges_ vector.

This caused changes to non-contractual behavior of the runtime (enumeration order), so the unit tests are updated to reflect this.

On a real-world graph used by our team, which contains 13190 nodes and 20796 edges, this change reduced heap allocation from 39.1 MB to 38.0 MB, for a drop of about 3%.
Change: 154781831
---
 tensorflow/core/common_runtime/function.cc    |  2 +-
 .../core/common_runtime/function_test.cc      | 14 ++--
 tensorflow/core/graph/graph.cc                |  5 +-
 tensorflow/core/graph/graph.h                 | 69 +++++++++++++++++--
 4 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 0f2e24690f..13e20568ff 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -456,7 +456,7 @@ Status FunctionLibraryRuntimeImpl::Instantiate(
 void DumpGraph(StringPiece label, const Graph* g) {
   // TODO(zhifengc): Change Graph to record #nodes.
   VLOG(1) << "Graph " << label << " #nodes " << g->num_nodes() << " #edges "
-          << g->edges().size();
+          << g->num_edges();
   if (VLOG_IS_ON(2)) {
     for (const auto& line : str_util::Split(DebugString(g), '\n')) {
       VLOG(2) << "|| " << line;
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index bbf35590eb..8f70ab8783 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -424,7 +424,7 @@ TEST_F(FunctionLibraryRuntimeTest, ControlDeps) {
   n8 = NoOp() @ n4
   n9 = Identity[T=float](n3) @ n8
   n10 = Identity[T=float](n2) @ n8
-  n11 = NoOp() @ n10, n9
+  n11 = NoOp() @ n9, n10
   n5 = Mul[T=float](n2, n2) @ n11
   n6 = Add[T=float](n4, n5)
 }
@@ -500,8 +500,8 @@ TEST_F(FunctionLibraryRuntimeTest, Gradient_XTimesTwo) {
   OptimizeGraph(lib_, &g);
   const char* e2 = R"P(
 (n2:float, n3:float) -> (n9:float) {
-  n11 = Const[dtype=int32, value=Tensor<type: int32 shape: [0] values: >]()
   n10 = Const[dtype=float, value=Tensor<type: float shape: [] values: 2>]()
+  n11 = Const[dtype=int32, value=Tensor<type: int32 shape: [0] values: >]()
   n6 = Shape[T=float, out_type=int32](n2)
   n5 = Mul[T=float](n3, n10)
   n7 = BroadcastGradientArgs[T=int32](n6, n11)
@@ -614,10 +614,10 @@ TEST_F(FunctionLibraryRuntimeTest, Gradient_AddSum) {
   n17 = Sum[T=float, Tidx=int32, keep_dims=false](n14, n16)
   n19 = SymbolicGradient[Tin={float, int32, float}, Tout={float, int32}, f=Sum[T=float, Tidx=int32, keep_dims=false]](n14, n16, n26)
   n21 = SymbolicGradient[Tin={float, float, float}, Tout={float, float}, f=Add[T=float]](n24, n25, n19)
-  n28 = Identity[T=float](n21:1)
   n27 = Identity[T=float](n21)
-  n6 = Identity[T=float](n28)
+  n28 = Identity[T=float](n21:1)
   n8 = Identity[T=float](n27)
+  n6 = Identity[T=float](n28)
 }
 )P";
   EXPECT_EQ(e1, DebugString(g.get()));
@@ -626,8 +626,8 @@ TEST_F(FunctionLibraryRuntimeTest, Gradient_AddSum) {
   const char* e2 = R"P(
 (n4:float, n3:float) -> (n25:float, n23:float) {
   n2 = Const[dtype=float, value=Tensor<type: float shape: [] values: 1>]()
-  n8 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
   n7 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
+  n8 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
   n19 = Shape[T=float, out_type=int32](n3)
   n9 = Add[T=float](n4, n3)
   n20 = Shape[T=float, out_type=int32](n4)
@@ -641,10 +641,10 @@ TEST_F(FunctionLibraryRuntimeTest, Gradient_AddSum) {
   n16 = Reshape[T=float, Tshape=int32](n2, n15)
   n17 = Div[T=int32](n14, n15)
   n18 = Tile[T=float, Tmultiples=int32](n16, n17)
-  n24 = Sum[T=float, Tidx=int32, keep_dims=false](n18, n21)
   n22 = Sum[T=float, Tidx=int32, keep_dims=false](n18, n21:1)
-  n25 = Reshape[T=float, Tshape=int32](n24, n20)
+  n24 = Sum[T=float, Tidx=int32, keep_dims=false](n18, n21)
   n23 = Reshape[T=float, Tshape=int32](n22, n19)
+  n25 = Reshape[T=float, Tshape=int32](n24, n20)
 }
 )P";
   EXPECT_EQ(e2, DebugString(g.get()));
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index e1657cb862..a68a8f2509 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -344,7 +344,7 @@ const Edge* Graph::AddEdge(Node* source, int x, Node* dest, int y) {
   CHECK(source->out_edges_.insert(e).second);
   CHECK(dest->in_edges_.insert(e).second);
   edges_.push_back(e);
-  edge_set_.insert(e);
+  ++num_edges_;
   return e;
 }
 
@@ -354,8 +354,8 @@ void Graph::RemoveEdge(const Edge* e) {
   CHECK_EQ(e->src_->out_edges_.erase(e), size_t{1});
   CHECK_EQ(e->dst_->in_edges_.erase(e), size_t{1});
   CHECK_EQ(e, edges_[e->id_]);
+  CHECK_GT(num_edges_, 0);
 
-  CHECK_EQ(edge_set_.erase(e), size_t{1});
   edges_[e->id_] = nullptr;
 
   Edge* del = const_cast<Edge*>(e);
@@ -365,6 +365,7 @@ void Graph::RemoveEdge(const Edge* e) {
   del->src_output_ = kControlSlot - 1;
   del->dst_input_ = kControlSlot - 1;
   free_edges_.push_back(del);
+  --num_edges_;
 }
 
 Status Graph::AddFunctionLibrary(const FunctionDefLibrary& fdef_lib) {
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index 11a49ec3b3..bbb3af196d 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -268,6 +268,66 @@ class Edge {
   int dst_input_;
 };
 
+// Allows for iteration of the edges of a Graph, by iterating the underlying
+// Graph.edges_ vector while skipping over null entries.
+class GraphEdgesIterable {
+ private:
+  const std::vector<Edge*>& edges_;
+
+ public:
+  explicit GraphEdgesIterable(const std::vector<Edge*>& edges)
+      : edges_(edges) {}
+
+  typedef Edge* value_type;
+
+  class const_iterator {
+   private:
+    // The underlying iterator.
+    std::vector<value_type>::const_iterator iter_;
+
+    // The end of the underlying iterator.
+    std::vector<value_type>::const_iterator end_;
+
+    // Advances iter_ until it reaches a non-null item, or reaches the end.
+    void apply_filter() {
+      while (iter_ != end_ && *iter_ == nullptr) {
+        ++iter_;
+      }
+    }
+
+   public:
+    const_iterator(std::vector<value_type>::const_iterator iter,
+                   std::vector<value_type>::const_iterator end)
+        : iter_(iter), end_(end) {
+      apply_filter();
+    }
+
+    bool operator==(const const_iterator& other) const {
+      return iter_ == other.iter_;
+    }
+
+    bool operator!=(const const_iterator& other) const {
+      return iter_ != other.iter_;
+    }
+
+    // This is the prefix increment operator (++x), which is the operator
+    // used by C++ range iteration (for (x : y) ...).  We intentionally do not
+    // provide a postfix increment operator.
+    const_iterator& operator++() {
+      ++iter_;
+      apply_filter();
+      return *this;
+    }
+
+    value_type operator*() { return *iter_; }
+  };
+
+  const_iterator begin() {
+    return const_iterator(edges_.begin(), edges_.end());
+  }
+  const_iterator end() { return const_iterator(edges_.end(), edges_.end()); }
+};
+
 // Thread compatible but not thread safe.
 class Graph {
  public:
@@ -345,7 +405,7 @@ class Graph {
   // smaller than num_edge_ids(). If one needs to create an array of
   // edges indexed by edge ids, num_edge_ids() should be used as the
   // array's size.
-  int num_edges() const { return edges().size(); }
+  int num_edges() const { return num_edges_; }
 
   // Serialize the nodes starting at `from_node_id` to a GraphDef.
   void ToGraphDefSubRange(GraphDef* graph_def, int from_node_id) const;
@@ -381,7 +441,7 @@ class Graph {
 
   // Access to the set of all edges.  Example usage:
   //   for (const Edge* e : graph.edges()) { ... }
-  const EdgeSet& edges() const { return edge_set_; }
+  GraphEdgesIterable edges() const { return GraphEdgesIterable(edges_); }
 
   // The pre-defined nodes.
   enum { kSourceId = 0, kSinkId = 1 };
@@ -421,9 +481,8 @@ class Graph {
   // the edge with that id was removed from the graph.
   std::vector<Edge*> edges_;
 
-  // For ease of iteration, we currently just keep a set of all live
-  // edges.  May want to optimize by removing this copy.
-  EdgeSet edge_set_;
+  // The number of entries in edges_ that are not nullptr.
+  int num_edges_ = 0;
 
   // Allocated but free nodes and edges.
   std::vector<Node*> free_nodes_;
-- 
GitLab


From 880b4aca813738fe70de57bda3f408168f1d270c Mon Sep 17 00:00:00 2001
From: Neven Miculinic <neven.miculinic@gmail.com>
Date: Tue, 2 May 2017 03:03:34 +0200
Subject: [PATCH 0902/1563] Added atrous_conv1d and 3d. Refactored 2d. (#7545)

* Added atrous_conv1d and 3d. Refactored 2d.

This commit makes following changes:
* deleted most atrous_conv2d code to reuse existing tf.nn.convolution function
* added atrous_conv1d and atrous_conv3d with similar API as atrous_conv2d
* Added support for variable rate per dimension, e.g. for atrous_conv2d
  rate=2, or rate=[2,1] does different things. Former is equal to
  rate=[2,2]. rate_i determines dilation_rate in dimension i.
* added strides support with same API as in tf.nn.convolution function

This commit makes more code deletions then additions. However
documentation per function makes it appear large.

Test Plan:

Some simple tests to verify I haven't screwed something up:

```
A = np.array([1, 2, 3, 4, 5, 6], dtype=np.float32).reshape(1, 6, 1)
print(A)

kernel = np.array([100, 10, 1], dtype=np.float32).reshape(3, 1, 1)

with tf.Session() as sess:
    print(sess.run(tf.nn.atrous_conv1d(A, kernel, padding='SAME', rate=[2])))
```

```
B = np.arange(16, dtype=np.float32).reshape(1, 4, 4, 1)
kernel = np.array([1000, 100, 10, 1.0], dtype=np.float32).reshape(2, 2, 1, 1)

with tf.Session() as sess:
    a = sess.run(tf.nn.convolution(B, kernel, padding='SAME', dilation_rate=np.array([2, 2])))
    b = sess.run(tf.nn.atrous_conv2d(B, kernel, rate=2, padding='SAME'))
    print(np.allclose(a, b))
    print(a)
    print(b)
```

```
C = np.arange(4**3, dtype=np.float32).reshape(1, 4, 4, 4, 1)
kernel = (10**np.arange(8, 0, -1, dtype=np.float32)).reshape(2, 2, 2, 1, 1)

with tf.Session() as sess:
    a = sess.run(tf.nn.conv3d(C, kernel, strides=[1, 1,1,1,1], padding='SAME'))
    b = sess.run(tf.nn.atrous_conv3d(C, kernel, rate=1, padding='SAME'))
    print(np.allclose(a, b))
    print(a)
    print(b)
```

Also running atrous_conv2d unit tests to verify backward compatibility.

* Fixed > 80 char lines, implemented suggestions

* Implemented suggestions.

Deleted atrous_conv1d and atrous_conv3d.
Added note in documentation for atrous_conv2d that convolution should be
used instead.

* Restored short summary in atrous_conv2d

* Fixed cleanup of leftover comments/mentions of atrous_conv1d/3d.

* Fix undefined strides
---
 tensorflow/python/ops/nn_ops.py | 94 +++------------------------------
 1 file changed, 7 insertions(+), 87 deletions(-)

diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 9b54b93754..247d35923e 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -840,6 +840,11 @@ def pool(input,  # pylint: disable=redefined-builtin
 def atrous_conv2d(value, filters, rate, padding, name=None):
   """Atrous convolution (a.k.a. convolution with holes or dilated convolution).
 
+  This function is a simpler wrapper around the more general
+  @{tf.nn.convolution}, and exists only for backwards compatibility. You can
+  use @{tf.nn.convolution} to perform 1-D, 2-D, or 3-D atrous convolution.
+
+
   Computes a 2-D atrous convolution, also known as convolution with holes or
   dilated convolution, given 4-D `value` and `filters` tensors. If the `rate`
   parameter is equal to one, it performs regular 2-D convolution. If the `rate`
@@ -959,93 +964,8 @@ def atrous_conv2d(value, filters, rate, padding, name=None):
     ValueError: If input/output depth does not match `filters`' shape, or if
       padding is other than `'VALID'` or `'SAME'`.
   """
-  with ops.name_scope(name, "atrous_conv2d", [value, filters]) as name:
-    value = ops.convert_to_tensor(value, name="value")
-    filters = ops.convert_to_tensor(filters, name="filters")
-    if not value.get_shape()[3].is_compatible_with(filters.get_shape()[2]):
-      raise ValueError(
-          "value's input channels does not match filters' input channels, "
-          "{} != {}".format(value.get_shape()[3], filters.get_shape()[2]))
-    if rate < 1:
-      raise ValueError("rate {} cannot be less than one".format(rate))
-
-    if rate == 1:
-      value = gen_nn_ops.conv2d(input=value,
-                                filter=filters,
-                                strides=[1, 1, 1, 1],
-                                padding=padding)
-      return value
-
-    # We have two padding contributions. The first is used for converting "SAME"
-    # to "VALID". The second is required so that the height and width of the
-    # zero-padded value tensor are multiples of rate.
-
-    # Padding required to reduce to "VALID" convolution
-    if padding == "SAME":
-      # Handle filters whose shape is unknown during graph creation.
-      if filters.get_shape().is_fully_defined():
-        filter_shape = filters.get_shape().as_list()
-      else:
-        filter_shape = array_ops.shape(filters)
-      filter_height, filter_width = filter_shape[0], filter_shape[1]
-
-      # Spatial dimensions of the filters and the upsampled filters in which we
-      # introduce (rate - 1) zeros between consecutive filter values.
-      filter_height_up = filter_height + (filter_height - 1) * (rate - 1)
-      filter_width_up = filter_width + (filter_width - 1) * (rate - 1)
-
-      pad_height = filter_height_up - 1
-      pad_width = filter_width_up - 1
-
-      # When pad_height (pad_width) is odd, we pad more to bottom (right),
-      # following the same convention as conv2d().
-      pad_top = pad_height // 2
-      pad_bottom = pad_height - pad_top
-      pad_left = pad_width // 2
-      pad_right = pad_width - pad_left
-    elif padding == "VALID":
-      pad_top = 0
-      pad_bottom = 0
-      pad_left = 0
-      pad_right = 0
-    else:
-      raise ValueError("Invalid padding")
-
-    # Handle input whose shape is unknown during graph creation.
-    if value.get_shape().is_fully_defined():
-      value_shape = value.get_shape().as_list()
-    else:
-      value_shape = array_ops.shape(value)
-
-    in_height = value_shape[1] + pad_top + pad_bottom
-    in_width = value_shape[2] + pad_left + pad_right
-
-    # More padding so that rate divides the height and width of the input.
-    pad_bottom_extra = (rate - in_height % rate) % rate
-    pad_right_extra = (rate - in_width % rate) % rate
-
-    # The paddings argument to space_to_batch includes both padding components.
-    space_to_batch_pad = [[pad_top, pad_bottom + pad_bottom_extra],
-                          [pad_left, pad_right + pad_right_extra]]
-
-    value = array_ops.space_to_batch(input=value,
-                                     paddings=space_to_batch_pad,
-                                     block_size=rate)
-
-    value = gen_nn_ops.conv2d(input=value,
-                              filter=filters,
-                              strides=[1, 1, 1, 1],
-                              padding="VALID",
-                              name=name)
-
-    # The crops argument to batch_to_space is just the extra padding component.
-    batch_to_space_crop = [[0, pad_bottom_extra], [0, pad_right_extra]]
-
-    value = array_ops.batch_to_space(input=value,
-                                     crops=batch_to_space_crop,
-                                     block_size=rate)
-
-    return value
+  return convolution(input=value, filter=filters, padding=padding,
+                     dilation_rate=np.broadcast_to(rate, (2, )), name=name)
 
 
 def conv2d_transpose(value,
-- 
GitLab


From 0673c708f05bc6a22e3438a53c4e98b2b70e3320 Mon Sep 17 00:00:00 2001
From: Falcon Dai <me@falcondai.com>
Date: Mon, 1 May 2017 20:30:03 -0500
Subject: [PATCH 0903/1563]  minor change to
 `tf.contrib.framework.load_variable` doc (#9483)

---
 tensorflow/python/training/checkpoint_utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/training/checkpoint_utils.py b/tensorflow/python/training/checkpoint_utils.py
index 35d1a069d8..ffa39b7793 100644
--- a/tensorflow/python/training/checkpoint_utils.py
+++ b/tensorflow/python/training/checkpoint_utils.py
@@ -59,14 +59,14 @@ def load_checkpoint(ckpt_dir_or_file):
 
 
 def load_variable(ckpt_dir_or_file, name):
-  """Returns a tensor with the contents of the given variable in the checkpoint.
+  """Returns the tensor value of the given variable in the checkpoint.
 
   Args:
     ckpt_dir_or_file: Directory with checkpoints file or path to checkpoint.
-    name: Name of the tensor to return.
+    name: Name of the variable to return.
 
   Returns:
-    `Tensor` object.
+    A numpy `ndarray` with a copy of the value of this variable.
   """
   # TODO(b/29227106): Fix this in the right place and remove this.
   if name.endswith(":0"):
-- 
GitLab


From 58cd0f404eb0fe66a1ecffa0d26232ff1502eb61 Mon Sep 17 00:00:00 2001
From: "Gao, Xiang" <qasdfgtyuiop@gmail.com>
Date: Mon, 1 May 2017 21:31:43 -0400
Subject: [PATCH 0904/1563] make configure smarter in detecting cuda (#9492)

* make configure smarter in detecting cuda

* Remove variable
---
 configure | 59 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/configure b/configure
index 75d3e160f5..8124888f6a 100755
--- a/configure
+++ b/configure
@@ -410,31 +410,6 @@ done
 export TF_CUDA_CLANG
 write_action_env_to_bazelrc "TF_CUDA_CLANG" "$TF_CUDA_CLANG"
 
-# Set up which gcc nvcc should use as the host compiler
-# No need to set this on Windows
-while [[ "$TF_CUDA_CLANG" != "1" ]] && ! is_windows && true; do
-  fromuser=""
-  if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
-    default_gcc_host_compiler_path=$(which gcc || true)
-    read -p "Please specify which gcc should be used by nvcc as the host compiler. [Default is $default_gcc_host_compiler_path]: " GCC_HOST_COMPILER_PATH
-    fromuser="1"
-    if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
-      GCC_HOST_COMPILER_PATH="$default_gcc_host_compiler_path"
-    fi
-  fi
-  if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
-    export GCC_HOST_COMPILER_PATH
-    write_action_env_to_bazelrc "GCC_HOST_COMPILER_PATH" "$GCC_HOST_COMPILER_PATH"
-    break
-  fi
-  echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
-  if [ -z "$fromuser" ]; then
-    exit 1
-  fi
-  GCC_HOST_COMPILER_PATH=""
-  # Retry
-done
-
 # Set up which clang we should use as the cuda / host compiler.
 while [[ "$TF_CUDA_CLANG" == "1" ]] && true; do
   fromuser=""
@@ -475,6 +450,11 @@ while true; do
       else
         default_cuda_path="$(cygpath -m "$CUDA_PATH")"
       fi
+    elif is_linux; then
+      # If the default doesn't exist, try an alternative default.
+      if [ ! -d $default_cuda_path ] && [ -d /opt/cuda ]; then
+        default_cuda_path=/opt/cuda
+      fi
     fi
     read -p "Please specify the location where CUDA $TF_CUDA_VERSION toolkit is installed. Refer to README.md for more details. [Default is $default_cuda_path]: " CUDA_TOOLKIT_PATH
     fromuser="1"
@@ -514,6 +494,35 @@ while true; do
   CUDA_TOOLKIT_PATH=""
 done
 
+# Set up which gcc nvcc should use as the host compiler
+# No need to set this on Windows
+while [[ "$TF_CUDA_CLANG" != "1" ]] && ! is_windows && true; do
+  fromuser=""
+  if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
+    default_gcc_host_compiler_path=$(which gcc || true)
+    cuda_bin_symlink="$CUDA_TOOLKIT_PATH/bin/gcc"
+    if [ -L "$cuda_bin_symlink" ]; then
+      default_gcc_host_compiler_path=$(readlink $cuda_bin_symlink)
+    fi
+    read -p "Please specify which gcc should be used by nvcc as the host compiler. [Default is $default_gcc_host_compiler_path]: " GCC_HOST_COMPILER_PATH
+    fromuser="1"
+    if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
+      GCC_HOST_COMPILER_PATH="$default_gcc_host_compiler_path"
+    fi
+  fi
+  if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
+    export GCC_HOST_COMPILER_PATH
+    write_action_env_to_bazelrc "GCC_HOST_COMPILER_PATH" "$GCC_HOST_COMPILER_PATH"
+    break
+  fi
+  echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
+  if [ -z "$fromuser" ]; then
+    exit 1
+  fi
+  GCC_HOST_COMPILER_PATH=""
+  # Retry
+done
+
 # Find out where the cuDNN library is installed
 while true; do
   # Configure the cuDNN version to use.
-- 
GitLab


From 0287e879ac67bf41b862b0e4583ceab4e678ea2b Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Mon, 1 May 2017 17:41:00 -0800
Subject: [PATCH 0905/1563] Enable grappler to propagate shapes through queues.
 Change: 154789133

---
 .../core/common_runtime/shape_refiner.cc      | 228 ++++++++++++------
 .../core/common_runtime/shape_refiner.h       |   8 +
 .../core/common_runtime/shape_refiner_test.cc |  33 +++
 tensorflow/core/framework/shape_inference.h   |  57 ++++-
 tensorflow/core/grappler/costs/BUILD          |   4 +-
 .../core/grappler/costs/graph_properties.cc   |  68 ++++++
 .../grappler/costs/graph_properties_test.cc   |  73 ++++++
 tensorflow/core/ops/data_flow_ops.cc          |  12 +-
 8 files changed, 402 insertions(+), 81 deletions(-)

diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index 5135355a94..daa9e5091a 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -89,9 +89,6 @@ Status ShapeRefiner::AddNode(const Node* node) {
 
   // This needs to be filled in with real data in a second pass.
   std::vector<const Tensor*> input_tensors(node->num_inputs());
-  std::vector<Tensor> real_tensors(node->num_inputs());
-  std::vector<bool> attempted_materialization(node->num_inputs());
-  std::vector<bool> attempted_tensor_as_shape_conversion(node->num_inputs());
   std::vector<ShapeHandle> input_tensors_as_shapes;
 
   // Create the inference context for this node with the existing input shapes.
@@ -104,78 +101,7 @@ Status ShapeRefiner::AddNode(const Node* node) {
   }
 
   // Run the shape inference function, and return if there was an error.
-  if (op_reg_data->shape_inference_fn) {
-    TF_RETURN_IF_ERROR(c->Run(op_reg_data->shape_inference_fn));
-  } else {
-    TF_RETURN_IF_ERROR(c->Run(shape_inference::UnknownShape));
-  }
-
-  // We must run the shape function repeatedly, in case users write
-  // shape functions where they only conditionally call input_tensor()
-  // based on the values of another input tensor.
-  bool rerun_shape_fn;
-  do {
-    // If the result of running shape inference would have benefitted
-    // from knowing the values of input tensors, try to materialize
-    // the results of those tensors, and then run the shape inference
-    // function again using those known tensors.
-    rerun_shape_fn = false;
-
-    // NOTE: It is possible to batch the extraction and
-    // materialization of inputs, instead of materializing one input
-    // at a time like we do below.  If input-at-a-time computation
-    // becomes a bottleneck, we could separate ExtractConstantSubgraph
-    // into two functions: one that returns true if an input is
-    // derivable from constants, and another function that extracts
-    // the subgraph for multiple target nodes and executes the whole
-    // subgraph once.
-
-    for (int i = 0; i < c->num_inputs(); ++i) {
-      if (!c->requested_input_tensor(i)) {
-        continue;
-      }
-      // Check if we have not already filled in the requested input,
-      // and if not, try to materialize the tensors.
-      if (!attempted_materialization[i]) {
-        attempted_materialization[i] = true;
-
-        Tensor result;
-        bool evaluated = false;
-        TF_RETURN_IF_ERROR(
-            EvaluateConstantTensorForEdge(node, i, &evaluated, &result));
-        if (evaluated) {
-          real_tensors[i] = result;
-          input_tensors[i] = &real_tensors[i];
-          // We have more concrete information about a shape,
-          // so re-run shape inference.
-          rerun_shape_fn = true;
-        }
-      }
-      if (c->requested_input_tensor_as_partial_shape(i) &&
-          !attempted_tensor_as_shape_conversion[i]) {
-        attempted_tensor_as_shape_conversion[i] = true;
-        if (i >= input_tensors_as_shapes.size()) {
-          input_tensors_as_shapes.resize(i + 1);
-        }
-        ShapeHandle s;
-        TF_RETURN_IF_ERROR(ConstantPartialShape(c.get(), node, i, &s));
-        input_tensors_as_shapes[i] = s;
-        rerun_shape_fn = true;
-      }
-    }
-
-    if (rerun_shape_fn) {
-      // We have more information about the shapes on this pass,
-      // so re-run shape inference.
-      c->set_input_tensors(input_tensors);
-      c->set_input_tensors_as_shapes(input_tensors_as_shapes);
-      if (op_reg_data->shape_inference_fn) {
-        TF_RETURN_IF_ERROR(op_reg_data->shape_inference_fn(c.get()));
-      } else {
-        TF_RETURN_IF_ERROR(shape_inference::UnknownShape(c.get()));
-      }
-    }
-  } while (rerun_shape_fn);
+  TF_RETURN_IF_ERROR(RunShapeFn(node, op_reg_data, c.get()));
 
   // Store the resulting InferenceContext object in the map.
   node_to_context_[node].swap(c);
@@ -211,6 +137,71 @@ Status ShapeRefiner::SetShape(const Node* node, int output_port,
   return Status::OK();
 }
 
+Status ShapeRefiner::UpdateNode(const Node* node, bool* refined) {
+  auto it = node_to_context_.find(node);
+  if (it == node_to_context_.end()) {
+    *refined = true;
+    return AddNode(node);
+  }
+  InferenceContext* node_context = it->second.get();
+
+  // Check if the shapes of the nodes in the fan-in of this node have changed,
+  // and if they have update the node input shapes.
+  for (const Edge* e : node->in_edges()) {
+    if (e->IsControlEdge()) continue;
+
+    Node* input = e->src();
+    auto iter = node_to_context_.find(input);
+    if (iter == node_to_context_.end()) {
+      return errors::FailedPrecondition(
+          "Input ", e->dst_input(), " ('", input->name(), "') for '",
+          node->name(), "' was not previously added to ShapeRefiner.");
+    }
+
+    InferenceContext* c = iter->second.get();
+    DCHECK_GE(e->dst_input(), 0);
+    if (node_context->set_input(e->dst_input(), c->output(e->src_output()))) {
+      *refined = true;
+    }
+
+    // Also propagate handle shape and dtype of edges which are carrying
+    // resource handles.
+    if (e->src()->output_type(e->src_output()) == DT_RESOURCE) {
+      if (node_context->set_input_handle_dtype(
+              e->dst_input(), c->output_handle_dtype(e->src_output()))) {
+        *refined = true;
+      }
+      if (node_context->set_input_handle_shape(
+              e->dst_input(), c->output_handle_shape(e->src_output()))) {
+        *refined = true;
+      }
+    }
+  }
+
+  if (!*refined) {
+    // No input shape has changed, we're done
+    return Status::OK();
+  }
+
+  // Get and run the shape function for this node to update the shapes of the
+  // outputs.
+  const OpRegistrationData* op_reg_data;
+  TF_RETURN_IF_ERROR(ops_registry_->LookUp(node->type_string(), &op_reg_data));
+  if (op_reg_data->shape_inference_fn == nullptr &&
+      require_shape_inference_fns_) {
+    return errors::InvalidArgument(
+        "No shape inference function exists for op '", node->type_string(),
+        "', did you forget to define it?");
+  }
+
+  if (!op_reg_data->shape_inference_fn) {
+    // There is nothing more we can infer
+    return Status::OK();
+  }
+
+  return RunShapeFn(node, op_reg_data, node_context);
+}
+
 Status ShapeRefiner::EvaluateConstantTensorForEdge(const Node* node,
                                                    int dst_idx, bool* evaluated,
                                                    Tensor* result) {
@@ -463,4 +454,91 @@ Status ShapeRefiner::ConstantPartialShape(InferenceContext* target_context,
   return Status::OK();
 }
 
+Status ShapeRefiner::RunShapeFn(const Node* node,
+                                const OpRegistrationData* op_reg_data,
+                                shape_inference::InferenceContext* c) {
+  // This will be filled in with real data in a second pass.
+  std::vector<const Tensor*> input_tensors(node->num_inputs());
+  std::vector<Tensor> real_tensors(node->num_inputs());
+  std::vector<bool> attempted_materialization(node->num_inputs());
+  std::vector<bool> attempted_tensor_as_shape_conversion(node->num_inputs());
+  std::vector<ShapeHandle> input_tensors_as_shapes;
+
+  // Run the shape inference function, and return if there was an error.
+  if (op_reg_data->shape_inference_fn) {
+    TF_RETURN_IF_ERROR(c->Run(op_reg_data->shape_inference_fn));
+  } else {
+    TF_RETURN_IF_ERROR(c->Run(shape_inference::UnknownShape));
+  }
+
+  // We must run the shape function repeatedly, in case users write
+  // shape functions where they only conditionally call input_tensor()
+  // based on the values of another input tensor.
+  bool rerun_shape_fn;
+  do {
+    // If the result of running shape inference would have benefitted
+    // from knowing the values of input tensors, try to materialize
+    // the results of those tensors, and then run the shape inference
+    // function again using those known tensors.
+    rerun_shape_fn = false;
+
+    // NOTE: It is possible to batch the extraction and
+    // materialization of inputs, instead of materializing one input
+    // at a time like we do below.  If input-at-a-time computation
+    // becomes a bottleneck, we could separate ExtractConstantSubgraph
+    // into two functions: one that returns true if an input is
+    // derivable from constants, and another function that extracts
+    // the subgraph for multiple target nodes and executes the whole
+    // subgraph once.
+
+    for (int i = 0; i < c->num_inputs(); ++i) {
+      if (!c->requested_input_tensor(i)) {
+        continue;
+      }
+      // Check if we have not already filled in the requested input,
+      // and if not, try to materialize the tensors.
+      if (!attempted_materialization[i]) {
+        attempted_materialization[i] = true;
+
+        Tensor result;
+        bool evaluated = false;
+        TF_RETURN_IF_ERROR(
+            EvaluateConstantTensorForEdge(node, i, &evaluated, &result));
+        if (evaluated) {
+          real_tensors[i] = result;
+          input_tensors[i] = &real_tensors[i];
+          // We have more concrete information about a shape,
+          // so re-run shape inference.
+          rerun_shape_fn = true;
+        }
+      }
+      if (c->requested_input_tensor_as_partial_shape(i) &&
+          !attempted_tensor_as_shape_conversion[i]) {
+        attempted_tensor_as_shape_conversion[i] = true;
+        if (i >= input_tensors_as_shapes.size()) {
+          input_tensors_as_shapes.resize(i + 1);
+        }
+        ShapeHandle s;
+        TF_RETURN_IF_ERROR(ConstantPartialShape(c, node, i, &s));
+        input_tensors_as_shapes[i] = s;
+        rerun_shape_fn = true;
+      }
+    }
+
+    if (rerun_shape_fn) {
+      // We have more information about the shapes on this pass,
+      // so re-run shape inference.
+      c->set_input_tensors(input_tensors);
+      c->set_input_tensors_as_shapes(input_tensors_as_shapes);
+      if (op_reg_data->shape_inference_fn) {
+        TF_RETURN_IF_ERROR(op_reg_data->shape_inference_fn(c));
+      } else {
+        TF_RETURN_IF_ERROR(shape_inference::UnknownShape(c));
+      }
+    }
+  } while (rerun_shape_fn);
+
+  return Status::OK();
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/common_runtime/shape_refiner.h b/tensorflow/core/common_runtime/shape_refiner.h
index 2d04ea1505..9709bd0302 100644
--- a/tensorflow/core/common_runtime/shape_refiner.h
+++ b/tensorflow/core/common_runtime/shape_refiner.h
@@ -55,6 +55,11 @@ class ShapeRefiner {
   Status SetShape(const Node* node, int output_port,
                   shape_inference::ShapeHandle shape);
 
+  // Update the input shapes of node in case the shapes of the fan-ins of 'node'
+  // have themselves been modified (For example, in case of incremental shape
+  // refinement). Sets refined to true if any of the node shape has changed.
+  Status UpdateNode(const Node* node, bool* refined);
+
   // Returns the InferenceContext for 'node', if present.
   shape_inference::InferenceContext* GetContext(const Node* node) const {
     auto it = node_to_context_.find(node);
@@ -108,6 +113,9 @@ class ShapeRefiner {
                               const Node* node, int dst_idx,
                               shape_inference::ShapeHandle* result);
 
+  Status RunShapeFn(const Node* node, const OpRegistrationData* op_reg_data,
+                    shape_inference::InferenceContext* c);
+
   int32 graph_def_version_;
   const OpRegistryInterface* const ops_registry_;
 
diff --git a/tensorflow/core/common_runtime/shape_refiner_test.cc b/tensorflow/core/common_runtime/shape_refiner_test.cc
index d7e7c3b5ad..b8df6dd4f6 100644
--- a/tensorflow/core/common_runtime/shape_refiner_test.cc
+++ b/tensorflow/core/common_runtime/shape_refiner_test.cc
@@ -768,5 +768,38 @@ TEST(ShapeRefinerTest, ConstantValueAsShape_ConcatInvalidDimValue) {
             m.AddNode(result).error_message());
 }
 
+TEST(ShapeRefinerTest, IncrementalUpdates) {
+  Scope root = Scope::NewRootScope();
+  Graph* g = root.graph();
+  Node* queue;
+  TF_CHECK_OK(NodeBuilder("queue", "FIFOQueueV2")
+                  .Attr("component_types", {DT_FLOAT})
+                  .Finalize(g, &queue));
+  Node* dequeue;
+  TF_CHECK_OK(NodeBuilder("dequeue", "QueueDequeueV2")
+                  .Attr("component_types", {DT_FLOAT})
+                  .Input(queue)
+                  .Finalize(g, &dequeue));
+  ShapeRefiner m(TF_GRAPH_DEF_VERSION, OpRegistry::Global());
+  TF_ASSERT_OK(m.AddNode(queue));
+  TF_ASSERT_OK(m.AddNode(dequeue));
+
+  // At this point, the shapes of the dequeued tensor are unknown.
+  shape_inference::InferenceContext* ctx = m.GetContext(dequeue);
+  EXPECT_EQ("?", ctx->DebugString(ctx->output(0)));
+
+  // Inject a shape, and incrementally propagate it to the dequeue op.
+  ctx = m.GetContext(queue);
+  shape_inference::ShapeHandle shp = ctx->MakeShape({3, 7});
+  ctx->set_output_handle_shape(0, shp);
+  ctx->set_output_handle_dtype(0, DT_FLOAT);
+
+  bool refined = false;
+  TF_ASSERT_OK(m.UpdateNode(dequeue, &refined));
+  EXPECT_TRUE(refined);
+  ctx = m.GetContext(dequeue);
+  EXPECT_EQ("[3,7]", ctx->DebugString(ctx->output(0)));
+}
+
 }  // namespace
 }  // namespace tensorflow
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index e88f6dbb04..71663027b3 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -191,6 +191,17 @@ class InferenceContext {
     return s;
   }
 
+  // Set the shape of the input in position idx. This requires idx to be in the
+  // [0, num_inputs) range. Returns true iff the stored input shape has been
+  // updated with a different handle.
+  bool set_input(int idx, ShapeHandle shape) {
+    if (!inputs_[idx].SameHandle(shape)) {
+      inputs_[idx] = shape;
+      return true;
+    } else {
+      return false;
+    }
+  }
   ShapeHandle input(int64 idx) const { return inputs_[idx]; }
   Status input(StringPiece input_name, std::vector<ShapeHandle>* output) const;
   int num_inputs() const { return inputs_.size(); }
@@ -430,15 +441,53 @@ class InferenceContext {
   // and dtypes of tensors which can be accessed via the handle. These methods
   // propagate that information. Output handle dtypes and shapes are ignored if
   // the output tensor is not of type DT_RESOURCE.
+
+  // Set the shape corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_inputs) range. Returns true iff the stored shape
+  // has been updated with a different handle.
+  bool set_input_handle_shape(int idx, ShapeHandle shape) {
+    if (!input_handle_shape_[idx].SameHandle(shape)) {
+      input_handle_shape_[idx] = shape;
+      return true;
+    }
+    return false;
+  }
+
+  // Set the type corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_inputs) range. Returns true iff the stored type
+  // has been updated.
+  bool set_input_handle_dtype(int idx, DataType dtype) {
+    if (input_handle_dtype_[idx] != dtype) {
+      input_handle_dtype_[idx] = dtype;
+      return true;
+    }
+    return false;
+  }
   ShapeHandle input_handle_shape(int idx);
   DataType input_handle_dtype(int idx) const {
     return input_handle_dtype_[idx];
   }
-  void set_output_handle_shape(int idx, ShapeHandle shape) {
-    output_handle_shape_[idx] = shape;
+
+  // Set the shape corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_outputs) range.
+  // Returns true iff the stored shape has been updated with a different handle.
+  bool set_output_handle_shape(int idx, ShapeHandle shape) {
+    if (!output_handle_shape_[idx].SameHandle(shape)) {
+      output_handle_shape_[idx] = shape;
+      return true;
+    }
+    return false;
   }
-  void set_output_handle_dtype(int idx, DataType dtype) {
-    output_handle_dtype_[idx] = dtype;
+
+  // Set the type corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_outputs) range. Returns true iff the stored type
+  // has been updated.
+  bool set_output_handle_dtype(int idx, DataType dtype) {
+    if (output_handle_dtype_[idx] != dtype) {
+      output_handle_dtype_[idx] = dtype;
+      return true;
+    }
+    return false;
   }
   ShapeHandle output_handle_shape(int idx) const {
     return output_handle_shape_[idx];
diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index d078d9af09..e784c2df44 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -50,11 +50,13 @@ cc_test(
     args = ["--heap_check=local"],  # The GPU tracer leaks memory
     deps = [
         ":graph_properties",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:scope",
+        "//tensorflow/core:framework",
         "//tensorflow/core:lib_proto_parsing",
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
         "//tensorflow/core/grappler:grappler_item",
-        "//tensorflow/core/grappler:grappler_item_builder",
         "//tensorflow/core/grappler/clusters:single_machine",
         "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
     ],
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 06e91af2c2..ad8f4f3f7c 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -15,6 +15,9 @@ limitations under the License.
 
 #include "tensorflow/core/grappler/costs/graph_properties.h"
 
+#include <queue>
+#include <unordered_map>
+#include <unordered_set>
 #include "tensorflow/core/common_runtime/shape_refiner.h"
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/graph/graph_constructor.h"
@@ -31,6 +34,71 @@ Status GraphProperties::InferStatically() {
   Status s = ImportGraphDef(options, item_.graph, &graph, &shape_refiner);
   TF_RETURN_IF_ERROR(s);
 
+  // List the resources and the nodes using them
+  std::unordered_map<const Node*, std::unordered_set<const Node*>> resources;
+  for (const Node* const node : graph.nodes()) {
+    for (int i = 0; i < node->num_inputs(); ++i) {
+      if (node->input_type(i) == DataType::DT_RESOURCE) {
+        const Node* resource;
+        TF_CHECK_OK(node->input_node(i, &resource));
+        resources[resource].insert(node);
+      }
+    }
+  }
+
+  // If we found a resource, try to propagate the shapes through it.
+  bool done = true;
+  do {
+    std::queue<const Node*> new_shapes;
+    for (const auto& resource_data : resources) {
+      const Node* qnode = resource_data.first;
+      StringPiece type(qnode->type_string());
+      if (!type.ends_with("QueueV2")) {
+        continue;
+      }
+      auto qctx = shape_refiner.GetContext(qnode);
+      if (!qctx) {
+        continue;
+      }
+      shape_inference::ShapeHandle data_shp = qctx->output_handle_shape(0);
+      if (qctx->FullyDefined(data_shp)) {
+        continue;
+      }
+
+      for (const auto& node : resource_data.second) {
+        auto ctx = shape_refiner.GetContext(node);
+        if (!ctx) {
+          continue;
+        }
+        if (node->type_string().find("Enqueue") != std::string::npos) {
+          if (ctx->num_inputs() == 2) {
+            const DataType dtype = node->input_type(1);
+            shape_inference::ShapeHandle shp = ctx->input(1);
+            shape_inference::ShapeHandle refined;
+            TF_RETURN_IF_ERROR(qctx->Merge(shp, data_shp, &refined));
+            if (qctx->set_output_handle_shape(0, refined) ||
+                qctx->set_output_handle_dtype(0, dtype)) {
+              new_shapes.push(qnode);
+            }
+          }
+        }
+      }
+    }
+    // Propagate the shapes in the transitive fan-out of the queue.
+    done = new_shapes.empty();
+    while (!new_shapes.empty()) {
+      const Node* n = new_shapes.front();
+      new_shapes.pop();
+      for (const Node* fanout : n->out_nodes()) {
+        bool updated = false;
+        TF_RETURN_IF_ERROR(shape_refiner.UpdateNode(fanout, &updated));
+        if (updated) {
+          new_shapes.push(fanout);
+        }
+      }
+    }
+  } while (!done);
+
   for (const Node* const node : graph.nodes()) {
     VLOG(1) << "<Node> " << node->name();
     auto ctx = shape_refiner.GetContext(node);
diff --git a/tensorflow/core/grappler/costs/graph_properties_test.cc b/tensorflow/core/grappler/costs/graph_properties_test.cc
index 32683644fb..1eff52ba0e 100644
--- a/tensorflow/core/grappler/costs/graph_properties_test.cc
+++ b/tensorflow/core/grappler/costs/graph_properties_test.cc
@@ -14,6 +14,9 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/costs/graph_properties.h"
+#include "tensorflow/cc/framework/scope.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def_builder.h"
 #include "tensorflow/core/grappler/clusters/single_machine.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h"
@@ -129,6 +132,76 @@ TEST_F(GraphPropertiesTest, DynamicProperties) {
   }
 }
 
+TEST_F(GraphPropertiesTest, VarHandles) {
+  GrapplerItem item;
+  TF_CHECK_OK(NodeDefBuilder("Var", "VarHandleOp")
+                  .Attr("dtype", DT_FLOAT)
+                  .Attr("shape", TensorShape({3, 7}))
+                  .Finalize(item.graph.add_node()));
+
+  TF_CHECK_OK(NodeDefBuilder("VarRead", "ReadVariableOp")
+                  .Attr("dtype", DT_FLOAT)
+                  .Input("Var", 0, DT_RESOURCE)
+                  .Finalize(item.graph.add_node()));
+
+  GraphProperties properties(item);
+  TF_CHECK_OK(properties.InferStatically());
+
+  const auto props = properties.GetOutputProperties("VarRead");
+  EXPECT_EQ(1, props.size());
+  const OpInfo::TensorProperties& prop = props[0];
+  EXPECT_EQ(DT_FLOAT, prop.dtype());
+  EXPECT_FALSE(prop.shape().unknown_rank());
+  EXPECT_EQ(2, prop.shape().dim_size());
+  EXPECT_EQ(3, prop.shape().dim(0).size());
+  EXPECT_EQ(7, prop.shape().dim(1).size());
+}
+
+TEST_F(GraphPropertiesTest, Queues) {
+  // Create a graph with known input shapes, and propagate the shapes through a
+  // couple of queues.
+  tensorflow::Scope root = tensorflow::Scope::NewRootScope();
+
+  auto q1 = ops::FIFOQueue(root.WithOpName("Queue1"), {DataType::DT_FLOAT});
+  Output rnd =
+      ops::RandomNormal(root.WithOpName("rnd"), {3, 7}, DataType::DT_FLOAT);
+  Output square1 = ops::Square(root.WithOpName("Square1"), rnd);
+  auto enqueue1 = ops::QueueEnqueue(root.WithOpName("Enqueue1"), q1, {square1});
+  auto dequeue1 =
+      ops::QueueDequeue(root.WithOpName("Dequeue1"), q1, {DataType::DT_FLOAT});
+
+  auto q2 =
+      ops::RandomShuffleQueue(root.WithOpName("Queue2"), {DataType::DT_FLOAT});
+  Output square2 = ops::Square(root.WithOpName("Square2"), dequeue1[0]);
+  auto enqueue2 = ops::QueueEnqueue(root.WithOpName("Enqueue2"), q2, {square2});
+  auto dequeue2 =
+      ops::QueueDequeue(root.WithOpName("Dequeue2"), q2, {DataType::DT_FLOAT});
+
+  GrapplerItem item;
+  TF_CHECK_OK(root.ToGraphDef(&item.graph));
+
+  GraphProperties properties(item);
+  TF_CHECK_OK(properties.InferStatically());
+
+  const auto props1 = properties.GetOutputProperties("Dequeue1");
+  EXPECT_EQ(1, props1.size());
+  const OpInfo::TensorProperties& prop1 = props1[0];
+  EXPECT_EQ(DT_FLOAT, prop1.dtype());
+  EXPECT_FALSE(prop1.shape().unknown_rank());
+  EXPECT_EQ(2, prop1.shape().dim_size());
+  EXPECT_EQ(3, prop1.shape().dim(0).size());
+  EXPECT_EQ(7, prop1.shape().dim(1).size());
+
+  const auto props2 = properties.GetOutputProperties("Dequeue2");
+  EXPECT_EQ(1, props2.size());
+  const OpInfo::TensorProperties& prop2 = props2[0];
+  EXPECT_EQ(DT_FLOAT, prop2.dtype());
+  EXPECT_FALSE(prop2.shape().unknown_rank());
+  EXPECT_EQ(2, prop2.shape().dim_size());
+  EXPECT_EQ(3, prop2.shape().dim(0).size());
+  EXPECT_EQ(7, prop2.shape().dim(1).size());
+}
+
 }  // namespace
 }  // namespace grappler
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index f82e9d1eb7..f35a1bb648 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -623,7 +623,17 @@ REGISTER_OP("QueueDequeueV2")
     .Output("components: component_types")
     .Attr("component_types: list(type) >= 1")
     .Attr("timeout_ms: int = -1")
-    .SetShapeFn(shape_inference::UnknownShape)
+    .SetShapeFn([](InferenceContext* c) {
+      if (c->num_outputs() == 1) {
+        c->set_output(0, c->input_handle_shape(0));
+      } else {
+        // TODO(vrv): handle the case of multiple outputs.
+        for (int i = 0; i < c->num_outputs(); ++i) {
+          c->set_output(i, c->UnknownShape());
+        }
+      }
+      return Status::OK();
+    })
     .Doc(R"doc(
 Dequeues a tuple of one or more tensors from the given queue.
 
-- 
GitLab


From f0faf5139819e2c6d7b0437d9e03ffce71c7d6e5 Mon Sep 17 00:00:00 2001
From: Michael Hofmann <kmhofmann@users.noreply.github.com>
Date: Tue, 2 May 2017 04:58:04 +0200
Subject: [PATCH 0906/1563] Fix PATH error with non-system GCC (#7543). (#9482)

---
 .../crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
index cab533b9e7..242439daf4 100755
--- a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
+++ b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
@@ -227,7 +227,7 @@ def InvokeNvcc(argv, log=False):
 
   # TODO(zhengxq): for some reason, 'gcc' needs this help to find 'as'.
   # Need to investigate and fix.
-  cmd = 'PATH=' + PREFIX_DIR + ' ' + cmd
+  cmd = 'PATH=' + PREFIX_DIR + ':$PATH ' + cmd
   if log: Log(cmd)
   return os.system(cmd)
 
-- 
GitLab


From a6e6a2b71af3308ec925215709cf47cd7cf23ba3 Mon Sep 17 00:00:00 2001
From: Jun Kim <tae-jun@users.noreply.github.com>
Date: Tue, 2 May 2017 12:00:32 +0900
Subject: [PATCH 0907/1563] Remove comments about an unused argument (#9584)

Remove comments about an unused argument in `tf.train.suffle_batch` and `tf.train.batch`.
---
 tensorflow/python/training/input.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tensorflow/python/training/input.py b/tensorflow/python/training/input.py
index 83f1ac4abd..e9fe9215ae 100644
--- a/tensorflow/python/training/input.py
+++ b/tensorflow/python/training/input.py
@@ -879,9 +879,6 @@ def batch(tensors, batch_size, num_threads=1, capacity=32,
   `get_shape` method will have a first `Dimension` value of `None`, and
   operations that depend on fixed batch_size would fail.
 
-  Note: if `num_epochs` is not `None`, this function creates local counter
-  `epochs`. Use `local_variables_initializer()` to initialize local variables.
-
   Args:
     tensors: The list or dictionary of tensors to enqueue.
     batch_size: The new batch size pulled from the queue.
@@ -1181,9 +1178,6 @@ def shuffle_batch(tensors, batch_size, capacity, min_after_dequeue,
   `get_shape` method will have a first `Dimension` value of `None`, and
   operations that depend on fixed batch_size would fail.
 
-  Note: if `num_epochs` is not `None`, this function creates local counter
-  `epochs`. Use `local_variables_initializer()` to initialize local variables.
-
   Args:
     tensors: The list or dictionary of tensors to enqueue.
     batch_size: The new batch size pulled from the queue.
-- 
GitLab


From 9e289ce04020f01f4d8c537f2c399fddae4be019 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Mon, 1 May 2017 19:29:12 -0800
Subject: [PATCH 0908/1563] Add whitelist support in uid of RunConfig. Change:
 154794859

---
 .../python/learn/estimators/run_config.py     | 26 ++++++++++-
 .../learn/estimators/run_config_test.py       | 45 +++++++++++++++++++
 .../learn/python/learn/learn_runner_test.py   |  3 +-
 3 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 109c8d25e1..5a63ee7fa8 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -31,6 +31,17 @@ from tensorflow.python.estimator import run_config as core_run_config
 from tensorflow.python.training import server_lib
 
 
+_DEFAULT_UID_WHITE_LIST = [
+    'tf_random_seed',
+    'save_summary_steps',
+    'save_checkpoints_steps',
+    'save_checkpoints_secs',
+    'session_config',
+    'keep_checkpoint_max',
+    'keep_checkpoint_every_n_hours',
+]
+
+
 class Environment(object):
   # For running general distributed training.
   CLOUD = 'cloud'
@@ -312,18 +323,29 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     return new_copy
 
   @experimental
-  def uid(self):
+  def uid(self, whitelist=None):
     """Generates a 'Unique Identifier' based on all internal fields.
 
     Caller should use the uid string to check `RunConfig` instance integrity
     in one session use, but should not rely on the implementation details, which
     is subject to change.
 
+    Args:
+      whitelist: A list of the string names of the properties uid should not
+        include. If `None`, defaults to `_DEFAULT_UID_WHITE_LIST`, which
+        includes most properites user allowes to change.
+
     Returns:
       A uid string.
     """
-    # TODO(b/33295821): Allows user to specify a whitelist.
+    if whitelist is None:
+      whitelist = _DEFAULT_UID_WHITE_LIST
+
     state = {k: v for k, v in self.__dict__.items() if not k.startswith('__')}
+    # Pop out the keys in whitelist.
+    for k in whitelist:
+      state.pop('_' + k, None)
+
     ordered_state = collections.OrderedDict(
         sorted(state.items(), key=lambda t: t[0]))
     # For class instance without __repr__, some special cares are required.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index 14cef7cc43..6d39a9ad13 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -257,6 +257,51 @@ class RunConfigTest(test.TestCase):
     self.assertNotEqual(expected_uid, new_config.uid())
     self.assertEqual(ANOTHER_TEST_DIR, new_config.model_dir)
 
+  def test_uid_for_whitelist(self):
+    whitelist = ["model_dir"]
+    config = run_config_lib.RunConfig(
+        tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
+
+    expected_uid = config.uid(whitelist)
+    self.assertEqual(expected_uid, config.uid(whitelist))
+
+    new_config = config.replace(model_dir=ANOTHER_TEST_DIR)
+    self.assertEqual(TEST_DIR, config.model_dir)
+    self.assertEqual(expected_uid, new_config.uid(whitelist))
+    self.assertEqual(ANOTHER_TEST_DIR, new_config.model_dir)
+
+  def test_uid_for_default_whitelist(self):
+    config = run_config_lib.RunConfig(
+        tf_random_seed=11,
+        save_summary_steps=12,
+        save_checkpoints_steps=13,
+        save_checkpoints_secs=14,
+        session_config=15,
+        keep_checkpoint_max=16,
+        keep_checkpoint_every_n_hours=17)
+    self.assertEqual(11, config.tf_random_seed)
+    self.assertEqual(12, config.save_summary_steps)
+    self.assertEqual(13, config.save_checkpoints_steps)
+    self.assertEqual(14, config.save_checkpoints_secs)
+    self.assertEqual(15, config.session_config)
+    self.assertEqual(16, config.keep_checkpoint_max)
+    self.assertEqual(17, config.keep_checkpoint_every_n_hours)
+
+    new_config = run_config_lib.RunConfig(
+        tf_random_seed=21,
+        save_summary_steps=22,
+        save_checkpoints_steps=23,
+        save_checkpoints_secs=24,
+        session_config=25,
+        keep_checkpoint_max=26,
+        keep_checkpoint_every_n_hours=27)
+    self.assertEqual(config.uid(), new_config.uid())
+    # model_dir is not on the default whitelist.
+    self.assertNotEqual(config.uid(whitelist=[]),
+                        new_config.uid(whitelist=[]))
+    new_config = new_config.replace(model_dir=ANOTHER_TEST_DIR)
+    self.assertNotEqual(config.uid(), new_config.uid())
+
   def test_uid_for_deepcopy(self):
     tf_config = {
         "cluster": {
diff --git a/tensorflow/contrib/learn/python/learn/learn_runner_test.py b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
index 6c8cde453f..77bdcaeb7e 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
@@ -293,8 +293,7 @@ class LearnRunnerRunWithRunConfigTest(test.TestCase):
     def _experiment_fn(run_config, hparams):
       del run_config, hparams  # unused.
       # Explicitly use a new run_config.
-      new_config = run_config_lib.RunConfig(
-          model_dir=_MODIR_DIR, save_checkpoints_steps=123)
+      new_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR + "/123")
 
       return TestExperiment(config=new_config)
 
-- 
GitLab


From a6fb4cc4338e4e947e9bff8fcbffaf072d14aa3e Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Mon, 1 May 2017 21:51:04 -0700
Subject: [PATCH 0909/1563] Allow the output of `tf.argmax` as index type
 (#9000)

This fix tries to fix the issue raised in #8951 where
the following will raise a `TypeError`:
```
a = tf.constant([1, 2, 3], dtype=tf.float32)
b = tf.argmax(a)
tf.Session().run(a[b])

TypeError: Input 'strides' of 'StridedSlice' Op has type int32 that does not match type int64 of argument 'begin'.
```
The reason for the erorr is that, `strides` is added as `append(1)`
without type while `begin` is appended with type.

The mismatch of `strides` and `begin` causes the error.

This fix fixes the issue by cast the stride with the same type
as `begin` when needed.

This issue was raised in #8951. It was also raised earlier in
https://github.com/tensorflow/tensorflow/issues/206#issuecomment-259076860

This fix fixes #8951.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
---
 tensorflow/python/ops/array_ops.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 77db63dd0f..5ac630c321 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -470,7 +470,10 @@ def _SliceHelper(tensor, slice_spec, var=None):
     else:
       begin.append(s)
       end.append(s + 1)
-      strides.append(1)
+      if isinstance(s, ops.Tensor):
+        strides.append(constant(1, s.dtype))
+      else:
+        strides.append(np.ones_like(s).dtype.type(1))
       shrink_axis_mask |= (1 << index)
     index += 1
 
-- 
GitLab


From e184562ea5234e84592ee78f964522ffe1c2cbd6 Mon Sep 17 00:00:00 2001
From: Alexandr Baranezky <admin@asterai.com>
Date: Tue, 2 May 2017 07:59:03 +0300
Subject: [PATCH 0910/1563] Added output information with path to  wrong JPEG
 file (#9555)

* Added output information about wrong JPEG file

* Identation

* Switch from logging.fatal to raising runtime exception
---
 tensorflow/examples/image_retraining/retrain.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tensorflow/examples/image_retraining/retrain.py b/tensorflow/examples/image_retraining/retrain.py
index 5f4b6bed48..44b29a57be 100644
--- a/tensorflow/examples/image_retraining/retrain.py
+++ b/tensorflow/examples/image_retraining/retrain.py
@@ -369,9 +369,13 @@ def create_bottleneck_file(bottleneck_path, image_lists, label_name, index,
   if not gfile.Exists(image_path):
     tf.logging.fatal('File does not exist %s', image_path)
   image_data = gfile.FastGFile(image_path, 'rb').read()
-  bottleneck_values = run_bottleneck_on_image(sess, image_data,
-                                              jpeg_data_tensor,
-                                              bottleneck_tensor)
+  try:
+    bottleneck_values = run_bottleneck_on_image(sess, image_data,
+                                                jpeg_data_tensor,
+                                                bottleneck_tensor)
+  except:
+    raise RuntimeError('Error during processing file %s' % image_path)
+
   bottleneck_string = ','.join(str(x) for x in bottleneck_values)
   with open(bottleneck_path, 'w') as bottleneck_file:
     bottleneck_file.write(bottleneck_string)
-- 
GitLab


From 53a60aedd3932e7d2986434ab6e2c9cf1ef7d50d Mon Sep 17 00:00:00 2001
From: Julian Villella <julian.villella@hotmail.com>
Date: Tue, 2 May 2017 00:20:03 -0500
Subject: [PATCH 0911/1563] Replace sed_hyphen_i() with portable implementation
 (#8935)

---
 configure | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 8124888f6a..1844799225 100755
--- a/configure
+++ b/configure
@@ -35,12 +35,9 @@ function is_windows() {
   fi
 }
 
-function sed_hyphen_i() {
-  if is_macos; then
-    sed -i '' "$@"
-  else
-    sed -i "$@"
-  fi
+function sed_in_place() {
+  sed -e $1 $2 > "$2.bak"
+  mv "$2.bak" $2
 }
 
 function write_to_bazelrc() {
@@ -170,7 +167,7 @@ function setup_python {
 rm -f .tf_configure.bazelrc
 touch .tf_configure.bazelrc
 touch .bazelrc
-sed_hyphen_i "/tf_configure/d" .bazelrc
+sed_in_place "/tf_configure/d" .bazelrc
 echo "import %workspace%/.tf_configure.bazelrc" >> .bazelrc
 
 # Delete any leftover BUILD files from the Makefile build, which would interfere
-- 
GitLab


From 883e32600ef242cb44d0702bb96f71f3140b5403 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Tue, 2 May 2017 04:08:23 -0800
Subject: [PATCH 0912/1563] Fix a bunch of bad links and missing docs in
 contrib. Change: 154820641

---
 tensorflow/contrib/distributions/__init__.py  | 133 +++++++++---------
 tensorflow/contrib/losses/__init__.py         |  24 +++-
 .../contrib/losses/python/losses/__init__.py  | 120 +---------------
 tensorflow/contrib/seq2seq/__init__.py        |  56 ++++----
 .../seq2seq/python/ops/attention_wrapper.py   |   1 +
 .../api_guides/python/contrib.graph_editor.md |  20 +--
 .../api_guides/python/contrib.linalg.md       |   2 +-
 .../api_guides/python/contrib.losses.md       |  15 +-
 tensorflow/docs_src/get_started/tflearn.md    |   2 +-
 tensorflow/tools/docs/generate_lib.py         |   1 -
 10 files changed, 132 insertions(+), 242 deletions(-)

diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 15e33c2c6f..cafa477f44 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -15,74 +15,6 @@
 """Classes representing statistical distributions and ops for working with them.
 
 See the @{$python/contrib.distributions} guide.
-
-## Distribution Object
-@@ReparameterizationType
-@@Distribution
-
-## Individual Distributions
-@@Binomial
-@@Bernoulli
-@@BernoulliWithSigmoidProbs
-@@Beta
-@@BetaWithSoftplusConcentration
-@@Categorical
-@@Chi2
-@@Chi2WithAbsDf
-@@Deterministic
-@@VectorDeterministic
-@@Exponential
-@@ExponentialWithSoftplusRate
-@@Gamma
-@@GammaWithSoftplusConcentrationRate
-@@Geometric
-@@InverseGamma
-@@InverseGammaWithSoftplusConcentrationRate
-@@Laplace
-@@LaplaceWithSoftplusScale
-@@Logistic
-@@NegativeBinomial
-@@Normal
-@@NormalWithSoftplusScale
-@@Poisson
-@@StudentT
-@@StudentTWithAbsDfSoftplusScale
-@@Uniform
-
-@@MultivariateNormalDiag
-@@MultivariateNormalTriL
-@@MultivariateNormalDiagPlusLowRank
-@@MultivariateNormalDiagWithSoftplusScale
-
-@@Dirichlet
-@@DirichletMultinomial
-@@Multinomial
-@@WishartCholesky
-@@WishartFull
-
-@@TransformedDistribution
-@@QuantizedDistribution
-
-@@Mixture
-
-@@ExpRelaxedOneHotCategorical
-@@OneHotCategorical
-@@RelaxedBernoulli
-@@RelaxedOneHotCategorical
-
-## Kullback-Leibler Divergence
-@@kl_divergence
-@@RegisterKL
-
-## Helper Functions
-@@matrix_diag_transform
-@@normal_conjugates_known_scale_posterior
-@@normal_conjugates_known_scale_predictive
-@@softplus_inverse
-
-## Functions for statistics of samples
-@@percentile
-
 """
 from __future__ import absolute_import
 from __future__ import division
@@ -140,6 +72,71 @@ _allowed_symbols = [
     'ConditionalTransformedDistribution',
     'FULLY_REPARAMETERIZED',
     'NOT_REPARAMETERIZED',
+    'Affine',
+    'AffineLinearOperator',
+    'Bijector',
+    'Chain',
+    'CholeskyOuterProduct',
+    'Exp',
+    'Identity',
+    'Inline',
+    'Invert',
+    'PowerTransform',
+    'SigmoidCentered',
+    'SoftmaxCentered',
+    'Softplus',
+    'ReparameterizationType',
+    'Distribution',
+    'Binomial',
+    'Bernoulli',
+    'BernoulliWithSigmoidProbs',
+    'Beta',
+    'BetaWithSoftplusConcentration',
+    'Categorical',
+    'Chi2',
+    'Chi2WithAbsDf',
+    'Deterministic',
+    'VectorDeterministic',
+    'Exponential',
+    'ExponentialWithSoftplusRate',
+    'Gamma',
+    'GammaWithSoftplusConcentrationRate',
+    'Geometric',
+    'InverseGamma',
+    'InverseGammaWithSoftplusConcentrationRate',
+    'Laplace',
+    'LaplaceWithSoftplusScale',
+    'Logistic',
+    'NegativeBinomial',
+    'Normal',
+    'NormalWithSoftplusScale',
+    'Poisson',
+    'StudentT',
+    'StudentTWithAbsDfSoftplusScale',
+    'Uniform',
+    'MultivariateNormalDiag',
+    'MultivariateNormalTriL',
+    'MultivariateNormalDiagPlusLowRank',
+    'MultivariateNormalDiagWithSoftplusScale',
+    'Dirichlet',
+    'DirichletMultinomial',
+    'Multinomial',
+    'WishartCholesky',
+    'WishartFull',
+    'TransformedDistribution',
+    'QuantizedDistribution',
+    'Mixture',
+    'ExpRelaxedOneHotCategorical',
+    'OneHotCategorical',
+    'RelaxedBernoulli',
+    'RelaxedOneHotCategorical',
+    'kl_divergence',
+    'RegisterKL',
+    'matrix_diag_transform',
+    'normal_conjugates_known_scale_posterior',
+    'normal_conjugates_known_scale_predictive',
+    'softplus_inverse',
+    'percentile'
 ]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/losses/__init__.py b/tensorflow/contrib/losses/__init__.py
index 9861ecc1f8..790bf61367 100644
--- a/tensorflow/contrib/losses/__init__.py
+++ b/tensorflow/contrib/losses/__init__.py
@@ -22,10 +22,26 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-# pylint: disable=unused-import,wildcard-import
-from tensorflow.contrib.losses.python import losses
+# pylint: disable=wildcard-import
 from tensorflow.contrib.losses.python.losses import *
-# pylint: enable=unused-import,wildcard-import
+# pylint: enable=wildcard-import
 
 from tensorflow.python.util.all_util import remove_undocumented
-remove_undocumented(__name__, doc_string_modules=[losses])
+
+_allowed_symbols = [
+    'absolute_difference',
+    'add_loss',
+    'hinge_loss',
+    'compute_weighted_loss',
+    'cosine_distance',
+    'get_losses',
+    'get_regularization_losses',
+    'get_total_loss',
+    'log_loss',
+    'mean_pairwise_squared_error',
+    'mean_squared_error',
+    'sigmoid_cross_entropy',
+    'softmax_cross_entropy',
+    'sparse_softmax_cross_entropy',
+]
+remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/losses/python/losses/__init__.py b/tensorflow/contrib/losses/python/losses/__init__.py
index 1b57f0baee..6e9d1d4a77 100644
--- a/tensorflow/contrib/losses/python/losses/__init__.py
+++ b/tensorflow/contrib/losses/python/losses/__init__.py
@@ -12,127 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""## Loss operations for use in neural networks.
+"""Ops for building neural network losses.
 
-Note: By default all the losses are collected into the `GraphKeys.LOSSES`
-collection.
-
-All of the loss functions take a pair of predictions and ground truth labels,
-from which the loss is computed. It is assumed that the shape of both these
-tensors is of the form [batch_size, d1, ... dN] where `batch_size` is the number
-of samples in the batch and `d1` ... `dN` are the remaining dimensions.
-
-It is common, when training with multiple loss functions, to adjust the relative
-strengths of individual losses. This is performed by rescaling the losses via
-a `weight` parameter passed to the loss functions. For example, if we were
-training with both log_loss and sum_of_squares_loss, and we wished that the
-log_loss penalty be twice as severe as the sum_of_squares_loss, we would
-implement this as:
-
-  # Explicitely set the weight.
-  tf.contrib.losses.log(predictions, labels, weight=2.0)
-
-  # Uses default weight of 1.0
-  tf.contrib.losses.sum_of_squares(predictions, labels)
-
-  # All the losses are collected into the `GraphKeys.LOSSES` collection.
-  losses = tf.get_collection(tf.GraphKeys.LOSSES)
-
-While specifying a scalar loss rescales the loss over the entire batch,
-we sometimes want to rescale the loss per batch sample. For example, if we have
-certain examples that matter more to us to get correctly, we might want to have
-a higher loss that other samples whose mistakes matter less. In this case, we
-can provide a weight vector of length `batch_size` which results in the loss
-for each sample in the batch being scaled by the corresponding weight element.
-For example, consider the case of a classification problem where we want to
-maximize our accuracy but we especially interested in obtaining high accuracy
-for a specific class:
-
-  inputs, labels = LoadData(batch_size=3)
-  logits = MyModelPredictions(inputs)
-
-  # Ensures that the loss for examples whose ground truth class is `3` is 5x
-  # higher than the loss for all other examples.
-  weight = tf.multiply(4, tf.cast(tf.equal(labels, 3), tf.float32)) + 1
-
-  onehot_labels = tf.one_hot(labels, num_classes=5)
-  tf.contrib.losses.softmax_cross_entropy(logits, onehot_labels, weight=weight)
-
-Finally, in certain cases, we may want to specify a different loss for every
-single measurable value. For example, if we are performing per-pixel depth
-prediction, or per-pixel denoising, a single batch sample has P values where P
-is the number of pixels in the image. For many losses, the number of measurable
-values matches the number of elements in the predictions and labels tensors.
-For others, such as softmax_cross_entropy and cosine_distance, the
-loss functions reduces the dimensions of the inputs to produces a tensor of
-losses for each measurable value. For example, softmax_cross_entropy takes as
-input predictions and labels of dimension [batch_size, num_classes] but the
-number of measurable values is [batch_size]. Consequently, when passing a weight
-tensor to specify a different loss for every measurable value, the dimension of
-the tensor will depend on the loss being used.
-
-For a concrete example, consider the case of per-pixel depth prediction where
-certain ground truth depth values are missing (due to sensor noise in the
-capture process). In this case, we want to assign zero weight to losses for
-these predictions.
-
-  # 'depths' that are missing have a value of 0:
-  images, depths = LoadData(...)
-  predictions = MyModelPredictions(images)
-
-  weight = tf.cast(tf.greater(depths, 0), tf.float32)
-  loss  = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
-
-Note that when using weights for the losses, the final average is computed
-by rescaling the losses by the weights and then dividing by the total number of
-non-zero samples. For an arbitrary set of weights, this may not necessarily
-produce a weighted average. Instead, it simply and transparently rescales the
-per-element losses before averaging over the number of observations. For example
-if the losses computed by the loss function is an array [4, 1, 2, 3] and the
-weights are an array [1, 0.5, 3, 9], then the average loss is:
-
-  (4*1 + 1*0.5 + 2*3 + 3*9) / 4
-
-However, with a single loss function and an arbitrary set of weights, one can
-still easily create a loss function such that the resulting loss is a
-weighted average over the individual prediction errors:
-
-  images, labels = LoadData(...)
-  predictions = MyModelPredictions(images)
-
-  weight = MyComplicatedWeightingFunction(labels)
-  weight = tf.div(weight, tf.size(weight))
-  loss = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
-
-@@absolute_difference
-@@add_loss
-@@hinge_loss
-@@compute_weighted_loss
-@@cosine_distance
-@@get_losses
-@@get_regularization_losses
-@@get_total_loss
-@@log_loss
-@@mean_pairwise_squared_error
-@@mean_squared_error
-@@sigmoid_cross_entropy
-@@softmax_cross_entropy
-@@sparse_softmax_cross_entropy
-
-The following are deprecated in favor of `mean_pairwise_squared_error` and
-`mean_squared_error`.
-@@sum_of_pairwise_squares
-@@sum_of_squares
+See @{$python/contrib.losses}.
 """
 
-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-# pylint: disable=unused-import,wildcard-import
+# pylint: disable=wildcard-import
 from tensorflow.contrib.losses.python.losses.loss_ops import *
-from tensorflow.python.util.all_util import make_all
-# pylint: enable=unused-import,wildcard-import
-
-__all__ = make_all(__name__)
+# pylint: enable=wildcard-import
diff --git a/tensorflow/contrib/seq2seq/__init__.py b/tensorflow/contrib/seq2seq/__init__.py
index dd497197e3..dc159b93a3 100644
--- a/tensorflow/contrib/seq2seq/__init__.py
+++ b/tensorflow/contrib/seq2seq/__init__.py
@@ -16,36 +16,6 @@
 """Ops for building neural network seq2seq decoders and losses.
 
 See the @{$python/contrib.seq2seq} guide.
-
-@@Decoder
-@@dynamic_decode
-
-@@BasicDecoderOutput
-@@BasicDecoder
-
-@@BeamSearchDecoderOutput
-@@BeamSearchDecoderState
-@@BeamSearchDecoder
-@@FinalBeamSearchDecoderOutput
-
-@@Helper
-@@CustomHelper
-@@GreedyEmbeddingHelper
-@@ScheduledEmbeddingTrainingHelper
-@@ScheduledOutputTrainingHelper
-@@TrainingHelper
-
-@@BahdanauAttention
-@@LuongAttention
-
-@@hardmax
-
-@@AttentionWrapperState
-@@AttentionWrapper
-
-@@gather_tree
-
-@@tile_batch
 """
 
 from __future__ import absolute_import
@@ -63,6 +33,30 @@ from tensorflow.contrib.seq2seq.python.ops.loss import *
 from tensorflow.python.util.all_util import remove_undocumented
 # pylint: enable=unused-import,widcard-import,line-too-long
 
-_allowed_symbols = ["sequence_loss"]
+_allowed_symbols = [
+    "sequence_loss",
+    "Decoder",
+    "dynamic_decode",
+    "BasicDecoder",
+    "BasicDecoderOutput",
+    "BeamSearchDecoder",
+    "BeamSearchDecoderOutput",
+    "BeamSearchDecoderState",
+    "Helper",
+    "CustomHelper",
+    "FinalBeamSearchDecoderOutput",
+    "gather_tree",
+    "GreedyEmbeddingHelper",
+    "ScheduledEmbeddingTrainingHelper",
+    "ScheduledOutputTrainingHelper",
+    "TrainingHelper",
+    "BahdanauAttention",
+    "LuongAttention",
+    "hardmax",
+    "AttentionWrapperState",
+    "AttentionWrapper",
+    "AttentionMechanism",
+    "tile_batch"]
+
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 9fc548aabe..d3fc8d1d0d 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -39,6 +39,7 @@ from tensorflow.python.util import nest
 
 
 __all__ = [
+    "AttentionMechanism",
     "AttentionWrapper",
     "AttentionWrapperState",
     "LuongAttention",
diff --git a/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md b/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md
index f611624079..de4f126507 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md
@@ -137,16 +137,16 @@ which to operate must always be given explicitly. This is the reason why
 
 ## Module: reroute
 
-*   @{tf.contrib.graph_editor.reroute.swap_ts}
-*   @{tf.contrib.graph_editor.reroute.reroute_ts}
-*   @{tf.contrib.graph_editor.reroute.swap_inputs}
-*   @{tf.contrib.graph_editor.reroute.reroute_inputs}
-*   @{tf.contrib.graph_editor.reroute.swap_outputs}
-*   @{tf.contrib.graph_editor.reroute.reroute_outputs}
-*   @{tf.contrib.graph_editor.reroute.swap_ios}
-*   @{tf.contrib.graph_editor.reroute.reroute_ios}
-*   @{tf.contrib.graph_editor.reroute.remove_control_inputs}
-*   @{tf.contrib.graph_editor.reroute.add_control_inputs}
+*   @{tf.contrib.graph_editor.swap_ts}
+*   @{tf.contrib.graph_editor.reroute_ts}
+*   @{tf.contrib.graph_editor.swap_inputs}
+*   @{tf.contrib.graph_editor.reroute_inputs}
+*   @{tf.contrib.graph_editor.swap_outputs}
+*   @{tf.contrib.graph_editor.reroute_outputs}
+*   @{tf.contrib.graph_editor.swap_ios}
+*   @{tf.contrib.graph_editor.reroute_ios}
+*   @{tf.contrib.graph_editor.remove_control_inputs}
+*   @{tf.contrib.graph_editor.add_control_inputs}
 
 ## Module: edit
 
diff --git a/tensorflow/docs_src/api_guides/python/contrib.linalg.md b/tensorflow/docs_src/api_guides/python/contrib.linalg.md
index efc2d76ef1..b2c7fcf6bb 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.linalg.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.linalg.md
@@ -21,7 +21,7 @@ Subclasses of `LinearOperator` provide a access to common methods on a
 *   @{tf.contrib.linalg.LinearOperatorDiag}
 *   @{tf.contrib.linalg.LinearOperatorIdentity}
 *   @{tf.contrib.linalg.LinearOperatorScaledIdentity}
-*   @{tf.contrib.linalg.LinearOperatorMatrix}
+*   @{tf.contrib.linalg.LinearOperatorFullMatrix}
 *   @{tf.contrib.linalg.LinearOperatorTriL}
 *   @{tf.contrib.linalg.LinearOperatorUDVHUpdate}
 
diff --git a/tensorflow/docs_src/api_guides/python/contrib.losses.md b/tensorflow/docs_src/api_guides/python/contrib.losses.md
index cb93f9d549..8c289dd556 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.losses.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.losses.md
@@ -13,8 +13,8 @@ of samples in the batch and `d1` ... `dN` are the remaining dimensions.
 It is common, when training with multiple loss functions, to adjust the relative
 strengths of individual losses. This is performed by rescaling the losses via
 a `weight` parameter passed to the loss functions. For example, if we were
-training with both log_loss and sum_of_squares_loss, and we wished that the
-log_loss penalty be twice as severe as the sum_of_squares_loss, we would
+training with both log_loss and mean_square_error, and we wished that the
+log_loss penalty be twice as severe as the mean_square_error, we would
 implement this as:
 
 ```python
@@ -22,7 +22,7 @@ implement this as:
   tf.contrib.losses.log(predictions, labels, weight=2.0)
 
   # Uses default weight of 1.0
-  tf.contrib.losses.sum_of_squares(predictions, labels)
+  tf.contrib.losses.mean_square_error(predictions, labels)
 
   # All the losses are collected into the `GraphKeys.LOSSES` collection.
   losses = tf.get_collection(tf.GraphKeys.LOSSES)
@@ -74,7 +74,7 @@ these predictions.
   predictions = MyModelPredictions(images)
 
   weight = tf.cast(tf.greater(depths, 0), tf.float32)
-  loss  = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
+  loss  = tf.contrib.losses.mean_square_error(predictions, depths, weight)
 ```
 
 Note that when using weights for the losses, the final average is computed
@@ -100,7 +100,7 @@ weighted average over the individual prediction errors:
 
   weight = MyComplicatedWeightingFunction(labels)
   weight = tf.div(weight, tf.size(weight))
-  loss = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
+  loss = tf.contrib.losses.mean_square_error(predictions, depths, weight)
 ```
 
 @{tf.contrib.losses.absolute_difference}
@@ -118,9 +118,4 @@ weighted average over the individual prediction errors:
 @{tf.contrib.losses.softmax_cross_entropy}
 @{tf.contrib.losses.sparse_softmax_cross_entropy}
 
-The following are deprecated in favor of `mean_pairwise_squared_error` and
-`mean_squared_error`.
-@{tf.contrib.losses.sum_of_pairwise_squares}
-@{tf.contrib.losses.sum_of_squares}
-
 
diff --git a/tensorflow/docs_src/get_started/tflearn.md b/tensorflow/docs_src/get_started/tflearn.md
index 079349be32..ed21969b3e 100644
--- a/tensorflow/docs_src/get_started/tflearn.md
+++ b/tensorflow/docs_src/get_started/tflearn.md
@@ -278,7 +278,7 @@ Then, the code creates a `DNNClassifier` model using the following arguments:
 
 The `tf.contrib.learn` API uses input functions, which create the TensorFlow
 operations that generate data for the model. In this case, the data is small
-enough that it can be stored in @{tf.constant TensorFlow constants}. The
+enough that it can be stored in @{tf.constant$TensorFlow constants}. The
 following code produces the simplest possible input pipeline:
 
 ```python
diff --git a/tensorflow/tools/docs/generate_lib.py b/tensorflow/tools/docs/generate_lib.py
index 1518cd53a3..d974f0f1af 100644
--- a/tensorflow/tools/docs/generate_lib.py
+++ b/tensorflow/tools/docs/generate_lib.py
@@ -190,7 +190,6 @@ def _get_default_do_not_descend_map():
           'tensor_forest',
           'tensorboard',
           'testing',
-          'training',
           'tfprof',
       ],
       'contrib.bayesflow': [
-- 
GitLab


From e8eafd94de1fc90a5f4724570f5882b01e1626dc Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 2 May 2017 08:06:50 -0800
Subject: [PATCH 0913/1563] Don't try to refine the shapes for a node if its
 inference context wasn't successfully built by the AddNode() method. Change:
 154838211

---
 tensorflow/core/common_runtime/shape_refiner.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index daa9e5091a..828297a1ab 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -88,7 +88,7 @@ Status ShapeRefiner::AddNode(const Node* node) {
   }
 
   // This needs to be filled in with real data in a second pass.
-  std::vector<const Tensor*> input_tensors(node->num_inputs());
+  std::vector<const Tensor*> input_tensors(node->num_inputs(), nullptr);
   std::vector<ShapeHandle> input_tensors_as_shapes;
 
   // Create the inference context for this node with the existing input shapes.
@@ -145,6 +145,9 @@ Status ShapeRefiner::UpdateNode(const Node* node, bool* refined) {
   }
   InferenceContext* node_context = it->second.get();
 
+  // Give up if the context wasn't successfully built by the AddNode() method.
+  TF_RETURN_IF_ERROR(node_context->construction_status());
+
   // Check if the shapes of the nodes in the fan-in of this node have changed,
   // and if they have update the node input shapes.
   for (const Edge* e : node->in_edges()) {
@@ -458,7 +461,7 @@ Status ShapeRefiner::RunShapeFn(const Node* node,
                                 const OpRegistrationData* op_reg_data,
                                 shape_inference::InferenceContext* c) {
   // This will be filled in with real data in a second pass.
-  std::vector<const Tensor*> input_tensors(node->num_inputs());
+  std::vector<const Tensor*> input_tensors(node->num_inputs(), nullptr);
   std::vector<Tensor> real_tensors(node->num_inputs());
   std::vector<bool> attempted_materialization(node->num_inputs());
   std::vector<bool> attempted_tensor_as_shape_conversion(node->num_inputs());
-- 
GitLab


From aaa5600245ea328057a91752dfeaed0770136676 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 08:25:23 -0800
Subject: [PATCH 0914/1563] Fix issue related to empty bazel.rc file. Change:
 154840138

---
 .gitignore     |  1 -
 configure      |  3 +--
 tools/bazel.rc | 30 ++++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 tools/bazel.rc

diff --git a/.gitignore b/.gitignore
index 900e5a53cb..d8ecef1e1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ node_modules
 /.tf_configure.bazelrc
 /bazel-*
 /third_party/py/numpy/numpy_include
-/tools/bazel.rc
 /tools/python_bin_path.sh
 /tools/git/gen
 /util/python/python_include
diff --git a/configure b/configure
index 75d3e160f5..dce59586ab 100755
--- a/configure
+++ b/configure
@@ -356,9 +356,8 @@ if [[ "$TF_NEED_VERBS" == "1" ]]; then
 fi
 
 # Append CC optimization flags to bazel.rc
-echo >> tools/bazel.rc
 for opt in $CC_OPT_FLAGS; do
-  echo "build:opt --cxxopt=$opt --copt=$opt" >> tools/bazel.rc
+  write_to_bazelrc 'build:opt --cxxopt=$opt --copt=$opt'
 done
 
 # Run the gen_git_source to create links where bazel can track dependencies for
diff --git a/tools/bazel.rc b/tools/bazel.rc
new file mode 100644
index 0000000000..e67a290cf4
--- /dev/null
+++ b/tools/bazel.rc
@@ -0,0 +1,30 @@
+build:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain
+build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true
+
+build:cuda_clang --crosstool_top=@local_config_cuda//crosstool:toolchain
+build:cuda_clang --define=using_cuda=true --define=using_cuda_clang=true
+
+build:win-cuda --define=using_cuda=true --define=using_cuda_nvcc=true
+
+build:mkl --define=using_mkl=true
+
+build:sycl --crosstool_top=@local_config_sycl//crosstool:toolchain
+build:sycl --define=using_sycl=true
+
+build:sycl_asan --crosstool_top=@local_config_sycl//crosstool:toolchain
+build:sycl_asan --define=using_sycl=true --copt -fno-omit-frame-pointer --copt -fsanitize-coverage=3 --copt -DGPR_NO_DIRECT_SYSCALLS --linkopt -fPIC --linkopt -fsanitize=address
+
+build --define=use_fast_cpp_protos=true
+build --define=allow_oversize_protos=true
+
+build --spawn_strategy=standalone
+test --spawn_strategy=standalone
+run --spawn_strategy=standalone
+
+build --genrule_strategy=standalone
+test --genrule_strategy=standalone
+run --genrule_strategy=standalone
+
+build -c opt
+test -c opt
+run -c opt
-- 
GitLab


From a6dcd5e0c8e3186ea821f83bb0b1d742c054821a Mon Sep 17 00:00:00 2001
From: Bairen Yi <byronyi@users.noreply.github.com>
Date: Wed, 3 May 2017 01:11:11 +0800
Subject: [PATCH 0915/1563] Fix several TODOs in gRPC runtime (#9531)

---
 .../rpc/grpc_tensor_coding.cc                 | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
index c6260afa20..0b0e8ec1de 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.h"
 #include "grpc++/support/byte_buffer.h"
 #include "grpc++/support/slice.h"
+#include "tensorflow/core/common_runtime/dma_helper.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_reference.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
@@ -27,10 +28,9 @@ namespace tensorflow {
 namespace grpc {
 
 static void do_nothing(void* raw) {}
-static void unref_tensorreference(void* raw) {
-  TensorReference* ref = static_cast<TensorReference*>(raw);
-  ref->Unref();
-  delete ref;
+static void unref_tensorbuffer(void* raw) {
+  TensorBuffer* buf = static_cast<TensorBuffer*>(raw);
+  buf->Unref();
 }
 
 void EncodeRecvTensorResponseToByteBuffer(const RecvTensorResponse& proto,
@@ -219,8 +219,8 @@ void EncodeTensorToByteBuffer(bool is_dead, const Tensor& val,
 
     if (tensor_data_is_large) {
       // Encode the actual tensor data by pointing to the backing store,
-      // and add a special zero-length slice that is really a TensorReference
-      // object that we will destroy when we are done.
+      // and add a special zero-length slice that is really a TensorBuffer
+      // reference that we will unref when we are done.
       //
       // TODO(jeff): Note that this approach relies on the fact that
       // slices are destroyed in the order in which they are added to
@@ -241,17 +241,15 @@ void EncodeTensorToByteBuffer(bool is_dead, const Tensor& val,
 
       // (E) Encode tensor data, but by sharing backing store
 
-      // TODO(jeff,sanjay): It'd be nice to avoid this TensorReference
-      // allocation, and instead get our hands on the underlying
-      // TensorBuffer object and just directly ref it here and unref
-      // it in unref_tensorreference.
-      TensorReference* ref = new TensorReference(val);
+      const TensorBuffer* buf = DMAHelper::buffer(&val);
+      buf->Ref();
       gpr_slice s1 = gpr_slice_new(
           const_cast<void*>(static_cast<const void*>(tdata.data())),
           tdata.size(), do_nothing);
       slices[1] = ::grpc::Slice(s1, ::grpc::Slice::STEAL_REF);
 
-      gpr_slice s2 = gpr_slice_new(ref, 0, unref_tensorreference);
+      gpr_slice s2 = gpr_slice_new(const_cast<TensorBuffer*>(buf),
+                                   0, unref_tensorbuffer);
       slices[2] = ::grpc::Slice(s2, ::grpc::Slice::STEAL_REF);
       num_slices += 2;
     }
-- 
GitLab


From 58e7b4fcd47795a42a6c012910a33239236e0979 Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <sjhshy@gmail.com>
Date: Wed, 3 May 2017 02:16:04 +0900
Subject: [PATCH 0916/1563] Added 10 comments that illustrate each tests in
 EventAccumulator. (#9592)

* Added 10 comments that illustrates each tests in EventAccumulator.

* Shorten to 80 cols

* More lint
---
 .../event_processing/event_accumulator_test.py       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
index 3734e470b6..f7d424cb91 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
@@ -225,6 +225,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertTagsEqual(x.Tags(), {})
 
   def testTags(self):
+    """Tags should be found in EventAccumulator after adding some events."""
     gen = _EventGenerator(self)
     gen.AddScalar('s1')
     gen.AddScalar('s2')
@@ -245,6 +246,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     })
 
   def testReload(self):
+    """EventAccumulator contains suitable tags after calling Reload."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     acc.Reload()
@@ -267,6 +269,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     })
 
   def testScalars(self):
+    """Tests whether EventAccumulator contains scalars after adding them."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     s1 = ea.ScalarEvent(wall_time=1, step=10, value=32)
@@ -293,6 +296,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
       self.assertEqual(expected_value, gotten_event.value[i])
 
   def testHealthPills(self):
+    """HealthPills should be properly inserted into EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     gen.AddHealthPill(13371337, 41, 'Add', 0, range(1, 13))
@@ -328,6 +332,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertItemsEqual(['Add', 'MatMul'], acc.GetOpsWithHealthPills())
 
   def testHistograms(self):
+    """Tests whether histograms are inserted into EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
 
@@ -377,6 +382,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.Histograms('hst2'), [hst2])
 
   def testCompressedHistograms(self):
+    """Tests compressed histograms inserted into EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen, compression_bps=(0, 2500, 5000, 7500, 10000))
 
@@ -428,6 +434,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.CompressedHistograms('hst2'), [expected_cmphst2])
 
   def testCompressedHistogramsWithEmptyHistogram(self):
+    """Tests that empty histograms compressed properly in EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen, compression_bps=(0, 2500, 5000, 7500, 10000))
 
@@ -481,6 +488,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertAlmostEqual(vals[8].value, 1.0)
 
   def testImages(self):
+    """Tests 2 images inserted/accessed in EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     im1 = ea.ImageEvent(
@@ -514,6 +522,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.Images('im2'), [im2])
 
   def testAudio(self):
+    """Tests 2 audio events inserted/accessed in EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     snd1 = ea.AudioEvent(
@@ -551,6 +560,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.Audio('snd2'), [snd2])
 
   def testKeyError(self):
+    """KeyError should be raised when accessing non-existing keys."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     acc.Reload()
@@ -574,7 +584,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
       acc.Audio('hst1')
 
   def testNonValueEvents(self):
-    """Tests that non-value events in the generator don't cause early exits."""
+    """Non-value events in the generator don't cause early exits."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     gen.AddScalar('s1', wall_time=1, step=10, value=20)
-- 
GitLab


From 1e684abf3d67a686486f33fdc4dfd8c4be14ba45 Mon Sep 17 00:00:00 2001
From: Junwei Pan <pandevirus@gmail.com>
Date: Tue, 2 May 2017 10:33:35 -0700
Subject: [PATCH 0917/1563] Update link (#9598)

---
 tensorflow/python/ops/logging_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/logging_ops.py b/tensorflow/python/ops/logging_ops.py
index 9c49ef7889..dbb13e0c8f 100644
--- a/tensorflow/python/ops/logging_ops.py
+++ b/tensorflow/python/ops/logging_ops.py
@@ -124,7 +124,7 @@ def image_summary(tag, tensor, max_images=3, collections=None, name=None):
   """Outputs a `Summary` protocol buffer with images.
 
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The summary has up to `max_images` summary values containing images. The
   images are built from `tensor` which must be 4-D with shape `[batch_size,
-- 
GitLab


From c0d7c1eb2f0b9bcde891dc825f9a76c948225d9f Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Tue, 2 May 2017 09:47:18 -0800
Subject: [PATCH 0918/1563] Remove overly precise CHECK when rendering debug
 output for a function.

An `_Arg` node can have more than three attrs, because the runtime may
(and does) add system-defined attrs (viz. "_output_shapes") that do
not change the meaning of the op.
Change: 154850526
---
 tensorflow/core/framework/function.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index c731155924..a387d49613 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -582,7 +582,7 @@ string Print(const GraphDef& gdef) {
   for (size_t i = 0; i < arg.size(); ++i) {
     const NodeDef* n = arg[i];
     if (i > 0) strings::StrAppend(&out, ", ");
-    CHECK_EQ(2, n->attr_size());
+    CHECK_GE(n->attr_size(), 2);
     strings::StrAppend(&out, n->name(), ":", get_type(*n));
   }
   strings::StrAppend(&out, ") -> (");
-- 
GitLab


From dedd3fc2ca18da4676c221600388d8a8d8642190 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 10:18:06 -0800
Subject: [PATCH 0919/1563] Port makefile build breakage Change: 154855106

---
 .../makefile/sub_makefiles/hexagon_graph_execution/Makefile.in   | 1 -
 tensorflow/contrib/makefile/tf_op_files.txt                      | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in b/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
index ccbbfa4132..2a6f66edcb 100644
--- a/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
+++ b/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
@@ -47,7 +47,6 @@ GRAPH_TRANSFER_SRCS := \
 tensorflow/cc/framework/scope.cc \
 tensorflow/cc/framework/ops.cc \
 tensorflow/cc/ops/const_op.cc \
-tensorflow/core/kernels/function_ops.cc \
 tensorflow/core/kernels/hexagon/graph_transfer_utils.cc \
 tensorflow/core/kernels/hexagon/graph_transferer.cc \
 tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc \
diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index a6d76548f4..e4cee308a3 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -103,6 +103,7 @@ tensorflow/core/kernels/identity_op.cc
 tensorflow/core/kernels/gather_op.cc
 tensorflow/core/kernels/gather_functor.cc
 tensorflow/core/kernels/fused_batch_norm_op.cc
+tensorflow/core/kernels/function_ops.cc
 tensorflow/core/kernels/fill_functor.cc
 tensorflow/core/kernels/fifo_queue.cc
 tensorflow/core/kernels/fake_quant_ops.cc
-- 
GitLab


From 5e727b8d2690c6740d52a161fabf169f87f3d786 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 10:23:53 -0800
Subject: [PATCH 0920/1563] [TF:XLA] Try to incorporate Tensorflow node
 structure for large HLO GraphDefs.

This change assumes that a TF subgraph/op does not cross the boundary of a HLO
computation and always put top-level TF subgraphs/ops under HLO computations.
Change: 154855884
---
 .../xla/service/hlo_tfgraph_builder.cc        | 14 ++++++++----
 .../xla/service/hlo_tfgraph_builder_test.cc   | 22 +++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
index fdc1c0ba2d..da07dea123 100644
--- a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
@@ -88,12 +88,18 @@ const string& HloTfGraphBuilder::GetNodeNameForInstruction(
   if (ContainsKey(instruction_to_node_name_, instruction)) {
     return instruction_to_node_name_[instruction];
   }
+  string node_name;
   // If an instruction is fused, put it in the subgraph of the fusion;
   // otherwise, put it in the computation subgraph.
-  string node_name =
-      instruction->IsFused()
-          ? GetNodeNameForInstruction(instruction->fusion_instruction())
-          : instruction->parent()->name();
+  if (instruction->IsFused()) {
+    node_name = GetNodeNameForInstruction(instruction->fusion_instruction());
+  } else {
+    node_name = instruction->parent()->name();
+    if (!instruction->metadata().op_name().empty()) {
+      // Always make computations contain TF ops but not the other way around.
+      StrAppend(&node_name, "/", instruction->metadata().op_name());
+    }
+  }
   string instruction_name = instruction->name();
   if (instruction->opcode() == HloOpcode::kParameter) {
     StrAppend(&instruction_name, ".", instruction->parameter_number());
diff --git a/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
index df66408022..6041debc4a 100644
--- a/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
@@ -137,6 +137,28 @@ TEST_F(HloTfGraphBuilderTest, GreaterThanOrEqualTo) {
   EXPECT_EQ(graph_def.node(2).op(), "HloGreaterThanOrEqualTo");
 }
 
+TEST_F(HloTfGraphBuilderTest, IncorparateTfOpsStructure) {
+  auto builder = HloComputation::Builder("GE");
+  auto param_1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r0f32_, "param0"));
+  auto param_2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, r0f32_, "param1"));
+  auto ge = builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32_, HloOpcode::kGe, param_1, param_2));
+  OpMetadata metadata;
+  metadata.set_op_name("x/y");
+  metadata.set_op_type("Y");
+  ge->set_metadata(metadata);
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 3);
+  EXPECT_EQ(graph_def.node(0).name(), "GE/param0.0");
+  EXPECT_EQ(graph_def.node(1).name(), "GE/param1.1");
+  EXPECT_EQ(graph_def.node(2).input_size(), 2);
+  EXPECT_EQ(graph_def.node(2).name(), "GE/x/y/greater-than-or-equal-to");
+  EXPECT_EQ(graph_def.node(2).op(), "HloGreaterThanOrEqualTo");
+}
+
 TEST_F(HloTfGraphBuilderTest, EmbeddedComputationsDiamond) {
   // Create computations with a diamond-shaped callgraph.
   auto negate_computation = CreateNegateComputation();
-- 
GitLab


From 8304066d0215521598e1592336a2cf9cb602457c Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 2 May 2017 10:28:57 -0800
Subject: [PATCH 0921/1563] Added a unit test to check what happens when 2
 shapes with known rank but unknown dimensions are merged Change: 154856675

---
 tensorflow/core/framework/shape_inference_test.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tensorflow/core/framework/shape_inference_test.cc b/tensorflow/core/framework/shape_inference_test.cc
index c82b506e4b..78d1fc0fc5 100644
--- a/tensorflow/core/framework/shape_inference_test.cc
+++ b/tensorflow/core/framework/shape_inference_test.cc
@@ -558,6 +558,11 @@ TEST_F(ShapeInferenceTest, MergeShape) {
   EXPECT_TRUE(SameHandle(c.Dim(s_1_u, 0), c.Dim(out, 0)));
   EXPECT_TRUE(SameHandle(c.Dim(s_u_2, 1), c.Dim(out, 1)));
 
+  auto s_u1 = c.UnknownShapeOfRank(1);
+  auto s_u2 = c.UnknownShapeOfRank(1);
+  TF_EXPECT_OK(c.Merge(s_u1, s_u2, &out));
+  EXPECT_TRUE(SameHandle(s_u1, out));
+
   // Incompatible merges give errors and set out to nullptr.
   out = s_unknown;
   EXPECT_TRUE(
-- 
GitLab


From 0774317eedf667d74110bb639eb4dfe46ee8cc5d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 10:31:38 -0800
Subject: [PATCH 0922/1563] [XLA] Refactor constant folding operations into a
 dedicated module

Refactor constant folding operations into a dedicated module, and added a new
ReplaceInstruction() API to collapse { computation->ReplaceInstruction();
changed=true}.
Change: 154857025
---
 tensorflow/compiler/xla/service/BUILD         |  21 ++
 .../xla/service/algebraic_simplifier.cc       | 186 ++-----------
 .../xla/service/algebraic_simplifier_test.cc  | 133 ---------
 .../xla/service/hlo_constant_folding.cc       | 254 +++++++++++++++---
 .../xla/service/hlo_constant_folding.h        |   6 +-
 .../xla/service/hlo_constant_folding_test.cc  | 169 ++++++++++++
 6 files changed, 422 insertions(+), 347 deletions(-)
 create mode 100644 tensorflow/compiler/xla/service/hlo_constant_folding_test.cc

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 05fc480936..a4e35135d7 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1418,6 +1418,27 @@ cc_library(
     ],
 )
 
+cc_test(
+    name = "hlo_constant_folding_test",
+    srcs = ["hlo_constant_folding_test.cc"],
+    deps = [
+        ":cpu_plugin",
+        ":hlo",
+        ":hlo_constant_folding",
+        ":hlo_matchers",
+        ":hlo_pass",
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
+        "//tensorflow/compiler/xla:types",
+        "//tensorflow/compiler/xla:util",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:test_main",
+    ],
+)
+
 cc_library(
     name = "device_memory_allocator",
     srcs = ["device_memory_allocator.cc"],
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 124a949bac..d6dce9745b 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -219,12 +219,6 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
                                    HloInstruction* operand, HloInstruction* max,
                                    HloInstruction* max_operand);
 
-  // Tries to constant fold a concatenate operation, and returns true if the
-  // operation has been performed. An error status is returned in case of error.
-  StatusOr<bool> TryConcatenateConstantFold(
-      HloInstruction* concatenate,
-      tensorflow::gtl::ArraySlice<HloInstruction*> operands);
-
   // A Reshape or Broadcast that feeds an element-wise operation with a unique
   // non-scalar operand can sink to after the operation.
   StatusOr<bool> TryToSinkReshapeOrBroadcastAfterOpWithUniqueNonScalarOperand(
@@ -236,12 +230,23 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
   Status ReplaceWithNewInstruction(
       HloInstruction* old_instruction,
       std::unique_ptr<HloInstruction> new_instruction) {
-    TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
+    TF_RETURN_IF_ERROR(computation_->ReplaceWithNewInstruction(
         old_instruction, std::move(new_instruction)));
     changed_ = true;
     return Status::OK();
   }
 
+  // Replaces the existing HLO instruction old_instruction, with
+  // new_instruction, and marks the optimizer status as changed.
+  // Returns the Status representing the result of the replace operation.
+  Status ReplaceInstruction(HloInstruction* old_instruction,
+                            HloInstruction* new_instruction) {
+    TF_RETURN_IF_ERROR(
+        computation_->ReplaceInstruction(old_instruction, new_instruction));
+    changed_ = true;
+    return Status::OK();
+  }
+
   // Current HloComputation instance the AlgebraicSimplifierVisitor is
   // traversing.
   HloComputation* computation_;
@@ -290,8 +295,7 @@ void AlgebraicSimplifierVisitor::ReplaceWithBitcast(
   auto bitcast = computation_->AddInstruction(
       HloInstruction::CreateUnary(instruction->shape(), HloOpcode::kBitcast,
                                   instruction->mutable_operand(0)));
-  TF_CHECK_OK(computation_->ReplaceInstruction(instruction, bitcast));
-  changed_ = true;
+  TF_CHECK_OK(ReplaceInstruction(instruction, bitcast));
 }
 
 bool AlgebraicSimplifierVisitor::ReplaceInstructionIfSameShape(
@@ -299,9 +303,7 @@ bool AlgebraicSimplifierVisitor::ReplaceInstructionIfSameShape(
   if (!SameShape(old_instruction, new_instruction)) {
     return false;
   }
-  TF_CHECK_OK(
-      computation_->ReplaceInstruction(old_instruction, new_instruction));
-  changed_ = true;
+  TF_CHECK_OK(ReplaceInstruction(old_instruction, new_instruction));
   return true;
 }
 
@@ -329,63 +331,6 @@ Status AlgebraicSimplifierVisitor::HandleCopy(HloInstruction* copy,
   return Status::OK();
 }
 
-StatusOr<bool> AlgebraicSimplifierVisitor::TryConcatenateConstantFold(
-    HloInstruction* concatenate,
-    tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
-  if (operands[0]->opcode() == HloOpcode::kConstant) {
-    // If all the operands of a concatenate are constant, fold them into a
-    // single constant tensor.
-    // The concatenate dimension is going to be the sum of all the concatenate
-    // dimensions.
-    int64 concat_dim = concatenate->dimensions()[0];
-    const Shape& reference_shape = operands[0]->shape();
-    if (ShapeUtil::IsTuple(reference_shape)) {
-      VLOG(5) << "Tuples not currently supported by the concatenate constant"
-                 " folder";
-      return false;
-    }
-    int64 rank = ShapeUtil::Rank(reference_shape);
-    std::vector<int64> concat_dimensions(reference_shape.dimensions().begin(),
-                                         reference_shape.dimensions().end());
-    if (concat_dim < 0) {
-      concat_dim += rank;
-    }
-    for (int64 i = 1; i < operands.size(); ++i) {
-      const Shape& operand_shape = operands[i]->shape();
-      if (operands[i]->opcode() != HloOpcode::kConstant ||
-          ShapeUtil::IsTuple(operand_shape)) {
-        return false;
-      }
-      // Accumulate the concat dimension from all tensors taking part to the
-      // operation.
-      concat_dimensions[concat_dim] +=
-          ShapeUtil::GetDimension(operand_shape, concat_dim);
-    }
-
-    auto literal = LiteralUtil::CreateFromDimensions(
-        reference_shape.element_type(), concat_dimensions);
-    std::vector<int64> source_indices(rank, 0);
-    std::vector<int64> dest_indices(concat_dimensions.size(), 0);
-    for (auto operand : operands) {
-      const Shape& operand_shape = operand->shape();
-      Status status = LiteralUtil::Copy(
-          operand->literal(), source_indices, literal.get(), dest_indices,
-          AsInt64Slice(operand_shape.dimensions()));
-      if (!status.ok()) {
-        VLOG(1) << "Error while creating concatenated literal : " << status;
-        return false;
-      }
-      dest_indices[concat_dim] +=
-          ShapeUtil::GetDimension(operand_shape, concat_dim);
-    }
-    TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
-        concatenate, HloInstruction::CreateConstant(std::move(literal))));
-    changed_ = true;
-    return true;
-  }
-  return false;
-}
-
 Status AlgebraicSimplifierVisitor::HandleConcatenate(
     HloInstruction* concatenate,
     tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
@@ -394,13 +339,6 @@ Status AlgebraicSimplifierVisitor::HandleConcatenate(
     ReplaceInstructionIfSameShape(concatenate, operands[0]);
     return Status::OK();
   }
-  // If all the concatenate operands are constant, this will get folded into a
-  // new constant literal.
-  TF_ASSIGN_OR_RETURN(bool folded,
-                      TryConcatenateConstantFold(concatenate, operands));
-  if (folded) {
-    return Status::OK();
-  }
   // Filter out and remove empty operands.
   std::vector<HloInstruction*> nonempty_operands;
   for (HloInstruction* operand : operands) {
@@ -799,65 +737,6 @@ Status AlgebraicSimplifierVisitor::HandleBroadcast(HloInstruction* broadcast) {
   return Status::OK();
 }
 
-template <PrimitiveType primitive_src_type, PrimitiveType primitive_dest_type>
-static std::unique_ptr<HloInstruction> ConvertIfTypesMatch(
-    const Literal& src_literal) {
-  CHECK_EQ(primitive_src_type, src_literal.shape().element_type());
-
-  return HloInstruction::CreateConstant(
-      LiteralUtil::Convert<typename primitive_util::PrimitiveTypeToNative<
-                               primitive_src_type>::type,
-                           typename primitive_util::PrimitiveTypeToNative<
-                               primitive_dest_type>::type>(src_literal));
-}
-
-template <PrimitiveType primitive_src_type>
-static std::unique_ptr<HloInstruction> ConvertIfDestTypeMatches(
-    const Literal& src_literal, PrimitiveType primitive_dest_type) {
-  switch (primitive_dest_type) {
-#define CONVERT_IF_TYPES_MATCH(type) \
-  case (type):                       \
-    return ConvertIfTypesMatch<primitive_src_type, (type)>(src_literal);
-    CONVERT_IF_TYPES_MATCH(PRED)
-    CONVERT_IF_TYPES_MATCH(S8)
-    CONVERT_IF_TYPES_MATCH(S32)
-    CONVERT_IF_TYPES_MATCH(S64)
-    CONVERT_IF_TYPES_MATCH(U8)
-    CONVERT_IF_TYPES_MATCH(U32)
-    CONVERT_IF_TYPES_MATCH(U64)
-    CONVERT_IF_TYPES_MATCH(F32)
-    CONVERT_IF_TYPES_MATCH(F64)
-#undef CONVERT_IF_TYPES_MATCH
-    // Other types are not yet supported.
-    default:
-      LOG(FATAL) << "Unimplemented: ConvertIfDestTypeMatches for type "
-                 << PrimitiveType_Name(src_literal.shape().element_type());
-  }
-}
-
-static std::unique_ptr<HloInstruction> ConvertIfSrcTypeMatches(
-    const Literal& src_literal, PrimitiveType primitive_dest_type) {
-  switch (src_literal.shape().element_type()) {
-#define CONVERT_IF_DEST_TYPE_MATCHES(type) \
-  case (type):                             \
-    return ConvertIfDestTypeMatches<(type)>(src_literal, primitive_dest_type);
-    CONVERT_IF_DEST_TYPE_MATCHES(PRED)
-    CONVERT_IF_DEST_TYPE_MATCHES(S8)
-    CONVERT_IF_DEST_TYPE_MATCHES(S32)
-    CONVERT_IF_DEST_TYPE_MATCHES(S64)
-    CONVERT_IF_DEST_TYPE_MATCHES(U8)
-    CONVERT_IF_DEST_TYPE_MATCHES(U32)
-    CONVERT_IF_DEST_TYPE_MATCHES(U64)
-    CONVERT_IF_DEST_TYPE_MATCHES(F32)
-    CONVERT_IF_DEST_TYPE_MATCHES(F64)
-#undef CONVERT_IF_DEST_TYPE_MATCHES
-    // Other types are not yet supported.
-    default:
-      LOG(FATAL) << "Unimplemented: ConvertIfSrcTypeMatches for type "
-                 << PrimitiveType_Name(src_literal.shape().element_type());
-  }
-}
-
 // A conversion to the same element type as the operand is a nop and can be
 // removed.  A conversion of a constant can be simplified by making a new
 // constant.
@@ -866,14 +745,7 @@ Status AlgebraicSimplifierVisitor::HandleConvert(HloInstruction* convert,
   PrimitiveType src_type = operand->shape().element_type();
   PrimitiveType dest_type = convert->shape().element_type();
   if (src_type == dest_type) {
-    changed_ = true;
-    return computation_->ReplaceInstruction(convert, operand);
-  }
-  if (operand->opcode() == HloOpcode::kConstant) {
-    const Literal& src_literal = operand->literal();
-    std::unique_ptr<HloInstruction> new_constant =
-        ConvertIfSrcTypeMatches(src_literal, dest_type);
-    return ReplaceWithNewInstruction(convert, std::move(new_constant));
+    return ReplaceInstruction(convert, operand);
   }
   return Status::OK();
 }
@@ -1080,8 +952,7 @@ Status AlgebraicSimplifierVisitor::HandleReshape(HloInstruction* reshape) {
   // Delete no-op reshapes, i.e. where shape = operand shape.
   if (SameShape(reshape, operand)) {
     VLOG(10) << "deleting no-op reshape";
-    changed_ = true;
-    return computation_->ReplaceInstruction(reshape, operand);
+    return ReplaceInstruction(reshape, operand);
   }
 
   // Merge reshapes.
@@ -1131,8 +1002,7 @@ Status AlgebraicSimplifierVisitor::HandleReverse(HloInstruction* reverse,
   };
   if (std::all_of(reverse->dimensions().begin(), reverse->dimensions().end(),
                   dim_is_one)) {
-    changed_ = true;
-    return computation_->ReplaceInstruction(reverse, operand);
+    return ReplaceInstruction(reverse, operand);
   }
   return Status::OK();
 }
@@ -1143,21 +1013,6 @@ Status AlgebraicSimplifierVisitor::HandleSlice(HloInstruction* slice,
   if (ReplaceInstructionIfSameShape(slice, operand)) {
     return Status::OK();
   }
-  if (operand->opcode() == HloOpcode::kConstant) {
-    const Shape& shape = slice->shape();
-    auto literal = LiteralUtil::CreateFromDimensions(
-        shape.element_type(), AsInt64Slice(shape.dimensions()));
-    std::vector<int64> dest_indices(slice->slice_starts().size(), 0);
-    Status status = LiteralUtil::Copy(operand->literal(), slice->slice_starts(),
-                                      literal.get(), dest_indices,
-                                      AsInt64Slice(shape.dimensions()));
-    if (status.ok()) {
-      TF_CHECK_OK(ReplaceWithNewInstruction(
-          slice, HloInstruction::CreateConstant(std::move(literal))));
-    } else {
-      VLOG(1) << "Error while creating sliced literal : " << status;
-    }
-  }
   return Status::OK();
 }
 
@@ -1247,8 +1102,7 @@ Status AlgebraicSimplifierVisitor::HandleTranspose(HloInstruction* transpose) {
   if (std::is_sorted(transpose->dimensions().begin(),
                      transpose->dimensions().end())) {
     VLOG(10) << "deleting no-op transpose";
-    changed_ = true;
-    return computation_->ReplaceInstruction(transpose, operand);
+    return ReplaceInstruction(transpose, operand);
   }
 
   if (HloOpcode::kTranspose == operand->opcode()) {
@@ -1379,9 +1233,7 @@ Status AlgebraicSimplifierVisitor::HandleConvolution(
   auto new_rhs = add_bitcast(new_filter_shape, rhs);
   auto dot = computation_->AddInstruction(HloInstruction::CreateBinary(
       dot_output_shape, HloOpcode::kDot, new_lhs, new_rhs));
-  changed_ = true;
-  return computation_->ReplaceInstruction(convolution,
-                                          add_bitcast(convolution_shape, dot));
+  return ReplaceInstruction(convolution, add_bitcast(convolution_shape, dot));
 }
 
 bool AlgebraicSimplifierVisitor::TransformToClampIfSameShape(
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 0cce076da5..f4b42055b7 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -466,75 +466,6 @@ TEST_F(AlgebraicSimplifierTest, ConvertBetweenSameType) {
   EXPECT_THAT(computation->root_instruction(), input);
 }
 
-TEST_F(AlgebraicSimplifierTest, ConvertF32ToS64) {
-  HloComputation::Builder builder(TestName());
-  HloInstruction* input = builder.AddInstruction(
-      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
-  builder.AddInstruction(
-      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {}), input));
-
-  auto module = MakeUnique<HloModule>(TestName());
-  auto computation = module->AddEntryComputation(builder.Build());
-
-  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-
-  EXPECT_THAT(computation->root_instruction(), op::Constant());
-  EXPECT_EQ(LiteralUtil::GetFirstElement<int64>(
-                computation->root_instruction()->literal()),
-            42);
-}
-
-TEST_F(AlgebraicSimplifierTest, ConvertS64ToF32) {
-  HloComputation::Builder builder(TestName());
-  HloInstruction* input = builder.AddInstruction(
-      HloInstruction::CreateConstant(LiteralUtil::CreateR0<int64>(42)));
-  builder.AddInstruction(
-      HloInstruction::CreateConvert(ShapeUtil::MakeShape(F32, {}), input));
-
-  auto module = MakeUnique<HloModule>(TestName());
-  auto computation = module->AddEntryComputation(builder.Build());
-
-  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-
-  EXPECT_THAT(computation->root_instruction(), op::Constant());
-  EXPECT_EQ(LiteralUtil::GetFirstElement<float>(
-                computation->root_instruction()->literal()),
-            42.0f);
-}
-
-TEST_F(AlgebraicSimplifierTest, ConvertF32ArrayToS64Array) {
-  HloComputation::Builder builder(TestName());
-  HloInstruction* input = builder.AddInstruction(HloInstruction::CreateConstant(
-      LiteralUtil::CreateR1<float>({42.0f, 19.0f})));
-  builder.AddInstruction(
-      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {2}), input));
-
-  auto module = MakeUnique<HloModule>(TestName());
-  auto computation = module->AddEntryComputation(builder.Build());
-
-  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-
-  EXPECT_THAT(computation->root_instruction(), op::Constant());
-  EXPECT_EQ(
-      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {0}),
-      42);
-  EXPECT_EQ(
-      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {1}),
-      19);
-}
-
 // Test that copies are removed.
 TEST_F(AlgebraicSimplifierTest, RemoveCopy) {
   Shape r0f32 = ShapeUtil::MakeShape(F32, {});
@@ -1666,69 +1597,5 @@ TEST_F(AlgebraicSimplifierTest, IteratorInvalidation) {
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 }
 
-TEST_F(AlgebraicSimplifierTest, Concatenate) {
-  const struct TestConfig {
-    int concat_dimension;
-    tensorflow::gtl::ArraySlice<int64> dimensions;
-    tensorflow::gtl::ArraySlice<int64> concat_sizes;
-  } test_configs[] = {
-      {1, {11, 0, 7, 5, 9}, {2, 5, 7, 11}},
-      {3, {1, 4, 17, 0, 8}, {1, 3, 9, 12}},
-  };
-
-  for (auto& test_config : test_configs) {
-    HloComputation::Builder builder(TestName());
-    std::vector<int64> dimensions(test_config.dimensions.begin(),
-                                  test_config.dimensions.end());
-    int64 concat_size = 0;
-    std::vector<HloInstruction*> operands;
-    for (auto csize : test_config.concat_sizes) {
-      dimensions[test_config.concat_dimension] = csize;
-      concat_size += csize;
-      auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
-      HloInstruction* insn = builder.AddInstruction(
-          HloInstruction::CreateConstant(std::move(literal)));
-      operands.push_back(insn);
-    }
-    dimensions[test_config.concat_dimension] = concat_size;
-    Shape shape = ShapeUtil::MakeShape(F32, dimensions);
-    builder.AddInstruction(HloInstruction::CreateConcatenate(
-        shape, operands, test_config.concat_dimension));
-    HloModule module(TestName());
-    auto computation = module.AddEntryComputation(builder.Build());
-
-    AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                   non_bitcasting_callback());
-    ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-
-    HloInstruction* root = computation->root_instruction();
-    EXPECT_EQ(root->opcode(), HloOpcode::kConstant);
-    EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
-  }
-}
-
-TEST_F(AlgebraicSimplifierTest, Slice) {
-  HloComputation::Builder builder(TestName());
-  const int64 dimensions[] = {11, 8, 7, 5, 9};
-  const int64 slice_start[] = {4, 2, 3, 1, 5};
-  const int64 slice_limits[] = {10, 8, 6, 5, 9};
-  auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
-  HloInstruction* lit_insn = builder.AddInstruction(
-      HloInstruction::CreateConstant(std::move(literal)));
-  Shape shape = ShapeUtil::MakeShape(F32, {6, 6, 3, 4, 4});
-  builder.AddInstruction(
-      HloInstruction::CreateSlice(shape, lit_insn, slice_start, slice_limits));
-  HloModule module(TestName());
-  auto computation = module.AddEntryComputation(builder.Build());
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kConstant);
-  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
-}
-
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding.cc b/tensorflow/compiler/xla/service/hlo_constant_folding.cc
index 9a5345dc13..cb0a99d773 100644
--- a/tensorflow/compiler/xla/service/hlo_constant_folding.cc
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding.cc
@@ -15,16 +15,14 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/hlo_constant_folding.h"
 
-#include <list>
-#include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
@@ -34,52 +32,222 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 
 namespace xla {
+namespace {
+
+template <PrimitiveType primitive_src_type, PrimitiveType primitive_dest_type>
+static std::unique_ptr<Literal> ConvertIfTypesMatch(
+    const Literal& src_literal) {
+  CHECK_EQ(primitive_src_type, src_literal.shape().element_type());
+  return LiteralUtil::Convert<
+      typename primitive_util::PrimitiveTypeToNative<primitive_src_type>::type,
+      typename primitive_util::PrimitiveTypeToNative<
+          primitive_dest_type>::type>(src_literal);
+}
+
+template <PrimitiveType primitive_src_type>
+static std::unique_ptr<Literal> ConvertIfDestTypeMatches(
+    const Literal& src_literal, PrimitiveType primitive_dest_type) {
+  switch (primitive_dest_type) {
+#define CONVERT_IF_TYPES_MATCH(type) \
+  case (type):                       \
+    return ConvertIfTypesMatch<primitive_src_type, (type)>(src_literal);
+    CONVERT_IF_TYPES_MATCH(PRED)
+    CONVERT_IF_TYPES_MATCH(S8)
+    CONVERT_IF_TYPES_MATCH(S32)
+    CONVERT_IF_TYPES_MATCH(S64)
+    CONVERT_IF_TYPES_MATCH(U8)
+    CONVERT_IF_TYPES_MATCH(U32)
+    CONVERT_IF_TYPES_MATCH(U64)
+    CONVERT_IF_TYPES_MATCH(F32)
+    CONVERT_IF_TYPES_MATCH(F64)
+#undef CONVERT_IF_TYPES_MATCH
+    // Other types are not yet supported.
+    default:
+      LOG(FATAL) << "Unimplemented: ConvertIfDestTypeMatches for type "
+                 << PrimitiveType_Name(src_literal.shape().element_type());
+  }
+}
+
+static std::unique_ptr<Literal> ConvertIfSrcTypeMatches(
+    const Literal& src_literal, PrimitiveType primitive_dest_type) {
+  switch (src_literal.shape().element_type()) {
+#define CONVERT_IF_DEST_TYPE_MATCHES(type) \
+  case (type):                             \
+    return ConvertIfDestTypeMatches<(type)>(src_literal, primitive_dest_type);
+    CONVERT_IF_DEST_TYPE_MATCHES(PRED)
+    CONVERT_IF_DEST_TYPE_MATCHES(S8)
+    CONVERT_IF_DEST_TYPE_MATCHES(S32)
+    CONVERT_IF_DEST_TYPE_MATCHES(S64)
+    CONVERT_IF_DEST_TYPE_MATCHES(U8)
+    CONVERT_IF_DEST_TYPE_MATCHES(U32)
+    CONVERT_IF_DEST_TYPE_MATCHES(U64)
+    CONVERT_IF_DEST_TYPE_MATCHES(F32)
+    CONVERT_IF_DEST_TYPE_MATCHES(F64)
+#undef CONVERT_IF_DEST_TYPE_MATCHES
+    // Other types are not yet supported.
+    default:
+      LOG(FATAL) << "Unimplemented: ConvertIfSrcTypeMatches for type "
+                 << PrimitiveType_Name(src_literal.shape().element_type());
+  }
+}
+
+}  // namespace
+
+// ConstantFolderVisitor traverses the HLO computation and reduces certain
+// constant graph sections, to literals.
+class ConstantFolderVisitor : public DfsHloVisitorWithDefault {
+ public:
+  // Default visitor action is to do nothing and return OK.
+  Status DefaultAction(HloInstruction* /*hlo_instruction*/) override {
+    return Status::OK();
+  }
+
+  Status HandleConcatenate(
+      HloInstruction* concatenate,
+      tensorflow::gtl::ArraySlice<HloInstruction*> operands) override;
+
+  Status HandleConvert(HloInstruction* convert,
+                       HloInstruction* operand) override;
+
+  Status HandleReshape(HloInstruction* reshape) override;
+
+  Status HandleSlice(HloInstruction* slice, HloInstruction* operand) override;
+
+  Status HandleTranspose(HloInstruction* transpose) override;
+
+  // Returns whether a constant folding operation has occurred.
+  const bool changed() const { return changed_; }
+
+  // Runs the visitor on a computation and returns whether any changes were
+  // performed.
+  static StatusOr<bool> Run(HloComputation* computation);
+
+ private:
+  ConstantFolderVisitor() = default;
+
+  // Replaces the existing HLO instruction old_instruction, with a literal,
+  // and marks the optimizer status as changed.
+  // Returns the Status representing the result of the replace operation.
+  Status ReplaceWithConstant(HloInstruction* old_instruction,
+                             std::unique_ptr<Literal> literal) {
+    TF_RETURN_IF_ERROR(old_instruction->parent()->ReplaceWithNewInstruction(
+        old_instruction, HloInstruction::CreateConstant(std::move(literal))));
+    changed_ = true;
+    return Status::OK();
+  }
+
+  // Whether any constant folding operations have occurred.
+  bool changed_ = false;
+};
+
+StatusOr<bool> ConstantFolderVisitor::Run(HloComputation* computation) {
+  ConstantFolderVisitor visitor;
+  TF_RETURN_IF_ERROR(computation->Accept(&visitor));
+  return visitor.changed();
+}
 
 StatusOr<bool> HloConstantFolding::Run(HloModule* module) {
+  XLA_VLOG_LINES(2,
+                 "HloConstantFolding::Run(), before:\n" + module->ToString());
   bool changed = false;
-  for (auto& computation : module->computations()) {
-    for (auto instruction : computation->MakeInstructionPostOrder()) {
-      // Skip dead code.
-      if (instruction->user_count() == 0 &&
-          computation->root_instruction() != instruction) {
-        continue;
-      }
-      // Depending on the opcode, choose how to handle constant operands.
-      //
-      // TODO(b/35975797): Fold constant computations for more than reshapes and
-      // transposes.
-      switch (instruction->opcode()) {
-        case HloOpcode::kReshape: {
-          if (instruction->operand(0)->opcode() == HloOpcode::kConstant) {
-            TF_ASSIGN_OR_RETURN(
-                auto reshaped_literal,
-                LiteralUtil::Reshape(
-                    instruction->operand(0)->literal(),
-                    AsInt64Slice(instruction->shape().dimensions())));
-            TF_CHECK_OK(computation->ReplaceWithNewInstruction(
-                instruction,
-                HloInstruction::CreateConstant(std::move(reshaped_literal))));
-            changed = true;
-          }
-          break;
-        }
-        case HloOpcode::kTranspose: {
-          if (instruction->operand(0)->opcode() == HloOpcode::kConstant) {
-            auto transposed_literal = LiteralUtil::Transpose(
-                instruction->operand(0)->literal(), instruction->dimensions());
-            TF_CHECK_OK(computation->ReplaceWithNewInstruction(
-                instruction,
-                HloInstruction::CreateConstant(std::move(transposed_literal))));
-            changed = true;
-          }
-          break;
-        }
-        default:
-          break;
+  for (auto& comp : module->computations()) {
+    TF_ASSIGN_OR_RETURN(bool result, ConstantFolderVisitor::Run(comp.get()));
+    changed = changed || result;
+  }
+  XLA_VLOG_LINES(2, "HloConstantFolding::Run(), after:\n" + module->ToString());
+  return changed;
+}
+
+Status ConstantFolderVisitor::HandleReshape(HloInstruction* reshape) {
+  if (reshape->operand(0)->opcode() == HloOpcode::kConstant) {
+    TF_ASSIGN_OR_RETURN(
+        auto reshaped_literal,
+        LiteralUtil::Reshape(reshape->operand(0)->literal(),
+                             AsInt64Slice(reshape->shape().dimensions())));
+    return ReplaceWithConstant(reshape, std::move(reshaped_literal));
+  }
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleTranspose(HloInstruction* transpose) {
+  if (transpose->operand(0)->opcode() == HloOpcode::kConstant) {
+    auto transposed_literal = LiteralUtil::Transpose(
+        transpose->operand(0)->literal(), transpose->dimensions());
+    return ReplaceWithConstant(transpose, std::move(transposed_literal));
+  }
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleConcatenate(
+    HloInstruction* concatenate,
+    tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
+  if (operands[0]->opcode() == HloOpcode::kConstant) {
+    // If all the operands of a concatenate are constant, fold them into a
+    // single constant tensor.
+    // The result concatenate dimension is going to be the sum of all the
+    // concatenate dimensions of the arrays taking part of the operation.
+    int64 concat_dim = concatenate->dimensions()[0];
+    const Shape& reference_shape = operands[0]->shape();
+    CHECK(!ShapeUtil::IsTuple(reference_shape));
+    int64 rank = ShapeUtil::Rank(reference_shape);
+    std::vector<int64> concat_dimensions(reference_shape.dimensions().begin(),
+                                         reference_shape.dimensions().end());
+    if (concat_dim < 0) {
+      concat_dim += rank;
+    }
+    for (int64 i = 1; i < operands.size(); ++i) {
+      const Shape& operand_shape = operands[i]->shape();
+      CHECK(!ShapeUtil::IsTuple(operand_shape));
+      if (operands[i]->opcode() != HloOpcode::kConstant) {
+        return Status::OK();
       }
+      // Accumulate the concat dimension from all tensors taking part to the
+      // operation.
+      concat_dimensions[concat_dim] +=
+          ShapeUtil::GetDimension(operand_shape, concat_dim);
+    }
+
+    auto literal = LiteralUtil::CreateFromDimensions(
+        reference_shape.element_type(), concat_dimensions);
+    std::vector<int64> source_indices(rank, 0);
+    std::vector<int64> dest_indices(concat_dimensions.size(), 0);
+    for (auto operand : operands) {
+      const Shape& operand_shape = operand->shape();
+      TF_RETURN_IF_ERROR(LiteralUtil::Copy(
+          operand->literal(), source_indices, literal.get(), dest_indices,
+          AsInt64Slice(operand_shape.dimensions())));
+      dest_indices[concat_dim] +=
+          ShapeUtil::GetDimension(operand_shape, concat_dim);
     }
+    return ReplaceWithConstant(concatenate, std::move(literal));
   }
-  return changed;
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleSlice(HloInstruction* slice,
+                                          HloInstruction* operand) {
+  if (operand->opcode() == HloOpcode::kConstant) {
+    const Shape& shape = slice->shape();
+    auto literal = LiteralUtil::CreateFromDimensions(
+        shape.element_type(), AsInt64Slice(shape.dimensions()));
+    std::vector<int64> dest_indices(slice->slice_starts().size(), 0);
+    TF_RETURN_IF_ERROR(LiteralUtil::Copy(
+        operand->literal(), slice->slice_starts(), literal.get(), dest_indices,
+        AsInt64Slice(shape.dimensions())));
+    TF_RETURN_IF_ERROR(ReplaceWithConstant(slice, std::move(literal)));
+  }
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleConvert(HloInstruction* convert,
+                                            HloInstruction* operand) {
+  if (operand->opcode() == HloOpcode::kConstant) {
+    const Literal& src_literal = operand->literal();
+    std::unique_ptr<Literal> new_constant =
+        ConvertIfSrcTypeMatches(src_literal, convert->shape().element_type());
+    return ReplaceWithConstant(convert, std::move(new_constant));
+  }
+  return Status::OK();
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding.h b/tensorflow/compiler/xla/service/hlo_constant_folding.h
index 514bb8164c..f45eccf825 100644
--- a/tensorflow/compiler/xla/service/hlo_constant_folding.h
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding.h
@@ -25,12 +25,10 @@ namespace xla {
 // computation on constants.
 class HloConstantFolding : public HloPassInterface {
  public:
-  explicit HloConstantFolding() {}
-  ~HloConstantFolding() override {}
   tensorflow::StringPiece name() const override { return "constant_folding"; }
 
-  // Run ConstantFolding on the given module. Returns whether the module was
-  // changed (common subexpressions were found and eliminated).
+  // Run constant folding operations on the given module. Returns whether the
+  // module was changed (constant expressions folded).
   StatusOr<bool> Run(HloModule* module) override;
 };
 
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
new file mode 100644
index 0000000000..d20f423bd6
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
@@ -0,0 +1,169 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/service/hlo_constant_folding.h"
+
+#include <memory>
+#include <utility>
+
+#include "tensorflow/compiler/xla/layout_util.h"
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
+#include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/hlo_pass_fix.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
+#include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+#include "tensorflow/compiler/xla/types.h"
+
+namespace op = xla::testing::opcode_matchers;
+
+namespace xla {
+namespace {
+
+using HloConstantFoldingTest = HloTestBase;
+
+TEST_F(HloConstantFoldingTest, ConvertF32ToS64) {
+  HloComputation::Builder builder(TestName());
+  HloInstruction* input = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
+  builder.AddInstruction(
+      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {}), input));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
+  EXPECT_EQ(LiteralUtil::GetFirstElement<int64>(
+                computation->root_instruction()->literal()),
+            42);
+}
+
+TEST_F(HloConstantFoldingTest, ConvertS64ToF32) {
+  HloComputation::Builder builder(TestName());
+  HloInstruction* input = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<int64>(42)));
+  builder.AddInstruction(
+      HloInstruction::CreateConvert(ShapeUtil::MakeShape(F32, {}), input));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
+  EXPECT_EQ(LiteralUtil::GetFirstElement<float>(
+                computation->root_instruction()->literal()),
+            42.0f);
+}
+
+TEST_F(HloConstantFoldingTest, ConvertF32ArrayToS64Array) {
+  HloComputation::Builder builder(TestName());
+  HloInstruction* input = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR1<float>({42.0f, 19.0f})));
+  builder.AddInstruction(
+      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {2}), input));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
+  EXPECT_EQ(
+      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {0}),
+      42);
+  EXPECT_EQ(
+      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {1}),
+      19);
+}
+
+TEST_F(HloConstantFoldingTest, Concatenate) {
+  const struct TestConfig {
+    int concat_dimension;
+    tensorflow::gtl::ArraySlice<int64> dimensions;
+    tensorflow::gtl::ArraySlice<int64> concat_sizes;
+  } test_configs[] = {
+      {1, {11, 0, 7, 5, 9}, {2, 5, 7, 11}},
+      {3, {1, 4, 17, 0, 8}, {1, 3, 9, 12}},
+  };
+
+  for (auto& test_config : test_configs) {
+    HloComputation::Builder builder(TestName());
+    std::vector<int64> dimensions(test_config.dimensions.begin(),
+                                  test_config.dimensions.end());
+    int64 concat_size = 0;
+    std::vector<HloInstruction*> operands;
+    for (auto csize : test_config.concat_sizes) {
+      dimensions[test_config.concat_dimension] = csize;
+      concat_size += csize;
+      auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
+      HloInstruction* insn = builder.AddInstruction(
+          HloInstruction::CreateConstant(std::move(literal)));
+      operands.push_back(insn);
+    }
+    dimensions[test_config.concat_dimension] = concat_size;
+    Shape shape = ShapeUtil::MakeShape(F32, dimensions);
+    builder.AddInstruction(HloInstruction::CreateConcatenate(
+        shape, operands, test_config.concat_dimension));
+    HloModule module(TestName());
+    auto computation = module.AddEntryComputation(builder.Build());
+
+    HloConstantFolding simplifier;
+    ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+
+    HloInstruction* root = computation->root_instruction();
+    EXPECT_THAT(root, op::Constant());
+    EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+  }
+}
+
+TEST_F(HloConstantFoldingTest, Slice) {
+  HloComputation::Builder builder(TestName());
+  const int64 dimensions[] = {11, 8, 7, 5, 9};
+  const int64 slice_start[] = {4, 2, 3, 1, 5};
+  const int64 slice_limits[] = {10, 8, 6, 5, 9};
+  auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
+  HloInstruction* lit_insn = builder.AddInstruction(
+      HloInstruction::CreateConstant(std::move(literal)));
+  Shape shape = ShapeUtil::MakeShape(F32, {6, 6, 3, 4, 4});
+  builder.AddInstruction(
+      HloInstruction::CreateSlice(shape, lit_insn, slice_start, slice_limits));
+  HloModule module(TestName());
+  auto computation = module.AddEntryComputation(builder.Build());
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_THAT(root, op::Constant());
+  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+}
+
+}  // namespace
+}  // namespace xla
-- 
GitLab


From a27319bf06a22e1fae89aa54aa62dcd5814f2641 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Tue, 2 May 2017 10:46:53 -0800
Subject: [PATCH 0923/1563] Java: Docs: Update instructions for Windows.

Inspired by
http://stackoverflow.com/questions/43741775/tensorflow-in-java-running-failed
Change: 154859066
---
 tensorflow/docs_src/install/install_java.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 1abf3b69f5..65cfe375d5 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -211,15 +211,20 @@ two files are available to the JVM:
   * the downloaded `.jar` file
   * the extracted JNI library
 
-For example, the following command line executes the `HelloTF` program:
+For example, the following command line executes the `HelloTF` program on Linux
+and Mac OS X:
 
 <pre><b>java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
+And the following comand line executes the `HelloTF` program on Windows:
+
+<pre><b>java -cp libtensorflow-1.1.0-rc2.jar;. -Djava.library.path=jni HelloTF</b></pre>
+
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
 outputs something else, check
-[Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow)
-for possible solutions.
+[Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow) for
+possible solutions.
 
 
 ### Advanced Example
-- 
GitLab


From 5e23da5ace56f577566285352b2bf246b1fcabc9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 10:50:47 -0800
Subject: [PATCH 0924/1563] Add more documentation for features and labels.
 Change: 154859649

---
 tensorflow/python/estimator/estimator.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index c04e37eccd..c394315cfa 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -94,13 +94,15 @@ class Estimator(object):
 
         * Args:
 
-          * `features`: single `Tensor` or `dict` of `Tensor`s
-                 (depending on data passed to `train`),
-          * `labels`: `Tensor` or `dict` of `Tensor`s (for multi-head
-                 models). If mode is `ModeKeys.PREDICT`, `labels=None` will be
-                 passed. If the `model_fn`'s signature does not accept
-                 `mode`, the `model_fn` must still be able to handle
-                 `labels=None`.
+          * `features`: This is the first item returned from the `input_fn`
+                 passed to `train`, 'evaluate`, and `predict`. This should be a
+                 single `Tensor` or `dict` of same.
+          * `labels`: This is the second item returned from the `input_fn`
+                 passed to `train`, 'evaluate`, and `predict`. This should be a
+                 single `Tensor` or `dict` of same (for multi-head models). If
+                 mode is `ModeKeys.PREDICT`, `labels=None` will be passed. If
+                 the `model_fn`'s signature does not accept `mode`, the
+                 `model_fn` must still be able to handle `labels=None`.
           * `mode`: Optional. Specifies if this training, evaluation or
                  prediction. See `ModeKeys`.
           * `params`: Optional `dict` of hyperparameters.  Will receive what
-- 
GitLab


From 4c5274e120e33b262164686ecb2b4714a5a11f23 Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Tue, 2 May 2017 10:54:46 -0800
Subject: [PATCH 0925/1563] Added link to high-performance models Change:
 154860213

---
 tensorflow/docs_src/performance/performance_guide.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/performance/performance_guide.md b/tensorflow/docs_src/performance/performance_guide.md
index 8a1bba883a..07c5d3087f 100644
--- a/tensorflow/docs_src/performance/performance_guide.md
+++ b/tensorflow/docs_src/performance/performance_guide.md
@@ -1,8 +1,10 @@
-# Performance
+# Performance Guide
 
 This guide contains a collection of best practices for optimizing your
 TensorFlow code. The best practices apply to both new and experienced
-Tensorflow users.
+Tensorflow users.  As a complement to the best practices in this document, the
+@{$performance_models$High-Performance Models} document links to example code
+and details for creating models that scale on a variety of hardware.
 
 ## Best Practices
 While optimizing implementations of different types of models can be different,
@@ -73,7 +75,7 @@ Unless for a special circumstance or for example code, do not feed data
 into the session from Python variables, e.g. `dictionary`.
 
 ```python
-# This will result in poor performance.
+# Using feed_dict often results in suboptimal performance when using large inputs.
 sess.run(train_step, feed_dict={x: batch_xs, y_: batch_ys})
 ```
 
@@ -141,3 +143,4 @@ bn = tf.contrib.layers.batch_norm(
 The non-fused batch norm does computations using several individual Ops. Fused
 batch norm combines the individual operations into a single kernel, which runs
 faster.
+
-- 
GitLab


From 1e27ffdd12d2d6d8f34f7b5275d975fd3c2faac6 Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Tue, 2 May 2017 11:09:49 -0800
Subject: [PATCH 0926/1563] Navigation and index for new performance section
 documents. Change: 154862215

---
 tensorflow/docs_src/performance/index.md      | 12 ++++++++++--
 tensorflow/docs_src/performance/leftnav_files |  5 ++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/performance/index.md b/tensorflow/docs_src/performance/index.md
index 0ff4d2ee00..746dc0c74f 100644
--- a/tensorflow/docs_src/performance/index.md
+++ b/tensorflow/docs_src/performance/index.md
@@ -2,11 +2,19 @@
 
 Performance is often a significant issue when training a machine learning
 model.  This section explains various ways to optimize performance.  Start
-your investigation with the following guide:
+your investigation with the @{$performance_guide$Performance Guide} and then go
+deeper with techniques detailed in @{$performance_models$High-Performance Models}:
 
-  * @{$performance_guide$Performance}, which contains a collection of best
+  * @{$performance_guide$Performance Guide}, which contains a collection of best
     practices for optimizing your TensorFlow code.
 
+  * @{$performance_models$High-Performance Models}, which contains a collection
+    advanced techniques to build highly scalable models targeting different
+    system types and network topologies.
+
+  * @{$benchmarks$Benchmarks}, which contains a collection of benchmark
+    results.
+
 XLA (Accelerated Linear Algebra) is an experimental compiler for linear
 algebra that optimizes TensorFlow computations. The following guides explore
 XLA:
diff --git a/tensorflow/docs_src/performance/leftnav_files b/tensorflow/docs_src/performance/leftnav_files
index 0f30cc7fa5..d228473220 100644
--- a/tensorflow/docs_src/performance/leftnav_files
+++ b/tensorflow/docs_src/performance/leftnav_files
@@ -1,4 +1,8 @@
 performance_guide.md
+performance_models.md
+benchmarks.md
+quantization.md
+>>>
 xla/index.md
 xla/broadcasting.md
 xla/developing_new_backend.md
@@ -6,4 +10,3 @@ xla/jit.md
 xla/operation_semantics.md
 xla/shapes.md
 xla/tfcompile.md
-quantization.md
-- 
GitLab


From 6a533a0824eb23a32b8e9c5d64ddccf08497e45d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 11:13:39 -0800
Subject: [PATCH 0927/1563] Fix shape mismatch between loss and weights.
 Change: 154862650

---
 .../learn/python/learn/estimators/head.py     | 11 ++++++-
 .../python/learn/estimators/head_test.py      | 30 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 452f8a901e..15e457f932 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -921,12 +921,21 @@ def _softmax_cross_entropy_loss(labels, logits, weights=None):
     if not labels.dtype.is_integer:
       raise ValueError("Labels dtype should be integer "
                        "Instead got %s." % labels.dtype)
-    # TODO(ptucker): This will break for dynamic shapes.
+
     # sparse_softmax_cross_entropy_with_logits requires [batch_size] labels.
+    is_squeezed_labels = False
+    # TODO(ptucker): This will break for dynamic shapes.
     if len(labels.get_shape()) == 2:
       labels = array_ops.squeeze(labels, squeeze_dims=(1,))
+      is_squeezed_labels = True
+
     loss = nn.sparse_softmax_cross_entropy_with_logits(
         labels=labels, logits=logits, name=name)
+
+    # Restore squeezed dimension, if necessary, so loss matches weights shape.
+    if is_squeezed_labels:
+      loss = array_ops.expand_dims(loss, axis=(1,))
+
     return _compute_weighted_loss(loss, weights)
 
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index 442530cb5e..207a189a94 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -791,7 +791,7 @@ class BinaryClassificationHeadTest(test.TestCase):
             [b"0", b"1"], predicted_classes[0])
         self.assertIn("probabilities", six.iterkeys(predictions_for_serving))
 
-  def testBinaryClassificationInferMode_withWightColumn(self):
+  def testBinaryClassificationInferMode_withWeightColumn(self):
     n_classes = 2
     head = head_lib.multi_class_head(n_classes=n_classes,
                                      weight_column_name="label_weight")
@@ -951,7 +951,7 @@ class MultiClassHeadTest(test.TestCase):
 
   def setUp(self):
     self._logits = ((1., 0., 0.),)
-    self._labels = (2,)
+    self._labels = ((2,),)
 
   def _expected_eval_metrics(self, expected_loss):
     return {
@@ -1131,7 +1131,7 @@ class MultiClassHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss,
                       expected_eval_metrics, model_fn_ops)
 
-  def testMultiClassWithWeight(self):
+  def testMultiClassWithScalarWeight(self):
     n_classes = 3
     head = head_lib.multi_class_head(
         n_classes=n_classes,
@@ -1154,6 +1154,30 @@ class MultiClassHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss * weight,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
 
+  def testMultiClassWith2DWeight(self):
+    n_classes = 3
+    head = head_lib.multi_class_head(
+        n_classes=n_classes,
+        weight_column_name="label_weight",
+        metric_class_ids=range(n_classes))
+    with ops.Graph().as_default(), session.Session():
+      weight = .1
+      weights = ((weight,),)
+      # logloss: z:label, x:logit
+      # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
+      model_fn_ops = head.create_model_fn_ops(
+          features={"label_weight": weights},
+          labels=self._labels,
+          mode=model_fn.ModeKeys.TRAIN,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=self._logits)
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["loss"])
+      expected_loss = 1.5514447
+      _assert_metrics(self, expected_loss * weight,
+                      self._expected_eval_metrics(expected_loss), model_fn_ops)
+
   def testMultiClassWithCustomLoss(self):
     n_classes = 3
     head = head_lib.multi_class_head(
-- 
GitLab


From 6aae4bb997851f2de84a7d5337e980e840ba516f Mon Sep 17 00:00:00 2001
From: Cassandra Xia <cassandrax@google.com>
Date: Tue, 2 May 2017 11:13:48 -0800
Subject: [PATCH 0928/1563] Add examples to TensorShape documentation and ran
 autoformatter. Change: 154862667

---
 tensorflow/python/framework/tensor_shape.py | 52 ++++++++++-----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/tensorflow/python/framework/tensor_shape.py b/tensorflow/python/framework/tensor_shape.py
index 3664710caa..73c810711f 100644
--- a/tensorflow/python/framework/tensor_shape.py
+++ b/tensorflow/python/framework/tensor_shape.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
 """Helper classes for tensor shape inference."""
 from __future__ import absolute_import
 from __future__ import division
@@ -31,8 +30,8 @@ class Dimension(object):
       self._value = None
     else:
       self._value = int(value)
-      if (not isinstance(value, compat.bytes_or_text_types)
-          and self._value != value):
+      if (not isinstance(value, compat.bytes_or_text_types) and
+          self._value != value):
         raise ValueError("Ambiguous dimension: %s" % value)
       if self._value < 0:
         raise ValueError("Dimension %d must be >= 0" % self._value)
@@ -89,9 +88,8 @@ class Dimension(object):
       True if this Dimension and `other` are compatible.
     """
     other = as_dimension(other)
-    return (self._value is None
-            or other.value is None
-            or self._value == other.value)
+    return (self._value is None or other.value is None or
+            self._value == other.value)
 
   def assert_is_compatible_with(self, other):
     """Raises an exception if `other` is not compatible with this Dimension.
@@ -104,8 +102,8 @@ class Dimension(object):
         is_compatible_with).
     """
     if not self.is_compatible_with(other):
-      raise ValueError("Dimensions %s and %s are not compatible"
-                       % (self, other))
+      raise ValueError("Dimensions %s and %s are not compatible" % (self,
+                                                                    other))
 
   def merge_with(self, other):
     """Returns a Dimension that combines the information in `self` and `other`.
@@ -385,18 +383,17 @@ class TensorShape(object):
   `Tensor`. It may be one of the following:
 
   * *Fully-known shape:* has a known number of dimensions and a known size
-    for each dimension.
+    for each dimension. e.g. `TensorShape([16, 256])`
   * *Partially-known shape:* has a known number of dimensions, and an unknown
-    size for one or more dimension.
+    size for one or more dimension. e.g. `TensorShape([None, 256])`
   * *Unknown shape:* has an unknown number of dimensions, and an unknown
-    size in all dimensions.
+    size in all dimensions. e.g. `TensorShape(None)`
 
   If a tensor is produced by an operation of type `"Foo"`, its shape
   may be inferred if there is a registered shape function for
-  `"Foo"`. See @{$adding_an_op#shape-functions-in-c$`Shape functions in   C++`} for
-  details of shape functions and how to register them. Alternatively,
-  the shape may be set explicitly using
-  @{tf.Tensor.set_shape}.
+  `"Foo"`. See @{$adding_an_op#shape-functions-in-c$`Shape functions in C++`}
+  for details of shape functions and how to register them. Alternatively,
+  the shape may be set explicitly using @{tf.Tensor.set_shape}.
   """
 
   def __init__(self, dims):
@@ -414,7 +411,7 @@ class TensorShape(object):
       self._dims = None
     elif isinstance(dims, compat.bytes_or_text_types):
       raise TypeError("A string has ambiguous TensorShape, please wrap in a "
-                       "list or convert to an int: %s" % dims)
+                      "list or convert to an int: %s" % dims)
     elif isinstance(dims, tensor_shape_pb2.TensorShapeProto):
       if dims.unknown_rank:
         self._dims = None
@@ -422,7 +419,8 @@ class TensorShape(object):
         self._dims = [
             # Protos store variable-size dimensions as -1
             as_dimension(dim.size if dim.size != -1 else None)
-            for dim in dims.dim]
+            for dim in dims.dim
+        ]
     elif isinstance(dims, TensorShape):
       self._dims = dims.dims
     else:
@@ -519,7 +517,7 @@ class TensorShape(object):
           # suffixes of otherwise unknown shapes.
           return unknown_shape()
         else:
-          return unknown_shape(ndims=stop-start)
+          return unknown_shape(ndims=stop - start)
       else:
         return Dimension(None)
 
@@ -560,8 +558,7 @@ class TensorShape(object):
           new_dims.append(dim.merge_with(other[i]))
         return TensorShape(new_dims)
       except ValueError:
-        raise ValueError("Shapes %s and %s are not compatible" %
-                         (self, other))
+        raise ValueError("Shapes %s and %s are not compatible" % (self, other))
 
   def concatenate(self, other):
     """Returns the concatenation of the dimension in `self` and `other`.
@@ -599,8 +596,8 @@ class TensorShape(object):
     other = as_shape(other)
     if self.ndims is not None and other.ndims is not None:
       if self.ndims != other.ndims:
-        raise ValueError(
-            "Shapes %s and %s must have the same rank" % (self, other))
+        raise ValueError("Shapes %s and %s must have the same rank" % (self,
+                                                                       other))
 
   def assert_has_rank(self, rank):
     """Raises an exception if `self` is not compatible with the given `rank`.
@@ -736,8 +733,8 @@ class TensorShape(object):
 
   def is_fully_defined(self):
     """Returns True iff `self` is fully defined in every dimension."""
-    return (self._dims is not None
-            and all(dim.value is not None for dim in self._dims))
+    return (self._dims is not None and all(dim.value is not None
+                                           for dim in self._dims))
 
   def assert_is_fully_defined(self):
     """Raises an exception if `self` is not fully defined in every dimension.
@@ -767,9 +764,10 @@ class TensorShape(object):
       return tensor_shape_pb2.TensorShapeProto(unknown_rank=True)
     else:
       return tensor_shape_pb2.TensorShapeProto(dim=[
-          tensor_shape_pb2.TensorShapeProto.Dim(
-              size=-1 if d.value is None else d.value)
-          for d in self._dims])
+          tensor_shape_pb2.TensorShapeProto.Dim(size=-1
+                                                if d.value is None else d.value)
+          for d in self._dims
+      ])
 
   def __eq__(self, other):
     """Returns True if `self` is equivalent to `other`."""
-- 
GitLab


From 50df613b944c975ad719141ef8a012ccfd68b4b7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 11:21:41 -0800
Subject: [PATCH 0929/1563] Move linking of cudnn_plugin, cublas_plugin and
 cufft_plugin from stream_executor to the ops that need them. Change:
 154863520

---
 tensorflow/compiler/xla/service/gpu/BUILD        |  2 ++
 tensorflow/core/kernels/BUILD                    |  9 +++++++--
 .../core/platform/default/build_config/BUILD     | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/service/gpu/BUILD b/tensorflow/compiler/xla/service/gpu/BUILD
index 1fdbcfe564..d26f415fd4 100644
--- a/tensorflow/compiler/xla/service/gpu/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/BUILD
@@ -264,6 +264,8 @@ cc_library(
         "//tensorflow/compiler/xla/service:tuple_points_to_analysis",
         "//tensorflow/core:lib",
         "//tensorflow/core:stream_executor_no_cuda",
+        "//tensorflow/core/platform/default/build_config:cublas_plugin",
+        "//tensorflow/core/platform/default/build_config:cudnn_plugin",
         "//tensorflow/core/platform/default/build_config:stream_executor_cuda",
     ],
 )
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 231e06d5f4..29b4d63bbf 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -2042,6 +2042,7 @@ tf_kernel_library(
     deps = [
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
+        "//tensorflow/core/platform/default/build_config:cublas_plugin",
         "@local_config_cuda//cuda:cusolver",
     ],
 )
@@ -2322,7 +2323,9 @@ tf_kernel_library(
     prefix = "fft_ops",
     deps = MATH_DEPS + [
         "//tensorflow/core:spectral_ops_op_lib",
-    ],
+    ] + if_cuda([
+        "//tensorflow/core/platform/default/build_config:cufft_plugin",
+    ]),
 )
 
 tf_kernel_library(
@@ -2626,7 +2629,9 @@ tf_kernel_library(
             "@libxsmm_archive//:xsmm_avx",
         ],
         "//conditions:default": [],
-    }),
+    }) + if_cuda([
+        "//tensorflow/core/platform/default/build_config:cudnn_plugin",
+    ]),
 )
 
 tf_kernel_library(
diff --git a/tensorflow/core/platform/default/build_config/BUILD b/tensorflow/core/platform/default/build_config/BUILD
index 8bc412c5d8..9e3d5f354d 100644
--- a/tensorflow/core/platform/default/build_config/BUILD
+++ b/tensorflow/core/platform/default/build_config/BUILD
@@ -58,6 +58,22 @@ cc_library(
     ],
 )
 
+# Dummy stream executor cuda plugins.
+cc_library(
+    name = "cublas_plugin",
+    srcs = [],
+)
+
+cc_library(
+    name = "cufft_plugin",
+    srcs = [],
+)
+
+cc_library(
+    name = "cudnn_plugin",
+    srcs = [],
+)
+
 # OSX framework for device driver access
 cc_library(
     name = "IOKit",
-- 
GitLab


From 27e9b383fef5d1f5e1b9e73454e58a22cc09d088 Mon Sep 17 00:00:00 2001
From: Raingo <raingomm@gmail.com>
Date: Tue, 2 May 2017 12:57:54 -0700
Subject: [PATCH 0930/1563] Update README.md for graph transform (#8765)

* Update README.md

* Update README.md

keep the remove identity, but make a note about control flows

* Update README.md

clean up
---
 tensorflow/tools/graph_transforms/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index edf20e4782..9bb438fa71 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -94,7 +94,10 @@ transforms to modify the graph with. The transforms are given as a list of
 names, and can each have arguments themselves. These transforms define the
 pipeline of modifications that are applied in order to produce the output.
 Sometimes you need some transforms to happen before others, and the ordering
-within the list lets you specify which happen first.
+within the list lets you specify which happen first. 
+Note that the optimization 
+`remove_nodes(op=Identity, op=CheckNumerics)` will break the model with control 
+flow operations, such as `tf.cond`, `tf.map_fn`, and `tf.while`.
 
 ## Inspecting Graphs
 
-- 
GitLab


From 0c372ad452e3d65aa57e7e8c3fef51846383c10a Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 2 May 2017 11:48:29 -0800
Subject: [PATCH 0931/1563] Properly track the persistent memory usage of
 lookup tables. Change: 154866686

---
 tensorflow/core/grappler/clusters/BUILD       |   1 +
 .../core/grappler/clusters/single_machine.cc  |  48 +++++++-
 .../core/grappler/clusters/single_machine.h   |   2 +
 .../grappler/clusters/single_machine_test.cc  | 115 ++++++++++++++++++
 tensorflow/core/kernels/lookup_table_op.h     |  13 +-
 5 files changed, 171 insertions(+), 8 deletions(-)

diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index 34ad404856..b48025b86f 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -58,6 +58,7 @@ cc_library(
         "//tensorflow/core:core_cpu",
         "//tensorflow/core:direct_session",
         "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:utils",
         "//tensorflow/core/kernels:ops_util",
     ],
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 09c8d55efd..abb9e4245e 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include <memory>
 
 #include "tensorflow/cc/training/queue_runner.h"
+#include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/kernels/ops_util.h"
 #include "tensorflow/core/lib/core/errors.h"
@@ -111,6 +112,8 @@ Status SingleMachine::Run(const GraphDef& graph_def,
         for (auto node : *init_metadata_.mutable_cost_graph()->mutable_node()) {
           node.clear_compute_cost();
         }
+        // Also clear the timeline to save memory
+        init_metadata_.clear_step_stats();
       }
       for (int i = 0; i < queue_runner_defs_.size(); ++i) {
         std::unique_ptr<QueueRunner> queue_runner;
@@ -133,15 +136,17 @@ Status SingleMachine::Run(const GraphDef& graph_def,
     }
   }
 
-  TF_RETURN_IF_ERROR(RunWithTimeout(feed, fetch, metadata));
-
   if (metadata) {
-    // Add the costs of initialization and the queue runners.
-    metadata->MergeFrom(init_metadata_);
-    return coordinator_->ExportCostGraph(metadata->mutable_cost_graph());
+    TF_RETURN_IF_ERROR(RunWithTimeout(feed, fetch, metadata));
+    // Merge the costs of the initialization and the queue runners.
+    CostGraphDef queue_costs;
+    TF_RETURN_IF_ERROR(coordinator_->ExportCostGraph(&queue_costs));
+    MergeCosts(metadata->mutable_cost_graph(), init_metadata_.cost_graph(),
+               queue_costs);
   } else {
-    return Status::OK();
+    return RunWithTimeout(feed, fetch, nullptr);
   }
+  return Status::OK();
 }
 
 Status SingleMachine::RunWithTimeout(
@@ -249,5 +254,36 @@ Status SingleMachine::ResetSession() {
   return Status::OK();
 }
 
+void SingleMachine::MergeCosts(CostGraphDef* graph_costs,
+                               const CostGraphDef& init_costs,
+                               const CostGraphDef& queue_costs) {
+  graph_costs->mutable_node()->Reserve(graph_costs->node_size() +
+                                       init_costs.node_size() +
+                                       queue_costs.node_size());
+  std::unordered_set<string> nodes_seen;
+  for (const auto& node : graph_costs->node()) {
+    nodes_seen.insert(node.name());
+  }
+
+  // The costs obtained by running the main graph could be more stable than
+  // the one we get from the queue runners since the queue runners run
+  // asynchronously.
+  for (const auto& node : queue_costs.node()) {
+    if (nodes_seen.find(node.name()) != nodes_seen.end()) {
+      continue;
+    }
+    graph_costs->add_node()->MergeFrom(node);
+  }
+
+  // Don't overwrite the costs with that generated during initialization since
+  // these are possibly outdated.
+  for (const auto& node : init_costs.node()) {
+    if (nodes_seen.find(node.name()) != nodes_seen.end()) {
+      continue;
+    }
+    graph_costs->add_node()->MergeFrom(node);
+  }
+}
+
 }  // namespace grappler
 }  // namespace tensorflow
diff --git a/tensorflow/core/grappler/clusters/single_machine.h b/tensorflow/core/grappler/clusters/single_machine.h
index f69b11df5d..f2773376e4 100644
--- a/tensorflow/core/grappler/clusters/single_machine.h
+++ b/tensorflow/core/grappler/clusters/single_machine.h
@@ -47,6 +47,8 @@ class SingleMachine : public Cluster {
                         RunMetadata* run_metadata, int64 timeout_s);
   Status ResetSession();
   Status CloseSession(bool use_timeout);
+  void MergeCosts(CostGraphDef* graph_costs, const CostGraphDef& init_costs,
+                  const CostGraphDef& queue_costs);
 
   const int num_gpus_;
   std::unique_ptr<Session> session_;
diff --git a/tensorflow/core/grappler/clusters/single_machine_test.cc b/tensorflow/core/grappler/clusters/single_machine_test.cc
index 0572aa04be..17db48817e 100644
--- a/tensorflow/core/grappler/clusters/single_machine_test.cc
+++ b/tensorflow/core/grappler/clusters/single_machine_test.cc
@@ -159,6 +159,121 @@ TEST_F(SingleMachineTest, InitializationMemory) {
   EXPECT_TRUE(found);
 }
 
+namespace {
+template <class T>
+inline void SetNodeAttr(const string& key, const T& value, NodeDef* node) {
+  AttrValue attr_value;
+  SetAttrValue(value, &attr_value);
+  auto* attr_map = node->mutable_attr();
+  (*attr_map)[key] = attr_value;
+}
+template <>
+inline void SetNodeAttr(const string& key, const Tensor& tensor,
+                        NodeDef* node) {
+  TensorProto tensor_proto;
+  tensor.AsProtoTensorContent(&tensor_proto);
+  SetNodeAttr(key, tensor_proto, node);
+}
+
+}  // namespace
+
+TEST_F(SingleMachineTest, PersistentMemory) {
+  // Build a hashtable and its initialization graph.
+  GrapplerItem item;
+  const DataType key_dtype = DT_INT64;
+  const DataType data_dtype = DT_INT64;
+
+  NodeDef* hashtable_node = item.graph.add_node();
+  hashtable_node->set_op("HashTable");
+  hashtable_node->set_name("hash_table");
+  SetNodeAttr("key_dtype", key_dtype, hashtable_node);
+  SetNodeAttr("value_dtype", data_dtype, hashtable_node);
+
+  // Initial hashtable keys and values
+  NodeDef* keys_node = item.graph.add_node();
+  keys_node->set_op("Const");
+  keys_node->set_name("table_keys");
+  SetNodeAttr("dtype", key_dtype, keys_node);
+  Tensor keys(key_dtype, TensorShape{2});
+  keys.vec<int64>()(0) = 123;
+  keys.vec<int64>()(1) = 321;
+  SetNodeAttr("value", keys, keys_node);
+
+  NodeDef* values_node = item.graph.add_node();
+  values_node->set_op("Const");
+  values_node->set_name("table_values");
+  SetNodeAttr("dtype", data_dtype, values_node);
+  Tensor values(data_dtype, TensorShape{2});
+  values.vec<int64>()(0) = 789;
+  values.vec<int64>()(1) = 987;
+  SetNodeAttr("value", values, values_node);
+
+  // InitializeTable node
+  NodeDef* init_table_node = item.graph.add_node();
+  init_table_node->set_op("InitializeTable");
+  init_table_node->set_name("initialize_table");
+  SetNodeAttr("Tkey", key_dtype, init_table_node);
+  SetNodeAttr("Tval", data_dtype, init_table_node);
+  *init_table_node->add_input() = "hash_table";
+  *init_table_node->add_input() = "table_keys";
+  *init_table_node->add_input() = "table_values";
+  item.init_ops.push_back(init_table_node->name());
+
+  // Key to lookup
+  NodeDef* query_node = item.graph.add_node();
+  query_node->set_op("Const");
+  query_node->set_name("query");
+  SetNodeAttr("dtype", key_dtype, query_node);
+  Tensor query(key_dtype, TensorShape({}));
+  query.flat<int64>()(0) = 0;
+  SetNodeAttr("value", query, query_node);
+
+  // Default return value of hashtable lookup
+  NodeDef* default_value_node = item.graph.add_node();
+  default_value_node->set_op("Const");
+  default_value_node->set_name("default_table_value");
+  SetNodeAttr("dtype", data_dtype, default_value_node);
+  Tensor dflt(data_dtype, TensorShape({}));
+  dflt.flat<int64>()(0) = 456;
+  SetNodeAttr("value", dflt, default_value_node);
+
+  // HashTable lookup node
+  NodeDef* lookup_node = item.graph.add_node();
+  lookup_node->set_op("LookupTableFind");
+  lookup_node->set_name("table_lookup");
+  SetNodeAttr("Tin", key_dtype, lookup_node);
+  SetNodeAttr("Tout", data_dtype, lookup_node);
+  *lookup_node->add_input() = "hash_table";
+  *lookup_node->add_input() = "query";
+  *lookup_node->add_input() = "default_table_value";
+  item.fetch.push_back(lookup_node->name());
+
+  // Run the graph
+  TF_CHECK_OK(cluster_->Initialize(item));
+  RunMetadata metadata;
+  TF_CHECK_OK(cluster_->Run(item.graph, item.feed, item.fetch, &metadata));
+
+  // Check the cost model.
+  bool found_table_init = false;
+  bool found_hashtable = false;
+  for (const auto& node : metadata.cost_graph().node()) {
+    if (node.name() == "hash_table") {
+      found_hashtable = true;
+      // Persistent memory usage should be 0 since it's recorded as part of the
+      // initialize_table op.
+      EXPECT_EQ(0, node.host_persistent_memory_size());
+      EXPECT_EQ(0, node.device_persistent_memory_size());
+    } else if (node.name() == "initialize_table") {
+      found_table_init = true;
+      // Persistent memory should hold 2 keys and 2 values.
+      EXPECT_LE(4 * sizeof(int64), node.host_persistent_memory_size());
+      EXPECT_EQ(0, node.device_persistent_memory_size());
+    }
+  }
+  EXPECT_TRUE(found_table_init);
+  EXPECT_TRUE(found_hashtable);
+}
+
 }  // namespace
 }  // namespace grappler
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/lookup_table_op.h b/tensorflow/core/kernels/lookup_table_op.h
index 4cd25a3cc6..ff23a09a24 100644
--- a/tensorflow/core/kernels/lookup_table_op.h
+++ b/tensorflow/core/kernels/lookup_table_op.h
@@ -64,8 +64,8 @@ class LookupTableOp : public OpKernel {
         return ctx->status();
       }
       if (ctx->track_allocations()) {
-        ctx->record_device_persistent_memory_allocation(
-            container->MemoryUsed());
+        ctx->record_host_persistent_memory_allocation(
+            container->MemoryUsed() + table_handle_.AllocatedBytes());
       }
       *ret = container;
       return Status::OK();
@@ -225,6 +225,15 @@ class HashTable : public InitializableLookupTable {
     return Status::OK();
   }
 
+  int64 MemoryUsed() const override {
+    if (table_) {
+      const int64 num_elements = table_->size();
+      return num_elements * (sizeof(K) + sizeof(V));
+    } else {
+      return 0;
+    }
+  }
+
  private:
   std::unique_ptr<std::unordered_map<K, V>> table_;
 };
-- 
GitLab


From 498565a68898b4ce0a696e24fc36a52792141631 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 2 May 2017 11:48:51 -0800
Subject: [PATCH 0932/1563] Reset the inputs to ShapeRefiner::RunShapeFn so
 that it behaves the same every time it's called. To properly handle queues
 that have populated by several enqueue ops, merge the shapes of the inputs to
 all the enqueue ops before calling
 InferenceContext::set_output_handle_shape(). This ensures that we detect
 incorrect queue setups (where the 2 enqueue ops might generate tensors with
 incompatible shapes), and that we take all the known shape information
 instead of that of just one of the enqueue ops. Change: 154866747

---
 .../core/common_runtime/shape_refiner.cc      |  2 ++
 .../core/grappler/costs/graph_properties.cc   | 21 ++++++++++------
 .../grappler/costs/graph_properties_test.cc   | 25 +++++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index 828297a1ab..8eb383a14f 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -468,6 +468,8 @@ Status ShapeRefiner::RunShapeFn(const Node* node,
   std::vector<ShapeHandle> input_tensors_as_shapes;
 
   // Run the shape inference function, and return if there was an error.
+  c->set_input_tensors(input_tensors);
+  c->set_input_tensors_as_shapes(input_tensors_as_shapes);
   if (op_reg_data->shape_inference_fn) {
     TF_RETURN_IF_ERROR(c->Run(op_reg_data->shape_inference_fn));
   } else {
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index ad8f4f3f7c..31c1043ae6 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -60,8 +60,9 @@ Status GraphProperties::InferStatically() {
       if (!qctx) {
         continue;
       }
-      shape_inference::ShapeHandle data_shp = qctx->output_handle_shape(0);
-      if (qctx->FullyDefined(data_shp)) {
+      DataType queue_type = qctx->output_handle_dtype(0);
+      shape_inference::ShapeHandle queue_shp = qctx->output_handle_shape(0);
+      if (qctx->FullyDefined(queue_shp) && queue_type != DT_INVALID) {
         continue;
       }
 
@@ -73,16 +74,20 @@ Status GraphProperties::InferStatically() {
         if (node->type_string().find("Enqueue") != std::string::npos) {
           if (ctx->num_inputs() == 2) {
             const DataType dtype = node->input_type(1);
-            shape_inference::ShapeHandle shp = ctx->input(1);
-            shape_inference::ShapeHandle refined;
-            TF_RETURN_IF_ERROR(qctx->Merge(shp, data_shp, &refined));
-            if (qctx->set_output_handle_shape(0, refined) ||
-                qctx->set_output_handle_dtype(0, dtype)) {
-              new_shapes.push(qnode);
+            if (queue_type == DT_INVALID) {
+              queue_type = dtype;
+            } else {
+              CHECK_EQ(queue_type, dtype);
             }
+            shape_inference::ShapeHandle shp = ctx->input(1);
+            TF_RETURN_IF_ERROR(qctx->Merge(queue_shp, shp, &queue_shp));
           }
         }
       }
+      if (qctx->set_output_handle_dtype(0, queue_type) ||
+          qctx->set_output_handle_shape(0, queue_shp)) {
+        new_shapes.push(qnode);
+      }
     }
     // Propagate the shapes in the transitive fan-out of the queue.
     done = new_shapes.empty();
diff --git a/tensorflow/core/grappler/costs/graph_properties_test.cc b/tensorflow/core/grappler/costs/graph_properties_test.cc
index 1eff52ba0e..94b809dc44 100644
--- a/tensorflow/core/grappler/costs/graph_properties_test.cc
+++ b/tensorflow/core/grappler/costs/graph_properties_test.cc
@@ -177,6 +177,19 @@ TEST_F(GraphPropertiesTest, Queues) {
   auto dequeue2 =
       ops::QueueDequeue(root.WithOpName("Dequeue2"), q2, {DataType::DT_FLOAT});
 
+  auto q3 =
+      ops::RandomShuffleQueue(root.WithOpName("Queue3"), {DataType::DT_FLOAT});
+  auto dequeue3 =
+      ops::QueueDequeue(root.WithOpName("Dequeue3"), q3, {DataType::DT_FLOAT});
+
+  auto q4 =
+      ops::RandomShuffleQueue(root.WithOpName("Queue4"), {DataType::DT_FLOAT});
+  auto enqueue4 = ops::QueueEnqueue(root.WithOpName("Enqueue4"), q4, {square2});
+  auto enqueue4_2 =
+      ops::QueueEnqueue(root.WithOpName("Enqueue4_2"), q4, {dequeue3[0]});
+  auto dequeue4 =
+      ops::QueueDequeue(root.WithOpName("Dequeue4"), q4, {DataType::DT_FLOAT});
+
   GrapplerItem item;
   TF_CHECK_OK(root.ToGraphDef(&item.graph));
 
@@ -200,6 +213,18 @@ TEST_F(GraphPropertiesTest, Queues) {
   EXPECT_EQ(2, prop2.shape().dim_size());
   EXPECT_EQ(3, prop2.shape().dim(0).size());
   EXPECT_EQ(7, prop2.shape().dim(1).size());
+
+  // The dequeue3 op shape is unknown. The square2 op shape is known. Verify
+  // that we merge the 2 properly to determine the shape of the data coming out
+  // of the queue.
+  const auto props4 = properties.GetOutputProperties("Dequeue4");
+  EXPECT_EQ(1, props4.size());
+  const OpInfo::TensorProperties& prop4 = props4[0];
+  EXPECT_EQ(DT_FLOAT, prop4.dtype());
+  EXPECT_FALSE(prop4.shape().unknown_rank());
+  EXPECT_EQ(2, prop4.shape().dim_size());
+  EXPECT_EQ(3, prop4.shape().dim(0).size());
+  EXPECT_EQ(7, prop4.shape().dim(1).size());
 }
 
 }  // namespace
-- 
GitLab


From fc407cbcc0ce5d5f4e8553f5aaaaaa263d318eeb Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 12:00:16 -0800
Subject: [PATCH 0933/1563] Making sure an error message will be produced by
 session_manager when a non-tensor object is passed in. Otherwise the 'name'
 property is missing. Change: 154868022

---
 tensorflow/python/training/session_manager.py | 24 +++++++++++++++----
 .../python/training/session_manager_test.py   | 17 +++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/training/session_manager.py b/tensorflow/python/training/session_manager.py
index 6bcc6e25c3..a13b6dd976 100644
--- a/tensorflow/python/training/session_manager.py
+++ b/tensorflow/python/training/session_manager.py
@@ -27,6 +27,23 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import saver as saver_mod
 
 
+def _maybe_name(obj):
+  """Returns object name if it has one, or a message otherwise.
+
+  This is useful for names that apper in error messages.
+  Args:
+    obj: Object to get the name of.
+  Returns:
+    name, "None", or a "no name" message.
+  """
+  if obj is None:
+    return "None"
+  elif hasattr(obj, "name"):
+    return obj.name
+  else:
+    return "<no name for %s>" % type(obj)
+
+
 class SessionManager(object):
   """Training helper that restores from checkpoint and creates session.
 
@@ -267,8 +284,8 @@ class SessionManager(object):
     if not local_init_success:
       raise RuntimeError(
           "Init operations did not make model ready for local_init.  "
-          "Init op: %s, init fn: %s, error: %s" % ("None" if init_op is None
-                                                   else init_op.name, init_fn,
+          "Init op: %s, init fn: %s, error: %s" % (_maybe_name(init_op),
+                                                   init_fn,
                                                    msg))
 
     is_ready, msg = self._model_ready(sess)
@@ -276,8 +293,7 @@ class SessionManager(object):
       raise RuntimeError(
           "Init operations did not make model ready.  "
           "Init op: %s, init fn: %s, local_init_op: %s, error: %s" %
-          (None if init_op is None else init_op.name, init_fn,
-           self._local_init_op, msg))
+          (_maybe_name(init_op), init_fn, self._local_init_op, msg))
     return sess
 
   def recover_session(self,
diff --git a/tensorflow/python/training/session_manager_test.py b/tensorflow/python/training/session_manager_test.py
index 246e95110a..4dc1d5abb7 100644
--- a/tensorflow/python/training/session_manager_test.py
+++ b/tensorflow/python/training/session_manager_test.py
@@ -497,6 +497,23 @@ class SessionManagerTest(test.TestCase):
                                    "Init operations did not make model ready"):
         sm2.prepare_session("", init_op=v.initializer)
 
+  def testPrepareSessionDidNotInitLocalVariableList(self):
+    with ops.Graph().as_default():
+      v = variables.Variable(1, name="v")
+      w = variables.Variable(
+          v,
+          trainable=False,
+          collections=[ops.GraphKeys.LOCAL_VARIABLES],
+          name="w")
+      with self.test_session():
+        self.assertEqual(False, variables.is_variable_initialized(v).eval())
+        self.assertEqual(False, variables.is_variable_initialized(w).eval())
+      sm2 = session_manager.SessionManager(
+          ready_op=variables.report_uninitialized_variables())
+      with self.assertRaisesRegexp(RuntimeError,
+                                   "Init operations did not make model ready"):
+        sm2.prepare_session("", init_op=[v.initializer])
+
   def testPrepareSessionWithReadyNotReadyForLocal(self):
     with ops.Graph().as_default():
       v = variables.Variable(1, name="v")
-- 
GitLab


From 867d407d98bca274db9a574cfb1877be7baad19c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 12:03:34 -0800
Subject: [PATCH 0934/1563] Don't needlessly synchronize the CUDA stream in
 CropAndResize. Make the op Async so we don't block an executor thread while
 waiting for the result of the box bounds check to be copied back to the host.
 Change: 154868460

---
 tensorflow/core/kernels/crop_and_resize_op.cc | 565 ++++++++++--------
 tensorflow/core/kernels/crop_and_resize_op.h  |   8 +-
 .../core/kernels/crop_and_resize_op_gpu.cu.cc |   2 +-
 .../core/kernels/crop_and_resize_op_test.cc   |   6 +-
 4 files changed, 330 insertions(+), 251 deletions(-)

diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index 746fe63e2a..1c7afcf866 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -19,6 +19,9 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/crop_and_resize_op.h"
 
+#include <functional>
+#include <string>
+
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -26,10 +29,13 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/types.h"
 
 #if GOOGLE_CUDA
+#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
 #include "tensorflow/core/platform/stream_executor.h"
 #endif  // GOOGLE_CUDA
 
@@ -37,41 +43,67 @@ namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
+using Callback = std::function<void()>;
+
+namespace {
 
-static inline void ParseAndCheckBoxSizes(OpKernelContext* context,
-                                         const Tensor& boxes,
-                                         const Tensor& box_ind,
-                                         int* num_boxes) {
-  if (boxes.NumElements() == 0 && box_ind.NumElements() == 0) {
+static inline Status ParseAndCheckBoxSizes(const Tensor& boxes,
+                                           const Tensor& box_index,
+                                           int* num_boxes) {
+  if (boxes.NumElements() == 0 && box_index.NumElements() == 0) {
     *num_boxes = 0;
-    return;
+    return Status::OK();
   }
   // The shape of 'boxes' is [num_boxes, 4].
-  OP_REQUIRES(context, boxes.dims() == 2,
-              errors::InvalidArgument("boxes must be 2-D",
-                                      boxes.shape().DebugString()));
+  if (boxes.dims() != 2) {
+    return errors::InvalidArgument("boxes must be 2-D",
+                                   boxes.shape().DebugString());
+  }
   *num_boxes = boxes.dim_size(0);
-  OP_REQUIRES(context, boxes.dim_size(1) == 4,
-              errors::InvalidArgument("boxes must have 4 columns"));
-
-  // The shape of 'box_ind' is [num_boxes].
-  OP_REQUIRES(context, box_ind.dims() == 1,
-              errors::InvalidArgument("box_ind must be 1-D",
-                                      box_ind.shape().DebugString()));
-  OP_REQUIRES(context, box_ind.dim_size(0) == *num_boxes,
-              errors::InvalidArgument("box_ind has incompatible shape"));
+  if (boxes.dim_size(1) != 4) {
+    return errors::InvalidArgument("boxes must have 4 columns");
+  }
+  // The shape of 'box_index' is [num_boxes].
+  if (box_index.dims() != 1) {
+    return errors::InvalidArgument("box_index must be 1-D",
+                                   box_index.shape().DebugString());
+  }
+  if (box_index.dim_size(0) != *num_boxes) {
+    return errors::InvalidArgument("box_index has incompatible shape");
+  }
+  return Status::OK();
 }
 
-// Verifies that all values in box_ind are in [0, batch).
+// Conditionally calls the compute callback if all values in box_index are in
+// [0, batch_size) then calls done.
 template <typename Device>
-inline void CheckValidBoxInd(
-    OpKernelContext* context,
-    typename TTypes<int32, 1>::ConstTensor box_ind_data, int batch);
+inline void RunIfBoxIndexIsValid(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done);
+
+// Specialization of CheckValidBoxIndex for a CPUDevice.
+template <>
+inline void RunIfBoxIndexIsValid<CPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done) {
+  const int num_boxes = box_index.dimension(0);
+  for (int b = 0; b < num_boxes; ++b) {
+    OP_REQUIRES_ASYNC(
+        context, FastBoundsCheck(box_index(b), batch_size),
+        errors::OutOfRange("box_index has values outside [0, batch_size)"),
+        done);
+  }
+  compute();
+  done();
+}
+
+}  // namespace
 
 template <typename Device, typename T>
-class CropAndResizeOp : public OpKernel {
+class CropAndResizeOp : public AsyncOpKernel {
  public:
-  explicit CropAndResizeOp(OpKernelConstruction* context) : OpKernel(context) {
+  explicit CropAndResizeOp(OpKernelConstruction* context)
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
@@ -80,69 +112,77 @@ class CropAndResizeOp : public OpKernel {
                                              &extrapolation_value_));
   }
 
-  void Compute(OpKernelContext* context) override {
-    // The shape of 'image' is [batch, image_height, image_width, channels].
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
+    // The shape of 'image' is [batch_size, image_height, image_width,
+    // channels].
     const Tensor& image = context->input(0);
-    OP_REQUIRES(context, image.dims() == 4,
-                errors::InvalidArgument("input image must be 4-D",
-                                        image.shape().DebugString()));
-
-    const int batch = image.dim_size(0);
-    const int image_height = image.dim_size(1);
-    const int image_width = image.dim_size(2);
-    const int depth = image.dim_size(3);
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-
     // The shape of 'boxes' is [num_boxes, 4].
     const Tensor& boxes = context->input(1);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(2);
-
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
-
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(2);
     // The shape of 'crop_size' is [2].
     const Tensor& crop_size = context->input(3);
 
-    OP_REQUIRES(context, crop_size.dims() == 1,
-                errors::InvalidArgument("crop_size must be 1-D",
-                                        crop_size.shape().DebugString()));
-    OP_REQUIRES(context, crop_size.dim_size(0) == 2,
-                errors::InvalidArgument("crop_size must have two elements",
-                                        crop_size.shape().DebugString()));
-
+    // Validate inputs dimensions.
+    OP_REQUIRES_ASYNC(context, image.dims() == 4,
+                      errors::InvalidArgument("input image must be 4-D",
+                                              image.shape().DebugString()),
+                      done);
+    const int batch_size = image.dim_size(0);
+    const int image_height = image.dim_size(1);
+    const int image_width = image.dim_size(2);
+    const int depth = image.dim_size(3);
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    int num_boxes = 0;
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
+
+    OP_REQUIRES_ASYNC(context, crop_size.dims() == 1,
+                      errors::InvalidArgument("crop_size must be 1-D",
+                                              crop_size.shape().DebugString()),
+                      done);
+    OP_REQUIRES_ASYNC(
+        context, crop_size.dim_size(0) == 2,
+        errors::InvalidArgument("crop_size must have two elements",
+                                crop_size.shape().DebugString()),
+        done);
+
+    // Copy and validate crop sizes.
     auto crop_size_vec = crop_size.vec<int32>();
     const int crop_height = internal::SubtleMustCopy(crop_size_vec(0));
     const int crop_width = internal::SubtleMustCopy(crop_size_vec(1));
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("crop dimensions must be positive"));
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("crop dimensions must be positive"), done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(
+    OP_REQUIRES_OK_ASYNC(
         context,
         context->allocate_output(
             0, TensorShape({num_boxes, crop_height, crop_width, depth}),
-            &output));
-
-    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<float, 4>::Tensor crops_data = output->tensor<float, 4>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResize<Device, T>()(
-        context->eigen_device<Device>(), image_data, boxes_data, box_ind_data,
-        extrapolation_value_, crops_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeKernel."));
-    }
+            &output),
+        done);
+
+    auto compute_callback = [this, context, output]() {
+      const Tensor& image = context->input(0);
+      const Tensor& boxes = context->input(1);
+      const Tensor& box_index = context->input(2);
+      const bool status = functor::CropAndResize<Device, T>()(
+          context->eigen_device<Device>(), image.tensor<T, 4>(),
+          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
+          extrapolation_value_, output->tensor<float, 4>());
+      if (!status) {
+        context->SetStatus(
+            errors::Internal("Failed launch CropAndResizeKernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 
  private:
@@ -155,10 +195,10 @@ template <typename T>
 struct CropAndResize<CPUDevice, T> {
   bool operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   float extrapolation_value,
                   typename TTypes<float, 4>::Tensor crops) {
-    const int batch = image.dimension(0);
+    const int batch_size = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -173,8 +213,8 @@ struct CropAndResize<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -235,89 +275,94 @@ struct CropAndResize<CPUDevice, T> {
     return true;
   }
 };
+
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradImageOp : public OpKernel {
+class CropAndResizeGradImageOp : public AsyncOpKernel {
  public:
   explicit CropAndResizeGradImageOp(OpKernelConstruction* context)
-      : OpKernel(context) {
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void Compute(OpKernelContext* context) override {
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
-
-    OP_REQUIRES(context, grads.dims() == 4,
-                errors::InvalidArgument("grads image must be 4-D",
-                                        grads.shape().DebugString()));
-    const int crop_height = grads.dim_size(1);
-    const int crop_width = grads.dim_size(2);
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("grads dimensions must be positive"));
-
     // The shape of 'boxes' is [num_boxes, 4].
     const Tensor& boxes = context->input(1);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(2);
-
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
-
-    OP_REQUIRES(
-        context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"));
-
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(2);
     // The shape of 'image_size' is [4].
     const Tensor& image_size = context->input(3);
-    OP_REQUIRES(context, image_size.dims() == 1,
-                errors::InvalidArgument("image_size must be 1-D",
-                                        image_size.shape().DebugString()));
-    OP_REQUIRES(context, image_size.dim_size(0) == 4,
-                errors::InvalidArgument("image_size must have 4 elements",
-                                        image_size.shape().DebugString()));
 
+    // Validate input shapes.
+    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
+                      errors::InvalidArgument("grads image must be 4-D",
+                                              grads.shape().DebugString()),
+                      done);
+    const int crop_height = grads.dim_size(1);
+    const int crop_width = grads.dim_size(2);
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("grads dimensions must be positive"), done);
+    int num_boxes = 0;
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
+    OP_REQUIRES_ASYNC(
+        context, grads.dim_size(0) == num_boxes,
+        errors::InvalidArgument("boxes and grads have incompatible shape"),
+        done);
+
+    OP_REQUIRES_ASYNC(context, image_size.dims() == 1,
+                      errors::InvalidArgument("image_size must be 1-D",
+                                              image_size.shape().DebugString()),
+                      done);
+    OP_REQUIRES_ASYNC(context, image_size.dim_size(0) == 4,
+                      errors::InvalidArgument("image_size must have 4 elements",
+                                              image_size.shape().DebugString()),
+                      done);
     auto image_size_vec = image_size.vec<int32>();
-    const int batch = internal::SubtleMustCopy(image_size_vec(0));
+    const int batch_size = internal::SubtleMustCopy(image_size_vec(0));
     const int image_height = internal::SubtleMustCopy(image_size_vec(1));
     const int image_width = internal::SubtleMustCopy(image_size_vec(2));
     const int depth = internal::SubtleMustCopy(image_size_vec(3));
-
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-    OP_REQUIRES(
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    OP_REQUIRES_ASYNC(
         context, grads.dim_size(3) == depth,
-        errors::InvalidArgument("image_size and grads are incompatible"));
+        errors::InvalidArgument("image_size and grads are incompatible"), done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(
-        context, context->allocate_output(
-                     0, TensorShape({batch, image_height, image_width, depth}),
-                     &output));
-
-    typename TTypes<float, 4>::ConstTensor grads_data =
-        grads.tensor<float, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<T, 4>::Tensor output_data = output->tensor<T, 4>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResizeBackpropImage<Device, T>()(
-        context->eigen_device<Device>(), grads_data, boxes_data, box_ind_data,
-        output_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeBackpropImageKernel."));
-    }
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        context->allocate_output(
+            0, TensorShape({batch_size, image_height, image_width, depth}),
+            &output),
+        done);
+
+    auto compute_callback = [context, output]() {
+      const Tensor& grads = context->input(0);
+      const Tensor& boxes = context->input(1);
+      const Tensor& box_index = context->input(2);
+      const bool status = functor::CropAndResizeBackpropImage<Device, T>()(
+          context->eigen_device<Device>(), grads.tensor<float, 4>(),
+          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
+          output->tensor<T, 4>());
+      if (!status) {
+        context->SetStatus(errors::Internal(
+            "Failed launch CropAndResizeBackpropImage kernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 };
 
@@ -328,9 +373,9 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
   bool operator()(const CPUDevice& d,
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   typename TTypes<T, 4>::Tensor grads_image) {
-    const int batch = grads_image.dimension(0);
+    const int batch_size = grads_image.dimension(0);
     const int image_height = grads_image.dimension(1);
     const int image_width = grads_image.dimension(2);
 
@@ -347,8 +392,8 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -399,83 +444,90 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
     return true;
   }
 };
+
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradBoxesOp : public OpKernel {
+class CropAndResizeGradBoxesOp : public AsyncOpKernel {
  public:
   explicit CropAndResizeGradBoxesOp(OpKernelConstruction* context)
-      : OpKernel(context) {
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void Compute(OpKernelContext* context) override {
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
+    // The shape of 'boxes' is [num_boxes, 4].
+    const Tensor& boxes = context->input(2);
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(3);
+    // The shape of 'image' is [batch_size, image_height, image_width, depth].
+    const Tensor& image = context->input(1);
 
-    OP_REQUIRES(context, grads.dims() == 4,
-                errors::InvalidArgument("grads image must be 4-D",
-                                        grads.shape().DebugString()));
-
+    // Validate input shapes.
+    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
+                      errors::InvalidArgument("grads image must be 4-D",
+                                              grads.shape().DebugString()),
+                      done);
     const int crop_height = grads.dim_size(1);
     const int crop_width = grads.dim_size(2);
     const int depth = grads.dim_size(3);
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("grads dimensions must be positive"));
-
-    // The shape of 'image' is [batch, image_height, image_width, depth].
-    const Tensor& image = context->input(1);
-    OP_REQUIRES(context, image.dims() == 4,
-                errors::InvalidArgument("input image must be 4-D",
-                                        image.shape().DebugString()));
-
-    const int batch = image.dim_size(0);
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("grads dimensions must be positive"), done);
+
+    OP_REQUIRES_ASYNC(context, image.dims() == 4,
+                      errors::InvalidArgument("input image must be 4-D",
+                                              image.shape().DebugString()),
+                      done);
+    const int batch_size = image.dim_size(0);
     const int image_height = image.dim_size(1);
     const int image_width = image.dim_size(2);
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-    OP_REQUIRES(context, image.dim_size(3) == depth,
-                errors::InvalidArgument("image, grads depth differ"));
-
-    // The shape of 'boxes' is [num_boxes, 4].
-    const Tensor& boxes = context->input(2);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(3);
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    OP_REQUIRES_ASYNC(context, image.dim_size(3) == depth,
+                      errors::InvalidArgument("image, grads depth differ"),
+                      done);
 
     int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
 
-    OP_REQUIRES(
+    OP_REQUIRES_ASYNC(
         context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"));
+        errors::InvalidArgument("boxes and grads have incompatible shape"),
+        done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->allocate_output(
-                                0, TensorShape({num_boxes, 4}), &output));
-
-    typename TTypes<float, 4>::ConstTensor grads_data =
-        grads.tensor<float, 4>();
-    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<float, 2>::Tensor output_data = output->tensor<float, 2>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
-        context->eigen_device<Device>(), grads_data, image_data, boxes_data,
-        box_ind_data, output_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeBackpropBoxesKernel."));
-    }
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        context->allocate_output(0, TensorShape({num_boxes, 4}), &output),
+        done);
+
+    auto compute_callback = [context, output]() {
+      const Tensor& grads = context->input(0);
+      const Tensor& image = context->input(1);
+      const Tensor& boxes = context->input(2);
+      const Tensor& box_index = context->input(3);
+      const bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
+          context->eigen_device<Device>(), grads.tensor<float, 4>(),
+          image.tensor<T, 4>(), boxes.tensor<float, 2>(),
+          box_index.tensor<int32, 1>(), output->tensor<float, 2>());
+      if (!status) {
+        context->SetStatus(errors::Internal(
+            "Failed launch CropAndResizeBackpropBoxes kernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 };
 
@@ -487,9 +539,9 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   typename TTypes<float, 2>::Tensor grads_boxes) {
-    const int batch = image.dimension(0);
+    const int batch_size = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -506,8 +558,8 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -589,30 +641,19 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
     return true;
   }
 };
-}  // namespace functor
 
-// Specialization of CheckValidBoxInd for a CPUDevice.
-template <>
-inline void CheckValidBoxInd<CPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch) {
-  const int num_boxes = box_ind.dimension(0);
-  for (int b = 0; b < num_boxes; ++b) {
-    OP_REQUIRES(context, box_ind(b) >= 0 && box_ind(b) < batch,
-                errors::OutOfRange("box_ind has values outside [0, batch)"));
-  }
-}
+}  // namespace functor
 
-#define REGISTER_KERNEL(T)                                         \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T")              \
-                              .HostMemory("crop_size"),            \
-                          CropAndResizeOp<CPUDevice, T>);          \
-                                                                   \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")           \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T"),             \
+#define REGISTER_KERNEL(T)                                \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResize")           \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<T>("T")     \
+                              .HostMemory("crop_size"),   \
+                          CropAndResizeOp<CPUDevice, T>); \
+                                                          \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")  \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<T>("T"),    \
                           CropAndResizeGradBoxesOp<CPUDevice, T>);
 
 TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNEL);
@@ -634,50 +675,86 @@ TF_CALL_double(REGISTER_KERNEL);
 
 #if GOOGLE_CUDA
 
-// Forward declaration of the CheckValidBoxIndHelper specialization for GPU.
+// Forward declaration of the CheckValidBoxIndexHelper specialization for GPU.
 namespace functor {
 template <>
-void CheckValidBoxIndHelper<GPUDevice>::operator()(
-    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch, typename TTypes<bool, 0>::Tensor isvalid);
-extern template struct CheckValidBoxIndHelper<GPUDevice>;
+void CheckValidBoxIndexHelper<GPUDevice>::operator()(
+    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, typename TTypes<bool, 0>::Tensor isvalid);
+extern template struct CheckValidBoxIndexHelper<GPUDevice>;
 }  // namespace functor
 
-// Specialization of CheckValidBoxInd for a GPUDevice.
+namespace {
+
+// Specialization of CheckValidBoxIndex for a GPUDevice.
 template <>
-inline void CheckValidBoxInd<GPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch) {
-  const int num_boxes = box_ind.dimension(0);
+inline void RunIfBoxIndexIsValid<GPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done) {
+  const int num_boxes = box_index.dimension(0);
   if (num_boxes == 0) {
+    compute();
+    done();
     return;
   }
-  Tensor isvalid_tensor;
-  OP_REQUIRES_OK(context,
-                 context->allocate_temp(DataTypeToEnum<bool>::value,
-                                        TensorShape({}), &isvalid_tensor));
 
-  typename TTypes<bool, 0>::Tensor isvalid = isvalid_tensor.tensor<bool, 0>();
+  Tensor isvalid_dev_tensor;
+  OP_REQUIRES_OK_ASYNC(
+      context,
+      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
+                             &isvalid_dev_tensor),
+      done);
+  typename TTypes<bool, 0>::Tensor isvalid_dev =
+      isvalid_dev_tensor.tensor<bool, 0>();
 
-  functor::CheckValidBoxIndHelper<GPUDevice>()(
-      context->eigen_device<GPUDevice>(), box_ind, batch, isvalid);
+  // Run the actual box check on the device.
+  functor::CheckValidBoxIndexHelper<GPUDevice>()(
+      context->eigen_device<GPUDevice>(), box_index, batch_size, isvalid_dev);
 
+  // Copy the result back to the host.
   auto* stream = context->op_device_context()->stream();
-  OP_REQUIRES(context, stream, errors::Internal("No GPU stream available."));
-
-  bool isvalid_host = false;
-  perftools::gputools::DeviceMemoryBase isvalid_gpu(isvalid.data(),
-                                                    sizeof(bool));
-  stream->ThenMemcpy(&isvalid_host, isvalid_gpu, sizeof(bool));
-  stream->BlockHostUntilDone();
-
-  OP_REQUIRES(context, stream->ok(),
-              errors::Internal("cudaMemcpy from device to host failed"));
-
-  OP_REQUIRES(context, isvalid_host,
-              errors::OutOfRange("box_ind has values outside [0, batch)"));
+  OP_REQUIRES_ASYNC(context, stream,
+                    errors::Internal("No GPU stream available."), done);
+  Tensor isvalid_host_tensor;
+  // Use pinned host memory on the host to avoid unnecessary
+  // synchronization.
+  AllocatorAttributes alloc_attr;
+  alloc_attr.set_on_host(true);
+  alloc_attr.set_gpu_compatible(true);
+  OP_REQUIRES_OK_ASYNC(
+      context,
+      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
+                             &isvalid_host_tensor, alloc_attr),
+      done);
+  typename TTypes<bool, 0>::Tensor isvalid_host =
+      isvalid_host_tensor.tensor<bool, 0>();
+
+  perftools::gputools::DeviceMemoryBase wrapped(isvalid_dev.data(),
+                                                sizeof(bool));
+  const bool status = stream
+                          ->ThenMemcpy(isvalid_host.data() /* destination */,
+                                       wrapped /* source */, sizeof(bool))
+                          .ok();
+  OP_REQUIRES_ASYNC(
+      context, status,
+      errors::Internal("Failed to launch copy of isvalid from device to host."),
+      done);
+
+  auto wrapped_callback = [context, isvalid_host, compute, done]() {
+    OP_REQUIRES_ASYNC(
+        context, isvalid_host(),
+        errors::OutOfRange("box_index has values outside [0, batch_size)"),
+        done);
+    compute();
+    done();
+  };
+
+  context->device()->tensorflow_gpu_device_info()->event_mgr->ThenExecute(
+      stream, wrapped_callback);
 }
 
+}  // namespace
+
 #define REGISTER_KERNEL(T)                                         \
   REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
                               .Device(DEVICE_GPU)                  \
diff --git a/tensorflow/core/kernels/crop_and_resize_op.h b/tensorflow/core/kernels/crop_and_resize_op.h
index 22df1bdd56..460dbad22b 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.h
+++ b/tensorflow/core/kernels/crop_and_resize_op.h
@@ -53,12 +53,12 @@ struct CropAndResizeBackpropBoxes {
 };
 
 template <typename Device>
-struct CheckValidBoxIndHelper {
-  // Checks if all values in box_ind are in [0, batch).
+struct CheckValidBoxIndexHelper {
+  // Checks if all values in box_index are in [0, batch).
   void operator()(const Device& d,
-                  typename TTypes<int32, 1>::ConstTensor box_ind, int batch,
+                  typename TTypes<int32, 1>::ConstTensor box_index, int batch,
                   typename TTypes<bool, 0>::Tensor isvalid) {
-    isvalid.device(d) = ((box_ind >= 0) && (box_ind < batch)).all();
+    isvalid.device(d) = ((box_index >= 0) && (box_index < batch)).all();
   }
 };
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
index 254475db46..c1235fda89 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
@@ -440,7 +440,7 @@ TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 
-template struct CheckValidBoxIndHelper<GPUDevice>;
+template struct CheckValidBoxIndexHelper<GPUDevice>;
 
 }  // namespace functor
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/crop_and_resize_op_test.cc b/tensorflow/core/kernels/crop_and_resize_op_test.cc
index 3a7f180598..d6139dae96 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_test.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_test.cc
@@ -251,7 +251,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(
-      StringPiece(s.ToString()).contains("box_ind has incompatible shape"))
+      StringPiece(s.ToString()).contains("box_index has incompatible shape"))
       << s;
 }
 
@@ -264,8 +264,10 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndex) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(StringPiece(s.ToString())
-                  .contains("box_ind has values outside [0, batch)"))
+                  .contains("box_index has values outside [0, batch_size)"))
       << s;
 }
 
+// TODO(zhengxq, rmlarsen): Add a benchmark.
+
 }  // namespace tensorflow
-- 
GitLab


From a8cf54a732d2385fa7b97495c73a91e4515e8d60 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Tue, 2 May 2017 13:00:15 -0800
Subject: [PATCH 0935/1563] Add contribution guidelines and standards section
 to CONTRIBUTING.md

Several parts are largely based on the post by @yaroslavvb at: #7443#issuecomment-279182613

Fixes #7443
Change: 154876045
---
 CONTRIBUTING.md | 137 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5ae5c0fbbc..c36ef1ecd3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,3 +27,140 @@ contributions, often because we probably won't get to them right now. If you
 decide to start on an issue, leave a comment so that other people know that
 you're working on it. If you want to help out, but not alone, use the issue
 comment thread to coordinate.
+
+### Contribution guidelines and standards
+
+Before sending your pull request for
+[review](https://github.com/tensorflow/tensorflow/pulls),
+make sure your changes are consistent with the guidelines and follow the
+TensorFlow coding style.
+
+#### General guidelines and philosophy for contribution
+
+* Include unit tests when you contribute new features, as they help to
+  a) prove that your code works correctly, b) guard against future breaking
+  changes to lower the maintenance cost.
+* Bug fixes also generally require unit tests, because the presense of bugs
+  usually indicates insufficient test coverage.
+* Keep API compatibility in mind when you change code in core TensorFlow,
+  e.g., code in [tensorflow/core](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/core) and  [tensorflow/python](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/python).
+  TensorFlow has reached version 1 and hence cannot make
+  non-backward-compatible API changes without a major release. Reviewers of your
+  pull request will comment on any API compatibility issues.
+* When you contribute a new feature to TensorFlow, the maintenance burden is (by
+  default) transferred to the TensorFlow team. This means that benefit of
+  contribution must be compared against the cost of maintaining the feature.
+* Full new features (e.g., a new op implementing a cutting-edge algorithm)
+  typically will live in
+  [tensorflow/contrib](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib)
+  to get some airtime before decision is made regarding whether they are to be
+  migrated to the core.
+
+#### License
+
+Include a license at the top of new files.
+
+* [C/C++ license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/framework/op.cc#L1)
+* [Python license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/ops/nn.py#L1)
+* [Java license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/java/src/main/java/org/tensorflow/Graph.java#L1)
+* [Go license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/go/operation.go#L1)
+* [Bash license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/ci_build/ci_sanity.sh#L2)
+* [HTML license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/dist/index.html#L2)
+* [JavaScript/TypeScript license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/components/tf_backend/backend.ts#L1)
+
+Bazel BUILD files also need to include a license section, e.g.,
+[BUILD example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/BUILD#L61).
+
+#### C++ coding style
+
+Changes to TensorFlow C++ code should conform to
+[Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html).
+
+Use `clang-tidy` to check your C/C++ changes. To install clang-tidy on ubuntu:16.04, do:
+
+```bash
+apt-get install -y clang-tidy
+```
+
+You can check a C/C++ file by doing:
+
+
+```bash
+clang-format <my_cc_file> --style=google > /tmp/my_cc_file.cc
+diff <my_cc_file> /tmp/my_cc_file.cc
+```
+
+#### Python coding style
+
+Changes to TensorFlow Python code should conform to
+[Google Python Style Guide](https://google.github.io/styleguide/pyguide.html)
+
+Use `pylint` to check your Python changes. To install `pylint` and
+retrieve TensorFlow's custom style definition:
+
+```bash
+pip install pylint
+wget -O /tmp/pylintrc https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/tools/ci_build/pylintrc
+```
+
+To check a file with `pylint`:
+
+```bash
+pylint --rcfile=/tmp/pylintrc myfile.py
+```
+
+#### Coding style for other languages
+
+* [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)
+* [Google JavaScript Style Guide](https://google.github.io/styleguide/jsguide.html)
+* [Google Shell Style Guide](https://google.github.io/styleguide/shell.xml)
+
+#### Running sanity check
+
+If you have Docker installed on your system, you can perform a sanity check on
+your changes by running the command:
+
+```bash
+tensorflow/tools/ci_build/ci_build.sh CPU tensorflow/tools/ci_build/ci_sanity.sh
+```
+
+This will catch most license, Python coding style and BUILD file issues that
+may exist in your changes.
+
+#### Running unit tests
+
+There are two ways to run TensorFlow unit tests.
+
+1. Using tools and libraries installed directly on your system.
+
+   Refer to the
+   [CPU-only developer Dockerfile](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/docker/Dockerfile.devel) and
+   [GPU developer Dockerfile](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/docker/Dockerfile.devel-gpu)
+   for the required packages. Alternatively, use the said
+   [Docker images](https://hub.docker.com/r/tensorflow/tensorflow/tags/), e.g.,
+   `tensorflow/tensorflow:nightly-devel` and `tensorflow/tensorflow:nightly-devel-gpu`
+   for development to avoid installing the packages directly on your system.
+
+   Once you have the packages installed, you can run a specific unit test in
+   bazel by doing as follows:
+
+   If the tests are to be run on GPU, add CUDA paths to LD_LIBRARY_PATH and add
+   the `cuda` option flag
+
+   ```bash
+   export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH"
+
+   export flags="--config=opt --config=cuda -k"
+   ```
+
+   For example, to run all tests under tensorflow/python, do:
+
+   ```bash
+   bazel test ${flags} //tensorflow/python/...
+   ```
+
+2. Using Docker and TensorFlow's CI scripts.
+
+   See
+   [TensorFlow Builds](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/tools/ci_build) for details.
+
-- 
GitLab


From 86b5d66d66d172a273929f0cda7087aa8c45697d Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Tue, 2 May 2017 13:03:41 -0800
Subject: [PATCH 0936/1563] Final draft Change: 154876563

---
 .../performance/performance_models.md         | 484 ++++++++----------
 1 file changed, 212 insertions(+), 272 deletions(-)

diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index 71c4e6cfe0..70c415a024 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -1,155 +1,109 @@
 # High-Performance Models
 
-TensorFlow is a powerful and flexible machine learning platform.
-It can be used to distribute model training and inference across a large number
-of machines and computation devices.
-
-Its software stack is made of a few layers:
-
-* a fast and powerful C++ core
-* low-level Python primitives that sit right above individual kernels
-* a diverse range of high-level libraries that aim to make building real models
-  easier
-
-There are many existing examples and tutorials that explain useful features in
-TensorFlow.  The goal of this set of scripts is to demonstrate that we can build
-flexible and powerful high-performance models using the low-level APIs.
-In the future, many of the high-performance primitives will be incorporated into
-high-level APIs, and made available to more users transparently.
-But meanwhile, we show that it is fairly easy for advanced users to build highly
-scalable models targeting different system types, network topologies, etc.
-
-We divide our effort to build high-performance models into three categories:
-
-1. A fast input pipeline to read data from disk, preprocess it, and make it
-   ready on the GPU.
-2. A high-throughput model that trains on GPU very efficiently.
-3. Fast variable and gradients distribution mechanisms that scale well across
-   many machines and computation devices.
+This document and accompanying
+[scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+detail how to build highly scalable models that target a variety of system types
+and network topologies. The techniques in this document utilize some low-level
+TensorFlow Python primitives. In the future, many of these techniques will be
+incorporated into high-level APIs.
 
 ## Input Pipeline
 
-The input pipeline is the part of a TensorFlow program that reads input data,
-shuffles it, and preprocesses it.
-
-Among the most important features to build a fast input pipeline:
-
-* Avoid using feed-dictionary to feed a large amount of data for each step.
-  * Instead, use reader ops to get data into TensorFlow directly.
-* Parallelize data processing.
-* Use software pipelining to feed data, so that data is available immediately
-  when needed.
-
-One way to implement software pipelining in TensorFlow is through
-`tf.FifoQueue`, and it is possible to parallelize data processing through
-`tf.train.queue_runner`, which uses Python threads as its underlying
-implementation.
-This lays the foundation for the current Inception input pipeline.
-This design is well built for feeding older generation of GPUs,
-but the overhead of Python threads is too large to feed newer GPUs that are four
-to five times faster.
-
-In this model, we explore an alternative design that uses the native
-parallelism in TensorFlow.  In our example of an image model input pipeline,
-there are a few important parts:
-
-* Choose and read the image files from the disk.
-* Decode the image data into images, transform and add distortion so they are
-ready to be used.
-* Organize the transformed images into a minibatch.
-* Transfer the images from CPU to GPU, so they are ready for model training.
-
-It is important to note that the dominant part of each stage can happen in
-parallel with that of other stages:
-the file IO uses DMA to transfer the data from hard disk to memory;
-image decoding, transformation and distortion are CPU-heavy;
-the data transfer from CPU to GPU uses the GPU's copy-engine unit;
-and the GPU kernels use the main SMs of the GPU.
-It is natural to cut our pipeline into those parts so they can run in parallel
-with each other.
-
-Also, as mentioned earlier, most of the current input pipeline heavily uses
-Python threads.  However, the large overhead introduced by Python threads
-severely limits its scalability when the newer GPUs are a lot faster; we can
-alleviate this by making a single `session.run` call execute all parts of the
-pipeline.
-
-### Parallelize IO Reads
-
-In this new model, we use the native parallelism in TensorFlow: TensorFlow
-subscribes to an eager-execution model, which means that when nodes in the graph
-became available, TensorFlow will try to execute as many of them as possible.
-
-In order to parallelize reading from hard disk, we use `data_flow_ops.RecordInput`
-in this model.
-Given a list of input files of TFRecords, `RecordInput` continuously reads
-records using background threads, placing the records into its own large,
-internal pool of records.
-When it is has loaded at least half of its capacity, it produces output tensors.
-
-Since this op has its internal threads, and is dominated by IO time that doesn’t
-consume much CPU time, it naturally runs in parallel with the rest of the model.
+The @{$performance_guide$Performance Guide} explains how to identify possible
+input pipeline issues and best practices. We found that using @{tf.FIFOQueue}
+and @{tf.train.queue_runner} could not saturate multiple current generation GPUs
+when using large inputs and processing with higher samples per second, such
+as training ImageNet with [AlexNet](http://papers.nips.cc/paper/4824-imagenet-classification-with-deep-convolutional-neural-networks.pdf).
+This is due to the the use of Python threads as its underlying implementation.
+The overhead of Python threads is too large.
+
+Another approach, which we have implemented in the
+[scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks),
+is to build an input pipeline using the native parallelism in TensorFlow. Our
+implementation is made up of 3 stages:
+
+*   I/O reads: Choose and read image files from disk.
+*   Image Processing: Decode image records into images, preprocess, and organize
+    into mini-batches.
+*   CPU-to-GPU Data Transfer: Transfer images from CPU to GPU.
+
+The dominant part of each stage is executed in parallel with the other stages
+using `data_flow_ops.StagingArea`. `StagingArea` is a queue-like operator
+similar to @{tf.FIFOQueue}. The difference is that `StagingArea` offers simpler
+functionality and can be executed on both CPU and GPU in parallel with other
+stages. Breaking the input pipeline into 3 stages that operate independently in
+parallel is scalable and takes full advantage of large multi-core environments.
+The rest of this section details the stages followed by details about using
+`data_flow_ops.StagingArea`.
+
+### Parallelize I/O Reads
+
+`data_flow_ops.RecordInput` is used to parallelize reading from disk. Given a
+list of input files representing TFRecords, `RecordInput` continuously reads
+records using background threads. The records are placed into its own large
+internal pool and when it has loaded at least half of its capacity, it produces
+output tensors.
+
+This op has its own internal threads that are dominated by I/O time that consume
+minimal CPU, which allows it to run smoothly in parallel with the rest of the
+model.
 
 ### Parallelize Image Processing
 
-After reading from “RecordInput”, the tensors are passed to the input processing
-pipeline.  For example, if we need to feed 8 GPUs, each with a batch-size of 32,
-then for each step we do the following.
-
-First, read 32x8=256 records, and process them individually, in
-parallel. This starts with 256 independent RecordInput read ops in the graph.
-
-Then, follow each read with identical set of ops for processing. Each set is
-considered independent and will execute in parallel.  The operations include
-image decoding, image distortion, and resizing.
-
-Finally, once the images are ready, they will be concatenated together into 8
-batch-size 32 tensors.
-Note that we can use “tf.concat” for this purpose.
-However, “tf.concat” is implemented as a single op, which waits for all
-the inputs to be ready, and then concatenates them together. Since all
-inputs are produced in parallel, there will be a long tail waiting for all
-inputs to be available; and when concatenation happens, the op becomes memory
-limited as all input tensors compete for memory bandwidth.
-So for the final concatenation, we use `tf.parallel_stack` instead. This
+After images are read from `RecordInput` they are passed as tensors to the image
+processing pipeline. To make the image processing pipeline easier to explain,
+assume that the input pipeline is targeting 8 GPUs with a batch size of 256 (32
+per GPU).
+
+256 records are read and processed individually in parallel. This starts with
+256 independent `RecordInput` read ops in the graph. Each read op is followed by
+an identical set of ops for image preprocessing that are considered independent
+and executed in parallel. The image preprocessing ops include operations such as
+image decoding, distortion, and resizing.
+
+Once the images are through preprocessing, they are concatenated together into 8
+batch size 32 tensors. Rather than use @{tf.concat} for this purpose, which is
+implemented as a single op that waits for all the inputs to be ready before
+concatenating them together, @{tf.parallel_stack} is used. @{tf.parallel_stack}
 allocates an uninitialized tensor as an output, and each input tensor is written
 to its designated portion of the output tensor as soon as the input is
-available.  When all the input tensors are finished, the output tensor is passed
-along in the graph. This effectively hides all the memory latency with the long
-tail of producing all the input tensors.
+available.
+
+When all the input tensors are finished, the output tensor is passed along in
+the graph. This effectively hides all the memory latency with the long tail of
+producing all the input tensors.
 
 ### Parallelize CPU-to-GPU Data Transfer
 
-In our example, once all the input images are processed and concatenated
-together by the CPU, we have 8 tensors, each of which has a batch-size of 32.
-These tensors are then to be used by the GPU for the model training.
+Continuing with the assumption that the target is 8 GPUs with a batch size of
+256 (32 per GPU). Once the input images are processed and concatenated together
+by the CPU, we have 8 tensors each with a batch-size of 32.
 
-In TensorFlow, users can use tensors from one device on any other device
-directly.  TensorFlow inserts implicit copies to make the tensors available on
-any devices where they are used.  The runtime schedules the copy between devices
-to run before the tensors are actually used.  However, if the copy cannot finish
-in time, the computation that needs those tensors will stall.
+TensorFlow enables tensors from one device to be used on any other device
+directly. TensorFlow inserts implicit copies to make the tensors available on
+any devices where they are used. The runtime schedules the copy between devices
+to run before the tensors are actually used. However, if the copy cannot finish
+in time, the computation that needs those tensors will stall and result in
+decreased performance.
 
-For high-performance models, it is helpful to explicitly schedule the copy ahead
-of the time in parallel, so when the computation starts on GPU, all the tensors
-are already available on the right device.
+In this implementation, `data_flow_ops.StagingArea` is used to explicitly
+schedule the copy in parallel. The end result is that when computation starts on
+the GPU, all the tensors are already available.
 
 ### Software Pipelining
 
-With all the stages capable of being driven by different processors, we insert
-`data_flow_ops.StagingArea` in between them so they run in parallel.
-`StagingArea` is a queue-like operator similar to `tf.FifoQueue`.
-But it offers simpler functionalities and can be executed on both CPU and GPU.
+With all the stages capable of being driven by different processors,
+`data_flow_ops.StagingArea` is used between them so they run in parallel.
+`StagingArea` is a queue-like operator similar to @{tf.FIFOQueue} that offers
+simpler functionalities that can be executed on both CPU and GPU.
 
-Before the model starts running all the stages, we warm up the stages in order
-so the staging buffers in between all have one set of data in them.
-During each run step that follows, we will run all the stages.
-They read one set of data from the staging buffers at the beginning of each
-stage, and push one set at end end.
+Before the model starts running all the stages, the input pipeline stages are
+warmed up to prime the staging buffers in between with one set of data.
+During each run step, one set of data is read from the staging buffers at
+the beginning of each stage, and one set is pushed at the end.
 
-For example: if there are three stages: A, B and C.
-There are two staging areas in between: S1 and S2.
-During the warm up, we run:
+For example: if there are three stages: A, B and C. There are two staging areas
+in between: S1 and S2. During the warm up, we run:
 
 ```
 Warm up:
@@ -162,123 +116,126 @@ Step 4: A3  B2  C1
 Step 5: A4  B3  C2
 ```
 
-After the warm up, S1 and S2 each have one set of data in them.
-For each step of the actual execution, one set of data is consumed from each
-staging area, and one set is added to each.
+After the warm up, S1 and S2 each have one set of data in them. For each step of
+the actual execution, one set of data is consumed from each staging area, and
+one set is added to each.
 
-There are a few nice properties about the scheme:
+Benefits of using this scheme:
 
-* All the stages are non-blocking, since the staging areas always have one set
-of data after the warm up.
-* Each stage can run in parallel since they can all start immediately.
-* The staging buffers have a fixed memory overhead. They will have at most one
-  extra set of data.
-* Only a single`session.run()` call is needed to run all stages of the step,
-  which makes profiling and debugging much easier.
+*   All stages are non-blocking, since the staging areas always have one set of
+    data after the warm up.
+*   Each stage can run in parallel since they can all start immediately.
+*   The staging buffers have a fixed memory overhead. They will have at most one
+    extra set of data.
+*   Only a single`session.run()` call is needed to run all stages of the step,
+    which makes profiling and debugging much easier.
 
 ## Best Practices in Building High-Performance Models
 
-The computation on GPU can happen immediately since the input data have already
-been transferred onto GPU when the step starts.
-But it is still important to build the model that runs as fast as possible.
-Here are some tips for a high-performance convolutional neural network (CNN)
-model:
+Collected below are a couple of additional best practices that can improve
+performance and increase the flexiblity of models.
 
 ### Build the model with both NHWC and NCHW
 
 Most TensorFlow operations used by a CNN support both NHWC and NCHW data format.
-On GPU, NCHW is faster.
-But on CPU, NHWC is sometimes faster.
+On GPU, NCHW is faster. But on CPU, NHWC is sometimes faster.
 
-So it is a good idea to build the model that can work in both ways.
-Our model shows a good way to do that effectively.
-For GPU training, we should always use NCHW.
-But if the model needs inference on CPU, we could use NHWC; weights obtained
-from training with NCHW data format can be used for inference in NHWC data
-format.
+Building a model to support both date formats keeps the model flexible and
+capable of operating optimally regardless of platform. Most TensorFlow
+operations used by a CNN support both NHWC and NCHW data format. The benchmark
+script was written to support both NCHW and NHWC. NCHW should always be used
+when training with GPUs. NHWC is sometimes faster on CPU. A flexible model can
+be trained on GPUs using NCHW with inference done on CPU using NHWC with the
+weights obtained from training.
 
 ### Use Fused Batch-Normalization
 
 The default batch-normalization in TensorFlow is implemented as composite
-operations.
-This is very general, but often leads to suboptimal performance.
-An alternative is the fused batch-normalization, and the performance on GPU
-is often much faster.
+operations. This is very general, but often leads to suboptimal performance. An
+alternative is to use fused batch-normalization which often has much better
+performance on GPU. Below is an example of using @{tf.contrib.layers.batch_norm}
+to implement fused batch-normalization.
+
+```python
+bn = tf.contrib.layers.batch_norm(
+          input_layer, fused=True, data_format='NCHW'
+          scope=scope)
+```
 
 ## Variable Distribution and Gradient Aggregation
 
 During training, training variable values are updated using aggregated gradients
-and deltas.  In this model, we demonstrate that with the flexible and
-general-purpose TensorFlow primitives, it is fairly easy to build a diverse
-range of high-performance distribution and aggregation schemes for different
-types of systems.
-
-For example:
-
-* The standard parameter-server where each replica of the training model reads
-  the variables directly, and updates the variable independently.  When each
-  model needs the variables, they are copied over through the standard implicit
-  copies added by the TensorFlow runtime. It is shown how to use this method
-  in either local training, distributed synchronous training, and distributed
-  asynchronous training.
-* A replicated mode for local training where each GPU has an identical
-  copy of the training parameters.  The forward and backward computation can
-  start immediately as the variable data is immediately available.  Gradients
-  are accumulated across all GPUs, and the aggregated total is applied to
-  each GPU's copy of the variables so that they stay in sync.
-* A distributed replicated mode of training where each GPU has an identical copy
-  of the training parameters, and a master copy of the variables is stored
-  on the parameter-servers.  The forward and backward computation can
-  start immediately as the variable data is immediately available.  Gradients
-  are accumulated across all GPUs on each server and then the per-server
-  aggregated gradients are applied to the master copy. After all workers do
-  this, each worker updates its copy of the variable from the master copy.
-
-We show that most of the variable distribution and aggregation subsystem can
-be implemented through TensorFlow low-level primitives with manageable
-complexity at the model level. Here we discuss some more details.
-
-### Parameter-server Variables
-
-The most common way trainable variables are managed in TensorFlow models is the
+and deltas. In the benchmark script, we demonstrate that with the flexible and
+general-purpose TensorFlow primitives, a diverse range of high-performance
+distribution and aggregation schemes can be built.
+
+Three examples of variable distribution and aggregation were included in the
+script:
+
+*   `parameter_server` where each replica of the training model reads the
+    variables from a parameter server and updates the variable independently.
+    When each model needs the variables, they are copied over through the
+    standard implicit copies added by the TensorFlow runtime. The example
+    [script](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+    illustrates using this method for local training, distributed synchronous
+    training, and distributed asynchronous training.
+*   `replicated` places an identical copy of each training variable on each
+    GPU. The forward and backward computation can start immediately as the
+    variable data is immediately available. Gradients are accumulated across all
+    GPUs, and the aggregated total is applied to each GPU's copy of the
+    variables to keep them in sync.
+*   `distributed_replicated` places an identical copy of the training parameters
+    on each GPU along with a master copy on the parameter servers. The forward
+    and backward computation can start immediately as the variable data is
+    immediately available. Gradients are accumulated across all GPUs on each
+    server and then the per-server aggregated gradients are applied to the
+    master copy. After all workers do this, each worker updates its copy of the
+    variable from the master copy.
+
+Below are additional details about each approach.
+
+### Parameter Server Variables
+
+The most common way trainable variables are managed in TensorFlow models is
 parameter server mode.
 
-In a distributed system, this means that each worker process runs the same
-model, and parameter server processes own the master copies of the variables.
-When a worker needs a variable from a parameter server, it refers to it
-directly.  The TensorFlow runtime adds implicit copies to the graph to make the
-variable value available on the computation device that needs it. When a
-gradient is computed on a worker, it is sent to the parameter server that owns
-the particular variable, and the corresponding optimizer is used to update the
-variable.
+In a distributed system, each worker process runs the same model, and parameter
+server processes own the master copies of the variables. When a worker needs a
+variable from a parameter server, it refers to it directly. The TensorFlow
+runtime adds implicit copies to the graph to make the variable value available
+on the computation device that needs it. When a gradient is computed on a
+worker, it is sent to the parameter server that owns the particular variable,
+and the corresponding optimizer is used to update the variable.
 
 There are some techniques to improve throughput:
 
-* The variables are spread among parameter servers based on their size, for load
-  balancing.
-* When each worker has multiple GPUs, gradients are accumulated across the GPUs
-  and a single aggregated gradient is sent to the parameter server. This reduces
-  the network bandwidth and the amount of work done by the parameter servers.
+*   The variables are spread among parameter servers based on their size, for
+    load balancing.
+*   When each worker has multiple GPUs, gradients are accumulated across the
+    GPUs and a single aggregated gradient is sent to the parameter server. This
+    reduces the network bandwidth and the amount of work done by the parameter
+    servers.
 
 For coordinating between workers, a very common mode is async updates, where
 each worker updates the master copy of the variables without synchronizing with
-other workers.  In our model, we demonstrate that it is fairly easy to introduce
+other workers. In our model, we demonstrate that it is fairly easy to introduce
 synchronization across workers so updates for all workers are finished in one
 step before the next step can start.
 
-The parameter-server method can also be used for local training, In this case,
+The parameter server method can also be used for local training, In this case,
 instead of spreading the master copies of variables across parameters servers,
 they are either on the CPU or spread across the available GPUs.
 
 Due to the simple nature of this setup, this architecture has gained a lot of
 popularity within the community.
 
-This is available in the benchmark scripts as the 'parameter_server'
-variable_update mode.
+This mode can be used in the script by passing
+`--variable_update=parameter_server`.
 
-![parameter_server mode in distributed
-training](../images/perf_parameter_server_mode_doc.png){
-width="900" style="max-width: inherit"}
+<div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" alt="parameter_server mode in distributed training"
+   src="../images/perf_parameter_server_mode_doc.png">
+</div>
 
 ### Replicated Variables
 
@@ -292,19 +249,18 @@ devices and the fully aggregated gradient is then applied to each local copy.
 
 Gradient aggregation across the server can be done in different ways:
 
-* Using standard TensorFlow operations to accumulate the total on a single
-  device (CPU or GPU) and then copy it back to all GPUs.
-* Using NVIDIA NCCL, described below in the NCCL section.
+*   Using standard TensorFlow operations to accumulate the total on a single
+    device (CPU or GPU) and then copy it back to all GPUs.
+*   Using NVIDIA® NCCL, described below in the NCCL section.
 
-This is available in the benchmark scripts for local execution only, as the
-'replicated' variable_update mode.
+This mode can be used in the script by passing `--variable_update=replicated`.
 
 ### Replicated Variables in Distributed Training
 
-The replicated method for variables can be extended to distributed training.
-One way to do this like the replicated mode: aggregate the gradients fully
-across the cluster and apply them to each local copy of the variable. This may
-be shown in a future version of this scripts; the scripts do present a different
+The replicated method for variables can be extended to distributed training. One
+way to do this like the replicated mode: aggregate the gradients fully across
+the cluster and apply them to each local copy of the variable. This may be shown
+in a future version of this scripts; the scripts do present a different
 variation, described here.
 
 In this mode, in addition to each GPU's copy of the variables, a master copy is
@@ -314,28 +270,30 @@ immediately using the local copies of the variables.
 As the gradients of the weights become available, they are sent back to the
 parameter servers and all local copies are updated:
 
-1. All the gradients from the GPU on the same worker are aggregated together.
-2. Aggregated gradients from each worker are sent to the parameter server that
-   owns the variable, where the specified optimizer is used to update the
-   master copy of the variable.
-3. Each worker updates its local copy of the variable from the master. In
-   the example model, this is done with a cross-replica barrier that waits for
-   all the workers to finish updating the variables, and fetches the new
-   variable only after the barrier has been released by all replicas.  Once the
-   copy finishes for all variables, this marks the end of a training step, and a
-   new step can start.
+1.  All the gradients from the GPU on the same worker are aggregated together.
+2.  Aggregated gradients from each worker are sent to the parameter server that
+    owns the variable, where the specified optimizer is used to update the
+    master copy of the variable.
+3.  Each worker updates its local copy of the variable from the master. In the
+    example model, this is done with a cross-replica barrier that waits for all
+    the workers to finish updating the variables, and fetches the new variable
+    only after the barrier has been released by all replicas. Once the copy
+    finishes for all variables, this marks the end of a training step, and a new
+    step can start.
 
 Although this sounds similar to the standard use of parameter servers, the
-performance is often better in many cases.  This is largely due to the fact the
+performance is often better in many cases. This is largely due to the fact the
 computation can happen without any delay, and much of the copy latency of early
 gradients can be hidden by later computation layers.
 
-This is available in the benchmark scripts as the 'distributed_replicated'
-variable_update mode.
+This mode can be used in the script by passing
+`--variable_update=distributed_replicated`.
+
 
-![distributed_replicated mode](
-../images/perf_distributed_replicated_mode_doc.png){
-width="900" style="max-width: inherit"}
+<div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" alt="distributed_replicated mode"
+   src="../images/perf_distributed_replicated_mode_doc.png">
+</div>
 
 #### NCCL
 
@@ -343,47 +301,29 @@ In order to broadcast variables and aggregate gradients across different GPUs
 within the same host machine, we can use the default TensorFlow implicit copy
 mechanism.
 
-However, we can instead use the optional NCCL support.  NCCL is an NVIDIA
-library that can efficiently broadcast and aggregate data across different GPUs.
-It schedules a cooperating kernel on each GPU that knows how to best utilize the
-underlying hardware topology; this kernel uses a single SM of the GPU.
+However, we can instead use the optional NCCL (@{tf.contrib.nccl}) support. NCCL
+is an NVIDIA® library that can efficiently broadcast and aggregate data across
+different GPUs. It schedules a cooperating kernel on each GPU that knows how to
+best utilize the underlying hardware topology; this kernel uses a single SM of
+the GPU.
 
 In our experiment, we demonstrate that although NCCL often leads to much faster
-data aggregation by itself, it doesn't necessarily lead to faster training.  Our
+data aggregation by itself, it doesn't necessarily lead to faster training. Our
 hypothesis is that the implicit copies are essentially free since they go to the
 copy engine on GPU, as long as its latency can be hidden by the main computation
-itself.  Although NCCL can transfer data faster, it takes one SM away, and adds
-more pressure to the underlying L2 cache.  Our results show that for 8-GPUs,
-NCCL often leads to better performance.  However, for fewer GPUs, the implicit
-copies often perform better.
+itself. Although NCCL can transfer data faster, it takes one SM away, and adds
+more pressure to the underlying L2 cache. Our results show that for 8-GPUs, NCCL
+often leads to better performance. However, for fewer GPUs, the implicit copies
+often perform better.
 
 #### Staged Variables
 
 We further introduce a staged-variable mode where we use staging areas for both
-the variable reads, and their updates.
-Similar to software pipelining of the input pipeline, this can hide the data
-copy latency.
-If the computation time takes longer than the copy and aggregation, the copy
-itself becomes essentially free.
+the variable reads, and their updates. Similar to software pipelining of the
+input pipeline, this can hide the data copy latency. If the computation time
+takes longer than the copy and aggregation, the copy itself becomes essentially
+free.
 
 The downside is that all the weights read are from the previous training step.
-So it is a different algorithm from SGD.
-But it is possible to improve its convergence by adjusting learning rate and
-other hyperparameters.
-
-## Conclusions
-
-In this high-performance model, we present a number of options to build
-high-performance models in TensorFlow.
-Due to the flexible design in TensorFlow, advanced features like this often
-requires no system-level changes, and can be largely achieved through
-model-level changes.
-
-We do not claim which combination works best for a particular model.
-That should be left to the engineers who build the model and the training system.
-Many of the ingredients of the high-performance model will find their ways
-to high-level primitives that become transparent to users.
-However, we have shown that advanced users can easily tune and modify the
-underlying model behavior using low-level primitives.
-This could be very useful when improving performance for particular system
-setups and model configurations.
+So it is a different algorithm from SGD. But it is possible to improve its
+convergence by adjusting learning rate and other hyperparameters.
-- 
GitLab


From 978d492bf0ae708644cf6d61a5aaf1e503a6c04f Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Tue, 2 May 2017 13:04:08 -0800
Subject: [PATCH 0937/1563] Final draft Change: 154876646

---
 tensorflow/docs_src/performance/benchmarks.md | 128 +++++++++++-------
 1 file changed, 77 insertions(+), 51 deletions(-)

diff --git a/tensorflow/docs_src/performance/benchmarks.md b/tensorflow/docs_src/performance/benchmarks.md
index 8c0cff138d..bfb47d9f90 100644
--- a/tensorflow/docs_src/performance/benchmarks.md
+++ b/tensorflow/docs_src/performance/benchmarks.md
@@ -1,17 +1,17 @@
-# TensorFlow Performance Benchmarks
+# Benchmarks
 
 ## Overview
 
 A selection of image classification models were tested across multiple platforms
 to create a point of reference for the TensorFlow community. The methodology,
-links to the scripts, and commands to reproduce the results are in the
-[appendix](#appendix).
+links to the benchmark scripts, and commands to reproduce the results are in the
+[Appendix](#appendix).
 
 ## Results for image classification models
 
-InceptionV3 ([arXiv:1512.00567](https://arxiv.org/abs/1512.00567)),
-ResNet-50 ([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)),
-ResNet-152 ([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)), VGG16
+InceptionV3 ([arXiv:1512.00567](https://arxiv.org/abs/1512.00567)), ResNet-50
+([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)), ResNet-152
+([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)), VGG16
 ([arXiv:1409.1556](https://arxiv.org/abs/1409.1556)), and
 [AlexNet](http://papers.nips.cc/paper/4824-imagenet-classification-with-deep-convolutional-neural-networks.pdf)
 were tested using the [ImageNet](http://www.image-net.org/) data set. Tests were
@@ -27,32 +27,32 @@ input pipeline and the underlying disk I/O are saturating the compute units.
 
 ### Training with NVIDIA® DGX-1™ (NVIDIA® Tesla® P100)
 
-<div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_p100_single_server.png">
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:80%" src="../images/perf_summary_p100_single_server.png">
 </div>
 
 Details and additional results are in the [Details for NVIDIA® DGX-1™ (NVIDIA®
-Tesla® P100)](#details-for-nvidia®-dgx-1™-nvidia®-tesla®-p100) section.
+Tesla® P100)](#details_for_nvidia_dgx-1tm_nvidia_tesla_p100) section.
 
 ### Training with NVIDIA® Tesla® K80
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_k80_single_server.png">
+  <img style="width:80%" src="../images/perf_summary_k80_single_server.png">
 </div>
 
 Details and additional results are in the [Details for Google Compute Engine
-(NVIDIA® Tesla® K80)](#details-for-google-compute-engine-nvidia®-tesla®-k80) and
+(NVIDIA® Tesla® K80)](#details_for_google_compute_engine_nvidia_tesla_k80) and
 [Details for Amazon EC2 (NVIDIA® Tesla®
-K80)](#details-for-amazon-ec2-nvidia®-tesla®-k80) sections.
+K80)](#details_for_amazon_ec2_nvidia_tesla_k80) sections.
 
 ### Distributed training with NVIDIA® Tesla® K80
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_k80_aws_distributed.png">
+  <img style="width:80%" src="../images/perf_summary_k80_aws_distributed.png">
 </div>
 
 Details and additional results are in the [Details for Amazon EC2 Distributed
-(NVIDIA® Tesla® K80)](#details-for-amazon-ec2-distributed-nvidia®-tesla®-k80)
+(NVIDIA® Tesla® K80)](#details_for_amazon_ec2_distributed_nvidia_tesla_k80)
 section.
 
 ### Compare synthetic with real data training
@@ -82,12 +82,15 @@ section.
 *   **TensorFlow GitHub hash:** b1e174e
 *   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
     //tensorflow/tools/pip_package:build_pip_package`
-*   **Disk:** local SSD
+*   **Disk:** Local SSD
 *   **DataSet:** ImageNet
 
-Batch size and optimizer used for each model.
+Batch size and optimizer used for each model are listed in the table below. In
+addition to the batch sizes listed in the table, InceptionV3, ResNet-50,
+ResNet-152, and VGG16 were tested with a batch size of 32. Those results are in
+the *other results* section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+Options            | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ------------------ | ----------- | --------- | ---------- | ------- | -----
 Batch size per GPU | 64          | 64        | 64         | 512     | 64
 Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
@@ -104,10 +107,8 @@ VGG16       | replicated (with NCCL) | n/a
 
 ### Results
 
-Batch size and optimizer used for each model are listed in the table below.
-
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_p100_single_server.png">
+  <img style="width:80%" src="../images/perf_summary_p100_single_server.png">
 </div>
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
@@ -136,6 +137,28 @@ GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 Training AlexNet with real data on 8 GPUs was excluded from the graph and table
 above due to it maxing out the input pipeline.
 
+### Other Results
+
+The results below are all with a batch size of 32.
+
+**Training synthetic data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
+---- | ----------- | --------- | ---------- | -----
+1    | 128         | 210       | 85.3       | 124
+2    | 259         | 412       | 166        | 241
+4    | 520         | 827       | 330        | 470
+8    | 995         | 1623      | 643        | 738
+
+**Training real data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
+---- | ----------- | --------- | ---------- | -----
+1    | 130         | 208       | 85.0       | 124
+2    | 257         | 403       | 163        | 221
+4    | 507         | 814       | 325        | 401
+8    | 966         | 1525      | 641        | 619
+
 ## Details for Google Compute Engine (NVIDIA® Tesla® K80)
 
 ### Environment
@@ -156,7 +179,7 @@ addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
 tested with a batch size of 32. Those results are in the *other results*
 section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+Options            | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ------------------ | ----------- | --------- | ---------- | ------- | -----
 Batch size per GPU | 64          | 64        | 32         | 512     | 32
 Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
@@ -184,10 +207,10 @@ GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-1    | 30.5        | 56.7      | 20.7       | 639     | 30.2
-2    | 57.8        | 107       | 39         | 1136    | 55.5
-4    | 115         | 211       | 77.3       | 2067    | 106
-8    | 225         | 418       | 150        | 4056    | 213
+  1  | 30.6        | 56.7      | 20.7       | 639     | 30.2       
+  2  | 58.4        | 107       | 39.0       | 1136    | 55.5       
+  4  | 115         | 211       | 77.3       | 2067    | 106        
+  8  | 225         | 422       | 151        | 4056    | 213   
 
 ### Other Results
 
@@ -204,10 +227,10 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-1    | 29.3                        | 53.6
-2    | 55                          | 102
-4    | 109                         | 200
-8    | 215                         | 387
+  1  | 29.5                        | 53.6       
+  2  | 55.4                        | 102        
+  4  | 110                         | 201        
+  8  | 216                         | 387  
 
 ## Details for Amazon EC2 (NVIDIA® Tesla® K80)
 
@@ -230,7 +253,7 @@ addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
 tested with a batch size of 32. Those results are in the *other results*
 section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+Options            | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ------------------ | ----------- | --------- | ---------- | ------- | -----
 Batch size per GPU | 64          | 64        | 32         | 512     | 32
 Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
@@ -289,7 +312,7 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
 1    | 30.0                        | 53.6
-2    | 57.5                        | 101
+2    | 57.5                        | 102
 4    | 113                         | 202
 8    | 212                         | 379
 
@@ -313,7 +336,7 @@ addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
 tested with a batch size of 32. Those results are in the *other results*
 section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152
+Options            | InceptionV3 | ResNet-50 | ResNet-152
 ------------------ | ----------- | --------- | ----------
 Batch size per GPU | 64          | 64        | 32
 Optimizer          | sgd         | sgd       | sgd
@@ -337,7 +360,7 @@ used with the following exceptions:
 ### Results
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:95%" src="../images/perf_summary_k80_aws_distributed.png">
+  <img style="width:80%" src="../images/perf_summary_k80_aws_distributed.png">
 </div>
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
@@ -374,34 +397,37 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 
 ### Executing benchmark tests
 
-The code for the benchmarks was created to be both used for benchmarking
-TensorFlow as well as used as a tool to test hardware platforms. The benchmark
-code includes modes such as `trivial` that run a virtually empty model that is
-useful for testing the maximum possibly samples/sec for the input pipeline among
-other things. Not only does this test TensorFlow but also the throughput of the
-underlying systems. There are two ways to execute the benchmarks in
-[tf_cnn_benchmarks.py](TODO: LINK TO GITHUB):
+The [benchmark code](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+was created to be used for benchmarking TensorFlow as well as used as a tool to
+test hardware platforms. Techniques used in the benchmark scripts are detailed
+in @{$performance_models$High-Performance Models}.
+
+There are two ways to execute the benchmark code:
 
-1.  Execute [tf_cnn_benchmarks.py](TODO: LINK TO GITHUB) directly
-2.  Utilize the [small wrapper](TODO: LINK TO GITHUB) that helps pick the
-    correct config
+1.  Execute [tf_cnn_benchmarks.py](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/tf_cnn_benchmarks.py)
+    directly.
+2.  Utilize the [scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/main.py)
+    that helps pick the correct config for each platform executes
+    `tf_cnn_benchmarks.py`.
 
 The wrapper is suggested as a starting point. Then investigate the variety of
-options available in `tf_cnn_benchmarks.py`. While the wrapper extensive
-examples, below are a couple highlights.
+options available in `tf_cnn_benchmarks.py`. Below are a couple examples of
+using the wrapper.
 
-Run ResNet-50 on a single instance with 8 GPUs. The `system` argument is used to
-determine the optimal configuration. The supported values are gce, aws, and
-dgx1. If `system` is not passeed, the best config for the most widely available
-hardware is used.
+**Single Server**
+This example illustrates training ResNet-50 on a single instance with 8 GPUs.
+The `system` flag is used to determine the optimal configuration. The
+supported values are gce, aws, and dgx1. If `system` is not passed, the best
+config for the most widely available hardware is used.
 
 ```bash
 python main.py --model=resnet50 --num_gpus=8
 python main.py --system=aws --model=resnet50 --num_gpus=8
 ```
 
-Run ResNet-50 on 2 hosts, e.g. host_0 (10.0.0.1) and host_1 (10.0.0.2), with 8
-GPUs each on aws.
+**Distributed**
+This example illustrates training ResNet-50 on 2 hosts, e.g. host_0 (10.0.0.1)
+and host_1 (10.0.0.2), with 8 GPUs each on AWS (Amazon EC2).
 
 ```bash
 # Run the following commands on host_0 (10.0.0.1):
-- 
GitLab


From c590b00b2cbd757a94594da55de89d1b66a8b064 Mon Sep 17 00:00:00 2001
From: Andrew Selle <aselle@google.com>
Date: Tue, 2 May 2017 13:05:29 -0800
Subject: [PATCH 0938/1563] Fix losses documentation.

Fix documentation of get_total_loss() to be correct.
And add a helpful comment about a common pitfall.
Change: 154876822
---
 tensorflow/python/ops/losses/util.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/ops/losses/util.py b/tensorflow/python/ops/losses/util.py
index 09ad874fae..3414df475f 100644
--- a/tensorflow/python/ops/losses/util.py
+++ b/tensorflow/python/ops/losses/util.py
@@ -57,7 +57,7 @@ def get_losses(scope=None, loss_collection=ops.GraphKeys.LOSSES):
 
 
 def get_regularization_losses(scope=None):
-  """Gets the regularization losses.
+  """Gets the list of regularization losses.
 
   Args:
     scope: An optional scope for filtering the losses to return.
@@ -88,7 +88,11 @@ def get_regularization_loss(scope=None, name="total_regularization_loss"):
 def get_total_loss(add_regularization_losses=True, name="total_loss"):
   """Returns a tensor whose value represents the total loss.
 
-  Notice that the function adds the given losses to the regularization losses.
+  In particular, this adds any losses you have added with `tf.add_loss()` to
+  any regularization losses that have been added by regularization parameters
+  on layers constructors e.g. `tf.layers`. Be very sure to use this if you
+  are constructing a loss_op manually. Otherwise regularization arguments
+  on `tf.layers` methods will not function.
 
   Args:
     add_regularization_losses: A boolean indicating whether or not to use the
-- 
GitLab


From 5b6d276679b62ad4992d397b1987a4a4a2bd84c6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 13:10:44 -0800
Subject: [PATCH 0939/1563] [XLA] Second change for HLO interpreter.

Extends HloEvaluator to allow evaluation of HLO Computation or single HLO instruction
with non-constant operands, by traversing the instruction in post order and keeps track of
each instruction along the way as evaluated literals.
Change: 154877580
---
 tensorflow/compiler/xla/service/BUILD         |   2 +
 .../compiler/xla/service/hlo_evaluator.cc     | 254 +++++++++++-------
 .../compiler/xla/service/hlo_evaluator.h      |  81 +++++-
 .../xla/service/hlo_evaluator_test.cc         |  65 ++++-
 tensorflow/compiler/xla/service/hlo_query.cc  |  10 +
 tensorflow/compiler/xla/service/hlo_query.h   |   4 +
 6 files changed, 305 insertions(+), 111 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index a4e35135d7..bdb69b6e55 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -80,6 +80,8 @@ cc_library(
         ":hlo_query",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:status",
+        "//tensorflow/compiler/xla:status_macros",
         "//tensorflow/compiler/xla:statusor",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
index ebe7428052..1b3babc214 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -26,20 +26,21 @@ limitations under the License.
 #include "tensorflow/compiler/xla/index_util.h"
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/map_util.h"
 #include "tensorflow/compiler/xla/primitive_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/hlo_query.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/status.h"
+#include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/core/lib/core/bitmap.h"
+#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
-#include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/types.h"
 
@@ -53,9 +54,7 @@ std::unique_ptr<Literal> ElementWiseUnaryOp(
     const Literal& operand) {
   DCHECK(ShapeUtil::SameDimensions(shape, operand.shape()));
 
-  auto result = MakeUnique<Literal>();
-  *result->mutable_shape() = shape;
-  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+  auto result = LiteralUtil::CreateFromShape(shape);
 
   std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
   do {
@@ -74,9 +73,7 @@ std::unique_ptr<Literal> ElementWiseBinaryOp(
   DCHECK(ShapeUtil::SameDimensions(shape, rhs.shape()));
   DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
 
-  auto result = MakeUnique<Literal>();
-  *result->mutable_shape() = shape;
-  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+  auto result = LiteralUtil::CreateFromShape(shape);
 
   std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
   do {
@@ -99,9 +96,7 @@ std::unique_ptr<Literal> ElementWiseTernaryOp(
   DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
   DCHECK(ShapeUtil::SameDimensions(rhs.shape(), ehs.shape()));
 
-  auto result = MakeUnique<Literal>();
-  *result->mutable_shape() = shape;
-  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+  auto result = LiteralUtil::CreateFromShape(shape);
 
   std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
   do {
@@ -130,29 +125,130 @@ NativeT AbsoluteVal(NativeT value) {
   return std::abs(value);
 }
 
-template <typename NativeT>
-StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
+}  // namespace
+
+Status HloEvaluator::DefaultAction(HloInstruction* hlo) {
+  VLOG(2) << "Handle instruction: " << hlo->ToString();
+  Shape shape = hlo->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  TF_ASSIGN_OR_RETURN(evaluated_[hlo], EvaluateBasedOnType(hlo));
+  return Status::OK();
+}
+
+Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
+  VLOG(2) << "HandleParameter: " << parameter->ToString();
+  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
+  VLOG(2) << "Parameter evaluated to: "
+          << LiteralUtil::ToString(*input_literal);
+  CHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
+
+  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
+  return Status::OK();
+}
+
+Status HloEvaluator::HandleConstant(HloInstruction* constant,
+                                    const Literal& literal) {
+  VLOG(2) << "HandleConstant: " << constant->ToString();
+  CHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
+
+  evaluated_[constant] = MakeUnique<Literal>(literal);
+  return Status::OK();
+}
+
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
+    HloComputation* computation,
+    tensorflow::gtl::ArraySlice<const Literal*> args) {
+  arg_literals_ = args;
+  TF_RETURN_IF_ERROR(computation->Accept(this));
+  return std::move(FindOrDie(evaluated_, computation->root_instruction()));
+}
+
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
+    HloInstruction* instruction,
+    tensorflow::gtl::ArraySlice<const Literal*> args) {
+  DCHECK(hlo_query::AllOperandsAreParametersOrConstants(*instruction));
+  Shape shape = instruction->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  arg_literals_ = args;
+
+  // Evaluate operands of Parameter type against the input literals which caches
+  // the evaluated literal results.
+  for (const auto operand : instruction->operands()) {
+    if (operand->opcode() == HloOpcode::kParameter) {
+      TF_CHECK_OK(HandleParameter(operand));
+    } else if (operand->opcode() == HloOpcode::kConstant) {
+      evaluated_[operand] = MakeUnique<Literal>(operand->literal());
+    }
+  }
+
+  TF_RETURN_IF_ERROR(instruction->Visit(this));
+  return std::move(FindOrDie(evaluated_, instruction));
+}
+
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateBasedOnType(
     HloInstruction* instruction) {
-  DCHECK(hlo_query::AllOperandsAreConstants(*instruction));
+  Shape shape = instruction->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  switch (shape.element_type()) {
+    case PRED:
+      return EvaluateSameTypedElementwise<bool>(instruction);
+    case U8:
+      return EvaluateSameTypedElementwise<uint8>(instruction);
+    case U16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(U16).c_str());
+    case U32:
+      return EvaluateSameTypedElementwise<uint32>(instruction);
+    case U64:
+      return EvaluateSameTypedElementwise<uint64>(instruction);
+    case S8:
+      return EvaluateSameTypedElementwise<int8>(instruction);
+    case S16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(S16).c_str());
+    case S32:
+      return EvaluateSameTypedElementwise<int32>(instruction);
+    case S64:
+      return EvaluateSameTypedElementwise<int64>(instruction);
+    case F16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(F16).c_str());
+    case F32:
+      return EvaluateSameTypedElementwise<float>(instruction);
+    case F64:
+      return EvaluateSameTypedElementwise<double>(instruction);
+    default:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(shape.element_type()).c_str());
+  }
+}
 
+template <typename NativeT>
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateSameTypedElementwise(
+    HloInstruction* instruction) {
   const std::vector<HloInstruction*>& operands = instruction->operands();
   HloOpcode opcode = instruction->opcode();
   const Shape& shape = instruction->shape();
 
   switch (opcode) {
     // TODO(b/35950897): many of the stl function used here are not overloaded
-    // for all XLA primitive types.
+    // for every XLA primitive types.
+
     // Unary element-wise ops.
+    //
     case HloOpcode::kAbs:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return AbsoluteVal(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kCeil:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::ceil(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kConvert:
       CHECK_EQ(operands.size(), 1);
       // TODO(b/35950897): implement Convert.
@@ -162,37 +258,37 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return operand; },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kExp:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::exp(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kFloor:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::floor(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kIsFinite:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::isfinite(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kLog:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::log(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kLogicalNot:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return !operand; },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kNegate:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return -operand; },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kSign:
       CHECK_EQ(operands.size(), 1);
       CHECK(primitive_util::IsIntegralType(shape.element_type()));
@@ -201,95 +297,113 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
                                        return (NativeT(0) < operand) -
                                               (operand < NativeT(0));
                                      },
-                                     operands[0]->literal());
+                                     GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kTanh:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::tanh(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     // Binary element-wise ops.
+    //
     case HloOpcode::kAdd:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs + rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kDivide:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs / rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kMultiply:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs * rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kSubtract:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs - rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kEq:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs == rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kGe:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs >= rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kGt:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs > rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLe:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs <= rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLt:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs < rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kNe:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs != rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kMaximum:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return std::max(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kMinimum:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return std::min(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kPower:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return std::pow(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kRemainder:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape,
           [](NativeT lhs, NativeT rhs) { return std::remainder(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLogicalAnd:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs && rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLogicalOr:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs || rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     // Ternary element-wise ops.
+    //
     case HloOpcode::kClamp: {
       CHECK_EQ(operands.size(), 3);
       std::function<NativeT(NativeT, NativeT, NativeT)> clamp_op =
@@ -297,8 +411,9 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
             return std::max(low, std::min(value, high));
           };
       return ElementWiseTernaryOp<NativeT, NativeT, NativeT, NativeT>(
-          shape, std::move(clamp_op), operands[0]->literal(),
-          operands[1]->literal(), operands[2]->literal());
+          shape, std::move(clamp_op), GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]),
+          GetEvaluatedLiteralFor(operands[2]));
     } break;
     case HloOpcode::kSelect: {
       CHECK_EQ(operands.size(), 3);
@@ -311,8 +426,9 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
             return on_false;
           };
       return ElementWiseTernaryOp<NativeT, bool, NativeT, NativeT>(
-          shape, std::move(select_op), operands[0]->literal(),
-          operands[1]->literal(), operands[2]->literal());
+          shape, std::move(select_op), GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]),
+          GetEvaluatedLiteralFor(operands[2]));
     } break;
     default:
       return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
@@ -320,48 +436,4 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
   }
 }
 
-}  // namespace
-
-/* static */ StatusOr<std::unique_ptr<Literal>>
-HloEvaluator::EvaluateOpForLiteral(HloInstruction* instruction) {
-  DCHECK(hlo_query::AllOperandsAreConstants(*instruction));
-
-  Shape shape = instruction->shape();
-  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
-
-  // REVIEW QUESTION: other than a few operations, do we need to handle the
-  // general case of operands being of different types in the context of the
-  // evaluator?
-
-  switch (shape.element_type()) {
-    case PRED:
-      return EvaluateOpForLiteralInternal<bool>(instruction);
-    case U8:
-      return EvaluateOpForLiteralInternal<uint8>(instruction);
-    case U16:
-      LOG(FATAL) << "U16/uint16 is unimplemented.";
-    case U32:
-      return EvaluateOpForLiteralInternal<uint32>(instruction);
-    case U64:
-      return EvaluateOpForLiteralInternal<uint64>(instruction);
-    case S8:
-      return EvaluateOpForLiteralInternal<int8>(instruction);
-    case S16:
-      LOG(FATAL) << "S16/int16 is unimplemented.";
-    case S32:
-      return EvaluateOpForLiteralInternal<int32>(instruction);
-    case S64:
-      return EvaluateOpForLiteralInternal<int64>(instruction);
-    case F16:
-      LOG(FATAL) << "F16 is unimplemented.";
-    case F32:
-      return EvaluateOpForLiteralInternal<float>(instruction);
-    case F64:
-      return EvaluateOpForLiteralInternal<double>(instruction);
-    default:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(shape.element_type()).c_str());
-  }
-}
-
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.h b/tensorflow/compiler/xla/service/hlo_evaluator.h
index c6ec650d67..6372a6c269 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.h
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.h
@@ -18,22 +18,89 @@ limitations under the License.
 
 #include <memory>
 
+#include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/lib/gtl/flatmap.h"
+#include "tensorflow/core/platform/macros.h"
 
 namespace xla {
 
-// Responsible for evaluating a HLO instruction with constant operands.
-class HloEvaluator {
+// Responsible for evaluating HLO and obtain literal as the evaluation results.
+//
+// This class is not thread-safe.
+class HloEvaluator : public DfsHloVisitorWithDefault {
  public:
-  // Evaluates a single HLO instruction for constants and return the result as a
-  // Literal.
-  // Precondition: all operands of the instruction are constants, instruction is
-  // valid with corresponding number of operands for the given operator.
+  HloEvaluator() {}
+  ~HloEvaluator() override {}
+
+  // Evaluates a HLO computation and an array of pointers to literals.
+  // Return the evaluated result as literal if successful.
+  // Precondition: argument literals are in post-order corresponding to the
+  // input instruction's parameters.
+  StatusOr<std::unique_ptr<Literal>> Evaluate(
+      HloComputation* computation,
+      tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
+
+  // Evaluates a single HLO instruction and an array of pointers to literals.
+  // Return the evaluated result as literal if successful.
+  // Precondition:
+  // 1. argument literals are in post-order corresponding to the input
+  // instruction's parameters.
+  // 2. the instruction's operands must be of either Parameter or Constant type.
   // TODO(b/35950897): implement more ops other than element-wise ops.
-  static StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteral(
+  // TODO(b/35950897): handle broadcasts.
+  StatusOr<std::unique_ptr<Literal>> Evaluate(
+      HloInstruction* instruction,
+      tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
+
+ protected:
+  // The following methods implement the DfsHloVisitor interface.
+  //
+  // DefaultAction here handles all non-specificialized (i.e., instruction
+  // without corresponding Handle* method) instructions.
+  // TODO(b/35950897): it's likely better to refactor the switches here and push
+  // up the switch to templated methods instead, likely at DfsHloVisitor level.
+  Status DefaultAction(HloInstruction* hlo_instruction) override;
+
+  Status HandleParameter(HloInstruction* parameter) override;
+  Status HandleConstant(HloInstruction* constant,
+                        const Literal& literal) override;
+
+ private:
+  // Evaluates a single HLO instruction return the result as a Literal if
+  // successful. A Status will be returned on error.
+  StatusOr<std::unique_ptr<Literal>> EvaluateBasedOnType(
       HloInstruction* instruction);
+
+  // Evaluates an element-wise HLO instruction that has the same output literal
+  // type as the operands' types.
+  template <typename NativeT>
+  StatusOr<std::unique_ptr<Literal>> EvaluateSameTypedElementwise(
+      HloInstruction* instruction);
+
+  // Returns the already-evaluated literal result for the instruction.
+  // Crash with log if the given instruction has not been evaluated previously.
+  const Literal& GetEvaluatedLiteralFor(const HloInstruction* hlo) {
+    auto it = evaluated_.find(hlo);
+    CHECK(it != evaluated_.end())
+        << "could not find evaluated value for: " << hlo->ToString();
+    return *(it->second);
+  }
+
+  // Tracks the HLO instruciton and its evaluated literal result.
+  tensorflow::gtl::FlatMap<const HloInstruction*, std::unique_ptr<Literal>>
+      evaluated_;
+  // Stores input literals, assuming they are in post-order. Literals are not
+  // owned by this class, and they must outlive the lifetime of the instance of
+  // this class.
+  tensorflow::gtl::ArraySlice<const Literal*> arg_literals_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(HloEvaluator);
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator_test.cc b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
index 585fe65def..443e5ad4f4 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
@@ -14,10 +14,13 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/compiler/xla/service/hlo_evaluator.h"
 
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
@@ -29,9 +32,16 @@ limitations under the License.
 namespace xla {
 namespace {
 
+class HloEvaluatorTest : public ::testing::Test {
+ protected:
+  HloEvaluatorTest() { evaluator_ = MakeUnique<HloEvaluator>(); }
+
+  std::unique_ptr<HloEvaluator> evaluator_;
+};
+
 // Verifies that HloEvaluator evaluates a HLO instruction that performs clamp
 // with 3 operands.
-TEST(HloEvaluatorTest, DoesClamp) {
+TEST_F(HloEvaluatorTest, DoesClamp) {
   auto low = LiteralUtil::CreateR2<float>({{0.f, 2.f}, {2.f, 4.f}});
   auto high = LiteralUtil::CreateR2<float>({{2.f, 4.f}, {4.f, 4.f}});
   auto value = LiteralUtil::CreateR2<float>({{0.f, 5.f}, {0.f, 4.f}});
@@ -44,7 +54,7 @@ TEST(HloEvaluatorTest, DoesClamp) {
       shape, HloOpcode::kClamp, c1.get(), c2.get(), c3.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<float>({{0, 4}, {2, 4}});
 
@@ -53,7 +63,7 @@ TEST(HloEvaluatorTest, DoesClamp) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs select
 // with 3 operands.
-TEST(HloEvaluatorTest, DoesSelect) {
+TEST_F(HloEvaluatorTest, DoesSelect) {
   auto pred = LiteralUtil::CreateR2<bool>({{true, false}, {false, true}});
   auto on_true = LiteralUtil::CreateR2<float>({{2.f, 4.f}, {4.f, 4.f}});
   auto on_false = LiteralUtil::CreateR2<float>({{0.f, 5.f}, {0.f, 4.f}});
@@ -66,7 +76,7 @@ TEST(HloEvaluatorTest, DoesSelect) {
       shape, HloOpcode::kSelect, c1.get(), c2.get(), c3.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<float>({{2, 5}, {0, 4}});
 
@@ -75,7 +85,7 @@ TEST(HloEvaluatorTest, DoesSelect) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs
 // element-wise addition with 2 operands.
-TEST(HloEvaluatorTest, DoesAdd) {
+TEST_F(HloEvaluatorTest, DoesAdd) {
   auto lhs = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
   auto rhs = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
 
@@ -86,7 +96,7 @@ TEST(HloEvaluatorTest, DoesAdd) {
       HloInstruction::CreateBinary(shape, HloOpcode::kAdd, c1.get(), c2.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<int64>({{3, 4}, {-96, 8}});
 
@@ -95,7 +105,7 @@ TEST(HloEvaluatorTest, DoesAdd) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs
 // element-wise divide with 2 operands.
-TEST(HloEvaluatorTest, DoesDivide) {
+TEST_F(HloEvaluatorTest, DoesDivide) {
   auto lhs_s64 = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
   auto rhs_s64 = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
 
@@ -106,7 +116,7 @@ TEST(HloEvaluatorTest, DoesDivide) {
                                                   c1_s64.get(), c2_s64.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<int64>({{0, 0}, {-25, 1}});
 
@@ -121,8 +131,7 @@ TEST(HloEvaluatorTest, DoesDivide) {
   instruction = HloInstruction::CreateBinary(shape_f64, HloOpcode::kDivide,
                                              c1_f64.get(), c2_f64.get());
 
-  result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+  result = evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   expected =
       LiteralUtil::CreateR2<double>({{0.45454545454545453, 0}, {-25, 1}});
@@ -132,21 +141,51 @@ TEST(HloEvaluatorTest, DoesDivide) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs
 // element-wise abs op with 1 operand.
-TEST(HloEvaluatorTest, DoesAbs) {
+TEST_F(HloEvaluatorTest, DoesAbs) {
   auto operand = LiteralUtil::CreateR2<int64>({{1, -20}, {-100, 4}});
-
   Shape shape = ShapeUtil::MakeShape(S64, {2, 2});
   auto c1 = HloInstruction::CreateConstant(std::move(operand));
   auto instruction =
       HloInstruction::CreateUnary(shape, HloOpcode::kAbs, c1.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<int64>({{1, 20}, {100, 4}});
 
   EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
 }
 
+// Verifies that HloEvaluator evaluates a HLO Computation with non-parameter nor
+// constant operands.
+TEST_F(HloEvaluatorTest, DoesTraveseInstructions) {
+  HloComputation::Builder builder(
+      ::testing::UnitTest::GetInstance()->current_test_info()->name());
+
+  auto lhs = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
+  auto rhs = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
+  auto rhs2 = LiteralUtil::CreateR2<int64>({{1, -20}, {-100, 4}});
+  std::vector<const Literal*> args = {lhs.get(), rhs.get(), rhs2.get()};
+
+  Shape shape = ShapeUtil::MakeShape(S64, {2, 2});
+
+  auto param_lhs = HloInstruction::CreateParameter(0, shape, "lhs");
+  auto param_rhs = HloInstruction::CreateParameter(1, shape, "rhs");
+  auto lhs_instruction = HloInstruction::CreateBinary(
+      shape, HloOpcode::kAdd, param_lhs.get(), param_rhs.get());
+
+  auto param_rhs2 = HloInstruction::CreateParameter(2, shape, "rhs2");
+  auto root_instruction = HloInstruction::CreateBinary(
+      shape, HloOpcode::kAdd, lhs_instruction.get(), param_rhs2.get());
+
+  builder.AddInstruction(std::move(root_instruction));
+  std::unique_ptr<Literal> result =
+      evaluator_->Evaluate(builder.Build().get(), args).ConsumeValueOrDie();
+
+  auto expected = LiteralUtil::CreateR2<int64>({{4, -16}, {-196, 12}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_query.cc b/tensorflow/compiler/xla/service/hlo_query.cc
index d699737864..a153d73dbd 100644
--- a/tensorflow/compiler/xla/service/hlo_query.cc
+++ b/tensorflow/compiler/xla/service/hlo_query.cc
@@ -32,6 +32,16 @@ bool IsConstantR0F32(HloInstruction* instruction, float* out) {
   return false;
 }
 
+bool AllOperandsAreParametersOrConstants(const HloInstruction& instruction) {
+  for (const auto& operand : instruction.operands()) {
+    if (operand->opcode() != HloOpcode::kParameter &&
+        operand->opcode() != HloOpcode::kConstant) {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool AllOperandsAreParameters(const HloInstruction& instruction) {
   for (const auto& operand : instruction.operands()) {
     if (operand->opcode() != HloOpcode::kParameter) {
diff --git a/tensorflow/compiler/xla/service/hlo_query.h b/tensorflow/compiler/xla/service/hlo_query.h
index 56f3cfd863..c79347bbf9 100644
--- a/tensorflow/compiler/xla/service/hlo_query.h
+++ b/tensorflow/compiler/xla/service/hlo_query.h
@@ -28,6 +28,10 @@ namespace hlo_query {
 // Precondition: out != nullptr
 bool IsConstantR0F32(HloInstruction* instruction, float* out);
 
+// Returns whether all of an instruction's operands are of the types constants
+// and parameters.
+bool AllOperandsAreParametersOrConstants(const HloInstruction& instruction);
+
 // Returns whether all of an instruction's operands are parameters.
 bool AllOperandsAreParameters(const HloInstruction& instruction);
 
-- 
GitLab


From a16a92f104fea20da6c0a62ebe2d91ab03429e29 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 2 May 2017 13:15:17 -0800
Subject: [PATCH 0940/1563] [tf distributions] Move the remaining whitelisted
 distributions to core. Change: 154878206

---
 tensorflow/contrib/distributions/BUILD        | 174 ------------------
 tensorflow/contrib/distributions/__init__.py  |  22 +--
 .../bijectors/cholesky_outer_product_test.py  |   2 +-
 .../kernel_tests/bijectors/invert_test.py     |   2 +-
 .../ops/bijectors/bijector_test_util.py       |   2 +-
 .../contrib/distributions/python/ops/chi2.py  |   2 +-
 .../distributions/python/ops/mixture.py       |   2 +-
 .../python/ops/vector_student_t.py            |   2 +-
 .../contrib/seq2seq/python/ops/helper.py      |   4 +-
 .../python/kernel_tests/distributions/BUILD   | 174 ++++++++++++++++++
 .../distributions}/bernoulli_test.py          |  30 ++-
 .../kernel_tests/distributions}/beta_test.py  |  43 ++++-
 .../distributions}/categorical_test.py        |   2 +-
 .../dirichlet_multinomial_test.py             |   5 +-
 .../distributions}/dirichlet_test.py          |  35 +++-
 .../distributions}/exponential_test.py        |  47 ++++-
 .../kernel_tests/distributions}/gamma_test.py |  90 ++++++---
 .../distributions}/laplace_test.py            |  80 ++++++--
 .../distributions}/multinomial_test.py        |  56 +++---
 .../distributions}/student_t_test.py          | 131 ++++++++-----
 .../distributions}/uniform_test.py            |  29 ++-
 tensorflow/python/ops/distributions/BUILD     |   1 +
 .../ops/distributions}/bernoulli.py           |   0
 .../ops => python/ops/distributions}/beta.py  |   0
 .../ops/distributions}/categorical.py         |   0
 .../distributions/conditional_distribution.py |   2 +-
 .../ops/distributions}/dirichlet.py           |   0
 .../distributions}/dirichlet_multinomial.py   |   0
 .../ops/distributions}/exponential.py         |   2 +-
 .../ops => python/ops/distributions}/gamma.py |   0
 .../ops/distributions}/laplace.py             |   0
 .../ops/distributions}/multinomial.py         |   0
 tensorflow/python/ops/distributions/normal.py |   6 +-
 .../ops/distributions}/student_t.py           |  12 +-
 .../ops/distributions}/uniform.py             |   0
 35 files changed, 607 insertions(+), 350 deletions(-)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/bernoulli_test.py (94%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/beta_test.py (94%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/categorical_test.py (99%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/dirichlet_multinomial_test.py (99%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/dirichlet_test.py (94%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/exponential_test.py (88%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/gamma_test.py (93%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/laplace_test.py (92%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/multinomial_test.py (87%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/student_t_test.py (83%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/uniform_test.py (93%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/bernoulli.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/beta.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/categorical.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/dirichlet.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/dirichlet_multinomial.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/exponential.py (98%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/gamma.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/laplace.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/multinomial.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/student_t.py (97%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/uniform.py (100%)

diff --git a/tensorflow/contrib/distributions/BUILD b/tensorflow/contrib/distributions/BUILD
index 1b9bd6ad91..9f675c6613 100644
--- a/tensorflow/contrib/distributions/BUILD
+++ b/tensorflow/contrib/distributions/BUILD
@@ -193,38 +193,6 @@ cuda_py_test(
     tags = ["notap"],  # http://b/30441813
 )
 
-cuda_py_test(
-    name = "bernoulli_test",
-    size = "small",
-    srcs = ["python/kernel_tests/bernoulli_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "beta_test",
-    size = "small",
-    srcs = ["python/kernel_tests/beta_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "binomial_test",
     size = "small",
@@ -238,24 +206,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "categorical_test",
-    size = "small",
-    srcs = ["python/kernel_tests/categorical_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-        "//tensorflow/python:random_ops",
-    ],
-)
-
 cuda_py_test(
     name = "chi2_test",
     srcs = ["python/kernel_tests/chi2_test.py"],
@@ -287,66 +237,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "dirichlet_test",
-    size = "small",
-    srcs = ["python/kernel_tests/dirichlet_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "dirichlet_multinomial_test",
-    size = "medium",
-    srcs = ["python/kernel_tests/dirichlet_multinomial_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "exponential_test",
-    srcs = ["python/kernel_tests/exponential_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "gamma_test",
-    srcs = ["python/kernel_tests/gamma_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "geometric_test",
     size = "small",
@@ -378,36 +268,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "laplace_test",
-    srcs = ["python/kernel_tests/laplace_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "multinomial_test",
-    srcs = ["python/kernel_tests/multinomial_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "mvn_diag_test",
     size = "small",
@@ -528,24 +388,6 @@ cuda_py_test(
     tags = ["nomsan"],  # disable to avoid false positives from scipy.
 )
 
-cuda_py_test(
-    name = "student_t_test",
-    size = "small",
-    srcs = ["python/kernel_tests/student_t_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-    tags = ["nomsan"],  # disable to avoid false positives from scipy.
-)
-
 cuda_py_test(
     name = "vector_student_t_test",
     size = "medium",
@@ -562,22 +404,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "uniform_test",
-    size = "small",
-    srcs = ["python/kernel_tests/uniform_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-    ],
-)
-
 cuda_py_test(
     name = "wishart_test",
     size = "small",
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index cafa477f44..6ea74fab0e 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -23,25 +23,16 @@ from __future__ import print_function
 # pylint: disable=unused-import,wildcard-import,line-too-long,g-importing-member
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops.bernoulli import *
-from tensorflow.contrib.distributions.python.ops.beta import *
 from tensorflow.contrib.distributions.python.ops.binomial import *
-from tensorflow.contrib.distributions.python.ops.categorical import *
 from tensorflow.contrib.distributions.python.ops.chi2 import *
 from tensorflow.contrib.distributions.python.ops.conditional_transformed_distribution import *
 from tensorflow.contrib.distributions.python.ops.deterministic import *
-from tensorflow.contrib.distributions.python.ops.dirichlet import *
-from tensorflow.contrib.distributions.python.ops.dirichlet_multinomial import *
 from tensorflow.contrib.distributions.python.ops.distribution_util import matrix_diag_transform
 from tensorflow.contrib.distributions.python.ops.distribution_util import softplus_inverse
-from tensorflow.contrib.distributions.python.ops.exponential import *
-from tensorflow.contrib.distributions.python.ops.gamma import *
 from tensorflow.contrib.distributions.python.ops.geometric import *
 from tensorflow.contrib.distributions.python.ops.inverse_gamma import *
-from tensorflow.contrib.distributions.python.ops.laplace import *
 from tensorflow.contrib.distributions.python.ops.logistic import *
 from tensorflow.contrib.distributions.python.ops.mixture import *
-from tensorflow.contrib.distributions.python.ops.multinomial import *
 from tensorflow.contrib.distributions.python.ops.mvn_diag import *
 from tensorflow.contrib.distributions.python.ops.mvn_diag_plus_low_rank import *
 from tensorflow.contrib.distributions.python.ops.mvn_tril import *
@@ -53,14 +44,23 @@ from tensorflow.contrib.distributions.python.ops.quantized_distribution import *
 from tensorflow.contrib.distributions.python.ops.relaxed_bernoulli import *
 from tensorflow.contrib.distributions.python.ops.relaxed_onehot_categorical import *
 from tensorflow.contrib.distributions.python.ops.sample_stats import *
-from tensorflow.contrib.distributions.python.ops.student_t import *
 from tensorflow.contrib.distributions.python.ops.transformed_distribution import *
-from tensorflow.contrib.distributions.python.ops.uniform import *
 from tensorflow.contrib.distributions.python.ops.wishart import *
+from tensorflow.python.ops.distributions.bernoulli import *
+from tensorflow.python.ops.distributions.beta import *
+from tensorflow.python.ops.distributions.categorical import *
 from tensorflow.python.ops.distributions.conditional_distribution import *
+from tensorflow.python.ops.distributions.dirichlet import *
+from tensorflow.python.ops.distributions.dirichlet_multinomial import *
 from tensorflow.python.ops.distributions.distribution import *
+from tensorflow.python.ops.distributions.exponential import *
+from tensorflow.python.ops.distributions.gamma import *
 from tensorflow.python.ops.distributions.kullback_leibler import *
+from tensorflow.python.ops.distributions.laplace import *
+from tensorflow.python.ops.distributions.multinomial import *
 from tensorflow.python.ops.distributions.normal import *
+from tensorflow.python.ops.distributions.student_t import *
+from tensorflow.python.ops.distributions.uniform import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
index 267e4ad350..a4688829f1 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
 from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import gamma as gamma_lib
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
index 267e4ad350..a4688829f1 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
 from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import gamma as gamma_lib
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py b/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py
index a083442332..ff3535c626 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import uniform as uniform_lib
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import uniform as uniform_lib
 
 
 def assert_finite(array):
diff --git a/tensorflow/contrib/distributions/python/ops/chi2.py b/tensorflow/contrib/distributions/python/ops/chi2.py
index 45d3accdd6..bdd5571c96 100644
--- a/tensorflow/contrib/distributions/python/ops/chi2.py
+++ b/tensorflow/contrib/distributions/python/ops/chi2.py
@@ -18,11 +18,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import gamma
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import gamma
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/mixture.py b/tensorflow/contrib/distributions/python/ops/mixture.py
index 6d318014ad..f3b09f60f3 100644
--- a/tensorflow/contrib/distributions/python/ops/mixture.py
+++ b/tensorflow/contrib/distributions/python/ops/mixture.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import categorical
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
@@ -29,6 +28,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import categorical
 from tensorflow.python.ops.distributions import distribution
 from tensorflow.python.ops.distributions import util as distribution_util
 
diff --git a/tensorflow/contrib/distributions/python/ops/vector_student_t.py b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
index d7115f6f0b..299ff36962 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
@@ -19,13 +19,13 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import student_t
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import student_t
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/seq2seq/python/ops/helper.py b/tensorflow/contrib/seq2seq/python/ops/helper.py
index d6c0527ad2..bdd7d7ca73 100644
--- a/tensorflow/contrib/seq2seq/python/ops/helper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/helper.py
@@ -23,8 +23,6 @@ import abc
 
 import six
 
-from tensorflow.contrib.distributions.python.ops import bernoulli
-from tensorflow.contrib.distributions.python.ops import categorical
 from tensorflow.contrib.seq2seq.python.ops import decoder
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -35,6 +33,8 @@ from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import tensor_array_ops
+from tensorflow.python.ops.distributions import bernoulli
+from tensorflow.python.ops.distributions import categorical
 from tensorflow.python.util import nest
 
 __all__ = [
diff --git a/tensorflow/python/kernel_tests/distributions/BUILD b/tensorflow/python/kernel_tests/distributions/BUILD
index 3c1a4d5125..3630adc954 100644
--- a/tensorflow/python/kernel_tests/distributions/BUILD
+++ b/tensorflow/python/kernel_tests/distributions/BUILD
@@ -41,6 +41,180 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "beta_test",
+    size = "small",
+    srcs = ["beta_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "bernoulli_test",
+    size = "small",
+    srcs = ["bernoulli_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "categorical_test",
+    size = "small",
+    srcs = ["categorical_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:random_ops",
+    ],
+)
+
+cuda_py_test(
+    name = "dirichlet_test",
+    size = "small",
+    srcs = ["dirichlet_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "dirichlet_multinomial_test",
+    size = "medium",
+    srcs = ["dirichlet_multinomial_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "exponential_test",
+    srcs = ["exponential_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "gamma_test",
+    srcs = ["gamma_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "laplace_test",
+    srcs = ["laplace_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "multinomial_test",
+    srcs = ["multinomial_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "student_t_test",
+    size = "small",
+    srcs = ["student_t_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+    tags = ["nomsan"],  # disable to avoid false positives from scipy.
+)
+
+cuda_py_test(
+    name = "uniform_test",
+    size = "small",
+    srcs = ["uniform_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+    ],
+)
+
 cuda_py_test(
     name = "normal_test",
     size = "medium",
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py b/tensorflow/python/kernel_tests/distributions/bernoulli_test.py
similarity index 94%
rename from tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
rename to tensorflow/python/kernel_tests/distributions/bernoulli_test.py
index e8b0eb4eb8..ef93c4dab0 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
+++ b/tensorflow/python/kernel_tests/distributions/bernoulli_test.py
@@ -18,15 +18,30 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-import scipy.special
-from tensorflow.contrib.distributions.python.ops import bernoulli
+
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import bernoulli
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+special = try_import("scipy.special")
 
 
 def make_bernoulli(batch_shape, dtype=dtypes.int32):
@@ -54,13 +69,16 @@ class BernoulliTest(test.TestCase):
     with self.test_session():
       self.assertAllClose(logits, dist.logits.eval())
 
+    if not special:
+      return
+
     with self.test_session():
-      self.assertAllClose(scipy.special.expit(logits), dist.probs.eval())
+      self.assertAllClose(special.expit(logits), dist.probs.eval())
 
     p = [0.01, 0.99, 0.42]
     dist = bernoulli.Bernoulli(probs=p)
     with self.test_session():
-      self.assertAllClose(scipy.special.logit(p), dist.logits.eval())
+      self.assertAllClose(special.logit(p), dist.logits.eval())
 
   def testInvalidP(self):
     invalid_ps = [1.01, 2.]
@@ -160,7 +178,9 @@ class BernoulliTest(test.TestCase):
   def testPmfWithP(self):
     p = [[0.2, 0.4], [0.3, 0.6]]
     self._testPmf(probs=p)
-    self._testPmf(logits=scipy.special.logit(p))
+    if not special:
+      return
+    self._testPmf(logits=special.logit(p))
 
   def testBroadcasting(self):
     with self.test_session():
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py b/tensorflow/python/kernel_tests/distributions/beta_test.py
similarity index 94%
rename from tensorflow/contrib/distributions/python/kernel_tests/beta_test.py
rename to tensorflow/python/kernel_tests/distributions/beta_test.py
index ec16a85991..91a451f033 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py
+++ b/tensorflow/python/kernel_tests/distributions/beta_test.py
@@ -16,18 +16,33 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import special
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import beta as beta_lib
+
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import random_seed
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import beta as beta_lib
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+special = try_import("scipy.special")
+stats = try_import("scipy.stats")
 
 
 class BetaTest(test.TestCase):
@@ -167,18 +182,22 @@ class BetaTest(test.TestCase):
     with session.Session():
       a = [1., 2, 3]
       b = [2., 4, 1.2]
-      expected_mean = stats.beta.mean(a, b)
       dist = beta_lib.Beta(a, b)
       self.assertEqual(dist.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_mean = stats.beta.mean(a, b)
       self.assertAllClose(expected_mean, dist.mean().eval())
 
   def testBetaVariance(self):
     with session.Session():
       a = [1., 2, 3]
       b = [2., 4, 1.2]
-      expected_variance = stats.beta.var(a, b)
       dist = beta_lib.Beta(a, b)
       self.assertEqual(dist.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variance = stats.beta.var(a, b)
       self.assertAllClose(expected_variance, dist.variance().eval())
 
   def testBetaMode(self):
@@ -228,9 +247,11 @@ class BetaTest(test.TestCase):
     with session.Session():
       a = [1., 2, 3]
       b = [2., 4, 1.2]
-      expected_entropy = stats.beta.entropy(a, b)
       dist = beta_lib.Beta(a, b)
       self.assertEqual(dist.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.beta.entropy(a, b)
       self.assertAllClose(expected_entropy, dist.entropy().eval())
 
   def testBetaSample(self):
@@ -243,6 +264,8 @@ class BetaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000,))
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       self.assertLess(
           stats.kstest(
               # Beta is a univariate distribution.
@@ -286,6 +309,8 @@ class BetaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000, 3, 2, 2))
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values[:, 1, :].mean(axis=0),
           stats.beta.mean(a, b)[1, :],
@@ -301,6 +326,8 @@ class BetaTest(test.TestCase):
         actual = beta_lib.Beta(a, b).cdf(x).eval()
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 0. <= x)
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 1. >= x)
+        if not stats:
+          return
         self.assertAllClose(stats.beta.cdf(x, a, b), actual, rtol=1e-4, atol=0)
 
   def testBetaLogCdf(self):
@@ -313,6 +340,8 @@ class BetaTest(test.TestCase):
         actual = math_ops.exp(beta_lib.Beta(a, b).log_cdf(x)).eval()
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 0. <= x)
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 1. >= x)
+        if not stats:
+          return
         self.assertAllClose(stats.beta.cdf(x, a, b), actual, rtol=1e-4, atol=0)
 
   def testBetaWithSoftplusConcentration(self):
@@ -342,6 +371,8 @@ class BetaTest(test.TestCase):
         d2_sp = beta_lib.BetaWithSoftplusConcentration(concentration1=a2_sp,
                                                        concentration0=b2_sp)
 
+        if not special:
+          return
         kl_expected = (special.betaln(a2, b2) - special.betaln(a1, b1) +
                        (a1 - a2) * special.digamma(a1) +
                        (b1 - b2) * special.digamma(b1) +
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py b/tensorflow/python/kernel_tests/distributions/categorical_test.py
similarity index 99%
rename from tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py
rename to tensorflow/python/kernel_tests/distributions/categorical_test.py
index 269c02ede3..bfdb5fa9fe 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py
+++ b/tensorflow/python/kernel_tests/distributions/categorical_test.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import categorical
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_util
@@ -29,6 +28,7 @@ from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import categorical
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py b/tensorflow/python/kernel_tests/distributions/dirichlet_multinomial_test.py
similarity index 99%
rename from tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
rename to tensorflow/python/kernel_tests/distributions/dirichlet_multinomial_test.py
index bc25366cfa..d009f4e931 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
+++ b/tensorflow/python/kernel_tests/distributions/dirichlet_multinomial_test.py
@@ -17,14 +17,15 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-from tensorflow.contrib import distributions
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import dirichlet_multinomial
 from tensorflow.python.platform import test
 
-ds = distributions
+
+ds = dirichlet_multinomial
 
 
 class DirichletMultinomialTest(test.TestCase):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_test.py b/tensorflow/python/kernel_tests/distributions/dirichlet_test.py
similarity index 94%
rename from tensorflow/contrib/distributions/python/kernel_tests/dirichlet_test.py
rename to tensorflow/python/kernel_tests/distributions/dirichlet_test.py
index cd634da09d..a2f1de5aaf 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_test.py
+++ b/tensorflow/python/kernel_tests/distributions/dirichlet_test.py
@@ -16,14 +16,29 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import dirichlet as dirichlet_lib
+
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import dirichlet as dirichlet_lib
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
 
 
 class DirichletTest(test.TestCase):
@@ -132,9 +147,11 @@ class DirichletTest(test.TestCase):
   def testMean(self):
     with self.test_session():
       alpha = [1., 2, 3]
-      expected_mean = stats.dirichlet.mean(alpha)
       dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
       self.assertEqual(dirichlet.mean().get_shape(), [3])
+      if not stats:
+        return
+      expected_mean = stats.dirichlet.mean(alpha)
       self.assertAllClose(dirichlet.mean().eval(), expected_mean)
 
   def testCovarianceFromSampling(self):
@@ -177,11 +194,13 @@ class DirichletTest(test.TestCase):
     with self.test_session():
       alpha = [1., 2, 3]
       denominator = np.sum(alpha)**2 * (np.sum(alpha) + 1)
+      dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
+      self.assertEqual(dirichlet.covariance().get_shape(), (3, 3))
+      if not stats:
+        return
       expected_covariance = np.diag(stats.dirichlet.var(alpha))
       expected_covariance += [[0., -2, -3], [-2, 0, -6],
                               [-3, -6, 0]] / denominator
-      dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
-      self.assertEqual(dirichlet.covariance().get_shape(), (3, 3))
       self.assertAllClose(dirichlet.covariance().eval(), expected_covariance)
 
   def testMode(self):
@@ -213,9 +232,11 @@ class DirichletTest(test.TestCase):
   def testEntropy(self):
     with self.test_session():
       alpha = [1., 2, 3]
-      expected_entropy = stats.dirichlet.entropy(alpha)
       dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
       self.assertEqual(dirichlet.entropy().get_shape(), ())
+      if not stats:
+        return
+      expected_entropy = stats.dirichlet.entropy(alpha)
       self.assertAllClose(dirichlet.entropy().eval(), expected_entropy)
 
   def testSample(self):
@@ -227,6 +248,8 @@ class DirichletTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000, 2))
       self.assertTrue(np.all(sample_values > 0.0))
+      if not stats:
+        return
       self.assertLess(
           stats.kstest(
               # Beta is a univariate distribution.
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/exponential_test.py b/tensorflow/python/kernel_tests/distributions/exponential_test.py
similarity index 88%
rename from tensorflow/contrib/distributions/python/kernel_tests/exponential_test.py
rename to tensorflow/python/kernel_tests/distributions/exponential_test.py
index 6171202413..7afdf0f947 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/exponential_test.py
+++ b/tensorflow/python/kernel_tests/distributions/exponential_test.py
@@ -18,13 +18,28 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import exponential as exponential_lib
+
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import exponential as exponential_lib
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
 
 
 class ExponentialTest(test.TestCase):
@@ -36,14 +51,17 @@ class ExponentialTest(test.TestCase):
       lam_v = 2.0
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
       exponential = exponential_lib.Exponential(rate=lam)
-      expected_log_pdf = stats.expon.logpdf(x, scale=1 / lam_v)
 
       log_pdf = exponential.log_prob(x)
       self.assertEqual(log_pdf.get_shape(), (6,))
-      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
 
       pdf = exponential.prob(x)
       self.assertEqual(pdf.get_shape(), (6,))
+
+      if not stats:
+        return
+      expected_log_pdf = stats.expon.logpdf(x, scale=1 / lam_v)
+      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
       self.assertAllClose(pdf.eval(), np.exp(expected_log_pdf))
 
   def testExponentialCDF(self):
@@ -54,34 +72,43 @@ class ExponentialTest(test.TestCase):
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       exponential = exponential_lib.Exponential(rate=lam)
-      expected_cdf = stats.expon.cdf(x, scale=1 / lam_v)
 
       cdf = exponential.cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+
+      if not stats:
+        return
+      expected_cdf = stats.expon.cdf(x, scale=1 / lam_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testExponentialMean(self):
     with session.Session():
       lam_v = np.array([1.0, 4.0, 2.5])
-      expected_mean = stats.expon.mean(scale=1 / lam_v)
       exponential = exponential_lib.Exponential(rate=lam_v)
       self.assertEqual(exponential.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_mean = stats.expon.mean(scale=1 / lam_v)
       self.assertAllClose(exponential.mean().eval(), expected_mean)
 
   def testExponentialVariance(self):
     with session.Session():
       lam_v = np.array([1.0, 4.0, 2.5])
-      expected_variance = stats.expon.var(scale=1 / lam_v)
       exponential = exponential_lib.Exponential(rate=lam_v)
       self.assertEqual(exponential.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variance = stats.expon.var(scale=1 / lam_v)
       self.assertAllClose(exponential.variance().eval(), expected_variance)
 
   def testExponentialEntropy(self):
     with session.Session():
       lam_v = np.array([1.0, 4.0, 2.5])
-      expected_entropy = stats.expon.entropy(scale=1 / lam_v)
       exponential = exponential_lib.Exponential(rate=lam_v)
       self.assertEqual(exponential.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.expon.entropy(scale=1 / lam_v)
       self.assertAllClose(exponential.entropy().eval(), expected_entropy)
 
   def testExponentialSample(self):
@@ -95,6 +122,8 @@ class ExponentialTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000, 2))
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       for i in range(2):
         self.assertLess(
             stats.kstest(
@@ -116,6 +145,8 @@ class ExponentialTest(test.TestCase):
       sample_values = samples.eval()
 
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       for i in range(2):
         self.assertLess(
             stats.kstest(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py b/tensorflow/python/kernel_tests/distributions/gamma_test.py
similarity index 93%
rename from tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py
rename to tensorflow/python/kernel_tests/distributions/gamma_test.py
index 5ccf2308a5..5e4813ac07 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py
+++ b/tensorflow/python/kernel_tests/distributions/gamma_test.py
@@ -17,18 +17,32 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import special
-from scipy import stats
 
-from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import gamma as gamma_lib
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+special = try_import("scipy.special")
+stats = try_import("scipy.stats")
 
 
 class GammaTest(test.TestCase):
@@ -53,13 +67,14 @@ class GammaTest(test.TestCase):
       beta_v = 3.0
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
       log_pdf = gamma.log_prob(x)
       self.assertEqual(log_pdf.get_shape(), (6,))
-      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
-
       pdf = gamma.prob(x)
       self.assertEqual(pdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
+      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
       self.assertAllClose(pdf.eval(), np.exp(expected_log_pdf))
 
   def testGammaLogPDFMultidimensional(self):
@@ -71,15 +86,16 @@ class GammaTest(test.TestCase):
       beta_v = np.array([3.0, 4.0])
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
       log_pdf = gamma.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
-
       pdf = gamma.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+      if not stats:
+        return
+      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testGammaLogPDFMultidimensionalBroadcasting(self):
@@ -91,15 +107,17 @@ class GammaTest(test.TestCase):
       beta_v = 3.0
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
       log_pdf = gamma.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
-
       pdf = gamma.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+
+      if not stats:
+        return
+      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testGammaCDF(self):
@@ -112,10 +130,11 @@ class GammaTest(test.TestCase):
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_cdf = stats.gamma.cdf(x, alpha_v, scale=1 / beta_v)
-
       cdf = gamma.cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_cdf = stats.gamma.cdf(x, alpha_v, scale=1 / beta_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testGammaMean(self):
@@ -123,8 +142,10 @@ class GammaTest(test.TestCase):
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
-      expected_means = stats.gamma.mean(alpha_v, scale=1 / beta_v)
       self.assertEqual(gamma.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_means = stats.gamma.mean(alpha_v, scale=1 / beta_v)
       self.assertAllClose(gamma.mean().eval(), expected_means)
 
   def testGammaModeAllowNanStatsIsFalseWorksWhenAllBatchMembersAreDefined(self):
@@ -165,8 +186,10 @@ class GammaTest(test.TestCase):
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
-      expected_variances = stats.gamma.var(alpha_v, scale=1 / beta_v)
       self.assertEqual(gamma.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variances = stats.gamma.var(alpha_v, scale=1 / beta_v)
       self.assertAllClose(gamma.variance().eval(), expected_variances)
 
   def testGammaStd(self):
@@ -174,17 +197,21 @@ class GammaTest(test.TestCase):
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
-      expected_stddev = stats.gamma.std(alpha_v, scale=1. / beta_v)
       self.assertEqual(gamma.stddev().get_shape(), (3,))
+      if not stats:
+        return
+      expected_stddev = stats.gamma.std(alpha_v, scale=1. / beta_v)
       self.assertAllClose(gamma.stddev().eval(), expected_stddev)
 
   def testGammaEntropy(self):
     with self.test_session():
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
-      expected_entropy = stats.gamma.entropy(alpha_v, scale=1 / beta_v)
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
       self.assertEqual(gamma.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.gamma.entropy(alpha_v, scale=1 / beta_v)
       self.assertAllClose(gamma.entropy().eval(), expected_entropy)
 
   def testGammaSampleSmallAlpha(self):
@@ -199,6 +226,9 @@ class GammaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (n,))
       self.assertEqual(sample_values.shape, (n,))
+      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(),
           stats.gamma.mean(
@@ -208,7 +238,6 @@ class GammaTest(test.TestCase):
           sample_values.var(),
           stats.gamma.var(alpha_v, scale=1 / beta_v),
           atol=.15)
-      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
 
   def testGammaSample(self):
     with session.Session():
@@ -222,6 +251,9 @@ class GammaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (n,))
       self.assertEqual(sample_values.shape, (n,))
+      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(),
           stats.gamma.mean(
@@ -231,7 +263,6 @@ class GammaTest(test.TestCase):
           sample_values.var(),
           stats.gamma.var(alpha_v, scale=1 / beta_v),
           atol=.15)
-      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
 
   def testGammaSampleMultiDimensional(self):
     with session.Session():
@@ -246,6 +277,8 @@ class GammaTest(test.TestCase):
       zeros = np.zeros_like(alpha_v + beta_v)  # 10 x 100
       alpha_bc = alpha_v + zeros
       beta_bc = beta_v + zeros
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(axis=0),
           stats.gamma.mean(
@@ -266,6 +299,8 @@ class GammaTest(test.TestCase):
 
   def _kstest(self, alpha, beta, samples):
     # Uses the Kolmogorov-Smirnov test for goodness of fit.
+    if not stats:
+      return True  # If we can't test, return that the test passes.
     ks, _ = stats.kstest(samples, stats.gamma(alpha, scale=1 / beta).cdf)
     # Return True when the test passes.
     return ks < 0.02
@@ -279,6 +314,12 @@ class GammaTest(test.TestCase):
       sample_vals, pdf_vals = sess.run([samples, pdfs])
       self.assertEqual(samples.get_shape(), (num, 2, 2))
       self.assertEqual(pdfs.get_shape(), (num, 2, 2))
+      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
+      if not stats:
+        return
       self.assertAllClose(
           stats.gamma.mean(
               [[7., 11.], [7., 11.]], scale=1 / np.array([[5., 5.], [6., 6.]])),
@@ -289,10 +330,6 @@ class GammaTest(test.TestCase):
                           scale=1 / np.array([[5., 5.], [6., 6.]])),
           sample_vals.var(axis=0),
           atol=.1)
-      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
 
   def _assertIntegral(self, sample_vals, pdf_vals, err=1e-3):
     s_p = zip(sample_vals, pdf_vals)
@@ -350,6 +387,10 @@ class GammaTest(test.TestCase):
     # Execute graph.
     [kl_sample_, kl_actual_] = sess.run([kl_sample, kl_actual])
 
+    self.assertEqual(beta0.shape, kl_actual.get_shape())
+
+    if not special:
+      return
     kl_expected = ((alpha0 - alpha1) * special.digamma(alpha0)
                    + special.gammaln(alpha1)
                    - special.gammaln(alpha0)
@@ -357,7 +398,6 @@ class GammaTest(test.TestCase):
                    - alpha1 * np.log(beta1)
                    + alpha0 * (beta1 / beta0 - 1.))
 
-    self.assertEqual(beta0.shape, kl_actual.get_shape())
     self.assertAllClose(kl_expected, kl_actual_, atol=0., rtol=1e-6)
     self.assertAllClose(kl_sample_, kl_actual_, atol=0., rtol=1e-2)
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/laplace_test.py b/tensorflow/python/kernel_tests/distributions/laplace_test.py
similarity index 92%
rename from tensorflow/contrib/distributions/python/kernel_tests/laplace_test.py
rename to tensorflow/python/kernel_tests/distributions/laplace_test.py
index 1f58d495f0..55577386c4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/laplace_test.py
+++ b/tensorflow/python/kernel_tests/distributions/laplace_test.py
@@ -17,15 +17,31 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import laplace as laplace_lib
+
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import laplace as laplace_lib
 from tensorflow.python.platform import test
 
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
+
 
 class LaplaceTest(test.TestCase):
 
@@ -49,9 +65,11 @@ class LaplaceTest(test.TestCase):
       scale_v = 3.0
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       log_pdf = laplace.log_prob(x)
       self.assertEqual(log_pdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       self.assertAllClose(log_pdf.eval(), expected_log_pdf)
 
       pdf = laplace.prob(x)
@@ -67,15 +85,17 @@ class LaplaceTest(test.TestCase):
       scale_v = np.array([3.0, 4.0])
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       log_pdf = laplace.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
 
       pdf = laplace.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+      if not stats:
+        return
+      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testLaplaceLogPDFMultidimensionalBroadcasting(self):
@@ -87,15 +107,17 @@ class LaplaceTest(test.TestCase):
       scale_v = 3.0
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       log_pdf = laplace.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
 
       pdf = laplace.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+      if not stats:
+        return
+      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testLaplaceCDF(self):
@@ -108,10 +130,12 @@ class LaplaceTest(test.TestCase):
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_cdf = stats.laplace.cdf(x, loc_v, scale=scale_v)
 
       cdf = laplace.cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_cdf = stats.laplace.cdf(x, loc_v, scale=scale_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testLaplaceLogCDF(self):
@@ -124,10 +148,12 @@ class LaplaceTest(test.TestCase):
       x = np.array([-2.5, 2.5, -4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_cdf = stats.laplace.logcdf(x, loc_v, scale=scale_v)
 
       cdf = laplace.log_cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_cdf = stats.laplace.logcdf(x, loc_v, scale=scale_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testLaplaceLogSurvivalFunction(self):
@@ -140,10 +166,12 @@ class LaplaceTest(test.TestCase):
       x = np.array([-2.5, 2.5, -4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_sf = stats.laplace.logsf(x, loc_v, scale=scale_v)
 
       sf = laplace.log_survival_function(x)
       self.assertEqual(sf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_sf = stats.laplace.logsf(x, loc_v, scale=scale_v)
       self.assertAllClose(sf.eval(), expected_sf)
 
   def testLaplaceMean(self):
@@ -151,8 +179,10 @@ class LaplaceTest(test.TestCase):
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
-      expected_means = stats.laplace.mean(loc_v, scale=scale_v)
       self.assertEqual(laplace.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_means = stats.laplace.mean(loc_v, scale=scale_v)
       self.assertAllClose(laplace.mean().eval(), expected_means)
 
   def testLaplaceMode(self):
@@ -168,8 +198,10 @@ class LaplaceTest(test.TestCase):
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
-      expected_variances = stats.laplace.var(loc_v, scale=scale_v)
       self.assertEqual(laplace.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variances = stats.laplace.var(loc_v, scale=scale_v)
       self.assertAllClose(laplace.variance().eval(), expected_variances)
 
   def testLaplaceStd(self):
@@ -177,17 +209,21 @@ class LaplaceTest(test.TestCase):
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
-      expected_stddev = stats.laplace.std(loc_v, scale=scale_v)
       self.assertEqual(laplace.stddev().get_shape(), (3,))
+      if not stats:
+        return
+      expected_stddev = stats.laplace.std(loc_v, scale=scale_v)
       self.assertAllClose(laplace.stddev().eval(), expected_stddev)
 
   def testLaplaceEntropy(self):
     with self.test_session():
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
-      expected_entropy = stats.laplace.entropy(loc_v, scale=scale_v)
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
       self.assertEqual(laplace.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.laplace.entropy(loc_v, scale=scale_v)
       self.assertAllClose(laplace.entropy().eval(), expected_entropy)
 
   def testLaplaceSample(self):
@@ -202,6 +238,8 @@ class LaplaceTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (n,))
       self.assertEqual(sample_values.shape, (n,))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(),
           stats.laplace.mean(
@@ -228,6 +266,8 @@ class LaplaceTest(test.TestCase):
       zeros = np.zeros_like(loc_v + scale_v)  # 10 x 100
       loc_bc = loc_v + zeros
       scale_bc = scale_v + zeros
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(axis=0),
           stats.laplace.mean(
@@ -250,6 +290,8 @@ class LaplaceTest(test.TestCase):
 
   def _kstest(self, loc, scale, samples):
     # Uses the Kolmogorov-Smirnov test for goodness of fit.
+    if not stats:
+      return True  # If scipy isn't available, return "True" for passing
     ks, _ = stats.kstest(samples, stats.laplace(loc, scale=scale).cdf)
     # Return True when the test passes.
     return ks < 0.02
@@ -263,6 +305,12 @@ class LaplaceTest(test.TestCase):
       sample_vals, pdf_vals = sess.run([samples, pdfs])
       self.assertEqual(samples.get_shape(), (num, 2, 2))
       self.assertEqual(pdfs.get_shape(), (num, 2, 2))
+      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
+      if not stats:
+        return
       self.assertAllClose(
           stats.laplace.mean(
               [[7., 11.], [7., 11.]], scale=np.array([[5., 5.], [6., 6.]])),
@@ -275,10 +323,6 @@ class LaplaceTest(test.TestCase):
           sample_vals.var(axis=0),
           rtol=0.05,
           atol=0.)
-      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
 
   def _assertIntegral(self, sample_vals, pdf_vals, err=1e-3):
     s_p = zip(sample_vals, pdf_vals)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py b/tensorflow/python/kernel_tests/distributions/multinomial_test.py
similarity index 87%
rename from tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
rename to tensorflow/python/kernel_tests/distributions/multinomial_test.py
index b1c0c9f7a9..80caf10391 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
+++ b/tensorflow/python/kernel_tests/distributions/multinomial_test.py
@@ -17,15 +17,14 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-from tensorflow.contrib import distributions
+
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import multinomial
 from tensorflow.python.platform import test
 
-ds = distributions
-
 
 class MultinomialTest(test.TestCase):
 
@@ -35,7 +34,7 @@ class MultinomialTest(test.TestCase):
   def testSimpleShapes(self):
     with self.test_session():
       p = [.1, .3, .6]
-      dist = ds.Multinomial(total_count=1., probs=p)
+      dist = multinomial.Multinomial(total_count=1., probs=p)
       self.assertEqual(3, dist.event_shape_tensor().eval())
       self.assertAllEqual([], dist.batch_shape_tensor().eval())
       self.assertEqual(tensor_shape.TensorShape([3]), dist.event_shape)
@@ -45,7 +44,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = 0.5 * np.ones([3, 2, 2], dtype=np.float32)
       n = [[3., 2], [4, 5], [6, 7]]
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       self.assertEqual(2, dist.event_shape_tensor().eval())
       self.assertAllEqual([3, 2], dist.batch_shape_tensor().eval())
       self.assertEqual(tensor_shape.TensorShape([2]), dist.event_shape)
@@ -55,14 +54,14 @@ class MultinomialTest(test.TestCase):
     p = [[0.1, 0.2, 0.7], [0.2, 0.3, 0.5]]
     n = [[3.], [4]]
     with self.test_session():
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       self.assertEqual((2, 1), dist.total_count.get_shape())
       self.assertAllClose(n, dist.total_count.eval())
 
   def testP(self):
     p = [[0.1, 0.2, 0.7]]
     with self.test_session():
-      dist = ds.Multinomial(total_count=3., probs=p)
+      dist = multinomial.Multinomial(total_count=3., probs=p)
       self.assertEqual((1, 3), dist.probs.get_shape())
       self.assertEqual((1, 3), dist.logits.get_shape())
       self.assertAllClose(p, dist.probs.eval())
@@ -71,7 +70,7 @@ class MultinomialTest(test.TestCase):
     p = np.array([[0.1, 0.2, 0.7]], dtype=np.float32)
     logits = np.log(p) - 50.
     with self.test_session():
-      multinom = ds.Multinomial(total_count=3., logits=logits)
+      multinom = multinomial.Multinomial(total_count=3., logits=logits)
       self.assertEqual((1, 3), multinom.probs.get_shape())
       self.assertEqual((1, 3), multinom.logits.get_shape())
       self.assertAllClose(p, multinom.probs.eval())
@@ -81,7 +80,7 @@ class MultinomialTest(test.TestCase):
     p = [[0.1, 0.2, 0.7]]
     n = [[5.]]
     with self.test_session():
-      dist = ds.Multinomial(total_count=n, probs=p, validate_args=True)
+      dist = multinomial.Multinomial(total_count=n, probs=p, validate_args=True)
       dist.prob([2., 3, 0]).eval()
       dist.prob([3., 0, 2]).eval()
       with self.assertRaisesOpError("must be non-negative"):
@@ -94,7 +93,8 @@ class MultinomialTest(test.TestCase):
     n = [[5.]]
     with self.test_session():
       # No errors with integer n.
-      multinom = ds.Multinomial(total_count=n, probs=p, validate_args=True)
+      multinom = multinomial.Multinomial(
+          total_count=n, probs=p, validate_args=True)
       multinom.prob([2., 1, 2]).eval()
       multinom.prob([3., 0, 2]).eval()
       # Counts don't sum to n.
@@ -106,7 +106,8 @@ class MultinomialTest(test.TestCase):
           "cannot contain fractional components."):
         multinom.prob(x).eval(feed_dict={x: [1.0, 2.5, 1.5]})
 
-      multinom = ds.Multinomial(total_count=n, probs=p, validate_args=False)
+      multinom = multinomial.Multinomial(
+          total_count=n, probs=p, validate_args=False)
       multinom.prob([1., 2., 2.]).eval()
       # Non-integer arguments work.
       multinom.prob([1.0, 2.5, 1.5]).eval()
@@ -116,7 +117,7 @@ class MultinomialTest(test.TestCase):
       # Both zero-batches.  No broadcast
       p = [0.5, 0.5]
       counts = [1., 0]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose(0.5, pmf.eval())
       self.assertEqual((), pmf.get_shape())
 
@@ -125,7 +126,7 @@ class MultinomialTest(test.TestCase):
       # Both zero-batches.  No broadcast
       p = [0.1, 0.9]
       counts = [3., 2]
-      dist = ds.Multinomial(total_count=5., probs=p)
+      dist = multinomial.Multinomial(total_count=5., probs=p)
       pmf = dist.prob(counts)
       # 5 choose 3 = 5 choose 2 = 10. 10 * (.9)^2 * (.1)^3 = 81/10000.
       self.assertAllClose(81. / 10000, pmf.eval())
@@ -135,7 +136,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [[0.1, 0.9]]
       counts = [[1., 0], [0, 1]]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose([0.1, 0.9], pmf.eval())
       self.assertEqual((2), pmf.get_shape())
 
@@ -143,7 +144,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [0.1, 0.9]
       counts = [[1., 0], [0, 1]]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose([0.1, 0.9], pmf.eval())
       self.assertEqual((2), pmf.get_shape())
 
@@ -151,7 +152,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [[0.1, 0.9], [0.7, 0.3]]
       counts = [[1., 0]]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose(pmf.eval(), [0.1, 0.7])
       self.assertEqual((2), pmf.get_shape())
 
@@ -159,7 +160,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [[0.1, 0.9], [0.7, 0.3]]
       counts = [1., 0]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose(pmf.eval(), [0.1, 0.7])
       self.assertEqual(pmf.get_shape(), (2))
 
@@ -171,7 +172,7 @@ class MultinomialTest(test.TestCase):
       n = [[3., 3], [3, 3]]
       # [2]
       counts = [2., 1]
-      pmf = ds.Multinomial(total_count=n, probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=n, probs=p).prob(counts)
       pmf.eval()
       self.assertEqual(pmf.get_shape(), (2, 2))
 
@@ -180,7 +181,7 @@ class MultinomialTest(test.TestCase):
       p = [0.1, 0.9]
       counts = [3., 2]
       n = np.full([4, 3], 5., dtype=np.float32)
-      pmf = ds.Multinomial(total_count=n, probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=n, probs=p).prob(counts)
       pmf.eval()
       self.assertEqual((4, 3), pmf.get_shape())
 
@@ -188,7 +189,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       n = 5.
       p = [0.1, 0.2, 0.7]
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       expected_means = 5 * np.array(p, dtype=np.float32)
       self.assertEqual((3,), dist.mean().get_shape())
       self.assertAllClose(expected_means, dist.mean().eval())
@@ -197,7 +198,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       n = 5.
       p = [0.1, 0.2, 0.7]
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       expected_covariances = [[9. / 20, -1 / 10, -7 / 20],
                               [-1 / 10, 4 / 5, -7 / 10],
                               [-7 / 20, -7 / 10, 21 / 20]]
@@ -210,7 +211,7 @@ class MultinomialTest(test.TestCase):
       n = [5.] * 2
       # Shape [4, 1, 2]
       p = [[[0.1, 0.9]], [[0.1, 0.9]]] * 2
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       # Shape [2, 2]
       inner_var = [[9. / 20, -9 / 20], [-9 / 20, 9 / 20]]
       # Shape [4, 2, 2, 2]
@@ -228,8 +229,8 @@ class MultinomialTest(test.TestCase):
     ns2 = np.random.randint(low=1, high=11, size=[6, 1]).astype(np.float32)
 
     with self.test_session():
-      dist = ds.Multinomial(ns, p)
-      dist2 = ds.Multinomial(ns2, p2)
+      dist = multinomial.Multinomial(ns, p)
+      dist2 = multinomial.Multinomial(ns2, p2)
 
       covariance = dist.covariance()
       covariance2 = dist2.covariance()
@@ -246,7 +247,8 @@ class MultinomialTest(test.TestCase):
     # doesn't support different total counts.
     n = np.float32(5)
     with self.test_session() as sess:
-      dist = ds.Multinomial(n, theta)  # batch_shape=[2], event_shape=[3]
+      # batch_shape=[2], event_shape=[3]
+      dist = multinomial.Multinomial(n, theta)
       x = dist.sample(int(250e3), seed=1)
       sample_mean = math_ops.reduce_mean(x, 0)
       x_centered = x - sample_mean[array_ops.newaxis, ...]
@@ -281,7 +283,7 @@ class MultinomialTest(test.TestCase):
 
   def testSampleUnbiasedNonScalarBatch(self):
     with self.test_session() as sess:
-      dist = ds.Multinomial(
+      dist = multinomial.Multinomial(
           total_count=5.,
           logits=math_ops.log(2. * self._rng.rand(4, 3, 2).astype(np.float32)))
       n = int(3e3)
@@ -310,7 +312,7 @@ class MultinomialTest(test.TestCase):
 
   def testSampleUnbiasedScalarBatch(self):
     with self.test_session() as sess:
-      dist = ds.Multinomial(
+      dist = multinomial.Multinomial(
           total_count=5.,
           logits=math_ops.log(2. * self._rng.rand(4).astype(np.float32)))
       n = int(5e3)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/student_t_test.py b/tensorflow/python/kernel_tests/distributions/student_t_test.py
similarity index 83%
rename from tensorflow/contrib/distributions/python/kernel_tests/student_t_test.py
rename to tensorflow/python/kernel_tests/distributions/student_t_test.py
index 209ef696ca..f1150de58e 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/student_t_test.py
+++ b/tensorflow/python/kernel_tests/distributions/student_t_test.py
@@ -18,19 +18,30 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
 import math
 
 import numpy as np
-from scipy import stats
-from tensorflow.contrib import distributions
-from tensorflow.contrib.distributions.python.ops import student_t
+
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import random_seed
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import student_t
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
 
-ds = distributions
+
+stats = try_import("scipy.stats")
 
 
 class StudentTTest(test.TestCase):
@@ -45,7 +56,7 @@ class StudentTTest(test.TestCase):
       mu_v = 7.
       sigma_v = 8.
       t = np.array([-2.5, 2.5, 8., 0., -1., 2.], dtype=np.float32)
-      student = ds.StudentT(df, loc=mu, scale=-sigma)
+      student = student_t.StudentT(df, loc=mu, scale=-sigma)
 
       log_pdf = student.log_prob(t)
       self.assertEquals(log_pdf.get_shape(), (6,))
@@ -54,6 +65,9 @@ class StudentTTest(test.TestCase):
       self.assertEquals(pdf.get_shape(), (6,))
       pdf_values = pdf.eval()
 
+      if not stats:
+        return
+
       expected_log_pdf = stats.t.logpdf(t, df_v, loc=mu_v, scale=sigma_v)
       expected_pdf = stats.t.pdf(t, df_v, loc=mu_v, scale=sigma_v)
       self.assertAllClose(expected_log_pdf, log_pdf_values)
@@ -72,13 +86,16 @@ class StudentTTest(test.TestCase):
       mu_v = np.array([3., -3.])
       sigma_v = np.array([np.sqrt(10.), np.sqrt(15.)])
       t = np.array([[-2.5, 2.5, 4., 0., -1., 2.]], dtype=np.float32).T
-      student = ds.StudentT(df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df, loc=mu, scale=sigma)
       log_pdf = student.log_prob(t)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
       pdf = student.prob(t)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+
+      if not stats:
+        return
       expected_log_pdf = stats.t.logpdf(t, df_v, loc=mu_v, scale=sigma_v)
       expected_pdf = stats.t.pdf(t, df_v, loc=mu_v, scale=sigma_v)
       self.assertAllClose(expected_log_pdf, log_pdf_values)
@@ -105,6 +122,8 @@ class StudentTTest(test.TestCase):
       self.assertEquals(cdf.get_shape(), (6,))
       cdf_values = cdf.eval()
 
+      if not stats:
+        return
       expected_log_cdf = stats.t.logcdf(t, df_v, loc=mu_v, scale=sigma_v)
       expected_cdf = stats.t.cdf(t, df_v, loc=mu_v, scale=sigma_v)
       self.assertAllClose(expected_log_cdf, log_cdf_values, atol=0., rtol=1e-5)
@@ -119,7 +138,7 @@ class StudentTTest(test.TestCase):
     mu_v = np.array([[1., -1, 0]])  # 1x3
     sigma_v = np.array([[1., -2., 3.]]).T  # transposed => 3x1
     with self.test_session():
-      student = ds.StudentT(df=df_v, loc=mu_v, scale=sigma_v)
+      student = student_t.StudentT(df=df_v, loc=mu_v, scale=sigma_v)
       ent = student.entropy()
       ent_values = ent.eval()
 
@@ -128,6 +147,8 @@ class StudentTTest(test.TestCase):
     sigma_bc = np.abs(sigma_v) * ones
     mu_bc = ones.T * mu_v
     df_bc = ones.T * df_v
+    if not stats:
+      return
     expected_entropy = stats.t.entropy(
         np.reshape(df_bc, [-1]),
         loc=np.reshape(mu_bc, [-1]),
@@ -144,7 +165,7 @@ class StudentTTest(test.TestCase):
       mu_v = 3.
       sigma_v = np.sqrt(10.)
       n = constant_op.constant(200000)
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       samples = student.sample(n, seed=123456)
       sample_values = samples.eval()
       n_val = 200000
@@ -166,11 +187,13 @@ class StudentTTest(test.TestCase):
       n = constant_op.constant(100)
 
       random_seed.set_random_seed(654321)
-      student = ds.StudentT(df=df, loc=mu, scale=sigma, name="student_t1")
+      student = student_t.StudentT(
+          df=df, loc=mu, scale=sigma, name="student_t1")
       samples1 = student.sample(n, seed=123456).eval()
 
       random_seed.set_random_seed(654321)
-      student2 = ds.StudentT(df=df, loc=mu, scale=sigma, name="student_t2")
+      student2 = student_t.StudentT(
+          df=df, loc=mu, scale=sigma, name="student_t2")
       samples2 = student2.sample(n, seed=123456).eval()
 
       self.assertAllClose(samples1, samples2)
@@ -180,7 +203,7 @@ class StudentTTest(test.TestCase):
       df_v = [1e-1, 1e-5, 1e-10, 1e-20]
       df = constant_op.constant(df_v)
       n = constant_op.constant(200000)
-      student = ds.StudentT(df=df, loc=1., scale=1.)
+      student = student_t.StudentT(df=df, loc=1., scale=1.)
       samples = student.sample(n, seed=123456)
       sample_values = samples.eval()
       n_val = 200000
@@ -198,7 +221,7 @@ class StudentTTest(test.TestCase):
       mu_v = [3., -3.]
       sigma_v = [np.sqrt(10.), np.sqrt(15.)]
       n = constant_op.constant(200000)
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       samples = student.sample(n, seed=123456)
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (200000, batch_size, 2))
@@ -222,6 +245,8 @@ class StudentTTest(test.TestCase):
   def _checkKLApprox(self, df, mu, sigma, samples):
     n = samples.size
     np.random.seed(137)
+    if not stats:
+      return
     sample_scipy = stats.t.rvs(df, loc=mu, scale=sigma, size=n)
     covg = 0.99
     r = stats.t.interval(covg, df, loc=mu, scale=sigma)
@@ -247,9 +272,9 @@ class StudentTTest(test.TestCase):
       self.assertEqual(student.prob(2.).get_shape(), (3,))
       self.assertEqual(student.sample(37, seed=123456).get_shape(), (37, 3,))
 
-    _check(ds.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
-    _check(ds.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
-    _check(ds.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
+    _check(student_t.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
+    _check(student_t.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
+    _check(student_t.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
 
   def testBroadcastingPdfArgs(self):
 
@@ -266,9 +291,9 @@ class StudentTTest(test.TestCase):
       xs = xs.T
       _assert_shape(student, xs, (3, 3))
 
-    _check(ds.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
-    _check(ds.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
-    _check(ds.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
+    _check(student_t.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
+    _check(student_t.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
+    _check(student_t.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
 
     def _check2d(student):
       _assert_shape(student, 2., (1, 3))
@@ -279,9 +304,9 @@ class StudentTTest(test.TestCase):
       xs = xs.T
       _assert_shape(student, xs, (3, 3))
 
-    _check2d(ds.StudentT(df=[[2., 3., 4.,]], loc=2., scale=1.))
-    _check2d(ds.StudentT(df=7., loc=[[2., 3., 4.,]], scale=1.))
-    _check2d(ds.StudentT(df=7., loc=3., scale=[[2., 3., 4.,]]))
+    _check2d(student_t.StudentT(df=[[2., 3., 4.,]], loc=2., scale=1.))
+    _check2d(student_t.StudentT(df=7., loc=[[2., 3., 4.,]], scale=1.))
+    _check2d(student_t.StudentT(df=7., loc=3., scale=[[2., 3., 4.,]]))
 
     def _check2d_rows(student):
       _assert_shape(student, 2., (3, 1))
@@ -292,22 +317,23 @@ class StudentTTest(test.TestCase):
       xs = xs.T  # (3,1)
       _assert_shape(student, xs, (3, 1))
 
-    _check2d_rows(ds.StudentT(df=[[2.], [3.], [4.]], loc=2., scale=1.))
-    _check2d_rows(ds.StudentT(df=7., loc=[[2.], [3.], [4.]], scale=1.))
-    _check2d_rows(ds.StudentT(df=7., loc=3., scale=[[2.], [3.], [4.]]))
+    _check2d_rows(student_t.StudentT(df=[[2.], [3.], [4.]], loc=2., scale=1.))
+    _check2d_rows(student_t.StudentT(df=7., loc=[[2.], [3.], [4.]], scale=1.))
+    _check2d_rows(student_t.StudentT(df=7., loc=3., scale=[[2.], [3.], [4.]]))
 
   def testMeanAllowNanStatsIsFalseWorksWhenAllBatchMembersAreDefined(self):
     with self.test_session():
       mu = [1., 3.3, 4.4]
-      student = ds.StudentT(df=[3., 5., 7.], loc=mu, scale=[3., 2., 1.])
+      student = student_t.StudentT(df=[3., 5., 7.], loc=mu, scale=[3., 2., 1.])
       mean = student.mean().eval()
       self.assertAllClose([1., 3.3, 4.4], mean)
 
   def testMeanAllowNanStatsIsFalseRaisesWhenBatchMemberIsUndefined(self):
     with self.test_session():
       mu = [1., 3.3, 4.4]
-      student = ds.StudentT(df=[0.5, 5., 7.], loc=mu, scale=[3., 2., 1.],
-                            allow_nan_stats=False)
+      student = student_t.StudentT(
+          df=[0.5, 5., 7.], loc=mu, scale=[3., 2., 1.],
+          allow_nan_stats=False)
       with self.assertRaisesOpError("x < y"):
         student.mean().eval()
 
@@ -315,8 +341,9 @@ class StudentTTest(test.TestCase):
     with self.test_session():
       mu = [-2, 0., 1., 3.3, 4.4]
       sigma = [5., 4., 3., 2., 1.]
-      student = ds.StudentT(df=[0.5, 1., 3., 5., 7.], loc=mu, scale=sigma,
-                            allow_nan_stats=True)
+      student = student_t.StudentT(
+          df=[0.5, 1., 3., 5., 7.], loc=mu, scale=sigma,
+          allow_nan_stats=True)
       mean = student.mean().eval()
       self.assertAllClose([np.nan, np.nan, 1., 3.3, 4.4], mean)
 
@@ -327,7 +354,8 @@ class StudentTTest(test.TestCase):
       df = [0.5, 1.5, 3., 5., 7.]
       mu = [-2, 0., 1., 3.3, 4.4]
       sigma = [5., 4., 3., 2., 1.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma, allow_nan_stats=True)
+      student = student_t.StudentT(
+          df=df, loc=mu, scale=sigma, allow_nan_stats=True)
       var = student.variance().eval()
       ## scipy uses inf for variance when the mean is undefined.  When mean is
       # undefined we say variance is undefined as well.  So test the first
@@ -336,6 +364,8 @@ class StudentTTest(test.TestCase):
       self.assertTrue(np.isnan(var[0]))
       var[0] = np.inf
 
+      if not stats:
+        return
       expected_var = [
           stats.t.var(d, loc=m, scale=s) for (d, m, s) in zip(df, mu, sigma)
       ]
@@ -348,9 +378,11 @@ class StudentTTest(test.TestCase):
       df = [1.5, 3., 5., 7.]
       mu = [0., 1., 3.3, 4.4]
       sigma = [4., 3., 2., 1.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       var = student.variance().eval()
 
+      if not stats:
+        return
       expected_var = [
           stats.t.var(d, loc=m, scale=s) for (d, m, s) in zip(df, mu, sigma)
       ]
@@ -359,13 +391,15 @@ class StudentTTest(test.TestCase):
   def testVarianceAllowNanStatsFalseRaisesForUndefinedBatchMembers(self):
     with self.test_session():
       # df <= 1 ==> variance not defined
-      student = ds.StudentT(df=1., loc=0., scale=1., allow_nan_stats=False)
+      student = student_t.StudentT(
+          df=1., loc=0., scale=1., allow_nan_stats=False)
       with self.assertRaisesOpError("x < y"):
         student.variance().eval()
 
     with self.test_session():
       # df <= 1 ==> variance not defined
-      student = ds.StudentT(df=0.5, loc=0., scale=1., allow_nan_stats=False)
+      student = student_t.StudentT(
+          df=0.5, loc=0., scale=1., allow_nan_stats=False)
       with self.assertRaisesOpError("x < y"):
         student.variance().eval()
 
@@ -375,11 +409,13 @@ class StudentTTest(test.TestCase):
       df = [3.5, 5., 3., 5., 7.]
       mu = [-2.2]
       sigma = [5., 4., 3., 2., 1.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       # Test broadcast of mu across shape of df/sigma
       stddev = student.stddev().eval()
       mu *= len(df)
 
+      if not stats:
+        return
       expected_stddev = [
           stats.t.std(d, loc=m, scale=s) for (d, m, s) in zip(df, mu, sigma)
       ]
@@ -390,14 +426,14 @@ class StudentTTest(test.TestCase):
       df = [0.5, 1., 3]
       mu = [-1, 0., 1]
       sigma = [5., 4., 3.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       # Test broadcast of mu across shape of df/sigma
       mode = student.mode().eval()
       self.assertAllClose([-1., 0, 1], mode)
 
   def testPdfOfSample(self):
     with self.test_session() as sess:
-      student = ds.StudentT(df=3., loc=np.pi, scale=1.)
+      student = student_t.StudentT(df=3., loc=np.pi, scale=1.)
       num = 20000
       samples = student.sample(num, seed=123456)
       pdfs = student.prob(samples)
@@ -410,13 +446,15 @@ class StudentTTest(test.TestCase):
       self.assertEqual(mean.get_shape(), ())
       self.assertNear(np.pi, np.mean(sample_vals), err=0.02)
       self.assertNear(np.pi, mean_val, err=1e-6)
-      self.assertNear(stats.t.pdf(np.pi, 3., loc=np.pi), mean_pdf_val, err=1e-6)
       # Verify integral over sample*pdf ~= 1.
       self._assertIntegral(sample_vals, pdf_vals, err=2e-3)
+      if not stats:
+        return
+      self.assertNear(stats.t.pdf(np.pi, 3., loc=np.pi), mean_pdf_val, err=1e-6)
 
   def testPdfOfSampleMultiDims(self):
     with self.test_session() as sess:
-      student = ds.StudentT(df=[7., 11.], loc=[[5.], [6.]], scale=3.)
+      student = student_t.StudentT(df=[7., 11.], loc=[[5.], [6.]], scale=3.)
       self.assertAllEqual([], student.event_shape)
       self.assertAllEqual([], student.event_shape_tensor().eval())
       self.assertAllEqual([2, 2], student.batch_shape)
@@ -429,6 +467,12 @@ class StudentTTest(test.TestCase):
       self.assertEqual(pdfs.get_shape(), (num, 2, 2))
       self.assertNear(5., np.mean(sample_vals[:, 0, :]), err=.03)
       self.assertNear(6., np.mean(sample_vals[:, 1, :]), err=.03)
+      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
+      if not stats:
+        return
       self.assertNear(
           stats.t.var(7., loc=0., scale=3.),  # loc d.n. effect var
           np.var(sample_vals[:, :, 0]),
@@ -437,10 +481,6 @@ class StudentTTest(test.TestCase):
           stats.t.var(11., loc=0., scale=3.),  # loc d.n. effect var
           np.var(sample_vals[:, :, 1]),
           err=.4)
-      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
 
   def _assertIntegral(self, sample_vals, pdf_vals, err=1.5e-3):
     s_p = zip(sample_vals, pdf_vals)
@@ -454,8 +494,8 @@ class StudentTTest(test.TestCase):
 
   def testNegativeDofFails(self):
     with self.test_session():
-      student = ds.StudentT(df=[2, -5.], loc=0., scale=1.,
-                            validate_args=True, name="S")
+      student = student_t.StudentT(df=[2, -5.], loc=0., scale=1.,
+                                   validate_args=True, name="S")
       with self.assertRaisesOpError(r"Condition x > 0 did not hold"):
         student.mean().eval()
 
@@ -464,7 +504,8 @@ class StudentTTest(test.TestCase):
       df = constant_op.constant([-3.2, -4.6])
       mu = constant_op.constant([-4.2, 3.4])
       sigma = constant_op.constant([-6.4, -8.8])
-      student = ds.StudentTWithAbsDfSoftplusScale(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentTWithAbsDfSoftplusScale(
+          df=df, loc=mu, scale=sigma)
       self.assertAllClose(
           math_ops.floor(math_ops.abs(df)).eval(), student.df.eval())
       self.assertAllClose(mu.eval(), student.loc.eval())
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/uniform_test.py b/tensorflow/python/kernel_tests/distributions/uniform_test.py
similarity index 93%
rename from tensorflow/contrib/distributions/python/kernel_tests/uniform_test.py
rename to tensorflow/python/kernel_tests/distributions/uniform_test.py
index c3c97b98f0..df99a0ed25 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/uniform_test.py
+++ b/tensorflow/python/kernel_tests/distributions/uniform_test.py
@@ -18,15 +18,30 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import uniform as uniform_lib
+
 from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import errors_impl
+from tensorflow.python.framework import errors
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import uniform as uniform_lib
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
 
 
 class UniformTest(test.TestCase):
@@ -126,7 +141,7 @@ class UniformTest(test.TestCase):
       b_v = np.array([1.0, 2.0, 3.0], dtype=np.float32)
       uniform = uniform_lib.Uniform(low=a_v, high=b_v, validate_args=True)
 
-      with self.assertRaisesWithPredicateMatch(errors_impl.InvalidArgumentError,
+      with self.assertRaisesWithPredicateMatch(errors.InvalidArgumentError,
                                                "x < y"):
         uniform.low.eval()
 
@@ -187,6 +202,8 @@ class UniformTest(test.TestCase):
       a = 10.0
       b = 100.0
       uniform = uniform_lib.Uniform(low=a, high=b)
+      if not stats:
+        return
       s_uniform = stats.uniform(loc=a, scale=b - a)
       self.assertAllClose(uniform.mean().eval(), s_uniform.mean())
 
@@ -195,6 +212,8 @@ class UniformTest(test.TestCase):
       a = 10.0
       b = 100.0
       uniform = uniform_lib.Uniform(low=a, high=b)
+      if not stats:
+        return
       s_uniform = stats.uniform(loc=a, scale=b - a)
       self.assertAllClose(uniform.variance().eval(), s_uniform.var())
 
@@ -203,6 +222,8 @@ class UniformTest(test.TestCase):
       a = 10.0
       b = 100.0
       uniform = uniform_lib.Uniform(low=a, high=b)
+      if not stats:
+        return
       s_uniform = stats.uniform(loc=a, scale=b - a)
       self.assertAllClose(uniform.stddev().eval(), s_uniform.std())
 
diff --git a/tensorflow/python/ops/distributions/BUILD b/tensorflow/python/ops/distributions/BUILD
index 90d3f04c72..833239eb5f 100644
--- a/tensorflow/python/ops/distributions/BUILD
+++ b/tensorflow/python/ops/distributions/BUILD
@@ -24,6 +24,7 @@ py_library(
         "//tensorflow/python:nn",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:special_math_ops",
         "//tensorflow/python:util",
     ],
 )
diff --git a/tensorflow/contrib/distributions/python/ops/bernoulli.py b/tensorflow/python/ops/distributions/bernoulli.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/bernoulli.py
rename to tensorflow/python/ops/distributions/bernoulli.py
diff --git a/tensorflow/contrib/distributions/python/ops/beta.py b/tensorflow/python/ops/distributions/beta.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/beta.py
rename to tensorflow/python/ops/distributions/beta.py
diff --git a/tensorflow/contrib/distributions/python/ops/categorical.py b/tensorflow/python/ops/distributions/categorical.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/categorical.py
rename to tensorflow/python/ops/distributions/categorical.py
diff --git a/tensorflow/python/ops/distributions/conditional_distribution.py b/tensorflow/python/ops/distributions/conditional_distribution.py
index a04373afbf..ef25d4aedd 100644
--- a/tensorflow/python/ops/distributions/conditional_distribution.py
+++ b/tensorflow/python/ops/distributions/conditional_distribution.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class ConditionalDistribution(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/dirichlet.py b/tensorflow/python/ops/distributions/dirichlet.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/dirichlet.py
rename to tensorflow/python/ops/distributions/dirichlet.py
diff --git a/tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py b/tensorflow/python/ops/distributions/dirichlet_multinomial.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py
rename to tensorflow/python/ops/distributions/dirichlet_multinomial.py
diff --git a/tensorflow/contrib/distributions/python/ops/exponential.py b/tensorflow/python/ops/distributions/exponential.py
similarity index 98%
rename from tensorflow/contrib/distributions/python/ops/exponential.py
rename to tensorflow/python/ops/distributions/exponential.py
index a293d1e0dc..281641b915 100644
--- a/tensorflow/contrib/distributions/python/ops/exponential.py
+++ b/tensorflow/python/ops/distributions/exponential.py
@@ -20,13 +20,13 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import gamma
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import gamma
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/gamma.py b/tensorflow/python/ops/distributions/gamma.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/gamma.py
rename to tensorflow/python/ops/distributions/gamma.py
diff --git a/tensorflow/contrib/distributions/python/ops/laplace.py b/tensorflow/python/ops/distributions/laplace.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/laplace.py
rename to tensorflow/python/ops/distributions/laplace.py
diff --git a/tensorflow/contrib/distributions/python/ops/multinomial.py b/tensorflow/python/ops/distributions/multinomial.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/multinomial.py
rename to tensorflow/python/ops/distributions/multinomial.py
diff --git a/tensorflow/python/ops/distributions/normal.py b/tensorflow/python/ops/distributions/normal.py
index 4c531b0378..0ef1c91df8 100644
--- a/tensorflow/python/ops/distributions/normal.py
+++ b/tensorflow/python/ops/distributions/normal.py
@@ -70,14 +70,14 @@ class Normal(distribution.Distribution):
 
   ```python
   # Define a single scalar Normal distribution.
-  dist = tf.contrib.distributions.Normal(loc=0., scale=3.)
+  dist = tf.distributions.Normal(loc=0., scale=3.)
 
   # Evaluate the cdf at 1, returning a scalar.
   dist.cdf(1.)
 
   # Define a batch of two scalar valued Normals.
   # The first has mean 1 and standard deviation 11, the second 2 and 22.
-  dist = tf.contrib.distributions.Normal(loc=[1, 2.], scale=[11, 22.])
+  dist = tf.distributions.Normal(loc=[1, 2.], scale=[11, 22.])
 
   # Evaluate the pdf of the first distribution on 0, and the second on 1.5,
   # returning a length two tensor.
@@ -92,7 +92,7 @@ class Normal(distribution.Distribution):
   ```python
   # Define a batch of two scalar valued Normals.
   # Both have mean 1, but different standard deviations.
-  dist = tf.contrib.distributions.Normal(loc=1., scale=[11, 22.])
+  dist = tf.distributions.Normal(loc=1., scale=[11, 22.])
 
   # Evaluate the pdf of both distributions on the same point, 3.0,
   # returning a length 2 tensor.
diff --git a/tensorflow/contrib/distributions/python/ops/student_t.py b/tensorflow/python/ops/distributions/student_t.py
similarity index 97%
rename from tensorflow/contrib/distributions/python/ops/student_t.py
rename to tensorflow/python/ops/distributions/student_t.py
index 7872569a2b..073ac4286b 100644
--- a/tensorflow/contrib/distributions/python/ops/student_t.py
+++ b/tensorflow/python/ops/distributions/student_t.py
@@ -42,8 +42,10 @@ __all__ = [
 
 
 class StudentT(distribution.Distribution):
-  # pylint: disable=line-too-long
-  """Student's t-distribution with degree of freedom `df`, location `loc`, and `scale` parameters.
+  """Student's t-distribution.
+
+  This distribution has parameters: degree of freedom `df`, location `loc`,
+  and `scale`.
 
   #### Mathematical details
 
@@ -82,7 +84,7 @@ class StudentT(distribution.Distribution):
 
   ```python
   # Define a single scalar Student t distribution.
-  single_dist = tf.contrib.distributions.StudentT(df=3)
+  single_dist = tf.distributions.StudentT(df=3)
 
   # Evaluate the pdf at 1, returning a scalar Tensor.
   single_dist.prob(1.)
@@ -90,7 +92,7 @@ class StudentT(distribution.Distribution):
   # Define a batch of two scalar valued Student t's.
   # The first has degrees of freedom 2, mean 1, and scale 11.
   # The second 3, 2 and 22.
-  multi_dist = tf.contrib.distributions.StudentT(df=[2, 3],
+  multi_dist = tf.distributions.StudentT(df=[2, 3],
                                                  loc=[1, 2.],
                                                  scale=[11, 22.])
 
@@ -107,7 +109,7 @@ class StudentT(distribution.Distribution):
   ```python
   # Define a batch of two Student's t distributions.
   # Both have df 2 and mean 1, but different scales.
-  dist = tf.contrib.distributions.StudentT(df=2, loc=1, scale=[11, 22.])
+  dist = tf.distributions.StudentT(df=2, loc=1, scale=[11, 22.])
 
   # Evaluate the pdf of both distributions on the same point, 3.0,
   # returning a length 2 tensor.
diff --git a/tensorflow/contrib/distributions/python/ops/uniform.py b/tensorflow/python/ops/distributions/uniform.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/uniform.py
rename to tensorflow/python/ops/distributions/uniform.py
-- 
GitLab


From a5749019e065b25f49531de8b9f29627fb12fc5f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 13:30:00 -0800
Subject: [PATCH 0941/1563] Add shape to error message. Change: 154880260

---
 tensorflow/python/ops/weights_broadcast_ops.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/ops/weights_broadcast_ops.py b/tensorflow/python/ops/weights_broadcast_ops.py
index 257b9f1faa..35e93249c3 100644
--- a/tensorflow/python/ops/weights_broadcast_ops.py
+++ b/tensorflow/python/ops/weights_broadcast_ops.py
@@ -97,9 +97,10 @@ def assert_broadcastable(weights, values):
         return control_flow_ops.no_op(name="static_scalar_check_success")
       if weights_rank_static != values_rank_static:
         raise ValueError(
-            "%s values.rank=%s. weights.rank=%s." % (
+            "%s values.rank=%s. weights.rank=%s."
+            " values.shape=%s. weights.shape=%s." % (
                 _ASSERT_BROADCASTABLE_ERROR_PREFIX, values_rank_static,
-                weights_rank_static))
+                weights_rank_static, values.shape, weights.shape))
       weights_shape_static = tensor_util.constant_value(weights_shape)
       values_shape_static = tensor_util.constant_value(values_shape)
       if weights_shape_static is not None and values_shape_static is not None:
-- 
GitLab


From cb4322c7c3731740680a30ebbf8dd62ce9d4cb9f Mon Sep 17 00:00:00 2001
From: Andrew Selle <aselle@andyselle.com>
Date: Tue, 2 May 2017 15:48:58 -0700
Subject: [PATCH 0942/1563] Fix tf_env_collect.sh on macos by avoiding >>&
 redirection (#9601)

Avoid using redirection ">>& foo.txt".
Instead use "2>&1  >> foo.txt"

Fixes #9587
---
 tools/tf_env_collect.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/tf_env_collect.sh b/tools/tf_env_collect.sh
index 2a92e9a078..f126031661 100755
--- a/tools/tf_env_collect.sh
+++ b/tools/tf_env_collect.sh
@@ -28,7 +28,7 @@ fi
 
 echo >> $OUTPUT_FILE
 echo '== compiler =====================================================' >> $OUTPUT_FILE
-c++ --version &>> $OUTPUT_FILE
+c++ --version 2>&1 >> $OUTPUT_FILE
 
 echo >> $OUTPUT_FILE
 echo '== uname -a =====================================================' >> $OUTPUT_FILE
@@ -36,7 +36,7 @@ uname -a >> $OUTPUT_FILE
 
 echo >> $OUTPUT_FILE
 echo '== check pips ===================================================' >> $OUTPUT_FILE
-pip list 2>&1 | grep "proto\|numpy\|tensorflow" &>> $OUTPUT_FILE
+pip list 2>&1 | grep "proto\|numpy\|tensorflow" >> $OUTPUT_FILE
 
 
 echo >> $OUTPUT_FILE
@@ -53,7 +53,7 @@ print("tf.COMPILER_VERSION = %s" % tf.GIT_VERSION)
 with tf.Session() as sess:
   print("Sanity check: %r" % sess.run(tf.constant([1,2,3])[:1]))
 EOF
-python /tmp/check_tf.py &>> ${OUTPUT_FILE}
+python /tmp/check_tf.py 2>&1  >> ${OUTPUT_FILE}
 
 DEBUG_LD=libs python -c "import tensorflow"  2>>${OUTPUT_FILE} > /tmp/loadedlibs
 grep libcudnn.so /tmp/loadedlibs >> $OUTPUT_FILE
@@ -74,7 +74,7 @@ fi
 
 echo >> $OUTPUT_FILE >> $OUTPUT_FILE
 echo '== nvidia-smi ===================================================' >> $OUTPUT_FILE
-nvidia-smi &>> $OUTPUT_FILE
+nvidia-smi 2>&1 >> $OUTPUT_FILE
 
 echo >> $OUTPUT_FILE
 
-- 
GitLab


From 52ef8d90032ee49ca120d4e38d1f5198039795dc Mon Sep 17 00:00:00 2001
From: Dalei Li <d.li@student.tue.nl>
Date: Wed, 3 May 2017 00:50:28 +0200
Subject: [PATCH 0943/1563] Corrected SummaryHook with SummarySaverHook.
 (#9602)

---
 tensorflow/python/training/monitored_session.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index 4c81af56ad..c905672313 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -559,7 +559,7 @@ class MonitoredSession(_MonitoredSession):
 
   ```python
   saver_hook = CheckpointSaverHook(...)
-  summary_hook = SummaryHook(...)
+  summary_hook = SummarySaverHook(...)
   with MonitoredSession(session_creator=ChiefSessionCreator(...),
                         hooks=[saver_hook, summary_hook]) as sess:
     while not sess.should_stop():
@@ -648,7 +648,7 @@ class SingularMonitoredSession(_MonitoredSession):
   Example usage:
   ```python
   saver_hook = CheckpointSaverHook(...)
-  summary_hook = SummaryHook(...)
+  summary_hook = SummarySaverHook(...)
   with SingularMonitoredSession(hooks=[saver_hook, summary_hook]) as sess:
     while not sess.should_stop():
       sess.run(train_op)
-- 
GitLab


From 58196d4bf923d6fa2500e84d9d22ed8227ba305c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 16:27:12 -0800
Subject: [PATCH 0944/1563] [TF:XLA] Added unittest for transpose constant
 folding

Transpose constant folding was missing a unittest.
Change: 154903586
---
 tensorflow/compiler/xla/literal_util.h        | 46 +++++++++++
 tensorflow/compiler/xla/service/BUILD         |  1 +
 .../xla/service/hlo_constant_folding_test.cc  | 78 +++++++++++++++----
 .../compiler/xla/tests/literal_test_util.h    | 65 ++++++++++++++++
 4 files changed, 173 insertions(+), 17 deletions(-)

diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index ae3d43e56c..3a6d21979e 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -33,6 +33,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/primitive_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
@@ -339,6 +340,14 @@ class LiteralUtil {
                                               const Layout& layout,
                                               Literal* literal);
 
+  // Populates literal values by calling the generator function for every cell
+  // in the literal object.
+  template <typename NativeT>
+  static Status Populate(
+      Literal* literal,
+      const std::function<NativeT(tensorflow::gtl::ArraySlice<int64> indexes)>&
+          generator);
+
   // Creates a Literal of the given dimensions with all elements set to the
   // given value.
   template <typename NativeT>
@@ -992,6 +1001,43 @@ template <typename NativeT>
                                   literal);
 }
 
+template <typename NativeT>
+/* static */ Status LiteralUtil::Populate(
+    Literal* literal,
+    const std::function<NativeT(tensorflow::gtl::ArraySlice<int64> indexes)>&
+        generator) {
+  const Shape& shape = literal->shape();
+  int64 rank = ShapeUtil::Rank(shape);
+  TF_RET_CHECK(shape.element_type() ==
+               primitive_util::NativeToPrimitiveType<NativeT>());
+  tensorflow::protobuf::RepeatedField<NativeT>* data =
+      GetMutableRepeatedField<NativeT>(literal);
+  if (rank > 0) {
+    std::vector<int64> base(rank, 0);
+    std::vector<int64> step(rank, 1);
+    std::vector<int64> minor_scan_indexes(rank, 0);
+    int64 minor_dimension = shape.layout().minor_to_major()[0];
+    int64 minor_dimension_size =
+        ShapeUtil::GetDimension(shape, minor_dimension);
+
+    step[minor_dimension] = minor_dimension_size;
+    auto init_function = [&](const std::vector<int64>& indexes) {
+      int64 index = LinearIndex(*literal, indexes);
+      std::copy(indexes.begin(), indexes.end(), minor_scan_indexes.begin());
+      for (int64 i = 0; i < minor_dimension_size; ++i) {
+        minor_scan_indexes[minor_dimension] = i;
+        data->Set(index + i, generator(minor_scan_indexes));
+      }
+      return true;
+    };
+    ShapeUtil::ForEachIndex(shape, base, AsInt64Slice(shape.dimensions()), step,
+                            init_function);
+  } else {
+    data->Set(0, generator({}));
+  }
+  return Status::OK();
+}
+
 template <typename NativeT>
 /* static */ void LiteralUtil::PopulateWithValue(
     NativeT value, tensorflow::gtl::ArraySlice<int64> dimensions,
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index bdb69b6e55..750e1ee3f2 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1436,6 +1436,7 @@ cc_test(
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/compiler/xla/tests:literal_test_util",
         "//tensorflow/core:lib",
         "//tensorflow/core:test_main",
     ],
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
index d20f423bd6..21d93a1f27 100644
--- a/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
@@ -28,6 +28,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/test.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+#include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/types.h"
 
 namespace op = xla::testing::opcode_matchers;
@@ -49,8 +50,9 @@ TEST_F(HloConstantFoldingTest, ConvertF32ToS64) {
 
   EXPECT_THAT(computation->root_instruction(), op::Convert(input));
 
-  HloConstantFolding simplifier;
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+  HloConstantFolding const_folder;
+  TF_ASSIGN_OR_ASSERT_OK(bool result, const_folder.Run(module.get()));
+  EXPECT_TRUE(result);
 
   EXPECT_THAT(computation->root_instruction(), op::Constant());
   EXPECT_EQ(LiteralUtil::GetFirstElement<int64>(
@@ -70,8 +72,9 @@ TEST_F(HloConstantFoldingTest, ConvertS64ToF32) {
 
   EXPECT_THAT(computation->root_instruction(), op::Convert(input));
 
-  HloConstantFolding simplifier;
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+  HloConstantFolding const_folder;
+  TF_ASSIGN_OR_ASSERT_OK(bool result, const_folder.Run(module.get()));
+  EXPECT_TRUE(result);
 
   EXPECT_THAT(computation->root_instruction(), op::Constant());
   EXPECT_EQ(LiteralUtil::GetFirstElement<float>(
@@ -91,8 +94,9 @@ TEST_F(HloConstantFoldingTest, ConvertF32ArrayToS64Array) {
 
   EXPECT_THAT(computation->root_instruction(), op::Convert(input));
 
-  HloConstantFolding simplifier;
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+  HloConstantFolding const_folder;
+  TF_ASSIGN_OR_ASSERT_OK(bool result, const_folder.Run(module.get()));
+  EXPECT_TRUE(result);
 
   EXPECT_THAT(computation->root_instruction(), op::Constant());
   EXPECT_EQ(
@@ -131,11 +135,12 @@ TEST_F(HloConstantFoldingTest, Concatenate) {
     Shape shape = ShapeUtil::MakeShape(F32, dimensions);
     builder.AddInstruction(HloInstruction::CreateConcatenate(
         shape, operands, test_config.concat_dimension));
-    HloModule module(TestName());
-    auto computation = module.AddEntryComputation(builder.Build());
+    auto module = MakeUnique<HloModule>(TestName());
+    auto computation = module->AddEntryComputation(builder.Build());
 
-    HloConstantFolding simplifier;
-    ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+    HloConstantFolding const_folder;
+    TF_ASSIGN_OR_ASSERT_OK(bool result, const_folder.Run(module.get()));
+    EXPECT_TRUE(result);
 
     HloInstruction* root = computation->root_instruction();
     EXPECT_THAT(root, op::Constant());
@@ -148,21 +153,60 @@ TEST_F(HloConstantFoldingTest, Slice) {
   const int64 dimensions[] = {11, 8, 7, 5, 9};
   const int64 slice_start[] = {4, 2, 3, 1, 5};
   const int64 slice_limits[] = {10, 8, 6, 5, 9};
-  auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
-  HloInstruction* lit_insn = builder.AddInstruction(
+  TF_ASSIGN_OR_ASSERT_OK(auto literal,
+                         LiteralTestUtil::CreateRandomLiteral<F32>(
+                             ShapeUtil::MakeShape(F32, dimensions), 0.0, 1.0));
+  HloInstruction* literal_instruction = builder.AddInstruction(
       HloInstruction::CreateConstant(std::move(literal)));
   Shape shape = ShapeUtil::MakeShape(F32, {6, 6, 3, 4, 4});
+  builder.AddInstruction(HloInstruction::CreateSlice(
+      shape, literal_instruction, slice_start, slice_limits));
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  HloConstantFolding const_folder;
+  TF_ASSIGN_OR_ASSERT_OK(bool result, const_folder.Run(module.get()));
+  EXPECT_TRUE(result);
+
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_THAT(root, op::Constant());
+  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+}
+
+TEST_F(HloConstantFoldingTest, TransposeConstantFold) {
+  HloComputation::Builder builder(TestName());
+  const int64 dimensions[] = {11, 8, 7, 5, 9};
+  TF_ASSIGN_OR_ASSERT_OK(auto literal,
+                         LiteralTestUtil::CreateRandomLiteral<F32>(
+                             ShapeUtil::MakeShape(F32, dimensions), 0.0, 1.0));
+  auto literal_clone = LiteralUtil::CloneToUnique(*literal);
+  HloInstruction* literal_instruction = builder.AddInstruction(
+      HloInstruction::CreateConstant(std::move(literal)));
+  Shape shape = ShapeUtil::MakeShape(F32, {8, 7, 11, 9, 5});
+  const int64 permutation[] = {1, 2, 0, 4, 3};
   builder.AddInstruction(
-      HloInstruction::CreateSlice(shape, lit_insn, slice_start, slice_limits));
-  HloModule module(TestName());
-  auto computation = module.AddEntryComputation(builder.Build());
+      HloInstruction::CreateTranspose(shape, literal_instruction, permutation));
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
 
-  HloConstantFolding simplifier;
-  ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+  HloConstantFolding const_folder;
+  TF_ASSIGN_OR_ASSERT_OK(bool result, const_folder.Run(module.get()));
+  EXPECT_TRUE(result);
 
   HloInstruction* root = computation->root_instruction();
   EXPECT_THAT(root, op::Constant());
   EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+
+  using NativeT = typename primitive_util::PrimitiveTypeToNative<F32>::type;
+  bool matched = true;
+  LiteralUtil::EachCell<NativeT>(
+      root->literal(),
+      [&](tensorflow::gtl::ArraySlice<int64> indices, NativeT value) {
+        std::vector<int64> rindexes = Permute(permutation, indices);
+        matched = matched && (value == LiteralUtil::Get<NativeT>(*literal_clone,
+                                                                 rindexes));
+      });
+  EXPECT_TRUE(matched);
 }
 
 }  // namespace
diff --git a/tensorflow/compiler/xla/tests/literal_test_util.h b/tensorflow/compiler/xla/tests/literal_test_util.h
index aeadc023cc..4f98083033 100644
--- a/tensorflow/compiler/xla/tests/literal_test_util.h
+++ b/tensorflow/compiler/xla/tests/literal_test_util.h
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include <initializer_list>
 #include <memory>
+#include <random>
 #include <string>
 
 #include "tensorflow/compiler/xla/array2d.h"
@@ -171,6 +172,36 @@ class LiteralTestUtil {
       tensorflow::gtl::ArraySlice<int64> minor_to_major,
       const Literal& literal);
 
+  // Creates a literal with the supplied shape, and uses the provided value
+  // generator to populate the literal's values.
+  // Returns the new literal object, or an error Status if failed.
+  template <
+      PrimitiveType type,
+      typename T = typename primitive_util::PrimitiveTypeToNative<type>::type>
+  static StatusOr<std::unique_ptr<Literal>> CreateRandomLiteral(
+      const Shape& shape,
+      const std::function<T(tensorflow::gtl::ArraySlice<int64>)>& generator);
+
+  // Creates a literal with the supplied shape, and initializes the literal
+  // values using a normal distribution with given mean and stddev standard
+  // deviation, and using the engine as entropy generator.
+  // Returns the new literal object, or an error Status if failed.
+  template <
+      PrimitiveType type, typename E,
+      typename T = typename primitive_util::PrimitiveTypeToNative<type>::type>
+  static StatusOr<std::unique_ptr<Literal>> CreateRandomLiteral(
+      const Shape& shape, E* engine, T mean, T stddev);
+
+  // Creates a literal with the supplied shape, and initializes the literal
+  // values using a normal distribution with given mean and stddev standard
+  // deviation.
+  // Returns the new literal object, or an error Status if failed.
+  template <
+      PrimitiveType type,
+      typename T = typename primitive_util::PrimitiveTypeToNative<type>::type>
+  static StatusOr<std::unique_ptr<Literal>> CreateRandomLiteral(
+      const Shape& shape, T mean, T stddev);
+
  private:
   TF_DISALLOW_COPY_AND_ASSIGN(LiteralTestUtil);
 };
@@ -270,6 +301,40 @@ template <typename NativeT>
   ExpectNear(*LiteralUtil::CreateR4FromArray4D(expected), actual, error);
 }
 
+template <PrimitiveType type, typename T>
+/* static */ StatusOr<std::unique_ptr<Literal>>
+LiteralTestUtil::CreateRandomLiteral(
+    const Shape& shape,
+    const std::function<T(tensorflow::gtl::ArraySlice<int64>)>& generator) {
+  using NativeT = typename primitive_util::PrimitiveTypeToNative<type>::type;
+  TF_RET_CHECK(shape.element_type() == type);
+  std::unique_ptr<Literal> literal = LiteralUtil::CreateFromShape(shape);
+  TF_RETURN_IF_ERROR(LiteralUtil::Populate<NativeT>(
+      literal.get(), [&](tensorflow::gtl::ArraySlice<int64> indexes) {
+        return generator(indexes);
+      }));
+  return std::move(literal);
+}
+
+template <PrimitiveType type, typename E, typename T>
+/* static */ StatusOr<std::unique_ptr<Literal>>
+LiteralTestUtil::CreateRandomLiteral(const Shape& shape, E* engine, T mean,
+                                     T stddev) {
+  using NativeT = typename primitive_util::PrimitiveTypeToNative<type>::type;
+  std::normal_distribution<NativeT> generator(mean, stddev);
+  return CreateRandomLiteral<type, NativeT>(
+      shape, [&](tensorflow::gtl::ArraySlice<int64> /*indexes*/) {
+        return generator(*engine);
+      });
+}
+
+template <PrimitiveType type, typename T>
+/* static */ StatusOr<std::unique_ptr<Literal>>
+LiteralTestUtil::CreateRandomLiteral(const Shape& shape, T mean, T stddev) {
+  std::minstd_rand0 engine;
+  return CreateRandomLiteral<type>(shape, &engine, mean, stddev);
+}
+
 }  // namespace xla
 
 #endif  // TENSORFLOW_COMPILER_XLA_TESTS_LITERAL_TEST_UTIL_H_
-- 
GitLab


From 5ad12420e78d0aa756fd2a41945468e826e267c2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 2 May 2017 17:21:15 -0800
Subject: [PATCH 0945/1563] [XLA:HLO] Run HeapSimulator on whole-module if all
 computations are sequential.

Previously the HeapSimulator was only run on a per-computation basis. This meant
that if you had many sub-computations in your module (e.g. many While loops),
the space for all of the temporary buffers inside the conditions and bodies of
the loops were in distinct memory ranges. This is overly pessimistic if all
computations in the module are sequential.

This CL changes the HeapSimulator to also run whole-module simulation, calling
Alloc and Free on sub-computation buffers at the appropriate nested spot, right
next to the calling instruction. The BufferAssigner is updated to take advantage
of this when possible, as is MinimumMemoryForSequence.
Change: 154908856
---
 tensorflow/compiler/xla/service/BUILD         |  31 ++---
 .../compiler/xla/service/buffer_assignment.cc | 126 +++++++++++++-----
 .../compiler/xla/service/buffer_assignment.h  |  29 +++-
 .../compiler/xla/service/heap_simulator.cc    |  90 +++++++++++--
 .../compiler/xla/service/heap_simulator.h     |  32 ++++-
 .../xla/service/heap_simulator_test.cc        | 126 +++++++++++++++++-
 .../compiler/xla/service/hlo_ordering.cc      |  62 +++++----
 .../compiler/xla/service/hlo_ordering_test.cc |  59 ++++++++
 8 files changed, 441 insertions(+), 114 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 750e1ee3f2..2452158efa 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -666,8 +666,8 @@ cc_library(
     ],
     deps = [
         ":buffer_liveness",
-        ":heap_simulator",
         ":hlo",
+        ":hlo_ordering",
         ":logical_buffer",
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:shape_util",
@@ -707,51 +707,38 @@ cc_test(
     ],
 )
 
-cc_library(
-    name = "heap_simulator",
-    srcs = [
-        "heap_simulator.cc",
-    ],
-    hdrs = [
-        "heap_simulator.h",
-    ],
-    deps = [
-        ":hlo",
-        ":liveness_util",
-        ":logical_buffer",
-        ":tuple_points_to_analysis",
-        "//tensorflow/compiler/xla:statusor",
-        "//tensorflow/compiler/xla:util",
-        "//tensorflow/core:lib",
-    ],
-)
-
 cc_test(
     name = "heap_simulator_test",
     srcs = ["heap_simulator_test.cc"],
     deps = [
-        ":heap_simulator",
         ":hlo",
+        ":hlo_ordering",
         ":logical_buffer",
         ":tuple_points_to_analysis",
+        "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:status_macros",
         "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/core:lib",
         "//tensorflow/core:test_main",
     ],
 )
 
+# The hlo_ordering library contains both hlo_ordering and heap_simulator because
+# they are mutually dependent.
 cc_library(
     name = "hlo_ordering",
     srcs = [
+        "heap_simulator.cc",
         "hlo_ordering.cc",
     ],
     hdrs = [
+        "heap_simulator.h",
         "hlo_ordering.h",
     ],
     deps = [
         ":call_graph",
-        ":heap_simulator",
         ":hlo",
+        ":liveness_util",
         ":logical_buffer",
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:shape_util",
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index 3cdbf892f7..a79468f939 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -548,6 +548,8 @@ Status BufferAssigner::AssignBuffersForComputation(
     const FlatSet<const HloInstruction*>* hlos_to_allocate,
     const FlatSet<const LogicalBuffer*>& colocated_buffers,
     const FlatSet<BufferAllocation::Index>& colocated_allocations,
+    FlatMap<const HloComputation*, FlatSet<const LogicalBuffer*>>*
+        buffers_to_assign_sequentially,
     BufferAssignment* assignment) {
   // Buffers are sorted and assigned to BufferAllocations in decreasing order of
   // size.
@@ -578,9 +580,16 @@ Status BufferAssigner::AssignBuffersForComputation(
   // If there is a sequential instruction ordering, we'll delay assignment of
   // temp buffers until after the main assignment loop.
   const BufferLiveness& liveness = assignment->liveness();
-  const std::vector<const HloInstruction*>* sequential_order =
-      liveness.hlo_ordering().SequentialOrder(*computation);
-  FlatSet<const LogicalBuffer*> unassigned_temp_buffers;
+  const bool has_sequential_order =
+      liveness.hlo_ordering().SequentialOrder(*computation) != nullptr;
+  if (has_sequential_order && buffers_to_assign_sequentially != nullptr) {
+    // Every sequential computation must get an entry in the
+    // buffers_to_assign_sequentially map, even if we end up with an empty set
+    // of buffers. This ensures we can correctly determine whether to run
+    // whole-module heap simulation.
+    buffers_to_assign_sequentially->emplace(computation,
+                                            FlatSet<const LogicalBuffer*>());
+  }
 
   // Sort the LogicalBuffers first by size. We assign the larger LogicalBuffers
   // first for simplicity. This means any previously created BufferAllocation is
@@ -599,7 +608,7 @@ Status BufferAssigner::AssignBuffersForComputation(
   // important reuse case where an elementwise instruction reuses one of its
   // operand's buffer. This improves locality.
   std::sort(sorted_buffers.begin(), sorted_buffers.end(),
-            [this, sequential_order, &liveness, &post_order_position](
+            [this, has_sequential_order, &liveness, &post_order_position](
                 const LogicalBuffer* a, const LogicalBuffer* b) {
               // Primary sort is by decreasing buffer size.
               const int64 a_size = buffer_size_(*a);
@@ -609,7 +618,7 @@ Status BufferAssigner::AssignBuffersForComputation(
               }
               // Otherwise live out buffers come before others, if the
               // instructions are sequentially ordered.
-              if (sequential_order != nullptr) {
+              if (has_sequential_order) {
                 const bool a_live_out = liveness.MaybeLiveOut(*a);
                 const bool b_live_out = liveness.MaybeLiveOut(*b);
                 if (a_live_out != b_live_out) {
@@ -746,7 +755,7 @@ Status BufferAssigner::AssignBuffersForComputation(
       }
     }
 
-    if (!assignment->HasAllocation(*buffer) && sequential_order != nullptr &&
+    if (!assignment->HasAllocation(*buffer) && has_sequential_order &&
         !liveness.MaybeLiveOut(*buffer)) {
       // There is a sequential instruction ordering, so we delay assignment of
       // temp buffers until after the loop. We do this right before we decide to
@@ -758,7 +767,7 @@ Status BufferAssigner::AssignBuffersForComputation(
       // for the definition of temp buffers.
       CHECK(!is_entry_parameter) << *buffer;
       CHECK(!is_thread_local) << *buffer;
-      unassigned_temp_buffers.insert(buffer);
+      (*buffers_to_assign_sequentially)[computation].insert(buffer);
       VLOG(3) << "Delaying assignment of temp buffer: " << *buffer;
       continue;
     }
@@ -772,27 +781,68 @@ Status BufferAssigner::AssignBuffersForComputation(
     }
   }
 
-  if (!unassigned_temp_buffers.empty()) {
-    TF_RETURN_IF_ERROR(AssignBuffersWithSequentialOrdering(
-        *sequential_order, unassigned_temp_buffers, *computation, assignment));
-  }
   return Status::OK();
 }
 
 Status BufferAssigner::AssignBuffersWithSequentialOrdering(
-    const std::vector<const HloInstruction*>& sequence,
-    const FlatSet<const LogicalBuffer*>& buffers_to_assign,
-    const HloComputation& computation, BufferAssignment* assignment) {
+    const FlatMap<const HloComputation*, FlatSet<const LogicalBuffer*>>&
+        buffers_to_assign_sequentially,
+    bool run_whole_module_heap_simulation, BufferAssignment* assignment) {
   // Run the sequence of instructions through the heap simulator.  The heuristic
   // that seems to give the best results is lazy-best-fit, with all runs of
   // alloc / free calls sorted in decreasing size order.
-  TF_ASSIGN_OR_RETURN(
-      HeapSimulator::Result result,
-      HeapSimulator::Run(MakeUnique<DecreasingSizeRunsHeap>(
-                             MakeUnique<LazyBestFitHeap>(alignment_)),
-                         sequence, computation,
-                         assignment->points_to_analysis(), buffer_size_,
-                         &buffers_to_assign));
+  const HloOrdering& hlo_ordering = assignment->liveness().hlo_ordering();
+  if (run_whole_module_heap_simulation) {
+    // Run the heap simulation over the whole module. This reduces memory usage,
+    // since buffers for kCall and kWhile sub-computations are only live for the
+    // duration of their calling instructions.
+    VLOG(1) << "Running whole-module heap simulation";
+    SequentialHloOrdering::HloModuleSequence module_sequence;
+    FlatSet<const LogicalBuffer*> all_buffers_to_assign;
+    for (const auto& pair : buffers_to_assign_sequentially) {
+      const HloComputation* computation = pair.first;
+      const FlatSet<const LogicalBuffer*>& buffers_to_assign = pair.second;
+      const std::vector<const HloInstruction*>* instruction_sequence =
+          hlo_ordering.SequentialOrder(*computation);
+      CHECK(instruction_sequence != nullptr) << computation->name();
+      module_sequence[computation] = *instruction_sequence;
+      all_buffers_to_assign.insert(buffers_to_assign.begin(),
+                                   buffers_to_assign.end());
+    }
+    TF_ASSIGN_OR_RETURN(
+        const HeapSimulator::Result result,
+        HeapSimulator::Run(MakeUnique<DecreasingSizeRunsHeap>(
+                               MakeUnique<LazyBestFitHeap>(alignment_)),
+                           assignment->module(), module_sequence,
+                           assignment->points_to_analysis(), buffer_size_,
+                           &all_buffers_to_assign));
+    AssignBuffersFromHeapSimulator(result, assignment);
+  } else {
+    // Run the heap-simulation on a per-computation basis. Buffers for
+    // sub-computations are assigned disjoint BufferAllocations, assuming the
+    // worst-case that they may all be live concurrently.
+    VLOG(1) << "Running per-computation heap simulation";
+    for (const auto& pair : buffers_to_assign_sequentially) {
+      const HloComputation* computation = pair.first;
+      const FlatSet<const LogicalBuffer*>& buffers_to_assign = pair.second;
+      const std::vector<const HloInstruction*>* instruction_sequence =
+          hlo_ordering.SequentialOrder(*computation);
+      CHECK(instruction_sequence != nullptr) << computation->name();
+      TF_ASSIGN_OR_RETURN(
+          const HeapSimulator::Result result,
+          HeapSimulator::Run(MakeUnique<DecreasingSizeRunsHeap>(
+                                 MakeUnique<LazyBestFitHeap>(alignment_)),
+                             *computation, *instruction_sequence,
+                             assignment->points_to_analysis(), buffer_size_,
+                             &buffers_to_assign));
+      AssignBuffersFromHeapSimulator(result, assignment);
+    }
+  }
+  return Status::OK();
+}
+
+void BufferAssigner::AssignBuffersFromHeapSimulator(
+    const HeapSimulator::Result& result, BufferAssignment* assignment) {
   if (assignment->stats_.preallocated_temp_fragmentation_bytes == -1) {
     assignment->stats_.preallocated_temp_fragmentation_bytes =
         result.fragmentation_size;
@@ -801,8 +851,6 @@ Status BufferAssigner::AssignBuffersWithSequentialOrdering(
         result.fragmentation_size;
   }
 
-  // Use the results of the heap simulator to create one allocation per
-  // computation, with LogicalBuffers packed to specific offsets.
   BufferAllocation* allocation = assignment->NewEmptyAllocation(
       result.heap_size, /*is_thread_local=*/false, /*is_reusable=*/true);
   for (const auto& buffer_chunk : result.chunk_map) {
@@ -810,7 +858,6 @@ Status BufferAssigner::AssignBuffersWithSequentialOrdering(
     const HeapSimulator::Chunk& chunk = buffer_chunk.second;
     assignment->AddAssignment(allocation, buffer, chunk.offset, chunk.size);
   }
-  return Status::OK();
 }
 
 // Adds the 'colocated_set' of buffers to 'colocated_buffer_sets', maintaining
@@ -1108,8 +1155,6 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
   TF_ASSIGN_OR_RETURN(std::unique_ptr<BufferLiveness> liveness,
                       BufferLiveness::Run(module, std::move(hlo_ordering)));
 
-  std::vector<const HloComputation*> thread_local_computations;
-  std::vector<const HloComputation*> global_computations;
   VLOG(1) << "Assigning buffers to module " << module->name();
   if (hlos_to_allocate != nullptr) {
     VLOG(3) << "LogicalBuffer assignment restricted to hlos: ";
@@ -1121,9 +1166,6 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
   XLA_VLOG_LINES(3, liveness->ToString());
   XLA_VLOG_LINES(3, liveness->points_to_analysis().ToString());
 
-  TF_RETURN_IF_ERROR(GatherComputationsByAllocationType(
-      module, &thread_local_computations, &global_computations));
-
   // Set of HLO's to allocate if hlos_to_allocate is given. Passed as a set to
   // AssignBuffersForComputation for fast membership testing.
   std::unique_ptr<FlatSet<const HloInstruction*>> hlo_set;
@@ -1148,16 +1190,38 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
   AssignColocatedBufferSets(colocated_buffer_sets, assignment.get(),
                             &colocated_buffers, &colocated_allocations);
 
+  std::vector<const HloComputation*> thread_local_computations;
+  std::vector<const HloComputation*> global_computations;
+  TF_RETURN_IF_ERROR(GatherComputationsByAllocationType(
+      module, &thread_local_computations, &global_computations));
+
+  // First assign buffers for global computatations. Temporary buffers for
+  // sequential computations are collected in 'buffers_to_assign_sequentially'.
+  FlatMap<const HloComputation*, FlatSet<const LogicalBuffer*>>
+      buffers_to_assign_sequentially;
   for (auto* computation : global_computations) {
     TF_RETURN_IF_ERROR(AssignBuffersForComputation(
         computation, /*is_thread_local=*/false, hlo_set.get(),
-        colocated_buffers, colocated_allocations, assignment.get()));
+        colocated_buffers, colocated_allocations,
+        &buffers_to_assign_sequentially, assignment.get()));
   }
+  // Assign buffers with sequential ordering, if any. If all global computations
+  // are sequential, we can run heap simuation on the whole module, which
+  // reduces memory usage.
+  const bool run_whole_module_heap_simulation =
+      buffers_to_assign_sequentially.size() == global_computations.size();
+  TF_RETURN_IF_ERROR(AssignBuffersWithSequentialOrdering(
+      buffers_to_assign_sequentially, run_whole_module_heap_simulation,
+      assignment.get()));
+
+  // Now assign buffers for thread-local computations. All LogicalBuffers get
+  // their own BufferAllocation.
   for (auto* computation : thread_local_computations) {
     TF_RET_CHECK(computation != module->entry_computation());
     TF_RETURN_IF_ERROR(AssignBuffersForComputation(
         computation, /*is_thread_local=*/true, hlo_set.get(), colocated_buffers,
-        colocated_allocations, assignment.get()));
+        colocated_allocations, /*buffers_to_assign_sequentially=*/nullptr,
+        assignment.get()));
   }
 
   // Mark all buffers which may be live out of the entry computation as
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.h b/tensorflow/compiler/xla/service/buffer_assignment.h
index 34667c435d..7e96caf0f4 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.h
+++ b/tensorflow/compiler/xla/service/buffer_assignment.h
@@ -23,6 +23,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/compiler/xla/service/buffer_liveness.h"
+#include "tensorflow/compiler/xla/service/heap_simulator.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
@@ -354,6 +355,9 @@ class BufferAssignment {
   void AddAssignment(BufferAllocation* allocation, const LogicalBuffer& buffer,
                      int64 offset, int64 size);
 
+  // Returns the HloModule used to construct this assignment.
+  const HloModule& module() { return *module_; }
+
   // Returns the BufferLiveness object used to construct this assignment.
   const BufferLiveness& liveness() { return *liveness_; }
 
@@ -427,14 +431,27 @@ class BufferAssigner {
       const tensorflow::gtl::FlatSet<const LogicalBuffer*>& colocated_buffers,
       const tensorflow::gtl::FlatSet<BufferAllocation::Index>&
           colocated_allocations,
+      tensorflow::gtl::FlatMap<const HloComputation*,
+                               tensorflow::gtl::FlatSet<const LogicalBuffer*>>*
+          buffers_to_assign_sequentially,
       BufferAssignment* assignment);
 
-  // Assigns 'buffers_to_assign' assuming the HLO instructions will be executed
-  // in the given 'sequential_order'.
+  // Assigns 'buffers_to_assign_sequentially' using heap simulation, assuming
+  // the HLO instructions will be executed in the sequential order given by
+  // assignment->liveness().hlo_ordering().SequentialOrder. If
+  // 'run_whole_module_heap_simulation' is true, the heap simulation will be run
+  // assuming all global computations are sequentially ordered.
   Status AssignBuffersWithSequentialOrdering(
-      const std::vector<const HloInstruction*>& sequential_order,
-      const tensorflow::gtl::FlatSet<const LogicalBuffer*>& buffers_to_assign,
-      const HloComputation& computation, BufferAssignment* assignment);
+      const tensorflow::gtl::FlatMap<
+          const HloComputation*,
+          tensorflow::gtl::FlatSet<const LogicalBuffer*>>&
+          buffers_to_assign_sequentially,
+      bool run_whole_module_heap_simulation, BufferAssignment* assignment);
+
+  // Uses the results of the heap simulator to create a single allocation, with
+  // LogicalBuffers packed to specific offsets.
+  void AssignBuffersFromHeapSimulator(const HeapSimulator::Result& result,
+                                      BufferAssignment* assignment);
 
   // Tries to assign the given instruction to the given buffer. Returns if the
   // assignment was successful.
@@ -477,8 +494,6 @@ class BufferAssigner {
       const HloComputation& computation, const BufferLiveness& buffer_liveness,
       std::vector<ColocatedBufferSet>* colocated_buffer_sets);
 
-  const HloModule* module_;
-
   // Function which returns the buffer size for a given logical buffer (shape).
   LogicalBuffer::SizeFunction buffer_size_;
 
diff --git a/tensorflow/compiler/xla/service/heap_simulator.cc b/tensorflow/compiler/xla/service/heap_simulator.cc
index 9c4899a67d..d7aa5664df 100644
--- a/tensorflow/compiler/xla/service/heap_simulator.cc
+++ b/tensorflow/compiler/xla/service/heap_simulator.cc
@@ -53,12 +53,44 @@ std::vector<const LogicalBuffer*> UniqueOperandSourceBuffers(
 
 /*static*/
 StatusOr<HeapSimulator::Result> HeapSimulator::Run(
-    std::unique_ptr<HeapAlgorithm> algorithm,
+    std::unique_ptr<HeapAlgorithm> algorithm, const HloModule& module,
+    const SequentialHloOrdering::HloModuleSequence& module_sequence,
+    const TuplePointsToAnalysis& points_to_analysis,
+    const LogicalBuffer::SizeFunction& size_fn,
+    const FlatSet<const LogicalBuffer*>* buffers_to_assign) {
+  HeapSimulator heap(std::move(algorithm), size_fn, buffers_to_assign);
+  const HloComputation* entry_computation = module.entry_computation();
+  const std::vector<const HloInstruction*>& instruction_sequence =
+      FindOrDie(module_sequence, entry_computation);
+  TF_RETURN_IF_ERROR(heap.RunComputation(*entry_computation,
+                                         instruction_sequence,
+                                         points_to_analysis, &module_sequence));
+  return heap.Finish();
+}
+
+/*static*/
+StatusOr<HeapSimulator::Result> HeapSimulator::Run(
+    std::unique_ptr<HeapAlgorithm> algorithm, const HloComputation& computation,
     const std::vector<const HloInstruction*>& instruction_sequence,
-    const HloComputation& computation,
     const TuplePointsToAnalysis& points_to_analysis,
     const LogicalBuffer::SizeFunction& size_fn,
     const FlatSet<const LogicalBuffer*>* buffers_to_assign) {
+  HeapSimulator heap(std::move(algorithm), size_fn, buffers_to_assign);
+  TF_RETURN_IF_ERROR(heap.RunComputation(computation, instruction_sequence,
+                                         points_to_analysis,
+                                         /*module_sequence=*/nullptr));
+  return heap.Finish();
+}
+
+// Runs a heap simulation for the given 'computation', assuming the given
+// 'instruction_sequence'. If 'module_sequence' is non-null, it is used to find
+// kCall and kWhile sub-computations, and the heap simulation for those
+// sub-computations will be run recursively.
+Status HeapSimulator::RunComputation(
+    const HloComputation& computation,
+    const std::vector<const HloInstruction*>& instruction_sequence,
+    const TuplePointsToAnalysis& points_to_analysis,
+    const SequentialHloOrdering::HloModuleSequence* module_sequence) {
   // The goal here is to minimize memory usage, assuming the given sequential
   // ordering of instructions.  The strategy is to walk through the instruction
   // sequence, calling Alloc and Free on the underlying heap algorithm.  The
@@ -67,7 +99,6 @@ StatusOr<HeapSimulator::Result> HeapSimulator::Run(
   // 'live_buffers' tracks the liveness of each buffer that we assign, by
   // associating it with a set of HloInstructions that need to be visited.  When
   // the set becomes empty, the buffer is no longer used, and can be freed.
-  HeapSimulator heap(std::move(algorithm), size_fn, buffers_to_assign);
   FlatMap<const LogicalBuffer*, FlatSet<const HloInstruction*>> live_buffers;
 
   const HloInstruction* root = computation.root_instruction();
@@ -90,7 +121,7 @@ StatusOr<HeapSimulator::Result> HeapSimulator::Run(
     // lifetime of buffers that aren't already connected by a data dependency.
     std::vector<const LogicalBuffer*> dead_buffers_to_free;
     for (const LogicalBuffer* buffer : buffers_defined_by_instruction) {
-      if (heap.IgnoreBuffer(buffer)) {
+      if (IgnoreBuffer(buffer)) {
         continue;
       }
       for (const BufferAlias& alias :
@@ -127,7 +158,7 @@ StatusOr<HeapSimulator::Result> HeapSimulator::Run(
     std::vector<const LogicalBuffer*> operand_buffers_to_free;
     for (const LogicalBuffer* operand_buffer :
          UniqueOperandSourceBuffers(instruction, points_to_analysis)) {
-      if (heap.IgnoreBuffer(operand_buffer)) {
+      if (IgnoreBuffer(operand_buffer)) {
         continue;
       }
       live_buffers[operand_buffer].erase(instruction);
@@ -142,10 +173,10 @@ StatusOr<HeapSimulator::Result> HeapSimulator::Run(
     // happen before dead or operand buffers are freed; the instruction reads
     // the operand buffers to produce its output.
     //
-    // INVARIANT: Either heap.Alloc or heap.ShareBuffer will be called for each
-    // buffer that we should assign.
+    // INVARIANT: Either Alloc or ShareBuffer will be called for each buffer
+    // that we should assign.
     for (const LogicalBuffer* buffer : buffers_defined_by_instruction) {
-      if (heap.IgnoreBuffer(buffer)) {
+      if (IgnoreBuffer(buffer)) {
         continue;
       }
 
@@ -159,24 +190,50 @@ StatusOr<HeapSimulator::Result> HeapSimulator::Run(
             CanShareOperandBufferWithUser(
                 operand_buffer->instruction(), operand_buffer->index(),
                 buffer->instruction(), buffer->index(), points_to_analysis)) {
-          heap.ShareBuffer(buffer, operand_buffer);
+          ShareBuffer(buffer, operand_buffer);
           shared = true;
           break;
         }
       }
 
       if (!shared) {
-        heap.Alloc(buffer);
+        Alloc(buffer);
       }
     }
 
+    // If the whole module is sequential, we can save memory by running the
+    // heap-simulation for sub-computations inline. E.g. the buffers for the
+    // condition and body of a kWhile instruction are only live for the duration
+    // of the instruction itself.
+    //
+    // The order that the sub-computations are simulated does not affect
+    // correctness; since the whole module is sequential, we know that the
+    // sub-computations will never be run concurrently.
+    if (module_sequence != nullptr) {
+      if (instruction->opcode() == HloOpcode::kCall ||
+          instruction->opcode() == HloOpcode::kWhile) {
+        for (const HloComputation* called_computation :
+             instruction->called_computations()) {
+          const std::vector<const HloInstruction*>& called_sequence =
+              FindOrDie(*module_sequence, called_computation);
+          TF_RETURN_IF_ERROR(RunComputation(*called_computation,
+                                            called_sequence, points_to_analysis,
+                                            module_sequence));
+        }
+      }
+
+      // Other sub-computations (e.g. Map, Reduce, ...) are skipped; they are
+      // assigned "thread-local" allocations, meaning their buffers are not
+      // allocated up-front at the beginning of the computation.
+    }
+
     // Free buffers that are no longer live.  This is the earliest point that we
     // can de-allocate; right after the last use of the buffer.
     for (const LogicalBuffer* buffer : dead_buffers_to_free) {
-      heap.Free(buffer);
+      Free(buffer);
     }
     for (const LogicalBuffer* buffer : operand_buffers_to_free) {
-      heap.Free(buffer);
+      Free(buffer);
     }
   }
 
@@ -187,10 +244,10 @@ StatusOr<HeapSimulator::Result> HeapSimulator::Run(
     const FlatSet<const HloInstruction*>& pending = buffer_pending.second;
     CHECK_EQ(pending.size(), 1) << *buffer;
     CHECK(*pending.begin() == nullptr) << *buffer;
-    heap.Free(buffer);
+    Free(buffer);
   }
 
-  return heap.Finish();
+  return Status::OK();
 }
 
 HeapSimulator::HeapSimulator(
@@ -309,6 +366,11 @@ HeapSimulator::Result HeapSimulator::Finish() {
         result.chunk_map.emplace(buffer, chunk);
       }
     }
+    // If we were told to assign specific buffers, make sure we've assigned
+    // exactly that many buffers.
+    if (buffers_to_assign_ != nullptr) {
+      CHECK_EQ(buffers_to_assign_->size(), result.chunk_map.size());
+    }
   }
 
   // Fragmentation is the difference between the actual and ideal sizes.
diff --git a/tensorflow/compiler/xla/service/heap_simulator.h b/tensorflow/compiler/xla/service/heap_simulator.h
index 0ce2906767..3d98046261 100644
--- a/tensorflow/compiler/xla/service/heap_simulator.h
+++ b/tensorflow/compiler/xla/service/heap_simulator.h
@@ -23,6 +23,7 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_ordering.h"
 #include "tensorflow/compiler/xla/service/logical_buffer.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 #include "tensorflow/compiler/xla/statusor.h"
@@ -63,17 +64,32 @@ class HeapSimulator {
   };
 
   // Run the heap simulation with the given algorithm, assuming the given
-  // sequential ordering of instructions.  The 'instruction_sequence' must
-  // contain a topologically-consistent total ordering of all instructions in
-  // the computation.  The result is invalid if instructions are not run in
-  // exactly this sequence.
+  // module_sequence, which must contain a topologically-consistent total
+  // ordering of all instructions within each computation. The result is invalid
+  // if instructions are not run in exactly this sequence.
+  //
+  // Running heap simulation on the whole module tends to save memory, compared
+  // to running on a per-computation basis, since we can re-use buffer space for
+  // called sub-computations.
   //
   // If 'buffers_to_assign' is provided, only those buffers are assigned
   // offsets, otherwise all buffers defined by the instructions are assigned.
+  static StatusOr<Result> Run(
+      std::unique_ptr<HeapAlgorithm> algorithm, const HloModule& module,
+      const SequentialHloOrdering::HloModuleSequence& module_sequence,
+      const TuplePointsToAnalysis& points_to_analysis,
+      const LogicalBuffer::SizeFunction& size_fn,
+      const tensorflow::gtl::FlatSet<const LogicalBuffer*>* buffers_to_assign =
+          nullptr);
+
+  // Same as above, but runs on a single computation. The 'instruction_sequence'
+  // must contain a topologically-consistent total ordering of all instructions
+  // in the computation. The result is invalid if instructions are not run in
+  // exactly this sequence.
   static StatusOr<Result> Run(
       std::unique_ptr<HeapAlgorithm> algorithm,
-      const std::vector<const HloInstruction*>& instruction_sequence,
       const HloComputation& computation,
+      const std::vector<const HloInstruction*>& instruction_sequence,
       const TuplePointsToAnalysis& points_to_analysis,
       const LogicalBuffer::SizeFunction& size_fn,
       const tensorflow::gtl::FlatSet<const LogicalBuffer*>* buffers_to_assign =
@@ -86,6 +102,12 @@ class HeapSimulator {
       const tensorflow::gtl::FlatSet<const LogicalBuffer*>* buffers_to_assign);
   ~HeapSimulator();
 
+  Status RunComputation(
+      const HloComputation& computation,
+      const std::vector<const HloInstruction*>& instruction_sequence,
+      const TuplePointsToAnalysis& points_to_analysis,
+      const SequentialHloOrdering::HloModuleSequence* module_sequence);
+
   bool IgnoreBuffer(const LogicalBuffer* buffer) const;
   void Alloc(const LogicalBuffer* buffer);
   void Free(const LogicalBuffer* buffer);
diff --git a/tensorflow/compiler/xla/service/heap_simulator_test.cc b/tensorflow/compiler/xla/service/heap_simulator_test.cc
index 874bd5f106..0a6900f733 100644
--- a/tensorflow/compiler/xla/service/heap_simulator_test.cc
+++ b/tensorflow/compiler/xla/service/heap_simulator_test.cc
@@ -19,13 +19,16 @@ limitations under the License.
 #include <utility>
 #include <vector>
 
+#include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
+#include "tensorflow/compiler/xla/service/hlo_ordering.h"
 #include "tensorflow/compiler/xla/service/logical_buffer.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 #include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+#include "tensorflow/core/lib/gtl/flatmap.h"
 
 namespace xla {
 namespace {
@@ -69,6 +72,7 @@ class HeapCallRecorder : public HeapAlgorithm {
 // sequence against an expected sequence.
 class HeapSimulatorTracker {
  public:
+  // Constructor for testing a single entry computation.
   HeapSimulatorTracker(
       const string& name, std::unique_ptr<HloComputation> computation,
       const std::vector<const HloInstruction*>& instruction_sequence) {
@@ -83,12 +87,48 @@ class HeapSimulatorTracker {
     auto zero_size = [](const LogicalBuffer& buffer) { return 0; };
     auto algorithm = MakeUnique<DecreasingSizeRunsHeap>(
         MakeUnique<HeapCallRecorder>(&actual_calls_));
-    result_ = HeapSimulator::Run(std::move(algorithm), instruction_sequence,
-                                 *module_->entry_computation(),
-                                 *points_to_analysis_, zero_size)
+    result_ = HeapSimulator::Run(
+                  std::move(algorithm), *module_->entry_computation(),
+                  instruction_sequence, *points_to_analysis_, zero_size)
                   .ConsumeValueOrDie();
   }
 
+  explicit HeapSimulatorTracker(const string& name) {
+    module_ = MakeUnique<HloModule>(name);
+  }
+
+  // Similar to the single entry computation constructor above, but runs the
+  // simulation over the entire module.
+  void RunWholeModule(
+      const std::vector<const HloInstruction*>& full_module_sequence) {
+    points_to_analysis_ =
+        TuplePointsToAnalysis::Run(module_.get()).ConsumeValueOrDie();
+
+    // Construct the module sequence grouped by computation.
+    SequentialHloOrdering::HloModuleSequence module_sequence;
+    tensorflow::gtl::FlatMap<const HloInstruction*, int> reverse_position;
+    for (int i = 0; i < full_module_sequence.size(); ++i) {
+      const HloInstruction* instruction = full_module_sequence[i];
+      module_sequence[instruction->parent()].push_back(instruction);
+      reverse_position[instruction] = full_module_sequence.size() - i;
+    }
+
+    // Hack the size_fn so that it returns a decreasing value as we step through
+    // the sequence. This lets us ensure the Alloc calls are in the sequence
+    // order. The Free calls are sorted by LogicalBuffer.id, which is at least
+    // deterministic.
+    auto size_fn = [&reverse_position](const LogicalBuffer& buffer) {
+      return reverse_position[buffer.instruction()];
+    };
+    auto algorithm = MakeUnique<DecreasingSizeRunsHeap>(
+        MakeUnique<HeapCallRecorder>(&actual_calls_));
+    result_ = HeapSimulator::Run(std::move(algorithm), *module_,
+                                 module_sequence, *points_to_analysis_, size_fn)
+                  .ConsumeValueOrDie();
+  }
+
+  HloModule* module() { return module_.get(); }
+
   // Returns the buffer defined at the given instruction and index.
   const LogicalBuffer* BufferAt(const HloInstruction* instruction,
                                 const ShapeIndex& index) const {
@@ -358,6 +398,86 @@ TEST_F(HeapSimulatorTest, MultiplyDotDotTuple) {
   });
 }
 
+TEST_F(HeapSimulatorTest, WholeModule) {
+  HeapSimulatorTracker tracker(TestName());
+
+  const Shape scalar_shape = ShapeUtil::MakeShape(xla::F32, {});
+  const Shape tuple_shape =
+      ShapeUtil::MakeTupleShape({scalar_shape, scalar_shape});
+
+  auto cond_builder = HloComputation::Builder("WhileCond");
+  HloInstruction* cond_param = cond_builder.AddInstruction(
+      HloInstruction::CreateParameter(0, tuple_shape, "cond_param"));
+  HloInstruction* cond_iter = cond_builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(scalar_shape, cond_param, 0));
+  HloInstruction* cond_data = cond_builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(scalar_shape, cond_param, 1));
+  HloInstruction* cond_lt = cond_builder.AddInstruction(
+      HloInstruction::CreateBinary(ShapeUtil::MakeShape(PRED, {}),
+                                   HloOpcode::kLt, cond_iter, cond_data));
+  HloComputation* cond_computation =
+      tracker.module()->AddEmbeddedComputation(cond_builder.Build());
+
+  auto body_builder = HloComputation::Builder("WhileBody");
+  HloInstruction* body_param = body_builder.AddInstruction(
+      HloInstruction::CreateParameter(0, tuple_shape, "body_param"));
+  HloComputation* body_computation =
+      tracker.module()->AddEmbeddedComputation(body_builder.Build());
+
+  auto builder = HloComputation::Builder(TestName());
+  HloInstruction* param = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, tuple_shape, "param"));
+  HloInstruction* while_op = builder.AddInstruction(HloInstruction::CreateWhile(
+      tuple_shape, cond_computation, body_computation, param));
+  tracker.module()->AddEntryComputation(builder.Build());
+
+  tracker.RunWholeModule(
+      {param, while_op, body_param, cond_param, cond_iter, cond_data, cond_lt});
+  tracker.ExpectCallSequence({
+      // The entry computation param and while_op are allocated first.
+      {kAlloc, tracker.BufferAt(param, {})},
+      {kAlloc, tracker.BufferAt(param, {0})},
+      {kAlloc, tracker.BufferAt(param, {1})},
+      {kAlloc, tracker.BufferAt(while_op, {})},
+      {kAlloc, tracker.BufferAt(while_op, {0})},
+      {kAlloc, tracker.BufferAt(while_op, {1})},
+
+      // Now the while body param is allocated and freed.
+      {kAlloc, tracker.BufferAt(body_param, {})},
+      {kAlloc, tracker.BufferAt(body_param, {0})},
+      {kAlloc, tracker.BufferAt(body_param, {1})},
+      {kFree, tracker.BufferAt(body_param, {})},
+      {kFree, tracker.BufferAt(body_param, {0})},
+      {kFree, tracker.BufferAt(body_param, {1})},
+
+      // Now the while cond param is allocated. The GTE instructions just alias
+      // the param elements, so the param tuple can immediately be freed.
+      {kAlloc, tracker.BufferAt(cond_param, {})},
+      {kAlloc, tracker.BufferAt(cond_param, {0})},
+      {kAlloc, tracker.BufferAt(cond_param, {1})},
+      {kFree, tracker.BufferAt(cond_param, {})},
+
+      // Now the final cond less-than buffer is allocated.
+      {kAlloc, tracker.BufferAt(cond_lt, {})},
+
+      // The order of the remaining Free calls is based on the LogicalBuffer.id,
+      // which is deterministic, but not obvious.
+      {kFree, tracker.BufferAt(param, {})},
+      {kFree, tracker.BufferAt(param, {0})},
+      {kFree, tracker.BufferAt(param, {1})},
+
+      {kFree, tracker.BufferAt(while_op, {})},
+      {kFree, tracker.BufferAt(while_op, {0})},
+      {kFree, tracker.BufferAt(while_op, {1})},
+
+      {kFree, tracker.BufferAt(cond_param, {0})},
+      {kFree, tracker.BufferAt(cond_param, {1})},
+      {kFree, tracker.BufferAt(cond_lt, {})},
+
+      {kFinish, nullptr},
+  });
+}
+
 // Base class for heap algorithm tests.
 class HeapAlgorithmTestBase : public ::testing::Test {
  protected:
diff --git a/tensorflow/compiler/xla/service/hlo_ordering.cc b/tensorflow/compiler/xla/service/hlo_ordering.cc
index 7476b72f02..725ce17d66 100644
--- a/tensorflow/compiler/xla/service/hlo_ordering.cc
+++ b/tensorflow/compiler/xla/service/hlo_ordering.cc
@@ -221,23 +221,6 @@ string SequentialHloOrdering::ToString() const {
   return tensorflow::str_util::Join(pieces, "\n");
 }
 
-namespace {
-StatusOr<int64> MinimumMemoryForSequence(
-    const HloComputation& computation,
-    const std::vector<const HloInstruction*>& sequence,
-    const TuplePointsToAnalysis& points_to_analysis,
-    const LogicalBuffer::SizeFunction& size_function) {
-  // The absolute minimum memory required for a given sequence of instructions
-  // is determined by the sequence of Alloc and Free calls on a simulated heap,
-  // ignoring fragmentation.
-  TF_ASSIGN_OR_RETURN(
-      HeapSimulator::Result result,
-      HeapSimulator::Run(MakeUnique<NoFragmentationStatsHeap>(), sequence,
-                         computation, points_to_analysis, size_function));
-  return result.heap_size;
-}
-}  // namespace
-
 StatusOr<int64> MinimumMemoryForSequence(
     const SequentialHloOrdering::HloModuleSequence& module_sequence,
     const LogicalBuffer::SizeFunction& size_function) {
@@ -249,17 +232,16 @@ StatusOr<int64> MinimumMemoryForSequence(
   TF_ASSIGN_OR_RETURN(std::unique_ptr<TuplePointsToAnalysis> points_to_analysis,
                       TuplePointsToAnalysis::Run(module));
 
-  int64 total_memory = 0;
-  for (const auto& pair : module_sequence) {
-    const HloComputation* computation = pair.first;
-    const std::vector<const HloInstruction*>& sequence = pair.second;
-    TF_ASSIGN_OR_RETURN(
-        const int64 memory,
-        MinimumMemoryForSequence(*computation, sequence, *points_to_analysis,
-                                 size_function));
-    total_memory += memory;
-  }
-  return total_memory;
+  // The absolute minimum memory required for a given sequence of instructions
+  // is determined by the sequence of Alloc and Free calls on a simulated heap,
+  // ignoring fragmentation. We run the heap simulation on the whole module,
+  // rather than summing each computation, since it gives us a better lower
+  // bound, by minimizing the liveness of sub-computations.
+  TF_ASSIGN_OR_RETURN(
+      HeapSimulator::Result result,
+      HeapSimulator::Run(MakeUnique<NoFragmentationStatsHeap>(), *module,
+                         module_sequence, *points_to_analysis, size_function));
+  return result.heap_size;
 }
 
 namespace {
@@ -516,6 +498,18 @@ StatusOr<std::vector<const HloInstruction*>> RunDFSMemoryScheduler(
   return sequence;
 }
 
+StatusOr<int64> MinimumMemoryForComputation(
+    const HloComputation& computation,
+    const std::vector<const HloInstruction*>& sequence,
+    const TuplePointsToAnalysis& points_to_analysis,
+    const LogicalBuffer::SizeFunction& size_function) {
+  TF_ASSIGN_OR_RETURN(
+      HeapSimulator::Result result,
+      HeapSimulator::Run(MakeUnique<NoFragmentationStatsHeap>(), computation,
+                         sequence, points_to_analysis, size_function));
+  return result.heap_size;
+}
+
 StatusOr<std::vector<const HloInstruction*>> CreateMemoryMinimizingSequence(
     const HloComputation& computation,
     const TuplePointsToAnalysis& points_to_analysis,
@@ -523,13 +517,17 @@ StatusOr<std::vector<const HloInstruction*>> CreateMemoryMinimizingSequence(
   // We try both a list-scheduler based ordering and a DFS based ordering, and
   // choose whichever returns a lower min-memory, not accounting for
   // fragmentation.
+  //
+  // Note that this is just a heuristic. One obvious inaccuracy is that the
+  // memory required for sub-computations might be different when considered
+  // within the caller's context. But it's good enough for now.
   TF_ASSIGN_OR_RETURN(
       std::vector<const HloInstruction*> list_sequence,
       ListScheduler::Run(computation, points_to_analysis, size_function));
   TF_ASSIGN_OR_RETURN(
       const int64 list_memory,
-      MinimumMemoryForSequence(computation, list_sequence, points_to_analysis,
-                               size_function));
+      MinimumMemoryForComputation(computation, list_sequence,
+                                  points_to_analysis, size_function));
   VLOG(2) << "Min-memory list sequence: " << list_memory << " bytes";
 
   TF_ASSIGN_OR_RETURN(
@@ -537,8 +535,8 @@ StatusOr<std::vector<const HloInstruction*>> CreateMemoryMinimizingSequence(
       RunDFSMemoryScheduler(computation, points_to_analysis, size_function));
   TF_ASSIGN_OR_RETURN(
       const int64 dfs_memory,
-      MinimumMemoryForSequence(computation, dfs_sequence, points_to_analysis,
-                               size_function));
+      MinimumMemoryForComputation(computation, dfs_sequence, points_to_analysis,
+                                  size_function));
   VLOG(2) << "Min-memory dfs sequence: " << dfs_memory << " bytes";
 
   if (list_memory <= dfs_memory) {
diff --git a/tensorflow/compiler/xla/service/hlo_ordering_test.cc b/tensorflow/compiler/xla/service/hlo_ordering_test.cc
index 01b5fd9364..c387fbb89b 100644
--- a/tensorflow/compiler/xla/service/hlo_ordering_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_ordering_test.cc
@@ -155,6 +155,65 @@ TEST_F(HloOrderingTest, InstructionsInDifferentComputations) {
   EXPECT_FALSE(ordering.ExecutesBefore(y, c));
 }
 
+class MinimumMemoryForSequenceTest : public HloTestBase {};
+
+TEST_F(MinimumMemoryForSequenceTest, MultiComputation) {
+  HloModule module(TestName());
+  const Shape scalar_shape = ShapeUtil::MakeShape(xla::F32, {});
+  const Shape tuple_shape =
+      ShapeUtil::MakeTupleShape({scalar_shape, scalar_shape});
+
+  auto cond_builder = HloComputation::Builder("WhileCond");
+  // Tuple param: 24 bytes (each elem has 8 byte pointer, 4 byte element)
+  HloInstruction* cond_param = cond_builder.AddInstruction(
+      HloInstruction::CreateParameter(0, tuple_shape, "cond_param"));
+  HloInstruction* cond_iter = cond_builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(scalar_shape, cond_param, 0));
+  HloInstruction* cond_data = cond_builder.AddInstruction(
+      HloInstruction::CreateGetTupleElement(scalar_shape, cond_param, 1));
+  // Free cond_param[] (16 bytes), Alloc PRED[] (1 byte)
+  HloInstruction* cond_lt = cond_builder.AddInstruction(
+      HloInstruction::CreateBinary(ShapeUtil::MakeShape(PRED, {}),
+                                   HloOpcode::kLt, cond_iter, cond_data));
+  HloComputation* cond_computation =
+      module.AddEmbeddedComputation(cond_builder.Build());
+
+  auto body_builder = HloComputation::Builder("WhileBody");
+  // Tuple param: 24 bytes (each elem has 8 byte pointer, 4 byte element)
+  HloInstruction* body_param = body_builder.AddInstruction(
+      HloInstruction::CreateParameter(0, tuple_shape, "body_param"));
+  HloComputation* body_computation =
+      module.AddEmbeddedComputation(body_builder.Build());
+
+  auto builder = HloComputation::Builder(TestName());
+  // Entry params: 8 bytes (4 bytes per param), TOTAL=8
+  HloInstruction* iter = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, scalar_shape, "param_iter"));
+  HloInstruction* data = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, scalar_shape, "param_data"));
+  // Tuple: 16 bytes (8 bytes per pointer), TOTAL=24
+  HloInstruction* tuple =
+      builder.AddInstruction(HloInstruction::CreateTuple({iter, data}));
+  // While: 8 bytes (4 bytes per element), TOTAL=32
+  // Both cond and body use a max of 24 bytes, TOTAL=56
+  HloInstruction* while_op = builder.AddInstruction(HloInstruction::CreateWhile(
+      tuple_shape, cond_computation, body_computation, tuple));
+  HloComputation* entry_computation =
+      module.AddEntryComputation(builder.Build());
+
+  auto size_fn = [](const LogicalBuffer& buffer) {
+    return ShapeUtil::ByteSizeOf(buffer.shape(), /*pointer_size=*/8);
+  };
+
+  SequentialHloOrdering::HloModuleSequence module_sequence;
+  module_sequence[cond_computation] = {cond_param, cond_iter, cond_data,
+                                       cond_lt};
+  module_sequence[body_computation] = {body_param};
+  module_sequence[entry_computation] = {iter, data, tuple, while_op};
+  EXPECT_EQ(56,
+            MinimumMemoryForSequence(module_sequence, size_fn).ValueOrDie());
+}
+
 }  // namespace
 
 }  // namespace xla
-- 
GitLab


From a8d720c2b7e4260bee7020822168bfba852274ac Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 2 May 2017 18:02:26 -0800
Subject: [PATCH 0946/1563] Calling InferenceContext::UnknownShapes twice
 produces 2 shape handles for which ShapeHandle::SameHandle returns false.
 Therefore we need to merge the shapes handles in InferenceContext::set_input,
 InferenceContext::set_input_handle_shape, and
 InferenceContext::set_output_handle_shape Change: 154911808

---
 .../core/common_runtime/shape_refiner.cc      |   4 +-
 tensorflow/core/framework/shape_inference.h   |  62 +++--
 .../core/grappler/costs/graph_properties.cc   |   2 +-
 .../grappler/costs/graph_properties_test.cc   | 227 ++++++++++++++++++
 4 files changed, 268 insertions(+), 27 deletions(-)

diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index 8eb383a14f..876f34b991 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -163,7 +163,7 @@ Status ShapeRefiner::UpdateNode(const Node* node, bool* refined) {
 
     InferenceContext* c = iter->second.get();
     DCHECK_GE(e->dst_input(), 0);
-    if (node_context->set_input(e->dst_input(), c->output(e->src_output()))) {
+    if (node_context->MergeInput(e->dst_input(), c->output(e->src_output()))) {
       *refined = true;
     }
 
@@ -174,7 +174,7 @@ Status ShapeRefiner::UpdateNode(const Node* node, bool* refined) {
               e->dst_input(), c->output_handle_dtype(e->src_output()))) {
         *refined = true;
       }
-      if (node_context->set_input_handle_shape(
+      if (node_context->MergeInputHandleShape(
               e->dst_input(), c->output_handle_shape(e->src_output()))) {
         *refined = true;
       }
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index 71663027b3..cebadcc5b4 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -191,16 +191,18 @@ class InferenceContext {
     return s;
   }
 
-  // Set the shape of the input in position idx. This requires idx to be in the
-  // [0, num_inputs) range. Returns true iff the stored input shape has been
-  // updated with a different handle.
-  bool set_input(int idx, ShapeHandle shape) {
-    if (!inputs_[idx].SameHandle(shape)) {
-      inputs_[idx] = shape;
-      return true;
-    } else {
+  // Merge the stored shape of the input in position idx with the specified
+  // shape. This requires idx to be in the [0, num_inputs) range. If the merge
+  // is successful and the new shape differs from the old one, store the new
+  // shape and return true. Return false otherwise.
+  bool MergeInput(int idx, ShapeHandle shape) {
+    ShapeHandle new_shape;
+    if (!Merge(inputs_[idx], shape, &new_shape).ok() ||
+        inputs_[idx].SameHandle(new_shape)) {
       return false;
     }
+    inputs_[idx] = new_shape;
+    return true;
   }
   ShapeHandle input(int64 idx) const { return inputs_[idx]; }
   Status input(StringPiece input_name, std::vector<ShapeHandle>* output) const;
@@ -442,15 +444,18 @@ class InferenceContext {
   // propagate that information. Output handle dtypes and shapes are ignored if
   // the output tensor is not of type DT_RESOURCE.
 
-  // Set the shape corresponding to the resource in position idx. This requires
-  // idx to be in the [0, num_inputs) range. Returns true iff the stored shape
-  // has been updated with a different handle.
-  bool set_input_handle_shape(int idx, ShapeHandle shape) {
-    if (!input_handle_shape_[idx].SameHandle(shape)) {
-      input_handle_shape_[idx] = shape;
-      return true;
+  // Merge the stored shape corresponding to the input handle in position idx
+  // with the specified shape. This requires idx to be in the [0, num_inputs)
+  // range. If the merge is successful and the new shape differs from the old
+  // one, store the new shape and return true. Return false otherwise.
+  bool MergeInputHandleShape(int idx, ShapeHandle shape) {
+    ShapeHandle new_shape;
+    if (!Merge(input_handle_shape_[idx], shape, &new_shape).ok() ||
+        input_handle_shape_[idx].SameHandle(new_shape)) {
+      return false;
     }
-    return false;
+    input_handle_shape_[idx] = shape;
+    return true;
   }
 
   // Set the type corresponding to the resource in position idx. This requires
@@ -468,15 +473,24 @@ class InferenceContext {
     return input_handle_dtype_[idx];
   }
 
-  // Set the shape corresponding to the resource in position idx. This requires
-  // idx to be in the [0, num_outputs) range.
-  // Returns true iff the stored shape has been updated with a different handle.
-  bool set_output_handle_shape(int idx, ShapeHandle shape) {
-    if (!output_handle_shape_[idx].SameHandle(shape)) {
-      output_handle_shape_[idx] = shape;
-      return true;
+  // Merge the stored shape corresponding to the output handle in position idx
+  // with the specified shape. This requires idx to be in the [0, num_outputs)
+  // range. If the merge is successful and the new shape differs from the old
+  // one, store the new shape and return true. Return false otherwise.
+
+  bool MergeOutputHandleShape(int idx, ShapeHandle shape) {
+    ShapeHandle new_shape;
+    if (!Merge(output_handle_shape_[idx], shape, &new_shape).ok() ||
+        output_handle_shape_[idx].SameHandle(new_shape)) {
+      return false;
     }
-    return false;
+    output_handle_shape_[idx] = shape;
+    return true;
+  }
+  // Overwrite the shape corresponding to the output handle in position idx with
+  // the specified shape.
+  void set_output_handle_shape(int idx, ShapeHandle shape) {
+    output_handle_shape_[idx] = shape;
   }
 
   // Set the type corresponding to the resource in position idx. This requires
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 31c1043ae6..75f2f16c5b 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -85,7 +85,7 @@ Status GraphProperties::InferStatically() {
         }
       }
       if (qctx->set_output_handle_dtype(0, queue_type) ||
-          qctx->set_output_handle_shape(0, queue_shp)) {
+          qctx->MergeOutputHandleShape(0, queue_shp)) {
         new_shapes.push(qnode);
       }
     }
diff --git a/tensorflow/core/grappler/costs/graph_properties_test.cc b/tensorflow/core/grappler/costs/graph_properties_test.cc
index 94b809dc44..be5ae3c364 100644
--- a/tensorflow/core/grappler/costs/graph_properties_test.cc
+++ b/tensorflow/core/grappler/costs/graph_properties_test.cc
@@ -177,10 +177,14 @@ TEST_F(GraphPropertiesTest, Queues) {
   auto dequeue2 =
       ops::QueueDequeue(root.WithOpName("Dequeue2"), q2, {DataType::DT_FLOAT});
 
+  // Create a queue that feeds itself.
   auto q3 =
       ops::RandomShuffleQueue(root.WithOpName("Queue3"), {DataType::DT_FLOAT});
   auto dequeue3 =
       ops::QueueDequeue(root.WithOpName("Dequeue3"), q3, {DataType::DT_FLOAT});
+  auto merge3 = ops::Merge(root.WithOpName("Merge3"), {dequeue3[0], square2});
+  auto enqueue3 =
+      ops::QueueEnqueue(root.WithOpName("Enqueue3"), q3, {merge3.output});
 
   auto q4 =
       ops::RandomShuffleQueue(root.WithOpName("Queue4"), {DataType::DT_FLOAT});
@@ -227,6 +231,229 @@ TEST_F(GraphPropertiesTest, Queues) {
   EXPECT_EQ(7, prop4.shape().dim(1).size());
 }
 
+TEST_F(GraphPropertiesTest, Loops) {
+  // Test graph produced in python using:
+  /*
+     with tf.Graph().as_default():
+       i = tf.constant(0)
+       c = lambda i: tf.less(i, 10)
+       b = lambda i: tf.add(i, 1)
+       r = tf.while_loop(c, b, [i])
+       with open('/tmp/graph.txt', 'w') as f:
+         f.write(str(tf.get_default_graph().as_graph_def()))
+  */
+  const string gdef_ascii = R"EOF(
+node {
+  name: "Const"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "while/Enter"
+  op: "Enter"
+  input: "Const"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "frame_name"
+    value {
+      s: "while/while/"
+    }
+  }
+  attr {
+    key: "is_constant"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "parallel_iterations"
+    value {
+      i: 10
+    }
+  }
+}
+node {
+  name: "while/Merge"
+  op: "Merge"
+  input: "while/Enter"
+  input: "while/NextIteration"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/Less/y"
+  op: "Const"
+  input: "^while/Merge"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "while/Less"
+  op: "Less"
+  input: "while/Merge"
+  input: "while/Less/y"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/LoopCond"
+  op: "LoopCond"
+  input: "while/Less"
+}
+node {
+  name: "while/Switch"
+  op: "Switch"
+  input: "while/Merge"
+  input: "while/LoopCond"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@while/Merge"
+      }
+    }
+  }
+}
+node {
+  name: "while/Identity"
+  op: "Identity"
+  input: "while/Switch:1"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/Add/y"
+  op: "Const"
+  input: "^while/Identity"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "while/Add"
+  op: "Add"
+  input: "while/Identity"
+  input: "while/Add/y"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/NextIteration"
+  op: "NextIteration"
+  input: "while/Add"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/Exit"
+  op: "Exit"
+  input: "while/Switch"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+versions {
+  producer: 11
+}
+  )EOF";
+
+  GrapplerItem item;
+  CHECK(protobuf::TextFormat::ParseFromString(gdef_ascii, &item.graph));
+  GraphProperties properties(item);
+  TF_CHECK_OK(properties.InferStatically());
+
+  const auto props = properties.GetOutputProperties("while/Exit");
+  EXPECT_EQ(1, props.size());
+  const OpInfo::TensorProperties& prop = props[0];
+  EXPECT_EQ(DT_INT32, prop.dtype());
+  EXPECT_TRUE(prop.shape().unknown_rank());
+}
+
 }  // namespace
 }  // namespace grappler
 }  // namespace tensorflow
-- 
GitLab


From 550df413158b32645ca5df4dcaabc67f1a48964d Mon Sep 17 00:00:00 2001
From: Arno Leist <mail@arno-leist.de>
Date: Wed, 3 May 2017 14:34:24 +1200
Subject: [PATCH 0947/1563] Added -D_GLIBCXX_USE_CXX11_ABI=0 to bazel build
 (#9607)

* Added -D_GLIBCXX_USE_CXX11_ABI=0 to bazel build

Fixes issues with missing symbols when compiling with GCC 5.x. See
issue tensorflow/tensorflow#1419.

* Split lines to keep line length under 80 chars
---
 tensorflow/tools/docker/Dockerfile.devel     | 3 ++-
 tensorflow/tools/docker/Dockerfile.devel-gpu | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index bfac54c601..a0e0f88d9d 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -92,7 +92,8 @@ WORKDIR /tensorflow
 ENV CI_BUILD_PYTHON python
 
 RUN tensorflow/tools/ci_build/builds/configured CPU \
-    bazel build -c opt tensorflow/tools/pip_package:build_pip_package && \
+    bazel build -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+        tensorflow/tools/pip_package:build_pip_package && \
     bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
     pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl && \
     rm -rf /tmp/pip && \
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 7726cbdfbf..743c05ef88 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -92,7 +92,8 @@ ENV TF_NEED_CUDA 1
 ENV TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.0,6.1
 
 RUN tensorflow/tools/ci_build/builds/configured GPU \
-    bazel build -c opt --config=cuda tensorflow/tools/pip_package:build_pip_package && \
+    bazel build -c opt --config=cuda --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+        tensorflow/tools/pip_package:build_pip_package && \
     bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
     pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl && \
     rm -rf /tmp/pip && \
-- 
GitLab


From 3af03be757b63ea6fbd28cc351d5d2323c526354 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Tue, 2 May 2017 18:56:32 -0800
Subject: [PATCH 0948/1563] tfdbg: internal-only changes Change: 154914490

---
 tensorflow/python/debug/wrappers/framework.py        |  6 ------
 tensorflow/python/debug/wrappers/framework_test.py   | 12 ------------
 tensorflow/tools/dist_test/server/BUILD              |  2 +-
 .../tools/dist_test/server/grpc_tensorflow_server.py | 12 +++++++++++-
 4 files changed, 12 insertions(+), 20 deletions(-)
 mode change 100755 => 100644 tensorflow/tools/dist_test/server/grpc_tensorflow_server.py

diff --git a/tensorflow/python/debug/wrappers/framework.py b/tensorflow/python/debug/wrappers/framework.py
index 50645c1c87..0d8616a69f 100644
--- a/tensorflow/python/debug/wrappers/framework.py
+++ b/tensorflow/python/debug/wrappers/framework.py
@@ -348,12 +348,6 @@ class BaseDebugWrapperSession(session.SessionInterface):
 
     _check_type(sess, session.BaseSession)
 
-    # TODO(cais): Remove this check once tfdbg is integrated with GrpcSession.
-    if sess.sess_str:
-      raise NotImplementedError(
-          "Non-DirectSession support is not available from TensorFlow "
-          "Debugger yet (sess_str=%s)" % sess.sess_str)
-
     # The session being wrapped.
     self._sess = sess
     self._thread_name_filter_pattern = (re.compile(thread_name_filter)
diff --git a/tensorflow/python/debug/wrappers/framework_test.py b/tensorflow/python/debug/wrappers/framework_test.py
index 1d69c7769a..fd0efcd925 100644
--- a/tensorflow/python/debug/wrappers/framework_test.py
+++ b/tensorflow/python/debug/wrappers/framework_test.py
@@ -384,18 +384,6 @@ class DebugWrapperSessionTest(test_util.TensorFlowTestCase):
         ["a_init", "b_init"],
         [datum.node_name for datum in dump.dumped_tensor_data])
 
-  def testUsingNonDirectSessionRaisesNotImplementedError(self):
-    # TODO(cais): Remove this test once tfdbg is integrated with GrpcSession.
-    fake_non_direct_session = session.Session()
-    fake_non_direct_session._target = "foo"
-
-    with self.assertRaisesRegexp(
-        NotImplementedError,
-        r"Non-DirectSession support is not available from TensorFlow Debugger "
-        r"yet \(sess_str=foo\)"):
-      TestDebugWrapperSession(
-          fake_non_direct_session, self._dump_root, self._observer)
-
 
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/tools/dist_test/server/BUILD b/tensorflow/tools/dist_test/server/BUILD
index 9d008ec9ce..865af8dd7b 100644
--- a/tensorflow/tools/dist_test/server/BUILD
+++ b/tensorflow/tools/dist_test/server/BUILD
@@ -9,7 +9,7 @@ exports_files(["LICENSE"])
 
 load("//tensorflow:tensorflow.bzl", "py_test")
 
-py_library(
+py_binary(
     name = "grpc_tensorflow_server",
     srcs = [
         "grpc_tensorflow_server.py",
diff --git a/tensorflow/tools/dist_test/server/grpc_tensorflow_server.py b/tensorflow/tools/dist_test/server/grpc_tensorflow_server.py
old mode 100755
new mode 100644
index 2d774577b6..bd6700a0b1
--- a/tensorflow/tools/dist_test/server/grpc_tensorflow_server.py
+++ b/tensorflow/tools/dist_test/server/grpc_tensorflow_server.py
@@ -36,6 +36,7 @@ from __future__ import print_function
 import argparse
 import sys
 
+from tensorflow.core.protobuf import config_pb2
 from tensorflow.core.protobuf import tensorflow_server_pb2
 from tensorflow.python.platform import app
 from tensorflow.python.training import server_lib
@@ -103,8 +104,11 @@ def main(unused_args):
     raise ValueError("Invalid task_id: %d" % FLAGS.task_id)
   server_def.task_index = FLAGS.task_id
 
+  config = config_pb2.ConfigProto(gpu_options=config_pb2.GPUOptions(
+      per_process_gpu_memory_fraction=FLAGS.gpu_memory_fraction))
+
   # Create GRPC Server instance
-  server = server_lib.Server(server_def)
+  server = server_lib.Server(server_def, config=config)
 
   # join() is blocking, unlike start()
   server.join()
@@ -137,6 +141,11 @@ if __name__ == "__main__":
       default=0,
       help="Task index, e.g., 0"
   )
+  parser.add_argument(
+      "--gpu_memory_fraction",
+      type=float,
+      default=1.0,
+      help="Fraction of GPU memory allocated",)
   parser.add_argument(
       "--verbose",
       type="bool",
@@ -145,5 +154,6 @@ if __name__ == "__main__":
       default=False,
       help="Verbose mode"
   )
+
   FLAGS, unparsed = parser.parse_known_args()
   app.run(main=main, argv=[sys.argv[0]] + unparsed)
-- 
GitLab


From 485a24eda09965b83af1b2218bc12c529cc35c91 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 2 May 2017 19:24:23 -0800
Subject: [PATCH 0949/1563] [tf layers] Delay marking a layer as built until
 the end of its first apply().

This allows the layer's call() method to call add_variable, making it much
easier to create variables while building the layer's logic.
Change: 154916035
---
 .../contrib/keras/python/keras/layers/core.py |  1 +
 .../keras/python/keras/layers/merge.py        |  3 ++
 .../keras/python/keras/layers/wrappers.py     |  1 +
 tensorflow/python/layers/base.py              |  4 +--
 tensorflow/python/layers/base_test.py         | 30 +++++++++++++++++++
 tensorflow/python/layers/convolutional.py     |  4 ++-
 tensorflow/python/layers/core.py              |  1 +
 tensorflow/python/layers/normalization.py     |  1 +
 tensorflow/python/layers/pooling.py           |  3 ++
 9 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/layers/core.py b/tensorflow/contrib/keras/python/keras/layers/core.py
index 7a9e0d1736..0b6cdc65a4 100644
--- a/tensorflow/contrib/keras/python/keras/layers/core.py
+++ b/tensorflow/contrib/keras/python/keras/layers/core.py
@@ -741,6 +741,7 @@ class Dense(tf_core_layers.Dense, Layer):
       self.constraints[self.kernel] = self.kernel_constraint
     if self.use_bias and self.bias_constraint:
       self.constraints[self.bias] = self.bias_constraint
+    self.built = True
 
   def get_config(self):
     config = {
diff --git a/tensorflow/contrib/keras/python/keras/layers/merge.py b/tensorflow/contrib/keras/python/keras/layers/merge.py
index 25921979bd..b4bb9935fd 100644
--- a/tensorflow/contrib/keras/python/keras/layers/merge.py
+++ b/tensorflow/contrib/keras/python/keras/layers/merge.py
@@ -111,6 +111,7 @@ class _Merge(Layer):
       self._reshape_required = False
     else:
       self._reshape_required = True
+    self.built = True
 
   def call(self, inputs):
     if self._reshape_required:
@@ -302,6 +303,7 @@ class Concatenate(_Merge):
                        'inputs with matching shapes '
                        'except for the concat axis. '
                        'Got inputs shapes: %s' % (input_shape))
+    self.built = True
 
   def call(self, inputs):
     if not isinstance(inputs, list):
@@ -414,6 +416,7 @@ class Dot(_Merge):
       raise ValueError('Dimension incompatibility '
                        '%s != %s. ' % (shape1[axes[0]], shape2[axes[1]]) +
                        'Layer shapes: %s, %s' % (shape1, shape2))
+    self.built = True
 
   def call(self, inputs):
     x1 = inputs[0]
diff --git a/tensorflow/contrib/keras/python/keras/layers/wrappers.py b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
index ce6458fd0c..092501cb11 100644
--- a/tensorflow/contrib/keras/python/keras/layers/wrappers.py
+++ b/tensorflow/contrib/keras/python/keras/layers/wrappers.py
@@ -166,6 +166,7 @@ class TimeDistributed(Wrapper):
       self.layer.build(child_input_shape)
       self.layer.built = True
     super(TimeDistributed, self).build()
+    self.built = True
 
   def _compute_output_shape(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape).as_list()
diff --git a/tensorflow/python/layers/base.py b/tensorflow/python/layers/base.py
index f6b816333e..cfcd844800 100644
--- a/tensorflow/python/layers/base.py
+++ b/tensorflow/python/layers/base.py
@@ -335,7 +335,7 @@ class Layer(object):
 
   def add_variable(self, name, shape, dtype=None,
                    initializer=None, regularizer=None, trainable=True):
-    """Adds a new variable to the layer.
+    """Adds a new variable to the layer, or gets an existing one; returns it.
 
     Arguments:
       name: variable name.
@@ -424,7 +424,6 @@ class Layer(object):
             self.build(input_shapes[0])
           else:
             self.build(input_shapes)
-          self.built = True
         if 'scope' in tf_inspect.getargspec(self.call).args:
           kwargs['scope'] = scope
         outputs = self.call(inputs, *args, **kwargs)
@@ -443,6 +442,7 @@ class Layer(object):
 
     # Update global default collections.
     _add_elements_to_collection(self.updates, ops.GraphKeys.UPDATE_OPS)
+    self.built = True
     return outputs
 
   @property
diff --git a/tensorflow/python/layers/base_test.py b/tensorflow/python/layers/base_test.py
index 9acf1c05e2..9e2457a489 100644
--- a/tensorflow/python/layers/base_test.py
+++ b/tensorflow/python/layers/base_test.py
@@ -153,6 +153,36 @@ class BaseLayerTest(test.TestCase):
     self.assertEqual(layer.built, True)
     self.assertEqual(outputs.op.name, 'my_layer/Square')
 
+  def testFirstCallCanCreateVariablesButSecondCanNotWhenBuildEmpty(self):
+
+    class MyLayer(base_layers.Layer):
+
+      def build(self, _):
+        # Do not mark the layer as built.
+        pass
+
+      def call(self, inputs):
+        self.my_var = self.add_variable('my_var', [2, 2])
+        if self.built:
+          # Skip creating on the first call; try to create after it's
+          # built.  This is expected to fail.
+          self.add_variable('this_will_break_on_second_call', [2, 2])
+        return inputs + math_ops.square(self.my_var)
+
+    layer = MyLayer(name='my_layer')
+    inputs = random_ops.random_uniform((2,), seed=1)
+    outputs = layer.apply(inputs)
+    self.assertEqual(layer.built, True)
+    self.assertEqual(outputs.op.name, 'my_layer/add')
+    self.assertListEqual(
+        [v.name for v in layer.variables], ['my_layer/my_var:0'])
+    with self.assertRaisesRegexp(ValueError,
+                                 'my_layer/this_will_break_on_second_call'):
+      layer.apply(inputs)
+    # The list of variables hasn't changed.
+    self.assertListEqual(
+        [v.name for v in layer.variables], ['my_layer/my_var:0'])
+
   def testDeepCopy(self):
 
     class MyLayer(base_layers.Layer):
diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py
index 50709bb51d..b2fe9feb44 100644
--- a/tensorflow/python/layers/convolutional.py
+++ b/tensorflow/python/layers/convolutional.py
@@ -145,6 +145,7 @@ class _Conv(base.Layer):
                                     dtype=self.dtype)
     else:
       self.bias = None
+    self.built = True
 
   def call(self, inputs):
     outputs = nn.convolution(
@@ -837,6 +838,7 @@ class SeparableConv2D(Conv2D):
                                     dtype=self.dtype)
     else:
       self.bias = None
+    self.built = True
 
   def call(self, inputs):
     if self.data_format == 'channels_first':
@@ -1070,6 +1072,7 @@ class Conv2DTranspose(Conv2D):
                                     dtype=self.dtype)
     else:
       self.bias = None
+    self.built = True
 
   def call(self, inputs):
     inputs_shape = array_ops.shape(inputs)
@@ -1224,4 +1227,3 @@ convolution2d = conv2d
 convolution3d = conv3d
 separable_convolution2d = separable_conv2d
 convolution2d_transpose = deconvolution2d = deconv2d = conv2d_transpose
-
diff --git a/tensorflow/python/layers/core.py b/tensorflow/python/layers/core.py
index 49f6499ca4..1ec4e51e5e 100644
--- a/tensorflow/python/layers/core.py
+++ b/tensorflow/python/layers/core.py
@@ -130,6 +130,7 @@ class Dense(base.Layer):
                                     trainable=True)
     else:
       self.bias = None
+    self.built = True
 
   def call(self, inputs):
     inputs = ops.convert_to_tensor(inputs, dtype=self.dtype)
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 2970ddb8ce..871f840c52 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -201,6 +201,7 @@ class BatchNormalization(base.Layer):
                 'renorm_stddev_weight', ())
     finally:
       self._scope.set_partitioner(partitioner)
+    self.built = True
 
   def _renorm_correction_and_moments(self, mean, variance, training):
     """Returns the correction and update values for renorm."""
diff --git a/tensorflow/python/layers/pooling.py b/tensorflow/python/layers/pooling.py
index b819372923..a1dfab09de 100644
--- a/tensorflow/python/layers/pooling.py
+++ b/tensorflow/python/layers/pooling.py
@@ -71,6 +71,7 @@ class _Pooling1D(base.Layer):
     if len(input_shape) != 3:
       raise ValueError('Inputs should have rank 3. '
                        'Received input shape:', str(input_shape))
+    self.built = True
 
   def call(self, inputs):
     # There is no TF op for 1D pooling, hence we make the inputs 4D.
@@ -261,6 +262,7 @@ class _Pooling2D(base.Layer):
     if len(input_shape) != 4:
       raise ValueError('Inputs should have rank 4. '
                        'Received input shape:', str(input_shape))
+    self.built = True
 
   def call(self, inputs):
     if self.data_format == 'channels_last':
@@ -448,6 +450,7 @@ class _Pooling3D(base.Layer):
     if len(input_shape) != 5:
       raise ValueError('Inputs should have rank 5. '
                        'Received input shape:', str(input_shape))
+    self.built = True
 
   def call(self, inputs):
     pool_shape = (1,) + self.pool_size + (1,)
-- 
GitLab


From a0a56e977e0a495df085bd6e5fa05664ebf05789 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 00:35:09 -0800
Subject: [PATCH 0950/1563] Allow importers of scoped metagraphs to specify
 collections to restore with a predicate.

Predicates offer a flexible generalization of blacklists & whitelists.
Change: 154931947
---
 tensorflow/python/framework/meta_graph.py     | 13 +++-
 .../python/framework/meta_graph_test.py       | 60 +++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/framework/meta_graph.py b/tensorflow/python/framework/meta_graph.py
index 26344d3852..7b13fcfbdf 100644
--- a/tensorflow/python/framework/meta_graph.py
+++ b/tensorflow/python/framework/meta_graph.py
@@ -422,14 +422,15 @@ def import_scoped_meta_graph(meta_graph_or_file,
                              graph=None,
                              import_scope=None,
                              input_map=None,
-                             unbound_inputs_col_name="unbound_inputs"):
-  """Recreates a`Graph` saved in a `MetaGraphDef` proto.
+                             unbound_inputs_col_name="unbound_inputs",
+                             restore_collections_predicate=(lambda key: True)):
+  """Recreates a `Graph` saved in a `MetaGraphDef` proto.
 
   This function takes a `MetaGraphDef` protocol buffer as input. If
   the argument is a file containing a `MetaGraphDef` protocol buffer ,
   it constructs a protocol buffer from the file content. The function
   then adds all the nodes from the `graph_def` field to the
-  current graph, recreates all the collections, and returns a saver
+  current graph, recreates the desired collections, and returns a saver
   constructed from the `saver_def` field.
 
   In combination with `export_scoped_meta_graph()`, this function can be used to
@@ -453,6 +454,10 @@ def import_scoped_meta_graph(meta_graph_or_file,
       `Tensor` objects. The values of the named input tensors in the imported
       graph will be re-mapped to the respective `Tensor` values.
     unbound_inputs_col_name: Collection name for looking up unbound inputs.
+    restore_collections_predicate: a predicate on collection names. A collection
+      named c (i.e whose key is c) will be restored iff
+      1) `restore_collections_predicate(c)` is True, and
+      2) `c != unbound_inputs_col_name`.
 
   Returns:
     A dictionary of all the `Variables` imported into the name scope.
@@ -503,6 +508,8 @@ def import_scoped_meta_graph(meta_graph_or_file,
       # Don't add unbound_inputs to the new graph.
       if key == unbound_inputs_col_name:
         continue
+      if not restore_collections_predicate(key):
+        continue
 
       kind = col_def.WhichOneof("kind")
       if kind is None:
diff --git a/tensorflow/python/framework/meta_graph_test.py b/tensorflow/python/framework/meta_graph_test.py
index f8056ade3e..49d5997784 100644
--- a/tensorflow/python/framework/meta_graph_test.py
+++ b/tensorflow/python/framework/meta_graph_test.py
@@ -335,6 +335,66 @@ class ScopedMetaGraphTest(test.TestCase):
     for a, b in zip(orig_meta_graphs, new_meta_graphs):
       test_util.assert_meta_graph_protos_equal(self, a, b)
 
+  def testScopedImportWithSelectedCollections(self):
+    meta_graph_filename = os.path.join(
+        _TestDir("selected_collections_import"), "meta_graph.pb")
+
+    graph = ops.Graph()
+    # Add a variable to populate two collections. The functionality tested is
+    # not specific to variables, but using variables in the test is convenient.
+    with graph.as_default():
+      variables.Variable(initial_value=1.0, trainable=True)
+    self.assertTrue(
+        all([
+            graph.get_collection(key)
+            for key in
+            [ops.GraphKeys.GLOBAL_VARIABLES, ops.GraphKeys.TRAINABLE_VARIABLES]
+        ]))
+    meta_graph.export_scoped_meta_graph(
+        filename=meta_graph_filename, graph=graph)
+
+    def _test_import(include_collection_keys, omit_collection_keys):
+      assert set(include_collection_keys).isdisjoint(omit_collection_keys)
+      newgraph = ops.Graph()
+      import_scope = "some_scope_name"
+
+      def _restore_collections_predicate(collection_key):
+        return (collection_key in include_collection_keys and
+                collection_key not in omit_collection_keys)
+
+      meta_graph.import_scoped_meta_graph(
+          meta_graph_filename,
+          graph=newgraph,
+          import_scope=import_scope,
+          restore_collections_predicate=_restore_collections_predicate)
+      collection_values = [
+          newgraph.get_collection(name=key, scope=import_scope)
+          for key in include_collection_keys
+      ]
+      self.assertTrue(all(collection_values))
+      collection_values = [
+          newgraph.get_collection(name=key, scope=import_scope)
+          for key in omit_collection_keys
+      ]
+      self.assertFalse(any(collection_values))
+
+    _test_import(
+        include_collection_keys=[
+            ops.GraphKeys.GLOBAL_VARIABLES, ops.GraphKeys.TRAINABLE_VARIABLES
+        ],
+        omit_collection_keys=[])
+    _test_import(
+        include_collection_keys=[ops.GraphKeys.GLOBAL_VARIABLES],
+        omit_collection_keys=[ops.GraphKeys.TRAINABLE_VARIABLES])
+    _test_import(
+        include_collection_keys=[ops.GraphKeys.TRAINABLE_VARIABLES],
+        omit_collection_keys=[ops.GraphKeys.GLOBAL_VARIABLES])
+    _test_import(
+        include_collection_keys=[],
+        omit_collection_keys=[
+            ops.GraphKeys.GLOBAL_VARIABLES, ops.GraphKeys.TRAINABLE_VARIABLES
+        ])
+
   def _testScopedExportWithQueue(self, test_dir, exported_filename):
     graph = ops.Graph()
     with graph.as_default():
-- 
GitLab


From 562136cf7fb887b5dba755319263230062d512e0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 06:16:09 -0800
Subject: [PATCH 0951/1563] [TF:XLA] Set metadata of all added HLO instructions
 when lowering computations. Change: 154952289

---
 .../compiler/xla/service/user_computation.cc  | 164 ++++++++----------
 .../xla/service/user_computation_test.cc      |   5 +
 2 files changed, 79 insertions(+), 90 deletions(-)

diff --git a/tensorflow/compiler/xla/service/user_computation.cc b/tensorflow/compiler/xla/service/user_computation.cc
index 34e8ee8aca..e9fcc9fa66 100644
--- a/tensorflow/compiler/xla/service/user_computation.cc
+++ b/tensorflow/compiler/xla/service/user_computation.cc
@@ -1928,6 +1928,12 @@ HloInstruction* ComputationLowerer::Visit(
 
   const OperationRequest& request =
       session_computation_.requests().at(handle.handle());
+  auto add_instruction = [&](std::unique_ptr<HloInstruction> instruction) {
+    HloInstruction* hlo_instruction =
+        hlo_builder_.AddInstruction(std::move(instruction));
+    hlo_instruction->set_metadata(request.request().metadata());
+    return hlo_instruction;
+  };
   HloInstruction* hlo_instruction;
   switch (request.request().op_case()) {
     case OpRequest::kRngRequest: {
@@ -1936,7 +1942,7 @@ HloInstruction* ComputationLowerer::Visit(
       for (const ComputationDataHandle& param : rng_request.parameter()) {
         parameters.push_back(Visit(param, visited));
       }
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateRng(
+      hlo_instruction = add_instruction(HloInstruction::CreateRng(
           request.output_shape(), rng_request.distribution(), parameters));
       break;
     }
@@ -1944,9 +1950,8 @@ HloInstruction* ComputationLowerer::Visit(
     case OpRequest::kConstantRequest: {
       const ConstantRequest& constant_request =
           request.request().constant_request();
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateConstant(
-              LiteralUtil::CloneToUnique(constant_request.literal())));
+      hlo_instruction = add_instruction(HloInstruction::CreateConstant(
+          LiteralUtil::CloneToUnique(constant_request.literal())));
       break;
     }
 
@@ -1955,17 +1960,15 @@ HloInstruction* ComputationLowerer::Visit(
           request.request().get_tuple_element_request();
       HloInstruction* operand =
           Visit(get_tuple_element_request.operand(), visited);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateGetTupleElement(
-              request.output_shape(), operand,
-              get_tuple_element_request.index()));
+      hlo_instruction = add_instruction(HloInstruction::CreateGetTupleElement(
+          request.output_shape(), operand, get_tuple_element_request.index()));
       break;
     }
 
     case OpRequest::kSliceRequest: {
       const SliceRequest& slice_request = request.request().slice_request();
       HloInstruction* operand = Visit(slice_request.operand(), visited);
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateSlice(
+      hlo_instruction = add_instruction(HloInstruction::CreateSlice(
           request.output_shape(), operand,
           AsInt64Slice(slice_request.start_indices()),
           AsInt64Slice(slice_request.limit_indices())));
@@ -1979,10 +1982,9 @@ HloInstruction* ComputationLowerer::Visit(
       HloInstruction* start_indices =
           Visit(dynamic_slice_request.start_indices(), visited);
 
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateDynamicSlice(
-              request.output_shape(), operand, start_indices,
-              AsInt64Slice(dynamic_slice_request.slice_sizes())));
+      hlo_instruction = add_instruction(HloInstruction::CreateDynamicSlice(
+          request.output_shape(), operand, start_indices,
+          AsInt64Slice(dynamic_slice_request.slice_sizes())));
       break;
     }
 
@@ -1996,7 +1998,7 @@ HloInstruction* ComputationLowerer::Visit(
       HloInstruction* start_indices =
           Visit(dynamic_update_slice_request.start_indices(), visited);
       hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateDynamicUpdateSlice(
+          add_instruction(HloInstruction::CreateDynamicUpdateSlice(
               request.output_shape(), operand, update, start_indices));
       break;
     }
@@ -2010,9 +2012,8 @@ HloInstruction* ComputationLowerer::Visit(
         HloInstruction* operand = Visit(handle, visited);
         operands.push_back(operand);
       }
-      hlo_instruction = hlo_builder_.AddInstruction(
-          HloInstruction::CreateConcatenate(request.output_shape(), operands,
-                                            concatenate_request.dimension()));
+      hlo_instruction = add_instruction(HloInstruction::CreateConcatenate(
+          request.output_shape(), operands, concatenate_request.dimension()));
       break;
     }
 
@@ -2021,10 +2022,9 @@ HloInstruction* ComputationLowerer::Visit(
           request.request().convolve_request();
       HloInstruction* lhs = Visit(convolve_request.lhs(), visited);
       HloInstruction* rhs = Visit(convolve_request.rhs(), visited);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateConvolve(
-              request.output_shape(), lhs, rhs, convolve_request.window(),
-              convolve_request.dimension_numbers()));
+      hlo_instruction = add_instruction(HloInstruction::CreateConvolve(
+          request.output_shape(), lhs, rhs, convolve_request.window(),
+          convolve_request.dimension_numbers()));
       break;
     }
 
@@ -2033,17 +2033,15 @@ HloInstruction* ComputationLowerer::Visit(
           request.request().cross_replica_sum_request();
       HloInstruction* operand =
           Visit(cross_replica_sum_request.operand(), visited);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateCrossReplicaSum(
-              request.output_shape(), operand));
+      hlo_instruction = add_instruction(HloInstruction::CreateCrossReplicaSum(
+          request.output_shape(), operand));
       break;
     }
 
     case OpRequest::kInfeedRequest: {
       const InfeedRequest& infeed_request = request.request().infeed_request();
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateInfeed(
-              request.output_shape(), infeed_request.config()));
+      hlo_instruction = add_instruction(HloInstruction::CreateInfeed(
+          request.output_shape(), infeed_request.config()));
       break;
     }
 
@@ -2051,9 +2049,8 @@ HloInstruction* ComputationLowerer::Visit(
       const OutfeedRequest& outfeed_request =
           request.request().outfeed_request();
       HloInstruction* operand = Visit(outfeed_request.operand(), visited);
-      hlo_instruction = hlo_builder_.AddInstruction(
-          HloInstruction::CreateOutfeed(outfeed_request.shape(), operand,
-                                        outfeed_request.outfeed_config()));
+      hlo_instruction = add_instruction(HloInstruction::CreateOutfeed(
+          outfeed_request.shape(), operand, outfeed_request.outfeed_config()));
       break;
     }
 
@@ -2069,7 +2066,7 @@ HloInstruction* ComputationLowerer::Visit(
           request.embedded_computation_versions(0);
       HloComputation* map_computation =
           ResolveComputation(map_request.to_apply(), map_version);
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateMap(
+      hlo_instruction = add_instruction(HloInstruction::CreateMap(
           request.output_shape(), operands, map_computation));
       break;
     }
@@ -2083,10 +2080,9 @@ HloInstruction* ComputationLowerer::Visit(
           request.embedded_computation_versions(0);
       HloComputation* reduce_computation =
           ResolveComputation(reduce_request.to_apply(), reduce_version);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateReduce(
-              request.output_shape(), operand, init_value,
-              AsInt64Slice(reduce_request.dimensions()), reduce_computation));
+      hlo_instruction = add_instruction(HloInstruction::CreateReduce(
+          request.output_shape(), operand, init_value,
+          AsInt64Slice(reduce_request.dimensions()), reduce_computation));
       break;
     }
 
@@ -2101,10 +2097,9 @@ HloInstruction* ComputationLowerer::Visit(
           request.embedded_computation_versions(0);
       HloComputation* reduce_window_computation = ResolveComputation(
           reduce_window_request.to_apply(), reduce_window_version);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateReduceWindow(
-              request.output_shape(), operand, init_value,
-              reduce_window_request.window(), reduce_window_computation));
+      hlo_instruction = add_instruction(HloInstruction::CreateReduceWindow(
+          request.output_shape(), operand, init_value,
+          reduce_window_request.window(), reduce_window_computation));
       break;
     }
 
@@ -2126,11 +2121,10 @@ HloInstruction* ComputationLowerer::Visit(
           select_and_scatter_request.select(), select_version);
       HloComputation* scatter_computation = ResolveComputation(
           select_and_scatter_request.scatter(), scatter_version);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateSelectAndScatter(
-              request.output_shape(), operand, select_computation,
-              select_and_scatter_request.window(), source, init_value,
-              scatter_computation));
+      hlo_instruction = add_instruction(HloInstruction::CreateSelectAndScatter(
+          request.output_shape(), operand, select_computation,
+          select_and_scatter_request.window(), source, init_value,
+          scatter_computation));
       break;
     }
 
@@ -2151,9 +2145,8 @@ HloInstruction* ComputationLowerer::Visit(
                                        ShapeUtil::Rank(request.output_shape()) -
                                        ShapeUtil::Rank(operand->shape()));
       }
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateBroadcast(
-              request.output_shape(), operand, broadcast_dimensions));
+      hlo_instruction = add_instruction(HloInstruction::CreateBroadcast(
+          request.output_shape(), operand, broadcast_dimensions));
       break;
     }
 
@@ -2165,14 +2158,13 @@ HloInstruction* ComputationLowerer::Visit(
       if (IsIdentityPermutation(AsInt64Slice(reshape_request.dimensions()))) {
         transposed = operand;
       } else {
-        transposed =
-            hlo_builder_.AddInstruction(HloInstruction::CreateTranspose(
-                ShapeUtil::PermuteDimensions(InversePermutation(AsInt64Slice(
-                                                 reshape_request.dimensions())),
-                                             operand->shape()),
-                operand, AsInt64Slice(reshape_request.dimensions())));
+        transposed = add_instruction(HloInstruction::CreateTranspose(
+            ShapeUtil::PermuteDimensions(
+                InversePermutation(AsInt64Slice(reshape_request.dimensions())),
+                operand->shape()),
+            operand, AsInt64Slice(reshape_request.dimensions())));
       }
-      hlo_instruction = hlo_builder_.AddInstruction(
+      hlo_instruction = add_instruction(
           HloInstruction::CreateReshape(request.output_shape(), transposed));
       break;
     }
@@ -2181,12 +2173,11 @@ HloInstruction* ComputationLowerer::Visit(
       const TransposeRequest& transpose_request =
           request.request().transpose_request();
       HloInstruction* operand = Visit(transpose_request.operand(), visited);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateTranspose(
-              ShapeUtil::PermuteDimensions(InversePermutation(AsInt64Slice(
-                                               transpose_request.dimensions())),
-                                           operand->shape()),
-              operand, AsInt64Slice(transpose_request.dimensions())));
+      hlo_instruction = add_instruction(HloInstruction::CreateTranspose(
+          ShapeUtil::PermuteDimensions(
+              InversePermutation(AsInt64Slice(transpose_request.dimensions())),
+              operand->shape()),
+          operand, AsInt64Slice(transpose_request.dimensions())));
       break;
     }
 
@@ -2194,10 +2185,9 @@ HloInstruction* ComputationLowerer::Visit(
       const ReverseRequest& reverse_request =
           request.request().reverse_request();
       HloInstruction* operand = Visit(reverse_request.operand(), visited);
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateReverse(
-              request.output_shape(), operand,
-              AsInt64Slice(reverse_request.dimensions())));
+      hlo_instruction = add_instruction(HloInstruction::CreateReverse(
+          request.output_shape(), operand,
+          AsInt64Slice(reverse_request.dimensions())));
       break;
     }
 
@@ -2206,7 +2196,7 @@ HloInstruction* ComputationLowerer::Visit(
       HloInstruction* operand = Visit(pad_request.operand(), visited);
       HloInstruction* padding_value =
           Visit(pad_request.padding_value(), visited);
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreatePad(
+      hlo_instruction = add_instruction(HloInstruction::CreatePad(
           request.output_shape(), operand, padding_value,
           pad_request.padding_config()));
       break;
@@ -2214,7 +2204,7 @@ HloInstruction* ComputationLowerer::Visit(
 
     case OpRequest::kRecvRequest: {
       const RecvRequest& recv_request = request.request().recv_request();
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateRecv(
+      hlo_instruction = add_instruction(HloInstruction::CreateRecv(
           request.output_shape(), recv_request.channel_handle().handle()));
       break;
     }
@@ -2222,10 +2212,9 @@ HloInstruction* ComputationLowerer::Visit(
     case OpRequest::kParameterRequest: {
       const ParameterRequest& parameter_request =
           request.request().parameter_request();
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateParameter(
-              parameter_request.parameter(), request.output_shape(),
-              parameter_request.name()));
+      hlo_instruction = add_instruction(HloInstruction::CreateParameter(
+          parameter_request.parameter(), request.output_shape(),
+          parameter_request.name()));
       break;
     }
 
@@ -2233,7 +2222,7 @@ HloInstruction* ComputationLowerer::Visit(
       const ConvertRequest& convert_request =
           request.request().convert_request();
       HloInstruction* operand = Visit(convert_request.operand(), visited);
-      hlo_instruction = hlo_builder_.AddInstruction(
+      hlo_instruction = add_instruction(
           HloInstruction::CreateConvert(request.output_shape(), operand));
       break;
     }
@@ -2250,7 +2239,7 @@ HloInstruction* ComputationLowerer::Visit(
       HloComputation* body =
           ResolveComputation(while_request.body(), body_version);
       HloInstruction* init = Visit(while_request.init(), visited);
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateWhile(
+      hlo_instruction = add_instruction(HloInstruction::CreateWhile(
           request.output_shape(), condition, body, init));
       break;
     }
@@ -2262,9 +2251,8 @@ HloInstruction* ComputationLowerer::Visit(
       HloInstruction* rhs = Visit(ternary_op_request.rhs(), visited);
       HloInstruction* ehs = Visit(ternary_op_request.ehs(), visited);
       auto hlo_opcode = TernaryOperationToHloOpcode(ternary_op_request.triop());
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateTernary(
-              request.output_shape(), hlo_opcode, lhs, rhs, ehs));
+      hlo_instruction = add_instruction(HloInstruction::CreateTernary(
+          request.output_shape(), hlo_opcode, lhs, rhs, ehs));
       break;
     }
 
@@ -2279,9 +2267,8 @@ HloInstruction* ComputationLowerer::Visit(
       }
       auto hlo_opcode =
           VariadicOperationToHloOpcode(variadic_op_request.varop());
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateVariadic(
-              request.output_shape(), hlo_opcode, operands));
+      hlo_instruction = add_instruction(HloInstruction::CreateVariadic(
+          request.output_shape(), hlo_opcode, operands));
       break;
     }
 
@@ -2296,7 +2283,7 @@ HloInstruction* ComputationLowerer::Visit(
           request.embedded_computation_versions(0);
       HloComputation* call_computation =
           ResolveComputation(call_request.to_apply(), call_version);
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateCall(
+      hlo_instruction = add_instruction(HloInstruction::CreateCall(
           request.output_shape(), operands, call_computation));
       break;
     }
@@ -2308,9 +2295,8 @@ HloInstruction* ComputationLowerer::Visit(
       for (const ComputationDataHandle& operand : cc_request.operands()) {
         operands.push_back(Visit(operand, visited));
       }
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateCustomCall(
-              cc_request.shape(), operands, cc_request.call_target_name()));
+      hlo_instruction = add_instruction(HloInstruction::CreateCustomCall(
+          cc_request.shape(), operands, cc_request.call_target_name()));
       break;
     }
 
@@ -2319,7 +2305,7 @@ HloInstruction* ComputationLowerer::Visit(
           request.request().unary_op_request();
       HloInstruction* operand = Visit(unary_op_request.operand(), visited);
       auto hlo_opcode = UnaryOperationToHloOpcode(unary_op_request.unop());
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateUnary(
+      hlo_instruction = add_instruction(HloInstruction::CreateUnary(
           request.output_shape(), hlo_opcode, operand));
       break;
     }
@@ -2347,23 +2333,22 @@ HloInstruction* ComputationLowerer::Visit(
         // identical to the HLO broadcast semantics so the broadcast_dimensions
         // field can just be passed to the instruction builder.
         HloInstruction* broadcasted_operand =
-            hlo_builder_.AddInstruction(HloInstruction::CreateBroadcast(
+            add_instruction(HloInstruction::CreateBroadcast(
                 broadcast_shape, operand_to_broadcast,
                 AsInt64Slice(binary_op_request.broadcast_dimensions())));
 
         lhs = (lhs == operand_to_broadcast) ? broadcasted_operand : lhs;
         rhs = (rhs == operand_to_broadcast) ? broadcasted_operand : rhs;
       }
-      hlo_instruction =
-          hlo_builder_.AddInstruction(HloInstruction::CreateBinary(
-              request.output_shape(), hlo_opcode, lhs, rhs));
+      hlo_instruction = add_instruction(HloInstruction::CreateBinary(
+          request.output_shape(), hlo_opcode, lhs, rhs));
       break;
     }
 
     case OpRequest::kTraceRequest: {
       const TraceRequest& trace_request = request.request().trace_request();
       HloInstruction* operand = Visit(trace_request.operand(), visited);
-      hlo_instruction = hlo_builder_.AddInstruction(
+      hlo_instruction = add_instruction(
           HloInstruction::CreateTrace(trace_request.tag(), operand));
       operand->set_tracing(hlo_instruction);
       break;
@@ -2372,7 +2357,7 @@ HloInstruction* ComputationLowerer::Visit(
     case OpRequest::kSendRequest: {
       const SendRequest& send_request = request.request().send_request();
       HloInstruction* operand = Visit(send_request.operand(), visited);
-      hlo_instruction = hlo_builder_.AddInstruction(HloInstruction::CreateSend(
+      hlo_instruction = add_instruction(HloInstruction::CreateSend(
           operand, send_request.channel_handle().handle()));
       break;
     }
@@ -2383,7 +2368,6 @@ HloInstruction* ComputationLowerer::Visit(
     default:
       LOG(FATAL) << "Unexpected request type: " << request.request().op_case();
   }
-  hlo_instruction->set_metadata(request.request().metadata());
   (*visited)[handle.handle()] = hlo_instruction;
   return hlo_instruction;
 }
diff --git a/tensorflow/compiler/xla/service/user_computation_test.cc b/tensorflow/compiler/xla/service/user_computation_test.cc
index 032b5cfac6..cf04cfde50 100644
--- a/tensorflow/compiler/xla/service/user_computation_test.cc
+++ b/tensorflow/compiler/xla/service/user_computation_test.cc
@@ -59,6 +59,9 @@ TEST_F(UserComputationTest, SimpleComputation) {
   param_request.set_name("param0");
   TF_ASSIGN_OR_ASSERT_OK(ComputationDataHandle param_handle,
                          computation.AddParameterInstruction(param_request));
+  OpMetadata metadata;
+  metadata.set_op_name("meta");
+  TF_ASSERT_OK(computation.SetOpMetadata(param_handle, metadata));
 
   OutfeedRequest outfeed_request;
   *outfeed_request.mutable_operand() = constant_handle;
@@ -135,6 +138,8 @@ TEST_F(UserComputationTest, SimpleComputation) {
     // The root of the instruction should be the parameter instruction (not the
     // outfeed).
     EXPECT_THAT(hlo_computation->root_instruction(), op::Parameter());
+    EXPECT_EQ(hlo_computation->root_instruction()->metadata().op_name(),
+              "meta");
   }
 }
 
-- 
GitLab


From 27aaf4a653aa36e1c742fd859426f046ff6cf7af Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 3 May 2017 07:52:23 -0800
Subject: [PATCH 0952/1563] Made sure that both queue shapes and types are
 updated in one single pass instead of two. Change: 154960772

---
 tensorflow/core/grappler/costs/graph_properties.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 75f2f16c5b..035483ec17 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -84,7 +84,7 @@ Status GraphProperties::InferStatically() {
           }
         }
       }
-      if (qctx->set_output_handle_dtype(0, queue_type) ||
+      if (qctx->set_output_handle_dtype(0, queue_type) |
           qctx->MergeOutputHandleShape(0, queue_shp)) {
         new_shapes.push(qnode);
       }
-- 
GitLab


From b93dd62e8ae9faed909c677781edc278632704f0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 08:20:17 -0800
Subject: [PATCH 0953/1563] Move bucketized_column to core. Change: 154963963

---
 .../python/feature_column/feature_column.py   | 128 +++++++-
 .../feature_column/feature_column_test.py     | 280 +++++++++++++++++-
 2 files changed, 401 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 7d8a42080d..e408506cb0 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -200,13 +200,13 @@ def make_linear_model(features,
     builder = _LazyBuilder(features)
     for column in sorted(feature_columns, key=lambda x: x.name):
       with variable_scope.variable_scope(None, default_name=column.name):
-        if isinstance(column, _DenseColumn):
-          weigthed_sums.append(_create_dense_column_weighted_sum(
-              column, builder, units, weight_collections, trainable))
-        else:
+        if isinstance(column, _CategoricalColumn):
           weigthed_sums.append(_create_categorical_column_weighted_sum(
               column, builder, units, sparse_combiner, weight_collections,
               trainable))
+        else:
+          weigthed_sums.append(_create_dense_column_weighted_sum(
+              column, builder, units, weight_collections, trainable))
     predictions_no_bias = math_ops.add_n(
         weigthed_sums, name='weighted_sum_no_bias')
     bias = variable_scope.get_variable(
@@ -237,7 +237,7 @@ def numeric_column(key,
   # or
   bucketized_price = bucketized_column(price, boundaries=[...])
   all_feature_columns = [bucketized_price, ...]
-  linear_prediction, _, _ = make_linear_model(features, all_feature_columns)
+  linear_prediction = make_linear_model(features, all_feature_columns)
 
   ```
 
@@ -291,6 +291,55 @@ def numeric_column(key,
       normalizer_fn=normalizer_fn)
 
 
+def bucketized_column(source_column, boundaries):
+  """Represents discretized dense input.
+
+  Buckets include the left boundary, and exclude the right boundary. Namely,
+  `boundaries=[0., 1., 2.]` generates buckets `(-inf, 0.)`, `[0., 1.)`,
+  `[1., 2.)`, and `[2., +inf)`.
+
+  An example:
+  ```python
+  price = numeric_column('price')
+  bucketized_price = bucketized_column(price, boundaries=[...])
+  all_feature_columns = [bucketized_price, ...]
+  linear_prediction = make_linear_model(features, all_feature_columns)
+
+  # or
+  all_feature_columns = [bucketized_price, ...]
+  dense_tensor = make_input_layer(features, all_feature_columns)
+  ```
+
+  Args:
+    source_column: A one-dimensional dense column which is generated with
+      `numeric_column`.
+    boundaries: A sorted list or tuple of floats specifying the boundaries.
+
+  Returns:
+    A `_BucketizedColumn`.
+
+  Raises:
+    ValueError: If `source_column` is not a numeric column, or if it is not
+      one-dimensional.
+    ValueError: If `boundaries` is not a sorted list or tuple.
+  """
+  if not isinstance(source_column, _NumericColumn):
+    raise ValueError(
+        'source_column must be a column generated with numeric_column(). '
+        'Given: {}'.format(source_column))
+  if len(source_column.shape) > 1:
+    raise ValueError(
+        'source_column must be one-dimensional column. '
+        'Given: {}'.format(source_column))
+  if (not boundaries or
+      not (isinstance(boundaries, list) or isinstance(boundaries, tuple))):
+    raise ValueError('boundaries must be a sorted list.')
+  for i in range(len(boundaries) - 1):
+    if boundaries[i] >= boundaries[i + 1]:
+      raise ValueError('boundaries must be a sorted list.')
+  return _BucketizedColumn(source_column, tuple(boundaries))
+
+
 def categorical_column_with_hash_bucket(key,
                                         hash_bucket_size,
                                         dtype=dtypes.string):
@@ -303,8 +352,8 @@ def categorical_column_with_hash_bucket(key,
   An example:
   ```python
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
-  linear_prediction, _, _ = make_linear_model(features, all_feature_columns)
   all_feature_columns = [keywords, ...]
+  linear_prediction = make_linear_model(features, all_feature_columns)
 
   # or
   keywords_embedded = embedding_column(keywords, 16)
@@ -668,6 +717,73 @@ class _NumericColumn(_DenseColumn,
     return inputs.get(self)
 
 
+class _BucketizedColumn(_DenseColumn, _CategoricalColumn,
+                        collections.namedtuple('_BucketizedColumn', [
+                            'source_column', 'boundaries'])):
+  """See `bucketized_column`."""
+
+  @property
+  def name(self):
+    return '{}_bucketized'.format(self.source_column.name)
+
+  @property
+  def _parse_example_config(self):
+    return self.source_column._parse_example_config  # pylint: disable=protected-access
+
+  def _transform_feature(self, inputs):
+    source_tensor = inputs.get(self.source_column)
+    return math_ops._bucketize(  # pylint: disable=protected-access
+        source_tensor,
+        boundaries=self.boundaries)
+
+  @property
+  def _variable_shape(self):
+    return tuple(self.source_column.shape) + (len(self.boundaries) + 1,)
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    del weight_collections
+    del trainable
+    input_tensor = inputs.get(self)
+    return array_ops.one_hot(
+        indices=math_ops.to_int64(input_tensor),
+        depth=len(self.boundaries) + 1,
+        on_value=1.,
+        off_value=0.)
+
+  @property
+  def _num_buckets(self):
+    # By construction, source_column is always one-dimensional.
+    return (len(self.boundaries) + 1) * self.source_column.shape[0]
+
+  def _get_sparse_tensors(self, inputs, weight_collections=None,
+                          trainable=None):
+    input_tensor = inputs.get(self)
+    batch_size = array_ops.shape(input_tensor)[0]
+    # By construction, source_column is always one-dimensional.
+    source_dimension = self.source_column.shape[0]
+
+    i1 = array_ops.reshape(
+        array_ops.tile(
+            array_ops.expand_dims(math_ops.range(0, batch_size), 1),
+            [1, source_dimension]),
+        (-1,))
+    i2 = array_ops.tile(math_ops.range(0, source_dimension), [batch_size])
+    # Flatten the bucket indices and unique them across dimensions
+    # E.g. 2nd dimension indices will range from k to 2*k-1 with k buckets
+    bucket_indices = (
+        array_ops.reshape(input_tensor, (-1,)) +
+        (len(self.boundaries) + 1) * i2)
+
+    indices = math_ops.to_int64(array_ops.transpose(array_ops.stack((i1, i2))))
+    dense_shape = math_ops.to_int64(array_ops.stack(
+        [batch_size, source_dimension]))
+    sparse_tensor = sparse_tensor_lib.SparseTensor(
+        indices=indices,
+        values=bucket_indices,
+        dense_shape=dense_shape)
+    return _CategoricalColumn.IdWeightPair(sparse_tensor, None)
+
+
 def _create_tuple(shape, value):
   """Returns a tuple with given shape and filled with value."""
   if shape:
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index eefe3b0297..32d6a4e8f0 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -151,7 +151,7 @@ class LazyColumnTest(test.TestCase):
       builder.get(NotAFeatureColumn())
 
 
-class NumericalColumnTest(test.TestCase):
+class NumericColumnTest(test.TestCase):
 
   def test_defaults(self):
     a = fc.numeric_column('aaa')
@@ -327,6 +327,231 @@ class NumericalColumnTest(test.TestCase):
         self.assertAllClose([[10.], [50.]], predictions.eval())
 
 
+class BucketizedColumnTest(test.TestCase):
+
+  def test_invalid_source_column_type(self):
+    a = fc.categorical_column_with_hash_bucket('aaa', hash_bucket_size=10)
+    with self.assertRaisesRegexp(
+        ValueError,
+        'source_column must be a column generated with numeric_column'):
+      fc.bucketized_column(a, boundaries=[0, 1])
+
+  def test_invalid_source_column_shape(self):
+    a = fc.numeric_column('aaa', shape=[2, 3])
+    with self.assertRaisesRegexp(
+        ValueError, 'source_column must be one-dimensional column'):
+      fc.bucketized_column(a, boundaries=[0, 1])
+
+  def test_invalid_boundaries(self):
+    a = fc.numeric_column('aaa')
+    with self.assertRaisesRegexp(
+        ValueError, 'boundaries must be a sorted list'):
+      fc.bucketized_column(a, boundaries=None)
+    with self.assertRaisesRegexp(
+        ValueError, 'boundaries must be a sorted list'):
+      fc.bucketized_column(a, boundaries=1.)
+    with self.assertRaisesRegexp(
+        ValueError, 'boundaries must be a sorted list'):
+      fc.bucketized_column(a, boundaries=[1, 0])
+    with self.assertRaisesRegexp(
+        ValueError, 'boundaries must be a sorted list'):
+      fc.bucketized_column(a, boundaries=[1, 1])
+
+  def test_name(self):
+    a = fc.numeric_column('aaa', dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    self.assertEqual('aaa_bucketized', b.name)
+
+  def test_parse_config(self):
+    a = fc.numeric_column('aaa', shape=[2], dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    self.assertEqual({
+        'aaa': parsing_ops.FixedLenFeature((2,), dtype=dtypes.int32)
+    }, b._parse_example_config)
+
+  def test_variable_shape(self):
+    a = fc.numeric_column('aaa', shape=[2], dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    # Column 'aaa` has shape [2] times three buckets -> variable_shape=[2, 3].
+    self.assertAllEqual((2, 3), b._variable_shape)
+
+  def test_num_buckets(self):
+    a = fc.numeric_column('aaa', shape=[2], dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    # Column 'aaa` has shape [2] times three buckets -> num_buckets=6.
+    self.assertEqual(6, b._num_buckets)
+
+  def test_parse_example(self):
+    price = fc.numeric_column('price', shape=[2])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 50])
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'price':
+                feature_pb2.Feature(float_list=feature_pb2.FloatList(
+                    value=[20., 110.]))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=bucketized_price._parse_example_config)
+    self.assertIn('price', features)
+    with self.test_session():
+      self.assertAllEqual([[20., 110.]], features['price'].eval())
+
+  def test_transform_feature(self):
+    price = fc.numeric_column('price', shape=[2])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
+    with ops.Graph().as_default():
+      builder = fc._LazyBuilder({
+          'price': constant_op.constant([[-1., 1.], [5., 6.]])
+      })
+      transformed_tensor = builder.get(bucketized_price)
+      with _initialized_session():
+        self.assertAllEqual([[0, 1], [3, 4]], transformed_tensor.eval())
+
+  def test_get_dense_tensor_one_input_value(self):
+    """Tests _get_dense_tensor() for input with shape=[1]."""
+    price = fc.numeric_column('price', shape=[1])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
+    with ops.Graph().as_default():
+      builder = fc._LazyBuilder({
+          'price': constant_op.constant([[-1.], [1.], [5.], [6.]])
+      })
+      with _initialized_session():
+        bucketized_price_tensor = bucketized_price._get_dense_tensor(builder)
+        self.assertAllClose(
+            # One-hot tensor.
+            [[[1., 0., 0., 0., 0.]],
+             [[0., 1., 0., 0., 0.]],
+             [[0., 0., 0., 1., 0.]],
+             [[0., 0., 0., 0., 1.]]],
+            bucketized_price_tensor.eval())
+
+  def test_get_dense_tensor_two_input_values(self):
+    """Tests _get_dense_tensor() for input with shape=[2]."""
+    price = fc.numeric_column('price', shape=[2])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
+    with ops.Graph().as_default():
+      builder = fc._LazyBuilder({
+          'price': constant_op.constant([[-1., 1.], [5., 6.]])
+      })
+      with _initialized_session():
+        bucketized_price_tensor = bucketized_price._get_dense_tensor(builder)
+        self.assertAllClose(
+            # One-hot tensor.
+            [[[1., 0., 0., 0., 0.], [0., 1., 0., 0., 0.]],
+             [[0., 0., 0., 1., 0.], [0., 0., 0., 0., 1.]]],
+            bucketized_price_tensor.eval())
+
+  def test_get_sparse_tensors_one_input_value(self):
+    """Tests _get_sparse_tensors() for input with shape=[1]."""
+    price = fc.numeric_column('price', shape=[1])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
+    with ops.Graph().as_default():
+      builder = fc._LazyBuilder({
+          'price': constant_op.constant([[-1.], [1.], [5.], [6.]])
+      })
+      with _initialized_session() as sess:
+        id_weight_pair = bucketized_price._get_sparse_tensors(builder)
+        self.assertIsNone(id_weight_pair.weight_tensor)
+        id_tensor_value = sess.run(id_weight_pair.id_tensor)
+        self.assertAllEqual(
+            [[0, 0], [1, 0], [2, 0], [3, 0]], id_tensor_value.indices)
+        self.assertAllEqual([0, 1, 3, 4], id_tensor_value.values)
+        self.assertAllEqual([4, 1], id_tensor_value.dense_shape)
+
+  def test_get_sparse_tensors_two_input_values(self):
+    """Tests _get_sparse_tensors() for input with shape=[2]."""
+    price = fc.numeric_column('price', shape=[2])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
+    with ops.Graph().as_default():
+      builder = fc._LazyBuilder({
+          'price': constant_op.constant([[-1., 1.], [5., 6.]])
+      })
+      with _initialized_session() as sess:
+        id_weight_pair = bucketized_price._get_sparse_tensors(builder)
+        self.assertIsNone(id_weight_pair.weight_tensor)
+        id_tensor_value = sess.run(id_weight_pair.id_tensor)
+        self.assertAllEqual(
+            [[0, 0], [0, 1], [1, 0], [1, 1]], id_tensor_value.indices)
+        # Values 0-4 correspond to the first column of the input price.
+        # Values 5-9 correspond to the second column of the input price.
+        self.assertAllEqual([0, 6, 3, 9], id_tensor_value.values)
+        self.assertAllEqual([2, 2], id_tensor_value.dense_shape)
+
+  def test_sparse_tensor_input_not_supported(self):
+    price = fc.numeric_column('price')
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 1])
+    builder = fc._LazyBuilder({
+        'price':
+            sparse_tensor.SparseTensor(
+                indices=[[0, 0]], values=[0.3], dense_shape=[1, 1])
+    })
+    with self.assertRaisesRegexp(ValueError, 'must be a Tensor'):
+      bucketized_price._transform_feature(builder)
+
+  def test_deep_copy(self):
+    a = fc.numeric_column('aaa', shape=[2])
+    a_bucketized = fc.bucketized_column(a, boundaries=[0, 1])
+    a_bucketized_copy = copy.deepcopy(a_bucketized)
+    self.assertEqual(a_bucketized_copy.name, 'aaa_bucketized')
+    self.assertAllEqual(a_bucketized_copy._variable_shape, (2, 3))
+    self.assertEqual(a_bucketized_copy.boundaries, (0, 1))
+
+  def test_make_linear_model_one_input_value(self):
+    """Tests make_linear_model() for input with shape=[1]."""
+    price = fc.numeric_column('price', shape=[1])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[-1.], [1.], [5.], [6.]])}
+      predictions = fc.make_linear_model(features, [bucketized_price])
+      bias = get_linear_model_bias()
+      bucketized_price_var = get_linear_model_column_var(bucketized_price)
+      with _initialized_session() as sess:
+        self.assertAllClose([0.], bias.eval())
+        # One weight variable per bucket, all initialized to zero.
+        self.assertAllClose(
+            [[0.], [0.], [0.], [0.], [0.]], bucketized_price_var.eval())
+        self.assertAllClose([[0.], [0.], [0.], [0.]], predictions.eval())
+        sess.run(bucketized_price_var.assign(
+            [[10.], [20.], [30.], [40.], [50.]]))
+        # price -1. is in the 0th bucket, whose weight is 10.
+        # price 1. is in the 1st bucket, whose weight is 20.
+        # price 5. is in the 3rd bucket, whose weight is 40.
+        # price 6. is in the 4th bucket, whose weight is 50.
+        self.assertAllClose([[10.], [20.], [40.], [50.]], predictions.eval())
+        sess.run(bias.assign([1.]))
+        self.assertAllClose([[11.], [21.], [41.], [51.]], predictions.eval())
+
+  def test_make_linear_model_two_input_values(self):
+    """Tests make_linear_model() for input with shape=[2]."""
+    price = fc.numeric_column('price', shape=[2])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
+    with ops.Graph().as_default():
+      features = {'price': constant_op.constant([[-1., 1.], [5., 6.]])}
+      predictions = fc.make_linear_model(features, [bucketized_price])
+      bias = get_linear_model_bias()
+      bucketized_price_var = get_linear_model_column_var(bucketized_price)
+      with _initialized_session() as sess:
+        self.assertAllClose([0.], bias.eval())
+        # One weight per bucket per input column, all initialized to zero.
+        self.assertAllClose(
+            [[0.], [0.], [0.], [0.], [0.], [0.], [0.], [0.], [0.], [0.]],
+            bucketized_price_var.eval())
+        self.assertAllClose([[0.], [0.]], predictions.eval())
+        sess.run(bucketized_price_var.assign(
+            [[10.], [20.], [30.], [40.], [50.],
+             [60.], [70.], [80.], [90.], [100.]]))
+        # 1st example:
+        #   price -1. is in the 0th bucket, whose weight is 10.
+        #   price 1. is in the 6th bucket, whose weight is 70.
+        # 2nd example:
+        #   price 5. is in the 3rd bucket, whose weight is 40.
+        #   price 6. is in the 9th bucket, whose weight is 100.
+        self.assertAllClose([[80.], [140.]], predictions.eval())
+        sess.run(bias.assign([1.]))
+        self.assertAllClose([[81.], [141.]], predictions.eval())
+
+
 class SparseColumnHashedTest(test.TestCase):
 
   def test_defaults(self):
@@ -567,6 +792,59 @@ class MakeLinearModelTest(test.TestCase):
         sess.run(price_var.assign([[10.]]))
         self.assertAllClose([[1015.], [10065.]], predictions.eval())
 
+  def test_dense_and_sparse_column(self):
+    """When the column is both dense and sparse, uses sparse tensors."""
+
+    class _DenseAndSparseColumn(fc._DenseColumn, fc._CategoricalColumn):
+
+      @property
+      def name(self):
+        return 'dense_and_sparse_column'
+
+      @property
+      def _parse_example_config(self):
+        return {self.name: parsing_ops.VarLenFeature(self.dtype)}
+
+      def _transform_feature(self, inputs):
+        return inputs.get(self.name)
+
+      @property
+      def _variable_shape(self):
+        raise ValueError('Should not use this method.')
+
+      def _get_dense_tensor(self, inputs, weight_collections=None,
+                            trainable=None):
+        raise ValueError('Should not use this method.')
+
+      @property
+      def _num_buckets(self):
+        return 4
+
+      def _get_sparse_tensors(self, inputs, weight_collections=None,
+                              trainable=None):
+        sp_tensor = sparse_tensor.SparseTensor(
+            indices=[[0, 0], [1, 0], [1, 1]],
+            values=[2, 0, 3],
+            dense_shape=[2, 2])
+        return fc._CategoricalColumn.IdWeightPair(sp_tensor, None)
+
+    dense_and_sparse_column = _DenseAndSparseColumn()
+    with ops.Graph().as_default():
+      sp_tensor = sparse_tensor.SparseTensor(
+          values=['omar', 'stringer', 'marlo'],
+          indices=[[0, 0], [1, 0], [1, 1]],
+          dense_shape=[2, 2])
+      features = {dense_and_sparse_column.name: sp_tensor}
+      predictions = fc.make_linear_model(features, [dense_and_sparse_column])
+      bias = get_linear_model_bias()
+      dense_and_sparse_column_var = get_linear_model_column_var(
+          dense_and_sparse_column)
+      with _initialized_session() as sess:
+        sess.run(dense_and_sparse_column_var.assign(
+            [[10.], [100.], [1000.], [10000.]]))
+        sess.run(bias.assign([5.]))
+        self.assertAllClose([[1005.], [10015.]], predictions.eval())
+
   def test_dense_multi_output(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
-- 
GitLab


From 3d3e30894d15d54dd1e474e019d045f65a4c1f91 Mon Sep 17 00:00:00 2001
From: Junwei Pan <pandevirus@gmail.com>
Date: Wed, 3 May 2017 09:45:23 -0700
Subject: [PATCH 0954/1563] Update Link (#9611)

---
 tensorflow/python/ops/logging_ops.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/ops/logging_ops.py b/tensorflow/python/ops/logging_ops.py
index dbb13e0c8f..08e3f83a0b 100644
--- a/tensorflow/python/ops/logging_ops.py
+++ b/tensorflow/python/ops/logging_ops.py
@@ -86,7 +86,7 @@ def histogram_summary(tag, values, collections=None, name=None):
   This ops is deprecated. Please switch to tf.summary.histogram.
 
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The generated
   [`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
@@ -190,7 +190,7 @@ def audio_summary(tag,
 
   This op is deprecated. Please switch to tf.summary.audio.
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The summary has up to `max_outputs` summary values containing audio. The
   audio is built from `tensor` which must be 3-D with shape `[batch_size,
@@ -326,7 +326,7 @@ def scalar_summary(tags, values, collections=None, name=None):
 
   This ops is deprecated. Please switch to tf.summary.scalar.
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The input `tags` and `values` must have the same shape.  The generated
   summary has a summary value for each tag-value pair in `tags` and `values`.
-- 
GitLab


From a1f5abe8e1855d1d5a18870a5d3129f3c2040f15 Mon Sep 17 00:00:00 2001
From: weipingpku <630404796@qq.com>
Date: Thu, 4 May 2017 00:48:21 +0800
Subject: [PATCH 0955/1563] Fix typo in LINE#500 (#9626)

cell_input_fn -> probability_fn
---
 tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 9fc548aabe..a0f1775257 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -497,7 +497,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     if probability_fn is None:
       probability_fn = nn_ops.softmax
     else:
-      if not callable(cell_input_fn):
+      if not callable(probability_fn):
         raise TypeError(
             "probability_fn must be callable, saw type: %s"
             % type(probability_fn).__name__)
-- 
GitLab


From 39200b037b49f9d75b6bcd5ac25c5497e1bdcfd6 Mon Sep 17 00:00:00 2001
From: Junwei Pan <pandevirus@gmail.com>
Date: Wed, 3 May 2017 09:55:06 -0700
Subject: [PATCH 0956/1563] Make link clickable (#9631)

* Make link clickable

* wrap to 80 (not sure if this works)

* Undo
---
 tensorflow/python/ops/ctc_ops.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/ops/ctc_ops.py b/tensorflow/python/ops/ctc_ops.py
index bd23a66e0c..4cfe991784 100644
--- a/tensorflow/python/ops/ctc_ops.py
+++ b/tensorflow/python/ops/ctc_ops.py
@@ -35,11 +35,9 @@ def ctc_loss(labels, inputs, sequence_length,
 
   This op implements the CTC loss as presented in the article:
 
-  A. Graves, S. Fernandez, F. Gomez, J. Schmidhuber.
+  [A. Graves, S. Fernandez, F. Gomez, J. Schmidhuber.
   Connectionist Temporal Classification: Labelling Unsegmented Sequence Data
-  with Recurrent Neural Networks. ICML 2006, Pittsburgh, USA, pp. 369-376.
-
-  http://www.cs.toronto.edu/~graves/icml_2006.pdf
+  with Recurrent Neural Networks. ICML 2006, Pittsburgh, USA, pp. 369-376.](http://www.cs.toronto.edu/~graves/icml_2006.pdf)
 
   Input requirements:
 
-- 
GitLab


From 1414cc83d99336e88560b76c1615b7065c1e6b2c Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <sjhshy@gmail.com>
Date: Thu, 4 May 2017 01:56:41 +0900
Subject: [PATCH 0957/1563] Add 8 comments for event_multiplexer tests. (#9629)

* Add 8 comments for event_multiplexer tests.

* small fixes
---
 .../event_processing/event_multiplexer_test.py    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
index ded1856d7e..a97f39e87f 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
@@ -124,16 +124,19 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.stubs.CleanUp()
 
   def testEmptyLoader(self):
+    """Tests empty EventMultiplexer creation."""
     x = event_multiplexer.EventMultiplexer()
     self.assertEqual(x.Runs(), {})
 
   def testRunNamesRespected(self):
+    """Tests two EventAccumulators inserted/accessed in EventMultiplexer."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     self.assertItemsEqual(sorted(x.Runs().keys()), ['run1', 'run2'])
     self.assertEqual(x._GetAccumulator('run1')._path, 'path1')
     self.assertEqual(x._GetAccumulator('run2')._path, 'path2')
 
   def testReload(self):
+    """EventAccumulators should Reload after EventMultiplexer call it."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     self.assertFalse(x._GetAccumulator('run1').reload_called)
     self.assertFalse(x._GetAccumulator('run2').reload_called)
@@ -142,6 +145,7 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertTrue(x._GetAccumulator('run2').reload_called)
 
   def testScalars(self):
+    """Tests Scalars function returns suitable values."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
 
     run1_actual = x.Scalars('run1', 'sv1')
@@ -150,6 +154,7 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertEqual(run1_expected, run1_actual)
 
   def testHealthPills(self):
+    """Tests HealthPills() returns events associated with run1/Add."""
     self.stubs.Set(event_accumulator, 'EventAccumulator',
                    functools.partial(
                        _GetFakeAccumulator,
@@ -172,11 +177,13 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertItemsEqual(['Add'], x.GetOpsWithHealthPills('run1'))
 
   def testExceptions(self):
+    """KeyError should be raised when accessing non-existing keys."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     with self.assertRaises(KeyError):
       x.Scalars('sv1', 'xxx')
 
   def testInitialization(self):
+    """Tests EventMultiplexer is created properly with its params."""
     x = event_multiplexer.EventMultiplexer()
     self.assertEqual(x.Runs(), {})
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
@@ -185,6 +192,14 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertEqual(x._GetAccumulator('run2')._path, 'path2')
 
   def testAddRunsFromDirectory(self):
+    """Tests AddRunsFromDirectory function.
+
+    Tests the following scenarios:
+    - When the directory does not exist.
+    - When the directory is empty.
+    - When the directory has empty subdirectory.
+    - Contains proper EventAccumulators after adding events.
+    """
     x = event_multiplexer.EventMultiplexer()
     tmpdir = self.get_temp_dir()
     join = os.path.join
-- 
GitLab


From 00bfa9069e2f8456e26e09d6a7a1d0dff807e5bf Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 08:52:26 -0800
Subject: [PATCH 0958/1563] fixed a bug passing two flag values: show_type and
 show_summary, they currently override the value of show_time Change:
 154967526

---
 tensorflow/tools/benchmark/benchmark_model.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/benchmark/benchmark_model.cc b/tensorflow/tools/benchmark/benchmark_model.cc
index c2e41e4918..8c480f8d9d 100644
--- a/tensorflow/tools/benchmark/benchmark_model.cc
+++ b/tensorflow/tools/benchmark/benchmark_model.cc
@@ -334,8 +334,8 @@ int Main(int argc, char** argv) {
       Flag("show_memory", &show_memory, "whether to list stats by memory used"),
       Flag("memory_limit", &memory_limit,
            "how many items to show by memory used"),
-      Flag("show_type", &show_time, "whether to list stats by op type"),
-      Flag("show_summary", &show_time,
+      Flag("show_type", &show_type, "whether to list stats by op type"),
+      Flag("show_summary", &show_summary,
            "whether to show a summary of the stats"),
       Flag("show_flops", &show_flops, "whether to estimate the model's FLOPs"),
       Flag("warmup_runs", &warmup_runs, "how many runs to initialize model"),
-- 
GitLab


From 834a2e27a9c31b43c8dad631c555676555f63f62 Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Wed, 3 May 2017 08:59:36 -0800
Subject: [PATCH 0959/1563] Adding tf_cnn_benchmark.py examples Change:
 154968353

---
 tensorflow/docs_src/performance/benchmarks.md | 146 ++++++------------
 .../performance/performance_models.md         |  93 ++++++++++-
 2 files changed, 141 insertions(+), 98 deletions(-)

diff --git a/tensorflow/docs_src/performance/benchmarks.md b/tensorflow/docs_src/performance/benchmarks.md
index bfb47d9f90..19d37794ab 100644
--- a/tensorflow/docs_src/performance/benchmarks.md
+++ b/tensorflow/docs_src/performance/benchmarks.md
@@ -3,9 +3,9 @@
 ## Overview
 
 A selection of image classification models were tested across multiple platforms
-to create a point of reference for the TensorFlow community. The methodology,
-links to the benchmark scripts, and commands to reproduce the results are in the
-[Appendix](#appendix).
+to create a point of reference for the TensorFlow community. The
+[Methodology](#methodology) section details how the test were executed and has
+links to the scripts used.
 
 ## Results for image classification models
 
@@ -120,19 +120,19 @@ VGG16       | replicated (with NCCL) | n/a
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-1    | 142         | 238       | 95.6       | 2987    | 132
-2    | 284         | 479       | 187        | 5658    | 259
-4    | 569         | 948       | 374        | 10509   | 511
-8    | 1131        | 1886      | 744        | 17822   | 959
+  1  | 142         | 238       | 95.6       | 2987    | 154
+  2  | 284         | 479       | 187        | 5658    | 295
+  4  | 569         | 948       | 374        | 10509   | 584
+  8  | 1131        | 1886      | 744        | 17822   | 1081
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-1    | 142         | 239       | 95.5       | 2890    | 132
-2    | 278         | 468       | 187        | 4448    | 245
-4    | 551         | 938       | 373        | 7105    | 466
-8    | 1079        | 1802      | 721        | N/A     | 794
+  1  | 142         | 239       | 95.5       | 2890    | 154
+  2  | 278         | 468       | 187        | 4448    | 284
+  4  | 551         | 938       | 373        | 7105    | 534
+  8  | 1079        | 1802      | 721        | N/A     | 898
 
 Training AlexNet with real data on 8 GPUs was excluded from the graph and table
 above due to it maxing out the input pipeline.
@@ -145,19 +145,19 @@ The results below are all with a batch size of 32.
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
 ---- | ----------- | --------- | ---------- | -----
-1    | 128         | 210       | 85.3       | 124
-2    | 259         | 412       | 166        | 241
-4    | 520         | 827       | 330        | 470
-8    | 995         | 1623      | 643        | 738
+  1  | 128         | 210       | 85.3       | 144
+  2  | 259         | 412       | 166        | 281
+  4  | 520         | 827       | 330        | 549
+  8  | 995         | 1623      | 643        | 820
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
 ---- | ----------- | --------- | ---------- | -----
-1    | 130         | 208       | 85.0       | 124
-2    | 257         | 403       | 163        | 221
-4    | 507         | 814       | 325        | 401
-8    | 966         | 1525      | 641        | 619
+  1  | 130         | 208       | 85.0       | 144
+  2  | 257         | 403       | 163        | 253
+  4  | 507         | 814       | 325        | 457
+  8  | 966         | 1525      | 641        | 690
 
 ## Details for Google Compute Engine (NVIDIA® Tesla® K80)
 
@@ -198,19 +198,19 @@ The configuration used for each model was `variable_update` equal to
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-1    | 30.5        | 56.8      | 20.8       | 656     | 30.3
-2    | 57.8        | 107       | 39.1       | 1210    | 56.2
-4    | 116         | 212       | 77.2       | 2330    | 106
-8    | 227         | 419       | 151        | 4640    | 222
+  1  | 30.5        | 56.8      | 20.8       | 656     | 35.4
+  2  | 57.8        | 107       | 39.1       | 1209    | 64.8
+  4  | 116         | 212       | 77.2       | 2328    | 120
+  8  | 227         | 419       | 151        | 4640    | 234
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-  1  | 30.6        | 56.7      | 20.7       | 639     | 30.2       
-  2  | 58.4        | 107       | 39.0       | 1136    | 55.5       
-  4  | 115         | 211       | 77.3       | 2067    | 106        
-  8  | 225         | 422       | 151        | 4056    | 213   
+  1  | 30.6        | 56.7      | 20.7       | 639     | 34.2
+  2  | 58.4        | 107       | 39.0       | 1136    | 62.9
+  4  | 115         | 211       | 77.3       | 2067    | 118
+  8  | 225         | 422       | 151        | 4056    | 230
 
 ### Other Results
 
@@ -227,10 +227,10 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-  1  | 29.5                        | 53.6       
-  2  | 55.4                        | 102        
-  4  | 110                         | 201        
-  8  | 216                         | 387  
+  1  | 29.5                        | 53.6
+  2  | 55.4                        | 102
+  4  | 110                         | 201
+  8  | 216                         | 387
 
 ## Details for Amazon EC2 (NVIDIA® Tesla® K80)
 
@@ -279,19 +279,19 @@ VGG16       | parameter_server          | gpu
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-1    | 30.8        | 56.3      | 20.9       | 684     | 32.4
-2    | 58.7        | 108       | 39.3       | 1244    | 61.5
-4    | 117         | 217       | 79.1       | 2479    | 123
-8    | 230         | 419       | 156        | 4853    | 234
+  1  | 30.8        | 56.3      | 20.9       | 684     | 36.3
+  2  | 58.7        | 108       | 39.3       | 1244    | 69.4
+  4  | 117         | 217       | 79.1       | 2479    | 141
+  8  | 230         | 419       | 156        | 4853    | 260
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-1    | 30.5        | 56.0      | 20.6       | 674     | 32.0
-2    | 58.7        | 107       | 39.0       | 1227    | 61.0
-4    | 118         | 205       | 77.9       | 2201    | 120
-8    | 228         | 405       | 152        | N/A     | 191
+  1  | 30.5        | 56.0      | 20.6       | 674     | 36.3
+  2  | 59.0        | 107       | 39.0       | 1227    | 67.5
+  4  | 118         | 205       | 77.9       | 2201    | 136
+  8  | 228         | 405       | 152        | N/A     | 242
 
 Training AlexNet with real data on 8 GPUs was excluded from the graph and table
 above due to our EFS setup not providing enough throughput.
@@ -393,63 +393,17 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 32   | 820                         | 1265
 64   | 1608                        | 2623
 
-## Appendix
 
-### Executing benchmark tests
+## Methodology
 
-The [benchmark code](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
-was created to be used for benchmarking TensorFlow as well as used as a tool to
-test hardware platforms. Techniques used in the benchmark scripts are detailed
-in @{$performance_models$High-Performance Models}.
+This [script](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+was run on the various platforms to generate the above results.
+@{$performance_models$High-Performance Models} details techniques in the script
+along with examples of how to execute the script.
 
-There are two ways to execute the benchmark code:
-
-1.  Execute [tf_cnn_benchmarks.py](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/tf_cnn_benchmarks.py)
-    directly.
-2.  Utilize the [scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/main.py)
-    that helps pick the correct config for each platform executes
-    `tf_cnn_benchmarks.py`.
-
-The wrapper is suggested as a starting point. Then investigate the variety of
-options available in `tf_cnn_benchmarks.py`. Below are a couple examples of
-using the wrapper.
-
-**Single Server**
-This example illustrates training ResNet-50 on a single instance with 8 GPUs.
-The `system` flag is used to determine the optimal configuration. The
-supported values are gce, aws, and dgx1. If `system` is not passed, the best
-config for the most widely available hardware is used.
-
-```bash
-python main.py --model=resnet50 --num_gpus=8
-python main.py --system=aws --model=resnet50 --num_gpus=8
-```
-
-**Distributed**
-This example illustrates training ResNet-50 on 2 hosts, e.g. host_0 (10.0.0.1)
-and host_1 (10.0.0.2), with 8 GPUs each on AWS (Amazon EC2).
-
-```bash
-# Run the following commands on host_0 (10.0.0.1):
-  $  python main.py --system=aws --model=resnet50 --job_name=worker
-     --hosts=10.0.0.1,10.0.0.2 --task_index=0
-
-  $  python main.py --system=aws --model=resnet50 --job_name=ps
-     --hosts=10.0.0.1,10.0.0.2 --task_index=0
-
-# Run the following commands on host_1 (10.0.0.2):
-  $  python main.py --system=aws --model=resnet50 --job_name=worker
-     --hosts=10.0.0.1,10.0.0.2 --task_index=1
-
-  $  python main.py --system=aws --model=resnet50 --job_name=ps
-     --hosts=10.0.0.1,10.0.0.2 --task_index=1
-```
-
-### Methodology
-
-Unless otherwise stated, each test is run 5 times and then the times are
-averaged together. GPUs are run in their default state on the given platform.
-For NVIDIA® Tesla® K80 this means leaving on [GPU
-Boost](https://devblogs.nvidia.com/parallelforall/increase-performance-gpu-boost-k80-autoboost/)
-unless it has been turned off by the provider. For a given test, 10 warmup steps
-are done and then the next 100 steps are averaged.
+In order to create results that are as repeatable as possible, each test was run
+5 times and then the times were averaged together. GPUs are run in their default
+state on the given platform.  For NVIDIA® Tesla® K80 this means leaving on [GPU
+Boost](https://devblogs.nvidia.com/parallelforall/increase-performance-gpu-boost-k80-autoboost/).
+For each test, 10 warmup steps are done and then the next 100 steps are
+averaged.
diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index 70c415a024..027ecb195e 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -14,8 +14,8 @@ input pipeline issues and best practices. We found that using @{tf.FIFOQueue}
 and @{tf.train.queue_runner} could not saturate multiple current generation GPUs
 when using large inputs and processing with higher samples per second, such
 as training ImageNet with [AlexNet](http://papers.nips.cc/paper/4824-imagenet-classification-with-deep-convolutional-neural-networks.pdf).
-This is due to the the use of Python threads as its underlying implementation.
-The overhead of Python threads is too large.
+This is due to the use of Python threads as its underlying implementation. The
+overhead of Python threads is too large.
 
 Another approach, which we have implemented in the
 [scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks),
@@ -327,3 +327,92 @@ free.
 The downside is that all the weights read are from the previous training step.
 So it is a different algorithm from SGD. But it is possible to improve its
 convergence by adjusting learning rate and other hyperparameters.
+
+### Executing the script
+
+This section lists the core command line arguments and a few basic examples for
+executing the main script
+([tf_cnn_benchmarks.py](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/tf_cnn_benchmarks.py)).
+
+#### Base command line arguments
+
+*   **`model`**: Model to use, e.g. `resnet50`, `inception3`, `vgg16`, and
+    `alexnet`.
+*   **`num_gpus`**: Number of GPUs to use.
+*   **`data_dir`**: Path to data to process. If not set, synthetic data is used.
+    To use Imagenet data use these
+    [instructions(https://github.com/tensorflow/models/tree/master/inception#getting-started)
+    as a starting point.
+*   **`batch_size`**: Batch size for each GPU.
+*   **`variable_update`**: The method for managing variables: `parameter_server`
+    ,`replicated`, `distributed_replicated`, `independent`
+*   **`local_parameter_device`**: Device to use as parameter server: `cpu` or
+    `gpu`.
+
+#### Single instance examples
+
+```bash
+# VGG16 training ImageNet with 8 GPUs using arguments that optimize for
+# Google Compute Engine.
+python tf_cnn_benchmarks.py --local_parameter_device=cpu --num_gpus=8 \
+--batch_size=32 --model=vgg16 --data_dir=/home/ubuntu/imagenet/train \
+--variable_update=parameter_server --nodistortions
+
+# VGG16 training synthetic ImageNet data with 8 GPUs using arguments that
+# optimize for the NVIDIA DGX-1.
+python tf_cnn_benchmarks.py --local_parameter_device=gpu --num_gpus=8 \
+--batch_size=64 --model=vgg16 --variable_update=replicated --use_nccl=True
+
+# VGG16 training ImageNet data with 8 GPUs using arguments that optimize for
+# Amazon EC2.
+python tf_cnn_benchmarks.py --local_parameter_device=gpu --num_gpus=8 \
+--batch_size=64 --model=vgg16 --variable_update=parameter_server
+
+# ResNet-50 training ImageNet data with 8 GPUs using arguments that optimize for
+# Amazon EC2.
+python tf_cnn_benchmarks.py --local_parameter_device=gpu --num_gpus=8 \
+--batch_size=64 --model=resnet50 --variable_update=replicated --use_nccl=False
+
+```
+
+#### Distributed command line arguments
+
+*   **`ps_hosts`**: Comma separated list of hosts to use as parameter servers
+    in the format of ```<host>:port```, e.g. ```10.0.0.2:50000```.
+*   **`worker_hosts`**: Comma separated list of hosts to use as workers in the
+    format of ```<host>:port```, e.g. ```10.0.0.2:50001```.
+*   **`task_index`**: Index of the host in the list of `ps_hosts` or
+    `worker_hosts` being started.
+*   **`job_name`**: Type of job, e.g `ps` or `worker`
+
+#### Distributed examples
+
+Below is an example of training ResNet-50 on 2 hosts: host_0 (10.0.0.1) and
+host_1 (10.0.0.2). The example uses synthetic data. To use real data pass the
+`--data_dir` argument.
+
+```bash
+# Run the following commands on host_0 (10.0.0.1):
+python tf_cnn_benchmarks.py --local_parameter_device=gpu --num_gpus=8 \
+--batch_size=64 --model=resnet50 --variable_update=distributed_replicated \
+--job_name=worker --ps_hosts=10.0.0.1:50000,10.0.0.2:50000 \
+--worker_hosts=10.0.0.1:50001,10.0.0.2:50001 --task_index=0
+
+python tf_cnn_benchmarks.py --local_parameter_device=gpu --num_gpus=8 \
+--batch_size=64 --model=resnet50 --variable_update=distributed_replicated \
+--job_name=ps --ps_hosts=10.0.0.1:50000,10.0.0.2:50000 \
+--worker_hosts=10.0.0.1:50001,10.0.0.2:50001 --task_index=0
+
+
+# Run the following commands on host_1 (10.0.0.2):
+python tf_cnn_benchmarks.py --local_parameter_device=gpu --num_gpus=8 \
+--batch_size=64 --model=resnet50 --variable_update=distributed_replicated \
+--job_name=worker --ps_hosts=10.0.0.1:50000,10.0.0.2:50000 \
+--worker_hosts=10.0.0.1:50001,10.0.0.2:50001 --task_index=1
+
+python tf_cnn_benchmarks.py --local_parameter_device=gpu --num_gpus=8 \
+--batch_size=64 --model=resnet50 --variable_update=distributed_replicated \
+--job_name=ps --ps_hosts=10.0.0.1:50000,10.0.0.2:50000 \
+--worker_hosts=10.0.0.1:50001,10.0.0.2:50001 --task_index=1
+
+```
-- 
GitLab


From 7bb4cd35457fd7c3fdcb53a92495073aa9adcd5e Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Wed, 3 May 2017 09:05:41 -0800
Subject: [PATCH 0960/1563] 1. Default implementation of determinant,
 log_determinant added. Now the only methods lacking a default are the
 assert_* (this will be discussed at design review), and the abstractmethods
 shape/apply/...

2. is_square hint added to all operators and used.

3. errant reference to non-existent "log_determinant" method changed to "log_abs_determinant".
Change: 154969228
---
 .../linear_operator_composition_test.py       |  5 +-
 .../linear_operator_full_matrix_test.py       | 19 ++--
 .../kernel_tests/linear_operator_test.py      |  3 +
 .../linalg/python/ops/linear_operator.py      | 95 +++++++++++++------
 .../python/ops/linear_operator_composition.py |  7 +-
 .../linalg/python/ops/linear_operator_diag.py | 11 ++-
 .../python/ops/linear_operator_full_matrix.py | 34 +------
 .../python/ops/linear_operator_identity.py    | 19 +++-
 .../linalg/python/ops/linear_operator_tril.py | 13 ++-
 9 files changed, 130 insertions(+), 76 deletions(-)

diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py
index 998073e28b..0585a0ba5a 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py
@@ -65,12 +65,15 @@ class SquareLinearOperatorCompositionTest(
       # feed_dict.
       matrices = sess.run(matrices)
       operator = linalg.LinearOperatorComposition(
-          [linalg.LinearOperatorFullMatrix(m_ph) for m_ph in matrices_ph])
+          [linalg.LinearOperatorFullMatrix(m_ph) for m_ph in matrices_ph],
+          is_square=True)
       feed_dict = {m_ph: m for (m_ph, m) in zip(matrices_ph, matrices)}
     else:
       operator = linalg.LinearOperatorComposition(
           [linalg.LinearOperatorFullMatrix(m) for m in matrices])
       feed_dict = None
+      # Should be auto-set.
+      self.assertTrue(operator.is_square)
 
     # Convert back to Tensor.  Needed if use_placeholder, since then we have
     # already evaluated each matrix to a numpy array.
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
index d4a9e97ce7..12c299683a 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
@@ -45,9 +45,10 @@ class SquareLinearOperatorFullMatrixTest(
       # values are random and we want the same value used for both mat and
       # feed_dict.
       matrix = matrix.eval()
-      operator = linalg.LinearOperatorFullMatrix(matrix_ph)
+      operator = linalg.LinearOperatorFullMatrix(matrix_ph, is_square=True)
       feed_dict = {matrix_ph: matrix}
     else:
+      # is_square should be auto-detected here.
       operator = linalg.LinearOperatorFullMatrix(matrix)
       feed_dict = None
 
@@ -68,6 +69,8 @@ class SquareLinearOperatorFullMatrixTest(
     self.assertTrue(operator.is_positive_definite)
     self.assertTrue(operator.is_non_singular)
     self.assertFalse(operator.is_self_adjoint)
+    # Auto-detected.
+    self.assertTrue(operator.is_square)
 
 
 class SquareLinearOperatorFullMatrixSymmetricPositiveDefiniteTest(
@@ -104,6 +107,7 @@ class SquareLinearOperatorFullMatrixSymmetricPositiveDefiniteTest(
       # values are random and we want the same value used for both mat and
       # feed_dict.
       matrix = matrix.eval()
+      # is_square is auto-set because of self_adjoint/pd.
       operator = linalg.LinearOperatorFullMatrix(
           matrix_ph, is_self_adjoint=True, is_positive_definite=True)
       feed_dict = {matrix_ph: matrix}
@@ -129,7 +133,8 @@ class SquareLinearOperatorFullMatrixSymmetricPositiveDefiniteTest(
 
     # Should be auto-set
     self.assertTrue(operator.is_non_singular)
-    self.assertTrue(operator._is_spd)
+    self.assertTrue(operator._can_use_cholesky)
+    self.assertTrue(operator.is_square)
 
 
 class NonSquareLinearOperatorFullMatrixTest(
@@ -157,16 +162,14 @@ class NonSquareLinearOperatorFullMatrixTest(
     return operator, mat, feed_dict
 
   def test_is_x_flags(self):
-    # Matrix with two positive eigenvalues.
-    matrix = [[3., 0.], [1., 1.]]
+    matrix = [[3., 2., 1.], [1., 1., 1.]]
     operator = linalg.LinearOperatorFullMatrix(
         matrix,
-        is_positive_definite=True,
-        is_non_singular=True,
         is_self_adjoint=False)
-    self.assertTrue(operator.is_positive_definite)
-    self.assertTrue(operator.is_non_singular)
+    self.assertEqual(operator.is_positive_definite, None)
+    self.assertEqual(operator.is_non_singular, None)
     self.assertFalse(operator.is_self_adjoint)
+    self.assertFalse(operator.is_square)
 
   def test_matrix_must_have_at_least_two_dims_or_raises(self):
     with self.assertRaisesRegexp(ValueError, "at least 2 dimensions"):
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
index c5bfc6e1fd..d24388fce3 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
@@ -54,6 +54,9 @@ class LinearOperatorShape(linalg.LinearOperator):
   def _shape_tensor(self):
     return constant_op.constant(self._stored_shape, dtype=dtypes.int32)
 
+  def _apply(self):
+    raise NotImplementedError("Not needed for this test.")
+
 
 class LinearOperatorApplyOnly(linalg.LinearOperator):
   """LinearOperator that simply wraps a [batch] matrix and implements apply."""
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator.py b/tensorflow/contrib/linalg/python/ops/linear_operator.py
index 454411d93c..8d0a1d7de2 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import abc
 import contextlib
 
 from tensorflow.contrib import framework as contrib_framework
@@ -25,6 +26,7 @@ from tensorflow.contrib.linalg.python.ops import linear_operator_util
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
+from tensorflow.python.ops import math_ops
 
 __all__ = ["LinearOperator"]
 
@@ -50,11 +52,9 @@ class LinearOperator(object):
 
   #### Performance contract
 
-  Subclasses should implement a method only if it can be done with a reasonable
-  performance increase over generic dense operations, either in time, parallel
-  scalability, or memory usage.  For example, if the determinant can only be
-  computed using `tf.matrix_determinant(self.to_dense())`, then determinants
-  should not be implemented.
+  Subclasses should only implement the assert methods
+  (e.g. `assert_non_singular`) if they can be done in less than `O(N^3)`
+  time.
 
   Class docstrings should contain an explanation of computational complexity.
   Since this is a high-performance library, attention should be paid to detail,
@@ -100,7 +100,7 @@ class LinearOperator(object):
   operator.shape()
   ==> [2, 4, 4]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> Shape [2] Tensor
 
   x = ... Shape [2, 4, 5] Tensor
@@ -131,6 +131,7 @@ class LinearOperator(object):
   * If `is_X == None` (the default), callers should have no expectation either
     way.
   """
+  __metaclass__ = abc.ABCMeta
 
   def __init__(self,
                dtype,
@@ -167,17 +168,23 @@ class LinearOperator(object):
       ValueError:  If hints are set incorrectly.
     """
     # Check and auto-set flags.
-    if is_square is False:
-      if is_non_singular or is_positive_definite:
-        raise ValueError(
-            "A non-singular or positive definite operator is always square.")
-    self._is_square_set_by_user = is_square
-
     if is_positive_definite:
       if is_non_singular is False:
         raise ValueError("A positive definite matrix is always non-singular.")
       is_non_singular = True
 
+    if is_non_singular:
+      if is_square is False:
+        raise ValueError("A non-singular matrix is always square.")
+      is_square = True
+
+    if is_self_adjoint:
+      if is_square is False:
+        raise ValueError("A self-adjoint matrix is always square.")
+      is_square = True
+
+    self._is_square_set_or_implied_by_hints = is_square
+
     graph_parents = [] if graph_parents is None else graph_parents
     for i, t in enumerate(graph_parents):
       if t is None or not contrib_framework.is_tensor(t):
@@ -239,15 +246,16 @@ class LinearOperator(object):
     """Return `True/False` depending on if this operator is square."""
     # Static checks done after __init__.  Why?  Because domain/range dimension
     # sometimes requires lots of work done in the derived class after init.
-    static_square_check = self.domain_dimension == self.range_dimension
-    if self._is_square_set_by_user is False and static_square_check:
+    auto_square_check = self.domain_dimension == self.range_dimension
+    if self._is_square_set_or_implied_by_hints is False and auto_square_check:
       raise ValueError(
           "User set is_square hint to False, but the operator was square.")
-    if self._is_square_set_by_user is None:
-      return static_square_check
+    if self._is_square_set_or_implied_by_hints is None:
+      return auto_square_check
 
-    return self._is_square_set_by_user
+    return self._is_square_set_or_implied_by_hints
 
+  @abc.abstractmethod
   def _shape(self):
     # Write this in derived class to enable all static shape methods.
     raise NotImplementedError("_shape is not implemented.")
@@ -265,6 +273,7 @@ class LinearOperator(object):
     """
     return self._shape()
 
+  @abc.abstractmethod
   def _shape_tensor(self):
     raise NotImplementedError("_shape_tensor is not implemented.")
 
@@ -367,8 +376,7 @@ class LinearOperator(object):
           self._cached_tensor_rank_tensor = ops.convert_to_tensor(
               self.tensor_rank)
         else:
-          self._cached_tensor_rank_tensor = array_ops.size(
-              self.shape_tensor())
+          self._cached_tensor_rank_tensor = array_ops.size(self.shape_tensor())
       return self._cached_tensor_rank_tensor
 
   @property
@@ -486,9 +494,10 @@ class LinearOperator(object):
     """Check that arg.dtype == self.dtype."""
     if arg.dtype != self.dtype:
       raise TypeError(
-          "Expected argument to have dtype %s.  Found: %s in tensor %s"
-          % (self.dtype, arg.dtype, arg))
+          "Expected argument to have dtype %s.  Found: %s in tensor %s" %
+          (self.dtype, arg.dtype, arg))
 
+  @abc.abstractmethod
   def _apply(self, x, adjoint=False, adjoint_arg=False):
     raise NotImplementedError("_apply is not implemented.")
 
@@ -517,7 +526,9 @@ class LinearOperator(object):
       return self._apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
   def _determinant(self):
-    raise NotImplementedError("_det is not implemented.")
+    if self._can_use_cholesky():
+      return math_ops.exp(self.log_abs_determinant())
+    return linalg_ops.matrix_determinant(self._matrix)
 
   def determinant(self, name="det"):
     """Determinant for every batch member.
@@ -539,7 +550,11 @@ class LinearOperator(object):
       return self._determinant()
 
   def _log_abs_determinant(self):
-    raise NotImplementedError("_log_abs_det is not implemented.")
+    if self._can_use_cholesky():
+      diag = array_ops.matrix_diag_part(self._get_cached_chol())
+      return 2 * math_ops.reduce_sum(math_ops.log(diag), reduction_indices=[-1])
+    abs_det = math_ops.abs(self.determinant())
+    return math_ops.log(abs_det)
 
   def log_abs_determinant(self, name="log_abs_det"):
     """Log absolute value of determinant for every batch member.
@@ -561,13 +576,20 @@ class LinearOperator(object):
       return self._log_abs_determinant()
 
   def _solve(self, rhs, adjoint=False, adjoint_arg=False):
-    # Since this is an exact solve method for all rhs, this will only be
-    # available for non-singular (batch) operators, in particular the operator
-    # must be square.
-    raise NotImplementedError("_solve is not implemented.")
+    if self.is_square is False:
+      raise NotImplementedError(
+          "Solve is not yet implemented for non-square operators.")
+    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
+    if self._can_use_cholesky():
+      return linalg_ops.cholesky_solve(self._get_cached_chol(), rhs)
+    return linalg_ops.matrix_solve(
+        self._get_cached_dense_matrix(), rhs, adjoint=adjoint)
 
   def solve(self, rhs, adjoint=False, adjoint_arg=False, name="solve"):
-    """Solve `R` (batch) systems of equations exactly: `A X = rhs`.
+    """Solve `R` (batch) systems of equations with best effort: `A X = rhs`.
+
+    The solution may not be exact, and in this case it will be close in some
+    sense (see class docstring for details).
 
     Examples:
 
@@ -689,3 +711,20 @@ class LinearOperator(object):
       x = ops.convert_to_tensor(x, name="x")
       self._check_input_dtype(x)
       return self._add_to_tensor(x)
+
+  def _can_use_cholesky(self):
+    # TODO(langmore) Add complex types when tf.cholesky can use them.
+    return (not self.dtype.is_complex and self.is_self_adjoint and
+            self.is_positive_definite)
+
+  def _get_cached_dense_matrix(self):
+    if not hasattr(self, "_cached_dense_matrix"):
+      self._cached_dense_matrix = self.to_dense()
+    return self._cached_dense_matrix
+
+  def _get_cached_chol(self):
+    if not self._can_use_cholesky():
+      return None
+    if not hasattr(self, "_cached_chol"):
+      self._cached_chol = linalg_ops.cholesky(self._get_cached_dense_matrix())
+    return self._cached_chol
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
index b1557769b2..550c630497 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
@@ -63,7 +63,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
   operator.shape
   ==> [2, 2]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
@@ -96,7 +96,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
   #### Matrix property hints
 
   This `LinearOperator` is initialized with boolean flags of the form `is_X`,
-  for `X = non_singular, self_adjoint, positive_definite`.
+  for `X = non_singular, self_adjoint, positive_definite, square`.
   These have the following meaning
   * If `is_X == True`, callers should expect the operator to have the
     property `X`.  This is a promise that should be fulfilled, but is *not* a
@@ -112,6 +112,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
                is_non_singular=None,
                is_self_adjoint=None,
                is_positive_definite=None,
+               is_square=None,
                name=None):
     r"""Initialize a `LinearOperatorComposition`.
 
@@ -132,6 +133,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
         self-adjoint to be positive-definite.  See:
         https://en.wikipedia.org/wiki/Positive-definite_matrix\
             #Extension_for_non_symmetric_matrices
+      is_square:  Expect that this operator acts like square [batch] matrices.
       name: A name for this `LinearOperator`.  Default is the individual
         operators names joined with `_o_`.
 
@@ -177,6 +179,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
           is_non_singular=is_non_singular,
           is_self_adjoint=is_self_adjoint,
           is_positive_definite=is_positive_definite,
+          is_square=is_square,
           name=name)
 
   @property
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
index 97e52d08a4..d81dea6514 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
@@ -52,7 +52,7 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
   operator.shape
   ==> [2, 2]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
@@ -97,7 +97,7 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
   #### Matrix property hints
 
   This `LinearOperator` is initialized with boolean flags of the form `is_X`,
-  for `X = non_singular, self_adjoint, positive_definite`.
+  for `X = non_singular, self_adjoint, positive_definite, square`.
   These have the following meaning
   * If `is_X == True`, callers should expect the operator to have the
     property `X`.  This is a promise that should be fulfilled, but is *not* a
@@ -113,6 +113,7 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
                is_non_singular=None,
                is_self_adjoint=None,
                is_positive_definite=None,
+               is_square=None,
                name="LinearOperatorDiag"):
     r"""Initialize a `LinearOperatorDiag`.
 
@@ -129,6 +130,7 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
         self-adjoint to be positive-definite.  See:
         https://en.wikipedia.org/wiki/Positive-definite_matrix\
             #Extension_for_non_symmetric_matrices
+      is_square:  Expect that this operator acts like square [batch] matrices.
       name: A name for this `LinearOperator`.
 
     Raises:
@@ -147,12 +149,17 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
         else:
           is_self_adjoint = True
 
+      if is_square is False:
+        raise ValueError("Only square diagonal operators currently supported.")
+      is_square = True
+
       super(LinearOperatorDiag, self).__init__(
           dtype=self._diag.dtype,
           graph_parents=[self._diag],
           is_non_singular=is_non_singular,
           is_self_adjoint=is_self_adjoint,
           is_positive_definite=is_positive_definite,
+          is_square=is_square,
           name=name)
 
   def _check_diag(self, diag):
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
index 64ab561457..0f245e609b 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
@@ -19,11 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.linalg.python.ops import linear_operator
-from tensorflow.contrib.linalg.python.ops import linear_operator_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 
 __all__ = ["LinearOperatorFullMatrix"]
@@ -49,7 +47,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   operator.shape
   ==> [2, 2]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
@@ -93,7 +91,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   #### Matrix property hints
 
   This `LinearOperator` is initialized with boolean flags of the form `is_X`,
-  for `X = non_singular, self_adjoint, positive_definite`.
+  for `X = non_singular, self_adjoint, positive_definite, square`.
   These have the following meaning
   * If `is_X == True`, callers should expect the operator to have the
     property `X`.  This is a promise that should be fulfilled, but is *not* a
@@ -109,6 +107,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
                is_non_singular=None,
                is_self_adjoint=None,
                is_positive_definite=None,
+               is_square=None,
                name="LinearOperatorFullMatrix"):
     r"""Initialize a `LinearOperatorFullMatrix`.
 
@@ -124,6 +123,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
         self-adjoint to be positive-definite.  See:
         https://en.wikipedia.org/wiki/Positive-definite_matrix\
             #Extension_for_non_symmetric_matrices
+      is_square:  Expect that this operator acts like square [batch] matrices.
       name: A name for this `LinearOperator`.
 
     Raises:
@@ -134,19 +134,13 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
       self._matrix = ops.convert_to_tensor(matrix, name="matrix")
       self._check_matrix(self._matrix)
 
-      # Special treatment for (real) Symmetric Positive Definite.
-      self._is_spd = (
-          (not self._matrix.dtype.is_complex)
-          and is_self_adjoint and is_positive_definite)
-      if self._is_spd:
-        self._chol = linalg_ops.cholesky(self._matrix)
-
       super(LinearOperatorFullMatrix, self).__init__(
           dtype=self._matrix.dtype,
           graph_parents=[self._matrix],
           is_non_singular=is_non_singular,
           is_self_adjoint=is_self_adjoint,
           is_positive_definite=is_positive_definite,
+          is_square=is_square,
           name=name)
 
   def _check_matrix(self, matrix):
@@ -177,23 +171,5 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
     return math_ops.matmul(
         self._matrix, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
-  def _determinant(self):
-    if self._is_spd:
-      return math_ops.exp(self.log_abs_determinant())
-    return linalg_ops.matrix_determinant(self._matrix)
-
-  def _log_abs_determinant(self):
-    if self._is_spd:
-      diag = array_ops.matrix_diag_part(self._chol)
-      return 2 * math_ops.reduce_sum(math_ops.log(diag), reduction_indices=[-1])
-    abs_det = math_ops.abs(self.determinant())
-    return math_ops.log(abs_det)
-
-  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
-    rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
-    if self._is_spd:
-      return linalg_ops.cholesky_solve(self._chol, rhs)
-    return linalg_ops.matrix_solve(self._matrix, rhs, adjoint=adjoint)
-
   def _to_dense(self):
     return self._matrix
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
index 845bf25192..d595442c70 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
@@ -112,7 +112,7 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
   operator.shape
   ==> [2, 2]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> 0.
 
   x = ... Shape [2, 4] Tensor
@@ -180,7 +180,7 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
   #### Matrix property hints
 
   This `LinearOperator` is initialized with boolean flags of the form `is_X`,
-  for `X = non_singular, self_adjoint, positive_definite`.
+  for `X = non_singular, self_adjoint, positive_definite, square`.
   These have the following meaning
   * If `is_X == True`, callers should expect the operator to have the
     property `X`.  This is a promise that should be fulfilled, but is *not* a
@@ -198,6 +198,7 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
                is_non_singular=True,
                is_self_adjoint=True,
                is_positive_definite=True,
+               is_square=True,
                assert_proper_shapes=False,
                name="LinearOperatorIdentity"):
     r"""Initialize a `LinearOperatorIdentity`.
@@ -224,6 +225,7 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
         self-adjoint to be positive-definite.  See:
         https://en.wikipedia.org/wiki/Positive-definite_matrix\
             #Extension_for_non_symmetric_matrices
+      is_square:  Expect that this operator acts like square [batch] matrices.
       assert_proper_shapes:  Python `bool`.  If `False`, only perform static
         checks that initialization and method arguments have proper shape.
         If `True`, and static checks are inconclusive, add asserts to the graph.
@@ -248,12 +250,15 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
         raise ValueError("An identity operator is always non-singular.")
       if not is_positive_definite:
         raise ValueError("An identity operator is always positive-definite.")
+      if not is_square:
+        raise ValueError("An identity operator is always square.")
 
       super(LinearOperatorIdentity, self).__init__(
           dtype=dtype,
           is_non_singular=is_non_singular,
           is_self_adjoint=is_self_adjoint,
           is_positive_definite=is_positive_definite,
+          is_square=is_square,
           name=name)
 
       self._num_rows = linear_operator_util.shape_tensor(
@@ -459,7 +464,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
   operator.shape
   ==> [2, 2]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> 2 * Log[3]
 
   x = ... Shape [2, 4] Tensor
@@ -510,7 +515,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
   #### Matrix property hints
 
   This `LinearOperator` is initialized with boolean flags of the form `is_X`,
-  for `X = non_singular, self_adjoint, positive_definite`.
+  for `X = non_singular, self_adjoint, positive_definite, square`.
   These have the following meaning
   * If `is_X == True`, callers should expect the operator to have the
     property `X`.  This is a promise that should be fulfilled, but is *not* a
@@ -527,6 +532,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
                is_non_singular=None,
                is_self_adjoint=None,
                is_positive_definite=None,
+               is_square=True,
                assert_proper_shapes=False,
                name="LinearOperatorScaledIdentity"):
     r"""Initialize a `LinearOperatorScaledIdentity`.
@@ -550,6 +556,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
         self-adjoint to be positive-definite.  See:
         https://en.wikipedia.org/wiki/Positive-definite_matrix\
             #Extension_for_non_symmetric_matrices
+      is_square:  Expect that this operator acts like square [batch] matrices.
       assert_proper_shapes:  Python `bool`.  If `False`, only perform static
         checks that initialization and method arguments have proper shape.
         If `True`, and static checks are inconclusive, add asserts to the graph.
@@ -561,6 +568,9 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
     """
     self._assert_proper_shapes = assert_proper_shapes
 
+    if not is_square:
+      raise ValueError("A ScaledIdentity operator is always square.")
+
     with ops.name_scope(name, values=[multiplier, num_rows]):
       self._multiplier = ops.convert_to_tensor(multiplier, name="multiplier")
 
@@ -569,6 +579,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
           is_non_singular=is_non_singular,
           is_self_adjoint=is_self_adjoint,
           is_positive_definite=is_positive_definite,
+          is_square=is_square,
           name=name)
 
       # Shape [B1,...Bb, 1, 1]
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
index 756e26cc13..6d4033c2a3 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
@@ -53,7 +53,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
   operator.shape
   ==> [2, 2]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
@@ -90,7 +90,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
   #### Matrix property hints
 
   This `LinearOperator` is initialized with boolean flags of the form `is_X`,
-  for `X = non_singular, self_adjoint, positive_definite`.
+  for `X = non_singular, self_adjoint, positive_definite, square`.
   These have the following meaning
   * If `is_X == True`, callers should expect the operator to have the
     property `X`.  This is a promise that should be fulfilled, but is *not* a
@@ -106,6 +106,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
                is_non_singular=None,
                is_self_adjoint=None,
                is_positive_definite=None,
+               is_square=None,
                name="LinearOperatorTriL"):
     r"""Initialize a `LinearOperatorTriL`.
 
@@ -126,12 +127,19 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
         self-adjoint to be positive-definite.  See:
         https://en.wikipedia.org/wiki/Positive-definite_matrix\
             #Extension_for_non_symmetric_matrices
+      is_square:  Expect that this operator acts like square [batch] matrices.
       name: A name for this `LinearOperator`.
 
     Raises:
       TypeError:  If `diag.dtype` is not an allowed type.
+      ValueError:  If `is_square` is `False`.
     """
 
+    if is_square is False:
+      raise ValueError(
+          "Only square lower triangular operators supported at this time.")
+    is_square = True
+
     with ops.name_scope(name, values=[tril]):
       self._tril = ops.convert_to_tensor(tril, name="tril")
       self._check_tril(self._tril)
@@ -144,6 +152,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
           is_non_singular=is_non_singular,
           is_self_adjoint=is_self_adjoint,
           is_positive_definite=is_positive_definite,
+          is_square=is_square,
           name=name)
 
   def _check_tril(self, tril):
-- 
GitLab


From c800d2e36954edddcb83aa1df7f623f2780c7780 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 09:26:28 -0800
Subject: [PATCH 0961/1563] Add support for python expression as SavedModel CLI
 inputs with '--input_exprs' option. Now python expression can be passed to
 --input_exprs option for saved_model_cli run command. For example
 --input_exprs "x=np.ones((50,50))"

Also change inputs for both '--inputs' and '--input_exprs' options to be semicolon separated instead of comma.
Change: 154971814
---
 tensorflow/python/tools/saved_model_cli.py    | 156 +++++++++++-------
 .../python/tools/saved_model_cli_test.py      |  90 ++++++----
 2 files changed, 161 insertions(+), 85 deletions(-)

diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index 9dfafb77e7..2fea29d961 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -56,20 +56,22 @@ Example output:
 To show all available information in the SavedModel:
   $saved_model_cli show --dir /tmp/saved_model --all
 
-'run' command usage: saved_model_cli run [-h] --dir DIR --tag_set TAG_SET
-                         --signature_def SIGNATURE_DEF_KEY --inputs INPUTS
-                         [--outdir OUTDIR] [--overwrite]
+usage: saved_model_cli run [-h] --dir DIR --tag_set TAG_SET --signature_def
+                           SIGNATURE_DEF_KEY [--inputs INPUTS]
+                           [--input_exprs INPUT_EXPRS] [--outdir OUTDIR]
+                           [--overwrite] [--tf_debug]
+
 Examples:
 To run input tensors from files through a MetaGraphDef and save the output
 tensors to files:
   $saved_model_cli run --dir /tmp/saved_model --tag_set serve
-  --signature_def serving_default --inputs x:0=/tmp/124.npz,x2=/tmp/123.npy
-  --outdir /tmp/out
+  --signature_def serving_default --inputs x=/tmp/124.npz
+  --input_exprs 'x2=np.ones((6,2))' --outdir /tmp/out
 
 To observe the intermediate Tensor values in the runtime graph, use the
 --tf_debug flag, e.g.:
   $saved_model_cli run --dir /tmp/saved_model --tag_set serve
-  --signature_def serving_default --inputs x:0=/tmp/124.npz,x2=/tmp/123.npy
+  --signature_def serving_default --inputs 'x=/tmp/124.npz;x2=/tmp/123.npy'
   --outdir /tmp/out --tf_debug
 
 To build this tool from source, run:
@@ -367,7 +369,7 @@ def run_saved_model_with_feed_dict(saved_model_dir, tag_set, signature_def_key,
                                             output_full_path))
 
 
-def preprocess_input_arg_string(inputs_str):
+def preprocess_inputs_arg_string(inputs_str):
   """Parses input arg into dictionary that maps input to file/variable tuple.
 
   Parses input string in the format of, for example,
@@ -375,74 +377,94 @@ def preprocess_input_arg_string(inputs_str):
   dictionary looks like
   {'input_key1': (filename1, variable_name1),
    'input_key2': (file2, None)}
-  , which maps input keys to a tuple of file name and varaible name(None if
+  , which maps input keys to a tuple of file name and variable name(None if
   empty).
 
   Args:
-    inputs_str: A string that specified where to load inputs. Each input is
-        separated by comma.
-        * If the command line arg for inputs is quoted and contains
-            whitespace(s), all whitespaces will be ignored.
+    inputs_str: A string that specified where to load inputs. Inputs are
+    separated by semicolons.
         * For each input key:
-            'input=filename<[variable_name]>'
-        * The "[variable_name]" key is optional. Will be set to None if not
-            specified.
+            '<input_key>=<filename>' or
+            '<input_key>=<filename>[<variable_name>]'
+        * The optional 'variable_name' key will be set to None if not specified.
 
   Returns:
-    A dictionary that maps input keys to a tuple of file name and varaible name.
+    A dictionary that maps input keys to a tuple of file name and variable name.
 
   Raises:
-    RuntimeError: An error when the given input is in a bad format.
+    RuntimeError: An error when the given input string is in a bad format.
   """
   input_dict = {}
-  inputs_raw = inputs_str.split(',')
+  inputs_raw = inputs_str.split(';')
   for input_raw in filter(bool, inputs_raw):  # skip empty strings
-    # Remove quotes and whitespaces
-    input_raw = input_raw.replace('"', '').replace('\'', '').replace(' ', '')
-
     # Format of input=filename[variable_name]'
-    match = re.match(r'^([\w\-]+)=([\w\-.\/]+)\[([\w\-]+)\]$', input_raw)
+    match = re.match(r'([^=]+)=([^\[\]]+)\[([^\[\]]+)\]$', input_raw)
+
     if match:
-      input_dict[match.group(1)] = (match.group(2), match.group(3))
+      input_dict[match.group(1)] = match.group(2), match.group(3)
     else:
       # Format of input=filename'
-      match = re.match(r'^([\w\-]+)=([\w\-.\/]+)$', input_raw)
+      match = re.match(r'([^=]+)=([^\[\]]+)$', input_raw)
       if match:
-        input_dict[match.group(1)] = (match.group(2), None)
+        input_dict[match.group(1)] = match.group(2), None
       else:
         raise RuntimeError(
-            'Input \"%s\" format is incorrect. Please follow \"--inputs '
-            'input_key=file_name[variable_name]\" or input_key=file_name' %
-            input_raw)
+            '--inputs "%s" format is incorrect. Please follow'
+            '"<input_key>=<filename>", or'
+            '"<input_key>=<filename>[<variable_name>]"' % input_raw)
 
   return input_dict
 
 
-def load_inputs_from_input_arg_string(inputs_str):
-  """Parses input arg string and load inputs into a dictionary.
+def preprocess_input_exprs_arg_string(input_exprs_str):
+  """Parses input arg into dictionary that maps input key to python expression.
 
-  Parses input string in the format of, for example,
-  "input1=filename1[variable_name1],input2=filename2" into a
-  dictionary looks like
-  {'input1:0': ndarray_saved_as_variable_name1_in_filename1 ,
-   'input2:0': ndarray_saved_in_filename2}
-  , which maps input keys to a numpy ndarray loaded from file. See Args section
-  for more details on inputs format.
+  Parses input string in the format of 'input_key=<python expression>' into a
+  dictionary that maps each input_key to its python expression.
+
+  Args:
+    input_exprs_str: A string that specifies python expression for input keys.
+    Each input is separated by semicolon. For each input key:
+        'input_key=<python expression>'
+
+  Returns:
+    A dictionary that maps input keys to python expressions.
+
+  Raises:
+    RuntimeError: An error when the given input string is in a bad format.
+  """
+  input_dict = {}
+
+  for input_raw in filter(bool, input_exprs_str.split(';')):
+    if '=' not in input_exprs_str:
+      raise RuntimeError('--input_exprs "%s" format is incorrect. Please follow'
+                         '"<input_key>=<python expression>"' % input_exprs_str)
+    input_key, expr = input_raw.split('=')
+    input_dict[input_key] = expr
+
+  return input_dict
+
+
+def load_inputs_from_input_arg_string(inputs_str, input_exprs_str):
+  """Parses input arg strings and create inputs feed_dict.
+
+  Parses '--inputs' string for inputs to be loaded from file, and parses
+  '--input_exprs' string for inputs to be evaluated from python expression.
 
   Args:
     inputs_str: A string that specified where to load inputs. Each input is
-        separated by comma.
-        * If the command line arg for inputs is quoted and contains
-            whitespace(s), all whitespaces will be ignored.
+        separated by semicolon.
         * For each input key:
-            'input=filename[variable_name]'
+            '<input_key>=<filename>' or
+            '<input_key>=<filename>[<variable_name>]'
+        * The optional 'variable_name' key will be set to None if not specified.
         * File specified by 'filename' will be loaded using numpy.load. Inputs
             can be loaded from only .npy, .npz or pickle files.
         * The "[variable_name]" key is optional depending on the input file type
             as descripted in more details below.
         When loading from a npy file, which always contains a numpy ndarray, the
         content will be directly assigned to the specified input tensor. If a
-        varaible_name is specified, it will be ignored and a warning will be
+        variable_name is specified, it will be ignored and a warning will be
         issued.
         When loading from a npz zip file, user can specify which variable within
         the zip file to load for the input tensor inside the square brackets. If
@@ -453,10 +475,12 @@ def load_inputs_from_input_arg_string(inputs_str):
         to the specified input tensor, else SavedModel CLI will assume a
         dictionary is stored in the pickle file and the value corresponding to
         the variable_name will be used.
+    input_exprs_str: A string that specified python expressions for inputs.
+        * In the format of: '<input_key>=<python expression>'.
+        * numpy module is available as np.
 
   Returns:
-    A dictionary that maps input tensor keys to a numpy ndarray loaded from
-    file.
+    A dictionary that maps input tensor keys to numpy ndarrays.
 
   Raises:
     RuntimeError: An error when a key is specified, but the input file contains
@@ -466,13 +490,14 @@ def load_inputs_from_input_arg_string(inputs_str):
   """
   tensor_key_feed_dict = {}
 
-  for input_tensor_key, (
-      filename,
-      variable_name) in preprocess_input_arg_string(inputs_str).items():
+  inputs = preprocess_inputs_arg_string(inputs_str)
+  input_exprs = preprocess_input_exprs_arg_string(input_exprs_str)
+
+  for input_tensor_key, (filename, variable_name) in inputs.items():
+    data = np.load(filename)
+
     # When a variable_name key is specified for the input file
     if variable_name:
-      data = np.load(filename)
-
       # if file contains a single ndarray, ignore the input name
       if isinstance(data, np.ndarray):
         warnings.warn(
@@ -488,7 +513,6 @@ def load_inputs_from_input_arg_string(inputs_str):
               (filename, variable_name))
     # When no key is specified for the input file.
     else:
-      data = np.load(filename)
       # Check if npz file only contains a single numpy ndarray.
       if isinstance(data, np.lib.npyio.NpzFile):
         variable_name_list = data.files
@@ -500,6 +524,16 @@ def load_inputs_from_input_arg_string(inputs_str):
       else:
         tensor_key_feed_dict[input_tensor_key] = data
 
+  # When input is a python expression:
+  for input_tensor_key, py_expr in input_exprs.items():
+    if input_tensor_key in tensor_key_feed_dict:
+      warnings.warn(
+          'input_key %s has been specified with both --inputs and --input_exprs'
+          ' options. Value in --input_exprs will be used.' % input_tensor_key)
+
+    # ast.literal_eval does not work with numpy expressions
+    tensor_key_feed_dict[input_tensor_key] = eval(py_expr)  # pylint: disable=eval-used
+
   return tensor_key_feed_dict
 
 
@@ -531,7 +565,8 @@ def run(args):
   Args:
     args: A namespace parsed from command line.
   """
-  tensor_key_feed_dict = load_inputs_from_input_arg_string(args.inputs)
+  tensor_key_feed_dict = load_inputs_from_input_arg_string(
+      args.inputs, args.input_exprs)
   run_saved_model_with_feed_dict(args.dir, args.tag_set, args.signature_def,
                                  tensor_key_feed_dict, args.outdir,
                                  args.overwrite, tf_debug=args.tf_debug)
@@ -559,7 +594,7 @@ def create_parser():
       'MetaGraphDef specified by its tag-set:\n'
       '$saved_model_cli show --dir /tmp/saved_model --tag_set serve\n'
       'For a MetaGraphDef with multiple tags in the tag-set, all tags must be '
-      'passed in, separated by \',\':\n'
+      'passed in, separated by \';\':\n'
       '$saved_model_cli show --dir /tmp/saved_model --tag_set serve,gpu\n\n'
       'To show all inputs and outputs TensorInfo for a specific'
       ' SignatureDef specified by the SignatureDef key in a'
@@ -601,7 +636,7 @@ def create_parser():
              '$saved_model_cli show --dir /tmp/saved_model --tag_set serve'
              '--signature_def serving_default '
              '--inputs input1_key=/tmp/124.npz[x],input2_key=/tmp/123.npy'
-             '--outdir=/out\n\n'
+             '--input_exprs \'input3_key=np.ones(2)\' --outdir=/out\n\n'
              'For more information about input file format, please see:\n'
              'https://www.tensorflow.org/programmers_guide/saved_model_cli\n')
   parser_run = subparsers.add_parser(
@@ -622,10 +657,15 @@ def create_parser():
       required=True,
       metavar='SIGNATURE_DEF_KEY',
       help='key of SignatureDef to run')
-  msg = ('inputs in the format of \'input_key=filename[variable_name]\', '
-         'separated by \',\'. Inputs can only be loaded from .npy, .npz or '
-         'pickle files. Please use input keys instead of input names.')
-  parser_run.add_argument('--inputs', type=str, required=True, help=msg)
+  msg = ('Loading inputs from files, in the format of \'<input_key>=<filename>,'
+         ' or \'<input_key>=<filename>[<variable_name>]\', separated by \';\'.'
+         ' The file format can only be from .npy, .npz or pickle.')
+  parser_run.add_argument('--inputs', type=str, default='', help=msg)
+  msg = ('Specifying inputs by python expressions, in the format of'
+         ' "<input_key>=\'<python expression>\'", separated by \';\'. '
+         'numpy module is available as \'np\'. '
+         'Will override duplicate input_keys from --inputs option.')
+  parser_run.add_argument('--input_exprs', type=str, default='', help=msg)
   parser_run.add_argument(
       '--outdir',
       type=str,
@@ -649,6 +689,8 @@ def create_parser():
 def main():
   parser = create_parser()
   args = parser.parse_args()
+  if not args.inputs and not args.input_exprs:
+    args.error('At least one of --inputs and --input_exprs is required')
   args.func(args)
 
 
diff --git a/tensorflow/python/tools/saved_model_cli_test.py b/tensorflow/python/tools/saved_model_cli_test.py
index a321ada2dd..1c7a44b3eb 100644
--- a/tensorflow/python/tools/saved_model_cli_test.py
+++ b/tensorflow/python/tools/saved_model_cli_test.py
@@ -201,28 +201,37 @@ Method name is: tensorflow/serving/predict"""
     self.assertEqual(err.getvalue().strip(), '')
 
   def testInputPreProcessFormats(self):
-    input_str = 'input1=/path/file.txt[ab3], input2=file2,,'
-    input_dict = saved_model_cli.preprocess_input_arg_string(input_str)
+    input_str = 'input1=/path/file.txt[ab3];input2=file2'
+    input_expr_str = 'input3=np.zeros([2,2]);input4=[4,5]'
+    input_dict = saved_model_cli.preprocess_inputs_arg_string(input_str)
+    input_expr_dict = saved_model_cli.preprocess_input_exprs_arg_string(
+        input_expr_str)
     self.assertTrue(input_dict['input1'] == ('/path/file.txt', 'ab3'))
     self.assertTrue(input_dict['input2'] == ('file2', None))
-
-  def testInputPreProcessQuoteAndWhitespace(self):
-    input_str = '\' input1 = file[v_1]\', input2=file ["sd"] '
-    input_dict = saved_model_cli.preprocess_input_arg_string(input_str)
-    self.assertTrue(input_dict['input1'] == ('file', 'v_1'))
-    self.assertTrue(input_dict['input2'] == ('file', 'sd'))
+    self.assertTrue(input_expr_dict['input3'] == 'np.zeros([2,2])')
+    self.assertTrue(input_expr_dict['input4'] == '[4,5]')
     self.assertTrue(len(input_dict) == 2)
+    self.assertTrue(len(input_expr_dict) == 2)
+
+  def testInputPreProcessFileNames(self):
+    input_str = (r'inputx=C:\Program Files\data.npz[v:0];'
+                 r'input:0=c:\PROGRA~1\data.npy')
+    input_dict = saved_model_cli.preprocess_inputs_arg_string(input_str)
+    print(input_dict)
+    self.assertTrue(input_dict['inputx'] == (r'C:\Program Files\data.npz',
+                                             'v:0'))
+    self.assertTrue(input_dict['input:0'] == (r'c:\PROGRA~1\data.npy', None))
 
   def testInputPreProcessErrorBadFormat(self):
     input_str = 'inputx=file[[v1]v2'
     with self.assertRaises(RuntimeError):
-      saved_model_cli.preprocess_input_arg_string(input_str)
+      saved_model_cli.preprocess_inputs_arg_string(input_str)
     input_str = 'inputx:file'
     with self.assertRaises(RuntimeError):
-      saved_model_cli.preprocess_input_arg_string(input_str)
-    input_str = 'inputx=file(v_1)'
+      saved_model_cli.preprocess_inputs_arg_string(input_str)
+    input_str = 'inputx:np.zeros((5))'
     with self.assertRaises(RuntimeError):
-      saved_model_cli.preprocess_input_arg_string(input_str)
+      saved_model_cli.preprocess_input_exprs_arg_string(input_str)
 
   def testInputParserNPY(self):
     x0 = np.array([[1], [2]])
@@ -231,8 +240,8 @@ Method name is: tensorflow/serving/predict"""
     input1_path = os.path.join(test.get_temp_dir(), 'input1.npy')
     np.save(input0_path, x0)
     np.save(input1_path, x1)
-    input_str = 'x0=' + input0_path + '[x0],x1=' + input1_path
-    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    input_str = 'x0=' + input0_path + '[x0];x1=' + input1_path
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str, '')
     self.assertTrue(np.all(feed_dict['x0'] == x0))
     self.assertTrue(np.all(feed_dict['x1'] == x1))
 
@@ -240,8 +249,8 @@ Method name is: tensorflow/serving/predict"""
     x0 = np.array([[1], [2]])
     input_path = os.path.join(test.get_temp_dir(), 'input.npz')
     np.savez(input_path, a=x0)
-    input_str = 'x=' + input_path + '[a],y=' + input_path
-    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    input_str = 'x=' + input_path + '[a];y=' + input_path
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str, '')
     self.assertTrue(np.all(feed_dict['x'] == x0))
     self.assertTrue(np.all(feed_dict['y'] == x0))
 
@@ -258,25 +267,50 @@ Method name is: tensorflow/serving/predict"""
       pickle.dump(pkl1, f)
     with open(input_path2, 'wb') as f:
       pickle.dump(pkl2, f)
-    input_str = 'x=' + input_path0 + '[b],y=' + input_path1 + '[c],'
+    input_str = 'x=' + input_path0 + '[b];y=' + input_path1 + '[c];'
     input_str += 'z=' + input_path2
-    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str, '')
     self.assertTrue(np.all(feed_dict['x'] == pkl0['b']))
     self.assertTrue(np.all(feed_dict['y'] == pkl1))
     self.assertTrue(np.all(feed_dict['z'] == pkl2))
 
-  def testInputParserQuoteAndWhitespace(self):
+  def testInputParserPythonExpression(self):
+    x1 = np.ones([2, 10])
+    x2 = np.array([[1], [2], [3]])
+    x3 = np.mgrid[0:5, 0:5]
+    x4 = [[3], [4]]
+    input_expr_str = ('x1=np.ones([2,10]);x2=np.array([[1],[2],[3]]);'
+                      'x3=np.mgrid[0:5,0:5];x4=[[3],[4]]')
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(
+        '', input_expr_str)
+    self.assertTrue(np.all(feed_dict['x1'] == x1))
+    self.assertTrue(np.all(feed_dict['x2'] == x2))
+    self.assertTrue(np.all(feed_dict['x3'] == x3))
+    self.assertTrue(np.all(feed_dict['x4'] == x4))
+
+  def testInputParserBoth(self):
     x0 = np.array([[1], [2]])
-    x1 = np.array(range(6)).reshape(2, 3)
-    input0_path = os.path.join(test.get_temp_dir(), 'input0.npy')
-    input1_path = os.path.join(test.get_temp_dir(), 'input1.npy')
-    np.save(input0_path, x0)
-    np.save(input1_path, x1)
-    input_str = '"x0=' + input0_path + '[x0] , x1 = ' + input1_path + '"'
-    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(input_str)
+    input_path = os.path.join(test.get_temp_dir(), 'input.npz')
+    np.savez(input_path, a=x0)
+    x1 = np.ones([2, 10])
+    input_str = 'x0=' + input_path + '[a]'
+    input_expr_str = 'x1=np.ones([2,10])'
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(
+        input_str, input_expr_str)
     self.assertTrue(np.all(feed_dict['x0'] == x0))
     self.assertTrue(np.all(feed_dict['x1'] == x1))
 
+  def testInputParserBothDuplicate(self):
+    x0 = np.array([[1], [2]])
+    input_path = os.path.join(test.get_temp_dir(), 'input.npz')
+    np.savez(input_path, a=x0)
+    x1 = np.ones([2, 10])
+    input_str = 'x0=' + input_path + '[a]'
+    input_expr_str = 'x0=np.ones([2,10])'
+    feed_dict = saved_model_cli.load_inputs_from_input_arg_string(
+        input_str, input_expr_str)
+    self.assertTrue(np.all(feed_dict['x0'] == x1))
+
   def testInputParserErrorNoName(self):
     x0 = np.array([[1], [2]])
     x1 = np.array(range(5))
@@ -284,7 +318,7 @@ Method name is: tensorflow/serving/predict"""
     np.savez(input_path, a=x0, b=x1)
     input_str = 'x=' + input_path
     with self.assertRaises(RuntimeError):
-      saved_model_cli.load_inputs_from_input_arg_string(input_str)
+      saved_model_cli.load_inputs_from_input_arg_string(input_str, '')
 
   def testInputParserErrorWrongName(self):
     x0 = np.array([[1], [2]])
@@ -293,7 +327,7 @@ Method name is: tensorflow/serving/predict"""
     np.savez(input_path, a=x0, b=x1)
     input_str = 'x=' + input_path + '[c]'
     with self.assertRaises(RuntimeError):
-      saved_model_cli.load_inputs_from_input_arg_string(input_str)
+      saved_model_cli.load_inputs_from_input_arg_string(input_str, '')
 
   def testRunCommandExistingOutdir(self):
     self.parser = saved_model_cli.create_parser()
-- 
GitLab


From 622e2f22041e69656531d224c7a87b9bd2299c25 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 09:31:24 -0800
Subject: [PATCH 0962/1563] Fix some pylint errors. Change: 154972424

---
 tensorflow/python/ops/data_flow_ops.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/ops/data_flow_ops.py b/tensorflow/python/ops/data_flow_ops.py
index 6395451e2a..95e803e2aa 100644
--- a/tensorflow/python/ops/data_flow_ops.py
+++ b/tensorflow/python/ops/data_flow_ops.py
@@ -21,7 +21,6 @@ from __future__ import print_function
 
 import collections
 import hashlib
-import re
 import threading
 
 import six
@@ -56,6 +55,7 @@ def _as_type_list(dtypes):
 def _as_shape_list(shapes, dtypes, unknown_dim_allowed=False,
                    unknown_rank_allowed=False):
   """Convert shapes to a list of tuples of int (or None)."""
+  del dtypes
   if unknown_dim_allowed:
     if (not isinstance(shapes, collections.Sequence)
         or not shapes
@@ -925,16 +925,18 @@ class Barrier(object):
     If barrier has no completed elements, this operation will block
     until there are 'num_elements' elements to take.
 
+    TODO(b/25743580): the semantics of `allow_small_batch` are experimental
+    and may be extended to other cases in the future.
+
+    TODO(ebrevdo): If a take_many(allow_small_batch=True) is blocking
+    already when the barrier is closed, it will block for ever. Fix this
+    by using asynchronous operations.
+
     Args:
       num_elements: The number of elements to take.
       allow_small_batch: If the barrier is closed, don't block if there are less
         completed elements than requested, but instead return all available
         completed elements.
-        TODO(b/25743580): the semantics of `allow_small_batch` are experimental
-        and may be extended to other cases in the future.
-        TODO(ebrevdo): If a take_many(allow_small_batch=True) is blocking
-        already when the barrier is closed, it will block for ever. Fix this
-        by using asynchronous operations.
       timeout: This specifies the number of milliseconds to block
         before returning with DEADLINE_EXCEEDED. (This option is not
         supported yet.)
-- 
GitLab


From 44446379790a211df6c77cf7dff8ad819cd4ef57 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Wed, 3 May 2017 09:31:39 -0800
Subject: [PATCH 0963/1563] Adds model_dir in TF_CONFIG, which is read by
 RunConfig. Change: 154972457

---
 .../python/learn/estimators/run_config.py     | 29 ++++++++++++++++---
 .../learn/estimators/run_config_test.py       | 21 ++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 5a63ee7fa8..3b7d618b60 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -28,6 +28,7 @@ import six
 from tensorflow.contrib.framework.python.framework import experimental
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.estimator import run_config as core_run_config
+from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import server_lib
 
 
@@ -260,10 +261,12 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
         the feature.
       evaluation_master: the master on which to perform evaluation.
       model_dir: directory where model parameters, graph etc are saved. If
-        `None`, see `Estimator` about where the model will be saved.
+        `None`, will use `model_dir` property in `TF_CONFIG` environment
+        variable. If both are set, must have same value. If both are `None`, see
+        `Estimator` about where the model will be saved.
       session_config: a ConfigProto used to set session parameters, or None.
-         Note - using this argument, it is easy to provide settings which break
-         otherwise perfectly good models. Use with care.
+        Note - using this argument, it is easy to provide settings which break
+        otherwise perfectly good models. Use with care.
     """
     super(RunConfig, self).__init__(
         master=master, evaluation_master=evaluation_master)
@@ -291,7 +294,7 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     # create Scaffold and Saver in their model_fn to set these.
     self._keep_checkpoint_max = keep_checkpoint_max
     self._keep_checkpoint_every_n_hours = keep_checkpoint_every_n_hours
-    self._model_dir = model_dir
+    self._model_dir = _get_model_dir(model_dir)
 
   def replace(self, **kwargs):
     """Returns a new instance of `RunConfig` replacing specified properties.
@@ -434,3 +437,21 @@ def _get_master(cluster_spec, task_type, task_id):
   # For backwards compatibility, we return empty string if task_type was
   # not set (task_type did not previously exist).
   return ''
+
+
+def _get_model_dir(model_dir):
+  """Returns `model_dir` based user provided `model_dir` or `TF_CONFIG`."""
+
+  model_dir_in_tf_config = json.loads(
+      os.environ.get('TF_CONFIG') or '{}').get('model_dir', None)
+  if model_dir_in_tf_config is not None:
+    if model_dir is not None and model_dir_in_tf_config != model_dir:
+      raise ValueError(
+          '`model_dir` provided in RunConfig construct, if set, '
+          'must have the same value as the model_dir in TF_CONFIG. '
+          'model_dir: {}\nTF_CONFIG["model_dir"]: {}.\n'.format(
+              model_dir, model_dir_in_tf_config))
+
+    logging.info('Using model_dir in TF_CONFIG: %s', model_dir_in_tf_config)
+
+  return model_dir or model_dir_in_tf_config
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index 6d39a9ad13..9102e42bfb 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -223,6 +223,27 @@ class RunConfigTest(test.TestCase):
     config = run_config_lib.RunConfig(model_dir=TEST_DIR)
     self.assertEqual(TEST_DIR, config.model_dir)
 
+  def test_model_dir_in_tf_config(self):
+    tf_config = {"model_dir": TEST_DIR}
+    with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
+      run_config = run_config_lib.RunConfig()
+    self.assertEqual(TEST_DIR, run_config.model_dir)
+
+  def test_model_dir_both_in_tf_config_and_constructor(self):
+    tf_config = {"model_dir": TEST_DIR}
+    with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
+      run_config = run_config_lib.RunConfig(model_dir=TEST_DIR)
+    self.assertEqual(TEST_DIR, run_config.model_dir)
+
+  def test_model_dir_fail_if_constructor_value_mismatch_tf_config(self):
+    tf_config = {"model_dir": TEST_DIR}
+    with patch.dict("os.environ", {"TF_CONFIG": json.dumps(tf_config)}):
+      with self.assertRaisesRegexp(
+          ValueError,
+          "`model_dir` provided in RunConfig .* must have "
+          "the same value .* in TF_CONFIG"):
+        run_config_lib.RunConfig(model_dir=TEST_DIR + "/sub_dir")
+
   def test_replace(self):
     config = run_config_lib.RunConfig(
         tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
-- 
GitLab


From 9521556866c85baf702c2f934875866801aee38e Mon Sep 17 00:00:00 2001
From: Yifei Feng <yifeif@google.com>
Date: Wed, 3 May 2017 11:09:43 -0700
Subject: [PATCH 0964/1563] Keep auditwheel at 1.5.0. Nightly is failing with
 the newest auditwheel release.

---
 tensorflow/tools/ci_build/install/install_auditwheel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/install/install_auditwheel.sh b/tensorflow/tools/ci_build/install/install_auditwheel.sh
index 2538a393d3..e6f6124d56 100755
--- a/tensorflow/tools/ci_build/install/install_auditwheel.sh
+++ b/tensorflow/tools/ci_build/install/install_auditwheel.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-sudo pip3 install auditwheel
+sudo pip3 install auditwheel==1.5.0
 
 set +e
 patchelf_location=$(which patchelf)
-- 
GitLab


From 427081c11b55d494b92fa836f67ad07439096115 Mon Sep 17 00:00:00 2001
From: Mark Heffernan <meheff@google.com>
Date: Wed, 3 May 2017 10:13:00 -0800
Subject: [PATCH 0965/1563] [XLA] Account for computation output size correctly
 in HLO rematerialization. Previously in HLO rematerialization, the tuple
 elements of the output were not counted against memory use. This change fixes
 this. Also, move the accounting for the parameter to the caller of HLO
 rematerialization because the arguments to the computation are existing
 allocation prior to execution and are not part of the memory allocated
 specifically for the computation. Change: 154978404

---
 .../xla/service/hlo_rematerialization.cc      | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization.cc b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
index 44293f582e..b1ee2e46b0 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
@@ -1160,28 +1160,25 @@ StatusOr<bool> HloRematerialization::Run(
                       TuplePointsToAnalysis::Run(
                           module, /*include_loop_fusion_instructions=*/true));
 
-  // Adjust memory limit to account for the parameter and output of the entry
+  // Adjust memory limit to account for the output of the entry
   // computation. This is necessary because the per-computation accounting in
-  // MemoryUsageTracker do not include parameters and output as these are
-  // typically allocated by the caller. With this adjustment the memory limit
-  // accounts for the size of all HLO instructions (parameters, output
-  // instructions, etc).
-  auto total_size = [this](const HloInstruction* instruction) {
-    int64 total_size = 0;
-    for (const LogicalBuffer* logical_buffer :
-         points_to_analysis_->GetBuffersDefinedByInstruction(instruction)) {
-      total_size += size_function_(logical_buffer->shape());
-    }
-    return total_size;
-  };
-  const HloComputation* entry_computation = module->entry_computation();
-  memory_limit_bytes -= total_size(entry_computation->root_instruction());
-  for (const HloInstruction* param :
-       entry_computation->parameter_instructions()) {
-    memory_limit_bytes -= total_size(param);
-  }
-  VLOG(1) << "Adjusted memory limit accounting for parameters and output: "
-          << HumanReadableNumBytes(memory_limit_bytes);
+  // MemoryUsageTracker do not include output as these are typically allocated
+  // by the caller.
+  int64 module_output_size = 0;
+  ShapeUtil::ForEachSubshape(
+      module->entry_computation()->root_instruction()->shape(),
+      [&module_output_size, this](const Shape& subshape,
+                                  const ShapeIndex& /*index*/) {
+        module_output_size += size_function_(subshape);
+        return Status::OK();
+      })
+      .IgnoreError();
+
+  const int64 adjusted_memory_limit_bytes =
+      memory_limit_bytes - module_output_size;
+  VLOG(1) << "Adjusted memory limit accounting for output ("
+          << HumanReadableNumBytes(module_output_size)
+          << "): " << HumanReadableNumBytes(adjusted_memory_limit_bytes);
 
   XLA_VLOG_LINES(3, "Before HloRematerialization:\n" + module->ToString());
   // Create initial sequence of HLO instructions.
@@ -1204,8 +1201,13 @@ StatusOr<bool> HloRematerialization::Run(
         return Status::OK();
       }));
 
+  // The peak memory usage of the module equals the peak memory use of the entry
+  // computation plus the output size of the computation. This is because the
+  // peak memory for a computation does not include the output as this is
+  // typically accounted for in the caller.
   const int64 before_peak_memory =
-      computation_peak_memory_.at(module->entry_computation());
+      computation_peak_memory_.at(module->entry_computation()) +
+      module_output_size;
   VLOG(1) << "Peak memory usage of module (before): "
           << HumanReadableNumBytes(before_peak_memory);
 
@@ -1216,9 +1218,9 @@ StatusOr<bool> HloRematerialization::Run(
 
   // Subcomputations called by the entry computation will also be
   // rematerialized.
-  TF_ASSIGN_OR_RETURN(bool changed,
-                      RematerializeComputation(module->entry_computation(),
-                                               sequence, memory_limit_bytes));
+  TF_ASSIGN_OR_RETURN(bool changed, RematerializeComputation(
+                                        module->entry_computation(), sequence,
+                                        adjusted_memory_limit_bytes));
 
   // Rematerialization can introduce dead code. This occurs if all uses of an
   // instruction are replaced with rematerializations of the instruction.
@@ -1257,7 +1259,8 @@ StatusOr<bool> HloRematerialization::Run(
           << " instructions in module " << module->name() << "; "
           << net_instructions_added_ << " net instructions added";
   const int64 current_peak_memory =
-      computation_peak_memory_.at(module->entry_computation());
+      computation_peak_memory_.at(module->entry_computation()) +
+      module_output_size;
   VLOG(1) << "Peak memory usage of module now "
           << HumanReadableNumBytes(current_peak_memory) << " ("
           << current_peak_memory << " bytes), was "
-- 
GitLab


From 87ffdd2d500674c28b95abec7cb9b2f7eb0bba91 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 10:14:21 -0800
Subject: [PATCH 0966/1563] Internal change Change: 154978617

---
 third_party/ortools.BUILD |  13 +++++
 tools/tf_env_collect.sh   | 108 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 third_party/ortools.BUILD
 create mode 100644 tools/tf_env_collect.sh

diff --git a/third_party/ortools.BUILD b/third_party/ortools.BUILD
new file mode 100644
index 0000000000..61191e3d27
--- /dev/null
+++ b/third_party/ortools.BUILD
@@ -0,0 +1,13 @@
+# Google's software suite for combinatorial optimization
+
+licenses(["notice"])  # Apache2 license
+
+exports_files(["LICENSE-2.0.txt"])
+
+native.cc_library(
+    name = "linear_solver_glop",
+    deps = [
+        "@ortools_archive//linear_solver:linear_solver_glop",
+    ],
+    visibility = ["//visibility:public"],
+)
diff --git a/tools/tf_env_collect.sh b/tools/tf_env_collect.sh
new file mode 100644
index 0000000000..71b17f4b7b
--- /dev/null
+++ b/tools/tf_env_collect.sh
@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+set -u  # Check for undefined variables
+
+echo "Collecting system information..."
+
+OUTPUT_FILE=tf_env.txt
+
+echo >> $OUTPUT_FILE
+echo "== cat /etc/issue ===============================================" >> $OUTPUT_FILE
+uname -a >> $OUTPUT_FILE
+uname=`uname -s`
+if [ "$(uname)" == "Darwin" ]; then
+  echo Mac OS X `sw_vers -productVersion` >> $OUTPUT_FILE
+elif [ "$(uname)" == "Linux" ]; then
+  cat /etc/*release | grep VERSION >> $OUTPUT_FILE
+fi
+
+
+echo >> $OUTPUT_FILE
+echo '== are we in docker =============================================' >> $OUTPUT_FILE
+num=`cat /proc/1/cgroup | grep docker | wc -l`;
+if [ $num -ge 1 ]; then
+  echo "Yes" >> $OUTPUT_FILE
+else
+  echo "No" >> $OUTPUT_FILE
+fi
+
+echo >> $OUTPUT_FILE
+echo '== compiler =====================================================' >> $OUTPUT_FILE
+c++ --version &>> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== uname -a =====================================================' >> $OUTPUT_FILE
+uname -a >> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== check pips ===================================================' >> $OUTPUT_FILE
+pip list 2>&1 | grep "proto\|numpy\|tensorflow" &>> $OUTPUT_FILE
+
+
+echo >> $OUTPUT_FILE
+echo '== check for virtualenv =========================================' >> $OUTPUT_FILE
+python -c "import sys;print(hasattr(sys, \"real_prefix\"))" >> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== tensorflow import ============================================' >> $OUTPUT_FILE
+cat <<EOF > /tmp/check_tf.py
+import tensorflow as tf;
+print("tf.VERSION = %s" % tf.VERSION)
+print("tf.GIT_VERSION = %s" % tf.GIT_VERSION)
+print("tf.COMPILER_VERSION = %s" % tf.GIT_VERSION)
+with tf.Session() as sess:
+  print("Sanity check: %r" % sess.run(tf.constant([1,2,3])[:1]))
+EOF
+python /tmp/check_tf.py &>> ${OUTPUT_FILE}
+
+DEBUG_LD=libs python -c "import tensorflow"  2>>${OUTPUT_FILE} > /tmp/loadedlibs
+grep libcudnn.so /tmp/loadedlibs >> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+echo '== env ==========================================================' >> $OUTPUT_FILE
+if [ -z ${LD_LIBRARY_PATH+x} ]; then
+  echo "LD_LIBRARY_PATH is unset" >> $OUTPUT_FILE;
+else
+  echo LD_LIBRARY_PATH ${LD_LIBRARY_PATH}  >> $OUTPUT_FILE;
+fi
+if [ -z ${DYLD_LIBRARY_PATH+x} ]; then
+  echo "DYLD_LIBRARY_PATH is unset" >> $OUTPUT_FILE;
+else
+  echo DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}  >> $OUTPUT_FILE;
+fi
+
+
+echo >> $OUTPUT_FILE >> $OUTPUT_FILE
+echo '== nvidia-smi ===================================================' >> $OUTPUT_FILE
+nvidia-smi &>> $OUTPUT_FILE
+
+echo >> $OUTPUT_FILE
+
+echo '== cuda libs  ===================================================' >> $OUTPUT_FILE
+find /usr/local -type f -name 'libcudart*'  2>/dev/null | grep cuda |  grep -v "\\.cache" >> ${OUTPUT_FILE}
+find /usr/local -type f -name 'libudnn*'  2>/dev/null | grep cuda |  grep -v "\\.cache" >> ${OUTPUT_FILE}
+
+# Remove any words with google.
+mv $OUTPUT_FILE old-$OUTPUT_FILE
+grep -v -i google old-${OUTPUT_FILE} > $OUTPUT_FILE
+
+echo "Wrote environment to ${OUTPUT_FILE}. You can review the contents of that file."
+echo "and use it to populate the fields in the github issue template."
+echo
+echo "cat ${OUTPUT_FILE}"
+echo
+
-- 
GitLab


From 2e329cc8987e82a83c2cfa708a83266a76d8c833 Mon Sep 17 00:00:00 2001
From: Zader Zheng <yumaoshu@gmail.com>
Date: Thu, 4 May 2017 03:24:53 +0800
Subject: [PATCH 0967/1563] Correct self_check label in label_image example
 (#9608)

`military uniform` is the 654th label in inceptionV3 package.
---
 tensorflow/examples/label_image/main.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
index 8e3f69a6d6..e6e191bd75 100644
--- a/tensorflow/examples/label_image/main.cc
+++ b/tensorflow/examples/label_image/main.cc
@@ -307,11 +307,11 @@ int main(int argc, char* argv[]) {
   }
 
   // This is for automated testing to make sure we get the expected result with
-  // the default settings. We know that label 866 (military uniform) should be
+  // the default settings. We know that label 653 (military uniform) should be
   // the top label for the Admiral Hopper image.
   if (self_test) {
     bool expected_matches;
-    Status check_status = CheckTopLabel(outputs, 866, &expected_matches);
+    Status check_status = CheckTopLabel(outputs, 653, &expected_matches);
     if (!check_status.ok()) {
       LOG(ERROR) << "Running check failed: " << check_status;
       return -1;
-- 
GitLab


From 22586bdf900640217deac6dc826054bc6e785518 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Wed, 3 May 2017 12:25:10 -0700
Subject: [PATCH 0968/1563] Branch 154885009 (#9604)

* Enable grappler to propagate shapes through queues.
Change: 154789133

* Add whitelist support in uid of RunConfig.
Change: 154794859

* Fix a bunch of bad links and missing docs in contrib.
Change: 154820641

* Don't try to refine the shapes for a node if its inference context wasn't
successfully built by the AddNode() method.
Change: 154838211

* Fix issue related to empty bazel.rc file.
Change: 154840138

* Remove overly precise CHECK when rendering debug output for a function.

An `_Arg` node can have more than three attrs, because the runtime may
(and does) add system-defined attrs (viz. "_output_shapes") that do
not change the meaning of the op.
Change: 154850526

* Port makefile build breakage
Change: 154855106

* [TF:XLA] Try to incorporate Tensorflow node structure for large HLO GraphDefs.

This change assumes that a TF subgraph/op does not cross the boundary of a HLO
computation and always put top-level TF subgraphs/ops under HLO computations.
Change: 154855884

* Added a unit test to check what happens when 2 shapes with known rank but
unknown dimensions are merged
Change: 154856675

* [XLA] Refactor constant folding operations into a dedicated module

Refactor constant folding operations into a dedicated module, and added a new
ReplaceInstruction() API to collapse { computation->ReplaceInstruction();
changed=true}.
Change: 154857025

* Java: Docs: Update instructions for Windows.

Inspired by
http://stackoverflow.com/questions/43741775/tensorflow-in-java-running-failed
Change: 154859066

* Add more documentation for features and labels.
Change: 154859649

* Added link to high-performance models
Change: 154860213

* Navigation and index for new performance section documents.
Change: 154862215

* Fix shape mismatch between loss and weights.
Change: 154862650

* Add examples to TensorShape documentation and ran autoformatter.
Change: 154862667

* Move linking of cudnn_plugin, cublas_plugin and cufft_plugin from
stream_executor to the ops that need them.
Change: 154863520

* Properly track the persistent memory usage of lookup tables.
Change: 154866686

* Reset the inputs to ShapeRefiner::RunShapeFn so that it behaves the same every time it's called.
To properly handle queues that have populated by several enqueue ops, merge the shapes of the inputs to all the enqueue ops before calling InferenceContext::set_output_handle_shape(). This ensures that we detect incorrect queue setups (where the 2 enqueue ops might generate tensors with incompatible shapes), and that we take all the known shape information instead of that of just one of the enqueue ops.
Change: 154866747

* Making sure an error message will be produced by session_manager when a non-tensor object is passed in.
Otherwise the 'name' property is missing.
Change: 154868022

* Don't needlessly synchronize the CUDA stream in CropAndResize.
Make the op Async so we don't block an executor thread while waiting for the result of the box bounds check to be copied back to the host.
Change: 154868460

* Add contribution guidelines and standards section to CONTRIBUTING.md

Several parts are largely based on the post by @yaroslavvb at: #7443#issuecomment-279182613

Fixes #7443
Change: 154876045

* Final draft
Change: 154876563

* Final draft
Change: 154876646

* Fix losses documentation.

Fix documentation of get_total_loss() to be correct.
And add a helpful comment about a common pitfall.
Change: 154876822

* [XLA] Second change for HLO interpreter.

Extends HloEvaluator to allow evaluation of HLO Computation or single HLO instruction
with non-constant operands, by traversing the instruction in post order and keeps track of
each instruction along the way as evaluated literals.
Change: 154877580

* [tf distributions] Move the remaining whitelisted distributions to core.
Change: 154878206

* Add shape to error message.
Change: 154880260

* Revert "Fix build issue when `/usr/bin/python` path is not available (#9547)"

This reverts commit 95f37ebf0bd46c328266f65bbd16d319c0efab3d.
---
 .gitignore                                    |   1 -
 CONTRIBUTING.md                               | 137 +++++
 configure                                     |   3 +-
 tensorflow/compiler/xla/service/BUILD         |  23 +
 .../xla/service/algebraic_simplifier.cc       | 186 +-----
 .../xla/service/algebraic_simplifier_test.cc  | 133 -----
 tensorflow/compiler/xla/service/gpu/BUILD     |   2 +
 .../xla/service/hlo_constant_folding.cc       | 254 ++++++--
 .../xla/service/hlo_constant_folding.h        |   6 +-
 .../xla/service/hlo_constant_folding_test.cc  | 169 ++++++
 .../compiler/xla/service/hlo_evaluator.cc     | 254 +++++---
 .../compiler/xla/service/hlo_evaluator.h      |  81 ++-
 .../xla/service/hlo_evaluator_test.cc         |  65 +-
 tensorflow/compiler/xla/service/hlo_query.cc  |  10 +
 tensorflow/compiler/xla/service/hlo_query.h   |   4 +
 .../xla/service/hlo_tfgraph_builder.cc        |  14 +-
 .../xla/service/hlo_tfgraph_builder_test.cc   |  22 +
 tensorflow/contrib/distributions/BUILD        | 174 ------
 tensorflow/contrib/distributions/__init__.py  | 155 +++--
 .../bijectors/cholesky_outer_product_test.py  |   2 +-
 .../kernel_tests/bijectors/invert_test.py     |   2 +-
 .../ops/bijectors/bijector_test_util.py       |   2 +-
 .../contrib/distributions/python/ops/chi2.py  |   2 +-
 .../distributions/python/ops/mixture.py       |   2 +-
 .../python/ops/vector_student_t.py            |   2 +-
 .../learn/python/learn/estimators/head.py     |  11 +-
 .../python/learn/estimators/head_test.py      |  30 +-
 .../python/learn/estimators/run_config.py     |  26 +-
 .../learn/estimators/run_config_test.py       |  45 ++
 .../learn/python/learn/learn_runner_test.py   |   3 +-
 tensorflow/contrib/losses/__init__.py         |  24 +-
 .../contrib/losses/python/losses/__init__.py  | 120 +---
 .../hexagon_graph_execution/Makefile.in       |   1 -
 tensorflow/contrib/seq2seq/__init__.py        |  56 +-
 .../seq2seq/python/ops/attention_wrapper.py   |   1 +
 .../contrib/seq2seq/python/ops/helper.py      |   4 +-
 .../core/common_runtime/shape_refiner.cc      | 235 +++++---
 .../core/common_runtime/shape_refiner.h       |   8 +
 .../core/common_runtime/shape_refiner_test.cc |  33 +
 tensorflow/core/framework/function.cc         |   2 +-
 tensorflow/core/framework/shape_inference.h   |  57 +-
 .../core/framework/shape_inference_test.cc    |   5 +
 tensorflow/core/grappler/clusters/BUILD       |   1 +
 .../core/grappler/clusters/single_machine.cc  |  48 +-
 .../core/grappler/clusters/single_machine.h   |   2 +
 .../grappler/clusters/single_machine_test.cc  | 115 ++++
 tensorflow/core/grappler/costs/BUILD          |   4 +-
 .../core/grappler/costs/graph_properties.cc   |  73 +++
 .../grappler/costs/graph_properties_test.cc   |  98 +++
 tensorflow/core/kernels/BUILD                 |   9 +-
 tensorflow/core/kernels/crop_and_resize_op.cc | 565 ++++++++++--------
 tensorflow/core/kernels/crop_and_resize_op.h  |   8 +-
 .../core/kernels/crop_and_resize_op_gpu.cu.cc |   2 +-
 .../core/kernels/crop_and_resize_op_test.cc   |   6 +-
 tensorflow/core/kernels/lookup_table_op.h     |  13 +-
 tensorflow/core/ops/data_flow_ops.cc          |  12 +-
 .../core/platform/default/build_config/BUILD  |  16 +
 .../api_guides/python/contrib.graph_editor.md |  20 +-
 .../api_guides/python/contrib.linalg.md       |   2 +-
 .../api_guides/python/contrib.losses.md       |  15 +-
 tensorflow/docs_src/get_started/tflearn.md    |   2 +-
 tensorflow/docs_src/install/install_java.md   |  11 +-
 tensorflow/docs_src/performance/benchmarks.md | 128 ++--
 tensorflow/docs_src/performance/index.md      |  12 +-
 tensorflow/docs_src/performance/leftnav_files |   5 +-
 .../docs_src/performance/performance_guide.md |   9 +-
 .../performance/performance_models.md         | 484 +++++++--------
 tensorflow/python/estimator/estimator.py      |  16 +-
 tensorflow/python/framework/tensor_shape.py   |  52 +-
 .../python/kernel_tests/distributions/BUILD   | 174 ++++++
 .../distributions}/bernoulli_test.py          |  30 +-
 .../kernel_tests/distributions}/beta_test.py  |  43 +-
 .../distributions}/categorical_test.py        |   2 +-
 .../dirichlet_multinomial_test.py             |   5 +-
 .../distributions}/dirichlet_test.py          |  35 +-
 .../distributions}/exponential_test.py        |  47 +-
 .../kernel_tests/distributions}/gamma_test.py |  90 ++-
 .../distributions}/laplace_test.py            |  80 ++-
 .../distributions}/multinomial_test.py        |  56 +-
 .../distributions}/student_t_test.py          | 131 ++--
 .../distributions}/uniform_test.py            |  29 +-
 tensorflow/python/ops/distributions/BUILD     |   1 +
 .../ops/distributions}/bernoulli.py           |   0
 .../ops => python/ops/distributions}/beta.py  |   0
 .../ops/distributions}/categorical.py         |   0
 .../distributions/conditional_distribution.py |   2 +-
 .../ops/distributions}/dirichlet.py           |   0
 .../distributions}/dirichlet_multinomial.py   |   0
 .../ops/distributions}/exponential.py         |   2 +-
 .../ops => python/ops/distributions}/gamma.py |   0
 .../ops/distributions}/laplace.py             |   0
 .../ops/distributions}/multinomial.py         |   0
 tensorflow/python/ops/distributions/normal.py |   6 +-
 .../ops/distributions}/student_t.py           |  12 +-
 .../ops/distributions}/uniform.py             |   0
 tensorflow/python/ops/losses/util.py          |   8 +-
 .../python/ops/weights_broadcast_ops.py       |   5 +-
 tensorflow/python/training/session_manager.py |  24 +-
 .../python/training/session_manager_test.py   |  17 +
 tensorflow/tensorflow.bzl                     |   2 +-
 tensorflow/tools/docs/generate_lib.py         |   1 -
 tools/bazel.rc                                |  30 +
 102 files changed, 3141 insertions(+), 1785 deletions(-)
 create mode 100644 tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/bernoulli_test.py (94%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/beta_test.py (94%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/categorical_test.py (99%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/dirichlet_multinomial_test.py (99%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/dirichlet_test.py (94%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/exponential_test.py (88%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/gamma_test.py (93%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/laplace_test.py (92%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/multinomial_test.py (87%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/student_t_test.py (83%)
 rename tensorflow/{contrib/distributions/python/kernel_tests => python/kernel_tests/distributions}/uniform_test.py (93%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/bernoulli.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/beta.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/categorical.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/dirichlet.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/dirichlet_multinomial.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/exponential.py (98%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/gamma.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/laplace.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/multinomial.py (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/student_t.py (97%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/uniform.py (100%)
 create mode 100644 tools/bazel.rc

diff --git a/.gitignore b/.gitignore
index 900e5a53cb..d8ecef1e1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ node_modules
 /.tf_configure.bazelrc
 /bazel-*
 /third_party/py/numpy/numpy_include
-/tools/bazel.rc
 /tools/python_bin_path.sh
 /tools/git/gen
 /util/python/python_include
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5ae5c0fbbc..c36ef1ecd3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,3 +27,140 @@ contributions, often because we probably won't get to them right now. If you
 decide to start on an issue, leave a comment so that other people know that
 you're working on it. If you want to help out, but not alone, use the issue
 comment thread to coordinate.
+
+### Contribution guidelines and standards
+
+Before sending your pull request for
+[review](https://github.com/tensorflow/tensorflow/pulls),
+make sure your changes are consistent with the guidelines and follow the
+TensorFlow coding style.
+
+#### General guidelines and philosophy for contribution
+
+* Include unit tests when you contribute new features, as they help to
+  a) prove that your code works correctly, b) guard against future breaking
+  changes to lower the maintenance cost.
+* Bug fixes also generally require unit tests, because the presense of bugs
+  usually indicates insufficient test coverage.
+* Keep API compatibility in mind when you change code in core TensorFlow,
+  e.g., code in [tensorflow/core](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/core) and  [tensorflow/python](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/python).
+  TensorFlow has reached version 1 and hence cannot make
+  non-backward-compatible API changes without a major release. Reviewers of your
+  pull request will comment on any API compatibility issues.
+* When you contribute a new feature to TensorFlow, the maintenance burden is (by
+  default) transferred to the TensorFlow team. This means that benefit of
+  contribution must be compared against the cost of maintaining the feature.
+* Full new features (e.g., a new op implementing a cutting-edge algorithm)
+  typically will live in
+  [tensorflow/contrib](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib)
+  to get some airtime before decision is made regarding whether they are to be
+  migrated to the core.
+
+#### License
+
+Include a license at the top of new files.
+
+* [C/C++ license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/framework/op.cc#L1)
+* [Python license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/ops/nn.py#L1)
+* [Java license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/java/src/main/java/org/tensorflow/Graph.java#L1)
+* [Go license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/go/operation.go#L1)
+* [Bash license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/ci_build/ci_sanity.sh#L2)
+* [HTML license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/dist/index.html#L2)
+* [JavaScript/TypeScript license example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/components/tf_backend/backend.ts#L1)
+
+Bazel BUILD files also need to include a license section, e.g.,
+[BUILD example](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/BUILD#L61).
+
+#### C++ coding style
+
+Changes to TensorFlow C++ code should conform to
+[Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html).
+
+Use `clang-tidy` to check your C/C++ changes. To install clang-tidy on ubuntu:16.04, do:
+
+```bash
+apt-get install -y clang-tidy
+```
+
+You can check a C/C++ file by doing:
+
+
+```bash
+clang-format <my_cc_file> --style=google > /tmp/my_cc_file.cc
+diff <my_cc_file> /tmp/my_cc_file.cc
+```
+
+#### Python coding style
+
+Changes to TensorFlow Python code should conform to
+[Google Python Style Guide](https://google.github.io/styleguide/pyguide.html)
+
+Use `pylint` to check your Python changes. To install `pylint` and
+retrieve TensorFlow's custom style definition:
+
+```bash
+pip install pylint
+wget -O /tmp/pylintrc https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/tools/ci_build/pylintrc
+```
+
+To check a file with `pylint`:
+
+```bash
+pylint --rcfile=/tmp/pylintrc myfile.py
+```
+
+#### Coding style for other languages
+
+* [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)
+* [Google JavaScript Style Guide](https://google.github.io/styleguide/jsguide.html)
+* [Google Shell Style Guide](https://google.github.io/styleguide/shell.xml)
+
+#### Running sanity check
+
+If you have Docker installed on your system, you can perform a sanity check on
+your changes by running the command:
+
+```bash
+tensorflow/tools/ci_build/ci_build.sh CPU tensorflow/tools/ci_build/ci_sanity.sh
+```
+
+This will catch most license, Python coding style and BUILD file issues that
+may exist in your changes.
+
+#### Running unit tests
+
+There are two ways to run TensorFlow unit tests.
+
+1. Using tools and libraries installed directly on your system.
+
+   Refer to the
+   [CPU-only developer Dockerfile](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/docker/Dockerfile.devel) and
+   [GPU developer Dockerfile](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/docker/Dockerfile.devel-gpu)
+   for the required packages. Alternatively, use the said
+   [Docker images](https://hub.docker.com/r/tensorflow/tensorflow/tags/), e.g.,
+   `tensorflow/tensorflow:nightly-devel` and `tensorflow/tensorflow:nightly-devel-gpu`
+   for development to avoid installing the packages directly on your system.
+
+   Once you have the packages installed, you can run a specific unit test in
+   bazel by doing as follows:
+
+   If the tests are to be run on GPU, add CUDA paths to LD_LIBRARY_PATH and add
+   the `cuda` option flag
+
+   ```bash
+   export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH"
+
+   export flags="--config=opt --config=cuda -k"
+   ```
+
+   For example, to run all tests under tensorflow/python, do:
+
+   ```bash
+   bazel test ${flags} //tensorflow/python/...
+   ```
+
+2. Using Docker and TensorFlow's CI scripts.
+
+   See
+   [TensorFlow Builds](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/tools/ci_build) for details.
+
diff --git a/configure b/configure
index 1844799225..e44939bfd6 100755
--- a/configure
+++ b/configure
@@ -353,9 +353,8 @@ if [[ "$TF_NEED_VERBS" == "1" ]]; then
 fi
 
 # Append CC optimization flags to bazel.rc
-echo >> tools/bazel.rc
 for opt in $CC_OPT_FLAGS; do
-  echo "build:opt --cxxopt=$opt --copt=$opt" >> tools/bazel.rc
+  write_to_bazelrc 'build:opt --cxxopt=$opt --copt=$opt'
 done
 
 # Run the gen_git_source to create links where bazel can track dependencies for
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 05fc480936..bdb69b6e55 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -80,6 +80,8 @@ cc_library(
         ":hlo_query",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:status",
+        "//tensorflow/compiler/xla:status_macros",
         "//tensorflow/compiler/xla:statusor",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
@@ -1418,6 +1420,27 @@ cc_library(
     ],
 )
 
+cc_test(
+    name = "hlo_constant_folding_test",
+    srcs = ["hlo_constant_folding_test.cc"],
+    deps = [
+        ":cpu_plugin",
+        ":hlo",
+        ":hlo_constant_folding",
+        ":hlo_matchers",
+        ":hlo_pass",
+        "//tensorflow/compiler/xla:literal_util",
+        "//tensorflow/compiler/xla:shape_util",
+        "//tensorflow/compiler/xla:test",
+        "//tensorflow/compiler/xla:types",
+        "//tensorflow/compiler/xla:util",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/tests:hlo_test_base",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:test_main",
+    ],
+)
+
 cc_library(
     name = "device_memory_allocator",
     srcs = ["device_memory_allocator.cc"],
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 124a949bac..d6dce9745b 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -219,12 +219,6 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
                                    HloInstruction* operand, HloInstruction* max,
                                    HloInstruction* max_operand);
 
-  // Tries to constant fold a concatenate operation, and returns true if the
-  // operation has been performed. An error status is returned in case of error.
-  StatusOr<bool> TryConcatenateConstantFold(
-      HloInstruction* concatenate,
-      tensorflow::gtl::ArraySlice<HloInstruction*> operands);
-
   // A Reshape or Broadcast that feeds an element-wise operation with a unique
   // non-scalar operand can sink to after the operation.
   StatusOr<bool> TryToSinkReshapeOrBroadcastAfterOpWithUniqueNonScalarOperand(
@@ -236,12 +230,23 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
   Status ReplaceWithNewInstruction(
       HloInstruction* old_instruction,
       std::unique_ptr<HloInstruction> new_instruction) {
-    TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
+    TF_RETURN_IF_ERROR(computation_->ReplaceWithNewInstruction(
         old_instruction, std::move(new_instruction)));
     changed_ = true;
     return Status::OK();
   }
 
+  // Replaces the existing HLO instruction old_instruction, with
+  // new_instruction, and marks the optimizer status as changed.
+  // Returns the Status representing the result of the replace operation.
+  Status ReplaceInstruction(HloInstruction* old_instruction,
+                            HloInstruction* new_instruction) {
+    TF_RETURN_IF_ERROR(
+        computation_->ReplaceInstruction(old_instruction, new_instruction));
+    changed_ = true;
+    return Status::OK();
+  }
+
   // Current HloComputation instance the AlgebraicSimplifierVisitor is
   // traversing.
   HloComputation* computation_;
@@ -290,8 +295,7 @@ void AlgebraicSimplifierVisitor::ReplaceWithBitcast(
   auto bitcast = computation_->AddInstruction(
       HloInstruction::CreateUnary(instruction->shape(), HloOpcode::kBitcast,
                                   instruction->mutable_operand(0)));
-  TF_CHECK_OK(computation_->ReplaceInstruction(instruction, bitcast));
-  changed_ = true;
+  TF_CHECK_OK(ReplaceInstruction(instruction, bitcast));
 }
 
 bool AlgebraicSimplifierVisitor::ReplaceInstructionIfSameShape(
@@ -299,9 +303,7 @@ bool AlgebraicSimplifierVisitor::ReplaceInstructionIfSameShape(
   if (!SameShape(old_instruction, new_instruction)) {
     return false;
   }
-  TF_CHECK_OK(
-      computation_->ReplaceInstruction(old_instruction, new_instruction));
-  changed_ = true;
+  TF_CHECK_OK(ReplaceInstruction(old_instruction, new_instruction));
   return true;
 }
 
@@ -329,63 +331,6 @@ Status AlgebraicSimplifierVisitor::HandleCopy(HloInstruction* copy,
   return Status::OK();
 }
 
-StatusOr<bool> AlgebraicSimplifierVisitor::TryConcatenateConstantFold(
-    HloInstruction* concatenate,
-    tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
-  if (operands[0]->opcode() == HloOpcode::kConstant) {
-    // If all the operands of a concatenate are constant, fold them into a
-    // single constant tensor.
-    // The concatenate dimension is going to be the sum of all the concatenate
-    // dimensions.
-    int64 concat_dim = concatenate->dimensions()[0];
-    const Shape& reference_shape = operands[0]->shape();
-    if (ShapeUtil::IsTuple(reference_shape)) {
-      VLOG(5) << "Tuples not currently supported by the concatenate constant"
-                 " folder";
-      return false;
-    }
-    int64 rank = ShapeUtil::Rank(reference_shape);
-    std::vector<int64> concat_dimensions(reference_shape.dimensions().begin(),
-                                         reference_shape.dimensions().end());
-    if (concat_dim < 0) {
-      concat_dim += rank;
-    }
-    for (int64 i = 1; i < operands.size(); ++i) {
-      const Shape& operand_shape = operands[i]->shape();
-      if (operands[i]->opcode() != HloOpcode::kConstant ||
-          ShapeUtil::IsTuple(operand_shape)) {
-        return false;
-      }
-      // Accumulate the concat dimension from all tensors taking part to the
-      // operation.
-      concat_dimensions[concat_dim] +=
-          ShapeUtil::GetDimension(operand_shape, concat_dim);
-    }
-
-    auto literal = LiteralUtil::CreateFromDimensions(
-        reference_shape.element_type(), concat_dimensions);
-    std::vector<int64> source_indices(rank, 0);
-    std::vector<int64> dest_indices(concat_dimensions.size(), 0);
-    for (auto operand : operands) {
-      const Shape& operand_shape = operand->shape();
-      Status status = LiteralUtil::Copy(
-          operand->literal(), source_indices, literal.get(), dest_indices,
-          AsInt64Slice(operand_shape.dimensions()));
-      if (!status.ok()) {
-        VLOG(1) << "Error while creating concatenated literal : " << status;
-        return false;
-      }
-      dest_indices[concat_dim] +=
-          ShapeUtil::GetDimension(operand_shape, concat_dim);
-    }
-    TF_CHECK_OK(computation_->ReplaceWithNewInstruction(
-        concatenate, HloInstruction::CreateConstant(std::move(literal))));
-    changed_ = true;
-    return true;
-  }
-  return false;
-}
-
 Status AlgebraicSimplifierVisitor::HandleConcatenate(
     HloInstruction* concatenate,
     tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
@@ -394,13 +339,6 @@ Status AlgebraicSimplifierVisitor::HandleConcatenate(
     ReplaceInstructionIfSameShape(concatenate, operands[0]);
     return Status::OK();
   }
-  // If all the concatenate operands are constant, this will get folded into a
-  // new constant literal.
-  TF_ASSIGN_OR_RETURN(bool folded,
-                      TryConcatenateConstantFold(concatenate, operands));
-  if (folded) {
-    return Status::OK();
-  }
   // Filter out and remove empty operands.
   std::vector<HloInstruction*> nonempty_operands;
   for (HloInstruction* operand : operands) {
@@ -799,65 +737,6 @@ Status AlgebraicSimplifierVisitor::HandleBroadcast(HloInstruction* broadcast) {
   return Status::OK();
 }
 
-template <PrimitiveType primitive_src_type, PrimitiveType primitive_dest_type>
-static std::unique_ptr<HloInstruction> ConvertIfTypesMatch(
-    const Literal& src_literal) {
-  CHECK_EQ(primitive_src_type, src_literal.shape().element_type());
-
-  return HloInstruction::CreateConstant(
-      LiteralUtil::Convert<typename primitive_util::PrimitiveTypeToNative<
-                               primitive_src_type>::type,
-                           typename primitive_util::PrimitiveTypeToNative<
-                               primitive_dest_type>::type>(src_literal));
-}
-
-template <PrimitiveType primitive_src_type>
-static std::unique_ptr<HloInstruction> ConvertIfDestTypeMatches(
-    const Literal& src_literal, PrimitiveType primitive_dest_type) {
-  switch (primitive_dest_type) {
-#define CONVERT_IF_TYPES_MATCH(type) \
-  case (type):                       \
-    return ConvertIfTypesMatch<primitive_src_type, (type)>(src_literal);
-    CONVERT_IF_TYPES_MATCH(PRED)
-    CONVERT_IF_TYPES_MATCH(S8)
-    CONVERT_IF_TYPES_MATCH(S32)
-    CONVERT_IF_TYPES_MATCH(S64)
-    CONVERT_IF_TYPES_MATCH(U8)
-    CONVERT_IF_TYPES_MATCH(U32)
-    CONVERT_IF_TYPES_MATCH(U64)
-    CONVERT_IF_TYPES_MATCH(F32)
-    CONVERT_IF_TYPES_MATCH(F64)
-#undef CONVERT_IF_TYPES_MATCH
-    // Other types are not yet supported.
-    default:
-      LOG(FATAL) << "Unimplemented: ConvertIfDestTypeMatches for type "
-                 << PrimitiveType_Name(src_literal.shape().element_type());
-  }
-}
-
-static std::unique_ptr<HloInstruction> ConvertIfSrcTypeMatches(
-    const Literal& src_literal, PrimitiveType primitive_dest_type) {
-  switch (src_literal.shape().element_type()) {
-#define CONVERT_IF_DEST_TYPE_MATCHES(type) \
-  case (type):                             \
-    return ConvertIfDestTypeMatches<(type)>(src_literal, primitive_dest_type);
-    CONVERT_IF_DEST_TYPE_MATCHES(PRED)
-    CONVERT_IF_DEST_TYPE_MATCHES(S8)
-    CONVERT_IF_DEST_TYPE_MATCHES(S32)
-    CONVERT_IF_DEST_TYPE_MATCHES(S64)
-    CONVERT_IF_DEST_TYPE_MATCHES(U8)
-    CONVERT_IF_DEST_TYPE_MATCHES(U32)
-    CONVERT_IF_DEST_TYPE_MATCHES(U64)
-    CONVERT_IF_DEST_TYPE_MATCHES(F32)
-    CONVERT_IF_DEST_TYPE_MATCHES(F64)
-#undef CONVERT_IF_DEST_TYPE_MATCHES
-    // Other types are not yet supported.
-    default:
-      LOG(FATAL) << "Unimplemented: ConvertIfSrcTypeMatches for type "
-                 << PrimitiveType_Name(src_literal.shape().element_type());
-  }
-}
-
 // A conversion to the same element type as the operand is a nop and can be
 // removed.  A conversion of a constant can be simplified by making a new
 // constant.
@@ -866,14 +745,7 @@ Status AlgebraicSimplifierVisitor::HandleConvert(HloInstruction* convert,
   PrimitiveType src_type = operand->shape().element_type();
   PrimitiveType dest_type = convert->shape().element_type();
   if (src_type == dest_type) {
-    changed_ = true;
-    return computation_->ReplaceInstruction(convert, operand);
-  }
-  if (operand->opcode() == HloOpcode::kConstant) {
-    const Literal& src_literal = operand->literal();
-    std::unique_ptr<HloInstruction> new_constant =
-        ConvertIfSrcTypeMatches(src_literal, dest_type);
-    return ReplaceWithNewInstruction(convert, std::move(new_constant));
+    return ReplaceInstruction(convert, operand);
   }
   return Status::OK();
 }
@@ -1080,8 +952,7 @@ Status AlgebraicSimplifierVisitor::HandleReshape(HloInstruction* reshape) {
   // Delete no-op reshapes, i.e. where shape = operand shape.
   if (SameShape(reshape, operand)) {
     VLOG(10) << "deleting no-op reshape";
-    changed_ = true;
-    return computation_->ReplaceInstruction(reshape, operand);
+    return ReplaceInstruction(reshape, operand);
   }
 
   // Merge reshapes.
@@ -1131,8 +1002,7 @@ Status AlgebraicSimplifierVisitor::HandleReverse(HloInstruction* reverse,
   };
   if (std::all_of(reverse->dimensions().begin(), reverse->dimensions().end(),
                   dim_is_one)) {
-    changed_ = true;
-    return computation_->ReplaceInstruction(reverse, operand);
+    return ReplaceInstruction(reverse, operand);
   }
   return Status::OK();
 }
@@ -1143,21 +1013,6 @@ Status AlgebraicSimplifierVisitor::HandleSlice(HloInstruction* slice,
   if (ReplaceInstructionIfSameShape(slice, operand)) {
     return Status::OK();
   }
-  if (operand->opcode() == HloOpcode::kConstant) {
-    const Shape& shape = slice->shape();
-    auto literal = LiteralUtil::CreateFromDimensions(
-        shape.element_type(), AsInt64Slice(shape.dimensions()));
-    std::vector<int64> dest_indices(slice->slice_starts().size(), 0);
-    Status status = LiteralUtil::Copy(operand->literal(), slice->slice_starts(),
-                                      literal.get(), dest_indices,
-                                      AsInt64Slice(shape.dimensions()));
-    if (status.ok()) {
-      TF_CHECK_OK(ReplaceWithNewInstruction(
-          slice, HloInstruction::CreateConstant(std::move(literal))));
-    } else {
-      VLOG(1) << "Error while creating sliced literal : " << status;
-    }
-  }
   return Status::OK();
 }
 
@@ -1247,8 +1102,7 @@ Status AlgebraicSimplifierVisitor::HandleTranspose(HloInstruction* transpose) {
   if (std::is_sorted(transpose->dimensions().begin(),
                      transpose->dimensions().end())) {
     VLOG(10) << "deleting no-op transpose";
-    changed_ = true;
-    return computation_->ReplaceInstruction(transpose, operand);
+    return ReplaceInstruction(transpose, operand);
   }
 
   if (HloOpcode::kTranspose == operand->opcode()) {
@@ -1379,9 +1233,7 @@ Status AlgebraicSimplifierVisitor::HandleConvolution(
   auto new_rhs = add_bitcast(new_filter_shape, rhs);
   auto dot = computation_->AddInstruction(HloInstruction::CreateBinary(
       dot_output_shape, HloOpcode::kDot, new_lhs, new_rhs));
-  changed_ = true;
-  return computation_->ReplaceInstruction(convolution,
-                                          add_bitcast(convolution_shape, dot));
+  return ReplaceInstruction(convolution, add_bitcast(convolution_shape, dot));
 }
 
 bool AlgebraicSimplifierVisitor::TransformToClampIfSameShape(
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index 0cce076da5..f4b42055b7 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -466,75 +466,6 @@ TEST_F(AlgebraicSimplifierTest, ConvertBetweenSameType) {
   EXPECT_THAT(computation->root_instruction(), input);
 }
 
-TEST_F(AlgebraicSimplifierTest, ConvertF32ToS64) {
-  HloComputation::Builder builder(TestName());
-  HloInstruction* input = builder.AddInstruction(
-      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
-  builder.AddInstruction(
-      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {}), input));
-
-  auto module = MakeUnique<HloModule>(TestName());
-  auto computation = module->AddEntryComputation(builder.Build());
-
-  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-
-  EXPECT_THAT(computation->root_instruction(), op::Constant());
-  EXPECT_EQ(LiteralUtil::GetFirstElement<int64>(
-                computation->root_instruction()->literal()),
-            42);
-}
-
-TEST_F(AlgebraicSimplifierTest, ConvertS64ToF32) {
-  HloComputation::Builder builder(TestName());
-  HloInstruction* input = builder.AddInstruction(
-      HloInstruction::CreateConstant(LiteralUtil::CreateR0<int64>(42)));
-  builder.AddInstruction(
-      HloInstruction::CreateConvert(ShapeUtil::MakeShape(F32, {}), input));
-
-  auto module = MakeUnique<HloModule>(TestName());
-  auto computation = module->AddEntryComputation(builder.Build());
-
-  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-
-  EXPECT_THAT(computation->root_instruction(), op::Constant());
-  EXPECT_EQ(LiteralUtil::GetFirstElement<float>(
-                computation->root_instruction()->literal()),
-            42.0f);
-}
-
-TEST_F(AlgebraicSimplifierTest, ConvertF32ArrayToS64Array) {
-  HloComputation::Builder builder(TestName());
-  HloInstruction* input = builder.AddInstruction(HloInstruction::CreateConstant(
-      LiteralUtil::CreateR1<float>({42.0f, 19.0f})));
-  builder.AddInstruction(
-      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {2}), input));
-
-  auto module = MakeUnique<HloModule>(TestName());
-  auto computation = module->AddEntryComputation(builder.Build());
-
-  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
-
-  EXPECT_THAT(computation->root_instruction(), op::Constant());
-  EXPECT_EQ(
-      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {0}),
-      42);
-  EXPECT_EQ(
-      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {1}),
-      19);
-}
-
 // Test that copies are removed.
 TEST_F(AlgebraicSimplifierTest, RemoveCopy) {
   Shape r0f32 = ShapeUtil::MakeShape(F32, {});
@@ -1666,69 +1597,5 @@ TEST_F(AlgebraicSimplifierTest, IteratorInvalidation) {
   ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
 }
 
-TEST_F(AlgebraicSimplifierTest, Concatenate) {
-  const struct TestConfig {
-    int concat_dimension;
-    tensorflow::gtl::ArraySlice<int64> dimensions;
-    tensorflow::gtl::ArraySlice<int64> concat_sizes;
-  } test_configs[] = {
-      {1, {11, 0, 7, 5, 9}, {2, 5, 7, 11}},
-      {3, {1, 4, 17, 0, 8}, {1, 3, 9, 12}},
-  };
-
-  for (auto& test_config : test_configs) {
-    HloComputation::Builder builder(TestName());
-    std::vector<int64> dimensions(test_config.dimensions.begin(),
-                                  test_config.dimensions.end());
-    int64 concat_size = 0;
-    std::vector<HloInstruction*> operands;
-    for (auto csize : test_config.concat_sizes) {
-      dimensions[test_config.concat_dimension] = csize;
-      concat_size += csize;
-      auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
-      HloInstruction* insn = builder.AddInstruction(
-          HloInstruction::CreateConstant(std::move(literal)));
-      operands.push_back(insn);
-    }
-    dimensions[test_config.concat_dimension] = concat_size;
-    Shape shape = ShapeUtil::MakeShape(F32, dimensions);
-    builder.AddInstruction(HloInstruction::CreateConcatenate(
-        shape, operands, test_config.concat_dimension));
-    HloModule module(TestName());
-    auto computation = module.AddEntryComputation(builder.Build());
-
-    AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                   non_bitcasting_callback());
-    ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-
-    HloInstruction* root = computation->root_instruction();
-    EXPECT_EQ(root->opcode(), HloOpcode::kConstant);
-    EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
-  }
-}
-
-TEST_F(AlgebraicSimplifierTest, Slice) {
-  HloComputation::Builder builder(TestName());
-  const int64 dimensions[] = {11, 8, 7, 5, 9};
-  const int64 slice_start[] = {4, 2, 3, 1, 5};
-  const int64 slice_limits[] = {10, 8, 6, 5, 9};
-  auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
-  HloInstruction* lit_insn = builder.AddInstruction(
-      HloInstruction::CreateConstant(std::move(literal)));
-  Shape shape = ShapeUtil::MakeShape(F32, {6, 6, 3, 4, 4});
-  builder.AddInstruction(
-      HloInstruction::CreateSlice(shape, lit_insn, slice_start, slice_limits));
-  HloModule module(TestName());
-  auto computation = module.AddEntryComputation(builder.Build());
-
-  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
-                                 non_bitcasting_callback());
-  ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
-
-  HloInstruction* root = computation->root_instruction();
-  EXPECT_EQ(root->opcode(), HloOpcode::kConstant);
-  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
-}
-
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/gpu/BUILD b/tensorflow/compiler/xla/service/gpu/BUILD
index 1fdbcfe564..d26f415fd4 100644
--- a/tensorflow/compiler/xla/service/gpu/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/BUILD
@@ -264,6 +264,8 @@ cc_library(
         "//tensorflow/compiler/xla/service:tuple_points_to_analysis",
         "//tensorflow/core:lib",
         "//tensorflow/core:stream_executor_no_cuda",
+        "//tensorflow/core/platform/default/build_config:cublas_plugin",
+        "//tensorflow/core/platform/default/build_config:cudnn_plugin",
         "//tensorflow/core/platform/default/build_config:stream_executor_cuda",
     ],
 )
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding.cc b/tensorflow/compiler/xla/service/hlo_constant_folding.cc
index 9a5345dc13..cb0a99d773 100644
--- a/tensorflow/compiler/xla/service/hlo_constant_folding.cc
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding.cc
@@ -15,16 +15,14 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/hlo_constant_folding.h"
 
-#include <list>
-#include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
@@ -34,52 +32,222 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 
 namespace xla {
+namespace {
+
+template <PrimitiveType primitive_src_type, PrimitiveType primitive_dest_type>
+static std::unique_ptr<Literal> ConvertIfTypesMatch(
+    const Literal& src_literal) {
+  CHECK_EQ(primitive_src_type, src_literal.shape().element_type());
+  return LiteralUtil::Convert<
+      typename primitive_util::PrimitiveTypeToNative<primitive_src_type>::type,
+      typename primitive_util::PrimitiveTypeToNative<
+          primitive_dest_type>::type>(src_literal);
+}
+
+template <PrimitiveType primitive_src_type>
+static std::unique_ptr<Literal> ConvertIfDestTypeMatches(
+    const Literal& src_literal, PrimitiveType primitive_dest_type) {
+  switch (primitive_dest_type) {
+#define CONVERT_IF_TYPES_MATCH(type) \
+  case (type):                       \
+    return ConvertIfTypesMatch<primitive_src_type, (type)>(src_literal);
+    CONVERT_IF_TYPES_MATCH(PRED)
+    CONVERT_IF_TYPES_MATCH(S8)
+    CONVERT_IF_TYPES_MATCH(S32)
+    CONVERT_IF_TYPES_MATCH(S64)
+    CONVERT_IF_TYPES_MATCH(U8)
+    CONVERT_IF_TYPES_MATCH(U32)
+    CONVERT_IF_TYPES_MATCH(U64)
+    CONVERT_IF_TYPES_MATCH(F32)
+    CONVERT_IF_TYPES_MATCH(F64)
+#undef CONVERT_IF_TYPES_MATCH
+    // Other types are not yet supported.
+    default:
+      LOG(FATAL) << "Unimplemented: ConvertIfDestTypeMatches for type "
+                 << PrimitiveType_Name(src_literal.shape().element_type());
+  }
+}
+
+static std::unique_ptr<Literal> ConvertIfSrcTypeMatches(
+    const Literal& src_literal, PrimitiveType primitive_dest_type) {
+  switch (src_literal.shape().element_type()) {
+#define CONVERT_IF_DEST_TYPE_MATCHES(type) \
+  case (type):                             \
+    return ConvertIfDestTypeMatches<(type)>(src_literal, primitive_dest_type);
+    CONVERT_IF_DEST_TYPE_MATCHES(PRED)
+    CONVERT_IF_DEST_TYPE_MATCHES(S8)
+    CONVERT_IF_DEST_TYPE_MATCHES(S32)
+    CONVERT_IF_DEST_TYPE_MATCHES(S64)
+    CONVERT_IF_DEST_TYPE_MATCHES(U8)
+    CONVERT_IF_DEST_TYPE_MATCHES(U32)
+    CONVERT_IF_DEST_TYPE_MATCHES(U64)
+    CONVERT_IF_DEST_TYPE_MATCHES(F32)
+    CONVERT_IF_DEST_TYPE_MATCHES(F64)
+#undef CONVERT_IF_DEST_TYPE_MATCHES
+    // Other types are not yet supported.
+    default:
+      LOG(FATAL) << "Unimplemented: ConvertIfSrcTypeMatches for type "
+                 << PrimitiveType_Name(src_literal.shape().element_type());
+  }
+}
+
+}  // namespace
+
+// ConstantFolderVisitor traverses the HLO computation and reduces certain
+// constant graph sections, to literals.
+class ConstantFolderVisitor : public DfsHloVisitorWithDefault {
+ public:
+  // Default visitor action is to do nothing and return OK.
+  Status DefaultAction(HloInstruction* /*hlo_instruction*/) override {
+    return Status::OK();
+  }
+
+  Status HandleConcatenate(
+      HloInstruction* concatenate,
+      tensorflow::gtl::ArraySlice<HloInstruction*> operands) override;
+
+  Status HandleConvert(HloInstruction* convert,
+                       HloInstruction* operand) override;
+
+  Status HandleReshape(HloInstruction* reshape) override;
+
+  Status HandleSlice(HloInstruction* slice, HloInstruction* operand) override;
+
+  Status HandleTranspose(HloInstruction* transpose) override;
+
+  // Returns whether a constant folding operation has occurred.
+  const bool changed() const { return changed_; }
+
+  // Runs the visitor on a computation and returns whether any changes were
+  // performed.
+  static StatusOr<bool> Run(HloComputation* computation);
+
+ private:
+  ConstantFolderVisitor() = default;
+
+  // Replaces the existing HLO instruction old_instruction, with a literal,
+  // and marks the optimizer status as changed.
+  // Returns the Status representing the result of the replace operation.
+  Status ReplaceWithConstant(HloInstruction* old_instruction,
+                             std::unique_ptr<Literal> literal) {
+    TF_RETURN_IF_ERROR(old_instruction->parent()->ReplaceWithNewInstruction(
+        old_instruction, HloInstruction::CreateConstant(std::move(literal))));
+    changed_ = true;
+    return Status::OK();
+  }
+
+  // Whether any constant folding operations have occurred.
+  bool changed_ = false;
+};
+
+StatusOr<bool> ConstantFolderVisitor::Run(HloComputation* computation) {
+  ConstantFolderVisitor visitor;
+  TF_RETURN_IF_ERROR(computation->Accept(&visitor));
+  return visitor.changed();
+}
 
 StatusOr<bool> HloConstantFolding::Run(HloModule* module) {
+  XLA_VLOG_LINES(2,
+                 "HloConstantFolding::Run(), before:\n" + module->ToString());
   bool changed = false;
-  for (auto& computation : module->computations()) {
-    for (auto instruction : computation->MakeInstructionPostOrder()) {
-      // Skip dead code.
-      if (instruction->user_count() == 0 &&
-          computation->root_instruction() != instruction) {
-        continue;
-      }
-      // Depending on the opcode, choose how to handle constant operands.
-      //
-      // TODO(b/35975797): Fold constant computations for more than reshapes and
-      // transposes.
-      switch (instruction->opcode()) {
-        case HloOpcode::kReshape: {
-          if (instruction->operand(0)->opcode() == HloOpcode::kConstant) {
-            TF_ASSIGN_OR_RETURN(
-                auto reshaped_literal,
-                LiteralUtil::Reshape(
-                    instruction->operand(0)->literal(),
-                    AsInt64Slice(instruction->shape().dimensions())));
-            TF_CHECK_OK(computation->ReplaceWithNewInstruction(
-                instruction,
-                HloInstruction::CreateConstant(std::move(reshaped_literal))));
-            changed = true;
-          }
-          break;
-        }
-        case HloOpcode::kTranspose: {
-          if (instruction->operand(0)->opcode() == HloOpcode::kConstant) {
-            auto transposed_literal = LiteralUtil::Transpose(
-                instruction->operand(0)->literal(), instruction->dimensions());
-            TF_CHECK_OK(computation->ReplaceWithNewInstruction(
-                instruction,
-                HloInstruction::CreateConstant(std::move(transposed_literal))));
-            changed = true;
-          }
-          break;
-        }
-        default:
-          break;
+  for (auto& comp : module->computations()) {
+    TF_ASSIGN_OR_RETURN(bool result, ConstantFolderVisitor::Run(comp.get()));
+    changed = changed || result;
+  }
+  XLA_VLOG_LINES(2, "HloConstantFolding::Run(), after:\n" + module->ToString());
+  return changed;
+}
+
+Status ConstantFolderVisitor::HandleReshape(HloInstruction* reshape) {
+  if (reshape->operand(0)->opcode() == HloOpcode::kConstant) {
+    TF_ASSIGN_OR_RETURN(
+        auto reshaped_literal,
+        LiteralUtil::Reshape(reshape->operand(0)->literal(),
+                             AsInt64Slice(reshape->shape().dimensions())));
+    return ReplaceWithConstant(reshape, std::move(reshaped_literal));
+  }
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleTranspose(HloInstruction* transpose) {
+  if (transpose->operand(0)->opcode() == HloOpcode::kConstant) {
+    auto transposed_literal = LiteralUtil::Transpose(
+        transpose->operand(0)->literal(), transpose->dimensions());
+    return ReplaceWithConstant(transpose, std::move(transposed_literal));
+  }
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleConcatenate(
+    HloInstruction* concatenate,
+    tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
+  if (operands[0]->opcode() == HloOpcode::kConstant) {
+    // If all the operands of a concatenate are constant, fold them into a
+    // single constant tensor.
+    // The result concatenate dimension is going to be the sum of all the
+    // concatenate dimensions of the arrays taking part of the operation.
+    int64 concat_dim = concatenate->dimensions()[0];
+    const Shape& reference_shape = operands[0]->shape();
+    CHECK(!ShapeUtil::IsTuple(reference_shape));
+    int64 rank = ShapeUtil::Rank(reference_shape);
+    std::vector<int64> concat_dimensions(reference_shape.dimensions().begin(),
+                                         reference_shape.dimensions().end());
+    if (concat_dim < 0) {
+      concat_dim += rank;
+    }
+    for (int64 i = 1; i < operands.size(); ++i) {
+      const Shape& operand_shape = operands[i]->shape();
+      CHECK(!ShapeUtil::IsTuple(operand_shape));
+      if (operands[i]->opcode() != HloOpcode::kConstant) {
+        return Status::OK();
       }
+      // Accumulate the concat dimension from all tensors taking part to the
+      // operation.
+      concat_dimensions[concat_dim] +=
+          ShapeUtil::GetDimension(operand_shape, concat_dim);
+    }
+
+    auto literal = LiteralUtil::CreateFromDimensions(
+        reference_shape.element_type(), concat_dimensions);
+    std::vector<int64> source_indices(rank, 0);
+    std::vector<int64> dest_indices(concat_dimensions.size(), 0);
+    for (auto operand : operands) {
+      const Shape& operand_shape = operand->shape();
+      TF_RETURN_IF_ERROR(LiteralUtil::Copy(
+          operand->literal(), source_indices, literal.get(), dest_indices,
+          AsInt64Slice(operand_shape.dimensions())));
+      dest_indices[concat_dim] +=
+          ShapeUtil::GetDimension(operand_shape, concat_dim);
     }
+    return ReplaceWithConstant(concatenate, std::move(literal));
   }
-  return changed;
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleSlice(HloInstruction* slice,
+                                          HloInstruction* operand) {
+  if (operand->opcode() == HloOpcode::kConstant) {
+    const Shape& shape = slice->shape();
+    auto literal = LiteralUtil::CreateFromDimensions(
+        shape.element_type(), AsInt64Slice(shape.dimensions()));
+    std::vector<int64> dest_indices(slice->slice_starts().size(), 0);
+    TF_RETURN_IF_ERROR(LiteralUtil::Copy(
+        operand->literal(), slice->slice_starts(), literal.get(), dest_indices,
+        AsInt64Slice(shape.dimensions())));
+    TF_RETURN_IF_ERROR(ReplaceWithConstant(slice, std::move(literal)));
+  }
+  return Status::OK();
+}
+
+Status ConstantFolderVisitor::HandleConvert(HloInstruction* convert,
+                                            HloInstruction* operand) {
+  if (operand->opcode() == HloOpcode::kConstant) {
+    const Literal& src_literal = operand->literal();
+    std::unique_ptr<Literal> new_constant =
+        ConvertIfSrcTypeMatches(src_literal, convert->shape().element_type());
+    return ReplaceWithConstant(convert, std::move(new_constant));
+  }
+  return Status::OK();
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding.h b/tensorflow/compiler/xla/service/hlo_constant_folding.h
index 514bb8164c..f45eccf825 100644
--- a/tensorflow/compiler/xla/service/hlo_constant_folding.h
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding.h
@@ -25,12 +25,10 @@ namespace xla {
 // computation on constants.
 class HloConstantFolding : public HloPassInterface {
  public:
-  explicit HloConstantFolding() {}
-  ~HloConstantFolding() override {}
   tensorflow::StringPiece name() const override { return "constant_folding"; }
 
-  // Run ConstantFolding on the given module. Returns whether the module was
-  // changed (common subexpressions were found and eliminated).
+  // Run constant folding operations on the given module. Returns whether the
+  // module was changed (constant expressions folded).
   StatusOr<bool> Run(HloModule* module) override;
 };
 
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
new file mode 100644
index 0000000000..d20f423bd6
--- /dev/null
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
@@ -0,0 +1,169 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/service/hlo_constant_folding.h"
+
+#include <memory>
+#include <utility>
+
+#include "tensorflow/compiler/xla/layout_util.h"
+#include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
+#include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_matchers.h"
+#include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/hlo_pass_fix.h"
+#include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/test.h"
+#include "tensorflow/compiler/xla/tests/hlo_test_base.h"
+#include "tensorflow/compiler/xla/types.h"
+
+namespace op = xla::testing::opcode_matchers;
+
+namespace xla {
+namespace {
+
+using HloConstantFoldingTest = HloTestBase;
+
+TEST_F(HloConstantFoldingTest, ConvertF32ToS64) {
+  HloComputation::Builder builder(TestName());
+  HloInstruction* input = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(42.0f)));
+  builder.AddInstruction(
+      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {}), input));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
+  EXPECT_EQ(LiteralUtil::GetFirstElement<int64>(
+                computation->root_instruction()->literal()),
+            42);
+}
+
+TEST_F(HloConstantFoldingTest, ConvertS64ToF32) {
+  HloComputation::Builder builder(TestName());
+  HloInstruction* input = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<int64>(42)));
+  builder.AddInstruction(
+      HloInstruction::CreateConvert(ShapeUtil::MakeShape(F32, {}), input));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
+  EXPECT_EQ(LiteralUtil::GetFirstElement<float>(
+                computation->root_instruction()->literal()),
+            42.0f);
+}
+
+TEST_F(HloConstantFoldingTest, ConvertF32ArrayToS64Array) {
+  HloComputation::Builder builder(TestName());
+  HloInstruction* input = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR1<float>({42.0f, 19.0f})));
+  builder.AddInstruction(
+      HloInstruction::CreateConvert(ShapeUtil::MakeShape(S64, {2}), input));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+
+  EXPECT_THAT(computation->root_instruction(), op::Convert(input));
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(module.get()).ValueOrDie());
+
+  EXPECT_THAT(computation->root_instruction(), op::Constant());
+  EXPECT_EQ(
+      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {0}),
+      42);
+  EXPECT_EQ(
+      LiteralUtil::Get<int64>(computation->root_instruction()->literal(), {1}),
+      19);
+}
+
+TEST_F(HloConstantFoldingTest, Concatenate) {
+  const struct TestConfig {
+    int concat_dimension;
+    tensorflow::gtl::ArraySlice<int64> dimensions;
+    tensorflow::gtl::ArraySlice<int64> concat_sizes;
+  } test_configs[] = {
+      {1, {11, 0, 7, 5, 9}, {2, 5, 7, 11}},
+      {3, {1, 4, 17, 0, 8}, {1, 3, 9, 12}},
+  };
+
+  for (auto& test_config : test_configs) {
+    HloComputation::Builder builder(TestName());
+    std::vector<int64> dimensions(test_config.dimensions.begin(),
+                                  test_config.dimensions.end());
+    int64 concat_size = 0;
+    std::vector<HloInstruction*> operands;
+    for (auto csize : test_config.concat_sizes) {
+      dimensions[test_config.concat_dimension] = csize;
+      concat_size += csize;
+      auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
+      HloInstruction* insn = builder.AddInstruction(
+          HloInstruction::CreateConstant(std::move(literal)));
+      operands.push_back(insn);
+    }
+    dimensions[test_config.concat_dimension] = concat_size;
+    Shape shape = ShapeUtil::MakeShape(F32, dimensions);
+    builder.AddInstruction(HloInstruction::CreateConcatenate(
+        shape, operands, test_config.concat_dimension));
+    HloModule module(TestName());
+    auto computation = module.AddEntryComputation(builder.Build());
+
+    HloConstantFolding simplifier;
+    ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+
+    HloInstruction* root = computation->root_instruction();
+    EXPECT_THAT(root, op::Constant());
+    EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+  }
+}
+
+TEST_F(HloConstantFoldingTest, Slice) {
+  HloComputation::Builder builder(TestName());
+  const int64 dimensions[] = {11, 8, 7, 5, 9};
+  const int64 slice_start[] = {4, 2, 3, 1, 5};
+  const int64 slice_limits[] = {10, 8, 6, 5, 9};
+  auto literal = LiteralUtil::CreateFromDimensions(F32, dimensions);
+  HloInstruction* lit_insn = builder.AddInstruction(
+      HloInstruction::CreateConstant(std::move(literal)));
+  Shape shape = ShapeUtil::MakeShape(F32, {6, 6, 3, 4, 4});
+  builder.AddInstruction(
+      HloInstruction::CreateSlice(shape, lit_insn, slice_start, slice_limits));
+  HloModule module(TestName());
+  auto computation = module.AddEntryComputation(builder.Build());
+
+  HloConstantFolding simplifier;
+  ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_THAT(root, op::Constant());
+  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+}
+
+}  // namespace
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
index ebe7428052..1b3babc214 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -26,20 +26,21 @@ limitations under the License.
 #include "tensorflow/compiler/xla/index_util.h"
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/map_util.h"
 #include "tensorflow/compiler/xla/primitive_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/hlo_query.h"
 #include "tensorflow/compiler/xla/shape_util.h"
+#include "tensorflow/compiler/xla/status.h"
+#include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/core/lib/core/bitmap.h"
+#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
-#include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/types.h"
 
@@ -53,9 +54,7 @@ std::unique_ptr<Literal> ElementWiseUnaryOp(
     const Literal& operand) {
   DCHECK(ShapeUtil::SameDimensions(shape, operand.shape()));
 
-  auto result = MakeUnique<Literal>();
-  *result->mutable_shape() = shape;
-  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+  auto result = LiteralUtil::CreateFromShape(shape);
 
   std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
   do {
@@ -74,9 +73,7 @@ std::unique_ptr<Literal> ElementWiseBinaryOp(
   DCHECK(ShapeUtil::SameDimensions(shape, rhs.shape()));
   DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
 
-  auto result = MakeUnique<Literal>();
-  *result->mutable_shape() = shape;
-  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+  auto result = LiteralUtil::CreateFromShape(shape);
 
   std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
   do {
@@ -99,9 +96,7 @@ std::unique_ptr<Literal> ElementWiseTernaryOp(
   DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
   DCHECK(ShapeUtil::SameDimensions(rhs.shape(), ehs.shape()));
 
-  auto result = MakeUnique<Literal>();
-  *result->mutable_shape() = shape;
-  LiteralUtil::Reserve(ShapeUtil::ElementsIn(shape), result.get());
+  auto result = LiteralUtil::CreateFromShape(shape);
 
   std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
   do {
@@ -130,29 +125,130 @@ NativeT AbsoluteVal(NativeT value) {
   return std::abs(value);
 }
 
-template <typename NativeT>
-StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
+}  // namespace
+
+Status HloEvaluator::DefaultAction(HloInstruction* hlo) {
+  VLOG(2) << "Handle instruction: " << hlo->ToString();
+  Shape shape = hlo->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  TF_ASSIGN_OR_RETURN(evaluated_[hlo], EvaluateBasedOnType(hlo));
+  return Status::OK();
+}
+
+Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
+  VLOG(2) << "HandleParameter: " << parameter->ToString();
+  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
+  VLOG(2) << "Parameter evaluated to: "
+          << LiteralUtil::ToString(*input_literal);
+  CHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
+
+  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
+  return Status::OK();
+}
+
+Status HloEvaluator::HandleConstant(HloInstruction* constant,
+                                    const Literal& literal) {
+  VLOG(2) << "HandleConstant: " << constant->ToString();
+  CHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
+
+  evaluated_[constant] = MakeUnique<Literal>(literal);
+  return Status::OK();
+}
+
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
+    HloComputation* computation,
+    tensorflow::gtl::ArraySlice<const Literal*> args) {
+  arg_literals_ = args;
+  TF_RETURN_IF_ERROR(computation->Accept(this));
+  return std::move(FindOrDie(evaluated_, computation->root_instruction()));
+}
+
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
+    HloInstruction* instruction,
+    tensorflow::gtl::ArraySlice<const Literal*> args) {
+  DCHECK(hlo_query::AllOperandsAreParametersOrConstants(*instruction));
+  Shape shape = instruction->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  arg_literals_ = args;
+
+  // Evaluate operands of Parameter type against the input literals which caches
+  // the evaluated literal results.
+  for (const auto operand : instruction->operands()) {
+    if (operand->opcode() == HloOpcode::kParameter) {
+      TF_CHECK_OK(HandleParameter(operand));
+    } else if (operand->opcode() == HloOpcode::kConstant) {
+      evaluated_[operand] = MakeUnique<Literal>(operand->literal());
+    }
+  }
+
+  TF_RETURN_IF_ERROR(instruction->Visit(this));
+  return std::move(FindOrDie(evaluated_, instruction));
+}
+
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateBasedOnType(
     HloInstruction* instruction) {
-  DCHECK(hlo_query::AllOperandsAreConstants(*instruction));
+  Shape shape = instruction->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  switch (shape.element_type()) {
+    case PRED:
+      return EvaluateSameTypedElementwise<bool>(instruction);
+    case U8:
+      return EvaluateSameTypedElementwise<uint8>(instruction);
+    case U16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(U16).c_str());
+    case U32:
+      return EvaluateSameTypedElementwise<uint32>(instruction);
+    case U64:
+      return EvaluateSameTypedElementwise<uint64>(instruction);
+    case S8:
+      return EvaluateSameTypedElementwise<int8>(instruction);
+    case S16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(S16).c_str());
+    case S32:
+      return EvaluateSameTypedElementwise<int32>(instruction);
+    case S64:
+      return EvaluateSameTypedElementwise<int64>(instruction);
+    case F16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(F16).c_str());
+    case F32:
+      return EvaluateSameTypedElementwise<float>(instruction);
+    case F64:
+      return EvaluateSameTypedElementwise<double>(instruction);
+    default:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(shape.element_type()).c_str());
+  }
+}
 
+template <typename NativeT>
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateSameTypedElementwise(
+    HloInstruction* instruction) {
   const std::vector<HloInstruction*>& operands = instruction->operands();
   HloOpcode opcode = instruction->opcode();
   const Shape& shape = instruction->shape();
 
   switch (opcode) {
     // TODO(b/35950897): many of the stl function used here are not overloaded
-    // for all XLA primitive types.
+    // for every XLA primitive types.
+
     // Unary element-wise ops.
+    //
     case HloOpcode::kAbs:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return AbsoluteVal(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kCeil:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::ceil(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kConvert:
       CHECK_EQ(operands.size(), 1);
       // TODO(b/35950897): implement Convert.
@@ -162,37 +258,37 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return operand; },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kExp:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::exp(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kFloor:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::floor(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kIsFinite:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::isfinite(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kLog:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::log(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kLogicalNot:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return !operand; },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kNegate:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return -operand; },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kSign:
       CHECK_EQ(operands.size(), 1);
       CHECK(primitive_util::IsIntegralType(shape.element_type()));
@@ -201,95 +297,113 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
                                        return (NativeT(0) < operand) -
                                               (operand < NativeT(0));
                                      },
-                                     operands[0]->literal());
+                                     GetEvaluatedLiteralFor(operands[0]));
     case HloOpcode::kTanh:
       CHECK_EQ(operands.size(), 1);
       return ElementWiseUnaryOp<NativeT>(
           shape, [](NativeT operand) { return std::tanh(operand); },
-          operands[0]->literal());
+          GetEvaluatedLiteralFor(operands[0]));
     // Binary element-wise ops.
+    //
     case HloOpcode::kAdd:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs + rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kDivide:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs / rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kMultiply:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs * rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kSubtract:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs - rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kEq:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs == rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kGe:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs >= rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kGt:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs > rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLe:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs <= rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLt:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs < rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kNe:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<bool>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs != rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kMaximum:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return std::max(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kMinimum:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return std::min(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kPower:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return std::pow(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kRemainder:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape,
           [](NativeT lhs, NativeT rhs) { return std::remainder(lhs, rhs); },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLogicalAnd:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs && rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     case HloOpcode::kLogicalOr:
       CHECK_EQ(operands.size(), 2);
       return ElementWiseBinaryOp<NativeT>(
           shape, [](NativeT lhs, NativeT rhs) { return lhs || rhs; },
-          operands[0]->literal(), operands[1]->literal());
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
     // Ternary element-wise ops.
+    //
     case HloOpcode::kClamp: {
       CHECK_EQ(operands.size(), 3);
       std::function<NativeT(NativeT, NativeT, NativeT)> clamp_op =
@@ -297,8 +411,9 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
             return std::max(low, std::min(value, high));
           };
       return ElementWiseTernaryOp<NativeT, NativeT, NativeT, NativeT>(
-          shape, std::move(clamp_op), operands[0]->literal(),
-          operands[1]->literal(), operands[2]->literal());
+          shape, std::move(clamp_op), GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]),
+          GetEvaluatedLiteralFor(operands[2]));
     } break;
     case HloOpcode::kSelect: {
       CHECK_EQ(operands.size(), 3);
@@ -311,8 +426,9 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
             return on_false;
           };
       return ElementWiseTernaryOp<NativeT, bool, NativeT, NativeT>(
-          shape, std::move(select_op), operands[0]->literal(),
-          operands[1]->literal(), operands[2]->literal());
+          shape, std::move(select_op), GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]),
+          GetEvaluatedLiteralFor(operands[2]));
     } break;
     default:
       return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
@@ -320,48 +436,4 @@ StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteralInternal(
   }
 }
 
-}  // namespace
-
-/* static */ StatusOr<std::unique_ptr<Literal>>
-HloEvaluator::EvaluateOpForLiteral(HloInstruction* instruction) {
-  DCHECK(hlo_query::AllOperandsAreConstants(*instruction));
-
-  Shape shape = instruction->shape();
-  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
-
-  // REVIEW QUESTION: other than a few operations, do we need to handle the
-  // general case of operands being of different types in the context of the
-  // evaluator?
-
-  switch (shape.element_type()) {
-    case PRED:
-      return EvaluateOpForLiteralInternal<bool>(instruction);
-    case U8:
-      return EvaluateOpForLiteralInternal<uint8>(instruction);
-    case U16:
-      LOG(FATAL) << "U16/uint16 is unimplemented.";
-    case U32:
-      return EvaluateOpForLiteralInternal<uint32>(instruction);
-    case U64:
-      return EvaluateOpForLiteralInternal<uint64>(instruction);
-    case S8:
-      return EvaluateOpForLiteralInternal<int8>(instruction);
-    case S16:
-      LOG(FATAL) << "S16/int16 is unimplemented.";
-    case S32:
-      return EvaluateOpForLiteralInternal<int32>(instruction);
-    case S64:
-      return EvaluateOpForLiteralInternal<int64>(instruction);
-    case F16:
-      LOG(FATAL) << "F16 is unimplemented.";
-    case F32:
-      return EvaluateOpForLiteralInternal<float>(instruction);
-    case F64:
-      return EvaluateOpForLiteralInternal<double>(instruction);
-    default:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(shape.element_type()).c_str());
-  }
-}
-
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.h b/tensorflow/compiler/xla/service/hlo_evaluator.h
index c6ec650d67..6372a6c269 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.h
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.h
@@ -18,22 +18,89 @@ limitations under the License.
 
 #include <memory>
 
+#include "tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/lib/gtl/flatmap.h"
+#include "tensorflow/core/platform/macros.h"
 
 namespace xla {
 
-// Responsible for evaluating a HLO instruction with constant operands.
-class HloEvaluator {
+// Responsible for evaluating HLO and obtain literal as the evaluation results.
+//
+// This class is not thread-safe.
+class HloEvaluator : public DfsHloVisitorWithDefault {
  public:
-  // Evaluates a single HLO instruction for constants and return the result as a
-  // Literal.
-  // Precondition: all operands of the instruction are constants, instruction is
-  // valid with corresponding number of operands for the given operator.
+  HloEvaluator() {}
+  ~HloEvaluator() override {}
+
+  // Evaluates a HLO computation and an array of pointers to literals.
+  // Return the evaluated result as literal if successful.
+  // Precondition: argument literals are in post-order corresponding to the
+  // input instruction's parameters.
+  StatusOr<std::unique_ptr<Literal>> Evaluate(
+      HloComputation* computation,
+      tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
+
+  // Evaluates a single HLO instruction and an array of pointers to literals.
+  // Return the evaluated result as literal if successful.
+  // Precondition:
+  // 1. argument literals are in post-order corresponding to the input
+  // instruction's parameters.
+  // 2. the instruction's operands must be of either Parameter or Constant type.
   // TODO(b/35950897): implement more ops other than element-wise ops.
-  static StatusOr<std::unique_ptr<Literal>> EvaluateOpForLiteral(
+  // TODO(b/35950897): handle broadcasts.
+  StatusOr<std::unique_ptr<Literal>> Evaluate(
+      HloInstruction* instruction,
+      tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
+
+ protected:
+  // The following methods implement the DfsHloVisitor interface.
+  //
+  // DefaultAction here handles all non-specificialized (i.e., instruction
+  // without corresponding Handle* method) instructions.
+  // TODO(b/35950897): it's likely better to refactor the switches here and push
+  // up the switch to templated methods instead, likely at DfsHloVisitor level.
+  Status DefaultAction(HloInstruction* hlo_instruction) override;
+
+  Status HandleParameter(HloInstruction* parameter) override;
+  Status HandleConstant(HloInstruction* constant,
+                        const Literal& literal) override;
+
+ private:
+  // Evaluates a single HLO instruction return the result as a Literal if
+  // successful. A Status will be returned on error.
+  StatusOr<std::unique_ptr<Literal>> EvaluateBasedOnType(
       HloInstruction* instruction);
+
+  // Evaluates an element-wise HLO instruction that has the same output literal
+  // type as the operands' types.
+  template <typename NativeT>
+  StatusOr<std::unique_ptr<Literal>> EvaluateSameTypedElementwise(
+      HloInstruction* instruction);
+
+  // Returns the already-evaluated literal result for the instruction.
+  // Crash with log if the given instruction has not been evaluated previously.
+  const Literal& GetEvaluatedLiteralFor(const HloInstruction* hlo) {
+    auto it = evaluated_.find(hlo);
+    CHECK(it != evaluated_.end())
+        << "could not find evaluated value for: " << hlo->ToString();
+    return *(it->second);
+  }
+
+  // Tracks the HLO instruciton and its evaluated literal result.
+  tensorflow::gtl::FlatMap<const HloInstruction*, std::unique_ptr<Literal>>
+      evaluated_;
+  // Stores input literals, assuming they are in post-order. Literals are not
+  // owned by this class, and they must outlive the lifetime of the instance of
+  // this class.
+  tensorflow::gtl::ArraySlice<const Literal*> arg_literals_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(HloEvaluator);
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator_test.cc b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
index 585fe65def..443e5ad4f4 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator_test.cc
@@ -14,10 +14,13 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/compiler/xla/service/hlo_evaluator.h"
 
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "tensorflow/compiler/xla/literal_util.h"
+#include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/statusor.h"
@@ -29,9 +32,16 @@ limitations under the License.
 namespace xla {
 namespace {
 
+class HloEvaluatorTest : public ::testing::Test {
+ protected:
+  HloEvaluatorTest() { evaluator_ = MakeUnique<HloEvaluator>(); }
+
+  std::unique_ptr<HloEvaluator> evaluator_;
+};
+
 // Verifies that HloEvaluator evaluates a HLO instruction that performs clamp
 // with 3 operands.
-TEST(HloEvaluatorTest, DoesClamp) {
+TEST_F(HloEvaluatorTest, DoesClamp) {
   auto low = LiteralUtil::CreateR2<float>({{0.f, 2.f}, {2.f, 4.f}});
   auto high = LiteralUtil::CreateR2<float>({{2.f, 4.f}, {4.f, 4.f}});
   auto value = LiteralUtil::CreateR2<float>({{0.f, 5.f}, {0.f, 4.f}});
@@ -44,7 +54,7 @@ TEST(HloEvaluatorTest, DoesClamp) {
       shape, HloOpcode::kClamp, c1.get(), c2.get(), c3.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<float>({{0, 4}, {2, 4}});
 
@@ -53,7 +63,7 @@ TEST(HloEvaluatorTest, DoesClamp) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs select
 // with 3 operands.
-TEST(HloEvaluatorTest, DoesSelect) {
+TEST_F(HloEvaluatorTest, DoesSelect) {
   auto pred = LiteralUtil::CreateR2<bool>({{true, false}, {false, true}});
   auto on_true = LiteralUtil::CreateR2<float>({{2.f, 4.f}, {4.f, 4.f}});
   auto on_false = LiteralUtil::CreateR2<float>({{0.f, 5.f}, {0.f, 4.f}});
@@ -66,7 +76,7 @@ TEST(HloEvaluatorTest, DoesSelect) {
       shape, HloOpcode::kSelect, c1.get(), c2.get(), c3.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<float>({{2, 5}, {0, 4}});
 
@@ -75,7 +85,7 @@ TEST(HloEvaluatorTest, DoesSelect) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs
 // element-wise addition with 2 operands.
-TEST(HloEvaluatorTest, DoesAdd) {
+TEST_F(HloEvaluatorTest, DoesAdd) {
   auto lhs = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
   auto rhs = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
 
@@ -86,7 +96,7 @@ TEST(HloEvaluatorTest, DoesAdd) {
       HloInstruction::CreateBinary(shape, HloOpcode::kAdd, c1.get(), c2.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<int64>({{3, 4}, {-96, 8}});
 
@@ -95,7 +105,7 @@ TEST(HloEvaluatorTest, DoesAdd) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs
 // element-wise divide with 2 operands.
-TEST(HloEvaluatorTest, DoesDivide) {
+TEST_F(HloEvaluatorTest, DoesDivide) {
   auto lhs_s64 = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
   auto rhs_s64 = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
 
@@ -106,7 +116,7 @@ TEST(HloEvaluatorTest, DoesDivide) {
                                                   c1_s64.get(), c2_s64.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<int64>({{0, 0}, {-25, 1}});
 
@@ -121,8 +131,7 @@ TEST(HloEvaluatorTest, DoesDivide) {
   instruction = HloInstruction::CreateBinary(shape_f64, HloOpcode::kDivide,
                                              c1_f64.get(), c2_f64.get());
 
-  result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+  result = evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   expected =
       LiteralUtil::CreateR2<double>({{0.45454545454545453, 0}, {-25, 1}});
@@ -132,21 +141,51 @@ TEST(HloEvaluatorTest, DoesDivide) {
 
 // Verifies that HloEvaluator evaluates a HLO instruction that performs
 // element-wise abs op with 1 operand.
-TEST(HloEvaluatorTest, DoesAbs) {
+TEST_F(HloEvaluatorTest, DoesAbs) {
   auto operand = LiteralUtil::CreateR2<int64>({{1, -20}, {-100, 4}});
-
   Shape shape = ShapeUtil::MakeShape(S64, {2, 2});
   auto c1 = HloInstruction::CreateConstant(std::move(operand));
   auto instruction =
       HloInstruction::CreateUnary(shape, HloOpcode::kAbs, c1.get());
 
   std::unique_ptr<Literal> result =
-      HloEvaluator::EvaluateOpForLiteral(instruction.get()).ConsumeValueOrDie();
+      evaluator_->Evaluate(instruction.get(), {}).ConsumeValueOrDie();
 
   auto expected = LiteralUtil::CreateR2<int64>({{1, 20}, {100, 4}});
 
   EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
 }
 
+// Verifies that HloEvaluator evaluates a HLO Computation with non-parameter nor
+// constant operands.
+TEST_F(HloEvaluatorTest, DoesTraveseInstructions) {
+  HloComputation::Builder builder(
+      ::testing::UnitTest::GetInstance()->current_test_info()->name());
+
+  auto lhs = LiteralUtil::CreateR2<int64>({{1, 0}, {-100, 4}});
+  auto rhs = LiteralUtil::CreateR2<int64>({{2, 4}, {4, 4}});
+  auto rhs2 = LiteralUtil::CreateR2<int64>({{1, -20}, {-100, 4}});
+  std::vector<const Literal*> args = {lhs.get(), rhs.get(), rhs2.get()};
+
+  Shape shape = ShapeUtil::MakeShape(S64, {2, 2});
+
+  auto param_lhs = HloInstruction::CreateParameter(0, shape, "lhs");
+  auto param_rhs = HloInstruction::CreateParameter(1, shape, "rhs");
+  auto lhs_instruction = HloInstruction::CreateBinary(
+      shape, HloOpcode::kAdd, param_lhs.get(), param_rhs.get());
+
+  auto param_rhs2 = HloInstruction::CreateParameter(2, shape, "rhs2");
+  auto root_instruction = HloInstruction::CreateBinary(
+      shape, HloOpcode::kAdd, lhs_instruction.get(), param_rhs2.get());
+
+  builder.AddInstruction(std::move(root_instruction));
+  std::unique_ptr<Literal> result =
+      evaluator_->Evaluate(builder.Build().get(), args).ConsumeValueOrDie();
+
+  auto expected = LiteralUtil::CreateR2<int64>({{4, -16}, {-196, 12}});
+
+  EXPECT_TRUE(LiteralUtil::Equal(*result, *expected));
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_query.cc b/tensorflow/compiler/xla/service/hlo_query.cc
index d699737864..a153d73dbd 100644
--- a/tensorflow/compiler/xla/service/hlo_query.cc
+++ b/tensorflow/compiler/xla/service/hlo_query.cc
@@ -32,6 +32,16 @@ bool IsConstantR0F32(HloInstruction* instruction, float* out) {
   return false;
 }
 
+bool AllOperandsAreParametersOrConstants(const HloInstruction& instruction) {
+  for (const auto& operand : instruction.operands()) {
+    if (operand->opcode() != HloOpcode::kParameter &&
+        operand->opcode() != HloOpcode::kConstant) {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool AllOperandsAreParameters(const HloInstruction& instruction) {
   for (const auto& operand : instruction.operands()) {
     if (operand->opcode() != HloOpcode::kParameter) {
diff --git a/tensorflow/compiler/xla/service/hlo_query.h b/tensorflow/compiler/xla/service/hlo_query.h
index 56f3cfd863..c79347bbf9 100644
--- a/tensorflow/compiler/xla/service/hlo_query.h
+++ b/tensorflow/compiler/xla/service/hlo_query.h
@@ -28,6 +28,10 @@ namespace hlo_query {
 // Precondition: out != nullptr
 bool IsConstantR0F32(HloInstruction* instruction, float* out);
 
+// Returns whether all of an instruction's operands are of the types constants
+// and parameters.
+bool AllOperandsAreParametersOrConstants(const HloInstruction& instruction);
+
 // Returns whether all of an instruction's operands are parameters.
 bool AllOperandsAreParameters(const HloInstruction& instruction);
 
diff --git a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
index fdc1c0ba2d..da07dea123 100644
--- a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
@@ -88,12 +88,18 @@ const string& HloTfGraphBuilder::GetNodeNameForInstruction(
   if (ContainsKey(instruction_to_node_name_, instruction)) {
     return instruction_to_node_name_[instruction];
   }
+  string node_name;
   // If an instruction is fused, put it in the subgraph of the fusion;
   // otherwise, put it in the computation subgraph.
-  string node_name =
-      instruction->IsFused()
-          ? GetNodeNameForInstruction(instruction->fusion_instruction())
-          : instruction->parent()->name();
+  if (instruction->IsFused()) {
+    node_name = GetNodeNameForInstruction(instruction->fusion_instruction());
+  } else {
+    node_name = instruction->parent()->name();
+    if (!instruction->metadata().op_name().empty()) {
+      // Always make computations contain TF ops but not the other way around.
+      StrAppend(&node_name, "/", instruction->metadata().op_name());
+    }
+  }
   string instruction_name = instruction->name();
   if (instruction->opcode() == HloOpcode::kParameter) {
     StrAppend(&instruction_name, ".", instruction->parameter_number());
diff --git a/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
index df66408022..6041debc4a 100644
--- a/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder_test.cc
@@ -137,6 +137,28 @@ TEST_F(HloTfGraphBuilderTest, GreaterThanOrEqualTo) {
   EXPECT_EQ(graph_def.node(2).op(), "HloGreaterThanOrEqualTo");
 }
 
+TEST_F(HloTfGraphBuilderTest, IncorparateTfOpsStructure) {
+  auto builder = HloComputation::Builder("GE");
+  auto param_1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, r0f32_, "param0"));
+  auto param_2 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, r0f32_, "param1"));
+  auto ge = builder.AddInstruction(
+      HloInstruction::CreateBinary(r0f32_, HloOpcode::kGe, param_1, param_2));
+  OpMetadata metadata;
+  metadata.set_op_name("x/y");
+  metadata.set_op_type("Y");
+  ge->set_metadata(metadata);
+  TF_CHECK_OK(generator_.AddComputation(*builder.Build()));
+  GraphDef graph_def = generator_.GetGraphDef();
+  EXPECT_EQ(graph_def.node_size(), 3);
+  EXPECT_EQ(graph_def.node(0).name(), "GE/param0.0");
+  EXPECT_EQ(graph_def.node(1).name(), "GE/param1.1");
+  EXPECT_EQ(graph_def.node(2).input_size(), 2);
+  EXPECT_EQ(graph_def.node(2).name(), "GE/x/y/greater-than-or-equal-to");
+  EXPECT_EQ(graph_def.node(2).op(), "HloGreaterThanOrEqualTo");
+}
+
 TEST_F(HloTfGraphBuilderTest, EmbeddedComputationsDiamond) {
   // Create computations with a diamond-shaped callgraph.
   auto negate_computation = CreateNegateComputation();
diff --git a/tensorflow/contrib/distributions/BUILD b/tensorflow/contrib/distributions/BUILD
index 1b9bd6ad91..9f675c6613 100644
--- a/tensorflow/contrib/distributions/BUILD
+++ b/tensorflow/contrib/distributions/BUILD
@@ -193,38 +193,6 @@ cuda_py_test(
     tags = ["notap"],  # http://b/30441813
 )
 
-cuda_py_test(
-    name = "bernoulli_test",
-    size = "small",
-    srcs = ["python/kernel_tests/bernoulli_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "beta_test",
-    size = "small",
-    srcs = ["python/kernel_tests/beta_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "binomial_test",
     size = "small",
@@ -238,24 +206,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "categorical_test",
-    size = "small",
-    srcs = ["python/kernel_tests/categorical_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-        "//tensorflow/python:random_ops",
-    ],
-)
-
 cuda_py_test(
     name = "chi2_test",
     srcs = ["python/kernel_tests/chi2_test.py"],
@@ -287,66 +237,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "dirichlet_test",
-    size = "small",
-    srcs = ["python/kernel_tests/dirichlet_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "dirichlet_multinomial_test",
-    size = "medium",
-    srcs = ["python/kernel_tests/dirichlet_multinomial_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "exponential_test",
-    srcs = ["python/kernel_tests/exponential_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "gamma_test",
-    srcs = ["python/kernel_tests/gamma_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "geometric_test",
     size = "small",
@@ -378,36 +268,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "laplace_test",
-    srcs = ["python/kernel_tests/laplace_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-cuda_py_test(
-    name = "multinomial_test",
-    srcs = ["python/kernel_tests/multinomial_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "mvn_diag_test",
     size = "small",
@@ -528,24 +388,6 @@ cuda_py_test(
     tags = ["nomsan"],  # disable to avoid false positives from scipy.
 )
 
-cuda_py_test(
-    name = "student_t_test",
-    size = "small",
-    srcs = ["python/kernel_tests/student_t_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
-    ],
-    tags = ["nomsan"],  # disable to avoid false positives from scipy.
-)
-
 cuda_py_test(
     name = "vector_student_t_test",
     size = "medium",
@@ -562,22 +404,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "uniform_test",
-    size = "small",
-    srcs = ["python/kernel_tests/uniform_test.py"],
-    additional_deps = [
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-    ],
-)
-
 cuda_py_test(
     name = "wishart_test",
     size = "small",
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 15e33c2c6f..6ea74fab0e 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -15,74 +15,6 @@
 """Classes representing statistical distributions and ops for working with them.
 
 See the @{$python/contrib.distributions} guide.
-
-## Distribution Object
-@@ReparameterizationType
-@@Distribution
-
-## Individual Distributions
-@@Binomial
-@@Bernoulli
-@@BernoulliWithSigmoidProbs
-@@Beta
-@@BetaWithSoftplusConcentration
-@@Categorical
-@@Chi2
-@@Chi2WithAbsDf
-@@Deterministic
-@@VectorDeterministic
-@@Exponential
-@@ExponentialWithSoftplusRate
-@@Gamma
-@@GammaWithSoftplusConcentrationRate
-@@Geometric
-@@InverseGamma
-@@InverseGammaWithSoftplusConcentrationRate
-@@Laplace
-@@LaplaceWithSoftplusScale
-@@Logistic
-@@NegativeBinomial
-@@Normal
-@@NormalWithSoftplusScale
-@@Poisson
-@@StudentT
-@@StudentTWithAbsDfSoftplusScale
-@@Uniform
-
-@@MultivariateNormalDiag
-@@MultivariateNormalTriL
-@@MultivariateNormalDiagPlusLowRank
-@@MultivariateNormalDiagWithSoftplusScale
-
-@@Dirichlet
-@@DirichletMultinomial
-@@Multinomial
-@@WishartCholesky
-@@WishartFull
-
-@@TransformedDistribution
-@@QuantizedDistribution
-
-@@Mixture
-
-@@ExpRelaxedOneHotCategorical
-@@OneHotCategorical
-@@RelaxedBernoulli
-@@RelaxedOneHotCategorical
-
-## Kullback-Leibler Divergence
-@@kl_divergence
-@@RegisterKL
-
-## Helper Functions
-@@matrix_diag_transform
-@@normal_conjugates_known_scale_posterior
-@@normal_conjugates_known_scale_predictive
-@@softplus_inverse
-
-## Functions for statistics of samples
-@@percentile
-
 """
 from __future__ import absolute_import
 from __future__ import division
@@ -91,25 +23,16 @@ from __future__ import print_function
 # pylint: disable=unused-import,wildcard-import,line-too-long,g-importing-member
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops.bernoulli import *
-from tensorflow.contrib.distributions.python.ops.beta import *
 from tensorflow.contrib.distributions.python.ops.binomial import *
-from tensorflow.contrib.distributions.python.ops.categorical import *
 from tensorflow.contrib.distributions.python.ops.chi2 import *
 from tensorflow.contrib.distributions.python.ops.conditional_transformed_distribution import *
 from tensorflow.contrib.distributions.python.ops.deterministic import *
-from tensorflow.contrib.distributions.python.ops.dirichlet import *
-from tensorflow.contrib.distributions.python.ops.dirichlet_multinomial import *
 from tensorflow.contrib.distributions.python.ops.distribution_util import matrix_diag_transform
 from tensorflow.contrib.distributions.python.ops.distribution_util import softplus_inverse
-from tensorflow.contrib.distributions.python.ops.exponential import *
-from tensorflow.contrib.distributions.python.ops.gamma import *
 from tensorflow.contrib.distributions.python.ops.geometric import *
 from tensorflow.contrib.distributions.python.ops.inverse_gamma import *
-from tensorflow.contrib.distributions.python.ops.laplace import *
 from tensorflow.contrib.distributions.python.ops.logistic import *
 from tensorflow.contrib.distributions.python.ops.mixture import *
-from tensorflow.contrib.distributions.python.ops.multinomial import *
 from tensorflow.contrib.distributions.python.ops.mvn_diag import *
 from tensorflow.contrib.distributions.python.ops.mvn_diag_plus_low_rank import *
 from tensorflow.contrib.distributions.python.ops.mvn_tril import *
@@ -121,14 +44,23 @@ from tensorflow.contrib.distributions.python.ops.quantized_distribution import *
 from tensorflow.contrib.distributions.python.ops.relaxed_bernoulli import *
 from tensorflow.contrib.distributions.python.ops.relaxed_onehot_categorical import *
 from tensorflow.contrib.distributions.python.ops.sample_stats import *
-from tensorflow.contrib.distributions.python.ops.student_t import *
 from tensorflow.contrib.distributions.python.ops.transformed_distribution import *
-from tensorflow.contrib.distributions.python.ops.uniform import *
 from tensorflow.contrib.distributions.python.ops.wishart import *
+from tensorflow.python.ops.distributions.bernoulli import *
+from tensorflow.python.ops.distributions.beta import *
+from tensorflow.python.ops.distributions.categorical import *
 from tensorflow.python.ops.distributions.conditional_distribution import *
+from tensorflow.python.ops.distributions.dirichlet import *
+from tensorflow.python.ops.distributions.dirichlet_multinomial import *
 from tensorflow.python.ops.distributions.distribution import *
+from tensorflow.python.ops.distributions.exponential import *
+from tensorflow.python.ops.distributions.gamma import *
 from tensorflow.python.ops.distributions.kullback_leibler import *
+from tensorflow.python.ops.distributions.laplace import *
+from tensorflow.python.ops.distributions.multinomial import *
 from tensorflow.python.ops.distributions.normal import *
+from tensorflow.python.ops.distributions.student_t import *
+from tensorflow.python.ops.distributions.uniform import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
 
@@ -140,6 +72,71 @@ _allowed_symbols = [
     'ConditionalTransformedDistribution',
     'FULLY_REPARAMETERIZED',
     'NOT_REPARAMETERIZED',
+    'Affine',
+    'AffineLinearOperator',
+    'Bijector',
+    'Chain',
+    'CholeskyOuterProduct',
+    'Exp',
+    'Identity',
+    'Inline',
+    'Invert',
+    'PowerTransform',
+    'SigmoidCentered',
+    'SoftmaxCentered',
+    'Softplus',
+    'ReparameterizationType',
+    'Distribution',
+    'Binomial',
+    'Bernoulli',
+    'BernoulliWithSigmoidProbs',
+    'Beta',
+    'BetaWithSoftplusConcentration',
+    'Categorical',
+    'Chi2',
+    'Chi2WithAbsDf',
+    'Deterministic',
+    'VectorDeterministic',
+    'Exponential',
+    'ExponentialWithSoftplusRate',
+    'Gamma',
+    'GammaWithSoftplusConcentrationRate',
+    'Geometric',
+    'InverseGamma',
+    'InverseGammaWithSoftplusConcentrationRate',
+    'Laplace',
+    'LaplaceWithSoftplusScale',
+    'Logistic',
+    'NegativeBinomial',
+    'Normal',
+    'NormalWithSoftplusScale',
+    'Poisson',
+    'StudentT',
+    'StudentTWithAbsDfSoftplusScale',
+    'Uniform',
+    'MultivariateNormalDiag',
+    'MultivariateNormalTriL',
+    'MultivariateNormalDiagPlusLowRank',
+    'MultivariateNormalDiagWithSoftplusScale',
+    'Dirichlet',
+    'DirichletMultinomial',
+    'Multinomial',
+    'WishartCholesky',
+    'WishartFull',
+    'TransformedDistribution',
+    'QuantizedDistribution',
+    'Mixture',
+    'ExpRelaxedOneHotCategorical',
+    'OneHotCategorical',
+    'RelaxedBernoulli',
+    'RelaxedOneHotCategorical',
+    'kl_divergence',
+    'RegisterKL',
+    'matrix_diag_transform',
+    'normal_conjugates_known_scale_posterior',
+    'normal_conjugates_known_scale_predictive',
+    'softplus_inverse',
+    'percentile'
 ]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
index 267e4ad350..a4688829f1 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
 from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import gamma as gamma_lib
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
index 267e4ad350..a4688829f1 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
 from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import gamma as gamma_lib
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py b/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py
index a083442332..ff3535c626 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import uniform as uniform_lib
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import uniform as uniform_lib
 
 
 def assert_finite(array):
diff --git a/tensorflow/contrib/distributions/python/ops/chi2.py b/tensorflow/contrib/distributions/python/ops/chi2.py
index 45d3accdd6..bdd5571c96 100644
--- a/tensorflow/contrib/distributions/python/ops/chi2.py
+++ b/tensorflow/contrib/distributions/python/ops/chi2.py
@@ -18,11 +18,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import gamma
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import gamma
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/mixture.py b/tensorflow/contrib/distributions/python/ops/mixture.py
index 6d318014ad..f3b09f60f3 100644
--- a/tensorflow/contrib/distributions/python/ops/mixture.py
+++ b/tensorflow/contrib/distributions/python/ops/mixture.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import categorical
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
@@ -29,6 +28,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import categorical
 from tensorflow.python.ops.distributions import distribution
 from tensorflow.python.ops.distributions import util as distribution_util
 
diff --git a/tensorflow/contrib/distributions/python/ops/vector_student_t.py b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
index d7115f6f0b..299ff36962 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
@@ -19,13 +19,13 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import student_t
 from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions import student_t
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 452f8a901e..15e457f932 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -921,12 +921,21 @@ def _softmax_cross_entropy_loss(labels, logits, weights=None):
     if not labels.dtype.is_integer:
       raise ValueError("Labels dtype should be integer "
                        "Instead got %s." % labels.dtype)
-    # TODO(ptucker): This will break for dynamic shapes.
+
     # sparse_softmax_cross_entropy_with_logits requires [batch_size] labels.
+    is_squeezed_labels = False
+    # TODO(ptucker): This will break for dynamic shapes.
     if len(labels.get_shape()) == 2:
       labels = array_ops.squeeze(labels, squeeze_dims=(1,))
+      is_squeezed_labels = True
+
     loss = nn.sparse_softmax_cross_entropy_with_logits(
         labels=labels, logits=logits, name=name)
+
+    # Restore squeezed dimension, if necessary, so loss matches weights shape.
+    if is_squeezed_labels:
+      loss = array_ops.expand_dims(loss, axis=(1,))
+
     return _compute_weighted_loss(loss, weights)
 
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index 442530cb5e..207a189a94 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -791,7 +791,7 @@ class BinaryClassificationHeadTest(test.TestCase):
             [b"0", b"1"], predicted_classes[0])
         self.assertIn("probabilities", six.iterkeys(predictions_for_serving))
 
-  def testBinaryClassificationInferMode_withWightColumn(self):
+  def testBinaryClassificationInferMode_withWeightColumn(self):
     n_classes = 2
     head = head_lib.multi_class_head(n_classes=n_classes,
                                      weight_column_name="label_weight")
@@ -951,7 +951,7 @@ class MultiClassHeadTest(test.TestCase):
 
   def setUp(self):
     self._logits = ((1., 0., 0.),)
-    self._labels = (2,)
+    self._labels = ((2,),)
 
   def _expected_eval_metrics(self, expected_loss):
     return {
@@ -1131,7 +1131,7 @@ class MultiClassHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss,
                       expected_eval_metrics, model_fn_ops)
 
-  def testMultiClassWithWeight(self):
+  def testMultiClassWithScalarWeight(self):
     n_classes = 3
     head = head_lib.multi_class_head(
         n_classes=n_classes,
@@ -1154,6 +1154,30 @@ class MultiClassHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss * weight,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
 
+  def testMultiClassWith2DWeight(self):
+    n_classes = 3
+    head = head_lib.multi_class_head(
+        n_classes=n_classes,
+        weight_column_name="label_weight",
+        metric_class_ids=range(n_classes))
+    with ops.Graph().as_default(), session.Session():
+      weight = .1
+      weights = ((weight,),)
+      # logloss: z:label, x:logit
+      # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
+      model_fn_ops = head.create_model_fn_ops(
+          features={"label_weight": weights},
+          labels=self._labels,
+          mode=model_fn.ModeKeys.TRAIN,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=self._logits)
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["loss"])
+      expected_loss = 1.5514447
+      _assert_metrics(self, expected_loss * weight,
+                      self._expected_eval_metrics(expected_loss), model_fn_ops)
+
   def testMultiClassWithCustomLoss(self):
     n_classes = 3
     head = head_lib.multi_class_head(
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 109c8d25e1..5a63ee7fa8 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -31,6 +31,17 @@ from tensorflow.python.estimator import run_config as core_run_config
 from tensorflow.python.training import server_lib
 
 
+_DEFAULT_UID_WHITE_LIST = [
+    'tf_random_seed',
+    'save_summary_steps',
+    'save_checkpoints_steps',
+    'save_checkpoints_secs',
+    'session_config',
+    'keep_checkpoint_max',
+    'keep_checkpoint_every_n_hours',
+]
+
+
 class Environment(object):
   # For running general distributed training.
   CLOUD = 'cloud'
@@ -312,18 +323,29 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     return new_copy
 
   @experimental
-  def uid(self):
+  def uid(self, whitelist=None):
     """Generates a 'Unique Identifier' based on all internal fields.
 
     Caller should use the uid string to check `RunConfig` instance integrity
     in one session use, but should not rely on the implementation details, which
     is subject to change.
 
+    Args:
+      whitelist: A list of the string names of the properties uid should not
+        include. If `None`, defaults to `_DEFAULT_UID_WHITE_LIST`, which
+        includes most properites user allowes to change.
+
     Returns:
       A uid string.
     """
-    # TODO(b/33295821): Allows user to specify a whitelist.
+    if whitelist is None:
+      whitelist = _DEFAULT_UID_WHITE_LIST
+
     state = {k: v for k, v in self.__dict__.items() if not k.startswith('__')}
+    # Pop out the keys in whitelist.
+    for k in whitelist:
+      state.pop('_' + k, None)
+
     ordered_state = collections.OrderedDict(
         sorted(state.items(), key=lambda t: t[0]))
     # For class instance without __repr__, some special cares are required.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index 14cef7cc43..6d39a9ad13 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -257,6 +257,51 @@ class RunConfigTest(test.TestCase):
     self.assertNotEqual(expected_uid, new_config.uid())
     self.assertEqual(ANOTHER_TEST_DIR, new_config.model_dir)
 
+  def test_uid_for_whitelist(self):
+    whitelist = ["model_dir"]
+    config = run_config_lib.RunConfig(
+        tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
+
+    expected_uid = config.uid(whitelist)
+    self.assertEqual(expected_uid, config.uid(whitelist))
+
+    new_config = config.replace(model_dir=ANOTHER_TEST_DIR)
+    self.assertEqual(TEST_DIR, config.model_dir)
+    self.assertEqual(expected_uid, new_config.uid(whitelist))
+    self.assertEqual(ANOTHER_TEST_DIR, new_config.model_dir)
+
+  def test_uid_for_default_whitelist(self):
+    config = run_config_lib.RunConfig(
+        tf_random_seed=11,
+        save_summary_steps=12,
+        save_checkpoints_steps=13,
+        save_checkpoints_secs=14,
+        session_config=15,
+        keep_checkpoint_max=16,
+        keep_checkpoint_every_n_hours=17)
+    self.assertEqual(11, config.tf_random_seed)
+    self.assertEqual(12, config.save_summary_steps)
+    self.assertEqual(13, config.save_checkpoints_steps)
+    self.assertEqual(14, config.save_checkpoints_secs)
+    self.assertEqual(15, config.session_config)
+    self.assertEqual(16, config.keep_checkpoint_max)
+    self.assertEqual(17, config.keep_checkpoint_every_n_hours)
+
+    new_config = run_config_lib.RunConfig(
+        tf_random_seed=21,
+        save_summary_steps=22,
+        save_checkpoints_steps=23,
+        save_checkpoints_secs=24,
+        session_config=25,
+        keep_checkpoint_max=26,
+        keep_checkpoint_every_n_hours=27)
+    self.assertEqual(config.uid(), new_config.uid())
+    # model_dir is not on the default whitelist.
+    self.assertNotEqual(config.uid(whitelist=[]),
+                        new_config.uid(whitelist=[]))
+    new_config = new_config.replace(model_dir=ANOTHER_TEST_DIR)
+    self.assertNotEqual(config.uid(), new_config.uid())
+
   def test_uid_for_deepcopy(self):
     tf_config = {
         "cluster": {
diff --git a/tensorflow/contrib/learn/python/learn/learn_runner_test.py b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
index 6c8cde453f..77bdcaeb7e 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
@@ -293,8 +293,7 @@ class LearnRunnerRunWithRunConfigTest(test.TestCase):
     def _experiment_fn(run_config, hparams):
       del run_config, hparams  # unused.
       # Explicitly use a new run_config.
-      new_config = run_config_lib.RunConfig(
-          model_dir=_MODIR_DIR, save_checkpoints_steps=123)
+      new_config = run_config_lib.RunConfig(model_dir=_MODIR_DIR + "/123")
 
       return TestExperiment(config=new_config)
 
diff --git a/tensorflow/contrib/losses/__init__.py b/tensorflow/contrib/losses/__init__.py
index 9861ecc1f8..790bf61367 100644
--- a/tensorflow/contrib/losses/__init__.py
+++ b/tensorflow/contrib/losses/__init__.py
@@ -22,10 +22,26 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-# pylint: disable=unused-import,wildcard-import
-from tensorflow.contrib.losses.python import losses
+# pylint: disable=wildcard-import
 from tensorflow.contrib.losses.python.losses import *
-# pylint: enable=unused-import,wildcard-import
+# pylint: enable=wildcard-import
 
 from tensorflow.python.util.all_util import remove_undocumented
-remove_undocumented(__name__, doc_string_modules=[losses])
+
+_allowed_symbols = [
+    'absolute_difference',
+    'add_loss',
+    'hinge_loss',
+    'compute_weighted_loss',
+    'cosine_distance',
+    'get_losses',
+    'get_regularization_losses',
+    'get_total_loss',
+    'log_loss',
+    'mean_pairwise_squared_error',
+    'mean_squared_error',
+    'sigmoid_cross_entropy',
+    'softmax_cross_entropy',
+    'sparse_softmax_cross_entropy',
+]
+remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/losses/python/losses/__init__.py b/tensorflow/contrib/losses/python/losses/__init__.py
index 1b57f0baee..6e9d1d4a77 100644
--- a/tensorflow/contrib/losses/python/losses/__init__.py
+++ b/tensorflow/contrib/losses/python/losses/__init__.py
@@ -12,127 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""## Loss operations for use in neural networks.
+"""Ops for building neural network losses.
 
-Note: By default all the losses are collected into the `GraphKeys.LOSSES`
-collection.
-
-All of the loss functions take a pair of predictions and ground truth labels,
-from which the loss is computed. It is assumed that the shape of both these
-tensors is of the form [batch_size, d1, ... dN] where `batch_size` is the number
-of samples in the batch and `d1` ... `dN` are the remaining dimensions.
-
-It is common, when training with multiple loss functions, to adjust the relative
-strengths of individual losses. This is performed by rescaling the losses via
-a `weight` parameter passed to the loss functions. For example, if we were
-training with both log_loss and sum_of_squares_loss, and we wished that the
-log_loss penalty be twice as severe as the sum_of_squares_loss, we would
-implement this as:
-
-  # Explicitely set the weight.
-  tf.contrib.losses.log(predictions, labels, weight=2.0)
-
-  # Uses default weight of 1.0
-  tf.contrib.losses.sum_of_squares(predictions, labels)
-
-  # All the losses are collected into the `GraphKeys.LOSSES` collection.
-  losses = tf.get_collection(tf.GraphKeys.LOSSES)
-
-While specifying a scalar loss rescales the loss over the entire batch,
-we sometimes want to rescale the loss per batch sample. For example, if we have
-certain examples that matter more to us to get correctly, we might want to have
-a higher loss that other samples whose mistakes matter less. In this case, we
-can provide a weight vector of length `batch_size` which results in the loss
-for each sample in the batch being scaled by the corresponding weight element.
-For example, consider the case of a classification problem where we want to
-maximize our accuracy but we especially interested in obtaining high accuracy
-for a specific class:
-
-  inputs, labels = LoadData(batch_size=3)
-  logits = MyModelPredictions(inputs)
-
-  # Ensures that the loss for examples whose ground truth class is `3` is 5x
-  # higher than the loss for all other examples.
-  weight = tf.multiply(4, tf.cast(tf.equal(labels, 3), tf.float32)) + 1
-
-  onehot_labels = tf.one_hot(labels, num_classes=5)
-  tf.contrib.losses.softmax_cross_entropy(logits, onehot_labels, weight=weight)
-
-Finally, in certain cases, we may want to specify a different loss for every
-single measurable value. For example, if we are performing per-pixel depth
-prediction, or per-pixel denoising, a single batch sample has P values where P
-is the number of pixels in the image. For many losses, the number of measurable
-values matches the number of elements in the predictions and labels tensors.
-For others, such as softmax_cross_entropy and cosine_distance, the
-loss functions reduces the dimensions of the inputs to produces a tensor of
-losses for each measurable value. For example, softmax_cross_entropy takes as
-input predictions and labels of dimension [batch_size, num_classes] but the
-number of measurable values is [batch_size]. Consequently, when passing a weight
-tensor to specify a different loss for every measurable value, the dimension of
-the tensor will depend on the loss being used.
-
-For a concrete example, consider the case of per-pixel depth prediction where
-certain ground truth depth values are missing (due to sensor noise in the
-capture process). In this case, we want to assign zero weight to losses for
-these predictions.
-
-  # 'depths' that are missing have a value of 0:
-  images, depths = LoadData(...)
-  predictions = MyModelPredictions(images)
-
-  weight = tf.cast(tf.greater(depths, 0), tf.float32)
-  loss  = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
-
-Note that when using weights for the losses, the final average is computed
-by rescaling the losses by the weights and then dividing by the total number of
-non-zero samples. For an arbitrary set of weights, this may not necessarily
-produce a weighted average. Instead, it simply and transparently rescales the
-per-element losses before averaging over the number of observations. For example
-if the losses computed by the loss function is an array [4, 1, 2, 3] and the
-weights are an array [1, 0.5, 3, 9], then the average loss is:
-
-  (4*1 + 1*0.5 + 2*3 + 3*9) / 4
-
-However, with a single loss function and an arbitrary set of weights, one can
-still easily create a loss function such that the resulting loss is a
-weighted average over the individual prediction errors:
-
-  images, labels = LoadData(...)
-  predictions = MyModelPredictions(images)
-
-  weight = MyComplicatedWeightingFunction(labels)
-  weight = tf.div(weight, tf.size(weight))
-  loss = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
-
-@@absolute_difference
-@@add_loss
-@@hinge_loss
-@@compute_weighted_loss
-@@cosine_distance
-@@get_losses
-@@get_regularization_losses
-@@get_total_loss
-@@log_loss
-@@mean_pairwise_squared_error
-@@mean_squared_error
-@@sigmoid_cross_entropy
-@@softmax_cross_entropy
-@@sparse_softmax_cross_entropy
-
-The following are deprecated in favor of `mean_pairwise_squared_error` and
-`mean_squared_error`.
-@@sum_of_pairwise_squares
-@@sum_of_squares
+See @{$python/contrib.losses}.
 """
 
-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-# pylint: disable=unused-import,wildcard-import
+# pylint: disable=wildcard-import
 from tensorflow.contrib.losses.python.losses.loss_ops import *
-from tensorflow.python.util.all_util import make_all
-# pylint: enable=unused-import,wildcard-import
-
-__all__ = make_all(__name__)
+# pylint: enable=wildcard-import
diff --git a/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in b/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
index ccbbfa4132..2a6f66edcb 100644
--- a/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
+++ b/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in
@@ -47,7 +47,6 @@ GRAPH_TRANSFER_SRCS := \
 tensorflow/cc/framework/scope.cc \
 tensorflow/cc/framework/ops.cc \
 tensorflow/cc/ops/const_op.cc \
-tensorflow/core/kernels/function_ops.cc \
 tensorflow/core/kernels/hexagon/graph_transfer_utils.cc \
 tensorflow/core/kernels/hexagon/graph_transferer.cc \
 tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc \
diff --git a/tensorflow/contrib/seq2seq/__init__.py b/tensorflow/contrib/seq2seq/__init__.py
index dd497197e3..dc159b93a3 100644
--- a/tensorflow/contrib/seq2seq/__init__.py
+++ b/tensorflow/contrib/seq2seq/__init__.py
@@ -16,36 +16,6 @@
 """Ops for building neural network seq2seq decoders and losses.
 
 See the @{$python/contrib.seq2seq} guide.
-
-@@Decoder
-@@dynamic_decode
-
-@@BasicDecoderOutput
-@@BasicDecoder
-
-@@BeamSearchDecoderOutput
-@@BeamSearchDecoderState
-@@BeamSearchDecoder
-@@FinalBeamSearchDecoderOutput
-
-@@Helper
-@@CustomHelper
-@@GreedyEmbeddingHelper
-@@ScheduledEmbeddingTrainingHelper
-@@ScheduledOutputTrainingHelper
-@@TrainingHelper
-
-@@BahdanauAttention
-@@LuongAttention
-
-@@hardmax
-
-@@AttentionWrapperState
-@@AttentionWrapper
-
-@@gather_tree
-
-@@tile_batch
 """
 
 from __future__ import absolute_import
@@ -63,6 +33,30 @@ from tensorflow.contrib.seq2seq.python.ops.loss import *
 from tensorflow.python.util.all_util import remove_undocumented
 # pylint: enable=unused-import,widcard-import,line-too-long
 
-_allowed_symbols = ["sequence_loss"]
+_allowed_symbols = [
+    "sequence_loss",
+    "Decoder",
+    "dynamic_decode",
+    "BasicDecoder",
+    "BasicDecoderOutput",
+    "BeamSearchDecoder",
+    "BeamSearchDecoderOutput",
+    "BeamSearchDecoderState",
+    "Helper",
+    "CustomHelper",
+    "FinalBeamSearchDecoderOutput",
+    "gather_tree",
+    "GreedyEmbeddingHelper",
+    "ScheduledEmbeddingTrainingHelper",
+    "ScheduledOutputTrainingHelper",
+    "TrainingHelper",
+    "BahdanauAttention",
+    "LuongAttention",
+    "hardmax",
+    "AttentionWrapperState",
+    "AttentionWrapper",
+    "AttentionMechanism",
+    "tile_batch"]
+
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index a0f1775257..8d1c0c59e0 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -39,6 +39,7 @@ from tensorflow.python.util import nest
 
 
 __all__ = [
+    "AttentionMechanism",
     "AttentionWrapper",
     "AttentionWrapperState",
     "LuongAttention",
diff --git a/tensorflow/contrib/seq2seq/python/ops/helper.py b/tensorflow/contrib/seq2seq/python/ops/helper.py
index d6c0527ad2..bdd7d7ca73 100644
--- a/tensorflow/contrib/seq2seq/python/ops/helper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/helper.py
@@ -23,8 +23,6 @@ import abc
 
 import six
 
-from tensorflow.contrib.distributions.python.ops import bernoulli
-from tensorflow.contrib.distributions.python.ops import categorical
 from tensorflow.contrib.seq2seq.python.ops import decoder
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -35,6 +33,8 @@ from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import tensor_array_ops
+from tensorflow.python.ops.distributions import bernoulli
+from tensorflow.python.ops.distributions import categorical
 from tensorflow.python.util import nest
 
 __all__ = [
diff --git a/tensorflow/core/common_runtime/shape_refiner.cc b/tensorflow/core/common_runtime/shape_refiner.cc
index 5135355a94..8eb383a14f 100644
--- a/tensorflow/core/common_runtime/shape_refiner.cc
+++ b/tensorflow/core/common_runtime/shape_refiner.cc
@@ -88,10 +88,7 @@ Status ShapeRefiner::AddNode(const Node* node) {
   }
 
   // This needs to be filled in with real data in a second pass.
-  std::vector<const Tensor*> input_tensors(node->num_inputs());
-  std::vector<Tensor> real_tensors(node->num_inputs());
-  std::vector<bool> attempted_materialization(node->num_inputs());
-  std::vector<bool> attempted_tensor_as_shape_conversion(node->num_inputs());
+  std::vector<const Tensor*> input_tensors(node->num_inputs(), nullptr);
   std::vector<ShapeHandle> input_tensors_as_shapes;
 
   // Create the inference context for this node with the existing input shapes.
@@ -104,78 +101,7 @@ Status ShapeRefiner::AddNode(const Node* node) {
   }
 
   // Run the shape inference function, and return if there was an error.
-  if (op_reg_data->shape_inference_fn) {
-    TF_RETURN_IF_ERROR(c->Run(op_reg_data->shape_inference_fn));
-  } else {
-    TF_RETURN_IF_ERROR(c->Run(shape_inference::UnknownShape));
-  }
-
-  // We must run the shape function repeatedly, in case users write
-  // shape functions where they only conditionally call input_tensor()
-  // based on the values of another input tensor.
-  bool rerun_shape_fn;
-  do {
-    // If the result of running shape inference would have benefitted
-    // from knowing the values of input tensors, try to materialize
-    // the results of those tensors, and then run the shape inference
-    // function again using those known tensors.
-    rerun_shape_fn = false;
-
-    // NOTE: It is possible to batch the extraction and
-    // materialization of inputs, instead of materializing one input
-    // at a time like we do below.  If input-at-a-time computation
-    // becomes a bottleneck, we could separate ExtractConstantSubgraph
-    // into two functions: one that returns true if an input is
-    // derivable from constants, and another function that extracts
-    // the subgraph for multiple target nodes and executes the whole
-    // subgraph once.
-
-    for (int i = 0; i < c->num_inputs(); ++i) {
-      if (!c->requested_input_tensor(i)) {
-        continue;
-      }
-      // Check if we have not already filled in the requested input,
-      // and if not, try to materialize the tensors.
-      if (!attempted_materialization[i]) {
-        attempted_materialization[i] = true;
-
-        Tensor result;
-        bool evaluated = false;
-        TF_RETURN_IF_ERROR(
-            EvaluateConstantTensorForEdge(node, i, &evaluated, &result));
-        if (evaluated) {
-          real_tensors[i] = result;
-          input_tensors[i] = &real_tensors[i];
-          // We have more concrete information about a shape,
-          // so re-run shape inference.
-          rerun_shape_fn = true;
-        }
-      }
-      if (c->requested_input_tensor_as_partial_shape(i) &&
-          !attempted_tensor_as_shape_conversion[i]) {
-        attempted_tensor_as_shape_conversion[i] = true;
-        if (i >= input_tensors_as_shapes.size()) {
-          input_tensors_as_shapes.resize(i + 1);
-        }
-        ShapeHandle s;
-        TF_RETURN_IF_ERROR(ConstantPartialShape(c.get(), node, i, &s));
-        input_tensors_as_shapes[i] = s;
-        rerun_shape_fn = true;
-      }
-    }
-
-    if (rerun_shape_fn) {
-      // We have more information about the shapes on this pass,
-      // so re-run shape inference.
-      c->set_input_tensors(input_tensors);
-      c->set_input_tensors_as_shapes(input_tensors_as_shapes);
-      if (op_reg_data->shape_inference_fn) {
-        TF_RETURN_IF_ERROR(op_reg_data->shape_inference_fn(c.get()));
-      } else {
-        TF_RETURN_IF_ERROR(shape_inference::UnknownShape(c.get()));
-      }
-    }
-  } while (rerun_shape_fn);
+  TF_RETURN_IF_ERROR(RunShapeFn(node, op_reg_data, c.get()));
 
   // Store the resulting InferenceContext object in the map.
   node_to_context_[node].swap(c);
@@ -211,6 +137,74 @@ Status ShapeRefiner::SetShape(const Node* node, int output_port,
   return Status::OK();
 }
 
+Status ShapeRefiner::UpdateNode(const Node* node, bool* refined) {
+  auto it = node_to_context_.find(node);
+  if (it == node_to_context_.end()) {
+    *refined = true;
+    return AddNode(node);
+  }
+  InferenceContext* node_context = it->second.get();
+
+  // Give up if the context wasn't successfully built by the AddNode() method.
+  TF_RETURN_IF_ERROR(node_context->construction_status());
+
+  // Check if the shapes of the nodes in the fan-in of this node have changed,
+  // and if they have update the node input shapes.
+  for (const Edge* e : node->in_edges()) {
+    if (e->IsControlEdge()) continue;
+
+    Node* input = e->src();
+    auto iter = node_to_context_.find(input);
+    if (iter == node_to_context_.end()) {
+      return errors::FailedPrecondition(
+          "Input ", e->dst_input(), " ('", input->name(), "') for '",
+          node->name(), "' was not previously added to ShapeRefiner.");
+    }
+
+    InferenceContext* c = iter->second.get();
+    DCHECK_GE(e->dst_input(), 0);
+    if (node_context->set_input(e->dst_input(), c->output(e->src_output()))) {
+      *refined = true;
+    }
+
+    // Also propagate handle shape and dtype of edges which are carrying
+    // resource handles.
+    if (e->src()->output_type(e->src_output()) == DT_RESOURCE) {
+      if (node_context->set_input_handle_dtype(
+              e->dst_input(), c->output_handle_dtype(e->src_output()))) {
+        *refined = true;
+      }
+      if (node_context->set_input_handle_shape(
+              e->dst_input(), c->output_handle_shape(e->src_output()))) {
+        *refined = true;
+      }
+    }
+  }
+
+  if (!*refined) {
+    // No input shape has changed, we're done
+    return Status::OK();
+  }
+
+  // Get and run the shape function for this node to update the shapes of the
+  // outputs.
+  const OpRegistrationData* op_reg_data;
+  TF_RETURN_IF_ERROR(ops_registry_->LookUp(node->type_string(), &op_reg_data));
+  if (op_reg_data->shape_inference_fn == nullptr &&
+      require_shape_inference_fns_) {
+    return errors::InvalidArgument(
+        "No shape inference function exists for op '", node->type_string(),
+        "', did you forget to define it?");
+  }
+
+  if (!op_reg_data->shape_inference_fn) {
+    // There is nothing more we can infer
+    return Status::OK();
+  }
+
+  return RunShapeFn(node, op_reg_data, node_context);
+}
+
 Status ShapeRefiner::EvaluateConstantTensorForEdge(const Node* node,
                                                    int dst_idx, bool* evaluated,
                                                    Tensor* result) {
@@ -463,4 +457,93 @@ Status ShapeRefiner::ConstantPartialShape(InferenceContext* target_context,
   return Status::OK();
 }
 
+Status ShapeRefiner::RunShapeFn(const Node* node,
+                                const OpRegistrationData* op_reg_data,
+                                shape_inference::InferenceContext* c) {
+  // This will be filled in with real data in a second pass.
+  std::vector<const Tensor*> input_tensors(node->num_inputs(), nullptr);
+  std::vector<Tensor> real_tensors(node->num_inputs());
+  std::vector<bool> attempted_materialization(node->num_inputs());
+  std::vector<bool> attempted_tensor_as_shape_conversion(node->num_inputs());
+  std::vector<ShapeHandle> input_tensors_as_shapes;
+
+  // Run the shape inference function, and return if there was an error.
+  c->set_input_tensors(input_tensors);
+  c->set_input_tensors_as_shapes(input_tensors_as_shapes);
+  if (op_reg_data->shape_inference_fn) {
+    TF_RETURN_IF_ERROR(c->Run(op_reg_data->shape_inference_fn));
+  } else {
+    TF_RETURN_IF_ERROR(c->Run(shape_inference::UnknownShape));
+  }
+
+  // We must run the shape function repeatedly, in case users write
+  // shape functions where they only conditionally call input_tensor()
+  // based on the values of another input tensor.
+  bool rerun_shape_fn;
+  do {
+    // If the result of running shape inference would have benefitted
+    // from knowing the values of input tensors, try to materialize
+    // the results of those tensors, and then run the shape inference
+    // function again using those known tensors.
+    rerun_shape_fn = false;
+
+    // NOTE: It is possible to batch the extraction and
+    // materialization of inputs, instead of materializing one input
+    // at a time like we do below.  If input-at-a-time computation
+    // becomes a bottleneck, we could separate ExtractConstantSubgraph
+    // into two functions: one that returns true if an input is
+    // derivable from constants, and another function that extracts
+    // the subgraph for multiple target nodes and executes the whole
+    // subgraph once.
+
+    for (int i = 0; i < c->num_inputs(); ++i) {
+      if (!c->requested_input_tensor(i)) {
+        continue;
+      }
+      // Check if we have not already filled in the requested input,
+      // and if not, try to materialize the tensors.
+      if (!attempted_materialization[i]) {
+        attempted_materialization[i] = true;
+
+        Tensor result;
+        bool evaluated = false;
+        TF_RETURN_IF_ERROR(
+            EvaluateConstantTensorForEdge(node, i, &evaluated, &result));
+        if (evaluated) {
+          real_tensors[i] = result;
+          input_tensors[i] = &real_tensors[i];
+          // We have more concrete information about a shape,
+          // so re-run shape inference.
+          rerun_shape_fn = true;
+        }
+      }
+      if (c->requested_input_tensor_as_partial_shape(i) &&
+          !attempted_tensor_as_shape_conversion[i]) {
+        attempted_tensor_as_shape_conversion[i] = true;
+        if (i >= input_tensors_as_shapes.size()) {
+          input_tensors_as_shapes.resize(i + 1);
+        }
+        ShapeHandle s;
+        TF_RETURN_IF_ERROR(ConstantPartialShape(c, node, i, &s));
+        input_tensors_as_shapes[i] = s;
+        rerun_shape_fn = true;
+      }
+    }
+
+    if (rerun_shape_fn) {
+      // We have more information about the shapes on this pass,
+      // so re-run shape inference.
+      c->set_input_tensors(input_tensors);
+      c->set_input_tensors_as_shapes(input_tensors_as_shapes);
+      if (op_reg_data->shape_inference_fn) {
+        TF_RETURN_IF_ERROR(op_reg_data->shape_inference_fn(c));
+      } else {
+        TF_RETURN_IF_ERROR(shape_inference::UnknownShape(c));
+      }
+    }
+  } while (rerun_shape_fn);
+
+  return Status::OK();
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/common_runtime/shape_refiner.h b/tensorflow/core/common_runtime/shape_refiner.h
index 2d04ea1505..9709bd0302 100644
--- a/tensorflow/core/common_runtime/shape_refiner.h
+++ b/tensorflow/core/common_runtime/shape_refiner.h
@@ -55,6 +55,11 @@ class ShapeRefiner {
   Status SetShape(const Node* node, int output_port,
                   shape_inference::ShapeHandle shape);
 
+  // Update the input shapes of node in case the shapes of the fan-ins of 'node'
+  // have themselves been modified (For example, in case of incremental shape
+  // refinement). Sets refined to true if any of the node shape has changed.
+  Status UpdateNode(const Node* node, bool* refined);
+
   // Returns the InferenceContext for 'node', if present.
   shape_inference::InferenceContext* GetContext(const Node* node) const {
     auto it = node_to_context_.find(node);
@@ -108,6 +113,9 @@ class ShapeRefiner {
                               const Node* node, int dst_idx,
                               shape_inference::ShapeHandle* result);
 
+  Status RunShapeFn(const Node* node, const OpRegistrationData* op_reg_data,
+                    shape_inference::InferenceContext* c);
+
   int32 graph_def_version_;
   const OpRegistryInterface* const ops_registry_;
 
diff --git a/tensorflow/core/common_runtime/shape_refiner_test.cc b/tensorflow/core/common_runtime/shape_refiner_test.cc
index d7e7c3b5ad..b8df6dd4f6 100644
--- a/tensorflow/core/common_runtime/shape_refiner_test.cc
+++ b/tensorflow/core/common_runtime/shape_refiner_test.cc
@@ -768,5 +768,38 @@ TEST(ShapeRefinerTest, ConstantValueAsShape_ConcatInvalidDimValue) {
             m.AddNode(result).error_message());
 }
 
+TEST(ShapeRefinerTest, IncrementalUpdates) {
+  Scope root = Scope::NewRootScope();
+  Graph* g = root.graph();
+  Node* queue;
+  TF_CHECK_OK(NodeBuilder("queue", "FIFOQueueV2")
+                  .Attr("component_types", {DT_FLOAT})
+                  .Finalize(g, &queue));
+  Node* dequeue;
+  TF_CHECK_OK(NodeBuilder("dequeue", "QueueDequeueV2")
+                  .Attr("component_types", {DT_FLOAT})
+                  .Input(queue)
+                  .Finalize(g, &dequeue));
+  ShapeRefiner m(TF_GRAPH_DEF_VERSION, OpRegistry::Global());
+  TF_ASSERT_OK(m.AddNode(queue));
+  TF_ASSERT_OK(m.AddNode(dequeue));
+
+  // At this point, the shapes of the dequeued tensor are unknown.
+  shape_inference::InferenceContext* ctx = m.GetContext(dequeue);
+  EXPECT_EQ("?", ctx->DebugString(ctx->output(0)));
+
+  // Inject a shape, and incrementally propagate it to the dequeue op.
+  ctx = m.GetContext(queue);
+  shape_inference::ShapeHandle shp = ctx->MakeShape({3, 7});
+  ctx->set_output_handle_shape(0, shp);
+  ctx->set_output_handle_dtype(0, DT_FLOAT);
+
+  bool refined = false;
+  TF_ASSERT_OK(m.UpdateNode(dequeue, &refined));
+  EXPECT_TRUE(refined);
+  ctx = m.GetContext(dequeue);
+  EXPECT_EQ("[3,7]", ctx->DebugString(ctx->output(0)));
+}
+
 }  // namespace
 }  // namespace tensorflow
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index c731155924..a387d49613 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -582,7 +582,7 @@ string Print(const GraphDef& gdef) {
   for (size_t i = 0; i < arg.size(); ++i) {
     const NodeDef* n = arg[i];
     if (i > 0) strings::StrAppend(&out, ", ");
-    CHECK_EQ(2, n->attr_size());
+    CHECK_GE(n->attr_size(), 2);
     strings::StrAppend(&out, n->name(), ":", get_type(*n));
   }
   strings::StrAppend(&out, ") -> (");
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index e88f6dbb04..71663027b3 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -191,6 +191,17 @@ class InferenceContext {
     return s;
   }
 
+  // Set the shape of the input in position idx. This requires idx to be in the
+  // [0, num_inputs) range. Returns true iff the stored input shape has been
+  // updated with a different handle.
+  bool set_input(int idx, ShapeHandle shape) {
+    if (!inputs_[idx].SameHandle(shape)) {
+      inputs_[idx] = shape;
+      return true;
+    } else {
+      return false;
+    }
+  }
   ShapeHandle input(int64 idx) const { return inputs_[idx]; }
   Status input(StringPiece input_name, std::vector<ShapeHandle>* output) const;
   int num_inputs() const { return inputs_.size(); }
@@ -430,15 +441,53 @@ class InferenceContext {
   // and dtypes of tensors which can be accessed via the handle. These methods
   // propagate that information. Output handle dtypes and shapes are ignored if
   // the output tensor is not of type DT_RESOURCE.
+
+  // Set the shape corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_inputs) range. Returns true iff the stored shape
+  // has been updated with a different handle.
+  bool set_input_handle_shape(int idx, ShapeHandle shape) {
+    if (!input_handle_shape_[idx].SameHandle(shape)) {
+      input_handle_shape_[idx] = shape;
+      return true;
+    }
+    return false;
+  }
+
+  // Set the type corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_inputs) range. Returns true iff the stored type
+  // has been updated.
+  bool set_input_handle_dtype(int idx, DataType dtype) {
+    if (input_handle_dtype_[idx] != dtype) {
+      input_handle_dtype_[idx] = dtype;
+      return true;
+    }
+    return false;
+  }
   ShapeHandle input_handle_shape(int idx);
   DataType input_handle_dtype(int idx) const {
     return input_handle_dtype_[idx];
   }
-  void set_output_handle_shape(int idx, ShapeHandle shape) {
-    output_handle_shape_[idx] = shape;
+
+  // Set the shape corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_outputs) range.
+  // Returns true iff the stored shape has been updated with a different handle.
+  bool set_output_handle_shape(int idx, ShapeHandle shape) {
+    if (!output_handle_shape_[idx].SameHandle(shape)) {
+      output_handle_shape_[idx] = shape;
+      return true;
+    }
+    return false;
   }
-  void set_output_handle_dtype(int idx, DataType dtype) {
-    output_handle_dtype_[idx] = dtype;
+
+  // Set the type corresponding to the resource in position idx. This requires
+  // idx to be in the [0, num_outputs) range. Returns true iff the stored type
+  // has been updated.
+  bool set_output_handle_dtype(int idx, DataType dtype) {
+    if (output_handle_dtype_[idx] != dtype) {
+      output_handle_dtype_[idx] = dtype;
+      return true;
+    }
+    return false;
   }
   ShapeHandle output_handle_shape(int idx) const {
     return output_handle_shape_[idx];
diff --git a/tensorflow/core/framework/shape_inference_test.cc b/tensorflow/core/framework/shape_inference_test.cc
index c82b506e4b..78d1fc0fc5 100644
--- a/tensorflow/core/framework/shape_inference_test.cc
+++ b/tensorflow/core/framework/shape_inference_test.cc
@@ -558,6 +558,11 @@ TEST_F(ShapeInferenceTest, MergeShape) {
   EXPECT_TRUE(SameHandle(c.Dim(s_1_u, 0), c.Dim(out, 0)));
   EXPECT_TRUE(SameHandle(c.Dim(s_u_2, 1), c.Dim(out, 1)));
 
+  auto s_u1 = c.UnknownShapeOfRank(1);
+  auto s_u2 = c.UnknownShapeOfRank(1);
+  TF_EXPECT_OK(c.Merge(s_u1, s_u2, &out));
+  EXPECT_TRUE(SameHandle(s_u1, out));
+
   // Incompatible merges give errors and set out to nullptr.
   out = s_unknown;
   EXPECT_TRUE(
diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index 34ad404856..b48025b86f 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -58,6 +58,7 @@ cc_library(
         "//tensorflow/core:core_cpu",
         "//tensorflow/core:direct_session",
         "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:utils",
         "//tensorflow/core/kernels:ops_util",
     ],
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 09c8d55efd..abb9e4245e 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include <memory>
 
 #include "tensorflow/cc/training/queue_runner.h"
+#include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/kernels/ops_util.h"
 #include "tensorflow/core/lib/core/errors.h"
@@ -111,6 +112,8 @@ Status SingleMachine::Run(const GraphDef& graph_def,
         for (auto node : *init_metadata_.mutable_cost_graph()->mutable_node()) {
           node.clear_compute_cost();
         }
+        // Also clear the timeline to save memory
+        init_metadata_.clear_step_stats();
       }
       for (int i = 0; i < queue_runner_defs_.size(); ++i) {
         std::unique_ptr<QueueRunner> queue_runner;
@@ -133,15 +136,17 @@ Status SingleMachine::Run(const GraphDef& graph_def,
     }
   }
 
-  TF_RETURN_IF_ERROR(RunWithTimeout(feed, fetch, metadata));
-
   if (metadata) {
-    // Add the costs of initialization and the queue runners.
-    metadata->MergeFrom(init_metadata_);
-    return coordinator_->ExportCostGraph(metadata->mutable_cost_graph());
+    TF_RETURN_IF_ERROR(RunWithTimeout(feed, fetch, metadata));
+    // Merge the costs of the initialization and the queue runners.
+    CostGraphDef queue_costs;
+    TF_RETURN_IF_ERROR(coordinator_->ExportCostGraph(&queue_costs));
+    MergeCosts(metadata->mutable_cost_graph(), init_metadata_.cost_graph(),
+               queue_costs);
   } else {
-    return Status::OK();
+    return RunWithTimeout(feed, fetch, nullptr);
   }
+  return Status::OK();
 }
 
 Status SingleMachine::RunWithTimeout(
@@ -249,5 +254,36 @@ Status SingleMachine::ResetSession() {
   return Status::OK();
 }
 
+void SingleMachine::MergeCosts(CostGraphDef* graph_costs,
+                               const CostGraphDef& init_costs,
+                               const CostGraphDef& queue_costs) {
+  graph_costs->mutable_node()->Reserve(graph_costs->node_size() +
+                                       init_costs.node_size() +
+                                       queue_costs.node_size());
+  std::unordered_set<string> nodes_seen;
+  for (const auto& node : graph_costs->node()) {
+    nodes_seen.insert(node.name());
+  }
+
+  // The costs obtained by running the main graph could be more stable than
+  // the one we get from the queue runners since the queue runners run
+  // asynchronously.
+  for (const auto& node : queue_costs.node()) {
+    if (nodes_seen.find(node.name()) != nodes_seen.end()) {
+      continue;
+    }
+    graph_costs->add_node()->MergeFrom(node);
+  }
+
+  // Don't overwrite the costs with that generated during initialization since
+  // these are possibly outdated.
+  for (const auto& node : init_costs.node()) {
+    if (nodes_seen.find(node.name()) != nodes_seen.end()) {
+      continue;
+    }
+    graph_costs->add_node()->MergeFrom(node);
+  }
+}
+
 }  // namespace grappler
 }  // namespace tensorflow
diff --git a/tensorflow/core/grappler/clusters/single_machine.h b/tensorflow/core/grappler/clusters/single_machine.h
index f69b11df5d..f2773376e4 100644
--- a/tensorflow/core/grappler/clusters/single_machine.h
+++ b/tensorflow/core/grappler/clusters/single_machine.h
@@ -47,6 +47,8 @@ class SingleMachine : public Cluster {
                         RunMetadata* run_metadata, int64 timeout_s);
   Status ResetSession();
   Status CloseSession(bool use_timeout);
+  void MergeCosts(CostGraphDef* graph_costs, const CostGraphDef& init_costs,
+                  const CostGraphDef& queue_costs);
 
   const int num_gpus_;
   std::unique_ptr<Session> session_;
diff --git a/tensorflow/core/grappler/clusters/single_machine_test.cc b/tensorflow/core/grappler/clusters/single_machine_test.cc
index 0572aa04be..17db48817e 100644
--- a/tensorflow/core/grappler/clusters/single_machine_test.cc
+++ b/tensorflow/core/grappler/clusters/single_machine_test.cc
@@ -159,6 +159,121 @@ TEST_F(SingleMachineTest, InitializationMemory) {
   EXPECT_TRUE(found);
 }
 
+namespace {
+template <class T>
+inline void SetNodeAttr(const string& key, const T& value, NodeDef* node) {
+  AttrValue attr_value;
+  SetAttrValue(value, &attr_value);
+  auto* attr_map = node->mutable_attr();
+  (*attr_map)[key] = attr_value;
+}
+template <>
+inline void SetNodeAttr(const string& key, const Tensor& tensor,
+                        NodeDef* node) {
+  TensorProto tensor_proto;
+  tensor.AsProtoTensorContent(&tensor_proto);
+  SetNodeAttr(key, tensor_proto, node);
+}
+
+}  // namespace
+
+TEST_F(SingleMachineTest, PersistentMemory) {
+  // Build a hashtable and its initialization graph.
+  GrapplerItem item;
+  const DataType key_dtype = DT_INT64;
+  const DataType data_dtype = DT_INT64;
+
+  NodeDef* hashtable_node = item.graph.add_node();
+  hashtable_node->set_op("HashTable");
+  hashtable_node->set_name("hash_table");
+  SetNodeAttr("key_dtype", key_dtype, hashtable_node);
+  SetNodeAttr("value_dtype", data_dtype, hashtable_node);
+
+  // Initial hashtable keys and values
+  NodeDef* keys_node = item.graph.add_node();
+  keys_node->set_op("Const");
+  keys_node->set_name("table_keys");
+  SetNodeAttr("dtype", key_dtype, keys_node);
+  Tensor keys(key_dtype, TensorShape{2});
+  keys.vec<int64>()(0) = 123;
+  keys.vec<int64>()(1) = 321;
+  SetNodeAttr("value", keys, keys_node);
+
+  NodeDef* values_node = item.graph.add_node();
+  values_node->set_op("Const");
+  values_node->set_name("table_values");
+  SetNodeAttr("dtype", data_dtype, values_node);
+  Tensor values(data_dtype, TensorShape{2});
+  values.vec<int64>()(0) = 789;
+  values.vec<int64>()(1) = 987;
+  SetNodeAttr("value", values, values_node);
+
+  // InitializeTable node
+  NodeDef* init_table_node = item.graph.add_node();
+  init_table_node->set_op("InitializeTable");
+  init_table_node->set_name("initialize_table");
+  SetNodeAttr("Tkey", key_dtype, init_table_node);
+  SetNodeAttr("Tval", data_dtype, init_table_node);
+  *init_table_node->add_input() = "hash_table";
+  *init_table_node->add_input() = "table_keys";
+  *init_table_node->add_input() = "table_values";
+  item.init_ops.push_back(init_table_node->name());
+
+  // Key to lookup
+  NodeDef* query_node = item.graph.add_node();
+  query_node->set_op("Const");
+  query_node->set_name("query");
+  SetNodeAttr("dtype", key_dtype, query_node);
+  Tensor query(key_dtype, TensorShape({}));
+  query.flat<int64>()(0) = 0;
+  SetNodeAttr("value", query, query_node);
+
+  // Default return value of hashtable lookup
+  NodeDef* default_value_node = item.graph.add_node();
+  default_value_node->set_op("Const");
+  default_value_node->set_name("default_table_value");
+  SetNodeAttr("dtype", data_dtype, default_value_node);
+  Tensor dflt(data_dtype, TensorShape({}));
+  dflt.flat<int64>()(0) = 456;
+  SetNodeAttr("value", dflt, default_value_node);
+
+  // HashTable lookup node
+  NodeDef* lookup_node = item.graph.add_node();
+  lookup_node->set_op("LookupTableFind");
+  lookup_node->set_name("table_lookup");
+  SetNodeAttr("Tin", key_dtype, lookup_node);
+  SetNodeAttr("Tout", data_dtype, lookup_node);
+  *lookup_node->add_input() = "hash_table";
+  *lookup_node->add_input() = "query";
+  *lookup_node->add_input() = "default_table_value";
+  item.fetch.push_back(lookup_node->name());
+
+  // Run the graph
+  TF_CHECK_OK(cluster_->Initialize(item));
+  RunMetadata metadata;
+  TF_CHECK_OK(cluster_->Run(item.graph, item.feed, item.fetch, &metadata));
+
+  // Check the cost model.
+  bool found_table_init = false;
+  bool found_hashtable = false;
+  for (const auto& node : metadata.cost_graph().node()) {
+    if (node.name() == "hash_table") {
+      found_hashtable = true;
+      // Persistent memory usage should be 0 since it's recorded as part of the
+      // initialize_table op.
+      EXPECT_EQ(0, node.host_persistent_memory_size());
+      EXPECT_EQ(0, node.device_persistent_memory_size());
+    } else if (node.name() == "initialize_table") {
+      found_table_init = true;
+      // Persistent memory should hold 2 keys and 2 values.
+      EXPECT_LE(4 * sizeof(int64), node.host_persistent_memory_size());
+      EXPECT_EQ(0, node.device_persistent_memory_size());
+    }
+  }
+  EXPECT_TRUE(found_table_init);
+  EXPECT_TRUE(found_hashtable);
+}
+
 }  // namespace
 }  // namespace grappler
 }  // namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index d078d9af09..e784c2df44 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -50,11 +50,13 @@ cc_test(
     args = ["--heap_check=local"],  # The GPU tracer leaks memory
     deps = [
         ":graph_properties",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:scope",
+        "//tensorflow/core:framework",
         "//tensorflow/core:lib_proto_parsing",
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
         "//tensorflow/core/grappler:grappler_item",
-        "//tensorflow/core/grappler:grappler_item_builder",
         "//tensorflow/core/grappler/clusters:single_machine",
         "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
     ],
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 06e91af2c2..31c1043ae6 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -15,6 +15,9 @@ limitations under the License.
 
 #include "tensorflow/core/grappler/costs/graph_properties.h"
 
+#include <queue>
+#include <unordered_map>
+#include <unordered_set>
 #include "tensorflow/core/common_runtime/shape_refiner.h"
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/graph/graph_constructor.h"
@@ -31,6 +34,76 @@ Status GraphProperties::InferStatically() {
   Status s = ImportGraphDef(options, item_.graph, &graph, &shape_refiner);
   TF_RETURN_IF_ERROR(s);
 
+  // List the resources and the nodes using them
+  std::unordered_map<const Node*, std::unordered_set<const Node*>> resources;
+  for (const Node* const node : graph.nodes()) {
+    for (int i = 0; i < node->num_inputs(); ++i) {
+      if (node->input_type(i) == DataType::DT_RESOURCE) {
+        const Node* resource;
+        TF_CHECK_OK(node->input_node(i, &resource));
+        resources[resource].insert(node);
+      }
+    }
+  }
+
+  // If we found a resource, try to propagate the shapes through it.
+  bool done = true;
+  do {
+    std::queue<const Node*> new_shapes;
+    for (const auto& resource_data : resources) {
+      const Node* qnode = resource_data.first;
+      StringPiece type(qnode->type_string());
+      if (!type.ends_with("QueueV2")) {
+        continue;
+      }
+      auto qctx = shape_refiner.GetContext(qnode);
+      if (!qctx) {
+        continue;
+      }
+      DataType queue_type = qctx->output_handle_dtype(0);
+      shape_inference::ShapeHandle queue_shp = qctx->output_handle_shape(0);
+      if (qctx->FullyDefined(queue_shp) && queue_type != DT_INVALID) {
+        continue;
+      }
+
+      for (const auto& node : resource_data.second) {
+        auto ctx = shape_refiner.GetContext(node);
+        if (!ctx) {
+          continue;
+        }
+        if (node->type_string().find("Enqueue") != std::string::npos) {
+          if (ctx->num_inputs() == 2) {
+            const DataType dtype = node->input_type(1);
+            if (queue_type == DT_INVALID) {
+              queue_type = dtype;
+            } else {
+              CHECK_EQ(queue_type, dtype);
+            }
+            shape_inference::ShapeHandle shp = ctx->input(1);
+            TF_RETURN_IF_ERROR(qctx->Merge(queue_shp, shp, &queue_shp));
+          }
+        }
+      }
+      if (qctx->set_output_handle_dtype(0, queue_type) ||
+          qctx->set_output_handle_shape(0, queue_shp)) {
+        new_shapes.push(qnode);
+      }
+    }
+    // Propagate the shapes in the transitive fan-out of the queue.
+    done = new_shapes.empty();
+    while (!new_shapes.empty()) {
+      const Node* n = new_shapes.front();
+      new_shapes.pop();
+      for (const Node* fanout : n->out_nodes()) {
+        bool updated = false;
+        TF_RETURN_IF_ERROR(shape_refiner.UpdateNode(fanout, &updated));
+        if (updated) {
+          new_shapes.push(fanout);
+        }
+      }
+    }
+  } while (!done);
+
   for (const Node* const node : graph.nodes()) {
     VLOG(1) << "<Node> " << node->name();
     auto ctx = shape_refiner.GetContext(node);
diff --git a/tensorflow/core/grappler/costs/graph_properties_test.cc b/tensorflow/core/grappler/costs/graph_properties_test.cc
index 32683644fb..94b809dc44 100644
--- a/tensorflow/core/grappler/costs/graph_properties_test.cc
+++ b/tensorflow/core/grappler/costs/graph_properties_test.cc
@@ -14,6 +14,9 @@ limitations under the License.
 ==============================================================================*/
 
 #include "tensorflow/core/grappler/costs/graph_properties.h"
+#include "tensorflow/cc/framework/scope.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def_builder.h"
 #include "tensorflow/core/grappler/clusters/single_machine.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h"
@@ -129,6 +132,101 @@ TEST_F(GraphPropertiesTest, DynamicProperties) {
   }
 }
 
+TEST_F(GraphPropertiesTest, VarHandles) {
+  GrapplerItem item;
+  TF_CHECK_OK(NodeDefBuilder("Var", "VarHandleOp")
+                  .Attr("dtype", DT_FLOAT)
+                  .Attr("shape", TensorShape({3, 7}))
+                  .Finalize(item.graph.add_node()));
+
+  TF_CHECK_OK(NodeDefBuilder("VarRead", "ReadVariableOp")
+                  .Attr("dtype", DT_FLOAT)
+                  .Input("Var", 0, DT_RESOURCE)
+                  .Finalize(item.graph.add_node()));
+
+  GraphProperties properties(item);
+  TF_CHECK_OK(properties.InferStatically());
+
+  const auto props = properties.GetOutputProperties("VarRead");
+  EXPECT_EQ(1, props.size());
+  const OpInfo::TensorProperties& prop = props[0];
+  EXPECT_EQ(DT_FLOAT, prop.dtype());
+  EXPECT_FALSE(prop.shape().unknown_rank());
+  EXPECT_EQ(2, prop.shape().dim_size());
+  EXPECT_EQ(3, prop.shape().dim(0).size());
+  EXPECT_EQ(7, prop.shape().dim(1).size());
+}
+
+TEST_F(GraphPropertiesTest, Queues) {
+  // Create a graph with known input shapes, and propagate the shapes through a
+  // couple of queues.
+  tensorflow::Scope root = tensorflow::Scope::NewRootScope();
+
+  auto q1 = ops::FIFOQueue(root.WithOpName("Queue1"), {DataType::DT_FLOAT});
+  Output rnd =
+      ops::RandomNormal(root.WithOpName("rnd"), {3, 7}, DataType::DT_FLOAT);
+  Output square1 = ops::Square(root.WithOpName("Square1"), rnd);
+  auto enqueue1 = ops::QueueEnqueue(root.WithOpName("Enqueue1"), q1, {square1});
+  auto dequeue1 =
+      ops::QueueDequeue(root.WithOpName("Dequeue1"), q1, {DataType::DT_FLOAT});
+
+  auto q2 =
+      ops::RandomShuffleQueue(root.WithOpName("Queue2"), {DataType::DT_FLOAT});
+  Output square2 = ops::Square(root.WithOpName("Square2"), dequeue1[0]);
+  auto enqueue2 = ops::QueueEnqueue(root.WithOpName("Enqueue2"), q2, {square2});
+  auto dequeue2 =
+      ops::QueueDequeue(root.WithOpName("Dequeue2"), q2, {DataType::DT_FLOAT});
+
+  auto q3 =
+      ops::RandomShuffleQueue(root.WithOpName("Queue3"), {DataType::DT_FLOAT});
+  auto dequeue3 =
+      ops::QueueDequeue(root.WithOpName("Dequeue3"), q3, {DataType::DT_FLOAT});
+
+  auto q4 =
+      ops::RandomShuffleQueue(root.WithOpName("Queue4"), {DataType::DT_FLOAT});
+  auto enqueue4 = ops::QueueEnqueue(root.WithOpName("Enqueue4"), q4, {square2});
+  auto enqueue4_2 =
+      ops::QueueEnqueue(root.WithOpName("Enqueue4_2"), q4, {dequeue3[0]});
+  auto dequeue4 =
+      ops::QueueDequeue(root.WithOpName("Dequeue4"), q4, {DataType::DT_FLOAT});
+
+  GrapplerItem item;
+  TF_CHECK_OK(root.ToGraphDef(&item.graph));
+
+  GraphProperties properties(item);
+  TF_CHECK_OK(properties.InferStatically());
+
+  const auto props1 = properties.GetOutputProperties("Dequeue1");
+  EXPECT_EQ(1, props1.size());
+  const OpInfo::TensorProperties& prop1 = props1[0];
+  EXPECT_EQ(DT_FLOAT, prop1.dtype());
+  EXPECT_FALSE(prop1.shape().unknown_rank());
+  EXPECT_EQ(2, prop1.shape().dim_size());
+  EXPECT_EQ(3, prop1.shape().dim(0).size());
+  EXPECT_EQ(7, prop1.shape().dim(1).size());
+
+  const auto props2 = properties.GetOutputProperties("Dequeue2");
+  EXPECT_EQ(1, props2.size());
+  const OpInfo::TensorProperties& prop2 = props2[0];
+  EXPECT_EQ(DT_FLOAT, prop2.dtype());
+  EXPECT_FALSE(prop2.shape().unknown_rank());
+  EXPECT_EQ(2, prop2.shape().dim_size());
+  EXPECT_EQ(3, prop2.shape().dim(0).size());
+  EXPECT_EQ(7, prop2.shape().dim(1).size());
+
+  // The dequeue3 op shape is unknown. The square2 op shape is known. Verify
+  // that we merge the 2 properly to determine the shape of the data coming out
+  // of the queue.
+  const auto props4 = properties.GetOutputProperties("Dequeue4");
+  EXPECT_EQ(1, props4.size());
+  const OpInfo::TensorProperties& prop4 = props4[0];
+  EXPECT_EQ(DT_FLOAT, prop4.dtype());
+  EXPECT_FALSE(prop4.shape().unknown_rank());
+  EXPECT_EQ(2, prop4.shape().dim_size());
+  EXPECT_EQ(3, prop4.shape().dim(0).size());
+  EXPECT_EQ(7, prop4.shape().dim(1).size());
+}
+
 }  // namespace
 }  // namespace grappler
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 231e06d5f4..29b4d63bbf 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -2042,6 +2042,7 @@ tf_kernel_library(
     deps = [
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
+        "//tensorflow/core/platform/default/build_config:cublas_plugin",
         "@local_config_cuda//cuda:cusolver",
     ],
 )
@@ -2322,7 +2323,9 @@ tf_kernel_library(
     prefix = "fft_ops",
     deps = MATH_DEPS + [
         "//tensorflow/core:spectral_ops_op_lib",
-    ],
+    ] + if_cuda([
+        "//tensorflow/core/platform/default/build_config:cufft_plugin",
+    ]),
 )
 
 tf_kernel_library(
@@ -2626,7 +2629,9 @@ tf_kernel_library(
             "@libxsmm_archive//:xsmm_avx",
         ],
         "//conditions:default": [],
-    }),
+    }) + if_cuda([
+        "//tensorflow/core/platform/default/build_config:cudnn_plugin",
+    ]),
 )
 
 tf_kernel_library(
diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index 746fe63e2a..1c7afcf866 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -19,6 +19,9 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/crop_and_resize_op.h"
 
+#include <functional>
+#include <string>
+
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -26,10 +29,13 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/types.h"
 
 #if GOOGLE_CUDA
+#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
 #include "tensorflow/core/platform/stream_executor.h"
 #endif  // GOOGLE_CUDA
 
@@ -37,41 +43,67 @@ namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
+using Callback = std::function<void()>;
+
+namespace {
 
-static inline void ParseAndCheckBoxSizes(OpKernelContext* context,
-                                         const Tensor& boxes,
-                                         const Tensor& box_ind,
-                                         int* num_boxes) {
-  if (boxes.NumElements() == 0 && box_ind.NumElements() == 0) {
+static inline Status ParseAndCheckBoxSizes(const Tensor& boxes,
+                                           const Tensor& box_index,
+                                           int* num_boxes) {
+  if (boxes.NumElements() == 0 && box_index.NumElements() == 0) {
     *num_boxes = 0;
-    return;
+    return Status::OK();
   }
   // The shape of 'boxes' is [num_boxes, 4].
-  OP_REQUIRES(context, boxes.dims() == 2,
-              errors::InvalidArgument("boxes must be 2-D",
-                                      boxes.shape().DebugString()));
+  if (boxes.dims() != 2) {
+    return errors::InvalidArgument("boxes must be 2-D",
+                                   boxes.shape().DebugString());
+  }
   *num_boxes = boxes.dim_size(0);
-  OP_REQUIRES(context, boxes.dim_size(1) == 4,
-              errors::InvalidArgument("boxes must have 4 columns"));
-
-  // The shape of 'box_ind' is [num_boxes].
-  OP_REQUIRES(context, box_ind.dims() == 1,
-              errors::InvalidArgument("box_ind must be 1-D",
-                                      box_ind.shape().DebugString()));
-  OP_REQUIRES(context, box_ind.dim_size(0) == *num_boxes,
-              errors::InvalidArgument("box_ind has incompatible shape"));
+  if (boxes.dim_size(1) != 4) {
+    return errors::InvalidArgument("boxes must have 4 columns");
+  }
+  // The shape of 'box_index' is [num_boxes].
+  if (box_index.dims() != 1) {
+    return errors::InvalidArgument("box_index must be 1-D",
+                                   box_index.shape().DebugString());
+  }
+  if (box_index.dim_size(0) != *num_boxes) {
+    return errors::InvalidArgument("box_index has incompatible shape");
+  }
+  return Status::OK();
 }
 
-// Verifies that all values in box_ind are in [0, batch).
+// Conditionally calls the compute callback if all values in box_index are in
+// [0, batch_size) then calls done.
 template <typename Device>
-inline void CheckValidBoxInd(
-    OpKernelContext* context,
-    typename TTypes<int32, 1>::ConstTensor box_ind_data, int batch);
+inline void RunIfBoxIndexIsValid(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done);
+
+// Specialization of CheckValidBoxIndex for a CPUDevice.
+template <>
+inline void RunIfBoxIndexIsValid<CPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done) {
+  const int num_boxes = box_index.dimension(0);
+  for (int b = 0; b < num_boxes; ++b) {
+    OP_REQUIRES_ASYNC(
+        context, FastBoundsCheck(box_index(b), batch_size),
+        errors::OutOfRange("box_index has values outside [0, batch_size)"),
+        done);
+  }
+  compute();
+  done();
+}
+
+}  // namespace
 
 template <typename Device, typename T>
-class CropAndResizeOp : public OpKernel {
+class CropAndResizeOp : public AsyncOpKernel {
  public:
-  explicit CropAndResizeOp(OpKernelConstruction* context) : OpKernel(context) {
+  explicit CropAndResizeOp(OpKernelConstruction* context)
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
@@ -80,69 +112,77 @@ class CropAndResizeOp : public OpKernel {
                                              &extrapolation_value_));
   }
 
-  void Compute(OpKernelContext* context) override {
-    // The shape of 'image' is [batch, image_height, image_width, channels].
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
+    // The shape of 'image' is [batch_size, image_height, image_width,
+    // channels].
     const Tensor& image = context->input(0);
-    OP_REQUIRES(context, image.dims() == 4,
-                errors::InvalidArgument("input image must be 4-D",
-                                        image.shape().DebugString()));
-
-    const int batch = image.dim_size(0);
-    const int image_height = image.dim_size(1);
-    const int image_width = image.dim_size(2);
-    const int depth = image.dim_size(3);
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-
     // The shape of 'boxes' is [num_boxes, 4].
     const Tensor& boxes = context->input(1);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(2);
-
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
-
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(2);
     // The shape of 'crop_size' is [2].
     const Tensor& crop_size = context->input(3);
 
-    OP_REQUIRES(context, crop_size.dims() == 1,
-                errors::InvalidArgument("crop_size must be 1-D",
-                                        crop_size.shape().DebugString()));
-    OP_REQUIRES(context, crop_size.dim_size(0) == 2,
-                errors::InvalidArgument("crop_size must have two elements",
-                                        crop_size.shape().DebugString()));
-
+    // Validate inputs dimensions.
+    OP_REQUIRES_ASYNC(context, image.dims() == 4,
+                      errors::InvalidArgument("input image must be 4-D",
+                                              image.shape().DebugString()),
+                      done);
+    const int batch_size = image.dim_size(0);
+    const int image_height = image.dim_size(1);
+    const int image_width = image.dim_size(2);
+    const int depth = image.dim_size(3);
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    int num_boxes = 0;
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
+
+    OP_REQUIRES_ASYNC(context, crop_size.dims() == 1,
+                      errors::InvalidArgument("crop_size must be 1-D",
+                                              crop_size.shape().DebugString()),
+                      done);
+    OP_REQUIRES_ASYNC(
+        context, crop_size.dim_size(0) == 2,
+        errors::InvalidArgument("crop_size must have two elements",
+                                crop_size.shape().DebugString()),
+        done);
+
+    // Copy and validate crop sizes.
     auto crop_size_vec = crop_size.vec<int32>();
     const int crop_height = internal::SubtleMustCopy(crop_size_vec(0));
     const int crop_width = internal::SubtleMustCopy(crop_size_vec(1));
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("crop dimensions must be positive"));
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("crop dimensions must be positive"), done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(
+    OP_REQUIRES_OK_ASYNC(
         context,
         context->allocate_output(
             0, TensorShape({num_boxes, crop_height, crop_width, depth}),
-            &output));
-
-    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<float, 4>::Tensor crops_data = output->tensor<float, 4>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResize<Device, T>()(
-        context->eigen_device<Device>(), image_data, boxes_data, box_ind_data,
-        extrapolation_value_, crops_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeKernel."));
-    }
+            &output),
+        done);
+
+    auto compute_callback = [this, context, output]() {
+      const Tensor& image = context->input(0);
+      const Tensor& boxes = context->input(1);
+      const Tensor& box_index = context->input(2);
+      const bool status = functor::CropAndResize<Device, T>()(
+          context->eigen_device<Device>(), image.tensor<T, 4>(),
+          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
+          extrapolation_value_, output->tensor<float, 4>());
+      if (!status) {
+        context->SetStatus(
+            errors::Internal("Failed launch CropAndResizeKernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 
  private:
@@ -155,10 +195,10 @@ template <typename T>
 struct CropAndResize<CPUDevice, T> {
   bool operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   float extrapolation_value,
                   typename TTypes<float, 4>::Tensor crops) {
-    const int batch = image.dimension(0);
+    const int batch_size = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -173,8 +213,8 @@ struct CropAndResize<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -235,89 +275,94 @@ struct CropAndResize<CPUDevice, T> {
     return true;
   }
 };
+
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradImageOp : public OpKernel {
+class CropAndResizeGradImageOp : public AsyncOpKernel {
  public:
   explicit CropAndResizeGradImageOp(OpKernelConstruction* context)
-      : OpKernel(context) {
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void Compute(OpKernelContext* context) override {
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
-
-    OP_REQUIRES(context, grads.dims() == 4,
-                errors::InvalidArgument("grads image must be 4-D",
-                                        grads.shape().DebugString()));
-    const int crop_height = grads.dim_size(1);
-    const int crop_width = grads.dim_size(2);
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("grads dimensions must be positive"));
-
     // The shape of 'boxes' is [num_boxes, 4].
     const Tensor& boxes = context->input(1);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(2);
-
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
-
-    OP_REQUIRES(
-        context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"));
-
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(2);
     // The shape of 'image_size' is [4].
     const Tensor& image_size = context->input(3);
-    OP_REQUIRES(context, image_size.dims() == 1,
-                errors::InvalidArgument("image_size must be 1-D",
-                                        image_size.shape().DebugString()));
-    OP_REQUIRES(context, image_size.dim_size(0) == 4,
-                errors::InvalidArgument("image_size must have 4 elements",
-                                        image_size.shape().DebugString()));
 
+    // Validate input shapes.
+    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
+                      errors::InvalidArgument("grads image must be 4-D",
+                                              grads.shape().DebugString()),
+                      done);
+    const int crop_height = grads.dim_size(1);
+    const int crop_width = grads.dim_size(2);
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("grads dimensions must be positive"), done);
+    int num_boxes = 0;
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
+    OP_REQUIRES_ASYNC(
+        context, grads.dim_size(0) == num_boxes,
+        errors::InvalidArgument("boxes and grads have incompatible shape"),
+        done);
+
+    OP_REQUIRES_ASYNC(context, image_size.dims() == 1,
+                      errors::InvalidArgument("image_size must be 1-D",
+                                              image_size.shape().DebugString()),
+                      done);
+    OP_REQUIRES_ASYNC(context, image_size.dim_size(0) == 4,
+                      errors::InvalidArgument("image_size must have 4 elements",
+                                              image_size.shape().DebugString()),
+                      done);
     auto image_size_vec = image_size.vec<int32>();
-    const int batch = internal::SubtleMustCopy(image_size_vec(0));
+    const int batch_size = internal::SubtleMustCopy(image_size_vec(0));
     const int image_height = internal::SubtleMustCopy(image_size_vec(1));
     const int image_width = internal::SubtleMustCopy(image_size_vec(2));
     const int depth = internal::SubtleMustCopy(image_size_vec(3));
-
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-    OP_REQUIRES(
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    OP_REQUIRES_ASYNC(
         context, grads.dim_size(3) == depth,
-        errors::InvalidArgument("image_size and grads are incompatible"));
+        errors::InvalidArgument("image_size and grads are incompatible"), done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(
-        context, context->allocate_output(
-                     0, TensorShape({batch, image_height, image_width, depth}),
-                     &output));
-
-    typename TTypes<float, 4>::ConstTensor grads_data =
-        grads.tensor<float, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<T, 4>::Tensor output_data = output->tensor<T, 4>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResizeBackpropImage<Device, T>()(
-        context->eigen_device<Device>(), grads_data, boxes_data, box_ind_data,
-        output_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeBackpropImageKernel."));
-    }
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        context->allocate_output(
+            0, TensorShape({batch_size, image_height, image_width, depth}),
+            &output),
+        done);
+
+    auto compute_callback = [context, output]() {
+      const Tensor& grads = context->input(0);
+      const Tensor& boxes = context->input(1);
+      const Tensor& box_index = context->input(2);
+      const bool status = functor::CropAndResizeBackpropImage<Device, T>()(
+          context->eigen_device<Device>(), grads.tensor<float, 4>(),
+          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
+          output->tensor<T, 4>());
+      if (!status) {
+        context->SetStatus(errors::Internal(
+            "Failed launch CropAndResizeBackpropImage kernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 };
 
@@ -328,9 +373,9 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
   bool operator()(const CPUDevice& d,
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   typename TTypes<T, 4>::Tensor grads_image) {
-    const int batch = grads_image.dimension(0);
+    const int batch_size = grads_image.dimension(0);
     const int image_height = grads_image.dimension(1);
     const int image_width = grads_image.dimension(2);
 
@@ -347,8 +392,8 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -399,83 +444,90 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
     return true;
   }
 };
+
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradBoxesOp : public OpKernel {
+class CropAndResizeGradBoxesOp : public AsyncOpKernel {
  public:
   explicit CropAndResizeGradBoxesOp(OpKernelConstruction* context)
-      : OpKernel(context) {
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void Compute(OpKernelContext* context) override {
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
+    // The shape of 'boxes' is [num_boxes, 4].
+    const Tensor& boxes = context->input(2);
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(3);
+    // The shape of 'image' is [batch_size, image_height, image_width, depth].
+    const Tensor& image = context->input(1);
 
-    OP_REQUIRES(context, grads.dims() == 4,
-                errors::InvalidArgument("grads image must be 4-D",
-                                        grads.shape().DebugString()));
-
+    // Validate input shapes.
+    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
+                      errors::InvalidArgument("grads image must be 4-D",
+                                              grads.shape().DebugString()),
+                      done);
     const int crop_height = grads.dim_size(1);
     const int crop_width = grads.dim_size(2);
     const int depth = grads.dim_size(3);
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("grads dimensions must be positive"));
-
-    // The shape of 'image' is [batch, image_height, image_width, depth].
-    const Tensor& image = context->input(1);
-    OP_REQUIRES(context, image.dims() == 4,
-                errors::InvalidArgument("input image must be 4-D",
-                                        image.shape().DebugString()));
-
-    const int batch = image.dim_size(0);
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("grads dimensions must be positive"), done);
+
+    OP_REQUIRES_ASYNC(context, image.dims() == 4,
+                      errors::InvalidArgument("input image must be 4-D",
+                                              image.shape().DebugString()),
+                      done);
+    const int batch_size = image.dim_size(0);
     const int image_height = image.dim_size(1);
     const int image_width = image.dim_size(2);
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-    OP_REQUIRES(context, image.dim_size(3) == depth,
-                errors::InvalidArgument("image, grads depth differ"));
-
-    // The shape of 'boxes' is [num_boxes, 4].
-    const Tensor& boxes = context->input(2);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(3);
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    OP_REQUIRES_ASYNC(context, image.dim_size(3) == depth,
+                      errors::InvalidArgument("image, grads depth differ"),
+                      done);
 
     int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
 
-    OP_REQUIRES(
+    OP_REQUIRES_ASYNC(
         context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"));
+        errors::InvalidArgument("boxes and grads have incompatible shape"),
+        done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->allocate_output(
-                                0, TensorShape({num_boxes, 4}), &output));
-
-    typename TTypes<float, 4>::ConstTensor grads_data =
-        grads.tensor<float, 4>();
-    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<float, 2>::Tensor output_data = output->tensor<float, 2>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
-        context->eigen_device<Device>(), grads_data, image_data, boxes_data,
-        box_ind_data, output_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeBackpropBoxesKernel."));
-    }
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        context->allocate_output(0, TensorShape({num_boxes, 4}), &output),
+        done);
+
+    auto compute_callback = [context, output]() {
+      const Tensor& grads = context->input(0);
+      const Tensor& image = context->input(1);
+      const Tensor& boxes = context->input(2);
+      const Tensor& box_index = context->input(3);
+      const bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
+          context->eigen_device<Device>(), grads.tensor<float, 4>(),
+          image.tensor<T, 4>(), boxes.tensor<float, 2>(),
+          box_index.tensor<int32, 1>(), output->tensor<float, 2>());
+      if (!status) {
+        context->SetStatus(errors::Internal(
+            "Failed launch CropAndResizeBackpropBoxes kernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 };
 
@@ -487,9 +539,9 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   typename TTypes<float, 2>::Tensor grads_boxes) {
-    const int batch = image.dimension(0);
+    const int batch_size = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -506,8 +558,8 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -589,30 +641,19 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
     return true;
   }
 };
-}  // namespace functor
 
-// Specialization of CheckValidBoxInd for a CPUDevice.
-template <>
-inline void CheckValidBoxInd<CPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch) {
-  const int num_boxes = box_ind.dimension(0);
-  for (int b = 0; b < num_boxes; ++b) {
-    OP_REQUIRES(context, box_ind(b) >= 0 && box_ind(b) < batch,
-                errors::OutOfRange("box_ind has values outside [0, batch)"));
-  }
-}
+}  // namespace functor
 
-#define REGISTER_KERNEL(T)                                         \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T")              \
-                              .HostMemory("crop_size"),            \
-                          CropAndResizeOp<CPUDevice, T>);          \
-                                                                   \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")           \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T"),             \
+#define REGISTER_KERNEL(T)                                \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResize")           \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<T>("T")     \
+                              .HostMemory("crop_size"),   \
+                          CropAndResizeOp<CPUDevice, T>); \
+                                                          \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")  \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<T>("T"),    \
                           CropAndResizeGradBoxesOp<CPUDevice, T>);
 
 TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNEL);
@@ -634,50 +675,86 @@ TF_CALL_double(REGISTER_KERNEL);
 
 #if GOOGLE_CUDA
 
-// Forward declaration of the CheckValidBoxIndHelper specialization for GPU.
+// Forward declaration of the CheckValidBoxIndexHelper specialization for GPU.
 namespace functor {
 template <>
-void CheckValidBoxIndHelper<GPUDevice>::operator()(
-    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch, typename TTypes<bool, 0>::Tensor isvalid);
-extern template struct CheckValidBoxIndHelper<GPUDevice>;
+void CheckValidBoxIndexHelper<GPUDevice>::operator()(
+    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, typename TTypes<bool, 0>::Tensor isvalid);
+extern template struct CheckValidBoxIndexHelper<GPUDevice>;
 }  // namespace functor
 
-// Specialization of CheckValidBoxInd for a GPUDevice.
+namespace {
+
+// Specialization of CheckValidBoxIndex for a GPUDevice.
 template <>
-inline void CheckValidBoxInd<GPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch) {
-  const int num_boxes = box_ind.dimension(0);
+inline void RunIfBoxIndexIsValid<GPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done) {
+  const int num_boxes = box_index.dimension(0);
   if (num_boxes == 0) {
+    compute();
+    done();
     return;
   }
-  Tensor isvalid_tensor;
-  OP_REQUIRES_OK(context,
-                 context->allocate_temp(DataTypeToEnum<bool>::value,
-                                        TensorShape({}), &isvalid_tensor));
 
-  typename TTypes<bool, 0>::Tensor isvalid = isvalid_tensor.tensor<bool, 0>();
+  Tensor isvalid_dev_tensor;
+  OP_REQUIRES_OK_ASYNC(
+      context,
+      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
+                             &isvalid_dev_tensor),
+      done);
+  typename TTypes<bool, 0>::Tensor isvalid_dev =
+      isvalid_dev_tensor.tensor<bool, 0>();
 
-  functor::CheckValidBoxIndHelper<GPUDevice>()(
-      context->eigen_device<GPUDevice>(), box_ind, batch, isvalid);
+  // Run the actual box check on the device.
+  functor::CheckValidBoxIndexHelper<GPUDevice>()(
+      context->eigen_device<GPUDevice>(), box_index, batch_size, isvalid_dev);
 
+  // Copy the result back to the host.
   auto* stream = context->op_device_context()->stream();
-  OP_REQUIRES(context, stream, errors::Internal("No GPU stream available."));
-
-  bool isvalid_host = false;
-  perftools::gputools::DeviceMemoryBase isvalid_gpu(isvalid.data(),
-                                                    sizeof(bool));
-  stream->ThenMemcpy(&isvalid_host, isvalid_gpu, sizeof(bool));
-  stream->BlockHostUntilDone();
-
-  OP_REQUIRES(context, stream->ok(),
-              errors::Internal("cudaMemcpy from device to host failed"));
-
-  OP_REQUIRES(context, isvalid_host,
-              errors::OutOfRange("box_ind has values outside [0, batch)"));
+  OP_REQUIRES_ASYNC(context, stream,
+                    errors::Internal("No GPU stream available."), done);
+  Tensor isvalid_host_tensor;
+  // Use pinned host memory on the host to avoid unnecessary
+  // synchronization.
+  AllocatorAttributes alloc_attr;
+  alloc_attr.set_on_host(true);
+  alloc_attr.set_gpu_compatible(true);
+  OP_REQUIRES_OK_ASYNC(
+      context,
+      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
+                             &isvalid_host_tensor, alloc_attr),
+      done);
+  typename TTypes<bool, 0>::Tensor isvalid_host =
+      isvalid_host_tensor.tensor<bool, 0>();
+
+  perftools::gputools::DeviceMemoryBase wrapped(isvalid_dev.data(),
+                                                sizeof(bool));
+  const bool status = stream
+                          ->ThenMemcpy(isvalid_host.data() /* destination */,
+                                       wrapped /* source */, sizeof(bool))
+                          .ok();
+  OP_REQUIRES_ASYNC(
+      context, status,
+      errors::Internal("Failed to launch copy of isvalid from device to host."),
+      done);
+
+  auto wrapped_callback = [context, isvalid_host, compute, done]() {
+    OP_REQUIRES_ASYNC(
+        context, isvalid_host(),
+        errors::OutOfRange("box_index has values outside [0, batch_size)"),
+        done);
+    compute();
+    done();
+  };
+
+  context->device()->tensorflow_gpu_device_info()->event_mgr->ThenExecute(
+      stream, wrapped_callback);
 }
 
+}  // namespace
+
 #define REGISTER_KERNEL(T)                                         \
   REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
                               .Device(DEVICE_GPU)                  \
diff --git a/tensorflow/core/kernels/crop_and_resize_op.h b/tensorflow/core/kernels/crop_and_resize_op.h
index 22df1bdd56..460dbad22b 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.h
+++ b/tensorflow/core/kernels/crop_and_resize_op.h
@@ -53,12 +53,12 @@ struct CropAndResizeBackpropBoxes {
 };
 
 template <typename Device>
-struct CheckValidBoxIndHelper {
-  // Checks if all values in box_ind are in [0, batch).
+struct CheckValidBoxIndexHelper {
+  // Checks if all values in box_index are in [0, batch).
   void operator()(const Device& d,
-                  typename TTypes<int32, 1>::ConstTensor box_ind, int batch,
+                  typename TTypes<int32, 1>::ConstTensor box_index, int batch,
                   typename TTypes<bool, 0>::Tensor isvalid) {
-    isvalid.device(d) = ((box_ind >= 0) && (box_ind < batch)).all();
+    isvalid.device(d) = ((box_index >= 0) && (box_index < batch)).all();
   }
 };
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
index 254475db46..c1235fda89 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
@@ -440,7 +440,7 @@ TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 
-template struct CheckValidBoxIndHelper<GPUDevice>;
+template struct CheckValidBoxIndexHelper<GPUDevice>;
 
 }  // namespace functor
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/crop_and_resize_op_test.cc b/tensorflow/core/kernels/crop_and_resize_op_test.cc
index 3a7f180598..d6139dae96 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_test.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_test.cc
@@ -251,7 +251,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(
-      StringPiece(s.ToString()).contains("box_ind has incompatible shape"))
+      StringPiece(s.ToString()).contains("box_index has incompatible shape"))
       << s;
 }
 
@@ -264,8 +264,10 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndex) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(StringPiece(s.ToString())
-                  .contains("box_ind has values outside [0, batch)"))
+                  .contains("box_index has values outside [0, batch_size)"))
       << s;
 }
 
+// TODO(zhengxq, rmlarsen): Add a benchmark.
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/lookup_table_op.h b/tensorflow/core/kernels/lookup_table_op.h
index 4cd25a3cc6..ff23a09a24 100644
--- a/tensorflow/core/kernels/lookup_table_op.h
+++ b/tensorflow/core/kernels/lookup_table_op.h
@@ -64,8 +64,8 @@ class LookupTableOp : public OpKernel {
         return ctx->status();
       }
       if (ctx->track_allocations()) {
-        ctx->record_device_persistent_memory_allocation(
-            container->MemoryUsed());
+        ctx->record_host_persistent_memory_allocation(
+            container->MemoryUsed() + table_handle_.AllocatedBytes());
       }
       *ret = container;
       return Status::OK();
@@ -225,6 +225,15 @@ class HashTable : public InitializableLookupTable {
     return Status::OK();
   }
 
+  int64 MemoryUsed() const override {
+    if (table_) {
+      const int64 num_elements = table_->size();
+      return num_elements * (sizeof(K) + sizeof(V));
+    } else {
+      return 0;
+    }
+  }
+
  private:
   std::unique_ptr<std::unordered_map<K, V>> table_;
 };
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index f82e9d1eb7..f35a1bb648 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -623,7 +623,17 @@ REGISTER_OP("QueueDequeueV2")
     .Output("components: component_types")
     .Attr("component_types: list(type) >= 1")
     .Attr("timeout_ms: int = -1")
-    .SetShapeFn(shape_inference::UnknownShape)
+    .SetShapeFn([](InferenceContext* c) {
+      if (c->num_outputs() == 1) {
+        c->set_output(0, c->input_handle_shape(0));
+      } else {
+        // TODO(vrv): handle the case of multiple outputs.
+        for (int i = 0; i < c->num_outputs(); ++i) {
+          c->set_output(i, c->UnknownShape());
+        }
+      }
+      return Status::OK();
+    })
     .Doc(R"doc(
 Dequeues a tuple of one or more tensors from the given queue.
 
diff --git a/tensorflow/core/platform/default/build_config/BUILD b/tensorflow/core/platform/default/build_config/BUILD
index 8bc412c5d8..9e3d5f354d 100644
--- a/tensorflow/core/platform/default/build_config/BUILD
+++ b/tensorflow/core/platform/default/build_config/BUILD
@@ -58,6 +58,22 @@ cc_library(
     ],
 )
 
+# Dummy stream executor cuda plugins.
+cc_library(
+    name = "cublas_plugin",
+    srcs = [],
+)
+
+cc_library(
+    name = "cufft_plugin",
+    srcs = [],
+)
+
+cc_library(
+    name = "cudnn_plugin",
+    srcs = [],
+)
+
 # OSX framework for device driver access
 cc_library(
     name = "IOKit",
diff --git a/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md b/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md
index f611624079..de4f126507 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.graph_editor.md
@@ -137,16 +137,16 @@ which to operate must always be given explicitly. This is the reason why
 
 ## Module: reroute
 
-*   @{tf.contrib.graph_editor.reroute.swap_ts}
-*   @{tf.contrib.graph_editor.reroute.reroute_ts}
-*   @{tf.contrib.graph_editor.reroute.swap_inputs}
-*   @{tf.contrib.graph_editor.reroute.reroute_inputs}
-*   @{tf.contrib.graph_editor.reroute.swap_outputs}
-*   @{tf.contrib.graph_editor.reroute.reroute_outputs}
-*   @{tf.contrib.graph_editor.reroute.swap_ios}
-*   @{tf.contrib.graph_editor.reroute.reroute_ios}
-*   @{tf.contrib.graph_editor.reroute.remove_control_inputs}
-*   @{tf.contrib.graph_editor.reroute.add_control_inputs}
+*   @{tf.contrib.graph_editor.swap_ts}
+*   @{tf.contrib.graph_editor.reroute_ts}
+*   @{tf.contrib.graph_editor.swap_inputs}
+*   @{tf.contrib.graph_editor.reroute_inputs}
+*   @{tf.contrib.graph_editor.swap_outputs}
+*   @{tf.contrib.graph_editor.reroute_outputs}
+*   @{tf.contrib.graph_editor.swap_ios}
+*   @{tf.contrib.graph_editor.reroute_ios}
+*   @{tf.contrib.graph_editor.remove_control_inputs}
+*   @{tf.contrib.graph_editor.add_control_inputs}
 
 ## Module: edit
 
diff --git a/tensorflow/docs_src/api_guides/python/contrib.linalg.md b/tensorflow/docs_src/api_guides/python/contrib.linalg.md
index efc2d76ef1..b2c7fcf6bb 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.linalg.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.linalg.md
@@ -21,7 +21,7 @@ Subclasses of `LinearOperator` provide a access to common methods on a
 *   @{tf.contrib.linalg.LinearOperatorDiag}
 *   @{tf.contrib.linalg.LinearOperatorIdentity}
 *   @{tf.contrib.linalg.LinearOperatorScaledIdentity}
-*   @{tf.contrib.linalg.LinearOperatorMatrix}
+*   @{tf.contrib.linalg.LinearOperatorFullMatrix}
 *   @{tf.contrib.linalg.LinearOperatorTriL}
 *   @{tf.contrib.linalg.LinearOperatorUDVHUpdate}
 
diff --git a/tensorflow/docs_src/api_guides/python/contrib.losses.md b/tensorflow/docs_src/api_guides/python/contrib.losses.md
index cb93f9d549..8c289dd556 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.losses.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.losses.md
@@ -13,8 +13,8 @@ of samples in the batch and `d1` ... `dN` are the remaining dimensions.
 It is common, when training with multiple loss functions, to adjust the relative
 strengths of individual losses. This is performed by rescaling the losses via
 a `weight` parameter passed to the loss functions. For example, if we were
-training with both log_loss and sum_of_squares_loss, and we wished that the
-log_loss penalty be twice as severe as the sum_of_squares_loss, we would
+training with both log_loss and mean_square_error, and we wished that the
+log_loss penalty be twice as severe as the mean_square_error, we would
 implement this as:
 
 ```python
@@ -22,7 +22,7 @@ implement this as:
   tf.contrib.losses.log(predictions, labels, weight=2.0)
 
   # Uses default weight of 1.0
-  tf.contrib.losses.sum_of_squares(predictions, labels)
+  tf.contrib.losses.mean_square_error(predictions, labels)
 
   # All the losses are collected into the `GraphKeys.LOSSES` collection.
   losses = tf.get_collection(tf.GraphKeys.LOSSES)
@@ -74,7 +74,7 @@ these predictions.
   predictions = MyModelPredictions(images)
 
   weight = tf.cast(tf.greater(depths, 0), tf.float32)
-  loss  = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
+  loss  = tf.contrib.losses.mean_square_error(predictions, depths, weight)
 ```
 
 Note that when using weights for the losses, the final average is computed
@@ -100,7 +100,7 @@ weighted average over the individual prediction errors:
 
   weight = MyComplicatedWeightingFunction(labels)
   weight = tf.div(weight, tf.size(weight))
-  loss = tf.contrib.losses.sum_of_squares(predictions, depths, weight)
+  loss = tf.contrib.losses.mean_square_error(predictions, depths, weight)
 ```
 
 @{tf.contrib.losses.absolute_difference}
@@ -118,9 +118,4 @@ weighted average over the individual prediction errors:
 @{tf.contrib.losses.softmax_cross_entropy}
 @{tf.contrib.losses.sparse_softmax_cross_entropy}
 
-The following are deprecated in favor of `mean_pairwise_squared_error` and
-`mean_squared_error`.
-@{tf.contrib.losses.sum_of_pairwise_squares}
-@{tf.contrib.losses.sum_of_squares}
-
 
diff --git a/tensorflow/docs_src/get_started/tflearn.md b/tensorflow/docs_src/get_started/tflearn.md
index 079349be32..ed21969b3e 100644
--- a/tensorflow/docs_src/get_started/tflearn.md
+++ b/tensorflow/docs_src/get_started/tflearn.md
@@ -278,7 +278,7 @@ Then, the code creates a `DNNClassifier` model using the following arguments:
 
 The `tf.contrib.learn` API uses input functions, which create the TensorFlow
 operations that generate data for the model. In this case, the data is small
-enough that it can be stored in @{tf.constant TensorFlow constants}. The
+enough that it can be stored in @{tf.constant$TensorFlow constants}. The
 following code produces the simplest possible input pipeline:
 
 ```python
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 111b046689..a20fccffd5 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -211,15 +211,20 @@ two files are available to the JVM:
   * the downloaded `.jar` file
   * the extracted JNI library
 
-For example, the following command line executes the `HelloTF` program:
+For example, the following command line executes the `HelloTF` program on Linux
+and Mac OS X:
 
 <pre><b>java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
+And the following comand line executes the `HelloTF` program on Windows:
+
+<pre><b>java -cp libtensorflow-1.1.0-rc2.jar;. -Djava.library.path=jni HelloTF</b></pre>
+
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
 outputs something else, check
-[Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow)
-for possible solutions.
+[Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow) for
+possible solutions.
 
 
 ### Advanced Example
diff --git a/tensorflow/docs_src/performance/benchmarks.md b/tensorflow/docs_src/performance/benchmarks.md
index 8c0cff138d..bfb47d9f90 100644
--- a/tensorflow/docs_src/performance/benchmarks.md
+++ b/tensorflow/docs_src/performance/benchmarks.md
@@ -1,17 +1,17 @@
-# TensorFlow Performance Benchmarks
+# Benchmarks
 
 ## Overview
 
 A selection of image classification models were tested across multiple platforms
 to create a point of reference for the TensorFlow community. The methodology,
-links to the scripts, and commands to reproduce the results are in the
-[appendix](#appendix).
+links to the benchmark scripts, and commands to reproduce the results are in the
+[Appendix](#appendix).
 
 ## Results for image classification models
 
-InceptionV3 ([arXiv:1512.00567](https://arxiv.org/abs/1512.00567)),
-ResNet-50 ([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)),
-ResNet-152 ([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)), VGG16
+InceptionV3 ([arXiv:1512.00567](https://arxiv.org/abs/1512.00567)), ResNet-50
+([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)), ResNet-152
+([arXiv:1512.03385](https://arxiv.org/abs/1512.03385)), VGG16
 ([arXiv:1409.1556](https://arxiv.org/abs/1409.1556)), and
 [AlexNet](http://papers.nips.cc/paper/4824-imagenet-classification-with-deep-convolutional-neural-networks.pdf)
 were tested using the [ImageNet](http://www.image-net.org/) data set. Tests were
@@ -27,32 +27,32 @@ input pipeline and the underlying disk I/O are saturating the compute units.
 
 ### Training with NVIDIA® DGX-1™ (NVIDIA® Tesla® P100)
 
-<div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_p100_single_server.png">
+<div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:80%" src="../images/perf_summary_p100_single_server.png">
 </div>
 
 Details and additional results are in the [Details for NVIDIA® DGX-1™ (NVIDIA®
-Tesla® P100)](#details-for-nvidia®-dgx-1™-nvidia®-tesla®-p100) section.
+Tesla® P100)](#details_for_nvidia_dgx-1tm_nvidia_tesla_p100) section.
 
 ### Training with NVIDIA® Tesla® K80
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_k80_single_server.png">
+  <img style="width:80%" src="../images/perf_summary_k80_single_server.png">
 </div>
 
 Details and additional results are in the [Details for Google Compute Engine
-(NVIDIA® Tesla® K80)](#details-for-google-compute-engine-nvidia®-tesla®-k80) and
+(NVIDIA® Tesla® K80)](#details_for_google_compute_engine_nvidia_tesla_k80) and
 [Details for Amazon EC2 (NVIDIA® Tesla®
-K80)](#details-for-amazon-ec2-nvidia®-tesla®-k80) sections.
+K80)](#details_for_amazon_ec2_nvidia_tesla_k80) sections.
 
 ### Distributed training with NVIDIA® Tesla® K80
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_k80_aws_distributed.png">
+  <img style="width:80%" src="../images/perf_summary_k80_aws_distributed.png">
 </div>
 
 Details and additional results are in the [Details for Amazon EC2 Distributed
-(NVIDIA® Tesla® K80)](#details-for-amazon-ec2-distributed-nvidia®-tesla®-k80)
+(NVIDIA® Tesla® K80)](#details_for_amazon_ec2_distributed_nvidia_tesla_k80)
 section.
 
 ### Compare synthetic with real data training
@@ -82,12 +82,15 @@ section.
 *   **TensorFlow GitHub hash:** b1e174e
 *   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
     //tensorflow/tools/pip_package:build_pip_package`
-*   **Disk:** local SSD
+*   **Disk:** Local SSD
 *   **DataSet:** ImageNet
 
-Batch size and optimizer used for each model.
+Batch size and optimizer used for each model are listed in the table below. In
+addition to the batch sizes listed in the table, InceptionV3, ResNet-50,
+ResNet-152, and VGG16 were tested with a batch size of 32. Those results are in
+the *other results* section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+Options            | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ------------------ | ----------- | --------- | ---------- | ------- | -----
 Batch size per GPU | 64          | 64        | 64         | 512     | 64
 Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
@@ -104,10 +107,8 @@ VGG16       | replicated (with NCCL) | n/a
 
 ### Results
 
-Batch size and optimizer used for each model are listed in the table below.
-
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:100%" src="../images/perf_summary_p100_single_server.png">
+  <img style="width:80%" src="../images/perf_summary_p100_single_server.png">
 </div>
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
@@ -136,6 +137,28 @@ GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 Training AlexNet with real data on 8 GPUs was excluded from the graph and table
 above due to it maxing out the input pipeline.
 
+### Other Results
+
+The results below are all with a batch size of 32.
+
+**Training synthetic data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
+---- | ----------- | --------- | ---------- | -----
+1    | 128         | 210       | 85.3       | 124
+2    | 259         | 412       | 166        | 241
+4    | 520         | 827       | 330        | 470
+8    | 995         | 1623      | 643        | 738
+
+**Training real data**
+
+GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
+---- | ----------- | --------- | ---------- | -----
+1    | 130         | 208       | 85.0       | 124
+2    | 257         | 403       | 163        | 221
+4    | 507         | 814       | 325        | 401
+8    | 966         | 1525      | 641        | 619
+
 ## Details for Google Compute Engine (NVIDIA® Tesla® K80)
 
 ### Environment
@@ -156,7 +179,7 @@ addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
 tested with a batch size of 32. Those results are in the *other results*
 section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+Options            | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ------------------ | ----------- | --------- | ---------- | ------- | -----
 Batch size per GPU | 64          | 64        | 32         | 512     | 32
 Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
@@ -184,10 +207,10 @@ GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-1    | 30.5        | 56.7      | 20.7       | 639     | 30.2
-2    | 57.8        | 107       | 39         | 1136    | 55.5
-4    | 115         | 211       | 77.3       | 2067    | 106
-8    | 225         | 418       | 150        | 4056    | 213
+  1  | 30.6        | 56.7      | 20.7       | 639     | 30.2       
+  2  | 58.4        | 107       | 39.0       | 1136    | 55.5       
+  4  | 115         | 211       | 77.3       | 2067    | 106        
+  8  | 225         | 422       | 151        | 4056    | 213   
 
 ### Other Results
 
@@ -204,10 +227,10 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-1    | 29.3                        | 53.6
-2    | 55                          | 102
-4    | 109                         | 200
-8    | 215                         | 387
+  1  | 29.5                        | 53.6       
+  2  | 55.4                        | 102        
+  4  | 110                         | 201        
+  8  | 216                         | 387  
 
 ## Details for Amazon EC2 (NVIDIA® Tesla® K80)
 
@@ -230,7 +253,7 @@ addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
 tested with a batch size of 32. Those results are in the *other results*
 section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
+Options            | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ------------------ | ----------- | --------- | ---------- | ------- | -----
 Batch size per GPU | 64          | 64        | 32         | 512     | 32
 Optimizer          | sgd         | sgd       | sgd        | sgd     | sgd
@@ -289,7 +312,7 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
 1    | 30.0                        | 53.6
-2    | 57.5                        | 101
+2    | 57.5                        | 102
 4    | 113                         | 202
 8    | 212                         | 379
 
@@ -313,7 +336,7 @@ addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
 tested with a batch size of 32. Those results are in the *other results*
 section.
 
-                   | InceptionV3 | ResNet-50 | ResNet-152
+Options            | InceptionV3 | ResNet-50 | ResNet-152
 ------------------ | ----------- | --------- | ----------
 Batch size per GPU | 64          | 64        | 32
 Optimizer          | sgd         | sgd       | sgd
@@ -337,7 +360,7 @@ used with the following exceptions:
 ### Results
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
-  <img style="width:95%" src="../images/perf_summary_k80_aws_distributed.png">
+  <img style="width:80%" src="../images/perf_summary_k80_aws_distributed.png">
 </div>
 
 <div style="width:95%; margin:auto; margin-bottom:10px; margin-top:20px;">
@@ -374,34 +397,37 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 
 ### Executing benchmark tests
 
-The code for the benchmarks was created to be both used for benchmarking
-TensorFlow as well as used as a tool to test hardware platforms. The benchmark
-code includes modes such as `trivial` that run a virtually empty model that is
-useful for testing the maximum possibly samples/sec for the input pipeline among
-other things. Not only does this test TensorFlow but also the throughput of the
-underlying systems. There are two ways to execute the benchmarks in
-[tf_cnn_benchmarks.py](TODO: LINK TO GITHUB):
+The [benchmark code](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+was created to be used for benchmarking TensorFlow as well as used as a tool to
+test hardware platforms. Techniques used in the benchmark scripts are detailed
+in @{$performance_models$High-Performance Models}.
+
+There are two ways to execute the benchmark code:
 
-1.  Execute [tf_cnn_benchmarks.py](TODO: LINK TO GITHUB) directly
-2.  Utilize the [small wrapper](TODO: LINK TO GITHUB) that helps pick the
-    correct config
+1.  Execute [tf_cnn_benchmarks.py](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/tf_cnn_benchmarks.py)
+    directly.
+2.  Utilize the [scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/main.py)
+    that helps pick the correct config for each platform executes
+    `tf_cnn_benchmarks.py`.
 
 The wrapper is suggested as a starting point. Then investigate the variety of
-options available in `tf_cnn_benchmarks.py`. While the wrapper extensive
-examples, below are a couple highlights.
+options available in `tf_cnn_benchmarks.py`. Below are a couple examples of
+using the wrapper.
 
-Run ResNet-50 on a single instance with 8 GPUs. The `system` argument is used to
-determine the optimal configuration. The supported values are gce, aws, and
-dgx1. If `system` is not passeed, the best config for the most widely available
-hardware is used.
+**Single Server**
+This example illustrates training ResNet-50 on a single instance with 8 GPUs.
+The `system` flag is used to determine the optimal configuration. The
+supported values are gce, aws, and dgx1. If `system` is not passed, the best
+config for the most widely available hardware is used.
 
 ```bash
 python main.py --model=resnet50 --num_gpus=8
 python main.py --system=aws --model=resnet50 --num_gpus=8
 ```
 
-Run ResNet-50 on 2 hosts, e.g. host_0 (10.0.0.1) and host_1 (10.0.0.2), with 8
-GPUs each on aws.
+**Distributed**
+This example illustrates training ResNet-50 on 2 hosts, e.g. host_0 (10.0.0.1)
+and host_1 (10.0.0.2), with 8 GPUs each on AWS (Amazon EC2).
 
 ```bash
 # Run the following commands on host_0 (10.0.0.1):
diff --git a/tensorflow/docs_src/performance/index.md b/tensorflow/docs_src/performance/index.md
index 0ff4d2ee00..746dc0c74f 100644
--- a/tensorflow/docs_src/performance/index.md
+++ b/tensorflow/docs_src/performance/index.md
@@ -2,11 +2,19 @@
 
 Performance is often a significant issue when training a machine learning
 model.  This section explains various ways to optimize performance.  Start
-your investigation with the following guide:
+your investigation with the @{$performance_guide$Performance Guide} and then go
+deeper with techniques detailed in @{$performance_models$High-Performance Models}:
 
-  * @{$performance_guide$Performance}, which contains a collection of best
+  * @{$performance_guide$Performance Guide}, which contains a collection of best
     practices for optimizing your TensorFlow code.
 
+  * @{$performance_models$High-Performance Models}, which contains a collection
+    advanced techniques to build highly scalable models targeting different
+    system types and network topologies.
+
+  * @{$benchmarks$Benchmarks}, which contains a collection of benchmark
+    results.
+
 XLA (Accelerated Linear Algebra) is an experimental compiler for linear
 algebra that optimizes TensorFlow computations. The following guides explore
 XLA:
diff --git a/tensorflow/docs_src/performance/leftnav_files b/tensorflow/docs_src/performance/leftnav_files
index 0f30cc7fa5..d228473220 100644
--- a/tensorflow/docs_src/performance/leftnav_files
+++ b/tensorflow/docs_src/performance/leftnav_files
@@ -1,4 +1,8 @@
 performance_guide.md
+performance_models.md
+benchmarks.md
+quantization.md
+>>>
 xla/index.md
 xla/broadcasting.md
 xla/developing_new_backend.md
@@ -6,4 +10,3 @@ xla/jit.md
 xla/operation_semantics.md
 xla/shapes.md
 xla/tfcompile.md
-quantization.md
diff --git a/tensorflow/docs_src/performance/performance_guide.md b/tensorflow/docs_src/performance/performance_guide.md
index 8a1bba883a..07c5d3087f 100644
--- a/tensorflow/docs_src/performance/performance_guide.md
+++ b/tensorflow/docs_src/performance/performance_guide.md
@@ -1,8 +1,10 @@
-# Performance
+# Performance Guide
 
 This guide contains a collection of best practices for optimizing your
 TensorFlow code. The best practices apply to both new and experienced
-Tensorflow users.
+Tensorflow users.  As a complement to the best practices in this document, the
+@{$performance_models$High-Performance Models} document links to example code
+and details for creating models that scale on a variety of hardware.
 
 ## Best Practices
 While optimizing implementations of different types of models can be different,
@@ -73,7 +75,7 @@ Unless for a special circumstance or for example code, do not feed data
 into the session from Python variables, e.g. `dictionary`.
 
 ```python
-# This will result in poor performance.
+# Using feed_dict often results in suboptimal performance when using large inputs.
 sess.run(train_step, feed_dict={x: batch_xs, y_: batch_ys})
 ```
 
@@ -141,3 +143,4 @@ bn = tf.contrib.layers.batch_norm(
 The non-fused batch norm does computations using several individual Ops. Fused
 batch norm combines the individual operations into a single kernel, which runs
 faster.
+
diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index 71c4e6cfe0..70c415a024 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -1,155 +1,109 @@
 # High-Performance Models
 
-TensorFlow is a powerful and flexible machine learning platform.
-It can be used to distribute model training and inference across a large number
-of machines and computation devices.
-
-Its software stack is made of a few layers:
-
-* a fast and powerful C++ core
-* low-level Python primitives that sit right above individual kernels
-* a diverse range of high-level libraries that aim to make building real models
-  easier
-
-There are many existing examples and tutorials that explain useful features in
-TensorFlow.  The goal of this set of scripts is to demonstrate that we can build
-flexible and powerful high-performance models using the low-level APIs.
-In the future, many of the high-performance primitives will be incorporated into
-high-level APIs, and made available to more users transparently.
-But meanwhile, we show that it is fairly easy for advanced users to build highly
-scalable models targeting different system types, network topologies, etc.
-
-We divide our effort to build high-performance models into three categories:
-
-1. A fast input pipeline to read data from disk, preprocess it, and make it
-   ready on the GPU.
-2. A high-throughput model that trains on GPU very efficiently.
-3. Fast variable and gradients distribution mechanisms that scale well across
-   many machines and computation devices.
+This document and accompanying
+[scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+detail how to build highly scalable models that target a variety of system types
+and network topologies. The techniques in this document utilize some low-level
+TensorFlow Python primitives. In the future, many of these techniques will be
+incorporated into high-level APIs.
 
 ## Input Pipeline
 
-The input pipeline is the part of a TensorFlow program that reads input data,
-shuffles it, and preprocesses it.
-
-Among the most important features to build a fast input pipeline:
-
-* Avoid using feed-dictionary to feed a large amount of data for each step.
-  * Instead, use reader ops to get data into TensorFlow directly.
-* Parallelize data processing.
-* Use software pipelining to feed data, so that data is available immediately
-  when needed.
-
-One way to implement software pipelining in TensorFlow is through
-`tf.FifoQueue`, and it is possible to parallelize data processing through
-`tf.train.queue_runner`, which uses Python threads as its underlying
-implementation.
-This lays the foundation for the current Inception input pipeline.
-This design is well built for feeding older generation of GPUs,
-but the overhead of Python threads is too large to feed newer GPUs that are four
-to five times faster.
-
-In this model, we explore an alternative design that uses the native
-parallelism in TensorFlow.  In our example of an image model input pipeline,
-there are a few important parts:
-
-* Choose and read the image files from the disk.
-* Decode the image data into images, transform and add distortion so they are
-ready to be used.
-* Organize the transformed images into a minibatch.
-* Transfer the images from CPU to GPU, so they are ready for model training.
-
-It is important to note that the dominant part of each stage can happen in
-parallel with that of other stages:
-the file IO uses DMA to transfer the data from hard disk to memory;
-image decoding, transformation and distortion are CPU-heavy;
-the data transfer from CPU to GPU uses the GPU's copy-engine unit;
-and the GPU kernels use the main SMs of the GPU.
-It is natural to cut our pipeline into those parts so they can run in parallel
-with each other.
-
-Also, as mentioned earlier, most of the current input pipeline heavily uses
-Python threads.  However, the large overhead introduced by Python threads
-severely limits its scalability when the newer GPUs are a lot faster; we can
-alleviate this by making a single `session.run` call execute all parts of the
-pipeline.
-
-### Parallelize IO Reads
-
-In this new model, we use the native parallelism in TensorFlow: TensorFlow
-subscribes to an eager-execution model, which means that when nodes in the graph
-became available, TensorFlow will try to execute as many of them as possible.
-
-In order to parallelize reading from hard disk, we use `data_flow_ops.RecordInput`
-in this model.
-Given a list of input files of TFRecords, `RecordInput` continuously reads
-records using background threads, placing the records into its own large,
-internal pool of records.
-When it is has loaded at least half of its capacity, it produces output tensors.
-
-Since this op has its internal threads, and is dominated by IO time that doesn’t
-consume much CPU time, it naturally runs in parallel with the rest of the model.
+The @{$performance_guide$Performance Guide} explains how to identify possible
+input pipeline issues and best practices. We found that using @{tf.FIFOQueue}
+and @{tf.train.queue_runner} could not saturate multiple current generation GPUs
+when using large inputs and processing with higher samples per second, such
+as training ImageNet with [AlexNet](http://papers.nips.cc/paper/4824-imagenet-classification-with-deep-convolutional-neural-networks.pdf).
+This is due to the the use of Python threads as its underlying implementation.
+The overhead of Python threads is too large.
+
+Another approach, which we have implemented in the
+[scripts](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks),
+is to build an input pipeline using the native parallelism in TensorFlow. Our
+implementation is made up of 3 stages:
+
+*   I/O reads: Choose and read image files from disk.
+*   Image Processing: Decode image records into images, preprocess, and organize
+    into mini-batches.
+*   CPU-to-GPU Data Transfer: Transfer images from CPU to GPU.
+
+The dominant part of each stage is executed in parallel with the other stages
+using `data_flow_ops.StagingArea`. `StagingArea` is a queue-like operator
+similar to @{tf.FIFOQueue}. The difference is that `StagingArea` offers simpler
+functionality and can be executed on both CPU and GPU in parallel with other
+stages. Breaking the input pipeline into 3 stages that operate independently in
+parallel is scalable and takes full advantage of large multi-core environments.
+The rest of this section details the stages followed by details about using
+`data_flow_ops.StagingArea`.
+
+### Parallelize I/O Reads
+
+`data_flow_ops.RecordInput` is used to parallelize reading from disk. Given a
+list of input files representing TFRecords, `RecordInput` continuously reads
+records using background threads. The records are placed into its own large
+internal pool and when it has loaded at least half of its capacity, it produces
+output tensors.
+
+This op has its own internal threads that are dominated by I/O time that consume
+minimal CPU, which allows it to run smoothly in parallel with the rest of the
+model.
 
 ### Parallelize Image Processing
 
-After reading from “RecordInput”, the tensors are passed to the input processing
-pipeline.  For example, if we need to feed 8 GPUs, each with a batch-size of 32,
-then for each step we do the following.
-
-First, read 32x8=256 records, and process them individually, in
-parallel. This starts with 256 independent RecordInput read ops in the graph.
-
-Then, follow each read with identical set of ops for processing. Each set is
-considered independent and will execute in parallel.  The operations include
-image decoding, image distortion, and resizing.
-
-Finally, once the images are ready, they will be concatenated together into 8
-batch-size 32 tensors.
-Note that we can use “tf.concat” for this purpose.
-However, “tf.concat” is implemented as a single op, which waits for all
-the inputs to be ready, and then concatenates them together. Since all
-inputs are produced in parallel, there will be a long tail waiting for all
-inputs to be available; and when concatenation happens, the op becomes memory
-limited as all input tensors compete for memory bandwidth.
-So for the final concatenation, we use `tf.parallel_stack` instead. This
+After images are read from `RecordInput` they are passed as tensors to the image
+processing pipeline. To make the image processing pipeline easier to explain,
+assume that the input pipeline is targeting 8 GPUs with a batch size of 256 (32
+per GPU).
+
+256 records are read and processed individually in parallel. This starts with
+256 independent `RecordInput` read ops in the graph. Each read op is followed by
+an identical set of ops for image preprocessing that are considered independent
+and executed in parallel. The image preprocessing ops include operations such as
+image decoding, distortion, and resizing.
+
+Once the images are through preprocessing, they are concatenated together into 8
+batch size 32 tensors. Rather than use @{tf.concat} for this purpose, which is
+implemented as a single op that waits for all the inputs to be ready before
+concatenating them together, @{tf.parallel_stack} is used. @{tf.parallel_stack}
 allocates an uninitialized tensor as an output, and each input tensor is written
 to its designated portion of the output tensor as soon as the input is
-available.  When all the input tensors are finished, the output tensor is passed
-along in the graph. This effectively hides all the memory latency with the long
-tail of producing all the input tensors.
+available.
+
+When all the input tensors are finished, the output tensor is passed along in
+the graph. This effectively hides all the memory latency with the long tail of
+producing all the input tensors.
 
 ### Parallelize CPU-to-GPU Data Transfer
 
-In our example, once all the input images are processed and concatenated
-together by the CPU, we have 8 tensors, each of which has a batch-size of 32.
-These tensors are then to be used by the GPU for the model training.
+Continuing with the assumption that the target is 8 GPUs with a batch size of
+256 (32 per GPU). Once the input images are processed and concatenated together
+by the CPU, we have 8 tensors each with a batch-size of 32.
 
-In TensorFlow, users can use tensors from one device on any other device
-directly.  TensorFlow inserts implicit copies to make the tensors available on
-any devices where they are used.  The runtime schedules the copy between devices
-to run before the tensors are actually used.  However, if the copy cannot finish
-in time, the computation that needs those tensors will stall.
+TensorFlow enables tensors from one device to be used on any other device
+directly. TensorFlow inserts implicit copies to make the tensors available on
+any devices where they are used. The runtime schedules the copy between devices
+to run before the tensors are actually used. However, if the copy cannot finish
+in time, the computation that needs those tensors will stall and result in
+decreased performance.
 
-For high-performance models, it is helpful to explicitly schedule the copy ahead
-of the time in parallel, so when the computation starts on GPU, all the tensors
-are already available on the right device.
+In this implementation, `data_flow_ops.StagingArea` is used to explicitly
+schedule the copy in parallel. The end result is that when computation starts on
+the GPU, all the tensors are already available.
 
 ### Software Pipelining
 
-With all the stages capable of being driven by different processors, we insert
-`data_flow_ops.StagingArea` in between them so they run in parallel.
-`StagingArea` is a queue-like operator similar to `tf.FifoQueue`.
-But it offers simpler functionalities and can be executed on both CPU and GPU.
+With all the stages capable of being driven by different processors,
+`data_flow_ops.StagingArea` is used between them so they run in parallel.
+`StagingArea` is a queue-like operator similar to @{tf.FIFOQueue} that offers
+simpler functionalities that can be executed on both CPU and GPU.
 
-Before the model starts running all the stages, we warm up the stages in order
-so the staging buffers in between all have one set of data in them.
-During each run step that follows, we will run all the stages.
-They read one set of data from the staging buffers at the beginning of each
-stage, and push one set at end end.
+Before the model starts running all the stages, the input pipeline stages are
+warmed up to prime the staging buffers in between with one set of data.
+During each run step, one set of data is read from the staging buffers at
+the beginning of each stage, and one set is pushed at the end.
 
-For example: if there are three stages: A, B and C.
-There are two staging areas in between: S1 and S2.
-During the warm up, we run:
+For example: if there are three stages: A, B and C. There are two staging areas
+in between: S1 and S2. During the warm up, we run:
 
 ```
 Warm up:
@@ -162,123 +116,126 @@ Step 4: A3  B2  C1
 Step 5: A4  B3  C2
 ```
 
-After the warm up, S1 and S2 each have one set of data in them.
-For each step of the actual execution, one set of data is consumed from each
-staging area, and one set is added to each.
+After the warm up, S1 and S2 each have one set of data in them. For each step of
+the actual execution, one set of data is consumed from each staging area, and
+one set is added to each.
 
-There are a few nice properties about the scheme:
+Benefits of using this scheme:
 
-* All the stages are non-blocking, since the staging areas always have one set
-of data after the warm up.
-* Each stage can run in parallel since they can all start immediately.
-* The staging buffers have a fixed memory overhead. They will have at most one
-  extra set of data.
-* Only a single`session.run()` call is needed to run all stages of the step,
-  which makes profiling and debugging much easier.
+*   All stages are non-blocking, since the staging areas always have one set of
+    data after the warm up.
+*   Each stage can run in parallel since they can all start immediately.
+*   The staging buffers have a fixed memory overhead. They will have at most one
+    extra set of data.
+*   Only a single`session.run()` call is needed to run all stages of the step,
+    which makes profiling and debugging much easier.
 
 ## Best Practices in Building High-Performance Models
 
-The computation on GPU can happen immediately since the input data have already
-been transferred onto GPU when the step starts.
-But it is still important to build the model that runs as fast as possible.
-Here are some tips for a high-performance convolutional neural network (CNN)
-model:
+Collected below are a couple of additional best practices that can improve
+performance and increase the flexiblity of models.
 
 ### Build the model with both NHWC and NCHW
 
 Most TensorFlow operations used by a CNN support both NHWC and NCHW data format.
-On GPU, NCHW is faster.
-But on CPU, NHWC is sometimes faster.
+On GPU, NCHW is faster. But on CPU, NHWC is sometimes faster.
 
-So it is a good idea to build the model that can work in both ways.
-Our model shows a good way to do that effectively.
-For GPU training, we should always use NCHW.
-But if the model needs inference on CPU, we could use NHWC; weights obtained
-from training with NCHW data format can be used for inference in NHWC data
-format.
+Building a model to support both date formats keeps the model flexible and
+capable of operating optimally regardless of platform. Most TensorFlow
+operations used by a CNN support both NHWC and NCHW data format. The benchmark
+script was written to support both NCHW and NHWC. NCHW should always be used
+when training with GPUs. NHWC is sometimes faster on CPU. A flexible model can
+be trained on GPUs using NCHW with inference done on CPU using NHWC with the
+weights obtained from training.
 
 ### Use Fused Batch-Normalization
 
 The default batch-normalization in TensorFlow is implemented as composite
-operations.
-This is very general, but often leads to suboptimal performance.
-An alternative is the fused batch-normalization, and the performance on GPU
-is often much faster.
+operations. This is very general, but often leads to suboptimal performance. An
+alternative is to use fused batch-normalization which often has much better
+performance on GPU. Below is an example of using @{tf.contrib.layers.batch_norm}
+to implement fused batch-normalization.
+
+```python
+bn = tf.contrib.layers.batch_norm(
+          input_layer, fused=True, data_format='NCHW'
+          scope=scope)
+```
 
 ## Variable Distribution and Gradient Aggregation
 
 During training, training variable values are updated using aggregated gradients
-and deltas.  In this model, we demonstrate that with the flexible and
-general-purpose TensorFlow primitives, it is fairly easy to build a diverse
-range of high-performance distribution and aggregation schemes for different
-types of systems.
-
-For example:
-
-* The standard parameter-server where each replica of the training model reads
-  the variables directly, and updates the variable independently.  When each
-  model needs the variables, they are copied over through the standard implicit
-  copies added by the TensorFlow runtime. It is shown how to use this method
-  in either local training, distributed synchronous training, and distributed
-  asynchronous training.
-* A replicated mode for local training where each GPU has an identical
-  copy of the training parameters.  The forward and backward computation can
-  start immediately as the variable data is immediately available.  Gradients
-  are accumulated across all GPUs, and the aggregated total is applied to
-  each GPU's copy of the variables so that they stay in sync.
-* A distributed replicated mode of training where each GPU has an identical copy
-  of the training parameters, and a master copy of the variables is stored
-  on the parameter-servers.  The forward and backward computation can
-  start immediately as the variable data is immediately available.  Gradients
-  are accumulated across all GPUs on each server and then the per-server
-  aggregated gradients are applied to the master copy. After all workers do
-  this, each worker updates its copy of the variable from the master copy.
-
-We show that most of the variable distribution and aggregation subsystem can
-be implemented through TensorFlow low-level primitives with manageable
-complexity at the model level. Here we discuss some more details.
-
-### Parameter-server Variables
-
-The most common way trainable variables are managed in TensorFlow models is the
+and deltas. In the benchmark script, we demonstrate that with the flexible and
+general-purpose TensorFlow primitives, a diverse range of high-performance
+distribution and aggregation schemes can be built.
+
+Three examples of variable distribution and aggregation were included in the
+script:
+
+*   `parameter_server` where each replica of the training model reads the
+    variables from a parameter server and updates the variable independently.
+    When each model needs the variables, they are copied over through the
+    standard implicit copies added by the TensorFlow runtime. The example
+    [script](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+    illustrates using this method for local training, distributed synchronous
+    training, and distributed asynchronous training.
+*   `replicated` places an identical copy of each training variable on each
+    GPU. The forward and backward computation can start immediately as the
+    variable data is immediately available. Gradients are accumulated across all
+    GPUs, and the aggregated total is applied to each GPU's copy of the
+    variables to keep them in sync.
+*   `distributed_replicated` places an identical copy of the training parameters
+    on each GPU along with a master copy on the parameter servers. The forward
+    and backward computation can start immediately as the variable data is
+    immediately available. Gradients are accumulated across all GPUs on each
+    server and then the per-server aggregated gradients are applied to the
+    master copy. After all workers do this, each worker updates its copy of the
+    variable from the master copy.
+
+Below are additional details about each approach.
+
+### Parameter Server Variables
+
+The most common way trainable variables are managed in TensorFlow models is
 parameter server mode.
 
-In a distributed system, this means that each worker process runs the same
-model, and parameter server processes own the master copies of the variables.
-When a worker needs a variable from a parameter server, it refers to it
-directly.  The TensorFlow runtime adds implicit copies to the graph to make the
-variable value available on the computation device that needs it. When a
-gradient is computed on a worker, it is sent to the parameter server that owns
-the particular variable, and the corresponding optimizer is used to update the
-variable.
+In a distributed system, each worker process runs the same model, and parameter
+server processes own the master copies of the variables. When a worker needs a
+variable from a parameter server, it refers to it directly. The TensorFlow
+runtime adds implicit copies to the graph to make the variable value available
+on the computation device that needs it. When a gradient is computed on a
+worker, it is sent to the parameter server that owns the particular variable,
+and the corresponding optimizer is used to update the variable.
 
 There are some techniques to improve throughput:
 
-* The variables are spread among parameter servers based on their size, for load
-  balancing.
-* When each worker has multiple GPUs, gradients are accumulated across the GPUs
-  and a single aggregated gradient is sent to the parameter server. This reduces
-  the network bandwidth and the amount of work done by the parameter servers.
+*   The variables are spread among parameter servers based on their size, for
+    load balancing.
+*   When each worker has multiple GPUs, gradients are accumulated across the
+    GPUs and a single aggregated gradient is sent to the parameter server. This
+    reduces the network bandwidth and the amount of work done by the parameter
+    servers.
 
 For coordinating between workers, a very common mode is async updates, where
 each worker updates the master copy of the variables without synchronizing with
-other workers.  In our model, we demonstrate that it is fairly easy to introduce
+other workers. In our model, we demonstrate that it is fairly easy to introduce
 synchronization across workers so updates for all workers are finished in one
 step before the next step can start.
 
-The parameter-server method can also be used for local training, In this case,
+The parameter server method can also be used for local training, In this case,
 instead of spreading the master copies of variables across parameters servers,
 they are either on the CPU or spread across the available GPUs.
 
 Due to the simple nature of this setup, this architecture has gained a lot of
 popularity within the community.
 
-This is available in the benchmark scripts as the 'parameter_server'
-variable_update mode.
+This mode can be used in the script by passing
+`--variable_update=parameter_server`.
 
-![parameter_server mode in distributed
-training](../images/perf_parameter_server_mode_doc.png){
-width="900" style="max-width: inherit"}
+<div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" alt="parameter_server mode in distributed training"
+   src="../images/perf_parameter_server_mode_doc.png">
+</div>
 
 ### Replicated Variables
 
@@ -292,19 +249,18 @@ devices and the fully aggregated gradient is then applied to each local copy.
 
 Gradient aggregation across the server can be done in different ways:
 
-* Using standard TensorFlow operations to accumulate the total on a single
-  device (CPU or GPU) and then copy it back to all GPUs.
-* Using NVIDIA NCCL, described below in the NCCL section.
+*   Using standard TensorFlow operations to accumulate the total on a single
+    device (CPU or GPU) and then copy it back to all GPUs.
+*   Using NVIDIA® NCCL, described below in the NCCL section.
 
-This is available in the benchmark scripts for local execution only, as the
-'replicated' variable_update mode.
+This mode can be used in the script by passing `--variable_update=replicated`.
 
 ### Replicated Variables in Distributed Training
 
-The replicated method for variables can be extended to distributed training.
-One way to do this like the replicated mode: aggregate the gradients fully
-across the cluster and apply them to each local copy of the variable. This may
-be shown in a future version of this scripts; the scripts do present a different
+The replicated method for variables can be extended to distributed training. One
+way to do this like the replicated mode: aggregate the gradients fully across
+the cluster and apply them to each local copy of the variable. This may be shown
+in a future version of this scripts; the scripts do present a different
 variation, described here.
 
 In this mode, in addition to each GPU's copy of the variables, a master copy is
@@ -314,28 +270,30 @@ immediately using the local copies of the variables.
 As the gradients of the weights become available, they are sent back to the
 parameter servers and all local copies are updated:
 
-1. All the gradients from the GPU on the same worker are aggregated together.
-2. Aggregated gradients from each worker are sent to the parameter server that
-   owns the variable, where the specified optimizer is used to update the
-   master copy of the variable.
-3. Each worker updates its local copy of the variable from the master. In
-   the example model, this is done with a cross-replica barrier that waits for
-   all the workers to finish updating the variables, and fetches the new
-   variable only after the barrier has been released by all replicas.  Once the
-   copy finishes for all variables, this marks the end of a training step, and a
-   new step can start.
+1.  All the gradients from the GPU on the same worker are aggregated together.
+2.  Aggregated gradients from each worker are sent to the parameter server that
+    owns the variable, where the specified optimizer is used to update the
+    master copy of the variable.
+3.  Each worker updates its local copy of the variable from the master. In the
+    example model, this is done with a cross-replica barrier that waits for all
+    the workers to finish updating the variables, and fetches the new variable
+    only after the barrier has been released by all replicas. Once the copy
+    finishes for all variables, this marks the end of a training step, and a new
+    step can start.
 
 Although this sounds similar to the standard use of parameter servers, the
-performance is often better in many cases.  This is largely due to the fact the
+performance is often better in many cases. This is largely due to the fact the
 computation can happen without any delay, and much of the copy latency of early
 gradients can be hidden by later computation layers.
 
-This is available in the benchmark scripts as the 'distributed_replicated'
-variable_update mode.
+This mode can be used in the script by passing
+`--variable_update=distributed_replicated`.
+
 
-![distributed_replicated mode](
-../images/perf_distributed_replicated_mode_doc.png){
-width="900" style="max-width: inherit"}
+<div style="width:100%; margin:auto; margin-bottom:10px; margin-top:20px;">
+  <img style="width:100%" alt="distributed_replicated mode"
+   src="../images/perf_distributed_replicated_mode_doc.png">
+</div>
 
 #### NCCL
 
@@ -343,47 +301,29 @@ In order to broadcast variables and aggregate gradients across different GPUs
 within the same host machine, we can use the default TensorFlow implicit copy
 mechanism.
 
-However, we can instead use the optional NCCL support.  NCCL is an NVIDIA
-library that can efficiently broadcast and aggregate data across different GPUs.
-It schedules a cooperating kernel on each GPU that knows how to best utilize the
-underlying hardware topology; this kernel uses a single SM of the GPU.
+However, we can instead use the optional NCCL (@{tf.contrib.nccl}) support. NCCL
+is an NVIDIA® library that can efficiently broadcast and aggregate data across
+different GPUs. It schedules a cooperating kernel on each GPU that knows how to
+best utilize the underlying hardware topology; this kernel uses a single SM of
+the GPU.
 
 In our experiment, we demonstrate that although NCCL often leads to much faster
-data aggregation by itself, it doesn't necessarily lead to faster training.  Our
+data aggregation by itself, it doesn't necessarily lead to faster training. Our
 hypothesis is that the implicit copies are essentially free since they go to the
 copy engine on GPU, as long as its latency can be hidden by the main computation
-itself.  Although NCCL can transfer data faster, it takes one SM away, and adds
-more pressure to the underlying L2 cache.  Our results show that for 8-GPUs,
-NCCL often leads to better performance.  However, for fewer GPUs, the implicit
-copies often perform better.
+itself. Although NCCL can transfer data faster, it takes one SM away, and adds
+more pressure to the underlying L2 cache. Our results show that for 8-GPUs, NCCL
+often leads to better performance. However, for fewer GPUs, the implicit copies
+often perform better.
 
 #### Staged Variables
 
 We further introduce a staged-variable mode where we use staging areas for both
-the variable reads, and their updates.
-Similar to software pipelining of the input pipeline, this can hide the data
-copy latency.
-If the computation time takes longer than the copy and aggregation, the copy
-itself becomes essentially free.
+the variable reads, and their updates. Similar to software pipelining of the
+input pipeline, this can hide the data copy latency. If the computation time
+takes longer than the copy and aggregation, the copy itself becomes essentially
+free.
 
 The downside is that all the weights read are from the previous training step.
-So it is a different algorithm from SGD.
-But it is possible to improve its convergence by adjusting learning rate and
-other hyperparameters.
-
-## Conclusions
-
-In this high-performance model, we present a number of options to build
-high-performance models in TensorFlow.
-Due to the flexible design in TensorFlow, advanced features like this often
-requires no system-level changes, and can be largely achieved through
-model-level changes.
-
-We do not claim which combination works best for a particular model.
-That should be left to the engineers who build the model and the training system.
-Many of the ingredients of the high-performance model will find their ways
-to high-level primitives that become transparent to users.
-However, we have shown that advanced users can easily tune and modify the
-underlying model behavior using low-level primitives.
-This could be very useful when improving performance for particular system
-setups and model configurations.
+So it is a different algorithm from SGD. But it is possible to improve its
+convergence by adjusting learning rate and other hyperparameters.
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index c04e37eccd..c394315cfa 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -94,13 +94,15 @@ class Estimator(object):
 
         * Args:
 
-          * `features`: single `Tensor` or `dict` of `Tensor`s
-                 (depending on data passed to `train`),
-          * `labels`: `Tensor` or `dict` of `Tensor`s (for multi-head
-                 models). If mode is `ModeKeys.PREDICT`, `labels=None` will be
-                 passed. If the `model_fn`'s signature does not accept
-                 `mode`, the `model_fn` must still be able to handle
-                 `labels=None`.
+          * `features`: This is the first item returned from the `input_fn`
+                 passed to `train`, 'evaluate`, and `predict`. This should be a
+                 single `Tensor` or `dict` of same.
+          * `labels`: This is the second item returned from the `input_fn`
+                 passed to `train`, 'evaluate`, and `predict`. This should be a
+                 single `Tensor` or `dict` of same (for multi-head models). If
+                 mode is `ModeKeys.PREDICT`, `labels=None` will be passed. If
+                 the `model_fn`'s signature does not accept `mode`, the
+                 `model_fn` must still be able to handle `labels=None`.
           * `mode`: Optional. Specifies if this training, evaluation or
                  prediction. See `ModeKeys`.
           * `params`: Optional `dict` of hyperparameters.  Will receive what
diff --git a/tensorflow/python/framework/tensor_shape.py b/tensorflow/python/framework/tensor_shape.py
index 3664710caa..73c810711f 100644
--- a/tensorflow/python/framework/tensor_shape.py
+++ b/tensorflow/python/framework/tensor_shape.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
 """Helper classes for tensor shape inference."""
 from __future__ import absolute_import
 from __future__ import division
@@ -31,8 +30,8 @@ class Dimension(object):
       self._value = None
     else:
       self._value = int(value)
-      if (not isinstance(value, compat.bytes_or_text_types)
-          and self._value != value):
+      if (not isinstance(value, compat.bytes_or_text_types) and
+          self._value != value):
         raise ValueError("Ambiguous dimension: %s" % value)
       if self._value < 0:
         raise ValueError("Dimension %d must be >= 0" % self._value)
@@ -89,9 +88,8 @@ class Dimension(object):
       True if this Dimension and `other` are compatible.
     """
     other = as_dimension(other)
-    return (self._value is None
-            or other.value is None
-            or self._value == other.value)
+    return (self._value is None or other.value is None or
+            self._value == other.value)
 
   def assert_is_compatible_with(self, other):
     """Raises an exception if `other` is not compatible with this Dimension.
@@ -104,8 +102,8 @@ class Dimension(object):
         is_compatible_with).
     """
     if not self.is_compatible_with(other):
-      raise ValueError("Dimensions %s and %s are not compatible"
-                       % (self, other))
+      raise ValueError("Dimensions %s and %s are not compatible" % (self,
+                                                                    other))
 
   def merge_with(self, other):
     """Returns a Dimension that combines the information in `self` and `other`.
@@ -385,18 +383,17 @@ class TensorShape(object):
   `Tensor`. It may be one of the following:
 
   * *Fully-known shape:* has a known number of dimensions and a known size
-    for each dimension.
+    for each dimension. e.g. `TensorShape([16, 256])`
   * *Partially-known shape:* has a known number of dimensions, and an unknown
-    size for one or more dimension.
+    size for one or more dimension. e.g. `TensorShape([None, 256])`
   * *Unknown shape:* has an unknown number of dimensions, and an unknown
-    size in all dimensions.
+    size in all dimensions. e.g. `TensorShape(None)`
 
   If a tensor is produced by an operation of type `"Foo"`, its shape
   may be inferred if there is a registered shape function for
-  `"Foo"`. See @{$adding_an_op#shape-functions-in-c$`Shape functions in   C++`} for
-  details of shape functions and how to register them. Alternatively,
-  the shape may be set explicitly using
-  @{tf.Tensor.set_shape}.
+  `"Foo"`. See @{$adding_an_op#shape-functions-in-c$`Shape functions in C++`}
+  for details of shape functions and how to register them. Alternatively,
+  the shape may be set explicitly using @{tf.Tensor.set_shape}.
   """
 
   def __init__(self, dims):
@@ -414,7 +411,7 @@ class TensorShape(object):
       self._dims = None
     elif isinstance(dims, compat.bytes_or_text_types):
       raise TypeError("A string has ambiguous TensorShape, please wrap in a "
-                       "list or convert to an int: %s" % dims)
+                      "list or convert to an int: %s" % dims)
     elif isinstance(dims, tensor_shape_pb2.TensorShapeProto):
       if dims.unknown_rank:
         self._dims = None
@@ -422,7 +419,8 @@ class TensorShape(object):
         self._dims = [
             # Protos store variable-size dimensions as -1
             as_dimension(dim.size if dim.size != -1 else None)
-            for dim in dims.dim]
+            for dim in dims.dim
+        ]
     elif isinstance(dims, TensorShape):
       self._dims = dims.dims
     else:
@@ -519,7 +517,7 @@ class TensorShape(object):
           # suffixes of otherwise unknown shapes.
           return unknown_shape()
         else:
-          return unknown_shape(ndims=stop-start)
+          return unknown_shape(ndims=stop - start)
       else:
         return Dimension(None)
 
@@ -560,8 +558,7 @@ class TensorShape(object):
           new_dims.append(dim.merge_with(other[i]))
         return TensorShape(new_dims)
       except ValueError:
-        raise ValueError("Shapes %s and %s are not compatible" %
-                         (self, other))
+        raise ValueError("Shapes %s and %s are not compatible" % (self, other))
 
   def concatenate(self, other):
     """Returns the concatenation of the dimension in `self` and `other`.
@@ -599,8 +596,8 @@ class TensorShape(object):
     other = as_shape(other)
     if self.ndims is not None and other.ndims is not None:
       if self.ndims != other.ndims:
-        raise ValueError(
-            "Shapes %s and %s must have the same rank" % (self, other))
+        raise ValueError("Shapes %s and %s must have the same rank" % (self,
+                                                                       other))
 
   def assert_has_rank(self, rank):
     """Raises an exception if `self` is not compatible with the given `rank`.
@@ -736,8 +733,8 @@ class TensorShape(object):
 
   def is_fully_defined(self):
     """Returns True iff `self` is fully defined in every dimension."""
-    return (self._dims is not None
-            and all(dim.value is not None for dim in self._dims))
+    return (self._dims is not None and all(dim.value is not None
+                                           for dim in self._dims))
 
   def assert_is_fully_defined(self):
     """Raises an exception if `self` is not fully defined in every dimension.
@@ -767,9 +764,10 @@ class TensorShape(object):
       return tensor_shape_pb2.TensorShapeProto(unknown_rank=True)
     else:
       return tensor_shape_pb2.TensorShapeProto(dim=[
-          tensor_shape_pb2.TensorShapeProto.Dim(
-              size=-1 if d.value is None else d.value)
-          for d in self._dims])
+          tensor_shape_pb2.TensorShapeProto.Dim(size=-1
+                                                if d.value is None else d.value)
+          for d in self._dims
+      ])
 
   def __eq__(self, other):
     """Returns True if `self` is equivalent to `other`."""
diff --git a/tensorflow/python/kernel_tests/distributions/BUILD b/tensorflow/python/kernel_tests/distributions/BUILD
index 3c1a4d5125..3630adc954 100644
--- a/tensorflow/python/kernel_tests/distributions/BUILD
+++ b/tensorflow/python/kernel_tests/distributions/BUILD
@@ -41,6 +41,180 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "beta_test",
+    size = "small",
+    srcs = ["beta_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "bernoulli_test",
+    size = "small",
+    srcs = ["bernoulli_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "categorical_test",
+    size = "small",
+    srcs = ["categorical_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:random_ops",
+    ],
+)
+
+cuda_py_test(
+    name = "dirichlet_test",
+    size = "small",
+    srcs = ["dirichlet_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "dirichlet_multinomial_test",
+    size = "medium",
+    srcs = ["dirichlet_multinomial_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "exponential_test",
+    srcs = ["exponential_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "gamma_test",
+    srcs = ["gamma_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "laplace_test",
+    srcs = ["laplace_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "multinomial_test",
+    srcs = ["multinomial_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+cuda_py_test(
+    name = "student_t_test",
+    size = "small",
+    srcs = ["student_t_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+    tags = ["nomsan"],  # disable to avoid false positives from scipy.
+)
+
+cuda_py_test(
+    name = "uniform_test",
+    size = "small",
+    srcs = ["uniform_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+    ],
+)
+
 cuda_py_test(
     name = "normal_test",
     size = "medium",
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py b/tensorflow/python/kernel_tests/distributions/bernoulli_test.py
similarity index 94%
rename from tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
rename to tensorflow/python/kernel_tests/distributions/bernoulli_test.py
index e8b0eb4eb8..ef93c4dab0 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bernoulli_test.py
+++ b/tensorflow/python/kernel_tests/distributions/bernoulli_test.py
@@ -18,15 +18,30 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-import scipy.special
-from tensorflow.contrib.distributions.python.ops import bernoulli
+
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import bernoulli
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+special = try_import("scipy.special")
 
 
 def make_bernoulli(batch_shape, dtype=dtypes.int32):
@@ -54,13 +69,16 @@ class BernoulliTest(test.TestCase):
     with self.test_session():
       self.assertAllClose(logits, dist.logits.eval())
 
+    if not special:
+      return
+
     with self.test_session():
-      self.assertAllClose(scipy.special.expit(logits), dist.probs.eval())
+      self.assertAllClose(special.expit(logits), dist.probs.eval())
 
     p = [0.01, 0.99, 0.42]
     dist = bernoulli.Bernoulli(probs=p)
     with self.test_session():
-      self.assertAllClose(scipy.special.logit(p), dist.logits.eval())
+      self.assertAllClose(special.logit(p), dist.logits.eval())
 
   def testInvalidP(self):
     invalid_ps = [1.01, 2.]
@@ -160,7 +178,9 @@ class BernoulliTest(test.TestCase):
   def testPmfWithP(self):
     p = [[0.2, 0.4], [0.3, 0.6]]
     self._testPmf(probs=p)
-    self._testPmf(logits=scipy.special.logit(p))
+    if not special:
+      return
+    self._testPmf(logits=special.logit(p))
 
   def testBroadcasting(self):
     with self.test_session():
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py b/tensorflow/python/kernel_tests/distributions/beta_test.py
similarity index 94%
rename from tensorflow/contrib/distributions/python/kernel_tests/beta_test.py
rename to tensorflow/python/kernel_tests/distributions/beta_test.py
index ec16a85991..91a451f033 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/beta_test.py
+++ b/tensorflow/python/kernel_tests/distributions/beta_test.py
@@ -16,18 +16,33 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import special
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import beta as beta_lib
+
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import random_seed
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import beta as beta_lib
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+special = try_import("scipy.special")
+stats = try_import("scipy.stats")
 
 
 class BetaTest(test.TestCase):
@@ -167,18 +182,22 @@ class BetaTest(test.TestCase):
     with session.Session():
       a = [1., 2, 3]
       b = [2., 4, 1.2]
-      expected_mean = stats.beta.mean(a, b)
       dist = beta_lib.Beta(a, b)
       self.assertEqual(dist.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_mean = stats.beta.mean(a, b)
       self.assertAllClose(expected_mean, dist.mean().eval())
 
   def testBetaVariance(self):
     with session.Session():
       a = [1., 2, 3]
       b = [2., 4, 1.2]
-      expected_variance = stats.beta.var(a, b)
       dist = beta_lib.Beta(a, b)
       self.assertEqual(dist.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variance = stats.beta.var(a, b)
       self.assertAllClose(expected_variance, dist.variance().eval())
 
   def testBetaMode(self):
@@ -228,9 +247,11 @@ class BetaTest(test.TestCase):
     with session.Session():
       a = [1., 2, 3]
       b = [2., 4, 1.2]
-      expected_entropy = stats.beta.entropy(a, b)
       dist = beta_lib.Beta(a, b)
       self.assertEqual(dist.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.beta.entropy(a, b)
       self.assertAllClose(expected_entropy, dist.entropy().eval())
 
   def testBetaSample(self):
@@ -243,6 +264,8 @@ class BetaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000,))
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       self.assertLess(
           stats.kstest(
               # Beta is a univariate distribution.
@@ -286,6 +309,8 @@ class BetaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000, 3, 2, 2))
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values[:, 1, :].mean(axis=0),
           stats.beta.mean(a, b)[1, :],
@@ -301,6 +326,8 @@ class BetaTest(test.TestCase):
         actual = beta_lib.Beta(a, b).cdf(x).eval()
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 0. <= x)
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 1. >= x)
+        if not stats:
+          return
         self.assertAllClose(stats.beta.cdf(x, a, b), actual, rtol=1e-4, atol=0)
 
   def testBetaLogCdf(self):
@@ -313,6 +340,8 @@ class BetaTest(test.TestCase):
         actual = math_ops.exp(beta_lib.Beta(a, b).log_cdf(x)).eval()
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 0. <= x)
         self.assertAllEqual(np.ones(shape, dtype=np.bool), 1. >= x)
+        if not stats:
+          return
         self.assertAllClose(stats.beta.cdf(x, a, b), actual, rtol=1e-4, atol=0)
 
   def testBetaWithSoftplusConcentration(self):
@@ -342,6 +371,8 @@ class BetaTest(test.TestCase):
         d2_sp = beta_lib.BetaWithSoftplusConcentration(concentration1=a2_sp,
                                                        concentration0=b2_sp)
 
+        if not special:
+          return
         kl_expected = (special.betaln(a2, b2) - special.betaln(a1, b1) +
                        (a1 - a2) * special.digamma(a1) +
                        (b1 - b2) * special.digamma(b1) +
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py b/tensorflow/python/kernel_tests/distributions/categorical_test.py
similarity index 99%
rename from tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py
rename to tensorflow/python/kernel_tests/distributions/categorical_test.py
index 269c02ede3..bfdb5fa9fe 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/categorical_test.py
+++ b/tensorflow/python/kernel_tests/distributions/categorical_test.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import categorical
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_util
@@ -29,6 +28,7 @@ from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import categorical
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py b/tensorflow/python/kernel_tests/distributions/dirichlet_multinomial_test.py
similarity index 99%
rename from tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
rename to tensorflow/python/kernel_tests/distributions/dirichlet_multinomial_test.py
index bc25366cfa..d009f4e931 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_multinomial_test.py
+++ b/tensorflow/python/kernel_tests/distributions/dirichlet_multinomial_test.py
@@ -17,14 +17,15 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-from tensorflow.contrib import distributions
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import dirichlet_multinomial
 from tensorflow.python.platform import test
 
-ds = distributions
+
+ds = dirichlet_multinomial
 
 
 class DirichletMultinomialTest(test.TestCase):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_test.py b/tensorflow/python/kernel_tests/distributions/dirichlet_test.py
similarity index 94%
rename from tensorflow/contrib/distributions/python/kernel_tests/dirichlet_test.py
rename to tensorflow/python/kernel_tests/distributions/dirichlet_test.py
index cd634da09d..a2f1de5aaf 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/dirichlet_test.py
+++ b/tensorflow/python/kernel_tests/distributions/dirichlet_test.py
@@ -16,14 +16,29 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import dirichlet as dirichlet_lib
+
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import dirichlet as dirichlet_lib
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
 
 
 class DirichletTest(test.TestCase):
@@ -132,9 +147,11 @@ class DirichletTest(test.TestCase):
   def testMean(self):
     with self.test_session():
       alpha = [1., 2, 3]
-      expected_mean = stats.dirichlet.mean(alpha)
       dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
       self.assertEqual(dirichlet.mean().get_shape(), [3])
+      if not stats:
+        return
+      expected_mean = stats.dirichlet.mean(alpha)
       self.assertAllClose(dirichlet.mean().eval(), expected_mean)
 
   def testCovarianceFromSampling(self):
@@ -177,11 +194,13 @@ class DirichletTest(test.TestCase):
     with self.test_session():
       alpha = [1., 2, 3]
       denominator = np.sum(alpha)**2 * (np.sum(alpha) + 1)
+      dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
+      self.assertEqual(dirichlet.covariance().get_shape(), (3, 3))
+      if not stats:
+        return
       expected_covariance = np.diag(stats.dirichlet.var(alpha))
       expected_covariance += [[0., -2, -3], [-2, 0, -6],
                               [-3, -6, 0]] / denominator
-      dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
-      self.assertEqual(dirichlet.covariance().get_shape(), (3, 3))
       self.assertAllClose(dirichlet.covariance().eval(), expected_covariance)
 
   def testMode(self):
@@ -213,9 +232,11 @@ class DirichletTest(test.TestCase):
   def testEntropy(self):
     with self.test_session():
       alpha = [1., 2, 3]
-      expected_entropy = stats.dirichlet.entropy(alpha)
       dirichlet = dirichlet_lib.Dirichlet(concentration=alpha)
       self.assertEqual(dirichlet.entropy().get_shape(), ())
+      if not stats:
+        return
+      expected_entropy = stats.dirichlet.entropy(alpha)
       self.assertAllClose(dirichlet.entropy().eval(), expected_entropy)
 
   def testSample(self):
@@ -227,6 +248,8 @@ class DirichletTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000, 2))
       self.assertTrue(np.all(sample_values > 0.0))
+      if not stats:
+        return
       self.assertLess(
           stats.kstest(
               # Beta is a univariate distribution.
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/exponential_test.py b/tensorflow/python/kernel_tests/distributions/exponential_test.py
similarity index 88%
rename from tensorflow/contrib/distributions/python/kernel_tests/exponential_test.py
rename to tensorflow/python/kernel_tests/distributions/exponential_test.py
index 6171202413..7afdf0f947 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/exponential_test.py
+++ b/tensorflow/python/kernel_tests/distributions/exponential_test.py
@@ -18,13 +18,28 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import exponential as exponential_lib
+
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import exponential as exponential_lib
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
 
 
 class ExponentialTest(test.TestCase):
@@ -36,14 +51,17 @@ class ExponentialTest(test.TestCase):
       lam_v = 2.0
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
       exponential = exponential_lib.Exponential(rate=lam)
-      expected_log_pdf = stats.expon.logpdf(x, scale=1 / lam_v)
 
       log_pdf = exponential.log_prob(x)
       self.assertEqual(log_pdf.get_shape(), (6,))
-      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
 
       pdf = exponential.prob(x)
       self.assertEqual(pdf.get_shape(), (6,))
+
+      if not stats:
+        return
+      expected_log_pdf = stats.expon.logpdf(x, scale=1 / lam_v)
+      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
       self.assertAllClose(pdf.eval(), np.exp(expected_log_pdf))
 
   def testExponentialCDF(self):
@@ -54,34 +72,43 @@ class ExponentialTest(test.TestCase):
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       exponential = exponential_lib.Exponential(rate=lam)
-      expected_cdf = stats.expon.cdf(x, scale=1 / lam_v)
 
       cdf = exponential.cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+
+      if not stats:
+        return
+      expected_cdf = stats.expon.cdf(x, scale=1 / lam_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testExponentialMean(self):
     with session.Session():
       lam_v = np.array([1.0, 4.0, 2.5])
-      expected_mean = stats.expon.mean(scale=1 / lam_v)
       exponential = exponential_lib.Exponential(rate=lam_v)
       self.assertEqual(exponential.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_mean = stats.expon.mean(scale=1 / lam_v)
       self.assertAllClose(exponential.mean().eval(), expected_mean)
 
   def testExponentialVariance(self):
     with session.Session():
       lam_v = np.array([1.0, 4.0, 2.5])
-      expected_variance = stats.expon.var(scale=1 / lam_v)
       exponential = exponential_lib.Exponential(rate=lam_v)
       self.assertEqual(exponential.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variance = stats.expon.var(scale=1 / lam_v)
       self.assertAllClose(exponential.variance().eval(), expected_variance)
 
   def testExponentialEntropy(self):
     with session.Session():
       lam_v = np.array([1.0, 4.0, 2.5])
-      expected_entropy = stats.expon.entropy(scale=1 / lam_v)
       exponential = exponential_lib.Exponential(rate=lam_v)
       self.assertEqual(exponential.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.expon.entropy(scale=1 / lam_v)
       self.assertAllClose(exponential.entropy().eval(), expected_entropy)
 
   def testExponentialSample(self):
@@ -95,6 +122,8 @@ class ExponentialTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(sample_values.shape, (100000, 2))
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       for i in range(2):
         self.assertLess(
             stats.kstest(
@@ -116,6 +145,8 @@ class ExponentialTest(test.TestCase):
       sample_values = samples.eval()
 
       self.assertFalse(np.any(sample_values < 0.0))
+      if not stats:
+        return
       for i in range(2):
         self.assertLess(
             stats.kstest(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py b/tensorflow/python/kernel_tests/distributions/gamma_test.py
similarity index 93%
rename from tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py
rename to tensorflow/python/kernel_tests/distributions/gamma_test.py
index 5ccf2308a5..5e4813ac07 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/gamma_test.py
+++ b/tensorflow/python/kernel_tests/distributions/gamma_test.py
@@ -17,18 +17,32 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import special
-from scipy import stats
 
-from tensorflow.contrib.distributions.python.ops import gamma as gamma_lib
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import gamma as gamma_lib
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+special = try_import("scipy.special")
+stats = try_import("scipy.stats")
 
 
 class GammaTest(test.TestCase):
@@ -53,13 +67,14 @@ class GammaTest(test.TestCase):
       beta_v = 3.0
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
       log_pdf = gamma.log_prob(x)
       self.assertEqual(log_pdf.get_shape(), (6,))
-      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
-
       pdf = gamma.prob(x)
       self.assertEqual(pdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
+      self.assertAllClose(log_pdf.eval(), expected_log_pdf)
       self.assertAllClose(pdf.eval(), np.exp(expected_log_pdf))
 
   def testGammaLogPDFMultidimensional(self):
@@ -71,15 +86,16 @@ class GammaTest(test.TestCase):
       beta_v = np.array([3.0, 4.0])
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
       log_pdf = gamma.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
-
       pdf = gamma.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+      if not stats:
+        return
+      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testGammaLogPDFMultidimensionalBroadcasting(self):
@@ -91,15 +107,17 @@ class GammaTest(test.TestCase):
       beta_v = 3.0
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
       log_pdf = gamma.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
-
       pdf = gamma.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+
+      if not stats:
+        return
+      expected_log_pdf = stats.gamma.logpdf(x, alpha_v, scale=1 / beta_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testGammaCDF(self):
@@ -112,10 +130,11 @@ class GammaTest(test.TestCase):
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       gamma = gamma_lib.Gamma(concentration=alpha, rate=beta)
-      expected_cdf = stats.gamma.cdf(x, alpha_v, scale=1 / beta_v)
-
       cdf = gamma.cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_cdf = stats.gamma.cdf(x, alpha_v, scale=1 / beta_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testGammaMean(self):
@@ -123,8 +142,10 @@ class GammaTest(test.TestCase):
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
-      expected_means = stats.gamma.mean(alpha_v, scale=1 / beta_v)
       self.assertEqual(gamma.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_means = stats.gamma.mean(alpha_v, scale=1 / beta_v)
       self.assertAllClose(gamma.mean().eval(), expected_means)
 
   def testGammaModeAllowNanStatsIsFalseWorksWhenAllBatchMembersAreDefined(self):
@@ -165,8 +186,10 @@ class GammaTest(test.TestCase):
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
-      expected_variances = stats.gamma.var(alpha_v, scale=1 / beta_v)
       self.assertEqual(gamma.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variances = stats.gamma.var(alpha_v, scale=1 / beta_v)
       self.assertAllClose(gamma.variance().eval(), expected_variances)
 
   def testGammaStd(self):
@@ -174,17 +197,21 @@ class GammaTest(test.TestCase):
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
-      expected_stddev = stats.gamma.std(alpha_v, scale=1. / beta_v)
       self.assertEqual(gamma.stddev().get_shape(), (3,))
+      if not stats:
+        return
+      expected_stddev = stats.gamma.std(alpha_v, scale=1. / beta_v)
       self.assertAllClose(gamma.stddev().eval(), expected_stddev)
 
   def testGammaEntropy(self):
     with self.test_session():
       alpha_v = np.array([1.0, 3.0, 2.5])
       beta_v = np.array([1.0, 4.0, 5.0])
-      expected_entropy = stats.gamma.entropy(alpha_v, scale=1 / beta_v)
       gamma = gamma_lib.Gamma(concentration=alpha_v, rate=beta_v)
       self.assertEqual(gamma.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.gamma.entropy(alpha_v, scale=1 / beta_v)
       self.assertAllClose(gamma.entropy().eval(), expected_entropy)
 
   def testGammaSampleSmallAlpha(self):
@@ -199,6 +226,9 @@ class GammaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (n,))
       self.assertEqual(sample_values.shape, (n,))
+      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(),
           stats.gamma.mean(
@@ -208,7 +238,6 @@ class GammaTest(test.TestCase):
           sample_values.var(),
           stats.gamma.var(alpha_v, scale=1 / beta_v),
           atol=.15)
-      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
 
   def testGammaSample(self):
     with session.Session():
@@ -222,6 +251,9 @@ class GammaTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (n,))
       self.assertEqual(sample_values.shape, (n,))
+      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(),
           stats.gamma.mean(
@@ -231,7 +263,6 @@ class GammaTest(test.TestCase):
           sample_values.var(),
           stats.gamma.var(alpha_v, scale=1 / beta_v),
           atol=.15)
-      self.assertTrue(self._kstest(alpha_v, beta_v, sample_values))
 
   def testGammaSampleMultiDimensional(self):
     with session.Session():
@@ -246,6 +277,8 @@ class GammaTest(test.TestCase):
       zeros = np.zeros_like(alpha_v + beta_v)  # 10 x 100
       alpha_bc = alpha_v + zeros
       beta_bc = beta_v + zeros
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(axis=0),
           stats.gamma.mean(
@@ -266,6 +299,8 @@ class GammaTest(test.TestCase):
 
   def _kstest(self, alpha, beta, samples):
     # Uses the Kolmogorov-Smirnov test for goodness of fit.
+    if not stats:
+      return True  # If we can't test, return that the test passes.
     ks, _ = stats.kstest(samples, stats.gamma(alpha, scale=1 / beta).cdf)
     # Return True when the test passes.
     return ks < 0.02
@@ -279,6 +314,12 @@ class GammaTest(test.TestCase):
       sample_vals, pdf_vals = sess.run([samples, pdfs])
       self.assertEqual(samples.get_shape(), (num, 2, 2))
       self.assertEqual(pdfs.get_shape(), (num, 2, 2))
+      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
+      if not stats:
+        return
       self.assertAllClose(
           stats.gamma.mean(
               [[7., 11.], [7., 11.]], scale=1 / np.array([[5., 5.], [6., 6.]])),
@@ -289,10 +330,6 @@ class GammaTest(test.TestCase):
                           scale=1 / np.array([[5., 5.], [6., 6.]])),
           sample_vals.var(axis=0),
           atol=.1)
-      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
 
   def _assertIntegral(self, sample_vals, pdf_vals, err=1e-3):
     s_p = zip(sample_vals, pdf_vals)
@@ -350,6 +387,10 @@ class GammaTest(test.TestCase):
     # Execute graph.
     [kl_sample_, kl_actual_] = sess.run([kl_sample, kl_actual])
 
+    self.assertEqual(beta0.shape, kl_actual.get_shape())
+
+    if not special:
+      return
     kl_expected = ((alpha0 - alpha1) * special.digamma(alpha0)
                    + special.gammaln(alpha1)
                    - special.gammaln(alpha0)
@@ -357,7 +398,6 @@ class GammaTest(test.TestCase):
                    - alpha1 * np.log(beta1)
                    + alpha0 * (beta1 / beta0 - 1.))
 
-    self.assertEqual(beta0.shape, kl_actual.get_shape())
     self.assertAllClose(kl_expected, kl_actual_, atol=0., rtol=1e-6)
     self.assertAllClose(kl_sample_, kl_actual_, atol=0., rtol=1e-2)
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/laplace_test.py b/tensorflow/python/kernel_tests/distributions/laplace_test.py
similarity index 92%
rename from tensorflow/contrib/distributions/python/kernel_tests/laplace_test.py
rename to tensorflow/python/kernel_tests/distributions/laplace_test.py
index 1f58d495f0..55577386c4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/laplace_test.py
+++ b/tensorflow/python/kernel_tests/distributions/laplace_test.py
@@ -17,15 +17,31 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import laplace as laplace_lib
+
 from tensorflow.python.client import session
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import laplace as laplace_lib
 from tensorflow.python.platform import test
 
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
+
 
 class LaplaceTest(test.TestCase):
 
@@ -49,9 +65,11 @@ class LaplaceTest(test.TestCase):
       scale_v = 3.0
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       log_pdf = laplace.log_prob(x)
       self.assertEqual(log_pdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       self.assertAllClose(log_pdf.eval(), expected_log_pdf)
 
       pdf = laplace.prob(x)
@@ -67,15 +85,17 @@ class LaplaceTest(test.TestCase):
       scale_v = np.array([3.0, 4.0])
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       log_pdf = laplace.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
 
       pdf = laplace.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+      if not stats:
+        return
+      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testLaplaceLogPDFMultidimensionalBroadcasting(self):
@@ -87,15 +107,17 @@ class LaplaceTest(test.TestCase):
       scale_v = 3.0
       x = np.array([[2.5, 2.5, 4.0, 0.1, 1.0, 2.0]], dtype=np.float32).T
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
       log_pdf = laplace.log_prob(x)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
-      self.assertAllClose(log_pdf_values, expected_log_pdf)
 
       pdf = laplace.prob(x)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+      if not stats:
+        return
+      expected_log_pdf = stats.laplace.logpdf(x, loc_v, scale=scale_v)
+      self.assertAllClose(log_pdf_values, expected_log_pdf)
       self.assertAllClose(pdf_values, np.exp(expected_log_pdf))
 
   def testLaplaceCDF(self):
@@ -108,10 +130,12 @@ class LaplaceTest(test.TestCase):
       x = np.array([2.5, 2.5, 4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_cdf = stats.laplace.cdf(x, loc_v, scale=scale_v)
 
       cdf = laplace.cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_cdf = stats.laplace.cdf(x, loc_v, scale=scale_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testLaplaceLogCDF(self):
@@ -124,10 +148,12 @@ class LaplaceTest(test.TestCase):
       x = np.array([-2.5, 2.5, -4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_cdf = stats.laplace.logcdf(x, loc_v, scale=scale_v)
 
       cdf = laplace.log_cdf(x)
       self.assertEqual(cdf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_cdf = stats.laplace.logcdf(x, loc_v, scale=scale_v)
       self.assertAllClose(cdf.eval(), expected_cdf)
 
   def testLaplaceLogSurvivalFunction(self):
@@ -140,10 +166,12 @@ class LaplaceTest(test.TestCase):
       x = np.array([-2.5, 2.5, -4.0, 0.1, 1.0, 2.0], dtype=np.float32)
 
       laplace = laplace_lib.Laplace(loc=loc, scale=scale)
-      expected_sf = stats.laplace.logsf(x, loc_v, scale=scale_v)
 
       sf = laplace.log_survival_function(x)
       self.assertEqual(sf.get_shape(), (6,))
+      if not stats:
+        return
+      expected_sf = stats.laplace.logsf(x, loc_v, scale=scale_v)
       self.assertAllClose(sf.eval(), expected_sf)
 
   def testLaplaceMean(self):
@@ -151,8 +179,10 @@ class LaplaceTest(test.TestCase):
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
-      expected_means = stats.laplace.mean(loc_v, scale=scale_v)
       self.assertEqual(laplace.mean().get_shape(), (3,))
+      if not stats:
+        return
+      expected_means = stats.laplace.mean(loc_v, scale=scale_v)
       self.assertAllClose(laplace.mean().eval(), expected_means)
 
   def testLaplaceMode(self):
@@ -168,8 +198,10 @@ class LaplaceTest(test.TestCase):
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
-      expected_variances = stats.laplace.var(loc_v, scale=scale_v)
       self.assertEqual(laplace.variance().get_shape(), (3,))
+      if not stats:
+        return
+      expected_variances = stats.laplace.var(loc_v, scale=scale_v)
       self.assertAllClose(laplace.variance().eval(), expected_variances)
 
   def testLaplaceStd(self):
@@ -177,17 +209,21 @@ class LaplaceTest(test.TestCase):
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
-      expected_stddev = stats.laplace.std(loc_v, scale=scale_v)
       self.assertEqual(laplace.stddev().get_shape(), (3,))
+      if not stats:
+        return
+      expected_stddev = stats.laplace.std(loc_v, scale=scale_v)
       self.assertAllClose(laplace.stddev().eval(), expected_stddev)
 
   def testLaplaceEntropy(self):
     with self.test_session():
       loc_v = np.array([1.0, 3.0, 2.5])
       scale_v = np.array([1.0, 4.0, 5.0])
-      expected_entropy = stats.laplace.entropy(loc_v, scale=scale_v)
       laplace = laplace_lib.Laplace(loc=loc_v, scale=scale_v)
       self.assertEqual(laplace.entropy().get_shape(), (3,))
+      if not stats:
+        return
+      expected_entropy = stats.laplace.entropy(loc_v, scale=scale_v)
       self.assertAllClose(laplace.entropy().eval(), expected_entropy)
 
   def testLaplaceSample(self):
@@ -202,6 +238,8 @@ class LaplaceTest(test.TestCase):
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (n,))
       self.assertEqual(sample_values.shape, (n,))
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(),
           stats.laplace.mean(
@@ -228,6 +266,8 @@ class LaplaceTest(test.TestCase):
       zeros = np.zeros_like(loc_v + scale_v)  # 10 x 100
       loc_bc = loc_v + zeros
       scale_bc = scale_v + zeros
+      if not stats:
+        return
       self.assertAllClose(
           sample_values.mean(axis=0),
           stats.laplace.mean(
@@ -250,6 +290,8 @@ class LaplaceTest(test.TestCase):
 
   def _kstest(self, loc, scale, samples):
     # Uses the Kolmogorov-Smirnov test for goodness of fit.
+    if not stats:
+      return True  # If scipy isn't available, return "True" for passing
     ks, _ = stats.kstest(samples, stats.laplace(loc, scale=scale).cdf)
     # Return True when the test passes.
     return ks < 0.02
@@ -263,6 +305,12 @@ class LaplaceTest(test.TestCase):
       sample_vals, pdf_vals = sess.run([samples, pdfs])
       self.assertEqual(samples.get_shape(), (num, 2, 2))
       self.assertEqual(pdfs.get_shape(), (num, 2, 2))
+      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
+      if not stats:
+        return
       self.assertAllClose(
           stats.laplace.mean(
               [[7., 11.], [7., 11.]], scale=np.array([[5., 5.], [6., 6.]])),
@@ -275,10 +323,6 @@ class LaplaceTest(test.TestCase):
           sample_vals.var(axis=0),
           rtol=0.05,
           atol=0.)
-      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
 
   def _assertIntegral(self, sample_vals, pdf_vals, err=1e-3):
     s_p = zip(sample_vals, pdf_vals)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py b/tensorflow/python/kernel_tests/distributions/multinomial_test.py
similarity index 87%
rename from tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
rename to tensorflow/python/kernel_tests/distributions/multinomial_test.py
index b1c0c9f7a9..80caf10391 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/multinomial_test.py
+++ b/tensorflow/python/kernel_tests/distributions/multinomial_test.py
@@ -17,15 +17,14 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
-from tensorflow.contrib import distributions
+
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import multinomial
 from tensorflow.python.platform import test
 
-ds = distributions
-
 
 class MultinomialTest(test.TestCase):
 
@@ -35,7 +34,7 @@ class MultinomialTest(test.TestCase):
   def testSimpleShapes(self):
     with self.test_session():
       p = [.1, .3, .6]
-      dist = ds.Multinomial(total_count=1., probs=p)
+      dist = multinomial.Multinomial(total_count=1., probs=p)
       self.assertEqual(3, dist.event_shape_tensor().eval())
       self.assertAllEqual([], dist.batch_shape_tensor().eval())
       self.assertEqual(tensor_shape.TensorShape([3]), dist.event_shape)
@@ -45,7 +44,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = 0.5 * np.ones([3, 2, 2], dtype=np.float32)
       n = [[3., 2], [4, 5], [6, 7]]
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       self.assertEqual(2, dist.event_shape_tensor().eval())
       self.assertAllEqual([3, 2], dist.batch_shape_tensor().eval())
       self.assertEqual(tensor_shape.TensorShape([2]), dist.event_shape)
@@ -55,14 +54,14 @@ class MultinomialTest(test.TestCase):
     p = [[0.1, 0.2, 0.7], [0.2, 0.3, 0.5]]
     n = [[3.], [4]]
     with self.test_session():
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       self.assertEqual((2, 1), dist.total_count.get_shape())
       self.assertAllClose(n, dist.total_count.eval())
 
   def testP(self):
     p = [[0.1, 0.2, 0.7]]
     with self.test_session():
-      dist = ds.Multinomial(total_count=3., probs=p)
+      dist = multinomial.Multinomial(total_count=3., probs=p)
       self.assertEqual((1, 3), dist.probs.get_shape())
       self.assertEqual((1, 3), dist.logits.get_shape())
       self.assertAllClose(p, dist.probs.eval())
@@ -71,7 +70,7 @@ class MultinomialTest(test.TestCase):
     p = np.array([[0.1, 0.2, 0.7]], dtype=np.float32)
     logits = np.log(p) - 50.
     with self.test_session():
-      multinom = ds.Multinomial(total_count=3., logits=logits)
+      multinom = multinomial.Multinomial(total_count=3., logits=logits)
       self.assertEqual((1, 3), multinom.probs.get_shape())
       self.assertEqual((1, 3), multinom.logits.get_shape())
       self.assertAllClose(p, multinom.probs.eval())
@@ -81,7 +80,7 @@ class MultinomialTest(test.TestCase):
     p = [[0.1, 0.2, 0.7]]
     n = [[5.]]
     with self.test_session():
-      dist = ds.Multinomial(total_count=n, probs=p, validate_args=True)
+      dist = multinomial.Multinomial(total_count=n, probs=p, validate_args=True)
       dist.prob([2., 3, 0]).eval()
       dist.prob([3., 0, 2]).eval()
       with self.assertRaisesOpError("must be non-negative"):
@@ -94,7 +93,8 @@ class MultinomialTest(test.TestCase):
     n = [[5.]]
     with self.test_session():
       # No errors with integer n.
-      multinom = ds.Multinomial(total_count=n, probs=p, validate_args=True)
+      multinom = multinomial.Multinomial(
+          total_count=n, probs=p, validate_args=True)
       multinom.prob([2., 1, 2]).eval()
       multinom.prob([3., 0, 2]).eval()
       # Counts don't sum to n.
@@ -106,7 +106,8 @@ class MultinomialTest(test.TestCase):
           "cannot contain fractional components."):
         multinom.prob(x).eval(feed_dict={x: [1.0, 2.5, 1.5]})
 
-      multinom = ds.Multinomial(total_count=n, probs=p, validate_args=False)
+      multinom = multinomial.Multinomial(
+          total_count=n, probs=p, validate_args=False)
       multinom.prob([1., 2., 2.]).eval()
       # Non-integer arguments work.
       multinom.prob([1.0, 2.5, 1.5]).eval()
@@ -116,7 +117,7 @@ class MultinomialTest(test.TestCase):
       # Both zero-batches.  No broadcast
       p = [0.5, 0.5]
       counts = [1., 0]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose(0.5, pmf.eval())
       self.assertEqual((), pmf.get_shape())
 
@@ -125,7 +126,7 @@ class MultinomialTest(test.TestCase):
       # Both zero-batches.  No broadcast
       p = [0.1, 0.9]
       counts = [3., 2]
-      dist = ds.Multinomial(total_count=5., probs=p)
+      dist = multinomial.Multinomial(total_count=5., probs=p)
       pmf = dist.prob(counts)
       # 5 choose 3 = 5 choose 2 = 10. 10 * (.9)^2 * (.1)^3 = 81/10000.
       self.assertAllClose(81. / 10000, pmf.eval())
@@ -135,7 +136,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [[0.1, 0.9]]
       counts = [[1., 0], [0, 1]]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose([0.1, 0.9], pmf.eval())
       self.assertEqual((2), pmf.get_shape())
 
@@ -143,7 +144,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [0.1, 0.9]
       counts = [[1., 0], [0, 1]]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose([0.1, 0.9], pmf.eval())
       self.assertEqual((2), pmf.get_shape())
 
@@ -151,7 +152,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [[0.1, 0.9], [0.7, 0.3]]
       counts = [[1., 0]]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose(pmf.eval(), [0.1, 0.7])
       self.assertEqual((2), pmf.get_shape())
 
@@ -159,7 +160,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       p = [[0.1, 0.9], [0.7, 0.3]]
       counts = [1., 0]
-      pmf = ds.Multinomial(total_count=1., probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=1., probs=p).prob(counts)
       self.assertAllClose(pmf.eval(), [0.1, 0.7])
       self.assertEqual(pmf.get_shape(), (2))
 
@@ -171,7 +172,7 @@ class MultinomialTest(test.TestCase):
       n = [[3., 3], [3, 3]]
       # [2]
       counts = [2., 1]
-      pmf = ds.Multinomial(total_count=n, probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=n, probs=p).prob(counts)
       pmf.eval()
       self.assertEqual(pmf.get_shape(), (2, 2))
 
@@ -180,7 +181,7 @@ class MultinomialTest(test.TestCase):
       p = [0.1, 0.9]
       counts = [3., 2]
       n = np.full([4, 3], 5., dtype=np.float32)
-      pmf = ds.Multinomial(total_count=n, probs=p).prob(counts)
+      pmf = multinomial.Multinomial(total_count=n, probs=p).prob(counts)
       pmf.eval()
       self.assertEqual((4, 3), pmf.get_shape())
 
@@ -188,7 +189,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       n = 5.
       p = [0.1, 0.2, 0.7]
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       expected_means = 5 * np.array(p, dtype=np.float32)
       self.assertEqual((3,), dist.mean().get_shape())
       self.assertAllClose(expected_means, dist.mean().eval())
@@ -197,7 +198,7 @@ class MultinomialTest(test.TestCase):
     with self.test_session():
       n = 5.
       p = [0.1, 0.2, 0.7]
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       expected_covariances = [[9. / 20, -1 / 10, -7 / 20],
                               [-1 / 10, 4 / 5, -7 / 10],
                               [-7 / 20, -7 / 10, 21 / 20]]
@@ -210,7 +211,7 @@ class MultinomialTest(test.TestCase):
       n = [5.] * 2
       # Shape [4, 1, 2]
       p = [[[0.1, 0.9]], [[0.1, 0.9]]] * 2
-      dist = ds.Multinomial(total_count=n, probs=p)
+      dist = multinomial.Multinomial(total_count=n, probs=p)
       # Shape [2, 2]
       inner_var = [[9. / 20, -9 / 20], [-9 / 20, 9 / 20]]
       # Shape [4, 2, 2, 2]
@@ -228,8 +229,8 @@ class MultinomialTest(test.TestCase):
     ns2 = np.random.randint(low=1, high=11, size=[6, 1]).astype(np.float32)
 
     with self.test_session():
-      dist = ds.Multinomial(ns, p)
-      dist2 = ds.Multinomial(ns2, p2)
+      dist = multinomial.Multinomial(ns, p)
+      dist2 = multinomial.Multinomial(ns2, p2)
 
       covariance = dist.covariance()
       covariance2 = dist2.covariance()
@@ -246,7 +247,8 @@ class MultinomialTest(test.TestCase):
     # doesn't support different total counts.
     n = np.float32(5)
     with self.test_session() as sess:
-      dist = ds.Multinomial(n, theta)  # batch_shape=[2], event_shape=[3]
+      # batch_shape=[2], event_shape=[3]
+      dist = multinomial.Multinomial(n, theta)
       x = dist.sample(int(250e3), seed=1)
       sample_mean = math_ops.reduce_mean(x, 0)
       x_centered = x - sample_mean[array_ops.newaxis, ...]
@@ -281,7 +283,7 @@ class MultinomialTest(test.TestCase):
 
   def testSampleUnbiasedNonScalarBatch(self):
     with self.test_session() as sess:
-      dist = ds.Multinomial(
+      dist = multinomial.Multinomial(
           total_count=5.,
           logits=math_ops.log(2. * self._rng.rand(4, 3, 2).astype(np.float32)))
       n = int(3e3)
@@ -310,7 +312,7 @@ class MultinomialTest(test.TestCase):
 
   def testSampleUnbiasedScalarBatch(self):
     with self.test_session() as sess:
-      dist = ds.Multinomial(
+      dist = multinomial.Multinomial(
           total_count=5.,
           logits=math_ops.log(2. * self._rng.rand(4).astype(np.float32)))
       n = int(5e3)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/student_t_test.py b/tensorflow/python/kernel_tests/distributions/student_t_test.py
similarity index 83%
rename from tensorflow/contrib/distributions/python/kernel_tests/student_t_test.py
rename to tensorflow/python/kernel_tests/distributions/student_t_test.py
index 209ef696ca..f1150de58e 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/student_t_test.py
+++ b/tensorflow/python/kernel_tests/distributions/student_t_test.py
@@ -18,19 +18,30 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
 import math
 
 import numpy as np
-from scipy import stats
-from tensorflow.contrib import distributions
-from tensorflow.contrib.distributions.python.ops import student_t
+
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import random_seed
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops.distributions import student_t
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
 
-ds = distributions
+
+stats = try_import("scipy.stats")
 
 
 class StudentTTest(test.TestCase):
@@ -45,7 +56,7 @@ class StudentTTest(test.TestCase):
       mu_v = 7.
       sigma_v = 8.
       t = np.array([-2.5, 2.5, 8., 0., -1., 2.], dtype=np.float32)
-      student = ds.StudentT(df, loc=mu, scale=-sigma)
+      student = student_t.StudentT(df, loc=mu, scale=-sigma)
 
       log_pdf = student.log_prob(t)
       self.assertEquals(log_pdf.get_shape(), (6,))
@@ -54,6 +65,9 @@ class StudentTTest(test.TestCase):
       self.assertEquals(pdf.get_shape(), (6,))
       pdf_values = pdf.eval()
 
+      if not stats:
+        return
+
       expected_log_pdf = stats.t.logpdf(t, df_v, loc=mu_v, scale=sigma_v)
       expected_pdf = stats.t.pdf(t, df_v, loc=mu_v, scale=sigma_v)
       self.assertAllClose(expected_log_pdf, log_pdf_values)
@@ -72,13 +86,16 @@ class StudentTTest(test.TestCase):
       mu_v = np.array([3., -3.])
       sigma_v = np.array([np.sqrt(10.), np.sqrt(15.)])
       t = np.array([[-2.5, 2.5, 4., 0., -1., 2.]], dtype=np.float32).T
-      student = ds.StudentT(df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df, loc=mu, scale=sigma)
       log_pdf = student.log_prob(t)
       log_pdf_values = log_pdf.eval()
       self.assertEqual(log_pdf.get_shape(), (6, 2))
       pdf = student.prob(t)
       pdf_values = pdf.eval()
       self.assertEqual(pdf.get_shape(), (6, 2))
+
+      if not stats:
+        return
       expected_log_pdf = stats.t.logpdf(t, df_v, loc=mu_v, scale=sigma_v)
       expected_pdf = stats.t.pdf(t, df_v, loc=mu_v, scale=sigma_v)
       self.assertAllClose(expected_log_pdf, log_pdf_values)
@@ -105,6 +122,8 @@ class StudentTTest(test.TestCase):
       self.assertEquals(cdf.get_shape(), (6,))
       cdf_values = cdf.eval()
 
+      if not stats:
+        return
       expected_log_cdf = stats.t.logcdf(t, df_v, loc=mu_v, scale=sigma_v)
       expected_cdf = stats.t.cdf(t, df_v, loc=mu_v, scale=sigma_v)
       self.assertAllClose(expected_log_cdf, log_cdf_values, atol=0., rtol=1e-5)
@@ -119,7 +138,7 @@ class StudentTTest(test.TestCase):
     mu_v = np.array([[1., -1, 0]])  # 1x3
     sigma_v = np.array([[1., -2., 3.]]).T  # transposed => 3x1
     with self.test_session():
-      student = ds.StudentT(df=df_v, loc=mu_v, scale=sigma_v)
+      student = student_t.StudentT(df=df_v, loc=mu_v, scale=sigma_v)
       ent = student.entropy()
       ent_values = ent.eval()
 
@@ -128,6 +147,8 @@ class StudentTTest(test.TestCase):
     sigma_bc = np.abs(sigma_v) * ones
     mu_bc = ones.T * mu_v
     df_bc = ones.T * df_v
+    if not stats:
+      return
     expected_entropy = stats.t.entropy(
         np.reshape(df_bc, [-1]),
         loc=np.reshape(mu_bc, [-1]),
@@ -144,7 +165,7 @@ class StudentTTest(test.TestCase):
       mu_v = 3.
       sigma_v = np.sqrt(10.)
       n = constant_op.constant(200000)
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       samples = student.sample(n, seed=123456)
       sample_values = samples.eval()
       n_val = 200000
@@ -166,11 +187,13 @@ class StudentTTest(test.TestCase):
       n = constant_op.constant(100)
 
       random_seed.set_random_seed(654321)
-      student = ds.StudentT(df=df, loc=mu, scale=sigma, name="student_t1")
+      student = student_t.StudentT(
+          df=df, loc=mu, scale=sigma, name="student_t1")
       samples1 = student.sample(n, seed=123456).eval()
 
       random_seed.set_random_seed(654321)
-      student2 = ds.StudentT(df=df, loc=mu, scale=sigma, name="student_t2")
+      student2 = student_t.StudentT(
+          df=df, loc=mu, scale=sigma, name="student_t2")
       samples2 = student2.sample(n, seed=123456).eval()
 
       self.assertAllClose(samples1, samples2)
@@ -180,7 +203,7 @@ class StudentTTest(test.TestCase):
       df_v = [1e-1, 1e-5, 1e-10, 1e-20]
       df = constant_op.constant(df_v)
       n = constant_op.constant(200000)
-      student = ds.StudentT(df=df, loc=1., scale=1.)
+      student = student_t.StudentT(df=df, loc=1., scale=1.)
       samples = student.sample(n, seed=123456)
       sample_values = samples.eval()
       n_val = 200000
@@ -198,7 +221,7 @@ class StudentTTest(test.TestCase):
       mu_v = [3., -3.]
       sigma_v = [np.sqrt(10.), np.sqrt(15.)]
       n = constant_op.constant(200000)
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       samples = student.sample(n, seed=123456)
       sample_values = samples.eval()
       self.assertEqual(samples.get_shape(), (200000, batch_size, 2))
@@ -222,6 +245,8 @@ class StudentTTest(test.TestCase):
   def _checkKLApprox(self, df, mu, sigma, samples):
     n = samples.size
     np.random.seed(137)
+    if not stats:
+      return
     sample_scipy = stats.t.rvs(df, loc=mu, scale=sigma, size=n)
     covg = 0.99
     r = stats.t.interval(covg, df, loc=mu, scale=sigma)
@@ -247,9 +272,9 @@ class StudentTTest(test.TestCase):
       self.assertEqual(student.prob(2.).get_shape(), (3,))
       self.assertEqual(student.sample(37, seed=123456).get_shape(), (37, 3,))
 
-    _check(ds.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
-    _check(ds.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
-    _check(ds.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
+    _check(student_t.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
+    _check(student_t.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
+    _check(student_t.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
 
   def testBroadcastingPdfArgs(self):
 
@@ -266,9 +291,9 @@ class StudentTTest(test.TestCase):
       xs = xs.T
       _assert_shape(student, xs, (3, 3))
 
-    _check(ds.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
-    _check(ds.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
-    _check(ds.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
+    _check(student_t.StudentT(df=[2., 3., 4.,], loc=2., scale=1.))
+    _check(student_t.StudentT(df=7., loc=[2., 3., 4.,], scale=1.))
+    _check(student_t.StudentT(df=7., loc=3., scale=[2., 3., 4.,]))
 
     def _check2d(student):
       _assert_shape(student, 2., (1, 3))
@@ -279,9 +304,9 @@ class StudentTTest(test.TestCase):
       xs = xs.T
       _assert_shape(student, xs, (3, 3))
 
-    _check2d(ds.StudentT(df=[[2., 3., 4.,]], loc=2., scale=1.))
-    _check2d(ds.StudentT(df=7., loc=[[2., 3., 4.,]], scale=1.))
-    _check2d(ds.StudentT(df=7., loc=3., scale=[[2., 3., 4.,]]))
+    _check2d(student_t.StudentT(df=[[2., 3., 4.,]], loc=2., scale=1.))
+    _check2d(student_t.StudentT(df=7., loc=[[2., 3., 4.,]], scale=1.))
+    _check2d(student_t.StudentT(df=7., loc=3., scale=[[2., 3., 4.,]]))
 
     def _check2d_rows(student):
       _assert_shape(student, 2., (3, 1))
@@ -292,22 +317,23 @@ class StudentTTest(test.TestCase):
       xs = xs.T  # (3,1)
       _assert_shape(student, xs, (3, 1))
 
-    _check2d_rows(ds.StudentT(df=[[2.], [3.], [4.]], loc=2., scale=1.))
-    _check2d_rows(ds.StudentT(df=7., loc=[[2.], [3.], [4.]], scale=1.))
-    _check2d_rows(ds.StudentT(df=7., loc=3., scale=[[2.], [3.], [4.]]))
+    _check2d_rows(student_t.StudentT(df=[[2.], [3.], [4.]], loc=2., scale=1.))
+    _check2d_rows(student_t.StudentT(df=7., loc=[[2.], [3.], [4.]], scale=1.))
+    _check2d_rows(student_t.StudentT(df=7., loc=3., scale=[[2.], [3.], [4.]]))
 
   def testMeanAllowNanStatsIsFalseWorksWhenAllBatchMembersAreDefined(self):
     with self.test_session():
       mu = [1., 3.3, 4.4]
-      student = ds.StudentT(df=[3., 5., 7.], loc=mu, scale=[3., 2., 1.])
+      student = student_t.StudentT(df=[3., 5., 7.], loc=mu, scale=[3., 2., 1.])
       mean = student.mean().eval()
       self.assertAllClose([1., 3.3, 4.4], mean)
 
   def testMeanAllowNanStatsIsFalseRaisesWhenBatchMemberIsUndefined(self):
     with self.test_session():
       mu = [1., 3.3, 4.4]
-      student = ds.StudentT(df=[0.5, 5., 7.], loc=mu, scale=[3., 2., 1.],
-                            allow_nan_stats=False)
+      student = student_t.StudentT(
+          df=[0.5, 5., 7.], loc=mu, scale=[3., 2., 1.],
+          allow_nan_stats=False)
       with self.assertRaisesOpError("x < y"):
         student.mean().eval()
 
@@ -315,8 +341,9 @@ class StudentTTest(test.TestCase):
     with self.test_session():
       mu = [-2, 0., 1., 3.3, 4.4]
       sigma = [5., 4., 3., 2., 1.]
-      student = ds.StudentT(df=[0.5, 1., 3., 5., 7.], loc=mu, scale=sigma,
-                            allow_nan_stats=True)
+      student = student_t.StudentT(
+          df=[0.5, 1., 3., 5., 7.], loc=mu, scale=sigma,
+          allow_nan_stats=True)
       mean = student.mean().eval()
       self.assertAllClose([np.nan, np.nan, 1., 3.3, 4.4], mean)
 
@@ -327,7 +354,8 @@ class StudentTTest(test.TestCase):
       df = [0.5, 1.5, 3., 5., 7.]
       mu = [-2, 0., 1., 3.3, 4.4]
       sigma = [5., 4., 3., 2., 1.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma, allow_nan_stats=True)
+      student = student_t.StudentT(
+          df=df, loc=mu, scale=sigma, allow_nan_stats=True)
       var = student.variance().eval()
       ## scipy uses inf for variance when the mean is undefined.  When mean is
       # undefined we say variance is undefined as well.  So test the first
@@ -336,6 +364,8 @@ class StudentTTest(test.TestCase):
       self.assertTrue(np.isnan(var[0]))
       var[0] = np.inf
 
+      if not stats:
+        return
       expected_var = [
           stats.t.var(d, loc=m, scale=s) for (d, m, s) in zip(df, mu, sigma)
       ]
@@ -348,9 +378,11 @@ class StudentTTest(test.TestCase):
       df = [1.5, 3., 5., 7.]
       mu = [0., 1., 3.3, 4.4]
       sigma = [4., 3., 2., 1.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       var = student.variance().eval()
 
+      if not stats:
+        return
       expected_var = [
           stats.t.var(d, loc=m, scale=s) for (d, m, s) in zip(df, mu, sigma)
       ]
@@ -359,13 +391,15 @@ class StudentTTest(test.TestCase):
   def testVarianceAllowNanStatsFalseRaisesForUndefinedBatchMembers(self):
     with self.test_session():
       # df <= 1 ==> variance not defined
-      student = ds.StudentT(df=1., loc=0., scale=1., allow_nan_stats=False)
+      student = student_t.StudentT(
+          df=1., loc=0., scale=1., allow_nan_stats=False)
       with self.assertRaisesOpError("x < y"):
         student.variance().eval()
 
     with self.test_session():
       # df <= 1 ==> variance not defined
-      student = ds.StudentT(df=0.5, loc=0., scale=1., allow_nan_stats=False)
+      student = student_t.StudentT(
+          df=0.5, loc=0., scale=1., allow_nan_stats=False)
       with self.assertRaisesOpError("x < y"):
         student.variance().eval()
 
@@ -375,11 +409,13 @@ class StudentTTest(test.TestCase):
       df = [3.5, 5., 3., 5., 7.]
       mu = [-2.2]
       sigma = [5., 4., 3., 2., 1.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       # Test broadcast of mu across shape of df/sigma
       stddev = student.stddev().eval()
       mu *= len(df)
 
+      if not stats:
+        return
       expected_stddev = [
           stats.t.std(d, loc=m, scale=s) for (d, m, s) in zip(df, mu, sigma)
       ]
@@ -390,14 +426,14 @@ class StudentTTest(test.TestCase):
       df = [0.5, 1., 3]
       mu = [-1, 0., 1]
       sigma = [5., 4., 3.]
-      student = ds.StudentT(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentT(df=df, loc=mu, scale=sigma)
       # Test broadcast of mu across shape of df/sigma
       mode = student.mode().eval()
       self.assertAllClose([-1., 0, 1], mode)
 
   def testPdfOfSample(self):
     with self.test_session() as sess:
-      student = ds.StudentT(df=3., loc=np.pi, scale=1.)
+      student = student_t.StudentT(df=3., loc=np.pi, scale=1.)
       num = 20000
       samples = student.sample(num, seed=123456)
       pdfs = student.prob(samples)
@@ -410,13 +446,15 @@ class StudentTTest(test.TestCase):
       self.assertEqual(mean.get_shape(), ())
       self.assertNear(np.pi, np.mean(sample_vals), err=0.02)
       self.assertNear(np.pi, mean_val, err=1e-6)
-      self.assertNear(stats.t.pdf(np.pi, 3., loc=np.pi), mean_pdf_val, err=1e-6)
       # Verify integral over sample*pdf ~= 1.
       self._assertIntegral(sample_vals, pdf_vals, err=2e-3)
+      if not stats:
+        return
+      self.assertNear(stats.t.pdf(np.pi, 3., loc=np.pi), mean_pdf_val, err=1e-6)
 
   def testPdfOfSampleMultiDims(self):
     with self.test_session() as sess:
-      student = ds.StudentT(df=[7., 11.], loc=[[5.], [6.]], scale=3.)
+      student = student_t.StudentT(df=[7., 11.], loc=[[5.], [6.]], scale=3.)
       self.assertAllEqual([], student.event_shape)
       self.assertAllEqual([], student.event_shape_tensor().eval())
       self.assertAllEqual([2, 2], student.batch_shape)
@@ -429,6 +467,12 @@ class StudentTTest(test.TestCase):
       self.assertEqual(pdfs.get_shape(), (num, 2, 2))
       self.assertNear(5., np.mean(sample_vals[:, 0, :]), err=.03)
       self.assertNear(6., np.mean(sample_vals[:, 1, :]), err=.03)
+      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
+      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
+      if not stats:
+        return
       self.assertNear(
           stats.t.var(7., loc=0., scale=3.),  # loc d.n. effect var
           np.var(sample_vals[:, :, 0]),
@@ -437,10 +481,6 @@ class StudentTTest(test.TestCase):
           stats.t.var(11., loc=0., scale=3.),  # loc d.n. effect var
           np.var(sample_vals[:, :, 1]),
           err=.4)
-      self._assertIntegral(sample_vals[:, 0, 0], pdf_vals[:, 0, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 0, 1], pdf_vals[:, 0, 1], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 0], pdf_vals[:, 1, 0], err=0.02)
-      self._assertIntegral(sample_vals[:, 1, 1], pdf_vals[:, 1, 1], err=0.02)
 
   def _assertIntegral(self, sample_vals, pdf_vals, err=1.5e-3):
     s_p = zip(sample_vals, pdf_vals)
@@ -454,8 +494,8 @@ class StudentTTest(test.TestCase):
 
   def testNegativeDofFails(self):
     with self.test_session():
-      student = ds.StudentT(df=[2, -5.], loc=0., scale=1.,
-                            validate_args=True, name="S")
+      student = student_t.StudentT(df=[2, -5.], loc=0., scale=1.,
+                                   validate_args=True, name="S")
       with self.assertRaisesOpError(r"Condition x > 0 did not hold"):
         student.mean().eval()
 
@@ -464,7 +504,8 @@ class StudentTTest(test.TestCase):
       df = constant_op.constant([-3.2, -4.6])
       mu = constant_op.constant([-4.2, 3.4])
       sigma = constant_op.constant([-6.4, -8.8])
-      student = ds.StudentTWithAbsDfSoftplusScale(df=df, loc=mu, scale=sigma)
+      student = student_t.StudentTWithAbsDfSoftplusScale(
+          df=df, loc=mu, scale=sigma)
       self.assertAllClose(
           math_ops.floor(math_ops.abs(df)).eval(), student.df.eval())
       self.assertAllClose(mu.eval(), student.loc.eval())
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/uniform_test.py b/tensorflow/python/kernel_tests/distributions/uniform_test.py
similarity index 93%
rename from tensorflow/contrib/distributions/python/kernel_tests/uniform_test.py
rename to tensorflow/python/kernel_tests/distributions/uniform_test.py
index c3c97b98f0..df99a0ed25 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/uniform_test.py
+++ b/tensorflow/python/kernel_tests/distributions/uniform_test.py
@@ -18,15 +18,30 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import importlib
+
 import numpy as np
-from scipy import stats
-from tensorflow.contrib.distributions.python.ops import uniform as uniform_lib
+
 from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import errors_impl
+from tensorflow.python.framework import errors
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import uniform as uniform_lib
 from tensorflow.python.platform import test
+from tensorflow.python.platform import tf_logging
+
+
+def try_import(name):  # pylint: disable=invalid-name
+  module = None
+  try:
+    module = importlib.import_module(name)
+  except ImportError as e:
+    tf_logging.warning("Could not import %s: %s" % (name, str(e)))
+  return module
+
+
+stats = try_import("scipy.stats")
 
 
 class UniformTest(test.TestCase):
@@ -126,7 +141,7 @@ class UniformTest(test.TestCase):
       b_v = np.array([1.0, 2.0, 3.0], dtype=np.float32)
       uniform = uniform_lib.Uniform(low=a_v, high=b_v, validate_args=True)
 
-      with self.assertRaisesWithPredicateMatch(errors_impl.InvalidArgumentError,
+      with self.assertRaisesWithPredicateMatch(errors.InvalidArgumentError,
                                                "x < y"):
         uniform.low.eval()
 
@@ -187,6 +202,8 @@ class UniformTest(test.TestCase):
       a = 10.0
       b = 100.0
       uniform = uniform_lib.Uniform(low=a, high=b)
+      if not stats:
+        return
       s_uniform = stats.uniform(loc=a, scale=b - a)
       self.assertAllClose(uniform.mean().eval(), s_uniform.mean())
 
@@ -195,6 +212,8 @@ class UniformTest(test.TestCase):
       a = 10.0
       b = 100.0
       uniform = uniform_lib.Uniform(low=a, high=b)
+      if not stats:
+        return
       s_uniform = stats.uniform(loc=a, scale=b - a)
       self.assertAllClose(uniform.variance().eval(), s_uniform.var())
 
@@ -203,6 +222,8 @@ class UniformTest(test.TestCase):
       a = 10.0
       b = 100.0
       uniform = uniform_lib.Uniform(low=a, high=b)
+      if not stats:
+        return
       s_uniform = stats.uniform(loc=a, scale=b - a)
       self.assertAllClose(uniform.stddev().eval(), s_uniform.std())
 
diff --git a/tensorflow/python/ops/distributions/BUILD b/tensorflow/python/ops/distributions/BUILD
index 90d3f04c72..833239eb5f 100644
--- a/tensorflow/python/ops/distributions/BUILD
+++ b/tensorflow/python/ops/distributions/BUILD
@@ -24,6 +24,7 @@ py_library(
         "//tensorflow/python:nn",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:special_math_ops",
         "//tensorflow/python:util",
     ],
 )
diff --git a/tensorflow/contrib/distributions/python/ops/bernoulli.py b/tensorflow/python/ops/distributions/bernoulli.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/bernoulli.py
rename to tensorflow/python/ops/distributions/bernoulli.py
diff --git a/tensorflow/contrib/distributions/python/ops/beta.py b/tensorflow/python/ops/distributions/beta.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/beta.py
rename to tensorflow/python/ops/distributions/beta.py
diff --git a/tensorflow/contrib/distributions/python/ops/categorical.py b/tensorflow/python/ops/distributions/categorical.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/categorical.py
rename to tensorflow/python/ops/distributions/categorical.py
diff --git a/tensorflow/python/ops/distributions/conditional_distribution.py b/tensorflow/python/ops/distributions/conditional_distribution.py
index a04373afbf..ef25d4aedd 100644
--- a/tensorflow/python/ops/distributions/conditional_distribution.py
+++ b/tensorflow/python/ops/distributions/conditional_distribution.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import util as distribution_util
 
 
 class ConditionalDistribution(distribution.Distribution):
diff --git a/tensorflow/contrib/distributions/python/ops/dirichlet.py b/tensorflow/python/ops/distributions/dirichlet.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/dirichlet.py
rename to tensorflow/python/ops/distributions/dirichlet.py
diff --git a/tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py b/tensorflow/python/ops/distributions/dirichlet_multinomial.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/dirichlet_multinomial.py
rename to tensorflow/python/ops/distributions/dirichlet_multinomial.py
diff --git a/tensorflow/contrib/distributions/python/ops/exponential.py b/tensorflow/python/ops/distributions/exponential.py
similarity index 98%
rename from tensorflow/contrib/distributions/python/ops/exponential.py
rename to tensorflow/python/ops/distributions/exponential.py
index a293d1e0dc..281641b915 100644
--- a/tensorflow/contrib/distributions/python/ops/exponential.py
+++ b/tensorflow/python/ops/distributions/exponential.py
@@ -20,13 +20,13 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops import gamma
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops.distributions import gamma
 
 
 __all__ = [
diff --git a/tensorflow/contrib/distributions/python/ops/gamma.py b/tensorflow/python/ops/distributions/gamma.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/gamma.py
rename to tensorflow/python/ops/distributions/gamma.py
diff --git a/tensorflow/contrib/distributions/python/ops/laplace.py b/tensorflow/python/ops/distributions/laplace.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/laplace.py
rename to tensorflow/python/ops/distributions/laplace.py
diff --git a/tensorflow/contrib/distributions/python/ops/multinomial.py b/tensorflow/python/ops/distributions/multinomial.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/multinomial.py
rename to tensorflow/python/ops/distributions/multinomial.py
diff --git a/tensorflow/python/ops/distributions/normal.py b/tensorflow/python/ops/distributions/normal.py
index 4c531b0378..0ef1c91df8 100644
--- a/tensorflow/python/ops/distributions/normal.py
+++ b/tensorflow/python/ops/distributions/normal.py
@@ -70,14 +70,14 @@ class Normal(distribution.Distribution):
 
   ```python
   # Define a single scalar Normal distribution.
-  dist = tf.contrib.distributions.Normal(loc=0., scale=3.)
+  dist = tf.distributions.Normal(loc=0., scale=3.)
 
   # Evaluate the cdf at 1, returning a scalar.
   dist.cdf(1.)
 
   # Define a batch of two scalar valued Normals.
   # The first has mean 1 and standard deviation 11, the second 2 and 22.
-  dist = tf.contrib.distributions.Normal(loc=[1, 2.], scale=[11, 22.])
+  dist = tf.distributions.Normal(loc=[1, 2.], scale=[11, 22.])
 
   # Evaluate the pdf of the first distribution on 0, and the second on 1.5,
   # returning a length two tensor.
@@ -92,7 +92,7 @@ class Normal(distribution.Distribution):
   ```python
   # Define a batch of two scalar valued Normals.
   # Both have mean 1, but different standard deviations.
-  dist = tf.contrib.distributions.Normal(loc=1., scale=[11, 22.])
+  dist = tf.distributions.Normal(loc=1., scale=[11, 22.])
 
   # Evaluate the pdf of both distributions on the same point, 3.0,
   # returning a length 2 tensor.
diff --git a/tensorflow/contrib/distributions/python/ops/student_t.py b/tensorflow/python/ops/distributions/student_t.py
similarity index 97%
rename from tensorflow/contrib/distributions/python/ops/student_t.py
rename to tensorflow/python/ops/distributions/student_t.py
index 7872569a2b..073ac4286b 100644
--- a/tensorflow/contrib/distributions/python/ops/student_t.py
+++ b/tensorflow/python/ops/distributions/student_t.py
@@ -42,8 +42,10 @@ __all__ = [
 
 
 class StudentT(distribution.Distribution):
-  # pylint: disable=line-too-long
-  """Student's t-distribution with degree of freedom `df`, location `loc`, and `scale` parameters.
+  """Student's t-distribution.
+
+  This distribution has parameters: degree of freedom `df`, location `loc`,
+  and `scale`.
 
   #### Mathematical details
 
@@ -82,7 +84,7 @@ class StudentT(distribution.Distribution):
 
   ```python
   # Define a single scalar Student t distribution.
-  single_dist = tf.contrib.distributions.StudentT(df=3)
+  single_dist = tf.distributions.StudentT(df=3)
 
   # Evaluate the pdf at 1, returning a scalar Tensor.
   single_dist.prob(1.)
@@ -90,7 +92,7 @@ class StudentT(distribution.Distribution):
   # Define a batch of two scalar valued Student t's.
   # The first has degrees of freedom 2, mean 1, and scale 11.
   # The second 3, 2 and 22.
-  multi_dist = tf.contrib.distributions.StudentT(df=[2, 3],
+  multi_dist = tf.distributions.StudentT(df=[2, 3],
                                                  loc=[1, 2.],
                                                  scale=[11, 22.])
 
@@ -107,7 +109,7 @@ class StudentT(distribution.Distribution):
   ```python
   # Define a batch of two Student's t distributions.
   # Both have df 2 and mean 1, but different scales.
-  dist = tf.contrib.distributions.StudentT(df=2, loc=1, scale=[11, 22.])
+  dist = tf.distributions.StudentT(df=2, loc=1, scale=[11, 22.])
 
   # Evaluate the pdf of both distributions on the same point, 3.0,
   # returning a length 2 tensor.
diff --git a/tensorflow/contrib/distributions/python/ops/uniform.py b/tensorflow/python/ops/distributions/uniform.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/uniform.py
rename to tensorflow/python/ops/distributions/uniform.py
diff --git a/tensorflow/python/ops/losses/util.py b/tensorflow/python/ops/losses/util.py
index 09ad874fae..3414df475f 100644
--- a/tensorflow/python/ops/losses/util.py
+++ b/tensorflow/python/ops/losses/util.py
@@ -57,7 +57,7 @@ def get_losses(scope=None, loss_collection=ops.GraphKeys.LOSSES):
 
 
 def get_regularization_losses(scope=None):
-  """Gets the regularization losses.
+  """Gets the list of regularization losses.
 
   Args:
     scope: An optional scope for filtering the losses to return.
@@ -88,7 +88,11 @@ def get_regularization_loss(scope=None, name="total_regularization_loss"):
 def get_total_loss(add_regularization_losses=True, name="total_loss"):
   """Returns a tensor whose value represents the total loss.
 
-  Notice that the function adds the given losses to the regularization losses.
+  In particular, this adds any losses you have added with `tf.add_loss()` to
+  any regularization losses that have been added by regularization parameters
+  on layers constructors e.g. `tf.layers`. Be very sure to use this if you
+  are constructing a loss_op manually. Otherwise regularization arguments
+  on `tf.layers` methods will not function.
 
   Args:
     add_regularization_losses: A boolean indicating whether or not to use the
diff --git a/tensorflow/python/ops/weights_broadcast_ops.py b/tensorflow/python/ops/weights_broadcast_ops.py
index 257b9f1faa..35e93249c3 100644
--- a/tensorflow/python/ops/weights_broadcast_ops.py
+++ b/tensorflow/python/ops/weights_broadcast_ops.py
@@ -97,9 +97,10 @@ def assert_broadcastable(weights, values):
         return control_flow_ops.no_op(name="static_scalar_check_success")
       if weights_rank_static != values_rank_static:
         raise ValueError(
-            "%s values.rank=%s. weights.rank=%s." % (
+            "%s values.rank=%s. weights.rank=%s."
+            " values.shape=%s. weights.shape=%s." % (
                 _ASSERT_BROADCASTABLE_ERROR_PREFIX, values_rank_static,
-                weights_rank_static))
+                weights_rank_static, values.shape, weights.shape))
       weights_shape_static = tensor_util.constant_value(weights_shape)
       values_shape_static = tensor_util.constant_value(values_shape)
       if weights_shape_static is not None and values_shape_static is not None:
diff --git a/tensorflow/python/training/session_manager.py b/tensorflow/python/training/session_manager.py
index 6bcc6e25c3..a13b6dd976 100644
--- a/tensorflow/python/training/session_manager.py
+++ b/tensorflow/python/training/session_manager.py
@@ -27,6 +27,23 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import saver as saver_mod
 
 
+def _maybe_name(obj):
+  """Returns object name if it has one, or a message otherwise.
+
+  This is useful for names that apper in error messages.
+  Args:
+    obj: Object to get the name of.
+  Returns:
+    name, "None", or a "no name" message.
+  """
+  if obj is None:
+    return "None"
+  elif hasattr(obj, "name"):
+    return obj.name
+  else:
+    return "<no name for %s>" % type(obj)
+
+
 class SessionManager(object):
   """Training helper that restores from checkpoint and creates session.
 
@@ -267,8 +284,8 @@ class SessionManager(object):
     if not local_init_success:
       raise RuntimeError(
           "Init operations did not make model ready for local_init.  "
-          "Init op: %s, init fn: %s, error: %s" % ("None" if init_op is None
-                                                   else init_op.name, init_fn,
+          "Init op: %s, init fn: %s, error: %s" % (_maybe_name(init_op),
+                                                   init_fn,
                                                    msg))
 
     is_ready, msg = self._model_ready(sess)
@@ -276,8 +293,7 @@ class SessionManager(object):
       raise RuntimeError(
           "Init operations did not make model ready.  "
           "Init op: %s, init fn: %s, local_init_op: %s, error: %s" %
-          (None if init_op is None else init_op.name, init_fn,
-           self._local_init_op, msg))
+          (_maybe_name(init_op), init_fn, self._local_init_op, msg))
     return sess
 
   def recover_session(self,
diff --git a/tensorflow/python/training/session_manager_test.py b/tensorflow/python/training/session_manager_test.py
index 246e95110a..4dc1d5abb7 100644
--- a/tensorflow/python/training/session_manager_test.py
+++ b/tensorflow/python/training/session_manager_test.py
@@ -497,6 +497,23 @@ class SessionManagerTest(test.TestCase):
                                    "Init operations did not make model ready"):
         sm2.prepare_session("", init_op=v.initializer)
 
+  def testPrepareSessionDidNotInitLocalVariableList(self):
+    with ops.Graph().as_default():
+      v = variables.Variable(1, name="v")
+      w = variables.Variable(
+          v,
+          trainable=False,
+          collections=[ops.GraphKeys.LOCAL_VARIABLES],
+          name="w")
+      with self.test_session():
+        self.assertEqual(False, variables.is_variable_initialized(v).eval())
+        self.assertEqual(False, variables.is_variable_initialized(w).eval())
+      sm2 = session_manager.SessionManager(
+          ready_op=variables.report_uninitialized_variables())
+      with self.assertRaisesRegexp(RuntimeError,
+                                   "Init operations did not make model ready"):
+        sm2.prepare_session("", init_op=[v.initializer])
+
   def testPrepareSessionWithReadyNotReadyForLocal(self):
     with ops.Graph().as_default():
       v = variables.Variable(1, name="v")
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 7baddf301c..ddffabd8cb 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -1185,7 +1185,7 @@ def tf_version_info_genrule():
       ],
       outs=["util/version_info.cc"],
       cmd=
-      "$(PYTHON_BIN_PATH) $(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
       local=1,
       tools=[clean_dep("//tensorflow/tools/git:gen_git_source.py")],)
 
diff --git a/tensorflow/tools/docs/generate_lib.py b/tensorflow/tools/docs/generate_lib.py
index 1518cd53a3..d974f0f1af 100644
--- a/tensorflow/tools/docs/generate_lib.py
+++ b/tensorflow/tools/docs/generate_lib.py
@@ -190,7 +190,6 @@ def _get_default_do_not_descend_map():
           'tensor_forest',
           'tensorboard',
           'testing',
-          'training',
           'tfprof',
       ],
       'contrib.bayesflow': [
diff --git a/tools/bazel.rc b/tools/bazel.rc
new file mode 100644
index 0000000000..e67a290cf4
--- /dev/null
+++ b/tools/bazel.rc
@@ -0,0 +1,30 @@
+build:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain
+build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true
+
+build:cuda_clang --crosstool_top=@local_config_cuda//crosstool:toolchain
+build:cuda_clang --define=using_cuda=true --define=using_cuda_clang=true
+
+build:win-cuda --define=using_cuda=true --define=using_cuda_nvcc=true
+
+build:mkl --define=using_mkl=true
+
+build:sycl --crosstool_top=@local_config_sycl//crosstool:toolchain
+build:sycl --define=using_sycl=true
+
+build:sycl_asan --crosstool_top=@local_config_sycl//crosstool:toolchain
+build:sycl_asan --define=using_sycl=true --copt -fno-omit-frame-pointer --copt -fsanitize-coverage=3 --copt -DGPR_NO_DIRECT_SYSCALLS --linkopt -fPIC --linkopt -fsanitize=address
+
+build --define=use_fast_cpp_protos=true
+build --define=allow_oversize_protos=true
+
+build --spawn_strategy=standalone
+test --spawn_strategy=standalone
+run --spawn_strategy=standalone
+
+build --genrule_strategy=standalone
+test --genrule_strategy=standalone
+run --genrule_strategy=standalone
+
+build -c opt
+test -c opt
+run -c opt
-- 
GitLab


From 6adc38555f66357426cd4c2028574ef00ba147cf Mon Sep 17 00:00:00 2001
From: David Norman <DavidNorman@users.noreply.github.com>
Date: Wed, 3 May 2017 22:16:18 +0100
Subject: [PATCH 0969/1563] Allocation tracking of pre-tracked buffer returned
 in a tuple should increment the buffer by 2 (#9408)

* Allocation tracking of pre-tracked buffer returned in a tuple should increment the buffer
ref count by 2, not 1.

A buffer not pre-tracked has its ref-count set to 2 when it is part of a tuple. A buffer
pre-tracked has its value increased by 1, whether it is part of a tuple or not.  This is
an error.

* Adjust range check following review

* Fix silly off by 2 error
---
 tensorflow/compiler/xla/service/allocation_tracker.cc | 5 +++--
 tensorflow/compiler/xla/service/allocation_tracker.h  | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tensorflow/compiler/xla/service/allocation_tracker.cc b/tensorflow/compiler/xla/service/allocation_tracker.cc
index 49a621810e..83759a7a0c 100644
--- a/tensorflow/compiler/xla/service/allocation_tracker.cc
+++ b/tensorflow/compiler/xla/service/allocation_tracker.cc
@@ -64,8 +64,9 @@ GlobalDataHandle AllocationTracker::RegisterInternal(
     auto& allocation = FindOrDie(handle_to_allocation_, handle);
     int ref_count = allocation->ref_count();
     CHECK_GT(ref_count, 0);
-    VLOG(2) << "ref_count: " << ref_count << " -> " << ref_count + 1;
-    allocation->increment_ref_count();
+    VLOG(2) << "ref_count: " << ref_count << " -> " <<
+            (ref_count + initial_ref_count);
+    allocation->increment_ref_count(initial_ref_count);
   } else {
     handle = next_handle_++;
     VLOG(2) << "ref_count: " << initial_ref_count;
diff --git a/tensorflow/compiler/xla/service/allocation_tracker.h b/tensorflow/compiler/xla/service/allocation_tracker.h
index e007680016..ebbf35b6fe 100644
--- a/tensorflow/compiler/xla/service/allocation_tracker.h
+++ b/tensorflow/compiler/xla/service/allocation_tracker.h
@@ -63,10 +63,10 @@ class Allocation {
     CHECK_GE(ref_count_, 0);
     return ref_count_;
   }
-  void increment_ref_count() {
+  void increment_ref_count(int inc) {
     CHECK_GT(ref_count_, 0);
-    CHECK_LT(ref_count_, INT_MAX);
-    ++ref_count_;
+    CHECK_LE(ref_count_, INT_MAX - inc);
+    ref_count_ += inc;
   }
   void decrement_ref_count() {
     CHECK_GT(ref_count_, 0);
-- 
GitLab


From c9fccab57ed15ad9b9f4c2d5789e434260cdb57f Mon Sep 17 00:00:00 2001
From: Sam Abrahams <sjabraha@gmail.com>
Date: Wed, 3 May 2017 14:20:06 -0700
Subject: [PATCH 0970/1563] Add check for duplicate names in import_graph_def
 (#9605)

---
 tensorflow/python/framework/importer.py      |  3 +++
 tensorflow/python/framework/importer_test.py | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/tensorflow/python/framework/importer.py b/tensorflow/python/framework/importer.py
index fcddd9546d..ed579224d3 100644
--- a/tensorflow/python/framework/importer.py
+++ b/tensorflow/python/framework/importer.py
@@ -275,6 +275,9 @@ def import_graph_def(graph_def, input_map=None, return_elements=None,
 
     # 1. Add operations without their inputs.
     for node in graph_def.node:
+      # Check to see if this op's name matches a previously seen op
+      if node.name in name_to_op:
+        raise ValueError('Duplicate name \'%s\' in GraphDef.' % node.name)
       # Set any default attr values that aren't present.
       if node.op not in op_dict:
         raise ValueError('No op named %s in defined operations.' % node.op)
diff --git a/tensorflow/python/framework/importer_test.py b/tensorflow/python/framework/importer_test.py
index c4ccc3d189..2b2398f833 100644
--- a/tensorflow/python/framework/importer_test.py
+++ b/tensorflow/python/framework/importer_test.py
@@ -685,6 +685,17 @@ class ImportGraphDefTest(test.TestCase):
       self.assertEqual("return_elements must be a list of strings.",
                        str(e.exception))
 
+  def testDuplicateOperationNames(self):
+    with ops.Graph().as_default():
+      with self.assertRaises(ValueError) as e:
+        importer.import_graph_def(
+            self._MakeGraphDef("""
+            node { name: 'A' op: 'Oi' }
+            node { name: 'B' op: 'Oi' }
+            node { name: 'A' op: 'Oi' }
+            """))
+      self.assertEqual("Duplicate name 'A' in GraphDef.", str(e.exception))
+
   def testWithExtensionAndAttr(self):
     with ops.Graph().as_default() as g:
       c = constant_op.constant(5.0, dtype=dtypes.float32, name="c")
-- 
GitLab


From 7828637e07b0081a37dfdc66ff912dd1d6ff3228 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 11:04:22 -0800
Subject: [PATCH 0971/1563] In the CUDA path of depthwise_conv2d, use
 compile-time constants if the filter size and depth_multiplier match the
 xception model.

Hardening the depthwise_conv2d forward test by using non-uniform filter values.
Change: 154985456
---
 .../core/kernels/depthwise_conv_op_gpu.cu.cc  | 238 +++++++++++-------
 .../kernel_tests/depthwise_conv_op_test.py    |  10 +-
 2 files changed, 157 insertions(+), 91 deletions(-)

diff --git a/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc b/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc
index 5377d09ec6..b16adf6102 100644
--- a/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc
@@ -24,28 +24,32 @@ limitations under the License.
 
 #if !defined(_MSC_VER)
 #define UNROLL _Pragma("unroll")
+#define NOUNROLL _Pragma("nounroll")
 #else
 #define UNROLL
+#define NOUNROLL
 #endif
 
 namespace tensorflow {
 
-namespace {
-
-typedef Eigen::GpuDevice GPUDevice;
+using Eigen::GpuDevice;
 
 // A Cuda kernel to compute the depthwise convolution forward pass
 // in NHWC format.
-template <typename T>
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
 __global__ void DepthwiseConv2dGPUKernelNHWC(const DepthwiseArgs args,
                                              const T* input, const T* filter,
                                              T* output, int num_outputs) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
-  const int filter_rows = args.filter_rows;
-  const int filter_cols = args.filter_cols;
-  const int depth_multiplier = args.depth_multiplier;
+  const int filter_rows =
+      kKnownFilterHeight < 0 ? args.filter_rows : kKnownFilterHeight;
+  const int filter_cols =
+      kKnownFilterWidth < 0 ? args.filter_cols : kKnownFilterWidth;
+  const int depth_multiplier =
+      kKnownDepthMultiplier < 0 ? args.depth_multiplier : kKnownDepthMultiplier;
   const int stride = args.stride;
   const int pad_rows = args.pad_rows;
   const int pad_cols = args.pad_cols;
@@ -114,16 +118,20 @@ __global__ void DepthwiseConv2dGPUKernelNHWC(const DepthwiseArgs args,
 
 // A Cuda kernel to compute the depthwise convolution forward pass
 // in NCHW format.
-template <typename T>
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
 __global__ void DepthwiseConv2dGPUKernelNCHW(const DepthwiseArgs args,
                                              const T* input, const T* filter,
                                              T* output, int num_outputs) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
-  const int filter_rows = args.filter_rows;
-  const int filter_cols = args.filter_cols;
-  const int depth_multiplier = args.depth_multiplier;
+  const int filter_rows =
+      kKnownFilterHeight < 0 ? args.filter_rows : kKnownFilterHeight;
+  const int filter_cols =
+      kKnownFilterWidth < 0 ? args.filter_cols : kKnownFilterWidth;
+  const int depth_multiplier =
+      kKnownDepthMultiplier < 0 ? args.depth_multiplier : kKnownDepthMultiplier;
   const int stride = args.stride;
   const int pad_rows = args.pad_rows;
   const int pad_cols = args.pad_cols;
@@ -235,29 +243,41 @@ __global__ void DepthwiseConv2dGPUKernelNCHW(const DepthwiseArgs args,
   }
 }
 
-}  // namespace
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
+void LaunchDepthwiseConv2dGPU(const GpuDevice& d, const DepthwiseArgs args,
+                              const T* input, const T* filter, T* output,
+                              TensorFormat data_format) {
+  const int num_outputs =
+      args.batch * args.out_rows * args.out_cols * args.out_depth;
+  CudaLaunchConfig config = GetCudaLaunchConfig(num_outputs, d);
+  if (data_format == FORMAT_NHWC) {
+    DepthwiseConv2dGPUKernelNHWC<T, kKnownFilterWidth, kKnownFilterHeight,
+                                 kKnownDepthMultiplier>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            args, input, filter, output, num_outputs);
+  } else if (data_format == FORMAT_NCHW) {
+    DepthwiseConv2dGPUKernelNCHW<T, kKnownFilterWidth, kKnownFilterHeight,
+                                 kKnownDepthMultiplier>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            args, input, filter, output, num_outputs);
+  } else {
+    assert(false);
+  }
+}
 
 // A simple launch pad to launch the Cuda kernel for depthwise convolution.
 template <typename T>
 struct DepthwiseConv2dGPULaunch {
-  static void Run(const GPUDevice& d, const DepthwiseArgs args, const T* input,
+  static void Run(const GpuDevice& d, const DepthwiseArgs args, const T* input,
                   const T* filter, T* output, TensorFormat data_format) {
-    // In this kernel, each thread is computing the gradients from one element
-    // in the out_backprop. Note that one element in the out_backprop can map
-    // to multiple filter elements.
-    const int num_outputs =
-        args.batch * args.out_rows * args.out_cols * args.out_depth;
-    CudaLaunchConfig config = GetCudaLaunchConfig(num_outputs, d);
-    if (data_format == FORMAT_NHWC) {
-      DepthwiseConv2dGPUKernelNHWC<T>
-          <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-              args, input, filter, output, num_outputs);
-    } else if (data_format == FORMAT_NCHW) {
-      DepthwiseConv2dGPUKernelNCHW<T>
-          <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-              args, input, filter, output, num_outputs);
+    if (args.filter_rows == 3 && args.filter_cols == 3 &&
+        args.depth_multiplier == 1) {
+      LaunchDepthwiseConv2dGPU<T, 3, 3, 1>(d, args, input, filter, output,
+                                           data_format);
     } else {
-      assert(false);
+      LaunchDepthwiseConv2dGPU<T, -1, -1, -1>(d, args, input, filter, output,
+                                              data_format);
     }
   }
 };
@@ -266,18 +286,20 @@ template struct DepthwiseConv2dGPULaunch<float>;
 template struct DepthwiseConv2dGPULaunch<double>;
 
 // A Cuda kernel to compute the depthwise convolution backprop w.r.t. input.
-template <typename T, int KNOWN_DEPTH_MULTIPLIER>
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
 __global__ void DepthwiseConv2dBackpropInputGPUKernelNHWC(
     const DepthwiseArgs args, const T* out_backprop, const T* filter,
     T* in_backprop, int num_in_backprop) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
-  const int filter_rows = args.filter_rows;
-  const int filter_cols = args.filter_cols;
-  const int depth_multiplier = KNOWN_DEPTH_MULTIPLIER == -1
-                                   ? args.depth_multiplier
-                                   : KNOWN_DEPTH_MULTIPLIER;
+  const int filter_rows =
+      kKnownFilterHeight < 0 ? args.filter_rows : kKnownFilterHeight;
+  const int filter_cols =
+      kKnownFilterWidth < 0 ? args.filter_cols : kKnownFilterWidth;
+  const int depth_multiplier =
+      kKnownDepthMultiplier < 0 ? args.depth_multiplier : kKnownDepthMultiplier;
   const int stride = args.stride;
   const int pad_rows = args.pad_rows;
   const int pad_cols = args.pad_cols;
@@ -301,14 +323,12 @@ __global__ void DepthwiseConv2dBackpropInputGPUKernelNHWC(
         tf_max(0, (in_c - filter_cols + pad_cols + stride) / stride);
     const int out_c_end = tf_min(out_cols - 1, (in_c + pad_cols) / stride);
 
-#pragma nounroll
-    for (int out_r = out_r_start; out_r <= out_r_end; ++out_r) {
+    NOUNROLL for (int out_r = out_r_start; out_r <= out_r_end; ++out_r) {
       const int f_r = in_r + pad_rows - out_r * stride;
       const int temp_out_backprop_offset =
           out_depth * out_cols * (out_r + out_rows * b);
       const int temp_filter_offset = filter_cols * f_r;
-#pragma nounroll
-      for (int out_c = out_c_start; out_c <= out_c_end; ++out_c) {
+      NOUNROLL for (int out_c = out_c_start; out_c <= out_c_end; ++out_c) {
         const int f_c = in_c + pad_cols - out_c * stride;
         int filter_offset =
             depth_multiplier * (in_d + in_depth * (f_c + temp_filter_offset));
@@ -328,7 +348,8 @@ __global__ void DepthwiseConv2dBackpropInputGPUKernelNHWC(
   }
 }
 
-template <typename T>
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
 __global__ void __launch_bounds__(1024)
     DepthwiseConv2dBackpropInputGPUKernelNCHW(const DepthwiseArgs args,
                                               const T* out_backprop,
@@ -337,9 +358,12 @@ __global__ void __launch_bounds__(1024)
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
-  const int filter_rows = args.filter_rows;
-  const int filter_cols = args.filter_cols;
-  const int depth_multiplier = args.depth_multiplier;
+  const int filter_rows =
+      kKnownFilterHeight < 0 ? args.filter_rows : kKnownFilterHeight;
+  const int filter_cols =
+      kKnownFilterWidth < 0 ? args.filter_cols : kKnownFilterWidth;
+  const int depth_multiplier =
+      kKnownDepthMultiplier < 0 ? args.depth_multiplier : kKnownDepthMultiplier;
   const int stride = args.stride;
   const int pad_rows = args.pad_rows;
   const int pad_cols = args.pad_cols;
@@ -395,34 +419,52 @@ __global__ void __launch_bounds__(1024)
   }
 }
 
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
+void LaunchDepthwiseConv2dBackpropInputGPU(const GpuDevice& d,
+                                           const DepthwiseArgs args,
+                                           const T* out_backprop,
+                                           const T* filter, T* in_backprop,
+                                           TensorFormat data_format) {
+  const int num_in_backprop =
+      args.batch * args.in_rows * args.in_cols * args.in_depth;
+  CudaLaunchConfig config = GetCudaLaunchConfig(num_in_backprop, d);
+  // Increase block count for when there are more warps/SM than threads/SM.
+  // TODO(csigg): this is pretty arbitraty and should be generalized using
+  // cudaOccupancyMaxPotentialBlockSize().
+  config.block_count *= 4;
+  if (data_format == FORMAT_NHWC) {
+    DepthwiseConv2dBackpropInputGPUKernelNHWC<
+        T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            args, out_backprop, filter, in_backprop, num_in_backprop);
+  } else if (data_format == FORMAT_NCHW) {
+    DepthwiseConv2dBackpropInputGPUKernelNCHW<
+        T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            args, out_backprop, filter, in_backprop, num_in_backprop);
+  } else {
+    assert(false);
+  }
+}
+
 // A simple launch pad to launch the Cuda kernel for depthwise convolution.
 template <typename T>
 struct DepthwiseConv2dBackpropInputGPULaunch {
-  static void Run(const GPUDevice& d, const DepthwiseArgs args,
+  static void Run(const GpuDevice& d, const DepthwiseArgs args,
                   const T* out_backprop, const T* filter, T* in_backprop,
                   TensorFormat data_format) {
-    const int num_in_backprop =
-        args.batch * args.in_rows * args.in_cols * args.in_depth;
-
-    CudaLaunchConfig config = GetCudaLaunchConfig(num_in_backprop, d);
-    // Increase block count for when there are more warps/SM than threads/SM.
-    config.block_count *= 4;
-    if (data_format == FORMAT_NHWC) {
-      if (args.depth_multiplier == 1) {
-        DepthwiseConv2dBackpropInputGPUKernelNHWC<T, 1>
-            <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-                args, out_backprop, filter, in_backprop, num_in_backprop);
+    if (args.depth_multiplier == 1) {
+      if (args.filter_rows == 3 && args.filter_cols == 3) {
+        LaunchDepthwiseConv2dBackpropInputGPU<T, 3, 3, 1>(
+            d, args, out_backprop, filter, in_backprop, data_format);
       } else {
-        DepthwiseConv2dBackpropInputGPUKernelNHWC<T, -1>
-            <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-                args, out_backprop, filter, in_backprop, num_in_backprop);
+        LaunchDepthwiseConv2dBackpropInputGPU<T, -1, -1, 1>(
+            d, args, out_backprop, filter, in_backprop, data_format);
       }
-    } else if (data_format == FORMAT_NCHW) {
-      DepthwiseConv2dBackpropInputGPUKernelNCHW<T>
-          <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-              args, out_backprop, filter, in_backprop, num_in_backprop);
     } else {
-      assert(false);
+      LaunchDepthwiseConv2dBackpropInputGPU<T, -1, -1, -1>(
+          d, args, out_backprop, filter, in_backprop, data_format);
     }
   }
 };
@@ -431,16 +473,20 @@ template struct DepthwiseConv2dBackpropInputGPULaunch<float>;
 template struct DepthwiseConv2dBackpropInputGPULaunch<double>;
 
 // A Cuda kernel to compute the depthwise convolution backprop w.r.t. filter.
-template <typename T>
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
 __global__ void DepthwiseConv2dBackpropFilterGPUKernelNHWC(
     const DepthwiseArgs args, const T* out_backprop, const T* input,
     T* filter_backprop, int num_out_backprop) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
-  const int filter_rows = args.filter_rows;
-  const int filter_cols = args.filter_cols;
-  const int depth_multiplier = args.depth_multiplier;
+  const int filter_rows =
+      kKnownFilterHeight < 0 ? args.filter_rows : kKnownFilterHeight;
+  const int filter_cols =
+      kKnownFilterWidth < 0 ? args.filter_cols : kKnownFilterWidth;
+  const int depth_multiplier =
+      kKnownDepthMultiplier < 0 ? args.depth_multiplier : kKnownDepthMultiplier;
   const int stride = args.stride;
   const int pad_rows = args.pad_rows;
   const int pad_cols = args.pad_cols;
@@ -518,16 +564,20 @@ __global__ void DepthwiseConv2dBackpropFilterGPUKernelNHWC(
 }
 
 // A Cuda kernel to compute the depthwise convolution backprop w.r.t. filter.
-template <typename T>
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
 __global__ void DepthwiseConv2dBackpropFilterGPUKernelNCHW(
     const DepthwiseArgs args, const T* out_backprop, const T* input,
     T* filter_backprop, int num_out_backprop) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
-  const int filter_rows = args.filter_rows;
-  const int filter_cols = args.filter_cols;
-  const int depth_multiplier = args.depth_multiplier;
+  const int filter_rows =
+      kKnownFilterHeight < 0 ? args.filter_rows : kKnownFilterHeight;
+  const int filter_cols =
+      kKnownFilterWidth < 0 ? args.filter_cols : kKnownFilterWidth;
+  const int depth_multiplier =
+      kKnownDepthMultiplier < 0 ? args.depth_multiplier : kKnownDepthMultiplier;
   const int stride = args.stride;
   const int pad_rows = args.pad_rows;
   const int pad_cols = args.pad_cols;
@@ -610,28 +660,44 @@ __global__ void DepthwiseConv2dBackpropFilterGPUKernelNCHW(
   }
 }
 
+template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
+          int kKnownDepthMultiplier>
+void LaunchDepthwiseConv2dBackpropFilterGPU(const GpuDevice& d,
+                                            const DepthwiseArgs args,
+                                            const T* out_backprop,
+                                            const T* input, T* filter_backprop,
+                                            TensorFormat data_format) {
+  const int num_out_backprop =
+      args.batch * args.out_rows * args.out_cols * args.out_depth;
+  CudaLaunchConfig config = GetCudaLaunchConfig(num_out_backprop, d);
+  if (data_format == FORMAT_NHWC) {
+    DepthwiseConv2dBackpropFilterGPUKernelNHWC<
+        T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            args, out_backprop, input, filter_backprop, num_out_backprop);
+  } else if (data_format == FORMAT_NCHW) {
+    DepthwiseConv2dBackpropFilterGPUKernelNCHW<
+        T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            args, out_backprop, input, filter_backprop, num_out_backprop);
+  } else {
+    assert(false);
+  }
+}
+
 // A simple launch pad to launch the Cuda kernel for depthwise convolution.
 template <typename T>
 struct DepthwiseConv2dBackpropFilterGPULaunch {
-  static void Run(const GPUDevice& d, const DepthwiseArgs args,
+  static void Run(const GpuDevice& d, const DepthwiseArgs args,
                   const T* out_backprop, const T* input, T* filter_backprop,
                   TensorFormat data_format) {
-    // In this kernel, each thread is computing the gradients for one element in
-    // the out_backprop.
-    const int num_out_backprop =
-        args.batch * args.out_rows * args.out_cols * args.out_depth;
-    CudaLaunchConfig config = GetCudaLaunchConfig(num_out_backprop, d);
-
-    if (data_format == FORMAT_NHWC) {
-      DepthwiseConv2dBackpropFilterGPUKernelNHWC<T>
-          <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-              args, out_backprop, input, filter_backprop, num_out_backprop);
-    } else if (data_format == FORMAT_NCHW) {
-      DepthwiseConv2dBackpropFilterGPUKernelNCHW<T>
-          <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-              args, out_backprop, input, filter_backprop, num_out_backprop);
+    if (args.filter_rows == 3 && args.filter_cols == 3 &&
+        args.depth_multiplier == 1) {
+      LaunchDepthwiseConv2dBackpropFilterGPU<T, 3, 3, 1>(
+          d, args, out_backprop, input, filter_backprop, data_format);
     } else {
-      assert(false);
+      LaunchDepthwiseConv2dBackpropFilterGPU<T, -1, -1, -1>(
+          d, args, out_backprop, input, filter_backprop, data_format);
     }
   }
 };
diff --git a/tensorflow/python/kernel_tests/depthwise_conv_op_test.py b/tensorflow/python/kernel_tests/depthwise_conv_op_test.py
index a881ed0dc9..2fc34bd4d1 100644
--- a/tensorflow/python/kernel_tests/depthwise_conv_op_test.py
+++ b/tensorflow/python/kernel_tests/depthwise_conv_op_test.py
@@ -113,10 +113,9 @@ class DepthwiseConv2DTest(test.TestCase):
       total_size_1 *= s
     for s in filter_in_sizes:
       total_size_2 *= s
-    # Initializes the input tensor with array containing incrementing
-    # numbers from 1.
+    # Initializes the input and filter tensor with numbers incrementing from 1.
     x1 = [f * 1.0 for f in range(1, total_size_1 + 1)]
-    x2 = [1.0 for f in range(1, total_size_2 + 1)]
+    x2 = [f * 1.0 for f in range(1, total_size_2 + 1)]
     with self.test_session(use_gpu=use_gpu) as sess:
       t1 = constant_op.constant(x1, shape=tensor_in_sizes)
       t1.set_shape(tensor_in_sizes)
@@ -147,8 +146,9 @@ class DepthwiseConv2DTest(test.TestCase):
       native_result = sess.run(conv_native)
       interface_result = sess.run(conv_interface)
 
-    print("diff matrix:",
-          np.amax(np.ravel(native_result) - np.ravel(interface_result)))
+    print("depthwise conv_2d: ", tensor_in_sizes, "*", filter_in_sizes,
+          ", stride:", stride, ", padding: ", padding, ", max diff: ",
+          np.amax(np.absolute(native_result - interface_result)))
     self.assertArrayNear(
         np.ravel(native_result), np.ravel(interface_result), 1e-5)
     self.assertShapeEqual(native_result, conv_native)
-- 
GitLab


From 965d620104d375c5fd2b18881f353eb41d9a63a2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 14:03:00 -0800
Subject: [PATCH 0972/1563] Internal change. Change: 155009390

---
 tensorflow/cc/BUILD                           |   10 +
 tensorflow/compiler/xla/reference_util.h      |    2 +-
 .../xla/service/cpu/cpu_instruction_fusion.cc |    5 +
 .../xla/service/gpu/instruction_fusion.cc     |    5 +
 .../compiler/xla/service/hlo_instruction.cc   |    7 +-
 .../compiler/xla/service/hlo_instruction.h    |    3 +-
 .../learn/python/learn/estimators/head.py     |    7 +-
 tensorflow/core/BUILD                         |    3 +
 tensorflow/core/common_runtime/function.cc    |   26 +-
 .../core/common_runtime/function_test.cc      | 1036 ++++++++++-------
 tensorflow/core/framework/attr_value_util.cc  |   21 +-
 tensorflow/core/graph/algorithm.cc            |   20 +-
 tensorflow/core/graph/algorithm.h             |   16 +-
 tensorflow/core/grappler/costs/BUILD          |   51 +
 .../costs/measuring_cost_estimator.cc         |  133 +++
 .../grappler/costs/measuring_cost_estimator.h |   76 ++
 .../core/grappler/costs/robust_stats.cc       |  151 +++
 tensorflow/core/grappler/costs/robust_stats.h |   42 +
 .../core/grappler/costs/robust_stats_test.cc  |   63 +
 .../core/grappler/costs/virtual_scheduler.cc  |  215 ++++
 .../core/grappler/costs/virtual_scheduler.h   |  116 ++
 tensorflow/core/kernels/BUILD                 |    7 +-
 .../performance/performance_models.md         |    6 +-
 .../python/feature_column/feature_column.py   |  147 ++-
 .../feature_column/feature_column_test.py     |  144 ++-
 .../kernel_tests/variable_scope_test.py       |    5 +
 tensorflow/python/ops/variable_scope.py       |   11 +
 tensorflow/python/training/supervisor.py      |    2 +-
 .../stream_executor/cuda/cuda_driver.cc       |   45 +-
 29 files changed, 1874 insertions(+), 501 deletions(-)
 create mode 100644 tensorflow/core/grappler/costs/measuring_cost_estimator.cc
 create mode 100644 tensorflow/core/grappler/costs/measuring_cost_estimator.h
 create mode 100644 tensorflow/core/grappler/costs/robust_stats.cc
 create mode 100644 tensorflow/core/grappler/costs/robust_stats.h
 create mode 100644 tensorflow/core/grappler/costs/robust_stats_test.cc
 create mode 100644 tensorflow/core/grappler/costs/virtual_scheduler.cc
 create mode 100644 tensorflow/core/grappler/costs/virtual_scheduler.h

diff --git a/tensorflow/cc/BUILD b/tensorflow/cc/BUILD
index 42fa139282..8810b8731a 100644
--- a/tensorflow/cc/BUILD
+++ b/tensorflow/cc/BUILD
@@ -388,6 +388,16 @@ tf_gen_op_wrappers_cc(
     visibility = ["//tensorflow:internal"],
 )
 
+tf_gen_op_wrappers_cc(
+    name = "functional_ops",
+    include_internal_ops = 1,
+    op_lib_names = [
+        "functional_ops",
+    ],
+    pkg = "//tensorflow/core",
+    visibility = ["//tensorflow:internal"],
+)
+
 tf_gen_op_wrappers_cc(
     name = "resource_variable_ops",
     include_internal_ops = 1,
diff --git a/tensorflow/compiler/xla/reference_util.h b/tensorflow/compiler/xla/reference_util.h
index 0327612129..f58f0bdc9f 100644
--- a/tensorflow/compiler/xla/reference_util.h
+++ b/tensorflow/compiler/xla/reference_util.h
@@ -422,7 +422,7 @@ class ReferenceUtil {
   static std::unique_ptr<Array2D<T1>> ApplyElementwise2D(
       F&& f, const Array2D<T1>& array1, const Array2D<Ts>&... arrays) {
     AssertSameSize2D(array1, arrays...);
-    auto result = MakeUnique<Array2D<T1>>(array1.n1(), array1.n1());
+    auto result = MakeUnique<Array2D<T1>>(array1.n1(), array1.n2());
     for (int64 i = 0; i < array1.n1(); ++i) {
       for (int64 j = 0; j < array1.n2(); ++j) {
         (*result)(i, j) = f(array1(i, j), arrays(i, j)...);
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_instruction_fusion.cc b/tensorflow/compiler/xla/service/cpu/cpu_instruction_fusion.cc
index 240da35ef1..dc002846e9 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_instruction_fusion.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_instruction_fusion.cc
@@ -24,6 +24,11 @@ bool CpuInstructionFusion::ShouldFuse(HloInstruction* consumer,
                                       int64 operand_index) {
   HloInstruction* producer = consumer->mutable_operand(operand_index);
 
+  // Output fusion is not currently supported on CPUs.
+  if (producer->opcode() == HloOpcode::kFusion) {
+    return false;
+  }
+
   // Condition for consumer: must be elementwise or a fusion op
   // (which necessarily only contains elementwise operations)
   if (!(consumer->opcode() == HloOpcode::kFusion ||
diff --git a/tensorflow/compiler/xla/service/gpu/instruction_fusion.cc b/tensorflow/compiler/xla/service/gpu/instruction_fusion.cc
index 34a44ad405..a36dcbbd2f 100644
--- a/tensorflow/compiler/xla/service/gpu/instruction_fusion.cc
+++ b/tensorflow/compiler/xla/service/gpu/instruction_fusion.cc
@@ -46,6 +46,11 @@ bool GpuInstructionFusion::ShouldFuse(HloInstruction* consumer,
                                       int64 operand_index) {
   HloInstruction* producer = consumer->mutable_operand(operand_index);
 
+  // Output fusion is not currently supported on GPUs.
+  if (producer->opcode() == HloOpcode::kFusion) {
+    return false;
+  }
+
   // RNG operations are not currently parallel-friendly on GPU.
   if (producer->opcode() == HloOpcode::kRng) {
     return false;
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 179e183265..66fb059975 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -1570,7 +1570,9 @@ string HloInstruction::ToCategory() const {
           return "non-elementwise fusion";
         }
       case FusionKind::kInput:
-        return "reduce fusion";
+        return "input fusion";
+      case FusionKind::kOutput:
+        return "output fusion";
       case FusionKind::kTransposeDot:
         return "dot fusion";
       case FusionKind::kConvBackwardFilter:
@@ -1618,7 +1620,6 @@ bool HloInstruction::IsFusable() const {
 
   // Some kinds of instructions don't make sense to fuse.
   switch (opcode_) {
-    case HloOpcode::kFusion:
     case HloOpcode::kInfeed:
     case HloOpcode::kOutfeed:
     case HloOpcode::kParameter:
@@ -2186,6 +2187,8 @@ string ToString(HloInstruction::FusionKind kind) {
       return "kLoop";
     case HloInstruction::FusionKind::kInput:
       return "kInput";
+    case HloInstruction::FusionKind::kOutput:
+      return "kOutput";
     case HloInstruction::FusionKind::kTransposeDot:
       return "kTransposeDot";
     case HloInstruction::FusionKind::kConvBackwardFilter:
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 5ec17c8004..43935690df 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -54,7 +54,8 @@ class HloInstruction {
  public:
   enum class FusionKind {
     kLoop,                // Fused into a loop.
-    kInput,               // Fused into a reduction kernel.
+    kInput,               // Op's input is fused into the op itself.
+    kOutput,              // Op's output is fused into the op itself.
     kTransposeDot,        // Fused into a dot with transposed operands.
     kConvBackwardFilter,  // Fused into a backward filter convolution.
     kConvBackwardInput,   // Fused into a backward input convolution.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 15e457f932..25f2922bf8 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -379,7 +379,12 @@ def multi_label_head(n_classes,
                      loss_fn=None):
   """Creates a Head for multi label classification.
 
-  The Head uses sigmoid cross entropy loss.
+  Multi-label classification handles the case where each example may have zero
+  or more associated labels, from a discrete set.  This is distinct from
+  `multi_class_head` which has exactly one label from a discrete set.
+
+  This head by default uses sigmoid cross entropy loss, which expects as input
+  a multi-hot tensor of shape `(batch_size, num_classes)`.
 
   Args:
     n_classes: Integer, number of classes, must be >= 2
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 1617addba0..119bc0f899 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -2417,6 +2417,9 @@ tf_cc_test(
         ":test_main",
         ":testlib",
         "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:cc_ops_internal",
+        "//tensorflow/cc:function_ops",
+        "//tensorflow/cc:functional_ops",
         "//tensorflow/core/kernels:cast_op",
         "//tensorflow/core/kernels:cwise_op",
         "//tensorflow/core/kernels:function_ops",
diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 13e20568ff..3644279b92 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -1001,25 +1001,19 @@ string NewName(const Node* n, bool pretty) {
 void ToGraphDef(const Graph* g, GraphDef* gdef, bool pretty) {
   // We visit nodes in forward topological sort order, which is a
   // possible execution order of the graph.
-  std::vector<size_t> pending(g->num_node_ids());
-  std::deque<const Node*> ready;
-  for (const Node* n : g->nodes()) {
-    pending[n->id()] = n->in_edges().size();
-    if (pending[n->id()] == 0) ready.push_back(n);
-  }
   gtl::InlinedVector<const Edge*, 4> inputs;
   gdef->Clear();
   gdef->mutable_versions()->CopyFrom(g->versions());
-  while (!ready.empty()) {
-    const Node* n = ready.front();
-    ready.pop_front();
-    for (const Edge* e : n->out_edges()) {
-      const Node* next = e->dst();
-      if (--pending[next->id()] == 0) {
-        ready.push_back(next);
-      }
+
+  std::vector<Node*> start_nodes;
+  for (Node* n : g->nodes()) {
+    if (n->out_edges().empty()) {
+      start_nodes.push_back(n);
     }
-    if (!n->IsOp()) continue;
+  }
+
+  ReverseDFSFrom(*g, start_nodes, nullptr, [gdef, pretty, &inputs](Node* n) {
+    if (!n->IsOp()) return;
     NodeDef* ndef = gdef->add_node();
     ndef->set_name(NewName(n, pretty));
     ndef->set_op(n->type_string());
@@ -1054,7 +1048,7 @@ void ToGraphDef(const Graph* g, GraphDef* gdef, bool pretty) {
         ndef->add_input(strings::StrCat(srcname, ":", e->src_output()));
       }
     }
-  }
+  });
 }
 
 string DebugString(const Graph* g) {
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index 8f70ab8783..af1ff6aec0 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -17,6 +17,10 @@ limitations under the License.
 
 #include <atomic>
 
+#include "tensorflow/cc/ops/array_ops_internal.h"
+#include "tensorflow/cc/ops/function_ops.h"
+#include "tensorflow/cc/ops/functional_ops.h"
+#include "tensorflow/cc/ops/standard_ops.h"
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/common_runtime/executor.h"
@@ -28,10 +32,12 @@ limitations under the License.
 #include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/lib/core/notification.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
 #include "tensorflow/core/lib/core/threadpool.h"
 #include "tensorflow/core/platform/test.h"
 #include "tensorflow/core/public/session_options.h"
 #include "tensorflow/core/public/version.h"
+#include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
 
@@ -58,13 +64,8 @@ class FunctionTest : public ::testing::Test {
       : device_(DeviceFactory::NewDevice("CPU", {},
                                          "/job:localhost/replica:0/task:0")) {}
 
-  ~FunctionTest() override {
-    delete exec_;
-    delete device_;
-  }
-
   void Create(const FunctionDef& fdef, InstantiateAttrValueSlice attrs) {
-    delete exec_;
+    exec_ = nullptr;
     InstantiationResult result;
     TF_CHECK_OK(InstantiateFunction(fdef, attrs, GetOpSig, &result));
 
@@ -79,15 +80,18 @@ class FunctionTest : public ::testing::Test {
 
     const int version = g->versions().producer();
     LocalExecutorParams params;
-    params.device = device_;
+    params.device = device_.get();
     params.create_kernel = [this, version](const NodeDef& ndef,
                                            OpKernel** kernel) {
-      return CreateNonCachedKernel(device_, nullptr, ndef, version, kernel);
+      return CreateNonCachedKernel(device_.get(), nullptr, ndef, version,
+                                   kernel);
     };
     params.delete_kernel = [](OpKernel* kernel) {
       DeleteNonCachedKernel(kernel);
     };
-    TF_CHECK_OK(NewLocalExecutor(params, g, &exec_));
+    Executor* exec;
+    TF_CHECK_OK(NewLocalExecutor(params, g, &exec));
+    exec_.reset(exec);
   }
 
   void Run(const std::vector<Tensor>& args, std::vector<Tensor*> rets) {
@@ -105,8 +109,8 @@ class FunctionTest : public ::testing::Test {
     }
   }
 
-  Device* device_ = nullptr;
-  Executor* exec_ = nullptr;
+  std::unique_ptr<Device> device_;
+  std::unique_ptr<Executor> exec_;
   DataTypeVector arg_types_;
   DataTypeVector ret_types_;
 };
@@ -136,21 +140,15 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
       : device_(DeviceFactory::NewDevice("CPU", {},
                                          "/job:localhost/replica:0/task:0")) {}
 
-  ~FunctionLibraryRuntimeTest() override {
-    delete lib_;
-    delete lib_def_;
-    delete device_;
-  }
-
   void Init(const std::vector<FunctionDef>& flib) {
     FunctionDefLibrary proto;
     for (const auto& fdef : flib) *(proto.add_function()) = fdef;
-    delete lib_def_;
-    lib_def_ = new FunctionLibraryDefinition(OpRegistry::Global(), proto);
-    delete lib_;
+    lib_def_.reset(new FunctionLibraryDefinition(OpRegistry::Global(), proto));
     OptimizerOptions opts;
-    lib_ = NewFunctionLibraryRuntime(nullptr, Env::Default(), device_,
-                                     TF_GRAPH_DEF_VERSION, lib_def_, opts);
+    lib_.reset(NewFunctionLibraryRuntime(nullptr, Env::Default(), device_.get(),
+                                         TF_GRAPH_DEF_VERSION, lib_def_.get(),
+                                         opts));
+    fdef_lib_ = lib_def_->ToProto();
   }
 
   Status Run(const string& name, InstantiateAttrValueSlice attrs,
@@ -190,7 +188,8 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     return Status::OK();
   }
 
-  Graph* GetFuncBody(const string& name, InstantiateAttrValueSlice attrs) {
+  std::unique_ptr<Graph> GetFuncBody(const string& name,
+                                     InstantiateAttrValueSlice attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(name, attrs, &handle);
     if (!status.ok()) {
@@ -199,12 +198,13 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     }
     const FunctionBody* fbody = lib_->GetFunctionBody(handle);
     CHECK_NOTNULL(fbody);
-    Graph* ret = new Graph(lib_def_);
-    CopyGraph(*fbody->graph, ret);
+    std::unique_ptr<Graph> ret(new Graph(lib_def_.get()));
+    CopyGraph(*fbody->graph, ret.get());
     return ret;
   }
 
-  Graph* GetGradBody(const string& func, InstantiateAttrValueSlice attrs) {
+  std::unique_ptr<Graph> GetGradBody(const string& func,
+                                     InstantiateAttrValueSlice attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(func, attrs, &handle);
     if (!status.ok()) {
@@ -213,17 +213,17 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     }
     const FunctionBody* fbody = lib_->GetFunctionBody(handle);
     CHECK_NOTNULL(fbody);
-    FunctionBody* gbody = SymbolicGradient(*fbody);
+    std::unique_ptr<FunctionBody> gbody(SymbolicGradient(*fbody));
     CHECK_NOTNULL(gbody);
-    Graph* ret = new Graph(lib_def_);
-    CopyGraph(*gbody->graph, ret);
-    delete gbody;
+    std::unique_ptr<Graph> ret(new Graph(lib_def_.get()));
+    CopyGraph(*gbody->graph, ret.get());
     return ret;
   }
 
-  Device* device_ = nullptr;
-  FunctionLibraryDefinition* lib_def_ = nullptr;
-  FunctionLibraryRuntime* lib_ = nullptr;
+  std::unique_ptr<Device> device_;
+  std::unique_ptr<FunctionLibraryDefinition> lib_def_;
+  std::unique_ptr<FunctionLibraryRuntime> lib_;
+  FunctionDefLibrary fdef_lib_;
 };
 
 TEST_F(FunctionLibraryRuntimeTest, IsStateful) {
@@ -254,113 +254,174 @@ TEST_F(FunctionLibraryRuntimeTest, XTimesN) {
   test::ExpectTensorEqual<float>(y, test::AsTensor<float>({16, 32, 48, 64}));
 }
 
+// Adds a function call to 'scope.
+// TODO(phawkins): replace with C++ API for calling functions, when that exists.
+Output Call(Scope* scope, const string& op_name, const string& fn_name,
+            gtl::ArraySlice<Input> inputs) {
+  NodeDef def;
+  NodeDefBuilder builder(op_name, fn_name, scope->graph()->op_registry());
+  for (const Input& input : inputs) {
+    builder.Input(input.node()->name(), input.index(),
+                  input.node()->output_type(input.index()));
+  }
+  TF_CHECK_OK(builder.Finalize(&def));
+  Status status;
+  Node* n = scope->graph()->AddNode(def, &status);
+  TF_CHECK_OK(status);
+  for (int i = 0; i < inputs.size(); ++i) {
+    scope->graph()->AddEdge(inputs[i].node(), inputs[i].index(), n, i);
+  }
+  return Output(n);
+}
+
 TEST_F(FunctionLibraryRuntimeTest, ExpandInlineFunctions) {
   Init({test::function::XTimesTwo(), test::function::XTimesFour(),
         test::function::XTimes16()});
-  Graph* g = GetFuncBody("XTimes16", {{"T", DT_FLOAT}});
+  std::unique_ptr<Graph> g = GetFuncBody("XTimes16", {{"T", DT_FLOAT}});
   ASSERT_TRUE(g != nullptr);
-  const char* e0 = R"P(
-(n2:float) -> (n4:float) {
-  n3 = XTimesFour[T=float](n2)
-  n4 = XTimesFour[T=float](n3)
-}
-)P";
-  EXPECT_EQ(e0, DebugString(g));
-
-  ExpandInlineFunctions(lib_, g);
-  const char* e1 = R"P(
-(n2:float) -> (n17:float) {
-  n10 = Identity[T=float](n2)
-  n7 = XTimesTwo[T=float](n10)
-  n8 = XTimesTwo[T=float](n7)
-  n11 = Identity[T=float](n8)
-  n16 = Identity[T=float](n11)
-  n13 = XTimesTwo[T=float](n16)
-  n14 = XTimesTwo[T=float](n13)
-  n17 = Identity[T=float](n14)
-}
-)P";
-  EXPECT_EQ(e1, DebugString(g));
-
-  ExpandInlineFunctions(lib_, g);
-  const char* e2 = R"P(
-(n2:float) -> (n17:float) {
-  n18 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n25 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n32 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n39 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n19 = Cast[DstT=float, SrcT=int64](n18)
-  n26 = Cast[DstT=float, SrcT=int64](n25)
-  n33 = Cast[DstT=float, SrcT=int64](n32)
-  n40 = Cast[DstT=float, SrcT=int64](n39)
-  n10 = Identity[T=float](n2)
-  n23 = Identity[T=float](n10)
-  n21 = Mul[T=float](n23, n19)
-  n24 = Identity[T=float](n21)
-  n30 = Identity[T=float](n24)
-  n28 = Mul[T=float](n30, n26)
-  n31 = Identity[T=float](n28)
-  n11 = Identity[T=float](n31)
-  n16 = Identity[T=float](n11)
-  n37 = Identity[T=float](n16)
-  n35 = Mul[T=float](n37, n33)
-  n38 = Identity[T=float](n35)
-  n44 = Identity[T=float](n38)
-  n42 = Mul[T=float](n44, n40)
-  n45 = Identity[T=float](n42)
-  n17 = Identity[T=float](n45)
-}
-)P";
-  EXPECT_EQ(e2, DebugString(g));
+
+  {
+    Scope s = Scope::NewRootScope();
+    TF_ASSERT_OK(s.graph()->AddFunctionLibrary(fdef_lib_));
+    auto arg = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto a = Call(&s, "x4", "XTimesFour", {arg});
+    auto b = Call(&s, "y", "XTimesFour", {a});
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), b, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
+
+  ExpandInlineFunctions(lib_.get(), g.get());
+  {
+    Scope s = Scope::NewRootScope();
+    TF_ASSERT_OK(s.graph()->AddFunctionLibrary(fdef_lib_));
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto func0 = ops::Identity(s.WithOpName("Func/_0"), x);
+    auto x4_x2 = Call(&s, "x4/x2", "XTimesTwo", {func0});
+    auto x4_y = Call(&s, "x4/y", "XTimesTwo", {x4_x2});
+    auto func1 = ops::Identity(s.WithOpName("Func/_1"), x4_y);
+    auto func2 = ops::Identity(s.WithOpName("Func/_2"), func1);
+    auto y_x2 = Call(&s, "y/x2", "XTimesTwo", {func2});
+    auto y_y = Call(&s, "y/y", "XTimesTwo", {y_x2});
+    auto func3 = ops::Identity(s.WithOpName("Func/_3"), y_y);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), func3, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
+
+  ExpandInlineFunctions(lib_.get(), g.get());
+  GraphDef e2;
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto x4_x2_two = ops::Const<int64>(s.WithOpName("x4/x2/two"), 2LL);
+    auto x4_y_two = ops::Const<int64>(s.WithOpName("x4/y/two"), 2LL);
+    auto y_x2_two = ops::Const<int64>(s.WithOpName("y/x2/two"), 2LL);
+    auto y_y_two = ops::Const<int64>(s.WithOpName("y/y/two"), 2LL);
+    auto x4_x2_scale =
+        ops::Cast(s.WithOpName("x4/x2/scale"), x4_x2_two, DT_FLOAT);
+    auto x4_y_scale = ops::Cast(s.WithOpName("x4/y/scale"), x4_y_two, DT_FLOAT);
+    auto y_x2_scale = ops::Cast(s.WithOpName("y/x2/scale"), y_x2_two, DT_FLOAT);
+    auto y_y_scale = ops::Cast(s.WithOpName("y/y/scale"), y_y_two, DT_FLOAT);
+    auto func0 = ops::Identity(s.WithOpName("Func/_0"), x);
+    auto func4 = ops::Identity(s.WithOpName("Func/_4"), func0);
+    auto x4_x2_y = ops::Mul(s.WithOpName("x4/x2/y"), func4, x4_x2_scale);
+    auto func5 = ops::Identity(s.WithOpName("Func/_5"), x4_x2_y);
+    auto func6 = ops::Identity(s.WithOpName("Func/_6"), func5);
+    auto x4_y_y = ops::Mul(s.WithOpName("x4/y/y"), func6, x4_y_scale);
+    auto func7 = ops::Identity(s.WithOpName("Func/_7"), x4_y_y);
+    auto func1 = ops::Identity(s.WithOpName("Func/_1"), func7);
+    auto func2 = ops::Identity(s.WithOpName("Func/_2"), func1);
+    auto func8 = ops::Identity(s.WithOpName("Func/_8"), func2);
+    auto y_x2_y = ops::Mul(s.WithOpName("y/x2/y"), func8, y_x2_scale);
+    auto func9 = ops::Identity(s.WithOpName("Func/_9"), y_x2_y);
+    auto func10 = ops::Identity(s.WithOpName("Func/_10"), func9);
+    auto y_y_y = ops::Mul(s.WithOpName("y/y/y"), func10, y_y_scale);
+    auto func11 = ops::Identity(s.WithOpName("Func/_11"), y_y_y);
+    auto func3 = ops::Identity(s.WithOpName("Func/_3"), func11);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), func3, 0);
+    TF_ASSERT_OK(s.ToGraphDef(&e2));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(e2, actual);
+  }
 
   // No further inlining.
-  ExpandInlineFunctions(lib_, g);
-  EXPECT_EQ(e2, DebugString(g));
+  ExpandInlineFunctions(lib_.get(), g.get());
+  {
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(e2, actual);
+  }
 
   // Get rid of redundant Identity nodes.
-  RemoveIdentityNodes(g);
-  const char* e3 = R"P(
-(n2:float) -> (n42:float) {
-  n18 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n25 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n32 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n39 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n19 = Cast[DstT=float, SrcT=int64](n18)
-  n26 = Cast[DstT=float, SrcT=int64](n25)
-  n33 = Cast[DstT=float, SrcT=int64](n32)
-  n40 = Cast[DstT=float, SrcT=int64](n39)
-  n21 = Mul[T=float](n2, n19)
-  n28 = Mul[T=float](n21, n26)
-  n35 = Mul[T=float](n28, n33)
-  n42 = Mul[T=float](n35, n40)
-}
-)P";
-  EXPECT_EQ(e3, DebugString(g));
-  delete g;
+  RemoveIdentityNodes(g.get());
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto x4_x2_two = ops::Const<int64>(s.WithOpName("x4/x2/two"), 2LL);
+    auto x4_y_two = ops::Const<int64>(s.WithOpName("x4/y/two"), 2LL);
+    auto y_x2_two = ops::Const<int64>(s.WithOpName("y/x2/two"), 2LL);
+    auto y_y_two = ops::Const<int64>(s.WithOpName("y/y/two"), 2LL);
+    auto x4_x2_scale =
+        ops::Cast(s.WithOpName("x4/x2/scale"), x4_x2_two, DT_FLOAT);
+    auto x4_y_scale = ops::Cast(s.WithOpName("x4/y/scale"), x4_y_two, DT_FLOAT);
+    auto y_x2_scale = ops::Cast(s.WithOpName("y/x2/scale"), y_x2_two, DT_FLOAT);
+    auto y_y_scale = ops::Cast(s.WithOpName("y/y/scale"), y_y_two, DT_FLOAT);
+    auto x4_x2_y = ops::Mul(s.WithOpName("x4/x2/y"), x, x4_x2_scale);
+    auto x4_y_y = ops::Mul(s.WithOpName("x4/y/y"), x4_x2_y, x4_y_scale);
+    auto y_x2_y = ops::Mul(s.WithOpName("y/x2/y"), x4_y_y, y_x2_scale);
+    auto y_y_y = ops::Mul(s.WithOpName("y/y/y"), y_x2_y, y_y_scale);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), y_y_y, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 }
 
 TEST_F(FunctionLibraryRuntimeTest, OptimizeGraph) {
   Init({test::function::XTimesTwo(), test::function::XTimesFour(),
         test::function::XTimes16()});
-  std::unique_ptr<Graph> g(GetFuncBody("XTimes16", {{"T", DT_FLOAT}}));
+  std::unique_ptr<Graph> g = GetFuncBody("XTimes16", {{"T", DT_FLOAT}});
   ASSERT_TRUE(g != nullptr);
-  ExpandInlineFunctions(lib_, g.get());
-  OptimizeGraph(lib_, &g);
-  const char* e0 = R"P(
-(n2:float) -> (n7:float) {
-  n8 = Const[dtype=float, value=Tensor<type: float shape: [] values: 2>]()
-  n4 = Mul[T=float](n2, n8)
-  n5 = Mul[T=float](n4, n8)
-  n6 = Mul[T=float](n5, n8)
-  n7 = Mul[T=float](n6, n8)
-}
-)P";
-  EXPECT_EQ(e0, DebugString(g.get()));
+  ExpandInlineFunctions(lib_.get(), g.get());
+  OptimizeGraph(lib_.get(), &g);
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto x4_x2_scale = ops::Const<float>(
+        s.WithOpName("x4/x2/scale/_12__cf__2")
+            .WithDevice("/job:localhost/replica:0/task:0/cpu:0"),
+        2.0f);
+    auto x4_x2_y = ops::Mul(s.WithOpName("x4/x2/y"), x, x4_x2_scale);
+    auto x4_y_y = ops::Mul(s.WithOpName("x4/y/y"), x4_x2_y, x4_x2_scale);
+    auto y_x2_y = ops::Mul(s.WithOpName("y/x2/y"), x4_y_y, x4_x2_scale);
+    auto y_y_y = ops::Mul(s.WithOpName("y/y/y"), y_x2_y, x4_x2_scale);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), y_y_y, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 }
 
 TEST_F(FunctionLibraryRuntimeTest, ManySwapsNodeDef) {
   auto func = FDH::Create(  // Creates a FunctionDef using NodeDefs
-      // Name
+                            // Name
       "ManySwapsNodeDef",
       // Input
       {"x: float", "y: float"},
@@ -379,9 +440,9 @@ TEST_F(FunctionLibraryRuntimeTest, ManySwapsNodeDef) {
       // Return
       {{"o", "g:output"}});
   Init({test::function::Swap(), func});
-  std::unique_ptr<Graph> g(GetFuncBody("ManySwapsNodeDef", {}));
+  std::unique_ptr<Graph> g = GetFuncBody("ManySwapsNodeDef", {});
   ASSERT_TRUE(g != nullptr);
-  OptimizeGraph(lib_, &g);
+  OptimizeGraph(lib_.get(), &g);
   const char* e0 = R"P(
 (n3:float, n2:float) -> (n3:float) {
 }
@@ -412,24 +473,35 @@ TEST_F(FunctionLibraryRuntimeTest, ControlDeps) {
        {{"o"}, "Add", {"x2:z:0", "y2:z:0"}, {{"T", DT_FLOAT}}}},
       {{"o", "o:z:0"}});
   Init({test::function::Swap(), func});
-  std::unique_ptr<Graph> g(GetFuncBody("ManySwapsFirst", {}));
+  std::unique_ptr<Graph> g = GetFuncBody("ManySwapsFirst", {});
   ASSERT_TRUE(g != nullptr);
-  OptimizeGraph(lib_, &g);
+  OptimizeGraph(lib_.get(), &g);
 
-  // NOTE: We can remove n8, n9, n10, n11 with a control edge n8->n5.
+  // NOTE: We can remove func0, func1, func2, func9 with a control edge n8->n5.
   // But we don't have a pass doing that.
-  const char* e0 = R"P(
-(n3:float, n2:float) -> (n6:float) {
-  n4 = Mul[T=float](n3, n3)
-  n8 = NoOp() @ n4
-  n9 = Identity[T=float](n3) @ n8
-  n10 = Identity[T=float](n2) @ n8
-  n11 = NoOp() @ n9, n10
-  n5 = Mul[T=float](n2, n2) @ n11
-  n6 = Add[T=float](n4, n5)
-}
-)P";
-  EXPECT_EQ(e0, DebugString(g.get()));
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto y = ops::_Arg(s.WithOpName("y"), DT_FLOAT, 1);
+    auto x2 = ops::Mul(s.WithOpName("x2"), x, x);
+    auto func0 = ops::NoOp(s.WithOpName("Func/_0").WithControlDependencies(x2));
+    auto func1 = ops::Identity(
+        s.WithOpName("Func/_1").WithControlDependencies({func0}), x);
+    auto func2 = ops::Identity(
+        s.WithOpName("Func/_2").WithControlDependencies({func0}), y);
+    auto func9 = ops::NoOp(s.WithOpName("Func/_9").WithControlDependencies(
+        {func1.output.op(), func2.output.op()}));
+    auto y2 =
+        ops::Mul(s.WithOpName("y2").WithControlDependencies({func9}), y, y);
+    auto o = ops::Add(s.WithOpName("o"), x2, y2);
+    auto ret = ops::_Retval(s.WithOpName("o_RetVal"), o, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 }
 
 TEST_F(FunctionLibraryRuntimeTest, Error_NotFound) {
@@ -476,84 +548,136 @@ TEST_F(FunctionLibraryRuntimeTest, Error_InstantiaionError) {
 TEST_F(FunctionLibraryRuntimeTest, Gradient_XTimesTwo) {
   Init({test::function::XTimesTwo(), test::function::XTimesFour(),
         test::function::XTimes16()});
-  auto f = GetFuncBody("XTimesTwo", {{"T", DT_FLOAT}});
-  const char* e0 = R"P(
-(n4:float) -> (n5:float) {
-  n2 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n3 = Cast[DstT=float, SrcT=int64](n2)
-  n5 = Mul[T=float](n4, n3)
-}
-)P";
-  EXPECT_EQ(e0, DebugString(f));
-  delete f;
-  std::unique_ptr<Graph> g(GetGradBody("XTimesTwo", {{"T", DT_FLOAT}}));
-  const char* e1 = R"P(
-(n4:float, n6:float) -> (n7:float) {
-  n2 = Const[dtype=int64, value=Tensor<type: int64 shape: [] values: 2>]()
-  n3 = Cast[DstT=float, SrcT=int64](n2)
-  n5 = Mul[T=float](n4, n3)
-  n7 = SymbolicGradient[Tin={float, float, float}, Tout={float, float}, f=Mul[T=float]](n4, n3, n6)
-}
-)P";
-  EXPECT_EQ(e1, DebugString(g.get()));
-
-  OptimizeGraph(lib_, &g);
-  const char* e2 = R"P(
-(n2:float, n3:float) -> (n9:float) {
-  n10 = Const[dtype=float, value=Tensor<type: float shape: [] values: 2>]()
-  n11 = Const[dtype=int32, value=Tensor<type: int32 shape: [0] values: >]()
-  n6 = Shape[T=float, out_type=int32](n2)
-  n5 = Mul[T=float](n3, n10)
-  n7 = BroadcastGradientArgs[T=int32](n6, n11)
-  n8 = Sum[T=float, Tidx=int32, keep_dims=false](n5, n7)
-  n9 = Reshape[T=float, Tshape=int32](n8, n6)
-}
-)P";
-  EXPECT_EQ(e2, DebugString(g.get()));
+  std::unique_ptr<Graph> f = GetFuncBody("XTimesTwo", {{"T", DT_FLOAT}});
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto two = ops::Const(s.WithOpName("two"), 2LL);
+    auto scale = ops::Cast(s.WithOpName("scale"), two, DT_FLOAT);
+    auto y = ops::Mul(s.WithOpName("y"), x, scale);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), y, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    f->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
+
+  std::unique_ptr<Graph> g = GetGradBody("XTimesTwo", {{"T", DT_FLOAT}});
+
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto func0 = ops::_Arg(s.WithOpName("Func/_0"), DT_FLOAT, 1);
+    auto two = ops::Const(s.WithOpName("two"), 2LL);
+    auto scale = ops::Cast(s.WithOpName("scale"), two, DT_FLOAT);
+    auto y = ops::Mul(s.WithOpName("y"), x, scale);
+    NameAttrList fn;
+    fn.set_name("Mul");
+    (*fn.mutable_attr())["T"].set_type(DT_FLOAT);
+    auto func1 = ops::SymbolicGradient(
+        s.WithOpName("Func/_1"), std::initializer_list<Input>{x, scale, func0},
+        {DT_FLOAT, DT_FLOAT}, fn);
+    auto func2 = ops::_Retval(s.WithOpName("Func/_2"), func1[0], 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
+
+  OptimizeGraph(lib_.get(), &g);
+
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto func0 = ops::_Arg(s.WithOpName("Func/_0"), DT_FLOAT, 1);
+    auto scale =
+        ops::Const(s.WithOpName("scale/_5__cf__6")
+                       .WithDevice("/job:localhost/replica:0/task:0/cpu:0"),
+                   2.0f);
+    auto func1_gx = ops::Mul(s.WithOpName("Func/_1/gx"), func0, scale);
+    auto func1_sx = ops::Shape(s.WithOpName("Func/_1/sx"), x);
+    auto const0 =
+        ops::Const(s.WithOpName("Func/_1/sy/_6__cf__7")
+                       .WithDevice("/job:localhost/replica:0/task:0/cpu:0"),
+                   0, {0});
+    auto func1_rx = ops::internal::BroadcastGradientArgs(
+        s.WithOpName("Func/_1/rx"), func1_sx, const0);
+    auto func1_sum_gx =
+        ops::Sum(s.WithOpName("Func/_1/sum_gx"), func1_gx, func1_rx.r0);
+    auto func1_dx =
+        ops::Reshape(s.WithOpName("Func/_1/dx"), func1_sum_gx, func1_sx);
+    auto func2 = ops::_Retval(s.WithOpName("Func/_2"), func1_dx, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 }
 
 TEST_F(FunctionLibraryRuntimeTest, Gradient_Add) {
   Init({});
   auto T = DT_FLOAT;
-  auto g = GetFuncBody("SymbolicGradient",
-                       {{"f", FDH::FunctionRef("Add", {{"T", T}})}});
-  const char* e0 = R"P(
-(n7:float, n5:float, n2:float) -> (n14:float, n11:float) {
-  n3 = Identity[T=float](n2)
-  n4 = Identity[T=float](n2)
-  n6 = Shape[T=float, out_type=int32](n5)
-  n8 = Shape[T=float, out_type=int32](n7)
-  n9 = BroadcastGradientArgs[T=int32](n8, n6)
-  n10 = Sum[T=float, Tidx=int32, keep_dims=false](n3, n9:1)
-  n13 = Sum[T=float, Tidx=int32, keep_dims=false](n4, n9)
-  n11 = Reshape[T=float, Tshape=int32](n10, n6)
-  n14 = Reshape[T=float, Tshape=int32](n13, n8)
-}
-)P";
-  EXPECT_EQ(e0, DebugString(g));
-  delete g;
+  std::unique_ptr<Graph> g = GetFuncBody(
+      "SymbolicGradient", {{"f", FDH::FunctionRef("Add", {{"T", T}})}});
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto y = ops::_Arg(s.WithOpName("y"), DT_FLOAT, 1);
+    auto dz = ops::_Arg(s.WithOpName("dz"), DT_FLOAT, 2);
+    auto gx = ops::Identity(s.WithOpName("gx"), dz);
+    auto gy = ops::Identity(s.WithOpName("gy"), dz);
+    auto sx = ops::Shape(s.WithOpName("sx"), x);
+    auto sy = ops::Shape(s.WithOpName("sy"), y);
+    auto rx = ops::internal::BroadcastGradientArgs(s.WithOpName("rx"), sx, sy);
+    auto sum_gx = ops::Sum(s.WithOpName("sum_gx"), gx, rx.r0);
+    auto sum_gy = ops::Sum(s.WithOpName("sum_gy"), gy, rx.r1);
+    auto dx = ops::Reshape(s.WithOpName("dx"), sum_gx, sx);
+    auto dy = ops::Reshape(s.WithOpName("dy"), sum_gy, sy);
+    auto dx_ret = ops::_Retval(s.WithOpName("dx_RetVal"), dx, 0);
+    auto dy_ret = ops::_Retval(s.WithOpName("dy_RetVal"), dy, 1);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 }
 
 TEST_F(FunctionLibraryRuntimeTest, Gradient_Mul) {
   Init({});
   auto T = DT_FLOAT;
-  auto g = GetFuncBody("SymbolicGradient",
-                       {{"f", FDH::FunctionRef("Mul", {{"T", T}})}});
-  const char* e0 = R"P(
-(n6:float, n3:float, n2:float) -> (n14:float, n11:float) {
-  n4 = Mul[T=float](n2, n3)
-  n5 = Shape[T=float, out_type=int32](n3)
-  n7 = Mul[T=float](n6, n2)
-  n8 = Shape[T=float, out_type=int32](n6)
-  n9 = BroadcastGradientArgs[T=int32](n8, n5)
-  n10 = Sum[T=float, Tidx=int32, keep_dims=false](n7, n9:1)
-  n13 = Sum[T=float, Tidx=int32, keep_dims=false](n4, n9)
-  n11 = Reshape[T=float, Tshape=int32](n10, n5)
-  n14 = Reshape[T=float, Tshape=int32](n13, n8)
-}
-)P";
-  EXPECT_EQ(e0, DebugString(g));
-  delete g;
+  std::unique_ptr<Graph> g = GetFuncBody(
+      "SymbolicGradient", {{"f", FDH::FunctionRef("Mul", {{"T", T}})}});
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto y = ops::_Arg(s.WithOpName("y"), DT_FLOAT, 1);
+    auto dz = ops::_Arg(s.WithOpName("dz"), DT_FLOAT, 2);
+    auto gx = ops::Mul(s.WithOpName("gx"), dz, y);
+    auto sx = ops::Shape(s.WithOpName("sx"), x);
+    auto gy = ops::Mul(s.WithOpName("gy"), x, dz);
+    auto sy = ops::Shape(s.WithOpName("sy"), y);
+    auto rx = ops::internal::BroadcastGradientArgs(s.WithOpName("rx"), sx, sy);
+    auto sum_gx = ops::Sum(s.WithOpName("sum_gx"), gx, rx.r0);
+    auto sum_gy = ops::Sum(s.WithOpName("sum_gy"), gy, rx.r1);
+    auto dx = ops::Reshape(s.WithOpName("dx"), sum_gx, sx);
+    auto dy = ops::Reshape(s.WithOpName("dy"), sum_gy, sy);
+    auto dx_ret = ops::_Retval(s.WithOpName("dx_RetVal"), dx, 0);
+    auto dy_ret = ops::_Retval(s.WithOpName("dy_RetVal"), dy, 1);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 }
 
 TEST_F(FunctionLibraryRuntimeTest, Gradient_AddSum) {
@@ -570,108 +694,170 @@ TEST_F(FunctionLibraryRuntimeTest, Gradient_AddSum) {
                           });
 
   // TestGrad = Test'(x, y)
-  auto grad =
-      FDH::Define("TestGrad", {"x:float", "y:float"}, {"dx:float", "dy:float"},
-                  {}, {FDH::Const<float>("dz", 1),
-                       {{"grad0", "grad1"},
-                        "SymbolicGradient",
-                        {"x", "y", "dz"},
-                        {
-                            {"f", FDH::FunctionRef("Test")},
-                            {"Tin", DataTypeSlice{T, T, T}},
-                            {"Tout", DataTypeSlice{T, T}},
-                        }},
-                       {{"dx"}, "Identity", {"grad0"}, {{"T", DT_FLOAT}}},
-                       {{"dy"}, "Identity", {"grad1"}, {{"T", DT_FLOAT}}}});
+  auto grad = FDH::Define("TestGrad", {"x:float", "y:float"},
+                          {"dx:float", "dy:float"}, {},
+                          {FDH::Const<float>("dz", 1),
+                           {{"grad0", "grad1"},
+                            "SymbolicGradient",
+                            {"x", "y", "dz"},
+                            {
+                                {"f", FDH::FunctionRef("Test")},
+                                {"Tin", DataTypeSlice{T, T, T}},
+                                {"Tout", DataTypeSlice{T, T}},
+                            }},
+                           {{"dx"}, "Identity", {"grad0"}, {{"T", DT_FLOAT}}},
+                           {{"dy"}, "Identity", {"grad1"}, {{"T", DT_FLOAT}}}});
 
   Init({test, grad});
 
-  std::unique_ptr<Graph> g(GetFuncBody("TestGrad", {}));
+  std::unique_ptr<Graph> g = GetFuncBody("TestGrad", {});
   ASSERT_TRUE(g != nullptr);
-  const char* e0 = R"P(
-(n4:float, n3:float) -> (n8:float, n6:float) {
-  n2 = Const[dtype=float, value=Tensor<type: float shape: [] values: 1>]()
-  n5 = SymbolicGradient[Tin={float, float, float}, Tout={float, float}, f=Test](n4, n3, n2)
-  n6 = Identity[T=float](n5:1)
-  n8 = Identity[T=float](n5)
-}
-)P";
-  EXPECT_EQ(e0, DebugString(g.get()));
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto y = ops::_Arg(s.WithOpName("y"), DT_FLOAT, 1);
+    auto dz = ops::Const(s.WithOpName("dz"), 1.0f);
+    NameAttrList fn;
+    fn.set_name("Test");
+    auto grad0 = ops::SymbolicGradient(s.WithOpName("grad0"),
+                                       std::initializer_list<Input>{x, y, dz},
+                                       {DT_FLOAT, DT_FLOAT}, fn);
+    auto dx = ops::Identity(s.WithOpName("dx"), grad0[0]);
+    auto dy = ops::Identity(s.WithOpName("dy"), grad0[1]);
+    auto dx_retval = ops::_Retval(s.WithOpName("dx_RetVal"), dx, 0);
+    auto dy_retval = ops::_Retval(s.WithOpName("dy_RetVal"), dy, 1);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 
-  ExpandInlineFunctions(lib_, g.get());
-  const char* e1 = R"P(
-(n4:float, n3:float) -> (n8:float, n6:float) {
-  n10 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  n11 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n2 = Const[dtype=float, value=Tensor<type: float shape: [] values: 1>]()
-  n26 = Identity[T=float](n2)
-  n25 = Identity[T=float](n3)
-  n24 = Identity[T=float](n4)
-  n14 = Add[T=float](n24, n25)
-  n15 = Rank[T=float](n14)
-  n16 = Range[Tidx=int32](n11, n15, n10)
-  n20 = ZerosLike[T=int32](n15)
-  n17 = Sum[T=float, Tidx=int32, keep_dims=false](n14, n16)
-  n19 = SymbolicGradient[Tin={float, int32, float}, Tout={float, int32}, f=Sum[T=float, Tidx=int32, keep_dims=false]](n14, n16, n26)
-  n21 = SymbolicGradient[Tin={float, float, float}, Tout={float, float}, f=Add[T=float]](n24, n25, n19)
-  n27 = Identity[T=float](n21)
-  n28 = Identity[T=float](n21:1)
-  n8 = Identity[T=float](n27)
-  n6 = Identity[T=float](n28)
-}
-)P";
-  EXPECT_EQ(e1, DebugString(g.get()));
-
-  OptimizeGraph(lib_, &g);
-  const char* e2 = R"P(
-(n4:float, n3:float) -> (n25:float, n23:float) {
-  n2 = Const[dtype=float, value=Tensor<type: float shape: [] values: 1>]()
-  n7 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  n8 = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  n19 = Shape[T=float, out_type=int32](n3)
-  n9 = Add[T=float](n4, n3)
-  n20 = Shape[T=float, out_type=int32](n4)
-  n10 = Rank[T=float](n9)
-  n14 = Shape[T=float, out_type=int32](n9)
-  n21 = BroadcastGradientArgs[T=int32](n20, n19)
-  n11 = Range[Tidx=int32](n8, n10, n7)
-  n12 = Shape[T=int32, out_type=int32](n11)
-  n13 = Fill[T=int32](n12, n7)
-  n15 = DynamicStitch[N=2, T=int32](n11, n11, n14, n13)
-  n16 = Reshape[T=float, Tshape=int32](n2, n15)
-  n17 = Div[T=int32](n14, n15)
-  n18 = Tile[T=float, Tmultiples=int32](n16, n17)
-  n22 = Sum[T=float, Tidx=int32, keep_dims=false](n18, n21:1)
-  n24 = Sum[T=float, Tidx=int32, keep_dims=false](n18, n21)
-  n23 = Reshape[T=float, Tshape=int32](n22, n19)
-  n25 = Reshape[T=float, Tshape=int32](n24, n20)
-}
-)P";
-  EXPECT_EQ(e2, DebugString(g.get()));
+  ExpandInlineFunctions(lib_.get(), g.get());
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto y = ops::_Arg(s.WithOpName("y"), DT_FLOAT, 1);
+    auto dz = ops::Const(s.WithOpName("dz"), 1.0f);
+    auto grad0_zero = ops::Const(s.WithOpName("grad0/zero"), 0);
+    auto grad0_one = ops::Const(s.WithOpName("grad0/one"), 1);
+    auto func0 = ops::Identity(s.WithOpName("Func/_0"), x);
+    auto func1 = ops::Identity(s.WithOpName("Func/_1"), y);
+    auto func2 = ops::Identity(s.WithOpName("Func/_2"), dz);
+    auto grad0_z = ops::Add(s.WithOpName("grad0/z"), func0, func1);
+    auto grad0_r = ops::Rank(s.WithOpName("grad0/r"), grad0_z);
+    auto grad0_indices = ops::Range(s.WithOpName("grad0/indices"), grad0_zero,
+                                    grad0_r, grad0_one);
+    auto grad0_l = ops::Sum(s.WithOpName("grad0/l"), grad0_z, grad0_indices);
+
+    NameAttrList sum;
+    sum.set_name("Sum");
+    (*sum.mutable_attr())["T"].set_type(DT_FLOAT);
+    (*sum.mutable_attr())["Tidx"].set_type(DT_INT32);
+    (*sum.mutable_attr())["keep_dims"].set_b(false);
+    auto grad0_func1 = ops::SymbolicGradient(
+        s.WithOpName("grad0/Func/_1"),
+        std::initializer_list<Input>{grad0_z, grad0_indices, func2},
+        {DT_FLOAT, DT_INT32}, sum);
+
+    auto grad0_func2 = ops::ZerosLike(s.WithOpName("grad0/Func/_2"), grad0_r);
+
+    NameAttrList add;
+    add.set_name("Add");
+    (*add.mutable_attr())["T"].set_type(DT_FLOAT);
+    auto grad0_func3 = ops::SymbolicGradient(
+        s.WithOpName("grad0/Func/_3"),
+        std::initializer_list<Input>{func0, func1, grad0_func1[0]},
+        {DT_FLOAT, DT_FLOAT}, add);
+
+    auto func3 = ops::Identity(s.WithOpName("Func/_3"), grad0_func3[0]);
+    auto func4 = ops::Identity(s.WithOpName("Func/_4"), grad0_func3[1]);
+    auto dx = ops::Identity(s.WithOpName("dx"), func3);
+    auto dy = ops::Identity(s.WithOpName("dy"), func4);
+    auto dx_retval = ops::_Retval(s.WithOpName("dx_RetVal"), dx, 0);
+    auto dy_retval = ops::_Retval(s.WithOpName("dy_RetVal"), dy, 1);
+
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
+
+  OptimizeGraph(lib_.get(), &g);
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_FLOAT, 0);
+    auto y = ops::_Arg(s.WithOpName("y"), DT_FLOAT, 1);
+    auto dz = ops::Const(s.WithOpName("dz"), 1.0f);
+    auto grad0_zero = ops::Const(s.WithOpName("grad0/zero"), 0);
+    auto grad0_one = ops::Const(s.WithOpName("grad0/one"), 1);
+    auto grad0_z = ops::Add(s.WithOpName("grad0/z"), x, y);
+    auto grad0_r = ops::Rank(s.WithOpName("grad0/r"), grad0_z);
+    auto grad0_indices = ops::Range(s.WithOpName("grad0/indices"), grad0_zero,
+                                    grad0_r, grad0_one);
+    auto i_shape =
+        ops::Shape(s.WithOpName("grad0/Func/_1/i_shape"), grad0_indices);
+    auto stitch_val = ops::Fill(s.WithOpName("grad0/Func/_1/stitch_val1"),
+                                i_shape, grad0_one);
+    auto x_shape = ops::Shape(s.WithOpName("grad0/Func/_1/x_shape"), grad0_z);
+    auto y_shape = ops::DynamicStitch(
+        s.WithOpName("grad0/Func/_1/y_shape"),
+        std::initializer_list<Input>{grad0_indices, grad0_indices},
+        std::initializer_list<Input>{x_shape, stitch_val});
+    auto dy_reshaped =
+        ops::Reshape(s.WithOpName("grad0/Func/_1/dy_reshaped"), dz, y_shape);
+    auto tile_scaling =
+        ops::Div(s.WithOpName("grad0/Func/_1/tile_scaling"), x_shape, y_shape);
+    auto func1_dx =
+        ops::Tile(s.WithOpName("grad0/Func/_1/dx"), dy_reshaped, tile_scaling);
+
+    auto sx = ops::Shape(s.WithOpName("grad0/Func/_3/sx"), x);
+    auto sy = ops::Shape(s.WithOpName("grad0/Func/_3/sy"), y);
+    auto rx = ops::internal::BroadcastGradientArgs(
+        s.WithOpName("grad0/Func/_3/rx"), sx, sy);
+    auto sum_gx =
+        ops::Sum(s.WithOpName("grad0/Func/_3/sum_gx"), func1_dx, rx.r0);
+    auto sum_gy =
+        ops::Sum(s.WithOpName("grad0/Func/_3/sum_gy"), func1_dx, rx.r1);
+    auto dx = ops::Reshape(s.WithOpName("grad0/Func/_3/dx"), sum_gx, sx);
+    auto dy = ops::Reshape(s.WithOpName("grad0/Func/_3/dy"), sum_gy, sy);
+
+    auto dx_retval = ops::_Retval(s.WithOpName("dx_RetVal"), dx, 0);
+    auto dy_retval = ops::_Retval(s.WithOpName("dy_RetVal"), dy, 1);
+
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
 }
 
 namespace {
 
 bool DoNothing(Graph* g) { return false; }
 
-string Optimize(const std::function<bool(Graph* g)>& pass,
-                const FunctionDef& fdef) {
+GraphDef Optimize(const std::function<bool(Graph* g)>& pass,
+                  const FunctionDef& fdef) {
   InstantiationResult result;
   InstantiateAttrValueMap empty;
   TF_CHECK_OK(InstantiateFunction(fdef, empty, GetOpSig, &result));
-  Graph* g = new Graph(OpRegistry::Global());
+  std::unique_ptr<Graph> g(new Graph(OpRegistry::Global()));
   GraphConstructorOptions opts;
   opts.allow_internal_ops = true;
   opts.expect_device_spec = false;
-  TF_CHECK_OK(ConvertGraphDefToGraph(opts, result.gdef, g));
-  pass(g);
-  Graph* g1 = new Graph(OpRegistry::Global());
-  CopyGraph(*g, g1);
-  delete g;
+  TF_CHECK_OK(ConvertGraphDefToGraph(opts, result.gdef, g.get()));
+  pass(g.get());
+  std::unique_ptr<Graph> g1(new Graph(OpRegistry::Global()));
+  CopyGraph(*g, g1.get());
+  g = nullptr;
   GraphDef gdef;
   g1->ToGraphDef(&gdef);
-  delete g1;
-  return DebugString(gdef);
+  return gdef;
 }
 
 }  // end namespace
@@ -700,21 +886,25 @@ TEST(OptimizationTest, RemoveDeadNodes) {
        {{"keep_me"}, "RandomUniform", {"o"}, {{"T", T}, {"dtype", DT_FLOAT}}},
        // y = Add<T>(a, o)
        {{"y"}, "Add", {"a", "o"}, {{"T", T}}}});
-  const char* e0 = R"S(
-(x:int32) -> (y:int32) {
-  o = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  keep_me = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](o)
-  x1 = Add[T=int32](o, o)
-  a = Square[T=int32](x)
-  y = Add[T=int32](a, o)
-  x2 = Mul[T=int32](a, x1)
-  x3 = Mul[T=int32](x1, x2)
-}
-)S";
-  EXPECT_EQ(Optimize(DoNothing, func), e0);
+
+  GraphDef expected;
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_INT32, 0);
+    auto o = ops::Const(s.WithOpName("o"), 1);
+    auto keep_me = ops::RandomUniform(s.WithOpName("keep_me"), {o}, DT_FLOAT);
+    auto x1 = ops::Add(s.WithOpName("x1"), o, o);
+    auto a = ops::Square(s.WithOpName("a"), x);
+    auto y = ops::Add(s.WithOpName("y"), a, o);
+    auto x2 = ops::Mul(s.WithOpName("x2"), a, x1);
+    auto x3 = ops::Mul(s.WithOpName("x3"), x1, x2);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), y, 0);
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+  }
+  TF_EXPECT_GRAPH_EQ(expected, Optimize(DoNothing, func));
 
   // TODO(zhifengc): Comes up another test case.
-  EXPECT_EQ(Optimize(::tensorflow::RemoveDeadNodes, func), e0);
+  TF_EXPECT_GRAPH_EQ(expected, Optimize(::tensorflow::RemoveDeadNodes, func));
 }
 
 TEST(OptimizationTest, RemoveIdentityNodes_Ref) {
@@ -735,23 +925,19 @@ TEST(OptimizationTest, RemoveIdentityNodes_Ref) {
        {{"v_read"}, "Identity", {"v"}, {{"T", T}}},
        // returns v + v
        {{"ret"}, "Add", {"v_read", "v_read"}, {{"T", T}}}});
-  const char* e0 = R"S(
-() -> (ret:float) {
-  v = VariableV2[container="", dtype=float, shape=[], shared_name=""]()
-  v_read = Identity[T=float](v)
-  ret = Add[T=float](v_read, v_read)
-}
-)S";
-  EXPECT_EQ(Optimize(DoNothing, func), e0);
-
-  const char* e1 = R"S(
-() -> (ret:float) {
-  v = VariableV2[container="", dtype=float, shape=[], shared_name=""]()
-  v_read = Identity[T=float](v)
-  ret = Add[T=float](v_read, v_read)
-}
-)S";
-  EXPECT_EQ(Optimize(::tensorflow::RemoveIdentityNodes, func), e1);
+
+  GraphDef expected;
+  {
+    Scope s = Scope::NewRootScope();
+    auto v = ops::Variable(s.WithOpName("v"), PartialTensorShape({}), DT_FLOAT);
+    auto v_read = ops::Identity(s.WithOpName("v_read"), v);
+    auto ret = ops::Add(s.WithOpName("ret"), v_read, v_read);
+    auto ret_retval = ops::_Retval(s.WithOpName("ret_RetVal"), ret, 0);
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+  }
+  TF_EXPECT_GRAPH_EQ(expected, Optimize(DoNothing, func));
+  TF_EXPECT_GRAPH_EQ(expected,
+                     Optimize(::tensorflow::RemoveIdentityNodes, func));
 }
 
 TEST(OptimizationTest, RemoveIdentityNodes) {
@@ -782,28 +968,38 @@ TEST(OptimizationTest, RemoveIdentityNodes) {
         {"x3"}},
        // y = Add<T>(a, o)
        {{"y"}, "Add", {"a", "o"}, {{"T", T}}}});
-  const char* e0 = R"S(
-(x:int32) -> (y:int32) {
-  o = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  a = Square[T=int32](x)
-  y = Add[T=int32](a, o)
-  x1 = Identity[T=int32](a)
-  x2 = Identity[T=int32](x1)
-  x3 = Identity[T=int32](x2)
-  keep_me = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](o) @ x3
-}
-)S";
-  EXPECT_EQ(Optimize(DoNothing, func), e0);
-
-  const char* e1 = R"S(
-(x:int32) -> (y:int32) {
-  o = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 1>]()
-  a = Square[T=int32](x)
-  y = Add[T=int32](a, o)
-  keep_me = RandomUniform[T=int32, dtype=float, seed2=0, seed=0](o) @ a
-}
-)S";
-  EXPECT_EQ(Optimize(::tensorflow::RemoveIdentityNodes, func), e1);
+
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_INT32, 0);
+    auto o = ops::Const(s.WithOpName("o"), 1);
+    auto a = ops::Square(s.WithOpName("a"), x);
+    auto y = ops::Add(s.WithOpName("y"), a, o);
+    auto x1 = ops::Identity(s.WithOpName("x1"), a);
+    auto x2 = ops::Identity(s.WithOpName("x2"), x1);
+    auto x3 = ops::Identity(s.WithOpName("x3"), x2);
+    auto keep_me = ops::RandomUniform(
+        s.WithOpName("keep_me").WithControlDependencies(x3), {o}, DT_FLOAT);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), y, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+    TF_EXPECT_GRAPH_EQ(expected, Optimize(DoNothing, func));
+  }
+
+  {
+    Scope s = Scope::NewRootScope();
+    auto x = ops::_Arg(s.WithOpName("x"), DT_INT32, 0);
+    auto o = ops::Const(s.WithOpName("o"), 1);
+    auto a = ops::Square(s.WithOpName("a"), x);
+    auto y = ops::Add(s.WithOpName("y"), a, o);
+    auto keep_me = ops::RandomUniform(
+        s.WithOpName("keep_me").WithControlDependencies(a), {o}, DT_FLOAT);
+    auto ret = ops::_Retval(s.WithOpName("y_RetVal"), y, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+    TF_EXPECT_GRAPH_EQ(expected,
+                       Optimize(::tensorflow::RemoveIdentityNodes, func));
+  }
 }
 
 TEST(OptimizationTest, RemoveListArrayConverter) {
@@ -840,49 +1036,63 @@ TEST(OptimizationTest, RemoveListArrayConverter) {
       // Return values
       {{"o", "o:sum"}});
 
-  const char* e0 = R"P(
-(i:float) -> (o:float) {
-  zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  s = Split[T=float, num_split=4](zero, i)
-  a = _ArrayToList[N=4, T=float, out_types={float, float, float, float}](s, s:1, s:2, s:3)
-  r = Mul[T=float](a:2, a:3)
-  l = Mul[T=float](a, a:1)
-  x = _ListToArray[N=2, T=float, Tin={float, float}](l, r)
-  o = AddN[N=2, T=float](x, x:1)
-}
-)P";
-  EXPECT_EQ(Optimize(DoNothing, func), e0);
-
-  const char* e1 = R"P(
-(i:float) -> (o:float) {
-  zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  s = Split[T=float, num_split=4](zero, i)
-  r = Mul[T=float](Func/_2, Func/_3)
-  l = Mul[T=float](Func/_0, Func/_1)
-  o = AddN[N=2, T=float](Func/_4, Func/_5)
-  Func/_0 = Identity[T=float](s)
-  Func/_1 = Identity[T=float](s:1)
-  Func/_2 = Identity[T=float](s:2)
-  Func/_3 = Identity[T=float](s:3)
-  Func/_4 = Identity[T=float](l)
-  Func/_5 = Identity[T=float](r)
-}
-)P";
-  EXPECT_EQ(Optimize(RemoveListArrayConverter, func), e1);
-
-  const char* e2 = R"P(
-(i:float) -> (o:float) {
-  zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  s = Split[T=float, num_split=4](zero, i)
-  r = Mul[T=float](s:2, s:3)
-  l = Mul[T=float](s, s:1)
-  o = AddN[N=2, T=float](l, r)
-}
-)P";
-  auto remove_listarray_and_identity = [](Graph* g) {
-    return RemoveListArrayConverter(g) && RemoveIdentityNodes(g);
-  };
-  EXPECT_EQ(Optimize(remove_listarray_and_identity, func), e2);
+  {
+    Scope scope = Scope::NewRootScope();
+    auto i = ops::_Arg(scope.WithOpName("i"), DT_FLOAT, 0);
+    auto zero = ops::Const(scope.WithOpName("zero"), 0);
+    auto s = ops::Split(scope.WithOpName("s"), zero, i, 4);
+    auto a = ops::_ArrayToList(scope.WithOpName("a"), s.output,
+                               {DT_FLOAT, DT_FLOAT, DT_FLOAT, DT_FLOAT});
+    auto r = ops::Mul(scope.WithOpName("r"), a[2], a[3]);
+    auto l = ops::Mul(scope.WithOpName("l"), a[0], a[1]);
+    auto x = ops::_ListToArray(scope.WithOpName("x"),
+                               std::initializer_list<Input>{l, r}, DT_FLOAT, 2);
+    auto o = ops::AddN(scope.WithOpName("o"), x.output);
+    auto o_ret = ops::_Retval(scope.WithOpName("o_RetVal"), o, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(scope.ToGraphDef(&expected));
+    TF_EXPECT_GRAPH_EQ(expected, Optimize(DoNothing, func));
+  }
+
+  {
+    Scope scope = Scope::NewRootScope();
+    auto i = ops::_Arg(scope.WithOpName("i"), DT_FLOAT, 0);
+    auto zero = ops::Const(scope.WithOpName("zero"), 0);
+    auto s = ops::Split(scope.WithOpName("s"), zero, i, 4);
+    auto func_0 = ops::Identity(scope.WithOpName("Func/_0"), s[0]);
+    auto func_1 = ops::Identity(scope.WithOpName("Func/_1"), s[1]);
+    auto func_2 = ops::Identity(scope.WithOpName("Func/_2"), s[2]);
+    auto func_3 = ops::Identity(scope.WithOpName("Func/_3"), s[3]);
+    auto r = ops::Mul(scope.WithOpName("r"), func_2, func_3);
+    auto l = ops::Mul(scope.WithOpName("l"), func_0, func_1);
+    auto func_4 = ops::Identity(scope.WithOpName("Func/_4"), l);
+    auto func_5 = ops::Identity(scope.WithOpName("Func/_5"), r);
+    auto o = ops::AddN(scope.WithOpName("o"),
+                       std::initializer_list<Input>{func_4, func_5});
+    auto o_ret = ops::_Retval(scope.WithOpName("o_RetVal"), o, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(scope.ToGraphDef(&expected));
+    TF_EXPECT_GRAPH_EQ(expected, Optimize(RemoveListArrayConverter, func));
+  }
+
+  {
+    Scope scope = Scope::NewRootScope();
+    auto i = ops::_Arg(scope.WithOpName("i"), DT_FLOAT, 0);
+    auto zero = ops::Const(scope.WithOpName("zero"), 0);
+    auto s = ops::Split(scope.WithOpName("s"), zero, i, 4);
+    auto r = ops::Mul(scope.WithOpName("r"), s[2], s[3]);
+    auto l = ops::Mul(scope.WithOpName("l"), s[0], s[1]);
+    auto o =
+        ops::AddN(scope.WithOpName("o"), std::initializer_list<Input>{l, r});
+    auto o_ret = ops::_Retval(scope.WithOpName("o_RetVal"), o, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(scope.ToGraphDef(&expected));
+
+    auto remove_listarray_and_identity = [](Graph* g) {
+      return RemoveListArrayConverter(g) && RemoveIdentityNodes(g);
+    };
+    TF_EXPECT_GRAPH_EQ(expected, Optimize(remove_listarray_and_identity, func));
+  }
 }
 
 TEST(OptimizationTest, RemoveListArrayConverter_WithContolDeps) {
@@ -911,33 +1121,47 @@ TEST(OptimizationTest, RemoveListArrayConverter_WithContolDeps) {
         {"x"}}},
       {{"o", "o:sum"}});
 
-  const char* e0 = R"P(
-(i:float) -> (o:float) {
-  dummy = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  x = _ListToArray[N=2, T=float, Tin={float, float}](i, i) @ dummy
-  o = AddN[N=2, T=float](x, x:1) @ x
-}
-)P";
-  EXPECT_EQ(Optimize(DoNothing, func), e0);
-
-  const char* e1 = R"P(
-(i:float) -> (o:float) {
-  dummy = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
-  o = AddN[N=2, T=float](Func/_0, Func/_1) @ Func/_3
-  Func/_0 = Identity[T=float](i) @ Func/_2
-  Func/_1 = Identity[T=float](i) @ Func/_2
-  Func/_2 = NoOp() @ dummy
-  Func/_3 = NoOp() @ Func/_0, Func/_1
-}
-)P";
-  EXPECT_EQ(Optimize(RemoveListArrayConverter, func), e1);
+  {
+    Scope s = Scope::NewRootScope();
+    auto i = ops::_Arg(s.WithOpName("i"), DT_FLOAT, 0);
+    auto dummy = ops::Const(s.WithOpName("dummy"), 0);
+    auto x = ops::_ListToArray(s.WithOpName("x").WithControlDependencies(dummy),
+                               std::initializer_list<Input>{i, i}, DT_FLOAT, 2);
+    auto o =
+        ops::AddN(s.WithOpName("o").WithControlDependencies({x.output[0].op()}),
+                  x.output);
+    auto o_ret = ops::_Retval(s.WithOpName("o_RetVal"), o, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+    TF_EXPECT_GRAPH_EQ(expected, Optimize(DoNothing, func));
+  }
+
+  GraphDef expected;
+  {
+    Scope s = Scope::NewRootScope();
+    auto i = ops::_Arg(s.WithOpName("i"), DT_FLOAT, 0);
+    auto dummy = ops::Const(s.WithOpName("dummy"), 0);
+    auto func_2 =
+        ops::NoOp(s.WithOpName("Func/_2").WithControlDependencies(dummy));
+    auto func_0 = ops::Identity(
+        s.WithOpName("Func/_0").WithControlDependencies({func_2}), i);
+    auto func_1 = ops::Identity(
+        s.WithOpName("Func/_1").WithControlDependencies({func_2}), i);
+    auto func_3 = ops::NoOp(s.WithOpName("Func/_3").WithControlDependencies(
+        {func_0.output.op(), func_1.output.op()}));
+    auto o = ops::AddN(s.WithOpName("o").WithControlDependencies({func_3}),
+                       std::initializer_list<Input>{func_0, func_1});
+    auto o_ret = ops::_Retval(s.WithOpName("o_RetVal"), o, 0);
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+  }
+  TF_EXPECT_GRAPH_EQ(expected, Optimize(RemoveListArrayConverter, func));
 
   auto remove_listarray_and_identity = [](Graph* g) {
     return RemoveListArrayConverter(g) && RemoveIdentityNodes(g);
   };
   // NOTE: We are not removing Identity nodes with any control
   // dependencies yet.
-  EXPECT_EQ(Optimize(remove_listarray_and_identity, func), e1);
+  TF_EXPECT_GRAPH_EQ(expected, Optimize(remove_listarray_and_identity, func));
 }
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/framework/attr_value_util.cc b/tensorflow/core/framework/attr_value_util.cc
index 452cfdda9e..3573cc6ec2 100644
--- a/tensorflow/core/framework/attr_value_util.cc
+++ b/tensorflow/core/framework/attr_value_util.cc
@@ -400,16 +400,33 @@ void SetAttrValue(gtl::ArraySlice<NameAttrList> value, AttrValue* out) {
   }
 }
 
+// Wrapper around protocol buffer serialization that requests deterministic
+// serialization, in particular for Map fields, which serialize in a random
+// order by default. Returns true on success.
+template <typename T>
+static bool DeterministicSerialization(const T& t, string* result) {
+  const int size = t.ByteSize();
+  *result = string(size, '\0');
+  ::tensorflow::protobuf::io::ArrayOutputStream array_stream(&(*result)[0],
+                                                             size);
+  ::tensorflow::protobuf::io::CodedOutputStream output_stream(&array_stream);
+  output_stream.SetSerializationDeterministic(true);
+  t.SerializeWithCachedSizes(&output_stream);
+  return !output_stream.HadError() && size == output_stream.ByteCount();
+}
+
 bool AreAttrValuesEqual(const AttrValue& a, const AttrValue& b) {
   string a_str, b_str;
-  a.SerializeToString(&a_str);
-  b.SerializeToString(&b_str);
+  DeterministicSerialization(a, &a_str);
+  DeterministicSerialization(b, &b_str);
   // Note: it should be safe to compare proto serializations of the attr
   // values since at most one field should be set in each (indeed, it
   // must be the same field if they are to compare equal).
   // Exception: there are multiple equivalent representations of
   // TensorProtos.  So a return value of true implies a == b, but not the
   // converse.
+  // TODO(phawkins): this is incorrect for NameAttrList attributes that may
+  // contain nested AttrValue maps.
   return a_str == b_str;
 }
 
diff --git a/tensorflow/core/graph/algorithm.cc b/tensorflow/core/graph/algorithm.cc
index 38f011ecaf..3bfba3fc4e 100644
--- a/tensorflow/core/graph/algorithm.cc
+++ b/tensorflow/core/graph/algorithm.cc
@@ -23,8 +23,8 @@ limitations under the License.
 
 namespace tensorflow {
 
-void DFS(const Graph& g, std::function<void(Node*)> enter,
-         std::function<void(Node*)> leave) {
+void DFS(const Graph& g, const std::function<void(Node*)>& enter,
+         const std::function<void(Node*)>& leave) {
   // Stack of work to do.
   struct Work {
     Node* node;
@@ -61,15 +61,23 @@ void DFS(const Graph& g, std::function<void(Node*)> enter,
   }
 }
 
-void ReverseDFS(const Graph& g, std::function<void(Node*)> enter,
-                std::function<void(Node*)> leave) {
+void ReverseDFS(const Graph& g, const std::function<void(Node*)>& enter,
+                const std::function<void(Node*)>& leave) {
+  ReverseDFSFrom(g, {g.sink_node()}, enter, leave);
+}
+
+void ReverseDFSFrom(const Graph& g, gtl::ArraySlice<Node*> start,
+                    const std::function<void(Node*)>& enter,
+                    const std::function<void(Node*)>& leave) {
   // Stack of work to do.
   struct Work {
     Node* node;
     bool leave;  // Are we entering or leaving n?
   };
-  std::vector<Work> stack;
-  stack.push_back(Work{g.sink_node(), false});
+  std::vector<Work> stack(start.size());
+  for (int i = 0; i < start.size(); ++i) {
+    stack[i] = Work{start[i], false};
+  }
 
   std::vector<bool> visited(g.num_node_ids(), false);
   while (!stack.empty()) {
diff --git a/tensorflow/core/graph/algorithm.h b/tensorflow/core/graph/algorithm.h
index 74aace8072..01d36e0a12 100644
--- a/tensorflow/core/graph/algorithm.h
+++ b/tensorflow/core/graph/algorithm.h
@@ -21,20 +21,28 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/graph/graph.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
 
 namespace tensorflow {
 
 // Perform a depth-first-search on g starting at the source node.
 // If enter is not empty, calls enter(n) before visiting any children of n.
 // If leave is not empty, calls leave(n) after visiting all children of n.
-extern void DFS(const Graph& g, std::function<void(Node*)> enter,
-                std::function<void(Node*)> leave);
+extern void DFS(const Graph& g, const std::function<void(Node*)>& enter,
+                const std::function<void(Node*)>& leave);
 
 // Perform a reverse depth-first-search on g starting at the sink node.
 // If enter is not empty, calls enter(n) before visiting any parents of n.
 // If leave is not empty, calls leave(n) after visiting all parents of n.
-extern void ReverseDFS(const Graph& g, std::function<void(Node*)> enter,
-                       std::function<void(Node*)> leave);
+extern void ReverseDFS(const Graph& g, const std::function<void(Node*)>& enter,
+                       const std::function<void(Node*)>& leave);
+
+// Perform a reverse depth-first-search on g starting at the 'start' nodes.
+// If enter is not empty, calls enter(n) before visiting any parents of n.
+// If leave is not empty, calls leave(n) after visiting all parents of n.
+extern void ReverseDFSFrom(const Graph& g, gtl::ArraySlice<Node*> start,
+                           const std::function<void(Node*)>& enter,
+                           const std::function<void(Node*)>& leave);
 
 // Stores in *order the post-order numbering of all nodes
 // in graph found via a depth first search starting at the source node.
diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index e784c2df44..22f4708d03 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -90,6 +90,23 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "robust_stats",
+    srcs = ["robust_stats.cc"],
+    hdrs = ["robust_stats.h"],
+    visibility = ["//visibility:public"],
+)
+
+cc_test(
+    name = "robust_stats_test",
+    srcs = ["robust_stats_test.cc"],
+    deps = [
+        ":robust_stats",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
 cc_library(
     name = "utils",
     srcs = ["utils.cc"],
@@ -116,3 +133,37 @@ cc_library(
         "//tensorflow/core:lib",
     ],
 )
+
+cc_library(
+    name = "virtual_scheduler",
+    srcs = ["virtual_scheduler.cc"],
+    hdrs = ["virtual_scheduler.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/costs:cost_estimator",
+    ],
+)
+
+cc_library(
+    name = "measuring_cost_estimator",
+    srcs = ["measuring_cost_estimator.cc"],
+    hdrs = ["measuring_cost_estimator.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":robust_stats",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:lib_proto_parsing",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:grappler_item_builder",
+        "//tensorflow/core/grappler/clusters:cluster",
+        "//tensorflow/core/grappler/costs:cost_estimator",
+        "//tensorflow/core/kernels:ops_util",
+    ],
+)
diff --git a/tensorflow/core/grappler/costs/measuring_cost_estimator.cc b/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
new file mode 100644
index 0000000000..6179dc05c1
--- /dev/null
+++ b/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
@@ -0,0 +1,133 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/measuring_cost_estimator.h"
+
+#include <limits>
+
+#include "tensorflow/core/grappler/clusters/cluster.h"
+#include "tensorflow/core/grappler/costs/robust_stats.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/blocking_counter.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/public/session.h"
+
+namespace tensorflow {
+namespace grappler {
+
+MeasuringCostEstimator::MeasuringCostEstimator(Cluster* cluster,
+                                               int measurement_steps,
+                                               int measurement_threads)
+    : measurement_steps_(measurement_steps),
+      measurement_threads_(measurement_threads) {
+  CHECK_GE(measurement_steps, 1);
+  if (measurement_threads > 0) {
+    thread_pool_.reset(new thread::ThreadPool(
+        Env::Default(), SanitizeThreadSuffix("measurements"),
+        measurement_threads));
+  }
+  cluster_ = cluster;
+}
+
+Status MeasuringCostEstimator::Initialize(const GrapplerItem& item) {
+  feed_ = item.feed;
+  fetch_ = item.fetch;
+  return cluster_->Initialize(item);
+}
+
+Status MeasuringCostEstimator::PredictCosts(const GraphDef& optimized_graph,
+                                            CostGraphDef* cost_graph,
+                                            Costs* costs) const {
+  std::vector<double> times(measurement_steps_);
+  BlockingCounter barrier(measurement_steps_);
+
+  mutex status_mu;
+  Status status;
+
+  auto measurement_fn = [&](const int step) {
+    const Costs::MicroSeconds start = Env::Default()->NowMicros();
+
+    RunMetadata metadata;
+    const Status local_status =
+        cluster_->Run(optimized_graph, feed_, fetch_, &metadata);
+    {
+      mutex_lock lock(status_mu);
+      status.Update(local_status);
+    }
+    if (step < 0) {
+      // Discard the first iteration as it triggers the warmup, and therefore
+      // takes much longer than a normal step.
+      return;
+    }
+    if (!local_status.ok()) {
+      // Discard the data if the run wasn't sucessful.
+      barrier.DecrementCount();
+      return;
+    }
+
+    const Costs::MicroSeconds finish = Env::Default()->NowMicros();
+    const double time = (finish - start).count() * 1e3;
+    times[step] = time;
+
+    if (cost_graph && (step + 1 == measurement_steps_)) {
+      metadata.mutable_cost_graph()->Swap(cost_graph);
+    }
+
+    barrier.DecrementCount();
+  };
+
+  // Initialize the computation and warm up TensorFlow.
+  measurement_fn(-1);
+
+  if (!status.ok()) {
+    LOG(ERROR) << "Failed to run start measurements: "
+               << status.error_message();
+    costs->execution_time = Costs::Duration::max();
+    return status;
+  }
+
+  // Run "measurement_steps_" and measure the time.
+  if (measurement_threads_ > 0) {
+    for (int i = 0; i < measurement_steps_; ++i) {
+      thread_pool_->Schedule([i, &measurement_fn]() { measurement_fn(i); });
+    }
+    barrier.Wait();
+  } else {
+    for (int i = 0; i < measurement_steps_ && status.ok(); ++i) {
+      measurement_fn(i);
+    }
+  }
+
+  if (!status.ok()) {
+    LOG(ERROR) << "Failed to measure graph performance: "
+               << status.error_message();
+    costs->execution_time = Costs::Duration::max();
+    costs->max_execution_time = Costs::Duration::max();
+    costs->min_execution_time = 0;
+    return status;
+  }
+
+  // Compute the average time of the measure steps. Use Huber statistics
+  // to filter out outliers.
+  RobustStats stats(times);
+  costs->execution_time = Costs::Duration(stats.mean());
+  costs->max_execution_time = Costs::Duration(stats.hi());
+  costs->min_execution_time = Costs::Duration(stats.lo());
+
+  return Status::OK();
+}
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/measuring_cost_estimator.h b/tensorflow/core/grappler/costs/measuring_cost_estimator.h
new file mode 100644
index 0000000000..a84853f6c7
--- /dev/null
+++ b/tensorflow/core/grappler/costs/measuring_cost_estimator.h
@@ -0,0 +1,76 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_COSTS_MEASURING_COST_ESTIMATOR_H_
+#define TENSORFLOW_GRAPPLER_COSTS_MEASURING_COST_ESTIMATOR_H_
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/grappler/costs/cost_estimator.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+class CostGraphDef;
+class GraphDef;
+}  // namespace tensorflow
+
+namespace tensorflow {
+namespace grappler {
+
+class Cluster;
+struct GrapplerItem;
+
+// Estimate the cost of running a Grappler item by actually running the
+// corresponding TensorFlow graph on the specified cluster and measuring the
+// runtimes.
+class MeasuringCostEstimator : public CostEstimator {
+ public:
+  // Run the model for measurement_steps to measure its average cost.
+  // When measurement_threads is greater than 0, use a threadpool of as many
+  // threads to run the measurements; otherwise, run them serially. Does not
+  // take ownership of cluster.
+  explicit MeasuringCostEstimator(Cluster* cluster, int measurement_steps,
+                                  int measurement_threads);
+  ~MeasuringCostEstimator() override {}
+
+  // Initalizes the estimator for the specified grappler item.
+  // This implementation always returns OK.
+  Status Initialize(const GrapplerItem& item) override;
+
+  // Runs the optimized version of the graph on the cluster, measure
+  // the runtimes of each operation, and annotated the CostGraphDef
+  // with the corresponding measurements.
+  // Returns the average latency for the whole graph.
+  Status PredictCosts(const GraphDef& optimized_graph, CostGraphDef* cost_graph,
+                      Costs* overall_cost) const override;
+
+ private:
+  Cluster* cluster_;  // Not owned.
+  int measurement_steps_;
+  int measurement_threads_;
+  std::vector<std::pair<string, Tensor>> feed_;
+  std::vector<string> fetch_;
+  std::unique_ptr<thread::ThreadPool> thread_pool_;
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_COSTS_MEASURING_COST_ESTIMATOR_H_
diff --git a/tensorflow/core/grappler/costs/robust_stats.cc b/tensorflow/core/grappler/costs/robust_stats.cc
new file mode 100644
index 0000000000..87cda1c0d2
--- /dev/null
+++ b/tensorflow/core/grappler/costs/robust_stats.cc
@@ -0,0 +1,151 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/robust_stats.h"
+#include <algorithm>
+
+namespace tensorflow {
+namespace grappler {
+
+// Given a sorted vector of values, calculate the median.
+// Returns 0 for an empty vector.  Does not verify sortedness.
+static double SortedMedian(const std::vector<double> &values) {
+  const int n = values.size();
+  if (n == 0) return 0.0;
+  if (n & 1) {
+    return values[n / 2];
+  } else {
+    return (values[n / 2] + values[n / 2 - 1]) / 2.0;
+  }
+}
+
+// Given a vector of values (sorted or not), calculate the median.
+static double Median(std::vector<double> &&values) {
+  const size_t n = values.size();
+  if (n == 0) return 0;
+  const auto middle = values.begin() + (n / 2);
+  // Put the middle value in its place.
+  std::nth_element(values.begin(), middle, values.end());
+  if (n & 1) {
+    return *middle;
+  }
+  // Return the average of the two elements, the max_element lower than
+  // *middle is found between begin and middle as a post-cond of
+  // nth_element.
+  const auto lower_middle = std::max_element(values.begin(), middle);
+  // Preventing overflow. We know that '*lower_middle <= *middle'.
+  // If both are on oposite sides of zero, the sum won't overflow, otherwise
+  // the difference won't overflow.
+  if (*lower_middle <= 0 && *middle >= 0) {
+    return (*lower_middle + *middle) / 2;
+  }
+  return *lower_middle + (*middle - *lower_middle) / 2;
+}
+
+// Given a set of values, calculates the scaled Median Absolute Deviation (a
+// robust approximation to the standard deviation).  This is calculated as the
+// median of the absolute deviations from the median, scaled by 1.4826.  Its
+// advantage over the standard deviation is that it is not (as) affected by
+// outlier values.  Returns a pair<median, mad>.
+static std::pair<double, double> ScaledMedianAbsoluteDeviation(
+    const std::vector<double> &sorted_values) {
+  double median = SortedMedian(sorted_values);
+
+  // Next, we calculate the absolute deviations from the median,
+  // find the median of the resulting data, and scale by 1.4826.
+  std::vector<double> deviations;
+  deviations.reserve(sorted_values.size());
+  for (double d : sorted_values) {
+    deviations.push_back(std::abs(d - median));
+  }
+  double mad = Median(std::move(deviations)) * 1.4826;
+  return std::pair<double, double>(median, mad);
+}
+
+RobustStats::RobustStats(const std::vector<double> &values)
+    : RobustStats(std::vector<double>(values)) {}
+
+RobustStats::RobustStats(std::vector<double> &&values) {
+  std::sort(values.begin(), values.end());
+  lo_ = values[0];
+  hi_ = values.back();
+  HuberMAD(values);
+}
+
+// Computes an updated mean using Huber's weighting function (values beyond
+// the margin are weighted by margin / abs(value - mean).
+double UpdateHuberMean(const std::vector<double> &sorted_values, double mean,
+                       double margin) {
+  int num_within = 0;
+  double sum = 0.0;
+
+  for (double d : sorted_values) {
+    if (d < mean - margin) {
+      sum -= margin;
+    } else if (d > mean + margin) {
+      sum += margin;
+    } else {
+      sum += d;
+      ++num_within;
+    }
+  }
+
+  // It is possible, for a set with an interquartile distance of 0, i.e., with
+  // more than half of the values at the median, to encounter the case where
+  // the Huber mean drifts slightly off the median and there are no values
+  // within the margin.  In that case, just return the old mean, and the caller
+  // will quit.
+  if (num_within > 0) {
+    return sum / num_within;
+  } else {
+    return mean;
+  }
+}
+
+// Given a list of values, this approximates the stddev using the MAD and then
+// uses it to compute a Huber robust mean (sandwich mean).  A margin of
+// c*stddev is defined around the current mean, and values are weighted by
+// margin / abs(value - mean) if outside the margin, or 1 if inside.  This
+// computes the mean iteratively, because each time it changes the margin
+// shifts a bit.  It typically settles very quickly, but it's possible for it
+// to be unstable.  We limit it to 10 iterations.
+//
+void RobustStats::HuberMAD(const std::vector<double> &sorted_values) {
+  const std::pair<double, double> median_mad =
+      ScaledMedianAbsoluteDeviation(sorted_values);
+  mean_ = median_mad.first;
+  stddev_ = median_mad.second;
+
+  // c = 1.345 is the commonly used cutoff with 95% efficiency at the normal.
+  // We're using c = 1.5 to be a little more conservative, and because that's
+  // the default in S-plus.
+  // TODO(dehnert): Specialize Stats for integral types so we don't implement
+  // methods that don't make sense.
+  const double c = 1.5;
+  const double margin = c * stddev_;
+
+  // Iterate 10 times, or until the Huber mean stabilizes.
+  // If the margin is zero, we don't want mean to drift from the median.
+  if (margin > 0.0) {
+    for (int k = 0; k < 10; ++k) {
+      double old_mean = mean_;
+      mean_ = UpdateHuberMean(sorted_values, mean_, margin);
+      if (mean_ == old_mean) break;
+    }
+  }
+}
+
+}  // namespace grappler
+}  // namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/robust_stats.h b/tensorflow/core/grappler/costs/robust_stats.h
new file mode 100644
index 0000000000..9d8f5bc970
--- /dev/null
+++ b/tensorflow/core/grappler/costs/robust_stats.h
@@ -0,0 +1,42 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_COSTS_ROBUST_STATS_H_
+#define TENSORFLOW_GRAPPLER_COSTS_ROBUST_STATS_H_
+
+#include <vector>
+namespace tensorflow {
+namespace grappler {
+class RobustStats {
+ public:
+  RobustStats(const std::vector<double>& values);
+  RobustStats(std::vector<double>&& values);
+
+  double lo() const { return lo_; }
+  double hi() const { return hi_; }
+  double mean() const { return mean_; }
+
+ private:
+  void HuberMAD(const std::vector<double>& values);
+
+  double lo_;
+  double hi_;
+  double mean_;
+  double stddev_;
+};
+}  // namespace grappler
+}  // namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_COSTS_ROBUST_STATS_H_
diff --git a/tensorflow/core/grappler/costs/robust_stats_test.cc b/tensorflow/core/grappler/costs/robust_stats_test.cc
new file mode 100644
index 0000000000..924097b126
--- /dev/null
+++ b/tensorflow/core/grappler/costs/robust_stats_test.cc
@@ -0,0 +1,63 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/robust_stats.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class RobustStatsTest : public ::testing::Test {
+ public:
+  void SetUp() override {
+    for (double d = 1.0; d <= 5.0; d += 1.0) {
+      values1_.push_back(5.0 - d);
+      values1_.push_back(5.0 + d);
+      values2_.push_back(25.0 - 2 * d);
+      values2_.push_back(25.0 + 2 * d);
+      values3_.push_back(-3.0 - d);
+      values3_.push_back(-3.0 + d);
+    }
+    values1_.push_back(5.0);  // Odd # elements, mean is 5.0
+    values3_.push_back(197.0);
+    values3_.push_back(-203.0);  // Even # elements, mean is -3.0
+  }
+
+  std::vector<double> values1_;
+  std::vector<double> values2_;
+  std::vector<double> values3_;
+};
+
+TEST_F(RobustStatsTest, Simple) {
+  RobustStats s1(values1_);
+  EXPECT_EQ(5.0, s1.mean());
+  EXPECT_EQ(0.0, s1.lo());
+  EXPECT_EQ(10.0, s1.hi());
+
+  RobustStats s2(values2_);
+  EXPECT_EQ(25.0, s2.mean());
+  EXPECT_EQ(15.0, s2.lo());
+  EXPECT_EQ(35.0, s2.hi());
+
+  RobustStats s3(values3_);
+  EXPECT_EQ(-3.0, s3.mean());
+  EXPECT_EQ(-203.0, s3.lo());
+  EXPECT_EQ(197.0, s3.hi());
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/virtual_scheduler.cc b/tensorflow/core/grappler/costs/virtual_scheduler.cc
new file mode 100644
index 0000000000..8f77d7677a
--- /dev/null
+++ b/tensorflow/core/grappler/costs/virtual_scheduler.cc
@@ -0,0 +1,215 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/virtual_scheduler.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/utils.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+Costs CombineCosts(const Costs& left, const Costs& right) {
+  CHECK_NE(left.max_memory, kMemoryUnknown);
+  CHECK_NE(left.max_per_op_buffers, kMemoryUnknown);
+  CHECK_NE(left.max_per_op_streaming, kMemoryUnknown);
+
+  Costs result = left;
+  result.execution_time += right.execution_time;
+  if (right.max_memory != kMemoryUnknown) {
+    result.max_memory += right.max_memory;
+  }
+  if (right.max_per_op_buffers != kMemoryUnknown) {
+    result.max_per_op_buffers =
+        std::max(left.max_per_op_buffers, right.max_per_op_buffers);
+  }
+  if (right.max_per_op_streaming != kMemoryUnknown) {
+    result.max_per_op_streaming =
+        std::max(left.max_per_op_streaming, right.max_per_op_streaming);
+  }
+  VLOG(2) << "costs execution_time=" << result.execution_time.count()
+          << " max_memory=" << result.max_memory
+          << " max_per_op_buffers=" << result.max_per_op_buffers
+          << " max_per_op_streaming=" << result.max_per_op_streaming;
+  return result;
+}
+}  // namespace
+
+VirtualScheduler::VirtualScheduler(const GraphDef& graph,
+                                   const std::vector<string>& fetch_nodes)
+    : graph_costs_(Costs::ZeroCosts()),
+      // TODO(dyoon): Use a better way than FIFO.
+      ready_nodes_(new FIFOManager()) {
+  // First, get the nodes that would run to output fetch_nodes.
+  std::vector<const NodeDef*> nodes =
+      ComputeTransitiveFanin(graph, fetch_nodes);
+
+  // TODO(dyoon): this is a bit inefficient as name_to_node is already built in
+  // ComputeTransitiveFanin().
+  std::unordered_map<string, const NodeDef*> name_to_node;
+  for (const auto& node : graph.node()) {
+    name_to_node[node.name()] = &node;
+  }
+
+  // Build node_map.
+  for (const auto* node : nodes) {
+    auto& node_state = GetNodeStateOrCreateIt(node);
+    // TODO(dyoon): add SendRecv considering devices and control dependency.
+    for (const string& input : node->input()) {
+      const NodeDef* in = name_to_node[NodeName(input)];
+      CHECK(in);
+      node_state.inputs.push_back(in);
+      auto& input_node_state = GetNodeStateOrCreateIt(in);
+      input_node_state.outputs.push_back(node);
+    }
+    if (node->input().empty()) {
+      node_state.time_ready =
+          Costs::Duration();  // Node without input: ready at time 0.
+      ready_nodes_->AddNode(node);
+    }
+  }
+}
+
+const NodeDef* VirtualScheduler::GetCurrNode() const {
+  return ready_nodes_->GetCurrNode();
+}
+
+NodeState& VirtualScheduler::GetNodeStateOrCreateIt(const NodeDef* node) {
+  auto it = node_map_.find(node);
+  if (it == node_map_.end()) {
+    it = node_map_.emplace(node, NodeState()).first;
+  }
+  return it->second;
+}
+
+bool VirtualScheduler::MarkCurrNodeExecuted(const Costs& node_costs) {
+  // Update graph_costs_ and per-op costs.
+  graph_costs_ = CombineCosts(graph_costs_, node_costs);
+  const auto* node = GetCurrNode();
+  const auto& op_name = node->op();
+
+  auto it = op_to_cost_.find(op_name);
+  if (it == op_to_cost_.end()) {
+    it = op_to_cost_.emplace(op_name, Costs::ZeroCosts()).first;
+  }
+  auto& op_cost = it->second;
+  op_cost = CombineCosts(op_cost, node_costs);
+
+  // Update node and device states.
+  auto& node_state = node_map_[node];
+  auto& device = device_[node->device()];
+  device.nodes_executed.push_back(node);
+  // Node is scheduled when the device is available AND all the inputs are
+  // ready; hence, time_scheduled is time_ready if time_ready > device curr
+  // time.
+  node_state.time_scheduled =
+      std::max(device.GetCurrTime(), node_state.time_ready);
+  // Override device curr time with the time_scheduled.
+  device.device_costs.execution_time = node_state.time_scheduled;
+  device.device_costs = CombineCosts(device.device_costs, node_costs);
+  auto curr_time = device.GetCurrTime();
+  node_state.time_finished = curr_time;
+
+  // Update device's per-op cost.
+  {
+    auto it = device.op_to_cost.find(op_name);
+    if (it == device.op_to_cost.end()) {
+      it = device.op_to_cost.emplace(op_name, Costs::ZeroCosts()).first;
+    }
+    auto& op_cost = it->second;
+    op_cost = CombineCosts(op_cost, node_costs);
+
+    VLOG(2) << "Op scheduled -- name: " << node->name()
+            << ", op: " << node->op() << ", device: " << node->device()
+            << ", ready: " << node_state.time_ready.count()
+            << ", scheduled: " << node_state.time_scheduled.count()
+            << ", finished: " << node_state.time_finished.count();
+
+    // Increment num_inputs_ready of the output nodes.
+    for (auto* output : node_state.outputs) {
+      auto& output_state = node_map_[output];
+      output_state.num_inputs_ready++;
+      if (output_state.num_inputs_ready == output_state.inputs.size()) {
+        // This output node is now ready.
+        output_state.time_ready = curr_time;
+        ready_nodes_->AddNode(output);
+      }
+    }
+
+    // Increment num_outputs_executed of the input nodes.
+    for (auto* input : node_state.inputs) {
+      auto& input_state = node_map_[input];
+      input_state.num_outputs_executed++;
+      if (input_state.num_outputs_executed == input_state.outputs.size()) {
+        // All the outputs are executed; no reference to this input nodel
+        input_state.time_no_reference = curr_time;
+        // TODO(dyoon): collect device memory usage; note that this input node
+        // use device memory between time_scheduled and time_no_reference.
+      }
+    }
+  }
+
+  // Remove the current node; assume FIFO.
+  ready_nodes_->RemoveCurrNode();
+  return !ready_nodes_->Empty();  // True if not empty.
+}
+
+Costs VirtualScheduler::Summary() const {
+  // Print out basic execution summary.
+  VLOG(1) << "Expected execution time: " << graph_costs_.execution_time.count();
+  VLOG(1) << "Expected max memory: " << graph_costs_.max_memory;
+  VLOG(1) << "Expected max per-op buffers: " << graph_costs_.max_per_op_buffers;
+  VLOG(1) << "Expected max per-op streaming buffers: "
+          << graph_costs_.max_per_op_streaming;
+
+  VLOG(1) << "Per-op execution time:";
+  for (const auto& op_cost_pair : op_to_cost_) {
+    const auto& op = op_cost_pair.first;
+    const auto& cost = op_cost_pair.second.execution_time.count();
+    if (cost) {  // Skip printing out zero-cost ops.
+      VLOG(1) << " + " << op << " : " << cost;
+    }
+  }
+
+  // Print per device summary
+  VLOG(1) << "Devices:";
+  Costs critical_path_costs = Costs::ZeroCosts();
+
+  for (const auto& device : device_) {
+    const auto& name = device.first;
+    const auto& state = device.second;
+    VLOG(1) << "Device = " << name
+            << ", num_nodes = " << state.nodes_executed.size()
+            << ", execution_time = " << state.GetCurrTime().count();
+    VLOG(1) << "Per-op execution time:";
+    for (const auto& op_cost_pair : state.op_to_cost) {
+      const auto& op = op_cost_pair.first;
+      const auto& cost = op_cost_pair.second.execution_time.count();
+      if (cost) {  // Skip printing out zero-cost ops.
+        VLOG(1) << " + " << op << " : " << cost;
+      }
+    }
+    if (critical_path_costs.execution_time <= state.GetCurrTime()) {
+      critical_path_costs = state.device_costs;
+    }
+  }
+
+  VLOG(1) << "Critical path execution time: "
+          << critical_path_costs.execution_time.count();
+  return critical_path_costs;
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/virtual_scheduler.h b/tensorflow/core/grappler/costs/virtual_scheduler.h
new file mode 100644
index 0000000000..b7785c94e0
--- /dev/null
+++ b/tensorflow/core/grappler/costs/virtual_scheduler.h
@@ -0,0 +1,116 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_COSTS_VIRTUAL_SCHEDULER_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_COSTS_VIRTUAL_SCHEDULER_H_
+
+#include <list>
+#include <memory>
+#include <unordered_map>
+
+#include "tensorflow/core/grappler/costs/cost_estimator.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+
+namespace tensorflow {
+namespace grappler {
+
+namespace {
+struct NodeState {
+  std::vector<const NodeDef*> inputs;
+  std::vector<const NodeDef*> outputs;
+  int num_inputs_ready;
+  int num_outputs_executed;
+  Costs::Duration time_ready;
+  Costs::Duration time_scheduled;
+  Costs::Duration time_finished;
+  Costs::Duration time_no_reference;
+
+  // Node will be ready to be executed at time_ready, scheduled at
+  // time_scheduled, and finishes execution at time_finished.
+  // Between time_scheduled and time_no_reference, the node's output tensor
+  // needs to be on the device, using up device memory.
+
+  NodeState() {
+    num_inputs_ready = 0;
+    num_outputs_executed = 0;
+    time_ready = Costs::Duration::max();
+    time_scheduled = Costs::Duration::max();
+    time_finished = Costs::Duration::max();
+    time_no_reference = Costs::Duration::max();
+  }
+};
+
+struct DeviceState {
+  std::vector<const NodeDef*> nodes_executed;
+  Costs device_costs;
+  std::map<string, Costs> op_to_cost;  // Per-op cost.
+
+  DeviceState() { device_costs = Costs::ZeroCosts(); }
+
+  Costs::Duration GetCurrTime() const { return device_costs.execution_time; }
+};
+
+// ReadyNodeManager (abstract class):
+// Keeps ready nodes and picks the best one to be scheduled.
+class ReadyNodeManager {
+ public:
+  ReadyNodeManager() {}
+  virtual ~ReadyNodeManager() {}
+  virtual void AddNode(const NodeDef* node) = 0;
+  virtual const NodeDef* GetCurrNode() const = 0;
+  virtual void RemoveCurrNode() = 0;
+  virtual bool Empty() const = 0;
+};
+
+class FIFOManager : public ReadyNodeManager {
+ public:
+  FIFOManager() : ReadyNodeManager() {}
+  ~FIFOManager() override {}
+  void AddNode(const NodeDef* node) override { nodes_.push_back(node); }
+  const NodeDef* GetCurrNode() const override { return nodes_.front(); }
+  void RemoveCurrNode() override { nodes_.pop_front(); }
+  bool Empty() const override { return nodes_.empty(); }
+
+ private:
+  std::list<const NodeDef*> nodes_;
+};
+}  // namespace
+
+// The virtual scheduler emulates execution of nodes in a graph, considering
+// dependencies, device, etc.
+class VirtualScheduler {
+ public:
+  VirtualScheduler(const GraphDef& graph,
+                   const std::vector<string>& fetch_nodes);
+
+  const NodeDef* GetCurrNode() const;
+  bool MarkCurrNodeExecuted(const Costs& node_costs);
+
+  Costs Summary() const;
+
+ private:
+  NodeState& GetNodeStateOrCreateIt(const NodeDef* node);
+
+  Costs graph_costs_;                   // Graph cost.
+  std::map<string, Costs> op_to_cost_;  // Per-op cost.
+  std::unique_ptr<ReadyNodeManager> ready_nodes_;
+  std::unordered_map<const NodeDef*, NodeState> node_map_;
+  std::unordered_map<string, DeviceState> device_;
+};
+
+}  // namespace grappler
+}  // end namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_COSTS_VIRTUAL_SCHEDULER_H_
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 29b4d63bbf..0847d1279b 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -2109,7 +2109,9 @@ tf_kernel_library(
 tf_kernel_library(
     name = "matrix_triangular_solve_op",
     prefix = "matrix_triangular_solve_op",
-    deps = LINALG_DEPS,
+    deps = LINALG_DEPS + if_cuda([
+        "//tensorflow/core/platform/default/build_config:cublas_plugin",
+    ]),
 )
 
 tf_kernel_library(
@@ -2350,6 +2352,8 @@ tf_kernel_library(
         "//conditions:default": [],
     }) + if_mkl([
         "//third_party/mkl:intel_binary_blob",
+    ]) + if_cuda([
+        "//tensorflow/core/platform/default/build_config:cublas_plugin",
     ]),
 )
 
@@ -2630,6 +2634,7 @@ tf_kernel_library(
         ],
         "//conditions:default": [],
     }) + if_cuda([
+        "//tensorflow/core/platform/default/build_config:cublas_plugin",
         "//tensorflow/core/platform/default/build_config:cudnn_plugin",
     ]),
 )
diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index 027ecb195e..d415c29aa1 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -328,12 +328,16 @@ The downside is that all the weights read are from the previous training step.
 So it is a different algorithm from SGD. But it is possible to improve its
 convergence by adjusting learning rate and other hyperparameters.
 
-### Executing the script
+## Executing the script
 
 This section lists the core command line arguments and a few basic examples for
 executing the main script
 ([tf_cnn_benchmarks.py](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks/tf_cnn_benchmarks.py)).
 
+> Note: `tf_cnn_benchmarks.py` uses the config `force_gpu_compatible`,
+> which was introduced after TensorFlow 1.1. Until TensorFlow 1.2 is released
+> building from source is advised.
+
 #### Base command line arguments
 
 *   **`model`**: Model to use, e.g. `resnet50`, `inception3`, `vgg16`, and
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index e408506cb0..a96052a3ae 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -139,6 +139,82 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import nest
 
 
+def make_input_layer(features,
+                     feature_columns,
+                     weight_collections=None,
+                     trainable=True):
+  """Returns a dense `Tensor` as input layer based on given `feature_columns`.
+
+  Generally a single example in training data is described with FeatureColumns.
+  At the first layer of the model, this column oriented data should be converted
+  to a single `Tensor`.
+
+  Example:
+
+  ```python
+  price = numeric_column('price')
+  keywords_embedded = embedding_column(
+      categorical_column_with_hash_bucket("keywords", 10K), dimensions=16)
+  all_feature_columns = [price, keywords_embedded, ...]
+  dense_tensor = make_input_layer(features, all_feature_columns)
+  for units in [128, 64, 32]:
+    dense_tensor = tf.layers.dense(dense_tensor, units, tf.nn.relu)
+  prediction = tf.layers.dense(dense_tensor, 1)
+  ```
+
+  Args:
+    features: A mapping from key to tensors. `FeatureColumn`s look up via these
+      keys. For example `numeric_column('price') will look at 'price' key in
+      this dict. Values can be a `SparseTensor` or a `Tensor` depends on
+      corresponding `FeatureColumn`.
+    feature_columns: An iterable containing all the `FeatureColumn`s. All items
+      should be instances of classes derived from `_DenseColumn` such as
+      `numeric_column`, `embedding_column`, `bucketized_column`,
+      `indicator_column`. If you have categorical features, you can wrap them
+      with with an `embedding_column` or `indicator_column`.
+    weight_collections: A list of collection names to which the Variable will be
+      added. Note that, variables will also be added to collections
+      `tf.GraphKeys.GLOBAL_VARIABLES` and `ops.GraphKeys.MODEL_VARIABLES`.
+    trainable: If `True` also add the variable to the graph collection
+      `GraphKeys.TRAINABLE_VARIABLES` (see `tf.Variable`).
+
+  Returns:
+    A `Tensor` which represents input layer of a model. Its shape
+    is (batch_size, first_layer_dimension) and its dtype is `float32`.
+    first_layer_dimension is determined based on given `feature_columns`.
+
+  Raises:
+    ValueError: if an item in `feature_columns` is not a `_DenseColumn`.
+  """
+  _check_feature_columns(feature_columns)
+  for column in feature_columns:
+    if not isinstance(column, _DenseColumn):
+      raise ValueError(
+          'Items of feature_columns must be a _DenseColumn. '
+          'You can wrap a categorical column with an '
+          'embedding_column or indicator_column. Given: {}'.format(column))
+  weight_collections = list(weight_collections or [])
+  if ops.GraphKeys.GLOBAL_VARIABLES not in weight_collections:
+    weight_collections.append(ops.GraphKeys.GLOBAL_VARIABLES)
+  if ops.GraphKeys.MODEL_VARIABLES not in weight_collections:
+    weight_collections.append(ops.GraphKeys.MODEL_VARIABLES)
+  with variable_scope.variable_scope(
+      None, default_name='make_input_layer', values=features.values()):
+    builder = _LazyBuilder(features)
+    output_tensors = []
+    for column in sorted(feature_columns, key=lambda x: x.name):
+      with variable_scope.variable_scope(None, default_name=column.name):
+        tensor = column._get_dense_tensor(  # pylint: disable=protected-access
+            builder,
+            weight_collections=weight_collections,
+            trainable=trainable)
+        num_elements = column._variable_shape.num_elements()  # pylint: disable=protected-access
+        batch_size = array_ops.shape(tensor)[0]
+        tensor = array_ops.reshape(tensor, shape=(batch_size, num_elements))
+        output_tensors.append(tensor)
+    return array_ops.concat(output_tensors, 1)
+
+
 def make_linear_model(features,
                       feature_columns,
                       units=1,
@@ -156,10 +232,21 @@ def make_linear_model(features,
   while `make_input_layer` explicitly requires wrapping each of them with an
   `embedding_column` or an `indicator_column`.
 
+  Example:
+
+  ```python
+  price = numeric_column('price')
+  price_buckets = bucketized_column(price, boundaries=[0., 10., 100., 1000.])
+  keywords = categorical_column_with_hash_bucket("keywords", 10K)
+  all_feature_columns = [price_buckets, keywords, ...]
+  prediction = make_linear_model(features, all_feature_columns)
+  ```
+
   Args:
-    features: A mapping from key to tensors. 'string' key means a base feature.
-      It can have `_FeatureColumn` as a key too. That means that FeatureColumn
-      is already transformed by the input pipeline.
+    features: A mapping from key to tensors. `FeatureColumn`s look up via these
+      keys. For example `numeric_column('price')` will look at 'price' key in
+      this dict. Values are `Tensor` or `SparseTensor` depending on
+      corresponding `FeatureColumn`.
     feature_columns: An iterable containing all the FeatureColumns. All items
       should be instances of classes derived from FeatureColumn.
     units: units: An integer, dimensionality of the output space. Default
@@ -191,9 +278,10 @@ def make_linear_model(features,
       raise ValueError('Items of feature_columns must be either a _DenseColumn '
                        'or _CategoricalColumn. Given: {}'.format(column))
   weight_collections = list(weight_collections or [])
-  weight_collections += [
-      ops.GraphKeys.GLOBAL_VARIABLES, ops.GraphKeys.MODEL_VARIABLES
-  ]
+  if ops.GraphKeys.GLOBAL_VARIABLES not in weight_collections:
+    weight_collections.append(ops.GraphKeys.GLOBAL_VARIABLES)
+  if ops.GraphKeys.MODEL_VARIABLES not in weight_collections:
+    weight_collections.append(ops.GraphKeys.MODEL_VARIABLES)
   with variable_scope.variable_scope(
       None, default_name='make_linear_model', values=features.values()):
     weigthed_sums = []
@@ -228,7 +316,8 @@ def numeric_column(key,
                    normalizer_fn=None):
   """Represents real valued or numerical features.
 
-  An example:
+  Example:
+
   ```python
   price = numeric_column('price')
   all_feature_columns = [price, ...]
@@ -298,7 +387,8 @@ def bucketized_column(source_column, boundaries):
   `boundaries=[0., 1., 2.]` generates buckets `(-inf, 0.)`, `[0., 1.)`,
   `[1., 2.)`, and `[2., +inf)`.
 
-  An example:
+  Example:
+
   ```python
   price = numeric_column('price')
   bucketized_price = bucketized_column(price, boundaries=[...])
@@ -349,7 +439,8 @@ def categorical_column_with_hash_bucket(key,
   want to distribute your inputs into a finite number of buckets by hashing.
   output_id = Hash(input_feature_string) % bucket_size
 
-  An example:
+  Example:
+
   ```python
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
   all_feature_columns = [keywords, ...]
@@ -471,7 +562,7 @@ class _DenseColumn(_FeatureColumn):
 
   @abc.abstractproperty
   def _variable_shape(self):
-    """Returns shape of variable which is compatible with _get_dense_tensor."""
+    """Returns a `TensorShape` of variable compatible with _get_dense_tensor."""
     pass
 
   @abc.abstractmethod
@@ -480,6 +571,7 @@ class _DenseColumn(_FeatureColumn):
 
     The output of this function will be used by model-buildier-functions. For
     example the pseudo code of `make_input_layer` will be like that:
+
     ```python
     def make_input_layer(features, feature_columns, ...):
       outputs = [fc._get_dense_tensor(...) for fc in feature_columns]
@@ -503,7 +595,7 @@ def _create_dense_column_weighted_sum(
       builder,
       weight_collections=weight_collections,
       trainable=trainable)
-  num_elements = tensor_shape.TensorShape(column._variable_shape).num_elements()  # pylint: disable=protected-access
+  num_elements = column._variable_shape.num_elements()  # pylint: disable=protected-access
   batch_size = array_ops.shape(tensor)[0]
   tensor = array_ops.reshape(tensor, shape=(batch_size, num_elements))
   weight = variable_scope.get_variable(
@@ -615,12 +707,15 @@ class _LazyBuilder(object):
     """Creates a `_LazyBuilder`.
 
     Args:
-      features: A mapping from feature column to tensors. A `string` key
+      features: A mapping from feature column to objects that are `Tensor` or
+        `SparseTensor`, or can be converted to same via
+        `sparse_tensor.convert_to_tensor_or_sparse_tensor`. A `string` key
         signifies a base feature (not-transformed). A `FeatureColumn` key
         means that this `Tensor` is the output of an existing `FeatureColumn`
         which can be reused.
     """
-    self._columns_to_tensors = features.copy()
+    self._features = features.copy()
+    self._feature_tensors = {}
 
   def get(self, key):
     """Returns a `Tensor` for the given key.
@@ -640,9 +735,16 @@ class _LazyBuilder(object):
       ValueError: if key is not found or a transformed `Tensor` cannot be
         computed.
     """
-    if key in self._columns_to_tensors:
-      # Feature_column is already transformed or it's a raw feature.
-      return self._columns_to_tensors[key]
+    if key in self._feature_tensors:
+      # FeatureColumn is already transformed or converted.
+      return self._feature_tensors[key]
+
+    if key in self._features:
+      # FeatureColumn is a raw feature.
+      feature_tensor = sparse_tensor_lib.convert_to_tensor_or_sparse_tensor(
+          self._features[key])
+      self._feature_tensors[key] = feature_tensor
+      return feature_tensor
 
     if not isinstance(key, (str, _FeatureColumn)):
       raise TypeError('"key" must be either a "str" or "_FeatureColumn". '
@@ -653,11 +755,13 @@ class _LazyBuilder(object):
 
     column = key
     logging.debug('Transforming feature_column %s.', column)
-    transformed = column._transform_feature(self)  # pylint: disable=protected-access
+    # pylint: disable=protected-access
+    transformed = column._transform_feature(self)
+    # pylint: enable=protected-access
     if transformed is None:
       raise ValueError('Column {} is not supported.'.format(column.name))
-    self._columns_to_tensors[column] = transformed
-    return self._columns_to_tensors[column]
+    self._feature_tensors[column] = transformed
+    return transformed
 
 
 def _check_feature_columns(feature_columns):
@@ -709,7 +813,7 @@ class _NumericColumn(_DenseColumn,
 
   @property
   def _variable_shape(self):
-    return self.shape
+    return tensor_shape.TensorShape(self.shape)
 
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
     del weight_collections
@@ -738,7 +842,8 @@ class _BucketizedColumn(_DenseColumn, _CategoricalColumn,
 
   @property
   def _variable_shape(self):
-    return tuple(self.source_column.shape) + (len(self.boundaries) + 1,)
+    return tensor_shape.TensorShape(
+        tuple(self.source_column.shape) + (len(self.boundaries) + 1,))
 
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
     del weight_collections
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 32d6a4e8f0..bc62653310 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -65,7 +65,7 @@ class LazyColumnTest(test.TestCase):
       def _parse_example_config(self):
         pass
 
-    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
     column = TransformCounter()
     self.assertEqual(0, column.num_transform)
     builder.get(column)
@@ -88,7 +88,7 @@ class LazyColumnTest(test.TestCase):
       def _parse_example_config(self):
         pass
 
-    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
     column = Transformer()
     self.assertEqual('Output', builder.get(column))
     self.assertEqual('Output', builder.get(column))
@@ -108,13 +108,13 @@ class LazyColumnTest(test.TestCase):
       def _parse_example_config(self):
         pass
 
-    features = {'a': constant_op.constant([[2], [3.]])}
+    features = {'a': [[2], [3.]]}
     builder = fc._LazyBuilder(features=features)
     builder.get(Transformer())
     self.assertEqual(['a'], list(features.keys()))
 
   def test_error_if_feature_is_not_found(self):
-    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
     with self.assertRaisesRegexp(ValueError,
                                  'bbb is not in features dictionary'):
       builder.get('bbb')
@@ -135,7 +135,7 @@ class LazyColumnTest(test.TestCase):
       def _parse_example_config(self):
         pass
 
-    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
     with self.assertRaisesRegexp(ValueError,
                                  'NotAProperColumn is not supported'):
       builder.get(NotAProperColumn())
@@ -145,7 +145,7 @@ class LazyColumnTest(test.TestCase):
     class NotAFeatureColumn(object):
       pass
 
-    builder = fc._LazyBuilder(features={'a': constant_op.constant([[2], [3.]])})
+    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
     with self.assertRaisesRegexp(
         TypeError, '"key" must be either a "str" or "_FeatureColumn".'):
       builder.get(NotAFeatureColumn())
@@ -273,7 +273,7 @@ class NumericColumnTest(test.TestCase):
 
     price = fc.numeric_column('price', shape=[2], normalizer_fn=_increment_two)
     builder = fc._LazyBuilder({
-        'price': constant_op.constant([[1., 2.], [5., 6.]])
+        'price': [[1., 2.], [5., 6.]]
     })
     output = builder.get(price)
     with self.test_session():
@@ -286,7 +286,7 @@ class NumericColumnTest(test.TestCase):
 
     price = fc.numeric_column('price', shape=[2], normalizer_fn=_increment_two)
     builder = fc._LazyBuilder({
-        'price': constant_op.constant([[1., 2.], [5., 6.]])
+        'price': [[1., 2.], [5., 6.]]
     })
     self.assertEqual(builder.get(price), price._get_dense_tensor(builder))
 
@@ -315,7 +315,7 @@ class NumericColumnTest(test.TestCase):
   def test_make_linear_model(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[1.], [5.]])}
+      features = {'price': [[1.], [5.]]}
       predictions = fc.make_linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
@@ -402,7 +402,7 @@ class BucketizedColumnTest(test.TestCase):
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
       builder = fc._LazyBuilder({
-          'price': constant_op.constant([[-1., 1.], [5., 6.]])
+          'price': [[-1., 1.], [5., 6.]]
       })
       transformed_tensor = builder.get(bucketized_price)
       with _initialized_session():
@@ -414,7 +414,7 @@ class BucketizedColumnTest(test.TestCase):
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
       builder = fc._LazyBuilder({
-          'price': constant_op.constant([[-1.], [1.], [5.], [6.]])
+          'price': [[-1.], [1.], [5.], [6.]]
       })
       with _initialized_session():
         bucketized_price_tensor = bucketized_price._get_dense_tensor(builder)
@@ -432,7 +432,7 @@ class BucketizedColumnTest(test.TestCase):
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
       builder = fc._LazyBuilder({
-          'price': constant_op.constant([[-1., 1.], [5., 6.]])
+          'price': [[-1., 1.], [5., 6.]]
       })
       with _initialized_session():
         bucketized_price_tensor = bucketized_price._get_dense_tensor(builder)
@@ -448,7 +448,7 @@ class BucketizedColumnTest(test.TestCase):
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
       builder = fc._LazyBuilder({
-          'price': constant_op.constant([[-1.], [1.], [5.], [6.]])
+          'price': [[-1.], [1.], [5.], [6.]]
       })
       with _initialized_session() as sess:
         id_weight_pair = bucketized_price._get_sparse_tensors(builder)
@@ -465,7 +465,7 @@ class BucketizedColumnTest(test.TestCase):
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
       builder = fc._LazyBuilder({
-          'price': constant_op.constant([[-1., 1.], [5., 6.]])
+          'price': [[-1., 1.], [5., 6.]]
       })
       with _initialized_session() as sess:
         id_weight_pair = bucketized_price._get_sparse_tensors(builder)
@@ -502,7 +502,7 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[1])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[-1.], [1.], [5.], [6.]])}
+      features = {'price': [[-1.], [1.], [5.], [6.]]}
       predictions = fc.make_linear_model(features, [bucketized_price])
       bias = get_linear_model_bias()
       bucketized_price_var = get_linear_model_column_var(bucketized_price)
@@ -527,7 +527,7 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[2])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[-1., 1.], [5., 6.]])}
+      features = {'price': [[-1., 1.], [5., 6.]]}
       predictions = fc.make_linear_model(features, [bucketized_price])
       bias = get_linear_model_bias()
       bucketized_price_var = get_linear_model_column_var(bucketized_price)
@@ -621,15 +621,15 @@ class SparseColumnHashedTest(test.TestCase):
     float_fc = fc.categorical_column_with_hash_bucket(
         'a_float', 10, dtype=dtypes.string)
     int_tensor = sparse_tensor.SparseTensor(
-        values=constant_op.constant([101]),
+        values=[101],
         indices=[[0, 0]],
         dense_shape=[1, 1])
     string_tensor = sparse_tensor.SparseTensor(
-        values=constant_op.constant(['101']),
+        values=['101'],
         indices=[[0, 0]],
         dense_shape=[1, 1])
     float_tensor = sparse_tensor.SparseTensor(
-        values=constant_op.constant([101.]),
+        values=[101.],
         indices=[[0, 0]],
         dense_shape=[1, 1])
     builder = fc._LazyBuilder({
@@ -745,7 +745,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_bias(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[1.], [5.]])}
+      features = {'price': [[1.], [5.]]}
       predictions = fc.make_linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
@@ -848,7 +848,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_multi_output(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[1.], [5.]])}
+      features = {'price': [[1.], [5.]]}
       predictions = fc.make_linear_model(features, [price], units=3)
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
@@ -885,7 +885,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_multi_dimension(self):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[1., 2.], [5., 6.]])}
+      features = {'price': [[1., 2.], [5., 6.]]}
       predictions = fc.make_linear_model(features, [price])
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
@@ -913,7 +913,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_multi_dimension_multi_output(self):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[1., 2.], [5., 6.]])}
+      features = {'price': [[1., 2.], [5., 6.]]}
       predictions = fc.make_linear_model(features, [price], units=3)
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
@@ -928,7 +928,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_raises_if_shape_mismatch(self):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[1.], [5.]])}
+      features = {'price': [[1.], [5.]]}
       predictions = fc.make_linear_model(features, [price])
       with _initialized_session():
         with self.assertRaisesRegexp(Exception, 'requested shape has 4'):
@@ -937,7 +937,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_reshaping(self):
     price = fc.numeric_column('price', shape=[1, 2])
     with ops.Graph().as_default():
-      features = {'price': constant_op.constant([[[1., 2.]], [[5., 6.]]])}
+      features = {'price': [[[1., 2.]], [[5., 6.]]]}
       predictions = fc.make_linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
@@ -953,8 +953,8 @@ class MakeLinearModelTest(test.TestCase):
     price2 = fc.numeric_column('price2')
     with ops.Graph().as_default():
       features = {
-          'price1': constant_op.constant([[1., 2.], [5., 6.]]),
-          'price2': constant_op.constant([[3.], [4.]])
+          'price1': [[1., 2.], [5., 6.]],
+          'price2': [[3.], [4.]]
       }
       predictions = fc.make_linear_model(features, [price1, price2])
       bias = get_linear_model_bias()
@@ -973,7 +973,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_collection(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default() as g:
-      features = {'price': constant_op.constant([[1.], [5.]])}
+      features = {'price': [[1.], [5.]]}
       fc.make_linear_model(features, [price], weight_collections=['my-vars'])
       my_vars = g.get_collection('my-vars')
       bias = get_linear_model_bias()
@@ -998,7 +998,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_trainable_default(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default() as g:
-      features = {'price': constant_op.constant([[1.], [5.]])}
+      features = {'price': [[1.], [5.]]}
       fc.make_linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
@@ -1022,7 +1022,7 @@ class MakeLinearModelTest(test.TestCase):
   def test_dense_trainable_false(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default() as g:
-      features = {'price': constant_op.constant([[1.], [5.]])}
+      features = {'price': [[1.], [5.]]}
       fc.make_linear_model(features, [price], trainable=False)
       trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
       self.assertEqual([], trainable_vars)
@@ -1074,5 +1074,89 @@ class MakeLinearModelTest(test.TestCase):
       self.assertIn('wire_cast', my_vars[2].name)
 
 
+class MakeInputLayerTest(test.TestCase):
+
+  def test_should_be_dense_column(self):
+    with self.assertRaisesRegexp(ValueError, 'must be a _DenseColumn'):
+      fc.make_input_layer(
+          features={'a': [[0]]},
+          feature_columns=[
+              fc.categorical_column_with_hash_bucket('wire_cast', 4)
+          ])
+
+  def test_does_not_support_dict_columns(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'Expected feature_columns to be iterable, found dict.'):
+      fc.make_input_layer(
+          features={'a': [[0]]}, feature_columns={'a': fc.numeric_column('a')})
+
+  def test_raises_if_duplicate_name(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'Duplicate feature column name found for columns'):
+      fc.make_input_layer(
+          features={'a': [[0]]},
+          feature_columns=[fc.numeric_column('a'),
+                           fc.numeric_column('a')])
+
+  def test_one_column(self):
+    price = fc.numeric_column('price')
+    with ops.Graph().as_default():
+      features = {'price': [[1.], [5.]]}
+      net = fc.make_input_layer(features, [price])
+      with _initialized_session():
+        self.assertAllClose([[1.], [5.]], net.eval())
+
+  def test_multi_dimension(self):
+    price = fc.numeric_column('price', shape=2)
+    with ops.Graph().as_default():
+      features = {'price': [[1., 2.], [5., 6.]]}
+      net = fc.make_input_layer(features, [price])
+      with _initialized_session():
+        self.assertAllClose([[1., 2.], [5., 6.]], net.eval())
+
+  def test_raises_if_shape_mismatch(self):
+    price = fc.numeric_column('price', shape=2)
+    with ops.Graph().as_default():
+      features = {'price': [[1.], [5.]]}
+      net = fc.make_input_layer(features, [price])
+      with _initialized_session():
+        with self.assertRaisesRegexp(Exception, 'requested shape has 4'):
+          net.eval()
+
+  def test_reshaping(self):
+    price = fc.numeric_column('price', shape=[1, 2])
+    with ops.Graph().as_default():
+      features = {'price': [[[1., 2.]], [[5., 6.]]]}
+      net = fc.make_input_layer(features, [price])
+      with _initialized_session():
+        self.assertAllClose([[1., 2.], [5., 6.]], net.eval())
+
+  def test_multi_column(self):
+    price1 = fc.numeric_column('price1', shape=2)
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': [[1., 2.], [5., 6.]],
+          'price2': [[3.], [4.]]
+      }
+      net = fc.make_input_layer(features, [price1, price2])
+      with _initialized_session():
+        self.assertAllClose([[1., 2., 3.], [5., 6., 4.]], net.eval())
+
+  def test_column_order(self):
+    price_a = fc.numeric_column('price_a')
+    price_b = fc.numeric_column('price_b')
+    with ops.Graph().as_default():
+      features = {
+          'price_a': [[1.]],
+          'price_b': [[3.]],
+      }
+      net1 = fc.make_input_layer(features, [price_a, price_b])
+      net2 = fc.make_input_layer(features, [price_b, price_a])
+      with _initialized_session():
+        self.assertAllClose([[1., 3.]], net1.eval())
+        self.assertAllClose([[1., 3.]], net2.eval())
+
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/kernel_tests/variable_scope_test.py b/tensorflow/python/kernel_tests/variable_scope_test.py
index 69d1a6f60e..245dcc96db 100644
--- a/tensorflow/python/kernel_tests/variable_scope_test.py
+++ b/tensorflow/python/kernel_tests/variable_scope_test.py
@@ -774,6 +774,11 @@ class VariableScopeTest(test.TestCase):
         self.assertEqual([v.name
                           for v in scope.global_variables()], ["foo/b:0"])
 
+  def testGetVariableWithRefDtype(self):
+    v = variable_scope.get_variable("v", shape=[3, 4], dtype=dtypes.float32)
+    # Ensure it is possible to do get_variable with a _ref dtype passed in.
+    _ = variable_scope.get_variable("w", shape=[5, 6], dtype=v.dtype)
+
 
 def axis0_into1_partitioner(shape=None, **unused_kwargs):
   part = [1] * len(shape)
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index 76719f35b8..43addbe5a5 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -280,6 +280,17 @@ class _VariableStore(object):
       raise ValueError(
           "Passed a custom_getter which is not callable: %s" % custom_getter)
 
+    # If a *_ref type is passed in an error would be triggered further down the
+    # stack. We prevent this using base_dtype to get a non-ref version of the
+    # type, before doing anything else. When _ref types are removed in favour of
+    # resources, this line can be removed.
+    try:
+      dtype = dtype.base_dtype
+    except AttributeError:
+      # .base_dtype not existing means that we will try and use the raw dtype
+      # which was passed in - this might be a NumPy type which is valid.
+      pass
+
     # This is the main logic of get_variable.  However, custom_getter
     # may override this logic.  So we save it as a callable and pass
     # it to custom_getter.
diff --git a/tensorflow/python/training/supervisor.py b/tensorflow/python/training/supervisor.py
index 93e64b4ab0..277c11386d 100644
--- a/tensorflow/python/training/supervisor.py
+++ b/tensorflow/python/training/supervisor.py
@@ -994,7 +994,7 @@ class SVSummaryThread(coordinator.LooperThread):
       summary_strs = self._sess.run(self._sv.summary_op)
       global_step = None
     if self._sv.summary_writer:
-      logging.info("Recording summary at step %d.", global_step)
+      logging.info("Recording summary at step %s.", global_step)
       self._sv.summary_writer.add_summary(summary_strs, global_step)
 
 
diff --git a/tensorflow/stream_executor/cuda/cuda_driver.cc b/tensorflow/stream_executor/cuda/cuda_driver.cc
index e441321fc8..9b8e23babd 100644
--- a/tensorflow/stream_executor/cuda/cuda_driver.cc
+++ b/tensorflow/stream_executor/cuda/cuda_driver.cc
@@ -227,7 +227,7 @@ string ToString(CUresult result) {
 // created by StreamExecutor (to ensure that the CUDA runtime didn't create a
 // context behind our backs).
 CUcontext CurrentContext() {
-  CUcontext current  = CUDADriver::CurrentContextOrDie();
+  CUcontext current = CUDADriver::CurrentContextOrDie();
   if (current != nullptr && !CreatedContexts::Has(current)) {
     LOG(FATAL) << "current context was not created by the StreamExecutor "
                   "cuda_driver API: "
@@ -480,27 +480,56 @@ bool DeviceOptionsToContextFlags(DeviceOptions device_options, int *flags) {
     CUdevice device, DeviceOptions device_options, CudaContext** context) {
   *context = nullptr;
 
-  CUcontext former_context = CurrentContext();
-  if (former_context != nullptr) {
-    LOG(WARNING) << "creating context when one is currently active; existing: "
-                 << former_context;
-  }
-
   int flags = 0;
   if (!DeviceOptionsToContextFlags(device_options, &flags)) {
     LOG(WARNING) << "could not convert all device options into context flags";
   }
 
   CUresult res;
+  CUcontext former_context;
   CUcontext new_context;
   {
     // TODO(leary) Need to see if NVIDIA can expunge the leakiness in their
     // context creation: see http://b/13248943
 
 #if CUDA_VERSION >= 7000
-    res = cuDevicePrimaryCtxSetFlags(device, flags);
+    {
+      unsigned int former_primary_context_flags;
+      int former_primary_context_is_active;
+      CHECK_EQ(CUDA_SUCCESS,
+               cuDevicePrimaryCtxGetState(device, &former_primary_context_flags,
+                                          &former_primary_context_is_active));
+      if (former_primary_context_flags != flags) {
+        if (former_primary_context_is_active) {
+          LOG(ERROR)
+              << "The primary context is active and has a different flag set ("
+              << former_primary_context_flags << ") than the desired flag set ("
+              << flags << ").";
+        } else {
+          CHECK_EQ(CUDA_SUCCESS, cuDevicePrimaryCtxSetFlags(device, flags));
+        }
+      }
+    }
+
+    former_context = CUDADriver::CurrentContextOrDie();
     res = cuDevicePrimaryCtxRetain(&new_context, device);
+    if (former_context != nullptr) {
+      if (former_context == new_context) {
+        VLOG(2) << "The primary context " << former_context
+                << " exists before initializing the StreamExecutor.";
+      } else {
+        LOG(WARNING) << "A non-primary context " << former_context
+                     << " exists before initializing the StreamExecutor. We "
+                        "haven't verified StreamExecutor works with that.";
+      }
+    }
 #else
+    former_context = CurrentContext();
+    if (former_context != nullptr) {
+      LOG(WARNING)
+          << "creating context when one is currently active; existing: "
+          << former_context;
+    }
     res = cuCtxCreate(&new_context, flags, device);
 #endif
   }
-- 
GitLab


From 1457d7ffdcee6a18619a74bdc465ffa60c0fd1ff Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Wed, 3 May 2017 14:31:45 -0800
Subject: [PATCH 0973/1563] sparse_ops:  Preserving static shape info in
 sparse_reshape, sparse_reorder, sparse_add, sparse_reset_shape in the cases
 where all input shapes are known and do not contain implicit "-1" dimensions.
  Exceptions are raises when appropriate, preventing a dishonest static shape
 from being set. Change: 155013345

---
 .../python/kernel_tests/sparse_add_op_test.py |  1 +
 .../python/kernel_tests/sparse_ops_test.py    | 19 +++++-
 .../kernel_tests/sparse_reorder_op_test.py    |  7 ++
 .../kernel_tests/sparse_reshape_op_test.py    | 13 ++++
 tensorflow/python/ops/sparse_ops.py           | 64 ++++++++++++++++---
 5 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/tensorflow/python/kernel_tests/sparse_add_op_test.py b/tensorflow/python/kernel_tests/sparse_add_op_test.py
index 874dcbabf1..555c16194e 100644
--- a/tensorflow/python/kernel_tests/sparse_add_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_add_op_test.py
@@ -88,6 +88,7 @@ class SparseAddTest(test.TestCase):
       for sp_a in (self._SparseTensorValue_3x3(), self._SparseTensor_3x3()):
         for sp_b in (self._SparseTensorValue_3x3(), self._SparseTensor_3x3()):
           sp_sum = sparse_ops.sparse_add(sp_a, sp_b)
+          self.assertAllEqual((3, 3), sp_sum.get_shape())
 
           sum_out = sess.run(sp_sum)
 
diff --git a/tensorflow/python/kernel_tests/sparse_ops_test.py b/tensorflow/python/kernel_tests/sparse_ops_test.py
index 06d5cbaf2d..bad11a29df 100644
--- a/tensorflow/python/kernel_tests/sparse_ops_test.py
+++ b/tensorflow/python/kernel_tests/sparse_ops_test.py
@@ -328,6 +328,12 @@ class SparseResetShapeTest(test_util.TensorFlowTestCase):
     return sparse_tensor.SparseTensorValue(self._IND_2_5_6, self._VAL_2_5_6,
                                            self._SHP_2_5_6)
 
+  def testStaticShapeInfoPreservedWhenNewShapeIsProvidedAndStatic(self):
+    sp_input = self._SparseTensor_2x5x6()
+    new_shape = np.array([3, 6, 7], dtype=np.int64)
+    sp_output = sparse_ops.sparse_reset_shape(sp_input, new_shape)
+    self.assertAllEqual([3, 6, 7], sp_output.get_shape())
+
   def testBasic(self):
     with self.test_session(use_gpu=False) as sess:
       sp_input = self._SparseTensor_2x5x6()
@@ -397,14 +403,21 @@ class SparseResetShapeTest(test_util.TensorFlowTestCase):
       with self.assertRaisesOpError("x == y did not hold element-wise"):
         sess.run(out, feed_dict={new_shape: np.array([3, 7], dtype=np.int64)})
 
-  def testInvalidDimensionSize(self):
+  def testInvalidDimensionSizeStatic(self):
+    sp_input = self._SparseTensor_2x5x6()
+    new_shape = np.array([3, 7, 5], dtype=np.int64)
+
+    with self.assertRaisesRegexp(ValueError, "should have dimension sizes"):
+      sparse_ops.sparse_reset_shape(sp_input, new_shape)
+
+  def testInvalidDimensionSizeDynamic(self):
     with self.test_session(use_gpu=False) as sess:
       sp_input = self._SparseTensor_2x5x6()
-      new_shape = np.array([3, 7, 5], dtype=np.int64)
+      new_shape = array_ops.placeholder(dtype=dtypes.int32)
       out = sparse_ops.sparse_reset_shape(sp_input, new_shape)
 
       with self.assertRaisesOpError("x <= y did not hold element-wise"):
-        sess.run(out)
+        sess.run(out, feed_dict={new_shape: [3, 7, 5]})
 
   def testInvalidDimensionSizeInputUnavailableInGraphConstruction(self):
     sp_input = array_ops.sparse_placeholder(dtype=dtypes.int32)
diff --git a/tensorflow/python/kernel_tests/sparse_reorder_op_test.py b/tensorflow/python/kernel_tests/sparse_reorder_op_test.py
index 5136cdadea..18335d665a 100644
--- a/tensorflow/python/kernel_tests/sparse_reorder_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_reorder_op_test.py
@@ -48,6 +48,13 @@ class SparseReorderTest(test.TestCase):
     shape = np.array([5, 6]).astype(np.int64)
     return sparse_tensor.SparseTensorValue(ind, val, shape)
 
+  def testStaticShapeInfoPreserved(self):
+    sp_input = sparse_tensor.SparseTensor.from_value(
+        self._SparseTensorValue_5x6(np.arange(6)))
+    self.assertAllEqual((5, 6), sp_input.get_shape())
+    sp_output = sparse_ops.sparse_reorder(sp_input)
+    self.assertAllEqual((5, 6), sp_output.get_shape())
+
   def testAlreadyInOrder(self):
     with self.test_session(use_gpu=False) as sess:
       input_val = self._SparseTensorValue_5x6(np.arange(6))
diff --git a/tensorflow/python/kernel_tests/sparse_reshape_op_test.py b/tensorflow/python/kernel_tests/sparse_reshape_op_test.py
index 1bb05aa3b2..42874ea9b7 100644
--- a/tensorflow/python/kernel_tests/sparse_reshape_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_reshape_op_test.py
@@ -50,6 +50,13 @@ class SparseReshapeTest(test.TestCase):
     shape = np.array([2, 3, 4])
     return sparse_tensor.SparseTensorValue(ind, val, shape)
 
+  def testStaticShapeInfoPreserved(self):
+    sp_input = sparse_tensor.SparseTensor.from_value(
+        self._SparseTensorValue_5x6())
+    self.assertAllEqual((5, 6), sp_input.get_shape())
+    sp_output = sparse_ops.sparse_reshape(sp_input, shape=(1, 5, 2, 3))
+    self.assertAllEqual((1, 5, 2, 3), sp_output.get_shape())
+
   def testSameShape(self):
     with self.test_session(use_gpu=False) as sess:
       input_val = self._SparseTensorValue_5x6()
@@ -180,6 +187,12 @@ class SparseReshapeTest(test.TestCase):
       with self.assertRaisesOpError("only one output shape size may be -1"):
         sess.run(sp_output, {sp_input: input_val})
 
+  def testProvideStaticallyMismatchedSizes(self):
+    input_val = self._SparseTensorValue_5x6()
+    sp_input = sparse_tensor.SparseTensor.from_value(input_val)
+    with self.assertRaisesRegexp(ValueError, "Cannot reshape"):
+      sparse_ops.sparse_reshape(sp_input, [4, 7])
+
   def testFeedMismatchedSizes(self):
     with self.test_session(use_gpu=False) as sess:
       sp_input = self._SparseTensorPlaceholder()
diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index f8eb34aa5e..0140a27aaa 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -51,6 +51,7 @@ import numpy as np
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
@@ -288,12 +289,21 @@ def sparse_add(a, b, thresh=0):
 
   if all(isinstance(inp, sparse_classes) for inp in [a, b]):
     a = _convert_to_sparse_tensor(a)
+    b = _convert_to_sparse_tensor(b)
     thresh = ops.convert_to_tensor(
         thresh, dtype=a.values.dtype.real_dtype, name="thresh")
     output_ind, output_val, output_shape = (gen_sparse_ops._sparse_add(
         a.indices, a.values, a.dense_shape,
         b.indices, b.values, b.dense_shape,
         thresh))
+
+    # Attempt to get output_shape statically.
+    a.get_shape().assert_is_compatible_with(b.get_shape())
+    static_shape = array_ops.broadcast_static_shape(
+        a.get_shape(), b.get_shape())
+    if static_shape.is_fully_defined():
+      output_shape = static_shape.as_list()
+
     return sparse_tensor.SparseTensor(output_ind, output_val, output_shape)
   else:
     # swap to make `a` the SparseTensor.
@@ -368,8 +378,12 @@ def sparse_reorder(sp_input, name=None):
   reordered_ind, reordered_val = (gen_sparse_ops._sparse_reorder(
       sp_input.indices, sp_input.values, sp_input.dense_shape, name=name))
 
-  return sparse_tensor.SparseTensor(reordered_ind, reordered_val,
-                                    array_ops.identity(sp_input.dense_shape))
+  if sp_input.get_shape().is_fully_defined():
+    dense_shape = sp_input.get_shape().as_list()
+  else:
+    dense_shape = array_ops.identity(sp_input.dense_shape)
+
+  return sparse_tensor.SparseTensor(reordered_ind, reordered_val, dense_shape)
 
 
 def sparse_reshape(sp_input, shape, name=None):
@@ -416,13 +430,30 @@ def sparse_reshape(sp_input, shape, name=None):
 
   Raises:
     TypeError: If `sp_input` is not a `SparseTensor`.
+    ValueError:  If argument `shape` requests a `SparseTensor` with a different
+      number of elements than `sp_input`.
   """
   sp_input = _convert_to_sparse_tensor(sp_input)
+  shape = ops.convert_to_tensor(shape, dtype=dtypes.int64)
 
   with ops.name_scope(name, "SparseReshape", [sp_input]) as name:
     reshaped_ind, reshaped_shape = gen_sparse_ops._sparse_reshape(
         sp_input.indices, sp_input.dense_shape, shape, name=name)
 
+    reshaped_shape_const = tensor_util.constant_value(shape)
+    if (reshaped_shape_const is not None
+        and sp_input.get_shape().is_fully_defined()):
+      # Don't deal with inferred dimensions. That would add significant code.
+      if all(n >= 0 for n in reshaped_shape_const):
+        reshaped_size = np.prod(reshaped_shape_const)
+        in_shape_size = np.prod(sp_input.get_shape().as_list())
+        if reshaped_size != in_shape_size:
+          raise ValueError(
+              "Cannot reshape a tensor with %d elements to shape %s "
+              "(%d elements)."
+              % (in_shape_size, reshaped_shape_const, reshaped_size))
+        reshaped_shape = reshaped_shape_const
+
     return sparse_tensor.SparseTensor(
         reshaped_ind, array_ops.identity(sp_input.values),
         reshaped_shape)
@@ -986,6 +1017,8 @@ def sparse_reset_shape(sp_input, new_shape=None):
     TypeError: If `sp_input` is not a `SparseTensor`.
     ValueError: If `new_shape` represents a tensor with a different rank from
       that of `sp_input` (if shapes are known when graph is constructed).
+    ValueError:  If `new_shape` is determined during graph build to have
+      dimension sizes that are too small.
     OpError:
       - If `new_shape` has dimension sizes that are too small.
       - If shapes are not known during graph construction time, and during run
@@ -1009,14 +1042,27 @@ def sparse_reset_shape(sp_input, new_shape=None):
     # error before the sparse_tensor.SparseTensor catches it.
     output_shape_tensor.get_shape()[0].merge_with(in_shape.get_shape()[0])
 
-    # For cases where shape is not known during graph construction.
-    output_shape_tensor = control_flow_ops.with_dependencies(
-        [check_ops.assert_equal(
-            array_ops.shape(in_shape), array_ops.shape(output_shape_tensor))],
-        output_shape_tensor)
-    output_shape_tensor = control_flow_ops.with_dependencies(
-        [check_ops.assert_less_equal(in_shape, output_shape_tensor)],
+    output_shape_tensor_const = tensor_util.constant_value(
         output_shape_tensor)
+    # For cases where all shapes are known during graph construction
+    if (output_shape_tensor_const is not None
+        and sp_input.get_shape().is_fully_defined()):
+      in_shape_const = np.array(sp_input.get_shape().as_list())
+      if not np.all(in_shape_const <= output_shape_tensor_const):
+        raise ValueError(
+            "Requested new_shape should have dimension sizes >= sp_input.shape."
+            "  Found new_shape (%s), sp_input.shape (%s)."
+            % (in_shape_const, output_shape_tensor_const))
+      output_shape_tensor = output_shape_tensor_const
+    else:
+      # For cases where shape is not known during graph construction.
+      output_shape_tensor = control_flow_ops.with_dependencies(
+          [check_ops.assert_equal(
+              array_ops.shape(in_shape), array_ops.shape(output_shape_tensor))],
+          output_shape_tensor)
+      output_shape_tensor = control_flow_ops.with_dependencies(
+          [check_ops.assert_less_equal(in_shape, output_shape_tensor)],
+          output_shape_tensor)
 
   return sparse_tensor.SparseTensor(in_indices, in_values, output_shape_tensor)
 
-- 
GitLab


From 6b493f72c82593cb1a642af2d091e93b15b56ddc Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 14:58:36 -0800
Subject: [PATCH 0974/1563] Change contrib estimator to save relative paths in
 checkpoint. Change: 155016674

---
 .../python/learn/estimators/estimator.py      |  3 +-
 .../python/learn/estimators/estimator_test.py | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 123db50d32..74a6da20d4 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -966,7 +966,8 @@ class BaseEstimator(
             saver.Saver(
                 sharded=True,
                 max_to_keep=self._config.keep_checkpoint_max,
-                defer_build=True))
+                defer_build=True,
+                save_relative_paths=True))
 
       chief_hooks = []
       if (self._config.save_checkpoints_secs or
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
index 8c61ffad55..c95df75356 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
@@ -28,6 +28,8 @@ import numpy as np
 import six
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
+from google.protobuf import text_format
+
 from tensorflow.contrib import learn
 from tensorflow.contrib import lookup
 from tensorflow.contrib.framework.python.ops import variables
@@ -50,6 +52,7 @@ from tensorflow.python.client import session as session_lib
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.lib.io import file_io
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
@@ -61,6 +64,7 @@ from tensorflow.python.platform import test
 from tensorflow.python.saved_model import loader
 from tensorflow.python.saved_model import tag_constants
 from tensorflow.python.training import basic_session_run_hooks
+from tensorflow.python.training import checkpoint_state_pb2
 from tensorflow.python.training import input as input_lib
 from tensorflow.python.training import monitored_session
 from tensorflow.python.training import saver as saver_lib
@@ -674,6 +678,38 @@ class EstimatorTest(test.TestCase):
         metrics={'MSE': metric_ops.streaming_mean_squared_error})
     self.assertLess(scores3['MSE'], scores['MSE'])
 
+  def test_checkpoint_contains_relative_paths(self):
+    tmpdir = tempfile.mkdtemp()
+    est = estimator.Estimator(
+        model_dir=tmpdir,
+        model_fn=linear_model_fn_with_model_fn_ops)
+    est.fit(input_fn=boston_input_fn, steps=5)
+
+    checkpoint_file_content = file_io.read_file_to_string(
+        os.path.join(tmpdir, 'checkpoint'))
+    ckpt = checkpoint_state_pb2.CheckpointState()
+    text_format.Merge(checkpoint_file_content, ckpt)
+    self.assertEqual(ckpt.model_checkpoint_path, 'model.ckpt-5')
+    self.assertAllEqual(
+        ['model.ckpt-1', 'model.ckpt-5'], ckpt.all_model_checkpoint_paths)
+
+  def test_train_save_copy_reload(self):
+    tmpdir = tempfile.mkdtemp()
+    model_dir1 = os.path.join(tmpdir, 'model_dir1')
+    est1 = estimator.Estimator(
+        model_dir=model_dir1,
+        model_fn=linear_model_fn_with_model_fn_ops)
+    est1.fit(input_fn=boston_input_fn, steps=5)
+
+    model_dir2 = os.path.join(tmpdir, 'model_dir2')
+    os.renames(model_dir1, model_dir2)
+    est2 = estimator.Estimator(
+        model_dir=model_dir2,
+        model_fn=linear_model_fn_with_model_fn_ops)
+    self.assertEqual(5, est2.get_variable_value('global_step'))
+    est2.fit(input_fn=boston_input_fn, steps=5)
+    self.assertEqual(10, est2.get_variable_value('global_step'))
+
   def testEstimatorParams(self):
     boston = base.load_boston()
     est = estimator.SKCompat(
-- 
GitLab


From 4a4a1ebc485d854196f0c2231842f70eebeb8981 Mon Sep 17 00:00:00 2001
From: Neal Wu <wun@google.com>
Date: Wed, 3 May 2017 16:46:57 -0800
Subject: [PATCH 0975/1563] TensorFlow documentation fixes Change: 155029319

---
 tensorflow/contrib/layers/python/layers/layers.py       | 6 +++---
 tensorflow/docs_src/performance/index.md                | 2 +-
 tensorflow/docs_src/programmers_guide/variable_scope.md | 8 ++++----
 tensorflow/docs_src/tutorials/deep_cnn.md               | 2 +-
 tensorflow/python/layers/normalization.py               | 4 +++-
 tensorflow/python/ops/variable_scope.py                 | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index c920764803..32ca0c38d9 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -844,7 +844,7 @@ def convolution(inputs,
   variable would be created and added the activations. Finally, if
   `activation_fn` is not `None`, it is applied to the activations as well.
 
-  Performs a'trous convolution with input stride/dilation rate equal to `rate`
+  Performs atrous convolution with input stride/dilation rate equal to `rate`
   if a value > 1 for any dimension of `rate` is specified.  In this case
   `stride` values != 1 are not supported.
 
@@ -870,7 +870,7 @@ def convolution(inputs,
       "NCW".  For N=2, the valid values are "NHWC" (default) and "NCHW".
       For N=3, the valid values are "NDHWC" (default) and "NCDHW".
     rate: A sequence of N positive integers specifying the dilation rate to use
-      for a'trous convolution.  Can be a single integer to specify the same
+      for atrous convolution.  Can be a single integer to specify the same
       value for all spatial dimensions.  Specifying any `rate` value != 1 is
       incompatible with specifying any `stride` value != 1.
     activation_fn: Activation function. The default value is a ReLU function.
@@ -1865,7 +1865,7 @@ def separable_convolution2d(
       depthwise convolution stride. Can be an int if both strides are the same.
     padding: One of 'VALID' or 'SAME'.
     rate: A list of length 2: [rate_height, rate_width], specifying the dilation
-      rates for a'trous convolution. Can be an int if both rates are the same.
+      rates for atrous convolution. Can be an int if both rates are the same.
       If any value is larger than one, then both stride values need to be one.
     activation_fn: Activation function. The default value is a ReLU function.
       Explicitly set it to None to skip it and maintain a linear activation.
diff --git a/tensorflow/docs_src/performance/index.md b/tensorflow/docs_src/performance/index.md
index 746dc0c74f..7c1cd152d3 100644
--- a/tensorflow/docs_src/performance/index.md
+++ b/tensorflow/docs_src/performance/index.md
@@ -9,7 +9,7 @@ deeper with techniques detailed in @{$performance_models$High-Performance Models
     practices for optimizing your TensorFlow code.
 
   * @{$performance_models$High-Performance Models}, which contains a collection
-    advanced techniques to build highly scalable models targeting different
+    of advanced techniques to build highly scalable models targeting different
     system types and network topologies.
 
   * @{$benchmarks$Benchmarks}, which contains a collection of benchmark
diff --git a/tensorflow/docs_src/programmers_guide/variable_scope.md b/tensorflow/docs_src/programmers_guide/variable_scope.md
index 5084acbab9..f4d2b3f37b 100644
--- a/tensorflow/docs_src/programmers_guide/variable_scope.md
+++ b/tensorflow/docs_src/programmers_guide/variable_scope.md
@@ -5,7 +5,7 @@ in the way described in the @{$variables$Variables HowTo}.
 But when building complex models you often need to share large sets of
 variables and you might want to initialize all of them in one place.
 This tutorial shows how this can be done using `tf.variable_scope()` and
-the `tf.get_variable()`.
+`tf.get_variable()`.
 
 ## The Problem
 
@@ -368,6 +368,6 @@ sequence-to-sequence models.
 
 File | What's in it?
 --- | ---
-`models/tutorials/image/cifar10/cifar10.py` | Model for detecting objects in images.
-`models/tutorials/rnn/rnn_cell.py` | Cell functions for recurrent neural networks.
-`models/tutorials/rnn/seq2seq.py` | Functions for building sequence-to-sequence models.
+`tutorials/image/cifar10/cifar10.py` | Model for detecting objects in images.
+`tutorials/rnn/rnn_cell.py` | Cell functions for recurrent neural networks.
+`tutorials/rnn/seq2seq.py` | Functions for building sequence-to-sequence models.
diff --git a/tensorflow/docs_src/tutorials/deep_cnn.md b/tensorflow/docs_src/tutorials/deep_cnn.md
index d6a136fee4..f60c8fd770 100644
--- a/tensorflow/docs_src/tutorials/deep_cnn.md
+++ b/tensorflow/docs_src/tutorials/deep_cnn.md
@@ -83,7 +83,7 @@ for details.  It consists of 1,068,298 learnable parameters and requires about
 ## Code Organization
 
 The code for this tutorial resides in
-[`tensorflow_models/tutorials/image/cifar10/`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/).
+[`models/tutorials/image/cifar10/`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/).
 
 File | Purpose
 --- | ---
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index 871f840c52..f92ea9b05f 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -400,7 +400,9 @@ def batch_normalization(inputs,
     training: Either a Python boolean, or a TensorFlow boolean scalar tensor
       (e.g. a placeholder). Whether to return the output in training mode
       (normalized with statistics of the current batch) or in inference mode
-      (normalized with moving statistics).
+      (normalized with moving statistics). **NOTE**: make sure to set this
+      parameter correctly, or else your training/inference will not work
+      properly.
     trainable: Boolean, if `True` also add variables to the graph collection
       `GraphKeys.TRAINABLE_VARIABLES` (see tf.Variable).
     name: String, the name of the layer.
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index 43addbe5a5..a29ddfa9f2 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -1292,7 +1292,7 @@ def _pure_variable_scope(name_or_scope,
       well-defined semantics. Defaults to False (will later change to True).
 
   Yields:
-    A scope that can be to captured and reused.
+    A scope that can be captured and reused.
 
   Raises:
     ValueError: when trying to reuse within a create scope, or create within
-- 
GitLab


From ddf30ca616de8ceebdf414c9800b857aa004e281 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 3 May 2017 16:57:29 -0800
Subject: [PATCH 0976/1563] Added missing header file to fix the MacOS builds
 Change: 155030326

---
 tensorflow/core/grappler/costs/robust_stats.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/core/grappler/costs/robust_stats.cc b/tensorflow/core/grappler/costs/robust_stats.cc
index 87cda1c0d2..dba6efae0f 100644
--- a/tensorflow/core/grappler/costs/robust_stats.cc
+++ b/tensorflow/core/grappler/costs/robust_stats.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/grappler/costs/robust_stats.h"
 #include <algorithm>
+#include <cmath>
 
 namespace tensorflow {
 namespace grappler {
-- 
GitLab


From 7c0f8489c7acab99bd1497d82fa9fa6459007fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Csomor?=
 <laszlocsomor@users.noreply.github.com>
Date: Thu, 4 May 2017 04:29:39 +0200
Subject: [PATCH 0977/1563] Fix Bazel CI / TensorFlow project (#9510)

* Windows, python_configure, configure: fix issues

Fix Bazel CI for TensorFlow after TF started using
python_config.bzl instead of python_config.sh:

- Fix the default python binary detection
  ./configure to use mixed-style paths (Windows
  path with forward slashes, see "cygpath -m")
- python_configure.bzl:_symlink_genrule_for_dir
  now executes "cmd.exe /c dir" instead of just
  "dir" on Windows, because it used to find
  /usr/bin/dir instead of the built-in dir command
- python_configure.bzl:_execute is a new method to
  run commands and report errors in a uniform way

See https://github.com/bazelbuild/bazel/issues/2892

* python_configure: fix an error message

* workspace.bzl: fix "patch" call on Windows

Found as part of fixing https://github.com/bazelbuild/bazel/issues/2892
---
 tensorflow/workspace.bzl            | 25 +++++++--
 third_party/py/python_configure.bzl | 81 ++++++++++++++++++++---------
 2 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 0f69d53ba4..6270b95b6b 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -8,6 +8,19 @@ load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
 load("//third_party/py:python_configure.bzl", "python_configure")
 
 
+def _is_windows(repository_ctx):
+  """Returns true if the host operating system is windows."""
+  return repository_ctx.os.name.lower().find("windows") != -1
+
+
+def _get_env_var(repository_ctx, name):
+  """Find an environment variable."""
+  if name in repository_ctx.os.environ:
+    return repository_ctx.os.environ[name]
+  else:
+    return None
+
+
 # Parse the bazel version string from `native.bazel_version`.
 def _parse_bazel_version(bazel_version):
   # Remove commit from version.
@@ -74,7 +87,7 @@ temp_workaround_http_archive = repository_rule(
 # Executes specified command with arguments and calls 'fail' if it exited with
 # non-zero code
 def _execute_and_check_ret_code(repo_ctx, cmd_and_args):
-  result = repo_ctx.execute(cmd_and_args)
+  result = repo_ctx.execute(cmd_and_args, timeout=10)
   if result.return_code != 0:
     fail(("Non-zero return code({1}) when executing '{0}':\n" + "Stdout: {2}\n"
           + "Stderr: {3}").format(" ".join(cmd_and_args), result.return_code,
@@ -84,9 +97,15 @@ def _execute_and_check_ret_code(repo_ctx, cmd_and_args):
 # Apply a patch_file to the repository root directory
 # Runs 'patch -p1'
 def _apply_patch(repo_ctx, patch_file):
-  _execute_and_check_ret_code(repo_ctx, [
+  cmd = [
       "patch", "-p1", "-d", repo_ctx.path("."), "-i", repo_ctx.path(patch_file)
-  ])
+  ]
+  if _is_windows(repo_ctx):
+    bazel_sh = _get_env_var(repo_ctx, "BAZEL_SH")
+    if not bazel_sh:
+      fail("BAZEL_SH environment variable is not set")
+    cmd = [bazel_sh, "-c", " ".join(cmd)]
+  _execute_and_check_ret_code(repo_ctx, cmd)
 
 
 # Download the repository and apply a patch to its root
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index 928bd333c6..c453645db5 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -58,21 +58,53 @@ def _is_windows(repository_ctx):
   return False
 
 
+def _execute(repository_ctx, cmdline, error_msg=None, error_details=None,
+             empty_stdout_fine=False):
+  """Executes an arbitrary shell command.
+
+  Args:
+    repository_ctx: the repository_ctx object
+    cmdline: list of strings, the command to execute
+    error_msg: string, a summary of the error if the command fails
+    error_details: string, details about the error or steps to fix it
+    empty_stdout_fine: bool, if True, an empty stdout result is fine, otherwise
+      it's an error
+  Return:
+    the result of repository_ctx.execute(cmdline)
+  """
+  result = repository_ctx.execute(cmdline)
+  if result.stderr or not (empty_stdout_fine or result.stdout):
+    _python_configure_fail(
+        "\n".join([
+            error_msg.strip() if error_msg else "Repository command failed",
+            result.stderr.strip(),
+            error_details if error_details else ""]))
+  return result
+
+
 def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name):
   """returns a genrule to symlink all files in a directory."""
   # Get the list of files under this directory
   find_result = None
   if _is_windows(repository_ctx):
-    find_result = repository_ctx.execute([
-        "dir", src_dir, "/b", "/s", "/a-d",
-    ])
+    find_result = _execute(
+        repository_ctx,
+        ["cmd.exe", "/c", "dir", src_dir.replace("/", "\\"), "/b", "/s",
+         "/a-d"],
+        empty_stdout_fine=True)
+    # src_files will be used to compute BUILD rules, where path must use
+    # forward slashes.
+    src_files = find_result.stdout.replace("\\", "/").splitlines()
+    # Create a list with the src_dir stripped to use for outputs.
+    fwdslashes_src_dir = src_dir.replace("\\", "/")
+    dest_files = [e.replace(fwdslashes_src_dir, "") for e in src_files]
   else:
-    find_result = repository_ctx.execute([
-        "find", src_dir, "-follow", "-type", "f",
-    ])
-  # Create a list with the src_dir stripped to use for outputs.
-  dest_files = find_result.stdout.replace(src_dir, '').splitlines()
-  src_files = find_result.stdout.splitlines()
+    find_result = _execute(
+        repository_ctx, ["find", src_dir, "-follow", "-type", "f"],
+        empty_stdout_fine=True)
+    # Create a list with the src_dir stripped to use for outputs.
+    dest_files = find_result.stdout.replace(src_dir, '').splitlines()
+    src_files = find_result.stdout.splitlines()
   command = []
   command_windows = []
   outs = []
@@ -136,26 +168,27 @@ def _check_python_bin(repository_ctx, python_bin):
 
 def _get_python_include(repository_ctx, python_bin):
   """Gets the python include path."""
-  result = repository_ctx.execute([python_bin, "-c",
-                                   'from __future__ import print_function;' +
-                                   'from distutils import sysconfig;' +
-                                   'print(sysconfig.get_python_inc())'])
-  if result == "":
-    _python_configure_fail(
-        "Problem getting python include path.  Is distutils installed?")
+  result = _execute(repository_ctx,
+                    [python_bin, "-c",
+                     'from __future__ import print_function;' +
+                     'from distutils import sysconfig;' +
+                     'print(sysconfig.get_python_inc())'],
+                    error_msg="Problem getting python include path.",
+                    error_details=("Is the Python binary path set up right? " +
+                                   "(See ./configure or BAZEL_BIN_PATH.) " +
+                                   "Is distutils installed?"))
   return result.stdout.splitlines()[0]
 
 
 def _get_numpy_include(repository_ctx, python_bin):
   """Gets the numpy include path."""
-  result = repository_ctx.execute([python_bin, "-c",
-                                   'from __future__ import print_function;' +
-                                   'import numpy;' +
-                                   ' print(numpy.get_include());'])
-  if result == "":
-    _python_configure_fail(
-        "Problem getting numpy include path.  Is numpy installed?")
-  return result.stdout.splitlines()[0]
+  return _execute(repository_ctx,
+                  [python_bin, "-c",
+                   'from __future__ import print_function;' +
+                   'import numpy;' +
+                   ' print(numpy.get_include());'],
+                  error_msg="Problem getting numpy include path.",
+                  error_details="Is numpy installed?").stdout.splitlines()[0]
 
 
 def _create_local_python_repository(repository_ctx):
-- 
GitLab


From 1aaff859bfe8855ff81088dabf13991ce9c7494c Mon Sep 17 00:00:00 2001
From: Alex Egg <eggie5@gmail.com>
Date: Wed, 3 May 2017 19:36:33 -0700
Subject: [PATCH 0978/1563] Fixed typo: date -> data (#9648)

---
 tensorflow/docs_src/performance/performance_models.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index d415c29aa1..9ca1e77ff5 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -140,7 +140,7 @@ performance and increase the flexiblity of models.
 Most TensorFlow operations used by a CNN support both NHWC and NCHW data format.
 On GPU, NCHW is faster. But on CPU, NHWC is sometimes faster.
 
-Building a model to support both date formats keeps the model flexible and
+Building a model to support both data formats keeps the model flexible and
 capable of operating optimally regardless of platform. Most TensorFlow
 operations used by a CNN support both NHWC and NCHW data format. The benchmark
 script was written to support both NCHW and NHWC. NCHW should always be used
-- 
GitLab


From 8c5284c13def703948386b4628e2e6a40ba44b2c Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Wed, 3 May 2017 18:24:43 -0800
Subject: [PATCH 0979/1563] track variable's persistent momery in the variable
 op; remove tracking in allocate_persistent calls since we are going to track
 persistent memory of resources in resource ops.

We will soon use resource variables instead of variables, we will need to track that as well.
Change: 155036823
---
 tensorflow/core/framework/op_kernel.cc | 16 ----------------
 tensorflow/core/kernels/variable_ops.h | 12 ++++++++++++
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 3d913cdaf0..6fad379b76 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -656,22 +656,6 @@ Status OpKernelContext::allocate_persistent(DataType type,
       *out_tensor = out_persistent->AccessTensor(this);
     }
   }
-  if (track_allocations() && persistent.TotalBytes() > 0) {
-    // TODO(yuefengz): some allocators allocate memory even if the requested
-    // size is 0.
-    Allocator* a = get_allocator(attr);
-    if (a->TracksAllocationSizes()) {
-      int64 alloc_size =
-          a->AllocatedSize(const_cast<char*>(persistent.tensor_data().data()));
-      int64 alloc_id =
-          a->AllocationId(const_cast<char*>(persistent.tensor_data().data()));
-      if (allocate_on_host(attr)) {
-        record_host_persistent_memory_allocation(alloc_size, alloc_id);
-      } else {
-        record_device_persistent_memory_allocation(alloc_size, alloc_id);
-      }
-    }
-  }
   return s;
 }
 
diff --git a/tensorflow/core/kernels/variable_ops.h b/tensorflow/core/kernels/variable_ops.h
index 8c173a4ba3..25b17b26c8 100644
--- a/tensorflow/core/kernels/variable_ops.h
+++ b/tensorflow/core/kernels/variable_ops.h
@@ -76,6 +76,18 @@ class VariableOp : public OpKernel {
     // As long as the resource manager hasn't been cleared the ref we return
     // here is valid because it owns a ref on var.
     ctx->set_output_ref(0, var->mu(), var->tensor());
+    if (ctx->track_allocations() && var->tensor()->IsInitialized()) {
+      AllocatorAttributes attr;
+      attr.set_gpu_compatible(true);
+      attr.set_nic_compatible(true);
+      if (ctx->allocate_on_host(attr)) {
+        ctx->record_host_persistent_memory_allocation(
+            var->tensor()->AllocatedBytes());
+      } else {
+        ctx->record_device_persistent_memory_allocation(
+            var->tensor()->AllocatedBytes());
+      }
+    }
     var->Unref();
   }
 
-- 
GitLab


From dc33e79fea3777f23fa37a3d7840968d1a954190 Mon Sep 17 00:00:00 2001
From: Aaron Schumacher <ajschumacher@gmail.com>
Date: Wed, 3 May 2017 23:36:01 -0400
Subject: [PATCH 0980/1563] fix `iris_test.csv` download link (#9649)

---
 tensorflow/docs_src/get_started/monitors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/get_started/monitors.md b/tensorflow/docs_src/get_started/monitors.md
index cb4ef70eeb..d9c605b013 100644
--- a/tensorflow/docs_src/get_started/monitors.md
+++ b/tensorflow/docs_src/get_started/monitors.md
@@ -65,7 +65,7 @@ if __name__ == "__main__":
 
 Copy the above code into a file, and download the corresponding
 [training](http://download.tensorflow.org/data/iris_training.csv) and
-@{tf.test} data sets to the same
+[test](http://download.tensorflow.org/data/iris_test.csv) data sets to the same
 directory.
 
 In the following sections, you'll progressively make updates to the above code
-- 
GitLab


From b0ab95c7af7c051d78dd74bd0a3032ce35273ea6 Mon Sep 17 00:00:00 2001
From: Shane <sffc@sffc1.com>
Date: Wed, 3 May 2017 20:38:21 -0700
Subject: [PATCH 0981/1563] Catch exception on tf_session.TF_NewStatus()
 (#9575)

* Catch exception on tf_session.TF_NewStatus()

"try" and "finally" without "except" is not sufficient to catch the exception.  The exception makes TensorFlow appear to be broken.  Fixes #8652

* Catching an AttributeError instead of broad exception type
---
 tensorflow/python/client/session.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/python/client/session.py b/tensorflow/python/client/session.py
index 7981defe78..700e95c0b9 100644
--- a/tensorflow/python/client/session.py
+++ b/tensorflow/python/client/session.py
@@ -594,6 +594,9 @@ class BaseSession(SessionInterface):
       try:
         status = tf_session.TF_NewStatus()
         tf_session.TF_DeleteDeprecatedSession(self._session, status)
+      except AttributeError:
+        # 'NoneType' object has no attribute 'TF_NewStatus'
+        pass
       finally:
         if status is not None:
           tf_session.TF_DeleteStatus(status)
-- 
GitLab


From d0042ed637c5808d5de161353baf5209e46a5985 Mon Sep 17 00:00:00 2001
From: wuhaixutab <haixudontknow@yeah.net>
Date: Thu, 4 May 2017 12:23:13 +0800
Subject: [PATCH 0982/1563] Add input function for training and testing (#9617)
 (#9650)

* Add input function for training and testing

Estimator is decoupled from Scikit Learn interface by moving into separate class SKCompat. Arguments x, y and batch_size are only available in the SKCompat class, Estimator will only accept input_fn

* remove extra comma
---
 .../examples/tutorials/estimators/abalone.py     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tensorflow/examples/tutorials/estimators/abalone.py b/tensorflow/examples/tutorials/estimators/abalone.py
index 932ce8a8b2..3c0ea2e409 100644
--- a/tensorflow/examples/tutorials/estimators/abalone.py
+++ b/tensorflow/examples/tutorials/estimators/abalone.py
@@ -134,12 +134,22 @@ def main(unused_argv):
 
   # Instantiate Estimator
   nn = tf.contrib.learn.Estimator(model_fn=model_fn, params=model_params)
-
+  
+  def get_train_inputs():
+    x = tf.constant(training_set.data)
+    y = tf.constant(training_set.target)
+    return x, y
+  
   # Fit
-  nn.fit(x=training_set.data, y=training_set.target, steps=5000)
+  nn.fit(input_fn=get_train_inputs, steps=5000)
 
   # Score accuracy
-  ev = nn.evaluate(x=test_set.data, y=test_set.target, steps=1)
+  def get_test_inputs():
+    x = tf.constant(test_set.data)
+    y = tf.constant(test_set.target)
+    return x, y
+  
+  ev = nn.evaluate(input_fn=get_test_inputs, steps=1)
   print("Loss: %s" % ev["loss"])
   print("Root Mean Squared Error: %s" % ev["rmse"])
 
-- 
GitLab


From 66496e0445b1cd1cf661a7bc5b40bf4e3378012d Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Wed, 3 May 2017 21:21:16 -0800
Subject: [PATCH 0983/1563] Convert VadalidationMonitors to hooks in Experiment
 for fit/train call. Change: 155045865

---
 tensorflow/contrib/learn/python/learn/experiment.py      | 4 ++++
 tensorflow/contrib/learn/python/learn/experiment_test.py | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index 602d33e5f9..85d45aef7a 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -647,6 +647,10 @@ class Experiment(object):
     if _sentinel is not None:
       raise ValueError("_call_train should be called with keyword args only")
 
+    # Estimator in core cannot work with monitors. We need to convert them
+    # to hooks. For Estimator in contrib, it is converted internally. So, it is
+    # safe to convert for both cases.
+    hooks = monitors.replace_monitors_with_hooks(hooks, self._estimator)
     if self._core_estimator_used:
       return self._estimator.train(input_fn=input_fn,
                                    steps=steps,
diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index 4b5f3a195c..9ecfc73299 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -24,7 +24,6 @@ import time
 
 from tensorflow.contrib.learn.python.learn import evaluable
 from tensorflow.contrib.learn.python.learn import experiment
-from tensorflow.contrib.learn.python.learn import monitors
 from tensorflow.contrib.learn.python.learn import run_config
 from tensorflow.contrib.learn.python.learn import trainable
 from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
@@ -461,7 +460,8 @@ class ExperimentTest(test.TestCase):
       self.assertEqual(1, est.eval_count)
       self.assertEqual(1, len(est.monitors))
       self.assertEqual([noop_hook], est.eval_hooks)
-      self.assertTrue(isinstance(est.monitors[0], monitors.ValidationMonitor))
+      self.assertTrue(isinstance(est.monitors[0],
+                                 session_run_hook.SessionRunHook))
 
   def test_train_hooks_extend_does_not_mutate_input_hooks(self):
     for est in self._estimators_for_tests():
@@ -563,7 +563,8 @@ class ExperimentTest(test.TestCase):
       self.assertEqual(1, est.export_count)
       self.assertEqual(1, len(est.monitors))
       self.assertEqual([noop_hook], est.eval_hooks)
-      self.assertTrue(isinstance(est.monitors[0], monitors.ValidationMonitor))
+      self.assertTrue(isinstance(est.monitors[0],
+                                 session_run_hook.SessionRunHook))
 
   def test_train_and_evaluate_with_no_eval_during_training(self):
     for est in self._estimators_for_tests():
-- 
GitLab


From 34e31cd154dfa896272690413abe2a709b49d42d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 22:38:54 -0800
Subject: [PATCH 0984/1563] [XLA] Improve error message for concatenate, expose
 ComputationBuilder::first_error() Change: 155049706

---
 tensorflow/compiler/xla/client/computation_builder.h | 8 ++++++++
 tensorflow/compiler/xla/service/shape_inference.cc   | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/client/computation_builder.h b/tensorflow/compiler/xla/client/computation_builder.h
index 87ceb43d1f..6af69eeec1 100644
--- a/tensorflow/compiler/xla/client/computation_builder.h
+++ b/tensorflow/compiler/xla/client/computation_builder.h
@@ -668,6 +668,14 @@ class ComputationBuilder {
   // then Build() should be used instead.
   Computation BuildAndNoteError();
 
+  // Returns the first error that was encountered while building the
+  // computation. When an error is encountered, by default we return a vacuous
+  // ComputationDataHandle and inform the user of the error that occurred while
+  // building the computation when they make a final call to Build().
+  //
+  // See also set_die_immediately_on_error().
+  Status first_error() const { return first_error_; }
+
  private:
   using PopulateLiteral = std::function<void(Literal*)>;
 
diff --git a/tensorflow/compiler/xla/service/shape_inference.cc b/tensorflow/compiler/xla/service/shape_inference.cc
index 338d63f1a0..b2ef8ed486 100644
--- a/tensorflow/compiler/xla/service/shape_inference.cc
+++ b/tensorflow/compiler/xla/service/shape_inference.cc
@@ -244,8 +244,11 @@ StatusOr<Shape> InferWindowOutputShape(const Shape& base_shape,
     }
     if (ShapeUtil::Rank(*arg_shape) != ShapeUtil::Rank(*shape)) {
       return InvalidArgument(
-          "cannot concatenate arrays with different ranks: %lld vs %lld",
-          ShapeUtil::Rank(*arg_shape), ShapeUtil::Rank(*shape));
+          "Cannot concatenate arrays with different ranks: %lld (%s) vs %lld "
+          "(%s)",
+          ShapeUtil::Rank(*arg_shape),
+          ShapeUtil::HumanString(*arg_shape).c_str(), ShapeUtil::Rank(*shape),
+          ShapeUtil::HumanString(*shape).c_str());
     }
     if (arg_shape->element_type() != shape->element_type()) {
       return InvalidArgument(
-- 
GitLab


From b661c668c26e31ab1bd6f74d751390b511c50739 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 3 May 2017 22:48:59 -0800
Subject: [PATCH 0985/1563] Remove duplicated documentation for SavedModel CLI.
 Change: 155050138

---
 .../docs_src/programmers_guide/index.md       |  5 ++
 tensorflow/python/tools/saved_model_cli.py    | 64 +------------------
 2 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/tensorflow/docs_src/programmers_guide/index.md b/tensorflow/docs_src/programmers_guide/index.md
index 309b39451f..acdca2bad4 100644
--- a/tensorflow/docs_src/programmers_guide/index.md
+++ b/tensorflow/docs_src/programmers_guide/index.md
@@ -39,6 +39,11 @@ trained graph.  The following guide details `MetaGraph` objects:
 
   * @{$meta_graph$Exporting and Importing a MetaGraph}.
 
+`SavedModel` is the universal serialization format for Tensorflow models. TensorFlow provides SavedModel CLI (command-line interface) as a tool to inspect and execute a MetaGraph in a SavedModel. The detailed usages and examples are
+documented in the following guide:
+
+  * @{$saved_model_cli$SavedModel CLI (Command-Line Interface)}.
+
 To learn about the TensorFlow versioning scheme, consult the following two
 guides:
 
diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index 2fea29d961..c9c56a5014 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -14,68 +14,8 @@
 # ==============================================================================
 """Command-line interface to inspect and execute a graph in a SavedModel.
 
-If TensorFlow is installed on your system through pip, the 'saved_model_cli'
-binary can be invoked directly from command line.
-
-At a high level, SavedModel CLI allows users to both inspect and execute
-computations on a MetaGraphDef in a SavedModel. These are done through `show`
-and `run` commands. Following is the usage of the two commands. SavedModel
-CLI will also display these information with -h option.
-
-'show' command usage: saved_model_cli show [-h] --dir DIR [--tag_set TAG_SET]
-                          [--signature_def SIGNATURE_DEF_KEY]
-Examples:
-To show all available tag-sets in the SavedModel:
-  $saved_model_cli show --dir /tmp/saved_model
-
-To show all available SignatureDef keys in a MetaGraphDef specified by its
-tag-set:
-  $saved_model_cli show --dir /tmp/saved_model --tag_set serve
-For a MetaGraphDef with multiple tags in the tag-set, all tags must be passed
-in, separated by ',':
-  $saved_model_cli show --dir /tmp/saved_model --tag_set serve,gpu
-
-To show all inputs and outputs TensorInfo for a specific SignatureDef specified
-by the SignatureDef key in a MetaGraphDef:
-  $saved_model_cli show --dir /tmp/saved_model --tag_set serve
-  --signature_def serving_default
-Example output:
-  The given SavedModel SignatureDef contains the following input(s):
-  inputs['input0'] tensor_info:
-      dtype: DT_FLOAT
-      shape: (-1, 1)
-  inputs['input1'] tensor_info:
-      dtype: DT_FLOAT
-      shape: (-1, 1)
-  The given SavedModel SignatureDef contains the following output(s):
-  outputs['output'] tensor_info:
-      dtype: DT_FLOAT
-      shape: (-1, 1)
-  Method name is: tensorflow/serving/regress
-
-To show all available information in the SavedModel:
-  $saved_model_cli show --dir /tmp/saved_model --all
-
-usage: saved_model_cli run [-h] --dir DIR --tag_set TAG_SET --signature_def
-                           SIGNATURE_DEF_KEY [--inputs INPUTS]
-                           [--input_exprs INPUT_EXPRS] [--outdir OUTDIR]
-                           [--overwrite] [--tf_debug]
-
-Examples:
-To run input tensors from files through a MetaGraphDef and save the output
-tensors to files:
-  $saved_model_cli run --dir /tmp/saved_model --tag_set serve
-  --signature_def serving_default --inputs x=/tmp/124.npz
-  --input_exprs 'x2=np.ones((6,2))' --outdir /tmp/out
-
-To observe the intermediate Tensor values in the runtime graph, use the
---tf_debug flag, e.g.:
-  $saved_model_cli run --dir /tmp/saved_model --tag_set serve
-  --signature_def serving_default --inputs 'x=/tmp/124.npz;x2=/tmp/123.npy'
-  --outdir /tmp/out --tf_debug
-
-To build this tool from source, run:
-  $bazel build tensorflow/python/tools:saved_model_cli
+For detailed usages and examples, please refer to:
+https://www.tensorflow.org/programmers_guide/saved_model_cli
 
 """
 
-- 
GitLab


From 19d74ef55cf5979d133af6371e2bb644a09072e5 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <kramerb@google.com>
Date: Thu, 4 May 2017 01:28:15 -0800
Subject: [PATCH 0986/1563] [XLA] Add a target hook to force input layout equal
 to output layout in layout_assignment

Currently unused.
Change: 155058967
---
 tensorflow/compiler/xla/service/layout_assignment.cc | 3 ++-
 tensorflow/compiler/xla/service/layout_assignment.h  | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/layout_assignment.cc b/tensorflow/compiler/xla/service/layout_assignment.cc
index 5e7bd4a7ce..d413621cfe 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment.cc
@@ -705,7 +705,8 @@ std::unique_ptr<Layout> LayoutAssignment::ChooseOperandLayoutFromOutputLayout(
   CHECK(ShapeUtil::IsArray(instruction->shape()) &&
         ShapeUtil::IsArray(operand->shape()));
 
-  if (instruction->IsElementwiseOnOperand(operand_no) &&
+  if ((instruction->IsElementwiseOnOperand(operand_no) ||
+       InstructionRequiresInputLayoutEqualToOutputLayout(instruction)) &&
       !ShapeUtil::IsScalar(operand->shape()) &&
       ShapeUtil::Rank(operand->shape()) ==
           ShapeUtil::Rank(instruction->shape())) {
diff --git a/tensorflow/compiler/xla/service/layout_assignment.h b/tensorflow/compiler/xla/service/layout_assignment.h
index 61dc7b1207..4f586c334d 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.h
+++ b/tensorflow/compiler/xla/service/layout_assignment.h
@@ -248,6 +248,15 @@ class LayoutAssignment : public HloPassInterface {
     return Status::OK();
   }
 
+  // This method can be overriden to mark instructions as requiring the operands
+  // to have the same layout as the result, for performance or correctness. This
+  // will propagate constraints through the instruction from the result into the
+  // operands.
+  virtual bool InstructionRequiresInputLayoutEqualToOutputLayout(
+      const HloInstruction* instruction) {
+    return false;
+  }
+
   // Construct contraints and assign layouts to all instructions in the
   // computation satisfying the given ComputationLayout. Layouts constraints are
   // added, then propagated until all LogicalBuffers in the computation are
-- 
GitLab


From 0374fd18c2c6bd19dba265469604f711fe6a91c5 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 4 May 2017 04:55:19 -0800
Subject: [PATCH 0987/1563] Change Unique op to use gtl::FlatMap instead of
 std::unordered_map<>. Change: 155070869

---
 tensorflow/core/kernels/unique_op.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/kernels/unique_op.cc b/tensorflow/core/kernels/unique_op.cc
index f5d4fcec84..d50e2060ac 100644
--- a/tensorflow/core/kernels/unique_op.cc
+++ b/tensorflow/core/kernels/unique_op.cc
@@ -13,7 +13,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include <unordered_map>
 #include <utility>
 
 #include "tensorflow/core/framework/op_kernel.h"
@@ -21,6 +20,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/gtl/flatmap.h"
 
 namespace tensorflow {
 
@@ -50,8 +50,7 @@ class UniqueOp : public OpKernel {
                                 {0}, 1, input.shape(), &idx));
     auto idx_vec = idx->template vec<int32>();
 
-    std::unordered_map<T, int32> uniq;
-    uniq.reserve(2 * N);
+    gtl::FlatMap<T, int32> uniq(N);
     for (int64 i = 0, j = 0; i < N; ++i) {
       auto it = uniq.insert(std::make_pair(Tin(i), j));
       idx_vec(i) = it.first->second;
-- 
GitLab


From 42c7659eddaaeea13ffac6688e1acd56147abaf1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 07:04:55 -0800
Subject: [PATCH 0988/1563] Add `categorical_column_with_vocabulary_file`. Move
 lookup_ops implementation from tensorflow/contrib/lookup to
 tensorflow/python/feature_column. Change: 155079825

---
 tensorflow/contrib/cmake/tf_python.cmake      |   1 +
 tensorflow/contrib/lookup/BUILD               |  11 +-
 tensorflow/contrib/lookup/__init__.py         |   2 +-
 tensorflow/python/BUILD                       |   3 +-
 tensorflow/python/feature_column/BUILD        |  34 ++
 .../python/feature_column/feature_column.py   | 233 +++++++++-
 .../feature_column/feature_column_test.py     | 408 +++++++++++++++++-
 .../feature_column}/lookup_ops.py             |   6 +-
 .../testdata/warriors_vocabulary.txt          |   5 +
 .../testdata/wire_vocabulary.txt              |   3 +
 .../tools/pip_package/pip_smoke_test.py       |   1 +
 11 files changed, 666 insertions(+), 41 deletions(-)
 rename tensorflow/{contrib/lookup => python/feature_column}/lookup_ops.py (99%)
 create mode 100644 tensorflow/python/feature_column/testdata/warriors_vocabulary.txt
 create mode 100644 tensorflow/python/feature_column/testdata/wire_vocabulary.txt

diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 53ebfbb57d..ad3b29c8ea 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -203,6 +203,7 @@ add_python_module("tensorflow/python/estimator")
 add_python_module("tensorflow/python/estimator/export")
 add_python_module("tensorflow/python/estimator/inputs")
 add_python_module("tensorflow/python/estimator/inputs/queues")
+add_python_module("tensorflow/python/feature_column")
 add_python_module("tensorflow/python/framework")
 add_python_module("tensorflow/python/grappler")
 add_python_module("tensorflow/python/kernel_tests")
diff --git a/tensorflow/contrib/lookup/BUILD b/tensorflow/contrib/lookup/BUILD
index b3316ee8c4..5966c86dfb 100644
--- a/tensorflow/contrib/lookup/BUILD
+++ b/tensorflow/contrib/lookup/BUILD
@@ -13,19 +13,10 @@ py_library(
     name = "lookup_py",
     srcs = [
         "__init__.py",
-        "lookup_ops.py",
     ],
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:control_flow_ops",
-        "//tensorflow/python:data_flow_ops_gen",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:string_ops",
-        "//tensorflow/python:training",
-        "//tensorflow/python:util",
+        "//tensorflow/python/feature_column:lookup_ops",
     ],
 )
 
diff --git a/tensorflow/contrib/lookup/__init__.py b/tensorflow/contrib/lookup/__init__.py
index dbd64cf042..a5fcdc7b42 100644
--- a/tensorflow/contrib/lookup/__init__.py
+++ b/tensorflow/contrib/lookup/__init__.py
@@ -47,7 +47,7 @@ from __future__ import division
 from __future__ import print_function
 
 # pylint: disable=unused-import,wildcard-import
-from tensorflow.contrib.lookup.lookup_ops import *
+from tensorflow.python.feature_column.lookup_ops import *
 # pylint: enable=unused-import,wildcard-import
 
 from tensorflow.python.util.all_util import remove_undocumented
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 5e938c73f5..817d157da2 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -82,6 +82,7 @@ py_library(
         "//third_party/py/numpy",
         "//tensorflow/python/estimator:estimator_py",
         "//tensorflow/python/feature_column:feature_column",
+        "//tensorflow/python/feature_column:lookup_ops",
         "//tensorflow/python/ops/losses",
         "//tensorflow/python/ops/distributions",
         "//tensorflow/python/saved_model",
@@ -1021,7 +1022,7 @@ tf_gen_op_wrapper_private_py(
     require_shape_functions = True,
     visibility = [
         "//learning/brain/python/ops:__pkg__",
-        "//tensorflow/contrib/lookup:__pkg__",
+        "//tensorflow/python/feature_column:__pkg__",
         "//tensorflow/python/kernel_tests:__pkg__",
     ],
 )
diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
index d5eb20e997..d734273845 100644
--- a/tensorflow/python/feature_column/BUILD
+++ b/tensorflow/python/feature_column/BUILD
@@ -29,6 +29,7 @@ py_library(
     srcs = ["feature_column.py"],
     srcs_version = "PY2AND3",
     deps = [
+        ":lookup_ops",
         "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:init_ops",
@@ -44,14 +45,47 @@ py_library(
     ],
 )
 
+filegroup(
+    name = "vocabulary_testdata",
+    srcs = [
+        "testdata/warriors_vocabulary.txt",
+        "testdata/wire_vocabulary.txt",
+    ],
+)
+
 py_test(
     name = "feature_column_test",
     srcs = ["feature_column_test.py"],
+    data = [":vocabulary_testdata"],
     srcs_version = "PY2AND3",
+    tags = ["no_pip"],
     deps = [
         ":feature_column",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:training",
+    ],
+)
+
+# TODO(ptucker,yleon): Move along with 3p/tf/contrib/lookup.
+# Test is still in 3p/tf/contrib/lookup.
+py_library(
+    name = "lookup_ops",
+    srcs = [
+        "lookup_ops.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:data_flow_ops_gen",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:string_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
     ],
 )
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index a96052a3ae..33bed3abcf 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -121,6 +121,7 @@ from __future__ import print_function
 import abc
 import collections
 
+from tensorflow.python.feature_column import lookup_ops
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
@@ -331,7 +332,9 @@ def numeric_column(key,
   ```
 
   Args:
-    key: A string providing key to look up corresponding `Tensor`.
+    key: A unique string identifying the input feature. It is used as the
+      column name and the dictionary key for feature parsing configs, feature
+      `Tensor` objects, and feature columns.
     shape: An iterable of integers specifies the shape of the `Tensor`. An
       integer can be given which means a single dimension `Tensor` with given
       width. The `Tensor` representing the column will have the shape of
@@ -443,22 +446,22 @@ def categorical_column_with_hash_bucket(key,
 
   ```python
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
-  all_feature_columns = [keywords, ...]
-  linear_prediction = make_linear_model(features, all_feature_columns)
+  linear_prediction = make_linear_model(features, [keywords, ...])
 
   # or
   keywords_embedded = embedding_column(keywords, 16)
-  all_feature_columns = [keywords_embedded, ...]
-  dense_tensor = make_input_layer(features, all_feature_columns)
+  dense_tensor = make_input_layer(features, [keywords_embedded, ...])
   ```
 
   Args:
-    key: A string providing key to look up corresponding `Tensor`.
+    key: A unique string identifying the input feature. It is used as the
+      column name and the dictionary key for feature parsing configs, feature
+      `Tensor` objects, and feature columns.
     hash_bucket_size: An int > 1. The number of buckets.
     dtype: The type of features. Only string and integer types are supported.
 
   Returns:
-    A `_CategoricalColumnHashed`.
+    A `_HashedCategoricalColumn`.
 
   Raises:
     ValueError: `hash_bucket_size` is not greater than 1.
@@ -476,7 +479,100 @@ def categorical_column_with_hash_bucket(key,
     raise ValueError('dtype must be string or integer. '
                      'dtype: {}, column_name: {}'.format(dtype, key))
 
-  return _CategoricalColumnHashed(key, hash_bucket_size, dtype)
+  return _HashedCategoricalColumn(key, hash_bucket_size, dtype)
+
+
+def categorical_column_with_vocabulary_file(
+    key, vocabulary_file, vocabulary_size, num_oov_buckets=0,
+    default_value=None, dtype=dtypes.string):
+  """Creates a `_CategoricalColumn` with vocabulary file configuration.
+
+  Use this when your inputs are in string or integer format, and you have a
+  vocabulary file that maps each value to an integer ID. By default,
+  out-of-vocabulary values are ignored. Use either (but not both) of
+  `num_oov_buckets` and `default_value` to specify how to include
+  out-of-vocabulary values.
+
+  Inputs can be either `Tensor` or `SparseTensor`. If `Tensor`, missing values
+  can be represented by `-1` for int and `''` for string. Note that these values
+  are independent of the `default_value` argument.
+
+  Example with `num_oov_buckets`:
+  File '/us/states.txt' contains 50 lines, each with a 2-character U.S. state
+  abbreviation. All inputs with values in that file are assigned an ID 0-49,
+  corresponding to its line number. All other values are hashed and assigned an
+  ID 50-54.
+  ```python
+  states = categorical_column_with_vocabulary_file(
+      key='keywords', vocabulary_file='/us/states.txt', vocabulary_size=50,
+      num_oov_buckets=5)
+  linear_prediction = make_linear_model(features, [states, ...])
+  ```
+
+  Example with `default_value`:
+  File '/us/states.txt' contains 51 lines - the first line is 'XX', and the
+  other 50 each have a 2-character U.S. state abbreviation. Both a literal 'XX'
+  in input, and other values missing from the file, will be assigned ID 0. All
+  others are assigned the corresponding line number 1-50.
+  ```python
+  states = categorical_column_with_vocabulary_file(
+      key='keywords', vocabulary_file='/us/states.txt', vocabulary_size=51,
+      default_value=0)
+  linear_prediction, _, _ = make_linear_model(features, [states, ...])
+
+  And to make an embedding with either:
+  ```python
+  dense_tensor = make_input_layer(features, [embedding_column(states, 3),...])
+  ```
+
+  Args:
+    key: A unique string identifying the input feature. It is used as the
+      column name and the dictionary key for feature parsing configs, feature
+      `Tensor` objects, and feature columns.
+    vocabulary_file: The vocabulary file name.
+    vocabulary_size: Number of the elements in the vocabulary.
+    num_oov_buckets: Non-negative integer, the number of out-of-vocabulary
+      buckets. All out-of-vocabulary inputs will be assigned IDs in the range
+      `[vocabulary_size, vocabulary_size+num_oov_buckets)` based on a hash of
+      the input value. A positive `num_oov_buckets` can not be specified with
+      `default_value`.
+    default_value: The integer ID value to return for out-of-vocabulary feature
+      values, defaults to -1. This can not be specified with a positive
+      `num_oov_buckets`.
+    dtype: The type of features. Only string and integer types are supported.
+
+  Returns:
+    A `_CategoricalColumn` with vocabulary file configuration.
+
+  Raises:
+    ValueError: `vocabulary_file` is missing.
+    ValueError: `vocabulary_size` is missing or < 1.
+    ValueError: `num_oov_buckets` is not a non-negative integer.
+    ValueError: `dtype` is neither string nor integer.
+  """
+  if not vocabulary_file:
+    raise ValueError('Missing vocabulary_file in {}.'.format(key))
+  # `vocabulary_size` isn't required for lookup, but it is for `_num_buckets`.
+  # TODO(ptucker): Should we fail for vocabulary_size==1?
+  if (vocabulary_size is None) or (vocabulary_size < 1):
+    raise ValueError('Invalid vocabulary_size in {}.'.format(key))
+  if num_oov_buckets:
+    if default_value is not None:
+      raise ValueError(
+          'Can\'t specify both num_oov_buckets and default_value in {}.'.format(
+              key))
+    if num_oov_buckets < 0:
+      raise ValueError('Invalid num_oov_buckets {} in {}.'.format(
+          num_oov_buckets, key))
+  if dtype != dtypes.string and not dtype.is_integer:
+    raise ValueError('Invalid dtype {} in {}.'.format(dtype, key))
+  return _VocabularyCategoricalColumn(
+      key=key,
+      vocabulary_file=vocabulary_file,
+      vocabulary_size=vocabulary_size,
+      num_oov_buckets=0 if num_oov_buckets is None else num_oov_buckets,
+      default_value=-1 if default_value is None else default_value,
+      dtype=dtype)
 
 
 class _FeatureColumn(object):
@@ -764,6 +860,67 @@ class _LazyBuilder(object):
     return transformed
 
 
+# TODO(ptucker): Move to third_party/tensorflow/python/ops/sparse_ops.py
+def _shape_offsets(shape):
+  """Returns moving offset for each dimension given shape."""
+  offsets = []
+  for dim in reversed(shape):
+    if offsets:
+      offsets.append(dim * offsets[-1])
+    else:
+      offsets.append(dim)
+  offsets.reverse()
+  return offsets
+
+
+# TODO(ptucker): Move to third_party/tensorflow/python/ops/sparse_ops.py
+def _to_sparse_input(input_tensor, ignore_value=None):
+  """Converts a `Tensor` to a `SparseTensor`, dropping ignore_value cells.
+
+  If `input_tensor` is already a `SparseTensor`, just return it.
+
+  Args:
+    input_tensor: A string or integer `Tensor`.
+    ignore_value: Entries in `dense_tensor` equal to this value will be
+      absent from the resulting `SparseTensor`. If `None`, default value of
+      `dense_tensor`'s dtype will be used ('' for `str`, -1 for `int`).
+
+  Returns:
+    A `SparseTensor` with the same shape as `input_tensor`.
+
+  Raises:
+    ValueError: when `input_tensor`'s rank is `None`.
+  """
+  input_tensor = sparse_tensor_lib.convert_to_tensor_or_sparse_tensor(
+      input_tensor)
+  if isinstance(input_tensor, sparse_tensor_lib.SparseTensor):
+    return input_tensor
+  with ops.name_scope(None, 'to_sparse_input', (input_tensor, ignore_value,)):
+    input_rank = input_tensor.get_shape().ndims
+    if input_rank is None:
+      # TODO(b/32318825): Implement dense_to_sparse_tensor for undefined rank.
+      raise ValueError('Undefined input_tensor shape.')
+    if ignore_value is None:
+      ignore_value = '' if input_tensor.dtype == dtypes.string else -1
+    dense_shape = math_ops.cast(array_ops.shape(input_tensor), dtypes.int64)
+    indices = array_ops.where(math_ops.not_equal(
+        input_tensor, math_ops.cast(ignore_value, input_tensor.dtype)))
+    # Flattens the tensor and indices for use with gather.
+    flat_tensor = array_ops.reshape(input_tensor, [-1])
+    flat_indices = indices[:, input_rank - 1]
+    # Computes the correct flattened indices for 2d (or higher) tensors.
+    if input_rank > 1:
+      higher_dims = indices[:, :input_rank - 1]
+      shape_offsets = array_ops.stack(
+          _shape_offsets(array_ops.unstack(dense_shape)[1:]))
+      offsets = math_ops.reduce_sum(
+          math_ops.multiply(higher_dims, shape_offsets),
+          reduction_indices=[1])
+      flat_indices = math_ops.add(flat_indices, offsets)
+    values = array_ops.gather(flat_tensor, flat_indices)
+    return sparse_tensor_lib.SparseTensor(indices, values, dense_shape)
+
+
 def _check_feature_columns(feature_columns):
   if isinstance(feature_columns, dict):
     raise ValueError('Expected feature_columns to be iterable, found dict.')
@@ -951,7 +1108,7 @@ def _check_default_value(shape, default_value, dtype, key):
       `shape`.
     dtype: defines the type of values. Default value is `tf.float32`. Must be a
       non-quantized, real integer or floating point type.
-    key: A string providing key to look up corresponding `Tensor`.
+    key: Column name, used only for error messages.
 
   Returns:
     A tuple which will be used as default value.
@@ -994,9 +1151,9 @@ def _check_default_value(shape, default_value, dtype, key):
                       default_value, dtype, key))
 
 
-class _CategoricalColumnHashed(
+class _HashedCategoricalColumn(
     _CategoricalColumn,
-    collections.namedtuple('_CategoricalColumnHashed',
+    collections.namedtuple('_HashedCategoricalColumn',
                            ['key', 'hash_bucket_size', 'dtype'])):
   """see `categorical_column_with_hash_bucket`."""
 
@@ -1009,7 +1166,7 @@ class _CategoricalColumnHashed(
     return {self.key: parsing_ops.VarLenFeature(self.dtype)}
 
   def _transform_feature(self, inputs):
-    input_tensor = inputs.get(self.key)
+    input_tensor = _to_sparse_input(inputs.get(self.key))
     if not isinstance(input_tensor, sparse_tensor_lib.SparseTensor):
       raise ValueError('SparseColumn input must be a SparseTensor.')
 
@@ -1045,6 +1202,58 @@ class _CategoricalColumnHashed(
     return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
 
 
+class _VocabularyCategoricalColumn(
+    _CategoricalColumn, collections.namedtuple('_VocabularyCategoricalColumn', (
+        'key', 'vocabulary_file', 'vocabulary_size', 'num_oov_buckets', 'dtype',
+        'default_value'
+    ))):
+  """See `categorical_column_with_vocabulary_file`."""
+
+  @property
+  def name(self):
+    return self.key
+
+  @property
+  def _parse_example_config(self):
+    return {self.key: parsing_ops.VarLenFeature(self.dtype)}
+
+  def _transform_feature(self, inputs):
+    input_tensor = _to_sparse_input(inputs.get(self.key))
+
+    if self.dtype.is_integer != input_tensor.dtype.is_integer:
+      raise ValueError(
+          'Column dtype and SparseTensors dtype must be compatible. '
+          'key: {}, column dtype: {}, tensor dtype: {}'.format(
+              self.key, self.dtype, input_tensor.dtype))
+
+    key_dtype = self.dtype
+    if input_tensor.dtype.is_integer:
+      # `index_table_from_file` requires 64-bit integer keys.
+      key_dtype = dtypes.int64
+      input_tensor = math_ops.to_int64(input_tensor)
+    elif input_tensor.dtype != dtypes.string:
+      raise ValueError('input tensors dtype must be string or integer. '
+                       'dtype: {}, column_name: {}'.format(
+                           input_tensor.dtype, self.key))
+
+    return lookup_ops.index_table_from_file(
+        vocabulary_file=self.vocabulary_file,
+        num_oov_buckets=self.num_oov_buckets,
+        vocab_size=self.vocabulary_size,
+        default_value=self.default_value,
+        key_dtype=key_dtype,
+        name='{}_lookup'.format(self.key)).lookup(input_tensor)
+
+  @property
+  def _num_buckets(self):
+    """Returns number of buckets in this sparse feature."""
+    return self.vocabulary_size + self.num_oov_buckets
+
+  def _get_sparse_tensors(
+      self, inputs, weight_collections=None, trainable=None):
+    return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
+
+
 # TODO(zakaria): Move this to embedding_ops and make it public.
 def _safe_embedding_lookup_sparse(embedding_weights,
                                   sparse_ids,
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index bc62653310..d85142abcf 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -28,6 +28,7 @@ from tensorflow.python.client import session
 from tensorflow.python.feature_column import feature_column as fc
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import data_flow_ops
@@ -552,7 +553,7 @@ class BucketizedColumnTest(test.TestCase):
         self.assertAllClose([[81.], [141.]], predictions.eval())
 
 
-class SparseColumnHashedTest(test.TestCase):
+class HashedCategoricalColumnTest(test.TestCase):
 
   def test_defaults(self):
     a = fc.categorical_column_with_hash_bucket('aaa', 10)
@@ -578,11 +579,14 @@ class SparseColumnHashedTest(test.TestCase):
 
   def test_deep_copy(self):
     """Tests deepcopy of categorical_column_with_hash_bucket."""
-    column = fc.categorical_column_with_hash_bucket('aaa', 10)
-    column_copy = copy.deepcopy(column)
-    self.assertEqual('aaa', column_copy.name)
-    self.assertEqual(10, column_copy.hash_bucket_size)
-    self.assertEqual(dtypes.string, column_copy.dtype)
+    original = fc.categorical_column_with_hash_bucket('aaa', 10)
+    for column in (original, copy.deepcopy(original)):
+      self.assertEqual('aaa', column.name)
+      self.assertEqual(10, column.hash_bucket_size)
+      # pylint: disable=protected-access
+      self.assertEqual(10, column._num_buckets)
+      # pylint: enable=protected-access
+      self.assertEqual(dtypes.string, column.dtype)
 
   def test_parse_config(self):
     a = fc.categorical_column_with_hash_bucket('aaa', 10)
@@ -681,14 +685,45 @@ class SparseColumnHashedTest(test.TestCase):
 
   def test_get_sparse_tensors(self):
     hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
-    wire_tensor = sparse_tensor.SparseTensor(
-        values=['omar', 'stringer', 'marlo'],
-        indices=[[0, 0], [1, 0], [1, 1]],
-        dense_shape=[2, 2])
-    builder = fc._LazyBuilder({'wire': wire_tensor})
-    self.assertEqual(
-        builder.get(hashed_sparse),
-        hashed_sparse._get_sparse_tensors(builder).id_tensor)
+    builder = fc._LazyBuilder({
+        'wire': sparse_tensor.SparseTensor(
+            values=['omar', 'stringer', 'marlo'],
+            indices=[[0, 0], [1, 0], [1, 1]],
+            dense_shape=[2, 2])
+    })
+    id_weight_pair = hashed_sparse._get_sparse_tensors(builder)
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    self.assertEqual(builder.get(hashed_sparse), id_weight_pair.id_tensor)
+
+  def test_get_sparse_tensors_dense_input(self):
+    hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
+    builder = fc._LazyBuilder({
+        'wire': (('omar', ''), ('stringer', 'marlo'))
+    })
+    id_weight_pair = hashed_sparse._get_sparse_tensors(builder)
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    self.assertEqual(builder.get(hashed_sparse), id_weight_pair.id_tensor)
+
+  def test_make_linear_model(self):
+    wire_column = fc.categorical_column_with_hash_bucket('wire', 4)
+    self.assertEqual(4, wire_column._num_buckets)
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          wire_column.name: sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=('marlo', 'skywalker', 'omar'),
+              dense_shape=(2, 2))
+      }, (wire_column,))
+      bias = get_linear_model_bias()
+      wire_var = get_linear_model_column_var(wire_column)
+      with _initialized_session():
+        self.assertAllClose((0.,), bias.eval())
+        self.assertAllClose(((0.,), (0.,), (0.,), (0.,)), wire_var.eval())
+        self.assertAllClose(((0.,), (0.,)), predictions.eval())
+        wire_var.assign(((1.,), (2.,), (3.,), (4.,))).eval()
+        # 'marlo' -> 3: wire_var[3] = 4
+        # 'skywalker' -> 2, 'omar' -> 2: wire_var[2] + wire_var[2] = 3+3 = 6
+        self.assertAllClose(((4.,), (6.,)), predictions.eval())
 
 
 def get_linear_model_bias():
@@ -1158,5 +1193,350 @@ class MakeInputLayerTest(test.TestCase):
         self.assertAllClose([[1., 3.]], net2.eval())
 
 
+class VocabularyCategoricalColumnTest(test.TestCase):
+
+  def setUp(self):
+    super(VocabularyCategoricalColumnTest, self).setUp()
+
+    # Contains ints, Golden State Warriors jersey numbers: 30, 35, 11, 23, 22
+    self._warriors_vocabulary_file_name = test.test_src_dir_path(
+        'python/feature_column/testdata/warriors_vocabulary.txt')
+    self._warriors_vocabulary_size = 5
+
+    # Contains strings, character names from 'The Wire': omar, stringer, marlo
+    self._wire_vocabulary_file_name = test.test_src_dir_path(
+        'python/feature_column/testdata/wire_vocabulary.txt')
+    self._wire_vocabulary_size = 3
+
+  def _assert_sparse_tensor_value(self, expected, actual):
+    self.assertEqual(np.int64, np.array(actual.indices).dtype)
+    self.assertAllEqual(expected.indices, actual.indices)
+
+    self.assertEqual(
+        np.array(expected.values).dtype, np.array(actual.values).dtype)
+    self.assertAllEqual(expected.values, actual.values)
+
+    self.assertEqual(np.int64, np.array(actual.dense_shape).dtype)
+    self.assertAllEqual(expected.dense_shape, actual.dense_shape)
+
+  def test_defaults(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa', vocabulary_file='path_to_file', vocabulary_size=3)
+    self.assertEqual('aaa', column.name)
+    # pylint: disable=protected-access
+    self.assertEqual(3, column._num_buckets)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.string)
+    }, column._parse_example_config)
+    # pylint: enable=protected-access
+
+  def test_all_constructor_args(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa', vocabulary_file='path_to_file', vocabulary_size=3,
+        num_oov_buckets=4, dtype=dtypes.int32)
+    # pylint: disable=protected-access
+    self.assertEqual(7, column._num_buckets)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.int32)
+    }, column._parse_example_config)
+    # pylint: enable=protected-access
+
+  def test_deep_copy(self):
+    """Tests deepcopy of categorical_column_with_hash_bucket."""
+    original = fc.categorical_column_with_vocabulary_file(
+        key='aaa', vocabulary_file='path_to_file', vocabulary_size=3,
+        num_oov_buckets=4, dtype=dtypes.int32)
+    for column in (original, copy.deepcopy(original)):
+      self.assertEqual('aaa', column.name)
+      # pylint: disable=protected-access
+      self.assertEqual(7, column._num_buckets)
+      self.assertEqual({
+          'aaa': parsing_ops.VarLenFeature(dtypes.int32)
+      }, column._parse_example_config)
+      # pylint: enable=protected-access
+
+  def test_vocabulary_file_none(self):
+    with self.assertRaisesRegexp(ValueError, 'Missing vocabulary_file'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa', vocabulary_file=None, vocabulary_size=3)
+
+  def test_vocabulary_file_empty_string(self):
+    with self.assertRaisesRegexp(ValueError, 'Missing vocabulary_file'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa', vocabulary_file='', vocabulary_size=3)
+
+  def test_invalid_vocabulary_file(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa', vocabulary_file='file_does_not_exist', vocabulary_size=10)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    with self.assertRaisesRegexp(errors.OpError, 'file_does_not_exist'):
+      with self.test_session():
+        data_flow_ops.tables_initializer().run()
+
+  def test_invalid_vocabulary_size(self):
+    with self.assertRaisesRegexp(ValueError, 'Invalid vocabulary_size'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa', vocabulary_file=self._wire_vocabulary_file_name,
+          vocabulary_size=None)
+    with self.assertRaisesRegexp(ValueError, 'Invalid vocabulary_size'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa', vocabulary_file=self._wire_vocabulary_file_name,
+          vocabulary_size=-1)
+    with self.assertRaisesRegexp(ValueError, 'Invalid vocabulary_size'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa', vocabulary_file=self._wire_vocabulary_file_name,
+          vocabulary_size=0)
+
+  def test_too_large_vocabulary_size(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size + 1)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    with self.assertRaisesRegexp(errors.OpError, 'Invalid vocab_size'):
+      with self.test_session():
+        data_flow_ops.tables_initializer().run()
+
+  def test_invalid_num_oov_buckets(self):
+    with self.assertRaisesRegexp(ValueError, 'Invalid num_oov_buckets'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa', vocabulary_file='path', vocabulary_size=3,
+          num_oov_buckets=-1)
+
+  def test_invalid_dtype(self):
+    with self.assertRaisesRegexp(ValueError, 'Invalid dtype'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa', vocabulary_file='path', vocabulary_size=3,
+          dtype=dtypes.float64)
+
+  def test_invalid_buckets_and_default_value(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'both num_oov_buckets and default_value'):
+      fc.categorical_column_with_vocabulary_file(
+          key='aaa',
+          vocabulary_file=self._wire_vocabulary_file_name,
+          vocabulary_size=self._wire_vocabulary_size,
+          num_oov_buckets=100,
+          default_value=2)
+
+  def test_get_sparse_tensors(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, -1, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_dense_input(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size)
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
+        'aaa': (('marlo', ''), ('skywalker', 'omar'))
+    }))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=np.array((2, -1, 0), dtype=np.int64),
+              dense_shape=(2, 2)),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_default_value_in_vocabulary(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size,
+        default_value=2)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, 2, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_with_oov_buckets(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size,
+        num_oov_buckets=100)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1), (1, 2)),
+        values=('marlo', 'skywalker', 'omar', 'heisenberg'),
+        dense_shape=(2, 3))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, 33, 0, 62), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_small_vocabulary_size(self):
+    # 'marlo' is the last entry in our vocabulary file, so be setting
+    # `vocabulary_size` to 1 less than number of entries in file, we take
+    # 'marlo' out of the vocabulary.
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size - 1)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((-1, -1, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_int32(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._warriors_vocabulary_file_name,
+        vocabulary_size=self._warriors_vocabulary_size,
+        dtype=dtypes.int32)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1), (2, 2)),
+        values=(11, 100, 30, 22),
+        dense_shape=(3, 3))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, -1, 0, 4), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_int32_dense_input(self):
+    default_value = -100
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._warriors_vocabulary_file_name,
+        vocabulary_size=self._warriors_vocabulary_size,
+        dtype=dtypes.int32,
+        default_value=default_value)
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
+        'aaa': ((11, -1, -1), (100, 30, -1), (-1, -1, 22))
+    }))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1), (2, 2)),
+              values=np.array((2, default_value, 0, 4), dtype=np.int64),
+              dense_shape=(3, 3)),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_int32_with_oov_buckets(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._warriors_vocabulary_file_name,
+        vocabulary_size=self._warriors_vocabulary_size,
+        dtype=dtypes.int32,
+        num_oov_buckets=100)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1), (2, 2)),
+        values=(11, 100, 30, 22),
+        dense_shape=(3, 3))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      self._assert_sparse_tensor_value(
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, 60, 0, 4), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_make_linear_model(self):
+    wire_column = fc.categorical_column_with_vocabulary_file(
+        key='wire',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size,
+        num_oov_buckets=1)
+    self.assertEqual(4, wire_column._num_buckets)
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          wire_column.name: sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=('marlo', 'skywalker', 'omar'),
+              dense_shape=(2, 2))
+      }, (wire_column,))
+      bias = get_linear_model_bias()
+      wire_var = get_linear_model_column_var(wire_column)
+      with _initialized_session():
+        self.assertAllClose((0.,), bias.eval())
+        self.assertAllClose(((0.,), (0.,), (0.,), (0.,)), wire_var.eval())
+        self.assertAllClose(((0.,), (0.,)), predictions.eval())
+        wire_var.assign(((1.,), (2.,), (3.,), (4.,))).eval()
+        # 'marlo' -> 2: wire_var[2] = 3
+        # 'skywalker' -> 3, 'omar' -> 0: wire_var[3] + wire_var[0] = 4+1 = 5
+        self.assertAllClose(((3.,), (5.,)), predictions.eval())
+
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/lookup/lookup_ops.py b/tensorflow/python/feature_column/lookup_ops.py
similarity index 99%
rename from tensorflow/contrib/lookup/lookup_ops.py
rename to tensorflow/python/feature_column/lookup_ops.py
index 9dc7414cd0..13a67fa518 100644
--- a/tensorflow/contrib/lookup/lookup_ops.py
+++ b/tensorflow/python/feature_column/lookup_ops.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Lookup table Operations."""
-# pylint: disable=g-bad-name
+"""Lookup table operations."""
+
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
@@ -608,7 +608,7 @@ class HasherSpec(collections.namedtuple("HasherSpec", ["hasher", "key"])):
   __slots__ = ()
 
 
-FastHashSpec = HasherSpec("fasthash", None)
+FastHashSpec = HasherSpec("fasthash", None)  # pylint: disable=invalid-name
 
 
 class StrongHashSpec(HasherSpec):
diff --git a/tensorflow/python/feature_column/testdata/warriors_vocabulary.txt b/tensorflow/python/feature_column/testdata/warriors_vocabulary.txt
new file mode 100644
index 0000000000..6c917fa699
--- /dev/null
+++ b/tensorflow/python/feature_column/testdata/warriors_vocabulary.txt
@@ -0,0 +1,5 @@
+30
+35
+11
+23
+22
diff --git a/tensorflow/python/feature_column/testdata/wire_vocabulary.txt b/tensorflow/python/feature_column/testdata/wire_vocabulary.txt
new file mode 100644
index 0000000000..32c6b5692a
--- /dev/null
+++ b/tensorflow/python/feature_column/testdata/wire_vocabulary.txt
@@ -0,0 +1,3 @@
+omar
+stringer
+marlo
diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index 61c3fe5540..0438ce6846 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -45,6 +45,7 @@ BLACKLIST = [
     "//tensorflow/python:compare_test_proto_py",
     "//tensorflow/core:image_testdata",
     "//tensorflow/core/kernels/cloud:bigquery_reader_ops",
+    "//tensorflow/python/feature_column:vocabulary_testdata",
     "//tensorflow/python:framework/test_file_system.so",
     # contrib
     "//tensorflow/contrib/session_bundle:session_bundle_half_plus_two",
-- 
GitLab


From 1ed691459980004f0f9e53bd19d751fa5449d79f Mon Sep 17 00:00:00 2001
From: Oleksii Kuchaiev <okuchaiev@users.noreply.github.com>
Date: Thu, 4 May 2017 09:44:57 -0700
Subject: [PATCH 0989/1563] Group LSTM cell (#9606)

* GLSTM cell from https://openreview.net/forum?id=ByxWXyNFg&noteId=ByxWXyNFg

* Responding to comments on PR#9606

* Update comments according to review.

* More fixes on users' behalf.
---
 .../rnn/python/kernel_tests/rnn_cell_test.py  |  58 ++++++
 tensorflow/contrib/rnn/python/ops/rnn_cell.py | 178 ++++++++++++++++++
 2 files changed, 236 insertions(+)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
index 55fd7e7a51..31ac89b4a8 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
@@ -906,6 +906,64 @@ class RNNCellTest(test.TestCase):
       # States are left untouched
       self.assertAllClose(res[2], res[3])
 
+  def testGLSTMCell(self):
+    # Ensure that G-LSTM matches LSTM when number_of_groups = 1
+    batch_size = 2
+    num_units = 4
+    number_of_groups = 1
+
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root1", initializer=init_ops.constant_initializer(0.5)):
+        x = array_ops.ones([batch_size, num_units])
+        # When number_of_groups = 1, G-LSTM is equivalent to regular LSTM
+        gcell = rnn_cell.GLSTMCell(num_units=num_units,
+                                   number_of_groups=number_of_groups)
+        cell = core_rnn_cell_impl.LSTMCell(num_units=num_units)
+        self.assertTrue(isinstance(gcell.state_size, tuple))
+        zero_state = gcell.zero_state(batch_size=batch_size,
+                                      dtype=dtypes.float32)
+        gh, gs = gcell(x, zero_state)
+        h, g = cell(x, zero_state)
+
+        sess.run([variables.global_variables_initializer()])
+        glstm_result = sess.run([gh, gs])
+        lstm_result = sess.run([h, g])
+
+        self.assertAllClose(glstm_result[0], lstm_result[0], 1e-5)
+        self.assertAllClose(glstm_result[1], lstm_result[1], 1e-5)
+
+    # Test that G-LSTM subgroup act like corresponding sub-LSTMs
+    batch_size = 2
+    num_units = 4
+    number_of_groups = 2
+
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root2", initializer=init_ops.constant_initializer(0.5)):
+        # input for G-LSTM with 2 groups
+        glstm_input = array_ops.ones([batch_size, num_units])
+        gcell = rnn_cell.GLSTMCell(num_units=num_units,
+                                   number_of_groups=number_of_groups)
+        gcell_zero_state = gcell.zero_state(batch_size=batch_size,
+                                            dtype=dtypes.float32)
+        gh, gs = gcell(glstm_input, gcell_zero_state)
+
+        # input for LSTM cell simulating single G-LSTM group
+        lstm_input = array_ops.ones([batch_size, num_units / number_of_groups])
+        # note division by number_of_groups. This cell one simulates G-LSTM group
+        cell = core_rnn_cell_impl.LSTMCell(num_units=
+                                           int(num_units / number_of_groups))
+        cell_zero_state = cell.zero_state(batch_size=batch_size,
+                                          dtype=dtypes.float32)
+        h, g = cell(lstm_input, cell_zero_state)
+
+        sess.run([variables.global_variables_initializer()])
+        [gh_res, h_res] = sess.run([gh, h])
+        self.assertAllClose(gh_res[:, 0:int(num_units / number_of_groups)],
+                            h_res, 1e-5)
+        self.assertAllClose(gh_res[:, int(num_units / number_of_groups):],
+                            h_res, 1e-5)
 
 class LayerNormBasicLSTMCellTest(test.TestCase):
 
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index acba77f0e1..df36dd2bf9 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -1926,3 +1926,181 @@ class PhasedLSTMCell(core_rnn_cell.RNNCell):
     new_state = core_rnn_cell.LSTMStateTuple(new_c, new_h)
 
     return new_h, new_state
+
+
+class GLSTMCell(core_rnn_cell.RNNCell):
+  """Group LSTM cell (G-LSTM).
+
+  The implementation is based on:
+
+    https://arxiv.org/abs/1703.10722
+
+  O. Kuchaiev and B. Ginsburg
+  "Factorization Tricks for LSTM Networks", ICLR 2017 workshop.
+  """
+
+  def __init__(self, num_units, initializer=None, num_proj=None,
+               number_of_groups=1, forget_bias=1.0, activation=math_ops.tanh,
+               reuse=None):
+    """Initialize the parameters of G-LSTM cell.
+
+    Args:
+      num_units: int, The number of units in the G-LSTM cell
+      initializer: (optional) The initializer to use for the weight and
+        projection matrices.
+      num_proj: (optional) int, The output dimensionality for the projection
+        matrices.  If None, no projection is performed.
+      number_of_groups: (optional) int, number of groups to use.
+        If `number_of_groups` is 1, then it should be equivalent to LSTM cell
+      forget_bias: Biases of the forget gate are initialized by default to 1
+        in order to reduce the scale of forgetting at the beginning of
+        the training.
+      activation: Activation function of the inner states.
+      reuse: (optional) Python boolean describing whether to reuse variables
+        in an existing scope.  If not `True`, and the existing scope already
+        has the given variables, an error is raised.
+
+    Raises:
+      ValueError: If `num_units` or `num_proj` is not divisible by 
+        `number_of_groups`.
+    """
+    super(GLSTMCell, self).__init__(_reuse=reuse)
+    self._num_units = num_units
+    self._initializer = initializer
+    self._num_proj = num_proj
+    self._forget_bias = forget_bias
+    self._activation = activation
+    self._number_of_groups = number_of_groups
+
+    if self._num_units % self._number_of_groups != 0:
+      raise ValueError("num_units must be divisible by number_of_groups")
+    if self._num_proj:
+      if self._num_proj % self._number_of_groups != 0:
+        raise ValueError("num_proj must be divisible by number_of_groups")
+      self._group_shape = [int(self._num_proj / self._number_of_groups),
+                           int(self._num_units / self._number_of_groups)]
+    else:
+      self._group_shape = [int(self._num_units / self._number_of_groups),
+                           int(self._num_units / self._number_of_groups)]
+
+    if num_proj:
+      self._state_size = core_rnn_cell.LSTMStateTuple(num_units, num_proj)
+      self._output_size = num_proj
+    else:
+      self._state_size = core_rnn_cell.LSTMStateTuple(num_units, num_units)
+      self._output_size = num_units
+
+  @property
+  def state_size(self):
+    return self._state_size
+
+  @property
+  def output_size(self):
+    return self._output_size
+
+  def _get_input_for_group(self, inputs, group_id, group_size):
+    """Slices inputs into groups to prepare for processing by cell's groups
+
+    Args:
+      inputs: cell input or it's previous state,
+              a Tensor, 2D, [batch x num_units]
+      group_id: group id, a Scalar, for which to prepare input
+      group_size: size of the group
+
+    Returns:
+      subset of inputs corresponding to group "group_id",
+      a Tensor, 2D, [batch x num_units/number_of_groups]
+    """
+    batch_size = inputs.shape[0].value or array_ops.shape(value)[0]
+    return array_ops.slice(input_=inputs,
+                           begin=[0, group_id * group_size],
+                           size=[batch_size, group_size],
+                           name=("GLSTM_group%d_input_generation" % group_id))
+
+  def call(self, inputs, state):
+    """Run one step of G-LSTM.
+
+    Args:
+      inputs: input Tensor, 2D, [batch x num_units].
+      state: this must be a tuple of state Tensors, both `2-D`,
+      with column sizes `c_state` and `m_state`.
+
+    Returns:
+      A tuple containing:
+
+      - A `2-D, [batch x output_dim]`, Tensor representing the output of the
+        G-LSTM after reading `inputs` when previous state was `state`.
+        Here output_dim is:
+           num_proj if num_proj was set,
+           num_units otherwise.
+      - LSTMStateTuple representing the new state of G-LSTM  cell
+        after reading `inputs` when the previous state was `state`.
+
+    Raises:
+      ValueError: If input size cannot be inferred from inputs via
+        static shape inference.
+    """
+    (c_prev, m_prev) = state
+
+    input_size = inputs.get_shape().with_rank(2)[1]
+    if input_size.value is None:
+      raise ValueError("Couldn't infer input size from inputs.get_shape()[-1]")
+    dtype = inputs.dtype
+    scope = vs.get_variable_scope()
+    with vs.variable_scope(scope, initializer=self._initializer):
+      i_parts = []
+      j_parts = []
+      f_parts = []
+      o_parts = []
+
+      for group_id in range(self._number_of_groups):
+        with vs.variable_scope("group%d" % group_id):
+          x_g_id = array_ops.concat(
+            [self._get_input_for_group(inputs, group_id,
+                                       self._group_shape[0]),
+             self._get_input_for_group(m_prev, group_id,
+                                       self._group_shape[0])], axis=1)
+          R_k = _linear(x_g_id, 4 * self._group_shape[1], bias=False)
+          i_k, j_k, f_k, o_k = array_ops.split(R_k, 4, 1)
+
+        i_parts.append(i_k)
+        j_parts.append(j_k)
+        f_parts.append(f_k)
+        o_parts.append(o_k)
+
+      bi = vs.get_variable(name="bias_i",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+      bj = vs.get_variable(name="bias_j",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+      bf = vs.get_variable(name="bias_f",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+      bo = vs.get_variable(name="bias_o",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+
+      i = nn_ops.bias_add(array_ops.concat(i_parts, axis=1), bi)
+      j = nn_ops.bias_add(array_ops.concat(j_parts, axis=1), bj)
+      f = nn_ops.bias_add(array_ops.concat(f_parts, axis=1), bf)
+      o = nn_ops.bias_add(array_ops.concat(o_parts, axis=1), bo)
+
+    c = (math_ops.sigmoid(f + self._forget_bias) * c_prev +
+         math_ops.sigmoid(i) * math_ops.tanh(j))
+    m = math_ops.sigmoid(o) * self._activation(c)
+
+    if self._num_proj is not None:
+      with vs.variable_scope("projection"):
+        m = _linear(m, self._num_proj, bias=False)
+
+    new_state = core_rnn_cell.LSTMStateTuple(c, m)
+    return m, new_state
-- 
GitLab


From 1e4899035ed82c85f6c85b7349211528f161402c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 08:29:59 -0800
Subject: [PATCH 0990/1563] Use six.string_types instead of str in
 estimator/export. Change: 155087824

---
 tensorflow/python/estimator/export/export.py  |  6 +-
 .../python/estimator/export/export_output.py  |  4 +-
 .../estimator/export/export_output_test.py    | 29 ++++++++
 .../python/estimator/export/export_test.py    | 67 ++++++++++++++++++-
 4 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/estimator/export/export.py b/tensorflow/python/estimator/export/export.py
index 37a98cf481..a1ecd794df 100644
--- a/tensorflow/python/estimator/export/export.py
+++ b/tensorflow/python/estimator/export/export.py
@@ -23,6 +23,8 @@ import collections
 import os
 import time
 
+import six
+
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
@@ -56,7 +58,7 @@ class ServingInputReceiver(collections.namedtuple('ServingInputReceiver',
     if not isinstance(features, dict):
       features = {_SINGLE_FEATURE_DEFAULT_NAME: features}
     for name, tensor in features.items():
-      if not isinstance(name, str):
+      if not isinstance(name, six.string_types):
         raise ValueError('feature keys must be strings: {}.'.format(name))
       if not (isinstance(tensor, ops.Tensor)
               or isinstance(tensor, sparse_tensor.SparseTensor)):
@@ -68,7 +70,7 @@ class ServingInputReceiver(collections.namedtuple('ServingInputReceiver',
     if not isinstance(receiver_tensors, dict):
       receiver_tensors = {_SINGLE_RECEIVER_DEFAULT_NAME: receiver_tensors}
     for name, tensor in receiver_tensors.items():
-      if not isinstance(name, str):
+      if not isinstance(name, six.string_types):
         raise ValueError(
             'receiver_tensors keys must be strings: {}.'.format(name))
       if not isinstance(tensor, ops.Tensor):
diff --git a/tensorflow/python/estimator/export/export_output.py b/tensorflow/python/estimator/export/export_output.py
index 69be0f687c..49bcd06d50 100644
--- a/tensorflow/python/estimator/export/export_output.py
+++ b/tensorflow/python/estimator/export/export_output.py
@@ -20,6 +20,8 @@ from __future__ import print_function
 
 import abc
 
+import six
+
 
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -171,7 +173,7 @@ class PredictOutput(ExportOutput):
           'Prediction outputs must be given as a dict of string to Tensor; '
           'got {}'.format(outputs))
     for key, value in outputs.items():
-      if not isinstance(key, str):
+      if not isinstance(key, six.string_types):
         raise ValueError(
             'Prediction output key must be a string; got {}.'.format(key))
       if not isinstance(value, ops.Tensor):
diff --git a/tensorflow/python/estimator/export/export_output_test.py b/tensorflow/python/estimator/export/export_output_test.py
index 27a088e551..035a9a143e 100644
--- a/tensorflow/python/estimator/export/export_output_test.py
+++ b/tensorflow/python/estimator/export/export_output_test.py
@@ -22,7 +22,9 @@ from tensorflow.core.framework import tensor_shape_pb2
 from tensorflow.core.framework import types_pb2
 from tensorflow.core.protobuf import meta_graph_pb2
 from tensorflow.python.estimator.export import export_output as export_output_lib
+from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 from tensorflow.python.saved_model import signature_constants
@@ -197,6 +199,33 @@ class ExportOutputTest(test.TestCase):
         signature_constants.CLASSIFY_METHOD_NAME)
     self.assertEqual(actual_signature_def, expected_signature_def)
 
+  def test_predict_output_constructor(self):
+    """Tests that no errors are raised when input is expected."""
+    outputs = {
+        "output0": constant_op.constant([0]),
+        u"output1": constant_op.constant([1]),
+    }
+    export_output_lib.PredictOutput(outputs)
+
+  def test_predict_output_outputs_invalid(self):
+    with self.assertRaisesRegexp(
+        ValueError,
+        "Prediction outputs must be given as a dict of string to Tensor"):
+      export_output_lib.PredictOutput(constant_op.constant([0]))
+
+    with self.assertRaisesRegexp(
+        ValueError,
+        "Prediction output key must be a string"):
+      export_output_lib.PredictOutput({1: constant_op.constant([0])})
+
+    with self.assertRaisesRegexp(
+        ValueError,
+        "Prediction output value must be a Tensor"):
+      export_output_lib.PredictOutput({
+          "prediction1": sparse_tensor.SparseTensor(
+              indices=[[0, 0]], values=[1], dense_shape=[1, 1]),
+      })
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/estimator/export/export_test.py b/tensorflow/python/estimator/export/export_test.py
index fdd924f2e1..7946bd88ba 100644
--- a/tensorflow/python/estimator/export/export_test.py
+++ b/tensorflow/python/estimator/export/export_test.py
@@ -28,13 +28,11 @@ from tensorflow.core.example import example_pb2
 from tensorflow.python.estimator.export import export
 from tensorflow.python.estimator.export import export_output
 from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import parsing_ops
 from tensorflow.python.platform import test
 from tensorflow.python.saved_model import signature_constants
@@ -43,6 +41,69 @@ from tensorflow.python.saved_model import signature_def_utils
 
 class ExportTest(test_util.TensorFlowTestCase):
 
+  def test_serving_input_receiver_constructor(self):
+    """Tests that no errors are raised when input is expected."""
+    features = {
+        "feature0": constant_op.constant([0]),
+        u"feature1": constant_op.constant([1]),
+        "feature2": sparse_tensor.SparseTensor(
+            indices=[[0, 0]], values=[1], dense_shape=[1, 1]),
+    }
+    receiver_tensors = {
+        "example0": array_ops.placeholder(dtypes.string, name="example0"),
+        u"example1": array_ops.placeholder(dtypes.string, name="example1"),
+    }
+    export.ServingInputReceiver(features, receiver_tensors)
+
+  def test_serving_input_receiver_features_invalid(self):
+    receiver_tensors = {
+        "example0": array_ops.placeholder(dtypes.string, name="example0"),
+        u"example1": array_ops.placeholder(dtypes.string, name="example1"),
+    }
+
+    with self.assertRaisesRegexp(ValueError, "features must be defined"):
+      export.ServingInputReceiver(
+          features=None,
+          receiver_tensors=receiver_tensors)
+
+    with self.assertRaisesRegexp(ValueError, "feature keys must be strings"):
+      export.ServingInputReceiver(
+          features={1: constant_op.constant([1])},
+          receiver_tensors=receiver_tensors)
+
+    with self.assertRaisesRegexp(
+        ValueError, "feature feature1 must be a Tensor or SparseTensor"):
+      export.ServingInputReceiver(
+          features={"feature1": [1]},
+          receiver_tensors=receiver_tensors)
+
+  def test_serving_input_receiver_receiver_tensors_invalid(self):
+    features = {
+        "feature0": constant_op.constant([0]),
+        u"feature1": constant_op.constant([1]),
+        "feature2": sparse_tensor.SparseTensor(
+            indices=[[0, 0]], values=[1], dense_shape=[1, 1]),
+    }
+
+    with self.assertRaisesRegexp(
+        ValueError, "receiver_tensors must be defined"):
+      export.ServingInputReceiver(
+          features=features,
+          receiver_tensors=None)
+
+    with self.assertRaisesRegexp(
+        ValueError, "receiver_tensors keys must be strings"):
+      export.ServingInputReceiver(
+          features=features,
+          receiver_tensors={
+              1: array_ops.placeholder(dtypes.string, name="example0")})
+
+    with self.assertRaisesRegexp(
+        ValueError, "receiver_tensor example1 must be a Tensor"):
+      export.ServingInputReceiver(
+          features=features,
+          receiver_tensors={"example1": [1]})
+
   def test_single_feature_single_receiver(self):
     feature = constant_op.constant(5)
     receiver_tensor = array_ops.placeholder(dtypes.string)
-- 
GitLab


From 074ede9a2371e188d27790f68b7b7ead82d8ef1d Mon Sep 17 00:00:00 2001
From: Andrew Selle <aselle@google.com>
Date: Thu, 4 May 2017 08:43:15 -0800
Subject: [PATCH 0991/1563] Adjust getting started guide to use a training and
 eval data set. Change: 155089162

---
 .../docs_src/get_started/get_started.md       | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/tensorflow/docs_src/get_started/get_started.md b/tensorflow/docs_src/get_started/get_started.md
index b52adc3790..00cc10cd34 100644
--- a/tensorflow/docs_src/get_started/get_started.md
+++ b/tensorflow/docs_src/get_started/get_started.md
@@ -372,25 +372,36 @@ features = [tf.contrib.layers.real_valued_column("x", dimension=1)]
 estimator = tf.contrib.learn.LinearRegressor(feature_columns=features)
 
 # TensorFlow provides many helper methods to read and set up data sets.
-# Here we use `numpy_input_fn`. We have to tell the function how many batches
+# Here we use two data sets: one for training and one for evaluation
+# We have to tell the function how many batches
 # of data (num_epochs) we want and how big each batch should be.
-x = np.array([1., 2., 3., 4.])
-y = np.array([0., -1., -2., -3.])
-input_fn = tf.contrib.learn.io.numpy_input_fn({"x":x}, y, batch_size=4,
+x_train = np.array([1., 2., 3., 4.])
+y_train = np.array([0., -1., -2., -3.])
+x_eval = np.array([2., 5., 8., 1.])
+y_eval = np.array([-1.01, -4.1, -7, 0.])
+input_fn = tf.contrib.learn.io.numpy_input_fn({"x":x_train}, y_train,
+                                              batch_size=4,
                                               num_epochs=1000)
+eval_input_fn = tf.contrib.learn.io.numpy_input_fn(
+    {"x":x_eval}, y_eval, batch_size=4, num_epochs=1000)
 
-# We can invoke 1000 training steps by invoking the `fit` method and passing the
+# We can invoke 1000 training steps by invoking the  method and passing the
 # training data set.
 estimator.fit(input_fn=input_fn, steps=1000)
 
-# Here we evaluate how well our model did. In a real example, we would want
-# to use a separate validation and testing data set to avoid overfitting.
-print(estimator.evaluate(input_fn=input_fn))
+# Here we evaluate how well our model did.
+train_loss = estimator.evaluate(input_fn=input_fn)
+eval_loss = estimator.evaluate(input_fn=eval_input_fn)
+print("train loss: %r"% train_loss)
+print("eval loss: %r"% eval_loss)
 ```
 When run, it produces
 ```
-    {'global_step': 1000, 'loss': 1.9650059e-11}
+    train loss: {'global_step': 1000, 'loss': 4.3049088e-08}
+    eval loss: {'global_step': 1000, 'loss': 0.0025487561}
 ```
+Notice how our eval data has a higher loss, but it is still close to zero.
+That means we are learning properly.
 
 ### A custom model
 
@@ -432,19 +443,25 @@ def model(features, labels, mode):
       train_op=train)
 
 estimator = tf.contrib.learn.Estimator(model_fn=model)
-# define our data set
-x = np.array([1., 2., 3., 4.])
-y = np.array([0., -1., -2., -3.])
-input_fn = tf.contrib.learn.io.numpy_input_fn({"x": x}, y, 4, num_epochs=1000)
+# define our data sets
+x_train = np.array([1., 2., 3., 4.])
+y_train = np.array([0., -1., -2., -3.])
+x_eval = np.array([2., 5., 8., 1.])
+y_eval = np.array([-1.01, -4.1, -7, 0.])
+input_fn = tf.contrib.learn.io.numpy_input_fn({"x": x_train}, y_train, 4, num_epochs=1000)
 
 # train
 estimator.fit(input_fn=input_fn, steps=1000)
-# evaluate our model
-print(estimator.evaluate(input_fn=input_fn, steps=10))
+# Here we evaluate how well our model did. 
+train_loss = estimator.evaluate(input_fn=input_fn)
+eval_loss = estimator.evaluate(input_fn=eval_input_fn)
+print("train loss: %r"% train_loss)
+print("eval loss: %r"% eval_loss)
 ```
 When run, it produces
-```python
-{'loss': 5.9819476e-11, 'global_step': 1000}
+```
+train loss: {'global_step': 1000, 'loss': 4.9380226e-11}
+eval loss: {'global_step': 1000, 'loss': 0.01010081}
 ```
 
 Notice how the contents of the custom `model()` function are very similar
-- 
GitLab


From 3bee923c93f9624ce3abf8d55173be66a7755545 Mon Sep 17 00:00:00 2001
From: Patrick Nguyen <drpng@google.com>
Date: Thu, 4 May 2017 08:48:51 -0800
Subject: [PATCH 0992/1563] Use $opt defined in the loop rather than raw
 string.

Fixes #9651.
Change: 155089799
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index dce59586ab..d7dde98292 100755
--- a/configure
+++ b/configure
@@ -357,7 +357,7 @@ fi
 
 # Append CC optimization flags to bazel.rc
 for opt in $CC_OPT_FLAGS; do
-  write_to_bazelrc 'build:opt --cxxopt=$opt --copt=$opt'
+  write_to_bazelrc "build:opt --cxxopt=$opt --copt=$opt"
 done
 
 # Run the gen_git_source to create links where bazel can track dependencies for
-- 
GitLab


From 65044bc25981e4e060ad5c34d9a520a0561775c3 Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Thu, 4 May 2017 08:48:52 -0800
Subject: [PATCH 0993/1563] Add an option to not convert layout if GEMM is used
 internally in Conv2D, Conv2DBackpropFilter, and Conv2DBackpropInput, because
 in such cases, NHWC is usually faster than NCHW. The cost of enabling this
 option is the overhead of more non-cancellable layout conversion nodes. We
 added auto tuning to choose a better option by estimating the overhead using
 the number of added layout conversion nodes.

Don't Convert the layout for Sum, because reduction along dimension 0, 2, 3 (in NCHW) is about 10x slower than along 0, 1, 2 (in NHWC).
Change: 155089805
---
 tensorflow/core/grappler/op_types.cc          |  10 +
 tensorflow/core/grappler/op_types.h           |   2 +
 tensorflow/core/grappler/optimizers/BUILD     |  17 ++
 .../grappler/optimizers/layout_optimizer.cc   | 188 +++++++++++++++---
 .../grappler/optimizers/layout_optimizer.h    |   6 +
 .../optimizers/layout_optimizer_test.cc       | 147 ++++++++++++++
 6 files changed, 340 insertions(+), 30 deletions(-)
 create mode 100644 tensorflow/core/grappler/optimizers/layout_optimizer_test.cc

diff --git a/tensorflow/core/grappler/op_types.cc b/tensorflow/core/grappler/op_types.cc
index bafbcc200c..64bdd91077 100644
--- a/tensorflow/core/grappler/op_types.cc
+++ b/tensorflow/core/grappler/op_types.cc
@@ -18,6 +18,11 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+bool IsConcat(const NodeDef& node) {
+  const auto op = node.op();
+  return op == "Concat" || op == "ConcatV2";
+}
+
 bool IsDequeueOp(const NodeDef& node) {
   static const std::set<std::string> dequeue_ops = {
       "QueueDequeueManyV2", "QueueDequeueMany", "QueueDequeueV2",
@@ -30,6 +35,11 @@ bool IsPlaceholder(const NodeDef& node) {
   return op == "Placeholder" || op == "PlaceholderV2";
 }
 
+bool IsTranspose(const NodeDef& node) {
+  const auto op = node.op();
+  return op == "Transpose";
+}
+
 bool IsVariable(const NodeDef& node) {
   const auto op = node.op();
   return op == "Variable" || op == "VariableV2" || op == "AutoReloadVariable" ||
diff --git a/tensorflow/core/grappler/op_types.h b/tensorflow/core/grappler/op_types.h
index 2f58835628..4f2bb2bc05 100644
--- a/tensorflow/core/grappler/op_types.h
+++ b/tensorflow/core/grappler/op_types.h
@@ -21,8 +21,10 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
+bool IsConcat(const NodeDef& node);
 bool IsDequeueOp(const NodeDef& node);
 bool IsPlaceholder(const NodeDef& node);
+bool IsTranspose(const NodeDef& node);
 bool IsVariable(const NodeDef& node);
 
 }  // end namespace grappler
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index e3b36c8412..5f30dfbaa2 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -205,11 +205,28 @@ cc_library(
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:devices",
         "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:op_types",
         "//tensorflow/core/grappler:utils",
         "//tensorflow/core/grappler/clusters:cluster",
     ],
 )
 
+cc_test(
+    name = "layout_optimizer_test",
+    srcs = ["layout_optimizer_test.cc"],
+    deps = [
+        ":layout_optimizer",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+    ],
+)
+
 cc_library(
     name = "meta_optimizer",
     srcs = ["meta_optimizer.cc"],
diff --git a/tensorflow/core/grappler/optimizers/layout_optimizer.cc b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
index 9570ec17d0..5fec89b698 100644
--- a/tensorflow/core/grappler/optimizers/layout_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/core/grappler/clusters/cluster.h"
 #include "tensorflow/core/grappler/devices.h"
 #include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/op_types.h"
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/lib/strings/numbers.h"
@@ -68,8 +69,7 @@ std::set<string> GetOpsFormatAgnostic() {
                                           "Slice",
                                           "SquaredDifference",
                                           "Squeeze",
-                                          "Sub",
-                                          "Sum"};
+                                          "Sub"};
   return ops_format_agnostic;
 }
 
@@ -110,9 +110,9 @@ class NodeProcessor {
   }
 
  protected:
-  bool IsDimsN(NodeDef* node, int n) const {
-    if (node->attr().find("_output_shapes") != node->attr().end()) {
-      auto shape = node->attr().at("_output_shapes").list().shape(0);
+  bool IsDimsN(const NodeDef& node, int n) const {
+    if (node.attr().find("_output_shapes") != node.attr().end()) {
+      auto shape = node.attr().at("_output_shapes").list().shape(0);
       if (shape.dim_size() == n) {
         return true;
       }
@@ -120,7 +120,7 @@ class NodeProcessor {
     return false;
   }
 
-  bool IsDimsFour(NodeDef* node) const { return IsDimsN(node, 4); }
+  bool IsDimsFour(const NodeDef& node) const { return IsDimsN(node, 4); }
 
   bool IsNHWC() const {
     if (node_->attr().find("data_format") != node_->attr().end()) {
@@ -145,7 +145,7 @@ class NodeProcessor {
   }
 
   virtual bool ShouldProcess() const {
-    return IsNHWC() && IsDimsFour(node_) && HasOutputs();
+    return IsNHWC() && IsDimsFour(*node_) && HasOutputs();
   }
 
   void UpdateAttrDataFormat() {
@@ -268,6 +268,8 @@ class NodeProcessor {
     for (const auto& output : outputs) {
       string node_name_NCHWToNHWC = strings::StrCat(
           kTransposeNCHWToNHWC, "-", node_->name(), "-", output->name());
+      // TODO (yaozhang): handle the rare case where node A is connected to more
+      // than one input of node B.
       auto it = std::find_if(output->mutable_input()->begin(),
                              output->mutable_input()->end(),
                              [this](const string& input) {
@@ -341,7 +343,7 @@ class BiasAddGradProcessor : public NodeProcessor {
   bool ShouldProcess() const override {
     auto input = node_map_->GetNode(node_->input(0));
     if (input) {
-      if ((IsNHWC() && IsDimsFour(input)) || IsNodeNCHWToNHWC(input->name())) {
+      if ((IsNHWC() && IsDimsFour(*input)) || IsNodeNCHWToNHWC(input->name())) {
         return true;
       }
     }
@@ -351,13 +353,89 @@ class BiasAddGradProcessor : public NodeProcessor {
   Status AddLayoutTransposeToOutputs() override { return Status::OK(); }
 };
 
-class Conv2DBackpropFilterProcessor : public NodeProcessor {
+class Conv2DProcessor : public NodeProcessor {
+ public:
+  Conv2DProcessor(GraphDef* graph, NodeDef* node, NodeMap* node_map,
+                  bool no_gemm)
+      : NodeProcessor(graph, node, node_map), no_gemm_(no_gemm) {}
+
+ protected:
+  bool ShouldProcess() const override {
+    return IsNHWC() && IsDimsFour(*node_) && HasOutputs() &&
+           (!IsGemmUsed() || no_gemm_);
+  }
+
+  TensorShapeProto GetShape(const string& input_name) const {
+    string node_name;
+    int output_pos;
+    node_name = ParseNodeName(input_name, &output_pos);
+    NodeDef* node = node_map_->GetNode(node_name);
+    if (node->attr().find("_output_shapes") != node->attr().end()) {
+      return node->attr().at("_output_shapes").list().shape(output_pos);
+    }
+    TensorShapeProto shape;
+    return shape;
+  }
+
+  bool IsStrideOne() const {
+    if (node_->attr().find("strides") != node_->attr().end()) {
+      auto list = node_->attr().at("strides").list();
+      return list.i(1) == 1 && list.i(2) == 1;
+    }
+    return false;
+  }
+
+  bool IsValidPadding() const {
+    if (node_->attr().find("padding") != node_->attr().end()) {
+      auto padding = node_->attr().at("padding").s();
+      return padding == "VALID";
+    }
+    return false;
+  }
+
+  // The logic inside this function is based on the internal implementation of
+  // Conv2D, Conv2DBackpropInput, and Conv2DBackpropFilter ops, and thus
+  // needs to be updated accordingly if the internal implementation changes.
+  bool IsGemmUsed(const TensorShapeProto& filter_shape,
+                  const TensorShapeProto& input_shape) const {
+    if (filter_shape.dim_size() == 4) {
+      if (filter_shape.dim(0).size() == 1 && filter_shape.dim(1).size() == 1 &&
+          IsStrideOne()) {
+        return true;
+      }
+    }
+    if (input_shape.dim_size() == 4 && filter_shape.dim_size() == 4) {
+      if (input_shape.dim(1).size() == filter_shape.dim(0).size() == 1 &&
+          input_shape.dim(2).size() == filter_shape.dim(1).size() &&
+          IsValidPadding()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  virtual bool IsGemmUsed() const {
+    auto filter_shape = GetShape(node_->input(1));
+    auto input_shape = GetShape(node_->input(0));
+    return IsGemmUsed(filter_shape, input_shape);
+  }
+
+  bool no_gemm_;
+};
+
+class Conv2DBackpropFilterProcessor : public Conv2DProcessor {
  public:
   Conv2DBackpropFilterProcessor(GraphDef* graph, NodeDef* node,
-                                NodeMap* node_map)
-      : NodeProcessor(graph, node, node_map) {}
+                                NodeMap* node_map, bool no_gemm)
+      : Conv2DProcessor(graph, node, node_map, no_gemm) {}
 
  protected:
+  bool IsGemmUsed() const override {
+    auto filter_shape = GetShape(node_->name());
+    auto input_shape = GetShape(node_->input(0));
+    return Conv2DProcessor::IsGemmUsed(filter_shape, input_shape);
+  }
+
   std::vector<int> GetInputPos() const override {
     std::vector<int> input_pos = {0, 2};
     return input_pos;
@@ -370,17 +448,24 @@ class Conv2DBackpropFilterProcessor : public NodeProcessor {
   void UpdateAttrShape() override {}
 };
 
-class Conv2DBackpropInputProcessor : public NodeProcessor {
+class Conv2DBackpropInputProcessor : public Conv2DProcessor {
  public:
   Conv2DBackpropInputProcessor(GraphDef* graph, NodeDef* node,
-                               NodeMap* node_map)
-      : NodeProcessor(graph, node, node_map) {}
+                               NodeMap* node_map, bool no_gemm)
+      : Conv2DProcessor(graph, node, node_map, no_gemm) {}
 
  protected:
+  bool IsGemmUsed() const override {
+    auto filter_shape = GetShape(node_->input(1));
+    auto input_shape = GetShape(node_->name());
+    return Conv2DProcessor::IsGemmUsed(filter_shape, input_shape);
+  }
+
   std::vector<int> GetInputPos() const override {
     std::vector<int> input_pos = {2};
     return input_pos;
   }
+
   Status CustomizedProcessing() override {
     NodeDef* node = node_map_->GetNode(node_->input(0));
     return UpdateAttrValue(node);
@@ -418,7 +503,7 @@ class AgnosticNodeProcessor : public NodeProcessor {
 
  protected:
   bool ShouldProcess() const override {
-    return IsDimsFour(node_) && HasOutputs() && IsNodeAfterNCHWToNHWC();
+    return IsDimsFour(*node_) && HasOutputs() && IsNodeAfterNCHWToNHWC();
   }
 
   bool IsNodeAfterNCHWToNHWC() const {
@@ -467,7 +552,7 @@ class BinaryOpProcessor : public AgnosticNodeProcessor {
 
  protected:
   bool ShouldProcess() const override {
-    return IsDimsFour(node_) && HasOutputs() && IsNodeAfterNCHWToNHWC() &&
+    return IsDimsFour(*node_) && HasOutputs() && IsNodeAfterNCHWToNHWC() &&
            (Is4DOperateWithND(4) || Is4DOperateWithScalar() ||
             Is4DOperateWithVector());
   }
@@ -484,10 +569,10 @@ class BinaryOpProcessor : public AgnosticNodeProcessor {
     auto input0 = node_map_->GetNode(node_->input(0));
     auto input1 = node_map_->GetNode(node_->input(1));
     if (input0 && input1) {
-      return (IsDimsFour(input0) || IsNodeNCHWToNHWC(input0->name())) &&
+      return (IsDimsFour(*input0) || IsNodeNCHWToNHWC(input0->name())) &&
              ((n == 4)
-                  ? (IsDimsFour(input1) || IsNodeNCHWToNHWC(input1->name()))
-                  : IsDimsN(input1, n));
+                  ? (IsDimsFour(*input1) || IsNodeNCHWToNHWC(input1->name()))
+                  : IsDimsN(*input1, n));
     }
     return false;
   }
@@ -571,7 +656,7 @@ class ConcatProcessor : public AgnosticNodeProcessor {
 
  protected:
   bool ShouldProcess() const override {
-    return IsDimsFour(node_) && HasOutputs() && IsNodeAfterNCHWToNHWC() &&
+    return IsDimsFour(*node_) && HasOutputs() && IsNodeAfterNCHWToNHWC() &&
            IsAlongDimC();
   }
 
@@ -739,7 +824,7 @@ class SqueezeProcessor : public AgnosticNodeProcessor {
 
  protected:
   bool ShouldProcess() const override {
-    return IsDimsN(node_, 2) && HasOutputs() && IsNodeAfterNCHWToNHWC() &&
+    return IsDimsN(*node_, 2) && HasOutputs() && IsNodeAfterNCHWToNHWC() &&
            IsInputConvertible() && IsAlongDimHW();
   }
 
@@ -790,7 +875,7 @@ class SumProcessor : public AgnosticNodeProcessor {
   bool ShouldProcess() const override {
     auto input0 = node_map_->GetNode(node_->input(0));
     return HasOutputs() && IsNodeAfterNCHWToNHWC() &&
-           (IsDimsFour(input0) || IsNodeNCHWToNHWC(input0->name())) &&
+           (IsDimsFour(*input0) || IsNodeNCHWToNHWC(input0->name())) &&
            IsAlongDimNHW();
   }
 
@@ -825,10 +910,21 @@ class SumProcessor : public AgnosticNodeProcessor {
   }
 };
 
+struct TuningConfig {
+  // If true, do not use the NHWC GEMM implementation. When filter size is
+  // one or filter size is equal to input image size,
+  // the NHWC implementation of Conv2D, Conv2DBackpropInput, and
+  // Conv2DBackpropFilter will use a specialized GEMM implementation, which is
+  // usually faster than the NCHW implementation. The downside is that this
+  // might result in more non-cancellable layout conversion nodes (implemented
+  // by the Tranpose op).
+  bool no_gemm;
+};
+
 class DataLayoutOptimizer {
  public:
-  explicit DataLayoutOptimizer(GraphDef* graph)
-      : graph_(graph), node_map_(graph_) {}
+  explicit DataLayoutOptimizer(GraphDef* graph, TuningConfig config)
+      : graph_(graph), node_map_(graph_), config_(config) {}
 
   Status Optimize() {
     LOG(INFO) << "Number of nodes for original graph: " << graph_->node_size();
@@ -908,12 +1004,15 @@ class DataLayoutOptimizer {
         } else if (node->op().compare("BiasAddGrad") == 0) {
           node_processor.reset(
               new BiasAddGradProcessor(graph_, node, &node_map_));
-        } else if (node->op().compare("Conv2DBackpropFilter") == 0) {
+        } else if (node->op().compare("Conv2D") == 0) {
           node_processor.reset(
-              new Conv2DBackpropFilterProcessor(graph_, node, &node_map_));
+              new Conv2DProcessor(graph_, node, &node_map_, config_.no_gemm));
+        } else if (node->op().compare("Conv2DBackpropFilter") == 0) {
+          node_processor.reset(new Conv2DBackpropFilterProcessor(
+              graph_, node, &node_map_, config_.no_gemm));
         } else if (node->op().compare("Conv2DBackpropInput") == 0) {
-          node_processor.reset(
-              new Conv2DBackpropInputProcessor(graph_, node, &node_map_));
+          node_processor.reset(new Conv2DBackpropInputProcessor(
+              graph_, node, &node_map_, config_.no_gemm));
         } else if (node->op().compare("FusedBatchNormGrad") == 0) {
           node_processor.reset(
               new FusedBatchNormGradProcessor(graph_, node, &node_map_));
@@ -1025,17 +1124,46 @@ class DataLayoutOptimizer {
 
   GraphDef* graph_;
   NodeMap node_map_;
+  TuningConfig config_;
 };
 
+int GetNumTranspose(const GraphDef& graph) {
+  int number = 0;
+  for (const auto& node : graph.node()) {
+    if (IsTranspose(node)) {
+      number++;
+    }
+  }
+  LOG(INFO) << "Number of Transpose nodes: " << number;
+  return number;
+}
+
 Status LayoutOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
                                  GraphDef* output) {
-  if (GetNumAvailableGPUs() < 1) {
+  if (num_gpus_ == 0) {
+    num_gpus_ = GetNumAvailableGPUs();
+  }
+  if (num_gpus_ < 1) {
     // LayoutOptimizer is currently only tuned for GPU.
     return Status::OK();
   }
+
   *output = item.graph;
-  DataLayoutOptimizer layout_optimizer(output);
+  TuningConfig config;
+  config.no_gemm = false;
+  DataLayoutOptimizer layout_optimizer(output, config);
   auto status = layout_optimizer.Optimize();
+
+  // This is based on an empirical observation that if the introduced Transpose
+  // nodes is more than 30, not using GEMM implementation would result in better
+  // performance.
+  if (status.ok() && GetNumTranspose(*output) > 30) {
+    *output = item.graph;
+    config.no_gemm = true;
+    DataLayoutOptimizer layout_optimizer(output, config);
+    status = layout_optimizer.Optimize();
+  }
+
   if (!status.ok()) {
     *output = item.graph;
   }
diff --git a/tensorflow/core/grappler/optimizers/layout_optimizer.h b/tensorflow/core/grappler/optimizers/layout_optimizer.h
index 66dec17a35..1bd6f9544b 100644
--- a/tensorflow/core/grappler/optimizers/layout_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/layout_optimizer.h
@@ -29,11 +29,17 @@ class LayoutOptimizer : public GraphOptimizer {
 
   string name() const override { return "layout"; };
 
+  // This is for testing only.
+  void set_num_gpus(int num_gpus) { num_gpus_ = num_gpus; };
+
   Status Optimize(Cluster* cluster, const GrapplerItem& item,
                   GraphDef* output) override;
 
   void Feedback(Cluster* cluster, const GrapplerItem& item,
                 const GraphDef& optimize_output, double result) override;
+
+ private:
+  int num_gpus_ = 0;
 };
 
 }  // end namespace grappler
diff --git a/tensorflow/core/grappler/optimizers/layout_optimizer_test.cc b/tensorflow/core/grappler/optimizers/layout_optimizer_test.cc
new file mode 100644
index 0000000000..be38ca1a69
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/layout_optimizer_test.cc
@@ -0,0 +1,147 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+void AddOutputShape(Node* node, const TensorShape& shape) {
+  std::vector<TensorShapeProto> output_shapes;
+  TensorShapeProto shape_proto;
+  shape.AsProto(&shape_proto);
+  output_shapes.push_back(shape_proto);
+  node->AddAttr("_output_shapes", output_shapes);
+}
+
+class LayoutOptimizerTest : public ::testing::Test {
+ protected:
+  Output SimpleConv(tensorflow::Scope* s, int input_size, int filter_size,
+                    const string& padding) {
+    int batch_size = 128;
+    int input_height = input_size;
+    int input_width = input_size;
+    int input_depth = 3;
+    int filter_count = 2;
+    int stride = 1;
+    TensorShape input_shape(
+        {batch_size, input_height, input_width, input_depth});
+    Tensor input_data(DT_FLOAT, input_shape);
+    test::FillIota<float>(&input_data, 1.0f);
+    Output input =
+        ops::Const(s->WithOpName("Input"), Input::Initializer(input_data));
+    AddOutputShape(input.node(), input_shape);
+
+    TensorShape filter_shape(
+        {filter_size, filter_size, input_depth, filter_count});
+    Tensor filter_data(DT_FLOAT, filter_shape);
+    test::FillIota<float>(&filter_data, 1.0f);
+    Output filter =
+        ops::Const(s->WithOpName("Filter"), Input::Initializer(filter_data));
+    AddOutputShape(filter.node(), filter_shape);
+
+    Output conv = ops::Conv2D(s->WithOpName("Conv2D"), input, filter,
+                              {1, stride, stride, 1}, padding);
+    AddOutputShape(conv.node(), input_shape);
+    return conv;
+  }
+};
+
+TEST_F(LayoutOptimizerTest, FilterSizeIsOne) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  auto conv = SimpleConv(&s, 2, 1, "SAME");
+  Output fetch = ops::Identity(s.WithOpName("Fetch"), {conv});
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  LayoutOptimizer optimizer;
+  optimizer.set_num_gpus(1);
+  GraphDef output;
+  Status status = optimizer.Optimize(nullptr, item, &output);
+  NodeMap node_map(&output);
+  EXPECT_FALSE(
+      node_map.GetNode("LayoutOptimizerTransposeNHWCToNCHW-Conv2D-Input"));
+}
+
+TEST_F(LayoutOptimizerTest, FilterSizeNotOne) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  auto conv = SimpleConv(&s, 2, 1, "SAME");
+  Output fetch = ops::Identity(s.WithOpName("Fetch"), {conv});
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  LayoutOptimizer optimizer;
+  optimizer.set_num_gpus(1);
+  GraphDef output;
+  Status status = optimizer.Optimize(nullptr, item, &output);
+  NodeMap node_map(&output);
+  EXPECT_FALSE(
+      node_map.GetNode("LayoutOptimizerTransposeNHWCToNCHW-Conv2D-Input"));
+}
+
+TEST_F(LayoutOptimizerTest, EqualSizeWithValidPadding) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  auto conv = SimpleConv(&s, 2, 2, "VALID");
+  Output fetch = ops::Identity(s.WithOpName("Fetch"), {conv});
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  LayoutOptimizer optimizer;
+  optimizer.set_num_gpus(1);
+  GraphDef output;
+  Status status = optimizer.Optimize(nullptr, item, &output);
+  NodeMap node_map(&output);
+  EXPECT_FALSE(
+      node_map.GetNode("LayoutOptimizerTransposeNHWCToNCHW-Conv2D-Input"));
+}
+
+TEST_F(LayoutOptimizerTest, EqualSizeWithSamePadding) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  auto conv = SimpleConv(&s, 2, 2, "SAME");
+  Output fetch = ops::Identity(s.WithOpName("Fetch"), {conv});
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  LayoutOptimizer optimizer;
+  optimizer.set_num_gpus(1);
+  GraphDef output;
+  Status status = optimizer.Optimize(nullptr, item, &output);
+  NodeMap node_map(&output);
+  EXPECT_TRUE(
+      node_map.GetNode("LayoutOptimizerTransposeNHWCToNCHW-Conv2D-Input"));
+}
+
+TEST_F(LayoutOptimizerTest, NotEqualSizeWithValidPadding) {
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+  auto conv = SimpleConv(&s, 2, 3, "VALID");
+  Output fetch = ops::Identity(s.WithOpName("Fetch"), {conv});
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+  LayoutOptimizer optimizer;
+  optimizer.set_num_gpus(1);
+  GraphDef output;
+  Status status = optimizer.Optimize(nullptr, item, &output);
+  NodeMap node_map(&output);
+  EXPECT_TRUE(
+      node_map.GetNode("LayoutOptimizerTransposeNHWCToNCHW-Conv2D-Input"));
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
-- 
GitLab


From 641c9824d4c08b5d7c6ae4c3f26b0607f0dea619 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Thu, 4 May 2017 08:56:01 -0800
Subject: [PATCH 0994/1563] Make contrib real_valued_column cross compatible
 with core feature_column builders. Change: 155090692

---
 tensorflow/contrib/layers/BUILD               |  1 +
 .../layers/python/layers/feature_column.py    | 28 +++++++++++++++++--
 .../python/layers/feature_column_ops_test.py  | 17 +++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/layers/BUILD b/tensorflow/contrib/layers/BUILD
index aba8eabe10..fe661a5625 100644
--- a/tensorflow/contrib/layers/BUILD
+++ b/tensorflow/contrib/layers/BUILD
@@ -108,6 +108,7 @@ tf_custom_op_py_library(
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//tensorflow/python/feature_column",
         "@six_archive//:six",
     ],
 )
diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index d6d5bf2294..04fe2370d1 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -136,8 +136,10 @@ from tensorflow.contrib.layers.python.layers import layers
 from tensorflow.contrib.layers.python.ops import bucketization_op
 from tensorflow.contrib.layers.python.ops import sparse_feature_cross_op
 from tensorflow.contrib.layers.python.ops import sparse_ops as contrib_sparse_ops
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import sparse_tensor as sparse_tensor_py
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
@@ -1497,9 +1499,12 @@ def _real_valued_var_len_column(column_name,
                                  is_sparse)
 
 
-class _RealValuedColumn(_FeatureColumn, collections.namedtuple(
-    "_RealValuedColumn",
-    ["column_name", "dimension", "default_value", "dtype", "normalizer"])):
+class _RealValuedColumn(
+    _FeatureColumn,
+    fc_core._DenseColumn,  # pylint: disable=protected-access
+    collections.namedtuple(
+        "_RealValuedColumn",
+        ["column_name", "dimension", "default_value", "dtype", "normalizer"])):
   """Represents a real valued feature column also known as continuous features.
 
   Instances of this class are immutable. The dictionary returned by InputBuilder
@@ -1569,6 +1574,23 @@ class _RealValuedColumn(_FeatureColumn, collections.namedtuple(
   def _to_dense_tensor(self, input_tensor):
     return input_tensor
 
+  @property
+  def _variable_shape(self):
+    return tensor_shape.TensorShape((self.dimension))
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    del weight_collections
+    del trainable
+    return inputs.get(self)
+
+  def _transform_feature(self, inputs):
+    return math_ops.to_float(
+        self._normalized_input_tensor(inputs.get(self.name)))
+
+  @property
+  def _parse_example_config(self):
+    return self.config
+
 
 def real_valued_column(column_name,
                        dimension=1,
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index 632836fee4..b2dad0162e 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -27,6 +27,7 @@ from tensorflow.contrib.layers.python.layers import feature_column
 from tensorflow.contrib.layers.python.layers import feature_column_ops
 from tensorflow.core.example import example_pb2
 from tensorflow.core.example import feature_pb2
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -610,6 +611,10 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [real_valued])
     with self.test_session():
       self.assertAllClose(output.eval(), features["price"].eval())
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllClose(output.eval(),
+                          fc_core.make_input_layer(features,
+                                                   [real_valued]).eval())
 
   def testRealValuedColumnWithMultiDimensions(self):
     real_valued = feature_column.real_valued_column("price", 2)
@@ -620,6 +625,10 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [real_valued])
     with self.test_session():
       self.assertAllClose(output.eval(), features["price"].eval())
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllClose(output.eval(),
+                          fc_core.make_input_layer(features,
+                                                   [real_valued]).eval())
 
   def testRealValuedColumnSparse(self):
     sparse_real_valued = feature_column._real_valued_var_len_column(
@@ -640,6 +649,10 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [real_valued])
     with self.test_session():
       self.assertAllClose(output.eval(), features["price"].eval() - 2)
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllClose(output.eval(),
+                          fc_core.make_input_layer(features,
+                                                   [real_valued]).eval())
 
   def testRealValuedColumnWithMultiDimensionsAndNormalizer(self):
     real_valued = feature_column.real_valued_column(
@@ -651,6 +664,10 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [real_valued])
     with self.test_session():
       self.assertAllClose(output.eval(), features["price"].eval() - 2)
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllClose(output.eval(),
+                          fc_core.make_input_layer(features,
+                                                   [real_valued]).eval())
 
   def testBucketizedColumnWithNormalizerSucceedsForDNN(self):
     bucket = feature_column.bucketized_column(
-- 
GitLab


From 6801788c3260178146fffe9175d5c36c12d55c5a Mon Sep 17 00:00:00 2001
From: xiaoyaozhuzi <1018919372@qq.com>
Date: Fri, 5 May 2017 01:16:41 +0800
Subject: [PATCH 0995/1563] Add input function for training and testing (#9617)
 (#9658)

* Add input function for training and testing

Estimator is decoupled from Scikit Learn interface by moving into separate class SKCompat. Arguments x, y and batch_size are only available in the SKCompat class, Estimator will only accept input_fn

* remove extra comma
-- 
GitLab


From a83997223feac44e9a94c87c7c13e2452a658b73 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 09:06:58 -0800
Subject: [PATCH 0996/1563] Update build rules for contrib/opt. Change:
 155092161

---
 tensorflow/contrib/opt/BUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index 2173e13b91..1843b6968e 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -29,7 +29,9 @@ py_library(
         "//tensorflow/python:platform",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
         "//tensorflow/python:variables",
+        "//third_party/py/scipy",
         "@six_archive//:six",
     ],
 )
-- 
GitLab


From 0cd6405a02fbac7b84679f2a631408dc641c6d4a Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 4 May 2017 09:22:18 -0800
Subject: [PATCH 0997/1563] RNNCells' trainable_weights and
 non_trainable_weights parameters return valid values. Change: 155094112

---
 .../python/kernel_tests/core_rnn_cell_test.py | 63 +++++++++++++++----
 .../rnn/python/ops/core_rnn_cell_impl.py      | 48 --------------
 tensorflow/contrib/rnn/python/ops/rnn_cell.py |  3 -
 tensorflow/python/ops/rnn_cell_impl.py        | 40 ++++++++++--
 4 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
index 15afac9823..f4589e3d9e 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
@@ -74,7 +74,41 @@ class RNNCellTest(test.TestCase):
           "root", initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 2])
         m = array_ops.zeros([1, 2])
-        g, _ = core_rnn_cell_impl.BasicRNNCell(2)(x, m)
+        cell = core_rnn_cell_impl.BasicRNNCell(2)
+        g, _ = cell(x, m)
+        self.assertEqual(
+            ["root/basic_rnn_cell/%s:0"
+             % core_rnn_cell_impl._WEIGHTS_VARIABLE_NAME,
+             "root/basic_rnn_cell/%s:0"
+             % core_rnn_cell_impl._BIAS_VARIABLE_NAME],
+            [v.name for v in cell.trainable_variables])
+        self.assertFalse(cell.non_trainable_variables)
+        sess.run([variables_lib.global_variables_initializer()])
+        res = sess.run(
+            [g], {x.name: np.array([[1., 1.]]),
+                  m.name: np.array([[0.1, 0.1]])})
+        self.assertEqual(res[0].shape, (1, 2))
+
+  def testBasicRNNCellNotTrainable(self):
+    with self.test_session() as sess:
+      def not_trainable_getter(getter, *args, **kwargs):
+        kwargs["trainable"] = False
+        return getter(*args, **kwargs)
+
+      with variable_scope.variable_scope(
+          "root", initializer=init_ops.constant_initializer(0.5),
+          custom_getter=not_trainable_getter):
+        x = array_ops.zeros([1, 2])
+        m = array_ops.zeros([1, 2])
+        cell = core_rnn_cell_impl.BasicRNNCell(2)
+        g, _ = cell(x, m)
+        self.assertFalse(cell.trainable_variables)
+        self.assertEqual(
+            ["root/basic_rnn_cell/%s:0"
+             % core_rnn_cell_impl._WEIGHTS_VARIABLE_NAME,
+             "root/basic_rnn_cell/%s:0"
+             % core_rnn_cell_impl._BIAS_VARIABLE_NAME],
+            [v.name for v in cell.non_trainable_variables])
         sess.run([variables_lib.global_variables_initializer()])
         res = sess.run(
             [g], {x.name: np.array([[1., 1.]]),
@@ -114,10 +148,23 @@ class RNNCellTest(test.TestCase):
           "root", initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 2])
         m = array_ops.zeros([1, 8])
-        g, out_m = core_rnn_cell_impl.MultiRNNCell(
+        cell = core_rnn_cell_impl.MultiRNNCell(
             [core_rnn_cell_impl.BasicLSTMCell(
                 2, state_is_tuple=False) for _ in range(2)],
-            state_is_tuple=False)(x, m)
+            state_is_tuple=False)
+        g, out_m = cell(x, m)
+        expected_variable_names = [
+            "root/multi_rnn_cell/cell_0/basic_lstm_cell/%s:0"
+            % core_rnn_cell_impl._WEIGHTS_VARIABLE_NAME,
+            "root/multi_rnn_cell/cell_0/basic_lstm_cell/%s:0"
+            % core_rnn_cell_impl._BIAS_VARIABLE_NAME,
+            "root/multi_rnn_cell/cell_1/basic_lstm_cell/%s:0"
+            % core_rnn_cell_impl._WEIGHTS_VARIABLE_NAME,
+            "root/multi_rnn_cell/cell_1/basic_lstm_cell/%s:0"
+            % core_rnn_cell_impl._BIAS_VARIABLE_NAME]
+        self.assertEqual(
+            expected_variable_names, [v.name for v in cell.trainable_variables])
+        self.assertFalse(cell.non_trainable_variables)
         sess.run([variables_lib.global_variables_initializer()])
         res = sess.run(
             [g, out_m],
@@ -125,15 +172,7 @@ class RNNCellTest(test.TestCase):
              m.name: 0.1 * np.ones([1, 8])})
         self.assertEqual(len(res), 2)
         variables = variables_lib.global_variables()
-        self.assertEqual(4, len(variables))
-        self.assertEquals(variables[0].op.name,
-                          "root/multi_rnn_cell/cell_0/basic_lstm_cell/weights")
-        self.assertEquals(variables[1].op.name,
-                          "root/multi_rnn_cell/cell_0/basic_lstm_cell/biases")
-        self.assertEquals(variables[2].op.name,
-                          "root/multi_rnn_cell/cell_1/basic_lstm_cell/weights")
-        self.assertEquals(variables[3].op.name,
-                          "root/multi_rnn_cell/cell_1/basic_lstm_cell/biases")
+        self.assertEqual(expected_variable_names, [v.name for v in variables])
         # The numbers in results were not calculated, this is just a smoke test.
         self.assertAllClose(res[0], [[0.24024698, 0.24024698]])
         expected_mem = np.array([[
diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index 884b51926e..eba2c0d2ac 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -27,7 +27,6 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
-import contextlib
 import hashlib
 import math
 import numbers
@@ -57,53 +56,6 @@ _BIAS_VARIABLE_NAME = "biases"
 _WEIGHTS_VARIABLE_NAME = "weights"
 
 
-@contextlib.contextmanager
-def _checked_scope(cell, scope, reuse=None, **kwargs):
-  if reuse is not None:
-    kwargs["reuse"] = reuse
-  with vs.variable_scope(scope, **kwargs) as checking_scope:
-    scope_name = checking_scope.name
-    if hasattr(cell, "_scope"):
-      cell_scope = cell._scope  # pylint: disable=protected-access
-      if cell_scope.name != checking_scope.name:
-        raise ValueError(
-            "Attempt to reuse RNNCell %s with a different variable scope than "
-            "its first use.  First use of cell was with scope '%s', this "
-            "attempt is with scope '%s'.  Please create a new instance of the "
-            "cell if you would like it to use a different set of weights.  "
-            "If before you were using: MultiRNNCell([%s(...)] * num_layers), "
-            "change to: MultiRNNCell([%s(...) for _ in range(num_layers)]).  "
-            "If before you were using the same cell instance as both the "
-            "forward and reverse cell of a bidirectional RNN, simply create "
-            "two instances (one for forward, one for reverse).  "
-            "In May 2017, we will start transitioning this cell's behavior "
-            "to use existing stored weights, if any, when it is called "
-            "with scope=None (which can lead to silent model degradation, so "
-            "this error will remain until then.)"
-            % (cell, cell_scope.name, scope_name, type(cell).__name__,
-               type(cell).__name__))
-    else:
-      weights_found = False
-      try:
-        with vs.variable_scope(checking_scope, reuse=True):
-          vs.get_variable(_WEIGHTS_VARIABLE_NAME)
-        weights_found = True
-      except ValueError:
-        pass
-      if weights_found and reuse is None:
-        raise ValueError(
-            "Attempt to have a second RNNCell use the weights of a variable "
-            "scope that already has weights: '%s'; and the cell was not "
-            "constructed as %s(..., reuse=True).  "
-            "To share the weights of an RNNCell, simply "
-            "reuse it in your second calculation, or create a new one with "
-            "the argument reuse=True." % (scope_name, type(cell).__name__))
-
-    # Everything is OK.  Update the cell's scope and yield it.
-    cell._scope = checking_scope  # pylint: disable=protected-access
-    yield checking_scope
-
-
 class BasicRNNCell(RNNCell):
   """The most basic RNN cell."""
 
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index acba77f0e1..ad23e532b1 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -39,9 +39,6 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import nest
 
 
-_checked_scope = core_rnn_cell_impl._checked_scope  # pylint: disable=protected-access
-
-
 def _get_concat_variable(name, shape, dtype, num_shards):
   """Get a sharded variable concatenated into one tensor."""
   sharded_variable = _get_sharded_variable(name, shape, dtype, num_shards)
diff --git a/tensorflow/python/ops/rnn_cell_impl.py b/tensorflow/python/ops/rnn_cell_impl.py
index 4810e97b36..c7ac742b5d 100644
--- a/tensorflow/python/ops/rnn_cell_impl.py
+++ b/tensorflow/python/ops/rnn_cell_impl.py
@@ -28,6 +28,8 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.layers import base as base_layer
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import variable_scope as vs
+from tensorflow.python.ops import variables as tf_variables
 from tensorflow.python.util import nest
 
 
@@ -75,11 +77,13 @@ def _zero_state_tensors(state_size, batch_size, dtype):
   return zeros
 
 
-class _RNNCell(base_layer.Layer):  # pylint: disable=protected-access
+class _RNNCell(base_layer.Layer):
   """Abstract object representing an RNN cell.
 
-  Every `RNNCell` must have the properties below and implement `__call__` with
-  the following signature.
+  Every `RNNCell` must have the properties below and implement `call` with
+  the signature `(output, next_state) = call(input, state)`.  The optional
+  third input argument, `scope`, is allowed for backwards compatibility
+  purposes; but should be left off for new subclasses.
 
   This definition of cell differs from the definition used in the literature.
   In the literature, 'cell' refers to an object with a single scalar output.
@@ -90,8 +94,9 @@ class _RNNCell(base_layer.Layer):  # pylint: disable=protected-access
   This operation results in an output matrix with `self.output_size` columns.
   If `self.state_size` is an integer, this operation also results in a new
   state matrix with `self.state_size` columns.  If `self.state_size` is a
-  tuple of integers, then it results in a tuple of `len(state_size)` state
-  matrices, each with a column size corresponding to values in `state_size`.
+  (possibly nested tuple of) TensorShape object(s), then it should return a
+  matching structure of Tensors having shape `[batch_size].concatenate(s)`
+  for each `s` in `self.batch_size`.
   """
 
   def __call__(self, inputs, state, scope=None):
@@ -112,7 +117,25 @@ class _RNNCell(base_layer.Layer):  # pylint: disable=protected-access
       - New state: Either a single `2-D` tensor, or a tuple of tensors matching
         the arity and shapes of `state`.
     """
-    return super(_RNNCell, self).__call__(inputs, state, scope=scope)
+    if scope is not None:
+      with vs.variable_scope(scope,
+                             custom_getter=self._rnn_get_variable) as scope:
+        return super(_RNNCell, self).__call__(inputs, state, scope=scope)
+    else:
+      with vs.variable_scope(vs.get_variable_scope(),
+                             custom_getter=self._rnn_get_variable):
+        return super(_RNNCell, self).__call__(inputs, state)
+
+  def _rnn_get_variable(self, getter, *args, **kwargs):
+    variable = getter(*args, **kwargs)
+    trainable = (variable in tf_variables.trainable_variables() or
+                 (isinstance(variable, tf_variables.PartitionedVariable) and
+                  list(variable)[0] in tf_variables.trainable_variables()))
+    if trainable and variable not in self._trainable_weights:
+      self._trainable_weights.append(variable)
+    elif not trainable and variable not in self._non_trainable_weights:
+      self._non_trainable_weights.append(variable)
+    return variable
 
   @property
   def state_size(self):
@@ -128,6 +151,11 @@ class _RNNCell(base_layer.Layer):  # pylint: disable=protected-access
     """Integer or TensorShape: size of outputs produced by this cell."""
     raise NotImplementedError("Abstract method")
 
+  def build(self, _):
+    # This tells the parent Layer object that it's OK to call
+    # self.add_variable() inside the call() method.
+    pass
+
   def zero_state(self, batch_size, dtype):
     """Return zero-filled state tensor(s).
 
-- 
GitLab


From 94e7325bbf2d07e0e0044f37c6249b4b3173d9b4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 09:22:47 -0800
Subject: [PATCH 0998/1563] Making the pip smoke test warning clearer. Change:
 155094164

---
 tensorflow/tools/pip_package/pip_smoke_test.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index 0438ce6846..fa61a19b39 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -122,7 +122,10 @@ def main():
       affected_tests_list = affected_tests.split("\n")[:-2]
       print("\n".join(affected_tests_list))
 
-    raise RuntimeError("One or more dependencies are not in the pip package.")
+    raise RuntimeError("""One or more dependencies are not in the pip package.
+Please either blacklist the dependencies in
+tensorflow/tensorflow/tensorflow/tools/pip_package/pip_smoke_test.py
+or add them to tensorflow/tensorflow/tensorflow/tools/pip_package/BUILD.""")
 
   else:
     print("TEST PASSED")
-- 
GitLab


From 61048d872698cbfb5462e850823c97c7f733b35d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 09:42:53 -0800
Subject: [PATCH 0999/1563] Automated rollback of change 154868460 Change:
 155096835

---
 tensorflow/core/kernels/crop_and_resize_op.cc | 565 ++++++++----------
 tensorflow/core/kernels/crop_and_resize_op.h  |   8 +-
 .../core/kernels/crop_and_resize_op_gpu.cu.cc |   2 +-
 .../core/kernels/crop_and_resize_op_test.cc   |   6 +-
 4 files changed, 251 insertions(+), 330 deletions(-)

diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index 1c7afcf866..746fe63e2a 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -19,9 +19,6 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/crop_and_resize_op.h"
 
-#include <functional>
-#include <string>
-
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -29,13 +26,10 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/kernels/bounds_check.h"
-#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/types.h"
 
 #if GOOGLE_CUDA
-#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
 #include "tensorflow/core/platform/stream_executor.h"
 #endif  // GOOGLE_CUDA
 
@@ -43,67 +37,41 @@ namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
-using Callback = std::function<void()>;
-
-namespace {
 
-static inline Status ParseAndCheckBoxSizes(const Tensor& boxes,
-                                           const Tensor& box_index,
-                                           int* num_boxes) {
-  if (boxes.NumElements() == 0 && box_index.NumElements() == 0) {
+static inline void ParseAndCheckBoxSizes(OpKernelContext* context,
+                                         const Tensor& boxes,
+                                         const Tensor& box_ind,
+                                         int* num_boxes) {
+  if (boxes.NumElements() == 0 && box_ind.NumElements() == 0) {
     *num_boxes = 0;
-    return Status::OK();
+    return;
   }
   // The shape of 'boxes' is [num_boxes, 4].
-  if (boxes.dims() != 2) {
-    return errors::InvalidArgument("boxes must be 2-D",
-                                   boxes.shape().DebugString());
-  }
+  OP_REQUIRES(context, boxes.dims() == 2,
+              errors::InvalidArgument("boxes must be 2-D",
+                                      boxes.shape().DebugString()));
   *num_boxes = boxes.dim_size(0);
-  if (boxes.dim_size(1) != 4) {
-    return errors::InvalidArgument("boxes must have 4 columns");
-  }
-  // The shape of 'box_index' is [num_boxes].
-  if (box_index.dims() != 1) {
-    return errors::InvalidArgument("box_index must be 1-D",
-                                   box_index.shape().DebugString());
-  }
-  if (box_index.dim_size(0) != *num_boxes) {
-    return errors::InvalidArgument("box_index has incompatible shape");
-  }
-  return Status::OK();
+  OP_REQUIRES(context, boxes.dim_size(1) == 4,
+              errors::InvalidArgument("boxes must have 4 columns"));
+
+  // The shape of 'box_ind' is [num_boxes].
+  OP_REQUIRES(context, box_ind.dims() == 1,
+              errors::InvalidArgument("box_ind must be 1-D",
+                                      box_ind.shape().DebugString()));
+  OP_REQUIRES(context, box_ind.dim_size(0) == *num_boxes,
+              errors::InvalidArgument("box_ind has incompatible shape"));
 }
 
-// Conditionally calls the compute callback if all values in box_index are in
-// [0, batch_size) then calls done.
+// Verifies that all values in box_ind are in [0, batch).
 template <typename Device>
-inline void RunIfBoxIndexIsValid(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
-    int batch_size, Callback compute, Callback done);
-
-// Specialization of CheckValidBoxIndex for a CPUDevice.
-template <>
-inline void RunIfBoxIndexIsValid<CPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
-    int batch_size, Callback compute, Callback done) {
-  const int num_boxes = box_index.dimension(0);
-  for (int b = 0; b < num_boxes; ++b) {
-    OP_REQUIRES_ASYNC(
-        context, FastBoundsCheck(box_index(b), batch_size),
-        errors::OutOfRange("box_index has values outside [0, batch_size)"),
-        done);
-  }
-  compute();
-  done();
-}
-
-}  // namespace
+inline void CheckValidBoxInd(
+    OpKernelContext* context,
+    typename TTypes<int32, 1>::ConstTensor box_ind_data, int batch);
 
 template <typename Device, typename T>
-class CropAndResizeOp : public AsyncOpKernel {
+class CropAndResizeOp : public OpKernel {
  public:
-  explicit CropAndResizeOp(OpKernelConstruction* context)
-      : AsyncOpKernel(context) {
+  explicit CropAndResizeOp(OpKernelConstruction* context) : OpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
@@ -112,77 +80,69 @@ class CropAndResizeOp : public AsyncOpKernel {
                                              &extrapolation_value_));
   }
 
-  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
-    // The shape of 'image' is [batch_size, image_height, image_width,
-    // channels].
+  void Compute(OpKernelContext* context) override {
+    // The shape of 'image' is [batch, image_height, image_width, channels].
     const Tensor& image = context->input(0);
-    // The shape of 'boxes' is [num_boxes, 4].
-    const Tensor& boxes = context->input(1);
-    // The shape of 'box_index' is [num_boxes].
-    const Tensor& box_index = context->input(2);
-    // The shape of 'crop_size' is [2].
-    const Tensor& crop_size = context->input(3);
+    OP_REQUIRES(context, image.dims() == 4,
+                errors::InvalidArgument("input image must be 4-D",
+                                        image.shape().DebugString()));
 
-    // Validate inputs dimensions.
-    OP_REQUIRES_ASYNC(context, image.dims() == 4,
-                      errors::InvalidArgument("input image must be 4-D",
-                                              image.shape().DebugString()),
-                      done);
-    const int batch_size = image.dim_size(0);
+    const int batch = image.dim_size(0);
     const int image_height = image.dim_size(1);
     const int image_width = image.dim_size(2);
     const int depth = image.dim_size(3);
-    OP_REQUIRES_ASYNC(
-        context, image_height > 0 && image_width > 0,
-        errors::InvalidArgument("image dimensions must be positive"), done);
+    OP_REQUIRES(context, image_height > 0 && image_width > 0,
+                errors::InvalidArgument("image dimensions must be positive"));
+
+    // The shape of 'boxes' is [num_boxes, 4].
+    const Tensor& boxes = context->input(1);
+
+    // The shape of 'box_ind' is [num_boxes].
+    const Tensor& box_ind = context->input(2);
+
     int num_boxes = 0;
-    OP_REQUIRES_OK_ASYNC(
-        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
-
-    OP_REQUIRES_ASYNC(context, crop_size.dims() == 1,
-                      errors::InvalidArgument("crop_size must be 1-D",
-                                              crop_size.shape().DebugString()),
-                      done);
-    OP_REQUIRES_ASYNC(
-        context, crop_size.dim_size(0) == 2,
-        errors::InvalidArgument("crop_size must have two elements",
-                                crop_size.shape().DebugString()),
-        done);
-
-    // Copy and validate crop sizes.
+    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
+
+    // The shape of 'crop_size' is [2].
+    const Tensor& crop_size = context->input(3);
+
+    OP_REQUIRES(context, crop_size.dims() == 1,
+                errors::InvalidArgument("crop_size must be 1-D",
+                                        crop_size.shape().DebugString()));
+    OP_REQUIRES(context, crop_size.dim_size(0) == 2,
+                errors::InvalidArgument("crop_size must have two elements",
+                                        crop_size.shape().DebugString()));
+
     auto crop_size_vec = crop_size.vec<int32>();
     const int crop_height = internal::SubtleMustCopy(crop_size_vec(0));
     const int crop_width = internal::SubtleMustCopy(crop_size_vec(1));
-    OP_REQUIRES_ASYNC(
-        context, crop_height > 0 && crop_width > 0,
-        errors::InvalidArgument("crop dimensions must be positive"), done);
+    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
+                errors::InvalidArgument("crop dimensions must be positive"));
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK_ASYNC(
+    OP_REQUIRES_OK(
         context,
         context->allocate_output(
             0, TensorShape({num_boxes, crop_height, crop_width, depth}),
-            &output),
-        done);
-
-    auto compute_callback = [this, context, output]() {
-      const Tensor& image = context->input(0);
-      const Tensor& boxes = context->input(1);
-      const Tensor& box_index = context->input(2);
-      const bool status = functor::CropAndResize<Device, T>()(
-          context->eigen_device<Device>(), image.tensor<T, 4>(),
-          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
-          extrapolation_value_, output->tensor<float, 4>());
-      if (!status) {
-        context->SetStatus(
-            errors::Internal("Failed launch CropAndResizeKernel."));
-      }
-    };
-
-    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
-                                 batch_size, std::move(compute_callback),
-                                 std::move(done));
+            &output));
+
+    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
+    typename TTypes<float, 2>::ConstTensor boxes_data =
+        boxes.tensor<float, 2>();
+    typename TTypes<int32, 1>::ConstTensor box_ind_data =
+        box_ind.tensor<int32, 1>();
+    typename TTypes<float, 4>::Tensor crops_data = output->tensor<float, 4>();
+
+    CheckValidBoxInd<Device>(context, box_ind_data, batch);
+
+    bool status = functor::CropAndResize<Device, T>()(
+        context->eigen_device<Device>(), image_data, boxes_data, box_ind_data,
+        extrapolation_value_, crops_data);
+    if (!status) {
+      context->SetStatus(
+          errors::Internal("Failed launch CropAndResizeKernel."));
+    }
   }
 
  private:
@@ -195,10 +155,10 @@ template <typename T>
 struct CropAndResize<CPUDevice, T> {
   bool operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_index,
+                  typename TTypes<int32, 1>::ConstTensor box_ind,
                   float extrapolation_value,
                   typename TTypes<float, 4>::Tensor crops) {
-    const int batch_size = image.dimension(0);
+    const int batch = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -213,8 +173,8 @@ struct CropAndResize<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_index(b);
-      if (!FastBoundsCheck(b_in, batch_size)) {
+      const int32 b_in = box_ind(b);
+      if (b_in < 0 || b_in >= batch) {
         continue;
       }
 
@@ -275,94 +235,89 @@ struct CropAndResize<CPUDevice, T> {
     return true;
   }
 };
-
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradImageOp : public AsyncOpKernel {
+class CropAndResizeGradImageOp : public OpKernel {
  public:
   explicit CropAndResizeGradImageOp(OpKernelConstruction* context)
-      : AsyncOpKernel(context) {
+      : OpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
+  void Compute(OpKernelContext* context) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
-    // The shape of 'boxes' is [num_boxes, 4].
-    const Tensor& boxes = context->input(1);
-    // The shape of 'box_index' is [num_boxes].
-    const Tensor& box_index = context->input(2);
-    // The shape of 'image_size' is [4].
-    const Tensor& image_size = context->input(3);
 
-    // Validate input shapes.
-    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
-                      errors::InvalidArgument("grads image must be 4-D",
-                                              grads.shape().DebugString()),
-                      done);
+    OP_REQUIRES(context, grads.dims() == 4,
+                errors::InvalidArgument("grads image must be 4-D",
+                                        grads.shape().DebugString()));
     const int crop_height = grads.dim_size(1);
     const int crop_width = grads.dim_size(2);
-    OP_REQUIRES_ASYNC(
-        context, crop_height > 0 && crop_width > 0,
-        errors::InvalidArgument("grads dimensions must be positive"), done);
+    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
+                errors::InvalidArgument("grads dimensions must be positive"));
+
+    // The shape of 'boxes' is [num_boxes, 4].
+    const Tensor& boxes = context->input(1);
+
+    // The shape of 'box_ind' is [num_boxes].
+    const Tensor& box_ind = context->input(2);
+
     int num_boxes = 0;
-    OP_REQUIRES_OK_ASYNC(
-        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
-    OP_REQUIRES_ASYNC(
+    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
+
+    OP_REQUIRES(
         context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"),
-        done);
-
-    OP_REQUIRES_ASYNC(context, image_size.dims() == 1,
-                      errors::InvalidArgument("image_size must be 1-D",
-                                              image_size.shape().DebugString()),
-                      done);
-    OP_REQUIRES_ASYNC(context, image_size.dim_size(0) == 4,
-                      errors::InvalidArgument("image_size must have 4 elements",
-                                              image_size.shape().DebugString()),
-                      done);
+        errors::InvalidArgument("boxes and grads have incompatible shape"));
+
+    // The shape of 'image_size' is [4].
+    const Tensor& image_size = context->input(3);
+    OP_REQUIRES(context, image_size.dims() == 1,
+                errors::InvalidArgument("image_size must be 1-D",
+                                        image_size.shape().DebugString()));
+    OP_REQUIRES(context, image_size.dim_size(0) == 4,
+                errors::InvalidArgument("image_size must have 4 elements",
+                                        image_size.shape().DebugString()));
+
     auto image_size_vec = image_size.vec<int32>();
-    const int batch_size = internal::SubtleMustCopy(image_size_vec(0));
+    const int batch = internal::SubtleMustCopy(image_size_vec(0));
     const int image_height = internal::SubtleMustCopy(image_size_vec(1));
     const int image_width = internal::SubtleMustCopy(image_size_vec(2));
     const int depth = internal::SubtleMustCopy(image_size_vec(3));
-    OP_REQUIRES_ASYNC(
-        context, image_height > 0 && image_width > 0,
-        errors::InvalidArgument("image dimensions must be positive"), done);
-    OP_REQUIRES_ASYNC(
+
+    OP_REQUIRES(context, image_height > 0 && image_width > 0,
+                errors::InvalidArgument("image dimensions must be positive"));
+    OP_REQUIRES(
         context, grads.dim_size(3) == depth,
-        errors::InvalidArgument("image_size and grads are incompatible"), done);
+        errors::InvalidArgument("image_size and grads are incompatible"));
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK_ASYNC(
-        context,
-        context->allocate_output(
-            0, TensorShape({batch_size, image_height, image_width, depth}),
-            &output),
-        done);
-
-    auto compute_callback = [context, output]() {
-      const Tensor& grads = context->input(0);
-      const Tensor& boxes = context->input(1);
-      const Tensor& box_index = context->input(2);
-      const bool status = functor::CropAndResizeBackpropImage<Device, T>()(
-          context->eigen_device<Device>(), grads.tensor<float, 4>(),
-          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
-          output->tensor<T, 4>());
-      if (!status) {
-        context->SetStatus(errors::Internal(
-            "Failed launch CropAndResizeBackpropImage kernel."));
-      }
-    };
-
-    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
-                                 batch_size, std::move(compute_callback),
-                                 std::move(done));
+    OP_REQUIRES_OK(
+        context, context->allocate_output(
+                     0, TensorShape({batch, image_height, image_width, depth}),
+                     &output));
+
+    typename TTypes<float, 4>::ConstTensor grads_data =
+        grads.tensor<float, 4>();
+    typename TTypes<float, 2>::ConstTensor boxes_data =
+        boxes.tensor<float, 2>();
+    typename TTypes<int32, 1>::ConstTensor box_ind_data =
+        box_ind.tensor<int32, 1>();
+    typename TTypes<T, 4>::Tensor output_data = output->tensor<T, 4>();
+
+    CheckValidBoxInd<Device>(context, box_ind_data, batch);
+
+    bool status = functor::CropAndResizeBackpropImage<Device, T>()(
+        context->eigen_device<Device>(), grads_data, boxes_data, box_ind_data,
+        output_data);
+    if (!status) {
+      context->SetStatus(
+          errors::Internal("Failed launch CropAndResizeBackpropImageKernel."));
+    }
   }
 };
 
@@ -373,9 +328,9 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
   bool operator()(const CPUDevice& d,
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_index,
+                  typename TTypes<int32, 1>::ConstTensor box_ind,
                   typename TTypes<T, 4>::Tensor grads_image) {
-    const int batch_size = grads_image.dimension(0);
+    const int batch = grads_image.dimension(0);
     const int image_height = grads_image.dimension(1);
     const int image_width = grads_image.dimension(2);
 
@@ -392,8 +347,8 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_index(b);
-      if (!FastBoundsCheck(b_in, batch_size)) {
+      const int32 b_in = box_ind(b);
+      if (b_in < 0 || b_in >= batch) {
         continue;
       }
 
@@ -444,90 +399,83 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
     return true;
   }
 };
-
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradBoxesOp : public AsyncOpKernel {
+class CropAndResizeGradBoxesOp : public OpKernel {
  public:
   explicit CropAndResizeGradBoxesOp(OpKernelConstruction* context)
-      : AsyncOpKernel(context) {
+      : OpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
+  void Compute(OpKernelContext* context) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
-    // The shape of 'boxes' is [num_boxes, 4].
-    const Tensor& boxes = context->input(2);
-    // The shape of 'box_index' is [num_boxes].
-    const Tensor& box_index = context->input(3);
-    // The shape of 'image' is [batch_size, image_height, image_width, depth].
-    const Tensor& image = context->input(1);
 
-    // Validate input shapes.
-    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
-                      errors::InvalidArgument("grads image must be 4-D",
-                                              grads.shape().DebugString()),
-                      done);
+    OP_REQUIRES(context, grads.dims() == 4,
+                errors::InvalidArgument("grads image must be 4-D",
+                                        grads.shape().DebugString()));
+
     const int crop_height = grads.dim_size(1);
     const int crop_width = grads.dim_size(2);
     const int depth = grads.dim_size(3);
-    OP_REQUIRES_ASYNC(
-        context, crop_height > 0 && crop_width > 0,
-        errors::InvalidArgument("grads dimensions must be positive"), done);
-
-    OP_REQUIRES_ASYNC(context, image.dims() == 4,
-                      errors::InvalidArgument("input image must be 4-D",
-                                              image.shape().DebugString()),
-                      done);
-    const int batch_size = image.dim_size(0);
+    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
+                errors::InvalidArgument("grads dimensions must be positive"));
+
+    // The shape of 'image' is [batch, image_height, image_width, depth].
+    const Tensor& image = context->input(1);
+    OP_REQUIRES(context, image.dims() == 4,
+                errors::InvalidArgument("input image must be 4-D",
+                                        image.shape().DebugString()));
+
+    const int batch = image.dim_size(0);
     const int image_height = image.dim_size(1);
     const int image_width = image.dim_size(2);
-    OP_REQUIRES_ASYNC(
-        context, image_height > 0 && image_width > 0,
-        errors::InvalidArgument("image dimensions must be positive"), done);
-    OP_REQUIRES_ASYNC(context, image.dim_size(3) == depth,
-                      errors::InvalidArgument("image, grads depth differ"),
-                      done);
+    OP_REQUIRES(context, image_height > 0 && image_width > 0,
+                errors::InvalidArgument("image dimensions must be positive"));
+    OP_REQUIRES(context, image.dim_size(3) == depth,
+                errors::InvalidArgument("image, grads depth differ"));
+
+    // The shape of 'boxes' is [num_boxes, 4].
+    const Tensor& boxes = context->input(2);
+
+    // The shape of 'box_ind' is [num_boxes].
+    const Tensor& box_ind = context->input(3);
 
     int num_boxes = 0;
-    OP_REQUIRES_OK_ASYNC(
-        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
+    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
 
-    OP_REQUIRES_ASYNC(
+    OP_REQUIRES(
         context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"),
-        done);
+        errors::InvalidArgument("boxes and grads have incompatible shape"));
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK_ASYNC(
-        context,
-        context->allocate_output(0, TensorShape({num_boxes, 4}), &output),
-        done);
-
-    auto compute_callback = [context, output]() {
-      const Tensor& grads = context->input(0);
-      const Tensor& image = context->input(1);
-      const Tensor& boxes = context->input(2);
-      const Tensor& box_index = context->input(3);
-      const bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
-          context->eigen_device<Device>(), grads.tensor<float, 4>(),
-          image.tensor<T, 4>(), boxes.tensor<float, 2>(),
-          box_index.tensor<int32, 1>(), output->tensor<float, 2>());
-      if (!status) {
-        context->SetStatus(errors::Internal(
-            "Failed launch CropAndResizeBackpropBoxes kernel."));
-      }
-    };
-
-    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
-                                 batch_size, std::move(compute_callback),
-                                 std::move(done));
+    OP_REQUIRES_OK(context, context->allocate_output(
+                                0, TensorShape({num_boxes, 4}), &output));
+
+    typename TTypes<float, 4>::ConstTensor grads_data =
+        grads.tensor<float, 4>();
+    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
+    typename TTypes<float, 2>::ConstTensor boxes_data =
+        boxes.tensor<float, 2>();
+    typename TTypes<int32, 1>::ConstTensor box_ind_data =
+        box_ind.tensor<int32, 1>();
+    typename TTypes<float, 2>::Tensor output_data = output->tensor<float, 2>();
+
+    CheckValidBoxInd<Device>(context, box_ind_data, batch);
+
+    bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
+        context->eigen_device<Device>(), grads_data, image_data, boxes_data,
+        box_ind_data, output_data);
+    if (!status) {
+      context->SetStatus(
+          errors::Internal("Failed launch CropAndResizeBackpropBoxesKernel."));
+    }
   }
 };
 
@@ -539,9 +487,9 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_index,
+                  typename TTypes<int32, 1>::ConstTensor box_ind,
                   typename TTypes<float, 2>::Tensor grads_boxes) {
-    const int batch_size = image.dimension(0);
+    const int batch = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -558,8 +506,8 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_index(b);
-      if (!FastBoundsCheck(b_in, batch_size)) {
+      const int32 b_in = box_ind(b);
+      if (b_in < 0 || b_in >= batch) {
         continue;
       }
 
@@ -641,19 +589,30 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
     return true;
   }
 };
-
 }  // namespace functor
 
-#define REGISTER_KERNEL(T)                                \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResize")           \
-                              .Device(DEVICE_CPU)         \
-                              .TypeConstraint<T>("T")     \
-                              .HostMemory("crop_size"),   \
-                          CropAndResizeOp<CPUDevice, T>); \
-                                                          \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")  \
-                              .Device(DEVICE_CPU)         \
-                              .TypeConstraint<T>("T"),    \
+// Specialization of CheckValidBoxInd for a CPUDevice.
+template <>
+inline void CheckValidBoxInd<CPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
+    int batch) {
+  const int num_boxes = box_ind.dimension(0);
+  for (int b = 0; b < num_boxes; ++b) {
+    OP_REQUIRES(context, box_ind(b) >= 0 && box_ind(b) < batch,
+                errors::OutOfRange("box_ind has values outside [0, batch)"));
+  }
+}
+
+#define REGISTER_KERNEL(T)                                         \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
+                              .Device(DEVICE_CPU)                  \
+                              .TypeConstraint<T>("T")              \
+                              .HostMemory("crop_size"),            \
+                          CropAndResizeOp<CPUDevice, T>);          \
+                                                                   \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")           \
+                              .Device(DEVICE_CPU)                  \
+                              .TypeConstraint<T>("T"),             \
                           CropAndResizeGradBoxesOp<CPUDevice, T>);
 
 TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNEL);
@@ -675,85 +634,49 @@ TF_CALL_double(REGISTER_KERNEL);
 
 #if GOOGLE_CUDA
 
-// Forward declaration of the CheckValidBoxIndexHelper specialization for GPU.
+// Forward declaration of the CheckValidBoxIndHelper specialization for GPU.
 namespace functor {
 template <>
-void CheckValidBoxIndexHelper<GPUDevice>::operator()(
-    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_index,
-    int batch_size, typename TTypes<bool, 0>::Tensor isvalid);
-extern template struct CheckValidBoxIndexHelper<GPUDevice>;
+void CheckValidBoxIndHelper<GPUDevice>::operator()(
+    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_ind,
+    int batch, typename TTypes<bool, 0>::Tensor isvalid);
+extern template struct CheckValidBoxIndHelper<GPUDevice>;
 }  // namespace functor
 
-namespace {
-
-// Specialization of CheckValidBoxIndex for a GPUDevice.
+// Specialization of CheckValidBoxInd for a GPUDevice.
 template <>
-inline void RunIfBoxIndexIsValid<GPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
-    int batch_size, Callback compute, Callback done) {
-  const int num_boxes = box_index.dimension(0);
+inline void CheckValidBoxInd<GPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
+    int batch) {
+  const int num_boxes = box_ind.dimension(0);
   if (num_boxes == 0) {
-    compute();
-    done();
     return;
   }
+  Tensor isvalid_tensor;
+  OP_REQUIRES_OK(context,
+                 context->allocate_temp(DataTypeToEnum<bool>::value,
+                                        TensorShape({}), &isvalid_tensor));
 
-  Tensor isvalid_dev_tensor;
-  OP_REQUIRES_OK_ASYNC(
-      context,
-      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
-                             &isvalid_dev_tensor),
-      done);
-  typename TTypes<bool, 0>::Tensor isvalid_dev =
-      isvalid_dev_tensor.tensor<bool, 0>();
+  typename TTypes<bool, 0>::Tensor isvalid = isvalid_tensor.tensor<bool, 0>();
 
-  // Run the actual box check on the device.
-  functor::CheckValidBoxIndexHelper<GPUDevice>()(
-      context->eigen_device<GPUDevice>(), box_index, batch_size, isvalid_dev);
+  functor::CheckValidBoxIndHelper<GPUDevice>()(
+      context->eigen_device<GPUDevice>(), box_ind, batch, isvalid);
 
-  // Copy the result back to the host.
   auto* stream = context->op_device_context()->stream();
-  OP_REQUIRES_ASYNC(context, stream,
-                    errors::Internal("No GPU stream available."), done);
-  Tensor isvalid_host_tensor;
-  // Use pinned host memory on the host to avoid unnecessary
-  // synchronization.
-  AllocatorAttributes alloc_attr;
-  alloc_attr.set_on_host(true);
-  alloc_attr.set_gpu_compatible(true);
-  OP_REQUIRES_OK_ASYNC(
-      context,
-      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
-                             &isvalid_host_tensor, alloc_attr),
-      done);
-  typename TTypes<bool, 0>::Tensor isvalid_host =
-      isvalid_host_tensor.tensor<bool, 0>();
-
-  perftools::gputools::DeviceMemoryBase wrapped(isvalid_dev.data(),
-                                                sizeof(bool));
-  const bool status = stream
-                          ->ThenMemcpy(isvalid_host.data() /* destination */,
-                                       wrapped /* source */, sizeof(bool))
-                          .ok();
-  OP_REQUIRES_ASYNC(
-      context, status,
-      errors::Internal("Failed to launch copy of isvalid from device to host."),
-      done);
-
-  auto wrapped_callback = [context, isvalid_host, compute, done]() {
-    OP_REQUIRES_ASYNC(
-        context, isvalid_host(),
-        errors::OutOfRange("box_index has values outside [0, batch_size)"),
-        done);
-    compute();
-    done();
-  };
-
-  context->device()->tensorflow_gpu_device_info()->event_mgr->ThenExecute(
-      stream, wrapped_callback);
-}
+  OP_REQUIRES(context, stream, errors::Internal("No GPU stream available."));
+
+  bool isvalid_host = false;
+  perftools::gputools::DeviceMemoryBase isvalid_gpu(isvalid.data(),
+                                                    sizeof(bool));
+  stream->ThenMemcpy(&isvalid_host, isvalid_gpu, sizeof(bool));
+  stream->BlockHostUntilDone();
 
-}  // namespace
+  OP_REQUIRES(context, stream->ok(),
+              errors::Internal("cudaMemcpy from device to host failed"));
+
+  OP_REQUIRES(context, isvalid_host,
+              errors::OutOfRange("box_ind has values outside [0, batch)"));
+}
 
 #define REGISTER_KERNEL(T)                                         \
   REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
diff --git a/tensorflow/core/kernels/crop_and_resize_op.h b/tensorflow/core/kernels/crop_and_resize_op.h
index 460dbad22b..22df1bdd56 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.h
+++ b/tensorflow/core/kernels/crop_and_resize_op.h
@@ -53,12 +53,12 @@ struct CropAndResizeBackpropBoxes {
 };
 
 template <typename Device>
-struct CheckValidBoxIndexHelper {
-  // Checks if all values in box_index are in [0, batch).
+struct CheckValidBoxIndHelper {
+  // Checks if all values in box_ind are in [0, batch).
   void operator()(const Device& d,
-                  typename TTypes<int32, 1>::ConstTensor box_index, int batch,
+                  typename TTypes<int32, 1>::ConstTensor box_ind, int batch,
                   typename TTypes<bool, 0>::Tensor isvalid) {
-    isvalid.device(d) = ((box_index >= 0) && (box_index < batch)).all();
+    isvalid.device(d) = ((box_ind >= 0) && (box_ind < batch)).all();
   }
 };
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
index c1235fda89..254475db46 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
@@ -440,7 +440,7 @@ TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 
-template struct CheckValidBoxIndexHelper<GPUDevice>;
+template struct CheckValidBoxIndHelper<GPUDevice>;
 
 }  // namespace functor
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/crop_and_resize_op_test.cc b/tensorflow/core/kernels/crop_and_resize_op_test.cc
index d6139dae96..3a7f180598 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_test.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_test.cc
@@ -251,7 +251,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(
-      StringPiece(s.ToString()).contains("box_index has incompatible shape"))
+      StringPiece(s.ToString()).contains("box_ind has incompatible shape"))
       << s;
 }
 
@@ -264,10 +264,8 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndex) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(StringPiece(s.ToString())
-                  .contains("box_index has values outside [0, batch_size)"))
+                  .contains("box_ind has values outside [0, batch)"))
       << s;
 }
 
-// TODO(zhengxq, rmlarsen): Add a benchmark.
-
 }  // namespace tensorflow
-- 
GitLab


From 2b75d151c92660e9aa8d378feda20059a1592e5c Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Thu, 4 May 2017 09:55:12 -0800
Subject: [PATCH 1000/1563] Fix an error. Change: 155098574

---
 tensorflow/core/grappler/optimizers/layout_optimizer.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/optimizers/layout_optimizer.cc b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
index 5fec89b698..e37c4a5b36 100644
--- a/tensorflow/core/grappler/optimizers/layout_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/layout_optimizer.cc
@@ -405,7 +405,7 @@ class Conv2DProcessor : public NodeProcessor {
       }
     }
     if (input_shape.dim_size() == 4 && filter_shape.dim_size() == 4) {
-      if (input_shape.dim(1).size() == filter_shape.dim(0).size() == 1 &&
+      if (input_shape.dim(1).size() == filter_shape.dim(0).size() &&
           input_shape.dim(2).size() == filter_shape.dim(1).size() &&
           IsValidPadding()) {
         return true;
-- 
GitLab


From 1f3e689b98365556741ccaba71868ffe1ab6364d Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 4 May 2017 10:20:38 -0800
Subject: [PATCH 1001/1563] Don't repeatedly serialize the function library in
 MasterSession. Change: 155102455

---
 tensorflow/core/distributed_runtime/master_session.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index f7b422b70e..5257aea1e3 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -162,7 +162,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
   // Partitions the graph into subgraphs and registers them on
   // workers.
   Status RegisterPartitions(const PartitionOptions& popts,
-                            const FunctionDefLibrary& func_def_lib);
+                            const FunctionLibraryDefinition& flib_def);
 
   // Runs one step of all partitions.
   Status RunPartitions(const MasterEnv* env, int64 step_id,
@@ -273,7 +273,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
 };
 
 Status MasterSession::ReffedClientGraph::RegisterPartitions(
-    const PartitionOptions& popts, const FunctionDefLibrary& func_def_lib) {
+    const PartitionOptions& popts, const FunctionLibraryDefinition& flib_def) {
   {  // Ensure register once.
     mu_.lock();
     if (!init_started_) {
@@ -292,7 +292,8 @@ Status MasterSession::ReffedClientGraph::RegisterPartitions(
           graph_defs_for_publishing.push_back(&name_def.second);
         }
         stats_publisher_->PublishGraphProto(graph_defs_for_publishing);
-        s = DoRegisterPartitions(popts, func_def_lib, std::move(graph_defs));
+        s = DoRegisterPartitions(popts, flib_def.ToProto(),
+                                 std::move(graph_defs));
       }
       mu_.lock();
       init_result_ = s;
@@ -1214,7 +1215,7 @@ Status MasterSession::BuildAndRegisterPartitions(ReffedClientGraph* rcg) {
   }
 
   TF_RETURN_IF_ERROR(
-      rcg->RegisterPartitions(popts, rcg->client_graph()->flib_def->ToProto()));
+      rcg->RegisterPartitions(popts, *rcg->client_graph()->flib_def));
 
   return Status::OK();
 }
-- 
GitLab


From 50b836addfed6b49fc823987e9301f1b6eeef90c Mon Sep 17 00:00:00 2001
From: Zongheng Yang <zongheng@google.com>
Date: Thu, 4 May 2017 11:12:52 -0800
Subject: [PATCH 1002/1563] Github #9633: enforce an omitted shape check in
 sparse_add() op.

Previously, the code made the assumption that the two operands have matching
shapes, but did not enforce the equality.  This could lead to invalid memory
access in some cases.
Change: 155109464
---
 .../kernels/sparse_tensor_dense_add_op.cc     | 27 +++++++++++++------
 tensorflow/python/ops/sparse_ops.py           |  2 ++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/tensorflow/core/kernels/sparse_tensor_dense_add_op.cc b/tensorflow/core/kernels/sparse_tensor_dense_add_op.cc
index b5093d59fc..48f38872e2 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_add_op.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_add_op.cc
@@ -47,16 +47,26 @@ class SparseTensorDenseAddOp : public OpKernel {
                     "Input a_indices should be a matrix but received shape: ",
                     a_indices_t->shape().DebugString()));
     OP_REQUIRES(
-        ctx, TensorShapeUtils::IsVector(a_values_t->shape()) &&
-                 TensorShapeUtils::IsVector(a_shape_t->shape()),
+        ctx,
+        TensorShapeUtils::IsVector(a_values_t->shape()) &&
+            TensorShapeUtils::IsVector(a_shape_t->shape()),
         errors::InvalidArgument("Inputs a_values and a_shape should be vectors "
                                 "but received shapes: ",
                                 a_values_t->shape().DebugString(), " and ",
                                 a_shape_t->shape().DebugString()));
-    OP_REQUIRES(ctx, a_shape_t->NumElements() == b->dims(),
-                errors::InvalidArgument(
-                    "Two operands have different dimensions; received: ",
-                    a_shape_t->NumElements(), " and ", b->dims()));
+    OP_REQUIRES(
+        ctx, a_shape_t->NumElements() == b->dims(),
+        errors::InvalidArgument("Two operands have different ranks; received: ",
+                                a_shape_t->NumElements(), " and ", b->dims()));
+    const auto a_shape_flat = a_shape_t->flat<Index>();
+    for (int i = 0; i < b->dims(); ++i) {
+      OP_REQUIRES(
+          ctx, a_shape_flat(i) == b->dim_size(i),
+          errors::InvalidArgument(
+              "Dimension ", i,
+              " does not equal (no broadcasting is supported): sparse side ",
+              a_shape_flat(i), " vs dense side ", b->dim_size(i)));
+    }
 
     Tensor *out_t;
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, b->shape(), &out_t));
@@ -82,8 +92,9 @@ class SparseTensorDenseAddOp : public OpKernel {
       NDIMS_CASE(4);
       NDIMS_CASE(5);
       default:
-        OP_REQUIRES(ctx, false, errors::InvalidArgument(
-                                    "Only tensors with ranks between 1 and 5 "
+        OP_REQUIRES(
+            ctx, false,
+            errors::InvalidArgument("Only tensors with ranks between 1 and 5 "
                                     "are currently supported.  Tensor rank: ",
                                     ndims));
 #undef NDIMS_CASE
diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 0140a27aaa..d6cb7c5be4 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -241,6 +241,8 @@ def sparse_add(a, b, thresh=0):
   of arguments does not matter.  Use vanilla `tf.add()` for adding two dense
   `Tensor`s.
 
+  The shapes of the two operands must match: broadcasting is not supported.
+
   The indices of any input `SparseTensor` are assumed ordered in standard
   lexicographic order.  If this is not the case, before this step run
   `SparseReorder` to restore index ordering.
-- 
GitLab


From f6f26abe3416cc63f43d3ed18cb98eefae966e24 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 4 May 2017 11:58:52 -0800
Subject: [PATCH 1003/1563] Don't declare the ReadyNodeManager class in an
 anonymous namespace since some compilers don't like that. Change: 155115034

---
 tensorflow/core/grappler/costs/virtual_scheduler.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tensorflow/core/grappler/costs/virtual_scheduler.h b/tensorflow/core/grappler/costs/virtual_scheduler.h
index b7785c94e0..5d437dff50 100644
--- a/tensorflow/core/grappler/costs/virtual_scheduler.h
+++ b/tensorflow/core/grappler/costs/virtual_scheduler.h
@@ -26,7 +26,6 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
-namespace {
 struct NodeState {
   std::vector<const NodeDef*> inputs;
   std::vector<const NodeDef*> outputs;
@@ -86,7 +85,6 @@ class FIFOManager : public ReadyNodeManager {
  private:
   std::list<const NodeDef*> nodes_;
 };
-}  // namespace
 
 // The virtual scheduler emulates execution of nodes in a graph, considering
 // dependencies, device, etc.
-- 
GitLab


From e847d1b41fc44d9e892c8fef446b94a709dc8cf3 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 4 May 2017 11:59:45 -0800
Subject: [PATCH 1004/1563] Automated rollback of change 155092161 Change:
 155115134

---
 tensorflow/contrib/opt/BUILD | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index 1843b6968e..2173e13b91 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -29,9 +29,7 @@ py_library(
         "//tensorflow/python:platform",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
-        "//tensorflow/python:util",
         "//tensorflow/python:variables",
-        "//third_party/py/scipy",
         "@six_archive//:six",
     ],
 )
-- 
GitLab


From 9340f27ae1daa1a7d4aeef9487dae6807cb6d5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Csomor?=
 <laszlocsomor@users.noreply.github.com>
Date: Thu, 4 May 2017 22:19:05 +0200
Subject: [PATCH 1005/1563] Fix Bazel CI / TensorFlow project. (#9659)

This change:

1. updates common_env.sh to export PYTHON_LIB_PATH
along with PYTHON_BIN_PATH so the configure
scripts doesn't have to guess

2. writes these paths to bazelrc with quotes
around, to guard agains spaces in the path (e.g.
"C:/Program Files/Anaconda3/python")

Fixes https://github.com/bazelbuild/bazel/issues/2892
---
 configure                                          | 14 +++++++-------
 .../tools/ci_build/windows/bazel/common_env.sh     |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index e44939bfd6..15715e5ef2 100755
--- a/configure
+++ b/configure
@@ -147,17 +147,17 @@ function setup_python {
   # Set-up env variables used by python_configure.bzl
   write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
   write_action_env_to_bazelrc "PYTHON_LIB_PATH" "$PYTHON_LIB_PATH"
-  write_to_bazelrc "build --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
-  write_to_bazelrc "build --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
+  write_to_bazelrc "build --define PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\""
+  write_to_bazelrc "build --define PYTHON_LIB_PATH=\"$PYTHON_LIB_PATH\""
   write_to_bazelrc "build --force_python=py$python_major_version"
   write_to_bazelrc "build --host_force_python=py$python_major_version"
-  write_to_bazelrc "build --python${python_major_version}_path=$PYTHON_BIN_PATH"
+  write_to_bazelrc "build --python${python_major_version}_path=\"$PYTHON_BIN_PATH\""
   write_to_bazelrc "test --force_python=py$python_major_version"
   write_to_bazelrc "test --host_force_python=py$python_major_version"
-  write_to_bazelrc "test --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
-  write_to_bazelrc "test --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
-  write_to_bazelrc "run --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
-  write_to_bazelrc "run --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
+  write_to_bazelrc "test --define PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\""
+  write_to_bazelrc "test --define PYTHON_LIB_PATH=\"$PYTHON_LIB_PATH\""
+  write_to_bazelrc "run --define PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\""
+  write_to_bazelrc "run --define PYTHON_LIB_PATH=\"$PYTHON_LIB_PATH\""
 
   # Write tools/python_bin_path.sh
   echo "export PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\"" > tools/python_bin_path.sh
diff --git a/tensorflow/tools/ci_build/windows/bazel/common_env.sh b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
index b993747521..e4e3861710 100644
--- a/tensorflow/tools/ci_build/windows/bazel/common_env.sh
+++ b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
@@ -34,6 +34,7 @@ export BAZEL_SH="C:/tools/msys64/usr/bin/bash"
 
 # Set Python path for ./configure
 export PYTHON_BIN_PATH="C:/Program Files/Anaconda3/python"
+export PYTHON_LIB_PATH="C:/Program Files/Anaconda3/lib/site-packages"
 
 # Set Python path for cc_configure.bzl
 export BAZEL_PYTHON="C:/Program Files/Anaconda3/python"
-- 
GitLab


From 28c03f5d5a946e3050f7eed0cd7f3f64e5fa768d Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Thu, 4 May 2017 12:19:59 -0800
Subject: [PATCH 1006/1563] Docs: Stop advertising GPU support for Mac OS X.

Starting with the next release (1.2) GPU support for Mac will be dropped in
release binaries since the configuration of NVIDIA GPUs on a Mac is somewhat
esoteric (and we currently do not have the bandwidth to debug test failures
on that platform).

While at it, change to version 1.1.0 from 1.1.0-rc2
Change: 155117808
---
 tensorflow/docs_src/install/install_c.md    |  2 +-
 tensorflow/docs_src/install/install_go.md   |  2 +-
 tensorflow/docs_src/install/install_java.md | 18 +++++++--------
 tensorflow/go/README.md                     | 25 +++++----------------
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/tensorflow/docs_src/install/install_c.md b/tensorflow/docs_src/install/install_c.md
index c1581efb4f..c1c7b66546 100644
--- a/tensorflow/docs_src/install/install_c.md
+++ b/tensorflow/docs_src/install/install_c.md
@@ -35,7 +35,7 @@ enable TensorFlow for C:
          OS="linux" # Change to "darwin" for Mac OS
          TARGET_DIRECTORY="/usr/local"
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
            sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_go.md b/tensorflow/docs_src/install/install_go.md
index dd713e4786..c9abaf2aca 100644
--- a/tensorflow/docs_src/install/install_go.md
+++ b/tensorflow/docs_src/install/install_go.md
@@ -35,7 +35,7 @@ steps to install this library and enable TensorFlow for Go:
          TF_TYPE="cpu" # Change to "gpu" for GPU support
          TARGET_DIRECTORY='/usr/local'
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0-rc2.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0.tar.gz" |
          sudo tar -C $TARGET_DIRECTORY -xz
 
      The `tar` command extracts the TensorFlow C library into the `lib`
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 65cfe375d5..55d9c2c08f 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -34,7 +34,7 @@ following to the project's `pom.xml` to use the TensorFlow Java APIs:
 <dependency>
   <groupId>org.tensorflow</groupId>
   <artifactId>tensorflow</artifactId>
-  <version>1.1.0-rc2</version>
+  <version>1.1.0</version>
 </dependency>
 ```
 
@@ -63,7 +63,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
                <dependency>
                  <groupId>org.tensorflow</groupId>
                  <artifactId>tensorflow</artifactId>
-                 <version>1.1.0-rc2</version>
+                 <version>1.1.0</version>
                </dependency>
              </dependencies>
          </project>
@@ -122,7 +122,7 @@ refer to the simpler instructions above instead.
 Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
      which is the TensorFlow Java Archive (JAR).
 
   2. Decide whether you will run TensorFlow for Java on CPU(s) only or with
@@ -141,7 +141,7 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
          mkdir -p ./jni
          curl -L \
-           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0-rc2.tar.gz" |
+           "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-${TF_TYPE}-${OS}-x86_64-1.1.0.tar.gz" |
            tar -xz -C ./jni
 
 ### Install on Windows
@@ -149,10 +149,10 @@ Take the following steps to install TensorFlow for Java on Linux or Mac OS:
 Take the following steps to install TensorFlow for Java on Windows:
 
   1. Download
-     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0-rc2.jar),
+     [libtensorflow.jar](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-1.1.0.jar),
      which is the TensorFlow Java Archive (JAR).
   2. Download the following Java Native Interface (JNI) file appropriate for
-     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0-rc2.zip).
+     [TensorFlow for Java on Windows](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow_jni-cpu-windows-x86_64-1.1.0.zip).
   3. Extract this .zip file.
 
 
@@ -200,7 +200,7 @@ must be part of your `classpath`. For example, you can include the
 downloaded `.jar` in your `classpath` by using the `-cp` compilation flag
 as follows:
 
-<pre><b>javac -cp libtensorflow-1.1.0-rc2.jar HelloTF.java</b></pre>
+<pre><b>javac -cp libtensorflow-1.1.0.jar HelloTF.java</b></pre>
 
 
 ### Running
@@ -214,11 +214,11 @@ two files are available to the JVM:
 For example, the following command line executes the `HelloTF` program on Linux
 and Mac OS X:
 
-<pre><b>java -cp libtensorflow-1.1.0-rc2.jar:. -Djava.library.path=./jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0.jar:. -Djava.library.path=./jni HelloTF</b></pre>
 
 And the following comand line executes the `HelloTF` program on Windows:
 
-<pre><b>java -cp libtensorflow-1.1.0-rc2.jar;. -Djava.library.path=jni HelloTF</b></pre>
+<pre><b>java -cp libtensorflow-1.1.0.jar;. -Djava.library.path=jni HelloTF</b></pre>
 
 If the program prints <tt>Hello from <i>version</i></tt>, you've successfully
 installed TensorFlow for Java and are ready to use the API.  If the program
diff --git a/tensorflow/go/README.md b/tensorflow/go/README.md
index e32c21ca72..a1b4255292 100644
--- a/tensorflow/go/README.md
+++ b/tensorflow/go/README.md
@@ -9,24 +9,22 @@ Construct and execute TensorFlow graphs in Go.
 > (`github.com/tensorflow/tensorflow/tensorflow/go`).
 
 ## Quickstart
-
 1.  Download and extract the TensorFlow C library, preferably into `/usr/local`.
     GPU-enabled versions require CUDA 8.0 and cuDNN 5.1. For other versions, the
     TensorFlow C library will have to be built from source (see below).
 
     -   Linux:
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.0.0.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.0.0.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz),
+        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.1.0.tar.gz)
     -   OS X
-        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.0.0.tar.gz),
-        [GPU-enabled](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-darwin-x86_64-1.0.0.tar.gz)
+        [CPU-only](https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.1.0.tar.gz),
 
     The following shell snippet downloads and extracts into `/usr/local`:
 
     ```sh
     TF_TYPE="cpu" # Set to "gpu" for GPU support
     curl -L \
-      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.0.0.tar.gz" |
+      "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-${TF_TYPE}-$(go env GOOS)-x86_64-1.1.0.tar.gz" |
     sudo tar -C /usr/local -xz
     ```
 
@@ -41,20 +39,7 @@ Construct and execute TensorFlow graphs in Go.
 
 ### Installing into locations other than `/usr/local`
 
-The TensorFlow C library (`libtensorflow.so`) needs to be available at build
-time (e.g., `go build`) and run time (`go test` or executing binaries). If the
-library has not been extracted into `/usr/local`, then it needs to be made
-available through the `LIBRARY_PATH` environment variable at build time and the
-`LD_LIBRARY_PATH` environment variable (`DYLD_LIBRARY_PATH` on OS X) at run
-time.
-
-For example, if the TensorFlow C library was extracted into `/dir`, then:
-
-```sh
-export LIBRARY_PATH=/dir/lib
-export LD_LIBRARY_PATH=/dir/lib   # For Linux
-export DYLD_LIBRARY_PATH=/dir/lib # For OS X
-```
+Refer to [Installing TensorFlow for Go](https://www.tensorflow.org/install/install_go)
 
 ## Building the TensorFlow C library from source
 
-- 
GitLab


From e46a12bc9fbcea1fef224daa47eb9f1cf9e56472 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Thu, 4 May 2017 12:20:14 -0800
Subject: [PATCH 1007/1563] Docs: Fix broken link in
 contrib.layers.initializers Change: 155117831

---
 tensorflow/contrib/layers/python/layers/initializers.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/initializers.py b/tensorflow/contrib/layers/python/layers/initializers.py
index 4359d0c63e..811e7fa7aa 100644
--- a/tensorflow/contrib/layers/python/layers/initializers.py
+++ b/tensorflow/contrib/layers/python/layers/initializers.py
@@ -46,8 +46,7 @@ def xavier_initializer(uniform=True, seed=None, dtype=dtypes.float32):
   Args:
     uniform: Whether to use uniform or normal distributed random initialization.
     seed: A Python integer. Used to create random seeds. See
-      [`set_random_seed`](../../api_docs/python/constant_op.md#set_random_seed)
-      for behavior.
+          @{tf.set_random_seed} for behavior.
     dtype: The data type. Only floating point types are supported.
 
   Returns:
@@ -97,8 +96,7 @@ def variance_scaling_initializer(factor=2.0, mode='FAN_IN', uniform=False,
     mode: String.  'FAN_IN', 'FAN_OUT', 'FAN_AVG'.
     uniform: Whether to use uniform or normal distributed random initialization.
     seed: A Python integer. Used to create random seeds. See
-      [`set_random_seed`](../../api_docs/python/constant_op.md#set_random_seed)
-      for behavior.
+          @{tf.set_random_seed} for behavior.
     dtype: The data type. Only floating point types are supported.
 
   Returns:
-- 
GitLab


From dd140f79e06a81c52cd8fc9ec6cda975a78a401f Mon Sep 17 00:00:00 2001
From: Yutaka Leon <yleon@google.com>
Date: Thu, 4 May 2017 12:31:30 -0800
Subject: [PATCH 1008/1563] Organize the lookup table ops into it's own
 lookup_ops.cc file instead of data_flow_ops.cc Change: 155119120

---
 .../python/layers/feature_column_ops_test.py  | 106 +--
 .../estimators/dynamic_rnn_estimator_test.py  |   6 +-
 .../python/learn/estimators/estimator.py      |   4 +-
 .../python/learn/estimators/head_test.py      |  10 +-
 .../state_saving_rnn_estimator_test.py        |   6 +-
 .../learn/python/learn/graph_actions.py       |  11 +-
 .../learn/python/learn/utils/export.py        |  18 +-
 tensorflow/contrib/lookup/BUILD               |   2 +-
 tensorflow/contrib/lookup/lookup_ops_test.py  |  64 +-
 .../contrib/slim/python/slim/learning.py      |   4 +-
 tensorflow/core/BUILD                         |   3 +
 tensorflow/core/kernels/BUILD                 |  10 +-
 tensorflow/core/ops/data_flow_ops.cc          | 598 ----------------
 tensorflow/core/ops/lookup_ops.cc             | 666 ++++++++++++++++++
 tensorflow/python/BUILD                       |  30 +-
 tensorflow/python/estimator/estimator_test.py |   9 +-
 tensorflow/python/feature_column/BUILD        |   2 +-
 .../feature_column/feature_column_test.py     |   8 +-
 .../python/feature_column/lookup_ops.py       |  54 +-
 tensorflow/python/ops/data_flow_ops.py        |  42 --
 tensorflow/python/ops/lookup_ops.py           |  77 ++
 tensorflow/python/ops/standard_ops.py         |   1 +
 tensorflow/python/saved_model/main_op_impl.py |   4 +-
 .../python/training/monitored_session.py      |   4 +-
 .../python/training/saver_test_utils.py       |  14 +-
 tensorflow/python/training/supervisor.py      |   8 +-
 26 files changed, 950 insertions(+), 811 deletions(-)
 create mode 100644 tensorflow/core/ops/lookup_ops.cc
 create mode 100644 tensorflow/python/ops/lookup_ops.py

diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index b2dad0162e..a09cc53571 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -33,9 +33,9 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import variable_scope
@@ -224,7 +224,7 @@ class TransformerTest(test.TestCase):
     self.assertEqual(len(output), 1)
     self.assertIn(keys_sparse, output)
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertEqual(output[keys_sparse].values.dtype, dtypes.int64)
       self.assertAllEqual(output[keys_sparse].values.eval(), [1, 2, 0])
       self.assertAllEqual(output[keys_sparse].indices.eval(),
@@ -242,7 +242,7 @@ class TransformerTest(test.TestCase):
     output = feature_column_ops._Transformer(features).transform(keys_sparse)
 
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       # While the input is a dense Tensor, the output should be a SparseTensor.
       self.assertIsInstance(output, sparse_tensor.SparseTensor)
       self.assertEqual(output.dtype, dtypes.int64)
@@ -311,7 +311,7 @@ class TransformerTest(test.TestCase):
     self.assertIn(weighted_ids, output)
 
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(output[weighted_ids][0].dense_shape.eval(),
                           ids_tensor.dense_shape.eval())
       self.assertAllEqual(output[weighted_ids][0].indices.eval(),
@@ -341,7 +341,7 @@ class TransformerTest(test.TestCase):
     self.assertEqual(len(output), 1)
     self.assertIn(vocab_sparse, output)
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertEqual(output[vocab_sparse].values.dtype, dtypes.int64)
       self.assertAllEqual(output[vocab_sparse].values.eval(), [1, 2, 0])
       self.assertAllEqual(output[vocab_sparse].indices.eval(),
@@ -363,7 +363,7 @@ class TransformerTest(test.TestCase):
     self.assertEqual(len(output), 1)
     self.assertIn(vocab_sparse, output)
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertEqual(output[vocab_sparse].values.dtype, dtypes.int64)
       self.assertAllEqual(output[vocab_sparse].values.eval(), [1, 2, 0, 1])
       self.assertAllEqual(output[vocab_sparse].indices.eval(),
@@ -387,7 +387,7 @@ class TransformerTest(test.TestCase):
     self.assertEqual(len(output), 1)
     self.assertIn(vocab_sparse, output)
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertEqual(output[vocab_sparse].values.dtype, dtypes.int64)
       self.assertAllEqual(output[vocab_sparse].values.eval(), [1, 2, 0])
       self.assertAllEqual(output[vocab_sparse].indices.eval(),
@@ -409,7 +409,7 @@ class TransformerTest(test.TestCase):
     self.assertEqual(len(output), 1)
     self.assertIn(vocab_sparse, output)
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertEqual(output[vocab_sparse].values.dtype, dtypes.int64)
       self.assertAllEqual(output[vocab_sparse].values.eval(), [1, 2, 0, 1])
       self.assertAllEqual(output[vocab_sparse].indices.eval(),
@@ -601,7 +601,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
         one_hot_column, embedding_column, real_valued_column])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(output.eval().shape, [3, 2 + 4 + 10])
 
   def testRealValuedColumn(self):
@@ -714,7 +714,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [one_hot_column])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual([[0, 0, 10., 0], [0, 20., 0, 0], [30., 0, 40., 0]],
                           output.eval())
 
@@ -732,7 +732,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual([[0, 0, 1, 0], [0, 1, 0, 0], [1, 0, 0, 0]],
                           output.eval())
 
@@ -750,7 +750,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual([[0, 0, 1, 0], [0, 1, 0, 0], [1, 0, 1, 0]],
                           output.eval())
 
@@ -784,7 +784,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [one_hot_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual([3, 10], output.eval().shape)
 
   def testEmbeddingColumnSucceedsForDNN(self):
@@ -891,7 +891,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [embeded_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(output.eval().shape, [2, 10])
 
   def testEmbeddingColumnWithIntegerWeightedSparseColumnSucceedsForDNN(self):
@@ -914,7 +914,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [embeded_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(output.eval().shape, [2, 10])
 
   def testEmbeddingColumnWithCrossedColumnSucceedsForDNN(self):
@@ -965,7 +965,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
       with self.assertRaisesRegexp(
           ValueError,
           "Error creating input layer for column: ids_weighted_by_weights"):
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         feature_column_ops.input_from_feature_columns(features, [weighted_ids])
 
   def testCrossedColumnFailsForDNN(self):
@@ -1072,7 +1072,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                                                            [embeded_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       # score: (sum of weights)
       self.assertAllEqual(output.eval(), [[10.], [50.], [0.]])
 
@@ -1310,7 +1310,7 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
 
     with self.test_session() as sess:
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       model_input = sess.run(model_input_tensor)
 
     expected_input_shape = np.array([4, 3, 4])
@@ -1344,7 +1344,7 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
 
     with self.test_session() as sess:
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       model_input = sess.run(model_input_tensor)
 
     expected_input_shape = np.array([4, 3, hash_buckets])
@@ -1374,7 +1374,7 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
 
     with self.test_session() as sess:
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       model_input = sess.run(model_input_tensor)
 
     self.assertAllEqual(expected_input_shape, model_input.shape)
@@ -1403,7 +1403,7 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
 
     with self.test_session() as sess:
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       model_input = sess.run(model_input_tensor)
 
     self.assertAllEqual(expected_input_shape, model_input.shape)
@@ -1433,7 +1433,7 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
                                                embedding_weights)
     with self.test_session() as sess:
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       model_input, gradients = sess.run([model_input_tensor, gradient_tensor])
 
     expected_input_shape = [4, 3, embedding_dimension]
@@ -1500,7 +1500,7 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
 
     with self.test_session() as sess:
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       model_input = sess.run(model_input_tensor)
 
     expected_input_shape = [
@@ -1581,7 +1581,7 @@ class WeightedSumTest(test.TestCase):
         features, [weighted_ids], num_outputs=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
 
   def testWeightedSparseColumnWithDenseInputTensor(self):
@@ -1597,7 +1597,7 @@ class WeightedSumTest(test.TestCase):
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
 
   def testCrossedColumn(self):
@@ -1651,7 +1651,7 @@ class WeightedSumTest(test.TestCase):
               features, [movies], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.initialize_all_variables().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[movies][0]
         self.assertEqual(weights.get_shape(), (3, 1))
@@ -1726,7 +1726,7 @@ class WeightedSumTest(test.TestCase):
               features, [age, language], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         self.assertAllClose(output.eval(), [[0.], [0.]])
 
@@ -1766,7 +1766,7 @@ class WeightedSumTest(test.TestCase):
       self.assertEqual(len(variables), 1)
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         self.assertAllClose(output.eval(), [[0.], [0.]])
 
@@ -1830,7 +1830,7 @@ class WeightedSumTest(test.TestCase):
               features, [weighted_language], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         self.assertAllClose(output.eval(), [[0.], [0.]])
 
@@ -1858,7 +1858,7 @@ class WeightedSumTest(test.TestCase):
               features, [language], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         # score: 0.1 + language_weight['hindi'] + language_weight['english']
         sess.run(bias.assign([0.1]))
@@ -1881,7 +1881,7 @@ class WeightedSumTest(test.TestCase):
               features, [movies], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[movies][0]
         self.assertEqual(weights.get_shape(), (15, 1))
@@ -1915,7 +1915,7 @@ class WeightedSumTest(test.TestCase):
               features, [country_language], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[country_language][0]
         sess.run(weights.assign(weights + 0.4))
@@ -1939,7 +1939,7 @@ class WeightedSumTest(test.TestCase):
               features, [language_language], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[language_language][0]
         sess.run(weights.assign(weights + 0.4))
@@ -1972,7 +1972,7 @@ class WeightedSumTest(test.TestCase):
               features, [country_language], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[country_language][0]
         sess.run(weights.assign(weights + 0.4))
@@ -2013,7 +2013,7 @@ class WeightedSumTest(test.TestCase):
                 scope=scope))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         self.assertEqual(2, len(column_to_variable[country]))
         self.assertEqual(3, len(column_to_variable[language]))
@@ -2050,7 +2050,7 @@ class WeightedSumTest(test.TestCase):
               features, [country, age, incomes], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         incomes_weights = column_to_variable[incomes][0]
         sess.run(incomes_weights.assign([[0.1], [0.2], [0.3]]))
@@ -2086,7 +2086,7 @@ class WeightedSumTest(test.TestCase):
               features, [country, age, height, incomes], num_outputs=5))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         height_weights = column_to_variable[height][0]
         sess.run(
@@ -2116,7 +2116,7 @@ class WeightedSumTest(test.TestCase):
               features, [bucket], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         sess.run(column_to_variable[bucket][0].assign([[0.1], [0.2], [0.3],
                                                        [0.4]]))
@@ -2144,7 +2144,7 @@ class WeightedSumTest(test.TestCase):
               features, [bucket, country], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         # dimension = 2, bucket_size = 4, num_classes = 1
         sess.run(column_to_variable[bucket][0].assign(
@@ -2173,7 +2173,7 @@ class WeightedSumTest(test.TestCase):
               features, [bucket, country], num_outputs=5))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         # dimension = 2, bucket_size = 4, num_classes = 5
         sess.run(column_to_variable[bucket][0].assign(
@@ -2209,7 +2209,7 @@ class WeightedSumTest(test.TestCase):
               features, [country_price], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[country_price][0]
         sess.run(weights.assign(weights + 0.4))
@@ -2248,7 +2248,7 @@ class WeightedSumTest(test.TestCase):
               features, [country_language_price], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[country_language_price][0]
         sess.run(weights.assign(weights + 0.4))
@@ -2272,7 +2272,7 @@ class WeightedSumTest(test.TestCase):
               features, [product], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         product_weights = column_to_variable[product][0]
         sess.run(product_weights.assign([[0.1], [0.2], [0.3], [0.4], [0.5]]))
         self.assertAllClose(output.eval(), [[0.1], [0.5], [0.3]])
@@ -2287,7 +2287,7 @@ class WeightedSumTest(test.TestCase):
               features, [product], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         product_weights = column_to_variable[product][0]
         sess.run(product_weights.assign([[0.1], [0.2], [0.3], [0.4], [0.5]]))
         self.assertAllClose(output.eval(), [[0.1], [0.5], [0.3]])
@@ -2302,7 +2302,7 @@ class WeightedSumTest(test.TestCase):
               features, [product], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         product_weights = column_to_variable[product][0]
         sess.run(product_weights.assign([[0.1], [0.2], [0.3], [0.4], [0.5]]))
         self.assertAllClose(output.eval(), [[0.6], [0.7]])
@@ -2323,7 +2323,7 @@ class WeightedSumTest(test.TestCase):
               features, [product], num_outputs=1))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         product_weights = column_to_variable[product][0]
         sess.run(product_weights.assign([[0.1], [0.2], [0.3], [0.4], [0.5]]))
         self.assertAllClose(output.eval(), [[0.1], [0.5], [0.3]])
@@ -2335,7 +2335,7 @@ class WeightedSumTest(test.TestCase):
           features, [feature_column.real_valued_column("age")], num_outputs=3)
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         sess.run(bias.assign([0.1, 0.2, 0.3]))
         self.assertAllClose(output.eval(), [[0.1, 0.2, 0.3], [0.1, 0.2, 0.3],
                                             [0.1, 0.2, 0.3], [0.1, 0.2, 0.3]])
@@ -2349,7 +2349,7 @@ class WeightedSumTest(test.TestCase):
               features, [column], num_outputs=3))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         weights = column_to_variable[column][0]
         self.assertEqual(weights.get_shape(), (1, 3))
         sess.run(weights.assign([[0.01, 0.03, 0.05]]))
@@ -2373,7 +2373,7 @@ class WeightedSumTest(test.TestCase):
               features, [column], num_outputs=3))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         weights = column_to_variable[column][0]
         self.assertEqual(weights.get_shape(), (5, 3))
         sess.run(
@@ -2399,7 +2399,7 @@ class WeightedSumTest(test.TestCase):
               features, [column], num_outputs=3))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[column][0]
         self.assertEqual(weights.get_shape(), (5, 3))
@@ -2439,7 +2439,7 @@ class WeightedSumTest(test.TestCase):
               features, [column], num_outputs=3))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[column][0]
         self.assertEqual(weights.get_shape(), (5, 3))
@@ -2468,7 +2468,7 @@ class WeightedSumTest(test.TestCase):
               features, [column], num_outputs=3))
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
         weights = column_to_variable[column][0]
         self.assertEqual(weights.get_shape(), (5, 3))
@@ -2533,7 +2533,7 @@ class ParseExampleTest(test.TestCase):
     self.assertIn(bucket, output)
     self.assertIn(wire_cast, output)
     with self.test_session():
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(output[bucket].eval(), [[2, 3, 0]])
       self.assertAllEqual(output[wire_cast].indices.eval(), [[0, 0], [0, 1]])
       self.assertAllEqual(output[wire_cast].values.eval(), [2, 0])
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
index 43b3d2a78f..58072500d1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
@@ -38,8 +38,8 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import random_seed
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import functional_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import variables
@@ -157,7 +157,7 @@ class DynamicRnnEstimatorTest(test.TestCase):
         self.context_feature_columns)
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
-      sess.run(data_flow_ops.tables_initializer())
+      sess.run(lookup_ops.tables_initializer())
       sequence_input_val = sess.run(sequence_input)
     expected_shape = np.array([
         3,  # expected batch size
@@ -178,7 +178,7 @@ class DynamicRnnEstimatorTest(test.TestCase):
     # Obtain values of activations and final state.
     with session.Session() as sess:
       sess.run(variables.global_variables_initializer())
-      sess.run(data_flow_ops.tables_initializer())
+      sess.run(lookup_ops.tables_initializer())
       activations, final_state = sess.run([activations_t, final_state_t])
 
     expected_activations_shape = np.array([3, 2, self.NUM_LABEL_COLUMNS])
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 74a6da20d4..36f843ba8e 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -57,7 +57,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import random_seed
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import resources
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import gfile
@@ -1292,7 +1292,7 @@ class Estimator(BaseEstimator):
         init_op = control_flow_ops.group(
             variables.local_variables_initializer(),
             resources.initialize_resources(resources.shared_resources()),
-            data_flow_ops.tables_initializer())
+            lookup_ops.tables_initializer())
 
         # Perform the export
         builder = saved_model_builder.SavedModelBuilder(export_dir)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index 207a189a94..d5777088de 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -32,7 +32,7 @@ from tensorflow.core.framework import summary_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.ops.losses import losses as losses_lib
 from tensorflow.python.platform import test
@@ -1214,7 +1214,7 @@ class MultiClassHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=((1., 0., 0.), (0., 0., 1.),))
       with session.Session():
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         self.assertAllEqual(
             [0, 2],
             model_fn_ops.predictions["classes"].eval())
@@ -1266,7 +1266,7 @@ class MultiClassHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=((1., 0., 0.), (0., 0., 1.),))
       with session.Session():
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         self.assertAllEqual(
             [b"key0", b"key2"],
             model_fn_ops.predictions["classes"].eval())
@@ -1301,7 +1301,7 @@ class MultiClassHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=((1., 0., 0.),))
       with session.Session():
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
         _assert_summary_tags(self, ["loss"])
@@ -1327,7 +1327,7 @@ class MultiClassHeadTest(test.TestCase):
           train_op_fn=head_lib.no_op_train_fn,
           logits=((0., 0., 1.),))
       with session.Session():
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
         self.assertIsNone(model_fn_ops.train_op)
         _assert_no_variables(self)
         _assert_summary_tags(self, ["loss"])
diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
index f5bd03429c..feea6c5fed 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
@@ -35,8 +35,8 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import variables
@@ -55,7 +55,7 @@ class PrepareInputsForRnnTest(test.TestCase):
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
-      sess.run(data_flow_ops.initialize_all_tables())
+      sess.run(lookup_ops.tables_initializer())
       features_val = sess.run(features_by_time)
       self.assertAllEqual(expected, features_val)
 
@@ -316,7 +316,7 @@ class StateSavingRnnEstimatorTest(test.TestCase):
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
-      sess.run(data_flow_ops.initialize_all_tables())
+      sess.run(lookup_ops.tables_initializer())
       actual_sequence, actual_context = sess.run(
           [sequence, context])
       assert_equal(expected_sequence, actual_sequence)
diff --git a/tensorflow/contrib/learn/python/learn/graph_actions.py b/tensorflow/contrib/learn/python/learn/graph_actions.py
index 4b7867f2d0..98365c05f6 100644
--- a/tensorflow/contrib/learn/python/learn/graph_actions.py
+++ b/tensorflow/contrib/learn/python/learn/graph_actions.py
@@ -37,8 +37,8 @@ from tensorflow.python.client import session as tf_session
 from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import logging_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import resources
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
@@ -429,11 +429,14 @@ def _get_ready_op():
 
 
 def _get_local_init_op():
+  """Returns the local init ops to initialize tables and local variables."""
   local_init_op = _get_first_op_from_collection(
       ops.GraphKeys.LOCAL_INIT_OP)
   if local_init_op is None:
-    op_list = [variables.local_variables_initializer(),
-               data_flow_ops.tables_initializer()]
+    op_list = [
+        variables.local_variables_initializer(),
+        lookup_ops.tables_initializer()
+    ]
     if op_list:
       local_init_op = control_flow_ops.group(*op_list)
       ops.add_to_collection(ops.GraphKeys.LOCAL_INIT_OP, local_init_op)
@@ -680,7 +683,7 @@ def run_feeds_iter(output_dict, feed_dicts, restore_checkpoint_path=None):
       else:
         session.run(variables.global_variables_initializer())
       session.run(variables.local_variables_initializer())
-      session.run(data_flow_ops.tables_initializer())
+      session.run(lookup_ops.tables_initializer())
       coord = coordinator.Coordinator()
       threads = None
       try:
diff --git a/tensorflow/contrib/learn/python/learn/utils/export.py b/tensorflow/contrib/learn/python/learn/utils/export.py
index b53be29283..36a1f5f60c 100644
--- a/tensorflow/contrib/learn/python/learn/utils/export.py
+++ b/tensorflow/contrib/learn/python/learn/utils/export.py
@@ -28,7 +28,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import saver as tf_saver
@@ -67,17 +67,17 @@ def _export_graph(graph, saver, checkpoint_path, export_dir,
   with graph.as_default():
     with tf_session.Session('') as session:
       variables.local_variables_initializer()
-      data_flow_ops.tables_initializer()
+      lookup_ops.tables_initializer()
       saver.restore(session, checkpoint_path)
 
       export = exporter.Exporter(saver)
-      export.init(init_op=control_flow_ops.group(
-          variables.local_variables_initializer(),
-          data_flow_ops.tables_initializer()),
-                  default_graph_signature=default_graph_signature,
-                  named_graph_signatures=named_graph_signatures,
-                  assets_collection=ops.get_collection(
-                      ops.GraphKeys.ASSET_FILEPATHS))
+      export.init(
+          init_op=control_flow_ops.group(
+              variables.local_variables_initializer(),
+              lookup_ops.tables_initializer()),
+          default_graph_signature=default_graph_signature,
+          named_graph_signatures=named_graph_signatures,
+          assets_collection=ops.get_collection(ops.GraphKeys.ASSET_FILEPATHS))
       return export.export(export_dir, contrib_variables.get_global_step(),
                            session, exports_to_keep=exports_to_keep)
 
diff --git a/tensorflow/contrib/lookup/BUILD b/tensorflow/contrib/lookup/BUILD
index 5966c86dfb..bbbd340352 100644
--- a/tensorflow/contrib/lookup/BUILD
+++ b/tensorflow/contrib/lookup/BUILD
@@ -30,11 +30,11 @@ py_test(
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:lookup_ops",
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training",
         "//tensorflow/python:variables",
diff --git a/tensorflow/contrib/lookup/lookup_ops_test.py b/tensorflow/contrib/lookup/lookup_ops_test.py
index 0ec40a63f2..5ec169b6db 100644
--- a/tensorflow/contrib/lookup/lookup_ops_test.py
+++ b/tensorflow/contrib/lookup/lookup_ops_test.py
@@ -31,7 +31,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 from tensorflow.python.training import saver
@@ -125,7 +125,7 @@ class HashTableOpTest(test.TestCase):
       table3 = lookup.HashTable(
           lookup.KeyValueTensorInitializer(keys, values), default_val)
 
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(3, table1.size().eval())
       self.assertAllEqual(3, table2.size().eval())
       self.assertAllEqual(3, table3.size().eval())
@@ -1184,7 +1184,7 @@ class IndexTableFromFile(test.TestCase):
       ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, 3), ids.eval())
 
   def test_int32_index_table_from_file(self):
@@ -1198,7 +1198,7 @@ class IndexTableFromFile(test.TestCase):
           constant_op.constant((1, -1000, 11), dtype=dtypes.int32))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, 3), ids.eval())
 
   def test_int64_index_table_from_file(self):
@@ -1212,7 +1212,7 @@ class IndexTableFromFile(test.TestCase):
           constant_op.constant((1, -1000, 11), dtype=dtypes.int64))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, 3), ids.eval())
 
   def test_index_table_from_file_with_default_value(self):
@@ -1224,7 +1224,7 @@ class IndexTableFromFile(test.TestCase):
       ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, default_value), ids.eval())
 
   def test_index_table_from_file_with_oov_buckets(self):
@@ -1236,7 +1236,7 @@ class IndexTableFromFile(test.TestCase):
           constant_op.constant(["salad", "surgery", "tarkus", "toccata"]))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual(
           (
               1,  # From vocabulary file.
@@ -1259,7 +1259,7 @@ class IndexTableFromFile(test.TestCase):
       ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, -1, -1), ids.eval())
       self.assertEqual(2, table.size().eval())
 
@@ -1286,7 +1286,7 @@ class IndexTableFromFile(test.TestCase):
       ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, -1), ids.eval())
       self.assertEqual(3, table.size().eval())
 
@@ -1345,7 +1345,7 @@ class IndexTableFromTensor(test.TestCase):
       ids = table.lookup(constant_op.constant(("salad", "surgery", "tarkus")))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, 3), ids.eval())
 
   def test_int32_index_table_from_tensor_with_tensor_init(self):
@@ -1356,7 +1356,7 @@ class IndexTableFromTensor(test.TestCase):
           constant_op.constant((1, -1000, 11), dtype=dtypes.int32))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, 3), ids.eval())
 
   def test_int64_index_table_from_tensor_with_tensor_init(self):
@@ -1367,7 +1367,7 @@ class IndexTableFromTensor(test.TestCase):
           constant_op.constant((1, -1000, 11), dtype=dtypes.int64))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, 3), ids.eval())
 
   def test_index_table_from_tensor_with_default_value(self):
@@ -1378,7 +1378,7 @@ class IndexTableFromTensor(test.TestCase):
       ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
 
       self.assertRaises(errors_impl.OpError, ids.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, default_value), ids.eval())
 
   def test_index_table_from_tensor_missing_mapping(self):
@@ -1394,7 +1394,7 @@ class IndexTableFromTensor(test.TestCase):
       self.assertRaises(errors_impl.OpError, ids.eval)
       with self.assertRaisesRegexp(
           errors_impl.OpError, "keys and values cannot be empty"):
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
   def test_index_table_from_tensor_with_invalid_hashers(self):
     with self.test_session():
@@ -1422,7 +1422,7 @@ class StringToIndexTest(test.TestCase):
       indices = lookup.string_to_index(feats, mapping=mapping_strings)
 
       self.assertRaises(errors_impl.OpError, indices.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
 
       self.assertAllEqual((1, 2, -1), indices.eval())
 
@@ -1433,7 +1433,7 @@ class StringToIndexTest(test.TestCase):
       _ = lookup.string_to_index(feats, mapping=mapping_strings)
 
       self.assertRaises(errors_impl.OpError,
-                        data_flow_ops.tables_initializer().run)
+                        lookup_ops.tables_initializer().run)
 
   def test_string_to_index_with_default_value(self):
     default_value = -42
@@ -1444,7 +1444,7 @@ class StringToIndexTest(test.TestCase):
           feats, mapping=mapping_strings, default_value=default_value)
       self.assertRaises(errors_impl.OpError, indices.eval)
 
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((1, 2, default_value), indices.eval())
 
 
@@ -1463,7 +1463,7 @@ class IndexToStringTableFromFileTest(test.TestCase):
           vocabulary_file=vocabulary_file)
       features = table.lookup(constant_op.constant([0, 1, 2, 3], dtypes.int64))
       self.assertRaises(errors_impl.OpError, features.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"brain", b"salad", b"surgery", b"UNK"),
                           features.eval())
 
@@ -1475,7 +1475,7 @@ class IndexToStringTableFromFileTest(test.TestCase):
           vocabulary_file=vocabulary_file, default_value=default_value)
       features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
       self.assertRaises(errors_impl.OpError, features.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"salad", b"surgery", default_value),
                           features.eval())
 
@@ -1489,7 +1489,7 @@ class IndexToStringTableFromFileTest(test.TestCase):
           default_value=default_value)
       features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
       self.assertRaises(errors_impl.OpError, features.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"salad", default_value, default_value),
                           features.eval())
 
@@ -1501,7 +1501,7 @@ class IndexToStringTableFromFileTest(test.TestCase):
       features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
 
       self.assertRaises(errors_impl.OpError, features.eval)
-      init = data_flow_ops.tables_initializer()
+      init = lookup_ops.tables_initializer()
       self.assertRaisesRegexp(errors_impl.InvalidArgumentError,
                               "Invalid vocab_size", init.run)
 
@@ -1513,7 +1513,7 @@ class IndexToStringTableFromFileTest(test.TestCase):
       features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
 
       self.assertRaises(errors_impl.OpError, features.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"salad", b"surgery", b"UNK"), features.eval())
 
 
@@ -1528,7 +1528,7 @@ class IndexToStringTableFromTensorTest(test.TestCase):
       indices = constant_op.constant([0, 1, 2, 3], dtypes.int64)
       features = table.lookup(indices)
       self.assertRaises(errors_impl.OpError, features.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
 
       self.assertAllEqual((b"brain", b"salad", b"surgery", b"UNK"),
                           features.eval())
@@ -1540,7 +1540,7 @@ class IndexToStringTableFromTensorTest(test.TestCase):
           mapping=mapping_strings)
       indices = constant_op.constant([0, 1, 4], dtypes.int64)
       features = table.lookup(indices)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"hello", b"hello", b"UNK"), features.eval())
 
   def test_index_to_string_with_default_value(self):
@@ -1553,7 +1553,7 @@ class IndexToStringTableFromTensorTest(test.TestCase):
       features = table.lookup(indices)
       self.assertRaises(errors_impl.OpError, features.eval)
 
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"salad", b"surgery", default_value),
                           features.eval())
 
@@ -1567,7 +1567,7 @@ class IndexToStringTest(test.TestCase):
       feats = lookup.index_to_string(indices, mapping=mapping_strings)
 
       self.assertRaises(errors_impl.OpError, feats.eval)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
 
       self.assertAllEqual((b"brain", b"salad", b"surgery", b"UNK"),
                           feats.eval())
@@ -1577,11 +1577,11 @@ class IndexToStringTest(test.TestCase):
       mapping_strings = constant_op.constant(["hello", "hello"])
       indices = constant_op.constant([0, 1, 4], dtypes.int64)
       feats = lookup.index_to_string(indices, mapping=mapping_strings)
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"hello", b"hello", b"UNK"), feats.eval())
 
       self.assertRaises(errors_impl.OpError,
-                        data_flow_ops.tables_initializer().run)
+                        lookup_ops.tables_initializer().run)
 
   def test_index_to_string_with_default_value(self):
     default_value = b"NONE"
@@ -1592,7 +1592,7 @@ class IndexToStringTest(test.TestCase):
           indices, mapping=mapping_strings, default_value=default_value)
       self.assertRaises(errors_impl.OpError, feats.eval)
 
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
       self.assertAllEqual((b"salad", b"surgery", default_value), feats.eval())
 
 
@@ -1755,7 +1755,7 @@ class InitializeTableFromFileOpTest(test.TestCase):
           default_value,
           shared_name=shared_name)
 
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
 
       input_string = constant_op.constant(["brain", "salad", "tank"])
 
@@ -2081,7 +2081,7 @@ class IdTableWithHashBucketsTest(test.TestCase):
           hasher_spec=lookup.StrongHashSpec((1, 2)),
           name="table2")
 
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
 
       input_string = constant_op.constant(
           ["fruit", "brain", "salad", "surgery", "UNK"])
@@ -2167,7 +2167,7 @@ class IdTableWithHashBucketsTest(test.TestCase):
               default_value2),
           oov_buckets)
 
-      data_flow_ops.tables_initializer().run()
+      lookup_ops.tables_initializer().run()
 
       input_string_1 = constant_op.constant(
           ["brain", "salad", "surgery", "UNK"])
diff --git a/tensorflow/contrib/slim/python/slim/learning.py b/tensorflow/contrib/slim/python/slim/learning.py
index 5ced8a4f08..b70d612f55 100644
--- a/tensorflow/contrib/slim/python/slim/learning.py
+++ b/tensorflow/contrib/slim/python/slim/learning.py
@@ -261,7 +261,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.lib.io import file_io
 from tensorflow.python.ops import clip_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables as tf_variables
 from tensorflow.python.platform import tf_logging as logging
@@ -657,7 +657,7 @@ def train(train_op,
       if local_init_op == _USE_DEFAULT:
         local_init_op = control_flow_ops.group(
             tf_variables.local_variables_initializer(),
-            data_flow_ops.tables_initializer())
+            lookup_ops.tables_initializer())
 
       if sync_optimizer is not None and isinstance(
           sync_optimizer, sync_replicas_optimizer.SyncReplicasOptimizer):
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 119bc0f899..435618ace7 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -506,6 +506,7 @@ tf_gen_op_libs(
         "image_ops",
         "io_ops",
         "linalg_ops",
+        "lookup_ops",
         "logging_ops",
         "math_ops",
         "nn_ops",
@@ -582,6 +583,7 @@ cc_library(
         ":image_ops_op_lib",
         ":io_ops_op_lib",
         ":linalg_ops_op_lib",
+        ":lookup_ops_op_lib",
         ":logging_ops_op_lib",
         ":math_ops_op_lib",
         ":nn_ops_op_lib",
@@ -708,6 +710,7 @@ cc_library(
         "//tensorflow/core/kernels:image",
         "//tensorflow/core/kernels:io",
         "//tensorflow/core/kernels:linalg",
+        "//tensorflow/core/kernels:lookup",
         "//tensorflow/core/kernels:logging",
         "//tensorflow/core/kernels:math",
         "//tensorflow/core/kernels:multinomial_op",
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 0847d1279b..02ab30a04f 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -1327,6 +1327,14 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "lookup",
+    deps = [
+        ":lookup_table_init_op",
+        ":lookup_table_op",
+    ],
+)
+
 DATA_FLOW_DEPS = [
     ":bounds_check",
     ":concat_lib",
@@ -1450,10 +1458,10 @@ LOOKUP_DEPS = [
     ":initializable_lookup_table",
     ":lookup_util",
     "//tensorflow/core:core_cpu",
-    "//tensorflow/core:data_flow_ops_op_lib",
     "//tensorflow/core:framework",
     "//tensorflow/core:lib",
     "//tensorflow/core:lib_internal",
+    "//tensorflow/core:lookup_ops_op_lib",
 ]
 
 tf_kernel_library(
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index f35a1bb648..032ede6459 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -1876,604 +1876,6 @@ size: The number of incomplete elements (i.e. those with some of their value
 
 // --------------------------------------------------------------------------
 
-REGISTER_OP("LookupTableFind")
-    .Input("table_handle: Ref(string)")
-    .Input("keys: Tin")
-    .Input("default_value: Tout")
-    .Output("values: Tout")
-    .Attr("Tin: type")
-    .Attr("Tout: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
-      DimensionHandle unused_dim;
-      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
-
-      // Default value must be scalar or vector.
-      ShapeHandle unused;
-      TF_RETURN_IF_ERROR(c->WithRankAtMost(c->input(2), 1, &unused));
-      c->set_output(0, c->UnknownShape());
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Looks up keys in a table, outputs the corresponding values.
-
-The tensor `keys` must of the same type as the keys of the table.
-The output `values` is of the type of the table values.
-
-The scalar `default_value` is the value output for keys not present in the
-table. It must also be of the same type as the table values.
-
-table_handle: Handle to the table.
-keys:  Any shape.  Keys to look up.
-values: Same shape as `keys`.  Values found in the table, or `default_values`
-   for missing keys.
-)doc");
-
-REGISTER_OP("LookupTableFindV2")
-    .Input("table_handle: resource")
-    .Input("keys: Tin")
-    .Input("default_value: Tout")
-    .Output("values: Tout")
-    .Attr("Tin: type")
-    .Attr("Tout: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
-
-      // Default value must be scalar or vector.
-      ShapeHandle unused;
-      TF_RETURN_IF_ERROR(c->WithRankAtMost(c->input(2), 1, &unused));
-      c->set_output(0, c->UnknownShape());
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Looks up keys in a table, outputs the corresponding values.
-
-The tensor `keys` must of the same type as the keys of the table.
-The output `values` is of the type of the table values.
-
-The scalar `default_value` is the value output for keys not present in the
-table. It must also be of the same type as the table values.
-
-table_handle: Handle to the table.
-keys:  Any shape.  Keys to look up.
-values: Same shape as `keys`.  Values found in the table, or `default_values`
-   for missing keys.
-)doc");
-
-REGISTER_OP("LookupTableInsert")
-    .Input("table_handle: Ref(string)")
-    .Input("keys: Tin")
-    .Input("values: Tout")
-    .Attr("Tin: type")
-    .Attr("Tout: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
-      DimensionHandle unused_dim;
-      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
-
-      // TODO(ebrevdo): Validate keys and values shape.
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Updates the table to associates keys with values.
-
-The tensor `keys` must be of the same type as the keys of the table.
-The tensor `values` must be of the type of the table values.
-
-table_handle: Handle to the table.
-keys:  Any shape.  Keys to look up.
-values: Values to associate with keys.
-)doc");
-
-REGISTER_OP("LookupTableInsertV2")
-    .Input("table_handle: resource")
-    .Input("keys: Tin")
-    .Input("values: Tout")
-    .Attr("Tin: type")
-    .Attr("Tout: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
-
-      // TODO: Validate keys and values shape.
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Updates the table to associates keys with values.
-
-The tensor `keys` must be of the same type as the keys of the table.
-The tensor `values` must be of the type of the table values.
-
-table_handle: Handle to the table.
-keys:  Any shape.  Keys to look up.
-values: Values to associate with keys.
-)doc");
-
-REGISTER_OP("LookupTableSize")
-    .Input("table_handle: Ref(string)")
-    .Output("size: int64")
-    .SetShapeFn(TwoElementVectorInputsAndScalarOutputs)
-    .Doc(R"doc(
-Computes the number of elements in the given table.
-
-table_handle: Handle to the table.
-size: Scalar that contains number of elements in the table.
-)doc");
-
-REGISTER_OP("LookupTableSizeV2")
-    .Input("table_handle: resource")
-    .Output("size: int64")
-    .SetShapeFn(ScalarAndTwoElementVectorInputsAndScalarOutputs)
-    .Doc(R"doc(
-Computes the number of elements in the given table.
-
-table_handle: Handle to the table.
-size: Scalar that contains number of elements in the table.
-)doc");
-
-REGISTER_OP("LookupTableExport")
-    .Input("table_handle: Ref(string)")
-    .Output("keys: Tkeys")
-    .Output("values: Tvalues")
-    .Attr("Tkeys: type")
-    .Attr("Tvalues: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
-      DimensionHandle unused_dim;
-      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
-
-      ShapeHandle values = c->UnknownShape();
-      TF_RETURN_IF_ERROR(c->WithRankAtLeast(values, 1, &values));
-      ShapeHandle keys = c->Vector(c->Dim(values, 0));
-      c->set_output(0, keys);
-      c->set_output(1, values);
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Outputs all keys and values in the table.
-
-table_handle: Handle to the table.
-keys: Vector of all keys present in the table.
-values: Tensor of all values in the table. Indexed in parallel with `keys`.
-)doc");
-
-REGISTER_OP("LookupTableExportV2")
-    .Input("table_handle: resource")
-    .Output("keys: Tkeys")
-    .Output("values: Tvalues")
-    .Attr("Tkeys: type")
-    .Attr("Tvalues: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
-
-      ShapeHandle values = c->UnknownShape();
-      TF_RETURN_IF_ERROR(c->WithRankAtLeast(values, 1, &values));
-      ShapeHandle keys = c->Vector(c->Dim(values, 0));
-      c->set_output(0, keys);
-      c->set_output(1, values);
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Outputs all keys and values in the table.
-
-table_handle: Handle to the table.
-keys: Vector of all keys present in the table.
-values: Tensor of all values in the table. Indexed in parallel with `keys`.
-)doc");
-
-REGISTER_OP("LookupTableImport")
-    .Input("table_handle: Ref(string)")
-    .Input("keys: Tin")
-    .Input("values: Tout")
-    .Attr("Tin: type")
-    .Attr("Tout: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
-      DimensionHandle unused_dim;
-      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
-
-      // TODO(ebrevdo): Validate keys and values shape.
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Replaces the contents of the table with the specified keys and values.
-
-The tensor `keys` must be of the same type as the keys of the table.
-The tensor `values` must be of the type of the table values.
-
-table_handle: Handle to the table.
-keys:  Any shape.  Keys to look up.
-values: Values to associate with keys.
-)doc");
-
-REGISTER_OP("LookupTableImportV2")
-    .Input("table_handle: resource")
-    .Input("keys: Tin")
-    .Input("values: Tout")
-    .Attr("Tin: type")
-    .Attr("Tout: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
-
-      // TODO: Validate keys and values shape.
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Replaces the contents of the table with the specified keys and values.
-
-The tensor `keys` must be of the same type as the keys of the table.
-The tensor `values` must be of the type of the table values.
-
-table_handle: Handle to the table.
-keys:  Any shape.  Keys to look up.
-values: Values to associate with keys.
-)doc");
-
-REGISTER_OP("HashTable")
-    .Output("table_handle: Ref(string)")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .SetIsStateful()
-    .SetShapeFn(TwoElementOutput)
-    .Doc(R"doc(
-Creates a non-initialized hash table.
-
-This op creates a hash table, specifying the type of its keys and values.
-Before using the table you will have to initialize it.  After initialization the
-table will be immutable.
-
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-use_node_name_sharing: If true and shared_name is empty, the table is shared
-  using the node name.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-)doc");
-
-REGISTER_OP("HashTableV2")
-    .Output("table_handle: resource")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .SetIsStateful()
-    .SetShapeFn(ScalarOutput)
-    .Doc(R"doc(
-Creates a non-initialized hash table.
-
-This op creates a hash table, specifying the type of its keys and values.
-Before using the table you will have to initialize it.  After initialization the
-table will be immutable.
-
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-use_node_name_sharing: If true and shared_name is empty, the table is shared
-  using the node name.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-)doc");
-
-REGISTER_OP("MutableHashTable")
-    .Output("table_handle: Ref(string)")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .SetIsStateful()
-    .SetShapeFn(TwoElementOutput)
-    .Doc(R"doc(
-Creates an empty hash table.
-
-This op creates a mutable hash table, specifying the type of its keys and
-values. Each value must be a scalar. Data can be inserted into the table using
-the insert operations. It does not support the initialization operation.
-
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-use_node_name_sharing: If true and shared_name is empty, the table is shared
-  using the node name.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-)doc");
-
-REGISTER_OP("MutableHashTableV2")
-    .Output("table_handle: resource")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .SetIsStateful()
-    .SetShapeFn(ScalarOutput)
-    .Doc(R"doc(
-Creates an empty hash table.
-
-This op creates a mutable hash table, specifying the type of its keys and
-values. Each value must be a scalar. Data can be inserted into the table using
-the insert operations. It does not support the initialization operation.
-
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-use_node_name_sharing: If true and shared_name is empty, the table is shared
-  using the node name.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-)doc");
-
-REGISTER_OP("MutableHashTableOfTensors")
-    .Output("table_handle: Ref(string)")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .Attr("value_shape: shape = {}")
-    .SetIsStateful()
-    .SetShapeFn(TwoElementOutput)
-    .Doc(R"doc(
-Creates an empty hash table.
-
-This op creates a mutable hash table, specifying the type of its keys and
-values. Each value must be a vector. Data can be inserted into the table using
-the insert operations. It does not support the initialization operation.
-
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-)doc");
-
-REGISTER_OP("MutableHashTableOfTensorsV2")
-    .Output("table_handle: resource")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .Attr("value_shape: shape = {}")
-    .SetIsStateful()
-    .SetShapeFn(ScalarOutput)
-    .Doc(R"doc(
-Creates an empty hash table.
-
-This op creates a mutable hash table, specifying the type of its keys and
-values. Each value must be a vector. Data can be inserted into the table using
-the insert operations. It does not support the initialization operation.
-
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-)doc");
-
-REGISTER_OP("MutableDenseHashTable")
-    .Input("empty_key: key_dtype")
-    .Output("table_handle: Ref(string)")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .Attr("value_shape: shape = {}")
-    .Attr("initial_num_buckets: int = 131072")  // 2^17
-    .Attr("max_load_factor: float = 0.8")
-    .SetIsStateful()
-    .SetShapeFn(TwoElementOutput)
-    .Doc(R"doc(
-Creates an empty hash table that uses tensors as the backing store. It uses
-"open addressing" with quadratic reprobing to resolve collisions.
-
-This op creates a mutable hash table, specifying the type of its keys and
-values. Each value must be a scalar. Data can be inserted into the table using
-the insert operations. It does not support the initialization operation.
-
-empty_key: The key used to represent empty key buckets internally. Must not
-  be used in insert or lookup operations.
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-value_shape: The shape of each value.
-initial_num_buckets: The initial number of hash table buckets. Must be a power
-  to 2.
-max_load_factor: The maximum ratio between number of entries and number of
-  buckets before growing the table. Must be between 0 and 1.
-)doc");
-
-REGISTER_OP("MutableDenseHashTableV2")
-    .Input("empty_key: key_dtype")
-    .Output("table_handle: resource")
-    .Attr("container: string = ''")
-    .Attr("shared_name: string = ''")
-    .Attr("use_node_name_sharing: bool = false")
-    .Attr("key_dtype: type")
-    .Attr("value_dtype: type")
-    .Attr("value_shape: shape = {}")
-    .Attr("initial_num_buckets: int = 131072")  // 2^17
-    .Attr("max_load_factor: float = 0.8")
-    .SetIsStateful()
-    .SetShapeFn(ScalarOutput)
-    .Doc(R"doc(
-Creates an empty hash table that uses tensors as the backing store. It uses
-"open addressing" with quadratic reprobing to resolve collisions.
-
-This op creates a mutable hash table, specifying the type of its keys and
-values. Each value must be a scalar. Data can be inserted into the table using
-the insert operations. It does not support the initialization operation.
-
-empty_key: The key used to represent empty key buckets internally. Must not
-  be used in insert or lookup operations.
-table_handle: Handle to a table.
-container: If non-empty, this table is placed in the given container.
-  Otherwise, a default container is used.
-shared_name: If non-empty, this table is shared under the given name across
-  multiple sessions.
-key_dtype: Type of the table keys.
-value_dtype: Type of the table values.
-value_shape: The shape of each value.
-initial_num_buckets: The initial number of hash table buckets. Must be a power
-  to 2.
-max_load_factor: The maximum ratio between number of entries and number of
-  buckets before growing the table. Must be between 0 and 1.
-)doc");
-
-REGISTER_OP("InitializeTable")
-    .Input("table_handle: Ref(string)")
-    .Input("keys: Tkey")
-    .Input("values: Tval")
-    .Attr("Tkey: type")
-    .Attr("Tval: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
-      DimensionHandle unused_dim;
-      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
-
-      ShapeHandle keys;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 1, &keys));
-      TF_RETURN_IF_ERROR(c->Merge(keys, c->input(2), &keys));
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Table initializer that takes two tensors for keys and values respectively.
-
-table_handle: Handle to a table which will be initialized.
-keys: Keys of type Tkey.
-values: Values of type Tval.
-)doc");
-
-REGISTER_OP("InitializeTableV2")
-    .Input("table_handle: resource")
-    .Input("keys: Tkey")
-    .Input("values: Tval")
-    .Attr("Tkey: type")
-    .Attr("Tval: type")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
-
-      ShapeHandle keys;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 1, &keys));
-      TF_RETURN_IF_ERROR(c->Merge(keys, c->input(2), &keys));
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Table initializer that takes two tensors for keys and values respectively.
-
-table_handle: Handle to a table which will be initialized.
-keys: Keys of type Tkey.
-values: Values of type Tval.
-)doc");
-
-REGISTER_OP("InitializeTableFromTextFile")
-    .Input("table_handle: Ref(string)")
-    .Input("filename: string")
-    .Attr("key_index: int >= -2")
-    .Attr("value_index: int >= -2")
-    .Attr("vocab_size: int >= -1 = -1")
-    .Attr("delimiter: string = '\t'")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
-      DimensionHandle unused_dim;
-      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
-
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &handle));
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Initializes a table from a text file.
-
-It inserts one key-value pair into the table for each line of the file.
-The key and value is extracted from the whole line content, elements from the
-split line based on `delimiter` or the line number (starting from zero).
-Where to extract the key and value from a line is specified by `key_index` and
-`value_index`.
-
-- A value of -1 means use the line number(starting from zero), expects `int64`.
-- A value of -2 means use the whole line content, expects `string`.
-- A value >= 0 means use the index (starting at zero) of the split line based
-  on `delimiter`.
-
-table_handle: Handle to a table which will be initialized.
-filename: Filename of a vocabulary text file.
-key_index: Column index in a line to get the table `key` values from.
-value_index: Column index that represents information of a line to get the table
-  `value` values from.
-vocab_size: Number of elements of the file, use -1 if unknown.
-delimiter: Delimiter to separate fields in a line.
-)doc");
-
-REGISTER_OP("InitializeTableFromTextFileV2")
-    .Input("table_handle: resource")
-    .Input("filename: string")
-    .Attr("key_index: int >= -2")
-    .Attr("value_index: int >= -2")
-    .Attr("vocab_size: int >= -1 = -1")
-    .Attr("delimiter: string = '\t'")
-    .SetShapeFn([](InferenceContext* c) {
-      ShapeHandle handle;
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
-
-      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &handle));
-      return Status::OK();
-    })
-    .Doc(R"doc(
-Initializes a table from a text file.
-
-It inserts one key-value pair into the table for each line of the file.
-The key and value is extracted from the whole line content, elements from the
-split line based on `delimiter` or the line number (starting from zero).
-Where to extract the key and value from a line is specified by `key_index` and
-`value_index`.
-
-- A value of -1 means use the line number(starting from zero), expects `int64`.
-- A value of -2 means use the whole line content, expects `string`.
-- A value >= 0 means use the index (starting at zero) of the split line based
-  on `delimiter`.
-
-table_handle: Handle to a table which will be initialized.
-filename: Filename of a vocabulary text file.
-key_index: Column index in a line to get the table `key` values from.
-value_index: Column index that represents information of a line to get the table
-  `value` values from.
-vocab_size: Number of elements of the file, use -1 if unknown.
-delimiter: Delimiter to separate fields in a line.
-)doc");
-
 REGISTER_OP("GetSessionHandle")
     .Input("value: T")
     .Output("handle: string")
diff --git a/tensorflow/core/ops/lookup_ops.cc b/tensorflow/core/ops/lookup_ops.cc
new file mode 100644
index 0000000000..498a65690d
--- /dev/null
+++ b/tensorflow/core/ops/lookup_ops.cc
@@ -0,0 +1,666 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/framework/common_shape_fns.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_def_builder.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+using shape_inference::DimensionHandle;
+using shape_inference::InferenceContext;
+using shape_inference::ShapeHandle;
+
+// --------------------------------------------------------------------------
+
+namespace {
+Status TwoElementVectorInputsAndScalarOutputs(InferenceContext* c) {
+  ShapeHandle handle;
+  DimensionHandle unused_handle;
+  for (int i = 0; i < c->num_inputs(); ++i) {
+    TF_RETURN_IF_ERROR(c->WithRank(c->input(i), 1, &handle));
+    TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_handle));
+  }
+  for (int i = 0; i < c->num_outputs(); ++i) {
+    c->set_output(i, c->Scalar());
+  }
+  return Status::OK();
+}
+
+Status ScalarAndTwoElementVectorInputsAndScalarOutputs(InferenceContext* c) {
+  ShapeHandle handle;
+  DimensionHandle unused_handle;
+  TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+  for (int i = 1; i < c->num_inputs(); ++i) {
+    TF_RETURN_IF_ERROR(c->WithRank(c->input(i), 1, &handle));
+    TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_handle));
+  }
+  for (int i = 0; i < c->num_outputs(); ++i) {
+    c->set_output(i, c->Scalar());
+  }
+  return Status::OK();
+}
+
+Status TwoElementOutput(InferenceContext* c) {
+  c->set_output(0, c->Vector(2));
+  return Status::OK();
+}
+
+Status ScalarOutput(InferenceContext* c) {
+  c->set_output(0, c->Scalar());
+  return Status::OK();
+}
+}  // namespace
+
+REGISTER_OP("LookupTableFind")
+    .Input("table_handle: Ref(string)")
+    .Input("keys: Tin")
+    .Input("default_value: Tout")
+    .Output("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
+      DimensionHandle unused_dim;
+      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
+
+      // Default value must be scalar or vector.
+      ShapeHandle unused;
+      TF_RETURN_IF_ERROR(c->WithRankAtMost(c->input(2), 1, &unused));
+      c->set_output(0, c->UnknownShape());
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Looks up keys in a table, outputs the corresponding values.
+
+The tensor `keys` must of the same type as the keys of the table.
+The output `values` is of the type of the table values.
+
+The scalar `default_value` is the value output for keys not present in the
+table. It must also be of the same type as the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Same shape as `keys`.  Values found in the table, or `default_values`
+   for missing keys.
+)doc");
+
+REGISTER_OP("LookupTableFindV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tin")
+    .Input("default_value: Tout")
+    .Output("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      // Default value must be scalar or vector.
+      ShapeHandle unused;
+      TF_RETURN_IF_ERROR(c->WithRankAtMost(c->input(2), 1, &unused));
+      c->set_output(0, c->UnknownShape());
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Looks up keys in a table, outputs the corresponding values.
+
+The tensor `keys` must of the same type as the keys of the table.
+The output `values` is of the type of the table values.
+
+The scalar `default_value` is the value output for keys not present in the
+table. It must also be of the same type as the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Same shape as `keys`.  Values found in the table, or `default_values`
+   for missing keys.
+)doc");
+
+REGISTER_OP("LookupTableInsert")
+    .Input("table_handle: Ref(string)")
+    .Input("keys: Tin")
+    .Input("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
+      DimensionHandle unused_dim;
+      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
+
+      // TODO(ebrevdo): Validate keys and values shape.
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Updates the table to associates keys with values.
+
+The tensor `keys` must be of the same type as the keys of the table.
+The tensor `values` must be of the type of the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Values to associate with keys.
+)doc");
+
+REGISTER_OP("LookupTableInsertV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tin")
+    .Input("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      // TODO: Validate keys and values shape.
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Updates the table to associates keys with values.
+
+The tensor `keys` must be of the same type as the keys of the table.
+The tensor `values` must be of the type of the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Values to associate with keys.
+)doc");
+
+REGISTER_OP("LookupTableSize")
+    .Input("table_handle: Ref(string)")
+    .Output("size: int64")
+    .SetShapeFn(TwoElementVectorInputsAndScalarOutputs)
+    .Doc(R"doc(
+Computes the number of elements in the given table.
+
+table_handle: Handle to the table.
+size: Scalar that contains number of elements in the table.
+)doc");
+
+REGISTER_OP("LookupTableSizeV2")
+    .Input("table_handle: resource")
+    .Output("size: int64")
+    .SetShapeFn(ScalarAndTwoElementVectorInputsAndScalarOutputs)
+    .Doc(R"doc(
+Computes the number of elements in the given table.
+
+table_handle: Handle to the table.
+size: Scalar that contains number of elements in the table.
+)doc");
+
+REGISTER_OP("LookupTableExport")
+    .Input("table_handle: Ref(string)")
+    .Output("keys: Tkeys")
+    .Output("values: Tvalues")
+    .Attr("Tkeys: type")
+    .Attr("Tvalues: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
+      DimensionHandle unused_dim;
+      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
+
+      ShapeHandle values = c->UnknownShape();
+      TF_RETURN_IF_ERROR(c->WithRankAtLeast(values, 1, &values));
+      ShapeHandle keys = c->Vector(c->Dim(values, 0));
+      c->set_output(0, keys);
+      c->set_output(1, values);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Outputs all keys and values in the table.
+
+table_handle: Handle to the table.
+keys: Vector of all keys present in the table.
+values: Tensor of all values in the table. Indexed in parallel with `keys`.
+)doc");
+
+REGISTER_OP("LookupTableExportV2")
+    .Input("table_handle: resource")
+    .Output("keys: Tkeys")
+    .Output("values: Tvalues")
+    .Attr("Tkeys: type")
+    .Attr("Tvalues: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      ShapeHandle values = c->UnknownShape();
+      TF_RETURN_IF_ERROR(c->WithRankAtLeast(values, 1, &values));
+      ShapeHandle keys = c->Vector(c->Dim(values, 0));
+      c->set_output(0, keys);
+      c->set_output(1, values);
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Outputs all keys and values in the table.
+
+table_handle: Handle to the table.
+keys: Vector of all keys present in the table.
+values: Tensor of all values in the table. Indexed in parallel with `keys`.
+)doc");
+
+REGISTER_OP("LookupTableImport")
+    .Input("table_handle: Ref(string)")
+    .Input("keys: Tin")
+    .Input("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
+      DimensionHandle unused_dim;
+      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
+
+      // TODO(ebrevdo): Validate keys and values shape.
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Replaces the contents of the table with the specified keys and values.
+
+The tensor `keys` must be of the same type as the keys of the table.
+The tensor `values` must be of the type of the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Values to associate with keys.
+)doc");
+
+REGISTER_OP("LookupTableImportV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tin")
+    .Input("values: Tout")
+    .Attr("Tin: type")
+    .Attr("Tout: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      // TODO: Validate keys and values shape.
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Replaces the contents of the table with the specified keys and values.
+
+The tensor `keys` must be of the same type as the keys of the table.
+The tensor `values` must be of the type of the table values.
+
+table_handle: Handle to the table.
+keys:  Any shape.  Keys to look up.
+values: Values to associate with keys.
+)doc");
+
+REGISTER_OP("HashTable")
+    .Output("table_handle: Ref(string)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .SetIsStateful()
+    .SetShapeFn(TwoElementOutput)
+    .Doc(R"doc(
+Creates a non-initialized hash table.
+
+This op creates a hash table, specifying the type of its keys and values.
+Before using the table you will have to initialize it.  After initialization the
+table will be immutable.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+use_node_name_sharing: If true and shared_name is empty, the table is shared
+  using the node name.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
+REGISTER_OP("HashTableV2")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates a non-initialized hash table.
+
+This op creates a hash table, specifying the type of its keys and values.
+Before using the table you will have to initialize it.  After initialization the
+table will be immutable.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+use_node_name_sharing: If true and shared_name is empty, the table is shared
+  using the node name.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
+REGISTER_OP("MutableHashTable")
+    .Output("table_handle: Ref(string)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .SetIsStateful()
+    .SetShapeFn(TwoElementOutput)
+    .Doc(R"doc(
+Creates an empty hash table.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a scalar. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+use_node_name_sharing: If true and shared_name is empty, the table is shared
+  using the node name.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
+REGISTER_OP("MutableHashTableV2")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates an empty hash table.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a scalar. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+use_node_name_sharing: If true and shared_name is empty, the table is shared
+  using the node name.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
+REGISTER_OP("MutableHashTableOfTensors")
+    .Output("table_handle: Ref(string)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .Attr("value_shape: shape = {}")
+    .SetIsStateful()
+    .SetShapeFn(TwoElementOutput)
+    .Doc(R"doc(
+Creates an empty hash table.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a vector. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
+REGISTER_OP("MutableHashTableOfTensorsV2")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .Attr("value_shape: shape = {}")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates an empty hash table.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a vector. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+)doc");
+
+REGISTER_OP("MutableDenseHashTable")
+    .Input("empty_key: key_dtype")
+    .Output("table_handle: Ref(string)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .Attr("value_shape: shape = {}")
+    .Attr("initial_num_buckets: int = 131072")  // 2^17
+    .Attr("max_load_factor: float = 0.8")
+    .SetIsStateful()
+    .SetShapeFn(TwoElementOutput)
+    .Doc(R"doc(
+Creates an empty hash table that uses tensors as the backing store. It uses
+"open addressing" with quadratic reprobing to resolve collisions.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a scalar. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+empty_key: The key used to represent empty key buckets internally. Must not
+  be used in insert or lookup operations.
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+value_shape: The shape of each value.
+initial_num_buckets: The initial number of hash table buckets. Must be a power
+  to 2.
+max_load_factor: The maximum ratio between number of entries and number of
+  buckets before growing the table. Must be between 0 and 1.
+)doc");
+
+REGISTER_OP("MutableDenseHashTableV2")
+    .Input("empty_key: key_dtype")
+    .Output("table_handle: resource")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .Attr("use_node_name_sharing: bool = false")
+    .Attr("key_dtype: type")
+    .Attr("value_dtype: type")
+    .Attr("value_shape: shape = {}")
+    .Attr("initial_num_buckets: int = 131072")  // 2^17
+    .Attr("max_load_factor: float = 0.8")
+    .SetIsStateful()
+    .SetShapeFn(ScalarOutput)
+    .Doc(R"doc(
+Creates an empty hash table that uses tensors as the backing store. It uses
+"open addressing" with quadratic reprobing to resolve collisions.
+
+This op creates a mutable hash table, specifying the type of its keys and
+values. Each value must be a scalar. Data can be inserted into the table using
+the insert operations. It does not support the initialization operation.
+
+empty_key: The key used to represent empty key buckets internally. Must not
+  be used in insert or lookup operations.
+table_handle: Handle to a table.
+container: If non-empty, this table is placed in the given container.
+  Otherwise, a default container is used.
+shared_name: If non-empty, this table is shared under the given name across
+  multiple sessions.
+key_dtype: Type of the table keys.
+value_dtype: Type of the table values.
+value_shape: The shape of each value.
+initial_num_buckets: The initial number of hash table buckets. Must be a power
+  to 2.
+max_load_factor: The maximum ratio between number of entries and number of
+  buckets before growing the table. Must be between 0 and 1.
+)doc");
+
+REGISTER_OP("InitializeTable")
+    .Input("table_handle: Ref(string)")
+    .Input("keys: Tkey")
+    .Input("values: Tval")
+    .Attr("Tkey: type")
+    .Attr("Tval: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
+      DimensionHandle unused_dim;
+      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
+
+      ShapeHandle keys;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 1, &keys));
+      TF_RETURN_IF_ERROR(c->Merge(keys, c->input(2), &keys));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Table initializer that takes two tensors for keys and values respectively.
+
+table_handle: Handle to a table which will be initialized.
+keys: Keys of type Tkey.
+values: Values of type Tval.
+)doc");
+
+REGISTER_OP("InitializeTableV2")
+    .Input("table_handle: resource")
+    .Input("keys: Tkey")
+    .Input("values: Tval")
+    .Attr("Tkey: type")
+    .Attr("Tval: type")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      ShapeHandle keys;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 1, &keys));
+      TF_RETURN_IF_ERROR(c->Merge(keys, c->input(2), &keys));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Table initializer that takes two tensors for keys and values respectively.
+
+table_handle: Handle to a table which will be initialized.
+keys: Keys of type Tkey.
+values: Values of type Tval.
+)doc");
+
+REGISTER_OP("InitializeTableFromTextFile")
+    .Input("table_handle: Ref(string)")
+    .Input("filename: string")
+    .Attr("key_index: int >= -2")
+    .Attr("value_index: int >= -2")
+    .Attr("vocab_size: int >= -1 = -1")
+    .Attr("delimiter: string = '\t'")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 1, &handle));
+      DimensionHandle unused_dim;
+      TF_RETURN_IF_ERROR(c->WithValue(c->Dim(handle, 0), 2, &unused_dim));
+
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &handle));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Initializes a table from a text file.
+
+It inserts one key-value pair into the table for each line of the file.
+The key and value is extracted from the whole line content, elements from the
+split line based on `delimiter` or the line number (starting from zero).
+Where to extract the key and value from a line is specified by `key_index` and
+`value_index`.
+
+- A value of -1 means use the line number(starting from zero), expects `int64`.
+- A value of -2 means use the whole line content, expects `string`.
+- A value >= 0 means use the index (starting at zero) of the split line based
+  on `delimiter`.
+
+table_handle: Handle to a table which will be initialized.
+filename: Filename of a vocabulary text file.
+key_index: Column index in a line to get the table `key` values from.
+value_index: Column index that represents information of a line to get the table
+  `value` values from.
+vocab_size: Number of elements of the file, use -1 if unknown.
+delimiter: Delimiter to separate fields in a line.
+)doc");
+
+REGISTER_OP("InitializeTableFromTextFileV2")
+    .Input("table_handle: resource")
+    .Input("filename: string")
+    .Attr("key_index: int >= -2")
+    .Attr("value_index: int >= -2")
+    .Attr("vocab_size: int >= -1 = -1")
+    .Attr("delimiter: string = '\t'")
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle handle;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &handle));
+
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &handle));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Initializes a table from a text file.
+
+It inserts one key-value pair into the table for each line of the file.
+The key and value is extracted from the whole line content, elements from the
+split line based on `delimiter` or the line number (starting from zero).
+Where to extract the key and value from a line is specified by `key_index` and
+`value_index`.
+
+- A value of -1 means use the line number(starting from zero), expects `int64`.
+- A value of -2 means use the whole line content, expects `string`.
+- A value >= 0 means use the index (starting at zero) of the split line based
+  on `delimiter`.
+
+table_handle: Handle to a table which will be initialized.
+filename: Filename of a vocabulary text file.
+key_index: Column index in a line to get the table `key` values from.
+value_index: Column index that represents information of a line to get the table
+  `value` values from.
+vocab_size: Number of elements of the file, use -1 if unknown.
+delimiter: Delimiter to separate fields in a line.
+)doc");
+
+}  // namespace tensorflow
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 817d157da2..9fd5ada71e 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -1022,7 +1022,6 @@ tf_gen_op_wrapper_private_py(
     require_shape_functions = True,
     visibility = [
         "//learning/brain/python/ops:__pkg__",
-        "//tensorflow/python/feature_column:__pkg__",
         "//tensorflow/python/kernel_tests:__pkg__",
     ],
 )
@@ -1057,6 +1056,16 @@ tf_gen_op_wrapper_private_py(
     ],
 )
 
+tf_gen_op_wrapper_private_py(
+    name = "lookup_ops_gen",
+    require_shape_functions = True,
+    visibility = [
+        "//learning/brain/python/ops:__pkg__",
+        "//tensorflow/python/feature_column:__pkg__",
+        "//tensorflow/python/kernel_tests:__pkg__",
+    ],
+)
+
 tf_gen_op_wrapper_private_py(
     name = "math_ops_gen",
     require_shape_functions = True,
@@ -1474,6 +1483,20 @@ py_library(
     ],
 )
 
+py_library(
+    name = "lookup_ops",
+    srcs = ["ops/lookup_ops.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":array_ops",
+        ":framework",
+        ":framework_for_generated_wrappers",
+        ":lookup_ops_gen",
+        ":math_ops",
+        "@six_archive//:six",
+    ],
+)
+
 py_library(
     name = "math_grad",
     srcs = ["ops/math_grad.py"],
@@ -1862,6 +1885,7 @@ py_library(
         ":io_ops",
         ":linalg_ops",
         ":logging_ops",
+        ":lookup_ops",
         ":math_grad",
         ":math_ops",
         ":numerics",
@@ -2269,6 +2293,7 @@ py_library(
         ":io_ops",
         ":io_ops_gen",
         ":lib",
+        ":lookup_ops",
         ":math_ops",
         ":platform",
         ":protos_all_py",
@@ -2991,6 +3016,7 @@ cuda_py_tests(
         ":framework",
         ":framework_for_generated_wrappers",
         ":framework_test_lib",
+        ":lookup_ops",
         ":gradients",
         ":math_ops",
         ":nn_grad",
@@ -3021,7 +3047,7 @@ py_library(
     srcs = ["training/saver_test_utils.py"],
     srcs_version = "PY2AND3",
     deps = [
-        ":data_flow_ops_gen",
+        ":lookup_ops_gen",
         ":training",
     ],
 )
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index f70c285f04..b8064f0a77 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -42,8 +42,8 @@ from tensorflow.python.lib.io import file_io
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import metrics as metrics_lib
 from tensorflow.python.ops import parsing_ops
 from tensorflow.python.ops import state_ops
@@ -1391,9 +1391,10 @@ class EstimatorExportTest(test.TestCase):
       my_int = variables.Variable(1, name='my_int',
                                   collections=[ops.GraphKeys.LOCAL_VARIABLES])
       scores = constant_op.constant([3.])
-      with ops.control_dependencies(
-          [variables.local_variables_initializer(),
-           data_flow_ops.tables_initializer()]):
+      with ops.control_dependencies([
+          variables.local_variables_initializer(),
+          lookup_ops.tables_initializer()
+      ]):
         assign_op = state_ops.assign(my_int, 12345)
 
       # local_initSop must be an Operation, not a Tensor.
diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
index d734273845..ac7aef96ac 100644
--- a/tensorflow/python/feature_column/BUILD
+++ b/tensorflow/python/feature_column/BUILD
@@ -80,9 +80,9 @@ py_library(
     deps = [
         "//tensorflow/python:array_ops",
         "//tensorflow/python:control_flow_ops",
-        "//tensorflow/python:data_flow_ops_gen",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:lookup_ops_gen",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:string_ops",
         "//tensorflow/python:training",
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index d85142abcf..ad67a082dc 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -31,7 +31,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import parsing_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables as variables_lib
@@ -41,7 +41,7 @@ from tensorflow.python.platform import test
 def _initialized_session():
   sess = session.Session()
   sess.run(variables_lib.global_variables_initializer())
-  sess.run(data_flow_ops.tables_initializer())
+  sess.run(lookup_ops.tables_initializer())
   return sess
 
 
@@ -1277,7 +1277,7 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     with self.assertRaisesRegexp(errors.OpError, 'file_does_not_exist'):
       with self.test_session():
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
   def test_invalid_vocabulary_size(self):
     with self.assertRaisesRegexp(ValueError, 'Invalid vocabulary_size'):
@@ -1307,7 +1307,7 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     with self.assertRaisesRegexp(errors.OpError, 'Invalid vocab_size'):
       with self.test_session():
-        data_flow_ops.tables_initializer().run()
+        lookup_ops.tables_initializer().run()
 
   def test_invalid_num_oov_buckets(self):
     with self.assertRaisesRegexp(ValueError, 'Invalid num_oov_buckets'):
diff --git a/tensorflow/python/feature_column/lookup_ops.py b/tensorflow/python/feature_column/lookup_ops.py
index 13a67fa518..8225b47b20 100644
--- a/tensorflow/python/feature_column/lookup_ops.py
+++ b/tensorflow/python/feature_column/lookup_ops.py
@@ -27,7 +27,7 @@ from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import gen_data_flow_ops
+from tensorflow.python.ops import gen_lookup_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import string_ops
 from tensorflow.python.training.saver import BaseSaverBuilder
@@ -151,7 +151,7 @@ class InitializableLookupTableBase(LookupInterface):
     with ops.name_scope(name, "%s_Size" % self._name,
                         [self._table_ref]) as scope:
       # pylint: disable=protected-access
-      return gen_data_flow_ops._lookup_table_size(self._table_ref, name=scope)
+      return gen_lookup_ops._lookup_table_size(self._table_ref, name=scope)
       # pylint: enable=protected-access
 
   def lookup(self, keys, name=None):
@@ -182,7 +182,7 @@ class InitializableLookupTableBase(LookupInterface):
         name, "%s_Lookup" % self._name,
         (self._table_ref, key_tensor, self._default_value)) as scope:
       # pylint: disable=protected-access
-      values = gen_data_flow_ops._lookup_table_find(
+      values = gen_lookup_ops._lookup_table_find(
           self._table_ref, key_tensor, self._default_value, name=scope)
       # pylint: enable=protected-access
 
@@ -229,7 +229,7 @@ class HashTable(InitializableLookupTableBase):
     with ops.name_scope(
         name, "hash_table", (initializer, default_value)) as scope:
       # pylint: disable=protected-access
-      table_ref = gen_data_flow_ops._hash_table(
+      table_ref = gen_lookup_ops._hash_table(
           shared_name=shared_name,
           key_dtype=initializer.key_dtype,
           value_dtype=initializer.value_dtype,
@@ -308,10 +308,8 @@ class KeyValueTensorInitializer(TableInitializerBase):
         self._name,
         values=(table.table_ref, self._keys, self._values)) as scope:
       # pylint: disable=protected-access
-      init_op = gen_data_flow_ops._initialize_table(table.table_ref,
-                                                    self._keys,
-                                                    self._values,
-                                                    name=scope)
+      init_op = gen_lookup_ops._initialize_table(
+          table.table_ref, self._keys, self._values, name=scope)
       # pylint: enable=protected-access
     ops.add_to_collection(ops.GraphKeys.TABLE_INITIALIZERS, init_op)
     return init_op
@@ -477,7 +475,7 @@ class TextFileInitializer(TableInitializerBase):
                                        dtypes.string,
                                        name="asset_filepath")
       # pylint: disable=protected-access
-      init_op = gen_data_flow_ops._initialize_table_from_text_file(
+      init_op = gen_lookup_ops._initialize_table_from_text_file(
           table.table_ref,
           filename,
           self._key_index,
@@ -1333,14 +1331,14 @@ class MutableHashTable(LookupInterface):
     use_node_name_sharing = checkpoint and shared_name is None
     # pylint: disable=protected-access
     if self._default_value.get_shape().ndims == 0:
-      self._table_ref = gen_data_flow_ops._mutable_hash_table(
+      self._table_ref = gen_lookup_ops._mutable_hash_table(
           shared_name=shared_name,
           use_node_name_sharing=use_node_name_sharing,
           key_dtype=key_dtype,
           value_dtype=value_dtype,
           name=name)
     else:
-      self._table_ref = gen_data_flow_ops._mutable_hash_table_of_tensors(
+      self._table_ref = gen_lookup_ops._mutable_hash_table_of_tensors(
           shared_name=shared_name,
           use_node_name_sharing=use_node_name_sharing,
           key_dtype=key_dtype,
@@ -1368,7 +1366,7 @@ class MutableHashTable(LookupInterface):
     with ops.name_scope(name, "%s_Size" % self._name,
                         [self._table_ref]) as name:
       # pylint: disable=protected-access
-      return gen_data_flow_ops._lookup_table_size(self._table_ref, name=name)
+      return gen_lookup_ops._lookup_table_size(self._table_ref, name=name)
 
   def lookup(self, keys, name=None):
     """Looks up `keys` in a table, outputs the corresponding values.
@@ -1394,10 +1392,8 @@ class MutableHashTable(LookupInterface):
     with ops.name_scope(name, "%s_lookup_table_find" % self._name,
                         (self._table_ref, keys, self._default_value)) as name:
       # pylint: disable=protected-access
-      values = gen_data_flow_ops._lookup_table_find(self._table_ref,
-                                                    keys,
-                                                    self._default_value,
-                                                    name=name)
+      values = gen_lookup_ops._lookup_table_find(
+          self._table_ref, keys, self._default_value, name=name)
 
     values.set_shape(keys.get_shape().concatenate(self._value_shape))
     return values
@@ -1423,7 +1419,7 @@ class MutableHashTable(LookupInterface):
     with ops.name_scope(name, "%s_lookup_table_insert" % self._name,
                         [self._table_ref, keys, values]) as name:
       # pylint: disable=protected-access
-      op = gen_data_flow_ops._lookup_table_insert(
+      op = gen_lookup_ops._lookup_table_insert(
           self._table_ref, keys, values, name=name)
       return op
 
@@ -1440,11 +1436,8 @@ class MutableHashTable(LookupInterface):
     with ops.name_scope(name, "%s_lookup_table_export_values" % self._name,
                         [self._table_ref]) as name:
       # pylint: disable=protected-access
-      exported_keys, exported_values = gen_data_flow_ops._lookup_table_export(
-          self._table_ref,
-          self._key_dtype,
-          self._value_dtype,
-          name=name)
+      exported_keys, exported_values = gen_lookup_ops._lookup_table_export(
+          self._table_ref, self._key_dtype, self._value_dtype, name=name)
 
     exported_values.set_shape(exported_keys.get_shape().concatenate(
         self._value_shape))
@@ -1464,7 +1457,7 @@ class MutableHashTable(LookupInterface):
 
     def restore(self, restored_tensors, unused_restored_shapes):
       # pylint: disable=protected-access
-      return gen_data_flow_ops._lookup_table_import(
+      return gen_lookup_ops._lookup_table_import(
           self.op._table_ref, restored_tensors[0], restored_tensors[1])
 
 
@@ -1539,7 +1532,7 @@ class MutableDenseHashTable(LookupInterface):
     use_node_name_sharing = checkpoint and shared_name is None
     empty_key = ops.convert_to_tensor(empty_key, dtype=key_dtype)
     # pylint: disable=protected-access
-    self._table_ref = gen_data_flow_ops._mutable_dense_hash_table(
+    self._table_ref = gen_lookup_ops._mutable_dense_hash_table(
         empty_key=empty_key,
         shared_name=shared_name,
         use_node_name_sharing=use_node_name_sharing,
@@ -1567,7 +1560,7 @@ class MutableDenseHashTable(LookupInterface):
     with ops.name_scope(name, "%s_Size" % self._name,
                         [self._table_ref]) as name:
       # pylint: disable=protected-access
-      return gen_data_flow_ops._lookup_table_size(self._table_ref, name=name)
+      return gen_lookup_ops._lookup_table_size(self._table_ref, name=name)
 
   def lookup(self, keys, name=None):
     """Looks up `keys` in a table, outputs the corresponding values.
@@ -1593,7 +1586,7 @@ class MutableDenseHashTable(LookupInterface):
     with ops.name_scope(name, "%s_lookup_table_find" % self._name,
                         [self._table_ref, keys]) as name:
       # pylint: disable=protected-access
-      values = gen_data_flow_ops._lookup_table_find(
+      values = gen_lookup_ops._lookup_table_find(
           self._table_ref, keys, self._default_value, name=name)
 
     if keys.get_shape().ndims is not None and keys.get_shape().ndims > 0:
@@ -1623,7 +1616,7 @@ class MutableDenseHashTable(LookupInterface):
     with ops.name_scope(name, "%s_lookup_table_insert" % self._name,
                         [self._table_ref, keys, values]) as name:
       # pylint: disable=protected-access
-      op = gen_data_flow_ops._lookup_table_insert(
+      op = gen_lookup_ops._lookup_table_insert(
           self._table_ref, keys, values, name=name)
       return op
 
@@ -1640,7 +1633,7 @@ class MutableDenseHashTable(LookupInterface):
     with ops.name_scope(name, "%s_lookup_table_export_values" % self._name,
                         [self._table_ref]) as name:
       # pylint: disable=protected-access
-      exported_keys, exported_values = gen_data_flow_ops._lookup_table_export(
+      exported_keys, exported_values = gen_lookup_ops._lookup_table_export(
           self._table_ref, self._key_dtype, self._value_dtype, name=name)
 
     exported_values.set_shape(exported_keys.get_shape().concatenate(
@@ -1661,6 +1654,5 @@ class MutableDenseHashTable(LookupInterface):
 
     def restore(self, restored_tensors, unused_restored_shapes):
       # pylint: disable=protected-access
-      return gen_data_flow_ops._lookup_table_import(self.op._table_ref,
-                                                    restored_tensors[0],
-                                                    restored_tensors[1])
+      return gen_lookup_ops._lookup_table_import(
+          self.op._table_ref, restored_tensors[0], restored_tensors[1])
diff --git a/tensorflow/python/ops/data_flow_ops.py b/tensorflow/python/ops/data_flow_ops.py
index 95e803e2aa..9a208613ad 100644
--- a/tensorflow/python/ops/data_flow_ops.py
+++ b/tensorflow/python/ops/data_flow_ops.py
@@ -38,7 +38,6 @@ from tensorflow.python.ops import math_ops
 # pylint: disable=wildcard-import
 from tensorflow.python.ops.gen_data_flow_ops import *
 # pylint: enable=wildcard-import
-from tensorflow.python.util.deprecation import deprecated
 
 
 def _as_type_list(dtypes):
@@ -1037,47 +1036,6 @@ class Barrier(object):
         self._barrier_ref, name=name)
 
 
-@deprecated("2017-03-02", "Use `tf.tables_initializer` instead.")
-def initialize_all_tables(name="init_all_tables"):
-  """Returns an Op that initializes all tables of the default graph.
-
-  Args:
-    name: Optional name for the initialization op.
-
-  Returns:
-    An Op that initializes all tables.  Note that if there are
-    not tables the returned Op is a NoOp.
-  """
-  return tables_initializer(name)
-
-
-def tables_initializer(name="init_all_tables"):
-  """Returns an Op that initializes all tables of the default graph.
-
-  Args:
-    name: Optional name for the initialization op.
-
-  Returns:
-    An Op that initializes all tables.  Note that if there are
-    not tables the returned Op is a NoOp.
-  """
-  initializers = ops.get_collection(ops.GraphKeys.TABLE_INITIALIZERS)
-  if initializers:
-    return control_flow_ops.group(*initializers, name=name)
-  return control_flow_ops.no_op(name=name)
-
-
-ops.NotDifferentiable("LookupTableFind")
-ops.NotDifferentiable("LookupTableInsert")
-ops.NotDifferentiable("LookupTableSize")
-ops.NotDifferentiable("HashTable")
-ops.NotDifferentiable("InitializeTable")
-ops.NotDifferentiable("InitializeTableFromTextFile")
-ops.NotDifferentiable("MutableDenseHashTable")
-ops.NotDifferentiable("MutableHashTable")
-ops.NotDifferentiable("MutableHashTableOfTensors")
-
-
 class ConditionalAccumulatorBase(object):
   """A conditional accumulator for aggregating gradients.
 
diff --git a/tensorflow/python/ops/lookup_ops.py b/tensorflow/python/ops/lookup_ops.py
new file mode 100644
index 0000000000..54dba9e38e
--- /dev/null
+++ b/tensorflow/python/ops/lookup_ops.py
@@ -0,0 +1,77 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#==============================================================================
+"""Data Flow Operations."""
+# pylint: disable=g-bad-name
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import control_flow_ops
+# go/tf-wildcard-import
+# pylint: disable=wildcard-import
+from tensorflow.python.ops.gen_lookup_ops import *
+# pylint: enable=wildcard-import
+from tensorflow.python.util.deprecation import deprecated
+
+
+@deprecated("2017-03-02", "Use `tf.tables_initializer` instead.")
+def initialize_all_tables(name="init_all_tables"):
+  """Returns an Op that initializes all tables of the default graph.
+
+  Args:
+    name: Optional name for the initialization op.
+
+  Returns:
+    An Op that initializes all tables.  Note that if there are
+    not tables the returned Op is a NoOp.
+  """
+  return tables_initializer(name)
+
+
+def tables_initializer(name="init_all_tables"):
+  """Returns an Op that initializes all tables of the default graph.
+
+  Args:
+    name: Optional name for the initialization op.
+
+  Returns:
+    An Op that initializes all tables.  Note that if there are
+    not tables the returned Op is a NoOp.
+  """
+  initializers = ops.get_collection(ops.GraphKeys.TABLE_INITIALIZERS)
+  if initializers:
+    return control_flow_ops.group(*initializers, name=name)
+  return control_flow_ops.no_op(name=name)
+
+
+ops.NotDifferentiable("LookupTableFind")
+ops.NotDifferentiable("LookupTableFindV2")
+ops.NotDifferentiable("LookupTableInsert")
+ops.NotDifferentiable("LookupTableInsertV2")
+ops.NotDifferentiable("LookupTableSize")
+ops.NotDifferentiable("LookupTableSizeV2")
+ops.NotDifferentiable("HashTable")
+ops.NotDifferentiable("HashTableV2")
+ops.NotDifferentiable("InitializeTable")
+ops.NotDifferentiable("InitializeTableV2")
+ops.NotDifferentiable("InitializeTableFromTextFile")
+ops.NotDifferentiable("InitializeTableFromTextFileV2")
+ops.NotDifferentiable("MutableDenseHashTable")
+ops.NotDifferentiable("MutableDenseHashTableV2")
+ops.NotDifferentiable("MutableHashTable")
+ops.NotDifferentiable("MutableHashTableV2")
+ops.NotDifferentiable("MutableHashTableOfTensors")
+ops.NotDifferentiable("MutableHashTableOfTensorsV2")
diff --git a/tensorflow/python/ops/standard_ops.py b/tensorflow/python/ops/standard_ops.py
index 09e04d4247..a39d28490c 100644
--- a/tensorflow/python/ops/standard_ops.py
+++ b/tensorflow/python/ops/standard_ops.py
@@ -57,6 +57,7 @@ from tensorflow.python.ops.io_ops import *
 from tensorflow.python.ops.linalg_ops import *
 from tensorflow.python.ops.logging_ops import Print
 from tensorflow.python.ops.logging_ops import get_summary_op
+from tensorflow.python.ops.lookup_ops import *
 from tensorflow.python.ops.math_ops import *
 from tensorflow.python.ops.numerics import *
 from tensorflow.python.ops.parsing_ops import *
diff --git a/tensorflow/python/saved_model/main_op_impl.py b/tensorflow/python/saved_model/main_op_impl.py
index 66cf9d4d8a..355fd57bf1 100644
--- a/tensorflow/python/saved_model/main_op_impl.py
+++ b/tensorflow/python/saved_model/main_op_impl.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops as tf_data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import variables
 
 
@@ -35,7 +35,7 @@ def main_op():
   """
   init = variables.global_variables_initializer()
   init_local = variables.local_variables_initializer()
-  init_tables = tf_data_flow_ops.tables_initializer()
+  init_tables = lookup_ops.tables_initializer()
   return control_flow_ops.group(init, init_local, init_tables)
 
 
diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index 4c81af56ad..fcec3ed97c 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -26,7 +26,7 @@ from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import resources
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
@@ -238,7 +238,7 @@ class Scaffold(object):
   @staticmethod
   def _default_local_init_op():
     return control_flow_ops.group(variables.local_variables_initializer(),
-                                  data_flow_ops.tables_initializer())
+                                  lookup_ops.tables_initializer())
 
 
 def MonitoredTrainingSession(master='',  # pylint: disable=invalid-name
diff --git a/tensorflow/python/training/saver_test_utils.py b/tensorflow/python/training/saver_test_utils.py
index 5f31e2aa53..6a73565f82 100644
--- a/tensorflow/python/training/saver_test_utils.py
+++ b/tensorflow/python/training/saver_test_utils.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops as ops_lib
-from tensorflow.python.ops import gen_data_flow_ops
+from tensorflow.python.ops import gen_lookup_ops
 from tensorflow.python.training import saver as saver_module
 
 
@@ -34,7 +34,7 @@ class CheckpointedOp(object):
   # pylint: disable=protected-access
   def __init__(self, name, table_ref=None):
     if table_ref is None:
-      self.table_ref = gen_data_flow_ops._mutable_hash_table(
+      self.table_ref = gen_lookup_ops._mutable_hash_table(
           key_dtype=dtypes.string, value_dtype=dtypes.float32, name=name)
     else:
       self.table_ref = table_ref
@@ -52,10 +52,10 @@ class CheckpointedOp(object):
     return self._saveable
 
   def insert(self, keys, values):
-    return gen_data_flow_ops._lookup_table_insert(self.table_ref, keys, values)
+    return gen_lookup_ops._lookup_table_insert(self.table_ref, keys, values)
 
   def lookup(self, keys, default):
-    return gen_data_flow_ops._lookup_table_find(self.table_ref, keys, default)
+    return gen_lookup_ops._lookup_table_find(self.table_ref, keys, default)
 
   def keys(self):
     return self._export()[0]
@@ -64,8 +64,8 @@ class CheckpointedOp(object):
     return self._export()[1]
 
   def _export(self):
-    return gen_data_flow_ops._lookup_table_export(self.table_ref, dtypes.string,
-                                                  dtypes.float32)
+    return gen_lookup_ops._lookup_table_export(self.table_ref, dtypes.string,
+                                               dtypes.float32)
 
   class CustomSaveable(saver_module.BaseSaverBuilder.SaveableObject):
     """A custom saveable for CheckpointedOp."""
@@ -81,6 +81,6 @@ class CheckpointedOp(object):
       super(CheckpointedOp.CustomSaveable, self).__init__(table, specs, name)
 
     def restore(self, restore_tensors, shapes):
-      return gen_data_flow_ops._lookup_table_import(
+      return gen_lookup_ops._lookup_table_import(
           self.op.table_ref, restore_tensors[0], restore_tensors[1])
   # pylint: enable=protected-access
diff --git a/tensorflow/python/training/supervisor.py b/tensorflow/python/training/supervisor.py
index 277c11386d..230ed1db68 100644
--- a/tensorflow/python/training/supervisor.py
+++ b/tensorflow/python/training/supervisor.py
@@ -27,7 +27,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import meta_graph
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.summary import summary as _summary
@@ -426,8 +426,10 @@ class Supervisor(object):
       local_init_op = self._get_first_op_from_collection(
           ops.GraphKeys.LOCAL_INIT_OP)
       if local_init_op is None:
-        op_list = [variables.local_variables_initializer(),
-                   data_flow_ops.tables_initializer()]
+        op_list = [
+            variables.local_variables_initializer(),
+            lookup_ops.tables_initializer()
+        ]
         if op_list:
           local_init_op = control_flow_ops.group(*op_list)
           ops.add_to_collection(ops.GraphKeys.LOCAL_INIT_OP, local_init_op)
-- 
GitLab


From 3273cf4f4d18820daf83ba7dd8b4c8a4329a4f01 Mon Sep 17 00:00:00 2001
From: KB Sriram <kbsriram@gmail.com>
Date: Thu, 4 May 2017 13:55:20 -0700
Subject: [PATCH 1009/1563] Java API to get the size of output list operations
 (#9640)

* Java API to get the size of output list operations

* Java API to get the size of output list operations
---
 tensorflow/java/BUILD                         | 12 ++++
 .../main/java/org/tensorflow/Operation.java   | 24 +++++++
 .../java/src/main/native/operation_jni.cc     | 18 +++++
 .../java/src/main/native/operation_jni.h      | 10 +++
 .../java/org/tensorflow/OperationTest.java    | 66 +++++++++++++++++++
 5 files changed, 130 insertions(+)
 create mode 100644 tensorflow/java/src/test/java/org/tensorflow/OperationTest.java

diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD
index f2904ad5a6..a8910248c1 100644
--- a/tensorflow/java/BUILD
+++ b/tensorflow/java/BUILD
@@ -54,6 +54,18 @@ java_test(
     ],
 )
 
+java_test(
+    name = "OperationTest",
+    size = "small",
+    srcs = ["src/test/java/org/tensorflow/OperationTest.java"],
+    test_class = "org.tensorflow.OperationTest",
+    deps = [
+        ":tensorflow",
+        ":testutil",
+        "@junit",
+    ],
+)
+
 java_test(
     name = "SavedModelBundleTest",
     size = "small",
diff --git a/tensorflow/java/src/main/java/org/tensorflow/Operation.java b/tensorflow/java/src/main/java/org/tensorflow/Operation.java
index 48db554e07..43dbaf125c 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/Operation.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/Operation.java
@@ -70,6 +70,28 @@ public final class Operation {
     }
   }
 
+  /**
+   * Returns the size of the list of Tensors produced by this operation.
+   *
+   * <p>An Operation has multiple named outputs, each of which produces either
+   * a single tensor or a list of tensors. This method returns the size of
+   * the list of tensors for a specific named output of the operation.
+   *
+   * @param name identifier of the list of tensors (of which there may
+   *        be many) produced by this operation.
+   * @returns the size of the list of Tensors produced by this named output.
+   * @throws IllegalArgumentException if this operation has no output
+   *         with the provided name.
+   */
+  public int outputListLength(final String name) {
+    Graph.Reference r = graph.ref();
+    try {
+      return outputListLength(unsafeNativeHandle, name);
+    } finally {
+      r.close();
+    }
+  }
+
   /** Returns a symbolic handle to one of the tensors produced by this operation. */
   public Output output(int idx) {
     return new Output(this, idx);
@@ -108,6 +130,8 @@ public final class Operation {
 
   private static native int numOutputs(long handle);
 
+  private static native int outputListLength(long handle, String name);
+
   private static native long[] shape(long graphHandle, long opHandle, int output);
 
   private static native int dtype(long graphHandle, long opHandle, int output);
diff --git a/tensorflow/java/src/main/native/operation_jni.cc b/tensorflow/java/src/main/native/operation_jni.cc
index 32e59bc0ae..b3d5fc4ec3 100644
--- a/tensorflow/java/src/main/native/operation_jni.cc
+++ b/tensorflow/java/src/main/native/operation_jni.cc
@@ -66,6 +66,24 @@ JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_numOutputs(JNIEnv* env,
   return TF_OperationNumOutputs(op);
 }
 
+JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_outputListLength(JNIEnv* env,
+                                                                      jclass clazz,
+                                                                      jlong handle,
+                                                                      jstring name) {
+  TF_Operation* op = requireHandle(env, handle);
+  if (op == nullptr) return 0;
+
+  TF_Status* status = TF_NewStatus();
+
+  const char* cname = env->GetStringUTFChars(name, nullptr);
+  int result = TF_OperationOutputListLength(op, cname, status);
+  env->ReleaseStringUTFChars(name, cname);
+
+  throwExceptionIfNotOK(env, status);
+  TF_DeleteStatus(status);
+  return result;
+}
+
 JNIEXPORT jlongArray JNICALL Java_org_tensorflow_Operation_shape(
     JNIEnv* env, jclass clazz, jlong graph_handle, jlong op_handle,
     jint output_index) {
diff --git a/tensorflow/java/src/main/native/operation_jni.h b/tensorflow/java/src/main/native/operation_jni.h
index 6292a48069..b5d156f7c2 100644
--- a/tensorflow/java/src/main/native/operation_jni.h
+++ b/tensorflow/java/src/main/native/operation_jni.h
@@ -46,6 +46,16 @@ JNIEXPORT jstring JNICALL Java_org_tensorflow_Operation_type(JNIEnv *, jclass,
 JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_numOutputs(JNIEnv *,
                                                                 jclass, jlong);
 
+/*
+ * Class:     org_tensorflow_Operation
+ * Method:    outputListLength
+ * Signature: (JLjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_outputListLength(JNIEnv *,
+                                                                      jclass,
+                                                                      jlong,
+                                                                      jstring);
+
 /*
  * Class:     org_tensorflow_Operation
  * Method:    shape
diff --git a/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java b/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
new file mode 100644
index 0000000000..53bd511b5b
--- /dev/null
+++ b/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
@@ -0,0 +1,66 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+package org.tensorflow;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.List;
+
+/** Unit tests for {@link org.tensorflow.Operation}. */
+@RunWith(JUnit4.class)
+public class OperationTest {
+
+  @Test
+  public void  outputListLengthFailsOnInvalidName() {
+    try (Graph g = new Graph()) {
+      Operation op = g.opBuilder("Add", "Add")
+          .addInput(TestUtil.constant(g, "x", 1))
+          .addInput(TestUtil.constant(g, "y", 2))
+          .build();
+      assertEquals(1, op.outputListLength("z"));
+
+      try {
+        op.outputListLength("unknown");
+        fail("Did not catch bad name");
+      } catch (IllegalArgumentException iae) {
+        // expected
+      }
+    }
+  }
+
+  @Test
+  public void outputListLength() {
+    assertEquals(1, split(new int[]{0, 1}, 1));
+    assertEquals(2, split(new int[]{0, 1}, 2));
+    assertEquals(3, split(new int[]{0, 1, 2}, 3));
+  }
+
+  private int split(int[] values, int num_split) {
+    try (Graph g = new Graph()) {
+      return g.opBuilder("Split", "Split")
+          .addInput(TestUtil.constant(g, "split_dim", 0))
+          .addInput(TestUtil.constant(g, "values", values))
+          .setAttr("num_split", num_split)
+          .build()
+          .outputListLength("output");
+    }
+  }
+}
-- 
GitLab


From 27dd167c5fd4d0d4e7572cc8d639c0e61e69215e Mon Sep 17 00:00:00 2001
From: Vivek Rane <vivek.v.rane@intel.com>
Date: Thu, 4 May 2017 14:02:25 -0700
Subject: [PATCH 1010/1563] Enable MKL in configure and various bug fixes
 (#9580)

* relu grad and maxpooling grad fixes for perf

* Graph layout pass and conversion pass changes

This commit makes following changes:

- Enables support for ReluGrad and BiasAddGrad
- Adds support for detecting depthwise/batchwise pooling
- Adds more unit tests for Graph rewrite pass
- Improvements to handling control-flow edges
- Bug fixes

* Defaulting to Eigen when LRN depth_radius!=2

* Fixed mkl_conv_grad_filter.cc for conv_ops_tests.py

* Style fix to mkl_matmul and remove unnecessary 'MKL' label on matmul kernel

* Style fixes based on clang-format to mkl_conv_* and mkl_matmul

* Bug fixes

* Adding OP_REQUIRES_OK check in Concat

* Making some style changes

* Enabled the configuration of MKL settings

* relu grad and maxpooling grad fixes for perf

* Graph layout pass and conversion pass changes

This commit makes following changes:

- Enables support for ReluGrad and BiasAddGrad
- Adds support for detecting depthwise/batchwise pooling
- Adds more unit tests for Graph rewrite pass
- Improvements to handling control-flow edges
- Bug fixes

* Defaulting to Eigen when LRN depth_radius!=2

* Fixed mkl_conv_grad_filter.cc for conv_ops_tests.py

* Style fix to mkl_matmul and remove unnecessary 'MKL' label on matmul kernel

* Style fixes based on clang-format to mkl_conv_* and mkl_matmul

* Bug fixes

* Adding OP_REQUIRES_OK check in Concat

* Making some style changes

* Enabled the configuration of MKL settings

* Fixing graph unit tests with Mkl op name change to _Mkl; Fixed missing _ in MklToTf op

* Fixed missing libdl.so.2 in BUILD file

* Fixes for unit test build failures.

* Changes in mkl_conv_grad_filter_ops.cc for Google code style

* Fixes to remove dead code

* removed the dead code and added a TODO for mkl implementation to handle this case in the future

* Fixed buildifier sanity check error

* Adding support for google's CI automation

* Updated link to new MKL version

* Fix for missing locate command in CI

* Adding updatedb to populate the database after installing mlocate

* Fixed buildifier issue

* setting tf_need_mkl=0 in libtf files

* Added third_party/mkl/* to .gitignore

* Added third_party/eigen3/mkl_include to .gitignore

* In configured, set MKL-enabling options only for Linux.
---
 .gitignore                                    |   2 +
 configure                                     |  87 ++-
 tensorflow/compiler/xla/service/cpu/BUILD     |   1 +
 .../lib/quantiles/weighted_quantiles_stream.h |   1 +
 tensorflow/core/BUILD                         |   5 +-
 tensorflow/core/graph/mkl_layout_pass.cc      | 579 +++++++++-----
 tensorflow/core/graph/mkl_layout_pass_test.cc | 720 ++++++++++++++++--
 .../core/graph/mkl_tfconversion_pass.cc       |  36 +-
 .../core/graph/mkl_tfconversion_pass_test.cc  |   4 +-
 tensorflow/core/kernels/mkl_concat_op.cc      |   3 +
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |   4 +-
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |  11 +-
 .../core/kernels/mkl_conv_grad_input_ops.cc   |   6 +-
 tensorflow/core/kernels/mkl_conv_ops.cc       |  42 +-
 tensorflow/core/kernels/mkl_lrn_op.cc         |  52 +-
 tensorflow/core/kernels/mkl_matmul_op.cc      |  16 +-
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |   5 -
 tensorflow/core/kernels/mkl_relu_op.cc        |  60 +-
 tensorflow/core/kernels/mkl_tfconv_op.cc      |   2 +-
 tensorflow/tools/ci_build/builds/configured   |   6 +
 .../ci_build/install/install_deb_packages.sh  |   4 +
 .../tools/ci_build/osx/libtensorflow_cpu.sh   |   1 +
 .../tools/ci_build/osx/libtensorflow_gpu.sh   |   1 +
 third_party/grpc.BUILD                        |   2 +
 third_party/jemalloc.BUILD                    |   3 +
 third_party/llvm/llvm.BUILD                   |   1 +
 third_party/mkl/BUILD                         |   1 +
 27 files changed, 1246 insertions(+), 409 deletions(-)

diff --git a/.gitignore b/.gitignore
index d8ecef1e1e..be0a287a8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ node_modules
 /.bazelrc
 /.tf_configure.bazelrc
 /bazel-*
+/third_party/eigen3/mkl_include
+/third_party/mkl/*
 /third_party/py/numpy/numpy_include
 /tools/python_bin_path.sh
 /tools/git/gen
diff --git a/configure b/configure
index 15715e5ef2..4104651cbb 100755
--- a/configure
+++ b/configure
@@ -180,25 +180,35 @@ fi
 setup_python
 
 ## Set up MKL related environment settings
-if false; then # Disable building with MKL for now
-  while [ "$TF_NEED_MKL" == "" ]; do
-    fromuser=""
-    read -p "Do you wish to build TensorFlow with MKL support (experimental)? [y/N] " INPUT
-    fromuser="1"
-    case $INPUT in
-      [Yy]* ) echo "MKL support (experimental) (will be enabled for TensorFlow"; TF_NEED_MKL=1;;
-      [Nn]* ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
-      "" ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
-      * ) echo "Invalid selection: " $INPUT;;
-    esac
-  done
+while [ "$TF_NEED_MKL" == "" ]; do
+  fromuser=""
+  read -p "Do you wish to build TensorFlow with MKL support? [y/N] " INPUT
+  fromuser="1"
+  case $INPUT in
+    [Yy]* ) echo "MKL support will be enabled for TensorFlow"; TF_NEED_MKL=1;;
+    [Nn]* ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
+    "" ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
+    * ) echo "Invalid selection: " $INPUT;;
+  esac
+done
 
-  OSNAME=`uname -s`
+OSNAME=`uname -s`
 
-  if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
+if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
+  fromuser=""
+  read -p "Do you wish to download MKL LIB from the web? [Y/n] " INPUT
+  fromuser="1"
+  case $INPUT in
+    [Yy]* ) TF_DOWNLOAD_MKL=1;;
+    [Nn]* ) TF_DOWNLOAD_MKL=0;;
+    "" )    TF_DOWNLOAD_MKL=1;;
+    * )     echo "Invalid selection: " $INPUT; exit 1;;
+  esac
+
+  if [[ "$TF_DOWNLOAD_MKL" == "1" ]]; then
     DST=`dirname $0`
-    ARCHIVE_BASENAME=mklml_lnx_2017.0.2.20170209.tgz
-    GITHUB_RELEASE_TAG=v0.5
+    ARCHIVE_BASENAME=mklml_lnx_2018.0.20170425.tgz
+    GITHUB_RELEASE_TAG=v0.7
     MKLURL="https://github.com/01org/mkl-dnn/releases/download/$GITHUB_RELEASE_TAG/$ARCHIVE_BASENAME"
     if ! [ -e "$DST/third_party/mkl/$ARCHIVE_BASENAME" ]; then
       wget --no-check-certificate -P $DST/third_party/mkl/ $MKLURL
@@ -208,7 +218,20 @@ if false; then # Disable building with MKL for now
     MKL_INSTALL_PATH=$DST/third_party/mkl/$extracted_dir_name
     MKL_INSTALL_PATH=`${PYTHON_BIN_PATH} -c "import os; print(os.path.realpath(os.path.expanduser('${MKL_INSTALL_PATH}')))"`
 
-    if [ "$OSNAME" == "Linux" ]; then
+  else
+    default_mkl_path=/opt/intel/mklml
+    fromuser=""
+    read -p "Please specify the location where MKL is installed. [Default is $default_mkl_path]: " MKL_INSTALL_PATH
+    fromuser="1"
+    if [ -z "$MKL_INSTALL_PATH" ]; then
+      MKL_INSTALL_PATH=$default_mkl_path
+    fi
+    # Result returned from "read" will be used unexpanded. That make "~" unuseable.
+    # Going through one more level of expansion to handle that.
+    MKL_INSTALL_PATH=`${PYTHON_BIN_PATH} -c "import os; print(os.path.realpath(os.path.expanduser('${MKL_INSTALL_PATH}')))"`
+  fi
+
+  if [ "$OSNAME" == "Linux" ]; then
       # Full MKL configuration
       MKL_RT_LIB_PATH="lib/intel64/libmkl_rt.so" #${TF_MKL_EXT}#TODO version?
       MKL_RT_OMP_LIB_PATH="../compiler/lib/intel64/libiomp5.so" #TODO VERSION?
@@ -216,24 +239,33 @@ if false; then # Disable building with MKL for now
       # MKL-ML configuration
       MKL_ML_LIB_PATH="lib/libmklml_intel.so" #${TF_MKL_EXT}#TODO version?
       MKL_ML_OMP_LIB_PATH="lib/libiomp5.so" #TODO VERSION?
-    elif [ "$OSNAME" == "Darwin" ]; then
+  elif [ "$OSNAME" == "Darwin" ]; then
       echo "Darwin is unsupported yet";
       exit 1
-    fi
+  fi
 
-    if [ -e "$MKL_INSTALL_PATH/${MKL_ML_LIB_PATH}" ]; then
+  if [ -e "$MKL_INSTALL_PATH/${MKL_ML_LIB_PATH}" ]; then
       ln -sf $MKL_INSTALL_PATH/${MKL_ML_LIB_PATH} third_party/mkl/
       ln -sf $MKL_INSTALL_PATH/${MKL_ML_OMP_LIB_PATH} third_party/mkl/
       ln -sf $MKL_INSTALL_PATH/include third_party/mkl/
       ln -sf $MKL_INSTALL_PATH/include third_party/eigen3/mkl_include
-    else
-      echo "ERROR: $MKL_INSTALL_PATH/${MKL_ML_LIB_PATH} does not exist";
+      loc=$(locate -e libdl.so.2 | sed -n 1p)
+      ln -sf $loc third_party/mkl/libdl.so.2
+  elif [ -e "$MKL_INSTALL_PATH/${MKL_RT_LIB_PATH}" ]; then
+      ln -sf $MKL_INSTALL_PATH/${MKL_RT_LIB_PATH} third_party/mkl/
+      ln -sf $MKL_INSTALL_PATH/${MKL_RT_OMP_LIB_PATH} third_party/mkl/
+      ln -sf $MKL_INSTALL_PATH/include third_party/mkl/
+      ln -sf $MKL_INSTALL_PATH/include third_party/eigen3/mkl_include
+      loc=$(locate -e libdl.so.2 | sed -n 1p)
+      ln -sf $loc third_party/mkl/libdl.so.2
+  else
+      echo "ERROR: $MKL_INSTALL_PATH/${MKL_ML_LIB_PATH} nor $MKL_INSTALL_PATH/${MKL_RT_LIB_PATH} exists";
       exit 1
-    fi
+  fi
 
-    if [ -z "$fromuser" ]; then
+  if [ -z "$fromuser" ]; then
       exit 1
-    fi
+  fi
 
 cat > third_party/mkl/mkl.config <<EOF
 # MKL_INSTALL_PATH refers to the location of MKL root folder. The MKL header and library
@@ -241,9 +273,8 @@ cat > third_party/mkl/mkl.config <<EOF
 MKL_INSTALL_PATH=$MKL_INSTALL_PATH
 EOF
 
-  fi # TF_NEED_MKL
-  ################## MKL
-fi # Disable building with MKL for now
+fi # TF_NEED_MKL
+## End MKL setup
 
 ## Set up architecture-dependent optimization flags.
 if [ -z "$CC_OPT_FLAGS" ]; then
diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD
index 6e24506b38..5d66cd272d 100644
--- a/tensorflow/compiler/xla/service/cpu/BUILD
+++ b/tensorflow/compiler/xla/service/cpu/BUILD
@@ -98,6 +98,7 @@ cc_library(
     name = "simple_orc_jit",
     srcs = ["simple_orc_jit.cc"],
     hdrs = ["simple_orc_jit.h"],
+    linkopts = ["-ldl"],
     deps = [
         ":compiler_functor",
         ":cpu_runtime",
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
index daf0e48000..fd577ad712 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
@@ -17,6 +17,7 @@
 
 #include <memory>
 #include <vector>
+#include <cmath>
 
 #include "tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h"
 #include "tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary.h"
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 119bc0f899..2d27b5d9d4 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1282,7 +1282,10 @@ cc_library(
     ] + tf_additional_verbs_lib_defines(),
     linkopts = select({
         "//tensorflow:freebsd": [],
-        "//conditions:default": ["-ldl"],
+        "//conditions:default": [
+            "-ldl",
+            "-lpthread",
+        ],
     }),
     deps = tf_additional_lib_deps() + [
         ":lib_hash_crc32c_accelerate_internal",
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 09b632a165..87388ebe7b 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -35,6 +35,7 @@ limitations under the License.
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/hash/hash.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/util/tensor_format.h"
 
 #include "tensorflow/core/graph/mkl_layout_pass.h"
 #include "tensorflow/core/util/mkl_util.h"
@@ -280,51 +281,72 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     csinfo_.mkl_conv2d = "_MklConv2D";
     csinfo_.mkl_conv2d_with_bias = "_MklConv2DWithBias";
     csinfo_.mkl_conv2d_with_bias_backprop_bias =
-        "_MklConv2DWithBiasBackpropBias";
-    csinfo_.relu = "Relu";
-    csinfo_.reshape = "Reshape";
-    csinfo_.relu_grad = "ReluGrad";
-    csinfo_.split = "Split";
+                                   "_MklConv2DWithBiasBackpropBias";
+    csinfo_.relu                  = "Relu";
+    csinfo_.relu_grad             = "ReluGrad";
+    csinfo_.reshape               = "Reshape";
+    csinfo_.split                 = "Split";
 
     // NOTE: names are alphabetically sorted.
-    rinfo_.push_back({csinfo_.avg_pool, GetMklOpName(csinfo_.avg_pool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avg_pool,
+                      GetMklOpName(csinfo_.avg_pool),
+                      CopyAttrsPooling, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.avg_pool_grad,
-                      GetMklOpName(csinfo_.avg_pool_grad), 2, CopyAttrsPooling,
-                      AlwaysRewrite});
-    rinfo_.push_back({csinfo_.concat, GetMklOpName(csinfo_.concat), 0,
-                      CopyAttrsConcat, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.concatv2, GetMklOpName(csinfo_.concatv2), 0,
-                      CopyAttrsConcatV2, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.conv2d, GetMklOpName(csinfo_.conv2d), 2,
-                      CopyAttrsConv2D, AlwaysRewrite});
+                      GetMklOpName(csinfo_.avg_pool_grad),
+                      CopyAttrsPooling, AlwaysRewrite, nullptr});
+    // BiasAddGrad gets written into Conv2DWithBiasBackpropBias depending
+    // on if context contains Conv2D.
+    rinfo_.push_back({csinfo_.bias_add_grad,
+                      csinfo_.mkl_conv2d_with_bias_backprop_bias,
+                      CopyAttrsBiasAddGrad, ContextMatchRewrite,
+                      &biasaddgrad_conv2dwithbias_context_});
+    // BiasAddGrad gets written into BiasAddGrad depending on if context
+    // contains MatMul.
+    rinfo_.push_back({csinfo_.bias_add_grad, csinfo_.matmul,
+                      CopyAttrsBiasAddGrad, ContextMatchRewrite,
+                      &biasaddgrad_matmul_context_});
+    rinfo_.push_back({csinfo_.concat,
+                      GetMklOpName(csinfo_.concat),
+                      CopyAttrsConcat, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.concatv2,
+                      GetMklOpName(csinfo_.concatv2),
+                      CopyAttrsConcatV2, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.conv2d,
+                      GetMklOpName(csinfo_.conv2d),
+                      CopyAttrsConv2D, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.conv2d_grad_filter,
-                      GetMklOpName(csinfo_.conv2d_grad_filter), 3,
-                      CopyAttrsConv2D, AlwaysRewrite});
+                      GetMklOpName(csinfo_.conv2d_grad_filter),
+                      CopyAttrsConv2D, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.conv2d_grad_input,
-                      GetMklOpName(csinfo_.conv2d_grad_input), 3,
-                      CopyAttrsConv2D, AlwaysRewrite});
+                      GetMklOpName(csinfo_.conv2d_grad_input),
+                      CopyAttrsConv2D, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.fused_batch_norm,
-                      GetMklOpName(csinfo_.fused_batch_norm), 5,
-                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+                      GetMklOpName(csinfo_.fused_batch_norm),
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.fused_batch_norm_grad,
-                      GetMklOpName(csinfo_.fused_batch_norm_grad), 5,
-                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.lrn, GetMklOpName(csinfo_.lrn), 1, CopyAttrsLRN,
-                      AlwaysRewrite});
-    rinfo_.push_back({csinfo_.lrn_grad, GetMklOpName(csinfo_.lrn_grad), 3,
-                      CopyAttrsLRN, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.max_pool, GetMklOpName(csinfo_.max_pool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
+                      GetMklOpName(csinfo_.fused_batch_norm_grad),
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.lrn,
+                      GetMklOpName(csinfo_.lrn),
+                      CopyAttrsLRN, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.lrn_grad,
+                      GetMklOpName(csinfo_.lrn_grad),
+                      CopyAttrsLRN, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.max_pool,
+                      GetMklOpName(csinfo_.max_pool),
+                      CopyAttrsPooling, NonDepthBatchWisePoolRewrite, nullptr});
     rinfo_.push_back({csinfo_.max_pool_grad,
-                      GetMklOpName(csinfo_.max_pool_grad), 3, CopyAttrsPooling,
-                      AlwaysRewrite});
-    rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu), 1,
-                      CopyAttrsRelu, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.reshape, GetMklOpName(csinfo_.reshape), 2,
-                      CopyAttrsReshape, AlwaysRewrite});
-
-    // TODO(inteltf): we do not support ReluGrad and BiasAddGrad yet.
+                      GetMklOpName(csinfo_.max_pool_grad),
+                      CopyAttrsPooling, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.relu,
+                      GetMklOpName(csinfo_.relu),
+                      CopyAttrsRelu, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.relu_grad,
+                      GetMklOpName(csinfo_.relu_grad),
+                      CopyAttrsRelu, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.reshape,
+                      GetMklOpName(csinfo_.reshape),
+                      CopyAttrsReshape, AlwaysRewrite, nullptr});
 
     // Add info about which ops to add workspace edge to and the slots.
     wsinfo_.push_back({csinfo_.lrn, csinfo_.lrn_grad, 0, 2, 1, 3});
@@ -338,8 +360,15 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     // maxhops in backward data-flow graph. Since input of forward nodes
     // (Conv2D) directly goes to backward nodes, we do not expect the
     // hop-distance would be more than few nodes.
-    cinfo_.push_back({csinfo_.bias_add_grad, csinfo_.mkl_conv2d_with_bias,
-                      kNodeMergeContextMaxDepth});
+    biasaddgrad_matmul_context_ = {csinfo_.bias_add_grad, csinfo_.matmul,
+                                   kNodeMergeContextMaxDepth};
+
+    biasaddgrad_conv2dwithbias_context_ = {csinfo_.bias_add_grad,
+                                   csinfo_.mkl_conv2d_with_bias,
+                                   kNodeMergeContextMaxDepth};
+
+    cinfo_.push_back(&biasaddgrad_matmul_context_);
+    cinfo_.push_back(&biasaddgrad_conv2dwithbias_context_);
   }
 
   // Standard interface to run pass
@@ -354,7 +383,16 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // @return true, if and only if graph is mutated; false otherwise.
   bool RunPass(std::unique_ptr<Graph>* g);
 
- private:
+  /// Structure to specify the context information used in a node rewrite rule
+  typedef struct {
+    string node;     // Name of the node to be rewritten
+    string fwd;      // Name of the node in the forward pass that this node
+                     // corresponds to
+    size_t max_hop;  // Maximum number of hops the fwd is located
+                     // from this node. If the fwd is farther than max_hop
+                     // then we do not rewrite the node.
+  } ContextInfo;
+
   /// Structure to specify the name of an original node, its new name after
   /// rewrite, the number of inputs to the original node, the function to
   /// be used to copy attributes for the op, and the rule (if any) which
@@ -362,11 +400,12 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   typedef struct {
     string name;      // Original name of op of the node in the graph
     string new_name;  // New name of the op of the node in the graph
-    int num_ins;      // The number of inputs to the original op type
     // A function handler to copy attributes from an old node to a new node.
     std::function<void(const Node*, NodeBuilder*)> copy_attrs;
-    std::function<bool(const Node*)> rewrite_rule;  // A rule under which to
-                                                    // rewrite this node.
+    // A rule under which to rewrite this node
+    std::function<bool(const Node*, const ContextInfo* c)> rewrite_rule;
+    // ContextInfo, if any, to be used for rewrite
+    ContextInfo* context;
   } RewriteInfo;
 
   /// Structure to specify a forward op, a backward op, and the slot numbers
@@ -393,16 +432,6 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string new_node;  // Name of the node after merge
   } MergeInfo;
 
-  /// Structure to specify the context information used in a node rewrite rule
-  typedef struct {
-    string node;     // Name of the node to be rewritten
-    string fwd;      // Name of the node in the forward pass that this node
-                     // corresponds to
-    size_t max_hop;  // Maximum number of hops the fwd is located
-                     // from this node. If the fwd is farther than max_hop
-                     // then we do not rewrite the node.
-  } ContextInfo;
-
   /// Structure to store all constant strings
   /// NOTE: names are alphabetically sorted.
   struct {
@@ -427,10 +456,11 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string mkl_conv2d_with_bias_backprop_bias;
     string relu;
     string relu_grad;
-    string split;
     string reshape;
+    string split;
   } csinfo_;
 
+ private:
   /// Maintain info about nodes to rewrite
   std::vector<RewriteInfo> rinfo_;
 
@@ -441,7 +471,11 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   std::vector<MergeInfo> minfo_;
 
   /// Maintain info about nodes to rewrite
-  static std::vector<ContextInfo> cinfo_;
+  static std::vector<ContextInfo*> cinfo_;
+
+  /// Context variables used in referencing rules
+  static ContextInfo biasaddgrad_matmul_context_;
+  static ContextInfo biasaddgrad_conv2dwithbias_context_;
 
   /// Hash table to maintain nodes visited in the graph.
   std::unordered_set<const Node*> visited_nodes_;
@@ -464,19 +498,6 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // Clear all visited nodes
   inline void UnMarkRewrittenNodes() { visited_nodes_.clear(); }
 
-  // Is this a graph node that can accept variable number of inputs?
-  // Return true if yes, false otherwise.
-  //
-  // Concat, Split are vararg nodes.
-  inline bool IsVarArgNode(Node* n) {
-    if (n->type_string() == csinfo_.concat ||
-        n->type_string() == csinfo_.concatv2 ||
-        n->type_string() == csinfo_.split) {
-      return true;
-    }
-    return false;
-  }
-
   // Is OpDef::ArgDef a list type? It could be N * T or list(type).
   // Refer to opdef.proto for details of list type.
   inline bool ArgIsList(const OpDef::ArgDef& arg) const {
@@ -510,6 +531,39 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     return string(kMklOpPrefix) + name;
   }
 
+  // Can op represented by node 'n' run on DEVICE_CPU?
+  // Op can run on CPU with MKL if the runtime assigned device or the
+  // user requested device contains device CPU, or both are empty.
+  bool CanOpRunOnCPUDevice(const Node* n) {
+    bool result = true;
+    string reason;
+
+    // Substring that should be checked for in device name for CPU device.
+    const char* const kCPUDeviceSubStr = "cpu";
+
+    // If Op has been specifically assigned to a non-CPU device, then No.
+    if (!n->assigned_device_name().empty() &&
+        !StringPiece(n->assigned_device_name()).contains(kCPUDeviceSubStr)) {
+      result = false;
+      reason = "Op has been assigned a runtime device that is not CPU.";
+    }
+
+    // If user has specifically assigned this op to a non-CPU device, then No.
+    if (!n->def().device().empty() &&
+        !StringPiece(n->def().device()).contains(kCPUDeviceSubStr)) {
+      result = false;
+      reason = "User has assigned a device that is not CPU.";
+    }
+
+    if (result == false) {
+      VLOG(1) << "MklLayoutRewritePass: Skipping rewriting of the node "
+              << n->type_string() << ", reason: " << reason;
+    }
+
+    // Otherwise Yes.
+    return result;
+  }
+
   // Return a node that can be merged with input node 'n'
   //
   // @return pointer to the node if we can find such a
@@ -538,13 +592,46 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
 
   // Default rewrite rule to be used in scenario 1 for rewrite.
   // @return - true (since we want to always rewrite)
-  static bool AlwaysRewrite(const Node* n) { return true; }
-  // Rewrite rule that uses context-information for matching
+  static bool AlwaysRewrite(const Node* n, const ContextInfo* c = nullptr) {
+    return true;
+  }
+
+  // Check if we are performing pooling on depth or batch. If it is, then we
+  // do not rewrite MaxPool node to Mkl version.
+  // @return - true (if it is not a depth/batch wise pooling case);
+  //           false otherwise.
+  static bool NonDepthBatchWisePoolRewrite(const Node* n,
+                                           const ContextInfo* c) {
+    CHECK_NOTNULL(n);
+
+    string data_format_str;
+    TensorFormat data_format;
+    std::vector<int32> ksize, strides;
+    CHECK_EQ(GetNodeAttr(n->def(), "ksize", &ksize).ok(), true);
+    CHECK_EQ(GetNodeAttr(n->def(), "strides", &strides).ok(), true);
+    CHECK_EQ(GetNodeAttr(n->def(), "data_format", &data_format_str).ok(),
+             true);
+    CHECK_EQ(FormatFromString(data_format_str, &data_format), true);
+
+    // Condition that specifies non-batch-wise and non-depth-wise pooling.
+    if (GetTensorDim(ksize,   data_format, 'N') == 1 &&
+        GetTensorDim(strides, data_format, 'N') == 1 &&
+        GetTensorDim(ksize,   data_format, 'C') == 1 &&
+        GetTensorDim(strides, data_format, 'C') == 1) {
+      return true;
+    }
+
+    return false;
+  }
+
+  // Rewrite rule that uses context-information for matching,
   // used in scenario 2.
   //
   // @input - Node 'n' for which to search for matching context
-  // @return - true if matching context is found; false otherwise.
-  static bool ContextMatchRewrite(const Node* n);
+  // @input - The context 'c' under which to rewrite
+  // @return - true if we can rewrite node under context 'c';
+  //           false otherwise.
+  static bool ContextMatchRewrite(const Node* n, const ContextInfo* c);
 
   // Helper function that searches the matching contextinfo for the node.
   // Implements depth-first search in the data dependence graph for the
@@ -598,6 +685,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // node that we are constructing.
   //
   // @input g - input graph,
+  // @input orig_node - Original node that we are rewriting
   // @input inputs - inputs to old node that we are using for constructing
   //                 new inputs,
   // @input input_idx - the index in the 'inputs' vector pointing to the
@@ -608,11 +696,10 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // @output output_nodes - the list of new nodes creating Mkl tensors
   //
   // @return None
-  void GetNodesProducingMklTensorList(
-      std::unique_ptr<Graph>* g,
-      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
-      int* input_idx, int list_length,
-      std::vector<NodeBuilder::NodeOut>* output_nodes);
+  void GetNodesProducingMklTensorList(std::unique_ptr<Graph>* g,
+    Node* orig_node, const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes);
 
   // Get a node that will feed an Mkl tensor to the new
   // node that we are constructing. The output node could be (1) 'n'
@@ -620,6 +707,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // if 'n' is not an Mkl layer.
   //
   // @input g - input graph,
+  // @input orig_node - Original node that we are rewriting,
   // @input n - Node based on which we are creating Mkl node,
   // @input n_output_slot - the output slot of node 'n'
   //            which is feeding to the node that we are constructing
@@ -627,9 +715,8 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // @output mkl_node_output_slot - the slot number of mkl_node that
   //                                will feed the tensor
   // @return None
-  void GetNodeProducingMklTensor(std::unique_ptr<Graph>* g, Node* n,
-                                 int n_output_slot, Node** mkl_node,
-                                 int* mkl_node_output_slot);
+  void GetNodeProducingMklTensor(std::unique_ptr<Graph>* g, Node* orig_node,
+    Node* n, int n_output_slot, Node** mkl_node, int* mkl_node_output_slot);
 
   // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
   // in graph 'g'. Original node is input in 'old_node'. Inputs to 'nb' are
@@ -695,13 +782,18 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
                                    Node* orig_node);
 };
 
-std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
+MklLayoutRewritePass::ContextInfo
+  MklLayoutRewritePass::biasaddgrad_conv2dwithbias_context_;
+MklLayoutRewritePass::ContextInfo
+  MklLayoutRewritePass::biasaddgrad_matmul_context_;
+std::vector<MklLayoutRewritePass::ContextInfo*> MklLayoutRewritePass::cinfo_;
 
-// We register Mkl rewrite pass for phase 1 in post rewrite group.
+// We register Mkl rewrite pass for phase 1 in post partitioning group.
 // We register it here so that we get a complete picture of all users of Mkl
 // nodes. Do not change the ordering of the Mkl passes.
-REGISTER_OPTIMIZATION(OptimizationPassRegistry::POST_REWRITE_FOR_EXEC, 1,
-                      MklLayoutRewritePass);
+const OptimizationPassRegistry::Grouping kMklLayoutRewritePassGroup =
+    OptimizationPassRegistry::POST_PARTITIONING;
+REGISTER_OPTIMIZATION(kMklLayoutRewritePassGroup, 1, MklLayoutRewritePass);
 
 //////////////////////////////////////////////////////////////////////////
 //           Helper functions for creating new node
@@ -737,27 +829,14 @@ void MklLayoutRewritePass::GetNodesProducingTFTensorList(
 
   while (list_length != 0) {
     CHECK_GT(list_length, 0);
-    CHECK_LE(*input_idx, inputs.size());
+    CHECK_LT(*input_idx, inputs.size());
     Node* n = inputs[*input_idx].first;
     int slot = inputs[*input_idx].second;
-    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
-    // If input node 'n' is producing a list/array output at output
-    // slot 'slot' then we need to find out the length of that list/array.
-    if (ArgIsList(arg)) {
-      int N = GetTensorListLength(arg, n);
-      CHECK_LE(N, list_length);
-      for (int j = 0; j < N; j++) {
-        output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
-      }
-      (*input_idx)++;
-      list_length -= N;
-    } else {
-      // But if input node 'n' is just producing a single tensor at
-      // output slot 'slot' then we just add that single node.
-      output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
-      (*input_idx)++;
-      list_length--;
-    }
+    // If input node 'n' is just producing a single tensor at
+    // output slot 'slot' then we just add that single node.
+    output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
+    (*input_idx)++;
+    list_length--;
   }
 }
 
@@ -775,20 +854,39 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
   TensorShape dummy_shape({8});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                  .Attr("value", proto)
-                  .Attr("dtype", dt)
-                  .Device(orig_node->def().device())  // We place this node on
-                                                      // the same device as the
-                                                      // device of the original
-                                                      // node.
-                  .Finalize(&**g, out));
+               .Attr("value", proto)
+               .Attr("dtype", dt)
+               .Device(orig_node->def().device())  // We place this node on
+                                                   // the same device as the
+                                                   // device of the original
+                                                   // node.
+               .Finalize(&**g, out));
+
+  // If number of inputs to the original node is > 0, then we add
+  // control dependency between 1st input (index 0) of the original node and
+  // the dummy Mkl node. This is needed because control-flow ops such as Enter,
+  // Merge, etc, require frame_name of the dummy Mkl node to be same as the
+  // rewritten node. Adding control edge between 1st input of the original node
+  // and the dummy Mkl node ensures that the dummy node is in the same frame
+  // as the original node. Choosing 1st input is not necessary - any input of
+  // the original node is fine because all the inputs of a node are always in
+  // the same frame.
+  if (orig_node->num_inputs() > 0) {
+    Node* orig_input0 = nullptr;
+    TF_CHECK_OK(orig_node->input_node(0,
+                                      const_cast<const Node**>(&orig_input0)));
+    CHECK_NOTNULL((*g)->AddControlEdge(orig_input0, *out));
+  }
+
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
 void MklLayoutRewritePass::GetNodesProducingMklTensorList(
     std::unique_ptr<Graph>* g,
-    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs, int* input_idx,
-    int list_length, std::vector<NodeBuilder::NodeOut>* output_nodes) {
+    Node* orig_node,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes) {
   CHECK_LT(*input_idx, inputs.size());
   CHECK_GT(list_length, 0);
   CHECK_NOTNULL(output_nodes);
@@ -796,38 +894,19 @@ void MklLayoutRewritePass::GetNodesProducingMklTensorList(
 
   while (list_length != 0) {
     CHECK_GT(list_length, 0);
-    CHECK_LE(*input_idx, inputs.size());
+    CHECK_LT(*input_idx, inputs.size());
     Node* n = inputs[*input_idx].first;
     int slot = inputs[*input_idx].second;
-    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
-    // We need to check first if the input edge is going to carry a
-    // single tensor or a list of tensors. If it is a list of tensors,
-    // then we need to create list of Mkl dummy nodes.
-    if (ArgIsList(arg)) {
-      // If input node 'n' is producing a list/array output at output
-      // slot 'slot' then we need to find out the length of that list/array.
-      int N = GetTensorListLength(arg, n);
-      CHECK_LE(N, list_length);
-      Node* mkl_node = nullptr;
-      int mkl_node_output_slot = 0;
-      // If it is a list, then create a list of Mkl dummy nodes.
-      for (int j = 0; j < N; j++) {
-        GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
-        output_nodes->push_back(
-            NodeBuilder::NodeOut(mkl_node, mkl_node_output_slot));
-      }
-      (*input_idx)++;
-      list_length -= N;
-    } else {
-      // If it is not a list, then create a single Mkl tensor node.
-      Node* mkl_node = nullptr;
-      int mkl_node_output_slot = 0;
-      GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
-      output_nodes->push_back(
-          NodeBuilder::NodeOut(mkl_node, mkl_node_output_slot));
-      (*input_idx)++;
-      list_length--;
-    }
+    // If 'n' is producing a single tensor, then create a single Mkl tensor
+    // node.
+    Node* mkl_node = nullptr;
+    int mkl_node_output_slot = 0;
+    GetNodeProducingMklTensor(g, orig_node, n, slot, &mkl_node,
+                              &mkl_node_output_slot);
+    output_nodes->push_back(NodeBuilder::NodeOut(mkl_node,
+                                                mkl_node_output_slot));
+    (*input_idx)++;
+    list_length--;
   }
 }
 
@@ -835,9 +914,9 @@ void MklLayoutRewritePass::GetNodesProducingMklTensorList(
 // node that we are constructing. An input node could be (1) 'n'
 // if it is Mkl layer, or (2) a dummy node producing dummy Mkl tensor
 // if 'n' is not an Mkl layer.
-void MklLayoutRewritePass::GetNodeProducingMklTensor(
-    std::unique_ptr<Graph>* g, Node* n, int n_output_slot, Node** mkl_node,
-    int* mkl_node_output_slot) {
+void MklLayoutRewritePass::GetNodeProducingMklTensor(std::unique_ptr<Graph>* g,
+    Node* orig_node, Node* n,
+    int n_output_slot, Node** mkl_node, int* mkl_node_output_slot) {
   CHECK_NOTNULL(n);
   CHECK_NOTNULL(mkl_node);
   CHECK_NOTNULL(mkl_node_output_slot);
@@ -860,7 +939,7 @@ void MklLayoutRewritePass::GetNodeProducingMklTensor(
     // to create a dummy node that will feed a dummy Mkl tensor to this node.
     // DummyMklTensor node has no input and generates only 1 output
     // (dummy Mkl tensor) as output slot number 0.
-    GetDummyMklTensorNode(g, mkl_node, n);
+    GetDummyMklTensorNode(g, mkl_node, orig_node);
     CHECK_NOTNULL(*mkl_node);
     *mkl_node_output_slot = 0;
   }
@@ -926,16 +1005,16 @@ int MklLayoutRewritePass::SetUpContiguousInputs(
     if (ArgIsList(arg)) {
       std::vector<NodeBuilder::NodeOut> new_node_inputs;
       int N = GetTensorListLength(arg, old_node);
-      GetNodesProducingMklTensorList(g, old_node_inputs, &iidx, N,
-                                     &new_node_inputs);
+      GetNodesProducingMklTensorList(g, old_node, old_node_inputs, &iidx,
+                                     N, &new_node_inputs);
       nb->Input(new_node_inputs);
       nn_slot_idx++;
     } else {
       Node* mkl_node = nullptr;
       int mkl_node_output_slot = 0;
-      GetNodeProducingMklTensor(g, old_node_inputs[iidx].first,
-                                old_node_inputs[iidx].second, &mkl_node,
-                                &mkl_node_output_slot);
+      GetNodeProducingMklTensor(g, old_node, old_node_inputs[iidx].first,
+                                old_node_inputs[iidx].second,
+                                &mkl_node, &mkl_node_output_slot);
       nb->Input(mkl_node, mkl_node_output_slot);
       iidx++;
       nn_slot_idx++;
@@ -1020,13 +1099,30 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
   TensorShape dummy_shape({1});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                  .Attr("value", proto)
-                  .Attr("dtype", dt)
-                  .Device(orig_node->def().device())  // We place this node on
-                                                      // same the device as the
-                                                      // device of the original
-                                                      // node.
-                  .Finalize(&**g, out));
+                .Attr("value", proto)
+                .Attr("dtype", dt)
+                .Device(orig_node->def().device())  // We place this node on
+                                                    // same the device as the
+                                                    // device of the original
+                                                    // node.
+                .Finalize(&**g, out));
+
+  // If number of inputs to the original node is > 0, then we add
+  // control dependency between 1st input (index 0) of the original node and
+  // the dummy Mkl node. This is needed because control-flow ops such as Enter,
+  // Merge, etc, require frame_name of the dummy Mkl node to be same as the
+  // rewritten node. Adding control edge between 1st input of the original node
+  // and the dummy Mkl node ensures that the dummy node is in the same frame
+  // as the original node. Choosing 1st input is not necessary - any input of
+  // the original node is fine because all the inputs of a node are always in
+  // the same frame.
+  if (orig_node->num_inputs() > 0) {
+    Node* orig_input0 = nullptr;
+    TF_CHECK_OK(orig_node->input_node(0,
+                                      const_cast<const Node**>(&orig_input0)));
+    CHECK_NOTNULL((*g)->AddControlEdge(orig_input0, *out));
+  }
+
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
@@ -1235,6 +1331,19 @@ void MklLayoutRewritePass::CopyAttrsRelu(const Node* orig_node,
   nb->Attr("T", T);
 }
 
+void MklLayoutRewritePass::CopyAttrsReshape(const Node* orig_node,
+                                           NodeBuilder* nb) {
+  DataType T;
+  DataType Tshape;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tshape", &Tshape));
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("Tshape", Tshape);
+}
+
 void MklLayoutRewritePass::CopyAttrsSplit(const Node* orig_node,
                                           NodeBuilder* nb) {
   DataType T;
@@ -1303,20 +1412,6 @@ void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orig_node,
   nb->Attr("is_training", is_training);
 }
 
-void MklLayoutRewritePass::CopyAttrsReshape(const Node* orig_node,
-                                            NodeBuilder* nb) {
-  DataType T;
-  DataType Tshape;
-
-  // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tshape", &Tshape));
-
-  // Add attributes to new node.
-  nb->Attr("T", T);
-  nb->Attr("Tshape", Tshape);
-}
-
 //////////////////////////////////////////////////////////////////////////
 //           Helper functions related to node merge pass
 //////////////////////////////////////////////////////////////////////////
@@ -1353,8 +1448,9 @@ Node* MklLayoutRewritePass::CheckForNodeMerge(const Node* a) const {
       continue;
     }
 
+    const int B_in = b->num_inputs();
     gtl::InlinedVector<Node*, 4> b_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> b_in(N_in);
+    gtl::InlinedVector<std::pair<Node*, int>, 4> b_in(B_in);
     FillInputs(b, &b_control_edges, &b_in);
 
     // Shouldn't merge if a and b have different control edges.
@@ -1438,7 +1534,7 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     CHECK_EQ(succ->in_edges().size(), 2);
     Node* oper3_mkl = nullptr;  // Mkl tensor corresponding to oper3
     int oper3_mkl_slot = 0;     // For dummy MKL tensor node, output slot is 0.
-    GetDummyMklTensorNode(g, &oper3_mkl, succ);  // Get dummy Mkl tensor node
+    GetDummyMklTensorNode(g, &oper3_mkl, pred);  // Get dummy Mkl tensor node
     // as BiasAdd does not have Mkl tensor as input.
     CHECK_NOTNULL(oper3_mkl);
 
@@ -1483,9 +1579,38 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     // Set the Mkl layer label for this op.
     new_node->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
+    // Incoming data edges from 'pred' node and 'succ' node to new 'new_node'
+    // node are already copied in BuildNode. We handle control edges now.
+    for (const Edge* e : pred->in_edges()) {
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(e->src(), new_node));
+      }
+    }
+    for (const Edge* e : succ->in_edges()) {
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(e->src(), new_node));
+      }
+    }
+
     // Incoming edges are fixed, we will fix the outgoing edges now.
+    // First, we will fix outgoing control edges from 'pred' node.
+    // We don't need to handle outgoing data edges from 'pred' node
+    // because pred has only 1 output going to succ node (we enforced
+    // this check for merge already).
+    for (const Edge* e : pred->out_edges()) {
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(new_node, e->dst()));
+      }
+    }
+
+    // Second, we will fix outgoing control and data edges from 'succ' node.
     for (const Edge* e : succ->out_edges()) {
-      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(new_node, e->dst()));
+      } else {
+        CHECK_NOTNULL((*g)->AddEdge(new_node, e->src_output(), e->dst(),
+                                  e->dst_input()));
+      }
     }
 
     // Copy device assigned to old node to new node.
@@ -1550,18 +1675,22 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
             "data_format or T attribute or devices of BiasAddGrad and "
             "Conv2D do not match. Will skip node rewrite optimization");
       }
+    } else if (orig_node->type_string() == csinfo_.bias_add_grad &&
+               ri->new_name == csinfo_.matmul) {
+      // When BiasAddGrad has MatMul in context, we do not do any rewrite
+      // and leave BiasAddGrad as it is. But we check for this condition
+      // when we check for node rewrite rule. So we should not even come
+      // here for MatMul. So we will fail now.
+        return Status(
+            error::Code::INVALID_ARGUMENT,
+            "No rewrite is required for BiasAddGrad for MatMul context.");
     }
   }
 
   // Get all inputs.
-  const int num = orig_node->in_edges().size();
-  // Check the number of inputs against the user-specified value for non-vararg
-  // nodes.
-  if (!IsVarArgNode(orig_node)) {
-    CHECK_EQ(num, ri->num_ins);
-  }
+  const int num_inputs = orig_node->in_edges().size();
   gtl::InlinedVector<Node*, 4> control_edges;
-  gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num);
+  gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num_inputs);
   FillInputs(orig_node, &control_edges, &inputs);
 
   // Build new node. We use same name as original node, but change the op name.
@@ -1596,8 +1725,15 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
   TF_CHECK_OK(nb.Finalize(&**g, &new_node));
   CHECK_NOTNULL(new_node);
 
-  // Incoming edges from 'orig_node' node to new 'new_node' node are already
-  // copied in BuildNode. Copy outgoing edges from 'orig_node' node to new
+  // Incoming data edges from 'orig_node' node to new 'new_node' node are
+  // already copied in BuildNode. We need to handle control edges now.
+  for (const Edge* e : orig_node->in_edges()) {
+    if (e->IsControlEdge()) {
+      CHECK_NOTNULL((*g)->AddControlEdge(e->src(), new_node));
+    }
+  }
+
+  // Copy outgoing edges from 'orig_node' node to new
   // 'new_node' node, since the output also follows same ordering among
   // Tensorflow tensors and Mkl tensors. We need to connect Tensorflow
   // tensors appropriately. Specifically, nth output of the original node
@@ -1605,15 +1741,12 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
   // of the tensors. For the contiguous ordering of the tensors, it will be n.
   // GetTensorDataIndex provides this mapping function.
   for (const Edge* e : orig_node->out_edges()) {
-    // We need to handle control-edges by using their original slot number.
-    // Generally, -1 is reserved for control slot.
-    if (e->src_output() < 0) {
-      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
+    if (e->IsControlEdge()) {
+      CHECK_NOTNULL((*g)->AddControlEdge(new_node, e->dst()));
     } else {
-      (*g)->AddEdge(
-          new_node,
-          GetTensorDataIndex(e->src_output(), e->src()->num_outputs()),
-          e->dst(), e->dst_input());
+      CHECK_NOTNULL((*g)->AddEdge(new_node, GetTensorDataIndex(e->src_output(),
+                            e->src()->num_outputs()),
+                    e->dst(), e->dst_input()));
     }
   }
 
@@ -1640,8 +1773,8 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n,
   bool is_matching_cinfo_found = false;
   std::vector<const ContextInfo*> mci;
   for (auto ci = cinfo_.cbegin(); ci != cinfo_.cend(); ++ci) {
-    if (n->type_string() == ci->node) {
-      mci.push_back(&*ci);
+    if (n->type_string() == (*ci)->node) {
+      mci.push_back(*ci);
       is_matching_cinfo_found = true;
     }
   }
@@ -1701,9 +1834,10 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n,
   return nullptr;
 }
 
-bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n) {
+bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n,
+                                               const ContextInfo* c) {
   const Node* fwd_node = nullptr;
-  return SearchMatchingContext(n, &fwd_node) != nullptr;
+  return SearchMatchingContext(n, &fwd_node) == c;
 }
 
 const MklLayoutRewritePass::RewriteInfo*
@@ -1719,18 +1853,29 @@ MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
     return nullptr;
   }
 
-  if (!mkl_op_registry::IsMklOp(GetMklOpName(n->type_string()), T)) {
-    return nullptr;
+  // BiasAddGrad is not an Mkl layer, so we make an exception for it.
+  if (n->type_string() != csinfo_.bias_add_grad) {
+    if (!mkl_op_registry::IsMklOp(GetMklOpName(n->type_string()), T)) {
+      return nullptr;
+    }
   }
 
   // We support 2 types of node rewrites:
-  // 1. Rewriting BiasAddGrad depending on its context.
+  // 1. Rewriting BiasAddGrad depending on its MklConv2DWithBias context.
   // 2. Rewriting an op to Mkl op always
   // We return true if any of these 2 conditions is met.
 
   // Find matching RewriteInfo and then check that rewrite rule applies.
   for (auto ri = rinfo_.cbegin(); ri != rinfo_.cend(); ++ri) {
-    if (n->type_string().compare(ri->name) == 0 && ri->rewrite_rule(n)) {
+    if (n->type_string().compare(ri->name) == 0 &&
+        ri->rewrite_rule(n, ri->context)) {
+      // If we are rewriting BiasAddGrad into BiasAddGrad for MatMul context,
+      // then we just return directly.
+      if (n->type_string() == csinfo_.bias_add_grad &&
+          ri->context->fwd == csinfo_.matmul &&
+          ri->new_name == csinfo_.bias_add_grad) {
+        return nullptr;
+      }
       return &*ri;
     }
   }
@@ -1753,7 +1898,8 @@ bool MklLayoutRewritePass::RunPass(std::unique_ptr<Graph>* g) {
   GetReversePostOrder(**g, &order);  // This will give us topological sort.
 
   for (Node* n : order) {
-    if (!n->IsOp()) {
+    // If node is not an op or it cannot run on CPU device, then skip.
+    if (!n->IsOp() || !CanOpRunOnCPUDevice(n)) {
       continue;
     }
 
@@ -1801,18 +1947,31 @@ bool RunMklLayoutRewritePass(std::unique_ptr<Graph>* g) {
   return MklLayoutRewritePass().RunPass(g);
 }
 
-Status MklLayoutRewritePass::Run(const GraphOptimizationPassOptions& options) {
-  if (options.graph == nullptr) {
+Status MklLayoutRewritePass::Run(
+  const GraphOptimizationPassOptions& options) {
+  if (options.graph == nullptr && options.partition_graphs == nullptr) {
     return Status::OK();
   }
 
-  // Get the ownership of graph
-  std::unique_ptr<Graph>* g = std::move(options.graph);
-
-  RunPass(g);
-
-  // Return the ownership of graph back
-  options.graph->reset(g->release());
+  auto process_graph = [&](std::unique_ptr<Graph>* g) {
+    // Get the ownership of a graph
+    std::unique_ptr<Graph>* ng = std::move(g);
+    RunPass(ng);
+    // Return the ownership of a graph back
+    g->reset(ng->release());
+  };
+
+  if (kMklLayoutRewritePassGroup !=
+      OptimizationPassRegistry::POST_PARTITIONING) {
+    // For any pre-partitioning phase, a graph is stored in options.graph.
+    process_graph(options.graph);
+  } else {
+    // For post partitioning phase, graphs are stored in
+    // options.partition_graphs.
+    for (auto& pg : *options.partition_graphs) {
+      process_graph(&pg.second);
+    }
+  }
 
   return Status::OK();
 }
diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc
index 6e72baf84e..3c4a5263af 100644
--- a/tensorflow/core/graph/mkl_layout_pass_test.cc
+++ b/tensorflow/core/graph/mkl_layout_pass_test.cc
@@ -39,7 +39,11 @@ limitations under the License.
 namespace tensorflow {
 namespace {
 
-static void InitGraph(const string& s, Graph* graph) {
+const char kCPUDevice[] = "/job:a/replica:0/task:0/cpu:0";
+const char kGPUDevice[] = "/job:a/replica:0/task:0/gpu:0";
+
+static void InitGraph(const string& s, Graph* graph,
+                      const string& device = kCPUDevice) {
   GraphDef graph_def;
 
   auto parser = protobuf::TextFormat::Parser();
@@ -47,14 +51,18 @@ static void InitGraph(const string& s, Graph* graph) {
   CHECK(parser.MergeFromString(s, &graph_def)) << s;
   GraphConstructorOptions opts;
   TF_CHECK_OK(ConvertGraphDefToGraph(opts, graph_def, graph));
+
+  for (Node* node : graph->nodes()) {
+    node->set_assigned_device_name(device);
+  }
 }
 
 class MklLayoutPassTest : public ::testing::Test {
  public:
   MklLayoutPassTest() : graph_(OpRegistry::Global()) {}
 
-  void InitGraph(const string& s) {
-    ::tensorflow::InitGraph(s, &graph_);
+  void InitGraph(const string& s, const string& device = kCPUDevice) {
+    ::tensorflow::InitGraph(s, &graph_, device);
     original_ = CanonicalGraphString(&graph_);
   }
 
@@ -114,7 +122,8 @@ REGISTER_OP("InputList").Output("o: N * float").Attr("N: int").SetIsStateful();
 REGISTER_OP("HalfInput").Output("o: half").SetIsStateful();
 REGISTER_OP("Int32Input").Output("o: int32").SetIsStateful();
 REGISTER_OP("_MklInput").Output("o: uint8").SetIsStateful();
-REGISTER_OP("_MklInput2").Output("o: uint8").Output("o1: uint8").SetIsStateful();
+REGISTER_OP("_MklInput2").Output("o: uint8")
+                        .Output("o1: uint8").SetIsStateful();
 
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to node merge optiimization
@@ -162,8 +171,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);E(_MklConv2DWithBias);"
-            "M(_MklInput);N(_MklInput);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
-            "DMT/_0->E:5;E->Z;M->E:3;N->E:4;Y->Z:1");
+            "M(_MklInput);N(_MklInput);Y(Input);Z(Sub)|A->E;"
+            "A:control->DMT/_0:control;B->E:1;D->E:2;DMT/_0->E:5;E->Z;M->E:3;"
+            "N->E:4;Y->Z:1");
 }
 
 // C=_MklConv2D(A,M:1,B,N:1); E=BiasAdd(C,D); Z=Sub(E,Y) (for interleaved)
@@ -194,8 +204,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);E(_MklConv2DWithBias);"
-            "M(_MklInput2);N(_MklInput2);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
-            "DMT/_0->E:5;E->Z;M:1->E:3;N:1->E:4;Y->Z:1");
+            "M(_MklInput2);N(_MklInput2);Y(Input);Z(Sub)|A->E;"
+            "A:control->DMT/_0:control;B->E:1;D->E:2;DMT/_0->E:5;E->Z;"
+            "M:1->E:3;N:1->E:4;Y->Z:1");
 }
 
 // C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
@@ -226,8 +237,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);E(_MklConv2DWithBias);Y(Input);Z(Sub)|"
-            "A->E;B->E:1;D->E:2;DMT/_0->E:3;DMT/_1->E:4;DMT/_2->E:5;"
-            "E->Z;Y->Z:1");
+            "A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;B->E:1;D->E:2;DMT/_0->E:3;DMT/_1->E:4;"
+            "DMT/_2->E:5;E->Z;Y->Z:1");
 }
 
 // Graph contains only _MklConv2D, no AddBias.
@@ -330,9 +342,6 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_AttrMismatch) {
             "N(_MklInput)|A->C;B->C:1;C->E;D->E:1;M->C:2;N->C:3");
 }
 
-// Disabling Conv2DBackpropBias test for now as we have disabled rewrite
-// of BiasAddGrad into BackpropBias
-#if 0
 // Test set 2: _MklConv2D..BiasAddGrad -> _MklConv2DWithBiasBackpropBias
 // rewrite tests
 
@@ -361,18 +370,17 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Positive) {
       " input: ['E'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(_MklConv2DWithBias);DMT/_0(Const);"
-            "E(Sub);F(_MklConv2DWithBiasBackpropBias);M(_MklInput);N(_MklInput);"
-            "O(_MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;DMT/_0->F:1;E->F;"
-            "M->D:3;N->D:4;O->D:5");
+            "E(Sub);F(_MklConv2DWithBiasBackpropBias);M(_MklInput);"
+            "N(_MklInput);O(_MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;"
+            "DMT/_0->F:1;E->F;E:control->DMT/_0:control;M->D:3;N->D:4;"
+            "O->D:5");
 }
-#endif
 
-// No _MklConv2D in context, but Conv2D in context.
-// Only Conv2D would be rewritten to _MklConv2D, but no rewrite
-// for BiasAddGrad should happen.
+// No _MklConv2DWithBias in context, but _MklConv2D in context.
+// No rewrite for BiasAddGrad should happen.
 // C=_MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D) (for interleaved)
 // C=_MklConv2D(A,B,M,N); D=Sub(C,A); E=BiasAddGrad(D) (for contiguous)
-TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_No_MklConv2DWithBias) {
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'B' op: 'Input'}"
@@ -507,8 +515,10 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Basic) {
       "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['B', 'C'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(_MklConv2D);D(Mul);DMT/_0(Const);DMT/_1(Const)|"
-            "A->C;B->C:1;B->D;C->D:1;DMT/_0->C:2;DMT/_1->C:3");
+            "A(Input);B(Input);C(_MklConv2D);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->C;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;B->D;C->D:1;DMT/_0->C:2;"
+            "DMT/_1->C:3");
 }
 
 // 2 Conv2D Ops in sequence. Both should get transformed and 1st Conv2D will
@@ -535,7 +545,9 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Positive1) {
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(_MklConv2D);D(_MklConv2D);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;B->C:1;C->D:1;C->E;"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;"
+            "A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;B->C:1;C->D:1;C->E;"
             "C:1->D:3;D->E:1;DMT/_0->C:2;DMT/_1->C:3;DMT/_2->D:2");
 }
 
@@ -558,6 +570,50 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Negative_UnsupportedType) {
             "A->C;B->C:1;B->D;C->D:1");
 }
 
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2DGradFilter_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Int32Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Conv2DBackpropFilter'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Int32Input);C(Input);D(_MklConv2DBackpropFilter);"
+            "DMT/_0(Const);DMT/_1(Const);DMT/_2(Const);E(Mul)|"
+            "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:4;DMT/_2->D:5");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2DGradInput_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Int32Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Conv2DBackpropInput'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['B', 'A', 'C']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Int32Input);C(Input);D(_MklConv2DBackpropInput);"
+            "DMT/_0(Const);DMT/_1(Const);DMT/_2(Const);E(Mul)|"
+            "A->D:1;A->E;B->D;B:control->DMT/_0:control;"
+            "B:control->DMT/_1:control;B:control->DMT/_2:control;C->D:2;"
+            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+}
+
 // Concat Op test: Concat with no Mkl layer feeding it
 TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Basic) {
   InitGraph(
@@ -572,13 +628,14 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Basic) {
       "node { name: 'D' op: 'Concat'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'N'                value { i: 2 } }"
-      " input: ['A', 'B']}"
+      " input: ['A', 'B:0', 'B:1']}"
       "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Const);B(InputList);C(Input);D(_MklConcat);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D;B->D:1;B->D:2;C->E;"
-            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;A:control->DMT/_2:control;B->D:1;"
+            "B:1->D:2;C->E;D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
 }
 
 // Concat with 2 Mkl layers feeding it
@@ -616,9 +673,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_Mkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(_MklConv2D);"
-            "F(_MklConv2D);G(Const);H(_MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "F(_MklConv2D);G(Const);H(_MklConcat);I(Mul)|A->E;A->I;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "B->E:1;C->F;C:control->DMT/_0:control;C:control->DMT/_1:control;"
             "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
-            "DMT/_4->H:3;E->H:1;E:1->H:4;F->H:2;F:1->H:5;G->H;H->I:1");
+            "DMT/_4->H:3;E->H:1;E:1->H:4;F->H:2;F:1->H:5;G->H;"
+            "G:control->DMT/_4:control;H->I:1");
 }
 
 // Concat with 1 Mkl and 1 non-Mkl layer feeding it
@@ -651,12 +711,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_MixedMkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);E(_MklConv2D);F(Mul);G(Const);"
-            "H(_MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "H(_MklConcat);I(Mul)|A->E;A->I;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
             "DMT/_1->E:3;DMT/_2->H:3;DMT/_3->H:5;E->H:1;E:1->H:4;F->H:2;"
-            "G->H;H->I:1");
+            "G->H;G:control->DMT/_2:control;G:control->DMT/_3:control;H->I:1");
 }
 
-#if 0
 // ConcatV2 Op test: ConcatV2 with no Mkl layer feeding it
 TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Basic) {
   InitGraph(
@@ -676,11 +736,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Basic) {
       "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Const);B(InputList);C(Input);D(_MklConcat);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D:2;B->D;B:1->D:1;C->E;"
-            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+            "A(Const);B(InputList);C(Input);D(_MklConcatV2);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D:2;B->D;B:1->D:1;"
+            "B:control->DMT/_0:control;B:control->DMT/_1:control;"
+            "B:control->DMT/_2:control;C->E;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:4;DMT/_2->D:5");
 }
-#endif
 
 // ConcatV2 with 2 Mkl layers feeding it
 TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_Mkl) {
@@ -718,9 +779,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_Mkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(_MklConv2D);"
-            "F(_MklConv2D);G(Const);H(_MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "F(_MklConv2D);G(Const);H(_MklConcatV2);I(Mul)|A->E;A->I;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;B->E:1;C->F;"
+            "C:control->DMT/_0:control;C:control->DMT/_1:control;"
             "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
-            "DMT/_4->H:5;E->H;E:1->H:3;F->H:1;F:1->H:4;G->H:2;H->I:1");
+            "DMT/_4->H:5;E->H;E:1->H:3;E:control->DMT/_4:control;F->H:1;"
+            "F:1->H:4;G->H:2;H->I:1");
 }
 
 // ConcatV2 with 1 Mkl and 1 non-Mkl layer feeding it
@@ -754,11 +818,175 @@ TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_MixedMkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);E(_MklConv2D);F(Mul);G(Const);"
-            "H(_MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
-            "DMT/_1->E:3;DMT/_2->H:4;DMT/_3->H:5;E->H;E:1->H:3;F->H:1;"
+            "H(_MklConcatV2);I(Mul)|A->E;A->I;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "DMT/_1->E:3;DMT/_2->H:4;DMT/_3->H:5;E->H;E:1->H:3;"
+            "E:control->DMT/_2:control;E:control->DMT/_3:control;F->H:1;"
             "G->H:2;H->I:1");
 }
 
+TEST_F(MklLayoutPassTest, NodeRewrite_Relu_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Relu'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklRelu);C(Mul);DMT/_0(Const)|A->B;A->C;"
+            "A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ReluGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'ReluGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(_MklReluGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->C;A->D;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;C->D:1;DMT/_0->C:2;DMT/_1->C:3");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ReluReluGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Relu'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'ReluGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklRelu);C(_MklReluGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->B;A->C;A->D;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;B:1->C:3;C->D:1;DMT/_0->B:1;"
+            "DMT/_1->C:2");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPool_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'AvgPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklAvgPool);C(Mul);DMT/_0(Const)|A->B;A->C;"
+            "A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPoolGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Int32Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'AvgPoolGrad' "
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['B', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Int32Input);B(Input);C(_MklAvgPoolGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->C;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;B->D;C->D:1;DMT/_0->C:2;"
+            "DMT/_1->C:3");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPoolAvgPoolGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'I' op: 'Int32Input'}"
+      "node { name: 'B' op: 'AvgPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'AvgPoolGrad' "
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['I', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklAvgPool);C(_MklAvgPoolGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const);I(Int32Input)|A->B;A->D;A:control->DMT/_0:control;"
+            "B->C:1;B:1->C:3;C->D:1;DMT/_0->B:1;DMT/_1->C:2;I->C;"
+            "I:control->DMT/_1:control");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_FusedBatchNormGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'FusedBatchNormGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'epsilon'      value { f: 0.0001 } }"
+      " attr { key: 'is_training'  value { b: true } }"
+      " input: ['A', 'B', 'C', 'D', 'E'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'F'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Input);"
+            "F(_MklFusedBatchNormGrad);G(Mul)|A->F;A->G;"
+            "A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->F:1;C->F:2;D->F:3;"
+            "DMT/_0->F:5;DMT/_1->F:6;DMT/_2->F:7;DMT/_3->F:8;DMT/_4->F:9;"
+            "E->F:4;F->G:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_FusedBatchNorm_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'FusedBatchNorm'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'epsilon'      value { f: 0.0001 } }"
+      " attr { key: 'is_training'  value { b: true } }"
+      " input: ['A', 'B', 'C', 'D', 'E'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'F'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Input);"
+            "F(_MklFusedBatchNorm);G(Mul)|A->F;A->G;"
+            "A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->F:1;C->F:2;D->F:3;"
+            "DMT/_0->F:5;DMT/_1->F:6;DMT/_2->F:7;DMT/_3->F:8;DMT/_4->F:9;"
+            "E->F:4;F->G:1");
+}
+
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to rewriting node for workspace edges
 /////////////////////////////////////////////////////////////////////
@@ -802,13 +1030,13 @@ TEST_F(MklLayoutPassTest, MaxPoolLRN_Positive) {
       "node { name: 'H' op: 'Input'}"
       "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['H', 'G'] }");
-  EXPECT_EQ(
-      DoMklLayoutOptimizationPass(),
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
       "A(Input);B(_MklLRN);C(_MklMaxPool);D(Input);DMT/_0(Const);DMT/_1(Const);"
-      "DMT/_2(Const);E(_MklMaxPoolGrad);F(Input);G(_MklLRNGrad);H(Input);I(Mul)|"
-      "A->B;B->C;B->E;B->G:2;B:1->G:3;B:2->C:1;B:2->E:4;B:2->G:6;B:3->G:7;"
-      "C->E:1;C:1->E:3;C:2->E:5;C:3->E:7;D->E:2;DMT/_0->B:1;DMT/_1->E:6;"
-      "DMT/_2->G:5;E->G;E:1->G:4;F->G:1;G->I:1;H->I");
+      "DMT/_2(Const);E(_MklMaxPoolGrad);F(Input);G(_MklLRNGrad);H(Input);"
+      "I(Mul)|A->B;A:control->DMT/_0:control;B->C;B->E;B->G:2;B:1->G:3;"
+      "B:2->C:1;B:2->E:4;B:2->G:6;B:3->G:7;B:control->DMT/_1:control;C->E:1;"
+      "C:1->E:3;C:2->E:5;C:3->E:7;D->E:2;DMT/_0->B:1;DMT/_1->E:6;DMT/_2->G:5;"
+      "E->G;E:1->G:4;E:control->DMT/_2:control;F->G:1;G->I:1;H->I");
 }
 
 /* Test LRN->LRNGrad replacement by workspace nodes. */
@@ -838,8 +1066,9 @@ TEST_F(MklLayoutPassTest, LRN_Positive) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);E(_MklLRNGrad);F(Mul)|"
-            "A->B;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;C->E;C->F;D->E:1;"
-            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:5;E->F:1");
+            "A->B;A:control->DMT/_0:control;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;"
+            "C->E;C->F;C:control->DMT/_1:control;C:control->DMT/_2:control;"
+            "D->E:1;DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:5;E->F:1");
 }
 
 /* Test LRN->LRNGrad replacement when only one of them is present. */
@@ -858,7 +1087,7 @@ TEST_F(MklLayoutPassTest, LRN_Negative1) {
       " input: ['A', 'B'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklLRN);C(Mul);DMT/_0(Const)|"
-            "A->B;A->C;B->C:1;DMT/_0->B:1");
+            "A->B;A->C;A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
 }
 
 /* Test LRN->LRNGrad replacement when only one of them is present. */
@@ -880,8 +1109,10 @@ TEST_F(MklLayoutPassTest, LRN_Negative2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(_MklLRNGrad);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
-            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
-            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+            "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:7;DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
 }
 
 /* Test LRN->LRNGrad negative case, where single LRN feeds
@@ -920,9 +1151,13 @@ TEST_F(MklLayoutPassTest, LRN_Negative3) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);DMT/_5(Const);"
-            "DMT/_6(Const);E(_MklLRNGrad);F(_MklLRNGrad);G(Mul)|A->B;B->E:2;"
-            "B->F:1;B:1->E:3;B:2->E:6;B:2->F:5;B:3->E:7;C->E;C->F;D->E:1;"
-            "D->F:2;DMT/_0->B:1;DMT/_1->F:3;DMT/_2->F:7;DMT/_3->F:4;"
+            "DMT/_6(Const);E(_MklLRNGrad);F(_MklLRNGrad);G(Mul)|A->B;"
+            "A:control->DMT/_0:control;B->E:2;"
+            "B->F:1;B:1->E:3;B:2->E:6;B:2->F:5;B:3->E:7;C->E;C->F;"
+            "C:control->DMT/_1:control;C:control->DMT/_2:control;"
+            "C:control->DMT/_3:control;C:control->DMT/_4:control;"
+            "C:control->DMT/_5:control;C:control->DMT/_6:control;"
+            "D->E:1;D->F:2;DMT/_0->B:1;DMT/_1->F:3;DMT/_2->F:7;DMT/_3->F:4;"
             "DMT/_4->F:6;DMT/_5->E:4;DMT/_6->E:5;E->G;F->G:1");
 }
 
@@ -951,8 +1186,9 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Positive) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklMaxPool);C(Input);D(Input);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);E(_MklMaxPoolGrad);F(Mul)|"
-            "A->B;B->E:1;B:1->E:3;B:2->E:5;B:3->E:7;C->E;C->F;D->E:2;"
-            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:6;E->F:1");
+            "A->B;A:control->DMT/_0:control;B->E:1;B:1->E:3;B:2->E:5;B:3->E:7;"
+            "C->E;C->F;C:control->DMT/_1:control;C:control->DMT/_2:control;"
+            "D->E:2;DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:6;E->F:1");
 }
 
 // Test MaxPool>MaxPoolGrad replacement when only one of them is present.
@@ -972,7 +1208,7 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative1) {
       " input: ['A', 'B'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklMaxPool);C(Mul);DMT/_0(Const)|"
-            "A->B;A->C;B->C:1;DMT/_0->B:1");
+            "A->B;A->C;A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
 }
 
 // Test MaxPoolGrad replacement when only one of them is present.
@@ -995,8 +1231,374 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(_MklMaxPoolGrad);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
-            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
-            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+            "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:7;DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+}
+
+// Test MaxPool handling for batch-wise pooling (NCHW)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative3) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 2, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for batch-wise pooling (NCHW)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative4) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 2, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative5) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:2, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NCHW)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative6) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:2, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for batch-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative7) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 2, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for batch-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative8) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 2, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative9) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:2} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative10) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+/////////////////////////////////////////////////////////////////////
+
+// Single Conv2D Op on GPU device
+// No rewrite should happen
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['B', 'C'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Conv2D);D(Mul)|A->C;B->C:1;B->D;C->D:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'O' op: '_MklInput'}"
+      "node { name: 'D' op: '_MklConv2DWithBias'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C', 'M', 'N', 'O']}"
+      "node { name: 'E' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['D', 'A']}"
+      "node { name: 'F' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['E'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(_MklConv2DWithBias);"
+            "E(Sub);F(BiasAddGrad);M(_MklInput);N(_MklInput);"
+            "O(_MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;E->F;"
+            "M->D:3;N->D:4;O->D:5");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2DGradFilter_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Int32Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Conv2DBackpropFilter'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Int32Input);C(Input);D(Conv2DBackpropFilter);E(Mul)|"
+            "A->D;A->E;B->D:1;C->D:2;D->E:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_Relu_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Relu'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Relu);C(Mul)|A->B;A->C;B->C:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ReluGrad_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'ReluGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(ReluGrad);D(Mul)|A->C;A->D;B->C:1;C->D:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_MaxPool_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPool_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'AvgPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(AvgPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Concat Op test: Concat with no Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['A', 'B:0', 'B:1']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(Concat);E(Mul)|A->D;"
+            "B->D:1;B:1->D:2;C->E;D->E:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['B:0', 'B:1', 'A']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(ConcatV2);E(Mul)|"
+            "A->D:2;B->D;B:1->D:1;C->E;D->E:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_FusedBatchNorm_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'FusedBatchNorm'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'epsilon'      value { f: 0.0001 } }"
+      " attr { key: 'is_training'  value { b: true } }"
+      " input: ['A', 'B', 'C', 'D', 'E'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'F'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);E(Input);"
+            "F(FusedBatchNorm);G(Mul)|A->F;A->G;B->F:1;C->F:2;D->F:3;"
+            "E->F:4;F->G:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_DeviceTest) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'M', 'N']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['C', 'D'] }"
+      "node { name: 'Y' op: 'Input'}"
+      "node { name: 'Z' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['E', 'Y']}", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(_MklConv2D);D(Input);E(BiasAdd);"
+            "M(_MklInput);N(_MklInput);Y(Input);Z(Sub)|A->C;"
+            "B->C:1;C->E;D->E:1;E->Z;M->C:2;N->C:3;Y->Z:1");
 }
 
 /////////////////////////////////////////////////////////////////////
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 55c280719c..590b3d030f 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -98,12 +98,13 @@ class MklToTfConversionPass : public GraphOptimizationPass {
   Status InsertConversionNodeOnEdge(std::unique_ptr<Graph>* g, Edge*);
 };
 
-// We register MklToTf insertion for phase 1 in post-partition grouping.
-// We register this pass after partitioning so that we get a complete
-// picture of inputs and outputs of the nodes in the graphs.
+// We register MklToTf insertion for phase 2 in post-partition grouping
+// because we register MklLayoutRewritePass for phase 1 in post-partition
+// grouping. We register this pass after partitioning so that we get a
+// complete picture of inputs and outputs of the nodes in the graphs.
 const OptimizationPassRegistry::Grouping kMklTfConvPassGroup =
     OptimizationPassRegistry::POST_PARTITIONING;
-REGISTER_OPTIMIZATION(kMklTfConvPassGroup, 1, MklToTfConversionPass);
+REGISTER_OPTIMIZATION(kMklTfConvPassGroup, 2, MklToTfConversionPass);
 
 Status MklToTfConversionPass::InsertConversionNodeOnEdge(
     std::unique_ptr<Graph>* g, Edge* e) {
@@ -121,10 +122,12 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
   string data_format;
 
   TF_CHECK_OK(GetNodeAttr(src->def(), "T", &src_datatype));
-  TF_CHECK_OK(GetNodeAttr(dst->def(), "T", &dst_datatype));
-  if (src_datatype != dst_datatype) {
-    string err_msg = "T attribute of " + src->name() + " and " + dst->name() +
-                     " do not match. Will not insert" +
+  bool dst_dtype_found = GetNodeAttr(dst->def(), "T", &dst_datatype) ==
+                          Status::OK();
+  // We compare source and destination datatypes only when both are found.
+  if (dst_dtype_found && (src_datatype != dst_datatype)) {
+    string err_msg = "T attribute of " + src->name() + " and " +
+                      dst->name() + " do not match. Will not insert" +
                      " MklToTf node in such case.";
     return Status(error::Code::INVALID_ARGUMENT, err_msg.c_str());
   }
@@ -202,18 +205,19 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
             << src->type_string() << " and " << dst->type_string();
 
     // Let's get source and destination data type.
-    DataType src_datatype = DT_INVALID;
-    if (GetNodeAttr(src->def(), "T", &src_datatype) != Status::OK()) {
-      continue;
-    }
     // We cannot check datatype on destination node because destination node
     // may not be Mkl node.
-    DataType dst_datatype = DT_INVALID;
-    GetNodeAttr(dst->def(), "T", &dst_datatype);
+    DataType src_datatype;
+    DataType dst_datatype;
+    bool src_is_mkl_op = (GetNodeAttr(src->def(), "T", &src_datatype) ==
+                            Status::OK() &&
+                          IsMklSupportedOp(src->type_string(), src_datatype));
+    bool dst_is_mkl_op = (GetNodeAttr(dst->def(), "T", &dst_datatype) ==
+                            Status::OK() &&
+                          IsMklSupportedOp(dst->type_string(), dst_datatype));
 
     // Check if src with is Mkl-compliant, while dst is not Mkl-compliant.
-    if (IsMklSupportedOp(src->type_string(), src_datatype) &&
-        !IsMklSupportedOp(dst->type_string(), dst_datatype)) {
+    if (src_is_mkl_op && !dst_is_mkl_op) {
       VLOG(1) << "MklToTfConversionPass: Scheduled nodes " << src->name()
               << " and " << dst->name() << " for inserting conversion nodes";
       candidate_edges.push_back(const_cast<Edge*>(e));
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
index bd2cb0989c..90bef11164 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
@@ -149,7 +149,7 @@ TEST_F(MklToTfConversionPass, Positive) {
         " input: ['C', 'D']}");
     EXPECT_EQ(DoRunMklToTfConversionPass(),
               "A(Input);B(Input);C(_MklConv2D);D(Input);E(Sub);M(_MklInput);"
-              "_Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:2;C->Mkl2Tf/_0;"
+              "Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:2;C->Mkl2Tf/_0;"
               "C:1->Mkl2Tf/_0:1;D->E:1;M->C:1;Mkl2Tf/_0->E;N->C:3");
   } else {
     CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
@@ -172,7 +172,7 @@ TEST_F(MklToTfConversionPass, Positive) {
         " input: ['C', 'D']}");
     EXPECT_EQ(DoRunMklToTfConversionPass(),
               "A(Input);B(Input);C(_MklConv2D);D(Input);E(Sub);M(_MklInput);"
-              "_Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:1;C->Mkl2Tf/_0;"
+              "Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:1;C->Mkl2Tf/_0;"
               "C:1->Mkl2Tf/_0:1;D->E:1;M->C:2;Mkl2Tf/_0->E;N->C:3");
   }
 }
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
index 27930c44a6..094ab1c6c6 100644
--- a/tensorflow/core/kernels/mkl_concat_op.cc
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -265,6 +265,7 @@ class MklConcatOp : public OpKernel {
           s.GetDimension() > 0 ? s.GetSizes()[concat_dim] : 1;
     }
     mkl_context.MklCreateInputLayouts(context, input_shapes);
+    OP_REQUIRES_OK(context, context->status());
 
     CHECK_EQ(dnnConcatCreate_F32(&mkl_context.prim_concat, NULL, N,
                                  &mkl_context.lt_inputs[0]),
@@ -316,12 +317,14 @@ class MklConcatOp : public OpKernel {
 
     mkl_context.mkl_tmp_tensors.resize(N);
     mkl_context.MklPrepareConcatInputs(context, input_tensors);
+    OP_REQUIRES_OK(context, context->status());
 
     // Execute primitive.
     CHECK_EQ(dnnExecute_F32(mkl_context.prim_concat, mkl_context.concat_res),
              E_SUCCESS);
 
     mkl_context.MklCleanup();
+    OP_REQUIRES_OK(context, context->status());
   }
 
  private:
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
index 8a1006a8e9..d4364d31e4 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -38,9 +38,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
+#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
-#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -252,7 +252,7 @@ class MklConv2DCustomBackpropBiasOp : public OpKernel {
 };
 
 #define REGISTER_CPU_KERNELS(T)                                     \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBiasBackpropBias")     \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBiasBackpropBias")    \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
index 6381b527a1..dc6b88e953 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -37,9 +37,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
+#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
-#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -266,8 +266,11 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
     int input_offsets[2];
     size_t conv_strides[2];
     MklShape input_shape, grad_filter_shape, out_backprop_shape;
-    dnnPrimitive_t prim_conv_bwdfilter, convert_bwdfilter;
-    dnnLayout_t lt_input, lt_grad_filter, lt_out_backprop;
+    dnnPrimitive_t prim_conv_bwdfilter = nullptr;
+    dnnPrimitive_t convert_bwdfilter = nullptr;
+    dnnLayout_t lt_input = nullptr;
+    dnnLayout_t lt_grad_filter = nullptr;
+    dnnLayout_t lt_out_backprop = nullptr;
     void* conv_res[dnnResourceNumber];
 
     void MklCleanup() {
@@ -409,7 +412,7 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
 };
 
 #define REGISTER_MKL_FILTER_KERNELS(T)                              \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropFilter")           \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropFilter")          \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index 638ce4c024..c97f1dd7b7 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -23,8 +23,6 @@ limitations under the License.
 #define EIGEN_USE_THREADS
 #include <algorithm>
 #include <vector>
-#include "third_party/mkl/include/mkl_dnn.h"
-#include "third_party/mkl/include/mkl_dnn_types.h"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -42,6 +40,8 @@ limitations under the License.
 #include "tensorflow/core/util/tensor_format.h"
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
 
 namespace tensorflow {
 
@@ -342,7 +342,7 @@ class MklConv2DCustomBackpropInputOp : public OpKernel {
 };
 
 #define REGISTER_MKL_CPU_KERNELS(T)                                 \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropInput")            \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropInput")           \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index b818819b02..76b9f1798d 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -36,9 +36,9 @@ limitations under the License.
 #include "tensorflow/core/util/padding.h"
 #include "tensorflow/core/util/tensor_format.h"
 
+#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
-#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -98,19 +98,18 @@ class MklConv2DOp : public OpKernel {
                                         filter.shape().DebugString()));
 
     for (int i = 0; i < 3; i++) {
-      OP_REQUIRES(
-          context,
-          FastBoundsCheck(filter.dim_size(i), std::numeric_limits<int>::max()),
-          errors::InvalidArgument("filter too large"));
+      OP_REQUIRES(context, FastBoundsCheck(filter.dim_size(i),
+                                           std::numeric_limits<int>::max()),
+                  errors::InvalidArgument("filter too large"));
     }
 
     const int64 input_depth =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'C')
                             : GetTensorDim(input, data_format_, 'C');
-    OP_REQUIRES(context, input_depth == filter.dim_size(2),
-                errors::InvalidArgument(
-                    "input and filter must have the same depth: ", input_depth,
-                    " vs ", filter.dim_size(2)));
+    OP_REQUIRES(
+        context, input_depth == filter.dim_size(2),
+        errors::InvalidArgument("input and filter must have the same depth: ",
+                                input_depth, " vs ", filter.dim_size(2)));
     // The last dimension for filter is out_depth.
     const int out_depth = static_cast<int>(filter.dim_size(3));
 
@@ -119,10 +118,9 @@ class MklConv2DOp : public OpKernel {
     const int64 input_rows_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'H')
                             : GetTensorDim(input, data_format_, 'H');
-    OP_REQUIRES(
-        context,
-        FastBoundsCheck(input_rows_raw, std::numeric_limits<int>::max()),
-        errors::InvalidArgument("Input rows too large"));
+    OP_REQUIRES(context, FastBoundsCheck(input_rows_raw,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("Input rows too large"));
     const int input_rows = static_cast<int>(input_rows_raw);
     const int filter_rows = static_cast<int>(filter.dim_size(0));
 
@@ -131,10 +129,9 @@ class MklConv2DOp : public OpKernel {
     const int64 input_cols_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'W')
                             : GetTensorDim(input, data_format_, 'W');
-    OP_REQUIRES(
-        context,
-        FastBoundsCheck(input_cols_raw, std::numeric_limits<int>::max()),
-        errors::InvalidArgument("Input cols too large"));
+    OP_REQUIRES(context, FastBoundsCheck(input_cols_raw,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("Input cols too large"));
     const int input_cols = static_cast<int>(input_cols_raw);
     const int filter_cols = static_cast<int>(filter.dim_size(1));
 
@@ -142,10 +139,9 @@ class MklConv2DOp : public OpKernel {
     const int64 input_batch_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'N')
                             : GetTensorDim(input, data_format_, 'N');
-    OP_REQUIRES(
-        context,
-        FastBoundsCheck(input_batch_raw, std::numeric_limits<int>::max()),
-        errors::InvalidArgument("batch is too large"));
+    OP_REQUIRES(context, FastBoundsCheck(input_batch_raw,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("batch is too large"));
     const int batch = static_cast<int>(input_batch_raw);
 
     // For now we take the stride from the second and third dimensions only (we
@@ -438,12 +434,12 @@ class MklConv2DOp : public OpKernel {
 };
 
 #define REGISTER_MKL_CPU(T)                                         \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2D")                         \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2D")                        \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
                           MklConv2DOp<CPUDevice, T, false>);        \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBias")                 \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBias")                \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
index edca8e2553..9d050d430a 100644
--- a/tensorflow/core/kernels/mkl_lrn_op.cc
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -104,6 +104,15 @@ class MklLRNOp : public OpKernel {
       return;
     }
 
+    // TODO(inteltf) MKL will support depth radius not equal to 2 in the future
+    if (depth_radius_ != 2) {
+      Tensor converted_tensor =
+          ConvertMklToTF<T>(context, input, mkl_context.input_shape);
+      mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
+                                    beta_, converted_tensor);
+      return;
+    }
+
     if (input_in_mkl_format) {
       // MKL supports normalization over channel dimension only
       if (mkl_context.input_shape.tf_dim_idx(mkl_context.in_dims - 1) ==
@@ -112,8 +121,10 @@ class MklLRNOp : public OpKernel {
             static_cast<dnnLayout_t>(mkl_context.input_shape.GetCurLayout());
         workspace_enabled_ = true;
       } else {
+        Tensor converted_tensor =
+            ConvertMklToTF<T>(context, input, mkl_context.input_shape);
         mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
-                                      beta_, input);
+                                      beta_, converted_tensor);
         return;
       }
     }
@@ -267,7 +278,7 @@ class MklLRNOp : public OpKernel {
     }
 
     // Fallback implementation - Taken from lrn_op.cc
-    // TODO(intelft) Check if we can use EigenLRNOp directly instead of making a
+    // TODO(inteltf) Check if we can use EigenLRNOp directly instead of making a
     // copy.
     void MklDefaultToEigen(OpKernelContext* context, int depth_radius_,
                            float bias_, float alpha_, float beta_,
@@ -378,6 +389,12 @@ class MklLRNGradOp : public OpKernel {
       mkl_context.MklDefaultToEigen(context);
       return;
     }
+
+    if (depth_radius_ != 2) {
+      mkl_context.MklDefaultToEigen(context);
+      return;
+    }
+
     if (ingrad_in_mkl_format || inimage_in_mkl_format) {
       const MklShape* tmp_mkl_shape = (ingrad_in_mkl_format)
                                           ? &mkl_context.ingrad_shape
@@ -489,14 +506,11 @@ class MklLRNGradOp : public OpKernel {
     MklShape ingrad_shape, inimage_shape, outimage_shape;
     dnnPrimitive_t lrn_bwd = nullptr;
     dnnPrimitive_t convert_input = nullptr;
-    /* dnnPrimitive_t convert_output; */
     dnnLayout_t lt_input = nullptr;
     dnnLayout_t lt_output = nullptr;
     dnnLayout_t lt_bdw_input = nullptr;
     dnnLayout_t lt_workspace = nullptr;
     dnnLayout_t lt_internal_input = nullptr;
-    /* dnnLayout_t lt_internal_workspace;
-    dnnLayout_t lt_internal_output; */
     void* res_lrn_bwd[dnnResourceNumber];
 
     // prepare mkl input
@@ -619,14 +633,36 @@ class MklLRNGradOp : public OpKernel {
     // copy.
     void MklDefaultToEigen(OpKernelContext* context) {
       // CHECK(false);
-      Tensor in_grads = MklGetInput(context, 0);
-      Tensor in_image = MklGetInput(context, 1);
-      Tensor out_image = MklGetInput(context, 2);
+
+      Tensor in_grads;
+      Tensor in_image;
+      Tensor out_image;
 
       GetMklShape(context, 0, &ingrad_shape);
       GetMklShape(context, 1, &inimage_shape);
       GetMklShape(context, 2, &outimage_shape);
 
+      if (ingrad_shape.IsMklTensor()) {
+        in_grads =
+            ConvertMklToTF<T>(context, MklGetInput(context, 0), ingrad_shape);
+      } else {
+        in_grads = MklGetInput(context, 0);
+      }
+
+      if (inimage_shape.IsMklTensor()) {
+        in_image =
+            ConvertMklToTF<T>(context, MklGetInput(context, 1), inimage_shape);
+      } else {
+        in_image = MklGetInput(context, 1);
+      }
+
+      if (outimage_shape.IsMklTensor()) {
+        out_image =
+            ConvertMklToTF<T>(context, MklGetInput(context, 2), outimage_shape);
+      } else {
+        out_image = MklGetInput(context, 2);
+      }
+
       const int64 batch = static_cast<int64>(in_grads.dim_size(0));
       const int64 rows = static_cast<int64>(in_grads.dim_size(1));
       const int64 cols = static_cast<int64>(in_grads.dim_size(2));
diff --git a/tensorflow/core/kernels/mkl_matmul_op.cc b/tensorflow/core/kernels/mkl_matmul_op.cc
index 3ba28c13ed..e43b75e250 100644
--- a/tensorflow/core/kernels/mkl_matmul_op.cc
+++ b/tensorflow/core/kernels/mkl_matmul_op.cc
@@ -199,15 +199,13 @@ class MklMatMulOp : public OpKernel {
   }
 };
 
-#define REGISTER_CPU(T)                                                      \
-  REGISTER_KERNEL_BUILDER(                                                   \
-      Name("MatMul").Device(DEVICE_CPU).TypeConstraint<T>("T"),              \
-      MklMatMulOp<CPUDevice, T, false /* cublas, ignored for CPU */>);       \
-  REGISTER_KERNEL_BUILDER(                                                   \
-      Name("MatMul").Device(DEVICE_CPU).TypeConstraint<T>("T").Label("MKL"), \
-      MklMatMulOp<CPUDevice, T, false /* cublas, ignored for CPU */>)
-
-// TODO:Consider template specialization when adding/removing additional types
+#define REGISTER_CPU(T)                                         \
+  REGISTER_KERNEL_BUILDER(                                      \
+      Name("MatMul").Device(DEVICE_CPU).TypeConstraint<T>("T"), \
+      MklMatMulOp<CPUDevice, T, false /* cublas, ignored for CPU */>);
+
+// TODO(inteltf) Consider template specialization when adding/removing
+// additional types
 TF_CALL_float(REGISTER_CPU);
 TF_CALL_double(REGISTER_CPU);
 TF_CALL_complex64(REGISTER_CPU);
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index ba2d347d94..1e0ee258b0 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -276,11 +276,6 @@ class MklMaxPoolingGradOp : public OpKernel {
     mkl_context.pooling_res[dnnResourceDiffSrc] = const_cast<void*>(
         static_cast<const void*>(output_tensor->flat<T>().data()));
 
-    int64 output_size = output_tensor->NumElements();
-    for (int64 i = 0; i < output_size; ++i) {
-      (static_cast<float*>(mkl_context.pooling_res[dnnResourceDiffSrc]))[i] = 0;
-    }
-
     CHECK_EQ(
         dnnExecute_F32(mkl_context.prim_pooling_bwd, mkl_context.pooling_res),
         E_SUCCESS);
diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc
index 25c8359cc5..0c66f73141 100644
--- a/tensorflow/core/kernels/mkl_relu_op.cc
+++ b/tensorflow/core/kernels/mkl_relu_op.cc
@@ -16,17 +16,17 @@ limitations under the License.
 // See docs in ../ops/nn_ops.cc.
 #ifdef INTEL_MKL
 
-#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 
-#include "third_party/mkl/include/mkl_dnn.h"
-#include "third_party/mkl/include/mkl_dnn_types.h"
 #include "tensorflow/core/platform/default/logging.h"
 #include "tensorflow/core/util/mkl_util.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
 
 namespace tensorflow {
 
@@ -194,45 +194,29 @@ class MklReluGradOp : public OpKernel {
 
       void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
       void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
-
-      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
-                   &mkl_lt_internal_grad, prim_relu_bwd, dnnResourceDiffDst),
-               E_SUCCESS);
-
-      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_input,
-                                                prim_relu_bwd, dnnResourceSrc),
-               E_SUCCESS);
-
-      if (!dnnLayoutCompare_F32(mkl_lt_internal_grad, lt_grad)) {
-        AllocTmpBuffer(context, mkl_tmp_grad_buf_tensor, mkl_lt_internal_grad,
-                       &relu_res[dnnResourceDiffDst]);
-        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_grad, lt_grad,
-                                         mkl_lt_internal_grad),
+      dnnPrimitive_t cv_input_to_grad = NULL;
+      Tensor mkl_tmp_buf_tensor;
+      void* mkl_buffer_convert = nullptr;
+
+      // if input and grad are not in the same layout, do a conversion between
+      // them.
+      if (!dnnLayoutCompare_F32(lt_input, lt_grad)) {
+        AllocTmpBuffer(context, &mkl_tmp_buf_tensor, lt_grad,
+                       &mkl_buffer_convert);
+        CHECK_EQ(dnnConversionCreate_F32(&cv_input_to_grad, lt_input, lt_grad),
                  E_SUCCESS);
-        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_grad, user_g,
-                                          relu_res[dnnResourceDiffDst]),
-                 E_SUCCESS);
-        dnnDelete_F32(cv_user_to_reluB_grad);
-      } else {
-        relu_res[dnnResourceDiffDst] = user_g;
-      }
 
-      if (!dnnLayoutCompare_F32(mkl_lt_internal_input, lt_input)) {
-        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
-                       &relu_res[dnnResourceSrc]);
-        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_input, lt_input,
-                                         mkl_lt_internal_input),
-                 E_SUCCESS);
-        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_input, user_i,
-                                          relu_res[dnnResourceSrc]),
+        CHECK_EQ(dnnConversionExecute_F32(cv_input_to_grad, user_i,
+                                          mkl_buffer_convert),
                  E_SUCCESS);
-        dnnDelete_F32(cv_user_to_reluB_input);
+        relu_res[dnnResourceSrc] = mkl_buffer_convert;
+        dnnDelete_F32(cv_input_to_grad);
       } else {
         relu_res[dnnResourceSrc] = user_i;
       }
 
-      dnnLayoutDelete_F32(mkl_lt_internal_input);
-      dnnLayoutDelete_F32(mkl_lt_internal_grad);
+      relu_res[dnnResourceDiffDst] = user_g;
+
     }
 
     void MklCreateInputLayouts(OpKernelContext* context) {
@@ -331,7 +315,7 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
   mkl_context.MklCreateInputLayouts(context);
   float negative_slope = 0.0;
   CHECK_EQ(dnnReLUCreateBackward_F32(&mkl_context.prim_relu_bwd, NULL,
-                                     mkl_context.lt_grad, mkl_context.lt_input,
+                                     mkl_context.lt_grad, mkl_context.lt_grad,
                                      negative_slope),
            E_SUCCESS);
   Tensor mkl_tmp_grad_buf_tensor, mkl_tmp_input_buf_tensor;
@@ -380,12 +364,12 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
 /* Register DNN kernels for supported operations and supported types - right now
  * it is only Relu and f32*/
 #define REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES(type)             \
-  REGISTER_KERNEL_BUILDER(Name("_MklRelu")                           \
+  REGISTER_KERNEL_BUILDER(Name("_MklRelu")                          \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<type>("T")            \
                               .Label(mkl_op_registry::kMklOpLabel), \
                           MklReluOp<CPUDevice, type>);              \
-  REGISTER_KERNEL_BUILDER(Name("_MklReluGrad")                       \
+  REGISTER_KERNEL_BUILDER(Name("_MklReluGrad")                      \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<type>("T")            \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_tfconv_op.cc b/tensorflow/core/kernels/mkl_tfconv_op.cc
index c31ef5c255..588d6874dd 100644
--- a/tensorflow/core/kernels/mkl_tfconv_op.cc
+++ b/tensorflow/core/kernels/mkl_tfconv_op.cc
@@ -106,7 +106,7 @@ class MklToTfOp : public OpKernel {
 ///////////////////////////////////////////////////////////
 
 #define REGISTER_CPU(T)                                             \
-  REGISTER_KERNEL_BUILDER(Name("MklToTf")                           \
+  REGISTER_KERNEL_BUILDER(Name("_MklToTf")                          \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/tools/ci_build/builds/configured b/tensorflow/tools/ci_build/builds/configured
index 25cb51ea7c..9fcf916902 100755
--- a/tensorflow/tools/ci_build/builds/configured
+++ b/tensorflow/tools/ci_build/builds/configured
@@ -28,6 +28,12 @@ set -e
 CONTAINER_TYPE=$( echo "$1" | tr '[:upper:]' '[:lower:]' )
 shift 1
 
+# Enable support for MKL, for Linux only.
+if [[ $(uname) == "Linux" ]]; then
+  export TF_NEED_MKL=1
+  export TF_DOWNLOAD_MKL=1
+fi
+
 # Enable support for Google Cloud Platform (GCP)
 export TF_NEED_GCP=1
 # Enable support for HDFS
diff --git a/tensorflow/tools/ci_build/install/install_deb_packages.sh b/tensorflow/tools/ci_build/install/install_deb_packages.sh
index 6b160bbe03..da1f2199d0 100755
--- a/tensorflow/tools/ci_build/install/install_deb_packages.sh
+++ b/tensorflow/tools/ci_build/install/install_deb_packages.sh
@@ -46,6 +46,7 @@ apt-get install -y --no-install-recommends \
     git \
     libcurl4-openssl-dev \
     libtool \
+    mlocate \
     openjdk-8-jdk \
     openjdk-8-jre-headless \
     pkg-config \
@@ -63,6 +64,9 @@ apt-get install -y --no-install-recommends \
     zip \
     zlib1g-dev
 
+# populate the database
+updatedb
+
 if [[ "$1" != "--without_cmake" ]]; then
   apt-get install -y --no-install-recommends \
     cmake
diff --git a/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh
index 762c531725..d90a1b905d 100755
--- a/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh
+++ b/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh
@@ -28,6 +28,7 @@ export TF_NEED_GCP=0
 export TF_NEED_HDFS=0
 export TF_NEED_CUDA=0
 export TF_NEED_OPENCL=0
+export TF_NEED_MKL=0
 export COMPUTECPP_PATH="/usr/local"
 
 export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
diff --git a/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh b/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh
index 1da5e8c2bf..79973647c1 100755
--- a/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh
+++ b/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh
@@ -29,6 +29,7 @@ export PYTHON_BIN_PATH="/usr/bin/python"
 export TF_NEED_GCP=0
 export TF_NEED_HDFS=0
 export TF_NEED_OPENCL=0
+export TF_NEED_MKL=0
 export COMPUTECPP_PATH="/usr/local"
 
 export PATH="/usr/local/cuda/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
diff --git a/third_party/grpc.BUILD b/third_party/grpc.BUILD
index 1d1e2222de..d776574f79 100644
--- a/third_party/grpc.BUILD
+++ b/third_party/grpc.BUILD
@@ -178,6 +178,7 @@ cc_library(
     ],
     deps = [
     ],
+    linkopts = ["-lpthread"],
 )
 
 cc_library(
@@ -1787,6 +1788,7 @@ cc_library(
         ":grpc_unsecure",
         "//external:protobuf_clib",
     ],
+    linkopts = ["-lpthread"],
 )
 
 cc_library(
diff --git a/third_party/jemalloc.BUILD b/third_party/jemalloc.BUILD
index 8ed13c51a5..b1c639a454 100644
--- a/third_party/jemalloc.BUILD
+++ b/third_party/jemalloc.BUILD
@@ -94,6 +94,9 @@ cc_library(
         "@%ws%//tensorflow:linux_ppc64le": [
             "-lpthread",
         ],
+        "@%ws%//tensorflow:linux_x86_64": [
+            "-lpthread", 
+        ],
         "//conditions:default": [
         ],
     }),
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index d5ab326283..306ac51767 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -1695,6 +1695,7 @@ cc_library(
         ":demangle",
         "@zlib_archive//:zlib",
     ],
+    linkopts = ["-lpthread", "-ldl"],
 )
 
 cc_library(
diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD
index 7e95ebd355..8c86766eff 100644
--- a/third_party/mkl/BUILD
+++ b/third_party/mkl/BUILD
@@ -16,6 +16,7 @@ load(
 cc_library(
     name = "intel_binary_blob",
     srcs = if_mkl([
+        "libdl.so.2",
         "libmklml_intel.so",
         "libiomp5.so",
     ]),
-- 
GitLab


From fd69bb292af7f15cd364e36ead7f596a3c484b2c Mon Sep 17 00:00:00 2001
From: Andrew Harp <andrewharp@google.com>
Date: Thu, 4 May 2017 12:48:11 -0800
Subject: [PATCH 1011/1563] Android demo: Add YUV -> RGB conversion Java
 implementation as fallback if native implementation is not found. This means
 that compiling libtensorflow_demo.so will only be strictly necessary for the
 Detection example (which uses native object tracking). A followup change will
 add graceful degradation in that case too.

Java conversion may be slower depending on the device, but should still be acceptable for demo purposes as the majority of the compute time will still be spent on TF inference passes.

Note that this has no effect on the necessity of libtensorflow_inference.so, which provides the actual TF support. However libtensorflow_inference.so may be added to applications via the prebuilt AAR, so no native compilation is necessary.

Partially addresses #6385
Change: 155121431
---
 .../tensorflow/demo/ClassifierActivity.java   |  3 +-
 .../org/tensorflow/demo/DetectorActivity.java |  3 +-
 .../org/tensorflow/demo/StylizeActivity.java  |  8 +-
 .../demo/TensorFlowMultiBoxDetector.java      |  4 -
 .../demo/TensorFlowYoloDetector.java          |  4 -
 .../org/tensorflow/demo/env/ImageUtils.java   | 88 ++++++++++++++++++-
 6 files changed, 89 insertions(+), 21 deletions(-)

diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/ClassifierActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/ClassifierActivity.java
index b26a231678..bc39126925 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/ClassifierActivity.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/ClassifierActivity.java
@@ -194,13 +194,12 @@ public class ClassifierActivity extends CameraActivity implements OnImageAvailab
           yuvBytes[0],
           yuvBytes[1],
           yuvBytes[2],
-          rgbBytes,
           previewWidth,
           previewHeight,
           yRowStride,
           uvRowStride,
           uvPixelStride,
-          false);
+          rgbBytes);
 
       image.close();
     } catch (final Exception e) {
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java
index 206a99f3e3..cdb6c3fed8 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java
@@ -273,13 +273,12 @@ public class DetectorActivity extends CameraActivity implements OnImageAvailable
           yuvBytes[0],
           yuvBytes[1],
           yuvBytes[2],
-          rgbBytes,
           previewWidth,
           previewHeight,
           yRowStride,
           uvRowStride,
           uvPixelStride,
-          false);
+          rgbBytes);
 
       image.close();
     } catch (final Exception e) {
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/StylizeActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/StylizeActivity.java
index 7634be5c02..7afe2bf541 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/StylizeActivity.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/StylizeActivity.java
@@ -65,10 +65,6 @@ import org.tensorflow.demo.R;
  * Artistic Style" (https://arxiv.org/abs/1610.07629)
  */
 public class StylizeActivity extends CameraActivity implements OnImageAvailableListener {
-  static {
-    System.loadLibrary("tensorflow_demo");
-  }
-
   private static final Logger LOGGER = new Logger();
 
   private static final String MODEL_FILE = "file:///android_asset/stylize_quantized.pb";
@@ -509,17 +505,17 @@ public class StylizeActivity extends CameraActivity implements OnImageAvailableL
       final int yRowStride = planes[0].getRowStride();
       final int uvRowStride = planes[1].getRowStride();
       final int uvPixelStride = planes[1].getPixelStride();
+
       ImageUtils.convertYUV420ToARGB8888(
           yuvBytes[0],
           yuvBytes[1],
           yuvBytes[2],
-          rgbBytes,
           previewWidth,
           previewHeight,
           yRowStride,
           uvRowStride,
           uvPixelStride,
-          false);
+          rgbBytes);
 
       image.close();
     } catch (final Exception e) {
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowMultiBoxDetector.java b/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowMultiBoxDetector.java
index f3e7114335..1dcf9f55ef 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowMultiBoxDetector.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowMultiBoxDetector.java
@@ -41,10 +41,6 @@ import org.tensorflow.demo.env.Logger;
 public class TensorFlowMultiBoxDetector implements Classifier {
   private static final Logger LOGGER = new Logger();
 
-  static {
-    System.loadLibrary("tensorflow_demo");
-  }
-
   // Only return this many results with at least this confidence.
   private static final int MAX_RESULTS = Integer.MAX_VALUE;
 
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowYoloDetector.java b/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowYoloDetector.java
index 174723071d..b7e36a2379 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowYoloDetector.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowYoloDetector.java
@@ -31,10 +31,6 @@ import org.tensorflow.demo.env.SplitTimer;
 public class TensorFlowYoloDetector implements Classifier {
   private static final Logger LOGGER = new Logger();
 
-  static {
-    System.loadLibrary("tensorflow_demo");
-  }
-
   // Only return this many results with at least this confidence.
   private static final int MAX_RESULTS = 5;
 
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/env/ImageUtils.java b/tensorflow/examples/android/src/org/tensorflow/demo/env/ImageUtils.java
index db929e5e08..5f2ff9164c 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/env/ImageUtils.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/env/ImageUtils.java
@@ -27,6 +27,14 @@ import java.io.FileOutputStream;
 public class ImageUtils {
   @SuppressWarnings("unused")
   private static final Logger LOGGER = new Logger();
+  
+  static {
+    try {
+      System.loadLibrary("tensorflow_demo");
+    } catch (UnsatisfiedLinkError e) {
+      LOGGER.w("Native library not found, native RGB -> YUV conversion may be unavailable.");
+    }
+  }
 
   /**
    * Utility method to compute the allocated size in bytes of a YUV420SP image
@@ -83,10 +91,84 @@ public class ImageUtils {
     }
   }
 
+  // This value is 2 ^ 18 - 1, and is used to clamp the RGB values before their ranges
+  // are normalized to eight bits.
+  static final int kMaxChannelValue = 262143;
+
+  // Always prefer the native implementation if available.
+  private static boolean useNativeConversion = true;
+
+  public static void convertYUV420ToARGB8888(
+      byte[] yData,
+      byte[] uData,
+      byte[] vData,
+      int width,
+      int height,
+      int yRowStride,
+      int uvRowStride,
+      int uvPixelStride,
+      int[] out) {
+    if (useNativeConversion) {
+      try {
+        convertYUV420ToARGB8888(
+            yData, uData, vData, out, width, height, yRowStride, uvRowStride, uvPixelStride, false);
+        return;
+      } catch (UnsatisfiedLinkError e) {
+        LOGGER.w("Native YUV -> RGB implementation not found, falling back to Java implementation");
+        useNativeConversion = false;
+      }
+    }
+
+    int i = 0;
+    for (int y = 0; y < height; y++) {
+      int pY = yRowStride * y;
+      int uv_row_start = uvRowStride * (y >> 1);
+      int pUV = uv_row_start;
+      int pV = uv_row_start;
+
+      for (int x = 0; x < width; x++) {
+        int uv_offset = pUV + (x >> 1) * uvPixelStride;
+        out[i++] =
+            YUV2RGB(
+                convertByteToInt(yData, pY + x),
+                convertByteToInt(uData, uv_offset),
+                convertByteToInt(vData, uv_offset));
+      }
+    }
+  }
+
+  private static int convertByteToInt(byte[] arr, int pos) {
+    return arr[pos] & 0xFF;
+  }
+
+  private static int YUV2RGB(int nY, int nU, int nV) {
+    nY -= 16;
+    nU -= 128;
+    nV -= 128;
+    if (nY < 0) nY = 0;
+
+    // This is the floating point equivalent. We do the conversion in integer
+    // because some Android devices do not have floating point in hardware.
+    // nR = (int)(1.164 * nY + 2.018 * nU);
+    // nG = (int)(1.164 * nY - 0.813 * nV - 0.391 * nU);
+    // nB = (int)(1.164 * nY + 1.596 * nV);
+
+    final int foo = 1192 * nY;
+    int nR = foo + 1634 * nV;
+    int nG = foo - 833 * nV - 400 * nU;
+    int nB = foo + 2066 * nU;
+
+    nR = Math.min(kMaxChannelValue, Math.max(0, nR));
+    nG = Math.min(kMaxChannelValue, Math.max(0, nG));
+    nB = Math.min(kMaxChannelValue, Math.max(0, nB));
+
+    return 0xff000000 | ((nR << 6) & 0x00ff0000) | ((nG >> 2) & 0x0000FF00) | ((nB >> 10) & 0xff);
+  }
+
   /**
-   * Converts YUV420 semi-planar data to ARGB 8888 data using the supplied width
-   * and height. The input and output must already be allocated and non-null.
-   * For efficiency, no error checking is performed.
+   * Converts YUV420 semi-planar data to ARGB 8888 data using the supplied width and height. The
+   * input and output must already be allocated and non-null. For efficiency, no error checking is
+   * performed.
    *
    * @param input The array of YUV 4:2:0 input data.
    * @param output A pre-allocated array for the ARGB 8:8:8:8 output data.
-- 
GitLab


From 7e0b20510f25c6fb12ee8c055e32fb575f588abb Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 12:49:13 -0800
Subject: [PATCH 1012/1563] Add sparse_recall_at_top_k which takes top-k class
 indices instead of class logits. Change: 155121560

---
 .../contrib/metrics/python/ops/metric_ops.py  |  84 ++++++
 .../metrics/python/ops/metric_ops_test.py     | 275 ++++++++++++++++++
 tensorflow/python/ops/metrics_impl.py         |  69 ++++-
 3 files changed, 427 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/metrics/python/ops/metric_ops.py b/tensorflow/contrib/metrics/python/ops/metric_ops.py
index d57203c042..727cdd9597 100644
--- a/tensorflow/contrib/metrics/python/ops/metric_ops.py
+++ b/tensorflow/contrib/metrics/python/ops/metric_ops.py
@@ -1338,6 +1338,87 @@ def streaming_sparse_precision_at_top_k(top_k_predictions,
         name=name_scope)
 
 
+def sparse_recall_at_top_k(labels,
+                           top_k_predictions,
+                           class_id=None,
+                           weights=None,
+                           metrics_collections=None,
+                           updates_collections=None,
+                           name=None):
+  """Computes recall@k of top-k predictions with respect to sparse labels.
+
+  If `class_id` is specified, we calculate recall by considering only the
+      entries in the batch for which `class_id` is in the label, and computing
+      the fraction of them for which `class_id` is in the top-k `predictions`.
+  If `class_id` is not specified, we'll calculate recall as how often on
+      average a class among the labels of a batch entry is in the top-k
+      `predictions`.
+
+  `sparse_recall_at_top_k` creates two local variables, `true_positive_at_<k>`
+  and `false_negative_at_<k>`, that are used to compute the recall_at_k
+  frequency. This frequency is ultimately returned as `recall_at_<k>`: an
+  idempotent operation that simply divides `true_positive_at_<k>` by total
+  (`true_positive_at_<k>` + `false_negative_at_<k>`).
+
+  For estimation of the metric over a stream of data, the function creates an
+  `update_op` operation that updates these variables and returns the
+  `recall_at_<k>`. Set operations applied to `top_k` and `labels` calculate the
+  true positives and false negatives weighted by `weights`. Then `update_op`
+  increments `true_positive_at_<k>` and `false_negative_at_<k>` using these
+  values.
+
+  If `weights` is `None`, weights default to 1. Use weights of 0 to mask values.
+
+  Args:
+    labels: `int64` `Tensor` or `SparseTensor` with shape
+      [D1, ... DN, num_labels], where N >= 1 and num_labels is the number of
+      target classes for the associated prediction. Commonly, N=1 and `labels`
+      has shape [batch_size, num_labels]. [D1, ... DN] must match
+      `top_k_predictions`. Values should be in range [0, num_classes), where
+      num_classes is the last dimension of `predictions`. Values outside this
+      range always count towards `false_negative_at_<k>`.
+    top_k_predictions: Integer `Tensor` with shape [D1, ... DN, k] where
+      N >= 1. Commonly, N=1 and top_k_predictions has shape [batch size, k].
+      The final dimension contains the indices of top-k labels. [D1, ... DN]
+      must match `labels`.
+    class_id: Integer class ID for which we want binary metrics. This should be
+      in range [0, num_classes), where num_classes is the last dimension of
+      `predictions`. If class_id is outside this range, the method returns NAN.
+    weights: `Tensor` whose rank is either 0, or n-1, where n is the rank of
+      `labels`. If the latter, it must be broadcastable to `labels` (i.e., all
+      dimensions must be either `1`, or the same as the corresponding `labels`
+      dimension).
+    metrics_collections: An optional list of collections that values should
+      be added to.
+    updates_collections: An optional list of collections that updates should
+      be added to.
+    name: Name of new update operation, and namespace for other dependent ops.
+
+  Returns:
+    recall: Scalar `float64` `Tensor` with the value of `true_positives` divided
+      by the sum of `true_positives` and `false_negatives`.
+    update_op: `Operation` that increments `true_positives` and
+      `false_negatives` variables appropriately, and whose value matches
+      `recall`.
+
+  Raises:
+    ValueError: If `weights` is not `None` and its shape doesn't match
+    `predictions`, or if either `metrics_collections` or `updates_collections`
+    are not a list or tuple.
+  """
+  default_name = _at_k_name('recall', class_id=class_id)
+  with ops.name_scope(name, default_name, (top_k_predictions, labels,
+                                           weights)) as name_scope:
+    return metrics_impl._sparse_recall_at_top_k(  # pylint: disable=protected-access
+        labels=labels,
+        predictions_idx=top_k_predictions,
+        class_id=class_id,
+        weights=weights,
+        metrics_collections=metrics_collections,
+        updates_collections=updates_collections,
+        name=name_scope)
+
+
 def streaming_sparse_average_precision_at_k(predictions,
                                             labels,
                                             k,
@@ -2288,6 +2369,7 @@ def _remove_squeezable_dimensions(predictions, labels, weights):
 __all__ = [
     'aggregate_metric_map',
     'aggregate_metrics',
+    'sparse_recall_at_top_k',
     'streaming_accuracy',
     'streaming_auc',
     'streaming_false_negatives',
@@ -2310,7 +2392,9 @@ __all__ = [
     'streaming_root_mean_squared_error',
     'streaming_sensitivity_at_specificity',
     'streaming_sparse_average_precision_at_k',
+    'streaming_sparse_average_precision_at_top_k',
     'streaming_sparse_precision_at_k',
+    'streaming_sparse_precision_at_top_k',
     'streaming_sparse_recall_at_k',
     'streaming_specificity_at_sensitivity',
     'streaming_true_negatives',
diff --git a/tensorflow/contrib/metrics/python/ops/metric_ops_test.py b/tensorflow/contrib/metrics/python/ops/metric_ops_test.py
index b960e1310e..f42e974e23 100644
--- a/tensorflow/contrib/metrics/python/ops/metric_ops_test.py
+++ b/tensorflow/contrib/metrics/python/ops/metric_ops_test.py
@@ -2958,8 +2958,38 @@ class StreamingSparseRecallTest(test.TestCase):
         self.assertEqual(expected, update.eval())
         self.assertEqual(expected, metric.eval())
 
+  def _test_sparse_recall_at_top_k(self,
+                                   labels,
+                                   top_k_predictions,
+                                   expected,
+                                   class_id=None,
+                                   weights=None):
+    with ops.Graph().as_default() as g, self.test_session(g):
+      if weights is not None:
+        weights = constant_op.constant(weights, dtypes_lib.float32)
+      metric, update = metric_ops.sparse_recall_at_top_k(
+          labels=labels,
+          top_k_predictions=constant_op.constant(top_k_predictions,
+                                                 dtypes_lib.int32),
+          class_id=class_id,
+          weights=weights)
+
+      # Fails without initialized vars.
+      self.assertRaises(errors_impl.OpError, metric.eval)
+      self.assertRaises(errors_impl.OpError, update.eval)
+      variables.variables_initializer(variables.local_variables()).run()
+
+      # Run per-step op and assert expected values.
+      if math.isnan(expected):
+        self.assertTrue(math.isnan(update.eval()))
+        self.assertTrue(math.isnan(metric.eval()))
+      else:
+        self.assertEqual(expected, update.eval())
+        self.assertEqual(expected, metric.eval())
+
   def test_one_label_at_k1_nan(self):
     predictions = [[0.1, 0.3, 0.2, 0.4], [0.1, 0.2, 0.3, 0.4]]
+    top_k_predictions = [[3], [3]]
     sparse_labels = _binary_2d_label_to_sparse_value(
         [[0, 0, 0, 1], [0, 0, 1, 0]])
     dense_labels = np.array([[3], [2]], dtype=np.int64)
@@ -2970,9 +3000,12 @@ class StreamingSparseRecallTest(test.TestCase):
       for class_id in (-1, 0, 1, 4):
         self._test_streaming_sparse_recall_at_k(
             predictions, labels, k=1, expected=NAN, class_id=class_id)
+        self._test_sparse_recall_at_top_k(
+            labels, top_k_predictions, expected=NAN, class_id=class_id)
 
   def test_one_label_at_k1_no_predictions(self):
     predictions = [[0.1, 0.3, 0.2, 0.4], [0.1, 0.2, 0.3, 0.4]]
+    top_k_predictions = [[3], [3]]
     sparse_labels = _binary_2d_label_to_sparse_value(
         [[0, 0, 0, 1], [0, 0, 1, 0]])
     dense_labels = np.array([[3], [2]], dtype=np.int64)
@@ -2981,9 +3014,12 @@ class StreamingSparseRecallTest(test.TestCase):
       # Class 2: 0 predictions.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=0.0, class_id=2)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=0.0, class_id=2)
 
   def test_one_label_at_k1(self):
     predictions = [[0.1, 0.3, 0.2, 0.4], [0.1, 0.2, 0.3, 0.4]]
+    top_k_predictions = [[3], [3]]
     sparse_labels = _binary_2d_label_to_sparse_value(
         [[0, 0, 0, 1], [0, 0, 1, 0]])
     dense_labels = np.array([[3], [2]], dtype=np.int64)
@@ -2992,13 +3028,18 @@ class StreamingSparseRecallTest(test.TestCase):
       # Class 3: 1 label, 2 predictions, 1 correct.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=1.0 / 1, class_id=3)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=1.0 / 1, class_id=3)
 
       # All classes: 2 labels, 2 predictions, 1 correct.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=1.0 / 2)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=1.0 / 2)
 
   def test_one_label_at_k1_weighted(self):
     predictions = [[0.1, 0.3, 0.2, 0.4], [0.1, 0.2, 0.3, 0.4]]
+    top_k_predictions = [[3], [3]]
     sparse_labels = _binary_2d_label_to_sparse_value(
         [[0, 0, 0, 1], [0, 0, 1, 0]])
     dense_labels = np.array([[3], [2]], dtype=np.int64)
@@ -3007,6 +3048,8 @@ class StreamingSparseRecallTest(test.TestCase):
       # Class 3: 1 label, 2 predictions, 1 correct.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=NAN, class_id=3, weights=(0.0,))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=NAN, class_id=3, weights=(0.0,))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3014,6 +3057,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=1.0 / 1,
           class_id=3,
           weights=(1.0,))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=1.0 / 1,
+          class_id=3,
+          weights=(1.0,))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3021,6 +3070,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=1.0 / 1,
           class_id=3,
           weights=(2.0,))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=1.0 / 1,
+          class_id=3,
+          weights=(2.0,))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3028,6 +3083,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=NAN,
           class_id=3,
           weights=(0.0, 0.0))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=NAN,
+          class_id=3,
+          weights=(0.0, 0.0))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3035,6 +3096,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=NAN,
           class_id=3,
           weights=(0.0, 1.0))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=NAN,
+          class_id=3,
+          weights=(0.0, 1.0))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3042,6 +3109,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=1.0 / 1,
           class_id=3,
           weights=(1.0, 0.0))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=1.0 / 1,
+          class_id=3,
+          weights=(1.0, 0.0))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3049,6 +3122,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=1.0 / 1,
           class_id=3,
           weights=(1.0, 1.0))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=1.0 / 1,
+          class_id=3,
+          weights=(1.0, 1.0))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3056,6 +3135,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=2.0 / 2,
           class_id=3,
           weights=(2.0, 3.0))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=2.0 / 2,
+          class_id=3,
+          weights=(2.0, 3.0))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3063,6 +3148,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=3.0 / 3,
           class_id=3,
           weights=(3.0, 2.0))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=3.0 / 3,
+          class_id=3,
+          weights=(3.0, 2.0))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3070,6 +3161,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=0.3 / 0.3,
           class_id=3,
           weights=(0.3, 0.6))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=0.3 / 0.3,
+          class_id=3,
+          weights=(0.3, 0.6))
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3077,32 +3174,70 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=0.6 / 0.6,
           class_id=3,
           weights=(0.6, 0.3))
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=0.6 / 0.6,
+          class_id=3,
+          weights=(0.6, 0.3))
 
       # All classes: 2 labels, 2 predictions, 1 correct.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=NAN, weights=(0.0,))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=NAN, weights=(0.0,))
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=1.0 / 2, weights=(1.0,))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=1.0 / 2, weights=(1.0,))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=1.0 / 2, weights=(2.0,))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=1.0 / 2, weights=(2.0,))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=1.0 / 1, weights=(1.0, 0.0))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=1.0 / 1, weights=(1.0, 0.0))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=0.0 / 1, weights=(0.0, 1.0))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=0.0 / 1, weights=(0.0, 1.0))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=1.0 / 2, weights=(1.0, 1.0))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=1.0 / 2, weights=(1.0, 1.0))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=2.0 / 5, weights=(2.0, 3.0))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=2.0 / 5, weights=(2.0, 3.0))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=3.0 / 5, weights=(3.0, 2.0))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=3.0 / 5, weights=(3.0, 2.0))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=0.3 / 0.9, weights=(0.3, 0.6))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=0.3 / 0.9, weights=(0.3, 0.6))
+
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=1, expected=0.6 / 0.9, weights=(0.6, 0.3))
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=0.6 / 0.9, weights=(0.6, 0.3))
 
   def test_three_labels_at_k5_nan(self):
     predictions = [[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                    [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]]
+    top_k_predictions = [
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ]
     sparse_labels = _binary_2d_label_to_sparse_value(
         [[0, 0, 1, 0, 0, 0, 0, 1, 1, 0], [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]])
     dense_labels = np.array([[2, 7, 8], [1, 2, 5]], dtype=np.int64)
@@ -3112,10 +3247,16 @@ class StreamingSparseRecallTest(test.TestCase):
       for class_id in (0, 3, 4, 6, 9, 10):
         self._test_streaming_sparse_recall_at_k(
             predictions, labels, k=5, expected=NAN, class_id=class_id)
+        self._test_sparse_recall_at_top_k(
+            labels, top_k_predictions, expected=NAN, class_id=class_id)
 
   def test_three_labels_at_k5_no_predictions(self):
     predictions = [[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                    [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]]
+    top_k_predictions = [
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ]
     sparse_labels = _binary_2d_label_to_sparse_value(
         [[0, 0, 1, 0, 0, 0, 0, 1, 1, 0], [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]])
     dense_labels = np.array([[2, 7, 8], [1, 2, 5]], dtype=np.int64)
@@ -3124,10 +3265,16 @@ class StreamingSparseRecallTest(test.TestCase):
       # Class 8: 1 label, no predictions.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=5, expected=0.0 / 1, class_id=8)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=0.0 / 1, class_id=8)
 
   def test_three_labels_at_k5(self):
     predictions = [[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                    [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]]
+    top_k_predictions = [
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ]
     sparse_labels = _binary_2d_label_to_sparse_value(
         [[0, 0, 1, 0, 0, 0, 0, 1, 1, 0], [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]])
     dense_labels = np.array([[2, 7, 8], [1, 2, 5]], dtype=np.int64)
@@ -3136,23 +3283,35 @@ class StreamingSparseRecallTest(test.TestCase):
       # Class 2: 2 labels, both correct.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=5, expected=2.0 / 2, class_id=2)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=2.0 / 2, class_id=2)
 
       # Class 5: 1 label, incorrect.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=5, expected=1.0 / 1, class_id=5)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=1.0 / 1, class_id=5)
 
       # Class 7: 1 label, incorrect.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=5, expected=0.0 / 1, class_id=7)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=0.0 / 1, class_id=7)
 
       # All classes: 6 labels, 3 correct.
       self._test_streaming_sparse_recall_at_k(
           predictions, labels, k=5, expected=3.0 / 6)
+      self._test_sparse_recall_at_top_k(
+          labels, top_k_predictions, expected=3.0 / 6)
 
   def test_three_labels_at_k5_some_out_of_range(self):
     """Tests that labels outside the [0, n_classes) count in denominator."""
     predictions = [[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                    [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]]
+    top_k_predictions = [
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ]
     sp_labels = sparse_tensor.SparseTensorValue(
         indices=[[0, 0], [0, 1], [0, 2], [0, 3], [1, 0], [1, 1], [1, 2],
                  [1, 3]],
@@ -3167,6 +3326,11 @@ class StreamingSparseRecallTest(test.TestCase):
         k=5,
         expected=2.0 / 2,
         class_id=2)
+    self._test_sparse_recall_at_top_k(
+        sp_labels,
+        top_k_predictions,
+        expected=2.0 / 2,
+        class_id=2)
 
     # Class 5: 1 label, incorrect.
     self._test_streaming_sparse_recall_at_k(
@@ -3175,6 +3339,11 @@ class StreamingSparseRecallTest(test.TestCase):
         k=5,
         expected=1.0 / 1,
         class_id=5)
+    self._test_sparse_recall_at_top_k(
+        sp_labels,
+        top_k_predictions,
+        expected=1.0 / 1,
+        class_id=5)
 
     # Class 7: 1 label, incorrect.
     self._test_streaming_sparse_recall_at_k(
@@ -3183,16 +3352,30 @@ class StreamingSparseRecallTest(test.TestCase):
         k=5,
         expected=0.0 / 1,
         class_id=7)
+    self._test_sparse_recall_at_top_k(
+        sp_labels,
+        top_k_predictions,
+        expected=0.0 / 1,
+        class_id=7)
 
     # All classes: 8 labels, 3 correct.
     self._test_streaming_sparse_recall_at_k(
         predictions=predictions, labels=sp_labels, k=5, expected=3.0 / 8)
+    self._test_sparse_recall_at_top_k(
+        sp_labels, top_k_predictions, expected=3.0 / 8)
 
   def test_3d_nan(self):
     predictions = [[[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                     [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]],
                    [[0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6],
                     [0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9]]]
+    top_k_predictions = [[
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ], [
+        [5, 7, 2, 9, 6],
+        [9, 4, 6, 2, 0],
+    ]]
     sparse_labels = _binary_3d_label_to_sparse_value(
         [[[0, 0, 1, 0, 0, 0, 0, 1, 1, 0], [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]],
          [[0, 1, 1, 0, 0, 1, 0, 0, 0, 0], [0, 0, 1, 0, 0, 0, 0, 1, 1, 0]]])
@@ -3207,12 +3390,21 @@ class StreamingSparseRecallTest(test.TestCase):
       for class_id in (0, 3, 4, 6, 9, 10):
         self._test_streaming_sparse_recall_at_k(
             predictions, labels, k=5, expected=NAN, class_id=class_id)
+        self._test_sparse_recall_at_top_k(
+            labels, top_k_predictions, expected=NAN, class_id=class_id)
 
   def test_3d_no_predictions(self):
     predictions = [[[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                     [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]],
                    [[0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6],
                     [0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9]]]
+    top_k_predictions = [[
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ], [
+        [5, 7, 2, 9, 6],
+        [9, 4, 6, 2, 0],
+    ]]
     sparse_labels = _binary_3d_label_to_sparse_value(
         [[[0, 0, 1, 0, 0, 0, 0, 1, 1, 0],
           [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]],
@@ -3229,12 +3421,21 @@ class StreamingSparseRecallTest(test.TestCase):
       for class_id in (1, 8):
         self._test_streaming_sparse_recall_at_k(
             predictions, labels, k=5, expected=0.0, class_id=class_id)
+        self._test_sparse_recall_at_top_k(
+            labels, top_k_predictions, expected=0.0, class_id=class_id)
 
   def test_3d(self):
     predictions = [[[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                     [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]],
                    [[0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6],
                     [0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9]]]
+    top_k_predictions = [[
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ], [
+        [5, 7, 2, 9, 6],
+        [9, 4, 6, 2, 0],
+    ]]
     labels = _binary_3d_label_to_sparse_value(
         [[[0, 0, 1, 0, 0, 0, 0, 1, 1, 0],
           [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]],
@@ -3244,24 +3445,39 @@ class StreamingSparseRecallTest(test.TestCase):
     # Class 2: 4 labels, all correct.
     self._test_streaming_sparse_recall_at_k(
         predictions, labels, k=5, expected=4.0 / 4, class_id=2)
+    self._test_sparse_recall_at_top_k(
+        labels, top_k_predictions, expected=4.0 / 4, class_id=2)
 
     # Class 5: 2 labels, both correct.
     self._test_streaming_sparse_recall_at_k(
         predictions, labels, k=5, expected=2.0 / 2, class_id=5)
+    self._test_sparse_recall_at_top_k(
+        labels, top_k_predictions, expected=2.0 / 2, class_id=5)
 
     # Class 7: 2 labels, 1 incorrect.
     self._test_streaming_sparse_recall_at_k(
         predictions, labels, k=5, expected=1.0 / 2, class_id=7)
+    self._test_sparse_recall_at_top_k(
+        labels, top_k_predictions, expected=1.0 / 2, class_id=7)
 
     # All classes: 12 labels, 7 correct.
     self._test_streaming_sparse_recall_at_k(
         predictions, labels, k=5, expected=7.0 / 12)
+    self._test_sparse_recall_at_top_k(
+        labels, top_k_predictions, expected=7.0 / 12)
 
   def test_3d_ignore_all(self):
     predictions = [[[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                     [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]],
                    [[0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6],
                     [0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9]]]
+    top_k_predictions = [[
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ], [
+        [5, 7, 2, 9, 6],
+        [9, 4, 6, 2, 0],
+    ]]
     labels = _binary_3d_label_to_sparse_value(
         [[[0, 0, 1, 0, 0, 0, 0, 1, 1, 0],
           [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]],
@@ -3276,6 +3492,12 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=NAN,
           class_id=class_id,
           weights=[[0], [0]])
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=NAN,
+          class_id=class_id,
+          weights=[[0], [0]])
       self._test_streaming_sparse_recall_at_k(
           predictions,
           labels,
@@ -3283,16 +3505,33 @@ class StreamingSparseRecallTest(test.TestCase):
           expected=NAN,
           class_id=class_id,
           weights=[[0, 0], [0, 0]])
+      self._test_sparse_recall_at_top_k(
+          labels,
+          top_k_predictions,
+          expected=NAN,
+          class_id=class_id,
+          weights=[[0, 0], [0, 0]])
     self._test_streaming_sparse_recall_at_k(
         predictions, labels, k=5, expected=NAN, weights=[[0], [0]])
+    self._test_sparse_recall_at_top_k(
+        labels, top_k_predictions, expected=NAN, weights=[[0], [0]])
     self._test_streaming_sparse_recall_at_k(
         predictions, labels, k=5, expected=NAN, weights=[[0, 0], [0, 0]])
+    self._test_sparse_recall_at_top_k(
+        labels, top_k_predictions, expected=NAN, weights=[[0, 0], [0, 0]])
 
   def test_3d_ignore_some(self):
     predictions = [[[0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9],
                     [0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6]],
                    [[0.3, 0.0, 0.7, 0.2, 0.4, 0.9, 0.5, 0.8, 0.1, 0.6],
                     [0.5, 0.1, 0.6, 0.3, 0.8, 0.0, 0.7, 0.2, 0.4, 0.9]]]
+    top_k_predictions = [[
+        [9, 4, 6, 2, 0],
+        [5, 7, 2, 9, 6],
+    ], [
+        [5, 7, 2, 9, 6],
+        [9, 4, 6, 2, 0],
+    ]]
     labels = _binary_3d_label_to_sparse_value(
         [[[0, 0, 1, 0, 0, 0, 0, 1, 1, 0],
           [0, 1, 1, 0, 0, 1, 0, 0, 0, 0]],
@@ -3307,6 +3546,12 @@ class StreamingSparseRecallTest(test.TestCase):
         expected=2.0 / 2.0,
         class_id=2,
         weights=[[1], [0]])
+    self._test_sparse_recall_at_top_k(
+        labels,
+        top_k_predictions,
+        expected=2.0 / 2.0,
+        class_id=2,
+        weights=[[1], [0]])
 
     # Class 2: 2 labels, both correct.
     self._test_streaming_sparse_recall_at_k(
@@ -3316,6 +3561,12 @@ class StreamingSparseRecallTest(test.TestCase):
         expected=2.0 / 2.0,
         class_id=2,
         weights=[[0], [1]])
+    self._test_sparse_recall_at_top_k(
+        labels,
+        top_k_predictions,
+        expected=2.0 / 2.0,
+        class_id=2,
+        weights=[[0], [1]])
 
     # Class 7: 1 label, correct.
     self._test_streaming_sparse_recall_at_k(
@@ -3325,6 +3576,12 @@ class StreamingSparseRecallTest(test.TestCase):
         expected=1.0 / 1.0,
         class_id=7,
         weights=[[0], [1]])
+    self._test_sparse_recall_at_top_k(
+        labels,
+        top_k_predictions,
+        expected=1.0 / 1.0,
+        class_id=7,
+        weights=[[0], [1]])
 
     # Class 7: 1 label, incorrect.
     self._test_streaming_sparse_recall_at_k(
@@ -3334,6 +3591,12 @@ class StreamingSparseRecallTest(test.TestCase):
         expected=0.0 / 1.0,
         class_id=7,
         weights=[[1], [0]])
+    self._test_sparse_recall_at_top_k(
+        labels,
+        top_k_predictions,
+        expected=0.0 / 1.0,
+        class_id=7,
+        weights=[[1], [0]])
 
     # Class 7: 2 labels, 1 correct.
     self._test_streaming_sparse_recall_at_k(
@@ -3343,6 +3606,12 @@ class StreamingSparseRecallTest(test.TestCase):
         expected=1.0 / 2.0,
         class_id=7,
         weights=[[1, 0], [1, 0]])
+    self._test_sparse_recall_at_top_k(
+        labels,
+        top_k_predictions,
+        expected=1.0 / 2.0,
+        class_id=7,
+        weights=[[1, 0], [1, 0]])
 
     # Class 7: No labels.
     self._test_streaming_sparse_recall_at_k(
@@ -3352,6 +3621,12 @@ class StreamingSparseRecallTest(test.TestCase):
         expected=NAN,
         class_id=7,
         weights=[[0, 1], [0, 1]])
+    self._test_sparse_recall_at_top_k(
+        labels,
+        top_k_predictions,
+        expected=NAN,
+        class_id=7,
+        weights=[[0, 1], [0, 1]])
 
   def test_sparse_tensor_value(self):
     predictions = [[0.1, 0.3, 0.2, 0.4],
diff --git a/tensorflow/python/ops/metrics_impl.py b/tensorflow/python/ops/metrics_impl.py
index 4dc8e702ca..28ed3af9d7 100644
--- a/tensorflow/python/ops/metrics_impl.py
+++ b/tensorflow/python/ops/metrics_impl.py
@@ -1924,7 +1924,74 @@ def recall_at_k(labels,
     labels = _maybe_expand_labels(labels, predictions)
 
     _, top_k_idx = nn.top_k(predictions, k)
-    top_k_idx = math_ops.to_int64(top_k_idx)
+    return _sparse_recall_at_top_k(
+        labels=labels,
+        predictions_idx=top_k_idx,
+        k=k,
+        class_id=class_id,
+        weights=weights,
+        metrics_collections=metrics_collections,
+        updates_collections=updates_collections,
+        name=scope)
+
+
+def _sparse_recall_at_top_k(labels,
+                            predictions_idx,
+                            k=None,
+                            class_id=None,
+                            weights=None,
+                            metrics_collections=None,
+                            updates_collections=None,
+                            name=None):
+  """Computes recall@k of top-k predictions with respect to sparse labels.
+
+  Differs from `recall_at_k` in that predictions must be in the form of top `k`
+  class indices, whereas `recall_at_k` expects logits. Refer to `recall_at_k`
+  for more details.
+
+  Args:
+    labels: `int64` `Tensor` or `SparseTensor` with shape
+      [D1, ... DN, num_labels] or [D1, ... DN], where the latter implies
+      num_labels=1. N >= 1 and num_labels is the number of target classes for
+      the associated prediction. Commonly, N=1 and `labels` has shape
+      [batch_size, num_labels]. [D1, ... DN] must match `predictions`. Values
+      should be in range [0, num_classes), where num_classes is the last
+      dimension of `predictions`. Values outside this range always count
+      towards `false_negative_at_<k>`.
+    predictions_idx: Integer `Tensor` with shape [D1, ... DN, k] where N >= 1.
+      Commonly, N=1 and predictions has shape [batch size, k]. The final
+      dimension contains the top `k` predicted class indices. [D1, ... DN] must
+      match `labels`.
+    k: Integer, k for @k metric.
+    class_id: Integer class ID for which we want binary metrics. This should be
+      in range [0, num_classes), where num_classes is the last dimension of
+      `predictions`. If class_id is outside this range, the method returns NAN.
+    weights: `Tensor` whose rank is either 0, or n-1, where n is the rank of
+      `labels`. If the latter, it must be broadcastable to `labels` (i.e., all
+      dimensions must be either `1`, or the same as the corresponding `labels`
+      dimension).
+    metrics_collections: An optional list of collections that values should
+      be added to.
+    updates_collections: An optional list of collections that updates should
+      be added to.
+    name: Name of new update operation, and namespace for other dependent ops.
+
+  Returns:
+    recall: Scalar `float64` `Tensor` with the value of `true_positives` divided
+      by the sum of `true_positives` and `false_negatives`.
+    update_op: `Operation` that increments `true_positives` and
+      `false_negatives` variables appropriately, and whose value matches
+      `recall`.
+
+  Raises:
+    ValueError: If `weights` is not `None` and its shape doesn't match
+    `predictions`, or if either `metrics_collections` or `updates_collections`
+    are not a list or tuple.
+  """
+  with ops.name_scope(name,
+                      _at_k_name('recall', k, class_id=class_id),
+                      (predictions_idx, labels, weights)) as scope:
+    top_k_idx = math_ops.to_int64(predictions_idx)
     tp, tp_update = _streaming_sparse_true_positive_at_k(
         predictions_idx=top_k_idx, labels=labels, k=k, class_id=class_id,
         weights=weights)
-- 
GitLab


From a90d9a425aafbb4152cad8a1b4d5a4ca9090b46e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 12:50:49 -0800
Subject: [PATCH 1013/1563] [XLA] Adapt to interface changes in llvm r302060.
 Change: 155121754

---
 tensorflow/compiler/xla/service/cpu/ir_emitter.cc          | 3 ++-
 tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
index 1c704fd1ee..1e34de9e4b 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
@@ -201,7 +201,8 @@ void IrEmitter::InitializeIrFunction(const string& function_name,
     if (&argument == retval) {
       continue;
     }
-    compute_function_->setDoesNotAlias(argument.getArgNo() + 1);
+    compute_function_->addAttribute(argument.getArgNo() + 1,
+                                    llvm::Attribute::NoAlias);
   }
 
   ir_builder_.SetInsertPoint(llvm::BasicBlock::Create(
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc b/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc
index 04babcca0c..e52e55a1a8 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc
+++ b/tensorflow/compiler/xla/service/gpu/ir_emitter_unnested.cc
@@ -196,7 +196,7 @@ llvm::Function* IrEmitterUnnested::BuildKernelPrototype(
           ir_emitter_context_->buffer_assignment().GetTempAllocation()) {
     kernel->addDereferenceableAttr(temp_buffer_arg_no + 1, allocation->size());
   }
-  kernel->setDoesNotAlias(temp_buffer_arg_no + 1);
+  kernel->addAttribute(temp_buffer_arg_no + 1, llvm::Attribute::NoAlias);
 
   // Add the declaration of this kernel to llvm.nvvm.annotations so that NVPTX
   // treats it as a CUDA kernel.
-- 
GitLab


From c36a71d962cb49ce25d8d2173587738692742bb6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 12:55:13 -0800
Subject: [PATCH 1014/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 155122342

---
 tensorflow/go/op/wrappers.go | 5314 +++++++++++++++++-----------------
 1 file changed, 2657 insertions(+), 2657 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index c63be8bc5e..eb4789a182 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -3522,256 +3522,6 @@ func Stage(scope *Scope, values []tf.Output, optional ...StageAttr) (o *tf.Opera
 	return scope.AddOperation(opspec)
 }
 
-// Table initializer that takes two tensors for keys and values respectively.
-//
-// Arguments:
-//	table_handle: Handle to a table which will be initialized.
-//	keys: Keys of type Tkey.
-//	values: Values of type Tval.
-//
-// Returns the created operation.
-func InitializeTableV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "InitializeTableV2",
-		Input: []tf.Input{
-			table_handle, keys, values,
-		},
-	}
-	return scope.AddOperation(opspec)
-}
-
-// MutableHashTableV2Attr is an optional argument to MutableHashTableV2.
-type MutableHashTableV2Attr func(optionalAttr)
-
-// MutableHashTableV2Container sets the optional container attribute to value.
-//
-// value: If non-empty, this table is placed in the given container.
-// Otherwise, a default container is used.
-// If not specified, defaults to ""
-func MutableHashTableV2Container(value string) MutableHashTableV2Attr {
-	return func(m optionalAttr) {
-		m["container"] = value
-	}
-}
-
-// MutableHashTableV2SharedName sets the optional shared_name attribute to value.
-//
-// value: If non-empty, this table is shared under the given name across
-// multiple sessions.
-// If not specified, defaults to ""
-func MutableHashTableV2SharedName(value string) MutableHashTableV2Attr {
-	return func(m optionalAttr) {
-		m["shared_name"] = value
-	}
-}
-
-// MutableHashTableV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
-//
-// value: If true and shared_name is empty, the table is shared
-// using the node name.
-// If not specified, defaults to false
-func MutableHashTableV2UseNodeNameSharing(value bool) MutableHashTableV2Attr {
-	return func(m optionalAttr) {
-		m["use_node_name_sharing"] = value
-	}
-}
-
-// Creates an empty hash table.
-//
-// This op creates a mutable hash table, specifying the type of its keys and
-// values. Each value must be a scalar. Data can be inserted into the table using
-// the insert operations. It does not support the initialization operation.
-//
-// Arguments:
-//	key_dtype: Type of the table keys.
-//	value_dtype: Type of the table values.
-//
-// Returns Handle to a table.
-func MutableHashTableV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...MutableHashTableV2Attr) (table_handle tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "MutableHashTableV2",
-
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// HashTableV2Attr is an optional argument to HashTableV2.
-type HashTableV2Attr func(optionalAttr)
-
-// HashTableV2Container sets the optional container attribute to value.
-//
-// value: If non-empty, this table is placed in the given container.
-// Otherwise, a default container is used.
-// If not specified, defaults to ""
-func HashTableV2Container(value string) HashTableV2Attr {
-	return func(m optionalAttr) {
-		m["container"] = value
-	}
-}
-
-// HashTableV2SharedName sets the optional shared_name attribute to value.
-//
-// value: If non-empty, this table is shared under the given name across
-// multiple sessions.
-// If not specified, defaults to ""
-func HashTableV2SharedName(value string) HashTableV2Attr {
-	return func(m optionalAttr) {
-		m["shared_name"] = value
-	}
-}
-
-// HashTableV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
-//
-// value: If true and shared_name is empty, the table is shared
-// using the node name.
-// If not specified, defaults to false
-func HashTableV2UseNodeNameSharing(value bool) HashTableV2Attr {
-	return func(m optionalAttr) {
-		m["use_node_name_sharing"] = value
-	}
-}
-
-// Creates a non-initialized hash table.
-//
-// This op creates a hash table, specifying the type of its keys and values.
-// Before using the table you will have to initialize it.  After initialization the
-// table will be immutable.
-//
-// Arguments:
-//	key_dtype: Type of the table keys.
-//	value_dtype: Type of the table values.
-//
-// Returns Handle to a table.
-func HashTableV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...HashTableV2Attr) (table_handle tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "HashTableV2",
-
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Replaces the contents of the table with the specified keys and values.
-//
-// The tensor `keys` must be of the same type as the keys of the table.
-// The tensor `values` must be of the type of the table values.
-//
-// Arguments:
-//	table_handle: Handle to the table.
-//	keys: Any shape.  Keys to look up.
-//	values: Values to associate with keys.
-//
-// Returns the created operation.
-func LookupTableImportV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "LookupTableImportV2",
-		Input: []tf.Input{
-			table_handle, keys, values,
-		},
-	}
-	return scope.AddOperation(opspec)
-}
-
-// Outputs all keys and values in the table.
-//
-// Arguments:
-//	table_handle: Handle to the table.
-//
-//
-//
-// Returns Vector of all keys present in the table.Tensor of all values in the table. Indexed in parallel with `keys`.
-func LookupTableExportV2(scope *Scope, table_handle tf.Output, Tkeys tf.DataType, Tvalues tf.DataType) (keys tf.Output, values tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"Tkeys": Tkeys, "Tvalues": Tvalues}
-	opspec := tf.OpSpec{
-		Type: "LookupTableExportV2",
-		Input: []tf.Input{
-			table_handle,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
-}
-
-// Updates the table to associates keys with values.
-//
-// The tensor `keys` must be of the same type as the keys of the table.
-// The tensor `values` must be of the type of the table values.
-//
-// Arguments:
-//	table_handle: Handle to the table.
-//	keys: Any shape.  Keys to look up.
-//	values: Values to associate with keys.
-//
-// Returns the created operation.
-func LookupTableInsertV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "LookupTableInsertV2",
-		Input: []tf.Input{
-			table_handle, keys, values,
-		},
-	}
-	return scope.AddOperation(opspec)
-}
-
-// Looks up keys in a table, outputs the corresponding values.
-//
-// The tensor `keys` must of the same type as the keys of the table.
-// The output `values` is of the type of the table values.
-//
-// The scalar `default_value` is the value output for keys not present in the
-// table. It must also be of the same type as the table values.
-//
-// Arguments:
-//	table_handle: Handle to the table.
-//	keys: Any shape.  Keys to look up.
-//
-//
-// Returns Same shape as `keys`.  Values found in the table, or `default_values`
-// for missing keys.
-func LookupTableFindV2(scope *Scope, table_handle tf.Output, keys tf.Output, default_value tf.Output) (values tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "LookupTableFindV2",
-		Input: []tf.Input{
-			table_handle, keys, default_value,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // FakeQuantWithMinMaxArgsAttr is an optional argument to FakeQuantWithMinMaxArgs.
 type FakeQuantWithMinMaxArgsAttr func(optionalAttr)
 
@@ -5404,177 +5154,133 @@ func ExtractGlimpse(scope *Scope, input tf.Output, size tf.Output, offsets tf.Ou
 	return op.Output(0)
 }
 
-// Computes softmax cross entropy cost and gradients to backpropagate.
+// Draw bounding boxes on a batch of images.
 //
-// Unlike `SoftmaxCrossEntropyWithLogits`, this operation does not accept
-// a matrix of label probabilities, but rather a single label per row
-// of features.  This label is considered to have probability 1.0 for the
-// given row.
+// Outputs a copy of `images` but draws on top of the pixels zero or more bounding
+// boxes specified by the locations in `boxes`. The coordinates of the each
+// bounding box in `boxes` are encoded as `[y_min, x_min, y_max, x_max]`. The
+// bounding box coordinates are floats in `[0.0, 1.0]` relative to the width and
+// height of the underlying image.
 //
-// Inputs are the logits, not probabilities.
+// For example, if an image is 100 x 200 pixels and the bounding box is
+// `[0.1, 0.2, 0.5, 0.9]`, the bottom-left and upper-right coordinates of the
+// bounding box will be `(10, 40)` to `(50, 180)`.
+//
+// Parts of the bounding box may fall outside the image.
 //
 // Arguments:
-//	features: batch_size x num_classes matrix
-//	labels: batch_size vector with values in [0, num_classes).
-// This is the label for the given minibatch entry.
+//	images: 4-D with shape `[batch, height, width, depth]`. A batch of images.
+//	boxes: 3-D with shape `[batch, num_bounding_boxes, 4]` containing bounding
+// boxes.
 //
-// Returns Per example loss (batch_size vector).backpropagated gradients (batch_size x num_classes matrix).
-func SparseSoftmaxCrossEntropyWithLogits(scope *Scope, features tf.Output, labels tf.Output) (loss tf.Output, backprop tf.Output) {
+// Returns 4-D with the same shape as `images`. The batch of input images with
+// bounding boxes drawn on the images.
+func DrawBoundingBoxes(scope *Scope, images tf.Output, boxes tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "SparseSoftmaxCrossEntropyWithLogits",
+		Type: "DrawBoundingBoxes",
 		Input: []tf.Input{
-			features, labels,
+			images, boxes,
 		},
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
-}
-
-// TensorSummaryAttr is an optional argument to TensorSummary.
-type TensorSummaryAttr func(optionalAttr)
-
-// TensorSummaryDescription sets the optional description attribute to value.
-//
-// value: A json-encoded SummaryDescription proto.
-// If not specified, defaults to ""
-func TensorSummaryDescription(value string) TensorSummaryAttr {
-	return func(m optionalAttr) {
-		m["description"] = value
-	}
+	return op.Output(0)
 }
 
-// TensorSummaryLabels sets the optional labels attribute to value.
+// Convert one or more images from HSV to RGB.
 //
-// value: An unused list of strings.
-// If not specified, defaults to <>
-func TensorSummaryLabels(value []string) TensorSummaryAttr {
-	return func(m optionalAttr) {
-		m["labels"] = value
-	}
-}
-
-// TensorSummaryDisplayName sets the optional display_name attribute to value.
+// Outputs a tensor of the same shape as the `images` tensor, containing the RGB
+// value of the pixels. The output is only well defined if the value in `images`
+// are in `[0,1]`.
 //
-// value: An unused string.
-// If not specified, defaults to ""
-func TensorSummaryDisplayName(value string) TensorSummaryAttr {
-	return func(m optionalAttr) {
-		m["display_name"] = value
-	}
-}
-
-// Outputs a `Summary` protocol buffer with a tensor.
+// See `rgb_to_hsv` for a description of the HSV encoding.
 //
 // Arguments:
-//	tensor: A tensor to serialize.
-func TensorSummary(scope *Scope, tensor tf.Output, optional ...TensorSummaryAttr) (summary tf.Output) {
+//	images: 1-D or higher rank. HSV data to convert. Last dimension must be size 3.
+//
+// Returns `images` converted to RGB.
+func HSVToRGB(scope *Scope, images tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "TensorSummary",
+		Type: "HSVToRGB",
 		Input: []tf.Input{
-			tensor,
+			images,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Computes softplus gradients for a softplus operation.
+// Decode the first frame of a GIF-encoded image to a uint8 tensor.
+//
+// GIF with frame or transparency compression are not supported
+// convert animated GIF from compressed to uncompressed by:
+//
+// convert $src.gif -coalesce $dst.gif
 //
 // Arguments:
-//	gradients: The backpropagated gradients to the corresponding softplus operation.
-//	features: The features passed as input to the corresponding softplus operation.
+//	contents: 0-D.  The GIF-encoded image.
 //
-// Returns The gradients: `gradients / (1 + exp(-features))`.
-func SoftplusGrad(scope *Scope, gradients tf.Output, features tf.Output) (backprops tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "SoftplusGrad",
-		Input: []tf.Input{
-			gradients, features,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Computes softplus: `log(exp(features) + 1)`.
-func Softplus(scope *Scope, features tf.Output) (activations tf.Output) {
+// Returns 4-D with shape `[num_frames, height, width, 3]`. RGB order
+func DecodeGif(scope *Scope, contents tf.Output) (image tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "Softplus",
+		Type: "DecodeGif",
 		Input: []tf.Input{
-			features,
+			contents,
 		},
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// BatchMatMulAttr is an optional argument to BatchMatMul.
-type BatchMatMulAttr func(optionalAttr)
+// DecodePngAttr is an optional argument to DecodePng.
+type DecodePngAttr func(optionalAttr)
 
-// BatchMatMulAdjX sets the optional adj_x attribute to value.
+// DecodePngChannels sets the optional channels attribute to value.
 //
-// value: If `True`, adjoint the slices of `x`. Defaults to `False`.
-// If not specified, defaults to false
-func BatchMatMulAdjX(value bool) BatchMatMulAttr {
+// value: Number of color channels for the decoded image.
+// If not specified, defaults to 0
+func DecodePngChannels(value int64) DecodePngAttr {
 	return func(m optionalAttr) {
-		m["adj_x"] = value
+		m["channels"] = value
 	}
 }
 
-// BatchMatMulAdjY sets the optional adj_y attribute to value.
-//
-// value: If `True`, adjoint the slices of `y`. Defaults to `False`.
-// If not specified, defaults to false
-func BatchMatMulAdjY(value bool) BatchMatMulAttr {
+// DecodePngDtype sets the optional dtype attribute to value.
+// If not specified, defaults to DT_UINT8
+func DecodePngDtype(value tf.DataType) DecodePngAttr {
 	return func(m optionalAttr) {
-		m["adj_y"] = value
+		m["dtype"] = value
 	}
 }
 
-// Multiplies slices of two tensors in batches.
-//
-// Multiplies all slices of `Tensor` `x` and `y` (each slice can be
-// viewed as an element of a batch), and arranges the individual results
-// in a single output tensor of the same batch size. Each of the
-// individual slices can optionally be adjointed (to adjoint a matrix
-// means to transpose and conjugate it) before multiplication by setting
-// the `adj_x` or `adj_y` flag to `True`, which are by default `False`.
-//
-// The input tensors `x` and `y` are 2-D or higher with shape `[..., r_x, c_x]`
-// and `[..., r_y, c_y]`.
+// Decode a PNG-encoded image to a uint8 or uint16 tensor.
 //
-// The output tensor is 2-D or higher with shape `[..., r_o, c_o]`, where:
+// The attr `channels` indicates the desired number of color channels for the
+// decoded image.
 //
-//     r_o = c_x if adj_x else r_x
-//     c_o = r_y if adj_y else c_y
+// Accepted values are:
 //
-// It is computed as:
+// *   0: Use the number of channels in the PNG-encoded image.
+// *   1: output a grayscale image.
+// *   3: output an RGB image.
+// *   4: output an RGBA image.
 //
-//     output[..., :, :] = matrix(x[..., :, :]) * matrix(y[..., :, :])
+// If needed, the PNG-encoded image is transformed to match the requested number
+// of color channels.
 //
 // Arguments:
-//	x: 2-D or higher with shape `[..., r_x, c_x]`.
-//	y: 2-D or higher with shape `[..., r_y, c_y]`.
+//	contents: 0-D.  The PNG-encoded image.
 //
-// Returns 3-D or higher with shape `[..., r_o, c_o]`
-func BatchMatMul(scope *Scope, x tf.Output, y tf.Output, optional ...BatchMatMulAttr) (output tf.Output) {
+// Returns 3-D with shape `[height, width, channels]`.
+func DecodePng(scope *Scope, contents tf.Output, optional ...DecodePngAttr) (image tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -5583,9 +5289,9 @@ func BatchMatMul(scope *Scope, x tf.Output, y tf.Output, optional ...BatchMatMul
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "BatchMatMul",
+		Type: "DecodePng",
 		Input: []tf.Input{
-			x, y,
+			contents,
 		},
 		Attrs: attrs,
 	}
@@ -5593,143 +5299,141 @@ func BatchMatMul(scope *Scope, x tf.Output, y tf.Output, optional ...BatchMatMul
 	return op.Output(0)
 }
 
-// SparseTensorDenseMatMulAttr is an optional argument to SparseTensorDenseMatMul.
-type SparseTensorDenseMatMulAttr func(optionalAttr)
-
-// SparseTensorDenseMatMulAdjointA sets the optional adjoint_a attribute to value.
-//
-// value: Use the adjoint of A in the matrix multiply.  If A is complex, this
-// is transpose(conj(A)).  Otherwise it's transpose(A).
-// If not specified, defaults to false
-func SparseTensorDenseMatMulAdjointA(value bool) SparseTensorDenseMatMulAttr {
-	return func(m optionalAttr) {
-		m["adjoint_a"] = value
-	}
-}
-
-// SparseTensorDenseMatMulAdjointB sets the optional adjoint_b attribute to value.
+// Adjust the contrast of one or more images.
 //
-// value: Use the adjoint of B in the matrix multiply.  If B is complex, this
-// is transpose(conj(B)).  Otherwise it's transpose(B).
-// If not specified, defaults to false
-func SparseTensorDenseMatMulAdjointB(value bool) SparseTensorDenseMatMulAttr {
-	return func(m optionalAttr) {
-		m["adjoint_b"] = value
-	}
-}
-
-// Multiply SparseTensor (of rank 2) "A" by dense matrix "B".
+// `images` is a tensor of at least 3 dimensions.  The last 3 dimensions are
+// interpreted as `[height, width, channels]`.  The other dimensions only
+// represent a collection of images, such as `[batch, height, width, channels].`
 //
-// No validity checking is performed on the indices of A.  However, the following
-// input format is recommended for optimal behavior:
+// Contrast is adjusted independently for each channel of each image.
 //
-// if adjoint_a == false:
-//   A should be sorted in lexicographically increasing order.  Use SparseReorder
-//   if you're not sure.
-// if adjoint_a == true:
-//   A should be sorted in order of increasing dimension 1 (i.e., "column major"
-//   order instead of "row major" order).
+// For each channel, the Op first computes the mean of the image pixels in the
+// channel and then adjusts each component of each pixel to
+// `(x - mean) * contrast_factor + mean`.
 //
 // Arguments:
-//	a_indices: 2-D.  The `indices` of the `SparseTensor`, size `[nnz, 2]` Matrix.
-//	a_values: 1-D.  The `values` of the `SparseTensor`, size `[nnz]` Vector.
-//	a_shape: 1-D.  The `shape` of the `SparseTensor`, size `[2]` Vector.
-//	b: 2-D.  A dense Matrix.
-func SparseTensorDenseMatMul(scope *Scope, a_indices tf.Output, a_values tf.Output, a_shape tf.Output, b tf.Output, optional ...SparseTensorDenseMatMulAttr) (product tf.Output) {
+//	images: Images to adjust.  At least 3-D.
+//	contrast_factor: A float multiplier for adjusting contrast.
+//
+// Returns The contrast-adjusted image or images.
+func AdjustContrastv2(scope *Scope, images tf.Output, contrast_factor tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "SparseTensorDenseMatMul",
+		Type: "AdjustContrastv2",
 		Input: []tf.Input{
-			a_indices, a_values, a_shape, b,
+			images, contrast_factor,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Computes rectified linear 6: `min(max(features, 0), 6)`.
-func Relu6(scope *Scope, features tf.Output) (activations tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Relu6",
-		Input: []tf.Input{
-			features,
-		},
+// DecodeJpegAttr is an optional argument to DecodeJpeg.
+type DecodeJpegAttr func(optionalAttr)
+
+// DecodeJpegChannels sets the optional channels attribute to value.
+//
+// value: Number of color channels for the decoded image.
+// If not specified, defaults to 0
+func DecodeJpegChannels(value int64) DecodeJpegAttr {
+	return func(m optionalAttr) {
+		m["channels"] = value
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
 }
 
-// AudioSpectrogramAttr is an optional argument to AudioSpectrogram.
-type AudioSpectrogramAttr func(optionalAttr)
+// DecodeJpegRatio sets the optional ratio attribute to value.
+//
+// value: Downscaling ratio.
+// If not specified, defaults to 1
+func DecodeJpegRatio(value int64) DecodeJpegAttr {
+	return func(m optionalAttr) {
+		m["ratio"] = value
+	}
+}
 
-// AudioSpectrogramMagnitudeSquared sets the optional magnitude_squared attribute to value.
+// DecodeJpegFancyUpscaling sets the optional fancy_upscaling attribute to value.
 //
-// value: Whether to return the squared magnitude or just the
-// magnitude. Using squared magnitude can avoid extra calculations.
+// value: If true use a slower but nicer upscaling of the
+// chroma planes (yuv420/422 only).
+// If not specified, defaults to true
+func DecodeJpegFancyUpscaling(value bool) DecodeJpegAttr {
+	return func(m optionalAttr) {
+		m["fancy_upscaling"] = value
+	}
+}
+
+// DecodeJpegTryRecoverTruncated sets the optional try_recover_truncated attribute to value.
+//
+// value: If true try to recover an image from truncated input.
 // If not specified, defaults to false
-func AudioSpectrogramMagnitudeSquared(value bool) AudioSpectrogramAttr {
+func DecodeJpegTryRecoverTruncated(value bool) DecodeJpegAttr {
 	return func(m optionalAttr) {
-		m["magnitude_squared"] = value
+		m["try_recover_truncated"] = value
 	}
 }
 
-// Produces a visualization of audio data over time.
+// DecodeJpegAcceptableFraction sets the optional acceptable_fraction attribute to value.
 //
-// Spectrograms are a standard way of representing audio information as a series of
-// slices of frequency information, one slice for each window of time. By joining
-// these together into a sequence, they form a distinctive fingerprint of the sound
-// over time.
+// value: The minimum required fraction of lines before a truncated
+// input is accepted.
+// If not specified, defaults to 1
+func DecodeJpegAcceptableFraction(value float32) DecodeJpegAttr {
+	return func(m optionalAttr) {
+		m["acceptable_fraction"] = value
+	}
+}
+
+// DecodeJpegDctMethod sets the optional dct_method attribute to value.
 //
-// This op expects to receive audio data as an input, stored as floats in the range
-// -1 to 1, together with a window width in samples, and a stride specifying how
-// far to move the window between slices. From this it generates a three
-// dimensional output. The lowest dimension has an amplitude value for each
-// frequency during that time slice. The next dimension is time, with successive
-// frequency slices. The final dimension is for the channels in the input, so a
-// stereo audio input would have two here for example.
+// value: string specifying a hint about the algorithm used for
+// decompression.  Defaults to "" which maps to a system-specific
+// default.  Currently valid values are ["INTEGER_FAST",
+// "INTEGER_ACCURATE"].  The hint may be ignored (e.g., the internal
+// jpeg library changes to a version that does not have that specific
+// option.)
+// If not specified, defaults to ""
+func DecodeJpegDctMethod(value string) DecodeJpegAttr {
+	return func(m optionalAttr) {
+		m["dct_method"] = value
+	}
+}
+
+// Decode a JPEG-encoded image to a uint8 tensor.
 //
-// This means the layout when converted and saved as an image is rotated 90 degrees
-// clockwise from a typical spectrogram. Time is descending down the Y axis, and
-// the frequency decreases from left to right.
+// The attr `channels` indicates the desired number of color channels for the
+// decoded image.
 //
-// Each value in the result represents the square root of the sum of the real and
-// imaginary parts of an FFT on the current window of samples. In this way, the
-// lowest dimension represents the power of each frequency in the current window,
-// and adjacent windows are concatenated in the next dimension.
+// Accepted values are:
 //
-// To get a more intuitive and visual look at what this operation does, you can run
-// tensorflow/examples/wav_to_spectrogram to read in an audio file and save out the
-// resulting spectrogram as a PNG image.
+// *   0: Use the number of channels in the JPEG-encoded image.
+// *   1: output a grayscale image.
+// *   3: output an RGB image.
+//
+// If needed, the JPEG-encoded image is transformed to match the requested number
+// of color channels.
+//
+// The attr `ratio` allows downscaling the image by an integer factor during
+// decoding.  Allowed values are: 1, 2, 4, and 8.  This is much faster than
+// downscaling the image later.
 //
 // Arguments:
-//	input: Float representation of audio data.
-//	window_size: How wide the input window is in samples. For the highest efficiency
-// this should be a power of two, but other values are accepted.
-//	stride: How widely apart the center of adjacent sample windows should be.
+//	contents: 0-D.  The JPEG-encoded image.
 //
-// Returns 3D representation of the audio frequencies as an image.
-func AudioSpectrogram(scope *Scope, input tf.Output, window_size int64, stride int64, optional ...AudioSpectrogramAttr) (spectrogram tf.Output) {
+// Returns 3-D with shape `[height, width, channels]`..
+func DecodeJpeg(scope *Scope, contents tf.Output, optional ...DecodeJpegAttr) (image tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"window_size": window_size, "stride": stride}
+	attrs := map[string]interface{}{}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "AudioSpectrogram",
+		Type: "DecodeJpeg",
 		Input: []tf.Input{
-			input,
+			contents,
 		},
 		Attrs: attrs,
 	}
@@ -5737,28 +5441,42 @@ func AudioSpectrogram(scope *Scope, input tf.Output, window_size int64, stride i
 	return op.Output(0)
 }
 
-// Computes the gradient of morphological 2-D dilation with respect to the input.
+// ResizeNearestNeighborGradAttr is an optional argument to ResizeNearestNeighborGrad.
+type ResizeNearestNeighborGradAttr func(optionalAttr)
+
+// ResizeNearestNeighborGradAlignCorners sets the optional align_corners attribute to value.
+//
+// value: If true, rescale grads by (orig_height - 1) / (height - 1), which
+// exactly aligns the 4 corners of grads and original_image. If false, rescale by
+// orig_height / height. Treat similarly the width dimension.
+// If not specified, defaults to false
+func ResizeNearestNeighborGradAlignCorners(value bool) ResizeNearestNeighborGradAttr {
+	return func(m optionalAttr) {
+		m["align_corners"] = value
+	}
+}
+
+// Computes the gradient of nearest neighbor interpolation.
 //
 // Arguments:
-//	input: 4-D with shape `[batch, in_height, in_width, depth]`.
-//	filter: 3-D with shape `[filter_height, filter_width, depth]`.
-//	out_backprop: 4-D with shape `[batch, out_height, out_width, depth]`.
-//	strides: 1-D of length 4. The stride of the sliding window for each dimension of
-// the input tensor. Must be: `[1, stride_height, stride_width, 1]`.
-//	rates: 1-D of length 4. The input stride for atrous morphological dilation.
-// Must be: `[1, rate_height, rate_width, 1]`.
-//	padding: The type of padding algorithm to use.
+//	grads: 4-D with shape `[batch, height, width, channels]`.
+//	size: = A 1-D int32 Tensor of 2 elements: `orig_height, orig_width`. The
+// original input size.
 //
-// Returns 4-D with shape `[batch, in_height, in_width, depth]`.
-func Dilation2DBackpropInput(scope *Scope, input tf.Output, filter tf.Output, out_backprop tf.Output, strides []int64, rates []int64, padding string) (in_backprop tf.Output) {
+// Returns 4-D with shape `[batch, orig_height, orig_width, channels]`. Gradients
+// with respect to the input image.
+func ResizeNearestNeighborGrad(scope *Scope, grads tf.Output, size tf.Output, optional ...ResizeNearestNeighborGradAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"strides": strides, "rates": rates, "padding": padding}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "Dilation2DBackpropInput",
+		Type: "ResizeNearestNeighborGrad",
 		Input: []tf.Input{
-			input, filter, out_backprop,
+			grads, size,
 		},
 		Attrs: attrs,
 	}
@@ -5766,58 +5484,31 @@ func Dilation2DBackpropInput(scope *Scope, input tf.Output, filter tf.Output, ou
 	return op.Output(0)
 }
 
-// FusedBatchNormGradAttr is an optional argument to FusedBatchNormGrad.
-type FusedBatchNormGradAttr func(optionalAttr)
-
-// FusedBatchNormGradEpsilon sets the optional epsilon attribute to value.
-//
-// value: A small float number added to the variance of x.
-// If not specified, defaults to 0.0001
-func FusedBatchNormGradEpsilon(value float32) FusedBatchNormGradAttr {
-	return func(m optionalAttr) {
-		m["epsilon"] = value
-	}
-}
-
-// FusedBatchNormGradDataFormat sets the optional data_format attribute to value.
-//
-// value: The data format for y_backprop, x, x_backprop.
-// Either "NHWC" (default) or "NCHW".
-// If not specified, defaults to "NHWC"
-func FusedBatchNormGradDataFormat(value string) FusedBatchNormGradAttr {
-	return func(m optionalAttr) {
-		m["data_format"] = value
-	}
-}
+// ResizeNearestNeighborAttr is an optional argument to ResizeNearestNeighbor.
+type ResizeNearestNeighborAttr func(optionalAttr)
 
-// FusedBatchNormGradIsTraining sets the optional is_training attribute to value.
+// ResizeNearestNeighborAlignCorners sets the optional align_corners attribute to value.
 //
-// value: A bool value to indicate the operation is for training (default)
-// or inference.
-// If not specified, defaults to true
-func FusedBatchNormGradIsTraining(value bool) FusedBatchNormGradAttr {
+// value: If true, rescale input by (new_height - 1) / (height - 1), which
+// exactly aligns the 4 corners of images and resized images. If false, rescale
+// by new_height / height. Treat similarly the width dimension.
+// If not specified, defaults to false
+func ResizeNearestNeighborAlignCorners(value bool) ResizeNearestNeighborAttr {
 	return func(m optionalAttr) {
-		m["is_training"] = value
+		m["align_corners"] = value
 	}
 }
 
-// Gradient for batch normalization.
-//
-// Note that the size of 4D Tensors are defined by either "NHWC" or "NCHW".
-// The size of 1D Tensors matches the dimension C of the 4D Tensors.
+// Resize `images` to `size` using nearest neighbor interpolation.
 //
 // Arguments:
-//	y_backprop: A 4D Tensor for the gradient with respect to y.
-//	x: A 4D Tensor for input data.
-//	scale: A 1D Tensor for scaling factor, to scale the normalized x.
-//	reserve_space_1: A 1D Tensor for the computed batch mean, to be reused
-// in the gradient computation.
-//	reserve_space_2: A 1D Tensor for the computed batch variance (inverted variance
-// in the cuDNN case), to be used in the gradient computation.
+//	images: 4-D with shape `[batch, height, width, channels]`.
+//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
+// new size for the images.
 //
-// Returns A 4D Tensor for the gradient with respect to x.A 1D Tensor for the gradient with respect to scale.A 1D Tensor for the gradient with respect to offset.Unused placeholder to match the mean input in FusedBatchNorm.Unused placeholder to match the variance input
-// in FusedBatchNorm.
-func FusedBatchNormGrad(scope *Scope, y_backprop tf.Output, x tf.Output, scale tf.Output, reserve_space_1 tf.Output, reserve_space_2 tf.Output, optional ...FusedBatchNormGradAttr) (x_backprop tf.Output, scale_backprop tf.Output, offset_backprop tf.Output, reserve_space_3 tf.Output, reserve_space_4 tf.Output) {
+// Returns 4-D with shape
+// `[batch, new_height, new_width, channels]`.
+func ResizeNearestNeighbor(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeNearestNeighborAttr) (resized_images tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -5826,235 +5517,150 @@ func FusedBatchNormGrad(scope *Scope, y_backprop tf.Output, x tf.Output, scale t
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "FusedBatchNormGrad",
+		Type: "ResizeNearestNeighbor",
 		Input: []tf.Input{
-			y_backprop, x, scale, reserve_space_1, reserve_space_2,
+			images, size,
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2), op.Output(3), op.Output(4)
+	return op.Output(0)
 }
 
-// MaxPool3DGradGradAttr is an optional argument to MaxPool3DGradGrad.
-type MaxPool3DGradGradAttr func(optionalAttr)
-
-// MaxPool3DGradGradDataFormat sets the optional data_format attribute to value.
+// Returns the set of files matching one or more glob patterns.
 //
-// value: The data format of the input and output data. With the
-// default format "NDHWC", the data is stored in the order of:
-//     [batch, in_depth, in_height, in_width, in_channels].
-// Alternatively, the format could be "NCDHW", the data storage order is:
-//     [batch, in_channels, in_depth, in_height, in_width].
-// If not specified, defaults to "NDHWC"
-func MaxPool3DGradGradDataFormat(value string) MaxPool3DGradGradAttr {
-	return func(m optionalAttr) {
-		m["data_format"] = value
-	}
-}
-
-// Computes second-order gradients of the maxpooling function.
+// Note that this routine only supports wildcard characters in the
+// basename portion of the pattern, not in the directory portion.
 //
 // Arguments:
-//	orig_input: The original input tensor.
-//	orig_output: The original output tensor.
-//	grad: Output backprop of shape `[batch, depth, rows, cols, channels]`.
-//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
-// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
-//	strides: 1-D tensor of length 5. The stride of the sliding window for each
-// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
-//	padding: The type of padding algorithm to use.
+//	pattern: Shell wildcard pattern(s). Scalar or vector of type string.
 //
-// Returns Gradients of gradients w.r.t. the input to `max_pool`.
-func MaxPool3DGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPool3DGradGradAttr) (output tf.Output) {
+// Returns A vector of matching filenames.
+func MatchingFiles(scope *Scope, pattern tf.Output) (filenames tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "MaxPool3DGradGrad",
+		Type: "MatchingFiles",
 		Input: []tf.Input{
-			orig_input, orig_output, grad,
+			pattern,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// FakeQuantWithMinMaxArgsGradientAttr is an optional argument to FakeQuantWithMinMaxArgsGradient.
-type FakeQuantWithMinMaxArgsGradientAttr func(optionalAttr)
-
-// FakeQuantWithMinMaxArgsGradientMin sets the optional min attribute to value.
-// If not specified, defaults to -6
-func FakeQuantWithMinMaxArgsGradientMin(value float32) FakeQuantWithMinMaxArgsGradientAttr {
-	return func(m optionalAttr) {
-		m["min"] = value
-	}
-}
-
-// FakeQuantWithMinMaxArgsGradientMax sets the optional max attribute to value.
-// If not specified, defaults to 6
-func FakeQuantWithMinMaxArgsGradientMax(value float32) FakeQuantWithMinMaxArgsGradientAttr {
-	return func(m optionalAttr) {
-		m["max"] = value
-	}
-}
-
-// FakeQuantWithMinMaxArgsGradientNumBits sets the optional num_bits attribute to value.
-// If not specified, defaults to 8
-func FakeQuantWithMinMaxArgsGradientNumBits(value int64) FakeQuantWithMinMaxArgsGradientAttr {
-	return func(m optionalAttr) {
-		m["num_bits"] = value
-	}
-}
-
-// Compute gradients for a FakeQuantWithMinMaxArgs operation.
-//
-// Arguments:
-//	gradients: Backpropagated gradients above the FakeQuantWithMinMaxArgs operation.
-//	inputs: Values passed as inputs to the FakeQuantWithMinMaxArgs operation.
+// Shuffle dimensions of x according to a permutation.
 //
-// Returns Backpropagated gradients below the FakeQuantWithMinMaxArgs operation:
-// `gradients * (inputs >= min && inputs <= max)`.
-func FakeQuantWithMinMaxArgsGradient(scope *Scope, gradients tf.Output, inputs tf.Output, optional ...FakeQuantWithMinMaxArgsGradientAttr) (backprops tf.Output) {
+// The output `y` has the same rank as `x`. The shapes of `x` and `y` satisfy:
+//   `y.shape[i] == x.shape[perm[i]] for i in [0, 1, ..., rank(x) - 1]`
+func Transpose(scope *Scope, x tf.Output, perm tf.Output) (y tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "FakeQuantWithMinMaxArgsGradient",
+		Type: "Transpose",
 		Input: []tf.Input{
-			gradients, inputs,
+			x, perm,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Computes gradients of the maxpooling function.
-//
-// Arguments:
-//	input: The original input.
-//	grad: 4-D with shape `[batch, height, width, channels]`.  Gradients w.r.t. the
-// output of `max_pool`.
-//	argmax: The indices of the maximum values chosen for each output of `max_pool`.
-//	ksize: The size of the window for each dimension of the input tensor.
-//	strides: The stride of the sliding window for each dimension of the
-// input tensor.
-//	padding: The type of padding algorithm to use.
-//
-// Returns Gradients w.r.t. the input of `max_pool`.
-func MaxPoolGradWithArgmax(scope *Scope, input tf.Output, grad tf.Output, argmax tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output) {
+// Reads and outputs the entire contents of the input filename.
+func ReadFile(scope *Scope, filename tf.Output) (contents tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
 	opspec := tf.OpSpec{
-		Type: "MaxPoolGradWithArgmax",
+		Type: "ReadFile",
 		Input: []tf.Input{
-			input, grad, argmax,
+			filename,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Computes the gradient of morphological 2-D dilation with respect to the filter.
+// Computes softmax cross entropy cost and gradients to backpropagate.
+//
+// Unlike `SoftmaxCrossEntropyWithLogits`, this operation does not accept
+// a matrix of label probabilities, but rather a single label per row
+// of features.  This label is considered to have probability 1.0 for the
+// given row.
+//
+// Inputs are the logits, not probabilities.
 //
 // Arguments:
-//	input: 4-D with shape `[batch, in_height, in_width, depth]`.
-//	filter: 3-D with shape `[filter_height, filter_width, depth]`.
-//	out_backprop: 4-D with shape `[batch, out_height, out_width, depth]`.
-//	strides: 1-D of length 4. The stride of the sliding window for each dimension of
-// the input tensor. Must be: `[1, stride_height, stride_width, 1]`.
-//	rates: 1-D of length 4. The input stride for atrous morphological dilation.
-// Must be: `[1, rate_height, rate_width, 1]`.
-//	padding: The type of padding algorithm to use.
+//	features: batch_size x num_classes matrix
+//	labels: batch_size vector with values in [0, num_classes).
+// This is the label for the given minibatch entry.
 //
-// Returns 3-D with shape `[filter_height, filter_width, depth]`.
-func Dilation2DBackpropFilter(scope *Scope, input tf.Output, filter tf.Output, out_backprop tf.Output, strides []int64, rates []int64, padding string) (filter_backprop tf.Output) {
+// Returns Per example loss (batch_size vector).backpropagated gradients (batch_size x num_classes matrix).
+func SparseSoftmaxCrossEntropyWithLogits(scope *Scope, features tf.Output, labels tf.Output) (loss tf.Output, backprop tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"strides": strides, "rates": rates, "padding": padding}
 	opspec := tf.OpSpec{
-		Type: "Dilation2DBackpropFilter",
+		Type: "SparseSoftmaxCrossEntropyWithLogits",
 		Input: []tf.Input{
-			input, filter, out_backprop,
+			features, labels,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1)
 }
 
-// Returns the truth value of (x == y) element-wise.
+// TensorSummaryAttr is an optional argument to TensorSummary.
+type TensorSummaryAttr func(optionalAttr)
+
+// TensorSummaryDescription sets the optional description attribute to value.
 //
-// *NOTE*: `Equal` supports broadcasting. More about broadcasting
-// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func Equal(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Equal",
-		Input: []tf.Input{
-			x, y,
-		},
+// value: A json-encoded SummaryDescription proto.
+// If not specified, defaults to ""
+func TensorSummaryDescription(value string) TensorSummaryAttr {
+	return func(m optionalAttr) {
+		m["description"] = value
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
 }
 
-// AvgPool3DAttr is an optional argument to AvgPool3D.
-type AvgPool3DAttr func(optionalAttr)
+// TensorSummaryLabels sets the optional labels attribute to value.
+//
+// value: An unused list of strings.
+// If not specified, defaults to <>
+func TensorSummaryLabels(value []string) TensorSummaryAttr {
+	return func(m optionalAttr) {
+		m["labels"] = value
+	}
+}
 
-// AvgPool3DDataFormat sets the optional data_format attribute to value.
+// TensorSummaryDisplayName sets the optional display_name attribute to value.
 //
-// value: The data format of the input and output data. With the
-// default format "NDHWC", the data is stored in the order of:
-//     [batch, in_depth, in_height, in_width, in_channels].
-// Alternatively, the format could be "NCDHW", the data storage order is:
-//     [batch, in_channels, in_depth, in_height, in_width].
-// If not specified, defaults to "NDHWC"
-func AvgPool3DDataFormat(value string) AvgPool3DAttr {
+// value: An unused string.
+// If not specified, defaults to ""
+func TensorSummaryDisplayName(value string) TensorSummaryAttr {
 	return func(m optionalAttr) {
-		m["data_format"] = value
+		m["display_name"] = value
 	}
 }
 
-// Performs 3D average pooling on the input.
+// Outputs a `Summary` protocol buffer with a tensor.
 //
 // Arguments:
-//	input: Shape `[batch, depth, rows, cols, channels]` tensor to pool over.
-//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
-// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
-//	strides: 1-D tensor of length 5. The stride of the sliding window for each
-// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
-//	padding: The type of padding algorithm to use.
-//
-// Returns The average pooled output tensor.
-func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DAttr) (output tf.Output) {
+//	tensor: A tensor to serialize.
+func TensorSummary(scope *Scope, tensor tf.Output, optional ...TensorSummaryAttr) (summary tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	attrs := map[string]interface{}{}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "AvgPool3D",
+		Type: "TensorSummary",
 		Input: []tf.Input{
-			input,
+			tensor,
 		},
 		Attrs: attrs,
 	}
@@ -6062,99 +5668,672 @@ func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, pa
 	return op.Output(0)
 }
 
-// Produces the max pool of the input tensor for quantized types.
+// Computes softplus gradients for a softplus operation.
 //
 // Arguments:
-//	input: The 4D (batch x rows x cols x depth) Tensor to MaxReduce over.
-//	min_input: The float value that the lowest quantized input value represents.
-//	max_input: The float value that the highest quantized input value represents.
-//	ksize: The size of the window for each dimension of the input tensor.
-// The length must be 4 to match the number of dimensions of the input.
-//	strides: The stride of the sliding window for each dimension of the input
-// tensor. The length must be 4 to match the number of dimensions of the input.
-//	padding: The type of padding algorithm to use.
+//	gradients: The backpropagated gradients to the corresponding softplus operation.
+//	features: The features passed as input to the corresponding softplus operation.
 //
-// Returns The float value that the lowest quantized output value represents.The float value that the highest quantized output value represents.
-func QuantizedMaxPool(scope *Scope, input tf.Output, min_input tf.Output, max_input tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output, min_output tf.Output, max_output tf.Output) {
+// Returns The gradients: `gradients / (1 + exp(-features))`.
+func SoftplusGrad(scope *Scope, gradients tf.Output, features tf.Output) (backprops tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
 	opspec := tf.OpSpec{
-		Type: "QuantizedMaxPool",
+		Type: "SoftplusGrad",
 		Input: []tf.Input{
-			input, min_input, max_input,
+			gradients, features,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// Conv3DBackpropInputV2Attr is an optional argument to Conv3DBackpropInputV2.
-type Conv3DBackpropInputV2Attr func(optionalAttr)
-
-// Conv3DBackpropInputV2DataFormat sets the optional data_format attribute to value.
-//
-// value: The data format of the input and output data. With the
-// default format "NDHWC", the data is stored in the order of:
-//     [batch, in_depth, in_height, in_width, in_channels].
-// Alternatively, the format could be "NCDHW", the data storage order is:
-//     [batch, in_channels, in_depth, in_height, in_width].
-// If not specified, defaults to "NDHWC"
-func Conv3DBackpropInputV2DataFormat(value string) Conv3DBackpropInputV2Attr {
-	return func(m optionalAttr) {
-		m["data_format"] = value
-	}
+	return op.Output(0)
 }
 
-// Computes the gradients of 3-D convolution with respect to the input.
-//
-// Arguments:
-//	input_sizes: An integer vector representing the tensor shape of `input`,
-// where `input` is a 5-D
-// `[batch, depth, rows, cols, in_channels]` tensor.
-//	filter: Shape `[depth, rows, cols, in_channels, out_channels]`.
-// `in_channels` must match between `input` and `filter`.
-//	out_backprop: Backprop signal of shape `[batch, out_depth, out_rows, out_cols,
-// out_channels]`.
-//	strides: 1-D tensor of length 5. The stride of the sliding window for each
-// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
-//	padding: The type of padding algorithm to use.
-func Conv3DBackpropInputV2(scope *Scope, input_sizes tf.Output, filter tf.Output, out_backprop tf.Output, strides []int64, padding string, optional ...Conv3DBackpropInputV2Attr) (output tf.Output) {
+// Computes softplus: `log(exp(features) + 1)`.
+func Softplus(scope *Scope, features tf.Output) (activations tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"strides": strides, "padding": padding}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "Conv3DBackpropInputV2",
+		Type: "Softplus",
 		Input: []tf.Input{
-			input_sizes, filter, out_backprop,
+			features,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Returns a tensor of ones with the same shape and type as x.
-//
-// Arguments:
-//	x: a tensor of type T.
+// BatchMatMulAttr is an optional argument to BatchMatMul.
+type BatchMatMulAttr func(optionalAttr)
+
+// BatchMatMulAdjX sets the optional adj_x attribute to value.
 //
-// Returns a tensor of the same shape and type as x but filled with ones.
-func OnesLike(scope *Scope, x tf.Output) (y tf.Output) {
-	if scope.Err() != nil {
-		return
+// value: If `True`, adjoint the slices of `x`. Defaults to `False`.
+// If not specified, defaults to false
+func BatchMatMulAdjX(value bool) BatchMatMulAttr {
+	return func(m optionalAttr) {
+		m["adj_x"] = value
 	}
-	opspec := tf.OpSpec{
-		Type: "OnesLike",
-		Input: []tf.Input{
-			x,
-		},
+}
+
+// BatchMatMulAdjY sets the optional adj_y attribute to value.
+//
+// value: If `True`, adjoint the slices of `y`. Defaults to `False`.
+// If not specified, defaults to false
+func BatchMatMulAdjY(value bool) BatchMatMulAttr {
+	return func(m optionalAttr) {
+		m["adj_y"] = value
+	}
+}
+
+// Multiplies slices of two tensors in batches.
+//
+// Multiplies all slices of `Tensor` `x` and `y` (each slice can be
+// viewed as an element of a batch), and arranges the individual results
+// in a single output tensor of the same batch size. Each of the
+// individual slices can optionally be adjointed (to adjoint a matrix
+// means to transpose and conjugate it) before multiplication by setting
+// the `adj_x` or `adj_y` flag to `True`, which are by default `False`.
+//
+// The input tensors `x` and `y` are 2-D or higher with shape `[..., r_x, c_x]`
+// and `[..., r_y, c_y]`.
+//
+// The output tensor is 2-D or higher with shape `[..., r_o, c_o]`, where:
+//
+//     r_o = c_x if adj_x else r_x
+//     c_o = r_y if adj_y else c_y
+//
+// It is computed as:
+//
+//     output[..., :, :] = matrix(x[..., :, :]) * matrix(y[..., :, :])
+//
+// Arguments:
+//	x: 2-D or higher with shape `[..., r_x, c_x]`.
+//	y: 2-D or higher with shape `[..., r_y, c_y]`.
+//
+// Returns 3-D or higher with shape `[..., r_o, c_o]`
+func BatchMatMul(scope *Scope, x tf.Output, y tf.Output, optional ...BatchMatMulAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "BatchMatMul",
+		Input: []tf.Input{
+			x, y,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// SparseTensorDenseMatMulAttr is an optional argument to SparseTensorDenseMatMul.
+type SparseTensorDenseMatMulAttr func(optionalAttr)
+
+// SparseTensorDenseMatMulAdjointA sets the optional adjoint_a attribute to value.
+//
+// value: Use the adjoint of A in the matrix multiply.  If A is complex, this
+// is transpose(conj(A)).  Otherwise it's transpose(A).
+// If not specified, defaults to false
+func SparseTensorDenseMatMulAdjointA(value bool) SparseTensorDenseMatMulAttr {
+	return func(m optionalAttr) {
+		m["adjoint_a"] = value
+	}
+}
+
+// SparseTensorDenseMatMulAdjointB sets the optional adjoint_b attribute to value.
+//
+// value: Use the adjoint of B in the matrix multiply.  If B is complex, this
+// is transpose(conj(B)).  Otherwise it's transpose(B).
+// If not specified, defaults to false
+func SparseTensorDenseMatMulAdjointB(value bool) SparseTensorDenseMatMulAttr {
+	return func(m optionalAttr) {
+		m["adjoint_b"] = value
+	}
+}
+
+// Multiply SparseTensor (of rank 2) "A" by dense matrix "B".
+//
+// No validity checking is performed on the indices of A.  However, the following
+// input format is recommended for optimal behavior:
+//
+// if adjoint_a == false:
+//   A should be sorted in lexicographically increasing order.  Use SparseReorder
+//   if you're not sure.
+// if adjoint_a == true:
+//   A should be sorted in order of increasing dimension 1 (i.e., "column major"
+//   order instead of "row major" order).
+//
+// Arguments:
+//	a_indices: 2-D.  The `indices` of the `SparseTensor`, size `[nnz, 2]` Matrix.
+//	a_values: 1-D.  The `values` of the `SparseTensor`, size `[nnz]` Vector.
+//	a_shape: 1-D.  The `shape` of the `SparseTensor`, size `[2]` Vector.
+//	b: 2-D.  A dense Matrix.
+func SparseTensorDenseMatMul(scope *Scope, a_indices tf.Output, a_values tf.Output, a_shape tf.Output, b tf.Output, optional ...SparseTensorDenseMatMulAttr) (product tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "SparseTensorDenseMatMul",
+		Input: []tf.Input{
+			a_indices, a_values, a_shape, b,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Computes rectified linear 6: `min(max(features, 0), 6)`.
+func Relu6(scope *Scope, features tf.Output) (activations tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Relu6",
+		Input: []tf.Input{
+			features,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// AudioSpectrogramAttr is an optional argument to AudioSpectrogram.
+type AudioSpectrogramAttr func(optionalAttr)
+
+// AudioSpectrogramMagnitudeSquared sets the optional magnitude_squared attribute to value.
+//
+// value: Whether to return the squared magnitude or just the
+// magnitude. Using squared magnitude can avoid extra calculations.
+// If not specified, defaults to false
+func AudioSpectrogramMagnitudeSquared(value bool) AudioSpectrogramAttr {
+	return func(m optionalAttr) {
+		m["magnitude_squared"] = value
+	}
+}
+
+// Produces a visualization of audio data over time.
+//
+// Spectrograms are a standard way of representing audio information as a series of
+// slices of frequency information, one slice for each window of time. By joining
+// these together into a sequence, they form a distinctive fingerprint of the sound
+// over time.
+//
+// This op expects to receive audio data as an input, stored as floats in the range
+// -1 to 1, together with a window width in samples, and a stride specifying how
+// far to move the window between slices. From this it generates a three
+// dimensional output. The lowest dimension has an amplitude value for each
+// frequency during that time slice. The next dimension is time, with successive
+// frequency slices. The final dimension is for the channels in the input, so a
+// stereo audio input would have two here for example.
+//
+// This means the layout when converted and saved as an image is rotated 90 degrees
+// clockwise from a typical spectrogram. Time is descending down the Y axis, and
+// the frequency decreases from left to right.
+//
+// Each value in the result represents the square root of the sum of the real and
+// imaginary parts of an FFT on the current window of samples. In this way, the
+// lowest dimension represents the power of each frequency in the current window,
+// and adjacent windows are concatenated in the next dimension.
+//
+// To get a more intuitive and visual look at what this operation does, you can run
+// tensorflow/examples/wav_to_spectrogram to read in an audio file and save out the
+// resulting spectrogram as a PNG image.
+//
+// Arguments:
+//	input: Float representation of audio data.
+//	window_size: How wide the input window is in samples. For the highest efficiency
+// this should be a power of two, but other values are accepted.
+//	stride: How widely apart the center of adjacent sample windows should be.
+//
+// Returns 3D representation of the audio frequencies as an image.
+func AudioSpectrogram(scope *Scope, input tf.Output, window_size int64, stride int64, optional ...AudioSpectrogramAttr) (spectrogram tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"window_size": window_size, "stride": stride}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "AudioSpectrogram",
+		Input: []tf.Input{
+			input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Computes the gradient of morphological 2-D dilation with respect to the input.
+//
+// Arguments:
+//	input: 4-D with shape `[batch, in_height, in_width, depth]`.
+//	filter: 3-D with shape `[filter_height, filter_width, depth]`.
+//	out_backprop: 4-D with shape `[batch, out_height, out_width, depth]`.
+//	strides: 1-D of length 4. The stride of the sliding window for each dimension of
+// the input tensor. Must be: `[1, stride_height, stride_width, 1]`.
+//	rates: 1-D of length 4. The input stride for atrous morphological dilation.
+// Must be: `[1, rate_height, rate_width, 1]`.
+//	padding: The type of padding algorithm to use.
+//
+// Returns 4-D with shape `[batch, in_height, in_width, depth]`.
+func Dilation2DBackpropInput(scope *Scope, input tf.Output, filter tf.Output, out_backprop tf.Output, strides []int64, rates []int64, padding string) (in_backprop tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"strides": strides, "rates": rates, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "Dilation2DBackpropInput",
+		Input: []tf.Input{
+			input, filter, out_backprop,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// FusedBatchNormGradAttr is an optional argument to FusedBatchNormGrad.
+type FusedBatchNormGradAttr func(optionalAttr)
+
+// FusedBatchNormGradEpsilon sets the optional epsilon attribute to value.
+//
+// value: A small float number added to the variance of x.
+// If not specified, defaults to 0.0001
+func FusedBatchNormGradEpsilon(value float32) FusedBatchNormGradAttr {
+	return func(m optionalAttr) {
+		m["epsilon"] = value
+	}
+}
+
+// FusedBatchNormGradDataFormat sets the optional data_format attribute to value.
+//
+// value: The data format for y_backprop, x, x_backprop.
+// Either "NHWC" (default) or "NCHW".
+// If not specified, defaults to "NHWC"
+func FusedBatchNormGradDataFormat(value string) FusedBatchNormGradAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// FusedBatchNormGradIsTraining sets the optional is_training attribute to value.
+//
+// value: A bool value to indicate the operation is for training (default)
+// or inference.
+// If not specified, defaults to true
+func FusedBatchNormGradIsTraining(value bool) FusedBatchNormGradAttr {
+	return func(m optionalAttr) {
+		m["is_training"] = value
+	}
+}
+
+// Gradient for batch normalization.
+//
+// Note that the size of 4D Tensors are defined by either "NHWC" or "NCHW".
+// The size of 1D Tensors matches the dimension C of the 4D Tensors.
+//
+// Arguments:
+//	y_backprop: A 4D Tensor for the gradient with respect to y.
+//	x: A 4D Tensor for input data.
+//	scale: A 1D Tensor for scaling factor, to scale the normalized x.
+//	reserve_space_1: A 1D Tensor for the computed batch mean, to be reused
+// in the gradient computation.
+//	reserve_space_2: A 1D Tensor for the computed batch variance (inverted variance
+// in the cuDNN case), to be used in the gradient computation.
+//
+// Returns A 4D Tensor for the gradient with respect to x.A 1D Tensor for the gradient with respect to scale.A 1D Tensor for the gradient with respect to offset.Unused placeholder to match the mean input in FusedBatchNorm.Unused placeholder to match the variance input
+// in FusedBatchNorm.
+func FusedBatchNormGrad(scope *Scope, y_backprop tf.Output, x tf.Output, scale tf.Output, reserve_space_1 tf.Output, reserve_space_2 tf.Output, optional ...FusedBatchNormGradAttr) (x_backprop tf.Output, scale_backprop tf.Output, offset_backprop tf.Output, reserve_space_3 tf.Output, reserve_space_4 tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "FusedBatchNormGrad",
+		Input: []tf.Input{
+			y_backprop, x, scale, reserve_space_1, reserve_space_2,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2), op.Output(3), op.Output(4)
+}
+
+// MaxPool3DGradGradAttr is an optional argument to MaxPool3DGradGrad.
+type MaxPool3DGradGradAttr func(optionalAttr)
+
+// MaxPool3DGradGradDataFormat sets the optional data_format attribute to value.
+//
+// value: The data format of the input and output data. With the
+// default format "NDHWC", the data is stored in the order of:
+//     [batch, in_depth, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCDHW", the data storage order is:
+//     [batch, in_channels, in_depth, in_height, in_width].
+// If not specified, defaults to "NDHWC"
+func MaxPool3DGradGradDataFormat(value string) MaxPool3DGradGradAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Computes second-order gradients of the maxpooling function.
+//
+// Arguments:
+//	orig_input: The original input tensor.
+//	orig_output: The original output tensor.
+//	grad: Output backprop of shape `[batch, depth, rows, cols, channels]`.
+//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
+// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
+//	strides: 1-D tensor of length 5. The stride of the sliding window for each
+// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients of gradients w.r.t. the input to `max_pool`.
+func MaxPool3DGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPool3DGradGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MaxPool3DGradGrad",
+		Input: []tf.Input{
+			orig_input, orig_output, grad,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// FakeQuantWithMinMaxArgsGradientAttr is an optional argument to FakeQuantWithMinMaxArgsGradient.
+type FakeQuantWithMinMaxArgsGradientAttr func(optionalAttr)
+
+// FakeQuantWithMinMaxArgsGradientMin sets the optional min attribute to value.
+// If not specified, defaults to -6
+func FakeQuantWithMinMaxArgsGradientMin(value float32) FakeQuantWithMinMaxArgsGradientAttr {
+	return func(m optionalAttr) {
+		m["min"] = value
+	}
+}
+
+// FakeQuantWithMinMaxArgsGradientMax sets the optional max attribute to value.
+// If not specified, defaults to 6
+func FakeQuantWithMinMaxArgsGradientMax(value float32) FakeQuantWithMinMaxArgsGradientAttr {
+	return func(m optionalAttr) {
+		m["max"] = value
+	}
+}
+
+// FakeQuantWithMinMaxArgsGradientNumBits sets the optional num_bits attribute to value.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxArgsGradientNumBits(value int64) FakeQuantWithMinMaxArgsGradientAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
+	}
+}
+
+// Compute gradients for a FakeQuantWithMinMaxArgs operation.
+//
+// Arguments:
+//	gradients: Backpropagated gradients above the FakeQuantWithMinMaxArgs operation.
+//	inputs: Values passed as inputs to the FakeQuantWithMinMaxArgs operation.
+//
+// Returns Backpropagated gradients below the FakeQuantWithMinMaxArgs operation:
+// `gradients * (inputs >= min && inputs <= max)`.
+func FakeQuantWithMinMaxArgsGradient(scope *Scope, gradients tf.Output, inputs tf.Output, optional ...FakeQuantWithMinMaxArgsGradientAttr) (backprops tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "FakeQuantWithMinMaxArgsGradient",
+		Input: []tf.Input{
+			gradients, inputs,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Computes gradients of the maxpooling function.
+//
+// Arguments:
+//	input: The original input.
+//	grad: 4-D with shape `[batch, height, width, channels]`.  Gradients w.r.t. the
+// output of `max_pool`.
+//	argmax: The indices of the maximum values chosen for each output of `max_pool`.
+//	ksize: The size of the window for each dimension of the input tensor.
+//	strides: The stride of the sliding window for each dimension of the
+// input tensor.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients w.r.t. the input of `max_pool`.
+func MaxPoolGradWithArgmax(scope *Scope, input tf.Output, grad tf.Output, argmax tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "MaxPoolGradWithArgmax",
+		Input: []tf.Input{
+			input, grad, argmax,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Computes the gradient of morphological 2-D dilation with respect to the filter.
+//
+// Arguments:
+//	input: 4-D with shape `[batch, in_height, in_width, depth]`.
+//	filter: 3-D with shape `[filter_height, filter_width, depth]`.
+//	out_backprop: 4-D with shape `[batch, out_height, out_width, depth]`.
+//	strides: 1-D of length 4. The stride of the sliding window for each dimension of
+// the input tensor. Must be: `[1, stride_height, stride_width, 1]`.
+//	rates: 1-D of length 4. The input stride for atrous morphological dilation.
+// Must be: `[1, rate_height, rate_width, 1]`.
+//	padding: The type of padding algorithm to use.
+//
+// Returns 3-D with shape `[filter_height, filter_width, depth]`.
+func Dilation2DBackpropFilter(scope *Scope, input tf.Output, filter tf.Output, out_backprop tf.Output, strides []int64, rates []int64, padding string) (filter_backprop tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"strides": strides, "rates": rates, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "Dilation2DBackpropFilter",
+		Input: []tf.Input{
+			input, filter, out_backprop,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Returns the truth value of (x == y) element-wise.
+//
+// *NOTE*: `Equal` supports broadcasting. More about broadcasting
+// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
+func Equal(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Equal",
+		Input: []tf.Input{
+			x, y,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// AvgPool3DAttr is an optional argument to AvgPool3D.
+type AvgPool3DAttr func(optionalAttr)
+
+// AvgPool3DDataFormat sets the optional data_format attribute to value.
+//
+// value: The data format of the input and output data. With the
+// default format "NDHWC", the data is stored in the order of:
+//     [batch, in_depth, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCDHW", the data storage order is:
+//     [batch, in_channels, in_depth, in_height, in_width].
+// If not specified, defaults to "NDHWC"
+func AvgPool3DDataFormat(value string) AvgPool3DAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Performs 3D average pooling on the input.
+//
+// Arguments:
+//	input: Shape `[batch, depth, rows, cols, channels]` tensor to pool over.
+//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
+// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
+//	strides: 1-D tensor of length 5. The stride of the sliding window for each
+// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
+//	padding: The type of padding algorithm to use.
+//
+// Returns The average pooled output tensor.
+func AvgPool3D(scope *Scope, input tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "AvgPool3D",
+		Input: []tf.Input{
+			input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Produces the max pool of the input tensor for quantized types.
+//
+// Arguments:
+//	input: The 4D (batch x rows x cols x depth) Tensor to MaxReduce over.
+//	min_input: The float value that the lowest quantized input value represents.
+//	max_input: The float value that the highest quantized input value represents.
+//	ksize: The size of the window for each dimension of the input tensor.
+// The length must be 4 to match the number of dimensions of the input.
+//	strides: The stride of the sliding window for each dimension of the input
+// tensor. The length must be 4 to match the number of dimensions of the input.
+//	padding: The type of padding algorithm to use.
+//
+// Returns The float value that the lowest quantized output value represents.The float value that the highest quantized output value represents.
+func QuantizedMaxPool(scope *Scope, input tf.Output, min_input tf.Output, max_input tf.Output, ksize []int64, strides []int64, padding string) (output tf.Output, min_output tf.Output, max_output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	opspec := tf.OpSpec{
+		Type: "QuantizedMaxPool",
+		Input: []tf.Input{
+			input, min_input, max_input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
+// Conv3DBackpropInputV2Attr is an optional argument to Conv3DBackpropInputV2.
+type Conv3DBackpropInputV2Attr func(optionalAttr)
+
+// Conv3DBackpropInputV2DataFormat sets the optional data_format attribute to value.
+//
+// value: The data format of the input and output data. With the
+// default format "NDHWC", the data is stored in the order of:
+//     [batch, in_depth, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCDHW", the data storage order is:
+//     [batch, in_channels, in_depth, in_height, in_width].
+// If not specified, defaults to "NDHWC"
+func Conv3DBackpropInputV2DataFormat(value string) Conv3DBackpropInputV2Attr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Computes the gradients of 3-D convolution with respect to the input.
+//
+// Arguments:
+//	input_sizes: An integer vector representing the tensor shape of `input`,
+// where `input` is a 5-D
+// `[batch, depth, rows, cols, in_channels]` tensor.
+//	filter: Shape `[depth, rows, cols, in_channels, out_channels]`.
+// `in_channels` must match between `input` and `filter`.
+//	out_backprop: Backprop signal of shape `[batch, out_depth, out_rows, out_cols,
+// out_channels]`.
+//	strides: 1-D tensor of length 5. The stride of the sliding window for each
+// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
+//	padding: The type of padding algorithm to use.
+func Conv3DBackpropInputV2(scope *Scope, input_sizes tf.Output, filter tf.Output, out_backprop tf.Output, strides []int64, padding string, optional ...Conv3DBackpropInputV2Attr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "Conv3DBackpropInputV2",
+		Input: []tf.Input{
+			input_sizes, filter, out_backprop,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Returns a tensor of ones with the same shape and type as x.
+//
+// Arguments:
+//	x: a tensor of type T.
+//
+// Returns a tensor of the same shape and type as x but filled with ones.
+func OnesLike(scope *Scope, x tf.Output) (y tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "OnesLike",
+		Input: []tf.Input{
+			x,
+		},
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -6528,33 +6707,122 @@ func NextIteration(scope *Scope, data tf.Output) (output tf.Output) {
 			data,
 		},
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Does nothing. Only useful as a placeholder for control edges.
+//
+// Returns the created operation.
+func NoOp(scope *Scope) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "NoOp",
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Computes softsign: `features / (abs(features) + 1)`.
+func Softsign(scope *Scope, features tf.Output) (activations tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Softsign",
+		Input: []tf.Input{
+			features,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// ResizeBilinearAttr is an optional argument to ResizeBilinear.
+type ResizeBilinearAttr func(optionalAttr)
+
+// ResizeBilinearAlignCorners sets the optional align_corners attribute to value.
+//
+// value: If true, rescale input by (new_height - 1) / (height - 1), which
+// exactly aligns the 4 corners of images and resized images. If false, rescale
+// by new_height / height. Treat similarly the width dimension.
+// If not specified, defaults to false
+func ResizeBilinearAlignCorners(value bool) ResizeBilinearAttr {
+	return func(m optionalAttr) {
+		m["align_corners"] = value
+	}
+}
+
+// Resize `images` to `size` using bilinear interpolation.
+//
+// Input images can be of different types but output images are always float.
+//
+// Arguments:
+//	images: 4-D with shape `[batch, height, width, channels]`.
+//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
+// new size for the images.
+//
+// Returns 4-D with shape
+// `[batch, new_height, new_width, channels]`.
+func ResizeBilinear(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeBilinearAttr) (resized_images tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResizeBilinear",
+		Input: []tf.Input{
+			images, size,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// ProdAttr is an optional argument to Prod.
+type ProdAttr func(optionalAttr)
+
+// ProdKeepDims sets the optional keep_dims attribute to value.
+//
+// value: If true, retain reduced dimensions with length 1.
+// If not specified, defaults to false
+func ProdKeepDims(value bool) ProdAttr {
+	return func(m optionalAttr) {
+		m["keep_dims"] = value
+	}
 }
 
-// Does nothing. Only useful as a placeholder for control edges.
+// Computes the product of elements across dimensions of a tensor.
 //
-// Returns the created operation.
-func NoOp(scope *Scope) (o *tf.Operation) {
+// Reduces `input` along the dimensions given in `reduction_indices`. Unless
+// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in
+// `reduction_indices`. If `keep_dims` is true, the reduced dimensions are
+// retained with length 1.
+//
+// Arguments:
+//	input: The tensor to reduce.
+//	reduction_indices: The dimensions to reduce.
+//
+// Returns The reduced tensor.
+func Prod(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ...ProdAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	opspec := tf.OpSpec{
-		Type: "NoOp",
-	}
-	return scope.AddOperation(opspec)
-}
-
-// Computes softsign: `features / (abs(features) + 1)`.
-func Softsign(scope *Scope, features tf.Output) (activations tf.Output) {
-	if scope.Err() != nil {
-		return
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "Softsign",
+		Type: "Prod",
 		Input: []tf.Input{
-			features,
+			input, reduction_indices,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -6770,6 +7038,181 @@ func BiasAddV1(scope *Scope, value tf.Output, bias tf.Output) (output tf.Output)
 	return op.Output(0)
 }
 
+// EncodeJpegAttr is an optional argument to EncodeJpeg.
+type EncodeJpegAttr func(optionalAttr)
+
+// EncodeJpegFormat sets the optional format attribute to value.
+//
+// value: Per pixel image format.
+// If not specified, defaults to ""
+func EncodeJpegFormat(value string) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["format"] = value
+	}
+}
+
+// EncodeJpegQuality sets the optional quality attribute to value.
+//
+// value: Quality of the compression from 0 to 100 (higher is better and slower).
+// If not specified, defaults to 95
+func EncodeJpegQuality(value int64) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["quality"] = value
+	}
+}
+
+// EncodeJpegProgressive sets the optional progressive attribute to value.
+//
+// value: If True, create a JPEG that loads progressively (coarse to fine).
+// If not specified, defaults to false
+func EncodeJpegProgressive(value bool) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["progressive"] = value
+	}
+}
+
+// EncodeJpegOptimizeSize sets the optional optimize_size attribute to value.
+//
+// value: If True, spend CPU/RAM to reduce size with no quality change.
+// If not specified, defaults to false
+func EncodeJpegOptimizeSize(value bool) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["optimize_size"] = value
+	}
+}
+
+// EncodeJpegChromaDownsampling sets the optional chroma_downsampling attribute to value.
+//
+// value: See http://en.wikipedia.org/wiki/Chroma_subsampling.
+// If not specified, defaults to true
+func EncodeJpegChromaDownsampling(value bool) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["chroma_downsampling"] = value
+	}
+}
+
+// EncodeJpegDensityUnit sets the optional density_unit attribute to value.
+//
+// value: Unit used to specify `x_density` and `y_density`:
+// pixels per inch (`'in'`) or centimeter (`'cm'`).
+// If not specified, defaults to "in"
+func EncodeJpegDensityUnit(value string) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["density_unit"] = value
+	}
+}
+
+// EncodeJpegXDensity sets the optional x_density attribute to value.
+//
+// value: Horizontal pixels per density unit.
+// If not specified, defaults to 300
+func EncodeJpegXDensity(value int64) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["x_density"] = value
+	}
+}
+
+// EncodeJpegYDensity sets the optional y_density attribute to value.
+//
+// value: Vertical pixels per density unit.
+// If not specified, defaults to 300
+func EncodeJpegYDensity(value int64) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["y_density"] = value
+	}
+}
+
+// EncodeJpegXmpMetadata sets the optional xmp_metadata attribute to value.
+//
+// value: If not empty, embed this XMP metadata in the image header.
+// If not specified, defaults to ""
+func EncodeJpegXmpMetadata(value string) EncodeJpegAttr {
+	return func(m optionalAttr) {
+		m["xmp_metadata"] = value
+	}
+}
+
+// JPEG-encode an image.
+//
+// `image` is a 3-D uint8 Tensor of shape `[height, width, channels]`.
+//
+// The attr `format` can be used to override the color format of the encoded
+// output.  Values can be:
+//
+// *   `''`: Use a default format based on the number of channels in the image.
+// *   `grayscale`: Output a grayscale JPEG image.  The `channels` dimension
+//     of `image` must be 1.
+// *   `rgb`: Output an RGB JPEG image. The `channels` dimension
+//     of `image` must be 3.
+//
+// If `format` is not specified or is the empty string, a default format is picked
+// in function of the number of channels in `image`:
+//
+// *   1: Output a grayscale image.
+// *   3: Output an RGB image.
+//
+// Arguments:
+//	image: 3-D with shape `[height, width, channels]`.
+//
+// Returns 0-D. JPEG-encoded image.
+func EncodeJpeg(scope *Scope, image tf.Output, optional ...EncodeJpegAttr) (contents tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "EncodeJpeg",
+		Input: []tf.Input{
+			image,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Gradients for batch normalization.
+//
+// DEPRECATED at GraphDef version 9: Use tf.nn.batch_normalization()
+//
+// This op is deprecated. See `tf.nn.batch_normalization`.
+//
+// Arguments:
+//	t: A 4D input Tensor.
+//	m: A 1D mean Tensor with size matching the last dimension of t.
+// This is the first output from tf.nn.moments,
+// or a saved moving average thereof.
+//	v: A 1D variance Tensor with size matching the last dimension of t.
+// This is the second output from tf.nn.moments,
+// or a saved moving average thereof.
+//	gamma: A 1D gamma Tensor with size matching the last dimension of t.
+// If "scale_after_normalization" is true, this Tensor will be multiplied
+// with the normalized Tensor.
+//	backprop: 4D backprop Tensor.
+//	variance_epsilon: A small float number to avoid dividing by 0.
+//	scale_after_normalization: A bool indicating whether the resulted tensor
+// needs to be multiplied with gamma.
+//
+// Returns 4D backprop tensor for input.1D backprop tensor for mean.1D backprop tensor for variance.1D backprop tensor for beta.1D backprop tensor for gamma.
+func BatchNormWithGlobalNormalizationGrad(scope *Scope, t tf.Output, m tf.Output, v tf.Output, gamma tf.Output, backprop tf.Output, variance_epsilon float32, scale_after_normalization bool) (dx tf.Output, dm tf.Output, dv tf.Output, db tf.Output, dg tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"variance_epsilon": variance_epsilon, "scale_after_normalization": scale_after_normalization}
+	opspec := tf.OpSpec{
+		Type: "BatchNormWithGlobalNormalizationGrad",
+		Input: []tf.Input{
+			t, m, v, gamma, backprop,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2), op.Output(3), op.Output(4)
+}
+
 // Conv2DBackpropInputAttr is an optional argument to Conv2DBackpropInput.
 type Conv2DBackpropInputAttr func(optionalAttr)
 
@@ -7136,28 +7579,73 @@ func SegmentMax(scope *Scope, data tf.Output, segment_ids tf.Output) (output tf.
 // *  `start,length` where `start` and `length` are integers.  In that
 //    case the slice covers `length` indices starting at `start`.
 //
-// See also `Save`.
+// See also `Save`.
+//
+// Arguments:
+//	filename: Must have a single element. The name of the file to which we write the
+// tensor.
+//	tensor_names: Shape `[N]`. The names of the tensors to be saved.
+//	shapes_and_slices: Shape `[N]`.  The shapes and slice specifications to use when
+// saving the tensors.
+//	data: `N` tensors to save.
+//
+// Returns the created operation.
+func SaveSlices(scope *Scope, filename tf.Output, tensor_names tf.Output, shapes_and_slices tf.Output, data []tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "SaveSlices",
+		Input: []tf.Input{
+			filename, tensor_names, shapes_and_slices, tf.OutputList(data),
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Writes contents to the file at input filename. Creates file if not existing.
+//
+// Arguments:
+//	filename: scalar. The name of the file to which we write the contents.
+//	contents: scalar. The content to be written to the output file.
+//
+// Returns the created operation.
+func WriteFile(scope *Scope, filename tf.Output, contents tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "WriteFile",
+		Input: []tf.Input{
+			filename, contents,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Computes the Cholesky decomposition of one or more square matrices.
+//
+// The input is a tensor of shape `[..., M, M]` whose inner-most 2 dimensions
+// form square matrices, with the same constraints as the single matrix Cholesky
+// decomposition above. The output is a tensor of the same shape as the input
+// containing the Cholesky decompositions for all input submatrices `[..., :, :]`.
 //
 // Arguments:
-//	filename: Must have a single element. The name of the file to which we write the
-// tensor.
-//	tensor_names: Shape `[N]`. The names of the tensors to be saved.
-//	shapes_and_slices: Shape `[N]`.  The shapes and slice specifications to use when
-// saving the tensors.
-//	data: `N` tensors to save.
+//	input: Shape is `[..., M, M]`.
 //
-// Returns the created operation.
-func SaveSlices(scope *Scope, filename tf.Output, tensor_names tf.Output, shapes_and_slices tf.Output, data []tf.Output) (o *tf.Operation) {
+// Returns Shape is `[..., M, M]`.
+func Cholesky(scope *Scope, input tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "SaveSlices",
+		Type: "Cholesky",
 		Input: []tf.Input{
-			filename, tensor_names, shapes_and_slices, tf.OutputList(data),
+			input,
 		},
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
 // Returns the rank of a tensor.
@@ -7243,54 +7731,6 @@ func DecodeCSV(scope *Scope, records tf.Output, record_defaults []tf.Output, opt
 	return output
 }
 
-// BiasAddGradAttr is an optional argument to BiasAddGrad.
-type BiasAddGradAttr func(optionalAttr)
-
-// BiasAddGradDataFormat sets the optional data_format attribute to value.
-//
-// value: Specify the data format of the input and output data. With the
-// default format "NHWC", the bias tensor will be added to the last dimension
-// of the value tensor.
-// Alternatively, the format could be "NCHW", the data storage order of:
-//     [batch, in_channels, in_height, in_width].
-// The tensor will be added to "in_channels", the third-to-the-last
-//     dimension.
-// If not specified, defaults to "NHWC"
-func BiasAddGradDataFormat(value string) BiasAddGradAttr {
-	return func(m optionalAttr) {
-		m["data_format"] = value
-	}
-}
-
-// The backward operation for "BiasAdd" on the "bias" tensor.
-//
-// It accumulates all the values from out_backprop into the feature dimension.
-// For NHWC data format, the feature dimension is the last. For NCHW data format,
-// the feature dimension is the third-to-last.
-//
-// Arguments:
-//	out_backprop: Any number of dimensions.
-//
-// Returns 1-D with size the feature dimension of `out_backprop`.
-func BiasAddGrad(scope *Scope, out_backprop tf.Output, optional ...BiasAddGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "BiasAddGrad",
-		Input: []tf.Input{
-			out_backprop,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Convert JSON-encoded Example records to binary protocol buffer strings.
 //
 // This op translates a tensor containing Example records, encoded using
@@ -8024,27 +8464,51 @@ func ParameterizedTruncatedNormal(scope *Scope, shape tf.Output, means tf.Output
 	return op.Output(0)
 }
 
-// Convert one or more images from HSV to RGB.
+// EncodePngAttr is an optional argument to EncodePng.
+type EncodePngAttr func(optionalAttr)
+
+// EncodePngCompression sets the optional compression attribute to value.
 //
-// Outputs a tensor of the same shape as the `images` tensor, containing the RGB
-// value of the pixels. The output is only well defined if the value in `images`
-// are in `[0,1]`.
+// value: Compression level.
+// If not specified, defaults to -1
+func EncodePngCompression(value int64) EncodePngAttr {
+	return func(m optionalAttr) {
+		m["compression"] = value
+	}
+}
+
+// PNG-encode an image.
 //
-// See `rgb_to_hsv` for a description of the HSV encoding.
+// `image` is a 3-D uint8 or uint16 Tensor of shape `[height, width, channels]`
+// where `channels` is:
+//
+// *   1: for grayscale.
+// *   2: for grayscale + alpha.
+// *   3: for RGB.
+// *   4: for RGBA.
+//
+// The ZLIB compression level, `compression`, can be -1 for the PNG-encoder
+// default or a value from 0 to 9.  9 is the highest compression level, generating
+// the smallest output, but is slower.
 //
 // Arguments:
-//	images: 1-D or higher rank. HSV data to convert. Last dimension must be size 3.
+//	image: 3-D with shape `[height, width, channels]`.
 //
-// Returns `images` converted to RGB.
-func HSVToRGB(scope *Scope, images tf.Output) (output tf.Output) {
+// Returns 0-D. PNG-encoded image.
+func EncodePng(scope *Scope, image tf.Output, optional ...EncodePngAttr) (contents tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "HSVToRGB",
+		Type: "EncodePng",
 		Input: []tf.Input{
-			images,
+			image,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -8976,29 +9440,6 @@ func SparseSparseMinimum(scope *Scope, a_indices tf.Output, a_values tf.Output,
 	return op.Output(0), op.Output(1)
 }
 
-// Returns the set of files matching one or more glob patterns.
-//
-// Note that this routine only supports wildcard characters in the
-// basename portion of the pattern, not in the directory portion.
-//
-// Arguments:
-//	pattern: Shell wildcard pattern(s). Scalar or vector of type string.
-//
-// Returns A vector of matching filenames.
-func MatchingFiles(scope *Scope, pattern tf.Output) (filenames tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "MatchingFiles",
-		Input: []tf.Input{
-			pattern,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Computes the gradient of the sigmoid of `x` wrt its input.
 //
 // Specifically, `grad = dy * y * (1 - y)`, where `y = sigmoid(x)`, and
@@ -10189,180 +10630,68 @@ func PackAxis(value int64) PackAttr {
 // # 'z' is [3, 6]
 // pack([x, y, z]) => [[1, 4], [2, 5], [3, 6]]  # Pack along first dim.
 // pack([x, y, z], axis=1) => [[1, 2, 3], [4, 5, 6]]
-// ```
-//
-// This is the opposite of `unpack`.
-//
-// Arguments:
-//	values: Must be of same shape and type.
-//
-// Returns The packed tensor.
-func Pack(scope *Scope, values []tf.Output, optional ...PackAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "Pack",
-		Input: []tf.Input{
-			tf.OutputList(values),
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Deprecated. Use TensorArraySplitV3
-func TensorArraySplitV2(scope *Scope, handle tf.Output, value tf.Output, lengths tf.Output, flow_in tf.Output) (flow_out tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "TensorArraySplitV2",
-		Input: []tf.Input{
-			handle, value, lengths, flow_in,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// QuantizedReluAttr is an optional argument to QuantizedRelu.
-type QuantizedReluAttr func(optionalAttr)
-
-// QuantizedReluOutType sets the optional out_type attribute to value.
-// If not specified, defaults to DT_QUINT8
-func QuantizedReluOutType(value tf.DataType) QuantizedReluAttr {
-	return func(m optionalAttr) {
-		m["out_type"] = value
-	}
-}
-
-// Computes Quantized Rectified Linear: `max(features, 0)`
-//
-// Arguments:
-//
-//	min_features: The float value that the lowest quantized value represents.
-//	max_features: The float value that the highest quantized value represents.
-//
-// Returns Has the same output shape as "features".The float value that the lowest quantized value represents.The float value that the highest quantized value represents.
-func QuantizedRelu(scope *Scope, features tf.Output, min_features tf.Output, max_features tf.Output, optional ...QuantizedReluAttr) (activations tf.Output, min_activations tf.Output, max_activations tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "QuantizedRelu",
-		Input: []tf.Input{
-			features, min_features, max_features,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// InitializeTableFromTextFileV2Attr is an optional argument to InitializeTableFromTextFileV2.
-type InitializeTableFromTextFileV2Attr func(optionalAttr)
-
-// InitializeTableFromTextFileV2VocabSize sets the optional vocab_size attribute to value.
-//
-// value: Number of elements of the file, use -1 if unknown.
-// If not specified, defaults to -1
-//
-// REQUIRES: value >= -1
-func InitializeTableFromTextFileV2VocabSize(value int64) InitializeTableFromTextFileV2Attr {
-	return func(m optionalAttr) {
-		m["vocab_size"] = value
-	}
-}
-
-// InitializeTableFromTextFileV2Delimiter sets the optional delimiter attribute to value.
-//
-// value: Delimiter to separate fields in a line.
-// If not specified, defaults to "\t"
-func InitializeTableFromTextFileV2Delimiter(value string) InitializeTableFromTextFileV2Attr {
-	return func(m optionalAttr) {
-		m["delimiter"] = value
-	}
-}
-
-// Initializes a table from a text file.
-//
-// It inserts one key-value pair into the table for each line of the file.
-// The key and value is extracted from the whole line content, elements from the
-// split line based on `delimiter` or the line number (starting from zero).
-// Where to extract the key and value from a line is specified by `key_index` and
-// `value_index`.
-//
-// - A value of -1 means use the line number(starting from zero), expects `int64`.
-// - A value of -2 means use the whole line content, expects `string`.
-// - A value >= 0 means use the index (starting at zero) of the split line based
-//   on `delimiter`.
+// ```
+//
+// This is the opposite of `unpack`.
 //
 // Arguments:
-//	table_handle: Handle to a table which will be initialized.
-//	filename: Filename of a vocabulary text file.
-//	key_index: Column index in a line to get the table `key` values from.
-//	value_index: Column index that represents information of a line to get the table
-// `value` values from.
+//	values: Must be of same shape and type.
 //
-// Returns the created operation.
-func InitializeTableFromTextFileV2(scope *Scope, table_handle tf.Output, filename tf.Output, key_index int64, value_index int64, optional ...InitializeTableFromTextFileV2Attr) (o *tf.Operation) {
+// Returns The packed tensor.
+func Pack(scope *Scope, values []tf.Output, optional ...PackAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"key_index": key_index, "value_index": value_index}
+	attrs := map[string]interface{}{}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "InitializeTableFromTextFileV2",
+		Type: "Pack",
 		Input: []tf.Input{
-			table_handle, filename,
+			tf.OutputList(values),
 		},
 		Attrs: attrs,
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
-// ResourceSparseApplyProximalGradientDescentAttr is an optional argument to ResourceSparseApplyProximalGradientDescent.
-type ResourceSparseApplyProximalGradientDescentAttr func(optionalAttr)
+// Deprecated. Use TensorArraySplitV3
+func TensorArraySplitV2(scope *Scope, handle tf.Output, value tf.Output, lengths tf.Output, flow_in tf.Output) (flow_out tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "TensorArraySplitV2",
+		Input: []tf.Input{
+			handle, value, lengths, flow_in,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
 
-// ResourceSparseApplyProximalGradientDescentUseLocking sets the optional use_locking attribute to value.
-//
-// value: If True, the subtraction will be protected by a lock;
-// otherwise the behavior is undefined, but may exhibit less contention.
-// If not specified, defaults to false
-func ResourceSparseApplyProximalGradientDescentUseLocking(value bool) ResourceSparseApplyProximalGradientDescentAttr {
+// QuantizedReluAttr is an optional argument to QuantizedRelu.
+type QuantizedReluAttr func(optionalAttr)
+
+// QuantizedReluOutType sets the optional out_type attribute to value.
+// If not specified, defaults to DT_QUINT8
+func QuantizedReluOutType(value tf.DataType) QuantizedReluAttr {
 	return func(m optionalAttr) {
-		m["use_locking"] = value
+		m["out_type"] = value
 	}
 }
 
-// Sparse update '*var' as FOBOS algorithm with fixed learning rate.
-//
-// That is for rows we have grad for, we update var as follows:
-// prox_v = var - alpha * grad
-// var = sign(prox_v)/(1+alpha*l2) * max{|prox_v|-alpha*l1,0}
+// Computes Quantized Rectified Linear: `max(features, 0)`
 //
 // Arguments:
-//	var_: Should be from a Variable().
-//	alpha: Scaling factor. Must be a scalar.
-//	l1: L1 regularization. Must be a scalar.
-//	l2: L2 regularization. Must be a scalar.
-//	grad: The gradient.
-//	indices: A vector of indices into the first dimension of var and accum.
 //
-// Returns the created operation.
-func ResourceSparseApplyProximalGradientDescent(scope *Scope, var_ tf.Output, alpha tf.Output, l1 tf.Output, l2 tf.Output, grad tf.Output, indices tf.Output, optional ...ResourceSparseApplyProximalGradientDescentAttr) (o *tf.Operation) {
+//	min_features: The float value that the lowest quantized value represents.
+//	max_features: The float value that the highest quantized value represents.
+//
+// Returns Has the same output shape as "features".The float value that the lowest quantized value represents.The float value that the highest quantized value represents.
+func QuantizedRelu(scope *Scope, features tf.Output, min_features tf.Output, max_features tf.Output, optional ...QuantizedReluAttr) (activations tf.Output, min_activations tf.Output, max_activations tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -10371,13 +10700,14 @@ func ResourceSparseApplyProximalGradientDescent(scope *Scope, var_ tf.Output, al
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "ResourceSparseApplyProximalGradientDescent",
+		Type: "QuantizedRelu",
 		Input: []tf.Input{
-			var_, alpha, l1, l2, grad, indices,
+			features, min_features, max_features,
 		},
 		Attrs: attrs,
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
 }
 
 // Computes rectified linear gradients for a Relu operation.
@@ -10420,51 +10750,6 @@ func ReciprocalGrad(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
-// Computes the Cholesky decomposition of one or more square matrices.
-//
-// The input is a tensor of shape `[..., M, M]` whose inner-most 2 dimensions
-// form square matrices, with the same constraints as the single matrix Cholesky
-// decomposition above. The output is a tensor of the same shape as the input
-// containing the Cholesky decompositions for all input submatrices `[..., :, :]`.
-//
-// Arguments:
-//	input: Shape is `[..., M, M]`.
-//
-// Returns Shape is `[..., M, M]`.
-func Cholesky(scope *Scope, input tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Cholesky",
-		Input: []tf.Input{
-			input,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Writes contents to the file at input filename. Creates file if not existing.
-//
-// Arguments:
-//	filename: scalar. The name of the file to which we write the contents.
-//	contents: scalar. The content to be written to the output file.
-//
-// Returns the created operation.
-func WriteFile(scope *Scope, filename tf.Output, contents tf.Output) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "WriteFile",
-		Input: []tf.Input{
-			filename, contents,
-		},
-	}
-	return scope.AddOperation(opspec)
-}
-
 // Reverses specific dimensions of a tensor.
 //
 // NOTE `tf.reverse` has now changed behavior in preparation for 1.0.
@@ -10627,6 +10912,35 @@ func IFFT3D(scope *Scope, input tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
+// Looks up keys in a table, outputs the corresponding values.
+//
+// The tensor `keys` must of the same type as the keys of the table.
+// The output `values` is of the type of the table values.
+//
+// The scalar `default_value` is the value output for keys not present in the
+// table. It must also be of the same type as the table values.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//	keys: Any shape.  Keys to look up.
+//
+//
+// Returns Same shape as `keys`.  Values found in the table, or `default_values`
+// for missing keys.
+func LookupTableFindV2(scope *Scope, table_handle tf.Output, keys tf.Output, default_value tf.Output) (values tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "LookupTableFindV2",
+		Input: []tf.Input{
+			table_handle, keys, default_value,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Given a quantized tensor described by (input, input_min, input_max), outputs a
 //
 // range that covers the actual values present in that tensor.  This op is
@@ -11124,185 +11438,69 @@ func FFT2D(scope *Scope, input tf.Output) (output tf.Output) {
 			input,
 		},
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Creates a tensor filled with a scalar value.
-//
-// This operation creates a tensor of shape `dims` and fills it with `value`.
-//
-// For example:
-//
-// ```
-// # Output tensor has shape [2, 3].
-// fill([2, 3], 9) ==> [[9, 9, 9]
-//                      [9, 9, 9]]
-// ```
-//
-// Arguments:
-//	dims: 1-D. Represents the shape of the output tensor.
-//	value: 0-D (scalar). Value to fill the returned tensor.
-//
-// @compatibility(numpy)
-// Equivalent to np.full
-// @end_compatibility
-func Fill(scope *Scope, dims tf.Output, value tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Fill",
-		Input: []tf.Input{
-			dims, value,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Inverse 2D fast Fourier transform.
-//
-// Computes the inverse 2-dimensional discrete Fourier transform over the
-// inner-most 2 dimensions of `input`.
-//
-// Arguments:
-//	input: A complex64 tensor.
-//
-// Returns A complex64 tensor of the same shape as `input`. The inner-most 2
-//   dimensions of `input` are replaced with their inverse 2D Fourier transform.
-//
-// @compatibility(numpy)
-// Equivalent to np.fft.ifft2
-// @end_compatibility
-func IFFT2D(scope *Scope, input tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "IFFT2D",
-		Input: []tf.Input{
-			input,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// MutableHashTableOfTensorsV2Attr is an optional argument to MutableHashTableOfTensorsV2.
-type MutableHashTableOfTensorsV2Attr func(optionalAttr)
-
-// MutableHashTableOfTensorsV2Container sets the optional container attribute to value.
-//
-// value: If non-empty, this table is placed in the given container.
-// Otherwise, a default container is used.
-// If not specified, defaults to ""
-func MutableHashTableOfTensorsV2Container(value string) MutableHashTableOfTensorsV2Attr {
-	return func(m optionalAttr) {
-		m["container"] = value
-	}
-}
-
-// MutableHashTableOfTensorsV2SharedName sets the optional shared_name attribute to value.
-//
-// value: If non-empty, this table is shared under the given name across
-// multiple sessions.
-// If not specified, defaults to ""
-func MutableHashTableOfTensorsV2SharedName(value string) MutableHashTableOfTensorsV2Attr {
-	return func(m optionalAttr) {
-		m["shared_name"] = value
-	}
-}
-
-// MutableHashTableOfTensorsV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
-// If not specified, defaults to false
-func MutableHashTableOfTensorsV2UseNodeNameSharing(value bool) MutableHashTableOfTensorsV2Attr {
-	return func(m optionalAttr) {
-		m["use_node_name_sharing"] = value
-	}
-}
-
-// MutableHashTableOfTensorsV2ValueShape sets the optional value_shape attribute to value.
-// If not specified, defaults to <>
-func MutableHashTableOfTensorsV2ValueShape(value tf.Shape) MutableHashTableOfTensorsV2Attr {
-	return func(m optionalAttr) {
-		m["value_shape"] = value
-	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
-// Creates an empty hash table.
+// Creates a tensor filled with a scalar value.
 //
-// This op creates a mutable hash table, specifying the type of its keys and
-// values. Each value must be a vector. Data can be inserted into the table using
-// the insert operations. It does not support the initialization operation.
+// This operation creates a tensor of shape `dims` and fills it with `value`.
+//
+// For example:
+//
+// ```
+// # Output tensor has shape [2, 3].
+// fill([2, 3], 9) ==> [[9, 9, 9]
+//                      [9, 9, 9]]
+// ```
 //
 // Arguments:
-//	key_dtype: Type of the table keys.
-//	value_dtype: Type of the table values.
+//	dims: 1-D. Represents the shape of the output tensor.
+//	value: 0-D (scalar). Value to fill the returned tensor.
 //
-// Returns Handle to a table.
-func MutableHashTableOfTensorsV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...MutableHashTableOfTensorsV2Attr) (table_handle tf.Output) {
+// @compatibility(numpy)
+// Equivalent to np.full
+// @end_compatibility
+func Fill(scope *Scope, dims tf.Output, value tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "MutableHashTableOfTensorsV2",
-
-		Attrs: attrs,
+		Type: "Fill",
+		Input: []tf.Input{
+			dims, value,
+		},
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// ResourceApplyProximalAdagradAttr is an optional argument to ResourceApplyProximalAdagrad.
-type ResourceApplyProximalAdagradAttr func(optionalAttr)
-
-// ResourceApplyProximalAdagradUseLocking sets the optional use_locking attribute to value.
-//
-// value: If True, updating of the var and accum tensors will be protected by
-// a lock; otherwise the behavior is undefined, but may exhibit less contention.
-// If not specified, defaults to false
-func ResourceApplyProximalAdagradUseLocking(value bool) ResourceApplyProximalAdagradAttr {
-	return func(m optionalAttr) {
-		m["use_locking"] = value
-	}
-}
-
-// Update '*var' and '*accum' according to FOBOS with Adagrad learning rate.
+// Inverse 2D fast Fourier transform.
 //
-// accum += grad * grad
-// prox_v = var - lr * grad * (1 / sqrt(accum))
-// var = sign(prox_v)/(1+lr*l2) * max{|prox_v|-lr*l1,0}
+// Computes the inverse 2-dimensional discrete Fourier transform over the
+// inner-most 2 dimensions of `input`.
 //
 // Arguments:
-//	var_: Should be from a Variable().
-//	accum: Should be from a Variable().
-//	lr: Scaling factor. Must be a scalar.
-//	l1: L1 regularization. Must be a scalar.
-//	l2: L2 regularization. Must be a scalar.
-//	grad: The gradient.
+//	input: A complex64 tensor.
 //
-// Returns the created operation.
-func ResourceApplyProximalAdagrad(scope *Scope, var_ tf.Output, accum tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, grad tf.Output, optional ...ResourceApplyProximalAdagradAttr) (o *tf.Operation) {
+// Returns A complex64 tensor of the same shape as `input`. The inner-most 2
+//   dimensions of `input` are replaced with their inverse 2D Fourier transform.
+//
+// @compatibility(numpy)
+// Equivalent to np.fft.ifft2
+// @end_compatibility
+func IFFT2D(scope *Scope, input tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "ResourceApplyProximalAdagrad",
+		Type: "IFFT2D",
 		Input: []tf.Input{
-			var_, accum, lr, l1, l2, grad,
+			input,
 		},
-		Attrs: attrs,
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
 // TensorArrayV3Attr is an optional argument to TensorArrayV3.
@@ -11619,54 +11817,6 @@ func FractionalMaxPoolGrad(scope *Scope, orig_input tf.Output, orig_output tf.Ou
 	return op.Output(0)
 }
 
-// AvgPool3DGradAttr is an optional argument to AvgPool3DGrad.
-type AvgPool3DGradAttr func(optionalAttr)
-
-// AvgPool3DGradDataFormat sets the optional data_format attribute to value.
-//
-// value: The data format of the input and output data. With the
-// default format "NDHWC", the data is stored in the order of:
-//     [batch, in_depth, in_height, in_width, in_channels].
-// Alternatively, the format could be "NCDHW", the data storage order is:
-//     [batch, in_channels, in_depth, in_height, in_width].
-// If not specified, defaults to "NDHWC"
-func AvgPool3DGradDataFormat(value string) AvgPool3DGradAttr {
-	return func(m optionalAttr) {
-		m["data_format"] = value
-	}
-}
-
-// Computes gradients of average pooling function.
-//
-// Arguments:
-//	orig_input_shape: The original input dimensions.
-//	grad: Output backprop of shape `[batch, depth, rows, cols, channels]`.
-//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
-// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
-//	strides: 1-D tensor of length 5. The stride of the sliding window for each
-// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
-//	padding: The type of padding algorithm to use.
-//
-// Returns The backprop for input.
-func AvgPool3DGrad(scope *Scope, orig_input_shape tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "AvgPool3DGrad",
-		Input: []tf.Input{
-			orig_input_shape, grad,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // QuantizedRelu6Attr is an optional argument to QuantizedRelu6.
 type QuantizedRelu6Attr func(optionalAttr)
 
@@ -12745,6 +12895,54 @@ func Tanh(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
+// AvgPool3DGradAttr is an optional argument to AvgPool3DGrad.
+type AvgPool3DGradAttr func(optionalAttr)
+
+// AvgPool3DGradDataFormat sets the optional data_format attribute to value.
+//
+// value: The data format of the input and output data. With the
+// default format "NDHWC", the data is stored in the order of:
+//     [batch, in_depth, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCDHW", the data storage order is:
+//     [batch, in_channels, in_depth, in_height, in_width].
+// If not specified, defaults to "NDHWC"
+func AvgPool3DGradDataFormat(value string) AvgPool3DGradAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Computes gradients of average pooling function.
+//
+// Arguments:
+//	orig_input_shape: The original input dimensions.
+//	grad: Output backprop of shape `[batch, depth, rows, cols, channels]`.
+//	ksize: 1-D tensor of length 5. The size of the window for each dimension of
+// the input tensor. Must have `ksize[0] = ksize[4] = 1`.
+//	strides: 1-D tensor of length 5. The stride of the sliding window for each
+// dimension of `input`. Must have `strides[0] = strides[4] = 1`.
+//	padding: The type of padding algorithm to use.
+//
+// Returns The backprop for input.
+func AvgPool3DGrad(scope *Scope, orig_input_shape tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPool3DGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "AvgPool3DGrad",
+		Input: []tf.Input{
+			orig_input_shape, grad,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // TextLineReaderV2Attr is an optional argument to TextLineReaderV2.
 type TextLineReaderV2Attr func(optionalAttr)
 
@@ -13390,39 +13588,6 @@ func ResourceApplyAdadelta(scope *Scope, var_ tf.Output, accum tf.Output, accum_
 	return scope.AddOperation(opspec)
 }
 
-// Shuffle dimensions of x according to a permutation.
-//
-// The output `y` has the same rank as `x`. The shapes of `x` and `y` satisfy:
-//   `y.shape[i] == x.shape[perm[i]] for i in [0, 1, ..., rank(x) - 1]`
-func Transpose(scope *Scope, x tf.Output, perm tf.Output) (y tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Transpose",
-		Input: []tf.Input{
-			x, perm,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Reads and outputs the entire contents of the input filename.
-func ReadFile(scope *Scope, filename tf.Output) (contents tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "ReadFile",
-		Input: []tf.Input{
-			filename,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Output a fact about factorials.
 func Fact(scope *Scope) (fact tf.Output) {
 	if scope.Err() != nil {
@@ -14230,62 +14395,31 @@ func GatherValidateIndices(value bool) GatherAttr {
 //     output[i, ..., j, :, ... :] = params[indices[i, ..., j], :, ..., :]
 // ```
 //
-// If `indices` is a permutation and `len(indices) == params.shape[0]` then
-// this operation will permute `params` accordingly.
-//
-// `validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
-// `indices` are always validated to be within range. If assigned to GPU,
-// out-of-bound indices result in safe but unspecified behavior, which may include
-// raising an error.
-//
-// <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="https://www.tensorflow.org/images/Gather.png" alt>
-// </div>
-func Gather(scope *Scope, params tf.Output, indices tf.Output, optional ...GatherAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "Gather",
-		Input: []tf.Input{
-			params, indices,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Adjust the contrast of one or more images.
-//
-// `images` is a tensor of at least 3 dimensions.  The last 3 dimensions are
-// interpreted as `[height, width, channels]`.  The other dimensions only
-// represent a collection of images, such as `[batch, height, width, channels].`
-//
-// Contrast is adjusted independently for each channel of each image.
-//
-// For each channel, the Op first computes the mean of the image pixels in the
-// channel and then adjusts each component of each pixel to
-// `(x - mean) * contrast_factor + mean`.
+// If `indices` is a permutation and `len(indices) == params.shape[0]` then
+// this operation will permute `params` accordingly.
 //
-// Arguments:
-//	images: Images to adjust.  At least 3-D.
-//	contrast_factor: A float multiplier for adjusting contrast.
+// `validate_indices`: DEPRECATED. If this operation is assigned to CPU, values in
+// `indices` are always validated to be within range. If assigned to GPU,
+// out-of-bound indices result in safe but unspecified behavior, which may include
+// raising an error.
 //
-// Returns The contrast-adjusted image or images.
-func AdjustContrastv2(scope *Scope, images tf.Output, contrast_factor tf.Output) (output tf.Output) {
+// <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
+// <img style="width:100%" src="https://www.tensorflow.org/images/Gather.png" alt>
+// </div>
+func Gather(scope *Scope, params tf.Output, indices tf.Output, optional ...GatherAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "AdjustContrastv2",
+		Type: "Gather",
 		Input: []tf.Input{
-			images, contrast_factor,
+			params, indices,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -14386,31 +14520,6 @@ func Dilation2D(scope *Scope, input tf.Output, filter tf.Output, strides []int64
 	return op.Output(0)
 }
 
-// Decode the first frame of a GIF-encoded image to a uint8 tensor.
-//
-// GIF with frame or transparency compression are not supported
-// convert animated GIF from compressed to uncompressed by:
-//
-// convert $src.gif -coalesce $dst.gif
-//
-// Arguments:
-//	contents: 0-D.  The GIF-encoded image.
-//
-// Returns 4-D with shape `[num_frames, height, width, 3]`. RGB order
-func DecodeGif(scope *Scope, contents tf.Output) (image tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "DecodeGif",
-		Input: []tf.Input{
-			contents,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // EncodeBase64Attr is an optional argument to EncodeBase64.
 type EncodeBase64Attr func(optionalAttr)
 
@@ -14672,143 +14781,118 @@ func SparseSegmentSqrtN(scope *Scope, data tf.Output, indices tf.Output, segment
 	return op.Output(0)
 }
 
-// Component-wise divides a SparseTensor by a dense Tensor.
+// ResizeBilinearGradAttr is an optional argument to ResizeBilinearGrad.
+type ResizeBilinearGradAttr func(optionalAttr)
+
+// ResizeBilinearGradAlignCorners sets the optional align_corners attribute to value.
 //
-// *Limitation*: this Op only broadcasts the dense side to the sparse side, but not
-// the other direction.
+// value: If true, rescale grads by (orig_height - 1) / (height - 1), which
+// exactly aligns the 4 corners of grads and original_image. If false, rescale by
+// orig_height / height. Treat similarly the width dimension.
+// If not specified, defaults to false
+func ResizeBilinearGradAlignCorners(value bool) ResizeBilinearGradAttr {
+	return func(m optionalAttr) {
+		m["align_corners"] = value
+	}
+}
+
+// Computes the gradient of bilinear interpolation.
 //
 // Arguments:
-//	sp_indices: 2-D.  `N x R` matrix with the indices of non-empty values in a
-// SparseTensor, possibly not in canonical ordering.
-//	sp_values: 1-D.  `N` non-empty values corresponding to `sp_indices`.
-//	sp_shape: 1-D.  Shape of the input SparseTensor.
-//	dense: `R`-D.  The dense Tensor operand.
+//	grads: 4-D with shape `[batch, height, width, channels]`.
+//	original_image: 4-D with shape `[batch, orig_height, orig_width, channels]`,
+// The image tensor that was resized.
 //
-// Returns 1-D.  The `N` values that are operated on.
-func SparseDenseCwiseDiv(scope *Scope, sp_indices tf.Output, sp_values tf.Output, sp_shape tf.Output, dense tf.Output) (output tf.Output) {
+// Returns 4-D with shape `[batch, orig_height, orig_width, channels]`.
+// Gradients with respect to the input image. Input image must have been
+// float or double.
+func ResizeBilinearGrad(scope *Scope, grads tf.Output, original_image tf.Output, optional ...ResizeBilinearGradAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "SparseDenseCwiseDiv",
+		Type: "ResizeBilinearGrad",
 		Input: []tf.Input{
-			sp_indices, sp_values, sp_shape, dense,
+			grads, original_image,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Reads the value of a variable.
-//
-// The tensor returned by this operation is immutable.
-//
-// The value returned by this operation is guaranteed to be influenced by all the
-// writes on which this operation depends directly or indirectly, and to not be
-// influenced by any of the writes which depend directly or indirectly on this
-// operation.
+// Computes the number of elements in the given table.
 //
 // Arguments:
-//	resource: handle to the resource in which to store the variable.
-//	dtype: the dtype of the value.
-func ReadVariableOp(scope *Scope, resource tf.Output, dtype tf.DataType) (value tf.Output) {
+//	table_handle: Handle to the table.
+//
+// Returns Scalar that contains number of elements in the table.
+func LookupTableSizeV2(scope *Scope, table_handle tf.Output) (size tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"dtype": dtype}
 	opspec := tf.OpSpec{
-		Type: "ReadVariableOp",
+		Type: "LookupTableSizeV2",
 		Input: []tf.Input{
-			resource,
+			table_handle,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// ProdAttr is an optional argument to Prod.
-type ProdAttr func(optionalAttr)
-
-// ProdKeepDims sets the optional keep_dims attribute to value.
-//
-// value: If true, retain reduced dimensions with length 1.
-// If not specified, defaults to false
-func ProdKeepDims(value bool) ProdAttr {
-	return func(m optionalAttr) {
-		m["keep_dims"] = value
-	}
-}
-
-// Computes the product of elements across dimensions of a tensor.
+// Component-wise divides a SparseTensor by a dense Tensor.
 //
-// Reduces `input` along the dimensions given in `reduction_indices`. Unless
-// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in
-// `reduction_indices`. If `keep_dims` is true, the reduced dimensions are
-// retained with length 1.
+// *Limitation*: this Op only broadcasts the dense side to the sparse side, but not
+// the other direction.
 //
 // Arguments:
-//	input: The tensor to reduce.
-//	reduction_indices: The dimensions to reduce.
+//	sp_indices: 2-D.  `N x R` matrix with the indices of non-empty values in a
+// SparseTensor, possibly not in canonical ordering.
+//	sp_values: 1-D.  `N` non-empty values corresponding to `sp_indices`.
+//	sp_shape: 1-D.  Shape of the input SparseTensor.
+//	dense: `R`-D.  The dense Tensor operand.
 //
-// Returns The reduced tensor.
-func Prod(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ...ProdAttr) (output tf.Output) {
+// Returns 1-D.  The `N` values that are operated on.
+func SparseDenseCwiseDiv(scope *Scope, sp_indices tf.Output, sp_values tf.Output, sp_shape tf.Output, dense tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "Prod",
+		Type: "SparseDenseCwiseDiv",
 		Input: []tf.Input{
-			input, reduction_indices,
+			sp_indices, sp_values, sp_shape, dense,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// ResizeBilinearAttr is an optional argument to ResizeBilinear.
-type ResizeBilinearAttr func(optionalAttr)
-
-// ResizeBilinearAlignCorners sets the optional align_corners attribute to value.
+// Reads the value of a variable.
 //
-// value: If true, rescale input by (new_height - 1) / (height - 1), which
-// exactly aligns the 4 corners of images and resized images. If false, rescale
-// by new_height / height. Treat similarly the width dimension.
-// If not specified, defaults to false
-func ResizeBilinearAlignCorners(value bool) ResizeBilinearAttr {
-	return func(m optionalAttr) {
-		m["align_corners"] = value
-	}
-}
-
-// Resize `images` to `size` using bilinear interpolation.
+// The tensor returned by this operation is immutable.
 //
-// Input images can be of different types but output images are always float.
+// The value returned by this operation is guaranteed to be influenced by all the
+// writes on which this operation depends directly or indirectly, and to not be
+// influenced by any of the writes which depend directly or indirectly on this
+// operation.
 //
 // Arguments:
-//	images: 4-D with shape `[batch, height, width, channels]`.
-//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
-// new size for the images.
-//
-// Returns 4-D with shape
-// `[batch, new_height, new_width, channels]`.
-func ResizeBilinear(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeBilinearAttr) (resized_images tf.Output) {
+//	resource: handle to the resource in which to store the variable.
+//	dtype: the dtype of the value.
+func ReadVariableOp(scope *Scope, resource tf.Output, dtype tf.DataType) (value tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
+	attrs := map[string]interface{}{"dtype": dtype}
 	opspec := tf.OpSpec{
-		Type: "ResizeBilinear",
+		Type: "ReadVariableOp",
 		Input: []tf.Input{
-			images, size,
+			resource,
 		},
 		Attrs: attrs,
 	}
@@ -14964,25 +15048,127 @@ func SparseSoftmax(scope *Scope, sp_indices tf.Output, sp_values tf.Output, sp_s
 	return op.Output(0)
 }
 
-// Computes gradients for SparseSegmentMean.
+// Computes gradients for SparseSegmentMean.
+//
+// Returns tensor "output" with same shape as grad, except for dimension 0 whose
+// value is output_dim0.
+//
+// Arguments:
+//	grad: gradient propagated to the SparseSegmentMean op.
+//	indices: indices passed to the corresponding SparseSegmentMean op.
+//	segment_ids: segment_ids passed to the corresponding SparseSegmentMean op.
+//	output_dim0: dimension 0 of "data" passed to SparseSegmentMean op.
+func SparseSegmentMeanGrad(scope *Scope, grad tf.Output, indices tf.Output, segment_ids tf.Output, output_dim0 tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "SparseSegmentMeanGrad",
+		Input: []tf.Input{
+			grad, indices, segment_ids, output_dim0,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Converts one or more images from RGB to HSV.
+//
+// Outputs a tensor of the same shape as the `images` tensor, containing the HSV
+// value of the pixels. The output is only well defined if the value in `images`
+// are in `[0,1]`.
+//
+// `output[..., 0]` contains hue, `output[..., 1]` contains saturation, and
+// `output[..., 2]` contains value. All HSV values are in `[0,1]`. A hue of 0
+// corresponds to pure red, hue 1/3 is pure green, and 2/3 is pure blue.
+//
+// Arguments:
+//	images: 1-D or higher rank. RGB data to convert. Last dimension must be size 3.
+//
+// Returns `images` converted to HSV.
+func RGBToHSV(scope *Scope, images tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "RGBToHSV",
+		Input: []tf.Input{
+			images,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// MatrixSolveLsAttr is an optional argument to MatrixSolveLs.
+type MatrixSolveLsAttr func(optionalAttr)
+
+// MatrixSolveLsFast sets the optional fast attribute to value.
+// If not specified, defaults to true
+func MatrixSolveLsFast(value bool) MatrixSolveLsAttr {
+	return func(m optionalAttr) {
+		m["fast"] = value
+	}
+}
+
+// Solves one or more linear least-squares problems.
 //
-// Returns tensor "output" with same shape as grad, except for dimension 0 whose
-// value is output_dim0.
+// `matrix` is a tensor of shape `[..., M, N]` whose inner-most 2 dimensions
+// form matrices of size `[M, N]`. Rhs is a tensor of shape `[..., M, K]`.
+// The output is a tensor shape `[..., N, K]` where each output matrix solves
+// each of the equations matrix[..., :, :] * output[..., :, :] = rhs[..., :, :]
+// in the least squares sense.
+//
+// matrix and right-hand sides in the batch:
+//
+// `matrix`=\\(A \in \Re^{m \times n}\\),
+// `rhs`=\\(B  \in \Re^{m \times k}\\),
+// `output`=\\(X  \in \Re^{n \times k}\\),
+// `l2_regularizer`=\\(\lambda\\).
+//
+// If `fast` is `True`, then the solution is computed by solving the normal
+// equations using Cholesky decomposition. Specifically, if \\(m \ge n\\) then
+// \\(X = (A^T A + \lambda I)^{-1} A^T B\\), which solves the least-squares
+// problem \\(X = \mathrm{argmin}_{Z \in \Re^{n \times k} } ||A Z - B||_F^2 +
+// \lambda ||Z||_F^2\\). If \\(m \lt n\\) then `output` is computed as
+// \\(X = A^T (A A^T + \lambda I)^{-1} B\\), which (for \\(\lambda = 0\\)) is the
+// minimum-norm solution to the under-determined linear system, i.e.
+// \\(X = \mathrm{argmin}_{Z \in \Re^{n \times k} } ||Z||_F^2 \\), subject to
+// \\(A Z = B\\). Notice that the fast path is only numerically stable when
+// \\(A\\) is numerically full rank and has a condition number
+// \\(\mathrm{cond}(A) \lt \frac{1}{\sqrt{\epsilon_{mach} } }\\) or\\(\lambda\\) is
+// sufficiently large.
+//
+// If `fast` is `False` an algorithm based on the numerically robust complete
+// orthogonal decomposition is used. This computes the minimum-norm
+// least-squares solution, even when \\(A\\) is rank deficient. This path is
+// typically 6-7 times slower than the fast path. If `fast` is `False` then
+// `l2_regularizer` is ignored.
 //
 // Arguments:
-//	grad: gradient propagated to the SparseSegmentMean op.
-//	indices: indices passed to the corresponding SparseSegmentMean op.
-//	segment_ids: segment_ids passed to the corresponding SparseSegmentMean op.
-//	output_dim0: dimension 0 of "data" passed to SparseSegmentMean op.
-func SparseSegmentMeanGrad(scope *Scope, grad tf.Output, indices tf.Output, segment_ids tf.Output, output_dim0 tf.Output) (output tf.Output) {
+//	matrix: Shape is `[..., M, N]`.
+//	rhs: Shape is `[..., M, K]`.
+//	l2_regularizer: Scalar tensor.
+//
+// @compatibility(numpy)
+// Equivalent to np.linalg.lstsq
+// @end_compatibility
+//
+// Returns Shape is `[..., N, K]`.
+func MatrixSolveLs(scope *Scope, matrix tf.Output, rhs tf.Output, l2_regularizer tf.Output, optional ...MatrixSolveLsAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "SparseSegmentMeanGrad",
+		Type: "MatrixSolveLs",
 		Input: []tf.Input{
-			grad, indices, segment_ids, output_dim0,
+			matrix, rhs, l2_regularizer,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -15770,6 +15956,30 @@ func TanhGrad(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
+// Outputs all keys and values in the table.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//
+//
+//
+// Returns Vector of all keys present in the table.Tensor of all values in the table. Indexed in parallel with `keys`.
+func LookupTableExportV2(scope *Scope, table_handle tf.Output, Tkeys tf.DataType, Tvalues tf.DataType) (keys tf.Output, values tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"Tkeys": Tkeys, "Tvalues": Tvalues}
+	opspec := tf.OpSpec{
+		Type: "LookupTableExportV2",
+		Input: []tf.Input{
+			table_handle,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1)
+}
+
 // AddManySparseToTensorsMapAttr is an optional argument to AddManySparseToTensorsMap.
 type AddManySparseToTensorsMapAttr func(optionalAttr)
 
@@ -15877,6 +16087,153 @@ func StringToHashBucketFast(scope *Scope, input tf.Output, num_buckets int64) (o
 	return op.Output(0)
 }
 
+// TensorArrayGatherV3Attr is an optional argument to TensorArrayGatherV3.
+type TensorArrayGatherV3Attr func(optionalAttr)
+
+// TensorArrayGatherV3ElementShape sets the optional element_shape attribute to value.
+//
+// value: The expected shape of an element, if known. Used to
+// validate the shapes of TensorArray elements. If this shape is not
+// fully specified, gathering zero-size TensorArrays is an error.
+// If not specified, defaults to <unknown_rank:true >
+func TensorArrayGatherV3ElementShape(value tf.Shape) TensorArrayGatherV3Attr {
+	return func(m optionalAttr) {
+		m["element_shape"] = value
+	}
+}
+
+// Gather specific elements from the TensorArray into output `value`.
+//
+// All elements selected by `indices` must have the same shape.
+//
+// Arguments:
+//	handle: The handle to a TensorArray.
+//	indices: The locations in the TensorArray from which to read tensor elements.
+//	flow_in: A float scalar that enforces proper chaining of operations.
+//	dtype: The type of the elem that is returned.
+//
+// Returns All of the elements in the TensorArray, concatenated along a new
+// axis (the new dimension 0).
+func TensorArrayGatherV3(scope *Scope, handle tf.Output, indices tf.Output, flow_in tf.Output, dtype tf.DataType, optional ...TensorArrayGatherV3Attr) (value tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"dtype": dtype}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "TensorArrayGatherV3",
+		Input: []tf.Input{
+			handle, indices, flow_in,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Deprecated. Disallowed in GraphDef version >= 2.
+//
+// DEPRECATED at GraphDef version 2: Use AdjustContrastv2 instead
+func AdjustContrast(scope *Scope, images tf.Output, contrast_factor tf.Output, min_value tf.Output, max_value tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "AdjustContrast",
+		Input: []tf.Input{
+			images, contrast_factor, min_value, max_value,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// MaxPoolGradGradAttr is an optional argument to MaxPoolGradGrad.
+type MaxPoolGradGradAttr func(optionalAttr)
+
+// MaxPoolGradGradDataFormat sets the optional data_format attribute to value.
+//
+// value: Specify the data format of the input and output data. With the
+// default format "NHWC", the data is stored in the order of:
+//     [batch, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCHW", the data storage order of:
+//     [batch, in_channels, in_height, in_width].
+// If not specified, defaults to "NHWC"
+func MaxPoolGradGradDataFormat(value string) MaxPoolGradGradAttr {
+	return func(m optionalAttr) {
+		m["data_format"] = value
+	}
+}
+
+// Computes second-order gradients of the maxpooling function.
+//
+// Arguments:
+//	orig_input: The original input tensor.
+//	orig_output: The original output tensor.
+//	grad: 4-D.  Gradients of gradients w.r.t. the input of `max_pool`.
+//	ksize: The size of the window for each dimension of the input tensor.
+//	strides: The stride of the sliding window for each dimension of the
+// input tensor.
+//	padding: The type of padding algorithm to use.
+//
+// Returns Gradients of gradients w.r.t. the input to `max_pool`.
+func MaxPoolGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPoolGradGradAttr) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "MaxPoolGradGrad",
+		Input: []tf.Input{
+			orig_input, orig_output, grad,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// 3D real-valued fast Fourier transform.
+//
+// Computes the 3-dimensional discrete Fourier transform of a real-valued signal
+// over the inner-most 3 dimensions of `input`.
+//
+// Since the DFT of a real signal is Hermitian-symmetric, `RFFT3D` only returns the
+// `fft_length / 2 + 1` unique components of the FFT for the inner-most dimension
+// of `output`: the zero-frequency term, followed by the `fft_length / 2`
+// positive-frequency terms.
+//
+// Arguments:
+//	input: A float32 tensor.
+//	fft_length: An int32 tensor of shape [3]. The FFT length for each dimension.
+//
+// Returns A complex64 tensor of the same rank as `input`. The inner-most 3
+//   dimensions of `input` are replaced with the their 3D Fourier transform. The
+//   inner-most dimension contains `fft_length / 2 + 1` unique frequency
+//   components.
+//
+// @compatibility(numpy)
+// Equivalent to np.fft.rfftn with 3 dimensions.
+// @end_compatibility
+func RFFT3D(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "RFFT3D",
+		Input: []tf.Input{
+			input, fft_length,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // UniqueWithCountsAttr is an optional argument to UniqueWithCounts.
 type UniqueWithCountsAttr func(optionalAttr)
 
@@ -16704,8 +17061,32 @@ func FractionalAvgPool(scope *Scope, value tf.Output, pooling_ratio []float32, o
 		},
 		Attrs: attrs,
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
+// Updates the table to associates keys with values.
+//
+// The tensor `keys` must be of the same type as the keys of the table.
+// The tensor `values` must be of the type of the table values.
+//
+// Arguments:
+//	table_handle: Handle to the table.
+//	keys: Any shape.  Keys to look up.
+//	values: Values to associate with keys.
+//
+// Returns the created operation.
+func LookupTableInsertV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "LookupTableInsertV2",
+		Input: []tf.Input{
+			table_handle, keys, values,
+		},
+	}
+	return scope.AddOperation(opspec)
 }
 
 // Produces the average pool of the input tensor for quantized types.
@@ -16997,41 +17378,6 @@ func ComplexAbs(scope *Scope, x tf.Output, optional ...ComplexAbsAttr) (y tf.Out
 	return op.Output(0)
 }
 
-// Draw bounding boxes on a batch of images.
-//
-// Outputs a copy of `images` but draws on top of the pixels zero or more bounding
-// boxes specified by the locations in `boxes`. The coordinates of the each
-// bounding box in `boxes` are encoded as `[y_min, x_min, y_max, x_max]`. The
-// bounding box coordinates are floats in `[0.0, 1.0]` relative to the width and
-// height of the underlying image.
-//
-// For example, if an image is 100 x 200 pixels and the bounding box is
-// `[0.1, 0.2, 0.5, 0.9]`, the bottom-left and upper-right coordinates of the
-// bounding box will be `(10, 40)` to `(50, 180)`.
-//
-// Parts of the bounding box may fall outside the image.
-//
-// Arguments:
-//	images: 4-D with shape `[batch, height, width, depth]`. A batch of images.
-//	boxes: 3-D with shape `[batch, num_bounding_boxes, 4]` containing bounding
-// boxes.
-//
-// Returns 4-D with the same shape as `images`. The batch of input images with
-// bounding boxes drawn on the images.
-func DrawBoundingBoxes(scope *Scope, images tf.Output, boxes tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "DrawBoundingBoxes",
-		Input: []tf.Input{
-			images, boxes,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Returns the element-wise max of two SparseTensors.
 //
 // Assumes the two SparseTensors have the same shape, i.e., no broadcasting.
@@ -17501,28 +17847,6 @@ func Log(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
-// Computes rectified linear 6 gradients for a Relu6 operation.
-//
-// Arguments:
-//	gradients: The backpropagated gradients to the corresponding Relu6 operation.
-//	features: The features passed as input to the corresponding Relu6 operation.
-//
-// Returns The gradients:
-// `gradients * (features > 0) * (features < 6)`.
-func Relu6Grad(scope *Scope, gradients tf.Output, features tf.Output) (backprops tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Relu6Grad",
-		Input: []tf.Input{
-			gradients, features,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // ResizeBicubicAttr is an optional argument to ResizeBicubic.
 type ResizeBicubicAttr func(optionalAttr)
 
@@ -17568,6 +17892,28 @@ func ResizeBicubic(scope *Scope, images tf.Output, size tf.Output, optional ...R
 	return op.Output(0)
 }
 
+// Computes rectified linear 6 gradients for a Relu6 operation.
+//
+// Arguments:
+//	gradients: The backpropagated gradients to the corresponding Relu6 operation.
+//	features: The features passed as input to the corresponding Relu6 operation.
+//
+// Returns The gradients:
+// `gradients * (features > 0) * (features < 6)`.
+func Relu6Grad(scope *Scope, gradients tf.Output, features tf.Output) (backprops tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Relu6Grad",
+		Input: []tf.Input{
+			gradients, features,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes natural logarithm of (1 + x) element-wise.
 //
 // I.e., \\(y = \log_e (1 + x)\\).
@@ -17659,198 +18005,23 @@ func Erfc(scope *Scope, x tf.Output) (y tf.Output) {
 //	input: A float32 tensor.
 //	fft_length: An int32 tensor of shape [2]. The FFT length for each dimension.
 //
-// Returns A complex64 tensor of the same rank as `input`. The inner-most 2
-//   dimensions of `input` are replaced with their 2D Fourier transform. The
-//   inner-most dimension contains `fft_length / 2 + 1` unique frequency
-//   components.
-//
-// @compatibility(numpy)
-// Equivalent to np.fft.rfft2
-// @end_compatibility
-func RFFT2D(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "RFFT2D",
-		Input: []tf.Input{
-			input, fft_length,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Gradients for batch normalization.
-//
-// DEPRECATED at GraphDef version 9: Use tf.nn.batch_normalization()
-//
-// This op is deprecated. See `tf.nn.batch_normalization`.
-//
-// Arguments:
-//	t: A 4D input Tensor.
-//	m: A 1D mean Tensor with size matching the last dimension of t.
-// This is the first output from tf.nn.moments,
-// or a saved moving average thereof.
-//	v: A 1D variance Tensor with size matching the last dimension of t.
-// This is the second output from tf.nn.moments,
-// or a saved moving average thereof.
-//	gamma: A 1D gamma Tensor with size matching the last dimension of t.
-// If "scale_after_normalization" is true, this Tensor will be multiplied
-// with the normalized Tensor.
-//	backprop: 4D backprop Tensor.
-//	variance_epsilon: A small float number to avoid dividing by 0.
-//	scale_after_normalization: A bool indicating whether the resulted tensor
-// needs to be multiplied with gamma.
-//
-// Returns 4D backprop tensor for input.1D backprop tensor for mean.1D backprop tensor for variance.1D backprop tensor for beta.1D backprop tensor for gamma.
-func BatchNormWithGlobalNormalizationGrad(scope *Scope, t tf.Output, m tf.Output, v tf.Output, gamma tf.Output, backprop tf.Output, variance_epsilon float32, scale_after_normalization bool) (dx tf.Output, dm tf.Output, dv tf.Output, db tf.Output, dg tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"variance_epsilon": variance_epsilon, "scale_after_normalization": scale_after_normalization}
-	opspec := tf.OpSpec{
-		Type: "BatchNormWithGlobalNormalizationGrad",
-		Input: []tf.Input{
-			t, m, v, gamma, backprop,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2), op.Output(3), op.Output(4)
-}
-
-// EncodeJpegAttr is an optional argument to EncodeJpeg.
-type EncodeJpegAttr func(optionalAttr)
-
-// EncodeJpegFormat sets the optional format attribute to value.
-//
-// value: Per pixel image format.
-// If not specified, defaults to ""
-func EncodeJpegFormat(value string) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["format"] = value
-	}
-}
-
-// EncodeJpegQuality sets the optional quality attribute to value.
-//
-// value: Quality of the compression from 0 to 100 (higher is better and slower).
-// If not specified, defaults to 95
-func EncodeJpegQuality(value int64) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["quality"] = value
-	}
-}
-
-// EncodeJpegProgressive sets the optional progressive attribute to value.
-//
-// value: If True, create a JPEG that loads progressively (coarse to fine).
-// If not specified, defaults to false
-func EncodeJpegProgressive(value bool) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["progressive"] = value
-	}
-}
-
-// EncodeJpegOptimizeSize sets the optional optimize_size attribute to value.
-//
-// value: If True, spend CPU/RAM to reduce size with no quality change.
-// If not specified, defaults to false
-func EncodeJpegOptimizeSize(value bool) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["optimize_size"] = value
-	}
-}
-
-// EncodeJpegChromaDownsampling sets the optional chroma_downsampling attribute to value.
-//
-// value: See http://en.wikipedia.org/wiki/Chroma_subsampling.
-// If not specified, defaults to true
-func EncodeJpegChromaDownsampling(value bool) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["chroma_downsampling"] = value
-	}
-}
-
-// EncodeJpegDensityUnit sets the optional density_unit attribute to value.
-//
-// value: Unit used to specify `x_density` and `y_density`:
-// pixels per inch (`'in'`) or centimeter (`'cm'`).
-// If not specified, defaults to "in"
-func EncodeJpegDensityUnit(value string) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["density_unit"] = value
-	}
-}
-
-// EncodeJpegXDensity sets the optional x_density attribute to value.
-//
-// value: Horizontal pixels per density unit.
-// If not specified, defaults to 300
-func EncodeJpegXDensity(value int64) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["x_density"] = value
-	}
-}
-
-// EncodeJpegYDensity sets the optional y_density attribute to value.
-//
-// value: Vertical pixels per density unit.
-// If not specified, defaults to 300
-func EncodeJpegYDensity(value int64) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["y_density"] = value
-	}
-}
-
-// EncodeJpegXmpMetadata sets the optional xmp_metadata attribute to value.
-//
-// value: If not empty, embed this XMP metadata in the image header.
-// If not specified, defaults to ""
-func EncodeJpegXmpMetadata(value string) EncodeJpegAttr {
-	return func(m optionalAttr) {
-		m["xmp_metadata"] = value
-	}
-}
-
-// JPEG-encode an image.
-//
-// `image` is a 3-D uint8 Tensor of shape `[height, width, channels]`.
-//
-// The attr `format` can be used to override the color format of the encoded
-// output.  Values can be:
-//
-// *   `''`: Use a default format based on the number of channels in the image.
-// *   `grayscale`: Output a grayscale JPEG image.  The `channels` dimension
-//     of `image` must be 1.
-// *   `rgb`: Output an RGB JPEG image. The `channels` dimension
-//     of `image` must be 3.
-//
-// If `format` is not specified or is the empty string, a default format is picked
-// in function of the number of channels in `image`:
-//
-// *   1: Output a grayscale image.
-// *   3: Output an RGB image.
-//
-// Arguments:
-//	image: 3-D with shape `[height, width, channels]`.
+// Returns A complex64 tensor of the same rank as `input`. The inner-most 2
+//   dimensions of `input` are replaced with their 2D Fourier transform. The
+//   inner-most dimension contains `fft_length / 2 + 1` unique frequency
+//   components.
 //
-// Returns 0-D. JPEG-encoded image.
-func EncodeJpeg(scope *Scope, image tf.Output, optional ...EncodeJpegAttr) (contents tf.Output) {
+// @compatibility(numpy)
+// Equivalent to np.fft.rfft2
+// @end_compatibility
+func RFFT2D(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "EncodeJpeg",
+		Type: "RFFT2D",
 		Input: []tf.Input{
-			image,
+			input, fft_length,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
@@ -18164,6 +18335,117 @@ func ArgMin(scope *Scope, input tf.Output, dimension tf.Output) (output tf.Outpu
 	return op.Output(0)
 }
 
+// ResourceSparseApplyProximalGradientDescentAttr is an optional argument to ResourceSparseApplyProximalGradientDescent.
+type ResourceSparseApplyProximalGradientDescentAttr func(optionalAttr)
+
+// ResourceSparseApplyProximalGradientDescentUseLocking sets the optional use_locking attribute to value.
+//
+// value: If True, the subtraction will be protected by a lock;
+// otherwise the behavior is undefined, but may exhibit less contention.
+// If not specified, defaults to false
+func ResourceSparseApplyProximalGradientDescentUseLocking(value bool) ResourceSparseApplyProximalGradientDescentAttr {
+	return func(m optionalAttr) {
+		m["use_locking"] = value
+	}
+}
+
+// Sparse update '*var' as FOBOS algorithm with fixed learning rate.
+//
+// That is for rows we have grad for, we update var as follows:
+// prox_v = var - alpha * grad
+// var = sign(prox_v)/(1+alpha*l2) * max{|prox_v|-alpha*l1,0}
+//
+// Arguments:
+//	var_: Should be from a Variable().
+//	alpha: Scaling factor. Must be a scalar.
+//	l1: L1 regularization. Must be a scalar.
+//	l2: L2 regularization. Must be a scalar.
+//	grad: The gradient.
+//	indices: A vector of indices into the first dimension of var and accum.
+//
+// Returns the created operation.
+func ResourceSparseApplyProximalGradientDescent(scope *Scope, var_ tf.Output, alpha tf.Output, l1 tf.Output, l2 tf.Output, grad tf.Output, indices tf.Output, optional ...ResourceSparseApplyProximalGradientDescentAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceSparseApplyProximalGradientDescent",
+		Input: []tf.Input{
+			var_, alpha, l1, l2, grad, indices,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
+// InitializeTableFromTextFileV2Attr is an optional argument to InitializeTableFromTextFileV2.
+type InitializeTableFromTextFileV2Attr func(optionalAttr)
+
+// InitializeTableFromTextFileV2VocabSize sets the optional vocab_size attribute to value.
+//
+// value: Number of elements of the file, use -1 if unknown.
+// If not specified, defaults to -1
+//
+// REQUIRES: value >= -1
+func InitializeTableFromTextFileV2VocabSize(value int64) InitializeTableFromTextFileV2Attr {
+	return func(m optionalAttr) {
+		m["vocab_size"] = value
+	}
+}
+
+// InitializeTableFromTextFileV2Delimiter sets the optional delimiter attribute to value.
+//
+// value: Delimiter to separate fields in a line.
+// If not specified, defaults to "\t"
+func InitializeTableFromTextFileV2Delimiter(value string) InitializeTableFromTextFileV2Attr {
+	return func(m optionalAttr) {
+		m["delimiter"] = value
+	}
+}
+
+// Initializes a table from a text file.
+//
+// It inserts one key-value pair into the table for each line of the file.
+// The key and value is extracted from the whole line content, elements from the
+// split line based on `delimiter` or the line number (starting from zero).
+// Where to extract the key and value from a line is specified by `key_index` and
+// `value_index`.
+//
+// - A value of -1 means use the line number(starting from zero), expects `int64`.
+// - A value of -2 means use the whole line content, expects `string`.
+// - A value >= 0 means use the index (starting at zero) of the split line based
+//   on `delimiter`.
+//
+// Arguments:
+//	table_handle: Handle to a table which will be initialized.
+//	filename: Filename of a vocabulary text file.
+//	key_index: Column index in a line to get the table `key` values from.
+//	value_index: Column index that represents information of a line to get the table
+// `value` values from.
+//
+// Returns the created operation.
+func InitializeTableFromTextFileV2(scope *Scope, table_handle tf.Output, filename tf.Output, key_index int64, value_index int64, optional ...InitializeTableFromTextFileV2Attr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"key_index": key_index, "value_index": value_index}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "InitializeTableFromTextFileV2",
+		Input: []tf.Input{
+			table_handle, filename,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
 // Computes atan of x element-wise.
 func Atan(scope *Scope, x tf.Output) (y tf.Output) {
 	if scope.Err() != nil {
@@ -18628,33 +18910,36 @@ func Less(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
-// FakeQuantWithMinMaxVarsGradientAttr is an optional argument to FakeQuantWithMinMaxVarsGradient.
-type FakeQuantWithMinMaxVarsGradientAttr func(optionalAttr)
+// BiasAddGradAttr is an optional argument to BiasAddGrad.
+type BiasAddGradAttr func(optionalAttr)
 
-// FakeQuantWithMinMaxVarsGradientNumBits sets the optional num_bits attribute to value.
+// BiasAddGradDataFormat sets the optional data_format attribute to value.
 //
-// value: The bitwidth of the quantization; between 2 and 8, inclusive.
-// If not specified, defaults to 8
-func FakeQuantWithMinMaxVarsGradientNumBits(value int64) FakeQuantWithMinMaxVarsGradientAttr {
+// value: Specify the data format of the input and output data. With the
+// default format "NHWC", the bias tensor will be added to the last dimension
+// of the value tensor.
+// Alternatively, the format could be "NCHW", the data storage order of:
+//     [batch, in_channels, in_height, in_width].
+// The tensor will be added to "in_channels", the third-to-the-last
+//     dimension.
+// If not specified, defaults to "NHWC"
+func BiasAddGradDataFormat(value string) BiasAddGradAttr {
 	return func(m optionalAttr) {
-		m["num_bits"] = value
+		m["data_format"] = value
 	}
 }
 
-// Compute gradients for a FakeQuantWithMinMaxVars operation.
-//
-// Arguments:
-//	gradients: Backpropagated gradients above the FakeQuantWithMinMaxVars operation.
-//	inputs: Values passed as inputs to the FakeQuantWithMinMaxVars operation.
-// min, max: Quantization interval, scalar floats.
+// The backward operation for "BiasAdd" on the "bias" tensor.
 //
+// It accumulates all the values from out_backprop into the feature dimension.
+// For NHWC data format, the feature dimension is the last. For NCHW data format,
+// the feature dimension is the third-to-last.
 //
+// Arguments:
+//	out_backprop: Any number of dimensions.
 //
-// Returns Backpropagated gradients w.r.t. inputs:
-// `gradients * (inputs >= min && inputs <= max)`.Backpropagated gradients w.r.t. min parameter:
-// `sum(gradients * (inputs < min))`.Backpropagated gradients w.r.t. max parameter:
-// `sum(gradients * (inputs > max))`.
-func FakeQuantWithMinMaxVarsGradient(scope *Scope, gradients tf.Output, inputs tf.Output, min tf.Output, max tf.Output, optional ...FakeQuantWithMinMaxVarsGradientAttr) (backprops_wrt_input tf.Output, backprop_wrt_min tf.Output, backprop_wrt_max tf.Output) {
+// Returns 1-D with size the feature dimension of `out_backprop`.
+func BiasAddGrad(scope *Scope, out_backprop tf.Output, optional ...BiasAddGradAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -18663,31 +18948,13 @@ func FakeQuantWithMinMaxVarsGradient(scope *Scope, gradients tf.Output, inputs t
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "FakeQuantWithMinMaxVarsGradient",
+		Type: "BiasAddGrad",
 		Input: []tf.Input{
-			gradients, inputs, min, max,
+			out_backprop,
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// Returns the min of x and y (i.e. x < y ? x : y) element-wise.
-//
-// *NOTE*: `Minimum` supports broadcasting. More about broadcasting
-// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func Minimum(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Minimum",
-		Input: []tf.Input{
-			x, y,
-		},
-	}
-	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
@@ -19980,79 +20247,20 @@ func SquaredDifference(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 //	out_type: The type of the output. Should be a lower bit depth than Tinput.
 //
 // Returns The float value that the minimum quantized output value represents.The float value that the maximum quantized output value represents.
-func QuantizeDownAndShrinkRange(scope *Scope, input tf.Output, input_min tf.Output, input_max tf.Output, out_type tf.DataType) (output tf.Output, output_min tf.Output, output_max tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"out_type": out_type}
-	opspec := tf.OpSpec{
-		Type: "QuantizeDownAndShrinkRange",
-		Input: []tf.Input{
-			input, input_min, input_max,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
-// DecodePngAttr is an optional argument to DecodePng.
-type DecodePngAttr func(optionalAttr)
-
-// DecodePngChannels sets the optional channels attribute to value.
-//
-// value: Number of color channels for the decoded image.
-// If not specified, defaults to 0
-func DecodePngChannels(value int64) DecodePngAttr {
-	return func(m optionalAttr) {
-		m["channels"] = value
-	}
-}
-
-// DecodePngDtype sets the optional dtype attribute to value.
-// If not specified, defaults to DT_UINT8
-func DecodePngDtype(value tf.DataType) DecodePngAttr {
-	return func(m optionalAttr) {
-		m["dtype"] = value
-	}
-}
-
-// Decode a PNG-encoded image to a uint8 or uint16 tensor.
-//
-// The attr `channels` indicates the desired number of color channels for the
-// decoded image.
-//
-// Accepted values are:
-//
-// *   0: Use the number of channels in the PNG-encoded image.
-// *   1: output a grayscale image.
-// *   3: output an RGB image.
-// *   4: output an RGBA image.
-//
-// If needed, the PNG-encoded image is transformed to match the requested number
-// of color channels.
-//
-// Arguments:
-//	contents: 0-D.  The PNG-encoded image.
-//
-// Returns 3-D with shape `[height, width, channels]`.
-func DecodePng(scope *Scope, contents tf.Output, optional ...DecodePngAttr) (image tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
+func QuantizeDownAndShrinkRange(scope *Scope, input tf.Output, input_min tf.Output, input_max tf.Output, out_type tf.DataType) (output tf.Output, output_min tf.Output, output_max tf.Output) {
+	if scope.Err() != nil {
+		return
 	}
+	attrs := map[string]interface{}{"out_type": out_type}
 	opspec := tf.OpSpec{
-		Type: "DecodePng",
+		Type: "QuantizeDownAndShrinkRange",
 		Input: []tf.Input{
-			contents,
+			input, input_min, input_max,
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1), op.Output(2)
 }
 
 // AudioSummaryV2Attr is an optional argument to AudioSummaryV2.
@@ -20219,165 +20427,151 @@ func AudioSummary(scope *Scope, tag tf.Output, tensor tf.Output, sample_rate flo
 	return op.Output(0)
 }
 
-// ResizeNearestNeighborAttr is an optional argument to ResizeNearestNeighbor.
-type ResizeNearestNeighborAttr func(optionalAttr)
-
-// ResizeNearestNeighborAlignCorners sets the optional align_corners attribute to value.
+// Replaces the contents of the table with the specified keys and values.
 //
-// value: If true, rescale input by (new_height - 1) / (height - 1), which
-// exactly aligns the 4 corners of images and resized images. If false, rescale
-// by new_height / height. Treat similarly the width dimension.
-// If not specified, defaults to false
-func ResizeNearestNeighborAlignCorners(value bool) ResizeNearestNeighborAttr {
-	return func(m optionalAttr) {
-		m["align_corners"] = value
-	}
-}
-
-// Resize `images` to `size` using nearest neighbor interpolation.
+// The tensor `keys` must be of the same type as the keys of the table.
+// The tensor `values` must be of the type of the table values.
 //
 // Arguments:
-//	images: 4-D with shape `[batch, height, width, channels]`.
-//	size: = A 1-D int32 Tensor of 2 elements: `new_height, new_width`.  The
-// new size for the images.
+//	table_handle: Handle to the table.
+//	keys: Any shape.  Keys to look up.
+//	values: Values to associate with keys.
 //
-// Returns 4-D with shape
-// `[batch, new_height, new_width, channels]`.
-func ResizeNearestNeighbor(scope *Scope, images tf.Output, size tf.Output, optional ...ResizeNearestNeighborAttr) (resized_images tf.Output) {
+// Returns the created operation.
+func LookupTableImportV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "ResizeNearestNeighbor",
+		Type: "LookupTableImportV2",
 		Input: []tf.Input{
-			images, size,
+			table_handle, keys, values,
 		},
-		Attrs: attrs,
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return scope.AddOperation(opspec)
 }
 
-// Computes the gradient for the sqrt of `x` wrt its input.
+// HashTableV2Attr is an optional argument to HashTableV2.
+type HashTableV2Attr func(optionalAttr)
+
+// HashTableV2Container sets the optional container attribute to value.
 //
-// Specifically, `grad = dy * 0.5 / y`, where `y = sqrt(x)`, and `dy`
-// is the corresponding input gradient.
-func SqrtGrad(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "SqrtGrad",
-		Input: []tf.Input{
-			x, y,
-		},
+// value: If non-empty, this table is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func HashTableV2Container(value string) HashTableV2Attr {
+	return func(m optionalAttr) {
+		m["container"] = value
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
 }
 
-// MatrixInverseAttr is an optional argument to MatrixInverse.
-type MatrixInverseAttr func(optionalAttr)
+// HashTableV2SharedName sets the optional shared_name attribute to value.
+//
+// value: If non-empty, this table is shared under the given name across
+// multiple sessions.
+// If not specified, defaults to ""
+func HashTableV2SharedName(value string) HashTableV2Attr {
+	return func(m optionalAttr) {
+		m["shared_name"] = value
+	}
+}
 
-// MatrixInverseAdjoint sets the optional adjoint attribute to value.
+// HashTableV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
+//
+// value: If true and shared_name is empty, the table is shared
+// using the node name.
 // If not specified, defaults to false
-func MatrixInverseAdjoint(value bool) MatrixInverseAttr {
+func HashTableV2UseNodeNameSharing(value bool) HashTableV2Attr {
 	return func(m optionalAttr) {
-		m["adjoint"] = value
+		m["use_node_name_sharing"] = value
 	}
 }
 
-// Computes the inverse of one or more square invertible matrices or their
-//
-// adjoints (conjugate transposes).
-//
-// The input is a tensor of shape `[..., M, M]` whose inner-most 2 dimensions
-// form square matrices. The output is a tensor of the same shape as the input
-// containing the inverse for all input submatrices `[..., :, :]`.
-//
-// The op uses LU decomposition with partial pivoting to compute the inverses.
+// Creates a non-initialized hash table.
 //
-// If a matrix is not invertible there is no guarantee what the op does. It
-// may detect the condition and raise an exception or it may simply return a
-// garbage result.
+// This op creates a hash table, specifying the type of its keys and values.
+// Before using the table you will have to initialize it.  After initialization the
+// table will be immutable.
 //
 // Arguments:
-//	input: Shape is `[..., M, M]`.
-//
-// Returns Shape is `[..., M, M]`.
+//	key_dtype: Type of the table keys.
+//	value_dtype: Type of the table values.
 //
-// @compatibility(numpy)
-// Equivalent to np.linalg.inv
-// @end_compatibility
-func MatrixInverse(scope *Scope, input tf.Output, optional ...MatrixInverseAttr) (output tf.Output) {
+// Returns Handle to a table.
+func HashTableV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...HashTableV2Attr) (table_handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
+	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "MatrixInverse",
-		Input: []tf.Input{
-			input,
-		},
+		Type: "HashTableV2",
+
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// TFRecordReaderV2Attr is an optional argument to TFRecordReaderV2.
-type TFRecordReaderV2Attr func(optionalAttr)
+// MutableHashTableV2Attr is an optional argument to MutableHashTableV2.
+type MutableHashTableV2Attr func(optionalAttr)
 
-// TFRecordReaderV2Container sets the optional container attribute to value.
+// MutableHashTableV2Container sets the optional container attribute to value.
 //
-// value: If non-empty, this reader is placed in the given container.
+// value: If non-empty, this table is placed in the given container.
 // Otherwise, a default container is used.
 // If not specified, defaults to ""
-func TFRecordReaderV2Container(value string) TFRecordReaderV2Attr {
+func MutableHashTableV2Container(value string) MutableHashTableV2Attr {
 	return func(m optionalAttr) {
 		m["container"] = value
 	}
 }
 
-// TFRecordReaderV2SharedName sets the optional shared_name attribute to value.
+// MutableHashTableV2SharedName sets the optional shared_name attribute to value.
 //
-// value: If non-empty, this reader is named in the given bucket
-// with this shared_name. Otherwise, the node name is used instead.
+// value: If non-empty, this table is shared under the given name across
+// multiple sessions.
 // If not specified, defaults to ""
-func TFRecordReaderV2SharedName(value string) TFRecordReaderV2Attr {
+func MutableHashTableV2SharedName(value string) MutableHashTableV2Attr {
 	return func(m optionalAttr) {
 		m["shared_name"] = value
 	}
 }
 
-// TFRecordReaderV2CompressionType sets the optional compression_type attribute to value.
-// If not specified, defaults to ""
-func TFRecordReaderV2CompressionType(value string) TFRecordReaderV2Attr {
+// MutableHashTableV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
+//
+// value: If true and shared_name is empty, the table is shared
+// using the node name.
+// If not specified, defaults to false
+func MutableHashTableV2UseNodeNameSharing(value bool) MutableHashTableV2Attr {
 	return func(m optionalAttr) {
-		m["compression_type"] = value
+		m["use_node_name_sharing"] = value
 	}
 }
 
-// A Reader that outputs the records from a TensorFlow Records file.
+// Creates an empty hash table.
 //
-// Returns The handle to reference the Reader.
-func TFRecordReaderV2(scope *Scope, optional ...TFRecordReaderV2Attr) (reader_handle tf.Output) {
+// This op creates a mutable hash table, specifying the type of its keys and
+// values. Each value must be a scalar. Data can be inserted into the table using
+// the insert operations. It does not support the initialization operation.
+//
+// Arguments:
+//	key_dtype: Type of the table keys.
+//	value_dtype: Type of the table values.
+//
+// Returns Handle to a table.
+func MutableHashTableV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...MutableHashTableV2Attr) (table_handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
+	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "TFRecordReaderV2",
+		Type: "MutableHashTableV2",
 
 		Attrs: attrs,
 	}
@@ -20385,35 +20579,36 @@ func TFRecordReaderV2(scope *Scope, optional ...TFRecordReaderV2Attr) (reader_ha
 	return op.Output(0)
 }
 
-// MatrixSolveAttr is an optional argument to MatrixSolve.
-type MatrixSolveAttr func(optionalAttr)
+// ResourceApplyProximalAdagradAttr is an optional argument to ResourceApplyProximalAdagrad.
+type ResourceApplyProximalAdagradAttr func(optionalAttr)
 
-// MatrixSolveAdjoint sets the optional adjoint attribute to value.
+// ResourceApplyProximalAdagradUseLocking sets the optional use_locking attribute to value.
 //
-// value: Boolean indicating whether to solve with `matrix` or its (block-wise)
-// adjoint.
+// value: If True, updating of the var and accum tensors will be protected by
+// a lock; otherwise the behavior is undefined, but may exhibit less contention.
 // If not specified, defaults to false
-func MatrixSolveAdjoint(value bool) MatrixSolveAttr {
+func ResourceApplyProximalAdagradUseLocking(value bool) ResourceApplyProximalAdagradAttr {
 	return func(m optionalAttr) {
-		m["adjoint"] = value
+		m["use_locking"] = value
 	}
 }
 
-// Solves systems of linear equations.
+// Update '*var' and '*accum' according to FOBOS with Adagrad learning rate.
 //
-// `Matrix` is a tensor of shape `[..., M, M]` whose inner-most 2 dimensions
-// form square matrices. `Rhs` is a tensor of shape `[..., M, K]`. The `output` is
-// a tensor shape `[..., M, K]`.  If `adjoint` is `False` then each output matrix
-// satisfies `matrix[..., :, :] * output[..., :, :] = rhs[..., :, :]`.
-// If `adjoint` is `True` then each output matrix satisfies
-// `adjoint(matrix[..., :, :]) * output[..., :, :] = rhs[..., :, :]`.
+// accum += grad * grad
+// prox_v = var - lr * grad * (1 / sqrt(accum))
+// var = sign(prox_v)/(1+lr*l2) * max{|prox_v|-lr*l1,0}
 //
 // Arguments:
-//	matrix: Shape is `[..., M, M]`.
-//	rhs: Shape is `[..., M, K]`.
+//	var_: Should be from a Variable().
+//	accum: Should be from a Variable().
+//	lr: Scaling factor. Must be a scalar.
+//	l1: L1 regularization. Must be a scalar.
+//	l2: L2 regularization. Must be a scalar.
+//	grad: The gradient.
 //
-// Returns Shape is `[..., M, K]`.
-func MatrixSolve(scope *Scope, matrix tf.Output, rhs tf.Output, optional ...MatrixSolveAttr) (output tf.Output) {
+// Returns the created operation.
+func ResourceApplyProximalAdagrad(scope *Scope, var_ tf.Output, accum tf.Output, lr tf.Output, l1 tf.Output, l2 tf.Output, grad tf.Output, optional ...ResourceApplyProximalAdagradAttr) (o *tf.Operation) {
 	if scope.Err() != nil {
 		return
 	}
@@ -20422,181 +20617,160 @@ func MatrixSolve(scope *Scope, matrix tf.Output, rhs tf.Output, optional ...Matr
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "MatrixSolve",
+		Type: "ResourceApplyProximalAdagrad",
 		Input: []tf.Input{
-			matrix, rhs,
+			var_, accum, lr, l1, l2, grad,
 		},
 		Attrs: attrs,
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return scope.AddOperation(opspec)
 }
 
-// SumAttr is an optional argument to Sum.
-type SumAttr func(optionalAttr)
+// MutableHashTableOfTensorsV2Attr is an optional argument to MutableHashTableOfTensorsV2.
+type MutableHashTableOfTensorsV2Attr func(optionalAttr)
 
-// SumKeepDims sets the optional keep_dims attribute to value.
+// MutableHashTableOfTensorsV2Container sets the optional container attribute to value.
 //
-// value: If true, retain reduced dimensions with length 1.
+// value: If non-empty, this table is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func MutableHashTableOfTensorsV2Container(value string) MutableHashTableOfTensorsV2Attr {
+	return func(m optionalAttr) {
+		m["container"] = value
+	}
+}
+
+// MutableHashTableOfTensorsV2SharedName sets the optional shared_name attribute to value.
+//
+// value: If non-empty, this table is shared under the given name across
+// multiple sessions.
+// If not specified, defaults to ""
+func MutableHashTableOfTensorsV2SharedName(value string) MutableHashTableOfTensorsV2Attr {
+	return func(m optionalAttr) {
+		m["shared_name"] = value
+	}
+}
+
+// MutableHashTableOfTensorsV2UseNodeNameSharing sets the optional use_node_name_sharing attribute to value.
 // If not specified, defaults to false
-func SumKeepDims(value bool) SumAttr {
+func MutableHashTableOfTensorsV2UseNodeNameSharing(value bool) MutableHashTableOfTensorsV2Attr {
+	return func(m optionalAttr) {
+		m["use_node_name_sharing"] = value
+	}
+}
+
+// MutableHashTableOfTensorsV2ValueShape sets the optional value_shape attribute to value.
+// If not specified, defaults to <>
+func MutableHashTableOfTensorsV2ValueShape(value tf.Shape) MutableHashTableOfTensorsV2Attr {
 	return func(m optionalAttr) {
-		m["keep_dims"] = value
+		m["value_shape"] = value
 	}
 }
 
-// Computes the sum of elements across dimensions of a tensor.
+// Creates an empty hash table.
 //
-// Reduces `input` along the dimensions given in `reduction_indices`. Unless
-// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in
-// `reduction_indices`. If `keep_dims` is true, the reduced dimensions are
-// retained with length 1.
+// This op creates a mutable hash table, specifying the type of its keys and
+// values. Each value must be a vector. Data can be inserted into the table using
+// the insert operations. It does not support the initialization operation.
 //
 // Arguments:
-//	input: The tensor to reduce.
-//	reduction_indices: The dimensions to reduce.
+//	key_dtype: Type of the table keys.
+//	value_dtype: Type of the table values.
 //
-// Returns The reduced tensor.
-func Sum(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ...SumAttr) (output tf.Output) {
+// Returns Handle to a table.
+func MutableHashTableOfTensorsV2(scope *Scope, key_dtype tf.DataType, value_dtype tf.DataType, optional ...MutableHashTableOfTensorsV2Attr) (table_handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
+	attrs := map[string]interface{}{"key_dtype": key_dtype, "value_dtype": value_dtype}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "Sum",
-		Input: []tf.Input{
-			input, reduction_indices,
-		},
+		Type: "MutableHashTableOfTensorsV2",
+
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Partitions `data` into `num_partitions` tensors using indices from `partitions`.
-//
-// For each index tuple `js` of size `partitions.ndim`, the slice `data[js, ...]`
-// becomes part of `outputs[partitions[js]]`.  The slices with `partitions[js] = i`
-// are placed in `outputs[i]` in lexicographic order of `js`, and the first
-// dimension of `outputs[i]` is the number of entries in `partitions` equal to `i`.
-// In detail,
-//
-// ```python
-//     outputs[i].shape = [sum(partitions == i)] + data.shape[partitions.ndim:]
-//
-//     outputs[i] = pack([data[js, ...] for js if partitions[js] == i])
-// ```
-//
-// `data.shape` must start with `partitions.shape`.
-//
-// For example:
-//
-// ```python
-//     # Scalar partitions.
-//     partitions = 1
-//     num_partitions = 2
-//     data = [10, 20]
-//     outputs[0] = []  # Empty with shape [0, 2]
-//     outputs[1] = [[10, 20]]
-//
-//     # Vector partitions.
-//     partitions = [0, 0, 1, 1, 0]
-//     num_partitions = 2
-//     data = [10, 20, 30, 40, 50]
-//     outputs[0] = [10, 20, 50]
-//     outputs[1] = [30, 40]
-// ```
-//
-// <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="https://www.tensorflow.org/images/DynamicPartition.png" alt>
-// </div>
+// Table initializer that takes two tensors for keys and values respectively.
 //
 // Arguments:
+//	table_handle: Handle to a table which will be initialized.
+//	keys: Keys of type Tkey.
+//	values: Values of type Tval.
 //
-//	partitions: Any shape.  Indices in the range `[0, num_partitions)`.
-//	num_partitions: The number of partitions to output.
-func DynamicPartition(scope *Scope, data tf.Output, partitions tf.Output, num_partitions int64) (outputs []tf.Output) {
+// Returns the created operation.
+func InitializeTableV2(scope *Scope, table_handle tf.Output, keys tf.Output, values tf.Output) (o *tf.Operation) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"num_partitions": num_partitions}
 	opspec := tf.OpSpec{
-		Type: "DynamicPartition",
+		Type: "InitializeTableV2",
 		Input: []tf.Input{
-			data, partitions,
+			table_handle, keys, values,
 		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	if scope.Err() != nil {
-		return
-	}
-	var idx int
-	var err error
-	if outputs, idx, err = makeOutputList(op, idx, "outputs"); err != nil {
-		scope.UpdateErr("DynamicPartition", err)
-		return
 	}
-	return outputs
+	return scope.AddOperation(opspec)
 }
 
-// Serialize a `SparseTensor` into a string 3-vector (1-D `Tensor`) object.
+// FakeQuantWithMinMaxVarsGradientAttr is an optional argument to FakeQuantWithMinMaxVarsGradient.
+type FakeQuantWithMinMaxVarsGradientAttr func(optionalAttr)
+
+// FakeQuantWithMinMaxVarsGradientNumBits sets the optional num_bits attribute to value.
 //
-// Arguments:
-//	sparse_indices: 2-D.  The `indices` of the `SparseTensor`.
-//	sparse_values: 1-D.  The `values` of the `SparseTensor`.
-//	sparse_shape: 1-D.  The `shape` of the `SparseTensor`.
-func SerializeSparse(scope *Scope, sparse_indices tf.Output, sparse_values tf.Output, sparse_shape tf.Output) (serialized_sparse tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "SerializeSparse",
-		Input: []tf.Input{
-			sparse_indices, sparse_values, sparse_shape,
-		},
+// value: The bitwidth of the quantization; between 2 and 8, inclusive.
+// If not specified, defaults to 8
+func FakeQuantWithMinMaxVarsGradientNumBits(value int64) FakeQuantWithMinMaxVarsGradientAttr {
+	return func(m optionalAttr) {
+		m["num_bits"] = value
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
 }
 
-// Computes the reciprocal of x element-wise.
+// Compute gradients for a FakeQuantWithMinMaxVars operation.
 //
-// DEPRECATED at GraphDef version 17: Use Reciprocal
+// Arguments:
+//	gradients: Backpropagated gradients above the FakeQuantWithMinMaxVars operation.
+//	inputs: Values passed as inputs to the FakeQuantWithMinMaxVars operation.
+// min, max: Quantization interval, scalar floats.
 //
-// I.e., \\(y = 1 / x\\).
-func Inv(scope *Scope, x tf.Output) (y tf.Output) {
+//
+//
+// Returns Backpropagated gradients w.r.t. inputs:
+// `gradients * (inputs >= min && inputs <= max)`.Backpropagated gradients w.r.t. min parameter:
+// `sum(gradients * (inputs < min))`.Backpropagated gradients w.r.t. max parameter:
+// `sum(gradients * (inputs > max))`.
+func FakeQuantWithMinMaxVarsGradient(scope *Scope, gradients tf.Output, inputs tf.Output, min tf.Output, max tf.Output, optional ...FakeQuantWithMinMaxVarsGradientAttr) (backprops_wrt_input tf.Output, backprop_wrt_min tf.Output, backprop_wrt_max tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "Inv",
+		Type: "FakeQuantWithMinMaxVarsGradient",
 		Input: []tf.Input{
-			x,
+			gradients, inputs, min, max,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1), op.Output(2)
 }
 
-// Returns x / y element-wise for integer types.
-//
-// Truncation designates that negative numbers will round fractional quantities
-// toward zero. I.e. -7 / 5 = 1. This matches C semantics but it is different
-// than Python semantics. See `FloorDiv` for a division function that matches
-// Python Semantics.
+// Returns the min of x and y (i.e. x < y ? x : y) element-wise.
 //
-// *NOTE*: `TruncateDiv` supports broadcasting. More about broadcasting
+// *NOTE*: `Minimum` supports broadcasting. More about broadcasting
 // [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func TruncateDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
+func Minimum(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "TruncateDiv",
+		Type: "Minimum",
 		Input: []tf.Input{
 			x, y,
 		},
@@ -20605,166 +20779,113 @@ func TruncateDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
-// Restores tensors from a V2 checkpoint.
-//
-// For backward compatibility with the V1 format, this Op currently allows
-// restoring from a V1 checkpoint as well:
-//   - This Op first attempts to find the V2 index file pointed to by "prefix", and
-//     if found proceed to read it as a V2 checkpoint;
-//   - Otherwise the V1 read path is invoked.
-// Relying on this behavior is not recommended, as the ability to fall back to read
-// V1 might be deprecated and eventually removed.
-//
-// By default, restores the named tensors in full.  If the caller wishes to restore
-// specific slices of stored tensors, "shape_and_slices" should be non-empty
-// strings and correspondingly well-formed.
-//
-// Callers must ensure all the named tensors are indeed stored in the checkpoint.
-//
-// Arguments:
-//	prefix: Must have a single element.  The prefix of a V2 checkpoint.
-//	tensor_names: shape {N}.  The names of the tensors to be restored.
-//	shape_and_slices: shape {N}.  The slice specs of the tensors to be restored.
-// Empty strings indicate that they are non-partitioned tensors.
-//	dtypes: shape {N}.  The list of expected dtype for the tensors.  Must match
-// those stored in the checkpoint.
+// Computes the gradient for the sqrt of `x` wrt its input.
 //
-// Returns shape {N}.  The restored tensors, whose shapes are read from the
-// checkpoint directly.
-func RestoreV2(scope *Scope, prefix tf.Output, tensor_names tf.Output, shape_and_slices tf.Output, dtypes []tf.DataType) (tensors []tf.Output) {
+// Specifically, `grad = dy * 0.5 / y`, where `y = sqrt(x)`, and `dy`
+// is the corresponding input gradient.
+func SqrtGrad(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"dtypes": dtypes}
 	opspec := tf.OpSpec{
-		Type: "RestoreV2",
+		Type: "SqrtGrad",
 		Input: []tf.Input{
-			prefix, tensor_names, shape_and_slices,
+			x, y,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	if scope.Err() != nil {
-		return
-	}
-	var idx int
-	var err error
-	if tensors, idx, err = makeOutputList(op, idx, "tensors"); err != nil {
-		scope.UpdateErr("RestoreV2", err)
-		return
-	}
-	return tensors
+	return op.Output(0)
 }
 
-// AvgPoolAttr is an optional argument to AvgPool.
-type AvgPoolAttr func(optionalAttr)
+// MatrixInverseAttr is an optional argument to MatrixInverse.
+type MatrixInverseAttr func(optionalAttr)
 
-// AvgPoolDataFormat sets the optional data_format attribute to value.
-//
-// value: Specify the data format of the input and output data. With the
-// default format "NHWC", the data is stored in the order of:
-//     [batch, in_height, in_width, in_channels].
-// Alternatively, the format could be "NCHW", the data storage order of:
-//     [batch, in_channels, in_height, in_width].
-// If not specified, defaults to "NHWC"
-func AvgPoolDataFormat(value string) AvgPoolAttr {
+// MatrixInverseAdjoint sets the optional adjoint attribute to value.
+// If not specified, defaults to false
+func MatrixInverseAdjoint(value bool) MatrixInverseAttr {
 	return func(m optionalAttr) {
-		m["data_format"] = value
-	}
-}
-
-// Performs average pooling on the input.
-//
-// Each entry in `output` is the mean of the corresponding size `ksize`
-// window in `value`.
-//
-// Arguments:
-//	value: 4-D with shape `[batch, height, width, channels]`.
-//	ksize: The size of the sliding window for each dimension of `value`.
-//	strides: The stride of the sliding window for each dimension of `value`.
-//	padding: The type of padding algorithm to use.
-//
-// Returns The average pooled output tensor.
-func AvgPool(scope *Scope, value tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPoolAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "AvgPool",
-		Input: []tf.Input{
-			value,
-		},
-		Attrs: attrs,
+		m["adjoint"] = value
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
 }
 
-// Computes the mean along sparse segments of a tensor.
+// Computes the inverse of one or more square invertible matrices or their
 //
-// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
-// segments.
+// adjoints (conjugate transposes).
 //
-// Like `SegmentMean`, but `segment_ids` can have rank less than `data`'s first
-// dimension, selecting a subset of dimension 0, specified by `indices`.
+// The input is a tensor of shape `[..., M, M]` whose inner-most 2 dimensions
+// form square matrices. The output is a tensor of the same shape as the input
+// containing the inverse for all input submatrices `[..., :, :]`.
+//
+// The op uses LU decomposition with partial pivoting to compute the inverses.
+//
+// If a matrix is not invertible there is no guarantee what the op does. It
+// may detect the condition and raise an exception or it may simply return a
+// garbage result.
 //
 // Arguments:
+//	input: Shape is `[..., M, M]`.
 //
-//	indices: A 1-D tensor. Has same rank as `segment_ids`.
-//	segment_ids: A 1-D tensor. Values should be sorted and can be repeated.
+// Returns Shape is `[..., M, M]`.
 //
-// Returns Has same shape as data, except for dimension 0 which
-// has size `k`, the number of segments.
-func SparseSegmentMean(scope *Scope, data tf.Output, indices tf.Output, segment_ids tf.Output) (output tf.Output) {
+// @compatibility(numpy)
+// Equivalent to np.linalg.inv
+// @end_compatibility
+func MatrixInverse(scope *Scope, input tf.Output, optional ...MatrixInverseAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "SparseSegmentMean",
+		Type: "MatrixInverse",
 		Input: []tf.Input{
-			data, indices, segment_ids,
+			input,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// WholeFileReaderV2Attr is an optional argument to WholeFileReaderV2.
-type WholeFileReaderV2Attr func(optionalAttr)
+// TFRecordReaderV2Attr is an optional argument to TFRecordReaderV2.
+type TFRecordReaderV2Attr func(optionalAttr)
 
-// WholeFileReaderV2Container sets the optional container attribute to value.
+// TFRecordReaderV2Container sets the optional container attribute to value.
 //
 // value: If non-empty, this reader is placed in the given container.
 // Otherwise, a default container is used.
 // If not specified, defaults to ""
-func WholeFileReaderV2Container(value string) WholeFileReaderV2Attr {
+func TFRecordReaderV2Container(value string) TFRecordReaderV2Attr {
 	return func(m optionalAttr) {
 		m["container"] = value
 	}
 }
 
-// WholeFileReaderV2SharedName sets the optional shared_name attribute to value.
+// TFRecordReaderV2SharedName sets the optional shared_name attribute to value.
 //
 // value: If non-empty, this reader is named in the given bucket
 // with this shared_name. Otherwise, the node name is used instead.
 // If not specified, defaults to ""
-func WholeFileReaderV2SharedName(value string) WholeFileReaderV2Attr {
+func TFRecordReaderV2SharedName(value string) TFRecordReaderV2Attr {
 	return func(m optionalAttr) {
 		m["shared_name"] = value
 	}
 }
 
-// A Reader that outputs the entire contents of a file as a value.
-//
-// To use, enqueue filenames in a Queue.  The output of ReaderRead will
-// be a filename (key) and the contents of that file (value).
+// TFRecordReaderV2CompressionType sets the optional compression_type attribute to value.
+// If not specified, defaults to ""
+func TFRecordReaderV2CompressionType(value string) TFRecordReaderV2Attr {
+	return func(m optionalAttr) {
+		m["compression_type"] = value
+	}
+}
+
+// A Reader that outputs the records from a TensorFlow Records file.
 //
 // Returns The handle to reference the Reader.
-func WholeFileReaderV2(scope *Scope, optional ...WholeFileReaderV2Attr) (reader_handle tf.Output) {
+func TFRecordReaderV2(scope *Scope, optional ...TFRecordReaderV2Attr) (reader_handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -20773,7 +20894,7 @@ func WholeFileReaderV2(scope *Scope, optional ...WholeFileReaderV2Attr) (reader_
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "WholeFileReaderV2",
+		Type: "TFRecordReaderV2",
 
 		Attrs: attrs,
 	}
@@ -20781,87 +20902,124 @@ func WholeFileReaderV2(scope *Scope, optional ...WholeFileReaderV2Attr) (reader_
 	return op.Output(0)
 }
 
-// Returns up to `num_records` (key, value) pairs produced by a Reader.
+// Adjust the saturation of one or more images.
 //
-// Will dequeue from the input queue if necessary (e.g. when the
-// Reader needs to start reading from a new file since it has finished
-// with the previous file).
-// It may return less than `num_records` even before the last batch.
+// `images` is a tensor of at least 3 dimensions.  The last dimension is
+// interpretted as channels, and must be three.
+//
+// The input image is considered in the RGB colorspace. Conceptually, the RGB
+// colors are first mapped into HSV. A scale is then applied all the saturation
+// values, and then remapped back to RGB colorspace.
 //
 // Arguments:
-//	reader_handle: Handle to a `Reader`.
-//	queue_handle: Handle to a `Queue`, with string work items.
-//	num_records: number of records to read from `Reader`.
+//	images: Images to adjust.  At least 3-D.
+//	scale: A float scale to add to the saturation.
 //
-// Returns A 1-D tensor.A 1-D tensor.
-func ReaderReadUpToV2(scope *Scope, reader_handle tf.Output, queue_handle tf.Output, num_records tf.Output) (keys tf.Output, values tf.Output) {
+// Returns The hue-adjusted image or images.
+func AdjustSaturation(scope *Scope, images tf.Output, scale tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "ReaderReadUpToV2",
+		Type: "AdjustSaturation",
 		Input: []tf.Input{
-			reader_handle, queue_handle, num_records,
+			images, scale,
 		},
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
+	return op.Output(0)
 }
 
-// Conv2DBackpropFilterAttr is an optional argument to Conv2DBackpropFilter.
-type Conv2DBackpropFilterAttr func(optionalAttr)
+// SelfAdjointEigV2Attr is an optional argument to SelfAdjointEigV2.
+type SelfAdjointEigV2Attr func(optionalAttr)
 
-// Conv2DBackpropFilterUseCudnnOnGpu sets the optional use_cudnn_on_gpu attribute to value.
+// SelfAdjointEigV2ComputeV sets the optional compute_v attribute to value.
+//
+// value: If `True` then eigenvectors will be computed and returned in `v`.
+// Otherwise, only the eigenvalues will be computed.
 // If not specified, defaults to true
-func Conv2DBackpropFilterUseCudnnOnGpu(value bool) Conv2DBackpropFilterAttr {
+func SelfAdjointEigV2ComputeV(value bool) SelfAdjointEigV2Attr {
 	return func(m optionalAttr) {
-		m["use_cudnn_on_gpu"] = value
+		m["compute_v"] = value
 	}
 }
 
-// Conv2DBackpropFilterDataFormat sets the optional data_format attribute to value.
+// Computes the eigen decomposition of one or more square self-adjoint matrices.
 //
-// value: Specify the data format of the input and output data. With the
-// default format "NHWC", the data is stored in the order of:
-//     [batch, in_height, in_width, in_channels].
-// Alternatively, the format could be "NCHW", the data storage order of:
-//     [batch, in_channels, in_height, in_width].
-// If not specified, defaults to "NHWC"
-func Conv2DBackpropFilterDataFormat(value string) Conv2DBackpropFilterAttr {
+// Computes the eigenvalues and (optionally) eigenvectors of each inner matrix in
+// `input` such that `input[..., :, :] = v[..., :, :] * diag(e[..., :])`.
+//
+// ```prettyprint
+// # a is a tensor.
+// # e is a tensor of eigenvalues.
+// # v is a tensor of eigenvectors.
+// e, v = self_adjoint_eig(a)
+// e = self_adjoint_eig(a, compute_v=False)
+// ```
+//
+// Arguments:
+//	input: `Tensor` input of shape `[N, N]`.
+//
+// Returns Eigenvalues. Shape is `[N]`.Eigenvectors. Shape is `[N, N]`.
+func SelfAdjointEigV2(scope *Scope, input tf.Output, optional ...SelfAdjointEigV2Attr) (e tf.Output, v tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "SelfAdjointEigV2",
+		Input: []tf.Input{
+			input,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1)
+}
+
+// MatrixSolveAttr is an optional argument to MatrixSolve.
+type MatrixSolveAttr func(optionalAttr)
+
+// MatrixSolveAdjoint sets the optional adjoint attribute to value.
+//
+// value: Boolean indicating whether to solve with `matrix` or its (block-wise)
+// adjoint.
+// If not specified, defaults to false
+func MatrixSolveAdjoint(value bool) MatrixSolveAttr {
 	return func(m optionalAttr) {
-		m["data_format"] = value
+		m["adjoint"] = value
 	}
 }
 
-// Computes the gradients of convolution with respect to the filter.
+// Solves systems of linear equations.
+//
+// `Matrix` is a tensor of shape `[..., M, M]` whose inner-most 2 dimensions
+// form square matrices. `Rhs` is a tensor of shape `[..., M, K]`. The `output` is
+// a tensor shape `[..., M, K]`.  If `adjoint` is `False` then each output matrix
+// satisfies `matrix[..., :, :] * output[..., :, :] = rhs[..., :, :]`.
+// If `adjoint` is `True` then each output matrix satisfies
+// `adjoint(matrix[..., :, :]) * output[..., :, :] = rhs[..., :, :]`.
 //
 // Arguments:
-//	input: 4-D with shape `[batch, in_height, in_width, in_channels]`.
-//	filter_sizes: An integer vector representing the tensor shape of `filter`,
-// where `filter` is a 4-D
-// `[filter_height, filter_width, in_channels, out_channels]` tensor.
-//	out_backprop: 4-D with shape `[batch, out_height, out_width, out_channels]`.
-// Gradients w.r.t. the output of the convolution.
-//	strides: The stride of the sliding window for each dimension of the input
-// of the convolution. Must be in the same order as the dimension specified with
-// format.
-//	padding: The type of padding algorithm to use.
+//	matrix: Shape is `[..., M, M]`.
+//	rhs: Shape is `[..., M, K]`.
 //
-// Returns 4-D with shape
-// `[filter_height, filter_width, in_channels, out_channels]`.  Gradient w.r.t.
-// the `filter` input of the convolution.
-func Conv2DBackpropFilter(scope *Scope, input tf.Output, filter_sizes tf.Output, out_backprop tf.Output, strides []int64, padding string, optional ...Conv2DBackpropFilterAttr) (output tf.Output) {
+// Returns Shape is `[..., M, K]`.
+func MatrixSolve(scope *Scope, matrix tf.Output, rhs tf.Output, optional ...MatrixSolveAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"strides": strides, "padding": padding}
+	attrs := map[string]interface{}{}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "Conv2DBackpropFilter",
+		Type: "MatrixSolve",
 		Input: []tf.Input{
-			input, filter_sizes, out_backprop,
+			matrix, rhs,
 		},
 		Attrs: attrs,
 	}
@@ -20869,227 +21027,271 @@ func Conv2DBackpropFilter(scope *Scope, input tf.Output, filter_sizes tf.Output,
 	return op.Output(0)
 }
 
-// Computes Psi, the derivative of Lgamma (the log of the absolute value of
+// SumAttr is an optional argument to Sum.
+type SumAttr func(optionalAttr)
+
+// SumKeepDims sets the optional keep_dims attribute to value.
 //
-// `Gamma(x)`), element-wise.
-func Digamma(scope *Scope, x tf.Output) (y tf.Output) {
+// value: If true, retain reduced dimensions with length 1.
+// If not specified, defaults to false
+func SumKeepDims(value bool) SumAttr {
+	return func(m optionalAttr) {
+		m["keep_dims"] = value
+	}
+}
+
+// Computes the sum of elements across dimensions of a tensor.
+//
+// Reduces `input` along the dimensions given in `reduction_indices`. Unless
+// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in
+// `reduction_indices`. If `keep_dims` is true, the reduced dimensions are
+// retained with length 1.
+//
+// Arguments:
+//	input: The tensor to reduce.
+//	reduction_indices: The dimensions to reduce.
+//
+// Returns The reduced tensor.
+func Sum(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ...SumAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "Digamma",
+		Type: "Sum",
 		Input: []tf.Input{
-			x,
+			input, reduction_indices,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// MinAttr is an optional argument to Min.
-type MinAttr func(optionalAttr)
-
-// MinKeepDims sets the optional keep_dims attribute to value.
+// Partitions `data` into `num_partitions` tensors using indices from `partitions`.
+//
+// For each index tuple `js` of size `partitions.ndim`, the slice `data[js, ...]`
+// becomes part of `outputs[partitions[js]]`.  The slices with `partitions[js] = i`
+// are placed in `outputs[i]` in lexicographic order of `js`, and the first
+// dimension of `outputs[i]` is the number of entries in `partitions` equal to `i`.
+// In detail,
+//
+// ```python
+//     outputs[i].shape = [sum(partitions == i)] + data.shape[partitions.ndim:]
+//
+//     outputs[i] = pack([data[js, ...] for js if partitions[js] == i])
+// ```
+//
+// `data.shape` must start with `partitions.shape`.
+//
+// For example:
+//
+// ```python
+//     # Scalar partitions.
+//     partitions = 1
+//     num_partitions = 2
+//     data = [10, 20]
+//     outputs[0] = []  # Empty with shape [0, 2]
+//     outputs[1] = [[10, 20]]
 //
-// value: If true, retain reduced dimensions with length 1.
-// If not specified, defaults to false
-func MinKeepDims(value bool) MinAttr {
-	return func(m optionalAttr) {
-		m["keep_dims"] = value
-	}
-}
-
-// Computes the minimum of elements across dimensions of a tensor.
+//     # Vector partitions.
+//     partitions = [0, 0, 1, 1, 0]
+//     num_partitions = 2
+//     data = [10, 20, 30, 40, 50]
+//     outputs[0] = [10, 20, 50]
+//     outputs[1] = [30, 40]
+// ```
 //
-// Reduces `input` along the dimensions given in `reduction_indices`. Unless
-// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in
-// `reduction_indices`. If `keep_dims` is true, the reduced dimensions are
-// retained with length 1.
+// <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
+// <img style="width:100%" src="https://www.tensorflow.org/images/DynamicPartition.png" alt>
+// </div>
 //
 // Arguments:
-//	input: The tensor to reduce.
-//	reduction_indices: The dimensions to reduce.
 //
-// Returns The reduced tensor.
-func Min(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ...MinAttr) (output tf.Output) {
+//	partitions: Any shape.  Indices in the range `[0, num_partitions)`.
+//	num_partitions: The number of partitions to output.
+func DynamicPartition(scope *Scope, data tf.Output, partitions tf.Output, num_partitions int64) (outputs []tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
+	attrs := map[string]interface{}{"num_partitions": num_partitions}
 	opspec := tf.OpSpec{
-		Type: "Min",
+		Type: "DynamicPartition",
 		Input: []tf.Input{
-			input, reduction_indices,
+			data, partitions,
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	if scope.Err() != nil {
+		return
+	}
+	var idx int
+	var err error
+	if outputs, idx, err = makeOutputList(op, idx, "outputs"); err != nil {
+		scope.UpdateErr("DynamicPartition", err)
+		return
+	}
+	return outputs
 }
 
-// Returns the number of work units this Reader has finished processing.
+// Serialize a `SparseTensor` into a string 3-vector (1-D `Tensor`) object.
 //
 // Arguments:
-//	reader_handle: Handle to a Reader.
-func ReaderNumWorkUnitsCompletedV2(scope *Scope, reader_handle tf.Output) (units_completed tf.Output) {
+//	sparse_indices: 2-D.  The `indices` of the `SparseTensor`.
+//	sparse_values: 1-D.  The `values` of the `SparseTensor`.
+//	sparse_shape: 1-D.  The `shape` of the `SparseTensor`.
+func SerializeSparse(scope *Scope, sparse_indices tf.Output, sparse_values tf.Output, sparse_shape tf.Output) (serialized_sparse tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "ReaderNumWorkUnitsCompletedV2",
+		Type: "SerializeSparse",
 		Input: []tf.Input{
-			reader_handle,
+			sparse_indices, sparse_values, sparse_shape,
 		},
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Returns x / y element-wise for real types.
+// Computes the reciprocal of x element-wise.
 //
-// If `x` and `y` are reals, this will return the floating-point division.
+// DEPRECATED at GraphDef version 17: Use Reciprocal
 //
-// *NOTE*: `Div` supports broadcasting. More about broadcasting
-// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func RealDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
+// I.e., \\(y = 1 / x\\).
+func Inv(scope *Scope, x tf.Output) (y tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "RealDiv",
+		Type: "Inv",
 		Input: []tf.Input{
-			x, y,
+			x,
 		},
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// ShapeAttr is an optional argument to Shape.
-type ShapeAttr func(optionalAttr)
-
-// ShapeOutType sets the optional out_type attribute to value.
-// If not specified, defaults to DT_INT32
-func ShapeOutType(value tf.DataType) ShapeAttr {
-	return func(m optionalAttr) {
-		m["out_type"] = value
-	}
-}
-
-// Returns the shape of a tensor.
-//
-// This operation returns a 1-D integer tensor representing the shape of `input`.
+// Returns x / y element-wise for integer types.
 //
-// For example:
+// Truncation designates that negative numbers will round fractional quantities
+// toward zero. I.e. -7 / 5 = 1. This matches C semantics but it is different
+// than Python semantics. See `FloorDiv` for a division function that matches
+// Python Semantics.
 //
-// ```
-// # 't' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]
-// shape(t) ==> [2, 2, 3]
-// ```
-func Shape(scope *Scope, input tf.Output, optional ...ShapeAttr) (output tf.Output) {
+// *NOTE*: `TruncateDiv` supports broadcasting. More about broadcasting
+// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
+func TruncateDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "Shape",
+		Type: "TruncateDiv",
 		Input: []tf.Input{
-			input,
+			x, y,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Computes softmax cross entropy cost and gradients to backpropagate.
+// Restores tensors from a V2 checkpoint.
 //
-// Inputs are the logits, not probabilities.
+// For backward compatibility with the V1 format, this Op currently allows
+// restoring from a V1 checkpoint as well:
+//   - This Op first attempts to find the V2 index file pointed to by "prefix", and
+//     if found proceed to read it as a V2 checkpoint;
+//   - Otherwise the V1 read path is invoked.
+// Relying on this behavior is not recommended, as the ability to fall back to read
+// V1 might be deprecated and eventually removed.
+//
+// By default, restores the named tensors in full.  If the caller wishes to restore
+// specific slices of stored tensors, "shape_and_slices" should be non-empty
+// strings and correspondingly well-formed.
+//
+// Callers must ensure all the named tensors are indeed stored in the checkpoint.
 //
 // Arguments:
-//	features: batch_size x num_classes matrix
-//	labels: batch_size x num_classes matrix
-// The caller must ensure that each batch of labels represents a valid
-// probability distribution.
+//	prefix: Must have a single element.  The prefix of a V2 checkpoint.
+//	tensor_names: shape {N}.  The names of the tensors to be restored.
+//	shape_and_slices: shape {N}.  The slice specs of the tensors to be restored.
+// Empty strings indicate that they are non-partitioned tensors.
+//	dtypes: shape {N}.  The list of expected dtype for the tensors.  Must match
+// those stored in the checkpoint.
 //
-// Returns Per example loss (batch_size vector).backpropagated gradients (batch_size x num_classes matrix).
-func SoftmaxCrossEntropyWithLogits(scope *Scope, features tf.Output, labels tf.Output) (loss tf.Output, backprop tf.Output) {
+// Returns shape {N}.  The restored tensors, whose shapes are read from the
+// checkpoint directly.
+func RestoreV2(scope *Scope, prefix tf.Output, tensor_names tf.Output, shape_and_slices tf.Output, dtypes []tf.DataType) (tensors []tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{"dtypes": dtypes}
 	opspec := tf.OpSpec{
-		Type: "SoftmaxCrossEntropyWithLogits",
+		Type: "RestoreV2",
 		Input: []tf.Input{
-			features, labels,
+			prefix, tensor_names, shape_and_slices,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
-}
-
-// Computes the number of elements in the given table.
-//
-// Arguments:
-//	table_handle: Handle to the table.
-//
-// Returns Scalar that contains number of elements in the table.
-func LookupTableSizeV2(scope *Scope, table_handle tf.Output) (size tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	opspec := tf.OpSpec{
-		Type: "LookupTableSizeV2",
-		Input: []tf.Input{
-			table_handle,
-		},
+	var idx int
+	var err error
+	if tensors, idx, err = makeOutputList(op, idx, "tensors"); err != nil {
+		scope.UpdateErr("RestoreV2", err)
+		return
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return tensors
 }
 
-// ResizeBilinearGradAttr is an optional argument to ResizeBilinearGrad.
-type ResizeBilinearGradAttr func(optionalAttr)
+// AvgPoolAttr is an optional argument to AvgPool.
+type AvgPoolAttr func(optionalAttr)
 
-// ResizeBilinearGradAlignCorners sets the optional align_corners attribute to value.
+// AvgPoolDataFormat sets the optional data_format attribute to value.
 //
-// value: If true, rescale grads by (orig_height - 1) / (height - 1), which
-// exactly aligns the 4 corners of grads and original_image. If false, rescale by
-// orig_height / height. Treat similarly the width dimension.
-// If not specified, defaults to false
-func ResizeBilinearGradAlignCorners(value bool) ResizeBilinearGradAttr {
+// value: Specify the data format of the input and output data. With the
+// default format "NHWC", the data is stored in the order of:
+//     [batch, in_height, in_width, in_channels].
+// Alternatively, the format could be "NCHW", the data storage order of:
+//     [batch, in_channels, in_height, in_width].
+// If not specified, defaults to "NHWC"
+func AvgPoolDataFormat(value string) AvgPoolAttr {
 	return func(m optionalAttr) {
-		m["align_corners"] = value
+		m["data_format"] = value
 	}
 }
 
-// Computes the gradient of bilinear interpolation.
+// Performs average pooling on the input.
+//
+// Each entry in `output` is the mean of the corresponding size `ksize`
+// window in `value`.
 //
 // Arguments:
-//	grads: 4-D with shape `[batch, height, width, channels]`.
-//	original_image: 4-D with shape `[batch, orig_height, orig_width, channels]`,
-// The image tensor that was resized.
+//	value: 4-D with shape `[batch, height, width, channels]`.
+//	ksize: The size of the sliding window for each dimension of `value`.
+//	strides: The stride of the sliding window for each dimension of `value`.
+//	padding: The type of padding algorithm to use.
 //
-// Returns 4-D with shape `[batch, orig_height, orig_width, channels]`.
-// Gradients with respect to the input image. Input image must have been
-// float or double.
-func ResizeBilinearGrad(scope *Scope, grads tf.Output, original_image tf.Output, optional ...ResizeBilinearGradAttr) (output tf.Output) {
+// Returns The average pooled output tensor.
+func AvgPool(scope *Scope, value tf.Output, ksize []int64, strides []int64, padding string, optional ...AvgPoolAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
+	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "ResizeBilinearGrad",
+		Type: "AvgPool",
 		Input: []tf.Input{
-			grads, original_image,
+			value,
 		},
 		Attrs: attrs,
 	}
@@ -21097,142 +21299,67 @@ func ResizeBilinearGrad(scope *Scope, grads tf.Output, original_image tf.Output,
 	return op.Output(0)
 }
 
-// ResizeNearestNeighborGradAttr is an optional argument to ResizeNearestNeighborGrad.
-type ResizeNearestNeighborGradAttr func(optionalAttr)
-
-// ResizeNearestNeighborGradAlignCorners sets the optional align_corners attribute to value.
+// Computes the mean along sparse segments of a tensor.
 //
-// value: If true, rescale grads by (orig_height - 1) / (height - 1), which
-// exactly aligns the 4 corners of grads and original_image. If false, rescale by
-// orig_height / height. Treat similarly the width dimension.
-// If not specified, defaults to false
-func ResizeNearestNeighborGradAlignCorners(value bool) ResizeNearestNeighborGradAttr {
-	return func(m optionalAttr) {
-		m["align_corners"] = value
-	}
-}
-
-// Computes the gradient of nearest neighbor interpolation.
+// Read @{$math_ops#segmentation$the section on segmentation} for an explanation of
+// segments.
+//
+// Like `SegmentMean`, but `segment_ids` can have rank less than `data`'s first
+// dimension, selecting a subset of dimension 0, specified by `indices`.
 //
 // Arguments:
-//	grads: 4-D with shape `[batch, height, width, channels]`.
-//	size: = A 1-D int32 Tensor of 2 elements: `orig_height, orig_width`. The
-// original input size.
 //
-// Returns 4-D with shape `[batch, orig_height, orig_width, channels]`. Gradients
-// with respect to the input image.
-func ResizeNearestNeighborGrad(scope *Scope, grads tf.Output, size tf.Output, optional ...ResizeNearestNeighborGradAttr) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
+//	indices: A 1-D tensor. Has same rank as `segment_ids`.
+//	segment_ids: A 1-D tensor. Values should be sorted and can be repeated.
+//
+// Returns Has same shape as data, except for dimension 0 which
+// has size `k`, the number of segments.
+func SparseSegmentMean(scope *Scope, data tf.Output, indices tf.Output, segment_ids tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
 	}
 	opspec := tf.OpSpec{
-		Type: "ResizeNearestNeighborGrad",
+		Type: "SparseSegmentMean",
 		Input: []tf.Input{
-			grads, size,
+			data, indices, segment_ids,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// DecodeJpegAttr is an optional argument to DecodeJpeg.
-type DecodeJpegAttr func(optionalAttr)
-
-// DecodeJpegChannels sets the optional channels attribute to value.
-//
-// value: Number of color channels for the decoded image.
-// If not specified, defaults to 0
-func DecodeJpegChannels(value int64) DecodeJpegAttr {
-	return func(m optionalAttr) {
-		m["channels"] = value
-	}
-}
-
-// DecodeJpegRatio sets the optional ratio attribute to value.
-//
-// value: Downscaling ratio.
-// If not specified, defaults to 1
-func DecodeJpegRatio(value int64) DecodeJpegAttr {
-	return func(m optionalAttr) {
-		m["ratio"] = value
-	}
-}
-
-// DecodeJpegFancyUpscaling sets the optional fancy_upscaling attribute to value.
-//
-// value: If true use a slower but nicer upscaling of the
-// chroma planes (yuv420/422 only).
-// If not specified, defaults to true
-func DecodeJpegFancyUpscaling(value bool) DecodeJpegAttr {
-	return func(m optionalAttr) {
-		m["fancy_upscaling"] = value
-	}
-}
-
-// DecodeJpegTryRecoverTruncated sets the optional try_recover_truncated attribute to value.
-//
-// value: If true try to recover an image from truncated input.
-// If not specified, defaults to false
-func DecodeJpegTryRecoverTruncated(value bool) DecodeJpegAttr {
-	return func(m optionalAttr) {
-		m["try_recover_truncated"] = value
-	}
-}
+// WholeFileReaderV2Attr is an optional argument to WholeFileReaderV2.
+type WholeFileReaderV2Attr func(optionalAttr)
 
-// DecodeJpegAcceptableFraction sets the optional acceptable_fraction attribute to value.
+// WholeFileReaderV2Container sets the optional container attribute to value.
 //
-// value: The minimum required fraction of lines before a truncated
-// input is accepted.
-// If not specified, defaults to 1
-func DecodeJpegAcceptableFraction(value float32) DecodeJpegAttr {
+// value: If non-empty, this reader is placed in the given container.
+// Otherwise, a default container is used.
+// If not specified, defaults to ""
+func WholeFileReaderV2Container(value string) WholeFileReaderV2Attr {
 	return func(m optionalAttr) {
-		m["acceptable_fraction"] = value
+		m["container"] = value
 	}
 }
 
-// DecodeJpegDctMethod sets the optional dct_method attribute to value.
+// WholeFileReaderV2SharedName sets the optional shared_name attribute to value.
 //
-// value: string specifying a hint about the algorithm used for
-// decompression.  Defaults to "" which maps to a system-specific
-// default.  Currently valid values are ["INTEGER_FAST",
-// "INTEGER_ACCURATE"].  The hint may be ignored (e.g., the internal
-// jpeg library changes to a version that does not have that specific
-// option.)
+// value: If non-empty, this reader is named in the given bucket
+// with this shared_name. Otherwise, the node name is used instead.
 // If not specified, defaults to ""
-func DecodeJpegDctMethod(value string) DecodeJpegAttr {
+func WholeFileReaderV2SharedName(value string) WholeFileReaderV2Attr {
 	return func(m optionalAttr) {
-		m["dct_method"] = value
+		m["shared_name"] = value
 	}
 }
 
-// Decode a JPEG-encoded image to a uint8 tensor.
-//
-// The attr `channels` indicates the desired number of color channels for the
-// decoded image.
-//
-// Accepted values are:
-//
-// *   0: Use the number of channels in the JPEG-encoded image.
-// *   1: output a grayscale image.
-// *   3: output an RGB image.
-//
-// If needed, the JPEG-encoded image is transformed to match the requested number
-// of color channels.
-//
-// The attr `ratio` allows downscaling the image by an integer factor during
-// decoding.  Allowed values are: 1, 2, 4, and 8.  This is much faster than
-// downscaling the image later.
+// A Reader that outputs the entire contents of a file as a value.
 //
-// Arguments:
-//	contents: 0-D.  The JPEG-encoded image.
+// To use, enqueue filenames in a Queue.  The output of ReaderRead will
+// be a filename (key) and the contents of that file (value).
 //
-// Returns 3-D with shape `[height, width, channels]`..
-func DecodeJpeg(scope *Scope, contents tf.Output, optional ...DecodeJpegAttr) (image tf.Output) {
+// Returns The handle to reference the Reader.
+func WholeFileReaderV2(scope *Scope, optional ...WholeFileReaderV2Attr) (reader_handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -21241,66 +21368,53 @@ func DecodeJpeg(scope *Scope, contents tf.Output, optional ...DecodeJpegAttr) (i
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "DecodeJpeg",
-		Input: []tf.Input{
-			contents,
-		},
+		Type: "WholeFileReaderV2",
+
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// TensorArrayGatherV3Attr is an optional argument to TensorArrayGatherV3.
-type TensorArrayGatherV3Attr func(optionalAttr)
-
-// TensorArrayGatherV3ElementShape sets the optional element_shape attribute to value.
-//
-// value: The expected shape of an element, if known. Used to
-// validate the shapes of TensorArray elements. If this shape is not
-// fully specified, gathering zero-size TensorArrays is an error.
-// If not specified, defaults to <unknown_rank:true >
-func TensorArrayGatherV3ElementShape(value tf.Shape) TensorArrayGatherV3Attr {
-	return func(m optionalAttr) {
-		m["element_shape"] = value
-	}
-}
-
-// Gather specific elements from the TensorArray into output `value`.
+// Returns up to `num_records` (key, value) pairs produced by a Reader.
 //
-// All elements selected by `indices` must have the same shape.
+// Will dequeue from the input queue if necessary (e.g. when the
+// Reader needs to start reading from a new file since it has finished
+// with the previous file).
+// It may return less than `num_records` even before the last batch.
 //
 // Arguments:
-//	handle: The handle to a TensorArray.
-//	indices: The locations in the TensorArray from which to read tensor elements.
-//	flow_in: A float scalar that enforces proper chaining of operations.
-//	dtype: The type of the elem that is returned.
+//	reader_handle: Handle to a `Reader`.
+//	queue_handle: Handle to a `Queue`, with string work items.
+//	num_records: number of records to read from `Reader`.
 //
-// Returns All of the elements in the TensorArray, concatenated along a new
-// axis (the new dimension 0).
-func TensorArrayGatherV3(scope *Scope, handle tf.Output, indices tf.Output, flow_in tf.Output, dtype tf.DataType, optional ...TensorArrayGatherV3Attr) (value tf.Output) {
+// Returns A 1-D tensor.A 1-D tensor.
+func ReaderReadUpToV2(scope *Scope, reader_handle tf.Output, queue_handle tf.Output, num_records tf.Output) (keys tf.Output, values tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"dtype": dtype}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "TensorArrayGatherV3",
+		Type: "ReaderReadUpToV2",
 		Input: []tf.Input{
-			handle, indices, flow_in,
+			reader_handle, queue_handle, num_records,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1)
 }
 
-// MaxPoolGradGradAttr is an optional argument to MaxPoolGradGrad.
-type MaxPoolGradGradAttr func(optionalAttr)
+// Conv2DBackpropFilterAttr is an optional argument to Conv2DBackpropFilter.
+type Conv2DBackpropFilterAttr func(optionalAttr)
 
-// MaxPoolGradGradDataFormat sets the optional data_format attribute to value.
+// Conv2DBackpropFilterUseCudnnOnGpu sets the optional use_cudnn_on_gpu attribute to value.
+// If not specified, defaults to true
+func Conv2DBackpropFilterUseCudnnOnGpu(value bool) Conv2DBackpropFilterAttr {
+	return func(m optionalAttr) {
+		m["use_cudnn_on_gpu"] = value
+	}
+}
+
+// Conv2DBackpropFilterDataFormat sets the optional data_format attribute to value.
 //
 // value: Specify the data format of the input and output data. With the
 // default format "NHWC", the data is stored in the order of:
@@ -21308,36 +21422,41 @@ type MaxPoolGradGradAttr func(optionalAttr)
 // Alternatively, the format could be "NCHW", the data storage order of:
 //     [batch, in_channels, in_height, in_width].
 // If not specified, defaults to "NHWC"
-func MaxPoolGradGradDataFormat(value string) MaxPoolGradGradAttr {
+func Conv2DBackpropFilterDataFormat(value string) Conv2DBackpropFilterAttr {
 	return func(m optionalAttr) {
 		m["data_format"] = value
 	}
 }
 
-// Computes second-order gradients of the maxpooling function.
+// Computes the gradients of convolution with respect to the filter.
 //
 // Arguments:
-//	orig_input: The original input tensor.
-//	orig_output: The original output tensor.
-//	grad: 4-D.  Gradients of gradients w.r.t. the input of `max_pool`.
-//	ksize: The size of the window for each dimension of the input tensor.
-//	strides: The stride of the sliding window for each dimension of the
-// input tensor.
+//	input: 4-D with shape `[batch, in_height, in_width, in_channels]`.
+//	filter_sizes: An integer vector representing the tensor shape of `filter`,
+// where `filter` is a 4-D
+// `[filter_height, filter_width, in_channels, out_channels]` tensor.
+//	out_backprop: 4-D with shape `[batch, out_height, out_width, out_channels]`.
+// Gradients w.r.t. the output of the convolution.
+//	strides: The stride of the sliding window for each dimension of the input
+// of the convolution. Must be in the same order as the dimension specified with
+// format.
 //	padding: The type of padding algorithm to use.
 //
-// Returns Gradients of gradients w.r.t. the input to `max_pool`.
-func MaxPoolGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output, grad tf.Output, ksize []int64, strides []int64, padding string, optional ...MaxPoolGradGradAttr) (output tf.Output) {
+// Returns 4-D with shape
+// `[filter_height, filter_width, in_channels, out_channels]`.  Gradient w.r.t.
+// the `filter` input of the convolution.
+func Conv2DBackpropFilter(scope *Scope, input tf.Output, filter_sizes tf.Output, out_backprop tf.Output, strides []int64, padding string, optional ...Conv2DBackpropFilterAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{"ksize": ksize, "strides": strides, "padding": padding}
+	attrs := map[string]interface{}{"strides": strides, "padding": padding}
 	for _, a := range optional {
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "MaxPoolGradGrad",
+		Type: "Conv2DBackpropFilter",
 		Input: []tf.Input{
-			orig_input, orig_output, grad,
+			input, filter_sizes, out_backprop,
 		},
 		Attrs: attrs,
 	}
@@ -21345,159 +21464,127 @@ func MaxPoolGradGrad(scope *Scope, orig_input tf.Output, orig_output tf.Output,
 	return op.Output(0)
 }
 
-// 3D real-valued fast Fourier transform.
-//
-// Computes the 3-dimensional discrete Fourier transform of a real-valued signal
-// over the inner-most 3 dimensions of `input`.
-//
-// Since the DFT of a real signal is Hermitian-symmetric, `RFFT3D` only returns the
-// `fft_length / 2 + 1` unique components of the FFT for the inner-most dimension
-// of `output`: the zero-frequency term, followed by the `fft_length / 2`
-// positive-frequency terms.
-//
-// Arguments:
-//	input: A float32 tensor.
-//	fft_length: An int32 tensor of shape [3]. The FFT length for each dimension.
-//
-// Returns A complex64 tensor of the same rank as `input`. The inner-most 3
-//   dimensions of `input` are replaced with the their 3D Fourier transform. The
-//   inner-most dimension contains `fft_length / 2 + 1` unique frequency
-//   components.
+// Computes Psi, the derivative of Lgamma (the log of the absolute value of
 //
-// @compatibility(numpy)
-// Equivalent to np.fft.rfftn with 3 dimensions.
-// @end_compatibility
-func RFFT3D(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Output) {
+// `Gamma(x)`), element-wise.
+func Digamma(scope *Scope, x tf.Output) (y tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "RFFT3D",
+		Type: "Digamma",
 		Input: []tf.Input{
-			input, fft_length,
+			x,
 		},
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Deprecated. Disallowed in GraphDef version >= 2.
+// MinAttr is an optional argument to Min.
+type MinAttr func(optionalAttr)
+
+// MinKeepDims sets the optional keep_dims attribute to value.
 //
-// DEPRECATED at GraphDef version 2: Use AdjustContrastv2 instead
-func AdjustContrast(scope *Scope, images tf.Output, contrast_factor tf.Output, min_value tf.Output, max_value tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "AdjustContrast",
-		Input: []tf.Input{
-			images, contrast_factor, min_value, max_value,
-		},
+// value: If true, retain reduced dimensions with length 1.
+// If not specified, defaults to false
+func MinKeepDims(value bool) MinAttr {
+	return func(m optionalAttr) {
+		m["keep_dims"] = value
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
 }
 
-// Store the input tensor in the state of the current session.
+// Computes the minimum of elements across dimensions of a tensor.
+//
+// Reduces `input` along the dimensions given in `reduction_indices`. Unless
+// `keep_dims` is true, the rank of the tensor is reduced by 1 for each entry in
+// `reduction_indices`. If `keep_dims` is true, the reduced dimensions are
+// retained with length 1.
 //
 // Arguments:
-//	value: The tensor to be stored.
+//	input: The tensor to reduce.
+//	reduction_indices: The dimensions to reduce.
 //
-// Returns The handle for the tensor stored in the session state, represented
-// as a ResourceHandle object.
-func GetSessionHandleV2(scope *Scope, value tf.Output) (handle tf.Output) {
+// Returns The reduced tensor.
+func Min(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ...MinAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
 	opspec := tf.OpSpec{
-		Type: "GetSessionHandleV2",
+		Type: "Min",
 		Input: []tf.Input{
-			value,
+			input, reduction_indices,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Restore a Reader to its initial clean state.
+// Returns the number of work units this Reader has finished processing.
 //
 // Arguments:
 //	reader_handle: Handle to a Reader.
-//
-// Returns the created operation.
-func ReaderResetV2(scope *Scope, reader_handle tf.Output) (o *tf.Operation) {
+func ReaderNumWorkUnitsCompletedV2(scope *Scope, reader_handle tf.Output) (units_completed tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "ReaderResetV2",
+		Type: "ReaderNumWorkUnitsCompletedV2",
 		Input: []tf.Input{
 			reader_handle,
 		},
 	}
-	return scope.AddOperation(opspec)
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
 }
 
-// Adjust the hue of one or more images.
-//
-// `images` is a tensor of at least 3 dimensions.  The last dimension is
-// interpretted as channels, and must be three.
-//
-// The input image is considered in the RGB colorspace. Conceptually, the RGB
-// colors are first mapped into HSV. A delta is then applied all the hue values,
-// and then remapped back to RGB colorspace.
+// Returns x / y element-wise for real types.
 //
-// Arguments:
-//	images: Images to adjust.  At least 3-D.
-//	delta: A float delta to add to the hue.
+// If `x` and `y` are reals, this will return the floating-point division.
 //
-// Returns The hue-adjusted image or images.
-func AdjustHue(scope *Scope, images tf.Output, delta tf.Output) (output tf.Output) {
+// *NOTE*: `Div` supports broadcasting. More about broadcasting
+// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
+func RealDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "AdjustHue",
+		Type: "RealDiv",
 		Input: []tf.Input{
-			images, delta,
+			x, y,
 		},
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// SelfAdjointEigV2Attr is an optional argument to SelfAdjointEigV2.
-type SelfAdjointEigV2Attr func(optionalAttr)
+// ShapeAttr is an optional argument to Shape.
+type ShapeAttr func(optionalAttr)
 
-// SelfAdjointEigV2ComputeV sets the optional compute_v attribute to value.
-//
-// value: If `True` then eigenvectors will be computed and returned in `v`.
-// Otherwise, only the eigenvalues will be computed.
-// If not specified, defaults to true
-func SelfAdjointEigV2ComputeV(value bool) SelfAdjointEigV2Attr {
+// ShapeOutType sets the optional out_type attribute to value.
+// If not specified, defaults to DT_INT32
+func ShapeOutType(value tf.DataType) ShapeAttr {
 	return func(m optionalAttr) {
-		m["compute_v"] = value
+		m["out_type"] = value
 	}
 }
 
-// Computes the eigen decomposition of one or more square self-adjoint matrices.
-//
-// Computes the eigenvalues and (optionally) eigenvectors of each inner matrix in
-// `input` such that `input[..., :, :] = v[..., :, :] * diag(e[..., :])`.
+// Returns the shape of a tensor.
 //
-// ```prettyprint
-// # a is a tensor.
-// # e is a tensor of eigenvalues.
-// # v is a tensor of eigenvectors.
-// e, v = self_adjoint_eig(a)
-// e = self_adjoint_eig(a, compute_v=False)
-// ```
+// This operation returns a 1-D integer tensor representing the shape of `input`.
 //
-// Arguments:
-//	input: `Tensor` input of shape `[N, N]`.
+// For example:
 //
-// Returns Eigenvalues. Shape is `[N]`.Eigenvectors. Shape is `[N, N]`.
-func SelfAdjointEigV2(scope *Scope, input tf.Output, optional ...SelfAdjointEigV2Attr) (e tf.Output, v tf.Output) {
+// ```
+// # 't' is [[[1, 1, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]
+// shape(t) ==> [2, 2, 3]
+// ```
+func Shape(scope *Scope, input tf.Output, optional ...ShapeAttr) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -21506,192 +21593,105 @@ func SelfAdjointEigV2(scope *Scope, input tf.Output, optional ...SelfAdjointEigV
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "SelfAdjointEigV2",
+		Type: "Shape",
 		Input: []tf.Input{
 			input,
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
+	return op.Output(0)
 }
 
-// Adjust the saturation of one or more images.
-//
-// `images` is a tensor of at least 3 dimensions.  The last dimension is
-// interpretted as channels, and must be three.
+// Computes softmax cross entropy cost and gradients to backpropagate.
 //
-// The input image is considered in the RGB colorspace. Conceptually, the RGB
-// colors are first mapped into HSV. A scale is then applied all the saturation
-// values, and then remapped back to RGB colorspace.
+// Inputs are the logits, not probabilities.
 //
 // Arguments:
-//	images: Images to adjust.  At least 3-D.
-//	scale: A float scale to add to the saturation.
+//	features: batch_size x num_classes matrix
+//	labels: batch_size x num_classes matrix
+// The caller must ensure that each batch of labels represents a valid
+// probability distribution.
 //
-// Returns The hue-adjusted image or images.
-func AdjustSaturation(scope *Scope, images tf.Output, scale tf.Output) (output tf.Output) {
+// Returns Per example loss (batch_size vector).backpropagated gradients (batch_size x num_classes matrix).
+func SoftmaxCrossEntropyWithLogits(scope *Scope, features tf.Output, labels tf.Output) (loss tf.Output, backprop tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "AdjustSaturation",
+		Type: "SoftmaxCrossEntropyWithLogits",
 		Input: []tf.Input{
-			images, scale,
+			features, labels,
 		},
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// EncodePngAttr is an optional argument to EncodePng.
-type EncodePngAttr func(optionalAttr)
-
-// EncodePngCompression sets the optional compression attribute to value.
-//
-// value: Compression level.
-// If not specified, defaults to -1
-func EncodePngCompression(value int64) EncodePngAttr {
-	return func(m optionalAttr) {
-		m["compression"] = value
-	}
+	return op.Output(0), op.Output(1)
 }
 
-// PNG-encode an image.
-//
-// `image` is a 3-D uint8 or uint16 Tensor of shape `[height, width, channels]`
-// where `channels` is:
-//
-// *   1: for grayscale.
-// *   2: for grayscale + alpha.
-// *   3: for RGB.
-// *   4: for RGBA.
-//
-// The ZLIB compression level, `compression`, can be -1 for the PNG-encoder
-// default or a value from 0 to 9.  9 is the highest compression level, generating
-// the smallest output, but is slower.
+// Store the input tensor in the state of the current session.
 //
 // Arguments:
-//	image: 3-D with shape `[height, width, channels]`.
+//	value: The tensor to be stored.
 //
-// Returns 0-D. PNG-encoded image.
-func EncodePng(scope *Scope, image tf.Output, optional ...EncodePngAttr) (contents tf.Output) {
+// Returns The handle for the tensor stored in the session state, represented
+// as a ResourceHandle object.
+func GetSessionHandleV2(scope *Scope, value tf.Output) (handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "EncodePng",
+		Type: "GetSessionHandleV2",
 		Input: []tf.Input{
-			image,
+			value,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// MatrixSolveLsAttr is an optional argument to MatrixSolveLs.
-type MatrixSolveLsAttr func(optionalAttr)
-
-// MatrixSolveLsFast sets the optional fast attribute to value.
-// If not specified, defaults to true
-func MatrixSolveLsFast(value bool) MatrixSolveLsAttr {
-	return func(m optionalAttr) {
-		m["fast"] = value
-	}
-}
-
-// Solves one or more linear least-squares problems.
-//
-// `matrix` is a tensor of shape `[..., M, N]` whose inner-most 2 dimensions
-// form matrices of size `[M, N]`. Rhs is a tensor of shape `[..., M, K]`.
-// The output is a tensor shape `[..., N, K]` where each output matrix solves
-// each of the equations matrix[..., :, :] * output[..., :, :] = rhs[..., :, :]
-// in the least squares sense.
-//
-// matrix and right-hand sides in the batch:
-//
-// `matrix`=\\(A \in \Re^{m \times n}\\),
-// `rhs`=\\(B  \in \Re^{m \times k}\\),
-// `output`=\\(X  \in \Re^{n \times k}\\),
-// `l2_regularizer`=\\(\lambda\\).
+// Adjust the hue of one or more images.
 //
-// If `fast` is `True`, then the solution is computed by solving the normal
-// equations using Cholesky decomposition. Specifically, if \\(m \ge n\\) then
-// \\(X = (A^T A + \lambda I)^{-1} A^T B\\), which solves the least-squares
-// problem \\(X = \mathrm{argmin}_{Z \in \Re^{n \times k} } ||A Z - B||_F^2 +
-// \lambda ||Z||_F^2\\). If \\(m \lt n\\) then `output` is computed as
-// \\(X = A^T (A A^T + \lambda I)^{-1} B\\), which (for \\(\lambda = 0\\)) is the
-// minimum-norm solution to the under-determined linear system, i.e.
-// \\(X = \mathrm{argmin}_{Z \in \Re^{n \times k} } ||Z||_F^2 \\), subject to
-// \\(A Z = B\\). Notice that the fast path is only numerically stable when
-// \\(A\\) is numerically full rank and has a condition number
-// \\(\mathrm{cond}(A) \lt \frac{1}{\sqrt{\epsilon_{mach} } }\\) or\\(\lambda\\) is
-// sufficiently large.
+// `images` is a tensor of at least 3 dimensions.  The last dimension is
+// interpretted as channels, and must be three.
 //
-// If `fast` is `False` an algorithm based on the numerically robust complete
-// orthogonal decomposition is used. This computes the minimum-norm
-// least-squares solution, even when \\(A\\) is rank deficient. This path is
-// typically 6-7 times slower than the fast path. If `fast` is `False` then
-// `l2_regularizer` is ignored.
+// The input image is considered in the RGB colorspace. Conceptually, the RGB
+// colors are first mapped into HSV. A delta is then applied all the hue values,
+// and then remapped back to RGB colorspace.
 //
 // Arguments:
-//	matrix: Shape is `[..., M, N]`.
-//	rhs: Shape is `[..., M, K]`.
-//	l2_regularizer: Scalar tensor.
-//
-// @compatibility(numpy)
-// Equivalent to np.linalg.lstsq
-// @end_compatibility
+//	images: Images to adjust.  At least 3-D.
+//	delta: A float delta to add to the hue.
 //
-// Returns Shape is `[..., N, K]`.
-func MatrixSolveLs(scope *Scope, matrix tf.Output, rhs tf.Output, l2_regularizer tf.Output, optional ...MatrixSolveLsAttr) (output tf.Output) {
+// Returns The hue-adjusted image or images.
+func AdjustHue(scope *Scope, images tf.Output, delta tf.Output) (output tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
 	opspec := tf.OpSpec{
-		Type: "MatrixSolveLs",
+		Type: "AdjustHue",
 		Input: []tf.Input{
-			matrix, rhs, l2_regularizer,
+			images, delta,
 		},
-		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
 	return op.Output(0)
 }
 
-// Converts one or more images from RGB to HSV.
-//
-// Outputs a tensor of the same shape as the `images` tensor, containing the HSV
-// value of the pixels. The output is only well defined if the value in `images`
-// are in `[0,1]`.
-//
-// `output[..., 0]` contains hue, `output[..., 1]` contains saturation, and
-// `output[..., 2]` contains value. All HSV values are in `[0,1]`. A hue of 0
-// corresponds to pure red, hue 1/3 is pure green, and 2/3 is pure blue.
+// Restore a Reader to its initial clean state.
 //
 // Arguments:
-//	images: 1-D or higher rank. RGB data to convert. Last dimension must be size 3.
+//	reader_handle: Handle to a Reader.
 //
-// Returns `images` converted to HSV.
-func RGBToHSV(scope *Scope, images tf.Output) (output tf.Output) {
+// Returns the created operation.
+func ReaderResetV2(scope *Scope, reader_handle tf.Output) (o *tf.Operation) {
 	if scope.Err() != nil {
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "RGBToHSV",
+		Type: "ReaderResetV2",
 		Input: []tf.Input{
-			images,
+			reader_handle,
 		},
 	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return scope.AddOperation(opspec)
 }
-- 
GitLab


From 9b336b4a33158061535fd6ba4973605248055b69 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 4 May 2017 13:05:05 -0800
Subject: [PATCH 1015/1563] Open sourced op level cost prediction Change:
 155123817

---
 tensorflow/core/grappler/costs/BUILD          |  27 +
 .../grappler/costs/op_level_cost_estimator.cc | 554 ++++++++++++++++++
 .../grappler/costs/op_level_cost_estimator.h  | 143 +++++
 .../costs/op_level_cost_estimator_test.cc     | 113 ++++
 tensorflow/core/grappler/costs/utils.cc       |   4 +-
 5 files changed, 840 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/core/grappler/costs/op_level_cost_estimator.cc
 create mode 100644 tensorflow/core/grappler/costs/op_level_cost_estimator.h
 create mode 100644 tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc

diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index 22f4708d03..372092f42a 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -111,6 +111,7 @@ cc_library(
     name = "utils",
     srcs = ["utils.cc"],
     hdrs = ["utils.h"],
+    defines = if_cuda(["GOOGLE_CUDA=1"]),
     visibility = ["//visibility:public"],
     deps = [
         ":op_performance_data_cc",
@@ -167,3 +168,29 @@ cc_library(
         "//tensorflow/core/kernels:ops_util",
     ],
 )
+
+cc_library(
+    name = "op_level_cost_estimator",
+    srcs = ["op_level_cost_estimator.cc"],
+    hdrs = ["op_level_cost_estimator.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":cost_estimator",
+        ":op_performance_data_cc",
+        ":utils",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+    ],
+)
+
+cc_test(
+    name = "op_level_cost_estimator_test",
+    srcs = ["op_level_cost_estimator_test.cc"],
+    deps = [
+        ":op_level_cost_estimator",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
new file mode 100644
index 0000000000..baed7a8899
--- /dev/null
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
@@ -0,0 +1,554 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/op_level_cost_estimator.h"
+#include "tensorflow/core/framework/attr_value_util.h"
+#include "tensorflow/core/grappler/costs/utils.h"
+
+namespace tensorflow {
+namespace grappler {
+
+constexpr int kOpsPerMac = 2;
+constexpr char kConv2d[] = "Conv2D";
+constexpr char kConv2dBackPropFilter[] = "Conv2DBackpropFilter";
+constexpr char kConv2dBackPropInput[] = "Conv2DBackpropInput";
+constexpr char kMatMul[] = "MatMul";
+constexpr char kSparseMatMul[] = "SparseMatMul";
+constexpr char kIdentity[] = "Identity";
+constexpr char kNoOp[] = "NoOp";
+constexpr char kReshape[] = "Reshape";
+
+OpLevelCostEstimator::OpLevelCostEstimator() {
+  // Syntactic sugar to build and return a lambda that takes an OpInfo and
+  // returns a cost.
+  typedef Costs (OpLevelCostEstimator::*CostImpl)(const OpInfo& op_feature)
+      const;
+  auto wrap = [this](CostImpl impl) -> std::function<Costs(const OpInfo&)> {
+    return [this, impl](const OpInfo& op) { return (this->*impl)(op); };
+  };
+
+  device_cost_impl_ = {
+      {kConv2d, wrap(&OpLevelCostEstimator::PredictConv2D)},
+      {kConv2dBackPropFilter,
+       wrap(&OpLevelCostEstimator::PredictConv2DBackPropFilter)},
+      {kConv2dBackPropInput,
+       wrap(&OpLevelCostEstimator::PredictConv2DBackPropInput)},
+      {kMatMul, wrap(&OpLevelCostEstimator::PredictMatMul)},
+      {kSparseMatMul, wrap(&OpLevelCostEstimator::PredictMatMul)},
+      {kIdentity, wrap(&OpLevelCostEstimator::PredictNoOp)},
+      {kNoOp, wrap(&OpLevelCostEstimator::PredictNoOp)},
+      {kReshape, wrap(&OpLevelCostEstimator::PredictNoOp)}};
+}
+
+Costs OpLevelCostEstimator::PredictCosts(const OpInfo& op_features) const {
+  auto it = device_cost_impl_.find(op_features.op());
+  if (it == device_cost_impl_.end()) {
+    VLOG(1) << "Missing implementation for op: " << op_features.op();
+    Costs costs;
+    costs = DummyExecutionTime(op_features);
+    return costs;
+  }
+
+  std::function<Costs(const OpInfo&)> estimator = it->second;
+  Costs costs = estimator(op_features);
+  VLOG(1) << "Operation " << op_features.op() << " takes "
+          << costs.execution_time.count() << " ns.";
+  return costs;
+}
+
+std::pair<double, double> OpLevelCostEstimator::GetDeviceInfo(
+    const OpInfo::DeviceProperties& device) const {
+  double gflops = -1;
+  double bandwidth = -1;
+  if (device.bandwidth() > 0) {
+    bandwidth = device.bandwidth() / 1e6;
+  }
+
+  if (device.type() == "CPU") {
+    const OpInfo::DeviceProperties local_cpu = GetLocalCPUInfo();
+    // Check if vector instructions are available, and refine performance
+    // prediction based on this.
+    gflops = local_cpu.num_cores() * local_cpu.frequency();
+    if (bandwidth < 0) {
+      if (local_cpu.bandwidth() > 0) {
+        bandwidth = local_cpu.bandwidth() / 1e6;
+      } else {
+        bandwidth = 32;
+      }
+    }
+  } else if (device.type() == "GPU") {
+    const OpInfo::DeviceProperties local_gpu = GetLocalGPUInfo(0);
+    const string architecture = local_gpu.environment().at("architecture");
+    int cores_per_multiprocessor;
+    if (architecture < "3") {
+      // Fermi
+      cores_per_multiprocessor = 32;
+    } else if (architecture < "4") {
+      // Kepler
+      cores_per_multiprocessor = 192;
+    } else if (architecture < "6") {
+      //  Maxwell
+      cores_per_multiprocessor = 128;
+    } else {
+      // Pascal.
+      cores_per_multiprocessor = 64;
+    }
+    gflops = local_gpu.num_cores() * local_gpu.frequency() *
+             cores_per_multiprocessor * kOpsPerMac;
+    if (bandwidth < 0) {
+      CHECK(local_gpu.bandwidth() > 0);
+      bandwidth = local_gpu.bandwidth() / 1e6;
+    }
+  }
+
+  return std::make_pair(gflops, bandwidth);
+}
+
+Costs OpLevelCostEstimator::DummyExecutionTime(
+    const OpInfo& op_features) const {
+  Costs costs = PredictOpCountBasedCost(0, op_features);
+  costs.inaccurate = true;
+  return costs;
+}
+
+Costs OpLevelCostEstimator::PredictOpCountBasedCost(
+    double operations, const OpInfo& op_features) const {
+  std::pair<double, double> device_perf = GetDeviceInfo(op_features.device());
+  Costs::NanoSeconds compute_cost(operations / device_perf.first);
+  VLOG(1) << "Op:" << op_features.op() << " GOps:" << operations / 1e9
+          << " Execution Time (ns):" << compute_cost.count();
+
+  bool found_unknown_shapes = false;
+  double total_input_size =
+      CalculateInputSize(op_features, &found_unknown_shapes);
+  double total_output_size =
+      CalculateOutputSize(op_features, &found_unknown_shapes);
+  double total_io_size = total_input_size + total_output_size;
+
+  Costs::NanoSeconds memory_cost(total_io_size / device_perf.second);
+  VLOG(1) << "Op:" << op_features.op() << " Size (KB):" << (total_io_size) / 1e3
+          << " Memory Time (ns):" << memory_cost.count();
+
+  Costs costs;
+  costs.compute_time = compute_cost;
+  costs.memory_time = memory_cost;
+  costs.execution_time = compute_cost + memory_cost;
+  costs.inaccurate = found_unknown_shapes;
+  return costs;
+}
+
+int64 OpLevelCostEstimator::CountConv2DOperations(
+    const OpInfo& op_features, bool* found_unknown_shapes) const {
+  return CountConv2DOperations(op_features, nullptr, found_unknown_shapes);
+}
+
+namespace {
+
+string GetDataFormat(const OpInfo& op_features) {
+  string data_format = "NHWC";  // Default format.
+  if (op_features.attr().find("data_format") != op_features.attr().end()) {
+    data_format = op_features.attr().at("data_format").s();
+  }
+  return data_format;
+}
+
+Padding GetPadding(const OpInfo& op_features) {
+  if (op_features.attr().find("padding") != op_features.attr().end() &&
+      op_features.attr().at("padding").s() == "VALID") {
+    return Padding::VALID;
+  }
+  return Padding::SAME;  // Default padding.
+}
+
+std::vector<int64> GetStrides(const OpInfo& op_features) {
+  if (op_features.attr().find("strides") != op_features.attr().end()) {
+    const auto strides = op_features.attr().at("strides").list().i();
+    return {strides[0], strides[1], strides[2], strides[3]};
+  }
+  return {1, 1, 1, 1};
+}
+
+int64 GetOutputSize(const int64 input, const int64 filter, const int64 stride,
+                    const Padding& padding) {
+  // Logic for calculating output shape is from GetWindowedOutputSizeVerbose()
+  // function in third_party/tensorflow/core/framework/common_shape_fns.cc.
+  if (padding == Padding::VALID) {
+    return (input - filter + stride) / stride;
+  } else {  // SAME.
+    return (input + stride - 1) / stride;
+  }
+}
+
+// Return a minimum shape if the shape is unknown. If known, return the original
+// shape.
+TensorShapeProto MaybeGetMinimumShape(const TensorShapeProto& original_shape,
+                                      int rank, bool* found_unknown_shapes) {
+  auto shape = original_shape;
+  if (shape.unknown_rank()) {
+    *found_unknown_shapes = true;
+  }
+  if (shape.unknown_rank() || shape.dim_size() == 0) {
+    TensorShapeProto::Dim dim;
+    VLOG(1) << "WARNING: Use minimum shape because the shape is unknown.";
+    // The size of each dimension is at least 1, if unknown.
+    dim.set_size(1);
+    for (int i = 0; i < rank; i++) {
+      *shape.add_dim() = dim;
+    }
+  } else {
+    CHECK_EQ(shape.dim_size(), rank);
+    for (int i = 0; i < rank; i++) {
+      if (shape.dim(i).size() == -1) {
+        *found_unknown_shapes = true;
+        VLOG(1)
+            << "WARNING: Use minimum dim size 1 because the shape is unknown.";
+        // The size of each dimension is at least 1, if unknown.
+        shape.mutable_dim(i)->set_size(1);
+      }
+    }
+  }
+  return shape;
+}
+}  // namespace
+
+// Helper to translate the positional arguments into named fields.
+OpLevelCostEstimator::ConvolutionDimensions
+OpLevelCostEstimator::ConvolutionDimensionsFromInputs(
+    const TensorShapeProto& original_image_shape,
+    const TensorShapeProto& original_filter_shape, const OpInfo& op_features,
+    bool* found_unknown_shapes) {
+  auto image_shape =
+      MaybeGetMinimumShape(original_image_shape, 4, found_unknown_shapes);
+  auto filter_shape =
+      MaybeGetMinimumShape(original_filter_shape, 4, found_unknown_shapes);
+
+  int x_index, y_index, channel_index;
+  const string& data_format = GetDataFormat(op_features);
+  if (data_format == "NCHW") {
+    x_index = 2;
+    y_index = 3;
+    channel_index = 1;
+  } else {
+    x_index = 1;
+    y_index = 2;
+    channel_index = 3;
+  }
+  int64 batch = image_shape.dim(0).size();
+  int64 ix = image_shape.dim(x_index).size();
+  int64 iy = image_shape.dim(y_index).size();
+  int64 iz = image_shape.dim(channel_index).size();
+  int64 kx = filter_shape.dim(0).size();
+  int64 ky = filter_shape.dim(1).size();
+  std::vector<int64> strides = GetStrides(op_features);
+  const auto padding = GetPadding(op_features);
+  int64 sx = strides[x_index];
+  int64 sy = strides[y_index];
+  int64 ox = GetOutputSize(ix, kx, sx, padding);
+  int64 oy = GetOutputSize(iy, ky, sy, padding);
+  int64 oz = filter_shape.dim(3).size();
+  // Only check equality when both sizes are known (in other words, when
+  // neither is set to a minimum dimension size of 1).
+  if (iz != 1 && filter_shape.dim(2).size() != 1) {
+    CHECK_EQ(iz, filter_shape.dim(2).size());
+  } else {
+    iz = std::max<int64>(iz, filter_shape.dim(2).size());
+  }
+  OpLevelCostEstimator::ConvolutionDimensions conv_dims = {
+      batch, ix, iy, iz, kx, ky, oz, ox, oy, sx, sy, padding};
+
+  VLOG(1) << "Batch Size:" << batch;
+  VLOG(1) << "Image Dims:" << ix << "," << iy;
+  VLOG(1) << "Input Features:" << iz;
+  VLOG(1) << "Kernel Dims:" << kx << "," << ky;
+  VLOG(1) << "Output Features:" << oz;
+  VLOG(1) << "Output Dims:" << ox << "," << oy;
+  VLOG(1) << "Strides:" << sx << "," << sy;
+  VLOG(1) << "Padding:" << (padding == Padding::VALID ? "VALID" : "SAME");
+  return conv_dims;
+}
+
+int64 OpLevelCostEstimator::CountConv2DOperations(
+    const OpInfo& op_features, ConvolutionDimensions* conv_info,
+    bool* found_unknown_shapes) const {
+  if (op_features.op() != kConv2d) {
+    LOG(ERROR) << "Invalid Operation";
+    return 0;
+  }
+  ConvolutionDimensions conv_dims = ConvolutionDimensionsFromInputs(
+      op_features.inputs(0).shape(), op_features.inputs(1).shape(), op_features,
+      found_unknown_shapes);
+
+  int64 ops = conv_dims.batch;
+  ops *= conv_dims.ox * conv_dims.oy;
+  ops *= conv_dims.kx * conv_dims.ky;
+  ops *= conv_dims.iz * conv_dims.oz;
+  ops *= kOpsPerMac;
+  VLOG(1) << "Operations for Conv2D" << ops;
+
+  if (conv_info != nullptr) {
+    *conv_info = conv_dims;
+  }
+  return ops;
+}
+
+int64 OpLevelCostEstimator::CountMatMulOperations(
+    const OpInfo& op_features, bool* found_unknown_shapes) const {
+  return CountMatMulOperations(op_features, nullptr, found_unknown_shapes);
+}
+
+int64 OpLevelCostEstimator::CountMatMulOperations(
+    const OpInfo& op_features, MatMulDimensions* mat_mul,
+    bool* found_unknown_shapes) const {
+  double ops = 0;
+
+  // TODO(nishantpatil): Create separate estimator for Sparse Matmul
+  if ((op_features.op() != kMatMul) && (op_features.op() != kSparseMatMul)) {
+    LOG(ERROR) << "Invalid Operation";
+    return ops;
+  }
+
+  // first matrix
+  auto& a_matrix = op_features.inputs(0);
+  auto& b_matrix = op_features.inputs(1);
+
+  bool transpose_a = false;
+  bool transpose_b = false;
+
+  double m_dim, n_dim, k_dim, k_dim_b = 0;
+
+  for (const auto& item : op_features.attr()) {
+    VLOG(1) << "Key:" << item.first
+            << " Value:" << SummarizeAttrValue(item.second);
+    if (item.first == "transpose_a" && item.second.b() == true)
+      transpose_a = true;
+    if (item.first == "transpose_b" && item.second.b() == true)
+      transpose_b = true;
+  }
+  VLOG(1) << "transpose_a:" << transpose_a;
+  VLOG(1) << "transpose_b:" << transpose_b;
+  auto a_matrix_shape =
+      MaybeGetMinimumShape(a_matrix.shape(), 2, found_unknown_shapes);
+  auto b_matrix_shape =
+      MaybeGetMinimumShape(b_matrix.shape(), 2, found_unknown_shapes);
+  if (transpose_a) {
+    m_dim = a_matrix_shape.dim(1).size();
+    k_dim = a_matrix_shape.dim(0).size();
+  } else {
+    m_dim = a_matrix_shape.dim(0).size();
+    k_dim = a_matrix_shape.dim(1).size();
+  }
+  if (transpose_b) {
+    k_dim_b = b_matrix_shape.dim(1).size();
+    n_dim = b_matrix_shape.dim(0).size();
+  } else {
+    k_dim_b = b_matrix_shape.dim(0).size();
+    n_dim = b_matrix_shape.dim(1).size();
+  }
+
+  VLOG(1) << "M, N, K: " << m_dim << "," << n_dim << "," << k_dim;
+  // Only check equality when both sizes are known (in other words, when
+  // neither is set to a minimum dimension size of 1).
+  if (k_dim_b != 1 && k_dim != 1 && k_dim_b != k_dim) {
+    LOG(ERROR) << "Incompatible Matrix dimensions";
+    return ops;
+  } else {
+    // One of k_dim and k_dim_b might be 1 (mininum dimension size).
+    k_dim = std::max(k_dim, k_dim_b);
+  }
+
+  ops = m_dim * n_dim * k_dim * 2;
+  VLOG(1) << "Operations for Matmul" << ops;
+
+  if (mat_mul != nullptr) {
+    mat_mul->m = m_dim;
+    mat_mul->n = n_dim;
+    mat_mul->k = k_dim;
+  }
+  return ops;
+}
+
+// TODO(cliffy): Dedup this method and CountConv2DBackPropFilterOperations.
+int64 OpLevelCostEstimator::CountConv2DBackPropInputOperations(
+    const OpInfo& op_features, ConvolutionDimensions* returned_conv_dims,
+    bool* found_unknown_shapes) const {
+  int64 ops = 0;
+
+  if (op_features.op() != kConv2dBackPropInput) {
+    LOG(ERROR) << "Invalid Operation";
+    return ops;
+  }
+
+  if (op_features.attr().find("_output_shapes") == op_features.attr().end()) {
+    // Need _output_shapes for input shape.
+    LOG(ERROR) << "No output shape in Conv2DBackPropInput op feaure.";
+    return ops;
+  }
+
+  const auto& input_shape =
+      op_features.attr().at("_output_shapes").list().shape(0);
+  ConvolutionDimensions conv_dims = ConvolutionDimensionsFromInputs(
+      input_shape, op_features.inputs(1).shape(), op_features,
+      found_unknown_shapes);
+
+  ops = conv_dims.batch;
+  ops *= conv_dims.ox * conv_dims.oy;
+  ops *= conv_dims.kx * conv_dims.ky;
+  ops *= conv_dims.iz * conv_dims.oz;
+  ops *= kOpsPerMac;
+
+  VLOG(1) << "Operations for Conv2DBackPropInput" << ops;
+
+  if (returned_conv_dims != nullptr) {
+    *returned_conv_dims = conv_dims;
+  }
+  return ops;
+}
+
+int64 OpLevelCostEstimator::CountConv2DBackPropFilterOperations(
+    const OpInfo& op_features, ConvolutionDimensions* returned_conv_dims,
+    bool* found_unknown_shapes) const {
+  int64 ops = 0;
+  if (op_features.op() != kConv2dBackPropFilter) {
+    LOG(ERROR) << "Invalid Operation";
+    return ops;
+  }
+
+  if (op_features.attr().find("_output_shapes") == op_features.attr().end()) {
+    // Need _output_shapes for filter shape.
+    LOG(ERROR) << "No output shape in Conv2DBackPropFilter op feaure.";
+    return ops;
+  }
+
+  const auto& filter_shape =
+      op_features.attr().at("_output_shapes").list().shape(0);
+  ConvolutionDimensions conv_dims = ConvolutionDimensionsFromInputs(
+      op_features.inputs(0).shape(), filter_shape, op_features,
+      found_unknown_shapes);
+
+  ops = conv_dims.batch;
+  ops *= conv_dims.ox * conv_dims.oy;
+  ops *= conv_dims.kx * conv_dims.ky;
+  ops *= conv_dims.iz * conv_dims.oz;
+  ops *= kOpsPerMac;
+
+  VLOG(1) << "Operations for Conv2DBackPropFilter" << ops;
+
+  if (returned_conv_dims != nullptr) {
+    *returned_conv_dims = conv_dims;
+  }
+  return ops;
+}
+
+int64 OpLevelCostEstimator::CalculateSingleInputSize(
+    const OpInfo::TensorProperties& input, bool* found_unknown_shapes) const {
+  VLOG(1) << "   with " << input.dtype() << " input of shape "
+          << input.shape().DebugString();
+  int64 input_size = 1;
+  int num_dims = std::max(1, input.shape().dim_size());
+  auto input_shape =
+      MaybeGetMinimumShape(input.shape(), num_dims, found_unknown_shapes);
+  for (const auto& dim : input_shape.dim()) {
+    input_size *= dim.size();
+  }
+  return input_size * DataTypeSize(input.dtype());
+}
+
+int64 OpLevelCostEstimator::CalculateInputSize(
+    const OpInfo& op_features, bool* found_unknown_shapes) const {
+  int64 total_input_size = 0;
+  for (auto& input : op_features.inputs()) {
+    int64 input_size = CalculateSingleInputSize(input, found_unknown_shapes);
+    total_input_size += input_size;
+    VLOG(1) << "Input Size: " << input_size
+            << " Total Input Size:" << total_input_size;
+  }
+  return total_input_size;
+}
+
+int64 OpLevelCostEstimator::CalculateOutputSize(
+    const OpInfo& op_features, bool* found_unknown_shapes) const {
+  int64 total_output_size = 0;
+  // use float as default for calculations
+  DataType dt = DT_FLOAT;
+  for (const auto& item : op_features.attr()) {
+    VLOG(1) << "Key:" << item.first
+            << " Value:" << SummarizeAttrValue(item.second);
+    if (item.first == "_output_shapes") {
+      for (const auto& original_output_shape : item.second.list().shape()) {
+        int64 output_size = 1;
+        int num_dims = std::max(1, original_output_shape.dim_size());
+        auto output_shape = MaybeGetMinimumShape(
+            original_output_shape, num_dims, found_unknown_shapes);
+        for (const auto& dim : output_shape.dim()) {
+          output_size *= dim.size();
+        }
+        output_size *= DataTypeSize(dt);
+        total_output_size += output_size;
+        VLOG(1) << "Output Size: " << output_size
+                << " Total Output Size:" << total_output_size;
+      }
+    }
+    if (item.first == "T") {
+      dt = item.second.type();
+    }
+  }
+  return total_output_size;
+}
+
+Costs OpLevelCostEstimator::PredictConv2D(const OpInfo& op_features) const {
+  bool found_unknown_shapes = false;
+  auto costs = PredictOpCountBasedCost(
+      CountConv2DOperations(op_features, &found_unknown_shapes), op_features);
+  costs.inaccurate = found_unknown_shapes;
+  return costs;
+}
+
+Costs OpLevelCostEstimator::PredictConv2DBackPropInput(
+    const OpInfo& op_features) const {
+  bool found_unknown_shapes = false;
+  auto costs =
+      PredictOpCountBasedCost(CountConv2DBackPropInputOperations(
+                                  op_features, nullptr, &found_unknown_shapes),
+                              op_features);
+  costs.inaccurate = found_unknown_shapes;
+  return costs;
+}
+
+Costs OpLevelCostEstimator::PredictConv2DBackPropFilter(
+    const OpInfo& op_features) const {
+  bool found_unknown_shapes = false;
+  auto costs =
+      PredictOpCountBasedCost(CountConv2DBackPropFilterOperations(
+                                  op_features, nullptr, &found_unknown_shapes),
+                              op_features);
+  costs.inaccurate = found_unknown_shapes;
+  return costs;
+}
+
+Costs OpLevelCostEstimator::PredictMatMul(const OpInfo& op_features) const {
+  bool found_unknown_shapes = false;
+  auto costs = PredictOpCountBasedCost(
+      CountMatMulOperations(op_features, &found_unknown_shapes), op_features);
+  costs.inaccurate = found_unknown_shapes;
+  return costs;
+}
+
+Costs OpLevelCostEstimator::PredictNoOp(const OpInfo& op_features) const {
+  VLOG(1) << "Op:" << op_features.op() << " Execution Time 0 (ns)";
+  return Costs::ZeroCosts();
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.h b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
new file mode 100644
index 0000000000..5bb20cc6bb
--- /dev/null
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
@@ -0,0 +1,143 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CORE_GRAPPLER_COSTS_OP_LEVEL_COST_ESTIMATOR_H_
+#define TENSORFLOW_CORE_GRAPPLER_COSTS_OP_LEVEL_COST_ESTIMATOR_H_
+
+#include <functional>
+#include <map>
+#include <string>
+
+#include "tensorflow/core/graph/types.h"
+#include "tensorflow/core/grappler/costs/cost_estimator.h"
+#include "tensorflow/core/grappler/costs/op_performance_data.pb.h"
+#include "tensorflow/core/util/padding.h"
+
+namespace tensorflow {
+namespace grappler {
+
+class OpLevelCostEstimator {
+ public:
+  OpLevelCostEstimator();
+  virtual ~OpLevelCostEstimator() {}
+
+  Costs PredictCosts(const OpInfo& op_features) const;
+
+ protected:
+  // Returns an estimate of device performance (in billions of operations
+  // executed per second) and memory bandwith (in GigaBytes/second) for the
+  // specified device.
+  virtual std::pair<double, double> GetDeviceInfo(
+      const OpInfo::DeviceProperties& device) const;
+
+  // For operations for which we haven't yet built estimates, returns a dummy
+  // value based on input size.
+  Costs DummyExecutionTime(const OpInfo& op_features) const;
+
+  // Naive cost estimate based on operations divided by device ops/sec.
+  Costs PredictOpCountBasedCost(double operations,
+                                const OpInfo& op_features) const;
+
+  // This family of routines counts the number of operations to perform the
+  // specified TensorFlow Op.
+  struct MatMulDimensions {
+    int m;
+    int n;
+    int k;
+  };
+  struct ConvolutionDimensions {
+    int64 batch;      // Batch size.
+    int64 ix;         // Input size x.
+    int64 iy;         // Input size y.
+    int64 iz;         // Input depth.
+    int64 kx;         // Kernel x.
+    int64 ky;         // Kernel y.
+    int64 oz;         // Output depth.
+    int64 ox;         // Output size x.
+    int64 oy;         // Output size y.
+    int64 sx;         // Stride x.
+    int64 sy;         // Stride y.
+    Padding padding;  // SAME or VALID.
+  };
+  int64 CountConv2DOperations(const OpInfo& op_features,
+                              bool* found_unknown_shapes) const;
+  int64 CountConv2DOperations(const OpInfo& op_features,
+                              ConvolutionDimensions* conv_info,
+                              bool* found_unknown_shapes) const;
+  int64 CountMatMulOperations(const OpInfo& op_features,
+                              bool* found_unknown_shapes) const;
+  int64 CountMatMulOperations(const OpInfo& op_features,
+                              MatMulDimensions* mat_mul,
+                              bool* found_unknown_shapes) const;
+  int64 CountConv2DBackPropInputOperations(const OpInfo& op_features,
+                                           ConvolutionDimensions* conv_info,
+                                           bool* found_unknown_shapes) const;
+  int64 CountConv2DBackPropFilterOperations(const OpInfo& op_features,
+                                            ConvolutionDimensions* conv_info,
+                                            bool* found_unknown_shapes) const;
+
+  // Calculate the total size in bytes of a single input to a TensorFlow op.
+  int64 CalculateSingleInputSize(const OpInfo::TensorProperties& input,
+                                 bool* found_unknown_shapes) const;
+
+  // Calculate the total size in bytes of the all
+  // the inputs of specified TensorFlow Op
+  int64 CalculateInputSize(const OpInfo& op_features,
+                           bool* found_unknown_shapes) const;
+
+  // Calculate the total size in bytes of the all
+  // the outputs of specified TensorFlow Op
+  int64 CalculateOutputSize(const OpInfo& op_features,
+                            bool* found_unknown_shapes) const;
+
+  // This family of routines predicts the costs to
+  // perform the specified TensorFlow Op on the
+  // device represented by a subclass. The default
+  // implementation just divides the operations to
+  // perform the op (from the "Count" routines,
+  // above) by the device peak operations per
+  // second. Override to supply a better estimate.
+  // Implementation of costs other than
+  // execution_time is optional, depending on the
+  // device.
+  Costs PredictConv2D(const OpInfo& op_features) const;
+  Costs PredictConv2DBackPropInput(const OpInfo& op_features) const;
+  Costs PredictConv2DBackPropFilter(const OpInfo& op_features) const;
+  Costs PredictMatMul(const OpInfo& op_features) const;
+  Costs PredictNoOp(const OpInfo& op_features) const;
+
+  // Utility function for safe division. Returns 0
+  // if rhs is 0 or negative.
+  static double SafeDiv(const double lhs, const double rhs) {
+    if (rhs > 0) {
+      return lhs / rhs;
+    } else {
+      return 0.0;
+    }
+  }
+
+  static ConvolutionDimensions ConvolutionDimensionsFromInputs(
+      const TensorShapeProto& original_image_shape,
+      const TensorShapeProto& original_filter_shape, const OpInfo& op_features,
+      bool* found_unknown_shapes);
+
+ private:
+  typedef std::function<Costs(const OpInfo& op_feature)> CostImpl;
+  std::map<string, CostImpl> device_cost_impl_;
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+#endif  // TENSORFLOW_CORE_GRAPPLER_COSTS_OP_LEVEL_COST_ESTIMATOR_H_
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc b/tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc
new file mode 100644
index 0000000000..e0b0348c8e
--- /dev/null
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc
@@ -0,0 +1,113 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/op_level_cost_estimator.h"
+#include "tensorflow/core/framework/tensor_shape.pb.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+
+namespace {
+// Wrangles the minimum number of proto fields to set up a matrix.
+void DescribeMatrix(int rows, int columns, OpInfo *op_features) {
+  auto input = op_features->add_inputs();
+  auto shape = input->mutable_shape();
+  auto shape_rows = shape->add_dim();
+  shape_rows->set_size(rows);
+  auto shape_columns = shape->add_dim();
+  shape_columns->set_size(columns);
+  input->set_dtype(DT_FLOAT);
+}
+
+// Returns an OpInfo for MatMul with the minimum set of fields set up.
+OpInfo DescribeMatMul(int m, int n, int l, int k) {
+  OpInfo op_features;
+  auto device = op_features.mutable_device();
+  device->set_type("CPU");
+  op_features.set_op("MatMul");
+
+  DescribeMatrix(m, l, &op_features);
+  DescribeMatrix(k, n, &op_features);
+  return op_features;
+}
+
+// Returns an OpInfo for MatMul with unknown input shapes.
+OpInfo DescribeMatMulUnknownShape() {
+  OpInfo op_features;
+  auto device = op_features.mutable_device();
+  device->set_type("CPU");
+  op_features.set_op("MatMul");
+
+  auto input = op_features.add_inputs();
+  auto shape = input->mutable_shape();
+  shape->set_unknown_rank(true);
+
+  input = op_features.add_inputs();
+  shape = input->mutable_shape();
+  shape->set_unknown_rank(true);
+
+  return op_features;
+}
+
+// Wrangles the minimum number of proto fields to set up a 4D Tensor for cost
+// estimation purposes.
+void DescribeTensor4D(int dim0, int dim1, int dim2, int dim3,
+                      OpInfo *op_features) {
+  auto input = op_features->add_inputs();
+  auto shape = input->mutable_shape();
+  shape->add_dim()->set_size(dim0);
+  shape->add_dim()->set_size(dim1);
+  shape->add_dim()->set_size(dim2);
+  shape->add_dim()->set_size(dim3);
+}
+
+// Returns an OpInfo for Conv2D with the minimum set of fields set up.
+OpInfo DescribeConvolution(int batch, int ix, int iy, int iz1, int iz2, int kx,
+                           int ky, int oz) {
+  OpInfo op_features;
+  auto device = op_features.mutable_device();
+  device->set_type("CPU");
+  op_features.set_op("Conv2D");
+
+  DescribeTensor4D(batch, ix, iy, iz1, &op_features);
+  DescribeTensor4D(kx, ky, iz2, oz, &op_features);
+  return op_features;
+}
+}  // namespace
+
+TEST(OpLevelCostEstimatorTest, UnknownOrPartialShape) {
+  OpLevelCostEstimator estimator;
+
+  EXPECT_EQ(false,
+            estimator.PredictCosts(DescribeMatMul(2, 4, 7, 7)).inaccurate);
+  EXPECT_EQ(true,
+            estimator.PredictCosts(DescribeMatMul(-1, 4, 7, 7)).inaccurate);
+  EXPECT_EQ(true,
+            estimator.PredictCosts(DescribeMatMul(2, 4, -1, 7)).inaccurate);
+
+  EXPECT_EQ(
+      false,
+      estimator.PredictCosts(DescribeConvolution(16, 19, 19, 48, 48, 5, 5, 256))
+          .inaccurate);
+  EXPECT_EQ(
+      true,
+      estimator.PredictCosts(DescribeConvolution(16, -1, 19, 48, 48, 5, 5, 256))
+          .inaccurate);
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/utils.cc b/tensorflow/core/grappler/costs/utils.cc
index 4e35de9d4a..0852cb4fd3 100644
--- a/tensorflow/core/grappler/costs/utils.cc
+++ b/tensorflow/core/grappler/costs/utils.cc
@@ -147,7 +147,7 @@ OpInfo::DeviceProperties GetLocalCPUInfo() {
   // Combine cpu family and model into the model string.
   device.set_model(
       strings::StrCat((port::CPUFamily() << 4) + port::CPUModelNum()));
-  device.set_frequency(port::NominalCPUFrequency());
+  device.set_frequency(port::NominalCPUFrequency() * 1e-9);
   device.set_num_cores(port::NumSchedulableCPUs());
   device.set_l1_cache_size(Eigen::l1CacheSize());
   device.set_l2_cache_size(Eigen::l2CacheSize());
@@ -195,6 +195,8 @@ OpInfo::DeviceProperties GetLocalGPUInfo(int gpu_id) {
                          properties.memoryClockRate * 2);
   }
 
+  (*device.mutable_environment())["architecture"] =
+      strings::StrCat(properties.major, ".", properties.minor);
   (*device.mutable_environment())["cuda"] = strings::StrCat(CUDA_VERSION);
   (*device.mutable_environment())["cudnn"] = strings::StrCat(CUDNN_VERSION);
 #endif
-- 
GitLab


From 8db659168077605d4dc9846f47e730b5fb05f5e4 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 4 May 2017 13:51:15 -0800
Subject: [PATCH 1016/1563] Upgrade TypeScript to 2.3.1 Change: 155130334

---
 tensorflow/tensorboard/package.json |  2 +-
 tensorflow/workspace.bzl            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tensorflow/tensorboard/package.json b/tensorflow/tensorboard/package.json
index 69f08495a3..d424f103dd 100644
--- a/tensorflow/tensorboard/package.json
+++ b/tensorflow/tensorboard/package.json
@@ -30,7 +30,7 @@
     "merge2": "~0.3.6",
     "minimist": "~1.2.0",
     "tsify": "^0.14.8",
-    "typescript": "2.2.2",
+    "typescript": "2.3.1",
     "typings": "1.4.0",
     "vinyl-source-stream": "^1.1.0",
     "vulcanize": "^1.14.0",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 0f69d53ba4..50e329f8c0 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -668,13 +668,13 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "com_microsoft_typescript",
       licenses = ["notice"],  # Apache 2.0
       sha256_urls = {
-          "43a7c763fe024d5add8d5365e5a7981f4a359ba5bf86481f545a0db8f60d48cc": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
-              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/tsc.js",
+          "8465342c318f9c4cf0a29b109fa63ee3742dd4dc7080d05d9fd8f604814d04cf": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js",
+              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js",
           ],
-          "aecec1e47a3b3d872e214cb9adb82b30d6bd0471ea0aad7311ad81428566627c": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/lib.es6.d.ts",
-              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.2.2/lib/lib.es6.d.ts",
+          "a67e36da3029d232e4e938e61a0a3302f516d71e7100d54dbf5362ad8618e994": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/lib.es6.d.ts",
+              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/lib.es6.d.ts",
           ],
       },
       extra_build_file_content = "\n".join([
-- 
GitLab


From d1001f4bedf91f50971174f9131d5b72d6120d73 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 4 May 2017 13:54:01 -0800
Subject: [PATCH 1017/1563] [tf distributions] Move conditional back to contrib
 (not slated for core); move transformed into core.

(I accidentally moved the wrong file in the previous change!)

Also move the Identity bijector & test into core.

I can't move the TransformedDistribution test into core since it relies on linalg.
Change: 155130709
---
 tensorflow/contrib/distributions/BUILD        | 19 ------------
 tensorflow/contrib/distributions/__init__.py  |  4 +--
 .../kernel_tests/bijectors/affine_test.py     |  2 +-
 .../kernel_tests/bijectors/chain_test.py      |  2 +-
 .../bijectors/cholesky_outer_product_test.py  |  4 +--
 .../python/kernel_tests/bijectors/exp_test.py |  4 +--
 .../kernel_tests/bijectors/invert_test.py     |  4 +--
 .../bijectors/power_transform_test.py         |  4 +--
 .../kernel_tests/bijectors/sigmoid_test.py    |  4 +--
 .../bijectors/softmax_centered_test.py        |  2 +-
 .../kernel_tests/bijectors/softplus_test.py   |  4 +--
 .../python/ops/bijectors/__init__.py          |  2 +-
 .../python/ops/bijectors/identity.py          | 29 -------------------
 .../python/ops}/conditional_distribution.py   |  0
 .../conditional_transformed_distribution.py   |  4 +--
 .../python/ops/mvn_linear_operator.py         |  2 +-
 .../python/ops/relaxed_bernoulli.py           |  2 +-
 .../python/ops/relaxed_onehot_categorical.py  |  2 +-
 .../python/ops/vector_student_t.py            |  2 +-
 .../python/kernel_tests/distributions/BUILD   | 17 +++++++++++
 .../distributions/identity_bijector_test.py}  | 10 +++----
 .../ops/distributions}/bijector_test_util.py  |  0
 .../ops/distributions/identity_bijector.py}   |  0
 .../transformed_distribution.py               |  4 +--
 24 files changed, 48 insertions(+), 79 deletions(-)
 delete mode 100644 tensorflow/contrib/distributions/python/ops/bijectors/identity.py
 rename tensorflow/{python/ops/distributions => contrib/distributions/python/ops}/conditional_distribution.py (100%)
 rename tensorflow/{contrib/distributions/python/kernel_tests/bijectors/identity_test.py => python/kernel_tests/distributions/identity_bijector_test.py} (84%)
 rename tensorflow/{contrib/distributions/python/ops/bijectors => python/ops/distributions}/bijector_test_util.py (100%)
 rename tensorflow/{contrib/distributions/python/ops/bijectors/identity_impl.py => python/ops/distributions/identity_bijector.py} (100%)
 rename tensorflow/{contrib/distributions/python/ops => python/ops/distributions}/transformed_distribution.py (99%)

diff --git a/tensorflow/contrib/distributions/BUILD b/tensorflow/contrib/distributions/BUILD
index 9f675c6613..0c818dee03 100644
--- a/tensorflow/contrib/distributions/BUILD
+++ b/tensorflow/contrib/distributions/BUILD
@@ -710,25 +710,6 @@ cuda_py_test(
     ],
 )
 
-cuda_py_test(
-    name = "identity_test",
-    size = "small",
-    srcs = ["python/kernel_tests/bijectors/identity_test.py"],
-    additional_deps = [
-        ":bijectors_py",
-        ":distributions_py",
-        "//third_party/py/numpy",
-        "@six_archive//:six",
-        "//tensorflow/contrib/linalg:linalg_py",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
 cuda_py_test(
     name = "inline_test",
     size = "small",
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index 6ea74fab0e..ea12e13010 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -25,6 +25,7 @@ from __future__ import print_function
 from tensorflow.contrib.distributions.python.ops import bijectors
 from tensorflow.contrib.distributions.python.ops.binomial import *
 from tensorflow.contrib.distributions.python.ops.chi2 import *
+from tensorflow.contrib.distributions.python.ops.conditional_distribution import *
 from tensorflow.contrib.distributions.python.ops.conditional_transformed_distribution import *
 from tensorflow.contrib.distributions.python.ops.deterministic import *
 from tensorflow.contrib.distributions.python.ops.distribution_util import matrix_diag_transform
@@ -44,12 +45,10 @@ from tensorflow.contrib.distributions.python.ops.quantized_distribution import *
 from tensorflow.contrib.distributions.python.ops.relaxed_bernoulli import *
 from tensorflow.contrib.distributions.python.ops.relaxed_onehot_categorical import *
 from tensorflow.contrib.distributions.python.ops.sample_stats import *
-from tensorflow.contrib.distributions.python.ops.transformed_distribution import *
 from tensorflow.contrib.distributions.python.ops.wishart import *
 from tensorflow.python.ops.distributions.bernoulli import *
 from tensorflow.python.ops.distributions.beta import *
 from tensorflow.python.ops.distributions.categorical import *
-from tensorflow.python.ops.distributions.conditional_distribution import *
 from tensorflow.python.ops.distributions.dirichlet import *
 from tensorflow.python.ops.distributions.dirichlet_multinomial import *
 from tensorflow.python.ops.distributions.distribution import *
@@ -60,6 +59,7 @@ from tensorflow.python.ops.distributions.laplace import *
 from tensorflow.python.ops.distributions.multinomial import *
 from tensorflow.python.ops.distributions.normal import *
 from tensorflow.python.ops.distributions.student_t import *
+from tensorflow.python.ops.distributions.transformed_distribution import *
 from tensorflow.python.ops.distributions.uniform import *
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
index 13554f7664..e8fd6aa2f7 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/affine_test.py
@@ -23,9 +23,9 @@ import itertools
 import numpy as np
 
 from tensorflow.contrib.distributions.python.ops.bijectors.affine import Affine
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
index 994e21dd48..20e7543084 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/chain_test.py
@@ -20,12 +20,12 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.contrib.distributions.python.ops.bijectors.chain import Chain
 from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
 from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
 from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
index a4688829f1..0ff3530428 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/cholesky_outer_product_test.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops.distributions import gamma as gamma_lib
+from tensorflow.python.ops.distributions import transformed_distribution as transformed_distribution_lib
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
index c30ce60cac..9970c0b4d8 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/exp_test.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.contrib.distributions.python.ops.bijectors.exp import Exp
+from tensorflow.python.ops.distributions.bijector_test_util import assert_bijective_and_finite
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
index a4688829f1..0ff3530428 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/invert_test.py
@@ -19,11 +19,11 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import transformed_distribution as transformed_distribution_lib
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops.distributions import gamma as gamma_lib
+from tensorflow.python.ops.distributions import transformed_distribution as transformed_distribution_lib
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
index b30a3b599b..de1659aa9f 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/power_transform_test.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.contrib.distributions.python.ops.bijectors.power_transform import PowerTransform
+from tensorflow.python.ops.distributions.bijector_test_util import assert_bijective_and_finite
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
index 6f1a6b1cf4..e4f9d72785 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/sigmoid_test.py
@@ -21,9 +21,9 @@ from __future__ import print_function
 import numpy as np
 from scipy import special
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
+from tensorflow.python.ops.distributions.bijector_test_util import assert_bijective_and_finite
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
index 173d52686d..62e3869db0 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softmax_centered_test.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
 from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import SoftmaxCentered
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops.distributions.bijector_test_util import assert_bijective_and_finite
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
index 214b196b54..d9af9aec50 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/bijectors/softplus_test.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_bijective_and_finite
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
 from tensorflow.contrib.distributions.python.ops.bijectors.softplus import Softplus
+from tensorflow.python.ops.distributions.bijector_test_util import assert_bijective_and_finite
+from tensorflow.python.ops.distributions.bijector_test_util import assert_scalar_congruency
 from tensorflow.python.platform import test
 
 rng = np.random.RandomState(42)
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
index e1d31e373c..1684a5fffe 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/__init__.py
@@ -43,7 +43,6 @@ from tensorflow.contrib.distributions.python.ops.bijectors.chain import *
 from tensorflow.contrib.distributions.python.ops.bijectors.cholesky_outer_product import *
 from tensorflow.contrib.distributions.python.ops.bijectors.conditional_bijector import *
 from tensorflow.contrib.distributions.python.ops.bijectors.exp import *
-from tensorflow.contrib.distributions.python.ops.bijectors.identity import *
 from tensorflow.contrib.distributions.python.ops.bijectors.inline import *
 from tensorflow.contrib.distributions.python.ops.bijectors.invert import *
 from tensorflow.contrib.distributions.python.ops.bijectors.power_transform import *
@@ -52,6 +51,7 @@ from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid_centered impo
 from tensorflow.contrib.distributions.python.ops.bijectors.softmax_centered import *
 from tensorflow.contrib.distributions.python.ops.bijectors.softplus import *
 from tensorflow.python.ops.distributions.bijector import *
+from tensorflow.python.ops.distributions.identity_bijector import Identity
 
 # pylint: enable=unused-import,wildcard-import,line-too-long,g-importing-member
 
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/identity.py b/tensorflow/contrib/distributions/python/ops/bijectors/identity.py
deleted file mode 100644
index 749dd268f9..0000000000
--- a/tensorflow/contrib/distributions/python/ops/bijectors/identity.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Identity bijector."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-# go/tf-wildcard-import
-# pylint: disable=wildcard-import
-from tensorflow.contrib.distributions.python.ops.bijectors.identity_impl import *
-# pylint: enable=wildcard-import
-from tensorflow.python.util.all_util import remove_undocumented
-
-_allowed_symbols = ["Identity"]
-
-remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/python/ops/distributions/conditional_distribution.py b/tensorflow/contrib/distributions/python/ops/conditional_distribution.py
similarity index 100%
rename from tensorflow/python/ops/distributions/conditional_distribution.py
rename to tensorflow/contrib/distributions/python/ops/conditional_distribution.py
diff --git a/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py b/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py
index b0967802bd..2e1e68cf05 100644
--- a/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py
+++ b/tensorflow/contrib/distributions/python/ops/conditional_transformed_distribution.py
@@ -17,9 +17,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops import transformed_distribution
+from tensorflow.contrib.distributions.python.ops import conditional_distribution
 from tensorflow.python.ops import math_ops
-from tensorflow.python.ops.distributions import conditional_distribution
+from tensorflow.python.ops.distributions import transformed_distribution
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
index a66eb1674c..fbd623ed3a 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 from tensorflow.contrib import linalg
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
@@ -29,6 +28,7 @@ from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.ops.distributions import normal
+from tensorflow.python.ops.distributions import transformed_distribution
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
index 581e190f73..5b57a95c55 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import logistic
-from tensorflow.contrib.distributions.python.ops import transformed_distribution
 # Bijectors must be directly imported because `remove_undocumented` prevents
 # individual file imports.
 from tensorflow.contrib.distributions.python.ops.bijectors.sigmoid import Sigmoid
@@ -27,6 +26,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
+from tensorflow.python.ops.distributions import transformed_distribution
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py b/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py
index 00415f5e1a..da1cd72a6f 100644
--- a/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py
+++ b/tensorflow/contrib/distributions/python/ops/relaxed_onehot_categorical.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import numpy as np
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
@@ -30,6 +29,7 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops.distributions import distribution
+from tensorflow.python.ops.distributions import transformed_distribution
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/vector_student_t.py b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
index 299ff36962..ae804b6172 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_student_t.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_student_t.py
@@ -19,13 +19,13 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib.distributions.python.ops import bijectors
-from tensorflow.contrib.distributions.python.ops import transformed_distribution
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops.distributions import student_t
+from tensorflow.python.ops.distributions import transformed_distribution
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
diff --git a/tensorflow/python/kernel_tests/distributions/BUILD b/tensorflow/python/kernel_tests/distributions/BUILD
index 3630adc954..50a0795200 100644
--- a/tensorflow/python/kernel_tests/distributions/BUILD
+++ b/tensorflow/python/kernel_tests/distributions/BUILD
@@ -249,6 +249,23 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "identity_bijector_test",
+    size = "small",
+    srcs = ["identity_bijector_test.py"],
+    additional_deps = [
+        "//tensorflow/python/ops/distributions",
+        "//third_party/py/numpy",
+        "@six_archive//:six",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py b/tensorflow/python/kernel_tests/distributions/identity_bijector_test.py
similarity index 84%
rename from tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
rename to tensorflow/python/kernel_tests/distributions/identity_bijector_test.py
index 0969c293d4..e8f9d0b728 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/bijectors/identity_test.py
+++ b/tensorflow/python/kernel_tests/distributions/identity_bijector_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.distributions.python.ops.bijectors.bijector_test_util import assert_scalar_congruency
-from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
+from tensorflow.python.ops.distributions import bijector_test_util
+from tensorflow.python.ops.distributions import identity_bijector
 from tensorflow.python.platform import test
 
 
@@ -28,7 +28,7 @@ class IdentityBijectorTest(test.TestCase):
 
   def testBijector(self):
     with self.test_session():
-      bijector = Identity()
+      bijector = identity_bijector.Identity()
       self.assertEqual("identity", bijector.name)
       x = [[[0.], [1.]]]
       self.assertAllEqual(x, bijector.forward(x).eval())
@@ -38,8 +38,8 @@ class IdentityBijectorTest(test.TestCase):
 
   def testScalarCongruency(self):
     with self.test_session():
-      bijector = Identity()
-      assert_scalar_congruency(
+      bijector = identity_bijector.Identity()
+      bijector_test_util.assert_scalar_congruency(
           bijector, lower_x=-2., upper_x=2.)
 
 
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py b/tensorflow/python/ops/distributions/bijector_test_util.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/bijectors/bijector_test_util.py
rename to tensorflow/python/ops/distributions/bijector_test_util.py
diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/identity_impl.py b/tensorflow/python/ops/distributions/identity_bijector.py
similarity index 100%
rename from tensorflow/contrib/distributions/python/ops/bijectors/identity_impl.py
rename to tensorflow/python/ops/distributions/identity_bijector.py
diff --git a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py b/tensorflow/python/ops/distributions/transformed_distribution.py
similarity index 99%
rename from tensorflow/contrib/distributions/python/ops/transformed_distribution.py
rename to tensorflow/python/ops/distributions/transformed_distribution.py
index e146e20d3a..09b26a9fb7 100644
--- a/tensorflow/contrib/distributions/python/ops/transformed_distribution.py
+++ b/tensorflow/python/ops/distributions/transformed_distribution.py
@@ -21,7 +21,6 @@ import numpy as np
 
 # Bijectors must be directly imported because `remove_undocumented` prevents
 # individual file imports.
-from tensorflow.contrib.distributions.python.ops.bijectors.identity import Identity
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -32,6 +31,7 @@ from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops.distributions import distribution as distribution_lib
+from tensorflow.python.ops.distributions import identity_bijector
 from tensorflow.python.ops.distributions import util as distribution_util
 
 __all__ = [
@@ -265,7 +265,7 @@ class TransformedDistribution(distribution_lib.Distribution):
       self._empty = constant_op.constant([], dtype=dtypes.int32, name="empty")
 
       if bijector is None:
-        bijector = Identity(validate_args=validate_args)
+        bijector = identity_bijector.Identity(validate_args=validate_args)
 
       # We will keep track of a static and dynamic version of
       # self._is_{batch,event}_override. This way we can do more prior to graph
-- 
GitLab


From e98357a9fd8a2e0962b2da06d769e3e58aedffd4 Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Thu, 4 May 2017 14:32:19 -0800
Subject: [PATCH 1018/1563] Internal change. Change: 155135670

---
 tensorflow/tools/pip_package/pip_smoke_test.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index fa61a19b39..4bb5c1b73c 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -28,11 +28,13 @@ import subprocess
 PIP_PACKAGE_QUERY = """bazel query \
   'deps(//tensorflow/tools/pip_package:build_pip_package)'"""
 
-PY_TEST_QUERY = """bazel query 'filter("^((?!(benchmark|manual|no_pip)).)*$", \
-  deps(kind(py_test,\
-  //tensorflow/python/... + \
-  //tensorflow/tensorboard/... + \
-  //tensorflow/contrib/...), 1))'"""
+PY_TEST_QUERY = """bazel query 'deps(\
+  filter("^((?!benchmark).)*$",\
+  kind(py_test,\
+  //tensorflow/python/... \
+  + //tensorflow/tensorboard/... \
+  + //tensorflow/contrib/... \
+  - attr(tags, "manual|no_pip", //tensorflow/...))), 1)'"""
 
 # Hard-coded blacklist of files if not included in pip package
 # TODO(amitpatankar): Clean up blacklist.
-- 
GitLab


From f696b5d4398f8295fcb2be3c89a94e007ca62287 Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Thu, 4 May 2017 14:38:05 -0800
Subject: [PATCH 1019/1563] Added traceback_with_start_lines property to op
 that includes function start line number as the last element in each
 traceback tuple. Change: 155136334

---
 tensorflow/python/framework/ops.py            | 35 ++++++++++++++-----
 tensorflow/python/framework/ops_test.py       | 22 ++++++++++++
 .../api/golden/tensorflow.-operation.pbtxt    |  4 +++
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 93a29d0d8e..05972022d0 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -70,25 +70,33 @@ def _override_helper(clazz_object, operator, func):
   setattr(clazz_object, operator, func)
 
 
-def _convert_stack(stack):
+def _convert_stack(stack, include_func_start_lineno=False):
   """Converts a stack extracted using _extract_stack() to a traceback stack.
 
   Args:
-    stack: A list of n 4-tuples, (filename, lineno, name, frame_globals).
+    stack: A list of n 5-tuples,
+      (filename, lineno, name, frame_globals, func_start_lineno).
+    include_func_start_lineno: True if function start line number should be
+      included as the 5th entry in return tuples.
 
   Returns:
-    A list of n 4-tuples (filename, lineno, name, code), where the code tuple
-    element is calculated from the corresponding elements of the input tuple.
+    A list of n 4-tuples or 5-tuples
+    (filename, lineno, name, code, [optional: func_start_lineno]), where the
+    code tuple element is calculated from the corresponding elements of the
+    input tuple.
   """
   ret = []
-  for filename, lineno, name, frame_globals in stack:
+  for filename, lineno, name, frame_globals, func_start_lineno in stack:
     linecache.checkcache(filename)
     line = linecache.getline(filename, lineno, frame_globals)
     if line:
       line = line.strip()
     else:
       line = None
-    ret.append((filename, lineno, name, line))
+    if include_func_start_lineno:
+      ret.append((filename, lineno, name, line, func_start_lineno))
+    else:
+      ret.append((filename, lineno, name, line))
   return ret
 
 
@@ -103,7 +111,8 @@ def _extract_stack():
     be formatted etc. using traceback methods.
 
   Returns:
-    A list of 4-tuples (filename, lineno, name, frame_globals) corresponding to
+    A list of 5-tuples
+    (filename, lineno, name, frame_globals, func_start_lineno) corresponding to
     the call stack of the current thread.
   """
   # pylint: enable=line-too-long
@@ -118,7 +127,8 @@ def _extract_stack():
     filename = co.co_filename
     name = co.co_name
     frame_globals = f.f_globals
-    ret.append((filename, lineno, name, frame_globals))
+    func_start_lineno = co.co_firstlineno
+    ret.append((filename, lineno, name, frame_globals, func_start_lineno))
     f = f.f_back
   ret.reverse()
   return ret
@@ -1505,6 +1515,15 @@ class Operation(object):
     """Returns the call stack from when this operation was constructed."""
     return _convert_stack(self._traceback)
 
+  @property
+  def traceback_with_start_lines(self):
+    """Same as traceback but includes start line of function definition.
+
+    Returns:
+      A list of 5-tuples (filename, lineno, name, code, func_start_lineno).
+    """
+    return _convert_stack(self._traceback, include_func_start_lineno=True)
+
   def get_attr(self, name):
     """Returns the value of the attr of this op with the given `name`.
 
diff --git a/tensorflow/python/framework/ops_test.py b/tensorflow/python/framework/ops_test.py
index 06d03121a0..3e9f047a7d 100644
--- a/tensorflow/python/framework/ops_test.py
+++ b/tensorflow/python/framework/ops_test.py
@@ -22,6 +22,7 @@ import gc
 import weakref
 
 from tensorflow.core.framework import attr_value_pb2
+from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import constant_op
@@ -1703,5 +1704,26 @@ class NameScopeTest(test_util.TensorFlowTestCase):
       self.assertEqual("", g.get_name_scope())
 
 
+class TracebackTest(test_util.TensorFlowTestCase):
+
+  def testTracebackWithStartLines(self):
+    with self.test_session() as sess:
+      a = constant_op.constant(2.0)
+      sess.run(
+          a,
+          options=config_pb2.RunOptions(
+              trace_level=config_pb2.RunOptions.FULL_TRACE))
+      self.assertTrue(sess.graph.get_operations())
+
+      # Tests that traceback_with_start_lines is the same as traceback
+      # but includes one more element at the end.
+      for op in sess.graph.get_operations():
+        self.assertEquals(len(op.traceback), len(op.traceback_with_start_lines))
+        for frame, frame_with_start_line in zip(
+            op.traceback, op.traceback_with_start_lines):
+          self.assertEquals(5, len(frame_with_start_line))
+          self.assertEquals(frame, frame_with_start_line[:-1])
+
+
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
index 0f43a49ee9..64240f7069 100644
--- a/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-operation.pbtxt
@@ -38,6 +38,10 @@ tf_class {
     name: "traceback"
     mtype: "<type \'property\'>"
   }
+  member {
+    name: "traceback_with_start_lines"
+    mtype: "<type \'property\'>"
+  }
   member {
     name: "type"
     mtype: "<type \'property\'>"
-- 
GitLab


From 6604bc6fdc456c4028b3de41c1eda0ae89007630 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 4 May 2017 14:39:37 -0800
Subject: [PATCH 1020/1563] Clean up TensorBoard build and fix sync process
 Change: 155136555

---
 tensorflow/BUILD                              | 42 +++++++++++++++++++
 .../vz_data_summary/BUILD.OPENSOURCE          | 34 ---------------
 .../components/vz_projector/BUILD.OPENSOURCE  | 19 ---------
 tensorflow/tensorboard/defs.bzl               | 16 +++++++
 4 files changed, 58 insertions(+), 53 deletions(-)
 delete mode 100644 tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index a2f7a9fb63..da8190523a 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -318,6 +318,48 @@ filegroup(
         "//tensorflow/tensorboard/backend:all_files",
         "//tensorflow/tensorboard/backend/event_processing:all_files",
         "//tensorflow/tensorboard/components:all_files",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_backend:all_files",
+        "//tensorflow/tensorboard/components/tf_backend_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_color_scale:all_files",
+        "//tensorflow/tensorboard/components/tf_color_scale/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:all_files",
+        "//tensorflow/tensorboard/components/tf_dashboard_common/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_globals:all_files",
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_common:all_files",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_image_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_image_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_imports:all_files",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_storage:all_files",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_text_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_text_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_data_summary:all_files",
+        "//tensorflow/tensorboard/components/vz_distribution_chart:all_files",
+        "//tensorflow/tensorboard/components/vz_distribution_chart/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_distribution_chart_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries:all_files",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_line_chart:all_files",
+        "//tensorflow/tensorboard/components/vz_line_chart/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_projector:all_files",
+        "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_sorting:all_files",
+        "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
diff --git a/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE b/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
deleted file mode 100644
index 9743d70d94..0000000000
--- a/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the 'License');
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an 'AS IS' BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# =============================================================================
-
-# Description:
-# Package for the data-summary vz-element.
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE b/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
deleted file mode 100644
index 8c222be10e..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description:
-# Package for the Embedding Projector component.
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/defs.bzl b/tensorflow/tensorboard/defs.bzl
index 7bb5f961c9..22bb047075 100644
--- a/tensorflow/tensorboard/defs.bzl
+++ b/tensorflow/tensorboard/defs.bzl
@@ -60,6 +60,22 @@ def tensorboard_typescript_genrule(name, srcs, typings=[], **kwargs):
       **kwargs
   )
 
+def tensorboard_karma_web_test_suite(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
+def tensorboard_ts_declaration(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
+def tensorboard_ts_development_sources(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
+def tensorboard_ts_devserver(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
 def tensorboard_ts_library(**kwargs):
   """Rules referencing this will be deleted from the codebase soon."""
   pass
-- 
GitLab


From 4c992d9d6d45cc2e23f20ee728880fc236901dd4 Mon Sep 17 00:00:00 2001
From: Yutaka Leon <yleon@google.com>
Date: Thu, 4 May 2017 15:08:49 -0800
Subject: [PATCH 1021/1563] Fix mac build. Change: 155140054

---
 tensorflow/contrib/cmake/tf_core_ops.cmake | 1 +
 tensorflow/contrib/cmake/tf_python.cmake   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index 2a19433a7b..eae00ab875 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -22,6 +22,7 @@ set(tf_op_lib_names
     "image_ops"
     "io_ops"
     "linalg_ops"
+    "lookup_ops"
     "logging_ops"
     "math_ops"
     "nn_ops"
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index ad3b29c8ea..9e2eb71b4c 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -597,6 +597,7 @@ GENERATE_PYTHON_OP_LIB("image_ops")
 GENERATE_PYTHON_OP_LIB("io_ops")
 GENERATE_PYTHON_OP_LIB("linalg_ops")
 GENERATE_PYTHON_OP_LIB("logging_ops")
+GENERATE_PYTHON_OP_LIB("lookup_ops")
 GENERATE_PYTHON_OP_LIB("nn_ops")
 GENERATE_PYTHON_OP_LIB("parsing_ops")
 GENERATE_PYTHON_OP_LIB("random_ops")
-- 
GitLab


From 243ac0132001a5b8fa9c1d4435842d0b588b82be Mon Sep 17 00:00:00 2001
From: Vivek Rane <vivek.v.rane@intel.com>
Date: Thu, 4 May 2017 16:32:16 -0700
Subject: [PATCH 1022/1563] Added identity op and a fix for LRN (#9641)

* relu grad and maxpooling grad fixes for perf

* Graph layout pass and conversion pass changes

This commit makes following changes:

- Enables support for ReluGrad and BiasAddGrad
- Adds support for detecting depthwise/batchwise pooling
- Adds more unit tests for Graph rewrite pass
- Improvements to handling control-flow edges
- Bug fixes

* Defaulting to Eigen when LRN depth_radius!=2

* Fixed mkl_conv_grad_filter.cc for conv_ops_tests.py

* Style fix to mkl_matmul and remove unnecessary 'MKL' label on matmul kernel

* Style fixes based on clang-format to mkl_conv_* and mkl_matmul

* Bug fixes

* Adding OP_REQUIRES_OK check in Concat

* Making some style changes

* Enabled the configuration of MKL settings

* relu grad and maxpooling grad fixes for perf

* Graph layout pass and conversion pass changes

This commit makes following changes:

- Enables support for ReluGrad and BiasAddGrad
- Adds support for detecting depthwise/batchwise pooling
- Adds more unit tests for Graph rewrite pass
- Improvements to handling control-flow edges
- Bug fixes

* Defaulting to Eigen when LRN depth_radius!=2

* Fixed mkl_conv_grad_filter.cc for conv_ops_tests.py

* Style fix to mkl_matmul and remove unnecessary 'MKL' label on matmul kernel

* Style fixes based on clang-format to mkl_conv_* and mkl_matmul

* Bug fixes

* Adding OP_REQUIRES_OK check in Concat

* Making some style changes

* Enabled the configuration of MKL settings

* Fixing graph unit tests with Mkl op name change to _Mkl; Fixed missing _ in MklToTf op

* Fixed missing libdl.so.2 in BUILD file

* Fixes for unit test build failures.

* Changes in mkl_conv_grad_filter_ops.cc for Google code style

* Fixes to remove dead code

* removed the dead code and added a TODO for mkl implementation to handle this case in the future

* Enabling MklIdentityOp

* Calling MKL for all values of depth radius in LRN

* Fixed buildifier sanity check error

* Adding support for google's CI automation

* Updated link to new MKL version

* Enabling MklIdentityOp

* Calling MKL for all values of depth radius in LRN

* Fix for missing locate binary

* Fix for missing locate command in CI

* Adding updatedb to populate the database after installing mlocate

* Fixed buildifier issue

* setting tf_need_mkl=0 in libtf files

* Added third_party/mkl/* to .gitignore

* Added third_party/eigen3/mkl_include to .gitignore

* In configured, set MKL-enabling options only for Linux.

* Enabling MklIdentityOp

* Calling MKL for all values of depth radius in LRN

* Making style fix in LRN

* Fixed Indentation
---
 tensorflow/core/BUILD                      |  2 +
 tensorflow/core/graph/mkl_layout_pass.cc   | 16 ++++++
 tensorflow/core/kernels/BUILD              |  8 +++
 tensorflow/core/kernels/mkl_identity_op.cc | 63 ++++++++++++++++++++++
 tensorflow/core/kernels/mkl_lrn_op.cc      | 30 +++++------
 tensorflow/core/kernels/mkl_reshape_op.cc  |  2 +-
 tensorflow/core/ops/array_ops.cc           | 17 ++++++
 tensorflow/core/util/mkl_util.h            | 44 +++++++++++++--
 8 files changed, 160 insertions(+), 22 deletions(-)
 create mode 100644 tensorflow/core/kernels/mkl_identity_op.cc

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 2d27b5d9d4..4cfdf844ce 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -736,6 +736,7 @@ cc_library(
         "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
         "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_identity_op",
         "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
@@ -2123,6 +2124,7 @@ tf_cc_test_mkl(
         "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
         "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_identity_op",
         "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 87388ebe7b..94741a11ff 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -273,6 +273,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     csinfo_.conv2d_grad_filter = "Conv2DBackpropFilter";
     csinfo_.fused_batch_norm = "FusedBatchNorm";
     csinfo_.fused_batch_norm_grad = "FusedBatchNormGrad";
+    csinfo_.identity = "Identity";
     csinfo_.lrn = "LRN";
     csinfo_.lrn_grad = "LRNGrad";
     csinfo_.matmul = "MatMul";
@@ -326,6 +327,9 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     rinfo_.push_back({csinfo_.fused_batch_norm_grad,
                       GetMklOpName(csinfo_.fused_batch_norm_grad),
                       CopyAttrsFusedBatchNorm, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.identity,
+                      GetMklOpName(csinfo_.identity),
+                      CopyAttrsIdentity, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.lrn,
                       GetMklOpName(csinfo_.lrn),
                       CopyAttrsLRN, AlwaysRewrite, nullptr});
@@ -446,6 +450,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string conv2d_grad_filter;
     string fused_batch_norm;
     string fused_batch_norm_grad;
+    string identity;
     string lrn;
     string lrn_grad;
     string matmul;
@@ -767,6 +772,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   static void CopyAttrsConcatV2(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsConv2D(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsFusedBatchNorm(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsIdentity(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsLRN(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsPooling(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb);
@@ -1275,6 +1281,16 @@ void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orig_node,
   nb->Attr("data_format", data_format);
 }
 
+void MklLayoutRewritePass::CopyAttrsIdentity(const Node* orig_node,
+                                             NodeBuilder* nb) {
+  DataType T;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  // Add attributes to new node.
+  nb->Attr("T", T);
+}
+
 void MklLayoutRewritePass::CopyAttrsLRN(const Node* orig_node,
                                         NodeBuilder* nb) {
   DataType T;
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 0847d1279b..abce506aba 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4918,6 +4918,14 @@ tf_mkl_kernel_library(
     ],
 )
 
+tf_mkl_kernel_library(
+    name = "mkl_identity_op",
+    prefix = "mkl_identity_op",
+    deps = ARRAY_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
 tf_mkl_kernel_library(
     name = "mkl_lrn_op",
     prefix = "mkl_lrn_op",
diff --git a/tensorflow/core/kernels/mkl_identity_op.cc b/tensorflow/core/kernels/mkl_identity_op.cc
new file mode 100644
index 0000000000..e138cc2e95
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_identity_op.cc
@@ -0,0 +1,63 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/array_ops.cc.
+#ifdef INTEL_MKL
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/logging.h"
+
+#include "tensorflow/core/util/mkl_util.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+
+namespace tensorflow {
+typedef Eigen::ThreadPoolDevice CPUDevice;
+template <typename Device, typename T>
+class MklIdentityOp : public OpKernel {
+ public:
+  explicit MklIdentityOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    MklShape mkl_shape_input;
+    GetMklShape(context, 0, &mkl_shape_input);
+    bool input_in_mkl_format = mkl_shape_input.IsMklTensor();
+
+    if (input_in_mkl_format) {
+      ForwarMklTensorInToOut(context, 0, 0);
+    } else {
+      FowardTfTensorInToOut(context, 0, 0);
+    }
+  }
+
+  bool IsExpensive() override { return false; }
+};
+
+#define REGISTER_MKL_CPU(T)                                                   \
+  REGISTER_KERNEL_BUILDER(Name("_MklIdentity")                                \
+                            .Device(DEVICE_CPU)                               \
+                            .TypeConstraint<T>("T")                           \
+                            .Label(mkl_op_registry::kMklOpLabel),             \
+                        MklIdentityOp<CPUDevice, T>);                         \
+
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+}  // namespace tensorflow
+#endif // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
index 9d050d430a..ac432e13ce 100644
--- a/tensorflow/core/kernels/mkl_lrn_op.cc
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -171,9 +171,7 @@ class MklLRNOp : public OpKernel {
     MklShape input_shape;
     dnnPrimitive_t lrn_fwd = nullptr;
     dnnPrimitive_t convert_input = nullptr;
-    /* dnnPrimitive_t convert_output; */
     dnnLayout_t lt_input = nullptr;
-    /* dnnLayout_t lt_output; */
     dnnLayout_t lt_internal_input = nullptr;
     dnnLayout_t lt_internal_workspace = nullptr;
     dnnLayout_t lt_internal_output = nullptr;
@@ -390,11 +388,6 @@ class MklLRNGradOp : public OpKernel {
       return;
     }
 
-    if (depth_radius_ != 2) {
-      mkl_context.MklDefaultToEigen(context);
-      return;
-    }
-
     if (ingrad_in_mkl_format || inimage_in_mkl_format) {
       const MklShape* tmp_mkl_shape = (ingrad_in_mkl_format)
                                           ? &mkl_context.ingrad_shape
@@ -476,11 +469,11 @@ class MklLRNGradOp : public OpKernel {
         const_cast<void*>(static_cast<const void*>(output->flat<T>().data()));
 
     Tensor mkl_tmp_input_buf_tensor, mkl_tmp_image_buf_tensor,
-        mkl_tmp_outimage_buf_tensor, mkl_tmp_workspace_buf_tensor;
+        mkl_tmp_outimage_buf_tensor;
     // Convert Inputs if needed
-    mkl_context.MklPrepareLRNGradInput(
-        context, &mkl_tmp_input_buf_tensor, &mkl_tmp_image_buf_tensor,
-        &mkl_tmp_outimage_buf_tensor, &mkl_tmp_workspace_buf_tensor);
+    mkl_context.MklPrepareLRNGradInput(context, &mkl_tmp_input_buf_tensor,
+                                       &mkl_tmp_image_buf_tensor,
+                                       &mkl_tmp_outimage_buf_tensor);
 
     // We do not do any conversion for output. But we simply emit it
     // in MKL format.
@@ -537,11 +530,13 @@ class MklLRNGradOp : public OpKernel {
     void MklPrepareLRNGradInput(OpKernelContext* context,
                                 Tensor* mkl_tmp_input_buf_tensor,
                                 Tensor* mkl_tmp_image_buf_tensor,
-                                Tensor* mkl_tmp_outimage_buf_tensor,
-                                Tensor* mkl_tmp_workspace_buf_tensor) {
+                                Tensor* mkl_tmp_outimage_buf_tensor) {
       const Tensor& in_grads = MklGetInput(context, 0);
       const Tensor& in_image = MklGetInput(context, 1);
       const Tensor& out_image = MklGetInput(context, 2);
+      const Tensor& workspace = MklGetInput(
+          context,
+          3); /*Worskpsace is enabled, get the buffer to the workspace */
 
       void* user_input = const_cast<void*>(
           static_cast<const void*>(in_grads.flat<T>().data()));
@@ -549,6 +544,9 @@ class MklLRNGradOp : public OpKernel {
           static_cast<const void*>(in_image.flat<T>().data()));
       void* user_fwd_output = const_cast<void*>(
           static_cast<const void*>(out_image.flat<T>().data()));
+      void* workspace_buffer = const_cast<void*>(
+          static_cast<const void*>(workspace.flat<T>().data()));
+
       CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_workspace, lrn_bwd,
                                                 dnnResourceWorkspace),
                E_SUCCESS);
@@ -623,9 +621,7 @@ class MklLRNGradOp : public OpKernel {
         res_lrn_bwd[dnnResourceDst] = user_fwd_output;
       }
 
-      // Allocate buffer for workspace.
-      AllocTmpBuffer(context, mkl_tmp_workspace_buf_tensor, lt_workspace,
-                     &res_lrn_bwd[dnnResourceWorkspace]);
+      res_lrn_bwd[dnnResourceWorkspace] = workspace_buffer;
     }
 
     // Fallback implementation - Taken from lrn_op.cc
@@ -713,7 +709,7 @@ class MklLRNGradOp : public OpKernel {
       Shard(worker_threads.num_threads, worker_threads.workers, nodes * batch,
             depth * depth, shard);
     }
-
+		
     // release mkl resources
     void Mklcleanup() {
       bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
diff --git a/tensorflow/core/kernels/mkl_reshape_op.cc b/tensorflow/core/kernels/mkl_reshape_op.cc
index 753a8b52b4..593aa3a2fd 100644
--- a/tensorflow/core/kernels/mkl_reshape_op.cc
+++ b/tensorflow/core/kernels/mkl_reshape_op.cc
@@ -129,7 +129,7 @@ class MklReshapeOp : public OpKernel {
         return;
       }
     } else {
-      CopyTFTensorInToOut(context, 0, 0, shape);
+      CopyTfTensorInToOutWithShape(context, 0, 0, shape);
     }
   }
 };
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e528ae47aa..7b44ff1918 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1506,6 +1506,23 @@ REGISTER_OP("Identity")
 Return a tensor with the same shape and contents as the input tensor or value.
 )Doc");
 
+#ifdef INTEL_MKL
+REGISTER_OP("_MklIdentity")
+    .Input("input: T")
+    .Input("mkl_input: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("T: type")
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      c->set_output(0, c->input(0));
+      c->set_output_handle_dtype(0, c->input_handle_dtype(0));
+      c->set_output_handle_shape(0, c->input_handle_shape(0));
+      return Status::OK();
+    })
+    .Doc(R"Doc( Mkl implementation of IdentityOp
+)Doc");
+#endif
+
 // --------------------------------------------------------------------------
 REGISTER_OP("RefIdentity")
     .Input("input: Ref(T)")
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index 897b174eff..6a37256ea9 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -542,8 +542,8 @@ inline int64 GetMklTensorDim(const MklShape& mkl_shape, char dimension) {
   return mkl_shape.dim_size(index);
 }
 
-inline void CopyMklTensorInToOut(OpKernelContext* context, int idx_in,
-                                 int idx_out) {
+inline void CopyMklTensorInToOut(OpKernelContext* context,
+                                 int idx_in, int idx_out) {
   int num_inputs = context->num_inputs();
   int num_outputs = context->num_outputs();
   int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
@@ -563,8 +563,9 @@ inline void CopyMklTensorInToOut(OpKernelContext* context, int idx_in,
   context->set_output(idx_meta_out, meta_output);
 }
 
-inline void CopyTFTensorInToOut(OpKernelContext* context, int idx_in,
-                                int idx_out, const TensorShape& shape) {
+inline void CopyTfTensorInToOutWithShape(OpKernelContext* context,
+                                         int idx_in, int idx_out,
+                                         const TensorShape& shape) {
   int num_inputs = context->num_inputs();
   int num_outputs = context->num_outputs();
   int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
@@ -580,6 +581,41 @@ inline void CopyTFTensorInToOut(OpKernelContext* context, int idx_in,
   context->set_output(idx_data_out, output);
 }
 
+inline void FowardTfTensorInToOut(OpKernelContext* context,
+                                  int idx_in, int idx_out) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+
+  MklShape mkl_shape_output;
+  mkl_shape_output.SetMklTensor(false);
+  AllocateOutputSetMklShape(context, idx_out, mkl_shape_output);
+  if (IsRefType(context->input_dtype(idx_data_in))) {
+    context->forward_ref_input_to_ref_output(idx_data_in, idx_data_out);
+  } else {
+    context->set_output(idx_data_out, context->input(idx_data_in));
+  }
+}
+
+inline void ForwarMklTensorInToOut(OpKernelContext* context,
+                                   int idx_in, int idx_out) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_meta_in = GetTensorMetaDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+  int idx_meta_out = GetTensorMetaDataIndex(idx_out, num_outputs);
+
+  if (IsRefType(context->input_dtype(idx_data_in))) {
+    context->forward_ref_input_to_ref_output(idx_data_in, idx_data_out);
+    context->forward_ref_input_to_ref_output(idx_meta_in, idx_meta_out);
+  } else {
+    context->set_output(idx_data_out, context->input(idx_data_in));
+    context->set_output(idx_meta_out, context->input(idx_meta_in));
+  }
+}
+
 namespace mkl_op_registry {
 static const char* kMklOpLabel = "MklOp";
 static const char* kMklOpLabelPattern = "label='MklOp'";
-- 
GitLab


From 7ff483746404a3ca7ed66ae4271b21bcb07082ee Mon Sep 17 00:00:00 2001
From: Yutaka Leon <yleon@google.com>
Date: Thu, 4 May 2017 15:09:27 -0800
Subject: [PATCH 1023/1563] Fix documentation in supervisor. Change: 155140112

---
 tensorflow/docs_src/programmers_guide/supervisor.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/docs_src/programmers_guide/supervisor.md b/tensorflow/docs_src/programmers_guide/supervisor.md
index 82ed1c2cf7..55a090df58 100644
--- a/tensorflow/docs_src/programmers_guide/supervisor.md
+++ b/tensorflow/docs_src/programmers_guide/supervisor.md
@@ -362,8 +362,8 @@ following keyword arguments to the `Supervisor()` constructor:
    If not specified, the supervisor uses the first op in the
    `tf.GraphKeys.LOCAL_INIT_OP` collection.  If the collection is empty the
    supervisor adds an op to initialize all the tables and local variables in
-   the graph by calling `tf.initialize_all_tables()` and
-   `tf.initialize_all_local_variables()`.
+   the graph by calling `tf.tables_initializer()` and
+   `tf.local_variables_initializer()`.
 
    Pass `None` to not use a local init op.
 
-- 
GitLab


From ffc5e6fbf68b5229b68cfe96bbcaf58619277c06 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Thu, 4 May 2017 15:35:27 -0800
Subject: [PATCH 1024/1563] [TF] optimization: SparseTensorDenseMatMul GPU
 kernel rewritten in pure cuda.

Also added an additional GPU int32::max check that was missing.

Performance seems to be between 1x-10x faster on average.  The likely culprit on CPU slowdown was probably the unnecessary temp allocation for scratch space.

Performance on a k40, compiled -c opt --config cuda --copt=-mavx:

**BEFORE**

Matrix sizes:
  A sparse [m, k] with % nonzero values between 1% and 80%
  B dense [k, n]

% nnz    n       gpu     m       k       dt(dense)       dt(sparse)      dt(sparse)/dt(dense)
0.01     50      True    100     100     0.000319954     0.000275495     0.861045
0.01     50      True    100     1000    0.000469565     0.000290895     0.619497
0.01     50      True    1000    100     0.000572815     0.000271131     0.473331
0.01     50      True    1000    1000    0.00133119      0.00042006      0.315554
0.01     50      False   100     100     0.00034191      0.000289171     0.845751
0.01     50      False   100     1000    0.0004796       0.00028483      0.593891
0.01     50      False   1000    100     0.000632371     0.000300461     0.475134
0.01     50      False   1000    1000    0.00134726      0.000576285     0.427746
0.01     100     True    100     100     0.000353755     0.00027729      0.783849
0.01     100     True    100     1000    0.000536649     0.00028337      0.528036
0.01     100     True    1000    100     0.000661941     0.00027933      0.421987
0.01     100     True    1000    1000    0.0014109       0.0006698       0.474732
0.01     100     False   100     100     0.00039546      0.00030159      0.762631
0.01     100     False   100     1000    0.00054909      0.00027276      0.49675
0.01     100     False   1000    100     0.000631344     0.00028231      0.447157
0.01     100     False   1000    1000    0.00141789      0.000657049     0.463398
0.2      50      True    100     100     0.00033689      0.000280155     0.831591
0.2      50      True    100     1000    0.000563495     0.00064159      1.13859
0.2      50      True    1000    100     0.00058635      0.00067611      1.15308
0.2      50      True    1000    1000    0.00153552      0.00486242      3.16662
0.2      50      False   100     100     0.000333545     0.000267555     0.802154
0.2      50      False   100     1000    0.000544        0.00066272      1.21824
0.2      50      False   1000    100     0.00058253      0.000670955     1.15179
0.2      50      False   1000    1000    0.00153017      0.00480928      3.14298
0.2      100     True    100     100     0.00036919      0.000288659     0.781872
0.2      100     True    100     1000    0.00067063      0.00110059      1.64113
0.2      100     True    1000    100     0.00066443      0.00108547      1.63369
0.2      100     True    1000    1000    0.00180991      0.00961579      5.31286
0.2      100     False   100     100     0.00040061      0.000325365     0.812174
0.2      100     False   100     1000    0.00066774      0.00111843      1.67494
0.2      100     False   1000    100     0.000696205     0.00108078      1.55239
0.2      100     False   1000    1000    0.00179788      0.00960569      5.34278
0.5      50      True    100     100     0.00034819      0.00033425      0.959963
0.5      50      True    100     1000    0.00075176      0.00134084      1.78359
0.5      50      True    1000    100     0.000642445     0.00133641      2.08019
0.5      50      True    1000    1000    0.00233791      0.0124282       5.31597
0.5      50      False   100     100     0.000345069     0.000334586     0.96962
0.5      50      False   100     1000    0.00071701      0.00135879      1.89508
0.5      50      False   1000    100     0.000632119     0.00134036      2.12043
0.5      50      False   1000    1000    0.00240216      0.0126202       5.25368
0.5      100     True    100     100     0.000393934     0.00040344      1.02413
0.5      100     True    100     1000    0.000957675     0.002709        2.82873
0.5      100     True    1000    100     0.000756125     0.00242428      3.20619
0.5      100     True    1000    1000    0.00298202      0.0241416       8.09572
0.5      100     False   100     100     0.000395606     0.000433675     1.09623
0.5      100     False   100     1000    0.000963565     0.00248293      2.57682
0.5      100     False   1000    100     0.00079523      0.0024281       3.05333
0.5      100     False   1000    1000    0.00299668      0.0242615       8.09614
0.8      50      True    100     100     0.00036806      0.00040923      1.11186
0.8      50      True    100     1000    0.00091419      0.00207383      2.26848
0.8      50      True    1000    100     0.000684329     0.00196612      2.87307
0.8      50      True    1000    1000    0.00302433      0.0199798       6.60637
0.8      50      False   100     100     0.000368149     0.000615025     1.67058
0.8      50      False   100     1000    0.0008786       0.00205821      2.3426
0.8      50      False   1000    100     0.00067889      0.00195498      2.87967
0.8      50      False   1000    1000    0.00290009      0.0191242       6.59434
0.8      100     True    100     100     0.000452549     0.00063767      1.40906
0.8      100     True    100     1000    0.00126929      0.00391422      3.08378
0.8      100     True    1000    100     0.000919235     0.00386167      4.20096
0.8      100     True    1000    1000    0.00423295      0.0431824       10.2015
0.8      100     False   100     100     0.000428261     0.000626891     1.46381
0.8      100     False   100     1000    0.00120801      0.00395877      3.27711
0.8      100     False   1000    100     0.00080466      0.00385143      4.78641
0.8      100     False   1000    1000    0.00370808      0.0403527       10.8824

**AFTER**

Matrix sizes:
  A sparse [m, k] with % nonzero values between 1% and 80%
  B dense [k, n]

% nnz    n       gpu     m       k       dt(dense)       dt(sparse)      dt(sparse)/dt(dense)
0.01     50      True    100     100     0.000312485     0.00020528      0.656927
0.01     50      True    100     1000    0.0004655       0.00020095      0.431686
0.01     50      True    1000    100     0.000567449     0.000203935     0.359389
0.01     50      True    1000    1000    0.00132323      0.00027171      0.205339
0.01     50      False   100     100     0.000319945     0.000197511     0.617328
0.01     50      False   100     1000    0.000466419     0.000210185     0.450635
0.01     50      False   1000    100     0.0005581       0.000199865     0.358117
0.01     50      False   1000    1000    0.00129479      0.000451496     0.348702
0.01     100     True    100     100     0.000364131     0.000196835     0.540561
0.01     100     True    100     1000    0.00053398      0.000206494     0.386708
0.01     100     True    1000    100     0.00062722      0.000203185     0.323946
0.01     100     True    1000    1000    0.00138674      0.000335904     0.242227
0.01     100     False   100     100     0.000361339     0.000195        0.53966
0.01     100     False   100     1000    0.000531831     0.000207155     0.389513
0.01     100     False   1000    100     0.00062245      0.000197015     0.316515
0.01     100     False   1000    1000    0.0014007       0.000328825     0.234757
0.2      50      True    100     100     0.00033185      0.000262895     0.792209
0.2      50      True    100     1000    0.00054391      0.000586189     1.07773
0.2      50      True    1000    100     0.000581805     0.000531535     0.913597
0.2      50      True    1000    1000    0.00153913      0.00142783      0.927687
0.2      50      False   100     100     0.00033572      0.000266831     0.794803
0.2      50      False   100     1000    0.000534315     0.000585151     1.09514
0.2      50      False   1000    100     0.000580961     0.00033344      0.573947
0.2      50      False   1000    1000    0.0015055       0.00143968      0.956284
0.2      100     True    100     100     0.000371666     0.00026337      0.708621
0.2      100     True    100     1000    0.000667235     0.00056811      0.851439
0.2      100     True    1000    100     0.000671356     0.000400575     0.596666
0.2      100     True    1000    1000    0.00178568      0.00250393      1.40222
0.2      100     False   100     100     0.000370425     0.000254935     0.688223
0.2      100     False   100     1000    0.000661175     0.000601134     0.909191
0.2      100     False   1000    100     0.0006944       0.00039817      0.573401
0.2      100     False   1000    1000    0.00176969      0.0024947       1.40968
0.5      50      True    100     100     0.000346885     0.000263295     0.759028
0.5      50      True    100     1000    0.00073113      0.00107669      1.47263
0.5      50      True    1000    100     0.000672774     0.000493085     0.732914
0.5      50      True    1000    1000    0.00260436      0.003335        1.28054
0.5      50      False   100     100     0.00036242      0.000273196     0.753809
0.5      50      False   100     1000    0.000753295     0.00107086      1.42157
0.5      50      False   1000    100     0.00064886      0.000501654     0.773132
0.5      50      False   1000    1000    0.00241105      0.0033146       1.37475
0.5      100     True    100     100     0.000401269     0.00027831      0.693573
0.5      100     True    100     1000    0.00094245      0.00111468      1.18275
0.5      100     True    1000    100     0.00075719      0.00074962      0.990003
0.5      100     True    1000    1000    0.00297528      0.00601445      2.02147
0.5      100     False   100     100     0.000408576     0.00026246      0.642377
0.5      100     False   100     1000    0.00094272      0.00112762      1.19613
0.5      100     False   1000    100     0.000762925     0.00074343      0.974446
0.5      100     False   1000    1000    0.00314936      0.00604122      1.91824
0.8      50      True    100     100     0.00036589      0.000331376     0.905669
0.8      50      True    100     1000    0.00086403      0.00171248      1.98197
0.8      50      True    1000    100     0.00067048      0.000715261     1.06679
0.8      50      True    1000    1000    0.00284684      0.00527865      1.85422
0.8      50      False   100     100     0.000357161     0.000540144     1.51233
0.8      50      False   100     1000    0.000884765     0.00170428      1.92625
0.8      50      False   1000    100     0.000666975     0.000737065     1.10509
0.8      50      False   1000    1000    0.0028149       0.00530442      1.88441
0.8      100     True    100     100     0.00041237      0.00034323      0.832335
0.8      100     True    100     1000    0.00122102      0.00179725      1.47192
0.8      100     True    1000    100     0.000807976     0.00111246      1.37684
0.8      100     True    1000    1000    0.00379081      0.00968211      2.5541
0.8      100     False   100     100     0.000426315     0.000339085     0.795386
0.8      100     False   100     1000    0.00144096      0.00179819      1.2479
0.8      100     False   1000    100     0.000951196     0.0011155       1.17274
0.8      100     False   1000    1000    0.0039524       0.00980128      2.47983
Change: 155142876
---
 .../kernels/sparse_tensor_dense_matmul_op.cc  |  65 ++++----
 .../kernels/sparse_tensor_dense_matmul_op.h   |   9 +-
 .../sparse_tensor_dense_matmul_op_gpu.cu.cc   | 146 ++++++------------
 .../sparse_tensor_dense_matmul_op_test.py     |  87 ++++++++---
 4 files changed, 146 insertions(+), 161 deletions(-)

diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
index 30026f222a..30c57ef287 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
@@ -65,7 +65,8 @@ class SparseTensorDenseMatMulOp : public OpKernel {
     OP_REQUIRES(ctx, TensorShapeUtils::IsMatrix(a_indices->shape()),
                 errors::InvalidArgument("Tensor 'a_indices' is not a matrix"));
 
-    OP_REQUIRES(ctx, a_indices->shape().dim_size(0) == a_values->NumElements(),
+    const int64 nnz = a_indices->shape().dim_size(0);
+    OP_REQUIRES(ctx, nnz == a_values->NumElements(),
                 errors::InvalidArgument("Number of rows of a_indices does not "
                                         "match number of entries in a_values"));
 
@@ -89,8 +90,28 @@ class SparseTensorDenseMatMulOp : public OpKernel {
             inner_left, " vs. ", inner_right,
             ".  Did you forget a transpose?  "
             "Dimensions of A: [",
-            a_shape_t(0), ", ", a_shape_t(1), ").  Dimensions of B: ",
-            b->shape().DebugString()));
+            a_shape_t(0), ", ", a_shape_t(1),
+            ").  Dimensions of B: ", b->shape().DebugString()));
+
+    if (std::is_same<Device, GPUDevice>::value) {
+      // The GPU implementation is optimized to use 32 bit indexing, so
+      // give a friendly error to the programmer early on if they
+      // exceed.
+      const int int32max = std::numeric_limits<int>::max();
+      OP_REQUIRES(
+          ctx,
+          (FastBoundsCheck(inner_left, int32max) &&
+           FastBoundsCheck(inner_right, int32max) &&
+           FastBoundsCheck(outer_left, int32max) &&
+           FastBoundsCheck(outer_right, int32max) &&
+           FastBoundsCheck(b->NumElements(), int32max) &&
+           FastBoundsCheck(outer_left * outer_right, int32max) &&
+           FastBoundsCheck(a_values->NumElements(), int32max)),
+          errors::InvalidArgument("Cannot use GPU for > 2^31 entry inputs"));
+      OP_REQUIRES(ctx, FastBoundsCheck(nnz * outer_right, int32max),
+                  errors::InvalidArgument(
+                      "Cannot use GPU when output.shape[1] * nnz(a) > 2^31"));
+    }
 
     TensorShape out_shape({outer_left, outer_right});
     Tensor* out = nullptr;
@@ -111,41 +132,13 @@ class SparseTensorDenseMatMulOp : public OpKernel {
       return;
     }
 
-    Tensor scratch;
-
-    if (std::is_same<Device, GPUDevice>::value) {
-      // The GPU implementation is optimized to use 32 bit indexing, so
-      // give a friendly error to the programmer early on if they exceed.
-      OP_REQUIRES(
-          ctx,
-          FastBoundsCheck(inner_left, std::numeric_limits<int>::max()) &&
-              FastBoundsCheck(inner_right, std::numeric_limits<int>::max()) &&
-              FastBoundsCheck(outer_left, std::numeric_limits<int>::max()) &&
-              FastBoundsCheck(outer_right, std::numeric_limits<int>::max()) &&
-              FastBoundsCheck(b->NumElements(),
-                              std::numeric_limits<int>::max()) &&
-              FastBoundsCheck(out->NumElements(),
-                              std::numeric_limits<int>::max()) &&
-              FastBoundsCheck(a_values->NumElements(),
-                              std::numeric_limits<int>::max()),
-          errors::InvalidArgument("Cannot use GPU for > 2^31 entry inputs"));
-      const int nnz = static_cast<const int>(a_values->NumElements());
-      // Need nnz length vec scratch space on the GPU.
-      OP_REQUIRES_OK(ctx, ctx->allocate_temp(DataTypeToEnum<T>::value,
-                                             TensorShape({nnz}), &scratch));
-    } else {
-      // We don't need scratch space on the CPU.
-      OP_REQUIRES_OK(ctx, ctx->allocate_temp(DataTypeToEnum<T>::value,
-                                             TensorShape({0}), &scratch));
-    }
-
 #define MAYBE_ADJOINT(ADJ_A, ADJ_B)                                        \
   if (adjoint_a_ == ADJ_A && adjoint_b_ == ADJ_B) {                        \
     Status functor_status = functor::SparseTensorDenseMatMulFunctor<       \
         Device, T, Tindices, ADJ_A,                                        \
         ADJ_B>::Compute(ctx->eigen_device<Device>(), out->matrix<T>(),     \
                         a_indices->matrix<Tindices>(), a_values->vec<T>(), \
-                        b->matrix<T>(), scratch.vec<T>());                 \
+                        b->matrix<T>());                                   \
     OP_REQUIRES_OK(ctx, functor_status);                                   \
   }
 
@@ -189,10 +182,9 @@ namespace functor {
   Status SparseTensorDenseMatMulFunctor<                                  \
       GPUDevice, T, Tindices, ADJ_A,                                      \
       ADJ_B>::Compute(const GPUDevice& d, typename TTypes<T>::Matrix out, \
-                      typename TTypes<Tindices>::ConstMatrix a_indices,   \
+                      TTypes<Tindices>::ConstMatrix a_indices,            \
                       typename TTypes<T>::ConstVec a_values,              \
-                      typename TTypes<T>::ConstMatrix b,                  \
-                      typename TTypes<T>::Vec scratch);                   \
+                      typename TTypes<T>::ConstMatrix b);                 \
   extern template struct SparseTensorDenseMatMulFunctor<                  \
       GPUDevice, T, Tindices, ADJ_A, ADJ_B>;
 
@@ -255,8 +247,7 @@ struct SparseTensorDenseMatMulFunctor<CPUDevice, T, Tindices, ADJ_A, ADJ_B> {
   static Status Compute(const CPUDevice& d, typename TTypes<T>::Matrix out,
                         typename TTypes<Tindices>::ConstMatrix a_indices,
                         typename TTypes<T>::ConstVec a_values,
-                        typename TTypes<T>::ConstMatrix b,
-                        typename TTypes<T>::Vec scratch) {
+                        typename TTypes<T>::ConstMatrix b) {
     const std::size_t nnz = a_values.size();
     const std::size_t rhs_right = (ADJ_B ? b.dimension(0) : b.dimension(1));
     const std::size_t lhs_right = (ADJ_B ? b.dimension(1) : b.dimension(0));
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
index e707743f78..da13190494 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
@@ -28,11 +28,10 @@ namespace functor {
 template <typename Device, typename T, typename Tindices, bool ADJ_A,
           bool ADJ_B>
 struct SparseTensorDenseMatMulFunctor {
-  static EIGEN_ALWAYS_INLINE Status
-  Compute(const Device& d, typename TTypes<T>::Matrix out,
-          typename TTypes<Tindices>::ConstMatrix a_indices,
-          typename TTypes<T>::ConstVec a_values,
-          typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch);
+  static EIGEN_ALWAYS_INLINE Status Compute(
+      const Device& d, typename TTypes<T>::Matrix out,
+      typename TTypes<Tindices>::ConstMatrix a_indices,
+      typename TTypes<T>::ConstVec a_values, typename TTypes<T>::ConstMatrix b);
 };
 
 template <typename MATRIX, bool ADJ>
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
index 7266e0cf81..e261e42e0d 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
@@ -20,71 +20,45 @@ limitations under the License.
 #include "tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h"
 
 #include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/util/cuda_kernel_helper.h"
 
 namespace tensorflow {
 
 typedef Eigen::GpuDevice GPUDevice;
 
-namespace generator {
-
 template <typename T, typename Tindices, bool ADJ_A, bool ADJ_B>
-class SparseTensorDenseMatMulGPUGenerator {
- public:
-  EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE SparseTensorDenseMatMulGPUGenerator(
-      typename TTypes<T, 2>::Tensor32Bit out,
-      typename TTypes<const Tindices, 2>::Tensor32Bit a_indices,
-      typename TTypes<const T, 1>::Tensor32Bit a_values,
-      typename TTypes<const T, 2>::Tensor32Bit b)
-      : out_(out),
-        lhs_index_a_(ADJ_A ? 1 : 0),
-        rhs_index_a_(ADJ_A ? 0 : 1),
-        a_indices_(a_indices),
-        a_values_(a_values),
-        lhs_right_size(ADJ_B ? b.dimension(1) : b.dimension(0)),
-        maybe_adjoint_b_(
-            functor::MaybeAdjoint<typename TTypes<const T, 2>::Tensor32Bit,
-                                  ADJ_B>(b)) {}
-
-  EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE T
-  operator()(const Eigen::array<int, 2>& j_and_ix) const {
-#ifdef __CUDA_ARCH__
-    const int j = j_and_ix[0];
-    const int ix = j_and_ix[1];
-    int m = a_indices_(ix, lhs_index_a_);
-    int k = a_indices_(ix, rhs_index_a_);
-    assert(k < lhs_right_size);
-    assert(m < out_.dimension(0));
-    // If asserts are disabled, the caller is violating the sparse
-    // tensor index contract, and so we return invalid results.
-    // Force returning NaNs to try to signal that something is amiss.
-    T b_value;
-    if (k >= lhs_right_size || m >= out_.dimension(0)) {
-      m = 0;
-      k = 0;
-      b_value = std::numeric_limits<T>::quiet_NaN();
-    } else {
-      b_value = maybe_adjoint_b_(k, j);
+__global__ void SparseTensorDenseMatMulKernel(int nnz, int m, int b_rows,
+                                              int b_cols, int p,
+                                              const Tindices* a_indices,
+                                              const T* a_values, const T* b,
+                                              T* out) {
+  // out_{ij} = sum_k {a_ik b_kj}
+  // out = A * B', out_{ij} = sum_k {a_ik (b')_kj}; b'_{kj} = b_{jk}
+  const int n = (ADJ_B) ? b_cols : b_rows;
+  CUDA_1D_KERNEL_LOOP(index, nnz * p) {
+    const int a_ix = index / p;
+    const int j = index % p;
+    const int i = ldg(a_indices + 2 * a_ix + ((ADJ_A) ? 1 : 0));
+    const int k = ldg(a_indices + 2 * a_ix + ((ADJ_A) ? 0 : 1));
+    if (!FastBoundsCheck(i, m)) {
+      continue;  // Nowhere to signal an error :(
+    }
+    // out[i, j]
+    T* out_location = out + i * p + j;
+    if (!FastBoundsCheck(k, n)) {
+      CudaAtomicAdd(out_location, std::numeric_limits<T>::quiet_NaN());
+      continue;
     }
-    atomicAdd(&out_(m, j), a_values_(ix) * b_value);
-#else
-    assert(false && "This should only be run on the device");
-#endif
-    // Return something
-    return T(0);
-  }
 
- private:
-  mutable typename TTypes<T, 2>::Tensor32Bit out_;
-  const int lhs_index_a_;
-  const int rhs_index_a_;
-  typename TTypes<const Tindices, 2>::Tensor32Bit a_indices_;
-  typename TTypes<const T, 1>::Tensor32Bit a_values_;
-  const int lhs_right_size;
-  functor::MaybeAdjoint<typename TTypes<const T, 2>::Tensor32Bit, ADJ_B>
-      maybe_adjoint_b_;
-};
+    // a_value == (ADJ_A) ? a[k, i] : a[i, k]
+    const T a_value = ldg(a_values + a_ix);
 
-}  // namespace generator
+    // b_value == (ADJ_B) ? b[j, k] : b[k, j]
+    const T b_value = ldg(b + ((ADJ_B) ? j * b_cols + k : k * b_cols + j));
+    CudaAtomicAdd(out_location, a_value * b_value);
+  }
+}
 
 namespace functor {
 
@@ -94,51 +68,23 @@ struct SparseTensorDenseMatMulFunctor<GPUDevice, T, Tindices, ADJ_A, ADJ_B> {
   Compute(const GPUDevice& d, typename TTypes<T>::Matrix out,
           typename TTypes<Tindices>::ConstMatrix a_indices,
           typename TTypes<T>::ConstVec a_values,
-          typename TTypes<T>::ConstMatrix b, typename TTypes<T>::Vec scratch) {
-    generator::SparseTensorDenseMatMulGPUGenerator<T, Tindices, ADJ_A, ADJ_B>
-        sparse_tensor_dense_matmul_generator(To32Bit(out), To32Bit(a_indices),
-                                             To32Bit(a_values), To32Bit(b));
-    To32Bit(out).device(d) = To32Bit(out).constant(T(0));
+          typename TTypes<T>::ConstMatrix b) {
+    out.device(d) = out.constant(T(0));
     int nnz = a_values.size();
-    int n = (ADJ_B) ? b.dimension(0) : b.dimension(1);
-
-#if !defined(EIGEN_HAS_INDEX_LIST)
-    Eigen::Tensor<int, 2>::Dimensions matrix_1_by_nnz{{ 1, nnz }};
-    Eigen::array<int, 2> n_by_1{{ n, 1 }};
-    Eigen::array<int, 1> reduce_on_rows{{ 0 }};
-#else
-    Eigen::IndexList<Eigen::type2index<1>, int> matrix_1_by_nnz;
-    matrix_1_by_nnz.set(1, nnz);
-    Eigen::IndexList<int, Eigen::type2index<1> > n_by_1;
-    n_by_1.set(0, n);
-    Eigen::IndexList<Eigen::type2index<0> > reduce_on_rows;
-#endif
-
-    // How this works: the generator iterates over (j, ix) where j
-    // iterates from 0 .. n - 1 and ix iterates from
-    // 0 .. nnz - 1.  A side effect of the generator is to accumulate
-    // the products of values in A and B into the appropriate location
-    // in the dense matrix out.  In order to run the iteration,
-    // we take a smaller variable and broadcast to a size (n, nnz).
-    // This is the scratch variable.  In order to enforce execution,
-    // we have to perform assignment back into scratch (taking the sum).
-    // We don't care what gets assigned to scratch - only the side effect
-    // of the execution in the generator.
-    //
-    // Note it's not sufficient that scratch be a scalar, and to
-    // broadcast it to a matrix.  Eigen splits the computation not
-    // based on the largest intermediate shape (the size of the
-    // broadcast of scratch) but based on the output shape.  So
-    // scratch needs to be a vector at least.
-    //
-    // Note also that only float type is supported because the
-    // atomicAdd operation is only supported for floats in hardware.
-    To32Bit(scratch).device(d) =
-        To32Bit(scratch)
-            .reshape(matrix_1_by_nnz)
-            .broadcast(n_by_1)
-            .generate(sparse_tensor_dense_matmul_generator)
-            .sum(reduce_on_rows);
+    // out = A * B, A is [m x n] and B is [n x p], out is [m x p]
+    int m = out.dimension(0);
+    int p = out.dimension(1);
+    int b_rows = b.dimension(0);
+    int b_cols = b.dimension(1);
+
+    // TODO(ebrevdo): Should this be alpha * nnz instead of
+    // out.size()?  Perhaps p * nnz ?
+    CudaLaunchConfig config = GetCudaLaunchConfig(p * nnz, d);
+
+    SparseTensorDenseMatMulKernel<T, Tindices, ADJ_A, ADJ_B>
+        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
+            nnz, m, b_rows, b_cols, p, a_indices.data(), a_values.data(),
+            b.data(), out.data());
 
     return Status::OK();
   }
diff --git a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
index 8099175186..a0bd178e24 100644
--- a/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
@@ -29,6 +29,7 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
@@ -161,6 +162,46 @@ class SparseTensorDenseMatMulTest(test.TestCase):
         sparse_ops.sparse_tensor_dense_matmul(
             sparse_t, dense_t, adjoint_a=True).eval()
 
+  def testInvalidIndicesForSparseTensorDenseMatmulOnGPU(self):
+    # Note: use_gpu=False because nice errors are only returned from CPU kerne
+    if not test.is_gpu_available():
+      return
+    with self.test_session(use_gpu=True):
+      indices = np.array([[1, 10]]).astype(np.int64)
+      values = np.array([10]).astype(np.float32)
+      shape = [3, 2]
+      sparse_t = sparse_tensor.SparseTensor(indices, values, shape)
+
+      # Test multiplying by both a small and large dense matrix, to hit
+      # both cases in the kernel.
+      dense_t = np.matrix([[1] * 5, [2] * 5], dtype=np.float32)
+      expected_t = np.array([[0] * 5, [np.nan] * 5, [0] * 5], dtype=np.float32)
+      self.assertAllClose(expected_t,
+                          sparse_ops.sparse_tensor_dense_matmul(
+                              sparse_t, dense_t).eval())
+      dense_t = np.matrix([[1] * 500, [2] * 500], dtype=np.float32)
+      expected_t = np.array(
+          [[0] * 500, [np.nan] * 500, [0] * 500], dtype=np.float32)
+      self.assertAllClose(expected_t,
+                          sparse_ops.sparse_tensor_dense_matmul(
+                              sparse_t, dense_t).eval())
+
+      # Repeat with adjoint_a, now the error is that the sparse index
+      # is OOO w.r.t. the output.  The GPU kernel can't do much here,
+      # so it just doesn't accumulate.
+
+      dense_t = np.matrix([[1] * 5, [2] * 5, [3] * 5], dtype=np.float32)
+      expected_t = np.array([[0] * 5, [0] * 5], dtype=np.float32)
+      self.assertAllClose(expected_t,
+                          sparse_ops.sparse_tensor_dense_matmul(
+                              sparse_t, dense_t, adjoint_a=True).eval())
+
+      dense_t = np.matrix([[1] * 500, [2] * 500, [3] * 500], dtype=np.float32)
+      expected_t = np.array([[0] * 500, [0] * 500], dtype=np.float32)
+      self.assertAllClose(expected_t,
+                          sparse_ops.sparse_tensor_dense_matmul(
+                              sparse_t, dense_t, adjoint_a=True).eval())
+
   # Tests setting one dimension to be a high value.
   def _testLarge(self, np_dtype):
     r1 = np.random.randint(6000, 20000)
@@ -175,9 +216,12 @@ class SparseTensorDenseMatMulTest(test.TestCase):
 
       y = _maybe_complex(np.random.randn(k, n).astype(np_dtype))
 
-      self._testMatmul(x, y)
+      self._testMatmul(x, y, adjoint_a=False, adjoint_b=False)
+      self._testMatmul(x.transpose(), y, adjoint_a=True, adjoint_b=False)
+      self._testMatmul(x, y.transpose(), adjoint_a=False, adjoint_b=True)
+      self._testMatmul(
+          x.transpose(), y.transpose(), adjoint_a=True, adjoint_b=True)
 
-  def testLarge(self):
     np.random.seed(127)  # Repeatable results
     self._testLarge(np.float32)
     self._testLarge(np.float64)
@@ -221,7 +265,9 @@ def _sparse_tensor_dense_vs_dense_matmul_benchmark_dense(x, y, adjoint_a,
         lambda t, _: t < iterations,
         body, (t0, v0),
         parallel_iterations=1,
-        back_prop=False)
+        back_prop=False,
+        shape_invariants=(tensor_shape.TensorShape(()),
+                          tensor_shape.TensorShape(None)))
     return [final]
 
   return _timeit
@@ -246,7 +292,9 @@ def _sparse_tensor_dense_vs_dense_matmul_benchmark_sparse(x_ind, x_val, x_shape,
         lambda t, _: t < iterations,
         body, (t0, v0),
         parallel_iterations=1,
-        back_prop=False)
+        back_prop=False,
+        shape_invariants=(tensor_shape.TensorShape(()),
+                          tensor_shape.TensorShape(None)))
     return [final]
 
   return _timeit
@@ -291,7 +339,7 @@ def sparse_tensor_dense_vs_dense_matmul_benchmark(thresh,
   if skip_dense:
     delta_dense = float("nan")
   else:
-    with session.Session("", config=config, graph=ops.Graph()) as sess:
+    with session.Session(config=config, graph=ops.Graph()) as sess:
       if not use_gpu:
         with ops.device("/cpu:0"):
           x_t = constant_op.constant(x)
@@ -299,12 +347,12 @@ def sparse_tensor_dense_vs_dense_matmul_benchmark(thresh,
           ops_fn = _sparse_tensor_dense_vs_dense_matmul_benchmark_dense(
               x_t, y_t, adjoint_a, adjoint_b)
       else:
-        x_t = constant_op.constant(x)
-        y_t = constant_op.constant(y)
-        ops_fn = _sparse_tensor_dense_vs_dense_matmul_benchmark_dense(x_t, y_t,
-                                                                      adjoint_a,
-                                                                      adjoint_b)
-      delta_dense = _timer(sess, ops_fn, 1000)
+        with ops.device("/gpu:0"):
+          x_t = constant_op.constant(x)
+          y_t = constant_op.constant(y)
+          ops_fn = _sparse_tensor_dense_vs_dense_matmul_benchmark_dense(
+              x_t, y_t, adjoint_a, adjoint_b)
+      delta_dense = _timer(sess, ops_fn, 200)
 
   # Using sparse_tensor_dense_matmul.
   with session.Session("", config=config, graph=ops.Graph()) as sess:
@@ -317,13 +365,14 @@ def sparse_tensor_dense_vs_dense_matmul_benchmark(thresh,
         ops_fn = _sparse_tensor_dense_vs_dense_matmul_benchmark_sparse(
             x_ind, x_val, x_shape, y_t, adjoint_a, adjoint_b)
     else:
-      x_ind = constant_op.constant(np.vstack(np.where(x)).astype(np.int64).T)
-      x_val = constant_op.constant(x[np.where(x)])
-      x_shape = constant_op.constant(np.array(x.shape).astype(np.int64))
-      y_t = constant_op.constant(y)
-      ops_fn = _sparse_tensor_dense_vs_dense_matmul_benchmark_sparse(
-          x_ind, x_val, x_shape, y_t, adjoint_a, adjoint_b)
-    delta_sparse = _timer(sess, ops_fn, 1000)
+      with ops.device("/gpu:0"):
+        x_ind = constant_op.constant(np.vstack(np.where(x)).astype(np.int64).T)
+        x_val = constant_op.constant(x[np.where(x)])
+        x_shape = constant_op.constant(np.array(x.shape).astype(np.int64))
+        y_t = constant_op.constant(y)
+        ops_fn = _sparse_tensor_dense_vs_dense_matmul_benchmark_sparse(
+            x_ind, x_val, x_shape, y_t, adjoint_a, adjoint_b)
+    delta_sparse = _timer(sess, ops_fn, 200)
 
   print("%g \t %d \t %s \t %d \t %d \t %g \t %g \t %g" %
         (1 - thresh, n, use_gpu, m, k, delta_dense, delta_sparse,
@@ -340,7 +389,7 @@ def main(_):
         "\t dt(sparse)/dt(dense)")
 
   for thresh in (0.99, 0.8, 0.5, 0.2):
-    for n in (1, 10, 25):
+    for n in (50, 100):
       for use_gpu in (True, False):
         for m in (100, 1000):
           for k in (100, 1000):
-- 
GitLab


From 81fbb1246c3a41dec826fd9958772c02f88982bb Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Thu, 4 May 2017 16:14:18 -0800
Subject: [PATCH 1025/1563] Include c++ gradients in c_api build rule. #6268
 #9150 Change: 155146664

---
 tensorflow/c/BUILD  | 1 +
 tensorflow/cc/BUILD | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
index 4ad69ae3fb..3ab4e8efcd 100644
--- a/tensorflow/c/BUILD
+++ b/tensorflow/c/BUILD
@@ -58,6 +58,7 @@ tf_cuda_library(
             "//tensorflow/cc/saved_model:loader",
             "//tensorflow/cc:gradients",
             "//tensorflow/cc:ops",
+            "//tensorflow/cc:grad_ops",
             "//tensorflow/cc:scope_internal",
             "//tensorflow/core:core_cpu",
             "//tensorflow/core:framework",
diff --git a/tensorflow/cc/BUILD b/tensorflow/cc/BUILD
index 8810b8731a..8d4260a0b9 100644
--- a/tensorflow/cc/BUILD
+++ b/tensorflow/cc/BUILD
@@ -91,6 +91,7 @@ cc_library(
     deps = [
         ":array_grad",
         ":math_grad",
+        ":nn_grad",
     ],
 )
 
-- 
GitLab


From d24befd445ce74a611c95533b11ceb2a09841d47 Mon Sep 17 00:00:00 2001
From: Erik Smistad <ersmistad@gmail.com>
Date: Fri, 5 May 2017 03:39:21 +0200
Subject: [PATCH 1026/1563] replace sleep macro with an inline function (#9663)

---
 third_party/eigen3/unsupported/Eigen/CXX11/Tensor | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
index 00d2e7c0c7..861a87b68b 100644
--- a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
+++ b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
@@ -1,9 +1,11 @@
-#ifdef _WIN32
-#define sleep(seconds) Sleep(1000*seconds)
-#endif  // _WIN32
 #include "unsupported/Eigen/CXX11/Tensor"
 
 #ifdef _WIN32
+#ifndef SLEEP_FUNC_HEADER_GUARD
+#define SLEEP_FUNC_HEADER_GUARD
+inline void sleep(unsigned int seconds) { Sleep(1000*seconds); }
+#endif
+
 // On Windows, Eigen will include Windows.h, which defines various
 // macros that conflict with TensorFlow symbols. Undefine them here to
 // prevent clashes.
-- 
GitLab


From d48f3a9a3fcd91c6b97644f4007d92f17516b80a Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 4 May 2017 18:28:35 -0800
Subject: [PATCH 1027/1563] Automated rollback of change 155136555 Change:
 155156366

---
 tensorflow/BUILD                              | 42 -------------------
 .../vz_data_summary/BUILD.OPENSOURCE          | 34 +++++++++++++++
 .../components/vz_projector/BUILD.OPENSOURCE  | 19 +++++++++
 tensorflow/tensorboard/defs.bzl               | 16 -------
 4 files changed, 53 insertions(+), 58 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
 create mode 100644 tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index da8190523a..a2f7a9fb63 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -318,48 +318,6 @@ filegroup(
         "//tensorflow/tensorboard/backend:all_files",
         "//tensorflow/tensorboard/backend/event_processing:all_files",
         "//tensorflow/tensorboard/components:all_files",
-        "//tensorflow/tensorboard/components/tf_audio_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_backend:all_files",
-        "//tensorflow/tensorboard/components/tf_backend_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_color_scale:all_files",
-        "//tensorflow/tensorboard/components/tf_color_scale/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_color_scale_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:all_files",
-        "//tensorflow/tensorboard/components/tf_dashboard_common/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_globals:all_files",
-        "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_common:all_files",
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_image_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_image_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_imports:all_files",
-        "//tensorflow/tensorboard/components/tf_imports_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_storage:all_files",
-        "//tensorflow/tensorboard/components/tf_storage_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_text_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_text_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/vz_data_summary:all_files",
-        "//tensorflow/tensorboard/components/vz_distribution_chart:all_files",
-        "//tensorflow/tensorboard/components/vz_distribution_chart/demo:all_files",
-        "//tensorflow/tensorboard/components/vz_distribution_chart_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries:all_files",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries/demo:all_files",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_line_chart:all_files",
-        "//tensorflow/tensorboard/components/vz_line_chart/demo:all_files",
-        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_projector:all_files",
-        "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_sorting:all_files",
-        "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
-        "//tensorflow/tensorboard/components/vz_sorting_d3v4:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
diff --git a/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE b/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
new file mode 100644
index 0000000000..9743d70d94
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
@@ -0,0 +1,34 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# =============================================================================
+
+# Description:
+# Package for the data-summary vz-element.
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE b/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
new file mode 100644
index 0000000000..8c222be10e
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
@@ -0,0 +1,19 @@
+# Description:
+# Package for the Embedding Projector component.
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tensorboard/defs.bzl b/tensorflow/tensorboard/defs.bzl
index 22bb047075..7bb5f961c9 100644
--- a/tensorflow/tensorboard/defs.bzl
+++ b/tensorflow/tensorboard/defs.bzl
@@ -60,22 +60,6 @@ def tensorboard_typescript_genrule(name, srcs, typings=[], **kwargs):
       **kwargs
   )
 
-def tensorboard_karma_web_test_suite(**kwargs):
-  """Rules referencing this will be deleted from the codebase soon."""
-  pass
-
-def tensorboard_ts_declaration(**kwargs):
-  """Rules referencing this will be deleted from the codebase soon."""
-  pass
-
-def tensorboard_ts_development_sources(**kwargs):
-  """Rules referencing this will be deleted from the codebase soon."""
-  pass
-
-def tensorboard_ts_devserver(**kwargs):
-  """Rules referencing this will be deleted from the codebase soon."""
-  pass
-
 def tensorboard_ts_library(**kwargs):
   """Rules referencing this will be deleted from the codebase soon."""
   pass
-- 
GitLab


From afd69fc26f85782dd6ac44ef1e05ff0d147399a9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 4 May 2017 19:03:38 -0800
Subject: [PATCH 1028/1563] Add `categorical_column_with_vocabulary_list`.
 Change: 155158042

---
 .../python/feature_column/feature_column.py   | 174 +++++++--
 .../feature_column/feature_column_test.py     | 334 ++++++++++++++++--
 2 files changed, 464 insertions(+), 44 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 33bed3abcf..ffdf8868e2 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -121,6 +121,8 @@ from __future__ import print_function
 import abc
 import collections
 
+import numpy as np
+
 from tensorflow.python.feature_column import lookup_ops
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -433,6 +435,12 @@ def bucketized_column(source_column, boundaries):
   return _BucketizedColumn(source_column, tuple(boundaries))
 
 
+def _assert_string_or_int(dtype, prefix):
+  if (dtype != dtypes.string) and (not dtype.is_integer):
+    raise ValueError(
+        '{} dtype must be string or integer. dtype: {}.'.format(prefix, dtype))
+
+
 def categorical_column_with_hash_bucket(key,
                                         hash_bucket_size,
                                         dtype=dtypes.string):
@@ -475,9 +483,7 @@ def categorical_column_with_hash_bucket(key,
                      'hash_bucket_size: {}, key: {}'.format(
                          hash_bucket_size, key))
 
-  if dtype != dtypes.string and not dtype.is_integer:
-    raise ValueError('dtype must be string or integer. '
-                     'dtype: {}, column_name: {}'.format(dtype, key))
+  _assert_string_or_int(dtype, prefix='column_name: {}'.format(key))
 
   return _HashedCategoricalColumn(key, hash_bucket_size, dtype)
 
@@ -485,7 +491,7 @@ def categorical_column_with_hash_bucket(key,
 def categorical_column_with_vocabulary_file(
     key, vocabulary_file, vocabulary_size, num_oov_buckets=0,
     default_value=None, dtype=dtypes.string):
-  """Creates a `_CategoricalColumn` with vocabulary file configuration.
+  """A `_CategoricalColumn` with a vocabulary file.
 
   Use this when your inputs are in string or integer format, and you have a
   vocabulary file that maps each value to an integer ID. By default,
@@ -504,7 +510,7 @@ def categorical_column_with_vocabulary_file(
   ID 50-54.
   ```python
   states = categorical_column_with_vocabulary_file(
-      key='keywords', vocabulary_file='/us/states.txt', vocabulary_size=50,
+      key='states', vocabulary_file='/us/states.txt', vocabulary_size=50,
       num_oov_buckets=5)
   linear_prediction = make_linear_model(features, [states, ...])
   ```
@@ -516,7 +522,7 @@ def categorical_column_with_vocabulary_file(
   others are assigned the corresponding line number 1-50.
   ```python
   states = categorical_column_with_vocabulary_file(
-      key='keywords', vocabulary_file='/us/states.txt', vocabulary_size=51,
+      key='states', vocabulary_file='/us/states.txt', vocabulary_size=51,
       default_value=0)
   linear_prediction, _, _ = make_linear_model(features, [states, ...])
 
@@ -530,7 +536,9 @@ def categorical_column_with_vocabulary_file(
       column name and the dictionary key for feature parsing configs, feature
       `Tensor` objects, and feature columns.
     vocabulary_file: The vocabulary file name.
-    vocabulary_size: Number of the elements in the vocabulary.
+    vocabulary_size: Number of the elements in the vocabulary. This must be no
+      greater than length of `vocabulary_file`, if less than length, later
+      values are ignored.
     num_oov_buckets: Non-negative integer, the number of out-of-vocabulary
       buckets. All out-of-vocabulary inputs will be assigned IDs in the range
       `[vocabulary_size, vocabulary_size+num_oov_buckets)` based on a hash of
@@ -542,7 +550,7 @@ def categorical_column_with_vocabulary_file(
     dtype: The type of features. Only string and integer types are supported.
 
   Returns:
-    A `_CategoricalColumn` with vocabulary file configuration.
+    A `_CategoricalColumn` with a vocabulary file.
 
   Raises:
     ValueError: `vocabulary_file` is missing.
@@ -564,9 +572,8 @@ def categorical_column_with_vocabulary_file(
     if num_oov_buckets < 0:
       raise ValueError('Invalid num_oov_buckets {} in {}.'.format(
           num_oov_buckets, key))
-  if dtype != dtypes.string and not dtype.is_integer:
-    raise ValueError('Invalid dtype {} in {}.'.format(dtype, key))
-  return _VocabularyCategoricalColumn(
+  _assert_string_or_int(dtype, prefix='column_name: {}'.format(key))
+  return _VocabularyFileCategoricalColumn(
       key=key,
       vocabulary_file=vocabulary_file,
       vocabulary_size=vocabulary_size,
@@ -575,6 +582,80 @@ def categorical_column_with_vocabulary_file(
       dtype=dtype)
 
 
+def categorical_column_with_vocabulary_list(
+    key, vocabulary_list, dtype=None, default_value=-1):
+  """A `_CategoricalColumn` with in-memory vocabulary.
+
+  Logic for feature f is:
+  id = f in vocabulary_list ? vocabulary_list.index(f) : default_value
+
+  Use this when your inputs are in string or integer format, and you have an
+  in-memory vocabulary mapping each value to an integer ID. By default,
+  out-of-vocabulary values are ignored. Use `default_value` to specify how to
+  include out-of-vocabulary values.
+
+  Inputs can be either `Tensor` or `SparseTensor`. If `Tensor`, missing values
+  can be represented by `-1` for int and `''` for string. Note that these values
+  are independent of the `default_value` argument.
+
+  In the following examples, each input in `vocabulary_list` is assigned an ID
+  0-4 corresponding to its index (e.g., input 'B' produces output 2). All other
+  inputs are assigned `default_value` 0.
+
+  Linear model:
+  ```python
+  colors = categorical_column_with_vocabulary_list(
+      key='colors', vocabulary_list=('X', 'R', 'G', 'B', 'Y'), default_value=0)
+  linear_prediction, _, _ = make_linear_model(features, [colors, ...])
+  ```
+
+  Embedding for a DNN model:
+  ```python
+  dense_tensor = make_input_layer(features, [embedding_column(colors, 3),...])
+  ```
+
+  Args:
+    key: A unique string identifying the input feature. It is used as the
+      column name and the dictionary key for feature parsing configs, feature
+      `Tensor` objects, and feature columns.
+    vocabulary_list: An ordered iterable defining the vocabulary. Each feature
+      is mapped to the index of its value (if present) in `vocabulary_list`.
+      Must be castable to `dtype`.
+    dtype: The type of features. Only string and integer types are supported.
+      If `None`, it will be inferred from `vocabulary_list`.
+    default_value: The value to use for values not in `vocabulary_list`.
+
+  Returns:
+    A `_CategoricalColumn` with in-memory vocabulary.
+
+  Raises:
+    ValueError: if `vocabulary_list` is empty, or contains duplicate keys.
+    ValueError: if `dtype` is not integer or string.
+  """
+  if (vocabulary_list is None) or (len(vocabulary_list) < 1):
+    raise ValueError(
+        'vocabulary_list {} must be non-empty, column_name: {}'.format(
+            vocabulary_list, key))
+  if len(set(vocabulary_list)) != len(vocabulary_list):
+    raise ValueError(
+        'Duplicate keys in vocabulary_list {}, column_name: {}'.format(
+            vocabulary_list, key))
+  vocabulary_dtype = dtypes.as_dtype(np.array(vocabulary_list).dtype)
+  _assert_string_or_int(
+      vocabulary_dtype, prefix='column_name: {} vocabulary'.format(key))
+  if dtype is None:
+    dtype = vocabulary_dtype
+  elif dtype.is_integer != vocabulary_dtype.is_integer:
+    raise ValueError(
+        'dtype {} and vocabulary dtype {} do not match, column_name: {}'.format(
+            dtype, vocabulary_dtype, key))
+  _assert_string_or_int(dtype, prefix='column_name: {}'.format(key))
+
+  return _VocabularyListCategoricalColumn(
+      key=key, vocabulary_list=tuple(vocabulary_list), dtype=dtype,
+      default_value=default_value)
+
+
 class _FeatureColumn(object):
   """Represents a feature column abstraction.
 
@@ -1170,11 +1251,9 @@ class _HashedCategoricalColumn(
     if not isinstance(input_tensor, sparse_tensor_lib.SparseTensor):
       raise ValueError('SparseColumn input must be a SparseTensor.')
 
-    if (input_tensor.dtype != dtypes.string and
-        not input_tensor.dtype.is_integer):
-      raise ValueError('input tensors dtype must be string or integer. '
-                       'dtype: {}, column_name: {}'.format(
-                           input_tensor.dtype, self.key))
+    _assert_string_or_int(
+        input_tensor.dtype,
+        prefix='column_name: {} input_tensor'.format(self.key))
 
     if self.dtype.is_integer != input_tensor.dtype.is_integer:
       raise ValueError(
@@ -1202,8 +1281,9 @@ class _HashedCategoricalColumn(
     return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
 
 
-class _VocabularyCategoricalColumn(
-    _CategoricalColumn, collections.namedtuple('_VocabularyCategoricalColumn', (
+class _VocabularyFileCategoricalColumn(
+    _CategoricalColumn,
+    collections.namedtuple('_VocabularyFileCategoricalColumn', (
         'key', 'vocabulary_file', 'vocabulary_size', 'num_oov_buckets', 'dtype',
         'default_value'
     ))):
@@ -1226,15 +1306,15 @@ class _VocabularyCategoricalColumn(
           'key: {}, column dtype: {}, tensor dtype: {}'.format(
               self.key, self.dtype, input_tensor.dtype))
 
+    _assert_string_or_int(
+        input_tensor.dtype,
+        prefix='column_name: {} input_tensor'.format(self.key))
+
     key_dtype = self.dtype
     if input_tensor.dtype.is_integer:
       # `index_table_from_file` requires 64-bit integer keys.
       key_dtype = dtypes.int64
       input_tensor = math_ops.to_int64(input_tensor)
-    elif input_tensor.dtype != dtypes.string:
-      raise ValueError('input tensors dtype must be string or integer. '
-                       'dtype: {}, column_name: {}'.format(
-                           input_tensor.dtype, self.key))
 
     return lookup_ops.index_table_from_file(
         vocabulary_file=self.vocabulary_file,
@@ -1254,6 +1334,56 @@ class _VocabularyCategoricalColumn(
     return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
 
 
+class _VocabularyListCategoricalColumn(
+    _CategoricalColumn,
+    collections.namedtuple('_VocabularyListCategoricalColumn', (
+        'key', 'vocabulary_list', 'dtype', 'default_value'
+    ))):
+  """See `categorical_column_with_vocabulary_list`."""
+
+  @property
+  def name(self):
+    return self.key
+
+  @property
+  def _parse_example_config(self):
+    return {self.key: parsing_ops.VarLenFeature(self.dtype)}
+
+  def _transform_feature(self, inputs):
+    input_tensor = _to_sparse_input(inputs.get(self.key))
+
+    if self.dtype.is_integer != input_tensor.dtype.is_integer:
+      raise ValueError(
+          'Column dtype and SparseTensors dtype must be compatible. '
+          'key: {}, column dtype: {}, tensor dtype: {}'.format(
+              self.key, self.dtype, input_tensor.dtype))
+
+    _assert_string_or_int(
+        input_tensor.dtype,
+        prefix='column_name: {} input_tensor'.format(self.key))
+
+    key_dtype = self.dtype
+    if input_tensor.dtype.is_integer:
+      # `index_table_from_tensor` requires 64-bit integer keys.
+      key_dtype = dtypes.int64
+      input_tensor = math_ops.to_int64(input_tensor)
+
+    return lookup_ops.index_table_from_tensor(
+        mapping=tuple(self.vocabulary_list),
+        default_value=self.default_value,
+        dtype=key_dtype,
+        name='{}_lookup'.format(self.key)).lookup(input_tensor)
+
+  @property
+  def _num_buckets(self):
+    """Returns number of buckets in this sparse feature."""
+    return len(self.vocabulary_list)
+
+  def _get_sparse_tensors(
+      self, inputs, weight_collections=None, trainable=None):
+    return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
+
+
 # TODO(zakaria): Move this to embedding_ops and make it public.
 def _safe_embedding_lookup_sparse(embedding_weights,
                                   sparse_ids,
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index ad67a082dc..59aa39411f 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -1193,10 +1193,22 @@ class MakeInputLayerTest(test.TestCase):
         self.assertAllClose([[1., 3.]], net2.eval())
 
 
-class VocabularyCategoricalColumnTest(test.TestCase):
+def _assert_sparse_tensor_value(test_case, expected, actual):
+  test_case.assertEqual(np.int64, np.array(actual.indices).dtype)
+  test_case.assertAllEqual(expected.indices, actual.indices)
+
+  test_case.assertEqual(
+      np.array(expected.values).dtype, np.array(actual.values).dtype)
+  test_case.assertAllEqual(expected.values, actual.values)
+
+  test_case.assertEqual(np.int64, np.array(actual.dense_shape).dtype)
+  test_case.assertAllEqual(expected.dense_shape, actual.dense_shape)
+
+
+class VocabularyFileCategoricalColumnTest(test.TestCase):
 
   def setUp(self):
-    super(VocabularyCategoricalColumnTest, self).setUp()
+    super(VocabularyFileCategoricalColumnTest, self).setUp()
 
     # Contains ints, Golden State Warriors jersey numbers: 30, 35, 11, 23, 22
     self._warriors_vocabulary_file_name = test.test_src_dir_path(
@@ -1208,17 +1220,6 @@ class VocabularyCategoricalColumnTest(test.TestCase):
         'python/feature_column/testdata/wire_vocabulary.txt')
     self._wire_vocabulary_size = 3
 
-  def _assert_sparse_tensor_value(self, expected, actual):
-    self.assertEqual(np.int64, np.array(actual.indices).dtype)
-    self.assertAllEqual(expected.indices, actual.indices)
-
-    self.assertEqual(
-        np.array(expected.values).dtype, np.array(actual.values).dtype)
-    self.assertAllEqual(expected.values, actual.values)
-
-    self.assertEqual(np.int64, np.array(actual.dense_shape).dtype)
-    self.assertAllEqual(expected.dense_shape, actual.dense_shape)
-
   def test_defaults(self):
     column = fc.categorical_column_with_vocabulary_file(
         key='aaa', vocabulary_file='path_to_file', vocabulary_size=3)
@@ -1316,7 +1317,7 @@ class VocabularyCategoricalColumnTest(test.TestCase):
           num_oov_buckets=-1)
 
   def test_invalid_dtype(self):
-    with self.assertRaisesRegexp(ValueError, 'Invalid dtype'):
+    with self.assertRaisesRegexp(ValueError, 'dtype must be string or integer'):
       fc.categorical_column_with_vocabulary_file(
           key='aaa', vocabulary_file='path', vocabulary_size=3,
           dtype=dtypes.float64)
@@ -1331,6 +1332,36 @@ class VocabularyCategoricalColumnTest(test.TestCase):
           num_oov_buckets=100,
           default_value=2)
 
+  def test_invalid_input_dtype_int32(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size,
+        dtype=dtypes.string)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(12, 24, 36),
+        dense_shape=(2, 2))
+    with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
+      # pylint: disable=protected-access
+      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      # pylint: enable=protected-access
+
+  def test_invalid_input_dtype_string(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._warriors_vocabulary_file_name,
+        vocabulary_size=self._warriors_vocabulary_size,
+        dtype=dtypes.int32)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('omar', 'stringer', 'marlo'),
+        dense_shape=(2, 2))
+    with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
+      # pylint: disable=protected-access
+      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      # pylint: enable=protected-access
+
   def test_get_sparse_tensors(self):
     column = fc.categorical_column_with_vocabulary_file(
         key='aaa',
@@ -1346,7 +1377,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=inputs.indices,
               values=np.array((2, -1, 0), dtype=np.int64),
@@ -1365,7 +1397,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=np.array((2, -1, 0), dtype=np.int64),
@@ -1388,7 +1421,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=inputs.indices,
               values=np.array((2, 2, 0), dtype=np.int64),
@@ -1411,7 +1445,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=inputs.indices,
               values=np.array((2, 33, 0, 62), dtype=np.int64),
@@ -1436,7 +1471,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=inputs.indices,
               values=np.array((-1, -1, 0), dtype=np.int64),
@@ -1459,7 +1495,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=inputs.indices,
               values=np.array((2, -1, 0, 4), dtype=np.int64),
@@ -1481,7 +1518,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1), (2, 2)),
               values=np.array((2, default_value, 0, 4), dtype=np.int64),
@@ -1505,7 +1543,8 @@ class VocabularyCategoricalColumnTest(test.TestCase):
     # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
-      self._assert_sparse_tensor_value(
+      _assert_sparse_tensor_value(
+          self,
           sparse_tensor.SparseTensorValue(
               indices=inputs.indices,
               values=np.array((2, 60, 0, 4), dtype=np.int64),
@@ -1538,5 +1577,256 @@ class VocabularyCategoricalColumnTest(test.TestCase):
         self.assertAllClose(((3.,), (5.,)), predictions.eval())
 
 
+class VocabularyListCategoricalColumnTest(test.TestCase):
+
+  def test_defaults_string(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
+    self.assertEqual('aaa', column.name)
+    # pylint: disable=protected-access
+    self.assertEqual(3, column._num_buckets)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.string)
+    }, column._parse_example_config)
+    # pylint: enable=protected-access
+
+  def test_defaults_int(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=(12, 24, 36))
+    self.assertEqual('aaa', column.name)
+    # pylint: disable=protected-access
+    self.assertEqual(3, column._num_buckets)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.int64)
+    }, column._parse_example_config)
+    # pylint: enable=protected-access
+
+  def test_all_constructor_args(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=(12, 24, 36), dtype=dtypes.int32,
+        default_value=-99)
+    # pylint: disable=protected-access
+    self.assertEqual(3, column._num_buckets)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.int32)
+    }, column._parse_example_config)
+    # pylint: enable=protected-access
+
+  def test_deep_copy(self):
+    """Tests deepcopy of categorical_column_with_hash_bucket."""
+    original = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=(12, 24, 36), dtype=dtypes.int32)
+    for column in (original, copy.deepcopy(original)):
+      self.assertEqual('aaa', column.name)
+      # pylint: disable=protected-access
+      self.assertEqual(3, column._num_buckets)
+      self.assertEqual({
+          'aaa': parsing_ops.VarLenFeature(dtypes.int32)
+      }, column._parse_example_config)
+      # pylint: enable=protected-access
+
+  def test_invalid_dtype(self):
+    with self.assertRaisesRegexp(ValueError, 'dtype must be string or integer'):
+      fc.categorical_column_with_vocabulary_list(
+          key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'),
+          dtype=dtypes.float32)
+
+  def test_invalid_mapping_dtype(self):
+    with self.assertRaisesRegexp(
+        ValueError, r'vocabulary dtype must be string or integer'):
+      fc.categorical_column_with_vocabulary_list(
+          key='aaa', vocabulary_list=(12., 24., 36.))
+
+  def test_mismatched_int_dtype(self):
+    with self.assertRaisesRegexp(
+        ValueError, r'dtype.*and vocabulary dtype.*do not match'):
+      fc.categorical_column_with_vocabulary_list(
+          key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'),
+          dtype=dtypes.int32)
+
+  def test_mismatched_string_dtype(self):
+    with self.assertRaisesRegexp(
+        ValueError, r'dtype.*and vocabulary dtype.*do not match'):
+      fc.categorical_column_with_vocabulary_list(
+          key='aaa', vocabulary_list=(12, 24, 36), dtype=dtypes.string)
+
+  def test_none_mapping(self):
+    with self.assertRaisesRegexp(
+        ValueError, r'vocabulary_list.*must be non-empty'):
+      fc.categorical_column_with_vocabulary_list(
+          key='aaa', vocabulary_list=None)
+
+  def test_empty_mapping(self):
+    with self.assertRaisesRegexp(
+        ValueError, r'vocabulary_list.*must be non-empty'):
+      fc.categorical_column_with_vocabulary_list(
+          key='aaa', vocabulary_list=tuple([]))
+
+  def test_duplicate_mapping(self):
+    with self.assertRaisesRegexp(ValueError, 'Duplicate keys'):
+      fc.categorical_column_with_vocabulary_list(
+          key='aaa', vocabulary_list=(12, 24, 12))
+
+  def test_invalid_input_dtype_int32(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=('omar', 'stringer', 'marlo'))
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(12, 24, 36),
+        dense_shape=(2, 2))
+    with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
+      # pylint: disable=protected-access
+      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      # pylint: enable=protected-access
+
+  def test_invalid_input_dtype_string(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=(12, 24, 36))
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('omar', 'stringer', 'marlo'),
+        dense_shape=(2, 2))
+    with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
+      # pylint: disable=protected-access
+      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      # pylint: enable=protected-access
+
+  def test_get_sparse_tensors(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=('omar', 'stringer', 'marlo'))
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, -1, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_dense_input(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=('omar', 'stringer', 'marlo'))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
+        'aaa': (('marlo', ''), ('skywalker', 'omar'))
+    }))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=np.array((2, -1, 0), dtype=np.int64),
+              dense_shape=(2, 2)),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_default_value_in_vocabulary(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=('omar', 'stringer', 'marlo'),
+        default_value=2)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, 2, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_int32(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=np.array((30, 35, 11, 23, 22), dtype=np.int32),
+        dtype=dtypes.int32)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1), (2, 2)),
+        values=np.array((11, 100, 30, 22), dtype=np.int32),
+        dense_shape=(3, 3))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, -1, 0, 4), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_int32_dense_input(self):
+    default_value = -100
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=np.array((30, 35, 11, 23, 22), dtype=np.int32),
+        dtype=dtypes.int32,
+        default_value=default_value)
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
+        'aaa': np.array(
+            ((11, -1, -1), (100, 30, -1), (-1, -1, 22)),
+            dtype=np.int32)
+    }))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1), (2, 2)),
+              values=np.array((2, default_value, 0, 4), dtype=np.int64),
+              dense_shape=(3, 3)),
+          id_weight_pair.id_tensor.eval())
+
+  def test_make_linear_model(self):
+    wire_column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=('omar', 'stringer', 'marlo'))
+    self.assertEqual(3, wire_column._num_buckets)
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          wire_column.name: sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=('marlo', 'skywalker', 'omar'),
+              dense_shape=(2, 2))
+      }, (wire_column,))
+      bias = get_linear_model_bias()
+      wire_var = get_linear_model_column_var(wire_column)
+      with _initialized_session():
+        self.assertAllClose((0.,), bias.eval())
+        self.assertAllClose(((0.,), (0.,), (0.,)), wire_var.eval())
+        self.assertAllClose(((0.,), (0.,)), predictions.eval())
+        wire_var.assign(((1.,), (2.,), (3.,))).eval()
+        # 'marlo' -> 2: wire_var[2] = 3
+        # 'skywalker' -> None, 'omar' -> 0: wire_var[0] = 1
+        self.assertAllClose(((3.,), (1.,)), predictions.eval())
+
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From 44cf98028b635ff3dd4145df263b0706ba663924 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 4 May 2017 19:11:23 -0800
Subject: [PATCH 1029/1563] RNN checkpoint migration tool Change: 155158477

---
 tensorflow/contrib/rnn/BUILD                  |  25 ++
 .../rnn/python/tools/checkpoint_convert.py    | 231 ++++++++++++++++++
 .../python/tools/checkpoint_convert_test.py   | 108 ++++++++
 .../tools/pip_package/pip_smoke_test.py       |   2 +-
 4 files changed, 365 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/contrib/rnn/python/tools/checkpoint_convert.py
 create mode 100644 tensorflow/contrib/rnn/python/tools/checkpoint_convert_test.py

diff --git a/tensorflow/contrib/rnn/BUILD b/tensorflow/contrib/rnn/BUILD
index ab443eab6f..9d67563edd 100644
--- a/tensorflow/contrib/rnn/BUILD
+++ b/tensorflow/contrib/rnn/BUILD
@@ -304,6 +304,7 @@ filegroup(
         exclude = [
             "**/METADATA",
             "**/OWNERS",
+            "tools/**",
         ],
     ),
     visibility = ["//tensorflow:__subpackages__"],
@@ -351,3 +352,27 @@ tf_kernel_library(
         "//third_party/eigen3",
     ],
 )
+
+py_binary(
+    name = "checkpoint_convert",
+    srcs = ["python/tools/checkpoint_convert.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:training",
+        "//tensorflow/python:variables",
+    ],
+)
+
+py_test(
+    name = "checkpoint_convert_test",
+    size = "small",
+    srcs = ["python/tools/checkpoint_convert_test.py"],
+    srcs_version = "PY2AND3",
+    tags = ["no_pip"],
+    deps = [
+        ":checkpoint_convert",
+        "//tensorflow/python:client_testlib",
+    ],
+)
diff --git a/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py b/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py
new file mode 100644
index 0000000000..1e29114b0c
--- /dev/null
+++ b/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py
@@ -0,0 +1,231 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+r"""Convert checkpoints using RNNCells to new name convention.
+
+Usage:
+
+  python checkpoint_convert [--write_v1_checkpoint] \
+      '/path/to/checkpoint' '/path/to/new_checkpoint'
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import collections
+import re
+import sys
+
+from tensorflow.core.protobuf import saver_pb2
+from tensorflow.python import pywrap_tensorflow
+from tensorflow.python.client import session
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import app
+from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.training import saver as saver_lib
+
+_RNN_NAME_REPLACEMENTS = collections.OrderedDict([
+    ############################################################################
+    # contrib/rnn/python/ops/core_rnn_cell_impl.py
+    # BasicRNNCell
+    ('basic_rnn_cell/weights', 'basic_rnn_cell/kernel'),
+    ('basic_rnn_cell/biases', 'basic_rnn_cell/bias'),
+    # GRUCell
+    ('gru_cell/weights', 'gru_cell/kernel'),
+    ('gru_cell/biases', 'gru_cell/bias'),
+    ('gru_cell/gates/weights', 'gru_cell/gates/kernel'),
+    ('gru_cell/gates/biases', 'gru_cell/gates/bias'),
+    ('gru_cell/candidate/weights', 'gru_cell/candidate/kernel'),
+    ('gru_cell/candidate/biases', 'gru_cell/candidate/bias'),
+    # BasicLSTMCell
+    ('basic_lstm_cell/weights', 'basic_lstm_cell/kernel'),
+    ('basic_lstm_cell/biases', 'basic_lstm_cell/bias'),
+    # LSTMCell
+    ('lstm_cell/weights', 'lstm_cell/kernel'),
+    ('lstm_cell/biases', 'lstm_cell/bias'),
+    ('lstm_cell/projection/weights', 'lstm_cell/projection/kernel'),
+    ('lstm_cell/projection/biases', 'lstm_cell/projection/bias'),
+    # OutputProjectionWrapper
+    ('output_projection_wrapper/weights', 'output_projection_wrapper/kernel'),
+    ('output_projection_wrapper/biases', 'output_projection_wrapper/bias'),
+    # InputProjectionWrapper
+    ('input_projection_wrapper/weights', 'input_projection_wrapper/kernel'),
+    ('input_projection_wrapper/biases', 'input_projection_wrapper/bias'),
+    ############################################################################
+    # contrib/rnn/python/ops/lstm_ops.py
+    # LSTMBlockFusedCell ??
+    ('lstm_block_wrapper/weights', 'lstm_block_wrapper/kernel'),
+    ('lstm_block_wrapper/biases', 'lstm_block_wrapper/bias'),
+    ############################################################################
+    # contrib/rnn/python/ops/rnn_cell.py
+    # LayerNormBasicLSTMCell
+    ('layer_norm_basic_lstm_cell/weights', 'layer_norm_basic_lstm_cell/kernel'),
+    ('layer_norm_basic_lstm_cell/biases', 'layer_norm_basic_lstm_cell/bias'),
+    # UGRNNCell, not found in g3, but still need it?
+    ('ugrnn_cell/weights', 'ugrnn_cell/kernel'),
+    ('ugrnn_cell/biases', 'ugrnn_cell/bias'),
+    # NASCell
+    ('nas_rnn/weights', 'nas_rnn/kernel'),
+    ('nas_rnn/recurrent_weights', 'nas_rnn/recurrent_kernel'),
+    # IntersectionRNNCell
+    ('intersection_rnn_cell/weights', 'intersection_rnn_cell/kernel'),
+    ('intersection_rnn_cell/biases', 'intersection_rnn_cell/bias'),
+    ('intersection_rnn_cell/in_projection/weights',
+     'intersection_rnn_cell/in_projection/kernel'),
+    ('intersection_rnn_cell/in_projection/biases',
+     'intersection_rnn_cell/in_projection/bias'),
+    # PhasedLSTMCell
+    ('phased_lstm_cell/mask_gates/weights',
+     'phased_lstm_cell/mask_gates/kernel'),
+    ('phased_lstm_cell/mask_gates/biases', 'phased_lstm_cell/mask_gates/bias'),
+    ('phased_lstm_cell/new_input/weights', 'phased_lstm_cell/new_input/kernel'),
+    ('phased_lstm_cell/new_input/biases', 'phased_lstm_cell/new_input/bias'),
+    ('phased_lstm_cell/output_gate/weights',
+     'phased_lstm_cell/output_gate/kernel'),
+    ('phased_lstm_cell/output_gate/biases',
+     'phased_lstm_cell/output_gate/bias'),
+    # AttentionCellWrapper
+    ('attention_cell_wrapper/weights', 'attention_cell_wrapper/kernel'),
+    ('attention_cell_wrapper/biases', 'attention_cell_wrapper/bias'),
+    ('attention_cell_wrapper/attn_output_projection/weights',
+     'attention_cell_wrapper/attn_output_projection/kernel'),
+    ('attention_cell_wrapper/attn_output_projection/biases',
+     'attention_cell_wrapper/attn_output_projection/bias'),
+    ('attention_cell_wrapper/attention/weights',
+     'attention_cell_wrapper/attention/kernel'),
+    ('attention_cell_wrapper/attention/biases',
+     'attention_cell_wrapper/attention/bias'),
+])
+
+_RNN_SHARDED_NAME_REPLACEMENTS = collections.OrderedDict([
+    ('LSTMCell/W_', 'lstm_cell/weights/part_'),
+    ('BasicLSTMCell/Linear/Matrix_', 'basic_lstm_cell/weights/part_'),
+    ('GRUCell/W_', 'gru_cell/weights/part_'),
+    ('MultiRNNCell/Cell', 'multi_rnn_cell/cell_'),
+])
+
+
+def _rnn_name_replacement(var_name):
+  for pattern in _RNN_NAME_REPLACEMENTS:
+    if pattern in var_name:
+      old_var_name = var_name
+      var_name = var_name.replace(pattern, _RNN_NAME_REPLACEMENTS[pattern])
+      logging.info('Converted: %s --> %s' % (old_var_name, var_name))
+      break
+  return var_name
+
+
+def _rnn_name_replacement_sharded(var_name):
+  for pattern in _RNN_SHARDED_NAME_REPLACEMENTS:
+    if pattern in var_name:
+      old_var_name = var_name
+      var_name = var_name.replace(pattern,
+                                  _RNN_SHARDED_NAME_REPLACEMENTS[pattern])
+      logging.info('Converted: %s --> %s' % (old_var_name, var_name))
+  return var_name
+
+
+def _split_sharded_vars(name_shape_map):
+  """Split shareded variables.
+
+  Args:
+    name_shape_map: A dict from variable name to variable shape.
+
+  Returns:
+    not_sharded: Names of the non-sharded variables.
+    sharded: Names of the sharded varibales.
+  """
+  sharded = []
+  not_sharded = []
+  for name in name_shape_map:
+    if re.match(name, '_[0-9]+$'):
+      if re.sub('_[0-9]+$', '_1', name) in name_shape_map:
+        sharded.append(name)
+      else:
+        not_sharded.append(name)
+    else:
+      not_sharded.append(name)
+  return not_sharded, sharded
+
+
+def convert_names(checkpoint_from_path,
+                  checkpoint_to_path,
+                  write_v1_checkpoint=False):
+  """Migrates the names of variables within a checkpoint.
+
+  Args:
+    checkpoint_from_path: Path to source checkpoint to be read in.
+    checkpoint_to_path: Path to checkpoint to be written out.
+    write_v1_checkpoint: Whether the output checkpoint will be in V1 format.
+
+  Returns:
+    A dictionary that maps the new variable names to the Variable objects.
+    A dictionary that maps the old variable names to the new variable names.
+  """
+  with ops.Graph().as_default():
+    logging.info('Reading checkpoint_from_path %s' % checkpoint_from_path)
+    reader = pywrap_tensorflow.NewCheckpointReader(checkpoint_from_path)
+    name_shape_map = reader.get_variable_to_shape_map()
+    not_sharded, sharded = _split_sharded_vars(name_shape_map)
+    new_variable_map = {}
+    conversion_map = {}
+    for var_name in not_sharded:
+      new_var_name = _rnn_name_replacement(var_name)
+      tensor = reader.get_tensor(var_name)
+      var = variables.Variable(tensor, name=var_name)
+      new_variable_map[new_var_name] = var
+      if new_var_name != var_name:
+        conversion_map[var_name] = new_var_name
+    for var_name in sharded:
+      new_var_name = _rnn_name_replacement_sharded(var_name)
+      var = variables.Variable(tensor, name=var_name)
+      new_variable_map[new_var_name] = var
+      if new_var_name != var_name:
+        conversion_map[var_name] = new_var_name
+
+    write_version = (saver_pb2.SaverDef.V1
+                     if write_v1_checkpoint else saver_pb2.SaverDef.V2)
+    saver = saver_lib.Saver(new_variable_map, write_version=write_version)
+
+    with session.Session() as sess:
+      sess.run(variables.global_variables_initializer())
+      logging.info('Writing checkpoint_to_path %s' % checkpoint_to_path)
+      saver.save(sess, checkpoint_to_path)
+
+  logging.info('Summary:')
+  logging.info('  Converted %d variable name(s).' % len(new_variable_map))
+  return new_variable_map, conversion_map
+
+
+def main(_):
+  convert_names(
+      FLAGS.checkpoint_from_path,
+      FLAGS.checkpoint_to_path,
+      write_v1_checkpoint=FLAGS.write_v1_checkpoint)
+
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.register('type', 'bool', lambda v: v.lower() == 'true')
+  parser.add_argument('checkpoint_from_path', type=str,
+                      help='Path to source checkpoint to be read in.')
+  parser.add_argument('checkpoint_to_path', type=str,
+                      help='Path to checkpoint to be written out.')
+  parser.add_argument('--write_v1_checkpoint', action='store_true',
+                      help='Write v1 checkpoint')
+  FLAGS, unparsed = parser.parse_known_args()
+
+  app.run(main=main, argv=[sys.argv[0]] + unparsed)
diff --git a/tensorflow/contrib/rnn/python/tools/checkpoint_convert_test.py b/tensorflow/contrib/rnn/python/tools/checkpoint_convert_test.py
new file mode 100644
index 0000000000..e2fc2fa80e
--- /dev/null
+++ b/tensorflow/contrib/rnn/python/tools/checkpoint_convert_test.py
@@ -0,0 +1,108 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Unit tests for checkpoint converter."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import glob
+import os
+import tempfile
+
+from tensorflow.contrib.rnn.python.tools import checkpoint_convert
+from tensorflow.python.client import session
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+from tensorflow.python.training import saver as saver_lib
+
+
+class CheckpointConvertTest(test.TestCase):
+
+  def setUp(self):
+    self._old_ckpt_path = tempfile.mktemp()
+    self._new_ckpt_path = tempfile.mktemp()
+    ops.reset_default_graph()
+
+  def tearDown(self):
+    for file_name in glob.glob(self._old_ckpt_path + "*"):
+      os.remove(file_name)
+    for file_name in glob.glob(self._new_ckpt_path + "*"):
+      os.remove(file_name)
+
+  def testReplacementDictsContainUniqueAndNonEmptyVariableNames(self):
+    for old_name in checkpoint_convert._RNN_NAME_REPLACEMENTS:
+      new_name = checkpoint_convert._RNN_NAME_REPLACEMENTS[old_name]
+      self.assertTrue(old_name)
+      self.assertTrue(new_name)
+      self.assertNotEqual(old_name, new_name)
+    for old_name in checkpoint_convert._RNN_SHARDED_NAME_REPLACEMENTS:
+      new_name = checkpoint_convert._RNN_SHARDED_NAME_REPLACEMENTS[old_name]
+      self.assertTrue(old_name)
+      self.assertTrue(new_name)
+      self.assertNotEqual(old_name, new_name)
+
+  def testConversionFromV2WithConvertedVariableNamesSucceeds(self):
+    variables.Variable(10.0, name="a")
+    for old_name in checkpoint_convert._RNN_NAME_REPLACEMENTS:
+      variables.Variable(20.0, name=old_name)
+    with session.Session() as sess:
+      saver = saver_lib.Saver()
+      sess.run(variables.global_variables_initializer())
+      saver.save(sess, self._old_ckpt_path)
+
+    new_var_map, conversion_map = checkpoint_convert.convert_names(
+        self._old_ckpt_path, self._new_ckpt_path)
+    self.assertTrue(glob.glob(self._new_ckpt_path + "*"))
+    self.assertItemsEqual(
+        ["a"] + list(checkpoint_convert._RNN_NAME_REPLACEMENTS.values()),
+        new_var_map.keys())
+    self.assertEqual(checkpoint_convert._RNN_NAME_REPLACEMENTS, conversion_map)
+
+  def testConversionFromV2WithoutConvertedVariableNamesSucceeds(self):
+    variables.Variable(10.0, name="a")
+    with session.Session() as sess:
+      saver = saver_lib.Saver()
+      sess.run(variables.global_variables_initializer())
+      saver.save(sess, self._old_ckpt_path)
+
+    new_var_map, conversion_map = checkpoint_convert.convert_names(
+        self._old_ckpt_path, self._new_ckpt_path)
+    self.assertItemsEqual(["a"], new_var_map.keys())
+    self.assertFalse(conversion_map)
+
+  def testConversionToV1Succeeds(self):
+    variables.Variable(10.0, name="a")
+    variables.Variable(
+        20.0, name=list(checkpoint_convert._RNN_NAME_REPLACEMENTS.keys())[-1])
+
+    with session.Session() as sess:
+      saver = saver_lib.Saver()
+      sess.run(variables.global_variables_initializer())
+      saver.save(sess, self._old_ckpt_path)
+
+    new_var_map, conversion_map = checkpoint_convert.convert_names(
+        self._old_ckpt_path, self._new_ckpt_path, write_v1_checkpoint=True)
+    self.assertItemsEqual(
+        ["a", list(checkpoint_convert._RNN_NAME_REPLACEMENTS.values())[-1]],
+        new_var_map.keys())
+    self.assertEqual(
+        {list(checkpoint_convert._RNN_NAME_REPLACEMENTS.keys())[-1]:
+         list(checkpoint_convert._RNN_NAME_REPLACEMENTS.values())[-1]},
+        conversion_map)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py
index 4bb5c1b73c..459d6ee328 100644
--- a/tensorflow/tools/pip_package/pip_smoke_test.py
+++ b/tensorflow/tools/pip_package/pip_smoke_test.py
@@ -57,7 +57,7 @@ BLACKLIST = [
     "//tensorflow/contrib/factorization/examples:mnist.py",
     "//tensorflow/contrib/factorization:factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",  # pylint:disable=line-too-long
     "//tensorflow/contrib/bayesflow:reinforce_simple_example",
-    "//tensorflow/contrib/bayesflow:examples/reinforce_simple/reinforce_simple_example.py"  # pylint:disable=line-too-long
+    "//tensorflow/contrib/bayesflow:examples/reinforce_simple/reinforce_simple_example.py",  # pylint:disable=line-too-long
 ]
 
 
-- 
GitLab


From efa08d80a53a95ce6b8beb61ec86a275aed6b6c7 Mon Sep 17 00:00:00 2001
From: Andrew Harp <andrewharp@google.com>
Date: Thu, 4 May 2017 19:30:36 -0800
Subject: [PATCH 1030/1563] Android demo: Allow DetectorActivity to gracefully
 degrade if no native ObjectTracker support is found. If libtensorflow_demo.so
 is not found in the APK, rendered boxes will simply be stationary and will be
 replaced whenever new results come in.

Partially addresses #6385
Change: 155159326
---
 .../org/tensorflow/demo/DetectorActivity.java |  2 +-
 .../demo/tracking/MultiBoxTracker.java        | 54 +++++++++++++++----
 .../demo/tracking/ObjectTracker.java          | 26 ++++++---
 3 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java
index cdb6c3fed8..5800f80651 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java
@@ -124,7 +124,7 @@ public class DetectorActivity extends CameraActivity implements OnImageAvailable
     borderedText = new BorderedText(textSizePx);
     borderedText.setTypeface(Typeface.MONOSPACE);
 
-    tracker = new MultiBoxTracker(getResources().getDisplayMetrics());
+    tracker = new MultiBoxTracker(this);
 
     if (USE_YOLO) {
       detector =
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java b/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java
index 49c91d600d..91d1f9feb1 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/tracking/MultiBoxTracker.java
@@ -15,6 +15,7 @@ limitations under the License.
 
 package org.tensorflow.demo.tracking;
 
+import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
@@ -24,9 +25,9 @@ import android.graphics.Paint.Join;
 import android.graphics.Paint.Style;
 import android.graphics.RectF;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.util.Pair;
 import android.util.TypedValue;
+import android.widget.Toast;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
@@ -69,6 +70,7 @@ public class MultiBoxTracker {
 
   private static class TrackedRecognition {
     ObjectTracker.TrackedObject trackedObject;
+    RectF location;
     float detectionConfidence;
     int color;
     String title;
@@ -87,8 +89,10 @@ public class MultiBoxTracker {
   private int frameHeight;
 
   private int sensorOrientation;
+  private Context context;
 
-  public MultiBoxTracker(final DisplayMetrics metrics) {
+  public MultiBoxTracker(final Context context) {
+    this.context = context;
     for (final int color : COLORS) {
       availableColors.add(color);
     }
@@ -100,7 +104,9 @@ public class MultiBoxTracker {
     boxPaint.setStrokeJoin(Join.ROUND);
     boxPaint.setStrokeMiter(100);
 
-    textSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, TEXT_SIZE_DIP, metrics);
+    textSizePx =
+        TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP, TEXT_SIZE_DIP, context.getResources().getDisplayMetrics());
     borderedText = new BorderedText(textSizePx);
   }
 
@@ -152,10 +158,6 @@ public class MultiBoxTracker {
   }
 
   public synchronized void draw(final Canvas canvas) {
-    if (objectTracker == null) {
-      return;
-    }
-
     // TODO(andrewharp): This may not work for non-90 deg rotations.
     final float multiplier =
         Math.min(canvas.getWidth() / (float) frameHeight, canvas.getHeight() / (float) frameWidth);
@@ -168,9 +170,11 @@ public class MultiBoxTracker {
             sensorOrientation,
             false);
     for (final TrackedRecognition recognition : trackedObjects) {
-      final ObjectTracker.TrackedObject trackedObject = recognition.trackedObject;
+      final RectF trackedPos =
+          (objectTracker != null)
+              ? recognition.trackedObject.getTrackedPositionInPreviewFrame()
+              : new RectF(recognition.location);
 
-      final RectF trackedPos = trackedObject.getTrackedPositionInPreviewFrame();
       getFrameToCanvasMatrix().mapRect(trackedPos);
       boxPaint.setColor(recognition.color);
 
@@ -185,6 +189,8 @@ public class MultiBoxTracker {
     }
   }
 
+  private boolean initialized = false;
+
   public synchronized void onFrame(
       final int w,
       final int h,
@@ -192,7 +198,7 @@ public class MultiBoxTracker {
       final int sensorOrienation,
       final byte[] frame,
       final long timestamp) {
-    if (objectTracker == null) {
+    if (objectTracker == null && !initialized) {
       ObjectTracker.clearInstance();
 
       logger.i("Initializing ObjectTracker: %dx%d", w, h);
@@ -200,6 +206,19 @@ public class MultiBoxTracker {
       frameWidth = w;
       frameHeight = h;
       this.sensorOrientation = sensorOrienation;
+      initialized = true;
+
+      if (objectTracker == null) {
+        String message =
+            "Object tracking support not found. "
+                + "See tensorflow/examples/android/README.md for details.";
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+        logger.e(message);
+      }
+    }
+
+    if (objectTracker == null) {
+      return;
     }
 
     objectTracker.nextFrame(frame, null, timestamp, null, true);
@@ -255,7 +274,20 @@ public class MultiBoxTracker {
     }
 
     if (objectTracker == null) {
-      logger.w("No ObjectTracker, can't track anything!");
+      trackedObjects.clear();
+      for (final Pair<Float, Recognition> potential : rectsToTrack) {
+        final TrackedRecognition trackedRecognition = new TrackedRecognition();
+        trackedRecognition.detectionConfidence = potential.first;
+        trackedRecognition.location = new RectF(potential.second.getLocation());
+        trackedRecognition.trackedObject = null;
+        trackedRecognition.title = potential.second.getTitle();
+        trackedRecognition.color = COLORS[trackedObjects.size()];
+        trackedObjects.add(trackedRecognition);
+
+        if (trackedObjects.size() >= COLORS.length) {
+          break;
+        }
+      }
       return;
     }
 
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/tracking/ObjectTracker.java b/tensorflow/examples/android/src/org/tensorflow/demo/tracking/ObjectTracker.java
index 82de634baf..69f202b568 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/tracking/ObjectTracker.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/tracking/ObjectTracker.java
@@ -48,7 +48,18 @@ import org.tensorflow.demo.env.Size;
  * ObjectTracker still exists.
  */
 public class ObjectTracker {
-  private final Logger logger = new Logger();
+  private static final Logger LOGGER = new Logger();
+
+  private static boolean libraryFound = false;
+
+  static {
+    try {
+      System.loadLibrary("tensorflow_demo");
+      libraryFound = true;
+    } catch (UnsatisfiedLinkError e) {
+      LOGGER.e("libtensorflow_demo.so not found, tracking unavailable");
+    }
+  }
 
   private static final boolean DRAW_TEXT = false;
 
@@ -194,6 +205,13 @@ public class ObjectTracker {
 
   public static synchronized ObjectTracker getInstance(
       final int frameWidth, final int frameHeight, final int rowStride, final boolean alwaysTrack) {
+    if (!libraryFound) {
+      LOGGER.e(
+          "Native object tracking support not found. "
+              + "See tensorflow/examples/android/README.md for details.");
+      return null;
+    }
+
     if (instance == null) {
       instance = new ObjectTracker(frameWidth, frameHeight, rowStride, alwaysTrack);
       instance.init();
@@ -519,7 +537,7 @@ public class ObjectTracker {
       checkValidObject();
       synchronized (ObjectTracker.this) {
         if (lastExternalPositionTime > timestamp) {
-          logger.w("Tried to use older position time!");
+          LOGGER.w("Tried to use older position time!");
           return;
         }
         final RectF externalPosition = downscaleRect(position);
@@ -640,8 +658,4 @@ public class ObjectTracker {
 
   protected static native void downsampleImageNative(
       int width, int height, int rowStride, byte[] input, int factor, byte[] output);
-
-  static {
-    System.loadLibrary("tensorflow_demo");
-  }
 }
-- 
GitLab


From f28935a7d280b6ba75fe93fe35783d87b9cc2ec9 Mon Sep 17 00:00:00 2001
From: Brennan Saeta <saeta@google.com>
Date: Thu, 4 May 2017 19:43:48 -0800
Subject: [PATCH 1031/1563] Implement ClusterSpec Propagation in TF Master

ClusterSpec propagation is a capability upgrade for TensorFlow that should make
it much easier to (1) build distributed TensorFlow clusters, and (2) handle
node failures. The ClusterSpec propagation capability allows TensorFlow workers
to be booted independently of each other, and with no knowledge about others.
The client can then construct a ClusterDef (ClusterSpec), and then send it
to the TF master at session creation. The master in turn then propagates the
ClusterDef along to all of the workers.
Change: 155159972
---
 tensorflow/compiler/jit/xla_device.cc         |   2 +-
 .../compiler/tf2xla/xla_compilation_device.cc |   3 +-
 .../contrib/cmake/tf_core_framework.cmake     |   1 +
 .../makefile/proto_text_pb_cc_files.txt       |   1 +
 .../makefile/proto_text_pb_h_files.txt        |   1 +
 .../contrib/makefile/tf_pb_text_files.txt     |   1 +
 .../contrib/makefile/tf_proto_files.txt       |   1 +
 tensorflow/core/BUILD                         |   1 +
 tensorflow/core/common_runtime/device.cc      |   3 +-
 tensorflow/core/common_runtime/device.h       |   3 +-
 tensorflow/core/common_runtime/device_mgr.cc  |  19 +-
 tensorflow/core/common_runtime/device_mgr.h   |   2 +
 tensorflow/core/common_runtime/device_set.h   |   5 +-
 .../core/common_runtime/device_set_test.cc    |   3 +-
 .../core/common_runtime/gpu/gpu_device.cc     |   7 +-
 .../core/common_runtime/local_device.cc       |   6 +-
 tensorflow/core/common_runtime/local_device.h |   4 +-
 .../core/common_runtime/renamed_device.cc     |  54 ++++
 .../core/common_runtime/renamed_device.h      | 119 ++++++++
 .../core/common_runtime/simple_placer_test.cc |   2 +-
 .../core/common_runtime/threadpool_device.cc  |   6 +-
 tensorflow/core/distributed_runtime/BUILD     |   4 +-
 .../base_rendezvous_mgr.cc                    | 102 +++++--
 .../distributed_runtime/base_rendezvous_mgr.h |  43 ++-
 .../core/distributed_runtime/graph_mgr.cc     |  37 +--
 .../core/distributed_runtime/graph_mgr.h      |  11 +-
 tensorflow/core/distributed_runtime/master.cc | 121 +++++++-
 .../core/distributed_runtime/master_env.h     |  34 ++-
 .../distributed_runtime/master_session.cc     | 151 ++++++++--
 .../core/distributed_runtime/master_session.h |  21 +-
 .../distributed_runtime/message_wrappers.cc   |  21 ++
 .../distributed_runtime/message_wrappers.h    |  11 +
 .../core/distributed_runtime/remote_device.cc |  49 +++-
 .../rendezvous_mgr_interface.h                |  22 +-
 .../rpc/grpc_server_lib.cc                    |  83 +++---
 .../distributed_runtime/rpc/grpc_server_lib.h |  15 +-
 .../distributed_runtime/rpc/grpc_session.cc   |   7 +-
 .../rpc/grpc_worker_service.cc                |  14 +-
 .../rpc/rpc_rendezvous_mgr.cc                 | 100 ++-----
 .../rpc/rpc_rendezvous_mgr.h                  |  13 +-
 .../rpc/rpc_rendezvous_mgr_test.cc            |  19 +-
 .../core/distributed_runtime/session_mgr.cc   | 108 ++-----
 .../core/distributed_runtime/session_mgr.h    |  44 ++-
 .../distributed_runtime/session_mgr_test.cc   |  81 +-----
 tensorflow/core/distributed_runtime/worker.cc |  32 +--
 .../core/distributed_runtime/worker_env.h     |  11 +
 .../distributed_runtime/worker_interface.h    |   5 +
 .../distributed_runtime/worker_session.cc     |  84 +++++-
 .../core/distributed_runtime/worker_session.h |  12 +-
 tensorflow/core/framework/device_base.h       |   8 +-
 tensorflow/core/protobuf/cluster.proto        |  82 ++++++
 tensorflow/core/protobuf/config.proto         |   6 +
 tensorflow/core/protobuf/master.proto         |   3 +
 .../core/protobuf/tensorflow_server.proto     |  64 +----
 tensorflow/core/protobuf/worker.proto         |  12 +
 tensorflow/python/__init__.py                 |   2 +
 tensorflow/python/client/session_test.py      | 267 +++++++++++++++++-
 tensorflow/python/training/server_lib.py      |   7 +-
 tensorflow/python/training/training.py        |  30 +-
 .../api/golden/tensorflow.-config-proto.pbtxt |   4 +
 .../tensorflow.train.-cluster-def.pbtxt       |   2 +-
 ...nsorflow.train.-job-def.-tasks-entry.pbtxt |   2 +-
 .../golden/tensorflow.train.-job-def.pbtxt    |   2 +-
 63 files changed, 1396 insertions(+), 594 deletions(-)
 create mode 100644 tensorflow/core/common_runtime/renamed_device.cc
 create mode 100644 tensorflow/core/common_runtime/renamed_device.h
 create mode 100644 tensorflow/core/protobuf/cluster.proto

diff --git a/tensorflow/compiler/jit/xla_device.cc b/tensorflow/compiler/jit/xla_device.cc
index 93f487c36c..5e336c5287 100644
--- a/tensorflow/compiler/jit/xla_device.cc
+++ b/tensorflow/compiler/jit/xla_device.cc
@@ -125,7 +125,7 @@ XlaDevice::XlaDevice(const SessionOptions& options,
                      const DeviceType& jit_device_name,
                      perftools::gputools::Platform* platform,
                      Allocator* xla_allocator)
-    : LocalDevice(options, attrs, xla_allocator),
+    : LocalDevice(options, attrs),
       device_ordinal_(device_ordinal),
       jit_device_name_(jit_device_name),
       xla_allocator_(xla_allocator),
diff --git a/tensorflow/compiler/tf2xla/xla_compilation_device.cc b/tensorflow/compiler/tf2xla/xla_compilation_device.cc
index d86e741b69..362a101895 100644
--- a/tensorflow/compiler/tf2xla/xla_compilation_device.cc
+++ b/tensorflow/compiler/tf2xla/xla_compilation_device.cc
@@ -76,8 +76,7 @@ XlaCompilationDevice::XlaCompilationDevice(const SessionOptions& options,
           options,
           Device::BuildDeviceAttributes(
               "", type, Bytes(256 << 20), DeviceLocality(),
-              strings::StrCat("device: XLA compilation device ", type.type())),
-          cpu_allocator()),
+              strings::StrCat("device: XLA compilation device ", type.type()))),
       allocator_(new XlaCompilationAllocator()) {}
 
 XlaCompilationDevice::~XlaCompilationDevice() {}
diff --git a/tensorflow/contrib/cmake/tf_core_framework.cmake b/tensorflow/contrib/cmake/tf_core_framework.cmake
index 6fd1ae0814..560e45fc13 100644
--- a/tensorflow/contrib/cmake/tf_core_framework.cmake
+++ b/tensorflow/contrib/cmake/tf_core_framework.cmake
@@ -118,6 +118,7 @@ set(tf_proto_text_srcs
     "tensorflow/core/framework/types.proto"
     "tensorflow/core/framework/versions.proto"
     "tensorflow/core/lib/core/error_codes.proto"
+    "tensorflow/core/protobuf/cluster.proto"
     "tensorflow/core/protobuf/config.proto"
     "tensorflow/core/protobuf/debug.proto"
     "tensorflow/core/protobuf/rewriter_config.proto"
diff --git a/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt b/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt
index c0969e6dee..2f1fcb149e 100644
--- a/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt
+++ b/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt
@@ -7,6 +7,7 @@ tensorflow/core/protobuf/saver.pb.cc
 tensorflow/core/protobuf/queue_runner.pb.cc
 tensorflow/core/protobuf/named_tensor.pb.cc
 tensorflow/core/protobuf/meta_graph.pb.cc
+tensorflow/core/protobuf/cluster.pb.cc
 tensorflow/core/protobuf/config.pb.cc
 tensorflow/core/protobuf/rewriter_config.pb.cc
 tensorflow/core/protobuf/debug.pb.cc
diff --git a/tensorflow/contrib/makefile/proto_text_pb_h_files.txt b/tensorflow/contrib/makefile/proto_text_pb_h_files.txt
index 132b477596..6087a45168 100644
--- a/tensorflow/contrib/makefile/proto_text_pb_h_files.txt
+++ b/tensorflow/contrib/makefile/proto_text_pb_h_files.txt
@@ -7,6 +7,7 @@ tensorflow/core/protobuf/saver.pb.h
 tensorflow/core/protobuf/queue_runner.pb.h
 tensorflow/core/protobuf/named_tensor.pb.h
 tensorflow/core/protobuf/meta_graph.pb.h
+tensorflow/core/protobuf/cluster.pb.h
 tensorflow/core/protobuf/config.pb.h
 tensorflow/core/protobuf/debug.pb.h
 tensorflow/core/protobuf/rewriter_config.pb.h
diff --git a/tensorflow/contrib/makefile/tf_pb_text_files.txt b/tensorflow/contrib/makefile/tf_pb_text_files.txt
index f1da05e4c6..c39257ffa9 100644
--- a/tensorflow/contrib/makefile/tf_pb_text_files.txt
+++ b/tensorflow/contrib/makefile/tf_pb_text_files.txt
@@ -1,6 +1,7 @@
 tensorflow/core/util/saved_tensor_slice.pb_text.cc
 tensorflow/core/util/memmapped_file_system.pb_text.cc
 tensorflow/core/protobuf/saver.pb_text.cc
+tensorflow/core/protobuf/cluster.pb_text.cc
 tensorflow/core/protobuf/config.pb_text.cc
 tensorflow/core/protobuf/debug.pb_text.cc
 tensorflow/core/protobuf/rewriter_config.pb_text.cc
diff --git a/tensorflow/contrib/makefile/tf_proto_files.txt b/tensorflow/contrib/makefile/tf_proto_files.txt
index 2a78ea6101..5eadf5d55b 100644
--- a/tensorflow/contrib/makefile/tf_proto_files.txt
+++ b/tensorflow/contrib/makefile/tf_proto_files.txt
@@ -7,6 +7,7 @@ tensorflow/core/protobuf/saver.proto
 tensorflow/core/protobuf/queue_runner.proto
 tensorflow/core/protobuf/named_tensor.proto
 tensorflow/core/protobuf/meta_graph.proto
+tensorflow/core/protobuf/cluster.proto
 tensorflow/core/protobuf/config.proto
 tensorflow/core/protobuf/debug.proto
 tensorflow/core/protobuf/rewriter_config.proto
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 435618ace7..9d0c6a6c3e 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -154,6 +154,7 @@ CORE_PROTO_SRCS = [
     "framework/versions.proto",
     "lib/core/error_codes.proto",
     "protobuf/config.proto",
+    "protobuf/cluster.proto",
     "protobuf/debug.proto",
     "protobuf/queue_runner.proto",
     "protobuf/rewriter_config.proto",
diff --git a/tensorflow/core/common_runtime/device.cc b/tensorflow/core/common_runtime/device.cc
index 78649afeb9..aa8a2d989b 100644
--- a/tensorflow/core/common_runtime/device.cc
+++ b/tensorflow/core/common_runtime/device.cc
@@ -23,8 +23,7 @@ limitations under the License.
 
 namespace tensorflow {
 
-Device::Device(Env* env, const DeviceAttributes& device_attributes,
-               Allocator* device_allocator)
+Device::Device(Env* env, const DeviceAttributes& device_attributes)
     : DeviceBase(env), device_attributes_(device_attributes) {
   CHECK(DeviceNameUtils::ParseFullName(name(), &parsed_name_))
       << "Invalid device name: " << name();
diff --git a/tensorflow/core/common_runtime/device.h b/tensorflow/core/common_runtime/device.h
index 07c6bdd683..c0e58f143e 100644
--- a/tensorflow/core/common_runtime/device.h
+++ b/tensorflow/core/common_runtime/device.h
@@ -53,8 +53,7 @@ namespace tensorflow {
 
 class Device : public DeviceBase {
  public:
-  Device(Env* env, const DeviceAttributes& device_attributes,
-         Allocator* device_allocator);
+  Device(Env* env, const DeviceAttributes& device_attributes);
   ~Device() override;
 
   // Full name of this device (see top comment).
diff --git a/tensorflow/core/common_runtime/device_mgr.cc b/tensorflow/core/common_runtime/device_mgr.cc
index 7807656cb2..31f12d4833 100644
--- a/tensorflow/core/common_runtime/device_mgr.cc
+++ b/tensorflow/core/common_runtime/device_mgr.cc
@@ -29,10 +29,18 @@ DeviceMgr::DeviceMgr(const std::vector<Device*>& devices)
   for (Device* d : devices) {
     devices_.push_back(d);
 
-    // Register under both the full name and the local name.
+    // Register under the (1) full name, (2) canonical name, and (3) local name.
     string full_name = d->name();
     device_map_[CopyToBackingStore(full_name)] = d;
 
+    DeviceNameUtils::ParsedName parsed_name = d->parsed_name();
+    if (parsed_name.has_job && parsed_name.has_replica &&
+        parsed_name.has_task && parsed_name.has_type && parsed_name.has_id) {
+      string canonical_name = DeviceNameUtils::FullName(
+          parsed_name.job, parsed_name.replica, parsed_name.task,
+          parsed_name.type, parsed_name.id);
+      device_map_[CopyToBackingStore(canonical_name)] = d;
+    }
     string lname = DeviceNameUtils::LocalName(d->name());
     device_map_[CopyToBackingStore(lname)] = d;
     device_type_counts_[d->device_type()]++;
@@ -40,7 +48,8 @@ DeviceMgr::DeviceMgr(const std::vector<Device*>& devices)
 }
 
 DeviceMgr::~DeviceMgr() {
-  for (auto p : devices_) delete p;
+  // TODO(b/37437134): Remove destructor after converting to std::unique_ptr.
+  for (Device* p : devices_) delete p;
 }
 
 StringPiece DeviceMgr::CopyToBackingStore(StringPiece s) {
@@ -85,6 +94,12 @@ Status DeviceMgr::LookupDevice(StringPiece name, Device** device) const {
   Status s;
   auto iter = device_map_.find(name);
   if (iter == device_map_.end()) {
+    std::vector<StringPiece> device_names;
+    for (auto&& itr : device_map_) {
+      device_names.push_back(itr.first);
+    }
+    LOG(WARNING) << "Unknown device: " << name
+                 << " all devices: " << str_util::Join(device_names, ", ");
     return errors::InvalidArgument(name, " unknown device.");
   }
   *device = iter->second;
diff --git a/tensorflow/core/common_runtime/device_mgr.h b/tensorflow/core/common_runtime/device_mgr.h
index bb1ed72640..d16681ac59 100644
--- a/tensorflow/core/common_runtime/device_mgr.h
+++ b/tensorflow/core/common_runtime/device_mgr.h
@@ -36,6 +36,7 @@ class DeviceMgr {
  public:
   // Takes ownership of each device in 'devices'.
   // TODO(zhifengc): Other initialization information.
+  // TODO(b/37437134): Use std::unique_ptr's to track ownership.
   explicit DeviceMgr(const std::vector<Device*>& devices);
   ~DeviceMgr();
 
@@ -61,6 +62,7 @@ class DeviceMgr {
   int NumDeviceType(const string& type) const;
 
  private:
+  // TODO(b/37437134): Use std::unique_ptr's to track ownership.
   typedef gtl::InlinedVector<Device*, 8> DeviceVec;
   DeviceVec devices_;
 
diff --git a/tensorflow/core/common_runtime/device_set.h b/tensorflow/core/common_runtime/device_set.h
index b0540dfa95..4cd56e583c 100644
--- a/tensorflow/core/common_runtime/device_set.h
+++ b/tensorflow/core/common_runtime/device_set.h
@@ -39,7 +39,10 @@ class DeviceSet {
 
   // Set the device designated as the "client".  This device
   // must also be registered via AddDevice().
-  void set_client_device(Device* device) { client_device_ = device; }
+  void set_client_device(Device* device) {
+    DCHECK(client_device_ == nullptr);
+    client_device_ = device;
+  }
 
   // Returns a pointer to the device designated as the "client".
   Device* client_device() const { return client_device_; }
diff --git a/tensorflow/core/common_runtime/device_set_test.cc b/tensorflow/core/common_runtime/device_set_test.cc
index ff20ee94a7..0507076c8c 100644
--- a/tensorflow/core/common_runtime/device_set_test.cc
+++ b/tensorflow/core/common_runtime/device_set_test.cc
@@ -27,8 +27,7 @@ namespace {
 static Device* Dev(const char* type, const char* name) {
   class FakeDevice : public Device {
    public:
-    explicit FakeDevice(const DeviceAttributes& attr)
-        : Device(nullptr, attr, nullptr) {}
+    explicit FakeDevice(const DeviceAttributes& attr) : Device(nullptr, attr) {}
     Status Sync() override { return Status::OK(); }
     Allocator* GetAllocator(AllocatorAttributes) override { return nullptr; }
   };
diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index 0e2343cfe3..02f70d835d 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -179,10 +179,9 @@ BaseGPUDevice::BaseGPUDevice(const SessionOptions& options, const string& name,
                              int gpu_id, const string& physical_device_desc,
                              Allocator* gpu_allocator, Allocator* cpu_allocator,
                              bool sync_every_op, int32 max_streams)
-    : LocalDevice(options,
-                  Device::BuildDeviceAttributes(name, DEVICE_GPU, memory_limit,
-                                                locality, physical_device_desc),
-                  gpu_allocator),
+    : LocalDevice(options, Device::BuildDeviceAttributes(name, DEVICE_GPU,
+                                                         memory_limit, locality,
+                                                         physical_device_desc)),
       gpu_allocator_(gpu_allocator),
       cpu_allocator_(cpu_allocator),
       gpu_id_(gpu_id),
diff --git a/tensorflow/core/common_runtime/local_device.cc b/tensorflow/core/common_runtime/local_device.cc
index 0a6342ed73..3f7c9f68db 100644
--- a/tensorflow/core/common_runtime/local_device.cc
+++ b/tensorflow/core/common_runtime/local_device.cc
@@ -60,10 +60,8 @@ struct LocalDevice::EigenThreadPoolInfo {
 };
 
 LocalDevice::LocalDevice(const SessionOptions& options,
-                         const DeviceAttributes& attributes,
-                         Allocator* device_allocator)
-    : Device(options.env, attributes, device_allocator),
-      owned_tp_info_(nullptr) {
+                         const DeviceAttributes& attributes)
+    : Device(options.env, attributes), owned_tp_info_(nullptr) {
   // If we're running on the CPU, log warnings if we're not compiled using the
   // best flags for performance.
   port::WarnAboutUnusedCPUFeatures();
diff --git a/tensorflow/core/common_runtime/local_device.h b/tensorflow/core/common_runtime/local_device.h
index d1c27c6248..84a4f66db4 100644
--- a/tensorflow/core/common_runtime/local_device.h
+++ b/tensorflow/core/common_runtime/local_device.h
@@ -33,8 +33,8 @@ struct SessionOptions;
 // GPUDevice into more 'process-wide' abstractions.
 class LocalDevice : public Device {
  public:
-  LocalDevice(const SessionOptions& options, const DeviceAttributes& attributes,
-              Allocator* device_allocator);
+  LocalDevice(const SessionOptions& options,
+              const DeviceAttributes& attributes);
   ~LocalDevice() override;
 
  private:
diff --git a/tensorflow/core/common_runtime/renamed_device.cc b/tensorflow/core/common_runtime/renamed_device.cc
new file mode 100644
index 0000000000..fa9713735e
--- /dev/null
+++ b/tensorflow/core/common_runtime/renamed_device.cc
@@ -0,0 +1,54 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/common_runtime/renamed_device.h"
+
+namespace tensorflow {
+
+// TODO(saeta): Convert to returning a std::unique_ptr?
+/* static */
+Device* RenamedDevice::NewRenamedDevice(const string& new_base,
+                                        Device* underlying,
+                                        bool owns_underlying) {
+  DeviceNameUtils::ParsedName parsed_name;
+  CHECK(DeviceNameUtils::ParseFullName(new_base, &parsed_name));
+  DeviceNameUtils::ParsedName underlying_parsed_name =
+      underlying->parsed_name();
+  CHECK(underlying_parsed_name.has_type);
+  CHECK(underlying_parsed_name.has_id);
+  parsed_name.type = underlying_parsed_name.type;
+  parsed_name.id = underlying_parsed_name.id;
+  string name = DeviceNameUtils::FullName(parsed_name.job, parsed_name.replica,
+                                          parsed_name.task, parsed_name.type,
+                                          parsed_name.id);
+  DeviceAttributes attributes(underlying->attributes());
+  attributes.set_name(name);
+  return new RenamedDevice(underlying, attributes, owns_underlying);
+}
+
+RenamedDevice::RenamedDevice(Device* underlying,
+                             const DeviceAttributes& attributes,
+                             bool owns_underlying)
+    : Device(underlying->env(), attributes),
+      underlying_(underlying),
+      owns_underlying_(owns_underlying) {}
+
+RenamedDevice::~RenamedDevice() {
+  if (owns_underlying_) {
+    delete underlying_;
+  }
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/common_runtime/renamed_device.h b/tensorflow/core/common_runtime/renamed_device.h
new file mode 100644
index 0000000000..0158e18ced
--- /dev/null
+++ b/tensorflow/core/common_runtime/renamed_device.h
@@ -0,0 +1,119 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_COMMON_RUNTIME_RENAMED_DEVICE_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_COMMON_RUNTIME_RENAMED_DEVICE_H_
+
+#include "tensorflow/core/common_runtime/device.h"
+#include "tensorflow/core/util/device_name_utils.h"
+
+namespace tensorflow {
+
+// Wraps a device with a new name, delegating work to the wrapped device.
+//
+// This class is used to wrap local devices when using clusterspec propagation
+// where the name of a particular device may change in the context of a given
+// session.
+class RenamedDevice : public Device {
+ public:
+  static Device* NewRenamedDevice(const string& new_base, Device* underlying,
+                                  bool owns_underlying);
+  ~RenamedDevice() override;
+
+  // Below are virtual methods defined on DeviceBase
+  bool RequiresRecordingAccessedTensors() const override {
+    return underlying_->RequiresRecordingAccessedTensors();
+  }
+
+  const CpuWorkerThreads* tensorflow_cpu_worker_threads() const override {
+    return underlying_->tensorflow_cpu_worker_threads();
+  }
+
+  const GpuDeviceInfo* tensorflow_gpu_device_info() const override {
+    return underlying_->tensorflow_gpu_device_info();
+  }
+
+  Allocator* GetAllocator(AllocatorAttributes attr) override {
+    return underlying_->GetAllocator(attr);
+  }
+
+  Allocator* GetStepAllocator(AllocatorAttributes attr,
+                              ResourceMgr* step_resource_manager) override {
+    return underlying_->GetStepAllocator(attr, step_resource_manager);
+  }
+
+  const Eigen::ThreadPoolDevice* eigen_cpu_device() override {
+    return underlying_->eigen_cpu_device();
+  }
+
+#ifdef TENSORFLOW_USE_SYCL
+  const Eigen::SyclDevice* eigen_sycl_device() const override {
+    return underlying_->eigen_sycl_device();
+  }
+#endif
+
+  PerOpGpuDevice* MakeGpuDevice() override {
+    return underlying_->MakeGpuDevice();
+  }
+
+  void ReinitializeGpuDevice(OpKernelContext* context, PerOpGpuDevice* device,
+                             DeviceContext* dc, Allocator* allocator) override {
+    underlying_->ReinitializeGpuDevice(context, device, dc, allocator);
+  }
+
+  Status MakeTensorFromProto(const TensorProto& tensor_proto,
+                             const AllocatorAttributes alloc_attrs,
+                             Tensor* tensor) override {
+    return underlying_->MakeTensorFromProto(tensor_proto, alloc_attrs, tensor);
+  }
+
+  // Below are virtual methods defined on Device
+
+  void Compute(OpKernel* op_kernel, OpKernelContext* context) override {
+    underlying_->Compute(op_kernel, context);
+  }
+
+  void ComputeAsync(AsyncOpKernel* op_kernel, OpKernelContext* context,
+                    AsyncOpKernel::DoneCallback done) override {
+    underlying_->ComputeAsync(op_kernel, context, std::move(done));
+  }
+
+  void ConsumeListOfAccessedTensors(
+      DeviceContext* context, const TensorReferenceVector& tensors) override {
+    underlying_->ConsumeListOfAccessedTensors(context, tensors);
+  }
+
+  Status Sync() override { return underlying_->Sync(); }
+
+  Status MaybeRewriteGraph(const FunctionDefLibrary& library,
+                           std::unique_ptr<Graph>* graph) override {
+    return underlying_->MaybeRewriteGraph(library, graph);
+  }
+
+  Status FillContextMap(const Graph* graph,
+                        DeviceContextMap* device_context_map) override {
+    return underlying_->FillContextMap(graph, device_context_map);
+  }
+
+ private:
+  RenamedDevice(Device* underlying, const DeviceAttributes& attributes,
+                bool owns_underlying);
+  Device* const underlying_;
+  const bool owns_underlying_;
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_COMMON_RUNTIME_RENAMED_DEVICE_H_
diff --git a/tensorflow/core/common_runtime/simple_placer_test.cc b/tensorflow/core/common_runtime/simple_placer_test.cc
index bd84417b10..24f27af5f1 100644
--- a/tensorflow/core/common_runtime/simple_placer_test.cc
+++ b/tensorflow/core/common_runtime/simple_placer_test.cc
@@ -66,7 +66,7 @@ class DummyOp : public OpKernel {
 class FakeDevice : public Device {
  private:
   explicit FakeDevice(const DeviceAttributes& device_attributes)
-      : Device(nullptr, device_attributes, nullptr) {}
+      : Device(nullptr, device_attributes) {}
 
  public:
   Status Sync() override { return errors::Unimplemented("FakeDevice::Sync()"); }
diff --git a/tensorflow/core/common_runtime/threadpool_device.cc b/tensorflow/core/common_runtime/threadpool_device.cc
index 60348e885f..f5f8aab694 100644
--- a/tensorflow/core/common_runtime/threadpool_device.cc
+++ b/tensorflow/core/common_runtime/threadpool_device.cc
@@ -38,10 +38,8 @@ ThreadPoolDevice::ThreadPoolDevice(const SessionOptions& options,
                                    const string& name, Bytes memory_limit,
                                    const DeviceLocality& locality,
                                    Allocator* allocator)
-    : LocalDevice(options,
-                  Device::BuildDeviceAttributes(name, DEVICE_CPU, memory_limit,
-                                                locality),
-                  allocator),
+    : LocalDevice(options, Device::BuildDeviceAttributes(
+                               name, DEVICE_CPU, memory_limit, locality)),
       allocator_(allocator) {}
 
 ThreadPoolDevice::~ThreadPoolDevice() {}
diff --git a/tensorflow/core/distributed_runtime/BUILD b/tensorflow/core/distributed_runtime/BUILD
index 0f5eb0cb32..d2a828f39f 100644
--- a/tensorflow/core/distributed_runtime/BUILD
+++ b/tensorflow/core/distributed_runtime/BUILD
@@ -77,7 +77,6 @@ cc_library(
     ],
     deps = [
         ":graph_mgr",
-        ":rendezvous_mgr_interface",
         ":worker_cache",
         "//tensorflow/core:master_proto_cc",
         "//tensorflow/core:protos_all_cc",
@@ -92,9 +91,9 @@ cc_library(
     deps = [
         ":graph_mgr",
         ":worker_session",
+        "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
-        "//tensorflow/core/distributed_runtime/rpc:rpc_rendezvous_mgr",
     ],
 )
 
@@ -237,6 +236,7 @@ cc_library(
         "//tensorflow/core:lib",
         "//tensorflow/core:lib_internal",
         "//tensorflow/core:master_proto_cc",
+        "//tensorflow/core:protos_all_cc",
         "//tensorflow/core:worker_proto_cc",
     ],
 )
diff --git a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc
index 5863727f19..e68aea46ec 100644
--- a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc
+++ b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.cc
@@ -35,9 +35,8 @@ limitations under the License.
 
 namespace tensorflow {
 
-BaseRendezvousMgr::BaseRendezvousMgr(const WorkerEnv* worker_env,
-                                     const string& worker_name)
-    : worker_env_(worker_env), worker_name_(worker_name) {}
+BaseRendezvousMgr::BaseRendezvousMgr(const WorkerEnv* worker_env)
+    : worker_env_(worker_env) {}
 
 BaseRendezvousMgr::~BaseRendezvousMgr() {
   for (auto& p : table_) {
@@ -47,7 +46,7 @@ BaseRendezvousMgr::~BaseRendezvousMgr() {
   }
 }
 
-Rendezvous* BaseRendezvousMgr::Find(int64 step_id) {
+RemoteRendezvous* BaseRendezvousMgr::Find(int64 step_id) {
   return FindOrCreate(step_id);
 }
 
@@ -55,7 +54,7 @@ BaseRemoteRendezvous* BaseRendezvousMgr::FindOrCreate(int64 step_id) {
   mutex_lock l(mu_);
   Table::iterator iter = table_.find(step_id);
   if (iter == table_.end()) {
-    auto rr = Create(step_id, worker_env_, worker_name_);
+    auto rr = Create(step_id, worker_env_);
     iter = table_.insert({step_id, rr}).first;
   }
   iter->second->Ref();
@@ -128,14 +127,12 @@ void BaseRendezvousMgr::CleanupAll() {
   }
 }
 
-BaseRemoteRendezvous::BaseRemoteRendezvous(const WorkerEnv* env,
-                                           const string& worker_name,
-                                           int64 step_id,
+BaseRemoteRendezvous::BaseRemoteRendezvous(const WorkerEnv* env, int64 step_id,
                                            bool tolerate_dup_recv)
     : env_(env),
-      worker_name_(worker_name),
       step_id_(step_id),
-      local_(NewLocalRendezvous(tolerate_dup_recv)) {}
+      local_(NewLocalRendezvous(tolerate_dup_recv)),
+      session_(nullptr) {}
 
 BaseRemoteRendezvous::~BaseRemoteRendezvous() {
   CHECK(active_.empty());
@@ -150,6 +147,41 @@ static bool IsLocalDevice(const string& worker_name,
   return device_name.starts_with(worker_name);
 }
 
+Status BaseRemoteRendezvous::Initialize(WorkerSession* session) {
+  CHECK_NE(session, nullptr) << "session must not be null!";
+  std::vector<DeferredCall> deferred_calls;
+  {
+    mutex_lock l(mu_);
+    if (session_ != nullptr) {
+      if (session_->worker_name == session->worker_name) {
+        LOG(INFO) << "Skipping rendezvous re-initialization.";
+        return Status::OK();
+      }
+      Status s = errors::Internal(
+          "Double init! Worker names would have changed from: ",
+          session_->worker_name, " -> ", session->worker_name);
+      LOG(WARNING) << s;
+      return s;
+    }
+    session_ = session;
+    std::swap(deferred_calls, deferred_calls_);
+  }
+  for (DeferredCall& call : deferred_calls) {
+    RecvLocalAsyncInternal(call.parsed, std::move(call.done));
+  }
+  return Status::OK();
+}
+
+WorkerSession* BaseRemoteRendezvous::session() {
+  mutex_lock l(mu_);
+  return session_;
+}
+
+bool BaseRemoteRendezvous::is_initialized() {
+  mutex_lock l(mu_);
+  return is_initialized_locked();
+}
+
 Status BaseRemoteRendezvous::Send(const Rendezvous::ParsedKey& parsed,
                                   const Rendezvous::Args& args,
                                   const Tensor& val, const bool is_dead) {
@@ -157,10 +189,12 @@ Status BaseRemoteRendezvous::Send(const Rendezvous::ParsedKey& parsed,
   {
     mutex_lock l(mu_);
     if (!status_.ok()) return status_;
-  }
-  if (!IsLocalDevice(worker_name_, parsed.src_device)) {
-    return errors::InvalidArgument("Invalid rendezvous key (src): ",
-                                   parsed.FullKey(), " @ ", worker_name_);
+    DCHECK(is_initialized_locked());
+    if (!IsLocalDevice(session_->worker_name, parsed.src_device)) {
+      return errors::InvalidArgument(
+          "Invalid rendezvous key (src): ", parsed.FullKey(), " @ ",
+          session_->worker_name);
+    }
   }
   // Buffers "val" and "device_context" in local_.
   return local_->Send(parsed, args, val, is_dead);
@@ -168,17 +202,24 @@ Status BaseRemoteRendezvous::Send(const Rendezvous::ParsedKey& parsed,
 
 Status BaseRemoteRendezvous::ValidateDevices(const ParsedKey& parsed,
                                              bool is_src) {
+  // Cache session pointer to avoid repeatedly taking & releasing the lock
+  // (e.g. calling session())
+  WorkerSession* sess = nullptr;
   {
     mutex_lock l(mu_);
     if (!status_.ok()) return status_;
+    if (!is_initialized_locked()) {
+      return errors::Internal("ValidateDevices called before initialization.");
+    }
+    sess = session_;
   }
-  if (is_src && !IsLocalDevice(worker_name_, parsed.src_device)) {
+  if (is_src && !IsLocalDevice(sess->worker_name, parsed.src_device)) {
     return errors::InvalidArgument("Invalid rendezvous key (src): ",
-                                   parsed.FullKey(), " @ ", worker_name_);
+                                   parsed.FullKey(), " @ ", sess->worker_name);
   }
-  if (!is_src && !IsLocalDevice(worker_name_, parsed.dst_device)) {
+  if (!is_src && !IsLocalDevice(sess->worker_name, parsed.dst_device)) {
     return errors::InvalidArgument("Invalid rendezvous key (dst): ",
-                                   parsed.FullKey(), " @ ", worker_name_);
+                                   parsed.FullKey(), " @ ", sess->worker_name);
   }
   return Status::OK();
 }
@@ -244,6 +285,7 @@ void BaseRemoteRendezvous::RecvAsync(const ParsedKey& parsed,
                                      const Rendezvous::Args& recv_args,
                                      DoneCallback done) {
   VLOG(1) << "RemoteRendezvous Recv " << this << " " << parsed.FullKey();
+  CHECK(is_initialized()) << "RecvAsync called when uninitialized.";
   Status s = ValidateDevices(parsed, false /*!is_src*/);
   if (!s.ok()) {
     done(s, Args(), recv_args, Tensor(), false);
@@ -280,6 +322,26 @@ void BaseRemoteRendezvous::RecvAsync(const ParsedKey& parsed,
 
 void BaseRemoteRendezvous::RecvLocalAsync(const ParsedKey& parsed,
                                           DoneCallback done) {
+  {
+    mutex_lock l(mu_);
+    if (!is_initialized_locked()) {
+      // RecvLocalAsync can be called (due to an incoming RecvTensor RPC from a
+      // remote worker) before the RunStep (or PartialRunStep) RPC from the
+      // master arrives. RecvLocalAsync thus buffers the arguments until after
+      // the RemoteRendezvous is Initialize()'d, when it completes the
+      // rendezvous logic. At some point after Initialize() is called, a Tensor
+      // is produced locally that will then be sent in response to the incoming
+      // RPC.
+      DeferredCall call(parsed, std::move(done));
+      deferred_calls_.push_back(call);
+      return;
+    }
+  }
+  RecvLocalAsyncInternal(parsed, std::move(done));
+}
+
+void BaseRemoteRendezvous::RecvLocalAsyncInternal(const ParsedKey& parsed,
+                                                  DoneCallback done) {
   Status s = ValidateDevices(parsed, true /* is_src */);
   if (!s.ok()) {
     done(s, Args(), Args(), Tensor(), false);
@@ -318,4 +380,8 @@ void BaseRemoteRendezvous::DeregisterCall(BaseRecvTensorCall* call) {
   active_.erase(call);
 }
 
+BaseRemoteRendezvous::DeferredCall::DeferredCall(const ParsedKey& parsed,
+                                                 DoneCallback done)
+    : parsed(parsed), done(std::move(done)) {}
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h
index 447a75913d..b252f45fe9 100644
--- a/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h
+++ b/tensorflow/core/distributed_runtime/base_rendezvous_mgr.h
@@ -59,15 +59,17 @@ class BaseRecvTensorCall;
 // RendezvousMgr must have keys generated by Rendezvous::CreateKey().
 class BaseRendezvousMgr : public RendezvousMgrInterface {
  public:
-  explicit BaseRendezvousMgr(const WorkerEnv* worker_env,
-                             const string& worker_name);
+  explicit BaseRendezvousMgr(const WorkerEnv* worker_env);
 
   ~BaseRendezvousMgr() override;
 
   // Returns Rendezvous supporting send and recv among workers in the
   // "step_id".  The caller takes ownership of one reference on the
   // returned Rendezvous instance.
-  Rendezvous* Find(int64 step_id) override;
+  //
+  // Note: the caller must guarantee to eventually call Initialize on the
+  // returned RemoteRendezvous
+  RemoteRendezvous* Find(int64 step_id) override;
 
   // Finds the local rendezvous instance for the "step_id".  Runs
   // "done" when the tensor for "key" is produced or an error occurs.
@@ -91,8 +93,7 @@ class BaseRendezvousMgr : public RendezvousMgrInterface {
 
  protected:
   virtual BaseRemoteRendezvous* Create(int64 step_id,
-                                       const WorkerEnv* worker_env,
-                                       const string& worker_name) = 0;
+                                       const WorkerEnv* worker_env) = 0;
 
  private:
   // Maps step_id to rendezvous.
@@ -100,7 +101,6 @@ class BaseRendezvousMgr : public RendezvousMgrInterface {
 
   // Not owned.
   const WorkerEnv* const worker_env_;
-  const string worker_name_;
 
   mutex mu_;
   Table table_ GUARDED_BY(mu_);
@@ -116,10 +116,13 @@ class BaseRendezvousMgr : public RendezvousMgrInterface {
 // Buffering of Tensor values is delegated to a "local" Rendezvous
 // obtained from NewLocalRendezvous().  This class just adds
 // functionality to coordinate with remote workers.
-class BaseRemoteRendezvous : public Rendezvous {
+class BaseRemoteRendezvous : public RemoteRendezvous {
  public:
-  BaseRemoteRendezvous(const WorkerEnv* env, const string& worker_name,
-                       int64 step_id, bool tolerate_dup_recv);
+  BaseRemoteRendezvous(const WorkerEnv* env, int64 step_id,
+                       bool tolerate_dup_recv);
+
+  // Upgrades the BaseRemoteRendezvous to full initialization.
+  Status Initialize(WorkerSession* session) override;
 
   // Forwards to local_, where the Tensor "val" will be buffered and
   // any waiting callback stored.
@@ -163,10 +166,13 @@ class BaseRemoteRendezvous : public Rendezvous {
   // Removes "call" from active_ if "call" is in active_.
   void DeregisterCall(BaseRecvTensorCall* call);
 
+  WorkerSession* session();
+
+  bool is_initialized();
+
   ~BaseRemoteRendezvous() override;
 
   const WorkerEnv* const env_;  // Not owned.
-  const string worker_name_;
   const int64 step_id_;
 
  private:
@@ -176,10 +182,24 @@ class BaseRemoteRendezvous : public Rendezvous {
 
   // Status given by StartAbort() if any.
   Status status_ GUARDED_BY(mu_);
+  WorkerSession* session_ GUARDED_BY(mu_);  // Not owned.
+
+  // Data structures to handle calls when partially initialized.
+  struct DeferredCall {
+    const ParsedKey parsed;
+    DoneCallback done;
+
+    DeferredCall(const ParsedKey& parsed, DoneCallback done);
+  };
+  std::vector<DeferredCall> deferred_calls_ GUARDED_BY(mu_);
 
   // Active outstanding RecvTensor calls.
   gtl::FlatSet<BaseRecvTensorCall*> active_ GUARDED_BY(mu_);
 
+  bool is_initialized_locked() EXCLUSIVE_LOCKS_REQUIRED(mu_) {
+    return session_ != nullptr;
+  }
+
   // If "is_src" is true, checks that the rendezvous key "parsed"'s
   // source is in this process. If "is_src" is false, checks that the
   // rendezvous key "parsed"'s destination is in this process.
@@ -194,6 +214,9 @@ class BaseRemoteRendezvous : public Rendezvous {
                           const Rendezvous::Args& out_args, const Tensor& in,
                           Tensor* out, StatusCallback done);
 
+  // Must be called only if fully initialized.
+  void RecvLocalAsyncInternal(const ParsedKey& parsed, DoneCallback done);
+
   TF_DISALLOW_COPY_AND_ASSIGN(BaseRemoteRendezvous);
 };
 
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index ce7ce372e8..5bde771e8d 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -46,10 +46,8 @@ limitations under the License.
 
 namespace tensorflow {
 
-GraphMgr::GraphMgr(const WorkerEnv* worker_env,
-                   RendezvousMgrInterface* rendezvous_mgr)
-    : worker_env_(worker_env), rendezvous_mgr_(rendezvous_mgr), table_(5) {
-  CHECK(rendezvous_mgr) << "Rendezvous mgr was null";
+GraphMgr::GraphMgr(const WorkerEnv* worker_env, DeviceMgr* device_mgr)
+    : worker_env_(worker_env), device_mgr_(device_mgr), table_(5) {
   // The default value of sync_on_finish will be flipped soon and this
   // environment variable will be removed as well.
   Status status =
@@ -148,7 +146,7 @@ Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
   };
   popts.get_incarnation = [this](const string& name) -> int64 {
     Device* device = nullptr;
-    Status s = worker_env_->device_mgr->LookupDevice(name, &device);
+    Status s = device_mgr_->LookupDevice(name, &device);
     if (s.ok()) {
       return device->attributes().incarnation();
     } else {
@@ -193,8 +191,7 @@ Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
     ExecutionUnit* unit = &(item->units.back());
 
     // Find the device.
-    Status s =
-        worker_env_->device_mgr->LookupDevice(device_name, &unit->device);
+    Status s = device_mgr_->LookupDevice(device_name, &unit->device);
     if (!s.ok()) {
       // Remove the empty unit from the item as the item destructor wants all
       // units to have valid devices.
@@ -214,7 +211,7 @@ Status GraphMgr::InitItem(const string& session, const GraphDef& gdef,
 
     // Function library runtime.
     unit->lib = NewFunctionLibraryRuntime(
-        worker_env_->device_mgr, worker_env_->env, unit->device,
+        device_mgr_, worker_env_->env, unit->device,
         subgraph->versions().producer(), item->lib_def,
         graph_options.optimizer_options());
 
@@ -419,14 +416,14 @@ void GraphMgr::RecvOutputsFromRendezvousAsync(Rendezvous* rendezvous,
 }
 
 Status GraphMgr::SendInputs(const int64 step_id, const NamedTensors& in) {
-  Rendezvous* rendezvous = rendezvous_mgr_->Find(step_id);
+  Rendezvous* rendezvous = worker_env_->rendezvous_mgr->Find(step_id);
   Status s = SendInputsToRendezvous(rendezvous, in);
   rendezvous->Unref();
   return s;
 }
 
 Status GraphMgr::RecvOutputs(const int64 step_id, NamedTensors* out) {
-  Rendezvous* rendezvous = rendezvous_mgr_->Find(step_id);
+  Rendezvous* rendezvous = worker_env_->rendezvous_mgr->Find(step_id);
   Status s = RecvOutputsFromRendezvous(rendezvous, out);
   rendezvous->Unref();
   return s;
@@ -434,7 +431,7 @@ Status GraphMgr::RecvOutputs(const int64 step_id, NamedTensors* out) {
 
 void GraphMgr::RecvOutputsAsync(const int64 step_id, NamedTensors* out,
                                 StatusCallback done) {
-  Rendezvous* rendezvous = rendezvous_mgr_->Find(step_id);
+  Rendezvous* rendezvous = worker_env_->rendezvous_mgr->Find(step_id);
   RecvOutputsFromRendezvousAsync(rendezvous, out,
                                  [done, rendezvous](const Status s) {
                                    rendezvous->Unref();
@@ -443,7 +440,8 @@ void GraphMgr::RecvOutputsAsync(const int64 step_id, NamedTensors* out,
 }
 
 void GraphMgr::ExecuteAsync(const string& handle, const int64 step_id,
-                            const ExecutorOpts& opts,
+                            WorkerSession* session,
+                            const ExecutorOpts& /*opts*/,
                             StepStatsCollector* collector,
                             CostGraphDef* cost_graph,
                             CancellationManager* cancellation_manager,
@@ -464,10 +462,14 @@ void GraphMgr::ExecuteAsync(const string& handle, const int64 step_id,
     return;
   }
 
-  Rendezvous* rendezvous = rendezvous_mgr_->Find(step_id);
+  RemoteRendezvous* rendezvous = worker_env_->rendezvous_mgr->Find(step_id);
+  Status s = rendezvous->Initialize(session);
 
   // Sends values specified by the caller.
-  Status s = SendInputsToRendezvous(rendezvous, in);
+  if (s.ok()) {
+    s = SendInputsToRendezvous(rendezvous, in);
+  }
+
   if (!s.ok()) {
     done(s);
     item->Unref();
@@ -492,10 +494,9 @@ void GraphMgr::StartParallelExecutors(const string& handle, int64 step_id,
                                       StatusCallback done) {
   const int num_units = item->units.size();
   CHECK_GE(num_units, 1);
-  ScopedStepContainer* step_container =
-      new ScopedStepContainer(step_id, [this](const string& name) {
-        worker_env_->device_mgr->ClearContainers({name});
-      });
+  ScopedStepContainer* step_container = new ScopedStepContainer(
+      step_id,
+      [this](const string& name) { device_mgr_->ClearContainers({name}); });
   // NOTE: Transfer one ref of rendezvous and item.
   ExecutorBarrier* barrier =
       new ExecutorBarrier(num_units, rendezvous,
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.h b/tensorflow/core/distributed_runtime/graph_mgr.h
index 349af6c54e..50391f47e4 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.h
+++ b/tensorflow/core/distributed_runtime/graph_mgr.h
@@ -37,6 +37,8 @@ namespace tensorflow {
 class ExecutorOpts;
 class StepStatsCollector;
 class RendezvousMgrInterface;
+class DeviceMgr;
+struct WorkerSession;
 
 // GraphMgr keeps track of a set of graphs that are registered with a
 // TensorFlow worker. Each registered graph is identified by a handle
@@ -62,8 +64,7 @@ class RendezvousMgrInterface;
 //   EXPECT_EQ(out["c"], Tensor({4, 6}));
 class GraphMgr {
  public:
-  explicit GraphMgr(const WorkerEnv* worker_env,
-                    RendezvousMgrInterface* rendezvous_mgr);
+  explicit GraphMgr(const WorkerEnv* worker_env, DeviceMgr* device_mgr);
   ~GraphMgr();
 
   // Registers a graph. Fills in "handle"
@@ -78,8 +79,8 @@ class GraphMgr {
   typedef std::map<string, Tensor> NamedTensors;
   typedef std::function<void(const Status&)> StatusCallback;
   void ExecuteAsync(const string& handle, const int64 step_id,
-                    const ExecutorOpts& opts, StepStatsCollector* collector,
-                    CostGraphDef* cost_graph,
+                    WorkerSession* session, const ExecutorOpts& opts,
+                    StepStatsCollector* collector, CostGraphDef* cost_graph,
                     CancellationManager* cancellation_manager,
                     const NamedTensors& in, StatusCallback done);
 
@@ -131,7 +132,7 @@ class GraphMgr {
   };
 
   const WorkerEnv* worker_env_;             // Not owned.
-  RendezvousMgrInterface* rendezvous_mgr_;  // Not owned.
+  DeviceMgr* device_mgr_;
 
   CostModelManager cost_model_manager_;
 
diff --git a/tensorflow/core/distributed_runtime/master.cc b/tensorflow/core/distributed_runtime/master.cc
index b4adee3bf6..e860c99d95 100644
--- a/tensorflow/core/distributed_runtime/master.cc
+++ b/tensorflow/core/distributed_runtime/master.cc
@@ -34,6 +34,7 @@ limitations under the License.
 #include <unordered_set>
 #include <vector>
 
+#include "tensorflow/core/common_runtime/device_set.h"
 #include "tensorflow/core/common_runtime/process_util.h"
 #include "tensorflow/core/distributed_runtime/remote_device.h"
 #include "tensorflow/core/distributed_runtime/worker_cache.h"
@@ -48,12 +49,17 @@ limitations under the License.
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/protobuf/cluster.pb.h"
 #include "tensorflow/core/protobuf/master.pb.h"
 #include "tensorflow/core/protobuf/worker.pb.h"
 #include "tensorflow/core/public/session_options.h"
 
 namespace tensorflow {
 
+namespace {
+const char* const kGrpcProtocol = "grpc://";
+}  // namespace
+
 Master::Master(MasterEnv* env, double session_gc_seconds)
     : env_(env),
       last_1000_steps_(1000),
@@ -290,25 +296,122 @@ void Master::CreateSession(const CreateSessionRequest* req,
                            CreateSessionResponse* resp, MyClosure done) {
   SchedClosure([this, req, resp, done]() {
     Status status;
+    WorkerCacheFactoryOptions worker_cache_factory_options;
+    string grpc_protocol("grpc");
+    worker_cache_factory_options.protocol = &grpc_protocol;
     auto call_done = gtl::MakeCleanup([&status, &done] { done(status); });
     status = ValidateExternalGraphDefSyntax(req->graph_def());
     if (!status.ok()) return;
-    // Ping all the workers and build the list of devices that the
-    // session will use.
+
+    // The following 4 variables are set differently, depending on whether this
+    // session uses a client-provided clusterspec or not.
+    WorkerCacheInterface* worker_cache = nullptr;
+    // Note: worker_cache_ptr will be null except if this session is using a
+    // client-supplied ClusterDef (ClusterSpec propagation).
+    std::unique_ptr<WorkerCacheInterface> worker_cache_ptr;
+    std::unique_ptr<DeviceSet> device_set;
     // TODO(saeta): Convert to std::make_unique when available.
     std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devices(
         new std::vector<std::unique_ptr<Device>>());
-    status = DeviceFinder::GetRemoteDevices(req->config().device_filters(),
-                                            env_, env_->worker_cache,
-                                            remote_devices.get());
-    if (!status.ok()) return;
+
+    if (req->config().has_cluster_def()) {
+      worker_cache_factory_options.cluster_def = &req->config().cluster_def();
+
+      // Set the server_def's job_name and task_index fields.
+      string normalized_string;
+      string grpc_protocol(kGrpcProtocol);
+      if (req->target().compare(0, grpc_protocol.length(), grpc_protocol) ==
+          0) {
+        normalized_string =
+            req->target().substr(grpc_protocol.length(), string::npos);
+      } else {
+        normalized_string = req->target();
+      }
+      for (auto&& job : req->config().cluster_def().job()) {
+        for (auto&& task : job.tasks()) {
+          if (task.second == normalized_string) {
+            if (worker_cache_factory_options.job_name != nullptr) {
+              status = errors::InvalidArgument(
+                  "Found multiple matching tasks that correspond to "
+                  "to the master. Master target: '",
+                  req->target(), "'. ClusterDef: ",
+                  req->config().cluster_def().ShortDebugString());
+              LOG(ERROR) << status;
+              return;
+            }
+            if (env_->local_devices[0]->parsed_name().job == job.name() &&
+                env_->local_devices[0]->parsed_name().task == task.first) {
+              // TODO(b/37868888): Remove this limitation when resolved
+              status = errors::InvalidArgument(
+                  "The ClusterSpec names the job and task index to be the same "
+                  "names that were provided when the server booted. This is "
+                  "currently not allowed. Job: ",
+                  job.name(), ", task index: ", task.first);
+              return;
+            }
+            worker_cache_factory_options.job_name = &job.name();
+            worker_cache_factory_options.task_index = task.first;
+          }
+        }
+      }
+
+      // Create the worker cache from the computed server_def.
+      status = env_->worker_cache_factory(worker_cache_factory_options,
+                                          &worker_cache);
+      if (!status.ok()) return;
+      worker_cache_ptr = std::unique_ptr<WorkerCacheInterface>(worker_cache);
+      // Ping all the workers and build the list of devices that the
+      // session will use.
+      status =
+          DeviceFinder::GetRemoteDevices(req->config().device_filters(), env_,
+                                         worker_cache, remote_devices.get());
+      if (!status.ok()) return;
+      device_set.reset(new DeviceSet);
+      for (auto&& d : *remote_devices) {
+        device_set->AddDevice(d.get());
+        DeviceNameUtils::ParsedName name = d->parsed_name();
+        if (name.job == *worker_cache_factory_options.job_name &&
+            name.task == worker_cache_factory_options.task_index &&
+            name.type == "CPU") {
+          device_set->set_client_device(d.get());
+        }
+      }
+    } else {
+      worker_cache = env_->worker_cache;
+      // Ping all the workers and build the list of devices that the
+      // session will use.
+      status =
+          DeviceFinder::GetRemoteDevices(req->config().device_filters(), env_,
+                                         worker_cache, remote_devices.get());
+      if (!status.ok()) return;
+      device_set.reset(new DeviceSet);
+      for (auto&& d : *remote_devices) {
+        device_set->AddDevice(d.get());
+      }
+      int num_local_devices = 0;
+      for (Device* d : env_->local_devices) {
+        device_set->AddDevice(d);
+        if (num_local_devices == 0) {
+          // Uses the first local device as the client device.
+          device_set->set_client_device(d);
+        }
+        num_local_devices++;
+      }
+    }
+
+    CHECK(device_set->client_device());
+
     SessionOptions options;
     options.config = req->config();
-    MasterSession* session =
-        env_->master_session_factory(options, env_, std::move(remote_devices));
+
+    MasterSession* session = env_->master_session_factory(
+        options, env_, std::move(remote_devices), std::move(worker_cache_ptr),
+        std::move(device_set));
+
     GraphDef* gdef =
         const_cast<CreateSessionRequest*>(req)->mutable_graph_def();
-    status = session->Create(gdef);
+
+    status = session->Create(gdef, worker_cache_factory_options);
     if (!status.ok()) {
       session->Close().IgnoreError();
       session->Unref();
diff --git a/tensorflow/core/distributed_runtime/master_env.h b/tensorflow/core/distributed_runtime/master_env.h
index a155bd384d..bb548adda1 100644
--- a/tensorflow/core/distributed_runtime/master_env.h
+++ b/tensorflow/core/distributed_runtime/master_env.h
@@ -19,17 +19,41 @@ limitations under the License.
 #include <functional>
 #include <vector>
 
-#include "tensorflow/core/distributed_runtime/master_session.h"
+#include "tensorflow/core/protobuf/cluster.pb.h"
+#include "tensorflow/core/protobuf/tensorflow_server.pb.h"
 #include "tensorflow/core/public/session_options.h"
 
 namespace tensorflow {
 
 class Device;
+class DeviceSet;
 class Env;
 class MasterSession;
 class OpRegistryInterface;
 class WorkerCacheInterface;
 
+// Options passed to the worker_cache_factory function.
+struct WorkerCacheFactoryOptions {
+  const ClusterDef* cluster_def = nullptr;
+  const string* job_name = nullptr;
+  int task_index;
+  const string* protocol = nullptr;
+
+  WorkerCacheFactoryOptions() {}
+
+  // Construct from a ServerDef proto.
+  //
+  // Note: server_def must outlive WorkerCacheFactoryOptions!
+  WorkerCacheFactoryOptions(const ServerDef& server_def) {
+    if (server_def.has_cluster() && !server_def.job_name().empty()) {
+      cluster_def = &server_def.cluster();
+      job_name = &server_def.job_name();
+      task_index = server_def.task_index();
+      protocol = &server_def.protocol();
+    }
+  }
+};
+
 // The master environment class, which holds a bag of pointers to
 // per-master state.
 //
@@ -57,8 +81,14 @@ struct MasterEnv {
   // `MasterEnv*` is retained by the caller.
   std::function<MasterSession*(
       SessionOptions, MasterEnv*,
-      std::unique_ptr<std::vector<std::unique_ptr<Device>>>)>
+      std::unique_ptr<std::vector<std::unique_ptr<Device>>>,
+      std::unique_ptr<WorkerCacheInterface>,
+      std::unique_ptr<DeviceSet> device_set)>
       master_session_factory;
+
+  std::function<Status(const WorkerCacheFactoryOptions&,
+                       WorkerCacheInterface**)>
+      worker_cache_factory;
 };
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 5257aea1e3..50c5d90fc9 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -36,11 +36,13 @@ limitations under the License.
 #include "tensorflow/core/lib/core/notification.h"
 #include "tensorflow/core/lib/core/refcount.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/gtl/cleanup.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/random/random.h"
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/logging.h"
@@ -528,6 +530,7 @@ Status MasterSession::ReffedClientGraph::RunPartitions(
       c->req->set_is_partial(is_partial_);
       c->req->set_is_last_partial_run(is_last_partial_run);
     }
+    c->req->set_session_handle(session_handle_);
     c->req->set_graph_handle(part.graph_handle);
     c->req->set_step_id(step_id);
     *c->req->mutable_exec_opts() = exec_opts;
@@ -871,6 +874,7 @@ void MasterSession::ReffedClientGraph::DeregisterPartitions() {
     // The graph handle may be empty if we failed during partition registration.
     if (!part.graph_handle.empty()) {
       Call* c = new Call;
+      c->req.set_session_handle(session_handle_);
       c->req.set_graph_handle(part.graph_handle);
       // NOTE(mrry): We must capture `worker_cache_` since `this`
       // could be deleted before the callback is called.
@@ -973,31 +977,25 @@ string BuildGraphOptionsString(const BuildGraphOptions& opts) {
 MasterSession::MasterSession(
     const SessionOptions& opt, const MasterEnv* env,
     std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devs,
+    std::unique_ptr<WorkerCacheInterface> worker_cache,
+    std::unique_ptr<DeviceSet> device_set,
     StatsPublisherFactory stats_publisher_factory)
     : session_opts_(opt),
       env_(env),
       handle_(strings::FpToString(random::New64())),
       remote_devs_(std::move(remote_devs)),
+      worker_cache_(std::move(worker_cache)),
+      devices_(std::move(device_set)),
       stats_publisher_factory_(std::move(stats_publisher_factory)),
       graph_version_(0),
       run_graphs_(5),
       partial_run_graphs_(5) {
   UpdateLastAccessTime();
+  CHECK(devices_) << "device_set was null!";
 
   VLOG(1) << "Session " << handle_ << " #local " << env->local_devices.size()
           << " #remote " << remote_devs_->size();
-  for (auto&& d : *remote_devs_) {
-    devices_.AddDevice(d.get());
-  }
-  int num_local_devices = 0;
-  for (Device* d : env->local_devices) {
-    devices_.AddDevice(d);
-    if (num_local_devices == 0) {
-      // Uses the first local device as the client device.
-      devices_.set_client_device(d);
-    }
-    num_local_devices++;
-  }
+
   LOG(INFO) << "Start master session " << handle_
             << " with config: " << std::endl
             << session_opts_.config.DebugString();
@@ -1012,7 +1010,8 @@ void MasterSession::UpdateLastAccessTime() {
   last_access_time_usec_.store(Env::Default()->NowMicros());
 }
 
-Status MasterSession::Create(GraphDef* graph_def) {
+Status MasterSession::Create(GraphDef* graph_def,
+                             const WorkerCacheFactoryOptions& options) {
   if (session_opts_.config.graph_options().place_pruned_graph()) {
     // TODO(b/29900832): Fix this or remove the option.
     LOG(WARNING) << "Distributed session does not support the "
@@ -1020,17 +1019,93 @@ Status MasterSession::Create(GraphDef* graph_def) {
     session_opts_.config.mutable_graph_options()->set_place_pruned_graph(false);
   }
 
-  SimpleGraphExecutionStateOptions options;
-  options.device_set = &devices_;
-  options.session_options = &session_opts_;
+  SimpleGraphExecutionStateOptions execution_options;
+  execution_options.device_set = devices_.get();
+  execution_options.session_options = &session_opts_;
   {
     mutex_lock l(mu_);
     TF_RETURN_IF_ERROR(SimpleGraphExecutionState::MakeForBaseGraph(
-        graph_def, options, &execution_state_));
+        graph_def, execution_options, &execution_state_));
+  }
+  if (options.cluster_def != nullptr) {
+    return CreateWorkerSessions(options);
   }
   return Status::OK();
 }
 
+Status MasterSession::CreateWorkerSessions(
+    const WorkerCacheFactoryOptions& options) {
+  CHECK(worker_cache_) << "CreateWorkerSessions should be called only with "
+                       << "dynamic cluster membership.";
+  std::vector<string> worker_names;
+  worker_cache_->ListWorkers(&worker_names);
+
+  struct WorkerGroup {
+    // The worker name. (Not owned.)
+    const string* name;
+
+    // The worker referenced by name. (Not owned.)
+    WorkerInterface* worker = nullptr;
+
+    // Request and responses used for a given worker.
+    CreateWorkerSessionRequest request;
+    CreateWorkerSessionResponse response;
+    Status status = Status::OK();
+  };
+  BlockingCounter done(worker_names.size());
+  std::vector<WorkerGroup> workers(worker_names.size());
+
+  // Release the workers.
+  auto cleanup = gtl::MakeCleanup([this, &workers] {
+    for (auto&& worker_group : workers) {
+      if (worker_group.worker != nullptr) {
+        worker_cache_->ReleaseWorker(*worker_group.name, worker_group.worker);
+      }
+    }
+  });
+
+  Status status = Status::OK();
+  // Create all the workers & kick off the computations.
+  for (size_t i = 0; i < worker_names.size(); ++i) {
+    workers[i].name = &worker_names[i];
+    workers[i].worker = worker_cache_->CreateWorker(worker_names[i]);
+    workers[i].request.set_session_handle(handle_);
+    *workers[i].request.mutable_server_def()->mutable_cluster() =
+        *options.cluster_def;
+    workers[i].request.mutable_server_def()->set_protocol(*options.protocol);
+
+    DeviceNameUtils::ParsedName name;
+    if (!DeviceNameUtils::ParseFullName(worker_names[i], &name)) {
+      status = errors::Internal("Could not parse name ", worker_names[i]);
+      LOG(WARNING) << status;
+      return status;
+    }
+    if (!name.has_job || !name.has_task) {
+      status = errors::Internal("Incomplete worker name ", worker_names[i]);
+      LOG(WARNING) << status;
+      return status;
+    }
+
+    workers[i].request.mutable_server_def()->set_job_name(name.job);
+    workers[i].request.mutable_server_def()->set_task_index(name.task);
+  }
+
+  for (size_t i = 0; i < worker_names.size(); ++i) {
+    auto cb = [i, &workers, &done](const Status& s) {
+      workers[i].status = s;
+      done.DecrementCount();
+    };
+    workers[i].worker->CreateWorkerSessionAsync(&workers[i].request,
+                                                &workers[i].response, cb);
+  }
+
+  done.Wait();
+  for (size_t i = 0; i < workers.size(); ++i) {
+    status.Update(workers[i].status);
+  }
+  return status;
+}
+
 Status MasterSession::Extend(const ExtendSessionRequest* req,
                              ExtendSessionResponse* resp) {
   UpdateLastAccessTime();
@@ -1060,6 +1135,13 @@ Status MasterSession::Extend(const ExtendSessionRequest* req,
   return Status::OK();
 }
 
+WorkerCacheInterface* MasterSession::get_worker_cache() const {
+  if (worker_cache_) {
+    return worker_cache_.get();
+  }
+  return env_->worker_cache;
+}
+
 Status MasterSession::StartStep(const BuildGraphOptions& opts, int64* count,
                                 ReffedClientGraph** rcg, bool is_partial) {
   const uint64 hash = HashBuildGraphOptions(opts);
@@ -1083,11 +1165,11 @@ Status MasterSession::StartStep(const BuildGraphOptions& opts, int64* count,
               << "\n";
       std::unique_ptr<SimpleClientGraph> client_graph;
       TF_RETURN_IF_ERROR(execution_state_->BuildGraph(opts, &client_graph));
+      WorkerCacheInterface* worker_cache = get_worker_cache();
       auto entry = new ReffedClientGraph(
           handle_, opts, std::move(client_graph), session_opts_,
           stats_publisher_factory_, execution_state_.get(), is_partial,
-          env_->worker_cache);
-
+          worker_cache);
       iter = m->insert({hash, entry}).first;
       VLOG(1) << "Preparing to execute new graph";
     }
@@ -1162,6 +1244,8 @@ Status MasterSession::Run(CallOptions* opts, const RunStepRequestWrapper& req,
       return errors::FailedPrecondition("Session is closed.");
     }
     ++num_running_;
+    // Note: all code paths must eventually call MarkRunCompletion()
+    // in order to appropriate decrement the num_running_ counter.
   }
   Status status;
   if (!req.partial_run_handle().empty()) {
@@ -1169,16 +1253,18 @@ Status MasterSession::Run(CallOptions* opts, const RunStepRequestWrapper& req,
   } else {
     status = DoRunWithLocalExecution(opts, req, resp);
   }
-  {
-    mutex_lock l(mu_);
-    --num_running_;
-    if (num_running_ == 0) {
-      num_running_is_zero_.notify_all();
-    }
-  }
   return status;
 }
 
+// Decrements num_running_ and broadcasts if num_running_ is zero.
+void MasterSession::MarkRunCompletion() {
+  mutex_lock l(mu_);
+  --num_running_;
+  if (num_running_ == 0) {
+    num_running_is_zero_.notify_all();
+  }
+}
+
 Status MasterSession::BuildAndRegisterPartitions(ReffedClientGraph* rcg) {
   // Registers subgraphs if haven't done so.
   PartitionOptions popts;
@@ -1188,7 +1274,7 @@ Status MasterSession::BuildAndRegisterPartitions(ReffedClientGraph* rcg) {
     return strings::StrCat(prefix, "_S", next_node_id_++);
   };
   popts.get_incarnation = [this](const string& name) -> int64 {
-    Device* d = devices_.FindDeviceByName(name);
+    Device* d = devices_->FindDeviceByName(name);
     if (d == nullptr) {
       return PartitionOptions::kIllegalIncarnation;
     } else {
@@ -1223,6 +1309,7 @@ Status MasterSession::BuildAndRegisterPartitions(ReffedClientGraph* rcg) {
 Status MasterSession::DoPartialRun(CallOptions* opts,
                                    const RunStepRequestWrapper& req,
                                    MutableRunStepResponseWrapper* resp) {
+  auto cleanup = gtl::MakeCleanup([this] { MarkRunCompletion(); });
   const string& prun_handle = req.partial_run_handle();
   RunState* run_state = nullptr;
   {
@@ -1321,12 +1408,14 @@ Status MasterSession::DoPartialRun(CallOptions* opts,
     rcg->Ref();
     rcg->ProcessStats(run_state->step_id, &run_state->pss, run_state->ph.get(),
                       req.options(), resp->mutable_metadata());
+    cleanup.release();  // MarkRunCompletion called in done closure.
     rcg->CleanupPartitionsAsync(
         run_state->step_id, [this, rcg, prun_handle](const Status& s) {
           if (!s.ok()) {
             LOG(ERROR) << "Cleanup partition error: " << s;
           }
           rcg->Unref();
+          MarkRunCompletion();
         });
     mutex_lock l(mu_);
     partial_runs_.erase(prun_handle);
@@ -1368,10 +1457,10 @@ Status MasterSession::CreateDebuggerState(
 Status MasterSession::DoRunWithLocalExecution(
     CallOptions* opts, const RunStepRequestWrapper& req,
     MutableRunStepResponseWrapper* resp) {
-  VLOG(2) << "DoRunWithLocalExecution "
-          << "req: " << req.DebugString();
+  VLOG(2) << "DoRunWithLocalExecution req: " << req.DebugString();
   PerStepState pss;
   pss.start_micros = Env::Default()->NowMicros();
+  auto cleanup = gtl::MakeCleanup([this] { MarkRunCompletion(); });
 
   // Prepare.
   BuildGraphOptions bgopts;
@@ -1438,11 +1527,13 @@ Status MasterSession::DoRunWithLocalExecution(
     }
   }
   rcg->Ref();
-  rcg->CleanupPartitionsAsync(step_id, [rcg](const Status& s) {
+  cleanup.release();  // MarkRunCompletion called in done closure.
+  rcg->CleanupPartitionsAsync(step_id, [this, rcg](const Status& s) {
     if (!s.ok()) {
       LOG(ERROR) << "Cleanup partition error: " << s;
     }
     rcg->Unref();
+    MarkRunCompletion();
   });
   return s;
 }
diff --git a/tensorflow/core/distributed_runtime/master_session.h b/tensorflow/core/distributed_runtime/master_session.h
index d47125be99..3acc5bc5f0 100644
--- a/tensorflow/core/distributed_runtime/master_session.h
+++ b/tensorflow/core/distributed_runtime/master_session.h
@@ -26,6 +26,7 @@ limitations under the License.
 #include "tensorflow/core/distributed_runtime/call_options.h"
 #include "tensorflow/core/distributed_runtime/master_env.h"
 #include "tensorflow/core/distributed_runtime/message_wrappers.h"
+#include "tensorflow/core/distributed_runtime/worker_cache.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/protobuf/master.pb.h"
@@ -49,13 +50,15 @@ class MasterSession : public core::RefCounted {
   MasterSession(
       const SessionOptions& options, const MasterEnv* env,
       std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devs,
+      std::unique_ptr<WorkerCacheInterface> worker_cache,
+      std::unique_ptr<DeviceSet> device_set,
       StatsPublisherFactory stats_publisher_factory);
 
   // Initialize the MasterSession for "def".  Must be called before Extend(),
   // Run(), or Close().
   //
   // After this method returns, `def` will no longer be valid.
-  Status Create(GraphDef* def);
+  Status Create(GraphDef* def, const WorkerCacheFactoryOptions& options);
 
   // Returns the session handle.
   const string& handle() const { return handle_; }
@@ -107,8 +110,14 @@ class MasterSession : public core::RefCounted {
 
   std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devs_;
 
+  // The optional session-specific worker cluster.
+  // TODO(saeta): Convert to std::optional when available.
+  std::unique_ptr<WorkerCacheInterface> worker_cache_;
+  // Retrieves either worker_cache_ or the env_->worker_cache as appropriate.
+  WorkerCacheInterface* get_worker_cache() const;
+
   // The device set used by this session.
-  DeviceSet devices_;
+  std::unique_ptr<DeviceSet> devices_;
 
   StatsPublisherFactory stats_publisher_factory_;
 
@@ -181,6 +190,13 @@ class MasterSession : public core::RefCounted {
   // Private dtor. The client must call Close().
   virtual ~MasterSession();
 
+  // Creates sessions on all workers.
+  //
+  // If this session is operating using the new ClusterSpec propagation behavior
+  // call this method in order to propagate the cluster membership to all
+  // workers.
+  Status CreateWorkerSessions(const WorkerCacheFactoryOptions& server_def);
+
   Status StartStep(const BuildGraphOptions& opts, int64* count,
                    ReffedClientGraph** graph, bool is_partial);
   void ClearRunsTable(std::vector<ReffedClientGraph*>* to_unref,
@@ -190,6 +206,7 @@ class MasterSession : public core::RefCounted {
                                  MutableRunStepResponseWrapper* resp);
   Status DoPartialRun(CallOptions* opts, const RunStepRequestWrapper& req,
                       MutableRunStepResponseWrapper* resp);
+  void MarkRunCompletion();
   void UpdateLastAccessTime();
 
   Status BuildAndRegisterPartitions(ReffedClientGraph* rcg);
diff --git a/tensorflow/core/distributed_runtime/message_wrappers.cc b/tensorflow/core/distributed_runtime/message_wrappers.cc
index 7b58feb93c..b077975ea5 100644
--- a/tensorflow/core/distributed_runtime/message_wrappers.cc
+++ b/tensorflow/core/distributed_runtime/message_wrappers.cc
@@ -252,6 +252,14 @@ string ProtoRunStepRequest::DebugString() const {
 
 const RunStepRequest& ProtoRunStepRequest::ToProto() const { return *request_; }
 
+const string& InMemoryRunGraphRequest::session_handle() const {
+  return session_handle_;
+}
+
+void InMemoryRunGraphRequest::set_session_handle(const string& handle) {
+  session_handle_ = handle;
+}
+
 const string& InMemoryRunGraphRequest::graph_handle() const {
   return graph_handle_;
 }
@@ -320,6 +328,7 @@ void InMemoryRunGraphRequest::set_is_last_partial_run(
 const RunGraphRequest& InMemoryRunGraphRequest::ToProto() const {
   if (!proto_version_) {
     proto_version_.reset(new RunGraphRequest);
+    proto_version_->set_session_handle(session_handle());
     proto_version_->set_graph_handle(graph_handle());
     proto_version_->set_step_id(step_id());
     *proto_version_->mutable_exec_opts() = exec_opts();
@@ -337,6 +346,14 @@ const RunGraphRequest& InMemoryRunGraphRequest::ToProto() const {
   return *proto_version_;
 }
 
+const string& MutableProtoRunGraphRequest::session_handle() const {
+  return request_.session_handle();
+}
+
+void MutableProtoRunGraphRequest::set_session_handle(const string& handle) {
+  request_.set_session_handle(handle);
+}
+
 const string& MutableProtoRunGraphRequest::graph_handle() const {
   return request_.graph_handle();
 }
@@ -423,6 +440,10 @@ const RunGraphRequest& MutableProtoRunGraphRequest::ToProto() const {
 ProtoRunGraphRequest::ProtoRunGraphRequest(const RunGraphRequest* request)
     : request_(request) {}
 
+const string& ProtoRunGraphRequest::session_handle() const {
+  return request_->session_handle();
+}
+
 const string& ProtoRunGraphRequest::graph_handle() const {
   return request_->graph_handle();
 }
diff --git a/tensorflow/core/distributed_runtime/message_wrappers.h b/tensorflow/core/distributed_runtime/message_wrappers.h
index 02516eabb4..795a6add0e 100644
--- a/tensorflow/core/distributed_runtime/message_wrappers.h
+++ b/tensorflow/core/distributed_runtime/message_wrappers.h
@@ -223,6 +223,10 @@ class RunGraphRequestWrapper {
  public:
   virtual ~RunGraphRequestWrapper() {}
 
+  // The session handle used to register the graph. If empty, a single global
+  // namespace is used.
+  virtual const string& session_handle() const = 0;
+
   // REQUIRED: graph_handle must be returned by a RegisterGraph call
   // to the same WorkerService.
   virtual const string& graph_handle() const = 0;
@@ -262,6 +266,7 @@ class RunGraphRequestWrapper {
 // See `RunGraphRequestWrapper` above for a description of the fields.
 class MutableRunGraphRequestWrapper : public RunGraphRequestWrapper {
  public:
+  virtual void set_session_handle(const string& handle) = 0;
   virtual void set_graph_handle(const string& handle) = 0;
   virtual void set_step_id(int64 step_id) = 0;
   virtual ExecutorOpts* mutable_exec_opts() = 0;
@@ -280,6 +285,7 @@ class MutableRunGraphRequestWrapper : public RunGraphRequestWrapper {
 class InMemoryRunGraphRequest : public MutableRunGraphRequestWrapper {
  public:
   // RunGraphRequestWrapper methods.
+  const string& session_handle() const override;
   const string& graph_handle() const override;
   int64 step_id() const override;
   const ExecutorOpts& exec_opts() const override;
@@ -293,6 +299,7 @@ class InMemoryRunGraphRequest : public MutableRunGraphRequestWrapper {
   const RunGraphRequest& ToProto() const override;
 
   // MutableRunGraphRequestWrapper methods.
+  void set_session_handle(const string& handle) override;
   void set_graph_handle(const string& handle) override;
   void set_step_id(int64 step_id) override;
   ExecutorOpts* mutable_exec_opts() override;
@@ -304,6 +311,7 @@ class InMemoryRunGraphRequest : public MutableRunGraphRequestWrapper {
   void set_is_last_partial_run(bool is_last_partial_run) override;
 
  private:
+  string session_handle_;
   string graph_handle_;
   int64 step_id_;
   ExecutorOpts exec_opts_;
@@ -325,6 +333,7 @@ class InMemoryRunGraphRequest : public MutableRunGraphRequestWrapper {
 class MutableProtoRunGraphRequest : public MutableRunGraphRequestWrapper {
  public:
   // RunGraphRequestWrapper methods.
+  const string& session_handle() const override;
   const string& graph_handle() const override;
   int64 step_id() const override;
   const ExecutorOpts& exec_opts() const override;
@@ -338,6 +347,7 @@ class MutableProtoRunGraphRequest : public MutableRunGraphRequestWrapper {
   const RunGraphRequest& ToProto() const override;
 
   // MutableRunGraphRequestWrapper methods.
+  void set_session_handle(const string& handle) override;
   void set_graph_handle(const string& handle) override;
   void set_step_id(int64 step_id) override;
   ExecutorOpts* mutable_exec_opts() override;
@@ -357,6 +367,7 @@ class ProtoRunGraphRequest : public RunGraphRequestWrapper {
   ProtoRunGraphRequest(const RunGraphRequest* request);
 
   // RunGraphRequestWrapper methods.
+  const string& session_handle() const override;
   const string& graph_handle() const override;
   int64 step_id() const override;
   const ExecutorOpts& exec_opts() const override;
diff --git a/tensorflow/core/distributed_runtime/remote_device.cc b/tensorflow/core/distributed_runtime/remote_device.cc
index 9632e9c439..91c1fb99fe 100644
--- a/tensorflow/core/distributed_runtime/remote_device.cc
+++ b/tensorflow/core/distributed_runtime/remote_device.cc
@@ -16,11 +16,13 @@ limitations under the License.
 #include "tensorflow/core/distributed_runtime/remote_device.h"
 
 #include <vector>
+
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/common_runtime/process_util.h"
 #include "tensorflow/core/distributed_runtime/worker_cache.h"
 #include "tensorflow/core/distributed_runtime/worker_interface.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/gtl/cleanup.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/protobuf/worker.pb.h"
@@ -43,8 +45,7 @@ string GetLocalDeviceName(StringPiece fullname) {
 class RemoteDevice : public Device {
  public:
   RemoteDevice(Env* env, const DeviceAttributes& da)
-      : Device(env, da, nullptr),
-        local_dev_name_(GetLocalDeviceName(da.name())) {}
+      : Device(env, da), local_dev_name_(GetLocalDeviceName(da.name())) {}
 
   Status Sync() override { return Status::OK(); }
   Allocator* GetAllocator(AllocatorAttributes attr) override { return nullptr; }
@@ -68,18 +69,50 @@ void NewRemoteDevices(Env* env, WorkerCacheInterface* worker_cache,
     GetStatusResponse resp;
   };
   Call* call = new Call;
-  auto cb = [env, worker_cache, worker_name, done, wi, call](const Status& s) {
+  auto cb = [env, worker_cache, worker_name, done, wi,
+             call](const Status& status) {
+    Status s = status;
     std::vector<Device*> remote_devices;
+    auto cleanup = gtl::MakeCleanup(
+        [&worker_cache, &worker_name, &wi, &done, &remote_devices, &s, call] {
+          worker_cache->ReleaseWorker(worker_name, wi);
+          done(s, &remote_devices);
+          delete call;
+        });
     if (s.ok()) {
+      DeviceNameUtils::ParsedName worker_name_parsed;
+      if (!DeviceNameUtils::ParseFullName(worker_name, &worker_name_parsed) ||
+          !worker_name_parsed.has_job || !worker_name_parsed.has_replica ||
+          !worker_name_parsed.has_task) {
+        s = errors::InvalidArgument("Could not parse worker name: ",
+                                    worker_name);
+        LOG(WARNING) << s;
+        return;
+      }
       remote_devices.reserve(call->resp.device_attributes_size());
       for (const DeviceAttributes& da : call->resp.device_attributes()) {
-        auto d = new RemoteDevice(env, da);
-        remote_devices.push_back(d);
+        DeviceNameUtils::ParsedName device_name_parsed;
+        CHECK(DeviceNameUtils::ParseFullName(da.name(), &device_name_parsed))
+            << "Device attribute name '" << da.name() << "' could not be "
+            << "parsed. Device Attribute: " << da.DebugString();
+        // Preserve the exact name, if possible.
+        // TODO(b/37868888): Simplify when legacy device name formats removed.
+        if (device_name_parsed.job == worker_name_parsed.job &&
+            device_name_parsed.replica == worker_name_parsed.replica &&
+            device_name_parsed.task == worker_name_parsed.task) {
+          auto d = new RemoteDevice(env, da);
+          remote_devices.push_back(d);
+        } else {
+          DeviceAttributes da_rewritten = da;
+          da_rewritten.set_name(DeviceNameUtils::FullName(
+              worker_name_parsed.job, worker_name_parsed.replica,
+              worker_name_parsed.task, device_name_parsed.type,
+              device_name_parsed.id));
+          auto d = new RemoteDevice(env, da_rewritten);
+          remote_devices.push_back(d);
+        }
       }
     }
-    worker_cache->ReleaseWorker(worker_name, wi);
-    done(s, &remote_devices);
-    delete call;
   };
   wi->GetStatusAsync(&call->req, &call->resp, cb);
 }
diff --git a/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h b/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h
index 04c1fc248e..43267d4362 100644
--- a/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h
+++ b/tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h
@@ -25,6 +25,23 @@ limitations under the License.
 
 namespace tensorflow {
 
+struct WorkerSession;
+
+// RemoteRendezvous follow a 2-part initialization. First the objects are
+// constructed. Eventually, they will be initialized. Clients of the
+// RendezvousMgrInterface must guarantee to call Initialize on the returned
+// RemoteRendezvous eventually.
+//
+// Partially initialized RemoteRendezvous must respect the Rendezvous interface
+// (i.e. Send() must never block), however implementations are not expected to
+// actually perform the underlying operations until after the RemoteRendezvous
+// has been Initialize'd.
+class RemoteRendezvous : public Rendezvous {
+ public:
+  // Fully construct the RemoteRendezvous.
+  virtual Status Initialize(WorkerSession* session) = 0;
+};
+
 // RendezvousMgr keeps track of a set of local rendezvous instances.
 // All tensors sent by this worker are buffered in a RendezvousMgr
 // until the tensor is received.  Each global unique "step_id"
@@ -51,7 +68,10 @@ class RendezvousMgrInterface {
   // Returns Rendezvous supporting send and recv among workers in the
   // "step_id".  The caller takes ownership of one reference on the
   // returned Rendezvous instance.
-  virtual Rendezvous* Find(int64 step_id) = 0;
+  //
+  // Note: the caller must guarantee to eventually call Initialize on the
+  // returned RemoteRendezvous
+  virtual RemoteRendezvous* Find(int64 step_id) = 0;
 
   // Finds the local rendezvous instance for the "step_id".  Runs
   // "done" when the tensor for "key" is produced or an error occurs.
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
index 7160962b16..3867dd1f4d 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
@@ -63,10 +63,8 @@ class NoReusePortOption : public ::grpc::ServerBuilderOption {
 };
 
 // static utility function
-RendezvousMgrInterface* NewRpcRendezvousMgr(
-    const WorkerEnv* env, const string& worker_name,
-    WorkerCacheInterface* worker_cache) {
-  return new RpcRendezvousMgr(env, worker_name, worker_cache);
+RendezvousMgrInterface* NewRpcRendezvousMgr(const WorkerEnv* env) {
+  return new RpcRendezvousMgr(env);
 }
 
 }  // namespace
@@ -84,6 +82,9 @@ GrpcServer::~GrpcServer() {
   // TODO(mrry): Refactor the *Env classes so that it is less fiddly
   // to destroy them.
 
+  // Shut down all outstanding rendezvous.
+  delete worker_env_.rendezvous_mgr;
+
   // We must delete graph_mgr before device_mgr, due to shared
   // ownership of OpKernels in the executors. (The graph_mgr will
   // free all stateless OpKernels, and pass over borrowed stateful
@@ -91,8 +92,10 @@ GrpcServer::~GrpcServer() {
   // OpSegments.)
   if (worker_env_.session_mgr != nullptr) {
     delete worker_env_.session_mgr;  // Deletes graph_mgr's.
+  } else {
+    // Note: session_mgr's legacy_session_ deletes device_mgr now.
+    delete worker_env_.device_mgr;
   }
-  delete worker_env_.device_mgr;
 
   // Do not delete (as these are not owned by the server):
   // - master_env_.env
@@ -100,8 +103,9 @@ GrpcServer::~GrpcServer() {
   // - worker_env_.compute_pool
 }
 
-Status GrpcServer::Init(ServiceInitFunction service_func,
-                        RendezvousMgrCreationFunction rendevous_mgr_func) {
+Status GrpcServer::Init(
+    ServiceInitFunction service_func,
+    const RendezvousMgrCreationFunction& rendezvous_mgr_func) {
   mutex_lock l(mu_);
   CHECK_EQ(state_, NEW);
   master_env_.env = env_;
@@ -117,7 +121,11 @@ Status GrpcServer::Init(ServiceInitFunction service_func,
                       "/task:", server_def_.task_index());
   TF_RETURN_IF_ERROR(DeviceFactory::AddDevices(sess_opts, name_prefix,
                                                &master_env_.local_devices));
-  worker_env_.device_mgr = new DeviceMgr(master_env_.local_devices);
+  worker_env_.local_devices = master_env_.local_devices;
+  worker_env_.device_mgr = new DeviceMgr(worker_env_.local_devices);
+  worker_env_.rendezvous_mgr = rendezvous_mgr_func == nullptr
+                                   ? new RpcRendezvousMgr(&worker_env_)
+                                   : rendezvous_mgr_func(&worker_env_);
   string unused;
   string default_worker_name;
   if (!DeviceNameUtils::SplitDeviceName(master_env_.local_devices[0]->name(),
@@ -189,20 +197,18 @@ Status GrpcServer::Init(ServiceInitFunction service_func,
   }
 
   WorkerCacheInterface* worker_cache;
-  TF_RETURN_IF_ERROR(WorkerCacheFactory(server_def_, &worker_cache));
+  WorkerCacheFactoryOptions worker_cache_factory_options(server_def_);
+  TF_RETURN_IF_ERROR(
+      WorkerCacheFactory(worker_cache_factory_options, &worker_cache));
   CHECK_NE(nullptr, worker_cache);
 
   // Set up worker environment.
-  std::unique_ptr<RendezvousMgrInterface> rendezvous_mgr(
-      rendevous_mgr_func == nullptr ?
-      new RpcRendezvousMgr(&worker_env_, name_prefix, worker_cache) :
-      rendevous_mgr_func(&worker_env_, name_prefix, worker_cache));
   worker_env_.session_mgr = new SessionMgr(
       &worker_env_, SessionMgr::WorkerNameFromServerDef(server_def_),
       std::unique_ptr<WorkerCacheInterface>(worker_cache),
-      std::move(rendezvous_mgr),
       [this](const ServerDef& server_def, WorkerCacheInterface** worker_cache) {
-        return WorkerCacheFactory(server_def, worker_cache);
+        WorkerCacheFactoryOptions options(server_def);
+        return WorkerCacheFactory(options, worker_cache);
       });
   worker_env_.compute_pool = ComputePool(sess_opts);
 
@@ -212,11 +218,19 @@ Status GrpcServer::Init(ServiceInitFunction service_func,
   master_env_.master_session_factory =
       [config](
           SessionOptions options, const MasterEnv* env,
-          std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devs) {
+          std::unique_ptr<std::vector<std::unique_ptr<Device>>> remote_devs,
+          std::unique_ptr<WorkerCacheInterface> worker_cache,
+          std::unique_ptr<DeviceSet> device_set) {
         options.config.MergeFrom(config);
         return new MasterSession(options, env, std::move(remote_devs),
+                                 std::move(worker_cache), std::move(device_set),
                                  CreateNoOpStatsPublisher);
       };
+  master_env_.worker_cache_factory =
+      [this](const WorkerCacheFactoryOptions& options,
+             WorkerCacheInterface** worker_cache) {
+        return WorkerCacheFactory(options, worker_cache);
+      };
 
   // Provide direct access to the master from in-process clients.
   LocalMaster::Register(target(), master_impl_.get(),
@@ -225,13 +239,11 @@ Status GrpcServer::Init(ServiceInitFunction service_func,
   return Status::OK();
 }
 
-Status GrpcServer::Init() {
-  return Init(nullptr, nullptr);
-}
+Status GrpcServer::Init() { return Init(nullptr, nullptr); }
 
-Status GrpcServer::ParseChannelSpec(const ServerDef& server_def,
+Status GrpcServer::ParseChannelSpec(const WorkerCacheFactoryOptions& options,
                                     GrpcChannelSpec* channel_spec) {
-  for (const auto& job : server_def.cluster().job()) {
+  for (const auto& job : options.cluster_def->job()) {
     std::map<int, string> host_ports;
     for (const auto& task : job.tasks()) {
       string& host_port = host_ports[task.first];
@@ -241,8 +253,7 @@ Status GrpcServer::ParseChannelSpec(const ServerDef& server_def,
                                        task.first, "\": ", host_port, " and ",
                                        task.second);
       }
-      if (job.name() == server_def.job_name() &&
-          task.first == server_def.task_index()) {
+      if (job.name() == *options.job_name && task.first == options.task_index) {
         host_port = strings::StrCat("localhost:", bound_port_);
       } else {
         host_port = task.second;
@@ -253,17 +264,26 @@ Status GrpcServer::ParseChannelSpec(const ServerDef& server_def,
   return Status::OK();
 }
 
-Status GrpcServer::WorkerCacheFactory(const ServerDef& server_def,
+Status GrpcServer::WorkerCacheFactory(const WorkerCacheFactoryOptions& options,
                                       WorkerCacheInterface** worker_cache) {
-  string name_prefix =
-      strings::StrCat("/job:", server_def.job_name(), "/replica:0",
-                      "/task:", server_def.task_index());
+  if (options.job_name == nullptr || options.job_name->empty()) {
+    Status s = errors::InvalidArgument(
+        "The master (current machine) is not included in the provided "
+        "cluster_def. ",
+        options.cluster_def->DebugString());
+    LOG(WARNING) << s;
+    return s;
+  }
 
   GrpcChannelSpec channel_spec;
-  TF_RETURN_IF_ERROR(ParseChannelSpec(server_def, &channel_spec));
+  TF_RETURN_IF_ERROR(ParseChannelSpec(options, &channel_spec));
+
+  std::unique_ptr<GrpcChannelCache> channel_cache(
+      NewGrpcChannelCache(channel_spec, GetChannelCreationFunction()));
+
+  string name_prefix = strings::StrCat("/job:", *options.job_name, "/replica:0",
+                                       "/task:", options.task_index);
 
-  std::unique_ptr<GrpcChannelCache> channel_cache(NewGrpcChannelCache(
-      channel_spec, GetChannelCreationFunction(server_def)));
   const string host_port = channel_cache->TranslateTask(name_prefix);
   int requested_port;
 
@@ -349,8 +369,7 @@ std::shared_ptr<::grpc::ServerCredentials> GrpcServer::GetServerCredentials(
   return ::grpc::InsecureServerCredentials();
 }
 
-ChannelCreationFunction GrpcServer::GetChannelCreationFunction(
-    const ServerDef& server_def) const {
+ChannelCreationFunction GrpcServer::GetChannelCreationFunction() const {
   // We can do this because SparseGrpcChannelCache is robust to nullptr being
   // returned by the channel creation function
   return ConvertToChannelCreationFunction(NewHostPortGrpcChannel);
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
index 3b66291a9a..7b54bb84c8 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
@@ -37,9 +37,7 @@ class GrpcWorker;
 class Master;
 
 // function that creates a RendezvousMgr.
-typedef std::function<RendezvousMgrInterface*(
-    const WorkerEnv*, const std::string& worker_name,
-    WorkerCacheInterface* worker_cache)>
+typedef std::function<RendezvousMgrInterface*(const WorkerEnv*)>
     RendezvousMgrCreationFunction;
 
 // function that registers a service to the server. The service needs to
@@ -67,7 +65,7 @@ class GrpcServer : public ServerInterface {
 
  protected:
   Status Init(ServiceInitFunction service_func,
-              RendezvousMgrCreationFunction rendezvous_mgr_func);
+              const RendezvousMgrCreationFunction& rendezvous_mgr_func);
 
   Status Init();
 
@@ -75,17 +73,16 @@ class GrpcServer : public ServerInterface {
   virtual std::shared_ptr<::grpc::ServerCredentials> GetServerCredentials(
       const ServerDef& server_def) const;
 
-  virtual ChannelCreationFunction GetChannelCreationFunction(
-      const ServerDef& server_def) const;
+  virtual ChannelCreationFunction GetChannelCreationFunction() const;
 
   virtual std::unique_ptr<Master> CreateMaster(MasterEnv* master_env);
 
   // Creates a WorkerCacheInterface for a session.
-  Status WorkerCacheFactory(const ServerDef& server_def,
+  Status WorkerCacheFactory(const WorkerCacheFactoryOptions& options,
                             WorkerCacheInterface** worker_cache);
 
-  // Parses a ServerDef into a GrpcChannelSpec.
-  Status ParseChannelSpec(const ServerDef& server_def,
+  // Parses a WorkerCacheFactoryOptions into a GrpcChannelSpec.
+  Status ParseChannelSpec(const WorkerCacheFactoryOptions& options,
                           GrpcChannelSpec* channel_spec);
 
   // Returns the port to which this server is bound.
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_session.cc b/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
index 1aacef8a26..38d59d5bb5 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_session.cc
@@ -43,7 +43,7 @@ const size_t kSchemePrefixLength = strlen(kSchemePrefix);
 /* static */
 Status GrpcSession::Create(const SessionOptions& options,
                            std::unique_ptr<GrpcSession>* out_session) {
-  std::unique_ptr<GrpcSession> ret(new GrpcSession(options));
+  std::unique_ptr<GrpcSession> session(new GrpcSession(options));
   std::unique_ptr<MasterInterface> master;
   // For testing, we enable the client to disable the use of the local
   // master registry, so that the RPC stack is exercised.
@@ -56,8 +56,8 @@ Status GrpcSession::Create(const SessionOptions& options,
         options.target.substr(kSchemePrefixLength), &master_channel));
     master.reset(NewGrpcMaster(master_channel));
   }
-  ret->SetRemoteMaster(std::move(master));
-  *out_session = std::move(ret);
+  session->SetRemoteMaster(std::move(master));
+  *out_session = std::move(session);
   return Status::OK();
 }
 
@@ -102,6 +102,7 @@ Status GrpcSession::CreateImpl(CallOptions* call_options,
   CreateSessionRequest req;
   *req.mutable_config() = options_.config;
   *req.mutable_graph_def() = graph;
+  req.set_target(options_.target);
   ReEncodeConsts(req.mutable_graph_def());
   CreateSessionResponse resp;
   Status s = master_->CreateSession(call_options, &req, &resp);
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_worker_service.cc b/tensorflow/core/distributed_runtime/rpc/grpc_worker_service.cc
index c11266587d..873ef8588f 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_worker_service.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_worker_service.cc
@@ -113,6 +113,7 @@ class GrpcWorkerService : public AsyncServiceInterface {
     // completes, and we may decide to bound some of the request
     // types.
     ENQUEUE_REQUEST(GetStatus, false);
+    ENQUEUE_REQUEST(CreateWorkerSession, false);
     ENQUEUE_REQUEST(CleanupAll, false);
     ENQUEUE_REQUEST(RegisterGraph, false);
     ENQUEUE_REQUEST(DeregisterGraph, false);
@@ -181,6 +182,16 @@ class GrpcWorkerService : public AsyncServiceInterface {
     ENQUEUE_REQUEST(GetStatus, false);
   }
 
+  void CreateWorkerSessionHandler(
+      WorkerCall<CreateWorkerSessionRequest, CreateWorkerSessionResponse>*
+          call) {
+    Schedule([this, call]() {
+      Status s = worker_->CreateWorkerSession(&call->request, &call->response);
+      call->SendResponse(ToGrpcStatus(s));
+    });
+    ENQUEUE_REQUEST(CreateWorkerSession, false);
+  }
+
   void CleanupAllHandler(
       WorkerCall<CleanupAllRequest, CleanupAllResponse>* call) {
     Schedule([this, call]() {
@@ -298,7 +309,6 @@ void GrpcWorker::RecvTensorAsync(CallOptions* opts,
                                  ::grpc::ByteBuffer* response,
                                  StatusCallback done) {
   const int64 step_id = request->step_id();
-  WorkerSession* session = env_->session_mgr->WorkerSessionForStepId(step_id);
   const string& key = request->rendezvous_key();
   TRACEPRINTF("RecvTensor: %lld %s", step_id, key.c_str());
   Rendezvous::ParsedKey parsed;
@@ -317,7 +327,7 @@ void GrpcWorker::RecvTensorAsync(CallOptions* opts,
   // of execution of the callback lambda body below, an RPC
   // cancellation should abort the rendezvous.
   opts->SetCancelCallback([this, step_id]() { AbortStep(step_id); });
-  session->rendezvous_mgr->RecvLocalAsync(
+  env_->rendezvous_mgr->RecvLocalAsync(
       step_id, parsed,
       [opts, response, done, src_dev](const Status& status,
                                       const Rendezvous::Args& send_args,
diff --git a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.cc b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.cc
index 7518a289fd..8265100061 100644
--- a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.cc
+++ b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.cc
@@ -38,9 +38,8 @@ namespace {
 
 class RpcRemoteRendezvous : public BaseRemoteRendezvous {
  public:
-  RpcRemoteRendezvous(const WorkerEnv* env, const string& worker_name,
-                      WorkerCacheInterface* cache, int64 step_id)
-      : BaseRemoteRendezvous(env, worker_name, step_id, false), cache_(cache) {}
+  RpcRemoteRendezvous(const WorkerEnv* env, int64 step_id)
+      : BaseRemoteRendezvous(env, step_id, false) {}
 
  protected:
   void RecvFromRemoteAsync(const Rendezvous::ParsedKey& parsed,
@@ -50,7 +49,6 @@ class RpcRemoteRendezvous : public BaseRemoteRendezvous {
  private:
   ~RpcRemoteRendezvous() override {}
 
-  WorkerCacheInterface* const cache_;  // Not owned.
   TF_DISALLOW_COPY_AND_ASSIGN(RpcRemoteRendezvous);
 };
 
@@ -204,75 +202,10 @@ static RpcRecvTensorFreeList* get_call_freelist() {
   return call_freelist;
 }
 
-// A private cache that wraps worker_cache and allows reuse of
-// WorkerInterface objects.
-class WorkerFreeListCache : public WorkerCacheInterface {
- public:
-  explicit WorkerFreeListCache(WorkerCacheInterface* w) : wrapped_(w) {}
-
-  ~WorkerFreeListCache() {
-    for (auto p : workers_) {
-      wrapped_->ReleaseWorker(p.first, p.second.worker);
-    }
-  }
-
-  void ListWorkers(std::vector<string>* workers) const override {
-    wrapped_->ListWorkers(workers);
-  }
-
-  WorkerInterface* CreateWorker(const string& target) override {
-    mutex_lock l(mu_);
-    auto p = workers_.find(target);
-    if (p != workers_.end()) {
-      return p->second.worker;
-    }
-    WorkerState state;
-    state.worker = wrapped_->CreateWorker(target);
-    if (state.worker != nullptr) {
-      workers_.insert(std::make_pair(target, state));
-    }
-    return state.worker;
-  }
-
-  void ReleaseWorker(const string& target, WorkerInterface* worker) override {
-    // TODO(jeff,sanjay): Should decrement ref-count when we implement eviction.
-  }
-
-  bool GetDeviceLocalityNonBlocking(const string& device,
-                                    DeviceLocality* locality) override {
-    return wrapped_->GetDeviceLocalityNonBlocking(device, locality);
-  }
-
-  void GetDeviceLocalityAsync(const string& device, DeviceLocality* locality,
-                              StatusCallback done) override {
-    wrapped_->GetDeviceLocalityAsync(device, locality, done);
-  }
-
-  void SetLogging(bool active) override { wrapped_->SetLogging(active); }
-
-  void ClearLogs() override { wrapped_->ClearLogs(); }
-
-  bool RetrieveLogs(int64 step_id, StepStats* ss) override {
-    return wrapped_->RetrieveLogs(step_id, ss);
-  }
-
- private:
-  WorkerCacheInterface* wrapped_;
-
-  // Information kept per created WorkerInterface.
-  struct WorkerState {
-    WorkerInterface* worker;
-    // TODO(jeff,sanjay): Add reference count if we support eviction.
-  };
-
-  // TODO(jeff,sanjay): Eviction when the map becomes too big.
-  mutex mu_;
-  std::unordered_map<string, WorkerState> workers_ GUARDED_BY(mu_);
-};
-
 void RpcRemoteRendezvous::RecvFromRemoteAsync(
     const Rendezvous::ParsedKey& parsed, const Rendezvous::Args& recv_args,
     DoneCallback done) {
+  CHECK(is_initialized());
   Status s;
 
   // Prepare a RecvTensor call that can handle being aborted.
@@ -284,17 +217,21 @@ void RpcRemoteRendezvous::RecvFromRemoteAsync(
     s = errors::Internal(parsed.src_device,
                          " is invalid remote source device.");
   }
-  WorkerInterface* rwi = cache_->CreateWorker(call->src_worker_);
+  WorkerSession* sess = session();
+  WorkerInterface* rwi = sess->worker_cache->CreateWorker(call->src_worker_);
   if (s.ok() && rwi == nullptr) {
     s = errors::Internal("No worker known as ", call->src_worker_);
   }
 
   Device* dst_device;
   if (s.ok()) {
-    s = env_->device_mgr->LookupDevice(parsed.dst_device, &dst_device);
+    s = sess->device_mgr->LookupDevice(parsed.dst_device, &dst_device);
   }
   if (!s.ok()) {
-    get_call_freelist()->Release(call, cache_);
+    if (rwi != nullptr) {
+      sess->worker_cache->ReleaseWorker(call->src_worker_, rwi);
+    }
+    get_call_freelist()->Release(call, sess->worker_cache.get());
     done(s, Args(), recv_args, Tensor{}, false);
     return;
   }
@@ -314,26 +251,21 @@ void RpcRemoteRendezvous::RecvFromRemoteAsync(
     // current status should be bad.
     Status s = call->status();
     call->done()(s, Args(), call->recv_args(), call->tensor(), call->is_dead());
-    cache_->ReleaseWorker(call->src_worker_, call->wi_);
+    session()->worker_cache->ReleaseWorker(call->src_worker_, call->wi_);
     call->wi_ = nullptr;
-    get_call_freelist()->Release(call, cache_);
+    get_call_freelist()->Release(call, session()->worker_cache.get());
     Unref();
   });
 }
 
 }  // namespace
 
-RpcRendezvousMgr::RpcRendezvousMgr(const WorkerEnv* env,
-                                   const string& worker_name,
-                                   WorkerCacheInterface* worker_cache)
-    : BaseRendezvousMgr(env, worker_name),
-      cache_(new WorkerFreeListCache(worker_cache)) {}
+RpcRendezvousMgr::RpcRendezvousMgr(const WorkerEnv* env)
+    : BaseRendezvousMgr(env) {}
 
 BaseRemoteRendezvous* RpcRendezvousMgr::Create(int64 step_id,
-                                               const WorkerEnv* worker_env,
-                                               const string& worker_name) {
-  return new RpcRemoteRendezvous(worker_env, worker_name, cache_.get(),
-                                 step_id);
+                                               const WorkerEnv* worker_env) {
+  return new RpcRemoteRendezvous(worker_env, step_id);
 }
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.h b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.h
index 75dc62d98f..34c48a7917 100644
--- a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.h
+++ b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.h
@@ -17,13 +17,13 @@ limitations under the License.
 #define TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_RPC_RPC_RENDEZVOUS_MGR_H_
 
 #include "tensorflow/core/distributed_runtime/base_rendezvous_mgr.h"
-#include "tensorflow/core/distributed_runtime/worker_cache.h"
 #include "tensorflow/core/distributed_runtime/worker_env.h"
-#include "tensorflow/core/distributed_runtime/worker_session.h"
 #include "tensorflow/core/platform/macros.h"
 
 namespace tensorflow {
 
+class DeviceMgr;
+
 // RendezvousMgr keeps track of a set of local rendezvous instances.
 // All tensors sent by this worker are buffered in a RendezvousMgr
 // until the tensor is received.  Each global unique "step_id"
@@ -44,17 +44,12 @@ namespace tensorflow {
 // RendezvousMgr must have keys generated by Rendezvous::CreateKey.
 class RpcRendezvousMgr : public BaseRendezvousMgr {
  public:
-  explicit RpcRendezvousMgr(const WorkerEnv* env, const string& worker_name,
-                            WorkerCacheInterface* worker_cache);
+  explicit RpcRendezvousMgr(const WorkerEnv* env);
 
  protected:
-  BaseRemoteRendezvous* Create(int64 step_id, const WorkerEnv* worker_env,
-                               const string& session_name) override;
+  BaseRemoteRendezvous* Create(int64 step_id, const WorkerEnv* worker_env);
 
  private:
-  // Private cache_ that allows us to reuse WorkerInterface objects.
-  std::unique_ptr<WorkerCacheInterface> cache_;
-
   TF_DISALLOW_COPY_AND_ASSIGN(RpcRendezvousMgr);
 };
 
diff --git a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc
index 9b778eab3a..2d0d76623d 100644
--- a/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc
+++ b/tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr_test.cc
@@ -68,9 +68,9 @@ class RpcRendezvousMgrTest : public ::testing::Test {
       : cache_(new DummyWorkerCache),
         worker_session_("/job:mnist/replica:1/task:2",
                         std::unique_ptr<WorkerCacheInterface>(cache_),
-                        std::unique_ptr<RendezvousMgrInterface>(),
+                        std::unique_ptr<DeviceMgr>(),
                         std::unique_ptr<GraphMgr>()),
-        rmgr_(&env, worker_session_.worker_name, cache_) {
+        rmgr_(&env) {
     env.env = Env::Default();
   }
 
@@ -87,7 +87,8 @@ TEST_F(RpcRendezvousMgrTest, LocalSendRecv) {
       "/job:mnist/replica:1/task:2/cpu:0", 7890,
       "/job:mnist/replica:1/task:2/cpu:1", "foo", FrameAndIter(0, 0)));
   {
-    Rendezvous* rendez = rmgr_.Find(step_id);
+    RemoteRendezvous* rendez = rmgr_.Find(step_id);
+    TF_ASSERT_OK(rendez->Initialize(&worker_session_));
     core::ScopedUnref unref(rendez);
     Rendezvous::Args args;
     TF_ASSERT_OK(rendez->Send(key, args, V("peach"), false));
@@ -107,7 +108,7 @@ TEST_F(RpcRendezvousMgrTest, LocalAbort) {
       "/job:mnist/replica:1/task:2/cpu:1", "foo", FrameAndIter(0, 0)));
   {  // Explicit Abort().
     const int64 step_id = 123;
-    Rendezvous* rendez = rmgr_.Find(step_id);
+    RemoteRendezvous* rendez = rmgr_.Find(step_id);
     core::ScopedUnref unref(rendez);
     SchedClosure([this, rendez]() {
       env.env->SleepForMicroseconds(100 * 1000);
@@ -116,11 +117,12 @@ TEST_F(RpcRendezvousMgrTest, LocalAbort) {
     Tensor val(DT_STRING);
     bool val_dead = false;
     Rendezvous::Args args;
+    TF_ASSERT_OK(rendez->Initialize(&worker_session_));
     EXPECT_TRUE(errors::IsAborted(rendez->Recv(key, args, &val, &val_dead)));
   }
   {  // Cleanup causes Abort().
     const int64 step_id = 321;
-    Rendezvous* rendez = rmgr_.Find(step_id);
+    RemoteRendezvous* rendez = rmgr_.Find(step_id);
     core::ScopedUnref unref(rendez);
     SchedClosure([this, step_id]() {
       env.env->SleepForMicroseconds(100 * 1000);
@@ -129,6 +131,7 @@ TEST_F(RpcRendezvousMgrTest, LocalAbort) {
     Tensor val(DT_STRING);
     bool val_dead = false;
     Rendezvous::Args args;
+    TF_ASSERT_OK(rendez->Initialize(&worker_session_));
     EXPECT_TRUE(errors::IsAborted(rendez->Recv(key, args, &val, &val_dead)));
   }
 }
@@ -139,7 +142,8 @@ TEST_F(RpcRendezvousMgrTest, CleanupAll) {
       "/job:mnist/replica:1/task:2/cpu:1", "foo", FrameAndIter(0, 0)));
   {
     const int64 step_id = 123;
-    Rendezvous* rendez = rmgr_.Find(step_id);
+    RemoteRendezvous* rendez = rmgr_.Find(step_id);
+    TF_ASSERT_OK(rendez->Initialize(&worker_session_));
     core::ScopedUnref unref(rendez);
     Rendezvous::Args args;
     TF_ASSERT_OK(rendez->Send(key, args, V("peach"), false));
@@ -168,10 +172,11 @@ TEST_F(RpcRendezvousMgrTest, TransferDummyDeviceContext) {
       "/job:mnist/replica:1/task:2/cpu:0", 7890,
       "/job:mnist/replica:1/task:2/cpu:1", "foo", FrameAndIter(0, 0)));
   {
-    Rendezvous* rendez = rmgr_.Find(step_id);
+    RemoteRendezvous* rendez = rmgr_.Find(step_id);
     core::ScopedUnref unref(rendez);
     Rendezvous::Args args;
     args.device_context = dc;
+    TF_ASSERT_OK(rendez->Initialize(&worker_session_));
     TF_ASSERT_OK(rendez->Send(key, args, V("peach"), false));
   }
   {
diff --git a/tensorflow/core/distributed_runtime/session_mgr.cc b/tensorflow/core/distributed_runtime/session_mgr.cc
index e2be62f816..22551d5482 100644
--- a/tensorflow/core/distributed_runtime/session_mgr.cc
+++ b/tensorflow/core/distributed_runtime/session_mgr.cc
@@ -17,8 +17,9 @@ limitations under the License.
 
 #include <utility>
 
+#include "tensorflow/core/common_runtime/device_mgr.h"
+#include "tensorflow/core/common_runtime/renamed_device.h"
 #include "tensorflow/core/distributed_runtime/graph_mgr.h"
-#include "tensorflow/core/distributed_runtime/rpc/rpc_rendezvous_mgr.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 
 namespace tensorflow {
@@ -26,23 +27,12 @@ namespace tensorflow {
 SessionMgr::SessionMgr(
     WorkerEnv* worker_env, const string& default_worker_name,
     std::unique_ptr<WorkerCacheInterface> default_worker_cache,
-    std::unique_ptr<RendezvousMgrInterface> default_rendezvous_mgr,
-    WorkerCacheFactory worker_cache_factory)
-    : SessionMgr(
-          worker_env, default_worker_name, std::move(default_worker_cache),
-          default_rendezvous_mgr.release(), std::move(worker_cache_factory)) {}
-
-SessionMgr::SessionMgr(
-    WorkerEnv* worker_env, const string& default_worker_name,
-    std::unique_ptr<WorkerCacheInterface> default_worker_cache,
-    RendezvousMgrInterface* default_rendezvous_mgr,
     WorkerCacheFactory worker_cache_factory)
     : worker_env_(worker_env),
-      legacy_session_(
-          default_worker_name, std::move(default_worker_cache),
-          std::unique_ptr<RendezvousMgrInterface>(default_rendezvous_mgr),
-          std::unique_ptr<GraphMgr>(
-              new GraphMgr(worker_env, default_rendezvous_mgr))),
+      legacy_session_(default_worker_name, std::move(default_worker_cache),
+                      std::unique_ptr<DeviceMgr>(worker_env->device_mgr),
+                      std::unique_ptr<GraphMgr>(
+                          new GraphMgr(worker_env, worker_env->device_mgr))),
       worker_cache_factory_(std::move(worker_cache_factory)) {}
 
 string SessionMgr::WorkerNameFromServerDef(const ServerDef& server_def) {
@@ -53,20 +43,28 @@ string SessionMgr::WorkerNameFromServerDef(const ServerDef& server_def) {
 Status SessionMgr::CreateSession(const string& session,
                                  const ServerDef& server_def) {
   mutex_lock l(mu_);
+  if (session.empty()) {
+    return errors::InvalidArgument("Session must be non-empty.");
+  }
+
   const string worker_name = WorkerNameFromServerDef(server_def);
 
   WorkerCacheInterface* worker_cache = nullptr;
   TF_RETURN_IF_ERROR(worker_cache_factory_(server_def, &worker_cache));
 
-  std::unique_ptr<RendezvousMgrInterface> rendezvous_mgr(
-      new RpcRendezvousMgr(worker_env_, worker_name, worker_cache));
+  std::vector<Device*> renamed_devices;
+  for (Device* d : worker_env_->local_devices) {
+    renamed_devices.push_back(
+        RenamedDevice::NewRenamedDevice(worker_name, d, false));
+  }
+  std::unique_ptr<DeviceMgr> device_mgr(new DeviceMgr(renamed_devices));
 
   std::unique_ptr<GraphMgr> graph_mgr(
-      new GraphMgr(worker_env_, rendezvous_mgr.get()));
+      new GraphMgr(worker_env_, device_mgr.get()));
 
   std::unique_ptr<WorkerSession> worker_session(new WorkerSession(
       worker_name, std::unique_ptr<WorkerCacheInterface>(worker_cache),
-      std::move(rendezvous_mgr), std::move(graph_mgr)));
+      std::move(device_mgr), std::move(graph_mgr)));
 
   sessions_.insert(std::make_pair(session, std::move(worker_session)));
   return Status::OK();
@@ -78,22 +76,6 @@ Status SessionMgr::DeleteSession(const string& session) {
   if (it != sessions_.end()) {
     sessions_.erase(it);
   }
-  std::set<string> graph_handles;
-  for (auto graph_handle_it = sessions_by_graph_handle_.begin();
-       graph_handle_it != sessions_by_graph_handle_.end(); ++graph_handle_it) {
-    if (graph_handle_it->second == session) {
-      graph_handles.insert(graph_handle_it->first);
-      graph_handle_it = sessions_by_graph_handle_.erase(graph_handle_it);
-      if (graph_handle_it == sessions_by_graph_handle_.end()) break;
-    }
-  }
-  for (auto step_id_it = graphs_by_step_id_.begin();
-       step_id_it != graphs_by_step_id_.end(); ++step_id_it) {
-    if (graph_handles.find(step_id_it->second) != graph_handles.end()) {
-      step_id_it = graphs_by_step_id_.erase(step_id_it);
-      if (step_id_it == graphs_by_step_id_.end()) break;
-    }
-  }
   return Status::OK();
 }
 
@@ -114,58 +96,4 @@ WorkerSession* SessionMgr::WorkerSessionForSession(const string& session) {
 
 WorkerSession* SessionMgr::LegacySession() { return &legacy_session_; }
 
-WorkerSession* SessionMgr::WorkerSessionForGraphHandleUnlocked(
-    const string& graph_handle) {
-  auto it = sessions_by_graph_handle_.find(graph_handle);
-  if (it == sessions_by_graph_handle_.end()) {
-    return &legacy_session_;
-  } else {
-    return WorkerSessionForSessionUnlocked(it->second);
-  }
-}
-
-WorkerSession* SessionMgr::WorkerSessionForGraphHandle(
-    const string& graph_handle) {
-  mutex_lock l(mu_);
-  return WorkerSessionForGraphHandleUnlocked(graph_handle);
-}
-
-WorkerSession* SessionMgr::WorkerSessionForStepId(const int64 step_id) {
-  mutex_lock l(mu_);
-  auto it = graphs_by_step_id_.find(step_id);
-  if (it == graphs_by_step_id_.end()) {
-    return &legacy_session_;
-  } else {
-    return WorkerSessionForGraphHandleUnlocked(it->second);
-  }
-}
-
-void SessionMgr::AssociateGraphWithSession(const string& session,
-                                           const string& graph_handle) {
-  mutex_lock l(mu_);
-  sessions_by_graph_handle_[graph_handle] = session;
-}
-
-void SessionMgr::DisassociateGraphFromSession(const string& graph_handle) {
-  mutex_lock l(mu_);
-  auto it = sessions_by_graph_handle_.find(graph_handle);
-  if (it != sessions_by_graph_handle_.end()) {
-    sessions_by_graph_handle_.erase(it);
-  }
-}
-
-void SessionMgr::AssociateStepIdWithGraph(const string& graph_handle,
-                                          const int64 step_id) {
-  mutex_lock l(mu_);
-  graphs_by_step_id_[step_id] = graph_handle;
-}
-
-void SessionMgr::DisassociateStepIdFromGraph(const int64 step_id) {
-  mutex_lock l(mu_);
-  auto it = graphs_by_step_id_.find(step_id);
-  if (it != graphs_by_step_id_.end()) {
-    graphs_by_step_id_.erase(it);
-  }
-}
-
 }  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/session_mgr.h b/tensorflow/core/distributed_runtime/session_mgr.h
index 455b5c8d9d..c44bca7b7a 100644
--- a/tensorflow/core/distributed_runtime/session_mgr.h
+++ b/tensorflow/core/distributed_runtime/session_mgr.h
@@ -30,6 +30,8 @@ struct WorkerEnv;
 
 // SessionMgr keeps track of information related to a given session.
 //
+// SessionMgr runs on the workers.
+//
 // SessionMgr is threadsafe.
 class SessionMgr {
  public:
@@ -39,7 +41,6 @@ class SessionMgr {
   explicit SessionMgr(
       WorkerEnv* worker_env, const string& default_worker_name,
       std::unique_ptr<WorkerCacheInterface> default_worker_cache,
-      std::unique_ptr<RendezvousMgrInterface> default_rendezvous_mgr,
       WorkerCacheFactory worker_cache_factory);
   ~SessionMgr() {}
 
@@ -50,49 +51,36 @@ class SessionMgr {
   WorkerSession* WorkerSessionForSession(const string& session);
   WorkerSession* LegacySession();
 
-  // Locates the worker session for a given graph handle
-  WorkerSession* WorkerSessionForGraphHandle(const string& graph_handle);
-  void AssociateGraphWithSession(const string& session,
-                                 const string& graph_handle);
-  void DisassociateGraphFromSession(const string& graph_handle);
-
-  // Locates a worker session for a given step id
-  WorkerSession* WorkerSessionForStepId(const int64 step_id);
-  void AssociateStepIdWithGraph(const string& graph_handle,
-                                const int64 step_id);
-  void DisassociateStepIdFromGraph(const int64 step_id);
-
   Status DeleteSession(const string& session);
 
   static string WorkerNameFromServerDef(const ServerDef& server_def);
 
  private:
-  // Private constructor to work around std::unique_ptr ownership issues.
-  explicit SessionMgr(
-      WorkerEnv* worker_env, const string& default_worker_name,
-      std::unique_ptr<WorkerCacheInterface> default_worker_cache,
-      RendezvousMgrInterface* default_rendezvous_mgr,
-      WorkerCacheFactory worker_cache_factory);
-
   const WorkerEnv* const worker_env_;  // Not owned.
+
+  // A note about destruction:
+  // We must delete graph_mgr before device_mgr, due to shared
+  // ownership of OpKernels in the executors. (The graph_mgr will
+  // free all stateless OpKernels, and pass over borrowed stateful
+  // OpKernels, which are also held in their respective devices'
+  // OpSegments.)
+  //
+  // legacy_session_ owns the worker_env_.device_mgr, and so we must ensure
+  // that sessions_'s WorkerSessions are deleted (which do not own the
+  // underlying devices, but instead own RenamedDevices) before
+  // legacy_session_ is deleted. Further, we must ensure that WorkerSession's
+  // device_mgr is deleted after WorkerSession's graph_mgr.
+
   WorkerSession legacy_session_;
 
   const WorkerCacheFactory worker_cache_factory_;
 
   WorkerSession* WorkerSessionForSessionUnlocked(const string& session)
       EXCLUSIVE_LOCKS_REQUIRED(mu_);
-  WorkerSession* WorkerSessionForGraphHandleUnlocked(const string& graph_handle)
-      EXCLUSIVE_LOCKS_REQUIRED(mu_);
 
   mutex mu_;
   // A map from session identifier to internal session structure.
   std::map<string, std::unique_ptr<WorkerSession>> sessions_ GUARDED_BY(mu_);
-
-  // A map from graph handles to the session that they belong to.
-  std::map<string, string> sessions_by_graph_handle_ GUARDED_BY(mu_);
-
-  // A map from globally-unique step id's to the corresponding graph handles.
-  std::map<int64, string> graphs_by_step_id_ GUARDED_BY(mu_);
 };
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/session_mgr_test.cc b/tensorflow/core/distributed_runtime/session_mgr_test.cc
index d3f3fa8395..7132f123a5 100644
--- a/tensorflow/core/distributed_runtime/session_mgr_test.cc
+++ b/tensorflow/core/distributed_runtime/session_mgr_test.cc
@@ -27,8 +27,6 @@ class SessionMgrTest : public ::testing::Test {
   SessionMgrTest()
       : mgr_(&env_, "/job:mnist/replica:0/task:0",
              std::unique_ptr<WorkerCacheInterface>(),
-             std::unique_ptr<RendezvousMgrInterface>(new RpcRendezvousMgr(
-                 &env_, "/job:mnist/replica:0/task:0", nullptr)),
              factory_),
         legacy_session_(mgr_.WorkerSessionForSession("novel_session_id")) {}
 
@@ -48,90 +46,19 @@ TEST_F(SessionMgrTest, CreateSessionSimple) {
   TF_EXPECT_OK(mgr_.CreateSession(session_handle, server_def));
   WorkerSession* session = mgr_.WorkerSessionForSession(session_handle);
   EXPECT_NE(nullptr, session) << "Session for " << session_handle << "was null";
-
-  TF_EXPECT_OK(mgr_.DeleteSession(session_handle));
-}
-
-TEST_F(SessionMgrTest, AssociateGraphWithSession) {
-  ServerDef server_def;
-  string session_handle = "test_session_handle";
-  TF_EXPECT_OK(mgr_.CreateSession(session_handle, server_def));
-  WorkerSession* session = mgr_.WorkerSessionForSession(session_handle);
-  ASSERT_NE(nullptr, session) << "Session for " << session_handle << "was null";
-
-  string graph_handle = "test_graph_handle";
-  mgr_.AssociateGraphWithSession(session_handle, graph_handle);
-  WorkerSession* graph_session = mgr_.WorkerSessionForGraphHandle(graph_handle);
-  ASSERT_EQ(session, graph_session);
-
+  EXPECT_NE(mgr_.LegacySession(), session);
   TF_EXPECT_OK(mgr_.DeleteSession(session_handle));
 }
 
-TEST_F(SessionMgrTest, AssociateStepWithGraph) {
+TEST_F(SessionMgrTest, LegacySession) {
   ServerDef server_def;
-  string session_handle = "test_session_handle";
-  TF_EXPECT_OK(mgr_.CreateSession(session_handle, server_def));
+  string session_handle = "";
   WorkerSession* session = mgr_.WorkerSessionForSession(session_handle);
-  ASSERT_NE(nullptr, session) << "Session for " << session_handle << "was null";
-
-  string graph_handle = "test_graph_handle";
-  mgr_.AssociateGraphWithSession(session_handle, graph_handle);
-  WorkerSession* graph_session = mgr_.WorkerSessionForGraphHandle(graph_handle);
-  ASSERT_EQ(session, graph_session);
-
-  int64 step_id = 1234567890L;
-  mgr_.AssociateStepIdWithGraph(graph_handle, step_id);
-  WorkerSession* step_session = mgr_.WorkerSessionForStepId(step_id);
-  ASSERT_EQ(session, step_session);
-  ASSERT_EQ(graph_session, step_session);
+  EXPECT_EQ(mgr_.LegacySession(), session);
 
   TF_EXPECT_OK(mgr_.DeleteSession(session_handle));
 }
 
-TEST_F(SessionMgrTest, AssociateGraphWithSession_MissingSession) {
-  string session_handle = "test_session_handle";
-  string graph_handle = "test_graph_handle";
-  mgr_.AssociateGraphWithSession(session_handle, graph_handle);
-  WorkerSession* graph_session = mgr_.WorkerSessionForGraphHandle(graph_handle);
-  ASSERT_EQ(legacy_session_, graph_session);
-}
-
-TEST_F(SessionMgrTest, AssociateStepWithGraph_MissingGraph) {
-  ServerDef server_def;
-  string session_handle = "test_session_handle";
-  TF_EXPECT_OK(mgr_.CreateSession(session_handle, server_def));
-  WorkerSession* session = mgr_.WorkerSessionForSession(session_handle);
-  ASSERT_NE(nullptr, session) << "Session for " << session_handle << "was null";
-
-  string graph_handle = "test_graph_handle";
-  int64 step_id = 1234567890L;
-  mgr_.AssociateStepIdWithGraph(graph_handle, step_id);
-  WorkerSession* step_session = mgr_.WorkerSessionForStepId(step_id);
-  ASSERT_EQ(legacy_session_, step_session);
-}
-
-TEST_F(SessionMgrTest, AssociateStepWithGraph_MissingSession) {
-  string session_handle = "test_session_handle";
-  string graph_handle = "test_graph_handle";
-  mgr_.AssociateGraphWithSession(session_handle, graph_handle);
-  WorkerSession* graph_session = mgr_.WorkerSessionForGraphHandle(graph_handle);
-  ASSERT_EQ(legacy_session_, graph_session);
-
-  int64 step_id = 1234567890L;
-  mgr_.AssociateStepIdWithGraph(graph_handle, step_id);
-  WorkerSession* step_session = mgr_.WorkerSessionForStepId(step_id);
-  ASSERT_EQ(legacy_session_, step_session);
-}
-
-TEST_F(SessionMgrTest, AssociateStepWithGraph_MissingSessionAndGraph) {
-  string session_handle = "test_session_handle";
-  string graph_handle = "test_graph_handle";
-  int64 step_id = 1234567890L;
-  mgr_.AssociateStepIdWithGraph(graph_handle, step_id);
-  WorkerSession* step_session = mgr_.WorkerSessionForStepId(step_id);
-  ASSERT_EQ(legacy_session_, step_session);
-}
-
 TEST_F(SessionMgrTest, WorkerNameFromServerDef) {
   ServerDef server_def;
   server_def.set_job_name("worker");
diff --git a/tensorflow/core/distributed_runtime/worker.cc b/tensorflow/core/distributed_runtime/worker.cc
index 89639e21b5..07bb17981d 100644
--- a/tensorflow/core/distributed_runtime/worker.cc
+++ b/tensorflow/core/distributed_runtime/worker.cc
@@ -56,10 +56,6 @@ void Worker::RegisterGraphAsync(const RegisterGraphRequest* request,
   Status s = session->graph_mgr->Register(
       request->session_handle(), request->graph_def(), request->graph_options(),
       request->debug_options(), response->mutable_graph_handle());
-  if (s.ok()) {
-    env_->session_mgr->AssociateGraphWithSession(request->session_handle(),
-                                                 response->graph_handle());
-  }
   done(s);
 }
 
@@ -67,9 +63,8 @@ void Worker::DeregisterGraphAsync(const DeregisterGraphRequest* request,
                                   DeregisterGraphResponse* response,
                                   StatusCallback done) {
   WorkerSession* session =
-      env_->session_mgr->WorkerSessionForGraphHandle(request->graph_handle());
+      env_->session_mgr->WorkerSessionForSession(request->session_handle());
   Status s = session->graph_mgr->Deregister(request->graph_handle());
-  env_->session_mgr->DisassociateGraphFromSession(request->graph_handle());
 
   done(s);
 }
@@ -141,8 +136,7 @@ void Worker::SetOrCallFinalCallback(const string& graph_handle, int step_id,
 }
 
 void Worker::AbortStep(int64 step_id) {
-  WorkerSession* session = env_->session_mgr->WorkerSessionForStepId(step_id);
-  Rendezvous* rendez = session->rendezvous_mgr->Find(step_id);
+  Rendezvous* rendez = env_->rendezvous_mgr->Find(step_id);
   SchedNonBlockingClosureAfter(1000000, [rendez, step_id]() {
     // Delay a bit before aborting the step. This way, the root
     // cause may return first back to the client instead of this
@@ -193,8 +187,7 @@ void Worker::DoRunGraph(CallOptions* opts, RunGraphRequestWrapper* request,
   const int64 step_id = request->step_id();
   TRACEPRINTF("RunGraph: %lld", step_id);
   WorkerSession* session =
-      env_->session_mgr->WorkerSessionForGraphHandle(request->graph_handle());
-  env_->session_mgr->AssociateStepIdWithGraph(request->graph_handle(), step_id);
+      env_->session_mgr->WorkerSessionForSession(request->session_handle());
   GraphMgr::NamedTensors in;
   GraphMgr::NamedTensors* out = new GraphMgr::NamedTensors;
   Status s = PrepareRunGraph(request, &in, out);
@@ -231,8 +224,8 @@ void Worker::DoRunGraph(CallOptions* opts, RunGraphRequestWrapper* request,
   }
   CostGraphDef* cost_graph = response->mutable_cost_graph();
   session->graph_mgr->ExecuteAsync(
-      request->graph_handle(), step_id, request->exec_opts(), collector,
-      cost_graph, cm, in,
+      request->graph_handle(), step_id, session, request->exec_opts(),
+      collector, cost_graph, cm, in,
       [this, step_id, response, session, cm, out, token, collector, opts,
        done](Status s) {
         if (s.ok()) {
@@ -267,8 +260,8 @@ void Worker::DoPartialRunGraph(CallOptions* opts,
   const string& graph_handle = request->graph_handle();
   TRACEPRINTF("PartialRunGraph: %lld", step_id);
   WorkerSession* session =
-      env_->session_mgr->WorkerSessionForGraphHandle(graph_handle);
-  env_->session_mgr->AssociateStepIdWithGraph(graph_handle, step_id);
+      env_->session_mgr->WorkerSessionForSession(request->session_handle());
+
   GraphMgr::NamedTensors in;
   GraphMgr::NamedTensors* out = new GraphMgr::NamedTensors;
   Status s = PrepareRunGraph(request, &in, out);
@@ -315,8 +308,8 @@ void Worker::DoPartialRunGraph(CallOptions* opts,
                                               [cm]() { cm->StartCancel(); });
     }
     session->graph_mgr->ExecuteAsync(
-        graph_handle, step_id, request->exec_opts(), nullptr /* collector */,
-        nullptr /* cost_graph */, cm, in,
+        graph_handle, step_id, session, request->exec_opts(),
+        nullptr /* collector */, nullptr /* cost_graph */, cm, in,
         [this, token, graph_handle, step_id, cm](Status s) {
           {
             mutex_lock l(mu_);
@@ -365,8 +358,7 @@ void Worker::CleanupGraphAsync(const CleanupGraphRequest* request,
                                CleanupGraphResponse* response,
                                StatusCallback done) {
   const int64 step_id = request->step_id();
-  WorkerSession* session = env_->session_mgr->WorkerSessionForStepId(step_id);
-  session->rendezvous_mgr->Cleanup(step_id);
+  env_->rendezvous_mgr->Cleanup(step_id);
   done(Status::OK());
 }
 
@@ -394,8 +386,8 @@ void Worker::TracingAsync(const TracingRequest* request,
 Status Worker::PrepareRecvTensor(const Rendezvous::ParsedKey& parsed,
                                  Device** src_dev) {
   // Figures out which device the tensor is hosted on.
-  TF_RETURN_IF_ERROR(
-      env_->device_mgr->LookupDevice(parsed.src_device, src_dev));
+  string local_name = DeviceNameUtils::LocalName(parsed.src_device);
+  TF_RETURN_IF_ERROR(env_->device_mgr->LookupDevice(local_name, src_dev));
 
   // Does the device have the right incarnation number we expect?
   if ((*src_dev)->attributes().incarnation() != parsed.src_incarnation) {
diff --git a/tensorflow/core/distributed_runtime/worker_env.h b/tensorflow/core/distributed_runtime/worker_env.h
index 24fb5948a7..f09bea328f 100644
--- a/tensorflow/core/distributed_runtime/worker_env.h
+++ b/tensorflow/core/distributed_runtime/worker_env.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_WORKER_ENV_H_
 #define TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_WORKER_ENV_H_
 
+#include <vector>
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -24,8 +25,10 @@ namespace thread {
 class ThreadPool;
 }  // namespace thread
 
+class Device;
 class DeviceMgr;
 class Env;
+class RendezvousMgrInterface;
 class SessionMgr;
 
 // The worker environment class, which holds a bag of pointers to
@@ -38,10 +41,18 @@ struct WorkerEnv {
   // session_mgr encapsulates state for each session.
   SessionMgr* session_mgr = nullptr;
 
+  // The local devices of this worker. Devices are owned by the device_mgr.
+  //
+  // REQUIRES: !local_devices.empty().
+  std::vector<Device*> local_devices;
+
   // device_mgr manages local devices (cpu and gpu). The WorkerService
   // is the network interface for managed devices.
   DeviceMgr* device_mgr = nullptr;
 
+  // A set of rendezvous keyed by step ids.
+  RendezvousMgrInterface* rendezvous_mgr = nullptr;
+
   // A pool of threads for scheduling compute work.
   thread::ThreadPool* compute_pool = nullptr;
 };
diff --git a/tensorflow/core/distributed_runtime/worker_interface.h b/tensorflow/core/distributed_runtime/worker_interface.h
index 508bc7f468..c9db28ec67 100644
--- a/tensorflow/core/distributed_runtime/worker_interface.h
+++ b/tensorflow/core/distributed_runtime/worker_interface.h
@@ -113,6 +113,11 @@ class WorkerInterface {
     return CallAndWait(&ME::GetStatusAsync, request, response);
   }
 
+  Status CreateWorkerSession(const CreateWorkerSessionRequest* request,
+                             CreateWorkerSessionResponse* response) {
+    return CallAndWait(&ME::CreateWorkerSessionAsync, request, response);
+  }
+
   Status RegisterGraph(const RegisterGraphRequest* request,
                        RegisterGraphResponse* response) {
     return CallAndWait(&ME::RegisterGraphAsync, request, response);
diff --git a/tensorflow/core/distributed_runtime/worker_session.cc b/tensorflow/core/distributed_runtime/worker_session.cc
index 8298e16959..8691450e9b 100644
--- a/tensorflow/core/distributed_runtime/worker_session.cc
+++ b/tensorflow/core/distributed_runtime/worker_session.cc
@@ -17,14 +17,84 @@ limitations under the License.
 
 namespace tensorflow {
 
-WorkerSession::WorkerSession(
-    const string& worker_name,
-    std::unique_ptr<WorkerCacheInterface> worker_cache,
-    std::unique_ptr<RendezvousMgrInterface> rendezvous_mgr,
-    std::unique_ptr<GraphMgr> graph_mgr)
+namespace {
+
+// A private cache that wraps worker_cache and allows reuse of
+// WorkerInterface objects.
+class WorkerFreeListCache : public WorkerCacheInterface {
+ public:
+  explicit WorkerFreeListCache(std::unique_ptr<WorkerCacheInterface> w)
+      : wrapped_(std::move(w)) {}
+
+  ~WorkerFreeListCache() final {
+    for (auto p : workers_) {
+      wrapped_->ReleaseWorker(p.first, p.second.worker);
+    }
+  }
+
+  void ListWorkers(std::vector<string>* workers) const override {
+    wrapped_->ListWorkers(workers);
+  }
+
+  WorkerInterface* CreateWorker(const string& target) override {
+    mutex_lock l(mu_);
+    auto p = workers_.find(target);
+    if (p != workers_.end()) {
+      return p->second.worker;
+    }
+    WorkerState state;
+    state.worker = wrapped_->CreateWorker(target);
+    if (state.worker != nullptr) {
+      workers_.insert(std::make_pair(target, state));
+    }
+    return state.worker;
+  }
+
+  void ReleaseWorker(const string& target, WorkerInterface* worker) override {
+    // TODO(jeff,sanjay): Should decrement ref-count when we implement eviction.
+  }
+
+  bool GetDeviceLocalityNonBlocking(const string& device,
+                                    DeviceLocality* locality) override {
+    return wrapped_->GetDeviceLocalityNonBlocking(device, locality);
+  }
+
+  void GetDeviceLocalityAsync(const string& device, DeviceLocality* locality,
+                              StatusCallback done) override {
+    wrapped_->GetDeviceLocalityAsync(device, locality, done);
+  }
+
+  void SetLogging(bool active) override { wrapped_->SetLogging(active); }
+
+  void ClearLogs() override { wrapped_->ClearLogs(); }
+
+  bool RetrieveLogs(int64 step_id, StepStats* ss) override {
+    return wrapped_->RetrieveLogs(step_id, ss);
+  }
+
+ private:
+  std::unique_ptr<WorkerCacheInterface> wrapped_;
+
+  // Information kept per created WorkerInterface.
+  struct WorkerState {
+    WorkerInterface* worker;
+    // TODO(jeff,sanjay): Add reference count if we support eviction.
+  };
+
+  // TODO(jeff,sanjay): Eviction when the map becomes too big.
+  mutex mu_;
+  std::unordered_map<string, WorkerState> workers_ GUARDED_BY(mu_);
+};
+
+}  // namespace
+
+WorkerSession::WorkerSession(const string& worker_name,
+                             std::unique_ptr<WorkerCacheInterface> worker_cache,
+                             std::unique_ptr<DeviceMgr> device_mgr,
+                             std::unique_ptr<GraphMgr> graph_mgr)
     : worker_name(worker_name),
-      worker_cache(std::move(worker_cache)),
-      rendezvous_mgr(std::move(rendezvous_mgr)),
+      worker_cache(new WorkerFreeListCache(std::move(worker_cache))),
+      device_mgr(std::move(device_mgr)),
       graph_mgr(std::move(graph_mgr)) {}
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/worker_session.h b/tensorflow/core/distributed_runtime/worker_session.h
index e6ebe88329..77cf4de8f7 100644
--- a/tensorflow/core/distributed_runtime/worker_session.h
+++ b/tensorflow/core/distributed_runtime/worker_session.h
@@ -18,14 +18,13 @@ limitations under the License.
 
 #include <string>
 
+#include "tensorflow/core/common_runtime/device_mgr.h"
 #include "tensorflow/core/distributed_runtime/graph_mgr.h"
-#include "tensorflow/core/distributed_runtime/rendezvous_mgr_interface.h"
 #include "tensorflow/core/distributed_runtime/worker_cache.h"
 
 namespace tensorflow {
 
 class GraphMgr;
-class RendezvousMgrInterface;
 class WorkerCacheInterface;
 
 // WorkerSession encapsulates all of the state relating to a given session.
@@ -36,17 +35,20 @@ struct WorkerSession {
   // Object from which WorkerInterface instances can be obtained.
   const std::unique_ptr<WorkerCacheInterface> worker_cache;
 
-  // A set of rendezvous keyed by step ids.
-  const std::unique_ptr<RendezvousMgrInterface> rendezvous_mgr;
+  // Collection of local devices. These devices are typically RenamedDevices
+  // in all except the SessionMgr.legacy_session_. legacy_session_.device_mgr
+  // == worker_env_.device_mgr, which holds the true devices.
+  const std::unique_ptr<DeviceMgr> device_mgr;
 
   // graph_mgr keeps track of the registered graphs of this session.
   //
   // Note: graph_mgr must be deleted before rendezvous_mgr!
+  // Note: graph_mgr must be deleted before device_mgr!
   const std::unique_ptr<GraphMgr> graph_mgr;
 
   WorkerSession(const string& worker_name,
                 std::unique_ptr<WorkerCacheInterface> worker_cache,
-                std::unique_ptr<RendezvousMgrInterface> rendezvous_mgr,
+                std::unique_ptr<DeviceMgr> device_mgr,
                 std::unique_ptr<GraphMgr> graph_mgr);
 };
 
diff --git a/tensorflow/core/framework/device_base.h b/tensorflow/core/framework/device_base.h
index 8894671fdf..27fe28fe60 100644
--- a/tensorflow/core/framework/device_base.h
+++ b/tensorflow/core/framework/device_base.h
@@ -115,7 +115,7 @@ class DeviceBase {
     cpu_worker_threads_ = t;
   }
 
-  const CpuWorkerThreads* tensorflow_cpu_worker_threads() const {
+  virtual const CpuWorkerThreads* tensorflow_cpu_worker_threads() const {
     CHECK(cpu_worker_threads_ != nullptr);
     return cpu_worker_threads_;
   }
@@ -140,7 +140,7 @@ class DeviceBase {
     gpu_device_info_ = g;
   }
 
-  const GpuDeviceInfo* tensorflow_gpu_device_info() const {
+  virtual const GpuDeviceInfo* tensorflow_gpu_device_info() const {
     return gpu_device_info_;
   }
 
@@ -170,13 +170,13 @@ class DeviceBase {
     return GetAllocator(attr);
   }
 
-  const Eigen::ThreadPoolDevice* eigen_cpu_device() {
+  virtual const Eigen::ThreadPoolDevice* eigen_cpu_device() {
     CHECK(eigen_cpu_device_ != nullptr);
     return eigen_cpu_device_;
   }
 
 #ifdef TENSORFLOW_USE_SYCL
-  const Eigen::SyclDevice* eigen_sycl_device() const {
+  virtual const Eigen::SyclDevice* eigen_sycl_device() const {
     CHECK(eigen_sycl_device_ != nullptr);
     return eigen_sycl_device_;
   }
diff --git a/tensorflow/core/protobuf/cluster.proto b/tensorflow/core/protobuf/cluster.proto
new file mode 100644
index 0000000000..33c87eefe0
--- /dev/null
+++ b/tensorflow/core/protobuf/cluster.proto
@@ -0,0 +1,82 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+syntax = "proto3";
+
+package tensorflow;
+option cc_enable_arenas = true;
+option java_outer_classname = "ClusterProtos";
+option java_multiple_files = true;
+option java_package = "org.tensorflow.distruntime";
+
+// This file contains protos to be used when defining a TensorFlow
+// cluster.
+//
+// EXAMPLES
+// --------
+//
+// 1. A single-process cluster, containing "/job:local/task:0".
+//
+//    Cluster:
+//      job { name: 'local' tasks { key: 0 value: 'localhost:2222' } }
+//
+//    Server:
+//      cluster { $CLUSTER } job_name: 'local' task_index: 0
+//
+// 2. A two-process cluster, containing "/job:local/task:{0,1}".
+//
+//    Cluster:
+//      job { name: 'local' tasks { key: 0 value: 'localhost:2222' }
+//                          tasks { key: 1 value: 'localhost:2223' } }
+//
+//    Servers:
+//      cluster { $CLUSTER } job_name: 'local' task_index: 0
+//      cluster { $CLUSTER } job_name: 'local' task_index: 1
+//
+// 3. A two-job cluster, containing "/job:worker/task:{0,1,2}" and
+//    "/job:ps/task:{0,1}".
+//
+//    Cluster:
+//      job { name: 'worker' tasks { key: 0 value: 'worker1:2222' }
+//                           tasks { key: 1 value: 'worker2:2222' }
+//                           tasks { key: 2 value: 'worker3:2222' } }
+//      job { name: 'ps'     tasks { key: 0 value: 'ps0:2222' }
+//                           tasks { key: 1 value: 'ps1:2222' } }
+//
+//    Servers:
+//      cluster { $CLUSTER } job_name: 'worker' task_index: 0
+//      cluster { $CLUSTER } job_name: 'worker' task_index: 1
+//      cluster { $CLUSTER } job_name: 'worker' task_index: 2
+//      cluster { $CLUSTER } job_name: 'ps'     task_index: 0
+//      cluster { $CLUSTER } job_name: 'ps'     task_index: 1
+
+// Defines a single job in a TensorFlow cluster.
+message JobDef {
+  // The name of this job.
+  string name = 1;
+
+  // Mapping from task ID to "hostname:port" string.
+  //
+  // If the `name` field contains "worker", and the `tasks` map contains a
+  // mapping from 7 to "example.org:2222", then the device prefix
+  // "/job:worker/task:7" will be assigned to "example.org:2222".
+  map<int32, string> tasks = 2;
+}
+
+// Defines a TensorFlow cluster as a set of jobs.
+message ClusterDef {
+  // The jobs that comprise the cluster.
+  repeated JobDef job = 1;
+}
diff --git a/tensorflow/core/protobuf/config.proto b/tensorflow/core/protobuf/config.proto
index 5c0f7232eb..630f47633f 100644
--- a/tensorflow/core/protobuf/config.proto
+++ b/tensorflow/core/protobuf/config.proto
@@ -10,6 +10,7 @@ import "tensorflow/core/framework/cost_graph.proto";
 import "tensorflow/core/framework/graph.proto";
 import "tensorflow/core/framework/step_stats.proto";
 import "tensorflow/core/protobuf/debug.proto";
+import "tensorflow/core/protobuf/cluster.proto";
 import "tensorflow/core/protobuf/rewriter_config.proto";
 
 message GPUOptions {
@@ -259,6 +260,11 @@ message ConfigProto {
 
   // Options that apply when this session uses the distributed runtime.
   RPCOptions rpc_options = 13;
+
+  // Optional list of all workers to use in this session.
+  ClusterDef cluster_def = 14;
+
+  // Next: 15
 };
 
 // Options for a single Run() call.
diff --git a/tensorflow/core/protobuf/master.proto b/tensorflow/core/protobuf/master.proto
index de91b6133e..e607b1c42a 100644
--- a/tensorflow/core/protobuf/master.proto
+++ b/tensorflow/core/protobuf/master.proto
@@ -38,6 +38,9 @@ message CreateSessionRequest {
 
   // Configuration options.
   ConfigProto config = 2;
+
+  // The target string used from the client's perspective.
+  string target = 3;
 }
 
 message CreateSessionResponse {
diff --git a/tensorflow/core/protobuf/tensorflow_server.proto b/tensorflow/core/protobuf/tensorflow_server.proto
index c4077bd98e..6199e707e5 100644
--- a/tensorflow/core/protobuf/tensorflow_server.proto
+++ b/tensorflow/core/protobuf/tensorflow_server.proto
@@ -16,6 +16,7 @@ limitations under the License.
 syntax = "proto3";
 
 import "tensorflow/core/protobuf/config.proto";
+import "tensorflow/core/protobuf/cluster.proto";
 
 package tensorflow;
 option cc_enable_arenas = true;
@@ -23,69 +24,6 @@ option java_outer_classname = "ServerProtos";
 option java_multiple_files = true;
 option java_package = "org.tensorflow.distruntime";
 
-// This file contains protos to be used when defining a TensorFlow
-// cluster, and a server within that cluster.
-//
-// EXAMPLES
-// --------
-//
-// 1. A single-process cluster, containing "/job:local/task:0".
-//
-//    Cluster:
-//      job { name: 'local' tasks { key: 0 value: 'localhost:2222' } }
-//
-//    Server:
-//      cluster { $CLUSTER } job_name: 'local' task_index: 0
-//
-// 2. A two-process cluster, containing "/job:local/task:{0,1}".
-//
-//    Cluster:
-//      job { name: 'local' tasks { key: 0 value: 'localhost:2222' }
-//                          tasks { key: 1 value: 'localhost:2223' } }
-//
-//    Servers:
-//      cluster { $CLUSTER } job_name: 'local' task_index: 0
-//      cluster { $CLUSTER } job_name: 'local' task_index: 1
-//
-// 3. A two-job cluster, containing "/job:worker/task:{0,1,2}" and
-//    "/job:ps/task:{0,1}".
-//
-//    Cluster:
-//      job { name: 'worker' tasks { key: 0 value: 'worker1:2222' }
-//                           tasks { key: 1 value: 'worker2:2222' }
-//                           tasks { key: 2 value: 'worker3:2222' } }
-//      job { name: 'ps'     tasks { key: 0 value: 'ps0:2222' }
-//                           tasks { key: 1 value: 'ps1:2222' } }
-//
-//    Servers:
-//      cluster { $CLUSTER } job_name: 'worker' task_index: 0
-//      cluster { $CLUSTER } job_name: 'worker' task_index: 1
-//      cluster { $CLUSTER } job_name: 'worker' task_index: 2
-//      cluster { $CLUSTER } job_name: 'ps'     task_index: 0
-//      cluster { $CLUSTER } job_name: 'ps'     task_index: 1
-
-// Defines a single job in a TensorFlow cluster.
-message JobDef {
-  // The name of this job.
-  string name = 1;
-
-  // Mapping from task ID to "hostname:port" string.
-  //
-  // If the `name` field contains "worker", and the `tasks` map contains a
-  // mapping from 7 to "example.org:2222", then the device prefix
-  // "/job:worker/task:7" will be assigned to "example.org:2222".
-  //
-  // NOTE(mrry): Currently, only a dense task ID space starting at 0 is
-  // supported.
-  map<int32, string> tasks = 2;
-}
-
-// Defines a TensorFlow cluster as a set of jobs.
-message ClusterDef {
-  // The jobs that comprise the cluster.
-  repeated JobDef job = 1;
-}
-
 // Defines the configuration of a single TensorFlow server.
 message ServerDef {
   // The cluster of which this server is a member.
diff --git a/tensorflow/core/protobuf/worker.proto b/tensorflow/core/protobuf/worker.proto
index 661327847c..cf05aece39 100644
--- a/tensorflow/core/protobuf/worker.proto
+++ b/tensorflow/core/protobuf/worker.proto
@@ -119,6 +119,10 @@ message RegisterGraphResponse {
 ////////////////////////////////////////////////////////////////////////////////
 
 message DeregisterGraphRequest {
+  // The session_handle used when registering the graph. If session_handle is
+  // empty, a single global namespace is used.
+  string session_handle = 2;
+
   // REQUIRED: graph_handle must be returned by a RegisterGraph call
   // to the same WorkerService.
   string graph_handle = 1;
@@ -167,6 +171,12 @@ message ExecutorOpts {
 };
 
 message RunGraphRequest {
+  // session_handle is the the master-generated unique id for this session.
+  // If session_handle is non-empty, it must be the same as used when
+  // registering the graph. If it is empty, a single global namespace is used to
+  // search for the graph_handle.
+  string session_handle = 8;
+
   // REQUIRED: graph_handle must be returned by a RegisterGraph call
   // to the same WorkerService.
   string graph_handle = 1;
@@ -193,6 +203,8 @@ message RunGraphRequest {
   bool is_partial = 6;
   // True if this is the last partial run request in a sequence of requests.
   bool is_last_partial_run = 7;
+
+  // Next: 9
 }
 
 message RunGraphResponse {
diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py
index 864a96ef34..6336ca2310 100644
--- a/tensorflow/python/__init__.py
+++ b/tensorflow/python/__init__.py
@@ -55,6 +55,7 @@ from tensorflow.core.framework.summary_pb2 import *
 from tensorflow.core.framework.attr_value_pb2 import *
 from tensorflow.core.protobuf.meta_graph_pb2 import TensorInfo
 from tensorflow.core.protobuf.config_pb2 import *
+from tensorflow.core.protobuf.tensorflow_server_pb2 import *
 from tensorflow.core.protobuf.rewriter_config_pb2 import *
 from tensorflow.core.util.event_pb2 import *
 
@@ -131,6 +132,7 @@ _allowed_symbols = [
     'AttrValue',
     'AutoParallelOptions',
     'ConfigProto',
+    'ClusterDef',
     'DeviceSpec',
     'Event',
     'GPUOptions',
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 9add5bd3cd..040cc33315 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -29,6 +29,7 @@ import six
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.core.lib.core import error_codes_pb2
+from tensorflow.core.protobuf import cluster_pb2
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import common_shapes
@@ -1789,7 +1790,7 @@ class SessionTest(test_util.TensorFlowTestCase):
       with CaptureStderr() as log:
         sess.run(c)
       # Ensure that we did log device placement.
-      self.assertTrue('/job:local/replica:0/task:0/cpu:0' in str(log))
+      self.assertTrue('/job:local/replica:0/task:0/cpu:0' in str(log), str(log))
 
   def testLocalMasterSessionTimeout(self):
     # Test that the timeout passed in a config to the session works correctly.
@@ -1834,6 +1835,270 @@ class SessionTest(test_util.TensorFlowTestCase):
     server = server_lib.Server.create_local_server()
     self.runTestBuildGraphError(session.Session(server.target))
 
+  def testClusterSpecPropagationSimple(self):
+    server1 = server_lib.Server.create_local_server()
+    server2 = server_lib.Server.create_local_server()
+    cluster_def = cluster_pb2.ClusterDef()
+    job = cluster_def.job.add()
+    job.name = 'worker'
+    job.tasks[0] = server1.target[len('grpc://'):]
+    job.tasks[1] = server2.target[len('grpc://'):]
+    config = config_pb2.ConfigProto(cluster_def=cluster_def)
+
+    const = constant_op.constant(17)
+    sess = session.Session(server1.target, config=config)
+    output = sess.run(const)
+    self.assertEqual(17, output)
+
+  def testClusterSpecPropagationWorker2Placement(self):
+    server1 = server_lib.Server.create_local_server()
+    server2 = server_lib.Server.create_local_server()
+    cluster_def = cluster_pb2.ClusterDef()
+    job = cluster_def.job.add()
+    job.name = 'worker'
+    job.tasks[0] = server1.target[len('grpc://'):]
+    job.tasks[1] = server2.target[len('grpc://'):]
+    config = config_pb2.ConfigProto(cluster_def=cluster_def)
+
+    with ops.Graph().as_default() as g, ops.device('/job:worker/task:1'):
+      const = constant_op.constant(17)
+    sess = session.Session(server1.target, config=config, graph=g)
+    run_options = config_pb2.RunOptions(
+        trace_level=config_pb2.RunOptions.FULL_TRACE)
+    run_metadata = config_pb2.RunMetadata()
+    output = sess.run(const, options=run_options, run_metadata=run_metadata)
+    self.assertEqual(17, output)
+    self.assertEqual(1,
+                     len([
+                         node_stats
+                         for dev_stats in run_metadata.step_stats.dev_stats
+                         for node_stats in dev_stats.node_stats
+                         if '/job:worker/replica:0/task:1/device:CPU:0' ==
+                         dev_stats.device and 'Const' == node_stats.node_name
+                     ]))
+
+  def testClusterSpecPropagationWorker1Placement(self):
+    server1 = server_lib.Server.create_local_server()
+    server2 = server_lib.Server.create_local_server()
+    cluster_def = cluster_pb2.ClusterDef()
+    job = cluster_def.job.add()
+    job.name = 'worker'
+    job.tasks[0] = server1.target[len('grpc://'):]
+    job.tasks[1] = server2.target[len('grpc://'):]
+    config = config_pb2.ConfigProto(cluster_def=cluster_def)
+
+    with ops.Graph().as_default() as g, ops.device('/job:worker/task:0'):
+      const = constant_op.constant(17)
+    sess = session.Session(server1.target, config=config, graph=g)
+    output = sess.run(const)
+    self.assertEqual(17, output)
+
+  def testClusterSpecPropagationThreeServers2Graphs(self):
+    """Boots 3 servers, creates 2 sessions, ensures appropriate operations.
+
+    We create 2 clusterspecs:
+     1. server2 as the master, server1 as a worker
+     2. server2 as the master, server3 as a worker
+
+    We ensure that variables on the workers are independent.
+    """
+    server1 = server_lib.Server.create_local_server()
+    server2 = server_lib.Server.create_local_server()
+    server3 = server_lib.Server.create_local_server()
+    cluster_def1 = cluster_pb2.ClusterDef()
+    job1 = cluster_def1.job.add()
+    job1.name = 'worker1'
+    job1.tasks[0] = server2.target[len('grpc://'):]
+    job1.tasks[1] = server1.target[len('grpc://'):]
+
+    cluster_def2 = cluster_pb2.ClusterDef()
+    job2 = cluster_def2.job.add()
+    job2.name = 'worker2'
+    job2.tasks[0] = server2.target[len('grpc://'):]
+    job2.tasks[1] = server3.target[len('grpc://'):]
+
+    config1 = config_pb2.ConfigProto(cluster_def=cluster_def1)
+    config2 = config_pb2.ConfigProto(cluster_def=cluster_def2)
+
+    with ops.Graph().as_default() as g1:
+      with ops.device('/job:worker1/task:1'):
+        var1 = variables.Variable(array_ops.zeros([2]), name='var1')
+        update_op1 = state_ops.assign_add(
+            var1, array_ops.ones([2]), name='var1_assign_add')
+        init1 = variables.global_variables_initializer()
+
+    with ops.Graph().as_default() as g2:
+      with ops.device('/job:worker2/task:1'):
+        var2 = variables.Variable(array_ops.zeros([2]), name='var2')
+        update_op2 = state_ops.assign_add(
+            var2, array_ops.ones([2]), name='var2_assign_add')
+        init2 = variables.global_variables_initializer()
+
+    sess1 = session.Session(server2.target, graph=g1, config=config1)
+    sess2 = session.Session(server2.target, graph=g2, config=config2)
+
+    init1.run(session=sess1)
+    init2.run(session=sess2)
+
+    expected_zeros = np.zeros([2])
+    expected_ones = np.ones([2])
+
+    self.assertAllEqual(expected_zeros, sess1.run(var1))
+    self.assertAllEqual(expected_zeros, sess2.run(var2))
+
+    self.assertAllEqual(expected_ones, sess1.run(update_op1))
+    self.assertAllEqual(expected_ones, sess1.run(var1))
+    self.assertAllEqual(expected_zeros, sess2.run(var2))
+    self.assertAllEqual(expected_ones, sess2.run(update_op2))
+    self.assertAllEqual(expected_ones + expected_ones, sess1.run(update_op1))
+    self.assertAllEqual(expected_ones, sess2.run(var2))
+    self.assertAllEqual(expected_ones + expected_ones, sess1.run(var1))
+
+  def testClusterSpecPropagationThreeServers(self):
+    """Boots 3 servers, creates 2 sessions, ensures appropriate operations.
+
+    We create 2 clusterspecs:
+     1. server2 as the master, server1 as a worker
+     2. server2 as the master, server3 as a worker
+
+    We ensure that variables on the workers are independent.
+    """
+    server1 = server_lib.Server.create_local_server()
+    server2 = server_lib.Server.create_local_server()
+    server3 = server_lib.Server.create_local_server()
+    cluster_def1 = cluster_pb2.ClusterDef()
+    job1 = cluster_def1.job.add()
+    job1.name = 'worker'
+    job1.tasks[0] = server2.target[len('grpc://'):]
+    job1.tasks[1] = server1.target[len('grpc://'):]
+
+    cluster_def2 = cluster_pb2.ClusterDef()
+    job2 = cluster_def2.job.add()
+    job2.name = 'worker'
+    job2.tasks[0] = server2.target[len('grpc://'):]
+    job2.tasks[1] = server3.target[len('grpc://'):]
+
+    config1 = config_pb2.ConfigProto(cluster_def=cluster_def1)
+    config2 = config_pb2.ConfigProto(cluster_def=cluster_def2)
+
+    with ops.device('/job:worker/task:1'):
+      var = variables.Variable(array_ops.zeros([2]), name='var')
+      feed = array_ops.placeholder(dtypes.float32, shape=(2))
+      update_op = var.assign_add(feed)
+
+    sess1 = session.Session(server2.target, config=config1)
+    sess2 = session.Session(server2.target, config=config2)
+
+    variables.global_variables_initializer().run(session=sess1)
+    variables.global_variables_initializer().run(session=sess2)
+
+    expected_zeros = np.zeros([2])
+    expected_ones = np.ones([2])
+
+    self.assertAllEqual(expected_zeros, sess1.run(var))
+    self.assertAllEqual(expected_zeros, sess2.run(var))
+    self.assertAllEqual(expected_ones,
+                        sess1.run(update_op, feed_dict={feed: expected_ones}))
+    self.assertAllEqual(expected_ones, sess1.run(var))
+    self.assertAllEqual(expected_zeros, sess2.run(var))
+    self.assertAllEqual(expected_ones,
+                        sess2.run(update_op, feed_dict={feed: expected_ones}))
+    self.assertAllEqual(expected_ones + expected_ones,
+                        sess1.run(update_op, feed_dict={feed: expected_ones}))
+    self.assertAllEqual(expected_ones, sess2.run(var))
+    self.assertAllEqual(expected_ones + expected_ones, sess1.run(var))
+
+  def testClusterSpecPropagationThreeServersOneCluster(self):
+    """Boots 3 servers, ensures appropriate communication across workers.
+
+    Additionally, in this cluster, we ensure the master is not the 0-th worker.
+
+    Note: this test only uses one session.
+    """
+    server1 = server_lib.Server.create_local_server()
+    server2 = server_lib.Server.create_local_server()
+    server3 = server_lib.Server.create_local_server()
+    cluster_def = cluster_pb2.ClusterDef()
+    job = cluster_def.job.add()
+    job.name = 'worker'
+    job.tasks[0] = server3.target[len('grpc://'):]
+    job.tasks[1] = server2.target[len('grpc://'):]
+    job.tasks[2] = server1.target[len('grpc://'):]
+    config = config_pb2.ConfigProto(cluster_def=cluster_def)
+
+    # Add ops to the devices in non-linear order.
+
+    with ops.device('/job:worker/task:1'):
+      feed1 = array_ops.placeholder(dtypes.float32, shape=(2))
+      const1 = constant_op.constant(2.0)
+      mul1 = const1 * feed1
+
+    with ops.device('/job:worker/task:2'):
+      feed2 = array_ops.placeholder(dtypes.float32, shape=(2))
+      const2 = constant_op.constant(2.0)
+      mul2 = const2 * feed2
+
+    with ops.device('/job:worker/task:0'):
+      feed0 = array_ops.placeholder(dtypes.float32, shape=(2))
+      const0 = constant_op.constant(2.0)
+      mul0 = const0 * feed0
+
+    sum_op = mul0 + mul1 + mul2
+
+    ones = np.ones([2])
+    run_options = config_pb2.RunOptions(
+        trace_level=config_pb2.RunOptions.FULL_TRACE)
+    run_metadata = config_pb2.RunMetadata()
+
+    # Run!
+    with session.Session(server1.target, config=config) as sess:
+      output = sess.run(
+          sum_op,
+          options=run_options,
+          run_metadata=run_metadata,
+          feed_dict={feed1: ones,
+                     feed2: ones,
+                     feed0: ones})
+      self.assertAllEqual(6 * ones, output)
+
+      self.assertEqual(
+          3,
+          len([
+              dev_stats.device
+              for dev_stats in run_metadata.step_stats.dev_stats
+              for node_stats in dev_stats.node_stats
+              if '/job:worker/replica:0/task:' in dev_stats.device and
+              node_stats.node_name.startswith('Const')
+          ]), run_metadata)
+
+  def testClusterSpecPropagationPartialRun(self):
+    """Test successful partial run with ClusterSpec propagation."""
+    server1 = server_lib.Server.create_local_server()
+    server2 = server_lib.Server.create_local_server()
+
+    cluster_def = cluster_pb2.ClusterDef()
+    job = cluster_def.job.add()
+    job.name = 'worker'
+    job.tasks[0] = server1.target[len('grpc://'):]
+    job.tasks[1] = server2.target[len('grpc://'):]
+    config = config_pb2.ConfigProto(cluster_def=cluster_def)
+
+    with ops.device('/job:worker/task:0'):
+      a = array_ops.placeholder(dtypes.float32, shape=[])
+    with ops.device('/job:worker/task:1'):
+      b = array_ops.placeholder(dtypes.float32, shape=[])
+      c = array_ops.placeholder(dtypes.float32, shape=[])
+      r1 = math_ops.add(a, b)
+    with ops.device('/job:worker/task:0'):
+      r2 = math_ops.multiply(r1, c)
+
+    with session.Session(server1.target, config=config) as sess:
+      h = sess.partial_run_setup([r1, r2], [a, b, c])
+      res = sess.partial_run(h, r1, feed_dict={a: 1, b: 2})
+      self.assertEqual(3, res)
+      res = sess.partial_run(h, r2, feed_dict={c: 3})
+      self.assertEqual(9, res)
+
 
 if __name__ == '__main__':
   googletest.main()
diff --git a/tensorflow/python/training/server_lib.py b/tensorflow/python/training/server_lib.py
index d2ccf37d88..2091eca0b9 100644
--- a/tensorflow/python/training/server_lib.py
+++ b/tensorflow/python/training/server_lib.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.core.protobuf import cluster_pb2
 from tensorflow.core.protobuf import tensorflow_server_pb2
 from tensorflow.python import pywrap_tensorflow
 from tensorflow.python.framework import errors
@@ -276,14 +277,14 @@ class ClusterSpec(object):
                           "from integers to strings." % job_name)
         self._cluster_spec[job_name] = job_tasks
       self._make_cluster_def()
-    elif isinstance(cluster, tensorflow_server_pb2.ClusterDef):
+    elif isinstance(cluster, cluster_pb2.ClusterDef):
       self._cluster_def = cluster
       self._cluster_spec = {}
       for job_def in self._cluster_def.job:
         self._cluster_spec[job_def.name] = {
             i: t for i, t in job_def.tasks.items()}
     elif isinstance(cluster, ClusterSpec):
-      self._cluster_def = tensorflow_server_pb2.ClusterDef()
+      self._cluster_def = cluster_pb2.ClusterDef()
       self._cluster_def.MergeFrom(cluster.as_cluster_def())
       self._cluster_spec = {}
       for job_def in self._cluster_def.job:
@@ -440,7 +441,7 @@ class ClusterSpec(object):
       TypeError: If `cluster_spec` is not a dictionary mapping strings to lists
         of strings.
     """
-    self._cluster_def = tensorflow_server_pb2.ClusterDef()
+    self._cluster_def = cluster_pb2.ClusterDef()
 
     # NOTE(mrry): Sort by job_name to produce deterministic protobufs.
     for job_name, tasks in sorted(self._cluster_spec.items()):
diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index bdf3d9c017..f4ac3c9758 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -186,8 +186,8 @@ from tensorflow.python.training.learning_rate_decay import *
 # pylint: enable=wildcard-import
 
 # Distributed computing support.
-from tensorflow.core.protobuf.tensorflow_server_pb2 import ClusterDef
-from tensorflow.core.protobuf.tensorflow_server_pb2 import JobDef
+from tensorflow.core.protobuf.cluster_pb2 import ClusterDef
+from tensorflow.core.protobuf.cluster_pb2 import JobDef
 from tensorflow.core.protobuf.tensorflow_server_pb2 import ServerDef
 from tensorflow.python.training.server_lib import ClusterSpec
 from tensorflow.python.training.server_lib import Server
@@ -196,32 +196,32 @@ from tensorflow.python.training.server_lib import Server
 _allowed_symbols = [
     # TODO(cwhipkey): review these and move to contrib or expose through
     # documentation.
-    "generate_checkpoint_state_proto",   # Used internally by saver.
+    "generate_checkpoint_state_proto",  # Used internally by saver.
     "checkpoint_exists",  # Only used in test?
     "get_checkpoint_mtimes",  # Only used in test?
 
     # Legacy: remove.
     "do_quantize_training_on_graphdef",  # At least use grah_def, not graphdef.
-                                         # No uses within tensorflow.
+    # No uses within tensorflow.
     "queue_runner",  # Use tf.train.start_queue_runner etc directly.
-                     # This is also imported internally.
+    # This is also imported internally.
 
     # TODO(drpng): document these. The reference in howtos/distributed does
     # not link.
     "SyncReplicasOptimizer",
     # Protobufs:
-    "BytesList",          # from example_pb2.
+    "BytesList",  # from example_pb2.
     "ClusterDef",
-    "Example",            # from example_pb2
-    "Feature",            # from example_pb2
-    "Features",           # from example_pb2
-    "FeatureList",        # from example_pb2
-    "FeatureLists",       # from example_pb2
-    "FloatList",          # from example_pb2.
-    "Int64List",          # from example_pb2.
+    "Example",  # from example_pb2
+    "Feature",  # from example_pb2
+    "Features",  # from example_pb2
+    "FeatureList",  # from example_pb2
+    "FeatureLists",  # from example_pb2
+    "FloatList",  # from example_pb2.
+    "Int64List",  # from example_pb2.
     "JobDef",
-    "SaverDef",           # From saver_pb2.
-    "SequenceExample",    # from example_pb2.
+    "SaverDef",  # From saver_pb2.
+    "SequenceExample",  # from example_pb2.
     "ServerDef",
 ]
 # Include extra modules for docstrings because:
diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
index 805a9bdd4f..da6af3919e 100644
--- a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
@@ -6,6 +6,10 @@ tf_class {
     name: "ALLOW_SOFT_PLACEMENT_FIELD_NUMBER"
     mtype: "<type \'int\'>"
   }
+  member {
+    name: "CLUSTER_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
   member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
index feb73bd7d4..93ff856b09 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.train.ClusterDef"
 tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ClusterDef\'>"
+  is_instance: "<class \'tensorflow.core.protobuf.cluster_pb2.ClusterDef\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
     name: "DESCRIPTOR"
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
index 2d7fcbe545..ac6d81541a 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.train.JobDef.TasksEntry"
 tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.TasksEntry\'>"
+  is_instance: "<class \'tensorflow.core.protobuf.cluster_pb2.TasksEntry\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
     name: "DESCRIPTOR"
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
index fc5b76341d..ce34537fa1 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
@@ -1,6 +1,6 @@
 path: "tensorflow.train.JobDef"
 tf_class {
-  is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.JobDef\'>"
+  is_instance: "<class \'tensorflow.core.protobuf.cluster_pb2.JobDef\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
     name: "DESCRIPTOR"
-- 
GitLab


From 20b5a90c24d514673204b87f2dc604e2a818a22a Mon Sep 17 00:00:00 2001
From: Guenther Schmuelling <guschmue@microsoft.com>
Date: Thu, 4 May 2017 22:01:18 -0700
Subject: [PATCH 1032/1563] This fixes some issue introduced in the previous
 version where RTTI (#9671)

was removed from the exclusion list. Because of this the number of
symbols in the def file was close to 64K for gpu builds and yesterday
a few added symbols pushed us over the 64K limit for the windows linker.
Adding RTTI back to the exclusion list.
---
 tensorflow/contrib/cmake/tools/create_def_file.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/cmake/tools/create_def_file.py b/tensorflow/contrib/cmake/tools/create_def_file.py
index 9bd287d0d7..b16a5eadb0 100644
--- a/tensorflow/contrib/cmake/tools/create_def_file.py
+++ b/tensorflow/contrib/cmake/tools/create_def_file.py
@@ -44,7 +44,7 @@ UNDNAME = "undname.exe"
 DUMPBIN = "dumpbin.exe"
 
 # Exclude if matched
-EXCLUDE_RE = re.compile(r"deleting destructor|::internal::")
+EXCLUDE_RE = re.compile(r"RTTI|deleting destructor|::internal::")
 
 # Include if matched before exclude
 INCLUDEPRE_RE = re.compile(r"google::protobuf::internal::ExplicitlyConstructed|"
@@ -141,17 +141,17 @@ def main():
           continue
         if not INCLUDE_RE.search(line):
           continue
-          
+
       if "deleting destructor" in line:
         # Some of the symbols convered by INCLUDEPRE_RE export deleting
         # destructor symbols, which is a bad idea.
         # So we filter out such symbols here.
         continue
-          
+
       if DATA_EXCLUDE_RE.search(line):
         def_fp.write("\t" + decorated + "\n")
       else:
-        def_fp.write("\t" + decorated + " DATA\n")      
+        def_fp.write("\t" + decorated + " DATA\n")
       taken.add(decorated)
   exit_code = proc.wait()
   if exit_code != 0:
-- 
GitLab


From c38f1ac2bd8f0664831a476243d3d4534a566668 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Fri, 5 May 2017 06:00:35 -0800
Subject: [PATCH 1033/1563] [TF:XLA] Update LLVM revision to SVN revision
 r302214. Change: 155192906

---
 tensorflow/workspace.bzl    | 8 ++++----
 third_party/llvm/llvm.BUILD | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 50e329f8c0..14fce6cf40 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -479,11 +479,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "llvm",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/8a1f075c93565dd665a10ac38490f644b2c02037.tar.gz",
-          "https://github.com/llvm-mirror/llvm/archive/8a1f075c93565dd665a10ac38490f644b2c02037.tar.gz",
+          "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/13790c8735a78a029dec92d80f5633418d9ffdd6.tar.gz",
+          "https://github.com/llvm-mirror/llvm/archive/13790c8735a78a029dec92d80f5633418d9ffdd6.tar.gz",
       ],
-      sha256 = "d9ebd0b49544f3b20ee2a412aac18ed8899b8eef376343a6ba8e179563cbfd86",
-      strip_prefix = "llvm-8a1f075c93565dd665a10ac38490f644b2c02037",
+      sha256 = "da4fc7147f1e2706977822934d1b245dcb6248930f8089129362ada14f6119dd",
+      strip_prefix = "llvm-13790c8735a78a029dec92d80f5633418d9ffdd6",
       build_file = str(Label("//third_party/llvm:llvm.BUILD")),
       repository = tf_repo_name,
   )
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index d5ab326283..386c41910b 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -366,6 +366,7 @@ llvm_target_list = [
             ("-gen-asm-matcher", "lib/Target/ARM/ARMGenAsmMatcher.inc"),
             ("-gen-dag-isel", "lib/Target/ARM/ARMGenDAGISel.inc"),
             ("-gen-fast-isel", "lib/Target/ARM/ARMGenFastISel.inc"),
+            ("-gen-global-isel", "lib/Target/ARM/ARMGenGlobalISel.inc"),
             ("-gen-callingconv", "lib/Target/ARM/ARMGenCallingConv.inc"),
             ("-gen-subtarget", "lib/Target/ARM/ARMGenSubtargetInfo.inc"),
             ("-gen-disassembler", "lib/Target/ARM/ARMGenDisassemblerTables.inc"),
@@ -1116,6 +1117,7 @@ cc_library(
     ]),
     deps = [
         ":analysis",
+        ":bit_reader",
         ":bit_writer",
         ":config",
         ":core",
-- 
GitLab


From 88cb0291b759397481a1f2df6fe4bb591984dcad Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Fri, 5 May 2017 06:48:03 -0800
Subject: [PATCH 1034/1563] Added missing 's' on and in `bijectors` guide,
 fixing the links. fixed link to `kl_divergence` in `distributions` guide.
 Change: 155196210

---
 .../python/contrib.distributions.bijector.md  | 33 -------------------
 .../python/contrib.distributions.bijectors.md | 33 +++++++++++++++++++
 .../python/contrib.distributions.md           |  2 +-
 .../docs_src/api_guides/python/index.md       |  2 +-
 4 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 tensorflow/docs_src/api_guides/python/contrib.distributions.bijector.md
 create mode 100644 tensorflow/docs_src/api_guides/python/contrib.distributions.bijectors.md

diff --git a/tensorflow/docs_src/api_guides/python/contrib.distributions.bijector.md b/tensorflow/docs_src/api_guides/python/contrib.distributions.bijector.md
deleted file mode 100644
index 16a47bfd8b..0000000000
--- a/tensorflow/docs_src/api_guides/python/contrib.distributions.bijector.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Random variable transformations (contrib)
-[TOC]
-
-Bijector Ops.
-
-An API for invertible, differentiable transformations of random variables.
-
-## Background
-
-Differentiable, bijective transformations of continuous random variables alter
-the calculations made in the cumulative/probability distribution functions and
-sample function.  This module provides a standard interface for making these
-manipulations.
-
-For more details and examples, see the `Bijector` docstring.
-
-To apply a `Bijector`, use `distributions.TransformedDistribution`.
-
-## Bijectors
-
-*   @{tf.contrib.distributions.bijector.Affine}
-*   @{tf.contrib.distributions.bijector.AffineLinearOperator}
-*   @{tf.contrib.distributions.bijector.Bijector}
-*   @{tf.contrib.distributions.bijector.Chain}
-*   @{tf.contrib.distributions.bijector.CholeskyOuterProduct}
-*   @{tf.contrib.distributions.bijector.Exp}
-*   @{tf.contrib.distributions.bijector.Identity}
-*   @{tf.contrib.distributions.bijector.Inline}
-*   @{tf.contrib.distributions.bijector.Invert}
-*   @{tf.contrib.distributions.bijector.PowerTransform}
-*   @{tf.contrib.distributions.bijector.SigmoidCentered}
-*   @{tf.contrib.distributions.bijector.SoftmaxCentered}
-*   @{tf.contrib.distributions.bijector.Softplus}
diff --git a/tensorflow/docs_src/api_guides/python/contrib.distributions.bijectors.md b/tensorflow/docs_src/api_guides/python/contrib.distributions.bijectors.md
new file mode 100644
index 0000000000..0ce187b329
--- /dev/null
+++ b/tensorflow/docs_src/api_guides/python/contrib.distributions.bijectors.md
@@ -0,0 +1,33 @@
+# Random variable transformations (contrib)
+[TOC]
+
+Bijector Ops.
+
+An API for invertible, differentiable transformations of random variables.
+
+## Background
+
+Differentiable, bijective transformations of continuous random variables alter
+the calculations made in the cumulative/probability distribution functions and
+sample function.  This module provides a standard interface for making these
+manipulations.
+
+For more details and examples, see the `Bijector` docstring.
+
+To apply a `Bijector`, use `distributions.TransformedDistribution`.
+
+## Bijectors
+
+*   @{tf.contrib.distributions.bijectors.Affine}
+*   @{tf.contrib.distributions.bijectors.AffineLinearOperator}
+*   @{tf.contrib.distributions.bijectors.Bijector}
+*   @{tf.contrib.distributions.bijectors.Chain}
+*   @{tf.contrib.distributions.bijectors.CholeskyOuterProduct}
+*   @{tf.contrib.distributions.bijectors.Exp}
+*   @{tf.contrib.distributions.bijectors.Identity}
+*   @{tf.contrib.distributions.bijectors.Inline}
+*   @{tf.contrib.distributions.bijectors.Invert}
+*   @{tf.contrib.distributions.bijectors.PowerTransform}
+*   @{tf.contrib.distributions.bijectors.SigmoidCentered}
+*   @{tf.contrib.distributions.bijectors.SoftmaxCentered}
+*   @{tf.contrib.distributions.bijectors.Softplus}
diff --git a/tensorflow/docs_src/api_guides/python/contrib.distributions.md b/tensorflow/docs_src/api_guides/python/contrib.distributions.md
index 2b43e1281d..7a3d509b75 100644
--- a/tensorflow/docs_src/api_guides/python/contrib.distributions.md
+++ b/tensorflow/docs_src/api_guides/python/contrib.distributions.md
@@ -76,7 +76,7 @@ representing the posterior or posterior predictive.
 
 ## Kullback-Leibler Divergence
 
-*   @{tf.contrib.distributions.kl}
+*   @{tf.contrib.distributions.kl_divergence}
 *   @{tf.contrib.distributions.RegisterKL}
 
 ## Utilities
diff --git a/tensorflow/docs_src/api_guides/python/index.md b/tensorflow/docs_src/api_guides/python/index.md
index 177f19bc80..19d50926d8 100644
--- a/tensorflow/docs_src/api_guides/python/index.md
+++ b/tensorflow/docs_src/api_guides/python/index.md
@@ -40,7 +40,7 @@
 *   [Losses (contrib)](contrib.losses.md)
 *   [Metrics (contrib)](contrib.metrics.md)
 *   [Optimization (contrib)](contrib.opt.md)
-*   [Random variable transformations (contrib)](contrib.distributions.bijector.md)
+*   [Random variable transformations (contrib)](contrib.distributions.bijectors.md)
 *   [RNN and Cells (contrib)](contrib.rnn.md)
 *   [Seq2seq Library (contrib)](contrib.seq2seq.md)
 *   [Staging (contrib)](contrib.staging.md)
-- 
GitLab


From 8acd528f93a25998cfd192b9a732e233d624fdad Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <sjhshy@gmail.com>
Date: Sat, 6 May 2017 01:05:50 +0900
Subject: [PATCH 1035/1563] Misspellings on the saved_model_cli.py (#9684)

information => information
---
 tensorflow/python/tools/saved_model_cli.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index c9c56a5014..ac5be246a0 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -489,7 +489,7 @@ def show(args):
   else:
     # If no tag is specified, display all tag_set, if no signaure_def key is
     # specified, display all SignatureDef keys, else show input output tensor
-    # infomation corresponding to the given SignatureDef key
+    # information corresponding to the given SignatureDef key
     if args.tag_set is None:
       _show_tag_sets(args.dir)
     else:
@@ -555,7 +555,7 @@ def create_parser():
   parser_show.add_argument(
       '--all',
       action='store_true',
-      help='if set, will output all infomation in given SavedModel')
+      help='if set, will output all information in given SavedModel')
   parser_show.add_argument(
       '--tag_set',
       type=str,
-- 
GitLab


From 6044cbdf9c7354aeca70f289abadc46daaee9f58 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 08:07:48 -0800
Subject: [PATCH 1036/1563] Automated rollback of change 155096835 Change:
 155203119

---
 tensorflow/core/kernels/crop_and_resize_op.cc | 565 ++++++++++--------
 tensorflow/core/kernels/crop_and_resize_op.h  |   8 +-
 .../core/kernels/crop_and_resize_op_gpu.cu.cc |   2 +-
 .../core/kernels/crop_and_resize_op_test.cc   |   6 +-
 4 files changed, 330 insertions(+), 251 deletions(-)

diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index 746fe63e2a..6a748d3462 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -19,6 +19,9 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/crop_and_resize_op.h"
 
+#include <functional>
+#include <string>
+
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -26,10 +29,13 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/types.h"
 
 #if GOOGLE_CUDA
+#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
 #include "tensorflow/core/platform/stream_executor.h"
 #endif  // GOOGLE_CUDA
 
@@ -37,41 +43,67 @@ namespace tensorflow {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 typedef Eigen::GpuDevice GPUDevice;
+using Callback = std::function<void()>;
+
+namespace {
 
-static inline void ParseAndCheckBoxSizes(OpKernelContext* context,
-                                         const Tensor& boxes,
-                                         const Tensor& box_ind,
-                                         int* num_boxes) {
-  if (boxes.NumElements() == 0 && box_ind.NumElements() == 0) {
+static inline Status ParseAndCheckBoxSizes(const Tensor& boxes,
+                                           const Tensor& box_index,
+                                           int* num_boxes) {
+  if (boxes.NumElements() == 0 && box_index.NumElements() == 0) {
     *num_boxes = 0;
-    return;
+    return Status::OK();
   }
   // The shape of 'boxes' is [num_boxes, 4].
-  OP_REQUIRES(context, boxes.dims() == 2,
-              errors::InvalidArgument("boxes must be 2-D",
-                                      boxes.shape().DebugString()));
+  if (boxes.dims() != 2) {
+    return errors::InvalidArgument("boxes must be 2-D",
+                                   boxes.shape().DebugString());
+  }
   *num_boxes = boxes.dim_size(0);
-  OP_REQUIRES(context, boxes.dim_size(1) == 4,
-              errors::InvalidArgument("boxes must have 4 columns"));
-
-  // The shape of 'box_ind' is [num_boxes].
-  OP_REQUIRES(context, box_ind.dims() == 1,
-              errors::InvalidArgument("box_ind must be 1-D",
-                                      box_ind.shape().DebugString()));
-  OP_REQUIRES(context, box_ind.dim_size(0) == *num_boxes,
-              errors::InvalidArgument("box_ind has incompatible shape"));
+  if (boxes.dim_size(1) != 4) {
+    return errors::InvalidArgument("boxes must have 4 columns");
+  }
+  // The shape of 'box_index' is [num_boxes].
+  if (box_index.dims() != 1) {
+    return errors::InvalidArgument("box_index must be 1-D",
+                                   box_index.shape().DebugString());
+  }
+  if (box_index.dim_size(0) != *num_boxes) {
+    return errors::InvalidArgument("box_index has incompatible shape");
+  }
+  return Status::OK();
 }
 
-// Verifies that all values in box_ind are in [0, batch).
+// Conditionally calls the compute callback if all values in box_index are in
+// [0, batch_size) then calls done.
 template <typename Device>
-inline void CheckValidBoxInd(
-    OpKernelContext* context,
-    typename TTypes<int32, 1>::ConstTensor box_ind_data, int batch);
+inline void RunIfBoxIndexIsValid(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done);
+
+// Specialization of CheckValidBoxIndex for a CPUDevice.
+template <>
+inline void RunIfBoxIndexIsValid<CPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done) {
+  const int num_boxes = box_index.dimension(0);
+  for (int b = 0; b < num_boxes; ++b) {
+    OP_REQUIRES_ASYNC(
+        context, FastBoundsCheck(box_index(b), batch_size),
+        errors::OutOfRange("box_index has values outside [0, batch_size)"),
+        done);
+  }
+  compute();
+  done();
+}
+
+}  // namespace
 
 template <typename Device, typename T>
-class CropAndResizeOp : public OpKernel {
+class CropAndResizeOp : public AsyncOpKernel {
  public:
-  explicit CropAndResizeOp(OpKernelConstruction* context) : OpKernel(context) {
+  explicit CropAndResizeOp(OpKernelConstruction* context)
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
@@ -80,69 +112,77 @@ class CropAndResizeOp : public OpKernel {
                                              &extrapolation_value_));
   }
 
-  void Compute(OpKernelContext* context) override {
-    // The shape of 'image' is [batch, image_height, image_width, channels].
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
+    // The shape of 'image' is [batch_size, image_height, image_width,
+    // channels].
     const Tensor& image = context->input(0);
-    OP_REQUIRES(context, image.dims() == 4,
-                errors::InvalidArgument("input image must be 4-D",
-                                        image.shape().DebugString()));
-
-    const int batch = image.dim_size(0);
-    const int image_height = image.dim_size(1);
-    const int image_width = image.dim_size(2);
-    const int depth = image.dim_size(3);
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-
     // The shape of 'boxes' is [num_boxes, 4].
     const Tensor& boxes = context->input(1);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(2);
-
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
-
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(2);
     // The shape of 'crop_size' is [2].
     const Tensor& crop_size = context->input(3);
 
-    OP_REQUIRES(context, crop_size.dims() == 1,
-                errors::InvalidArgument("crop_size must be 1-D",
-                                        crop_size.shape().DebugString()));
-    OP_REQUIRES(context, crop_size.dim_size(0) == 2,
-                errors::InvalidArgument("crop_size must have two elements",
-                                        crop_size.shape().DebugString()));
-
+    // Validate inputs dimensions.
+    OP_REQUIRES_ASYNC(context, image.dims() == 4,
+                      errors::InvalidArgument("input image must be 4-D",
+                                              image.shape().DebugString()),
+                      done);
+    const int batch_size = image.dim_size(0);
+    const int image_height = image.dim_size(1);
+    const int image_width = image.dim_size(2);
+    const int depth = image.dim_size(3);
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    int num_boxes = 0;
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
+
+    OP_REQUIRES_ASYNC(context, crop_size.dims() == 1,
+                      errors::InvalidArgument("crop_size must be 1-D",
+                                              crop_size.shape().DebugString()),
+                      done);
+    OP_REQUIRES_ASYNC(
+        context, crop_size.dim_size(0) == 2,
+        errors::InvalidArgument("crop_size must have two elements",
+                                crop_size.shape().DebugString()),
+        done);
+
+    // Copy and validate crop sizes.
     auto crop_size_vec = crop_size.vec<int32>();
     const int crop_height = internal::SubtleMustCopy(crop_size_vec(0));
     const int crop_width = internal::SubtleMustCopy(crop_size_vec(1));
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("crop dimensions must be positive"));
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("crop dimensions must be positive"), done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(
+    OP_REQUIRES_OK_ASYNC(
         context,
         context->allocate_output(
             0, TensorShape({num_boxes, crop_height, crop_width, depth}),
-            &output));
-
-    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<float, 4>::Tensor crops_data = output->tensor<float, 4>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResize<Device, T>()(
-        context->eigen_device<Device>(), image_data, boxes_data, box_ind_data,
-        extrapolation_value_, crops_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeKernel."));
-    }
+            &output),
+        done);
+
+    auto compute_callback = [this, context, output]() {
+      const Tensor& image = context->input(0);
+      const Tensor& boxes = context->input(1);
+      const Tensor& box_index = context->input(2);
+      const bool status = functor::CropAndResize<Device, T>()(
+          context->eigen_device<Device>(), image.tensor<T, 4>(),
+          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
+          extrapolation_value_, output->tensor<float, 4>());
+      if (!status) {
+        context->SetStatus(
+            errors::Internal("Failed launch CropAndResizeKernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 
  private:
@@ -155,10 +195,10 @@ template <typename T>
 struct CropAndResize<CPUDevice, T> {
   bool operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   float extrapolation_value,
                   typename TTypes<float, 4>::Tensor crops) {
-    const int batch = image.dimension(0);
+    const int batch_size = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -173,8 +213,8 @@ struct CropAndResize<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -235,89 +275,94 @@ struct CropAndResize<CPUDevice, T> {
     return true;
   }
 };
+
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradImageOp : public OpKernel {
+class CropAndResizeGradImageOp : public AsyncOpKernel {
  public:
   explicit CropAndResizeGradImageOp(OpKernelConstruction* context)
-      : OpKernel(context) {
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void Compute(OpKernelContext* context) override {
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
-
-    OP_REQUIRES(context, grads.dims() == 4,
-                errors::InvalidArgument("grads image must be 4-D",
-                                        grads.shape().DebugString()));
-    const int crop_height = grads.dim_size(1);
-    const int crop_width = grads.dim_size(2);
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("grads dimensions must be positive"));
-
     // The shape of 'boxes' is [num_boxes, 4].
     const Tensor& boxes = context->input(1);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(2);
-
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
-
-    OP_REQUIRES(
-        context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"));
-
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(2);
     // The shape of 'image_size' is [4].
     const Tensor& image_size = context->input(3);
-    OP_REQUIRES(context, image_size.dims() == 1,
-                errors::InvalidArgument("image_size must be 1-D",
-                                        image_size.shape().DebugString()));
-    OP_REQUIRES(context, image_size.dim_size(0) == 4,
-                errors::InvalidArgument("image_size must have 4 elements",
-                                        image_size.shape().DebugString()));
 
+    // Validate input shapes.
+    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
+                      errors::InvalidArgument("grads image must be 4-D",
+                                              grads.shape().DebugString()),
+                      done);
+    const int crop_height = grads.dim_size(1);
+    const int crop_width = grads.dim_size(2);
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("grads dimensions must be positive"), done);
+    int num_boxes = 0;
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
+    OP_REQUIRES_ASYNC(
+        context, grads.dim_size(0) == num_boxes,
+        errors::InvalidArgument("boxes and grads have incompatible shape"),
+        done);
+
+    OP_REQUIRES_ASYNC(context, image_size.dims() == 1,
+                      errors::InvalidArgument("image_size must be 1-D",
+                                              image_size.shape().DebugString()),
+                      done);
+    OP_REQUIRES_ASYNC(context, image_size.dim_size(0) == 4,
+                      errors::InvalidArgument("image_size must have 4 elements",
+                                              image_size.shape().DebugString()),
+                      done);
     auto image_size_vec = image_size.vec<int32>();
-    const int batch = internal::SubtleMustCopy(image_size_vec(0));
+    const int batch_size = internal::SubtleMustCopy(image_size_vec(0));
     const int image_height = internal::SubtleMustCopy(image_size_vec(1));
     const int image_width = internal::SubtleMustCopy(image_size_vec(2));
     const int depth = internal::SubtleMustCopy(image_size_vec(3));
-
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-    OP_REQUIRES(
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    OP_REQUIRES_ASYNC(
         context, grads.dim_size(3) == depth,
-        errors::InvalidArgument("image_size and grads are incompatible"));
+        errors::InvalidArgument("image_size and grads are incompatible"), done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(
-        context, context->allocate_output(
-                     0, TensorShape({batch, image_height, image_width, depth}),
-                     &output));
-
-    typename TTypes<float, 4>::ConstTensor grads_data =
-        grads.tensor<float, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<T, 4>::Tensor output_data = output->tensor<T, 4>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResizeBackpropImage<Device, T>()(
-        context->eigen_device<Device>(), grads_data, boxes_data, box_ind_data,
-        output_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeBackpropImageKernel."));
-    }
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        context->allocate_output(
+            0, TensorShape({batch_size, image_height, image_width, depth}),
+            &output),
+        done);
+
+    auto compute_callback = [context, output]() {
+      const Tensor& grads = context->input(0);
+      const Tensor& boxes = context->input(1);
+      const Tensor& box_index = context->input(2);
+      const bool status = functor::CropAndResizeBackpropImage<Device, T>()(
+          context->eigen_device<Device>(), grads.tensor<float, 4>(),
+          boxes.tensor<float, 2>(), box_index.tensor<int32, 1>(),
+          output->tensor<T, 4>());
+      if (!status) {
+        context->SetStatus(errors::Internal(
+            "Failed launch CropAndResizeBackpropImage kernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 };
 
@@ -328,9 +373,9 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
   bool operator()(const CPUDevice& d,
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   typename TTypes<T, 4>::Tensor grads_image) {
-    const int batch = grads_image.dimension(0);
+    const int batch_size = grads_image.dimension(0);
     const int image_height = grads_image.dimension(1);
     const int image_width = grads_image.dimension(2);
 
@@ -347,8 +392,8 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -399,83 +444,90 @@ struct CropAndResizeBackpropImage<CPUDevice, T> {
     return true;
   }
 };
+
 }  // namespace functor
 
 template <typename Device, typename T>
-class CropAndResizeGradBoxesOp : public OpKernel {
+class CropAndResizeGradBoxesOp : public AsyncOpKernel {
  public:
   explicit CropAndResizeGradBoxesOp(OpKernelConstruction* context)
-      : OpKernel(context) {
+      : AsyncOpKernel(context) {
     string method;
     OP_REQUIRES_OK(context, context->GetAttr("method", &method));
     OP_REQUIRES(context, method == "bilinear",
                 errors::InvalidArgument("method must be 'bilinear'", method));
   }
 
-  void Compute(OpKernelContext* context) override {
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) override {
     // The shape of 'grads' is [num_boxes, crop_height, crop_width, depth].
     const Tensor& grads = context->input(0);
+    // The shape of 'boxes' is [num_boxes, 4].
+    const Tensor& boxes = context->input(2);
+    // The shape of 'box_index' is [num_boxes].
+    const Tensor& box_index = context->input(3);
+    // The shape of 'image' is [batch_size, image_height, image_width, depth].
+    const Tensor& image = context->input(1);
 
-    OP_REQUIRES(context, grads.dims() == 4,
-                errors::InvalidArgument("grads image must be 4-D",
-                                        grads.shape().DebugString()));
-
+    // Validate input shapes.
+    OP_REQUIRES_ASYNC(context, grads.dims() == 4,
+                      errors::InvalidArgument("grads image must be 4-D",
+                                              grads.shape().DebugString()),
+                      done);
     const int crop_height = grads.dim_size(1);
     const int crop_width = grads.dim_size(2);
     const int depth = grads.dim_size(3);
-    OP_REQUIRES(context, crop_height > 0 && crop_width > 0,
-                errors::InvalidArgument("grads dimensions must be positive"));
-
-    // The shape of 'image' is [batch, image_height, image_width, depth].
-    const Tensor& image = context->input(1);
-    OP_REQUIRES(context, image.dims() == 4,
-                errors::InvalidArgument("input image must be 4-D",
-                                        image.shape().DebugString()));
-
-    const int batch = image.dim_size(0);
+    OP_REQUIRES_ASYNC(
+        context, crop_height > 0 && crop_width > 0,
+        errors::InvalidArgument("grads dimensions must be positive"), done);
+
+    OP_REQUIRES_ASYNC(context, image.dims() == 4,
+                      errors::InvalidArgument("input image must be 4-D",
+                                              image.shape().DebugString()),
+                      done);
+    const int batch_size = image.dim_size(0);
     const int image_height = image.dim_size(1);
     const int image_width = image.dim_size(2);
-    OP_REQUIRES(context, image_height > 0 && image_width > 0,
-                errors::InvalidArgument("image dimensions must be positive"));
-    OP_REQUIRES(context, image.dim_size(3) == depth,
-                errors::InvalidArgument("image, grads depth differ"));
-
-    // The shape of 'boxes' is [num_boxes, 4].
-    const Tensor& boxes = context->input(2);
-
-    // The shape of 'box_ind' is [num_boxes].
-    const Tensor& box_ind = context->input(3);
+    OP_REQUIRES_ASYNC(
+        context, image_height > 0 && image_width > 0,
+        errors::InvalidArgument("image dimensions must be positive"), done);
+    OP_REQUIRES_ASYNC(context, image.dim_size(3) == depth,
+                      errors::InvalidArgument("image, grads depth differ"),
+                      done);
 
     int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, box_ind, &num_boxes);
+    OP_REQUIRES_OK_ASYNC(
+        context, ParseAndCheckBoxSizes(boxes, box_index, &num_boxes), done);
 
-    OP_REQUIRES(
+    OP_REQUIRES_ASYNC(
         context, grads.dim_size(0) == num_boxes,
-        errors::InvalidArgument("boxes and grads have incompatible shape"));
+        errors::InvalidArgument("boxes and grads have incompatible shape"),
+        done);
 
     // Allocate output tensor.
     Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->allocate_output(
-                                0, TensorShape({num_boxes, 4}), &output));
-
-    typename TTypes<float, 4>::ConstTensor grads_data =
-        grads.tensor<float, 4>();
-    typename TTypes<T, 4>::ConstTensor image_data = image.tensor<T, 4>();
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-    typename TTypes<int32, 1>::ConstTensor box_ind_data =
-        box_ind.tensor<int32, 1>();
-    typename TTypes<float, 2>::Tensor output_data = output->tensor<float, 2>();
-
-    CheckValidBoxInd<Device>(context, box_ind_data, batch);
-
-    bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
-        context->eigen_device<Device>(), grads_data, image_data, boxes_data,
-        box_ind_data, output_data);
-    if (!status) {
-      context->SetStatus(
-          errors::Internal("Failed launch CropAndResizeBackpropBoxesKernel."));
-    }
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        context->allocate_output(0, TensorShape({num_boxes, 4}), &output),
+        done);
+
+    auto compute_callback = [context, output]() {
+      const Tensor& grads = context->input(0);
+      const Tensor& image = context->input(1);
+      const Tensor& boxes = context->input(2);
+      const Tensor& box_index = context->input(3);
+      const bool status = functor::CropAndResizeBackpropBoxes<Device, T>()(
+          context->eigen_device<Device>(), grads.tensor<float, 4>(),
+          image.tensor<T, 4>(), boxes.tensor<float, 2>(),
+          box_index.tensor<int32, 1>(), output->tensor<float, 2>());
+      if (!status) {
+        context->SetStatus(errors::Internal(
+            "Failed launch CropAndResizeBackpropBoxes kernel."));
+      }
+    };
+
+    RunIfBoxIndexIsValid<Device>(context, box_index.tensor<int32, 1>(),
+                                 batch_size, std::move(compute_callback),
+                                 std::move(done));
   }
 };
 
@@ -487,9 +539,9 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
                   typename TTypes<float, 4>::ConstTensor grads,
                   typename TTypes<T, 4>::ConstTensor image,
                   typename TTypes<float, 2>::ConstTensor boxes,
-                  typename TTypes<int32, 1>::ConstTensor box_ind,
+                  typename TTypes<int32, 1>::ConstTensor box_index,
                   typename TTypes<float, 2>::Tensor grads_boxes) {
-    const int batch = image.dimension(0);
+    const int batch_size = image.dimension(0);
     const int image_height = image.dimension(1);
     const int image_width = image.dimension(2);
 
@@ -506,8 +558,8 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
       const float y2 = boxes(b, 2);
       const float x2 = boxes(b, 3);
 
-      const int32 b_in = box_ind(b);
-      if (b_in < 0 || b_in >= batch) {
+      const int32 b_in = box_index(b);
+      if (!FastBoundsCheck(b_in, batch_size)) {
         continue;
       }
 
@@ -589,30 +641,19 @@ struct CropAndResizeBackpropBoxes<CPUDevice, T> {
     return true;
   }
 };
-}  // namespace functor
 
-// Specialization of CheckValidBoxInd for a CPUDevice.
-template <>
-inline void CheckValidBoxInd<CPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch) {
-  const int num_boxes = box_ind.dimension(0);
-  for (int b = 0; b < num_boxes; ++b) {
-    OP_REQUIRES(context, box_ind(b) >= 0 && box_ind(b) < batch,
-                errors::OutOfRange("box_ind has values outside [0, batch)"));
-  }
-}
+}  // namespace functor
 
-#define REGISTER_KERNEL(T)                                         \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T")              \
-                              .HostMemory("crop_size"),            \
-                          CropAndResizeOp<CPUDevice, T>);          \
-                                                                   \
-  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")           \
-                              .Device(DEVICE_CPU)                  \
-                              .TypeConstraint<T>("T"),             \
+#define REGISTER_KERNEL(T)                                \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResize")           \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<T>("T")     \
+                              .HostMemory("crop_size"),   \
+                          CropAndResizeOp<CPUDevice, T>); \
+                                                          \
+  REGISTER_KERNEL_BUILDER(Name("CropAndResizeGradBoxes")  \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<T>("T"),    \
                           CropAndResizeGradBoxesOp<CPUDevice, T>);
 
 TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNEL);
@@ -634,50 +675,86 @@ TF_CALL_double(REGISTER_KERNEL);
 
 #if GOOGLE_CUDA
 
-// Forward declaration of the CheckValidBoxIndHelper specialization for GPU.
+// Forward declaration of the CheckValidBoxIndexHelper specialization for GPU.
 namespace functor {
 template <>
-void CheckValidBoxIndHelper<GPUDevice>::operator()(
-    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch, typename TTypes<bool, 0>::Tensor isvalid);
-extern template struct CheckValidBoxIndHelper<GPUDevice>;
+void CheckValidBoxIndexHelper<GPUDevice>::operator()(
+    const GPUDevice& d, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, typename TTypes<bool, 0>::Tensor isvalid);
+extern template struct CheckValidBoxIndexHelper<GPUDevice>;
 }  // namespace functor
 
-// Specialization of CheckValidBoxInd for a GPUDevice.
+namespace {
+
+// Specialization of CheckValidBoxIndex for a GPUDevice.
 template <>
-inline void CheckValidBoxInd<GPUDevice>(
-    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_ind,
-    int batch) {
-  const int num_boxes = box_ind.dimension(0);
+inline void RunIfBoxIndexIsValid<GPUDevice>(
+    OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
+    int batch_size, Callback compute, Callback done) {
+  const int num_boxes = box_index.dimension(0);
   if (num_boxes == 0) {
+    compute();
+    done();
     return;
   }
-  Tensor isvalid_tensor;
-  OP_REQUIRES_OK(context,
-                 context->allocate_temp(DataTypeToEnum<bool>::value,
-                                        TensorShape({}), &isvalid_tensor));
 
-  typename TTypes<bool, 0>::Tensor isvalid = isvalid_tensor.tensor<bool, 0>();
+  Tensor isvalid_dev_tensor;
+  OP_REQUIRES_OK_ASYNC(
+      context,
+      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
+                             &isvalid_dev_tensor),
+      done);
+  typename TTypes<bool, 0>::Tensor isvalid_dev =
+      isvalid_dev_tensor.tensor<bool, 0>();
 
-  functor::CheckValidBoxIndHelper<GPUDevice>()(
-      context->eigen_device<GPUDevice>(), box_ind, batch, isvalid);
+  // Run the actual box check on the device.
+  functor::CheckValidBoxIndexHelper<GPUDevice>()(
+      context->eigen_device<GPUDevice>(), box_index, batch_size, isvalid_dev);
 
+  // Copy the result back to the host.
   auto* stream = context->op_device_context()->stream();
-  OP_REQUIRES(context, stream, errors::Internal("No GPU stream available."));
-
-  bool isvalid_host = false;
-  perftools::gputools::DeviceMemoryBase isvalid_gpu(isvalid.data(),
-                                                    sizeof(bool));
-  stream->ThenMemcpy(&isvalid_host, isvalid_gpu, sizeof(bool));
-  stream->BlockHostUntilDone();
-
-  OP_REQUIRES(context, stream->ok(),
-              errors::Internal("cudaMemcpy from device to host failed"));
-
-  OP_REQUIRES(context, isvalid_host,
-              errors::OutOfRange("box_ind has values outside [0, batch)"));
+  OP_REQUIRES_ASYNC(context, stream,
+                    errors::Internal("No GPU stream available."), done);
+  Tensor isvalid_host_tensor;
+  // Use pinned host memory on the host to avoid unnecessary
+  // synchronization.
+  AllocatorAttributes alloc_attr;
+  alloc_attr.set_on_host(true);
+  alloc_attr.set_gpu_compatible(true);
+  OP_REQUIRES_OK_ASYNC(
+      context,
+      context->allocate_temp(DataTypeToEnum<bool>::value, TensorShape({}),
+                             &isvalid_host_tensor, alloc_attr),
+      done);
+  perftools::gputools::DeviceMemoryBase wrapped(isvalid_dev.data(),
+                                                sizeof(bool));
+  const bool status =
+      stream
+          ->ThenMemcpy(
+              isvalid_host_tensor.scalar<bool>().data() /* destination */,
+              wrapped /* source */, sizeof(bool))
+          .ok();
+  OP_REQUIRES_ASYNC(
+      context, status,
+      errors::Internal("Failed to launch copy of isvalid from device to host."),
+      done);
+
+  auto wrapped_callback = [context, isvalid_host_tensor, compute, done]() {
+    const bool isvalid = isvalid_host_tensor.scalar<bool>()();
+    OP_REQUIRES_ASYNC(
+        context, isvalid,
+        errors::OutOfRange("box_index has values outside [0, batch_size)"),
+        done);
+    compute();
+    done();
+  };
+
+  context->device()->tensorflow_gpu_device_info()->event_mgr->ThenExecute(
+      stream, wrapped_callback);
 }
 
+}  // namespace
+
 #define REGISTER_KERNEL(T)                                         \
   REGISTER_KERNEL_BUILDER(Name("CropAndResize")                    \
                               .Device(DEVICE_GPU)                  \
diff --git a/tensorflow/core/kernels/crop_and_resize_op.h b/tensorflow/core/kernels/crop_and_resize_op.h
index 22df1bdd56..460dbad22b 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.h
+++ b/tensorflow/core/kernels/crop_and_resize_op.h
@@ -53,12 +53,12 @@ struct CropAndResizeBackpropBoxes {
 };
 
 template <typename Device>
-struct CheckValidBoxIndHelper {
-  // Checks if all values in box_ind are in [0, batch).
+struct CheckValidBoxIndexHelper {
+  // Checks if all values in box_index are in [0, batch).
   void operator()(const Device& d,
-                  typename TTypes<int32, 1>::ConstTensor box_ind, int batch,
+                  typename TTypes<int32, 1>::ConstTensor box_index, int batch,
                   typename TTypes<bool, 0>::Tensor isvalid) {
-    isvalid.device(d) = ((box_ind >= 0) && (box_ind < batch)).all();
+    isvalid.device(d) = ((box_index >= 0) && (box_index < batch)).all();
   }
 };
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
index 254475db46..c1235fda89 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc
@@ -440,7 +440,7 @@ TF_CALL_GPU_NUMBER_TYPES(DEFINE_GPU_SPECS);
 
 #undef DEFINE_GPU_SPECS
 
-template struct CheckValidBoxIndHelper<GPUDevice>;
+template struct CheckValidBoxIndexHelper<GPUDevice>;
 
 }  // namespace functor
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/crop_and_resize_op_test.cc b/tensorflow/core/kernels/crop_and_resize_op_test.cc
index 3a7f180598..d6139dae96 100644
--- a/tensorflow/core/kernels/crop_and_resize_op_test.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op_test.cc
@@ -251,7 +251,7 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndexShape) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(
-      StringPiece(s.ToString()).contains("box_ind has incompatible shape"))
+      StringPiece(s.ToString()).contains("box_index has incompatible shape"))
       << s;
 }
 
@@ -264,8 +264,10 @@ TEST_F(CropAndResizeOpTest, TestInvalidBoxIndex) {
   Status s = RunOpKernel();
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(StringPiece(s.ToString())
-                  .contains("box_ind has values outside [0, batch)"))
+                  .contains("box_index has values outside [0, batch_size)"))
       << s;
 }
 
+// TODO(zhengxq, rmlarsen): Add a benchmark.
+
 }  // namespace tensorflow
-- 
GitLab


From 1b75a7bcb1648e9b065fbb2f50a6d708fbbb2aa8 Mon Sep 17 00:00:00 2001
From: Sukriti Ramesh <sukritiramesh@google.com>
Date: Fri, 5 May 2017 08:51:38 -0800
Subject: [PATCH 1037/1563] Update load functionality in SavedModel loader to
 use the Session graph and not the default graph. Change: 155207584

---
 tensorflow/python/saved_model/loader_impl.py  | 87 ++++++++++---------
 .../python/saved_model/saved_model_test.py    | 21 +++++
 2 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/tensorflow/python/saved_model/loader_impl.py b/tensorflow/python/saved_model/loader_impl.py
index a9d999dad3..3252652174 100644
--- a/tensorflow/python/saved_model/loader_impl.py
+++ b/tensorflow/python/saved_model/loader_impl.py
@@ -195,46 +195,47 @@ def load(sess, tags, export_dir, **saver_kwargs):
   Raises:
     RuntimeError: MetaGraphDef associated with the tags cannot be found.
   """
-  # Build the SavedModel protocol buffer and find the requested meta graph def.
-  saved_model = _parse_saved_model(export_dir)
-  found_match = False
-  for meta_graph_def in saved_model.meta_graphs:
-    if set(meta_graph_def.meta_info_def.tags) == set(tags):
-      meta_graph_def_to_load = meta_graph_def
-      found_match = True
-      break
-
-  if not found_match:
-    raise RuntimeError("MetaGraphDef associated with tags " + str(tags).strip(
-        "[]") + " could not be found in SavedModel")
-
-  # Build a saver by importing the meta graph def to load.
-  saver = tf_saver.import_meta_graph(meta_graph_def_to_load, **saver_kwargs)
-
-  if saver:
-    # Build the checkpoint path where the variables are located.
-    variables_path = os.path.join(
-        compat.as_bytes(export_dir),
-        compat.as_bytes(constants.VARIABLES_DIRECTORY),
-        compat.as_bytes(constants.VARIABLES_FILENAME))
-
-    # Restore the variables using the built saver in the provided session.
-    saver.restore(sess, variables_path)
-  else:
-    tf_logging.info("The specified SavedModel has no variables; no "
-                    "checkpoints were restored.")
-
-  # Get asset tensors, if any.
-  asset_tensors_dictionary = _get_asset_tensors(export_dir,
-                                                meta_graph_def_to_load)
-
-  main_op_tensor = _get_main_op_tensor(meta_graph_def_to_load)
-  if main_op_tensor is not None:
-    sess.run(fetches=[main_op_tensor], feed_dict=asset_tensors_dictionary)
-  else:
-    legacy_init_op_tensor = _get_legacy_init_op_tensor(meta_graph_def_to_load)
-    if legacy_init_op_tensor is not None:
-      sess.run(fetches=[legacy_init_op_tensor],
-               feed_dict=asset_tensors_dictionary)
-
-  return meta_graph_def_to_load
+  with sess.graph.as_default():
+    # Build the SavedModel protocol buffer and find requested meta graph def.
+    saved_model = _parse_saved_model(export_dir)
+    found_match = False
+    for meta_graph_def in saved_model.meta_graphs:
+      if set(meta_graph_def.meta_info_def.tags) == set(tags):
+        meta_graph_def_to_load = meta_graph_def
+        found_match = True
+        break
+
+    if not found_match:
+      raise RuntimeError("MetaGraphDef associated with tags " + str(tags).strip(
+          "[]") + " could not be found in SavedModel")
+
+    # Build a saver by importing the meta graph def to load.
+    saver = tf_saver.import_meta_graph(meta_graph_def_to_load, **saver_kwargs)
+
+    if saver:
+      # Build the checkpoint path where the variables are located.
+      variables_path = os.path.join(
+          compat.as_bytes(export_dir),
+          compat.as_bytes(constants.VARIABLES_DIRECTORY),
+          compat.as_bytes(constants.VARIABLES_FILENAME))
+
+      # Restore the variables using the built saver in the provided session.
+      saver.restore(sess, variables_path)
+    else:
+      tf_logging.info("The specified SavedModel has no variables; no "
+                      "checkpoints were restored.")
+
+    # Get asset tensors, if any.
+    asset_tensors_dictionary = _get_asset_tensors(export_dir,
+                                                  meta_graph_def_to_load)
+
+    main_op_tensor = _get_main_op_tensor(meta_graph_def_to_load)
+    if main_op_tensor is not None:
+      sess.run(fetches=[main_op_tensor], feed_dict=asset_tensors_dictionary)
+    else:
+      legacy_init_op_tensor = _get_legacy_init_op_tensor(meta_graph_def_to_load)
+      if legacy_init_op_tensor is not None:
+        sess.run(
+            fetches=[legacy_init_op_tensor], feed_dict=asset_tensors_dictionary)
+
+    return meta_graph_def_to_load
diff --git a/tensorflow/python/saved_model/saved_model_test.py b/tensorflow/python/saved_model/saved_model_test.py
index a81f744175..fcd6bc3954 100644
--- a/tensorflow/python/saved_model/saved_model_test.py
+++ b/tensorflow/python/saved_model/saved_model_test.py
@@ -151,6 +151,27 @@ class SavedModelTest(test.TestCase):
                                    constants.SAVED_MODEL_FILENAME_PBTXT):
         loader.load(sess, ["foo"], export_dir)
 
+  def testVerifySessionGraphUsage(self):
+    export_dir = os.path.join(test.get_temp_dir(),
+                              "test_verify_session_graph_usage")
+    builder = saved_model_builder.SavedModelBuilder(export_dir)
+
+    with self.test_session(graph=ops.Graph()) as sess:
+      self._init_and_validate_variable(sess, "v", 42)
+      builder.add_meta_graph_and_variables(sess, [tag_constants.TRAINING])
+
+    # Save the SavedModel to disk.
+    builder.save()
+
+    # Build a session and supply it to the load operation.
+    sess = session.Session(graph=ops.Graph())
+    loader.load(sess, [tag_constants.TRAINING], export_dir)
+
+    # Check the variable within the scope of the session and its graph.
+    with sess:
+      self.assertEqual(
+          42, ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)[0].eval())
+
   def testSequence(self):
     export_dir = os.path.join(test.get_temp_dir(), "test_sequence")
     builder = saved_model_builder.SavedModelBuilder(export_dir)
-- 
GitLab


From dd63839973e407b4e1501d2dd146e54ee30e445b Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 5 May 2017 08:58:08 -0800
Subject: [PATCH 1038/1563] Open sourced the analytical cost model Change:
 155208347

---
 tensorflow/core/grappler/costs/BUILD          |  37 +++++
 .../costs/analytical_cost_estimator.cc        | 128 ++++++++++++++++++
 .../costs/analytical_cost_estimator.h         |  63 +++++++++
 .../core/grappler/costs/virtual_placer.cc     |  57 ++++++++
 .../core/grappler/costs/virtual_placer.h      |  45 ++++++
 5 files changed, 330 insertions(+)
 create mode 100644 tensorflow/core/grappler/costs/analytical_cost_estimator.cc
 create mode 100644 tensorflow/core/grappler/costs/analytical_cost_estimator.h
 create mode 100644 tensorflow/core/grappler/costs/virtual_placer.cc
 create mode 100644 tensorflow/core/grappler/costs/virtual_placer.h

diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index 372092f42a..8e7209d0d4 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -135,6 +135,22 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "virtual_placer",
+    srcs = ["virtual_placer.cc"],
+    hdrs = ["virtual_placer.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":op_performance_data_cc",
+        ":utils",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:framework_lite",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:devices",
+        "//tensorflow/core/grappler/clusters:cluster",
+    ],
+)
+
 cc_library(
     name = "virtual_scheduler",
     srcs = ["virtual_scheduler.cc"],
@@ -194,3 +210,24 @@ cc_test(
         "//tensorflow/core:test_main",
     ],
 )
+
+cc_library(
+    name = "analytical_cost_estimator",
+    srcs = ["analytical_cost_estimator.cc"],
+    hdrs = ["analytical_cost_estimator.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":cost_estimator",
+        ":graph_properties",
+        ":op_level_cost_estimator",
+        ":op_performance_data_cc",
+        ":utils",
+        ":virtual_placer",
+        ":virtual_scheduler",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:grappler_item",
+    ],
+)
diff --git a/tensorflow/core/grappler/costs/analytical_cost_estimator.cc b/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
new file mode 100644
index 0000000000..29d55ca591
--- /dev/null
+++ b/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
@@ -0,0 +1,128 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/analytical_cost_estimator.h"
+
+#include <limits>
+#include <unordered_map>
+
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/graph/types.h"
+#include "tensorflow/core/grappler/costs/graph_properties.h"
+#include "tensorflow/core/grappler/costs/op_performance_data.pb.h"
+#include "tensorflow/core/grappler/costs/utils.h"
+#include "tensorflow/core/grappler/costs/virtual_placer.h"
+#include "tensorflow/core/grappler/costs/virtual_scheduler.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/public/session.h"
+
+namespace tensorflow {
+namespace grappler {
+
+AnalyticalCostEstimator::AnalyticalCostEstimator(Cluster* cluster,
+                                                 bool use_static_shapes)
+    : cluster_(cluster), use_static_shapes_(use_static_shapes) {}
+
+Status AnalyticalCostEstimator::Initialize(const GrapplerItem& item) {
+  item_ = item;
+  return Status::OK();
+}
+
+Status AnalyticalCostEstimator::PredictCosts(const GraphDef& optimized_graph,
+                                             CostGraphDef* cost_graph,
+                                             Costs* costs) const {
+  GrapplerItem item = item_;
+  item.graph = optimized_graph;
+  GraphProperties properties(item);
+  Status status;
+  if (use_static_shapes_) {
+    status = properties.InferStatically();
+  } else {
+    status = properties.InferDynamically(cluster_);
+  }
+
+  if (!status.ok()) {
+    costs->execution_time = Costs::Duration::max();
+    return status;
+  }
+
+  std::unordered_map<string, CostGraphDef::Node*> name_to_cost;
+  if (cost_graph) {
+    for (auto& node : *cost_graph->mutable_node()) {
+      name_to_cost[node.name()] = &node;
+    }
+  }
+  std::vector<string> inaccurate_nodes;
+  VirtualScheduler scheduler(optimized_graph, item_.fetch);
+  VirtualPlacer placer(cluster_);
+  Costs node_costs;
+  do {
+    const NodeDef* node = scheduler.GetCurrNode();
+    std::vector<OpInfo::TensorProperties> inputs =
+        properties.GetInputProperties(node->name());
+
+    OpInfo::DeviceProperties device = placer.get_device(*node);
+    OpInfo op_info;
+    op_info.set_op(node->op());
+    *op_info.mutable_attr() = node->attr();
+    for (auto& input : inputs) {
+      op_info.add_inputs()->Swap(&input);
+    }
+    op_info.mutable_device()->Swap(&device);
+
+    node_costs = node_estimator_.PredictCosts(op_info);
+    if (node_costs.inaccurate) {
+      inaccurate_nodes.push_back(node->name());
+    }
+    if (cost_graph) {
+      auto it = name_to_cost.find(node->name());
+      CostGraphDef::Node* cost_node;
+      if (it != name_to_cost.end()) {
+        cost_node = it->second;
+      } else {
+        cost_node = cost_graph->add_node();
+        cost_node->set_name(node->name());
+      }
+      string device_name = properties.GetDeviceName(node->name());
+      cost_node->set_device(device_name);
+      cost_node->set_compute_cost(
+          node_costs.execution_time.asMicroSeconds().count());
+      cost_node->set_compute_time(
+          node_costs.compute_time.asMicroSeconds().count());
+      cost_node->set_memory_time(
+          node_costs.memory_time.asMicroSeconds().count());
+      std::vector<OpInfo::TensorProperties> outputs =
+          properties.GetOutputProperties(node->name());
+      for (const auto& output : outputs) {
+        auto output_info = cost_node->add_output_info();
+        output_info->set_dtype(output.dtype());
+        auto shape = output_info->mutable_shape();
+        *shape = output.shape();
+      }
+    }
+  } while (scheduler.MarkCurrNodeExecuted(node_costs));
+
+  *costs = scheduler.Summary();
+  VLOG(1) << inaccurate_nodes.size() << " out of "
+          << optimized_graph.node_size()
+          << " nodes have inaccurate time estimation";
+  for (const auto& node : inaccurate_nodes) {
+    VLOG(2) << "Node with inaccurate time estimation: " << node;
+  }
+  return Status::OK();
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/analytical_cost_estimator.h b/tensorflow/core/grappler/costs/analytical_cost_estimator.h
new file mode 100644
index 0000000000..03e7faa4ff
--- /dev/null
+++ b/tensorflow/core/grappler/costs/analytical_cost_estimator.h
@@ -0,0 +1,63 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CORE_GRAPPLER_COSTS_ANALYTICAL_COST_ESTIMATOR_H_
+#define TENSORFLOW_CORE_GRAPPLER_COSTS_ANALYTICAL_COST_ESTIMATOR_H_
+
+#include "tensorflow/core/grappler/costs/cost_estimator.h"
+#include "tensorflow/core/grappler/costs/op_level_cost_estimator.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/lib/core/status.h"
+
+namespace tensorflow {
+class CostGraphDef;
+class GraphDef;
+}  // namespace tensorflow
+
+namespace tensorflow {
+namespace grappler {
+
+class Cluster;
+struct GrapplerItem;
+
+// Estimate the cost of running a Grappler item based on the theoretical
+// performance of the hardware that will run the model.
+class AnalyticalCostEstimator : public CostEstimator {
+ public:
+  // Does not take ownership of cluster.
+  explicit AnalyticalCostEstimator(Cluster* cluster, bool use_static_shapes);
+  ~AnalyticalCostEstimator() override {}
+
+  // Initalizes the estimator for the specified grappler item.
+  // This implementation always returns OK.
+  Status Initialize(const GrapplerItem& item) override;
+
+  // Predict the performance of each node of the optimized graph and annotate
+  // the CostGraphDef with the corresponding estimates. Also returns the
+  // expected latency for the whole graph.
+  Status PredictCosts(const GraphDef& optimized_graph, CostGraphDef* cost_graph,
+                      Costs* overall_latency) const override;
+
+ private:
+  Cluster* cluster_;  // Not owned.
+  GrapplerItem item_;
+  OpLevelCostEstimator node_estimator_;
+  bool use_static_shapes_;
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_CORE_GRAPPLER_COSTS_ANALYTICAL_COST_ESTIMATOR_H_
diff --git a/tensorflow/core/grappler/costs/virtual_placer.cc b/tensorflow/core/grappler/costs/virtual_placer.cc
new file mode 100644
index 0000000000..adc640aaa4
--- /dev/null
+++ b/tensorflow/core/grappler/costs/virtual_placer.cc
@@ -0,0 +1,57 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/costs/virtual_placer.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/clusters/cluster.h"
+#include "tensorflow/core/grappler/costs/utils.h"
+#include "tensorflow/core/grappler/devices.h"
+#include "tensorflow/core/util/device_name_utils.h"
+
+namespace tensorflow {
+namespace grappler {
+
+VirtualPlacer::VirtualPlacer(Cluster* cluster) : has_gpu_(false) {
+  devices_["CPU"] = GetLocalCPUInfo();
+  if (GetNumAvailableGPUs() > 0) {
+    has_gpu_ = true;
+    devices_["GPU"] = GetLocalGPUInfo(0);
+  }
+  unknown_device_.set_type("UNKNOWN");
+}
+
+const OpInfo::DeviceProperties& VirtualPlacer::get_device(
+    const NodeDef& node) const {
+  string device_type;
+  DeviceNameUtils::ParsedName parsed;
+  if (!node.device().empty() &&
+      DeviceNameUtils::ParseFullName(node.device(), &parsed)) {
+    device_type = parsed.type;
+  } else {
+    if (has_gpu_) {
+      device_type = "GPU";
+    } else {
+      device_type = "CPU";
+    }
+  }
+  auto it = devices_.find(device_type);
+  if (it == devices_.end()) {
+    return unknown_device_;
+  }
+  return it->second;
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/virtual_placer.h b/tensorflow/core/grappler/costs/virtual_placer.h
new file mode 100644
index 0000000000..812e94bf59
--- /dev/null
+++ b/tensorflow/core/grappler/costs/virtual_placer.h
@@ -0,0 +1,45 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_CORE_GRAPPLER_COSTS_VIRTUAL_PLACER_H_
+#define TENSORFLOW_CORE_GRAPPLER_COSTS_VIRTUAL_PLACER_H_
+
+#include <unordered_map>
+#include "tensorflow/core/grappler/costs/op_performance_data.pb.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+class NodeDef;
+
+namespace grappler {
+class Cluster;
+
+// The virtual placer emulates the behavior of the TF placer.
+class VirtualPlacer {
+ public:
+  VirtualPlacer(Cluster* cluster);
+
+  const OpInfo::DeviceProperties& get_device(const NodeDef& node) const;
+
+ private:
+  std::unordered_map<string, OpInfo::DeviceProperties> devices_;
+  bool has_gpu_;
+  OpInfo::DeviceProperties unknown_device_;
+};
+
+}  // namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_CORE_GRAPPLER_COSTS_VIRTUAL_PLACER_H_
-- 
GitLab


From b329dd821e29e64c93b1b9bf38e61871c6cb53da Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 09:04:16 -0800
Subject: [PATCH 1039/1563] Add `categorical_column_with_identity`. Change:
 155209179

---
 .../python/feature_column/feature_column.py   | 102 +++++++++
 .../feature_column/feature_column_test.py     | 194 ++++++++++++++++++
 2 files changed, 296 insertions(+)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index ffdf8868e2..f8855f259e 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -129,6 +129,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
@@ -656,6 +657,44 @@ def categorical_column_with_vocabulary_list(
       default_value=default_value)
 
 
+def categorical_column_with_identity(key, num_buckets, default_value=None):
+  """A `_CategoricalColumn` that returns identity values.
+
+  Use this when your inputs are integers in the range `[0, num_buckets)`. Values
+  outside this range will result in `default_value` if specified, otherwise it
+  will fail.
+
+  Inputs can be either `Tensor` or `SparseTensor`.
+  ```
+
+  Args:
+    key: A unique string identifying the input feature. It is used as the
+      column name and the dictionary key for feature parsing configs, feature
+      `Tensor` objects, and feature columns.
+    num_buckets: Range of inputs and outputs is `[0, num_buckets)`.
+    default_value: If `None`, this column's graph operations will fail for
+      out-of-range inputs. Otherwise, this value must be in the range
+      `[0, num_buckets)`, and will replace inputs in that range.
+
+  Returns:
+    A `_CategoricalColumn` that returns identity values.
+
+  Raises:
+    ValueError: if `num_buckets` is less than one.
+    ValueError: if `default_value` is not in range `[0, num_buckets)`.
+  """
+  if num_buckets < 1:
+    raise ValueError(
+        'num_buckets {} < 1, column_name {}'.format(num_buckets, key))
+  if (default_value is not None) and (
+      (default_value < 0) or (default_value >= num_buckets)):
+    raise ValueError(
+        'default_value {} not in range [0, {}), column_name {}'.format(
+            default_value, num_buckets, key))
+  return _IdentityCategoricalColumn(
+      key=key, num_buckets=num_buckets, default_value=default_value)
+
+
 class _FeatureColumn(object):
   """Represents a feature column abstraction.
 
@@ -1384,6 +1423,69 @@ class _VocabularyListCategoricalColumn(
     return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
 
 
+class _IdentityCategoricalColumn(
+    _CategoricalColumn,
+    collections.namedtuple('_IdentityCategoricalColumn', (
+        'key', 'num_buckets', 'default_value'
+    ))):
+
+  """See `categorical_column_with_identity`."""
+
+  @property
+  def name(self):
+    return self.key
+
+  @property
+  def _parse_example_config(self):
+    return {self.key: parsing_ops.VarLenFeature(dtypes.int64)}
+
+  def _transform_feature(self, inputs):
+    input_tensor = _to_sparse_input(inputs.get(self.key))
+
+    if not input_tensor.dtype.is_integer:
+      raise ValueError(
+          'Invalid input, not integer. key: {} dtype: {}'.format(
+              self.key, input_tensor.dtype))
+
+    values = math_ops.to_int64(input_tensor.values, name='values')
+    num_buckets = math_ops.to_int64(self.num_buckets, name='num_buckets')
+    zero = math_ops.to_int64(0, name='zero')
+    if self.default_value is None:
+      # Fail if values are out-of-range.
+      assert_less = check_ops.assert_less(
+          values, num_buckets, data=(values, num_buckets),
+          name='assert_less_than_num_buckets')
+      assert_greater = check_ops.assert_greater_equal(
+          values, zero, data=(values,),
+          name='assert_greater_or_equal_0')
+      with ops.control_dependencies((assert_less, assert_greater)):
+        values = array_ops.identity(values)
+    else:
+      # Assign default for out-of-range values.
+      values = array_ops.where(
+          math_ops.logical_or(
+              values < zero, values >= num_buckets, name='out_of_range'),
+          array_ops.fill(
+              dims=array_ops.shape(values),
+              value=math_ops.to_int64(self.default_value),
+              name='default_values'),
+          values)
+
+    return sparse_tensor_lib.SparseTensor(
+        indices=input_tensor.indices,
+        values=values,
+        dense_shape=input_tensor.dense_shape)
+
+  @property
+  def _num_buckets(self):
+    """Returns number of buckets in this sparse feature."""
+    return self.num_buckets
+
+  def _get_sparse_tensors(
+      self, inputs, weight_collections=None, trainable=None):
+    return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
+
+
 # TODO(zakaria): Move this to embedding_ops and make it public.
 def _safe_embedding_lookup_sparse(embedding_weights,
                                   sparse_ids,
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 59aa39411f..5201811831 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -31,6 +31,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import parsing_ops
 from tensorflow.python.ops import variable_scope
@@ -1828,5 +1829,198 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         self.assertAllClose(((3.,), (1.,)), predictions.eval())
 
 
+class IdentityCategoricalColumnTest(test.TestCase):
+
+  def test_constructor(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    self.assertEqual('aaa', column.name)
+    # pylint: disable=protected-access
+    self.assertEqual(3, column._num_buckets)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.int64)
+    }, column._parse_example_config)
+    # pylint: enable=protected-access
+
+  def test_deep_copy(self):
+    """Tests deepcopy of categorical_column_with_hash_bucket."""
+    original = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    for column in (original, copy.deepcopy(original)):
+      self.assertEqual('aaa', column.name)
+      # pylint: disable=protected-access
+      self.assertEqual(3, column._num_buckets)
+      self.assertEqual({
+          'aaa': parsing_ops.VarLenFeature(dtypes.int64)
+      }, column._parse_example_config)
+      # pylint: enable=protected-access
+
+  def test_invalid_num_buckets_zero(self):
+    with self.assertRaisesRegexp(ValueError, 'num_buckets 0 < 1'):
+      fc.categorical_column_with_identity(key='aaa', num_buckets=0)
+
+  def test_invalid_num_buckets_negative(self):
+    with self.assertRaisesRegexp(ValueError, 'num_buckets -1 < 1'):
+      fc.categorical_column_with_identity(key='aaa', num_buckets=-1)
+
+  def test_invalid_default_value_too_small(self):
+    with self.assertRaisesRegexp(ValueError, 'default_value -1 not in range'):
+      fc.categorical_column_with_identity(
+          key='aaa', num_buckets=3, default_value=-1)
+
+  def test_invalid_default_value_too_big(self):
+    with self.assertRaisesRegexp(ValueError, 'default_value 3 not in range'):
+      fc.categorical_column_with_identity(
+          key='aaa', num_buckets=3, default_value=3)
+
+  def test_invalid_input_dtype(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('omar', 'stringer', 'marlo'),
+        dense_shape=(2, 2))
+    with self.assertRaisesRegexp(ValueError, 'Invalid input, not integer'):
+      # pylint: disable=protected-access
+      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      # pylint: enable=protected-access
+
+  def test_get_sparse_tensors(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(0, 1, 0),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((0, 1, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_dense_input(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
+        'aaa': ((0, -1), (1, 0))
+    }))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=np.array((0, 1, 0), dtype=np.int64),
+              dense_shape=(2, 2)),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_with_inputs_too_small(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(1, -1, 0),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      with self.assertRaisesRegexp(
+          errors.OpError, 'assert_greater_or_equal_0'):
+        id_weight_pair.id_tensor.eval()
+
+  def test_get_sparse_tensors_with_inputs_too_big(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(1, 99, 0),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      with self.assertRaisesRegexp(
+          errors.OpError, 'assert_less_than_num_buckets'):
+        id_weight_pair.id_tensor.eval()
+
+  def test_get_sparse_tensors_with_default_value(self):
+    column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=4, default_value=3)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(1, -1, 99),
+        dense_shape=(2, 2))
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((1, 3, 3), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_weight_pair.id_tensor.eval())
+
+  def test_get_sparse_tensors_with_default_value_and_placeholder_inputs(self):
+    column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=4, default_value=3)
+    input_indices = array_ops.placeholder(dtype=dtypes.int64)
+    input_values = array_ops.placeholder(dtype=dtypes.int32)
+    input_shape = array_ops.placeholder(dtype=dtypes.int64)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=input_indices,
+        values=input_values,
+        dense_shape=input_shape)
+    # pylint: disable=protected-access
+    id_weight_pair = column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}))
+    # pylint: enable=protected-access
+    self.assertIsNone(id_weight_pair.weight_tensor)
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=np.array(((0, 0), (1, 0), (1, 1)), dtype=np.int64),
+              values=np.array((1, 3, 3), dtype=np.int64),
+              dense_shape=np.array((2, 2), dtype=np.int64)),
+          id_weight_pair.id_tensor.eval(feed_dict={
+              input_indices: ((0, 0), (1, 0), (1, 1)),
+              input_values: (1, -1, 99),
+              input_shape: (2, 2),
+          }))
+
+  def test_make_linear_model(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    self.assertEqual(3, column._num_buckets)
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          column.name: sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=(0, 2, 1),
+              dense_shape=(2, 2))
+      }, (column,))
+      bias = get_linear_model_bias()
+      weight_var = get_linear_model_column_var(column)
+      with _initialized_session():
+        self.assertAllClose((0.,), bias.eval())
+        self.assertAllClose(((0.,), (0.,), (0.,)), weight_var.eval())
+        self.assertAllClose(((0.,), (0.,)), predictions.eval())
+        weight_var.assign(((1.,), (2.,), (3.,))).eval()
+        # weight_var[0] = 1
+        # weight_var[2] + weight_var[1] = 3+2 = 5
+        self.assertAllClose(((1.,), (5.,)), predictions.eval())
+
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From 692fad20f913ffa2cb874a87578ecabb03cc4557 Mon Sep 17 00:00:00 2001
From: Dan Ringwalt <ringwalt@google.com>
Date: Fri, 5 May 2017 09:09:05 -0800
Subject: [PATCH 1040/1563] Merge changes from github. Change: 155209832

---
 ISSUE_TEMPLATE.md                             |  45 +-
 README.md                                     |  15 +-
 RELEASE.md                                    |   1 +
 configure                                     |  70 +-
 tensorflow/BUILD                              |   1 +
 tensorflow/contrib/batching/BUILD             |   1 +
 .../factorization/python/ops/gmm_ops.py       |   2 +-
 .../python/kernel_tests/grid_rnn_test.py      | 631 +++++++++++-------
 .../grid_rnn/python/ops/grid_rnn_cell.py      | 497 +++++++++-----
 .../python/kernel_tests/image_ops_test.py     |  25 +
 .../contrib/image/python/ops/image_ops.py     |  40 +-
 .../camera/CameraExampleViewController.mm     |   4 +-
 .../keras/python/keras/initializers_test.py   |   2 +-
 .../contrib/layers/python/layers/encoders.py  |   2 +-
 .../layers/python/layers/initializers.py      |   5 +-
 tensorflow/contrib/learn/__init__.py          |   1 +
 .../learn/estimators/dnn_linear_combined.py   |  12 +-
 .../learn/estimators/dynamic_rnn_estimator.py | 351 ----------
 .../estimators/dynamic_rnn_estimator_test.py  |  50 --
 .../learn/python/learn/estimators/kmeans.py   |   5 +-
 .../estimators/state_saving_rnn_estimator.py  | 178 -----
 .../state_saving_rnn_estimator_test.py        |  50 --
 tensorflow/contrib/rnn/__init__.py            |   2 +
 tensorflow/contrib/signal/BUILD               |  46 ++
 tensorflow/contrib/signal/__init__.py         |  27 +
 tensorflow/contrib/signal/python/__init__.py  |  19 +
 .../python/kernel_tests/shape_ops_test.py     |  68 ++
 .../contrib/signal/python/ops/__init__.py     |  19 +
 .../contrib/signal/python/ops/shape_ops.py    |  87 +++
 tensorflow/contrib/slim/README.md             |   2 +-
 .../contrib/slim/python/slim/data/README.md   |  14 +-
 .../slim/python/slim/nets/resnet_v2.py        |   2 +
 .../python/framework/fake_summary_writer.py   |   3 +
 tensorflow/contrib/verbs/README.md            |  42 +-
 .../contrib/verbs/grpc_verbs_service.cc       |   4 +
 tensorflow/contrib/verbs/rdma.cc              |  15 +-
 tensorflow/contrib/verbs/rdma.h               |   2 +
 tensorflow/contrib/verbs/rdma_mgr.cc          |   4 +
 tensorflow/contrib/verbs/verbs_service.proto  |   2 +
 .../core/distributed_runtime/rpc/grpc_call.h  |   1 +
 .../rpc/grpc_tensor_coding.cc                 |  22 +-
 tensorflow/core/kernels/cwise_op_atan2.cc     |  23 +
 .../core/kernels/cwise_op_gpu_atan2.cu.cc     |  26 +
 tensorflow/core/kernels/cwise_ops.h           |  16 +
 tensorflow/core/kernels/linalg_ops_common.cc  |  32 +-
 tensorflow/core/kernels/linalg_ops_common.h   |   3 -
 tensorflow/core/ops/math_ops.cc               |  15 +
 .../docs_src/community/documentation.md       |  24 +-
 tensorflow/docs_src/get_started/input_fn.md   |   2 +-
 tensorflow/docs_src/install/install_linux.md  |  22 +-
 tensorflow/docs_src/install/install_mac.md    |   4 +-
 .../docs_src/install/install_sources.md       |   4 +-
 .../docs_src/install/install_windows.md       |  21 +-
 .../examples/image_retraining/retrain.py      |   9 +-
 tensorflow/python/estimator/estimator_test.py |   5 +
 tensorflow/python/framework/ops.py            |  10 +-
 .../python/kernel_tests/cwise_ops_test.py     |  27 +
 .../kernel_tests/tensor_priority_test.py      |  86 +++
 tensorflow/python/layers/convolutional.py     | 274 +++++++-
 .../python/layers/convolutional_test.py       | 169 +++++
 tensorflow/python/layers/layers.py            |   2 +
 tensorflow/python/layers/utils.py             |  26 +
 tensorflow/python/layers/utils_test.py        |   7 +
 tensorflow/python/ops/array_ops.py            |   5 +-
 tensorflow/python/ops/ctc_ops.py              |   7 +-
 tensorflow/python/ops/init_ops.py             |  23 +-
 tensorflow/python/ops/logging_ops.py          |   2 +-
 tensorflow/python/ops/math_grad.py            |  10 +
 tensorflow/python/ops/math_ops.py             |  12 +-
 tensorflow/python/ops/nn_impl.py              |   5 +-
 tensorflow/python/ops/nn_ops.py               | 107 +--
 tensorflow/python/ops/parsing_ops.py          |   2 +-
 tensorflow/python/ops/random_ops.py           |   2 +-
 .../python/summary/writer/writer_cache.py     |   4 +
 .../python/tools/import_pb_to_tensorboard.py  |  50 ++
 .../python/training/checkpoint_utils.py       |  16 +-
 tensorflow/python/training/input.py           |   6 -
 .../python/training/monitored_session.py      |   4 +-
 tensorflow/python/training/saver.py           |   4 +-
 .../stream_executor/cuda/cuda_gpu_executor.cc |   8 -
 .../stream_executor/cuda/cuda_gpu_executor.h  |  11 -
 .../tensorboard/backend/application_test.py   |  13 +
 .../event_accumulator_test.py                 |  12 +-
 .../tensorboard/dist/tf-tensorboard.html      |   2 +-
 tensorflow/tensorflow.bzl                     |   2 +-
 .../tools/api/golden/tensorflow.layers.pbtxt  |   4 +
 .../tools/api/golden/tensorflow.nn.pbtxt      |   2 +-
 tensorflow/tools/api/golden/tensorflow.pbtxt  |   4 +
 tensorflow/tools/ci_build/update_version.sh   |   5 +-
 tensorflow/tools/common/public_api.py         |   2 +-
 tensorflow/tools/compatibility/tf_upgrade.py  |   4 +
 tensorflow/tools/docker/Dockerfile.devel      |   3 +-
 tensorflow/tools/docker/Dockerfile.devel-gpu  |   3 +-
 .../tools/docs/doc_generator_visitor.py       |   2 +-
 tensorflow/tools/docs/pretty_docs.py          |   2 +-
 tensorflow/tools/graph_transforms/README.md   |  15 +-
 tensorflow/tools/pip_package/BUILD            |   2 +
 tensorflow/tools/pip_package/setup.py         |   2 +-
 .../tools/quantization/quantize_graph.py      |   3 +-
 tensorflow/tools/tfprof/README.md             |   4 +-
 .../crosstool_wrapper_driver_is_not_gcc.tpl   |   2 +-
 101 files changed, 2167 insertions(+), 1375 deletions(-)
 create mode 100644 tensorflow/contrib/signal/BUILD
 create mode 100644 tensorflow/contrib/signal/__init__.py
 create mode 100644 tensorflow/contrib/signal/python/__init__.py
 create mode 100644 tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py
 create mode 100644 tensorflow/contrib/signal/python/ops/__init__.py
 create mode 100644 tensorflow/contrib/signal/python/ops/shape_ops.py
 create mode 100644 tensorflow/core/kernels/cwise_op_atan2.cc
 create mode 100644 tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc
 create mode 100644 tensorflow/python/kernel_tests/tensor_priority_test.py
 create mode 100644 tensorflow/python/tools/import_pb_to_tensorboard.py

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index d0979e87f7..6f4c048ce8 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,33 +1,36 @@
-Please go to Stack Overflow for help and support. http://stackoverflow.com/questions/tagged/tensorflow
+Please go to Stack Overflow for help and support:
+
+http://stackoverflow.com/questions/tagged/tensorflow
+
 If you open a GitHub issue, here is our policy:
 
-1. It must be a bug or feature request.
+1. It must be a bug or a feature request.
 2. The form below must be filled out.
 
-**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g. fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
+**Here's why we have that policy**: TensorFlow developers respond to issues. We want to focus on work that benefits the whole community, e.g., fixing bugs and adding features. Support only helps individuals. GitHub also notifies thousands of people when issues are filed. We want them to see you communicating an interesting problem, rather than being redirected to Stack Overflow.
 
 ------------------------
 
-Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
+### System information
+- **Have I written custom code (as opposed to using a stock example script provided in TensorFlow)**:
+- **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
+- **TensorFlow installed from (source or binary)**:
+- **TensorFlow version (use command below)**:
+- **Bazel version (if compiling from source)**:
+- **CUDA/cuDNN version**:
+- **GPU model and memory**:
+- **Exact command to reproduce**:
 
-### System Information
-- *Have I written custom code (as opposed to using a stock example script provided in TensorFlow)?*:
-- *OS Platform and Distribution (i.e. Linux Ubuntu 16.0)*:
-- *TensorFlow installed from (source or binary)?*:
-- *TensorFlow version* (use command below):
-- *Bazel version (if compiling from source)*:
-- *CUDA/cuDNN version*:
-- *GPU Model and Memory*:
-- *Exact command to reproduce*:
+You can collect some of this information using our environment capture script:
 
-You can collect some of this information using our environment capture script https://github.com/tensorflow/tensorflow/blob/master/tools/
-You can collect the TensorFlow version with
-```sh
-python -c "import tensorflow as tf; print (tf.GIT_VERSION, tf.VERSION)"
-```
+https://github.com/tensorflow/tensorflow/tree/master/tools/tf_env_collect.sh
 
+You can obtain the TensorFlow version with
 
-### Describe the problem clearly
+python -c "import tensorflow as tf; print(tf.GIT_VERSION, tf.VERSION)"
+
+### Describe the problem
+Describe the problem clearly here. Be sure to convey here why it's a bug in TensorFlow or a feature request.
 
-### Source Code / Logs
-Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full-traceback. Large logs and files should be attached. Try to reproducible test-case code the bare-minimum necessary to generate the problem
+### Source code / logs
+Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached. Try to provide a reproducible test case that is the bare minimum necessary to generate the problem.
diff --git a/README.md b/README.md
index 951e7c3b9f..2878dab260 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ guidelines](CONTRIBUTING.md).**
 
 **We use [GitHub issues](https://github.com/tensorflow/tensorflow/issues) for
 tracking requests and bugs, but please see
-[Community](tensorflow/docs_src/about/index.md#community) for general questions
+[Community](https://www.tensorflow.org/community/) for general questions
 and discussion.**
 
 ## Installation
@@ -34,13 +34,12 @@ and discussion.**
 
 People who are a little more adventurous can also try our nightly binaries:
 
-
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0rc2-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
-* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
-* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-1.1.0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-1.1.0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Windows CPU-only: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow-1.1.0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=cpu,OS=windows/))
+* Windows GPU: [Python 3.5 64-bit](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/lastSuccessfulBuild/artifact/cmake_build/tf_python/dist/tensorflow_gpu-1.1.0-cp35-cp35m-win_amd64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-win/DEVICE=gpu,OS=windows/))
 * Android: [demo APK](https://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/tensorflow_demo.apk), [native libs](http://ci.tensorflow.org/view/Nightly/job/nightly-android/lastSuccessfulBuild/artifact/out/native/)
 ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-android/))
 
diff --git a/RELEASE.md b/RELEASE.md
index fe6d052640..f078d336ab 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,6 +1,7 @@
 # Changes since the last release
 
 ## Major Features and Improvements
+* Added `tf.layers.conv3d_transpose` layer for spatio temporal deconvolution.
 * Added `tf.Session.make_callable()`, which provides a lower overhead means of running a similar step multiple times.
 * Added ibverbs-based RDMA support to contrib (courtesy @junshi15 from Yahoo).
 * `RNNCell` objects now subclass `tf.layers._Layer`.  The strictness described
diff --git a/configure b/configure
index d7dde98292..7f68a8f5d4 100755
--- a/configure
+++ b/configure
@@ -35,12 +35,9 @@ function is_windows() {
   fi
 }
 
-function sed_hyphen_i() {
-  if is_macos; then
-    sed -i '' "$@"
-  else
-    sed -i "$@"
-  fi
+function sed_in_place() {
+  sed -e $1 $2 > "$2.bak"
+  mv "$2.bak" $2
 }
 
 function write_to_bazelrc() {
@@ -170,7 +167,7 @@ function setup_python {
 rm -f .tf_configure.bazelrc
 touch .tf_configure.bazelrc
 touch .bazelrc
-sed_hyphen_i "/tf_configure/d" .bazelrc
+sed_in_place "/tf_configure/d" .bazelrc
 echo "import %workspace%/.tf_configure.bazelrc" >> .bazelrc
 
 # Delete any leftover BUILD files from the Makefile build, which would interfere
@@ -409,31 +406,6 @@ done
 export TF_CUDA_CLANG
 write_action_env_to_bazelrc "TF_CUDA_CLANG" "$TF_CUDA_CLANG"
 
-# Set up which gcc nvcc should use as the host compiler
-# No need to set this on Windows
-while [[ "$TF_CUDA_CLANG" != "1" ]] && ! is_windows && true; do
-  fromuser=""
-  if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
-    default_gcc_host_compiler_path=$(which gcc || true)
-    read -p "Please specify which gcc should be used by nvcc as the host compiler. [Default is $default_gcc_host_compiler_path]: " GCC_HOST_COMPILER_PATH
-    fromuser="1"
-    if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
-      GCC_HOST_COMPILER_PATH="$default_gcc_host_compiler_path"
-    fi
-  fi
-  if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
-    export GCC_HOST_COMPILER_PATH
-    write_action_env_to_bazelrc "GCC_HOST_COMPILER_PATH" "$GCC_HOST_COMPILER_PATH"
-    break
-  fi
-  echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
-  if [ -z "$fromuser" ]; then
-    exit 1
-  fi
-  GCC_HOST_COMPILER_PATH=""
-  # Retry
-done
-
 # Set up which clang we should use as the cuda / host compiler.
 while [[ "$TF_CUDA_CLANG" == "1" ]] && true; do
   fromuser=""
@@ -474,6 +446,11 @@ while true; do
       else
         default_cuda_path="$(cygpath -m "$CUDA_PATH")"
       fi
+    elif is_linux; then
+      # If the default doesn't exist, try an alternative default.
+      if [ ! -d $default_cuda_path ] && [ -d /opt/cuda ]; then
+        default_cuda_path=/opt/cuda
+      fi
     fi
     read -p "Please specify the location where CUDA $TF_CUDA_VERSION toolkit is installed. Refer to README.md for more details. [Default is $default_cuda_path]: " CUDA_TOOLKIT_PATH
     fromuser="1"
@@ -513,6 +490,35 @@ while true; do
   CUDA_TOOLKIT_PATH=""
 done
 
+# Set up which gcc nvcc should use as the host compiler
+# No need to set this on Windows
+while [[ "$TF_CUDA_CLANG" != "1" ]] && ! is_windows && true; do
+  fromuser=""
+  if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
+    default_gcc_host_compiler_path=$(which gcc || true)
+    cuda_bin_symlink="$CUDA_TOOLKIT_PATH/bin/gcc"
+    if [ -L "$cuda_bin_symlink" ]; then
+      default_gcc_host_compiler_path=$(readlink $cuda_bin_symlink)
+    fi
+    read -p "Please specify which gcc should be used by nvcc as the host compiler. [Default is $default_gcc_host_compiler_path]: " GCC_HOST_COMPILER_PATH
+    fromuser="1"
+    if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
+      GCC_HOST_COMPILER_PATH="$default_gcc_host_compiler_path"
+    fi
+  fi
+  if [ -e "$GCC_HOST_COMPILER_PATH" ]; then
+    export GCC_HOST_COMPILER_PATH
+    write_action_env_to_bazelrc "GCC_HOST_COMPILER_PATH" "$GCC_HOST_COMPILER_PATH"
+    break
+  fi
+  echo "Invalid gcc path. ${GCC_HOST_COMPILER_PATH} cannot be found" 1>&2
+  if [ -z "$fromuser" ]; then
+    exit 1
+  fi
+  GCC_HOST_COMPILER_PATH=""
+  # Retry
+done
+
 # Find out where the cuDNN library is installed
 while true; do
   # Configure the cuDNN version to use.
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index a2f7a9fb63..a36a57314d 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -255,6 +255,7 @@ filegroup(
         "//tensorflow/contrib/seq2seq:all_files",
         "//tensorflow/contrib/session_bundle:all_files",
         "//tensorflow/contrib/session_bundle/example:all_files",
+        "//tensorflow/contrib/signal:all_files",
         "//tensorflow/contrib/slim:all_files",
         "//tensorflow/contrib/slim/python/slim/data:all_files",
         "//tensorflow/contrib/slim/python/slim/nets:all_files",
diff --git a/tensorflow/contrib/batching/BUILD b/tensorflow/contrib/batching/BUILD
index 1f1e2db69b..b441906cd4 100644
--- a/tensorflow/contrib/batching/BUILD
+++ b/tensorflow/contrib/batching/BUILD
@@ -181,6 +181,7 @@ py_test(
     size = "small",
     srcs = ["python/ops/batch_ops_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["nomac"],
     deps = [
         ":batch_py",
         "//tensorflow/python:framework_test_lib",
diff --git a/tensorflow/contrib/factorization/python/ops/gmm_ops.py b/tensorflow/contrib/factorization/python/ops/gmm_ops.py
index 42544ff884..b092eab316 100644
--- a/tensorflow/contrib/factorization/python/ops/gmm_ops.py
+++ b/tensorflow/contrib/factorization/python/ops/gmm_ops.py
@@ -85,7 +85,7 @@ def _init_clusters_random(data, num_clusters, random_seed):
         maxval=math_ops.cast(num_data, dtypes.int64),
         seed=random_seed,
         dtype=dtypes.int64)
-  indices = math_ops.cast(indices, dtypes.int32) % num_data
+  indices %= math_ops.cast(num_data, dtypes.int64)
   clusters_init = embedding_lookup(data, indices, partition_strategy='div')
   return clusters_init
 
diff --git a/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py b/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py
index 758e0bcc07..280271a42d 100644
--- a/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py
+++ b/tensorflow/contrib/grid_rnn/python/kernel_tests/grid_rnn_test.py
@@ -34,180 +34,228 @@ from tensorflow.python.platform import test
 class GridRNNCellTest(test.TestCase):
 
   def testGrid2BasicLSTMCell(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=False) as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.2)) as root_scope:
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2BasicLSTMCell(2)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
+        res_g, res_s = sess.run([g, s], {
+            x:
+                np.array([[1., 1., 1.]]),
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))
         })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.36617181, 0.36617181]])
-        self.assertAllClose(res[1], [[0.71053141, 0.71053141, 0.36617181,
-                                      0.36617181, 0.72320831, 0.80555487,
-                                      0.39102408, 0.42150158]])
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+
+        self.assertAllClose(res_g, ([[0.36617181, 0.36617181]],))
+        self.assertAllClose(
+            res_s, (([[0.71053141, 0.71053141]], [[0.36617181, 0.36617181]]),
+                    ([[0.72320831, 0.80555487]], [[0.39102408, 0.42150158]])))
 
         # emulate a loop through the input sequence,
         # where we call cell() multiple times
         root_scope.reuse_variables()
         g2, s2 = cell(x, m)
-        self.assertEqual(g2.get_shape(), (1, 2))
-        self.assertEqual(s2.get_shape(), (1, 8))
-
-        res = sess.run([g2, s2], {x: np.array([[2., 2., 2.]]), m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.58847463, 0.58847463]])
-        self.assertAllClose(res[1], [[1.40469193, 1.40469193, 0.58847463,
-                                      0.58847463, 0.97726452, 1.04626071,
-                                      0.4927212, 0.51137757]])
+        self.assertEqual(g2[0].get_shape(), (1, 2))
+        self.assertEqual(s2[0].c.get_shape(), (1, 2))
+        self.assertEqual(s2[0].h.get_shape(), (1, 2))
+        self.assertEqual(s2[1].c.get_shape(), (1, 2))
+        self.assertEqual(s2[1].h.get_shape(), (1, 2))
+
+        res_g2, res_s2 = sess.run([g2, s2],
+                                  {x: np.array([[2., 2., 2.]]),
+                                   m: res_s})
+        self.assertEqual(res_g2[0].shape, (1, 2))
+        self.assertEqual(res_s2[0].c.shape, (1, 2))
+        self.assertEqual(res_s2[0].h.shape, (1, 2))
+        self.assertEqual(res_s2[1].c.shape, (1, 2))
+        self.assertEqual(res_s2[1].h.shape, (1, 2))
+        self.assertAllClose(res_g2[0], [[0.58847463, 0.58847463]])
+        self.assertAllClose(
+            res_s2, (([[1.40469193, 1.40469193]], [[0.58847463, 0.58847463]]),
+                     ([[0.97726452, 1.04626071]], [[0.4927212, 0.51137757]])))
 
   def testGrid2BasicLSTMCellTied(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=False) as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.2)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2BasicLSTMCell(2, tied=True)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
+        res_g, res_s = sess.run([g, s], {
+            x:
+                np.array([[1., 1., 1.]]),
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))
         })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.36617181, 0.36617181]])
-        self.assertAllClose(res[1], [[0.71053141, 0.71053141, 0.36617181,
-                                      0.36617181, 0.72320831, 0.80555487,
-                                      0.39102408, 0.42150158]])
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
 
-        res = sess.run([g, s], {x: np.array([[1., 1., 1.]]), m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.36703536, 0.36703536]])
-        self.assertAllClose(res[1], [[0.71200621, 0.71200621, 0.36703536,
-                                      0.36703536, 0.80941606, 0.87550586,
-                                      0.40108523, 0.42199609]])
+        self.assertAllClose(res_g[0], [[0.36617181, 0.36617181]])
+        self.assertAllClose(
+            res_s, (([[0.71053141, 0.71053141]], [[0.36617181, 0.36617181]]),
+                    ([[0.72320831, 0.80555487]], [[0.39102408, 0.42150158]])))
+
+        res_g, res_s = sess.run([g, s], {x: np.array([[1., 1., 1.]]), m: res_s})
+        self.assertEqual(res_g[0].shape, (1, 2))
+
+        self.assertAllClose(res_g[0], [[0.36703536, 0.36703536]])
+        self.assertAllClose(
+            res_s, (([[0.71200621, 0.71200621]], [[0.36703536, 0.36703536]]),
+                    ([[0.80941606, 0.87550586]], [[0.40108523, 0.42199609]])))
 
   def testGrid2BasicLSTMCellWithRelu(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=False) as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.2)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),)
         cell = grid_rnn_cell.Grid2BasicLSTMCell(
             2, tied=False, non_recurrent_fn=nn_ops.relu)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, ((2, 2),))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1., 1.]]),
-             m: np.array([[0.1, 0.2, 0.3, 0.4]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.31667367, 0.31667367]])
-        self.assertAllClose(res[1], [[0.29530135, 0.37520045, 0.17044567,
-                                      0.21292259]])
+        res_g, res_s = sess.run([g, s], {
+            x: np.array([[1., 1., 1.]]),
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),)
+        })
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertAllClose(res_g[0], [[0.31667367, 0.31667367]])
+        self.assertAllClose(res_s, (([[0.29530135, 0.37520045]],
+                                     [[0.17044567, 0.21292259]]),))
 
   """LSTMCell
   """
 
   def testGrid2LSTMCell(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=False) as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2LSTMCell(2, use_peepholes=True)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
+        res_g, res_s = sess.run([g, s], {
+            x:
+                np.array([[1., 1., 1.]]),
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))
         })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.95686918, 0.95686918]])
-        self.assertAllClose(res[1], [[2.41515064, 2.41515064, 0.95686918,
-                                      0.95686918, 1.38917875, 1.49043763,
-                                      0.83884692, 0.86036491]])
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+
+        self.assertAllClose(res_g[0], [[0.95686918, 0.95686918]])
+        self.assertAllClose(
+            res_s, (([[2.41515064, 2.41515064]], [[0.95686918, 0.95686918]]),
+                    ([[1.38917875, 1.49043763]], [[0.83884692, 0.86036491]])))
 
   def testGrid2LSTMCellTied(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=False) as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 8])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid2LSTMCell(2, tied=True, use_peepholes=True)
-        self.assertEqual(cell.state_size, 8)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 8))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1., 1.]]),
-            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
+        res_g, res_s = sess.run([g, s], {
+            x:
+                np.array([[1., 1., 1.]]),
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])))
         })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 8))
-        self.assertAllClose(res[0], [[0.95686918, 0.95686918]])
-        self.assertAllClose(res[1], [[2.41515064, 2.41515064, 0.95686918,
-                                      0.95686918, 1.38917875, 1.49043763,
-                                      0.83884692, 0.86036491]])
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+
+        self.assertAllClose(res_g[0], [[0.95686918, 0.95686918]])
+        self.assertAllClose(
+            res_s, (([[2.41515064, 2.41515064]], [[0.95686918, 0.95686918]]),
+                    ([[1.38917875, 1.49043763]], [[0.83884692, 0.86036491]])))
 
   def testGrid2LSTMCellWithRelu(self):
     with self.test_session() as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),)
         cell = grid_rnn_cell.Grid2LSTMCell(
             2, use_peepholes=True, non_recurrent_fn=nn_ops.relu)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, ((2, 2),))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1., 1.]]),
-             m: np.array([[0.1, 0.2, 0.3, 0.4]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[2.1831727, 2.1831727]])
-        self.assertAllClose(res[1], [[0.92270052, 1.02325559, 0.66159075,
-                                      0.70475441]])
+        res_g, res_s = sess.run([g, s], {
+            x: np.array([[1., 1., 1.]]),
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),)
+        })
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertAllClose(res_g[0], [[2.1831727, 2.1831727]])
+        self.assertAllClose(res_s, (([[0.92270052, 1.02325559]],
+                                     [[0.66159075, 0.70475441]]),))
 
   """RNNCell
   """
@@ -217,74 +265,84 @@ class GridRNNCellTest(test.TestCase):
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([2, 2])
-        m = array_ops.zeros([2, 4])
+        m = (array_ops.zeros([2, 2]), array_ops.zeros([2, 2]))
         cell = grid_rnn_cell.Grid2BasicRNNCell(2)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, (2, 2))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (2, 2))
-        self.assertEqual(s.get_shape(), (2, 4))
+        self.assertEqual(g[0].get_shape(), (2, 2))
+        self.assertEqual(s[0].get_shape(), (2, 2))
+        self.assertEqual(s[1].get_shape(), (2, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1.], [2., 2.]]),
-            m: np.array([[0.1, 0.1, 0.1, 0.1], [0.2, 0.2, 0.2, 0.2]])
+        res_g, res_s = sess.run([g, s], {
+            x:
+                np.array([[1., 1.], [2., 2.]]),
+            m: (np.array([[0.1, 0.1], [0.2, 0.2]]), np.array([[0.1, 0.1],
+                                                              [0.2, 0.2]]))
         })
-        self.assertEqual(res[0].shape, (2, 2))
-        self.assertEqual(res[1].shape, (2, 4))
-        self.assertAllClose(res[0], [[0.94685763, 0.94685763],
-                                     [0.99480951, 0.99480951]])
-        self.assertAllClose(res[1],
-                            [[0.94685763, 0.94685763, 0.80049908, 0.80049908],
-                             [0.99480951, 0.99480951, 0.97574311, 0.97574311]])
+        self.assertEqual(res_g[0].shape, (2, 2))
+        self.assertEqual(res_s[0].shape, (2, 2))
+        self.assertEqual(res_s[1].shape, (2, 2))
+
+        self.assertAllClose(res_g, ([[0.94685763, 0.94685763],
+                                     [0.99480951, 0.99480951]],))
+        self.assertAllClose(
+            res_s, ([[0.94685763, 0.94685763], [0.99480951, 0.99480951]],
+                    [[0.80049908, 0.80049908], [0.97574311, 0.97574311]]))
 
   def testGrid2BasicRNNCellTied(self):
     with self.test_session() as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([2, 2])
-        m = array_ops.zeros([2, 4])
+        m = (array_ops.zeros([2, 2]), array_ops.zeros([2, 2]))
         cell = grid_rnn_cell.Grid2BasicRNNCell(2, tied=True)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, (2, 2))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (2, 2))
-        self.assertEqual(s.get_shape(), (2, 4))
+        self.assertEqual(g[0].get_shape(), (2, 2))
+        self.assertEqual(s[0].get_shape(), (2, 2))
+        self.assertEqual(s[1].get_shape(), (2, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
-            x: np.array([[1., 1.], [2., 2.]]),
-            m: np.array([[0.1, 0.1, 0.1, 0.1], [0.2, 0.2, 0.2, 0.2]])
+        res_g, res_s = sess.run([g, s], {
+            x:
+                np.array([[1., 1.], [2., 2.]]),
+            m: (np.array([[0.1, 0.1], [0.2, 0.2]]), np.array([[0.1, 0.1],
+                                                              [0.2, 0.2]]))
         })
-        self.assertEqual(res[0].shape, (2, 2))
-        self.assertEqual(res[1].shape, (2, 4))
-        self.assertAllClose(res[0], [[0.94685763, 0.94685763],
-                                     [0.99480951, 0.99480951]])
-        self.assertAllClose(res[1],
-                            [[0.94685763, 0.94685763, 0.80049908, 0.80049908],
-                             [0.99480951, 0.99480951, 0.97574311, 0.97574311]])
+        self.assertEqual(res_g[0].shape, (2, 2))
+        self.assertEqual(res_s[0].shape, (2, 2))
+        self.assertEqual(res_s[1].shape, (2, 2))
+
+        self.assertAllClose(res_g, ([[0.94685763, 0.94685763],
+                                     [0.99480951, 0.99480951]],))
+        self.assertAllClose(
+            res_s, ([[0.94685763, 0.94685763], [0.99480951, 0.99480951]],
+                    [[0.80049908, 0.80049908], [0.97574311, 0.97574311]]))
 
   def testGrid2BasicRNNCellWithRelu(self):
     with self.test_session() as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 2])
-        m = array_ops.zeros([1, 2])
+        m = (array_ops.zeros([1, 2]),)
         cell = grid_rnn_cell.Grid2BasicRNNCell(2, non_recurrent_fn=nn_ops.relu)
-        self.assertEqual(cell.state_size, 2)
+        self.assertEqual(cell.state_size, (2,))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 2))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s],
-                       {x: np.array([[1., 1.]]),
-                        m: np.array([[0.1, 0.1]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 2))
-        self.assertAllClose(res[0], [[1.80049896, 1.80049896]])
-        self.assertAllClose(res[1], [[0.80049896, 0.80049896]])
+        res_g, res_s = sess.run(
+            [g, s], {x: np.array([[1., 1.]]),
+                     m: np.array([[0.1, 0.1]])})
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].shape, (1, 2))
+        self.assertAllClose(res_g, ([[1.80049896, 1.80049896]],))
+        self.assertAllClose(res_s, ([[0.80049896, 0.80049896]],))
 
   """1-LSTM
   """
@@ -294,51 +352,59 @@ class GridRNNCellTest(test.TestCase):
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)) as root_scope:
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),)
         cell = grid_rnn_cell.Grid1LSTMCell(2, use_peepholes=True)
-        self.assertEqual(cell.state_size, 4)
+        self.assertEqual(cell.state_size, ((2, 2),))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1., 1.]]),
-             m: np.array([[0.1, 0.2, 0.3, 0.4]])})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.91287315, 0.91287315]])
-        self.assertAllClose(res[1],
-                            [[2.26285243, 2.26285243, 0.91287315, 0.91287315]])
+        res_g, res_s = sess.run([g, s], {
+            x: np.array([[1., 1., 1.]]),
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),)
+        })
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+
+        self.assertAllClose(res_g, ([[0.91287315, 0.91287315]],))
+        self.assertAllClose(res_s, (([[2.26285243, 2.26285243]],
+                                     [[0.91287315, 0.91287315]]),))
 
         root_scope.reuse_variables()
 
         x2 = array_ops.zeros([0, 0])
         g2, s2 = cell(x2, m)
-        self.assertEqual(g2.get_shape(), (1, 2))
-        self.assertEqual(s2.get_shape(), (1, 4))
+        self.assertEqual(g2[0].get_shape(), (1, 2))
+        self.assertEqual(s2[0].c.get_shape(), (1, 2))
+        self.assertEqual(s2[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g2, s2], {m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.9032144, 0.9032144]])
-        self.assertAllClose(res[1],
-                            [[2.79966092, 2.79966092, 0.9032144, 0.9032144]])
+        res_g2, res_s2 = sess.run([g2, s2], {m: res_s})
+        self.assertEqual(res_g2[0].shape, (1, 2))
+        self.assertEqual(res_s2[0].c.shape, (1, 2))
+        self.assertEqual(res_s2[0].h.shape, (1, 2))
+
+        self.assertAllClose(res_g2, ([[0.9032144, 0.9032144]],))
+        self.assertAllClose(res_s2, (([[2.79966092, 2.79966092]],
+                                      [[0.9032144, 0.9032144]]),))
 
         g3, s3 = cell(x2, m)
-        self.assertEqual(g3.get_shape(), (1, 2))
-        self.assertEqual(s3.get_shape(), (1, 4))
+        self.assertEqual(g3[0].get_shape(), (1, 2))
+        self.assertEqual(s3[0].c.get_shape(), (1, 2))
+        self.assertEqual(s3[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g3, s3], {m: res[1]})
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 4))
-        self.assertAllClose(res[0], [[0.92727238, 0.92727238]])
-        self.assertAllClose(res[1],
-                            [[3.3529923, 3.3529923, 0.92727238, 0.92727238]])
+        res_g3, res_s3 = sess.run([g3, s3], {m: res_s2})
+        self.assertEqual(res_g3[0].shape, (1, 2))
+        self.assertEqual(res_s3[0].c.shape, (1, 2))
+        self.assertEqual(res_s3[0].h.shape, (1, 2))
+        self.assertAllClose(res_g3, ([[0.92727238, 0.92727238]],))
+        self.assertAllClose(res_s3, (([[3.3529923, 3.3529923]],
+                                      [[0.92727238, 0.92727238]]),))
 
   """3-LSTM
   """
@@ -348,32 +414,42 @@ class GridRNNCellTest(test.TestCase):
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 3])
-        m = array_ops.zeros([1, 12])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),
+             (array_ops.zeros([1, 2]), array_ops.zeros([1, 2])))
         cell = grid_rnn_cell.Grid3LSTMCell(2, use_peepholes=True)
-        self.assertEqual(cell.state_size, 12)
+        self.assertEqual(cell.state_size, ((2, 2), (2, 2), (2, 2)))
 
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (1, 2))
-        self.assertEqual(s.get_shape(), (1, 12))
+        self.assertEqual(g[0].get_shape(), (1, 2))
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
+        self.assertEqual(s[1].c.get_shape(), (1, 2))
+        self.assertEqual(s[1].h.get_shape(), (1, 2))
+        self.assertEqual(s[2].c.get_shape(), (1, 2))
+        self.assertEqual(s[2].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {
+        res_g, res_s = sess.run([g, s], {
             x:
                 np.array([[1., 1., 1.]]),
-            m:
-                np.array([[
-                    0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, -0.1, -0.2, -0.3,
-                    -0.4
-                ]])
+            m: ((np.array([[0.1, 0.2]]), np.array([[0.3, 0.4]])),
+                (np.array([[0.5, 0.6]]), np.array([[0.7, 0.8]])), (np.array(
+                    [[-0.1, -0.2]]), np.array([[-0.3, -0.4]])))
         })
-        self.assertEqual(res[0].shape, (1, 2))
-        self.assertEqual(res[1].shape, (1, 12))
-
-        self.assertAllClose(res[0], [[0.96892911, 0.96892911]])
-        self.assertAllClose(res[1], [[2.45227885, 2.45227885, 0.96892911,
-                                      0.96892911, 1.33592629, 1.4373529,
-                                      0.80867189, 0.83247656, 0.7317788,
-                                      0.63205892, 0.56548983, 0.50446129]])
+        self.assertEqual(res_g[0].shape, (1, 2))
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
+        self.assertEqual(res_s[1].c.shape, (1, 2))
+        self.assertEqual(res_s[1].h.shape, (1, 2))
+        self.assertEqual(res_s[2].c.shape, (1, 2))
+        self.assertEqual(res_s[2].h.shape, (1, 2))
+
+        self.assertAllClose(res_g, ([[0.96892911, 0.96892911]],))
+        self.assertAllClose(
+            res_s, (([[2.45227885, 2.45227885]], [[0.96892911, 0.96892911]]),
+                    ([[1.33592629, 1.4373529]], [[0.80867189, 0.83247656]]),
+                    ([[0.7317788, 0.63205892]], [[0.56548983, 0.50446129]])))
 
   """Edge cases
   """
@@ -383,7 +459,7 @@ class GridRNNCellTest(test.TestCase):
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([3, 2])
-        m = array_ops.zeros([0, 0])
+        m = ()
 
         # this is equivalent to relu
         cell = grid_rnn_cell.GridRNNCell(
@@ -394,21 +470,22 @@ class GridRNNCellTest(test.TestCase):
             non_recurrent_dims=0,
             non_recurrent_fn=nn_ops.relu)
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (3, 2))
-        self.assertEqual(s.get_shape(), (0, 0))
+        self.assertEqual(g[0].get_shape(), (3, 2))
+        self.assertEqual(s, ())
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run([g, s], {x: np.array([[1., -1.], [-2, 1], [2, -1]])})
-        self.assertEqual(res[0].shape, (3, 2))
-        self.assertEqual(res[1].shape, (0, 0))
-        self.assertAllClose(res[0], [[0, 0], [0, 0], [0.5, 0.5]])
+        res_g, res_s = sess.run([g, s],
+                                {x: np.array([[1., -1.], [-2, 1], [2, -1]])})
+        self.assertEqual(res_g[0].shape, (3, 2))
+        self.assertEqual(res_s, ())
+        self.assertAllClose(res_g, ([[0, 0], [0, 0], [0.5, 0.5]],))
 
   def testGridRNNEdgeCasesNoOutput(self):
     with self.test_session() as sess:
       with variable_scope.variable_scope(
           'root', initializer=init_ops.constant_initializer(0.5)):
         x = array_ops.zeros([1, 2])
-        m = array_ops.zeros([1, 4])
+        m = ((array_ops.zeros([1, 2]), array_ops.zeros([1, 2])),)
 
         # This cell produces no output
         cell = grid_rnn_cell.GridRNNCell(
@@ -419,16 +496,18 @@ class GridRNNCellTest(test.TestCase):
             non_recurrent_dims=0,
             non_recurrent_fn=nn_ops.relu)
         g, s = cell(x, m)
-        self.assertEqual(g.get_shape(), (0, 0))
-        self.assertEqual(s.get_shape(), (1, 4))
+        self.assertEqual(g, ())
+        self.assertEqual(s[0].c.get_shape(), (1, 2))
+        self.assertEqual(s[0].h.get_shape(), (1, 2))
 
         sess.run([variables.global_variables_initializer()])
-        res = sess.run(
-            [g, s],
-            {x: np.array([[1., 1.]]),
-             m: np.array([[0.1, 0.1, 0.1, 0.1]])})
-        self.assertEqual(res[0].shape, (0, 0))
-        self.assertEqual(res[1].shape, (1, 4))
+        res_g, res_s = sess.run([g, s], {
+            x: np.array([[1., 1.]]),
+            m: ((np.array([[0.1, 0.1]]), np.array([[0.1, 0.1]])),)
+        })
+        self.assertEqual(res_g, ())
+        self.assertEqual(res_s[0].c.shape, (1, 2))
+        self.assertEqual(res_s[0].h.shape, (1, 2))
 
   """Test with tf.nn.rnn
   """
@@ -451,20 +530,29 @@ class GridRNNCellTest(test.TestCase):
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 8))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape()[0], inp.get_shape()[0])
-      self.assertEqual(out.get_shape()[1], num_units)
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape()[0], inp.get_shape()[0])
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
 
   def testGrid2LSTMCellReLUWithRNN(self):
     batch_size = 3
@@ -478,27 +566,33 @@ class GridRNNCellTest(test.TestCase):
           num_units=num_units, non_recurrent_fn=nn_ops.relu)
 
       inputs = max_length * [
-          array_ops.placeholder(
-              dtypes.float32, shape=(batch_size, input_size))
+          array_ops.placeholder(dtypes.float32, shape=(batch_size, input_size))
       ]
 
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 4))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape()[0], inp.get_shape()[0])
-      self.assertEqual(out.get_shape()[1], num_units)
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape()[0], inp.get_shape()[0])
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
 
   def testGrid3LSTMCellReLUWithRNN(self):
     batch_size = 3
@@ -512,27 +606,35 @@ class GridRNNCellTest(test.TestCase):
           num_units=num_units, non_recurrent_fn=nn_ops.relu)
 
       inputs = max_length * [
-          array_ops.placeholder(
-              dtypes.float32, shape=(batch_size, input_size))
+          array_ops.placeholder(dtypes.float32, shape=(batch_size, input_size))
       ]
 
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 8))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[1].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape()[0], inp.get_shape()[0])
-      self.assertEqual(out.get_shape()[1], num_units)
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape()[0], inp.get_shape()[0])
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
 
   def testGrid1LSTMCellWithRNN(self):
     batch_size = 3
@@ -553,20 +655,91 @@ class GridRNNCellTest(test.TestCase):
       outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
 
     self.assertEqual(len(outputs), len(inputs))
-    self.assertEqual(state.get_shape(), (batch_size, 4))
+    self.assertEqual(state[0].c.get_shape(), (batch_size, 2))
+    self.assertEqual(state[0].h.get_shape(), (batch_size, 2))
 
     for out, inp in zip(outputs, inputs):
-      self.assertEqual(out.get_shape(), (3, num_units))
-      self.assertEqual(out.dtype, inp.dtype)
+      self.assertEqual(len(out), 1)
+      self.assertEqual(out[0].get_shape(), (3, num_units))
+      self.assertEqual(out[0].dtype, inp.dtype)
 
     with self.test_session() as sess:
       sess.run(variables.global_variables_initializer())
 
       input_value = np.ones((batch_size, input_size))
       values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
-      for v in values:
-        self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
+
+  def testGrid2LSTMCellWithRNNAndDynamicBatchSize(self):
+    """Test for #4296."""
+    input_size = 5
+    max_length = 6  # unrolled up to this length
+    num_units = 2
+
+    with variable_scope.variable_scope(
+        'root', initializer=init_ops.constant_initializer(0.5)):
+      cell = grid_rnn_cell.Grid2LSTMCell(num_units=num_units)
 
+      inputs = max_length * [
+          array_ops.placeholder(dtypes.float32, shape=(None, input_size))
+      ]
+
+      outputs, state = core_rnn.static_rnn(cell, inputs, dtype=dtypes.float32)
+
+    self.assertEqual(len(outputs), len(inputs))
+
+    for out, inp in zip(outputs, inputs):
+      self.assertEqual(len(out), 1)
+      self.assertTrue(out[0].get_shape()[0].value is None)
+      self.assertEqual(out[0].get_shape()[1], num_units)
+      self.assertEqual(out[0].dtype, inp.dtype)
+
+    with self.test_session() as sess:
+      sess.run(variables.global_variables_initializer())
+
+      input_value = np.ones((3, input_size))
+      values = sess.run(outputs + [state], feed_dict={inputs[0]: input_value})
+      for tp in values[:-1]:
+        for v in tp:
+          self.assertTrue(np.all(np.isfinite(v)))
+      for tp in values[-1]:
+        for st in tp:
+          for v in st:
+            self.assertTrue(np.all(np.isfinite(v)))
+
+  def testGrid2LSTMCellLegacy(self):
+    """Test for legacy case (when state_is_tuple=False)."""
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          'root', initializer=init_ops.constant_initializer(0.5)):
+        x = array_ops.zeros([1, 3])
+        m = array_ops.zeros([1, 8])
+        cell = grid_rnn_cell.Grid2LSTMCell(
+            2, use_peepholes=True, state_is_tuple=False, output_is_tuple=False)
+        self.assertEqual(cell.state_size, 8)
+
+        g, s = cell(x, m)
+        self.assertEqual(g.get_shape(), (1, 2))
+        self.assertEqual(s.get_shape(), (1, 8))
+
+        sess.run([variables.global_variables_initializer()])
+        res = sess.run([g, s], {
+            x: np.array([[1., 1., 1.]]),
+            m: np.array([[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8]])
+        })
+        self.assertEqual(res[0].shape, (1, 2))
+        self.assertEqual(res[1].shape, (1, 8))
+        self.assertAllClose(res[0], [[0.95686918, 0.95686918]])
+        self.assertAllClose(res[1], [[
+            2.41515064, 2.41515064, 0.95686918, 0.95686918, 1.38917875,
+            1.49043763, 0.83884692, 0.86036491
+        ]])
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py b/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py
index 269b224581..252788140f 100644
--- a/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py
+++ b/tensorflow/contrib/grid_rnn/python/ops/grid_rnn_cell.py
@@ -25,6 +25,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import variable_scope as vs
+
+from tensorflow.python.platform import tf_logging as logging
 from tensorflow.contrib import layers
 from tensorflow.contrib import rnn
 
@@ -53,7 +55,9 @@ class GridRNNCell(rnn.RNNCell):
                non_recurrent_dims=None,
                tied=False,
                cell_fn=None,
-               non_recurrent_fn=None):
+               non_recurrent_fn=None,
+               state_is_tuple=True,
+               output_is_tuple=True):
     """Initialize the parameters of a Grid RNN cell
 
     Args:
@@ -68,26 +72,47 @@ class GridRNNCell(rnn.RNNCell):
       non_recurrent_dims: int or list, List of dimensions that are not
         recurrent.
               The transfer function for non-recurrent dimensions is specified
-                via `non_recurrent_fn`,
-              which is default to be `tensorflow.nn.relu`.
+                via `non_recurrent_fn`, which is
+                default to be `tensorflow.nn.relu`.
       tied: bool, Whether to share the weights among the dimensions of this
         GridRNN cell.
               If there are non-recurrent dimensions in the grid, weights are
-                shared between each
-              group of recurrent and non-recurrent dimensions.
-      cell_fn: function, a function which returns the recurrent cell object. Has
-        to be in the following signature:
-              def cell_func(num_units, input_size):
+                shared between each group of recurrent and non-recurrent
+                dimensions.
+      cell_fn: function, a function which returns the recurrent cell object.
+        Has to be in the following signature:
+              ```
+              def cell_func(num_units):
                 # ...
-
+              ```
               and returns an object of type `RNNCell`. If None, LSTMCell with
                 default parameters will be used.
+        Note that if you use a custom RNNCell (with `cell_fn`), it is your
+        responsibility to make sure the inner cell use `state_is_tuple=True`.
+
       non_recurrent_fn: a tensorflow Op that will be the transfer function of
         the non-recurrent dimensions
+      state_is_tuple: If True, accepted and returned states are tuples of the
+        states of the recurrent dimensions. If False, they are concatenated
+        along the column axis. The latter behavior will soon be deprecated.
+
+        Note that if you use a custom RNNCell (with `cell_fn`), it is your
+        responsibility to make sure the inner cell use `state_is_tuple=True`.
+
+      output_is_tuple: If True, the output is a tuple of the outputs of the
+        recurrent dimensions. If False, they are concatenated along the
+        column axis. The later behavior will soon be deprecated.
 
     Raises:
       TypeError: if cell_fn does not return an RNNCell instance.
     """
+    if not state_is_tuple:
+      logging.warning('%s: Using a concatenated state is slower and will '
+                      'soon be deprecated.  Use state_is_tuple=True.', self)
+    if not output_is_tuple:
+      logging.warning('%s: Using a concatenated output is slower and will'
+                      'soon be deprecated.  Use output_is_tuple=True.', self)
+
     if num_dims < 1:
       raise ValueError('dims must be >= 1: {}'.format(num_dims))
 
@@ -96,37 +121,41 @@ class GridRNNCell(rnn.RNNCell):
                                      non_recurrent_fn or nn.relu, tied,
                                      num_units)
 
-    cell_input_size = (self._config.num_dims - 1) * num_units
+    self._state_is_tuple = state_is_tuple
+    self._output_is_tuple = output_is_tuple
+
     if cell_fn is None:
       my_cell_fn = functools.partial(
-          rnn.LSTMCell,
-          num_units=num_units, input_size=cell_input_size,
-          state_is_tuple=False)
+          rnn.LSTMCell, num_units=num_units, state_is_tuple=state_is_tuple)
     else:
-      my_cell_fn = lambda: cell_fn(num_units, cell_input_size)
+      my_cell_fn = lambda: cell_fn(num_units)
     if tied:
       self._cells = [my_cell_fn()] * num_dims
     else:
       self._cells = [my_cell_fn() for _ in range(num_dims)]
     if not isinstance(self._cells[0], rnn.RNNCell):
-      raise TypeError(
-          'cell_fn must return an RNNCell instance, saw: %s'
-          % type(self._cells[0]))
+      raise TypeError('cell_fn must return an RNNCell instance, saw: %s' %
+                      type(self._cells[0]))
 
-  @property
-  def input_size(self):
-    # temporarily using num_units as the input_size of each dimension.
-    # The actual input size only determined when this cell get invoked,
-    # so this information can be considered unreliable.
-    return self._config.num_units * len(self._config.inputs)
+    if self._output_is_tuple:
+      self._output_size = tuple(self._cells[0].output_size
+                                for _ in self._config.outputs)
+    else:
+      self._output_size = self._cells[0].output_size * len(self._config.outputs)
+
+    if self._state_is_tuple:
+      self._state_size = tuple(self._cells[0].state_size
+                               for _ in self._config.recurrents)
+    else:
+      self._state_size = self._cell_state_size() * len(self._config.recurrents)
 
   @property
   def output_size(self):
-    return self._cells[0].output_size * len(self._config.outputs)
+    return self._output_size
 
   @property
   def state_size(self):
-    return self._cells[0].state_size * len(self._config.recurrents)
+    return self._state_size
 
   def __call__(self, inputs, state, scope=None):
     """Run one step of GridRNN.
@@ -145,76 +174,148 @@ class GridRNNCell(rnn.RNNCell):
       - A 2D, batch x state_size, Tensor representing the new state of the cell
         after reading "inputs" when previous state was "state".
     """
-    state_sz = state.get_shape().as_list()[1]
-    if self.state_size != state_sz:
-      raise ValueError(
-          'Actual state size not same as specified: {} vs {}.'.format(
-              state_sz, self.state_size))
-
     conf = self._config
-    dtype = inputs.dtype if inputs is not None else state.dtype
+    dtype = inputs.dtype
 
-    # c_prev is `m`, and m_prev is `h` in the paper.
-    # Keep c and m here for consistency with the codebase
-    c_prev = [None] * self._config.num_dims
-    m_prev = [None] * self._config.num_dims
-    cell_output_size = self._cells[0].state_size - conf.num_units
-
-    # for LSTM   : state = memory cell + output, hence cell_output_size > 0
-    # for GRU/RNN: state = output (whose size is equal to _num_units),
-    #              hence cell_output_size = 0
-    for recurrent_dim, start_idx in zip(self._config.recurrents, range(
-        0, self.state_size, self._cells[0].state_size)):
-      if cell_output_size > 0:
-        c_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
-                                                [-1, conf.num_units])
-        m_prev[recurrent_dim] = array_ops.slice(
-            state, [0, start_idx + conf.num_units], [-1, cell_output_size])
-      else:
-        m_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
-                                                [-1, conf.num_units])
+    c_prev, m_prev, cell_output_size = self._extract_states(state)
 
     new_output = [None] * conf.num_dims
     new_state = [None] * conf.num_dims
 
     with vs.variable_scope(scope or type(self).__name__):  # GridRNNCell
+      # project input, populate c_prev and m_prev
+      self._project_input(inputs, c_prev, m_prev, cell_output_size > 0)
 
-      # project input
-      if inputs is not None and sum(inputs.get_shape().as_list()) > 0 and len(
-          conf.inputs) > 0:
-        input_splits = array_ops.split(
-            value=inputs, num_or_size_splits=len(conf.inputs), axis=1)
-        input_sz = input_splits[0].get_shape().as_list()[1]
-
-        for i, j in enumerate(conf.inputs):
-          input_project_m = vs.get_variable(
-              'project_m_{}'.format(j), [input_sz, conf.num_units], dtype=dtype)
-          m_prev[j] = math_ops.matmul(input_splits[i], input_project_m)
-
-          if cell_output_size > 0:
-            input_project_c = vs.get_variable(
-                'project_c_{}'.format(j), [input_sz, conf.num_units],
-                dtype=dtype)
-            c_prev[j] = math_ops.matmul(input_splits[i], input_project_c)
-
+      # propagate along dimensions, first for non-priority dimensions
+      # then priority dimensions
       _propagate(conf.non_priority, conf, self._cells, c_prev, m_prev,
                  new_output, new_state, True)
       _propagate(conf.priority, conf, self._cells,
                  c_prev, m_prev, new_output, new_state, False)
 
+      # collect outputs and states
       output_tensors = [new_output[i] for i in self._config.outputs]
-      output = array_ops.zeros(
-          [0, 0], dtype) if len(output_tensors) == 0 else array_ops.concat(
-              output_tensors, 1)
+      if self._output_is_tuple:
+        output = tuple(output_tensors)
+      else:
+        if output_tensors:
+          output = array_ops.concat(output_tensors, 1)
+        else:
+          output = array_ops.zeros([0, 0], dtype)
 
-      state_tensors = [new_state[i] for i in self._config.recurrents]
-      states = array_ops.zeros(
-          [0, 0],
-          dtype) if len(state_tensors) == 0 else array_ops.concat(state_tensors,
-                                                                  1)
+      if self._state_is_tuple:
+        states = tuple(new_state[i] for i in self._config.recurrents)
+      else:
+        # concat each state first, then flatten the whole thing
+        state_tensors = [
+            x for i in self._config.recurrents for x in new_state[i]
+        ]
+        if state_tensors:
+          states = array_ops.concat(state_tensors, 1)
+        else:
+          states = array_ops.zeros([0, 0], dtype)
 
     return output, states
 
+  def _extract_states(self, state):
+    """Extract the cell and previous output tensors from the given state.
+
+    Args:
+      state: The RNN state.
+
+    Returns:
+      Tuple of the cell value, previous output, and cell_output_size.
+
+    Raises:
+      ValueError: If len(self._config.recurrents) != len(state).
+    """
+    conf = self._config
+
+    # c_prev is `m` (cell value), and
+    # m_prev is `h` (previous output) in the paper.
+    # Keeping c and m here for consistency with the codebase
+    c_prev = [None] * conf.num_dims
+    m_prev = [None] * conf.num_dims
+
+    # for LSTM   : state = memory cell + output, hence cell_output_size > 0
+    # for GRU/RNN: state = output (whose size is equal to _num_units),
+    #              hence cell_output_size = 0
+    total_cell_state_size = self._cell_state_size()
+    cell_output_size = total_cell_state_size - conf.num_units
+
+    if self._state_is_tuple:
+      if len(conf.recurrents) != len(state):
+        raise ValueError('Expected state as a tuple of {} '
+                         'element'.format(len(conf.recurrents)))
+
+      for recurrent_dim, recurrent_state in zip(conf.recurrents, state):
+        if cell_output_size > 0:
+          c_prev[recurrent_dim], m_prev[recurrent_dim] = recurrent_state
+        else:
+          m_prev[recurrent_dim] = recurrent_state
+    else:
+      for recurrent_dim, start_idx in zip(conf.recurrents,
+                                          range(0, self.state_size,
+                                                total_cell_state_size)):
+        if cell_output_size > 0:
+          c_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
+                                                  [-1, conf.num_units])
+          m_prev[recurrent_dim] = array_ops.slice(
+              state, [0, start_idx + conf.num_units], [-1, cell_output_size])
+        else:
+          m_prev[recurrent_dim] = array_ops.slice(state, [0, start_idx],
+                                                  [-1, conf.num_units])
+    return c_prev, m_prev, cell_output_size
+
+  def _project_input(self, inputs, c_prev, m_prev, with_c):
+    """Fills in c_prev and m_prev with projected input, for input dimensions.
+
+    Args:
+      inputs: inputs tensor
+      c_prev: cell value
+      m_prev: previous output
+      with_c: boolean; whether to include project_c.
+
+    Raises:
+      ValueError: if len(self._config.input) != len(inputs)
+    """
+    conf = self._config
+
+    if (inputs is not None and inputs.get_shape().with_rank(2)[1].value > 0 and
+        conf.inputs):
+      if isinstance(inputs, tuple):
+        if len(conf.inputs) != len(inputs):
+          raise ValueError('Expect inputs as a tuple of {} '
+                           'tensors'.format(len(conf.inputs)))
+        input_splits = inputs
+      else:
+        input_splits = array_ops.split(
+            value=inputs, num_or_size_splits=len(conf.inputs), axis=1)
+      input_sz = input_splits[0].get_shape().with_rank(2)[1].value
+
+      for i, j in enumerate(conf.inputs):
+        input_project_m = vs.get_variable(
+            'project_m_{}'.format(j), [input_sz, conf.num_units],
+            dtype=inputs.dtype)
+        m_prev[j] = math_ops.matmul(input_splits[i], input_project_m)
+
+        if with_c:
+          input_project_c = vs.get_variable(
+              'project_c_{}'.format(j), [input_sz, conf.num_units],
+              dtype=inputs.dtype)
+          c_prev[j] = math_ops.matmul(input_splits[i], input_project_c)
+
+  def _cell_state_size(self):
+    """Total size of the state of the inner cell used in this grid.
+
+    Returns:
+      Total size of the state of the inner cell.
+    """
+    state_sizes = self._cells[0].state_size
+    if isinstance(state_sizes, tuple):
+      return sum(state_sizes)
+    return state_sizes
+
 
 """Specialized cells, for convenience
 """
@@ -223,11 +324,17 @@ class GridRNNCell(rnn.RNNCell):
 class Grid1BasicRNNCell(GridRNNCell):
   """1D BasicRNN cell"""
 
-  def __init__(self, num_units):
+  def __init__(self, num_units, state_is_tuple=True, output_is_tuple=True):
     super(Grid1BasicRNNCell, self).__init__(
-        num_units=num_units, num_dims=1,
-        input_dims=0, output_dims=0, priority_dims=0, tied=False,
-        cell_fn=lambda n, i: rnn.BasicRNNCell(num_units=n, input_size=i))
+        num_units=num_units,
+        num_dims=1,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        tied=False,
+        cell_fn=lambda n: rnn.BasicRNNCell(num_units=n),
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
 class Grid2BasicRNNCell(GridRNNCell):
@@ -240,71 +347,112 @@ class Grid2BasicRNNCell(GridRNNCell):
   specified.
   """
 
-  def __init__(self, num_units, tied=False, non_recurrent_fn=None):
+  def __init__(self,
+               num_units,
+               tied=False,
+               non_recurrent_fn=None,
+               state_is_tuple=True,
+               output_is_tuple=True):
     super(Grid2BasicRNNCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+        num_units=num_units,
+        num_dims=2,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        tied=tied,
         non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.BasicRNNCell(num_units=n, input_size=i),
-        non_recurrent_fn=non_recurrent_fn)
+        cell_fn=lambda n: rnn.BasicRNNCell(num_units=n),
+        non_recurrent_fn=non_recurrent_fn,
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
 class Grid1BasicLSTMCell(GridRNNCell):
-  """1D BasicLSTM cell"""
+  """1D BasicLSTM cell."""
 
-  def __init__(self, num_units, forget_bias=1):
+  def __init__(self,
+               num_units,
+               forget_bias=1,
+               state_is_tuple=True,
+               output_is_tuple=True):
+    def cell_fn(n):
+      return rnn.BasicLSTMCell(num_units=n, forget_bias=forget_bias)
     super(Grid1BasicLSTMCell, self).__init__(
-        num_units=num_units, num_dims=1,
-        input_dims=0, output_dims=0, priority_dims=0, tied=False,
-        cell_fn=lambda n, i: rnn.BasicLSTMCell(
-            num_units=n,
-            forget_bias=forget_bias, input_size=i,
-            state_is_tuple=False))
+        num_units=num_units,
+        num_dims=1,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        tied=False,
+        cell_fn=cell_fn,
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
 class Grid2BasicLSTMCell(GridRNNCell):
-  """2D BasicLSTM cell
+  """2D BasicLSTM cell.
 
-    This creates a 2D cell which receives input and gives output in the first
-    dimension.
+  This creates a 2D cell which receives input and gives output in the first
+  dimension.
 
-    The first dimension can optionally be non-recurrent if `non_recurrent_fn` is
-    specified.
+  The first dimension can optionally be non-recurrent if `non_recurrent_fn` is
+  specified.
   """
 
   def __init__(self,
                num_units,
                tied=False,
                non_recurrent_fn=None,
-               forget_bias=1):
+               forget_bias=1,
+               state_is_tuple=True,
+               output_is_tuple=True):
+    def cell_fn(n):
+      return rnn.BasicLSTMCell(num_units=n, forget_bias=forget_bias)
     super(Grid2BasicLSTMCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+        num_units=num_units,
+        num_dims=2,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        tied=tied,
         non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.BasicLSTMCell(
-            num_units=n, forget_bias=forget_bias, input_size=i,
-            state_is_tuple=False),
-        non_recurrent_fn=non_recurrent_fn)
+        cell_fn=cell_fn,
+        non_recurrent_fn=non_recurrent_fn,
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
 class Grid1LSTMCell(GridRNNCell):
-  """1D LSTM cell
+  """1D LSTM cell.
 
-    This is different from Grid1BasicLSTMCell because it gives options to
-    specify the forget bias and enabling peepholes
+  This is different from Grid1BasicLSTMCell because it gives options to
+  specify the forget bias and enabling peepholes.
   """
 
-  def __init__(self, num_units, use_peepholes=False, forget_bias=1.0):
+  def __init__(self,
+               num_units,
+               use_peepholes=False,
+               forget_bias=1.0,
+               state_is_tuple=True,
+               output_is_tuple=True):
+
+    def cell_fn(n):
+      return rnn.LSTMCell(
+          num_units=n, forget_bias=forget_bias, use_peepholes=use_peepholes)
+
     super(Grid1LSTMCell, self).__init__(
-        num_units=num_units, num_dims=1,
-        input_dims=0, output_dims=0, priority_dims=0,
-        cell_fn=lambda n, i: rnn.LSTMCell(
-            num_units=n, input_size=i, use_peepholes=use_peepholes,
-            forget_bias=forget_bias, state_is_tuple=False))
+        num_units=num_units,
+        num_dims=1,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        cell_fn=cell_fn,
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
 class Grid2LSTMCell(GridRNNCell):
-  """2D LSTM cell
+  """2D LSTM cell.
 
     This creates a 2D cell which receives input and gives output in the first
     dimension.
@@ -317,19 +465,30 @@ class Grid2LSTMCell(GridRNNCell):
                tied=False,
                non_recurrent_fn=None,
                use_peepholes=False,
-               forget_bias=1.0):
+               forget_bias=1.0,
+               state_is_tuple=True,
+               output_is_tuple=True):
+
+    def cell_fn(n):
+      return rnn.LSTMCell(
+          num_units=n, forget_bias=forget_bias, use_peepholes=use_peepholes)
+
     super(Grid2LSTMCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+        num_units=num_units,
+        num_dims=2,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        tied=tied,
         non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.LSTMCell(
-            num_units=n, input_size=i, forget_bias=forget_bias,
-            use_peepholes=use_peepholes, state_is_tuple=False),
-        non_recurrent_fn=non_recurrent_fn)
+        cell_fn=cell_fn,
+        non_recurrent_fn=non_recurrent_fn,
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
 class Grid3LSTMCell(GridRNNCell):
-  """3D BasicLSTM cell
+  """3D BasicLSTM cell.
 
     This creates a 2D cell which receives input and gives output in the first
     dimension.
@@ -343,19 +502,30 @@ class Grid3LSTMCell(GridRNNCell):
                tied=False,
                non_recurrent_fn=None,
                use_peepholes=False,
-               forget_bias=1.0):
+               forget_bias=1.0,
+               state_is_tuple=True,
+               output_is_tuple=True):
+
+    def cell_fn(n):
+      return rnn.LSTMCell(
+          num_units=n, forget_bias=forget_bias, use_peepholes=use_peepholes)
+
     super(Grid3LSTMCell, self).__init__(
-        num_units=num_units, num_dims=3,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+        num_units=num_units,
+        num_dims=3,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        tied=tied,
         non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.LSTMCell(
-            num_units=n, input_size=i, forget_bias=forget_bias,
-            use_peepholes=use_peepholes, state_is_tuple=False),
-        non_recurrent_fn=non_recurrent_fn)
+        cell_fn=cell_fn,
+        non_recurrent_fn=non_recurrent_fn,
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
 class Grid2GRUCell(GridRNNCell):
-  """2D LSTM cell
+  """2D LSTM cell.
 
     This creates a 2D cell which receives input and gives output in the first
     dimension.
@@ -363,21 +533,31 @@ class Grid2GRUCell(GridRNNCell):
     specified.
   """
 
-  def __init__(self, num_units, tied=False, non_recurrent_fn=None):
+  def __init__(self,
+               num_units,
+               tied=False,
+               non_recurrent_fn=None,
+               state_is_tuple=True,
+               output_is_tuple=True):
     super(Grid2GRUCell, self).__init__(
-        num_units=num_units, num_dims=2,
-        input_dims=0, output_dims=0, priority_dims=0, tied=tied,
+        num_units=num_units,
+        num_dims=2,
+        input_dims=0,
+        output_dims=0,
+        priority_dims=0,
+        tied=tied,
         non_recurrent_dims=None if non_recurrent_fn is None else 0,
-        cell_fn=lambda n, i: rnn.GRUCell(num_units=n, input_size=i),
-        non_recurrent_fn=non_recurrent_fn)
+        cell_fn=lambda n: rnn.GRUCell(num_units=n),
+        non_recurrent_fn=non_recurrent_fn,
+        state_is_tuple=state_is_tuple,
+        output_is_tuple=output_is_tuple)
 
 
-"""Helpers
-"""
+# Helpers
 
-_GridRNNDimension = namedtuple(
-    '_GridRNNDimension',
-    ['idx', 'is_input', 'is_output', 'is_priority', 'non_recurrent_fn'])
+_GridRNNDimension = namedtuple('_GridRNNDimension', [
+    'idx', 'is_input', 'is_output', 'is_priority', 'non_recurrent_fn'
+])
 
 _GridRNNConfig = namedtuple('_GridRNNConfig',
                             ['num_dims', 'dims', 'inputs', 'outputs',
@@ -387,7 +567,6 @@ _GridRNNConfig = namedtuple('_GridRNNConfig',
 
 def _parse_rnn_config(num_dims, ls_input_dims, ls_output_dims, ls_priority_dims,
                       ls_non_recurrent_dims, non_recurrent_fn, tied, num_units):
-
   def check_dim_list(ls):
     if ls is None:
       ls = []
@@ -412,8 +591,8 @@ def _parse_rnn_config(num_dims, ls_input_dims, ls_output_dims, ls_priority_dims,
             is_input=(i in input_dims),
             is_output=(i in output_dims),
             is_priority=(i in priority_dims),
-            non_recurrent_fn=non_recurrent_fn if i in non_recurrent_dims else
-            None))
+            non_recurrent_fn=non_recurrent_fn
+            if i in non_recurrent_dims else None))
   return _GridRNNConfig(
       num_dims=num_dims,
       dims=rnn_dims,
@@ -440,34 +619,40 @@ def _propagate(dim_indices, conf, cells, c_prev, m_prev, new_output, new_state,
   if conf.num_dims > 1:
     ls_cell_inputs = [None] * (conf.num_dims - 1)
     for d in conf.dims[:-1]:
-      ls_cell_inputs[d.idx] = new_output[d.idx] if new_output[
-          d.idx] is not None else m_prev[d.idx]
+      if new_output[d.idx] is None:
+        ls_cell_inputs[d.idx] = m_prev[d.idx]
+      else:
+        ls_cell_inputs[d.idx] = new_output[d.idx]
     cell_inputs = array_ops.concat(ls_cell_inputs, 1)
   else:
     cell_inputs = array_ops.zeros([m_prev[0].get_shape().as_list()[0], 0],
                                   m_prev[0].dtype)
 
-  last_dim_output = new_output[-1] if new_output[-1] is not None else m_prev[-1]
+  last_dim_output = (new_output[-1]
+                     if new_output[-1] is not None else m_prev[-1])
 
   for i in dim_indices:
     d = conf.dims[i]
     if d.non_recurrent_fn:
-      linear_args = array_ops.concat(
-          [cell_inputs, last_dim_output],
-          1) if conf.num_dims > 1 else last_dim_output
+      if conf.num_dims > 1:
+        linear_args = array_ops.concat([cell_inputs, last_dim_output], 1)
+      else:
+        linear_args = last_dim_output
       with vs.variable_scope('non_recurrent' if conf.tied else
                              'non_recurrent/cell_{}'.format(i)):
         if conf.tied and not (first_call and i == dim_indices[0]):
           vs.get_variable_scope().reuse_variables()
-        new_output[d.idx] = layers.legacy_fully_connected(
+
+        new_output[d.idx] = layers.fully_connected(
             linear_args,
-            num_output_units=conf.num_units,
+            num_outputs=conf.num_units,
             activation_fn=d.non_recurrent_fn,
-            weight_init=vs.get_variable_scope().initializer or
-            layers.initializers.xavier_initializer)
+            weights_initializer=(vs.get_variable_scope().initializer or
+                                 layers.initializers.xavier_initializer),
+            weights_regularizer=vs.get_variable_scope().regularizer)
     else:
       if c_prev[i] is not None:
-        cell_state = array_ops.concat([c_prev[i], last_dim_output], 1)
+        cell_state = (c_prev[i], last_dim_output)
       else:
         # for GRU/RNN, the state is just the previous output
         cell_state = last_dim_output
diff --git a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
index 4ce33de24a..33bd30b4e8 100644
--- a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
+++ b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
@@ -25,6 +25,7 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import googletest
 
@@ -110,6 +111,30 @@ class ImageOpsTest(test_util.TensorFlowTestCase):
                              [0, 1, 0, 1],
                              [0, 1, 1, 1]])
 
+  def _test_grad(self, shape_to_test):
+    with self.test_session():
+      test_image_shape = shape_to_test
+      test_image = np.random.randn(*test_image_shape)
+      test_image_tensor = constant_op.constant(
+          test_image, shape=test_image_shape)
+      test_transform = image_ops.angles_to_projective_transforms(
+          np.pi / 2, 4, 4)
+
+      output_shape = test_image_shape
+      output = image_ops.transform(test_image_tensor, test_transform)
+      left_err = gradient_checker.compute_gradient_error(
+          test_image_tensor,
+          test_image_shape,
+          output,
+          output_shape,
+          x_init_value=test_image)
+      self.assertLess(left_err, 1e-10)
+
+  def test_grad(self):
+    self._test_grad([16, 16])
+    self._test_grad([4, 12, 12])
+    self._test_grad([3, 4, 12, 12])
+
 
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/contrib/image/python/ops/image_ops.py b/tensorflow/contrib/image/python/ops/image_ops.py
index 889f361b19..9efdb0d521 100644
--- a/tensorflow/contrib/image/python/ops/image_ops.py
+++ b/tensorflow/contrib/image/python/ops/image_ops.py
@@ -24,6 +24,7 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import resource_loader
 
@@ -214,4 +215,41 @@ def _transform_matrices_to_flat(transform_matrices):
   return transforms[:, :8]
 
 
-ops.NotDifferentiable("ImageProjectiveTransform")
+@ops.RegisterGradient("ImageProjectiveTransform")
+def _image_projective_transform_grad(op, grad):
+  """Computes the gradient for ImageProjectiveTransform."""
+  images = op.inputs[0]
+  transforms = op.inputs[1]
+
+  image_or_images = ops.convert_to_tensor(images, name="images")
+  transform_or_transforms = ops.convert_to_tensor(
+      transforms, name="transforms", dtype=dtypes.float32)
+
+  if image_or_images.dtype.base_dtype not in _IMAGE_DTYPES:
+    raise TypeError("Invalid dtype %s." % image_or_images.dtype)
+  if len(image_or_images.get_shape()) == 2:
+    images = image_or_images[None, :, :, None]
+  elif len(image_or_images.get_shape()) == 3:
+    images = image_or_images[None, :, :, :]
+  elif len(image_or_images.get_shape()) == 4:
+    images = image_or_images
+  else:
+    raise TypeError("Images should have rank between 2 and 4")
+  if len(transform_or_transforms.get_shape()) == 1:
+    transforms = transform_or_transforms[None]
+  elif len(transform_or_transforms.get_shape()) == 2:
+    transforms = transform_or_transforms
+  else:
+    raise TypeError("Transforms should have rank 1 or 2.")
+
+  # Invert transformations
+  transforms = _flat_transforms_to_matrices(transforms=transforms)
+  inverse = linalg_ops.matrix_inverse(transforms)
+  transforms = _transform_matrices_to_flat(inverse)
+  output = gen_image_ops.image_projective_transform(grad, transforms)
+  if len(image_or_images.get_shape()) == 2:
+    return [output[0, :, :, 0], None]
+  elif len(image_or_images.get_shape()) == 3:
+    return [output[0, :, :, :], None]
+  else:
+    return [output, None]
diff --git a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
index 20c49d5b6a..27df3d3d71 100644
--- a/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
+++ b/tensorflow/contrib/ios_examples/camera/CameraExampleViewController.mm
@@ -323,10 +323,10 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
       auto predictions = output->flat<float>();
 
       NSMutableDictionary *newValues = [NSMutableDictionary dictionary];
-      for (int index = 0; index < predictions.size(); index += 1) {
+      for (int index = 0; index < predictions.size(); ++index) {
         const float predictionValue = predictions(index);
         if (predictionValue > 0.05f) {
-          std::string label = labels[index % predictions.size()];
+          std::string label = labels[index];
           NSString *labelObject = [NSString stringWithUTF8String:label.c_str()];
           NSNumber *valueObject = [NSNumber numberWithFloat:predictionValue];
           [newValues setObject:valueObject forKey:labelObject];
diff --git a/tensorflow/contrib/keras/python/keras/initializers_test.py b/tensorflow/contrib/keras/python/keras/initializers_test.py
index c9f50c28ea..0a07eddd89 100644
--- a/tensorflow/contrib/keras/python/keras/initializers_test.py
+++ b/tensorflow/contrib/keras/python/keras/initializers_test.py
@@ -120,7 +120,7 @@ class KerasInitializersTest(test.TestCase):
                    target_mean=0., target_std=None, target_max=2 * scale)
 
   def test_orthogonal(self):
-    tensor_shape = (10, 10)
+    tensor_shape = (20, 20)
     with self.test_session():
       self._runner(keras.initializers.orthogonal(seed=123), tensor_shape,
                    target_mean=0.)
diff --git a/tensorflow/contrib/layers/python/layers/encoders.py b/tensorflow/contrib/layers/python/layers/encoders.py
index 8b6abb4b45..89c9d37bd0 100644
--- a/tensorflow/contrib/layers/python/layers/encoders.py
+++ b/tensorflow/contrib/layers/python/layers/encoders.py
@@ -121,7 +121,7 @@ def embed_sequence(ids,
     `Tensor` of `[batch_size, doc_length, embed_dim]` with embedded sequences.
 
   Raises:
-    ValueError: if `embed_dim` or `vocab_size` are not specified when not
+    ValueError: if `embed_dim` or `vocab_size` are not specified when
       `reuse` is `None` or `False`.
   """
   if not (reuse or (vocab_size and embed_dim)):
diff --git a/tensorflow/contrib/layers/python/layers/initializers.py b/tensorflow/contrib/layers/python/layers/initializers.py
index 811e7fa7aa..271b3c01ff 100644
--- a/tensorflow/contrib/layers/python/layers/initializers.py
+++ b/tensorflow/contrib/layers/python/layers/initializers.py
@@ -34,9 +34,10 @@ def xavier_initializer(uniform=True, seed=None, dtype=dtypes.float32):
   This function implements the weight initialization from:
 
   Xavier Glorot and Yoshua Bengio (2010):
-           Understanding the difficulty of training deep feedforward neural
+           [Understanding the difficulty of training deep feedforward neural
            networks. International conference on artificial intelligence and
-           statistics.
+           statistics.](
+           http://www.jmlr.org/proceedings/papers/v9/glorot10a/glorot10a.pdf)
 
   This initializer is designed to keep the scale of the gradients roughly the
   same in all layers. In uniform distribution this ends up being the range:
diff --git a/tensorflow/contrib/learn/__init__.py b/tensorflow/contrib/learn/__init__.py
index bd56066b1b..05c4024d0b 100644
--- a/tensorflow/contrib/learn/__init__.py
+++ b/tensorflow/contrib/learn/__init__.py
@@ -38,6 +38,7 @@ See the @{$python/contrib.learn} guide.
 @@LinearEstimator
 @@LinearRegressor
 @@LogisticRegressor
+@@StateSavingRnnEstimator
 @@SVM
 @@SKCompat
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
index 0ff5d6e8dc..53c71c6f3e 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
@@ -35,11 +35,11 @@ from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.contrib.learn.python.learn.utils import export
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variable_scope
+from tensorflow.python.summary import summary
 from tensorflow.python.training import sync_replicas_optimizer
 from tensorflow.python.training import training_util
 
@@ -99,10 +99,14 @@ def _linear_learning_rate(num_linear_feature_columns):
   return min(_LINEAR_LEARNING_RATE, default_learning_rate)
 
 
+def _add_hidden_layer_summary(value, tag):
+  summary.scalar("%s/fraction_of_zero_values" % tag, nn.zero_fraction(value))
+  summary.histogram("%s/activation" % tag, value)
+
+
 def _add_layer_summary(value, tag):
-  logging_ops.scalar_summary("%s/fraction_of_zero_values" % tag,
-                             nn.zero_fraction(value))
-  logging_ops.histogram_summary("%s/activation" % tag, value)
+  summary.scalar("%s/fraction_of_zero_values" % tag, nn.zero_fraction(value))
+  summary.histogram("%s/activation" % tag, value)
 
 
 def _get_embedding_variable(column, collection_key, input_layer_scope):
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
index 525f84d511..d86ef8d477 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.contrib import layers
-from tensorflow.contrib.framework.python.framework import deprecated
 from tensorflow.contrib.layers.python.layers import optimizers
 from tensorflow.contrib.learn.python.learn.estimators import constants
 from tensorflow.contrib.learn.python.learn.estimators import estimator
@@ -540,20 +539,6 @@ def _get_dynamic_rnn_model_fn(
   return _dynamic_rnn_model_fn
 
 
-def _get_dropout_and_num_units(num_units,
-                               num_rnn_layers,
-                               input_keep_probability,
-                               output_keep_probability):
-  """Helper function for deprecated factory functions."""
-  dropout_keep_probabilities = None
-  num_units = [num_units for _ in range(num_rnn_layers)]
-  if input_keep_probability or output_keep_probability:
-    dropout_keep_probabilities = ([input_keep_probability]
-                                  + [1.0] * (num_rnn_layers - 1)
-                                  + [output_keep_probability])
-  return dropout_keep_probabilities, num_units
-
-
 class DynamicRnnEstimator(estimator.Estimator):
 
   def __init__(self,
@@ -704,339 +689,3 @@ class DynamicRnnEstimator(estimator.Estimator):
         model_dir=model_dir,
         config=config,
         feature_engineering_fn=feature_engineering_fn)
-
-
-@deprecated('2017-04-01',
-            'multi_value_rnn_regressor is deprecated. '
-            'Please construct a DynamicRnnEstimator directly.')
-def multi_value_rnn_regressor(num_units,
-                              sequence_feature_columns,
-                              context_feature_columns=None,
-                              cell_type='basic_rnn',
-                              num_rnn_layers=1,
-                              optimizer_type='SGD',
-                              learning_rate=0.1,
-                              momentum=None,
-                              gradient_clipping_norm=5.0,
-                              input_keep_probability=None,
-                              output_keep_probability=None,
-                              model_dir=None,
-                              config=None,
-                              feature_engineering_fn=None):
-  """Creates a `DynamicRnnEstimator` for multi-value regression.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a sequence of continuous values.
-
-  Args:
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.LINEAR_REGRESSION,
-      prediction_type=rnn_common.PredictionType.MULTIPLE_VALUE,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
-
-
-@deprecated('2017-04-01',
-            'multi_value_rnn_classifier is deprecated. '
-            'Please construct a DynamicRNNEstimator directly.')
-def multi_value_rnn_classifier(num_classes,
-                               num_units,
-                               sequence_feature_columns,
-                               context_feature_columns=None,
-                               cell_type='basic_rnn',
-                               num_rnn_layers=1,
-                               optimizer_type='SGD',
-                               learning_rate=0.1,
-                               predict_probabilities=False,
-                               momentum=None,
-                               gradient_clipping_norm=5.0,
-                               input_keep_probability=None,
-                               output_keep_probability=None,
-                               model_dir=None,
-                               config=None,
-                               feature_engineering_fn=None):
-  """Creates a `DynamicRNNEstimator` for multi-value classification.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a sequence of classifications, along with
-  (optionally) a probability distribution over classes.
-
-  Args:
-    num_classes: The number of classes for categorization.
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    predict_probabilities: A boolean indicating whether to predict probabilities
-      for all classes.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.CLASSIFICATION,
-      prediction_type=rnn_common.PredictionType.MULTIPLE_VALUE,
-      num_classes=num_classes,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=predict_probabilities,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
-
-
-@deprecated('2017-04-01',
-            'single_value_rnn_regressor is deprecated. '
-            'Please construct a DynamicRnnEstimator directly.')
-def single_value_rnn_regressor(num_units,
-                               sequence_feature_columns,
-                               context_feature_columns=None,
-                               cell_type='basic_rnn',
-                               num_rnn_layers=1,
-                               optimizer_type='SGD',
-                               learning_rate=0.1,
-                               momentum=None,
-                               gradient_clipping_norm=5.0,
-                               input_keep_probability=None,
-                               output_keep_probability=None,
-                               model_dir=None,
-                               config=None,
-                               feature_engineering_fn=None):
-  """Creates a `DynamicRnnEstimator` for single-value regression.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a single continuous values.
-
-  Args:
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.LINEAR_REGRESSION,
-      prediction_type=rnn_common.PredictionType.SINGLE_VALUE,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
-
-
-@deprecated('2017-04-01',
-            'single_value_rnn_classifier is deprecated. '
-            'Please construct a DynamicRnnEstimator directly.')
-def single_value_rnn_classifier(num_classes,
-                                num_units,
-                                sequence_feature_columns,
-                                context_feature_columns=None,
-                                cell_type='basic_rnn',
-                                num_rnn_layers=1,
-                                optimizer_type='SGD',
-                                learning_rate=0.1,
-                                predict_probabilities=False,
-                                momentum=None,
-                                gradient_clipping_norm=5.0,
-                                input_keep_probability=None,
-                                output_keep_probability=None,
-                                model_dir=None,
-                                config=None,
-                                feature_engineering_fn=None):
-  """Creates a `DynamicRnnEstimator` for single-value classification.
-
-  Returns an `Estimator` that given input sequences, processes them in a dynamic
-  recurrent network and outputs a single classifications, along with
-  (optionally) a probability distribution over classes.
-
-  Args:
-    num_classes: The number of classes for categorization.
-    num_units: The size of the RNN cells.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    cell_type: A subclass of `RNNCell` or one of 'basic_rnn,' 'lstm' or 'gru'.
-    num_rnn_layers: Number of RNN layers. Leave this at its default value 1
-      if passing a `cell_type` that is already a MultiRNNCell.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer`, a callback that returns an
-      optimizer, or a string. Strings must be one of 'Adagrad', 'Adam',
-      'Ftrl', 'Momentum', 'RMSProp' or 'SGD. See `layers.optimize_loss` for
-      more details.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    predict_probabilities: A boolean indicating whether to predict probabilities
-      for all classes.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    input_keep_probability: Probability to keep inputs to `cell`. If `None`,
-      no dropout is applied.
-    output_keep_probability: Probability to keep outputs of `cell`. If `None`,
-      no dropout is applied.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-  Returns:
-    An initialized `Estimator`.
-  """
-  dropout_keep_probabilities, num_units = _get_dropout_and_num_units(
-      num_units,
-      num_rnn_layers,
-      input_keep_probability,
-      output_keep_probability)
-  return DynamicRnnEstimator(
-      problem_type=constants.ProblemType.CLASSIFICATION,
-      prediction_type=rnn_common.PredictionType.SINGLE_VALUE,
-      num_classes=num_classes,
-      sequence_feature_columns=sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_units=num_units,
-      cell_type=cell_type,
-      optimizer=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=predict_probabilities,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      feature_engineering_fn=feature_engineering_fn,
-      config=config)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
index 58072500d1..6fc028ab70 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator_test.py
@@ -410,56 +410,6 @@ class DynamicRnnEstimatorTest(test.TestCase):
       state_piece = prediction_dict[dynamic_rnn_estimator._get_state_name(i)]
       self.assertListEqual(list(state_piece.shape), [batch_size, state_size])
 
-  def testLegacyConstructor(self):
-    """Exercise legacy constructor function."""
-    num_units = 16
-    num_layers = 6
-    output_keep_prob = 0.9
-    input_keep_prob = 0.7
-    batch_size = 11
-    learning_rate = 0.1
-    train_sequence_length = 21
-    train_steps = 121
-
-    def get_input_fn(batch_size, sequence_length, state_dict, starting_step=0):
-
-      def input_fn():
-        sequence = constant_op.constant(
-            [[(starting_step + i + j) % 2 for j in range(sequence_length + 1)]
-             for i in range(batch_size)],
-            dtype=dtypes.int32)
-        labels = array_ops.slice(sequence, [0, 0],
-                                 [batch_size, sequence_length])
-        inputs = array_ops.expand_dims(
-            math_ops.to_float(
-                array_ops.slice(sequence, [0, 1], [batch_size, sequence_length
-                                                  ])), 2)
-        input_dict = state_dict
-        input_dict['inputs'] = inputs
-        return input_dict, labels
-
-      return input_fn
-
-    seq_columns = [feature_column.real_valued_column('inputs', dimension=1)]
-    config = run_config.RunConfig(tf_random_seed=21212)
-
-    model_dir = tempfile.mkdtemp()
-    sequence_estimator = dynamic_rnn_estimator.multi_value_rnn_classifier(
-        num_classes=2,
-        num_units=num_units,
-        num_rnn_layers=num_layers,
-        input_keep_probability=input_keep_prob,
-        output_keep_probability=output_keep_prob,
-        sequence_feature_columns=seq_columns,
-        learning_rate=learning_rate,
-        config=config,
-        model_dir=model_dir)
-
-    train_input_fn = get_input_fn(
-        batch_size, train_sequence_length, state_dict={})
-
-    sequence_estimator.fit(input_fn=train_input_fn, steps=train_steps)
-
   def testMultipleRuns(self):
     """Tests resuming training by feeding state."""
     cell_sizes = [4, 7]
diff --git a/tensorflow/contrib/learn/python/learn/estimators/kmeans.py b/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
index a0f501dfba..5be07d271d 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
@@ -27,11 +27,11 @@ from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators.model_fn import ModelFnOps
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops.control_flow_ops import with_dependencies
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.summary import summary
 from tensorflow.python.training import session_run_hook
 from tensorflow.python.training.session_run_hook import SessionRunArgs
 
@@ -118,7 +118,7 @@ def _kmeans_clustering_model_fn(features, labels, mode, params, config):
            'kmeans_plus_plus_num_retries')).training_graph()
   incr_step = state_ops.assign_add(variables.get_global_step(), 1)
   loss = math_ops.reduce_sum(losses, name=KMeansClustering.LOSS_OP_NAME)
-  logging_ops.scalar_summary('loss/raw', loss)
+  summary.scalar('loss/raw', loss)
   training_op = with_dependencies([training_op, incr_step], loss)
   predictions = {
       KMeansClustering.ALL_SCORES: all_scores[0],
@@ -257,4 +257,3 @@ class KMeansClustering(estimator.Estimator):
   def clusters(self):
     """Returns cluster centers."""
     return super(KMeansClustering, self).get_variable_value(self.CLUSTERS)
-
diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
index e09278bc63..02acd70812 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 from tensorflow.contrib import layers
 from tensorflow.contrib import rnn as rnn_cell
-from tensorflow.contrib.framework.python.framework import deprecated
 from tensorflow.contrib.layers.python.layers import feature_column_ops
 from tensorflow.contrib.layers.python.layers import optimizers
 from tensorflow.contrib.learn.python.learn.estimators import constants
@@ -652,180 +651,3 @@ class StateSavingRnnEstimator(estimator.Estimator):
         model_dir=model_dir,
         config=config,
         feature_engineering_fn=feature_engineering_fn)
-
-
-@deprecated('2017-04-01', 'multi_value_rnn_regressor is deprecated. '
-            'Please construct a StateSavingRnnEstimator directly.')
-def multi_value_rnn_regressor(num_units,
-                              num_unroll,
-                              batch_size,
-                              sequence_feature_columns,
-                              context_feature_columns=None,
-                              num_rnn_layers=1,
-                              optimizer_type='SGD',
-                              learning_rate=0.1,
-                              momentum=None,
-                              gradient_clipping_norm=5.0,
-                              dropout_keep_probabilities=None,
-                              model_dir=None,
-                              config=None,
-                              feature_engineering_fn=None,
-                              num_threads=3,
-                              queue_capacity=1000,
-                              seed=None):
-  """Creates a RNN `Estimator` that predicts sequences of values.
-
-  Args:
-    num_units: The size of the RNN cells.
-    num_unroll: Python integer, how many time steps to unroll at a time.
-      The input sequences of length `k` are then split into `k / num_unroll`
-      many segments.
-    batch_size: Python integer, the size of the minibatch.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    num_rnn_layers: Number of RNN layers.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer` or a string. Strings must be
-      one of 'Adagrad', 'Momentum' or 'SGD'.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    dropout_keep_probabilities: a list of dropout keep probabilities or `None`.
-        If given a list, it must have length `num_rnn_layers + 1`.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-    num_threads: The Python integer number of threads enqueuing input examples
-      into a queue. Defaults to 3.
-    queue_capacity: The max capacity of the queue in number of examples.
-      Needs to be at least `batch_size`. Defaults to 1000. When iterating
-      over the same input example multiple times reusing their keys the
-      `queue_capacity` must be smaller than the number of examples.
-    seed: Fixes the random seed used for generating input keys by the SQSS.
-  Returns:
-    An initialized `Estimator`.
-  """
-  num_units = [num_units for _ in range(num_rnn_layers)]
-  return StateSavingRnnEstimator(
-      constants.ProblemType.LINEAR_REGRESSION,
-      num_unroll,
-      batch_size,
-      sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_classes=None,
-      num_units=num_units,
-      cell_type='lstm',
-      optimizer_type=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=False,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      config=config,
-      feature_engineering_fn=feature_engineering_fn,
-      num_threads=num_threads,
-      queue_capacity=queue_capacity,
-      seed=seed)
-
-
-@deprecated('2017-04-01', 'multi_value_rnn_classifier is deprecated. '
-            'Please construct a StateSavingRnnEstimator directly.')
-def multi_value_rnn_classifier(num_classes,
-                               num_units,
-                               num_unroll,
-                               batch_size,
-                               sequence_feature_columns,
-                               context_feature_columns=None,
-                               num_rnn_layers=1,
-                               optimizer_type='SGD',
-                               learning_rate=0.1,
-                               predict_probabilities=False,
-                               momentum=None,
-                               gradient_clipping_norm=5.0,
-                               dropout_keep_probabilities=None,
-                               model_dir=None,
-                               config=None,
-                               feature_engineering_fn=None,
-                               num_threads=3,
-                               queue_capacity=1000,
-                               seed=None):
-  """Creates a RNN `Estimator` that predicts sequences of labels.
-
-  Args:
-    num_classes: The number of classes for categorization.
-    num_units: The size of the RNN cells.
-    num_unroll: Python integer, how many time steps to unroll at a time.
-      The input sequences of length `k` are then split into `k / num_unroll`
-      many segments.
-    batch_size: Python integer, the size of the minibatch.
-    sequence_feature_columns: An iterable containing all the feature columns
-      describing sequence features. All items in the set should be instances
-      of classes derived from `FeatureColumn`.
-    context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
-      steps. All items in the set should be instances of classes derived from
-      `FeatureColumn`.
-    num_rnn_layers: Number of RNN layers.
-    optimizer_type: The type of optimizer to use. Either a subclass of
-      `Optimizer`, an instance of an `Optimizer` or a string. Strings must be
-      one of 'Adagrad', 'Momentum' or 'SGD'.
-    learning_rate: Learning rate. This argument has no effect if `optimizer`
-      is an instance of an `Optimizer`.
-    predict_probabilities: A boolean indicating whether to predict probabilities
-      for all classes.
-    momentum: Momentum value. Only used if `optimizer_type` is 'Momentum'.
-    gradient_clipping_norm: Parameter used for gradient clipping. If `None`,
-      then no clipping is performed.
-    dropout_keep_probabilities: a list of dropout keep probabilities or `None`.
-        If given a list, it must have length `num_rnn_layers + 1`.
-    model_dir: The directory in which to save and restore the model graph,
-      parameters, etc.
-    config: A `RunConfig` instance.
-    feature_engineering_fn: Takes features and labels which are the output of
-      `input_fn` and returns features and labels which will be fed into
-      `model_fn`. Please check `model_fn` for a definition of features and
-      labels.
-    num_threads: The Python integer number of threads enqueuing input examples
-      into a queue. Defaults to 3.
-    queue_capacity: The max capacity of the queue in number of examples.
-      Needs to be at least `batch_size`. Defaults to 1000. When iterating
-      over the same input example multiple times reusing their keys the
-      `queue_capacity` must be smaller than the number of examples.
-    seed: Fixes the random seed used for generating input keys by the SQSS.
-  Returns:
-    An initialized `Estimator`.
-  """
-  num_units = [num_units for _ in range(num_rnn_layers)]
-  return StateSavingRnnEstimator(
-      constants.ProblemType.CLASSIFICATION,
-      num_unroll,
-      batch_size,
-      sequence_feature_columns,
-      context_feature_columns=context_feature_columns,
-      num_classes=num_classes,
-      num_units=num_units,
-      cell_type='lstm',
-      optimizer_type=optimizer_type,
-      learning_rate=learning_rate,
-      predict_probabilities=predict_probabilities,
-      momentum=momentum,
-      gradient_clipping_norm=gradient_clipping_norm,
-      dropout_keep_probabilities=dropout_keep_probabilities,
-      model_dir=model_dir,
-      config=config,
-      feature_engineering_fn=feature_engineering_fn,
-      num_threads=num_threads,
-      queue_capacity=queue_capacity,
-      seed=seed)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
index feea6c5fed..886aab5b4f 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
@@ -455,56 +455,6 @@ class LegacyConstructorTest(test.TestCase):
       return {'inputs': inputs}, labels
     return input_fn
 
-  def testClassifierConstructor(self):
-    batch_size = 16
-    num_classes = 2
-    num_unroll = 32
-    sequence_length = 32
-    num_units = 4
-    learning_rate = 0.5
-    steps = 100
-    input_fn = self._get_input_fn(sequence_length,
-                                  seed=1234)
-    model_dir = tempfile.mkdtemp()
-    seq_columns = [
-        feature_column.real_valued_column(
-            'inputs', dimension=num_units)
-    ]
-    estimator = ssre.multi_value_rnn_classifier(num_classes,
-                                                num_units,
-                                                num_unroll,
-                                                batch_size,
-                                                seq_columns,
-                                                learning_rate=learning_rate,
-                                                model_dir=model_dir,
-                                                queue_capacity=batch_size+2,
-                                                seed=1234)
-    estimator.fit(input_fn=input_fn, steps=steps)
-
-  def testRegressorConstructor(self):
-    batch_size = 16
-    num_unroll = 32
-    sequence_length = 32
-    num_units = 4
-    learning_rate = 0.5
-    steps = 100
-    input_fn = self._get_input_fn(sequence_length,
-                                  seed=4321)
-    model_dir = tempfile.mkdtemp()
-    seq_columns = [
-        feature_column.real_valued_column(
-            'inputs', dimension=num_units)
-    ]
-    estimator = ssre.multi_value_rnn_regressor(num_units,
-                                               num_unroll,
-                                               batch_size,
-                                               seq_columns,
-                                               learning_rate=learning_rate,
-                                               model_dir=model_dir,
-                                               queue_capacity=batch_size+2,
-                                               seed=1234)
-    estimator.fit(input_fn=input_fn, steps=steps)
-
 
 # TODO(jtbates): move all tests below to a benchmark test.
 class StateSavingRNNEstimatorLearningTest(test.TestCase):
diff --git a/tensorflow/contrib/rnn/__init__.py b/tensorflow/contrib/rnn/__init__.py
index a744878124..d2f9cde4f6 100644
--- a/tensorflow/contrib/rnn/__init__.py
+++ b/tensorflow/contrib/rnn/__init__.py
@@ -42,6 +42,8 @@ See @{$python/contrib.rnn} guide.
 @@GridLSTMCell
 @@BidirectionalGridLSTMCell
 @@NASCell
+@@UGRNNCell
+@@IntersectionRNNCell
 @@PhasedLSTMCell
 @@HighwayWrapper
 
diff --git a/tensorflow/contrib/signal/BUILD b/tensorflow/contrib/signal/BUILD
new file mode 100644
index 0000000000..5b65a6ae05
--- /dev/null
+++ b/tensorflow/contrib/signal/BUILD
@@ -0,0 +1,46 @@
+package(default_visibility = ["//tensorflow:__subpackages__"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+load("//tensorflow:tensorflow.bzl", "cuda_py_tests")
+
+py_library(
+    name = "signal_py",
+    srcs = ["__init__.py"] + glob(["python/ops/*.py"]),
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:math_ops",
+    ],
+)
+
+cuda_py_tests(
+    name = "shape_ops_test",
+    size = "small",
+    srcs = ["python/kernel_tests/shape_ops_test.py"],
+    additional_deps = [
+        ":signal_py",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/signal/__init__.py b/tensorflow/contrib/signal/__init__.py
new file mode 100644
index 0000000000..9f906dd28e
--- /dev/null
+++ b/tensorflow/contrib/signal/__init__.py
@@ -0,0 +1,27 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""##Signal ops.
+
+@@frames
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.signal.python.ops.shape_ops import frames
+
+from tensorflow.python.util.all_util import remove_undocumented
+remove_undocumented(__name__)
diff --git a/tensorflow/contrib/signal/python/__init__.py b/tensorflow/contrib/signal/python/__init__.py
new file mode 100644
index 0000000000..e672d1146c
--- /dev/null
+++ b/tensorflow/contrib/signal/python/__init__.py
@@ -0,0 +1,19 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Signal ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
diff --git a/tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py b/tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py
new file mode 100644
index 0000000000..e07942875f
--- /dev/null
+++ b/tensorflow/contrib/signal/python/kernel_tests/shape_ops_test.py
@@ -0,0 +1,68 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for shape_ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.signal.python.ops import shape_ops
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import test
+
+
+class FramesTest(test.TestCase):
+
+  def test_mapping_of_indices_without_padding(self):
+    with self.test_session():
+      tensor = constant_op.constant(np.arange(9152), dtypes.int32)
+      tensor = array_ops.expand_dims(tensor, 0)
+
+      result = shape_ops.frames(tensor, 512, 180)
+      result = result.eval()
+
+      expected = np.tile(np.arange(512), (49, 1))
+      expected += np.tile(np.arange(49) * 180, (512, 1)).T
+
+      expected = np.expand_dims(expected, axis=0)
+      expected = np.array(expected, dtype=np.int32)
+
+      self.assertAllEqual(expected, result)
+
+  def test_mapping_of_indices_with_padding(self):
+    with self.test_session():
+      tensor = constant_op.constant(np.arange(10000), dtypes.int32)
+      tensor = array_ops.expand_dims(tensor, 0)
+
+      result = shape_ops.frames(tensor, 512, 192)
+      result = result.eval()
+
+      expected = np.tile(np.arange(512), (51, 1))
+      expected += np.tile(np.arange(51) * 192, (512, 1)).T
+
+      expected[expected >= 10000] = 0
+
+      expected = np.expand_dims(expected, axis=0)
+      expected = np.array(expected, dtype=np.int32)
+
+      self.assertAllEqual(expected, result)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/signal/python/ops/__init__.py b/tensorflow/contrib/signal/python/ops/__init__.py
new file mode 100644
index 0000000000..e672d1146c
--- /dev/null
+++ b/tensorflow/contrib/signal/python/ops/__init__.py
@@ -0,0 +1,19 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Signal ops."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
diff --git a/tensorflow/contrib/signal/python/ops/shape_ops.py b/tensorflow/contrib/signal/python/ops/shape_ops.py
new file mode 100644
index 0000000000..4914f19be7
--- /dev/null
+++ b/tensorflow/contrib/signal/python/ops/shape_ops.py
@@ -0,0 +1,87 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""General shape ops for frames."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+
+
+def frames(signal, frame_length, frame_step, name=None):
+  """Frame a signal into overlapping frames.
+
+  May be used in front of spectral functions.
+
+  For example:
+
+  ```python
+  pcm = tf.placeholder(tf.float32, [None, 9152])
+  frames = tf.contrib.signal.frames(pcm, 512, 180)
+  magspec = tf.abs(tf.spectral.rfft(frames, [512]))
+  image = tf.expand_dims(magspec, 3)
+  ```
+
+  Args:
+    signal: A `Tensor` of shape `[batch_size, signal_length]`.
+    frame_length: An `int32` or `int64` `Tensor`. The length of each frame.
+    frame_step: An `int32` or `int64` `Tensor`. The step between frames.
+    name: A name for the operation (optional).
+
+  Returns:
+    A `Tensor` of frames with shape `[batch_size, num_frames, frame_length]`.
+
+  Raises:
+    ValueError: if signal does not have rank 2.
+  """
+  with ops.name_scope(name, "frames", [signal, frame_length, frame_step]):
+    signal = ops.convert_to_tensor(signal, name="signal")
+    frame_length = ops.convert_to_tensor(frame_length, name="frame_length")
+    frame_step = ops.convert_to_tensor(frame_step, name="frame_step")
+
+    signal_rank = signal.shape.ndims
+
+    if signal_rank != 2:
+      raise ValueError("expected signal to have rank 2 but was " + signal_rank)
+
+    signal_length = array_ops.shape(signal)[1]
+
+    num_frames = math_ops.ceil((signal_length - frame_length) / frame_step)
+    num_frames = 1 + math_ops.cast(num_frames, dtypes.int32)
+
+    pad_length = (num_frames - 1) * frame_step + frame_length
+    pad_signal = array_ops.pad(signal, [[0, 0], [0,
+                                                 pad_length - signal_length]])
+
+    indices_frame = array_ops.expand_dims(math_ops.range(frame_length), 0)
+    indices_frames = array_ops.tile(indices_frame, [num_frames, 1])
+
+    indices_step = array_ops.expand_dims(
+        math_ops.range(num_frames) * frame_step, 1)
+    indices_steps = array_ops.tile(indices_step, [1, frame_length])
+
+    indices = indices_frames + indices_steps
+
+    # TODO(androbin): remove `transpose` when `gather` gets `axis` support
+    pad_signal = array_ops.transpose(pad_signal)
+    signal_frames = array_ops.gather(pad_signal, indices)
+    signal_frames = array_ops.transpose(signal_frames, perm=[2, 0, 1])
+
+    return signal_frames
diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md
index c8842dd57b..61148c0b26 100644
--- a/tensorflow/contrib/slim/README.md
+++ b/tensorflow/contrib/slim/README.md
@@ -447,7 +447,7 @@ vgg = tf.contrib.slim.nets.vgg
 images, labels = ...
 
 # Create the model.
-predictions = vgg.vgg_16(images)
+predictions, _ = vgg.vgg_16(images)
 
 # Define the loss functions and get the total loss.
 loss = slim.losses.softmax_cross_entropy(predictions, labels)
diff --git a/tensorflow/contrib/slim/python/slim/data/README.md b/tensorflow/contrib/slim/python/slim/data/README.md
index 858c694990..fe15a10b99 100644
--- a/tensorflow/contrib/slim/python/slim/data/README.md
+++ b/tensorflow/contrib/slim/python/slim/data/README.md
@@ -71,27 +71,27 @@ for item in data_decoder.list_items():
   print(item)
 ```
 
-## Example: TFExampleDataDecoder
+## Example: TFExampleDecoder
 
 The
-[tfexample_data_decoder.py](https://www.tensorflow.org/code/tensorflow/contrib/slim/python/slim/data/tfexample_data_decoder.py)
+[tfexample_decoder.py](https://www.tensorflow.org/code/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py)
 is a data decoder which decodes serialized `TFExample` protocol buffers. A
 `TFExample` protocol buffer is a map from keys (strings) to either a
 `tf.FixedLenFeature` or `tf.VarLenFeature`. Consequently, to decode a
 `TFExample`, one must provide a mapping from one or more `TFExample` fields
-to each of the `items` that the `tfexample_data_decoder` can provide. For
+to each of the `items` that the `tfexample_decoder` can provide. For
 example, a dataset of `TFExamples` might store images in various formats and
 each `TFExample` might contain an `encoding` key and a `format` key which can
 be used to decode the image using the appropriate decoder (jpg, png, etc).
 
-To make this possible, the `tfexample_data_decoder` is constructed by specifying
+To make this possible, the `tfexample_decoder` is constructed by specifying
 the a map of `TFExample` keys to either `tf.FixedLenFeature` or
 `tf.VarLenFeature` as well as a set of `ItemHandlers`. An `ItemHandler`
 provides a mapping from `TFExample` keys to the item being provided. Because a
-`tfexample_data_decoder` might return multiple `items`, one often constructs a
-`tfexample_data_decoder` using multiple `ItemHandlers`.
+`tfexample_decoder` might return multiple `items`, one often constructs a
+`tfexample_decoder` using multiple `ItemHandlers`.
 
-`tfexample_data_decoder` provides some predefined `ItemHandlers` which take care
+`tfexample_decoder` provides some predefined `ItemHandlers` which take care
 of the common cases of mapping `TFExamples` to images, `Tensors` and
 `SparseTensors`. For example, the following specification might be
 used to decode a dataset of images:
diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
index f260ede348..bd811e3726 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
@@ -64,6 +64,8 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import variable_scope
 
+resnet_arg_scope = resnet_utils.resnet_arg_scope
+
 
 @add_arg_scope
 def bottleneck(inputs,
diff --git a/tensorflow/contrib/testing/python/framework/fake_summary_writer.py b/tensorflow/contrib/testing/python/framework/fake_summary_writer.py
index 02f2d7fae8..f2065c6662 100644
--- a/tensorflow/contrib/testing/python/framework/fake_summary_writer.py
+++ b/tensorflow/contrib/testing/python/framework/fake_summary_writer.py
@@ -127,3 +127,6 @@ class FakeSummaryWriter(object):
 
   def reopen(self):
     pass
+
+  def close(self):
+    pass
diff --git a/tensorflow/contrib/verbs/README.md b/tensorflow/contrib/verbs/README.md
index 37a543dda8..da5f2b0223 100644
--- a/tensorflow/contrib/verbs/README.md
+++ b/tensorflow/contrib/verbs/README.md
@@ -1,54 +1,54 @@
-## How to compile and use Rdma-enabled tensorflow
-1. Follow the regular TF compilation instructions. During configure step, if you want ibverbs based Rdma support, answer yes to this question:
+## How to compile and use RDMA-enabled TensorFlow
+1. Follow the regular TF compilation instructions. During configure step, if you want ibverbs based RDMA support, answer yes to this question:
 
     ```Do you wish to build TensorFlow with VERBS-RDMA support [y/N]```
 
-2. To turn on Rdma connection, add the protocol "grpc+verbs" in server definition:
+2. To turn on RDMA connection, add the protocol "grpc+verbs" in server definition:
 
     ```server = tf.train.Server(cluster, job_name="local", task_index=0, protocol='grpc+verbs') # default protocol is 'grpc'```
 
 ## Overview
-The design is based on Tensorflow r1.0. An Rdma path is added between servers for tensor transfer (weights, gradients, etc). The existing GRPC path remains and is responsible for "administrative" tasks, such as setting up the Rdma path, exchanging computation graphs, etc.
+The design is based on TensorFlow r1.0. An RDMA path is added between servers for tensor transfer (weights, gradients, etc). The existing GRPC path remains and is responsible for "administrative" tasks, such as setting up the RDMA path, exchanging computation graphs, etc.
 
-During the server setup, an Rdma manager is created to manage low-level Rdma components such as Rdma channel and Rdma adapter, an Rdma rendezvous manager is created to oversee send/recv operations between servers. Following the distributed Tensorflow design philosophy, the send operation is passive, i.e. merely placing a tensor in the local out-going table. It is the receive operation that actually initiates the tensor transfer.
+During the server setup, an RDMA manager is created to manage low-level RDMA components such as RDMA channel and RDMA adapter, an RDMA rendezvous manager is created to oversee send/recv operations between servers. Following the distributed TensorFlow design philosophy, the send operation is passive, i.e. merely placing a tensor in the local out-going table. It is the receive operation that actually initiates the tensor transfer.
 
-Tensorflow dynamically allocates memory for tensors that are to be sent or received. This causes difficulty for Rdma operations where pinned memory is required. Two remedies are possible, either the memory is pinned, transfer, then unpinned for each and every tensor to be transferred, or a buffer is pre-allocated and pinned for each tensor. The former incurs significant operation overhead since pinning and unpinning memory for each dynamically generated tensor is slow. The latter incurs large memory overhead and extra copying from the tensor to its pinned buffer, but may still be faster than the former. The second approach is adopted in this design. Each Rdma channel, representing a Rdma connection to a peer, contains a table of pinned buffers for all the seen tensors that requires transfer. It is assumed that the tensor size rarely changes across different steps. So only one buffer is created for the same tensor across all the steps. In the rare case when the tensor size does increases, the old buffer is discarded and new buffer of larger size is created and pinned.
+TensorFlow dynamically allocates memory for tensors that are to be sent or received. This causes difficulty for RDMA operations where pinned memory is required. Two remedies are possible, either the memory is pinned, transfer, then unpinned for each and every tensor to be transferred, or a buffer is pre-allocated and pinned for each tensor. The former incurs significant operation overhead since pinning and unpinning memory for each dynamically generated tensor is slow. The latter incurs large memory overhead and extra copying from the tensor to its pinned buffer, but may still be faster than the former. The second approach is adopted in this design. Each RDMA channel, representing a RDMA connection to a peer, contains a table of pinned buffers for all the seen tensors that requires transfer. It is assumed that the tensor size rarely changes across different steps. So only one buffer is created for the same tensor across all the steps. In the rare case when the tensor size does increases, the old buffer is discarded and new buffer of larger size is created and pinned.
 
-When a tensor is prepared fro transfer, it is first converted to TensorProto, then the proto is serialized to byte array and copied to the pinned buffer. The content of the buffer is transferred to the remote node via Rdma write. On the remote side, the process is reversed. This is illustrated in the diagram below. The conversion of TensorProto is introduced to simplify transfer of string-tensors. Also since the TensorProto lives in host memory, even if the origin tensor lives in the device, the pinned buffers are all allocated in the host memory.
-![Tensorflow Rdma path](./design_diagram.png)
+When a tensor is prepared for transfer, it is first converted to TensorProto, then the proto is serialized to byte array and copied to the pinned buffer. The content of the buffer is transferred to the remote node via RDMA write. On the remote side, the process is reversed. This is illustrated in the diagram below. The conversion of TensorProto is introduced to simplify transfer of string-tensors. Also since the TensorProto lives in host memory, even if the origin tensor lives in the device, the pinned buffers are all allocated in the host memory.
+![TensorFlow RDMA path](./design_diagram.png)
 
 The following improvements can be made in the future. First, conversion to TensorProto and serialization can be avoided for numeric (float/int) tensors since their internal buffer can be access directly as byte array. Second, the pinned buffer may be allocated on device if the tensor is located in the device. This avoids extra device-to-host copy at the expense of extra device memory consumption.
 ## Design details
 
-### Rdma components
+### RDMA components
 
-* **Rdma adapter:** The base for Rdma communications. It may contain multiple channels and buffers.  It is responsible for handling various incoming Rdma messages.
-* **Rdma channel:** Responsible for Rdma connection to a particular node. It manages multiple buffers. A channel has a callback table which stores all the callbacks for the requested tensors.
-* **Rdma buffer:** Responsible for sending or receiving data. It has a fixed size memory to store the data. It has a queue to store the pending jobs. There are three types of buffers, message buffer, ACK buffer and tensor buffer. A channel has two message buffers, two ack buffers and many tensor buffers.
-* **Rdma manager:** Manages the adapter and channels, including channel creation, channel setup via GRPC service, channel lookup, etc.
-* **Rdma rendezvous manager:** manages multiple rdma rendezvous. 
-* **Rdma rendezvous:** a derived class of BaseRemoteRendezvous. This class is the back end for "send" and "recv" ops. When the sendrecv_op wants to send or receive a tensor, it calls the rendezvous' "send" and "recv" functions respectively. Rendezvous are identified by "step_id", a random number, so that tensors for different iterations don't get mixed up.
+* **RDMA adapter:** The base for RDMA communications. It may contain multiple channels and buffers.  It is responsible for handling various incoming RDMA messages.
+* **RDMA channel:** Responsible for RDMA connection to a particular node. It manages multiple buffers. A channel has a callback table which stores all the callbacks for the requested tensors.
+* **RDMA buffer:** Responsible for sending or receiving data. It has a fixed size memory to store the data. It has a queue to store the pending jobs. There are three types of buffers, message buffer, ACK buffer and tensor buffer. A channel has two message buffers, two ack buffers and many tensor buffers.
+* **RDMA manager:** Manages the adapter and channels, including channel creation, channel setup via GRPC service, channel lookup, etc.
+* **RDMA rendezvous manager:** manages multiple rdma rendezvous. 
+* **RDMA rendezvous:** a derived class of BaseRemoteRendezvous. This class is the back end for "send" and "recv" ops. When the sendrecv_op wants to send or receive a tensor, it calls the rendezvous' "send" and "recv" functions respectively. Rendezvous are identified by "step_id", a random number, so that tensors for different iterations don't get mixed up.
 
 ### The SEND operation
 
-In tensorflow, when rendezvous sends a tensor, it merely puts a tensor in a local table in the corresponding rendezvous. If the tensor has been requested, a callback exists in the table. "send" will activate the callback, which tries to send the tensor across the node.
+In TensorFlow, when rendezvous sends a tensor, it merely puts a tensor in a local table in the corresponding rendezvous. If the tensor has been requested, a callback exists in the table. "send" will activate the callback, which tries to send the tensor across the node.
 
 
 ### The RECV operation
 
-When a tensor is requested, rendezvous' recv function is called. The function first places a callback in the channel's callback table, which will be activated once the tensor is sent from the source. In the next step, a message is sent to notify the source of the requested tensor. Once the source receives the message, it will check locally for the tensor, if not found, a callback is placed in the table, otherwise, the tensor id will be placed at corresponding Rdma buffer's job queue for future transmission. When a tensor is scheduled to be transmitted, the Rdma buffer needs to have the memory allocated and initialized (registered with the remote buffer info). If the memory is not ready, the transmission is deferred, a message is sent to the destination to establish the memory first. The other case a transimssion can be deferred is when the buffer is still being used by an on-going transmission.
+When a tensor is requested, rendezvous' recv function is called. The function first places a callback in the channel's callback table, which will be activated once the tensor is sent from the source. In the next step, a message is sent to notify the source of the requested tensor. Once the source receives the message, it will check locally for the tensor, if not found, a callback is placed in the table, otherwise, the tensor id will be placed at corresponding RDMA buffer's job queue for future transmission. When a tensor is scheduled to be transmitted, the RDMA buffer needs to have the memory allocated and initialized (registered with the remote buffer info). If the memory is not ready, the transmission is deferred, a message is sent to the destination to establish the memory first. The other case a transmission can be deferred is when the buffer is still being used by an on-going transmission.
 
-### Three types of Rdma buffers
+### Three types of RDMA buffers
 
 * **Message buffer:** responsible for sending message only.
 * **Ack buffer:** once a message is sent, the recipient needs to send an ack via the ack buffer to free up the message buffer. An ack buffer is exclusively for its coupled message buffer.
 * **Tensor buffer:** responsible for sending tensors. The recipient needs to send back a message to free up the sending buffer.
 
-### Rdma packet format
+### RDMA packet format
 
 |type|name_size|name|step_id|buffer_size|remote_addr|rkey|is_dead|data_type|tensor_shape|tensor_bytes|tensor_buffer|
 
-### Six types of Rdma messages
+### Six types of RDMA messages
 * RDMA_MESSAGE_ACK
 * RDMA_MESSAGE_BUFFER_IDLE
 * RDMA_MESSAGE_BUFFER_REQUEST
@@ -56,7 +56,7 @@ When a tensor is requested, rendezvous' recv function is called. The function fi
 * RDMA_MESSAGE_TENSOR_REQUEST
 * RDMA_MESSAGE_TENSOR_WRITE
 
-### Actions upon receiving Rdma messages
+### Actions upon receiving RDMA messages
 * RDMA_MESSAGE_ACK
   * sender: mark local ack buffer idle.
   * receiver: mark remote message buffer idle, send next item.
diff --git a/tensorflow/contrib/verbs/grpc_verbs_service.cc b/tensorflow/contrib/verbs/grpc_verbs_service.cc
index e73b2700bd..f2af6b79fb 100644
--- a/tensorflow/contrib/verbs/grpc_verbs_service.cc
+++ b/tensorflow/contrib/verbs/grpc_verbs_service.cc
@@ -117,6 +117,8 @@ Status GrpcVerbsService::GetRemoteAddressSync(
   ra.lid = request->channel().lid();
   ra.qpn = request->channel().qpn();
   ra.psn = request->channel().psn();
+  ra.snp = request->channel().snp();
+  ra.iid = request->channel().iid();
   rc->SetRemoteAddress(ra, false);
   rc->Connect();
   int i = 0;
@@ -146,6 +148,8 @@ Status GrpcVerbsService::GetRemoteAddressSync(
   channel_info->set_lid(rc->self().lid);
   channel_info->set_qpn(rc->self().qpn);
   channel_info->set_psn(rc->self().psn);
+  channel_info->set_snp(rc->self().snp);
+  channel_info->set_iid(rc->self().iid);
   for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
     MemoryRegion* mr = response->add_mr();
     mr->set_remote_addr(reinterpret_cast<uint64>(mb[i]->buffer()));
diff --git a/tensorflow/contrib/verbs/rdma.cc b/tensorflow/contrib/verbs/rdma.cc
index 53d840f5d1..05df05de35 100644
--- a/tensorflow/contrib/verbs/rdma.cc
+++ b/tensorflow/contrib/verbs/rdma.cc
@@ -271,6 +271,11 @@ RdmaChannel::RdmaChannel(const RdmaAdapter* adapter, const string local_name,
     self_.lid = attr.lid;
     self_.qpn = qp_->qp_num;
     self_.psn = static_cast<uint32_t>(random::New64()) & 0xffffff;
+    union ibv_gid gid;
+    CHECK(!ibv_query_gid(adapter_->context_, (uint8_t)1, 0, &gid))
+        << "Query gid";
+    self_.snp = gid.global.subnet_prefix;
+    self_.iid = gid.global.interface_id;
   }
 
   // create message and ack buffers, then initialize the tables.
@@ -320,11 +325,15 @@ void RdmaChannel::SetRemoteAddress(const RdmaAddress& ra, bool override) {
     remote_.lid = ra.lid;
     remote_.qpn = ra.qpn;
     remote_.psn = ra.psn;
+    remote_.snp = ra.snp;
+    remote_.iid = ra.iid;
     remote_set_ = true;
   } else {
     CHECK(remote_.lid == ra.lid);
     CHECK(remote_.qpn == ra.qpn);
     CHECK(remote_.psn == ra.psn);
+    CHECK(remote_.snp == ra.snp);
+    CHECK(remote_.iid == ra.iid);
   }
 }
 
@@ -472,7 +481,11 @@ void RdmaChannel::Connect(const RdmaAddress& remoteAddr) {
     attr.rq_psn = remoteAddr.psn;
     attr.max_dest_rd_atomic = 1;
     attr.min_rnr_timer = 12;
-    attr.ah_attr.is_global = 0;
+    attr.ah_attr.is_global = 1;
+    attr.ah_attr.grh.dgid.global.subnet_prefix = remoteAddr.snp;
+    attr.ah_attr.grh.dgid.global.interface_id = remoteAddr.iid;
+    attr.ah_attr.grh.flow_label = 0;
+    attr.ah_attr.grh.hop_limit = 255;
     attr.ah_attr.dlid = remoteAddr.lid;
     attr.ah_attr.sl = 0;
     attr.ah_attr.src_path_bits = 0;
diff --git a/tensorflow/contrib/verbs/rdma.h b/tensorflow/contrib/verbs/rdma.h
index ae2aa63e3f..10cbbe58d9 100644
--- a/tensorflow/contrib/verbs/rdma.h
+++ b/tensorflow/contrib/verbs/rdma.h
@@ -40,6 +40,8 @@ struct RdmaAddress {
   uint32_t lid;
   uint32_t qpn;
   uint32_t psn;
+  uint64_t snp;
+  uint64_t iid;
 };
 // structure to save information for remote memory regions.
 struct RemoteMR {
diff --git a/tensorflow/contrib/verbs/rdma_mgr.cc b/tensorflow/contrib/verbs/rdma_mgr.cc
index e28b80c6f6..09b878843f 100644
--- a/tensorflow/contrib/verbs/rdma_mgr.cc
+++ b/tensorflow/contrib/verbs/rdma_mgr.cc
@@ -69,6 +69,8 @@ void RdmaMgr::SetupChannels() {
     channel_info->set_lid(rc->self_.lid);
     channel_info->set_qpn(rc->self_.qpn);
     channel_info->set_psn(rc->self_.psn);
+    channel_info->set_snp(rc->self_.snp);
+    channel_info->set_iid(rc->self_.iid);
     for (int i = 0; i < RdmaChannel::kNumMessageBuffers; i++) {
       MemoryRegion* mr = req.add_mr();
       mr->set_remote_addr(
@@ -85,6 +87,8 @@ void RdmaMgr::SetupChannels() {
       ra.lid = resp.channel().lid();
       ra.qpn = resp.channel().qpn();
       ra.psn = resp.channel().psn();
+      ra.snp = resp.channel().snp();
+      ra.iid = resp.channel().iid();
       rc->SetRemoteAddress(ra, false);
       rc->Connect();
       int i = 0;
diff --git a/tensorflow/contrib/verbs/verbs_service.proto b/tensorflow/contrib/verbs/verbs_service.proto
index b985febfb8..0df1fed4b9 100644
--- a/tensorflow/contrib/verbs/verbs_service.proto
+++ b/tensorflow/contrib/verbs/verbs_service.proto
@@ -30,6 +30,8 @@ message Channel {
   int32 lid = 1;
   int32 qpn = 2;
   int32 psn = 3;
+  uint64 snp = 4;
+  uint64 iid = 5;
 }
 
 message MemoryRegion {
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_call.h b/tensorflow/core/distributed_runtime/rpc/grpc_call.h
index 35f849c7a5..3b45e7e8a7 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_call.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_call.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_RPC_GRPC_CALL_H_
 #define THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_RPC_GRPC_CALL_H_
 
+#include "tensorflow/core/lib/core/refcount.h"
 #include "tensorflow/core/platform/macros.h"
 
 #include "grpc++/grpc++.h"
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
index c6260afa20..ba206890ce 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.h"
 #include "grpc++/support/byte_buffer.h"
 #include "grpc++/support/slice.h"
+#include "tensorflow/core/common_runtime/dma_helper.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_reference.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
@@ -27,10 +28,9 @@ namespace tensorflow {
 namespace grpc {
 
 static void do_nothing(void* raw) {}
-static void unref_tensorreference(void* raw) {
-  TensorReference* ref = static_cast<TensorReference*>(raw);
-  ref->Unref();
-  delete ref;
+static void unref_tensorbuffer(void* raw) {
+  TensorBuffer* buf = static_cast<TensorBuffer*>(raw);
+  buf->Unref();
 }
 
 void EncodeRecvTensorResponseToByteBuffer(const RecvTensorResponse& proto,
@@ -219,8 +219,8 @@ void EncodeTensorToByteBuffer(bool is_dead, const Tensor& val,
 
     if (tensor_data_is_large) {
       // Encode the actual tensor data by pointing to the backing store,
-      // and add a special zero-length slice that is really a TensorReference
-      // object that we will destroy when we are done.
+      // and add a special zero-length slice that is really a TensorBuffer
+      // reference that we will unref when we are done.
       //
       // TODO(jeff): Note that this approach relies on the fact that
       // slices are destroyed in the order in which they are added to
@@ -241,17 +241,15 @@ void EncodeTensorToByteBuffer(bool is_dead, const Tensor& val,
 
       // (E) Encode tensor data, but by sharing backing store
 
-      // TODO(jeff,sanjay): It'd be nice to avoid this TensorReference
-      // allocation, and instead get our hands on the underlying
-      // TensorBuffer object and just directly ref it here and unref
-      // it in unref_tensorreference.
-      TensorReference* ref = new TensorReference(val);
+      const TensorBuffer* buf = DMAHelper::buffer(&val);
+      buf->Ref();
       gpr_slice s1 = gpr_slice_new(
           const_cast<void*>(static_cast<const void*>(tdata.data())),
           tdata.size(), do_nothing);
       slices[1] = ::grpc::Slice(s1, ::grpc::Slice::STEAL_REF);
 
-      gpr_slice s2 = gpr_slice_new(ref, 0, unref_tensorreference);
+      gpr_slice s2 =
+          gpr_slice_new(const_cast<TensorBuffer*>(buf), 0, unref_tensorbuffer);
       slices[2] = ::grpc::Slice(s2, ::grpc::Slice::STEAL_REF);
       num_slices += 2;
     }
diff --git a/tensorflow/core/kernels/cwise_op_atan2.cc b/tensorflow/core/kernels/cwise_op_atan2.cc
new file mode 100644
index 0000000000..68f67c444e
--- /dev/null
+++ b/tensorflow/core/kernels/cwise_op_atan2.cc
@@ -0,0 +1,23 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/kernels/cwise_ops_common.h"
+
+namespace tensorflow {
+REGISTER2(BinaryOp, CPU, "Atan2", functor::atan2, float, double);
+#if GOOGLE_CUDA
+REGISTER2(BinaryOp, GPU, "Atan2", functor::atan2, float, double);
+#endif
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc b/tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc
new file mode 100644
index 0000000000..137e14ef84
--- /dev/null
+++ b/tensorflow/core/kernels/cwise_op_gpu_atan2.cu.cc
@@ -0,0 +1,26 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#if GOOGLE_CUDA
+
+#include "tensorflow/core/kernels/cwise_ops_gpu_common.cu.h"
+
+namespace tensorflow {
+namespace functor {
+DEFINE_BINARY2(atan2, float, double);
+}  // namespace functor
+}  // namespace tensorflow
+
+#endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/cwise_ops.h b/tensorflow/core/kernels/cwise_ops.h
index fb4c649a82..423307fd4c 100644
--- a/tensorflow/core/kernels/cwise_ops.h
+++ b/tensorflow/core/kernels/cwise_ops.h
@@ -658,6 +658,22 @@ struct zeta : base<T, Eigen::internal::scalar_zeta_op<T>> {};
 template <typename T>
 struct polygamma : base<T, Eigen::internal::scalar_polygamma_op<T>> {};
 
+template <typename Scalar>
+struct scalar_atan2_op {
+  EIGEN_EMPTY_STRUCT_CTOR(scalar_atan2_op)
+  EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar
+  operator()(const Scalar& y, const Scalar& x) const {
+#if GOOGLE_CUDA
+    return ::atan2(y, x);
+#else
+    return std::atan2(y, x);
+#endif
+  }
+};
+
+template <typename T>
+struct atan2 : base<T, scalar_atan2_op<T>> {};
+
 template <typename T>
 struct squared_difference
     : base<T, Eigen::internal::scalar_compose_op<
diff --git a/tensorflow/core/kernels/linalg_ops_common.cc b/tensorflow/core/kernels/linalg_ops_common.cc
index a38ddf76eb..155d9d1084 100644
--- a/tensorflow/core/kernels/linalg_ops_common.cc
+++ b/tensorflow/core/kernels/linalg_ops_common.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/linalg_ops_common.h"
 
+#include <utility>
+
 #include "third_party/eigen3/Eigen/Core"
 #include "tensorflow/core/framework/device_base.h"
 #include "tensorflow/core/framework/kernel_def_builder.h"
@@ -153,10 +155,9 @@ void LinearAlgebraOp<Scalar>::AnalyzeInputs(OpKernelContext* context,
     const int col_dimension = input_rank - 1;
     const int64 num_rows = in.dim_size(row_dimension);
     const int64 num_cols = in.dim_size(col_dimension);
-    // TODO(rmlarsen): Use emplace_back when it is added to InlinedVector. Same
-    // in several places below.
-    input_matrix_shapes->push_back(TensorShape({num_rows, num_cols}));
-    inputs->push_back(&in);
+    input_matrix_shapes->emplace_back(
+        std::initializer_list<int64>({num_rows, num_cols}));
+    inputs->emplace_back(&in);
   }
   // Have the derived class validate that the inputs are as expected.
   ValidateInputMatrixShapes(context, *input_matrix_shapes);
@@ -198,9 +199,7 @@ void LinearAlgebraOp<Scalar>::PrepareOutputs(
       // concatenated with the output_matrix_shape (if the output is not
       // scalar).
       output_tensor_shape = batch_shape;
-      for (int dim = 0; dim < output_matrix_shape.dims(); ++dim) {
-        output_tensor_shape.AddDim(output_matrix_shape.dim_size(dim));
-      }
+      output_tensor_shape.AppendShape(output_matrix_shape);
     }
     Tensor* out = nullptr;
     // See if there is an input buffer we can reuse for this output.
@@ -219,7 +218,7 @@ void LinearAlgebraOp<Scalar>::PrepareOutputs(
       OP_REQUIRES_OK(context, context->allocate_output(
                                   output_idx, output_tensor_shape, &out));
     }
-    outputs->push_back(out);
+    outputs->emplace_back(out);
   }
 }
 
@@ -232,11 +231,10 @@ void LinearAlgebraOp<Scalar>::ComputeTensorSlice(
   for (size_t i = 0; i < inputs.size(); ++i) {
     // TODO(kalakris): Handle alignment if possible. Eigen::Map is
     // unaligned by default.
-    matrix_inputs.push_back(
-        ConstMatrixMap(inputs[i]->flat<Scalar>().data() +
-                           matrix_index * input_matrix_shapes[i].num_elements(),
-                       input_matrix_shapes[i].dim_size(0),
-                       input_matrix_shapes[i].dim_size(1)));
+    matrix_inputs.emplace_back(
+        inputs[i]->flat<Scalar>().data() +
+            matrix_index * input_matrix_shapes[i].num_elements(),
+        input_matrix_shapes[i].dim_size(0), input_matrix_shapes[i].dim_size(1));
   }
 
   MatrixMaps matrix_outputs;
@@ -248,10 +246,10 @@ void LinearAlgebraOp<Scalar>::ComputeTensorSlice(
     int num_output_cols = output_matrix_shapes[i].dims() == 2
                               ? output_matrix_shapes[i].dim_size(1)
                               : 1;
-    matrix_outputs.push_back(
-        MatrixMap(outputs[i]->flat<Scalar>().data() +
-                      matrix_index * output_matrix_shapes[i].num_elements(),
-                  num_output_rows, num_output_cols));
+    matrix_outputs.emplace_back(
+        outputs[i]->flat<Scalar>().data() +
+            matrix_index * output_matrix_shapes[i].num_elements(),
+        num_output_rows, num_output_cols);
   }
   ComputeMatrix(context, matrix_inputs, &matrix_outputs);
 }
diff --git a/tensorflow/core/kernels/linalg_ops_common.h b/tensorflow/core/kernels/linalg_ops_common.h
index fcb735bfdb..75d1d29793 100644
--- a/tensorflow/core/kernels/linalg_ops_common.h
+++ b/tensorflow/core/kernels/linalg_ops_common.h
@@ -21,10 +21,7 @@ limitations under the License.
 // computations across different threads if necessary.
 #include <algorithm>
 
-#define EIGEN_USE_THREADS
-
 #include "third_party/eigen3/Eigen/Core"
-#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/kernel_def_builder.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/tensor.h"
diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index 494358fec6..01b35064b2 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -731,6 +731,21 @@ The polygamma function is defined as:
 where \\(\psi(x)\\) is the digamma function.
 )doc");
 
+REGISTER_OP("Atan2")
+    .Input("y: T")
+    .Input("x: T")
+    .Output("z: T")
+    .Attr("T: {float, double}")
+    .SetShapeFn(shape_inference::BroadcastBinaryOpShapeFn)
+    .Doc(R"doc(
+Computes arctangent of `y/x` element-wise, respecting signs of the arguments.
+This is the angle \( \theta \in [-\pi, \pi] \) such that
+\[ x = r \cos(\theta) \]
+and
+\[ y = r \sin(\theta) \]
+where \(r = \sqrt(x^2 + y^2) \).
+)doc");
+
 REGISTER_OP("Betainc")
     .Input("a: T")
     .Input("b: T")
diff --git a/tensorflow/docs_src/community/documentation.md b/tensorflow/docs_src/community/documentation.md
index be18d3e8be..27b8c8d302 100644
--- a/tensorflow/docs_src/community/documentation.md
+++ b/tensorflow/docs_src/community/documentation.md
@@ -4,12 +4,24 @@ We welcome contributions to the Tensorflow documentation from the community.
 This document explains how you can contribute to that documentation. In
 particular, this document explains the following:
 
-- Where the documentation is located.
-- How to make conformant edits.
-- How to build and test your documentation changes before you submit them.
-
-You can view Tensorflow documentation on tensorflow.org, and you can view and
-edit the raw files on Github.
+* Where the documentation is located.
+* How to make conformant edits.
+* How to build and test your documentation changes before you submit them.
+
+You can view Tensorflow documentation on https://www.tensorflow.org, and you
+can view and edit the raw files on Github. We're publishing our docs on Github
+so everybody can contribute. Whatever gets checked in tensorflow/docs_src will
+be published soon after on https://www.tensorflow.org. 
+
+Republishing TensorFlow documentation in different forms is absolutely allowed,
+but we are unlikely to accept other documentation formats (or the tooling to
+generate them) into our repository. If you do choose to republish our
+documentation in another form, please be sure to include:
+
+* The version of the API this represents (i.e. r1.0, master, etc.)
+* The commit or version from which the documentation was generated
+* Where to get the latest documentation (that is, https://www.tensorflow.org)
+* The Apache 2.0 license.
 
 ## A Note on Versions
 
diff --git a/tensorflow/docs_src/get_started/input_fn.md b/tensorflow/docs_src/get_started/input_fn.md
index 74ed5fbebf..a053617b58 100644
--- a/tensorflow/docs_src/get_started/input_fn.md
+++ b/tensorflow/docs_src/get_started/input_fn.md
@@ -12,7 +12,7 @@ When training a neural network using tf.contrib.learn, it's possible to pass
 your feature and target data directly into your `fit`, `evaluate`, or `predict`
 operations. Here's an example taken from the @{$tflearn$tf.contrib.learn quickstart tutorial}:
 
-```py
+```python
 training_set = tf.contrib.learn.datasets.base.load_csv_with_header(
     filename=IRIS_TRAINING, target_dtype=np.int, features_dtype=np.float32)
 test_set = tf.contrib.learn.datasets.base.load_csv_with_header(
diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index 8ee31fe692..e2f7ae6bf9 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -166,7 +166,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      virtualenv environment:
 
      <pre>(tensorflow)$ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 If you encounter installation problems, see
 [Common Installation Problems](#common_installation_problems).
@@ -271,7 +271,7 @@ take the following steps:
 
      <pre>
      $ <b>sudo pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl</b>
      </pre>
 
      If this step fails, see
@@ -458,7 +458,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
 
      <pre>
      (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl</b></pre>
+     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl</b></pre>
 
 
 <a name="ValidateYourInstallation"></a>
@@ -626,14 +626,14 @@ This section documents the relevant values for Linux installations.
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp27-none-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp27-none-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp27-none-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -645,14 +645,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp34-cp34m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp34-cp34m-linux_x86_64.whl
 </pre>
 
 Note that GPU support requires the NVIDIA hardware and software described in
@@ -664,14 +664,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp35-cp35m-linux_x86_64.whl
 </pre>
 
 
@@ -683,14 +683,14 @@ Note that GPU support requires the NVIDIA hardware and software described in
 CPU only:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
 GPU support:
 
 <pre>
-https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0rc2-cp36-cp36m-linux_x86_64.whl
+https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.1.0-cp36-cp36m-linux_x86_64.whl
 </pre>
 
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index b6a5758afe..73e143b145 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -112,7 +112,7 @@ Take the following steps to install TensorFlow with Virtualenv:
      https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
 
 If you encounter installation problems, see
-[Common Installation Problems](#CommonInstallationProblems).
+[Common Installation Problems](#common-installation-problems).
 
 
 ### Next Steps
@@ -233,7 +233,7 @@ take the following steps:
      https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b> </pre>
 
      If the preceding command fails, see
-     [Common installation problems](#CommonInstallationProblems).
+     [installation problems](#common-installation-problems).
 
 
 
diff --git a/tensorflow/docs_src/install/install_sources.md b/tensorflow/docs_src/install/install_sources.md
index 88268ba62f..8dd7870faa 100644
--- a/tensorflow/docs_src/install/install_sources.md
+++ b/tensorflow/docs_src/install/install_sources.md
@@ -320,10 +320,10 @@ Invoke `pip install` to install that pip package.
 The filename of the `.whl` file depends on your platform.
 For example, the following command will install the pip package
 
-for TensorFlow 1.1.0rc2 on Linux:
+for TensorFlow 1.1.0 on Linux:
 
 <pre>
-$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0rc2-py2-none-any.whl</b>
+$ <b>sudo pip install /tmp/tensorflow_pkg/tensorflow-1.1.0-py2-none-any.whl</b>
 </pre>
 
 ## Validate your installation
diff --git a/tensorflow/docs_src/install/install_windows.md b/tensorflow/docs_src/install/install_windows.md
index 5f7c27c028..db7c661aa1 100644
--- a/tensorflow/docs_src/install/install_windows.md
+++ b/tensorflow/docs_src/install/install_windows.md
@@ -103,7 +103,7 @@ Take the following steps to install TensorFlow in an Anaconda environment:
   2. Create a conda environment named <tt>tensorflow</tt>
      by invoking the following command:
 
-     <pre>C:\> <b>conda create -n tensorflow</b> </pre>
+     <pre>C:\> <b>conda create -n tensorflow python=3.5</b> </pre>
 
   3. Activate the conda environment by issuing the following command:
 
@@ -114,12 +114,12 @@ Take the following steps to install TensorFlow in an Anaconda environment:
      environment. To install the CPU-only version of TensorFlow, enter the
      following command:
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/cpu/tensorflow-1.1.0-cp35-cp35m-win_amd64.whl</b> </pre>
 
      To install the GPU version of TensorFlow, enter the following command
      (on a single line):
 
-     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0rc2-cp35-cp35m-win_amd64.whl</b> </pre>
+     <pre>(tensorflow)C:\> <b>pip install --ignore-installed --upgrade https://storage.googleapis.com/tensorflow/windows/gpu/tensorflow_gpu-1.1.0-cp35-cp35m-win_amd64.whl</b> </pre>
 
 ## Validate your installation
 
@@ -193,5 +193,20 @@ ImportError: cannot import name 'descriptor'</pre>
   <td><pre>No module named "pywrap_tensorflow"</pre></td>
 </tr>
 
+<tr>
+  <td><a href="https://stackoverflow.com/q/42217532">42217532</a></td>
+  <td>
+  <pre>OpKernel ('op: "BestSplits" device_type: "CPU"') for unknown op: BestSplits</pre>
+  </td>
+</tr>
+
+<tr>
+  <td><a href="https://stackoverflow.com/q/43134753">43134753</a></td>
+  <td>
+  <pre>The TensorFlow library wasn't compiled to use SSE instructions</pre>
+  </td>
+</tr>
+
+
 </table>
 
diff --git a/tensorflow/examples/image_retraining/retrain.py b/tensorflow/examples/image_retraining/retrain.py
index 5f4b6bed48..6c1b40b442 100644
--- a/tensorflow/examples/image_retraining/retrain.py
+++ b/tensorflow/examples/image_retraining/retrain.py
@@ -369,9 +369,12 @@ def create_bottleneck_file(bottleneck_path, image_lists, label_name, index,
   if not gfile.Exists(image_path):
     tf.logging.fatal('File does not exist %s', image_path)
   image_data = gfile.FastGFile(image_path, 'rb').read()
-  bottleneck_values = run_bottleneck_on_image(sess, image_data,
-                                              jpeg_data_tensor,
-                                              bottleneck_tensor)
+  try:
+    bottleneck_values = run_bottleneck_on_image(
+        sess, image_data, jpeg_data_tensor, bottleneck_tensor)
+  except:
+    raise RuntimeError('Error during processing file %s' % image_path)
+
   bottleneck_string = ','.join(str(x) for x in bottleneck_values)
   with open(bottleneck_path, 'w') as bottleneck_file:
     bottleneck_file.write(bottleneck_string)
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index b8064f0a77..5d9913d734 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -54,6 +54,7 @@ from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.saved_model import loader
 from tensorflow.python.saved_model import tag_constants
+from tensorflow.python.summary.writer import writer_cache
 from tensorflow.python.training import checkpoint_state_pb2
 from tensorflow.python.training import saver
 from tensorflow.python.training import saver_test_utils
@@ -436,8 +437,12 @@ class EstimatorTrainTest(test.TestCase):
         model_fn=model_fn_global_step_incrementer)
     est1.train(dummy_input_fn, steps=5)
 
+    # We have to clear the cache before we can rename the directory,
+    # otherwise open file handles will prevent the delete on Windows.
+    writer_cache.FileWriterCache.clear()
     model_dir2 = os.path.join(tmpdir, 'model_dir2')
     os.renames(model_dir1, model_dir2)
+
     est2 = estimator.Estimator(
         model_dir=model_dir2,
         model_fn=model_fn_global_step_incrementer)
diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 05972022d0..0b04904ec2 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -2705,11 +2705,11 @@ class Graph(object):
     Args:
       name: The key for the collection. For example, the `GraphKeys` class
         contains many standard names for collections.
-      scope: (Optional.) If supplied, the resulting list is filtered to include
-        only items whose `name` attribute matches using `re.match`. Items
-        without a `name` attribute are never returned if a scope is supplied and
-        the choice or `re.match` means that a `scope` without special tokens
-        filters by prefix.
+      scope: (Optional.) A string. If supplied, the resulting list is filtered
+        to include only items whose `name` attribute matches `scope` using
+        `re.match`. Items without a `name` attribute are never returned if a
+        scope is supplied. The choice of `re.match` means that a `scope` without
+        special tokens filters by prefix.
 
     Returns:
       The list of values in the collection with the given `name`, or
diff --git a/tensorflow/python/kernel_tests/cwise_ops_test.py b/tensorflow/python/kernel_tests/cwise_ops_test.py
index cd0d33ecf3..0846470abc 100644
--- a/tensorflow/python/kernel_tests/cwise_ops_test.py
+++ b/tensorflow/python/kernel_tests/cwise_ops_test.py
@@ -615,6 +615,13 @@ class BinaryOpTest(test.TestCase):
     self._compareBoth(x, y, np.multiply, _MUL)
     self._compareBoth(x, y + 0.1, np.true_divide, _TRUEDIV)
     self._compareBoth(x, y + 0.1, np.floor_divide, _FLOORDIV)
+    self._compareBoth(x, y, np.arctan2, math_ops.atan2)
+    x1 = np.random.randn(5, 6).astype(np.float32)
+    x2 = np.random.randn(5, 6).astype(np.float32)
+    # Remove tiny values--atan2 gradients are flaky near the origin.
+    x1[np.abs(x1) < 0.05] = 0.05 * np.sign(x1[np.abs(x1) < 0.05])
+    x2[np.abs(x2) < 0.05] = 0.05 * np.sign(x2[np.abs(x2) < 0.05])
+    self._compareBoth(x1, x2, np.arctan2, math_ops.atan2)
     try:
       from scipy import special  # pylint: disable=g-import-not-at-top
       a_pos_small = np.linspace(0.1, 2, 15).reshape(1, 3, 5).astype(np.float32)
@@ -672,6 +679,13 @@ class BinaryOpTest(test.TestCase):
     self._compareBoth(x, y, np.multiply, _MUL)
     self._compareBoth(x, y + 0.1, np.true_divide, _TRUEDIV)
     self._compareBoth(x, y + 0.1, np.floor_divide, _FLOORDIV)
+    self._compareBoth(x, y, np.arctan2, math_ops.atan2)
+    x1 = np.random.randn(7, 4).astype(np.float64)
+    x2 = np.random.randn(7, 4).astype(np.float64)
+    # Remove tiny values--atan2 gradients are flaky near the origin.
+    x1[np.abs(x1) < 0.5] = 0.5 * np.sign(x1[np.abs(x1) < 0.5])
+    x2[np.abs(x2) < 0.5] = 0.5 * np.sign(x2[np.abs(x2) < 0.5])
+    self._compareBoth(x1, x2, np.arctan2, math_ops.atan2)
     try:
       from scipy import special  # pylint: disable=g-import-not-at-top
       a_pos_small = np.linspace(0.1, 2, 15).reshape(1, 3, 5).astype(np.float32)
@@ -1090,6 +1104,19 @@ class BinaryOpTest(test.TestCase):
           error = gradient_checker.compute_gradient_error(y, [], z, [])
           self.assertLess(error, 2e-4)
 
+  def testAtan2SpecialValues(self):
+    x1l, x2l = zip((+0.0, +0.0), (+0.0, -0.0), (-0.0, +0.0), (-0.0, -0.0),
+                   (1.2345, float("inf")), (1.2345, -float("inf")),
+                   (-4.321, float("inf")), (-4.125, -float("inf")),
+                   (float("inf"), float("inf")), (float("inf"), -float("inf")),
+                   (-float("inf"), float("inf")), (-float("inf"),
+                                                   -float("inf")))
+    for dtype in np.float32, np.float64:
+      x1 = np.array(x1l).astype(dtype)
+      x2 = np.array(x2l).astype(dtype)
+      self._compareCpu(x1, x2, np.arctan2, math_ops.atan2)
+      self._compareGpu(x1, x2, np.arctan2, math_ops.atan2)
+
 
 class ComparisonOpTest(test.TestCase):
 
diff --git a/tensorflow/python/kernel_tests/tensor_priority_test.py b/tensorflow/python/kernel_tests/tensor_priority_test.py
new file mode 100644
index 0000000000..574538a837
--- /dev/null
+++ b/tensorflow/python/kernel_tests/tensor_priority_test.py
@@ -0,0 +1,86 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the binary ops priority mechanism."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.python.framework import ops
+from tensorflow.python.platform import test as test_lib
+
+
+class TensorPriorityTest(test_lib.TestCase):
+
+  def testSupportedRhsWithoutDelegation(self):
+
+    class NumpyArraySubclass(np.ndarray):
+      pass
+
+    supported_rhs_without_delegation = (3, 3.0, [1.0, 2.0], np.array(
+        [1.0, 2.0]), NumpyArraySubclass(
+            shape=(1, 2), buffer=np.array([1.0, 2.0])),
+                                        ops.convert_to_tensor([[1.0, 2.0]]))
+    for rhs in supported_rhs_without_delegation:
+      tensor = ops.convert_to_tensor([[10.0, 20.0]])
+      res = tensor + rhs
+      self.assertIsInstance(res, ops.Tensor)
+
+  def testUnsupportedRhsWithoutDelegation(self):
+
+    class WithoutReverseAdd(object):
+      pass
+
+    tensor = ops.convert_to_tensor([[10.0, 20.0]])
+    rhs = WithoutReverseAdd()
+    with self.assertRaisesWithPredicateMatch(
+        TypeError, lambda e: "Expected float" in str(e)):
+      # pylint: disable=pointless-statement
+      tensor + rhs
+
+  def testUnsupportedRhsWithDelegation(self):
+
+    class WithReverseAdd(object):
+
+      def __radd__(self, lhs):
+        return "Works!"
+
+    tensor = ops.convert_to_tensor([[10.0, 20.0]])
+    rhs = WithReverseAdd()
+    res = tensor + rhs
+    self.assertEqual(res, "Works!")
+
+  def testFullDelegationControlUsingRegistry(self):
+
+    class NumpyArraySubclass(np.ndarray):
+
+      def __radd__(self, lhs):
+        return "Works!"
+
+    def raise_to_delegate(value, dtype=None, name=None, as_ref=False):
+      del value, dtype, name, as_ref  # Unused.
+      raise TypeError
+
+    ops.register_tensor_conversion_function(
+        NumpyArraySubclass, raise_to_delegate, priority=0)
+    tensor = ops.convert_to_tensor([[10.0, 20.0]])
+    rhs = NumpyArraySubclass(shape=(1, 2), buffer=np.array([1.0, 2.0]))
+    res = tensor + rhs
+    self.assertEqual(res, "Works!")
+
+
+if __name__ == "__main__":
+  test_lib.main()
diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py
index b2fe9feb44..938161f426 100644
--- a/tensorflow/python/layers/convolutional.py
+++ b/tensorflow/python/layers/convolutional.py
@@ -972,7 +972,7 @@ def separable_conv2d(inputs,
 
 
 class Conv2DTranspose(Conv2D):
-  """Transposed convolution layer (sometimes called Deconvolution).
+  """Transposed 2D convolution layer (sometimes called 2D Deconvolution).
 
   The need for transposed convolutions generally arises
   from the desire to use a transformation going in the opposite direction
@@ -1086,19 +1086,9 @@ class Conv2DTranspose(Conv2D):
     kernel_h, kernel_w = self.kernel_size
     stride_h, stride_w = self.strides
 
-    def get_deconv_dim(dim_size, stride_size, kernel_size, padding):
-      if isinstance(dim_size, ops.Tensor):
-        dim_size = math_ops.multiply(dim_size, stride_size)
-      elif dim_size is not None:
-        dim_size *= stride_size
-
-      if padding == 'valid' and dim_size is not None:
-        dim_size += max(kernel_size - stride_size, 0)
-      return dim_size
-
     # Infer the dynamic output shape:
-    out_height = get_deconv_dim(height, stride_h, kernel_h, self.padding)
-    out_width = get_deconv_dim(width, stride_w, kernel_w, self.padding)
+    out_height = utils.get_deconv_dim(height, stride_h, kernel_h, self.padding)
+    out_width = utils.get_deconv_dim(width, stride_w, kernel_w, self.padding)
 
     if self.data_format == 'channels_first':
       output_shape = (batch_size, self.filters, out_height, out_width)
@@ -1119,10 +1109,10 @@ class Conv2DTranspose(Conv2D):
     # Infer the static output shape:
     out_shape = inputs.get_shape().as_list()
     out_shape[c_axis] = self.filters
-    out_shape[h_axis] = get_deconv_dim(
-        out_shape[h_axis], stride_h, kernel_h, self.padding)
-    out_shape[w_axis] = get_deconv_dim(
-        out_shape[w_axis], stride_w, kernel_w, self.padding)
+    out_shape[h_axis] = utils.get_deconv_dim(out_shape[h_axis], stride_h,
+                                             kernel_h, self.padding)
+    out_shape[w_axis] = utils.get_deconv_dim(out_shape[w_axis], stride_w,
+                                             kernel_w, self.padding)
     outputs.set_shape(out_shape)
 
     if self.bias:
@@ -1152,7 +1142,7 @@ def conv2d_transpose(inputs,
                      trainable=True,
                      name=None,
                      reuse=None):
-  """Transposed convolution layer (sometimes called Deconvolution).
+  """Functional interface for transposed 2D convolution layer.
 
   The need for transposed convolutions generally arises
   from the desire to use a transformation going in the opposite direction
@@ -1172,6 +1162,250 @@ def conv2d_transpose(inputs,
       of the convolution. Can be a single integer to specify the same value for
       all spatial dimensions.
     padding: one of `"valid"` or `"same"` (case-insensitive).
+    data_format: A string, one of `channels_last` (default) or `channels_first`.
+      The ordering of the dimensions in the inputs.
+      `channels_last` corresponds to inputs with shape
+      `(batch, height, width, channels)` while `channels_first` corresponds to
+      inputs with shape `(batch, channels, height, width)`.
+    activation: Activation function. Set it to `None` to maintain a
+      linear activation.
+    use_bias: Boolean, whether the layer uses a bias.
+    kernel_initializer: An initializer for the convolution kernel.
+    bias_initializer: An initializer for the bias vector. If `None`, then no
+      bias will be applied.
+    kernel_regularizer: Optional regularizer for the convolution kernel.
+    bias_regularizer: Optional regularizer for the bias vector.
+    activity_regularizer: Regularizer function for the output.
+    trainable: Boolean, if `True` also add variables to the graph collection
+      `GraphKeys.TRAINABLE_VARIABLES` (see `tf.Variable`).
+    name: A string, the name of the layer.
+    reuse: Boolean, whether to reuse the weights of a previous layer
+      by the same name.
+
+  Returns:
+    Output tensor.
+  """
+  layer = Conv2DTranspose(
+      filters=filters,
+      kernel_size=kernel_size,
+      strides=strides,
+      padding=padding,
+      data_format=data_format,
+      activation=activation,
+      use_bias=use_bias,
+      kernel_initializer=kernel_initializer,
+      bias_initializer=bias_initializer,
+      kernel_regularizer=kernel_regularizer,
+      bias_regularizer=bias_regularizer,
+      activity_regularizer=activity_regularizer,
+      trainable=trainable,
+      name=name,
+      _reuse=reuse,
+      _scope=name)
+  return layer.apply(inputs)
+
+
+class Conv3DTranspose(Conv3D):
+  """Transposed 3D convolution layer (sometimes called 3D Deconvolution).
+
+  Arguments:
+    filters: Integer, the dimensionality of the output space (i.e. the number
+      of filters in the convolution).
+    kernel_size: An integer or tuple/list of 3 integers, specifying the
+      depth, height and width of the 3D convolution window.
+      Can be a single integer to specify the same value for all spatial
+      dimensions.
+    strides: An integer or tuple/list of 3 integers, specifying the strides
+      of the convolution along the depth, height and width.
+      Can be a single integer to specify the same value for all spatial
+      dimensions.
+    padding: One of `"valid"` or `"same"` (case-insensitive).
+    data_format: A string, one of `channels_last` (default) or `channels_first`.
+      The ordering of the dimensions in the inputs.
+      `channels_last` corresponds to inputs with shape
+      `(batch, depth, height, width, channels)` while `channels_first`
+      corresponds to inputs with shape
+      `(batch, channels, depth, height, width)`.
+    activation: Activation function. Set it to `None` to maintain a
+      linear activation.
+    use_bias: Boolean, whether the layer uses a bias.
+    kernel_initializer: An initializer for the convolution kernel.
+    bias_initializer: An initializer for the bias vector. If `None`, then no
+      bias will be applied.
+    kernel_regularizer: Optional regularizer for the convolution kernel.
+    bias_regularizer: Optional regularizer for the bias vector.
+    activity_regularizer: Regularizer function for the output.
+    trainable: Boolean, if `True` also add variables to the graph collection
+      `GraphKeys.TRAINABLE_VARIABLES` (see `tf.Variable`).
+    name: A string, the name of the layer.
+  """
+
+  def __init__(self,
+               filters,
+               kernel_size,
+               strides=(1, 1, 1),
+               padding='valid',
+               data_format='channels_last',
+               activation=None,
+               use_bias=True,
+               kernel_initializer=None,
+               bias_initializer=init_ops.zeros_initializer(),
+               kernel_regularizer=None,
+               bias_regularizer=None,
+               activity_regularizer=None,
+               trainable=True,
+               name=None,
+               **kwargs):
+    super(Conv3DTranspose, self).__init__(
+        filters=filters,
+        kernel_size=kernel_size,
+        strides=strides,
+        padding=padding,
+        data_format=data_format,
+        activation=activation,
+        use_bias=use_bias,
+        kernel_initializer=kernel_initializer,
+        bias_initializer=bias_initializer,
+        kernel_regularizer=kernel_regularizer,
+        bias_regularizer=bias_regularizer,
+        activity_regularizer=activity_regularizer,
+        trainable=trainable,
+        name=name,
+        **kwargs)
+
+  def build(self, input_shape):
+    if len(input_shape) != 5:
+      raise ValueError('Inputs should have rank 5, received input shape:',
+                       str(input_shape))
+    if self.data_format == 'channels_first':
+      channel_axis = 1
+    else:
+      channel_axis = -1
+    if input_shape[channel_axis] is None:
+      raise ValueError('The channel dimension of the inputs '
+                       'should be defined, found None: ' + str(input_shape))
+    input_dim = input_shape[channel_axis]
+    kernel_shape = self.kernel_size + (self.filters, input_dim)
+
+    self.kernel = self.add_variable(
+        'kernel',
+        shape=kernel_shape,
+        initializer=self.kernel_initializer,
+        regularizer=self.kernel_regularizer,
+        trainable=True,
+        dtype=self.dtype)
+    if self.use_bias:
+      self.bias = self.add_variable(
+          'bias',
+          shape=(self.filters,),
+          initializer=self.bias_initializer,
+          regularizer=self.bias_regularizer,
+          trainable=True,
+          dtype=self.dtype)
+    else:
+      self.bias = None
+
+  def call(self, inputs):
+    inputs_shape = array_ops.shape(inputs)
+    batch_size = inputs_shape[0]
+    if self.data_format == 'channels_first':
+      c_axis, d_axis, h_axis, w_axis = 1, 2, 3, 4
+    else:
+      c_axis, d_axis, h_axis, w_axis = 4, 1, 2, 3
+
+    depth = inputs_shape[d_axis]
+    height = inputs_shape[h_axis]
+    width = inputs_shape[w_axis]
+
+    kernel_d, kernel_h, kernel_w = self.kernel_size
+    stride_d, stride_h, stride_w = self.strides
+
+    # Infer the dynamic output shape:
+    out_depth = utils.get_deconv_dim(depth, stride_d, kernel_d, self.padding)
+    out_height = utils.get_deconv_dim(height, stride_h, kernel_h, self.padding)
+    out_width = utils.get_deconv_dim(width, stride_w, kernel_w, self.padding)
+
+    if self.data_format == 'channels_first':
+      output_shape = (batch_size, self.filters, out_depth, out_height,
+                      out_width)
+      strides = (1, 1, stride_d, stride_h, stride_w)
+    else:
+      output_shape = (batch_size, out_depth, out_height, out_width,
+                      self.filters)
+      strides = (1, stride_d, stride_h, stride_w, 1)
+
+    output_shape_tensor = array_ops.stack(output_shape)
+    outputs = nn.conv3d_transpose(
+        inputs,
+        self.kernel,
+        output_shape_tensor,
+        strides,
+        data_format=utils.convert_data_format(self.data_format, ndim=5),
+        padding=self.padding.upper())
+
+    # Infer the static output shape:
+    out_shape = inputs.get_shape().as_list()
+    out_shape[c_axis] = self.filters
+    out_shape[d_axis] = utils.get_deconv_dim(out_shape[d_axis], stride_d,
+                                             kernel_d, self.padding)
+    out_shape[h_axis] = utils.get_deconv_dim(out_shape[h_axis], stride_h,
+                                             kernel_h, self.padding)
+    out_shape[w_axis] = utils.get_deconv_dim(out_shape[w_axis], stride_w,
+                                             kernel_w, self.padding)
+    outputs.set_shape(out_shape)
+
+    if self.bias:
+      outputs_shape = outputs.shape.as_list()
+      if self.data_format == 'channels_first':
+        outputs_4d = array_ops.reshape(outputs, [
+            outputs_shape[0], outputs_shape[1],
+            outputs_shape[2] * outputs_shape[3], outputs_shape[4]
+        ])
+      else:
+        outputs_4d = array_ops.reshape(outputs, [
+            outputs_shape[0], outputs_shape[1] * outputs_shape[2],
+            outputs_shape[3], outputs_shape[4]
+        ])
+      outputs_4d = nn.bias_add(
+          outputs_4d,
+          self.bias,
+          data_format=utils.convert_data_format(self.data_format, ndim=4))
+      outputs = array_ops.reshape(outputs_4d, outputs_shape)
+
+    if self.activation is not None:
+      return self.activation(outputs)
+    return outputs
+
+
+def conv3d_transpose(inputs,
+                     filters,
+                     kernel_size,
+                     strides=(1, 1, 1),
+                     padding='valid',
+                     data_format='channels_last',
+                     activation=None,
+                     use_bias=True,
+                     kernel_initializer=None,
+                     bias_initializer=init_ops.zeros_initializer(),
+                     kernel_regularizer=None,
+                     bias_regularizer=None,
+                     activity_regularizer=None,
+                     trainable=True,
+                     name=None,
+                     reuse=None):
+  """Functional interface for transposed 3D convolution layer.
+
+  Arguments:
+    inputs: Input tensor.
+    filters: Integer, the dimensionality of the output space (i.e. the number
+      of filters in the convolution).
+    kernel_size: A tuple or list of 3 positive integers specifying the spatial
+      dimensions of of the filters. Can be a single integer to specify the same
+      value for all spatial dimensions.
+    strides: A tuple or list of 3 positive integers specifying the strides
+      of the convolution. Can be a single integer to specify the same value for
+      all spatial dimensions.
+    padding: one of `"valid"` or `"same"` (case-insensitive).
     data_format: A string, one of `channels_last` (default) or `channels_first`.
       The ordering of the dimensions in the inputs.
       `channels_last` corresponds to inputs with shape
@@ -1195,7 +1429,7 @@ def conv2d_transpose(inputs,
   Returns:
     Output tensor.
   """
-  layer = Conv2DTranspose(
+  layer = Conv3DTranspose(
       filters=filters,
       kernel_size=kernel_size,
       strides=strides,
@@ -1222,8 +1456,10 @@ Convolution2D = Conv2D
 Convolution3D = Conv3D
 SeparableConvolution2D = SeparableConv2D
 Convolution2DTranspose = Deconvolution2D = Deconv2D = Conv2DTranspose
+Convolution3DTranspose = Deconvolution3D = Deconv3D = Conv3DTranspose
 convolution1d = conv1d
 convolution2d = conv2d
 convolution3d = conv3d
 separable_convolution2d = separable_conv2d
 convolution2d_transpose = deconvolution2d = deconv2d = conv2d_transpose
+convolution3d_transpose = deconvolution3d = deconv3d = conv3d_transpose
diff --git a/tensorflow/python/layers/convolutional_test.py b/tensorflow/python/layers/convolutional_test.py
index da962b2f99..42a2d77534 100644
--- a/tensorflow/python/layers/convolutional_test.py
+++ b/tensorflow/python/layers/convolutional_test.py
@@ -651,5 +651,174 @@ class Conv2DTransposeTest(test.TestCase):
     self.assertEqual(len(variables.trainable_variables()), 4)
 
 
+class Conv3DTransposeTest(test.TestCase):
+
+  def testInvalidDataFormat(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    with self.assertRaisesRegexp(ValueError, 'data_format'):
+      conv_layers.conv3d_transpose(volumes, 4, 3, data_format='invalid')
+
+  def testInvalidStrides(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    with self.assertRaisesRegexp(ValueError, 'strides'):
+      conv_layers.conv3d_transpose(volumes, 4, 3, strides=(1, 2))
+
+    with self.assertRaisesRegexp(ValueError, 'strides'):
+      conv_layers.conv3d_transpose(volumes, 4, 3, strides=None)
+
+  def testInvalidKernelSize(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    with self.assertRaisesRegexp(ValueError, 'kernel_size'):
+      conv_layers.conv3d_transpose(volumes, 4, (1, 2))
+
+    with self.assertRaisesRegexp(ValueError, 'kernel_size'):
+      conv_layers.conv3d_transpose(volumes, 4, None)
+
+  def testCreateConv3DTranspose(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], activation=nn_ops.relu)
+    output = layer.apply(volumes)
+    self.assertEqual(output.op.name, 'conv3d_transpose/Relu')
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth + 2, height + 2, width + 2, 4])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertListEqual(layer.bias.get_shape().as_list(), [4])
+
+  def testCreateConv3DTransposeIntegerKernelSize(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    layer = conv_layers.Conv3DTranspose(4, 3)
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth + 2, height + 2, width + 2, 4])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertListEqual(layer.bias.get_shape().as_list(), [4])
+
+  def testCreateConv3DTransposeChannelsFirst(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, 32, depth, height, width))
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], data_format='channels_first')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, 4, depth + 2, height + 2, width + 2])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertListEqual(layer.bias.get_shape().as_list(), [4])
+
+  def testConv3DTransposePaddingSame(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 64), seed=1)
+    layer = conv_layers.Conv3DTranspose(
+        32, volumes.get_shape()[1:4], padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth, height, width, 32])
+
+  def testCreateConv3DTransposeWithStrides(self):
+    depth, height, width = 4, 6, 8
+    # Test strides tuple.
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], strides=(2, 2, 2), padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth * 2, height * 2, width * 2, 4])
+
+    # Test strides integer.
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], strides=2, padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth * 2, height * 2, width * 2, 4])
+
+    # Test unequal strides.
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], strides=(2, 1, 1), padding='same')
+    output = layer.apply(volumes)
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth * 2, height, width, 4])
+
+  def testConv3DTransposeKernelRegularizer(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    reg = lambda x: 0.1 * math_ops.reduce_sum(x)
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], kernel_regularizer=reg)
+    layer.apply(volumes)
+    loss_keys = ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)
+    self.assertEqual(len(loss_keys), 1)
+    self.assertListEqual(layer.losses, loss_keys)
+
+  def testConv3DTransposeBiasRegularizer(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    reg = lambda x: 0.1 * math_ops.reduce_sum(x)
+    layer = conv_layers.Conv3DTranspose(4, [3, 3, 3], bias_regularizer=reg)
+    layer.apply(volumes)
+    loss_keys = ops.get_collection(ops.GraphKeys.REGULARIZATION_LOSSES)
+    self.assertEqual(len(loss_keys), 1)
+    self.assertListEqual(layer.losses, loss_keys)
+
+  def testConv3DTransposeNoBias(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32))
+    layer = conv_layers.Conv3DTranspose(
+        4, [3, 3, 3], activation=nn_ops.relu, use_bias=False)
+    output = layer.apply(volumes)
+    self.assertEqual(output.op.name, 'conv3d_transpose/Relu')
+    self.assertListEqual(output.get_shape().as_list(),
+                         [5, depth + 2, height + 2, width + 2, 4])
+    self.assertListEqual(layer.kernel.get_shape().as_list(), [3, 3, 3, 4, 32])
+    self.assertEqual(layer.bias, None)
+
+  def testFunctionalConv3DTransposeReuse(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+    self.assertEqual(len(variables.trainable_variables()), 2)
+    conv_layers.conv3d_transpose(
+        volumes, 4, [3, 3, 3], name='deconv1', reuse=True)
+    self.assertEqual(len(variables.trainable_variables()), 2)
+
+  def testFunctionalConv3DTransposeReuseFromScope(self):
+    with variable_scope.variable_scope('scope'):
+      depth, height, width = 5, 7, 9
+      volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+      conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+      self.assertEqual(len(variables.trainable_variables()), 2)
+    with variable_scope.variable_scope('scope', reuse=True):
+      conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+      self.assertEqual(len(variables.trainable_variables()), 2)
+
+  def testFunctionalConv3DTransposeInitializerFromScope(self):
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          'scope', initializer=init_ops.ones_initializer()):
+        depth, height, width = 5, 7, 9
+        volumes = random_ops.random_uniform(
+            (5, depth, height, width, 32), seed=1)
+        conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3], name='deconv1')
+        weights = variables.trainable_variables()
+        # Check the names of weights in order.
+        self.assertTrue('kernel' in weights[0].name)
+        self.assertTrue('bias' in weights[1].name)
+        sess.run(variables.global_variables_initializer())
+        weights = sess.run(weights)
+        # Check that the kernel weights got initialized to ones (from scope)
+        self.assertAllClose(weights[0], np.ones((3, 3, 3, 4, 32)))
+        # Check that the bias still got initialized to zeros.
+        self.assertAllClose(weights[1], np.zeros((4)))
+
+  def testFunctionalConv3DTransposeNoReuse(self):
+    depth, height, width = 5, 7, 9
+    volumes = random_ops.random_uniform((5, depth, height, width, 32), seed=1)
+    conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3])
+    self.assertEqual(len(variables.trainable_variables()), 2)
+    conv_layers.conv3d_transpose(volumes, 4, [3, 3, 3])
+    self.assertEqual(len(variables.trainable_variables()), 4)
+
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/layers/layers.py b/tensorflow/python/layers/layers.py
index 9f02757d5b..aa46eb5d27 100644
--- a/tensorflow/python/layers/layers.py
+++ b/tensorflow/python/layers/layers.py
@@ -23,6 +23,7 @@
 @@conv3d
 @@separable_conv2d
 @@conv2d_transpose
+@@conv3d_transpose
 @@average_pooling1d
 @@max_pooling1d
 @@average_pooling2d
@@ -50,6 +51,7 @@ from tensorflow.python.layers.convolutional import conv2d
 from tensorflow.python.layers.convolutional import conv3d
 from tensorflow.python.layers.convolutional import separable_conv2d
 from tensorflow.python.layers.convolutional import conv2d_transpose
+from tensorflow.python.layers.convolutional import conv3d_transpose
 
 # Pooling layers.
 from tensorflow.python.layers.pooling import average_pooling1d
diff --git a/tensorflow/python/layers/utils.py b/tensorflow/python/layers/utils.py
index 666d475690..64b948c70f 100644
--- a/tensorflow/python/layers/utils.py
+++ b/tensorflow/python/layers/utils.py
@@ -26,6 +26,7 @@ import numpy as np
 
 from tensorflow.python.ops import variables
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import math_ops
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_util
 
@@ -164,3 +165,28 @@ def constant_value(pred):
   else:
     raise TypeError('`pred` must be a Tensor, a Variable, or a Python bool.')
   return pred_value
+
+
+def get_deconv_dim(dim_size, stride_size, kernel_size, padding):
+  """Return output dimension of a deconv layer, based on input dimension.
+
+  Arguments:
+    dim_size: An int representing size of dimension, can be height, width
+      or depth.
+    stride_size: An int representing the stride of deconvolution filters
+      along the same dimension.
+    kernel_size: An int representing size of deconv kernel (filter) along
+      the same dimension.
+    padding: one of `"valid"` or `"same"` (case-insensitive).
+
+  Returns:
+    An int representing the size of output dimension of the layer.
+  """
+  if isinstance(dim_size, ops.Tensor):
+    dim_size = math_ops.multiply(dim_size, stride_size)
+  elif dim_size is not None:
+    dim_size *= stride_size
+
+  if padding == 'valid' and dim_size is not None:
+    dim_size += max(kernel_size - stride_size, 0)
+  return dim_size
diff --git a/tensorflow/python/layers/utils_test.py b/tensorflow/python/layers/utils_test.py
index 54e757c112..7969e957d8 100644
--- a/tensorflow/python/layers/utils_test.py
+++ b/tensorflow/python/layers/utils_test.py
@@ -62,6 +62,13 @@ class ConvUtilsTest(test.TestCase):
     with self.assertRaises(ValueError):
       utils.normalize_padding('invalid')
 
+  def testGetDeconvDim(self):
+    self.assertEqual(utils.get_deconv_dim(30, 1, 3, 'valid'), 32)
+    self.assertEqual(utils.get_deconv_dim(28, 1, 5, 'valid'), 32)
+    self.assertEqual(utils.get_deconv_dim(28, 2, 5, 'valid'), 59)
+    self.assertEqual(utils.get_deconv_dim(32, 1, 3, 'same'), 32)
+    self.assertEqual(utils.get_deconv_dim(32, 1, 5, 'same'), 32)
+    self.assertEqual(utils.get_deconv_dim(32, 2, 5, 'same'), 64)
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 77db63dd0f..5ac630c321 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -470,7 +470,10 @@ def _SliceHelper(tensor, slice_spec, var=None):
     else:
       begin.append(s)
       end.append(s + 1)
-      strides.append(1)
+      if isinstance(s, ops.Tensor):
+        strides.append(constant(1, s.dtype))
+      else:
+        strides.append(np.ones_like(s).dtype.type(1))
       shrink_axis_mask |= (1 << index)
     index += 1
 
diff --git a/tensorflow/python/ops/ctc_ops.py b/tensorflow/python/ops/ctc_ops.py
index b0a1fc3dd1..ee5b2952f4 100644
--- a/tensorflow/python/ops/ctc_ops.py
+++ b/tensorflow/python/ops/ctc_ops.py
@@ -197,7 +197,7 @@ def ctc_greedy_decoder(inputs, sequence_length, merge_repeated=True):
     merge_repeated: Boolean.  Default: True.
 
   Returns:
-    A tuple `(decoded, log_probabilities)` where
+    A tuple `(decoded, neg_sum_logits)` where
     decoded: A single-element list. `decoded[0]`
       is an `SparseTensor` containing the decoded outputs s.t.:
       `decoded.indices`: Indices matrix `(total_decoded_outputs x 2)`.
@@ -206,8 +206,9 @@ def ctc_greedy_decoder(inputs, sequence_length, merge_repeated=True):
         The vector stores the decoded classes.
       `decoded.shape`: Shape vector, size `(2)`.
         The shape values are: `[batch_size, max_decoded_length]`
-    log_probability: A `float` matrix `(batch_size x 1)` containing sequence
-        log-probabilities.
+    neg_sum_logits: A `float` matrix `(batch_size x 1)` containing, for the
+        sequence found, the negative of the sum of the greatest logit at each
+        timeframe.
   """
   outputs = gen_ctc_ops._ctc_greedy_decoder(
       inputs, sequence_length, merge_repeated=merge_repeated)
diff --git a/tensorflow/python/ops/init_ops.py b/tensorflow/python/ops/init_ops.py
index 67fff9c803..42b4f952bb 100644
--- a/tensorflow/python/ops/init_ops.py
+++ b/tensorflow/python/ops/init_ops.py
@@ -39,6 +39,7 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
+from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 
 
@@ -487,16 +488,18 @@ class Orthogonal(Initializer):
     flat_shape = (num_rows, num_cols)
 
     # Generate a random matrix
-    a = random_ops.random_uniform(flat_shape, dtype=dtype, seed=self.seed)
-    # Compute the svd
-    _, u, v = linalg_ops.svd(a, full_matrices=False)
-    # Pick the appropriate singular value decomposition
-    if num_rows > num_cols:
-      q = u
-    else:
-      # Tensorflow departs from numpy conventions
-      # such that we need to transpose axes here
-      q = array_ops.transpose(v)
+    a = random_ops.random_normal(flat_shape, dtype=dtype, seed=self.seed)
+    # Compute the qr factorization
+    q, r = linalg_ops.qr(a, full_matrices=False)
+    # Make Q uniform
+    square_len = math_ops.minimum(num_rows, num_cols)
+    d = array_ops.diag_part(r[:square_len, :square_len])
+    ph = d / math_ops.abs(d)
+    q *= ph
+    # Pad zeros to Q (if rows smaller than cols)
+    if num_rows < num_cols:
+      padding = array_ops.zeros([num_rows, num_cols - num_rows], dtype=dtype)
+      q = array_ops.concat([q, padding], 1)
     return self.gain * array_ops.reshape(q, shape)
 
   def get_config(self):
diff --git a/tensorflow/python/ops/logging_ops.py b/tensorflow/python/ops/logging_ops.py
index 9c49ef7889..dbb13e0c8f 100644
--- a/tensorflow/python/ops/logging_ops.py
+++ b/tensorflow/python/ops/logging_ops.py
@@ -124,7 +124,7 @@ def image_summary(tag, tensor, max_images=3, collections=None, name=None):
   """Outputs a `Summary` protocol buffer with images.
 
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The summary has up to `max_images` summary values containing images. The
   images are built from `tensor` which must be 4-D with shape `[batch_size,
diff --git a/tensorflow/python/ops/math_grad.py b/tensorflow/python/ops/math_grad.py
index 409e3c5111..024158e709 100644
--- a/tensorflow/python/ops/math_grad.py
+++ b/tensorflow/python/ops/math_grad.py
@@ -613,6 +613,16 @@ def _AtanGrad(op, grad):
     return grad * inv
 
 
+@ops.RegisterGradient("Atan2")
+def _Atan2Grad(op, grad):
+  """Returns grad * x / (x^2 + y^2), grad * -y / (x^2 + y^2)."""
+  y = op.inputs[0]
+  x = op.inputs[1]
+  with ops.control_dependencies([grad.op]):
+    grad_inv = grad / (math_ops.square(x) + math_ops.square(y))
+    return x * grad_inv, -y * grad_inv
+
+
 @ops.RegisterGradient("AddN")
 def _AddNGrad(op, grad):
   """Copies the gradient to all inputs."""
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 92e8723ced..b762205cf7 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -56,6 +56,7 @@ See the @{$python/math_ops} guide.
 @@acos
 @@asin
 @@atan
+@@atan2
 @@lgamma
 @@digamma
 @@erf
@@ -824,7 +825,16 @@ def _OverrideBinaryOperatorHelper(func, op_name, clazz_object=ops.Tensor):
   def binary_op_wrapper(x, y):
     with ops.name_scope(None, op_name, [x, y]) as name:
       if not isinstance(y, sparse_tensor.SparseTensor):
-        y = ops.convert_to_tensor(y, dtype=x.dtype.base_dtype, name="y")
+        try:
+          y = ops.convert_to_tensor(y, dtype=x.dtype.base_dtype, name="y")
+        except TypeError:
+          # If the RHS is not a tensor, it might be a tensor aware object
+          # that can implement the operator with knowledge of itself
+          # and the tensor.
+          if hasattr(type(y), "__r%s__" % op_name):
+            return NotImplemented
+          else:
+            raise
       return func(x, y, name=name)
 
   def binary_op_wrapper_sparse(sp_x, y):
diff --git a/tensorflow/python/ops/nn_impl.py b/tensorflow/python/ops/nn_impl.py
index 7c17cf2cb6..0a00e3d765 100644
--- a/tensorflow/python/ops/nn_impl.py
+++ b/tensorflow/python/ops/nn_impl.py
@@ -301,9 +301,8 @@ def zero_fraction(value, name=None):
   This is useful in summaries to measure and report sparsity.  For example,
 
   ```python
-      z = tf.Relu(...)
-      summ = tf.contrib.deprecated.scalar_summary('sparsity',
-      tf.nn.zero_fraction(z))
+      z = tf.nn.relu(...)
+      summ = tf.summary.scalar('sparsity', tf.nn.zero_fraction(z))
   ```
 
   Args:
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index ccce9402c7..61fda3a798 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -840,6 +840,11 @@ def pool(input,  # pylint: disable=redefined-builtin
 def atrous_conv2d(value, filters, rate, padding, name=None):
   """Atrous convolution (a.k.a. convolution with holes or dilated convolution).
 
+  This function is a simpler wrapper around the more general
+  @{tf.nn.convolution}, and exists only for backwards compatibility. You can
+  use @{tf.nn.convolution} to perform 1-D, 2-D, or 3-D atrous convolution.
+
+
   Computes a 2-D atrous convolution, also known as convolution with holes or
   dilated convolution, given 4-D `value` and `filters` tensors. If the `rate`
   parameter is equal to one, it performs regular 2-D convolution. If the `rate`
@@ -959,93 +964,12 @@ def atrous_conv2d(value, filters, rate, padding, name=None):
     ValueError: If input/output depth does not match `filters`' shape, or if
       padding is other than `'VALID'` or `'SAME'`.
   """
-  with ops.name_scope(name, "atrous_conv2d", [value, filters]) as name:
-    value = ops.convert_to_tensor(value, name="value")
-    filters = ops.convert_to_tensor(filters, name="filters")
-    if not value.get_shape()[3].is_compatible_with(filters.get_shape()[2]):
-      raise ValueError(
-          "value's input channels does not match filters' input channels, "
-          "{} != {}".format(value.get_shape()[3], filters.get_shape()[2]))
-    if rate < 1:
-      raise ValueError("rate {} cannot be less than one".format(rate))
-
-    if rate == 1:
-      value = gen_nn_ops.conv2d(input=value,
-                                filter=filters,
-                                strides=[1, 1, 1, 1],
-                                padding=padding)
-      return value
-
-    # We have two padding contributions. The first is used for converting "SAME"
-    # to "VALID". The second is required so that the height and width of the
-    # zero-padded value tensor are multiples of rate.
-
-    # Padding required to reduce to "VALID" convolution
-    if padding == "SAME":
-      # Handle filters whose shape is unknown during graph creation.
-      if filters.get_shape().is_fully_defined():
-        filter_shape = filters.get_shape().as_list()
-      else:
-        filter_shape = array_ops.shape(filters)
-      filter_height, filter_width = filter_shape[0], filter_shape[1]
-
-      # Spatial dimensions of the filters and the upsampled filters in which we
-      # introduce (rate - 1) zeros between consecutive filter values.
-      filter_height_up = filter_height + (filter_height - 1) * (rate - 1)
-      filter_width_up = filter_width + (filter_width - 1) * (rate - 1)
-
-      pad_height = filter_height_up - 1
-      pad_width = filter_width_up - 1
-
-      # When pad_height (pad_width) is odd, we pad more to bottom (right),
-      # following the same convention as conv2d().
-      pad_top = pad_height // 2
-      pad_bottom = pad_height - pad_top
-      pad_left = pad_width // 2
-      pad_right = pad_width - pad_left
-    elif padding == "VALID":
-      pad_top = 0
-      pad_bottom = 0
-      pad_left = 0
-      pad_right = 0
-    else:
-      raise ValueError("Invalid padding")
-
-    # Handle input whose shape is unknown during graph creation.
-    if value.get_shape().is_fully_defined():
-      value_shape = value.get_shape().as_list()
-    else:
-      value_shape = array_ops.shape(value)
-
-    in_height = value_shape[1] + pad_top + pad_bottom
-    in_width = value_shape[2] + pad_left + pad_right
-
-    # More padding so that rate divides the height and width of the input.
-    pad_bottom_extra = (rate - in_height % rate) % rate
-    pad_right_extra = (rate - in_width % rate) % rate
-
-    # The paddings argument to space_to_batch includes both padding components.
-    space_to_batch_pad = [[pad_top, pad_bottom + pad_bottom_extra],
-                          [pad_left, pad_right + pad_right_extra]]
-
-    value = array_ops.space_to_batch(input=value,
-                                     paddings=space_to_batch_pad,
-                                     block_size=rate)
-
-    value = gen_nn_ops.conv2d(input=value,
-                              filter=filters,
-                              strides=[1, 1, 1, 1],
-                              padding="VALID",
-                              name=name)
-
-    # The crops argument to batch_to_space is just the extra padding component.
-    batch_to_space_crop = [[0, pad_bottom_extra], [0, pad_right_extra]]
-
-    value = array_ops.batch_to_space(input=value,
-                                     crops=batch_to_space_crop,
-                                     block_size=rate)
-
-    return value
+  return convolution(
+      input=value,
+      filter=filters,
+      padding=padding,
+      dilation_rate=np.broadcast_to(rate, (2,)),
+      name=name)
 
 
 def conv2d_transpose(value,
@@ -1272,7 +1196,7 @@ def conv3d_transpose(value,
                      output_shape,
                      strides,
                      padding="SAME",
-                     data_format=None,
+                     data_format="NDHWC",
                      name=None):
   """The transpose of `conv3d`.
 
@@ -1308,10 +1232,11 @@ def conv3d_transpose(value,
                       [value, filter, output_shape]) as name:
     value = ops.convert_to_tensor(value, name="value")
     filter = ops.convert_to_tensor(filter, name="filter")
-    if not value.get_shape()[4].is_compatible_with(filter.get_shape()[4]):
+    axis = 1 if data_format == "NCDHW" else 4
+    if not value.get_shape()[axis].is_compatible_with(filter.get_shape()[4]):
       raise ValueError("input channels does not match filter's input channels, "
-                       "{} != {}".format(value.get_shape()[4], filter.get_shape(
-                       )[4]))
+                       "{} != {}".format(value.get_shape()[axis],
+                                         filter.get_shape()[4]))
 
     output_shape_ = ops.convert_to_tensor(output_shape, name="output_shape")
     if not output_shape_.get_shape().is_compatible_with(tensor_shape.vector(5)):
diff --git a/tensorflow/python/ops/parsing_ops.py b/tensorflow/python/ops/parsing_ops.py
index b1994acdc4..796ea20eb7 100644
--- a/tensorflow/python/ops/parsing_ops.py
+++ b/tensorflow/python/ops/parsing_ops.py
@@ -845,7 +845,7 @@ def parse_single_sequence_example(
   Parses a single serialized [`SequenceExample`](https://www.tensorflow.org/code/tensorflow/core/example/example.proto)
   proto given in `serialized`.
 
-  This op parses a serialize sequence example into a tuple of dictionaries
+  This op parses a serialized sequence example into a tuple of dictionaries
   mapping keys to `Tensor` and `SparseTensor` objects respectively.
   The first dictionary contains mappings for keys appearing in
   `context_features`, and the second dictionary contains mappings for keys
diff --git a/tensorflow/python/ops/random_ops.py b/tensorflow/python/ops/random_ops.py
index 19689622b1..f06980783a 100644
--- a/tensorflow/python/ops/random_ops.py
+++ b/tensorflow/python/ops/random_ops.py
@@ -324,7 +324,7 @@ def multinomial(logits, num_samples, seed=None, name=None):
 
   Args:
     logits: 2-D Tensor with shape `[batch_size, num_classes]`.  Each slice
-      `[i, :]` represents the unnormalized log probabilities for all classes.
+      `[i, :]` represents the log-odds for all classes.
     num_samples: 0-D.  Number of independent samples to draw for each row slice.
     seed: A Python integer. Used to create a random seed for the distribution.
       See
diff --git a/tensorflow/python/summary/writer/writer_cache.py b/tensorflow/python/summary/writer/writer_cache.py
index 21870e788e..bad289303c 100644
--- a/tensorflow/python/summary/writer/writer_cache.py
+++ b/tensorflow/python/summary/writer/writer_cache.py
@@ -39,6 +39,10 @@ class FileWriterCache(object):
   def clear():
     """Clear cached summary writers. Currently only used for unit tests."""
     with FileWriterCache._lock:
+      # Make sure all the writers are closed now (otherwise open file handles
+      # may hang around, blocking deletions on Windows).
+      for item in FileWriterCache._cache.values():
+        item.close()
       FileWriterCache._cache = {}
 
   @staticmethod
diff --git a/tensorflow/python/tools/import_pb_to_tensorboard.py b/tensorflow/python/tools/import_pb_to_tensorboard.py
new file mode 100644
index 0000000000..caeb04a24b
--- /dev/null
+++ b/tensorflow/python/tools/import_pb_to_tensorboard.py
@@ -0,0 +1,50 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ================================
+"""Imports a protobuf model as a graph in Tensorboard."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.core.framework import graph_pb2
+from tensorflow.python.client import session
+from tensorflow.python.framework import importer
+from tensorflow.python.framework import ops
+from tensorflow.python.platform import gfile
+from tensorflow.python.summary import summary
+
+
+def import_to_tensorboard(model_dir, log_dir):
+  """View an imported protobuf model (`.pb` file) as a graph in Tensorboard.
+
+  Args:
+    model_dir: The location of the protobuf (`pb`) model to visualize
+    log_dir: The location for the Tensorboard log to begin visualisation from.
+
+  Usage:
+    Call this function with your model location and desired log directory.
+    Launch Tensorboard by pointing it to the log directory.
+    View your imported `.pb` model as a graph.
+  """
+  with session.Session(graph=ops.Graph()) as sess:
+    with gfile.FastGFile(model_dir, "rb") as f:
+      graph_def = graph_pb2.GraphDef()
+      graph_def.ParseFromString(f.read())
+      importer.import_graph_def(graph_def)
+
+    pb_visual_writer = summary.FileWriter(log_dir)
+    pb_visual_writer.add_graph(sess.graph)
+    print("Model Imported. Visualize by running: "
+          "> tensorboard --logdir={}".format(log_dir))
diff --git a/tensorflow/python/training/checkpoint_utils.py b/tensorflow/python/training/checkpoint_utils.py
index 35d1a069d8..d52cf9a436 100644
--- a/tensorflow/python/training/checkpoint_utils.py
+++ b/tensorflow/python/training/checkpoint_utils.py
@@ -59,14 +59,14 @@ def load_checkpoint(ckpt_dir_or_file):
 
 
 def load_variable(ckpt_dir_or_file, name):
-  """Returns a tensor with the contents of the given variable in the checkpoint.
+  """Returns the tensor value of the given variable in the checkpoint.
 
   Args:
     ckpt_dir_or_file: Directory with checkpoints file or path to checkpoint.
-    name: Name of the tensor to return.
+    name: Name of the variable to return.
 
   Returns:
-    `Tensor` object.
+    A numpy `ndarray` with a copy of the value of this variable.
   """
   # TODO(b/29227106): Fix this in the right place and remove this.
   if name.endswith(":0"):
@@ -210,9 +210,8 @@ def init_from_checkpoint(ckpt_dir_or_file, assignment_map):
       else:
         var_name = ",".join([v.name for v in var])
       _set_variable_or_list_initializer(var, ckpt_file, tensor_name_in_ckpt)
-      logging.info("Initialize variable %s from checkpoint %s with %s" % (
-          var_name, ckpt_dir_or_file, tensor_name_in_ckpt
-      ))
+      logging.info("Initialize variable %s from checkpoint %s with %s",
+                   var_name, ckpt_dir_or_file, tensor_name_in_ckpt)
     else:
       scopes = ""
       # TODO(vihanjain): Support list of 'current_var_or_name' here.
@@ -250,9 +249,8 @@ def init_from_checkpoint(ckpt_dir_or_file, assignment_map):
         if var is None:
           var = _collect_partitioned_variable(var_name, store_vars)
         _set_variable_or_list_initializer(var, ckpt_file, full_tensor_name)
-        logging.info("Initialize variable %s from checkpoint %s with %s" % (
-            var_name, ckpt_dir_or_file, full_tensor_name
-        ))
+        logging.info("Initialize variable %s from checkpoint %s with %s",
+                     var_name, ckpt_dir_or_file, full_tensor_name)
 
 
 def _get_checkpoint_filename(ckpt_dir_or_file):
diff --git a/tensorflow/python/training/input.py b/tensorflow/python/training/input.py
index 83f1ac4abd..e9fe9215ae 100644
--- a/tensorflow/python/training/input.py
+++ b/tensorflow/python/training/input.py
@@ -879,9 +879,6 @@ def batch(tensors, batch_size, num_threads=1, capacity=32,
   `get_shape` method will have a first `Dimension` value of `None`, and
   operations that depend on fixed batch_size would fail.
 
-  Note: if `num_epochs` is not `None`, this function creates local counter
-  `epochs`. Use `local_variables_initializer()` to initialize local variables.
-
   Args:
     tensors: The list or dictionary of tensors to enqueue.
     batch_size: The new batch size pulled from the queue.
@@ -1181,9 +1178,6 @@ def shuffle_batch(tensors, batch_size, capacity, min_after_dequeue,
   `get_shape` method will have a first `Dimension` value of `None`, and
   operations that depend on fixed batch_size would fail.
 
-  Note: if `num_epochs` is not `None`, this function creates local counter
-  `epochs`. Use `local_variables_initializer()` to initialize local variables.
-
   Args:
     tensors: The list or dictionary of tensors to enqueue.
     batch_size: The new batch size pulled from the queue.
diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index fcec3ed97c..a891bae5f2 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -559,7 +559,7 @@ class MonitoredSession(_MonitoredSession):
 
   ```python
   saver_hook = CheckpointSaverHook(...)
-  summary_hook = SummaryHook(...)
+  summary_hook = SummarySaverHook(...)
   with MonitoredSession(session_creator=ChiefSessionCreator(...),
                         hooks=[saver_hook, summary_hook]) as sess:
     while not sess.should_stop():
@@ -648,7 +648,7 @@ class SingularMonitoredSession(_MonitoredSession):
   Example usage:
   ```python
   saver_hook = CheckpointSaverHook(...)
-  summary_hook = SummaryHook(...)
+  summary_hook = SummarySaverHook(...)
   with SingularMonitoredSession(hooks=[saver_hook, summary_hook]) as sess:
     while not sess.should_stop():
       sess.run(train_op)
diff --git a/tensorflow/python/training/saver.py b/tensorflow/python/training/saver.py
index 43b6174246..a65ab79495 100644
--- a/tensorflow/python/training/saver.py
+++ b/tensorflow/python/training/saver.py
@@ -935,11 +935,11 @@ def get_checkpoint_state(checkpoint_dir, latest_filename=None):
           ckpt.all_model_checkpoint_paths[i] = os.path.join(checkpoint_dir, p)
   except errors.OpError as e:
     # It's ok if the file cannot be read
-    logging.warning(str(e))
+    logging.warning("%s: %s", type(e).__name__, e)
     logging.warning("%s: Checkpoint ignored", coord_checkpoint_filename)
     return None
   except text_format.ParseError as e:
-    logging.warning(str(e))
+    logging.warning("%s: %s", type(e).__name__, e)
     logging.warning("%s: Checkpoint ignored", coord_checkpoint_filename)
     return None
   finally:
diff --git a/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc b/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
index 1bb90afd63..c1e72bb565 100644
--- a/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
+++ b/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
@@ -67,14 +67,6 @@ limitations under the License.
 extern bool FLAGS_check_gpu_leaks;
 bool FLAGS_prefer_cubin_to_ptx = true;
 
-namespace perftools {
-namespace gputools {
-namespace rng {
-class RngSupport;
-}  // namespace rng
-}  // namespace gputools
-}  // namespace perftools
-
 namespace perftools {
 namespace gputools {
 namespace cuda {
diff --git a/tensorflow/stream_executor/cuda/cuda_gpu_executor.h b/tensorflow/stream_executor/cuda/cuda_gpu_executor.h
index 9d386b5ed9..6c5b9dca90 100644
--- a/tensorflow/stream_executor/cuda/cuda_gpu_executor.h
+++ b/tensorflow/stream_executor/cuda/cuda_gpu_executor.h
@@ -35,17 +35,6 @@ limitations under the License.
 #include "tensorflow/stream_executor/platform/thread_annotations.h"
 #include "tensorflow/stream_executor/stream_executor_internal.h"
 
-namespace perftools {
-namespace gputools {
-namespace blas {
-class BlasSupport;
-}
-namespace internal {
-class RngSupport;
-}  // namespace internal
-}  // namespace gputools
-}  // namespace perftools
-
 namespace perftools {
 namespace gputools {
 namespace cuda {
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index a5181401fa..4ea627def7 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -227,6 +227,19 @@ class TensorboardServerTest(test.TestCase):
       response.read()
       connection.close()
 
+  def testScalars(self):
+    """Test the format of /data/scalars."""
+    data = self._getJson('/data/scalars?run=run1&tag=simple_values')
+    self.assertEqual(len(data), self._SCALAR_COUNT)
+
+  def testScalarsCsv(self):
+    """Test the csv format of /data/scalars."""
+    data = self._get(
+        '/data/scalars?run=run1&tag=simple_values&format=csv').read()
+    line_count = data.count('\n')
+    self.assertEqual(line_count,
+                     self._SCALAR_COUNT + 1)  # include 1 more line for header
+
   def testHistograms(self):
     """Test the format of /data/histograms."""
     self.assertEqual(
diff --git a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
index 3734e470b6..f7d424cb91 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_accumulator_test.py
@@ -225,6 +225,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertTagsEqual(x.Tags(), {})
 
   def testTags(self):
+    """Tags should be found in EventAccumulator after adding some events."""
     gen = _EventGenerator(self)
     gen.AddScalar('s1')
     gen.AddScalar('s2')
@@ -245,6 +246,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     })
 
   def testReload(self):
+    """EventAccumulator contains suitable tags after calling Reload."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     acc.Reload()
@@ -267,6 +269,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     })
 
   def testScalars(self):
+    """Tests whether EventAccumulator contains scalars after adding them."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     s1 = ea.ScalarEvent(wall_time=1, step=10, value=32)
@@ -293,6 +296,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
       self.assertEqual(expected_value, gotten_event.value[i])
 
   def testHealthPills(self):
+    """HealthPills should be properly inserted into EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     gen.AddHealthPill(13371337, 41, 'Add', 0, range(1, 13))
@@ -328,6 +332,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertItemsEqual(['Add', 'MatMul'], acc.GetOpsWithHealthPills())
 
   def testHistograms(self):
+    """Tests whether histograms are inserted into EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
 
@@ -377,6 +382,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.Histograms('hst2'), [hst2])
 
   def testCompressedHistograms(self):
+    """Tests compressed histograms inserted into EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen, compression_bps=(0, 2500, 5000, 7500, 10000))
 
@@ -428,6 +434,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.CompressedHistograms('hst2'), [expected_cmphst2])
 
   def testCompressedHistogramsWithEmptyHistogram(self):
+    """Tests that empty histograms compressed properly in EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen, compression_bps=(0, 2500, 5000, 7500, 10000))
 
@@ -481,6 +488,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertAlmostEqual(vals[8].value, 1.0)
 
   def testImages(self):
+    """Tests 2 images inserted/accessed in EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     im1 = ea.ImageEvent(
@@ -514,6 +522,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.Images('im2'), [im2])
 
   def testAudio(self):
+    """Tests 2 audio events inserted/accessed in EventAccumulator."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     snd1 = ea.AudioEvent(
@@ -551,6 +560,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
     self.assertEqual(acc.Audio('snd2'), [snd2])
 
   def testKeyError(self):
+    """KeyError should be raised when accessing non-existing keys."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     acc.Reload()
@@ -574,7 +584,7 @@ class MockingEventAccumulatorTest(EventAccumulatorTest):
       acc.Audio('hst1')
 
   def testNonValueEvents(self):
-    """Tests that non-value events in the generator don't cause early exits."""
+    """Non-value events in the generator don't cause early exits."""
     gen = _EventGenerator(self)
     acc = ea.EventAccumulator(gen)
     gen.AddScalar('s1', wall_time=1, step=10, value=20)
diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
index 8610940ac3..9f13cdfb47 100644
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ b/tensorflow/tensorboard/dist/tf-tensorboard.html
@@ -20112,7 +20112,7 @@ var TF;
           new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
           new TF.Dashboard.TfDistributionDashboard(backend),
           new TF.Dashboard.TfHistogramDashboard(backend),
-          new TF.Dashboard.VzProjectorDashboard('/data/plugin/projector'),
+          new TF.Dashboard.VzProjectorDashboard('data/plugin/projector'),
           new TF.Dashboard.TfTextDashboard(backend),
         ];
       },
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index ddffabd8cb..7baddf301c 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -1185,7 +1185,7 @@ def tf_version_info_genrule():
       ],
       outs=["util/version_info.cc"],
       cmd=
-      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      "$(PYTHON_BIN_PATH) $(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
       local=1,
       tools=[clean_dep("//tensorflow/tools/git:gen_git_source.py")],)
 
diff --git a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
index 6ca38e259b..78b10c44a2 100644
--- a/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.layers.pbtxt
@@ -32,6 +32,10 @@ tf_module {
     name: "conv3d"
     argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'dilation_rate\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1, 1)\', \'valid\', \'channels_last\', \'(1, 1, 1)\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
   }
+  member_method {
+    name: "conv3d_transpose"
+    argspec: "args=[\'inputs\', \'filters\', \'kernel_size\', \'strides\', \'padding\', \'data_format\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'(1, 1, 1)\', \'valid\', \'channels_last\', \'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
+  }
   member_method {
     name: "dense"
     argspec: "args=[\'inputs\', \'units\', \'activation\', \'use_bias\', \'kernel_initializer\', \'bias_initializer\', \'kernel_regularizer\', \'bias_regularizer\', \'activity_regularizer\', \'trainable\', \'name\', \'reuse\'], varargs=None, keywords=None, defaults=[\'None\', \'True\', \'None\', \'<tensorflow.python.ops.init_ops.Zeros object instance>\', \'None\', \'None\', \'None\', \'True\', \'None\', \'None\'], "
diff --git a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
index 192ceac2dd..3a448798b2 100644
--- a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
@@ -70,7 +70,7 @@ tf_module {
   }
   member_method {
     name: "conv3d_transpose"
-    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'None\', \'None\'], "
+    argspec: "args=[\'value\', \'filter\', \'output_shape\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'SAME\', \'NDHWC\', \'None\'], "
   }
   member_method {
     name: "convolution"
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index fb636d9525..046d82c2d5 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -636,6 +636,10 @@ tf_module {
     name: "atan"
     argspec: "args=[\'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
+  member_method {
+    name: "atan2"
+    argspec: "args=[\'y\', \'x\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "batch_to_space"
     argspec: "args=[\'input\', \'crops\', \'block_size\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
diff --git a/tensorflow/tools/ci_build/update_version.sh b/tensorflow/tools/ci_build/update_version.sh
index e0ca8c3259..682f5329f5 100755
--- a/tensorflow/tools/ci_build/update_version.sh
+++ b/tensorflow/tools/ci_build/update_version.sh
@@ -73,8 +73,11 @@ OLD_MAJOR=$(cat ${VERSION_H} | grep -E "^#define TF_MAJOR_VERSION [0-9]+" | \
 cut -d ' ' -f 3)
 OLD_MINOR=$(cat ${VERSION_H} | grep -E "^#define TF_MINOR_VERSION [0-9]+" | \
 cut -d ' ' -f 3)
-OLD_PATCH=$(cat ${VERSION_H} | grep -E "^#define TF_PATCH_VERSION [[:alnum:]-]+" | \
+OLD_PATCH_NUM=$(cat ${VERSION_H} | grep -E "^#define TF_PATCH_VERSION [[:alnum:]-]+" | \
 cut -d ' ' -f 3)
+OLD_EXTENSION=$(cat ${VERSION_H} | grep -E "^#define TF_VERSION_SUFFIX \"[[:alnum:]-]+\"" | \
+cut -d ' ' -f 3)
+OLD_PATCH="$OLD_PATCH_NUM${OLD_EXTENSION//\"}"
 OLD_PIP_PATCH="${OLD_PATCH//-}"
 
 sed -i -e "s/^#define TF_MAJOR_VERSION ${OLD_MAJOR}/#define TF_MAJOR_VERSION ${MAJOR}/g" ${VERSION_H}
diff --git a/tensorflow/tools/common/public_api.py b/tensorflow/tools/common/public_api.py
index 837f11f690..cab3b2ff6a 100644
--- a/tensorflow/tools/common/public_api.py
+++ b/tensorflow/tools/common/public_api.py
@@ -38,7 +38,7 @@ class PublicAPIVisitor(object):
     self._visitor = visitor
 
     # Modules/classes we do not want to descend into if we hit them. Usually,
-    # sytem modules exposed through platforms for compatibility reasons.
+    # system modules exposed through platforms for compatibility reasons.
     # Each entry maps a module path to a name to ignore in traversal.
     self._do_not_descend_map = {
         '': [
diff --git a/tensorflow/tools/compatibility/tf_upgrade.py b/tensorflow/tools/compatibility/tf_upgrade.py
index 80439f835a..9a4a8ff71d 100644
--- a/tensorflow/tools/compatibility/tf_upgrade.py
+++ b/tensorflow/tools/compatibility/tf_upgrade.py
@@ -34,6 +34,10 @@ class APIChangeSpec(object):
     # Maps from a function name to a dictionary that describes how to
     # map from an old argument keyword to the new argument keyword.
     self.function_keyword_renames = {
+        "tf.batch_matmul": {
+            "adj_x": "adjoint_a",
+            "adj_y": "adjoint_b",
+        },
         "tf.count_nonzero": {
             "reduction_indices": "axis"
         },
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index bfac54c601..a0e0f88d9d 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -92,7 +92,8 @@ WORKDIR /tensorflow
 ENV CI_BUILD_PYTHON python
 
 RUN tensorflow/tools/ci_build/builds/configured CPU \
-    bazel build -c opt tensorflow/tools/pip_package:build_pip_package && \
+    bazel build -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+        tensorflow/tools/pip_package:build_pip_package && \
     bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
     pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl && \
     rm -rf /tmp/pip && \
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 7726cbdfbf..743c05ef88 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -92,7 +92,8 @@ ENV TF_NEED_CUDA 1
 ENV TF_CUDA_COMPUTE_CAPABILITIES=3.0,3.5,5.2,6.0,6.1
 
 RUN tensorflow/tools/ci_build/builds/configured GPU \
-    bazel build -c opt --config=cuda tensorflow/tools/pip_package:build_pip_package && \
+    bazel build -c opt --config=cuda --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+        tensorflow/tools/pip_package:build_pip_package && \
     bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
     pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl && \
     rm -rf /tmp/pip && \
diff --git a/tensorflow/tools/docs/doc_generator_visitor.py b/tensorflow/tools/docs/doc_generator_visitor.py
index 119305bece..8f7b91fa75 100644
--- a/tensorflow/tools/docs/doc_generator_visitor.py
+++ b/tensorflow/tools/docs/doc_generator_visitor.py
@@ -170,7 +170,7 @@ class DocGeneratorVisitor(object):
     master names to a lexicographically sorted list of all aliases for that name
     (incl. the master name).
 
-    All these are computed and set as fields if they haven't aready.
+    All these are computed and set as fields if they haven't already.
     """
     if self._reverse_index is not None:
       return
diff --git a/tensorflow/tools/docs/pretty_docs.py b/tensorflow/tools/docs/pretty_docs.py
index 824f46170e..657d6bf849 100644
--- a/tensorflow/tools/docs/pretty_docs.py
+++ b/tensorflow/tools/docs/pretty_docs.py
@@ -230,7 +230,7 @@ def _build_signature(obj_info):
 
 
 def _build_compatibility(compatibility):
-  """Return the compatability section as an md string."""
+  """Return the compatibility section as an md string."""
   parts = []
   sorted_keys = sorted(compatibility.keys())
   for key in sorted_keys:
diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index c9f0a9b222..9bb438fa71 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -81,10 +81,10 @@ bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --out_graph=optimized_inception_graph.pb \
 --inputs='Mul:0' \
 --outputs='softmax:0' \
---transforms='\
-strip_unused_nodes(type=float, shape="1,299,299,3") \
-remove_nodes(op=Identity, op=CheckNumerics) \
-fold_old_batch_norms \
+--transforms='
+strip_unused_nodes(type=float, shape="1,299,299,3")
+remove_nodes(op=Identity, op=CheckNumerics)
+fold_old_batch_norms
 '
 ```
 
@@ -94,7 +94,10 @@ transforms to modify the graph with. The transforms are given as a list of
 names, and can each have arguments themselves. These transforms define the
 pipeline of modifications that are applied in order to produce the output.
 Sometimes you need some transforms to happen before others, and the ordering
-within the list lets you specify which happen first.
+within the list lets you specify which happen first. 
+Note that the optimization 
+`remove_nodes(op=Identity, op=CheckNumerics)` will break the model with control 
+flow operations, such as `tf.cond`, `tf.map_fn`, and `tf.while`.
 
 ## Inspecting Graphs
 
@@ -169,7 +172,7 @@ then you'll need to make local modifications to the build files to include the
 right .cc file that defines it. In a lot of cases the op is just a vestigial
 remnant from the training process though, and if that's true then you can run
 the [strip_unused_nodes](#strip_unused_nodes), specifying the inputs and outputs
-of your inference usage, to remove those unneccessary nodes:
+of your inference usage, to remove those unnecessary nodes:
 
 ```bash
 bazel build tensorflow/tools/graph_transforms:transform_graph
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index c17a7f7fb1..83be430e7d 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -68,6 +68,7 @@ py_binary(
         ":included_headers",
         "//tensorflow/contrib/nn:nn_py",
         "//tensorflow/contrib/session_bundle:session_bundle_pip",
+        "//tensorflow/contrib/signal:signal_py",
         "//tensorflow/contrib/slim/python/slim/data:data_pip",
         "//tensorflow/python:util_example_parser_configuration",
         "//tensorflow/python/debug:debug_pip",
@@ -141,6 +142,7 @@ sh_binary(
             "//tensorflow/contrib/ndlstm:ndlstm",
             "//tensorflow/contrib/nn:nn_py",
             "//tensorflow/contrib/session_bundle:session_bundle_pip",
+            "//tensorflow/contrib/signal:signal_py",
             "//tensorflow/contrib/slim:slim",
             "//tensorflow/contrib/slim/python/slim/data:data_pip",
             "//tensorflow/contrib/slim/python/slim/nets:nets_pip",
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 3ee99d5d31..f8982073c3 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -29,7 +29,7 @@ from setuptools.dist import Distribution
 # This version string is semver compatible, but incompatible with pip.
 # For pip, we will remove all '-' characters from this string, and use the
 # result for pip.
-_VERSION = '1.1.0-rc2'
+_VERSION = '1.1.0'
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.11.0',
diff --git a/tensorflow/tools/quantization/quantize_graph.py b/tensorflow/tools/quantization/quantize_graph.py
index d09349a79b..a0cfc352d4 100644
--- a/tensorflow/tools/quantization/quantize_graph.py
+++ b/tensorflow/tools/quantization/quantize_graph.py
@@ -453,7 +453,8 @@ class GraphRewriter(object):
 
   def round_nodes_recursively(self, current_node):
     """The entry point for simple rounding quantization."""
-    if self.already_visited[current_node.name]:
+    if (current_node.name in self.already_visited
+       ) and self.already_visited[current_node.name]:
       return
     self.already_visited[current_node.name] = True
     for input_node_name in current_node.input:
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index c83cdd45b6..540e179aae 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -30,7 +30,7 @@ statistics.
 
 tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
 
-### Examine the shapes and sizes of all trainiable Variables.
+### Examine the shapes and sizes of all trainable Variables.
 ```python
 # Print trainable variable parameter statistics to stdout.
 param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
@@ -439,7 +439,7 @@ with gfile.Open(os.path.join(output_dir, "run_meta"), "w") as f:
 <b>--op_log_path:</b>
 tensorflow::tfprof::OpLog. A proto used to provide extra op information
 for ops. By giving a group of ops a type name, users can easily aggregate the
-statistics for those ops without accidently missing or including extra ops.
+statistics for those ops without accidentally missing or including extra ops.
 tfprof exposes the following Python API to add op information and logging.
 
 ```python
diff --git a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
index cab533b9e7..242439daf4 100755
--- a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
+++ b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
@@ -227,7 +227,7 @@ def InvokeNvcc(argv, log=False):
 
   # TODO(zhengxq): for some reason, 'gcc' needs this help to find 'as'.
   # Need to investigate and fix.
-  cmd = 'PATH=' + PREFIX_DIR + ' ' + cmd
+  cmd = 'PATH=' + PREFIX_DIR + ':$PATH ' + cmd
   if log: Log(cmd)
   return os.system(cmd)
 
-- 
GitLab


From 3a6db4eadd7e9fed214966e7a0bd2265ea2d0eaf Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 09:11:35 -0800
Subject: [PATCH 1041/1563] Removing unnecessary lines from gitignore Change:
 155210210

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d8ecef1e1e..da5d14a9b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,11 +4,8 @@ node_modules
 /.bazelrc
 /.tf_configure.bazelrc
 /bazel-*
-/third_party/py/numpy/numpy_include
 /tools/python_bin_path.sh
 /tools/git/gen
-/util/python/python_include
-/util/python/python_lib
 /pip_test
 /_python_build
 *.pyc
-- 
GitLab


From 95cb6d0a3396b8274866f9692fc1231ae6edb7e6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 09:13:57 -0800
Subject: [PATCH 1042/1563] Go: Update generated wrapper functions for
 TensorFlow ops. Change: 155210529

---
 tensorflow/go/op/wrappers.go | 157 ++++++++++++++++++++---------------
 1 file changed, 89 insertions(+), 68 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index eb4789a182..e57c197fa4 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -5583,6 +5583,74 @@ func ReadFile(scope *Scope, filename tf.Output) (contents tf.Output) {
 	return op.Output(0)
 }
 
+// Store the input tensor in the state of the current session.
+//
+// Arguments:
+//	value: The tensor to be stored.
+//
+// Returns The handle for the tensor stored in the session state, represented
+// as a ResourceHandle object.
+func GetSessionHandleV2(scope *Scope, value tf.Output) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "GetSessionHandleV2",
+		Input: []tf.Input{
+			value,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Adjust the hue of one or more images.
+//
+// `images` is a tensor of at least 3 dimensions.  The last dimension is
+// interpretted as channels, and must be three.
+//
+// The input image is considered in the RGB colorspace. Conceptually, the RGB
+// colors are first mapped into HSV. A delta is then applied all the hue values,
+// and then remapped back to RGB colorspace.
+//
+// Arguments:
+//	images: Images to adjust.  At least 3-D.
+//	delta: A float delta to add to the hue.
+//
+// Returns The hue-adjusted image or images.
+func AdjustHue(scope *Scope, images tf.Output, delta tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "AdjustHue",
+		Input: []tf.Input{
+			images, delta,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Restore a Reader to its initial clean state.
+//
+// Arguments:
+//	reader_handle: Handle to a Reader.
+//
+// Returns the created operation.
+func ReaderResetV2(scope *Scope, reader_handle tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "ReaderResetV2",
+		Input: []tf.Input{
+			reader_handle,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
 // Computes softmax cross entropy cost and gradients to backpropagate.
 //
 // Unlike `SoftmaxCrossEntropyWithLogits`, this operation does not accept
@@ -19039,6 +19107,27 @@ func Igamma(scope *Scope, a tf.Output, x tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
+// Computes arctangent of `y/x` element-wise, respecting signs of the arguments.
+//
+// This is the angle \( \theta \in [-\pi, \pi] \) such that
+// \[ x = r \cos(\theta) \]
+// and
+// \[ y = r \sin(\theta) \]
+// where \(r = \sqrt(x^2 + y^2) \).
+func Atan2(scope *Scope, y tf.Output, x tf.Output) (z tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Atan2",
+		Input: []tf.Input{
+			y, x,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Compute the regularized incomplete beta integral \\(I_x(a, b)\\).
 //
 // The regularized incomplete beta integral is defined as:
@@ -21627,71 +21716,3 @@ func SoftmaxCrossEntropyWithLogits(scope *Scope, features tf.Output, labels tf.O
 	op := scope.AddOperation(opspec)
 	return op.Output(0), op.Output(1)
 }
-
-// Store the input tensor in the state of the current session.
-//
-// Arguments:
-//	value: The tensor to be stored.
-//
-// Returns The handle for the tensor stored in the session state, represented
-// as a ResourceHandle object.
-func GetSessionHandleV2(scope *Scope, value tf.Output) (handle tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "GetSessionHandleV2",
-		Input: []tf.Input{
-			value,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Adjust the hue of one or more images.
-//
-// `images` is a tensor of at least 3 dimensions.  The last dimension is
-// interpretted as channels, and must be three.
-//
-// The input image is considered in the RGB colorspace. Conceptually, the RGB
-// colors are first mapped into HSV. A delta is then applied all the hue values,
-// and then remapped back to RGB colorspace.
-//
-// Arguments:
-//	images: Images to adjust.  At least 3-D.
-//	delta: A float delta to add to the hue.
-//
-// Returns The hue-adjusted image or images.
-func AdjustHue(scope *Scope, images tf.Output, delta tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "AdjustHue",
-		Input: []tf.Input{
-			images, delta,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
-// Restore a Reader to its initial clean state.
-//
-// Arguments:
-//	reader_handle: Handle to a Reader.
-//
-// Returns the created operation.
-func ReaderResetV2(scope *Scope, reader_handle tf.Output) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "ReaderResetV2",
-		Input: []tf.Input{
-			reader_handle,
-		},
-	}
-	return scope.AddOperation(opspec)
-}
-- 
GitLab


From f3f05c8fd6ab935a614337af033f413e262db301 Mon Sep 17 00:00:00 2001
From: Eric Liu <ioeric@google.com>
Date: Fri, 5 May 2017 09:26:00 -0800
Subject: [PATCH 1043/1563] [XLA] Remove useless log message when dumping HLO
 GraphDef.

This produces too much output that is not helpful.
Change: 155212076
---
 tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
index da07dea123..2b14eca5d1 100644
--- a/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
+++ b/tensorflow/compiler/xla/service/hlo_tfgraph_builder.cc
@@ -68,9 +68,8 @@ void CleanNodeName(string* name) {
 }
 
 Status HloTfGraphBuilder::AddComputation(const HloComputation& computation) {
-  LOG(INFO) << "Adding computation " << computation.name();
+  VLOG(2) << "Adding computation " << computation.name();
   for (auto embedded : computation.MakeEmbeddedComputationsList()) {
-    LOG(INFO) << "Adding embedded computation " << embedded->name();
     for (auto& instruction : embedded->instructions()) {
       TF_RETURN_IF_ERROR(AddInstruction(instruction.get()));
     }
-- 
GitLab


From ce1a5674362bf7ff42d323eb21667ceeee6c99b4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 09:48:11 -0800
Subject: [PATCH 1044/1563] Update ops-related pbtxt files. Change: 155214850

---
 .../core/ops/compat/ops_history.v1.pbtxt      | 25 +++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 27 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 8856a0faaf..bc40715acc 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -1716,6 +1716,31 @@ op {
     }
   }
 }
+op {
+  name: "Atan2"
+  input_arg {
+    name: "y"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "x"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "z"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+}
 op {
   name: "AudioSpectrogram"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index b452ab7ef5..dd0a339609 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -1904,6 +1904,33 @@ op {
   }
   summary: "Computes atan of x element-wise."
 }
+op {
+  name: "Atan2"
+  input_arg {
+    name: "y"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "x"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "z"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+      }
+    }
+  }
+  summary: "Computes arctangent of `y/x` element-wise, respecting signs of the arguments."
+  description: "This is the angle \\( \\theta \\in [-\\pi, \\pi] \\) such that\n\\[ x = r \\cos(\\theta) \\]\nand\n\\[ y = r \\sin(\\theta) \\]\nwhere \\(r = \\sqrt(x^2 + y^2) \\)."
+}
 op {
   name: "AudioSpectrogram"
   input_arg {
-- 
GitLab


From a827ef5727ffc64f4f3ad48eda01abd241909d13 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Fri, 5 May 2017 10:07:37 -0800
Subject: [PATCH 1045/1563] Added cross compatibility to contrib feature
 columns: sparse_column_with_*, weighted_sparse_column, one_hot_column,
 embedding_column Change: 155217545

---
 .../layers/python/layers/feature_column.py    | 314 ++++++++++++++----
 .../python/layers/feature_column_ops.py       | 140 +-------
 .../python/layers/feature_column_ops_test.py  |  51 ++-
 3 files changed, 319 insertions(+), 186 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 04fe2370d1..95a4b032b0 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -131,21 +131,27 @@ import math
 import six
 
 from tensorflow.contrib import lookup
+from tensorflow.contrib.framework.python.framework import checkpoint_utils
 from tensorflow.contrib.framework.python.framework import experimental
+from tensorflow.contrib.framework.python.ops import variables as contrib_variables
+from tensorflow.contrib.layers.python.layers import embedding_ops
 from tensorflow.contrib.layers.python.layers import layers
 from tensorflow.contrib.layers.python.ops import bucketization_op
 from tensorflow.contrib.layers.python.ops import sparse_feature_cross_op
 from tensorflow.contrib.layers.python.ops import sparse_ops as contrib_sparse_ops
 from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor as sparse_tensor_py
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import string_ops
+from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import deprecation
 
@@ -291,11 +297,13 @@ class _FeatureColumn(object):
 
 
 # TODO(b/30410315): Support warm starting in all feature columns.
-class _SparseColumn(_FeatureColumn,
-                    collections.namedtuple("_SparseColumn",
-                                           ["column_name", "is_integerized",
-                                            "bucket_size", "lookup_config",
-                                            "combiner", "dtype"])):
+class _SparseColumn(
+    _FeatureColumn,
+    fc_core._CategoricalColumn,  # pylint: disable=protected-access
+    collections.namedtuple("_SparseColumn", [
+        "column_name", "is_integerized", "bucket_size", "lookup_config",
+        "combiner", "dtype"
+    ])):
   """Represents a sparse feature column also known as categorical features.
 
   Instances of this class are immutable. A sparse column means features are
@@ -426,9 +434,8 @@ class _SparseColumn(_FeatureColumn,
         initializer=init_ops.zeros_initializer(),
         combiner=self.combiner)
 
-  def _get_input_sparse_tensor(self, columns_to_tensors):
-    """Looks up the input tensor for transformation and sparsify it if dense."""
-    input_tensor = columns_to_tensors[self.name]
+  def _get_input_sparse_tensor(self, input_tensor):
+    """sparsify input_tensor if dense."""
     if not isinstance(input_tensor, sparse_tensor_py.SparseTensor):
       # To avoid making any assumptions about which values are to be ignored,
       # we set ignore_value to -1 for numeric tensors to avoid excluding valid
@@ -455,18 +462,44 @@ class _SparseColumn(_FeatureColumn,
                    format(self.name, other_column.name))
     return compatible
 
-
-class _SparseColumnIntegerized(_SparseColumn):
-  """See `sparse_column_with_integerized_feature`."""
+  @abc.abstractmethod
+  def _do_transform(self, input_tensor):
+    pass
 
   def insert_transformed_feature(self, columns_to_tensors):
     """Handles sparse column to id conversion."""
-    input_tensor = self._get_input_sparse_tensor(columns_to_tensors)
+    input_tensor = self._get_input_sparse_tensor(columns_to_tensors[self.name])
+    columns_to_tensors[self] = self._do_transform(input_tensor)
+
+  def _transform_feature(self, inputs):
+    input_tensor = self._get_input_sparse_tensor(inputs.get(self.name))
+    return self._do_transform(input_tensor)
 
+  @property
+  def _parse_example_config(self):
+    return self.config
+
+  @property
+  def _num_buckets(self):
+    return self.length
+
+  def _get_sparse_tensors(self, inputs, weight_collections=None,
+                          trainable=None):
+    del weight_collections
+    del trainable
+    input_tensor = inputs.get(self)
+    return fc_core._CategoricalColumn.IdWeightPair(  # pylint: disable=protected-access
+        self.id_tensor(input_tensor), self.weight_tensor(input_tensor))
+
+
+class _SparseColumnIntegerized(_SparseColumn):
+  """See `sparse_column_with_integerized_feature`."""
+
+  def _do_transform(self, input_tensor):
     sparse_id_values = math_ops.mod(input_tensor.values, self.bucket_size,
                                     name="mod")
-    columns_to_tensors[self] = sparse_tensor_py.SparseTensor(
-        input_tensor.indices, sparse_id_values, input_tensor.dense_shape)
+    return sparse_tensor_py.SparseTensor(input_tensor.indices, sparse_id_values,
+                                         input_tensor.dense_shape)
 
 
 def sparse_column_with_integerized_feature(column_name,
@@ -517,10 +550,7 @@ def sparse_column_with_integerized_feature(column_name,
 class _SparseColumnHashed(_SparseColumn):
   """See `sparse_column_with_hash_bucket`."""
 
-  def insert_transformed_feature(self, columns_to_tensors):
-    """Handles sparse column to id conversion."""
-    input_tensor = self._get_input_sparse_tensor(columns_to_tensors)
-
+  def _do_transform(self, input_tensor):
     if self.dtype.is_integer:
       sparse_values = string_ops.as_string(input_tensor.values)
     else:
@@ -528,8 +558,8 @@ class _SparseColumnHashed(_SparseColumn):
 
     sparse_id_values = string_ops.string_to_hash_bucket_fast(
         sparse_values, self.bucket_size, name="lookup")
-    columns_to_tensors[self] = sparse_tensor_py.SparseTensor(
-        input_tensor.indices, sparse_id_values, input_tensor.dense_shape)
+    return sparse_tensor_py.SparseTensor(input_tensor.indices, sparse_id_values,
+                                         input_tensor.dense_shape)
 
 
 def sparse_column_with_hash_bucket(column_name,
@@ -572,16 +602,13 @@ def sparse_column_with_hash_bucket(column_name,
 class _SparseColumnKeys(_SparseColumn):
   """See `sparse_column_with_keys`."""
 
-  def insert_transformed_feature(self, columns_to_tensors):
-    """Handles sparse column to id conversion."""
-    input_tensor = self._get_input_sparse_tensor(columns_to_tensors)
-
+  def _do_transform(self, input_tensor):
     table = lookup.index_table_from_tensor(
         mapping=tuple(self.lookup_config.keys),
         default_value=self.lookup_config.default_value,
         dtype=self.dtype,
         name="lookup")
-    columns_to_tensors[self] = table.lookup(input_tensor)
+    return table.lookup(input_tensor)
 
 
 def sparse_column_with_keys(
@@ -621,9 +648,7 @@ def sparse_column_with_keys(
 class _SparseColumnVocabulary(_SparseColumn):
   """See `sparse_column_with_vocabulary_file`."""
 
-  def insert_transformed_feature(self, columns_to_tensors):
-    """Handles sparse column to id conversion."""
-    st = self._get_input_sparse_tensor(columns_to_tensors)
+  def _do_transform(self, st):
     if self.dtype.is_integer:
       sparse_string_values = string_ops.as_string(st.values)
       sparse_string_tensor = sparse_tensor_py.SparseTensor(st.indices,
@@ -638,7 +663,7 @@ class _SparseColumnVocabulary(_SparseColumn):
         vocab_size=self.lookup_config.vocab_size,
         default_value=self.lookup_config.default_value,
         name=self.name + "_lookup")
-    columns_to_tensors[self] = table.lookup(sparse_string_tensor)
+    return table.lookup(sparse_string_tensor)
 
 
 def sparse_column_with_vocabulary_file(column_name,
@@ -694,9 +719,12 @@ def sparse_column_with_vocabulary_file(column_name,
       dtype=dtype)
 
 
-class _WeightedSparseColumn(_FeatureColumn, collections.namedtuple(
-    "_WeightedSparseColumn",
-    ["sparse_id_column", "weight_column_name", "dtype"])):
+class _WeightedSparseColumn(
+    _FeatureColumn,
+    fc_core._CategoricalColumn,  # pylint: disable=protected-access
+    collections.namedtuple("_WeightedSparseColumn",
+                           ["sparse_id_column", "weight_column_name",
+                            "dtype"])):
   """See `weighted_sparse_column`."""
 
   def __new__(cls, sparse_id_column, weight_column_name, dtype):
@@ -725,22 +753,6 @@ class _WeightedSparseColumn(_FeatureColumn, collections.namedtuple(
     """Returns a string which will be used as a key when we do sorting."""
     return "{}".format(self)
 
-  def insert_transformed_feature(self, columns_to_tensors):
-    """Inserts a tuple with the id and weight tensors."""
-    if self.sparse_id_column not in columns_to_tensors:
-      self.sparse_id_column.insert_transformed_feature(columns_to_tensors)
-
-    weight_tensor = columns_to_tensors[self.weight_column_name]
-    if not isinstance(weight_tensor, sparse_tensor_py.SparseTensor):
-      # The weight tensor can be a regular Tensor. In such case, sparsify it.
-      weight_tensor = contrib_sparse_ops.dense_to_sparse_tensor(weight_tensor)
-    if not self.dtype.is_floating:
-      weight_tensor = math_ops.to_float(weight_tensor)
-    columns_to_tensors[self] = tuple([
-        columns_to_tensors[self.sparse_id_column],
-        weight_tensor
-    ])
-
   def id_tensor(self, input_tensor):
     """Returns the id tensor from the given transformed input_tensor."""
     return input_tensor[0]
@@ -768,6 +780,43 @@ class _WeightedSparseColumn(_FeatureColumn, collections.namedtuple(
         initializer=init_ops.zeros_initializer(),
         combiner=self.sparse_id_column.combiner)
 
+  def _do_transform(self, id_tensor, weight_tensor):
+    if not isinstance(weight_tensor, sparse_tensor_py.SparseTensor):
+      # The weight tensor can be a regular Tensor. In such case, sparsify it.
+      weight_tensor = contrib_sparse_ops.dense_to_sparse_tensor(weight_tensor)
+    if not self.dtype.is_floating:
+      weight_tensor = math_ops.to_float(weight_tensor)
+    return tuple([id_tensor, weight_tensor])
+
+  def insert_transformed_feature(self, columns_to_tensors):
+    """Inserts a tuple with the id and weight tensors."""
+    if self.sparse_id_column not in columns_to_tensors:
+      self.sparse_id_column.insert_transformed_feature(columns_to_tensors)
+
+    weight_tensor = columns_to_tensors[self.weight_column_name]
+    columns_to_tensors[self] = self._do_transform(
+        columns_to_tensors[self.sparse_id_column], weight_tensor)
+
+  def _transform_feature(self, inputs):
+    return self._do_transform(
+        inputs.get(self.sparse_id_column), inputs.get(self.weight_column_name))
+
+  @property
+  def _parse_example_config(self):
+    return self.config
+
+  @property
+  def _num_buckets(self):
+    return self.length
+
+  def _get_sparse_tensors(self, inputs, weight_collections=None,
+                          trainable=None):
+    del weight_collections
+    del trainable
+    input_tensor = inputs.get(self)
+    return fc_core._CategoricalColumn.IdWeightPair(  # pylint: disable=protected-access
+        self.id_tensor(input_tensor), self.weight_tensor(input_tensor))
+
 
 def weighted_sparse_column(sparse_id_column,
                            weight_column_name,
@@ -815,9 +864,10 @@ def weighted_sparse_column(sparse_id_column,
   return _WeightedSparseColumn(sparse_id_column, weight_column_name, dtype)
 
 
-class _OneHotColumn(_FeatureColumn,
-                    collections.namedtuple("_OneHotColumn",
-                                           ["sparse_id_column"])):
+class _OneHotColumn(
+    _FeatureColumn,
+    fc_core._DenseColumn,  # pylint: disable=protected-access
+    collections.namedtuple("_OneHotColumn", ["sparse_id_column"])):
   """Represents a one-hot column for use in deep networks.
 
   Args:
@@ -897,12 +947,31 @@ class _OneHotColumn(_FeatureColumn,
     return math_ops.reduce_sum(
         one_hot_id_tensor, reduction_indices=[output_rank - 1])
 
+  @property
+  def _variable_shape(self):
+    return tensor_shape.TensorShape((self.length))
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    del weight_collections
+    del trainable
+    return inputs.get(self)
+
+  def _transform_feature(self, inputs):
+    return self._to_dnn_input_layer(inputs.get(self.sparse_id_column))
+
+  @property
+  def _parse_example_config(self):
+    return self.config
+
 
-class _EmbeddingColumn(_FeatureColumn, collections.namedtuple(
-    "_EmbeddingColumn",
-    ["sparse_id_column", "dimension", "combiner", "initializer",
-     "ckpt_to_load_from", "tensor_name_in_ckpt", "shared_embedding_name",
-     "shared_vocab_size", "max_norm", "trainable"])):
+class _EmbeddingColumn(
+    _FeatureColumn,
+    fc_core._DenseColumn,  # pylint: disable=protected-access
+    collections.namedtuple("_EmbeddingColumn", [
+        "sparse_id_column", "dimension", "combiner", "initializer",
+        "ckpt_to_load_from", "tensor_name_in_ckpt", "shared_embedding_name",
+        "shared_vocab_size", "max_norm", "trainable"
+    ])):
   """Represents an embedding column.
 
   Args:
@@ -1027,6 +1096,139 @@ class _EmbeddingColumn(_FeatureColumn, collections.namedtuple(
     raise ValueError("Column {} is not supported in linear models. "
                      "Please use sparse_column.".format(self))
 
+  @property
+  def _variable_shape(self):
+    return tensor_shape.TensorShape((self.dimension))
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    return _embeddings_from_arguments(
+        self,
+        self._deep_embedding_lookup_arguments(inputs.get(self)),
+        weight_collections, trainable)
+
+  def _transform_feature(self, inputs):
+    return inputs.get(self.sparse_id_column)
+
+  @property
+  def _parse_example_config(self):
+    return self.config
+
+
+def _is_variable(v):
+  """Returns true if `v` is a variable."""
+  return isinstance(v, (variables.Variable,
+                        resource_variable_ops.ResourceVariable))
+
+
+def _embeddings_from_arguments(column,
+                               args,
+                               weight_collections,
+                               trainable,
+                               output_rank=2):
+  """Returns embeddings for a column based on the computed arguments.
+
+  Args:
+   column: the column name.
+   args: the _DeepEmbeddingLookupArguments for this column.
+   weight_collections: collections to store weights in.
+   trainable: whether these embeddings should be trainable.
+   output_rank: the desired rank of the returned `Tensor`. Inner dimensions will
+     be combined to produce the desired rank.
+
+  Returns:
+   the embeddings.
+
+  Raises:
+   ValueError: if not possible to create.
+  """
+  # pylint: disable=protected-access
+  input_tensor = layers._inner_flatten(args.input_tensor, output_rank)
+  weight_tensor = None
+  if args.weight_tensor is not None:
+    weight_tensor = layers._inner_flatten(args.weight_tensor, output_rank)
+  # pylint: enable=protected-access
+
+  # This option is only enabled for scattered_embedding_column.
+  if args.hash_key:
+    embeddings = contrib_variables.model_variable(
+        name="weights",
+        shape=[args.vocab_size],
+        dtype=dtypes.float32,
+        initializer=args.initializer,
+        trainable=(trainable and args.trainable),
+        collections=weight_collections)
+
+    return embedding_ops.scattered_embedding_lookup_sparse(
+        embeddings,
+        input_tensor,
+        args.dimension,
+        hash_key=args.hash_key,
+        combiner=args.combiner,
+        name="lookup")
+
+  if args.shared_embedding_name is not None:
+    shared_embedding_collection_name = (
+        "SHARED_EMBEDDING_COLLECTION_" + args.shared_embedding_name.upper())
+    graph = ops.get_default_graph()
+    shared_embedding_collection = (
+        graph.get_collection_ref(shared_embedding_collection_name))
+    shape = [args.vocab_size, args.dimension]
+    if shared_embedding_collection:
+      if len(shared_embedding_collection) > 1:
+        raise ValueError(
+            "Collection %s can only contain one "
+            "(partitioned) variable." % shared_embedding_collection_name)
+      else:
+        embeddings = shared_embedding_collection[0]
+        if embeddings.get_shape() != shape:
+          raise ValueError(
+              "The embedding variable with name {} already "
+              "exists, but its shape does not match required "
+              "embedding shape  here. Please make sure to use "
+              "different shared_embedding_name for different "
+              "shared embeddings.".format(args.shared_embedding_name))
+    else:
+      embeddings = contrib_variables.model_variable(
+          name=args.shared_embedding_name,
+          shape=shape,
+          dtype=dtypes.float32,
+          initializer=args.initializer,
+          trainable=(trainable and args.trainable),
+          collections=weight_collections)
+      graph.add_to_collection(shared_embedding_collection_name, embeddings)
+  else:
+    embeddings = contrib_variables.model_variable(
+        name="weights",
+        shape=[args.vocab_size, args.dimension],
+        dtype=dtypes.float32,
+        initializer=args.initializer,
+        trainable=(trainable and args.trainable),
+        collections=weight_collections)
+
+  if _is_variable(embeddings):
+    embeddings = [embeddings]
+  else:
+    embeddings = embeddings._get_variable_list()  # pylint: disable=protected-access
+  # pylint: disable=protected-access
+  _maybe_restore_from_checkpoint(column._checkpoint_path(), embeddings)
+  return embedding_ops.safe_embedding_lookup_sparse(
+      embeddings,
+      input_tensor,
+      sparse_weights=weight_tensor,
+      combiner=args.combiner,
+      name=column.name + "weights",
+      max_norm=args.max_norm)
+
+
+def _maybe_restore_from_checkpoint(checkpoint_path, variable):
+  if checkpoint_path is not None:
+    path, tensor_name = checkpoint_path
+    weights_to_restore = variable
+    if len(variable) == 1:
+      weights_to_restore = variable[0]
+    checkpoint_utils.init_from_checkpoint(path,
+                                          {tensor_name: weights_to_restore})
+
 
 def one_hot_column(sparse_id_column):
   """Creates an `_OneHotColumn` for a one-hot or multi-hot repr in a DNN.
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops.py b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
index 31aca87002..d010ae6df1 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import functools
 
-from tensorflow.contrib.framework.python.framework import checkpoint_utils
 from tensorflow.contrib.framework.python.framework import experimental
 from tensorflow.contrib.framework.python.ops import variables as contrib_variables
 from tensorflow.contrib.layers.python.layers import embedding_ops
@@ -34,118 +33,12 @@ from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import parsing_ops
-from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import sparse_ops
 from tensorflow.python.ops import variable_scope
-from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import nest
 
 
-def _is_variable(v):
-  """Returns true if `v` is a variable."""
-  return isinstance(v, (variables.Variable,
-                        resource_variable_ops.ResourceVariable))
-
-
-def _embeddings_from_arguments(column,
-                               args,
-                               weight_collections,
-                               trainable,
-                               output_rank=2):
-  """Returns embeddings for a column based on the computed arguments.
-
-  Args:
-   column: the column name.
-   args: the _DeepEmbeddingLookupArguments for this column.
-   weight_collections: collections to store weights in.
-   trainable: whether these embeddings should be trainable.
-   output_rank: the desired rank of the returned `Tensor`. Inner dimensions will
-     be combined to produce the desired rank.
-
-  Returns:
-   the embeddings.
-
-  Raises:
-   ValueError: if not possible to create.
-  """
-  # pylint: disable=protected-access
-  input_tensor = layers._inner_flatten(args.input_tensor, output_rank)
-  weight_tensor = None
-  if args.weight_tensor is not None:
-    weight_tensor = layers._inner_flatten(args.weight_tensor, output_rank)
-  # pylint: enable=protected-access
-
-  # This option is only enabled for scattered_embedding_column.
-  if args.hash_key:
-    embeddings = contrib_variables.model_variable(
-        name='weights',
-        shape=[args.vocab_size],
-        dtype=dtypes.float32,
-        initializer=args.initializer,
-        trainable=(trainable and args.trainable),
-        collections=weight_collections)
-
-    return embedding_ops.scattered_embedding_lookup_sparse(
-        embeddings, input_tensor, args.dimension,
-        hash_key=args.hash_key,
-        combiner=args.combiner, name='lookup')
-
-  if args.shared_embedding_name is not None:
-    shared_embedding_collection_name = (
-        'SHARED_EMBEDDING_COLLECTION_' + args.shared_embedding_name.upper())
-    graph = ops.get_default_graph()
-    shared_embedding_collection = (
-        graph.get_collection_ref(shared_embedding_collection_name))
-    shape = [args.vocab_size, args.dimension]
-    if shared_embedding_collection:
-      if len(shared_embedding_collection) > 1:
-        raise ValueError('Collection %s can only contain one '
-                         '(partitioned) variable.'
-                         % shared_embedding_collection_name)
-      else:
-        embeddings = shared_embedding_collection[0]
-        if embeddings.get_shape() != shape:
-          raise ValueError('The embedding variable with name {} already '
-                           'exists, but its shape does not match required '
-                           'embedding shape  here. Please make sure to use '
-                           'different shared_embedding_name for different '
-                           'shared embeddings.'.format(
-                               args.shared_embedding_name))
-    else:
-      embeddings = contrib_variables.model_variable(
-          name=args.shared_embedding_name,
-          shape=shape,
-          dtype=dtypes.float32,
-          initializer=args.initializer,
-          trainable=(trainable and args.trainable),
-          collections=weight_collections)
-      graph.add_to_collection(shared_embedding_collection_name, embeddings)
-  else:
-    embeddings = contrib_variables.model_variable(
-        name='weights',
-        shape=[args.vocab_size, args.dimension],
-        dtype=dtypes.float32,
-        initializer=args.initializer,
-        trainable=(trainable and args.trainable),
-        collections=weight_collections)
-
-  if _is_variable(embeddings):
-    embeddings = [embeddings]
-  else:
-    embeddings = embeddings._get_variable_list()  # pylint: disable=protected-access
-  # pylint: disable=protected-access
-  _maybe_restore_from_checkpoint(
-      column._checkpoint_path(), embeddings)
-  return embedding_ops.safe_embedding_lookup_sparse(
-      embeddings,
-      input_tensor,
-      sparse_weights=weight_tensor,
-      combiner=args.combiner,
-      name=column.name + 'weights',
-      max_norm=args.max_norm)
-
-
 def _maybe_reshape_input_tensor(tensor, column_name, output_rank):
   """Reshape the input tensor by the following rule.
 
@@ -232,12 +125,13 @@ def _input_from_feature_columns(columns_to_tensors,
           # pylint: disable=protected-access
           arguments = column._deep_embedding_lookup_arguments(
               transformed_tensor)
-          output_tensors.append(_embeddings_from_arguments(
-              column,
-              arguments,
-              weight_collections,
-              trainable,
-              output_rank=output_rank))
+          output_tensors.append(
+              fc._embeddings_from_arguments(  # pylint: disable=protected-access
+                  column,
+                  arguments,
+                  weight_collections,
+                  trainable,
+                  output_rank=output_rank))
 
         except NotImplementedError as ee:
           try:
@@ -393,7 +287,7 @@ def _create_embedding_lookup(column,
         initializer=embedding_lookup_arguments.initializer,
         trainable=trainable,
         collections=weight_collections)
-    if _is_variable(variable):
+    if fc._is_variable(variable):  # pylint: disable=protected-access
       variable = [variable]
     else:
       variable = variable._get_variable_list()  # pylint: disable=protected-access
@@ -406,16 +300,6 @@ def _create_embedding_lookup(column,
     return variable, predictions
 
 
-def _maybe_restore_from_checkpoint(checkpoint_path, variable):
-  if checkpoint_path is not None:
-    path, tensor_name = checkpoint_path
-    weights_to_restore = variable
-    if len(variable) == 1:
-      weights_to_restore = variable[0]
-    checkpoint_utils.init_from_checkpoint(path,
-                                          {tensor_name: weights_to_restore})
-
-
 def _create_joint_embedding_lookup(columns_to_tensors,
                                    embedding_lookup_arguments,
                                    num_outputs,
@@ -451,7 +335,7 @@ def _create_joint_embedding_lookup(columns_to_tensors,
         initializer=init_ops.zeros_initializer(),
         trainable=trainable,
         collections=weight_collections)
-    if _is_variable(variable):
+    if fc._is_variable(variable):  # pylint: disable=protected-access
       variable = [variable]
     else:
       variable = variable._get_variable_list()  # pylint: disable=protected-access
@@ -634,7 +518,7 @@ def weighted_sum_from_feature_columns(columns_to_tensors,
           predictions, shape=(-1, num_outputs)))
       column_to_variable[column] = variable
       _log_variable(variable)
-      _maybe_restore_from_checkpoint(column._checkpoint_path(), variable)
+      fc._maybe_restore_from_checkpoint(column._checkpoint_path(), variable)  # pylint: disable=protected-access
     # pylint: enable=protected-access
     predictions_no_bias = math_ops.add_n(output_tensors)
     bias = contrib_variables.model_variable(
@@ -827,10 +711,10 @@ def parse_feature_columns_from_sequence_examples(
 def _log_variable(variable):
   if isinstance(variable, list):
     for var in variable:
-      if _is_variable(variable):
+      if fc._is_variable(variable):  # pylint: disable=protected-access
         logging.info('Created variable %s, with device=%s', var.name,
                      var.device)
-  elif _is_variable(variable):
+  elif fc._is_variable(variable):  # pylint: disable=protected-access
     logging.info('Created variable %s, with device=%s', variable.name,
                  variable.device)
 
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index a09cc53571..0123921266 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -597,12 +597,15 @@ class CreateInputLayersForDNNsTest(test.TestCase):
         "income":
             constant_op.constant([[20.3, 10], [110.3, 0.4], [-3.0, 30.4]]),
     }
-    output = feature_column_ops.input_from_feature_columns(features, [
-        one_hot_column, embedding_column, real_valued_column])
+    columns = [one_hot_column, embedding_column, real_valued_column]
+    output = feature_column_ops.input_from_feature_columns(features, columns)
+    output_core = fc_core.make_input_layer(features, columns)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual(output.eval().shape, [3, 2 + 4 + 10])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval().shape, output_core.eval().shape)
 
   def testRealValuedColumn(self):
     real_valued = feature_column.real_valued_column("price")
@@ -712,11 +715,14 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     one_hot_column = feature_column.one_hot_column(weighted_ids_column)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_column])
+    output_core = fc_core.make_input_layer(features, [one_hot_column])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual([[0, 0, 10., 0], [0, 20., 0, 0], [30., 0, 40., 0]],
                           output.eval())
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval(), output_core.eval())
 
   def testOneHotColumnFromSparseColumnWithKeysSucceedsForDNN(self):
     ids_column = feature_column.sparse_column_with_keys(
@@ -729,12 +735,15 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     features = {"ids": ids_tensor}
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
+    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual([[0, 0, 1, 0], [0, 1, 0, 0], [1, 0, 0, 0]],
                           output.eval())
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval(), output_core.eval())
 
   def testOneHotColumnFromMultivalentSparseColumnWithKeysSucceedsForDNN(self):
     ids_column = feature_column.sparse_column_with_keys(
@@ -747,12 +756,15 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     features = {"ids": ids_tensor}
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
+    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual([[0, 0, 1, 0], [0, 1, 0, 0], [1, 0, 1, 0]],
                           output.eval())
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval(), output_core.eval())
 
   def testOneHotColumnFromSparseColumnWithIntegerizedFeaturePassesForDNN(self):
     ids_column = feature_column.sparse_column_with_integerized_feature(
@@ -767,10 +779,13 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     }
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
+    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual([[0, 0, 1, 0], [0, 1, 0, 0], [1, 0, 1, 0]],
                           output.eval())
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval(), output_core.eval())
 
   def testOneHotColumnFromSparseColumnWithHashBucketSucceedsForDNN(self):
     hashed_sparse = feature_column.sparse_column_with_hash_bucket("feat", 10)
@@ -782,10 +797,13 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     one_hot_sparse = feature_column.one_hot_column(hashed_sparse)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
+    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual([3, 10], output.eval().shape)
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval(), output_core.eval())
 
   def testEmbeddingColumnSucceedsForDNN(self):
     hashed_sparse = feature_column.sparse_column_with_hash_bucket("wire", 10)
@@ -797,9 +815,12 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     embeded_sparse = feature_column.embedding_column(hashed_sparse, 10)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [embeded_sparse])
+    output_core = fc_core.make_input_layer(features, [embeded_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(output.eval().shape, [4, 10])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval().shape, output_core.eval().shape)
 
   def testScatteredEmbeddingColumnSucceedsForDNN(self):
     wire_tensor = sparse_tensor.SparseTensor(
@@ -838,12 +859,15 @@ class CreateInputLayersForDNNsTest(test.TestCase):
         initializer=init_ops.constant_initializer(init_value))
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [embeded_sparse])
+    output_core = fc_core.make_input_layer(features, [embeded_sparse])
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       output_eval = output.eval()
       self.assertAllEqual(output_eval.shape, [2, 10])
       self.assertAllClose(output_eval, np.tile(init_value, [2, 10]))
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval(), output_core.eval())
 
   def testEmbeddingColumnWithMultipleInitializersFails(self):
     hashed_sparse = feature_column.sparse_column_with_hash_bucket("wire", 10)
@@ -889,10 +913,14 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     embeded_sparse = feature_column.embedding_column(weighted_ids, 10)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [embeded_sparse])
+    output_core = fc_core.make_input_layer(features, [embeded_sparse])
+
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual(output.eval().shape, [2, 10])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval().shape, output_core.eval().shape)
 
   def testEmbeddingColumnWithIntegerWeightedSparseColumnSucceedsForDNN(self):
     """Same as the previous test, but with integer weights."""
@@ -1534,9 +1562,12 @@ class WeightedSumTest(test.TestCase):
     features = {"wire": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [hashed_sparse], num_outputs=5)
+    logits_core = fc_core.make_linear_model(features, [hashed_sparse], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(logits.eval(), logits_core.eval())
 
   def testSparseIntColumn(self):
     """Tests a sparse column with int values."""
@@ -1549,9 +1580,12 @@ class WeightedSumTest(test.TestCase):
     features = {"wire": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [hashed_sparse], num_outputs=5)
+    logits_core = fc_core.make_linear_model(features, [hashed_sparse], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(logits.eval(), logits_core.eval())
 
   def testSparseColumnWithDenseInputTensor(self):
     hashed_sparse = feature_column.sparse_column_with_hash_bucket("wire", 10)
@@ -1560,9 +1594,12 @@ class WeightedSumTest(test.TestCase):
     features = {"wire": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [hashed_sparse], num_outputs=5)
+    logits_core = fc_core.make_linear_model(features, [hashed_sparse], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(logits.eval(), logits_core.eval())
 
   def testWeightedSparseColumn(self):
     ids = feature_column.sparse_column_with_keys("ids",
@@ -1579,10 +1616,13 @@ class WeightedSumTest(test.TestCase):
     features = {"ids": ids_tensor, "weights": weights_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [weighted_ids], num_outputs=5)
+    logits_core = fc_core.make_linear_model(features, [weighted_ids], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(logits.eval(), logits_core.eval())
 
   def testWeightedSparseColumnWithDenseInputTensor(self):
     ids = feature_column.sparse_column_with_keys(
@@ -1594,11 +1634,14 @@ class WeightedSumTest(test.TestCase):
     features = {"ids": ids_tensor, "weights": weights_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [weighted_ids], num_outputs=5)
+    logits_core = fc_core.make_linear_model(features, [weighted_ids], units=5)
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(logits.eval(), logits_core.eval())
 
   def testCrossedColumn(self):
     a = feature_column.sparse_column_with_hash_bucket(
@@ -1649,6 +1692,8 @@ class WeightedSumTest(test.TestCase):
       output, column_to_variable, _ = (
           feature_column_ops.weighted_sum_from_feature_columns(
               features, [movies], num_outputs=1))
+      logits_core = fc_core.make_linear_model(features, [movies])
+
       with self.test_session() as sess:
         variables_lib.initialize_all_variables().run()
         lookup_ops.tables_initializer().run()
@@ -1659,6 +1704,8 @@ class WeightedSumTest(test.TestCase):
         # score for first example = 0.3 (matrix) + 0.1 (head-on) = 0.4
         # score for second example = 0.5 (winter sleep)
         self.assertAllClose(output.eval(), [[0.4], [0.5]])
+        # Cross compatibility: Core builder output should equal to contrib.
+        self.assertAllEqual(output.eval().shape, logits_core.eval().shape)
 
   def testRealValuedColumnWithMultiDimensions(self):
     real_valued = feature_column.real_valued_column("price", 2)
-- 
GitLab


From 2311dfc8ec1cef44dddb37603211337f48708824 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 10:08:29 -0800
Subject: [PATCH 1046/1563] Fix a bug in save_model_cli 'show'. Change:
 155217646

---
 tensorflow/python/tools/saved_model_cli.py      |  9 +++++++--
 tensorflow/python/tools/saved_model_cli_test.py | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index c9c56a5014..e19b187681 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -504,7 +504,14 @@ def run(args):
 
   Args:
     args: A namespace parsed from command line.
+
+  Raises:
+    AttributeError: An error when neither --inputs nor --input_exprs is passed
+    to run command.
   """
+  if not args.inputs and not args.input_exprs:
+    raise AttributeError(
+        'At least one of --inputs and --input_exprs must be required')
   tensor_key_feed_dict = load_inputs_from_input_arg_string(
       args.inputs, args.input_exprs)
   run_saved_model_with_feed_dict(args.dir, args.tag_set, args.signature_def,
@@ -629,8 +636,6 @@ def create_parser():
 def main():
   parser = create_parser()
   args = parser.parse_args()
-  if not args.inputs and not args.input_exprs:
-    args.error('At least one of --inputs and --input_exprs is required')
   args.func(args)
 
 
diff --git a/tensorflow/python/tools/saved_model_cli_test.py b/tensorflow/python/tools/saved_model_cli_test.py
index 1c7a44b3eb..8f79c888eb 100644
--- a/tensorflow/python/tools/saved_model_cli_test.py
+++ b/tensorflow/python/tools/saved_model_cli_test.py
@@ -409,6 +409,16 @@ Method name is: tensorflow/serving/predict"""
     with self.assertRaises(RuntimeError):
       saved_model_cli.run(args)
 
+  def testRunCommandInputNotGivenError(self):
+    self.parser = saved_model_cli.create_parser()
+    base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
+    args = self.parser.parse_args([
+        'run', '--dir', base_path, '--tag_set', 'serve', '--signature_def',
+        'serving_default'
+    ])
+    with self.assertRaises(AttributeError):
+      saved_model_cli.run(args)
+
   def testRunCommandWithDebuggerEnabled(self):
     self.parser = saved_model_cli.create_parser()
     base_path = test.test_src_dir_path(SAVED_MODEL_PATH)
-- 
GitLab


From f3e4e98fdd988b8d6d4b4a014b6974144e73183a Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Fri, 5 May 2017 11:03:49 -0800
Subject: [PATCH 1047/1563] Add d3 v4

The old version will be deleted when the migration is completed. The
new version can be referenced with the following build labels:

- @org_d3js_v4 (for d3.js)
- //tensorflow/tensorboard/components/tf_imports:d3v4.d.ts
Change: 155224862
---
 tensorflow/workspace.bzl | 333 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 331 insertions(+), 2 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 14fce6cf40..93300d9fb1 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -797,6 +797,27 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       },
   )
 
+  # TODO: Delete previous rule and rename this one org_d3js
+  filegroup_external(
+      name = "org_d3js_v4",
+      # no @license header
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256_urls_extract = {
+          "b5fac5b296bc196e6aa7b59f9e33986fc44d23d59a0e211705187be9e35b943d": [
+              "http://bazel-mirror.storage.googleapis.com/github.com/d3/d3/releases/download/v4.8.0/d3.zip",
+              "https://github.com/d3/d3/releases/download/v4.8.0/d3.zip",
+          ],
+      },
+      # TODO(jart): Use srcs=["d3.js"] instead of this once supported.
+      generated_rule_name = "all_files",
+      extra_build_file_content = "\n".join([
+          "filegroup(",
+          "    name = \"org_d3js_v4\",",
+          "    srcs = [\"d3.js\"],",
+          ")",
+      ]),
+  )
+
   filegroup_external(
       name = "org_definitelytyped",
       licenses = ["notice"],  # MIT
@@ -806,8 +827,8 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
           ],
           "177293828c7a206bf2a7f725753d51396d38668311aa37c96445f91bbf8128a7": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/6e2f2280ef16ef277049d0ce8583af167d586c59/d3/d3.d.ts",
-              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/6e2f2280ef16ef277049d0ce8583af167d586c59/d3/d3.d.ts",
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/6e2f2280ef16ef277049d0ce8583af167d586c59/d3/d3.d.ts",  # v3
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/6e2f2280ef16ef277049d0ce8583af167d586c59/d3/d3.d.ts",  # v3
           ],
           "e4cd3d5de0eb3bc7b1063b50d336764a0ac82a658b39b5cf90511f489ffdee60": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/efd40e67ff323f7147651bdbef03c03ead7b1675/lodash/lodash.d.ts",
@@ -828,6 +849,314 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       },
   )
 
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_array",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "61e7abb7b1f01fbcb0cab8cf39003392f422566209edd681fbd070eaa84ca000": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-array/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-array/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_axis",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "95f75c8dcc89850b2e72581d96a7b5f46ea4ac852f828893f141f14a597421f9": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-axis/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-axis/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_brush",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "a2738e693ce8a8640c2d29001e77582c9c361fd23bda44db471629866b60ada7": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-brush/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-brush/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_chord",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "c54d24756eb6d744b31e538ad9bab3a75f6d54e2288b29cc72338d4a057d3e83": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-chord/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-chord/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_collection",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "f987667167b1d2970911247e325eb1c37ca0823646f81ccec837ae59039822f7": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-collection/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-collection/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_color",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "9580c81f38ddcce7be0ac9bd3d0d083adebc34e17441709f90b9e4dcd1c19a56": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-color/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-color/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_dispatch",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "169f80b4cceca8e2e9ed384d81a5db0624cc01a26451dfb5a7e0cec6ea9cfb06": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dispatch/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dispatch/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_drag",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "08d35d139dde58c2722be98d718d01204fd6167d310f09b379e832f3c741489d": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-drag/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-drag/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_dsv",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "62594d00cf9e4bb895339c8e56f64330e202a5eb2a0fa580a1f6e6336f2c93ce": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dsv/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dsv/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_ease",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "d1cf8f99b7bf758c2ba3c0a4ce553e151d4d9b4cf45a6e8bd0edec7ce90f725b": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-ease/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-ease/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_force",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "288421e2008668d2076a4684657dd3d29b992832ef02c552981eb94a91042553": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-force/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-force/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_format",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "b42cb17e580c1fd0b64d478f7bd80ca806efaefda24426a833cf1f30a7275bca": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-format/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-format/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_hierarchy",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "a5683f5835d8716c6b89c075235078438cfab5897023ed720bfa492e244e969e": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-hierarchy/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-hierarchy/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_interpolate",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "590a71b741323ac3139b333ec8b743e24717fdd5b32bcff48ee521162a9dfe1c": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-interpolate/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-interpolate/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_path",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "96f35ba041bcaa265e2b373ee675177410d44d31c980e4f7fbeefd4bcba15b00": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-path/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-path/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_polygon",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "ce453451e8105cac6a4f4a4263ca2142ebb4bf442e342f470a81da691f220fcb": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-polygon/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-polygon/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_quadtree",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "238e278f1be5d6985a19800800cffee80f81199f71d848e3bbc288d1791a6f90": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-quadtree/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-quadtree/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_queue",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "e6ae19aad83495475653578de64fb9d6bf9764eda6c84d70f7935ec84bcc482e": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-queue/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-queue/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_random",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "d31b92ed86c23ec0a4776f99fa81ff033c95b96c8304d8aa9baf3b94af779aa8": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-random/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-random/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_request",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "44bb7b07d977028e6567540a3303b06fc9b33fb0960bc75c520e0733c840d89f": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-request/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-request/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_scale",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "02ce7c644ba34bd1abb84da2e832f248b048b6a23812be4365bd837f186c9f1f": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-scale/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-scale/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_selection",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "699043ddb28dfa5e46d87bc6a24cfc6d604237f298259d3fb3c7066e05e8c86e": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-selection/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-selection/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_shape",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "62668a7aaaf6232762b544f9f89c0f557ca7cfb0cd343a358dda7ecbe26f5739": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-shape/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-shape/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_time",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "0502490ce682fd9265fb1d5d693ce6cd82e3b05e5f5ee3433731266ecb03d5fc": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-time/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-time/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_timer",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "6f191f9aea704aa64b1defa40dfdff1447a6e6bb815feff1660f894500a9c94d": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-timer/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-timer/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_transition",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "a0a7c0c9bfb5c7d6d9d22a8d16b4484b66d13f2ed226954037546cb3da4098ba": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-transition/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-transition/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_voronoi",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "c6bd5f229f915151d0ef678fe50b1aa6a62334ea0a8c6fc0effbac9f7032efc7": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-voronoi/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-voronoi/index.d.ts",
+          ],
+      },
+  )
+
+  filegroup_external(
+      name = "org_definitelytyped_types_d3_zoom",
+      licenses = ["notice"],  # MIT
+      sha256_urls = {
+          "a25dc17fbd304cf7a0e5e7bbb8339c930d464eb40c4d6e5f839ce9c0191f4110": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-zoom/index.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-zoom/index.d.ts",
+          ],
+      },
+  )
+
   filegroup_external(
       name = "org_threejs",
       # no @license header
-- 
GitLab


From 532919a3be3a03fda4a7abba7d9403d05d6e8a31 Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@google.com>
Date: Fri, 5 May 2017 11:07:04 -0800
Subject: [PATCH 1048/1563] Use hlo_matchers in more tests. Change: 155225266

---
 .../xla/service/hlo_rematerialization_test.cc       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc b/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc
index 82de1c835b..2a1d728bc8 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization_test.cc
@@ -28,11 +28,13 @@ limitations under the License.
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 
-namespace op = xla::testing::opcode_matchers;
-
 namespace xla {
 namespace {
 
+namespace op = xla::testing::opcode_matchers;
+
+using ::testing::_;
+
 class HloRematerializationTest : public HloTestBase {
  protected:
   // Creates and returns a computation which can benefit from
@@ -145,11 +147,9 @@ TEST_F(HloRematerializationTest, SingleComputation) {
   // Find and save the original broadcast instruction which should be
   // rematerialized.
   const HloInstruction* slice = computation->root_instruction();
-  ASSERT_EQ(HloOpcode::kSlice, slice->opcode());
+  ASSERT_THAT(slice, op::Slice(op::Concatenate(op::Broadcast(_), _)));
   const HloInstruction* concat = slice->operand(0);
-  ASSERT_EQ(HloOpcode::kConcatenate, concat->opcode());
   const HloInstruction* bcast = concat->operand(0);
-  ASSERT_EQ(HloOpcode::kBroadcast, bcast->opcode());
 
   SequentialHloOrdering::HloModuleSequence sequence;
   // Computation requires 16KB without rematerialization, but uses only 12KB
@@ -165,8 +165,7 @@ TEST_F(HloRematerializationTest, SingleComputation) {
 
   // The broadcast should have been rematerialized.
   const HloInstruction* remat_bcast = concat->operand(0);
-  EXPECT_EQ(HloOpcode::kBroadcast, remat_bcast->opcode());
-  EXPECT_NE(bcast, remat_bcast);
+  EXPECT_THAT(remat_bcast, op::Broadcast(::testing::Ne(bcast)));
 
   // The rematerialized broadcast should be immediate before the concat in the
   // sequence.
-- 
GitLab


From 18dcf0973bc660aa9e84f89c7d3a913f9893f01b Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Fri, 5 May 2017 11:34:59 -0800
Subject: [PATCH 1049/1563] - Adds a tutorial for dense kernel methods. - Adds
 a README file to contrib/kernel_methods Change: 155228213

---
 tensorflow/contrib/kernel_methods/README.md   |  55 ++++
 .../kernel_methods/g3doc/acc-vs-trn_time.png  | Bin 0 -> 17992 bytes
 .../kernel_methods/g3doc/acc_vs_outdim.png    | Bin 0 -> 19835 bytes
 .../kernel_methods/g3doc/kernel_mapping.jpg   | Bin 0 -> 7330 bytes
 .../contrib/kernel_methods/g3doc/tutorial.md  | 273 ++++++++++++++++++
 5 files changed, 328 insertions(+)
 create mode 100644 tensorflow/contrib/kernel_methods/README.md
 create mode 100644 tensorflow/contrib/kernel_methods/g3doc/acc-vs-trn_time.png
 create mode 100644 tensorflow/contrib/kernel_methods/g3doc/acc_vs_outdim.png
 create mode 100644 tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.jpg
 create mode 100644 tensorflow/contrib/kernel_methods/g3doc/tutorial.md

diff --git a/tensorflow/contrib/kernel_methods/README.md b/tensorflow/contrib/kernel_methods/README.md
new file mode 100644
index 0000000000..1913800af0
--- /dev/null
+++ b/tensorflow/contrib/kernel_methods/README.md
@@ -0,0 +1,55 @@
+# TensorFlow contrib kernel_methods.
+
+This module contains operations and estimators that enable the use of primal
+(explicit) kernel methods in TensorFlow. See also the [tutorial](https://www.tensorflow.org/code/tensorflow/contrib/kernel_methods/g3doc/tutorial.md) on how to use this module to improve the quality of
+classification or regression tasks.
+
+## Kernel Mappers
+Implement explicit kernel mapping Ops over tensors. Kernel mappers add
+Tensor-In-Tensor-Out (TITO) Ops to the TensorFlow graph. They can be used in
+conjunction with other layers or ML models.
+
+Sample usage:
+
+```python
+kernel_mapper = tf.contrib.kernel_methods.SomeKernelMapper(...)
+out_tensor = kernel_mapper.map(in_tensor)
+...  # code that consumes out_tensor.
+```
+
+Currently, there is a [RandomFourierFeatureMapper]
+(https://www.tensorflow.org/code/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features.py) implemented that maps dense
+input to dense output.
+
+## Kernel-based Estimators
+tf.contrib.learn Estimators that use kernel mappers internally to discover
+non-linearities in the data. These canned estimators map their input features
+using kernel mapper Ops and then apply linear models to the mapped
+features. Combining kernel mappers with linear models and different loss
+functions leads to a variety of models: linear and non-linear SVMs, linear
+regression (with and without kernels) and (multinomial) logistic regression
+(with and without kernels).
+
+Currently there is a [KernelLinearClassifier]
+(https://www.tensorflow.org/code/tensorflow/contrib/kernel_methods/python/kernel_estimators.py) implemented but more pre-packaged estimators
+are on the way.
+
+Sample usage:
+
+```python
+real_column_a = tf.contrib.layers.real_valued_column(name='real_column_a',...)
+sparse_column_b = tf.contrib.layers.sparse_column_with_hash_bucket(...)
+kernel_mappers = {real_column_a : [tf.contrib.kernel_methods.SomeKernelMapper(...)]}
+optimizer = ...
+
+kernel_classifier = tf.contrib.kernel_methods.KernelLinearClassifier(
+    feature_columns=[real_column_a, sparse_column_b],
+    model_dir=...,
+    optimizer=optimizer,
+    kernel_mappers=kernel_mappers)
+
+# Construct input_fns
+kernel_classifier.fit(...)
+kernel_classifier.evaluate(...)
+```
+
diff --git a/tensorflow/contrib/kernel_methods/g3doc/acc-vs-trn_time.png b/tensorflow/contrib/kernel_methods/g3doc/acc-vs-trn_time.png
new file mode 100644
index 0000000000000000000000000000000000000000..1028bb390179cd21dba0b41b53a0b1eff4e345a4
GIT binary patch
literal 17992
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

literal 0
HcmV?d00001

diff --git a/tensorflow/contrib/kernel_methods/g3doc/acc_vs_outdim.png b/tensorflow/contrib/kernel_methods/g3doc/acc_vs_outdim.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3384e053b24d0225576a8610147b042fb7b1708
GIT binary patch
literal 19835
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
F1OTCF$E^SW

literal 0
HcmV?d00001

diff --git a/tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.jpg b/tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fd69fac76ee4cd85b18f594c8026a3398552071d
GIT binary patch
literal 7330
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

literal 0
HcmV?d00001

diff --git a/tensorflow/contrib/kernel_methods/g3doc/tutorial.md b/tensorflow/contrib/kernel_methods/g3doc/tutorial.md
new file mode 100644
index 0000000000..51000080a7
--- /dev/null
+++ b/tensorflow/contrib/kernel_methods/g3doc/tutorial.md
@@ -0,0 +1,273 @@
+# Improving classification using explicit kernel methods
+
+In this tutorial, we demonstrate how combining (explicit) kernel methods with
+linear models can drastically increase the latters' quality of predictions
+without significantly increasing training and inference times. Currently,
+explicit kernel mappings are supported for dense features. Support for sparse
+features is in the works.
+
+We will use [tf.contrib.learn](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn) (TensorFlow's high-level Machine Learning API) Estimators for our ML models.
+tf.contrib.learn API reduces the boilerplate code one needs to write for
+configuring, training and evaluating models and will let us focus on the core
+ideas. If you are not familiar with this API, [tf.contrib.learn Quickstart](https://www.tensorflow.org/get_started/tflearn) is a good place to start. We
+will use MNIST, a widely-used dataset containing images of handwritten digits
+(between 0 and 9). The tutorial consists of the following steps:
+
+* Load and prepare MNIST data for classification.
+* Construct a simple linear model, train it and evaluate it on the eval data.
+* Replace the linear model with a kernelized linear model, re-train and
+re-evaluate.
+
+## Load and prepare MNIST data for classification
+The first step is to prepare the data to be fed to the ML models. The following
+utility command from tf.contrib.learn loads the MNIST dataset:
+
+```python
+data = tf.contrib.learn.datasets.mnist.load_mnist()
+```
+This loads the entire MNIST dataset (containing 70K samples) and splits it into
+train, validation and test data with 55K, 5K and 10K samples respectively. Each
+split contains one numpy array for images (with shape [sample_size, 784]) and
+one for labels (with shape [sample_size, 1]). In this tutorial, we only use the
+train and validation splits (to train and evaluate our models respectively).
+
+In order to feed data to a tf.contrib.learn Estimator, it is helpful to convert
+it to Tensors. For this, we will use an `input function` which adds Ops to the
+TensorFlow graph that, when executed, create mini-batches of Tensors to be used
+downstream. For more background on input functions, check
+[Building Input Functions with tf.contrib.learn](https://www.tensorflow.org/get_started/input_fn). In this example, we will use the `tf.train.shuffle_batch` Op which,
+besides converting numpy arrays to Tensors, allows us to specify the batch_size
+and whether to randomize the input every time the input_fn Ops are executed
+(randomization typically expedites convergence during training). The full code
+for loading and preparing the data is shown in the snippet below. In this
+example, we use mini-batches of size 256 for training and the entire sample (5K
+entries) for evaluation. Feel free to experiment with different batch sizes.
+
+```python
+import numpy as np
+import tensorflow as tf
+
+def get_input_fn(dataset_split, batch_size, capacity=10000, min_after_dequeue=3000):
+
+  def _input_fn():
+    images_batch, labels_batch = tf.train.shuffle_batch(
+        tensors=[dataset_split.images, dataset_split.labels.astype(np.int32)],
+        batch_size=batch_size,
+        capacity=capacity,
+        min_after_dequeue=min_after_dequeue,
+        enqueue_many=True,
+        num_threads=4)
+    features_map = {'images': images_batch}
+    return features_map, labels_batch
+
+  return _input_fn
+
+data = tf.contrib.learn.datasets.mnist.load_mnist()
+
+train_input_fn = get_input_fn(data.train, batch_size=256)
+eval_input_fn = get_input_fn(data.validation, batch_size=5000)
+
+```
+
+## Training a simple linear model
+We can now train a linear model over the MNIST dataset. We will use the  [tf.contrib.learn.LinearClassifier](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/linear.py) estimator with 10 classes (representing the 10
+digits). The input features form a 784-dimensional (dense) vector which can be
+specified as follows:
+
+```python
+image_column = tf.contrib.layers.real_valued_column('images', dimension=784)
+```
+
+The full code for constructing, training and evaluating a LinearClassifier
+estimator is shown below.
+
+```python
+import time
+
+# Specify the feature(s) to be used by the estimator.
+image_column = tf.contrib.layers.real_valued_column('images', dimension=784)
+estimator = tf.contrib.learn.LinearClassifier(feature_columns=[image_column], n_classes=10)
+
+# Train.
+start = time.time()
+estimator.fit(input_fn=train_input_fn, steps=2000)
+end = time.time()
+print('Elapsed time: {} seconds'.format(end - start))
+
+# Evaluate and report metrics.
+eval_metrics = estimator.evaluate(input_fn=eval_input_fn, steps=1)
+print(eval_metrics)
+```
+On eval data, the loss (i.e., the value of the objective function being
+minimized during training) lies between **0.25 and 0.30** (depending on the
+parameters used) while the accuracy of the classifier is approximately **92.5%**
+(training is randomized so the exact loss and accuracy will vary). Also, the
+training time is around 25 seconds (this will also vary based on the machine you
+run the code on).
+
+In addition to experimenting with the (training) batch size and the number of
+training steps, there are a couple other parameters that can be tuned as well.
+For instance, you can change the optimization method used to minimize the loss
+by explicitly selecting another optimizer from the collection of
+[available optimizers]
+(https://www.tensorflow.org/code/tensorflow/python/training).
+As an example, the following code constructs a LinearClassifer estimator that
+uses the Follow-The-Regularized-Leader (FTRL) optimization strategy with a
+specific learning rate and l2-regularization.
+
+
+```python
+optimizer = tf.train.FtrlOptimizer(learning_rate=5.0, l2_regularization_strength=1.0)
+estimator = tf.contrib.learn.LinearClassifier(
+    feature_columns=[image_column], n_classes=10, optimizer=optimizer)
+```
+
+Regardless of the values of the parameters, the max accuracy a linear model can
+achieve on this dataset caps at around **93%**.
+
+## Using explicit kernel mappings with the linear model.
+The relatively high error (~7%) of the linear model over MNIST indicates that
+the input data is not linearly separable. We will use explicit kernel mappings
+to reduce the classification error.
+
+**Intuition:** The high-level idea is to use a non-linear map to transform the
+input space to another feature space (of possibly higher dimension) where the
+(transformed) features are (almost) linearly separable and then apply a linear
+model on the mapped features. This is shown in the following figure:
+
+<div style="text-align:center">
+<img src="./kernel_mapping.png">
+</div>
+
+**Technical details overview:** In this example we will use **Random Fourier
+Features** (introduced in the ["Random Features for Large-Scale Kernel Machines"]
+(https://people.eecs.berkeley.edu/~brecht/papers/07.rah.rec.nips.pdf) paper by
+Rahimi and Recht) to map the input data. Random Fourier Features map a vector
+$$\mathbf{x} \in \mathbb{R}^d$$ to $$\mathbf{x'} \in \mathbb{R}^D$$ via the
+following mapping:
+
+$$
+RFFM(\cdot): \mathbb{R}^d \to \mathbb{R}^D, \quad
+RFFM(\mathbf{x}) =  \cos(\mathbf{\Omega} \cdot \mathbf{x}+ \mathbf{b})
+$$
+
+where $$\mathbf{\Omega} \in \mathbb{R}^{D \times d}$$,
+$$\mathbf{x} \in \mathbb{R}^d,$$ $$\mathbf{b} \in \mathbb{R}^D$$ and cosine is
+applied elementwise.
+
+In this example, the entries of $$\mathbf{\Omega}$$ and $$\mathbf{b}$$ are
+sampled from distributions such that the mapping satisfies the following
+property:
+
+$$
+RFFM(\mathbf{x})^T \cdot RFFM(\mathbf{y}) \approx
+e^{-\frac{\|\mathbf{x} - \mathbf{y}\|^2}{2 \sigma^2}}
+$$
+
+The right-hand-side quantity of the expression above is known as the RBF (or
+Gaussian) kernel function. This function is one of the most-widely used kernel
+functions in Machine Learning and measures (implicitly) similarity in a
+different (much higher dimensional) space than the original one. See
+[Radial basis function kernel](https://en.wikipedia.org/wiki/Radial_basis_function_kernel)
+for more details.
+
+**Kernel Classifier:** `tf.contrib.kernel_methods.KernelLinearClassifier` is a
+pre-packaged `tf.contrib.learn` estimator that combines the power of explicit
+kernel mappings with linear models. Its API is very similar to that of the
+LinearClassifier with the additional ability to specify a list of explicit
+kernel mappings to be apply to each feature used by the classifier. The
+following code snippet demonstrates how to replace LinearClassifier with
+KernelLinearClassifier.
+
+
+```python
+# Specify the feature(s) to be used by the estimator. This is identical to the
+# code used for the LinearClassifier.
+image_column = tf.contrib.layers.real_valued_column('images', dimension=784)
+optimizer = tf.train.FtrlOptimizer(
+   learning_rate=50.0, l2_regularization_strength=0.001)
+
+
+kernel_mapper = tf.contrib.kernel_methods.RandomFourierFeatureMapper(
+  input_dim=784, output_dim=2000, stddev=5.0, name='rffm')
+kernel_mappers = {image_column: [kernel_mapper]}
+estimator = tf.contrib.kernel_methods.KernelLinearClassifier(
+   n_classes=10, optimizer=optimizer, kernel_mappers=kernel_mappers)
+
+# Train.
+start = time.time()
+estimator.fit(input_fn=train_input_fn, steps=2000)
+end = time.time()
+print('Elapsed time: {} seconds'.format(end - start))
+
+# Evaluate and report metrics.
+eval_metrics = estimator.evaluate(input_fn=eval_input_fn, steps=1)
+print(eval_metrics)
+```
+The only additional parameter passed to `KernelLinearClassifier` is a dictionary
+from feature_columns to a list of kernel mappings to be applied to the
+corresponding feature column. In this example, the lines
+
+```python
+kernel_mapper = tf.contrib.kernel_methods.RandomFourierFeatureMapper(
+  input_dim=784, output_dim=2000, stddev=5.0, name='rffm')
+kernel_mappers = {image_column: [kernel_mapper]}
+estimator = tf.contrib.kernel_methods.KernelLinearClassifier(
+   n_classes=10, optimizer=optimizer, kernel_mappers=kernel_mappers)
+```
+instruct the classifier to first map the initial 784-dimensional images to
+2000-dimensional vectors using random Fourier features and then learn a linear
+model on the transformed vectors. Note that, besides the output dimension, there
+is one more parameter (stddev) involved. This parameter is the standard
+deviation ($$\sigma$$) of the approximated RBF kernel and controls the
+similarity measure used in classification. This parameter is typically
+determined via hyperparameter tuning.
+
+Running the code above yields a loss of approximately **0.10** while the
+accuracy is increased to approximately **97%** on eval data (an increase of 4%
+over the plain linear model). The training time hovers around 35 seconds. We can
+increase the accuracy even more, by increasing the output dimension of the
+mapping and tuning the standard deviation even more.
+
+**On the role of stddev:** The classification quality is very sensitive to the
+value of the stddev parameter used to define the similarity measure between the
+pairs of input features. The following table shows the accuracy of the
+classifier on the eval data for different values of stddev (for all experiments
+the output dimension was fixed to 3000). The optimal value is stddev=5.0. Notice
+how too small or too high stddev values can dramatically decrease the accuracy
+of the classification.
+
+stddev | eval accuracy
+:----- | :------------
+1.0    | 0.1362
+2.0    | 0.4764
+4.0    | 0.9654
+5.0    | 0.9766
+8.0    | 0.9714
+16.0   | 0.8878
+
+**On the role of the output dimension:** Intuitively, the larger the output
+dimension of the mapping, the closer the inner product of two mapped vectors
+approximates the kernel which typically translates to better classification
+accuracy. Another way to think about this is that the output dimension equals
+the number of weights of the linear model (the larger this dimension, the larger
+the "degrees of freedom" of the model). However, after a certain threshold,
+higher output dimensions increase the accuracy by very little (while still
+increasing the training time). This is shown in the following 2 Figures which
+depict the eval accuracy as a function of the output dimension and the training
+time respectively.
+
+![image](./acc_vs_outdim.png)  ![image](./acc-vs-trn_time.png)
+
+
+## Explicit Kernel Mappings: summary and practical tips
+* Explicit kernel mappings combine the predictive power of non-linear models
+with the scalability of linear models.
+* Random Fourier Features can be particularly effective for datasets with dense
+features.
+* The parameters of the kernel mapping are often data-dependent. Model quality
+can be very sensitive to these parameters. Use hyperparameter tuning to find the
+optimal values.
+* If you have multiple numerical features, concatinate them into a single
+multi-dimensional one and apply the kernel mapping to the concatenated vector.
+
-- 
GitLab


From 116229a5e3590b432a0307b7e79bc6f96cbe34de Mon Sep 17 00:00:00 2001
From: Toby Boyd <tobyboyd@google.com>
Date: Fri, 5 May 2017 11:59:30 -0800
Subject: [PATCH 1050/1563] Updated numbers after running benchmarks on updated
 ResNet model. Change: 155230686

---
 tensorflow/docs_src/performance/benchmarks.md | 143 +++++++++---------
 1 file changed, 74 insertions(+), 69 deletions(-)

diff --git a/tensorflow/docs_src/performance/benchmarks.md b/tensorflow/docs_src/performance/benchmarks.md
index 19d37794ab..6bbc98ac0d 100644
--- a/tensorflow/docs_src/performance/benchmarks.md
+++ b/tensorflow/docs_src/performance/benchmarks.md
@@ -80,10 +80,12 @@ section.
 *   **OS:** Ubuntu 16.04 LTS with tests run via Docker
 *   **CUDA / cuDNN:** 8.0 / 5.1
 *   **TensorFlow GitHub hash:** b1e174e
+*   **Benchmark GitHub hash:** 9165a70
 *   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
     //tensorflow/tools/pip_package:build_pip_package`
 *   **Disk:** Local SSD
 *   **DataSet:** ImageNet
+*   **Test Date:** May 2017
 
 Batch size and optimizer used for each model are listed in the table below. In
 addition to the batch sizes listed in the table, InceptionV3, ResNet-50,
@@ -120,19 +122,19 @@ VGG16       | replicated (with NCCL) | n/a
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-  1  | 142         | 238       | 95.6       | 2987    | 154
-  2  | 284         | 479       | 187        | 5658    | 295
-  4  | 569         | 948       | 374        | 10509   | 584
-  8  | 1131        | 1886      | 744        | 17822   | 1081
+1    | 142         | 219       | 91.8       | 2987    | 154
+2    | 284         | 422       | 181        | 5658    | 295
+4    | 569         | 852       | 356        | 10509   | 584
+8    | 1131        | 1734      | 716        | 17822   | 1081
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-  1  | 142         | 239       | 95.5       | 2890    | 154
-  2  | 278         | 468       | 187        | 4448    | 284
-  4  | 551         | 938       | 373        | 7105    | 534
-  8  | 1079        | 1802      | 721        | N/A     | 898
+1    | 142         | 218       | 91.4       | 2890    | 154
+2    | 278         | 425       | 179        | 4448    | 284
+4    | 551         | 853       | 359        | 7105    | 534
+8    | 1079        | 1630      | 708        | N/A     | 898
 
 Training AlexNet with real data on 8 GPUs was excluded from the graph and table
 above due to it maxing out the input pipeline.
@@ -145,19 +147,19 @@ The results below are all with a batch size of 32.
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
 ---- | ----------- | --------- | ---------- | -----
-  1  | 128         | 210       | 85.3       | 144
-  2  | 259         | 412       | 166        | 281
-  4  | 520         | 827       | 330        | 549
-  8  | 995         | 1623      | 643        | 820
+1    | 128         | 195       | 82.7       | 144
+2    | 259         | 368       | 160        | 281
+4    | 520         | 768       | 317        | 549
+8    | 995         | 1485      | 632        | 820
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
 ---- | ----------- | --------- | ---------- | -----
-  1  | 130         | 208       | 85.0       | 144
-  2  | 257         | 403       | 163        | 253
-  4  | 507         | 814       | 325        | 457
-  8  | 966         | 1525      | 641        | 690
+1    | 130         | 193       | 82.4       | 144
+2    | 257         | 369       | 159        | 253
+4    | 507         | 760       | 317        | 457
+8    | 966         | 1410      | 609        | 690
 
 ## Details for Google Compute Engine (NVIDIA® Tesla® K80)
 
@@ -168,11 +170,12 @@ GPUs | InceptionV3 | ResNet-50 | ResNet-152 | VGG16
 *   **OS:** Ubuntu 16.04 LTS
 *   **CUDA / cuDNN:** 8.0 / 5.1
 *   **TensorFlow GitHub hash:** b1e174e
+*   **Benchmark GitHub hash:** 9165a70
 *   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
     //tensorflow/tools/pip_package:build_pip_package`
 *   **Disk:** 1.7 TB Shared SSD persistent disk (800 MB/s)
 *   **DataSet:** ImageNet
-*   **Test Date:** April 2017
+*   **Test Date:** May 2017
 
 Batch size and optimizer used for each model are listed in the table below. In
 addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
@@ -198,19 +201,19 @@ The configuration used for each model was `variable_update` equal to
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-  1  | 30.5        | 56.8      | 20.8       | 656     | 35.4
-  2  | 57.8        | 107       | 39.1       | 1209    | 64.8
-  4  | 116         | 212       | 77.2       | 2328    | 120
-  8  | 227         | 419       | 151        | 4640    | 234
+1    | 30.5        | 51.9      | 20.0       | 656     | 35.4
+2    | 57.8        | 99.0      | 38.2       | 1209    | 64.8
+4    | 116         | 195       | 75.8       | 2328    | 120
+8    | 227         | 387       | 148        | 4640    | 234
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-  1  | 30.6        | 56.7      | 20.7       | 639     | 34.2
-  2  | 58.4        | 107       | 39.0       | 1136    | 62.9
-  4  | 115         | 211       | 77.3       | 2067    | 118
-  8  | 225         | 422       | 151        | 4056    | 230
+1    | 30.6        | 51.2      | 20.0       | 639     | 34.2
+2    | 58.4        | 98.8      | 38.3       | 1136    | 62.9
+4    | 115         | 194       | 75.4       | 2067    | 118
+8    | 225         | 381       | 148        | 4056    | 230
 
 ### Other Results
 
@@ -218,19 +221,19 @@ GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-1    | 29.3                        | 53.9
-2    | 55.0                        | 101
-4    | 109                         | 200
-8    | 216                         | 398
+1    | 29.3                        | 49.5
+2    | 55.0                        | 95.4
+4    | 109                         | 183
+8    | 216                         | 362
 
 **Training real data**
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-  1  | 29.5                        | 53.6
-  2  | 55.4                        | 102
-  4  | 110                         | 201
-  8  | 216                         | 387
+1    | 29.5                        | 49.3
+2    | 55.4                        | 95.3
+4    | 110                         | 186
+8    | 216                         | 359
 
 ## Details for Amazon EC2 (NVIDIA® Tesla® K80)
 
@@ -241,12 +244,13 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 *   **OS:** Ubuntu 16.04 LTS
 *   **CUDA / cuDNN:** 8.0 / 5.1
 *   **TensorFlow GitHub hash:** b1e174e
+*   **Benchmark GitHub hash:** 9165a70
 *   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
     //tensorflow/tools/pip_package:build_pip_package`
 *   **Disk:** 1TB Amazon EFS (burst 100 MiB/sec for 12 hours, continuous 50
     MiB/sec)
 *   **DataSet:** ImageNet
-*   **Test Date:** April 2017
+*   **Test Date:** May 2017
 
 Batch size and optimizer used for each model are listed in the table below. In
 addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
@@ -279,19 +283,19 @@ VGG16       | parameter_server          | gpu
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-  1  | 30.8        | 56.3      | 20.9       | 684     | 36.3
-  2  | 58.7        | 108       | 39.3       | 1244    | 69.4
-  4  | 117         | 217       | 79.1       | 2479    | 141
-  8  | 230         | 419       | 156        | 4853    | 260
+1    | 30.8        | 51.5      | 19.7       | 684     | 36.3
+2    | 58.7        | 98.0      | 37.6       | 1244    | 69.4
+4    | 117         | 195       | 74.9       | 2479    | 141
+8    | 230         | 384       | 149        | 4853    | 260
 
 **Training real data**
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152 | Alexnet | VGG16
 ---- | ----------- | --------- | ---------- | ------- | -----
-  1  | 30.5        | 56.0      | 20.6       | 674     | 36.3
-  2  | 59.0        | 107       | 39.0       | 1227    | 67.5
-  4  | 118         | 205       | 77.9       | 2201    | 136
-  8  | 228         | 405       | 152        | N/A     | 242
+1    | 30.5        | 51.3      | 19.7       | 674     | 36.3
+2    | 59.0        | 94.9      | 38.2       | 1227    | 67.5
+4    | 118         | 188       | 75.2       | 2201    | 136
+8    | 228         | 373       | 149        | N/A     | 242
 
 Training AlexNet with real data on 8 GPUs was excluded from the graph and table
 above due to our EFS setup not providing enough throughput.
@@ -302,19 +306,19 @@ above due to our EFS setup not providing enough throughput.
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-1    | 29.9                        | 53.5
-2    | 57.5                        | 101
-4    | 114                         | 202
-8    | 216                         | 380
+1    | 29.9                        | 49.0
+2    | 57.5                        | 94.1
+4    | 114                         | 184
+8    | 216                         | 355
 
 **Training real data**
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-1    | 30.0                        | 53.6
-2    | 57.5                        | 102
-4    | 113                         | 202
-8    | 212                         | 379
+1    | 30.0                        | 49.1
+2    | 57.5                        | 95.1
+4    | 113                         | 185
+8    | 212                         | 353
 
 ## Details for Amazon EC2 Distributed (NVIDIA® Tesla® K80)
 
@@ -325,11 +329,12 @@ GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 *   **OS:** Ubuntu 16.04 LTS
 *   **CUDA / cuDNN:** 8.0 / 5.1
 *   **TensorFlow GitHub hash:** b1e174e
+*   **Benchmark GitHub hash:** 9165a70
 *   **Build Command:** `bazel build -c opt --copt=-march="haswell" --config=cuda
     //tensorflow/tools/pip_package:build_pip_package`
 *   **Disk:** 1.0 TB EFS (burst 100 MB/sec for 12 hours, continuous 50 MB/sec)
 *   **DataSet:** ImageNet
-*   **Test Date:** April 2017
+*   **Test Date:** May 2017
 
 The batch size and optimizer used for the tests are listed in the table. In
 addition to the batch sizes listed in the table, InceptionV3 and ResNet-50 were
@@ -343,11 +348,11 @@ Optimizer          | sgd         | sgd       | sgd
 
 Configuration used for each model.
 
-Model       | variable_update        | local_parameter_device
------------ | ---------------------- | ----------------------
-InceptionV3 | distributed_replicated | n/a
-ResNet-50   | distributed_replicated | n/a
-ResNet-152  | distributed_replicated | n/a
+Model       | variable_update        | local_parameter_device | cross_replica_sync
+----------- | ---------------------- | ---------------------- | ------------------
+InceptionV3 | distributed_replicated | n/a                    | True
+ResNet-50   | distributed_replicated | n/a                    | True
+ResNet-152  | distributed_replicated | n/a                    | True
 
 To simplify server setup, EC2 instances (p2.8xlarge) running worker servers also
 ran parameter servers. Equal numbers of parameter servers and work servers were
@@ -371,11 +376,11 @@ used with the following exceptions:
 
 GPUs | InceptionV3 | ResNet-50 | ResNet-152
 ---- | ----------- | --------- | ----------
-1    | 29.7        | 55.0      | 19.8
-8    | 229         | 410       | 150
-16   | 459         | 825       | 300
-32   | 902         | 1468      | 575
-64   | 1783        | 3051      | 1004
+1    | 29.7        | 52.4      | 19.4
+8    | 229         | 378       | 146
+16   | 459         | 751       | 291
+32   | 902         | 1388      | 565
+64   | 1783        | 2744      | 981
 
 ### Other Results
 
@@ -387,23 +392,23 @@ GPUs | InceptionV3 | ResNet-50 | ResNet-152
 
 GPUs | InceptionV3 (batch size 32) | ResNet-50 (batch size 32)
 ---- | --------------------------- | -------------------------
-1    | 29.2                        | 53.0
-8    | 219                         | 363
-16   | 427                         | 719
-32   | 820                         | 1265
-64   | 1608                        | 2623
-
+1    | 29.2                        | 48.4
+8    | 219                         | 333
+16   | 427                         | 667
+32   | 820                         | 1180
+64   | 1608                        | 2315
 
 ## Methodology
 
-This [script](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
+This
+[script](https://github.com/tensorflow/benchmarks/tree/master/scripts/tf_cnn_benchmarks)
 was run on the various platforms to generate the above results.
 @{$performance_models$High-Performance Models} details techniques in the script
 along with examples of how to execute the script.
 
 In order to create results that are as repeatable as possible, each test was run
 5 times and then the times were averaged together. GPUs are run in their default
-state on the given platform.  For NVIDIA® Tesla® K80 this means leaving on [GPU
+state on the given platform. For NVIDIA® Tesla® K80 this means leaving on [GPU
 Boost](https://devblogs.nvidia.com/parallelforall/increase-performance-gpu-boost-k80-autoboost/).
 For each test, 10 warmup steps are done and then the next 100 steps are
 averaged.
-- 
GitLab


From 65f8c5ca31a8dc217133f559281ced876d580113 Mon Sep 17 00:00:00 2001
From: Erik Smistad <ersmistad@gmail.com>
Date: Fri, 5 May 2017 22:36:24 +0200
Subject: [PATCH 1051/1563] Fix error of version_info.cc not being generated on
 windows if building python bindings is disabled in CMake (#9660)

---
 tensorflow/contrib/cmake/CMakeLists.txt  | 6 ++++++
 tensorflow/contrib/cmake/tf_python.cmake | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index af7b4fb386..83b405fd4e 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -229,6 +229,12 @@ if (tensorflow_ENABLE_GPU)
   endif()
 endif()
 
+# Find python executable
+include(FindPythonInterp)
+if(NOT ${PYTHONINTERP_FOUND})
+    message(FATAL_ERROR "CMake was unable to find a python interpreter.")
+endif()
+
 # Let's get to work!
 include(tf_core_framework.cmake)
 # NOTE: Disabled until issue #3996 is fixed.
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 9e2eb71b4c..bfd6a18c78 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -27,7 +27,6 @@
 
 # 1. Resolve the installed version of Python (for Python.h and python).
 # TODO(mrry): Parameterize the build script to enable Python 3 building.
-include(FindPythonInterp)
 if(NOT PYTHON_INCLUDE_DIR)
   set(PYTHON_NOT_FOUND false)
   exec_program("${PYTHON_EXECUTABLE}"
-- 
GitLab


From 56b2b7ab193b6fedb3dee58e847bad9776f69a16 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Fri, 5 May 2017 12:50:51 -0800
Subject: [PATCH 1052/1563] Internal change. Change: 155236037

---
 tensorflow/python/framework/function.py | 138 ++++++++++++++----------
 1 file changed, 84 insertions(+), 54 deletions(-)

diff --git a/tensorflow/python/framework/function.py b/tensorflow/python/framework/function.py
index 2a1389b91f..ac8aee2c83 100644
--- a/tensorflow/python/framework/function.py
+++ b/tensorflow/python/framework/function.py
@@ -113,18 +113,19 @@ def _add_op_node(op, func, input_dict):
   node_def = func.node_def[-1]
   for i in range(len(node_def.input)):
     if not node_def.input[i].startswith("^"):
-      assert node_def.input[i] in input_dict, (
-          "%s missing from %s" % (node_def.input[i], input_dict.items()))
+      assert node_def.input[i] in input_dict, ("%s missing from %s" %
+                                               (node_def.input[i],
+                                                input_dict.items()))
       node_def.input[i] = input_dict[node_def.input[i]]
 
 
-def _graph_to_function_def(graph, inputs, outputs, out_names=None):
+def _graph_to_function_def(graph, operations, inputs, outputs, out_names=None):
   """Returns `graph` as a `FunctionDef` protocol buffer.
 
   This method creates a [`FunctionDef`](
   https://www.tensorflow.org/code/tensorflow/core/framework/function.proto)
-  protocol buffer that contains all the ops present in the graph.  The
-  graph effectively becomes the body of the function.
+  protocol buffer that contains all the ops in `operations`.  The
+  operations become the body of the function.
 
   The arguments `inputs` and `outputs` will be listed as the inputs
   and outputs tensors of the function.  They must be lists of
@@ -132,6 +133,8 @@ def _graph_to_function_def(graph, inputs, outputs, out_names=None):
 
   Args:
     graph: Graph.
+    operations: the operations to put in the function. Must be a subset of
+     the operations in the graph.
     inputs: List of tensors. Inputs to the function.
     outputs: List of tensors. Outputs of the function.
     out_names: Optional list of string names for the outputs.
@@ -145,12 +148,12 @@ def _graph_to_function_def(graph, inputs, outputs, out_names=None):
   func = function_pb2.FunctionDef()
   func.signature.name = "_"
   used_names = set()
-  func.signature.input_arg.extend([_tensor_to_argdef(i, used_names=used_names)
-                                   for i in inputs])
+  func.signature.input_arg.extend(
+      [_tensor_to_argdef(i, used_names=used_names) for i in inputs])
   if out_names is None:
     used_names = set()
-    func.signature.output_arg.extend([
-        _tensor_to_argdef(o, used_names=used_names) for o in outputs])
+    func.signature.output_arg.extend(
+        [_tensor_to_argdef(o, used_names=used_names) for o in outputs])
   elif len(outputs) != len(out_names):
     raise ValueError(
         "Length of out_names (%d) does not match number of outputs (%d): %s" %
@@ -159,12 +162,12 @@ def _graph_to_function_def(graph, inputs, outputs, out_names=None):
     raise ValueError(
         "Must not have duplicates in out_names: %s" % ", ".join(out_names))
   else:
-    func.signature.output_arg.extend([
-        _tensor_to_argdef(o, name=n) for o, n in zip(outputs, out_names)])
+    func.signature.output_arg.extend(
+        [_tensor_to_argdef(o, name=n) for o, n in zip(outputs, out_names)])
   func_arg_placeholders = set([i.name for i in inputs])
   input_dict = _create_input_dict(graph, func_arg_placeholders)
 
-  for op in graph.get_operations():
+  for op in operations:
     if _is_in_placeholders(op, func_arg_placeholders):
       continue
     _add_op_node(op, func, input_dict)
@@ -295,17 +298,18 @@ class _FuncGraph(ops.Graph):
     self.extra_args = []
     self.extra_vars = []
 
-  def getvar(self,
-             getter,
-             name,
-             shape=None,
-             dtype=None,
-             initializer=None,
-             reuse=None,
-             trainable=True,
-             collections=None,  # pylint: disable=redefined-outer-name
-             use_resource=None,
-             **kwargs):
+  def getvar(
+      self,
+      getter,
+      name,
+      shape=None,
+      dtype=None,
+      initializer=None,
+      reuse=None,
+      trainable=True,
+      collections=None,  # pylint: disable=redefined-outer-name
+      use_resource=None,
+      **kwargs):
     """A custom variable getter."""
     # Here, we switch the default graph to the outer graph and ask the
     # variable scope in which the function is defined to give us the
@@ -538,20 +542,23 @@ class _DefinedFunction(object):
 
     # Build the FunctionDef
     self._definition = _graph_to_function_def(
-        temp_graph, inputs, outputs, out_names=self._out_names)
+        temp_graph,
+        temp_graph.get_operations(),
+        inputs,
+        outputs,
+        out_names=self._out_names)
 
     # Extra kwargs are treated as attrs on the function def.
     sig_pre_func_name = self._func_name or _get_func_name(self._func)
-    kwargs_attr = _parse_kwargs_as_attrs(
-        sig_pre_func_name, **self._extra_kwargs)
+    kwargs_attr = _parse_kwargs_as_attrs(sig_pre_func_name,
+                                         **self._extra_kwargs)
     for k in kwargs_attr:
       self._definition.attr[k].CopyFrom(kwargs_attr[k])
 
     # Hash the definition and its dependencies.
     self._hash_str = self._create_hash_str(
         self._definition.signature.input_arg,
-        self._definition.signature.output_arg,
-        self._definition.node_def)
+        self._definition.signature.output_arg, self._definition.node_def)
 
     # Finally, we decide the function name to use.  If not specified,
     # make up something which is almost certainly unique (but deterministic).
@@ -658,8 +665,8 @@ def _from_definition(fdef, grad_func=None):
   # have access to such a callable here).
   func = None
   argnames = [arg.name for arg in fdef.signature.input_arg]
-  input_types = tuple(dtypes.as_dtype(arg.type)
-                      for arg in fdef.signature.input_arg)
+  input_types = tuple(
+      dtypes.as_dtype(arg.type) for arg in fdef.signature.input_arg)
   func_name = fdef.signature.name
   # Note: FunctionDefs do not include python gradient functions, so if the
   # original _DefinedFunction included one it will not be reflected here.
@@ -675,8 +682,7 @@ def _from_definition(fdef, grad_func=None):
   result._extra_inputs = []
   result._hash_str = result._create_hash_str(
       result._definition.signature.input_arg,
-      result._definition.signature.output_arg,
-      result._definition.node_def)
+      result._definition.signature.output_arg, result._definition.node_def)
   # pylint: enable=protected-access
   return result
 
@@ -696,7 +702,8 @@ def _from_library(lib):
   Raises:
     ValueError: `lib` is invalid
   """
-  if not lib.function and not lib.gradient: return []
+  if not lib.function and not lib.gradient:
+    return []
 
   # function name -> FunctionDef proto
   funcs = {fdef.signature.name: fdef for fdef in lib.function}
@@ -720,8 +727,9 @@ def _from_library(lib):
     grad_to_funcs[gdef.gradient_func].append(gdef.function_name)
 
   # Start with functions without gradients
-  ready = [fdef for fdef in lib.function
-           if func_to_grad[fdef.signature.name] is None]
+  ready = [
+      fdef for fdef in lib.function if func_to_grad[fdef.signature.name] is None
+  ]
   if not ready:
     raise ValueError("FunctionDefLibrary contains cyclic gradient functions!\n"
                      + str(lib))
@@ -733,7 +741,8 @@ def _from_library(lib):
     name = fdef.signature.name
 
     grad = initialized.get(func_to_grad[name])
-    if func_to_grad[name]: assert grad
+    if func_to_grad[name]:
+      assert grad
     defined_func = _from_definition(fdef, grad_func=grad)
     initialized[name] = defined_func
 
@@ -835,10 +844,15 @@ class _OverloadedFunction(object):
       name = self._func_name
       if name is not None:
         name = "_".join([name, key])
-      defined = _DefinedFunction(self._func, self._argnames, input_types, name,
-                                 None, self._python_grad_func,
-                                 out_names=self._out_names,
-                                 **self._extra_kwargs)
+      defined = _DefinedFunction(
+          self._func,
+          self._argnames,
+          input_types,
+          name,
+          None,
+          self._python_grad_func,
+          out_names=self._out_names,
+          **self._extra_kwargs)
       _ = defined.name  # Fully instantiate the function definition.
       if self._grad_func:
         # If _grad_func is given, it is another
@@ -849,8 +863,8 @@ class _OverloadedFunction(object):
             for _ in defined.definition.signature.output_arg
         ]
         # pylint: disable=protected-access
-        defined._grad_func = self._grad_func.instantiate(input_types +
-                                                         output_types)
+        defined._grad_func = self._grad_func.instantiate(
+            input_types + output_types)
         # pylint: enable=protected-access
       self._overload[key] = defined
     return defined
@@ -981,22 +995,36 @@ class Defun(object):
         raise ValueError(
             "The function has fewer arguments than the number of specified "
             "input types.")
-      return _DefinedFunction(func, argnames, self._input_types,
-                              self._func_name, self._grad_func,
-                              self._python_grad_func,
-                              out_names=self._out_names, **self._extra_kwargs)
+      return _DefinedFunction(
+          func,
+          argnames,
+          self._input_types,
+          self._func_name,
+          self._grad_func,
+          self._python_grad_func,
+          out_names=self._out_names,
+          **self._extra_kwargs)
 
     # 'func' expects no arguments and input types is an empty list.
     if min_args == 0 and max_args == 0:
-      return _DefinedFunction(func, [], [], self._func_name, self._grad_func,
-                              self._python_grad_func,
-                              out_names=self._out_names, **self._extra_kwargs)
+      return _DefinedFunction(
+          func, [], [],
+          self._func_name,
+          self._grad_func,
+          self._python_grad_func,
+          out_names=self._out_names,
+          **self._extra_kwargs)
 
     # Input types are unknown. It's an overloaded function and hence
     # its definition needs to be deferred until it's called.
-    return _OverloadedFunction(func, argnames, self._func_name, self._grad_func,
-                               self._python_grad_func,
-                               out_names=self._out_names, **self._extra_kwargs)
+    return _OverloadedFunction(
+        func,
+        argnames,
+        self._func_name,
+        self._grad_func,
+        self._python_grad_func,
+        out_names=self._out_names,
+        **self._extra_kwargs)
 
 
 class Declare(object):
@@ -1039,8 +1067,10 @@ class Declare(object):
       names = [n for n, t in args]
       if len(names) != len(set(names)):
         raise ValueError("Expected names to all be unique: %s" % str(names))
-      return [op_def_pb2.OpDef.ArgDef(type=t.as_datatype_enum, name=n)
-              for n, t in args]
+      return [
+          op_def_pb2.OpDef.ArgDef(type=t.as_datatype_enum, name=n)
+          for n, t in args
+      ]
 
     self._sig.input_arg.extend(_to_argdef_list(inputs))
     self._sig.output_arg.extend(_to_argdef_list(outputs))
-- 
GitLab


From feb26a7224b8018a02af94fa28eaaafd4ddd2147 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Fri, 5 May 2017 13:03:57 -0800
Subject: [PATCH 1053/1563] Clean up TensorBoard build and fix sync process
 Change: 155237534

---
 tensorflow/BUILD                              |  42 ++++
 .../components/tf_audio_dashboard/BUILD       |  63 ++++++
 .../components/tf_audio_dashboard/demo/BUILD  |  26 +++
 .../tf_audio_dashboard/demo/data/BUILD        |  17 ++
 .../tensorboard/components/tf_backend/BUILD   |  81 ++++++++
 .../components/tf_backend_d3v4/BUILD          |  45 +++++
 .../components/tf_color_scale/BUILD           |  65 +++++++
 .../components/tf_color_scale/demo/BUILD      |  26 +++
 .../components/tf_color_scale_d3v4/BUILD      |  72 +++++++
 .../components/tf_dashboard_common/BUILD      | 102 ++++++++++
 .../components/tf_dashboard_common/demo/BUILD |  31 +++
 .../components/tf_dashboard_common_d3v4/BUILD | 114 +++++++++++
 .../tf_distribution_dashboard/BUILD           |  63 ++++++
 .../tf_distribution_dashboard/demo/BUILD      |  26 +++
 .../tf_distribution_dashboard/demo/data/BUILD |  17 ++
 .../tensorboard/components/tf_globals/BUILD   |  49 +++++
 .../components/tf_globals_d3v4/BUILD          |  16 ++
 .../components/tf_graph_common/BUILD          |  65 +++++++
 .../components/tf_histogram_dashboard/BUILD   |  62 ++++++
 .../tf_histogram_dashboard/demo/BUILD         |  26 +++
 .../tf_histogram_dashboard/demo/data/BUILD    |  17 ++
 .../components/tf_image_dashboard/BUILD       |  59 ++++++
 .../components/tf_image_dashboard/demo/BUILD  |  25 +++
 .../tf_image_dashboard/demo/data/BUILD        |  17 ++
 .../tensorboard/components/tf_imports/BUILD   | 120 ++++++++++++
 .../components/tf_imports_d3v4/BUILD          |  78 ++++++++
 .../components/tf_scalar_dashboard/BUILD      |  77 ++++++++
 .../components/tf_scalar_dashboard/demo/BUILD |  26 +++
 .../tf_scalar_dashboard/demo/data/BUILD       |  17 ++
 .../tensorboard/components/tf_storage/BUILD   |  70 +++++++
 .../components/tf_storage_d3v4/BUILD          |  35 ++++
 .../components/tf_text_dashboard/BUILD        |  60 ++++++
 .../components/tf_text_dashboard/demo/BUILD   |  25 +++
 .../tf_text_dashboard/demo/data/BUILD         |  17 ++
 .../components/vz_data_summary/BUILD          |  91 +++++++++
 .../vz_data_summary/BUILD.OPENSOURCE          |  34 ----
 .../components/vz_distribution_chart/BUILD    |  69 +++++++
 .../vz_distribution_chart/demo/BUILD          |  24 +++
 .../vz_distribution_chart_d3v4/BUILD          |  66 +++++++
 .../components/vz_histogram_timeseries/BUILD  |  50 +++++
 .../vz_histogram_timeseries/demo/BUILD        |  25 +++
 .../vz_histogram_timeseries_d3v4/BUILD        |  63 ++++++
 .../components/vz_line_chart/BUILD            |  73 +++++++
 .../components/vz_line_chart/demo/BUILD       |  24 +++
 .../components/vz_line_chart_d3v4/BUILD       |  66 +++++++
 .../tensorboard/components/vz_projector/BUILD | 180 ++++++++++++++++++
 .../components/vz_projector/BUILD.OPENSOURCE  |  19 --
 .../components/vz_projector_d3v4/BUILD        | 179 +++++++++++++++++
 .../tensorboard/components/vz_sorting/BUILD   |  50 +++++
 .../components/vz_sorting/test/BUILD          |  40 ++++
 .../components/vz_sorting_d3v4/BUILD          |  27 +++
 tensorflow/tensorboard/defs.bzl               |  20 ++
 52 files changed, 2698 insertions(+), 53 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_backend/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_globals/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_imports/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_storage/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_data_summary/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
 create mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_projector/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_sorting/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_sorting/test/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index a36a57314d..de22a996ea 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -319,6 +319,48 @@ filegroup(
         "//tensorflow/tensorboard/backend:all_files",
         "//tensorflow/tensorboard/backend/event_processing:all_files",
         "//tensorflow/tensorboard/components:all_files",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_backend:all_files",
+        "//tensorflow/tensorboard/components/tf_backend_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_color_scale:all_files",
+        "//tensorflow/tensorboard/components/tf_color_scale/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:all_files",
+        "//tensorflow/tensorboard/components/tf_dashboard_common/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_globals:all_files",
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_common:all_files",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_image_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_image_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_imports:all_files",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_storage:all_files",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_text_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_text_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_data_summary:all_files",
+        "//tensorflow/tensorboard/components/vz_distribution_chart:all_files",
+        "//tensorflow/tensorboard/components/vz_distribution_chart/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_distribution_chart_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries:all_files",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_line_chart:all_files",
+        "//tensorflow/tensorboard/components/vz_line_chart/demo:all_files",
+        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_projector:all_files",
+        "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_sorting:all_files",
+        "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
new file mode 100644
index 0000000000..004bece78b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
@@ -0,0 +1,63 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_audio_dashboard",
+    srcs = [
+        "tf-audio-dashboard.html",
+        "tf-audio-grid.html",
+        "tf-audio-loader.html",
+    ],
+    path = "/tf-audio-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "@org_polymer",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-audio-dashboard.html",
+        "tf-audio-grid.html",
+        "tf-audio-loader.html",
+    ],
+    destdir = "tf-audio-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_backend:legacy",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = ["//tensorflow/tensorboard/components:common_deps"],
+)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
new file mode 100644
index 0000000000..383ea8d1b6
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_audio_dashboard/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-audio-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_audio_dashboard",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo/data",
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
new file mode 100644
index 0000000000..c3824a923d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
@@ -0,0 +1,17 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "data",
+    srcs = glob(["*"]),
+    path = "/tf-audio-dashboard/demo/data",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_backend/BUILD b/tensorflow/tensorboard/components/tf_backend/BUILD
new file mode 100644
index 0000000000..66fc429c60
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend/BUILD
@@ -0,0 +1,81 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# TODO(dandelion): Add webfiles support for the test code.
+
+webfiles(
+    name = "tf_backend",
+    srcs = [
+        "tf-backend.html",
+        ":ts",
+    ],
+    path = "/tf-backend",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/vz_sorting",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = [
+        "backend.ts",
+        "behavior.ts",
+        "requestManager.ts",
+        "router.ts",
+        "urlPathHelpers.ts",
+    ],
+    typings = [
+        "@org_definitelytyped//:d3.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
+        "//tensorflow/tensorboard/components/vz_sorting:ts_typings",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-backend.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "tf-backend",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [
+        "backend.ts",
+        "behavior.ts",
+        "requestManager.ts",
+        "router.ts",
+        "urlPathHelpers.ts",
+    ],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps",
+        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
new file mode 100644
index 0000000000..e54d0e222c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
@@ -0,0 +1,45 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = [
+        "backend.ts",
+        "behavior.ts",
+        "requestManager.ts",
+        "router.ts",
+        "urlPathHelpers.ts",
+    ],
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:ts",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3_v4:bundle",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+    ],
+)
+
+# TODO(dandelion): Add runners for these tests
+tensorboard_ts_library(
+    name = "tests",
+    srcs = [
+        "backendTests.ts",
+        "behaviorTests.ts",
+        "requestManagerTests.ts",
+    ],
+    deps = [
+        ":ts",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_color_scale/BUILD b/tensorflow/tensorboard/components/tf_color_scale/BUILD
new file mode 100644
index 0000000000..52102577b4
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale/BUILD
@@ -0,0 +1,65 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# TODO(dandelion): Add webfiles support for the test code.
+
+webfiles(
+    name = "tf_color_scale",
+    srcs = [
+        "tf-color-scale.html",
+        ":ts",
+    ],
+    path = "/tf-color-scale",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = [
+        "colorScale.ts",
+        "palettes.ts",
+    ],
+    typings = ["@org_definitelytyped//:d3.d.ts"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-color-scale.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-color-scale",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [
+        "colorScale.ts",
+        "palettes.ts",
+    ],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = ["//tensorflow/tensorboard/components:common_deps"],
+)
diff --git a/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD b/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
new file mode 100644
index 0000000000..00b8a033b8
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_color_scale/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-color-scale/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_color_scale",
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD b/tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD
new file mode 100644
index 0000000000..fd7d394a36
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD
@@ -0,0 +1,72 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_ts_development_sources",
+    "tensorboard_ts_devserver",
+    "tensorboard_ts_library",
+    "tensorboard_webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+# TODO(dandelion): Add runner for the test code.
+
+tensorboard_webcomponent_library(
+    name = "tf_color_scale",
+    srcs = ["tf-color-scale.html"],
+    ts_lib_deps = [":ts"],
+    deps = [
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = [
+        "colorScale.ts",
+        "palettes.ts",
+    ],
+    deps = ["//tensorflow/tensorboard/components:common_deps_d3v4"],
+)
+
+tensorboard_ts_library(
+    name = "tests",
+    srcs = ["colorScaleTests.ts"],
+    deps = [
+        ":ts",
+        "//tensorflow/tensorboard/components:common_deps_d3v4",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+tensorboard_webcomponent_library(
+    name = "demo",
+    srcs = ["demo.html"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":tf_color_scale",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/paper-button:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+    ],
+)
+
+tensorboard_ts_devserver(
+    name = "devserver",
+    manifest = ":dev_sources",
+    serving_path = "/demo_out/bundle.js",
+    static_files = [":demo"],
+)
+
+tensorboard_ts_development_sources(
+    name = "dev_sources",
+    deps = [
+        ":ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
new file mode 100644
index 0000000000..880e6bd712
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
@@ -0,0 +1,102 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_dashboard_common",
+    srcs = glob(["*.html"]) + [
+        ":ts",
+    ],
+    path = "/tf-dashboard-common",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/tf_imports:plottable",
+        "//tensorflow/tensorboard/components/tf_storage",
+        "//tensorflow/tensorboard/components/vz_sorting",
+        "@org_polymer",
+        "@org_polymer_iron_ajax",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_iron_icons",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_checkbox",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_input",
+        "@org_polymer_paper_item",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+        "@org_polymer_paper_styles",
+        "@org_polymer_paper_toggle_button",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = [
+        "categorizer.ts",
+        "dashboard-behavior.ts",
+        "reload-behavior.ts",
+    ],
+    typings = [
+        "@org_definitelytyped//:d3.d.ts",
+        "//tensorflow/tensorboard/components/vz_sorting:ts_typings",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = glob(["*.html"]) + [":legacy_ts"],
+    destdir = "tf-dashboard-common",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_storage:legacy",
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/polymer/v1/iron-ajax:lib",
+        "//third_party/javascript/polymer/v1/iron-collapse:lib",
+        "//third_party/javascript/polymer/v1/iron-icons:lib",
+        "//third_party/javascript/polymer/v1/paper-button:lib",
+        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
+        "//third_party/javascript/polymer/v1/paper-dialog:lib",
+        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+        "//third_party/javascript/polymer/v1/paper-input:lib",
+        "//third_party/javascript/polymer/v1/paper-item:lib",
+        "//third_party/javascript/polymer/v1/paper-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-slider:lib",
+        "//third_party/javascript/polymer/v1/paper-spinner:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [
+        "categorizer.ts",
+        "dashboard-behavior.ts",
+        "reload-behavior.ts",
+    ],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps",
+        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
new file mode 100644
index 0000000000..05cfe34e72
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
@@ -0,0 +1,31 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_dashboard_common/demo
+webfiles(
+    name = "demo",
+    srcs = [
+        "tf-categorizer-demo.html",
+        "tf-collapsable-pane-demo.html",
+        "tf-multi-checkbox-demo.html",
+        "tf-regex-group-demo.html",
+    ],
+    path = "/tf-dashboard-common/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_color_scale",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "@org_polymer_iron_flex_layout",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
new file mode 100644
index 0000000000..85f06dabb5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
@@ -0,0 +1,114 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_ts_development_sources",
+    "tensorboard_ts_devserver",
+    "tensorboard_ts_library",
+    "tensorboard_webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_webcomponent_library(
+    name = "tf_dashboard_common",
+    srcs = [
+        "dashboard-style.html",
+        "run-color-style.html",
+        "scrollbar-style.html",
+        "tensorboard-color.html",
+        "tf-categorizer.html",
+        "tf-collapsable-pane.html",
+        "tf-dashboard.html",
+        "tf-dashboard-layout.html",
+        "tf-downloader.html",
+        "tf-multi-checkbox.html",
+        "tf-no-data-warning.html",
+        "tf-option-selector.html",
+        "tf-panes-helper.html",
+        "tf-regex-group.html",
+        "tf-run-selector.html",
+        "tf-sidebar-helper.html",
+    ],
+    ts_lib_deps = [":ts"],
+    deps = [
+        "//third_party/javascript/plottable/v3:lib",
+        "//third_party/javascript/polymer/v1/iron-ajax:lib",
+        "//third_party/javascript/polymer/v1/iron-collapse:lib",
+        "//third_party/javascript/polymer/v1/iron-icons:lib",
+        "//third_party/javascript/polymer/v1/paper-button:lib",
+        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
+        "//third_party/javascript/polymer/v1/paper-dialog:lib",
+        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+        "//third_party/javascript/polymer/v1/paper-input:lib",
+        "//third_party/javascript/polymer/v1/paper-item:lib",
+        "//third_party/javascript/polymer/v1/paper-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-slider:lib",
+        "//third_party/javascript/polymer/v1/paper-spinner:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = [
+        "dashboard-behavior.ts",
+        "reload-behavior.ts",
+        "tf-categorizer.ts",
+        "tf-multi-checkbox.ts",
+        "tf-regex-group.ts",
+    ],
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps_d3v4",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:ts",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:ts",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "tests",
+    srcs = ["tf-categorizer-tests.ts"],
+    deps = [
+        ":ts",
+        "//tensorflow/tensorboard/components:common_deps_d3v4",
+    ],
+)
+
+tensorboard_webcomponent_library(
+    name = "demo",
+    srcs = [
+        "tf-categorizer-demo.html",
+        "tf-collapsable-pane-demo.html",
+        "tf-multi-checkbox-demo.html",
+        "tf-regex-group-demo.html",
+    ],
+    deps = [
+        ":tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4:tf_color_scale",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+    ],
+)
+
+tensorboard_ts_devserver(
+    name = "devserver",
+    manifest = ":dev_sources",
+    serving_path = "/demo_out/bundle.js",
+    static_files = [":demo"],
+)
+
+tensorboard_ts_development_sources(
+    name = "dev_sources",
+    deps = [
+        ":ts",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
new file mode 100644
index 0000000000..e71bbdea2b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
@@ -0,0 +1,63 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_distribution_dashboard",
+    srcs = [
+        "tf-distribution-dashboard.html",
+    ],
+    path = "/tf-distribution-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend",
+        "//tensorflow/tensorboard/components/tf_color_scale",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/vz_distribution_chart",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-distribution-dashboard.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-distribution-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_backend:legacy",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/vz_distribution_chart:legacy",
+        "//third_party/javascript/polymer/v1/iron-collapse:lib",
+        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = ["//tensorflow/tensorboard/components:common_deps"],
+)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
new file mode 100644
index 0000000000..238937c0c2
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_distribution_dashboard/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-distribution-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data",
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
new file mode 100644
index 0000000000..589c1980e4
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
@@ -0,0 +1,17 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "data",
+    srcs = glob(["*"]),
+    path = "/tf-distribution-dashboard/demo/data",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_globals/BUILD b/tensorflow/tensorboard/components/tf_globals/BUILD
new file mode 100644
index 0000000000..2e5e4b0515
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_globals/BUILD
@@ -0,0 +1,49 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# TODO(dandelion): Add webfiles support for the test code.
+
+webfiles(
+    name = "tf_globals",
+    srcs = [
+        "tf-globals.html",
+        ":ts",
+    ],
+    path = "/tf-globals",
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["globals.ts"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-globals.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-globals",
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = ["globals.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD b/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
new file mode 100644
index 0000000000..202e72aaa6
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
@@ -0,0 +1,16 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = ["globals.ts"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_common/BUILD b/tensorflow/tensorboard/components/tf_graph_common/BUILD
new file mode 100644
index 0000000000..772abbbd31
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common/BUILD
@@ -0,0 +1,65 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_common",
+    srcs = [
+        "tf-graph-common.html",
+        ":ts",
+    ],
+    path = "/tf-graph-common",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "//tensorflow/tensorboard/components/tf_imports:dagre",
+        "//tensorflow/tensorboard/components/tf_imports:graphlib",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = glob(["*.ts"]),
+    typings = [
+        "@org_definitelytyped//:d3.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-common.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-graph-common",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = glob(["*.ts"]),
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = ["//tensorflow/tensorboard/components:common_deps"],
+)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
new file mode 100644
index 0000000000..c74eafa658
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
@@ -0,0 +1,62 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_histogram_dashboard",
+    srcs = [
+        "tf-histogram-dashboard.html",
+    ],
+    path = "/tf-histogram-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend",
+        "//tensorflow/tensorboard/components/tf_color_scale",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-histogram-dashboard.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-histogram-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_backend:legacy",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries:legacy",
+        "//third_party/javascript/polymer/v1/iron-collapse:lib",
+        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
new file mode 100644
index 0000000000..8350084874
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_histogram_dashboard/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-histogram-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data",
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
new file mode 100644
index 0000000000..d396efab73
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
@@ -0,0 +1,17 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "data",
+    srcs = glob(["*"]),
+    path = "/tf-histogram-dashboard/demo/data",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
new file mode 100644
index 0000000000..b69fe6ba22
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
@@ -0,0 +1,59 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_image_dashboard",
+    srcs = [
+        "tf-image-dashboard.html",
+        "tf-image-loader.html",
+    ],
+    path = "/tf-image-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend",
+        "//tensorflow/tensorboard/components/tf_color_scale",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "@org_polymer",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-image-dashboard.html",
+        "tf-image-loader.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-image-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend:legacy",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
new file mode 100644
index 0000000000..3a42342ca0
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
@@ -0,0 +1,25 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_image_dashboard/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-image-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_image_dashboard",
+        "//tensorflow/tensorboard/components/tf_image_dashboard/demo/data",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
new file mode 100644
index 0000000000..a613ac66c7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
@@ -0,0 +1,17 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "data",
+    srcs = glob(["*"]),
+    path = "/tf-image-dashboard/demo/data",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_imports/BUILD b/tensorflow/tensorboard/components/tf_imports/BUILD
new file mode 100644
index 0000000000..b41a6bd446
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports/BUILD
@@ -0,0 +1,120 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "d3",
+    srcs = [
+        "d3.html",
+        "@org_d3js",
+    ],
+    path = "/tf-imports",
+)
+
+webfiles(
+    name = "lodash",
+    srcs = [
+        "lodash.html",
+        "@com_lodash",
+    ],
+    path = "/tf-imports",
+)
+
+webfiles(
+    name = "graphlib",
+    srcs = [
+        "graphlib.html",
+        "@io_github_cpettitt_graphlib",
+    ],
+    path = "/tf-imports",
+    deps = [":lodash"],
+)
+
+webfiles(
+    name = "dagre",
+    srcs = [
+        "dagre.html",
+        "@io_github_cpettitt_dagre",
+    ],
+    path = "/tf-imports",
+    deps = [
+        ":graphlib",
+        ":lodash",
+    ],
+)
+
+webfiles(
+    name = "plottable",
+    srcs = [
+        "plottable.html",
+        "@com_palantir_plottable//:plottable.css",
+        "@com_palantir_plottable//:plottable.js",
+    ],
+    path = "/tf-imports",
+    deps = [":d3"],
+)
+
+# Generate single TypeScript typings file for d3.js with no ES6 imports.
+#
+# The DefinitelyTyped definition of d3 v4 was written under the assumption that
+# we want to use d3 in a modularized way. We don't want to do that because its
+# import statements use NodeJS namespaces, and the Web Compiler only supports
+# W3C, ECMA, and IETF standards.
+genrule(
+    name = "d3v4_typings",
+    srcs = [
+        # please maintain a reverse topological order
+        "@org_definitelytyped_types_d3_path//:index.d.ts",
+        "@org_definitelytyped_types_d3_time//:index.d.ts",
+        "@org_definitelytyped_types_d3_dsv//:index.d.ts",
+        "@org_definitelytyped_types_d3_color//:index.d.ts",
+        "@org_definitelytyped_types_d3_selection//:index.d.ts",
+        # d3-transition defines stuff in d3-selection wat?
+        # "@org_definitelytyped_types_d3_transition//:index.d.ts",
+        "@org_definitelytyped_types_d3_shape//:index.d.ts",
+        "@org_definitelytyped_types_d3_scale//:index.d.ts",
+        "@org_definitelytyped_types_d3_request//:index.d.ts",
+        "@org_definitelytyped_types_d3_interpolate//:index.d.ts",
+        "@org_definitelytyped_types_d3_drag//:index.d.ts",
+        "@org_definitelytyped_types_d3_brush//:index.d.ts",
+        "@org_definitelytyped_types_d3_axis//:index.d.ts",
+        "@org_definitelytyped_types_d3_zoom//:index.d.ts",
+        "@org_definitelytyped_types_d3_array//:index.d.ts",
+        "@org_definitelytyped_types_d3_chord//:index.d.ts",
+        "@org_definitelytyped_types_d3_collection//:index.d.ts",
+        "@org_definitelytyped_types_d3_dispatch//:index.d.ts",
+        "@org_definitelytyped_types_d3_ease//:index.d.ts",
+        "@org_definitelytyped_types_d3_force//:index.d.ts",
+        "@org_definitelytyped_types_d3_format//:index.d.ts",
+        "@org_definitelytyped_types_d3_hierarchy//:index.d.ts",
+        "@org_definitelytyped_types_d3_polygon//:index.d.ts",
+        "@org_definitelytyped_types_d3_quadtree//:index.d.ts",
+        "@org_definitelytyped_types_d3_queue//:index.d.ts",
+        "@org_definitelytyped_types_d3_random//:index.d.ts",
+        "@org_definitelytyped_types_d3_timer//:index.d.ts",
+        "@org_definitelytyped_types_d3_voronoi//:index.d.ts",
+    ],
+    outs = ["d3v4.d.ts"],
+    cmd = "\n".join([
+        "(",
+        "  echo 'declare namespace d3 {'",
+        "  for f in $(SRCS); do",
+        "    echo",
+        "    echo /////////////////////////////////////////////",
+        "    echo // $$f",
+        "    echo /////////////////////////////////////////////",
+        "    echo",
+        "    sed '/^import /d' $$f",
+        "  done",
+        "  echo '}'",
+        ") >$@",
+    ]),
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
new file mode 100644
index 0000000000..23ecee759c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -0,0 +1,78 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "d3",
+    srcs = [
+        "d3.html",
+        "@org_d3js_v4",
+    ],
+    path = "/tf-imports-d3v4",
+)
+
+webfiles(
+    name = "lodash",
+    srcs = [
+        "lodash.html",
+        "@com_lodash",
+    ],
+    path = "/tf-imports-d3v4",
+)
+
+webfiles(
+    name = "graphlib",
+    srcs = [
+        "graphlib.html",
+        "@io_github_cpettitt_graphlib",
+    ],
+    path = "/tf-imports-d3v4",
+    deps = [":lodash"],
+)
+
+webfiles(
+    name = "dagre",
+    srcs = [
+        "dagre.html",
+        "@io_github_cpettitt_dagre",
+    ],
+    path = "/tf-imports-d3v4",
+    deps = [
+        ":graphlib",
+        ":lodash",
+    ],
+)
+
+webfiles(
+    name = "plottable",
+    srcs = [
+        "plottable.html",
+        # TODO(jart): Replace when Plottable v3 is fixed.
+        "plottable.js",
+        "plottable.css",
+        # "//third_party/javascript/plottable/v3:plottable.css",
+        # "//third_party/javascript/plottable/v3:plottable.js",
+    ],
+    path = "/tf-imports-d3v4",
+    deps = [":d3"],
+)
+
+genrule(
+    name = "TEMPORARY_fake_plottable_css",
+    outs = ["plottable.css"],
+    cmd = "echo >$@",
+)
+
+genrule(
+    name = "TEMPORARY_fake_plottable_js",
+    outs = ["plottable.js"],
+    cmd = "echo >$@",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
new file mode 100644
index 0000000000..436d0c262d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
@@ -0,0 +1,77 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_scalar_dashboard",
+    srcs = [
+        "tf-scalar-dashboard.html",
+        "tf-smoothing-input.html",
+    ],
+    path = "/tf-scalar-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend",
+        "//tensorflow/tensorboard/components/tf_color_scale",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/vz_line_chart",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_paper_checkbox",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_input",
+        "@org_polymer_paper_item",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-scalar-dashboard.html",
+        "tf-smoothing-input.html",
+    ],
+    destdir = "tf-scalar-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_backend:legacy",
+        "//tensorflow/tensorboard/components/tf_color_scale:legacy",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/vz_line_chart:legacy",
+        "//third_party/javascript/polymer/v1/iron-collapse:lib",
+        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
+        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+        "//third_party/javascript/polymer/v1/paper-input:lib",
+        "//third_party/javascript/polymer/v1/paper-item:lib",
+        "//third_party/javascript/polymer/v1/paper-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-slider:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = ["//tensorflow/tensorboard/components:common_deps"],
+)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
new file mode 100644
index 0000000000..218fda3fdb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_scalar_dashboard/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-scalar-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
new file mode 100644
index 0000000000..7f39d27f60
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
@@ -0,0 +1,17 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "data",
+    srcs = glob(["*"]),
+    path = "/tf-scalar-dashboard/demo/data",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_storage/BUILD b/tensorflow/tensorboard/components/tf_storage/BUILD
new file mode 100644
index 0000000000..e796340e03
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage/BUILD
@@ -0,0 +1,70 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# TODO(dandelion): Add webfiles support for the test code.
+
+webfiles(
+    name = "tf_storage",
+    srcs = [
+        "tf-storage.html",
+        ":ts",
+    ],
+    path = "/tf-storage",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_globals",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = [
+        "storage.ts",
+    ],
+    typings = [
+        "@org_definitelytyped//:lodash.d.ts",
+        "//tensorflow/tensorboard/components/tf_globals:ts_typings",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-storage.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "tf-storage",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_globals:legacy",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = ["storage.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps",
+        "//tensorflow/tensorboard/components/tf_globals:legacy_ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD b/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
new file mode 100644
index 0000000000..877f026319
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
@@ -0,0 +1,35 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# TODO(dandelion): Add test runner.
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = ["storage.ts"],
+    deps = [
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:ts",
+        "//third_party/javascript/lodash:lodash-module",
+        "//third_party/javascript/typings/lodash",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "tests",
+    srcs = ["storageTests.ts"],
+    deps = [
+        ":ts",
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:ts",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/sinon",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
new file mode 100644
index 0000000000..71e16db691
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
@@ -0,0 +1,60 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_text_dashboard",
+    srcs = [
+        "tf-text-dashboard.html",
+        "tf-text-loader.html",
+    ],
+    path = "/tf-text-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend",
+        "//tensorflow/tensorboard/components/tf_color_scale",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "@org_polymer",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_material",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-text-dashboard.html",
+        "tf-text-loader.html",
+    ],
+    destdir = "tf-text-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend:legacy",
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//third_party/javascript/polymer/v1/paper-material:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
new file mode 100644
index 0000000000..6cd6702e4b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
@@ -0,0 +1,25 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_text_dashboard/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-text-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_text_dashboard",
+        "//tensorflow/tensorboard/components/tf_text_dashboard/demo/data",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
new file mode 100644
index 0000000000..8adf661396
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
@@ -0,0 +1,17 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "data",
+    srcs = glob(["*"]),
+    path = "/tf-text-dashboard/demo/data/plugin/text",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_data_summary/BUILD b/tensorflow/tensorboard/components/vz_data_summary/BUILD
new file mode 100644
index 0000000000..a4ba0c089c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_data_summary/BUILD
@@ -0,0 +1,91 @@
+package(default_visibility = ["//visibility:public"])
+
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_ts_config",
+    "tensorboard_ts_declaration",
+    "tensorboard_ts_development_sources",
+    "tensorboard_ts_devserver",
+    "tensorboard_ts_library",
+    "tensorboard_webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_webcomponent_library(
+    name = "lib",
+    srcs = ["vz-data-summary.html"],
+    ts_lib_deps = [":ts_lib"],
+    destdir = "vz-data-summary",
+    deps = [
+        "//learning/vis/vz_elements:common",
+        "//third_party/javascript/d3/v3:lib",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/iron-resizable-behavior:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "ts_lib",
+    srcs = ["vz-data-summary.ts"],
+    externs_list = [":externs"],
+    deps = [
+        ":typings",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+    ],
+)
+
+tensorboard_ts_declaration(
+    name = "typings",
+    srcs = ["typings.d.ts"],
+)
+
+# This build rule is used to run the demo.
+tensorboard_ts_devserver(
+    name = "dev_server",
+    manifest = ":dev_sources",
+    serving_path = "/demo_lib_out/vz-data-summary/vz-data-summary.js",
+    static_files = [":demo_lib"],
+    deps = [":tsconfig"],
+)
+
+tensorboard_webcomponent_library(
+    name = "demo_lib",
+    srcs = ["demo.html"],
+    destdir = "vz-data-summary",
+    deps = [
+        ":lib",
+        "//third_party/javascript/d3/v3:lib",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/iron-resizable-behavior:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "demo_ts_lib",
+    srcs = ["demo.ts"],
+    externs_list = [":externs"],
+    deps = [
+        ":ts_lib",
+        "//third_party/javascript/typings/d3",
+    ],
+)
+
+tensorboard_ts_development_sources(
+    name = "dev_sources",
+    deps = [":demo_ts_lib"],
+)
+
+tensorboard_ts_config(
+    name = "tsconfig",
+    deps = [":ts_lib"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE b/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
deleted file mode 100644
index 9743d70d94..0000000000
--- a/tensorflow/tensorboard/components/vz_data_summary/BUILD.OPENSOURCE
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the 'License');
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an 'AS IS' BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# =============================================================================
-
-# Description:
-# Package for the data-summary vz-element.
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
new file mode 100644
index 0000000000..5ce98b1d7c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
@@ -0,0 +1,69 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "vz_distribution_chart",
+    srcs = [
+        "vz-distribution-chart.html",
+        ":ts",
+    ],
+    path = "/vz-distribution-chart",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/tf_imports:plottable",
+        "//tensorflow/tensorboard/components/vz_line_chart",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["vz-distribution-chart.ts"],
+    typings = [
+        "@org_definitelytyped//:d3.d.ts",
+        "@com_palantir_plottable//:plottable.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
+        "//tensorflow/tensorboard/components/vz_line_chart:ts_typings",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "vz-distribution-chart.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "vz-distribution-chart",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = ["vz-distribution-chart.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps",
+        "//tensorflow/tensorboard/components/vz_line_chart:legacy_ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
new file mode 100644
index 0000000000..77f05aa2d4
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/vz_distribution_chart/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/vz-distribution-chart/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/vz_distribution_chart",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
new file mode 100644
index 0000000000..384fc6f44c
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
@@ -0,0 +1,66 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_ts_development_sources",
+    "tensorboard_ts_devserver",
+    "tensorboard_ts_library",
+    "tensorboard_webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = ["vz-distribution-chart.ts"],
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps_d3v4",
+        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:ts",
+        "//third_party/javascript/lodash:lodash-module",
+        "//third_party/javascript/plottable/v3:bundle",
+    ],
+)
+
+tensorboard_webcomponent_library(
+    name = "vz_distribution_chart",
+    srcs = [
+        "demo.html",
+        "vz-distribution-chart.html",
+    ],
+    ts_lib_deps = [":ts"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/plottable/v3:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_webcomponent_library(
+    name = "demo",
+    srcs = ["demo.html"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":vz_distribution_chart",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+    ],
+)
+
+tensorboard_ts_devserver(
+    name = "devserver",
+    manifest = ":dev_sources",
+    serving_path = "/demo_out/bundle.js",
+    static_files = [":demo"],
+)
+
+tensorboard_ts_development_sources(
+    name = "dev_sources",
+    deps = [":ts"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
new file mode 100644
index 0000000000..31032a6b23
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
@@ -0,0 +1,50 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "vz_histogram_timeseries",
+    srcs = [
+        "vz-histogram-timeseries.html",
+    ],
+    path = "/vz-histogram-timeseries",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:d3",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "index.html",
+        "vz-histogram-timeseries.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "vz-histogram-timeseries",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
new file mode 100644
index 0000000000..894de95be6
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
@@ -0,0 +1,25 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/vz-histogram-timeseries/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
new file mode 100644
index 0000000000..02c0640742
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
@@ -0,0 +1,63 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "vz_histogram_timeseries",
+    srcs = [
+        "vz-histogram-timeseries.html",
+    ],
+    path = "/vz-histogram-timeseries",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+# bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
+webfiles(
+    name = "demo",
+    srcs = ["demo.html"],
+    path = "/vz-histogram-timeseries",
+    deps = [
+        ":vz_histogram_timeseries",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "vz-histogram-timeseries.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "vz-histogram-timeseries",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/vz_line_chart/BUILD b/tensorflow/tensorboard/components/vz_line_chart/BUILD
new file mode 100644
index 0000000000..7b13abd721
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart/BUILD
@@ -0,0 +1,73 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "vz_line_chart",
+    srcs = [
+        "vz-line-chart.html",
+        ":ts",
+    ],
+    path = "/vz-line-chart",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/tf_imports:plottable",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = [
+        "dragZoomInteraction.ts",
+        "vz-chart-helpers.ts",
+        "vz-line-chart.ts",
+    ],
+    typings = [
+        "@org_definitelytyped//:d3.d.ts",
+        "@com_palantir_plottable//:plottable.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "index.html",
+        "vz-line-chart.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "vz-line-chart",
+    deps = [
+        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [
+        "dragZoomInteraction.ts",
+        "vz-chart-helpers.ts",
+        "vz-line-chart.ts",
+    ],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = ["//tensorflow/tensorboard/components:common_deps"],
+)
diff --git a/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
new file mode 100644
index 0000000000..84699b67b6
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/vz_line_chart/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/vz-line-chart/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/vz_line_chart",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
new file mode 100644
index 0000000000..fd460b3608
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
@@ -0,0 +1,66 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_ts_development_sources",
+    "tensorboard_ts_devserver",
+    "tensorboard_ts_library",
+    "tensorboard_webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = [
+        "dragZoomInteraction.ts",
+        "vz-chart-helpers.ts",
+        "vz-line-chart.ts",
+    ],
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps_d3v4",
+        "//third_party/javascript/lodash:lodash-module",
+        "//third_party/javascript/plottable/v3:bundle",
+    ],
+)
+
+tensorboard_webcomponent_library(
+    name = "vz_line_chart",
+    srcs = ["vz-line-chart.html"],
+    ts_lib_deps = [":ts"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/plottable/v3:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_webcomponent_library(
+    name = "demo",
+    srcs = ["demo.html"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":vz_line_chart",
+        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+    ],
+)
+
+tensorboard_ts_devserver(
+    name = "devserver",
+    manifest = ":dev_sources",
+    serving_path = "/demo_out/bundle.js",
+    static_files = [":demo"],
+)
+
+tensorboard_ts_development_sources(
+    name = "dev_sources",
+    deps = [":ts"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_projector/BUILD b/tensorflow/tensorboard/components/vz_projector/BUILD
new file mode 100644
index 0000000000..0ea94b9a22
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector/BUILD
@@ -0,0 +1,180 @@
+package(default_visibility = [":projector_group"])
+
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_karma_web_test_suite",
+    "tensorboard_ts_config",
+    "tensorboard_ts_declaration",
+    "tensorboard_ts_development_sources",
+    "tensorboard_ts_library",
+    "tensorboard_webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+# Visibility group for all clients of projector.
+package_group(
+    name = "projector_group",
+    packages = [
+        "//apps/labs/towerbridge/...",
+        "//experimental/bigpicture/projector/...",
+        "//java/com/google/apps/labs/towerbridge/...",
+        "//learning/vis/projector/...",
+        "//tensorflow/tensorboard/...",
+    ],
+)
+
+tensorboard_ts_declaration(
+    name = "external",
+    srcs = ["external.d.ts"],
+)
+
+tensorboard_ts_library(
+    name = "ts_lib",
+    srcs = glob(
+        ["*.ts"],
+        exclude = [
+            "*.d.ts",
+            "*_test.ts",
+            "bh_tsne.ts",
+            "sptree.ts",
+        ],
+    ),
+    runtime_deps = [
+        "//third_party/javascript/d3/v3:d3",
+        "//third_party/javascript/numericjs",
+        "//third_party/javascript/threejs/r77:threejs",
+        "//third_party/javascript/threejs/r77/examples/js/controls:orbitcontrols",
+        "//third_party/javascript/weblas",
+    ],
+    deps = [
+        ":external",
+        ":tsne_ts_lib",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/threejs:three",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "tsne_ts_lib",
+    srcs = [
+        "bh_tsne.ts",
+        "sptree.ts",
+    ],
+)
+
+_PROJECTOR_LIB_DEPS = [
+    "//third_party/javascript/polymer/v1/iron-collapse:lib",
+    "//third_party/javascript/polymer/v1/iron-icons:lib",
+    "//third_party/javascript/polymer/v1/paper-button:lib",
+    "//third_party/javascript/polymer/v1/paper-checkbox:lib",
+    "//third_party/javascript/polymer/v1/paper-dialog:lib",
+    "//third_party/javascript/polymer/v1/paper-dialog-scrollable:lib",
+    "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
+    "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+    "//third_party/javascript/polymer/v1/paper-input:lib",
+    "//third_party/javascript/polymer/v1/paper-item:lib",
+    "//third_party/javascript/polymer/v1/paper-listbox:lib",
+    "//third_party/javascript/polymer/v1/paper-slider:lib",
+    "//third_party/javascript/polymer/v1/paper-spinner:lib",
+    "//third_party/javascript/polymer/v1/paper-toast:lib",
+    "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
+    "//third_party/javascript/polymer/v1/paper-tooltip:lib",
+    "//third_party/javascript/polymer/v1/polymer:lib",
+]
+
+_PROJECTOR_DESTDIR = "vz-projector"
+
+_PROJECTOR_LIB_TS_LIB_DEPS = [
+    ":ts_lib",
+    ":tsne_ts_lib",
+]
+
+# Standalone embedding projector demos should depend on this target. We
+# exclude the HTML file for the dashboard itself. Demos do not need that
+# HTML file. This was introduced because standalone demos as of today
+# have an additional Closure pass that uses a compilation configuration
+# stricter than that of TensorBoard.
+tensorboard_webcomponent_library(
+    name = "lib",
+    srcs = glob(
+        ["*.html"],
+        exclude = ["vz-projector-dashboard.html"],
+    ),
+    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
+    destdir = _PROJECTOR_DESTDIR,
+    deps = _PROJECTOR_LIB_DEPS,
+)
+
+# TensorBoard, however, should depend on this target, which includes
+# the HTML file for the dashboard.
+tensorboard_webcomponent_library(
+    name = "lib_for_tensorboard",
+    srcs = glob(["*.html"]),
+    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
+    destdir = _PROJECTOR_DESTDIR,
+    deps = _PROJECTOR_LIB_DEPS,
+)
+
+### Tests ###
+
+tensorboard_ts_library(
+    name = "ts_test",
+    testonly = 1,
+    srcs = glob(["*_test.ts"]),
+    runtime_deps = [
+        "//third_party/javascript/polymer/v1/polymer:lib_all_js",
+    ],
+    deps = [
+        ":ts_lib",
+        ":tsne_ts_lib",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/jasmine:jasmine_without_externs",
+        "//third_party/javascript/typings/mocha",
+    ],
+)
+
+tensorboard_ts_development_sources(
+    name = "dev_sources_for_test",
+    testonly = 1,
+    runtime_deps = [
+        "//third_party/javascript/chai",
+        "//third_party/javascript/mocha",
+    ],
+    deps = [
+        ":ts_test",
+    ],
+)
+
+# To run locally, run :all_tests_local
+tensorboard_karma_web_test_suite(
+    name = "all_tests",
+    size = "medium",
+    browsers = ["//testing/web/browsers:chrome-linux"],
+    manifest = ":dev_sources_for_test",
+)
+
+# Generate a TypeScript IDE project by running this target.
+tensorboard_ts_config(
+    name = "tsconfig",
+    deps = [
+        ":ts_lib",
+        ":ts_test",
+        ":tsne_ts_lib",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE b/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
deleted file mode 100644
index 8c222be10e..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/BUILD.OPENSOURCE
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description:
-# Package for the Embedding Projector component.
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
new file mode 100644
index 0000000000..d9703d080d
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
@@ -0,0 +1,179 @@
+package(default_visibility = [":projector_group"])
+
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_karma_web_test_suite",
+    "tensorboard_ts_config",
+    "tensorboard_ts_declaration",
+    "tensorboard_ts_development_sources",
+    "tensorboard_ts_library",
+    "tensorboard_webcomponent_library",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**"],
+        exclude = [
+            "OWNERS",
+            "tsconfig.json",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+# Visibility group for all clients of projector.
+package_group(
+    name = "projector_group",
+    packages = [
+        "//apps/labs/towerbridge/...",
+        "//experimental/bigpicture/projector/...",
+        "//java/com/google/apps/labs/towerbridge/...",
+        "//learning/vis/projector/...",
+        "//tensorflow/tensorboard/...",
+    ],
+)
+
+tensorboard_ts_declaration(
+    name = "external",
+    srcs = ["external.d.ts"],
+)
+
+tensorboard_ts_library(
+    name = "ts_lib",
+    srcs = glob(
+        ["*.ts"],
+        exclude = [
+            "*.d.ts",
+            "*_test.ts",
+            "bh_tsne.ts",
+            "sptree.ts",
+        ],
+    ),
+    runtime_deps = [
+        "//third_party/javascript/numericjs",
+        "//third_party/javascript/threejs/r77:threejs",
+        "//third_party/javascript/threejs/r77/examples/js/controls:orbitcontrols",
+        "//third_party/javascript/weblas",
+    ],
+    deps = [
+        ":external",
+        ":tsne_ts_lib",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/typings/d3_v4:bundle",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/threejs:three",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "tsne_ts_lib",
+    srcs = [
+        "bh_tsne.ts",
+        "sptree.ts",
+    ],
+)
+
+_PROJECTOR_LIB_DEPS = [
+    "//third_party/javascript/polymer/v1/iron-collapse:lib",
+    "//third_party/javascript/polymer/v1/iron-icons:lib",
+    "//third_party/javascript/polymer/v1/paper-button:lib",
+    "//third_party/javascript/polymer/v1/paper-checkbox:lib",
+    "//third_party/javascript/polymer/v1/paper-dialog:lib",
+    "//third_party/javascript/polymer/v1/paper-dialog-scrollable:lib",
+    "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
+    "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+    "//third_party/javascript/polymer/v1/paper-input:lib",
+    "//third_party/javascript/polymer/v1/paper-item:lib",
+    "//third_party/javascript/polymer/v1/paper-listbox:lib",
+    "//third_party/javascript/polymer/v1/paper-slider:lib",
+    "//third_party/javascript/polymer/v1/paper-spinner:lib",
+    "//third_party/javascript/polymer/v1/paper-toast:lib",
+    "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
+    "//third_party/javascript/polymer/v1/paper-tooltip:lib",
+    "//third_party/javascript/polymer/v1/polymer:lib",
+]
+
+_PROJECTOR_DESTDIR = "vz-projector"
+
+_PROJECTOR_LIB_TS_LIB_DEPS = [
+    ":ts_lib",
+    ":tsne_ts_lib",
+]
+
+# Standalone embedding projector demos should depend on this target. We
+# exclude the HTML file for the dashboard itself. Demos do not need that
+# HTML file. This was introduced because standalone demos as of today
+# have an additional Closure pass that uses a compilation configuration
+# stricter than that of TensorBoard.
+tensorboard_webcomponent_library(
+    name = "lib",
+    srcs = glob(
+        ["*.html"],
+        exclude = ["vz-projector-dashboard.html"],
+    ),
+    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
+    destdir = _PROJECTOR_DESTDIR,
+    deps = _PROJECTOR_LIB_DEPS,
+)
+
+# TensorBoard, however, should depend on this target, which includes
+# the HTML file for the dashboard.
+tensorboard_webcomponent_library(
+    name = "lib_for_tensorboard",
+    srcs = glob(["*.html"]),
+    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
+    destdir = _PROJECTOR_DESTDIR,
+    deps = _PROJECTOR_LIB_DEPS,
+)
+
+### Tests ###
+
+tensorboard_ts_library(
+    name = "ts_test",
+    testonly = 1,
+    srcs = glob(["*_test.ts"]),
+    runtime_deps = [
+        "//third_party/javascript/polymer/v1/polymer:lib_all_js",
+    ],
+    deps = [
+        ":ts_lib",
+        ":tsne_ts_lib",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/jasmine:jasmine_without_externs",
+        "//third_party/javascript/typings/mocha",
+    ],
+)
+
+tensorboard_ts_development_sources(
+    name = "dev_sources_for_test",
+    testonly = 1,
+    runtime_deps = [
+        "//third_party/javascript/chai",
+        "//third_party/javascript/mocha",
+    ],
+    deps = [
+        ":ts_test",
+    ],
+)
+
+# To run locally, run :all_tests_local
+tensorboard_karma_web_test_suite(
+    name = "all_tests",
+    size = "medium",
+    browsers = ["//testing/web/browsers:chrome-linux"],
+    manifest = ":dev_sources_for_test",
+)
+
+# Generate a TypeScript IDE project by running this target.
+tensorboard_ts_config(
+    name = "tsconfig",
+    deps = [
+        ":ts_lib",
+        ":ts_test",
+        ":tsne_ts_lib",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/vz_sorting/BUILD b/tensorflow/tensorboard/components/vz_sorting/BUILD
new file mode 100644
index 0000000000..8efedb3639
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting/BUILD
@@ -0,0 +1,50 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "vz_sorting",
+    srcs = [
+        "vz-sorting.html",
+        ":ts",
+    ],
+    path = "/vz-sorting",
+    visibility = ["//visibility:public"],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["sorting.ts"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "vz-sorting.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "vz-sorting",
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = ["sorting.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = ["//tensorflow/tensorboard/components:common_deps"],
+)
diff --git a/tensorflow/tensorboard/components/vz_sorting/test/BUILD b/tensorflow/tensorboard/components/vz_sorting/test/BUILD
new file mode 100644
index 0000000000..d1cf5a596a
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting/test/BUILD
@@ -0,0 +1,40 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_wct_test_suite")
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_wct_test_suite(
+    name = "legacy_test",
+    size = "medium",
+    srcs = [
+        "index.html",
+        ":legacy_ts",
+    ],
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/polymer/v1/webcomponentsjs:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    testonly = 1,
+    srcs = ["sortingTests.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//tensorflow/tensorboard/components:common_deps",
+        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD b/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
new file mode 100644
index 0000000000..6e6ce525b4
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
@@ -0,0 +1,27 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_ts_library(
+    name = "ts",
+    srcs = ["sorting.ts"],
+)
+
+tensorboard_ts_library(
+    name = "tests",
+    srcs = ["sortingTests.ts"],
+    deps = [
+        ":ts",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/sinon",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/defs.bzl b/tensorflow/tensorboard/defs.bzl
index 7bb5f961c9..5d88baa5be 100644
--- a/tensorflow/tensorboard/defs.bzl
+++ b/tensorflow/tensorboard/defs.bzl
@@ -60,6 +60,26 @@ def tensorboard_typescript_genrule(name, srcs, typings=[], **kwargs):
       **kwargs
   )
 
+def tensorboard_karma_web_test_suite(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
+def tensorboard_ts_config(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
+def tensorboard_ts_declaration(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
+def tensorboard_ts_development_sources(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
+def tensorboard_ts_devserver(**kwargs):
+  """Rules referencing this will be deleted from the codebase soon."""
+  pass
+
 def tensorboard_ts_library(**kwargs):
   """Rules referencing this will be deleted from the codebase soon."""
   pass
-- 
GitLab


From 3cffa5fd4fcb2b2ef1fc244c1cf11dda507896cf Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 13:53:38 -0800
Subject: [PATCH 1054/1563] Modify make_export_strategy to work with core
 Estimator. Change: 155243616

---
 .../learn/python/learn/experiment_test.py     | 83 ++++++++++++++++---
 .../learn/utils/saved_model_export_utils.py   | 34 ++++++--
 2 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/experiment_test.py b/tensorflow/contrib/learn/python/learn/experiment_test.py
index 9ecfc73299..17feeb2736 100644
--- a/tensorflow/contrib/learn/python/learn/experiment_test.py
+++ b/tensorflow/contrib/learn/python/learn/experiment_test.py
@@ -22,6 +22,7 @@ import os
 import tempfile
 import time
 
+from tensorflow.contrib.learn.python.learn import estimator as estimator_lib
 from tensorflow.contrib.learn.python.learn import evaluable
 from tensorflow.contrib.learn.python.learn import experiment
 from tensorflow.contrib.learn.python.learn import run_config
@@ -38,6 +39,7 @@ from tensorflow.python.training import saver
 from tensorflow.python.training import server_lib
 from tensorflow.python.training import session_run_hook
 from tensorflow.python.util import compat
+from tensorflow.python.util import tf_inspect
 
 
 class SheepCounter(object):
@@ -119,6 +121,15 @@ class TestBaseEstimator(object):
         compat.as_bytes(export_dir_base), compat.as_bytes('bogus_timestamp'))
 
 
+def _check_method_supports_args(method, kwargs):
+  """Checks that the given method supports the given args."""
+  supported_args = tuple(tf_inspect.getargspec(method).args)
+  for kwarg in kwargs:
+    if kwarg not in supported_args:
+      raise ValueError(
+          'Argument `{}` is not supported in method {}.'.format(kwarg, method))
+
+
 class TestEstimator(
     TestBaseEstimator, evaluable.Evaluable, trainable.Trainable):
 
@@ -126,9 +137,12 @@ class TestEstimator(
     super(TestEstimator, self).__init__(config, max_evals, eval_dict)
     tf_logging.info('Create Estimator')
 
+  def evaluate(self, **kwargs):
+    _check_method_supports_args(evaluable.Evaluable.evaluate, kwargs)
+    return super(TestEstimator, self).evaluate(**kwargs)
+
   def fit(self, **kwargs):
-    if 'hooks' in kwargs:
-      raise ValueError('`hooks` is defined in core Estimator')
+    _check_method_supports_args(trainable.Trainable.fit, kwargs)
     if 'monitors' in kwargs:
       self.monitors = kwargs['monitors']
     return super(TestEstimator, self).train(**kwargs)
@@ -136,6 +150,13 @@ class TestEstimator(
   def train(self, **kwargs):
     raise ValueError('`train` is not defined in Estimator.')
 
+  def export_savedmodel(
+      self, export_dir_base, serving_input_fn, **kwargs):
+    _check_method_supports_args(
+        estimator_lib.Estimator.export_savedmodel, kwargs)
+    return super(TestEstimator, self).export_savedmodel(
+        export_dir_base, serving_input_fn, **kwargs)
+
 
 class TestCoreEstimator(TestBaseEstimator, core_estimator.Estimator):
 
@@ -144,17 +165,22 @@ class TestCoreEstimator(TestBaseEstimator, core_estimator.Estimator):
     tf_logging.info('Create Core Estimator')
 
   def evaluate(self, **kwargs):
-    if 'eval_metrics' in kwargs:
-      raise ValueError('`eval_metrics` is not defined in core Estimator')
+    _check_method_supports_args(core_estimator.Estimator.evaluate, kwargs)
     return super(TestCoreEstimator, self).evaluate(**kwargs)
 
   def train(self, **kwargs):
-    if 'monitors' in kwargs:
-      raise ValueError('`monitors` is not defined in core Estimator')
+    _check_method_supports_args(core_estimator.Estimator.train, kwargs)
     if 'hooks' in kwargs:
       self.monitors = kwargs['hooks']
     return super(TestCoreEstimator, self).train(**kwargs)
 
+  def export_savedmodel(
+      self, export_dir_base, serving_input_receiver_fn, **kwargs):
+    _check_method_supports_args(
+        core_estimator.Estimator.export_savedmodel, kwargs)
+    return super(TestCoreEstimator, self).export_savedmodel(
+        export_dir_base, serving_input_receiver_fn, **kwargs)
+
 
 class _NoopHook(session_run_hook.SessionRunHook):
   pass
@@ -184,6 +210,23 @@ class ExperimentTest(test.TestCase):
           eval_input_fn='eval_input',
           eval_metrics='eval_metrics')
 
+  def test_default_output_alternative_key_core_estimator(self):
+    est = TestCoreEstimator()
+    export_strategy = saved_model_export_utils.make_export_strategy(
+        est,
+        default_output_alternative_key='export_key',
+        exports_to_keep=None)
+    ex = experiment.Experiment(
+        est,
+        train_input_fn='train_input',
+        eval_input_fn='eval_input',
+        train_steps=100,
+        eval_steps=100,
+        export_strategies=export_strategy)
+    with self.assertRaisesRegexp(
+        ValueError, 'default_output_alternative_key is not supported'):
+      ex.train_and_evaluate()
+
   def test_train(self):
     for est in self._estimators_for_tests():
       eval_metrics = 'eval_metrics' if not isinstance(
@@ -508,7 +551,9 @@ class ExperimentTest(test.TestCase):
       eval_metrics = 'eval_metrics' if not isinstance(
           est, core_estimator.Estimator) else None
       export_strategy_1 = saved_model_export_utils.make_export_strategy(
-          est, 'export_input_1', exports_to_keep=None)
+          est,
+          None if isinstance(est, core_estimator.Estimator) else 'export_1',
+          exports_to_keep=None)
 
       ex = experiment.Experiment(
           est,
@@ -531,9 +576,13 @@ class ExperimentTest(test.TestCase):
       # After reset with list, the count should increase with the number of
       # items.
       export_strategy_2 = saved_model_export_utils.make_export_strategy(
-          est, 'export_input_2', exports_to_keep=None)
+          est,
+          None if isinstance(est, core_estimator.Estimator) else 'export_2',
+          exports_to_keep=None)
       export_strategy_3 = saved_model_export_utils.make_export_strategy(
-          est, 'export_input_3', exports_to_keep=None)
+          est,
+          None if isinstance(est, core_estimator.Estimator) else 'export_3',
+          exports_to_keep=None)
 
       old_es = ex.reset_export_strategies(
           [export_strategy_2, export_strategy_3])
@@ -547,7 +596,9 @@ class ExperimentTest(test.TestCase):
           est, core_estimator.Estimator) else None
       noop_hook = _NoopHook()
       export_strategy = saved_model_export_utils.make_export_strategy(
-          est, 'export_input', exports_to_keep=None)
+          est,
+          None if isinstance(est, core_estimator.Estimator) else 'export_input',
+          exports_to_keep=None)
       ex = experiment.Experiment(
           est,
           train_input_fn='train_input',
@@ -625,7 +676,9 @@ class ExperimentTest(test.TestCase):
           est, core_estimator.Estimator) else None
       noop_hook = _NoopHook()
       export_strategy = saved_model_export_utils.make_export_strategy(
-          est, 'export_input', exports_to_keep=None)
+          est,
+          None if isinstance(est, core_estimator.Estimator) else 'export_input',
+          exports_to_keep=None)
       ex = experiment.Experiment(
           est,
           train_input_fn='train_input',
@@ -646,7 +699,9 @@ class ExperimentTest(test.TestCase):
       eval_metrics = 'eval_metrics' if not isinstance(
           est, core_estimator.Estimator) else None
       export_strategy = saved_model_export_utils.make_export_strategy(
-          est, 'export_input', exports_to_keep=None)
+          est,
+          None if isinstance(est, core_estimator.Estimator) else 'export_input',
+          exports_to_keep=None)
       ex = experiment.Experiment(
           est,
           train_input_fn='train_input',
@@ -796,7 +851,9 @@ class ExperimentTest(test.TestCase):
   def test_test(self):
     for est in self._estimators_for_tests():
       exp_strategy = saved_model_export_utils.make_export_strategy(
-          est, 'export_input', exports_to_keep=None)
+          est,
+          None if isinstance(est, core_estimator.Estimator) else 'export_input',
+          exports_to_keep=None)
       ex = experiment.Experiment(
           est,
           train_input_fn='train_input',
diff --git a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py
index 7ad3779314..fa314e69c7 100644
--- a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py
+++ b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py
@@ -42,6 +42,7 @@ from tensorflow.contrib.learn.python.learn.estimators import constants
 from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.contrib.learn.python.learn.utils import gc
 from tensorflow.contrib.learn.python.learn.utils import input_fn_utils
+from tensorflow.python.estimator import estimator as core_estimator
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors_impl
 from tensorflow.python.platform import gfile
@@ -352,7 +353,8 @@ def make_export_strategy(serving_input_fn,
       `InputFnOps`.
     default_output_alternative_key: the name of the head to serve when an
       incoming serving request does not explicitly request a specific head.
-      Not needed for single-headed models.
+      Must be `None` if the estimator inherits from ${tf.estimator.Estimator}
+      or for single-headed models.
     assets_extra: A dict specifying how to populate the assets.extra directory
       within the exported SavedModel.  Each key should give the destination
       path (including the filename) relative to the assets.extra directory.
@@ -384,14 +386,30 @@ def make_export_strategy(serving_input_fn,
 
     Returns:
       The string path to the exported directory.
+
+    Raises:
+      ValueError: If `estimator` is a ${tf.estimator.Estimator} instance
+        and `default_output_alternative_key` was specified.
     """
-    export_result = estimator.export_savedmodel(
-        export_dir_base,
-        serving_input_fn,
-        default_output_alternative_key=default_output_alternative_key,
-        assets_extra=assets_extra,
-        as_text=as_text,
-        checkpoint_path=checkpoint_path)
+    if isinstance(estimator, core_estimator.Estimator):
+      if default_output_alternative_key is not None:
+        raise ValueError(
+            'default_output_alternative_key is not supported in core '
+            'Estimator. Given: {}'.format(default_output_alternative_key))
+      export_result = estimator.export_savedmodel(
+          export_dir_base,
+          serving_input_fn,
+          assets_extra=assets_extra,
+          as_text=as_text,
+          checkpoint_path=checkpoint_path)
+    else:
+      export_result = estimator.export_savedmodel(
+          export_dir_base,
+          serving_input_fn,
+          default_output_alternative_key=default_output_alternative_key,
+          assets_extra=assets_extra,
+          as_text=as_text,
+          checkpoint_path=checkpoint_path)
 
     garbage_collect_exports(export_dir_base, exports_to_keep)
     return export_result
-- 
GitLab


From cae8ed1ca54a9fd4f9cc64d08cadebce31fd4607 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 5 May 2017 18:16:04 -0400
Subject: [PATCH 1055/1563] Fix build scripts for MKL (#9698)

---
 .gitignore                                  | 1 +
 configure                                   | 4 ++--
 tensorflow/tools/ci_build/builds/configured | 6 ------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index be0a287a8e..e3d6df93c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ node_modules
 /.bazelrc
 /.tf_configure.bazelrc
 /bazel-*
+/bazel_pip
 /third_party/eigen3/mkl_include
 /third_party/mkl/*
 /third_party/py/numpy/numpy_include
diff --git a/configure b/configure
index 4e66e952c2..05be9dc29b 100755
--- a/configure
+++ b/configure
@@ -210,8 +210,8 @@ if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
     ARCHIVE_BASENAME=mklml_lnx_2018.0.20170425.tgz
     GITHUB_RELEASE_TAG=v0.7
     MKLURL="https://github.com/01org/mkl-dnn/releases/download/$GITHUB_RELEASE_TAG/$ARCHIVE_BASENAME"
-    if ! [ -e "$DST/third_party/mkl/$ARCHIVE_BASENAME" ]; then
-      wget --no-check-certificate -P $DST/third_party/mkl/ $MKLURL
+    if ! [ -e "${DST}/third_party/mkl/${ARCHIVE_BASENAME}" ]; then
+      curl -fSsL -o "${DST}/third_party/mkl/${ARCHIVE_BASENAME}" "${MKLURL}"
     fi
     tar -xzf $DST/third_party/mkl/$ARCHIVE_BASENAME -C $DST/third_party/mkl/
     extracted_dir_name="${ARCHIVE_BASENAME%.*}"
diff --git a/tensorflow/tools/ci_build/builds/configured b/tensorflow/tools/ci_build/builds/configured
index 9fcf916902..25cb51ea7c 100755
--- a/tensorflow/tools/ci_build/builds/configured
+++ b/tensorflow/tools/ci_build/builds/configured
@@ -28,12 +28,6 @@ set -e
 CONTAINER_TYPE=$( echo "$1" | tr '[:upper:]' '[:lower:]' )
 shift 1
 
-# Enable support for MKL, for Linux only.
-if [[ $(uname) == "Linux" ]]; then
-  export TF_NEED_MKL=1
-  export TF_DOWNLOAD_MKL=1
-fi
-
 # Enable support for Google Cloud Platform (GCP)
 export TF_NEED_GCP=1
 # Enable support for HDFS
-- 
GitLab


From e436ecd251b0bdb6c645ba32ad33219bcbf6004e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 14:07:33 -0800
Subject: [PATCH 1056/1563] Set inline <script> tags to strict mode

The "const" and "let" keywords cause problems in some browsers
when not running in strict mode.

Fixes #9075
Change: 155245440
---
 .../components/tf_audio_dashboard/tf-audio-loader.html          | 2 ++
 .../components/tf_dashboard_common/tf-chart-scaffold.html       | 2 ++
 .../components/tf_dashboard_common_d3v4/tf-chart-scaffold.html  | 2 ++
 .../components/tf_graph_dashboard/tf-graph-dashboard.html       | 2 ++
 .../tensorboard/components/tf_graph_info/tf-graph-info.html     | 2 ++
 .../components/tf_image_dashboard/tf-image-loader.html          | 2 ++
 .../tensorboard/components/tf_tensorboard/tf-tensorboard.html   | 2 ++
 .../components/vz_projector/vz-projector-dashboard.html         | 2 ++
 .../components/vz_projector_d3v4/vz-projector-dashboard.html    | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html
index ed3b5efa07..71539537d0 100644
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html
@@ -107,6 +107,8 @@ future for loading older clips.
     </template>
   </template>
   <script>
+    "use strict";
+
     Polymer({
       is: "tf-audio-loader",
       properties: {
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html
index e2530d5971..83b141cb98 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html
@@ -57,6 +57,8 @@ plugin is requred to implement two functions:
     </style>
   </template>
   <script>
+    "use strict";
+
     Polymer({
       is: "tf-chart-scaffold",
       properties: {
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
index 402f909287..fd5320be39 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
@@ -55,6 +55,8 @@ plugin is requred to implement two functions:
     </style>
   </template>
   <script>
+    "use strict";
+
     Polymer({
       is: "tf-chart-scaffold",
       properties: {
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
index 573c3dfa60..d2b069f320 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
@@ -103,6 +103,8 @@ out-hierarchy-params="{{_hierarchyParams}}"
 </dom-module>
 
 <script>
+"use strict";
+
 (function() {
 TF.Dashboard.TfGraphDashboard = Polymer({
   is: 'tf-graph-dashboard',
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html b/tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html
index 45347fb1de..b33e1e00d0 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html
+++ b/tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html
@@ -169,6 +169,8 @@ h2 {
 </template>
 </template>
 <script>
+"use strict";
+
 (function() {
   Polymer({
     is: 'tf-graph-info',
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html
index f667520fb5..d9ba013dce 100644
--- a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html
@@ -108,6 +108,8 @@ future for loading older images.
     </style>
   </template>
   <script>
+    "use strict";
+
     Polymer({
       is: "tf-image-loader",
       properties: {
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
index b5b2e2d5a8..7440263f88 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
@@ -210,6 +210,8 @@ allows the user to toggle between various dashboards.
     </style>
   </template>
   <script>
+    "use strict";
+
     Polymer({
       is: "tf-tensorboard",
       behaviors: [TF.TensorBoard.AutoReloadBehavior],
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
index 3857113ac0..55c15da5ed 100644
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
+++ b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
@@ -37,6 +37,8 @@ limitations under the License.
   </template>
 </template>
 <script>
+"use strict";
+
 (function() {
 TF.Dashboard.VzProjectorDashboard = Polymer({
   is: 'vz-projector-dashboard',
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html
index 3857113ac0..55c15da5ed 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-dashboard.html
@@ -37,6 +37,8 @@ limitations under the License.
   </template>
 </template>
 <script>
+"use strict";
+
 (function() {
 TF.Dashboard.VzProjectorDashboard = Polymer({
   is: 'vz-projector-dashboard',
-- 
GitLab


From fe16da297ceb2cd71e1c7128116e0339ec6789ed Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 5 May 2017 14:28:20 -0800
Subject: [PATCH 1057/1563] Use the proper units to encode frequencies Change:
 155247835

---
 tensorflow/core/grappler/costs/op_level_cost_estimator.cc | 5 +++--
 tensorflow/core/grappler/costs/utils.cc                   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
index baed7a8899..8549bfa118 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
@@ -80,7 +80,8 @@ std::pair<double, double> OpLevelCostEstimator::GetDeviceInfo(
     const OpInfo::DeviceProperties local_cpu = GetLocalCPUInfo();
     // Check if vector instructions are available, and refine performance
     // prediction based on this.
-    gflops = local_cpu.num_cores() * local_cpu.frequency();
+    // Frequencies are stored in MHz in the DeviceProperties.
+    gflops = local_cpu.num_cores() * local_cpu.frequency() * 1e-3;
     if (bandwidth < 0) {
       if (local_cpu.bandwidth() > 0) {
         bandwidth = local_cpu.bandwidth() / 1e6;
@@ -105,7 +106,7 @@ std::pair<double, double> OpLevelCostEstimator::GetDeviceInfo(
       // Pascal.
       cores_per_multiprocessor = 64;
     }
-    gflops = local_gpu.num_cores() * local_gpu.frequency() *
+    gflops = local_gpu.num_cores() * local_gpu.frequency() * 1e-3 *
              cores_per_multiprocessor * kOpsPerMac;
     if (bandwidth < 0) {
       CHECK(local_gpu.bandwidth() > 0);
diff --git a/tensorflow/core/grappler/costs/utils.cc b/tensorflow/core/grappler/costs/utils.cc
index 0852cb4fd3..9447e56a7a 100644
--- a/tensorflow/core/grappler/costs/utils.cc
+++ b/tensorflow/core/grappler/costs/utils.cc
@@ -147,7 +147,7 @@ OpInfo::DeviceProperties GetLocalCPUInfo() {
   // Combine cpu family and model into the model string.
   device.set_model(
       strings::StrCat((port::CPUFamily() << 4) + port::CPUModelNum()));
-  device.set_frequency(port::NominalCPUFrequency() * 1e-9);
+  device.set_frequency(port::NominalCPUFrequency() * 1e-6);
   device.set_num_cores(port::NumSchedulableCPUs());
   device.set_l1_cache_size(Eigen::l1CacheSize());
   device.set_l2_cache_size(Eigen::l2CacheSize());
@@ -175,7 +175,7 @@ OpInfo::DeviceProperties GetLocalGPUInfo(int gpu_id) {
   if (error == cudaSuccess) {
     device.set_vendor("NVidia");
     device.set_model(properties.name);
-    device.set_frequency(properties.clockRate / 1000);
+    device.set_frequency(properties.clockRate * 1e-3);
     device.set_num_cores(properties.multiProcessorCount);
     device.set_num_registers(properties.regsPerMultiprocessor);
     // For compute capability less than 5, l1 cache size is configurable to
-- 
GitLab


From 37e3b71b49495af3873e7916a2ff28e598931b89 Mon Sep 17 00:00:00 2001
From: Dan Ringwalt <ringwalt@google.com>
Date: Fri, 5 May 2017 14:28:59 -0800
Subject: [PATCH 1058/1563] Add bilinear interpolation to tf.contrib.image.
 Change: 155247916

---
 tensorflow/contrib/image/kernels/image_ops.cc | 24 ++++-
 tensorflow/contrib/image/kernels/image_ops.h  | 95 +++++++++++++++----
 tensorflow/contrib/image/ops/image_ops.cc     |  2 +-
 .../python/kernel_tests/image_ops_test.py     | 49 ++++++++++
 .../contrib/image/python/ops/image_ops.py     | 17 ++--
 5 files changed, 155 insertions(+), 32 deletions(-)

diff --git a/tensorflow/contrib/image/kernels/image_ops.cc b/tensorflow/contrib/image/kernels/image_ops.cc
index 8d50541771..8a97f07732 100644
--- a/tensorflow/contrib/image/kernels/image_ops.cc
+++ b/tensorflow/contrib/image/kernels/image_ops.cc
@@ -43,13 +43,29 @@ template class FillProjectiveTransform<CPUDevice, double>;
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
 using functor::FillProjectiveTransform;
+using generator::INTERPOLATION_BILINEAR;
+using generator::INTERPOLATION_NEAREST;
+using generator::Interpolation;
 using generator::ProjectiveGenerator;
 
 template <typename Device, typename T>
 class ImageProjectiveTransform : public OpKernel {
+ private:
+  Interpolation interpolation_;
+
  public:
-  explicit ImageProjectiveTransform(OpKernelConstruction* ctx)
-      : OpKernel(ctx) {}
+  explicit ImageProjectiveTransform(OpKernelConstruction* ctx) : OpKernel(ctx) {
+    string interpolation_str;
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("interpolation", &interpolation_str));
+    if (interpolation_str == "NEAREST") {
+      interpolation_ = INTERPOLATION_NEAREST;
+    } else if (interpolation_str == "BILINEAR") {
+      interpolation_ = INTERPOLATION_BILINEAR;
+    } else {
+      LOG(FATAL) << "Invalid interpolation " << interpolation_str
+                 << ". Supported types: NEAREST, BILINEAR";
+    }
+  }
 
   void Compute(OpKernelContext* ctx) override {
     const Tensor& images_t = ctx->input(0);
@@ -68,8 +84,8 @@ class ImageProjectiveTransform : public OpKernel {
     Tensor* output_t;
     OP_REQUIRES_OK(ctx, ctx->allocate_output(0, images_t.shape(), &output_t));
     auto output = output_t->tensor<T, 4>();
-    const FillProjectiveTransform<Device, T> functor;
-    functor(ctx->eigen_device<Device>(), &output, images, transform);
+    (FillProjectiveTransform<Device, T>(interpolation_))(
+        ctx->eigen_device<Device>(), &output, images, transform);
   }
 };
 
diff --git a/tensorflow/contrib/image/kernels/image_ops.h b/tensorflow/contrib/image/kernels/image_ops.h
index 92b908a1c6..692e33fcf3 100644
--- a/tensorflow/contrib/image/kernels/image_ops.h
+++ b/tensorflow/contrib/image/kernels/image_ops.h
@@ -28,6 +28,8 @@ namespace tensorflow {
 
 namespace generator {
 
+enum Interpolation { INTERPOLATION_NEAREST, INTERPOLATION_BILINEAR };
+
 using Eigen::array;
 using Eigen::DenseIndex;
 
@@ -36,20 +38,19 @@ class ProjectiveGenerator {
  private:
   typename TTypes<T, 4>::ConstTensor input_;
   typename TTypes<float>::ConstMatrix transforms_;
+  const Interpolation interpolation_;
 
  public:
   static const int kNumParameters = 8;
 
   EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE
   ProjectiveGenerator(typename TTypes<T, 4>::ConstTensor input,
-                      typename TTypes<float>::ConstMatrix transforms)
-      : input_(input), transforms_(transforms) {}
+                      typename TTypes<float>::ConstMatrix transforms,
+                      const Interpolation interpolation)
+      : input_(input), transforms_(transforms), interpolation_(interpolation) {}
 
   EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE T
   operator()(const array<DenseIndex, 4>& coords) const {
-    array<DenseIndex, 4> input_coords;
-    input_coords[0] = coords[0];
-
     const int64 output_y = coords[1];
     const int64 output_x = coords[2];
     const float* transform =
@@ -57,24 +58,73 @@ class ProjectiveGenerator {
             ? transforms_.data()
             : &transforms_.data()[transforms_.dimension(1) * coords[0]];
     float projection = transform[6] * output_x + transform[7] * output_y + 1.f;
-    const int64 input_x = std::round(
+    const float input_x =
         (transform[0] * output_x + transform[1] * output_y + transform[2]) /
-        projection);
-    const int64 input_y = std::round(
+        projection;
+    const float input_y =
         (transform[3] * output_x + transform[4] * output_y + transform[5]) /
-        projection);
-
-    if (!(0 <= input_y && input_y < input_.dimension(1) && 0 <= input_x &&
-          input_x < input_.dimension(2))) {
-      // TODO(ringwalt): Add a fill value input.
-      return T(0);
+        projection;
+
+    // TODO(ringwalt): Add a fill value input.
+    static const T fill_value = T(0);
+    switch (interpolation_) {
+      case INTERPOLATION_NEAREST:
+        // Switch the order of x and y again for indexing into the image.
+        return nearest_interpolation(coords[0], input_y, input_x, coords[3],
+                                     fill_value);
+      case INTERPOLATION_BILINEAR:
+        return bilinear_interpolation(coords[0], input_y, input_x, coords[3],
+                                      fill_value);
     }
-    input_coords[1] = input_y;
-    input_coords[2] = input_x;
+  }
+
+ private:
+  EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE T
+  nearest_interpolation(const DenseIndex batch, const float y, const float x,
+                        const DenseIndex channel, const T fill_value) const {
+    return read_with_fill_value(batch, DenseIndex(std::round(y)),
+                                DenseIndex(std::round(x)), channel, fill_value);
+  }
 
-    input_coords[3] = coords[3];
+  EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE T
+  bilinear_interpolation(const DenseIndex batch, const float y, const float x,
+                         const DenseIndex channel, const T fill_value) const {
+    const float y_floor = std::floor(y);
+    const float x_floor = std::floor(x);
+    const float y_ceil = y_floor + 1;
+    const float x_ceil = x_floor + 1;
+    // f(x, y_floor) = (x_ceil - x) / (x_ceil - x_floor) * f(x_floor, y_floor)
+    //               + (x - x_floor) / (x_ceil - x_floor) * f(x_ceil, y_floor)
+    const float value_yfloor =
+        (x_ceil - x) * read_with_fill_value(batch, DenseIndex(y_floor),
+                                            DenseIndex(x_floor), channel,
+                                            fill_value) +
+        (x - x_floor) * read_with_fill_value(batch, DenseIndex(y_floor),
+                                             DenseIndex(x_ceil), channel,
+                                             fill_value);
+    // f(x, y_ceil) = (x_ceil - x) / (x_ceil - x_floor) * f(x_floor, y_ceil)
+    //              + (x - x_floor) / (x_ceil - x_floor) * f(x_ceil, y_ceil)
+    const float value_yceil =
+        (x_ceil - x) * read_with_fill_value(batch, DenseIndex(y_ceil),
+                                            DenseIndex(x_floor), channel,
+                                            fill_value) +
+        (x - x_floor) * read_with_fill_value(batch, DenseIndex(y_ceil),
+                                             DenseIndex(x_ceil), channel,
+                                             fill_value);
+    // f(x, y) = (y_ceil - y) / (y_ceil - y_floor) * f(x, y_floor)
+    //         + (y - y_floor) / (y_ceil - y_floor) * f(x, y_ceil)
+    return T((y_ceil - y) * value_yfloor + (y - y_floor) * value_yceil);
+  }
 
-    return input_(input_coords);
+  EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE T read_with_fill_value(
+      const DenseIndex batch, const DenseIndex y, const DenseIndex x,
+      const DenseIndex channel, const T fill_value) const {
+    // batch and channel must be correct, because they are passed unchanged from
+    // the input.
+    return (0 <= y && y < input_.dimension(1) && 0 <= x &&
+            x < input_.dimension(2))
+               ? input_(array<DenseIndex, 4>{batch, y, x, channel})
+               : fill_value;
   }
 };
 
@@ -85,6 +135,7 @@ class ProjectiveGenerator {
 // some Eigen device code.
 namespace functor {
 
+using generator::Interpolation;
 using generator::ProjectiveGenerator;
 
 template <typename Device, typename T>
@@ -92,15 +143,17 @@ struct FillProjectiveTransform {
   typedef typename TTypes<T, 4>::Tensor OutputType;
   typedef typename TTypes<T, 4>::ConstTensor InputType;
   typedef typename TTypes<float, 2>::ConstTensor TransformsType;
+  const Interpolation interpolation_;
 
-  FillProjectiveTransform() {}
+  FillProjectiveTransform(Interpolation interpolation)
+      : interpolation_(interpolation) {}
 
   EIGEN_ALWAYS_INLINE
   void operator()(const Device& device, OutputType* output,
                   const InputType& images,
                   const TransformsType& transform) const {
-    ProjectiveGenerator<Device, T> generator(images, transform);
-    output->device(device) = images.generate(generator);
+    output->device(device) = images.generate(
+        ProjectiveGenerator<Device, T>(images, transform, interpolation_));
   }
 };
 
diff --git a/tensorflow/contrib/image/ops/image_ops.cc b/tensorflow/contrib/image/ops/image_ops.cc
index 18c16cf1bb..a6d3fa4b64 100644
--- a/tensorflow/contrib/image/ops/image_ops.cc
+++ b/tensorflow/contrib/image/ops/image_ops.cc
@@ -23,13 +23,13 @@ using shape_inference::InferenceContext;
 
 // TODO(ringwalt): Add a "fill_mode" argument with "constant", "mirror", etc.
 // TODO(ringwalt): Add a "fill_constant" argument for constant mode (default 0).
-// TODO(ringwalt): Add an "interpolation" argument with "none", "bilinear", etc.
 // TODO(ringwalt): Add an "output_shape" argument. This is sufficient to
 // implement "same" and "valid" modes in the Python function.
 REGISTER_OP("ImageProjectiveTransform")
     .Input("images: dtype")
     .Input("transforms: float32")
     .Attr("dtype: {uint8, int32, int64, float32, float64}")
+    .Attr("interpolation: string")
     .Output("transformed_images: dtype")
     .SetShapeFn([](InferenceContext* c) {
       c->set_output(0, c->input(0));
diff --git a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
index 33bd30b4e8..5e78b590df 100644
--- a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
+++ b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
@@ -111,6 +111,55 @@ class ImageOpsTest(test_util.TensorFlowTestCase):
                              [0, 1, 0, 1],
                              [0, 1, 1, 1]])
 
+  def test_bilinear(self):
+    with self.test_session():
+      image = constant_op.constant(
+          [[0, 0, 0, 0, 0],
+           [0, 1, 1, 1, 0],
+           [0, 1, 0, 1, 0],
+           [0, 1, 1, 1, 0],
+           [0, 0, 0, 0, 0]],
+          dtypes.float32)
+      # The following result matches:
+      # >>> scipy.ndimage.rotate(image, 45, order=1, reshape=False)
+      # which uses spline interpolation of order 1, equivalent to bilinear
+      # interpolation.
+      self.assertAllClose(
+          image_ops.rotate(image, np.pi / 4.0, interpolation="BILINEAR").eval(),
+          [[0.000, 0.000, 0.343, 0.000, 0.000],
+           [0.000, 0.586, 0.914, 0.586, 0.000],
+           [0.343, 0.914, 0.000, 0.914, 0.343],
+           [0.000, 0.586, 0.914, 0.586, 0.000],
+           [0.000, 0.000, 0.343, 0.000, 0.000]],
+          atol=0.001)
+      self.assertAllClose(
+          image_ops.rotate(image, np.pi / 4.0, interpolation="NEAREST").eval(),
+          [[0, 0, 1, 0, 0],
+           [0, 1, 1, 1, 0],
+           [1, 1, 0, 1, 1],
+           [0, 1, 1, 1, 0],
+           [0, 0, 1, 0, 0]])
+
+  def test_bilinear_uint8(self):
+    with self.test_session():
+      image = constant_op.constant(
+          np.asarray(
+              [[0.0, 0.0, 0.0, 0.0, 0.0],
+               [0.0, 255, 255, 255, 0.0],
+               [0.0, 255, 0.0, 255, 0.0],
+               [0.0, 255, 255, 255, 0.0],
+               [0.0, 0.0, 0.0, 0.0, 0.0]],
+              np.uint8),
+          dtypes.uint8)
+      # == np.rint((expected image above) * 255)
+      self.assertAllEqual(
+          image_ops.rotate(image, np.pi / 4.0, interpolation="BILINEAR").eval(),
+          [[0.0, 0.0, 87., 0.0, 0.0],
+           [0.0, 149, 233, 149, 0.0],
+           [87., 233, 0.0, 233, 87.],
+           [0.0, 149, 233, 149, 0.0],
+           [0.0, 0.0, 87., 0.0, 0.0]])
+
   def _test_grad(self, shape_to_test):
     with self.test_session():
       test_image_shape = shape_to_test
diff --git a/tensorflow/contrib/image/python/ops/image_ops.py b/tensorflow/contrib/image/python/ops/image_ops.py
index 9efdb0d521..0d51d0dee1 100644
--- a/tensorflow/contrib/image/python/ops/image_ops.py
+++ b/tensorflow/contrib/image/python/ops/image_ops.py
@@ -37,7 +37,7 @@ _IMAGE_DTYPES = set(
 ops.RegisterShape("ImageProjectiveTransform")(common_shapes.call_cpp_shape_fn)
 
 
-def rotate(images, angles):
+def rotate(images, angles, interpolation="NEAREST"):
   """Rotate image(s) by the passed angle(s) in radians.
 
   Args:
@@ -46,6 +46,7 @@ def rotate(images, angles):
        (num_rows, num_columns) (HW).
     angles: A scalar angle to rotate all images by, or (if images has rank 4)
        a vector of length num_images, with an angle for each image in the batch.
+    interpolation: Interpolation mode. Supported values: "NEAREST", "BILINEAR".
 
   Returns:
     Image(s) with the same type and shape as `images`, rotated by the given
@@ -70,7 +71,8 @@ def rotate(images, angles):
   image_width = math_ops.cast(array_ops.shape(images)[2], dtypes.float32)[None]
   output = transform(
       images,
-      angles_to_projective_transforms(angles, image_width, image_height))
+      angles_to_projective_transforms(angles, image_height, image_width),
+      interpolation=interpolation)
   if len(image_or_images.get_shape()) == 2:
     return output[0, :, :, 0]
   elif len(image_or_images.get_shape()) == 3:
@@ -120,7 +122,7 @@ def angles_to_projective_transforms(angles, image_height, image_width):
       axis=1)
 
 
-def transform(images, transforms):
+def transform(images, transforms, interpolation="NEAREST"):
   """Applies the given transform(s) to the image(s).
 
   Args:
@@ -134,6 +136,7 @@ def transform(images, transforms):
        `(x', y') = ((a0 x + a1 y + a2) / k, (b0 x + b1 y + b2) / k)`,
        where `k = c0 x + c1 y + 1`. The transforms are *inverted* compared to
        the transform mapping input points to output points.
+     interpolation: Interpolation mode. Supported values: "NEAREST", "BILINEAR".
 
   Returns:
     Image(s) with the same type and shape as `images`, with the given
@@ -163,8 +166,8 @@ def transform(images, transforms):
     transforms = transform_or_transforms
   else:
     raise TypeError("Transforms should have rank 1 or 2.")
-  # pylint: disable=protected-access
-  output = gen_image_ops.image_projective_transform(images, transforms)
+  output = gen_image_ops.image_projective_transform(
+      images, transforms, interpolation=interpolation.upper())
   if len(image_or_images.get_shape()) == 2:
     return output[0, :, :, 0]
   elif len(image_or_images.get_shape()) == 3:
@@ -220,6 +223,7 @@ def _image_projective_transform_grad(op, grad):
   """Computes the gradient for ImageProjectiveTransform."""
   images = op.inputs[0]
   transforms = op.inputs[1]
+  interpolation = op.get_attr("interpolation")
 
   image_or_images = ops.convert_to_tensor(images, name="images")
   transform_or_transforms = ops.convert_to_tensor(
@@ -246,7 +250,8 @@ def _image_projective_transform_grad(op, grad):
   transforms = _flat_transforms_to_matrices(transforms=transforms)
   inverse = linalg_ops.matrix_inverse(transforms)
   transforms = _transform_matrices_to_flat(inverse)
-  output = gen_image_ops.image_projective_transform(grad, transforms)
+  output = gen_image_ops.image_projective_transform(
+      grad, transforms, interpolation=interpolation)
   if len(image_or_images.get_shape()) == 2:
     return [output[0, :, :, 0], None]
   elif len(image_or_images.get_shape()) == 3:
-- 
GitLab


From 63f7fae6a44686e1153f23d70a912cc0a83c7354 Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Fri, 5 May 2017 14:43:21 -0800
Subject: [PATCH 1059/1563] Add a profiler that dumps data in pprof format.
 Change: 155249446

---
 .../contrib/tfprof/python/tools/tfprof/BUILD  |  23 +
 .../python/tools/tfprof/pprof_profiler.py     | 445 ++++++++++++++++++
 .../tools/tfprof/pprof_profiler_test.py       | 164 +++++++
 tensorflow/workspace.bzl                      |  32 ++
 third_party/pprof.BUILD                       |  18 +
 5 files changed, 682 insertions(+)
 create mode 100644 tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py
 create mode 100644 tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py
 create mode 100644 third_party/pprof.BUILD

diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
index 9c3b10b22c..818c2d2cbf 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
@@ -97,6 +97,29 @@ py_test(
     ],
 )
 
+py_library(
+    name = "pprof_profiler",
+    srcs = ["pprof_profiler.py"],
+    srcs_version = "PY2AND3",
+    deps = ["@pprof_profile_proto//:pprof_proto_py"],
+)
+
+py_test(
+    name = "pprof_profiler_test",
+    srcs = ["pprof_profiler_test.py"],
+    main = "pprof_profiler_test.py",
+    srcs_version = "PY2AND3",
+    tags = ["no_pip"],  # TODO(annarev): get it working with pip.
+    deps = [
+        ":pprof_profiler",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+        "@pprof_profile_proto//:pprof_proto_py",
+    ],
+)
+
 # -----------------------------------------------------------------------------
 # Google-internal targets.  These must be at the end for syncrepo.
 
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py
new file mode 100644
index 0000000000..c3fea915a3
--- /dev/null
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py
@@ -0,0 +1,445 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Profiler for TensorFlow models that outputs data in pprof format.
+
+See https://github.com/google/pprof/blob/master/proto/profile.proto for pprof
+profile format.
+The following needs to be set for profiler to work:
+  * trace_level needs to be set to FULL_TRACE
+  * run_metadata object should be passed in to session.run call
+
+Sample usage:
+  options = tf.RunOptions(trace_level=tf.RunOptions.FULL_TRACE)
+  run_metadata = tf.RunMetadata()
+
+  with tf.Session as sess:
+    ...
+    sess.run(computation, run_metadata=run_metadata, options=options)
+  pprof_profiler.profile(sess.graph, run_metadata, output_dir)
+
+
+  The code above would output a pprof profile to separate output_dir/.*.pb.gz
+  file for each device. These files can be passed to pprof for formatting.
+  For e.g.:
+     pprof -png --nodecount=100 --sample_index=1 output_dir/profile_output.pb.gz
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from collections import defaultdict
+from collections import namedtuple
+import gzip
+import os
+import string
+import sys
+import time
+
+from pprof import profile_pb2
+
+
+if sys.version_info < (3,):
+  maketrans = string.maketrans
+else:
+  maketrans = str.maketrans
+
+
+ProfileDatum = namedtuple('ProfileDatum', [
+    'node_exec_stats', 'op_type', 'traceback'])
+
+
+class StringTable(object):
+  """Keeps track of strings to add to string_table in pprof proto."""
+
+  def __init__(self):
+    # Pprof requires first entry in string_table to be ''.
+    self._string_table = ['']
+    self._string_to_index = {'': 0}
+
+  def index_of(self, value_str):
+    """Get index of value_str in the string table.
+
+    If value_str is not in the string table, we will add it at the end
+    and then return the new index.
+    Args:
+      value_str: (string) Value to lookup/add in/to the string table.
+
+    Returns:
+      Index of value_str in the string table.
+    """
+    if value_str is None:
+      value_str = ''
+    if value_str in self._string_to_index:
+      return self._string_to_index[value_str]
+    index = len(self._string_table)
+    self._string_table.append(value_str)
+    self._string_to_index[value_str] = index
+    return index
+
+  def next_index(self):
+    """Gets index that would be assigned to the next added string.
+
+    Returns:
+      Index of the next string if it was added.
+    """
+    return len(self._string_table)
+
+  def string_table(self):
+    """Returns a list of strings to store in pprof's string_table."""
+    return self._string_table
+
+
+class Functions(object):
+  """Keeps track of `Function` protos for pprof profile."""
+
+  def __init__(self, string_table):
+    """Constructor.
+
+    Args:
+      string_table: A `StringTable` object.
+    """
+    self._string_table = string_table
+    # Maps tuples in the form (file_path, function_name, start_line_number)
+    # to `Function` protos.
+    self._function_key_to_function = {}
+
+  def index_of(self, file_path, function_name, function_start_line):
+    """Returns index of the function, adding the function if needed.
+
+    Args:
+      file_path: (string) Path to file where the function is defined.
+      function_name: (string) Function name.
+      function_start_line: (integer) Start line number of function definition.
+
+    Returns:
+      Function index.
+    """
+    function_key = (file_path, function_name, function_start_line)
+    if function_key in self._function_key_to_function:
+      return self._function_key_to_function[function_key].id
+    else:
+      # Function indexes should start from 1
+      function_index = len(self._function_key_to_function) + 1
+      function = profile_pb2.Function()
+      function.id = function_index
+      function.name = self._string_table.index_of(function_name)
+      function.filename = self._string_table.index_of(file_path)
+      function.start_line = function_start_line
+      self._function_key_to_function[function_key] = function
+      return function_index
+
+  def function_protos(self):
+    """Returns list of `profile_pb2.Function` protos."""
+    return self._function_key_to_function.values()
+
+
+class Locations(object):
+  """Keeps track of `Location` protos for pprof profile.
+
+  `Locations` store information about function call locations.
+  """
+
+  def __init__(self, functions):
+    """Constructor.
+
+    Args:
+      functions: A `Functions` object.
+    """
+    self._functions = functions
+    # Maps tuples in the form (file_path, called_function_name, line_number)
+    # to `Location` protos.
+    self._location_key_to_location = {}
+
+  def index_of(
+      self, file_path, line_number, called_function_name, called_file_path,
+      called_function_start_line):
+    """Returns index of the location, adding the location if needed.
+
+    Args:
+      file_path: (string) Path to file that makes the call.
+      line_number: (integer) Call line number.
+      called_function_name: (string) Function name of the function called at
+        `file_path` and `line_number`.
+      called_file_path: (string) Path to file where the called function is
+        defined.
+      called_function_start_line: (integer) Start line number of called
+        function definition in `called_file_path` file.
+
+    Returns:
+      Index of location.
+    """
+    location_key = (file_path, called_function_name, line_number)
+    if location_key in self._location_key_to_location:
+      location = self._location_key_to_location[location_key]
+      return location.id
+    else:
+      # Location indexes should start from 1
+      location_index = len(self._location_key_to_location) + 1
+      location = profile_pb2.Location()
+      location.id = location_index
+      self._location_key_to_location[location_key] = location
+
+      line = location.line.add()
+      line.function_id = self._functions.index_of(
+          called_file_path, called_function_name, called_function_start_line)
+      line.line = line_number
+      return location_index
+
+  def location_protos(self):
+    """Returns list of `profile_pb2.Location` protos."""
+    return self._location_key_to_location.values()
+
+
+class Samples(object):
+  """Keeps track of `Sample` protos for pprof profile.
+
+  Samples store the following statistics in order:
+  count, all_time, op_time
+  """
+
+  def __init__(self, string_table):
+    """Constructor.
+
+    Args:
+      string_table: A `StringTable` object.
+    """
+    self._string_table = string_table
+    # TODO(annarev): figure out if location is unique for each node name.
+    # If not, also key this dictionary based on location ids.
+    self._node_name_to_sample = {}
+
+  def add(self, datum, location_ids):
+    """Adds a sample data point.
+
+    Args:
+      datum: `ProfileDatum` to add a sample for.
+      location_ids: List of numberic location ids for this
+        sample.
+    """
+    node_name = datum.node_exec_stats.node_name
+    if node_name in self._node_name_to_sample:
+      sample = self._node_name_to_sample[node_name]
+      sample.location_id.extend(location_ids)
+    else:
+      sample = profile_pb2.Sample()
+      # Sample stores 3 values: count, all_time, op_time
+      sample.value.extend([0, 0, 0])
+
+      label = sample.label.add()
+      label.key = self._string_table.index_of('node_name')
+      label.str = self._string_table.index_of(node_name)
+      label = sample.label.add()
+      label.key = self._string_table.index_of('op_type')
+      label.str = self._string_table.index_of(datum.op_type)
+      self._node_name_to_sample[node_name] = sample
+    sample.value[0] += 1
+    sample.value[1] += datum.node_exec_stats.all_end_rel_micros
+    sample.value[2] += (
+        datum.node_exec_stats.op_end_rel_micros -
+        datum.node_exec_stats.op_start_rel_micros)
+
+  def get_sample_protos(self):
+    """Returns list of `Sample` protos for pprof profile."""
+    return self._node_name_to_sample.values()
+
+
+class PprofProfiler(object):
+  """Creates profiles in pprof format."""
+
+  def __init__(self, graph, run_metadata):
+    """Constructor.
+
+    Args:
+      graph: A `Graph` instance.
+      run_metadata: A list of `RunMetadata` objects.
+    """
+    self._graph = graph
+    self._run_metadata = run_metadata
+    self._string_table = StringTable()
+    self._functions = Functions(self._string_table)
+    self._locations = Locations(self._functions)
+
+  def profile(self):
+    """Generates pprof profiles.
+
+    Returns:
+      Dictionary mapping from device name to proto in `profile_pb2.Profile`
+      format.
+    """
+    profiles = {}
+    data_generator_func = self._get_profile_data_generator()
+    for device_index, device_stats in enumerate(
+        self._run_metadata.step_stats.dev_stats):
+      # Create profile
+      pprof_proto = self._get_pprof_proto(data_generator_func(device_stats))
+      if not pprof_proto.sample:
+        print(
+            'Not enough data to create profile for device %s. Did you pass '
+            'RunMetadata to session.run call?' % device_stats.device)
+        continue
+      # Add device name comment
+      device_count = len(self._run_metadata.step_stats.dev_stats)
+      device_description = (
+          'Device %d of %d: %s' %
+          (device_index + 1, device_count, device_stats.device))
+      device_description_str_index = self._string_table.next_index()
+      pprof_proto.string_table.append(device_description)
+      pprof_proto.comment.append(device_description_str_index)
+      profiles[device_stats.device] = pprof_proto
+    return profiles
+
+  def _get_pprof_proto(self, profile_datum_generator):
+    """Returns profile data in pprof proto format.
+
+    Args:
+      profile_datum_generator: Generator outputting `ProfileDatum` objects.
+
+    Returns:
+      A proto in pprof format.
+    """
+    pprof_profile = profile_pb2.Profile()
+    samples = Samples(self._string_table)
+
+    for datum in profile_datum_generator:
+      if not datum.traceback:
+        continue
+
+      stack_frame = datum.traceback[-1]
+      after_apply_op = False
+      location_ids = []
+
+      # We add locations from stack trace in bottom-up order.
+      for stack_frame_index in reversed(range(len(datum.traceback) - 1)):
+        prev_stack_frame = stack_frame
+        stack_frame = datum.traceback[stack_frame_index]
+
+        # Call at current frame calls function at previous frame.
+        prev_file_path = prev_stack_frame[0]
+        prev_function = prev_stack_frame[2]
+        prev_function_start_line = prev_stack_frame[4]
+        curr_file_path = stack_frame[0]
+        curr_line_number = stack_frame[1]
+
+        # Skip all calls up to apply_op since they are the same for all ops.
+        if not after_apply_op:
+          if prev_function == 'apply_op':
+            after_apply_op = True
+          continue
+        location_index = self._locations.index_of(
+            curr_file_path, curr_line_number,
+            prev_function, prev_file_path, prev_function_start_line)
+        location_ids.append(location_index)
+      samples.add(datum, location_ids)
+
+    sample_type_description = 'count'
+    sample_type = pprof_profile.sample_type.add()
+    sample_type.type = self._string_table.index_of(sample_type_description)
+    sample_type.unit = self._string_table.index_of('count')
+    sample_type_description = 'all_time'
+    sample_type = pprof_profile.sample_type.add()
+    sample_type.type = self._string_table.index_of(sample_type_description)
+    sample_type.unit = self._string_table.index_of('nanoseconds')
+    sample_type_description = 'op_time'
+    sample_type = pprof_profile.sample_type.add()
+    sample_type.type = self._string_table.index_of(sample_type_description)
+    sample_type.unit = self._string_table.index_of('nanoseconds')
+
+    pprof_profile.string_table.extend(self._string_table.string_table())
+    pprof_profile.sample.extend(samples.get_sample_protos())
+    pprof_profile.function.extend(self._functions.function_protos())
+    pprof_profile.location.extend(self._locations.location_protos())
+    return pprof_profile
+
+  def _get_profile_data_generator(self):
+    """Get function that generates `ProfileDatum` objects.
+
+    Returns:
+      A function that generates `ProfileDatum` objects.
+    """
+    node_to_traceback = defaultdict(list)
+    node_to_op_type = defaultdict(str)
+    for op in self._graph.get_operations():
+      node_to_traceback[op.name] = op.traceback_with_start_lines
+      node_to_op_type[op.name] = op.type
+
+    def profile_data_generator(device_step_stats):
+      for node_stats in device_step_stats.node_stats:
+        if node_stats.node_name == '_SOURCE' or node_stats.node_name == '_SINK':
+          continue
+        yield ProfileDatum(
+            node_stats,
+            node_to_op_type[node_stats.node_name],
+            node_to_traceback[node_stats.node_name])
+
+    return profile_data_generator
+
+
+def get_profiles(graph, run_metadata):
+  """Generate profiles in pprof format.
+
+  See https://github.com/google/pprof/blob/master/proto/profile.proto
+  for pprof proto format.
+
+  Args:
+    graph: A `Graph` object.
+    run_metadata: A `RunMetadata` proto.
+
+  Returns:
+    A dictionary mapping from device name to pprof proto for that device.
+  """
+  return PprofProfiler(graph, run_metadata).profile()
+
+
+def profile(graph, run_metadata, output_dir=None):
+  """Generate profiles in pprof format.
+
+  See https://github.com/google/pprof/blob/master/proto/profile.proto
+  for pprof proto format.
+
+  Args:
+    graph: A `Graph` object.
+    run_metadata: A `RunMetadata` proto.
+    output_dir: (string) Directory to output pprof profile to.
+      Profile files for each device will be stored in compressed
+      serialized proto format. If output_dir is None, profile protos
+      will be printed to stdout instead.
+
+  Returns:
+    List of output files created by this profile call.
+    (Note: this list will be empty if output_dir is None)
+  """
+  profiles = get_profiles(graph, run_metadata)
+  output_file_template = None
+  if output_dir:
+    if not os.path.isdir(output_dir):
+      os.makedirs(output_dir)
+    time_suffix = time.strftime('%Y%m%d%H%M%S')
+    output_file_template = os.path.join(
+        output_dir, '%s_' + time_suffix + '.pb.gz')
+
+  profile_files = []
+  for device, pprof_proto in profiles.items():
+    if output_file_template is None:
+      print('No output directory specified, printing to stdout instead.')
+      print(pprof_proto)
+    else:
+      device_name = str(device).strip('/').translate(
+          maketrans('/:', '__'))
+      profile_file = output_file_template % device_name
+      profile_files.append(profile_file)
+      with gzip.open(profile_file, 'w') as output_file:
+        print('Writing profile to %s...' % profile_file)
+        output_file.write(pprof_proto.SerializeToString())
+  return profile_files
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py
new file mode 100644
index 0000000000..13d3fb41ac
--- /dev/null
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py
@@ -0,0 +1,164 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for pprof_profiler."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import gzip
+
+from pprof import profile_pb2
+from tensorflow.contrib.tfprof.python.tools.tfprof import pprof_profiler
+from tensorflow.core.framework import step_stats_pb2
+from tensorflow.core.protobuf import config_pb2
+from tensorflow.python.framework import constant_op
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class PprofProfilerTest(test.TestCase):
+
+  def testDataEmpty(self):
+    output_dir = test.get_temp_dir()
+    run_metadata = config_pb2.RunMetadata()
+    graph = test.mock.MagicMock()
+    graph.get_operations.return_value = []
+
+    profiles = pprof_profiler.get_profiles(graph, run_metadata)
+    self.assertEquals(0, len(profiles))
+    profile_files = pprof_profiler.profile(
+        graph, run_metadata, output_dir)
+    self.assertEquals(0, len(profile_files))
+
+  def testRunMetadataEmpty(self):
+    output_dir = test.get_temp_dir()
+    run_metadata = config_pb2.RunMetadata()
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = 'Add/123'
+    op1.traceback = [('a/b/file1', 10, 'some_var')]
+    op1.type = 'add'
+    graph.get_operations.return_value = [op1]
+
+    profiles = pprof_profiler.get_profiles(graph, run_metadata)
+    self.assertEquals(0, len(profiles))
+    profile_files = pprof_profiler.profile(
+        graph, run_metadata, output_dir)
+    self.assertEquals(0, len(profile_files))
+
+  def testValidProfile(self):
+    output_dir = test.get_temp_dir()
+    run_metadata = config_pb2.RunMetadata()
+
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name='Add/123',
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = 'deviceA'
+    device1.node_stats.extend([node1])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = 'Add/123'
+    op1.traceback = [
+        ('a/b/file1', 10, 'apply_op', 'abc'), ('a/c/file2', 12, 'my_op', 'def')]
+    op1.type = 'add'
+    graph.get_operations.return_value = [op1]
+
+    expected_proto = """sample_type {
+  type: 5
+  unit: 5
+}
+sample_type {
+  type: 6
+  unit: 7
+}
+sample_type {
+  type: 8
+  unit: 7
+}
+sample {
+  value: 1
+  value: 4
+  value: 2
+  label {
+    key: 1
+    str: 2
+  }
+  label {
+    key: 3
+    str: 4
+  }
+}
+string_table: ""
+string_table: "node_name"
+string_table: "Add/123"
+string_table: "op_type"
+string_table: "add"
+string_table: "count"
+string_table: "all_time"
+string_table: "nanoseconds"
+string_table: "op_time"
+string_table: "Device 1 of 1: deviceA"
+comment: 9
+"""
+    # Test with protos
+    profiles = pprof_profiler.get_profiles(graph, run_metadata)
+    self.assertEquals(1, len(profiles))
+    self.assertTrue('deviceA' in profiles)
+    self.assertEquals(expected_proto, str(profiles['deviceA']))
+    # Test with files
+    profile_files = pprof_profiler.profile(
+        graph, run_metadata, output_dir)
+    self.assertEquals(1, len(profile_files))
+    with gzip.open(profile_files[0]) as profile_file:
+      profile_contents = profile_file.read()
+      profile = profile_pb2.Profile()
+      profile.ParseFromString(profile_contents)
+      self.assertEquals(expected_proto, str(profile))
+
+  def testProfileWithWhileLoop(self):
+    options = config_pb2.RunOptions()
+    options.trace_level = config_pb2.RunOptions.FULL_TRACE
+    run_metadata = config_pb2.RunMetadata()
+
+    num_iters = 5
+    with self.test_session() as sess:
+      i = constant_op.constant(0)
+      c = lambda i: math_ops.less(i, num_iters)
+      b = lambda i: math_ops.add(i, 1)
+      r = control_flow_ops.while_loop(c, b, [i])
+      sess.run(r, options=options, run_metadata=run_metadata)
+      profiles = pprof_profiler.get_profiles(sess.graph, run_metadata)
+      self.assertEquals(1, len(profiles))
+      profile = next(iter(profiles.values()))
+      add_samples = []  # Samples for the while/Add node
+      for sample in profile.sample:
+        if profile.string_table[sample.label[0].str] == 'while/Add':
+          add_samples.append(sample)
+      # Values for same nodes are aggregated.
+      self.assertEquals(1, len(add_samples))
+      # Value of "count" should be equal to number of iterations.
+      self.assertEquals(num_iters, add_samples[0].value[0])
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 93300d9fb1..5c6744a9b5 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -70,6 +70,27 @@ temp_workaround_http_archive = repository_rule(
     },
 )
 
+def _http_files_with_build_impl(repo_ctx):
+  repo_ctx.template("BUILD", repo_ctx.attr.build_file, {
+      "%prefix%": ".." if _repos_are_siblings() else "external",
+      "%ws%": repo_ctx.attr.repository
+  }, False)
+  for output, urls in repo_ctx.attr.file_urls.items():
+    repo_ctx.download(urls, output,
+                      repo_ctx.attr.sha256, executable=False)
+
+# Downloads a set of files and adds a BUILD file.
+http_files_with_build = repository_rule(
+    implementation = _http_files_with_build_impl,
+    attrs = {
+        "build_file": attr.label(),
+        "repository": attr.string(),
+        # Map from output file to URLs to download that file from.
+        "file_urls": attr.string_list_dict(default = {}),
+        "sha256": attr.string(default = ""),
+    },
+)
+
 
 # Executes specified command with arguments and calls 'fail' if it exited with
 # non-zero code
@@ -617,6 +638,17 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       repository = tf_repo_name,
   )
 
+  http_files_with_build(
+      name = "pprof_profile_proto",
+      file_urls = {
+          "pprof/profile.proto":
+          ["https://raw.githubusercontent.com/google/pprof/master/proto/profile.proto"],
+          "pprof/LICENSE":
+          ["https://raw.githubusercontent.com/google/pprof/master/LICENSE"]},
+      build_file = str(Label("//third_party:pprof.BUILD")),
+      repository = tf_repo_name,
+  )
+
   ##############################################################################
   # TensorBoard Build Tools
 
diff --git a/third_party/pprof.BUILD b/third_party/pprof.BUILD
new file mode 100644
index 0000000000..6f27bfc819
--- /dev/null
+++ b/third_party/pprof.BUILD
@@ -0,0 +1,18 @@
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+licenses(["notice"])  # MIT
+
+load("@protobuf//:protobuf.bzl", "py_proto_library")
+
+exports_files(["pprof/LICENSE"])
+
+py_proto_library(
+    name = "pprof_proto_py",
+    srcs = ["pprof/profile.proto"],
+    default_runtime = "@protobuf//:protobuf_python",
+    protoc = "@protobuf//:protoc",
+    srcs_version = "PY2AND3",
+    deps = ["@protobuf//:protobuf_python"],
+)
-- 
GitLab


From 1a1bef744a33b6b2d1af0cb09d32d1e12fd8ea7d Mon Sep 17 00:00:00 2001
From: Yifei Feng <yifeif@google.com>
Date: Fri, 5 May 2017 16:11:20 -0700
Subject: [PATCH 1060/1563] Remove opensource_only dir.

---
 tensorflow/opensource_only/eigen.threadpool | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 tensorflow/opensource_only/eigen.threadpool

diff --git a/tensorflow/opensource_only/eigen.threadpool b/tensorflow/opensource_only/eigen.threadpool
deleted file mode 100644
index d2639af4d9..0000000000
--- a/tensorflow/opensource_only/eigen.threadpool
+++ /dev/null
@@ -1 +0,0 @@
-#include "unsupported/Eigen/CXX11/ThreadPool"
-- 
GitLab


From 70c60b1491254f7a8a2ed1d060abd898be3be40d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 15:10:26 -0800
Subject: [PATCH 1061/1563] Refactor XLA's CompileAheadOfTime out of
 LocalClient into a new CompileOnlyClient class, and likewise from
 LocalService into a new CompileOnlyService class.

This also renames AheadOfTimeComputationInstance to AotComputationInstance for consistency with AotCompilationResult and AotCompilationOptions in compiler/xla/service/compiler.h.
Change: 155252320
---
 tensorflow/compiler/aot/BUILD                 |   2 +-
 tensorflow/compiler/aot/compile.cc            |  17 ++-
 tensorflow/compiler/xla/client/BUILD          |  22 +++
 .../compiler/xla/client/client_library.cc     |  38 ++++-
 .../compiler/xla/client/client_library.h      |  22 ++-
 .../xla/client/compile_only_client.cc         |  59 ++++++++
 .../compiler/xla/client/compile_only_client.h |  66 +++++++++
 .../compiler/xla/client/local_client.cc       |  32 -----
 tensorflow/compiler/xla/client/local_client.h |  26 +---
 tensorflow/compiler/xla/service/BUILD         |  21 +++
 .../xla/service/compile_only_service.cc       | 131 ++++++++++++++++++
 .../xla/service/compile_only_service.h        | 128 +++++++++++++++++
 .../compiler/xla/service/local_service.cc     |  64 ---------
 .../compiler/xla/service/local_service.h      |  16 ---
 tensorflow/compiler/xla/service/service.cc    |  30 ++--
 .../xla/tests/local_client_aot_test_helper.cc |   4 +-
 tensorflow/opensource_only/eigen.threadpool   |   1 +
 17 files changed, 512 insertions(+), 167 deletions(-)
 create mode 100644 tensorflow/compiler/xla/client/compile_only_client.cc
 create mode 100644 tensorflow/compiler/xla/client/compile_only_client.h
 create mode 100644 tensorflow/compiler/xla/service/compile_only_service.cc
 create mode 100644 tensorflow/compiler/xla/service/compile_only_service.h
 create mode 100644 tensorflow/opensource_only/eigen.threadpool

diff --git a/tensorflow/compiler/aot/BUILD b/tensorflow/compiler/aot/BUILD
index c52a56b642..c12005a4ca 100644
--- a/tensorflow/compiler/aot/BUILD
+++ b/tensorflow/compiler/aot/BUILD
@@ -73,7 +73,7 @@ cc_library(
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/client:client_library",
-        "//tensorflow/compiler/xla/client:local_client",
+        "//tensorflow/compiler/xla/client:compile_only_client",
         "//tensorflow/compiler/xla/service:compiler",
         "//tensorflow/compiler/xla/service/cpu:cpu_compiler",
         "//tensorflow/core:core_cpu",
diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index 4b5534c164..3955cabedf 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -27,7 +27,7 @@ limitations under the License.
 #include "tensorflow/compiler/tf2xla/xla_compiler.h"
 #include "tensorflow/compiler/tf2xla/xla_op_registry.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
-#include "tensorflow/compiler/xla/client/local_client.h"
+#include "tensorflow/compiler/xla/client/compile_only_client.h"
 #include "tensorflow/compiler/xla/service/compiler.h"
 #include "tensorflow/compiler/xla/service/cpu/cpu_compiler.h"
 #include "tensorflow/compiler/xla/shape_util.h"
@@ -274,7 +274,8 @@ Status CreateXlaArgs(const Graph& graph,
 
 // Converts the TensorFlow graph into an XLA computation, by executing the
 // graph symbolically, with each op building up the XLA HLO.
-Status ConvertGraphToXla(xla::LocalClient* client, std::unique_ptr<Graph> graph,
+Status ConvertGraphToXla(xla::CompileOnlyClient* client,
+                         std::unique_ptr<Graph> graph,
                          xla::Computation* computation, bool* has_context_arg) {
   // Create a device and context to convert the graph into an XLA computation.
   XlaOpRegistry::RegisterCompilationKernels();
@@ -333,7 +334,8 @@ Status ConvertGraphToXla(xla::LocalClient* client, std::unique_ptr<Graph> graph,
 }
 
 // Compiles the XLA computation into executable code.
-Status CompileXla(xla::LocalClient* client, const xla::Computation& computation,
+Status CompileXla(xla::CompileOnlyClient* client,
+                  const xla::Computation& computation,
                   const xla::cpu::CpuAotCompilationOptions& aot_opts,
                   CompileResult* compile_result) {
   // Retrieves arg and result layouts from the computation.
@@ -350,7 +352,7 @@ Status CompileXla(xla::LocalClient* client, const xla::Computation& computation,
   for (int i = 0; i < pshape->parameters_size(); ++i) {
     arg_layouts.push_back(pshape->mutable_parameters(i));
   }
-  xla::LocalClient::AheadOfTimeComputationInstance instance;
+  xla::CompileOnlyClient::AotComputationInstance instance;
   instance.computation = &computation;
   instance.argument_layouts = std::move(arg_layouts);
   instance.result_layout = &pshape->result();
@@ -365,7 +367,7 @@ Status CompileXla(xla::LocalClient* client, const xla::Computation& computation,
           std::move(aot_or.ValueOrDie().back()));
   compile_result->entry_point = aot_opts.entry_point_name();
   compile_result->pointer_size =
-      xla::LocalClient::PointerSizeForTriple(aot_opts.triple());
+      xla::CompileOnlyClient::PointerSizeForTriple(aot_opts.triple());
   return Status::OK();
 }
 
@@ -394,8 +396,9 @@ Status CompileGraph(std::unique_ptr<Graph> graph, const MainFlags& flags,
   namespace gpu = perftools::gputools;
   gpu::Platform* cpu_platform =
       gpu::MultiPlatformManager::PlatformWithName("Host").ValueOrDie();
-  xla::LocalClient* client =
-      xla::ClientLibrary::GetOrCreateLocalClient(cpu_platform).ValueOrDie();
+  xla::CompileOnlyClient* client =
+      xla::ClientLibrary::GetOrCreateCompileOnlyClient(cpu_platform)
+          .ValueOrDie();
   xla::Computation computation;
   TF_RETURN_IF_ERROR(ConvertGraphToXla(client, std::move(graph), &computation,
                                        &compile_result->has_context_arg));
diff --git a/tensorflow/compiler/xla/client/BUILD b/tensorflow/compiler/xla/client/BUILD
index 3e9dfe2a92..2d96128e25 100644
--- a/tensorflow/compiler/xla/client/BUILD
+++ b/tensorflow/compiler/xla/client/BUILD
@@ -99,6 +99,26 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "compile_only_client",
+    srcs = ["compile_only_client.cc"],
+    hdrs = ["compile_only_client.h"],
+    deps = [
+        ":client",
+        ":computation",
+        "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:util",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/service:compile_only_service",
+        "//tensorflow/compiler/xla/service:compiler",
+        "//tensorflow/compiler/xla/service/llvm_ir:llvm_util",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:stream_executor_no_cuda",
+        "@llvm//:support",
+    ],
+)
+
 # This target is used to instantiate the XLA service in-process and create
 # a client for it.
 cc_library(
@@ -106,12 +126,14 @@ cc_library(
     srcs = ["client_library.cc"],
     hdrs = ["client_library.h"],
     deps = [
+        ":compile_only_client",
         ":local_client",
         "//tensorflow/compiler/xla:status_macros",
         "//tensorflow/compiler/xla:statusor",
         "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla/service:backend",
+        "//tensorflow/compiler/xla/service:compile_only_service",
         "//tensorflow/compiler/xla/service:device_memory_allocator",
         "//tensorflow/compiler/xla/service:local_service",
         "//tensorflow/compiler/xla/service:platform_util",
diff --git a/tensorflow/compiler/xla/client/client_library.cc b/tensorflow/compiler/xla/client/client_library.cc
index 93437023bc..eb9a7ff2ac 100644
--- a/tensorflow/compiler/xla/client/client_library.cc
+++ b/tensorflow/compiler/xla/client/client_library.cc
@@ -69,8 +69,8 @@ ClientLibrary::~ClientLibrary() = default;
     TF_ASSIGN_OR_RETURN(platform, PlatformUtil::GetDefaultPlatform());
   }
 
-  auto it = client_library.instances_.find(platform->id());
-  if (it != client_library.instances_.end()) {
+  auto it = client_library.local_instances_.find(platform->id());
+  if (it != client_library.local_instances_.end()) {
     return it->second->client.get();
   }
 
@@ -78,13 +78,13 @@ ClientLibrary::~ClientLibrary() = default;
   service_options.set_platform(platform);
   service_options.set_number_of_replicas(replica_count);
 
-  std::unique_ptr<LocalInstance> instance = MakeUnique<LocalInstance>();
+  auto instance = MakeUnique<LocalInstance>();
   TF_ASSIGN_OR_RETURN(instance->service,
                       LocalService::NewService(service_options));
   instance->client = MakeUnique<LocalClient>(instance->service.get());
   LocalClient* cl = instance->client.get();
 
-  client_library.instances_.insert(
+  client_library.local_instances_.insert(
       std::make_pair(platform->id(), std::move(instance)));
   return cl;
 }
@@ -99,9 +99,35 @@ ClientLibrary::~ClientLibrary() = default;
     perftools::gputools::Platform* platform) {
   ClientLibrary& client_library = Singleton();
   tensorflow::mutex_lock lock(client_library.service_mutex_);
-  auto it = client_library.instances_.find(platform->id());
-  CHECK(it != client_library.instances_.end());
+  auto it = client_library.local_instances_.find(platform->id());
+  CHECK(it != client_library.local_instances_.end());
   return it->second->service.get();
 }
 
+/* static */ StatusOr<CompileOnlyClient*>
+ClientLibrary::GetOrCreateCompileOnlyClient(
+    perftools::gputools::Platform* platform) {
+  ClientLibrary& client_library = Singleton();
+  tensorflow::mutex_lock lock(client_library.service_mutex_);
+
+  if (platform == nullptr) {
+    TF_ASSIGN_OR_RETURN(platform, PlatformUtil::GetDefaultPlatform());
+  }
+
+  auto it = client_library.compile_only_instances_.find(platform->id());
+  if (it != client_library.compile_only_instances_.end()) {
+    return it->second->client.get();
+  }
+
+  auto instance = MakeUnique<CompileOnlyInstance>();
+  TF_ASSIGN_OR_RETURN(instance->service,
+                      CompileOnlyService::NewService(platform));
+  instance->client = MakeUnique<CompileOnlyClient>(instance->service.get());
+  CompileOnlyClient* cl = instance->client.get();
+
+  client_library.compile_only_instances_.insert(
+      std::make_pair(platform->id(), std::move(instance)));
+  return cl;
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/client/client_library.h b/tensorflow/compiler/xla/client/client_library.h
index 2bc319f933..49f4541437 100644
--- a/tensorflow/compiler/xla/client/client_library.h
+++ b/tensorflow/compiler/xla/client/client_library.h
@@ -26,7 +26,9 @@ limitations under the License.
 #include <string>
 #include <vector>
 
+#include "tensorflow/compiler/xla/client/compile_only_client.h"
 #include "tensorflow/compiler/xla/client/local_client.h"
+#include "tensorflow/compiler/xla/service/compile_only_service.h"
 #include "tensorflow/compiler/xla/service/device_memory_allocator.h"
 #include "tensorflow/compiler/xla/service/local_service.h"
 #include "tensorflow/compiler/xla/statusor.h"
@@ -76,6 +78,13 @@ class ClientLibrary {
   // access user computations from client.
   static LocalService* GetXlaService(perftools::gputools::Platform* platform);
 
+  // Singleton constructor-or-accessor for compile-only clients. Arguments:
+  //
+  //   platform : The platform the underlying XLA service should target. If
+  //     null then default platform is used.
+  static StatusOr<CompileOnlyClient*> GetOrCreateCompileOnlyClient(
+      perftools::gputools::Platform* platform = nullptr);
+
  private:
   // Returns the singleton instance of ClientLibrary.
   static ClientLibrary& Singleton();
@@ -90,10 +99,21 @@ class ClientLibrary {
     std::unique_ptr<LocalClient> client;
   };
 
+  struct CompileOnlyInstance {
+    // Service that is wrapped by the singleton client object.
+    std::unique_ptr<CompileOnlyService> service;
+    // Singleton client object.
+    std::unique_ptr<CompileOnlyClient> client;
+  };
+
   tensorflow::mutex service_mutex_;  // Guards the singleton creation state.
   std::unordered_map<perftools::gputools::Platform::Id,
                      std::unique_ptr<LocalInstance>>
-      instances_ GUARDED_BY(service_mutex_);
+      local_instances_ GUARDED_BY(service_mutex_);
+
+  std::unordered_map<perftools::gputools::Platform::Id,
+                     std::unique_ptr<CompileOnlyInstance>>
+      compile_only_instances_ GUARDED_BY(service_mutex_);
 
   TF_DISALLOW_COPY_AND_ASSIGN(ClientLibrary);
 };
diff --git a/tensorflow/compiler/xla/client/compile_only_client.cc b/tensorflow/compiler/xla/client/compile_only_client.cc
new file mode 100644
index 0000000000..2ff6f0b300
--- /dev/null
+++ b/tensorflow/compiler/xla/client/compile_only_client.cc
@@ -0,0 +1,59 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/client/compile_only_client.h"
+
+#include "external/llvm/include/llvm/ADT/Triple.h"
+#include "tensorflow/compiler/xla/ptr_util.h"
+#include "tensorflow/compiler/xla/service/llvm_ir/llvm_util.h"
+#include "tensorflow/compiler/xla/status_macros.h"
+
+namespace se = ::perftools::gputools;
+
+namespace xla {
+
+StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
+CompileOnlyClient::CompileAheadOfTime(
+    const tensorflow::gtl::ArraySlice<AotComputationInstance> computations,
+    const AotCompilationOptions& options) {
+  std::vector<CompileOnlyService::AotComputationInstance> service_instances;
+  service_instances.reserve(computations.size());
+  for (const AotComputationInstance& instance : computations) {
+    service_instances.push_back({});
+    CompileOnlyService::AotComputationInstance& service_instance =
+        service_instances.back();
+    TF_RET_CHECK(instance.computation != nullptr);
+    service_instance.computation = instance.computation->handle();
+    service_instance.argument_layouts = instance.argument_layouts;
+    service_instance.result_layout = instance.result_layout;
+  }
+  return compiler_service_->CompileAheadOfTime(service_instances, options);
+}
+
+int64 CompileOnlyClient::PointerSizeForTriple(
+    tensorflow::StringPiece target_triple) {
+  llvm::Triple triple(
+      llvm::Triple::normalize(llvm_ir::AsStringRef(target_triple)));
+  if (triple.isArch64Bit()) {
+    return 8;
+  } else if (triple.isArch32Bit()) {
+    return 4;
+  } else {
+    CHECK(triple.isArch16Bit());
+    return 2;
+  }
+}
+
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/client/compile_only_client.h b/tensorflow/compiler/xla/client/compile_only_client.h
new file mode 100644
index 0000000000..5900048711
--- /dev/null
+++ b/tensorflow/compiler/xla/client/compile_only_client.h
@@ -0,0 +1,66 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_COMPILER_XLA_CLIENT_COMPILE_ONLY_CLIENT_H_
+#define TENSORFLOW_COMPILER_XLA_CLIENT_COMPILE_ONLY_CLIENT_H_
+
+#include "tensorflow/compiler/xla/client/client.h"
+#include "tensorflow/compiler/xla/client/computation.h"
+#include "tensorflow/compiler/xla/service/compile_only_service.h"
+#include "tensorflow/compiler/xla/service/compiler.h"
+#include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/platform/stream_executor_no_cuda.h"
+
+namespace xla {
+
+// An XLA Client specialization for doing ahead-of-time compilation.  This does
+// not require (or attempt to instantiate) an execution-capable backend for the
+// relevant platform.
+class CompileOnlyClient : public Client {
+ public:
+  explicit CompileOnlyClient(CompileOnlyService* service)
+      : Client(service), compiler_service_(service) {}
+
+  CompileOnlyClient(const CompileOnlyClient&) = delete;
+  void operator=(const CompileOnlyClient&) = delete;
+
+  // A description of a computation to compile using CompileAheadOfTime.
+  struct AotComputationInstance {
+    const Computation* computation;
+    // Inform the compiler of the expected layout for arguments.
+    std::vector<const Shape*> argument_layouts;
+    // Specifies the expected result layout.
+    const Shape* result_layout;
+  };
+
+  // Compiles a list of computations for ahead-of-time execution.  This is
+  // intended for use in static compilation. The |options| parameter describes
+  // the target for which the compiler should emit code.
+  StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
+  CompileAheadOfTime(
+      const tensorflow::gtl::ArraySlice<AotComputationInstance> computations,
+      const AotCompilationOptions& options);
+
+  // Returns the size of a pointer in bytes for a given triple.
+  static int64 PointerSizeForTriple(tensorflow::StringPiece triple);
+
+ private:
+  CompileOnlyService* compiler_service_;
+};
+
+}  // namespace xla
+
+#endif  // TENSORFLOW_COMPILER_XLA_CLIENT_COMPILE_ONLY_CLIENT_H_
diff --git a/tensorflow/compiler/xla/client/local_client.cc b/tensorflow/compiler/xla/client/local_client.cc
index bfd14bc1c0..aaed34f4c3 100644
--- a/tensorflow/compiler/xla/client/local_client.cc
+++ b/tensorflow/compiler/xla/client/local_client.cc
@@ -261,38 +261,6 @@ tensorflow::Status LocalClient::ResolveArguments(
                                           argument_ptrs);
 }
 
-StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
-LocalClient::CompileAheadOfTime(
-    const tensorflow::gtl::ArraySlice<AheadOfTimeComputationInstance>
-        computations,
-    const AotCompilationOptions& options) {
-  std::vector<LocalService::AheadOfTimeComputationInstance> service_instances;
-  service_instances.reserve(computations.size());
-  for (const AheadOfTimeComputationInstance& instance : computations) {
-    service_instances.push_back({});
-    LocalService::AheadOfTimeComputationInstance& service_instance =
-        service_instances.back();
-    TF_RET_CHECK(instance.computation != nullptr);
-    service_instance.computation = instance.computation->handle();
-    service_instance.argument_layouts = instance.argument_layouts;
-    service_instance.result_layout = instance.result_layout;
-  }
-  return local_service_->CompileAheadOfTime(service_instances, options);
-}
-
-int64 LocalClient::PointerSizeForTriple(tensorflow::StringPiece target_triple) {
-  llvm::Triple triple(
-      llvm::Triple::normalize(llvm_ir::AsStringRef(target_triple)));
-  if (triple.isArch64Bit()) {
-    return 8;
-  } else if (triple.isArch32Bit()) {
-    return 4;
-  } else {
-    CHECK(triple.isArch16Bit());
-    return 2;
-  }
-}
-
 se::Platform* LocalClient::platform() const {
   return local_service_->backend().platform();
 }
diff --git a/tensorflow/compiler/xla/client/local_client.h b/tensorflow/compiler/xla/client/local_client.h
index 2c467efcea..94d5610639 100644
--- a/tensorflow/compiler/xla/client/local_client.h
+++ b/tensorflow/compiler/xla/client/local_client.h
@@ -148,7 +148,7 @@ class LocalExecutable {
   const ExecutableBuildOptions& build_options_;
 };
 
-// An XLA service client object for use when the client and service run in
+// An XLA Client specialization for use when the client and service run in
 // the same process.
 class LocalClient : public Client {
  public:
@@ -182,30 +182,6 @@ class LocalClient : public Client {
       const tensorflow::gtl::ArraySlice<const Shape*> argument_layouts,
       const ExecutableBuildOptions& options);
 
-  // A description of a computation to compile using CompileAheadOfTime.
-  struct AheadOfTimeComputationInstance {
-    const Computation* computation;
-    // Inform the compiler of the expected layout for arguments.
-    std::vector<const Shape*> argument_layouts;
-    // Specifies the expected result layout.
-    const Shape* result_layout;
-  };
-
-  // Compiles a list of computations for ahead-of-time execution.  This is
-  // intended for use in static compilation. The |options| parameter describes
-  // the target for which the compiler should emit code.
-  //
-  // TODO(b/31222190): This doesn't really belong in LocalClient. Move it to its
-  // own library.
-  StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
-  CompileAheadOfTime(
-      const tensorflow::gtl::ArraySlice<AheadOfTimeComputationInstance>
-          computations,
-      const AotCompilationOptions& options);
-
-  // Returns the size of a pointer in bytes for a given triple.
-  static int64 PointerSizeForTriple(tensorflow::StringPiece triple);
-
   // Returns the platform that the underlying service targets.
   perftools::gputools::Platform* platform() const;
 
diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 2452158efa..fd47ffe806 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -408,6 +408,27 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "compile_only_service",
+    srcs = ["compile_only_service.cc"],
+    hdrs = ["compile_only_service.h"],
+    deps = [
+        ":backend",
+        ":compiler",
+        ":computation_layout",
+        ":computation_tracker",
+        ":platform_util",
+        ":service",
+        "//tensorflow/compiler/xla:status_macros",
+        "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:types",
+        "//tensorflow/compiler/xla:util",
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:stream_executor_no_cuda",
+    ],
+)
+
 cc_library(
     name = "cpu_plugin",
     deps = [
diff --git a/tensorflow/compiler/xla/service/compile_only_service.cc b/tensorflow/compiler/xla/service/compile_only_service.cc
new file mode 100644
index 0000000000..ac1906c88c
--- /dev/null
+++ b/tensorflow/compiler/xla/service/compile_only_service.cc
@@ -0,0 +1,131 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/compiler/xla/service/compile_only_service.h"
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "tensorflow/compiler/xla/service/backend.h"
+#include "tensorflow/compiler/xla/service/computation_layout.h"
+#include "tensorflow/compiler/xla/service/computation_tracker.h"
+#include "tensorflow/compiler/xla/service/platform_util.h"
+#include "tensorflow/compiler/xla/status_macros.h"
+#include "tensorflow/compiler/xla/types.h"
+#include "tensorflow/compiler/xla/util.h"
+#include "tensorflow/core/lib/gtl/cleanup.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/stream_executor_no_cuda.h"
+
+namespace se = ::perftools::gputools;
+
+namespace xla {
+
+/* static */ StatusOr<std::unique_ptr<CompileOnlyService>>
+CompileOnlyService::NewService(perftools::gputools::Platform* platform) {
+  ServiceOptions default_options;
+  default_options.set_platform(platform);
+  return NewService(default_options);
+}
+
+/* static */ StatusOr<std::unique_ptr<CompileOnlyService>>
+CompileOnlyService::NewService(const ServiceOptions& options) {
+  perftools::gputools::Platform* platform = options.platform();
+  if (platform == nullptr) {
+    TF_ASSIGN_OR_RETURN(platform, PlatformUtil::GetDefaultPlatform());
+  }
+
+  TF_ASSIGN_OR_RETURN(auto compiler, Compiler::GetForPlatform(platform));
+
+  TF_ASSIGN_OR_RETURN(std::unique_ptr<Backend> compute_constant_backend,
+                      CreateComputeConstantBackend());
+  std::unique_ptr<CompileOnlyService> service(
+      new CompileOnlyService(compiler, std::move(compute_constant_backend)));
+  return std::move(service);
+}
+
+CompileOnlyService::CompileOnlyService(
+    Compiler* compiler, std::unique_ptr<Backend> compute_constant_backend)
+    : Service(/*backend=*/nullptr, std::move(compute_constant_backend)),
+      compiler_(compiler) {
+  runs_in_client_process_ = true;
+}
+
+StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
+CompileOnlyService::CompileAheadOfTime(
+    const tensorflow::gtl::ArraySlice<AotComputationInstance> computations,
+    const AotCompilationOptions& options) {
+  std::vector<std::unique_ptr<HloModule>> hlo_modules;
+  std::vector<std::unique_ptr<HloModuleConfig>> module_configs;
+  for (const AotComputationInstance& instance : computations) {
+    TF_ASSIGN_OR_RETURN(UserComputation * user_computation,
+                        computation_tracker_.Resolve(instance.computation));
+    VersionedComputationHandle versioned_handle =
+        user_computation->GetVersionedHandle();
+
+    // Dump computation proto state if flag is set.
+    legacy_flags::ServiceFlags* flags = legacy_flags::GetServiceFlags();
+    const string& directory_path = flags->xla_dump_computations_to;
+    if (!directory_path.empty()) {
+      TF_ASSIGN_OR_RETURN(
+          std::unique_ptr<SessionModule> session_module,
+          computation_tracker_.SnapshotComputation(versioned_handle.handle));
+      string filename = tensorflow::strings::StrCat(
+          "computation_", versioned_handle.handle.handle(), "__",
+          session_module->entry().name(), "__version_",
+          versioned_handle.version);
+      TF_RETURN_IF_ERROR(Executable::DumpToDirectory(directory_path, filename,
+                                                     *session_module));
+    }
+
+    TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModule> hlo_module,
+                        computation_tracker_.BuildHloModule(
+                            versioned_handle,
+                            /*include_unreachable_instructions=*/true));
+    hlo_modules.push_back(std::move(hlo_module));
+
+    TF_ASSIGN_OR_RETURN(
+        std::shared_ptr<const ProgramShape> program_shape,
+        user_computation->ComputeProgramShape(versioned_handle.version));
+
+    module_configs.push_back(MakeUnique<HloModuleConfig>(*program_shape));
+    HloModuleConfig* module_config = module_configs.back().get();
+    auto* computation_layout =
+        module_config->mutable_entry_computation_layout();
+    if (flags->xla_hlo_profile) {
+      module_config->enable_hlo_profiling(true);
+    }
+    for (int i = 0; i < instance.argument_layouts.size(); ++i) {
+      const Shape& argument_layout = *instance.argument_layouts[i];
+      if (ShapeUtil::IsTuple(argument_layout)) {
+        return Unimplemented("tuple arguments not supported yet");
+      }
+      TF_RETURN_IF_ERROR(
+          computation_layout->mutable_parameter_layout(i)->CopyLayoutFromShape(
+              argument_layout));
+    }
+    TF_RETURN_IF_ERROR(
+        computation_layout->mutable_result_layout()->CopyLayoutFromShape(
+            *instance.result_layout));
+  }
+
+  return compiler_->CompileAheadOfTime(std::move(hlo_modules),
+                                       std::move(module_configs),
+                                       MakeHloDumper(), options);
+}
+
+}  // namespace xla
diff --git a/tensorflow/compiler/xla/service/compile_only_service.h b/tensorflow/compiler/xla/service/compile_only_service.h
new file mode 100644
index 0000000000..06735b21ca
--- /dev/null
+++ b/tensorflow/compiler/xla/service/compile_only_service.h
@@ -0,0 +1,128 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_COMPILER_XLA_SERVICE_COMPILE_ONLY_SERVICE_H_
+#define TENSORFLOW_COMPILER_XLA_SERVICE_COMPILE_ONLY_SERVICE_H_
+
+#include "tensorflow/compiler/xla/service/backend.h"
+#include "tensorflow/compiler/xla/service/compiler.h"
+#include "tensorflow/compiler/xla/service/service.h"
+#include "tensorflow/compiler/xla/statusor.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
+#include "tensorflow/core/platform/stream_executor_no_cuda.h"
+
+namespace xla {
+
+// An XLA Service specialization for ahead-of-time compilation.  This only
+// instantiates a Compiler object for the relevant platform; it does not
+// instantiate or require an execution backend.
+class CompileOnlyService : public Service {
+ public:
+  // Factory for creating a CompileOnlyService. The parameter platform is the
+  // platform that the service should target. If platform is null then the
+  // default platform is used.
+  static StatusOr<std::unique_ptr<CompileOnlyService>> NewService(
+      perftools::gputools::Platform* platform);
+  static StatusOr<std::unique_ptr<CompileOnlyService>> NewService(
+      const ServiceOptions& options);
+
+  // A description of a computation to compile using CompileAheadOfTime.
+  struct AotComputationInstance {
+    ComputationHandle computation;
+    std::vector<const Shape*> argument_layouts;
+    const Shape* result_layout = nullptr;
+  };
+
+  // Compiles a list of computations for ahead-of-time execution.  This is
+  // intended for use in static compilation.  See
+  // |CompileOnlyClient::CompileAheadOfTime| for additional details.
+  StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
+  CompileAheadOfTime(
+      const tensorflow::gtl::ArraySlice<AotComputationInstance> computations,
+      const AotCompilationOptions& Options);
+
+  // Override Service methods that require an execute backend.
+  tensorflow::Status Execute(const ExecuteRequest* arg,
+                             ExecuteResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support execution.");
+  }
+  tensorflow::Status ExecuteParallel(const ExecuteParallelRequest* arg,
+                                     ExecuteParallelResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support execution.");
+  }
+  tensorflow::Status GetDeviceHandles(
+      const GetDeviceHandlesRequest* arg,
+      GetDeviceHandlesResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support devices.");
+  }
+  tensorflow::Status ExecuteAsync(const ExecuteAsyncRequest* arg,
+                                  ExecuteAsyncResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support execution.");
+  }
+  tensorflow::Status WaitForExecution(
+      const WaitForExecutionRequest* arg,
+      WaitForExecutionResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support execution.");
+  }
+  tensorflow::Status TransferToClient(
+      const TransferToClientRequest* arg,
+      TransferToClientResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support data transfers.");
+  }
+  tensorflow::Status TransferToClientInProcess(
+      const TransferToClientInProcessRequest* arg,
+      TransferToClientInProcessResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support data transfers.");
+  }
+  tensorflow::Status TransferToServer(
+      const TransferToServerRequest* arg,
+      TransferToServerResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support data transfers.");
+  }
+  tensorflow::Status TransferToInfeed(
+      const TransferToInfeedRequest* arg,
+      TransferToInfeedResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support data transfers.");
+  }
+  tensorflow::Status TransferFromOutfeed(
+      const TransferFromOutfeedRequest* arg,
+      TransferFromOutfeedResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support data transfers.");
+  }
+  tensorflow::Status TransferToServerInProcess(
+      const TransferToServerInProcessRequest* arg,
+      TransferToServerInProcessResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support data transfers.");
+  }
+  tensorflow::Status ResetDevice(const ResetDeviceRequest* arg,
+                                 ResetDeviceResponse* result) override {
+    return Unimplemented("CompileOnlyService does not support devices.");
+  }
+
+ private:
+  explicit CompileOnlyService(
+      Compiler* compiler, std::unique_ptr<Backend> compute_constant_backend);
+  CompileOnlyService(const CompileOnlyService&) = delete;
+  void operator=(const CompileOnlyService&) = delete;
+
+  // The compiler for the target platform.  This is included in place of
+  // the Service::execute_backend_'s compiler, since execute_backend_ is a
+  // nullptr in CompileOnlyService.
+  Compiler* compiler_;
+};
+
+}  // namespace xla
+
+#endif  // TENSORFLOW_COMPILER_XLA_SERVICE_COMPILE_ONLY_SERVICE_H_
diff --git a/tensorflow/compiler/xla/service/local_service.cc b/tensorflow/compiler/xla/service/local_service.cc
index 17d7b97b21..6947c5d2e1 100644
--- a/tensorflow/compiler/xla/service/local_service.cc
+++ b/tensorflow/compiler/xla/service/local_service.cc
@@ -128,70 +128,6 @@ StatusOr<GlobalDataHandle> LocalService::AllocateBufferOnDevice(
                                   allocation_size));
 }
 
-StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
-LocalService::CompileAheadOfTime(
-    const tensorflow::gtl::ArraySlice<AheadOfTimeComputationInstance>
-        computations,
-    const AotCompilationOptions& options) {
-  std::vector<std::unique_ptr<HloModule>> hlo_modules;
-  std::vector<std::unique_ptr<HloModuleConfig>> module_configs;
-  for (const AheadOfTimeComputationInstance& instance : computations) {
-    TF_ASSIGN_OR_RETURN(UserComputation * user_computation,
-                        computation_tracker_.Resolve(instance.computation));
-    VersionedComputationHandle versioned_handle =
-        user_computation->GetVersionedHandle();
-
-    // Dump computation proto state if flag is set.
-    legacy_flags::ServiceFlags* flags = legacy_flags::GetServiceFlags();
-    const string& directory_path = flags->xla_dump_computations_to;
-    if (!directory_path.empty()) {
-      TF_ASSIGN_OR_RETURN(
-          std::unique_ptr<SessionModule> session_module,
-          computation_tracker_.SnapshotComputation(versioned_handle.handle));
-      string filename = tensorflow::strings::StrCat(
-          "computation_", versioned_handle.handle.handle(), "__",
-          session_module->entry().name(), "__version_",
-          versioned_handle.version);
-      TF_RETURN_IF_ERROR(Executable::DumpToDirectory(directory_path, filename,
-                                                     *session_module));
-    }
-
-    TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModule> hlo_module,
-                        computation_tracker_.BuildHloModule(
-                            versioned_handle,
-                            /*include_unreachable_instructions=*/true));
-    hlo_modules.push_back(std::move(hlo_module));
-
-    TF_ASSIGN_OR_RETURN(
-        std::shared_ptr<const ProgramShape> program_shape,
-        user_computation->ComputeProgramShape(versioned_handle.version));
-
-    module_configs.push_back(MakeUnique<HloModuleConfig>(*program_shape));
-    HloModuleConfig* module_config = module_configs.back().get();
-    auto* computation_layout =
-        module_config->mutable_entry_computation_layout();
-    if (flags->xla_hlo_profile) {
-      module_config->enable_hlo_profiling(true);
-    }
-    for (int i = 0; i < instance.argument_layouts.size(); ++i) {
-      const Shape& argument_layout = *instance.argument_layouts[i];
-      if (ShapeUtil::IsTuple(argument_layout)) {
-        return Unimplemented("tuple arguments not supported yet");
-      }
-      TF_RETURN_IF_ERROR(
-          computation_layout->mutable_parameter_layout(i)->CopyLayoutFromShape(
-              argument_layout));
-    }
-    TF_RETURN_IF_ERROR(
-        computation_layout->mutable_result_layout()->CopyLayoutFromShape(
-            *instance.result_layout));
-  }
-
-  return execute_backend_->compiler()->CompileAheadOfTime(
-      std::move(hlo_modules), std::move(module_configs), MakeHloDumper(),
-      options);
-}
-
 StatusOr<std::unique_ptr<Executable>> LocalService::CompileExecutable(
     const ComputationHandle& computation,
     const tensorflow::gtl::ArraySlice<const Shape*> argument_layouts,
diff --git a/tensorflow/compiler/xla/service/local_service.h b/tensorflow/compiler/xla/service/local_service.h
index df27f0a7a6..a1a2ef98e9 100644
--- a/tensorflow/compiler/xla/service/local_service.h
+++ b/tensorflow/compiler/xla/service/local_service.h
@@ -59,22 +59,6 @@ class LocalService : public Service {
       const Shape& shape, int device_ordinal,
       bool allocate_space_for_deep_copy);
 
-  // A description of a computation to compile using CompileAheadOfTime.
-  struct AheadOfTimeComputationInstance {
-    ComputationHandle computation;
-    std::vector<const Shape*> argument_layouts;
-    const Shape* result_layout = nullptr;
-  };
-
-  // Compiles a list of computations for ahead-of-time execution.  This is
-  // intended for use in static compilation.  See
-  // |LocalClient::CompileAheadOfTime| for additional details.
-  StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
-  CompileAheadOfTime(
-      const tensorflow::gtl::ArraySlice<AheadOfTimeComputationInstance>
-          computations,
-      const AotCompilationOptions& Options);
-
   // Builds an Executable with the given argument layouts and options. If
   // result_layout is non-null, then the executable is compiled to produce a
   // result of the given layout.
diff --git a/tensorflow/compiler/xla/service/service.cc b/tensorflow/compiler/xla/service/service.cc
index 451bb8c7ea..892265f5b6 100644
--- a/tensorflow/compiler/xla/service/service.cc
+++ b/tensorflow/compiler/xla/service/service.cc
@@ -180,20 +180,24 @@ Service::Service(std::unique_ptr<Backend> execute_backend,
                  std::unique_ptr<Backend> compute_constant_backend)
     : execute_backend_(std::move(execute_backend)),
       compute_constant_backend_(std::move(compute_constant_backend)) {
-  LOG(INFO) << Printf(
-      "XLA service %p executing computations on platform %s. Devices:", this,
-      execute_backend_->platform()->Name().c_str());
-  for (int i = 0; i < execute_backend_->device_count(); ++i) {
-    if (execute_backend_->device_ordinal_supported(i)) {
-      se::StreamExecutor* executor =
-          execute_backend_->stream_executor(i).ValueOrDie();
-      const auto& description = executor->GetDeviceDescription();
-      LOG(INFO) << Printf("  StreamExecutor device (%d): %s, %s", i,
-                          description.name().c_str(),
-                          description.platform_version().c_str());
-    } else {
-      LOG(INFO) << Printf("  StreamExecutor device (%d) not supported", i);
+  if (execute_backend_) {
+    LOG(INFO) << Printf(
+        "XLA service %p executing computations on platform %s. Devices:", this,
+        execute_backend_->platform()->Name().c_str());
+    for (int i = 0; i < execute_backend_->device_count(); ++i) {
+      if (execute_backend_->device_ordinal_supported(i)) {
+        se::StreamExecutor* executor =
+            execute_backend_->stream_executor(i).ValueOrDie();
+        const auto& description = executor->GetDeviceDescription();
+        LOG(INFO) << Printf("  StreamExecutor device (%d): %s, %s", i,
+                            description.name().c_str(),
+                            description.platform_version().c_str());
+      } else {
+        LOG(INFO) << Printf("  StreamExecutor device (%d) not supported", i);
+      }
     }
+  } else {
+    VLOG(1) << "XLA compile-only service constructed";
   }
 }
 
diff --git a/tensorflow/compiler/xla/tests/local_client_aot_test_helper.cc b/tensorflow/compiler/xla/tests/local_client_aot_test_helper.cc
index 7ea83a9e95..52816dc72c 100644
--- a/tensorflow/compiler/xla/tests/local_client_aot_test_helper.cc
+++ b/tensorflow/compiler/xla/tests/local_client_aot_test_helper.cc
@@ -42,7 +42,7 @@ xla::Computation Doubler(xla::Client* client) {
 int main(int argc, char** argv) {
   tensorflow::port::InitMain(argv[0], &argc, &argv);
 
-  auto client = xla::ClientLibrary::LocalClientOrDie();
+  auto client = xla::ClientLibrary::GetOrCreateCompileOnlyClient().ValueOrDie();
 
   xla::ComputationBuilder builder(client, "aot_test_helper");
   auto opaque_shape = xla::ShapeUtil::MakeOpaqueShape();
@@ -74,7 +74,7 @@ int main(int argc, char** argv) {
   llvm::Triple triple(xla::llvm_ir::AsStringRef(triple_string));
 
   xla::Computation computation = builder.Build().ConsumeValueOrDie();
-  xla::LocalClient::AheadOfTimeComputationInstance instance{
+  xla::CompileOnlyClient::AotComputationInstance instance{
       &computation, /*argument_layouts=*/{&opaque_shape}, &r0f32};
 
   xla::cpu::CpuAotCompilationOptions options(
diff --git a/tensorflow/opensource_only/eigen.threadpool b/tensorflow/opensource_only/eigen.threadpool
new file mode 100644
index 0000000000..d2639af4d9
--- /dev/null
+++ b/tensorflow/opensource_only/eigen.threadpool
@@ -0,0 +1 @@
+#include "unsupported/Eigen/CXX11/ThreadPool"
-- 
GitLab


From 0632564172c13c60e43a2411f540ac29f76f52b3 Mon Sep 17 00:00:00 2001
From: Yifei Feng <yifeif@google.com>
Date: Fri, 5 May 2017 16:43:23 -0700
Subject: [PATCH 1062/1563] Remove deleted files.

---
 third_party/gpus/crosstool/CROSSTOOL.tpl     | 249 -------------------
 third_party/gpus/cuda/platform.bzl.tpl       |  15 --
 third_party/nccl/BUILD                       |   0
 third_party/nccl/fix_clang_compilation.patch |  85 -------
 third_party/nccl/nccl.BUILD                  |  66 -----
 tools/bazel.rc.template                      |  39 ---
 util/python/python_config.sh                 | 159 ------------
 7 files changed, 613 deletions(-)
 delete mode 100644 third_party/gpus/crosstool/CROSSTOOL.tpl
 delete mode 100644 third_party/gpus/cuda/platform.bzl.tpl
 delete mode 100644 third_party/nccl/BUILD
 delete mode 100644 third_party/nccl/fix_clang_compilation.patch
 delete mode 100644 third_party/nccl/nccl.BUILD
 delete mode 100644 tools/bazel.rc.template
 delete mode 100755 util/python/python_config.sh

diff --git a/third_party/gpus/crosstool/CROSSTOOL.tpl b/third_party/gpus/crosstool/CROSSTOOL.tpl
deleted file mode 100644
index b77a45c325..0000000000
--- a/third_party/gpus/crosstool/CROSSTOOL.tpl
+++ /dev/null
@@ -1,249 +0,0 @@
-major_version: "local"
-minor_version: ""
-default_target_cpu: "same_as_host"
-
-default_toolchain {
-  cpu: "k8"
-  toolchain_identifier: "local_linux"
-}
-default_toolchain {
-  cpu: "piii"
-  toolchain_identifier: "local_linux"
-}
-default_toolchain {
-  cpu: "arm"
-  toolchain_identifier: "local_linux"
-}
-default_toolchain {
-  cpu: "darwin"
-  toolchain_identifier: "local_darwin"
-}
-default_toolchain {
-  cpu: "ppc"
-  toolchain_identifier: "local_linux"
-}
-
-toolchain {
-  abi_version: "local"
-  abi_libc_version: "local"
-  builtin_sysroot: ""
-  compiler: "compiler"
-  host_system_name: "local"
-  needsPic: true
-  supports_gold_linker: false
-  supports_incremental_linker: false
-  supports_fission: false
-  supports_interface_shared_objects: false
-  supports_normalizing_ar: false
-  supports_start_end_lib: false
-  supports_thin_archives: false
-  target_libc: "local"
-  target_cpu: "local"
-  target_system_name: "local"
-  toolchain_identifier: "local_linux"
-
-  tool_path { name: "ar" path: "/usr/bin/ar" }
-  tool_path { name: "compat-ld" path: "/usr/bin/ld" }
-  tool_path { name: "cpp" path: "/usr/bin/cpp" }
-  tool_path { name: "dwp" path: "/usr/bin/dwp" }
-  # As part of the TensorFlow release, we place some cuda-related compilation
-  # files in @local_config_cuda//crosstool/clang/bin, and this relative
-  # path, combined with the rest of our Bazel configuration causes our
-  # compilation to use those files.
-  tool_path { name: "gcc" path: "clang/bin/crosstool_wrapper_driver_is_not_gcc" }
-  # Use "-std=c++11" for nvcc. For consistency, force both the host compiler
-  # and the device compiler to use "-std=c++11".
-  cxx_flag: "-std=c++11"
-  linker_flag: "-Wl,-no-as-needed"
-  linker_flag: "-lstdc++"
-  linker_flag: "-B/usr/bin/"
-
-%{gcc_host_compiler_includes}
-  tool_path { name: "gcov" path: "/usr/bin/gcov" }
-
-  # C(++) compiles invoke the compiler (as that is the one knowing where
-  # to find libraries), but we provide LD so other rules can invoke the linker.
-  tool_path { name: "ld" path: "/usr/bin/ld" }
-
-  tool_path { name: "nm" path: "/usr/bin/nm" }
-  tool_path { name: "objcopy" path: "/usr/bin/objcopy" }
-  objcopy_embed_flag: "-I"
-  objcopy_embed_flag: "binary"
-  tool_path { name: "objdump" path: "/usr/bin/objdump" }
-  tool_path { name: "strip" path: "/usr/bin/strip" }
-
-  # Anticipated future default.
-  unfiltered_cxx_flag: "-no-canonical-prefixes"
-
-  # Make C++ compilation deterministic. Use linkstamping instead of these
-  # compiler symbols.
-  unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
-  unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
-  unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
-  unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
-
-  # Security hardening on by default.
-  # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
-  # We need to undef it before redefining it as some distributions now have
-  # it enabled by default.
-  compiler_flag: "-U_FORTIFY_SOURCE"
-  compiler_flag: "-D_FORTIFY_SOURCE=1"
-  compiler_flag: "-fstack-protector"
-  compiler_flag: "-fPIE"
-  linker_flag: "-pie"
-  linker_flag: "-Wl,-z,relro,-z,now"
-
-  # Enable coloring even if there's no attached terminal. Bazel removes the
-  # escape sequences if --nocolor is specified. This isn't supported by gcc
-  # on Ubuntu 14.04.
-  # compiler_flag: "-fcolor-diagnostics"
-
-  # All warnings are enabled. Maybe enable -Werror as well?
-  compiler_flag: "-Wall"
-  # Enable a few more warnings that aren't part of -Wall.
-  compiler_flag: "-Wunused-but-set-parameter"
-  # But disable some that are problematic.
-  compiler_flag: "-Wno-free-nonheap-object" # has false positives
-
-  # Keep stack frames for debugging, even in opt mode.
-  compiler_flag: "-fno-omit-frame-pointer"
-
-  # Anticipated future default.
-  linker_flag: "-no-canonical-prefixes"
-  unfiltered_cxx_flag: "-fno-canonical-system-headers"
-  # Have gcc return the exit code from ld.
-  linker_flag: "-pass-exit-codes"
-  # Stamp the binary with a unique identifier.
-  linker_flag: "-Wl,--build-id=md5"
-  linker_flag: "-Wl,--hash-style=gnu"
-  # Gold linker only? Can we enable this by default?
-  # linker_flag: "-Wl,--warn-execstack"
-  # linker_flag: "-Wl,--detect-odr-violations"
-
-  # Include directory for cuda headers.
-  cxx_builtin_include_directory: "%{cuda_include_path}"
-
-  compilation_mode_flags {
-    mode: DBG
-    # Enable debug symbols.
-    compiler_flag: "-g"
-  }
-  compilation_mode_flags {
-    mode: OPT
-
-    # No debug symbols.
-    # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or
-    # even generally? However, that can't happen here, as it requires special
-    # handling in Bazel.
-    compiler_flag: "-g0"
-
-    # Conservative choice for -O
-    # -O3 can increase binary size and even slow down the resulting binaries.
-    # Profile first and / or use FDO if you need better performance than this.
-    compiler_flag: "-O2"
-
-    # Disable assertions
-    compiler_flag: "-DNDEBUG"
-
-    # Removal of unused code and data at link time (can this increase binary size in some cases?).
-    compiler_flag: "-ffunction-sections"
-    compiler_flag: "-fdata-sections"
-    linker_flag: "-Wl,--gc-sections"
-  }
-  linking_mode_flags { mode: DYNAMIC }
-}
-
-toolchain {
-  abi_version: "local"
-  abi_libc_version: "local"
-  builtin_sysroot: ""
-  compiler: "compiler"
-  host_system_name: "local"
-  needsPic: true
-  target_libc: "macosx"
-  target_cpu: "darwin"
-  target_system_name: "local"
-  toolchain_identifier: "local_darwin"
-
-  tool_path { name: "ar" path: "/usr/bin/libtool" }
-  tool_path { name: "compat-ld" path: "/usr/bin/ld" }
-  tool_path { name: "cpp" path: "/usr/bin/cpp" }
-  tool_path { name: "dwp" path: "/usr/bin/dwp" }
-  tool_path { name: "gcc" path: "clang/bin/crosstool_wrapper_driver_is_not_gcc" }
-  cxx_flag: "-std=c++11"
-  ar_flag: "-static"
-  ar_flag: "-s"
-  ar_flag: "-o"
-  linker_flag: "-lc++"
-  linker_flag: "-undefined"
-  linker_flag: "dynamic_lookup"
-  # TODO(ulfjack): This is wrong on so many levels. Figure out a way to auto-detect the proper
-  # setting from the local compiler, and also how to make incremental builds correct.
-  cxx_builtin_include_directory: "/"
-  tool_path { name: "gcov" path: "/usr/bin/gcov" }
-  tool_path { name: "ld" path: "/usr/bin/ld" }
-  tool_path { name: "nm" path: "/usr/bin/nm" }
-  tool_path { name: "objcopy" path: "/usr/bin/objcopy" }
-  objcopy_embed_flag: "-I"
-  objcopy_embed_flag: "binary"
-  tool_path { name: "objdump" path: "/usr/bin/objdump" }
-  tool_path { name: "strip" path: "/usr/bin/strip" }
-
-  # Anticipated future default.
-  unfiltered_cxx_flag: "-no-canonical-prefixes"
-  # Make C++ compilation deterministic. Use linkstamping instead of these
-  # compiler symbols.
-  unfiltered_cxx_flag: "-Wno-builtin-macro-redefined"
-  unfiltered_cxx_flag: "-D__DATE__=\"redacted\""
-  unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\""
-  unfiltered_cxx_flag: "-D__TIME__=\"redacted\""
-
-  # Security hardening on by default.
-  # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases.
-  compiler_flag: "-D_FORTIFY_SOURCE=1"
-  compiler_flag: "-fstack-protector"
-
-  # Enable coloring even if there's no attached terminal. Bazel removes the
-  # escape sequences if --nocolor is specified.
-  compiler_flag: "-fcolor-diagnostics"
-
-  # All warnings are enabled. Maybe enable -Werror as well?
-  compiler_flag: "-Wall"
-  # Enable a few more warnings that aren't part of -Wall.
-  compiler_flag: "-Wthread-safety"
-  compiler_flag: "-Wself-assign"
-
-  # Keep stack frames for debugging, even in opt mode.
-  compiler_flag: "-fno-omit-frame-pointer"
-
-  # Anticipated future default.
-  linker_flag: "-no-canonical-prefixes"
-
-  # Include directory for cuda headers.
-  cxx_builtin_include_directory: "%{cuda_include_path}"
-
-  compilation_mode_flags {
-    mode: DBG
-    # Enable debug symbols.
-    compiler_flag: "-g"
-  }
-  compilation_mode_flags {
-    mode: OPT
-    # No debug symbols.
-    # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or even generally?
-    # However, that can't happen here, as it requires special handling in Bazel.
-    compiler_flag: "-g0"
-
-    # Conservative choice for -O
-    # -O3 can increase binary size and even slow down the resulting binaries.
-    # Profile first and / or use FDO if you need better performance than this.
-    compiler_flag: "-O2"
-
-    # Disable assertions
-    compiler_flag: "-DNDEBUG"
-
-    # Removal of unused code and data at link time (can this increase binary size in some cases?).
-    compiler_flag: "-ffunction-sections"
-    compiler_flag: "-fdata-sections"
-  }
-}
diff --git a/third_party/gpus/cuda/platform.bzl.tpl b/third_party/gpus/cuda/platform.bzl.tpl
deleted file mode 100644
index 01ef24b94e..0000000000
--- a/third_party/gpus/cuda/platform.bzl.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-CUDA_VERSION = "%{cuda_version}"
-CUDNN_VERSION = "%{cudnn_version}"
-PLATFORM = "%{platform}"
-
-def cuda_sdk_version():
-  return CUDA_VERSION
-
-def cudnn_sdk_version():
-  return CUDNN_VERSION
-
-def readlink_command():
-  if PLATFORM == "Darwin":
-    return "greadlink"
-  else:
-    return "readlink"
diff --git a/third_party/nccl/BUILD b/third_party/nccl/BUILD
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/third_party/nccl/fix_clang_compilation.patch b/third_party/nccl/fix_clang_compilation.patch
deleted file mode 100644
index e8d2a7dc9f..0000000000
--- a/third_party/nccl/fix_clang_compilation.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 8241cd7b6ed1425eeb88fd380090575978e358f4 Mon Sep 17 00:00:00 2001
-From: Ilya Biryukov <ibiryukov@google.com>
-Date: Thu, 16 Mar 2017 12:01:11 +0100
-Subject: [PATCH 1/1] Fix compilation error when compiling with 'clang -x
- cuda'.
-
-Functions vFetch and vStore are not found by ADL with clang,
-so they need to be declared before usage in ReduceCopy.
----
- src/common_kernel.h | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/common_kernel.h b/src/common_kernel.h
-index 28fbc85..cc71f8a 100644
---- a/src/common_kernel.h
-+++ b/src/common_kernel.h
-@@ -30,6 +30,32 @@
- #define BAR(type, barid, nthreads) \
-     BAR_EXPAND(type, barid, ROUNDUP(nthreads, WARP_SIZE))
- 
-+template<typename T> inline __device__
-+T vFetch(const volatile T* ptr) {
-+  return *ptr;
-+}
-+
-+#ifdef CUDA_HAS_HALF
-+template<> inline __device__
-+half vFetch<half>(const volatile half* ptr) {
-+  half r;
-+  r.x = ptr->x;
-+  return r;
-+}
-+#endif
-+
-+template<typename T> inline __device__
-+void vStore(volatile T* ptr, const T val) {
-+  *ptr = val;
-+}
-+
-+#ifdef CUDA_HAS_HALF
-+template<> inline __device__
-+void vStore<half>(volatile half* ptr, const half val) {
-+  ptr->x = val.x;
-+}
-+#endif
-+
- __device__ unsigned int spinct;
- 
- // Spin wait until func evaluates to true
-@@ -225,32 +251,6 @@ __device__ inline volatile T* AlignUp(volatile T * ptr, size_t align) {
-   return reinterpret_cast<volatile T*>(ALIGNUP(ptrval, align));
- }
- 
--template<typename T> inline __device__
--T vFetch(const volatile T* ptr) {
--  return *ptr;
--}
--
--#ifdef CUDA_HAS_HALF
--template<> inline __device__
--half vFetch<half>(const volatile half* ptr) {
--  half r;
--  r.x = ptr->x;
--  return r;
--}
--#endif
--
--template<typename T> inline __device__
--void vStore(volatile T* ptr, const T val) {
--  *ptr = val;
--}
--
--#ifdef CUDA_HAS_HALF
--template<> inline __device__
--void vStore<half>(volatile half* ptr, const half val) {
--  ptr->x = val.x;
--}
--#endif
--
- // Assumptions:
- // - there is exactly 1 block
- // - THREADS is the number of producer threads
--- 
-2.12.0.367.g23dc2f6d3c-goog
-
diff --git a/third_party/nccl/nccl.BUILD b/third_party/nccl/nccl.BUILD
deleted file mode 100644
index 06b9b8ff68..0000000000
--- a/third_party/nccl/nccl.BUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# NVIDIA nccl
-# A package of optimized primitives for collective multi-GPU communication.
-
-licenses(["notice"])  # BSD
-
-exports_files(["LICENSE.txt"])
-
-load("@local_config_cuda//cuda:build_defs.bzl", "cuda_default_copts", "if_cuda")
-
-SRCS = [
-    "src/all_gather.cu",
-    "src/all_reduce.cu",
-    "src/broadcast.cu",
-    "src/core.cu",
-    "src/libwrap.cu",
-    "src/reduce.cu",
-    "src/reduce_scatter.cu",
-]
-
-# Copy .cu to .cu.cc so they can be in srcs of cc_library.
-[
-    genrule(
-        name = "gen_" + src,
-        srcs = [src],
-        outs = [src + ".cc"],
-        cmd = "cp $(location " + src + ") $(location " + src + ".cc)",
-    )
-    for src in SRCS
-]
-
-SRCS_CU_CC = [src + ".cc" for src in SRCS]
-
-cc_library(
-    name = "nccl",
-    srcs = if_cuda(SRCS_CU_CC + glob(["src/*.h"])),
-    hdrs = if_cuda(["src/nccl.h"]),
-    copts = [
-        "-DCUDA_MAJOR=0",
-        "-DCUDA_MINOR=0",
-        "-DNCCL_MAJOR=0",
-        "-DNCCL_MINOR=0",
-        "-DNCCL_PATCH=0",
-        "-Iexternal/nccl_archive/src",
-        "-O3",
-    ] + cuda_default_copts(),
-    linkopts = select({
-        "@%ws%//tensorflow:android": [
-            "-pie",
-        ],
-        "@%ws%//tensorflow:darwin": [
-            "-Wl,-framework",
-            "-Wl,CoreFoundation",
-            "-Wl,-framework",
-            "-Wl,Security",
-        ],
-        "@%ws%//tensorflow:ios": [],
-        "@%ws%//tensorflow:windows": [
-            "ws2_32.lib",
-        ],
-        "//conditions:default": [
-            "-lrt",
-        ],
-    }),
-    visibility = ["//visibility:public"],
-    deps = ["@local_config_cuda//cuda:cuda_headers"],
-)
diff --git a/tools/bazel.rc.template b/tools/bazel.rc.template
deleted file mode 100644
index 097ff7b9d0..0000000000
--- a/tools/bazel.rc.template
+++ /dev/null
@@ -1,39 +0,0 @@
-build:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain
-build:cuda --define=using_cuda=true --define=using_cuda_nvcc=true
-
-build:cuda_clang --crosstool_top=@local_config_cuda//crosstool:toolchain
-build:cuda_clang --define=using_cuda=true --define=using_cuda_clang=true
-
-build:win-cuda --define=using_cuda=true --define=using_cuda_nvcc=true
-
-build:mkl --define=using_mkl=true
-
-build:sycl --crosstool_top=@local_config_sycl//crosstool:toolchain
-build:sycl --define=using_sycl=true
-
-build:sycl_asan --crosstool_top=@local_config_sycl//crosstool:toolchain
-build:sycl_asan --define=using_sycl=true --copt -fno-omit-frame-pointer --copt -fsanitize-coverage=3 --copt -DGPR_NO_DIRECT_SYSCALLS --linkopt -fPIC --linkopt -fsanitize=address
-
-build --force_python=py$PYTHON_MAJOR_VERSION
-build --host_force_python=py$PYTHON_MAJOR_VERSION
-build --python$PYTHON_MAJOR_VERSION_path=$PYTHON_BINARY
-build --define=use_fast_cpp_protos=true
-build --define=allow_oversize_protos=true
-
-build --define PYTHON_BIN_PATH=$PYTHON_BINARY
-test --define PYTHON_BIN_PATH=$PYTHON_BINARY
-test --force_python=py$PYTHON_MAJOR_VERSION
-test --host_force_python=py$PYTHON_MAJOR_VERSION
-run --define PYTHON_BIN_PATH=$PYTHON_BINARY
-
-build --spawn_strategy=standalone
-test --spawn_strategy=standalone
-run --spawn_strategy=standalone
-
-build --genrule_strategy=standalone
-test --genrule_strategy=standalone
-run --genrule_strategy=standalone
-
-build -c opt
-test -c opt
-run -c opt
diff --git a/util/python/python_config.sh b/util/python/python_config.sh
deleted file mode 100755
index d5762ad456..0000000000
--- a/util/python/python_config.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-set -e -o errexit
-
-if [ -d "../org_tensorflow" ]; then
-  script_path="../org_tensorflow"
-else
-  # Prefix expected paths with ./ locally and external/reponame/ for remote repos.
-  # TODO(kchodorow): remove once runfiles paths are fixed, see
-  # https://github.com/bazelbuild/bazel/issues/848.
-  script_path=$(dirname $(dirname $(dirname "$0")))
-  script_path=${script_path:-.}
-fi
-
-function main {
-  setup_python "$1"
-  exit 0
-}
-
-function python_path {
-  "$PYTHON_BIN_PATH" - <<END
-from __future__ import print_function
-import site
-import os
-
-try:
-  input = raw_input
-except NameError:
-  pass
-
-python_paths = []
-if os.getenv('PYTHONPATH') is not None:
-  python_paths = os.getenv('PYTHONPATH').split(':')
-try:
-  library_paths = site.getsitepackages()
-except AttributeError:
- from distutils.sysconfig import get_python_lib
- library_paths = [get_python_lib()]
-all_paths = set(python_paths + library_paths)
-
-paths = []
-for path in all_paths:
-  if os.path.isdir(path):
-    paths.append(path)
-
-if len(paths) == 1:
-  print(paths[0])
-else:
-  ret_paths = ",".join(paths)
-  print(ret_paths)
-END
-}
-
-function default_python_path {
-  PYTHON_ARG="$1" "$PYTHON_BIN_PATH" - <<END
-from __future__ import print_function
-import os
-
-default = os.getenv('PYTHON_ARG')
-default = str(default)
-print(default)
-END
-}
-
-function setup_python {
-  PYTHON_BIN_PATH="$1";
-
-  # TODO(ngiraldo): move most of these checks to root configure
-  if [ -z "$PYTHON_BIN_PATH" ]; then
-    echo "PYTHON_BIN_PATH was not provided.  Did you run configure?"
-    exit 1
-  fi
-  if [ ! -x "$PYTHON_BIN_PATH" ]  || [ -d "$PYTHON_BIN_PATH" ]; then
-    echo "PYTHON_BIN_PATH is not executable.  Is it the python binary?"
-    exit 1
-  fi
-
-  local python_major_version=$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; import sys; print(sys.version_info[0]);')
-  if [ "$python_major_version" == "" ]; then
-    echo -e "\n\nERROR: Problem getting python version.  Is $PYTHON_BIN_PATH the correct python binary?"
-    exit 1
-  fi
-
-  # TODO(ngiraldo): confirm if these checks are really necessary, remove if not
-  if [ -z "$PYTHON_LIB_PATH" ]; then
-    local python_lib_path
-    # Split python_path into an array of paths, this allows path containing spaces
-    IFS=','
-    python_lib_path=($(python_path))
-    unset IFS
-
-    if [ 1 = "$USE_DEFAULT_PYTHON_LIB_PATH" ]; then
-      PYTHON_LIB_PATH="$(default_python_path "${python_lib_path[0]}")"
-      echo "Using python library path: $PYTHON_LIB_PATH"
-
-    else
-      echo "Found possible Python library paths:"
-      for x in "${python_lib_path[@]}"; do
-        echo "  $x"
-      done
-      set -- "${python_lib_path[@]}"
-      echo "Please input the desired Python library path to use.  Default is ["$1"]"
-      read b || true
-      if [ "$b" == "" ]; then
-        PYTHON_LIB_PATH="$(default_python_path "${python_lib_path[0]}")"
-        echo "Using python library path: $PYTHON_LIB_PATH"
-      else
-        PYTHON_LIB_PATH="$b"
-      fi
-    fi
-  fi
-
-  if test -d "$PYTHON_LIB_PATH" -a -x "$PYTHON_LIB_PATH"; then
-    python_lib="$PYTHON_LIB_PATH"
-  else
-    echo -e "\n\nERROR: Invalid python library path: ${PYTHON_LIB_PATH}."
-    exit 1
-  fi
-
-  # Convert python path to Windows style before writing into bazel.rc
-  if is_windows; then
-    PYTHON_BIN_PATH="$(cygpath -m "$PYTHON_BIN_PATH")"
-  fi
-
-  # TODO(ngiraldo): move all below to root configure
-  # Write tools/bazel.rc
-  echo "# Autogenerated by configure: DO NOT EDIT" > tools/bazel.rc
-  sed -e "s/\$PYTHON_MAJOR_VERSION/$python_major_version/g" \
-      -e "s|\$PYTHON_BINARY|\"$PYTHON_BIN_PATH\"|g" \
-      tools/bazel.rc.template >> tools/bazel.rc
-  # Write tools/python_bin_path.sh
-  echo "export PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\"" > tools/python_bin_path.sh
-}
-
-PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
-function is_windows() {
-  # On windows, the shell script is actually running in msys
-  if [[ "${PLATFORM}" =~ msys_nt* ]]; then
-    true
-  else
-    false
-  fi
-}
-
-main "$@"
-- 
GitLab


From fdb4eba5b1cd0f2a2b10f83042a7e0eec1a41548 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 15:59:43 -0800
Subject: [PATCH 1063/1563] - fixing comments to reflect reality Change:
 155256914

---
 tensorflow/core/common_runtime/gpu/gpu_device.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc
index 02f70d835d..e2ad18f33b 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_device.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc
@@ -567,15 +567,14 @@ int64 MinSystemMemory(int64 available_memory) {
   // We use the following heuristic for now:
   //
   // If the available_memory is < 2GiB, we allocate 200MiB to system memory.
-  // Otherwise, allocate 300MiB to system memory.
+  // Otherwise, allocate max(300MiB, 0.05 * available_memory) to system memory.
   //
-  // In the future we could be more sophisticated by using a table of
-  // devices.
+  // In the future we could be more sophisticated by using a table of devices.
   if (available_memory < (1LL << 31)) {
     // 200MiB
     return 209715200LL;
   } else {
-    // max(300 MiB, 0.95 * available_memory)
+    // max(300 MiB, 0.05 * available_memory)
     return std::max(314572800LL, static_cast<int64>(available_memory * 0.05));
   }
 }
-- 
GitLab


From 7467f370927207dfa12f18c2f42920ccf3920fe0 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Fri, 5 May 2017 17:29:38 -0700
Subject: [PATCH 1064/1563] merge fix

---
 .../python/kernel_tests/image_ops_test.py     | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
index d6fabf6e9a..5e78b590df 100644
--- a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
+++ b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
@@ -27,7 +27,6 @@ from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradient_checker
 from tensorflow.python.ops import math_ops
-from tensorflow.python.ops import gradient_checker
 from tensorflow.python.platform import googletest
 
 _DTYPES = set(
@@ -186,29 +185,5 @@ class ImageOpsTest(test_util.TensorFlowTestCase):
     self._test_grad([3, 4, 12, 12])
 
 
-  def _test_grad(self, shape_to_test):
-    with self.test_session():
-      test_image_shape = shape_to_test
-      test_image = np.random.randn(*test_image_shape)
-      test_image_tensor = constant_op.constant(test_image, 
-                                               shape=test_image_shape)
-      test_transform = image_ops.angles_to_projective_transforms(np.pi / 2, 
-                                                                 4, 
-                                                                 4)
-      test_transform_shape = test_transform.shape
-
-      output_shape = test_image_shape
-      output = image_ops.transform(test_image_tensor, test_transform)
-      left_err = gradient_checker.compute_gradient_error(
-          test_image_tensor, test_image_shape, output, output_shape,
-          x_init_value=test_image)
-      self.assertLess(left_err, 1e-10)
-
-  def test_grad(self):
-    self._test_grad([16, 16])
-    self._test_grad([4, 12, 12])
-    self._test_grad([3, 4, 12, 12])
-
-
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From 1e59f00c4803ef242500454b6e704a142db33222 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 16:14:24 -0800
Subject: [PATCH 1065/1563] Extend tfprof to associate op stats with Python
 codes. It's backward compatible. Stats of a source code line are aggregated
 from all ops created by that line.

A example.
_TFProfRoot (0us/22.44ms)
  model_analyzer_test.py:149:run_filename_as_m...:none (0us/22.44ms)
    model_analyzer_test.py:33:_run_code_in_main:none (0us/22.44ms)
      model_analyzer_test.py:208:<module>:test.main() (0us/22.44ms)
        model_analyzer_test.py:132:testComplexCodeView:x = lib.BuildFull... (0us/22.44ms)
          model_analyzer_testlib.py:63:BuildFullModel:return sgd_op.min... (0us/21.83ms)
          model_analyzer_testlib.py:54:BuildFullModel:seq.append(array_... (0us/254us)
            model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0us/134us)
            ...
          model_analyzer_testlib.py:61:BuildFullModel:loss = nn_ops.l2_... (0us/28us)
        model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
Change: 155258346
---
 tensorflow/contrib/tfprof/README.md           |  10 +-
 .../contrib/tfprof/python/tools/tfprof/BUILD  |  21 +-
 .../python/tools/tfprof/model_analyzer.py     |  41 ++-
 .../tools/tfprof/model_analyzer_test.py       | 150 ++++++++--
 .../tools/tfprof/model_analyzer_testlib.py    |  67 +++++
 .../tools/tfprof/print_model_analysis_test.py |   9 +-
 .../python/tools/tfprof/tfprof_logger.py      |  45 ++-
 tensorflow/tools/tfprof/README.md             |  80 ++++-
 tensorflow/tools/tfprof/internal/BUILD        |  42 +++
 .../tfprof/internal/print_model_analysis.cc   |  21 +-
 .../tools/tfprof/internal/tfprof_code.cc      | 216 ++++++++++++++
 .../tools/tfprof/internal/tfprof_code.h       |  89 ++++++
 .../tools/tfprof/internal/tfprof_graph.cc     |   8 +-
 .../tools/tfprof/internal/tfprof_graph.h      |   8 +-
 .../tools/tfprof/internal/tfprof_node.cc      |   5 +-
 .../tools/tfprof/internal/tfprof_node.h       |  96 +++++-
 .../tools/tfprof/internal/tfprof_options.h    |   2 +-
 .../tools/tfprof/internal/tfprof_scope.cc     |   8 +-
 .../tools/tfprof/internal/tfprof_scope.h      |   6 +-
 .../tools/tfprof/internal/tfprof_show.cc      |  13 +-
 .../tools/tfprof/internal/tfprof_show.h       |  16 +-
 .../tools/tfprof/internal/tfprof_show_code.cc | 275 ++++++++++++++++++
 .../tools/tfprof/internal/tfprof_show_code.h  | 124 ++++++++
 .../tools/tfprof/internal/tfprof_stats.cc     |  31 +-
 .../tools/tfprof/internal/tfprof_stats.h      |  13 +-
 .../tfprof/internal/tfprof_stats_test.cc      |  24 +-
 .../tfprof/internal/tfprof_tensor_test.cc     |   4 +-
 tensorflow/tools/tfprof/tfprof_log.proto      |  13 +
 tensorflow/tools/tfprof/tfprof_main.cc        |  16 +-
 tensorflow/tools/tfprof/tfprof_options.proto  |   2 +-
 tensorflow/tools/tfprof/tfprof_output.proto   |  34 ++-
 31 files changed, 1329 insertions(+), 160 deletions(-)
 create mode 100644 tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_code.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_code.h
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_show_code.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_show_code.h

diff --git a/tensorflow/contrib/tfprof/README.md b/tensorflow/contrib/tfprof/README.md
index c7ff4a2921..d891ecdc9a 100644
--- a/tensorflow/contrib/tfprof/README.md
+++ b/tensorflow/contrib/tfprof/README.md
@@ -11,7 +11,12 @@ Consultants: Jon Shlens, Pete Warden
 1.  Measure model parameters, float operations, tensor shapes.
 2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  Explore model based on name scope or graph structure.
+4.  3 ways to view and explore TensorFlow model profiles
+
+    *  Organize by Python code call stack.
+    *  Organize by TensorFlow operation name scope hierarchies.
+    *  Organize by TensorFlow operation inputs/outputs graph.
+
 5.  Selectively grouping/filtering/accounting/ordering ops.
 
 tfprof can be used as Python API, Interactive CLI and One-shot Script.
@@ -28,7 +33,8 @@ param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tfprof_options=tf.contrib.tfprof.model_analyzer.
         TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
 
-# param_stats is tensorflow.tfprof.TFProfNode proto. It organize the statistics
+# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
+# It organize the statistics
 # of each graph node in tree scructure. Let's print the root below.
 sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
 ```
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
index 818c2d2cbf..22bca93c87 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
@@ -23,14 +23,31 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":model_analyzer",
-        "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:array_ops",
+        ":model_analyzer_testlib",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:variables",
+    ],
+)
+
+py_library(
+    name = "model_analyzer_testlib",
+    srcs = ["model_analyzer_testlib.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":model_analyzer",
+        "//tensorflow/contrib/rnn:rnn_py",
+        "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:init_ops",
+        "//tensorflow/python:math_ops",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:rnn",
+        "//tensorflow/python:training",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
     ],
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
index cc94fd65b5..13b407d815 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
@@ -123,7 +123,7 @@ def print_model_analysis(graph,
   """Print model statistics.
 
     Prints the model statistics to stdout. Also returns the results
-    in a TFProfNode proto. See go/tfprof or run tfprof tool:
+    in a TFGraphNodeProto proto. See go/tfprof or run tfprof tool:
     'bazel run third_party/tensorflow/tools/tfprof help'
 
     Examples:
@@ -142,15 +142,19 @@ def print_model_analysis(graph,
               'micros' and 'bytes'.
     op_log: tensorflow::tfprof::OpLog proto. users can use this proto to
             group together ops and use a op_type to select the group.
-    tfprof_cmd: string. Either 'scope' or 'graph'. 'scope' view organize
-                ops using their name scopes. 'graph' view organize ops using
-                their graph inputs.
+    tfprof_cmd: string. Either 'scope', 'graph', 'code'.
+                'scope' view organize outputs using ops' name scope.
+                'graph' view organize outputs using op's inputs/outputs.
+                'code' view organize outputs using Python call stack.
     tfprof_options: See 'tfprof help' for details.
   Returns:
-    TFProfNode proto. Side effect: a formatted output to stdout.
+    If tfprof_cmd is 'scope' or 'graph', returns TFGraphNodeProto proto.
+    If tfprof_cmd is 'code', returns TFCodeNodeProto proto.
+    Side effect: a formatted output to stdout.
   """
   # pylint: disable=protected-access
-  op_log = tfprof_logger._merge_default_with_oplog(graph, op_log, run_meta)
+  op_log = tfprof_logger._merge_default_with_oplog(
+      graph, op_log, run_meta, add_trace=tfprof_cmd == 'code')
   # pylint: enable=protected-access
   opts = tfprof_options_pb2.OptionsProto()
   opts.max_depth = tfprof_options['max_depth']
@@ -178,11 +182,24 @@ def print_model_analysis(graph,
   opts.dump_to_file = tfprof_options['dump_to_file']
 
   run_meta_str = run_meta.SerializeToString() if run_meta else b''
-  op_log_str = op_log.SerializeToString() if op_log else b''
 
-  tfprof_node = tfprof_output_pb2.TFProfNode()
-  tfprof_node.ParseFromString(
-      print_mdl.PrintModelAnalysis(
-          graph.as_graph_def().SerializeToString(), run_meta_str, op_log_str,
-          tfprof_cmd.encode('utf-8'), opts.SerializeToString()))
+  if tfprof_cmd == 'code':
+    tfprof_node = tfprof_output_pb2.TFCodeNodeProto()
+    tfprof_node.ParseFromString(
+        print_mdl.PrintModelAnalysis(
+            graph.as_graph_def().SerializeToString(),
+            run_meta_str,
+            op_log.SerializeToString(),
+            tfprof_cmd.encode('utf-8'),
+            opts.SerializeToString()))
+  else:
+    tfprof_node = tfprof_output_pb2.TFGraphNodeProto()
+    tfprof_node.ParseFromString(
+        print_mdl.PrintModelAnalysis(
+            graph.as_graph_def().SerializeToString(),
+            run_meta_str,
+            op_log.SerializeToString(),
+            tfprof_cmd.encode('utf-8'),
+            opts.SerializeToString()))
+
   return tfprof_node
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
index 66b9267cbe..ac0d46d4ae 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
@@ -18,49 +18,27 @@ from __future__ import division
 from __future__ import print_function
 
 import os
-
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
-from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
-from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import init_ops
-from tensorflow.python.ops import nn_ops
-from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 
 # XXX: this depends on pywrap_tensorflow and must come later
 from tensorflow.contrib.tfprof.python.tools.tfprof import model_analyzer
+from tensorflow.contrib.tfprof.python.tools.tfprof import model_analyzer_testlib as lib
 
 
 class PrintModelAnalysisTest(test.TestCase):
 
-  def _BuildSmallModel(self):
-    image = array_ops.zeros([2, 6, 6, 3])
-    _ = variable_scope.get_variable(
-        'ScalarW', [],
-        dtypes.float32,
-        initializer=init_ops.random_normal_initializer(stddev=0.001))
-    kernel = variable_scope.get_variable(
-        'DW', [3, 3, 3, 6],
-        dtypes.float32,
-        initializer=init_ops.random_normal_initializer(stddev=0.001))
-    x = nn_ops.conv2d(image, kernel, [1, 2, 2, 1], padding='SAME')
-    kernel = variable_scope.get_variable(
-        'DW2', [2, 2, 6, 12],
-        dtypes.float32,
-        initializer=init_ops.random_normal_initializer(stddev=0.001))
-    x = nn_ops.conv2d(x, kernel, [1, 2, 2, 1], padding='SAME')
-    return x
-
   def testDumpToFile(self):
+    ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
     opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
 
     with session.Session() as sess, ops.device('/cpu:0'):
-      _ = self._BuildSmallModel()
+      _ = lib.BuildSmallModel()
       model_analyzer.print_model_analysis(sess.graph, tfprof_options=opts)
 
       with gfile.Open(opts['dump_to_file'], 'r') as f:
@@ -71,6 +49,7 @@ class PrintModelAnalysisTest(test.TestCase):
                          f.read())
 
   def testSelectEverything(self):
+    ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
     opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
     opts['account_type_regexes'] = ['.*']
@@ -78,8 +57,10 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device', 'op_types'
     ]
 
-    with session.Session() as sess, ops.device('/cpu:0'):
-      x = self._BuildSmallModel()
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
       run_meta = config_pb2.RunMetadata()
@@ -98,6 +79,121 @@ class PrintModelAnalysisTest(test.TestCase):
             f.read())
         # pylint: enable=line-too-long
 
+  def testSimpleCodeView(self):
+    ops.reset_default_graph()
+    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    opts['account_type_regexes'] = ['.*']
+    opts['show_name_regexes'] = ['.*model_analyzer_testlib.*']
+    opts['account_displayed_op_only'] = False
+    # TODO(xpan): Test 'micros'. Since the execution time changes each run,
+    # it's a bit difficult to test it now.
+    opts['select'] = [
+        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
+    ]
+
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildSmallModel()
+
+      sess.run(variables.global_variables_initializer())
+      run_meta = config_pb2.RunMetadata()
+      _ = sess.run(x,
+                   options=config_pb2.RunOptions(
+                       trace_level=config_pb2.RunOptions.FULL_TRACE),
+                   run_metadata=run_meta)
+
+      model_analyzer.print_model_analysis(
+          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
+
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
+        # pylint: disable=line-too-long
+        self.assertEqual(
+            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB)\n  model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n  model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/1 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/162 params, 0/0 flops, 0B/1.30KB)\n  model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/5.83k flops, 0B/432B)\n  model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/288 params, 0/0 flops, 0B/2.30KB)\n  model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/4.61k flops, 0B/384B)\n',
+            f.read())
+        # pylint: enable=line-too-long
+
+  def testComplexCodeView(self):
+    ops.reset_default_graph()
+    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    opts['account_type_regexes'] = ['.*']
+    opts['show_name_regexes'] = ['.*model_analyzer_testlib.py.*']
+    opts['account_displayed_op_only'] = False
+    opts['select'] = [
+        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
+    ]
+
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildFullModel()
+
+      sess.run(variables.global_variables_initializer())
+      run_meta = config_pb2.RunMetadata()
+      _ = sess.run(x,
+                   options=config_pb2.RunOptions(
+                       trace_level=config_pb2.RunOptions.FULL_TRACE),
+                   run_metadata=run_meta)
+
+      tfprof_node = model_analyzer.print_model_analysis(
+          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
+
+      # pylint: disable=line-too-long
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
+        self.assertEqual(
+            '_TFProfRoot (0/2.84k params, 0/54.08k flops, 0B/241.58KB)\n  model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_... (0/1.80k params, 0/41.76k flops, 0B/20.08KB)\n    model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n    model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/4 params, 0/0 flops, 0B/0B)\n    model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/648 params, 0/0 flops, 0B/5.18KB)\n    model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/23.33k flops, 0B/1.73KB)\n    model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/1.15k params, 0/0 flops, 0B/9.22KB)\n    model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/18.43k flops, 0B/1.54KB)\n  model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c... (0/1.04k params, 0/4.13k flops, 0B/24.86KB)\n  model_analyzer_testlib.py:62:BuildFullModel:target = array_op... (0/0 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_... (0/0 params, 0/0 flops, 0B/528B)\n  model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min... (0/0 params, 0/8.19k flops, 0B/196.12KB)\n',
+            f.read())
+
+      self.assertEqual(241584, tfprof_node.total_requested_bytes)
+      self.assertLess(0, tfprof_node.total_exec_micros)
+      self.assertEqual(2844, tfprof_node.total_parameters)
+      self.assertEqual(54080, tfprof_node.total_float_ops)
+      self.assertEqual(5, len(tfprof_node.children))
+      self.assertEqual('_TFProfRoot', tfprof_node.name)
+      self.assertEqual('model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_...',
+                       tfprof_node.children[0].name)
+      self.assertEqual('model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c...',
+                       tfprof_node.children[1].name)
+      self.assertEqual('model_analyzer_testlib.py:62:BuildFullModel:target = array_op...',
+                       tfprof_node.children[2].name)
+      self.assertEqual('model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_...',
+                       tfprof_node.children[3].name)
+      self.assertEqual('model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min...',
+                       tfprof_node.children[4].name)
+      # pylint: enable=line-too-long
+
+  def testCodeViewLeafGraphNode(self):
+    ops.reset_default_graph()
+    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
+    opts['account_type_regexes'] = ['.*']
+    opts['account_displayed_op_only'] = False
+    opts['select'] = [
+        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
+    ]
+
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildSmallModel()
+
+      sess.run(variables.global_variables_initializer())
+      run_meta = config_pb2.RunMetadata()
+      _ = sess.run(x,
+                   options=config_pb2.RunOptions(
+                       trace_level=config_pb2.RunOptions.FULL_TRACE),
+                   run_metadata=run_meta)
+
+      tfprof_node = model_analyzer.print_model_analysis(
+          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
+
+      leaf = tfprof_node
+      while leaf.children:
+        self.assertEqual(0, len(leaf.graph_nodes))
+        leaf = leaf.children[0]
+      self.assertEqual(1, len(leaf.graph_nodes))
+
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
new file mode 100644
index 0000000000..81bac84b8c
--- /dev/null
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
@@ -0,0 +1,67 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""A test lib that defines some models."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.rnn.python.ops.core_rnn_cell import BasicRNNCell
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import rnn
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.training import gradient_descent
+
+
+def BuildSmallModel():
+  """Build a small forward conv model."""
+  image = array_ops.zeros([2, 6, 6, 3])
+  _ = variable_scope.get_variable(
+      'ScalarW', [],
+      dtypes.float32,
+      initializer=init_ops.random_normal_initializer(stddev=0.001))
+  kernel = variable_scope.get_variable(
+      'DW', [3, 3, 3, 6],
+      dtypes.float32,
+      initializer=init_ops.random_normal_initializer(stddev=0.001))
+  x = nn_ops.conv2d(image, kernel, [1, 2, 2, 1], padding='SAME')
+  kernel = variable_scope.get_variable(
+      'DW2', [2, 2, 6, 12],
+      dtypes.float32,
+      initializer=init_ops.random_normal_initializer(stddev=0.001))
+  x = nn_ops.conv2d(x, kernel, [1, 2, 2, 1], padding='SAME')
+  return x
+
+
+def BuildFullModel():
+  """Build the full model with conv,rnn,opt."""
+  seq = []
+  for i in xrange(4):
+    with variable_scope.variable_scope('inp_%d' % i):
+      seq.append(array_ops.reshape(BuildSmallModel(), [2, 1, -1]))
+
+  cell = BasicRNNCell(16, 48)
+  out = rnn.dynamic_rnn(
+      cell, array_ops.concat(seq, axis=1), dtype=dtypes.float32)[0]
+
+  target = array_ops.ones_like(out)
+  loss = nn_ops.l2_loss(math_ops.reduce_mean(target - out))
+  sgd_op = gradient_descent.GradientDescentOptimizer(1e-2)
+  return sgd_op.minimize(loss)
+
+
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
index f0ac36c66a..aa133d3142 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
@@ -96,12 +96,13 @@ class PrintModelAnalysisTest(test.TestCase):
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = self._BuildSmallModel()
-      tfprof_pb = tfprof_output_pb2.TFProfNode()
+      tfprof_pb = tfprof_output_pb2.TFGraphNodeProto()
       tfprof_pb.ParseFromString(
-          print_mdl.PrintModelAnalysis(sess.graph.as_graph_def(
-          ).SerializeToString(), b'', b'', b'scope', opts.SerializeToString()))
+          print_mdl.PrintModelAnalysis(
+              sess.graph.as_graph_def().SerializeToString(),
+              b'', b'', b'scope', opts.SerializeToString()))
 
-      expected_pb = tfprof_output_pb2.TFProfNode()
+      expected_pb = tfprof_output_pb2.TFGraphNodeProto()
       text_format.Merge(r"""name: "_TFProfRoot"
       exec_micros: 0
       requested_bytes: 0
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
index e8cf84b6c7..cd3912bbfb 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
@@ -62,12 +62,13 @@ def _fill_missing_graph_shape(graph, run_meta):
   return graph
 
 
-def _get_logged_ops(graph, run_meta=None):
+def _get_logged_ops(graph, run_meta=None, add_trace=False):
   """Extract trainable model parameters and FLOPs for ops from a Graph.
 
   Args:
     graph: tf.Graph.
     run_meta: RunMetadata proto used to complete shape information.
+    add_trace: Whether to add op trace information.
   Returns:
     logged_ops: dict mapping from op_name to OpLogEntry.
   """
@@ -76,21 +77,32 @@ def _get_logged_ops(graph, run_meta=None):
 
   op_missing_shape = 0
   logged_ops = {}
-  graph_def = graph.as_graph_def()
-  for node in graph_def.node:
+  for op in graph.get_operations():
     try:
-      stats = ops.get_stats_for_node_def(graph, node, REGISTERED_FLOP_STATS)
+      stats = ops.get_stats_for_node_def(
+          graph, op.node_def, REGISTERED_FLOP_STATS)
     except ValueError:
       # Catch Exception When shape is incomplete. Skip it.
       op_missing_shape += 1
       stats = None
 
-    if not stats or not stats.value:
-      continue
-    if node.name not in logged_ops:
-      entry = tfprof_log_pb2.OpLogEntry()
-      entry.name = node.name
+    entry = tfprof_log_pb2.OpLogEntry()
+    entry.name = op.name
+    add_entry = False
+    if stats and stats.value:
       entry.float_ops = int(stats.value)
+      add_entry = True
+
+    if add_trace:
+      for tb in op.traceback:
+        trace = entry.code_def.traces.add()
+        trace.file = tb[0] if tb[0] else 'none'
+        trace.lineno = tb[1] if tb[1] else -1
+        trace.function = tb[2] if tb[2] else 'none'
+        trace.line = tb[3] if tb[3] else 'none'
+      add_entry = True
+
+    if add_entry:
       logged_ops[entry.name] = entry
 
   for v in graph.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES):
@@ -108,18 +120,21 @@ def _get_logged_ops(graph, run_meta=None):
   return logged_ops
 
 
-def _merge_default_with_oplog(graph, op_log=None, run_meta=None):
+def _merge_default_with_oplog(graph, op_log=None,
+                              run_meta=None,
+                              add_trace=False):
   """Merge the tfprof default extra info with caller's op_log.
 
   Args:
     graph: tf.Graph.
     op_log: OpLog proto.
     run_meta: RunMetadata proto used to complete shape information.
+    add_trace: Whether to add op trace information.
   Returns:
     tmp_op_log: Merged OpLog proto.
   """
   tmp_op_log = tfprof_log_pb2.OpLog()
-  logged_ops = _get_logged_ops(graph, run_meta)
+  logged_ops = _get_logged_ops(graph, run_meta, add_trace=add_trace)
   if not op_log:
     tmp_op_log.log_entries.extend(logged_ops.values())
   else:
@@ -131,13 +146,16 @@ def _merge_default_with_oplog(graph, op_log=None, run_meta=None):
         all_ops[op_name].types.extend(entry.types)
         if entry.float_ops > 0 and all_ops[op_name].float_ops == 0:
           all_ops[op_name].float_ops = entry.float_ops
+        if entry.code_def.traces and not all_ops[op_name].code_def.traces:
+          all_ops[op_name].code_def.MergeFrom(entry.code_def)
       else:
         all_ops[op_name] = entry
     tmp_op_log.log_entries.extend(all_ops.values())
   return tmp_op_log
 
 
-def write_op_log(graph, log_dir, op_log=None, run_meta=None):
+def write_op_log(graph, log_dir, op_log=None, run_meta=None,
+                 add_trace=False):
   """Log provided 'op_log', and add additional model information below.
 
     The API also assigns ops in tf.trainable_variables() an op type called
@@ -154,8 +172,9 @@ def write_op_log(graph, log_dir, op_log=None, run_meta=None):
         one is created.
     run_meta: (Optional) RunMetadata proto that helps flops computation using
         run time shape information.
+    add_trace: Whether to add op trace information. Used to support "code" view.
   """
-  op_log = _merge_default_with_oplog(graph, op_log, run_meta)
+  op_log = _merge_default_with_oplog(graph, op_log, run_meta, add_trace)
 
   with gfile.Open(os.path.join(log_dir, 'tfprof_log'), 'w') as log:
     log.write(op_log.SerializeToString())
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index 540e179aae..52d376d5f5 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -10,12 +10,17 @@ Consultants: Jon Shlens, Pete Warden
 1.  Measure model parameters, float operations, tensor shapes.
 2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  Explore model based on name scope or graph structure.
+4.  3 ways to view and explore TensorFlow model profiles
+
+    *  Organize by Python code call stack.
+    *  Organize by TensorFlow operation name scope hierarchies.
+    *  Organize by TensorFlow operation inputs/outputs graph.
+
 5.  Selectively grouping/filtering/accounting/ordering ops.
 
 [Python API Tutorials](#python-api-tutorials): It can be called directly from
 Python codes. Results are either printed
-to stdout or dumped to file. tensorflow.tfprof.TFProfNode proto is returned from
+to stdout or dumped to file. tensorflow.tfprof.TFGraphNodeProto proto is returned from
 the API to allow users to perform further analysis.
 
 [CLI Tutorials](#cli-tutorials):
@@ -33,13 +38,23 @@ tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
 ### Examine the shapes and sizes of all trainable Variables.
 ```python
 # Print trainable variable parameter statistics to stdout.
+# By default, statistics are associated with each graph node.
 param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tf.get_default_graph(),
     tfprof_options=tf.contrib.tfprof.model_analyzer.
         TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
 
-# param_stats is tensorflow.tfprof.TFProfNode proto. It organize the statistics
-# of each graph node in tree scructure. Let's print the root below.
+
+# Set tfprof_cmd='code' to associate statistics with Python codes.
+opts = tf.contrib.tfprof.model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
+opts['show_name_regexes'] = ['.*my_code1.py.*', '.*my_code2.py.*']
+param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
+    tf.get_default_graph(),
+    tfprof_cmd='code'
+    tfprof_options=opts)
+
+# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
+# Let's print the root below.
 sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
 ```
 
@@ -84,8 +99,20 @@ Finally, you may run `print_model_analysis` to explore the timing and memory
 demands of the model.
 
 ``` python
+# See model_analyzer_test.py for more examples.
+#
+# Print to stdout an analysis of the memory usage and the timing information
+# broken down by python codes.
+opts = tf.contrib.tfprof.model_analyzer.PRINT_ALL_TIMING_MEMORY.copy()
+opts['show_name_regexes'] = ['.*my_code.py.*']
+tf.contrib.tfprof.model_analyzer.print_model_analysis(
+    tf.get_default_graph(),
+    run_meta=run_metadata,
+    tfprof_cmd='code',
+    tfprof_options=opts)
+
 # Print to stdout an analysis of the memory usage and the timing information
-# from running the graph broken down by operations.
+# broken down by operations.
 tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tf.get_default_graph(),
     run_meta=run_metadata,
@@ -138,9 +165,9 @@ bazel-bin/tensorflow/tools/tfprof/tfprof \
     --run_meta_path=run_meta \
     --checkpoint_path=model.ckpt
 #
-# tfprof_log is used to define customized op types and float ops.
+# tfprof_log is used to define customized op types, float ops and code traces.
 # Use tfprof_logger.write_op_log() to create tfprof_log.
-# See 11) in Examples section on generating tfprof_log file.
+# See 12) in Examples section on generating tfprof_log file.
 bazel-bin/tensorflow/tools/tfprof/tfprof \
     --graph_path=graph.pbtxt \
     --run_meta_path=run_meta \
@@ -174,7 +201,28 @@ tfprof>
 -dump_to_file
 ```
 
-3) I want to see the `BatchNorm`'s gamma value in checkpoint.
+3) I want to see which line of my python codes costs most time!
+
+```shell
+# Requires --graph_path --op_log_path
+tfprof> code -max_depth 1000 -show_name_regexes .*model_analyzer.*py.* -select micros -account_type_regexes .* -order_by micros
+_TFProfRoot (0us/22.44ms)
+  model_analyzer_test.py:149:run_filename_as_m...:none (0us/22.44ms)
+    model_analyzer_test.py:33:_run_code_in_main:none (0us/22.44ms)
+      model_analyzer_test.py:208:<module>:test.main() (0us/22.44ms)
+        model_analyzer_test.py:132:testComplexCodeView:x = lib.BuildFull... (0us/22.44ms)
+          model_analyzer_testlib.py:63:BuildFullModel:return sgd_op.min... (0us/21.83ms)
+          model_analyzer_testlib.py:58:BuildFullModel:cell, array_ops.c... (0us/333us)
+          model_analyzer_testlib.py:54:BuildFullModel:seq.append(array_... (0us/254us)
+            model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0us/134us)
+            model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0us/40us)
+            ...
+          model_analyzer_testlib.py:61:BuildFullModel:loss = nn_ops.l2_... (0us/28us)
+          model_analyzer_testlib.py:60:BuildFullModel:target = array_op... (0us/0us)
+        model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
+```
+
+4) I want to see the `BatchNorm`'s gamma value in checkpoint.
 
 ```shell
 # Requires --graph_path, --checkpoint_path.
@@ -186,7 +234,7 @@ _TFProfRoot ()
 [1.57 1.83 1.30 1.25 1.59 1.14 1.26 0.82 1.19 1.10 1.48 1.01 0.82 1.23 1.21 1.14 ],
 ```
 
-4) I want to see my checkpoint tensors shape and number of parameters.
+5) I want to see my checkpoint tensors shape and number of parameters.
 
 ```shell
 # Requires --graph_path, --checkpoint_path.
@@ -205,7 +253,7 @@ _TFProfRoot (--/930.58k params)
   unit_last/final_bn/moving_variance (64, 64/64 params)
 ```
 
-5) I defined an op named ‘cost’ to calculate the loss. I want to know what ops
+6) I defined an op named ‘cost’ to calculate the loss. I want to know what ops
 it depends on take a long time to run. Hint: Use the ‘graph’ command to explore
 graph dependencies.
 
@@ -221,7 +269,7 @@ _TFProfRoot (0us/3.61sec)
   unit_3_3/sub2/conv2/Conv2D (10.26ms/3.60sec)
 ```
 
-6) I want to know the expensive operations during the back propagation.
+7) I want to know the expensive operations during the back propagation.
 Hint: tensorflow prepend ‘gradient’ to your defined name scopes. Use the ‘scope’
 command to explore based on name scope hierarchies.
 
@@ -238,7 +286,7 @@ _TFProfRoot (0us/2.29sec)
   ...
 ```
 
-7) Show the number of float operations in the model.
+8) Show the number of float operations in the model.
 Note: float operations calculation depends on
 1) op.RegisterStatistics. If an op doesn’t
 have RegisterStatistics defined, its float operations cannot be counted.
@@ -263,7 +311,7 @@ _TFProfRoot (0/17.63b flops)
   ...
 ```
 
-8) Show the number of parameters of all `tf.trainable_variables()` in the model.
+9) Show the number of parameters of all `tf.trainable_variables()` in the model.
 
 ```shell
 # Requires --graph_path --op_log_path.
@@ -283,7 +331,7 @@ generated by write_op_log() Python API. write_op_log() help users create some
 common op types implicitly. Users can define their own op types and log it
 through the write_op_log() API.
 
-9) What if I’m lazy and don’t want to define op type? I have given my ops
+109) What if I’m lazy and don’t want to define op type? I have given my ops
 well-defined names in my model’s code. And want to use names to select a group
 of ops. Let’s try it!
 
@@ -301,7 +349,7 @@ in terminal. Otherwise, tfprof accounts all ops matched by
 `-account_type_regexes` recursively even if they are hidden due to some
 options such as -max_depth.
 
-10) TensorFlow has built-in op types. For example, built-in op type `Variable`
+11) TensorFlow has built-in op types. For example, built-in op type `Variable`
 seems to include `Variable's` created by your model. However, be careful when
 depending on it because TensorFlow creates extra `Variable` ops implicitly and
 the implicitly created ops can have the same prefix as the `Variable's` you
@@ -327,7 +375,7 @@ _TFProfRoot (--/930.58k params)
 ```
 
 
-11) A example of defining extra op type for ops using `OpLog`
+12) A example of defining extra op type for ops using `OpLog`
 
 First, in Python code, create an `OpLog` proto and add op type
 information to it:
diff --git a/tensorflow/tools/tfprof/internal/BUILD b/tensorflow/tools/tfprof/internal/BUILD
index c5482a9776..adace89985 100644
--- a/tensorflow/tools/tfprof/internal/BUILD
+++ b/tensorflow/tools/tfprof/internal/BUILD
@@ -15,6 +15,7 @@ cc_library(
     srcs = ["tfprof_stats.cc"],
     hdrs = ["tfprof_stats.h"],
     deps = [
+        ":tfprof_code",
         ":tfprof_graph",
         ":tfprof_node",
         ":tfprof_options",
@@ -61,6 +62,27 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_code",
+    srcs = ["tfprof_code.cc"],
+    hdrs = ["tfprof_code.h"],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_node",
+        ":tfprof_options",
+        ":tfprof_show_code",
+        ":tfprof_tensor",
+        ":tfprof_utils",
+        "//tensorflow/c:c_api",
+        "//tensorflow/c:checkpoint_reader",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:regexp_internal",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "tfprof_graph",
     srcs = ["tfprof_graph.cc"],
@@ -98,6 +120,26 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_show_code",
+    srcs = ["tfprof_show_code.cc"],
+    hdrs = ["tfprof_show_code.h"],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_node",
+        ":tfprof_options",
+        ":tfprof_scope",
+        ":tfprof_show",
+        ":tfprof_tensor",
+        ":tfprof_utils",
+        "//tensorflow/c:checkpoint_reader",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:regexp_internal",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 tf_cc_test(
     name = "tfprof_show_test",
     srcs = ["tfprof_show_test.cc"],
diff --git a/tensorflow/tools/tfprof/internal/print_model_analysis.cc b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
index dfe4019fbb..c816e3209e 100644
--- a/tensorflow/tools/tfprof/internal/print_model_analysis.cc
+++ b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
@@ -40,13 +40,13 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
   graph_ptr->ParseFromString(*graph);
 
   std::unique_ptr<RunMetadata> run_meta_ptr;
-  if (run_meta) {
+  if (run_meta && !run_meta->empty()) {
     run_meta_ptr.reset(new RunMetadata());
     run_meta_ptr->ParseFromString(*run_meta);
   }
 
   std::unique_ptr<OpLog> op_log_ptr;
-  if (op_log) {
+  if (op_log && !op_log->empty()) {
     op_log_ptr.reset(new OpLog());
     op_log_ptr->ParseFromString(*op_log);
   }
@@ -58,16 +58,27 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
 
   Options opts = Options::FromProtoStr(*options);
 
+  // TODO(xpan): We should have dump_to_file/print_stdout/etc to control
+  // side-effects independently instead of one controlling the other.
   if (opts.dump_to_file.empty()) {
     printf("\n=========================Options=============================\n");
     printf("%s", opts.ToString().c_str());
     printf("\n==================Model Analysis Report======================\n");
-    TFProfNode root(tf_stats.PrintGraph(*command, opts));
+    string ret = "";
+    if (*command == kCmds[2]) {
+      ret = tf_stats.PrintCode(opts).SerializeAsString();
+    } else {
+      ret = tf_stats.PrintGraph(*command, opts).SerializeAsString();
+    }
     printf("\n======================End of Report==========================\n");
     fflush(stdout);
-    return root.SerializeAsString();
+    return ret;
+  }
+  if (*command == kCmds[2]) {
+    return tf_stats.PrintCode(opts).SerializeAsString();
+  } else {
+    return tf_stats.PrintGraph(*command, opts).SerializeAsString();
   }
-  return tf_stats.PrintGraph(*command, opts).SerializeAsString();
 }
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.cc b/tensorflow/tools/tfprof/internal/tfprof_code.cc
new file mode 100644
index 0000000000..d65d187f31
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.cc
@@ -0,0 +1,216 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_code.h"
+
+#include <stdio.h>
+#include <utility>
+
+#include "tensorflow/c/c_api.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/platform/regexp.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+
+namespace tensorflow {
+namespace tfprof {
+namespace {
+// Convert to Trace proto into a short readable string.
+string GetTraceString(const CodeDef::Trace& trace) {
+  string ntrace = "";
+  if (trace.file().find_last_of('/') != trace.file().npos) {
+    ntrace += trace.file().substr(trace.file().find_last_of('/') + 1);
+  } else {
+    ntrace += trace.file();
+  }
+  ntrace += strings::StrCat(":", trace.lineno());
+  if (trace.function().length() < 20) {
+    ntrace += ":" + trace.function();
+  } else {
+    ntrace += ":" + trace.function().substr(0, 17) + "...";
+  }
+  if (trace.line().length() < 20) {
+    ntrace += ":" + trace.line();
+  } else {
+    ntrace += ":" + trace.line().substr(0, 17) + "...";
+  }
+  return ntrace;
+}
+}  // namespace
+
+void TFCode::AddNode(TFGraphNode* node) {
+  if (!node->code()) {
+    return;
+  }
+  TFCodeNode* pre_trace_node = nullptr;
+  for (int i = 0; i < node->code()->traces_size(); ++i) {
+    // Unlike op name, which is globally unique, trace name is only unique
+    // w.r.t. it's parent.
+    const string& trace = GetTraceString(node->code()->traces(i));
+    if (i == 0) {
+      if (!trace_root_) {
+        trace_root_.reset(new TFCodeNode(trace));
+      }
+      CHECK(trace_root_->name() == trace) << "Different trace root";
+      pre_trace_node = trace_root_.get();
+      continue;
+    }
+    pre_trace_node->AddChildren(trace);
+    TFCodeNode* trace_node = pre_trace_node->children()[trace].get();
+
+    if (i == node->code()->traces_size()-1) {
+      trace_node->AddGraphNode(node);
+    }
+    pre_trace_node = trace_node;
+  }
+}
+
+void TFCode::Build() {
+  if (!trace_root_) {
+    return;
+  }
+  code_root_ = BuildCodeNodes(trace_root_.get());
+}
+
+CodeNode* TFCode::BuildCodeNodes(TFCodeNode* root) {
+  auto code_root = std::unique_ptr<CodeNode>(new CodeNode(root));
+  CodeNode* code_root_ptr = code_root.get();
+  code_nodes_.insert(std::move(code_root));
+
+  for (auto it = root->children().cbegin();
+       it != root->children().cend(); ++it) {
+    code_root_ptr->children.push_back(BuildCodeNodes(it->second.get()));
+  }
+  return code_root_ptr;
+}
+
+const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
+  // Search from roots recursively to find start node, if start_name_regexes
+  // is specified.
+  tfprof_trace_root_.reset(new TFCodeNode(kTFProfRoot));
+  tfprof_code_root_.reset(new CodeNode(tfprof_trace_root_.get()));
+  if (!code_root_) {
+    return tfprof_code_root_.get();
+  }
+
+  std::vector<CodeNode*> roots = {code_root_};
+  if (opts.start_name_regexes.size() != 1 ||
+      opts.start_name_regexes[0] != ".*") {
+    roots = SearchRoot(roots, opts.start_name_regexes);
+  }
+
+  tfprof_code_root_->children.assign(roots.begin(), roots.end());
+  Account({tfprof_code_root_.get()}, opts);
+
+  return PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
+}
+
+std::vector<CodeNode*> TFCode::SearchRoot(
+    std::vector<CodeNode*> roots, const std::vector<string>& regexes) {
+  std::vector<CodeNode*> res;
+  if (roots.empty()) {
+    return res;
+  }
+  for (CodeNode* root : roots) {
+    bool match_start_node = false;
+    for (const string& regex : regexes) {
+      if (RE2::FullMatch(root->name(), regex)) {
+        res.push_back(root);
+        match_start_node = true;
+        break;
+      }
+    }
+    if (match_start_node) {
+      // Found a start node at this branch, no need to continue.
+      continue;
+    }
+    std::vector<CodeNode*> nroots = SearchRoot(root->children, regexes);
+    res.insert(res.end(), nroots.begin(), nroots.end());
+  }
+  return res;
+}
+
+std::vector<CodeNode*> TFCode::PrintScope(const std::vector<CodeNode*> roots,
+                                            const Options& opts, int depth,
+                                            int last_ident) {
+  std::vector<CodeNode*> show_nodes;
+
+  for (CodeNode* node : roots) {
+    int nlast_ident = last_ident;
+    bool show = ShouldShow(node, opts, depth);
+    if (show) {
+      node->formatted_str.clear();
+      if (opts.account_displayed_op_only) {
+        node->ResetTotalStats();
+        node->AddSelfToTotalStats();
+      }
+      nlast_ident += 2;
+    }
+
+    std::vector<CodeNode*> show_cnodes;
+    if (!ShouldTrim(node, opts.trim_name_regexes)) {
+      show_cnodes = PrintScope(node->children, opts, depth + 1, nlast_ident);
+    }
+    if (show) {
+      show_cnodes = SortNodes(show_cnodes, opts);
+      string children_str;
+      for (CodeNode* sc : show_cnodes) {
+        children_str += sc->formatted_str;
+        node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        if (opts.account_displayed_op_only) {
+          node->AggregateTotalStats(sc);
+        }
+      }
+
+      node->formatted_str =
+          strings::Printf("%s%s\n", string(last_ident, ' ').c_str(),
+                          node->Format(opts).c_str());
+
+      if (opts.select.find(kShown[5]) != opts.select.end()) {
+        fprintf(stderr, "code view has no tensor value to show\n");
+      }
+
+      node->formatted_str += children_str;
+      show_nodes.push_back(node);
+    } else {
+      show_nodes.insert(show_nodes.end(), show_cnodes.begin(),
+                        show_cnodes.end());
+    }
+  }
+  return show_nodes;
+}
+
+void TFCode::Account(const std::vector<CodeNode*>& roots,
+                      const Options& opts) {
+  if (roots.empty()) return;
+
+  for (CodeNode* node : roots) {
+    node->ResetTotalStats();
+    Account(node->children, opts);
+
+    node->account = ShouldAccount(node, opts);
+    if (node->account) {
+      node->AddSelfToTotalStats();
+    }
+    for (CodeNode* c : node->children) {
+      node->AggregateTotalStats(c);
+    }
+  }
+}
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.h b/tensorflow/tools/tfprof/internal/tfprof_code.h
new file mode 100644
index 0000000000..79f35e384f
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.h
@@ -0,0 +1,89 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Build a tree structure based on the TensorFlow model's python code stacks.
+// Stats are aggregated from descendants from ancestors.
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "tensorflow/c/checkpoint_reader.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+class CodeNode : public ShowCodeNode {
+ public:
+  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
+  ~CodeNode() override {}
+
+  void AggregateTotalStats(CodeNode* node) {
+    ShowCodeNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() { ShowCodeNode::ResetTotalStats(); }
+
+  std::vector<CodeNode*> children;
+};
+
+class TFCode : public TFShowCode {
+ public:
+  explicit TFCode()
+      : code_root_(nullptr), trace_root_(nullptr) {}
+  ~TFCode() override {}
+
+  void AddNode(TFGraphNode* node) override;
+
+  void Build() override;
+
+ private:
+  CodeNode* BuildCodeNodes(TFCodeNode* root);
+
+  const ShowCodeNode* ShowInternal(const Options& opts) override;
+
+  std::vector<CodeNode*> SearchRoot(std::vector<CodeNode*> roots,
+                                    const std::vector<string>& regexes);
+
+  std::vector<CodeNode*> PrintScope(const std::vector<CodeNode*> roots,
+                                     const Options& opts, int depth,
+                                     int last_ident);
+
+  void Account(const std::vector<CodeNode*>& roots, const Options& opts);
+
+  CodeNode* code_root_;
+  std::unique_ptr<TFCodeNode> trace_root_;
+  std::unique_ptr<TFCodeNode> tfprof_trace_root_;
+  std::unique_ptr<CodeNode> tfprof_code_root_;
+  std::set<std::unique_ptr<CodeNode>> code_nodes_;
+};
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.cc b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
index 469b258f98..1623d9f8c4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
@@ -31,14 +31,14 @@ GraphNode* TFGraph::CreateParentNode(const string& name) {
   node_defs_.back()->set_name(name);
   node_defs_.back()->set_op(kTFGraphParent);
   parent_nodes_[name] =
-      std::unique_ptr<TFNode>(new TFNode(node_defs_.back().get()));
+      std::unique_ptr<TFGraphNode>(new TFGraphNode(node_defs_.back().get()));
   nodes_map_[name] =
       std::unique_ptr<GraphNode>(new GraphNode(parent_nodes_[name].get()));
   return nodes_map_[name].get();
 }
 
-void TFGraph::AddNode(TFNode* node) {
-  string name = node->node_def()->name();
+void TFGraph::AddNode(TFGraphNode* node) {
+  string name = node->name();
   nodes_map_[name] = std::unique_ptr<GraphNode>(new GraphNode(node));
 }
 
@@ -49,7 +49,7 @@ void TFGraph::Build() {
   // Filter out the root nodes (node not input of any other node).
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     GraphNode* node = it->second.get();
-    const std::map<string, TFNode*>& inputs = node->node->inputs();
+    const std::map<string, TFGraphNode*>& inputs = node->node->inputs();
     for (auto inputs_it = inputs.cbegin(); inputs_it != inputs.cend();
          inputs_it++) {
       nonroots.insert(inputs_it->first);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.h b/tensorflow/tools/tfprof/internal/tfprof_graph.h
index b16f80b33d..75979d020c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.h
@@ -39,7 +39,7 @@ namespace tensorflow {
 namespace tfprof {
 class GraphNode : public ShowNode {
  public:
-  explicit GraphNode(TFNode* node) : ShowNode(node) {
+  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
     mutable_proto()->set_inputs(node->inputs().size());
     mutable_proto()->set_total_inputs(0);
   }
@@ -72,7 +72,7 @@ class TFGraph : public TFShow {
       : TFShow(ckpt_reader) {}
   ~TFGraph() override {}
 
-  void AddNode(TFNode* node) override;
+  void AddNode(TFGraphNode* node) override;
 
   void Build() override;
 
@@ -99,14 +99,14 @@ class TFGraph : public TFShow {
   std::vector<GraphNode*> GenerateGraphDot(
       GraphNode* root, GraphNode* last_shown, const Options& opts, int depth,
       int hidden, std::set<string>* declared_nodes,
-      std::set<string>* declared_edges, TFProfNode* parent);
+      std::set<string>* declared_edges, TFGraphNodeProto* parent);
 
   void Account(const std::vector<GraphNode*>& roots, const Options& opts,
                std::map<string, int64>* visits);
 
   std::vector<GraphNode*> roots_;
   std::vector<std::unique_ptr<NodeDef>> node_defs_;
-  std::map<string, std::unique_ptr<TFNode>> parent_nodes_;
+  std::map<string, std::unique_ptr<TFGraphNode>> parent_nodes_;
   std::map<string, std::unique_ptr<GraphNode>> nodes_map_;
 };
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.cc b/tensorflow/tools/tfprof/internal/tfprof_node.cc
index 08bd91d99c..5f018addb4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.cc
@@ -20,7 +20,8 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-void TFNode::AddStepStat(const string& device, const NodeExecStats* step_stat) {
+void TFGraphNode::AddStepStat(const string& device,
+                              const NodeExecStats* step_stat) {
   if (!device.empty()) {
     // This might override device from GraphDef.
     device_ = device;
@@ -44,7 +45,7 @@ void TFNode::AddStepStat(const string& device, const NodeExecStats* step_stat) {
   }
 }
 
-void TFNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
+void TFGraphNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
   kernel_compute_micros_ = cost_node->compute_cost();
 }
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.h b/tensorflow/tools/tfprof/internal/tfprof_node.h
index 677c8d3c87..235904ea6c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.h
@@ -30,14 +30,16 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
 
-class TFNode {
+class TFGraphNode {
  public:
-  TFNode(const NodeDef* node)
+  TFGraphNode(const NodeDef* node)
       : node_(node),
+        code_(nullptr),
         step_stat_(nullptr),
         op_start_micros_(0),
         op_schedule_micros_(0),
@@ -70,9 +72,9 @@ class TFNode {
     device_ = node->device();
   }
 
-  TFNode() : TFNode(nullptr) {}
+  TFGraphNode() : TFGraphNode(nullptr) {}
 
-  void AddInput(TFNode* input) { inputs_[input->node_def()->name()] = input; }
+  void AddInput(TFGraphNode* input) { inputs_[input->name()] = input; }
 
   void AddOpType(const string& op_type) { op_types_.insert(op_type); }
 
@@ -83,27 +85,32 @@ class TFNode {
 
   void AddFloatOps(int64 float_ops) { float_ops_ = float_ops; }
 
+  void AddCode(const CodeDef* code) { code_ = code; }
+
+  const string& name() const { return node_->name(); }
   const NodeDef* node_def() { return node_; }
-  const std::map<string, TFNode*>& inputs() { return inputs_; }
+  const std::map<string, TFGraphNode*>& inputs() const { return inputs_; }
   int64 op_start_micros() { return op_start_micros_; }
   // This is time spent in Op::Compute(), which is GPU kernel schedule time.
   // Currently not used.
   int64 op_schedule_micros() { return op_schedule_micros_; }
   // This is time spent in kernel execution.
-  int64 kernel_compute_micros() { return kernel_compute_micros_; }
+  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
   int64 all_spent_micros() { return all_spent_micros_; }
-  int64 requested_byptes() { return requested_bytes_; }
-  int64 float_ops() { return float_ops_; }
-  string device() { return device_; }
-  const std::set<string>& op_types() { return op_types_; }
+  int64 requested_bytes() const { return requested_bytes_; }
+  int64 float_ops() const { return float_ops_; }
+  const CodeDef* code() { return code_; }
+  string device() const { return device_; }
+  const std::set<string>& op_types() const { return op_types_; }
 
-  const std::vector<int64>& shape() { return shape_; }
+  const std::vector<int64>& shape() const { return shape_; }
 
  private:
   void update_shape(const std::vector<int64>& shape) { shape_ = shape; }
 
-  std::map<string, TFNode*> inputs_;
+  std::map<string, TFGraphNode*> inputs_;
   const NodeDef* node_;
+  const CodeDef* code_;
   const NodeExecStats* step_stat_;
 
   std::vector<int64> shape_;
@@ -117,6 +124,71 @@ class TFNode {
   int64 float_ops_;
 };
 
+class TFCodeNode {
+ public:
+  TFCodeNode(const string& trace)
+      : trace_(trace),
+        kernel_compute_micros_(0),
+        requested_bytes_(0),
+        float_ops_(0) {}
+
+  void AddGraphNode(const TFGraphNode* node) {
+    if (nodes_.find(node->name()) != nodes_.end()) {
+      return;
+    }
+    nodes_[node->name()] = node;
+
+    kernel_compute_micros_ += node->kernel_compute_micros();
+    requested_bytes_ += node->requested_bytes();
+    float_ops_ += node->float_ops();
+    op_types_.insert(node->op_types().begin(), node->op_types().end());
+    if (node->shape().size() > 0) {
+      shapes_.push_back(node->shape());
+    }
+    if (!node->device().empty()) {
+      devices_.insert(node->device());
+    }
+  }
+  const std::map<string, const TFGraphNode*>& graph_nodes() const {
+    return nodes_;
+  }
+
+  void AddChildren(const string& trace) {
+    if (children_.find(trace) != children_.end()) {
+      return;
+    }
+    children_[trace].reset(new TFCodeNode(trace));
+  }
+  std::map<string, std::unique_ptr<TFCodeNode>>& children() {
+    return children_;
+  }
+
+  const string& name() const { return trace_; }
+
+  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
+
+  int64 requested_bytes() const { return requested_bytes_; }
+
+  int64 float_ops() const { return float_ops_; }
+
+  const std::set<string>& devices() const { return devices_; }
+
+  const std::set<string>& op_types() const { return op_types_; }
+
+  const std::vector<std::vector<int64>>& shapes() const { return shapes_; }
+
+ private:
+  const string trace_;
+  std::set<string> op_types_;
+  int64 kernel_compute_micros_;
+  int64 requested_bytes_;
+  int64 float_ops_;
+
+  std::set<string> devices_;
+  std::vector<std::vector<int64>> shapes_;
+  std::map<string, const TFGraphNode*> nodes_;
+  std::map<string, std::unique_ptr<TFCodeNode>> children_;
+};
 }  // namespace tfprof
 }  // namespace tensorflow
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.h b/tensorflow/tools/tfprof/internal/tfprof_options.h
index a5b55e77fa..0a9f2768e0 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.h
@@ -55,7 +55,7 @@ static const char* const kShown[] = {
 };
 
 static const char* const kCmds[] = {
-    "scope", "graph", "set", "help",
+    "scope", "graph", "code", "set", "help",
 };
 
 struct Options {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.cc b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
index 949d2d54e4..b4aef717c8 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
@@ -35,15 +35,15 @@ ScopeNode* TFScope::CreateParentNode(const string& name) {
   node_defs_.back()->set_name(name);
   node_defs_.back()->set_op(kTFScopeParent);
   parent_nodes_[name] =
-      std::unique_ptr<TFNode>(new TFNode(node_defs_.back().get()));
+      std::unique_ptr<TFGraphNode>(new TFGraphNode(node_defs_.back().get()));
   nodes_map_[name] =
       std::unique_ptr<ScopeNode>(new ScopeNode(parent_nodes_[name].get()));
   return nodes_map_[name].get();
 }
 
-void TFScope::AddNode(TFNode* node) {
-  string name = node->node_def()->name();
-  if (nodes_map_.find(node->node_def()->name()) == nodes_map_.end()) {
+void TFScope::AddNode(TFGraphNode* node) {
+  string name = node->name();
+  if (nodes_map_.find(node->name()) == nodes_map_.end()) {
     nodes_map_[name] = std::unique_ptr<ScopeNode>(new ScopeNode(node));
   }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.h b/tensorflow/tools/tfprof/internal/tfprof_scope.h
index a7c58920a2..2e2e4f5266 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.h
@@ -39,7 +39,7 @@ namespace tfprof {
 
 class ScopeNode : public ShowNode {
  public:
-  explicit ScopeNode(TFNode* node) : ShowNode(node) {}
+  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
   ~ScopeNode() override {}
 
   void AggregateTotalStats(ScopeNode* node) {
@@ -59,7 +59,7 @@ class TFScope : public TFShow {
       : TFShow(ckpt_reader) {}
   ~TFScope() override {}
 
-  void AddNode(TFNode* node) override;
+  void AddNode(TFGraphNode* node) override;
 
   void Build() override;
 
@@ -79,7 +79,7 @@ class TFScope : public TFShow {
 
   std::vector<ScopeNode*> roots_;
   std::vector<std::unique_ptr<NodeDef>> node_defs_;
-  std::map<string, std::unique_ptr<TFNode>> parent_nodes_;
+  std::map<string, std::unique_ptr<TFGraphNode>> parent_nodes_;
   std::map<string, std::unique_ptr<ScopeNode>> nodes_map_;
 };
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.cc b/tensorflow/tools/tfprof/internal/tfprof_show.cc
index 08ae82fea4..932dfb3893 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.cc
@@ -25,13 +25,13 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-ShowNode::ShowNode(TFNode* node) : node(node), account(true) {
+ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
   mutable_proto()->set_name(name());
   if (!node->device().empty()) {
     mutable_proto()->set_device(node->device());
   }
   mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_byptes());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
   mutable_proto()->set_float_ops(node->float_ops());
 
   if (!node->shape().empty()) {
@@ -119,12 +119,12 @@ string ShowNode::FormatMeta(const Options& opts) {
   return str_util::Join(info, ", ");
 }
 
-TFProfNode* ShowNode::mutable_proto() { return &proto_; }
+TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
 
-const TFProfNode& ShowNode::proto() const { return proto_; }
+const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
 
 void ShowNode::AggregateTotalStats(ShowNode* node) {
-  TFProfNode* node_pb = node->mutable_proto();
+  TFGraphNodeProto* node_pb = node->mutable_proto();
   mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
                                          node_pb->total_exec_micros());
   mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
@@ -151,9 +151,10 @@ void ShowNode::ResetTotalStats() {
   mutable_proto()->set_total_requested_bytes(0);
   mutable_proto()->set_total_parameters(0);
   mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
 }
 
-const TFProfNode& TFShow::Show(const Options& opts) {
+const TFGraphNodeProto& TFShow::Show(const Options& opts) {
   const ShowNode* root = ShowInternal(opts);
   if (opts.dump_to_file.empty()) {
     printf("%s", root->formatted_str.c_str());
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.h b/tensorflow/tools/tfprof/internal/tfprof_show.h
index a17358bb6b..5e85b81a72 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.h
@@ -37,18 +37,18 @@ namespace tensorflow {
 namespace tfprof {
 class ShowNode {
  public:
-  explicit ShowNode(TFNode* node);
+  explicit ShowNode(const TFGraphNode* node);
   virtual ~ShowNode() {}
 
-  const string& name() const { return node->node_def()->name(); }
-  TFProfNode* mutable_proto();
-  const TFProfNode& proto() const;
+  const string& name() const { return node->name(); }
+  TFGraphNodeProto* mutable_proto();
+  const TFGraphNodeProto& proto() const;
 
   string Format(const Options& opts);
 
   string FormatMeta(const Options& opts);
 
-  TFNode* node;
+  const TFGraphNode* node;
   bool account;
   string formatted_str;
 
@@ -59,7 +59,7 @@ class ShowNode {
 
   void ResetTotalStats();
 
-  TFProfNode proto_;
+  TFGraphNodeProto proto_;
 };
 
 class TFShow {
@@ -67,9 +67,9 @@ class TFShow {
   explicit TFShow(checkpoint::CheckpointReader* ckpt_reader)
       : ckpt_reader_(ckpt_reader) {}
   virtual ~TFShow() {}
-  virtual void AddNode(TFNode* node) = 0;
+  virtual void AddNode(TFGraphNode* node) = 0;
   virtual void Build() = 0;
-  const TFProfNode& Show(const Options& opts);
+  const TFGraphNodeProto& Show(const Options& opts);
 
  protected:
   virtual const ShowNode* ShowInternal(const Options& opts) = 0;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
new file mode 100644
index 0000000000..1b83b91ad5
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
@@ -0,0 +1,275 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
+
+#include <memory>
+#include <set>
+
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/regexp.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_scope.h"
+
+namespace tensorflow {
+namespace tfprof {
+ShowCodeNode::ShowCodeNode(const TFCodeNode* node)
+    : node(node), account(true) {
+  std::vector<ScopeNode> snodes;
+  for (auto it : node->graph_nodes()) {
+    ScopeNode snode(it.second);
+    snodes.push_back(snode);
+    snodes[snodes.size()-1].AddSelfToTotalStats();
+    *mutable_proto()->mutable_graph_nodes()->Add() =
+        snodes[snodes.size()-1].proto();
+  }
+
+  mutable_proto()->set_name(name());
+  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shapes().empty()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      int64 params = 1;
+      bool complete_shape = true;
+      for (int64 d : shape) {
+        // Sometimes parameters could be <0 when a dim is unknown.
+        if (d < 0) {
+          complete_shape = false;
+          break;
+        }
+        params *= d;
+      }
+      if (complete_shape) {
+        mutable_proto()->set_parameters(proto().parameters() + params);
+      } else {
+        fprintf(stderr, "Incomplete shape.");
+      }
+    }
+  }
+}
+
+string ShowCodeNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowCodeNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  std::vector<string> shapes;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      if (!shape.empty()) {
+        shapes.push_back(FormatShapes(shape));
+      }
+    }
+    if (!shapes.empty()) {
+      info.push_back(str_util::Join(shapes, "|"));
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (!node->devices().empty()) {
+      info.push_back(str_util::Join(node->devices(), "|"));
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    op_types.insert(node->devices().cbegin(), node->devices().cend());
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
+
+const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
+
+void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
+  TFCodeNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowCodeNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowCodeNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
+
+const TFCodeNodeProto& TFShowCode::Show(const Options& opts) {
+  const ShowCodeNode* root = ShowInternal(opts);
+  if (opts.dump_to_file.empty()) {
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+  } else {
+    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
+                                 root->formatted_str);
+    if (!s.ok()) {
+      fprintf(stderr, "%s\n", s.ToString().c_str());
+    }
+  }
+  return root->proto();
+}
+
+bool TFShowCode::ShouldShow(ShowCodeNode* node,
+                            const Options& opts,
+                            int depth) {
+  // Always show kTFProfRoot.
+  if (node->name() == kTFProfRoot) return true;
+
+  if (!node->account) return false;
+  // TODO(xpan): Think more carefully about node filtering in code view.
+  // Unlike graph/scope view, which users want to see the exact leaf op.
+  // In code view, users want to see the middle code traces they wrote.
+  //
+  // This is a subtle difference from scope/graph view. Usually mostly
+  // want to see the middle code traces (i.e. their own codes.), instead
+  // of the TensorFlow internal codes traces.
+  if (node->proto().total_requested_bytes() < opts.min_bytes ||
+      node->proto().total_exec_micros() < opts.min_micros ||
+      node->proto().total_parameters() < opts.min_params ||
+      node->proto().total_float_ops() < opts.min_float_ops ||
+      depth > opts.max_depth || !ShouldShowIfExtra(node, opts, depth)) {
+    return false;
+  }
+
+  bool show = false;
+  if (opts.device_regexes.size() == 1 && opts.device_regexes[0] == ".*") {
+    show = true;
+  } else {
+    for (const string& regex : opts.device_regexes) {
+      for (const string& device : node->node->devices()) {
+        if (RE2::FullMatch(device, regex)) {
+          show = true;
+          break;
+        }
+      }
+      if (show) break;
+    }
+  }
+  // Don't show if device_regexes don't cover it.
+  if (!show) return false;
+
+  show = false;
+  if (opts.show_name_regexes.size() == 1 && opts.show_name_regexes[0] == ".*") {
+    show = true;
+  } else {
+    for (const string& regex : opts.show_name_regexes) {
+      if (RE2::FullMatch(node->name(), regex)) {
+        show = true;
+        break;
+      }
+    }
+  }
+  // Don't show if show_name_regexes don't cover it.
+  if (!show) return false;
+  // Don't show if hide_name_regexes cover it.
+  for (const string& regex : opts.hide_name_regexes) {
+    if (RE2::FullMatch(node->name(), regex)) return false;
+  }
+  return true;
+}
+
+bool TFShowCode::ShouldTrim(ShowCodeNode* node,
+                        const std::vector<string>& regexes) {
+  for (const string& regex : regexes) {
+    if (RE2::FullMatch(node->name(), regex)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool TFShowCode::ShouldAccount(ShowCodeNode* node, const Options& opts) {
+  if (opts.account_type_regexes.size() == 1 &&
+      opts.account_type_regexes[0] == ".*") {
+    return true;
+  }
+  for (const string& regex : opts.account_type_regexes) {
+    for (const string& type : node->node->op_types()) {
+      if (RE2::FullMatch(type, regex)) {
+        return true;
+      }
+    }
+    for (const string& device : node->node->devices()) {
+      if (RE2::FullMatch(device, regex)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.h b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
new file mode 100644
index 0000000000..d74290572b
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
@@ -0,0 +1,124 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Parent class and utilities for tfprof_graph and tfprof_scope.
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "tensorflow/c/checkpoint_reader.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+class ShowCodeNode {
+ public:
+  explicit ShowCodeNode(const TFCodeNode* node);
+  virtual ~ShowCodeNode() {}
+
+  const string& name() const { return node->name(); }
+  TFCodeNodeProto* mutable_proto();
+  const TFCodeNodeProto& proto() const;
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFCodeNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowCodeNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFCodeNodeProto proto_;
+};
+
+class TFShowCode {
+ public:
+  explicit TFShowCode() {}
+  virtual ~TFShowCode() {}
+  virtual void AddNode(TFGraphNode* node) = 0;
+  virtual void Build() = 0;
+  const TFCodeNodeProto& Show(const Options& opts);
+
+ protected:
+  virtual const ShowCodeNode* ShowInternal(const Options& opts) = 0;
+
+  bool LookUpCheckPoint(const string& name,
+                        std::unique_ptr<TFProfTensor>* tensor);
+
+  // Overridden by subclass if extra requirements need to be met.
+  virtual bool ShouldShowIfExtra(ShowCodeNode* node, const Options& opts,
+                                 int depth) {
+    return true;
+  }
+
+  bool ShouldShow(ShowCodeNode* node, const Options& opts, int depth);
+
+  bool ShouldTrim(ShowCodeNode* node, const std::vector<string>& regexes);
+
+  bool ShouldAccount(ShowCodeNode* node, const Options& opts);
+
+  template <typename T>
+  std::vector<T*> SortNodes(const std::vector<T*>& nodes, const Options& opts) {
+    if (opts.order_by.empty() || nodes.empty()) {
+      return nodes;
+    }
+    std::vector<T*> sorted_nodes = nodes;
+    std::sort(sorted_nodes.begin(), sorted_nodes.end(), [&opts](const T* n1,
+                                                                const T* n2) {
+      if (n1->name() == kTFProfRoot) return true;
+      if (n2->name() == kTFProfRoot) return false;
+      bool name_cmp = n1->name() < n2->name();
+      if (opts.order_by == kOrderBy[0]) {
+        return name_cmp;
+      } else if (opts.order_by == kOrderBy[1]) {
+        return n1->proto().total_requested_bytes() >
+               n2->proto().total_requested_bytes();
+      } else if (opts.order_by == kOrderBy[2]) {
+        return n1->proto().total_exec_micros() >
+               n2->proto().total_exec_micros();
+      } else if (opts.order_by == kOrderBy[3]) {
+        return n1->proto().total_parameters() > n2->proto().total_parameters();
+      } else if (opts.order_by == kOrderBy[4]) {
+        return n1->proto().total_float_ops() > n2->proto().total_float_ops();
+      }
+      return name_cmp;
+    });
+    return sorted_nodes;
+  }
+};
+
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.cc b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
index edc0689d69..13ff6e7246 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
@@ -56,29 +56,38 @@ TFStats::TFStats(std::unique_ptr<GraphDef> graph,
   printf("Preparing Views...\n");
   scope_view_ = std::unique_ptr<TFScope>(new TFScope(ckpt_reader_.get()));
   graph_view_ = std::unique_ptr<TFGraph>(new TFGraph(ckpt_reader_.get()));
+  code_view_ = std::unique_ptr<TFCode>(new TFCode());
+
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     scope_view_->AddNode(&it->second);
     graph_view_->AddNode(&it->second);
+    code_view_->AddNode(&it->second);
   }
   scope_view_->Build();
   graph_view_->Build();
+  code_view_->Build();
 }
 
-const TFProfNode& TFStats::PrintGraph(const string& cmd, const Options& opts) {
+const TFGraphNodeProto& TFStats::PrintGraph(const string& cmd,
+                                            const Options& opts) {
   if (cmd == kCmds[0]) {
     return scope_view_->Show(opts);
   } else if (cmd == kCmds[1]) {
     return graph_view_->Show(opts);
   } else {
     fprintf(stderr, "Unknown command: %s\n", cmd.c_str());
-    return empty_node_;
+    return empty_graph_node_;
   }
 }
 
+const TFCodeNodeProto& TFStats::PrintCode(const Options& opts) {
+  return code_view_->Show(opts);
+}
+
 void TFStats::ParseGraph() {
   for (const NodeDef& node : graph_->node()) {
     CHECK(nodes_map_.find(node.name()) == nodes_map_.end());
-    nodes_map_[node.name()] = TFNode(&node);
+    nodes_map_[node.name()] = TFGraphNode(&node);
   }
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     const NodeDef* node_def = it->second.node_def();
@@ -110,6 +119,9 @@ void TFStats::ParseOpLog() {
     if (entry.float_ops()) {
       node->second.AddFloatOps(entry.float_ops());
     }
+    if (entry.has_code_def()) {
+      node->second.AddCode(&entry.code_def());
+    }
   }
 }
 
@@ -131,13 +143,14 @@ void TFStats::ParseRunMeta() {
             "Missing CostGraphDef in RunMetadata.\nMaybe you forget to"
             "set tf.ConfigProto(graph_options=tf.GraphOptions("
             "build_cost_model=1)) to Session()\n");
-  }
-  for (const auto& node_pb : run_meta_->cost_graph().node()) {
-    auto node = nodes_map_.find(node_pb.name());
-    if (node == nodes_map_.end()) {
-      continue;
+  } else {
+    for (const auto& node_pb : run_meta_->cost_graph().node()) {
+      auto node = nodes_map_.find(node_pb.name());
+      if (node == nodes_map_.end()) {
+        continue;
+      }
+      node->second.AddNodeStat(&node_pb);
     }
-    node->second.AddNodeStat(&node_pb);
   }
 }
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.h b/tensorflow/tools/tfprof/internal/tfprof_stats.h
index 3a8b46ae31..585dca6771 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.h
@@ -35,6 +35,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/protobuf/config.pb.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_code.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_graph.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
@@ -56,7 +57,8 @@ class TFStats {
 
   // Prints the results to stdout. Also returns the printed output in
   // a proto.
-  const TFProfNode& PrintGraph(const string& cmd, const Options& opts);
+  const TFGraphNodeProto& PrintGraph(const string& cmd, const Options& opts);
+  const TFCodeNodeProto& PrintCode(const Options& opts);
 
  private:
   void ParseGraph();
@@ -67,13 +69,16 @@ class TFStats {
 
   std::unique_ptr<TFScope> scope_view_;
   std::unique_ptr<TFGraph> graph_view_;
+  std::unique_ptr<TFCode> code_view_;
   std::unique_ptr<GraphDef> graph_;
   std::unique_ptr<RunMetadata> run_meta_;
   std::unique_ptr<OpLog> op_log_;
   std::unique_ptr<checkpoint::CheckpointReader> ckpt_reader_;
-  // Store TFNode instead of TFNode* to avoid large number of dynamic alloc.
-  std::map<string, TFNode> nodes_map_;
-  TFProfNode empty_node_;
+  // Store TFGraphNode instead of TFGraphNode* to avoid large number of
+  // dynamic alloc.
+  std::map<string, TFGraphNode> nodes_map_;
+  TFGraphNodeProto empty_graph_node_;
+  TFCodeNodeProto empty_code_node_;
 };
 
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
index 3c97f0eb65..b913161f6a 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
@@ -76,9 +76,9 @@ TEST_F(TFProfStatsTest, CustomOpType) {
                {".*"}, {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
@@ -108,9 +108,9 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
       3, 0, 0, 0, 0, {".*"}, "name", {kCkptVarType},  // accout_type_regexes
       {".*"}, {""}, {".*"}, {""}, false,
       {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
@@ -141,9 +141,9 @@ TEST_F(TFProfStatsTest, TestGraph) {
                {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("graph", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("graph", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: 0\ninputs: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
@@ -155,9 +155,9 @@ TEST_F(TFProfStatsTest, TestGraph) {
 TEST_F(TFProfStatsTest, TestFloatOps) {
   Options opts(10, 0, 0, 0, 1, {".*"}, "name", {".*"}, {".*"}, {""}, {".*"},
                {""}, false, {"float_ops"}, false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
@@ -187,9 +187,9 @@ TEST_F(TFProfStatsTest, TestAccountShownNameOnly) {
                {"unit_2_1.*DW"},  // show_name_regexes.
                {""}, true,        // account_displayed_op_only.
                {"params"}, false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
@@ -203,8 +203,8 @@ TEST_F(TFProfStatsTest, TestShowTensorValue) {
                {"unit_1_0.*gamma"}, {""}, false,
                {"tensor_value"},  // Show tensor value from checkpoint.
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
-  TFProfNode expected;
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
diff --git a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
index 8c19910355..95759f9d47 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
@@ -58,9 +58,9 @@ TEST_F(TFProfTensorTest, Basics) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name", {"VariableV2"}, {".*"}, {""},
                {".*"}, {""}, false, {"tensor_value"},  // show the tensor value.
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
diff --git a/tensorflow/tools/tfprof/tfprof_log.proto b/tensorflow/tools/tfprof/tfprof_log.proto
index cae6e1e3a8..5c47142e0a 100644
--- a/tensorflow/tools/tfprof/tfprof_log.proto
+++ b/tensorflow/tools/tfprof/tfprof_log.proto
@@ -2,6 +2,17 @@ syntax = "proto2";
 
 package tensorflow.tfprof;
 
+// It specifies the Python callstack that creates an op.
+message CodeDef {
+  repeated Trace traces = 1;
+  message Trace {
+    optional string file = 1;
+    optional int32 lineno = 2;
+    optional string function = 3;
+    optional string line = 4;
+  }
+}
+
 message OpLogEntry {
   // op name.
   optional string name = 1;
@@ -12,6 +23,8 @@ message OpLogEntry {
   // User can define extra op type information for an op. This allows the user
   // to select a group of ops precisely using op_type as a key.
   repeated string types = 3;
+  // Used to support tfprof "code" view.
+  optional CodeDef code_def = 4;
 }
 
 message OpLog {
diff --git a/tensorflow/tools/tfprof/tfprof_main.cc b/tensorflow/tools/tfprof/tfprof_main.cc
index a8ed6e3813..dd18a4ad3c 100644
--- a/tensorflow/tools/tfprof/tfprof_main.cc
+++ b/tensorflow/tools/tfprof/tfprof_main.cc
@@ -160,12 +160,13 @@ int main(int argc, char** argv) {
         "Profiling everything!\n");
     return 0;
   } else if (argc > 1) {
-    if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[3]) {
+    if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[4]) {
       tensorflow::tfprof::PrintHelp();
       return 0;
     }
     if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[0] ||
-        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[1]) {
+        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[1] ||
+        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[2]) {
       cmd = argv[1];
     }
   }
@@ -214,7 +215,10 @@ int main(int argc, char** argv) {
       hide_name_regexes, FLAGS_account_displayed_op_only, select, FLAGS_viz,
       FLAGS_dump_to_file);
 
-  if (!cmd.empty()) {
+  if (cmd == tensorflow::tfprof::kCmds[2]) {
+    tf_stat.PrintCode(opts);
+    return 0;
+  } else if (!cmd.empty()) {
     tf_stat.PrintGraph(cmd, opts);
     return 0;
   }
@@ -240,10 +244,12 @@ int main(int argc, char** argv) {
       fprintf(stderr, "E: %s\n", s.ToString().c_str());
       continue;
     }
-    if (cmd == tensorflow::tfprof::kCmds[2]) {
+    if (cmd == tensorflow::tfprof::kCmds[3]) {
       opts = new_opts;
-    } else if (cmd == tensorflow::tfprof::kCmds[3]) {
+    } else if (cmd == tensorflow::tfprof::kCmds[4]) {
       tensorflow::tfprof::PrintHelp();
+    } else if (cmd == tensorflow::tfprof::kCmds[2]) {
+      tf_stat.PrintCode(new_opts);
     } else {
       tf_stat.PrintGraph(cmd, new_opts);
     }
diff --git a/tensorflow/tools/tfprof/tfprof_options.proto b/tensorflow/tools/tfprof/tfprof_options.proto
index 0d8e688039..9d269a0995 100644
--- a/tensorflow/tools/tfprof/tfprof_options.proto
+++ b/tensorflow/tools/tfprof/tfprof_options.proto
@@ -21,4 +21,4 @@ message OptionsProto {
   repeated string select = 14;
   optional bool viz = 15;
   optional string dump_to_file = 16;
-}
\ No newline at end of file
+}
diff --git a/tensorflow/tools/tfprof/tfprof_output.proto b/tensorflow/tools/tfprof/tfprof_output.proto
index 9afd41046e..78dd056662 100644
--- a/tensorflow/tools/tfprof/tfprof_output.proto
+++ b/tensorflow/tools/tfprof/tfprof_output.proto
@@ -14,7 +14,8 @@ message TFProfTensorProto {
   repeated string value_str = 4;
 }
 
-message TFProfNode {
+// A node in TensorFlow graph. Used by scope/graph view.
+message TFGraphNodeProto {
   // op name.
   optional string name = 1;
   // tensor value restored from checkpoint.
@@ -45,5 +46,34 @@ message TFProfNode {
   repeated TensorShapeProto shapes = 11;
   // Descendants of the graph. The actual descendants depend on the data
   // structure used (scope, graph).
-  repeated TFProfNode children = 12;
+  repeated TFGraphNodeProto children = 12;
+}
+
+// A node in TensorFlow Python call trace stack. Used by code view.
+message TFCodeNodeProto {
+  // A trace in the trace stack.
+  optional string name = 1;
+
+  // code execution time.
+  optional int64 exec_micros = 2;
+  // Total requested bytes by the code.
+  optional int64 requested_bytes = 3;
+  // Number of parameters if available.
+  optional int64 parameters = 4;
+  // Number of float operations.
+  optional int64 float_ops = 5;
+
+  // The following are the aggregated stats from called descendents and the
+  // trace itself. The actual descendants depend on the data structure used.
+  optional int64 total_exec_micros = 6;
+  optional int64 total_requested_bytes = 7;
+  optional int64 total_parameters = 8;
+  optional int64 total_float_ops = 9;
+
+  // A set of graph nodes created by the leaf of the call stack.
+  // 'children' field should be empty if graph_nodes is non-empty.
+  repeated TFGraphNodeProto graph_nodes = 10;
+  // Descendants of the graph. The actual descendants depend on the data
+  // structure used (scope, graph).
+  repeated TFCodeNodeProto children = 11;
 }
\ No newline at end of file
-- 
GitLab


From 97d550a72de8f0dbd43e289a50231930e3526c91 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Fri, 5 May 2017 17:32:05 -0700
Subject: [PATCH 1066/1563] Rolling back bad internal merge commit that makes
 Android fail.

---
 tensorflow/tensorflow.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 7baddf301c..ddffabd8cb 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -1185,7 +1185,7 @@ def tf_version_info_genrule():
       ],
       outs=["util/version_info.cc"],
       cmd=
-      "$(PYTHON_BIN_PATH) $(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
       local=1,
       tools=[clean_dep("//tensorflow/tools/git:gen_git_source.py")],)
 
-- 
GitLab


From 53f68459f18fd9c707183511e1e58d03e2f367db Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 16:32:41 -0800
Subject: [PATCH 1067/1563] Fix multiple minor split_v related issues.

* Bug where the implementation didn't check in the case of one output that it
  was of the correct size.
* Bug in the shape inference where the output shapes are known.  It didn't do
  any error checking in the inference function, leading to a delay in finding
  problems.
The above two problems were highlighted by #8720
* Bug when num_or_size_splits is a constant tensor.
#7754

Also updates golden values in phasedLSTM test since it depends on the number
of nodes in the graph, which this CL changes.
Change: 155259859
---
 .../rnn/python/kernel_tests/rnn_cell_test.py  | 10 ++---
 tensorflow/core/kernels/split_v_op.cc         |  6 +++
 tensorflow/core/ops/array_ops.cc              | 37 ++++++++++++++++++-
 .../python/kernel_tests/split_op_test.py      | 37 +++++++++++++++++++
 tensorflow/python/ops/array_ops.py            | 26 ++++++-------
 5 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
index 55fd7e7a51..33fd35c1a3 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
@@ -849,14 +849,12 @@ class RNNCellTest(test.TestCase):
       batch_size = 3
       input_size = 4
       expected_state_c = np.array(
-          [[2.954548e-01, 8.354891e-04],
-           [2.834632e-01, 8.158963e-01],
-           [2.291694e-01, 1.325745e-04]],
+          [[0.00072015, 0.00036633], [0.00083481, 0.00047266],
+           [0.00085111, 0.00053054]],
           dtype=np.float32)
       expected_state_h = np.array(
-          [[2.116566e-01, 5.985238e-04],
-           [2.137760e-01, 6.153145e-01],
-           [1.742966e-01, 1.008306e-04]],
+          [[0.0005159, 0.00026243], [0.00062958, 0.00035646],
+           [0.00064732, 0.00040351]],
           dtype=np.float32)
       with variable_scope.variable_scope(
           "root", initializer=init_ops.constant_initializer(0.5)):
diff --git a/tensorflow/core/kernels/split_v_op.cc b/tensorflow/core/kernels/split_v_op.cc
index 114b41ae42..4dff1ea046 100644
--- a/tensorflow/core/kernels/split_v_op.cc
+++ b/tensorflow/core/kernels/split_v_op.cc
@@ -87,6 +87,12 @@ class SplitVOpBase : public OpKernel {
     // Special case 1: num_split == 1. Nothing to do.
     if (num_split == 1) {
       context->set_output(0, context->input(0));
+      OP_REQUIRES(
+          context, (*split_sizes_vec)[0] == input_size_split_dim,
+          errors::InvalidArgument("If there is only one output, it must have "
+                                  "the same size as the input. Input size: ",
+                                  input_size_split_dim,
+                                  " output size: ", (*split_sizes_vec)[0]));
       *done = true;
       return;
     }
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index e528ae47aa..5e5ede8aa9 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -518,7 +518,17 @@ REGISTER_OP("SplitV")
       } else if (rank == 0) {
         // Throw error if input is a scalar.
         return errors::InvalidArgument("Can't split scalars");
-      } else if (size_splits == nullptr || !c->ValueKnown(split_dimension)) {
+      } else if (size_splits == nullptr && c->ValueKnown(split_dimension)) {
+        // If split dimension is known, but the sizes are unknown, then
+        // only the split dimension is unknown
+        output_shape = input;
+        TF_RETURN_IF_ERROR(c->ReplaceDim(output_shape,
+                                         c->Value(split_dimension),
+                                         c->UnknownDim(), &output_shape));
+        for (int i = 0; i < num_outputs; ++i) {
+          c->set_output(i, output_shape);
+        }
+      } else if (size_splits == nullptr && !c->ValueKnown(split_dimension)) {
         // If split dimension or tensor containing the split sizes is unknown,
         // then return unknown shapes of same rank as input.
         output_shape = c->UnknownShapeOfRank(rank);
@@ -540,12 +550,37 @@ REGISTER_OP("SplitV")
           return errors::InvalidArgument(
               "Length of size_splits should be equal to num_outputs");
         }
+        int cumsum_outputs = 0;
+        bool has_neg_one = false;
+        // If the sizes of the splits are known, then
+        // make sure that the sizes add up to the expected
+        // dimension size, with the possibility of a -1.
+        // Specify the full output shapes.
         for (int i = 0; i < num_outputs; ++i) {
           output_shape = c->UnknownShapeOfRank(rank);
           TF_RETURN_IF_ERROR(c->ReplaceDim(input, split_dim,
                                            c->MakeDim(data[i]), &output_shape));
           c->set_output(i, output_shape);
+          if (data[i] == -1 && !has_neg_one)
+            has_neg_one = true;
+          else if (data[i] == -1 && has_neg_one)
+            return errors::InvalidArgument("size_splits can only have one -1");
+          else
+            cumsum_outputs += data[i];
         }
+        int split_dim_size = c->Value(c->Dim(input, split_dim));
+        if (has_neg_one) {
+          if (cumsum_outputs < split_dim_size)
+            cumsum_outputs = split_dim_size;
+          else
+            cumsum_outputs = split_dim_size + 1;
+        }
+        if (cumsum_outputs != c->Value(c->Dim(input, split_dim)))
+          return errors::InvalidArgument(
+              "Sum of output sizes must match "
+              "the size of the original Tensor along the split dimension "
+              "or the sum of the positive sizes must be less if it contains a "
+              "-1");
       }
 
       return Status::OK();
diff --git a/tensorflow/python/kernel_tests/split_op_test.py b/tensorflow/python/kernel_tests/split_op_test.py
index 38093ab6d6..02c27bf87d 100644
--- a/tensorflow/python/kernel_tests/split_op_test.py
+++ b/tensorflow/python/kernel_tests/split_op_test.py
@@ -22,6 +22,7 @@ import numpy as np
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors_impl
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradients_impl
@@ -40,6 +41,42 @@ class SplitOpTest(test.TestCase):
       data -= 1j * data
     return data
 
+  def testShapeInference(self):
+    model_input = array_ops.placeholder(dtypes.float32, shape=(1, 10))
+
+    # check that we fail during static shape inference if sizes are known
+    with self.assertRaises(ValueError):
+      # pylint: disable=expression-not-assigned
+      array_ops.split(model_input, [4], axis=1)[0]
+      # pylint: enable=expression-not-assigned
+
+    model_input = array_ops.placeholder(dtypes.float32)
+    inp = np.zeros((1, 10))
+    # check that we still fail at runtime if the shapes were unknown
+    with self.test_session(use_gpu=False) as sess:
+      with self.assertRaises(errors_impl.InvalidArgumentError):
+        sess.run(array_ops.split(model_input, [4]), {model_input: inp})
+
+    # test that we can pass a scalar Tensor as num_splits
+    with self.test_session(use_gpu=False) as sess:
+      result = sess.run(
+          array_ops.split(
+              array_ops.ones([4, 4]),
+              num_or_size_splits=array_ops.ones([2, 2]).get_shape()[1],
+              axis=0))
+
+    self.assertEqual(result[0].shape, (2, 4))
+    self.assertEqual(result[1].shape, (2, 4))
+
+    # test that none split dimensions remain, even if we don't know how
+    # the split_dim will be split, but we do know the axis
+    result = array_ops.split(
+        array_ops.ones([5, 2]), array_ops.constant([2, 1, 2]) * 1, axis=0)
+
+    self.assertEqual(result[0].shape[1], 2)
+    self.assertEqual(result[1].shape[1], 2)
+    self.assertEqual(result[2].shape[1], 2)
+
   def testExplicitNum(self):
     size_splits = array_ops.placeholder(dtype=dtypes.int32, shape=[None])
 
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 5ac630c321..f3bcb6ce77 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -84,7 +84,6 @@ from __future__ import print_function
 
 import sys
 import numpy as np
-import six
 
 from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import constant_op
@@ -1165,13 +1164,14 @@ def sparse_mask(a, mask_indices, name=None):
 def split(value, num_or_size_splits, axis=0, num=None, name="split"):
   """Splits a tensor into sub tensors.
 
-  If `num_or_size_splits` is a scalar, `num_split`, then splits `value` along
-  dimension `axis` into `num_split` smaller tensors.
+  If `num_or_size_splits` is an integer type, `num_split`, then splits `value`
+  along dimension `axis` into `num_split` smaller tensors.
   Requires that `num_split` evenly divides `value.shape[axis]`.
 
-  If `num_or_size_splits` is a tensor, `size_splits`, then splits `value` into
-  `len(size_splits)` pieces. The shape of the `i`-th piece has the same size as
-  the `value` except along dimension `axis` where the size is `size_splits[i]`.
+  If `num_or_size_splits` is not an integer type, it is presumed to be a Tensor
+  `size_splits`, then splits `value` into `len(size_splits)` pieces. The shape
+  of the `i`-th piece has the same size as the `value` except along dimension
+  `axis` where the size is `size_splits[i]`.
 
   For example:
 
@@ -1189,11 +1189,11 @@ def split(value, num_or_size_splits, axis=0, num=None, name="split"):
 
   Args:
     value: The `Tensor` to split.
-    num_or_size_splits: Either an integer indicating the number of splits along
-      split_dim or a 1-D Tensor containing the sizes of each output tensor
-      along split_dim. If an integer then it must evenly divide
-      `value.shape[axis]`; otherwise the sum of sizes along the split
-      dimension must match that of the `value`.
+    num_or_size_splits: Either a 0-D integer `Tensor` indicating the number of
+      splits along split_dim or a 1-D integer `Tensor` integer tensor containing
+      the sizes of each output tensor along split_dim. If a scalar then it must
+      evenly divide `value.shape[axis]`; otherwise the sum of sizes along the
+      split dimension must match that of the `value`.
     axis: A 0-D `int32` `Tensor`. The dimension along which to split.
       Must be in the range `[0, rank(value))`. Defaults to 0.
     num: Optional, used to specify the number of outputs when it cannot be
@@ -1209,11 +1209,11 @@ def split(value, num_or_size_splits, axis=0, num=None, name="split"):
   Raises:
     ValueError: If `num` is unspecified and cannot be inferred.
   """
-  if isinstance(num_or_size_splits, six.integer_types):
+  size_splits = ops.convert_to_tensor(num_or_size_splits)
+  if size_splits.get_shape().ndims == 0 and size_splits.dtype.is_integer:
     return gen_array_ops._split(
         split_dim=axis, num_split=num_or_size_splits, value=value, name=name)
   else:
-    size_splits = ops.convert_to_tensor(num_or_size_splits)
     if num is None:
       size_splits_shape = size_splits.get_shape()
       num = size_splits_shape.dims[0]
-- 
GitLab


From 6c0226154d131fb2ba2b0dffb65c461bab8d5f3f Mon Sep 17 00:00:00 2001
From: James Qin <jamesqin@google.com>
Date: Fri, 5 May 2017 16:38:59 -0800
Subject: [PATCH 1068/1563] Support dropout in cudnn RNN. Change: 155260345

---
 tensorflow/contrib/cudnn_rnn/BUILD            |   2 +-
 .../cudnn_rnn/kernels/cudnn_rnn_ops.cc        | 239 ++++++++++++++----
 .../contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc    |  27 +-
 .../python/kernel_tests/cudnn_rnn_ops_test.py | 176 ++++++++-----
 .../cudnn_rnn/python/ops/cudnn_rnn_ops.py     |  56 ++--
 5 files changed, 345 insertions(+), 155 deletions(-)

diff --git a/tensorflow/contrib/cudnn_rnn/BUILD b/tensorflow/contrib/cudnn_rnn/BUILD
index 9ebf94315b..60c0b42a79 100644
--- a/tensorflow/contrib/cudnn_rnn/BUILD
+++ b/tensorflow/contrib/cudnn_rnn/BUILD
@@ -82,7 +82,7 @@ tf_custom_op_py_library(
 
 cuda_py_test(
     name = "cudnn_rnn_ops_test",
-    size = "small",
+    size = "medium",
     srcs = ["python/kernel_tests/cudnn_rnn_ops_test.py"],
     additional_deps = [
         ":cudnn_rnn_py",
diff --git a/tensorflow/contrib/cudnn_rnn/kernels/cudnn_rnn_ops.cc b/tensorflow/contrib/cudnn_rnn/kernels/cudnn_rnn_ops.cc
index 6049d2afda..86faf0cc85 100644
--- a/tensorflow/contrib/cudnn_rnn/kernels/cudnn_rnn_ops.cc
+++ b/tensorflow/contrib/cudnn_rnn/kernels/cudnn_rnn_ops.cc
@@ -40,6 +40,7 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/util/env_var.h"
 
 #if GOOGLE_CUDA
 #include "tensorflow/core/platform/stream_executor.h"
@@ -67,7 +68,7 @@ limitations under the License.
  * TensorFlow is responsible for making sure the memory is alive long enough
  * and recycles afterwards.
  *
-*/
+ */
 namespace tensorflow {
 
 using CPUDevice = Eigen::ThreadPoolDevice;
@@ -106,6 +107,7 @@ using perftools::gputools::DeviceMemory;
 using perftools::gputools::DeviceMemoryBase;
 using perftools::gputools::ScratchAllocator;
 using perftools::gputools::port::StatusOr;
+using strings::Printf;
 
 Status ParseRNNMode(const string& str, RnnMode* rnn_mode) {
   if (str == "rnn_relu") {
@@ -203,9 +205,10 @@ DeviceMemoryBase SliceDeviceMemory(const DeviceMemoryBase& device_memory,
 }
 
 inline Status FromExecutorStatus(const perftools::gputools::port::Status& s) {
-  return s.ok() ? Status::OK() : Status(static_cast<tensorflow::error::Code>(
-                                            static_cast<int>(s.code())),
-                                        s.error_message());
+  return s.ok() ? Status::OK()
+                : Status(static_cast<tensorflow::error::Code>(
+                             static_cast<int>(s.code())),
+                         s.error_message());
 }
 
 template <typename T>
@@ -244,8 +247,7 @@ class CudnnRNNWorkspaceAllocator : public ScratchAllocator {
     // allocator.
     allocated_tensors_.push_back(temporary_memory);
     total_byte_size_ += byte_size;
-    return perftools::gputools::port::StatusOr<
-        perftools::gputools::DeviceMemory<uint8>>(
+    return StatusOr<DeviceMemory<uint8>>(
         AsDeviceMemory<uint8>(&temporary_memory));
   }
   int64 TotalByteSize() { return total_byte_size_; }
@@ -296,6 +298,43 @@ class CudnnRNNReserveSpaceAllocator : public ScratchAllocator {
   int output_index_;
 };
 
+// A helper to allocate persistent memory for Cudnn RNN models, which is
+// expected to live between kernel invocations.
+// This class is not thread-safe.
+class CudnnRNNPersistentSpaceAllocator : public ScratchAllocator {
+ public:
+  CudnnRNNPersistentSpaceAllocator(OpKernelContext* context)
+      : context_(context) {}
+
+  virtual ~CudnnRNNPersistentSpaceAllocator() {}
+
+  int64 GetMemoryLimitInBytes(perftools::gputools::Stream* stream) override {
+    return std::numeric_limits<int64>::max();
+  }
+
+  StatusOr<DeviceMemory<uint8>> AllocateBytes(
+      perftools::gputools::Stream* stream, int64 byte_size) override {
+    if (total_byte_size_ != 0) {
+      return Status(error::FAILED_PRECONDITION,
+                    "Persistent space allocator can only be called once");
+    }
+
+    Status allocation_status = context_->allocate_persistent(
+        DT_UINT8, TensorShape({byte_size}), &handle_, nullptr);
+    if (!allocation_status.ok()) {
+      return ToExecutorStatus(allocation_status);
+    }
+    total_byte_size_ += byte_size;
+    return AsDeviceMemory<uint8>(handle_.AccessTensor(context_));
+  }
+  int64 TotalByteSize() { return total_byte_size_; }
+
+ private:
+  int64 total_byte_size_ = 0;
+  PersistentTensor handle_;
+  OpKernelContext* context_;  // not owned
+};
+
 struct CudnnModelTypes {
   RnnMode rnn_mode;
   TFRNNInputMode rnn_input_mode;
@@ -317,6 +356,16 @@ struct CudnnModelShapes {
   TensorShape input_shape;
   TensorShape output_shape;
   TensorShape hidden_state_shape;
+  // At present only fields related to cached RnnDescriptor are concerned.
+  bool IsCompatibleWith(const CudnnModelShapes& rhs) const {
+    return num_layers == rhs.num_layers && input_size == rhs.input_size &&
+           num_units == rhs.num_units && dir_count == rhs.dir_count;
+  }
+  string RnnDescDebugString() {
+    return strings::Printf(
+        "[num_layers, input_size, num_units, dir_count]: [%d, %d, %d, %d]",
+        num_layers, input_size, num_units, dir_count);
+  }
 };
 
 // Extract and checks the forward input tensors, parameters, and shapes from the
@@ -399,11 +448,23 @@ void RestoreParams(const OpInputList params_input,
 
 }  // namespace
 
+// Note: all following kernels depend on a RnnDescriptor instance, which
+// according to Cudnn official doc should be kept around and reused across all
+// Cudnn kernels in the same model.
+// In Tensorflow, we don't pass the reference across different OpKernels,
+// rather, recreate it separately in each OpKernel, which does no cause issue:
+// CudnnDropoutDescriptor keeps a reference to a memory for
+// random number generator state. During recreation, this state is lost.
+// However, only forward-pass Cudnn APIs make use of the state.
+
 // A common base class for RNN kernels. It extracts common attributes and
 // shape validations.
 class CudnnRNNKernelCommon : public OpKernel {
  protected:
   CudnnRNNKernelCommon(OpKernelConstruction* context) : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("dropout", &dropout_));
+    OP_REQUIRES_OK(context, context->GetAttr("seed", &seed_));
+    OP_REQUIRES_OK(context, context->GetAttr("seed2", &seed2_));
     string str;
     OP_REQUIRES_OK(context, context->GetAttr("rnn_mode", &str));
     OP_REQUIRES_OK(context, ParseRNNMode(str, &model_types_.rnn_mode));
@@ -413,6 +474,10 @@ class CudnnRNNKernelCommon : public OpKernel {
     OP_REQUIRES_OK(context, context->GetAttr("direction", &str));
     OP_REQUIRES_OK(
         context, ParseRNNDirectionMode(str, &model_types_.rnn_direction_mode));
+    // Reset CudnnRnnDescriptor and related random number generate states in
+    // every Compute() call.
+    OP_REQUIRES_OK(context, ReadBoolFromEnvVar("TF_CUDNN_RESET_RND_GEN_STATE",
+                                               false, &reset_rnd_gen_state_));
   }
 
   bool HasInputC() const { return model_types_.HasInputC(); }
@@ -422,6 +487,9 @@ class CudnnRNNKernelCommon : public OpKernel {
     return model_types_.rnn_direction_mode;
   }
   CudnnModelTypes model_types() const { return model_types_; }
+  float dropout() const { return dropout_; }
+  uint64 seed() { return (static_cast<uint64>(seed_) << 32) | seed2_; }
+  bool ResetRndGenState() { return reset_rnd_gen_state_; }
 
   template <typename T>
   Status ExtractCudnnRNNParamsInfo(OpKernelContext* context,
@@ -448,11 +516,14 @@ class CudnnRNNKernelCommon : public OpKernel {
     RnnInputMode input_mode;
     TF_RETURN_IF_ERROR(
         ToRNNInputMode(rnn_input_mode(), num_units, input_size, &input_mode));
+
     auto* stream = context->op_device_context()->stream();
+    // ExtracCudnnRNNParamsInfo is only called by op_kernels that do not require
+    // random number generator, therefore set state_allocator to nullptr.
     auto rnn_desc_s = stream->parent()->createRnnDescriptor(
         num_layers, num_units, input_size, input_mode, rnn_direction_mode(),
-        rnn_mode(), ToDataType<T>::value, 0.f /*dropout*/, 0 /*seed*/,
-        nullptr /*state_allocator*/);
+        rnn_mode(), ToDataType<T>::value, dropout(), seed(),
+        nullptr /* state_allocator */);
     if (!rnn_desc_s.ok()) {
       return FromExecutorStatus(rnn_desc_s);
     }
@@ -461,6 +532,11 @@ class CudnnRNNKernelCommon : public OpKernel {
   }
 
  private:
+  int seed_;
+  int seed2_;
+  float dropout_;
+  bool reset_rnd_gen_state_;
+
   CudnnModelTypes model_types_;
 };
 
@@ -560,9 +636,8 @@ class CudnnRNNParamsToCanonical<GPUDevice, T> : public CudnnRNNKernelCommon {
         context->set_output(i, input.Slice(start, end));
       } else {
         Tensor* output = nullptr;
-        OP_REQUIRES_OK(
-            context,
-            context->allocate_output(i, TensorShape({width, height}), &output));
+        OP_REQUIRES_OK(context, context->allocate_output(
+                                    i, TensorShape({width, height}), &output));
         DeviceMemoryBase data_src_ptr = SliceDeviceMemory(
             input_ptr, rnn_desc->ParamsWeightRegions()[i].offset,
             size_in_bytes);
@@ -571,14 +646,17 @@ class CudnnRNNParamsToCanonical<GPUDevice, T> : public CudnnRNNKernelCommon {
       }
     }
 
-    CHECK(num_params_ == rnn_desc->ParamsBiasRegions().size())
-        << "Number of params mismatch. Expected " << num_params_ << ", got "
-        << rnn_desc->ParamsBiasRegions().size();
+    OP_REQUIRES(context, num_params_ == rnn_desc->ParamsBiasRegions().size(),
+                errors::InvalidArgument("Number of params mismatch. Expected ",
+                                        num_params_, ", got ",
+                                        rnn_desc->ParamsBiasRegions().size()));
     for (int i = 0; i < rnn_desc->ParamsBiasRegions().size(); i++) {
       int64 size_in_bytes = rnn_desc->ParamsBiasRegions()[i].size;
       int64 size = size_in_bytes / sizeof(T);
-      CHECK(size == num_units) << "Params size mismatch. Expected " << num_units
-                               << ", got " << size;
+      OP_REQUIRES(context, size == num_units,
+                  errors::InvalidArgument("Params size mismatch. Expected ",
+                                          num_units, ", got ", size));
+
       // If data is aligned, use slice view to avoid expensive memcpy.
       bool start_aligned =
           rnn_desc->ParamsBiasRegions()[i].offset % EIGEN_MAX_ALIGN_BYTES == 0;
@@ -698,16 +776,32 @@ class CudnnRNNForwardOp<GPUDevice, T> : public CudnnRNNKernelCommon {
     OP_REQUIRES_OK(context,
                    ToRNNInputMode(rnn_input_mode(), model_shapes.num_units,
                                   model_shapes.input_size, &input_mode));
-    // TODO(zhengxq): add dropout support.
     // TODO(zhengxq): cache the descriptor so we don't have to create them all
     // the time.
     auto data_type = ToDataType<T>::value;
-    auto rnn_desc_s = executor->createRnnDescriptor(
-        model_shapes.num_layers, model_shapes.num_units,
-        model_shapes.input_size, input_mode, rnn_direction_mode(), rnn_mode(),
-        data_type, 0.f /*dropout*/, 0 /*seed*/, nullptr /*state_allocator*/);
-    OP_REQUIRES_OK(context, FromExecutorStatus(rnn_desc_s));
-    auto rnn_desc = rnn_desc_s.ConsumeValueOrDie();
+    {
+      mutex_lock l(mu_);
+      if (model_shapes_ == nullptr) {
+        model_shapes_.reset(new CudnnModelShapes(model_shapes));
+      } else {
+        OP_REQUIRES(context, model_shapes_->IsCompatibleWith(model_shapes),
+                    errors::InvalidArgument(
+                        "Incompatible rnn model shapes inferred: expecting ",
+                        model_shapes_->RnnDescDebugString(), ", getting ",
+                        model_shapes.RnnDescDebugString(), "."));
+      }
+      if (rnn_desc_ == nullptr || ResetRndGenState()) {
+        dropout_state_allocator_.reset(
+            new CudnnRNNPersistentSpaceAllocator(context));
+        auto rnn_desc_s = executor->createRnnDescriptor(
+            model_shapes_->num_layers, model_shapes_->num_units,
+            model_shapes_->input_size, input_mode, rnn_direction_mode(),
+            rnn_mode(), data_type, dropout(), seed(),
+            dropout_state_allocator_.get());
+        OP_REQUIRES_OK(context, FromExecutorStatus(rnn_desc_s));
+        rnn_desc_ = std::move(rnn_desc_s.ConsumeValueOrDie());
+      }
+    }
 
     auto input_desc_s = executor->createRnnSequenceTensorDescriptor(
         input_shape.dim_size(0), input_shape.dim_size(1),
@@ -753,21 +847,30 @@ class CudnnRNNForwardOp<GPUDevice, T> : public CudnnRNNKernelCommon {
     // Creates a memory callback for the workspace. The memory lives to the end
     // of this kernel calls.
     CudnnRNNWorkspaceAllocator workspace_allocator(context);
-    bool launch_status =
-        stream
-            ->ThenRnnForward(
-                *rnn_desc, *input_desc, input_data, *hidden_state_desc,
-                input_h_data, *hidden_state_desc, input_c_data, params_data,
-                *output_desc, &output_data, *hidden_state_desc, &output_h_data,
-                *hidden_state_desc, &output_c_data, is_training_,
-                &reserve_space_allocator, &workspace_allocator)
-            .ok();
+    bool launch_status = false;
+    {
+      mutex_lock l(mu_);
+      launch_status =
+          stream
+              ->ThenRnnForward(
+                  *rnn_desc_, *input_desc, input_data, *hidden_state_desc,
+                  input_h_data, *hidden_state_desc, input_c_data, params_data,
+                  *output_desc, &output_data, *hidden_state_desc,
+                  &output_h_data, *hidden_state_desc, &output_c_data,
+                  is_training_, &reserve_space_allocator, &workspace_allocator)
+              .ok();
+    }
     OP_REQUIRES(context, launch_status,
                 errors::Internal("Failed to call ThenRnnForward"));
   }
 
  private:
+  mutex mu_;
   bool is_training_;
+  std::unique_ptr<CudnnModelShapes> model_shapes_ GUARDED_BY(mu_);
+  std::unique_ptr<RnnDescriptor> rnn_desc_ GUARDED_BY(mu_);
+  std::unique_ptr<CudnnRNNPersistentSpaceAllocator> dropout_state_allocator_
+      GUARDED_BY(mu_);
 };
 
 REGISTER_KERNEL_BUILDER(
@@ -808,9 +911,9 @@ class CudnnRNNBackwardOp<GPUDevice, T> : public CudnnRNNKernelCommon {
     const Tensor* output_h = nullptr;
     OP_REQUIRES_OK(context, context->input("output_h", &output_h));
     OP_REQUIRES(context, output_h->shape() == hidden_state_shape,
-                errors::InvalidArgument("Invalid output_h shape: ",
-                                        output_h->shape().DebugString(), " ",
-                                        hidden_state_shape.DebugString()));
+                errors::InvalidArgument(
+                    "Invalid output_h shape: ", output_h->shape().DebugString(),
+                    " ", hidden_state_shape.DebugString()));
     const Tensor* output_c = nullptr;
     if (HasInputC()) {
       // Only LSTM uses input_c and output_c. So for all other models, we only
@@ -881,15 +984,32 @@ class CudnnRNNBackwardOp<GPUDevice, T> : public CudnnRNNKernelCommon {
     OP_REQUIRES_OK(context,
                    ToRNNInputMode(rnn_input_mode(), model_shapes.num_units,
                                   model_shapes.input_size, &input_mode));
-    // TODO(zhengxq): add dropout support.
     // TODO(zhengxq): cache the descriptor so we don't have to create them all
     // the time.
-    auto rnn_desc_s = executor->createRnnDescriptor(
-        model_shapes.num_layers, model_shapes.num_units,
-        model_shapes.input_size, input_mode, rnn_direction_mode(), rnn_mode(),
-        data_type, 0.f /*dropout*/, 0 /*seed*/, nullptr /*state_allocator*/);
-    OP_REQUIRES_OK(context, FromExecutorStatus(rnn_desc_s));
-    auto rnn_desc = rnn_desc_s.ConsumeValueOrDie();
+    {
+      mutex_lock l(mu_);
+      if (model_shapes_ == nullptr) {
+        model_shapes_.reset(new CudnnModelShapes(model_shapes));
+      } else {
+        OP_REQUIRES(context, model_shapes_->IsCompatibleWith(model_shapes),
+                    errors::InvalidArgument(
+                        "Incompatible rnn model shapes inferred: expecting ",
+                        model_shapes_->RnnDescDebugString(), ", getting ",
+                        model_shapes.RnnDescDebugString(), "."));
+      }
+
+      if (rnn_desc_ == nullptr || ResetRndGenState()) {
+        dropout_state_allocator_.reset(
+            new CudnnRNNPersistentSpaceAllocator(context));
+        auto rnn_desc_s = executor->createRnnDescriptor(
+            model_shapes.num_layers, model_shapes.num_units,
+            model_shapes.input_size, input_mode, rnn_direction_mode(),
+            rnn_mode(), data_type, dropout(), seed(),
+            dropout_state_allocator_.get());
+        OP_REQUIRES_OK(context, FromExecutorStatus(rnn_desc_s));
+        rnn_desc_ = std::move(rnn_desc_s.ConsumeValueOrDie());
+      }
+    }
 
     auto input_desc_s = executor->createRnnSequenceTensorDescriptor(
         input_shape.dim_size(0), input_shape.dim_size(1),
@@ -939,21 +1059,32 @@ class CudnnRNNBackwardOp<GPUDevice, T> : public CudnnRNNKernelCommon {
     // Creates a memory callback for the workspace. The memory lives to the end
     // of this kernel calls.
     CudnnRNNWorkspaceAllocator workspace_allocator(context);
-    bool launch_status =
-        stream
-            ->ThenRnnBackward(
-                *rnn_desc, *input_desc, input_data, *hidden_state_desc,
-                input_h_data, *hidden_state_desc, input_c_data, params_data,
-                *output_desc, output_data, *hidden_state_desc, output_h_data,
-                *hidden_state_desc, output_c_data, output_backprop_data,
-                output_h_backprop_data, output_c_backprop_data,
-                &input_backprop_data, &input_h_backprop_data,
-                &input_c_backprop_data, &params_backprop_data,
-                &reserve_space_uint8, &workspace_allocator)
-            .ok();
+    bool launch_status = false;
+    {
+      mutex_lock l(mu_);
+      launch_status =
+          stream
+              ->ThenRnnBackward(
+                  *rnn_desc_, *input_desc, input_data, *hidden_state_desc,
+                  input_h_data, *hidden_state_desc, input_c_data, params_data,
+                  *output_desc, output_data, *hidden_state_desc, output_h_data,
+                  *hidden_state_desc, output_c_data, output_backprop_data,
+                  output_h_backprop_data, output_c_backprop_data,
+                  &input_backprop_data, &input_h_backprop_data,
+                  &input_c_backprop_data, &params_backprop_data,
+                  &reserve_space_uint8, &workspace_allocator)
+              .ok();
+    }
     OP_REQUIRES(context, launch_status,
                 errors::Internal("Failed to call ThenRnnBackward"));
   }
+
+ private:
+  mutex mu_;
+  std::unique_ptr<CudnnModelShapes> model_shapes_ GUARDED_BY(mu_);
+  std::unique_ptr<RnnDescriptor> rnn_desc_ GUARDED_BY(mu_);
+  std::unique_ptr<CudnnRNNPersistentSpaceAllocator> dropout_state_allocator_
+      GUARDED_BY(mu_);
 };
 
 REGISTER_KERNEL_BUILDER(
diff --git a/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc b/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc
index 58025f7b1a..a5cf8b8c18 100644
--- a/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc
+++ b/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc
@@ -35,6 +35,9 @@ input_mode: Indicate whether there is a linear projection between the input and
     input_size == num_units; otherwise, it implies 'linear_input'.
 direction: Indicates whether a bidirectional model will be used.
     dir = (direction == bidirectional) ? 2 : 1
+dropout: dropout probability. When set to 0., dropout is disabled.
+seed: the 1st part of a seed to initialize dropout.
+seed2: the 2nd part of a seed to initialize dropout.
 )doc";
 
 constexpr auto kCudnnRNNParamsBuffer = R"doc(
@@ -77,6 +80,9 @@ REGISTER_OP("CudnnRNNParamsSize")
     .Attr(kRNNModeAttrs)
     .Attr(kRNNInputModeAttrs)
     .Attr(kRNNDirectionAttrs)
+    .Attr("dropout: float = 0.0")
+    .Attr("seed: int = 0")
+    .Attr("seed2: int = 0")
     .Output("params_size: S")
     .SetShapeFn([](InferenceContext* c) {
       c->set_output(0, c->Vector(1));
@@ -119,6 +125,7 @@ REGISTER_OP("CudnnRNN")
     .Input("input_h: T")
     .Input("input_c: T")
     .Input("params: T")
+    .SetIsStateful()
     .Output("output: T")
     .Output("output_h: T")
     .Output("output_c: T")
@@ -127,7 +134,7 @@ REGISTER_OP("CudnnRNN")
     .Attr(kRNNModeAttrs)
     .Attr(kRNNInputModeAttrs)
     .Attr(kRNNDirectionAttrs)
-    .Attr("dropout: float")
+    .Attr("dropout: float = 0.0")
     .Attr("seed: int = 0")
     .Attr("seed2: int = 0")
     .Attr("is_training: bool = true")
@@ -158,7 +165,8 @@ REGISTER_OP("CudnnRNN")
 Computes the RNN from the input and initial states, with respect to the params
 buffer.
 )doc",
-                         kCudnnRNNCommonAttrs, CudnnRNNForwardTensors(), R"doc(
+                         kCudnnRNNCommonAttrs, CudnnRNNForwardTensors(),
+                         R"doc(
 is_training: Indicates whether this operation is used for inferenece or
     training.
 reserve_space: an opaque tensor that can be used in backprop calculation. It
@@ -185,6 +193,9 @@ REGISTER_OP("CudnnRNNBackprop")
     .Attr(kRNNModeAttrs)
     .Attr(kRNNInputModeAttrs)
     .Attr(kRNNDirectionAttrs)
+    .Attr("dropout: float = 0.0")
+    .Attr("seed: int = 0")
+    .Attr("seed2: int = 0")
     .SetShapeFn([](InferenceContext* c) {
       auto input_shape = c->input(0);
       auto input_h_shape = c->input(1);
@@ -199,7 +210,8 @@ REGISTER_OP("CudnnRNNBackprop")
     .Doc(strings::StrCat(R"doc(
 Compute the backprop of both data and weights in a RNN.
 )doc",
-                         kCudnnRNNCommonAttrs, CudnnRNNForwardTensors(), R"doc(
+                         kCudnnRNNCommonAttrs, CudnnRNNForwardTensors(),
+                         R"doc(
 output_backprop: A 3-D tensor with the same shape as output in the forward pass.
 output_h_backprop: A 3-D tensor with the same shape as output_h in the forward
     pass.
@@ -228,6 +240,9 @@ REGISTER_OP("CudnnRNNParamsToCanonical")
     .Attr(kRNNModeAttrs)
     .Attr(kRNNInputModeAttrs)
     .Attr(kRNNDirectionAttrs)
+    .Attr("dropout: float = 0.0")
+    .Attr("seed: int = 0")
+    .Attr("seed2: int = 0")
     .SetShapeFn([](InferenceContext* c) {
       ShapeHandle unused;
       TF_RETURN_IF_ERROR(c->WithRank(c->input(3), 1, &unused));
@@ -268,6 +283,9 @@ REGISTER_OP("CudnnRNNCanonicalToParams")
     .Attr(kRNNModeAttrs)
     .Attr(kRNNInputModeAttrs)
     .Attr(kRNNDirectionAttrs)
+    .Attr("dropout: float = 0.0")
+    .Attr("seed: int = 0")
+    .Attr("seed2: int = 0")
     .SetShapeFn([](InferenceContext* c) {
       c->set_output(0, c->Vector(InferenceContext::kUnknownDim));
       return Status::OK();
@@ -281,7 +299,6 @@ upcoming training or inferences.
 num_params: number of parameter sets for all layers.
     Each layer may contain multiple parameter sets, with each set consisting of
     a weight matrix and a bias vector.
-)doc",
-                         kCudnnRNNCommonAttrs));
+)doc", kCudnnRNNCommonAttrs));
 
 }  // namespace tensorflow
diff --git a/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py b/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
index b6047c531c..559878ce96 100644
--- a/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
+++ b/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
@@ -38,15 +38,24 @@ from tensorflow.python.training import saver as saver_lib
 
 class CudnnRNNTest(TensorFlowTestCase):
 
-  def _CreateModel(self, rnn_mode, num_layers, num_units, input_size):
+  def _CreateModel(self,
+                   rnn_mode,
+                   num_layers,
+                   num_units,
+                   input_size,
+                   dropout=0.):
     if rnn_mode == "lstm":
-      model = cudnn_rnn_ops.CudnnLSTM(num_layers, num_units, input_size)
+      model = cudnn_rnn_ops.CudnnLSTM(
+          num_layers, num_units, input_size, dropout=dropout)
     elif rnn_mode == "gru":
-      model = cudnn_rnn_ops.CudnnGRU(num_layers, num_units, input_size)
+      model = cudnn_rnn_ops.CudnnGRU(
+          num_layers, num_units, input_size, dropout=dropout)
     elif rnn_mode == "rnn_tanh":
-      model = cudnn_rnn_ops.CudnnRNNTanh(num_layers, num_units, input_size)
+      model = cudnn_rnn_ops.CudnnRNNTanh(
+          num_layers, num_units, input_size, dropout=dropout)
     elif rnn_mode == "rnn_relu":
-      model = cudnn_rnn_ops.CudnnRNNRelu(num_layers, num_units, input_size)
+      model = cudnn_rnn_ops.CudnnRNNRelu(
+          num_layers, num_units, input_size, dropout=dropout)
     else:
       raise ValueError("Invalid rnn_mode: %s" % rnn_mode)
     return model
@@ -174,9 +183,11 @@ class CudnnRNNTest(TensorFlowTestCase):
         self._testOneLSTMParamsSize(num_layers, num_units, input_size)
 
   def _testOneSimpleInference(self, rnn_mode, num_layers, num_units, input_size,
-                              batch_size, seq_length, dir_count, expected,
-                              tolerance):
-    model = self._CreateModel(rnn_mode, num_layers, num_units, input_size)
+                              batch_size, seq_length, dir_count, dropout,
+                              expected, tolerance):
+    random_seed.set_random_seed(5678)
+    model = self._CreateModel(rnn_mode, num_layers, num_units, input_size,
+                              dropout)
     has_input_c = (rnn_mode == "lstm")
     params_size_t = model.params_size()
     input_data = array_ops.ones([seq_length, batch_size, input_size])
@@ -206,18 +217,24 @@ class CudnnRNNTest(TensorFlowTestCase):
     with self.test_session(use_gpu=True) as sess:
       sess.run(variables.global_variables_initializer())
       total_sum_v = sess.run([total_sum])
+
       self.assertAllClose(
           total_sum_v[0], expected, atol=tolerance, rtol=tolerance)
 
   @unittest.skipUnless(test.is_built_with_cuda(),
                        "Test only applicable when running on GPUs")
   def testSimpleInference(self):
+    # Cudnn scales result for dropout during training, therefore dropout has no
+    # impact for inference results.
+    # (lstm, gru, rnn_tanh are saturated in the test. rnn_relu case is most
+    # demonstrative of the dropout-invariant nature of CudnnRnn.)
     test_configs = [
-        [
-            "lstm",
-            231833.22,
-            1e-2,
-            {
+        {
+            "rnn_mode": "lstm",
+            "dropout": [0., 0.5, 1.],
+            "expected": 231833.22,
+            "tolerance": 1e-2,
+            "shape": {
                 "num_layers": 4,
                 "num_units": 200,
                 "input_size": 200,
@@ -225,12 +242,13 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 10,
                 "dir_count": 1,
             },
-        ],
-        [
-            "gru",
-            56000,
-            1e-2,
-            {
+        },
+        {
+            "rnn_mode": "gru",
+            "dropout": [0., 0.5, 1.],
+            "expected": 56000,
+            "tolerance": 1e-2,
+            "shape": {
                 "num_layers": 4,
                 "num_units": 200,
                 "input_size": 200,
@@ -238,12 +256,13 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 10,
                 "dir_count": 1,
             },
-        ],
-        [
-            "rnn_tanh",
-            56000,
-            1e-2,
-            {
+        },
+        {
+            "rnn_mode": "rnn_tanh",
+            "dropout": [0., 0.5, 1.],
+            "expected": 56000,
+            "tolerance": 1e-2,
+            "shape": {
                 "num_layers": 4,
                 "num_units": 200,
                 "input_size": 200,
@@ -251,12 +270,13 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 10,
                 "dir_count": 1,
             },
-        ],
-        [
-            "rnn_relu",
-            130688,
-            1e-2,
-            {
+        },
+        {
+            "rnn_mode": "rnn_relu",
+            "dropout": [0., 0.5, 1.],
+            "expected": 130688,
+            "tolerance": 1e-2,
+            "shape": {
                 "num_layers": 2,
                 "num_units": 8,
                 "input_size": 4,
@@ -264,24 +284,32 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 2,
                 "dir_count": 1,
             },
-        ],
+        },
     ]
     with ops.Graph().as_default():
       for config in test_configs:
-        rnn_mode = config[0]
-        expected = config[1]
-        tolerance = config[2]
-        shapes = config[3]
-        self._testOneSimpleInference(rnn_mode, shapes["num_layers"],
-                                     shapes["num_units"], shapes["input_size"],
-                                     shapes["batch_size"], shapes["seq_length"],
-                                     shapes["dir_count"], expected, tolerance)
+        rnn_mode = config["rnn_mode"]
+        dropout_list = config.get("dropout", [0.])
+        expected = config["expected"]
+        tolerance = config["tolerance"]
+        shape = config["shape"]
+        for dropout in dropout_list:
+          self._testOneSimpleInference(
+              rnn_mode, shape["num_layers"], shape["num_units"],
+              shape["input_size"], shape["batch_size"], shape["seq_length"],
+              shape["dir_count"], dropout, expected, tolerance)
 
   def _testOneSimpleTraining(self, rnn_mode, num_layers, num_units, input_size,
-                             batch_size, seq_length, dir_count, tolerance):
+                             batch_size, seq_length, dir_count, dropout,
+                             tolerance):
+    # Gradient checking runs two forward ops with almost the same input. Need to
+    # make sure the drop patterns across the two runs are the same.
+    old_env_state = os.environ.get("TF_CUDNN_RESET_RND_GEN_STATE", str(False))
+    os.environ["TF_CUDNN_RESET_RND_GEN_STATE"] = str(True)
     has_input_c = (rnn_mode == "lstm")
     random_seed.set_random_seed(1234)
-    model = self._CreateModel(rnn_mode, num_layers, num_units, input_size)
+    model = self._CreateModel(rnn_mode, num_layers, num_units, input_size,
+                              dropout)
     params_size_t = model.params_size()
     input_data = variables.Variable(
         random_ops.random_uniform([seq_length, batch_size, input_size]))
@@ -294,6 +322,7 @@ class CudnnRNNTest(TensorFlowTestCase):
       input_c = variables.Variable(
           random_ops.random_uniform(
               [num_layers * dir_count, batch_size, num_units]))
+
       output, output_h, output_c = model(
           input_data=input_data,
           input_h=input_h,
@@ -322,18 +351,22 @@ class CudnnRNNTest(TensorFlowTestCase):
       sess.run(variables.global_variables_initializer())
       all_inputs = [entry[0] for entry in inputs_and_shapes]
       all_shapes = [entry[1] for entry in inputs_and_shapes]
+
       err = gradient_checker.compute_gradient_error(all_inputs, all_shapes,
                                                     total_sum, [1])
+
       self.assertLess(err, tolerance)
+      os.environ["TF_CUDNN_RESET_RND_GEN_STATE"] = old_env_state
 
   @unittest.skipUnless(test.is_built_with_cuda(),
                        "Test only applicable when running on GPUs")
   def testSimpleTraining(self):
     test_configs = [
-        [
-            "lstm",
-            1e-2,
-            {
+        {
+            "rnn_mode": "lstm",
+            "dropout": [0., 0.5, 1.],
+            "tolerance": 1e-2,
+            "shape": {
                 "num_layers": 2,
                 "num_units": 3,
                 "input_size": 4,
@@ -341,11 +374,12 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 4,
                 "dir_count": 1,
             },
-        ],
-        [
-            "gru",
-            4e-3,
-            {
+        },
+        {
+            "rnn_mode": "gru",
+            "dropout": [0., 0.5, 1.],
+            "tolerance": 4e-3,
+            "shape": {
                 "num_layers": 2,
                 "num_units": 3,
                 "input_size": 4,
@@ -353,11 +387,12 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 4,
                 "dir_count": 1,
             },
-        ],
-        [
-            "rnn_tanh",
-            5e-3,
-            {
+        },
+        {
+            "rnn_mode": "rnn_tanh",
+            "dropout": [0., 0.5, 1.],
+            "tolerance": 5e-3,
+            "shape": {
                 "num_layers": 2,
                 "num_units": 3,
                 "input_size": 4,
@@ -365,11 +400,12 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 4,
                 "dir_count": 1,
             },
-        ],
-        [
-            "rnn_relu",
-            3e-1,
-            {
+        },
+        {
+            "rnn_mode": "rnn_relu",
+            "dropout": [0., 0.5, 1.],
+            "tolerance": 4e-1,
+            "shape": {
                 "num_layers": 2,
                 "num_units": 3,
                 "input_size": 4,
@@ -377,17 +413,19 @@ class CudnnRNNTest(TensorFlowTestCase):
                 "seq_length": 4,
                 "dir_count": 1,
             },
-        ],
+        },
     ]
     with ops.Graph().as_default():
       for config in test_configs:
-        rnn_mode = config[0]
-        tolerance = config[1]
-        shape = config[2]
-        self._testOneSimpleTraining(rnn_mode, shape["num_layers"],
-                                    shape["num_units"], shape["input_size"],
-                                    shape["batch_size"], shape["seq_length"],
-                                    shape["dir_count"], tolerance)
+        rnn_mode = config["rnn_mode"]
+        dropout_list = config.get("dropout", [0.])
+        tolerance = config["tolerance"]
+        shape = config["shape"]
+        for dropout in dropout_list:
+          self._testOneSimpleTraining(rnn_mode, shape["num_layers"],
+                                      shape["num_units"], shape["input_size"],
+                                      shape["batch_size"], shape["seq_length"],
+                                      shape["dir_count"], dropout, tolerance)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
index c23d4cd4e3..a97c955fcb 100644
--- a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
+++ b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
@@ -23,13 +23,13 @@ from tensorflow.contrib.util import loader
 from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import random_seed
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.platform import resource_loader
 from tensorflow.python.training import saver
 
-
 _cudnn_rnn_ops_so = loader.load_op_library(
     resource_loader.get_path_to_datafile("_cudnn_rnn_ops.so"))
 
@@ -110,12 +110,12 @@ class RNNParamsSaveable(saver.BaseSaverBuilder.SaveableObject):
     if not isinstance(params, tuple):
       params = (params,)
     assign_ops = [
-        state_ops.assign(
-            variable, param, validate_shape=False)
+        state_ops.assign(variable, param, validate_shape=False)
         for variable, param in zip(self._variables, params)
     ]
     return control_flow_ops.group(*assign_ops)
 
+
 _cudnn_rnn_common_doc_string = """
   Cudnn RNN has an opaque parameter buffer that can be used for inference and
   training. But it is possible that the layout of the parameter buffers
@@ -163,8 +163,7 @@ class _CudnnRNN(object):
                input_mode="auto_select",
                direction="unidirectional",
                dropout=0.,
-               seed=0,
-               seed2=0):
+               seed=0):
     """Creates a CudnnRNN model from model spec.
 
     Args:
@@ -183,8 +182,8 @@ class _CudnnRNN(object):
       direction: the direction model that the model operates. Could be either
           'unidirectional' or 'bidirectional'
       dropout: whether to enable dropout. With it is 0, dropout is disabled.
-      seed: the first part of a seed that is used to initialize dropout.
-      seed2: the second part of a seed that is used to initialize dropout.
+      seed: the op seed used for initializing dropout. See @{tf.set_random_seed}
+          for behavior.
     """
     self._num_layers = num_layers
     self._num_units = num_units
@@ -193,8 +192,10 @@ class _CudnnRNN(object):
     self._input_mode = input_mode
     self._direction = direction
     self._dropout = dropout
-    self._seed = seed
-    self._seed2 = seed2
+    # get graph and op seed.
+    self._seed, self._seed2 = random_seed.get_seed(seed)
+    if self._seed is None and self._seed2 is None:
+      self._seed, self._seed2 = 0, 0
 
   def params_size(self):
     """Calculates the size of the opaque parameter buffer needed for this model.
@@ -208,6 +209,9 @@ class _CudnnRNN(object):
         input_size=self._input_size,
         T=dtypes.float32,
         S=dtypes.int32,
+        dropout=self._dropout,
+        seed=self._seed,
+        seed2=self._seed2,
         rnn_mode=self._rnn_mode,
         input_mode=self._input_mode,
         direction=self._direction)[0]
@@ -258,6 +262,9 @@ class _CudnnRNN(object):
         num_units=self._num_units,
         input_size=self._input_size,
         params=params,
+        dropout=self._dropout,
+        seed=self._seed,
+        seed2=self._seed2,
         num_params=self._num_layers * self._NUM_PARAMS_PER_LAYER,
         rnn_mode=self._rnn_mode,
         input_mode=self._input_mode,
@@ -280,6 +287,9 @@ class _CudnnRNN(object):
         input_size=self._input_size,
         weights=weights,
         biases=biases,
+        dropout=self._dropout,
+        seed=self._seed,
+        seed2=self._seed2,
         rnn_mode=self._rnn_mode,
         input_mode=self._input_mode,
         direction=self._direction)
@@ -299,8 +309,7 @@ class CudnnLSTM(_CudnnRNN):
                input_mode="auto_select",
                direction="unidirectional",
                dropout=0.,
-               seed=0,
-               seed2=0):
+               seed=0):
     """Creates a Cudnn LSTM model from model spec.
 
     Args:
@@ -317,8 +326,7 @@ class CudnnLSTM(_CudnnRNN):
       direction: the direction model that the model operates. Could be either
           'unidirectional' or 'bidirectional'
       dropout: whether to enable dropout. With it is 0, dropout is disabled.
-      seed: the first part of a seed that is used to initialize dropout.
-      seed2: the second part of a seed that is used to initialize dropout.
+      seed: the seed used for initializing dropout.
     """
     super(CudnnLSTM, self).__init__(
         "lstm",
@@ -328,8 +336,7 @@ class CudnnLSTM(_CudnnRNN):
         input_mode=input_mode,
         direction=direction,
         dropout=dropout,
-        seed=seed,
-        seed2=seed2)
+        seed=seed)
 
   def __call__(self, input_data, input_h, input_c, params, is_training=True):
     """Runs the forward step for the Cudnn LSTM model.
@@ -346,11 +353,8 @@ class CudnnLSTM(_CudnnRNN):
       output_h: the final state for h.
       output_c: the final state for c.
     """
-    output, output_h, output_c = super(CudnnLSTM, self).__call__(input_data,
-                                                                 input_h,
-                                                                 input_c,
-                                                                 params,
-                                                                 is_training)
+    output, output_h, output_c = super(CudnnLSTM, self).__call__(
+        input_data, input_h, input_c, params, is_training=is_training)
     return (output, output_h, output_c)
 
 
@@ -365,8 +369,7 @@ class _CudnnRNNNoInputC(_CudnnRNN):
                input_mode="auto_select",
                direction="unidirectional",
                dropout=0.,
-               seed=0,
-               seed2=0):
+               seed=0):
     """Creates a Cudnn RNN model from model without hidden-state C.
 
     Args:
@@ -383,8 +386,7 @@ class _CudnnRNNNoInputC(_CudnnRNN):
       direction: the direction model that the model operates. Could be either
           'unidirectional' or 'bidirectional'
       dropout: whether to enable dropout. With it is 0, dropout is disabled.
-      seed: the first part of a seed that is used to initialize dropout.
-      seed2: the second part of a seed that is used to initialize dropout.
+      seed: the seed used for initializing dropout.
     """
     super(_CudnnRNNNoInputC, self).__init__(
         self._rnn_mode,
@@ -394,8 +396,7 @@ class _CudnnRNNNoInputC(_CudnnRNN):
         input_mode=input_mode,
         direction=direction,
         dropout=dropout,
-        seed=seed,
-        seed2=seed2)
+        seed=seed)
 
   def __call__(self, input_data, input_h, params, is_training=True):
     """Runs the forward step for the Cudnn LSTM model.
@@ -459,6 +460,9 @@ def _cudnn_rnn_backward(op, *grad):
       output_h_backprop=grad[1],
       output_c_backprop=grad[2],
       reserve_space=op.outputs[3],
+      dropout=op.get_attr("dropout"),
+      seed=op.get_attr("seed"),
+      seed2=op.get_attr("seed2"),
       rnn_mode=op.get_attr("rnn_mode"),
       input_mode=op.get_attr("input_mode"),
       direction=op.get_attr("direction"))
-- 
GitLab


From c212ec406de35da0184b63eadf92fa82797133f6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 17:00:34 -0800
Subject: [PATCH 1069/1563] Clarify and expand comments on xla::GlobalData.  In
 particular, this adjusts the class-level comment to explain terms useful for
 someone who would use the class. Change: 155261668

---
 tensorflow/compiler/xla/client/global_data.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/client/global_data.h b/tensorflow/compiler/xla/client/global_data.h
index eb11d91034..b7929357d0 100644
--- a/tensorflow/compiler/xla/client/global_data.h
+++ b/tensorflow/compiler/xla/client/global_data.h
@@ -23,13 +23,15 @@ limitations under the License.
 
 namespace xla {
 
-// Wraps a GlobalDataHandle with a lifetime.
+// A GlobalData object represents a globally-accessible allocation of
+// data in the associated XLA service.
 class GlobalData {
  public:
   // Gives ownership of the global data handle to this object.
   GlobalData(ServiceInterface* parent, GlobalDataHandle handle);
 
-  // Unregisters the wrapped handle.
+  // Unregisters the wrapped handle, which causes the service to
+  // deallocate the associated data.
   ~GlobalData();
 
   const GlobalDataHandle& handle() const { return handle_; }
-- 
GitLab


From 6fca7d103745084480e8c909d539f17f78b0ab6f Mon Sep 17 00:00:00 2001
From: Oleksii Kuchaiev <okuchaiev@users.noreply.github.com>
Date: Fri, 5 May 2017 18:32:13 -0700
Subject: [PATCH 1070/1563] Making sure GLSTMCell is visible through
 tf.contrib.rnn.GLSTMCell (#9704)

* Making sure GLSTMCell is visible through tf.contrib.rnn.GLSTMCell

* GLSTM: better way to infer batch size
---
 tensorflow/contrib/rnn/__init__.py            | 1 +
 tensorflow/contrib/rnn/python/ops/rnn_cell.py | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tensorflow/contrib/rnn/__init__.py b/tensorflow/contrib/rnn/__init__.py
index d2f9cde4f6..2420c3e179 100644
--- a/tensorflow/contrib/rnn/__init__.py
+++ b/tensorflow/contrib/rnn/__init__.py
@@ -46,6 +46,7 @@ See @{$python/contrib.rnn} guide.
 @@IntersectionRNNCell
 @@PhasedLSTMCell
 @@HighwayWrapper
+@@GLSTMCell
 
 ### RNNCell wrappers
 @@AttentionCellWrapper
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index 9672b8b85f..7a0f894404 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -2008,10 +2008,9 @@ class GLSTMCell(core_rnn_cell.RNNCell):
       subset of inputs corresponding to group "group_id",
       a Tensor, 2D, [batch x num_units/number_of_groups]
     """
-    batch_size = inputs.shape[0].value or array_ops.shape(value)[0]
     return array_ops.slice(input_=inputs,
                            begin=[0, group_id * group_size],
-                           size=[batch_size, group_size],
+                           size=[self._batch_size, group_size],
                            name=("GLSTM_group%d_input_generation" % group_id))
 
   def call(self, inputs, state):
@@ -2039,9 +2038,7 @@ class GLSTMCell(core_rnn_cell.RNNCell):
     """
     (c_prev, m_prev) = state
 
-    input_size = inputs.get_shape().with_rank(2)[1]
-    if input_size.value is None:
-      raise ValueError("Couldn't infer input size from inputs.get_shape()[-1]")
+    self._batch_size = inputs.shape[0].value or array_ops.shape(inputs)[0]
     dtype = inputs.dtype
     scope = vs.get_variable_scope()
     with vs.variable_scope(scope, initializer=self._initializer):
-- 
GitLab


From 51ad1440bb14469daa354e206019ef4d574247f4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 17:27:51 -0800
Subject: [PATCH 1071/1563] Add a Drop Stale Gradient optimizer. Change:
 155263356

---
 tensorflow/contrib/opt/BUILD                  |  18 ++
 tensorflow/contrib/opt/__init__.py            |   4 +-
 .../training/drop_stale_gradient_optimizer.py | 112 +++++++
 .../drop_stale_gradient_optimizer_test.py     | 297 ++++++++++++++++++
 4 files changed, 430 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py
 create mode 100644 tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py

diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index 2173e13b91..2a8714644c 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -8,11 +8,13 @@ exports_files(["LICENSE"])
 package(default_visibility = ["//tensorflow:__subpackages__"])
 
 load("//tensorflow:tensorflow.bzl", "py_test")
+load("//tensorflow:tensorflow.bzl", "tf_py_test")
 
 py_library(
     name = "opt_py",
     srcs = [
         "__init__.py",
+        "python/training/drop_stale_gradient_optimizer.py",
         "python/training/external_optimizer.py",
         "python/training/lazy_adam_optimizer.py",
         "python/training/moving_average_optimizer.py",
@@ -104,6 +106,22 @@ py_test(
     ],
 )
 
+tf_py_test(
+    name = "drop_stale_gradient_optimizer_test",
+    srcs = ["python/training/drop_stale_gradient_optimizer_test.py"],
+    additional_deps = [
+        ":opt_py",
+        "//third_party/py/numpy",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:training",
+        "//tensorflow/python:variables",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/contrib/opt/__init__.py b/tensorflow/contrib/opt/__init__.py
index f88976a438..6cd68f29a7 100644
--- a/tensorflow/contrib/opt/__init__.py
+++ b/tensorflow/contrib/opt/__init__.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 # pylint: disable=wildcard-import
+from tensorflow.contrib.opt.python.training.drop_stale_gradient_optimizer import *
 from tensorflow.contrib.opt.python.training.external_optimizer import *
 from tensorflow.contrib.opt.python.training.lazy_adam_optimizer import *
 from tensorflow.contrib.opt.python.training.moving_average_optimizer import *
@@ -27,7 +28,8 @@ from tensorflow.contrib.opt.python.training.variable_clipping_optimizer import *
 
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = ['ExternalOptimizerInterface',
+_allowed_symbols = ['DropStaleGradientOptimizer',
+                    'ExternalOptimizerInterface',
                     'LazyAdamOptimizer',
                     'MovingAverageOptimizer',
                     'ScipyOptimizerInterface',
diff --git a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py
new file mode 100644
index 0000000000..586991a4b3
--- /dev/null
+++ b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py
@@ -0,0 +1,112 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""Wrapper optimizer for checking and dropping stale gradients."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import gen_array_ops
+from tensorflow.python.ops import gen_math_ops
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.summary import summary
+from tensorflow.python.training import optimizer
+from tensorflow.python.training import training_util
+
+
+class DropStaleGradientOptimizer(optimizer.Optimizer):
+  """Wrapper optimizer that checks and drops stale gradient.
+
+  This optimizer records the global step for each worker before computing
+  gradients and compares it with the global step at the time of applying the
+  gradients. If the difference is larger than a threshold, it will drop all
+  the computed gradients.
+  """
+
+  def __init__(self,
+               opt,
+               staleness,
+               use_locking=False,
+               name="DropStaleGradient"):
+    """Constructs a new DropStaleGradientOptimizer.
+
+    Args:
+      opt: The actual optimizer that will be used to compute and apply the
+           gradients. Must be one of the Optimizer classes.
+      staleness: The maximum staleness allowed for the optimizer.
+      use_locking: If `True` use locks for clip update operations.
+      name: Optional name prefix for the operations created when applying
+            gradients. Defaults to "DropStaleGradient".
+    """
+    super(DropStaleGradientOptimizer, self).__init__(use_locking, name)
+    self._opt = opt
+    self._staleness = staleness
+
+  def compute_gradients(self, loss, *args, **kwargs):
+    # Record current global step for worker.
+    with ops.colocate_with(loss):
+      self._local_step = training_util.get_global_step() + 0
+
+    with ops.control_dependencies([self._local_step]):
+      loss = gen_array_ops.identity(loss)
+      return self._opt.compute_gradients(loss, *args, **kwargs)
+
+  def get_slot(self, *args, **kwargs):
+    return self._opt.get_slot(*args, **kwargs)
+
+  def get_slot_names(self, *args, **kwargs):
+    return self._opt.get_slot_names(*args, **kwargs)
+
+  def apply_gradients(self, grads_and_vars, global_step=None, name=None):
+    gradients = []
+    # Number of stale gradients.
+    stale_counter = variable_scope.get_variable(
+        "stale_counter", [],
+        initializer=init_ops.zeros_initializer(),
+        trainable=False)
+
+    def _AcceptGradientOp():
+      with ops.control_dependencies(
+          [self._opt.apply_gradients(
+              grads_and_vars, global_step=global_step, name=name)]):
+        return gen_array_ops.identity(0.0)
+
+    def _DropGradientOp():
+      return gen_array_ops.identity(1.0)
+
+    for grad_and_var in grads_and_vars:
+      grad = grad_and_var[0]
+      if isinstance(grad, ops.Tensor):
+        gradients.append(grad)
+      else:
+        gradients.append(grad.op)
+
+    with ops.control_dependencies(gradients), ops.colocate_with(global_step):
+      staleness = gen_array_ops.reshape(
+          global_step - self._local_step, shape=())
+      conditional_update = stale_counter.assign_add(control_flow_ops.cond(
+          gen_math_ops.less_equal(staleness, self._staleness),
+          _AcceptGradientOp, _DropGradientOp))
+
+    summary.scalar(
+        "Gradient staleness percentage",
+        stale_counter / (math_ops.cast(global_step + 1, dtypes.float32)))
+    return conditional_update
diff --git a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
new file mode 100644
index 0000000000..4f0bc0ce2f
--- /dev/null
+++ b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
@@ -0,0 +1,297 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for DropStaleGradientOptimizer."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import portpicker
+
+from tensorflow.contrib.opt.python.training import drop_stale_gradient_optimizer
+from tensorflow.python.client import session
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+from tensorflow.python.training import gradient_descent
+from tensorflow.python.training import server_lib
+from tensorflow.python.training import training_util
+
+
+# Creates the workers and return their sessions, graphs, train_ops.
+def _get_workers(num_workers, staleness):
+  worker_ports = [portpicker.pick_unused_port() for _ in range(num_workers)]
+  cluster_dict = {
+      'worker': ['localhost:%s' % port for port in worker_ports],
+      'ps': ['localhost:%s' % portpicker.pick_unused_port()]
+  }
+  cs = server_lib.ClusterSpec(cluster_dict)
+  workers = [
+      server_lib.Server(
+          cs, job_name='worker', task_index=ix, start=True)
+      for ix in range(num_workers)
+  ]
+  server_lib.Server(cs, job_name='ps', task_index=0, start=True)
+
+  sessions = []
+  graphs = []
+  train_ops = []
+
+  # To simulate stale cases, maintaining two queues for computing and
+  # applying gradients respectively. In the phase of computing gradients,
+  # all workers except chief worker compute gradients together and chief worker
+  # computes after all other worers' computing finished. In the phase of
+  # applying gradients, chief worker will first apply gradients, then all other
+  # workers will apply gradients one by one. Therefore, the chief worker will
+  # always have 0 staleness, each of all other workers will have a unique
+  # staleness value from [1, num_workers).
+  for worker_id in range(num_workers):
+    graph = ops.Graph()
+    with graph.as_default():
+      global_step = training_util.create_global_step()
+      var_0 = variables.Variable(0.0, name='v0')
+      var_1 = variables.Variable(1.0, name='v1')
+      compute_gradients_queue = data_flow_ops.FIFOQueue(
+          -1, global_step.dtype.base_dtype, shapes=(),
+          name='compute_gradients_queue', shared_name='compute_gradients_queue')
+      apply_gradients_queue = data_flow_ops.FIFOQueue(
+          -1, global_step.dtype.base_dtype, shapes=(),
+          name='apply_gradients_queue', shared_name='apply_gradients_queue')
+
+      # Gradients for loss on var_0 and var_1 will be 1.0.
+      loss = 0 - var_0 - var_1
+      sgd_opt = gradient_descent.GradientDescentOptimizer(1.0)
+      stale_check_opt = (
+          drop_stale_gradient_optimizer.DropStaleGradientOptimizer(
+              sgd_opt, staleness))
+
+      # Compute gradients.
+      if worker_id == 0:
+        with ops.control_dependencies(
+            [compute_gradients_queue.dequeue_many(num_workers - 1)]):
+          grad_and_vars = stale_check_opt.compute_gradients(loss)
+      else:
+        grad_and_vars = stale_check_opt.compute_gradients(loss)
+        with ops.control_dependencies([t[0] for t in grad_and_vars]):
+          worker_enqueue_op = compute_gradients_queue.enqueue(global_step)
+
+      # Apply gradients.
+      if worker_id == 0:
+        with ops.control_dependencies(
+            [stale_check_opt.apply_gradients(grad_and_vars, global_step)]):
+          train_op = apply_gradients_queue.enqueue(global_step)
+      else:
+        with ops.control_dependencies([worker_enqueue_op]):
+          with ops.control_dependencies([apply_gradients_queue.dequeue()]):
+            with ops.control_dependencies(
+                [stale_check_opt.apply_gradients(
+                    grad_and_vars, global_step)]):
+              train_op = apply_gradients_queue.enqueue(global_step)
+
+      sess = session.Session(workers[worker_id].target)
+
+    sessions.append(sess)
+    graphs.append(graph)
+    train_ops.append(train_op)
+
+  return sessions, graphs, train_ops
+
+
+class DropStaleGradientOptimizerTest(test.TestCase):
+
+  def _run(self, train_op, sess):
+    sess.run(train_op)
+
+  def test1Worker(self):
+    num_workers = 1
+    sessions, graphs, train_ops = _get_workers(num_workers, 0)
+    with graphs[0].as_default():
+      sessions[0].run(variables.global_variables_initializer())
+    global_step = training_util.get_global_step(graphs[0])
+    var_0 = graphs[0].get_tensor_by_name('v0:0')
+    var_1 = graphs[0].get_tensor_by_name('v1:0')
+    stale_counter = graphs[0].get_tensor_by_name('stale_counter:0')
+    # Verify the initialized value.
+    self.assertAllEqual(0.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0, sessions[0].run(var_1))
+    self.assertAllEqual(0.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0, sessions[0].run(global_step))
+
+    sessions[0].run(train_ops[0])
+
+    # Verify the updated value after 1 step.
+    self.assertAllEqual(1, sessions[0].run(global_step))
+    self.assertAllEqual(0.0 + 1.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0 + 1.0, sessions[0].run(var_1))
+    self.assertAllEqual(1, sessions[0].run(global_step))
+
+  def test1WorkerNegativeStaleness(self):
+    num_workers = 1
+    sessions, graphs, train_ops = _get_workers(num_workers, -1)
+    with graphs[0].as_default():
+      sessions[0].run(variables.global_variables_initializer())
+    global_step = training_util.get_global_step(graphs[0])
+    var_0 = graphs[0].get_tensor_by_name('v0:0')
+    var_1 = graphs[0].get_tensor_by_name('v1:0')
+    stale_counter = graphs[0].get_tensor_by_name('stale_counter:0')
+    # Verify the initialized value.
+    self.assertAllEqual(0.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0, sessions[0].run(var_1))
+    self.assertAllEqual(0.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0, sessions[0].run(global_step))
+
+    sessions[0].run(train_ops[0])
+
+    # Verify no updates because max staleness is negative.
+    self.assertAllEqual(0, sessions[0].run(global_step))
+    self.assertAllEqual(1.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0, sessions[0].run(var_1))
+
+  def test2WorkersStaleness0(self):
+    num_workers = 2
+    sessions, graphs, train_ops = _get_workers(num_workers, 0)
+    with graphs[0].as_default():
+      sessions[0].run(variables.global_variables_initializer())
+    global_step = training_util.get_global_step(graphs[0])
+    var_0 = graphs[0].get_tensor_by_name('v0:0')
+    var_1 = graphs[0].get_tensor_by_name('v1:0')
+    stale_counter = graphs[0].get_tensor_by_name('stale_counter:0')
+    # Verify the initialized value.
+    self.assertAllEqual(0.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0, sessions[0].run(var_1))
+    self.assertAllEqual(0.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0, sessions[0].run(global_step))
+
+    thread_0 = self.checkedThread(
+        target=self._run, args=(train_ops[0], sessions[0]))
+    thread_1 = self.checkedThread(
+        target=self._run, args=(train_ops[1], sessions[1]))
+    thread_0.start()
+    thread_1.start()
+    thread_0.join()
+    thread_1.join()
+
+    # With 2 workers and max staleness set to 0, only cheif worker will update
+    # var_0 and var_1.
+    self.assertAllEqual(1, sessions[0].run(global_step))
+    self.assertAllEqual(1.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0.0 + 1.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0 + 1.0, sessions[0].run(var_1))
+
+  def test2WorkersStaleness1(self):
+    num_workers = 2
+    sessions, graphs, train_ops = _get_workers(num_workers, 1)
+    with graphs[0].as_default():
+      sessions[0].run(variables.global_variables_initializer())
+    global_step = training_util.get_global_step(graphs[0])
+    var_0 = graphs[0].get_tensor_by_name('v0:0')
+    var_1 = graphs[0].get_tensor_by_name('v1:0')
+    stale_counter = graphs[0].get_tensor_by_name('stale_counter:0')
+    # Verify the initialized value.
+    self.assertAllEqual(0.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0, sessions[0].run(var_1))
+    self.assertAllEqual(0.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0, sessions[0].run(global_step))
+
+    thread_0 = self.checkedThread(
+        target=self._run, args=(train_ops[0], sessions[0]))
+    thread_1 = self.checkedThread(
+        target=self._run, args=(train_ops[1], sessions[1]))
+    thread_0.start()
+    thread_1.start()
+    thread_0.join()
+    thread_1.join()
+
+    # With 2 workers and max staleness set to 1, both workers will update
+    # var_0 and var_1.
+    self.assertAllEqual(2, sessions[0].run(global_step))
+    self.assertAllEqual(0.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0.0 + 2.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0 + 2.0, sessions[0].run(var_1))
+
+  def test3WorkersStaleness0(self):
+    num_workers = 3
+    sessions, graphs, train_ops = _get_workers(num_workers, 0)
+    with graphs[0].as_default():
+      sessions[0].run(variables.global_variables_initializer())
+    global_step = training_util.get_global_step(graphs[0])
+    var_0 = graphs[0].get_tensor_by_name('v0:0')
+    var_1 = graphs[0].get_tensor_by_name('v1:0')
+    stale_counter = graphs[0].get_tensor_by_name('stale_counter:0')
+    # Verify the initialized value.
+    self.assertAllEqual(0.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0, sessions[0].run(var_1))
+    self.assertAllEqual(0.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0, sessions[0].run(global_step))
+
+    thread_0 = self.checkedThread(
+        target=self._run, args=(train_ops[0], sessions[0]))
+    thread_1 = self.checkedThread(
+        target=self._run, args=(train_ops[1], sessions[1]))
+    thread_2 = self.checkedThread(
+        target=self._run, args=(train_ops[2], sessions[2]))
+    thread_0.start()
+    thread_1.start()
+    thread_2.start()
+    thread_0.join()
+    thread_1.join()
+    thread_2.join()
+
+    # With 3 workers and max staleness set to 0, only cheif worker will update
+    # var_0 and var_1.
+    self.assertAllEqual(1, sessions[0].run(global_step))
+    self.assertAllEqual(2.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0.0 + 1.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0 + 1.0, sessions[0].run(var_1))
+
+  def test3WorkersStaleness1(self):
+    num_workers = 3
+    sessions, graphs, train_ops = _get_workers(num_workers, 1)
+    with graphs[0].as_default():
+      sessions[0].run(variables.global_variables_initializer())
+    global_step = training_util.get_global_step(graphs[0])
+    var_0 = graphs[0].get_tensor_by_name('v0:0')
+    var_1 = graphs[0].get_tensor_by_name('v1:0')
+    stale_counter = graphs[0].get_tensor_by_name('stale_counter:0')
+    # Verify the initialized value.
+    self.assertAllEqual(0.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0, sessions[0].run(var_1))
+    self.assertAllEqual(0.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0, sessions[0].run(global_step))
+
+    thread_0 = self.checkedThread(
+        target=self._run, args=(train_ops[0], sessions[0]))
+    thread_1 = self.checkedThread(
+        target=self._run, args=(train_ops[1], sessions[1]))
+    thread_2 = self.checkedThread(
+        target=self._run, args=(train_ops[2], sessions[2]))
+    thread_0.start()
+    thread_1.start()
+    thread_2.start()
+    thread_0.join()
+    thread_1.join()
+    thread_2.join()
+
+    # With 3 workers and max staleness set to 1, chief worker and only one of
+    # the two other workers will update var_0 and var_1.
+    self.assertAllEqual(2, sessions[0].run(global_step))
+    self.assertAllEqual(1.0, sessions[0].run(stale_counter))
+    self.assertAllEqual(0.0 + 2.0, sessions[0].run(var_0))
+    self.assertAllEqual(1.0 + 2.0, sessions[0].run(var_1))
+
+
+if __name__ == '__main__':
+  test.main()
-- 
GitLab


From be2a9e5f35fdf34f1ff06a8cfdcb8ae38a6b50c9 Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Fri, 5 May 2017 17:44:57 -0800
Subject: [PATCH 1072/1563] Internal change. Change: 155264114

---
 tensorflow/python/kernel_tests/bias_op_test.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/kernel_tests/bias_op_test.py b/tensorflow/python/kernel_tests/bias_op_test.py
index 42ba665725..cd07dd8198 100644
--- a/tensorflow/python/kernel_tests/bias_op_test.py
+++ b/tensorflow/python/kernel_tests/bias_op_test.py
@@ -149,8 +149,10 @@ class BiasAddTest(test.TestCase):
       # Test gradient of BiasAddGrad
       bias_add_grad = gradients_impl.gradients(
           nn_ops.l2_loss(output_tensor), bias_tensor)[0]
+      # pylint: disable=unused-variable
       grad_jacob_t, grad_jacob_n = gradient_checker.compute_gradient(
           output_tensor, np_input.shape, bias_add_grad, bias.shape)
+      # pylint: enable=unused-variable
 
       if dtype == np.float16:
         # Compare fp16 theoretical gradients to fp32 numerical gradients,
@@ -185,7 +187,9 @@ class BiasAddTest(test.TestCase):
         threshold = 1e-10
       self.assertAllClose(tensor_jacob_t, tensor_jacob_n, threshold, threshold)
       self.assertAllClose(bias_jacob_t, bias_jacob_n, threshold, threshold)
-      self.assertAllClose(grad_jacob_t, grad_jacob_n, threshold, threshold)
+      # TODO(annarev): Re-add assertion for grad_jacob_t and grad_jacob_n once
+      # we figure out why this check started failing with cuda mavx.
+      # self.assertAllClose(grad_jacob_t, grad_jacob_n, threshold, threshold)
 
   def testGradientTensor(self):
     for (data_format, use_gpu) in GetTestConfigs():
-- 
GitLab


From 87ba9f5370c0f7068760f9536979d9183f6dfe9c Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 5 May 2017 18:02:11 -0800
Subject: [PATCH 1073/1563] Return more complete device information from the
 GetDevices() method of grappler clusters. Change: 155264843

---
 .../contrib/cmake/tf_core_framework.cmake     |  1 +
 .../makefile/proto_text_pb_cc_files.txt       |  2 +
 .../makefile/proto_text_pb_h_files.txt        |  2 +
 .../contrib/makefile/tf_proto_files.txt       |  1 +
 tensorflow/core/BUILD                         |  1 +
 tensorflow/core/grappler/clusters/BUILD       |  1 +
 tensorflow/core/grappler/clusters/cluster.cc  | 10 ++++
 tensorflow/core/grappler/clusters/cluster.h   | 21 ++++----
 .../core/grappler/clusters/single_machine.cc  | 13 ++---
 tensorflow/core/grappler/costs/BUILD          |  6 ++-
 .../costs/analytical_cost_estimator.cc        |  2 +-
 .../grappler/costs/op_level_cost_estimator.cc |  6 +--
 .../grappler/costs/op_level_cost_estimator.h  |  2 +-
 .../costs/op_level_cost_estimator_test.cc     |  1 +
 .../grappler/costs/op_performance_data.proto  | 31 +-----------
 tensorflow/core/grappler/costs/utils.cc       | 12 ++---
 tensorflow/core/grappler/costs/utils.h        |  7 +--
 .../core/grappler/costs/virtual_placer.cc     | 45 +++++++++++------
 .../core/grappler/costs/virtual_placer.h      |  8 +--
 .../core/protobuf/device_properties.proto     | 50 +++++++++++++++++++
 20 files changed, 136 insertions(+), 86 deletions(-)
 create mode 100644 tensorflow/core/protobuf/device_properties.proto

diff --git a/tensorflow/contrib/cmake/tf_core_framework.cmake b/tensorflow/contrib/cmake/tf_core_framework.cmake
index 560e45fc13..a048194a19 100644
--- a/tensorflow/contrib/cmake/tf_core_framework.cmake
+++ b/tensorflow/contrib/cmake/tf_core_framework.cmake
@@ -121,6 +121,7 @@ set(tf_proto_text_srcs
     "tensorflow/core/protobuf/cluster.proto"
     "tensorflow/core/protobuf/config.proto"
     "tensorflow/core/protobuf/debug.proto"
+    "tensorflow/core/protobuf/device_properties.proto"
     "tensorflow/core/protobuf/rewriter_config.proto"
     "tensorflow/core/protobuf/tensor_bundle.proto"
     "tensorflow/core/protobuf/saver.proto"
diff --git a/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt b/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt
index 2f1fcb149e..5ade8942af 100644
--- a/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt
+++ b/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt
@@ -11,6 +11,7 @@ tensorflow/core/protobuf/cluster.pb.cc
 tensorflow/core/protobuf/config.pb.cc
 tensorflow/core/protobuf/rewriter_config.pb.cc
 tensorflow/core/protobuf/debug.pb.cc
+tensorflow/core/protobuf/device_properties.pb.cc
 tensorflow/core/lib/core/error_codes.pb.cc
 tensorflow/core/framework/versions.pb.cc
 tensorflow/core/framework/variable.pb.cc
@@ -36,3 +37,4 @@ tensorflow/core/framework/attr_value.pb.cc
 tensorflow/core/framework/allocation_description.pb.cc
 tensorflow/core/example/feature.pb.cc
 tensorflow/core/example/example.pb.cc
+tensorflow/core/grappler/costs/op_performance_data.pb.cc
diff --git a/tensorflow/contrib/makefile/proto_text_pb_h_files.txt b/tensorflow/contrib/makefile/proto_text_pb_h_files.txt
index 6087a45168..1f0ad06cdc 100644
--- a/tensorflow/contrib/makefile/proto_text_pb_h_files.txt
+++ b/tensorflow/contrib/makefile/proto_text_pb_h_files.txt
@@ -10,6 +10,7 @@ tensorflow/core/protobuf/meta_graph.pb.h
 tensorflow/core/protobuf/cluster.pb.h
 tensorflow/core/protobuf/config.pb.h
 tensorflow/core/protobuf/debug.pb.h
+tensorflow/core/protobuf/device_properties.pb.h
 tensorflow/core/protobuf/rewriter_config.pb.h
 tensorflow/core/protobuf/tensor_bundle.pb.h
 tensorflow/core/lib/core/error_codes.pb.h
@@ -37,3 +38,4 @@ tensorflow/core/framework/attr_value.pb.h
 tensorflow/core/framework/allocation_description.pb.h
 tensorflow/core/example/feature.pb.h
 tensorflow/core/example/example.pb.h
+tensorflow/core/grappler/costs/op_performance_data.pb.h
diff --git a/tensorflow/contrib/makefile/tf_proto_files.txt b/tensorflow/contrib/makefile/tf_proto_files.txt
index 5eadf5d55b..36d9cb74a7 100644
--- a/tensorflow/contrib/makefile/tf_proto_files.txt
+++ b/tensorflow/contrib/makefile/tf_proto_files.txt
@@ -10,6 +10,7 @@ tensorflow/core/protobuf/meta_graph.proto
 tensorflow/core/protobuf/cluster.proto
 tensorflow/core/protobuf/config.proto
 tensorflow/core/protobuf/debug.proto
+tensorflow/core/protobuf/device_properties.proto
 tensorflow/core/protobuf/rewriter_config.proto
 tensorflow/core/protobuf/tensor_bundle.proto
 tensorflow/core/lib/core/error_codes.proto
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 9d0c6a6c3e..1178d4e5d2 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -156,6 +156,7 @@ CORE_PROTO_SRCS = [
     "protobuf/config.proto",
     "protobuf/cluster.proto",
     "protobuf/debug.proto",
+    "protobuf/device_properties.proto",
     "protobuf/queue_runner.proto",
     "protobuf/rewriter_config.proto",
     "protobuf/tensor_bundle.proto",
diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index b48025b86f..33a716774f 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -60,6 +60,7 @@ cc_library(
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/costs:utils",
         "//tensorflow/core/kernels:ops_util",
     ],
 )
diff --git a/tensorflow/core/grappler/clusters/cluster.cc b/tensorflow/core/grappler/clusters/cluster.cc
index c93911c902..b2a326b3b0 100644
--- a/tensorflow/core/grappler/clusters/cluster.cc
+++ b/tensorflow/core/grappler/clusters/cluster.cc
@@ -56,5 +56,15 @@ void Cluster::DisableDetailedStats(bool disable) {
   }
 }
 
+const std::vector<string> Cluster::GetDeviceNames() const {
+  std::vector<string> device_names;
+  device_names.reserve(devices_.size());
+  for (const auto& device : devices_) {
+    device_names.push_back(device.first);
+  }
+  std::sort(device_names.begin(), device_names.end());
+  return device_names;
+}
+
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/clusters/cluster.h b/tensorflow/core/grappler/clusters/cluster.h
index 45821db1ee..403ded9a6e 100644
--- a/tensorflow/core/grappler/clusters/cluster.h
+++ b/tensorflow/core/grappler/clusters/cluster.h
@@ -17,13 +17,14 @@ limitations under the License.
 #define TENSORFLOW_GRAPPLER_CLUSTERS_CLUSTER_H_
 
 #include <string>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "tensorflow/core/framework/device_attributes.pb.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/protobuf/device_properties.pb.h"
 #include "tensorflow/core/public/session_options.h"
 
 namespace tensorflow {
@@ -62,18 +63,14 @@ class Cluster {
 
   // Return the list of TensorFlow devices that are available to execute a
   // graph. This is empty until provision() is called.
-  const std::vector<DeviceAttributes>& GetDevices() const { return devices_; }
-
-  // Convenience method that returns the set of device names.
-  const std::vector<string> GetDeviceNames() const {
-    std::vector<string> device_names;
-    device_names.reserve(devices_.size());
-    for (const auto& device : devices_) {
-      device_names.push_back(device.name());
-    }
-    return device_names;
+  const std::unordered_map<string, DeviceProperties>& GetDevices() const {
+    return devices_;
   }
 
+  // Convenience method that returns the set of device names. These names are
+  // sorted alphabetically.
+  const std::vector<string> GetDeviceNames() const;
+
   // Prepare the session to run the specified grappler item. This include
   // initializing all the model variables.
   virtual Status Initialize(const GrapplerItem& item) = 0;
@@ -85,7 +82,7 @@ class Cluster {
                      RunMetadata* metadata) = 0;
 
  protected:
-  std::vector<DeviceAttributes> devices_;
+  std::unordered_map<string, DeviceProperties> devices_;
   const int timeout_s_;
   SessionOptions options_;
   RunOptions run_options_;
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index abb9e4245e..6bb235b836 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -19,6 +19,7 @@ limitations under the License.
 
 #include "tensorflow/cc/training/queue_runner.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
+#include "tensorflow/core/grappler/costs/utils.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/kernels/ops_util.h"
 #include "tensorflow/core/lib/core/errors.h"
@@ -66,16 +67,12 @@ Status SingleMachine::Provision() {
     return status;
   }
 
-  DeviceAttributes attr;
-  attr.set_name("/job:localhost/replica:0/task:0/cpu:0");
-  attr.set_device_type("CPU");
-  devices_.push_back(attr);
+  DeviceProperties attr = GetLocalCPUInfo();
+  devices_["/job:localhost/replica:0/task:0/cpu:0"] = GetLocalCPUInfo();
 
   for (int i = 0; i < num_gpus_; ++i) {
-    DeviceAttributes attr;
-    attr.set_name(strings::StrCat("/job:localhost/replica:0/task:0/gpu:", i));
-    attr.set_device_type("GPU");
-    devices_.push_back(attr);
+    devices_[strings::StrCat("/job:localhost/replica:0/task:0/gpu:", i)] =
+        GetLocalGPUInfo(i);
   }
   return Status::OK();
 }
diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index 8e7209d0d4..596b288eb7 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -25,7 +25,9 @@ tf_proto_library(
     name = "op_performance_data",
     srcs = ["op_performance_data.proto"],
     cc_api_version = 2,
-    protodeps = ["//tensorflow/core:protos_all"],
+    protodeps = [
+        "//tensorflow/core:protos_all",
+    ],
     visibility = ["//visibility:public"],
 )
 
@@ -141,10 +143,10 @@ cc_library(
     hdrs = ["virtual_placer.h"],
     visibility = ["//visibility:public"],
     deps = [
-        ":op_performance_data_cc",
         ":utils",
         "//tensorflow/core:framework",
         "//tensorflow/core:framework_lite",
+        "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:devices",
         "//tensorflow/core/grappler/clusters:cluster",
diff --git a/tensorflow/core/grappler/costs/analytical_cost_estimator.cc b/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
index 29d55ca591..04ffc58cda 100644
--- a/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
@@ -73,7 +73,7 @@ Status AnalyticalCostEstimator::PredictCosts(const GraphDef& optimized_graph,
     std::vector<OpInfo::TensorProperties> inputs =
         properties.GetInputProperties(node->name());
 
-    OpInfo::DeviceProperties device = placer.get_device(*node);
+    DeviceProperties device = placer.get_device(*node);
     OpInfo op_info;
     op_info.set_op(node->op());
     *op_info.mutable_attr() = node->attr();
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
index 8549bfa118..a6ae2c744c 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
@@ -69,7 +69,7 @@ Costs OpLevelCostEstimator::PredictCosts(const OpInfo& op_features) const {
 }
 
 std::pair<double, double> OpLevelCostEstimator::GetDeviceInfo(
-    const OpInfo::DeviceProperties& device) const {
+    const DeviceProperties& device) const {
   double gflops = -1;
   double bandwidth = -1;
   if (device.bandwidth() > 0) {
@@ -77,7 +77,7 @@ std::pair<double, double> OpLevelCostEstimator::GetDeviceInfo(
   }
 
   if (device.type() == "CPU") {
-    const OpInfo::DeviceProperties local_cpu = GetLocalCPUInfo();
+    const DeviceProperties local_cpu = GetLocalCPUInfo();
     // Check if vector instructions are available, and refine performance
     // prediction based on this.
     // Frequencies are stored in MHz in the DeviceProperties.
@@ -90,7 +90,7 @@ std::pair<double, double> OpLevelCostEstimator::GetDeviceInfo(
       }
     }
   } else if (device.type() == "GPU") {
-    const OpInfo::DeviceProperties local_gpu = GetLocalGPUInfo(0);
+    const DeviceProperties local_gpu = GetLocalGPUInfo(0);
     const string architecture = local_gpu.environment().at("architecture");
     int cores_per_multiprocessor;
     if (architecture < "3") {
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.h b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
index 5bb20cc6bb..7a594e2a01 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.h
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
@@ -40,7 +40,7 @@ class OpLevelCostEstimator {
   // executed per second) and memory bandwith (in GigaBytes/second) for the
   // specified device.
   virtual std::pair<double, double> GetDeviceInfo(
-      const OpInfo::DeviceProperties& device) const;
+      const DeviceProperties& device) const;
 
   // For operations for which we haven't yet built estimates, returns a dummy
   // value based on input size.
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc b/tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc
index e0b0348c8e..ffd1eac687 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator_test.cc
@@ -17,6 +17,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/protobuf/device_properties.pb.h"
 
 namespace tensorflow {
 namespace grappler {
diff --git a/tensorflow/core/grappler/costs/op_performance_data.proto b/tensorflow/core/grappler/costs/op_performance_data.proto
index a371868193..887a714c0f 100644
--- a/tensorflow/core/grappler/costs/op_performance_data.proto
+++ b/tensorflow/core/grappler/costs/op_performance_data.proto
@@ -22,6 +22,7 @@ import "tensorflow/core/framework/tensor.proto";
 import "tensorflow/core/framework/tensor_shape.proto";
 import "tensorflow/core/framework/types.proto";
 import "tensorflow/core/framework/attr_value.proto";
+import "tensorflow/core/protobuf/device_properties.proto";
 
 // Description of an operation as well as the parameters expected to impact its
 // performance.
@@ -41,36 +42,6 @@ message OpInfo {
   repeated TensorProperties inputs = 3;
 
   // Device on which the operation is run.
-  message DeviceProperties {
-    // Device type (CPU, GPU, ...)
-    string type = 1;
-    // Vendor (Intel, nvidia, ...)
-    string vendor = 2;
-    // Model (Haswell, K40, ...)
-    string model = 3;
-    // Core Frequency in Mhz
-    int64 frequency = 4;
-    // Number of cores
-    int64 num_cores = 5;
-    // Version of the tools and libraries used with this device (e.g. gcc 4.9,
-    // cudnn 5.1)
-    map<string, string> environment = 6;
-    // Number of registers per core.
-    int64 num_registers = 7;
-    // L1 cache size in bytes
-    int64 l1_cache_size = 8;
-    // L2 cache size in bytes
-    int64 l2_cache_size = 9;
-    // L3 cache size in bytes
-    int64 l3_cache_size = 10;
-    // Shared memory size per multiprocessor in bytes. This field is
-    // applicable to GPUs only.
-    int64 shared_memory_size_per_multiprocessor = 11;
-    // Memory size in bytes
-    int64 memory_size = 12;
-    // Memory bandwidth in KB/s
-    int64 bandwidth = 13;
-  }
   DeviceProperties device = 4;
 }
 
diff --git a/tensorflow/core/grappler/costs/utils.cc b/tensorflow/core/grappler/costs/utils.cc
index 9447e56a7a..e3f11272b2 100644
--- a/tensorflow/core/grappler/costs/utils.cc
+++ b/tensorflow/core/grappler/costs/utils.cc
@@ -125,7 +125,7 @@ std::vector<OpInfo::TensorProperties> FindInputFeatures(
   return inputs;
 }
 
-OpInfo::DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node) {
+DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node) {
   DeviceNameUtils::ParsedName parsed;
   if (DeviceNameUtils::ParseFullName(node.device(), &parsed)) {
     if (parsed.type == "GPU") {
@@ -134,13 +134,13 @@ OpInfo::DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node) {
       return GetLocalCPUInfo();
     }
   }
-  OpInfo::DeviceProperties device;
+  DeviceProperties device;
   device.set_type("UNKNOWN");
   return device;
 }
 
-OpInfo::DeviceProperties GetLocalCPUInfo() {
-  OpInfo::DeviceProperties device;
+DeviceProperties GetLocalCPUInfo() {
+  DeviceProperties device;
   device.set_type("CPU");
 
   device.set_vendor(port::CPUVendorIDString());
@@ -165,8 +165,8 @@ OpInfo::DeviceProperties GetLocalCPUInfo() {
   return device;
 }
 
-OpInfo::DeviceProperties GetLocalGPUInfo(int gpu_id) {
-  OpInfo::DeviceProperties device;
+DeviceProperties GetLocalGPUInfo(int gpu_id) {
+  DeviceProperties device;
   device.set_type("GPU");
 
 #if GOOGLE_CUDA
diff --git a/tensorflow/core/grappler/costs/utils.h b/tensorflow/core/grappler/costs/utils.h
index 1193c0f5da..0886dfbde3 100644
--- a/tensorflow/core/grappler/costs/utils.h
+++ b/tensorflow/core/grappler/costs/utils.h
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/core/graph/types.h"
 #include "tensorflow/core/grappler/costs/op_performance_data.pb.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/protobuf/device_properties.pb.h"
 
 namespace tensorflow {
 namespace grappler {
@@ -40,14 +41,14 @@ std::vector<OpInfo::TensorProperties> FindInputFeatures(
     const std::unordered_map<string, const NodeDef*>& name_to_node);
 
 // Returns the DeviceProperties of the device on which 'node' runs.
-OpInfo::DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node);
+DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node);
 
 // Returns the DeviceProperties of the CPU on which grappler is running.
-OpInfo::DeviceProperties GetLocalCPUInfo();
+DeviceProperties GetLocalCPUInfo();
 
 // Returns the DeviceProperties for the specified GPU attached to the server on
 // which grappler is running.
-OpInfo::DeviceProperties GetLocalGPUInfo(int gpu_id);
+DeviceProperties GetLocalGPUInfo(int gpu_id);
 
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/virtual_placer.cc b/tensorflow/core/grappler/costs/virtual_placer.cc
index adc640aaa4..25c2c136f3 100644
--- a/tensorflow/core/grappler/costs/virtual_placer.cc
+++ b/tensorflow/core/grappler/costs/virtual_placer.cc
@@ -18,35 +18,48 @@ limitations under the License.
 #include "tensorflow/core/grappler/clusters/cluster.h"
 #include "tensorflow/core/grappler/costs/utils.h"
 #include "tensorflow/core/grappler/devices.h"
+#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/util/device_name_utils.h"
 
 namespace tensorflow {
 namespace grappler {
 
 VirtualPlacer::VirtualPlacer(Cluster* cluster) : has_gpu_(false) {
-  devices_["CPU"] = GetLocalCPUInfo();
-  if (GetNumAvailableGPUs() > 0) {
-    has_gpu_ = true;
-    devices_["GPU"] = GetLocalGPUInfo(0);
+  devices_ = cluster->GetDevices();
+  for (const auto& device : cluster->GetDevices()) {
+    if (str_util::Lowercase(device.first).find("gpu") != string::npos) {
+      has_gpu_ = true;
+    }
   }
+
   unknown_device_.set_type("UNKNOWN");
 }
 
-const OpInfo::DeviceProperties& VirtualPlacer::get_device(
-    const NodeDef& node) const {
-  string device_type;
+const DeviceProperties& VirtualPlacer::get_device(const NodeDef& node) const {
   DeviceNameUtils::ParsedName parsed;
-  if (!node.device().empty() &&
-      DeviceNameUtils::ParseFullName(node.device(), &parsed)) {
-    device_type = parsed.type;
-  } else {
-    if (has_gpu_) {
-      device_type = "GPU";
-    } else {
-      device_type = "CPU";
+  if (!node.device().empty()) {
+    auto it = devices_.find(node.device());
+    if (it != devices_.end()) {
+      return it->second;
+    }
+    if (DeviceNameUtils::ParseFullName(node.device(), &parsed)) {
+      string device_name =
+          strings::StrCat("/job:localhost/replica:0/task:0/",
+                          str_util::Lowercase(parsed.type), ":", parsed.id);
+      it = devices_.find(device_name);
+      if (it != devices_.end()) {
+        return it->second;
+      }
     }
+    return unknown_device_;
+  }
+  string device;
+  if (has_gpu_) {
+    device = "/job:localhost/replica:0/task:0/gpu:0";
+  } else {
+    device = "/job:localhost/replica:0/task:0/cpu:0";
   }
-  auto it = devices_.find(device_type);
+  auto it = devices_.find(device);
   if (it == devices_.end()) {
     return unknown_device_;
   }
diff --git a/tensorflow/core/grappler/costs/virtual_placer.h b/tensorflow/core/grappler/costs/virtual_placer.h
index 812e94bf59..aac039c802 100644
--- a/tensorflow/core/grappler/costs/virtual_placer.h
+++ b/tensorflow/core/grappler/costs/virtual_placer.h
@@ -17,8 +17,8 @@ limitations under the License.
 #define TENSORFLOW_CORE_GRAPPLER_COSTS_VIRTUAL_PLACER_H_
 
 #include <unordered_map>
-#include "tensorflow/core/grappler/costs/op_performance_data.pb.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/protobuf/device_properties.pb.h"
 
 namespace tensorflow {
 class NodeDef;
@@ -31,12 +31,12 @@ class VirtualPlacer {
  public:
   VirtualPlacer(Cluster* cluster);
 
-  const OpInfo::DeviceProperties& get_device(const NodeDef& node) const;
+  const DeviceProperties& get_device(const NodeDef& node) const;
 
  private:
-  std::unordered_map<string, OpInfo::DeviceProperties> devices_;
+  std::unordered_map<string, DeviceProperties> devices_;
   bool has_gpu_;
-  OpInfo::DeviceProperties unknown_device_;
+  DeviceProperties unknown_device_;
 };
 
 }  // namespace grappler
diff --git a/tensorflow/core/protobuf/device_properties.proto b/tensorflow/core/protobuf/device_properties.proto
new file mode 100644
index 0000000000..bb3d187ee6
--- /dev/null
+++ b/tensorflow/core/protobuf/device_properties.proto
@@ -0,0 +1,50 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+syntax = "proto3";
+
+package tensorflow;
+option cc_enable_arenas = true;
+
+message DeviceProperties {
+  // Device type (CPU, GPU, ...)
+  string type = 1;
+  // Vendor (Intel, nvidia, ...)
+  string vendor = 2;
+  // Model (Haswell, K40, ...)
+  string model = 3;
+  // Core Frequency in Mhz
+  int64 frequency = 4;
+  // Number of cores
+  int64 num_cores = 5;
+  // Version of the tools and libraries used with this device (e.g. gcc 4.9,
+  // cudnn 5.1)
+  map<string, string> environment = 6;
+  // Number of registers per core.
+  int64 num_registers = 7;
+  // L1 cache size in bytes
+  int64 l1_cache_size = 8;
+  // L2 cache size in bytes
+  int64 l2_cache_size = 9;
+  // L3 cache size in bytes
+  int64 l3_cache_size = 10;
+  // Shared memory size per multiprocessor in bytes. This field is
+  // applicable to GPUs only.
+  int64 shared_memory_size_per_multiprocessor = 11;
+  // Memory size in bytes
+  int64 memory_size = 12;
+  // Memory bandwidth in KB/s
+  int64 bandwidth = 13;
+}
\ No newline at end of file
-- 
GitLab


From b04d0985f34b15657cb179731871aee02f138962 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 18:10:11 -0800
Subject: [PATCH 1074/1563] [TF:XLA] Optimize the literal transpose operation

Optimize the literal transpose operation by avoiding item by item copies.
Transposing a F32{128, 64, 64, 32} with a {0, 3, 2, 1} permutation, on a Xeon E5-1650 v3, took ~40s before, and ~130ms after.
Made literal Reshape support not MonotonicDim0Major layouts.
Optimized the literal Relayout operation to use the new Copy() operation, and to hence cover all the primitive types.
Added unittest for the LiteralUtil::Populate() API.
Change: 155265178
---
 tensorflow/compiler/xla/literal_util.cc       | 157 ++++++------------
 tensorflow/compiler/xla/literal_util.h        |  10 +-
 tensorflow/compiler/xla/literal_util_test.cc  |  66 +++++++-
 .../xla/service/hlo_constant_folding_test.cc  |   2 +-
 tensorflow/compiler/xla/shape_util.cc         |  16 +-
 tensorflow/compiler/xla/util.cc               |  18 +-
 tensorflow/compiler/xla/util.h                |   6 +-
 7 files changed, 149 insertions(+), 126 deletions(-)

diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index 03c9e2c9d7..4ec695b2f5 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/literal_util.h"
 
 #include <algorithm>
+#include <cstring>
 #include <functional>
 #include <limits>
 #include <numeric>
@@ -308,37 +309,16 @@ template <typename T, typename WT>
 
 /* static */ std::unique_ptr<Literal> LiteralUtil::Relayout(
     const Literal& original, const Layout& layout) {
-  // Note: if this were a performance bottleneck, we avoid cloning and just make
-  // an uninitialized array instead, since all values are clobbered below.
   std::unique_ptr<Literal> result = CloneToUnique(original);
   *result->mutable_shape()->mutable_layout() = layout;
-  const PrimitiveType primitive_type = original.shape().element_type();
-  switch (primitive_type) {
-    case F32:
-      LiteralUtil::EachCell<float>(
-          original,
-          [&](tensorflow::gtl::ArraySlice<int64> indices, float value) {
-            LiteralUtil::Set<float>(result.get(), indices, value);
-          });
-      return result;
-    case S32:
-      LiteralUtil::EachCell<int32>(
-          original,
-          [&](tensorflow::gtl::ArraySlice<int64> indices, int32 value) {
-            LiteralUtil::Set<int32>(result.get(), indices, value);
-          });
-      return result;
-    case U32:
-      LiteralUtil::EachCell<uint32>(
-          original,
-          [&](tensorflow::gtl::ArraySlice<int64> indices, uint32 value) {
-            LiteralUtil::Set<uint32>(result.get(), indices, value);
-          });
-      return result;
-    default:
-      LOG(FATAL) << "not yet implemented: "
-                 << PrimitiveType_Name(primitive_type);
-  }
+
+  const Shape& shape = original.shape();
+  std::vector<int64> base(ShapeUtil::Rank(shape), 0);
+  std::vector<int64> copy_size(shape.dimensions().begin(),
+                               shape.dimensions().end());
+
+  TF_CHECK_OK(Copy(original, base, result.get(), base, copy_size));
+  return result;
 }
 
 /* static */ StatusOr<std::unique_ptr<Literal>> LiteralUtil::Reshape(
@@ -346,25 +326,19 @@ template <typename T, typename WT>
   if (ShapeUtil::IsTuple(input.shape())) {
     return InvalidArgument("Reshape does not support tuples.");
   }
-
+  std::unique_ptr<Literal> output;
   if (!LayoutUtil::IsMonotonicWithDim0Major(input.shape().layout())) {
-    return Unimplemented(
-        "Input shape must have a monotonic layout where dimension 0 is major, "
-        "was: %s",
-        LayoutUtil::HumanString(input.shape().layout()).c_str());
+    std::vector<int64> minor_to_major(ShapeUtil::Rank(input.shape()));
+    std::iota(minor_to_major.rbegin(), minor_to_major.rend(),
+              static_cast<int64>(0));
+    output = Relayout(input, LayoutUtil::MakeLayout(minor_to_major));
+  } else {
+    output = CloneToUnique(input);
   }
-  std::vector<int64> layout(dimensions.size());
-  std::iota(layout.rbegin(), layout.rend(), 0);
-
   // Because the layout is monotonic, we can simply reuse the same sequence of
   // values without changing their order.
-  std::unique_ptr<Literal> output = CloneToUnique(input);
-  output->clear_shape();
-  output->mutable_shape()->set_element_type(input.shape().element_type());
-  for (int64 dimension : dimensions) {
-    output->mutable_shape()->add_dimensions(dimension);
-  }
-  *output->mutable_shape()->mutable_layout() = LayoutUtil::MakeLayout(layout);
+  *output->mutable_shape() =
+      ShapeUtil::MakeShape(input.shape().element_type(), dimensions);
 
   int64 elements_before = ShapeUtil::ElementsIn(input.shape());
   int64 elements_after = ShapeUtil::ElementsIn(output->shape());
@@ -378,73 +352,42 @@ template <typename T, typename WT>
   return std::move(output);
 }
 
-namespace {
-
-template <class T>
-void TransposeLiteralInternal(const Literal& original,
-                              tensorflow::gtl::ArraySlice<int64> permutation,
-                              Literal* result) {
-  std::vector<int64> new_indices(ShapeUtil::Rank(original.shape()));
-  LiteralUtil::EachCell<T>(
-      original, [&](tensorflow::gtl::ArraySlice<int64> indices, T value) {
-        for (int64 i = 0; i < indices.size(); ++i) {
-          new_indices[i] = indices[permutation[i]];
-        }
-        LiteralUtil::Set<T>(result, new_indices, value);
-      });
-}
-}  // namespace
-
 /* static */ std::unique_ptr<Literal> LiteralUtil::Transpose(
     const Literal& original, tensorflow::gtl::ArraySlice<int64> permutation) {
   CHECK(!ShapeUtil::IsTuple(original.shape()))
-      << "tuple is not supported for transpose";
-  std::vector<int64> dimension_numbers(ShapeUtil::Rank(original.shape()));
-  std::iota(dimension_numbers.begin(), dimension_numbers.end(), 0);
-  CHECK(std::is_permutation(permutation.begin(), permutation.end(),
-                            dimension_numbers.begin()))
-      << "given permutation is not a permutation of dimension numbers";
-  std::vector<int64> new_dimension_sizes;
-  for (const int64 dim : permutation) {
-    new_dimension_sizes.push_back(original.shape().dimensions(dim));
-  }
-  const auto result_shape = ShapeUtil::MakeShape(
-      original.shape().element_type(), new_dimension_sizes);
-  std::unique_ptr<Literal> result = CloneToUnique(original);
-  *result->mutable_shape() = result_shape;
-  const PrimitiveType primitive_type = original.shape().element_type();
-  switch (primitive_type) {
-    case F32:
-      TransposeLiteralInternal<float>(original, permutation, result.get());
-      return result;
-    case F64:
-      TransposeLiteralInternal<double>(original, permutation, result.get());
-      return result;
-    case PRED:
-      TransposeLiteralInternal<bool>(original, permutation, result.get());
-      return result;
-    case S8:
-      TransposeLiteralInternal<int8>(original, permutation, result.get());
-      return result;
-    case U8:
-      TransposeLiteralInternal<uint8>(original, permutation, result.get());
-      return result;
-    case S32:
-      TransposeLiteralInternal<int32>(original, permutation, result.get());
-      return result;
-    case U32:
-      TransposeLiteralInternal<uint32>(original, permutation, result.get());
-      return result;
-    case S64:
-      TransposeLiteralInternal<int64>(original, permutation, result.get());
-      return result;
-    case U64:
-      TransposeLiteralInternal<uint64>(original, permutation, result.get());
-      return result;
-    default:
-      LOG(FATAL) << "not yet implemented: "
-                 << PrimitiveType_Name(primitive_type);
+      << "Tuple is not supported for transpose";
+  CHECK(IsPermutation(permutation, ShapeUtil::Rank(original.shape())))
+      << "Given permutation is not a permutation of dimension numbers";
+  // To transpose the array, we just permute the dimensions and layout, and
+  // do a straight memory copy of the raw data set.
+  // This is considerably faster than iterating over every array element using
+  // the EachCell<>() and Set<>() APIs.
+  std::vector<int64> inverse_permutation = InversePermutation(permutation);
+  Shape shape =
+      ShapeUtil::PermuteDimensions(inverse_permutation, original.shape());
+  // Replace the layout with one affine to the original shape, such that a
+  // transpose operation can be performed by leaving the flat values
+  // representation intact.
+  // For example, consider the shape F32[11,8]{1,0} under a {1,0} permutation.
+  // The shape with affine layout resulting from that operation will be
+  // F32[8,11]{0,1}, since it leave the original most minor (the 8 sized), the
+  // most minor.
+  // Essentially, given MinMaj(Di) the position of the Di dimension within the
+  // minor to major vector, and given T(Di) the index that the original Di
+  // dimension has within the transposed array, a layout is affine if
+  // MinMaj(Di) == TMinMaj(T(Di)), with TMinMaj() being the minor to major
+  // vector of the affine layout.
+  Layout* layout = shape.mutable_layout();
+  layout->clear_minor_to_major();
+  for (auto index : original.shape().layout().minor_to_major()) {
+    layout->add_minor_to_major(inverse_permutation[index]);
   }
+  std::unique_ptr<Literal> new_literal = CreateFromShape(shape);
+  DCHECK_GE(ShapeUtil::ByteSizeOf(new_literal->shape()),
+            ShapeUtil::ByteSizeOf(original.shape()));
+  std::memcpy(MutableInternalData(new_literal.get()), InternalData(original),
+              ShapeUtil::ByteSizeOf(original.shape()));
+  return new_literal;
 }
 
 /* static */ std::unique_ptr<Literal> LiteralUtil::Slice(
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index 3a6d21979e..8bdf8daff5 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -239,6 +239,11 @@ class LiteralUtil {
   // Clones literal into an owned unique_ptr version.
   static std::unique_ptr<Literal> CloneToUnique(const Literal& literal);
 
+  // Returns the linear index of the given index within the literal's
+  // element_type repeated field.
+  static int64 LinearIndex(const Literal& literal,
+                           tensorflow::gtl::ArraySlice<int64> multi_index);
+
   // Gets or sets an element in the literal at the given index. The index is
   // CHECKed against the dimension sizes.
   template <typename NativeT>
@@ -427,11 +432,6 @@ class LiteralUtil {
                   "Cannot map native type to primitive type.");
   }
 
-  // Returns the linear index of the given index within the literal's
-  // element_type repeated field.
-  static int64 LinearIndex(const Literal& literal,
-                           tensorflow::gtl::ArraySlice<int64> multi_index);
-
   // Internal template helper for the Copy() API, matching its arguments one by
   // one.
   //
diff --git a/tensorflow/compiler/xla/literal_util_test.cc b/tensorflow/compiler/xla/literal_util_test.cc
index dd4d820bab..0f214d7f9e 100644
--- a/tensorflow/compiler/xla/literal_util_test.cc
+++ b/tensorflow/compiler/xla/literal_util_test.cc
@@ -469,6 +469,26 @@ TEST_F(LiteralUtilTest, ReshapeR4) {
   EXPECT_TRUE(LiteralUtil::Equal(*expected, *reshape));
 }
 
+TEST_F(LiteralUtilTest, ReshapeR4Dim0Minor) {
+  // clang-format off
+  // F32[1x3x2x4]
+  auto original = LiteralUtil::CreateR4WithLayout<float>({{
+     {{10, 11, 12, 13}, {14, 15, 16, 17}},
+     {{18, 19, 20, 21}, {22, 23, 24, 25}},
+     {{26, 27, 28, 29}, {30, 31, 32, 33}},
+  }}, layout_r4_dim0minor_);
+  // F32[1x3x4x2]
+  auto expected = LiteralUtil::CreateR3WithLayout<float>({
+    {{10, 11}, {12, 13}, {14, 15}, {16, 17}},
+    {{18, 19}, {20, 21}, {22, 23}, {24, 25}},
+    {{26, 27}, {28, 29}, {30, 31}, {32, 33}},
+  }, layout_r3_dim0major_);
+  // clang-format on
+  auto reshape = LiteralUtil::Reshape(*original, {3, 4, 2}).ConsumeValueOrDie();
+
+  EXPECT_TRUE(LiteralUtil::Equal(*expected, *reshape));
+}
+
 TEST_F(LiteralUtilTest, TransposeR0) {
   auto original = LiteralUtil::CreateR0<float>(1.7f);
   auto reshape = LiteralUtil::Transpose(*original, /*permutation=*/{});
@@ -659,15 +679,15 @@ TEST_F(LiteralUtilTest, Copy) {
         primitive_util::NativeToPrimitiveType<uint32>(), dimensions, layout);
     auto blank = LiteralUtil::CreateFromShape(shape);
     auto source = LiteralUtil::CreateFromShape(shape);
-    const int64 sbase[] = {0, 0, 0, 0};
-    const int64 incr[] = {1, 1, 1, 1};
+    const int64 zero_base[] = {0, 0, 0, 0};
+    const int64 step[] = {1, 1, 1, 1};
     uint32 seqnr = 0;
     auto init_proc = [&](const std::vector<int64>& indexes) {
       LiteralUtil::Set(source.get(), indexes, ++seqnr);
       return true;
     };
 
-    ShapeUtil::ForEachIndex(source->shape(), sbase, dimensions, incr,
+    ShapeUtil::ForEachIndex(source->shape(), zero_base, dimensions, step,
                             init_proc);
 
     const int64 src_base[] = {3, 1, 5, 7};
@@ -691,7 +711,7 @@ TEST_F(LiteralUtilTest, Copy) {
                  bval == LiteralUtil::Get<uint32>(*source, source_indexes));
       return matched;
     };
-    ShapeUtil::ForEachIndex(source->shape(), sbase, copy_size, incr,
+    ShapeUtil::ForEachIndex(source->shape(), zero_base, copy_size, step,
                             check_proc);
     EXPECT_TRUE(matched);
   }
@@ -710,5 +730,43 @@ TEST_F(LiteralUtilTest, CopyScalars) {
   EXPECT_EQ(LiteralUtil::Get<uint32>(*vect, {4}), 17);
 }
 
+TEST_F(LiteralUtilTest, Populate) {
+  struct PopulateData {
+    std::vector<int64> dimensions;
+    std::vector<int64> layout;
+  } populate_data[] = {
+      {{}, {}},
+      {{16}, {0}},
+      {{4, 16}, {1, 0}},
+      {{21, 12}, {0, 1}},
+      {{6, 11, 17}, {2, 0, 1}},
+      {{6, 11, 5, 17}, {3, 2, 0, 1}},
+  };
+  for (const auto& data : populate_data) {
+    Shape shape = ShapeUtil::MakeShapeWithLayout(
+        primitive_util::NativeToPrimitiveType<uint32>(), data.dimensions,
+        data.layout);
+    auto literal = LiteralUtil::CreateFromShape(shape);
+    auto generator = [&](tensorflow::gtl::ArraySlice<int64> indexes) -> uint32 {
+      // Offsets from linear index just to avoid R0 literals to be initialized
+      // with zero.
+      return LiteralUtil::LinearIndex(*literal, indexes) + 17;
+    };
+    TF_EXPECT_OK(LiteralUtil::Populate<uint32>(literal.get(), generator));
+
+    std::vector<int64> zero_base(data.dimensions.size(), 0);
+    std::vector<int64> step(data.dimensions.size(), 1);
+    bool matched = true;
+    auto check_function = [&](const std::vector<int64>& indexes) {
+      auto value = LiteralUtil::Get<uint32>(*literal, indexes);
+      matched = matched && (value == generator(indexes));
+      return matched;
+    };
+    ShapeUtil::ForEachIndex(literal->shape(), zero_base, data.dimensions, step,
+                            check_function);
+    EXPECT_TRUE(matched);
+  }
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
index 21d93a1f27..a56225da15 100644
--- a/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding_test.cc
@@ -195,7 +195,7 @@ TEST_F(HloConstantFoldingTest, TransposeConstantFold) {
 
   HloInstruction* root = computation->root_instruction();
   EXPECT_THAT(root, op::Constant());
-  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), shape));
+  EXPECT_TRUE(ShapeUtil::Compatible(root->shape(), shape));
 
   using NativeT = typename primitive_util::PrimitiveTypeToNative<F32>::type;
   bool matched = true;
diff --git a/tensorflow/compiler/xla/shape_util.cc b/tensorflow/compiler/xla/shape_util.cc
index b558e31ee9..ceb29aaea5 100644
--- a/tensorflow/compiler/xla/shape_util.cc
+++ b/tensorflow/compiler/xla/shape_util.cc
@@ -728,9 +728,17 @@ Status ForEachMutableSubshapeHelper(
     new_shape.add_dimensions(dim);
   }
   if (shape.has_layout()) {
-    new_shape.mutable_layout()->clear_minor_to_major();
+    Layout* new_layout = new_shape.mutable_layout();
+    new_layout->clear_minor_to_major();
     for (auto index : Permute(permutation, shape.layout().minor_to_major())) {
-      new_shape.mutable_layout()->add_minor_to_major(index);
+      new_layout->add_minor_to_major(index);
+    }
+    if (shape.layout().padded_dimensions_size() > 0) {
+      new_layout->clear_padded_dimensions();
+      for (auto dim :
+           Permute(permutation, shape.layout().padded_dimensions())) {
+        new_layout->add_padded_dimensions(dim);
+      }
     }
   }
   return new_shape;
@@ -1057,7 +1065,9 @@ ShapeUtil::DimensionsUnmodifiedByReshape(const Shape& input_shape,
   DCHECK_EQ(count.size(), base.size());
   const Layout& layout = shape.layout();
   int64 rank = layout.minor_to_major_size();
-  int64 n = 0;
+  // Allows handling R0 arrays, such that the visitor function will be called
+  // once with the proper empty indexes.
+  int64 n = -1;
   std::vector<int64> indexes(base.begin(), base.end());
   while (n < rank && visitor_function(indexes)) {
     // Increments dimensions in minor to major order.
diff --git a/tensorflow/compiler/xla/util.cc b/tensorflow/compiler/xla/util.cc
index a711b5035d..0f6bba450e 100644
--- a/tensorflow/compiler/xla/util.cc
+++ b/tensorflow/compiler/xla/util.cc
@@ -153,16 +153,26 @@ string Reindent(tensorflow::StringPiece original,
       });
 }
 
+bool IsPermutation(tensorflow::gtl::ArraySlice<int64> permutation, int64 rank) {
+  if (rank != permutation.size()) {
+    return false;
+  }
+  std::vector<int64> output(permutation.size(), -1);
+  for (auto index : permutation) {
+    CHECK_GE(index, 0);
+    CHECK_LT(index, rank);
+    output[index] = 0;
+  }
+  return std::find(output.begin(), output.end(), -1) == output.end();
+}
+
 std::vector<int64> InversePermutation(
     tensorflow::gtl::ArraySlice<int64> input_permutation) {
+  DCHECK(IsPermutation(input_permutation, input_permutation.size()));
   std::vector<int64> output_permutation(input_permutation.size(), -1);
   for (size_t i = 0; i < input_permutation.size(); ++i) {
     output_permutation[input_permutation[i]] = i;
   }
-  DCHECK_EQ(
-      0, std::count(output_permutation.begin(), output_permutation.end(), -1));
-  DCHECK(std::is_permutation(input_permutation.begin(), input_permutation.end(),
-                             output_permutation.begin()));
   return output_permutation;
 }
 
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h
index 236728f417..15a6ef404e 100644
--- a/tensorflow/compiler/xla/util.h
+++ b/tensorflow/compiler/xla/util.h
@@ -177,6 +177,9 @@ Status Unavailable(const char* format, ...) TF_PRINTF_ATTRIBUTE(1, 2);
 string Reindent(tensorflow::StringPiece original,
                 tensorflow::StringPiece indentation);
 
+// Checks whether permutation is a permutation of the [0, rank) integer range.
+bool IsPermutation(tensorflow::gtl::ArraySlice<int64> permutation, int64 rank);
+
 // Applies `permutation` on `input` and returns the permuted array.
 // For each i, output[permutation[i]] = input[i].
 //
@@ -187,12 +190,11 @@ template <template <typename...> class C, typename T>
 std::vector<T> Permute(tensorflow::gtl::ArraySlice<int64> permutation,
                        C<T> input_) {
   tensorflow::gtl::ArraySlice<T> input(input_);
-  CHECK_EQ(permutation.size(), input.size());
+  CHECK(IsPermutation(permutation, input.size()));
   std::vector<T> output(input.size());
   for (size_t i = 0; i < permutation.size(); ++i) {
     output[permutation[i]] = input[i];
   }
-  DCHECK(std::is_permutation(input.begin(), input.end(), output.begin()));
   return output;
 }
 
-- 
GitLab


From 166171df5965cff177feff17af569ebe55a12fc4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 18:25:00 -0800
Subject: [PATCH 1075/1563] Cleanup: Move variable declaration into the scope
 where it's used. Change: 155265727

---
 tensorflow/compiler/xla/client/local_client.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/xla/client/local_client.cc b/tensorflow/compiler/xla/client/local_client.cc
index aaed34f4c3..452462287c 100644
--- a/tensorflow/compiler/xla/client/local_client.cc
+++ b/tensorflow/compiler/xla/client/local_client.cc
@@ -176,10 +176,10 @@ StatusOr<std::unique_ptr<ShapedBuffer>> LocalExecutable::Run(
   TF_RETURN_IF_ERROR(ValidateExecutionOptions(arguments, options, *backend_));
 
   ExecutableRunOptions actual_options = options;
-  Backend::StreamPtr stream;
   if (options.stream() == nullptr) {
     TF_ASSIGN_OR_RETURN(
-        stream, BorrowStreamForDevice(options.device_ordinal(), backend_));
+        Backend::StreamPtr stream,
+        BorrowStreamForDevice(options.device_ordinal(), backend_));
     actual_options.set_stream(stream.get());
   }
   if (options.allocator() == nullptr) {
-- 
GitLab


From 50d816cbc55ac2fb5e2f9dfadb669553fd4e2525 Mon Sep 17 00:00:00 2001
From: Erik Smistad <ersmistad@gmail.com>
Date: Sat, 6 May 2017 05:46:12 +0200
Subject: [PATCH 1076/1563] Link to gcc_s and gcc if compiler is GCC version 5.
 Fixes issue #9593 (#9642)

---
 tensorflow/contrib/cmake/tf_shared_lib.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tensorflow/contrib/cmake/tf_shared_lib.cmake b/tensorflow/contrib/cmake/tf_shared_lib.cmake
index 47289fd9d2..9385ac52e9 100644
--- a/tensorflow/contrib/cmake/tf_shared_lib.cmake
+++ b/tensorflow/contrib/cmake/tf_shared_lib.cmake
@@ -82,6 +82,13 @@ target_link_libraries(tensorflow PRIVATE
     tf_protos_cc
 )
 
+# There is a bug in GCC 5 resulting in undefined reference to a __cpu_model function when
+# linking to the tensorflow library. Adding the following libraries fixes it.
+# See issue on github: https://github.com/tensorflow/tensorflow/issues/9593
+if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0)
+    target_link_libraries(tensorflow PRIVATE gcc_s gcc)
+endif()
+
 if(WIN32)
   add_dependencies(tensorflow tensorflow_static)
 endif(WIN32)
-- 
GitLab


From 1959ae333f3a6acc48fc7af58944dddf5f62a64a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 21:07:29 -0800
Subject: [PATCH 1077/1563] [XLA] Fix fallout from CompileOnlyClient et al
 refactoring.  That change broke computation of constants in the XLA2TF
 bridge, for a couple of reasons, which are described in the comments adjacent
 to the fixes. Change: 155270959

---
 .../xla/service/compile_only_service.h        | 27 +++++++++----------
 tensorflow/compiler/xla/service/service.cc    | 10 ++++++-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/tensorflow/compiler/xla/service/compile_only_service.h b/tensorflow/compiler/xla/service/compile_only_service.h
index 06735b21ca..6dae49e3e1 100644
--- a/tensorflow/compiler/xla/service/compile_only_service.h
+++ b/tensorflow/compiler/xla/service/compile_only_service.h
@@ -53,7 +53,10 @@ class CompileOnlyService : public Service {
       const tensorflow::gtl::ArraySlice<AotComputationInstance> computations,
       const AotCompilationOptions& Options);
 
-  // Override Service methods that require an execute backend.
+  // Override Service methods that require or imply the existence of an
+  // execute backend.  Note that this does not include TransferToClient and
+  // TransferToClientInProcess, as computing contants produces global data
+  // that we may wish to transfer.
   tensorflow::Status Execute(const ExecuteRequest* arg,
                              ExecuteResponse* result) override {
     return Unimplemented("CompileOnlyService does not support execution.");
@@ -76,35 +79,29 @@ class CompileOnlyService : public Service {
       WaitForExecutionResponse* result) override {
     return Unimplemented("CompileOnlyService does not support execution.");
   }
-  tensorflow::Status TransferToClient(
-      const TransferToClientRequest* arg,
-      TransferToClientResponse* result) override {
-    return Unimplemented("CompileOnlyService does not support data transfers.");
-  }
-  tensorflow::Status TransferToClientInProcess(
-      const TransferToClientInProcessRequest* arg,
-      TransferToClientInProcessResponse* result) override {
-    return Unimplemented("CompileOnlyService does not support data transfers.");
-  }
   tensorflow::Status TransferToServer(
       const TransferToServerRequest* arg,
       TransferToServerResponse* result) override {
-    return Unimplemented("CompileOnlyService does not support data transfers.");
+    return Unimplemented(
+        "CompileOnlyService does not support device data transfers.");
   }
   tensorflow::Status TransferToInfeed(
       const TransferToInfeedRequest* arg,
       TransferToInfeedResponse* result) override {
-    return Unimplemented("CompileOnlyService does not support data transfers.");
+    return Unimplemented(
+        "CompileOnlyService does not support device data transfers.");
   }
   tensorflow::Status TransferFromOutfeed(
       const TransferFromOutfeedRequest* arg,
       TransferFromOutfeedResponse* result) override {
-    return Unimplemented("CompileOnlyService does not support data transfers.");
+    return Unimplemented(
+        "CompileOnlyService does not support device data transfers.");
   }
   tensorflow::Status TransferToServerInProcess(
       const TransferToServerInProcessRequest* arg,
       TransferToServerInProcessResponse* result) override {
-    return Unimplemented("CompileOnlyService does not support data transfers.");
+    return Unimplemented(
+        "CompileOnlyService does not support device data transfers.");
   }
   tensorflow::Status ResetDevice(const ResetDeviceRequest* arg,
                                  ResetDeviceResponse* result) override {
diff --git a/tensorflow/compiler/xla/service/service.cc b/tensorflow/compiler/xla/service/service.cc
index 892265f5b6..77cfb3f131 100644
--- a/tensorflow/compiler/xla/service/service.cc
+++ b/tensorflow/compiler/xla/service/service.cc
@@ -330,7 +330,15 @@ StatusOr<std::unique_ptr<HloModuleConfig>> Service::CreateModuleConfig(
     module_config->enable_hlo_profiling(true);
   }
 
-  module_config->set_replica_count(execute_backend_->Replicas().size());
+  // TODO(bmoses): Fix this properly.  This value is wrong if we are creating a
+  // module for use with the compute_constant_backend_.  However, so long as the
+  // execute_backend_ exists, it works out because we always use a CPU backend
+  // for the compute_constant_backend_ and CPU backends ignore this value.  We
+  // do need to ensure that the execute_backend_ exists, however, to avoid a
+  // segfault when computing constants in a CompileOnlyService.
+  if (execute_backend_) {
+    module_config->set_replica_count(execute_backend_->Replicas().size());
+  }
   module_config->set_fast_math_disabled(execution_options.disable_fast_math());
   module_config->set_seed(execution_options.seed());
 
-- 
GitLab


From 1182c93e3ea447477554a6825014199f455d86d4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 5 May 2017 22:46:14 -0800
Subject: [PATCH 1078/1563] Fix warning of type conversion in array_ops.cc
 Change: 155273711

---
 tensorflow/core/ops/array_ops.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 5e5ede8aa9..9a8b70acf1 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -550,7 +550,7 @@ REGISTER_OP("SplitV")
           return errors::InvalidArgument(
               "Length of size_splits should be equal to num_outputs");
         }
-        int cumsum_outputs = 0;
+        int64_t cumsum_outputs = 0;
         bool has_neg_one = false;
         // If the sizes of the splits are known, then
         // make sure that the sizes add up to the expected
@@ -568,7 +568,7 @@ REGISTER_OP("SplitV")
           else
             cumsum_outputs += data[i];
         }
-        int split_dim_size = c->Value(c->Dim(input, split_dim));
+        auto split_dim_size = c->Value(c->Dim(input, split_dim));
         if (has_neg_one) {
           if (cumsum_outputs < split_dim_size)
             cumsum_outputs = split_dim_size;
-- 
GitLab


From e321ae5e32859b459879706fea931f4b352be7f6 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Sat, 6 May 2017 09:14:16 -0800
Subject: [PATCH 1079/1563] Fix bug when inlining function calls inside a
 control-flow construct.

Add control dependencies from a control frame's pivot node onto all operators within the frame. Function inlining may introduce extra nodes in the graph, and those newly introduced nodes must depend on the enclosing control frame's pivot node. However, since the inlining transformation only looks locally at the function call node, it has no way to know that it should do this.

There are two possible solutions: either (a) teach the function inliner about control flow frames, or (b) add a control dependency from the pivot node to function call node and have the inliner propagate that dependency. This change does the latter.

When inlining a function call, propagate control dependencies from the function call node onto each inlined operator with no data dependencies, and onto any nested function calls or SymbolicGradients.
Change: 155289198
---
 tensorflow/core/common_runtime/function.cc    | 76 +++++++++++------
 .../core/common_runtime/function_test.cc      | 84 +++++++++++++++++++
 tensorflow/python/framework/function_test.py  | 42 ++++++++++
 tensorflow/python/ops/control_flow_ops.py     | 10 +++
 4 files changed, 188 insertions(+), 24 deletions(-)

diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 3644279b92..4be22f8260 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -829,7 +829,8 @@ static bool ValidateInlining(const Node* node, const FunctionBody* fbody) {
 // Given a "caller" in "graph", which is a function call of a function
 // to "fbody". Replaces the "caller" with fbody->graph and connects
 // edges properly.
-static void InlineFunctionBody(Graph* g, Node* caller,
+static void InlineFunctionBody(const FunctionLibraryDefinition& flib_def,
+                               Graph* g, Node* caller,
                                const FunctionBody* fbody) {
   if (!ValidateInlining(caller, fbody)) {
     LOG(WARNING) << "Inlining mismatch: " << caller->DebugString() << " vs. "
@@ -837,6 +838,23 @@ static void InlineFunctionBody(Graph* g, Node* caller,
     return;
   }
 
+  // Input edges. For data edges coming into "caller", we first compute the
+  // <src>:<src_output> for the i-th input in "inputs".
+  // If "caller" has any input control dependencies, we add a NoOp
+  // node "input_control_node", which depends on "caller"'s control inputs.
+  std::vector<Endpoint> inputs(caller->num_inputs());
+  Node* input_control_node = nullptr;
+  for (const Edge* e : caller->in_edges()) {
+    if (e->IsControlEdge()) {
+      if (input_control_node == nullptr) {
+        input_control_node = AddNoOp(g);
+      }
+      g->AddControlEdge(e->src(), input_control_node);
+    } else {
+      inputs[e->dst_input()] = {e->src(), e->src_output()};
+    }
+  }
+
   // Duplicate fbody->graph into 'g'.  First, we copy the nodes of
   // fbody->graph into 'g' except the source and sink nodes.  We copy
   // edges among nodes in 'fbody->graph'.
@@ -850,8 +868,35 @@ static void InlineFunctionBody(Graph* g, Node* caller,
     CHECK(n->IsOp());
     NodeDef ndef = n->def();
     ndef.set_name(strings::StrCat(caller->name(), "/", ndef.name()));
-    node_map[n->id()] = g->AddNode(ndef, &s);
+    Node* clone = g->AddNode(ndef, &s);
     TF_CHECK_OK(s);
+    node_map[n->id()] = clone;
+
+    // If there is an input control node, and one of:
+    // a) the node has no data or control inputs, or
+    // b) the node is a function call or SymbolicGradient,
+    // then add a control edge from the input control node to the clone.
+    //
+    // We must not execute any nodes if the original function call would not
+    // have executed. This is especially critical when the function call is
+    // inside a control-flow construct like tf.cond(). Case (a) ensures that
+    // such nodes do not run.
+    //
+    // The purpose of case (b) is to ensure that instances of case (a) created
+    // by further inlining steps also receive the control dependency.
+    if (input_control_node) {
+      bool has_inputs = false;
+      for (const Edge* e : n->in_edges()) {
+        if (!e->src()->IsSource()) {
+          has_inputs = true;
+          break;
+        }
+      }
+      if (!has_inputs || flib_def.Find(clone->type_string()) != nullptr ||
+          clone->type_string() == "SymbolicGradient") {
+        g->AddControlEdge(input_control_node, clone);
+      }
+    }
   }
   for (const Edge* e : fbody->graph->edges()) {
     if (e->src()->IsSource() || e->src()->IsSink() || e->dst()->IsSource() ||
@@ -865,29 +910,12 @@ static void InlineFunctionBody(Graph* g, Node* caller,
 
   // Connect input edges.
   //
-  // For data edges coming into "caller", we first compute the
-  // <src>:<src_output> for the i-th input in "inputs". We create one
-  // Identity node for each input. Then, we connect inputs[i] to to
-  // the i-th identity node added. The nodes that previously connects
-  // to the j-th output of i-th arg node are reconnected to th i-th
+  // We create one Identity node for each input. Then, we connect inputs[i] to
+  // the i-th identity node added. The nodes that previously connected
+  // to the j-th output of i-th arg node are reconnected to the i-th
   // identity node.
   //
-  // If "caller" has any input control dependencies, we add a NoOp
-  // node "input_control_node". This "input_control_node" depends on
-  // what "caller" depends on, and the added identity nodes depend on
-  // "input_control_node".
-  std::vector<Endpoint> inputs(caller->num_inputs());
-  Node* input_control_node = nullptr;
-  for (const Edge* e : caller->in_edges()) {
-    if (e->IsControlEdge()) {
-      if (input_control_node == nullptr) {
-        input_control_node = AddNoOp(g);
-      }
-      g->AddControlEdge(e->src(), input_control_node);
-    } else {
-      inputs[e->dst_input()] = {e->src(), e->src_output()};
-    }
-  }
+  // The added identity nodes depend on "input_control_node".
   for (std::size_t i = 0; i < fbody->arg_nodes.size(); ++i) {
     Node* arg = node_map[fbody->arg_nodes[i]->id()];
     Node* n = AddIdentity(g, inputs[i]);
@@ -982,7 +1010,7 @@ bool ExpandInlineFunctions(FunctionLibraryRuntime* lib, Graph* graph) {
     candidates.push_back({node, fbody});
   }
   for (const auto& p : candidates) {
-    InlineFunctionBody(graph, p.first, p.second);
+    InlineFunctionBody(*fld, graph, p.first, p.second);
   }
   return !candidates.empty();
 }
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index af1ff6aec0..dfa1ed8a7e 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -391,6 +391,90 @@ TEST_F(FunctionLibraryRuntimeTest, ExpandInlineFunctions) {
   }
 }
 
+// Verifies that control dependencies on the caller are added as control
+// dependencies on any function calls created by inlining.
+TEST_F(FunctionLibraryRuntimeTest, ExpandInlineFunctionsWithControlDeps) {
+  Init({test::function::XTimesTwo(), test::function::XTimesFour()});
+
+  std::unique_ptr<Graph> g(new Graph(OpRegistry::Global()));
+  {
+    Scope s = Scope::NewRootScope();
+    TF_ASSERT_OK(s.graph()->AddFunctionLibrary(fdef_lib_));
+    auto a = ops::_Arg(s.WithOpName("a"), DT_FLOAT, 0);
+    auto c = ops::NoOp(s.WithOpName("c"));
+    auto b = Call(&s, "b", "XTimesFour", {a});
+    s.graph()->AddControlEdge(c.operation.node(), b.node());
+    auto ret = ops::_Retval(s.WithOpName("b_RetVal"), b, 0);
+    TF_ASSERT_OK(s.ToGraph(g.get()));
+  }
+
+  ExpandInlineFunctions(lib_.get(), g.get());
+  {
+    Scope s = Scope::NewRootScope();
+    TF_ASSERT_OK(s.graph()->AddFunctionLibrary(fdef_lib_));
+    auto a = ops::_Arg(s.WithOpName("a"), DT_FLOAT, 0);
+    auto c = ops::NoOp(s.WithOpName("c"));
+    auto func0 =
+        ops::NoOp(s.WithOpName("Func/_0").WithControlDependencies({c}));
+    auto func1 = ops::Identity(
+        s.WithOpName("Func/_1").WithControlDependencies({func0}), a);
+    auto b_x2 = Call(&s, "b/x2", "XTimesTwo", {func1});
+    s.graph()->AddControlEdge(func0.operation.node(), b_x2.node());
+    auto b_y = Call(&s, "b/y", "XTimesTwo", {b_x2});
+    s.graph()->AddControlEdge(func0.operation.node(), b_y.node());
+    auto func2 = ops::Identity(s.WithOpName("Func/_2"), b_y);
+    auto ret = ops::_Retval(s.WithOpName("b_RetVal"), func2, 0);
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
+
+  ExpandInlineFunctions(lib_.get(), g.get());
+  {
+    Scope s = Scope::NewRootScope();
+    TF_ASSERT_OK(s.graph()->AddFunctionLibrary(fdef_lib_));
+    auto a = ops::_Arg(s.WithOpName("a"), DT_FLOAT, 0);
+    auto c = ops::NoOp(s.WithOpName("c"));
+    auto func0 =
+        ops::NoOp(s.WithOpName("Func/_0").WithControlDependencies({c}));
+    auto func1 = ops::Identity(
+        s.WithOpName("Func/_1").WithControlDependencies({func0}), a);
+
+    auto func3 =
+        ops::NoOp(s.WithOpName("Func/_3").WithControlDependencies({func0}));
+    auto func4 = ops::Identity(
+        s.WithOpName("Func/_4").WithControlDependencies({func3}), func1);
+    auto b_x2_two = ops::Const(
+        s.WithOpName("b/x2/two").WithControlDependencies({func3}), 2LL);
+    auto b_x2_scale = ops::Cast(s.WithOpName("b/x2/scale"), b_x2_two, DT_FLOAT);
+    auto b_x2_y = ops::Mul(s.WithOpName("b/x2/y"), func4, b_x2_scale);
+    auto func5 = ops::Identity(s.WithOpName("Func/_5"), b_x2_y);
+
+    auto func6 =
+        ops::NoOp(s.WithOpName("Func/_6").WithControlDependencies({func0}));
+    auto func7 = ops::Identity(
+        s.WithOpName("Func/_7").WithControlDependencies({func6}), func5);
+    auto b_y_two = ops::Const(
+        s.WithOpName("b/y/two").WithControlDependencies({func6}), 2LL);
+    auto b_y_scale = ops::Cast(s.WithOpName("b/y/scale"), b_y_two, DT_FLOAT);
+    auto b_y_y = ops::Mul(s.WithOpName("b/y/y"), func7, b_y_scale);
+    auto func8 = ops::Identity(s.WithOpName("Func/_8"), b_y_y);
+
+    auto func2 = ops::Identity(s.WithOpName("Func/_2"), func8);
+    auto ret = ops::_Retval(s.WithOpName("b_RetVal"), func2, 0);
+
+    GraphDef expected;
+    TF_ASSERT_OK(s.ToGraphDef(&expected));
+
+    GraphDef actual;
+    g->ToGraphDef(&actual);
+    TF_EXPECT_GRAPH_EQ(expected, actual);
+  }
+}
+
 TEST_F(FunctionLibraryRuntimeTest, OptimizeGraph) {
   Init({test::function::XTimesTwo(), test::function::XTimesFour(),
         test::function::XTimes16()});
diff --git a/tensorflow/python/framework/function_test.py b/tensorflow/python/framework/function_test.py
index 39f00e5216..416ab263af 100644
--- a/tensorflow/python/framework/function_test.py
+++ b/tensorflow/python/framework/function_test.py
@@ -324,6 +324,48 @@ class FunctionTest(test.TestCase):
                                    "assertion"):
         _ = MyFn(100.0).eval()
 
+  def testControlFlowStrictness(self):
+    """Inlined functions must not execute in a untaken control flow branch."""
+
+    @function.Defun(dtypes.int32)
+    def AssertFail(x):
+      # Assertion that always fails and does not have a data dependency on `x`.
+      assert_false = control_flow_ops.Assert(False, [42])
+      with ops.control_dependencies([assert_false]):
+        return array_ops.identity(x)
+
+    with ops.device("CPU"):
+      pred = array_ops.placeholder(dtypes.bool)
+      x = array_ops.placeholder(dtypes.int32)
+      cond = control_flow_ops.cond(pred, lambda: x + 1, lambda: AssertFail(x))
+      # pylint: disable=unnecessary-lambda
+      loop = control_flow_ops.while_loop(lambda y: pred,
+                                         lambda y: AssertFail(y), [x])
+      # pylint: enable=unnecessary-lambda
+
+    # Enables inlining.
+    config = config_pb2.ConfigProto(graph_options=config_pb2.GraphOptions(
+        optimizer_options=config_pb2.OptimizerOptions(
+            opt_level=config_pb2.OptimizerOptions.L0,
+            do_common_subexpression_elimination=True,
+            do_function_inlining=True,
+            do_constant_folding=True)))
+
+    with session.Session(config=config) as sess:
+      # Since the 'False' branch is not taken, the assertion should not fire.
+      self.assertEqual(4, sess.run(cond, {pred: True, x: 3}))
+
+      # The assertion should still fire if the False branch is taken.
+      with self.assertRaisesRegexp(errors_impl.InvalidArgumentError,
+                                   "assertion"):
+        sess.run(cond, {pred: False, x: 3})
+
+      # Similarly for loops.
+      self.assertEqual(3, sess.run(loop, {pred: False, x: 3}))
+      with self.assertRaisesRegexp(errors_impl.InvalidArgumentError,
+                                   "assertion"):
+        sess.run(loop, {pred: True, x: 3})
+
   def testVar(self):
 
     @function.Defun(dtypes.float32)
diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index 91be9ddbd7..713cb65a40 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -1622,6 +1622,11 @@ class CondContext(ControlFlowContext):
           # pylint: enable=protected-access
       for x in op.outputs:
         self._values.add(x.name)
+      # pylint: disable=protected-access
+      if op.graph._is_function(op.type) or op.type == "SymbolicGradient":
+        op._add_control_input(self._pivot.op)
+      # pylint: enable=protected-access
+
     if self._outer_context or not IsLoopExit(op):
       op.graph.prevent_fetching(op)
 
@@ -2147,8 +2152,13 @@ class WhileContext(ControlFlowContext):
   def _MaybeAddControlDependency(self, op):
     """Add a control input to the op if it only depends on loop invariants."""
     def _IsOpFree(op):
+      """Determines if `op` needs a control dependency."""
       if op.control_inputs:
         return False
+      # pylint: disable=protected-access
+      if op.graph._is_function(op.type) or op.type == "SymbolicGradient":
+        return True
+      # pylint: enable=protected-access
       for x in op.inputs:
         if not _IsLoopConstantEnter(x.op):
           return False
-- 
GitLab


From 91c9366589b1082e5d9d8fdc70fe46666efb69a1 Mon Sep 17 00:00:00 2001
From: Kwotsin <kwotsin@users.noreply.github.com>
Date: Sun, 7 May 2017 01:50:35 +0800
Subject: [PATCH 1080/1563] Including batch_norm as the normalizer function by
 default, as mentioned in function description (#9652)

* fixed separable_conv2d description error and included batch_norm by default as mentioned in description

* Update layers.py

* Update layers.py
---
 tensorflow/contrib/layers/python/layers/layers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 32ca0c38d9..3681829f65 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -1087,7 +1087,7 @@ def convolution2d_transpose(
   """Adds a convolution2d_transpose with an optional batch normalization layer.
 
   The function creates a variable called `weights`, representing the
-  kernel, that is convolved with the input. If `batch_norm_params` is `None`, a
+  kernel, that is convolved with the input. If `normalizer_fn` is `None`, a
   second variable called 'biases' is added to the result of the operation.
 
   Args:
@@ -1847,9 +1847,9 @@ def separable_convolution2d(
   This op first performs a depthwise convolution that acts separately on
   channels, creating a variable called `depthwise_weights`. If `num_outputs`
   is not None, it adds a pointwise convolution that mixes channels, creating a
-  variable called `pointwise_weights`. Then, if `batch_norm_params` is None,
-  it adds bias to the result, creating a variable called 'biases', otherwise
-  it adds a batch normalization layer. It finally applies an activation function
+  variable called `pointwise_weights`. Then, if `normalizer_fn` is None,
+  it adds bias to the result, creating a variable called 'biases', otherwise,
+  the `normalizer_fn` is applied. It finally applies an activation function
   to produce the end result.
 
   Args:
-- 
GitLab


From b981c5d1c4f48073107c9079a354711f4d878b00 Mon Sep 17 00:00:00 2001
From: Androbin <robin.richtsfeld@gmail.com>
Date: Sat, 6 May 2017 20:01:35 +0200
Subject: [PATCH 1081/1563] suggest is_training not known at construction time
 (#9723)

* suggest is_training not known at construction time

* Slight modification to keep style with line 162
---
 tensorflow/docs_src/community/style_guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/community/style_guide.md b/tensorflow/docs_src/community/style_guide.md
index 767e33c3d0..602cb88d45 100644
--- a/tensorflow/docs_src/community/style_guide.md
+++ b/tensorflow/docs_src/community/style_guide.md
@@ -163,7 +163,7 @@ operation.
              it's present in the scope.
 
 * Layers that behave differently during training should have:
-  - `is_training`: `bool` to indicate if a training graph is been built.
+  - `is_training`: `bool` indicator if the graph is being built for training.
 
 
 Example:
-- 
GitLab


From 4be052a5fc9e6569fcf07da3e9615b463e008266 Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <sjhshy@gmail.com>
Date: Sun, 7 May 2017 03:02:54 +0900
Subject: [PATCH 1082/1563] Patch/170506 misspell (#9725)

* Fix misspells.

* Fix misspells.

* Fix misspells.
---
 CONTRIBUTING.md                                           | 2 +-
 .../distributions/python/ops/operator_pd_identity.py      | 2 +-
 tensorflow/contrib/keras/python/keras/datasets/imdb.py    | 2 +-
 tensorflow/contrib/keras/python/keras/datasets/reuters.py | 2 +-
 tensorflow/contrib/keras/python/keras/engine/topology.py  | 2 +-
 tensorflow/contrib/keras/python/keras/engine/training.py  | 2 +-
 .../contrib/keras/python/keras/layers/normalization.py    | 2 +-
 tensorflow/contrib/keras/python/keras/models.py           | 2 +-
 .../contrib/keras/python/keras/preprocessing/sequence.py  | 2 +-
 tensorflow/contrib/labeled_tensor/python/ops/core.py      | 2 +-
 tensorflow/contrib/layers/python/layers/feature_column.py | 4 ++--
 .../layers/python/layers/feature_column_ops_test.py       | 4 ++--
 .../contrib/layers/python/layers/feature_column_test.py   | 2 +-
 tensorflow/contrib/layers/python/layers/layers.py         | 4 ++--
 .../python/learn/estimators/dynamic_rnn_estimator.py      | 8 ++++----
 tensorflow/contrib/learn/python/learn/estimators/head.py  | 2 +-
 .../contrib/learn/python/learn/estimators/head_test.py    | 2 +-
 .../python/learn/estimators/state_saving_rnn_estimator.py | 8 ++++----
 tensorflow/contrib/learn/python/learn/monitors.py         | 2 +-
 tensorflow/contrib/makefile/README.md                     | 2 +-
 .../session_bundle/example/export_half_plus_two.py        | 2 +-
 tensorflow/contrib/slim/python/slim/learning_test.py      | 2 +-
 .../sparsemax/python/kernel_tests/sparsemax_loss_test.py  | 4 ++--
 .../sparsemax/python/kernel_tests/sparsemax_test.py       | 4 ++--
 tensorflow/contrib/tensor_forest/client/random_forest.py  | 2 +-
 tensorflow/contrib/training/python/training/evaluation.py | 2 +-
 tensorflow/contrib/training/python/training/feeder.py     | 4 ++--
 .../contrib/training/python/training/feeder_test.py       | 2 +-
 tensorflow/contrib/training/python/training/hparam.py     | 2 +-
 .../contrib/training/python/training/training_test.py     | 2 +-
 tensorflow/core/common_runtime/visitable_allocator.h      | 2 +-
 tensorflow/docs_src/install/install_java.md               | 2 +-
 tensorflow/python/debug/cli/debugger_cli_common.py        | 2 +-
 tensorflow/python/debug/cli/profile_analyzer_cli.py       | 2 +-
 tensorflow/python/debug/lib/debug_data.py                 | 2 +-
 tensorflow/python/debug/wrappers/hooks.py                 | 2 +-
 tensorflow/python/framework/subscribe.py                  | 2 +-
 tensorflow/python/framework/test_util.py                  | 2 +-
 tensorflow/python/kernel_tests/linalg_ops_test.py         | 2 +-
 tensorflow/python/layers/normalization.py                 | 2 +-
 tensorflow/python/ops/math_ops.py                         | 2 +-
 tensorflow/python/ops/metrics_impl.py                     | 6 +++---
 tensorflow/python/ops/parsing_ops.py                      | 2 +-
 tensorflow/python/training/coordinator.py                 | 2 +-
 tensorflow/python/util/deprecation.py                     | 2 +-
 tensorflow/stream_executor/lib/statusor.h                 | 2 +-
 tensorflow/tools/docs/py_guide_parser.py                  | 2 +-
 47 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c36ef1ecd3..c78b6b1a15 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ TensorFlow coding style.
 * Include unit tests when you contribute new features, as they help to
   a) prove that your code works correctly, b) guard against future breaking
   changes to lower the maintenance cost.
-* Bug fixes also generally require unit tests, because the presense of bugs
+* Bug fixes also generally require unit tests, because the presence of bugs
   usually indicates insufficient test coverage.
 * Keep API compatibility in mind when you change code in core TensorFlow,
   e.g., code in [tensorflow/core](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/core) and  [tensorflow/python](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/python).
diff --git a/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py b/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py
index e6947bf609..4cee299790 100644
--- a/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py
+++ b/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py
@@ -115,7 +115,7 @@ class OperatorPDIdentity(operator_pd.OperatorPDBase):
     """Static check that the argument `x` is proper `shape`, `dtype`."""
     # x is a typical argument e.g. to matmul or solve.  In both cases, x should
     # have the same type/shape since this is a square matrix.  These checks are
-    # ususally not needed since we ususally have some tensor backing this
+    # usually not needed since we usually have some tensor backing this
     # distribution, and the calls to tf.matmul do a shape/type check.
     #
     # Static checks only for efficiency, the identity should be fast.
diff --git a/tensorflow/contrib/keras/python/keras/datasets/imdb.py b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
index bafd92aca6..5c087fe63f 100644
--- a/tensorflow/contrib/keras/python/keras/datasets/imdb.py
+++ b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
@@ -41,7 +41,7 @@ def load_data(path='imdb.npz',
       num_words: max number of words to include. Words are ranked
           by how often they occur (in the training set) and only
           the most frequent words are kept
-      skip_top: skip the top N most frequently occuring words
+      skip_top: skip the top N most frequently occurring words
           (which may not be informative).
       maxlen: truncate sequences after this length.
       seed: random seed for sample shuffling.
diff --git a/tensorflow/contrib/keras/python/keras/datasets/reuters.py b/tensorflow/contrib/keras/python/keras/datasets/reuters.py
index 81e940a846..b1c22fee63 100644
--- a/tensorflow/contrib/keras/python/keras/datasets/reuters.py
+++ b/tensorflow/contrib/keras/python/keras/datasets/reuters.py
@@ -43,7 +43,7 @@ def load_data(path='reuters.npz',
       num_words: max number of words to include. Words are ranked
           by how often they occur (in the training set) and only
           the most frequent words are kept
-      skip_top: skip the top N most frequently occuring words
+      skip_top: skip the top N most frequently occurring words
           (which may not be informative).
       maxlen: truncate sequences after this length.
       test_split: Fraction of the dataset to be used as test data.
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 0336fc4bf4..3d9ed51a1c 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -649,7 +649,7 @@ class Layer(tf_base_layers.Layer):
                           'but was passed an input_mask: ' + str(mask))
       # masking not explicitly supported: return None as mask
       return None
-    # if masking is explictly supported, by default
+    # if masking is explicitly supported, by default
     # carry over the input mask
     return mask
 
diff --git a/tensorflow/contrib/keras/python/keras/engine/training.py b/tensorflow/contrib/keras/python/keras/engine/training.py
index ba6201713e..96d1c2f262 100644
--- a/tensorflow/contrib/keras/python/keras/engine/training.py
+++ b/tensorflow/contrib/keras/python/keras/engine/training.py
@@ -245,7 +245,7 @@ def _check_array_lengths(inputs, targets, weights):
 
 
 def _check_loss_and_target_compatibility(targets, loss_fns, output_shapes):
-  """Does validation on the compatiblity of targets and loss functions.
+  """Does validation on the compatibility of targets and loss functions.
 
   This helps prevent users from using loss functions incorrectly.
 
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index df77401aee..ea229fdce1 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -169,7 +169,7 @@ class BatchNormalization(Layer):
 
       def normalize_inference():
         if needs_broadcasting:
-          # In this case we must explictly broadcast all parameters.
+          # In this case we must explicitly broadcast all parameters.
           broadcast_moving_mean = K.reshape(self.moving_mean, broadcast_shape)
           broadcast_moving_variance = K.reshape(self.moving_variance,
                                                 broadcast_shape)
diff --git a/tensorflow/contrib/keras/python/keras/models.py b/tensorflow/contrib/keras/python/keras/models.py
index 52456a4bb5..1c041091fc 100644
--- a/tensorflow/contrib/keras/python/keras/models.py
+++ b/tensorflow/contrib/keras/python/keras/models.py
@@ -221,7 +221,7 @@ def load_model(filepath, custom_objects=None):
         obj: object, dict, or list.
 
     Returns:
-        The same structure, where occurences
+        The same structure, where occurrences
             of a custom object name have been replaced
             with the custom object.
     """
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py b/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py
index 5a24a63b01..692a359ead 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py
@@ -156,7 +156,7 @@ def skipgrams(sequence,
           of word indices (integers). If using a `sampling_table`,
           word indices are expected to match the rank
           of the words in a reference dataset (e.g. 10 would encode
-          the 10-th most frequently occuring token).
+          the 10-th most frequently occurring token).
           Note that index 0 is expected to be a non-word and will be skipped.
       vocabulary_size: int. maximum possible word index + 1
       window_size: int. actually half-window.
diff --git a/tensorflow/contrib/labeled_tensor/python/ops/core.py b/tensorflow/contrib/labeled_tensor/python/ops/core.py
index 393c7f93f3..e6aded92ca 100644
--- a/tensorflow/contrib/labeled_tensor/python/ops/core.py
+++ b/tensorflow/contrib/labeled_tensor/python/ops/core.py
@@ -810,7 +810,7 @@ def axis_order_scope(axis_order=None):
   Example usage:
 
     with lt.axis_order_scope(['x', 'y', 'z']):
-      # result is guranteed to have the correct axis order
+      # result is guaranteed to have the correct axis order
       result = w + b
 
   You can nest scopes, in which case only the inner-most scope applies, e.g.,
diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 95a4b032b0..451137190f 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -451,7 +451,7 @@ class _SparseColumn(
     return input_tensor
 
   def is_compatible(self, other_column):
-    """Check compatability of two sparse columns."""
+    """Check compatibility of two sparse columns."""
     if self.lookup_config and other_column.lookup_config:
       return self.lookup_config == other_column.lookup_config
     compatible = (self.length == other_column.length and
@@ -2069,7 +2069,7 @@ class _CrossedColumn(_FeatureColumn,
                                              "hash_key",
                                              "combiner", "ckpt_to_load_from",
                                              "tensor_name_in_ckpt"])):
-  """Represents a cross transformation also known as conjuction or combination.
+  """Represents a cross transformation also known as conjunction or combination.
 
   Instances of this class are immutable. It crosses given `columns`. Crossed
   column output will be hashed to hash_bucket_size.
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index 0123921266..7590ed4ca0 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -1467,8 +1467,8 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
     expected_input_shape = [4, 3, embedding_dimension]
     self.assertAllEqual(expected_input_shape, model_input.shape)
 
-    # `ids_tensor` consists of 7 instances of <empty>, 3 occurences of "b",
-    # 2 occurences of "c" and 1 instance of "a".
+    # `ids_tensor` consists of 7 instances of <empty>, 3 occurrences of "b",
+    # 2 occurrences of "c" and 1 instance of "a".
     expected_gradient_values = sorted([0., 3., 2., 1.] * embedding_dimension)
     actual_gradient_values = np.sort(gradients[0].values, axis=None)
     self.assertAllClose(expected_gradient_values, actual_gradient_values)
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_test.py b/tensorflow/contrib/layers/python/layers/feature_column_test.py
index aa3912a408..0f606a787d 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_test.py
@@ -173,7 +173,7 @@ class FeatureColumnTest(test.TestCase):
     for i in range(len(b1_value)):
       self.assertAllClose(b1_value[i], b2_value[i])
 
-    # Test the case when a shared_embedding_name is explictly specified.
+    # Test the case when a shared_embedding_name is explicitly specified.
     d = fc.shared_embedding_columns(
         [a1, a2],
         dimension=4,
diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 3681829f65..7a429f75bb 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -278,7 +278,7 @@ def _fused_batch_norm(
         trainable=trainable_gamma)
 
     # Create moving_mean and moving_variance variables and add them to the
-    # appropiate collections.
+    # appropriate collections.
     moving_mean_collections = utils.get_variable_collections(
         variables_collections, 'moving_mean')
     moving_mean_initializer = param_initializers.get(
@@ -632,7 +632,7 @@ def batch_norm(inputs,
                                        trainable=trainable)
 
     # Create moving_mean and moving_variance variables and add them to the
-    # appropiate collections. We disable variable partitioning while creating
+    # appropriate collections. We disable variable partitioning while creating
     # them, because assign_moving_average is not yet supported for partitioned
     # variables.
     partitioner = variable_scope.get_variable_scope().partitioner
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
index d86ef8d477..fc092fccd7 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
@@ -115,7 +115,7 @@ def dict_to_state_tuple(input_dict, cell):
 
 
 def _concatenate_context_input(sequence_input, context_input):
-  """Replicates `context_input` accross all timesteps of `sequence_input`.
+  """Replicates `context_input` across all timesteps of `sequence_input`.
 
   Expands dimension 1 of `context_input` then tiles it `sequence_length` times.
   This value is appended to `sequence_input` on dimension 2 and the result is
@@ -177,7 +177,7 @@ def build_sequence_input(features,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features i.e. features that apply accross all time
+      describing context features i.e. features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     weight_collections: List of graph collections to which weights are added.
@@ -419,7 +419,7 @@ def _get_dynamic_rnn_model_fn(
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     predict_probabilities: A boolean indicating whether to predict probabilities
@@ -603,7 +603,7 @@ class DynamicRnnEstimator(estimator.Estimator):
         describing sequence features. All items in the iterable should be
         instances of classes derived from `FeatureColumn`.
       context_feature_columns: An iterable containing all the feature columns
-        describing context features, i.e., features that apply accross all time
+        describing context features, i.e., features that apply across all time
         steps. All items in the set should be instances of classes derived from
         `FeatureColumn`.
       num_classes: the number of classes for a classification problem. Only
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 25f2922bf8..52b4213463 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -163,7 +163,7 @@ class Head(object):
           ModeFnOps.loss to compute and apply gradients.
       logits: logits `Tensor` to be used by the head.
       logits_input: `Tensor` from which to build logits, often needed when you
-        don't want to compute the logits. Typicaly this is the activation of the
+        don't want to compute the logits. Typically this is the activation of the
         last hidden layer in a DNN. Some heads (like the ones responsible for
         candidate sampling) intrinsically avoid computing full logits and only
         accepts logits_input.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index d5777088de..f7934fc188 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -895,7 +895,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       _assert_summary_tags(self, ["loss"])
       # logloss: z:label, x:logit
       # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
-      # expected_loss is (total_weighted_loss)/1 since htere is 1 nonzero
+      # expected_loss is (total_weighted_loss)/1 since there is 1 nonzero
       # weight.
       expected_loss = 0.062652342
       _assert_metrics(
diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
index 02acd70812..9cb4c3515a 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
@@ -144,7 +144,7 @@ def _prepare_features_for_sqss(features, labels, mode,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
 
@@ -261,7 +261,7 @@ def _read_batch(cell,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     num_threads: The Python integer number of threads enqueuing input examples
@@ -420,7 +420,7 @@ def _get_rnn_model_fn(cell_type,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     predict_probabilities: A boolean indicating whether to predict probabilities
@@ -563,7 +563,7 @@ class StateSavingRnnEstimator(estimator.Estimator):
         describing sequence features. All items in the set should be instances
         of classes derived from `FeatureColumn`.
       context_feature_columns: An iterable containing all the feature columns
-        describing context features, i.e., features that apply accross all time
+        describing context features, i.e., features that apply across all time
         steps. All items in the set should be instances of classes derived from
         `FeatureColumn`.
       num_classes: The number of classes for categorization. Used only and
diff --git a/tensorflow/contrib/learn/python/learn/monitors.py b/tensorflow/contrib/learn/python/learn/monitors.py
index 9f13392666..4d8f53c170 100644
--- a/tensorflow/contrib/learn/python/learn/monitors.py
+++ b/tensorflow/contrib/learn/python/learn/monitors.py
@@ -473,7 +473,7 @@ class LoggingTrainable(EveryN):
 
   def every_n_step_begin(self, step):
     super(LoggingTrainable, self).every_n_step_begin(step)
-    # Get a list of trainable variables at the begining of every N steps.
+    # Get a list of trainable variables at the beginning of every N steps.
     # We cannot get this in __init__ because train_op has not been generated.
     trainables = ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES,
                                     scope=self._scope)
diff --git a/tensorflow/contrib/makefile/README.md b/tensorflow/contrib/makefile/README.md
index f061b58775..9ba5c035a2 100644
--- a/tensorflow/contrib/makefile/README.md
+++ b/tensorflow/contrib/makefile/README.md
@@ -295,7 +295,7 @@ itself, you'll see it's broken up into host and target sections. If you are
 cross-compiling, you should look at customizing the target settings to match
 what you need for your desired system.
 
-## Dependency Managment
+## Dependency Management
 
 The Makefile loads in a list of dependencies stored in text files. These files
 are generated from the main Bazel build by running 
diff --git a/tensorflow/contrib/session_bundle/example/export_half_plus_two.py b/tensorflow/contrib/session_bundle/example/export_half_plus_two.py
index 08ca47058c..4a56509e59 100644
--- a/tensorflow/contrib/session_bundle/example/export_half_plus_two.py
+++ b/tensorflow/contrib/session_bundle/example/export_half_plus_two.py
@@ -97,7 +97,7 @@ def Export(export_dir, use_checkpoint_v2):
     }
 
     # Create two filename assets and corresponding tensors.
-    # TODO(b/26254158) Consider adding validation of file existance as well as
+    # TODO(b/26254158) Consider adding validation of file existence as well as
     # hashes (e.g. sha1) for consistency.
     original_filename1 = tf.constant("hello1.txt")
     tf.add_to_collection(tf.GraphKeys.ASSET_FILEPATHS, original_filename1)
diff --git a/tensorflow/contrib/slim/python/slim/learning_test.py b/tensorflow/contrib/slim/python/slim/learning_test.py
index cf3a878450..83d45f6f5a 100644
--- a/tensorflow/contrib/slim/python/slim/learning_test.py
+++ b/tensorflow/contrib/slim/python/slim/learning_test.py
@@ -840,7 +840,7 @@ class TrainTest(test.TestCase):
         # Initialize the variables.
         sess.run(variables_lib.global_variables_initializer())
 
-        # Get the intial weights and biases values.
+        # Get the initial weights and biases values.
         weights_values, biases_values = sess.run([weights, biases])
         self.assertGreater(np.linalg.norm(weights_values), 0)
         self.assertAlmostEqual(np.linalg.norm(biases_values), 0)
diff --git a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py
index 89dbcd96f8..c8b4e472c9 100644
--- a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py
+++ b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py
@@ -159,7 +159,7 @@ class SparsemaxLossTest(test.TestCase):
     self.assertShapeEqual(q, tf_sparsemax_op)
 
   def _test_gradient_against_estimate(self, dtype, random, use_gpu):
-    """check sparsemax-loss Rop, aginst estimated-loss Rop"""
+    """check sparsemax-loss Rop, against estimated-loss Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10)).astype(dtype)
     q = np.zeros((test_obs, 10)).astype(dtype)
     q[np.arange(0, test_obs), np.random.randint(0, 10, size=test_obs)] = 1
@@ -178,7 +178,7 @@ class SparsemaxLossTest(test.TestCase):
     self.assertLess(err, 1e-4)
 
   def _test_gradient_against_numpy(self, dtype, random, use_gpu):
-    """check sparsemax-loss Rop, aginst numpy Rop"""
+    """check sparsemax-loss Rop, against numpy Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10))
     q = np.zeros((test_obs, 10))
     q[np.arange(0, test_obs), np.random.randint(0, 10, size=test_obs)] = 1
diff --git a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py
index eafac1b9ae..82d36ee9cb 100644
--- a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py
+++ b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py
@@ -188,7 +188,7 @@ class SparsemaxTest(test.TestCase):
     self.assertShapeEqual(z, tf_sparsemax_op)
 
   def _test_gradient_against_estimate(self, dtype, random, use_gpu):
-    """check sparsemax Rop, aginst estimated Rop"""
+    """check sparsemax Rop, against estimated Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10)).astype(dtype)
 
     logits = array_ops.placeholder(dtype, name='z')
@@ -204,7 +204,7 @@ class SparsemaxTest(test.TestCase):
     self.assertLess(err, 1e-4)
 
   def _test_gradient_against_numpy(self, dtype, random, use_gpu):
-    """check sparsemax Rop, aginst numpy Rop"""
+    """check sparsemax Rop, against numpy Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10)).astype(dtype)
 
     logits = constant_op.constant(z, name='z')
diff --git a/tensorflow/contrib/tensor_forest/client/random_forest.py b/tensorflow/contrib/tensor_forest/client/random_forest.py
index 01697df086..5f6e8119ac 100644
--- a/tensorflow/contrib/tensor_forest/client/random_forest.py
+++ b/tensorflow/contrib/tensor_forest/client/random_forest.py
@@ -79,7 +79,7 @@ class TensorForestLossHook(session_run_hook.SessionRunHook):
     current_loss = run_values.results['current_loss']
     current_step = run_values.results['global_step']
     self.steps += 1
-    # Gaurd against the global step going backwards, which might happen
+    # Guard against the global step going backwards, which might happen
     # if we recover from something.
     if self.last_step == -1 or self.last_step > current_step:
       logging.info('TensorForestLossHook resetting last_step.')
diff --git a/tensorflow/contrib/training/python/training/evaluation.py b/tensorflow/contrib/training/python/training/evaluation.py
index 8a985fe0e2..bc0c60c85c 100644
--- a/tensorflow/contrib/training/python/training/evaluation.py
+++ b/tensorflow/contrib/training/python/training/evaluation.py
@@ -254,7 +254,7 @@ def checkpoints_iterator(checkpoint_dir,
         logging.info('Timed-out waiting for a checkpoint.')
         return
       if timeout_fn():
-        # The timeout_fn indicated that we are truely done.
+        # The timeout_fn indicated that we are truly done.
         return
       else:
         # The timeout_fn indicated that more checkpoints may come.
diff --git a/tensorflow/contrib/training/python/training/feeder.py b/tensorflow/contrib/training/python/training/feeder.py
index a7f43cc07e..a5cd7c5c94 100644
--- a/tensorflow/contrib/training/python/training/feeder.py
+++ b/tensorflow/contrib/training/python/training/feeder.py
@@ -18,7 +18,7 @@
 
 This helper handles the plumbing in order to set up a feeder task to
 push generated inputs to a pool of remote consumers; or to run an
-identical feeding mechanism in a seperate thread in the same process.
+identical feeding mechanism in a separate thread in the same process.
 
 Example usage for distributed feeding:
 
@@ -331,7 +331,7 @@ class Feeder(object):
     they never close their queue. Second, they are added to the
     `Feeder.REMOTE_QUEUE_RUNNERS` collection, rather than
     `ops.GraphKeys.QUEUE_RUNNERS`, so they can be started/stopped
-    seperately.
+    separately.
 
     Args:
       queue: The queue.
diff --git a/tensorflow/contrib/training/python/training/feeder_test.py b/tensorflow/contrib/training/python/training/feeder_test.py
index 4d5cf9eff2..f3a2fee046 100644
--- a/tensorflow/contrib/training/python/training/feeder_test.py
+++ b/tensorflow/contrib/training/python/training/feeder_test.py
@@ -156,7 +156,7 @@ class FeederTest(test.TestCase):
     coord.join()
 
   def testFeederSeparateThread(self):
-    # Start a feeder on a seperate thread, but with a shared local queue
+    # Start a feeder on a separate thread, but with a shared local queue
     servers = self._create_local_cluster(worker=1)
     coord = coordinator.Coordinator()
     feed_thread = FeederThread(self, coord, servers, 'worker', 0)
diff --git a/tensorflow/contrib/training/python/training/hparam.py b/tensorflow/contrib/training/python/training/hparam.py
index 1d17782820..2e08593699 100644
--- a/tensorflow/contrib/training/python/training/hparam.py
+++ b/tensorflow/contrib/training/python/training/hparam.py
@@ -164,7 +164,7 @@ class HParams(object):
   import argparse
   parser = argparse.ArgumentParser(description='Train my model.')
   parser.add_argument('--hparams', type=str,
-                      help='Comma seperated list of "name=value" pairs.')
+                      help='Comma separated list of "name=value" pairs.')
   args = parser.parse_args()
   ...
   def my_program():
diff --git a/tensorflow/contrib/training/python/training/training_test.py b/tensorflow/contrib/training/python/training/training_test.py
index e7c8fcd2a0..0af79cf2e3 100644
--- a/tensorflow/contrib/training/python/training/training_test.py
+++ b/tensorflow/contrib/training/python/training/training_test.py
@@ -508,7 +508,7 @@ class TrainTest(test.TestCase):
         # Initialize the variables.
         session.run(variables_lib2.global_variables_initializer())
 
-        # Get the intial weights and biases values.
+        # Get the initial weights and biases values.
         weights_values, biases_values = session.run([weights, biases])
         self.assertGreater(np.linalg.norm(weights_values), 0)
         self.assertAlmostEqual(np.linalg.norm(biases_values), 0)
diff --git a/tensorflow/core/common_runtime/visitable_allocator.h b/tensorflow/core/common_runtime/visitable_allocator.h
index c83e4a4e3a..8edf922d11 100644
--- a/tensorflow/core/common_runtime/visitable_allocator.h
+++ b/tensorflow/core/common_runtime/visitable_allocator.h
@@ -44,7 +44,7 @@ class VisitableAllocator : public Allocator {
 };
 
 // Needed for cases when a VisitableAllocator gets wrapped for tracking.
-// Multiple-inheritance is considered acceptible in this case because
+// Multiple-inheritance is considered acceptable in this case because
 // VisitableAllocator is a pure virtual interface and only TrackingAllocator
 // has default implementation.
 class TrackingVisitableAllocator : public TrackingAllocator,
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 55d9c2c08f..bf7f6db82f 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -106,7 +106,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
 
 
 The preceding command should output <tt>Hello from <i>version</i></tt>. If it
-does, you've succesfully set up TensorFlow for Java and are ready to use it in
+does, you've successfully set up TensorFlow for Java and are ready to use it in
 Maven projects. If not, check
 [Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow)
 for possible solutions.  You can skip reading the rest of this document.
diff --git a/tensorflow/python/debug/cli/debugger_cli_common.py b/tensorflow/python/debug/cli/debugger_cli_common.py
index 64a22e6be4..889fc6a8f6 100644
--- a/tensorflow/python/debug/cli/debugger_cli_common.py
+++ b/tensorflow/python/debug/cli/debugger_cli_common.py
@@ -648,7 +648,7 @@ class CommandHandlerRegistry(object):
         3) the handler is found for the prefix, but it fails to return a
           RichTextLines or raise any exception.
       CommandLineExit:
-        If the command handler raises this type of exception, tihs method will
+        If the command handler raises this type of exception, this method will
         simply pass it along.
     """
     if not prefix:
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
index 42440521eb..7de2c6329e 100644
--- a/tensorflow/python/debug/cli/profile_analyzer_cli.py
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli.py
@@ -55,7 +55,7 @@ class ProfileDatum(object):
 
   @property
   def exec_time(self):
-    """Measures compute function exection time plus pre- and post-processing."""
+    """Measures compute function execution time plus pre- and post-processing."""
     return self.node_exec_stats.all_end_rel_micros
 
 
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index ce4bc82e0a..de1e1ce017 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -975,7 +975,7 @@ class DebugDumpDir(object):
       slot = datum.output_slot
       # In some cases (e.g., system clocks with insufficient precision),
       # the upstream and downstream tensors may have identical timestamps, the
-      # following check examines this possibilty and avoids raising an error if
+      # following check examines this possibility and avoids raising an error if
       # that is the case.
       if not self._satisfied_at_timestamp(
           pending_inputs[node], datum.timestamp, start_i=i + 1):
diff --git a/tensorflow/python/debug/wrappers/hooks.py b/tensorflow/python/debug/wrappers/hooks.py
index 65713f0b71..b0344a5029 100644
--- a/tensorflow/python/debug/wrappers/hooks.py
+++ b/tensorflow/python/debug/wrappers/hooks.py
@@ -66,7 +66,7 @@ class LocalCLIDebugHook(session_run_hook.SessionRunHook,
     """Add a tensor filter.
 
     See doc of `LocalCLIDebugWrapperSession.add_tensor_filter()` for details.
-    Override default behavior to accomodate the possibility of this method being
+    Override default behavior to accommodate the possibility of this method being
     called prior to the initialization of the underlying
     `LocalCLIDebugWrapperSession` object.
 
diff --git a/tensorflow/python/framework/subscribe.py b/tensorflow/python/framework/subscribe.py
index 91c6e33f22..2654bca31c 100644
--- a/tensorflow/python/framework/subscribe.py
+++ b/tensorflow/python/framework/subscribe.py
@@ -276,7 +276,7 @@ def subscribe(tensors, side_effects):
     Subscribed tensors, which are identity copies of the passed in tensors
       in the same passed in structure, but the graph has been modified
       such that these are downstream of the control dependencies for
-      the side effect graphs. Use these functionally equivelant tensors
+      the side effect graphs. Use these functionally equivalent tensors
       instead of the passed in tensors for further construction or running.
   """
   if not hasattr(side_effects, '__iter__'):
diff --git a/tensorflow/python/framework/test_util.py b/tensorflow/python/framework/test_util.py
index c3169e23a5..ac551a6e1a 100644
--- a/tensorflow/python/framework/test_util.py
+++ b/tensorflow/python/framework/test_util.py
@@ -250,7 +250,7 @@ class TensorFlowTestCase(googletest.TestCase):
     """Returns a unique temporary directory for the test to use.
 
     If you call this method multiple times during in a test, it will return the
-    same folder. However, accross different runs the directories will be
+    same folder. However, across different runs the directories will be
     different. This will ensure that across different runs tests will not be
     able to pollute each others environment.
     If you need multiple unique directories within a single test, you should
diff --git a/tensorflow/python/kernel_tests/linalg_ops_test.py b/tensorflow/python/kernel_tests/linalg_ops_test.py
index 153d4ab662..2d31ac85b0 100644
--- a/tensorflow/python/kernel_tests/linalg_ops_test.py
+++ b/tensorflow/python/kernel_tests/linalg_ops_test.py
@@ -28,7 +28,7 @@ from tensorflow.python.platform import test
 
 
 def _random_pd_matrix(n, rng):
-  """Random postive definite matrix."""
+  """Random positive definite matrix."""
   temp = rng.randn(n, n)
   return temp.dot(temp.T)
 
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index f92ea9b05f..b3d28f010f 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -322,7 +322,7 @@ class BatchNormalization(base.Layer):
 
     def _broadcast(v):
       if needs_broadcasting and v is not None:
-        # In this case we must explictly broadcast all parameters.
+        # In this case we must explicitly broadcast all parameters.
         return array_ops.reshape(v, broadcast_shape)
       return v
 
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index b762205cf7..158016ff37 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -2331,7 +2331,7 @@ def tensordot(a, b, axes, name=None):
     using `array_ops.transpose` and `array_ops.reshape`. The method takes a
     tensor and performs the correct transpose and reshape operation for a given
     set of indices. It returns the reshaped tensor as well as a list of indices
-    necesary to reshape the tensor again after matrix multiplication.
+    necessary to reshape the tensor again after matrix multiplication.
 
     Args:
       a: `Tensor`.
diff --git a/tensorflow/python/ops/metrics_impl.py b/tensorflow/python/ops/metrics_impl.py
index 28ed3af9d7..0d35f50894 100644
--- a/tensorflow/python/ops/metrics_impl.py
+++ b/tensorflow/python/ops/metrics_impl.py
@@ -1735,7 +1735,7 @@ def _streaming_sparse_true_positive_at_k(labels,
     A tuple of `Variable` and update `Operation`.
 
   Raises:
-    ValueError: If `weights` is not `None` and has an incomptable shape.
+    ValueError: If `weights` is not `None` and has an incompatible shape.
   """
   with ops.name_scope(
       name, _at_k_name('true_positive', k, class_id=class_id),
@@ -1831,7 +1831,7 @@ def _streaming_sparse_false_negative_at_k(labels,
     A tuple of `Variable` and update `Operation`.
 
   Raises:
-    ValueError: If `weights` is not `None` and has an incomptable shape.
+    ValueError: If `weights` is not `None` and has an incompatible shape.
   """
   with ops.name_scope(
       name, _at_k_name('false_negative', k, class_id=class_id),
@@ -2653,7 +2653,7 @@ def _streaming_sparse_false_positive_at_k(labels,
     A tuple of `Variable` and update `Operation`.
 
   Raises:
-    ValueError: If `weights` is not `None` and has an incomptable shape.
+    ValueError: If `weights` is not `None` and has an incompatible shape.
   """
   with ops.name_scope(
       name, _at_k_name('false_positive', k, class_id=class_id),
diff --git a/tensorflow/python/ops/parsing_ops.py b/tensorflow/python/ops/parsing_ops.py
index 796ea20eb7..c2f9961731 100644
--- a/tensorflow/python/ops/parsing_ops.py
+++ b/tensorflow/python/ops/parsing_ops.py
@@ -58,7 +58,7 @@ class SparseFeature(
         ["index_key", "value_key", "dtype", "size", "already_sorted"])):
   """Configuration for parsing a sparse input feature from an `Example`.
 
-  Note, preferrably use `VarLenFeature` (possibly in combination with a
+  Note, preferably use `VarLenFeature` (possibly in combination with a
   `SequenceExample`) in order to parse out `SparseTensor`s instead of
   `SparseFeature` due to its simplicity.
 
diff --git a/tensorflow/python/training/coordinator.py b/tensorflow/python/training/coordinator.py
index fea2f8240e..d234df71c1 100644
--- a/tensorflow/python/training/coordinator.py
+++ b/tensorflow/python/training/coordinator.py
@@ -366,7 +366,7 @@ class Coordinator(object):
     # If any thread is still alive, wait for the grace period to expire.
     # By the time this check is executed, threads may still be shutting down,
     # so we add a sleep of increasing duration to give them a chance to shut
-    # down without loosing too many cycles.
+    # down without losing too many cycles.
     # The sleep duration is limited to the remaining grace duration.
     stop_wait_secs = 0.001
     while any(t.is_alive() for t in threads) and stop_grace_period_secs >= 0.0:
diff --git a/tensorflow/python/util/deprecation.py b/tensorflow/python/util/deprecation.py
index 73fc3e2408..1e1599afb4 100644
--- a/tensorflow/python/util/deprecation.py
+++ b/tensorflow/python/util/deprecation.py
@@ -182,7 +182,7 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
     return d
 
   def _get_deprecated_positional_arguments(names_to_ok_vals, arg_spec):
-    """Builds a dictionary from deprecated arguments to thier spec.
+    """Builds a dictionary from deprecated arguments to their spec.
 
     Returned dict is keyed by argument name.
     Each value is a DeprecatedArgSpec with the following fields:
diff --git a/tensorflow/stream_executor/lib/statusor.h b/tensorflow/stream_executor/lib/statusor.h
index 06278d5152..bb423e390a 100644
--- a/tensorflow/stream_executor/lib/statusor.h
+++ b/tensorflow/stream_executor/lib/statusor.h
@@ -135,7 +135,7 @@ class StatusOr {
   // operators, to support move-only types and avoid unnecessary copying.
   StatusOr(T&& value);  // NOLINT
 
-  // Move conversion operator to avoid unecessary copy.
+  // Move conversion operator to avoid unnecessary copy.
   // T must be assignable from U.
   // Not marked with explicit so the implicit conversion can happen.
   template <typename U>
diff --git a/tensorflow/tools/docs/py_guide_parser.py b/tensorflow/tools/docs/py_guide_parser.py
index 3ca6d11b84..245643cb32 100644
--- a/tensorflow/tools/docs/py_guide_parser.py
+++ b/tensorflow/tools/docs/py_guide_parser.py
@@ -34,7 +34,7 @@ def md_files_in_dir(py_guide_src_dir):
 class PyGuideParser(object):
   """Simple parsing of a guide .md file.
 
-  Decendents can override the process_*() functions (called by process())
+  Descendants can override the process_*() functions (called by process())
   to either record infromation from the guide, or call replace_line()
   to affect the return value of process().
   """
-- 
GitLab


From d5956e3e6a30ec7c81a36d0ab82656e865716f84 Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <sjhshy@gmail.com>
Date: Sun, 7 May 2017 03:03:33 +0900
Subject: [PATCH 1083/1563] Added 2 unit tests for BasicLSTMCell to check
 ValueError. (#9693)

* Added 2 unit tests for BasicLSTMCell to check ValueError.

* spelling error

* change assertRaisesRegexp => assertRaises

* some lint fixes
---
 .../python/kernel_tests/core_rnn_cell_test.py | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
index f4589e3d9e..89ad0fcd75 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
@@ -194,6 +194,44 @@ class RNNCellTest(test.TestCase):
              m.name: 0.1 * np.ones([1, 4])})
         self.assertEqual(len(res), 2)
 
+  def testBasicLSTMCellDimension0Error(self):
+    """Tests that dimension 0 in both(x and m) shape must be equal."""
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root", initializer=init_ops.constant_initializer(0.5)):
+        num_units = 2
+        state_size = num_units * 2
+        batch_size = 3
+        input_size = 4
+        x = array_ops.zeros([batch_size, input_size])
+        m = array_ops.zeros([batch_size - 1, state_size])
+        with self.assertRaises(ValueError):
+          g, out_m = core_rnn_cell_impl.BasicLSTMCell(
+              num_units, state_is_tuple=False)(x, m)
+          sess.run([variables_lib.global_variables_initializer()])
+          sess.run([g, out_m],
+                   {x.name: 1 * np.ones([batch_size, input_size]),
+               m.name: 0.1 * np.ones([batch_size - 1, state_size])})
+
+  def testBasicLSTMCellStateSizeError(self):
+    """Tests that state_size must be num_units * 2."""
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root", initializer=init_ops.constant_initializer(0.5)):
+        num_units = 2
+        state_size = num_units * 3 # state_size must be num_units * 2
+        batch_size = 3
+        input_size = 4
+        x = array_ops.zeros([batch_size, input_size])
+        m = array_ops.zeros([batch_size, state_size])
+        with self.assertRaises(ValueError):
+          g, out_m = core_rnn_cell_impl.BasicLSTMCell(
+              num_units, state_is_tuple=False)(x, m)
+          sess.run([variables_lib.global_variables_initializer()])
+          sess.run([g, out_m],
+                   {x.name: 1 * np.ones([batch_size, input_size]),
+                    m.name: 0.1 * np.ones([batch_size, state_size])})
+
   def testBasicLSTMCellStateTupleType(self):
     with self.test_session():
       with variable_scope.variable_scope(
-- 
GitLab


From 3358855e0146524dddc038dffa6efcff0ff096eb Mon Sep 17 00:00:00 2001
From: Androbin <robin.richtsfeld@gmail.com>
Date: Sat, 6 May 2017 21:07:06 +0200
Subject: [PATCH 1084/1563] make usage of is_training more clear (#9730)

* make usage of is_training more clear

This is the continuation of #9723.

* Wrap lines
---
 tensorflow/docs_src/community/style_guide.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/community/style_guide.md b/tensorflow/docs_src/community/style_guide.md
index 602cb88d45..f90a6cf938 100644
--- a/tensorflow/docs_src/community/style_guide.md
+++ b/tensorflow/docs_src/community/style_guide.md
@@ -162,9 +162,9 @@ operation.
   - `reuse`: `bool` indicator if the variable should be reused if
              it's present in the scope.
 
-* Layers that behave differently during training should have:
-  - `is_training`: `bool` indicator if the graph is being built for training.
-
+* Layers that behave differently during training should take:
+  - `is_training`: `bool` indicator to conditionally choose different 
+                   computation paths (e.g. using `tf.cond`) during execution.
 
 Example:
 
-- 
GitLab


From b96fa4fc4c4b82b4ee74328449678a656454faac Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Sat, 6 May 2017 11:58:51 -0800
Subject: [PATCH 1085/1563] Automated rollback of change 155258346 Change:
 155292907

---
 tensorflow/contrib/tfprof/README.md           |  10 +-
 .../contrib/tfprof/python/tools/tfprof/BUILD  |  21 +-
 .../python/tools/tfprof/model_analyzer.py     |  41 +--
 .../tools/tfprof/model_analyzer_test.py       | 150 ++--------
 .../tools/tfprof/model_analyzer_testlib.py    |  67 -----
 .../tools/tfprof/print_model_analysis_test.py |   9 +-
 .../python/tools/tfprof/tfprof_logger.py      |  45 +--
 tensorflow/tools/tfprof/README.md             |  80 +----
 tensorflow/tools/tfprof/internal/BUILD        |  42 ---
 .../tfprof/internal/print_model_analysis.cc   |  21 +-
 .../tools/tfprof/internal/tfprof_code.cc      | 216 --------------
 .../tools/tfprof/internal/tfprof_code.h       |  89 ------
 .../tools/tfprof/internal/tfprof_graph.cc     |   8 +-
 .../tools/tfprof/internal/tfprof_graph.h      |   8 +-
 .../tools/tfprof/internal/tfprof_node.cc      |   5 +-
 .../tools/tfprof/internal/tfprof_node.h       |  96 +-----
 .../tools/tfprof/internal/tfprof_options.h    |   2 +-
 .../tools/tfprof/internal/tfprof_scope.cc     |   8 +-
 .../tools/tfprof/internal/tfprof_scope.h      |   6 +-
 .../tools/tfprof/internal/tfprof_show.cc      |  13 +-
 .../tools/tfprof/internal/tfprof_show.h       |  16 +-
 .../tools/tfprof/internal/tfprof_show_code.cc | 275 ------------------
 .../tools/tfprof/internal/tfprof_show_code.h  | 124 --------
 .../tools/tfprof/internal/tfprof_stats.cc     |  31 +-
 .../tools/tfprof/internal/tfprof_stats.h      |  13 +-
 .../tfprof/internal/tfprof_stats_test.cc      |  24 +-
 .../tfprof/internal/tfprof_tensor_test.cc     |   4 +-
 tensorflow/tools/tfprof/tfprof_log.proto      |  13 -
 tensorflow/tools/tfprof/tfprof_main.cc        |  16 +-
 tensorflow/tools/tfprof/tfprof_options.proto  |   2 +-
 tensorflow/tools/tfprof/tfprof_output.proto   |  34 +--
 31 files changed, 160 insertions(+), 1329 deletions(-)
 delete mode 100644 tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_code.cc
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_code.h
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_show_code.cc
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_show_code.h

diff --git a/tensorflow/contrib/tfprof/README.md b/tensorflow/contrib/tfprof/README.md
index d891ecdc9a..c7ff4a2921 100644
--- a/tensorflow/contrib/tfprof/README.md
+++ b/tensorflow/contrib/tfprof/README.md
@@ -11,12 +11,7 @@ Consultants: Jon Shlens, Pete Warden
 1.  Measure model parameters, float operations, tensor shapes.
 2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  3 ways to view and explore TensorFlow model profiles
-
-    *  Organize by Python code call stack.
-    *  Organize by TensorFlow operation name scope hierarchies.
-    *  Organize by TensorFlow operation inputs/outputs graph.
-
+4.  Explore model based on name scope or graph structure.
 5.  Selectively grouping/filtering/accounting/ordering ops.
 
 tfprof can be used as Python API, Interactive CLI and One-shot Script.
@@ -33,8 +28,7 @@ param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tfprof_options=tf.contrib.tfprof.model_analyzer.
         TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
 
-# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
-# It organize the statistics
+# param_stats is tensorflow.tfprof.TFProfNode proto. It organize the statistics
 # of each graph node in tree scructure. Let's print the root below.
 sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
 ```
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
index 22bca93c87..818c2d2cbf 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
@@ -23,31 +23,14 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":model_analyzer",
-        ":model_analyzer_testlib",
-        "//tensorflow/python:client",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:platform",
-        "//tensorflow/python:variables",
-    ],
-)
-
-py_library(
-    name = "model_analyzer_testlib",
-    srcs = ["model_analyzer_testlib.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":model_analyzer",
-        "//tensorflow/contrib/rnn:rnn_py",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:init_ops",
-        "//tensorflow/python:math_ops",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:platform",
-        "//tensorflow/python:rnn",
-        "//tensorflow/python:training",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
     ],
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
index 13b407d815..cc94fd65b5 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
@@ -123,7 +123,7 @@ def print_model_analysis(graph,
   """Print model statistics.
 
     Prints the model statistics to stdout. Also returns the results
-    in a TFGraphNodeProto proto. See go/tfprof or run tfprof tool:
+    in a TFProfNode proto. See go/tfprof or run tfprof tool:
     'bazel run third_party/tensorflow/tools/tfprof help'
 
     Examples:
@@ -142,19 +142,15 @@ def print_model_analysis(graph,
               'micros' and 'bytes'.
     op_log: tensorflow::tfprof::OpLog proto. users can use this proto to
             group together ops and use a op_type to select the group.
-    tfprof_cmd: string. Either 'scope', 'graph', 'code'.
-                'scope' view organize outputs using ops' name scope.
-                'graph' view organize outputs using op's inputs/outputs.
-                'code' view organize outputs using Python call stack.
+    tfprof_cmd: string. Either 'scope' or 'graph'. 'scope' view organize
+                ops using their name scopes. 'graph' view organize ops using
+                their graph inputs.
     tfprof_options: See 'tfprof help' for details.
   Returns:
-    If tfprof_cmd is 'scope' or 'graph', returns TFGraphNodeProto proto.
-    If tfprof_cmd is 'code', returns TFCodeNodeProto proto.
-    Side effect: a formatted output to stdout.
+    TFProfNode proto. Side effect: a formatted output to stdout.
   """
   # pylint: disable=protected-access
-  op_log = tfprof_logger._merge_default_with_oplog(
-      graph, op_log, run_meta, add_trace=tfprof_cmd == 'code')
+  op_log = tfprof_logger._merge_default_with_oplog(graph, op_log, run_meta)
   # pylint: enable=protected-access
   opts = tfprof_options_pb2.OptionsProto()
   opts.max_depth = tfprof_options['max_depth']
@@ -182,24 +178,11 @@ def print_model_analysis(graph,
   opts.dump_to_file = tfprof_options['dump_to_file']
 
   run_meta_str = run_meta.SerializeToString() if run_meta else b''
+  op_log_str = op_log.SerializeToString() if op_log else b''
 
-  if tfprof_cmd == 'code':
-    tfprof_node = tfprof_output_pb2.TFCodeNodeProto()
-    tfprof_node.ParseFromString(
-        print_mdl.PrintModelAnalysis(
-            graph.as_graph_def().SerializeToString(),
-            run_meta_str,
-            op_log.SerializeToString(),
-            tfprof_cmd.encode('utf-8'),
-            opts.SerializeToString()))
-  else:
-    tfprof_node = tfprof_output_pb2.TFGraphNodeProto()
-    tfprof_node.ParseFromString(
-        print_mdl.PrintModelAnalysis(
-            graph.as_graph_def().SerializeToString(),
-            run_meta_str,
-            op_log.SerializeToString(),
-            tfprof_cmd.encode('utf-8'),
-            opts.SerializeToString()))
-
+  tfprof_node = tfprof_output_pb2.TFProfNode()
+  tfprof_node.ParseFromString(
+      print_mdl.PrintModelAnalysis(
+          graph.as_graph_def().SerializeToString(), run_meta_str, op_log_str,
+          tfprof_cmd.encode('utf-8'), opts.SerializeToString()))
   return tfprof_node
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
index ac0d46d4ae..66b9267cbe 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
@@ -18,27 +18,49 @@ from __future__ import division
 from __future__ import print_function
 
 import os
+
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 
 # XXX: this depends on pywrap_tensorflow and must come later
 from tensorflow.contrib.tfprof.python.tools.tfprof import model_analyzer
-from tensorflow.contrib.tfprof.python.tools.tfprof import model_analyzer_testlib as lib
 
 
 class PrintModelAnalysisTest(test.TestCase):
 
+  def _BuildSmallModel(self):
+    image = array_ops.zeros([2, 6, 6, 3])
+    _ = variable_scope.get_variable(
+        'ScalarW', [],
+        dtypes.float32,
+        initializer=init_ops.random_normal_initializer(stddev=0.001))
+    kernel = variable_scope.get_variable(
+        'DW', [3, 3, 3, 6],
+        dtypes.float32,
+        initializer=init_ops.random_normal_initializer(stddev=0.001))
+    x = nn_ops.conv2d(image, kernel, [1, 2, 2, 1], padding='SAME')
+    kernel = variable_scope.get_variable(
+        'DW2', [2, 2, 6, 12],
+        dtypes.float32,
+        initializer=init_ops.random_normal_initializer(stddev=0.001))
+    x = nn_ops.conv2d(x, kernel, [1, 2, 2, 1], padding='SAME')
+    return x
+
   def testDumpToFile(self):
-    ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
     opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
 
     with session.Session() as sess, ops.device('/cpu:0'):
-      _ = lib.BuildSmallModel()
+      _ = self._BuildSmallModel()
       model_analyzer.print_model_analysis(sess.graph, tfprof_options=opts)
 
       with gfile.Open(opts['dump_to_file'], 'r') as f:
@@ -49,7 +71,6 @@ class PrintModelAnalysisTest(test.TestCase):
                          f.read())
 
   def testSelectEverything(self):
-    ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
     opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
     opts['account_type_regexes'] = ['.*']
@@ -57,10 +78,8 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device', 'op_types'
     ]
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
-      x = lib.BuildSmallModel()
+    with session.Session() as sess, ops.device('/cpu:0'):
+      x = self._BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
       run_meta = config_pb2.RunMetadata()
@@ -79,121 +98,6 @@ class PrintModelAnalysisTest(test.TestCase):
             f.read())
         # pylint: enable=line-too-long
 
-  def testSimpleCodeView(self):
-    ops.reset_default_graph()
-    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
-    opts['account_type_regexes'] = ['.*']
-    opts['show_name_regexes'] = ['.*model_analyzer_testlib.*']
-    opts['account_displayed_op_only'] = False
-    # TODO(xpan): Test 'micros'. Since the execution time changes each run,
-    # it's a bit difficult to test it now.
-    opts['select'] = [
-        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
-    ]
-
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
-      x = lib.BuildSmallModel()
-
-      sess.run(variables.global_variables_initializer())
-      run_meta = config_pb2.RunMetadata()
-      _ = sess.run(x,
-                   options=config_pb2.RunOptions(
-                       trace_level=config_pb2.RunOptions.FULL_TRACE),
-                   run_metadata=run_meta)
-
-      model_analyzer.print_model_analysis(
-          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
-
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
-        # pylint: disable=line-too-long
-        self.assertEqual(
-            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB)\n  model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n  model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/1 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/162 params, 0/0 flops, 0B/1.30KB)\n  model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/5.83k flops, 0B/432B)\n  model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/288 params, 0/0 flops, 0B/2.30KB)\n  model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/4.61k flops, 0B/384B)\n',
-            f.read())
-        # pylint: enable=line-too-long
-
-  def testComplexCodeView(self):
-    ops.reset_default_graph()
-    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
-    opts['account_type_regexes'] = ['.*']
-    opts['show_name_regexes'] = ['.*model_analyzer_testlib.py.*']
-    opts['account_displayed_op_only'] = False
-    opts['select'] = [
-        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
-    ]
-
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
-      x = lib.BuildFullModel()
-
-      sess.run(variables.global_variables_initializer())
-      run_meta = config_pb2.RunMetadata()
-      _ = sess.run(x,
-                   options=config_pb2.RunOptions(
-                       trace_level=config_pb2.RunOptions.FULL_TRACE),
-                   run_metadata=run_meta)
-
-      tfprof_node = model_analyzer.print_model_analysis(
-          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
-
-      # pylint: disable=line-too-long
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
-        self.assertEqual(
-            '_TFProfRoot (0/2.84k params, 0/54.08k flops, 0B/241.58KB)\n  model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_... (0/1.80k params, 0/41.76k flops, 0B/20.08KB)\n    model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n    model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/4 params, 0/0 flops, 0B/0B)\n    model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/648 params, 0/0 flops, 0B/5.18KB)\n    model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/23.33k flops, 0B/1.73KB)\n    model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/1.15k params, 0/0 flops, 0B/9.22KB)\n    model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/18.43k flops, 0B/1.54KB)\n  model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c... (0/1.04k params, 0/4.13k flops, 0B/24.86KB)\n  model_analyzer_testlib.py:62:BuildFullModel:target = array_op... (0/0 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_... (0/0 params, 0/0 flops, 0B/528B)\n  model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min... (0/0 params, 0/8.19k flops, 0B/196.12KB)\n',
-            f.read())
-
-      self.assertEqual(241584, tfprof_node.total_requested_bytes)
-      self.assertLess(0, tfprof_node.total_exec_micros)
-      self.assertEqual(2844, tfprof_node.total_parameters)
-      self.assertEqual(54080, tfprof_node.total_float_ops)
-      self.assertEqual(5, len(tfprof_node.children))
-      self.assertEqual('_TFProfRoot', tfprof_node.name)
-      self.assertEqual('model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_...',
-                       tfprof_node.children[0].name)
-      self.assertEqual('model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c...',
-                       tfprof_node.children[1].name)
-      self.assertEqual('model_analyzer_testlib.py:62:BuildFullModel:target = array_op...',
-                       tfprof_node.children[2].name)
-      self.assertEqual('model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_...',
-                       tfprof_node.children[3].name)
-      self.assertEqual('model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min...',
-                       tfprof_node.children[4].name)
-      # pylint: enable=line-too-long
-
-  def testCodeViewLeafGraphNode(self):
-    ops.reset_default_graph()
-    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    opts['account_type_regexes'] = ['.*']
-    opts['account_displayed_op_only'] = False
-    opts['select'] = [
-        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
-    ]
-
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
-      x = lib.BuildSmallModel()
-
-      sess.run(variables.global_variables_initializer())
-      run_meta = config_pb2.RunMetadata()
-      _ = sess.run(x,
-                   options=config_pb2.RunOptions(
-                       trace_level=config_pb2.RunOptions.FULL_TRACE),
-                   run_metadata=run_meta)
-
-      tfprof_node = model_analyzer.print_model_analysis(
-          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
-
-      leaf = tfprof_node
-      while leaf.children:
-        self.assertEqual(0, len(leaf.graph_nodes))
-        leaf = leaf.children[0]
-      self.assertEqual(1, len(leaf.graph_nodes))
-
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
deleted file mode 100644
index 81bac84b8c..0000000000
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""A test lib that defines some models."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from tensorflow.contrib.rnn.python.ops.core_rnn_cell import BasicRNNCell
-from tensorflow.python.framework import dtypes
-from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import init_ops
-from tensorflow.python.ops import math_ops
-from tensorflow.python.ops import nn_ops
-from tensorflow.python.ops import rnn
-from tensorflow.python.ops import variable_scope
-from tensorflow.python.training import gradient_descent
-
-
-def BuildSmallModel():
-  """Build a small forward conv model."""
-  image = array_ops.zeros([2, 6, 6, 3])
-  _ = variable_scope.get_variable(
-      'ScalarW', [],
-      dtypes.float32,
-      initializer=init_ops.random_normal_initializer(stddev=0.001))
-  kernel = variable_scope.get_variable(
-      'DW', [3, 3, 3, 6],
-      dtypes.float32,
-      initializer=init_ops.random_normal_initializer(stddev=0.001))
-  x = nn_ops.conv2d(image, kernel, [1, 2, 2, 1], padding='SAME')
-  kernel = variable_scope.get_variable(
-      'DW2', [2, 2, 6, 12],
-      dtypes.float32,
-      initializer=init_ops.random_normal_initializer(stddev=0.001))
-  x = nn_ops.conv2d(x, kernel, [1, 2, 2, 1], padding='SAME')
-  return x
-
-
-def BuildFullModel():
-  """Build the full model with conv,rnn,opt."""
-  seq = []
-  for i in xrange(4):
-    with variable_scope.variable_scope('inp_%d' % i):
-      seq.append(array_ops.reshape(BuildSmallModel(), [2, 1, -1]))
-
-  cell = BasicRNNCell(16, 48)
-  out = rnn.dynamic_rnn(
-      cell, array_ops.concat(seq, axis=1), dtype=dtypes.float32)[0]
-
-  target = array_ops.ones_like(out)
-  loss = nn_ops.l2_loss(math_ops.reduce_mean(target - out))
-  sgd_op = gradient_descent.GradientDescentOptimizer(1e-2)
-  return sgd_op.minimize(loss)
-
-
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
index aa133d3142..f0ac36c66a 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
@@ -96,13 +96,12 @@ class PrintModelAnalysisTest(test.TestCase):
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = self._BuildSmallModel()
-      tfprof_pb = tfprof_output_pb2.TFGraphNodeProto()
+      tfprof_pb = tfprof_output_pb2.TFProfNode()
       tfprof_pb.ParseFromString(
-          print_mdl.PrintModelAnalysis(
-              sess.graph.as_graph_def().SerializeToString(),
-              b'', b'', b'scope', opts.SerializeToString()))
+          print_mdl.PrintModelAnalysis(sess.graph.as_graph_def(
+          ).SerializeToString(), b'', b'', b'scope', opts.SerializeToString()))
 
-      expected_pb = tfprof_output_pb2.TFGraphNodeProto()
+      expected_pb = tfprof_output_pb2.TFProfNode()
       text_format.Merge(r"""name: "_TFProfRoot"
       exec_micros: 0
       requested_bytes: 0
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
index cd3912bbfb..e8cf84b6c7 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
@@ -62,13 +62,12 @@ def _fill_missing_graph_shape(graph, run_meta):
   return graph
 
 
-def _get_logged_ops(graph, run_meta=None, add_trace=False):
+def _get_logged_ops(graph, run_meta=None):
   """Extract trainable model parameters and FLOPs for ops from a Graph.
 
   Args:
     graph: tf.Graph.
     run_meta: RunMetadata proto used to complete shape information.
-    add_trace: Whether to add op trace information.
   Returns:
     logged_ops: dict mapping from op_name to OpLogEntry.
   """
@@ -77,32 +76,21 @@ def _get_logged_ops(graph, run_meta=None, add_trace=False):
 
   op_missing_shape = 0
   logged_ops = {}
-  for op in graph.get_operations():
+  graph_def = graph.as_graph_def()
+  for node in graph_def.node:
     try:
-      stats = ops.get_stats_for_node_def(
-          graph, op.node_def, REGISTERED_FLOP_STATS)
+      stats = ops.get_stats_for_node_def(graph, node, REGISTERED_FLOP_STATS)
     except ValueError:
       # Catch Exception When shape is incomplete. Skip it.
       op_missing_shape += 1
       stats = None
 
-    entry = tfprof_log_pb2.OpLogEntry()
-    entry.name = op.name
-    add_entry = False
-    if stats and stats.value:
+    if not stats or not stats.value:
+      continue
+    if node.name not in logged_ops:
+      entry = tfprof_log_pb2.OpLogEntry()
+      entry.name = node.name
       entry.float_ops = int(stats.value)
-      add_entry = True
-
-    if add_trace:
-      for tb in op.traceback:
-        trace = entry.code_def.traces.add()
-        trace.file = tb[0] if tb[0] else 'none'
-        trace.lineno = tb[1] if tb[1] else -1
-        trace.function = tb[2] if tb[2] else 'none'
-        trace.line = tb[3] if tb[3] else 'none'
-      add_entry = True
-
-    if add_entry:
       logged_ops[entry.name] = entry
 
   for v in graph.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES):
@@ -120,21 +108,18 @@ def _get_logged_ops(graph, run_meta=None, add_trace=False):
   return logged_ops
 
 
-def _merge_default_with_oplog(graph, op_log=None,
-                              run_meta=None,
-                              add_trace=False):
+def _merge_default_with_oplog(graph, op_log=None, run_meta=None):
   """Merge the tfprof default extra info with caller's op_log.
 
   Args:
     graph: tf.Graph.
     op_log: OpLog proto.
     run_meta: RunMetadata proto used to complete shape information.
-    add_trace: Whether to add op trace information.
   Returns:
     tmp_op_log: Merged OpLog proto.
   """
   tmp_op_log = tfprof_log_pb2.OpLog()
-  logged_ops = _get_logged_ops(graph, run_meta, add_trace=add_trace)
+  logged_ops = _get_logged_ops(graph, run_meta)
   if not op_log:
     tmp_op_log.log_entries.extend(logged_ops.values())
   else:
@@ -146,16 +131,13 @@ def _merge_default_with_oplog(graph, op_log=None,
         all_ops[op_name].types.extend(entry.types)
         if entry.float_ops > 0 and all_ops[op_name].float_ops == 0:
           all_ops[op_name].float_ops = entry.float_ops
-        if entry.code_def.traces and not all_ops[op_name].code_def.traces:
-          all_ops[op_name].code_def.MergeFrom(entry.code_def)
       else:
         all_ops[op_name] = entry
     tmp_op_log.log_entries.extend(all_ops.values())
   return tmp_op_log
 
 
-def write_op_log(graph, log_dir, op_log=None, run_meta=None,
-                 add_trace=False):
+def write_op_log(graph, log_dir, op_log=None, run_meta=None):
   """Log provided 'op_log', and add additional model information below.
 
     The API also assigns ops in tf.trainable_variables() an op type called
@@ -172,9 +154,8 @@ def write_op_log(graph, log_dir, op_log=None, run_meta=None,
         one is created.
     run_meta: (Optional) RunMetadata proto that helps flops computation using
         run time shape information.
-    add_trace: Whether to add op trace information. Used to support "code" view.
   """
-  op_log = _merge_default_with_oplog(graph, op_log, run_meta, add_trace)
+  op_log = _merge_default_with_oplog(graph, op_log, run_meta)
 
   with gfile.Open(os.path.join(log_dir, 'tfprof_log'), 'w') as log:
     log.write(op_log.SerializeToString())
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index 52d376d5f5..540e179aae 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -10,17 +10,12 @@ Consultants: Jon Shlens, Pete Warden
 1.  Measure model parameters, float operations, tensor shapes.
 2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  3 ways to view and explore TensorFlow model profiles
-
-    *  Organize by Python code call stack.
-    *  Organize by TensorFlow operation name scope hierarchies.
-    *  Organize by TensorFlow operation inputs/outputs graph.
-
+4.  Explore model based on name scope or graph structure.
 5.  Selectively grouping/filtering/accounting/ordering ops.
 
 [Python API Tutorials](#python-api-tutorials): It can be called directly from
 Python codes. Results are either printed
-to stdout or dumped to file. tensorflow.tfprof.TFGraphNodeProto proto is returned from
+to stdout or dumped to file. tensorflow.tfprof.TFProfNode proto is returned from
 the API to allow users to perform further analysis.
 
 [CLI Tutorials](#cli-tutorials):
@@ -38,23 +33,13 @@ tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
 ### Examine the shapes and sizes of all trainable Variables.
 ```python
 # Print trainable variable parameter statistics to stdout.
-# By default, statistics are associated with each graph node.
 param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tf.get_default_graph(),
     tfprof_options=tf.contrib.tfprof.model_analyzer.
         TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
 
-
-# Set tfprof_cmd='code' to associate statistics with Python codes.
-opts = tf.contrib.tfprof.model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
-opts['show_name_regexes'] = ['.*my_code1.py.*', '.*my_code2.py.*']
-param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    tfprof_cmd='code'
-    tfprof_options=opts)
-
-# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
-# Let's print the root below.
+# param_stats is tensorflow.tfprof.TFProfNode proto. It organize the statistics
+# of each graph node in tree scructure. Let's print the root below.
 sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
 ```
 
@@ -99,20 +84,8 @@ Finally, you may run `print_model_analysis` to explore the timing and memory
 demands of the model.
 
 ``` python
-# See model_analyzer_test.py for more examples.
-#
-# Print to stdout an analysis of the memory usage and the timing information
-# broken down by python codes.
-opts = tf.contrib.tfprof.model_analyzer.PRINT_ALL_TIMING_MEMORY.copy()
-opts['show_name_regexes'] = ['.*my_code.py.*']
-tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    run_meta=run_metadata,
-    tfprof_cmd='code',
-    tfprof_options=opts)
-
 # Print to stdout an analysis of the memory usage and the timing information
-# broken down by operations.
+# from running the graph broken down by operations.
 tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tf.get_default_graph(),
     run_meta=run_metadata,
@@ -165,9 +138,9 @@ bazel-bin/tensorflow/tools/tfprof/tfprof \
     --run_meta_path=run_meta \
     --checkpoint_path=model.ckpt
 #
-# tfprof_log is used to define customized op types, float ops and code traces.
+# tfprof_log is used to define customized op types and float ops.
 # Use tfprof_logger.write_op_log() to create tfprof_log.
-# See 12) in Examples section on generating tfprof_log file.
+# See 11) in Examples section on generating tfprof_log file.
 bazel-bin/tensorflow/tools/tfprof/tfprof \
     --graph_path=graph.pbtxt \
     --run_meta_path=run_meta \
@@ -201,28 +174,7 @@ tfprof>
 -dump_to_file
 ```
 
-3) I want to see which line of my python codes costs most time!
-
-```shell
-# Requires --graph_path --op_log_path
-tfprof> code -max_depth 1000 -show_name_regexes .*model_analyzer.*py.* -select micros -account_type_regexes .* -order_by micros
-_TFProfRoot (0us/22.44ms)
-  model_analyzer_test.py:149:run_filename_as_m...:none (0us/22.44ms)
-    model_analyzer_test.py:33:_run_code_in_main:none (0us/22.44ms)
-      model_analyzer_test.py:208:<module>:test.main() (0us/22.44ms)
-        model_analyzer_test.py:132:testComplexCodeView:x = lib.BuildFull... (0us/22.44ms)
-          model_analyzer_testlib.py:63:BuildFullModel:return sgd_op.min... (0us/21.83ms)
-          model_analyzer_testlib.py:58:BuildFullModel:cell, array_ops.c... (0us/333us)
-          model_analyzer_testlib.py:54:BuildFullModel:seq.append(array_... (0us/254us)
-            model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0us/134us)
-            model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0us/40us)
-            ...
-          model_analyzer_testlib.py:61:BuildFullModel:loss = nn_ops.l2_... (0us/28us)
-          model_analyzer_testlib.py:60:BuildFullModel:target = array_op... (0us/0us)
-        model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
-```
-
-4) I want to see the `BatchNorm`'s gamma value in checkpoint.
+3) I want to see the `BatchNorm`'s gamma value in checkpoint.
 
 ```shell
 # Requires --graph_path, --checkpoint_path.
@@ -234,7 +186,7 @@ _TFProfRoot ()
 [1.57 1.83 1.30 1.25 1.59 1.14 1.26 0.82 1.19 1.10 1.48 1.01 0.82 1.23 1.21 1.14 ],
 ```
 
-5) I want to see my checkpoint tensors shape and number of parameters.
+4) I want to see my checkpoint tensors shape and number of parameters.
 
 ```shell
 # Requires --graph_path, --checkpoint_path.
@@ -253,7 +205,7 @@ _TFProfRoot (--/930.58k params)
   unit_last/final_bn/moving_variance (64, 64/64 params)
 ```
 
-6) I defined an op named ‘cost’ to calculate the loss. I want to know what ops
+5) I defined an op named ‘cost’ to calculate the loss. I want to know what ops
 it depends on take a long time to run. Hint: Use the ‘graph’ command to explore
 graph dependencies.
 
@@ -269,7 +221,7 @@ _TFProfRoot (0us/3.61sec)
   unit_3_3/sub2/conv2/Conv2D (10.26ms/3.60sec)
 ```
 
-7) I want to know the expensive operations during the back propagation.
+6) I want to know the expensive operations during the back propagation.
 Hint: tensorflow prepend ‘gradient’ to your defined name scopes. Use the ‘scope’
 command to explore based on name scope hierarchies.
 
@@ -286,7 +238,7 @@ _TFProfRoot (0us/2.29sec)
   ...
 ```
 
-8) Show the number of float operations in the model.
+7) Show the number of float operations in the model.
 Note: float operations calculation depends on
 1) op.RegisterStatistics. If an op doesn’t
 have RegisterStatistics defined, its float operations cannot be counted.
@@ -311,7 +263,7 @@ _TFProfRoot (0/17.63b flops)
   ...
 ```
 
-9) Show the number of parameters of all `tf.trainable_variables()` in the model.
+8) Show the number of parameters of all `tf.trainable_variables()` in the model.
 
 ```shell
 # Requires --graph_path --op_log_path.
@@ -331,7 +283,7 @@ generated by write_op_log() Python API. write_op_log() help users create some
 common op types implicitly. Users can define their own op types and log it
 through the write_op_log() API.
 
-109) What if I’m lazy and don’t want to define op type? I have given my ops
+9) What if I’m lazy and don’t want to define op type? I have given my ops
 well-defined names in my model’s code. And want to use names to select a group
 of ops. Let’s try it!
 
@@ -349,7 +301,7 @@ in terminal. Otherwise, tfprof accounts all ops matched by
 `-account_type_regexes` recursively even if they are hidden due to some
 options such as -max_depth.
 
-11) TensorFlow has built-in op types. For example, built-in op type `Variable`
+10) TensorFlow has built-in op types. For example, built-in op type `Variable`
 seems to include `Variable's` created by your model. However, be careful when
 depending on it because TensorFlow creates extra `Variable` ops implicitly and
 the implicitly created ops can have the same prefix as the `Variable's` you
@@ -375,7 +327,7 @@ _TFProfRoot (--/930.58k params)
 ```
 
 
-12) A example of defining extra op type for ops using `OpLog`
+11) A example of defining extra op type for ops using `OpLog`
 
 First, in Python code, create an `OpLog` proto and add op type
 information to it:
diff --git a/tensorflow/tools/tfprof/internal/BUILD b/tensorflow/tools/tfprof/internal/BUILD
index adace89985..c5482a9776 100644
--- a/tensorflow/tools/tfprof/internal/BUILD
+++ b/tensorflow/tools/tfprof/internal/BUILD
@@ -15,7 +15,6 @@ cc_library(
     srcs = ["tfprof_stats.cc"],
     hdrs = ["tfprof_stats.h"],
     deps = [
-        ":tfprof_code",
         ":tfprof_graph",
         ":tfprof_node",
         ":tfprof_options",
@@ -62,27 +61,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "tfprof_code",
-    srcs = ["tfprof_code.cc"],
-    hdrs = ["tfprof_code.h"],
-    deps = [
-        ":tfprof_constants",
-        ":tfprof_node",
-        ":tfprof_options",
-        ":tfprof_show_code",
-        ":tfprof_tensor",
-        ":tfprof_utils",
-        "//tensorflow/c:c_api",
-        "//tensorflow/c:checkpoint_reader",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/core:regexp_internal",
-        "//tensorflow/tools/tfprof:protos_all_cc",
-    ],
-)
-
 cc_library(
     name = "tfprof_graph",
     srcs = ["tfprof_graph.cc"],
@@ -120,26 +98,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "tfprof_show_code",
-    srcs = ["tfprof_show_code.cc"],
-    hdrs = ["tfprof_show_code.h"],
-    deps = [
-        ":tfprof_constants",
-        ":tfprof_node",
-        ":tfprof_options",
-        ":tfprof_scope",
-        ":tfprof_show",
-        ":tfprof_tensor",
-        ":tfprof_utils",
-        "//tensorflow/c:checkpoint_reader",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/core:regexp_internal",
-        "//tensorflow/tools/tfprof:protos_all_cc",
-    ],
-)
-
 tf_cc_test(
     name = "tfprof_show_test",
     srcs = ["tfprof_show_test.cc"],
diff --git a/tensorflow/tools/tfprof/internal/print_model_analysis.cc b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
index c816e3209e..dfe4019fbb 100644
--- a/tensorflow/tools/tfprof/internal/print_model_analysis.cc
+++ b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
@@ -40,13 +40,13 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
   graph_ptr->ParseFromString(*graph);
 
   std::unique_ptr<RunMetadata> run_meta_ptr;
-  if (run_meta && !run_meta->empty()) {
+  if (run_meta) {
     run_meta_ptr.reset(new RunMetadata());
     run_meta_ptr->ParseFromString(*run_meta);
   }
 
   std::unique_ptr<OpLog> op_log_ptr;
-  if (op_log && !op_log->empty()) {
+  if (op_log) {
     op_log_ptr.reset(new OpLog());
     op_log_ptr->ParseFromString(*op_log);
   }
@@ -58,27 +58,16 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
 
   Options opts = Options::FromProtoStr(*options);
 
-  // TODO(xpan): We should have dump_to_file/print_stdout/etc to control
-  // side-effects independently instead of one controlling the other.
   if (opts.dump_to_file.empty()) {
     printf("\n=========================Options=============================\n");
     printf("%s", opts.ToString().c_str());
     printf("\n==================Model Analysis Report======================\n");
-    string ret = "";
-    if (*command == kCmds[2]) {
-      ret = tf_stats.PrintCode(opts).SerializeAsString();
-    } else {
-      ret = tf_stats.PrintGraph(*command, opts).SerializeAsString();
-    }
+    TFProfNode root(tf_stats.PrintGraph(*command, opts));
     printf("\n======================End of Report==========================\n");
     fflush(stdout);
-    return ret;
-  }
-  if (*command == kCmds[2]) {
-    return tf_stats.PrintCode(opts).SerializeAsString();
-  } else {
-    return tf_stats.PrintGraph(*command, opts).SerializeAsString();
+    return root.SerializeAsString();
   }
+  return tf_stats.PrintGraph(*command, opts).SerializeAsString();
 }
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.cc b/tensorflow/tools/tfprof/internal/tfprof_code.cc
deleted file mode 100644
index d65d187f31..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_code.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/tools/tfprof/internal/tfprof_code.h"
-
-#include <stdio.h>
-#include <utility>
-
-#include "tensorflow/c/c_api.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-#include "tensorflow/core/lib/strings/strcat.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/platform/regexp.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
-
-namespace tensorflow {
-namespace tfprof {
-namespace {
-// Convert to Trace proto into a short readable string.
-string GetTraceString(const CodeDef::Trace& trace) {
-  string ntrace = "";
-  if (trace.file().find_last_of('/') != trace.file().npos) {
-    ntrace += trace.file().substr(trace.file().find_last_of('/') + 1);
-  } else {
-    ntrace += trace.file();
-  }
-  ntrace += strings::StrCat(":", trace.lineno());
-  if (trace.function().length() < 20) {
-    ntrace += ":" + trace.function();
-  } else {
-    ntrace += ":" + trace.function().substr(0, 17) + "...";
-  }
-  if (trace.line().length() < 20) {
-    ntrace += ":" + trace.line();
-  } else {
-    ntrace += ":" + trace.line().substr(0, 17) + "...";
-  }
-  return ntrace;
-}
-}  // namespace
-
-void TFCode::AddNode(TFGraphNode* node) {
-  if (!node->code()) {
-    return;
-  }
-  TFCodeNode* pre_trace_node = nullptr;
-  for (int i = 0; i < node->code()->traces_size(); ++i) {
-    // Unlike op name, which is globally unique, trace name is only unique
-    // w.r.t. it's parent.
-    const string& trace = GetTraceString(node->code()->traces(i));
-    if (i == 0) {
-      if (!trace_root_) {
-        trace_root_.reset(new TFCodeNode(trace));
-      }
-      CHECK(trace_root_->name() == trace) << "Different trace root";
-      pre_trace_node = trace_root_.get();
-      continue;
-    }
-    pre_trace_node->AddChildren(trace);
-    TFCodeNode* trace_node = pre_trace_node->children()[trace].get();
-
-    if (i == node->code()->traces_size()-1) {
-      trace_node->AddGraphNode(node);
-    }
-    pre_trace_node = trace_node;
-  }
-}
-
-void TFCode::Build() {
-  if (!trace_root_) {
-    return;
-  }
-  code_root_ = BuildCodeNodes(trace_root_.get());
-}
-
-CodeNode* TFCode::BuildCodeNodes(TFCodeNode* root) {
-  auto code_root = std::unique_ptr<CodeNode>(new CodeNode(root));
-  CodeNode* code_root_ptr = code_root.get();
-  code_nodes_.insert(std::move(code_root));
-
-  for (auto it = root->children().cbegin();
-       it != root->children().cend(); ++it) {
-    code_root_ptr->children.push_back(BuildCodeNodes(it->second.get()));
-  }
-  return code_root_ptr;
-}
-
-const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
-  // Search from roots recursively to find start node, if start_name_regexes
-  // is specified.
-  tfprof_trace_root_.reset(new TFCodeNode(kTFProfRoot));
-  tfprof_code_root_.reset(new CodeNode(tfprof_trace_root_.get()));
-  if (!code_root_) {
-    return tfprof_code_root_.get();
-  }
-
-  std::vector<CodeNode*> roots = {code_root_};
-  if (opts.start_name_regexes.size() != 1 ||
-      opts.start_name_regexes[0] != ".*") {
-    roots = SearchRoot(roots, opts.start_name_regexes);
-  }
-
-  tfprof_code_root_->children.assign(roots.begin(), roots.end());
-  Account({tfprof_code_root_.get()}, opts);
-
-  return PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
-}
-
-std::vector<CodeNode*> TFCode::SearchRoot(
-    std::vector<CodeNode*> roots, const std::vector<string>& regexes) {
-  std::vector<CodeNode*> res;
-  if (roots.empty()) {
-    return res;
-  }
-  for (CodeNode* root : roots) {
-    bool match_start_node = false;
-    for (const string& regex : regexes) {
-      if (RE2::FullMatch(root->name(), regex)) {
-        res.push_back(root);
-        match_start_node = true;
-        break;
-      }
-    }
-    if (match_start_node) {
-      // Found a start node at this branch, no need to continue.
-      continue;
-    }
-    std::vector<CodeNode*> nroots = SearchRoot(root->children, regexes);
-    res.insert(res.end(), nroots.begin(), nroots.end());
-  }
-  return res;
-}
-
-std::vector<CodeNode*> TFCode::PrintScope(const std::vector<CodeNode*> roots,
-                                            const Options& opts, int depth,
-                                            int last_ident) {
-  std::vector<CodeNode*> show_nodes;
-
-  for (CodeNode* node : roots) {
-    int nlast_ident = last_ident;
-    bool show = ShouldShow(node, opts, depth);
-    if (show) {
-      node->formatted_str.clear();
-      if (opts.account_displayed_op_only) {
-        node->ResetTotalStats();
-        node->AddSelfToTotalStats();
-      }
-      nlast_ident += 2;
-    }
-
-    std::vector<CodeNode*> show_cnodes;
-    if (!ShouldTrim(node, opts.trim_name_regexes)) {
-      show_cnodes = PrintScope(node->children, opts, depth + 1, nlast_ident);
-    }
-    if (show) {
-      show_cnodes = SortNodes(show_cnodes, opts);
-      string children_str;
-      for (CodeNode* sc : show_cnodes) {
-        children_str += sc->formatted_str;
-        node->mutable_proto()->add_children()->MergeFrom(sc->proto());
-        if (opts.account_displayed_op_only) {
-          node->AggregateTotalStats(sc);
-        }
-      }
-
-      node->formatted_str =
-          strings::Printf("%s%s\n", string(last_ident, ' ').c_str(),
-                          node->Format(opts).c_str());
-
-      if (opts.select.find(kShown[5]) != opts.select.end()) {
-        fprintf(stderr, "code view has no tensor value to show\n");
-      }
-
-      node->formatted_str += children_str;
-      show_nodes.push_back(node);
-    } else {
-      show_nodes.insert(show_nodes.end(), show_cnodes.begin(),
-                        show_cnodes.end());
-    }
-  }
-  return show_nodes;
-}
-
-void TFCode::Account(const std::vector<CodeNode*>& roots,
-                      const Options& opts) {
-  if (roots.empty()) return;
-
-  for (CodeNode* node : roots) {
-    node->ResetTotalStats();
-    Account(node->children, opts);
-
-    node->account = ShouldAccount(node, opts);
-    if (node->account) {
-      node->AddSelfToTotalStats();
-    }
-    for (CodeNode* c : node->children) {
-      node->AggregateTotalStats(c);
-    }
-  }
-}
-}  // namespace tfprof
-}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.h b/tensorflow/tools/tfprof/internal/tfprof_code.h
deleted file mode 100644
index 79f35e384f..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_code.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// Build a tree structure based on the TensorFlow model's python code stacks.
-// Stats are aggregated from descendants from ancestors.
-
-#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
-#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "tensorflow/c/checkpoint_reader.h"
-#include "tensorflow/core/framework/graph.pb.h"
-#include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
-#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
-#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
-
-namespace tensorflow {
-namespace tfprof {
-
-class CodeNode : public ShowCodeNode {
- public:
-  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
-  ~CodeNode() override {}
-
-  void AggregateTotalStats(CodeNode* node) {
-    ShowCodeNode::AggregateTotalStats(node);
-  }
-
-  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
-
-  void ResetTotalStats() { ShowCodeNode::ResetTotalStats(); }
-
-  std::vector<CodeNode*> children;
-};
-
-class TFCode : public TFShowCode {
- public:
-  explicit TFCode()
-      : code_root_(nullptr), trace_root_(nullptr) {}
-  ~TFCode() override {}
-
-  void AddNode(TFGraphNode* node) override;
-
-  void Build() override;
-
- private:
-  CodeNode* BuildCodeNodes(TFCodeNode* root);
-
-  const ShowCodeNode* ShowInternal(const Options& opts) override;
-
-  std::vector<CodeNode*> SearchRoot(std::vector<CodeNode*> roots,
-                                    const std::vector<string>& regexes);
-
-  std::vector<CodeNode*> PrintScope(const std::vector<CodeNode*> roots,
-                                     const Options& opts, int depth,
-                                     int last_ident);
-
-  void Account(const std::vector<CodeNode*>& roots, const Options& opts);
-
-  CodeNode* code_root_;
-  std::unique_ptr<TFCodeNode> trace_root_;
-  std::unique_ptr<TFCodeNode> tfprof_trace_root_;
-  std::unique_ptr<CodeNode> tfprof_code_root_;
-  std::set<std::unique_ptr<CodeNode>> code_nodes_;
-};
-}  // namespace tfprof
-}  // namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.cc b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
index 1623d9f8c4..469b258f98 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
@@ -31,14 +31,14 @@ GraphNode* TFGraph::CreateParentNode(const string& name) {
   node_defs_.back()->set_name(name);
   node_defs_.back()->set_op(kTFGraphParent);
   parent_nodes_[name] =
-      std::unique_ptr<TFGraphNode>(new TFGraphNode(node_defs_.back().get()));
+      std::unique_ptr<TFNode>(new TFNode(node_defs_.back().get()));
   nodes_map_[name] =
       std::unique_ptr<GraphNode>(new GraphNode(parent_nodes_[name].get()));
   return nodes_map_[name].get();
 }
 
-void TFGraph::AddNode(TFGraphNode* node) {
-  string name = node->name();
+void TFGraph::AddNode(TFNode* node) {
+  string name = node->node_def()->name();
   nodes_map_[name] = std::unique_ptr<GraphNode>(new GraphNode(node));
 }
 
@@ -49,7 +49,7 @@ void TFGraph::Build() {
   // Filter out the root nodes (node not input of any other node).
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     GraphNode* node = it->second.get();
-    const std::map<string, TFGraphNode*>& inputs = node->node->inputs();
+    const std::map<string, TFNode*>& inputs = node->node->inputs();
     for (auto inputs_it = inputs.cbegin(); inputs_it != inputs.cend();
          inputs_it++) {
       nonroots.insert(inputs_it->first);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.h b/tensorflow/tools/tfprof/internal/tfprof_graph.h
index 75979d020c..b16f80b33d 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.h
@@ -39,7 +39,7 @@ namespace tensorflow {
 namespace tfprof {
 class GraphNode : public ShowNode {
  public:
-  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
+  explicit GraphNode(TFNode* node) : ShowNode(node) {
     mutable_proto()->set_inputs(node->inputs().size());
     mutable_proto()->set_total_inputs(0);
   }
@@ -72,7 +72,7 @@ class TFGraph : public TFShow {
       : TFShow(ckpt_reader) {}
   ~TFGraph() override {}
 
-  void AddNode(TFGraphNode* node) override;
+  void AddNode(TFNode* node) override;
 
   void Build() override;
 
@@ -99,14 +99,14 @@ class TFGraph : public TFShow {
   std::vector<GraphNode*> GenerateGraphDot(
       GraphNode* root, GraphNode* last_shown, const Options& opts, int depth,
       int hidden, std::set<string>* declared_nodes,
-      std::set<string>* declared_edges, TFGraphNodeProto* parent);
+      std::set<string>* declared_edges, TFProfNode* parent);
 
   void Account(const std::vector<GraphNode*>& roots, const Options& opts,
                std::map<string, int64>* visits);
 
   std::vector<GraphNode*> roots_;
   std::vector<std::unique_ptr<NodeDef>> node_defs_;
-  std::map<string, std::unique_ptr<TFGraphNode>> parent_nodes_;
+  std::map<string, std::unique_ptr<TFNode>> parent_nodes_;
   std::map<string, std::unique_ptr<GraphNode>> nodes_map_;
 };
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.cc b/tensorflow/tools/tfprof/internal/tfprof_node.cc
index 5f018addb4..08bd91d99c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.cc
@@ -20,8 +20,7 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-void TFGraphNode::AddStepStat(const string& device,
-                              const NodeExecStats* step_stat) {
+void TFNode::AddStepStat(const string& device, const NodeExecStats* step_stat) {
   if (!device.empty()) {
     // This might override device from GraphDef.
     device_ = device;
@@ -45,7 +44,7 @@ void TFGraphNode::AddStepStat(const string& device,
   }
 }
 
-void TFGraphNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
+void TFNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
   kernel_compute_micros_ = cost_node->compute_cost();
 }
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.h b/tensorflow/tools/tfprof/internal/tfprof_node.h
index 235904ea6c..677c8d3c87 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.h
@@ -30,16 +30,14 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
-#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
 
-class TFGraphNode {
+class TFNode {
  public:
-  TFGraphNode(const NodeDef* node)
+  TFNode(const NodeDef* node)
       : node_(node),
-        code_(nullptr),
         step_stat_(nullptr),
         op_start_micros_(0),
         op_schedule_micros_(0),
@@ -72,9 +70,9 @@ class TFGraphNode {
     device_ = node->device();
   }
 
-  TFGraphNode() : TFGraphNode(nullptr) {}
+  TFNode() : TFNode(nullptr) {}
 
-  void AddInput(TFGraphNode* input) { inputs_[input->name()] = input; }
+  void AddInput(TFNode* input) { inputs_[input->node_def()->name()] = input; }
 
   void AddOpType(const string& op_type) { op_types_.insert(op_type); }
 
@@ -85,32 +83,27 @@ class TFGraphNode {
 
   void AddFloatOps(int64 float_ops) { float_ops_ = float_ops; }
 
-  void AddCode(const CodeDef* code) { code_ = code; }
-
-  const string& name() const { return node_->name(); }
   const NodeDef* node_def() { return node_; }
-  const std::map<string, TFGraphNode*>& inputs() const { return inputs_; }
+  const std::map<string, TFNode*>& inputs() { return inputs_; }
   int64 op_start_micros() { return op_start_micros_; }
   // This is time spent in Op::Compute(), which is GPU kernel schedule time.
   // Currently not used.
   int64 op_schedule_micros() { return op_schedule_micros_; }
   // This is time spent in kernel execution.
-  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
+  int64 kernel_compute_micros() { return kernel_compute_micros_; }
   int64 all_spent_micros() { return all_spent_micros_; }
-  int64 requested_bytes() const { return requested_bytes_; }
-  int64 float_ops() const { return float_ops_; }
-  const CodeDef* code() { return code_; }
-  string device() const { return device_; }
-  const std::set<string>& op_types() const { return op_types_; }
+  int64 requested_byptes() { return requested_bytes_; }
+  int64 float_ops() { return float_ops_; }
+  string device() { return device_; }
+  const std::set<string>& op_types() { return op_types_; }
 
-  const std::vector<int64>& shape() const { return shape_; }
+  const std::vector<int64>& shape() { return shape_; }
 
  private:
   void update_shape(const std::vector<int64>& shape) { shape_ = shape; }
 
-  std::map<string, TFGraphNode*> inputs_;
+  std::map<string, TFNode*> inputs_;
   const NodeDef* node_;
-  const CodeDef* code_;
   const NodeExecStats* step_stat_;
 
   std::vector<int64> shape_;
@@ -124,71 +117,6 @@ class TFGraphNode {
   int64 float_ops_;
 };
 
-class TFCodeNode {
- public:
-  TFCodeNode(const string& trace)
-      : trace_(trace),
-        kernel_compute_micros_(0),
-        requested_bytes_(0),
-        float_ops_(0) {}
-
-  void AddGraphNode(const TFGraphNode* node) {
-    if (nodes_.find(node->name()) != nodes_.end()) {
-      return;
-    }
-    nodes_[node->name()] = node;
-
-    kernel_compute_micros_ += node->kernel_compute_micros();
-    requested_bytes_ += node->requested_bytes();
-    float_ops_ += node->float_ops();
-    op_types_.insert(node->op_types().begin(), node->op_types().end());
-    if (node->shape().size() > 0) {
-      shapes_.push_back(node->shape());
-    }
-    if (!node->device().empty()) {
-      devices_.insert(node->device());
-    }
-  }
-  const std::map<string, const TFGraphNode*>& graph_nodes() const {
-    return nodes_;
-  }
-
-  void AddChildren(const string& trace) {
-    if (children_.find(trace) != children_.end()) {
-      return;
-    }
-    children_[trace].reset(new TFCodeNode(trace));
-  }
-  std::map<string, std::unique_ptr<TFCodeNode>>& children() {
-    return children_;
-  }
-
-  const string& name() const { return trace_; }
-
-  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
-
-  int64 requested_bytes() const { return requested_bytes_; }
-
-  int64 float_ops() const { return float_ops_; }
-
-  const std::set<string>& devices() const { return devices_; }
-
-  const std::set<string>& op_types() const { return op_types_; }
-
-  const std::vector<std::vector<int64>>& shapes() const { return shapes_; }
-
- private:
-  const string trace_;
-  std::set<string> op_types_;
-  int64 kernel_compute_micros_;
-  int64 requested_bytes_;
-  int64 float_ops_;
-
-  std::set<string> devices_;
-  std::vector<std::vector<int64>> shapes_;
-  std::map<string, const TFGraphNode*> nodes_;
-  std::map<string, std::unique_ptr<TFCodeNode>> children_;
-};
 }  // namespace tfprof
 }  // namespace tensorflow
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.h b/tensorflow/tools/tfprof/internal/tfprof_options.h
index 0a9f2768e0..a5b55e77fa 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.h
@@ -55,7 +55,7 @@ static const char* const kShown[] = {
 };
 
 static const char* const kCmds[] = {
-    "scope", "graph", "code", "set", "help",
+    "scope", "graph", "set", "help",
 };
 
 struct Options {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.cc b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
index b4aef717c8..949d2d54e4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
@@ -35,15 +35,15 @@ ScopeNode* TFScope::CreateParentNode(const string& name) {
   node_defs_.back()->set_name(name);
   node_defs_.back()->set_op(kTFScopeParent);
   parent_nodes_[name] =
-      std::unique_ptr<TFGraphNode>(new TFGraphNode(node_defs_.back().get()));
+      std::unique_ptr<TFNode>(new TFNode(node_defs_.back().get()));
   nodes_map_[name] =
       std::unique_ptr<ScopeNode>(new ScopeNode(parent_nodes_[name].get()));
   return nodes_map_[name].get();
 }
 
-void TFScope::AddNode(TFGraphNode* node) {
-  string name = node->name();
-  if (nodes_map_.find(node->name()) == nodes_map_.end()) {
+void TFScope::AddNode(TFNode* node) {
+  string name = node->node_def()->name();
+  if (nodes_map_.find(node->node_def()->name()) == nodes_map_.end()) {
     nodes_map_[name] = std::unique_ptr<ScopeNode>(new ScopeNode(node));
   }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.h b/tensorflow/tools/tfprof/internal/tfprof_scope.h
index 2e2e4f5266..a7c58920a2 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.h
@@ -39,7 +39,7 @@ namespace tfprof {
 
 class ScopeNode : public ShowNode {
  public:
-  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
+  explicit ScopeNode(TFNode* node) : ShowNode(node) {}
   ~ScopeNode() override {}
 
   void AggregateTotalStats(ScopeNode* node) {
@@ -59,7 +59,7 @@ class TFScope : public TFShow {
       : TFShow(ckpt_reader) {}
   ~TFScope() override {}
 
-  void AddNode(TFGraphNode* node) override;
+  void AddNode(TFNode* node) override;
 
   void Build() override;
 
@@ -79,7 +79,7 @@ class TFScope : public TFShow {
 
   std::vector<ScopeNode*> roots_;
   std::vector<std::unique_ptr<NodeDef>> node_defs_;
-  std::map<string, std::unique_ptr<TFGraphNode>> parent_nodes_;
+  std::map<string, std::unique_ptr<TFNode>> parent_nodes_;
   std::map<string, std::unique_ptr<ScopeNode>> nodes_map_;
 };
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.cc b/tensorflow/tools/tfprof/internal/tfprof_show.cc
index 932dfb3893..08ae82fea4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.cc
@@ -25,13 +25,13 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
+ShowNode::ShowNode(TFNode* node) : node(node), account(true) {
   mutable_proto()->set_name(name());
   if (!node->device().empty()) {
     mutable_proto()->set_device(node->device());
   }
   mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_requested_bytes(node->requested_byptes());
   mutable_proto()->set_float_ops(node->float_ops());
 
   if (!node->shape().empty()) {
@@ -119,12 +119,12 @@ string ShowNode::FormatMeta(const Options& opts) {
   return str_util::Join(info, ", ");
 }
 
-TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
+TFProfNode* ShowNode::mutable_proto() { return &proto_; }
 
-const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
+const TFProfNode& ShowNode::proto() const { return proto_; }
 
 void ShowNode::AggregateTotalStats(ShowNode* node) {
-  TFGraphNodeProto* node_pb = node->mutable_proto();
+  TFProfNode* node_pb = node->mutable_proto();
   mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
                                          node_pb->total_exec_micros());
   mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
@@ -151,10 +151,9 @@ void ShowNode::ResetTotalStats() {
   mutable_proto()->set_total_requested_bytes(0);
   mutable_proto()->set_total_parameters(0);
   mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
 }
 
-const TFGraphNodeProto& TFShow::Show(const Options& opts) {
+const TFProfNode& TFShow::Show(const Options& opts) {
   const ShowNode* root = ShowInternal(opts);
   if (opts.dump_to_file.empty()) {
     printf("%s", root->formatted_str.c_str());
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.h b/tensorflow/tools/tfprof/internal/tfprof_show.h
index 5e85b81a72..a17358bb6b 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.h
@@ -37,18 +37,18 @@ namespace tensorflow {
 namespace tfprof {
 class ShowNode {
  public:
-  explicit ShowNode(const TFGraphNode* node);
+  explicit ShowNode(TFNode* node);
   virtual ~ShowNode() {}
 
-  const string& name() const { return node->name(); }
-  TFGraphNodeProto* mutable_proto();
-  const TFGraphNodeProto& proto() const;
+  const string& name() const { return node->node_def()->name(); }
+  TFProfNode* mutable_proto();
+  const TFProfNode& proto() const;
 
   string Format(const Options& opts);
 
   string FormatMeta(const Options& opts);
 
-  const TFGraphNode* node;
+  TFNode* node;
   bool account;
   string formatted_str;
 
@@ -59,7 +59,7 @@ class ShowNode {
 
   void ResetTotalStats();
 
-  TFGraphNodeProto proto_;
+  TFProfNode proto_;
 };
 
 class TFShow {
@@ -67,9 +67,9 @@ class TFShow {
   explicit TFShow(checkpoint::CheckpointReader* ckpt_reader)
       : ckpt_reader_(ckpt_reader) {}
   virtual ~TFShow() {}
-  virtual void AddNode(TFGraphNode* node) = 0;
+  virtual void AddNode(TFNode* node) = 0;
   virtual void Build() = 0;
-  const TFGraphNodeProto& Show(const Options& opts);
+  const TFProfNode& Show(const Options& opts);
 
  protected:
   virtual const ShowNode* ShowInternal(const Options& opts) = 0;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
deleted file mode 100644
index 1b83b91ad5..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
+++ /dev/null
@@ -1,275 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
-
-#include <memory>
-#include <set>
-
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-#include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/regexp.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_scope.h"
-
-namespace tensorflow {
-namespace tfprof {
-ShowCodeNode::ShowCodeNode(const TFCodeNode* node)
-    : node(node), account(true) {
-  std::vector<ScopeNode> snodes;
-  for (auto it : node->graph_nodes()) {
-    ScopeNode snode(it.second);
-    snodes.push_back(snode);
-    snodes[snodes.size()-1].AddSelfToTotalStats();
-    *mutable_proto()->mutable_graph_nodes()->Add() =
-        snodes[snodes.size()-1].proto();
-  }
-
-  mutable_proto()->set_name(name());
-  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
-  mutable_proto()->set_float_ops(node->float_ops());
-
-  if (!node->shapes().empty()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      int64 params = 1;
-      bool complete_shape = true;
-      for (int64 d : shape) {
-        // Sometimes parameters could be <0 when a dim is unknown.
-        if (d < 0) {
-          complete_shape = false;
-          break;
-        }
-        params *= d;
-      }
-      if (complete_shape) {
-        mutable_proto()->set_parameters(proto().parameters() + params);
-      } else {
-        fprintf(stderr, "Incomplete shape.");
-      }
-    }
-  }
-}
-
-string ShowCodeNode::Format(const Options& opts) {
-  if (opts.select.empty()) {
-    return name();
-  }
-  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
-}
-
-string ShowCodeNode::FormatMeta(const Options& opts) {
-  std::vector<string> info;
-  std::vector<string> shapes;
-  if (opts.select.find(kShown[2]) != opts.select.end()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      if (!shape.empty()) {
-        shapes.push_back(FormatShapes(shape));
-      }
-    }
-    if (!shapes.empty()) {
-      info.push_back(str_util::Join(shapes, "|"));
-    }
-    string params = FormatNumber(proto().total_parameters()) + " params";
-    if (account) {
-      params = FormatNumber(proto().parameters()) + "/" + params;
-    } else {
-      params = "--/" + params;
-    }
-    info.push_back(params);
-  }
-  if (opts.select.find(kShown[3]) != opts.select.end()) {
-    string fops = FormatNumber(proto().total_float_ops()) + " flops";
-    if (account) {
-      fops = FormatNumber(proto().float_ops()) + "/" + fops;
-    } else {
-      fops = "--/" + fops;
-    }
-    info.push_back(fops);
-  }
-  if (opts.select.find(kShown[0]) != opts.select.end()) {
-    string memory = FormatMemory(proto().total_requested_bytes());
-    if (account) {
-      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
-
-    } else {
-      memory = "--/" + memory;
-    }
-    info.push_back(memory);
-  }
-  if (opts.select.find(kShown[1]) != opts.select.end()) {
-    string time = FormatTime(proto().total_exec_micros());
-    if (account) {
-      time = FormatTime(proto().exec_micros()) + "/" + time;
-    } else {
-      time = "--/" + time;
-    }
-    info.push_back(time);
-  }
-  if (opts.select.find(kShown[6]) != opts.select.end()) {
-    if (!node->devices().empty()) {
-      info.push_back(str_util::Join(node->devices(), "|"));
-    }
-  }
-  if (opts.select.find(kShown[7]) != opts.select.end()) {
-    std::set<string> op_types = node->op_types();
-    // Device is considered a type.
-    op_types.insert(node->devices().cbegin(), node->devices().cend());
-    info.push_back(str_util::Join(op_types, "|"));
-  }
-  return str_util::Join(info, ", ");
-}
-
-TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
-
-const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
-
-void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
-  TFCodeNodeProto* node_pb = node->mutable_proto();
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         node_pb->total_exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             node_pb->total_requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        node_pb->total_parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       node_pb->total_float_ops());
-}
-
-void ShowCodeNode::AddSelfToTotalStats() {
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         proto().exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             proto().requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        proto().parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       proto().float_ops());
-}
-
-void ShowCodeNode::ResetTotalStats() {
-  mutable_proto()->set_total_exec_micros(0);
-  mutable_proto()->set_total_requested_bytes(0);
-  mutable_proto()->set_total_parameters(0);
-  mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
-}
-
-const TFCodeNodeProto& TFShowCode::Show(const Options& opts) {
-  const ShowCodeNode* root = ShowInternal(opts);
-  if (opts.dump_to_file.empty()) {
-    printf("%s", root->formatted_str.c_str());
-    fflush(stdout);
-  } else {
-    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
-                                 root->formatted_str);
-    if (!s.ok()) {
-      fprintf(stderr, "%s\n", s.ToString().c_str());
-    }
-  }
-  return root->proto();
-}
-
-bool TFShowCode::ShouldShow(ShowCodeNode* node,
-                            const Options& opts,
-                            int depth) {
-  // Always show kTFProfRoot.
-  if (node->name() == kTFProfRoot) return true;
-
-  if (!node->account) return false;
-  // TODO(xpan): Think more carefully about node filtering in code view.
-  // Unlike graph/scope view, which users want to see the exact leaf op.
-  // In code view, users want to see the middle code traces they wrote.
-  //
-  // This is a subtle difference from scope/graph view. Usually mostly
-  // want to see the middle code traces (i.e. their own codes.), instead
-  // of the TensorFlow internal codes traces.
-  if (node->proto().total_requested_bytes() < opts.min_bytes ||
-      node->proto().total_exec_micros() < opts.min_micros ||
-      node->proto().total_parameters() < opts.min_params ||
-      node->proto().total_float_ops() < opts.min_float_ops ||
-      depth > opts.max_depth || !ShouldShowIfExtra(node, opts, depth)) {
-    return false;
-  }
-
-  bool show = false;
-  if (opts.device_regexes.size() == 1 && opts.device_regexes[0] == ".*") {
-    show = true;
-  } else {
-    for (const string& regex : opts.device_regexes) {
-      for (const string& device : node->node->devices()) {
-        if (RE2::FullMatch(device, regex)) {
-          show = true;
-          break;
-        }
-      }
-      if (show) break;
-    }
-  }
-  // Don't show if device_regexes don't cover it.
-  if (!show) return false;
-
-  show = false;
-  if (opts.show_name_regexes.size() == 1 && opts.show_name_regexes[0] == ".*") {
-    show = true;
-  } else {
-    for (const string& regex : opts.show_name_regexes) {
-      if (RE2::FullMatch(node->name(), regex)) {
-        show = true;
-        break;
-      }
-    }
-  }
-  // Don't show if show_name_regexes don't cover it.
-  if (!show) return false;
-  // Don't show if hide_name_regexes cover it.
-  for (const string& regex : opts.hide_name_regexes) {
-    if (RE2::FullMatch(node->name(), regex)) return false;
-  }
-  return true;
-}
-
-bool TFShowCode::ShouldTrim(ShowCodeNode* node,
-                        const std::vector<string>& regexes) {
-  for (const string& regex : regexes) {
-    if (RE2::FullMatch(node->name(), regex)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool TFShowCode::ShouldAccount(ShowCodeNode* node, const Options& opts) {
-  if (opts.account_type_regexes.size() == 1 &&
-      opts.account_type_regexes[0] == ".*") {
-    return true;
-  }
-  for (const string& regex : opts.account_type_regexes) {
-    for (const string& type : node->node->op_types()) {
-      if (RE2::FullMatch(type, regex)) {
-        return true;
-      }
-    }
-    for (const string& device : node->node->devices()) {
-      if (RE2::FullMatch(device, regex)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-}  // namespace tfprof
-}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.h b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
deleted file mode 100644
index d74290572b..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// Parent class and utilities for tfprof_graph and tfprof_scope.
-
-#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
-#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "tensorflow/c/checkpoint_reader.h"
-#include "tensorflow/core/framework/graph.pb.h"
-#include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
-#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
-
-namespace tensorflow {
-namespace tfprof {
-class ShowCodeNode {
- public:
-  explicit ShowCodeNode(const TFCodeNode* node);
-  virtual ~ShowCodeNode() {}
-
-  const string& name() const { return node->name(); }
-  TFCodeNodeProto* mutable_proto();
-  const TFCodeNodeProto& proto() const;
-
-  string Format(const Options& opts);
-
-  string FormatMeta(const Options& opts);
-
-  const TFCodeNode* node;
-  bool account;
-  string formatted_str;
-
- protected:
-  void AggregateTotalStats(ShowCodeNode* node);
-
-  void AddSelfToTotalStats();
-
-  void ResetTotalStats();
-
-  TFCodeNodeProto proto_;
-};
-
-class TFShowCode {
- public:
-  explicit TFShowCode() {}
-  virtual ~TFShowCode() {}
-  virtual void AddNode(TFGraphNode* node) = 0;
-  virtual void Build() = 0;
-  const TFCodeNodeProto& Show(const Options& opts);
-
- protected:
-  virtual const ShowCodeNode* ShowInternal(const Options& opts) = 0;
-
-  bool LookUpCheckPoint(const string& name,
-                        std::unique_ptr<TFProfTensor>* tensor);
-
-  // Overridden by subclass if extra requirements need to be met.
-  virtual bool ShouldShowIfExtra(ShowCodeNode* node, const Options& opts,
-                                 int depth) {
-    return true;
-  }
-
-  bool ShouldShow(ShowCodeNode* node, const Options& opts, int depth);
-
-  bool ShouldTrim(ShowCodeNode* node, const std::vector<string>& regexes);
-
-  bool ShouldAccount(ShowCodeNode* node, const Options& opts);
-
-  template <typename T>
-  std::vector<T*> SortNodes(const std::vector<T*>& nodes, const Options& opts) {
-    if (opts.order_by.empty() || nodes.empty()) {
-      return nodes;
-    }
-    std::vector<T*> sorted_nodes = nodes;
-    std::sort(sorted_nodes.begin(), sorted_nodes.end(), [&opts](const T* n1,
-                                                                const T* n2) {
-      if (n1->name() == kTFProfRoot) return true;
-      if (n2->name() == kTFProfRoot) return false;
-      bool name_cmp = n1->name() < n2->name();
-      if (opts.order_by == kOrderBy[0]) {
-        return name_cmp;
-      } else if (opts.order_by == kOrderBy[1]) {
-        return n1->proto().total_requested_bytes() >
-               n2->proto().total_requested_bytes();
-      } else if (opts.order_by == kOrderBy[2]) {
-        return n1->proto().total_exec_micros() >
-               n2->proto().total_exec_micros();
-      } else if (opts.order_by == kOrderBy[3]) {
-        return n1->proto().total_parameters() > n2->proto().total_parameters();
-      } else if (opts.order_by == kOrderBy[4]) {
-        return n1->proto().total_float_ops() > n2->proto().total_float_ops();
-      }
-      return name_cmp;
-    });
-    return sorted_nodes;
-  }
-};
-
-}  // namespace tfprof
-}  // namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.cc b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
index 13ff6e7246..edc0689d69 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
@@ -56,38 +56,29 @@ TFStats::TFStats(std::unique_ptr<GraphDef> graph,
   printf("Preparing Views...\n");
   scope_view_ = std::unique_ptr<TFScope>(new TFScope(ckpt_reader_.get()));
   graph_view_ = std::unique_ptr<TFGraph>(new TFGraph(ckpt_reader_.get()));
-  code_view_ = std::unique_ptr<TFCode>(new TFCode());
-
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     scope_view_->AddNode(&it->second);
     graph_view_->AddNode(&it->second);
-    code_view_->AddNode(&it->second);
   }
   scope_view_->Build();
   graph_view_->Build();
-  code_view_->Build();
 }
 
-const TFGraphNodeProto& TFStats::PrintGraph(const string& cmd,
-                                            const Options& opts) {
+const TFProfNode& TFStats::PrintGraph(const string& cmd, const Options& opts) {
   if (cmd == kCmds[0]) {
     return scope_view_->Show(opts);
   } else if (cmd == kCmds[1]) {
     return graph_view_->Show(opts);
   } else {
     fprintf(stderr, "Unknown command: %s\n", cmd.c_str());
-    return empty_graph_node_;
+    return empty_node_;
   }
 }
 
-const TFCodeNodeProto& TFStats::PrintCode(const Options& opts) {
-  return code_view_->Show(opts);
-}
-
 void TFStats::ParseGraph() {
   for (const NodeDef& node : graph_->node()) {
     CHECK(nodes_map_.find(node.name()) == nodes_map_.end());
-    nodes_map_[node.name()] = TFGraphNode(&node);
+    nodes_map_[node.name()] = TFNode(&node);
   }
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     const NodeDef* node_def = it->second.node_def();
@@ -119,9 +110,6 @@ void TFStats::ParseOpLog() {
     if (entry.float_ops()) {
       node->second.AddFloatOps(entry.float_ops());
     }
-    if (entry.has_code_def()) {
-      node->second.AddCode(&entry.code_def());
-    }
   }
 }
 
@@ -143,14 +131,13 @@ void TFStats::ParseRunMeta() {
             "Missing CostGraphDef in RunMetadata.\nMaybe you forget to"
             "set tf.ConfigProto(graph_options=tf.GraphOptions("
             "build_cost_model=1)) to Session()\n");
-  } else {
-    for (const auto& node_pb : run_meta_->cost_graph().node()) {
-      auto node = nodes_map_.find(node_pb.name());
-      if (node == nodes_map_.end()) {
-        continue;
-      }
-      node->second.AddNodeStat(&node_pb);
+  }
+  for (const auto& node_pb : run_meta_->cost_graph().node()) {
+    auto node = nodes_map_.find(node_pb.name());
+    if (node == nodes_map_.end()) {
+      continue;
     }
+    node->second.AddNodeStat(&node_pb);
   }
 }
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.h b/tensorflow/tools/tfprof/internal/tfprof_stats.h
index 585dca6771..3a8b46ae31 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.h
@@ -35,7 +35,6 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/protobuf/config.pb.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_code.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_graph.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
@@ -57,8 +56,7 @@ class TFStats {
 
   // Prints the results to stdout. Also returns the printed output in
   // a proto.
-  const TFGraphNodeProto& PrintGraph(const string& cmd, const Options& opts);
-  const TFCodeNodeProto& PrintCode(const Options& opts);
+  const TFProfNode& PrintGraph(const string& cmd, const Options& opts);
 
  private:
   void ParseGraph();
@@ -69,16 +67,13 @@ class TFStats {
 
   std::unique_ptr<TFScope> scope_view_;
   std::unique_ptr<TFGraph> graph_view_;
-  std::unique_ptr<TFCode> code_view_;
   std::unique_ptr<GraphDef> graph_;
   std::unique_ptr<RunMetadata> run_meta_;
   std::unique_ptr<OpLog> op_log_;
   std::unique_ptr<checkpoint::CheckpointReader> ckpt_reader_;
-  // Store TFGraphNode instead of TFGraphNode* to avoid large number of
-  // dynamic alloc.
-  std::map<string, TFGraphNode> nodes_map_;
-  TFGraphNodeProto empty_graph_node_;
-  TFCodeNodeProto empty_code_node_;
+  // Store TFNode instead of TFNode* to avoid large number of dynamic alloc.
+  std::map<string, TFNode> nodes_map_;
+  TFProfNode empty_node_;
 };
 
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
index b913161f6a..3c97f0eb65 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
@@ -76,9 +76,9 @@ TEST_F(TFProfStatsTest, CustomOpType) {
                {".*"}, {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
                false);
-  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
+  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFGraphNodeProto expected;
+  TFProfNode expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
@@ -108,9 +108,9 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
       3, 0, 0, 0, 0, {".*"}, "name", {kCkptVarType},  // accout_type_regexes
       {".*"}, {""}, {".*"}, {""}, false,
       {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, false);
-  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
+  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFGraphNodeProto expected;
+  TFProfNode expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
@@ -141,9 +141,9 @@ TEST_F(TFProfStatsTest, TestGraph) {
                {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
                false);
-  const TFGraphNodeProto& root = tf_stats_->PrintGraph("graph", opts);
+  const TFProfNode& root = tf_stats_->PrintGraph("graph", opts);
 
-  TFGraphNodeProto expected;
+  TFProfNode expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: 0\ninputs: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
@@ -155,9 +155,9 @@ TEST_F(TFProfStatsTest, TestGraph) {
 TEST_F(TFProfStatsTest, TestFloatOps) {
   Options opts(10, 0, 0, 0, 1, {".*"}, "name", {".*"}, {".*"}, {""}, {".*"},
                {""}, false, {"float_ops"}, false);
-  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
+  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFGraphNodeProto expected;
+  TFProfNode expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
@@ -187,9 +187,9 @@ TEST_F(TFProfStatsTest, TestAccountShownNameOnly) {
                {"unit_2_1.*DW"},  // show_name_regexes.
                {""}, true,        // account_displayed_op_only.
                {"params"}, false);
-  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
+  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFGraphNodeProto expected;
+  TFProfNode expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
@@ -203,8 +203,8 @@ TEST_F(TFProfStatsTest, TestShowTensorValue) {
                {"unit_1_0.*gamma"}, {""}, false,
                {"tensor_value"},  // Show tensor value from checkpoint.
                false);
-  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
-  TFGraphNodeProto expected;
+  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  TFProfNode expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
diff --git a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
index 95759f9d47..8c19910355 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
@@ -58,9 +58,9 @@ TEST_F(TFProfTensorTest, Basics) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name", {"VariableV2"}, {".*"}, {""},
                {".*"}, {""}, false, {"tensor_value"},  // show the tensor value.
                false);
-  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
+  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFGraphNodeProto expected;
+  TFProfNode expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
diff --git a/tensorflow/tools/tfprof/tfprof_log.proto b/tensorflow/tools/tfprof/tfprof_log.proto
index 5c47142e0a..cae6e1e3a8 100644
--- a/tensorflow/tools/tfprof/tfprof_log.proto
+++ b/tensorflow/tools/tfprof/tfprof_log.proto
@@ -2,17 +2,6 @@ syntax = "proto2";
 
 package tensorflow.tfprof;
 
-// It specifies the Python callstack that creates an op.
-message CodeDef {
-  repeated Trace traces = 1;
-  message Trace {
-    optional string file = 1;
-    optional int32 lineno = 2;
-    optional string function = 3;
-    optional string line = 4;
-  }
-}
-
 message OpLogEntry {
   // op name.
   optional string name = 1;
@@ -23,8 +12,6 @@ message OpLogEntry {
   // User can define extra op type information for an op. This allows the user
   // to select a group of ops precisely using op_type as a key.
   repeated string types = 3;
-  // Used to support tfprof "code" view.
-  optional CodeDef code_def = 4;
 }
 
 message OpLog {
diff --git a/tensorflow/tools/tfprof/tfprof_main.cc b/tensorflow/tools/tfprof/tfprof_main.cc
index dd18a4ad3c..a8ed6e3813 100644
--- a/tensorflow/tools/tfprof/tfprof_main.cc
+++ b/tensorflow/tools/tfprof/tfprof_main.cc
@@ -160,13 +160,12 @@ int main(int argc, char** argv) {
         "Profiling everything!\n");
     return 0;
   } else if (argc > 1) {
-    if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[4]) {
+    if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[3]) {
       tensorflow::tfprof::PrintHelp();
       return 0;
     }
     if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[0] ||
-        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[1] ||
-        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[2]) {
+        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[1]) {
       cmd = argv[1];
     }
   }
@@ -215,10 +214,7 @@ int main(int argc, char** argv) {
       hide_name_regexes, FLAGS_account_displayed_op_only, select, FLAGS_viz,
       FLAGS_dump_to_file);
 
-  if (cmd == tensorflow::tfprof::kCmds[2]) {
-    tf_stat.PrintCode(opts);
-    return 0;
-  } else if (!cmd.empty()) {
+  if (!cmd.empty()) {
     tf_stat.PrintGraph(cmd, opts);
     return 0;
   }
@@ -244,12 +240,10 @@ int main(int argc, char** argv) {
       fprintf(stderr, "E: %s\n", s.ToString().c_str());
       continue;
     }
-    if (cmd == tensorflow::tfprof::kCmds[3]) {
+    if (cmd == tensorflow::tfprof::kCmds[2]) {
       opts = new_opts;
-    } else if (cmd == tensorflow::tfprof::kCmds[4]) {
+    } else if (cmd == tensorflow::tfprof::kCmds[3]) {
       tensorflow::tfprof::PrintHelp();
-    } else if (cmd == tensorflow::tfprof::kCmds[2]) {
-      tf_stat.PrintCode(new_opts);
     } else {
       tf_stat.PrintGraph(cmd, new_opts);
     }
diff --git a/tensorflow/tools/tfprof/tfprof_options.proto b/tensorflow/tools/tfprof/tfprof_options.proto
index 9d269a0995..0d8e688039 100644
--- a/tensorflow/tools/tfprof/tfprof_options.proto
+++ b/tensorflow/tools/tfprof/tfprof_options.proto
@@ -21,4 +21,4 @@ message OptionsProto {
   repeated string select = 14;
   optional bool viz = 15;
   optional string dump_to_file = 16;
-}
+}
\ No newline at end of file
diff --git a/tensorflow/tools/tfprof/tfprof_output.proto b/tensorflow/tools/tfprof/tfprof_output.proto
index 78dd056662..9afd41046e 100644
--- a/tensorflow/tools/tfprof/tfprof_output.proto
+++ b/tensorflow/tools/tfprof/tfprof_output.proto
@@ -14,8 +14,7 @@ message TFProfTensorProto {
   repeated string value_str = 4;
 }
 
-// A node in TensorFlow graph. Used by scope/graph view.
-message TFGraphNodeProto {
+message TFProfNode {
   // op name.
   optional string name = 1;
   // tensor value restored from checkpoint.
@@ -46,34 +45,5 @@ message TFGraphNodeProto {
   repeated TensorShapeProto shapes = 11;
   // Descendants of the graph. The actual descendants depend on the data
   // structure used (scope, graph).
-  repeated TFGraphNodeProto children = 12;
-}
-
-// A node in TensorFlow Python call trace stack. Used by code view.
-message TFCodeNodeProto {
-  // A trace in the trace stack.
-  optional string name = 1;
-
-  // code execution time.
-  optional int64 exec_micros = 2;
-  // Total requested bytes by the code.
-  optional int64 requested_bytes = 3;
-  // Number of parameters if available.
-  optional int64 parameters = 4;
-  // Number of float operations.
-  optional int64 float_ops = 5;
-
-  // The following are the aggregated stats from called descendents and the
-  // trace itself. The actual descendants depend on the data structure used.
-  optional int64 total_exec_micros = 6;
-  optional int64 total_requested_bytes = 7;
-  optional int64 total_parameters = 8;
-  optional int64 total_float_ops = 9;
-
-  // A set of graph nodes created by the leaf of the call stack.
-  // 'children' field should be empty if graph_nodes is non-empty.
-  repeated TFGraphNodeProto graph_nodes = 10;
-  // Descendants of the graph. The actual descendants depend on the data
-  // structure used (scope, graph).
-  repeated TFCodeNodeProto children = 11;
+  repeated TFProfNode children = 12;
 }
\ No newline at end of file
-- 
GitLab


From 739718f95ce114b1ffceeb23804f119c9b3d3474 Mon Sep 17 00:00:00 2001
From: Jonghoon Jin <jhjin0@gmail.com>
Date: Sat, 6 May 2017 12:51:14 -0700
Subject: [PATCH 1086/1563] better handling of MKL check in configure

not prompted to ask MKL download if the var is set already
remove unexpected exit when input is given by user
---
 configure | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 05be9dc29b..308369efd3 100755
--- a/configure
+++ b/configure
@@ -195,15 +195,17 @@ done
 OSNAME=`uname -s`
 
 if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
-  fromuser=""
-  read -p "Do you wish to download MKL LIB from the web? [Y/n] " INPUT
-  fromuser="1"
-  case $INPUT in
-    [Yy]* ) TF_DOWNLOAD_MKL=1;;
-    [Nn]* ) TF_DOWNLOAD_MKL=0;;
-    "" )    TF_DOWNLOAD_MKL=1;;
-    * )     echo "Invalid selection: " $INPUT; exit 1;;
-  esac
+  while [ "$TF_DOWNLOAD_MKL" == "" ]; do
+    fromuser=""
+    read -p "Do you wish to download MKL LIB from the web? [Y/n] " INPUT
+    fromuser="1"
+    case $INPUT in
+      [Yy]* ) TF_DOWNLOAD_MKL=1;;
+      [Nn]* ) TF_DOWNLOAD_MKL=0;;
+      "" )    TF_DOWNLOAD_MKL=1;;
+      * )     echo "Invalid selection: " $INPUT; exit 1;;
+    esac
+  done
 
   if [[ "$TF_DOWNLOAD_MKL" == "1" ]]; then
     DST=`dirname $0`
@@ -263,10 +265,6 @@ if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
       exit 1
   fi
 
-  if [ -z "$fromuser" ]; then
-      exit 1
-  fi
-
 cat > third_party/mkl/mkl.config <<EOF
 # MKL_INSTALL_PATH refers to the location of MKL root folder. The MKL header and library
 # files can be either in this directory, or under include/ and lib64/
-- 
GitLab


From 16271ea2fb61319554cecbd1be773a44b89d2de2 Mon Sep 17 00:00:00 2001
From: Xiang Gao <qasdfgtyuiop@gmail.com>
Date: Sat, 6 May 2017 17:56:54 -0400
Subject: [PATCH 1087/1563] pass tests

---
 tensorflow/core/framework/tensor.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 2e62016e1b..753548de84 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -661,7 +661,7 @@ typename TTypes<T, NDIMS>::Tensor Tensor::flat_outer_dims() {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) {
-  gtl::ArraySlice<int64> flat_outer = ComputeFlatOuterDims(
+  gtl::InlinedVector<int64,4> flat_outer = ComputeFlatOuterDims(
       shape_.dim_sizes(), begin + NDIMS);
   return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
@@ -678,7 +678,7 @@ typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_outer_dims() const {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) const {
-  gtl::ArraySlice<int64> flat_outer = ComputeFlatOuterDims(
+  gtl::InlinedVector<int64,4> flat_outer = ComputeFlatOuterDims(
       shape_.dim_sizes(), begin + NDIMS);
   return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
-- 
GitLab


From 7cac7f24d1c9c80d8ff8b17d4a52605486f1550f Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Sat, 6 May 2017 14:11:14 -0800
Subject: [PATCH 1088/1563] Specify a different outer class name for the
 generation of java output. Change: 155296402

---
 tensorflow/core/protobuf/device_properties.proto | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/protobuf/device_properties.proto b/tensorflow/core/protobuf/device_properties.proto
index bb3d187ee6..9b1497c710 100644
--- a/tensorflow/core/protobuf/device_properties.proto
+++ b/tensorflow/core/protobuf/device_properties.proto
@@ -17,6 +17,7 @@ syntax = "proto3";
 
 package tensorflow;
 option cc_enable_arenas = true;
+option java_outer_classname = "DevicePropertiesProtos";
 
 message DeviceProperties {
   // Device type (CPU, GPU, ...)
@@ -47,4 +48,4 @@ message DeviceProperties {
   int64 memory_size = 12;
   // Memory bandwidth in KB/s
   int64 bandwidth = 13;
-}
\ No newline at end of file
+}
-- 
GitLab


From 93572de9a17ca687318c7afac4496f515cd2264d Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Sat, 6 May 2017 18:07:31 -0800
Subject: [PATCH 1089/1563] Internal change. Change: 155301612

---
 tensorflow/python/kernel_tests/bias_op_test.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/kernel_tests/bias_op_test.py b/tensorflow/python/kernel_tests/bias_op_test.py
index cd07dd8198..fe5f0f319d 100644
--- a/tensorflow/python/kernel_tests/bias_op_test.py
+++ b/tensorflow/python/kernel_tests/bias_op_test.py
@@ -149,10 +149,8 @@ class BiasAddTest(test.TestCase):
       # Test gradient of BiasAddGrad
       bias_add_grad = gradients_impl.gradients(
           nn_ops.l2_loss(output_tensor), bias_tensor)[0]
-      # pylint: disable=unused-variable
       grad_jacob_t, grad_jacob_n = gradient_checker.compute_gradient(
           output_tensor, np_input.shape, bias_add_grad, bias.shape)
-      # pylint: enable=unused-variable
 
       if dtype == np.float16:
         # Compare fp16 theoretical gradients to fp32 numerical gradients,
@@ -186,10 +184,11 @@ class BiasAddTest(test.TestCase):
       if dtype == dtypes.float64:
         threshold = 1e-10
       self.assertAllClose(tensor_jacob_t, tensor_jacob_n, threshold, threshold)
-      self.assertAllClose(bias_jacob_t, bias_jacob_n, threshold, threshold)
-      # TODO(annarev): Re-add assertion for grad_jacob_t and grad_jacob_n once
-      # we figure out why this check started failing with cuda mavx.
-      # self.assertAllClose(grad_jacob_t, grad_jacob_n, threshold, threshold)
+      # TODO(annarev): Re-add assertion for float16, float32 dtypes and NCHW
+      # once we figure out why this check started failing with cuda mavx.
+      if dtype == dtypes.float64 or data_format != "NCHW":
+        self.assertAllClose(bias_jacob_t, bias_jacob_n, threshold, threshold)
+        self.assertAllClose(grad_jacob_t, grad_jacob_n, threshold, threshold)
 
   def testGradientTensor(self):
     for (data_format, use_gpu) in GetTestConfigs():
-- 
GitLab


From 24a61445f419c9698337cd40346b943b682e739f Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Sat, 6 May 2017 18:45:33 -0800
Subject: [PATCH 1090/1563] track persistent memory for temporary memory op.
 Change: 155302379

---
 tensorflow/core/kernels/variable_ops.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tensorflow/core/kernels/variable_ops.h b/tensorflow/core/kernels/variable_ops.h
index 25b17b26c8..f0b5796d04 100644
--- a/tensorflow/core/kernels/variable_ops.h
+++ b/tensorflow/core/kernels/variable_ops.h
@@ -127,6 +127,16 @@ class TemporaryVariableOp : public OpKernel {
     OP_REQUIRES_OK(context, rm->Create(context->step_container()->name(),
                                        var_name_, tmp_var));
     context->set_output_ref(0, &tmp_var->mu, &tmp_var->val);
+    if (context->track_allocations()) {
+      AllocatorAttributes attr;
+      if (context->allocate_on_host(attr)) {
+        context->record_host_persistent_memory_allocation(
+            tmp_var->val.AllocatedBytes());
+      } else {
+        context->record_device_persistent_memory_allocation(
+            tmp_var->val.AllocatedBytes());
+      }
+    }
   }
 
  private:
-- 
GitLab


From 1968b8b3f9316a8327176e25211c8cc2b01459bc Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 6 May 2017 20:46:07 -0800
Subject: [PATCH 1091/1563] Only make 1 collapsible for each run.

Previously, we could possibly make several collapsibles for each run because of how tag names were broken up.
Change: 155305237
---
 .../components/tf_dashboard_common/BUILD      |  1 +
 .../tf_dashboard_common/categorizer.ts        | 33 ++++++++++-------
 .../test/categorizerTest.ts                   | 12 +++++++
 .../tf-categorizer.ts                         | 35 +++++++++++--------
 4 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
index 880e6bd712..efced92dcf 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
@@ -46,6 +46,7 @@ tensorboard_typescript_genrule(
     ],
     typings = [
         "@org_definitelytyped//:d3.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
         "//tensorflow/tensorboard/components/vz_sorting:ts_typings",
     ],
 )
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/categorizer.ts b/tensorflow/tensorboard/components/tf_dashboard_common/categorizer.ts
index 42e7cbcff4..4c06462a98 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/categorizer.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/categorizer.ts
@@ -72,24 +72,31 @@ module Categorizer {
       if (tags.length === 0) {
         return [];
       }
-      let sortedTags = tags.slice().sort(VZ.Sorting.compareTagNames);
-      let categories: Category[] = [];
-      let currentCategory = {
-        name: extractor(sortedTags[0]),
-        tags: [],
-      };
-      sortedTags.forEach((t: string) => {
-        let topLevel = extractor(t);
-        if (currentCategory.name !== topLevel) {
-          categories.push(currentCategory);
-          currentCategory = {
+
+      // Maps between top-level name and category. We use the mapping to avoid
+      // duplicating categories per run.
+      const categoryMapping: {[key: string]: Category} = {};
+
+      tags.forEach((t: string) => {
+        const topLevel = extractor(t);
+        if (!categoryMapping[topLevel]) {
+          const newCategory = {
             name: topLevel,
             tags: [],
           };
+          categoryMapping[topLevel] = newCategory;
         }
-        currentCategory.tags.push(t);
+
+        categoryMapping[topLevel].tags.push(t);
+      });
+
+      // Sort categories into alphabetical order.
+      const categories =
+          _.map(_.keys(categoryMapping).sort(), key => categoryMapping[key]);
+      _.forEach(categories, (category) => {
+        // Sort the tags within each category.
+        category.tags.sort(VZ.Sorting.compareTagNames);
       });
-      categories.push(currentCategory);
       return categories;
     };
   }
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/test/categorizerTest.ts b/tensorflow/tensorboard/components/tf_dashboard_common/test/categorizerTest.ts
index ea149fda47..4e52b60f37 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/test/categorizerTest.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/test/categorizerTest.ts
@@ -62,6 +62,18 @@ module Categorizer {
         assert.deepEqual(
             topLevelNamespaceCategorizer(['a']), [{name: 'a', tags: ['a']}]);
       });
+
+      it('only create 1 category per run', () => {
+        // TensorBoard separates runs from tags using the / and _ characters
+        // *only* during sorting. The categorizer should group all tags under
+        // their correct categories - and create only 1 category per run.
+        const tags = ['foo/bar', 'foo_in_between_run/baz', 'foo/quux'];
+        const expected = [
+          {name: 'foo', tags: ['foo/bar', 'foo/quux']},
+          {name: 'foo_in_between_run', tags: ['foo_in_between_run/baz']},
+        ];
+        assert.deepEqual(topLevelNamespaceCategorizer(tags), expected);
+      });
     });
 
     describe('customCategorizer', () => {
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
index 10271d2c08..c9da9a17eb 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
@@ -73,24 +73,31 @@ function extractorToCategorizer(extractor: (s: string) => string): Categorizer {
     if (tags.length === 0) {
       return [];
     }
-    let sortedTags = tags.slice().sort(compareTagNames);
-    let categories: Category[] = [];
-    let currentCategory = {
-      name: extractor(sortedTags[0]),
-      tags: [],
-    };
-    sortedTags.forEach((t: string) => {
-      let topLevel = extractor(t);
-      if (currentCategory.name !== topLevel) {
-        categories.push(currentCategory);
-        currentCategory = {
+
+    // Maps between top-level name and category. We use the mapping to avoid
+    // duplicating categories per run.
+    const categoryMapping: {[key: string]: Category} = {};
+
+    tags.forEach((t: string) => {
+      const topLevel = extractor(t);
+      if (!categoryMapping[topLevel]) {
+        const newCategory = {
           name: topLevel,
           tags: [],
         };
+        categoryMapping[topLevel] = newCategory;
       }
-      currentCategory.tags.push(t);
+
+      categoryMapping[topLevel].tags.push(t);
+    });
+
+    // Sort categories into alphabetical order.
+    const categories =
+        _.map(_.keys(categoryMapping).sort(), key => categoryMapping[key]);
+    _.forEach(categories, (category) => {
+      // Sort the tags within each category.
+      category.tags.sort(compareTagNames);
     });
-    categories.push(currentCategory);
     return categories;
   };
 }
@@ -180,4 +187,4 @@ Polymer({
       this._setCategories(categories);
     })
   },
-});
\ No newline at end of file
+});
-- 
GitLab


From 9d7e9b0e6b6a08cf1613f073d1459d7ba42034fe Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sat, 6 May 2017 21:11:19 -0800
Subject: [PATCH 1092/1563] [TF:XLA] Instead of dumping ptxas output, write to
 a temp file & and use to build gpu executable. Switching to ptxas to avoid
 relying on the JIT in the nvidia driver for compilation. Change: 155305963

---
 .../compiler/xla/service/gpu/gpu_compiler.cc  | 62 ++++++++++++-------
 .../compiler/xla/service/gpu/gpu_compiler.h   |  1 +
 .../xla/service/gpu/gpu_executable.cc         | 13 +++-
 .../compiler/xla/service/gpu/gpu_executable.h | 19 +++---
 .../compiler/xla/service/gpu/kernel_thunk.cc  |  9 +--
 5 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index dc3a289a71..af5cf8ca4b 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -188,41 +188,52 @@ tensorflow::Status PrepareHloModuleForIrEmitting(
   return pipeline.Run(hlo_module).status();
 }
 
-// Invokes the ptxas tool on the given PTX string, and dumps its output.
-void DumpPtxasInfo(const string& ptx) {
+// Invokes the ptxas tool on the given PTX string, and stores the resulting
+// SASS in *cubin. If -v 2 or greater, runs ptxas with -v and dumps the
+// resulting stderr (which contains register allocation info, etc.)
+// to VLOG(2). If ptxas binary is not found *sass is set to "".
+Status CompilePTX(const string& ptx, int cc_major, int cc_minor,
+                  string* cubin) {
+  *cubin = "";
+
   const string ptxas_path =
       tensorflow::io::JoinPath(tensorflow::CudaRoot(), "bin/ptxas");
+
   // Do not log PTX stats if ptxas is not found at the given path.
-  if (!tensorflow::Env::Default()->FileExists(ptxas_path).ok()) {
-    LOG(WARNING)
-        << "Failed to dump PTX stats because ptxas is not found at path \""
-        << ptxas_path << "\".";
-    return;
-  }
+  LOG(INFO) << "Invoking ptxas at path \"" << ptxas_path << "\".";
+  TF_RETURN_IF_ERROR(tensorflow::Env::Default()->FileExists(ptxas_path));
 
   // Write `ptx` into a temporary file.
   char tempdir_template[] = "/tmp/ptxXXXXXX";
   char* tempdir_name = mkdtemp(tempdir_template);
   CHECK_NOTNULL(tempdir_name);
   string ptx_path = tensorflow::io::JoinPath(tempdir_name, "ptx");
+
   TF_CHECK_OK(
       tensorflow::WriteStringToFile(tensorflow::Env::Default(), ptx_path, ptx));
   LOG(INFO) << "ptx file written to: " << ptx_path;
 
   // Invoke ptxas and collect its output.
-  tensorflow::SubProcess ptxas_info_dumper;
-  ptxas_info_dumper.SetProgram(ptxas_path, {ptxas_path, ptx_path, "-o",
-                                            "/dev/null", "-v", "-arch=sm_35"});
-  ptxas_info_dumper.SetChannelAction(tensorflow::CHAN_STDERR,
-                                     tensorflow::ACTION_PIPE);
-  CHECK(ptxas_info_dumper.Start());
+  tensorflow::SubProcess ptxas_info;
+  string arch = tensorflow::strings::StrCat("sm_", cc_major, cc_minor);
+  string cubin_path = tensorflow::io::JoinPath(tempdir_name, "cubin");
+
+  if (VLOG_IS_ON(2)) {
+    ptxas_info.SetProgram(ptxas_path, {ptxas_path, "-v", "-o", cubin_path,
+                                       "-arch", arch, ptx_path});
+  } else {
+    ptxas_info.SetProgram(
+        ptxas_path, {ptxas_path, "-o", cubin_path, "-arch", arch, ptx_path});
+  }
+  ptxas_info.SetChannelAction(tensorflow::CHAN_STDERR, tensorflow::ACTION_PIPE);
+  CHECK(ptxas_info.Start());
   string stderr_output;
-  int exit_status = ptxas_info_dumper.Communicate(
+  int ptxas_exit_status = ptxas_info.Communicate(
       /*stdin_input=*/nullptr, /*stdout_output=*/nullptr, &stderr_output);
-  XLA_LOG_LINES(tensorflow::INFO, stderr_output);
-  if (exit_status != 0) {
-    LOG(FATAL) << "Invalid PTX. See the error message above for reasons.";
-  }
+
+  TF_RET_CHECK(ptxas_exit_status == 0);
+  return tensorflow::ReadFileToString(tensorflow::Env::Default(), cubin_path,
+                                      cubin);
 }
 
 }  // namespace
@@ -298,10 +309,14 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
 
   // Reserve space for the PTX to be generated for this module.
   string* ptx;
+  string* cubin;
   {
     tensorflow::mutex_lock lock(mutex_);
     generated_ptxes_.emplace_back(MakeUnique<string>());
     ptx = generated_ptxes_.back().get();
+
+    generated_cubins_.emplace_back(MakeUnique<string>());
+    cubin = generated_cubins_.back().get();
   }
   int cc_major, cc_minor;
   if (!stream_exec->GetDeviceDescription().cuda_compute_capability(&cc_major,
@@ -318,9 +333,6 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
   XLA_VLOG_LINES(2, llvm_ir::DumpModuleToString(llvm_module));
   VLOG(2) << "PTX:";
   XLA_VLOG_LINES(2, *ptx);
-  if (VLOG_IS_ON(2)) {
-    DumpPtxasInfo(*ptx);
-  }
 
   auto thunk_schedule = MakeUnique<ThunkSchedule>(
       ir_emitter.ConsumeThunkSequence(), std::move(stream_assignment),
@@ -328,9 +340,13 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
   VLOG(2) << "Printing the thunk schedule...";
   XLA_VLOG_LINES(2, thunk_schedule->ToString());
 
+  TF_RET_CHECK(CompilePTX(*ptx, cc_major, cc_minor, cubin).ok());
+
   auto* gpu_executable =
-      new GpuExecutable(*ptx, std::move(thunk_schedule), std::move(hlo_module),
+      new GpuExecutable(*cubin, *ptx, {cc_major, cc_minor},
+                        std::move(thunk_schedule), std::move(hlo_module),
                         std::move(module_config), std::move(buffer_assignment));
+
   if (flags->xla_gpu_embed_ir) {
     DCHECK_NE("", ir_module_string_before_opt);
     gpu_executable->set_ir_module_string(ir_module_string_before_opt);
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.h b/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
index 22f492b422..99c7ba5199 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
@@ -71,6 +71,7 @@ class GpuCompiler : public Compiler {
   // StreamExecutor (b/24776264).
   tensorflow::mutex mutex_;
   std::vector<std::unique_ptr<string>> generated_ptxes_ GUARDED_BY(mutex_);
+  std::vector<std::unique_ptr<string>> generated_cubins_ GUARDED_BY(mutex_);
 
   // The size in bytes of a pointer. Used for computing ShapeSizeBytes.
   int64 pointer_size_;
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_executable.cc b/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
index 32f0368b4b..b4b788162f 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
@@ -107,13 +107,17 @@ class HloExecutionProfiler {
 
 // Implementation note: HLO profiling is always enabled for GPU executables,
 // since we can use timers around thunks.
-GpuExecutable::GpuExecutable(tensorflow::StringPiece ptx,
+GpuExecutable::GpuExecutable(tensorflow::StringPiece cubin,
+                             tensorflow::StringPiece ptx,
+                             std::pair<int, int> compute_capability,
                              std::unique_ptr<ThunkSchedule> thunk_schedule,
                              std::unique_ptr<HloModule> hlo_module,
                              std::unique_ptr<HloModuleConfig> module_config,
                              std::unique_ptr<BufferAssignment> assignment)
     : Executable(std::move(hlo_module), std::move(module_config)),
+      cubin_(cubin),
       ptx_(ptx),
+      compute_capability_(compute_capability),
       thunk_schedule_(std::move(thunk_schedule)),
       assignment_(std::move(assignment)) {}
 
@@ -186,6 +190,13 @@ StatusOr<se::DeviceMemoryBase> GpuExecutable::ExecuteOnStream(
   // false.
   TF_RET_CHECK(!module_config().has_hybrid_result());
 
+  // Ensure the compute capability of the cubin and the stream match.
+  std::pair<int, int> stream_compute_compatibility;
+  stream->parent()->GetDeviceDescription().cuda_compute_capability(
+      &stream_compute_compatibility.first,
+      &stream_compute_compatibility.second);
+  TF_RET_CHECK(stream_compute_compatibility == compute_capability_);
+
   BufferAllocations::Builder buffer_allocations_builder;
   for (BufferAllocation::Index i = 0; i < assignment_->Allocations().size();
        ++i) {
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_executable.h b/tensorflow/compiler/xla/service/gpu/gpu_executable.h
index e308de79ba..09a92c4e4c 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_executable.h
+++ b/tensorflow/compiler/xla/service/gpu/gpu_executable.h
@@ -40,15 +40,17 @@ limitations under the License.
 
 namespace xla {
 namespace gpu {
-
 // GPU-targeting implementation of the XLA Executable interface.
 //
 // Launches the given CUDA kernel via the StreamExecutor.
-//
-// This is an immutable data type after initialization, and thus thread safe.
+
+// GPUExecutable should eventually be updated to associate a compute
+// capability with the PTX and store multiple cubins, each with their own
+// associated CC's, rather than including CC as a property of GpuExecutable.
 class GpuExecutable : public Executable {
  public:
-  GpuExecutable(tensorflow::StringPiece ptx,
+  GpuExecutable(tensorflow::StringPiece cubin, tensorflow::StringPiece ptx,
+                std::pair<int, int> compute_capability,
                 std::unique_ptr<ThunkSchedule> thunk_schedule,
                 std::unique_ptr<HloModule> hlo_module,
                 std::unique_ptr<HloModuleConfig> module_config,
@@ -62,7 +64,8 @@ class GpuExecutable : public Executable {
     ir_module_string_ = ir_module_string;
   }
 
-  // Returns the compiled PTX for the computation.
+  // Returns the compiled CUDA binary for the computation.
+  tensorflow::StringPiece cubin() const { return cubin_; }
   tensorflow::StringPiece ptx() const { return ptx_; }
 
   StatusOr<perftools::gputools::DeviceMemoryBase> ExecuteOnStream(
@@ -104,8 +107,10 @@ class GpuExecutable : public Executable {
   // This string should be modified only before ExecuteOnStream.
   string ir_module_string_;
 
-  // The reference to the compiled PTX for the computation.
-  const tensorflow::StringPiece ptx_;
+  // The reference to the compiled PTX & CUDA binary for the computation.
+  tensorflow::StringPiece cubin_;
+  tensorflow::StringPiece ptx_;
+  std::pair<int, int> compute_capability_;
 
   // The thunks to be invoked by this GpuExecutable. They are generated by the
   // IrEmitter.
diff --git a/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc b/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc
index 69399e36c4..48ccc63f3d 100644
--- a/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc
+++ b/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc
@@ -41,13 +41,10 @@ tensorflow::Status KernelThunk::Initialize(const GpuExecutable& executable) {
     // Already initialized by another thread.
     return tensorflow::Status::OK();
   }
-
   loader_spec_.reset(new se::MultiKernelLoaderSpec(io_buffers_.size() + 1));
-  tensorflow::StringPiece ptx = executable.ptx();
-  // Convert tensorflow::StringPiece to se::port::StringPiece because
-  // StreamExecutor uses the latter.
-  loader_spec_->AddCudaPtxInMemory(
-      se::port::StringPiece(ptx.data(), ptx.size()), kernel_name_);
+
+  tensorflow::StringPiece cubin = executable.cubin();
+  loader_spec_->AddCudaCubinInMemory(cubin.data(), kernel_name_);
   return tensorflow::Status::OK();
 }
 
-- 
GitLab


From 6ee900438cb0e25b082f7ab54f677b07ce812ebd Mon Sep 17 00:00:00 2001
From: Bairen Yi <byronyi@users.noreply.github.com>
Date: Sun, 7 May 2017 14:21:37 +0800
Subject: [PATCH 1093/1563] fix doc (#9733)

---
 tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
index ba206890ce..90e311a493 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
@@ -166,7 +166,7 @@ void EncodeTensorToByteBuffer(bool is_dead, const Tensor& val,
         (e_skeleton.size() +
          VarLengthEncodingSize(TensorProto::kTensorContentFieldNumber,
                                tdata.size()));
-    string header;  // All of RecvTensorRequest except the tensor() field
+    string header;  // All of RecvTensorResponse except the tensor() field
     response.AppendToString(&header);
 
     size_t expected_size =
-- 
GitLab


From d1565250256215a5e8bea184f3848b9d468672cb Mon Sep 17 00:00:00 2001
From: Mortada Mehyar <mortada@users.noreply.github.com>
Date: Sat, 6 May 2017 23:22:17 -0700
Subject: [PATCH 1094/1563] Fix missing dash for cxxopt build option (#9736)

---
 tensorflow/docs_src/extend/adding_an_op.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index f54f79cbf4..177eb25a31 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -42,7 +42,7 @@ To incorporate your custom op you'll need to:
     Python @{tf.test.compute_gradient_error$gradient checker}.
     See
     [`relu_op_test.py`](https://www.tensorflow.org/code/tensorflow/python/kernel_tests/relu_op_test.py) as
-    an example that does tests the forward functions of Relu-like operators and
+    an example that tests the forward functions of Relu-like operators and
     their gradients.
 
 PREREQUISITES:
@@ -188,7 +188,7 @@ building the `.so` file.
 >   the older ABI. If you compile your op library with `gcc>=5`, add
 >   `-D_GLIBCXX_USE_CXX11_ABI=0` to the command line to make the library
 >   compatible with the older abi.
->   Furthermore if you are using TensorFlow package created from source remember to add `-cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"`
+>   Furthermore if you are using TensorFlow package created from source remember to add `--cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"`
 >   as bazel command to compile the Python package.
 
 ### Compile the op using bazel (TensorFlow source installation)
@@ -225,7 +225,7 @@ TensorFlow Python API provides the
 load the dynamic library and register the op with the TensorFlow
 framework. `load_op_library` returns a Python module that contains the Python
 wrappers for the op and the kernel. Thus, once you have built the op, you can
-do the following to run it from Python :
+do the following to run it from Python:
 
 ```python
 import tensorflow as tf
-- 
GitLab


From bdca561c273d3749a8359763c157daa850af138c Mon Sep 17 00:00:00 2001
From: Jianfei Wang <me@thinxer.com>
Date: Mon, 8 May 2017 02:02:58 +0800
Subject: [PATCH 1095/1563] Fix tf.meshgrid documentation (#9740)

The original document has the wrong output regarding the default indexing xy.

    x = [1, 2, 3]
    y = [4, 5, 6]
    X, Y = tf.meshgrid(x, y)
    print(X.eval())
    print(Y.eval())

    [[1 2 3]
     [1 2 3]
     [1 2 3]]
    [[4 4 4]
     [5 5 5]
     [6 6 6]]
---
 tensorflow/python/ops/array_ops.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 5ac630c321..dad5b9dc0d 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1690,21 +1690,21 @@ def meshgrid(*args, **kwargs):
   results in
 
   ```prettyprint
-    X = [[1, 1, 1],
-         [2, 2, 2],
-         [3, 3, 3]]
-    Y = [[4, 5, 6],
-         [4, 5, 6],
-         [4, 5, 6]]
+    X = [[1, 2, 3],
+         [1, 2, 3],
+         [1, 2, 3]]
+    Y = [[4, 4, 4],
+         [5, 5, 5],
+         [6, 6, 6]]
   ```
 
   Args:
-    *args: `Tensor`s with rank 1
-    indexing: Either 'xy' or 'ij' (optional, default: 'xy')
+    *args: `Tensor`s with rank 1.
+    indexing: Either 'xy' or 'ij' (optional, default: 'xy').
     name: A name for the operation (optional).
 
   Returns:
-    outputs: A list of N `Tensor`s with rank N
+    outputs: A list of N `Tensor`s with rank N.
   """
 
   indexing = kwargs.pop("indexing", "xy")
-- 
GitLab


From 7fa0cf39f854d5fdaaa19ad6425dfed02f5fea64 Mon Sep 17 00:00:00 2001
From: Zader Zheng <yumaoshu@gmail.com>
Date: Mon, 8 May 2017 08:31:50 +0800
Subject: [PATCH 1096/1563] =?UTF-8?q?Unveil=20type=20check=20part=20in=20?=
 =?UTF-8?q?=5FVerifyGeneratedGradients=20that=20was=20not=20actu=E2=80=A6?=
 =?UTF-8?q?=20(#9529)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* unveil type check part in _VerifyGeneratedGradients that was not actually used

* remove the block that's not getting used
---
 tensorflow/python/ops/gradients_impl.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/tensorflow/python/ops/gradients_impl.py b/tensorflow/python/ops/gradients_impl.py
index 2adf8f05d8..bd8a5c86ac 100644
--- a/tensorflow/python/ops/gradients_impl.py
+++ b/tensorflow/python/ops/gradients_impl.py
@@ -273,28 +273,6 @@ def _VerifyGeneratedGradients(grads, op):
   if len(grads) != len(op.inputs):
     raise ValueError("Num gradients %d generated for op %s do not match num "
                      "inputs %d" % (len(grads), op.node_def, len(op.inputs)))
-    for i in xrange(len(grads)):
-      grad = grads[i]
-      inp = op.inputs[i]
-      if grad is None:
-        continue
-      if grad.dtype.is_floating:
-        if not inp.dtype.is_floating:
-          raise TypeError("Gradient type %s generated for real-valued op %s "
-                           "with type %s must be real" %
-                           (dtypes.as_dtype(grad.dtype).name, op.node_def,
-                            dtypes.as_dtype(inp.dtype).name))
-      elif grad.dtype.is_complex:
-        if not inp.dtype.is_complex:
-          raise TypeError("Gradient type %s generated for complex-valued op %s"
-                           " with type %s must be complex" %
-                           (dtypes.as_dtype(grad.dtype).name, op.node_def,
-                            dtypes.as_dtype(inp.dtype).name))
-      else:
-        raise TypeError("Gradient type %s generated for op %s "
-                         "with type %s must be either real or complex" %
-                         (dtypes.as_dtype(grad.dtype).name, op.node_def,
-                          dtypes.as_dtype(inp.dtype).name))
 
 
 def _StopOps(from_ops, pending_count):
-- 
GitLab


From 4dc3fdca610b567628e7b1dfd19bd6eaa7238733 Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Sun, 7 May 2017 11:22:29 -0800
Subject: [PATCH 1097/1563] Have sdca_model_fn used in SDCA-based optimizers
 use the training Ops from SDCAOptimizer instead of replicating this logic in
 place. Change: 155326885

---
 tensorflow/contrib/linear_optimizer/BUILD     |   2 -
 .../linear_optimizer/python/sdca_estimator.py | 134 +-----------------
 .../linear_optimizer/python/sdca_optimizer.py |  54 +++----
 3 files changed, 32 insertions(+), 158 deletions(-)

diff --git a/tensorflow/contrib/linear_optimizer/BUILD b/tensorflow/contrib/linear_optimizer/BUILD
index 21f02b0a96..472633b5c7 100644
--- a/tensorflow/contrib/linear_optimizer/BUILD
+++ b/tensorflow/contrib/linear_optimizer/BUILD
@@ -111,13 +111,11 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":sdca_ops_py",
-        ":sparse_feature_column_py",
         "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/contrib/learn",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:dtypes",
-        "//tensorflow/python:math_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:tensor_util",
         "//tensorflow/python:training",
diff --git a/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py b/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py
index 733b03eed3..f4961ab9db 100644
--- a/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py
+++ b/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py
@@ -24,13 +24,10 @@ from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators import head as head_lib
 from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.contrib.linear_optimizer.python import sdca_optimizer
-from tensorflow.contrib.linear_optimizer.python.ops import sdca_ops
-from tensorflow.contrib.linear_optimizer.python.ops.sparse_feature_column import SparseFeatureColumn
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.training import session_run_hook
 
@@ -76,131 +73,6 @@ def _add_bias_column(feature_columns, columns_to_tensors, bias_variable,
   columns_to_variables[bias_column] = [bias_variable]
 
 
-def _get_sdca_train_step(optimizer, columns_to_variables, weight_column_name,
-                         loss_type, features, targets, global_step):
-  """Returns the training operation of an SdcaModel optimizer."""
-
-  def _dense_tensor_to_sparse_feature_column(dense_tensor):
-    """Returns SparseFeatureColumn for the input dense_tensor."""
-    ignore_value = 0.0
-    sparse_indices = array_ops.where(
-        math_ops.not_equal(dense_tensor,
-                           math_ops.cast(ignore_value, dense_tensor.dtype)))
-    sparse_values = array_ops.gather_nd(dense_tensor, sparse_indices)
-    # TODO(sibyl-Aix6ihai, sibyl-vie3Poto): Makes this efficient, as now SDCA supports
-    # very sparse features with weights and not weights.
-    return SparseFeatureColumn(
-        array_ops.reshape(
-            array_ops.split(value=sparse_indices, num_or_size_splits=2,
-                            axis=1)[0], [-1]),
-        array_ops.reshape(
-            array_ops.split(value=sparse_indices, num_or_size_splits=2,
-                            axis=1)[1], [-1]),
-        array_ops.reshape(math_ops.to_float(sparse_values), [-1]))
-
-  def _training_examples_and_variables():
-    """Returns dictionaries for training examples and variables."""
-    batch_size = targets.get_shape()[0]
-
-    # Iterate over all feature columns and create appropriate lists for dense
-    # and sparse features as well as dense and sparse weights (variables) for
-    # SDCA.
-    # TODO(sibyl-vie3Poto): Reshape variables stored as values in column_to_variables
-    # dict as 1-dimensional tensors.
-    dense_features, sparse_features, sparse_feature_with_values = [], [], []
-    dense_feature_weights = []
-    sparse_feature_weights, sparse_feature_with_values_weights = [], []
-    for column in sorted(columns_to_variables.keys(), key=lambda x: x.key):
-      transformed_tensor = features[column]
-      if isinstance(column, layers.feature_column._RealValuedColumn):  # pylint: disable=protected-access
-        # A real-valued column corresponds to a dense feature in SDCA. A
-        # transformed tensor corresponding to a RealValuedColumn has rank 2
-        # (its shape is typically [batch_size, column.dimension]) and so it
-        # can be passed to SDCA as is.
-        dense_features.append(transformed_tensor)
-        # For real valued columns, the variables list contains exactly one
-        # element.
-        dense_feature_weights.append(columns_to_variables[column][0])
-      elif isinstance(column, layers.feature_column._BucketizedColumn):  # pylint: disable=protected-access
-        # A bucketized column corresponds to a sparse feature in SDCA. The
-        # bucketized feature is "sparsified" for SDCA by converting it to a
-        # SparseFeatureColumn respresenting the one-hot encoding of the
-        # bucketized feature.
-        #
-        # TODO(sibyl-vie3Poto): Explore whether it is more efficient to translate a
-        # bucketized feature column to a dense feature in SDCA. This will likely
-        # depend on the number of buckets.
-        dense_bucket_tensor = column._to_dnn_input_layer(transformed_tensor)  # pylint: disable=protected-access
-        sparse_feature_column = _dense_tensor_to_sparse_feature_column(
-            dense_bucket_tensor)
-        sparse_feature_with_values.append(sparse_feature_column)
-        # For bucketized columns, the variables list contains exactly one
-        # element.
-        sparse_feature_with_values_weights.append(
-            columns_to_variables[column][0])
-      elif isinstance(
-          column,
-          (
-              layers.feature_column._CrossedColumn,  # pylint: disable=protected-access
-              layers.feature_column._SparseColumn)):  # pylint: disable=protected-access
-        sparse_features.append(
-            SparseFeatureColumn(
-                array_ops.reshape(
-                    array_ops.split(
-                        value=transformed_tensor.indices,
-                        num_or_size_splits=2,
-                        axis=1)[0], [-1]),
-                array_ops.reshape(transformed_tensor.values, [-1]), None))
-        sparse_feature_weights.append(columns_to_variables[column][0])
-      elif isinstance(column, layers.feature_column._WeightedSparseColumn):  # pylint: disable=protected-access
-        id_tensor = column.id_tensor(transformed_tensor)
-        weight_tensor = column.weight_tensor(transformed_tensor)
-        sparse_feature_with_values.append(
-            SparseFeatureColumn(
-                array_ops.reshape(
-                    array_ops.split(
-                        value=id_tensor.indices, num_or_size_splits=2, axis=1)[
-                            0], [-1]),
-                array_ops.reshape(id_tensor.values, [-1]),
-                array_ops.reshape(weight_tensor.values, [-1])))
-        sparse_feature_with_values_weights.append(
-            columns_to_variables[column][0])
-      else:
-        raise ValueError("SDCAOptimizer does not support column type {}".format(
-            type(column).__name__))
-
-    example_weights = array_ops.reshape(
-        features[weight_column_name],
-        shape=[-1]) if weight_column_name else array_ops.ones([batch_size])
-    example_ids = features[optimizer.example_id_column]
-    sparse_feature_with_values.extend(sparse_features)
-    sparse_feature_with_values_weights.extend(sparse_feature_weights)
-    examples = dict(
-        sparse_features=sparse_feature_with_values,
-        dense_features=dense_features,
-        example_labels=math_ops.to_float(
-            array_ops.reshape(targets, shape=[-1])),
-        example_weights=example_weights,
-        example_ids=example_ids)
-    sdca_variables = dict(
-        sparse_features_weights=sparse_feature_with_values_weights,
-        dense_features_weights=dense_feature_weights)
-    return examples, sdca_variables
-
-  training_examples, training_variables = _training_examples_and_variables()
-  sdca_model = sdca_ops.SdcaModel(
-      examples=training_examples,
-      variables=training_variables,
-      options=dict(
-          symmetric_l1_regularization=optimizer.symmetric_l1_regularization,
-          symmetric_l2_regularization=optimizer.symmetric_l2_regularization,
-          num_loss_partitions=optimizer.num_loss_partitions,
-          num_table_shards=optimizer.num_table_shards,
-          loss_type=loss_type))
-  train_op = sdca_model.minimize(global_step=global_step)
-  return sdca_model, train_op
-
-
 def sdca_model_fn(features, labels, mode, params, config=None):
   """A model_fn for linear models that use the SDCA optimizer.
 
@@ -283,9 +155,9 @@ def sdca_model_fn(features, labels, mode, params, config=None):
 
   def _train_op_fn(unused_loss):
     global_step = contrib_variables.get_global_step()
-    sdca_model, train_op = _get_sdca_train_step(optimizer, columns_to_variables,
-                                                weight_column_name, loss_type,
-                                                features, labels, global_step)
+    sdca_model, train_op = optimizer.get_train_step(
+        columns_to_variables, weight_column_name, loss_type, features, labels,
+        global_step)
     if update_weights_hook is not None:
       update_weights_hook.set_parameters(sdca_model, train_op)
     return train_op
diff --git a/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py b/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py
index f9d69d6dea..65a7116c23 100644
--- a/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py
+++ b/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py
@@ -99,16 +99,16 @@ class SDCAOptimizer(object):
   def symmetric_l2_regularization(self):
     return self._symmetric_l2_regularization
 
-  def get_train_step(self, columns_to_variables,
-                     weight_column_name, loss_type, features, targets,
-                     global_step):
+  def get_train_step(self, columns_to_variables, weight_column_name, loss_type,
+                     features, targets, global_step):
     """Returns the training operation of an SdcaModel optimizer."""
 
-    def _tensor_to_sparse_feature_column(dense_tensor):
+    def _dense_tensor_to_sparse_feature_column(dense_tensor):
       """Returns SparseFeatureColumn for the input dense_tensor."""
       ignore_value = 0.0
-      sparse_indices = array_ops.where(math_ops.not_equal(
-          dense_tensor, math_ops.cast(ignore_value, dense_tensor.dtype)))
+      sparse_indices = array_ops.where(
+          math_ops.not_equal(dense_tensor,
+                             math_ops.cast(ignore_value, dense_tensor.dtype)))
       sparse_values = array_ops.gather_nd(dense_tensor, sparse_indices)
       # TODO(sibyl-Aix6ihai, sibyl-vie3Poto): Makes this efficient, as now SDCA supports
       # very sparse features with weights and not weights.
@@ -133,10 +133,9 @@ class SDCAOptimizer(object):
       dense_features, sparse_features, sparse_feature_with_values = [], [], []
       dense_feature_weights = []
       sparse_feature_weights, sparse_feature_with_values_weights = [], []
-      # pylint: disable=protected-access
       for column in sorted(columns_to_variables.keys(), key=lambda x: x.key):
         transformed_tensor = features[column]
-        if isinstance(column, layers.feature_column._RealValuedColumn):
+        if isinstance(column, layers.feature_column._RealValuedColumn):  # pylint: disable=protected-access
           # A real-valued column corresponds to a dense feature in SDCA. A
           # transformed tensor corresponding to a RealValuedColumn has rank 2
           # (its shape is typically [batch_size, column.dimension]) and so it
@@ -145,22 +144,28 @@ class SDCAOptimizer(object):
           # For real valued columns, the variables list contains exactly one
           # element.
           dense_feature_weights.append(columns_to_variables[column][0])
-        elif isinstance(column, layers.feature_column._BucketizedColumn):
+        elif isinstance(column, layers.feature_column._BucketizedColumn):  # pylint: disable=protected-access
           # A bucketized column corresponds to a sparse feature in SDCA. The
           # bucketized feature is "sparsified" for SDCA by converting it to a
           # SparseFeatureColumn respresenting the one-hot encoding of the
           # bucketized feature.
-          dense_bucket_tensor = layers.input_from_feature_columns(
-              {column: transformed_tensor}, [column])
-          sparse_feature_column = _tensor_to_sparse_feature_column(
+          #
+          # TODO(sibyl-vie3Poto): Explore whether it is more efficient to translate a
+          # bucketized feature column to a dense feature in SDCA. This will
+          # likely depend on the number of buckets.
+          dense_bucket_tensor = column._to_dnn_input_layer(transformed_tensor)  # pylint: disable=protected-access
+          sparse_feature_column = _dense_tensor_to_sparse_feature_column(
               dense_bucket_tensor)
           sparse_feature_with_values.append(sparse_feature_column)
           # For bucketized columns, the variables list contains exactly one
           # element.
           sparse_feature_with_values_weights.append(
               columns_to_variables[column][0])
-        elif isinstance(column, (layers.feature_column._CrossedColumn,
-                                 layers.feature_column._SparseColumn)):
+        elif isinstance(
+            column,
+            (
+                layers.feature_column._CrossedColumn,  # pylint: disable=protected-access
+                layers.feature_column._SparseColumn)):  # pylint: disable=protected-access
           sparse_features.append(
               SparseFeatureColumn(
                   array_ops.reshape(
@@ -168,10 +173,9 @@ class SDCAOptimizer(object):
                           value=transformed_tensor.indices,
                           num_or_size_splits=2,
                           axis=1)[0], [-1]),
-                  array_ops.reshape(transformed_tensor.values, [-1]),
-                  None))
+                  array_ops.reshape(transformed_tensor.values, [-1]), None))
           sparse_feature_weights.append(columns_to_variables[column][0])
-        elif isinstance(column, layers.feature_column._WeightedSparseColumn):
+        elif isinstance(column, layers.feature_column._WeightedSparseColumn):  # pylint: disable=protected-access
           id_tensor = column.id_tensor(transformed_tensor)
           weight_tensor = column.weight_tensor(transformed_tensor)
           sparse_feature_with_values.append(
@@ -183,11 +187,10 @@ class SDCAOptimizer(object):
                   array_ops.reshape(id_tensor.values, [-1]),
                   array_ops.reshape(weight_tensor.values, [-1])))
           sparse_feature_with_values_weights.append(
-            columns_to_variables[column][0])
+              columns_to_variables[column][0])
         else:
           raise ValueError('SDCAOptimizer does not support column type %s.' %
                            type(column).__name__)
-      # pylint: enable=protected-access
 
       example_weights = array_ops.reshape(
           features[weight_column_name],
@@ -195,12 +198,13 @@ class SDCAOptimizer(object):
       example_ids = features[self._example_id_column]
       sparse_feature_with_values.extend(sparse_features)
       sparse_feature_with_values_weights.extend(sparse_feature_weights)
-      examples = dict(sparse_features=sparse_feature_with_values,
-                      dense_features=dense_features,
-                      example_labels=math_ops.to_float(array_ops.reshape(
-                          targets, shape=[-1])),
-                      example_weights=example_weights,
-                      example_ids=example_ids)
+      examples = dict(
+          sparse_features=sparse_feature_with_values,
+          dense_features=dense_features,
+          example_labels=math_ops.to_float(
+              array_ops.reshape(targets, shape=[-1])),
+          example_weights=example_weights,
+          example_ids=example_ids)
       sdca_variables = dict(
           sparse_features_weights=sparse_feature_with_values_weights,
           dense_features_weights=dense_feature_weights)
-- 
GitLab


From 60adca7bce76c76cab2f872426cecf4b63a64526 Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Sun, 7 May 2017 14:18:47 -0800
Subject: [PATCH 1098/1563] [XLA] Make LiteralUtil::EachCellAsString handle all
 ranks

LiteralUtil::EachCellAsString was hard coded to handle only up to rank 4. This
simply reworks it to handle all ranks.
Change: 155331612
---
 tensorflow/compiler/xla/literal_util.cc | 45 ++++---------------------
 1 file changed, 6 insertions(+), 39 deletions(-)

diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index 4ec695b2f5..3b3e004864 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -736,47 +736,14 @@ template <typename T, typename WT>
     const Literal& literal,
     const std::function<void(tensorflow::gtl::ArraySlice<int64> indices,
                              const string& value)>& per_cell) {
-  if (ShapeUtil::Rank(literal.shape()) == 1) {
-    for (int64 i0 = 0; i0 < literal.shape().dimensions(0); ++i0) {
-      per_cell({i0}, GetAsString(literal, {i0}));
-    }
-    return;
-  }
-
-  if (ShapeUtil::Rank(literal.shape()) == 2) {
-    for (int64 i0 = 0; i0 < literal.shape().dimensions(0); ++i0) {
-      for (int64 i1 = 0; i1 < literal.shape().dimensions(1); ++i1) {
-        per_cell({i0, i1}, GetAsString(literal, {i0, i1}));
-      }
-    }
-    return;
-  }
-
-  if (ShapeUtil::Rank(literal.shape()) == 3) {
-    for (int64 i0 = 0; i0 < literal.shape().dimensions(0); ++i0) {
-      for (int64 i1 = 0; i1 < literal.shape().dimensions(1); ++i1) {
-        for (int64 i2 = 0; i2 < literal.shape().dimensions(2); ++i2) {
-          per_cell({i0, i1, i2}, GetAsString(literal, {i0, i1, i2}));
-        }
-      }
-    }
-    return;
-  }
-
-  if (ShapeUtil::Rank(literal.shape()) == 4) {
-    for (int64 i0 = 0; i0 < literal.shape().dimensions(0); ++i0) {
-      for (int64 i1 = 0; i1 < literal.shape().dimensions(1); ++i1) {
-        for (int64 i2 = 0; i2 < literal.shape().dimensions(2); ++i2) {
-          for (int64 i3 = 0; i3 < literal.shape().dimensions(3); ++i3) {
-            per_cell({i0, i1, i2, i3}, GetAsString(literal, {i0, i1, i2, i3}));
-          }
-        }
-      }
-    }
+  if (ShapeUtil::HasZeroElements(literal.shape())) {
     return;
   }
-
-  LOG(FATAL) << "unhandled rank: " << ShapeUtil::Rank(literal.shape());
+  std::vector<int64> indices = IndexUtil::LinearIndexToMultidimensionalIndex(
+      literal.shape(), /*linear_index=*/0);
+  do {
+    per_cell(indices, GetAsString(literal, indices));
+  } while (IndexUtil::BumpIndices(literal.shape(), &indices));
 }
 
 namespace {
-- 
GitLab


From f7935b8f8e4d51802ca7eff1c9f740446d6ca24a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 7 May 2017 16:07:06 -0800
Subject: [PATCH 1099/1563] Migrate the tf_graph_loader component to use
 webfiles. Change: 155334410

---
 tensorflow/BUILD                              |    1 +
 .../components/tf_graph_loader/BUILD          |   46 +
 .../components/tf_graph_loader/demo/BUILD     |   24 +
 .../tf_graph_loader/demo/data/graph.pbtxt     | 4606 +++++++++++++++++
 .../tf_graph_loader/demo/index.html           |   78 +
 .../tf_graph_loader/tf-graph-loader.html      |    1 +
 6 files changed, 4756 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader/demo/index.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index de22a996ea..c02987ed8a 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -334,6 +334,7 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_globals:all_files",
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_loader:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
         "//tensorflow/tensorboard/components/tf_image_dashboard:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/BUILD b/tensorflow/tensorboard/components/tf_graph_loader/BUILD
new file mode 100644
index 0000000000..ce2dddc809
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader/BUILD
@@ -0,0 +1,46 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_loader",
+    srcs = [
+        "tf-graph-loader.html",
+    ],
+    path = "/tf-graph-loader",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-loader.html",
+    ],
+    destdir = "tf-graph-loader",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
new file mode 100644
index 0000000000..0fc800489c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_loader/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-loader/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html b/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
new file mode 100644
index 0000000000..a75cf42e35
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
@@ -0,0 +1,78 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+  <head>
+    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+    <link rel="import" href="../tf-graph-loader.html">
+    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+    <title>TF Graph Loader Demo</title>
+  </head>
+  <body>
+    <demo-snippet>
+      <template>
+        <dom-module id="tf-graph-loader-demo">
+          <template>
+             <tf-graph-loader id="loader"
+                datasets="[[_datasets]]"
+                selected-dataset="[[_selectedDataset]]"
+                progress="{{_progress}}"></tf-graph-loader>
+          </template>
+          <script>
+            Polymer({
+              is: "tf-graph-loader-demo",
+              properties: {
+                // We tell the graph loader to load a specific pbtxt file.
+                _datasets: {
+                  type: Array,
+                  value: [{
+                    "name": "Graph with XLA Clusters Specified",
+                    "path": "data/graph.pbtxt"
+                  }],
+                },
+                _selectedDataset: {
+                  type: Number,
+                  value: 0,
+                },
+
+                // This property will be updated by the graph loader.
+                _progress: {
+                  type: Object,
+                },
+              },
+              observers: [
+                '_progressUpdated(_progress)',
+              ],
+              _progressUpdated(progress) {
+                // console.log the progress.
+                console.log('Progress updated.', progress);
+
+                // The graph has loaded. console.log it.
+                if (progress.value == 100) {
+                  console.log('graph', this.$.loader.outGraph);
+                }
+              },
+            });
+          </script>
+        </dom-module>
+        <!-- The graph loader lacks visual elements. -->
+        <tf-graph-loader-demo></tf-graph-loader-demo>
+      </template>
+    </demo-snippet>
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html b/tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html
index bdfb3aa2bf..8d59cbd2aa 100644
--- a/tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html
+++ b/tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html
@@ -16,6 +16,7 @@ limitations under the License.
 -->
 
 <link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
 
 <!--
 An element which provides a filter parsing for pbtxt to graph output.
-- 
GitLab


From 3c02d1100788789b04e04feb93761f0ad898ea77 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 7 May 2017 22:47:19 -0800
Subject: [PATCH 1100/1563] In the CUDA path of depthwise_conv2d, add
 __launch_bounds__ and use CUDA runtime helpers to determine LaunchConfig
 which maximizes occupancy. Change: 155347912

---
 .../core/kernels/depthwise_conv_op_gpu.cu.cc  | 93 +++++++++++++------
 tensorflow/core/util/cuda_kernel_helper.h     | 22 +++++
 2 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc b/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc
index b16adf6102..051d477244 100644
--- a/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc
+++ b/tensorflow/core/kernels/depthwise_conv_op_gpu.cu.cc
@@ -38,9 +38,9 @@ using Eigen::GpuDevice;
 // in NHWC format.
 template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
           int kKnownDepthMultiplier>
-__global__ void DepthwiseConv2dGPUKernelNHWC(const DepthwiseArgs args,
-                                             const T* input, const T* filter,
-                                             T* output, int num_outputs) {
+__global__ void __launch_bounds__(1024, 2)
+    DepthwiseConv2dGPUKernelNHWC(const DepthwiseArgs args, const T* input,
+                                 const T* filter, T* output, int num_outputs) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
@@ -120,9 +120,9 @@ __global__ void DepthwiseConv2dGPUKernelNHWC(const DepthwiseArgs args,
 // in NCHW format.
 template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
           int kKnownDepthMultiplier>
-__global__ void DepthwiseConv2dGPUKernelNCHW(const DepthwiseArgs args,
-                                             const T* input, const T* filter,
-                                             T* output, int num_outputs) {
+__global__ void __launch_bounds__(1024, 2)
+    DepthwiseConv2dGPUKernelNCHW(const DepthwiseArgs args, const T* input,
+                                 const T* filter, T* output, int num_outputs) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
@@ -250,17 +250,34 @@ void LaunchDepthwiseConv2dGPU(const GpuDevice& d, const DepthwiseArgs args,
                               TensorFormat data_format) {
   const int num_outputs =
       args.batch * args.out_rows * args.out_cols * args.out_depth;
-  CudaLaunchConfig config = GetCudaLaunchConfig(num_outputs, d);
+  // The compile-time constant version runs faster with a single block.
+  const int max_block_count = kKnownFilterWidth < 0 || kKnownFilterHeight < 0 ||
+                                      kKnownDepthMultiplier < 0 ||
+                                      args.out_rows * args.out_cols <= 256
+                                  ? std::numeric_limits<int>::max()
+                                  : d.getNumCudaMultiProcessors();
   if (data_format == FORMAT_NHWC) {
+    CudaLaunchConfig config = GetCudaLaunchConfig(
+        num_outputs, d,
+        DepthwiseConv2dGPUKernelNHWC<T, kKnownFilterWidth, kKnownFilterHeight,
+                                     kKnownDepthMultiplier>,
+        0);
     DepthwiseConv2dGPUKernelNHWC<T, kKnownFilterWidth, kKnownFilterHeight,
                                  kKnownDepthMultiplier>
-        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-            args, input, filter, output, num_outputs);
+        <<<std::min(max_block_count, config.block_count),
+           config.thread_per_block, 0, d.stream()>>>(args, input, filter,
+                                                     output, num_outputs);
   } else if (data_format == FORMAT_NCHW) {
+    CudaLaunchConfig config = GetCudaLaunchConfig(
+        num_outputs, d,
+        DepthwiseConv2dGPUKernelNCHW<T, kKnownFilterWidth, kKnownFilterHeight,
+                                     kKnownDepthMultiplier>,
+        0);
     DepthwiseConv2dGPUKernelNCHW<T, kKnownFilterWidth, kKnownFilterHeight,
                                  kKnownDepthMultiplier>
-        <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
-            args, input, filter, output, num_outputs);
+        <<<std::min(max_block_count, config.block_count),
+           config.thread_per_block, 0, d.stream()>>>(args, input, filter,
+                                                     output, num_outputs);
   } else {
     assert(false);
   }
@@ -288,9 +305,11 @@ template struct DepthwiseConv2dGPULaunch<double>;
 // A Cuda kernel to compute the depthwise convolution backprop w.r.t. input.
 template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
           int kKnownDepthMultiplier>
-__global__ void DepthwiseConv2dBackpropInputGPUKernelNHWC(
-    const DepthwiseArgs args, const T* out_backprop, const T* filter,
-    T* in_backprop, int num_in_backprop) {
+__global__ void __launch_bounds__(640, 2)
+    DepthwiseConv2dBackpropInputGPUKernelNHWC(const DepthwiseArgs args,
+                                              const T* out_backprop,
+                                              const T* filter, T* in_backprop,
+                                              int num_in_backprop) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
@@ -350,7 +369,7 @@ __global__ void DepthwiseConv2dBackpropInputGPUKernelNHWC(
 
 template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
           int kKnownDepthMultiplier>
-__global__ void __launch_bounds__(1024)
+__global__ void __launch_bounds__(640, 2)
     DepthwiseConv2dBackpropInputGPUKernelNCHW(const DepthwiseArgs args,
                                               const T* out_backprop,
                                               const T* filter, T* in_backprop,
@@ -428,17 +447,22 @@ void LaunchDepthwiseConv2dBackpropInputGPU(const GpuDevice& d,
                                            TensorFormat data_format) {
   const int num_in_backprop =
       args.batch * args.in_rows * args.in_cols * args.in_depth;
-  CudaLaunchConfig config = GetCudaLaunchConfig(num_in_backprop, d);
-  // Increase block count for when there are more warps/SM than threads/SM.
-  // TODO(csigg): this is pretty arbitraty and should be generalized using
-  // cudaOccupancyMaxPotentialBlockSize().
-  config.block_count *= 4;
   if (data_format == FORMAT_NHWC) {
+    CudaLaunchConfig config = GetCudaLaunchConfig(
+        num_in_backprop, d,
+        DepthwiseConv2dBackpropInputGPUKernelNHWC<
+            T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>,
+        0);
     DepthwiseConv2dBackpropInputGPUKernelNHWC<
         T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
         <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
             args, out_backprop, filter, in_backprop, num_in_backprop);
   } else if (data_format == FORMAT_NCHW) {
+    CudaLaunchConfig config = GetCudaLaunchConfig(
+        num_in_backprop, d,
+        DepthwiseConv2dBackpropInputGPUKernelNCHW<
+            T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>,
+        0);
     DepthwiseConv2dBackpropInputGPUKernelNCHW<
         T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
         <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
@@ -475,9 +499,12 @@ template struct DepthwiseConv2dBackpropInputGPULaunch<double>;
 // A Cuda kernel to compute the depthwise convolution backprop w.r.t. filter.
 template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
           int kKnownDepthMultiplier>
-__global__ void DepthwiseConv2dBackpropFilterGPUKernelNHWC(
-    const DepthwiseArgs args, const T* out_backprop, const T* input,
-    T* filter_backprop, int num_out_backprop) {
+__global__ void __launch_bounds__(640, 2)
+    DepthwiseConv2dBackpropFilterGPUKernelNHWC(const DepthwiseArgs args,
+                                               const T* out_backprop,
+                                               const T* input,
+                                               T* filter_backprop,
+                                               int num_out_backprop) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
@@ -566,9 +593,12 @@ __global__ void DepthwiseConv2dBackpropFilterGPUKernelNHWC(
 // A Cuda kernel to compute the depthwise convolution backprop w.r.t. filter.
 template <typename T, int kKnownFilterWidth, int kKnownFilterHeight,
           int kKnownDepthMultiplier>
-__global__ void DepthwiseConv2dBackpropFilterGPUKernelNCHW(
-    const DepthwiseArgs args, const T* out_backprop, const T* input,
-    T* filter_backprop, int num_out_backprop) {
+__global__ void __launch_bounds__(640, 2)
+    DepthwiseConv2dBackpropFilterGPUKernelNCHW(const DepthwiseArgs args,
+                                               const T* out_backprop,
+                                               const T* input,
+                                               T* filter_backprop,
+                                               int num_out_backprop) {
   const int in_rows = args.in_rows;
   const int in_cols = args.in_cols;
   const int in_depth = args.in_depth;
@@ -669,13 +699,22 @@ void LaunchDepthwiseConv2dBackpropFilterGPU(const GpuDevice& d,
                                             TensorFormat data_format) {
   const int num_out_backprop =
       args.batch * args.out_rows * args.out_cols * args.out_depth;
-  CudaLaunchConfig config = GetCudaLaunchConfig(num_out_backprop, d);
   if (data_format == FORMAT_NHWC) {
+    CudaLaunchConfig config = GetCudaLaunchConfig(
+        num_out_backprop, d,
+        DepthwiseConv2dBackpropFilterGPUKernelNHWC<
+            T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>,
+        0);
     DepthwiseConv2dBackpropFilterGPUKernelNHWC<
         T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
         <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
             args, out_backprop, input, filter_backprop, num_out_backprop);
   } else if (data_format == FORMAT_NCHW) {
+    CudaLaunchConfig config = GetCudaLaunchConfig(
+        num_out_backprop, d,
+        DepthwiseConv2dBackpropFilterGPUKernelNCHW<
+            T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>,
+        0);
     DepthwiseConv2dBackpropFilterGPUKernelNCHW<
         T, kKnownFilterWidth, kKnownFilterHeight, kKnownDepthMultiplier>
         <<<config.block_count, config.thread_per_block, 0, d.stream()>>>(
diff --git a/tensorflow/core/util/cuda_kernel_helper.h b/tensorflow/core/util/cuda_kernel_helper.h
index 8a3f6c587e..46ea68687c 100644
--- a/tensorflow/core/util/cuda_kernel_helper.h
+++ b/tensorflow/core/util/cuda_kernel_helper.h
@@ -63,6 +63,28 @@ inline CudaLaunchConfig GetCudaLaunchConfig(int work_element_count,
   return config;
 }
 
+// Calculate the Cuda launch config we should use for a kernel launch. This
+// variant takes the resource limits of func into account to maximize occupancy.
+template <typename DeviceFunc>
+inline CudaLaunchConfig GetCudaLaunchConfig(int work_element_count,
+                                            const GPUDevice& d, DeviceFunc func,
+                                            size_t dynamic_shared_memory_size) {
+  int block_count = 0;
+  int thread_per_block = 0;
+  cudaOccupancyMaxPotentialBlockSize(&block_count, &thread_per_block, func,
+                                     dynamic_shared_memory_size,
+                                     work_element_count);
+  block_count =
+      std::min(block_count,
+               (work_element_count + thread_per_block - 1) / thread_per_block);
+
+  CudaLaunchConfig config;
+  config.virtual_thread_count = work_element_count;
+  config.thread_per_block = thread_per_block;
+  config.block_count = block_count;
+  return config;
+}
+
 struct Cuda2DLaunchConfig {
   dim3 virtual_thread_count;
   dim3 thread_per_block;
-- 
GitLab


From d592502460f5647422cf490d44243a8f5a41a882 Mon Sep 17 00:00:00 2001
From: Eric Liu <ioeric@google.com>
Date: Mon, 8 May 2017 00:37:29 -0800
Subject: [PATCH 1101/1563] Add plugin_asset_util.PluginDirectory that returns
 plugin's logdir. Change: 155354289

---
 .../backend/event_processing/plugin_asset_util.py        | 9 +++++++--
 .../backend/event_processing/plugin_asset_util_test.py   | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/backend/event_processing/plugin_asset_util.py b/tensorflow/tensorboard/backend/event_processing/plugin_asset_util.py
index b9b951fd12..34bfd34195 100644
--- a/tensorflow/tensorboard/backend/event_processing/plugin_asset_util.py
+++ b/tensorflow/tensorboard/backend/event_processing/plugin_asset_util.py
@@ -30,6 +30,11 @@ def _IsDirectory(parent, item):
   return gfile.IsDirectory(os.path.join(parent, item))
 
 
+def PluginDirectory(logdir, plugin_name):
+  """Returns the plugin directory for plugin_name."""
+  return os.path.join(logdir, _PLUGINS_DIR, plugin_name)
+
+
 def ListPlugins(logdir):
   """List all the plugins that have registered assets in logdir.
 
@@ -61,7 +66,7 @@ def ListAssets(logdir, plugin_name):
     not exist (either because the logdir doesn't exist, or because the plugin
     didn't register) an empty list is returned.
   """
-  plugin_dir = os.path.join(logdir, _PLUGINS_DIR, plugin_name)
+  plugin_dir = PluginDirectory(logdir, plugin_name)
   if not gfile.IsDirectory(plugin_dir):
     return []
   entries = gfile.ListDirectory(plugin_dir)
@@ -83,7 +88,7 @@ def RetrieveAsset(logdir, plugin_name, asset_name):
     KeyError: if the asset does not exist.
   """
 
-  asset_path = os.path.join(logdir, _PLUGINS_DIR, plugin_name, asset_name)
+  asset_path = os.path.join(PluginDirectory(logdir, plugin_name), asset_name)
   try:
     with gfile.Open(asset_path, "r") as f:
       return f.read()
diff --git a/tensorflow/tensorboard/backend/event_processing/plugin_asset_util_test.py b/tensorflow/tensorboard/backend/event_processing/plugin_asset_util_test.py
index e74a0642d6..cfc6857777 100644
--- a/tensorflow/tensorboard/backend/event_processing/plugin_asset_util_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/plugin_asset_util_test.py
@@ -50,6 +50,11 @@ class PluginGamma(GenericContentPlugin):
 
 class PluginAssetUtilitiesTest(test.TestCase):
 
+  def testGetPluginDirectory(self):
+    self.assertEqual(
+        os.path.join("logdir", "plugins", "x"),
+        plugin_asset_util.PluginDirectory("logdir", "x"))
+
   def testNonExistentDirectory(self):
     tempdir = self.get_temp_dir()
     fake_dir = os.path.join(tempdir, "nonexistent_dir")
-- 
GitLab


From e6bf33e8eb62a9490b9621316fe757c3f500c6f3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 06:29:01 -0800
Subject: [PATCH 1102/1563] Added missing dependencies in llvm.BUILD. Change:
 155376589

---
 third_party/llvm/llvm.BUILD | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 386c41910b..15aa53962d 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -441,6 +441,16 @@ llvm_target_list = [
     for target in llvm_target_list
 ]
 
+# This target is used to provide *.def files to x86_code_gen.
+# Files with '.def' extension are not allowed in 'srcs' of 'cc_library' rule.
+cc_library(
+    name = "x86_defs",
+    hdrs = glob([
+        "lib/Target/X86/*.def",
+    ]),
+    visibility = ["//visibility:private"],
+)
+
 cc_library(
     name = "aarch64_asm_parser",
     srcs = glob([
@@ -628,6 +638,7 @@ cc_library(
         "lib/Analysis/*.cpp",
         "lib/Analysis/*.inc",
         "include/llvm/Transforms/Utils/Local.h",
+        "include/llvm/Transforms/Scalar.h",
         "lib/Analysis/*.h",
     ]),
     hdrs = glob([
@@ -730,6 +741,7 @@ cc_library(
         "lib/Target/ARM/MCTargetDesc/*.cpp",
         "lib/Target/ARM/MCTargetDesc/*.inc",
         "lib/Target/ARM/*.h",
+        "include/llvm/CodeGen/GlobalISel/GISelAccessor.h",
     ]),
     hdrs = glob([
         "include/llvm/Target/ARM/MCTargetDesc/*.h",
@@ -910,6 +922,7 @@ cc_library(
         ":bit_writer",
         ":config",
         ":core",
+        ":instrumentation",
         ":mc",
         ":profile_data",
         ":scalar",
@@ -1108,6 +1121,9 @@ cc_library(
         "lib/Transforms/IPO/*.c",
         "lib/Transforms/IPO/*.cpp",
         "lib/Transforms/IPO/*.inc",
+        "include/llvm/Transforms/SampleProfile.h",
+        "include/llvm-c/Transforms/IPO.h",
+        "include/llvm-c/Transforms/PassManagerBuilder.h",
         "lib/Transforms/IPO/*.h",
     ]),
     hdrs = glob([
@@ -1374,6 +1390,7 @@ cc_library(
         "lib/Transforms/ObjCARC/*.c",
         "lib/Transforms/ObjCARC/*.cpp",
         "lib/Transforms/ObjCARC/*.inc",
+        "include/llvm/Transforms/ObjCARC.h",
         "lib/Transforms/ObjCARC/*.h",
     ]),
     hdrs = glob([
@@ -1683,6 +1700,7 @@ cc_library(
         "lib/Support/Unix/*.inc",
         "lib/Support/Unix/*.h",
         "include/llvm-c/*.h",
+        "include/llvm/CodeGen/MachineValueType.h",
         "lib/Support/*.h",
     ]),
     hdrs = glob([
@@ -1691,7 +1709,11 @@ cc_library(
         "include/llvm/Support/*.inc",
         "include/llvm/ADT/*.h",
         "include/llvm/Support/ELFRelocs/*.def",
-    ]) + ["include/llvm/Support/DataTypes.h"],
+        "include/llvm/Support/WasmRelocs/*.def",
+    ]) + [
+        "include/llvm/Support/DataTypes.h",
+        "include/llvm/ExecutionEngine/ObjectMemoryBuffer.h",
+    ],
     deps = [
         ":config",
         ":demangle",
@@ -1788,6 +1810,7 @@ cc_library(
         ":analysis",
         ":config",
         ":core",
+        ":scalar",
         ":support",
         ":transform_utils",
     ],
@@ -1867,6 +1890,7 @@ cc_library(
         ":support",
         ":target",
         ":x86_asm_printer",
+        ":x86_defs",
         ":x86_desc",
         ":x86_info",
         ":x86_utils",
-- 
GitLab


From dcb6e92b1d0833ad9f30536896f5874260f80995 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 08:46:22 -0800
Subject: [PATCH 1103/1563] [XLA] Service::CreateModuleConfig should take the
 backend as a parameter, rather than assuming it's creating a module for the
 execute backend.  This fixes the TODO from service.cc that I added in my
 previous commit. Change: 155389451

---
 tensorflow/compiler/xla/service/service.cc | 51 ++++++++++------------
 tensorflow/compiler/xla/service/service.h  |  4 +-
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/tensorflow/compiler/xla/service/service.cc b/tensorflow/compiler/xla/service/service.cc
index 77cfb3f131..c001e705de 100644
--- a/tensorflow/compiler/xla/service/service.cc
+++ b/tensorflow/compiler/xla/service/service.cc
@@ -290,7 +290,7 @@ StatusOr<std::vector<const Allocation*>> Service::ResolveAndValidateArguments(
 StatusOr<std::unique_ptr<HloModuleConfig>> Service::CreateModuleConfig(
     const ProgramShape& program_shape,
     tensorflow::gtl::ArraySlice<const Allocation*> arguments,
-    const ExecutionOptions& execution_options) {
+    const ExecutionOptions& execution_options, Backend* backend) {
   auto module_config = MakeUnique<HloModuleConfig>(program_shape);
   auto* computation_layout = module_config->mutable_entry_computation_layout();
 
@@ -330,15 +330,7 @@ StatusOr<std::unique_ptr<HloModuleConfig>> Service::CreateModuleConfig(
     module_config->enable_hlo_profiling(true);
   }
 
-  // TODO(bmoses): Fix this properly.  This value is wrong if we are creating a
-  // module for use with the compute_constant_backend_.  However, so long as the
-  // execute_backend_ exists, it works out because we always use a CPU backend
-  // for the compute_constant_backend_ and CPU backends ignore this value.  We
-  // do need to ensure that the execute_backend_ exists, however, to avoid a
-  // segfault when computing constants in a CompileOnlyService.
-  if (execute_backend_) {
-    module_config->set_replica_count(execute_backend_->Replicas().size());
-  }
+  module_config->set_replica_count(backend->Replicas().size());
   module_config->set_fast_math_disabled(execution_options.disable_fast_math());
   module_config->set_seed(execution_options.seed());
 
@@ -486,7 +478,7 @@ StatusOr<std::shared_ptr<Executable>> Service::BuildAndCacheExecutable(
       std::unique_ptr<Executable> executable_unique_ptr,
       BuildExecutable(versioned_handle, std::move(module_config),
                       /*executable_for_compute_constant=*/false, arguments,
-                      execute_backend_.get(), executor));
+                      backend, executor));
 
   if (profile != nullptr) {
     uint64 end_micros = tensorflow::Env::Default()->NowMicros();
@@ -587,15 +579,14 @@ StatusOr<GlobalDataHandle> Service::ExecuteAndRegisterResult(
   perftools::gputools::DeviceMemoryBase result;
   if (backend->Replicas().size() == 1) {
     TF_ASSIGN_OR_RETURN(
-        result,
-        ExecuteOnStreamWrapper<StatusOr<se::DeviceMemoryBase>>(
-            executable, &run_options[0], profile, execute_backend_.get(),
-            [&arguments](Executable* executable,
-                         const ServiceExecutableRunOptions* run_options,
-                         HloExecutionProfile* hlo_execution_profile) {
-              return executable->ExecuteOnStream(run_options, arguments,
-                                                 hlo_execution_profile);
-            }));
+        result, ExecuteOnStreamWrapper<StatusOr<se::DeviceMemoryBase>>(
+                    executable, &run_options[0], profile, backend,
+                    [&arguments](Executable* executable,
+                                 const ServiceExecutableRunOptions* run_options,
+                                 HloExecutionProfile* hlo_execution_profile) {
+                      return executable->ExecuteOnStream(run_options, arguments,
+                                                         hlo_execution_profile);
+                    }));
   } else {
     std::vector<
         tensorflow::gtl::ArraySlice<perftools::gputools::DeviceMemoryBase>>
@@ -678,7 +669,8 @@ tensorflow::Status Service::ExecuteParallel(const ExecuteParallelRequest* arg,
     // the program and the argument allocations.
     TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModuleConfig> module_config,
                         CreateModuleConfig(*program_shape, arg_allocations,
-                                           request.execution_options()));
+                                           request.execution_options(),
+                                           execute_backend_.get()));
     VLOG(3) << "ExecuteParallel created HloModuleConfig computation layout: "
             << module_config->entry_computation_layout().ToString();
 
@@ -763,9 +755,10 @@ tensorflow::Status Service::Execute(const ExecuteRequest* arg,
       ResolveAndValidateArguments(arg->arguments(), execute_backend_.get(),
                                   execute_backend_->default_device_ordinal()));
 
-  TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModuleConfig> module_config,
-                      CreateModuleConfig(*program_shape, arg_allocations,
-                                         arg->execution_options()));
+  TF_ASSIGN_OR_RETURN(
+      std::unique_ptr<HloModuleConfig> module_config,
+      CreateModuleConfig(*program_shape, arg_allocations,
+                         arg->execution_options(), execute_backend_.get()));
 
   VLOG(3) << "Execute created HloModuleConfig computation layout: "
           << module_config->entry_computation_layout().ToString();
@@ -830,9 +823,10 @@ tensorflow::Status Service::ExecuteAsync(const ExecuteAsyncRequest* arg,
       ResolveAndValidateArguments(arg->arguments(), execute_backend_.get(),
                                   execute_backend_->default_device_ordinal()));
 
-  TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModuleConfig> module_config,
-                      CreateModuleConfig(*program_shape, arg_allocations,
-                                         arg->execution_options()));
+  TF_ASSIGN_OR_RETURN(
+      std::unique_ptr<HloModuleConfig> module_config,
+      CreateModuleConfig(*program_shape, arg_allocations,
+                         arg->execution_options(), execute_backend_.get()));
 
   VLOG(3) << "ExecuteAsync created HloModuleConfig computation layout: "
           << module_config->entry_computation_layout().ToString();
@@ -1153,7 +1147,8 @@ tensorflow::Status Service::ComputeConstant(const ComputeConstantRequest* arg,
   }
 
   TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModuleConfig> module_config,
-                      CreateModuleConfig(program_shape, {}, execution_options));
+                      CreateModuleConfig(program_shape, {}, execution_options,
+                                         compute_constant_backend_.get()));
 
   TF_ASSIGN_OR_RETURN(
       std::shared_ptr<Executable> executable,
diff --git a/tensorflow/compiler/xla/service/service.h b/tensorflow/compiler/xla/service/service.h
index 9600f6989a..0e0e7c4e21 100644
--- a/tensorflow/compiler/xla/service/service.h
+++ b/tensorflow/compiler/xla/service/service.h
@@ -265,11 +265,11 @@ class Service : public ServiceInterface {
       tensorflow::gtl::ArraySlice<const GlobalDataHandle*> arguments,
       const Backend* backend, int device_ordinal);
 
-  // Create a Hlo module config foe the given program shape and arguments.
+  // Create a Hlo module config for the given program shape and arguments.
   StatusOr<std::unique_ptr<HloModuleConfig>> CreateModuleConfig(
       const ProgramShape& program_shape,
       tensorflow::gtl::ArraySlice<const Allocation*> arguments,
-      const ExecutionOptions& execution_options);
+      const ExecutionOptions& execution_options, Backend* backend);
 
   // Builds an Executable for the given parameters. If
   // executable_for_compute_constant is true, then the executable is intended to
-- 
GitLab


From ec8ffb9eafd98b65ed0b594e546c49af89c298c5 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Mon, 8 May 2017 08:46:55 -0800
Subject: [PATCH 1104/1563] Improved documentation of bucketized_column.
 Change: 155389503

---
 tensorflow/python/feature_column/feature_column.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index f8855f259e..22ce5f48b1 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -393,6 +393,17 @@ def bucketized_column(source_column, boundaries):
   `boundaries=[0., 1., 2.]` generates buckets `(-inf, 0.)`, `[0., 1.)`,
   `[1., 2.)`, and `[2., +inf)`.
 
+  For example, if the inputs are
+    `boundaries` = [0, 10, 100]
+    input tensor = [[-5, 10000]
+                    [150,   10]
+                    [5,    100]]
+
+  then the output will be
+    output = [[0, 3]
+              [3, 2]
+              [1, 3]]
+
   Example:
 
   ```python
-- 
GitLab


From 697f34ca82c4488f3bb2d3b1e930b0088f63f8c5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 09:20:04 -0800
Subject: [PATCH 1105/1563] Extend tfprof to associate op stats with Python
 codes. It's backward compatible. Stats of a source code line are aggregated
 from all ops created by that line.

A example.
_TFProfRoot (0us/22.44ms)
  model_analyzer_test.py:149:run_filename_as_m...:none (0us/22.44ms)
    model_analyzer_test.py:33:_run_code_in_main:none (0us/22.44ms)
      model_analyzer_test.py:208:<module>:test.main() (0us/22.44ms)
        model_analyzer_test.py:132:testComplexCodeView:x = lib.BuildFull... (0us/22.44ms)
          model_analyzer_testlib.py:63:BuildFullModel:return sgd_op.min... (0us/21.83ms)
          model_analyzer_testlib.py:54:BuildFullModel:seq.append(array_... (0us/254us)
            model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0us/134us)
            ...
          model_analyzer_testlib.py:61:BuildFullModel:loss = nn_ops.l2_... (0us/28us)
        model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
Change: 155393864
---
 tensorflow/contrib/tfprof/README.md           |  10 +-
 .../contrib/tfprof/python/tools/tfprof/BUILD  |  22 +-
 .../python/tools/tfprof/model_analyzer.py     |  41 ++-
 .../tools/tfprof/model_analyzer_test.py       | 147 ++++++++--
 .../tools/tfprof/model_analyzer_testlib.py    |  67 +++++
 .../tools/tfprof/print_model_analysis_test.py |   9 +-
 .../python/tools/tfprof/tfprof_logger.py      |  45 ++-
 tensorflow/tools/tfprof/README.md             |  80 ++++-
 tensorflow/tools/tfprof/internal/BUILD        |  42 +++
 .../tfprof/internal/print_model_analysis.cc   |  21 +-
 .../tools/tfprof/internal/tfprof_code.cc      | 215 ++++++++++++++
 .../tools/tfprof/internal/tfprof_code.h       |  88 ++++++
 .../tools/tfprof/internal/tfprof_graph.cc     |   8 +-
 .../tools/tfprof/internal/tfprof_graph.h      |   8 +-
 .../tools/tfprof/internal/tfprof_node.cc      |   5 +-
 .../tools/tfprof/internal/tfprof_node.h       |  96 +++++-
 .../tools/tfprof/internal/tfprof_options.h    |   2 +-
 .../tools/tfprof/internal/tfprof_scope.cc     |   8 +-
 .../tools/tfprof/internal/tfprof_scope.h      |   6 +-
 .../tools/tfprof/internal/tfprof_show.cc      |  13 +-
 .../tools/tfprof/internal/tfprof_show.h       |  16 +-
 .../tools/tfprof/internal/tfprof_show_code.cc | 273 ++++++++++++++++++
 .../tools/tfprof/internal/tfprof_show_code.h  | 126 ++++++++
 .../tools/tfprof/internal/tfprof_stats.cc     |  31 +-
 .../tools/tfprof/internal/tfprof_stats.h      |  13 +-
 .../tfprof/internal/tfprof_stats_test.cc      |  24 +-
 .../tfprof/internal/tfprof_tensor_test.cc     |   4 +-
 tensorflow/tools/tfprof/tfprof_log.proto      |  13 +
 tensorflow/tools/tfprof/tfprof_main.cc        |  16 +-
 tensorflow/tools/tfprof/tfprof_options.proto  |   2 +-
 tensorflow/tools/tfprof/tfprof_output.proto   |  34 ++-
 31 files changed, 1325 insertions(+), 160 deletions(-)
 create mode 100644 tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_code.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_code.h
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_show_code.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_show_code.h

diff --git a/tensorflow/contrib/tfprof/README.md b/tensorflow/contrib/tfprof/README.md
index c7ff4a2921..d891ecdc9a 100644
--- a/tensorflow/contrib/tfprof/README.md
+++ b/tensorflow/contrib/tfprof/README.md
@@ -11,7 +11,12 @@ Consultants: Jon Shlens, Pete Warden
 1.  Measure model parameters, float operations, tensor shapes.
 2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  Explore model based on name scope or graph structure.
+4.  3 ways to view and explore TensorFlow model profiles
+
+    *  Organize by Python code call stack.
+    *  Organize by TensorFlow operation name scope hierarchies.
+    *  Organize by TensorFlow operation inputs/outputs graph.
+
 5.  Selectively grouping/filtering/accounting/ordering ops.
 
 tfprof can be used as Python API, Interactive CLI and One-shot Script.
@@ -28,7 +33,8 @@ param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tfprof_options=tf.contrib.tfprof.model_analyzer.
         TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
 
-# param_stats is tensorflow.tfprof.TFProfNode proto. It organize the statistics
+# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
+# It organize the statistics
 # of each graph node in tree scructure. Let's print the root below.
 sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
 ```
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
index 818c2d2cbf..0a920780c2 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
@@ -21,16 +21,34 @@ py_test(
     name = "model_analyzer_test",
     srcs = ["model_analyzer_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["no_pip"],
     deps = [
         ":model_analyzer",
-        "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:array_ops",
+        ":model_analyzer_testlib",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:variables",
+    ],
+)
+
+py_library(
+    name = "model_analyzer_testlib",
+    srcs = ["model_analyzer_testlib.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":model_analyzer",
+        "//tensorflow/contrib/rnn:rnn_py",
+        "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:init_ops",
+        "//tensorflow/python:math_ops",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:rnn",
+        "//tensorflow/python:training",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
     ],
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
index cc94fd65b5..13b407d815 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
@@ -123,7 +123,7 @@ def print_model_analysis(graph,
   """Print model statistics.
 
     Prints the model statistics to stdout. Also returns the results
-    in a TFProfNode proto. See go/tfprof or run tfprof tool:
+    in a TFGraphNodeProto proto. See go/tfprof or run tfprof tool:
     'bazel run third_party/tensorflow/tools/tfprof help'
 
     Examples:
@@ -142,15 +142,19 @@ def print_model_analysis(graph,
               'micros' and 'bytes'.
     op_log: tensorflow::tfprof::OpLog proto. users can use this proto to
             group together ops and use a op_type to select the group.
-    tfprof_cmd: string. Either 'scope' or 'graph'. 'scope' view organize
-                ops using their name scopes. 'graph' view organize ops using
-                their graph inputs.
+    tfprof_cmd: string. Either 'scope', 'graph', 'code'.
+                'scope' view organize outputs using ops' name scope.
+                'graph' view organize outputs using op's inputs/outputs.
+                'code' view organize outputs using Python call stack.
     tfprof_options: See 'tfprof help' for details.
   Returns:
-    TFProfNode proto. Side effect: a formatted output to stdout.
+    If tfprof_cmd is 'scope' or 'graph', returns TFGraphNodeProto proto.
+    If tfprof_cmd is 'code', returns TFCodeNodeProto proto.
+    Side effect: a formatted output to stdout.
   """
   # pylint: disable=protected-access
-  op_log = tfprof_logger._merge_default_with_oplog(graph, op_log, run_meta)
+  op_log = tfprof_logger._merge_default_with_oplog(
+      graph, op_log, run_meta, add_trace=tfprof_cmd == 'code')
   # pylint: enable=protected-access
   opts = tfprof_options_pb2.OptionsProto()
   opts.max_depth = tfprof_options['max_depth']
@@ -178,11 +182,24 @@ def print_model_analysis(graph,
   opts.dump_to_file = tfprof_options['dump_to_file']
 
   run_meta_str = run_meta.SerializeToString() if run_meta else b''
-  op_log_str = op_log.SerializeToString() if op_log else b''
 
-  tfprof_node = tfprof_output_pb2.TFProfNode()
-  tfprof_node.ParseFromString(
-      print_mdl.PrintModelAnalysis(
-          graph.as_graph_def().SerializeToString(), run_meta_str, op_log_str,
-          tfprof_cmd.encode('utf-8'), opts.SerializeToString()))
+  if tfprof_cmd == 'code':
+    tfprof_node = tfprof_output_pb2.TFCodeNodeProto()
+    tfprof_node.ParseFromString(
+        print_mdl.PrintModelAnalysis(
+            graph.as_graph_def().SerializeToString(),
+            run_meta_str,
+            op_log.SerializeToString(),
+            tfprof_cmd.encode('utf-8'),
+            opts.SerializeToString()))
+  else:
+    tfprof_node = tfprof_output_pb2.TFGraphNodeProto()
+    tfprof_node.ParseFromString(
+        print_mdl.PrintModelAnalysis(
+            graph.as_graph_def().SerializeToString(),
+            run_meta_str,
+            op_log.SerializeToString(),
+            tfprof_cmd.encode('utf-8'),
+            opts.SerializeToString()))
+
   return tfprof_node
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
index 66b9267cbe..55167576e2 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
@@ -18,49 +18,27 @@ from __future__ import division
 from __future__ import print_function
 
 import os
-
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
-from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
-from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import init_ops
-from tensorflow.python.ops import nn_ops
-from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import gfile
 from tensorflow.python.platform import test
 
 # XXX: this depends on pywrap_tensorflow and must come later
 from tensorflow.contrib.tfprof.python.tools.tfprof import model_analyzer
+from tensorflow.contrib.tfprof.python.tools.tfprof import model_analyzer_testlib as lib
 
 
 class PrintModelAnalysisTest(test.TestCase):
 
-  def _BuildSmallModel(self):
-    image = array_ops.zeros([2, 6, 6, 3])
-    _ = variable_scope.get_variable(
-        'ScalarW', [],
-        dtypes.float32,
-        initializer=init_ops.random_normal_initializer(stddev=0.001))
-    kernel = variable_scope.get_variable(
-        'DW', [3, 3, 3, 6],
-        dtypes.float32,
-        initializer=init_ops.random_normal_initializer(stddev=0.001))
-    x = nn_ops.conv2d(image, kernel, [1, 2, 2, 1], padding='SAME')
-    kernel = variable_scope.get_variable(
-        'DW2', [2, 2, 6, 12],
-        dtypes.float32,
-        initializer=init_ops.random_normal_initializer(stddev=0.001))
-    x = nn_ops.conv2d(x, kernel, [1, 2, 2, 1], padding='SAME')
-    return x
-
   def testDumpToFile(self):
+    ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
     opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
 
     with session.Session() as sess, ops.device('/cpu:0'):
-      _ = self._BuildSmallModel()
+      _ = lib.BuildSmallModel()
       model_analyzer.print_model_analysis(sess.graph, tfprof_options=opts)
 
       with gfile.Open(opts['dump_to_file'], 'r') as f:
@@ -71,6 +49,7 @@ class PrintModelAnalysisTest(test.TestCase):
                          f.read())
 
   def testSelectEverything(self):
+    ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
     opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
     opts['account_type_regexes'] = ['.*']
@@ -78,8 +57,10 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device', 'op_types'
     ]
 
-    with session.Session() as sess, ops.device('/cpu:0'):
-      x = self._BuildSmallModel()
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
       run_meta = config_pb2.RunMetadata()
@@ -98,6 +79,118 @@ class PrintModelAnalysisTest(test.TestCase):
             f.read())
         # pylint: enable=line-too-long
 
+  def testSimpleCodeView(self):
+    ops.reset_default_graph()
+    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    opts['account_type_regexes'] = ['.*']
+    opts['show_name_regexes'] = ['.*model_analyzer_testlib.*']
+    opts['account_displayed_op_only'] = False
+    # TODO(xpan): Test 'micros'. Since the execution time changes each run,
+    # it's a bit difficult to test it now.
+    opts['select'] = [
+        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
+    ]
+
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildSmallModel()
+
+      sess.run(variables.global_variables_initializer())
+      run_meta = config_pb2.RunMetadata()
+      _ = sess.run(x,
+                   options=config_pb2.RunOptions(
+                       trace_level=config_pb2.RunOptions.FULL_TRACE),
+                   run_metadata=run_meta)
+
+      model_analyzer.print_model_analysis(
+          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
+
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
+        # pylint: disable=line-too-long
+        self.assertEqual(
+            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB)\n  model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n  model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/1 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/162 params, 0/0 flops, 0B/1.30KB)\n  model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/5.83k flops, 0B/432B)\n  model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/288 params, 0/0 flops, 0B/2.30KB)\n  model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/4.61k flops, 0B/384B)\n',
+            f.read())
+        # pylint: enable=line-too-long
+
+  def testComplexCodeView(self):
+    ops.reset_default_graph()
+    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    opts['account_type_regexes'] = ['.*']
+    opts['show_name_regexes'] = ['.*model_analyzer_testlib.py.*']
+    opts['account_displayed_op_only'] = False
+    opts['select'] = ['params', 'float_ops']
+
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildFullModel()
+
+      sess.run(variables.global_variables_initializer())
+      run_meta = config_pb2.RunMetadata()
+      _ = sess.run(x,
+                   options=config_pb2.RunOptions(
+                       trace_level=config_pb2.RunOptions.FULL_TRACE),
+                   run_metadata=run_meta)
+
+      tfprof_node = model_analyzer.print_model_analysis(
+          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
+
+      # pylint: disable=line-too-long
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
+        self.assertEqual(
+            '_TFProfRoot (0/2.84k params, 0/54.08k flops)\n  model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_... (0/1.80k params, 0/41.76k flops)\n    model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops)\n    model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/4 params, 0/0 flops)\n    model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/648 params, 0/0 flops)\n    model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/23.33k flops)\n    model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/1.15k params, 0/0 flops)\n    model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/18.43k flops)\n  model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c... (0/1.04k params, 0/4.13k flops)\n  model_analyzer_testlib.py:62:BuildFullModel:target = array_op... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min... (0/0 params, 0/8.19k flops)\n',
+            f.read())
+
+      self.assertLess(0, tfprof_node.total_exec_micros)
+      self.assertEqual(2844, tfprof_node.total_parameters)
+      self.assertEqual(54080, tfprof_node.total_float_ops)
+      self.assertEqual(5, len(tfprof_node.children))
+      self.assertEqual('_TFProfRoot', tfprof_node.name)
+      self.assertEqual('model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_...',
+                       tfprof_node.children[0].name)
+      self.assertEqual('model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c...',
+                       tfprof_node.children[1].name)
+      self.assertEqual('model_analyzer_testlib.py:62:BuildFullModel:target = array_op...',
+                       tfprof_node.children[2].name)
+      self.assertEqual('model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_...',
+                       tfprof_node.children[3].name)
+      self.assertEqual('model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min...',
+                       tfprof_node.children[4].name)
+      # pylint: enable=line-too-long
+
+  def testCodeViewLeafGraphNode(self):
+    ops.reset_default_graph()
+    opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
+    opts['account_type_regexes'] = ['.*']
+    opts['account_displayed_op_only'] = False
+    opts['select'] = [
+        'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device'
+    ]
+
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+      x = lib.BuildSmallModel()
+
+      sess.run(variables.global_variables_initializer())
+      run_meta = config_pb2.RunMetadata()
+      _ = sess.run(x,
+                   options=config_pb2.RunOptions(
+                       trace_level=config_pb2.RunOptions.FULL_TRACE),
+                   run_metadata=run_meta)
+
+      tfprof_node = model_analyzer.print_model_analysis(
+          sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
+
+      leaf = tfprof_node
+      while leaf.children:
+        self.assertEqual(0, len(leaf.graph_nodes))
+        leaf = leaf.children[0]
+      self.assertEqual(1, len(leaf.graph_nodes))
+
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
new file mode 100644
index 0000000000..ed26f001c2
--- /dev/null
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_testlib.py
@@ -0,0 +1,67 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""A test lib that defines some models."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.rnn.python.ops.core_rnn_cell import BasicRNNCell
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import rnn
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.training import gradient_descent
+
+
+def BuildSmallModel():
+  """Build a small forward conv model."""
+  image = array_ops.zeros([2, 6, 6, 3])
+  _ = variable_scope.get_variable(
+      'ScalarW', [],
+      dtypes.float32,
+      initializer=init_ops.random_normal_initializer(stddev=0.001))
+  kernel = variable_scope.get_variable(
+      'DW', [3, 3, 3, 6],
+      dtypes.float32,
+      initializer=init_ops.random_normal_initializer(stddev=0.001))
+  x = nn_ops.conv2d(image, kernel, [1, 2, 2, 1], padding='SAME')
+  kernel = variable_scope.get_variable(
+      'DW2', [2, 2, 6, 12],
+      dtypes.float32,
+      initializer=init_ops.random_normal_initializer(stddev=0.001))
+  x = nn_ops.conv2d(x, kernel, [1, 2, 2, 1], padding='SAME')
+  return x
+
+
+def BuildFullModel():
+  """Build the full model with conv,rnn,opt."""
+  seq = []
+  for i in range(4):
+    with variable_scope.variable_scope('inp_%d' % i):
+      seq.append(array_ops.reshape(BuildSmallModel(), [2, 1, -1]))
+
+  cell = BasicRNNCell(16, 48)
+  out = rnn.dynamic_rnn(
+      cell, array_ops.concat(seq, axis=1), dtype=dtypes.float32)[0]
+
+  target = array_ops.ones_like(out)
+  loss = nn_ops.l2_loss(math_ops.reduce_mean(target - out))
+  sgd_op = gradient_descent.GradientDescentOptimizer(1e-2)
+  return sgd_op.minimize(loss)
+
+
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
index f0ac36c66a..aa133d3142 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
@@ -96,12 +96,13 @@ class PrintModelAnalysisTest(test.TestCase):
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = self._BuildSmallModel()
-      tfprof_pb = tfprof_output_pb2.TFProfNode()
+      tfprof_pb = tfprof_output_pb2.TFGraphNodeProto()
       tfprof_pb.ParseFromString(
-          print_mdl.PrintModelAnalysis(sess.graph.as_graph_def(
-          ).SerializeToString(), b'', b'', b'scope', opts.SerializeToString()))
+          print_mdl.PrintModelAnalysis(
+              sess.graph.as_graph_def().SerializeToString(),
+              b'', b'', b'scope', opts.SerializeToString()))
 
-      expected_pb = tfprof_output_pb2.TFProfNode()
+      expected_pb = tfprof_output_pb2.TFGraphNodeProto()
       text_format.Merge(r"""name: "_TFProfRoot"
       exec_micros: 0
       requested_bytes: 0
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
index e8cf84b6c7..cd3912bbfb 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
@@ -62,12 +62,13 @@ def _fill_missing_graph_shape(graph, run_meta):
   return graph
 
 
-def _get_logged_ops(graph, run_meta=None):
+def _get_logged_ops(graph, run_meta=None, add_trace=False):
   """Extract trainable model parameters and FLOPs for ops from a Graph.
 
   Args:
     graph: tf.Graph.
     run_meta: RunMetadata proto used to complete shape information.
+    add_trace: Whether to add op trace information.
   Returns:
     logged_ops: dict mapping from op_name to OpLogEntry.
   """
@@ -76,21 +77,32 @@ def _get_logged_ops(graph, run_meta=None):
 
   op_missing_shape = 0
   logged_ops = {}
-  graph_def = graph.as_graph_def()
-  for node in graph_def.node:
+  for op in graph.get_operations():
     try:
-      stats = ops.get_stats_for_node_def(graph, node, REGISTERED_FLOP_STATS)
+      stats = ops.get_stats_for_node_def(
+          graph, op.node_def, REGISTERED_FLOP_STATS)
     except ValueError:
       # Catch Exception When shape is incomplete. Skip it.
       op_missing_shape += 1
       stats = None
 
-    if not stats or not stats.value:
-      continue
-    if node.name not in logged_ops:
-      entry = tfprof_log_pb2.OpLogEntry()
-      entry.name = node.name
+    entry = tfprof_log_pb2.OpLogEntry()
+    entry.name = op.name
+    add_entry = False
+    if stats and stats.value:
       entry.float_ops = int(stats.value)
+      add_entry = True
+
+    if add_trace:
+      for tb in op.traceback:
+        trace = entry.code_def.traces.add()
+        trace.file = tb[0] if tb[0] else 'none'
+        trace.lineno = tb[1] if tb[1] else -1
+        trace.function = tb[2] if tb[2] else 'none'
+        trace.line = tb[3] if tb[3] else 'none'
+      add_entry = True
+
+    if add_entry:
       logged_ops[entry.name] = entry
 
   for v in graph.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES):
@@ -108,18 +120,21 @@ def _get_logged_ops(graph, run_meta=None):
   return logged_ops
 
 
-def _merge_default_with_oplog(graph, op_log=None, run_meta=None):
+def _merge_default_with_oplog(graph, op_log=None,
+                              run_meta=None,
+                              add_trace=False):
   """Merge the tfprof default extra info with caller's op_log.
 
   Args:
     graph: tf.Graph.
     op_log: OpLog proto.
     run_meta: RunMetadata proto used to complete shape information.
+    add_trace: Whether to add op trace information.
   Returns:
     tmp_op_log: Merged OpLog proto.
   """
   tmp_op_log = tfprof_log_pb2.OpLog()
-  logged_ops = _get_logged_ops(graph, run_meta)
+  logged_ops = _get_logged_ops(graph, run_meta, add_trace=add_trace)
   if not op_log:
     tmp_op_log.log_entries.extend(logged_ops.values())
   else:
@@ -131,13 +146,16 @@ def _merge_default_with_oplog(graph, op_log=None, run_meta=None):
         all_ops[op_name].types.extend(entry.types)
         if entry.float_ops > 0 and all_ops[op_name].float_ops == 0:
           all_ops[op_name].float_ops = entry.float_ops
+        if entry.code_def.traces and not all_ops[op_name].code_def.traces:
+          all_ops[op_name].code_def.MergeFrom(entry.code_def)
       else:
         all_ops[op_name] = entry
     tmp_op_log.log_entries.extend(all_ops.values())
   return tmp_op_log
 
 
-def write_op_log(graph, log_dir, op_log=None, run_meta=None):
+def write_op_log(graph, log_dir, op_log=None, run_meta=None,
+                 add_trace=False):
   """Log provided 'op_log', and add additional model information below.
 
     The API also assigns ops in tf.trainable_variables() an op type called
@@ -154,8 +172,9 @@ def write_op_log(graph, log_dir, op_log=None, run_meta=None):
         one is created.
     run_meta: (Optional) RunMetadata proto that helps flops computation using
         run time shape information.
+    add_trace: Whether to add op trace information. Used to support "code" view.
   """
-  op_log = _merge_default_with_oplog(graph, op_log, run_meta)
+  op_log = _merge_default_with_oplog(graph, op_log, run_meta, add_trace)
 
   with gfile.Open(os.path.join(log_dir, 'tfprof_log'), 'w') as log:
     log.write(op_log.SerializeToString())
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index 540e179aae..52d376d5f5 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -10,12 +10,17 @@ Consultants: Jon Shlens, Pete Warden
 1.  Measure model parameters, float operations, tensor shapes.
 2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  Explore model based on name scope or graph structure.
+4.  3 ways to view and explore TensorFlow model profiles
+
+    *  Organize by Python code call stack.
+    *  Organize by TensorFlow operation name scope hierarchies.
+    *  Organize by TensorFlow operation inputs/outputs graph.
+
 5.  Selectively grouping/filtering/accounting/ordering ops.
 
 [Python API Tutorials](#python-api-tutorials): It can be called directly from
 Python codes. Results are either printed
-to stdout or dumped to file. tensorflow.tfprof.TFProfNode proto is returned from
+to stdout or dumped to file. tensorflow.tfprof.TFGraphNodeProto proto is returned from
 the API to allow users to perform further analysis.
 
 [CLI Tutorials](#cli-tutorials):
@@ -33,13 +38,23 @@ tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
 ### Examine the shapes and sizes of all trainable Variables.
 ```python
 # Print trainable variable parameter statistics to stdout.
+# By default, statistics are associated with each graph node.
 param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tf.get_default_graph(),
     tfprof_options=tf.contrib.tfprof.model_analyzer.
         TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
 
-# param_stats is tensorflow.tfprof.TFProfNode proto. It organize the statistics
-# of each graph node in tree scructure. Let's print the root below.
+
+# Set tfprof_cmd='code' to associate statistics with Python codes.
+opts = tf.contrib.tfprof.model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
+opts['show_name_regexes'] = ['.*my_code1.py.*', '.*my_code2.py.*']
+param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
+    tf.get_default_graph(),
+    tfprof_cmd='code'
+    tfprof_options=opts)
+
+# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
+# Let's print the root below.
 sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
 ```
 
@@ -84,8 +99,20 @@ Finally, you may run `print_model_analysis` to explore the timing and memory
 demands of the model.
 
 ``` python
+# See model_analyzer_test.py for more examples.
+#
+# Print to stdout an analysis of the memory usage and the timing information
+# broken down by python codes.
+opts = tf.contrib.tfprof.model_analyzer.PRINT_ALL_TIMING_MEMORY.copy()
+opts['show_name_regexes'] = ['.*my_code.py.*']
+tf.contrib.tfprof.model_analyzer.print_model_analysis(
+    tf.get_default_graph(),
+    run_meta=run_metadata,
+    tfprof_cmd='code',
+    tfprof_options=opts)
+
 # Print to stdout an analysis of the memory usage and the timing information
-# from running the graph broken down by operations.
+# broken down by operations.
 tf.contrib.tfprof.model_analyzer.print_model_analysis(
     tf.get_default_graph(),
     run_meta=run_metadata,
@@ -138,9 +165,9 @@ bazel-bin/tensorflow/tools/tfprof/tfprof \
     --run_meta_path=run_meta \
     --checkpoint_path=model.ckpt
 #
-# tfprof_log is used to define customized op types and float ops.
+# tfprof_log is used to define customized op types, float ops and code traces.
 # Use tfprof_logger.write_op_log() to create tfprof_log.
-# See 11) in Examples section on generating tfprof_log file.
+# See 12) in Examples section on generating tfprof_log file.
 bazel-bin/tensorflow/tools/tfprof/tfprof \
     --graph_path=graph.pbtxt \
     --run_meta_path=run_meta \
@@ -174,7 +201,28 @@ tfprof>
 -dump_to_file
 ```
 
-3) I want to see the `BatchNorm`'s gamma value in checkpoint.
+3) I want to see which line of my python codes costs most time!
+
+```shell
+# Requires --graph_path --op_log_path
+tfprof> code -max_depth 1000 -show_name_regexes .*model_analyzer.*py.* -select micros -account_type_regexes .* -order_by micros
+_TFProfRoot (0us/22.44ms)
+  model_analyzer_test.py:149:run_filename_as_m...:none (0us/22.44ms)
+    model_analyzer_test.py:33:_run_code_in_main:none (0us/22.44ms)
+      model_analyzer_test.py:208:<module>:test.main() (0us/22.44ms)
+        model_analyzer_test.py:132:testComplexCodeView:x = lib.BuildFull... (0us/22.44ms)
+          model_analyzer_testlib.py:63:BuildFullModel:return sgd_op.min... (0us/21.83ms)
+          model_analyzer_testlib.py:58:BuildFullModel:cell, array_ops.c... (0us/333us)
+          model_analyzer_testlib.py:54:BuildFullModel:seq.append(array_... (0us/254us)
+            model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0us/134us)
+            model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0us/40us)
+            ...
+          model_analyzer_testlib.py:61:BuildFullModel:loss = nn_ops.l2_... (0us/28us)
+          model_analyzer_testlib.py:60:BuildFullModel:target = array_op... (0us/0us)
+        model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
+```
+
+4) I want to see the `BatchNorm`'s gamma value in checkpoint.
 
 ```shell
 # Requires --graph_path, --checkpoint_path.
@@ -186,7 +234,7 @@ _TFProfRoot ()
 [1.57 1.83 1.30 1.25 1.59 1.14 1.26 0.82 1.19 1.10 1.48 1.01 0.82 1.23 1.21 1.14 ],
 ```
 
-4) I want to see my checkpoint tensors shape and number of parameters.
+5) I want to see my checkpoint tensors shape and number of parameters.
 
 ```shell
 # Requires --graph_path, --checkpoint_path.
@@ -205,7 +253,7 @@ _TFProfRoot (--/930.58k params)
   unit_last/final_bn/moving_variance (64, 64/64 params)
 ```
 
-5) I defined an op named ‘cost’ to calculate the loss. I want to know what ops
+6) I defined an op named ‘cost’ to calculate the loss. I want to know what ops
 it depends on take a long time to run. Hint: Use the ‘graph’ command to explore
 graph dependencies.
 
@@ -221,7 +269,7 @@ _TFProfRoot (0us/3.61sec)
   unit_3_3/sub2/conv2/Conv2D (10.26ms/3.60sec)
 ```
 
-6) I want to know the expensive operations during the back propagation.
+7) I want to know the expensive operations during the back propagation.
 Hint: tensorflow prepend ‘gradient’ to your defined name scopes. Use the ‘scope’
 command to explore based on name scope hierarchies.
 
@@ -238,7 +286,7 @@ _TFProfRoot (0us/2.29sec)
   ...
 ```
 
-7) Show the number of float operations in the model.
+8) Show the number of float operations in the model.
 Note: float operations calculation depends on
 1) op.RegisterStatistics. If an op doesn’t
 have RegisterStatistics defined, its float operations cannot be counted.
@@ -263,7 +311,7 @@ _TFProfRoot (0/17.63b flops)
   ...
 ```
 
-8) Show the number of parameters of all `tf.trainable_variables()` in the model.
+9) Show the number of parameters of all `tf.trainable_variables()` in the model.
 
 ```shell
 # Requires --graph_path --op_log_path.
@@ -283,7 +331,7 @@ generated by write_op_log() Python API. write_op_log() help users create some
 common op types implicitly. Users can define their own op types and log it
 through the write_op_log() API.
 
-9) What if I’m lazy and don’t want to define op type? I have given my ops
+109) What if I’m lazy and don’t want to define op type? I have given my ops
 well-defined names in my model’s code. And want to use names to select a group
 of ops. Let’s try it!
 
@@ -301,7 +349,7 @@ in terminal. Otherwise, tfprof accounts all ops matched by
 `-account_type_regexes` recursively even if they are hidden due to some
 options such as -max_depth.
 
-10) TensorFlow has built-in op types. For example, built-in op type `Variable`
+11) TensorFlow has built-in op types. For example, built-in op type `Variable`
 seems to include `Variable's` created by your model. However, be careful when
 depending on it because TensorFlow creates extra `Variable` ops implicitly and
 the implicitly created ops can have the same prefix as the `Variable's` you
@@ -327,7 +375,7 @@ _TFProfRoot (--/930.58k params)
 ```
 
 
-11) A example of defining extra op type for ops using `OpLog`
+12) A example of defining extra op type for ops using `OpLog`
 
 First, in Python code, create an `OpLog` proto and add op type
 information to it:
diff --git a/tensorflow/tools/tfprof/internal/BUILD b/tensorflow/tools/tfprof/internal/BUILD
index c5482a9776..adace89985 100644
--- a/tensorflow/tools/tfprof/internal/BUILD
+++ b/tensorflow/tools/tfprof/internal/BUILD
@@ -15,6 +15,7 @@ cc_library(
     srcs = ["tfprof_stats.cc"],
     hdrs = ["tfprof_stats.h"],
     deps = [
+        ":tfprof_code",
         ":tfprof_graph",
         ":tfprof_node",
         ":tfprof_options",
@@ -61,6 +62,27 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_code",
+    srcs = ["tfprof_code.cc"],
+    hdrs = ["tfprof_code.h"],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_node",
+        ":tfprof_options",
+        ":tfprof_show_code",
+        ":tfprof_tensor",
+        ":tfprof_utils",
+        "//tensorflow/c:c_api",
+        "//tensorflow/c:checkpoint_reader",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:regexp_internal",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "tfprof_graph",
     srcs = ["tfprof_graph.cc"],
@@ -98,6 +120,26 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_show_code",
+    srcs = ["tfprof_show_code.cc"],
+    hdrs = ["tfprof_show_code.h"],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_node",
+        ":tfprof_options",
+        ":tfprof_scope",
+        ":tfprof_show",
+        ":tfprof_tensor",
+        ":tfprof_utils",
+        "//tensorflow/c:checkpoint_reader",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:regexp_internal",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 tf_cc_test(
     name = "tfprof_show_test",
     srcs = ["tfprof_show_test.cc"],
diff --git a/tensorflow/tools/tfprof/internal/print_model_analysis.cc b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
index dfe4019fbb..c816e3209e 100644
--- a/tensorflow/tools/tfprof/internal/print_model_analysis.cc
+++ b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
@@ -40,13 +40,13 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
   graph_ptr->ParseFromString(*graph);
 
   std::unique_ptr<RunMetadata> run_meta_ptr;
-  if (run_meta) {
+  if (run_meta && !run_meta->empty()) {
     run_meta_ptr.reset(new RunMetadata());
     run_meta_ptr->ParseFromString(*run_meta);
   }
 
   std::unique_ptr<OpLog> op_log_ptr;
-  if (op_log) {
+  if (op_log && !op_log->empty()) {
     op_log_ptr.reset(new OpLog());
     op_log_ptr->ParseFromString(*op_log);
   }
@@ -58,16 +58,27 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
 
   Options opts = Options::FromProtoStr(*options);
 
+  // TODO(xpan): We should have dump_to_file/print_stdout/etc to control
+  // side-effects independently instead of one controlling the other.
   if (opts.dump_to_file.empty()) {
     printf("\n=========================Options=============================\n");
     printf("%s", opts.ToString().c_str());
     printf("\n==================Model Analysis Report======================\n");
-    TFProfNode root(tf_stats.PrintGraph(*command, opts));
+    string ret = "";
+    if (*command == kCmds[2]) {
+      ret = tf_stats.PrintCode(opts).SerializeAsString();
+    } else {
+      ret = tf_stats.PrintGraph(*command, opts).SerializeAsString();
+    }
     printf("\n======================End of Report==========================\n");
     fflush(stdout);
-    return root.SerializeAsString();
+    return ret;
+  }
+  if (*command == kCmds[2]) {
+    return tf_stats.PrintCode(opts).SerializeAsString();
+  } else {
+    return tf_stats.PrintGraph(*command, opts).SerializeAsString();
   }
-  return tf_stats.PrintGraph(*command, opts).SerializeAsString();
 }
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.cc b/tensorflow/tools/tfprof/internal/tfprof_code.cc
new file mode 100644
index 0000000000..5618a52286
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.cc
@@ -0,0 +1,215 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_code.h"
+
+#include <stdio.h>
+#include <utility>
+
+#include "tensorflow/c/c_api.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/core/platform/regexp.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+
+namespace tensorflow {
+namespace tfprof {
+namespace {
+// Convert to Trace proto into a short readable string.
+string GetTraceString(const CodeDef::Trace& trace) {
+  string ntrace = "";
+  if (trace.file().find_last_of('/') != trace.file().npos) {
+    ntrace += trace.file().substr(trace.file().find_last_of('/') + 1);
+  } else {
+    ntrace += trace.file();
+  }
+  ntrace += strings::StrCat(":", trace.lineno());
+  if (trace.function().length() < 20) {
+    ntrace += ":" + trace.function();
+  } else {
+    ntrace += ":" + trace.function().substr(0, 17) + "...";
+  }
+  if (trace.line().length() < 20) {
+    ntrace += ":" + trace.line();
+  } else {
+    ntrace += ":" + trace.line().substr(0, 17) + "...";
+  }
+  return ntrace;
+}
+}  // namespace
+
+void TFCode::AddNode(TFGraphNode* node) {
+  if (!node->code()) {
+    return;
+  }
+  TFCodeNode* pre_trace_node = nullptr;
+  for (int i = 0; i < node->code()->traces_size(); ++i) {
+    // Unlike op name, which is globally unique, trace name is only unique
+    // w.r.t. it's parent.
+    const string& trace = GetTraceString(node->code()->traces(i));
+    if (i == 0) {
+      if (!trace_root_) {
+        trace_root_.reset(new TFCodeNode(trace));
+      }
+      CHECK(trace_root_->name() == trace) << "Different trace root";
+      pre_trace_node = trace_root_.get();
+      continue;
+    }
+    pre_trace_node->AddChildren(trace);
+    TFCodeNode* trace_node = pre_trace_node->children()[trace].get();
+
+    if (i == node->code()->traces_size() - 1) {
+      trace_node->AddGraphNode(node);
+    }
+    pre_trace_node = trace_node;
+  }
+}
+
+void TFCode::Build() {
+  if (!trace_root_) {
+    return;
+  }
+  code_root_ = BuildCodeNodes(trace_root_.get());
+}
+
+CodeNode* TFCode::BuildCodeNodes(TFCodeNode* root) {
+  auto code_root = std::unique_ptr<CodeNode>(new CodeNode(root));
+  CodeNode* code_root_ptr = code_root.get();
+  code_nodes_.insert(std::move(code_root));
+
+  for (auto it = root->children().cbegin(); it != root->children().cend();
+       ++it) {
+    code_root_ptr->children.push_back(BuildCodeNodes(it->second.get()));
+  }
+  return code_root_ptr;
+}
+
+const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
+  // Search from roots recursively to find start node, if start_name_regexes
+  // is specified.
+  tfprof_trace_root_.reset(new TFCodeNode(kTFProfRoot));
+  tfprof_code_root_.reset(new CodeNode(tfprof_trace_root_.get()));
+  if (!code_root_) {
+    return tfprof_code_root_.get();
+  }
+
+  std::vector<CodeNode*> roots = {code_root_};
+  if (opts.start_name_regexes.size() != 1 ||
+      opts.start_name_regexes[0] != ".*") {
+    roots = SearchRoot(roots, opts.start_name_regexes);
+  }
+
+  tfprof_code_root_->children.assign(roots.begin(), roots.end());
+  Account({tfprof_code_root_.get()}, opts);
+
+  return PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
+}
+
+std::vector<CodeNode*> TFCode::SearchRoot(std::vector<CodeNode*> roots,
+                                          const std::vector<string>& regexes) {
+  std::vector<CodeNode*> res;
+  if (roots.empty()) {
+    return res;
+  }
+  for (CodeNode* root : roots) {
+    bool match_start_node = false;
+    for (const string& regex : regexes) {
+      if (RE2::FullMatch(root->name(), regex)) {
+        res.push_back(root);
+        match_start_node = true;
+        break;
+      }
+    }
+    if (match_start_node) {
+      // Found a start node at this branch, no need to continue.
+      continue;
+    }
+    std::vector<CodeNode*> nroots = SearchRoot(root->children, regexes);
+    res.insert(res.end(), nroots.begin(), nroots.end());
+  }
+  return res;
+}
+
+std::vector<CodeNode*> TFCode::PrintScope(const std::vector<CodeNode*> roots,
+                                          const Options& opts, int depth,
+                                          int last_ident) {
+  std::vector<CodeNode*> show_nodes;
+
+  for (CodeNode* node : roots) {
+    int nlast_ident = last_ident;
+    bool show = ShouldShow(node, opts, depth);
+    if (show) {
+      node->formatted_str.clear();
+      if (opts.account_displayed_op_only) {
+        node->ResetTotalStats();
+        node->AddSelfToTotalStats();
+      }
+      nlast_ident += 2;
+    }
+
+    std::vector<CodeNode*> show_cnodes;
+    if (!ShouldTrim(node, opts.trim_name_regexes)) {
+      show_cnodes = PrintScope(node->children, opts, depth + 1, nlast_ident);
+    }
+    if (show) {
+      show_cnodes = SortNodes(show_cnodes, opts);
+      string children_str;
+      for (CodeNode* sc : show_cnodes) {
+        children_str += sc->formatted_str;
+        node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        if (opts.account_displayed_op_only) {
+          node->AggregateTotalStats(sc);
+        }
+      }
+
+      node->formatted_str =
+          strings::Printf("%s%s\n", string(last_ident, ' ').c_str(),
+                          node->Format(opts).c_str());
+
+      if (opts.select.find(kShown[5]) != opts.select.end()) {
+        fprintf(stderr, "code view has no tensor value to show\n");
+      }
+
+      node->formatted_str += children_str;
+      show_nodes.push_back(node);
+    } else {
+      show_nodes.insert(show_nodes.end(), show_cnodes.begin(),
+                        show_cnodes.end());
+    }
+  }
+  return show_nodes;
+}
+
+void TFCode::Account(const std::vector<CodeNode*>& roots, const Options& opts) {
+  if (roots.empty()) return;
+
+  for (CodeNode* node : roots) {
+    node->ResetTotalStats();
+    Account(node->children, opts);
+
+    node->account = ShouldAccount(node, opts);
+    if (node->account) {
+      node->AddSelfToTotalStats();
+    }
+    for (CodeNode* c : node->children) {
+      node->AggregateTotalStats(c);
+    }
+  }
+}
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.h b/tensorflow/tools/tfprof/internal/tfprof_code.h
new file mode 100644
index 0000000000..7c517e6b0e
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.h
@@ -0,0 +1,88 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Build a tree structure based on the TensorFlow model's python code stacks.
+// Stats are aggregated from descendants from ancestors.
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
+
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "tensorflow/c/checkpoint_reader.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+class CodeNode : public ShowCodeNode {
+ public:
+  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
+  ~CodeNode() override {}
+
+  void AggregateTotalStats(CodeNode* node) {
+    ShowCodeNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() { ShowCodeNode::ResetTotalStats(); }
+
+  std::vector<CodeNode*> children;
+};
+
+class TFCode : public TFShowCode {
+ public:
+  explicit TFCode() : code_root_(nullptr), trace_root_(nullptr) {}
+  ~TFCode() override {}
+
+  void AddNode(TFGraphNode* node) override;
+
+  void Build() override;
+
+ private:
+  CodeNode* BuildCodeNodes(TFCodeNode* root);
+
+  const ShowCodeNode* ShowInternal(const Options& opts) override;
+
+  std::vector<CodeNode*> SearchRoot(std::vector<CodeNode*> roots,
+                                    const std::vector<string>& regexes);
+
+  std::vector<CodeNode*> PrintScope(const std::vector<CodeNode*> roots,
+                                    const Options& opts, int depth,
+                                    int last_ident);
+
+  void Account(const std::vector<CodeNode*>& roots, const Options& opts);
+
+  CodeNode* code_root_;
+  std::unique_ptr<TFCodeNode> trace_root_;
+  std::unique_ptr<TFCodeNode> tfprof_trace_root_;
+  std::unique_ptr<CodeNode> tfprof_code_root_;
+  std::set<std::unique_ptr<CodeNode>> code_nodes_;
+};
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_CODE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.cc b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
index 469b258f98..1623d9f8c4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
@@ -31,14 +31,14 @@ GraphNode* TFGraph::CreateParentNode(const string& name) {
   node_defs_.back()->set_name(name);
   node_defs_.back()->set_op(kTFGraphParent);
   parent_nodes_[name] =
-      std::unique_ptr<TFNode>(new TFNode(node_defs_.back().get()));
+      std::unique_ptr<TFGraphNode>(new TFGraphNode(node_defs_.back().get()));
   nodes_map_[name] =
       std::unique_ptr<GraphNode>(new GraphNode(parent_nodes_[name].get()));
   return nodes_map_[name].get();
 }
 
-void TFGraph::AddNode(TFNode* node) {
-  string name = node->node_def()->name();
+void TFGraph::AddNode(TFGraphNode* node) {
+  string name = node->name();
   nodes_map_[name] = std::unique_ptr<GraphNode>(new GraphNode(node));
 }
 
@@ -49,7 +49,7 @@ void TFGraph::Build() {
   // Filter out the root nodes (node not input of any other node).
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     GraphNode* node = it->second.get();
-    const std::map<string, TFNode*>& inputs = node->node->inputs();
+    const std::map<string, TFGraphNode*>& inputs = node->node->inputs();
     for (auto inputs_it = inputs.cbegin(); inputs_it != inputs.cend();
          inputs_it++) {
       nonroots.insert(inputs_it->first);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.h b/tensorflow/tools/tfprof/internal/tfprof_graph.h
index b16f80b33d..75979d020c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.h
@@ -39,7 +39,7 @@ namespace tensorflow {
 namespace tfprof {
 class GraphNode : public ShowNode {
  public:
-  explicit GraphNode(TFNode* node) : ShowNode(node) {
+  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
     mutable_proto()->set_inputs(node->inputs().size());
     mutable_proto()->set_total_inputs(0);
   }
@@ -72,7 +72,7 @@ class TFGraph : public TFShow {
       : TFShow(ckpt_reader) {}
   ~TFGraph() override {}
 
-  void AddNode(TFNode* node) override;
+  void AddNode(TFGraphNode* node) override;
 
   void Build() override;
 
@@ -99,14 +99,14 @@ class TFGraph : public TFShow {
   std::vector<GraphNode*> GenerateGraphDot(
       GraphNode* root, GraphNode* last_shown, const Options& opts, int depth,
       int hidden, std::set<string>* declared_nodes,
-      std::set<string>* declared_edges, TFProfNode* parent);
+      std::set<string>* declared_edges, TFGraphNodeProto* parent);
 
   void Account(const std::vector<GraphNode*>& roots, const Options& opts,
                std::map<string, int64>* visits);
 
   std::vector<GraphNode*> roots_;
   std::vector<std::unique_ptr<NodeDef>> node_defs_;
-  std::map<string, std::unique_ptr<TFNode>> parent_nodes_;
+  std::map<string, std::unique_ptr<TFGraphNode>> parent_nodes_;
   std::map<string, std::unique_ptr<GraphNode>> nodes_map_;
 };
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.cc b/tensorflow/tools/tfprof/internal/tfprof_node.cc
index 08bd91d99c..5f018addb4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.cc
@@ -20,7 +20,8 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-void TFNode::AddStepStat(const string& device, const NodeExecStats* step_stat) {
+void TFGraphNode::AddStepStat(const string& device,
+                              const NodeExecStats* step_stat) {
   if (!device.empty()) {
     // This might override device from GraphDef.
     device_ = device;
@@ -44,7 +45,7 @@ void TFNode::AddStepStat(const string& device, const NodeExecStats* step_stat) {
   }
 }
 
-void TFNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
+void TFGraphNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
   kernel_compute_micros_ = cost_node->compute_cost();
 }
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.h b/tensorflow/tools/tfprof/internal/tfprof_node.h
index 677c8d3c87..235904ea6c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.h
@@ -30,14 +30,16 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
 
-class TFNode {
+class TFGraphNode {
  public:
-  TFNode(const NodeDef* node)
+  TFGraphNode(const NodeDef* node)
       : node_(node),
+        code_(nullptr),
         step_stat_(nullptr),
         op_start_micros_(0),
         op_schedule_micros_(0),
@@ -70,9 +72,9 @@ class TFNode {
     device_ = node->device();
   }
 
-  TFNode() : TFNode(nullptr) {}
+  TFGraphNode() : TFGraphNode(nullptr) {}
 
-  void AddInput(TFNode* input) { inputs_[input->node_def()->name()] = input; }
+  void AddInput(TFGraphNode* input) { inputs_[input->name()] = input; }
 
   void AddOpType(const string& op_type) { op_types_.insert(op_type); }
 
@@ -83,27 +85,32 @@ class TFNode {
 
   void AddFloatOps(int64 float_ops) { float_ops_ = float_ops; }
 
+  void AddCode(const CodeDef* code) { code_ = code; }
+
+  const string& name() const { return node_->name(); }
   const NodeDef* node_def() { return node_; }
-  const std::map<string, TFNode*>& inputs() { return inputs_; }
+  const std::map<string, TFGraphNode*>& inputs() const { return inputs_; }
   int64 op_start_micros() { return op_start_micros_; }
   // This is time spent in Op::Compute(), which is GPU kernel schedule time.
   // Currently not used.
   int64 op_schedule_micros() { return op_schedule_micros_; }
   // This is time spent in kernel execution.
-  int64 kernel_compute_micros() { return kernel_compute_micros_; }
+  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
   int64 all_spent_micros() { return all_spent_micros_; }
-  int64 requested_byptes() { return requested_bytes_; }
-  int64 float_ops() { return float_ops_; }
-  string device() { return device_; }
-  const std::set<string>& op_types() { return op_types_; }
+  int64 requested_bytes() const { return requested_bytes_; }
+  int64 float_ops() const { return float_ops_; }
+  const CodeDef* code() { return code_; }
+  string device() const { return device_; }
+  const std::set<string>& op_types() const { return op_types_; }
 
-  const std::vector<int64>& shape() { return shape_; }
+  const std::vector<int64>& shape() const { return shape_; }
 
  private:
   void update_shape(const std::vector<int64>& shape) { shape_ = shape; }
 
-  std::map<string, TFNode*> inputs_;
+  std::map<string, TFGraphNode*> inputs_;
   const NodeDef* node_;
+  const CodeDef* code_;
   const NodeExecStats* step_stat_;
 
   std::vector<int64> shape_;
@@ -117,6 +124,71 @@ class TFNode {
   int64 float_ops_;
 };
 
+class TFCodeNode {
+ public:
+  TFCodeNode(const string& trace)
+      : trace_(trace),
+        kernel_compute_micros_(0),
+        requested_bytes_(0),
+        float_ops_(0) {}
+
+  void AddGraphNode(const TFGraphNode* node) {
+    if (nodes_.find(node->name()) != nodes_.end()) {
+      return;
+    }
+    nodes_[node->name()] = node;
+
+    kernel_compute_micros_ += node->kernel_compute_micros();
+    requested_bytes_ += node->requested_bytes();
+    float_ops_ += node->float_ops();
+    op_types_.insert(node->op_types().begin(), node->op_types().end());
+    if (node->shape().size() > 0) {
+      shapes_.push_back(node->shape());
+    }
+    if (!node->device().empty()) {
+      devices_.insert(node->device());
+    }
+  }
+  const std::map<string, const TFGraphNode*>& graph_nodes() const {
+    return nodes_;
+  }
+
+  void AddChildren(const string& trace) {
+    if (children_.find(trace) != children_.end()) {
+      return;
+    }
+    children_[trace].reset(new TFCodeNode(trace));
+  }
+  std::map<string, std::unique_ptr<TFCodeNode>>& children() {
+    return children_;
+  }
+
+  const string& name() const { return trace_; }
+
+  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
+
+  int64 requested_bytes() const { return requested_bytes_; }
+
+  int64 float_ops() const { return float_ops_; }
+
+  const std::set<string>& devices() const { return devices_; }
+
+  const std::set<string>& op_types() const { return op_types_; }
+
+  const std::vector<std::vector<int64>>& shapes() const { return shapes_; }
+
+ private:
+  const string trace_;
+  std::set<string> op_types_;
+  int64 kernel_compute_micros_;
+  int64 requested_bytes_;
+  int64 float_ops_;
+
+  std::set<string> devices_;
+  std::vector<std::vector<int64>> shapes_;
+  std::map<string, const TFGraphNode*> nodes_;
+  std::map<string, std::unique_ptr<TFCodeNode>> children_;
+};
 }  // namespace tfprof
 }  // namespace tensorflow
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.h b/tensorflow/tools/tfprof/internal/tfprof_options.h
index a5b55e77fa..0a9f2768e0 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.h
@@ -55,7 +55,7 @@ static const char* const kShown[] = {
 };
 
 static const char* const kCmds[] = {
-    "scope", "graph", "set", "help",
+    "scope", "graph", "code", "set", "help",
 };
 
 struct Options {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.cc b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
index 949d2d54e4..b4aef717c8 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
@@ -35,15 +35,15 @@ ScopeNode* TFScope::CreateParentNode(const string& name) {
   node_defs_.back()->set_name(name);
   node_defs_.back()->set_op(kTFScopeParent);
   parent_nodes_[name] =
-      std::unique_ptr<TFNode>(new TFNode(node_defs_.back().get()));
+      std::unique_ptr<TFGraphNode>(new TFGraphNode(node_defs_.back().get()));
   nodes_map_[name] =
       std::unique_ptr<ScopeNode>(new ScopeNode(parent_nodes_[name].get()));
   return nodes_map_[name].get();
 }
 
-void TFScope::AddNode(TFNode* node) {
-  string name = node->node_def()->name();
-  if (nodes_map_.find(node->node_def()->name()) == nodes_map_.end()) {
+void TFScope::AddNode(TFGraphNode* node) {
+  string name = node->name();
+  if (nodes_map_.find(node->name()) == nodes_map_.end()) {
     nodes_map_[name] = std::unique_ptr<ScopeNode>(new ScopeNode(node));
   }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.h b/tensorflow/tools/tfprof/internal/tfprof_scope.h
index a7c58920a2..2e2e4f5266 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.h
@@ -39,7 +39,7 @@ namespace tfprof {
 
 class ScopeNode : public ShowNode {
  public:
-  explicit ScopeNode(TFNode* node) : ShowNode(node) {}
+  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
   ~ScopeNode() override {}
 
   void AggregateTotalStats(ScopeNode* node) {
@@ -59,7 +59,7 @@ class TFScope : public TFShow {
       : TFShow(ckpt_reader) {}
   ~TFScope() override {}
 
-  void AddNode(TFNode* node) override;
+  void AddNode(TFGraphNode* node) override;
 
   void Build() override;
 
@@ -79,7 +79,7 @@ class TFScope : public TFShow {
 
   std::vector<ScopeNode*> roots_;
   std::vector<std::unique_ptr<NodeDef>> node_defs_;
-  std::map<string, std::unique_ptr<TFNode>> parent_nodes_;
+  std::map<string, std::unique_ptr<TFGraphNode>> parent_nodes_;
   std::map<string, std::unique_ptr<ScopeNode>> nodes_map_;
 };
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.cc b/tensorflow/tools/tfprof/internal/tfprof_show.cc
index 08ae82fea4..932dfb3893 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.cc
@@ -25,13 +25,13 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-ShowNode::ShowNode(TFNode* node) : node(node), account(true) {
+ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
   mutable_proto()->set_name(name());
   if (!node->device().empty()) {
     mutable_proto()->set_device(node->device());
   }
   mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_byptes());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
   mutable_proto()->set_float_ops(node->float_ops());
 
   if (!node->shape().empty()) {
@@ -119,12 +119,12 @@ string ShowNode::FormatMeta(const Options& opts) {
   return str_util::Join(info, ", ");
 }
 
-TFProfNode* ShowNode::mutable_proto() { return &proto_; }
+TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
 
-const TFProfNode& ShowNode::proto() const { return proto_; }
+const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
 
 void ShowNode::AggregateTotalStats(ShowNode* node) {
-  TFProfNode* node_pb = node->mutable_proto();
+  TFGraphNodeProto* node_pb = node->mutable_proto();
   mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
                                          node_pb->total_exec_micros());
   mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
@@ -151,9 +151,10 @@ void ShowNode::ResetTotalStats() {
   mutable_proto()->set_total_requested_bytes(0);
   mutable_proto()->set_total_parameters(0);
   mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
 }
 
-const TFProfNode& TFShow::Show(const Options& opts) {
+const TFGraphNodeProto& TFShow::Show(const Options& opts) {
   const ShowNode* root = ShowInternal(opts);
   if (opts.dump_to_file.empty()) {
     printf("%s", root->formatted_str.c_str());
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.h b/tensorflow/tools/tfprof/internal/tfprof_show.h
index a17358bb6b..5e85b81a72 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.h
@@ -37,18 +37,18 @@ namespace tensorflow {
 namespace tfprof {
 class ShowNode {
  public:
-  explicit ShowNode(TFNode* node);
+  explicit ShowNode(const TFGraphNode* node);
   virtual ~ShowNode() {}
 
-  const string& name() const { return node->node_def()->name(); }
-  TFProfNode* mutable_proto();
-  const TFProfNode& proto() const;
+  const string& name() const { return node->name(); }
+  TFGraphNodeProto* mutable_proto();
+  const TFGraphNodeProto& proto() const;
 
   string Format(const Options& opts);
 
   string FormatMeta(const Options& opts);
 
-  TFNode* node;
+  const TFGraphNode* node;
   bool account;
   string formatted_str;
 
@@ -59,7 +59,7 @@ class ShowNode {
 
   void ResetTotalStats();
 
-  TFProfNode proto_;
+  TFGraphNodeProto proto_;
 };
 
 class TFShow {
@@ -67,9 +67,9 @@ class TFShow {
   explicit TFShow(checkpoint::CheckpointReader* ckpt_reader)
       : ckpt_reader_(ckpt_reader) {}
   virtual ~TFShow() {}
-  virtual void AddNode(TFNode* node) = 0;
+  virtual void AddNode(TFGraphNode* node) = 0;
   virtual void Build() = 0;
-  const TFProfNode& Show(const Options& opts);
+  const TFGraphNodeProto& Show(const Options& opts);
 
  protected:
   virtual const ShowNode* ShowInternal(const Options& opts) = 0;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
new file mode 100644
index 0000000000..17c0073c7e
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
@@ -0,0 +1,273 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
+
+#include <memory>
+#include <set>
+
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/regexp.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_scope.h"
+
+namespace tensorflow {
+namespace tfprof {
+ShowCodeNode::ShowCodeNode(const TFCodeNode* node) : node(node), account(true) {
+  std::vector<ScopeNode> snodes;
+  for (auto it : node->graph_nodes()) {
+    ScopeNode snode(it.second);
+    snodes.push_back(snode);
+    snodes[snodes.size() - 1].AddSelfToTotalStats();
+    *mutable_proto()->mutable_graph_nodes()->Add() =
+        snodes[snodes.size() - 1].proto();
+  }
+
+  mutable_proto()->set_name(name());
+  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shapes().empty()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      int64 params = 1;
+      bool complete_shape = true;
+      for (int64 d : shape) {
+        // Sometimes parameters could be <0 when a dim is unknown.
+        if (d < 0) {
+          complete_shape = false;
+          break;
+        }
+        params *= d;
+      }
+      if (complete_shape) {
+        mutable_proto()->set_parameters(proto().parameters() + params);
+      } else {
+        fprintf(stderr, "Incomplete shape.");
+      }
+    }
+  }
+}
+
+string ShowCodeNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowCodeNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  std::vector<string> shapes;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      if (!shape.empty()) {
+        shapes.push_back(FormatShapes(shape));
+      }
+    }
+    if (!shapes.empty()) {
+      info.push_back(str_util::Join(shapes, "|"));
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (!node->devices().empty()) {
+      info.push_back(str_util::Join(node->devices(), "|"));
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    op_types.insert(node->devices().cbegin(), node->devices().cend());
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
+
+const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
+
+void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
+  TFCodeNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowCodeNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowCodeNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
+
+const TFCodeNodeProto& TFShowCode::Show(const Options& opts) {
+  const ShowCodeNode* root = ShowInternal(opts);
+  if (opts.dump_to_file.empty()) {
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+  } else {
+    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
+                                 root->formatted_str);
+    if (!s.ok()) {
+      fprintf(stderr, "%s\n", s.ToString().c_str());
+    }
+  }
+  return root->proto();
+}
+
+bool TFShowCode::ShouldShow(ShowCodeNode* node, const Options& opts,
+                            int depth) {
+  // Always show kTFProfRoot.
+  if (node->name() == kTFProfRoot) return true;
+
+  if (!node->account) return false;
+  // TODO(xpan): Think more carefully about node filtering in code view.
+  // Unlike graph/scope view, which users want to see the exact leaf op.
+  // In code view, users want to see the middle code traces they wrote.
+  //
+  // This is a subtle difference from scope/graph view. Usually mostly
+  // want to see the middle code traces (i.e. their own codes.), instead
+  // of the TensorFlow internal codes traces.
+  if (node->proto().total_requested_bytes() < opts.min_bytes ||
+      node->proto().total_exec_micros() < opts.min_micros ||
+      node->proto().total_parameters() < opts.min_params ||
+      node->proto().total_float_ops() < opts.min_float_ops ||
+      depth > opts.max_depth || !ShouldShowIfExtra(node, opts, depth)) {
+    return false;
+  }
+
+  bool show = false;
+  if (opts.device_regexes.size() == 1 && opts.device_regexes[0] == ".*") {
+    show = true;
+  } else {
+    for (const string& regex : opts.device_regexes) {
+      for (const string& device : node->node->devices()) {
+        if (RE2::FullMatch(device, regex)) {
+          show = true;
+          break;
+        }
+      }
+      if (show) break;
+    }
+  }
+  // Don't show if device_regexes don't cover it.
+  if (!show) return false;
+
+  show = false;
+  if (opts.show_name_regexes.size() == 1 && opts.show_name_regexes[0] == ".*") {
+    show = true;
+  } else {
+    for (const string& regex : opts.show_name_regexes) {
+      if (RE2::FullMatch(node->name(), regex)) {
+        show = true;
+        break;
+      }
+    }
+  }
+  // Don't show if show_name_regexes don't cover it.
+  if (!show) return false;
+  // Don't show if hide_name_regexes cover it.
+  for (const string& regex : opts.hide_name_regexes) {
+    if (RE2::FullMatch(node->name(), regex)) return false;
+  }
+  return true;
+}
+
+bool TFShowCode::ShouldTrim(ShowCodeNode* node,
+                            const std::vector<string>& regexes) {
+  for (const string& regex : regexes) {
+    if (RE2::FullMatch(node->name(), regex)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool TFShowCode::ShouldAccount(ShowCodeNode* node, const Options& opts) {
+  if (opts.account_type_regexes.size() == 1 &&
+      opts.account_type_regexes[0] == ".*") {
+    return true;
+  }
+  for (const string& regex : opts.account_type_regexes) {
+    for (const string& type : node->node->op_types()) {
+      if (RE2::FullMatch(type, regex)) {
+        return true;
+      }
+    }
+    for (const string& device : node->node->devices()) {
+      if (RE2::FullMatch(device, regex)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.h b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
new file mode 100644
index 0000000000..afe0fa4473
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
@@ -0,0 +1,126 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Parent class and utilities for tfprof_graph and tfprof_scope.
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "tensorflow/c/checkpoint_reader.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+class ShowCodeNode {
+ public:
+  explicit ShowCodeNode(const TFCodeNode* node);
+  virtual ~ShowCodeNode() {}
+
+  const string& name() const { return node->name(); }
+  TFCodeNodeProto* mutable_proto();
+  const TFCodeNodeProto& proto() const;
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFCodeNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowCodeNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFCodeNodeProto proto_;
+};
+
+class TFShowCode {
+ public:
+  explicit TFShowCode() {}
+  virtual ~TFShowCode() {}
+  virtual void AddNode(TFGraphNode* node) = 0;
+  virtual void Build() = 0;
+  const TFCodeNodeProto& Show(const Options& opts);
+
+ protected:
+  virtual const ShowCodeNode* ShowInternal(const Options& opts) = 0;
+
+  bool LookUpCheckPoint(const string& name,
+                        std::unique_ptr<TFProfTensor>* tensor);
+
+  // Overridden by subclass if extra requirements need to be met.
+  virtual bool ShouldShowIfExtra(ShowCodeNode* node, const Options& opts,
+                                 int depth) {
+    return true;
+  }
+
+  bool ShouldShow(ShowCodeNode* node, const Options& opts, int depth);
+
+  bool ShouldTrim(ShowCodeNode* node, const std::vector<string>& regexes);
+
+  bool ShouldAccount(ShowCodeNode* node, const Options& opts);
+
+  template <typename T>
+  std::vector<T*> SortNodes(const std::vector<T*>& nodes, const Options& opts) {
+    if (opts.order_by.empty() || nodes.empty()) {
+      return nodes;
+    }
+    std::vector<T*> sorted_nodes = nodes;
+    std::sort(sorted_nodes.begin(), sorted_nodes.end(),
+              [&opts](const T* n1, const T* n2) {
+                if (n1->name() == kTFProfRoot) return true;
+                if (n2->name() == kTFProfRoot) return false;
+                bool name_cmp = n1->name() < n2->name();
+                if (opts.order_by == kOrderBy[0]) {
+                  return name_cmp;
+                } else if (opts.order_by == kOrderBy[1]) {
+                  return n1->proto().total_requested_bytes() >
+                         n2->proto().total_requested_bytes();
+                } else if (opts.order_by == kOrderBy[2]) {
+                  return n1->proto().total_exec_micros() >
+                         n2->proto().total_exec_micros();
+                } else if (opts.order_by == kOrderBy[3]) {
+                  return n1->proto().total_parameters() >
+                         n2->proto().total_parameters();
+                } else if (opts.order_by == kOrderBy[4]) {
+                  return n1->proto().total_float_ops() >
+                         n2->proto().total_float_ops();
+                }
+                return name_cmp;
+              });
+    return sorted_nodes;
+  }
+};
+
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.cc b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
index edc0689d69..13ff6e7246 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
@@ -56,29 +56,38 @@ TFStats::TFStats(std::unique_ptr<GraphDef> graph,
   printf("Preparing Views...\n");
   scope_view_ = std::unique_ptr<TFScope>(new TFScope(ckpt_reader_.get()));
   graph_view_ = std::unique_ptr<TFGraph>(new TFGraph(ckpt_reader_.get()));
+  code_view_ = std::unique_ptr<TFCode>(new TFCode());
+
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     scope_view_->AddNode(&it->second);
     graph_view_->AddNode(&it->second);
+    code_view_->AddNode(&it->second);
   }
   scope_view_->Build();
   graph_view_->Build();
+  code_view_->Build();
 }
 
-const TFProfNode& TFStats::PrintGraph(const string& cmd, const Options& opts) {
+const TFGraphNodeProto& TFStats::PrintGraph(const string& cmd,
+                                            const Options& opts) {
   if (cmd == kCmds[0]) {
     return scope_view_->Show(opts);
   } else if (cmd == kCmds[1]) {
     return graph_view_->Show(opts);
   } else {
     fprintf(stderr, "Unknown command: %s\n", cmd.c_str());
-    return empty_node_;
+    return empty_graph_node_;
   }
 }
 
+const TFCodeNodeProto& TFStats::PrintCode(const Options& opts) {
+  return code_view_->Show(opts);
+}
+
 void TFStats::ParseGraph() {
   for (const NodeDef& node : graph_->node()) {
     CHECK(nodes_map_.find(node.name()) == nodes_map_.end());
-    nodes_map_[node.name()] = TFNode(&node);
+    nodes_map_[node.name()] = TFGraphNode(&node);
   }
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     const NodeDef* node_def = it->second.node_def();
@@ -110,6 +119,9 @@ void TFStats::ParseOpLog() {
     if (entry.float_ops()) {
       node->second.AddFloatOps(entry.float_ops());
     }
+    if (entry.has_code_def()) {
+      node->second.AddCode(&entry.code_def());
+    }
   }
 }
 
@@ -131,13 +143,14 @@ void TFStats::ParseRunMeta() {
             "Missing CostGraphDef in RunMetadata.\nMaybe you forget to"
             "set tf.ConfigProto(graph_options=tf.GraphOptions("
             "build_cost_model=1)) to Session()\n");
-  }
-  for (const auto& node_pb : run_meta_->cost_graph().node()) {
-    auto node = nodes_map_.find(node_pb.name());
-    if (node == nodes_map_.end()) {
-      continue;
+  } else {
+    for (const auto& node_pb : run_meta_->cost_graph().node()) {
+      auto node = nodes_map_.find(node_pb.name());
+      if (node == nodes_map_.end()) {
+        continue;
+      }
+      node->second.AddNodeStat(&node_pb);
     }
-    node->second.AddNodeStat(&node_pb);
   }
 }
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.h b/tensorflow/tools/tfprof/internal/tfprof_stats.h
index 3a8b46ae31..585dca6771 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.h
@@ -35,6 +35,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/protobuf/config.pb.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_code.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_graph.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
@@ -56,7 +57,8 @@ class TFStats {
 
   // Prints the results to stdout. Also returns the printed output in
   // a proto.
-  const TFProfNode& PrintGraph(const string& cmd, const Options& opts);
+  const TFGraphNodeProto& PrintGraph(const string& cmd, const Options& opts);
+  const TFCodeNodeProto& PrintCode(const Options& opts);
 
  private:
   void ParseGraph();
@@ -67,13 +69,16 @@ class TFStats {
 
   std::unique_ptr<TFScope> scope_view_;
   std::unique_ptr<TFGraph> graph_view_;
+  std::unique_ptr<TFCode> code_view_;
   std::unique_ptr<GraphDef> graph_;
   std::unique_ptr<RunMetadata> run_meta_;
   std::unique_ptr<OpLog> op_log_;
   std::unique_ptr<checkpoint::CheckpointReader> ckpt_reader_;
-  // Store TFNode instead of TFNode* to avoid large number of dynamic alloc.
-  std::map<string, TFNode> nodes_map_;
-  TFProfNode empty_node_;
+  // Store TFGraphNode instead of TFGraphNode* to avoid large number of
+  // dynamic alloc.
+  std::map<string, TFGraphNode> nodes_map_;
+  TFGraphNodeProto empty_graph_node_;
+  TFCodeNodeProto empty_code_node_;
 };
 
 }  // namespace tfprof
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
index 3c97f0eb65..b913161f6a 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
@@ -76,9 +76,9 @@ TEST_F(TFProfStatsTest, CustomOpType) {
                {".*"}, {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
@@ -108,9 +108,9 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
       3, 0, 0, 0, 0, {".*"}, "name", {kCkptVarType},  // accout_type_regexes
       {".*"}, {""}, {".*"}, {""}, false,
       {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
@@ -141,9 +141,9 @@ TEST_F(TFProfStatsTest, TestGraph) {
                {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("graph", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("graph", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: 0\ninputs: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
@@ -155,9 +155,9 @@ TEST_F(TFProfStatsTest, TestGraph) {
 TEST_F(TFProfStatsTest, TestFloatOps) {
   Options opts(10, 0, 0, 0, 1, {".*"}, "name", {".*"}, {".*"}, {""}, {".*"},
                {""}, false, {"float_ops"}, false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
@@ -187,9 +187,9 @@ TEST_F(TFProfStatsTest, TestAccountShownNameOnly) {
                {"unit_2_1.*DW"},  // show_name_regexes.
                {""}, true,        // account_displayed_op_only.
                {"params"}, false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
@@ -203,8 +203,8 @@ TEST_F(TFProfStatsTest, TestShowTensorValue) {
                {"unit_1_0.*gamma"}, {""}, false,
                {"tensor_value"},  // Show tensor value from checkpoint.
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
-  TFProfNode expected;
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
diff --git a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
index 8c19910355..95759f9d47 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
@@ -58,9 +58,9 @@ TEST_F(TFProfTensorTest, Basics) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name", {"VariableV2"}, {".*"}, {""},
                {".*"}, {""}, false, {"tensor_value"},  // show the tensor value.
                false);
-  const TFProfNode& root = tf_stats_->PrintGraph("scope", opts);
+  const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
-  TFProfNode expected;
+  TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
       "name: \"_TFProfRoot\"\nexec_micros: 0\nrequested_bytes: "
       "0\ntotal_exec_micros: 0\ntotal_requested_bytes: 0\ntotal_parameters: "
diff --git a/tensorflow/tools/tfprof/tfprof_log.proto b/tensorflow/tools/tfprof/tfprof_log.proto
index cae6e1e3a8..5c47142e0a 100644
--- a/tensorflow/tools/tfprof/tfprof_log.proto
+++ b/tensorflow/tools/tfprof/tfprof_log.proto
@@ -2,6 +2,17 @@ syntax = "proto2";
 
 package tensorflow.tfprof;
 
+// It specifies the Python callstack that creates an op.
+message CodeDef {
+  repeated Trace traces = 1;
+  message Trace {
+    optional string file = 1;
+    optional int32 lineno = 2;
+    optional string function = 3;
+    optional string line = 4;
+  }
+}
+
 message OpLogEntry {
   // op name.
   optional string name = 1;
@@ -12,6 +23,8 @@ message OpLogEntry {
   // User can define extra op type information for an op. This allows the user
   // to select a group of ops precisely using op_type as a key.
   repeated string types = 3;
+  // Used to support tfprof "code" view.
+  optional CodeDef code_def = 4;
 }
 
 message OpLog {
diff --git a/tensorflow/tools/tfprof/tfprof_main.cc b/tensorflow/tools/tfprof/tfprof_main.cc
index a8ed6e3813..dd18a4ad3c 100644
--- a/tensorflow/tools/tfprof/tfprof_main.cc
+++ b/tensorflow/tools/tfprof/tfprof_main.cc
@@ -160,12 +160,13 @@ int main(int argc, char** argv) {
         "Profiling everything!\n");
     return 0;
   } else if (argc > 1) {
-    if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[3]) {
+    if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[4]) {
       tensorflow::tfprof::PrintHelp();
       return 0;
     }
     if (tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[0] ||
-        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[1]) {
+        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[1] ||
+        tensorflow::string(argv[1]) == tensorflow::tfprof::kCmds[2]) {
       cmd = argv[1];
     }
   }
@@ -214,7 +215,10 @@ int main(int argc, char** argv) {
       hide_name_regexes, FLAGS_account_displayed_op_only, select, FLAGS_viz,
       FLAGS_dump_to_file);
 
-  if (!cmd.empty()) {
+  if (cmd == tensorflow::tfprof::kCmds[2]) {
+    tf_stat.PrintCode(opts);
+    return 0;
+  } else if (!cmd.empty()) {
     tf_stat.PrintGraph(cmd, opts);
     return 0;
   }
@@ -240,10 +244,12 @@ int main(int argc, char** argv) {
       fprintf(stderr, "E: %s\n", s.ToString().c_str());
       continue;
     }
-    if (cmd == tensorflow::tfprof::kCmds[2]) {
+    if (cmd == tensorflow::tfprof::kCmds[3]) {
       opts = new_opts;
-    } else if (cmd == tensorflow::tfprof::kCmds[3]) {
+    } else if (cmd == tensorflow::tfprof::kCmds[4]) {
       tensorflow::tfprof::PrintHelp();
+    } else if (cmd == tensorflow::tfprof::kCmds[2]) {
+      tf_stat.PrintCode(new_opts);
     } else {
       tf_stat.PrintGraph(cmd, new_opts);
     }
diff --git a/tensorflow/tools/tfprof/tfprof_options.proto b/tensorflow/tools/tfprof/tfprof_options.proto
index 0d8e688039..9d269a0995 100644
--- a/tensorflow/tools/tfprof/tfprof_options.proto
+++ b/tensorflow/tools/tfprof/tfprof_options.proto
@@ -21,4 +21,4 @@ message OptionsProto {
   repeated string select = 14;
   optional bool viz = 15;
   optional string dump_to_file = 16;
-}
\ No newline at end of file
+}
diff --git a/tensorflow/tools/tfprof/tfprof_output.proto b/tensorflow/tools/tfprof/tfprof_output.proto
index 9afd41046e..78dd056662 100644
--- a/tensorflow/tools/tfprof/tfprof_output.proto
+++ b/tensorflow/tools/tfprof/tfprof_output.proto
@@ -14,7 +14,8 @@ message TFProfTensorProto {
   repeated string value_str = 4;
 }
 
-message TFProfNode {
+// A node in TensorFlow graph. Used by scope/graph view.
+message TFGraphNodeProto {
   // op name.
   optional string name = 1;
   // tensor value restored from checkpoint.
@@ -45,5 +46,34 @@ message TFProfNode {
   repeated TensorShapeProto shapes = 11;
   // Descendants of the graph. The actual descendants depend on the data
   // structure used (scope, graph).
-  repeated TFProfNode children = 12;
+  repeated TFGraphNodeProto children = 12;
+}
+
+// A node in TensorFlow Python call trace stack. Used by code view.
+message TFCodeNodeProto {
+  // A trace in the trace stack.
+  optional string name = 1;
+
+  // code execution time.
+  optional int64 exec_micros = 2;
+  // Total requested bytes by the code.
+  optional int64 requested_bytes = 3;
+  // Number of parameters if available.
+  optional int64 parameters = 4;
+  // Number of float operations.
+  optional int64 float_ops = 5;
+
+  // The following are the aggregated stats from called descendents and the
+  // trace itself. The actual descendants depend on the data structure used.
+  optional int64 total_exec_micros = 6;
+  optional int64 total_requested_bytes = 7;
+  optional int64 total_parameters = 8;
+  optional int64 total_float_ops = 9;
+
+  // A set of graph nodes created by the leaf of the call stack.
+  // 'children' field should be empty if graph_nodes is non-empty.
+  repeated TFGraphNodeProto graph_nodes = 10;
+  // Descendants of the graph. The actual descendants depend on the data
+  // structure used (scope, graph).
+  repeated TFCodeNodeProto children = 11;
 }
\ No newline at end of file
-- 
GitLab


From c43d4e93a62a6ae458a704b690d0a0a90434f3ab Mon Sep 17 00:00:00 2001
From: Ruben Vereecken <rubenvereecken@gmail.com>
Date: Tue, 9 May 2017 11:38:44 +0100
Subject: [PATCH 1106/1563] Added TensorBoard to the keras.callbacks API

---
 tensorflow/contrib/keras/api/keras/callbacks/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/keras/api/keras/callbacks/__init__.py b/tensorflow/contrib/keras/api/keras/callbacks/__init__.py
index 2f579f2d28..36db34f592 100644
--- a/tensorflow/contrib/keras/api/keras/callbacks/__init__.py
+++ b/tensorflow/contrib/keras/api/keras/callbacks/__init__.py
@@ -29,6 +29,7 @@ from tensorflow.contrib.keras.python.keras.callbacks import ModelCheckpoint
 from tensorflow.contrib.keras.python.keras.callbacks import ProgbarLogger
 from tensorflow.contrib.keras.python.keras.callbacks import ReduceLROnPlateau
 from tensorflow.contrib.keras.python.keras.callbacks import RemoteMonitor
+from tensorflow.contrib.keras.python.keras.callbacks import TensorBoard
 
 del absolute_import
 del division
-- 
GitLab


From 3bdeb9f8ce91c3234320cd559b6ae5ac19394981 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Mon, 8 May 2017 11:14:32 -0700
Subject: [PATCH 1107/1563] Adds replace api into RunConfig.

PiperOrigin-RevId: 155401586
---
 .gitmodules                                   |   0
 tensorflow/cc/ops/op_gen_overrides.pbtxt      |   2 +-
 .../python/learn/estimators/estimator.py      |   2 +-
 .../python/learn/estimators/run_config.py     |  30 +-
 .../learn/estimators/run_config_test.py       |  25 +-
 tensorflow/python/estimator/BUILD             |  11 +
 tensorflow/python/estimator/estimator.py      |   2 +
 tensorflow/python/estimator/estimator_test.py |   9 +-
 tensorflow/python/estimator/run_config.py     |  60 ++-
 .../python/estimator/run_config_test.py       |  52 +++
 tensorflow/tensorflow.bzl                     |   2 +-
 .../tensorflow.estimator.-run-config.pbtxt    |   5 +
 tensorflow/tools/ci_build/linux/cmake/run.sh  |   0
 third_party/jpeg.BUILD                        | 416 ------------------
 third_party/sycl/sycl/LICENSE.text.tpl        | 268 -----------
 15 files changed, 177 insertions(+), 707 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 tensorflow/python/estimator/run_config_test.py
 mode change 100644 => 100755 tensorflow/tools/ci_build/linux/cmake/run.sh
 delete mode 100644 third_party/jpeg.BUILD
 delete mode 100644 third_party/sycl/sycl/LICENSE.text.tpl

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tensorflow/cc/ops/op_gen_overrides.pbtxt b/tensorflow/cc/ops/op_gen_overrides.pbtxt
index cd94ddf4a1..1dffb10c03 100644
--- a/tensorflow/cc/ops/op_gen_overrides.pbtxt
+++ b/tensorflow/cc/ops/op_gen_overrides.pbtxt
@@ -22,7 +22,7 @@ op { name: "Where" input_rename: { from: "input" to: "condition" } }
 op { name: "ThreadUnsafeUnigramCandidateSampler", skip: true }
 
 # control_flow_ops
-# TODO(josh11b): Hide Switch and Merge once we write and migrate users to
+# TODO(joshl): Hide Switch and Merge once we write and migrate users to
 # a Cond() API.
 #op { name: "Switch" hide: true }
 #op { name: "Merge" hide: true }
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 36f843ba8e..e8142b659b 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -372,7 +372,6 @@ class BaseEstimator(
       logging.info('Using default config.')
     else:
       self._config = config
-    logging.info('Using config: %s', str(vars(self._config)))
 
     if self._config.session_config is None:
       self._session_config = config_pb2.ConfigProto(allow_soft_placement=True)
@@ -397,6 +396,7 @@ class BaseEstimator(
                       self._model_dir)
     if self._config.model_dir is None:
       self._config = self._config.replace(model_dir=self._model_dir)
+    logging.info('Using config: %s', str(vars(self._config)))
 
     # Set device function depending if there are replicas or not.
     self._device_fn = _get_replica_device_setter(self._config)
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 3b7d618b60..937664b116 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -19,7 +19,6 @@ from __future__ import division
 from __future__ import print_function
 
 import collections
-import copy
 import json
 import os
 
@@ -32,6 +31,9 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import server_lib
 
 
+# A list of the property names in RunConfig user allows to change. They will
+# not affect the execution framework, so when execution framework checks the
+# `uid` of the RunConfig, it should be ingored.
 _DEFAULT_UID_WHITE_LIST = [
     'tf_random_seed',
     'save_summary_steps',
@@ -300,7 +302,14 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     """Returns a new instance of `RunConfig` replacing specified properties.
 
     Only the properties in the following list are allowed to be replaced:
-      - `model_dir`.
+      - `model_dir`,
+      - `tf_random_seed`,
+      - `save_summary_steps`,
+      - `save_checkpoints_steps`,
+      - `save_checkpoints_secs`,
+      - `session_config`,
+      - `keep_checkpoint_max`,
+      - `keep_checkpoint_every_n_hours`,
 
     Args:
       **kwargs: keyword named properties with new values.
@@ -312,18 +321,11 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     Returns:
       a new instance of `RunConfig`.
     """
-
-    new_copy = copy.deepcopy(self)
-
-    # TODO(b/33295821): Allow more fields to be replaced.
-    for key, new_value in six.iteritems(kwargs):
-      if key == 'model_dir':
-        new_copy._model_dir = new_value  # pylint: disable=protected-access
-        continue
-
-      raise ValueError('{} is not supported by RunConfig replace'.format(key))
-
-    return new_copy
+    # In addition to the _DEFAULT_UID_WHITE_LIST, also allow model_dir to be
+    # replaced, as most execution frameworks change it.
+    return super(RunConfig, self)._replace(
+        allowed_properties_list=['model_dir'] + _DEFAULT_UID_WHITE_LIST,
+        **kwargs)
 
   @experimental
   def uid(self, whitelist=None):
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index 9102e42bfb..f7a7a7bd03 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -28,6 +28,7 @@ from tensorflow.python.training import server_lib
 
 TEST_DIR = "test_dir"
 ANOTHER_TEST_DIR = "another_test_dir"
+MASTER = "master_"
 RANDOM_SEED = 123
 
 patch = test.mock.patch
@@ -253,13 +254,31 @@ class RunConfigTest(test.TestCase):
     new_config = config.replace(model_dir=ANOTHER_TEST_DIR)
     self.assertEqual(ANOTHER_TEST_DIR, new_config.model_dir)
     self.assertEqual(RANDOM_SEED, new_config.tf_random_seed)
-
-    self.assertEqual(TEST_DIR, config.model_dir)
     self.assertEqual(RANDOM_SEED, config.tf_random_seed)
 
+  def test_replace_with_allowed_properties(self):
+    config = run_config_lib.RunConfig().replace(
+        tf_random_seed=11,
+        save_summary_steps=12,
+        save_checkpoints_steps=13,
+        save_checkpoints_secs=14,
+        session_config=15,
+        keep_checkpoint_max=16,
+        keep_checkpoint_every_n_hours=17)
+    self.assertEqual(11, config.tf_random_seed)
+    self.assertEqual(12, config.save_summary_steps)
+    self.assertEqual(13, config.save_checkpoints_steps)
+    self.assertEqual(14, config.save_checkpoints_secs)
+    self.assertEqual(15, config.session_config)
+    self.assertEqual(16, config.keep_checkpoint_max)
+    self.assertEqual(17, config.keep_checkpoint_every_n_hours)
+
+  def test_replace_with_disallowallowed_properties(self):
+    config = run_config_lib.RunConfig(
+        tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
     with self.assertRaises(ValueError):
       # tf_random_seed is not allowed to be replaced.
-      config.replace(tf_random_seed=RANDOM_SEED)
+      config.replace(master=MASTER)
 
     with self.assertRaises(ValueError):
       config.replace(some_undefined_property=RANDOM_SEED)
diff --git a/tensorflow/python/estimator/BUILD b/tensorflow/python/estimator/BUILD
index 52194973d2..cf76f8598b 100644
--- a/tensorflow/python/estimator/BUILD
+++ b/tensorflow/python/estimator/BUILD
@@ -73,6 +73,17 @@ py_library(
     srcs_version = "PY2AND3",
 )
 
+py_test(
+    name = "run_config_test",
+    size = "small",
+    srcs = ["run_config_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":run_config",
+        "//tensorflow/python:client_testlib",
+    ],
+)
+
 py_library(
     name = "estimator",
     srcs = [
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index c394315cfa..c97efc127a 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -157,6 +157,8 @@ class Estimator(object):
       self._model_dir = tempfile.mkdtemp()
       logging.warning('Using temporary folder as model directory: %s',
                       self._model_dir)
+    if self._config.model_dir is None:
+      self._config = self._config.replace(model_dir=self._model_dir)
     logging.info('Using config: %s', str(vars(self._config)))
 
     if self._config.session_config is None:
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 5d9913d734..5c8c3a2626 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -152,8 +152,10 @@ class EstimatorConstructorTest(test.TestCase):
     def model_fn(features, labels):
       _, _ = features, labels
 
-    est = estimator.Estimator(model_fn=model_fn)
-    self.assertTrue(est.model_dir is not None)
+    with test.mock.patch.object(tempfile, 'mkdtemp', return_value=_TMP_DIR):
+      est = estimator.Estimator(model_fn=model_fn)
+      self.assertEqual(_TMP_DIR, est.config.model_dir)
+      self.assertEqual(_TMP_DIR, est.model_dir)
 
   def test_model_dir_in_constructor(self):
 
@@ -161,6 +163,7 @@ class EstimatorConstructorTest(test.TestCase):
       _, _ = features, labels
 
     est = estimator.Estimator(model_fn=model_fn, model_dir=_TMP_DIR)
+    self.assertEqual(_TMP_DIR, est.config.model_dir)
     self.assertEqual(_TMP_DIR, est.model_dir)
 
   def test_model_dir_in_run_config(self):
@@ -175,6 +178,7 @@ class EstimatorConstructorTest(test.TestCase):
       _, _ = features, labels
 
     est = estimator.Estimator(model_fn=model_fn, config=FakeConfig())
+    self.assertEqual(_TMP_DIR, est.config.model_dir)
     self.assertEqual(_TMP_DIR, est.model_dir)
 
   def test_same_model_dir_in_constructor_and_run_config(self):
@@ -190,6 +194,7 @@ class EstimatorConstructorTest(test.TestCase):
 
     est = estimator.Estimator(
         model_fn=model_fn, config=FakeConfig(), model_dir=_TMP_DIR)
+    self.assertEqual(_TMP_DIR, est.config.model_dir)
     self.assertEqual(_TMP_DIR, est.model_dir)
 
   def test_different_model_dir_in_constructor_and_run_config(self):
diff --git a/tensorflow/python/estimator/run_config.py b/tensorflow/python/estimator/run_config.py
index 504bf5c3fe..2b6237643d 100644
--- a/tensorflow/python/estimator/run_config.py
+++ b/tensorflow/python/estimator/run_config.py
@@ -18,6 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import copy
+
+import six
+
 
 class TaskType(object):
   MASTER = 'master'
@@ -28,6 +32,9 @@ class TaskType(object):
 class RunConfig(object):
   """This class specifies the configurations for an `Estimator` run."""
 
+  def __init__(self):
+    self._model_dir = None
+
   @property
   def cluster_spec(self):
     return None
@@ -90,4 +97,55 @@ class RunConfig(object):
 
   @property
   def model_dir(self):
-    return None
+    return self._model_dir
+
+  def replace(self, **kwargs):
+    """Returns a new instance of `RunConfig` replacing specified properties.
+
+    Only the properties in the following list are allowed to be replaced:
+      - `model_dir`.
+
+    Args:
+      **kwargs: keyword named properties with new values.
+
+    Raises:
+      ValueError: If any property name in `kwargs` does not exist or is not
+        allowed to be replaced.
+
+    Returns:
+      a new instance of `RunConfig`.
+    """
+    return self._replace(allowed_properties_list=['model_dir'], **kwargs)
+
+  def _replace(self, allowed_properties_list=None, **kwargs):
+    """See `replace`.
+
+    N.B.: This implementation assumes that for key named "foo", the underlying
+    property the RunConfig holds is "_foo" (with one leading underscore).
+
+    Args:
+      allowed_properties_list: The property name list allowed to be replaced.
+      **kwargs: keyword named properties with new values.
+
+    Raises:
+      ValueError: If any property name in `kwargs` does not exist or is not
+        allowed to be replaced.
+
+    Returns:
+      a new instance of `RunConfig`.
+    """
+
+    new_copy = copy.deepcopy(self)
+
+    allowed_properties_list = allowed_properties_list or []
+
+    for key, new_value in six.iteritems(kwargs):
+      if key in allowed_properties_list:
+        setattr(new_copy, '_' + key, new_value)
+        continue
+
+      raise ValueError(
+          'Replacing {} is not supported. Allowed properties are {}.'.format(
+              key, allowed_properties_list))
+
+    return new_copy
diff --git a/tensorflow/python/estimator/run_config_test.py b/tensorflow/python/estimator/run_config_test.py
new file mode 100644
index 0000000000..3f83ae0c34
--- /dev/null
+++ b/tensorflow/python/estimator/run_config_test.py
@@ -0,0 +1,52 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""RunConfig tests."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.estimator import run_config as run_config_lib
+from tensorflow.python.platform import test
+
+_TEST_DIR = 'test_dir'
+_MASTER = 'master_'
+_NOT_SUPPORTED_REPLACE_PROPERTY_MSG = 'Replacing .*is not supported'
+
+
+class RunConfigTest(test.TestCase):
+
+  def test_model_dir(self):
+    empty_config = run_config_lib.RunConfig()
+    self.assertIsNone(empty_config.model_dir)
+
+    new_config = empty_config.replace(model_dir=_TEST_DIR)
+    self.assertEqual(_TEST_DIR, new_config.model_dir)
+
+  def test_replace(self):
+    config = run_config_lib.RunConfig()
+
+    with self.assertRaisesRegexp(
+        ValueError, _NOT_SUPPORTED_REPLACE_PROPERTY_MSG):
+      # master is not allowed to be replaced.
+      config.replace(master=_MASTER)
+
+    with self.assertRaisesRegexp(
+        ValueError, _NOT_SUPPORTED_REPLACE_PROPERTY_MSG):
+      config.replace(some_undefined_property=_MASTER)
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 7baddf301c..ff4222032d 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -241,7 +241,7 @@ def tf_gen_op_wrapper_cc(name,
 #            hdrs = [ "ops/array_ops_internal.h",
 #                     "ops/math_ops_internal.h" ],
 #            deps = [ ... ])
-# TODO(josh11b): Cleaner approach for hidden ops.
+# TODO(joshl): Cleaner approach for hidden ops.
 def tf_gen_op_wrappers_cc(name,
                           op_lib_names=[],
                           other_srcs=[],
diff --git a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
index 32082fc10b..d69c475a31 100644
--- a/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.estimator.-run-config.pbtxt
@@ -68,5 +68,10 @@ tf_class {
   }
   member_method {
     name: "__init__"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "replace"
+    argspec: "args=[\'self\'], varargs=None, keywords=kwargs, defaults=None"
   }
 }
diff --git a/tensorflow/tools/ci_build/linux/cmake/run.sh b/tensorflow/tools/ci_build/linux/cmake/run.sh
old mode 100644
new mode 100755
diff --git a/third_party/jpeg.BUILD b/third_party/jpeg.BUILD
deleted file mode 100644
index cbc1e86e51..0000000000
--- a/third_party/jpeg.BUILD
+++ /dev/null
@@ -1,416 +0,0 @@
-# Description:
-#   libjpeg-turbo is a drop in replacement for jpeglib optimized with SIMD.
-
-licenses(["notice"])  # custom notice-style license, see LICENSE.md
-
-exports_files(["LICENSE.md"])
-
-libjpegturbo_nocopts = "-[W]error"
-
-libjpegturbo_copts = select({
-    ":android": [
-        "-O2",
-        "-fPIE",
-        "-w",
-    ],
-    ":windows": [
-        "/Ox",
-        "/w14711",  # function 'function' selected for inline expansion
-        "/w14710",  # 'function' : function not inlined
-    ],
-    "//conditions:default": [
-        "-O3",
-        "-w",
-    ],
-}) + select({
-    ":armeabi-v7a": [
-        "-D__ARM_NEON__",
-        "-march=armv7-a",
-        "-mfloat-abi=softfp",
-        "-fprefetch-loop-arrays",
-    ],
-    "//conditions:default": [],
-})
-
-cc_library(
-    name = "jpeg",
-    srcs = [
-        "jaricom.c",
-        "jcapimin.c",
-        "jcapistd.c",
-        "jcarith.c",
-        "jccoefct.c",
-        "jccolor.c",
-        "jcdctmgr.c",
-        "jchuff.c",
-        "jchuff.h",
-        "jcinit.c",
-        "jcmainct.c",
-        "jcmarker.c",
-        "jcmaster.c",
-        "jcomapi.c",
-        "jconfig.h",
-        "jconfigint.h",
-        "jcparam.c",
-        "jcphuff.c",
-        "jcprepct.c",
-        "jcsample.c",
-        "jctrans.c",
-        "jdapimin.c",
-        "jdapistd.c",
-        "jdarith.c",
-        "jdatadst.c",
-        "jdatasrc.c",
-        "jdcoefct.c",
-        "jdcoefct.h",
-        "jdcolor.c",
-        "jdct.h",
-        "jddctmgr.c",
-        "jdhuff.c",
-        "jdhuff.h",
-        "jdinput.c",
-        "jdmainct.c",
-        "jdmainct.h",
-        "jdmarker.c",
-        "jdmaster.c",
-        "jdmaster.h",
-        "jdmerge.c",
-        "jdphuff.c",
-        "jdpostct.c",
-        "jdsample.c",
-        "jdsample.h",
-        "jdtrans.c",
-        "jerror.c",
-        "jfdctflt.c",
-        "jfdctfst.c",
-        "jfdctint.c",
-        "jidctflt.c",
-        "jidctfst.c",
-        "jidctint.c",
-        "jidctred.c",
-        "jinclude.h",
-        "jmemmgr.c",
-        "jmemnobs.c",
-        "jmemsys.h",
-        "jpeg_nbits_table.h",
-        "jpegcomp.h",
-        "jquant1.c",
-        "jquant2.c",
-        "jutils.c",
-        "jversion.h",
-    ],
-    hdrs = [
-        "jccolext.c",  # should have been named .inc
-        "jdcol565.c",  # should have been named .inc
-        "jdcolext.c",  # should have been named .inc
-        "jdmrg565.c",  # should have been named .inc
-        "jdmrgext.c",  # should have been named .inc
-        "jerror.h",
-        "jmorecfg.h",
-        "jpegint.h",
-        "jpeglib.h",
-        "jstdhuff.c",  # should have been named .inc
-    ],
-    copts = libjpegturbo_copts,
-    nocopts = libjpegturbo_nocopts,
-    visibility = ["//visibility:public"],
-    deps = select({
-        ":k8": [":simd_x86_64"],
-        ":armeabi-v7a": [":simd_armv7a"],
-        ":arm64-v8a": [":simd_armv8a"],
-        "//conditions:default": [":simd_none"],
-    }),
-)
-
-cc_library(
-    name = "simd_x86_64",
-    srcs = [
-        "jchuff.h",
-        "jconfig.h",
-        "jdct.h",
-        "jerror.h",
-        "jinclude.h",
-        "jmorecfg.h",
-        "jpegint.h",
-        "jpeglib.h",
-        "jsimd.h",
-        "jsimddct.h",
-        "simd/jccolor-sse2-64.o",
-        "simd/jcgray-sse2-64.o",
-        "simd/jchuff-sse2-64.o",
-        "simd/jcsample-sse2-64.o",
-        "simd/jdcolor-sse2-64.o",
-        "simd/jdmerge-sse2-64.o",
-        "simd/jdsample-sse2-64.o",
-        "simd/jfdctflt-sse-64.o",
-        "simd/jfdctfst-sse2-64.o",
-        "simd/jfdctint-sse2-64.o",
-        "simd/jidctflt-sse2-64.o",
-        "simd/jidctfst-sse2-64.o",
-        "simd/jidctint-sse2-64.o",
-        "simd/jidctred-sse2-64.o",
-        "simd/jquantf-sse2-64.o",
-        "simd/jquanti-sse2-64.o",
-        "simd/jsimd.h",
-        "simd/jsimd_x86_64.c",
-    ],
-    copts = libjpegturbo_copts,
-    linkstatic = 1,
-    nocopts = libjpegturbo_nocopts,
-)
-
-genrule(
-    name = "simd_x86_64_assemblage23",
-    srcs = [
-        "simd/jccolext-sse2-64.asm",
-        "simd/jccolor-sse2-64.asm",
-        "simd/jcgray-sse2-64.asm",
-        "simd/jcgryext-sse2-64.asm",
-        "simd/jchuff-sse2-64.asm",
-        "simd/jcolsamp.inc",
-        "simd/jcsample-sse2-64.asm",
-        "simd/jdcolext-sse2-64.asm",
-        "simd/jdcolor-sse2-64.asm",
-        "simd/jdct.inc",
-        "simd/jdmerge-sse2-64.asm",
-        "simd/jdmrgext-sse2-64.asm",
-        "simd/jdsample-sse2-64.asm",
-        "simd/jfdctflt-sse-64.asm",
-        "simd/jfdctfst-sse2-64.asm",
-        "simd/jfdctint-sse2-64.asm",
-        "simd/jidctflt-sse2-64.asm",
-        "simd/jidctfst-sse2-64.asm",
-        "simd/jidctint-sse2-64.asm",
-        "simd/jidctred-sse2-64.asm",
-        "simd/jpeg_nbits_table.inc",
-        "simd/jquantf-sse2-64.asm",
-        "simd/jquanti-sse2-64.asm",
-        "simd/jsimdcfg.inc",
-        "simd/jsimdext.inc",
-    ],
-    outs = [
-        "simd/jccolor-sse2-64.o",
-        "simd/jcgray-sse2-64.o",
-        "simd/jchuff-sse2-64.o",
-        "simd/jcsample-sse2-64.o",
-        "simd/jdcolor-sse2-64.o",
-        "simd/jdmerge-sse2-64.o",
-        "simd/jdsample-sse2-64.o",
-        "simd/jfdctflt-sse-64.o",
-        "simd/jfdctfst-sse2-64.o",
-        "simd/jfdctint-sse2-64.o",
-        "simd/jidctflt-sse2-64.o",
-        "simd/jidctfst-sse2-64.o",
-        "simd/jidctint-sse2-64.o",
-        "simd/jidctred-sse2-64.o",
-        "simd/jquantf-sse2-64.o",
-        "simd/jquanti-sse2-64.o",
-    ],
-    cmd = "for out in $(OUTS); do\n" +
-          "  $(location @nasm//:nasm) -f elf64" +
-          "    -DELF -DPIC -DRGBX_FILLER_0XFF -D__x86_64__ -DARCH_X86_64" +
-          "    -I $$(dirname $(location simd/jdct.inc))/" +
-          "    -I $$(dirname $(location simd/jsimdcfg.inc))/" +
-          "    -o $$out" +
-          "    $$(dirname $(location simd/jdct.inc))/$$(basename $${out%.o}.asm)\n" +
-          "done",
-    tools = ["@nasm//:nasm"],
-)
-
-cc_library(
-    name = "simd_armv7a",
-    srcs = [
-        "jchuff.h",
-        "jconfig.h",
-        "jdct.h",
-        "jinclude.h",
-        "jmorecfg.h",
-        "jpeglib.h",
-        "jsimd.h",
-        "jsimddct.h",
-        "simd/jsimd.h",
-        "simd/jsimd_arm.c",
-        "simd/jsimd_arm_neon.S",
-    ],
-    copts = libjpegturbo_copts,
-    nocopts = libjpegturbo_nocopts,
-)
-
-cc_library(
-    name = "simd_armv8a",
-    srcs = [
-        "jchuff.h",
-        "jconfig.h",
-        "jdct.h",
-        "jinclude.h",
-        "jmorecfg.h",
-        "jpeglib.h",
-        "jsimd.h",
-        "jsimddct.h",
-        "simd/jsimd.h",
-        "simd/jsimd_arm64.c",
-        "simd/jsimd_arm64_neon.S",
-    ],
-    copts = libjpegturbo_copts,
-    nocopts = libjpegturbo_nocopts,
-)
-
-cc_library(
-    name = "simd_none",
-    srcs = [
-        "jchuff.h",
-        "jconfig.h",
-        "jdct.h",
-        "jerror.h",
-        "jinclude.h",
-        "jmorecfg.h",
-        "jpegint.h",
-        "jpeglib.h",
-        "jsimd.h",
-        "jsimd_none.c",
-        "jsimddct.h",
-    ],
-    copts = libjpegturbo_copts,
-    nocopts = libjpegturbo_nocopts,
-)
-
-genrule(
-    name = "configure",
-    outs = ["jconfig.h"],
-    cmd = "cat <<'EOF' >$@\n" +
-          "#define JPEG_LIB_VERSION 62\n" +
-          "#define LIBJPEG_TURBO_VERSION 1.5.1\n" +
-          "#define LIBJPEG_TURBO_VERSION_NUMBER 1005001\n" +
-          "#define C_ARITH_CODING_SUPPORTED 1\n" +
-          "#define D_ARITH_CODING_SUPPORTED 1\n" +
-          "#define BITS_IN_JSAMPLE 8\n" +
-          "#define HAVE_LOCALE_H 1\n" +
-          "#define HAVE_STDDEF_H 1\n" +
-          "#define HAVE_STDLIB_H 1\n" +
-          "#define HAVE_UNSIGNED_CHAR 1\n" +
-          "#define HAVE_UNSIGNED_SHORT 1\n" +
-          "#define MEM_SRCDST_SUPPORTED 1\n" +
-          "#define NEED_SYS_TYPES_H 1\n" +
-          select({
-              ":k8": "#define WITH_SIMD 1\n",
-              ":armeabi-v7a": "#define WITH_SIMD 1\n",
-              ":arm64-v8a": "#define WITH_SIMD 1\n",
-              "//conditions:default": "",
-          }) +
-          "EOF",
-)
-
-genrule(
-    name = "configure_internal",
-    outs = ["jconfigint.h"],
-    cmd = "cat <<'EOF' >$@\n" +
-          "#define BUILD \"20161115\"\n" +
-          "#ifdef _MSC_VER  /* Windows */\n" +
-          "#define INLINE __inline\n" +
-          "#else\n" +
-          "#define INLINE inline __attribute__((always_inline))\n" +
-          "#endif\n" +
-          "#define PACKAGE_NAME \"libjpeg-turbo\"\n" +
-          "#define VERSION \"1.5.1\"\n" +
-          "#if (__WORDSIZE==64 && !defined(__native_client__)) || defined(_WIN64)\n" +
-          "#define SIZEOF_SIZE_T 8\n" +
-          "#else\n" +
-          "#define SIZEOF_SIZE_T 4\n" +
-          "#endif\n" +
-          "EOF",
-)
-
-# jiminy cricket the way this file is generated is completely outrageous
-genrule(
-    name = "configure_simd",
-    outs = ["simd/jsimdcfg.inc"],
-    cmd = "cat <<'EOF' >$@\n" +
-          "%define DCTSIZE 8\n" +
-          "%define DCTSIZE2 64\n" +
-          "%define RGB_RED 0\n" +
-          "%define RGB_GREEN 1\n" +
-          "%define RGB_BLUE 2\n" +
-          "%define RGB_PIXELSIZE 3\n" +
-          "%define EXT_RGB_RED 0\n" +
-          "%define EXT_RGB_GREEN 1\n" +
-          "%define EXT_RGB_BLUE 2\n" +
-          "%define EXT_RGB_PIXELSIZE 3\n" +
-          "%define EXT_RGBX_RED 0\n" +
-          "%define EXT_RGBX_GREEN 1\n" +
-          "%define EXT_RGBX_BLUE 2\n" +
-          "%define EXT_RGBX_PIXELSIZE 4\n" +
-          "%define EXT_BGR_RED 2\n" +
-          "%define EXT_BGR_GREEN 1\n" +
-          "%define EXT_BGR_BLUE 0\n" +
-          "%define EXT_BGR_PIXELSIZE 3\n" +
-          "%define EXT_BGRX_RED 2\n" +
-          "%define EXT_BGRX_GREEN 1\n" +
-          "%define EXT_BGRX_BLUE 0\n" +
-          "%define EXT_BGRX_PIXELSIZE 4\n" +
-          "%define EXT_XBGR_RED 3\n" +
-          "%define EXT_XBGR_GREEN 2\n" +
-          "%define EXT_XBGR_BLUE 1\n" +
-          "%define EXT_XBGR_PIXELSIZE 4\n" +
-          "%define EXT_XRGB_RED 1\n" +
-          "%define EXT_XRGB_GREEN 2\n" +
-          "%define EXT_XRGB_BLUE 3\n" +
-          "%define EXT_XRGB_PIXELSIZE 4\n" +
-          "%define RGBX_FILLER_0XFF 1\n" +
-          "%define JSAMPLE byte ; unsigned char\n" +
-          "%define SIZEOF_JSAMPLE SIZEOF_BYTE ; sizeof(JSAMPLE)\n" +
-          "%define CENTERJSAMPLE 128\n" +
-          "%define JCOEF word ; short\n" +
-          "%define SIZEOF_JCOEF SIZEOF_WORD ; sizeof(JCOEF)\n" +
-          "%define JDIMENSION dword ; unsigned int\n" +
-          "%define SIZEOF_JDIMENSION SIZEOF_DWORD ; sizeof(JDIMENSION)\n" +
-          "%define JSAMPROW POINTER ; JSAMPLE * (jpeglib.h)\n" +
-          "%define JSAMPARRAY POINTER ; JSAMPROW * (jpeglib.h)\n" +
-          "%define JSAMPIMAGE POINTER ; JSAMPARRAY * (jpeglib.h)\n" +
-          "%define JCOEFPTR POINTER ; JCOEF * (jpeglib.h)\n" +
-          "%define SIZEOF_JSAMPROW SIZEOF_POINTER ; sizeof(JSAMPROW)\n" +
-          "%define SIZEOF_JSAMPARRAY SIZEOF_POINTER ; sizeof(JSAMPARRAY)\n" +
-          "%define SIZEOF_JSAMPIMAGE SIZEOF_POINTER ; sizeof(JSAMPIMAGE)\n" +
-          "%define SIZEOF_JCOEFPTR SIZEOF_POINTER ; sizeof(JCOEFPTR)\n" +
-          "%define DCTELEM word ; short\n" +
-          "%define SIZEOF_DCTELEM SIZEOF_WORD ; sizeof(DCTELEM)\n" +
-          "%define float FP32 ; float\n" +
-          "%define SIZEOF_FAST_FLOAT SIZEOF_FP32 ; sizeof(float)\n" +
-          "%define ISLOW_MULT_TYPE word ; must be short\n" +
-          "%define SIZEOF_ISLOW_MULT_TYPE SIZEOF_WORD ; sizeof(ISLOW_MULT_TYPE)\n" +
-          "%define IFAST_MULT_TYPE word ; must be short\n" +
-          "%define SIZEOF_IFAST_MULT_TYPE SIZEOF_WORD ; sizeof(IFAST_MULT_TYPE)\n" +
-          "%define IFAST_SCALE_BITS 2 ; fractional bits in scale factors\n" +
-          "%define FLOAT_MULT_TYPE FP32 ; must be float\n" +
-          "%define SIZEOF_FLOAT_MULT_TYPE SIZEOF_FP32 ; sizeof(FLOAT_MULT_TYPE)\n" +
-          "%define JSIMD_NONE 0x00\n" +
-          "%define JSIMD_MMX 0x01\n" +
-          "%define JSIMD_3DNOW 0x02\n" +
-          "%define JSIMD_SSE 0x04\n" +
-          "%define JSIMD_SSE2 0x08\n" +
-          "EOF",
-)
-
-config_setting(
-    name = "k8",
-    values = {"cpu": "k8"},
-)
-
-config_setting(
-    name = "android",
-    values = {"crosstool_top": "//external:android/crosstool"},
-)
-
-config_setting(
-    name = "armeabi-v7a",
-    values = {"android_cpu": "armeabi-v7a"},
-)
-
-config_setting(
-    name = "arm64-v8a",
-    values = {"android_cpu": "arm64-v8a"},
-)
-
-config_setting(
-    name = "windows",
-    values = {"cpu": "x64_windows_msvc"},
-)
diff --git a/third_party/sycl/sycl/LICENSE.text.tpl b/third_party/sycl/sycl/LICENSE.text.tpl
deleted file mode 100644
index 0c2955c4d7..0000000000
--- a/third_party/sycl/sycl/LICENSE.text.tpl
+++ /dev/null
@@ -1,268 +0,0 @@
-
----------------------------------------------------------------------
-
-SOFTWARE LICENSE AGREEMENT
-
----------------------------------------------------------------------
----------------------------------------------------------------------
-
-By downloading, installing, copying, or otherwise using the
-ComputeCpp Community Edition software, including any associated
-components, media, printed materials, and electronic documentation
-("Software"), the user agrees to the following terms and conditions
-of this Software License Agreement ("Agreement"). Please read the
-terms of this Agreement carefully before beginning your download, as
-pressing the "I AGREE" button at the end of this Agreement will
-confirm your assent. If you do not agree to these terms, then
-Codeplay Software Limited is unwilling to license the Software to
-you; so please press the "CANCEL" button to cancel your download.
-
- 1. License. Codeplay Software Ltd., a company incorporated in
-    England and Wales with registered number 04567874 and having its
-    registered office at Regent House, 316 Beulah Hill, London,
-    United Kingdom, SE19 3HF ("Codeplay") hereby grants the user,
-    free of charge, a non-exclusive worldwide license to use and
-    replicate (but not modify) the Software for any use, whether
-    commercial or non-commercial, in accordance with this Agreement.
-    Codeplay reserves all rights to the Software that are not
-    expressly granted by this Agreement.
- 2. Redistribution. The user may copy and redistribute unmodified
-    copies of only those components of the Software which are
-    specified below ("Redistributable Components"), in object code
-    form, as part of the user’s software applications or libraries
-    ("Applications"). The user acknowledges and agrees that it has no
-    right to modify the Redistributable Components in any way. Any
-    use of the Redistributable Components within the user’s
-    Applications will continue to be subject to the terms and
-    conditions of this Agreement, and the user must also distribute a
-    copy of this Agreement and reproduce and include all notices of
-    copyrights or other proprietary rights in the Software. The
-    user’s redistribution of the Redistributable Components will not
-    entitle it to any payment from Codeplay. The user may not
-    transfer any of its rights or obligations under this Agreement.
-
-+-------------------------------------------+
-|Redistributable Component|File Name        |
-|-------------------------+-----------------|
-|Runtime (for Linux)      |libComputeCpp.so |
-|-------------------------+-----------------|
-|Runtime (for Windows)    |libComputeCpp.dll|
-+-------------------------------------------+
-
- 3. Restrictions. The user shall not:
-
-     a. circumvent or bypass any technological protection measures in
-        or relating to the Software;
-     b. use the Software to perform any unauthorized transfer of
-        information or for any illegal purpose;
-     c. de-compile, decrypt, disassemble, hack, emulate, exploit or
-        reverse-engineer the Software (other than to the limited
-        extent permitted by law);
-     d. copy or redistribute any components of the Software that are
-        not listed in the table of Redistributable Components;
-     e. publish, rent, lease, sell, export, import, or lend the
-        Software;
-     f. represent in any way that it is selling the Software itself
-        or any license to use the Software, nor refer to Codeplay or
-        ComputeCpp within its marketing materials, without the
-        express prior written permission of Codeplay.
- 4. Support. Codeplay does not provide any guarantees of support for
-    the Software to the user. Codeplay will use reasonable endeavours
-    to respond to users' support requests, for the most recent
-    release only, via the community support website at https://
-    computecpp.codeplay.com.
- 5. Intellectual Property. The Software is owned by Codeplay or its
-    licensors, and is protected by the copyright laws of the United
-    Kingdom and other countries and international treaty provisions.
-    Codeplay (and/or its licensors, as the case may be) retains all
-    copyrights, trade secrets and other proprietary rights in the
-    Software, including the rights to make and license the use of all
-    copies. To the extent that any patents owned by Codeplay or its
-    licensors relate to any component of the Software, the licence
-    granted to the user in accordance with this Agreement allows for
-    the lawful use of such patents but only for the purposes of this
-    Agreement and not further or otherwise. Therefore, the user may
-    make no copies of the Software, or the written materials that
-    accompany the Software, or reproduce it in any way, except as set
-    forth above.
- 6. Terms. This Agreement is effective until terminated. Codeplay or
-    the user may terminate it immediately at any time. Any violation
-    of the terms of this Agreement by the user will result in
-    immediate termination by Codeplay. Upon termination, the user
-    must return or destroy the Software and accompanying materials
-    and notify Codeplay of its actions by email to info@codeplay.com.
- 7. NO WARRANTIES. Codeplay expressly disclaims any warranty for the
-    Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-    ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-    WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
-    AND NON-INFRINGEMENT. IN NO EVENT SHALL CODEPLAY BE LIABLE FOR
-    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-    CONTRACT, DELICT OR TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE. In particular, Codeplay provides no guarantees of
-    application performance on the target hardware.
- 8. General. The invalidity of any portion or provision of this
-    Agreement shall not affect any other portions or provisions. This
-    Agreement shall be governed by the laws of Scotland. This
-    Agreement is the complete and exclusive agreement between the
-    user and Codeplay regarding the Software, and it supersedes any
-    prior agreement, oral or written, and any other communication
-    between the user and Codeplay relating to the subject matter of
-    the Agreement. Any amendment or modification of this Agreement
-    must be in writing and signed by both parties. If the user does
-    not agree to the terms of this Agreement, the user must not
-    install or use the Software.
- 9. Third Party Licenses. The following licenses are for third-party
-    components included in the software.
-
-     a. License for Clang/LLVM compiler technology components:
-
-==============================================================================
-
-LLVM Release License
-
-==============================================================================
-
-University of Illinois/NCSA
-
-Open Source License
-
-Copyright (c) 2007-2014 University of Illinois at Urbana-Champaign.
-
-All rights reserved.
-
-Developed by:
-
- LLVM Team
-
- University of Illinois at Urbana-Champaign
-
- http://llvm.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal with
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimers.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimers in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the names of the LLVM Team, University of Illinois at
- Urbana-Champaign, nor the names of its contributors may be used to
- endorse or promote products derived from this Software without specific
- prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-SOFTWARE.
-
-==============================================================================
-
- b. License for OpenBSD regex components:
-
-$OpenBSD: COPYRIGHT,v 1.3 2003/06/02 20:18:36 millert Exp $
-Copyright 1992, 1993, 1994 Henry Spencer. All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
- software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission. Since few users ever read sources,
- credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
- misrepresented as being the original software. Since few users
- ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-/*-
- * Copyright (c) 1994
- *      The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *                  @(#)COPYRIGHT8.1 (Berkeley) 3/16/94
- */
-
- c. License for MD5 components:
-
-/*
- * This code is derived from (original license follows):
- *
- * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
- * MD5 Message-Digest Algorithm (RFC 1321).
- *
- * Homepage:
- *  http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
- *
- * Author:
- * Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
- *
- * This software was written by Alexander Peslyak in 2001. No copyright is
- * claimed, and the software is hereby placed in the public domain.
- * In case this attempt to disclaim copyright and place the software in the
- * public domain is deemed null and void, then the software is
- * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * (This is a heavily cut-down "BSD license".)
- *
- * This differs from Colin Plumb's older public domain implementation in that
- * no exactly 32-bit integer data type is required (any 32-bit or wider
- * unsigned integer data type will do), there's no compile-time endianness
- * configuration, and the function prototypes match OpenSSL's. No code from
- * Colin Plumb's implementation has been reused; this comment merely compares
- * the properties of the two independent implementations.
- *
- * The primary goals of this implementation are portability and ease of use.
- * It is meant to be fast, but not as fast as possible. Some known
- * optimizations are not included to reduce source code size and avoid
- * compile-time configuration.
- */
-
-
-- 
GitLab


From e884e63f66d9d5c80df4a801dd94300aefbe7127 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 11:18:56 -0700
Subject: [PATCH 1108/1563] Add mac testing script.

PiperOrigin-RevId: 155402284
---
 .../tools/ci_build/osx/cpu/run_py2_cc_core.sh | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100755 tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh

diff --git a/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh b/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
new file mode 100755
index 0000000000..97df3c5e61
--- /dev/null
+++ b/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ==============================================================================
+
+set -e
+set -x
+
+N_JOBS=$(sysctl -n hw.ncpu)
+N_JOBS=$((N_JOBS+1))
+
+echo ""
+echo "Bazel will use ${N_JOBS} concurrent job(s)."
+echo ""
+
+# Run configure.
+export TF_NEED_GCP=0
+export TF_NEED_HDFS=0
+export TF_NEED_CUDA=0
+export PYTHON_BIN_PATH=$(which python2)
+yes "" | ./configure
+which bazel
+bazel test --test_tag_filters=-gpu,-benchmark-test \
+    --test_timeout 300,450,1200,3600 \
+    --test_size_filters=small,medium \
+    --jobs=${N_JOBS} --build_tests_only --test_output=errors -k -- \
+    //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/... \
+    -//tensorflow/tensorboard/...
-- 
GitLab


From 1244c8fdda9efb11a5386dce40fbb885f0df190b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 11:39:22 -0700
Subject: [PATCH 1109/1563] This is to add the tf.contrib.image.bipartite_match
 op. It can find bipartite matching based on a given distance matrix. A greedy
 bi-partite matching alogrithm is used to obtain the matching with the
 (greedy) minimum distance.

PiperOrigin-RevId: 155405406
---
 tensorflow/contrib/image/BUILD                |   2 +
 tensorflow/contrib/image/__init__.py          |   1 +
 .../image/kernels/bipartite_match_op.cc       | 134 ++++++++++++++++++
 tensorflow/contrib/image/ops/image_ops.cc     |  41 ++++++
 .../python/kernel_tests/image_ops_test.py     |  60 ++++++++
 .../contrib/image/python/ops/image_ops.py     |  39 +++++
 6 files changed, 277 insertions(+)
 create mode 100644 tensorflow/contrib/image/kernels/bipartite_match_op.cc

diff --git a/tensorflow/contrib/image/BUILD b/tensorflow/contrib/image/BUILD
index 7599406aca..a095f0e048 100755
--- a/tensorflow/contrib/image/BUILD
+++ b/tensorflow/contrib/image/BUILD
@@ -20,6 +20,7 @@ load("//tensorflow:tensorflow.bzl", "tf_custom_op_py_library")
 tf_custom_op_library(
     name = "python/ops/_image_ops.so",
     srcs = [
+        "kernels/bipartite_match_op.cc",
         "kernels/image_ops.cc",
         "kernels/image_ops.h",
         "ops/image_ops.cc",
@@ -33,6 +34,7 @@ tf_custom_op_library(
 tf_kernel_library(
     name = "image_ops_kernels",
     srcs = [
+        "kernels/bipartite_match_op.cc",
         "kernels/image_ops.cc",
         "kernels/image_ops.h",
     ],
diff --git a/tensorflow/contrib/image/__init__.py b/tensorflow/contrib/image/__init__.py
index aa70d42339..fee1a6c2bc 100755
--- a/tensorflow/contrib/image/__init__.py
+++ b/tensorflow/contrib/image/__init__.py
@@ -25,6 +25,7 @@ projective transforms (including rotation) are supported.
 @@compose_transforms
 @@rotate
 @@transform
+@@bipartite_match
 @@single_image_random_dot_stereograms
 """
 from __future__ import absolute_import
diff --git a/tensorflow/contrib/image/kernels/bipartite_match_op.cc b/tensorflow/contrib/image/kernels/bipartite_match_op.cc
new file mode 100644
index 0000000000..7d207c388b
--- /dev/null
+++ b/tensorflow/contrib/image/kernels/bipartite_match_op.cc
@@ -0,0 +1,134 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include <queue>
+#include <vector>
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/types.h"
+
+namespace {
+
+struct DistancePair {
+  DistancePair(int i1, int i2, double d) : index1(i1), index2(i2), dist(d) {}
+
+  bool operator<(const DistancePair& b1) const { return b1.dist < dist; }
+
+  int index1, index2;
+  float dist;
+};
+
+}  // namespace
+
+namespace tensorflow {
+
+class BipartiteMatchOp : public OpKernel {
+ public:
+  explicit BipartiteMatchOp(OpKernelConstruction* context) : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("top_k", &top_k_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input_distance_mat = context->input(0);
+    OP_REQUIRES(context, input_distance_mat.dims() == 2,
+                errors::InvalidArgument(
+                    "distance_mat should be 2-dimensional, but got ",
+                    input_distance_mat.shape().DebugString()));
+    const int num_input_rows = input_distance_mat.dim_size(0);
+    const int num_input_columns = input_distance_mat.dim_size(1);
+
+    const Tensor& input_num_valid_rows = context->input(1);
+    OP_REQUIRES(
+        context, input_num_valid_rows.NumElements() == 1,
+        errors::InvalidArgument(
+            "num_valid_rows argument should be a tensor with 1 element, "
+            "but got ",
+            input_num_valid_rows.NumElements()));
+
+    const float num_valid_rows_f = input_num_valid_rows.flat<float>()(0);
+    int num_valid_rows = num_input_rows;
+    // If num_valid_rows_f is non-negative, use it to set num_valid_rows.
+    if (num_valid_rows_f >= 0) {
+      num_valid_rows = static_cast<int>(num_valid_rows_f + 0.1);
+    }
+    OP_REQUIRES(
+        context, num_input_rows >= num_valid_rows,
+        errors::InvalidArgument("There should be at least ", num_valid_rows,
+                                " rows in distance_mat, but only got ",
+                                num_input_rows, " rows."));
+
+    // If negative or zero then set it to the maximum possible matches.
+    auto valid_top_k = top_k_;
+
+    if (valid_top_k <= 0) {
+      valid_top_k = num_valid_rows * num_input_columns;
+    }
+
+    // Create output tensors.
+    Tensor* row_to_column_match_indices = nullptr;
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(0, TensorShape({num_input_rows}),
+                                            &row_to_column_match_indices));
+    Tensor* column_to_row_match_indices = nullptr;
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(1, TensorShape({num_input_columns}),
+                                            &column_to_row_match_indices));
+
+    typename TTypes<float, 2>::ConstTensor distance_mat =
+        input_distance_mat.shaped<float, 2>(
+            {num_input_rows, num_input_columns});
+
+    // Greedy bi-partite matching.
+    std::priority_queue<DistancePair> match_queue;
+
+    for (int index1 = 0; index1 < num_valid_rows; index1++) {
+      for (int index2 = 0; index2 < num_input_columns; index2++) {
+        match_queue.push(
+            DistancePair(index1, index2, distance_mat(index1, index2)));
+      }
+    }
+
+    std::vector<int> row_to_col_match_vec(num_input_rows, -1);
+    std::vector<int> col_to_row_match_vec(num_input_columns, -1);
+    int index = 0;
+    while (!match_queue.empty()) {
+      const auto& match = match_queue.top();
+      if (row_to_col_match_vec[match.index1] == -1 &&
+          col_to_row_match_vec[match.index2] == -1) {
+        row_to_col_match_vec[match.index1] = match.index2;
+        col_to_row_match_vec[match.index2] = match.index1;
+
+        index++;
+        if (index >= valid_top_k) {
+          break;
+        }
+      }
+      match_queue.pop();
+    }
+
+    // Set the output tensors.
+    row_to_column_match_indices->vec<int>() =
+        TTypes<int>::Vec(row_to_col_match_vec.data(), num_input_rows);
+    column_to_row_match_indices->vec<int>() =
+        TTypes<int>::Vec(col_to_row_match_vec.data(), num_input_columns);
+  }
+
+ private:
+  int top_k_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("BipartiteMatch").Device(DEVICE_CPU),
+                        BipartiteMatchOp);
+
+}  // namespace tensorflow
diff --git a/tensorflow/contrib/image/ops/image_ops.cc b/tensorflow/contrib/image/ops/image_ops.cc
index a6d3fa4b64..6b24eaf2a5 100644
--- a/tensorflow/contrib/image/ops/image_ops.cc
+++ b/tensorflow/contrib/image/ops/image_ops.cc
@@ -20,6 +20,7 @@ limitations under the License.
 namespace tensorflow {
 
 using shape_inference::InferenceContext;
+using shape_inference::ShapeHandle;
 
 // TODO(ringwalt): Add a "fill_mode" argument with "constant", "mirror", etc.
 // TODO(ringwalt): Add a "fill_constant" argument for constant mode (default 0).
@@ -59,4 +60,44 @@ transformed_images: 4D `Tensor`, image(s) in NHWC format, generated by applying
 the `transforms` to the `images`. Satisfies the description above.
 )doc");
 
+REGISTER_OP("BipartiteMatch")
+    .Input("distance_mat: float")
+    .Input("num_valid_rows: float")
+    .Attr("top_k: int = -1")
+    .Output("row_to_col_match_indices: int32")
+    .Output("col_to_row_match_indices: int32")
+    .SetIsStateful()
+    .SetShapeFn([](InferenceContext* c) {
+      ShapeHandle input;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 2, &input));
+      c->set_output(0, c->MakeShape({c->Dim(input, 0)}));
+      c->set_output(1, c->MakeShape({c->Dim(input, 1)}));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Find bipartite matching based on a given distance matrix.
+
+A greedy bi-partite matching alogrithm is used to obtain the matching with the
+(greedy) minimum distance.
+
+distance_mat: A 2-D float tensor of shape `[num_rows, num_columns]`. It is a
+  pair-wise distance matrix between the entities represented by each row and
+  each column. It is an asymmetric matrix. The smaller the distance is, the more
+  similar the pairs are. The bipartite matching is to minimize the distances.
+num_valid_rows: A scalar or a 1-D tensor with one element describing the
+  number of valid rows of distance_mat to consider for the bipartite matching.
+  If set to be negative, then all rows from `distance_mat` are used.
+top_k: A scalar that specifies the number of top-k matches to retrieve.
+  If set to be negative, then is set according to the maximum number of
+  matches from `distance_mat`.
+row_to_col_match_indices: A vector of length num_rows, which is the number of
+  rows of the input `distance_matrix`.
+  If `row_to_col_match_indices[i]` is not -1, row i is matched to column
+  `row_to_col_match_indices[i]`.
+col_to_row_match_indices: A vector of length num_columns, which is the number
+  of columns of the input ditance matrix.
+  If `col_to_row_match_indices[j]` is not -1, column j is matched to row
+  `col_to_row_match_indices[j]`.
+)doc");
+
 }  // namespace tensorflow
diff --git a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
index 5e78b590df..b8a0706b61 100644
--- a/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
+++ b/tensorflow/contrib/image/python/kernel_tests/image_ops_test.py
@@ -185,5 +185,65 @@ class ImageOpsTest(test_util.TensorFlowTestCase):
     self._test_grad([3, 4, 12, 12])
 
 
+class BipartiteMatchTest(test_util.TensorFlowTestCase):
+
+  def _BipartiteMatchTest(self, distance_mat, distance_mat_shape,
+                          num_valid_rows,
+                          expected_row_to_col_match,
+                          expected_col_to_row_match):
+    distance_mat_np = np.array(distance_mat, dtype=np.float32).reshape(
+        distance_mat_shape)
+    expected_row_to_col_match_np = np.array(expected_row_to_col_match,
+                                            dtype=np.int32)
+    expected_col_to_row_match_np = np.array(expected_col_to_row_match,
+                                            dtype=np.int32)
+
+    with self.test_session():
+      distance_mat_tf = constant_op.constant(distance_mat_np,
+                                             shape=distance_mat_shape)
+      location_to_prior, prior_to_location = image_ops.bipartite_match(
+          distance_mat_tf, num_valid_rows)
+      location_to_prior_np = location_to_prior.eval()
+      prior_to_location_np = prior_to_location.eval()
+      self.assertAllEqual(location_to_prior_np, expected_row_to_col_match_np)
+      self.assertAllEqual(prior_to_location_np, expected_col_to_row_match_np)
+
+  def testBipartiteMatch(self):
+    distance_mat = [0.5, 0.8, 0.1,
+                    0.3, 0.2, 0.15]
+    num_valid_rows = 2
+    expected_row_to_col_match = [2, 1]
+    expected_col_to_row_match = [-1, 1, 0]
+    self._BipartiteMatchTest(distance_mat, [2, 3], num_valid_rows,
+                             expected_row_to_col_match,
+                             expected_col_to_row_match)
+
+    # The case of num_valid_rows less than num-of-rows-in-distance-mat.
+    num_valid_rows = 1
+    expected_row_to_col_match = [2, -1]
+    expected_col_to_row_match = [-1, -1, 0]
+    self._BipartiteMatchTest(distance_mat, [2, 3], num_valid_rows,
+                             expected_row_to_col_match,
+                             expected_col_to_row_match)
+
+    # The case of num_valid_rows being 0.
+    num_valid_rows = 0
+    expected_row_to_col_match = [-1, -1]
+    expected_col_to_row_match = [-1, -1, -1]
+    self._BipartiteMatchTest(distance_mat, [2, 3], num_valid_rows,
+                             expected_row_to_col_match,
+                             expected_col_to_row_match)
+
+    # The case of num_valid_rows less being -1.
+    num_valid_rows = -1
+    # The expected results are the same as num_valid_rows being 2.
+    expected_row_to_col_match = [2, 1]
+    expected_col_to_row_match = [-1, 1, 0]
+    self._BipartiteMatchTest(distance_mat, [2, 3], num_valid_rows,
+                             expected_row_to_col_match,
+                             expected_col_to_row_match)
+
+
 if __name__ == "__main__":
   googletest.main()
+
diff --git a/tensorflow/contrib/image/python/ops/image_ops.py b/tensorflow/contrib/image/python/ops/image_ops.py
index 0d51d0dee1..da374f8cef 100644
--- a/tensorflow/contrib/image/python/ops/image_ops.py
+++ b/tensorflow/contrib/image/python/ops/image_ops.py
@@ -258,3 +258,42 @@ def _image_projective_transform_grad(op, grad):
     return [output[0, :, :, :], None]
   else:
     return [output, None]
+
+
+def bipartite_match(
+    distance_mat,
+    num_valid_rows,
+    top_k=-1):
+  """Find bipartite matching based on a given distance matrix.
+
+  A greedy bi-partite matching alogrithm is used to obtain the matching with
+  the (greedy) minimum distance.
+
+  Args:
+    distance_mat: A 2-D float tensor of shape `[num_rows, num_columns]`. It is a
+      pair-wise distance matrix between the entities represented by each row and
+      each column. It is an asymmetric matrix. The smaller the distance is, the
+      more similar the pairs are. The bipartite matching is to minimize the
+      distances.
+    num_valid_rows: A scalar or a 1-D tensor with one element describing the
+      number of valid rows of distance_mat to consider for the bipartite
+      matching. If set to be negative, then all rows from `distance_mat` are
+      used.
+    top_k: A scalar that specifies the number of top-k matches to retrieve.
+      If set to be negative, then is set according to the maximum number of
+      matches from `distance_mat`.
+
+  Returns:
+    row_to_col_match_indices: A vector of length num_rows, which is the number
+      of rows of the input `distance_matrix`. If `row_to_col_match_indices[i]`
+      is not -1, row i is matched to column `row_to_col_match_indices[i]`.
+    col_to_row_match_indices: A vector of length num_columns, which is the
+      number of columns of the input ditance matrix.
+      If `col_to_row_match_indices[j]` is not -1, column j is matched to row
+      `col_to_row_match_indices[j]`.
+  """
+  result = gen_image_ops.bipartite_match(distance_mat, num_valid_rows, top_k)
+  return result
+
+
+ops.NotDifferentiable("BipartiteMatch")
-- 
GitLab


From 5dd25a29433cdfb9938f6766fd53ffc5f05972c9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 11:56:19 -0700
Subject: [PATCH 1110/1563] Merged commit includes the following changes:
 155407708  by yaozhang <yaozhang@google.com>:

    Only search for dequeue node in the transitive fanin of the training outputs. For some models, there are multiple dequeue nodes respectively for training, validation, and test. However, only the training dequeue node is of our interest.

--
155407641  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change

--

PiperOrigin-RevId: 155407708
---
 tensorflow/core/grappler/optimizers/auto_parallel.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/auto_parallel.cc b/tensorflow/core/grappler/optimizers/auto_parallel.cc
index 078fb10bc9..d4326a022f 100644
--- a/tensorflow/core/grappler/optimizers/auto_parallel.cc
+++ b/tensorflow/core/grappler/optimizers/auto_parallel.cc
@@ -108,13 +108,9 @@ Status AutoParallel::Initialize(const GrapplerItem& item) {
                                                 "ApplyAdam",
                                                 "ApplyRMSProp",
                                                 "ApplyCenteredRMSProp"};
-  const NodeDef* dequeue_node = nullptr;
   for (int i = 0; i < graph_.node_size(); i++) {
     all_nodes_.insert(
         std::make_pair(graph_.node(i).name(), graph_.mutable_node(i)));
-    if (IsDequeueOp(graph_.node(i))) {
-      dequeue_node = graph_.mutable_node(i);
-    }
     if (apply_gradients_ops.find(graph_.node(i).op()) !=
         apply_gradients_ops.end()) {
       apply_gradients_nodes_.insert(graph_.node(i).name());
@@ -152,6 +148,14 @@ Status AutoParallel::Initialize(const GrapplerItem& item) {
   auto train_nodes = ComputeTransitiveFanin(graph_, item.fetch);
   LOG(INFO) << "Number of training nodes: " << train_nodes.size();
 
+  const NodeDef* dequeue_node;
+  for (const auto& train_node : train_nodes) {
+    if (IsDequeueOp(*train_node)) {
+      dequeue_node = train_node;
+      break;
+    }
+  }
+
   std::vector<const NodeDef*> input_nodes;
   if (dequeue_node) {
     LOG(INFO) << "Dequeue node: " << dequeue_node->name();
-- 
GitLab


From 41f86fd4220e3e92b756c2c18033c693655baea3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 12:04:35 -0700
Subject: [PATCH 1111/1563] Fixed typo.

PiperOrigin-RevId: 155408790
---
 tensorflow/python/ops/control_flow_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index 713cb65a40..ad94183e5b 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -276,7 +276,7 @@ def exit(data, name=None):
 def switch(data, pred, dtype=None, name=None):
   """Forwards `data` to an output determined by `pred`.
 
-  If `pred` is false, the `data` input is forwared to the first output.
+  If `pred` is false, the `data` input is forwarded to the first output.
   Otherwise, the data goes to the second output.
 
   This op handles `Tensor`s and `IndexedSlices`.
-- 
GitLab


From eaa18b3d0fc4bd71d9b36a55fda81f7787427e8f Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 8 May 2017 12:09:39 -0700
Subject: [PATCH 1112/1563] Actually enforce nomac tag on Mac

Previously the nomac tag was not enforced, perhaps by mistake. This CL fixes that.

PiperOrigin-RevId: 155409422
---
 .../tools/ci_build/ci_parameterized_build.sh  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tensorflow/tools/ci_build/ci_parameterized_build.sh b/tensorflow/tools/ci_build/ci_parameterized_build.sh
index fd3eff4ee6..dfaf50eb4f 100755
--- a/tensorflow/tools/ci_build/ci_parameterized_build.sh
+++ b/tensorflow/tools/ci_build/ci_parameterized_build.sh
@@ -333,21 +333,35 @@ fi
 OPT_FLAG=$(str_strip "${OPT_FLAG}")
 
 
-# Filter out benchmark tests if this is not a benchmarks job
+# 1) Filter out benchmark tests if this is not a benchmarks job;
+# 2) Filter out tests with the "nomac" tag if the build is on Mac OS X.
 EXTRA_ARGS=""
+IS_MAC=0
+if [[ "$(uname)" == "Darwin" ]]; then
+  IS_MAC=1
+fi
 if [[ "${TF_BUILD_APPEND_ARGUMENTS}" == *"--test_tag_filters="* ]]; then
   ITEMS=(${TF_BUILD_APPEND_ARGUMENTS})
 
   for ITEM in "${ITEMS[@]}"; do
-    if [[ ${ITEM} == *"--test_tag_filters="* ]] &&
-      [[ ${ITEM} != *"benchmark-test"* ]]; then
-      EXTRA_ARGS="${EXTRA_ARGS} ${ITEM},-benchmark-test"
+    if [[ ${ITEM} == *"--test_tag_filters="* ]]; then
+      NEW_ITEM="${ITEM}"
+      if [[ ${NEW_ITEM} != *"benchmark-test"* ]]; then
+        NEW_ITEM="${NEW_ITEM},-benchmark-test"
+      fi
+      if [[ ${IS_MAC} == "1" ]] && [[ ${NEW_ITEM} != *"nomac"* ]]; then
+        NEW_ITEM="${NEW_ITEM},-nomac"
+      fi
+      EXTRA_ARGS="${EXTRA_ARGS} ${NEW_ITEM}"
     else
       EXTRA_ARGS="${EXTRA_ARGS} ${ITEM}"
     fi
   done
 else
   EXTRA_ARGS="${TF_BUILD_APPEND_ARGUMENTS} --test_tag_filters=-benchmark-test"
+  if [[ ${IS_MAC} == "1" ]]; then
+    EXTRA_ARGS="${EXTRA_ARGS},-nomac"
+  fi
 fi
 
 # For any "tool" dependencies in genrules, Bazel will build them for host
-- 
GitLab


From a816db6b977fac2e3ff6ccd490529aa558f1a9d1 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Mon, 8 May 2017 12:17:18 -0700
Subject: [PATCH 1113/1563] Fixes typos in docstring of string table.

PiperOrigin-RevId: 155410244
---
 tensorflow/python/feature_column/lookup_ops.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/feature_column/lookup_ops.py b/tensorflow/python/feature_column/lookup_ops.py
index 8225b47b20..b415235b99 100644
--- a/tensorflow/python/feature_column/lookup_ops.py
+++ b/tensorflow/python/feature_column/lookup_ops.py
@@ -972,7 +972,7 @@ def index_table_from_tensor(mapping,
   Sample Usages:
 
   ```python
-  mapping_strings = t.constant(["emerson", "lake", "palmer")
+  mapping_strings = t.constant(["emerson", "lake", "palmer"])
   table = tf.contrib.lookup.index_table_from_tensor(
       mapping=mapping_strings, num_oov_buckets=1, default_value=-1)
   features = tf.constant(["emerson", "lake", "and", "palmer"])
@@ -1064,7 +1064,7 @@ def string_to_index(tensor, mapping, default_value=-1, name=None):
   For example:
 
   ```python
-  mapping_strings = tf.constant(["emerson", "lake", "palmer")
+  mapping_strings = tf.constant(["emerson", "lake", "palmer"])
   feats = tf.constant(["emerson", "lake", "and", "palmer"])
   ids = tf.contrib.lookup.string_to_index(
       feats, mapping=mapping_strings, default_value=-1)
-- 
GitLab


From ebd6de64299a5484265455d8e0f469fad91a0927 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 12:18:14 -0700
Subject: [PATCH 1114/1563] Fix flaky test batch_sequences_with_states

PiperOrigin-RevId: 155410358
---
 .../training/sequence_queueing_state_saver.py      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
index 7b85f998ea..2c7c30911c 100644
--- a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
+++ b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
@@ -1443,6 +1443,7 @@ def batch_sequences_with_states(input_key,
       input_length = input_length if input_length is not None else length
     elif input_sequences:
       # Assert that value_length is a multiple of num_unroll.
+      checked_input_sequences = {}
       for key, value in input_sequences.items():
         if (isinstance(value, sparse_tensor.SparseTensor) or
             isinstance(value, sparse_tensor.SparseTensorValue)):
@@ -1460,11 +1461,13 @@ def batch_sequences_with_states(input_key,
                           ", but saw value: ",
                           string_ops.as_string(value_length),
                           ". Consider setting pad=True."])])]):
-            input_sequences[key] = sparse_tensor.SparseTensor(
-                indices=value.indices,
+            checked_input_sequences[key] = sparse_tensor.SparseTensor(
+                indices=array_ops.identity(
+                    value.indices, name="multiple_of_checked"),
                 values=array_ops.identity(
                     value.values, name="multiple_of_checked"),
-                dense_shape=value.dense_shape)
+                dense_shape=array_ops.identity(
+                    value.dense_shape, name="multiple_of_checked"))
         else:
           if not isinstance(value, ops.Tensor):
             try:
@@ -1490,9 +1493,9 @@ def batch_sequences_with_states(input_key,
                       ])
                   ])
           ]):
-            input_sequences[key] = array_ops.identity(
+            checked_input_sequences[key] = array_ops.identity(
                 value, name="multiple_of_checked")
-
+      input_sequences = checked_input_sequences
     # Move SparseTensors in context into input_sequences.
     _move_sparse_tensor_out_context(input_context, input_sequences, num_unroll)
     # Deconstruct SparseTensors in sequence into a dense Tensor before inputting
@@ -1691,7 +1694,6 @@ def _move_sparse_tensor_out_context(input_context, input_sequences, num_unroll):
     ind = array_ops.expand_dims(ind, 1)
     ind = array_ops.expand_dims(ind, 2)
     ind = array_ops.tile(ind, [1, dim0, 1])
-    array_ops.reshape(ind, array_ops.stack([n, dim0, 1]))
 
     # Concatenate both and reshape.
     indices = array_ops.concat([ind, multiplied_indices], 2)
-- 
GitLab


From 10096f75722e56eddb95512532842e3082b23cfc Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@google.com>
Date: Mon, 8 May 2017 12:25:42 -0700
Subject: [PATCH 1115/1563] Beautify HLO dot output.

- Show the value of effective scalar constants.  Previously we only
  showed the values of true (i.e., R0) scalars.

- Change the graph's font to Roboto.  Previously it was...whatever the
  default is -- Times New Roman?

- Place the graph's heading at the top of the graph, instead of wherever
  the dot renderer pleases.

- Make all nodes other than "while" rectangles, and Use rectangles with
  rounded corners for nested computations, to make them easier to
  distinguish from the other nodes.

- Make nodes' opcodes and graph headings bold.

- Tweak the graph's colors.

  * Now we use Material Design colors, from https://material.io/color.
    These are in general much lighter, which I think lets the reader
    focus more on the nodes' contents.

  * tuple and get-tuple-element are now white, to reflect that they are
    usually nops.  This makes graphs with many GTE ops much easier to
    parse.  (I think this is the most impactful change in this patch.)

  * We use fewer unique colors now, again in an effort to help readers
    focus on the graph itself.  This necessitates making some ops that
    previously had different colors share colors:

     - send, recv, infeed, outfeed, and cross-replica-sum are all now
       the same color, since they represent data transfer.

     - dot and conv are now both the same (bold) color, since these are
       often the most expensive ops in models.

     - map and fusion are now the same color, since they both are
       wrappers around "lambda functions".

PiperOrigin-RevId: 155411313
---
 .../compiler/xla/service/hlo_graph_dumper.cc  | 250 ++++++++++++------
 1 file changed, 165 insertions(+), 85 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
index 5ce52af5b4..9c84c64254 100644
--- a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
+++ b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
@@ -48,6 +48,65 @@ namespace xla {
 namespace hlo_graph_dumper {
 namespace {
 
+// Node color schemes, used by NodeColorAttributes.
+enum ColorScheme {
+  kBlue,
+  kBrown,
+  kDarkBlue,
+  kDarkGreen,
+  kDarkRed,
+  kGray,
+  kGreen,
+  kOrange,
+  kPurple,
+  kRed,
+  kWhite,
+  kYellow,
+};
+
+// Given a ColorScheme, returns an attribute string for a node of that color.
+// Sets the node's fill, stroke, and text colors.
+//
+// Colors are from https://material.io/color.
+string NodeColorAttributes(ColorScheme color) {
+  using std::make_tuple;
+
+  const char *fill_color, *stroke_color, *font_color;
+  std::tie(fill_color, stroke_color, font_color) =
+      [color]() -> std::tuple<const char*, const char*, const char*> {
+    switch (color) {
+      case kBlue:
+        return make_tuple("#bbdefb", "#8aacc8", "black");
+      case kBrown:
+        return make_tuple("#bcaaa4", "#8c7b75", "black");
+      case kDarkBlue:
+        return make_tuple("#1565c0", "#003c8f", "white");
+      case kDarkGreen:
+        return make_tuple("#2e7d32", "#005005", "white");
+      case kDarkRed:
+        return make_tuple("#b71c1c", "#7f0000", "white");
+      case kGray:
+        return make_tuple("#cfd8dc", "#9ea7aa", "black");
+      case kGreen:
+        return make_tuple("#c8e6c9", "#97b498", "black");
+      case kOrange:
+        return make_tuple("#ffe0b2", "#cbae82", "black");
+      case kPurple:
+        return make_tuple("#e1bee7", "#af8eb5", "black");
+      case kRed:
+        return make_tuple("#ffcdd2", "#cb9ca1", "black");
+      case kWhite:
+        return make_tuple("white", "black", "black");
+      case kYellow:
+        return make_tuple("#fff9c4", "#cbc693", "black");
+    }
+  }();
+
+  return Printf(
+      "style=filled, fontcolor=\"%s\", color=\"%s\", fillcolor=\"%s\"",
+      font_color, stroke_color, fill_color);
+}
+
 // Returns the dot graph identifier for the given instruction.
 string InstructionId(const HloInstruction* instruction) {
   return Printf("%lld", reinterpret_cast<uint64>(instruction));
@@ -102,30 +161,31 @@ string InstructionSequenceGraph(
       param_ports.push_back(
           Printf("<%s> %s", InstructionId(param).c_str(), label.c_str()));
     }
-    StrAppend(&graph_body, param_node_name,
-              " [shape=record,style=filled,fillcolor=\"lightblue1\",",
-              "label=\"{parameters | {", Join(param_ports, "|"), "}}\"];\n");
+    // (If we wanted the word "parameters" to be bold like the other op names,
+    // we'd have to make this into an HTML-like table.  It is possible but
+    // complicated; see http://www.graphviz.org/doc/info/shapes.html#html.)
+    StrAppend(&graph_body, param_node_name, " [shape=record ",
+              NodeColorAttributes(kOrange), "label=\"{parameters | {",
+              Join(param_ports, "|"), "}}\"];\n");
   }
 
   for (auto& instruction : instructions) {
-    string color = "peachpuff";
-    string shape = "ellipse";
-    string name = instruction->ExtendedOpcodeStr();
+    ColorScheme color = kYellow;
+    string shape = "box";
+    string name = StrCat("<b>", instruction->ExtendedOpcodeStr(), "</b> ",
+                         instruction->name());
     if (HloOpcode::kConvolution == instruction->opcode()) {
-      name += ":\\n" + instruction->ConvolutionDimensionNumbersToString() +
-              "\\n" + window_util::ToString(instruction->window());
+      StrAppend(&name, "<br/>",
+                instruction->ConvolutionDimensionNumbersToString(), "<br/>",
+                window_util::ToString(instruction->window()));
     }
 
-    name += "\\n" + instruction->name();
-    if (!instruction->metadata().op_type().empty()) {
-      StrAppend(&name, "\\n", instruction->metadata().op_type());
-    }
     if (!instruction->metadata().op_name().empty()) {
-      StrAppend(&name, "\\n", instruction->metadata().op_name());
+      StrAppend(&name, "<br/>", instruction->metadata().op_name());
     }
     if (!instruction->metadata().source_file().empty() &&
         instruction->metadata().source_line() != 0) {
-      StrAppend(&name, "\\n", instruction->metadata().source_file(), ":",
+      StrAppend(&name, "<br/>", instruction->metadata().source_file(), ":",
                 instruction->metadata().source_line());
     }
 
@@ -140,11 +200,8 @@ string InstructionSequenceGraph(
       case HloOpcode::kAdd:
       case HloOpcode::kCeil:
       case HloOpcode::kClamp:
-      case HloOpcode::kConcatenate:
       case HloOpcode::kConvert:
       case HloOpcode::kDivide:
-      case HloOpcode::kDynamicSlice:
-      case HloOpcode::kDynamicUpdateSlice:
       case HloOpcode::kEq:
       case HloOpcode::kExp:
       case HloOpcode::kFloor:
@@ -163,64 +220,49 @@ string InstructionSequenceGraph(
       case HloOpcode::kMultiply:
       case HloOpcode::kNe:
       case HloOpcode::kNegate:
-      case HloOpcode::kPad:
       case HloOpcode::kPower:
       case HloOpcode::kRemainder:
-      case HloOpcode::kReshape:
-      case HloOpcode::kReverse:
       case HloOpcode::kSelect:
       case HloOpcode::kSign:
       case HloOpcode::kSlice:
       case HloOpcode::kSort:
       case HloOpcode::kSubtract:
       case HloOpcode::kTanh:
-      case HloOpcode::kTuple:
-      case HloOpcode::kUpdate:
-        break;
-
-      case HloOpcode::kBroadcast:
-      case HloOpcode::kTranspose:
-        StrAppend(&name, "\\n", "dims={", Join(instruction->dimensions(), ","),
-                  "}");
-        break;
-      case HloOpcode::kGetTupleElement:
-        StrAppend(&name, "\\nindex=", instruction->tuple_index());
         break;
       case HloOpcode::kRng:
-        StrAppend(&name, "\\n",
+        StrAppend(&name, "<br/>",
                   RandomDistribution_Name(instruction->random_distribution()));
         break;
-      case HloOpcode::kConstant:
-        shape = "box";
-        color = "palegreen";
-        if (ShapeUtil::IsScalar(instruction->shape())) {
-          StrAppend(&name, "\\n", "value=", LiteralUtil::GetAsString(
-                                                instruction->literal(), {}));
-        }
+      case HloOpcode::kBroadcast:
+      case HloOpcode::kTranspose:
+        StrAppend(&name, "<br/>", "dims={",
+                  Join(instruction->dimensions(), ","), "}");
         break;
       case HloOpcode::kBitcast:
-      case HloOpcode::kCopy:
-        color = "white";
-        break;
-      case HloOpcode::kCall:
-        color = "tomato";
-        break;
-      case HloOpcode::kCustomCall:
-        color = "tomato4";
-        StrAppend(&name, "\\n",
-                  "custom_call_target=", instruction->custom_call_target());
+      case HloOpcode::kTuple:
+      case HloOpcode::kTrace:
+        color = kWhite;
         break;
-      case HloOpcode::kDot:
-        color = "slateblue";
+      case HloOpcode::kGetTupleElement:
+        color = kWhite;
+        StrAppend(&name, "<br/>index=", instruction->tuple_index());
         break;
-      case HloOpcode::kSend:
-        color = "purple";
+      case HloOpcode::kConcatenate:
+      case HloOpcode::kCopy:
+      case HloOpcode::kDynamicSlice:
+      case HloOpcode::kDynamicUpdateSlice:
+      case HloOpcode::kPad:
+      case HloOpcode::kReshape:
+      case HloOpcode::kReverse:
+      case HloOpcode::kUpdate:
+        color = kGreen;
         break;
-      case HloOpcode::kRecv:
-        color = "orange";
+      case HloOpcode::kConstant:
+        color = kBlue;
         break;
-      case HloOpcode::kMap:
-        color = "palevioletred";
+      case HloOpcode::kConvolution:
+      case HloOpcode::kDot:
+        color = kDarkBlue;
         break;
       case HloOpcode::kParameter:
         // A single record node is created for all the parameter nodes with a
@@ -229,38 +271,54 @@ string InstructionSequenceGraph(
         continue;
       case HloOpcode::kReduce:
         StrAppend(&name, " dims=", Join(instruction->dimensions(), ","));
-        color = "lightsalmon";
+        color = kPurple;
         break;
       case HloOpcode::kSelectAndScatter:
       case HloOpcode::kReduceWindow:
-        color = "lightsalmon";
-        break;
-      case HloOpcode::kTrace:
-        color = "white";
+        color = kPurple;
         break;
       case HloOpcode::kWhile:
-        color = "forestgreen";
+        shape = "ellipse";
+        color = kDarkGreen;
         break;
+      case HloOpcode::kMap:
       case HloOpcode::kFusion:
-        color = "gray";
-        break;
-      case HloOpcode::kConvolution:
-        color = "red";
-        break;
-      case HloOpcode::kCrossReplicaSum:
-        color = "turquoise";
+        color = kGray;
         break;
+      case HloOpcode::kSend:
+      case HloOpcode::kRecv:
       case HloOpcode::kInfeed:
       case HloOpcode::kOutfeed:
-        color = "blue";
+      case HloOpcode::kCrossReplicaSum:
+        color = kBrown;
+        break;
+      case HloOpcode::kCall:
+        color = kDarkGreen;
+        break;
+      case HloOpcode::kCustomCall:
+        color = kDarkGreen;
+        StrAppend(&name, "<br/>",
+                  "custom_call_target=", instruction->custom_call_target());
         break;
     }
 
     // Create instruction node with appropriate label, shape, and color.
+    // label is interpreted as an HTML-like string, so newlines must be
+    // delimited with <br/>, rather than \n.
     string label =
-        StrCat(name, "\\n", ShapeUtil::HumanString(instruction->shape()));
+        StrCat(name, "<br/>", ShapeUtil::HumanString(instruction->shape()));
+
+    if (instruction->opcode() == HloOpcode::kConstant &&
+        ShapeUtil::IsEffectiveScalar(instruction->shape())) {
+      auto elem_idx = IndexUtil::LinearIndexToMultidimensionalIndex(
+          instruction->shape(), /*linear_index=*/0);
+      StrAppend(&label, " = {",
+                LiteralUtil::GetAsString(instruction->literal(), elem_idx),
+                "}");
+    }
+
     if (show_addresses) {
-      Appendf(&label, "\\n[%p]", instruction.get());
+      Appendf(&label, "<br/>[%p]", instruction.get());
     }
     if (show_layouts && LayoutUtil::HasLayout(instruction->shape())) {
       string layout_string;
@@ -272,7 +330,7 @@ string InstructionSequenceGraph(
         layout_string =
             Join(instruction->shape().layout().minor_to_major(), ",");
       }
-      StrAppend(&label, "\\nlayout={", layout_string, "}");
+      StrAppend(&label, "<br/>layout={", layout_string, "}");
     }
     if (hlo_execution_profile != nullptr) {
       auto hlo_cycles_executed =
@@ -280,16 +338,16 @@ string InstructionSequenceGraph(
       auto total_cycles_executed =
           hlo_execution_profile->total_cycles_executed(*instruction->parent());
       if (hlo_cycles_executed > 0 && total_cycles_executed > 0) {
-        Appendf(&label, "\\n%% of cycles executed=%.2f",
+        Appendf(&label, "<br/>%% of cycles executed=%.2f",
                 (static_cast<double>(hlo_cycles_executed) /
                  static_cast<double>(total_cycles_executed)) *
                     100);
       }
     }
-    Appendf(&graph_body,
-            "%s [label=\"%s\", shape=%s, style=filled, fillcolor=%s];\n",
+
+    Appendf(&graph_body, "%s [label=<%s>, shape=%s, %s];\n",
             InstructionId(instruction.get()).c_str(), label.c_str(),
-            shape.c_str(), color.c_str());
+            shape.c_str(), NodeColorAttributes(color).c_str());
 
     // Create edges from the instruction's operands to the instruction.
     int64 operand_number = 0;
@@ -319,7 +377,7 @@ string InstructionSequenceGraph(
           StrCat("cluster_", InstructionId(instruction.get()));
       StrAppend(&graph_body, "subgraph ", cluster_name, " {\n");
       StrAppend(&graph_body,
-                "label=\"fused expression\";\nstyle=filled;\n"
+                "label=<<b>fused expression</b>>;\nstyle=\"rounded,filled\";\n"
                 "color=lightgrey;\n");
       StrAppend(&graph_body, InstructionSequenceGraph(
                                  instruction->fused_instructions(),
@@ -349,19 +407,39 @@ string InstructionSequenceGraph(
   return graph_body;
 }
 
+// DOT graphs accept a stylesheet as a URL.  So naturally, an inline stylesheet
+// is a data URI!
+//
+// We don't perform any escaping on this string, so be careful not to use double
+// quotes inside.
+static const char* dot_stylesheet = R"(
+data:text/css,
+@import url(https://fonts.googleapis.com/css?family=Roboto:400,700);
+svg text {
+  font-family: 'Roboto';
+  font-size: 12px;
+}
+)";
+
 string ComputationToDotGraph(const HloComputation& computation,
                              const string& label, bool show_addresses,
                              bool show_layouts,
                              const HloExecutionProfile* hlo_execution_profile) {
-  string graph_label = StrCat(label, "\\n", computation.name());
+  string graph_label = StrCat(label, "<br/>", computation.name());
   if (hlo_execution_profile != nullptr) {
     auto cycles = hlo_execution_profile->total_cycles_executed(computation);
-    Appendf(&graph_label, "\\ntotal cycles = %lld (%s)", cycles,
+    Appendf(&graph_label, "<br/>total cycles = %lld (%s)", cycles,
             tensorflow::strings::HumanReadableNum(cycles).c_str());
   }
-  string graph =
-      Printf("digraph G {\nrankdir=TB;\ncompound=true;\nlabel=\"%s\"\n",
-             graph_label.c_str());
+  string graph = Printf(
+      R"(digraph G {
+rankdir=TB;
+compound=true;
+label=<<b>%s</b>>;
+labelloc=t;
+stylesheet="%s"
+)",
+      graph_label.c_str(), dot_stylesheet);
 
   // Emit embedded computations as subgraph clusters.
   std::vector<string> intercomputation_edges;
@@ -369,7 +447,9 @@ string ComputationToDotGraph(const HloComputation& computation,
     string graph_body = InstructionSequenceGraph(
         embedded->instructions(), show_addresses, show_layouts,
         &intercomputation_edges, hlo_execution_profile);
-    Appendf(&graph, "subgraph cluster_%s {\nlabel=\"%s\";\n%s}\n",
+    Appendf(&graph,
+            "subgraph cluster_%s "
+            "{\nstyle=rounded;label=<<b>%s</b>>;labelloc=t;\n%s}\n",
             ComputationId(embedded).c_str(), embedded->name().c_str(),
             graph_body.c_str());
   }
-- 
GitLab


From 362e441b6d1dbcdfed02e0251a8f40adfc0a9d66 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 12:58:57 -0700
Subject: [PATCH 1116/1563] Add an option to remove empty rows and columns from
 the input matrix, in the input function used in the test for the
 WALSMatrixFactorization estimator.

PiperOrigin-RevId: 155415303
---
 .../ops/factorization_ops_test_utils.py       |  20 +++
 .../contrib/factorization/python/ops/wals.py  |  11 +-
 .../factorization/python/ops/wals_test.py     | 127 ++++++++++++++----
 3 files changed, 132 insertions(+), 26 deletions(-)

diff --git a/tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py b/tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py
index 6957211973..ead9474805 100644
--- a/tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py
+++ b/tensorflow/contrib/factorization/python/ops/factorization_ops_test_utils.py
@@ -37,6 +37,26 @@ INPUT_MATRIX = np.array(
      [0.0, 4.1, 0.0, 0.0, 4.4, 0.0, 4.6]]).astype(np.float32)
 
 
+def remove_empty_rows_columns(np_matrix):
+  """Simple util to remove empty rows and columns of a matrix.
+
+  Args:
+    np_matrix: A numpy array.
+  Returns:
+    A tuple consisting of:
+    mat: A numpy matrix obtained by removing empty rows and columns from
+      np_matrix.
+    nz_row_ids: A numpy array of the ids of non-empty rows, such that
+      nz_row_ids[i] is the old row index corresponding to new index i.
+    nz_col_ids: A numpy array of the ids of non-empty columns, such that
+      nz_col_ids[j] is the old column index corresponding to new index j.
+  """
+  nz_row_ids = np.where(np.sum(np_matrix, axis=1) != 0)[0]
+  nz_col_ids = np.where(np.sum(np_matrix, axis=0) != 0)[0]
+  mat = np_matrix[np.ix_(nz_row_ids, nz_col_ids)]
+  return mat, nz_row_ids, nz_col_ids
+
+
 def np_matrix_to_tf_sparse(np_matrix,
                            row_slices=None,
                            col_slices=None,
diff --git a/tensorflow/contrib/factorization/python/ops/wals.py b/tensorflow/contrib/factorization/python/ops/wals.py
index 9636625b10..2f7bf48041 100644
--- a/tensorflow/contrib/factorization/python/ops/wals.py
+++ b/tensorflow/contrib/factorization/python/ops/wals.py
@@ -70,6 +70,7 @@ class _SweepHook(session_run_hook.SessionRunHook):
         order. These are typically local initialization ops (such as cache
         initialization).
     """
+    # TODO(walidk): Provide a counter for the number of completed sweeps.
     self._num_rows = num_rows
     self._num_cols = num_cols
     self._row_prep_ops = row_prep_ops
@@ -367,10 +368,14 @@ class WALSMatrixFactorization(estimator.Estimator):
   The current implementation assumes that the training is run on a single
   machine, and will fail if config.num_worker_replicas is not equal to one.
   Training is done by calling self.fit(input_fn=input_fn), where input_fn
-  provides two queues: one for rows of the input matrix, and one for rows of the
-  transposed input matrix (i.e. columns of the original matrix). Note that
+  provides two tensors: one for rows of the input matrix, and one for rows of
+  the transposed input matrix (i.e. columns of the original matrix). Note that
   during a row sweep, only row batches are processed (ignoring column batches)
   and vice-versa.
+  Also note that every row (respectively every column) of the input matrix
+  must be processed at least once for the sweep to be considered complete. In
+  particular, training will not make progress if input_fn does not generate some
+  rows.
 
   For prediction, given a new set of input rows A' (e.g. new rows of the A
   matrix), we compute a corresponding set of row factors U', such that U' * V^T
@@ -473,10 +478,10 @@ class WALSMatrixFactorization(estimator.Estimator):
       ValueError: If config.num_worker_replicas is strictly greater than one.
         The current implementation only supports running on a single worker.
     """
-    # TODO(walidk): Support distributed training.
     # TODO(walidk): Support power-law based weight computation.
     # TODO(walidk): Add factor lookup by indices, with caching.
     # TODO(walidk): Support caching during prediction.
+    # TODO(walidk): Provide input pipelines that handle missing rows.
 
     params = {
         "num_rows": num_rows,
diff --git a/tensorflow/contrib/factorization/python/ops/wals_test.py b/tensorflow/contrib/factorization/python/ops/wals_test.py
index 3f5787ea87..323b89a5cd 100644
--- a/tensorflow/contrib/factorization/python/ops/wals_test.py
+++ b/tensorflow/contrib/factorization/python/ops/wals_test.py
@@ -25,6 +25,7 @@ import numpy as np
 from tensorflow.contrib.factorization.python.ops import factorization_ops_test_utils
 from tensorflow.contrib.factorization.python.ops import wals as wals_lib
 from tensorflow.contrib.learn.python.learn import run_config
+from tensorflow.contrib.learn.python.learn.estimators import model_fn
 from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
@@ -77,10 +78,53 @@ class WALSMatrixFactorizationTest(test.TestCase):
     return sparse_tensor.SparseTensor(
         indices=new_indices, values=sp_x.values, dense_shape=shape)
 
-  # TODO(walidk): Add an option to randomize inputs.
-  def input_fn(self, np_matrix, batch_size, project_row=None,
-               projection_weights=None, col_ids=None):
-    """Returns an input_fn that selects row and col batches from np_matrix."""
+  # TODO(walidk): Add an option to shuffle inputs.
+  def input_fn(self, np_matrix, batch_size, mode,
+               project_row=None, projection_weights=None,
+               remove_empty_rows_columns=False):
+    """Returns an input_fn that selects row and col batches from np_matrix.
+
+    This simple utility creates an input function from a numpy_array. The
+    following transformations are performed:
+    * The empty rows and columns in np_matrix are removed (if
+      remove_empty_rows_columns is true)
+    * np_matrix is converted to a SparseTensor.
+    * The rows of the sparse matrix (and the rows of its transpose) are batched.
+    * A features dictionary is created, which contains the row / column batches.
+
+    In TRAIN mode, one only needs to specify the np_matrix and the batch_size.
+    In INFER and EVAL modes, one must also provide project_row, a boolean which
+    specifies whether we are projecting rows or columns.
+
+    Args:
+      np_matrix: A numpy array. The input matrix to use.
+      batch_size: Integer.
+      mode: Can be one of model_fn.ModeKeys.{TRAIN, INFER, EVAL}.
+      project_row: A boolean. Used in INFER and EVAL modes. Specifies whether
+        to project rows or columns.
+      projection_weights: A float numpy array. Used in INFER mode. Specifies
+        the weights to use in the projection (the weights are optional, and
+        default to 1.).
+      remove_empty_rows_columns: A boolean. When true, this will remove empty
+        rows and columns in the np_matrix. Note that this will result in
+        modifying the indices of the input matrix. The mapping from new indices
+        to old indices is returned in the form of two numpy arrays.
+
+    Returns:
+      A tuple consisting of:
+      _fn: A callable. Calling _fn returns a features dict.
+      nz_row_ids: A numpy array of the ids of non-empty rows, such that
+        nz_row_ids[i] is the old row index corresponding to new index i.
+      nz_col_ids: A numpy array of the ids of non-empty columns, such that
+        nz_col_ids[j] is the old column index corresponding to new index j.
+    """
+    if remove_empty_rows_columns:
+      np_matrix, nz_row_ids, nz_col_ids = (
+          factorization_ops_test_utils.remove_empty_rows_columns(np_matrix))
+    else:
+      nz_row_ids = np.arange(np.shape(np_matrix)[0])
+      nz_col_ids = np.arange(np.shape(np_matrix)[1])
+
     def extract_features(row_batch, col_batch, shape):
       row_ids = row_batch[0]
       col_ids = col_batch[0]
@@ -111,7 +155,15 @@ class WALSMatrixFactorizationTest(test.TestCase):
           enqueue_many=True)
 
       features = extract_features(row_batch, col_batch, sp_mat.dense_shape)
-      if projection_weights is not None:
+
+      if mode == model_fn.ModeKeys.INFER or mode == model_fn.ModeKeys.EVAL:
+        self.assertTrue(
+            project_row is not None,
+            msg='project_row must be specified in INFER or EVAL mode.')
+        features[wals_lib.WALSMatrixFactorization.PROJECT_ROW] = (
+            constant_op.constant(project_row))
+
+      if mode == model_fn.ModeKeys.INFER and projection_weights is not None:
         weights_batch = input_lib.batch(
             projection_weights,
             batch_size=batch_size,
@@ -119,14 +171,15 @@ class WALSMatrixFactorizationTest(test.TestCase):
             enqueue_many=True)
         features[wals_lib.WALSMatrixFactorization.PROJECTION_WEIGHTS] = (
             weights_batch)
-      if project_row is not None:
-        features[wals_lib.WALSMatrixFactorization.PROJECT_ROW] = (
-            constant_op.constant(project_row))
 
       labels = None
       return features, labels
 
-    return _fn
+    return _fn, nz_row_ids, nz_col_ids
+
+  @property
+  def input_matrix(self):
+    return self.INPUT_MATRIX
 
   @property
   def row_steps(self):
@@ -197,8 +250,10 @@ class WALSMatrixFactorizationTest(test.TestCase):
 
   def test_fit(self):
     # Row sweep.
-    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
-                             batch_size=self.batch_size)
+    input_fn = self.input_fn(np_matrix=self.input_matrix,
+                             batch_size=self.batch_size,
+                             mode=model_fn.ModeKeys.TRAIN,
+                             remove_empty_rows_columns=True)[0]
     self._model.fit(input_fn=input_fn, steps=self.row_steps)
     row_factors = self._model.get_row_factors()
     self.assertAllClose(row_factors[0], self._row_factors_0, atol=1e-3)
@@ -206,8 +261,10 @@ class WALSMatrixFactorizationTest(test.TestCase):
 
     # Col sweep.
     # Running fit a second time will resume training from the checkpoint.
-    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
-                             batch_size=self.batch_size)
+    input_fn = self.input_fn(np_matrix=self.input_matrix,
+                             batch_size=self.batch_size,
+                             mode=model_fn.ModeKeys.TRAIN,
+                             remove_empty_rows_columns=True)[0]
     self._model.fit(input_fn=input_fn, steps=self.col_steps)
     col_factors = self._model.get_col_factors()
     self.assertAllClose(col_factors[0], self._col_factors_0, atol=1e-3)
@@ -215,14 +272,18 @@ class WALSMatrixFactorizationTest(test.TestCase):
     self.assertAllClose(col_factors[2], self._col_factors_2, atol=1e-3)
 
   def test_predict(self):
-    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
-                             batch_size=self.batch_size)
+    input_fn = self.input_fn(np_matrix=self.input_matrix,
+                             batch_size=self.batch_size,
+                             mode=model_fn.ModeKeys.TRAIN,
+                             remove_empty_rows_columns=True,
+                            )[0]
     # Project rows 1 and 4 from the input matrix.
     proj_input_fn = self.input_fn(
         np_matrix=self.INPUT_MATRIX[[1, 4], :],
         batch_size=2,
+        mode=model_fn.ModeKeys.INFER,
         project_row=True,
-        projection_weights=[[0.2, 0.5]])
+        projection_weights=[[0.2, 0.5]])[0]
 
     self._model.fit(input_fn=input_fn, steps=self.row_steps)
     projections = self._model.get_projections(proj_input_fn)
@@ -237,8 +298,9 @@ class WALSMatrixFactorizationTest(test.TestCase):
     proj_input_fn = self.input_fn(
         np_matrix=self.INPUT_MATRIX[:, [5, 3, 1]],
         batch_size=3,
+        mode=model_fn.ModeKeys.INFER,
         project_row=False,
-        projection_weights=[[0.6, 0.4, 0.2]])
+        projection_weights=[[0.6, 0.4, 0.2]])[0]
 
     self._model.fit(input_fn=input_fn, steps=self.col_steps)
     projections = self._model.get_projections(proj_input_fn)
@@ -253,11 +315,17 @@ class WALSMatrixFactorizationTest(test.TestCase):
     # Do a row sweep then evaluate the model on row inputs.
     # The evaluate function returns the loss of the projected rows, but since
     # projection is idempotent, the eval loss must match the model loss.
-    input_fn = self.input_fn(np_matrix=self.INPUT_MATRIX,
-                             batch_size=self.batch_size)
+    input_fn = self.input_fn(np_matrix=self.input_matrix,
+                             batch_size=self.batch_size,
+                             mode=model_fn.ModeKeys.TRAIN,
+                             remove_empty_rows_columns=True,
+                            )[0]
     self._model.fit(input_fn=input_fn, steps=self.row_steps)
-    eval_input_fn_row = self.input_fn(np_matrix=self.INPUT_MATRIX, batch_size=1,
-                                      project_row=True)
+    eval_input_fn_row = self.input_fn(np_matrix=self.input_matrix,
+                                      batch_size=1,
+                                      mode=model_fn.ModeKeys.EVAL,
+                                      project_row=True,
+                                      remove_empty_rows_columns=True)[0]
     loss = self._model.evaluate(
         input_fn=eval_input_fn_row, steps=self._num_rows)['loss']
 
@@ -271,8 +339,11 @@ class WALSMatrixFactorizationTest(test.TestCase):
 
     # Do a col sweep then evaluate the model on col inputs.
     self._model.fit(input_fn=input_fn, steps=self.col_steps)
-    eval_input_fn_col = self.input_fn(np_matrix=self.INPUT_MATRIX, batch_size=1,
-                                      project_row=False)
+    eval_input_fn_col = self.input_fn(np_matrix=self.input_matrix,
+                                      batch_size=1,
+                                      mode=model_fn.ModeKeys.EVAL,
+                                      project_row=False,
+                                      remove_empty_rows_columns=True)[0]
     loss = self._model.evaluate(
         input_fn=eval_input_fn_col, steps=self._num_cols)['loss']
 
@@ -299,6 +370,16 @@ class WALSMatrixFactorizationTestFullBatch(WALSMatrixFactorizationTest):
     return 100
 
 
+class WALSMatrixFactorizaiontTestPaddedInput(WALSMatrixFactorizationTest):
+  PADDED_INPUT_MATRIX = np.pad(
+      WALSMatrixFactorizationTest.INPUT_MATRIX,
+      [(1, 0), (1, 0)], mode='constant')
+
+  @property
+  def input_matrix(self):
+    return self.PADDED_INPUT_MATRIX
+
+
 class WALSMatrixFactorizationUnsupportedTest(test.TestCase):
 
   def setUp(self):
-- 
GitLab


From 1ea40e1ef95e28c702a26a31d69879edc0adbcee Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 13:14:45 -0700
Subject: [PATCH 1117/1563] Add nomac filter to mac build.

PiperOrigin-RevId: 155417322
---
 tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh b/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
index 97df3c5e61..e5f4a22f7a 100755
--- a/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
+++ b/tensorflow/tools/ci_build/osx/cpu/run_py2_cc_core.sh
@@ -32,7 +32,7 @@ export TF_NEED_CUDA=0
 export PYTHON_BIN_PATH=$(which python2)
 yes "" | ./configure
 which bazel
-bazel test --test_tag_filters=-gpu,-benchmark-test \
+bazel test --test_tag_filters=-gpu,-benchmark-test,-nomac \
     --test_timeout 300,450,1200,3600 \
     --test_size_filters=small,medium \
     --jobs=${N_JOBS} --build_tests_only --test_output=errors -k -- \
-- 
GitLab


From 3be35ada0ee4984d57aa3a1a887f778227ffc4c9 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Mon, 8 May 2017 13:17:37 -0700
Subject: [PATCH 1118/1563] VectorLaplaceDiag distribution added.
 VectorLaplaceLinearOperator added but not exposed as part of API.
 .det_covariance and .log_det_covariance removed from MVNLinOp Some small
 docfix to MVN

PiperOrigin-RevId: 155417807
---
 tensorflow/contrib/distributions/BUILD        |  16 +
 tensorflow/contrib/distributions/__init__.py  |   2 +
 .../kernel_tests/distribution_util_test.py    |  76 +++++
 .../mvn_diag_plus_low_rank_test.py            |  33 --
 .../python/kernel_tests/mvn_tril_test.py      |  34 --
 .../kernel_tests/vector_laplace_diag_test.py  | 207 ++++++++++++
 .../python/ops/distribution_util.py           | 109 +++++++
 .../distributions/python/ops/mvn_diag.py      |   4 +-
 .../python/ops/mvn_diag_plus_low_rank.py      |   4 +-
 .../python/ops/mvn_linear_operator.py         |  72 +----
 .../distributions/python/ops/mvn_tril.py      |   4 +-
 .../python/ops/vector_laplace_diag.py         | 229 ++++++++++++++
 .../ops/vector_laplace_linear_operator.py     | 294 ++++++++++++++++++
 13 files changed, 952 insertions(+), 132 deletions(-)
 create mode 100644 tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py
 create mode 100644 tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py
 create mode 100644 tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py

diff --git a/tensorflow/contrib/distributions/BUILD b/tensorflow/contrib/distributions/BUILD
index 0c818dee03..2b3c373ba0 100644
--- a/tensorflow/contrib/distributions/BUILD
+++ b/tensorflow/contrib/distributions/BUILD
@@ -388,6 +388,22 @@ cuda_py_test(
     tags = ["nomsan"],  # disable to avoid false positives from scipy.
 )
 
+cuda_py_test(
+    name = "vector_laplace_diag_test",
+    size = "medium",
+    srcs = ["python/kernel_tests/vector_laplace_diag_test.py"],
+    additional_deps = [
+        ":distributions_py",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 cuda_py_test(
     name = "vector_student_t_test",
     size = "medium",
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index ea12e13010..f6e08ce51f 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -45,6 +45,7 @@ from tensorflow.contrib.distributions.python.ops.quantized_distribution import *
 from tensorflow.contrib.distributions.python.ops.relaxed_bernoulli import *
 from tensorflow.contrib.distributions.python.ops.relaxed_onehot_categorical import *
 from tensorflow.contrib.distributions.python.ops.sample_stats import *
+from tensorflow.contrib.distributions.python.ops.vector_laplace_diag import *
 from tensorflow.contrib.distributions.python.ops.wishart import *
 from tensorflow.python.ops.distributions.bernoulli import *
 from tensorflow.python.ops.distributions.beta import *
@@ -121,6 +122,7 @@ _allowed_symbols = [
     'Dirichlet',
     'DirichletMultinomial',
     'Multinomial',
+    'VectorLaplaceDiag',
     'WishartCholesky',
     'WishartFull',
     'TransformedDistribution',
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
index 2b28392d35..58368d92c4 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
@@ -24,9 +24,11 @@ import numpy as np
 from scipy import special
 
 from tensorflow.contrib.distributions.python.ops import distribution_util
+from tensorflow.contrib.linalg.python.ops import linear_operator_diag
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradient_checker
@@ -128,6 +130,80 @@ class AssertCloseTest(test.TestCase):
           array_ops.identity(w).eval(feed_dict=feed_dict)
 
 
+class ShapesFromLocAndScaleTest(test.TestCase):
+
+  def test_static_loc_static_scale_non_matching_event_size_raises(self):
+    loc = constant_op.constant(np.zeros((2, 4)))
+    scale = linear_operator_diag.LinearOperatorDiag(np.ones((5, 1, 3)))
+    with self.assertRaisesRegexp(ValueError, "could not be broadcast"):
+      distribution_util.shapes_from_loc_and_scale(loc, scale)
+
+  def test_static_loc_static_scale(self):
+    loc = constant_op.constant(np.zeros((2, 3)))
+    scale = linear_operator_diag.LinearOperatorDiag(np.ones((5, 1, 3)))
+    batch_shape, event_shape = distribution_util.shapes_from_loc_and_scale(
+        loc, scale)
+
+    self.assertEqual(tensor_shape.TensorShape([5, 2]), batch_shape)
+    self.assertEqual(tensor_shape.TensorShape([3]), event_shape)
+
+  def test_static_loc_dynamic_scale(self):
+    loc = constant_op.constant(np.zeros((2, 3)))
+    diag = array_ops.placeholder(dtypes.float64)
+    scale = linear_operator_diag.LinearOperatorDiag(diag)
+    with self.test_session() as sess:
+      batch_shape, event_shape = sess.run(
+          distribution_util.shapes_from_loc_and_scale(loc, scale),
+          feed_dict={diag: np.ones((5, 1, 3))})
+      self.assertAllEqual([5, 2], batch_shape)
+      self.assertAllEqual([3], event_shape)
+
+  def test_dynamic_loc_static_scale(self):
+    loc = array_ops.placeholder(dtypes.float64)
+    diag = constant_op.constant(np.ones((5, 2, 3)))
+    scale = linear_operator_diag.LinearOperatorDiag(diag)
+    with self.test_session():
+      batch_shape, event_shape = distribution_util.shapes_from_loc_and_scale(
+          loc, scale)
+      # batch_shape depends on both args, and so is dynamic.  Since loc did not
+      # have static shape, we infered event shape entirely from scale, and this
+      # is available statically.
+      self.assertAllEqual(
+          [5, 2], batch_shape.eval(feed_dict={loc: np.zeros((2, 3))}))
+      self.assertAllEqual([3], event_shape)
+
+  def test_dynamic_loc_dynamic_scale(self):
+    loc = array_ops.placeholder(dtypes.float64)
+    diag = array_ops.placeholder(dtypes.float64)
+    scale = linear_operator_diag.LinearOperatorDiag(diag)
+    with self.test_session() as sess:
+      batch_shape, event_shape = sess.run(
+          distribution_util.shapes_from_loc_and_scale(loc, scale),
+          feed_dict={diag: np.ones((5, 2, 3)), loc: np.zeros((2, 3))})
+      self.assertAllEqual([5, 2], batch_shape)
+      self.assertAllEqual([3], event_shape)
+
+  def test_none_loc_static_scale(self):
+    loc = None
+    scale = linear_operator_diag.LinearOperatorDiag(np.ones((5, 1, 3)))
+    batch_shape, event_shape = distribution_util.shapes_from_loc_and_scale(
+        loc, scale)
+
+    self.assertEqual(tensor_shape.TensorShape([5, 1]), batch_shape)
+    self.assertEqual(tensor_shape.TensorShape([3]), event_shape)
+
+  def test_none_loc_dynamic_scale(self):
+    loc = None
+    diag = array_ops.placeholder(dtypes.float64)
+    scale = linear_operator_diag.LinearOperatorDiag(diag)
+    with self.test_session() as sess:
+      batch_shape, event_shape = sess.run(
+          distribution_util.shapes_from_loc_and_scale(loc, scale),
+          feed_dict={diag: np.ones((5, 1, 3))})
+      self.assertAllEqual([5, 1], batch_shape)
+      self.assertAllEqual([3], event_shape)
+
+
 class GetLogitsAndProbsTest(test.TestCase):
 
   def testGetLogitsAndProbsImproperArguments(self):
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py
index e803830a4e..a924d2e383 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_plus_low_rank_test.py
@@ -145,8 +145,6 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
     true_covariance = np.matmul(true_scale, true_scale.T)
     true_variance = np.diag(true_covariance)
     true_stddev = np.sqrt(true_variance)
-    true_det_covariance = np.linalg.det(true_covariance)
-    true_log_det_covariance = np.log(true_det_covariance)
 
     with self.test_session() as sess:
       dist = ds.MultivariateNormalDiagPlusLowRank(
@@ -231,8 +229,6 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
           analytical_covariance_,
           analytical_variance_,
           analytical_stddev_,
-          analytical_log_det_covariance_,
-          analytical_det_covariance_,
           scale_,
           sample_kl_identity_, analytical_kl_identity_,
           sample_kl_scaled_, analytical_kl_scaled_,
@@ -250,8 +246,6 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
           dist.covariance(),
           dist.variance(),
           dist.stddev(),
-          dist.log_det_covariance(),
-          dist.det_covariance(),
           scale,
           sample_kl_identity, analytical_kl_identity,
           sample_kl_scaled, analytical_kl_scaled,
@@ -266,8 +260,6 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
 
       sample_variance_ = np.diag(sample_covariance_)
       sample_stddev_ = np.sqrt(sample_variance_)
-      sample_det_covariance_ = np.linalg.det(sample_covariance_)
-      sample_log_det_covariance_ = np.log(sample_det_covariance_)
 
       logging.vlog(2, "true_mean:\n{}  ".format(true_mean))
       logging.vlog(2, "sample_mean:\n{}".format(sample_mean_))
@@ -286,20 +278,6 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
       logging.vlog(2, "sample_stddev:\n{}".format(sample_stddev_))
       logging.vlog(2, "analytical_stddev:\n{}".format(analytical_stddev_))
 
-      logging.vlog(2, "true_log_det_covariance:\n{}".format(
-          true_log_det_covariance))
-      logging.vlog(2, "sample_log_det_covariance:\n{}".format(
-          sample_log_det_covariance_))
-      logging.vlog(2, "analytical_log_det_covariance:\n{}".format(
-          analytical_log_det_covariance_))
-
-      logging.vlog(2, "true_det_covariance:\n{}".format(
-          true_det_covariance))
-      logging.vlog(2, "sample_det_covariance:\n{}".format(
-          sample_det_covariance_))
-      logging.vlog(2, "analytical_det_covariance:\n{}".format(
-          analytical_det_covariance_))
-
       logging.vlog(2, "true_scale:\n{}".format(true_scale))
       logging.vlog(2, "scale:\n{}".format(scale_))
 
@@ -353,17 +331,6 @@ class MultivariateNormalDiagPlusLowRankTest(test.TestCase):
       self.assertAllClose(true_stddev, analytical_stddev_,
                           atol=0., rtol=1e-6)
 
-      self.assertAllClose(true_log_det_covariance, sample_log_det_covariance_,
-                          atol=0., rtol=0.02)
-      self.assertAllClose(true_log_det_covariance,
-                          analytical_log_det_covariance_,
-                          atol=0., rtol=1e-6)
-
-      self.assertAllClose(true_det_covariance, sample_det_covariance_,
-                          atol=0., rtol=0.02)
-      self.assertAllClose(true_det_covariance, analytical_det_covariance_,
-                          atol=0., rtol=1e-5)
-
       self.assertAllClose(true_scale, scale_,
                           atol=0., rtol=1e-6)
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
index 11f632f3f4..8c6980ca57 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
@@ -300,8 +300,6 @@ class MultivariateNormalTriLTest(test.TestCase):
     true_covariance = np.matmul(true_scale, true_scale.T)
     true_variance = np.diag(true_covariance)
     true_stddev = np.sqrt(true_variance)
-    true_det_covariance = np.linalg.det(true_covariance)
-    true_log_det_covariance = np.log(true_det_covariance)
 
     with self.test_session() as sess:
       dist = ds.MultivariateNormalTriL(
@@ -334,8 +332,6 @@ class MultivariateNormalTriLTest(test.TestCase):
           analytical_covariance_,
           analytical_variance_,
           analytical_stddev_,
-          analytical_log_det_covariance_,
-          analytical_det_covariance_,
           sample_kl_chol_, analytical_kl_chol_,
           scale_,
       ] = sess.run([
@@ -345,16 +341,12 @@ class MultivariateNormalTriLTest(test.TestCase):
           dist.covariance(),
           dist.variance(),
           dist.stddev(),
-          dist.log_det_covariance(),
-          dist.det_covariance(),
           sample_kl_chol, analytical_kl_chol,
           scale,
       ])
 
       sample_variance_ = np.diag(sample_covariance_)
       sample_stddev_ = np.sqrt(sample_variance_)
-      sample_det_covariance_ = np.linalg.det(sample_covariance_)
-      sample_log_det_covariance_ = np.log(sample_det_covariance_)
 
       logging.vlog(2, "true_mean:\n{}  ".format(true_mean))
       logging.vlog(2, "sample_mean:\n{}".format(sample_mean_))
@@ -373,21 +365,6 @@ class MultivariateNormalTriLTest(test.TestCase):
       logging.vlog(2, "sample_stddev:\n{}".format(sample_stddev_))
       logging.vlog(2, "analytical_stddev:\n{}".format(analytical_stddev_))
 
-      logging.vlog(
-          2, "true_log_det_covariance:\n{}".format(true_log_det_covariance))
-      logging.vlog(
-          2, "sample_log_det_covariance:\n{}".format(
-              sample_log_det_covariance_))
-      logging.vlog(2, "analytical_log_det_covariance:\n{}".format(
-          analytical_log_det_covariance_))
-
-      logging.vlog(2, "true_det_covariance:\n{}".format(true_det_covariance))
-      logging.vlog(
-          2, "sample_det_covariance:\n{}".format(sample_det_covariance_))
-      logging.vlog(
-          2, "analytical_det_covariance:\n{}".format(
-              analytical_det_covariance_))
-
       logging.vlog(2, "true_scale:\n{}".format(true_scale))
       logging.vlog(2, "scale:\n{}".format(scale_))
 
@@ -414,17 +391,6 @@ class MultivariateNormalTriLTest(test.TestCase):
       self.assertAllClose(true_stddev, analytical_stddev_,
                           atol=0., rtol=1e-6)
 
-      self.assertAllClose(true_log_det_covariance, sample_log_det_covariance_,
-                          atol=0., rtol=0.04)
-      self.assertAllClose(true_log_det_covariance,
-                          analytical_log_det_covariance_,
-                          atol=0., rtol=1e-6)
-
-      self.assertAllClose(true_det_covariance, sample_det_covariance_,
-                          atol=0., rtol=0.03)
-      self.assertAllClose(true_det_covariance, analytical_det_covariance_,
-                          atol=0., rtol=1e-6)
-
       self.assertAllClose(true_scale, scale_,
                           atol=0., rtol=1e-6)
 
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py b/tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py
new file mode 100644
index 0000000000..fc04acd90c
--- /dev/null
+++ b/tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py
@@ -0,0 +1,207 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for VectorLaplaceLinearOperator."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+from tensorflow.contrib import distributions
+from tensorflow.contrib.distributions.python.ops import bijectors
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import test
+
+
+ds = distributions
+
+
+class VectorLaplaceDiagTest(test.TestCase):
+  """Well tested because this is a simple override of the base class."""
+
+  def setUp(self):
+    self._rng = np.random.RandomState(42)
+
+  def testScalarParams(self):
+    mu = -1.
+    diag = -5.
+    with self.test_session():
+      with self.assertRaisesRegexp(ValueError, "at least 1 dimension"):
+        ds.VectorLaplaceDiag(mu, diag)
+
+  def testVectorParams(self):
+    mu = [-1.]
+    diag = [-5.]
+    with self.test_session():
+      dist = ds.VectorLaplaceDiag(mu, diag, validate_args=True)
+      self.assertAllEqual([3, 1], dist.sample(3).get_shape())
+
+  def testDistWithBatchShapeOneThenTransformedThroughSoftplus(self):
+    # This complex combination of events resulted in a loss of static shape
+    # information when tensor_util.constant_value(self._needs_rotation) was
+    # being used incorrectly (resulting in always rotating).
+    # Batch shape = [1], event shape = [3]
+    mu = array_ops.zeros((1, 3))
+    diag = array_ops.ones((1, 3))
+    with self.test_session():
+      base_dist = ds.VectorLaplaceDiag(mu, diag, validate_args=True)
+      dist = ds.TransformedDistribution(
+          base_dist,
+          validate_args=True,
+          bijector=bijectors.Softplus(event_ndims=1))
+      samps = dist.sample(5)  # Shape [5, 1, 3].
+      self.assertAllEqual([5, 1], dist.log_prob(samps).get_shape())
+
+  def testMean(self):
+    mu = [-1., 1]
+    diag = [1., -5]
+    with self.test_session():
+      dist = ds.VectorLaplaceDiag(mu, diag, validate_args=True)
+      self.assertAllEqual(mu, dist.mean().eval())
+
+  def testMeanWithBroadcastLoc(self):
+    mu = [-1.]
+    diag = [1., -5]
+    with self.test_session():
+      dist = ds.VectorLaplaceDiag(mu, diag, validate_args=True)
+      self.assertAllEqual([-1., -1.], dist.mean().eval())
+
+  def testSample(self):
+    mu = [-1., 1]
+    diag = [1., -2]
+    with self.test_session():
+      dist = ds.VectorLaplaceDiag(mu, diag, validate_args=True)
+      samps = dist.sample(int(1e4), seed=0).eval()
+      cov_mat = 2. * array_ops.matrix_diag(diag).eval()**2
+
+      self.assertAllClose(mu, samps.mean(axis=0),
+                          atol=0., rtol=0.05)
+      self.assertAllClose(cov_mat, np.cov(samps.T),
+                          atol=0.05, rtol=0.05)
+
+  def testSampleWithBroadcastScale(self):
+    # mu corresponds to a 2-batch of 3-variate normals
+    mu = np.zeros([2, 3])
+
+    # diag corresponds to no batches of 3-variate normals
+    diag = np.ones([3])
+
+    with self.test_session():
+      dist = ds.VectorLaplaceDiag(mu, diag, validate_args=True)
+
+      mean = dist.mean()
+      self.assertAllEqual([2, 3], mean.get_shape())
+      self.assertAllClose(mu, mean.eval())
+
+      n = int(1e4)
+      samps = dist.sample(n, seed=0).eval()
+      cov_mat = 2. * array_ops.matrix_diag(diag).eval()**2
+      sample_cov = np.matmul(samps.transpose([1, 2, 0]),
+                             samps.transpose([1, 0, 2])) / n
+
+      self.assertAllClose(mu, samps.mean(axis=0),
+                          atol=0.10, rtol=0.05)
+      self.assertAllClose([cov_mat, cov_mat], sample_cov,
+                          atol=0.10, rtol=0.05)
+
+  def testCovariance(self):
+    with self.test_session():
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([2, 3], dtype=dtypes.float32))
+      self.assertAllClose(
+          2. * np.diag(np.ones([3], dtype=np.float32)),
+          vla.covariance().eval())
+
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([3], dtype=dtypes.float32),
+          scale_identity_multiplier=[3., 2.])
+      self.assertAllEqual([2], vla.batch_shape)
+      self.assertAllEqual([3], vla.event_shape)
+      self.assertAllClose(
+          2. * np.array([[[3., 0, 0],
+                          [0, 3, 0],
+                          [0, 0, 3]],
+                         [[2, 0, 0],
+                          [0, 2, 0],
+                          [0, 0, 2]]])**2.,
+          vla.covariance().eval())
+
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([3], dtype=dtypes.float32),
+          scale_diag=[[3., 2, 1], [4, 5, 6]])
+      self.assertAllEqual([2], vla.batch_shape)
+      self.assertAllEqual([3], vla.event_shape)
+      self.assertAllClose(
+          2. * np.array([[[3., 0, 0],
+                          [0, 2, 0],
+                          [0, 0, 1]],
+                         [[4, 0, 0],
+                          [0, 5, 0],
+                          [0, 0, 6]]])**2.,
+          vla.covariance().eval())
+
+  def testVariance(self):
+    with self.test_session():
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([2, 3], dtype=dtypes.float32))
+      self.assertAllClose(
+          2. * np.ones([3], dtype=np.float32),
+          vla.variance().eval())
+
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([3], dtype=dtypes.float32),
+          scale_identity_multiplier=[3., 2.])
+      self.assertAllClose(
+          2. * np.array([[3., 3, 3],
+                         [2, 2, 2]])**2.,
+          vla.variance().eval())
+
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([3], dtype=dtypes.float32),
+          scale_diag=[[3., 2, 1],
+                      [4, 5, 6]])
+      self.assertAllClose(
+          2. * np.array([[3., 2, 1],
+                         [4, 5, 6]])**2.,
+          vla.variance().eval())
+
+  def testStddev(self):
+    with self.test_session():
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([2, 3], dtype=dtypes.float32))
+      self.assertAllClose(
+          np.sqrt(2) * np.ones([3], dtype=np.float32),
+          vla.stddev().eval())
+
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([3], dtype=dtypes.float32),
+          scale_identity_multiplier=[3., 2.])
+      self.assertAllClose(
+          np.sqrt(2) * np.array([[3., 3, 3],
+                                 [2, 2, 2]]),
+          vla.stddev().eval())
+
+      vla = ds.VectorLaplaceDiag(
+          loc=array_ops.zeros([3], dtype=dtypes.float32),
+          scale_diag=[[3., 2, 1], [4, 5, 6]])
+      self.assertAllClose(
+          np.sqrt(2) * np.array([[3., 2, 1],
+                                 [4, 5, 6]]),
+          vla.stddev().eval())
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/distributions/python/ops/distribution_util.py b/tensorflow/contrib/distributions/python/ops/distribution_util.py
index 7ae9c86ee4..370b4f4a06 100644
--- a/tensorflow/contrib/distributions/python/ops/distribution_util.py
+++ b/tensorflow/contrib/distributions/python/ops/distribution_util.py
@@ -20,6 +20,8 @@ from __future__ import print_function
 
 from tensorflow.contrib import linalg
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
@@ -90,3 +92,110 @@ def make_diag_scale(loc, scale_diag, scale_identity_multiplier,
         is_self_adjoint=True,
         is_positive_definite=assert_positive,
         assert_proper_shapes=validate_args)
+
+
+def shapes_from_loc_and_scale(loc, scale, name="shapes_from_loc_and_scale"):
+  """Infer distribution batch and event shapes from a location and scale.
+
+  Location and scale family distributions determine their batch/event shape by
+  broadcasting the `loc` and `scale` args.  This helper does that broadcast,
+  statically if possible.
+
+  Batch shape broadcasts as per the normal rules.
+  We allow the `loc` event shape to broadcast up to that of `scale`.  We do not
+  allow `scale`'s event shape to change.  Therefore, the last dimension of `loc`
+  must either be size `1`, or the same as `scale.range_dimension`.
+
+  See `MultivariateNormalLinearOperator` for a usage example.
+
+  Args:
+    loc:  `N-D` `Tensor` with `N >= 1` (already converted to tensor) or `None`.
+      If `None`, both batch and event shape are determined by `scale`.
+    scale:  A `LinearOperator` instance.
+    name:  A string name to prepend to created ops.
+
+  Returns:
+    batch_shape:  `TensorShape` (if broadcast is done statically), or `Tensor`.
+    event_shape:  `TensorShape` (if broadcast is done statically), or `Tensor`.
+
+  Raises:
+    ValueError:  If the last dimension of `loc` is determined statically to be
+      different than the range of `scale`.
+  """
+  with ops.name_scope(name, values=[loc] + scale.graph_parents):
+    # Get event shape.
+    event_size = scale.range_dimension_tensor()
+    event_size_const = tensor_util.constant_value(event_size)
+    if event_size_const is not None:
+      event_shape = event_size_const.reshape([1])
+    else:
+      event_shape = event_size[array_ops.newaxis]
+
+    # Static check that event shapes match.
+    if loc is not None:
+      loc_event_size = loc.get_shape()[-1].value
+      if loc_event_size is not None and event_size_const is not None:
+        if loc_event_size != 1 and loc_event_size != event_size_const:
+          raise ValueError(
+              "Event size of 'scale' (%d) could not be broadcast up to that of "
+              "'loc' (%d)." % (loc_event_size, event_size_const))
+
+    # Get batch shape.
+    batch_shape = scale.batch_shape_tensor()
+    if loc is None:
+      batch_shape_const = tensor_util.constant_value(batch_shape)
+      batch_shape = (
+          batch_shape_const if batch_shape_const is not None else batch_shape)
+    else:
+      loc_batch_shape = loc.get_shape().with_rank_at_least(1)[:-1]
+      if (loc.get_shape().ndims is None or
+          not loc_batch_shape.is_fully_defined()):
+        loc_batch_shape = array_ops.shape(loc)[:-1]
+      else:
+        loc_batch_shape = ops.convert_to_tensor(loc_batch_shape,
+                                                name="loc_batch_shape")
+      batch_shape = prefer_static_broadcast_shape(batch_shape, loc_batch_shape)
+
+  return batch_shape, event_shape
+
+
+def prefer_static_broadcast_shape(
+    shape1, shape2, name="prefer_static_broadcast_shape"):
+  """Convenience function which statically broadcasts shape when possible.
+
+  Args:
+    shape1:  `1-D` integer `Tensor`.  Already converted to tensor!
+    shape2:  `1-D` integer `Tensor`.  Already converted to tensor!
+    name:  A string name to prepend to created ops.
+
+  Returns:
+    The broadcast shape, either as `TensorShape` (if broadcast can be done
+      statically), or as a `Tensor`.
+  """
+  with ops.name_scope(name, values=[shape1, shape2]):
+    if (tensor_util.constant_value(shape1) is not None and
+        tensor_util.constant_value(shape2) is not None):
+      return array_ops.broadcast_static_shape(
+          tensor_shape.TensorShape(tensor_util.constant_value(shape1)),
+          tensor_shape.TensorShape(tensor_util.constant_value(shape2)))
+    return array_ops.broadcast_dynamic_shape(shape1, shape2)
+
+
+def is_diagonal_scale(scale):
+  """Returns `True` if `scale` is a `LinearOperator` that is known to be diag.
+
+  Args:
+    scale:  `LinearOperator` instance.
+
+  Returns:
+    Python `bool`.
+
+  Raises:
+    TypeError:  If `scale` is not a `LinearOperator`.
+  """
+  if not isinstance(scale, linalg.LinearOperator):
+    raise TypeError("Expected argument 'scale' to be instance of LinearOperator"
+                    ". Found: %s" % scale)
+  return (isinstance(scale, linalg.LinearOperatorIdentity) or
+          isinstance(scale, linalg.LinearOperatorScaledIdentity) or
+          isinstance(scale, linalg.LinearOperatorDiag))
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_diag.py b/tensorflow/contrib/distributions/python/ops/mvn_diag.py
index 946c1dc16b..e57145b42f 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_diag.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_diag.py
@@ -146,8 +146,8 @@ class MultivariateNormalDiag(
     The `batch_shape` is the broadcast shape between `loc` and `scale`
     arguments.
 
-    The `event_shape` is given by the last dimension of `loc` or the last
-    dimension of the matrix implied by `scale`.
+    The `event_shape` is given by last dimension of the matrix implied by
+    `scale`. The last dimension of `loc` (if provided) must broadcast with this.
 
     Recall that `covariance = scale @ scale.T`. A (non-batch) `scale` matrix is:
 
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_diag_plus_low_rank.py b/tensorflow/contrib/distributions/python/ops/mvn_diag_plus_low_rank.py
index 1d4132cfd4..ee3e02e020 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_diag_plus_low_rank.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_diag_plus_low_rank.py
@@ -155,8 +155,8 @@ class MultivariateNormalDiagPlusLowRank(
     The `batch_shape` is the broadcast shape between `loc` and `scale`
     arguments.
 
-    The `event_shape` is given by the last dimension of `loc` or the last
-    dimension of the matrix implied by `scale`.
+    The `event_shape` is given by last dimension of the matrix implied by
+    `scale`. The last dimension of `loc` (if provided) must broadcast with this.
 
     Recall that `covariance = scale @ scale.T`. A (non-batch) `scale` matrix is:
 
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
index fbd623ed3a..15e699906f 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
@@ -20,16 +20,14 @@ from __future__ import print_function
 
 from tensorflow.contrib import linalg
 from tensorflow.contrib.distributions.python.ops import bijectors
+from tensorflow.contrib.distributions.python.ops import distribution_util
 from tensorflow.python.framework import ops
-from tensorflow.python.framework import tensor_shape
-from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops.distributions import kullback_leibler
 from tensorflow.python.ops.distributions import normal
 from tensorflow.python.ops.distributions import transformed_distribution
-from tensorflow.python.ops.distributions import util as distribution_util
 
 
 __all__ = [
@@ -54,16 +52,6 @@ or
 """
 
 
-def _broadcast_shape(shape1, shape2):
-  """Convenience function which statically broadcasts shape when possible."""
-  if (tensor_util.constant_value(shape1) is not None and
-      tensor_util.constant_value(shape2) is not None):
-    return array_ops.broadcast_static_shape(
-        tensor_shape.TensorShape(tensor_util.constant_value(shape1)),
-        tensor_shape.TensorShape(tensor_util.constant_value(shape2)))
-  return array_ops.broadcast_dynamic_shape(shape1, shape2)
-
-
 # TODO(b/35290280): Import in `../../__init__.py` after adding unit-tests.
 class MultivariateNormalLinearOperator(
     transformed_distribution.TransformedDistribution):
@@ -71,7 +59,7 @@ class MultivariateNormalLinearOperator(
 
   The Multivariate Normal distribution is defined over `R^k` and parameterized
   by a (batch of) length-`k` `loc` vector (aka "mu") and a (batch of) `k x k`
-  `scale` matrix; `covariance = scale @ scale.T` where `@` denotes
+  `scale` matrix; `covariance = scale @ scale.T`, where `@` denotes
   matrix-multiplication.
 
   #### Mathematical Details
@@ -158,8 +146,8 @@ class MultivariateNormalLinearOperator(
     The `batch_shape` is the broadcast shape between `loc` and `scale`
     arguments.
 
-    The `event_shape` is given by the last dimension of `loc` or the last
-    dimension of the matrix implied by `scale`.
+    The `event_shape` is given by last dimension of the matrix implied by
+    `scale`. The last dimension of `loc` (if provided) must broadcast with this.
 
     Recall that `covariance = scale @ scale.T`.
 
@@ -193,22 +181,9 @@ class MultivariateNormalLinearOperator(
     with ops.name_scope(name, values=[loc] + scale.graph_parents):
       # Since expand_dims doesn't preserve constant-ness, we obtain the
       # non-dynamic value if possible.
-      event_shape = scale.range_dimension_tensor()
-      if tensor_util.constant_value(event_shape) is not None:
-        event_shape = tensor_util.constant_value(event_shape).reshape([1])
-      else:
-        event_shape = event_shape[array_ops.newaxis]
-      batch_shape = scale.batch_shape_tensor()
-      if loc is not None:
-        loc = ops.convert_to_tensor(loc, name="loc")
-        loc_batch_shape = loc.get_shape().with_rank_at_least(1)[:-1]
-        if (loc.get_shape().ndims is None or
-            not loc_batch_shape.is_fully_defined()):
-          loc_batch_shape = array_ops.shape(loc)[:-1]
-        else:
-          loc_batch_shape = ops.convert_to_tensor(loc_batch_shape,
-                                                  name="loc_batch_shape")
-        batch_shape = _broadcast_shape(batch_shape, loc_batch_shape)
+      loc = ops.convert_to_tensor(loc, name="loc") if loc is not None else loc
+      batch_shape, event_shape = distribution_util.shapes_from_loc_and_scale(
+          loc, scale)
 
     super(MultivariateNormalLinearOperator, self).__init__(
         distribution=normal.Normal(
@@ -232,18 +207,6 @@ class MultivariateNormalLinearOperator(
     """The `scale` `LinearOperator` in `Y = scale @ X + loc`."""
     return self.bijector.scale
 
-  def log_det_covariance(self, name="log_det_covariance"):
-    """Log of determinant of covariance matrix."""
-    with ops.name_scope(self.name):
-      with ops.name_scope(name, values=self.scale.graph_parents):
-        return 2. * self.scale.log_abs_determinant()
-
-  def det_covariance(self, name="det_covariance"):
-    """Determinant of covariance matrix."""
-    with ops.name_scope(self.name):
-      with ops.name_scope(name, values=self.scale.graph_parents):
-        return math_ops.exp(2.* self.scale.log_abs_determinant())
-
   @distribution_util.AppendDocstring(_mvn_sample_note)
   def _log_prob(self, x):
     return super(MultivariateNormalLinearOperator, self)._log_prob(x)
@@ -272,41 +235,32 @@ class MultivariateNormalLinearOperator(
     return array_ops.identity(self.loc) + array_ops.zeros(shape, self.dtype)
 
   def _covariance(self):
-    if (isinstance(self.scale, linalg.LinearOperatorIdentity) or
-        isinstance(self.scale, linalg.LinearOperatorScaledIdentity) or
-        isinstance(self.scale, linalg.LinearOperatorDiag)):
+    if distribution_util.is_diagonal_scale(self.scale):
       return array_ops.matrix_diag(math_ops.square(self.scale.diag_part()))
     else:
-      # TODO(b/35040238): Remove transpose once LinOp supports `transpose`.
-      return self.scale.apply(array_ops.matrix_transpose(self.scale.to_dense()))
+      return self.scale.apply(self.scale.to_dense(), adjoint_arg=True)
 
   def _variance(self):
-    if (isinstance(self.scale, linalg.LinearOperatorIdentity) or
-        isinstance(self.scale, linalg.LinearOperatorScaledIdentity) or
-        isinstance(self.scale, linalg.LinearOperatorDiag)):
+    if distribution_util.is_diagonal_scale(self.scale):
       return math_ops.square(self.scale.diag_part())
     elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
           and self.scale.is_self_adjoint):
       return array_ops.matrix_diag_part(
           self.scale.apply(self.scale.to_dense()))
     else:
-      # TODO(b/35040238): Remove transpose once LinOp supports `transpose`.
       return array_ops.matrix_diag_part(
-          self.scale.apply(array_ops.matrix_transpose(self.scale.to_dense())))
+          self.scale.apply(self.scale.to_dense(), adjoint_arg=True))
 
   def _stddev(self):
-    if (isinstance(self.scale, linalg.LinearOperatorIdentity) or
-        isinstance(self.scale, linalg.LinearOperatorScaledIdentity) or
-        isinstance(self.scale, linalg.LinearOperatorDiag)):
+    if distribution_util.is_diagonal_scale(self.scale):
       return math_ops.abs(self.scale.diag_part())
     elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
           and self.scale.is_self_adjoint):
       return math_ops.sqrt(array_ops.matrix_diag_part(
           self.scale.apply(self.scale.to_dense())))
     else:
-      # TODO(b/35040238): Remove transpose once LinOp supports `transpose`.
       return math_ops.sqrt(array_ops.matrix_diag_part(
-          self.scale.apply(array_ops.matrix_transpose(self.scale.to_dense()))))
+          self.scale.apply(self.scale.to_dense(), adjoint_arg=True)))
 
   def _mode(self):
     return self._mean()
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_tril.py b/tensorflow/contrib/distributions/python/ops/mvn_tril.py
index 8594b1a4f9..dd5933f62b 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_tril.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_tril.py
@@ -140,8 +140,8 @@ class MultivariateNormalTriL(
     The `batch_shape` is the broadcast shape between `loc` and `scale`
     arguments.
 
-    The `event_shape` is given by the last dimension of `loc` or the last
-    dimension of the matrix implied by `scale`.
+    The `event_shape` is given by last dimension of the matrix implied by
+    `scale`. The last dimension of `loc` (if provided) must broadcast with this.
 
     Recall that `covariance = scale @ scale.T`. A (non-batch) `scale` matrix is:
 
diff --git a/tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py b/tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py
new file mode 100644
index 0000000000..2dfda81a15
--- /dev/null
+++ b/tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py
@@ -0,0 +1,229 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Distribution of a vectorized Laplace, with uncorrelated components."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.distributions.python.ops import distribution_util
+from tensorflow.contrib.distributions.python.ops import vector_laplace_linear_operator as vector_laplace_linop
+from tensorflow.python.framework import ops
+
+
+__all__ = [
+    "VectorLaplaceDiag",
+]
+
+
+class VectorLaplaceDiag(
+    vector_laplace_linop.VectorLaplaceLinearOperator):
+  """The vectorization of the Laplace distribution on `R^k`.
+
+  The vector laplace distribution is defined over `R^k`, and parameterized by
+  a (batch of) length-`k` `loc` vector (the means) and a (batch of) `k x k`
+  `scale` matrix:  `covariance = 2 * scale @ scale.T`, where `@` denotes
+  matrix-multiplication.
+
+  #### Mathematical Details
+
+  The probability density function (pdf) is,
+
+  ```none
+  pdf(x; loc, scale) = exp(-||y||_1) / Z,
+  y = inv(scale) @ (x - loc),
+  Z = 2**k |det(scale)|,
+  ```
+
+  where:
+
+  * `loc` is a vector in `R^k`,
+  * `scale` is a linear operator in `R^{k x k}`, `cov = scale @ scale.T`,
+  * `Z` denotes the normalization constant, and,
+  * `||y||_1` denotes the `l1` norm of `y`, `sum_i |y_i|.
+
+  A (non-batch) `scale` matrix is:
+
+  ```none
+  scale = diag(scale_diag + scale_identity_multiplier * ones(k))
+  ```
+
+  where:
+
+  * `scale_diag.shape = [k]`, and,
+  * `scale_identity_multiplier.shape = []`.
+
+  Additional leading dimensions (if any) will index batches.
+
+  If both `scale_diag` and `scale_identity_multiplier` are `None`, then
+  `scale` is the Identity matrix.
+
+  The VectorLaplace distribution is a member of the [location-scale
+  family](https://en.wikipedia.org/wiki/Location-scale_family), i.e., it can be
+  constructed as,
+
+  ```none
+  X = (X_1, ..., X_k), each X_i ~ Laplace(loc=0, scale=1)
+  Y = (Y_1, ...,Y_k) = scale @ X + loc
+  ```
+
+  #### About `VectorLaplace` and `Vector` distributions in TensorFlow.
+
+  The `VectorLaplace` is a non-standard distribution that has useful properties.
+
+  The marginals `Y_1, ..., Y_k` are *not* Laplace random variables, due to
+  the fact that the sum of Laplace random variables is not Laplace.
+
+  Instead, `Y` is a vector whose components are linear combinations of Laplace
+  random variables.  Thus, `Y` lives in the vector space generated by `vectors`
+  of Laplace distributions.  This allows the user to decide the mean and
+  covariance (by setting `loc` and `scale`), while preserving some properties of
+  the Laplace distribution.  In particular, the tails of `Y_i` will be (up to
+  polynomial factors) exponentially decaying.
+
+  To see this last statement, note that the pdf of `Y_i` is the convolution of
+  the pdf of `k` independent Laplace random variables.  One can then show by
+  induction that distributions with exponential (up to polynomial factors) tails
+  are closed under convolution.
+
+  #### Examples
+
+  ```python
+  ds = tf.contrib.distributions
+
+  # Initialize a single 2-variate VectorLaplace.
+  vla = ds.VectorLaplaceDiag(
+      loc=[1., -1],
+      scale_diag=[1, 2.])
+
+  vla.mean().eval()
+  # ==> [1., -1]
+
+  vla.stddev().eval()
+  # ==> [1., 2] * sqrt(2)
+
+  # Evaluate this on an observation in `R^2`, returning a scalar.
+  vla.prob([-1., 0]).eval()  # shape: []
+
+  # Initialize a 3-batch, 2-variate scaled-identity VectorLaplace.
+  vla = ds.VectorLaplaceDiag(
+      loc=[1., -1],
+      scale_identity_multiplier=[1, 2., 3])
+
+  vla.mean().eval()  # shape: [3, 2]
+  # ==> [[1., -1]
+  #      [1, -1],
+  #      [1, -1]]
+
+  vla.stddev().eval()  # shape: [3, 2]
+  # ==> sqrt(2) * [[1., 1],
+  #                [2, 2],
+  #                [3, 3]]
+
+  # Evaluate this on an observation in `R^2`, returning a length-3 vector.
+  vla.prob([-1., 0]).eval()  # shape: [3]
+
+  # Initialize a 2-batch of 3-variate VectorLaplace's.
+  vla = ds.VectorLaplaceDiag(
+      loc=[[1., 2, 3],
+           [11, 22, 33]]           # shape: [2, 3]
+      scale_diag=[[1., 2, 3],
+                  [0.5, 1, 1.5]])  # shape: [2, 3]
+
+  # Evaluate this on a two observations, each in `R^3`, returning a length-2
+  # vector.
+  x = [[-1., 0, 1],
+       [-11, 0, 11.]]   # shape: [2, 3].
+  vla.prob(x).eval()    # shape: [2]
+  ```
+
+  """
+
+  def __init__(self,
+               loc=None,
+               scale_diag=None,
+               scale_identity_multiplier=None,
+               validate_args=False,
+               allow_nan_stats=True,
+               name="VectorLaplaceDiag"):
+    """Construct Vector Laplace distribution on `R^k`.
+
+    The `batch_shape` is the broadcast shape between `loc` and `scale`
+    arguments.
+
+    The `event_shape` is given by last dimension of the matrix implied by
+    `scale`. The last dimension of `loc` (if provided) must broadcast with this.
+
+    Recall that `covariance = 2 * scale @ scale.T`.
+
+    ```none
+    scale = diag(scale_diag + scale_identity_multiplier * ones(k))
+    ```
+
+    where:
+
+    * `scale_diag.shape = [k]`, and,
+    * `scale_identity_multiplier.shape = []`.
+
+    Additional leading dimensions (if any) will index batches.
+
+    If both `scale_diag` and `scale_identity_multiplier` are `None`, then
+    `scale` is the Identity matrix.
+
+    Args:
+      loc: Floating-point `Tensor`. If this is set to `None`, `loc` is
+        implicitly `0`. When specified, may have shape `[B1, ..., Bb, k]` where
+        `b >= 0` and `k` is the event size.
+      scale_diag: Non-zero, floating-point `Tensor` representing a diagonal
+        matrix added to `scale`. May have shape `[B1, ..., Bb, k]`, `b >= 0`,
+        and characterizes `b`-batches of `k x k` diagonal matrices added to
+        `scale`. When both `scale_identity_multiplier` and `scale_diag` are
+        `None` then `scale` is the `Identity`.
+      scale_identity_multiplier: Non-zero, floating-point `Tensor` representing
+        a scaled-identity-matrix added to `scale`. May have shape
+        `[B1, ..., Bb]`, `b >= 0`, and characterizes `b`-batches of scaled
+        `k x k` identity matrices added to `scale`. When both
+        `scale_identity_multiplier` and `scale_diag` are `None` then `scale` is
+        the `Identity`.
+      validate_args: Python `bool`, default `False`. When `True` distribution
+        parameters are checked for validity despite possibly degrading runtime
+        performance. When `False` invalid inputs may silently render incorrect
+        outputs.
+      allow_nan_stats: Python `bool`, default `True`. When `True`,
+        statistics (e.g., mean, mode, variance) use the value "`NaN`" to
+        indicate the result is undefined. When `False`, an exception is raised
+        if one or more of the statistic's batch members are undefined.
+      name: Python `str` name prefixed to Ops created by this class.
+
+    Raises:
+      ValueError: if at most `scale_identity_multiplier` is specified.
+    """
+    parameters = locals()
+    with ops.name_scope(name):
+      with ops.name_scope("init", values=[
+          loc, scale_diag, scale_identity_multiplier]):
+        scale = distribution_util.make_diag_scale(
+            loc=loc,
+            scale_diag=scale_diag,
+            scale_identity_multiplier=scale_identity_multiplier,
+            validate_args=validate_args,
+            assert_positive=False)
+    super(VectorLaplaceDiag, self).__init__(
+        loc=loc,
+        scale=scale,
+        validate_args=validate_args,
+        allow_nan_stats=allow_nan_stats,
+        name=name)
+    self._parameters = parameters
diff --git a/tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py b/tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py
new file mode 100644
index 0000000000..346835dd59
--- /dev/null
+++ b/tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py
@@ -0,0 +1,294 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Vectorized Laplace distribution class, directly using LinearOpeartor."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib import linalg
+from tensorflow.contrib.distributions.python.ops import bijectors
+from tensorflow.contrib.distributions.python.ops import distribution_util
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops.distributions import laplace
+from tensorflow.python.ops.distributions import transformed_distribution
+
+
+__all__ = [
+    "VectorLaplaceLinearOperator"
+]
+
+_mvn_sample_note = """
+`value` is a batch vector with compatible shape if `value` is a `Tensor` whose
+shape can be broadcast up to either:
+
+```python
+self.batch_shape + self.event_shape
+```
+
+or
+
+```python
+[M1, ..., Mm] + self.batch_shape + self.event_shape
+```
+
+"""
+
+
+class VectorLaplaceLinearOperator(
+    transformed_distribution.TransformedDistribution):
+  """The vectorization of the Laplace distribution on `R^k`.
+
+  The vector laplace distribution is defined over `R^k`, and parameterized by
+  a (batch of) length-`k` `loc` vector (the means) and a (batch of) `k x k`
+  `scale` matrix:  `covariance = 2 * scale @ scale.T`, where `@` denotes
+  matrix-multiplication.
+
+  #### Mathematical Details
+
+  The probability density function (pdf) is,
+
+  ```none
+  pdf(x; loc, scale) = exp(-||y||_1) / Z,
+  y = inv(scale) @ (x - loc),
+  Z = 2**k |det(scale)|,
+  ```
+
+  where:
+
+  * `loc` is a vector in `R^k`,
+  * `scale` is a linear operator in `R^{k x k}`, `cov = scale @ scale.T`,
+  * `Z` denotes the normalization constant, and,
+  * `||y||_1` denotes the `l1` norm of `y`, `sum_i |y_i|.
+
+  The VectorLaplace distribution is a member of the [location-scale
+  family](https://en.wikipedia.org/wiki/Location-scale_family), i.e., it can be
+  constructed as,
+
+  ```none
+  X = (X_1, ..., X_k), each X_i ~ Laplace(loc=0, scale=1)
+  Y = (Y_1, ...,Y_k) = scale @ X + loc
+  ```
+
+  #### About `VectorLaplace` and `Vector` distributions in TensorFlow.
+
+  The `VectorLaplace` is a non-standard distribution that has useful properties.
+
+  The marginals `Y_1, ..., Y_k` are *not* Laplace random variables, due to
+  the fact that the sum of Laplace random variables is not Laplace.
+
+  Instead, `Y` is a vector whose components are linear combinations of Laplace
+  random variables.  Thus, `Y` lives in the vector space generated by `vectors`
+  of Laplace distributions.  This allows the user to decide the mean and
+  covariance (by setting `loc` and `scale`), while preserving some properties of
+  the Laplace distribution.  In particular, the tails of `Y_i` will be (up to
+  polynomial factors) exponentially decaying.
+
+  To see this last statement, note that the pdf of `Y_i` is the convolution of
+  the pdf of `k` independent Laplace random variables.  One can then show by
+  induction that distributions with exponential (up to polynomial factors) tails
+  are closed under convolution.
+
+
+  #### Examples
+
+  ```python
+  ds = tf.contrib.distributions
+  la = tf.contrib.linalg
+
+  # Initialize a single 3-variate VectorLaplace with some desired covariance.
+  mu = [1., 2, 3]
+  cov = [[ 0.36,  0.12,  0.06],
+         [ 0.12,  0.29, -0.13],
+         [ 0.06, -0.13,  0.26]]
+
+  scale = tf.cholesky(cov)
+  # ==> [[ 0.6,  0. ,  0. ],
+  #      [ 0.2,  0.5,  0. ],
+  #      [ 0.1, -0.3,  0.4]])
+
+  # Divide scale by sqrt(2) so that the final covariance will be what we want.
+  vla = ds.VectorLaplaceLinearOperator(
+      loc=mu,
+      scale=la.LinearOperatorTriL(scale / tf.sqrt(2)))
+
+  # Covariance agrees with cholesky(cov) parameterization.
+  vla.covariance().eval()
+  # ==> [[ 0.36,  0.12,  0.06],
+  #      [ 0.12,  0.29, -0.13],
+  #      [ 0.06, -0.13,  0.26]]
+
+  # Compute the pdf of an`R^3` observation; return a scalar.
+  vla.prob([-1., 0, 1]).eval()  # shape: []
+
+  # Initialize a 2-batch of 3-variate Vector Laplace's.
+  mu = [[1., 2, 3],
+        [11, 22, 33]]              # shape: [2, 3]
+  scale_diag = [[1., 2, 3],
+                [0.5, 1, 1.5]]     # shape: [2, 3]
+
+  vla = ds.VectorLaplaceLinearOperator(
+      loc=mu,
+      scale=la.LinearOperatorDiag(scale_diag))
+
+  # Compute the pdf of two `R^3` observations; return a length-2 vector.
+  x = [[-0.9, 0, 0.1],
+       [-10, 0, 9]]     # shape: [2, 3]
+  vla.prob(x).eval()    # shape: [2]
+  ```
+
+  """
+
+  def __init__(self,
+               loc=None,
+               scale=None,
+               validate_args=False,
+               allow_nan_stats=True,
+               name="VectorLaplaceLinearOperator"):
+    """Construct Vector Laplace distribution on `R^k`.
+
+    The `batch_shape` is the broadcast shape between `loc` and `scale`
+    arguments.
+
+    The `event_shape` is given by last dimension of the matrix implied by
+    `scale`. The last dimension of `loc` (if provided) must broadcast with this.
+
+    Recall that `covariance = 2 * scale @ scale.T`.
+
+    Additional leading dimensions (if any) will index batches.
+
+    Args:
+      loc: Floating-point `Tensor`. If this is set to `None`, `loc` is
+        implicitly `0`. When specified, may have shape `[B1, ..., Bb, k]` where
+        `b >= 0` and `k` is the event size.
+      scale: Instance of `LinearOperator` with same `dtype` as `loc` and shape
+        `[B1, ..., Bb, k, k]`.
+      validate_args: Python `bool`, default `False`. Whether to validate input
+        with asserts. If `validate_args` is `False`, and the inputs are
+        invalid, correct behavior is not guaranteed.
+      allow_nan_stats: Python `bool`, default `True`. If `False`, raise an
+        exception if a statistic (e.g. mean/mode/etc...) is undefined for any
+        batch member If `True`, batch members with valid parameters leading to
+        undefined statistics will return NaN for this statistic.
+      name: The name to give Ops created by the initializer.
+
+    Raises:
+      ValueError: if `scale` is unspecified.
+      TypeError: if not `scale.dtype.is_floating`
+    """
+    parameters = locals()
+    if scale is None:
+      raise ValueError("Missing required `scale` parameter.")
+    if not scale.dtype.is_floating:
+      raise TypeError("`scale` parameter must have floating-point dtype.")
+
+    with ops.name_scope(name, values=[loc] + scale.graph_parents):
+      # Since expand_dims doesn't preserve constant-ness, we obtain the
+      # non-dynamic value if possible.
+      loc = ops.convert_to_tensor(loc, name="loc") if loc is not None else loc
+      batch_shape, event_shape = distribution_util.shapes_from_loc_and_scale(
+          loc, scale)
+
+      super(VectorLaplaceLinearOperator, self).__init__(
+          distribution=laplace.Laplace(
+              loc=array_ops.zeros([], dtype=scale.dtype),
+              scale=array_ops.ones([], dtype=scale.dtype)),
+          bijector=bijectors.AffineLinearOperator(
+              shift=loc, scale=scale, validate_args=validate_args),
+          batch_shape=batch_shape,
+          event_shape=event_shape,
+          validate_args=validate_args,
+          name=name)
+      self._parameters = parameters
+
+  @property
+  def loc(self):
+    """The `loc` `Tensor` in `Y = scale @ X + loc`."""
+    return self.bijector.shift
+
+  @property
+  def scale(self):
+    """The `scale` `LinearOperator` in `Y = scale @ X + loc`."""
+    return self.bijector.scale
+
+  @distribution_util.AppendDocstring(_mvn_sample_note)
+  def _log_prob(self, x):
+    return super(VectorLaplaceLinearOperator, self)._log_prob(x)
+
+  @distribution_util.AppendDocstring(_mvn_sample_note)
+  def _prob(self, x):
+    return super(VectorLaplaceLinearOperator, self)._prob(x)
+
+  def _mean(self):
+    shape = self.batch_shape.concatenate(self.event_shape)
+    has_static_shape = shape.is_fully_defined()
+    if not has_static_shape:
+      shape = array_ops.concat([
+          self.batch_shape_tensor(),
+          self.event_shape_tensor(),
+      ], 0)
+
+    if self.loc is None:
+      return array_ops.zeros(shape, self.dtype)
+
+    if has_static_shape and shape == self.loc.get_shape():
+      return array_ops.identity(self.loc)
+
+    # Add dummy tensor of zeros to broadcast.  This is only necessary if shape
+    # != self.loc.shape, but we could not determine if this is the case.
+    return array_ops.identity(self.loc) + array_ops.zeros(shape, self.dtype)
+
+  def _covariance(self):
+    # Let
+    #   W = (w1,...,wk), with wj ~ iid Laplace(0, 1).
+    # Then this distribution is
+    #   X = loc + LW,
+    # and since E[X] = loc,
+    #   Cov(X) = E[LW W^T L^T] = L E[W W^T] L^T.
+    # Since E[wi wj] = 0 if i != j, and 2 if i == j, we have
+    #   Cov(X) = 2 LL^T
+    if distribution_util.is_diagonal_scale(self.scale):
+      return 2. * array_ops.matrix_diag(math_ops.square(self.scale.diag_part()))
+    else:
+      return 2. * self.scale.apply(self.scale.to_dense(), adjoint_arg=True)
+
+  def _variance(self):
+    if distribution_util.is_diagonal_scale(self.scale):
+      return 2. * math_ops.square(self.scale.diag_part())
+    elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
+          and self.scale.is_self_adjoint):
+      return array_ops.matrix_diag_part(
+          2. * self.scale.apply(self.scale.to_dense()))
+    else:
+      return 2. * array_ops.matrix_diag_part(
+          self.scale.apply(self.scale.to_dense(), adjoint_arg=True))
+
+  def _stddev(self):
+    if distribution_util.is_diagonal_scale(self.scale):
+      return np.sqrt(2) * math_ops.abs(self.scale.diag_part())
+    elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
+          and self.scale.is_self_adjoint):
+      return np.sqrt(2) * math_ops.sqrt(array_ops.matrix_diag_part(
+          self.scale.apply(self.scale.to_dense())))
+    else:
+      return np.sqrt(2) * math_ops.sqrt(array_ops.matrix_diag_part(
+          self.scale.apply(self.scale.to_dense(), adjoint_arg=True)))
+
+  def _mode(self):
+    return self._mean()
-- 
GitLab


From 50a22848cef10e924a5b72fd0ca2741d8366161b Mon Sep 17 00:00:00 2001
From: Dan Ringwalt <ringwalt@google.com>
Date: Mon, 8 May 2017 13:19:24 -0700
Subject: [PATCH 1119/1563] Support a list of globs in
 file_io.get_matching_files.

PiperOrigin-RevId: 155418052
---
 tensorflow/python/BUILD                  |  1 +
 tensorflow/python/lib/io/file_io.py      | 28 +++++++++++++++++-------
 tensorflow/python/lib/io/file_io_test.py |  6 +++++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 9fd5ada71e..e9f7a68045 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2673,6 +2673,7 @@ py_library(
         ":errors",
         ":pywrap_tensorflow",
         ":util",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/python/lib/io/file_io.py b/tensorflow/python/lib/io/file_io.py
index 91003b9ff3..c212d2071f 100644
--- a/tensorflow/python/lib/io/file_io.py
+++ b/tensorflow/python/lib/io/file_io.py
@@ -24,6 +24,8 @@ from __future__ import print_function
 import os
 import uuid
 
+import six
+
 from tensorflow.python import pywrap_tensorflow
 from tensorflow.python.framework import errors
 from tensorflow.python.util import compat
@@ -304,23 +306,33 @@ def write_string_to_file(filename, file_content):
 
 
 def get_matching_files(filename):
-  """Returns a list of files that match the given pattern.
+  """Returns a list of files that match the given pattern(s).
 
   Args:
-    filename: string, the pattern
+    filename: string or iterable of strings. The glob pattern(s).
 
   Returns:
-    Returns a list of strings containing filenames that match the given pattern.
+    A list of strings containing filenames that match the given pattern(s).
 
   Raises:
     errors.OpError: If there are filesystem / directory listing errors.
   """
   with errors.raise_exception_on_not_ok_status() as status:
-    # Convert each element to string, since the return values of the
-    # vector of string should be interpreted as strings, not bytes.
-    return [compat.as_str_any(matching_filename)
-            for matching_filename in pywrap_tensorflow.GetMatchingFiles(
-                compat.as_bytes(filename), status)]
+    if isinstance(filename, six.string_types):
+      return [
+          # Convert the filenames to string from bytes.
+          compat.as_str_any(matching_filename)
+          for matching_filename in pywrap_tensorflow.GetMatchingFiles(
+              compat.as_bytes(filename), status)
+      ]
+    else:
+      return [
+          # Convert the filenames to string from bytes.
+          compat.as_str_any(matching_filename)
+          for single_filename in filename
+          for matching_filename in pywrap_tensorflow.GetMatchingFiles(
+              compat.as_bytes(single_filename), status)
+      ]
 
 
 def create_dir(dirname):
diff --git a/tensorflow/python/lib/io/file_io_test.py b/tensorflow/python/lib/io/file_io_test.py
index 9ad0450855..e60b93b84f 100644
--- a/tensorflow/python/lib/io/file_io_test.py
+++ b/tensorflow/python/lib/io/file_io_test.py
@@ -129,6 +129,12 @@ class FileIoTest(test.TestCase):
     self.assertItemsEqual(
         file_io.get_matching_files(os.path.join(dir_path, "file*.txt")),
         expected_match)
+    self.assertItemsEqual(file_io.get_matching_files(tuple()), [])
+    files_subset = [
+        os.path.join(dir_path, files[0]), os.path.join(dir_path, files[2])
+    ]
+    self.assertItemsEqual(
+        file_io.get_matching_files(files_subset), files_subset)
     file_io.delete_recursively(dir_path)
     self.assertFalse(file_io.file_exists(os.path.join(dir_path, "file3.txt")))
 
-- 
GitLab


From 2de7a9e27ae3b7d6312f8b6842f183c825a80bd7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 13:19:47 -0700
Subject: [PATCH 1120/1563] * Wrap cuBlas high-level solvers into CudaSolver. *
 Use cuBlas calls to implement a GPU version of the matrix_inverse op. *
 Refactor CudaSolver to make all the kernel launches asynchronous, and add a
 public interface "RegisterLapackInfoCheckerCallback", which registers a
 callback to be invoked when the statuses of one or more solver kernels passed
 to it have been copied back to the host. * Refactor CholeskyOpGpu to use the
 updated API and make that kernel async too.

PiperOrigin-RevId: 155418113
---
 tensorflow/core/kernels/BUILD                 |  14 +-
 tensorflow/core/kernels/cholesky_op.cc        |  99 ++++--
 tensorflow/core/kernels/cuda_solvers.cc       | 332 +++++++++++++-----
 tensorflow/core/kernels/cuda_solvers.h        | 325 ++++++++++++-----
 .../core/kernels/cuda_solvers_gpu.cu.cc       |  52 +++
 tensorflow/core/kernels/linalg_ops_common.cc  |   7 -
 tensorflow/core/kernels/linalg_ops_common.h   |  27 +-
 tensorflow/core/kernels/matrix_inverse_op.cc  | 148 +++++++-
 .../kernel_tests/matrix_inverse_op_test.py    |   6 +-
 9 files changed, 753 insertions(+), 257 deletions(-)
 create mode 100644 tensorflow/core/kernels/cuda_solvers_gpu.cu.cc

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 02ab30a04f..d8873408d7 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -2041,16 +2041,24 @@ tf_kernel_library(
     name = "cuda_solvers",
     srcs = ["cuda_solvers.cc"],
     hdrs = ["cuda_solvers.h"],
+    gpu_srcs = [
+        "cuda_solvers.h",
+        "cuda_solvers_gpu.cu.cc",
+    ],
     # @local_config_cuda//cuda:cusolver, //third_party/eigen3:blas,
     # and //third_party/libf2c all contain various parts of BLAS, LAPACK,
     # and f2c helper functions in global namespace. Tell the compiler to
     # allow multiple definitions when linking this.
-    linkopts = ["-Wl,-zmuldefs"],
+    linkopts = select({
+        "//tensorflow:darwin": [],
+        "//conditions:default": ["-Wl,-z,muldefs"],
+    }),
     visibility = ["//visibility:private"],
     deps = [
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
         "//tensorflow/core/platform/default/build_config:cublas_plugin",
+        "@local_config_cuda//cuda:cublas",
         "@local_config_cuda//cuda:cusolver",
     ],
 )
@@ -2099,7 +2107,9 @@ tf_kernel_library(
 tf_kernel_library(
     name = "matrix_inverse_op",
     prefix = "matrix_inverse_op",
-    deps = LINALG_DEPS,
+    deps = if_cuda([
+        ":cuda_solvers",
+    ]) + LINALG_DEPS,
 )
 
 tf_kernel_library(
diff --git a/tensorflow/core/kernels/cholesky_op.cc b/tensorflow/core/kernels/cholesky_op.cc
index 2e33170d27..9a0ea2e303 100644
--- a/tensorflow/core/kernels/cholesky_op.cc
+++ b/tensorflow/core/kernels/cholesky_op.cc
@@ -90,45 +90,82 @@ TF_CALL_double(DECLARE_GPU_SPEC);
 }  // namespace functor
 
 template <class Scalar>
-class CholeskyOpGpu : public LinearAlgebraOp<Scalar> {
+class CholeskyOpGpu : public AsyncOpKernel {
  public:
-  INHERIT_LINALG_TYPEDEFS(Scalar);
-
-  explicit CholeskyOpGpu(OpKernelConstruction* context) : Base(context) {}
-
-  // Copy the lower triangular part of the input matrices to the output and
-  // set the strictly upper triangular part to zero. We use a pre-existing
-  // kernel MatrixBandPart to do this for all matrices in the batch at once,
-  // before we launch each of the Cholesky factorization kernels in parallel.
-  void BatchPreCompute(OpKernelContext* context, const TensorInputs& inputs,
-                       const TensorShapes& input_matrix_shapes,
-                       const TensorOutputs& outputs,
-                       const TensorShapes& output_matrix_shapes) final {
-    const int n = input_matrix_shapes[0].dim_size(0);
-    auto input_reshaped = inputs[0]->template flat_inner_dims<Scalar, 3>();
-    auto output_reshaped = outputs[0]->template flat_inner_dims<Scalar, 3>();
-    functor::MatrixBandPart<GPUDevice, Scalar>::Compute(
-        context->eigen_device<GPUDevice>(), n, 0, input_reshaped,
-        output_reshaped);
-  }
+  explicit CholeskyOpGpu(OpKernelConstruction* context)
+      : AsyncOpKernel(context) {}
+
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) final {
+    const Tensor& input = context->input(0);
+    const int ndims = input.dims();
+    const int64 n = input.dim_size(ndims - 1);
+    // Validate inputs.
+    OP_REQUIRES_ASYNC(
+        context, ndims >= 2,
+        errors::InvalidArgument("Input must have rank >= 2, got ", ndims),
+        done);
+    OP_REQUIRES_ASYNC(
+        context, input.dim_size(ndims - 2) == n,
+        errors::InvalidArgument("Input matrices must be squares, got",
+                                input.dim_size(ndims - 2), " != ", n),
+        done);
+
+    // Allocate output.
+    Tensor* output;
+    OP_REQUIRES_OK_ASYNC(context,
+                         context->forward_input_or_allocate_output(
+                             {0}, 0, input.shape(), &output),
+                         done);
 
-  void ComputeMatrix(OpKernelContext* context, const ConstMatrixMaps& inputs,
-                     MatrixMaps* outputs) final {
-    const ConstMatrixMap& input = inputs[0];
-    const int n = input.rows();
     if (n == 0) {
       // If X is an empty matrix (0 rows, 0 col), X * X' == X.
       // Therefore, we return X.
+      done();
       return;
     }
-    // Launch the Cholesky kernel.
-    CudaSolverDN cusolver(context);
-    const Status status = cusolver.potrf(CUBLAS_FILL_MODE_UPPER, n,
-                                         outputs->at(0).data(), n, nullptr);
-    if (!status.ok()) {
-      LOG(ERROR) << status.ToString();
+
+    // Copy the lower triangular part of the input matrices to the output and
+    // set the strictly upper triangular part to zero. We use a pre-existing
+    // kernel MatrixBandPart to do this for all matrices in the batch at once,
+    // before we launch each of the Cholesky factorization kernels in paralle.
+    auto input_reshaped = input.template flat_inner_dims<Scalar, 3>();
+    auto output_reshaped = output->template flat_inner_dims<Scalar, 3>();
+    functor::MatrixBandPart<GPUDevice, Scalar>::Compute(
+        context->eigen_device<GPUDevice>(), n, 0, input_reshaped,
+        output_reshaped);
+
+    // Launch a Cholesky kernel for each matrix in the batch.
+    const int64 batch_size = input_reshaped.dimension(0);
+    std::vector<DeviceLapackInfo> dev_info;
+    dev_info.emplace_back(context, batch_size, "potrf");
+    // TODO(rmlarsen): Parallelize over batches if it turns out to be
+    // an important use case.
+    CudaSolver solver(context);
+    for (int64 i = 0; i < batch_size; ++i) {
+      Scalar* output_ptr = output_reshaped.data() + i * n * n;
+      int* dev_info_ptr = dev_info.back().mutable_data() + i;
+      OP_REQUIRES_OK_ASYNC(
+          context,
+          solver.Potrf(CUBLAS_FILL_MODE_UPPER, n, output_ptr, n, dev_info_ptr),
+          done);
     }
-    OP_REQUIRES(context, status.ok(), errors::InvalidArgument(kErrMsg));
+
+    // Register callback to check info after kernels finish.
+    auto info_checker = [context, done](
+                            const Status& status,
+                            const std::vector<HostLapackInfo>& /* unused */) {
+      Status full_status = status;
+      if (!full_status.ok()) {
+        full_status.Update(errors::InvalidArgument(kErrMsg));
+      }
+      OP_REQUIRES_OK_ASYNC(context, full_status, done);
+      done();
+    };
+
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        solver.CopyLapackInfoToHostAsync(dev_info, std::move(info_checker)),
+        done);
   }
 };
 
diff --git a/tensorflow/core/kernels/cuda_solvers.cc b/tensorflow/core/kernels/cuda_solvers.cc
index 3e59fb0a5a..b2d1a53af4 100644
--- a/tensorflow/core/kernels/cuda_solvers.cc
+++ b/tensorflow/core/kernels/cuda_solvers.cc
@@ -18,6 +18,8 @@ limitations under the License.
 
 #include <chrono>
 #include <complex>
+#include <unordered_map>
+#include <vector>
 
 #include "cuda/include/cublas_v2.h"
 #include "cuda/include/cusolverDn.h"
@@ -26,124 +28,173 @@ limitations under the License.
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/lib/core/blocking_counter.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/gtl/inlined_vector.h"
+#include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/stream_executor.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 namespace {
 
-template <typename Scalar>
-class ScratchSpace {
- public:
-  explicit ScratchSpace(OpKernelContext* context, int size) {
-    TF_CHECK_OK(context->allocate_temp(DataTypeToEnum<Scalar>::value,
-                                       TensorShape({size}), &scratch_tensor_));
-  }
-  Scalar* data() { return scratch_tensor_.template flat<Scalar>().data(); }
-
- private:
-  Tensor scratch_tensor_;
-};
+inline bool CopyHostToDevice(OpKernelContext* context, void* dst,
+                             const void* src, uint64 bytes) {
+  auto stream = context->op_device_context()->stream();
+  perftools::gputools::DeviceMemoryBase wrapped_dst(dst);
+  return stream->ThenMemcpy(&wrapped_dst, src, bytes).ok();
+}
 
 // Type traits to get CUDA complex types from std::complex<>.
-
 template <typename T>
 struct CUDAComplexT {
   typedef T type;
 };
-
 template <>
 struct CUDAComplexT<std::complex<float>> {
   typedef cuComplex type;
 };
-
 template <>
 struct CUDAComplexT<std::complex<double>> {
   typedef cuDoubleComplex type;
 };
-
 // Converts pointers of std::complex<> to pointers of
 // cuComplex/cuDoubleComplex. No type conversion for non-complex types.
-
 template <typename T>
 inline const typename CUDAComplexT<T>::type* CUDAComplex(const T* p) {
   return reinterpret_cast<const typename CUDAComplexT<T>::type*>(p);
 }
-
 template <typename T>
 inline typename CUDAComplexT<T>::type* CUDAComplex(T* p) {
   return reinterpret_cast<typename CUDAComplexT<T>::type*>(p);
 }
 
-// Converts values of std::complex<float/double> to values of
-// cuComplex/cuDoubleComplex.
-inline cuComplex CUDAComplexValue(std::complex<float> val) {
-  return {val.real(), val.imag()};
-}
+// A set of initialized handles to the underlying Cuda libraries used by
+// CudaSolver. We maintain one such set of handles per unique stream.
+struct CudaSolverHandles {
+  explicit CudaSolverHandles(cudaStream_t stream) {
+    CHECK(cusolverDnCreate(&cusolver_dn_handle) == CUSOLVER_STATUS_SUCCESS)
+        << "Failed to create cuSolverDN instance.";
+    CHECK(cusolverDnSetStream(cusolver_dn_handle, stream) ==
+          CUSOLVER_STATUS_SUCCESS)
+        << "Failed to set cuSolverDN stream.";
+    CHECK(cublasCreate(&cublas_handle) == CUBLAS_STATUS_SUCCESS)
+        << "Failed to create cuBlas instance.";
+    CHECK(cublasSetStream(cublas_handle, stream) == CUBLAS_STATUS_SUCCESS)
+        << "Failed to set cuBlas stream.";
+  }
 
-inline cuDoubleComplex CUDAComplexValue(std::complex<double> val) {
-  return {val.real(), val.imag()};
+  ~CudaSolverHandles() {
+    CHECK(cublasDestroy(cublas_handle) == CUBLAS_STATUS_SUCCESS)
+        << "Failed to destroy cuBlas instance.";
+    CHECK(cusolverDnDestroy(cusolver_dn_handle) == CUSOLVER_STATUS_SUCCESS)
+        << "Failed to destroy cuSolverDN instance.";
+  }
+  cublasHandle_t cublas_handle;
+  cusolverDnHandle_t cusolver_dn_handle;
+};
+
+static mutex handle_map_mutex(LINKER_INITIALIZED);
+
+using HandleMap =
+    std::unordered_map<cudaStream_t, std::unique_ptr<CudaSolverHandles>>;
+
+// Returns a singleton map used for storing initialized handles for each unique
+// cuda stream.
+HandleMap* GetHandleMapSingleton() {
+  static HandleMap* cm = new HandleMap;
+  return cm;
 }
+
 }  // namespace
 
-#define TF_RETURN_IF_CUSOLVER_ERROR_MSG(expr, msg)             \
-  do {                                                         \
-    auto status = (expr);                                      \
-    if (TF_PREDICT_FALSE(status != CUSOLVER_STATUS_SUCCESS)) { \
-      return errors::Internal(msg);                            \
-    }                                                          \
+#define TF_RETURN_IF_CUSOLVER_ERROR(expr)                                      \
+  do {                                                                         \
+    auto status = (expr);                                                      \
+    if (TF_PREDICT_FALSE(status != CUSOLVER_STATUS_SUCCESS)) {                 \
+      return errors::Internal("cuSolverDN call failed with status =", status); \
+    }                                                                          \
   } while (0)
 
-#define TF_RETURN_IF_CUSOLVER_ERROR(expr) \
-  TF_RETURN_IF_CUSOLVER_ERROR_MSG(expr, "cuSolverDN call failed.")
-
-#define TF_RETURN_STATUS_FROM_INFO(method, device_info_ptr, info_ptr)     \
-  do {                                                                    \
-    int local_info;                                                       \
-    TF_RETURN_IF_ERROR(GetInfo(device_info_ptr, &local_info));            \
-    if (info_ptr != nullptr) *info_ptr = local_info;                      \
-    if (TF_PREDICT_FALSE(local_info != 0)) {                              \
-      return errors::Internal("cuSolverDN::" #method " returned info = ", \
-                              local_info, ", expected info = 0");         \
-    } else {                                                              \
-      return Status::OK();                                                \
-    }                                                                     \
+#define TF_RETURN_IF_CUBLAS_ERROR(expr)                                \
+  do {                                                                 \
+    auto status = (expr);                                              \
+    if (TF_PREDICT_FALSE(status != CUBLAS_STATUS_SUCCESS)) {           \
+      return errors::Internal("cuBlas call failed status = ", status); \
+    }                                                                  \
   } while (0)
 
-CudaSolverDN::CudaSolverDN(OpKernelContext* context) : context_(context) {
+CudaSolver::CudaSolver(OpKernelContext* context) : context_(context) {
   const cudaStream_t* cu_stream_ptr = CHECK_NOTNULL(
       reinterpret_cast<const cudaStream_t*>(context->op_device_context()
                                                 ->stream()
                                                 ->implementation()
                                                 ->CudaStreamMemberHack()));
   cuda_stream_ = *cu_stream_ptr;
-  CHECK(cusolverDnCreate(&handle_) == CUSOLVER_STATUS_SUCCESS)
-      << "Failed to create cuSolverDN instance.";
-  CHECK(cusolverDnSetStream(handle_, cuda_stream_) == CUSOLVER_STATUS_SUCCESS)
-      << "Failed to set cuSolverDN stream.";
+  HandleMap* handle_map = CHECK_NOTNULL(GetHandleMapSingleton());
+  mutex_lock lock(handle_map_mutex);
+  auto it = handle_map->find(cuda_stream_);
+  if (it == handle_map->end()) {
+    LOG(INFO) << "Creating CudaSolver handles for stream " << cuda_stream_;
+    // Previously unseen Cuda stream. Initialize a set of Cuda solver library
+    // handles for it.
+    std::unique_ptr<CudaSolverHandles> new_handles(
+        new CudaSolverHandles(cuda_stream_));
+    it =
+        handle_map->insert(std::make_pair(cuda_stream_, std::move(new_handles)))
+            .first;
+  }
+  cusolver_dn_handle_ = it->second->cusolver_dn_handle;
+  cublas_handle_ = it->second->cublas_handle;
 }
 
-CudaSolverDN::~CudaSolverDN() {
-  CHECK(cusolverDnDestroy(handle_) == CUSOLVER_STATUS_SUCCESS)
-      << "Failed to destroy cuSolverDN instance.";
-}
+Status CudaSolver::CopyLapackInfoToHostAsync(
+    const std::vector<DeviceLapackInfo>& dev_lapack_infos,
+    std::function<void(const Status&, const std::vector<HostLapackInfo>&)>
+        info_checker_callback) const {
+  std::vector<HostLapackInfo> host_lapack_infos;
+  if (dev_lapack_infos.empty()) {
+    info_checker_callback(Status::OK(), std::move(host_lapack_infos));
+    return Status::OK();
+  }
 
-Status CudaSolverDN::GetInfo(const int* dev_info, int* host_info) const {
-  CHECK(dev_info != nullptr);
-  CHECK(host_info != nullptr);
-  auto stream = context_->op_device_context()->stream();
-  perftools::gputools::DeviceMemoryBase wrapped(const_cast<int*>(dev_info));
-  if (!stream
-           ->ThenMemcpy(host_info /* destination */, wrapped /* source */,
-                        sizeof(int))
-           .ok()) {
-    return errors::Internal("Failed to copy dev_info to host.");
+  // Launch memcpys to copy info back from the device to the host.
+  for (const auto& dev_lapack_info : dev_lapack_infos) {
+    bool success = true;
+    auto host_copy = dev_lapack_info.CopyToHost(&success);
+    if (!success) {
+      return errors::Internal(
+          "Failed to launch copy of dev_lapack_info to host, debug_info = ",
+          dev_lapack_info.debug_info());
+    }
+    host_lapack_infos.push_back(std::move(host_copy));
   }
-  BlockingCounter barrier(1);
+
+  // This callback checks that all batch items in all calls were processed
+  // successfully and passes status to the info_checker_callback accordingly.
+  auto wrapped_info_checker_callback =
+      [info_checker_callback](std::vector<HostLapackInfo> host_lapack_infos) {
+        Status status;
+        for (auto host_lapack_info : host_lapack_infos) {
+          for (int i = 0; i < host_lapack_info.size() && status.ok(); ++i) {
+            const int info_value = (host_lapack_info.data())[i];
+            if (info_value != 0) {
+              status = errors::InvalidArgument(
+                  "Got info = ", info_value, " for batch index ", i,
+                  ", expected info = 0. Debug_info =",
+                  host_lapack_info.debug_info());
+            }
+          }
+          if (!status.ok()) {
+            break;
+          }
+        }
+        info_checker_callback(status, host_lapack_infos);
+      };
+  auto cb =
+      std::bind(wrapped_info_checker_callback, std::move(host_lapack_infos));
+  auto stream = context_->op_device_context()->stream();
   context_->device()->tensorflow_gpu_device_info()->event_mgr->ThenExecute(
-      stream, [&barrier]() { barrier.DecrementCount(); });
-  if (!barrier.WaitFor(std::chrono::minutes(1))) {
-    return errors::Internal("Failed to copy dev_info to host within 1 minute.");
-  }
+      stream, std::move(cb));
   return Status::OK();
 }
 
@@ -152,39 +203,134 @@ Status CudaSolverDN::GetInfo(const int* dev_info, int* host_info) const {
 #define TF_CALL_LAPACK_TYPES(m) \
   m(float, S) m(double, D) m(std::complex<float>, C) m(std::complex<double>, Z)
 
-// Macros to construct cusolver method names.
-#define SOLVER_NAME(method, lapack_prefix) cusolverDn##lapack_prefix##method
-#define BUFSIZE_NAME(method, lapack_prefix) \
+// Macros to construct cusolverDn method names.
+#define DN_SOLVER_FN(method, lapack_prefix) cusolverDn##lapack_prefix##method
+#define DN_SOLVER_NAME(method, lapack_prefix) \
+  "cusolverDn" #lapack_prefix #method
+#define DN_BUFSIZE_FN(method, lapack_prefix) \
   cusolverDn##lapack_prefix##method##_bufferSize
 
+// Macros to construct cublas method names.
+#define BLAS_SOLVER_FN(method, lapack_prefix) cublas##lapack_prefix##method
+#define BLAS_SOLVER_NAME(method, lapack_prefix) "cublas" #lapack_prefix #method
+
 //=============================================================================
 // Wrappers of cuSolverDN computational methods begin here.
+//
+// WARNING to implementers: The function signatures listed in the online docs
+// are sometimes inaccurate, e.g., are missing 'const' on pointers
+// to immutable arguments, while the actual headers have them as expected.
+// Check the actual declarations in the cusolver_api.h header file.
 //=============================================================================
-#define POTRF_INSTANCE(Scalar, lapack_prefix)                                 \
-  template <>                                                                 \
-  Status CudaSolverDN::potrf<Scalar>(cublasFillMode_t uplo, int n, Scalar* A, \
-                                     int lda, int* info) const {              \
-    /* Get amount of workspace memory required. */                            \
-    int lwork;                                                                \
-    TF_RETURN_IF_CUSOLVER_ERROR(BUFSIZE_NAME(potrf, lapack_prefix)(           \
-        handle_, uplo, n, CUDAComplex(A), lda, &lwork));                      \
-                                                                              \
-    /* Allocate device memory for workspace and info. */                      \
-    ScratchSpace<Scalar> device_workspace(context_, lwork);                   \
-    ScratchSpace<int> device_info(context_, 1);                               \
-                                                                              \
-    /* Launch the solver kernel. */                                           \
-    TF_RETURN_IF_CUSOLVER_ERROR(SOLVER_NAME(potrf, lapack_prefix)(            \
-        handle_, uplo, n, CUDAComplex(A), lda,                                \
-        CUDAComplex(device_workspace.data()), lwork, device_info.data()));    \
-                                                                              \
-    /* Get info from device and return status. */                             \
-    TF_RETURN_STATUS_FROM_INFO(potrf, device_info.data(), info);              \
-    return Status::OK();                                                      \
+template <typename Scalar, typename BufSizeFnT, typename SolverFnT>
+static inline Status PotrfImpl(BufSizeFnT bufsize, SolverFnT solver,
+                               OpKernelContext* context,
+                               cusolverDnHandle_t cusolver_dn_handle,
+                               cublasFillMode_t uplo, int n, Scalar* A, int lda,
+                               int* dev_lapack_info) {
+  /* Get amount of workspace memory required. */
+  int lwork;
+  TF_RETURN_IF_CUSOLVER_ERROR(
+      bufsize(cusolver_dn_handle, uplo, n, CUDAComplex(A), lda, &lwork));
+  /* Allocate device memory for workspace. */
+  ScratchSpace<Scalar> dev_workspace(context, lwork, /* on_host */ false);
+  /* Launch the solver kernel. */
+  TF_RETURN_IF_CUSOLVER_ERROR(solver(
+      cusolver_dn_handle, uplo, n, CUDAComplex(A), lda,
+      CUDAComplex(dev_workspace.mutable_data()), lwork, dev_lapack_info));
+  return Status::OK();
+}
+
+#define POTRF_INSTANCE(Scalar, lapack_prefix)                                \
+  template <>                                                                \
+  Status CudaSolver::Potrf<Scalar>(cublasFillMode_t uplo, int n, Scalar* A,  \
+                                   int lda, int* dev_lapack_info) const {    \
+    return PotrfImpl(DN_BUFSIZE_FN(potrf, lapack_prefix),                    \
+                     DN_SOLVER_FN(potrf, lapack_prefix), context_,           \
+                     cusolver_dn_handle_, uplo, n, A, lda, dev_lapack_info); \
   }
 
 TF_CALL_LAPACK_TYPES(POTRF_INSTANCE);
 
+//=============================================================================
+// Wrappers of cuBlas computational methods begin here.
+//
+// WARNING to implementers: The function signatures listed in the online docs
+// are sometimes inaccurate, e.g., are missing 'const' on pointers
+// to immutable arguments, while the actual headers have them as expected.
+// Check the actual declarations in the cublas_api.h header file.
+//=============================================================================
+template <typename Scalar, typename SolverFnT>
+static inline Status GetrfBatchedImpl(
+    SolverFnT solver, OpKernelContext* context, cublasHandle_t cublas_handle,
+    int n, const Scalar* host_a_dev_ptrs[], int lda, int* dev_pivots,
+    DeviceLapackInfo* dev_lapack_info, int batch_size) {
+  using CudaScalar = typename CUDAComplexT<Scalar>::type;
+  ScratchSpace<uint8> dev_a_dev_ptrs(context, sizeof(CudaScalar*) * batch_size,
+                                     /* on_host */ false);
+  if (!CopyHostToDevice(
+          context, (void*)dev_a_dev_ptrs.mutable_data() /* dest */,
+          (const void*)host_a_dev_ptrs /* source */, dev_a_dev_ptrs.bytes())) {
+    return errors::Internal("GetrfBatched: failed to copy pointers to device");
+  }
+  TF_RETURN_IF_CUBLAS_ERROR(
+      solver(cublas_handle, n, (CudaScalar**)dev_a_dev_ptrs.mutable_data(), lda,
+             dev_pivots, dev_lapack_info->mutable_data(), batch_size));
+  return Status::OK();
+}
+
+#define GETRF_BATCHED_INSTANCE(Scalar, lapack_prefix)                          \
+  template <>                                                                  \
+  Status CudaSolver::GetrfBatched(                                             \
+      int n, const Scalar* host_a_dev_ptrs[], int lda, int* dev_pivots,        \
+      DeviceLapackInfo* dev_lapack_info, int batch_size) const {               \
+    return GetrfBatchedImpl(BLAS_SOLVER_FN(getrfBatched, lapack_prefix),       \
+                            context_, cublas_handle_, n, host_a_dev_ptrs, lda, \
+                            dev_pivots, dev_lapack_info, batch_size);          \
+  }
+
+TF_CALL_LAPACK_TYPES(GETRF_BATCHED_INSTANCE);
+
+template <typename Scalar, typename SolverFnT>
+static inline Status GetriBatchedImpl(
+    SolverFnT solver, OpKernelContext* context, cublasHandle_t cublas_handle,
+    int n, const Scalar* host_a_dev_ptrs[], int lda, const int* dev_pivots,
+    const Scalar* host_a_inv_dev_ptrs[], int ldainv,
+    DeviceLapackInfo* dev_lapack_info, int batch_size) {
+  using CudaScalar = typename CUDAComplexT<Scalar>::type;
+  ScratchSpace<uint8> dev_a_dev_ptrs(context, sizeof(CudaScalar*) * batch_size,
+                                     /* on_host */ false);
+  ScratchSpace<uint8> dev_a_inv_dev_ptrs(
+      context, sizeof(CudaScalar*) * batch_size, /* on_host */ false);
+  if (!CopyHostToDevice(
+          context, (void*)dev_a_dev_ptrs.mutable_data() /* dest */,
+          (const void*)host_a_dev_ptrs /* source */, dev_a_dev_ptrs.bytes()) ||
+      !CopyHostToDevice(context, (void*)dev_a_inv_dev_ptrs.mutable_data(),
+                        (const void*)host_a_inv_dev_ptrs,
+                        dev_a_inv_dev_ptrs.bytes())) {
+    return errors::Internal("GetriBatched: failed to copy pointers to device");
+  }
+  TF_RETURN_IF_CUBLAS_ERROR(
+      solver(cublas_handle, n, (const CudaScalar**)dev_a_dev_ptrs.data(), lda,
+             dev_pivots, (CudaScalar**)dev_a_inv_dev_ptrs.mutable_data(),
+             ldainv, dev_lapack_info->mutable_data(), batch_size));
+  return Status::OK();
+}
+
+#define GETRI_BATCHED_INSTANCE(Scalar, lapack_prefix)                          \
+  template <>                                                                  \
+  Status CudaSolver::GetriBatched(                                             \
+      int n, const Scalar* host_a_dev_ptrs[], int lda, const int* dev_pivots,  \
+      const Scalar* host_a_inv_dev_ptrs[], int ldainv,                         \
+      DeviceLapackInfo* dev_lapack_info, int batch_size) const {               \
+    return GetriBatchedImpl(BLAS_SOLVER_FN(getriBatched, lapack_prefix),       \
+                            context_, cublas_handle_, n, host_a_dev_ptrs, lda, \
+                            dev_pivots, host_a_inv_dev_ptrs, ldainv,           \
+                            dev_lapack_info, batch_size);                      \
+  }
+
+TF_CALL_LAPACK_TYPES(GETRI_BATCHED_INSTANCE);
+
 }  // namespace tensorflow
 
 #endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/cuda_solvers.h b/tensorflow/core/kernels/cuda_solvers.h
index eeb179cfa6..7fe3ef42f2 100644
--- a/tensorflow/core/kernels/cuda_solvers.h
+++ b/tensorflow/core/kernels/cuda_solvers.h
@@ -14,164 +14,305 @@ limitations under the License.
 ==============================================================================
 */
 
-// This header implements CudaSolverDN and CuBlas, which contain templatized
-// wrappers of linear algebra solvers in the cuBlas and cuSolverDN libraries
-// for use in TensorFlow kernels.
+// This header declares the class CudaSolver, which contains wrappers of linear
+// algebra solvers in the cuBlas and cuSolverDN libraries for use in TensorFlow
+// kernels.
 
 #ifdef GOOGLE_CUDA
 
+#include <functional>
+#include <vector>
+
 #include "cuda/include/cublas_v2.h"
 #include "cuda/include/cusolverDn.h"
 #include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/stream_executor.h"
 
 namespace tensorflow {
 
-// A class that provides a simplified templated API for the solver methods
-// in cuSolverDN (http://docs.nvidia.com/cuda/cusolver).
-// An object of this class wraps a cuSolverDN instance, and will launch
-// kernels on the cuda stream wrapped by the GPU device in the OpKernelContext
-// provided to the constructor. The class methods transparently fetch the output
-// status of the solvers (a.k.a. the LAPACK "info" output variable) without
-// having to manually synchronize the underlying Cuda stream.
-class CudaSolverDN {
+// Container of LAPACK info data (an array of int) generated on-device by
+// a CudaSolver call. One or more such objects can be passed to
+// CudaSolver::CopyLapackInfoToHostAsync() along with a callback to
+// check the LAPACK info data after the corresponding kernels
+// finish and LAPACK info has been copied from the device to the host.
+class DeviceLapackInfo;
+
+// Host-side copy of LAPACK info.
+class HostLapackInfo;
+
+// The CudaSolver class provides a simplified templated API for the dense linear
+// solvers implemented in cuSolverDN (http://docs.nvidia.com/cuda/cusolver) and
+// cuBlas (http://docs.nvidia.com/cuda/cublas/#blas-like-extension/).
+// An object of this class wraps static cuSolver and cuBlas instances,
+// and will launch Cuda kernels on the stream wrapped by the GPU device
+// in the OpKernelContext provided to the constructor.
+//
+// Notice: All the computational member functions are asynchronous and simply
+// launch one or more Cuda kernels on the Cuda stream wrapped by the CudaSolver
+// object. To check the final status of the kernels run, call
+// RegisterLapackInfoCheckerCallback() on the CudaSolver object to set a
+// callback that will be invoked with the status of the kernels launched thus
+// far as arguments.
+//
+// Example of an asynchronous TensorFlow kernel using CudaSolver:
+//
+// template <typename Scalar>
+// class SymmetricPositiveDefiniteSolveOpGpu : public AsyncOpKernel {
+//  public:
+//   explicit SymmetricPositiveDefiniteSolveOpGpu(OpKernelConstruction* context)
+//       : AsyncOpKernel(context) { }
+//   void ComputeAsync(OpKernelContext* context, DoneCallback done) final {
+//     // 1. Set up input and output device ptrs. See, e.g.,
+//     // matrix_inverse_op.cc for a full example.
+//     ...
+//
+//     // 2. Initialize the solver object.
+//     CudaSolver solver(context);
+//
+//     // 3. Launch the two compute kernels back to back on the stream without
+//     // synchronizing.
+//     std::vector<DeviceLapackInfo> dev_info;
+//     const int batch_size = 1;
+//     dev_info.emplace_back(context, batch_size, "potrf");
+//     // Compute the Cholesky decomposition of the input matrix.
+//     OP_REQUIRES_OK_ASYNC(context,
+//                          solver.Potrf(uplo, n, dev_matrix_ptrs, n,
+//                                       dev_info.back().mutable_data()),
+//                          done);
+//     dev_info.emplace_back(context, batch_size, "potrs");
+//     // Use the Cholesky decomposition of the input matrix to solve A X = RHS.
+//     OP_REQUIRES_OK_ASYNC(context,
+//                          solver.Potrs(uplo, n, nrhs, dev_matrix_ptrs, n,
+//                                       dev_output_ptrs, ldrhs,
+//                                       dev_info.back().mutable_data()),
+//                          done);
+//
+//     // 4. Register a callback to check the status after the computation
+//     // finishes and call done.
+//     auto check_status = [context, done](const Status& status,
+//       const std::vector<HostLapackInfo>& /* unused */) {
+//           // In this example we don't care about the exact cause of
+//           // death, so just check status.
+//           OP_REQUIRES_OK_ASYNC(context, status, done);
+//           done();
+//     };
+//     OP_REQUIRES_OK_ASYNC(context,
+//                          solver.RegisterLapackInfoCheckerCallback(
+//                            dev_info, check_status);
+//                          done);
+//   }
+// };
+
+class CudaSolver {
  public:
-  explicit CudaSolverDN(OpKernelContext* context);
-  virtual ~CudaSolverDN();
+  // This object stores a pointer to context, which must outlive it.
+  explicit CudaSolver(OpKernelContext* context);
+  virtual ~CudaSolver() {}
+
+  // Launches a memcpy of solver status data specified by dev_lapack_info from
+  // device to the host, and asynchronously invokes the given callback when the
+  // copy is complete. The first Status argument to the callback will be
+  // Status::OK if all lapack infos retrived are zero, otherwise an error status
+  // is given. The second argument contains a host-side copy of the entire set
+  // of infos retrieved, and can be used for generating detailed error messages.
+  Status CopyLapackInfoToHostAsync(
+      const std::vector<DeviceLapackInfo>& dev_lapack_info,
+      std::function<void(const Status&, const std::vector<HostLapackInfo>&)>
+          info_checker_callback) const;
 
   // ====================================================================
-  // Templated wrappers for cuSolver functions start here.
-
-  // Cholesky factorization.
-  // Computes Cholesky factorization A = L * L^T.
-  // Returns Status::OK(), if the Cholesky factorization was successful.
-  // If info is not nullptr it is used to return the potrf info code:
-  // Returns zero if success, returns -i if the
-  // i-th parameter is wrong, returns i > 0, if the leading minor of order i is
-  // not positive definite, see:
+  // Wrappers for cuSolverDN and cuBlas solvers start here.
+  //
+  // Apart from capitalization of the first letter, the method names below map
+  // to those in cuSolverDN and cuBlas, which follow the naming convention in
+  // LAPACK see, e.g., http://docs.nvidia.com/cuda/cusolver/#naming-convention
+
+  // Computes the Cholesky factorization A = L * L^T for a single matrix.
+  // Returns Status::OK(), if the kernel was launched successfully. See:
   // http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-potrf
   template <typename Scalar>
-  Status potrf(cublasFillMode_t uplo, int n, Scalar* A, int lda,
-               int* info) const;
+  Status Potrf(cublasFillMode_t uplo, int n, Scalar* dev_A, int lda,
+               int* dev_lapack_info) const;
+
+  // Computes partially pivoted LU factorizations for a batch of matrices.
+  // Returns Status::OK() if the kernel was launched successfully.See:
+  // http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrfbatched
+  template <typename Scalar>
+  Status GetrfBatched(int n, const Scalar* host_a_dev_ptrs[], int lda,
+                      int* dev_pivots, DeviceLapackInfo* dev_lapack_info,
+                      int batch_size) const;
+
+  // Computes matrix inverses for a batch of matrices. Uses the outputs from
+  // GetrfBatched. Returns Status::OK() if the kernel was launched successfully.
+  // See:
+  // http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getribatched
+  template <typename Scalar>
+  Status GetriBatched(int n, const Scalar* host_a_dev_ptrs[], int lda,
+                      const int* dev_pivots,
+                      const Scalar* host_a_inverse_dev_ptrs[], int ldainv,
+                      DeviceLapackInfo* dev_lapack_info, int batch_size) const;
 
   /*
   TODO(rmlarsen, volunteers): Implement the kernels below.
   // Uses Cholesky factorization to solve A * X = B.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-potrs
   template <typename Scalar>
-  Status potrs(cublasFillMode_t uplo, int n, int nrhs, const Scalar* A, int lda,
-             Scalar* B, int ldb, int* info) const;
+  Status Potrs(cublasFillMode_t uplo, int n, int nrhs, const Scalar* dev_A, int
+  lda, Scalar* dev_B, int ldb, int* dev_lapack_info) const;
 
   // LU factorization.
   // Computes LU factorization with partial pivoting P * A = L * U.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-getrf
   template <typename Scalar>
-  Status getrf(int m, int n, Scalar* A, int lda, int* devIpiv,
-             int* devInfo) const;
+  Status Getrf(int m, int n, Scalar* dev_A, int lda, int* dev_pivots,
+             int* dev_lapack_info) const;
 
   // Uses LU factorization to solve A * X = B.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-getrs
   template <typename Scalar>
-  Status getrs(int n, int nrhs, const Scalar* A, int lda, const int* devIpiv,
-             Scalar* B, int ldb, int* devInfo) const;
+  Status Getrs(int n, int nrhs, const Scalar* dev_A, int lda, const int*
+  dev_pivots, Scalar* dev_B, int ldb, int* dev_lapack_info) const;
 
   // QR factorization.
   // Computes QR factorization A = Q * R.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-geqrf
   template <typename Scalar>
-  Status geqrf(int m, int n, Scalar* A, int lda, Scalar* TAU, int* devInfo)
-  const;
+  Status Geqrf(int m, int n, Scalar* dev_A, int lda, Scalar* dev_TAU, int*
+  devInfo) const;
 
   // Multiplies by Q.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-ormqr
   template <typename Scalar>
-  Status mqr(cublasSideMode_t side, cublasOperation_t trans, int m, int n, int
-  k, const Scalar* A, int lda, const Scalar* tau, Scalar* C, int ldc, int*
-  devInfo const);
+  Status Ormqr(cublasSideMode_t side, cublasOperation_t trans, int m, int n, int
+  k, const Scalar* dev_a, int lda, const Scalar* dev_tau, Scalar* dev_c, int
+  ldc, int* dev_lapack_info) const;
 
-  // Materializes Q.
+  // Generate Q.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-orgqr
   template <typename Scalar>
-  Status gqr(int m, int n, int k, Scalar* A, int lda, const Scalar* tau,
-           int* devInfo) const;
+  Status Orgqr(int m, int n, int k, Scalar* dev_A, int lda, const Scalar*
+  dev_tau, int* dev_lapack_info) const;
 
   // Symmetric/Hermitian Eigen decomposition.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-syevd
   template <typename Scalar>
-  Status evd(cusolverEigMode_t jobz, cublasFillMode_t uplo, int n, Scalar* A,
-           int lda, Scalar* W, int* devInfo) const;
+  Status Syevd(cusolverEigMode_t jobz, cublasFillMode_t uplo, int n, Scalar*
+  dev_A, int lda, Scalar* dev_W, int* dev_lapack_info) const;
 
   // Singular value decomposition.
   // See: http://docs.nvidia.com/cuda/cusolver/#cuds-lt-t-gt-gesvd
   template <typename Scalar>
-  Status gesvd(signed char jobu, signed char jobvt, int m, int n, Scalar* A,
-             int lda, Scalar* S, Scalar* U, int ldu, Scalar* VT, int ldvt,
-             int* devInfo);
-*/
+  Status Gesvd(signed char jobu, signed char jobvt, int m, int n, Scalar* dev_A,
+             int lda, Scalar* dev_S, Scalar* dev_U, int ldu, Scalar* dev_VT,
+             int ldvt, int* dev_lapack_info);
 
- private:
-  // Copies dev_info status back from the device to host and uses event manager
-  // to wait (with a timeout) until the copy has finished. Returns an error if
-  // the copy fails to complete successfully within the timeout period.
-  Status GetInfo(const int* dev_info, int* host_info) const;
+  // Batched linear solver using LU factorization from getrfBatched.
+  // See:
+  http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrsbatched
+  template <typename Scalar>
+  Status GetrsBatched(cublasOperation_t trans, int n, int nrhs,
+                    const Scalar* dev_Aarray[], int lda, const int* devIpiv,
+                    Scalar* dev_Barray[], int ldb, int* info, int batch_size)
+  const;
+  */
 
+ private:
   OpKernelContext* context_;  // not owned.
   cudaStream_t cuda_stream_;
-  cusolverDnHandle_t handle_;
+  cusolverDnHandle_t cusolver_dn_handle_;
+  cublasHandle_t cublas_handle_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(CudaSolver);
 };
 
-/*
-  TODO(rmlarsen, volunteers): Implement the kernels below. These are utils and
-batched solvers not currently wrapped by stream executor. class CudaBlas {
+// Helper class to allocate scratch memory and keep track of debug info.
+// Mostly a thin wrapper around Tensor.
+template <typename Scalar>
+class ScratchSpace {
  public:
-  // Initializes a cuSolverDN handle that will launch kernels using the
-  // cuda stream wrapped by the GPU device in context.
-  explicit CudaBlas(OpKernelContext* context);
-  virtual ~CudaBlas();
+  ScratchSpace(OpKernelContext* context, int size, bool on_host)
+      : ScratchSpace(context, size, "", on_host) {}
 
-  // Templatized wrappers for cuBlas functions.
+  ScratchSpace(OpKernelContext* context, int size, const string& debug_info,
+               bool on_host)
+      : context_(context), debug_info_(debug_info), on_host_(on_host) {
+    AllocatorAttributes alloc_attr;
+    if (on_host) {
+      // Allocate pinned memory on the host to avoid unnecessary
+      // synchronization.
+      alloc_attr.set_on_host(true);
+      alloc_attr.set_gpu_compatible(true);
+    }
+    TF_CHECK_OK(context->allocate_temp(DataTypeToEnum<Scalar>::value,
+                                       TensorShape({size}), &scratch_tensor_,
+                                       alloc_attr));
+  }
 
-  // Matrix addition, copy and transposition.
-  // See: http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-geam
-  template <typename Scalar>
-  Status geam(cublasOperation_t transa, cublasOperation_t transb, int m, int n,
-            const Scalar* alpha, const Scalar* A, int lda, const Scalar* beta,
-            const Scalar* B, int ldb, Scalar* C, int ldc) const;
+  virtual ~ScratchSpace() {}
 
-  // Batched LU fatorization.
-  // See:
-http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrfbatched
-  template <typename Scalar>
-  Status getrfBatched(int n, Scalar* Aarray[], int lda, int* PivotArray,
-                    int* infoArray, int batchSize) const;
+  Scalar* mutable_data() {
+    return scratch_tensor_.template flat<Scalar>().data();
+  }
+  const Scalar* data() const {
+    return scratch_tensor_.template flat<Scalar>().data();
+  }
+  int64 bytes() const { return scratch_tensor_.TotalBytes(); }
+  int64 size() const { return scratch_tensor_.NumElements(); }
+  const string& debug_info() const { return debug_info_; }
 
-  // Batched linear solver using LU factorization from getrfBatched.
-  // See:
-http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getrsbatched
-  template <typename Scalar>
-  Status getrsBatched(cublasOperation_t trans, int n, int nrhs,
-                    const Scalar* Aarray[], int lda, const int* devIpiv,
-                    Scalar* Barray[], int ldb, int* info, int batchSize) const;
+  // Returns true if this ScratchSpace is in host memory.
+  bool on_host() const { return on_host_; }
 
-  // Batched matrix inverse.
-  // See:
-http://docs.nvidia.com/cuda/cublas/index.html#cublas-lt-t-gt-getribatched
-  template <typename Scalar>
-  Status getriBatched(cublasHandle_t handle, int n, Scalar* Aarray[], int lda,
-                    int* PivotArray, Scalar* Carray[], int ldc, int* infoArray,
-                    int batchSize);
+ protected:
+  OpKernelContext* context() const { return context_; }
 
  private:
-  // Copies dev_info status back from the device to host and uses event manager
-  // to wait (with a timeout) until the copy has finished. Returns an error if
-  // the copy fails to complete successfully within the timeout period.
-  Status GetInfo(const int* dev_info, int* host_info) const;
+  OpKernelContext* context_;  // not owned
+  const string debug_info_;
+  const bool on_host_;
+  Tensor scratch_tensor_;
+};
 
-  OpKernelContext* context_;  // not owned.
-  cudaStream_t cuda_stream_;
-  cublasHandle_t handle_;
+class HostLapackInfo : public ScratchSpace<int> {
+ public:
+  HostLapackInfo(OpKernelContext* context, int size, const string& debug_info)
+      : ScratchSpace<int>(context, size, debug_info, /* on_host */ true){};
 };
-*/
+
+class DeviceLapackInfo : public ScratchSpace<int> {
+ public:
+  DeviceLapackInfo(OpKernelContext* context, int size, const string& debug_info)
+      : ScratchSpace<int>(context, size, debug_info, /* on_host */ false) {}
+
+  // Allocates a new scratch space on the host and launches a copy of the
+  // contents of *this to the new scratch space. Sets success to true if
+  // the copy kernel was launched successfully.
+  HostLapackInfo CopyToHost(bool* success) const {
+    CHECK(success != nullptr);
+    HostLapackInfo copy(context(), size(), debug_info());
+    auto stream = context()->op_device_context()->stream();
+    perftools::gputools::DeviceMemoryBase wrapped_src(
+        static_cast<void*>(const_cast<int*>(this->data())));
+    *success =
+        stream->ThenMemcpy(copy.mutable_data(), wrapped_src, this->bytes())
+            .ok();
+    return copy;
+  }
+};
+
+namespace functor {
+// Helper functor to transpose and conjugate all matrices in a flattened batch.
+template <typename Device, typename Scalar>
+struct AdjointBatchFunctor {
+  // We assume that the tensor sizes are correct.
+  void operator()(const Device& d,
+                  typename TTypes<Scalar, 3>::ConstTensor input,
+                  typename TTypes<Scalar, 3>::Tensor output);
+};
+}  // namespace functor
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/kernels/cuda_solvers_gpu.cu.cc b/tensorflow/core/kernels/cuda_solvers_gpu.cu.cc
new file mode 100644
index 0000000000..d32f506557
--- /dev/null
+++ b/tensorflow/core/kernels/cuda_solvers_gpu.cu.cc
@@ -0,0 +1,52 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#if GOOGLE_CUDA
+
+#define EIGEN_USE_GPU
+
+#include "tensorflow/core/kernels/cuda_solvers.h"
+
+#include <complex>
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/tensor_types.h"
+
+namespace tensorflow {
+namespace functor {
+
+typedef Eigen::GpuDevice GPUDevice;
+
+// TODO(rmlarsen): Add a faster custom kernel similar to
+// SwapDimension1And2InTensor3 in tensorflow/core/kernels/conv_ops_gpu_3.cu.cc
+template <typename Scalar>
+struct AdjointBatchFunctor<GPUDevice, Scalar> {
+  void operator()(const GPUDevice& d,
+                  typename TTypes<Scalar, 3>::ConstTensor input,
+                  typename TTypes<Scalar, 3>::Tensor output) {
+    const Eigen::array<int, 3> perm({0, 2, 1});
+    To32Bit(output).device(d) = To32Bit(input).shuffle(perm).conjugate();
+  }
+};
+
+// Instantiate implementations for the 4 numeric types.
+template struct AdjointBatchFunctor<GPUDevice, float>;
+template struct AdjointBatchFunctor<GPUDevice, double>;
+template struct AdjointBatchFunctor<GPUDevice, std::complex<float>>;
+template struct AdjointBatchFunctor<GPUDevice, std::complex<double>>;
+
+}  // namespace functor
+}  // namespace tensorflow
+
+#endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/linalg_ops_common.cc b/tensorflow/core/kernels/linalg_ops_common.cc
index 155d9d1084..36907fb571 100644
--- a/tensorflow/core/kernels/linalg_ops_common.cc
+++ b/tensorflow/core/kernels/linalg_ops_common.cc
@@ -97,10 +97,6 @@ void LinearAlgebraOp<Scalar>::Compute(OpKernelContext* context) {
   PrepareOutputs(context, input_matrix_shapes, batch_shape, &outputs,
                  &output_matrix_shapes);
 
-  // Perform batch-wide pre-computions, if any.
-  BatchPreCompute(context, inputs, input_matrix_shapes, outputs,
-                  output_matrix_shapes);
-
   // Process the individual matrix problems in parallel using a threadpool.
   auto shard = [this, &inputs, &input_matrix_shapes, &outputs,
                 &output_matrix_shapes, context](int64 begin, int64 end) {
@@ -113,9 +109,6 @@ void LinearAlgebraOp<Scalar>::Compute(OpKernelContext* context) {
   Shard(worker_threads.num_threads, worker_threads.workers,
         batch_shape.num_elements(), GetCostPerUnit(input_matrix_shapes), shard);
 
-  // Perform batch-wide post-computions, if any.
-  BatchPostCompute(context, inputs, input_matrix_shapes, outputs,
-                   output_matrix_shapes);
 }
 
 template <typename Scalar>
diff --git a/tensorflow/core/kernels/linalg_ops_common.h b/tensorflow/core/kernels/linalg_ops_common.h
index 75d1d29793..1d31786728 100644
--- a/tensorflow/core/kernels/linalg_ops_common.h
+++ b/tensorflow/core/kernels/linalg_ops_common.h
@@ -127,26 +127,9 @@ class LinearAlgebraOp : public OpKernel {
                              const ConstMatrixMaps& inputs,
                              MatrixMaps* outputs) = 0;
 
+ private:
   using TensorInputs = gtl::InlinedVector<const Tensor*, 4>;
   using TensorOutputs = gtl::InlinedVector<Tensor*, 4>;
-
-  // Hook for doing batch-wide processing before ComputeMatrix is called
-  // on each individual slice.
-  virtual void BatchPreCompute(OpKernelContext* context,
-                               const TensorInputs& inputs,
-                               const TensorShapes& input_matrix_shapes,
-                               const TensorOutputs& outputs,
-                               const TensorShapes& output_matrix_shapes) {}
-
-  // Hook for doing batch-wide processing after ComputeMatrix is called
-  // on each individual slice.
-  virtual void BatchPostCompute(OpKernelContext* context,
-                                const TensorInputs& inputs,
-                                const TensorShapes& input_matrix_shapes,
-                                const TensorOutputs& outputs,
-                                const TensorShapes& output_matrix_shapes) {}
-
- private:
   // This function maps 2-d slices (matrices) of the input and output tensors
   // using Eigen::Map and calls ComputeMatrix implemented in terms of the
   // Eigen::MatrixBase API by the derived class.
@@ -180,8 +163,8 @@ class LinearAlgebraOp : public OpKernel {
                       TensorShapes* output_matrix_shapes);
 };
 
-// Declare that LinearAlgebraOp is explicitly instantiated in
-// linalg_ops_common.cc for float and double.
+// Declare LinearAlgebraOp, which is explicitly instantiated in
+// linalg_ops_common.cc for float, double, complex64, and complex128.
 extern template class LinearAlgebraOp<float>;
 extern template class LinearAlgebraOp<double>;
 extern template class LinearAlgebraOp<complex64>;
@@ -196,9 +179,7 @@ extern template class LinearAlgebraOp<complex128>;
   using MatrixMaps = typename Base::MatrixMaps;           \
   using ConstMatrixMap = typename Base::ConstMatrixMap;   \
   using ConstMatrixMaps = typename Base::ConstMatrixMaps; \
-  using TensorShapes = typename Base::TensorShapes;       \
-  using TensorInputs = typename Base::TensorInputs;       \
-  using TensorOutputs = typename Base::TensorOutputs
+  using TensorShapes = typename Base::TensorShapes;
 
 #define REGISTER_LINALG_OP_CPU(OpName, OpClass, Scalar) \
   REGISTER_KERNEL_BUILDER(                              \
diff --git a/tensorflow/core/kernels/matrix_inverse_op.cc b/tensorflow/core/kernels/matrix_inverse_op.cc
index 0572d48b3e..0fd3d12a5c 100644
--- a/tensorflow/core/kernels/matrix_inverse_op.cc
+++ b/tensorflow/core/kernels/matrix_inverse_op.cc
@@ -15,6 +15,10 @@ limitations under the License.
 
 // See docs in ../ops/linalg_ops.cc.
 
+#if GOOGLE_CUDA
+#define EIGEN_USE_GPU
+#endif
+
 #include "third_party/eigen3/Eigen/Core"
 #include "third_party/eigen3/Eigen/LU"
 #include "tensorflow/core/framework/kernel_def_builder.h"
@@ -26,22 +30,22 @@ limitations under the License.
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
+#if GOOGLE_CUDA
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/kernels/cuda_solvers.h"
+#endif
+
 namespace tensorflow {
 
 template <class Scalar>
 class MatrixInverseOp : public LinearAlgebraOp<Scalar> {
  public:
-  typedef LinearAlgebraOp<Scalar> Base;
+  INHERIT_LINALG_TYPEDEFS(Scalar);
 
   explicit MatrixInverseOp(OpKernelConstruction* context) : Base(context) {
     OP_REQUIRES_OK(context, context->GetAttr("adjoint", &adjoint_));
   }
 
-  using Matrix = typename Base::Matrix;
-  using MatrixMaps = typename Base::MatrixMaps;
-  using ConstMatrixMap = typename Base::ConstMatrixMap;
-  using ConstMatrixMaps = typename Base::ConstMatrixMaps;
-
   void ComputeMatrix(OpKernelContext* context, const ConstMatrixMaps& inputs,
                      MatrixMaps* outputs) final {
     const ConstMatrixMap& input = inputs[0];
@@ -77,6 +81,138 @@ class MatrixInverseOp : public LinearAlgebraOp<Scalar> {
   TF_DISALLOW_COPY_AND_ASSIGN(MatrixInverseOp);
 };
 
+#if GOOGLE_CUDA
+
+typedef Eigen::GpuDevice GPUDevice;
+
+template <class Scalar>
+class MatrixInverseOpGpu : public AsyncOpKernel {
+ public:
+  explicit MatrixInverseOpGpu(OpKernelConstruction* context)
+      : AsyncOpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("adjoint", &adjoint_));
+  }
+
+  void ComputeAsync(OpKernelContext* context, DoneCallback done) final {
+    const Tensor& input = context->input(0);
+    const int ndims = input.dims();
+    const int64 n = input.dim_size(ndims - 1);
+    // Validate inputs.
+    OP_REQUIRES_ASYNC(
+        context, ndims >= 2,
+        errors::InvalidArgument("Input must have rank >= 2, got ", ndims),
+        done);
+    OP_REQUIRES_ASYNC(
+        context, input.dim_size(ndims - 2) == n,
+        errors::InvalidArgument("Input matrices must be squares, got",
+                                input.dim_size(ndims - 2), " != ", n),
+        done);
+
+    // Allocate output.
+    Tensor* out;
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        context->forward_input_or_allocate_output({0}, 0, input.shape(), &out),
+        done);
+
+    // By definition, an empty matrix's inverse is an empty matrix.
+    if (input.NumElements() == 0) {
+      done();
+      return;
+    }
+
+    // Make a copy of the (possible adjointed) input that we will use for the
+    // factorization step.
+    Tensor input_copy;
+    OP_REQUIRES_OK_ASYNC(context,
+                         context->allocate_temp(DataTypeToEnum<Scalar>::value,
+                                                input.shape(), &input_copy),
+                         done);
+    const GPUDevice& d = context->eigen_device<GPUDevice>();
+    auto input_copy_reshaped = input_copy.template flat_inner_dims<Scalar, 3>();
+    auto input_reshaped = input.template flat_inner_dims<Scalar, 3>();
+    if (!adjoint_) {
+      d.memcpy(input_copy_reshaped.data(), input_reshaped.data(),
+               input.NumElements() * sizeof(Scalar));
+    } else {
+      functor::AdjointBatchFunctor<GPUDevice, Scalar> functor;
+      functor(d, input_reshaped, input_copy_reshaped);
+    }
+    const int64 batch_size = input_copy_reshaped.dimension(0);
+
+    // Allocate pivots on the device.
+    ScratchSpace<int> pivots(context, n * batch_size, /* on_host */ false);
+
+    // Prepare pointer arrays for cuBlas' batch interface.
+    // TODO(rmlarsen): Find a way to encode pointer arrays in pinned host memory
+    // without the ugly casting.
+    ScratchSpace<uint8> input_copy_ptrs(context, sizeof(Scalar*) * batch_size,
+                                        /* on_host */ true);
+    ScratchSpace<uint8> output_ptrs(context, sizeof(Scalar*) * batch_size,
+                                    /* on_host */ true);
+    const Scalar** input_copy_ptrs_base =
+        reinterpret_cast<const Scalar**>(input_copy_ptrs.mutable_data());
+    const Scalar** output_ptrs_base =
+        reinterpret_cast<const Scalar**>(output_ptrs.mutable_data());
+    auto output_reshaped = out->template flat_inner_dims<Scalar, 3>();
+    for (int64 i = 0; i < batch_size; ++i) {
+      input_copy_ptrs_base[i] = input_copy_reshaped.data() + i * n * n;
+      output_ptrs_base[i] = output_reshaped.data() + i * n * n;
+    }
+
+    // Launch the two solver kernels back to back without waiting.
+    // 1. Compute the partially pivoted LU factorization(s) of the
+    // matrix/matrices.
+    CudaSolver solver(context);
+    std::vector<DeviceLapackInfo> dev_info;
+    dev_info.emplace_back(context, batch_size, "getrf");
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        solver.GetrfBatched(n, input_copy_ptrs_base, n, pivots.mutable_data(),
+                            &dev_info.back(), batch_size),
+        done);
+    // 2. Compute the inverse(s).
+    dev_info.emplace_back(context, batch_size, "getri");
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        solver.GetriBatched(n, input_copy_ptrs_base, n, pivots.data(),
+                            output_ptrs_base, n, &dev_info.back(), batch_size),
+        done);
+
+    // Register callback to check info after kernels finish.
+    auto info_checker = [context, done](
+                            const Status& status,
+                            const std::vector<HostLapackInfo>& host_infos) {
+      if (!status.ok() && errors::IsInvalidArgument(status) &&
+          !host_infos.empty()) {
+        for (int i = 0; i < host_infos[0].size(); ++i) {
+          // Match the CPU error message for singular matrices. Otherwise
+          // just print the original error message from the call itself
+          // below.
+          OP_REQUIRES_ASYNC(context, host_infos[0].data()[i] <= 0,
+                            errors::InvalidArgument("Input is not invertible."),
+                            done);
+        }
+      }
+      OP_REQUIRES_OK_ASYNC(context, status, done);
+      done();
+    };
+
+    OP_REQUIRES_OK_ASYNC(
+        context,
+        solver.CopyLapackInfoToHostAsync(dev_info, std::move(info_checker)),
+        done);
+  }
+
+ private:
+  bool adjoint_;
+};
+
+REGISTER_LINALG_OP_GPU("MatrixInverse", (MatrixInverseOpGpu<float>), float);
+REGISTER_LINALG_OP_GPU("MatrixInverse", (MatrixInverseOpGpu<double>), double);
+
+#endif  // GOOGLE_CUDA
+
 REGISTER_LINALG_OP("MatrixInverse", (MatrixInverseOp<float>), float);
 REGISTER_LINALG_OP("MatrixInverse", (MatrixInverseOp<double>), double);
 REGISTER_LINALG_OP("BatchMatrixInverse", (MatrixInverseOp<float>), float);
diff --git a/tensorflow/python/kernel_tests/matrix_inverse_op_test.py b/tensorflow/python/kernel_tests/matrix_inverse_op_test.py
index 263f90c4f1..c4418dfd43 100644
--- a/tensorflow/python/kernel_tests/matrix_inverse_op_test.py
+++ b/tensorflow/python/kernel_tests/matrix_inverse_op_test.py
@@ -32,7 +32,7 @@ class InverseOpTest(test.TestCase):
     for np_type in [np.float32, np.float64]:
       for adjoint in False, True:
         y = x.astype(np_type)
-        with self.test_session():
+        with self.test_session(use_gpu=True):
           # Verify that x^{-1} * x == Identity matrix.
           inv = linalg_ops.matrix_inverse(y, adjoint=adjoint)
           tf_ans = math_ops.matmul(inv, y, adjoint_b=adjoint)
@@ -86,8 +86,8 @@ class InverseOpTest(test.TestCase):
     with self.test_session():
       with self.assertRaisesOpError("Input is not invertible."):
         # All rows of the matrix below add to zero.
-        tensor3 = constant_op.constant(
-            [[1., 0., -1.], [-1., 1., 0.], [0., -1., 1.]])
+        tensor3 = constant_op.constant([[1., 0., -1.], [-1., 1., 0.],
+                                        [0., -1., 1.]])
         linalg_ops.matrix_inverse(tensor3).eval()
 
   def testEmpty(self):
-- 
GitLab


From be496fc2d3dbe8146e7174e32fd2c48d2ffe6999 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 13:23:21 -0700
Subject: [PATCH 1121/1563] Merged commit includes the following changes:
 155418607  by ashankar <ashankar@google.com>:

    Java: Accessor for list of all registered ops.

    Adds a method to get all the OpDefs registered in the address space of the
    process.

    #9685
    #7149

--
155418502  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change.

--
155418144  by cais <cais@google.com>:

    Internal-only changes

--

PiperOrigin-RevId: 155418607
---
 .../java/src/main/java/org/tensorflow/TensorFlow.java  | 10 +++++++++-
 tensorflow/java/src/main/native/tensorflow_jni.cc      | 10 ++++++++++
 tensorflow/java/src/main/native/tensorflow_jni.h       |  8 ++++++++
 .../src/test/java/org/tensorflow/TensorFlowTest.java   |  8 ++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/tensorflow/java/src/main/java/org/tensorflow/TensorFlow.java b/tensorflow/java/src/main/java/org/tensorflow/TensorFlow.java
index ff31133729..c21214b763 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/TensorFlow.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/TensorFlow.java
@@ -20,6 +20,15 @@ public final class TensorFlow {
   /** Returns the version of the underlying TensorFlow runtime. */
   public static native String version();
 
+  /**
+   * All the TensorFlow operations available in this address space.
+   *
+   * @return A serialized representation of an <a
+   *     href="https://www.tensorflow.org/code/tensorflow/core/framework/op_def.proto">OpList</a>
+   *     protocol buffer, which lists all the available TensorFlow operations.
+   */
+  public static native byte[] registeredOpList();
+
   private TensorFlow() {}
 
   /** Load the TensorFlow runtime C library. */
@@ -30,5 +39,4 @@ public final class TensorFlow {
   static {
     init();
   }
-
 }
diff --git a/tensorflow/java/src/main/native/tensorflow_jni.cc b/tensorflow/java/src/main/native/tensorflow_jni.cc
index 746550adbd..c553582e38 100644
--- a/tensorflow/java/src/main/native/tensorflow_jni.cc
+++ b/tensorflow/java/src/main/native/tensorflow_jni.cc
@@ -20,3 +20,13 @@ JNIEXPORT jstring JNICALL Java_org_tensorflow_TensorFlow_version(JNIEnv* env,
                                                                  jclass clazz) {
   return env->NewStringUTF(TF_Version());
 }
+
+JNIEXPORT jbyteArray JNICALL
+Java_org_tensorflow_TensorFlow_registeredOpList(JNIEnv* env, jclass clazz) {
+  TF_Buffer* buf = TF_GetAllOpList();
+  jint length = static_cast<int>(buf->length);
+  jbyteArray ret = env->NewByteArray(length);
+  env->SetByteArrayRegion(ret, 0, length, static_cast<const jbyte*>(buf->data));
+  TF_DeleteBuffer(buf);
+  return ret;
+}
diff --git a/tensorflow/java/src/main/native/tensorflow_jni.h b/tensorflow/java/src/main/native/tensorflow_jni.h
index 102951c472..ecd9b15828 100644
--- a/tensorflow/java/src/main/native/tensorflow_jni.h
+++ b/tensorflow/java/src/main/native/tensorflow_jni.h
@@ -30,6 +30,14 @@ extern "C" {
 JNIEXPORT jstring JNICALL Java_org_tensorflow_TensorFlow_version(JNIEnv*,
                                                                  jclass);
 
+/*
+ * Class:     org_tensorflow_TensorFlow
+ * Method:    registeredOpList
+ * Signature: ()[B
+ */
+JNIEXPORT jbyteArray JNICALL
+Java_org_tensorflow_TensorFlow_registeredOpList(JNIEnv*, jclass);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus
diff --git a/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java b/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java
index ff89aeffbb..27e2215f62 100644
--- a/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java
+++ b/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java
@@ -28,4 +28,12 @@ public class TensorFlowTest {
   public void version() {
     assertTrue(TensorFlow.version().length() > 0);
   }
+
+  @Test
+  public void registeredOpList() {
+    // Would be nice to actually parse the output as a tensorflow.OpList protocol buffer message,
+    // but as of May 2017, bazel support for generating Java code from protocol buffer definitions
+    // was not sorted out. Revisit? Till then, at least excercise the code.
+    assertTrue(TensorFlow.registeredOpList().length > 0);
+  }
 }
-- 
GitLab


From 70c303386909fe1a0d34cada6fe5a42565279849 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Mon, 8 May 2017 13:55:26 -0700
Subject: [PATCH 1122/1563] Final cross compatibility cl. Added cross
 compatibility to contrib feature columns: crossed_column, bucketized_column,
 scattered_embedding_column. Improved error message in core model builder.

PiperOrigin-RevId: 155422877
---
 .../layers/python/layers/feature_column.py    | 193 +++++++++++++-----
 .../python/layers/feature_column_ops_test.py  |  27 +++
 .../python/feature_column/feature_column.py   |   3 +-
 3 files changed, 171 insertions(+), 52 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 95a4b032b0..917c07398f 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -949,7 +949,7 @@ class _OneHotColumn(
 
   @property
   def _variable_shape(self):
-    return tensor_shape.TensorShape((self.length))
+    return tensor_shape.TensorShape([self.length])
 
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
     del weight_collections
@@ -1098,7 +1098,7 @@ class _EmbeddingColumn(
 
   @property
   def _variable_shape(self):
-    return tensor_shape.TensorShape((self.dimension))
+    return tensor_shape.TensorShape([self.dimension])
 
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
     return _embeddings_from_arguments(
@@ -1396,10 +1396,11 @@ def shared_embedding_columns(sparse_id_columns,
 
 class _ScatteredEmbeddingColumn(
     _FeatureColumn,
-    collections.namedtuple(
-        "_ScatteredEmbeddingColumn",
-        ["column_name", "size", "dimension", "hash_key", "combiner",
-         "initializer"])):
+    fc_core._DenseColumn,  # pylint: disable=protected-access
+    collections.namedtuple("_ScatteredEmbeddingColumn", [
+        "column_name", "size", "dimension", "hash_key", "combiner",
+        "initializer"
+    ])):
   """See `scattered_embedding_column`."""
 
   def __new__(cls,
@@ -1452,6 +1453,23 @@ class _ScatteredEmbeddingColumn(
         max_norm=None,
         trainable=True)
 
+  @property
+  def _variable_shape(self):
+    return tensor_shape.TensorShape([self.dimension])
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    return _embeddings_from_arguments(
+        self,
+        self._deep_embedding_lookup_arguments(inputs.get(self)),
+        weight_collections, trainable)
+
+  def _transform_feature(self, inputs):
+    return inputs.get(self.column_name)
+
+  @property
+  def _parse_example_config(self):
+    return self.config
+
 
 def scattered_embedding_column(column_name,
                                size,
@@ -1778,7 +1796,7 @@ class _RealValuedColumn(
 
   @property
   def _variable_shape(self):
-    return tensor_shape.TensorShape((self.dimension))
+    return tensor_shape.TensorShape([self.dimension])
 
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
     del weight_collections
@@ -1908,8 +1926,12 @@ def real_valued_column(column_name,
                       default_value, dtype, column_name))
 
 
-class _BucketizedColumn(_FeatureColumn, collections.namedtuple(
-    "_BucketizedColumn", ["source_column", "boundaries"])):
+class _BucketizedColumn(
+    _FeatureColumn,
+    fc_core._CategoricalColumn,  # pylint: disable=protected-access
+    fc_core._DenseColumn,  # pylint: disable=protected-access
+    collections.namedtuple("_BucketizedColumn", ["source_column",
+                                                 "boundaries"])):
   """Represents a bucketization transformation also known as binning.
 
   Instances of this class are immutable. Values in `source_column` will be
@@ -1979,15 +2001,6 @@ class _BucketizedColumn(_FeatureColumn, collections.namedtuple(
     """Returns a string which will be used as a key when we do sorting."""
     return "{}".format(self)
 
-  def insert_transformed_feature(self, columns_to_tensors):
-    # Bucketize the source column.
-    if self.source_column not in columns_to_tensors:
-      self.source_column.insert_transformed_feature(columns_to_tensors)
-    columns_to_tensors[self] = bucketization_op.bucketize(
-        columns_to_tensors[self.source_column],
-        boundaries=list(self.boundaries),
-        name="bucketize")
-
   # pylint: disable=unused-argument
   def _to_dnn_input_layer(self,
                           input_tensor,
@@ -2045,6 +2058,43 @@ class _BucketizedColumn(_FeatureColumn, collections.namedtuple(
         initializer=init_ops.zeros_initializer(),
         combiner="sum")
 
+  def _transform_feature(self, inputs):
+    """Handles cross transformation."""
+    # Bucketize the source column.
+    return bucketization_op.bucketize(
+        inputs.get(self.source_column),
+        boundaries=list(self.boundaries),
+        name="bucketize")
+
+  def insert_transformed_feature(self, columns_to_tensors):
+    """Handles sparse column to id conversion."""
+    columns_to_tensors[self] = self._transform_feature(
+        _LazyBuilderByColumnsToTensor(columns_to_tensors))
+
+  @property
+  def _parse_example_config(self):
+    return self.config
+
+  @property
+  def _num_buckets(self):
+    return self.length * self.source_column.dimension
+
+  def _get_sparse_tensors(self, inputs, weight_collections=None,
+                          trainable=None):
+    del weight_collections
+    del trainable
+    return fc_core._CategoricalColumn.IdWeightPair(  # pylint: disable=protected-access
+        self.to_sparse_tensor(inputs.get(self)), None)
+
+  @property
+  def _variable_shape(self):
+    return tensor_shape.TensorShape(
+        [self.length * self.source_column.dimension])
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    return self._to_dnn_input_layer(
+        inputs.get(self), weight_collections, trainable)
+
 
 def bucketized_column(source_column, boundaries):
   """Creates a _BucketizedColumn for discretizing dense input.
@@ -2063,12 +2113,13 @@ def bucketized_column(source_column, boundaries):
   return _BucketizedColumn(source_column, boundaries)
 
 
-class _CrossedColumn(_FeatureColumn,
-                     collections.namedtuple("_CrossedColumn",
-                                            ["columns", "hash_bucket_size",
-                                             "hash_key",
-                                             "combiner", "ckpt_to_load_from",
-                                             "tensor_name_in_ckpt"])):
+class _CrossedColumn(
+    _FeatureColumn,
+    fc_core._CategoricalColumn,  # pylint: disable=protected-access
+    collections.namedtuple("_CrossedColumn", [
+        "columns", "hash_bucket_size", "hash_key", "combiner",
+        "ckpt_to_load_from", "tensor_name_in_ckpt"
+    ])):
   """Represents a cross transformation also known as conjuction or combination.
 
   Instances of this class are immutable. It crosses given `columns`. Crossed
@@ -2186,12 +2237,37 @@ class _CrossedColumn(_FeatureColumn,
     """Returns the id tensor from the given transformed input_tensor."""
     return input_tensor
 
-  # pylint: disable=unused-argument
   def weight_tensor(self, input_tensor):
     """Returns the weight tensor from the given transformed input_tensor."""
+    del input_tensor
     return None
 
-  def insert_transformed_feature(self, columns_to_tensors):
+  def _to_dnn_input_layer(self,
+                          input_tensor,
+                          weight_collections=None,
+                          trainable=True,
+                          output_rank=2):
+    del input_tensor
+    del weight_collections
+    del trainable
+    del output_rank
+    raise ValueError("CrossedColumn is not supported in DNN. "
+                     "Please use embedding_column. column: {}".format(self))
+
+  def _checkpoint_path(self):
+    if self.ckpt_to_load_from is not None:
+      return self.ckpt_to_load_from, self.tensor_name_in_ckpt
+    return None
+
+  def _wide_embedding_lookup_arguments(self, input_tensor):
+    return _LinearEmbeddingLookupArguments(
+        input_tensor=input_tensor,
+        weight_tensor=None,
+        vocab_size=self.length,
+        initializer=init_ops.zeros_initializer(),
+        combiner=self.combiner)
+
+  def _transform_feature(self, inputs):
     """Handles cross transformation."""
 
     def _collect_leaf_level_columns(cross):
@@ -2207,42 +2283,57 @@ class _CrossedColumn(_FeatureColumn,
     feature_tensors = []
     for c in _collect_leaf_level_columns(self):
       if isinstance(c, _SparseColumn):
-        feature_tensors.append(columns_to_tensors[c.name])
+        feature_tensors.append(inputs.get(c.name))
       else:
-        if c not in columns_to_tensors:
-          c.insert_transformed_feature(columns_to_tensors)
         if isinstance(c, _BucketizedColumn):
-          feature_tensors.append(c.to_sparse_tensor(columns_to_tensors[c]))
+          feature_tensors.append(c.to_sparse_tensor(inputs.get(c)))
         else:
-          feature_tensors.append(columns_to_tensors[c])
-    columns_to_tensors[self] = sparse_feature_cross_op.sparse_feature_cross(
+          feature_tensors.append(inputs.get(c))
+    return sparse_feature_cross_op.sparse_feature_cross(
         feature_tensors,
         hashed_output=True,
         num_buckets=self.hash_bucket_size,
         hash_key=self.hash_key,
         name="cross")
 
-  # pylint: disable=unused-argument
-  def _to_dnn_input_layer(self,
-                          input_tensor,
-                          weight_collections=None,
-                          trainable=True,
-                          output_rank=2):
-    raise ValueError("CrossedColumn is not supported in DNN. "
-                     "Please use embedding_column. column: {}".format(self))
+  def insert_transformed_feature(self, columns_to_tensors):
+    """Handles sparse column to id conversion."""
+    columns_to_tensors[self] = self._transform_feature(
+        _LazyBuilderByColumnsToTensor(columns_to_tensors))
 
-  def _checkpoint_path(self):
-    if self.ckpt_to_load_from is not None:
-      return self.ckpt_to_load_from, self.tensor_name_in_ckpt
-    return None
+  @property
+  def _parse_example_config(self):
+    return self.config
 
-  def _wide_embedding_lookup_arguments(self, input_tensor):
-    return _LinearEmbeddingLookupArguments(
-        input_tensor=input_tensor,
-        weight_tensor=None,
-        vocab_size=self.length,
-        initializer=init_ops.zeros_initializer(),
-        combiner=self.combiner)
+  @property
+  def _num_buckets(self):
+    return self.length
+
+  def _get_sparse_tensors(self, inputs, weight_collections=None,
+                          trainable=None):
+    del weight_collections
+    del trainable
+    return fc_core._CategoricalColumn.IdWeightPair(inputs.get(self), None)  # pylint: disable=protected-access
+
+
+class _LazyBuilderByColumnsToTensor(object):
+
+  def __init__(self, columns_to_tensors):
+    self._columns_to_tensors = columns_to_tensors
+
+  def get(self, key):
+    """Gets the transformed feature column."""
+    if key in self._columns_to_tensors:
+      return self._columns_to_tensors[key]
+    if isinstance(key, str):
+      raise ValueError(
+          "features dictionary doesn't contain key ({})".format(key))
+    if not isinstance(key, _FeatureColumn):
+      raise TypeError('"key" must be either a "str" or "_FeatureColumn". '
+                      "Provided: {}".format(key))
+
+    key.insert_transformed_feature(self._columns_to_tensors)
+    return self._columns_to_tensors[key]
 
 
 def crossed_column(columns, hash_bucket_size, combiner="sum",
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index 0123921266..5e69d41621 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -683,6 +683,8 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     expected = [[0, 1, 0, 0], [0, 0, 1, 0], [1, 0, 0, 0]]
     with self.test_session():
       self.assertAllClose(output.eval(), expected)
+      self.assertAllClose(output.eval(),
+                          fc_core.make_input_layer(features, [bucket]).eval())
 
   def testBucketizedColumnWithMultiDimensionsSucceedsForDNN(self):
     bucket = feature_column.bucketized_column(
@@ -697,6 +699,8 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                 [1, 0, 0, 0, 1, 0, 0, 0]]
     with self.test_session():
       self.assertAllClose(output.eval(), expected)
+      self.assertAllClose(output.eval(),
+                          fc_core.make_input_layer(features, [bucket]).eval())
 
   def testOneHotColumnFromWeightedSparseColumnSucceedsForDNN(self):
     ids_column = feature_column.sparse_column_with_keys(
@@ -836,14 +840,24 @@ class CreateInputLayersForDNNsTest(test.TestCase):
         features, [embedded_sparse], weight_collections=["my_collection"])
     weights = ops.get_collection("my_collection")
     grad = gradients_impl.gradients(output, weights)
+    # Calcuates the tensors calculated by FC core libs. Later, the values will
+    # be compared with the contrib version.
+    output_core = fc_core.make_input_layer(
+        features, [embedded_sparse], weight_collections=["my_collection_core"])
+    weights_core = ops.get_collection("my_collection_core")
+    grad_core = gradients_impl.gradients(output_core, weights_core)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       gradient_values = []
+      gradient_values_core = []
       # Collect the gradient from the different partitions (one in this test)
       for p in range(len(grad)):
         gradient_values.extend(grad[p].values.eval())
+        gradient_values_core.extend(grad_core[p].values.eval())
       gradient_values.sort()
+      gradient_values_core.sort()
       self.assertAllEqual(gradient_values, [0.5] * 6 + [2] * 3)
+      self.assertAllEqual(gradient_values, gradient_values_core)
 
   def testEmbeddingColumnWithInitializerSucceedsForDNN(self):
     hashed_sparse = feature_column.sparse_column_with_hash_bucket("wire", 10)
@@ -1656,9 +1670,12 @@ class WeightedSumTest(test.TestCase):
     features = {"aaa": wire_tensor, "bbb": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [crossed], num_outputs=5)
+    logits_core = fc_core.make_linear_model(features, [crossed], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(logits.eval(), logits_core.eval())
 
   def testEmbeddingColumn(self):
     hashed_sparse = feature_column.sparse_column_with_hash_bucket("wire", 10)
@@ -1750,9 +1767,13 @@ class WeightedSumTest(test.TestCase):
     }
     output, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [real_valued, bucket, hashed_sparse, crossed], num_outputs=5)
+    output_core = fc_core.make_linear_model(
+        features, [real_valued, bucket, hashed_sparse, crossed], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(output.eval().shape, [3, 5])
+      # Verify cross compatibility: Core builder output should equal to contrib.
+      self.assertAllEqual(output.eval(), output_core.eval())
 
   def testPredictions(self):
     language = feature_column.sparse_column_with_keys(
@@ -2161,9 +2182,12 @@ class WeightedSumTest(test.TestCase):
       output, column_to_variable, _ = (
           feature_column_ops.weighted_sum_from_feature_columns(
               features, [bucket], num_outputs=1))
+      output_core = fc_core.make_linear_model(features, [bucket])
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
         lookup_ops.tables_initializer().run()
+        # Cross compatibility: Core builder output should equal to contrib.
+        self.assertAllEqual(output.eval(), output_core.eval())
 
         sess.run(column_to_variable[bucket][0].assign([[0.1], [0.2], [0.3],
                                                        [0.4]]))
@@ -2189,9 +2213,12 @@ class WeightedSumTest(test.TestCase):
       output, column_to_variable, _ = (
           feature_column_ops.weighted_sum_from_feature_columns(
               features, [bucket, country], num_outputs=1))
+      output_core = fc_core.make_linear_model(features, [bucket, country])
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
         lookup_ops.tables_initializer().run()
+        # Cross compatibility: Core builder output should equal to contrib.
+        self.assertAllEqual(output.eval(), output_core.eval())
 
         # dimension = 2, bucket_size = 4, num_classes = 1
         sess.run(column_to_variable[bucket][0].assign(
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 22ce5f48b1..16ac838050 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -1057,7 +1057,8 @@ def _check_feature_columns(feature_columns):
     raise ValueError('Expected feature_columns to be iterable, found dict.')
   for column in feature_columns:
     if not isinstance(column, _FeatureColumn):
-      raise ValueError('Items of feature_columns must be a _FeatureColumn.')
+      raise ValueError('Items of feature_columns must be a _FeatureColumn.'
+                       'Given: {}.'.format(column))
   name_to_column = dict()
   for column in feature_columns:
     if column.name in name_to_column:
-- 
GitLab


From 09f3fb939c9b395a9bc747cf81d15b2dc2804c3e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 14:10:10 -0700
Subject: [PATCH 1123/1563] Merged commit includes the following changes:
 155425029  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change.

--
155424167  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change.

--

PiperOrigin-RevId: 155425029
---
 tensorflow/compiler/xla/service/BUILD         |  1 +
 .../compiler/xla/service/buffer_liveness.cc   | 10 +-
 .../compiler/xla/service/copy_insertion.cc    |  7 ++
 .../compiler/xla/service/hlo_instruction.h    |  2 +
 .../xla/service/hlo_rematerialization.cc      |  4 +-
 .../compiler/xla/service/liveness_util.cc     | 98 ++++++++++++++-----
 .../xla/service/liveness_util_test.cc         | 70 ++++++++++++-
 .../xla/service/tuple_points_to_analysis.cc   | 26 ++---
 .../xla/service/tuple_points_to_analysis.h    | 15 +--
 .../service/tuple_points_to_analysis_test.cc  |  9 +-
 .../unsupported/Eigen/CXX11}/eigen.threadpool |  0
 11 files changed, 173 insertions(+), 69 deletions(-)
 rename {tensorflow/opensource_only => third_party/eigen3/unsupported/Eigen/CXX11}/eigen.threadpool (100%)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index fd47ffe806..7bdc2afe5e 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -1203,6 +1203,7 @@ cc_library(
         ":buffer_liveness",
         ":hlo",
         ":hlo_pass",
+        ":liveness_util",
         ":logical_buffer",
         ":tuple_points_to_analysis",
         "//tensorflow/compiler/xla:status_macros",
diff --git a/tensorflow/compiler/xla/service/buffer_liveness.cc b/tensorflow/compiler/xla/service/buffer_liveness.cc
index 38c2c81551..3be4810490 100644
--- a/tensorflow/compiler/xla/service/buffer_liveness.cc
+++ b/tensorflow/compiler/xla/service/buffer_liveness.cc
@@ -45,9 +45,7 @@ StatusOr<std::unique_ptr<BufferLiveness>> BufferLiveness::Run(
 }
 
 tensorflow::Status BufferLiveness::Analyze() {
-  TF_ASSIGN_OR_RETURN(points_to_analysis_,
-                      TuplePointsToAnalysis::Run(
-                          module_, /*include_loop_fusion_instructions=*/true));
+  TF_ASSIGN_OR_RETURN(points_to_analysis_, TuplePointsToAnalysis::Run(module_));
   for (auto& computation : module_->computations()) {
     // Gather all instructions whose buffers might alias other instructions into
     // the set aliased_buffers_.  This includes those contained as a tuple
@@ -117,11 +115,7 @@ bool BufferLiveness::live_range_strictly_before(const LogicalBuffer& a,
 
   // If 'b' is a user of 'a' then the buffers interfere unless 'a.instruction'
   // and 'b.instruction' emit the same shape/layout, and 'b.instruction' meets
-  // one of following qualifications:
-  // *) Is element-wise.
-  // *) Is a loop fusion instruction (with DynamicUpdateSlice fused root) where
-  //    the singleton use of 'a' at 'a.index' is the fused root at operand 0.
-  // *) Use of 'operand' is DynamicUpdateSlice at operand index 0.
+  // the qualifications specified in CanShareOperandBufferWithUser.
   for (const BufferAlias& alias : points_to_analysis_->GetBufferAliases(a)) {
     if (b.instruction()->IsUserOf(alias.instruction()) &&
         !CanShareOperandBufferWithUser(alias.instruction(), alias.index(),
diff --git a/tensorflow/compiler/xla/service/copy_insertion.cc b/tensorflow/compiler/xla/service/copy_insertion.cc
index 7db28aed3c..907b0307d4 100644
--- a/tensorflow/compiler/xla/service/copy_insertion.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/service/liveness_util.h"
 #include "tensorflow/compiler/xla/service/logical_buffer.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 #include "tensorflow/compiler/xla/status_macros.h"
@@ -319,6 +320,7 @@ Status InstructionCopier::RecordIndicesWhichInterfereWithOtherInstruction(
           if (liveness.MayInterfere(*instruction_buffer, *other_buffer)) {
             VLOG(2) << "Adding copy of buffer for instruction: "
                     << instruction_->name()
+                    << " instruction_buffer: " << instruction_buffer->ToString()
                     << " at index: " << tensorflow::str_util::Join(index, ",")
                     << " because of interference with buffer: "
                     << other_buffer->ToString();
@@ -351,6 +353,11 @@ Status InstructionCopier::RecordControlPredecessors(
           for (const BufferAlias& alias :
                points_to_analysis.GetBufferAliases(*buffer)) {
             for (HloInstruction* user : alias.instruction()->users()) {
+              if (DoesNotUseOperandBuffer(alias.instruction(), alias.index(),
+                                          user, points_to_analysis)) {
+                continue;
+              }
+
               if (user != instruction_) {
                 control_predecessors_.mutable_element(index)->push_back(user);
               }
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.h b/tensorflow/compiler/xla/service/hlo_instruction.h
index 43935690df..d300d99ade 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.h
+++ b/tensorflow/compiler/xla/service/hlo_instruction.h
@@ -56,6 +56,8 @@ class HloInstruction {
     kLoop,                // Fused into a loop.
     kInput,               // Op's input is fused into the op itself.
     kOutput,              // Op's output is fused into the op itself.
+                          // REQUIRES: At least one operand buffer must be able
+                          // to alias the output buffer.
     kTransposeDot,        // Fused into a dot with transposed operands.
     kConvBackwardFilter,  // Fused into a backward filter convolution.
     kConvBackwardInput,   // Fused into a backward input convolution.
diff --git a/tensorflow/compiler/xla/service/hlo_rematerialization.cc b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
index b1ee2e46b0..5d4fd7c2de 100644
--- a/tensorflow/compiler/xla/service/hlo_rematerialization.cc
+++ b/tensorflow/compiler/xla/service/hlo_rematerialization.cc
@@ -1156,9 +1156,7 @@ StatusOr<bool> HloRematerialization::Run(
   VLOG(1) << "HloRematerialization() with memory limit of "
           << HumanReadableNumBytes(memory_limit_bytes);
 
-  TF_ASSIGN_OR_RETURN(points_to_analysis_,
-                      TuplePointsToAnalysis::Run(
-                          module, /*include_loop_fusion_instructions=*/true));
+  TF_ASSIGN_OR_RETURN(points_to_analysis_, TuplePointsToAnalysis::Run(module));
 
   // Adjust memory limit to account for the output of the entry
   // computation. This is necessary because the per-computation accounting in
diff --git a/tensorflow/compiler/xla/service/liveness_util.cc b/tensorflow/compiler/xla/service/liveness_util.cc
index e0991fcb76..16e11ca6c6 100644
--- a/tensorflow/compiler/xla/service/liveness_util.cc
+++ b/tensorflow/compiler/xla/service/liveness_util.cc
@@ -99,6 +99,41 @@ std::vector<std::pair<HloInstruction*, int64>> GetAllUsesOfInstructionAtIndex(
   return uses;
 }
 
+// Returns true if there is exactly one use of 'operand' at 'operand_index'
+// in 'fusion.fused_instructions', where the singleton use is the fused
+// root at operand index 'use_operand_index'. Returns false otherwise.
+//
+// REQUIRES: 'fusion' opcode is a kFusion instruction.
+bool HasUniqueFusedUseOfOperandAt(
+    HloInstruction* operand, const ShapeIndex& operand_index,
+    HloInstruction* fusion, const int64 use_operand_index,
+    const TuplePointsToAnalysis& points_to_analysis) {
+  CHECK_EQ(HloOpcode::kFusion, fusion->opcode());
+  // Check that 'operand' is unique in the operand list of 'fusion'.
+  if (fusion->OperandIndices(operand).size() > 1) {
+    return false;
+  }
+  // Find fusion parameter associated with 'operand'.
+  const auto& fused_params = fusion->fused_parameters();
+  auto fused_param_it = std::find_if(
+      fused_params.begin(), fused_params.end(),
+      [&](HloInstruction* fused_param) {
+        return fusion->operand(fused_param->parameter_number()) == operand;
+      });
+  if (fused_param_it == fused_params.end()) {
+    return false;
+  }
+  auto* fused_param = *fused_param_it;
+  // Get all uses of 'operand' at 'index' from 'fusion.fused_instructions'.
+  auto fused_param_uses = GetAllUsesOfInstructionAtIndex(
+      fused_param, operand_index, points_to_analysis);
+  // Return true iff there is exactly one use of 'operand' at 'index', and
+  // this singleton use is the fused root (at index in 'use_operand_indices').
+  return fused_param_uses.size() == 1 &&
+         fused_param_uses[0].first == fusion->fused_expression_root() &&
+         fused_param_uses[0].second == use_operand_index;
+}
+
 }  // namespace
 
 // User and operand can share buffers iff both instructions emit the same shape
@@ -107,6 +142,9 @@ std::vector<std::pair<HloInstruction*, int64>> GetAllUsesOfInstructionAtIndex(
 // *) Is a loop fusion instruction where the only use of 'operand' at 'index'
 //    in the set 'user.fused_instructions' is a DynamicUpdateSlice fused root
 //    at operand 0. Or...
+// *) Is a kDot -> kAdd (or fused kTransposeDot -> kAdd) output fusion
+//    instruction where the only use of 'operand' at 'index' in the set
+//    'user.fused_instructions' is a kAdd fused root at operand 0 or 1. Or...
 // *) The 'user' of 'operand' is DynamicUpdateSlice or While at operand index 0.
 bool CanShareOperandBufferWithUser(
     HloInstruction* operand, const ShapeIndex& operand_index,
@@ -126,30 +164,46 @@ bool CanShareOperandBufferWithUser(
   if (user->opcode() == HloOpcode::kCopy) {
     return false;
   }
-  // Check if 'user' is a loop fusion instruction with a kDynamicUpdateSlice
-  // fused root instruction.
-  if (user->opcode() == HloOpcode::kFusion &&
-      user->fusion_kind() == HloInstruction::FusionKind::kLoop &&
-      user->fused_expression_root()->opcode() ==
-          HloOpcode::kDynamicUpdateSlice) {
-    for (auto& fused_param : user->fused_parameters()) {
-      // Find fusion parameter associated with 'operand'.
-      if (user->operand(fused_param->parameter_number()) != operand) {
-        continue;
-      }
-      // Get all uses of 'operand' at 'index' from 'user.fused_instructions'.
-      auto fused_param_uses = GetAllUsesOfInstructionAtIndex(
-          fused_param, operand_index, points_to_analysis);
-      // Return true iff there is exactly one use of 'operand' at 'index', and
-      // this singleton use is the fused root at operand index 0.
-      if (fused_param_uses.size() == 1 &&
-          fused_param_uses[0].first == user->fused_expression_root() &&
-          fused_param_uses[0].second == 0) {
-        return true;
+  if (user->opcode() == HloOpcode::kFusion) {
+    if (user->fusion_kind() == HloInstruction::FusionKind::kLoop &&
+        user->fused_expression_root()->opcode() ==
+            HloOpcode::kDynamicUpdateSlice) {
+      // Loop fusion with kDynamicUpdateSlice fused root.
+      //
+      // Returns true iff there is exactly one use of 'operand' at shape index
+      // 'operand_index', and this singleton use is the fused root at operand
+      // index 0.
+      return HasUniqueFusedUseOfOperandAt(operand, operand_index, user, 0,
+                                          points_to_analysis);
+    } else if (user->fusion_kind() == HloInstruction::FusionKind::kOutput &&
+               user->fused_expression_root()->opcode() == HloOpcode::kAdd) {
+      // Output fusion with kAdd fused root.
+
+      // Check if one operand of kAdd fused root is either kDot, or nested
+      // kFusion of kind kTransposeDot.
+      auto* add = user->fused_expression_root();
+      auto add_operand_it =
+          std::find_if(add->operands().begin(), add->operands().end(),
+                       [&](HloInstruction* operand) {
+                         return operand->opcode() == HloOpcode::kDot ||
+                                (operand->opcode() == HloOpcode::kFusion &&
+                                 operand->fusion_kind() ==
+                                     HloInstruction::FusionKind::kTransposeDot);
+                       });
+      if (add_operand_it == add->operands().end()) {
+        return false;
       }
-      break;
+      auto* matched_add_operand = *add_operand_it;
+      // Calculate operand index of 'add' operand which was not matched above.
+      const int64 other_add_operand_index =
+          matched_add_operand == add->operand(0) ? 1 : 0;
+      // Returns true iff there is exactly one use of 'operand' at shape index
+      // 'operand_index', and this singleton use is the fused root (at operand
+      // index 'other_add_operand_index').
+      return HasUniqueFusedUseOfOperandAt(operand, operand_index, user,
+                                          other_add_operand_index,
+                                          points_to_analysis);
     }
-    return false;
   }
   if (user->opcode() == HloOpcode::kDynamicUpdateSlice ||
       user->opcode() == HloOpcode::kWhile) {
diff --git a/tensorflow/compiler/xla/service/liveness_util_test.cc b/tensorflow/compiler/xla/service/liveness_util_test.cc
index 1ee0292511..0ddd0caa35 100644
--- a/tensorflow/compiler/xla/service/liveness_util_test.cc
+++ b/tensorflow/compiler/xla/service/liveness_util_test.cc
@@ -34,9 +34,7 @@ class PointsToAnalysisTestBase : public HloTestBase {
   void RunAnalysis() {
     CHECK_NOTNULL(module_.get());
     points_to_analysis_ =
-        TuplePointsToAnalysis::Run(module_.get(),
-                                   /*include_loop_fusion_instructions=*/true)
-            .ConsumeValueOrDie();
+        TuplePointsToAnalysis::Run(module_.get()).ConsumeValueOrDie();
   }
 
   void BuildModuleAndRunAnalysis(std::unique_ptr<HloComputation> computation) {
@@ -231,6 +229,72 @@ TEST_F(CanShareOperandBufferWithUserTest, DynamicUpdateSliceCanShare) {
       CanShareOperandBufferWithUser(starts, {}, dus, {}, *points_to_analysis_));
 }
 
+TEST_F(CanShareOperandBufferWithUserTest, FusedDotAdd) {
+  auto builder = HloComputation::Builder(TestName());
+  Shape data_shape = ShapeUtil::MakeShape(F32, {2, 2});
+
+  auto a = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR2<float>({{1.0, 0.0}, {0.0, 1.0}})));
+  auto b = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR2<float>({{2.0, 2.0}, {2.0, 2.0}})));
+
+  auto dot = builder.AddInstruction(
+      HloInstruction::CreateBinary(data_shape, HloOpcode::kDot, a, b));
+
+  auto one = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0)));
+  auto add_operand = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape, one, {1}));
+
+  auto add = builder.AddInstruction(HloInstruction::CreateBinary(
+      data_shape, HloOpcode::kAdd, dot, add_operand));
+
+  BuildModule(builder.Build());
+  auto fusion = computation_->CreateFusionInstruction(
+      {add, dot}, HloInstruction::FusionKind::kOutput);
+  RunAnalysis();
+
+  // Output fused dot add should be able to share buffer with 'add_operand'.
+  EXPECT_TRUE(CanShareOperandBufferWithUser(add_operand, {}, fusion, {},
+                                            *points_to_analysis_));
+}
+
+TEST_F(CanShareOperandBufferWithUserTest, FusedTransposeDotAdd) {
+  auto builder = HloComputation::Builder(TestName());
+  Shape data_shape = ShapeUtil::MakeShape(F32, {2, 2});
+
+  auto a = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR2<float>({{1.0, 0.0}, {0.0, 1.0}})));
+  auto b = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR2<float>({{2.0, 2.0}, {2.0, 2.0}})));
+  auto b_t = builder.AddInstruction(
+      HloInstruction::CreateTranspose(data_shape, b, {1, 0}));
+
+  auto dot = builder.AddInstruction(
+      HloInstruction::CreateBinary(data_shape, HloOpcode::kDot, a, b_t));
+
+  auto one = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0)));
+  auto add_operand = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape, one, {1}));
+
+  auto add = builder.AddInstruction(HloInstruction::CreateBinary(
+      data_shape, HloOpcode::kAdd, dot, add_operand));
+
+  BuildModule(builder.Build());
+
+  auto nested_fusion = computation_->CreateFusionInstruction(
+      {dot, b_t}, HloInstruction::FusionKind::kTransposeDot);
+
+  auto fusion = computation_->CreateFusionInstruction(
+      {add, nested_fusion}, HloInstruction::FusionKind::kOutput);
+  RunAnalysis();
+
+  // Output fused transpose-dot-add should be share buffer with 'add_operand'.
+  EXPECT_TRUE(CanShareOperandBufferWithUser(add_operand, {}, fusion, {},
+                                            *points_to_analysis_));
+}
+
 TEST_F(CanShareOperandBufferWithUserTest, WhileCanShare) {
   Shape data_shape = ShapeUtil::MakeShape(F32, {8});
 
diff --git a/tensorflow/compiler/xla/service/tuple_points_to_analysis.cc b/tensorflow/compiler/xla/service/tuple_points_to_analysis.cc
index 98c51b48f9..554adaf0e3 100644
--- a/tensorflow/compiler/xla/service/tuple_points_to_analysis.cc
+++ b/tensorflow/compiler/xla/service/tuple_points_to_analysis.cc
@@ -131,10 +131,9 @@ void PointsToSet::add_tuple_source(const ShapeIndex& index,
 }
 
 /* static */ StatusOr<std::unique_ptr<TuplePointsToAnalysis>>
-TuplePointsToAnalysis::Run(const HloModule* module,
-                           const bool include_loop_fusion_instructions) {
+TuplePointsToAnalysis::Run(const HloModule* module) {
   std::unique_ptr<TuplePointsToAnalysis> analysis(
-      new TuplePointsToAnalysis(module, include_loop_fusion_instructions));
+      new TuplePointsToAnalysis(module));
   TF_RETURN_IF_ERROR(analysis->Analyze());
   return std::move(analysis);
 }
@@ -145,17 +144,14 @@ Status TuplePointsToAnalysis::Analyze() {
     TF_RETURN_IF_ERROR(computation->Accept(this));
     TF_RETURN_IF_ERROR(
         PopulateDefinedBuffersAndAliases(computation->instructions()));
-    if (include_loop_fusion_instructions_) {
-      // Run points-to analysis on loop fusion instructions in 'computation'.
-      for (auto& instruction : computation->instructions()) {
-        if (instruction->opcode() != HloOpcode::kFusion ||
-            instruction->fusion_kind() != HloInstruction::FusionKind::kLoop) {
-          continue;
-        }
-        TF_RETURN_IF_ERROR(instruction->fused_expression_root()->Accept(this));
-        TF_RETURN_IF_ERROR(PopulateDefinedBuffersAndAliases(
-            instruction->fused_instructions()));
+    // Run points-to analysis on fusion instructions in 'computation'.
+    for (auto& instruction : computation->instructions()) {
+      if (instruction->opcode() != HloOpcode::kFusion) {
+        continue;
       }
+      TF_RETURN_IF_ERROR(instruction->fused_expression_root()->Accept(this));
+      TF_RETURN_IF_ERROR(
+          PopulateDefinedBuffersAndAliases(instruction->fused_instructions()));
     }
   }
 
@@ -482,9 +478,7 @@ string TuplePointsToAnalysis::ToString() const {
     for (const HloInstruction* instruction :
          computation->MakeInstructionPostOrder()) {
       InstructionToString(instruction, &output);
-      if (include_loop_fusion_instructions_ &&
-          instruction->opcode() == HloOpcode::kFusion &&
-          instruction->fusion_kind() == HloInstruction::FusionKind::kLoop) {
+      if (instruction->opcode() == HloOpcode::kFusion) {
         for (auto& fused : instruction->fused_instructions()) {
           InstructionToString(fused.get(), &output);
         }
diff --git a/tensorflow/compiler/xla/service/tuple_points_to_analysis.h b/tensorflow/compiler/xla/service/tuple_points_to_analysis.h
index a384529171..85a71b56ce 100644
--- a/tensorflow/compiler/xla/service/tuple_points_to_analysis.h
+++ b/tensorflow/compiler/xla/service/tuple_points_to_analysis.h
@@ -148,12 +148,9 @@ std::ostream& operator<<(std::ostream& out, const BufferAlias& buffer_alias);
 // the potential sources of each buffer in each instruction's output.
 class TuplePointsToAnalysis : public DfsHloVisitorWithDefault {
  public:
-  // Runs points-to analysis on 'module'. If 'include_loop_fusion_instructions'
-  // is true, includes fused instructions from each loop fusion instruction
-  // in 'module' in the points-to analysis.
+  // Runs points-to analysis on 'module'.
   static StatusOr<std::unique_ptr<TuplePointsToAnalysis>> Run(
-      const HloModule* module,
-      const bool include_loop_fusion_instructions = false);
+      const HloModule* module);
 
   // Return the points-to set of an instruction. This describes the potential
   // sources of each buffer in the instruction's output.
@@ -218,10 +215,7 @@ class TuplePointsToAnalysis : public DfsHloVisitorWithDefault {
   string ToString() const;
 
  private:
-  explicit TuplePointsToAnalysis(const HloModule* module,
-                                 const bool include_loop_fusion_instructions)
-      : module_(module),
-        include_loop_fusion_instructions_(include_loop_fusion_instructions) {}
+  explicit TuplePointsToAnalysis(const HloModule* module) : module_(module) {}
 
   // Perform the analysis. Should be called immediately after constructing the
   // object and before calling GetPointsToSet.
@@ -261,9 +255,6 @@ class TuplePointsToAnalysis : public DfsHloVisitorWithDefault {
   // The module this analysis is performed on.
   const HloModule* module_;
 
-  // Whether to run points-to analysis on loop fusion instructions in 'module_'.
-  const bool include_loop_fusion_instructions_;
-
   // A map containing a PointsToSet for every HLO instruction.
   tensorflow::gtl::FlatMap<const HloInstruction*, std::unique_ptr<PointsToSet>>
       points_to_;
diff --git a/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc b/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
index 808050bdab..87e1b058b7 100644
--- a/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
+++ b/tensorflow/compiler/xla/service/tuple_points_to_analysis_test.cc
@@ -52,11 +52,10 @@ class TuplePointsToAnalysisTest : public HloTestBase {
     module_->AddEntryComputation(std::move(computation));
   }
 
-  void RunAnalysis(const bool include_loop_fusion_instructions = false) {
+  void RunAnalysis() {
     CHECK_NOTNULL(module_.get());
-    points_to_analysis_ = TuplePointsToAnalysis::Run(
-                              module_.get(), include_loop_fusion_instructions)
-                              .ConsumeValueOrDie();
+    points_to_analysis_ =
+        TuplePointsToAnalysis::Run(module_.get()).ConsumeValueOrDie();
   }
 
   // Returns the LogicalBuffer defined at the given instruction and
@@ -609,7 +608,7 @@ class FusionPointsToAnalysisTest : public TuplePointsToAnalysisTest {
     auto* fusion = module_->entry_computation()->root_instruction();
     EXPECT_THAT(fusion, op::Fusion(tuple_param0));
     // Run points-to analysis (should include fused instructions from 'fusion').
-    RunAnalysis(/*include_loop_fusion_instructions=*/true);
+    RunAnalysis();
 
     // Check points-to set of fusion parameter associated with 'tuple_param0'.
     auto* fusion_param = GetFusionParameterForOperand(fusion, tuple_param0);
diff --git a/tensorflow/opensource_only/eigen.threadpool b/third_party/eigen3/unsupported/Eigen/CXX11/eigen.threadpool
similarity index 100%
rename from tensorflow/opensource_only/eigen.threadpool
rename to third_party/eigen3/unsupported/Eigen/CXX11/eigen.threadpool
-- 
GitLab


From c7f79bb75b5b83c3011e164ccd617a6ada910ea4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 14:30:06 -0700
Subject: [PATCH 1124/1563] Merged commit includes the following changes:
 155427981  by andrewharp <andrewharp@google.com>:

    StatSummarizer: Put size check error message outside of if block where it belongs.

--
155427811  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change

PiperOrigin-RevId: 155427981
---
 tensorflow/core/util/stat_summarizer.cc | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/tensorflow/core/util/stat_summarizer.cc b/tensorflow/core/util/stat_summarizer.cc
index 8300ba370e..40ae85e44b 100644
--- a/tensorflow/core/util/stat_summarizer.cc
+++ b/tensorflow/core/util/stat_summarizer.cc
@@ -50,20 +50,23 @@ void StatSummarizer::Validate(const Detail* detail,
       }
       const auto& stored = detail->outputs[slot];
       const auto& current = output.tensor_description();
-      bool do_shapes_match = true;
-      if (stored.shape().dim_size() != current.shape().dim_size()) {
-        do_shapes_match = false;
-      } else {
+
+      bool do_tensors_match =
+          (stored.dtype() == current.dtype()) &&
+          (stored.shape().dim_size() == current.shape().dim_size());
+
+      if (do_tensors_match) {
         for (int i = 0; i < stored.shape().dim_size(); ++i) {
           if (stored.shape().dim(i).size() != current.shape().dim(i).size()) {
-            do_shapes_match = false;
+            do_tensors_match = false;
+            break;
           }
         }
+      }
 
-        if ((stored.dtype() != current.dtype()) || !do_shapes_match) {
-          LOG(WARNING) << "Output tensor changed between runs for '"
-                       << ns.node_name();
-        }
+      if (!do_tensors_match) {
+        LOG(WARNING) << "Output tensor changed between runs for '"
+                     << ns.node_name();
       }
     }
   }
-- 
GitLab


From 3f1f88c55b22aff9bb900edddbe6cabd4f62a862 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 14:36:28 -0700
Subject: [PATCH 1125/1563] Enable USE_GEMM_FOR_CONV and -O3 on android.

PiperOrigin-RevId: 155428927
---
 tensorflow/contrib/android/cmake/CMakeLists.txt | 2 +-
 tensorflow/tensorflow.bzl                       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/android/cmake/CMakeLists.txt b/tensorflow/contrib/android/cmake/CMakeLists.txt
index 9f9d740d6c..2219daab11 100644
--- a/tensorflow/contrib/android/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/android/cmake/CMakeLists.txt
@@ -32,7 +32,7 @@ set_target_properties(lib_tf PROPERTIES IMPORTED_LOCATION
 # Change to compile flags should be replicated into bazel build file
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIS_SLIM_BUILD \
                      -std=c++11 -fno-rtti -fno-exceptions \
-                     -O2 -Wno-narrowing \
+                     -O3 -DUSE_GEMM_FOR_CONV -Wno-narrowing \
                      -mfpu=neon -mfloat-abi=softfp -fPIE \
                      -DGOOGLE_PROTOBUF_NO_RTTI \
                      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER")
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index ff4222032d..e058c0bb8f 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -133,7 +133,8 @@ def tf_copts():
           clean_dep("//tensorflow:android"): [
               "-std=c++11",
               "-DTF_LEAN_BINARY",
-              "-O2",
+              "-DUSE_GEMM_FOR_CONV",
+              "-O3",
           ],
           clean_dep("//tensorflow:darwin"): [],
           clean_dep("//tensorflow:windows"): [
-- 
GitLab


From 8b219918214f779b0f4c7785ae93feffa6e492c3 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Mon, 8 May 2017 14:46:09 -0700
Subject: [PATCH 1126/1563] tfdbg: Internally-oriented changes

PiperOrigin-RevId: 155430252
---
 tensorflow/core/debug/debug_io_utils.cc | 50 ++++++++++++++-----------
 tensorflow/core/debug/debug_io_utils.h  | 14 ++++++-
 2 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc
index a79ea1b45d..c8282b83d6 100644
--- a/tensorflow/core/debug/debug_io_utils.cc
+++ b/tensorflow/core/debug/debug_io_utils.cc
@@ -233,7 +233,7 @@ Status DebugIO::PublishDebugTensor(const string& tensor_name,
         strings::StrCat("Failed to parse tensor name: \"", tensor_name, "\""));
   }
 
-  int num_failed_urls = 0;
+  int32 num_failed_urls = 0;
   std::vector<Status> fail_statuses;
   for (const string& url : debug_urls) {
     if (str_util::Lowercase(url).find(kFileURLScheme) == 0) {
@@ -497,18 +497,26 @@ Status DebugFileIO::RecursiveCreateDir(Env* env, const string& dir) {
 
 #if defined(PLATFORM_GOOGLE)
 DebugGrpcChannel::DebugGrpcChannel(const string& server_stream_addr)
-    : url_(strings::StrCat(DebugIO::kGrpcURLScheme, server_stream_addr)),
-      ctx_(),
-      channel_(::grpc::CreateCustomChannel(server_stream_addr,
-                                           ::grpc::InsecureChannelCredentials(),
-                                           ::grpc::ChannelArguments())),
-      stub_(EventListener::NewStub(channel_)),
-      reader_writer_(stub_->SendEvents(&ctx_)),
-      mu_() {}
-// TODO(cais): Set GRPC_ARG_MAX_MESSAGE_LENGTH to max if necessary.
-
-bool DebugGrpcChannel::is_channel_ready() {
-  return channel_->GetState(false) == GRPC_CHANNEL_READY;
+    : server_stream_addr_(server_stream_addr),
+      url_(strings::StrCat(DebugIO::kGrpcURLScheme, server_stream_addr)) {}
+
+Status DebugGrpcChannel::Connect(const int64 timeout_micros) {
+  ::grpc::ChannelArguments args;
+  args.SetInt(GRPC_ARG_MAX_MESSAGE_LENGTH, std::numeric_limits<int32>::max());
+  // Avoid problems where default reconnect backoff is too long (e.g., 20 s).
+  args.SetInt("grpc.testing.fixed_reconnect_backoff_ms", 1000);
+  channel_ = ::grpc::CreateCustomChannel(
+      server_stream_addr_, ::grpc::InsecureChannelCredentials(), args);
+  if (!channel_->WaitForConnected(
+          gpr_time_add(gpr_now(GPR_CLOCK_REALTIME),
+                       gpr_time_from_micros(timeout_micros, GPR_TIMESPAN)))) {
+    return errors::FailedPrecondition(
+        "Failed to connect to gRPC channel at ", server_stream_addr_,
+        " within a timeout of ", timeout_micros / 1e6, " s.");
+  }
+  stub_ = EventListener::NewStub(channel_);
+  reader_writer_ = stub_->SendEvents(&ctx_);
+  return Status::OK();
 }
 
 bool DebugGrpcChannel::WriteEvent(const Event& event) {
@@ -551,7 +559,11 @@ Status DebugGrpcChannel::ReceiveServerRepliesAndClose() {
 // static
 mutex DebugGrpcIO::streams_mu;
 
-// Static
+// static
+int64 DebugGrpcIO::channel_connection_timeout_micros = 900 * 1000 * 1000;
+// TODO(cais): Make this configurable?
+
+// static
 std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>*
 DebugGrpcIO::GetStreamChannels() {
   static std::unordered_map<string, std::shared_ptr<DebugGrpcChannel>>*
@@ -592,12 +604,8 @@ Status DebugGrpcIO::SendEventProtoThroughGrpcStream(
         stream_channels = GetStreamChannels();
     if (stream_channels->find(grpc_stream_url) == stream_channels->end()) {
       debug_grpc_channel.reset(new DebugGrpcChannel(server_stream_addr));
-
-      if (!debug_grpc_channel->is_channel_ready()) {
-        return errors::FailedPrecondition(
-            strings::StrCat("Channel at the following gRPC stream URL is ",
-                            "not ready: ", grpc_stream_url));
-      }
+      TF_RETURN_IF_ERROR(
+          debug_grpc_channel->Connect(channel_connection_timeout_micros));
 
       (*stream_channels)[grpc_stream_url] = debug_grpc_channel;
       CreateEmptyEnabledSet(grpc_stream_url);
@@ -609,7 +617,7 @@ Status DebugGrpcIO::SendEventProtoThroughGrpcStream(
   bool write_ok = debug_grpc_channel->WriteEvent(event_proto);
   if (!write_ok) {
     return errors::Cancelled(strings::StrCat("Write event to stream URL ",
-                                             grpc_stream_url, "failed."));
+                                             grpc_stream_url, " failed."));
   }
 
   return Status::OK();
diff --git a/tensorflow/core/debug/debug_io_utils.h b/tensorflow/core/debug/debug_io_utils.h
index 7e0c3b1945..2785f5bcc1 100644
--- a/tensorflow/core/debug/debug_io_utils.h
+++ b/tensorflow/core/debug/debug_io_utils.h
@@ -215,8 +215,16 @@ class DebugGrpcChannel {
 
   virtual ~DebugGrpcChannel() {}
 
-  // Query whether the gRPC channel is ready for use.
-  bool is_channel_ready();
+  // Attempt to establish connection with server.
+  //
+  // Args:
+  //   timeout_micros: Timeout (in microseconds) for the attempt to establish
+  //     the connection.
+  //
+  // Returns:
+  //   OK Status iff connection is successfully established before timeout,
+  //   otherwise return an error Status.
+  Status Connect(const int64 timeout_micros);
 
   // Write an Event proto to the debug gRPC stream.
   //
@@ -234,6 +242,7 @@ class DebugGrpcChannel {
   Status ReceiveServerRepliesAndClose();
 
  private:
+  string server_stream_addr_;
   string url_;
   ::grpc::ClientContext ctx_;
   std::shared_ptr<::grpc::Channel> channel_;
@@ -302,6 +311,7 @@ class DebugGrpcIO {
   static void CreateEmptyEnabledSet(const string& grpc_debug_url);
 
   static mutex streams_mu;
+  static int64 channel_connection_timeout_micros;
 
   friend class GrpcDebugTest;
   friend class DebugNumericSummaryOpTest;
-- 
GitLab


From 0a77fc720ba6db07f167b437e12f599ba98fc776 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 7 Feb 2017 14:46:29 -0800
Subject: [PATCH 1127/1563] Avoid checking for shape consistency in split, when
 the dimension is unknown. Must defer to runtime.

PiperOrigin-RevId: 155430309
---
 tensorflow/core/ops/array_ops.cc                | 3 ++-
 tensorflow/python/kernel_tests/split_op_test.py | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 9a8b70acf1..949160c247 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -575,7 +575,8 @@ REGISTER_OP("SplitV")
           else
             cumsum_outputs = split_dim_size + 1;
         }
-        if (cumsum_outputs != c->Value(c->Dim(input, split_dim)))
+        if (c->ValueKnown(c->Dim(input, split_dim)) &&
+            cumsum_outputs != c->Value(c->Dim(input, split_dim)))
           return errors::InvalidArgument(
               "Sum of output sizes must match "
               "the size of the original Tensor along the split dimension "
diff --git a/tensorflow/python/kernel_tests/split_op_test.py b/tensorflow/python/kernel_tests/split_op_test.py
index 02c27bf87d..3dcafd2496 100644
--- a/tensorflow/python/kernel_tests/split_op_test.py
+++ b/tensorflow/python/kernel_tests/split_op_test.py
@@ -77,6 +77,12 @@ class SplitOpTest(test.TestCase):
     self.assertEqual(result[1].shape[1], 2)
     self.assertEqual(result[2].shape[1], 2)
 
+    model_input2 = array_ops.placeholder(dtypes.float32, shape=[None, 2])
+    result = array_ops.split(model_input2, [2, 2], axis=0)[0]
+
+    with self.test_session(use_gpu=False) as sess:
+      sess.run(result, feed_dict={model_input2: np.ones([4, 2])})
+
   def testExplicitNum(self):
     size_splits = array_ops.placeholder(dtype=dtypes.int32, shape=[None])
 
-- 
GitLab


From 036921c833bbe14dd3e21373665e4fd6a7d9f2ad Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 14:51:03 -0700
Subject: [PATCH 1128/1563] Small documentation fix: Update code example in
 cuda_solvers.h after changing method name.

PiperOrigin-RevId: 155430968
---
 tensorflow/core/kernels/cuda_solvers.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/kernels/cuda_solvers.h b/tensorflow/core/kernels/cuda_solvers.h
index 7fe3ef42f2..bed1962ad0 100644
--- a/tensorflow/core/kernels/cuda_solvers.h
+++ b/tensorflow/core/kernels/cuda_solvers.h
@@ -53,9 +53,9 @@ class HostLapackInfo;
 // Notice: All the computational member functions are asynchronous and simply
 // launch one or more Cuda kernels on the Cuda stream wrapped by the CudaSolver
 // object. To check the final status of the kernels run, call
-// RegisterLapackInfoCheckerCallback() on the CudaSolver object to set a
-// callback that will be invoked with the status of the kernels launched thus
-// far as arguments.
+// CopyLapackInfoToHostAsync() on the CudaSolver object to set a callback that
+// will be invoked with the status of the kernels launched thus far as
+// arguments.
 //
 // Example of an asynchronous TensorFlow kernel using CudaSolver:
 //
@@ -90,8 +90,7 @@ class HostLapackInfo;
 //                                       dev_info.back().mutable_data()),
 //                          done);
 //
-//     // 4. Register a callback to check the status after the computation
-//     // finishes and call done.
+//     // 4. Check the status after the computation finishes and call done.
 //     auto check_status = [context, done](const Status& status,
 //       const std::vector<HostLapackInfo>& /* unused */) {
 //           // In this example we don't care about the exact cause of
@@ -100,8 +99,8 @@ class HostLapackInfo;
 //           done();
 //     };
 //     OP_REQUIRES_OK_ASYNC(context,
-//                          solver.RegisterLapackInfoCheckerCallback(
-//                            dev_info, check_status);
+//                          solver.CopyLapackInfoToHostAsync(
+//                            dev_info, std::move(check_status));
 //                          done);
 //   }
 // };
-- 
GitLab


From 57a3696510677c54b494a9f04e75eca13ae69d70 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 14:59:32 -0700
Subject: [PATCH 1129/1563] Ignore trailing space in transform parameter
 string.

PiperOrigin-RevId: 155432297
---
 .../tools/graph_transforms/transform_graph.cc       |  5 +++++
 .../tools/graph_transforms/transform_graph_test.cc  | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/tensorflow/tools/graph_transforms/transform_graph.cc b/tensorflow/tools/graph_transforms/transform_graph.cc
index a1c4073fb9..b8bf2dc090 100644
--- a/tensorflow/tools/graph_transforms/transform_graph.cc
+++ b/tensorflow/tools/graph_transforms/transform_graph.cc
@@ -48,6 +48,11 @@ Status ParseTransformParameters(const string& transforms_string,
       func_parameters.clear();
       // Eat up any leading spaces.
       Scanner(remaining).AnySpace().GetResult(&remaining, &match);
+      if (remaining.empty()) {
+        // Nothing remains after consuming trailing spaces.
+        // Consumed all transform parameter string without errors.
+        return Status::OK();
+      }
       // See if we have a valid transform name.
       const bool found_transform_name =
           Scanner(remaining)
diff --git a/tensorflow/tools/graph_transforms/transform_graph_test.cc b/tensorflow/tools/graph_transforms/transform_graph_test.cc
index dd60b99854..bc2412fcbd 100644
--- a/tensorflow/tools/graph_transforms/transform_graph_test.cc
+++ b/tensorflow/tools/graph_transforms/transform_graph_test.cc
@@ -205,6 +205,19 @@ class TransformGraphTest : public ::testing::Test {
     EXPECT_EQ(0, params_list.size());
   }
 
+  void TestParseExtraSpaces() {
+    TransformParameters params_list;
+    ParseTransformParameters(" ", &params_list).IgnoreError();
+    EXPECT_EQ(0, params_list.size());
+
+    TF_EXPECT_OK(ParseTransformParameters("  foo bar \\\n", &params_list));
+    EXPECT_EQ(2, params_list.size());
+    EXPECT_EQ("foo", params_list[0].first);
+    EXPECT_TRUE(params_list[0].second.empty());
+    EXPECT_EQ("bar", params_list[1].first);
+    EXPECT_TRUE(params_list[1].second.empty());
+  }
+
   void TestShouldIgnoreErrors() {
     bool ignore_errors;
     TF_EXPECT_OK(
-- 
GitLab


From 4b476b8ead27e22b5b90adc103dc4e9ebd7ebce3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 15:02:59 -0700
Subject: [PATCH 1130/1563] Move tf-graph-controls into its own component.

Previously, 2 different components tf-graph-app and tf-graph-dashboard had been depending on tf-graph-controls.html, which resided in tf-graph. tf-graph-controls should be its own component because

1. The main tf-graph submodule didn't actually depend on it. Only outside components depended on it.
2. Components like tf-graph-app and tf-graph-dashboard should not really have to depend on HTML files within other components.

Also, removed the un-needed <html>, <head>, and <body> tags from the tf_graph_loader demo.

PiperOrigin-RevId: 155432856
---
 tensorflow/BUILD                              |   1 +
 .../components/tf_graph_app/tf-graph-app.html |   2 +-
 .../components/tf_graph_controls/BUILD        |  54 ++
 .../components/tf_graph_controls/demo/BUILD   |  24 +
 .../tf_graph_controls/demo/index.html         |  49 ++
 .../tf_graph_controls/tf-graph-controls.html  | 829 ++++++++++++++++++
 .../tf-graph-dashboard.html                   |   2 +-
 .../tf_graph_loader/demo/index.html           | 110 ++-
 8 files changed, 1011 insertions(+), 60 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index c02987ed8a..2ef3c7ae13 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -334,6 +334,7 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_globals:all_files",
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html b/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
index 07308d38e4..b349acd5b9 100644
--- a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
+++ b/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
@@ -18,7 +18,7 @@ limitations under the License.
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../tf-graph-board/tf-graph-board.html">
 <link rel="import" href="../tf-graph-loader/tf-graph-loader.html">
-<link rel="import" href="../tf-graph/tf-graph-controls.html">
+<link rel="import" href="../tf-graph-controls/tf-graph-controls.html">
 
 <!--
 Stand alone element of tf-graph for embedding.
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/BUILD b/tensorflow/tensorboard/components/tf_graph_controls/BUILD
new file mode 100644
index 0000000000..af042a98e3
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls/BUILD
@@ -0,0 +1,54 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_controls",
+    srcs = [
+        "tf-graph-controls.html",
+    ],
+    path = "/tf-graph-controls",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "@org_polymer",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_radio_group",
+        "@org_polymer_paper_toggle_button",
+        "@org_polymer_paper_tooltip",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-controls.html",
+    ],
+    destdir = "tf-graph-controls",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
new file mode 100644
index 0000000000..213f5e1ee3
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_controls/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-graph-controls/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_controls",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/demo/index.html b/tensorflow/tensorboard/components/tf_graph_controls/demo/index.html
new file mode 100644
index 0000000000..8b12641b28
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls/demo/index.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-controls.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Controls Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 700px;
+    position: relative;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-controls-demo">
+      <template>
+        <tf-graph-controls
+            id="controls"
+            color-by="structure"
+        ></tf-graph-controls>
+      </template>
+      <script>
+        Polymer({
+          is: "tf-graph-controls-demo",
+        });
+      </script>
+    </dom-module>
+    <div id="demo-container">
+      <tf-graph-controls-demo></tf-graph-controls-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html b/tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html
new file mode 100644
index 0000000000..10faf29bbc
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html
@@ -0,0 +1,829 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-menu/paper-menu.html">
+<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../paper-radio-group/paper-radio-group.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
+
+<dom-module id="tf-graph-controls">
+<template>
+<style>
+:host {
+  font-size: 12px;
+  color: gray;
+  --paper-font-subhead: {
+    font-size: 14px;
+    color: gray;
+  };
+  --paper-dropdown-menu-icon: {
+    width: 15px;
+    height: 15px;
+  };
+  --paper-dropdown-menu-button: {
+    padding: 0;
+  };
+  --paper-dropdown-menu-input: {
+    padding: 0;
+  };
+  --paper-item-min-height: 30px;
+}
+
+paper-button[raised].keyboard-focus {
+  font-weight: normal;
+}
+
+.run-dropdown {
+  --paper-input-container: {
+    padding: 9px 0 0 25px;
+  };
+}
+
+.color-dropdown {
+  --paper-input-container: {
+    padding: 9px 0 0 13px;
+  };
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+table td {
+  padding: 0;
+  margin: 0;
+}
+
+.allcontrols {
+  width: 188px;
+  padding: 0 30px;
+}
+
+.legend-holder {
+  position: absolute;
+  bottom: 0;
+  padding-bottom: 10px;
+}
+
+paper-radio-button {
+  display: block;
+  padding: 5px;
+}
+svg.icon {
+  width: 60px;
+  height: 18px;
+}
+.icon ellipse {
+  rx: 10px;
+  ry: 5px;
+  stroke: #CCC;
+  stroke-width: 1px;
+  fill: #FFFFFF;
+  cy: 10px;
+}
+.icon rect {
+  height: 14px;
+  width: 35px;
+  rx: 5px;
+  ry: 5px;
+  stroke: #CCC;
+  stroke-width: 2px;
+  fill: #D9D9D9;
+}
+.domainValues {
+  margin-bottom: 10px;
+  width: 165px;
+}
+.domainStart {
+  float: left;
+}
+.domainEnd {
+  float: right;
+}
+.colorBox {
+  width: 20px;
+}
+
+.image-icon {
+  width: 24px;
+  height: 24px;
+}
+
+.help-icon {
+  height: 15px;
+  margin: 0;
+  padding: 0;
+}
+
+.gray {
+  color: #666;
+}
+
+.title {
+  font-size: 16px;
+  margin: 8px 5px 8px 0;
+  color: black;
+}
+.title small {
+  font-weight: normal;
+}
+.deviceList, .xlaClusterList {
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+#file {
+  padding: 8px 0;
+}
+
+.color-legend-row {
+  clear: both;
+  height: 20px;
+  margin-top: 5px;
+  position: relative;
+}
+
+.color-legend-row svg {
+  position: absolute;
+  top: -1px;
+  width: 40px;
+}
+
+.color-legend-row span.color-legend-value {
+  margin-left: 60px;
+}
+
+#grey-rect {
+  fill: #eee;
+  stroke: #a6a6a6;
+}
+
+#faded-rect {
+  fill: url(#rectHatch);
+  stroke: var(--tb-graph-faded);
+}
+
+.button-text {
+  text-transform: none;
+  padding: 8px 18px 0 18px;
+  font-size: 14px
+}
+
+.upload-button {
+  width: 165px;
+  height: 25px;
+  text-transform: none;
+  margin-top: 4px;
+}
+
+.iconbutton {
+  padding: 2px;
+  width: 30px;
+  height: 30px;
+  color: var(--paper-orange-500);
+}
+
+.hidden-input {
+  height: 0px;
+  width: 0px;
+  overflow:hidden;
+}
+
+.allcontrols .control-holder {
+  display: flex;
+  clear: both;
+}
+
+.allcontrols .control-holder paper-radio-group {
+  margin-top: 5px;
+}
+
+span.counter {
+  font-size: 13px;
+  color: gray;
+}
+
+.runs paper-item {
+  --paper-item: {
+    white-space: nowrap;
+  }
+}
+
+table.control-holder {
+  border: 0;
+  border-collapse: collapse;
+}
+
+table.tf-graph-controls td.input-element-table-data {
+  padding: 0 0 0 20px;
+}
+
+/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
+/*  tooltips do not appear. */
+#color-by-radio-group paper-radio-button {
+  pointer-events: auto !important;
+}
+</style>
+<svg width="0" height="0">
+  <defs>
+    <g id="legend-rect">
+      <rect x="1" y="1" stroke-width="2px" height="14" width="35" rx="5" ry="5"></rect>
+    </g>
+    <g id="grey-rect">
+       <use xmlns:xlink="http://www.w3.org/1999/xlink"
+            xlink:href="#legend-rect"/>
+     </g>
+     <g id="faded-rect">
+       <use xmlns:xlink="http://www.w3.org/1999/xlink"
+            xlink:href="#legend-rect"/>
+     </g>
+  </defs>
+</svg>
+<div class="allcontrols">
+  <div class="control-holder">
+    <paper-icon-button icon="aspect-ratio" class="iconbutton" on-click="fit" alt="Fit to screen">
+    </paper-icon-button>
+    <paper-button class="button-text" on-click="fit">Fit to screen
+    </paper-button>
+  </div>
+  <div class="control-holder">
+    <paper-icon-button icon="file-download" class="iconbutton" on-click="download" alt="Download PNG">
+    </paper-icon-button>
+    <paper-button class="button-text" on-click="download">Download PNG
+    </paper-button>
+    <a href="#" id="graphdownload" class="title" download="graph.png">
+    </a>
+  </div>
+  <div class="control-holder runs">
+    <div class="title">Run <span class="counter">([[datasets.length]])</span></div>
+    <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
+      <paper-menu id="select" class="dropdown-content" selected="{{selectedDataset}}">
+        <template is="dom-repeat" items="[[datasets]]">
+          <paper-item>[[item.name]]</paper-item>
+        </template>
+      </paper-menu>
+    </paper-dropdown-menu>
+  </div>
+  <template is="dom-if" if="[[showSessionRunsDropdown]]">
+    <div class="control-holder">
+      <div class="title">Session runs <span class="counter">([[_numSessionRuns(metadataTags)]])</span></div>
+      <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
+        <paper-menu id="select" class="dropdown-content" selected="{{selectedMetadataTag}}">
+          <template is="dom-repeat" items="[[metadataTags]]">
+            <paper-item>[[item.tag]]</paper-item>
+          </template>
+          <paper-item>None</paper-item>
+        </paper-menu>
+      </paper-dropdown-menu>
+    </div>
+  </template>
+  <template is="dom-if" if="[[showUploadButton]]">
+    <div class="control-holder">
+      <div class="title">Upload</div>
+      <paper-button raised class="text-button upload-button"
+          on-click="_getFile">Choose File</paper-button>
+      <div class="hidden-input">
+        <input type="file" id="file" name="file" on-change="_updateFileInput" />
+      </div>
+    </div>
+  </template>
+  <table class="control-holder">
+    <tr>
+      <td class="title">Trace inputs</td>
+      <td class="input-element-table-data">
+        <paper-toggle-button id="trace-inputs"></paper-toggle-button>
+      </td>
+    </tr>
+    <template is="dom-if" if="[[healthPillsFeatureEnabled]]">
+      <tr>
+        <td class="title">Show health pills</td>
+        <td class="input-element-table-data">
+          <paper-toggle-button checked="{{healthPillsToggledOn}}"></paper-toggle-button>
+        </td>
+      </tr>
+    </template>
+  </table>
+  <div class="control-holder">
+    <div class="title">Color</div>
+    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
+      <paper-radio-button name="structure">Structure</paper-radio-button>
+
+      <paper-radio-button name="device">Device</paper-radio-button>
+
+      <paper-radio-button id="xla-cluster-radio-button"
+                          name="xla_cluster"
+                          disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
+        XLA Cluster
+      </paper-radio-button>
+      <paper-tooltip for="xla-cluster-radio-button" position="right">
+        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
+      </paper-tooltip>
+
+      <paper-radio-button id="compute-time-radio-button"
+                          name="compute_time"
+                          disabled="[[!stats]]">
+        Compute time
+      </paper-radio-button>
+      <paper-tooltip for="compute-time-radio-button" position="right">
+        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
+
+      <paper-radio-button id="memory-radio-button"
+                          name="memory"
+                          disabled="[[!stats]]">
+        Memory
+      </paper-radio-button>
+      <paper-tooltip for="memory-radio-button" position="right">
+        Coloring by memory is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
+    </paper-radio-group>
+  </div>
+  <div>
+    <template is="dom-if" if="[[_isGradientColoring(stats, colorBy)]]">
+      <svg width="140" height="20" style="margin: 0 5px" class="color-text">
+        <defs>
+          <linearGradient id="linearGradient" x1="0%" y1="0%" x2="100%" y2="0%">
+            <stop class="start" offset="0%"
+                stop-color$="[[_currentGradientParams.startColor]]"/>
+            <stop class="end" offset="100%"
+                stop-color$="[[_currentGradientParams.endColor]]"/>
+          </linearGradient>
+        </defs>
+        <rect x="0" y="0" width="135" height="20" fill="url(#linearGradient)"
+            stroke="black" />
+      </svg>
+      <div class="domainValues color-text">
+        <div class="domainStart">[[_currentGradientParams.minValue]]</div>
+        <div class="domainEnd">[[_currentGradientParams.maxValue]]</div>
+      </div>
+      <br style="clear: both">
+      <div>Devices included in stats:</div>
+      <div class="deviceList">
+        <table>
+        <template is="dom-repeat" items="[[_getDevices(devicesForStats)]]">
+          <tr>
+            <td>
+              <input type="checkbox" value$="[[item.device]]" checked$="[[item.used]]" on-click="_deviceCheckboxClicked"/>
+            </td>
+            <td>
+              <div>
+                <span>[[item.suffix]]</span>
+                <template is="dom-if" if="[[item.ignoredMsg]]">
+                  <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+                  <paper-tooltip position="right" animation-delay="0">[[item.ignoredMsg]]</paper-tooltip>
+                </template>
+              </div>
+            </td>
+          </tr>
+        </template>
+        </table>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'structure')]]">
+      <div class="color-text">
+        <div class="color-legend-row">
+          <div style="position: absolute;">
+            colors
+          </div>
+          <span class="color-legend-value">same substructure</span>
+        </div>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                 xlink:href="#grey-rect" x="0" y="0"/>
+          </svg>
+          <span class="color-legend-value">unique substructure</span>
+        </div>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'device')]]">
+      <div class="color-text">
+        <div class="deviceList">
+          <table>
+          <template is="dom-repeat" items="[[colorByParams.device]]">
+            <tr>
+              <td style$="[[_getBackgroundColor(item.color)]]">
+                <div class="colorBox"></div>
+              </td>
+              <td>
+                <div>[[item.device]]</div>
+              </td>
+            </tr>
+          </template>
+          </table>
+        </div>
+        <br/>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                 xlink:href="#grey-rect" x="0" y="0"/>
+          </svg>
+          <span class="color-legend-value">unknown device</span>
+        </div>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
+      <div class="color-text">
+        <div class="xlaClusterList">
+          <table>
+          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
+            <tr>
+              <td style$="[[_getBackgroundColor(item.color)]]">
+                <div class="colorBox"></div>
+              </td>
+              <td>
+                <div>[[item.xla_cluster]]</div>
+              </td>
+            </tr>
+          </template>
+          </table>
+        </div>
+        <br/>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                 xlink:href="#grey-rect" x="0" y="0"/>
+          </svg>
+          <span class="color-legend-value">unknown XLA cluster</span>
+        </div>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_statsNotNull(stats)]]">
+      <div class="color-legend-row">
+        <svg>
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                xlink:href="#faded-rect" x="0" y="0"/>
+        </svg>
+        <span class="color-legend-value">unused substructure</span>
+      </div>
+    </template>
+  </div>
+  <!--
+    Due to limited vertical space on the left sidebar, hide the legend whenever
+    we show a list of devices to include in stats.
+  -->
+  <template is="dom-if" if="[[!_isGradientColoring(stats, colorBy)]]">
+    <div class="legend-holder">
+      <table>
+        <tr>
+          <td><div class="title">Graph</div></td>
+          <td>(* = expandable)</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon">
+              <rect transform="translate(3, 1)" height="14" width="35"
+                  rx="5" ry="5"/>
+            </svg>
+          </td>
+          <td>Namespace<span class="gray">*</span></td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" preserveAspectRatio="xMinYMid meet"
+                viewBox="0 0 10 10">
+              <use xlink:href="#op-node-stamp" fill="white" stroke="#ccc" x="9.5"
+                y="6" />
+            </svg>
+          </td>
+          <td>OpNode</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet"
+                viewBox="0 0 12 12">
+              <use xlink:href="#op-series-horizontal-stamp" fill="white"
+                  stroke="#ccc" x="2" y="2"/>
+            </svg>
+          </td>
+          <td>Unconnected series<span class="gray">*</span></td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <use xlink:href="#op-series-vertical-stamp"
+                  fill="white" stroke="#ccc" x="2" y="2"/>
+            </svg>
+          </td>
+          <td>Connected series<span class="gray">*</span></td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon">
+              <circle fill="white" stroke="#848484" cx="10" cy="10" r="5"/>
+            </svg>
+          </td>
+          <td>Constant</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="image-icon" viewBox="0 0 12 12" width="24" height="24">
+              <use x="0" y="0" class="image-icon" xlink:href="#summary-icon"/>
+            </svg>
+          </td>
+          <td>Summary</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <defs>
+                <marker id="ref-arrowhead-legend" fill="#bbb" markerWidth="10"
+                    markerHeight="10" refX="1" refY="5" orient="auto">
+                  <path d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"/>
+                </marker>
+              </defs>
+              <path stroke="#bbb"
+                  d="M2 9 l 23 0" stroke-linecap="round" />
+            </svg>
+          </td>
+          <td>Dataflow edge</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <path stroke="#bbb"
+                d="M2 9 l 23 0" stroke-linecap="round" stroke-dasharray="2, 2" />
+            </svg>
+          </td>
+          <td>Control dependency edge</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <path marker-start="url(#ref-arrowhead-legend)"
+                stroke="#bbb" d="M2 9 l 23 0"
+                stroke-linecap="round" />
+            </svg>
+          </td>
+          <td>Reference edge</td>
+        </tr>
+      </table>
+    </div>
+  </template>
+  </div>
+</template>
+</dom-module>
+
+<script>
+(function() { // Private scope.
+/**
+ * Stats from device names that match these regexes will be excluded by default.
+ * The user can still turn on a device by selecting the checkbox in the device list.
+ * See b/29089982 for context.
+ */
+var DEVICE_NAMES_EXCLUDE = [
+  {
+    regex: /gpu:[0-9]+$/,
+    msg: 'Excluded by default since this is a CPU thread setting up GPU kernels.'
+  }
+];
+
+Polymer({
+  is: 'tf-graph-controls',
+  properties: {
+    // Public API.
+    stats: {
+      value: null,
+      type: Object,
+      observer: '_statsChanged'
+    },
+    devicesForStats: {
+      value: null,
+      type: Object,
+      notify: true,
+      readonly: true,
+    },
+    colorBy: {
+      type: String,
+      value: 'structure',
+      notify: true,
+      readonly: true
+    },
+    colorByParams: Object,
+    datasets: {
+      type: Array,
+      observer: '_datasetsChanged'
+    },
+    renderHierarchy: {
+      type: Object,
+      notify: true,
+    },
+    metadataTags: {
+      type: Array,
+      computed: '_getMetadataTags(selectedDataset, datasets)'
+    },
+    selectedDataset: {
+      type: Number,
+      notify: true,
+      value: 0,
+      observer: '_selectedDatasetChanged'
+    },
+    selectedFile: {
+      type: Object,
+      notify: true
+    },
+    selectedMetadataTag: {
+      type: Number,
+      notify: true,
+      value: -1
+    },
+    _currentGradientParams: {
+      type: Object,
+      computed: '_getCurrentGradientParams(colorByParams, colorBy)'
+    },
+    showSessionRunsDropdown: {
+      type: Boolean,
+      value: true
+    },
+    showUploadButton: {
+      type: Boolean,
+      value: true
+    },
+    // This stores whether the feature for showing health pills is enabled in the first place.
+    healthPillsFeatureEnabled: Boolean,
+    // This stores whether to show health pills. Only relevant if healthPillsFeatureEnabled. The
+    // user can toggle this value.
+    healthPillsToggledOn: {
+      type: Boolean,
+      notify: true,
+    },
+  },
+  listeners: {
+    'trace-inputs.change': '_traceInputToggleChanged'
+  },
+  _traceInputToggleChanged: function(event) {
+    // Flip the state of the trace inputs flag.
+    this.renderHierarchy.traceInputs = event.target.active;
+    tf.graph.scene.node.traceInputs(this.renderHierarchy);
+  },
+  _xlaClustersProvided: function(renderHierarchy) {
+    return renderHierarchy &&
+        renderHierarchy.hierarchy &&
+        renderHierarchy.hierarchy.xlaClusters.length > 0;
+  },
+  _statsChanged: function(stats) {
+    if (stats == null) {
+      return;
+    }
+    var devicesForStats = {};
+    var devices = _.each(stats.dev_stats, function(d) {
+      // Avoid device names that are ignored by default.
+      var exclude = _.some(DEVICE_NAMES_EXCLUDE, function(rule) {
+        return rule.regex.test(d.device);
+      });
+      if (!exclude) {
+        devicesForStats[d.device] = true;
+      }
+    });
+    this.set('devicesForStats', devicesForStats);
+  },
+  _getDevices: function(devicesForStats) {
+    var devices = _.map(this.stats.dev_stats, function(d) {
+      return d.device;
+    });
+    // Devices names can be long so we remove the longest common prefix
+    // before showing the devices in a list.
+    var suffixes = tf.graph.util.removeCommonPrefix(devices);
+    return _.map(devices, function(device, i) {
+      var ignoredMsg = null;
+      _.each(DEVICE_NAMES_EXCLUDE, function(rule) {
+        if (rule.regex.test(device)) {
+          ignoredMsg = rule.msg;
+        }
+      });
+      return {
+        device: device,
+        suffix: suffixes[i],
+        used: devicesForStats[device],
+        ignoredMsg: ignoredMsg
+      };
+    });
+  },
+  _deviceCheckboxClicked: function(checkbox) {
+    // Update the device map.
+    var devicesForStats = _.extend({}, this.devicesForStats);
+    var device = checkbox.target.value;
+    if (checkbox.target.checked) {
+      devicesForStats[device] = true;
+    } else {
+      delete devicesForStats[device];
+    }
+    this.set('devicesForStats', devicesForStats);
+  },
+  _numSessionRuns: function(metadataTags) {
+    return metadataTags != null ? metadataTags.length : 0;
+  },
+  _getBackgroundColor: function(color) {
+    return 'background-color:' + color;
+  },
+  fit: function() {
+    document.querySelector('#scene').fit();
+  },
+  _isGradientColoring: function(stats, colorBy) {
+    return ["compute_time", "memory"].indexOf(colorBy) !== -1
+        && stats != null;
+  },
+  _equals: function(a, b) {
+    return a === b;
+  },
+  _getCurrentGradientParams: function(colorByParams, colorBy) {
+    if (!this._isGradientColoring(this.stats, colorBy)) {
+      return;
+    }
+    var params = colorByParams[colorBy];
+    var minValue = params.minValue;
+    var maxValue = params.maxValue;
+    if (colorBy === 'memory') {
+      minValue = tf.graph.util.convertUnitsToHumanReadable(
+          minValue, tf.graph.util.MEMORY_UNITS);
+      maxValue = tf.graph.util.convertUnitsToHumanReadable(
+          maxValue, tf.graph.util.MEMORY_UNITS);
+    } else if (colorBy === 'compute_time') {
+      minValue = tf.graph.util.convertUnitsToHumanReadable(
+          minValue, tf.graph.util.TIME_UNITS);
+      maxValue = tf.graph.util.convertUnitsToHumanReadable(
+          maxValue, tf.graph.util.TIME_UNITS);
+    }
+    return {
+      minValue: minValue,
+      maxValue: maxValue,
+      startColor: params.startColor,
+      endColor: params.endColor
+    };
+  },
+  download: function() {
+    this.$.graphdownload.click();
+  },
+  _updateFileInput: function(e) {
+    var file = e.target.files[0];
+    if (!file) {
+      return;
+    }
+    this._setDownloadFilename(file.name);
+    this.set('selectedFile', e);
+  },
+  _datasetsChanged: function(newDatasets, oldDatasets) {
+    if (oldDatasets != null || this.selected == null) {
+      // Select the first dataset by default.
+      this.set('selectedDataset', 0);
+      this._setDownloadFilename(this.datasets[this.selectedDataset].path);
+    }
+  },
+  _getMetadataTags: function(selectedDataset, datasets) {
+    return this.datasets[selectedDataset].runMetadata;
+  },
+  _selectedDatasetChanged: function(newDataset, oldDataset) {
+    if (this.datasets) {
+      this.set('selectedMetadataTag', -1);
+      this.set('colorBy', 'structure');
+      this.$['trace-inputs'].active = false; // Set trace input to off-state.
+      this._setDownloadFilename(this.datasets[newDataset].path);
+    }
+  },
+  _getFile: function() {
+    this.$$("#file").click();
+  },
+  _setDownloadFilename: function(graphPath) {
+    // Strip off everything before the last "/" and strip off the file
+    // extension in order to get the name of the PNG for the graph.
+    var dotIndex = graphPath.lastIndexOf('.');
+    if (dotIndex) {
+      graphPath = graphPath.substring(0, dotIndex);
+    }
+    var slashIndex = graphPath.lastIndexOf('/');
+    if (slashIndex) {
+      graphPath = graphPath.substring(slashIndex + 1);
+    }
+    this.$.graphdownload.setAttribute('download', graphPath + '.png');
+  },
+  _statsNotNull: function(stats) {
+    return stats !== null;
+  },
+});
+})(); // Closing private scope.
+</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
index d2b069f320..bfc52a0a44 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
@@ -18,7 +18,7 @@ limitations under the License.
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../tf-graph-loader/tf-graph-loader.html">
 <link rel="import" href="../tf-graph-board/tf-graph-board.html">
-<link rel="import" href="../tf-graph/tf-graph-controls.html">
+<link rel="import" href="../tf-graph-controls/tf-graph-controls.html">
 <link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
 <link rel="import" href="../tf-backend/tf-backend.html">
 
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html b/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
index a75cf42e35..5da31d72eb 100644
--- a/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
+++ b/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
@@ -15,64 +15,58 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
-<html>
-  <head>
-    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="import" href="../tf-graph-loader.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <title>TF Graph Loader Demo</title>
-  </head>
-  <body>
-    <demo-snippet>
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Loader Demo</title>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-loader-demo">
       <template>
-        <dom-module id="tf-graph-loader-demo">
-          <template>
-             <tf-graph-loader id="loader"
-                datasets="[[_datasets]]"
-                selected-dataset="[[_selectedDataset]]"
-                progress="{{_progress}}"></tf-graph-loader>
-          </template>
-          <script>
-            Polymer({
-              is: "tf-graph-loader-demo",
-              properties: {
-                // We tell the graph loader to load a specific pbtxt file.
-                _datasets: {
-                  type: Array,
-                  value: [{
-                    "name": "Graph with XLA Clusters Specified",
-                    "path": "data/graph.pbtxt"
-                  }],
-                },
-                _selectedDataset: {
-                  type: Number,
-                  value: 0,
-                },
+         <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            progress="{{_progress}}"></tf-graph-loader>
+      </template>
+      <script>
+        Polymer({
+          is: "tf-graph-loader-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
 
-                // This property will be updated by the graph loader.
-                _progress: {
-                  type: Object,
-                },
-              },
-              observers: [
-                '_progressUpdated(_progress)',
-              ],
-              _progressUpdated(progress) {
-                // console.log the progress.
-                console.log('Progress updated.', progress);
+            // This property will be updated by the graph loader.
+            _progress: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_progressUpdated(_progress)',
+          ],
+          _progressUpdated(progress) {
+            // console.log the progress.
+            console.log('Progress updated.', progress);
 
-                // The graph has loaded. console.log it.
-                if (progress.value == 100) {
-                  console.log('graph', this.$.loader.outGraph);
-                }
-              },
-            });
-          </script>
-        </dom-module>
-        <!-- The graph loader lacks visual elements. -->
-        <tf-graph-loader-demo></tf-graph-loader-demo>
-      </template>
-    </demo-snippet>
-  </body>
-</html>
+            // The graph has loaded. console.log it.
+            if (progress.value == 100) {
+              console.log('graph', this.$.loader.outGraph);
+            }
+          },
+        });
+      </script>
+    </dom-module>
+    <!-- The graph loader lacks visual elements. -->
+    <tf-graph-loader-demo></tf-graph-loader-demo>
+  </template>
+</demo-snippet>
-- 
GitLab


From 960ea0d1633d612d2f8c2f61b4f573f25ce548a3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 15:09:16 -0700
Subject: [PATCH 1131/1563] [XLA] Use a templated Visitor for typed evaluation,
 instead of switching on opcode twice.

PiperOrigin-RevId: 155433842
---
 .../compiler/xla/service/hlo_evaluator.cc     | 822 ++++++++++--------
 .../compiler/xla/service/hlo_evaluator.h      |  64 +-
 2 files changed, 508 insertions(+), 378 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
index 1b3babc214..e0447d69aa 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -46,138 +46,485 @@ limitations under the License.
 
 namespace xla {
 
-namespace {
-
-template <typename NativeT>
-std::unique_ptr<Literal> ElementWiseUnaryOp(
-    const Shape& shape, std::function<NativeT(NativeT)>&& unary_op,
-    const Literal& operand) {
-  DCHECK(ShapeUtil::SameDimensions(shape, operand.shape()));
-
-  auto result = LiteralUtil::CreateFromShape(shape);
-
-  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-  do {
-    LiteralUtil::Set<NativeT>(
-        result.get(), multi_index,
-        unary_op(LiteralUtil::Get<NativeT>(operand, multi_index)));
-  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-  return result;
-}
-
-template <typename NativeT>
-std::unique_ptr<Literal> ElementWiseBinaryOp(
-    const Shape& shape, std::function<NativeT(NativeT, NativeT)>&& binary_op,
-    const Literal& lhs, const Literal& rhs) {
-  DCHECK(ShapeUtil::SameDimensions(shape, rhs.shape()));
-  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
-
-  auto result = LiteralUtil::CreateFromShape(shape);
-
-  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-  do {
-    LiteralUtil::Set<NativeT>(
-        result.get(), multi_index,
-        binary_op(LiteralUtil::Get<NativeT>(lhs, multi_index),
-                  LiteralUtil::Get<NativeT>(rhs, multi_index)));
-  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-  return result;
-}
-
-template <typename NativeT, typename LhsType, typename RhsType,
-          typename EhsType>
-std::unique_ptr<Literal> ElementWiseTernaryOp(
-    const Shape& shape,
-    std::function<NativeT(LhsType lhs, RhsType rhs, EhsType ehs)>&& ternary_op,
-    const Literal& lhs, const Literal& rhs, const Literal& ehs) {
-  DCHECK(ShapeUtil::SameDimensions(shape, lhs.shape()));
-  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
-  DCHECK(ShapeUtil::SameDimensions(rhs.shape(), ehs.shape()));
-
-  auto result = LiteralUtil::CreateFromShape(shape);
-
-  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-  do {
-    LiteralUtil::Set<NativeT>(
-        result.get(), multi_index,
-        ternary_op(LiteralUtil::Get<LhsType>(lhs, multi_index),
-                   LiteralUtil::Get<RhsType>(rhs, multi_index),
-                   LiteralUtil::Get<EhsType>(ehs, multi_index)));
-  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-  return result;
-}
-
-// Templated abs so that unsigned types can be passed in without warning.
-template <
-    typename NativeT,
-    typename std::enable_if<std::is_unsigned<NativeT>::value>::type* = nullptr>
-NativeT AbsoluteVal(NativeT value) {
-  return value;
-}
-
-template <
-    typename NativeT,
-    typename std::enable_if<std::is_signed<NativeT>::value>::type* = nullptr>
-NativeT AbsoluteVal(NativeT value) {
-  return std::abs(value);
-}
-
-}  // namespace
-
-Status HloEvaluator::DefaultAction(HloInstruction* hlo) {
-  VLOG(2) << "Handle instruction: " << hlo->ToString();
-  Shape shape = hlo->shape();
-  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+template <typename ReturnT>
+class HloEvaluator::TypedVisitor : public DfsHloVisitorWithDefault {
+ public:
+  explicit TypedVisitor(HloEvaluator* p) : parent_(p) {}
+
+  Status DefaultAction(HloInstruction* hlo_instruction) override {
+    return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
+                         HloOpcodeString(hlo_instruction->opcode()).c_str());
+  };
+
+  // TODO(b/35950897): many of the stl functions used in the handlers are not
+  // overloaded for every XLA primitive types.
+
+  template <typename NativeT,
+            typename std::enable_if<std::is_unsigned<NativeT>::value>::type* =
+                nullptr>
+  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[abs],
+                        ElementWiseUnaryOp(abs, [](NativeT elem_operand) {
+                          return elem_operand;
+                        }));
+    return Status::OK();
+  };
+
+  template <
+      typename NativeT,
+      typename std::enable_if<std::is_signed<NativeT>::value>::type* = nullptr>
+  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[abs],
+                        ElementWiseUnaryOp(abs, [](NativeT elem_operand) {
+                          return std::abs(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) override {
+    return HandleAbs<ReturnT>(abs, operand);
+  };
+
+  Status HandleCeil(HloInstruction* ceil, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[ceil],
+                        ElementWiseUnaryOp(ceil, [](ReturnT elem_operand) {
+                          return std::ceil(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleCopy(HloInstruction* copy, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[copy],
+                        ElementWiseUnaryOp(copy, [](ReturnT elem_operand) {
+                          return elem_operand;
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleExp(HloInstruction* exp, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[exp],
+                        ElementWiseUnaryOp(exp, [](ReturnT elem_operand) {
+                          return std::exp(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleFloor(HloInstruction* floor, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[floor],
+                        ElementWiseUnaryOp(floor, [](ReturnT elem_operand) {
+                          return std::floor(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleIsFinite(HloInstruction* is_finite,
+                        HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[is_finite],
+                        ElementWiseUnaryOp(is_finite, [](ReturnT elem_operand) {
+                          return std::isfinite(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleLog(HloInstruction* log, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[log],
+                        ElementWiseUnaryOp(log, [](ReturnT elem_operand) {
+                          return std::log(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleLogicalNot(HloInstruction* logical_not,
+                          HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[logical_not],
+        ElementWiseUnaryOp(logical_not,
+                           [](ReturnT elem_operand) { return !elem_operand; }));
+    return Status::OK();
+  };
+
+  Status HandleNegate(HloInstruction* negate,
+                      HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[negate],
+                        ElementWiseUnaryOp(negate, [](ReturnT elem_operand) {
+                          return -elem_operand;
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleSign(HloInstruction* sign, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[sign],
+                        ElementWiseUnaryOp(sign, [](ReturnT elem_operand) {
+                          return (ReturnT(0) < elem_operand) -
+                                 (elem_operand < ReturnT(0));
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleTanh(HloInstruction* tanh, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[tanh],
+                        ElementWiseUnaryOp(tanh, [](ReturnT elem_operand) {
+                          return std::tanh(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleMultiply(HloInstruction* multiply, HloInstruction* lhs,
+                        HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[multiply],
+        ElementWiseBinaryOp(multiply, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem * rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleSubtract(HloInstruction* subtract, HloInstruction* lhs,
+                        HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[subtract],
+        ElementWiseBinaryOp(subtract, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem - rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleAdd(HloInstruction* add, HloInstruction* lhs,
+                   HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[add],
+        ElementWiseBinaryOp(add, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem + rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleDivide(HloInstruction* divide, HloInstruction* lhs,
+                      HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[divide],
+        ElementWiseBinaryOp(divide, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem / rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleCompare(HloInstruction* compare, HloOpcode opcode,
+                       HloInstruction* lhs, HloInstruction* rhs) override {
+    std::function<bool(ReturnT, ReturnT)> compare_op;
+    switch (opcode) {
+      case HloOpcode::kEq:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el == rhs_el;
+        };
+        break;
+      case HloOpcode::kNe:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el != rhs_el;
+        };
+        break;
+      case HloOpcode::kGe:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el >= rhs_el;
+        };
+        break;
+      case HloOpcode::kGt:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el > rhs_el;
+        };
+        break;
+      case HloOpcode::kLe:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el <= rhs_el;
+        };
+        break;
+      case HloOpcode::kLt:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el < rhs_el;
+        };
+        break;
+      default:
+        LOG(FATAL) << "unhandled HLO opcode for conversion to Comparison: "
+                   << HloOpcodeString(opcode);
+    }
 
-  TF_ASSIGN_OR_RETURN(evaluated_[hlo], EvaluateBasedOnType(hlo));
-  return Status::OK();
-}
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!(ShapeUtil::SameDimensions(compare->shape(), rhs->shape()) &&
+          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()))) {
+      return Unimplemented(
+          "Compare operation with mismatched dimensions, likely due to "
+          "broadcasting is unsupported.");
+    }
 
-Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
-  VLOG(2) << "HandleParameter: " << parameter->ToString();
-  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
-  VLOG(2) << "Parameter evaluated to: "
-          << LiteralUtil::ToString(*input_literal);
-  CHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
+    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
+    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
+
+    auto result = LiteralUtil::CreateFromShape(compare->shape());
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<bool>(
+          result.get(), multi_index,
+          compare_op(LiteralUtil::Get<ReturnT>(lhs_literal, multi_index),
+                     LiteralUtil::Get<ReturnT>(rhs_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    parent_->evaluated_[compare] = std::move(result);
+
+    return Status::OK();
+  };
+
+  Status HandleMaximum(HloInstruction* maximum, HloInstruction* lhs,
+                       HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[maximum],
+        ElementWiseBinaryOp(maximum, [](ReturnT lhs, ReturnT rhs) {
+          return std::max(lhs, rhs);
+        }));
+    return Status::OK();
+  };
+
+  Status HandleMinimum(HloInstruction* minimum, HloInstruction* lhs,
+                       HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[minimum],
+        ElementWiseBinaryOp(minimum, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return std::min(lhs_el, rhs_el);
+        }));
+    return Status::OK();
+  };
+
+  Status HandlePower(HloInstruction* power, HloInstruction* lhs,
+                     HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[power],
+        ElementWiseBinaryOp(power, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return std::pow(lhs_el, rhs_el);
+        }));
+    return Status::OK();
+  };
+
+  Status HandleRemainder(HloInstruction* remainder, HloInstruction* lhs,
+                         HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[remainder],
+        ElementWiseBinaryOp(remainder, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return std::remainder(lhs_el, rhs_el);
+        }));
+    return Status::OK();
+  };
+
+  Status HandleLogicalAnd(HloInstruction* logical_and, HloInstruction* lhs,
+                          HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[logical_and],
+        ElementWiseBinaryOp(logical_and, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el && rhs_el;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleLogicalOr(HloInstruction* logical_or, HloInstruction* lhs,
+                         HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[logical_or],
+        ElementWiseBinaryOp(logical_or, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el || rhs_el;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleClamp(HloInstruction* clamp, HloInstruction* min,
+                     HloInstruction* arg, HloInstruction* max) override {
+    std::function<ReturnT(ReturnT, ReturnT, ReturnT)> clamp_op =
+        [](ReturnT low, ReturnT high, ReturnT value) {
+          return std::max(low, std::min(value, high));
+        };
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[clamp],
+                        ElementWiseTernaryOp(clamp, std::move(clamp_op)));
+    return Status::OK();
+  };
+
+  Status HandleSelect(HloInstruction* select, HloInstruction* pred,
+                      HloInstruction* on_true,
+                      HloInstruction* on_false) override {
+    CHECK(!ShapeUtil::IsTuple(select->shape()));
+    std::function<ReturnT(bool, ReturnT, ReturnT)> select_op =
+        [](bool pred, ReturnT on_true, ReturnT on_false) {
+          if (pred) {
+            return on_true;
+          }
+          return on_false;
+        };
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[select],
+                        ElementWiseTernaryOp(select, std::move(select_op)));
+    return Status::OK();
+  };
+
+  Status Preprocess(HloInstruction* hlo) override {
+    VLOG(2) << hlo->ToString();
+    return Status::OK();
+  };
+
+ private:
+  StatusOr<std::unique_ptr<Literal>> ElementWiseUnaryOp(
+      HloInstruction* instruction,
+      const std::function<ReturnT(ReturnT)>& unary_op) {
+    const auto shape = instruction->shape();
+    const auto* operand = instruction->operand(0);
+
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!ShapeUtil::SameDimensions(shape, operand->shape())) {
+      return Unimplemented(
+          "Implicit broadcasting is currently unsupported in HLO evaluator "
+          "Shape Mismatch: %s vs %s",
+          ShapeUtil::HumanString(shape).c_str(),
+          ShapeUtil::HumanString(operand->shape()).c_str());
+    }
 
-  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
-  return Status::OK();
-}
+    const Literal& operand_literal = parent_->GetEvaluatedLiteralFor(operand);
+
+    auto result = LiteralUtil::CreateFromShape(shape);
+
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<ReturnT>(
+          result.get(), multi_index,
+          unary_op(LiteralUtil::Get<ReturnT>(operand_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    return std::move(result);
+  };
+
+  StatusOr<std::unique_ptr<Literal>> ElementWiseBinaryOp(
+      HloInstruction* instruction,
+      const std::function<ReturnT(ReturnT, ReturnT)>& binary_op) {
+    const auto shape = instruction->shape();
+    const auto* lhs = instruction->operand(0);
+    const auto* rhs = instruction->operand(1);
+
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!(ShapeUtil::SameDimensions(shape, rhs->shape()) &&
+          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()))) {
+      return Unimplemented(
+          "Implicit broadcasting is currently unsupported in HLO evaluator "
+          "Shape Mismatch: %s vs %s vs %s: ",
+          ShapeUtil::HumanString(shape).c_str(),
+          ShapeUtil::HumanString(lhs->shape()).c_str(),
+          ShapeUtil::HumanString(rhs->shape()).c_str());
+    }
 
-Status HloEvaluator::HandleConstant(HloInstruction* constant,
-                                    const Literal& literal) {
-  VLOG(2) << "HandleConstant: " << constant->ToString();
-  CHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
+    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
+    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
+
+    auto result = LiteralUtil::CreateFromShape(shape);
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<ReturnT>(
+          result.get(), multi_index,
+          binary_op(LiteralUtil::Get<ReturnT>(lhs_literal, multi_index),
+                    LiteralUtil::Get<ReturnT>(rhs_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    return std::move(result);
+  };
+
+  template <typename LhsType, typename RhsType, typename EhsType>
+  StatusOr<std::unique_ptr<Literal>> ElementWiseTernaryOp(
+      HloInstruction* instruction,
+      const std::function<ReturnT(LhsType, RhsType, EhsType)>& ternary_op) {
+    const auto shape = instruction->shape();
+    const auto* lhs = instruction->operand(0);
+    const auto* rhs = instruction->operand(1);
+    const auto* ehs = instruction->operand(2);
+
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!(ShapeUtil::SameDimensions(shape, lhs->shape()) &&
+          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()) &&
+          ShapeUtil::SameDimensions(rhs->shape(), ehs->shape()))) {
+      return Unimplemented(
+          "Implicit broadcasting is currently unsupported in HLO evaluator "
+          "Shape Mismatch: %s vs %s vs %s vs %s: ",
+          ShapeUtil::HumanString(shape).c_str(),
+          ShapeUtil::HumanString(lhs->shape()).c_str(),
+          ShapeUtil::HumanString(rhs->shape()).c_str(),
+          ShapeUtil::HumanString(ehs->shape()).c_str());
+    }
 
-  evaluated_[constant] = MakeUnique<Literal>(literal);
-  return Status::OK();
+    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
+    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
+    const Literal& ehs_literal = parent_->GetEvaluatedLiteralFor(ehs);
+
+    auto result = LiteralUtil::CreateFromShape(shape);
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<ReturnT>(
+          result.get(), multi_index,
+          ternary_op(LiteralUtil::Get<LhsType>(lhs_literal, multi_index),
+                     LiteralUtil::Get<RhsType>(rhs_literal, multi_index),
+                     LiteralUtil::Get<EhsType>(ehs_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    return std::move(result);
+  };
+
+  HloEvaluator* parent_;
+};
+
+HloEvaluator::HloEvaluator() {
+  typed_visitors_[PRED] = MakeUnique<TypedVisitor<bool>>(this);
+  typed_visitors_[U8] = MakeUnique<TypedVisitor<uint8>>(this);
+  typed_visitors_[U16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
+    return Unimplemented("unhandled primitive type: U16.");
+  });
+  typed_visitors_[U32] = MakeUnique<TypedVisitor<uint32>>(this);
+  typed_visitors_[U64] = MakeUnique<TypedVisitor<uint64>>(this);
+  typed_visitors_[S8] = MakeUnique<TypedVisitor<int8>>(this);
+  typed_visitors_[S16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
+    return Unimplemented("unhandled primitive type: S16.");
+  });
+  typed_visitors_[S32] = MakeUnique<TypedVisitor<int32>>(this);
+  typed_visitors_[S64] = MakeUnique<TypedVisitor<int64>>(this);
+  typed_visitors_[F16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
+    return Unimplemented("unhandled primitive type: F16.");
+  });
+  typed_visitors_[F32] = MakeUnique<TypedVisitor<float>>(this);
+  typed_visitors_[F64] = MakeUnique<TypedVisitor<double>>(this);
 }
 
 StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
     HloComputation* computation,
     tensorflow::gtl::ArraySlice<const Literal*> args) {
   arg_literals_ = args;
+  evaluated_.clear();
+
   TF_RETURN_IF_ERROR(computation->Accept(this));
   return std::move(FindOrDie(evaluated_, computation->root_instruction()));
 }
 
 StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
     HloInstruction* instruction,
-    tensorflow::gtl::ArraySlice<const Literal*> args) {
+    tensorflow::gtl::ArraySlice<const Literal*> operands) {
   DCHECK(hlo_query::AllOperandsAreParametersOrConstants(*instruction));
   Shape shape = instruction->shape();
   TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
 
-  arg_literals_ = args;
+  arg_literals_ = operands;
+  evaluated_.clear();
 
-  // Evaluate operands of Parameter type against the input literals which caches
-  // the evaluated literal results.
+  // Evaluate operands of Parameter type against the input literals which
+  // caches the evaluated literal results.
   for (const auto operand : instruction->operands()) {
     if (operand->opcode() == HloOpcode::kParameter) {
-      TF_CHECK_OK(HandleParameter(operand));
+      const Literal* input_literal = arg_literals_[operand->parameter_number()];
+      VLOG(2) << "Parameter operand evaluated to: "
+              << LiteralUtil::ToString(*input_literal);
+      TF_RET_CHECK(ShapeUtil::Equal(operand->shape(), input_literal->shape()));
+
+      evaluated_[operand] = MakeUnique<Literal>(*input_literal);
     } else if (operand->opcode() == HloOpcode::kConstant) {
       evaluated_[operand] = MakeUnique<Literal>(operand->literal());
     }
@@ -187,253 +534,24 @@ StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
   return std::move(FindOrDie(evaluated_, instruction));
 }
 
-StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateBasedOnType(
-    HloInstruction* instruction) {
-  Shape shape = instruction->shape();
-  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
+  VLOG(2) << "HandleParameter: " << parameter->ToString();
+  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
+  VLOG(2) << "Parameter evaluated to: "
+          << LiteralUtil::ToString(*input_literal);
+  DCHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
 
-  switch (shape.element_type()) {
-    case PRED:
-      return EvaluateSameTypedElementwise<bool>(instruction);
-    case U8:
-      return EvaluateSameTypedElementwise<uint8>(instruction);
-    case U16:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(U16).c_str());
-    case U32:
-      return EvaluateSameTypedElementwise<uint32>(instruction);
-    case U64:
-      return EvaluateSameTypedElementwise<uint64>(instruction);
-    case S8:
-      return EvaluateSameTypedElementwise<int8>(instruction);
-    case S16:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(S16).c_str());
-    case S32:
-      return EvaluateSameTypedElementwise<int32>(instruction);
-    case S64:
-      return EvaluateSameTypedElementwise<int64>(instruction);
-    case F16:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(F16).c_str());
-    case F32:
-      return EvaluateSameTypedElementwise<float>(instruction);
-    case F64:
-      return EvaluateSameTypedElementwise<double>(instruction);
-    default:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(shape.element_type()).c_str());
-  }
+  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
+  return Status::OK();
 }
 
-template <typename NativeT>
-StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateSameTypedElementwise(
-    HloInstruction* instruction) {
-  const std::vector<HloInstruction*>& operands = instruction->operands();
-  HloOpcode opcode = instruction->opcode();
-  const Shape& shape = instruction->shape();
-
-  switch (opcode) {
-    // TODO(b/35950897): many of the stl function used here are not overloaded
-    // for every XLA primitive types.
-
-    // Unary element-wise ops.
-    //
-    case HloOpcode::kAbs:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return AbsoluteVal(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kCeil:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::ceil(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kConvert:
-      CHECK_EQ(operands.size(), 1);
-      // TODO(b/35950897): implement Convert.
-      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
-                           HloOpcodeString(opcode).c_str());
-    case HloOpcode::kCopy:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return operand; },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kExp:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::exp(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kFloor:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::floor(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kIsFinite:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::isfinite(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kLog:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::log(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kLogicalNot:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return !operand; },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kNegate:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return -operand; },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kSign:
-      CHECK_EQ(operands.size(), 1);
-      CHECK(primitive_util::IsIntegralType(shape.element_type()));
-      return ElementWiseUnaryOp<int>(shape,
-                                     [](NativeT operand) {
-                                       return (NativeT(0) < operand) -
-                                              (operand < NativeT(0));
-                                     },
-                                     GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kTanh:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::tanh(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    // Binary element-wise ops.
-    //
-    case HloOpcode::kAdd:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs + rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kDivide:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs / rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kMultiply:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs * rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kSubtract:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs - rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kEq:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs == rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kGe:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs >= rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kGt:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs > rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLe:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs <= rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLt:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs < rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kNe:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs != rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kMaximum:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return std::max(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kMinimum:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return std::min(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kPower:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return std::pow(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kRemainder:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape,
-          [](NativeT lhs, NativeT rhs) { return std::remainder(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLogicalAnd:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs && rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLogicalOr:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs || rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    // Ternary element-wise ops.
-    //
-    case HloOpcode::kClamp: {
-      CHECK_EQ(operands.size(), 3);
-      std::function<NativeT(NativeT, NativeT, NativeT)> clamp_op =
-          [](NativeT low, NativeT high, NativeT value) {
-            return std::max(low, std::min(value, high));
-          };
-      return ElementWiseTernaryOp<NativeT, NativeT, NativeT, NativeT>(
-          shape, std::move(clamp_op), GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]),
-          GetEvaluatedLiteralFor(operands[2]));
-    } break;
-    case HloOpcode::kSelect: {
-      CHECK_EQ(operands.size(), 3);
-      CHECK(!ShapeUtil::IsTuple(shape));
-      std::function<NativeT(bool, NativeT, NativeT)> select_op =
-          [](bool pred, NativeT on_true, NativeT on_false) {
-            if (pred) {
-              return on_true;
-            }
-            return on_false;
-          };
-      return ElementWiseTernaryOp<NativeT, bool, NativeT, NativeT>(
-          shape, std::move(select_op), GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]),
-          GetEvaluatedLiteralFor(operands[2]));
-    } break;
-    default:
-      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
-                           HloOpcodeString(opcode).c_str());
-  }
+Status HloEvaluator::HandleConstant(HloInstruction* constant,
+                                    const Literal& literal) {
+  VLOG(2) << "HandleConstant: " << constant->ToString();
+  DCHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
+
+  evaluated_[constant] = MakeUnique<Literal>(literal);
+  return Status::OK();
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.h b/tensorflow/compiler/xla/service/hlo_evaluator.h
index 6372a6c269..e93cb0fc39 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.h
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.h
@@ -35,13 +35,21 @@ namespace xla {
 // This class is not thread-safe.
 class HloEvaluator : public DfsHloVisitorWithDefault {
  public:
-  HloEvaluator() {}
-  ~HloEvaluator() override {}
-
+  HloEvaluator();
   // Evaluates a HLO computation and an array of pointers to literals.
   // Return the evaluated result as literal if successful.
-  // Precondition: argument literals are in post-order corresponding to the
-  // input instruction's parameters.
+  // Precondition: argument literals are corresponds to the input computation's
+  // parameters in their post-ordering. For e.g., consider the following graph:
+  //
+  //                *
+  //            /       \
+  //            +     Parameter1
+  //        /      \
+  //       /        \
+  //    Parameter0  Constant
+  //
+  // The input literals array will have its first literal map to Parameter0 and
+  // the second map to Parameter1.
   StatusOr<std::unique_ptr<Literal>> Evaluate(
       HloComputation* computation,
       tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
@@ -49,40 +57,36 @@ class HloEvaluator : public DfsHloVisitorWithDefault {
   // Evaluates a single HLO instruction and an array of pointers to literals.
   // Return the evaluated result as literal if successful.
   // Precondition:
-  // 1. argument literals are in post-order corresponding to the input
-  // instruction's parameters.
+  // 1. argument literals are corresponds to the input instruction's
+  // parameters in their post-orderring.
   // 2. the instruction's operands must be of either Parameter or Constant type.
   // TODO(b/35950897): implement more ops other than element-wise ops.
-  // TODO(b/35950897): handle broadcasts.
   StatusOr<std::unique_ptr<Literal>> Evaluate(
       HloInstruction* instruction,
       tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
 
  protected:
-  // The following methods implement the DfsHloVisitor interface.
-  //
-  // DefaultAction here handles all non-specificialized (i.e., instruction
-  // without corresponding Handle* method) instructions.
-  // TODO(b/35950897): it's likely better to refactor the switches here and push
-  // up the switch to templated methods instead, likely at DfsHloVisitor level.
-  Status DefaultAction(HloInstruction* hlo_instruction) override;
+  // Templated DfsHloVisitor. Typically ReturnT here indicates the resulting
+  // literal type of each evaluated Handle* method of a TypedVisitor. One
+  // exception to this is HandleCompare, where the resulting literal type is
+  // always boolean.
+  // Note the forward declaration here is necessary to enable TypedVisitor to
+  // access parent members.
+  template <typename ReturnT>
+  class TypedVisitor;
+
+  // Wraps around instruction handling to infer types before dispatching to
+  // the corresponding typed Visitor.
+  Status DefaultAction(HloInstruction* hlo) override {
+    return hlo->Visit(typed_visitors_.at(hlo->shape().element_type()).get());
+  }
 
   Status HandleParameter(HloInstruction* parameter) override;
+
   Status HandleConstant(HloInstruction* constant,
                         const Literal& literal) override;
 
  private:
-  // Evaluates a single HLO instruction return the result as a Literal if
-  // successful. A Status will be returned on error.
-  StatusOr<std::unique_ptr<Literal>> EvaluateBasedOnType(
-      HloInstruction* instruction);
-
-  // Evaluates an element-wise HLO instruction that has the same output literal
-  // type as the operands' types.
-  template <typename NativeT>
-  StatusOr<std::unique_ptr<Literal>> EvaluateSameTypedElementwise(
-      HloInstruction* instruction);
-
   // Returns the already-evaluated literal result for the instruction.
   // Crash with log if the given instruction has not been evaluated previously.
   const Literal& GetEvaluatedLiteralFor(const HloInstruction* hlo) {
@@ -92,9 +96,17 @@ class HloEvaluator : public DfsHloVisitorWithDefault {
     return *(it->second);
   }
 
+  // Map from a primitive type to its associated (templated) DfsHloVisitor.
+  tensorflow::gtl::FlatMap<PrimitiveType, std::unique_ptr<DfsHloVisitor>>
+      typed_visitors_;
+
   // Tracks the HLO instruciton and its evaluated literal result.
+  // TODO(b/35950897): have better memory management here to free instructions
+  // that are no longer a parent for any other subsequent instruction in
+  // post-orderring.
   tensorflow::gtl::FlatMap<const HloInstruction*, std::unique_ptr<Literal>>
       evaluated_;
+
   // Stores input literals, assuming they are in post-order. Literals are not
   // owned by this class, and they must outlive the lifetime of the instance of
   // this class.
-- 
GitLab


From a57373bd168d4f56bbf6bec86235b4bb40162915 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 15:25:21 -0700
Subject: [PATCH 1132/1563] Improve pydoc for
 `categorical_column_with_identity`.

PiperOrigin-RevId: 155435926
---
 .../python/feature_column/feature_column.py   | 90 ++++++++++++++-----
 1 file changed, 66 insertions(+), 24 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 16ac838050..70c38574fb 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -324,14 +324,15 @@ def numeric_column(key,
 
   ```python
   price = numeric_column('price')
-  all_feature_columns = [price, ...]
-  dense_tensor = make_input_layer(features, all_feature_columns)
+  columns = [price, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  dense_tensor = make_input_layer(features, columns)
 
   # or
   bucketized_price = bucketized_column(price, boundaries=[...])
-  all_feature_columns = [bucketized_price, ...]
-  linear_prediction = make_linear_model(features, all_feature_columns)
-
+  columns = [bucketized_price, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction = make_linear_model(features, columns)
   ```
 
   Args:
@@ -409,12 +410,14 @@ def bucketized_column(source_column, boundaries):
   ```python
   price = numeric_column('price')
   bucketized_price = bucketized_column(price, boundaries=[...])
-  all_feature_columns = [bucketized_price, ...]
-  linear_prediction = make_linear_model(features, all_feature_columns)
+  columns = [bucketized_price, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction = make_linear_model(features, columns)
 
   # or
-  all_feature_columns = [bucketized_price, ...]
-  dense_tensor = make_input_layer(features, all_feature_columns)
+  columns = [bucketized_price, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  dense_tensor = make_input_layer(features, columns)
   ```
 
   Args:
@@ -458,19 +461,27 @@ def categorical_column_with_hash_bucket(key,
                                         dtype=dtypes.string):
   """Represents sparse feature where ids are set by hashing.
 
-  Use this when your sparse features are in string or integer format where you
+  Use this when your sparse features are in string or integer format, and you
   want to distribute your inputs into a finite number of buckets by hashing.
   output_id = Hash(input_feature_string) % bucket_size
 
+  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  values can be represented by `-1` for int and `''` for string. Note that these
+  values are independent of the `default_value` argument.
+
   Example:
 
   ```python
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
-  linear_prediction = make_linear_model(features, [keywords, ...])
+  columns = [keywords, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction = make_linear_model(features, columns)
 
   # or
   keywords_embedded = embedding_column(keywords, 16)
-  dense_tensor = make_input_layer(features, [keywords_embedded, ...])
+  columns = [keywords_embedded, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  dense_tensor = make_input_layer(features, columns)
   ```
 
   Args:
@@ -511,9 +522,9 @@ def categorical_column_with_vocabulary_file(
   `num_oov_buckets` and `default_value` to specify how to include
   out-of-vocabulary values.
 
-  Inputs can be either `Tensor` or `SparseTensor`. If `Tensor`, missing values
-  can be represented by `-1` for int and `''` for string. Note that these values
-  are independent of the `default_value` argument.
+  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  values can be represented by `-1` for int and `''` for string. Note that these
+  values are independent of the `default_value` argument.
 
   Example with `num_oov_buckets`:
   File '/us/states.txt' contains 50 lines, each with a 2-character U.S. state
@@ -524,7 +535,9 @@ def categorical_column_with_vocabulary_file(
   states = categorical_column_with_vocabulary_file(
       key='states', vocabulary_file='/us/states.txt', vocabulary_size=50,
       num_oov_buckets=5)
-  linear_prediction = make_linear_model(features, [states, ...])
+  columns = [states, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction = make_linear_model(features, columns)
   ```
 
   Example with `default_value`:
@@ -536,11 +549,15 @@ def categorical_column_with_vocabulary_file(
   states = categorical_column_with_vocabulary_file(
       key='states', vocabulary_file='/us/states.txt', vocabulary_size=51,
       default_value=0)
-  linear_prediction, _, _ = make_linear_model(features, [states, ...])
+  columns = [states, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction, _, _ = make_linear_model(features, columns)
 
   And to make an embedding with either:
   ```python
-  dense_tensor = make_input_layer(features, [embedding_column(states, 3),...])
+  columns = [embedding_column(states, 3),...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  dense_tensor = make_input_layer(features, columns)
   ```
 
   Args:
@@ -606,9 +623,9 @@ def categorical_column_with_vocabulary_list(
   out-of-vocabulary values are ignored. Use `default_value` to specify how to
   include out-of-vocabulary values.
 
-  Inputs can be either `Tensor` or `SparseTensor`. If `Tensor`, missing values
-  can be represented by `-1` for int and `''` for string. Note that these values
-  are independent of the `default_value` argument.
+  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  values can be represented by `-1` for int and `''` for string. Note that these
+  values are independent of the `default_value` argument.
 
   In the following examples, each input in `vocabulary_list` is assigned an ID
   0-4 corresponding to its index (e.g., input 'B' produces output 2). All other
@@ -618,12 +635,16 @@ def categorical_column_with_vocabulary_list(
   ```python
   colors = categorical_column_with_vocabulary_list(
       key='colors', vocabulary_list=('X', 'R', 'G', 'B', 'Y'), default_value=0)
-  linear_prediction, _, _ = make_linear_model(features, [colors, ...])
+  columns = [colors, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction, _, _ = make_linear_model(features, columns)
   ```
 
   Embedding for a DNN model:
   ```python
-  dense_tensor = make_input_layer(features, [embedding_column(colors, 3),...])
+  columns = [embedding_column(colors, 3),...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  dense_tensor = make_input_layer(features, columns)
   ```
 
   Args:
@@ -675,7 +696,28 @@ def categorical_column_with_identity(key, num_buckets, default_value=None):
   outside this range will result in `default_value` if specified, otherwise it
   will fail.
 
-  Inputs can be either `Tensor` or `SparseTensor`.
+  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  values can be represented by `-1` for int and `''` for string. Note that these
+  values are independent of the `default_value` argument.
+
+  In the following examples, each input in the range `[0, 1000000)` is assigned
+  the same value. All other inputs are assigned `default_value` 0. Note that a
+  literal 0 in inputs will result in the same default ID.
+
+  Linear model:
+  ```python
+  video_id = categorical_column_with_identity(
+      key='video_id', num_buckets=1000000, default_value=0)
+  columns = [video_id, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction, _, _ = make_linear_model(features, columns)
+  ```
+
+  Embedding for a DNN model:
+  ```python
+  columns = [embedding_column(video_id, 9),...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  dense_tensor = make_input_layer(features, columns)
   ```
 
   Args:
-- 
GitLab


From 8d254838e35649ce8f6653bfe39758df3eafe43d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 15:58:29 -0700
Subject: [PATCH 1133/1563] Expand "Adding a New Op" to have: - comment about
 multi-threaded CPU kernel. - example of a GPU kernel.

PiperOrigin-RevId: 155440303
---
 tensorflow/docs_src/extend/adding_an_op.md | 157 +++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index f54f79cbf4..99933b75b4 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -152,6 +152,163 @@ REGISTER_KERNEL_BUILDER(Name("ZeroOut").Device(DEVICE_CPU), ZeroOutOp);
 >   Consider using a [`ResourceMgr`](https://www.tensorflow.org/code/tensorflow/core/framework/resource_mgr.h)
 >   to keep track of op state.
 
+### Multi-threaded CPU kernels
+
+To write a multi-threaded CPU kernel, the Shard function in
+[`work_sharder.h`](https://www.tensorflow.org/code/tensorflow/core/framework/work_sharder.h)
+can be used. This function shards a computation function across the
+threads configured to be used for intra-op threading (see
+intra_op_parallelism_threads in
+[`config.proto`](https://www.tensorflow.org/code/tensorflow/core/protobuf/config.proto)).
+
+### GPU kernels
+
+A GPU kernel is implemented in two parts: the OpKernel and the CUDA kernel and
+its launch code.
+
+Sometimes the OpKernel implementation is common between a CPU and GPU kernel,
+such as around inspecting inputs and allocating outputs.  In that case, a
+suggested implementation is to:
+
+1. Define the OpKernel templated on the Device and the primitive type of the
+   tensor.
+2. To do the actual computation of the output, the Compute function calls a
+    templated functor struct.
+3. The specialization of that functor for the CPUDevice is defined in the same
+   file, but the specialization for the GPUDevice is defined in a .cu.cc file,
+   since it will be compiled with the CUDA compiler.
+
+<!--zippy-->
+
+Expand this to see the example implementation.
+
+```c++
+// example.h
+#ifndef KERNEL_EXAMPLE_H_
+#define KERNEL_EXAMPLE_H_
+
+template <typename Device, typename T>
+struct ExampleFunctor {
+  void operator()(const Device& d, int size, const T* in, T* out);
+};
+
+#endif KERNEL_EXAMPLE_H_
+```
+
+```c++
+// example.cc
+#define EIGEN_USE_THREADS
+#include "example.h"
+#include "tensorflow/core/framework/op_kernel.h"
+
+using namespace tensorflow;
+
+using CPUDevice = Eigen::ThreadPoolDevice;
+using GPUDevice = Eigen::GpuDevice;
+
+// CPU specialization of actual computation.
+template <typename T>
+struct ExampleFunctor<CPUDevice, T> {
+  void operator()(const CPUDevice& d, int size, const T* in, T* out) {
+    for (int i = 0; i < size; ++i) {
+      out[i] = 2 * in[i];
+    }
+  }
+};
+
+// OpKernel definition.
+// template parameter <T> is the datatype of the tensors.
+template <typename Device, typename T>
+class ExampleOp : public OpKernel {
+ public:
+  explicit ExampleOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    // Grab the input tensor
+    const Tensor& input_tensor = context->input(0);
+
+    // Create an output tensor
+    Tensor* output_tensor = NULL;
+    OP_REQUIRES_OK(context, context->allocate_output(0, input_tensor.shape(),
+                                                     &output_tensor));
+
+    // Do the computation.
+    OP_REQUIRES(context, input_tensor.NumElements() <= tensorflow::kint32max,
+                errors::InvalidArgument("Too many elements in tensor"));
+    ExampleFunctor<Device, T>()(
+        context->eigen_device<Device>(),
+        static_cast<int>(input_tensor.NumElements()),
+        input_tensor.flat<T>().data(),
+        output_tensor->flat<T>().data());
+  }
+};
+
+// Register the CPU kernels.
+#define REGISTER_CPU(T)                                          \
+  REGISTER_KERNEL_BUILDER(                                       \
+      Name("Example").Device(DEVICE_CPU).TypeConstraint<T>("T"), \
+      ExampleOp<CPUDevice, T>);
+REGISTER_CPU(float);
+REGISTER_CPU(int32);
+
+// Register the GPU kernels.
+#ifdef GOOGLE_CUDA
+#define REGISTER_GPU(T)                                          \
+  REGISTER_KERNEL_BUILDER(                                       \
+      Name("Example").Device(DEVICE_GPU).TypeConstraint<T>("T"), \
+      ExampleOp<GPUDevice, T>);
+REGISTER_GPU(float);
+REGISTER_GPU(int32);
+#endif  // GOOGLE_CUDA
+```
+
+```c++
+#ifdef GOOGLE_CUDA
+
+#define EIGEN_USE_GPU
+#define EIGEN_USE_THREADS
+
+#include "example.h"
+#include "tensorflow/core/util/cuda_kernel_helper.h"
+
+using namespace tensorflow;
+
+#define EIGEN_USE_GPU
+
+// Define the CUDA kernel.
+template <typename T>
+__global__ void ExampleCudaKernel(const int size, const T* in, T* out) {
+  for (int i = blockIdx.x * blockDim.x + threadIdx.x; i < size;
+       i += blockDim.x * gridDim.x) {
+    out[i] = 2 * ldg(in + i);
+  }
+}
+
+// Define the GPU implementation that launches the CUDA kernel.
+template <typename T>
+struct ExampleFunctor<GPUDevice, T> {
+  void operator()(const GPUDevice& d, int size, const T* in, T* out) {
+    // Launch the cuda kernel.
+    //
+    // See core/util/cuda_kernel_helper.h for example of computing
+    // block count and thread_per_block count.
+    int block_count = 1024;
+    int thread_per_block = 20;
+    ExampleCudaKernel<T>
+        <<<block_count, thread_per_block, 0, d.stream()>>>(size, in, out);
+  }
+};
+
+// Instantiate functors for the types of OpKernels registered.
+typedef Eigen::GpuDevice GPUDevice;
+template struct ExampleFunctor<GPUDevice, float>;
+template struct ExampleFunctor<GPUDevice, int32>;
+
+#endif  // GOOGLE_CUDA
+```
+
+<!--endzippy-->
+
 ## Build the op library
 ### Compile the op using your system compiler (TensorFlow binary installation)
 
-- 
GitLab


From 6c1f55de2f89ba076c9153a0e33f748f5c468d9a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 16:24:49 -0700
Subject: [PATCH 1134/1563] Adds unit test case for output fused add with
 non-dot/transpose operand.

PiperOrigin-RevId: 155443320
---
 .../xla/service/liveness_util_test.cc         | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tensorflow/compiler/xla/service/liveness_util_test.cc b/tensorflow/compiler/xla/service/liveness_util_test.cc
index 0ddd0caa35..49c2c2d4a2 100644
--- a/tensorflow/compiler/xla/service/liveness_util_test.cc
+++ b/tensorflow/compiler/xla/service/liveness_util_test.cc
@@ -295,6 +295,34 @@ TEST_F(CanShareOperandBufferWithUserTest, FusedTransposeDotAdd) {
                                             *points_to_analysis_));
 }
 
+TEST_F(CanShareOperandBufferWithUserTest, OutputFusionCantAliasOperandBuffer) {
+  auto builder = HloComputation::Builder(TestName());
+  Shape data_shape = ShapeUtil::MakeShape(F32, {2, 2});
+
+  auto one = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(1.0)));
+  auto operand = builder.AddInstruction(
+      HloInstruction::CreateBroadcast(data_shape, one, {1}));
+
+  auto reverse = builder.AddInstruction(
+      HloInstruction::CreateReverse(data_shape, operand, {0, 1}));
+
+  auto two = builder.AddInstruction(HloInstruction::CreateConstant(
+      LiteralUtil::CreateR2<float>({{2.0, 2.0}, {2.0, 2.0}})));
+
+  auto add = builder.AddInstruction(
+      HloInstruction::CreateBinary(data_shape, HloOpcode::kAdd, reverse, two));
+
+  BuildModule(builder.Build());
+  auto fusion = computation_->CreateFusionInstruction(
+      {add, two, reverse}, HloInstruction::FusionKind::kOutput);
+  RunAnalysis();
+
+  // Output fused operand->reverse->add cannot alias operand buffer 'operand'.
+  EXPECT_FALSE(CanShareOperandBufferWithUser(operand, {}, fusion, {},
+                                             *points_to_analysis_));
+}
+
 TEST_F(CanShareOperandBufferWithUserTest, WhileCanShare) {
   Shape data_shape = ShapeUtil::MakeShape(F32, {8});
 
-- 
GitLab


From 02f4722a5bcc2ce3be9025112a780d1bc08918f9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 17:24:51 -0700
Subject: [PATCH 1135/1563] These checks only need to be done after the fact if
 an error occurs while saving.

PiperOrigin-RevId: 155450121
---
 tensorflow/python/training/saver.py      | 39 ++++++++--------
 tensorflow/python/training/saver_test.py | 58 +++++++++++++++---------
 2 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/tensorflow/python/training/saver.py b/tensorflow/python/training/saver.py
index a65ab79495..e9cc76aa90 100644
--- a/tensorflow/python/training/saver.py
+++ b/tensorflow/python/training/saver.py
@@ -1461,28 +1461,31 @@ class Saver(object):
             "'latest_filename' collides with 'save_path': '%s' and '%s'" %
             (latest_filename, save_path))
 
-    if not gfile.IsDirectory(os.path.dirname(save_path)):
-      raise ValueError(
-          "Parent directory of {} doesn't exist, can't save.".format(save_path))
-
-    save_path = os.path.dirname(save_path)
     if not isinstance(sess, session.SessionInterface):
       raise TypeError("'sess' must be a Session; %s" % sess)
 
+    save_path_parent = os.path.dirname(save_path)
     if not self._is_empty:
-      model_checkpoint_path = sess.run(
-          self.saver_def.save_tensor_name,
-          {self.saver_def.filename_tensor_name: checkpoint_file})
-      model_checkpoint_path = compat.as_str(model_checkpoint_path)
-      if write_state:
-        self._MaybeDeleteOldCheckpoints(
-            model_checkpoint_path, meta_graph_suffix=meta_graph_suffix)
-        _update_checkpoint_state(
-            save_dir=save_path,
-            model_checkpoint_path=model_checkpoint_path,
-            all_model_checkpoint_paths=self.last_checkpoints,
-            latest_filename=latest_filename,
-            save_relative_paths=self._save_relative_paths)
+      try:
+        model_checkpoint_path = sess.run(
+            self.saver_def.save_tensor_name,
+            {self.saver_def.filename_tensor_name: checkpoint_file})
+        model_checkpoint_path = compat.as_str(model_checkpoint_path)
+        if write_state:
+          self._MaybeDeleteOldCheckpoints(
+              model_checkpoint_path, meta_graph_suffix=meta_graph_suffix)
+          _update_checkpoint_state(
+              save_dir=save_path_parent,
+              model_checkpoint_path=model_checkpoint_path,
+              all_model_checkpoint_paths=self.last_checkpoints,
+              latest_filename=latest_filename,
+              save_relative_paths=self._save_relative_paths)
+      except (errors.FailedPreconditionError, errors.NotFoundError) as exc:
+        if not gfile.IsDirectory(save_path_parent):
+          exc = ValueError(
+              "Parent directory of {} doesn't exist, can't save.".format(
+                  save_path))
+        raise exc
 
     if write_meta_graph:
       meta_graph_filename = self._MetaGraphFilename(
diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py
index d862244f8f..cb6cf2f75b 100644
--- a/tensorflow/python/training/saver_test.py
+++ b/tensorflow/python/training/saver_test.py
@@ -555,32 +555,46 @@ class SaverTest(test.TestCase):
     self.testSaveWithGlobalStep(pad_step_number=True)
 
   def testSaveToNonexistingPath(self):
+    file_io.write_string_to_file(
+        os.path.join(self.get_temp_dir(), "actually_a_file"), "")
+    paths = [
+        os.path.join(self.get_temp_dir(), "nonexisting_dir/path"),
+        os.path.join(self.get_temp_dir(), "other_nonexisting_dir/path1/path2"),
+        os.path.join(self.get_temp_dir(), "actually_a_file/path"),
+    ]
+
+    for save_path in paths:
+      # Build a graph with 2 parameter nodes, and Save and
+      # Restore nodes for them.
+      v0 = variables.Variable(10.0, name="v0")
+      v1 = variables.Variable(20.0, name="v1")
+      save = saver_module.Saver({"v0": v0, "v1": v1}, restore_sequentially=True)
+      init_all_op = variables.global_variables_initializer()
 
-    save_path = os.path.join(self.get_temp_dir(), "nonexisting_dir/path")
-
-    # Build a graph with 2 parameter nodes, and Save and
-    # Restore nodes for them.
-    v0 = variables.Variable(10.0, name="v0")
-    v1 = variables.Variable(20.0, name="v1")
-    save = saver_module.Saver({"v0": v0, "v1": v1}, restore_sequentially=True)
-    init_all_op = variables.global_variables_initializer()
-
-    with self.test_session() as sess:
-      # Initialize all variables
-      sess.run(init_all_op)
+      # In the case where the parent directory doesn't exist, whether or not the
+      # save succeeds or fails is implementation dependent.  Therefore we allow
+      # both cases.
+      try:
+        with self.test_session() as sess:
+          # Initialize all variables
+          sess.run(init_all_op)
 
-      # Check that the parameter nodes have been initialized.
-      self.assertEqual(10.0, v0.eval())
-      self.assertEqual(20.0, v1.eval())
+          # Check that the parameter nodes have been initialized.
+          self.assertEqual(10.0, v0.eval())
+          self.assertEqual(20.0, v1.eval())
 
-      error_msg_template = "Parent directory of {} doesn't exist, can't save."
+          # Save the graph.
+          save.save(sess, save_path)
 
-      # Assert saving fails when parent dir of save path doesn't exist
-      with self.assertRaisesWithPredicateMatch(
-          ValueError,
-          lambda e: error_msg_template.format(save_path) in str(e)
-      ):
-        save.save(sess, save_path)
+        with self.test_session() as sess:
+          # Restore the saved values in the parameter nodes.
+          save.restore(sess, save_path)
+          # Check that the parameter nodes have been restored.
+          self.assertEqual(10.0, v0.eval())
+          self.assertEqual(20.0, v1.eval())
+      except ValueError as exc:
+        error_msg_template = "Parent directory of {} doesn't exist, can't save."
+        self.assertEqual(error_msg_template.format(save_path), str(exc))
 
   def testSaveToURI(self):
     # ParseURI functions don't work on Windows yet.
-- 
GitLab


From b1820e0d080d3c761b17b63eaf79d0338b2a59f2 Mon Sep 17 00:00:00 2001
From: Yutaka Leon <yleon@google.com>
Date: Mon, 8 May 2017 17:45:11 -0700
Subject: [PATCH 1136/1563] Add initial read-only lookup table ops into core
 that uses the V2 kernels.

PiperOrigin-RevId: 155452370
---
 tensorflow/python/kernel_tests/BUILD          |   16 +
 .../python/kernel_tests/lookup_ops_test.py    | 1321 +++++++++++++++++
 tensorflow/python/ops/lookup_ops.py           | 1140 +++++++++++++-
 tensorflow/python/ops/standard_ops.py         |    3 +-
 4 files changed, 2478 insertions(+), 2 deletions(-)
 create mode 100644 tensorflow/python/kernel_tests/lookup_ops_test.py

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index a81e6f5482..95a255f672 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -402,6 +402,22 @@ tf_py_test(
     ],
 )
 
+tf_py_test(
+    name = "lookup_ops_test",
+    size = "small",
+    srcs = ["lookup_ops_test.py"],
+    additional_deps = [
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:lookup_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:training",
+    ],
+)
+
 tf_py_test(
     name = "losses_test",
     size = "medium",
diff --git a/tensorflow/python/kernel_tests/lookup_ops_test.py b/tensorflow/python/kernel_tests/lookup_ops_test.py
new file mode 100644
index 0000000000..2a90bc539b
--- /dev/null
+++ b/tensorflow/python/kernel_tests/lookup_ops_test.py
@@ -0,0 +1,1321 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for lookup ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+import numpy as np
+
+from tensorflow.python.client import session
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors_impl
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.framework import test_util
+from tensorflow.python.ops import lookup_ops
+from tensorflow.python.platform import test
+from tensorflow.python.training import server_lib
+
+
+class HashTableOpTest(test.TestCase):
+
+  def testHashTable(self):
+    with self.test_session():
+      default_val = -1
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2], dtypes.int64)
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table.init.run()
+
+      self.assertAllEqual(3, table.size().eval())
+
+      input_string = constant_op.constant(["brain", "salad", "tank"])
+      output = table.lookup(input_string)
+      self.assertAllEqual([3], output.get_shape())
+
+      result = output.eval()
+      self.assertAllEqual([0, 1, -1], result)
+
+  def testHashTableFindHighRank(self):
+    with self.test_session():
+      default_val = -1
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2], dtypes.int64)
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table.init.run()
+
+      self.assertAllEqual(3, table.size().eval())
+
+      input_string = constant_op.constant(
+          [["brain", "salad"], ["tank", "tarkus"]])
+      output = table.lookup(input_string)
+
+      result = output.eval()
+      self.assertAllEqual([[0, 1], [-1, -1]], result)
+
+  def testHashTableInitWithPythonArrays(self):
+    with self.test_session():
+      default_val = -1
+      keys = ["brain", "salad", "surgery"]
+      values = [0, 1, 2]
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(
+              keys, values, value_dtype=dtypes.int64), default_val)
+      table.init.run()
+
+      self.assertAllEqual(3, table.size().eval())
+
+      input_string = constant_op.constant(["brain", "salad", "tank"])
+      output = table.lookup(input_string)
+
+      result = output.eval()
+      self.assertAllEqual([0, 1, -1], result)
+
+  def testHashTableInitWithNumPyArrays(self):
+    with self.test_session():
+      default_val = -1
+      keys = np.array(["brain", "salad", "surgery"], dtype=np.str)
+      values = np.array([0, 1, 2], dtype=np.int64)
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table.init.run()
+
+      self.assertAllEqual(3, table.size().eval())
+
+      input_string = constant_op.constant(["brain", "salad", "tank"])
+      output = table.lookup(input_string)
+
+      result = output.eval()
+      self.assertAllEqual([0, 1, -1], result)
+
+  def testMultipleHashTables(self):
+    with self.test_session() as sess:
+      default_val = -1
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2], dtypes.int64)
+
+      table1 = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table2 = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table3 = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual(3, table1.size().eval())
+      self.assertAllEqual(3, table2.size().eval())
+      self.assertAllEqual(3, table3.size().eval())
+
+      input_string = constant_op.constant(["brain", "salad", "tank"])
+      output1 = table1.lookup(input_string)
+      output2 = table2.lookup(input_string)
+      output3 = table3.lookup(input_string)
+
+      out1, out2, out3 = sess.run([output1, output2, output3])
+      self.assertAllEqual([0, 1, -1], out1)
+      self.assertAllEqual([0, 1, -1], out2)
+      self.assertAllEqual([0, 1, -1], out3)
+
+  def testHashTableWithTensorDefault(self):
+    with self.test_session():
+      default_val = constant_op.constant(-1, dtypes.int64)
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2], dtypes.int64)
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table.init.run()
+
+      input_string = constant_op.constant(["brain", "salad", "tank"])
+      output = table.lookup(input_string)
+
+      result = output.eval()
+      self.assertAllEqual([0, 1, -1], result)
+
+  def testHashTableWithSparseTensorInput(self):
+    with self.test_session() as sess:
+      default_val = constant_op.constant(-1, dtypes.int64)
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2], dtypes.int64)
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table.init.run()
+
+      sp_indices = [[0, 0], [0, 1], [1, 0]]
+      sp_shape = [2, 2]
+      input_tensor = sparse_tensor.SparseTensor(
+          constant_op.constant(sp_indices, dtypes.int64),
+          constant_op.constant(["brain", "salad", "tank"]),
+          constant_op.constant(sp_shape, dtypes.int64))
+      output = table.lookup(input_tensor)
+
+      out_indices, out_values, out_shape = sess.run(output)
+
+      self.assertAllEqual([0, 1, -1], out_values)
+      self.assertAllEqual(sp_indices, out_indices)
+      self.assertAllEqual(sp_shape, out_shape)
+
+  def testSignatureMismatch(self):
+    with self.test_session():
+      default_val = -1
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2], dtypes.int64)
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table.init.run()
+
+      input_string = constant_op.constant([1, 2, 3], dtypes.int64)
+      with self.assertRaises(TypeError):
+        table.lookup(input_string)
+
+      with self.assertRaises(TypeError):
+        lookup_ops.HashTable(
+            lookup_ops.KeyValueTensorInitializer(keys, values), "UNK")
+
+  def testDTypes(self):
+    with self.test_session():
+      default_val = -1
+      with self.assertRaises(TypeError):
+        lookup_ops.HashTable(
+            lookup_ops.KeyValueTensorInitializer(["a"], [1], [dtypes.string],
+                                                 dtypes.int64), default_val)
+
+  def testNotInitialized(self):
+    with self.test_session():
+      default_val = -1
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(
+              ["a"], [1], value_dtype=dtypes.int64), default_val)
+
+      input_string = constant_op.constant(["brain", "salad", "surgery"])
+      output = table.lookup(input_string)
+
+      with self.assertRaisesOpError("Table not initialized"):
+        output.eval()
+
+  def testInitializeTwice(self):
+    with self.test_session():
+      default_val = -1
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2], dtypes.int64)
+      table = lookup_ops.HashTable(
+          lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+      table.init.run()
+
+      with self.assertRaisesOpError("Table already initialized"):
+        table.init.run()
+
+  def testInitializationWithInvalidDimensions(self):
+    with self.test_session():
+      default_val = -1
+      keys = constant_op.constant(["brain", "salad", "surgery"])
+      values = constant_op.constant([0, 1, 2, 3, 4], dtypes.int64)
+
+      with self.assertRaises(ValueError):
+        lookup_ops.HashTable(
+            lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+
+  def testMultipleSessions(self):
+    # Start a server
+    server = server_lib.Server(
+        {
+            "local0": ["localhost:0"]
+        }, protocol="grpc", start=True)
+    # Create two sessions sharing the same state
+    session1 = session.Session(server.target)
+    session2 = session.Session(server.target)
+
+    default_val = -1
+    keys = constant_op.constant(["brain", "salad", "surgery"])
+    values = constant_op.constant([0, 1, 2], dtypes.int64)
+    table = lookup_ops.HashTable(
+        lookup_ops.KeyValueTensorInitializer(keys, values),
+        default_val,
+        name="t1")
+
+    # Init the table in the first session.
+    with session1:
+      table.init.run()
+      self.assertAllEqual(3, table.size().eval())
+
+    # Init the table in the second session and verify that we do not get a
+    # "Table already initialized" error.
+    with session2:
+      table.init.run()
+      self.assertAllEqual(3, table.size().eval())
+
+
+class IndexTableFromFile(test.TestCase):
+
+  def _createVocabFile(self, basename, values=("brain", "salad", "surgery")):
+    vocabulary_file = os.path.join(self.get_temp_dir(), basename)
+    with open(vocabulary_file, "w") as f:
+      f.write("\n".join(values) + "\n")
+    return vocabulary_file
+
+  def test_string_index_table_from_file(self):
+    vocabulary_file = self._createVocabFile("f2i_vocab1.txt")
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file, num_oov_buckets=1)
+      ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, 3), ids.eval())
+
+  def test_int32_index_table_from_file(self):
+    vocabulary_file = self._createVocabFile(
+        "f2i_vocab2.txt", values=("42", "1", "-1000"))
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file,
+          num_oov_buckets=1,
+          key_dtype=dtypes.int32)
+      ids = table.lookup(
+          constant_op.constant((1, -1000, 11), dtype=dtypes.int32))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, 3), ids.eval())
+
+  def test_int64_index_table_from_file(self):
+    vocabulary_file = self._createVocabFile(
+        "f2i_vocab3.txt", values=("42", "1", "-1000"))
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file,
+          num_oov_buckets=1,
+          key_dtype=dtypes.int64)
+      ids = table.lookup(
+          constant_op.constant((1, -1000, 11), dtype=dtypes.int64))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, 3), ids.eval())
+
+  def test_index_table_from_file_with_default_value(self):
+    default_value = -42
+    vocabulary_file = self._createVocabFile("f2i_vocab4.txt")
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file, default_value=default_value)
+      ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, default_value), ids.eval())
+
+  def test_index_table_from_file_with_oov_buckets(self):
+    vocabulary_file = self._createVocabFile("f2i_vocab5.txt")
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file, num_oov_buckets=1000)
+      ids = table.lookup(
+          constant_op.constant(["salad", "surgery", "tarkus", "toccata"]))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual(
+          (
+              1,  # From vocabulary file.
+              2,  # From vocabulary file.
+              867,  # 3 + fingerprint("tarkus") mod 300.
+              860),  # 3 + fingerprint("toccata") mod 300.
+          ids.eval())
+
+  def test_index_table_from_file_with_only_oov_buckets(self):
+    self.assertRaises(
+        ValueError, lookup_ops.index_table_from_file, vocabulary_file=None)
+
+  def test_index_table_from_file_with_vocab_size_too_small(self):
+    vocabulary_file = self._createVocabFile("f2i_vocab6.txt")
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file, vocab_size=2)
+      ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, -1, -1), ids.eval())
+      self.assertEqual(2, table.size().eval())
+
+  def test_index_table_from_file_with_vocab_size_too_large(self):
+    vocabulary_file = self._createVocabFile("f2i_vocab7.txt")
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file, vocab_size=4)
+      self.assertRaisesRegexp(errors_impl.InvalidArgumentError,
+                              "Invalid vocab_size", table.init.run)
+
+  def test_index_table_from_file_with_vocab_size(self):
+    vocabulary_file = self._createVocabFile("f2i_vocab8.txt")
+
+    self.assertRaises(
+        ValueError,
+        lookup_ops.index_table_from_file,
+        vocabulary_file=vocabulary_file,
+        vocab_size=0)
+
+    with self.test_session():
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file, vocab_size=3)
+      ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, -1), ids.eval())
+      self.assertEqual(3, table.size().eval())
+
+  def test_index_table_from_file_with_invalid_hashers(self):
+    vocabulary_file = self._createVocabFile("invalid_hasher.txt")
+    with self.test_session():
+      with self.assertRaises(TypeError):
+        lookup_ops.index_table_from_file(
+            vocabulary_file=vocabulary_file,
+            vocab_size=3,
+            num_oov_buckets=1,
+            hasher_spec=1)
+
+      table = lookup_ops.index_table_from_file(
+          vocabulary_file=vocabulary_file,
+          vocab_size=3,
+          num_oov_buckets=1,
+          hasher_spec=lookup_ops.HasherSpec("my-awesome-hash", None))
+
+      self.assertRaises(ValueError, table.lookup,
+                        constant_op.constant(["salad", "surgery", "tarkus"]))
+
+
+class KeyValueTensorInitializerTest(test.TestCase):
+
+  def test_string(self):
+    with ops.Graph().as_default(), self.test_session():
+      init = lookup_ops.KeyValueTensorInitializer(
+          ("brain", "salad", "surgery"), (0, 1, 2), dtypes.string, dtypes.int64)
+      table = lookup_ops.HashTable(init, default_value=-1)
+      table.init.run()
+
+  def test_int64(self):
+    with ops.Graph().as_default(), self.test_session():
+      init = lookup_ops.KeyValueTensorInitializer((42, 1, -1000), (0, 1, 2),
+                                                  dtypes.int64, dtypes.int64)
+      table = lookup_ops.HashTable(init, default_value=-1)
+      table.init.run()
+
+  def test_int32(self):
+    with ops.Graph().as_default(), self.test_session():
+      init = lookup_ops.KeyValueTensorInitializer((42, 1, -1000), (0, 1, 2),
+                                                  dtypes.int32, dtypes.int64)
+      table = lookup_ops.HashTable(init, default_value=-1)
+      with self.assertRaisesRegexp(
+          errors_impl.OpError, "No OpKernel was registered"):
+        table.init.run()
+
+
+class IndexTableFromTensor(test.TestCase):
+
+  def test_index_table_from_tensor_with_tensor_init(self):
+    with self.test_session():
+      table = lookup_ops.index_table_from_tensor(
+          vocabulary_list=("brain", "salad", "surgery"), num_oov_buckets=1)
+      ids = table.lookup(constant_op.constant(("salad", "surgery", "tarkus")))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, 3), ids.eval())
+
+  def test_int32_index_table_from_tensor_with_tensor_init(self):
+    with self.test_session():
+      table = lookup_ops.index_table_from_tensor(
+          vocabulary_list=(42, 1, -1000), num_oov_buckets=1, dtype=dtypes.int32)
+      ids = table.lookup(
+          constant_op.constant((1, -1000, 11), dtype=dtypes.int32))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, 3), ids.eval())
+
+  def test_int64_index_table_from_tensor_with_tensor_init(self):
+    with self.test_session():
+      table = lookup_ops.index_table_from_tensor(
+          vocabulary_list=(42, 1, -1000), num_oov_buckets=1, dtype=dtypes.int64)
+      ids = table.lookup(
+          constant_op.constant((1, -1000, 11), dtype=dtypes.int64))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, 3), ids.eval())
+
+  def test_index_table_from_tensor_with_default_value(self):
+    default_value = -42
+    with self.test_session():
+      table = lookup_ops.index_table_from_tensor(
+          vocabulary_list=["brain", "salad", "surgery"],
+          default_value=default_value)
+      ids = table.lookup(constant_op.constant(["salad", "surgery", "tarkus"]))
+
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((1, 2, default_value), ids.eval())
+
+  def test_index_table_from_tensor_missing_vocabulary_list(self):
+    with self.test_session():
+      with self.assertRaisesRegexp(ValueError,
+                                   "vocabulary_list must be specified"):
+        lookup_ops.index_table_from_tensor(
+            vocabulary_list=None, num_oov_buckets=1)
+
+  def test_index_table_from_tensor_empty_vocabulary_list(self):
+    with self.test_session():
+      table = lookup_ops.index_table_from_tensor(
+          vocabulary_list=np.array([], dtype=np.str_), num_oov_buckets=1)
+      ids = table.lookup(constant_op.constant(["salad", "surgery", "brain"]))
+      self.assertRaises(errors_impl.OpError, ids.eval)
+      with self.assertRaisesRegexp(
+          errors_impl.OpError, "keys and values cannot be empty"):
+        lookup_ops.tables_initializer().run()
+
+  def test_index_table_from_tensor_with_invalid_hashers(self):
+    with self.test_session():
+      with self.assertRaises(TypeError):
+        lookup_ops.index_table_from_tensor(
+            vocabulary_list=["brain", "salad", "surgery"],
+            num_oov_buckets=1,
+            hasher_spec=1)
+
+      table = lookup_ops.index_table_from_tensor(
+          vocabulary_list=["brain", "salad", "surgery"],
+          num_oov_buckets=1,
+          hasher_spec=lookup_ops.HasherSpec("my-awesome-hash", None))
+
+      self.assertRaises(ValueError, table.lookup,
+                        constant_op.constant(["salad", "surgery", "tarkus"]))
+
+
+class IndexToStringTableFromFileTest(test.TestCase):
+
+  def _createVocabFile(self, basename):
+    vocabulary_file = os.path.join(self.get_temp_dir(), basename)
+    with open(vocabulary_file, "w") as f:
+      f.write("\n".join(["brain", "salad", "surgery"]) + "\n")
+    return vocabulary_file
+
+  def test_index_to_string_table(self):
+    vocabulary_file = self._createVocabFile("i2f_vocab1.txt")
+    with self.test_session():
+      table = lookup_ops.index_to_string_table_from_file(
+          vocabulary_file=vocabulary_file)
+      features = table.lookup(constant_op.constant([0, 1, 2, 3], dtypes.int64))
+      self.assertRaises(errors_impl.OpError, features.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((b"brain", b"salad", b"surgery", b"UNK"),
+                          features.eval())
+
+  def test_index_to_string_table_with_default_value(self):
+    default_value = b"NONE"
+    vocabulary_file = self._createVocabFile("f2i_vocab2.txt")
+    with self.test_session():
+      table = lookup_ops.index_to_string_table_from_file(
+          vocabulary_file=vocabulary_file, default_value=default_value)
+      features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
+      self.assertRaises(errors_impl.OpError, features.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((b"salad", b"surgery", default_value),
+                          features.eval())
+
+  def test_index_to_string_table_with_vocab_size_too_small(self):
+    default_value = b"NONE"
+    vocabulary_file = self._createVocabFile("f2i_vocab2.txt")
+    with self.test_session():
+      table = lookup_ops.index_to_string_table_from_file(
+          vocabulary_file=vocabulary_file,
+          vocab_size=2,
+          default_value=default_value)
+      features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
+      self.assertRaises(errors_impl.OpError, features.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((b"salad", default_value, default_value),
+                          features.eval())
+
+  def test_index_to_string_table_with_vocab_size_too_large(self):
+    vocabulary_file = self._createVocabFile("f2i_vocab6.txt")
+    with self.test_session():
+      table = lookup_ops.index_to_string_table_from_file(
+          vocabulary_file=vocabulary_file, vocab_size=4)
+      features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
+
+      self.assertRaises(errors_impl.OpError, features.eval)
+      init = lookup_ops.tables_initializer()
+      self.assertRaisesRegexp(errors_impl.InvalidArgumentError,
+                              "Invalid vocab_size", init.run)
+
+  def test_index_to_string_table_with_vocab_size(self):
+    vocabulary_file = self._createVocabFile("f2i_vocab7.txt")
+    with self.test_session():
+      table = lookup_ops.index_to_string_table_from_file(
+          vocabulary_file=vocabulary_file, vocab_size=3)
+      features = table.lookup(constant_op.constant([1, 2, 4], dtypes.int64))
+
+      self.assertRaises(errors_impl.OpError, features.eval)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((b"salad", b"surgery", b"UNK"), features.eval())
+
+
+class IndexToStringTableFromTensorTest(test.TestCase):
+
+  def test_index_to_string_table_from_tensor(self):
+    with self.test_session():
+      vocabulary_list = constant_op.constant(["brain", "salad", "surgery"])
+      table = lookup_ops.index_to_string_table_from_tensor(
+          vocabulary_list=vocabulary_list)
+
+      indices = constant_op.constant([0, 1, 2, 3], dtypes.int64)
+      features = table.lookup(indices)
+      self.assertRaises(errors_impl.OpError, features.eval)
+      lookup_ops.tables_initializer().run()
+
+      self.assertAllEqual((b"brain", b"salad", b"surgery", b"UNK"),
+                          features.eval())
+
+  def test_duplicate_entries(self):
+    with self.test_session():
+      vocabulary_list = constant_op.constant(["hello", "hello"])
+      table = lookup_ops.index_to_string_table_from_tensor(
+          vocabulary_list=vocabulary_list)
+      indices = constant_op.constant([0, 1, 4], dtypes.int64)
+      features = table.lookup(indices)
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((b"hello", b"hello", b"UNK"), features.eval())
+
+  def test_index_to_string_with_default_value(self):
+    default_value = b"NONE"
+    with self.test_session():
+      vocabulary_list = constant_op.constant(["brain", "salad", "surgery"])
+      table = lookup_ops.index_to_string_table_from_tensor(
+          vocabulary_list=vocabulary_list, default_value=default_value)
+      indices = constant_op.constant([1, 2, 4], dtypes.int64)
+      features = table.lookup(indices)
+      self.assertRaises(errors_impl.OpError, features.eval)
+
+      lookup_ops.tables_initializer().run()
+      self.assertAllEqual((b"salad", b"surgery", default_value),
+                          features.eval())
+
+
+class InitializeTableFromFileOpTest(test.TestCase):
+
+  def _createVocabFile(self, basename, values=("brain", "salad", "surgery")):
+    vocabulary_file = os.path.join(self.get_temp_dir(), basename)
+    with open(vocabulary_file, "w") as f:
+      f.write("\n".join(values) + "\n")
+    return vocabulary_file
+
+  def testInitializeStringTable(self):
+    vocabulary_file = self._createVocabFile("one_column_1.txt")
+
+    with self.test_session():
+      default_value = -1
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(
+              vocabulary_file, dtypes.string,
+              lookup_ops.TextFileIndex.WHOLE_LINE, dtypes.int64,
+              lookup_ops.TextFileIndex.LINE_NUMBER), default_value)
+      table.init.run()
+
+      output = table.lookup(constant_op.constant(["brain", "salad", "tank"]))
+
+      result = output.eval()
+      self.assertAllEqual([0, 1, -1], result)
+
+  def testInitializeInt64Table(self):
+    vocabulary_file = self._createVocabFile(
+        "one_column_int64.txt", values=("42", "1", "-1000"))
+
+    with self.test_session():
+      default_value = -1
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(
+              vocabulary_file, dtypes.int64,
+              lookup_ops.TextFileIndex.WHOLE_LINE, dtypes.int64,
+              lookup_ops.TextFileIndex.LINE_NUMBER), default_value)
+      table.init.run()
+
+      output = table.lookup(
+          constant_op.constant((42, 1, 11), dtype=dtypes.int64))
+
+      result = output.eval()
+      self.assertAllEqual([0, 1, -1], result)
+
+  def testInitializeIndexTable(self):
+    vocabulary_file = self._createVocabFile("one_column_2.txt")
+
+    with self.test_session():
+      default_value = "UNK"
+      key_index = lookup_ops.TextFileIndex.LINE_NUMBER
+      value_index = lookup_ops.TextFileIndex.WHOLE_LINE
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(vocabulary_file, dtypes.int64,
+                                         key_index, dtypes.string, value_index),
+          default_value)
+      table.init.run()
+
+      input_values = constant_op.constant([0, 1, 2, 3], dtypes.int64)
+      output = table.lookup(input_values)
+
+      result = output.eval()
+      self.assertAllEqual([b"brain", b"salad", b"surgery", b"UNK"], result)
+
+  def testMultiColumn(self):
+    vocabulary_file = os.path.join(self.get_temp_dir(), "three_columns.txt")
+    with open(vocabulary_file, "w") as f:
+      f.write("\n".join(["0\tbrain\t1", "1\tsalad\t5", "2\tsurgery\t6"]) + "\n")
+
+    with self.test_session():
+      default_value = -1
+      key_index = 1
+      value_index = 2
+
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(vocabulary_file, dtypes.string,
+                                         key_index, dtypes.int64, value_index),
+          default_value)
+      table.init.run()
+
+      input_string = constant_op.constant(["brain", "salad", "surgery"])
+      output = table.lookup(input_string)
+
+      result = output.eval()
+      self.assertAllEqual([1, 5, 6], result)
+
+  def testInvalidDataTypeInMultiColumn(self):
+    vocabulary_file = os.path.join(self.get_temp_dir(), "three_columns.txt")
+    with open(vocabulary_file, "w") as f:
+      f.write("\n".join(["0\tbrain\t1", "1\tsalad\t5", "2\tsurgery\t6"]) + "\n")
+
+    with self.test_session():
+      default_value = -1
+      key_index = 2
+      value_index = 1
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(vocabulary_file, dtypes.string,
+                                         key_index, dtypes.int64, value_index),
+          default_value)
+      with self.assertRaisesOpError("is not a valid"):
+        table.init.run()
+
+  def testInvalidDataType(self):
+    vocabulary_file = self._createVocabFile("one_column_3.txt")
+
+    with self.test_session():
+      default_value = "UNK"
+      key_index = lookup_ops.TextFileIndex.WHOLE_LINE
+      value_index = lookup_ops.TextFileIndex.LINE_NUMBER
+
+      with self.assertRaises(ValueError):
+        lookup_ops.HashTable(
+            lookup_ops.TextFileInitializer(vocabulary_file, dtypes.int64,
+                                           key_index, dtypes.string,
+                                           value_index), default_value)
+
+  def testInvalidIndex(self):
+    vocabulary_file = self._createVocabFile("one_column_4.txt")
+    with self.test_session():
+      default_value = -1
+      key_index = 1  # second column of the line
+      value_index = lookup_ops.TextFileIndex.LINE_NUMBER
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(vocabulary_file, dtypes.string,
+                                         key_index, dtypes.int64, value_index),
+          default_value)
+
+      with self.assertRaisesOpError("Invalid number of columns"):
+        table.init.run()
+
+  def testInitializeSameTableWithMultipleNodes(self):
+    vocabulary_file = self._createVocabFile("one_column_5.txt")
+
+    with self.test_session() as sess:
+      shared_name = "shared-one-columm"
+      default_value = -1
+      table1 = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(vocabulary_file, dtypes.string,
+                                         lookup_ops.TextFileIndex.WHOLE_LINE,
+                                         dtypes.int64,
+                                         lookup_ops.TextFileIndex.LINE_NUMBER),
+          default_value,
+          shared_name=shared_name)
+      table2 = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(vocabulary_file, dtypes.string,
+                                         lookup_ops.TextFileIndex.WHOLE_LINE,
+                                         dtypes.int64,
+                                         lookup_ops.TextFileIndex.LINE_NUMBER),
+          default_value,
+          shared_name=shared_name)
+      table3 = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(vocabulary_file, dtypes.string,
+                                         lookup_ops.TextFileIndex.WHOLE_LINE,
+                                         dtypes.int64,
+                                         lookup_ops.TextFileIndex.LINE_NUMBER),
+          default_value,
+          shared_name=shared_name)
+
+      lookup_ops.tables_initializer().run()
+
+      input_string = constant_op.constant(["brain", "salad", "tank"])
+
+      output1 = table1.lookup(input_string)
+      output2 = table2.lookup(input_string)
+      output3 = table3.lookup(input_string)
+
+      out1, out2, out3 = sess.run([output1, output2, output3])
+      self.assertAllEqual([0, 1, -1], out1)
+      self.assertAllEqual([0, 1, -1], out2)
+      self.assertAllEqual([0, 1, -1], out3)
+
+  def testInitializeTableWithNoFilename(self):
+    with self.test_session():
+      default_value = -1
+      with self.assertRaises(ValueError):
+        lookup_ops.HashTable(
+            lookup_ops.TextFileInitializer(
+                "", dtypes.string, lookup_ops.TextFileIndex.WHOLE_LINE,
+                dtypes.int64, lookup_ops.TextFileIndex.LINE_NUMBER),
+            default_value)
+
+  def testInitializeWithVocabSize(self):
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      vocabulary_file1 = self._createVocabFile("one_column6.txt")
+      table1 = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(
+              vocabulary_file1,
+              dtypes.string,
+              lookup_ops.TextFileIndex.WHOLE_LINE,
+              dtypes.int64,
+              lookup_ops.TextFileIndex.LINE_NUMBER,
+              vocab_size=vocab_size), default_value)
+
+      # Initialize from file.
+      table1.init.run()
+      self.assertEquals(vocab_size, table1.size().eval())
+
+      vocabulary_file2 = self._createVocabFile("one_column7.txt")
+      vocab_size = 5
+      table2 = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(
+              vocabulary_file2,
+              dtypes.string,
+              lookup_ops.TextFileIndex.WHOLE_LINE,
+              dtypes.int64,
+              lookup_ops.TextFileIndex.LINE_NUMBER,
+              vocab_size=vocab_size), default_value)
+      with self.assertRaisesOpError("Invalid vocab_size"):
+        table2.init.run()
+
+      vocab_size = 1
+      vocabulary_file3 = self._createVocabFile("one_column3.txt")
+      table3 = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(
+              vocabulary_file3,
+              dtypes.string,
+              lookup_ops.TextFileIndex.WHOLE_LINE,
+              dtypes.int64,
+              lookup_ops.TextFileIndex.LINE_NUMBER,
+              vocab_size=vocab_size), default_value)
+
+      # Smaller vocab size reads only vocab_size records.
+      table3.init.run()
+      self.assertEquals(vocab_size, table3.size().eval())
+
+  def testFeedVocabularyName(self):
+    vocabulary_file = self._createVocabFile("feed_vocabulary.txt")
+
+    with self.test_session():
+      default_value = -1
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileInitializer(
+              "old_file.txt", dtypes.string,
+              lookup_ops.TextFileIndex.WHOLE_LINE, dtypes.int64,
+              lookup_ops.TextFileIndex.LINE_NUMBER), default_value)
+
+      # Initialize with non existing file (old_file.txt) should fail.
+      # TODO(yleon): Update message, which might change per FileSystem.
+      with self.assertRaisesOpError("old_file.txt"):
+        table.init.run()
+
+      # Initialize the model feeding the vocabulary file.
+      filenames = ops.get_collection(ops.GraphKeys.ASSET_FILEPATHS)
+      table.init.run(feed_dict={filenames[0]: vocabulary_file})
+
+      input_string = constant_op.constant(["brain", "salad", "tank"])
+      output = table.lookup(input_string)
+
+      result = output.eval()
+      self.assertAllEqual([0, 1, -1], result)
+
+  def testInvalidFilenames(self):
+    vocabulary_file = self._createVocabFile("filename_shape.txt")
+
+    with self.test_session():
+      default_value = -1
+
+      # Invalid data type
+      other_type = constant_op.constant(1)
+      with self.assertRaises(ValueError):
+        lookup_ops.HashTable(
+            lookup_ops.TextFileInitializer(
+                other_type, dtypes.string, lookup_ops.TextFileIndex.WHOLE_LINE,
+                dtypes.int64, lookup_ops.TextFileIndex.LINE_NUMBER),
+            default_value)
+
+      # Non-scalar filename
+      filenames = constant_op.constant([vocabulary_file, vocabulary_file])
+      with self.assertRaises(ValueError):
+        lookup_ops.HashTable(
+            lookup_ops.TextFileInitializer(
+                filenames, dtypes.string, lookup_ops.TextFileIndex.WHOLE_LINE,
+                dtypes.int64, lookup_ops.TextFileIndex.LINE_NUMBER),
+            default_value)
+
+  def testIdToStringTable(self):
+    vocab_file = self._createVocabFile("feat_to_id_1.txt")
+    with self.test_session():
+      default_value = "UNK"
+      vocab_size = 3
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileStringTableInitializer(
+              vocab_file, vocab_size=vocab_size), default_value)
+
+      table.init.run()
+
+      input_values = constant_op.constant([0, 1, 2, 3], dtypes.int64)
+
+      out = table.lookup(input_values)
+      self.assertAllEqual([b"brain", b"salad", b"surgery", b"UNK"], out.eval())
+      self.assertEquals(vocab_size, table.size().eval())
+
+  def testStringToIdTable(self):
+    vocab_file = self._createVocabFile("feat_to_id_2.txt")
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileIdTableInitializer(
+              vocab_file, vocab_size=vocab_size), default_value)
+      table.init.run()
+
+      input_string = constant_op.constant(["brain", "salad", "surgery", "UNK"])
+
+      out = table.lookup(input_string)
+      self.assertAllEqual([0, 1, 2, -1], out.eval())
+      self.assertEquals(vocab_size, table.size().eval())
+
+  def testInt64ToIdTable(self):
+    vocab_file = self._createVocabFile(
+        "feat_to_id_3.txt", values=("42", "1", "-1000"))
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      table = lookup_ops.HashTable(
+          lookup_ops.TextFileIdTableInitializer(
+              vocab_file, vocab_size=vocab_size, key_dtype=dtypes.int64),
+          default_value)
+      table.init.run()
+
+      out = table.lookup(
+          constant_op.constant((42, 1, -1000, 11), dtype=dtypes.int64))
+      self.assertAllEqual((0, 1, 2, -1), out.eval())
+      self.assertEquals(vocab_size, table.size().eval())
+
+
+class IdTableWithHashBucketsTest(test.TestCase):
+
+  def _createVocabFile(self, basename, values=("brain", "salad", "surgery")):
+    vocabulary_file = os.path.join(self.get_temp_dir(), basename)
+    with open(vocabulary_file, "w") as f:
+      f.write("\n".join(values) + "\n")
+    return vocabulary_file
+
+  def testStringIdTableWithHashBuckets(self):
+    vocab_file = self._createVocabFile("feat_to_id_1.txt")
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      oov_buckets = 1
+      table = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(
+                  vocab_file, vocab_size=vocab_size), default_value),
+          oov_buckets)
+
+      table.init.run()
+
+      input_string = constant_op.constant(["brain", "salad", "surgery", "UNK"])
+
+      out = table.lookup(input_string)
+      self.assertAllEqual([0, 1, 2, 3], out.eval())
+      self.assertEquals(vocab_size + oov_buckets, table.size().eval())
+
+  def testInt32IdTableWithHashBuckets(self):
+    vocab_file = self._createVocabFile("feat_to_id_2.txt", ("42", "1", "-1000"))
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      oov_buckets = 1
+      table = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(
+                  vocab_file, vocab_size=vocab_size, key_dtype=dtypes.int64),
+              default_value),
+          oov_buckets,
+          key_dtype=dtypes.int32)
+
+      table.init.run()
+
+      values = constant_op.constant((42, 1, -1000, 11), dtype=dtypes.int32)
+
+      out = table.lookup(values)
+      self.assertAllEqual([0, 1, 2, 3], out.eval())
+      self.assertEquals(vocab_size + oov_buckets, table.size().eval())
+
+  def testInt64IdTableWithHashBuckets(self):
+    vocab_file = self._createVocabFile("feat_to_id_3.txt", ("42", "1", "-1000"))
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      oov_buckets = 1
+      table = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(
+                  vocab_file, vocab_size=vocab_size, key_dtype=dtypes.int64),
+              default_value), oov_buckets)
+
+      table.init.run()
+
+      values = constant_op.constant((42, 1, -1000, 11), dtype=dtypes.int64)
+
+      out = table.lookup(values)
+      self.assertAllEqual([0, 1, 2, 3], out.eval())
+      self.assertEquals(vocab_size + oov_buckets, table.size().eval())
+
+  def testStringIdTableWithOnlyHashBucket(self):
+    with self.test_session():
+      oov_buckets = 5
+
+      # Set a table that only uses hash buckets, for each input value returns
+      # an id calculated by fingerprint("input") mod oov_buckets.
+      table = lookup_ops.IdTableWithHashBuckets(None, oov_buckets)
+      table.init.run()
+
+      values = constant_op.constant(("brain", "salad", "surgery"))
+
+      out = table.lookup(values)
+      self.assertAllEqual(
+          [
+              3,  # fingerprint("brain") mod 5.
+              1,  # fingerprint("salad") mod 5.
+              4  # fingerprint("surgery") mod 5
+          ],
+          out.eval())
+      self.assertEquals(oov_buckets, table.size().eval())
+
+  def testInt32IdTableWithOnlyHashBucket(self):
+    with self.test_session():
+      oov_buckets = 5
+
+      # Set a table that only uses hash buckets, for each input value returns
+      # an id calculated by fingerprint("input") mod oov_buckets.
+      table = lookup_ops.IdTableWithHashBuckets(
+          None, oov_buckets, key_dtype=dtypes.int32)
+      table.init.run()
+
+      input_string = constant_op.constant([42, 1, -1000], dtype=dtypes.int32)
+
+      out = table.lookup(input_string)
+      self.assertAllEqual(
+          [
+              1,  # fingerprint("42") mod 5.
+              4,  # fingerprint("1") mod 5.
+              2  # fingerprint("-1000") mod 5
+          ],
+          out.eval())
+      self.assertEquals(oov_buckets, table.size().eval())
+
+  def testFloat64IdTableWithOnlyHashBucket(self):
+    with self.test_session():
+      with self.assertRaisesRegexp(TypeError, "Invalid key_dtype"):
+        lookup_ops.IdTableWithHashBuckets(
+            None, num_oov_buckets=5, key_dtype=dtypes.float64)
+
+  def testBoolIdTableWithOnlyHashBucket(self):
+    with self.test_session():
+      with self.assertRaisesRegexp(TypeError, "Invalid key_dtype"):
+        lookup_ops.IdTableWithHashBuckets(
+            None, num_oov_buckets=5, key_dtype=dtypes.bool)
+
+  def testIdTableWithHashBucketsWithMultipleInitializers(self):
+    vocab_file = self._createVocabFile("feat_to_id_4.txt")
+    with self.test_session() as sess:
+      default_value = -1
+      vocab_size = 3
+      oov_buckets = 3
+
+      vocab_table = lookup_ops.HashTable(
+          lookup_ops.TextFileIdTableInitializer(
+              vocab_file, vocab_size=vocab_size), default_value)
+      table1 = lookup_ops.IdTableWithHashBuckets(
+          vocab_table,
+          oov_buckets,
+          hasher_spec=lookup_ops.FastHashSpec,
+          name="table1")
+
+      table2 = lookup_ops.IdTableWithHashBuckets(
+          vocab_table,
+          oov_buckets,
+          hasher_spec=lookup_ops.StrongHashSpec((1, 2)),
+          name="table2")
+
+      lookup_ops.tables_initializer().run()
+
+      input_string = constant_op.constant(
+          ["fruit", "brain", "salad", "surgery", "UNK"])
+
+      out1 = table1.lookup(input_string)
+      out2 = table2.lookup(input_string)
+
+      out1, out2 = sess.run([out1, out2])
+      self.assertAllEqual([5, 0, 1, 2, 5], out1)
+      self.assertAllEqual([5, 0, 1, 2, 3], out2)
+      self.assertEquals(vocab_size + oov_buckets, table1.size().eval())
+      self.assertEquals(vocab_size + oov_buckets, table2.size().eval())
+      test_util.assert_ops_in_graph({
+          "table1_Lookup/hash_bucket": "StringToHashBucketFast",
+          "table2_Lookup/hash_bucket": "StringToHashBucketStrong",
+      }, sess.graph)
+
+  def testIdTableWithHashBucketsInitializationAcrossSessions(self):
+    vocab_file = self._createVocabFile("feat_to_id_5.txt")
+    shared_name = "across-sessions"
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      oov_buckets = 1
+      table1 = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(
+                  vocab_file, vocab_size=vocab_size),
+              default_value,
+              shared_name=shared_name), oov_buckets)
+
+      table1.init.run()
+
+      input_string_1 = constant_op.constant(
+          ["brain", "salad", "surgery", "UNK"])
+
+      out1 = table1.lookup(input_string_1)
+
+      self.assertAllEqual([0, 1, 2, 3], out1.eval())
+      self.assertEquals(vocab_size + oov_buckets, table1.size().eval())
+
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      oov_buckets = 1
+
+      # Underlying lookup table already initialized in previous session.
+      # No need to call table2.init.run()
+      table2 = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(
+                  vocab_file, vocab_size=vocab_size),
+              default_value,
+              shared_name=shared_name), oov_buckets)
+
+      input_string_2 = constant_op.constant(["fruit", "salad", "UNK"])
+
+      out2 = table2.lookup(input_string_2)
+
+      self.assertAllEqual([3, 1, 3], out2.eval())
+      self.assertEquals(vocab_size + oov_buckets, table2.size().eval())
+
+  def testIdTableWithHashBucketsWithMultipleInitializersDifferentDefault(self):
+    vocab_file = self._createVocabFile("feat_to_id_6.txt")
+    with self.test_session() as sess:
+      default_value1 = -1
+      vocab_size = 3
+      oov_buckets = 0
+      table1 = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(
+                  vocab_file, vocab_size=vocab_size), default_value1),
+          oov_buckets)
+
+      default_value2 = -2
+      table2 = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(
+                  vocab_file, vocab_size=vocab_size), default_value2),
+          oov_buckets)
+
+      lookup_ops.tables_initializer().run()
+
+      input_string_1 = constant_op.constant(
+          ["brain", "salad", "surgery", "UNK"])
+      input_string_2 = constant_op.constant(["fruit", "salad", "UNK"])
+
+      out1 = table1.lookup(input_string_1)
+      out2 = table2.lookup(input_string_2)
+
+      out1, out2 = sess.run([out1, out2])
+      self.assertAllEqual([0, 1, 2, -1], out1)
+      self.assertAllEqual([-2, 1, -2], out2)
+      self.assertEquals(vocab_size + oov_buckets, table1.size().eval())
+      self.assertEquals(vocab_size + oov_buckets, table2.size().eval())
+
+  def testSparseTensor(self):
+    vocab_file = self._createVocabFile("feat_to_id_7.txt")
+    input_indices = [[0, 0], [0, 1], [2, 0], [2, 2], [3, 0]]
+    input_shape = [4, 4]
+    with self.test_session() as sess:
+      sp_features = sparse_tensor.SparseTensor(
+          constant_op.constant(input_indices, dtypes.int64),
+          constant_op.constant(["brain", "salad", "brain", "surgery", "tarkus"],
+                               dtypes.string),
+          constant_op.constant(input_shape, dtypes.int64))
+
+      table = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.TextFileIdTableInitializer(vocab_file, vocab_size=3),
+              -1), 1)
+      table.init.run()
+
+      sp_ids = table.lookup(sp_features)
+
+      self.assertAllEqual([5], sp_ids.values._shape_as_list())
+
+      sp_ids_ind, sp_ids_val, sp_ids_shape = sess.run(
+          [sp_ids.indices, sp_ids.values, sp_ids.dense_shape])
+
+      self.assertAllEqual(input_indices, sp_ids_ind)
+      self.assertAllEqual([0, 1, 0, 2, 3], sp_ids_val)
+      self.assertAllEqual(input_shape, sp_ids_shape)
+
+  def testInt32SparseTensor(self):
+    input_indices = [[0, 0], [0, 1], [2, 0], [2, 2], [3, 0]]
+    input_shape = [4, 4]
+    with self.test_session() as sess:
+      sp_features = sparse_tensor.SparseTensor(
+          constant_op.constant(input_indices, dtypes.int64),
+          constant_op.constant([42, 1, 42, -1000, 11], dtypes.int32),
+          constant_op.constant(input_shape, dtypes.int64))
+
+      table = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.KeyValueTensorInitializer(
+                  (42, 1, -1000), (0, 1, 2), dtypes.int64, dtypes.int64), -1),
+          1,
+          key_dtype=dtypes.int32)
+      table.init.run()
+
+      sp_ids = table.lookup(sp_features)
+
+      self.assertAllEqual([5], sp_ids.values._shape_as_list())
+
+      sp_ids_ind, sp_ids_val, sp_ids_shape = sess.run(
+          [sp_ids.indices, sp_ids.values, sp_ids.dense_shape])
+
+      self.assertAllEqual(input_indices, sp_ids_ind)
+      self.assertAllEqual([0, 1, 0, 2, 3], sp_ids_val)
+      self.assertAllEqual(input_shape, sp_ids_shape)
+
+  def testInt64SparseTensor(self):
+    input_indices = [[0, 0], [0, 1], [2, 0], [2, 2], [3, 0]]
+    input_shape = [4, 4]
+    with self.test_session() as sess:
+      sp_features = sparse_tensor.SparseTensor(
+          constant_op.constant(input_indices, dtypes.int64),
+          constant_op.constant([42, 1, 42, -1000, 11], dtypes.int64),
+          constant_op.constant(input_shape, dtypes.int64))
+
+      table = lookup_ops.IdTableWithHashBuckets(
+          lookup_ops.HashTable(
+              lookup_ops.KeyValueTensorInitializer(
+                  (42, 1, -1000), (0, 1, 2), dtypes.int64, dtypes.int64), -1),
+          1,
+          key_dtype=dtypes.int64)
+      table.init.run()
+
+      sp_ids = table.lookup(sp_features)
+
+      self.assertAllEqual([5], sp_ids.values._shape_as_list())
+
+      sp_ids_ind, sp_ids_val, sp_ids_shape = sess.run(
+          [sp_ids.indices, sp_ids.values, sp_ids.dense_shape])
+
+      self.assertAllEqual(input_indices, sp_ids_ind)
+      self.assertAllEqual([0, 1, 0, 2, 3], sp_ids_val)
+      self.assertAllEqual(input_shape, sp_ids_shape)
+
+  def testIdTableWithHashBucketsWithInvalidHashers(self):
+    vocab_file = self._createVocabFile("feat_to_id_4.txt")
+    with self.test_session():
+      default_value = -1
+      vocab_size = 3
+      oov_buckets = 1
+      lookup_table = lookup_ops.HashTable(
+          lookup_ops.TextFileIdTableInitializer(
+              vocab_file, vocab_size=vocab_size), default_value)
+
+      with self.assertRaises(TypeError):
+        lookup_ops.IdTableWithHashBuckets(
+            lookup_table, oov_buckets, hasher_spec=1)
+
+      table = lookup_ops.IdTableWithHashBuckets(
+          lookup_table,
+          oov_buckets,
+          hasher_spec=lookup_ops.HasherSpec("my-awesome-hash", None))
+
+      input_string = constant_op.constant(["brain", "salad", "surgery", "UNK"])
+
+      with self.assertRaises(ValueError):
+        table.lookup(input_string)
+
+      with self.assertRaises(ValueError):
+        table = lookup_ops.IdTableWithHashBuckets(
+            lookup_table,
+            oov_buckets,
+            hasher_spec=lookup_ops.StrongHashSpec([]))
+
+      with self.assertRaises(ValueError):
+        table = lookup_ops.IdTableWithHashBuckets(
+            lookup_table,
+            oov_buckets,
+            hasher_spec=lookup_ops.StrongHashSpec([1, 2, 3]))
+
+      with self.assertRaises(TypeError):
+        table = lookup_ops.IdTableWithHashBuckets(
+            lookup_table,
+            oov_buckets,
+            hasher_spec=lookup_ops.StrongHashSpec([None, 2]))
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/python/ops/lookup_ops.py b/tensorflow/python/ops/lookup_ops.py
index 54dba9e38e..82277ebacc 100644
--- a/tensorflow/python/ops/lookup_ops.py
+++ b/tensorflow/python/ops/lookup_ops.py
@@ -12,21 +12,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #==============================================================================
-"""Data Flow Operations."""
+"""Lookup operations."""
 # pylint: disable=g-bad-name
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
+import functools
+
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import gen_lookup_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import string_ops
 # go/tf-wildcard-import
 # pylint: disable=wildcard-import
 from tensorflow.python.ops.gen_lookup_ops import *
 # pylint: enable=wildcard-import
+from tensorflow.python.util import compat
 from tensorflow.python.util.deprecation import deprecated
 
 
+# TODO(yleon): Remove this function.
 @deprecated("2017-03-02", "Use `tf.tables_initializer` instead.")
 def initialize_all_tables(name="init_all_tables"):
   """Returns an Op that initializes all tables of the default graph.
@@ -57,6 +69,1132 @@ def tables_initializer(name="init_all_tables"):
   return control_flow_ops.no_op(name=name)
 
 
+def _check_table_dtypes(table, key_dtype, value_dtype):
+  """Check that the given key_dtype and value_dtype matches the table dtypes.
+
+  Args:
+    table: The table to check types against to.
+    key_dtype: The key data type to check.
+    value_dtype: The value data type to check.
+
+  Raises:
+    TypeError: when 'key_dtype' or 'value_dtype' doesn't match the table data
+      types.
+  """
+  if key_dtype != table.key_dtype:
+    raise TypeError("Invalid key dtype, expected %s but got %s." %
+                    (table.key_dtype, key_dtype))
+  if value_dtype != table.value_dtype:
+    raise TypeError("Invalid value dtype, expected %s but got %s." %
+                    (table.value_dtype, value_dtype))
+
+
+class LookupInterface(object):
+  """Represent a lookup table that persists across different steps."""
+
+  def __init__(self, key_dtype, value_dtype, name):
+    """Construct a lookup table interface.
+
+    Args:
+      key_dtype: The table key type.
+      value_dtype: The table value type.
+      name: A name for the operation (optional).
+    """
+    self._key_dtype = dtypes.as_dtype(key_dtype)
+    self._value_dtype = dtypes.as_dtype(value_dtype)
+    self._name = name
+
+  @property
+  def key_dtype(self):
+    """The table key dtype."""
+    return self._key_dtype
+
+  @property
+  def value_dtype(self):
+    """The table value dtype."""
+    return self._value_dtype
+
+  @property
+  def name(self):
+    """The name of the table."""
+    return self._name
+
+  @property
+  def init(self):
+    """The table initialization op."""
+    raise NotImplementedError
+
+  def size(self, name=None):
+    """Compute the number of elements in this table."""
+    raise NotImplementedError
+
+  def lookup(self, keys, name=None):
+    """Looks up `keys` in a table, outputs the corresponding values."""
+    raise NotImplementedError
+
+
+class InitializableLookupTableBase(LookupInterface):
+  """Initializable lookup table interface.
+
+  An initializable lookup tables persist across different steps.
+  """
+
+  def __init__(self, table_ref, default_value, initializer):
+    """Construct a table object from a table reference.
+
+    If requires a table initializer object (subclass of `TableInitializerBase`).
+    It provides the table key and value types, as well as the op to initialize
+    the table. The caller is responsible to execute the initialization op.
+
+    Args:
+      table_ref: The table reference, i.e. the output of the lookup table ops.
+      default_value: The value to use if a key is missing in the table.
+      initializer: The table initializer to use.
+    """
+    super(InitializableLookupTableBase,
+          self).__init__(initializer.key_dtype, initializer.value_dtype,
+                         table_ref.op.name.split("/")[-1])
+    self._table_ref = table_ref
+    self._default_value = ops.convert_to_tensor(
+        default_value, dtype=self._value_dtype)
+    self._default_value.get_shape().merge_with(tensor_shape.scalar())
+    self._init = initializer.initialize(self)
+
+  @property
+  def table_ref(self):
+    """Get the underlying table reference."""
+    return self._table_ref
+
+  @property
+  def default_value(self):
+    """The default value of the table."""
+    return self._default_value
+
+  @property
+  def init(self):
+    """The table initialization op."""
+    return self._init
+
+  def size(self, name=None):
+    """Compute the number of elements in this table.
+
+    Args:
+      name: A name for the operation (optional).
+
+    Returns:
+      A scalar tensor containing the number of elements in this table.
+    """
+    with ops.name_scope(name, "%s_Size" % self._name,
+                        [self._table_ref]) as scope:
+      # pylint: disable=protected-access
+      return gen_lookup_ops._lookup_table_size_v2(self._table_ref, name=scope)
+      # pylint: enable=protected-access
+
+  def lookup(self, keys, name=None):
+    """Looks up `keys` in a table, outputs the corresponding values.
+
+    The `default_value` is used for keys not present in the table.
+
+    Args:
+      keys: Keys to look up. May be either a `SparseTensor` or dense `Tensor`.
+      name: A name for the operation (optional).
+
+    Returns:
+      A `SparseTensor` if keys are sparse, otherwise a dense `Tensor`.
+
+    Raises:
+      TypeError: when `keys` or `default_value` doesn't match the table data
+        types.
+    """
+    key_tensor = keys
+    if isinstance(keys, sparse_tensor.SparseTensor):
+      key_tensor = keys.values
+
+    if keys.dtype != self._key_dtype:
+      raise TypeError("Signature mismatch. Keys must be dtype %s, got %s." %
+                      (self._key_dtype, keys.dtype))
+
+    with ops.name_scope(name, "%s_Lookup" % self._name,
+                        (self._table_ref, key_tensor,
+                         self._default_value)) as scope:
+      # pylint: disable=protected-access
+      values = gen_lookup_ops._lookup_table_find_v2(
+          self._table_ref, key_tensor, self._default_value, name=scope)
+      # pylint: enable=protected-access
+
+    values.set_shape(key_tensor.get_shape())
+    if isinstance(keys, sparse_tensor.SparseTensor):
+      return sparse_tensor.SparseTensor(keys.indices, values, keys.dense_shape)
+    else:
+      return values
+
+
+class HashTable(InitializableLookupTableBase):
+  """A generic hash table implementation.
+
+  Example usage:
+
+  ```python
+  table = tf.contrib.lookup.HashTable(
+      tf.contrib.lookup.KeyValueTensorInitializer(keys, values), -1)
+  out = table.lookup(input_tensor).
+  table.init.run()
+  print out.eval()
+  ```
+  """
+
+  def __init__(self, initializer, default_value, shared_name=None, name=None):
+    """Creates a non-initialized `HashTable` object.
+
+    Creates a table, the type of its keys and values are specified by the
+    initializer.
+    Before using the table you will have to initialize it. After initialization
+    the table will be immutable.
+
+    Args:
+      initializer: The table initializer to use. See `HashTable` kernel for
+        supported key and value types.
+      default_value: The value to use if a key is missing in the table.
+      shared_name: If non-empty, this table will be shared under
+        the given name across multiple sessions.
+      name: A name for the operation (optional).
+
+    Returns:
+      A `HashTable` object.
+    """
+    with ops.name_scope(name, "hash_table", (initializer,
+                                             default_value)) as scope:
+      # pylint: disable=protected-access
+      table_ref = gen_lookup_ops._hash_table_v2(
+          shared_name=shared_name,
+          key_dtype=initializer.key_dtype,
+          value_dtype=initializer.value_dtype,
+          name=scope)
+      # pylint: enable=protected-access
+
+      super(HashTable, self).__init__(table_ref, default_value, initializer)
+
+
+class TableInitializerBase(object):
+  """Base class for lookup table initializers."""
+
+  def __init__(self, key_dtype, value_dtype):
+    """Construct a table initializer object.
+
+    Args:
+      key_dtype: Type of the table keys.
+      value_dtype: Type of the table values.
+    """
+    self._key_dtype = dtypes.as_dtype(key_dtype)
+    self._value_dtype = dtypes.as_dtype(value_dtype)
+
+  @property
+  def key_dtype(self):
+    """The expected table key dtype."""
+    return self._key_dtype
+
+  @property
+  def value_dtype(self):
+    """The expected table value dtype."""
+    return self._value_dtype
+
+  def initialize(self, table):
+    """Returns the table initialization op."""
+    raise NotImplementedError
+
+
+class KeyValueTensorInitializer(TableInitializerBase):
+  """Table initializers given `keys` and `values` tensors."""
+
+  def __init__(self, keys, values, key_dtype=None, value_dtype=None, name=None):
+    """Constructs a table initializer object based on keys and values tensors.
+
+    Args:
+      keys: The tensor for the keys.
+      values: The tensor for the values.
+      key_dtype: The `keys` data type. Used when `keys` is a python array.
+      value_dtype: The `values` data type. Used when `values` is a python array.
+      name: A name for the operation (optional).
+    """
+    with ops.name_scope(name, "key_value_init", [keys, values]) as scope:
+      self._keys = ops.convert_to_tensor(keys, dtype=key_dtype, name="keys")
+      self._values = ops.convert_to_tensor(
+          values, dtype=value_dtype, name="values")
+      self._name = scope
+
+    super(KeyValueTensorInitializer, self).__init__(self._keys.dtype,
+                                                    self._values.dtype)
+
+  def initialize(self, table):
+    """Initializes the given `table` with `keys` and `values` tensors.
+
+    Args:
+      table: The table to initialize.
+
+    Returns:
+      The operation that initializes the table.
+
+    Raises:
+      TypeError: when the keys and values data types do not match the table
+      key and value data types.
+    """
+    _check_table_dtypes(table, self._keys.dtype, self._values.dtype)
+    with ops.name_scope(
+        self._name, values=(table.table_ref, self._keys,
+                            self._values)) as scope:
+      # pylint: disable=protected-access
+      init_op = gen_lookup_ops._initialize_table_v2(
+          table.table_ref, self._keys, self._values, name=scope)
+      # pylint: enable=protected-access
+    ops.add_to_collection(ops.GraphKeys.TABLE_INITIALIZERS, init_op)
+    return init_op
+
+
+class TextFileIndex(object):
+  WHOLE_LINE = -2
+  LINE_NUMBER = -1
+
+
+class TextFileInitializer(TableInitializerBase):
+  """Table initializers from a text file.
+
+  This initializer assigns one entry in the table for each line in the file.
+
+  The key and value type of the table to initialize is given by `key_dtype` and
+  `value_dtype`.
+
+  The key and value content to get from each line is specified by
+  the `key_index` and `value_index`.
+
+  * `TextFileIndex.LINE_NUMBER` means use the line number starting from zero,
+    expects data type int64.
+  * `TextFileIndex.WHOLE_LINE` means use the whole line content, expects data
+    type string.
+  * A value `>=0` means use the index (starting at zero) of the split line based
+      on `delimiter`.
+
+  For example if we have a file with the following content:
+
+  ```
+  emerson 10
+  lake 20
+  palmer 30
+  ```
+
+  The following snippet initializes a table with the first column as keys and
+  second column as values:
+
+  * `emerson -> 10`
+  * `lake -> 20`
+  * `palmer -> 30`
+
+  ```python
+  table = tf.contrib.lookup.HashTable(tf.contrib.lookup.TextFileInitializer(
+      "test.txt", tf.string, 0, tf.int64, 1, delimiter=" "), -1)
+  ...
+  table.init.run()
+  ```
+
+  Similarly to initialize the whole line as keys and the line number as values.
+
+  * `emerson 10 -> 0`
+  * `lake 20 -> 1`
+  * `palmer 30 -> 2`
+
+  ```python
+  table = tf.contrib.lookup.HashTable(tf.contrib.lookup.TextFileInitializer(
+      "test.txt", tf.string, tf.contrib.lookup.TextFileIndex.WHOLE_LINE,
+      tf.int64, tf.contrib.lookup.TextFileIndex.LINE_NUMBER, delimiter=" "), -1)
+  ...
+  table.init.run()
+  ```
+  """
+
+  def __init__(self,
+               filename,
+               key_dtype,
+               key_index,
+               value_dtype,
+               value_index,
+               vocab_size=None,
+               delimiter="\t",
+               name=None):
+    """Constructs a table initializer object to populate from a text file.
+
+    It generates one key-value pair per line. The type of table key and
+    value are specified by `key_dtype` and `value_dtype`, respectively.
+    Similarly the content of the key and value are specified by the key_index
+    and value_index.
+
+    - TextFileIndex.LINE_NUMBER means use the line number starting from zero,
+      expects data type int64.
+    - TextFileIndex.WHOLE_LINE means use the whole line content, expects data
+      type string.
+    - A value >=0 means use the index (starting at zero) of the split line based
+      on `delimiter`.
+
+    Args:
+      filename: The filename of the text file to be used for initialization.
+        The path must be accessible from wherever the graph is initialized
+        (eg. trainer or eval workers). The filename may be a scalar `Tensor`.
+      key_dtype: The `key` data type.
+      key_index: the index that represents information of a line to get the
+        table 'key' values from.
+      value_dtype: The `value` data type.
+      value_index: the index that represents information of a line to get the
+        table 'value' values from.'
+      vocab_size: The number of elements in the file, if known.
+      delimiter: The delimiter to separate fields in a line.
+      name: A name for the operation (optional).
+
+    Raises:
+      ValueError: when the filename is empty, or when the table key and value
+      data types do not match the expected data types.
+    """
+    if not isinstance(filename, ops.Tensor) and not filename:
+      raise ValueError("Filename required for %s." % name)
+
+    key_dtype = dtypes.as_dtype(key_dtype)
+    value_dtype = dtypes.as_dtype(value_dtype)
+
+    if key_index < -2:
+      raise ValueError("Invalid key index %s." % (key_index))
+
+    if key_index == TextFileIndex.LINE_NUMBER and key_dtype != dtypes.int64:
+      raise ValueError("Signature mismatch. Keys must be dtype %s, got %s." %
+                       (dtypes.int64, key_dtype))
+    if ((key_index == TextFileIndex.WHOLE_LINE) and
+        (not key_dtype.is_integer) and (key_dtype != dtypes.string)):
+      raise ValueError(
+          "Signature mismatch. Keys must be integer or string, got %s." %
+          key_dtype)
+    if value_index < -2:
+      raise ValueError("Invalid value index %s." % (value_index))
+
+    if value_index == TextFileIndex.LINE_NUMBER and value_dtype != dtypes.int64:
+      raise ValueError("Signature mismatch. Values must be dtype %s, got %s." %
+                       (dtypes.int64, value_dtype))
+    if value_index == TextFileIndex.WHOLE_LINE and value_dtype != dtypes.string:
+      raise ValueError("Signature mismatch. Values must be dtype %s, got %s." %
+                       (dtypes.string, value_dtype))
+
+    if (vocab_size is not None) and (vocab_size <= 0):
+      raise ValueError("Invalid vocab_size %s." % vocab_size)
+
+    self._filename = filename
+    self._key_index = key_index
+    self._value_index = value_index
+    self._vocab_size = vocab_size
+    self._delimiter = delimiter
+    self._name = name
+
+    super(TextFileInitializer, self).__init__(key_dtype, value_dtype)
+
+  def initialize(self, table):
+    """Initializes the table from a text file.
+
+    Args:
+      table: The table to be initialized.
+
+    Returns:
+      The operation that initializes the table.
+
+    Raises:
+      TypeError: when the keys and values data types do not match the table
+      key and value data types.
+    """
+    _check_table_dtypes(table, self.key_dtype, self.value_dtype)
+    with ops.name_scope(self._name, "text_file_init",
+                        (table.table_ref,)) as scope:
+      filename = ops.convert_to_tensor(
+          self._filename, dtypes.string, name="asset_filepath")
+      # pylint: disable=protected-access
+      init_op = gen_lookup_ops._initialize_table_from_text_file_v2(
+          table.table_ref,
+          filename,
+          self._key_index,
+          self._value_index,
+          -1 if self._vocab_size is None else self._vocab_size,
+          self._delimiter,
+          name=scope)
+      # pylint: enable=protected-access
+    ops.add_to_collection(ops.GraphKeys.TABLE_INITIALIZERS, init_op)
+    ops.add_to_collection(ops.GraphKeys.ASSET_FILEPATHS, filename)
+    return init_op
+
+
+class TextFileStringTableInitializer(TextFileInitializer):
+  """Table initializer for `int64` IDs to string tables from a text file."""
+
+  def __init__(self,
+               filename,
+               key_column_index=TextFileIndex.LINE_NUMBER,
+               value_column_index=TextFileIndex.WHOLE_LINE,
+               vocab_size=None,
+               delimiter="\t",
+               name="text_file_string_table_init"):
+    """Constructs an initializer for an id-to-string table from a text file.
+
+    It populates a table that its key and value types are int64 and string,
+    respectively. It generates one key-value pair per line.
+    The content of the key and value are specified by `key_column_index`
+    and `value_column_index`.
+
+    - TextFileIndex.LINE_NUMBER means use the line number starting from zero,
+      expects data type int64.
+    - TextFileIndex.WHOLE_LINE means use the whole line content, expects data
+      type string.
+    - A value >=0 means use the index (starting at zero) of the split line based
+      on `delimiter`.
+
+    Args:
+      filename: The filename of the text file to be used for initialization.
+        The path must be accessible from wherever the graph is initialized
+        (eg. trainer or eval workers). The filename may be a scalar `Tensor`.
+      key_column_index: The column index from the text file to get the keys
+        from. The default is 0 that represents the whole line content.
+      value_column_index: The column index from the text file to get the
+        values from. The default is to use the line number, starting from zero.
+      vocab_size: The number of elements in the file, if known.
+      delimiter: The delimiter to separate fields in a line.
+      name: Optional name for the op.
+
+    Raises:
+      TypeError: when the filename is empty, or when the table key and value
+      data types do not match the expected data types.
+    """
+    super(TextFileStringTableInitializer, self).__init__(
+        filename,
+        dtypes.int64,
+        key_column_index,
+        dtypes.string,
+        value_column_index,
+        vocab_size=vocab_size,
+        delimiter=delimiter,
+        name=name)
+
+
+class TextFileIdTableInitializer(TextFileInitializer):
+  """Table initializer for string to `int64` IDs tables from a text file."""
+
+  def __init__(self,
+               filename,
+               key_column_index=TextFileIndex.WHOLE_LINE,
+               value_column_index=TextFileIndex.LINE_NUMBER,
+               vocab_size=None,
+               delimiter="\t",
+               name="text_file_id_table_init",
+               key_dtype=dtypes.string):
+    """Constructs an initializer for an string-to-id table from a text file.
+
+    It populates a table that its key and value types are string and int64,
+    respectively. It generates one key-value pair per line.
+    The content of the key and value are specified by the key_index
+    and value_index.
+
+    - TextFileIndex.LINE_NUMBER means use the line number starting from zero,
+      expects data type int64.
+    - TextFileIndex.WHOLE_LINE means use the whole line content, expects data
+      type string.
+    - A value >=0 means use the index (starting at zero) of the split line based
+      on `delimiter`.
+
+    Args:
+      filename: The filename of the text file to be used for initialization.
+        The path must be accessible from wherever the graph is initialized
+        (eg. trainer or eval workers). The filename may be a scalar `Tensor`.
+      key_column_index: The column index from the text file to get the `key`
+        values from. The default is to use the line number, starting from zero.
+      value_column_index: The column index from the text file ro get the `value`
+        values from. The default is 0 that represents the whole line content.
+      vocab_size: The number of elements in the file, if known.
+      delimiter: The delimiter to separate fields in a line.
+      name: Optional name for the op.
+      key_dtype: The `key` data type.
+
+    Raises:
+      TypeError: when the filename is empty, or when the table key and value
+      data types do not match the expected data types.
+    """
+    super(TextFileIdTableInitializer, self).__init__(
+        filename,
+        key_dtype,
+        key_column_index,
+        dtypes.int64,
+        value_column_index,
+        vocab_size=vocab_size,
+        delimiter=delimiter,
+        name=name)
+
+
+class HasherSpec(collections.namedtuple("HasherSpec", ["hasher", "key"])):
+  """A structure for the spec of the hashing function to use for hash buckets.
+
+  `hasher` is the name of the hashing function to use (eg. "fasthash",
+  "stronghash").
+  `key` is optional and specify the key to use for the hash function if
+  supported, currently only used by a strong hash.
+
+  Fields:
+    hasher: The hasher name to use.
+    key: The key to be used by the hashing function, if required.
+  """
+  __slots__ = ()
+
+
+FastHashSpec = HasherSpec("fasthash", None)  # pylint: disable=invalid-name
+
+
+class StrongHashSpec(HasherSpec):
+  """A structure to specify a key of the strong keyed hash spec.
+
+  The strong hash requires a `key`, which is a list of 2 unsigned integer
+  numbers. These should be non-zero; random numbers generated from random.org
+  would be a fine choice.
+
+  Fields:
+    key: The key to be used by the keyed hashing function.
+  """
+  __slots__ = ()
+
+  def __new__(cls, key):
+    if len(key) != 2:
+      raise ValueError("key must have size 2, got %s." % len(key))
+
+    if not isinstance(key[0], compat.integral_types) or not isinstance(
+        key[1], compat.integral_types):
+      raise TypeError("Invalid key %s. Must be unsigned integer values." % key)
+
+    return super(cls, StrongHashSpec).__new__(cls, "stronghash", key)
+
+
+def _as_string(tensor):
+  if dtypes.string == tensor.dtype.base_dtype:
+    return tensor
+  return string_ops.as_string(tensor)
+
+
+class IdTableWithHashBuckets(LookupInterface):
+  """String to Id table wrapper that assigns out-of-vocabulary keys to buckets.
+
+  For example, if an instance of `IdTableWithHashBuckets` is initialized with a
+  string-to-id table that maps:
+  - emerson -> 0
+  - lake -> 1
+  - palmer -> 2
+
+  The `IdTableWithHashBuckets` object will performs the following mapping:
+  - emerson -> 0
+  - lake -> 1
+  - palmer -> 2
+  - <other term> -> bucket id between 3 and 3 + num_oov_buckets, calculated by:
+    hash(<term>) % num_oov_buckets + vocab_size
+
+  If input_tensor is ["emerson", "lake", "palmer", "king", "crimson"],
+  the lookup result is [0, 1, 2, 4, 7]
+
+  If `table` is None, only out-of-vocabulary buckets are used.
+
+  Example usage:
+
+  ```python
+  num_oov_buckets = 3
+  input_tensor = tf.constant(["emerson", "lake", "palmer", "king", "crimnson"])
+  table = tf.IdTableWithHashBuckets(
+      tf.HashTable(tf.TextFileIdTableInitializer(filename), default_value),
+      num_oov_buckets)
+  out = table.lookup(input_tensor).
+  table.init.run()
+  print out.eval()
+  ```
+
+  The hash function used for generating out-of-vocabulary buckets ID is handled
+  by `hasher_spec`.
+  """
+
+  def __init__(self,
+               table,
+               num_oov_buckets,
+               hasher_spec=FastHashSpec,
+               name=None,
+               key_dtype=None):
+    """Construct a `IdTableWithHashBuckets` object.
+
+    Args:
+      table: Table that maps `tf.string` or `tf.int64` keys to `tf.int64` ids.
+      num_oov_buckets: Number of buckets to use for out-of-vocabulary keys.
+      hasher_spec: A `HasherSpec` to specify the hash function to use for
+        assignation of out-of-vocabulary buckets  (optional).
+      name: A name for the operation (optional).
+      key_dtype: Data type of keys passed to `lookup`. Defaults to
+        `table.key_dtype` if `table` is specified, otherwise `tf.string`.
+        Must be string or integer, and must be castable to `table.key_dtype`.
+
+    Raises:
+      ValueError: when `table` in None and `num_oov_buckets` is not positive.
+      TypeError: when `hasher_spec` is invalid.
+    """
+    # If a name ends with a '/' it is a "name scope", remove all trailing '/'
+    # characters to use as table name.
+    if name:
+      name = name.rstrip("/")
+    if table:
+      if key_dtype is None:
+        key_dtype = table.key_dtype
+      supported_table_key_dtypes = (dtypes.int64, dtypes.string)
+      if table.key_dtype not in supported_table_key_dtypes:
+        raise TypeError("Invalid key dtype, expected one of %s, but got %s." %
+                        (supported_table_key_dtypes, key_dtype))
+      if table.key_dtype.is_integer != key_dtype.is_integer:
+        raise TypeError("Invalid key dtype, expected %s but got %s." %
+                        ("integer" if key_dtype.is_integer else "non-integer",
+                         table.key_dtype))
+      if table.value_dtype != dtypes.int64:
+        raise TypeError("Invalid value dtype, expected %s but got %s." %
+                        (dtypes.int64, table.value_dtype))
+      self._table = table
+      name = name or self._table.name
+    else:
+      if num_oov_buckets <= 0:
+        raise ValueError("oov_buckets must be > 0 if no table is supplied.")
+      key_dtype = dtypes.string if key_dtype is None else key_dtype
+      self._table = None
+      name = name or "hash_bucket"
+    if (not key_dtype.is_integer) and (dtypes.string != key_dtype):
+      raise TypeError(
+          "Invalid key_dtype, expected integer or string, got %s." % key_dtype)
+    self._num_oov_buckets = num_oov_buckets
+
+    if not isinstance(hasher_spec, HasherSpec):
+      raise TypeError(
+          "hasher_spec must be of type HasherSpec, got %s" % hasher_spec)
+    self._hasher_spec = hasher_spec
+    super(IdTableWithHashBuckets, self).__init__(key_dtype, dtypes.int64,
+                                                 name.split("/")[-1])
+
+  @property
+  def init(self):
+    """The table initialization op."""
+    if self._table:
+      return self._table.init
+    with ops.name_scope(None, "init"):
+      return control_flow_ops.no_op()
+
+  def size(self, name=None):
+    """Compute the number of elements in this table."""
+    with ops.name_scope(name, "%s_Size" % self.name) as scope:
+      if self._table:
+        tsize = self._table.size(scope)
+      else:
+        tsize = ops.convert_to_tensor(0, dtype=dtypes.int64)
+      return tsize + self._num_oov_buckets
+
+  def _get_string_to_hash_bucket_fn(self, hasher_spec):
+    """Returns the string_to_hash_bucket op to use based on `hasher_spec`."""
+    if not isinstance(hasher_spec, HasherSpec):
+      raise TypeError("hasher_spec must be of type HasherSpec %s" % hasher_spec)
+    if hasher_spec.hasher == "fasthash":
+      return string_ops.string_to_hash_bucket_fast
+    if hasher_spec.hasher == "legacy":
+      return string_ops.string_to_hash_bucket
+    if hasher_spec.hasher == "stronghash":
+      return functools.partial(
+          string_ops.string_to_hash_bucket_strong, key=hasher_spec.key)
+    raise ValueError("Unknown hasher %s" % hasher_spec.hasher)
+
+  def lookup(self, keys, name=None):
+    """Looks up `keys` in the table, outputs the corresponding values.
+
+    It assigns out-of-vocabulary keys to buckets based in their hashes.
+
+    Args:
+      keys: Keys to look up. May be either a `SparseTensor` or dense `Tensor`.
+      name: Optional name for the op.
+
+    Returns:
+      A `SparseTensor` if keys are sparse, otherwise a dense `Tensor`.
+
+    Raises:
+      TypeError: when `keys` doesn't match the table key data type.
+    """
+    if keys.dtype != self._key_dtype:
+      raise TypeError("Signature mismatch. Keys must be dtype %s, got %s." %
+                      (self._key_dtype, keys.dtype))
+    values = keys
+    if isinstance(keys, sparse_tensor.SparseTensor):
+      values = keys.values
+    if self._table and (self._table.key_dtype.base_dtype == dtypes.int64):
+      values = math_ops.to_int64(values)
+
+    if self._num_oov_buckets == 0:
+      ids = self._table.lookup(values, name=name)
+    else:
+      # TODO(yleon): Consider moving this functionality to its own kernel.
+      with ops.name_scope(name, "%s_Lookup" % self.name) as scope:
+        str_to_hash_bucket = self._get_string_to_hash_bucket_fn(
+            self._hasher_spec)
+        buckets = str_to_hash_bucket(
+            _as_string(values),
+            num_buckets=self._num_oov_buckets,
+            name="hash_bucket")
+        if self._table:
+          ids = self._table.lookup(values)
+          buckets = math_ops.add(buckets, self._table.size())
+          is_id_non_default = math_ops.not_equal(ids, self._table.default_value)
+          ids = array_ops.where(is_id_non_default, ids, buckets, name=scope)
+        else:
+          ids = buckets
+    if isinstance(keys, sparse_tensor.SparseTensor):
+      return sparse_tensor.SparseTensor(keys.indices, ids, keys.dense_shape)
+    return ids
+
+
+def index_table_from_file(vocabulary_file=None,
+                          num_oov_buckets=0,
+                          vocab_size=None,
+                          default_value=-1,
+                          hasher_spec=FastHashSpec,
+                          key_dtype=dtypes.string,
+                          name=None):
+  """Returns a lookup table that converts a string tensor into int64 IDs.
+
+  This operation constructs a lookup table to convert tensor of strings into
+  int64 IDs. The mapping can be initialized from a vocabulary file specified in
+  `vocabulary_file`, where the whole line is the key and the zero-based line
+  number is the ID.
+
+  Any lookup of an out-of-vocabulary token will return a bucket ID based on its
+  hash if `num_oov_buckets` is greater than zero. Otherwise it is assigned the
+  `default_value`.
+  The bucket ID range is `[vocabulary size, vocabulary size + num_oov_buckets]`.
+
+  The underlying table must be initialized by calling
+  `tf.tables_initializer.run()` or `table.init.run()` once.
+
+  Sample Usages:
+
+  If we have a vocabulary file "test.txt" with the following content:
+
+  ```
+  emerson
+  lake
+  palmer
+  ```
+
+  ```python
+  features = tf.constant(["emerson", "lake", "and", "palmer"])
+  table = tf.contrib.lookup.index_table_from_file(
+      vocabulary_file="test.txt", num_oov_buckets=1)
+  ids = table.lookup(features)
+  ...
+  tf.tables_initializer().run()
+
+  ids.eval()  ==> [0, 1, 3, 2]  # where 3 is the out-of-vocabulary bucket
+  ```
+
+  Args:
+    vocabulary_file: The vocabulary filename.
+    num_oov_buckets: The number of out-of-vocabulary buckets.
+    vocab_size: Number of the elements in the vocabulary, if known.
+    default_value: The value to use for out-of-vocabulary feature values.
+      Defaults to -1.
+    hasher_spec: A `HasherSpec` to specify the hash function to use for
+      assignation of out-of-vocabulary buckets.
+    key_dtype: The `key` data type.
+    name: A name for this op (optional).
+
+  Returns:
+    The lookup table to map a `key_dtype` `Tensor` to index `int64` `Tensor`.
+
+  Raises:
+    ValueError: If `vocabulary_file` is not set.
+    ValueError: If `num_oov_buckets` is negative or `vocab_size` is not greater
+      than zero.
+  """
+  if not vocabulary_file:
+    raise ValueError("vocabulary_file must be specified.")
+  if num_oov_buckets < 0:
+    raise ValueError("num_oov_buckets must be greater or equal than 0, got %d."
+                     % num_oov_buckets)
+  if vocab_size is not None and vocab_size < 1:
+    raise ValueError("vocab_size must be greater than 0, got %d." % vocab_size)
+  if (not key_dtype.is_integer) and (dtypes.string != key_dtype.base_dtype):
+    raise TypeError("Only integer and string keys are supported.")
+
+  with ops.name_scope(name, "string_to_index") as feat_to_id_scope:
+    table = None
+    shared_name = ""
+    with ops.name_scope(None, "hash_table") as hash_table_scope:
+      if vocab_size:
+        # Keep the shared_name:
+        # <table_type>_<filename>_<vocab_size>_<key_index>_<value_index>
+        shared_name = "hash_table_%s_%d_%s_%s" % (vocabulary_file, vocab_size,
+                                                  TextFileIndex.WHOLE_LINE,
+                                                  TextFileIndex.LINE_NUMBER)
+      else:
+        # Keep the shared_name
+        # <table_type>_<filename>_<key_index>_<value_index>
+        shared_name = "hash_table_%s_%s_%s" % (vocabulary_file,
+                                               TextFileIndex.WHOLE_LINE,
+                                               TextFileIndex.LINE_NUMBER)
+      init = TextFileIdTableInitializer(
+          vocabulary_file,
+          vocab_size=vocab_size,
+          key_dtype=dtypes.int64 if key_dtype.is_integer else key_dtype,
+          name="table_init")
+
+      table = HashTable(
+          init, default_value, shared_name=shared_name, name=hash_table_scope)
+    if num_oov_buckets:
+      table = IdTableWithHashBuckets(
+          table,
+          num_oov_buckets=num_oov_buckets,
+          hasher_spec=hasher_spec,
+          name=feat_to_id_scope,
+          key_dtype=key_dtype)
+
+    return table
+
+
+def index_table_from_tensor(vocabulary_list,
+                            num_oov_buckets=0,
+                            default_value=-1,
+                            hasher_spec=FastHashSpec,
+                            dtype=dtypes.string,
+                            name=None):
+  """Returns a lookup table that converts a string tensor into int64 IDs.
+
+  This operation constructs a lookup table to convert tensor of strings into
+  int64 IDs. The mapping can be initialized from a string `vocabulary_list` 1-D
+  tensor where each element is a key and corresponding index within the tensor
+  is the value.
+
+  Any lookup of an out-of-vocabulary token will return a bucket ID based on its
+  hash if `num_oov_buckets` is greater than zero. Otherwise it is assigned the
+  `default_value`.
+  The bucket ID range is `[mapping size, mapping size + num_oov_buckets]`.
+
+  The underlying table must be initialized by calling
+  `tf.tables_initializer.run()` or `table.init.run()` once.
+
+  Elements in `mapping` cannot have duplicates, otherwise when executing the
+  table initializer op, it will throw a `FailedPreconditionError`.
+
+  Sample Usages:
+
+  ```python
+  vocabulary_list = t.constant(["emerson", "lake", "palmer")
+  table = tf.contrib.lookup.index_table_from_tensor(
+      vocabulary_list=vocabulary_list, num_oov_buckets=1, default_value=-1)
+  features = tf.constant(["emerson", "lake", "and", "palmer"])
+  ids = table.lookup(features)
+  ...
+  tf.tables_initializer().run()
+
+  ids.eval()  ==> [0, 1, 4, 2]
+  ```
+
+  Args:
+    vocabulary_list: A 1-D `Tensor` that specifies the mapping of keys to
+      indices. Thetype of this object must be castable to `dtype`.
+    num_oov_buckets: The number of out-of-vocabulary buckets.
+    default_value: The value to use for out-of-vocabulary feature values.
+      Defaults to -1.
+    hasher_spec: A `HasherSpec` to specify the hash function to use for
+      assignment of out-of-vocabulary buckets.
+    dtype: The type of values passed to `lookup`. Only string and integers are
+      supported.
+    name: A name for this op (optional).
+
+  Returns:
+    The lookup table to map an input `Tensor` to index `int64` `Tensor`.
+
+  Raises:
+    ValueError: If `mapping` is invalid.
+    ValueError: If `num_oov_buckets` is negative.
+  """
+  if vocabulary_list is None:
+    raise ValueError("vocabulary_list must be specified.")
+
+  if num_oov_buckets < 0:
+    raise ValueError("num_oov_buckets must be greater or equal than 0, got %d."
+                     % num_oov_buckets)
+
+  if (not dtype.is_integer) and (dtypes.string != dtype.base_dtype):
+    raise TypeError("Only integer and string keys are supported.")
+
+  with ops.name_scope(name, "string_to_index") as feat_to_id_scope:
+    keys = ops.convert_to_tensor(vocabulary_list)
+    if keys.dtype.is_integer != dtype.is_integer:
+      raise ValueError("Expected %s, got %s." %
+                       ("integer"
+                        if dtype.is_integer else "non-integer", keys.dtype))
+    if (not dtype.is_integer) and (keys.dtype.base_dtype != dtype):
+      raise ValueError("Expected %s, got %s." % (dtype, keys.dtype))
+    num_elements = array_ops.size(keys)
+    values = math_ops.to_int64(math_ops.range(num_elements))
+
+    shared_name = ""
+    with ops.name_scope(None, "hash_table") as hash_table_scope:
+      table_keys = math_ops.to_int64(keys) if keys.dtype.is_integer else keys
+      init = KeyValueTensorInitializer(
+          table_keys,
+          values,
+          table_keys.dtype.base_dtype,
+          dtypes.int64,
+          name="table_init")
+      table = HashTable(
+          init, default_value, shared_name=shared_name, name=hash_table_scope)
+    if num_oov_buckets:
+      table = IdTableWithHashBuckets(
+          table,
+          num_oov_buckets=num_oov_buckets,
+          hasher_spec=hasher_spec,
+          name=feat_to_id_scope,
+          key_dtype=dtype)
+
+    return table
+
+
+def index_to_string_table_from_file(vocabulary_file,
+                                    vocab_size=None,
+                                    default_value="UNK",
+                                    name=None):
+  """Returns a lookup table that maps a `Tensor` of indices into strings.
+
+  This operation constructs a lookup table to map int64 indices into string
+  values. The table is initialized from a vocabulary file specified in
+  `vocabulary_file`, where the whole line is the value and the
+  zero-based line number is the index.
+
+  Any input which does not have a corresponding index in the vocabulary file
+  (an out-of-vocabulary entry) is assigned the `default_value`
+
+  The underlying table must be initialized by calling
+  `tf.tables_initializer.run()` or `table.init.run()` once.
+
+  Sample Usages:
+
+  If we have a vocabulary file "test.txt" with the following content:
+
+  ```
+  emerson
+  lake
+  palmer
+  ```
+
+  ```python
+  indices = tf.constant([1, 5], tf.int64)
+  table = tf.contrib.lookup.index_to_string_table_from_file(
+      vocabulary_file="test.txt", default_value="UNKNOWN")
+  values = table.lookup(indices)
+  ...
+  tf.tables_initializer().run()
+
+  values.eval() ==> ["lake", "UNKNOWN"]
+  ```
+
+  Args:
+    vocabulary_file: The vocabulary filename.
+    vocab_size: Number of the elements in the vocabulary, if known.
+    default_value: The value to use for out-of-vocabulary indices.
+    name: A name for this op (optional).
+
+  Returns:
+    The lookup table to map a string values associated to a given index `int64`
+    `Tensors`.
+
+  Raises:
+    ValueError: when `vocabulary_file` is empty.
+    ValueError: when `vocab_size` is invalid.
+  """
+  if not vocabulary_file:
+    raise ValueError("vocabulary_file must be specified.")
+  if vocab_size is not None and vocab_size < 1:
+    raise ValueError("vocab_size must be greater than 0, got %d." % vocab_size)
+
+  with ops.name_scope(name, "index_to_string") as scope:
+    shared_name = ""
+    if vocab_size:
+      # Keep a shared_name
+      # <table_type>_<filename>_<vocab_size>_<key_index>_<value_index>
+      shared_name = "hash_table_%s_%d_%s_%s" % (vocabulary_file, vocab_size,
+                                                TextFileIndex.LINE_NUMBER,
+                                                TextFileIndex.WHOLE_LINE)
+    else:
+      # Keep a shared_name <table_type>_<filename>_<key_index>_<value_index>
+      shared_name = "hash_table_%s_%s_%s" % (vocabulary_file,
+                                             TextFileIndex.LINE_NUMBER,
+                                             TextFileIndex.WHOLE_LINE)
+    init = TextFileStringTableInitializer(
+        vocabulary_file, vocab_size=vocab_size, name="table_init")
+
+    # TODO(yleon): Use a more effienct structure.
+    return HashTable(init, default_value, shared_name=shared_name, name=scope)
+
+
+def index_to_string_table_from_tensor(vocabulary_list,
+                                      default_value="UNK",
+                                      name=None):
+  """Returns a lookup table that maps a `Tensor` of indices into strings.
+
+  This operation constructs a lookup table to map int64 indices into string
+  values. The mapping is initialized from a string `mapping` 1-D `Tensor` where
+  each element is a value and the corresponding index within the tensor is the
+  key.
+
+  Any input which does not have a corresponding index in 'mapping'
+  (an out-of-vocabulary entry) is assigned the `default_value`
+
+  The underlying table must be initialized by calling
+  `tf.tables_initializer.run()` or `table.init.run()` once.
+
+  Elements in `mapping` cannot have duplicates, otherwise when executing the
+  table initializer op, it will throw a `FailedPreconditionError`.
+
+  Sample Usages:
+
+  ```python
+  vocabulary_list = t.constant(["emerson", "lake", "palmer")
+  indices = tf.constant([1, 5], tf.int64)
+  table = tf.contrib.lookup.index_to_string_table_from_tensor(
+      vocabulary_list, default_value="UNKNOWN")
+  values = table.lookup(indices)
+  ...
+  tf.tables_initializer().run()
+
+  values.eval() ==> ["lake", "UNKNOWN"]
+  ```
+
+  Args:
+    vocabulary_list: A 1-D string `Tensor` that specifies the strings to map
+      from indices.
+    default_value: The value to use for out-of-vocabulary indices.
+    name: A name for this op (optional).
+
+  Returns:
+    The lookup table to map a string values associated to a given index `int64`
+    `Tensors`.
+
+  Raises:
+    ValueError: when `vocabulary_list` is not set.
+  """
+
+  if vocabulary_list is None:
+    raise ValueError("vocabulary_list must be specified.")
+
+  with ops.name_scope(name, "index_to_string") as scope:
+    vocabulary_list = ops.convert_to_tensor(vocabulary_list, dtypes.string)
+    num_elements = array_ops.size(vocabulary_list)
+    keys = math_ops.to_int64(math_ops.range(num_elements))
+
+    shared_name = ""
+    init = KeyValueTensorInitializer(
+        keys, vocabulary_list, dtypes.int64, dtypes.string, name="table_init")
+    # TODO(yleon): Use a more effienct structure.
+    return HashTable(init, default_value, shared_name=shared_name, name=scope)
+
+
 ops.NotDifferentiable("LookupTableFind")
 ops.NotDifferentiable("LookupTableFindV2")
 ops.NotDifferentiable("LookupTableInsert")
diff --git a/tensorflow/python/ops/standard_ops.py b/tensorflow/python/ops/standard_ops.py
index a39d28490c..a6b14f6f6f 100644
--- a/tensorflow/python/ops/standard_ops.py
+++ b/tensorflow/python/ops/standard_ops.py
@@ -57,7 +57,8 @@ from tensorflow.python.ops.io_ops import *
 from tensorflow.python.ops.linalg_ops import *
 from tensorflow.python.ops.logging_ops import Print
 from tensorflow.python.ops.logging_ops import get_summary_op
-from tensorflow.python.ops.lookup_ops import *
+from tensorflow.python.ops.lookup_ops import initialize_all_tables
+from tensorflow.python.ops.lookup_ops import tables_initializer
 from tensorflow.python.ops.math_ops import *
 from tensorflow.python.ops.numerics import *
 from tensorflow.python.ops.parsing_ops import *
-- 
GitLab


From 94807f281536d07562f4e281ef1663424cd1c3eb Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Mon, 8 May 2017 17:55:20 -0700
Subject: [PATCH 1137/1563] Fixed the evaluate call in ValidationMonitor to
 support core Estimator.

PiperOrigin-RevId: 155453312
---
 .../contrib/learn/python/learn/monitors.py    | 31 ++++++++--
 .../learn/python/learn/monitors_test.py       | 57 +++++++++++++++++++
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/monitors.py b/tensorflow/contrib/learn/python/learn/monitors.py
index 9f13392666..50ad988b87 100644
--- a/tensorflow/contrib/learn/python/learn/monitors.py
+++ b/tensorflow/contrib/learn/python/learn/monitors.py
@@ -47,6 +47,7 @@ from tensorflow.contrib.learn.python.learn import session_run_hook
 from tensorflow.contrib.learn.python.learn.summary_writer_cache import SummaryWriterCache
 from tensorflow.core.framework.summary_pb2 import Summary
 from tensorflow.core.util.event_pb2 import SessionLog
+from tensorflow.python.estimator import estimator as core_estimator
 from tensorflow.python.framework import ops
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.training import saver as saver_lib
@@ -634,6 +635,23 @@ class ValidationMonitor(EveryN):
     """Returns the best early stopping metric value found so far."""
     return self._best_value
 
+  def _evaluate_estimator(self):
+    if isinstance(self._estimator, core_estimator.Estimator):
+      if any((x is not None for x in
+              [self.x, self.y, self.batch_size, self.metrics])):
+        raise ValueError(
+            "tf.estimator.Estimator does not support following "
+            "arguments: x, y, batch_size, metrics. Should set as `None` "
+            "in ValidationMonitor")
+      return self._estimator.evaluate(
+          input_fn=self.input_fn, steps=self.eval_steps, hooks=self.hooks,
+          name=self.name)
+    else:
+      return self._estimator.evaluate(
+          x=self.x, y=self.y, input_fn=self.input_fn,
+          batch_size=self.batch_size, steps=self.eval_steps,
+          metrics=self.metrics, hooks=self.hooks, name=self.name)
+
   def every_n_step_end(self, step, outputs):
     super(ValidationMonitor, self).every_n_step_end(step, outputs)
     # TODO(mdan): The use of step below is probably misleading.
@@ -656,10 +674,7 @@ class ValidationMonitor(EveryN):
     self._latest_path_step = step
 
     # Run evaluation and log it.
-    validation_outputs = self._estimator.evaluate(
-        x=self.x, y=self.y, input_fn=self.input_fn, batch_size=self.batch_size,
-        steps=self.eval_steps, metrics=self.metrics, hooks=self.hooks,
-        name=self.name)
+    validation_outputs = self._evaluate_estimator()
     stats = []
     for name in validation_outputs:
       stats.append("%s = %s" % (name, str(validation_outputs[name])))
@@ -919,6 +934,10 @@ class ExportMonitor(EveryN):
   def every_n_step_end(self, step, outputs):
     super(ExportMonitor, self).every_n_step_end(step, outputs)
     try:
+      if isinstance(self._estimator, core_estimator.Estimator):
+        raise ValueError(
+            "ExportMonitor does not support `tf.estimator.Estimator. `. "
+            "Please pass an ExportStrategy to Experiment instead.")
       self._last_export_dir = self._estimator.export(
           self.export_dir,
           exports_to_keep=self.exports_to_keep,
@@ -946,6 +965,10 @@ class ExportMonitor(EveryN):
       logging.info("Skipping export at the end since model has not been saved "
                    "yet.")
       return
+    if isinstance(self._estimator, core_estimator.Estimator):
+      raise ValueError(
+          "ExportMonitor does not support `tf.estimator.Estimator. `. "
+          "Please pass an ExportStrategy to Experiment instead.")
     try:
       self._last_export_dir = self._estimator.export(
           self.export_dir,
diff --git a/tensorflow/contrib/learn/python/learn/monitors_test.py b/tensorflow/contrib/learn/python/learn/monitors_test.py
index f9ee03c944..221d5f1fef 100644
--- a/tensorflow/contrib/learn/python/learn/monitors_test.py
+++ b/tensorflow/contrib/learn/python/learn/monitors_test.py
@@ -31,6 +31,7 @@ from tensorflow.contrib.framework.python.ops import variables as variables_lib
 from tensorflow.contrib.learn.python import learn
 from tensorflow.contrib.learn.python.learn import estimators
 from tensorflow.python.client import session as session_lib
+from tensorflow.python.estimator import estimator as core_estimator
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
@@ -449,6 +450,62 @@ class MonitorsTest(test.TestCase):
       monitor.epoch_end(epoch=0)
       monitor.end()
 
+  @test.mock.patch.object(saver, 'latest_checkpoint')
+  def test_validation_monitor_with_core_estimator(self, mock_latest_checkpoint):
+    estimator = test.mock.Mock(spec=core_estimator.Estimator)
+    model_dir = 'model/dir'
+    estimator.model_dir = model_dir
+    validation_outputs = {'loss': None}
+    estimator.evaluate.return_value = validation_outputs
+
+    monitor = learn.monitors.ValidationMonitor(
+        input_fn=lambda: constant_op.constant(2.0),
+        every_n_steps=0, early_stopping_rounds=2)
+    self._assert_validation_monitor(monitor)
+    monitor.set_estimator(estimator)
+    with ops.Graph().as_default() as g, self.test_session(g):
+      monitor.begin(max_steps=100)
+      monitor.epoch_begin(epoch=0)
+      self.assertEqual(0, estimator.evaluate.call_count)
+
+      # Step 0, initial loss.
+      step = 0
+      mock_latest_checkpoint.return_value = '%s/ckpt.%s' % (model_dir, step)
+      validation_outputs['loss'] = 42.0
+      self.assertEqual(0, len(monitor.step_begin(step=step)))
+      self.assertFalse(monitor.step_end(step=step, output={}))
+      self.assertEqual(1, estimator.evaluate.call_count)
+      self._assert_validation_monitor(
+          monitor, expected_best_step=0, expected_best_value=42.0)
+      monitor.post_step(step=step, session=None)
+
+  @test.mock.patch.object(saver, 'latest_checkpoint')
+  def test_validation_monitor_fail_with_core_estimator_and_metrics(
+      self, mock_latest_checkpoint):
+    estimator = test.mock.Mock(spec=core_estimator.Estimator)
+    model_dir = 'model/dir'
+    estimator.model_dir = model_dir
+    validation_outputs = {'loss': None}
+    estimator.evaluate.return_value = validation_outputs
+
+    monitor = learn.monitors.ValidationMonitor(
+        input_fn=lambda: constant_op.constant(2.0),
+        metrics=constant_op.constant(2.0),
+        every_n_steps=0, early_stopping_rounds=2)
+    monitor.set_estimator(estimator)
+    with ops.Graph().as_default() as g, self.test_session(g):
+      monitor.begin(max_steps=100)
+      monitor.epoch_begin(epoch=0)
+
+      with self.assertRaisesRegexp(
+          ValueError,
+          'tf.estimator.Estimator does not support .* metrics'):
+        step = 0
+        mock_latest_checkpoint.return_value = '%s/ckpt.%s' % (model_dir, step)
+        validation_outputs['loss'] = 42.0
+        self.assertEqual(0, len(monitor.step_begin(step=step)))
+        self.assertFalse(monitor.step_end(step=step, output={}))
+
   def test_graph_dump(self):
     monitor0 = learn.monitors.GraphDump()
     monitor1 = learn.monitors.GraphDump()
-- 
GitLab


From dc703d80793da9ddd94379b68f859f4195f5540f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 18:48:00 -0700
Subject: [PATCH 1138/1563] Migrate the tf_graph_info component to use
 webfiles.

This involved copying tf-graph-icon.html into the tf_graph_info component (from the tf_graph component). The tf_graph component had not been using tf-graph-icon.html.

PiperOrigin-RevId: 155457569
---
 tensorflow/BUILD                              |    1 +
 .../components/tf_graph_info/BUILD            |   60 +
 .../components/tf_graph_info/demo/BUILD       |   26 +
 .../tf_graph_info/demo/data/graph.pbtxt       | 4606 +++++++++++++++++
 .../components/tf_graph_info/demo/index.html  |   94 +
 .../tf_graph_info/tf-graph-icon.html          |  296 ++
 .../tf_graph_info/tf-node-info.html           |    2 +-
 .../tf_graph_info/tf-node-list-item.html      |    2 +-
 .../tf_graph_loader/demo/index.html           |    7 +-
 9 files changed, 5090 insertions(+), 4 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 2ef3c7ae13..8d94a2021b 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -335,6 +335,7 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_info:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph_info/BUILD b/tensorflow/tensorboard/components/tf_graph_info/BUILD
new file mode 100644
index 0000000000..0196c91905
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info/BUILD
@@ -0,0 +1,60 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_info",
+    srcs = [
+        "tf-graph-icon.html",
+        "tf-graph-info.html",
+        "tf-node-info.html",
+        "tf-node-list-item.html",
+    ],
+    path = "/tf-graph-info",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_iron_list",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_item",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-icon.html",
+        "tf-graph-info.html",
+        "tf-node-info.html",
+        "tf-node-list-item.html",
+    ],
+    destdir = "tf-graph-info",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
new file mode 100644
index 0000000000..abac5ff6ee
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_info/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-info/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "//tensorflow/tensorboard/components/tf_graph_info",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_info/demo/index.html b/tensorflow/tensorboard/components/tf_graph_info/demo/index.html
new file mode 100644
index 0000000000..f7d2ef7ee5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info/demo/index.html
@@ -0,0 +1,94 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-info.html">
+<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Info Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 600px;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-info-demo">
+      <template>
+        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
+        <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            out-graph="{{_graph}}">
+        </tf-graph-loader>
+
+        <tf-graph-info id="info" title="selected"></tf-graph-info>
+      </template>
+      <script>
+        "use strict";
+
+        Polymer({
+          is: "tf-graph-info-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
+
+            // This property will be updated by the graph loader.
+            _graph: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_graphUpdated(_graph)',
+          ],
+          _graphUpdated: function(slimGraph) {
+            const tracker = tf.graph.util.getTracker(this.$.loader);
+            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
+                tracker, 100, 'Namespace hierarchy');
+            const hierarchyOptions = {};
+            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
+                function(graphHierarchy) {
+              // We have parsed and built the graph object from a pbtxt file. Show info.
+              this.$.info.set('graph', slimGraph);
+              this.$.info.set('graphHierarchy', graphHierarchy);
+
+              // Select a node within that graph.
+              this.$.info.set('selectedNode', 'GradientDescent/learning_rate');
+            }.bind(this));
+          },
+        });
+      </script>
+    </dom-module>
+    <div id='demo-container'>
+      <tf-graph-info-demo></tf-graph-info-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html b/tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html
new file mode 100644
index 0000000000..a3e9dc59c5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html
@@ -0,0 +1,296 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+
+<dom-module id="tf-graph-icon">
+  <style>
+    .faded-rect {
+      fill: url(#rectHatch);
+    }
+
+    .faded-ellipse {
+      fill: url(#ellipseHatch);
+    }
+
+    .faded-rect, .faded-ellipse, .faded-series {
+      stroke:   var(--tb-graph-faded) !important;
+    }
+  </style>
+  <template>
+    <template is="dom-if" if="[[_isType(node, type, 'OP')]]">
+      <template is="dom-if" if="[[_isConst(node, const)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 10 10">
+          <circle cx="5" cy="5" r="3"
+              fill$="[[_getFill(_computedFill, 'OP')]]"
+              stroke$="[[_getStroke(_computedFill, 'OP')]]" />
+        </svg>
+      </template>
+      <template is="dom-if" if="[[_isSummary(node, summary)]]">
+        <svg width$="[[height]]" height$="[[height]]" viewBox="0 0 12 12">
+          <use x="0" y="0" xlink:href="#summary-icon" />
+        </svg>
+      </template>
+      <template is="dom-if" if="[[_isRegularOp(node, const, summary)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 8">
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+              xlink:href="#op-node-stamp"
+              fill$="[[_getFill(_computedFill, 'OP')]]"
+              stroke$="[[_getStroke(_computedFill, 'OP')]]"
+              class$="{{_fadedClass(renderInfo, 'ellipse')}}"
+              x="8" y="4" />
+        </svg>
+      </template>
+    </template>
+    <template is="dom-if" if="[[_isType(node, type, 'META')]]">
+      <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 37 16">
+        <rect x="1" y="1"
+            fill$="[[_getFill(_computedFill, 'META')]]"
+            stroke$="[[_getStroke(_computedFill, 'META')]]"
+            class$="{{_fadedClass(renderInfo, 'rect')}}"
+            stroke-width="2px"
+            height="14" width="35"
+            rx="5" ry="5"/>
+      </svg>
+    </template>
+    <template is="dom-if" if="[[_isType(node, type, 'SERIES')]]">
+      <template is="dom-if" if="[[_isVertical(node, vertical)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 15">
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+              xlink:href="#op-series-vertical-stamp"
+              fill$="[[_getFill(_computedFill, 'SERIES')]]"
+              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
+              class$="{{_fadedClass(renderInfo, 'series')}}"
+              x="0" y="2" />
+        </svg>
+      </template>
+      <template is="dom-if" if="[[!_isVertical(node, vertical)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 24 10">
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+              xlink:href="#op-series-horizontal-stamp"
+              fill$="[[_getFill(_computedFill, 'SERIES')]]"
+              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
+              class$="{{_fadedClass(renderInfo, 'series')}}"
+              x="0" y="1" />
+        </svg>
+      </template>
+    </template>
+  </template>
+
+  <script>
+    (function() {
+      Polymer({
+        is: 'tf-graph-icon',
+
+        properties: {
+          /**
+           * Node to represent with an icon. Optional, but if specified, its
+           * properties override those defined in the type, vertical, const and
+           * summary properties.
+           * @type {tf.graph.Node}
+           */
+          node: {
+            type: Object,
+            value: null
+          },
+
+          /**
+           * Render node information associated with this node. Optional. If
+           * specified, this is only used when computing the fill of the icon
+           * element.
+           * @type {tf.graph.render.RenderNodeInfo}
+           */
+          renderInfo: {
+            type: Object,
+            value: null
+          },
+
+          /**
+           * String indicating the type of coloring to use for this node, used
+           * only for determining the fill.
+           */
+          colorBy: {
+            type: Object,
+            value: "structural"
+          },
+
+          /**
+           * Function used by structural coloring algorithm to determine which
+           * color to use based on the template ID of the node. Optional.
+           */
+          templateIndex: {
+            type: Function,
+            value: null
+          },
+
+          /** Type of node to draw (ignored if node is set). */
+          type: {
+            type: String,
+            value: null
+          },
+
+          /** Direction for series (ignored for other types). */
+          vertical: {
+            type: Boolean,
+            value: false
+          },
+
+          /** Whether the op is Const (ignored for non-ops). */
+          const: {
+            type: Boolean,
+            value: false
+          },
+
+          /** Whether the op is a Summary (ignored for non-ops). */
+          summary: {
+            type: Boolean,
+            value: false
+          },
+
+          /**
+           * Fill for the icon, optional. If fill is specified and node is not
+           * specified, then this value will override the default for the
+           * element. However, if node is specified, this value will be ignored.
+           */
+          fill: {
+            type: String,
+            value: null
+          },
+
+          /** Height of the SVG element in pixels, used for scaling. */
+          height: {
+            type: Number,
+            value: 20
+          },
+
+          /** The computed fill for the node. **/
+          _computedFill: {
+            type: String,
+            computed:
+              "_getComputedFill(node, renderInfo, colorBy, templateIndex, fill)"
+          }
+
+        },
+
+        /**
+         * Get the computed fill value for the element.
+         */
+        _getComputedFill: function(inputNode, inputRenderInfo, inputColorBy,
+            inputTemplateIndex, inputFill) {
+          if (inputNode && inputRenderInfo &&
+              inputColorBy && inputTemplateIndex) {
+            var ns = tf.graph.scene.node;
+            var colorBy = ns.ColorBy[inputColorBy.toUpperCase()];
+            return ns.getFillForNode(inputTemplateIndex, colorBy,
+                inputRenderInfo, false);
+          }
+          return inputFill;
+        },
+
+        /**
+         * Get the fill value for the element, or if that's not possible, return
+         * the default fill value for the node type.
+         */
+        _getFill: function(inputComputedFill, inputNodeType) {
+          return inputComputedFill || ({
+            OP: tf.graph.render.OpNodeColors.DEFAULT_FILL,
+            META: tf.graph.render.MetanodeColors.DEFAULT_FILL,
+            SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_FILL
+          })[inputNodeType];
+        },
+
+        /**
+         * Get the stroke value for the element, or if that's not possible,
+         * return the default stroke value for the node type.
+         */
+        _getStroke: function(inputComputedFill, inputNodeType) {
+          return inputComputedFill ?
+            tf.graph.scene.node.getStrokeForFill(inputComputedFill) :
+            ({
+              OP: tf.graph.render.OpNodeColors.DEFAULT_STROKE,
+              META: tf.graph.render.MetanodeColors.DEFAULT_STROKE,
+              SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_STROKE
+            })[inputNodeType];
+        },
+
+        /**
+         * Test whether the specified node's type, or the literal type string,
+         * match a particular other type.
+         */
+        _isType: function(inputNode, inputType, targetType) {
+          if (inputNode) {
+            return tf.graph.NodeType[inputNode.type] === targetType;
+          }
+          return inputType === targetType;
+        },
+
+        /**
+         * Test whether the specified node should be represented as a vertical
+         * series. Defaults to the value of the vertical property if node is
+         * not specified.
+         */
+        _isVertical: function(inputNode, inputVertical) {
+          if (inputNode) {
+            return inputNode.hasNonControlEdges;
+          }
+          return !!inputVertical;
+        },
+
+        /**
+         * Test whether the specified node is a constant. Defaults to the value
+         * of the const property if node is not specified.
+         */
+        _isConst: function(inputNode, inputConst) {
+          if (inputNode) {
+            return inputNode.op === 'Const';
+          }
+          return !!inputConst;
+        },
+
+        /**
+         * Test whether the specified node is a summary. Defaults to the value
+         * of the summary property if node is not specified.
+         */
+        _isSummary: function(inputNode, inputSummary) {
+          if (inputNode) {
+            return this._isType(inputNode, null, 'OP') &&
+                inputNode.op.substr(-7) === 'Summary';
+          }
+          return !!inputSummary;
+        },
+
+        /**
+         * Test whether the op node is a regular non-summary non-const node.
+         */
+        _isRegularOp: function(inputNode, inputConst, inputSummary) {
+          return !this._isConst(inputNode, inputConst) &&
+              !this._isSummary(inputNode, inputSummary);
+        },
+
+        _fadedClass: function(itemRenderInfo, shape) {
+          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded-' + shape : '';
+        }
+      });
+    })();
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html b/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
index c3e470b123..0715777370 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
+++ b/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
@@ -21,7 +21,7 @@ limitations under the License.
 <link rel="import" href="../paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../paper-item/all-imports.html">
 <link rel="import" href="../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="../tf-graph/tf-graph-icon.html">
+<link rel="import" href="tf-graph-icon.html">
 <link rel="import" href="tf-node-list-item.html">
 
 <dom-module id="tf-node-info">
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html b/tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html
index 9e9bface5d..c15478d126 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html
+++ b/tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html
@@ -16,8 +16,8 @@ limitations under the License.
 -->
 
 <link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-graph/tf-graph-icon.html">
 <link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="tf-graph-icon.html">
 
 <dom-module id="tf-node-list-item">
   <style>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html b/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
index 5da31d72eb..2ffb2a1a59 100644
--- a/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
+++ b/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
@@ -23,13 +23,16 @@ limitations under the License.
   <template>
     <dom-module id="tf-graph-loader-demo">
       <template>
-         <tf-graph-loader
+        <tf-graph-loader
             id="loader"
             datasets="[[_datasets]]"
             selected-dataset="[[_selectedDataset]]"
-            progress="{{_progress}}"></tf-graph-loader>
+            progress="{{_progress}}">
+        </tf-graph-loader>
       </template>
       <script>
+        "use strict";
+
         Polymer({
           is: "tf-graph-loader-demo",
           properties: {
-- 
GitLab


From 00f981d1563409c462ea3f69137b0184914b407a Mon Sep 17 00:00:00 2001
From: Sukriti Ramesh <sukritiramesh@google.com>
Date: Mon, 8 May 2017 18:49:44 -0700
Subject: [PATCH 1139/1563] Mark SessionBundle deprecated in documentation.

PiperOrigin-RevId: 155457684
---
 tensorflow/contrib/session_bundle/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/contrib/session_bundle/README.md b/tensorflow/contrib/session_bundle/README.md
index 6df63cba80..5bcc8fab70 100644
--- a/tensorflow/contrib/session_bundle/README.md
+++ b/tensorflow/contrib/session_bundle/README.md
@@ -1,5 +1,8 @@
 # TensorFlow Inference Model Format
 
+WARNING: SessionBundle has been deprecated. Please use
+[SavedModel](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/saved_model/README.md) instead.
+
 [TOC]
 
 ## Overview
-- 
GitLab


From bb68623504456430f9c97f3d6118b874cb6dfa0f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 18:56:10 -0700
Subject: [PATCH 1140/1563] Automated g4 rollback of changelist 155428927

PiperOrigin-RevId: 155458050
---
 tensorflow/contrib/android/cmake/CMakeLists.txt | 2 +-
 tensorflow/tensorflow.bzl                       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/android/cmake/CMakeLists.txt b/tensorflow/contrib/android/cmake/CMakeLists.txt
index 2219daab11..9f9d740d6c 100644
--- a/tensorflow/contrib/android/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/android/cmake/CMakeLists.txt
@@ -32,7 +32,7 @@ set_target_properties(lib_tf PROPERTIES IMPORTED_LOCATION
 # Change to compile flags should be replicated into bazel build file
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIS_SLIM_BUILD \
                      -std=c++11 -fno-rtti -fno-exceptions \
-                     -O3 -DUSE_GEMM_FOR_CONV -Wno-narrowing \
+                     -O2 -Wno-narrowing \
                      -mfpu=neon -mfloat-abi=softfp -fPIE \
                      -DGOOGLE_PROTOBUF_NO_RTTI \
                      -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER")
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index e058c0bb8f..ff4222032d 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -133,8 +133,7 @@ def tf_copts():
           clean_dep("//tensorflow:android"): [
               "-std=c++11",
               "-DTF_LEAN_BINARY",
-              "-DUSE_GEMM_FOR_CONV",
-              "-O3",
+              "-O2",
           ],
           clean_dep("//tensorflow:darwin"): [],
           clean_dep("//tensorflow:windows"): [
-- 
GitLab


From dad374b4c70c520405b959950effe1e01cfa658d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 19:32:53 -0700
Subject: [PATCH 1141/1563] Augment compute_constant_test to also test
 CompileOnlyClient, as well as LocalClient.

PiperOrigin-RevId: 155460136
---
 tensorflow/compiler/xla/tests/BUILD           |   4 +-
 .../xla/tests/compute_constant_test.cc        | 286 +++++++++++-------
 2 files changed, 177 insertions(+), 113 deletions(-)

diff --git a/tensorflow/compiler/xla/tests/BUILD b/tensorflow/compiler/xla/tests/BUILD
index 12bc1e9956..f8a4c65109 100644
--- a/tensorflow/compiler/xla/tests/BUILD
+++ b/tensorflow/compiler/xla/tests/BUILD
@@ -1206,12 +1206,12 @@ xla_test(
         "//tensorflow/compiler/xla:statusor",
         "//tensorflow/compiler/xla:test_helpers",
         "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla/client:client_library",
         "//tensorflow/compiler/xla/client:computation",
         "//tensorflow/compiler/xla/client:computation_builder",
         "//tensorflow/compiler/xla/client:global_data",
-        "//tensorflow/compiler/xla/client:local_client",
         "//tensorflow/compiler/xla/legacy_flags:cpu_compiler_flags",
-        "//tensorflow/compiler/xla/tests:client_library_test_base",
+        "//tensorflow/compiler/xla/legacy_flags:hlo_pass_pipeline_flags",
         "//tensorflow/compiler/xla/tests:literal_test_util",
         "//tensorflow/compiler/xla/tests:test_utils",
         "//tensorflow/core:lib",
diff --git a/tensorflow/compiler/xla/tests/compute_constant_test.cc b/tensorflow/compiler/xla/tests/compute_constant_test.cc
index 4170e0f4e2..1d998fe33e 100644
--- a/tensorflow/compiler/xla/tests/compute_constant_test.cc
+++ b/tensorflow/compiler/xla/tests/compute_constant_test.cc
@@ -17,18 +17,18 @@ limitations under the License.
 #include <utility>
 #include <vector>
 
+#include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/compiler/xla/client/computation.h"
 #include "tensorflow/compiler/xla/client/computation_builder.h"
 #include "tensorflow/compiler/xla/client/global_data.h"
-#include "tensorflow/compiler/xla/client/local_client.h"
 #include "tensorflow/compiler/xla/layout_util.h"
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
+#include "tensorflow/compiler/xla/legacy_flags/hlo_pass_pipeline_flags.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/compiler/xla/test.h"
-#include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/tests/test_utils.h"
@@ -38,21 +38,60 @@ limitations under the License.
 namespace xla {
 namespace {
 
-class ComputeConstantTest : public ClientLibraryTestBase {
+// An enumerator for the client types that we want to iterate over in
+// the various tests.
+enum class ClientType { kLocal, kCompileOnly };
+ClientType client_types[] = {ClientType::kLocal, ClientType::kCompileOnly};
+
+class ComputeConstantTest : public ::testing::Test {
  public:
+  explicit ComputeConstantTest(
+      perftools::gputools::Platform* platform = nullptr,
+      tensorflow::gtl::ArraySlice<string> disabled_pass_names = {})
+      : platform_(platform) {
+    legacy_flags::HloPassPipelineFlags* flags =
+        legacy_flags::GetHloPassPipelineFlags();
+    flags->xla_disable_hlo_passes =
+        tensorflow::str_util::Join(disabled_pass_names, ",");
+  }
+
+  string TestName() const {
+    return ::testing::UnitTest::GetInstance()->current_test_info()->name();
+  }
+
+  Client* ClientOrDie(::perftools::gputools::Platform* platform,
+                      ClientType client_type) {
+    if (client_type == ClientType::kLocal) {
+      StatusOr<Client*> result =
+          ClientLibrary::GetOrCreateLocalClient(platform);
+      TF_CHECK_OK(result.status())
+          << "could not create LocalClient for testing";
+      return result.ValueOrDie();
+    } else if (client_type == ClientType::kCompileOnly) {
+      StatusOr<Client*> result =
+          ClientLibrary::GetOrCreateCompileOnlyClient(platform);
+      TF_CHECK_OK(result.status())
+          << "could not create CompileOnlyClient for testing";
+      return result.ValueOrDie();
+    }
+    LOG(FATAL) << "invalid client_type value";
+  }
+
   StatusOr<std::unique_ptr<Literal>> ComputeConstantLiteral(
-      ComputationDataHandle operand, ComputationBuilder* builder,
-      Layout* output_layout = nullptr) {
+      Client* client, const ComputationDataHandle& operand,
+      ComputationBuilder* builder, Layout* output_layout = nullptr) {
     TF_ASSIGN_OR_RETURN(auto remote_computed,
                         builder->ComputeConstant(operand, output_layout));
-    TF_ASSIGN_OR_RETURN(auto computed, client_->Transfer(*remote_computed));
+    TF_ASSIGN_OR_RETURN(auto computed, client->Transfer(*remote_computed));
     return std::move(computed);
   }
 
   template <class Scalar>
-  StatusOr<Scalar> ComputeConstantScalar(ComputationDataHandle operand,
+  StatusOr<Scalar> ComputeConstantScalar(Client* client,
+                                         const ComputationDataHandle& operand,
                                          ComputationBuilder* builder) {
-    TF_ASSIGN_OR_RETURN(auto literal, ComputeConstantLiteral(operand, builder));
+    TF_ASSIGN_OR_RETURN(auto literal,
+                        ComputeConstantLiteral(client, operand, builder));
     return LiteralUtil::Get<Scalar>(*literal, {});
   }
 
@@ -63,163 +102,188 @@ class ComputeConstantTest : public ClientLibraryTestBase {
     return result.ok() ? result.ValueOrDie() : false;
   }
 
-  template <class Scalar>
-  void ExpectConstantComputedScalar(ComputationDataHandle operand,
-                                    Scalar expected,
-                                    ComputationBuilder* builder) {
-    Scalar computed = ComputeConstantScalar<Scalar>(operand, builder);
-    ASSERT_TRUE(computed.ok()) << computed.status();
-    std::unique_ptr<Literal> expected_literal = LiteralUtil::CreateR0(expected);
-    LiteralTestUtil::ExpectEqual(*expected_literal, *computed);
-  }
+  perftools::gputools::Platform* platform_;
 };
 
 TEST_F(ComputeConstantTest, ScalarInt32Literal) {
-  ComputationBuilder b(client_, TestName());
-  auto computation = b.ConstantR0<int32>(42);
-  EXPECT_TRUE(IsConstant(computation, &b));
-
-  auto value = ComputeConstantScalar<int32>(computation, &b);
-  ASSERT_TRUE(value.ok()) << value.status();
-  EXPECT_EQ(value.ValueOrDie(), 42);
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
+    auto computation = b.ConstantR0<int32>(42);
+    EXPECT_TRUE(IsConstant(computation, &b));
+
+    auto value = ComputeConstantScalar<int32>(client, computation, &b);
+    ASSERT_TRUE(value.ok()) << value.status();
+    EXPECT_EQ(value.ValueOrDie(), 42);
+  }
 }
 
 TEST_F(ComputeConstantTest, ScalarFloatAdd) {
-  ComputationBuilder b(client_, TestName());
-  auto computation =
-      b.Add(b.ConstantR0<float>(42.5f), b.ConstantR0<float>(1.5f));
-  EXPECT_TRUE(IsConstant(computation, &b));
-
-  auto value = ComputeConstantScalar<float>(computation, &b);
-  ASSERT_TRUE(value.ok()) << value.status();
-  EXPECT_EQ(value.ValueOrDie(), 44.0f);
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
+    auto computation =
+        b.Add(b.ConstantR0<float>(42.5f), b.ConstantR0<float>(1.5f));
+    EXPECT_TRUE(IsConstant(computation, &b));
+
+    auto value = ComputeConstantScalar<float>(client, computation, &b);
+    ASSERT_TRUE(value.ok()) << value.status();
+    EXPECT_EQ(value.ValueOrDie(), 44.0f);
+  }
 }
 
 TEST_F(ComputeConstantTest, ScalarRng) {
-  ComputationBuilder b(client_, TestName());
-  auto computation =
-      b.RngUniform(b.ConstantR0<float>(1.1f), b.ConstantR0<float>(2.1f),
-                   ShapeUtil::MakeShape(F32, {}));
-  EXPECT_FALSE(IsConstant(computation, &b));
-
-  auto value = ComputeConstantScalar<float>(computation, &b);
-  ASSERT_FALSE(value.ok())
-      << "computing a RNG value should not be considered a constant";
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
+    auto computation =
+        b.RngUniform(b.ConstantR0<float>(1.1f), b.ConstantR0<float>(2.1f),
+                     ShapeUtil::MakeShape(F32, {}));
+    EXPECT_FALSE(IsConstant(computation, &b));
+
+    auto value = ComputeConstantScalar<float>(client, computation, &b);
+    ASSERT_FALSE(value.ok())
+        << "computing a RNG value should not be considered a constant";
+  }
 }
 
 TEST_F(ComputeConstantTest, DirectParam) {
-  ComputationBuilder b(client_, TestName());
-  auto computation = b.Parameter(0, ShapeUtil::MakeShape(F32, {}), "param");
-  EXPECT_FALSE(IsConstant(computation, &b));
-
-  auto value = ComputeConstantScalar<float>(computation, &b);
-  EXPECT_TRUE(tensorflow::StringPiece(value.status().ToString())
-                  .contains("depends on parameter"))
-      << value.status();
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
+    auto computation = b.Parameter(0, ShapeUtil::MakeShape(F32, {}), "param");
+    EXPECT_FALSE(IsConstant(computation, &b));
+
+    auto value = ComputeConstantScalar<float>(client, computation, &b);
+    EXPECT_TRUE(tensorflow::StringPiece(value.status().ToString())
+                    .contains("depends on parameter"))
+        << value.status();
+  }
 }
 
 TEST_F(ComputeConstantTest, IndirectParam) {
-  ComputationBuilder b(client_, TestName());
-  auto computation =
-      b.Add(b.ConstantR0<float>(1.0f),
-            b.Parameter(0, ShapeUtil::MakeShape(F32, {}), "param"));
-  EXPECT_FALSE(IsConstant(computation, &b));
-
-  auto value = ComputeConstantScalar<float>(computation, &b);
-  EXPECT_TRUE(tensorflow::StringPiece(value.status().ToString())
-                  .contains("depends on parameter"))
-      << value.status();
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
+    auto computation =
+        b.Add(b.ConstantR0<float>(1.0f),
+              b.Parameter(0, ShapeUtil::MakeShape(F32, {}), "param"));
+    EXPECT_FALSE(IsConstant(computation, &b));
+
+    auto value = ComputeConstantScalar<float>(client, computation, &b);
+    EXPECT_TRUE(tensorflow::StringPiece(value.status().ToString())
+                    .contains("depends on parameter"))
+        << value.status();
+  }
 }
 
 // Test computation of an expression interspersed with param nodes but
 // the expression does not depend on the param nodes.
 TEST_F(ComputeConstantTest, UnrelatedParam) {
-  ComputationBuilder b(client_, TestName());
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
 
-  auto param_a = b.Parameter(10, ShapeUtil::MakeShape(F32, {}), "param0");
-  auto constant_4 = b.Add(b.ConstantR0<float>(2.5f), b.ConstantR0<float>(1.5f));
-  auto not_constant_a = b.Add(constant_4, param_a);
+    auto param_a = b.Parameter(10, ShapeUtil::MakeShape(F32, {}), "param0");
+    auto constant_4 =
+        b.Add(b.ConstantR0<float>(2.5f), b.ConstantR0<float>(1.5f));
+    auto not_constant_a = b.Add(constant_4, param_a);
 
-  auto param_b = b.Parameter(1, ShapeUtil::MakeShape(F32, {}), "param1");
-  auto constant_9 = b.Mul(b.ConstantR0<float>(2.0f), b.ConstantR0<float>(4.5f));
-  auto not_constant_b = b.Add(param_b, constant_9);
+    auto param_b = b.Parameter(1, ShapeUtil::MakeShape(F32, {}), "param1");
+    auto constant_9 =
+        b.Mul(b.ConstantR0<float>(2.0f), b.ConstantR0<float>(4.5f));
+    auto not_constant_b = b.Add(param_b, constant_9);
 
-  auto constant_13 = b.Add(constant_4, constant_9);
-  b.Add(not_constant_b, b.Add(constant_13, not_constant_a));
+    auto constant_13 = b.Add(constant_4, constant_9);
+    b.Add(not_constant_b, b.Add(constant_13, not_constant_a));
 
-  EXPECT_TRUE(IsConstant(constant_13, &b));
+    EXPECT_TRUE(IsConstant(constant_13, &b));
 
-  auto value = ComputeConstantScalar<float>(constant_13, &b);
-  ASSERT_TRUE(value.ok()) << value.status();
-  EXPECT_EQ(value.ValueOrDie(), 13.0f);
+    auto value = ComputeConstantScalar<float>(client, constant_13, &b);
+    ASSERT_TRUE(value.ok()) << value.status();
+    EXPECT_EQ(value.ValueOrDie(), 13.0f);
+  }
 }
 
 TEST_F(ComputeConstantTest, NonScalarAdd) {
-  ComputationBuilder b(client_, TestName());
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
 
-  auto computation =
-      b.Add(b.ConstantR1<int32>({1, 2}), b.ConstantR1<int32>({3, 4}));
-  EXPECT_TRUE(IsConstant(computation, &b));
+    auto computation =
+        b.Add(b.ConstantR1<int32>({1, 2}), b.ConstantR1<int32>({3, 4}));
+    EXPECT_TRUE(IsConstant(computation, &b));
 
-  auto computed = ComputeConstantLiteral(computation, &b);
-  ASSERT_TRUE(computed.ok()) << computed.status();
-  std::unique_ptr<Literal> expected_literal =
-      LiteralUtil::CreateR1<int32>({4, 6});
-  LiteralTestUtil::ExpectEqual(*expected_literal, *computed.ValueOrDie());
+    auto computed = ComputeConstantLiteral(client, computation, &b);
+    ASSERT_TRUE(computed.ok()) << computed.status();
+    std::unique_ptr<Literal> expected_literal =
+        LiteralUtil::CreateR1<int32>({4, 6});
+    LiteralTestUtil::ExpectEqual(*expected_literal, *computed.ValueOrDie());
+  }
 }
 
 TEST_F(ComputeConstantTest, IntegerDivide) {
-  ComputationBuilder b(client_, TestName());
-  auto computation = b.Div(b.ConstantR0<int32>(15), b.ConstantR0<int32>(3));
-  EXPECT_TRUE(IsConstant(computation, &b));
-
-  auto computed = ComputeConstantLiteral(computation, &b);
-  ASSERT_TRUE(computed.ok()) << computed.status();
-  std::unique_ptr<Literal> expected_literal = LiteralUtil::CreateR0<int32>(5);
-  LiteralTestUtil::ExpectEqual(*expected_literal, *computed.ValueOrDie());
-}
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
+    auto computation = b.Div(b.ConstantR0<int32>(15), b.ConstantR0<int32>(3));
+    EXPECT_TRUE(IsConstant(computation, &b));
 
-XLA_TEST_F(ComputeConstantTest, Layout) {
-  ComputationBuilder b(client_, TestName());
-
-  std::vector<std::vector<int64>> layouts = {{0, 1}, {1, 0}};
-  for (const std::vector<int64>& layout : layouts) {
-    auto layout_proto = LayoutUtil::MakeLayout(layout);
-    auto computed =
-        ComputeConstantLiteral(b.Add(b.ConstantR2<int32>({{1, 2}, {3, 4}}),
-                                     b.ConstantR2<int32>({{10, 20}, {30, 40}})),
-                               &b, &layout_proto);
+    auto computed = ComputeConstantLiteral(client, computation, &b);
     ASSERT_TRUE(computed.ok()) << computed.status();
-
-    std::unique_ptr<Literal> expected_literal =
-        test_utils::CreateR2LiteralWithLayout<int32>({{11, 22}, {33, 44}},
-                                                     layout);
-    LiteralTestUtil::AssertEqualShapesAndLayouts(
-        expected_literal->shape(), computed.ValueOrDie()->shape());
+    std::unique_ptr<Literal> expected_literal = LiteralUtil::CreateR0<int32>(5);
     LiteralTestUtil::ExpectEqual(*expected_literal, *computed.ValueOrDie());
   }
 }
 
+XLA_TEST_F(ComputeConstantTest, Layout) {
+  for (ClientType client_type : client_types) {
+    Client* client = ClientOrDie(platform_, client_type);
+    ComputationBuilder b(client, TestName());
+
+    std::vector<std::vector<int64>> layouts = {{0, 1}, {1, 0}};
+    for (const std::vector<int64>& layout : layouts) {
+      auto layout_proto = LayoutUtil::MakeLayout(layout);
+      auto computed = ComputeConstantLiteral(
+          client,
+          b.Add(b.ConstantR2<int32>({{1, 2}, {3, 4}}),
+                b.ConstantR2<int32>({{10, 20}, {30, 40}})),
+          &b, &layout_proto);
+      ASSERT_TRUE(computed.ok()) << computed.status();
+
+      std::unique_ptr<Literal> expected_literal =
+          test_utils::CreateR2LiteralWithLayout<int32>({{11, 22}, {33, 44}},
+                                                       layout);
+      LiteralTestUtil::AssertEqualShapesAndLayouts(
+          expected_literal->shape(), computed.ValueOrDie()->shape());
+      LiteralTestUtil::ExpectEqual(*expected_literal, *computed.ValueOrDie());
+    }
+  }
+}
+
 // This test is permanently disabled on CPU because it requires that the
 // backend used for execution is different than the backend used for
 // ComputeConstant which is always cpu.
 TEST_F(ComputeConstantTest, DISABLED_ON_CPU(ReuseComputedConstant)) {
   // Compute a trivial constant, then try to use the value in an Execute
   // call. This should fail because the constant resides on the CPU and the
-  // Execute call is executed on a different backend.
-  ComputationBuilder constant_b(client_, TestName());
+  // Execute call is executed on a different backend.  This test only makes
+  // sense with LocalClient, since CompileOnlyClient does not support
+  // execution.
+  Client* client = ClientOrDie(platform_, ClientType::kLocal);
+  ComputationBuilder constant_b(client, TestName());
   auto constant = constant_b.ConstantR0<int32>(42);
   auto handle = constant_b.ComputeConstant(constant).ConsumeValueOrDie();
-  auto literal = client_->Transfer(*handle).ConsumeValueOrDie();
+  auto literal = client->Transfer(*handle).ConsumeValueOrDie();
   LiteralTestUtil::ExpectR0Equal(42, *literal);
 
   // Build trivial computation which takes one parameter.
-  ComputationBuilder b(client_, TestName());
+  ComputationBuilder b(client, TestName());
   b.Neg(b.Parameter(0, ShapeUtil::MakeShape(S32, {}), "param0"));
   auto computation = b.Build().ConsumeValueOrDie();
 
   // Try to use value from ComputeConstant in Execute.
-  auto execute_status = client_->Execute(computation, {handle.get()});
+  auto execute_status = client->Execute(computation, {handle.get()});
   EXPECT_FALSE(execute_status.ok());
   EXPECT_THAT(
       execute_status.status().error_message(),
-- 
GitLab


From 0b783210120d02d8441f87c2f31684b6e4e52349 Mon Sep 17 00:00:00 2001
From: Sukriti Ramesh <sukritiramesh@google.com>
Date: Mon, 8 May 2017 20:22:01 -0700
Subject: [PATCH 1142/1563] SavedModel documentation fix.

PiperOrigin-RevId: 155462669
---
 tensorflow/python/saved_model/README.md       | 4 ++--
 tensorflow/python/saved_model/builder_impl.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/saved_model/README.md b/tensorflow/python/saved_model/README.md
index 8422fb6404..f19127ecd5 100644
--- a/tensorflow/python/saved_model/README.md
+++ b/tensorflow/python/saved_model/README.md
@@ -102,7 +102,7 @@ The typical usage of `builder` is as follows:
 ~~~python
 export_dir = ...
 ...
-builder = saved_model_builder.SavedModelBuilder(export_dir)
+builder = tf.saved_model_builder.SavedModelBuilder(export_dir)
 with tf.Session(graph=tf.Graph()) as sess:
   ...
   builder.add_meta_graph_and_variables(sess,
@@ -132,7 +132,7 @@ the specific meta graph def, will be restored into the supplied session.
 export_dir = ...
 ...
 with tf.Session(graph=tf.Graph()) as sess:
-  loader.load(sess, [tag_constants.TRAINING], export_dir)
+  tf.saved_model.loader.load(sess, [tag_constants.TRAINING], export_dir)
   ...
 ~~~
 
diff --git a/tensorflow/python/saved_model/builder_impl.py b/tensorflow/python/saved_model/builder_impl.py
index d075a04ca2..667cecef65 100644
--- a/tensorflow/python/saved_model/builder_impl.py
+++ b/tensorflow/python/saved_model/builder_impl.py
@@ -57,7 +57,7 @@ class SavedModelBuilder(object):
   Typical usage for the `SavedModelBuilder`:
   ```python
   ...
-  builder = saved_model.builder.SavedModelBuilder(export_dir)
+  builder = tf.saved_model.builder.SavedModelBuilder(export_dir)
 
   with tf.Session(graph=tf.Graph()) as sess:
     ...
-- 
GitLab


From 77a65cfe9d1ef561eb70f1554e4df997d7fbff4e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 22:42:04 -0700
Subject: [PATCH 1143/1563] Merged commit includes the following changes:
 155469502  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Fix docs for ConcatOffset op. Can't have anything after arg docs.

--
155468120  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change.

--

PiperOrigin-RevId: 155469502
---
 tensorflow/core/ops/array_ops.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 949160c247..cf68680bb3 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -439,12 +439,12 @@ For example:
 concat_offset(2, [x, y, z]) => [0, 0, 0], [0, 2, 0], [0, 5, 0]
 ```
 
+This is typically used by gradient computations for a concat operation.
+
 concat_dim: The dimension along which to concatenate.
 shape: The `N` int32 vectors representing shape of tensors being concatenated.
 offset: The `N` int32 vectors representing the starting offset
         of input tensors within the concatenated output.
-
-This is typically used by gradient computations for a concat operation.
 )doc");
 
 // --------------------------------------------------------------------------
-- 
GitLab


From 0eff07a37a7dfbcbef5669f4076e9496303671f4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 22:51:47 -0700
Subject: [PATCH 1144/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 155470023
---
 tensorflow/core/ops/ops.pbtxt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index dd0a339609..6e46d5dda8 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -4151,7 +4151,7 @@ op {
   }
   output_arg {
     name: "offset"
-    description: "The `N` int32 vectors representing the starting offset\n        of input tensors within the concatenated output.\n\nThis is typically used by gradient computations for a concat operation."
+    description: "The `N` int32 vectors representing the starting offset\nof input tensors within the concatenated output."
     type: DT_INT32
     number_attr: "N"
   }
@@ -4162,7 +4162,7 @@ op {
     minimum: 2
   }
   summary: "Computes offsets of concat inputs within its output."
-  description: "For example:\n\n```\n# \'x\' is [2, 2, 7]\n# \'y\' is [2, 3, 7]\n# \'z\' is [2, 5, 7]\nconcat_offset(2, [x, y, z]) => [0, 0, 0], [0, 2, 0], [0, 5, 0]\n```"
+  description: "For example:\n\n```\n# \'x\' is [2, 2, 7]\n# \'y\' is [2, 3, 7]\n# \'z\' is [2, 5, 7]\nconcat_offset(2, [x, y, z]) => [0, 0, 0], [0, 2, 0], [0, 5, 0]\n```\n\nThis is typically used by gradient computations for a concat operation."
 }
 op {
   name: "ConcatV2"
-- 
GitLab


From 557b421fb0408bfe40f6c6ca37074891e9f97259 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 8 May 2017 22:59:22 -0700
Subject: [PATCH 1145/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 155470295
---
 tensorflow/go/op/wrappers.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index e57c197fa4..7f9cbc0b98 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -2390,14 +2390,14 @@ func Split(scope *Scope, split_dim tf.Output, value tf.Output, num_split int64)
 // concat_offset(2, [x, y, z]) => [0, 0, 0], [0, 2, 0], [0, 5, 0]
 // ```
 //
+// This is typically used by gradient computations for a concat operation.
+//
 // Arguments:
 //	concat_dim: The dimension along which to concatenate.
 //	shape: The `N` int32 vectors representing shape of tensors being concatenated.
 //
 // Returns The `N` int32 vectors representing the starting offset
-//         of input tensors within the concatenated output.
-//
-// This is typically used by gradient computations for a concat operation.
+// of input tensors within the concatenated output.
 func ConcatOffset(scope *Scope, concat_dim tf.Output, shape []tf.Output) (offset []tf.Output) {
 	if scope.Err() != nil {
 		return
-- 
GitLab


From 1ece66d58d1dc0ea688248d353b34f44b8ec30ad Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Mon, 8 May 2017 23:40:22 -0700
Subject: [PATCH 1146/1563] Add more TensorBoard web dependencies to build

- Polymer web-component-tester and its deps
- weblas for vz-projector
- threejs for vz-projector
- numericjs for vz-project

PiperOrigin-RevId: 155472472
---
 WORKSPACE                                     |   8 +-
 .../tensorboard/components/tf_imports/BUILD   |   6 +-
 .../components/tf_imports/dagre.html          |   9 +-
 .../components/tf_imports/graphlib.html       |   3 +-
 .../components/tf_imports/lodash.html         |   2 +-
 .../components/tf_imports_d3v4/BUILD          |  32 +++-
 .../components/tf_imports_d3v4/dagre.html     |   9 +-
 .../components/tf_imports_d3v4/graphlib.html  |   3 +-
 .../components/tf_imports_d3v4/lodash.html    |   2 +-
 .../components/tf_imports_d3v4/numericjs.html |  18 ++
 .../components/tf_imports_d3v4/threejs.html   |  18 ++
 .../components/tf_imports_d3v4/weblas.html    |  18 ++
 tensorflow/workspace.bzl                      | 178 ++++++++++++++----
 13 files changed, 244 insertions(+), 62 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
 create mode 100644 tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html

diff --git a/WORKSPACE b/WORKSPACE
index cab8389a55..b4c80d7aad 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,11 +2,11 @@ workspace(name = "org_tensorflow")
 
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "60fc6977908f999b23ca65698c2bb70213403824a84f7904310b6000d78be9ce",
-    strip_prefix = "rules_closure-5ca1dab6df9ad02050f7ba4e816407f88690cf7d",
+    sha256 = "0e38269c55536196c9b0c82a601c683f114901acb6d55f214e0179a3e188ef2a",
+    strip_prefix = "rules_closure-1762d8e6964b9f383b47a57888e55489d2432b61",
     urls = [
-        "http://bazel-mirror.storage.googleapis.com/github.com/bazelbuild/rules_closure/archive/5ca1dab6df9ad02050f7ba4e816407f88690cf7d.tar.gz",  # 2017-02-03
-        "https://github.com/bazelbuild/rules_closure/archive/5ca1dab6df9ad02050f7ba4e816407f88690cf7d.tar.gz",
+        "http://bazel-mirror.storage.googleapis.com/github.com/bazelbuild/rules_closure/archive/1762d8e6964b9f383b47a57888e55489d2432b61.tar.gz",  # 2017-05-08
+        "https://github.com/bazelbuild/rules_closure/archive/1762d8e6964b9f383b47a57888e55489d2432b61.tar.gz",
     ],
 )
 
diff --git a/tensorflow/tensorboard/components/tf_imports/BUILD b/tensorflow/tensorboard/components/tf_imports/BUILD
index b41a6bd446..8b91502ae2 100644
--- a/tensorflow/tensorboard/components/tf_imports/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports/BUILD
@@ -15,11 +15,9 @@ webfiles(
 
 webfiles(
     name = "lodash",
-    srcs = [
-        "lodash.html",
-        "@com_lodash",
-    ],
+    srcs = ["lodash.html"],
     path = "/tf-imports",
+    deps = ["@com_lodash"],
 )
 
 webfiles(
diff --git a/tensorflow/tensorboard/components/tf_imports/dagre.html b/tensorflow/tensorboard/components/tf_imports/dagre.html
index 48fe39da79..11164dc504 100644
--- a/tensorflow/tensorboard/components/tf_imports/dagre.html
+++ b/tensorflow/tensorboard/components/tf_imports/dagre.html
@@ -15,10 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<!--
-HTML imports are non-blocking thus getting the dependency 'graphlib'
-and 'lodash' via script imports instead.
--->
-<script src="lodash.js"></script>
-<script src="graphlib.core.js"></script>
+<link rel="import" href="lodash.html">
+<link rel="import" href="graphlib.html">
+
 <script src="dagre.core.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports/graphlib.html b/tensorflow/tensorboard/components/tf_imports/graphlib.html
index 4e19f7b008..783e33be0a 100644
--- a/tensorflow/tensorboard/components/tf_imports/graphlib.html
+++ b/tensorflow/tensorboard/components/tf_imports/graphlib.html
@@ -15,5 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<script src="lodash.js"></script>
+<link rel="import" href="lodash.html">
+
 <script src="graphlib.core.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports/lodash.html b/tensorflow/tensorboard/components/tf_imports/lodash.html
index f92aa80879..cbe35f1050 100644
--- a/tensorflow/tensorboard/components/tf_imports/lodash.html
+++ b/tensorflow/tensorboard/components/tf_imports/lodash.html
@@ -15,4 +15,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<script src="lodash.js"></script>
+<script src="../lodash/lodash.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
index 23ecee759c..2b2d827760 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -15,11 +15,37 @@ webfiles(
 
 webfiles(
     name = "lodash",
+    srcs = ["lodash.html"],
+    path = "/tf-imports-d3v4",
+    deps = ["@com_lodash"],
+)
+
+webfiles(
+    name = "threejs",
     srcs = [
-        "lodash.html",
-        "@com_lodash",
+        "threejs.html",
+        "@org_threejs//:OrbitControls.js",
+        "@org_threejs//:three.js",
     ],
-    path = "/tf-imports-d3v4",
+    path = "/tf-imports",
+)
+
+webfiles(
+    name = "numericjs",
+    srcs = [
+        "numericjs.html",
+        "@com_numericjs",
+    ],
+    path = "/tf-imports",
+)
+
+webfiles(
+    name = "weblas",
+    srcs = [
+        "weblas.html",
+        "@io_github_waylonflinn_weblas",
+    ],
+    path = "/tf-imports",
 )
 
 webfiles(
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html b/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
index 48fe39da79..11164dc504 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
@@ -15,10 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<!--
-HTML imports are non-blocking thus getting the dependency 'graphlib'
-and 'lodash' via script imports instead.
--->
-<script src="lodash.js"></script>
-<script src="graphlib.core.js"></script>
+<link rel="import" href="lodash.html">
+<link rel="import" href="graphlib.html">
+
 <script src="dagre.core.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html b/tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html
index 4e19f7b008..783e33be0a 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/graphlib.html
@@ -15,5 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<script src="lodash.js"></script>
+<link rel="import" href="lodash.html">
+
 <script src="graphlib.core.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html b/tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html
index f92aa80879..cbe35f1050 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/lodash.html
@@ -15,4 +15,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<script src="lodash.js"></script>
+<script src="../lodash/lodash.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html b/tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html
new file mode 100644
index 0000000000..adcae2ddfa
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html
@@ -0,0 +1,18 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="numeric.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html b/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
new file mode 100644
index 0000000000..75b016f0e8
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
@@ -0,0 +1,18 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="three.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html b/tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html
new file mode 100644
index 0000000000..078017faf0
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html
@@ -0,0 +1,18 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="weblas.js"></script>
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 5c6744a9b5..6a003c4e0e 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -738,15 +738,17 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   ##############################################################################
   # TensorBoard JavaScript Production Dependencies
 
-  filegroup_external(
+  webfiles_external(
       name = "com_lodash",
       licenses = ["notice"],  # MIT
-      sha256_urls = {
-          "7c7b391810bc08cf815683431857c51b5ee190062ae4f557e1e4689d6dd910ea": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
-              "https://raw.githubusercontent.com/lodash/lodash/3.8.0/lodash.js",
-          ],
-      },
+      sha256 = "0e88207e5f90af4ce8790d6e1e7d09d2702d81bce0bafdc253d18c0a5bf7661e",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/github.com/lodash/lodash/archive/3.10.1.tar.gz",
+          "https://github.com/lodash/lodash/archive/3.10.1.tar.gz",
+      ],
+      strip_prefix = "lodash-3.10.1",
+      path = "/lodash",
+      srcs = ["lodash.js"],
   )
 
   filegroup_external(
@@ -870,6 +872,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
           ],
+          "513ccd9ee1c708881120eeacd56788fc3b3da8e5c6172b20324cebbe858803fe": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/708609e0764daeb5eb64104af7aca50c520c4e6e/sinon/sinon.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/708609e0764daeb5eb64104af7aca50c520c4e6e/sinon/sinon.d.ts",
+          ],
           "44eba36339bd1c0792072b7b204ee926fe5ffe1e9e2da916e67ac55548e3668a": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
@@ -1205,33 +1211,6 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       },
   )
 
-  ##############################################################################
-  # TensorBoard JavaScript Testing Dependencies
-
-  filegroup_external(
-      name = "com_chaijs",
-      # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
-          "b926b325ad9843bf0b7a6d580ef78bb560e47c484b98680098d4fd9b31b77cd9": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
-              "https://raw.githubusercontent.com/chaijs/chai/2.3.0/chai.js",
-          ],
-      },
-  )
-
-  filegroup_external(
-      name = "org_mochajs",
-      # no @license header
-      licenses = ["notice"],  # MIT
-      sha256_urls = {
-          "e36d865a17ffdf5868e55e736526ae30f3d4bc667c85a2a28cd5c850a82361e2": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
-              "https://raw.githubusercontent.com/mochajs/mocha/2.3.4/mocha.js",
-          ],
-      },
-  )
-
   ##############################################################################
   # TensorBoard Polymer Dependencies
 
@@ -2438,7 +2417,9 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
       path = "/promise-polyfill",
       srcs = [
-          "Promise.js", "Promise-Statics.js", "promise-polyfill.html",
+          "Promise.js",
+          "Promise-Statics.js",
+          "promise-polyfill.html",
           "promise-polyfill-lite.html"
       ],
       deps = ["@org_polymer"],
@@ -2482,3 +2463,130 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "webcomponents-lite.min.js",
       ],
   )
+
+  ##############################################################################
+  # TensorBoard Testing Dependencies
+
+  webfiles_external(
+      name = "org_npmjs_registry_accessibility_developer_tools",
+      licenses = ["notice"],  # Apache License 2.0
+      sha256 = "1d6a72f401c9d53f68238c617dd43a05cd85ca5aa2e676a5b3c352711448e093",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.10.0.tgz",
+          "https://registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.10.0.tgz",
+      ],
+      strip_prefix = "package",
+      path = "/accessibility-developer-tools",
+  )
+
+  webfiles_external(
+      name = "org_npmjs_registry_async",
+      licenses = ["notice"],  # MIT
+      sha256 = "08655255ae810bf4d1cb1642df57658fcce823776d3ba8f4b46f4bbff6c87ece",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/async/-/async-1.5.0.tgz",
+          "https://registry.npmjs.org/async/-/async-1.5.0.tgz",
+      ],
+      strip_prefix = "package",
+      path = "/async",
+  )
+
+  webfiles_external(
+      name = "org_npmjs_registry_chai",
+      licenses = ["notice"],  # MIT
+      sha256 = "aca8137bed5bb295bd7173325b7ad604cd2aeb341d739232b4f9f0b26745be90",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+          "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+      ],
+      strip_prefix = "package",
+      path = "/chai",
+  )
+
+  webfiles_external(
+      name = "org_npmjs_registry_mocha",
+      licenses = ["notice"],  # MIT
+      sha256 = "13ef37a071196a2fba680799b906555d3f0ab61e80a7e8f73f93e77914590dd4",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+          "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+      ],
+      suppress = ["strictDependencies"],
+      strip_prefix = "package",
+      path = "/mocha",
+  )
+
+  webfiles_external(
+      name = "org_npmjs_registry_sinon",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "49edb057695fc9019aae992bf7e677a07de7c6ce2bf9f9facde4a245045d1532",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/sinon/-/sinon-1.17.4.tgz",
+          "https://registry.npmjs.org/sinon/-/sinon-1.17.4.tgz",
+      ],
+      strip_prefix = "package/lib",
+      path = "/sinonjs",
+  )
+
+  webfiles_external(
+      name = "org_npmjs_registry_sinon_chai",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "b85fc56f713832960b56fe9269ee4bb2cd41edd2ceb130b0936e5bdbed5dea63",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/sinon-chai/-/sinon-chai-2.8.0.tgz",
+          "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.8.0.tgz",
+      ],
+      strip_prefix = "package",
+      path = "/sinon-chai",
+  )
+
+  webfiles_external(
+      name = "org_npmjs_registry_stacky",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "c659e60f7957d9d80c23a7aacc4d71b19c6421a08f91174c0062de369595acae",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
+          "https://registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
+      ],
+      strip_prefix = "package",
+      path = "/stacky",
+  )
+
+  webfiles_external(
+      name = "org_npmjs_registry_web_component_tester",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "9d4ebd4945df8a936916d4d32b7f280f2a3afa35f79e7ca8ad3ed0a42770c537",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/web-component-tester/-/web-component-tester-4.3.6.tgz",
+          "https://registry.npmjs.org/web-component-tester/-/web-component-tester-4.3.6.tgz",
+      ],
+      strip_prefix = "package",
+      path = "/web-component-tester",
+      suppress = [
+          "absolutePaths",
+          "strictDependencies",
+      ],
+      deps = [
+          "@com_lodash",
+          "@org_npmjs_registry_accessibility_developer_tools",
+          "@org_npmjs_registry_async",
+          "@org_npmjs_registry_chai",
+          "@org_npmjs_registry_mocha",
+          "@org_npmjs_registry_sinon",
+          "@org_npmjs_registry_sinon_chai",
+          "@org_npmjs_registry_stacky",
+          "@org_polymer_test_fixture",
+      ],
+  )
+
+  webfiles_external(
+      name = "org_polymer_test_fixture",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "59d6cfb1187733b71275becfea181fe0aa1f734df5ff77f5850c806bbbf9a0d9",
+      strip_prefix = "test-fixture-2.0.1",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/test-fixture/archive/v2.0.1.tar.gz",
+          "https://github.com/PolymerElements/test-fixture/archive/v2.0.1.tar.gz",
+      ],
+      path = "/test-fixture",
+  )
-- 
GitLab


From 90311e78dd6d0a7879bfa37f6aaf0db2e78f0ae9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 00:25:31 -0700
Subject: [PATCH 1147/1563] Migrate the tf_graph component to use webfiles.

This involved rewriting the demo to only use the tf_graph component. We will demo the other components (such as tf-graph-board) in other directories.

PiperOrigin-RevId: 155474818
---
 tensorflow/BUILD                              |    1 +
 .../tensorboard/components/tf_graph/BUILD     |   60 +
 .../components/tf_graph/demo/BUILD            |   26 +
 .../components/tf_graph/demo/data/graph.pbtxt | 4606 +++++++++++++++++
 .../tf_graph/demo/demo_datasets.json          |  123 -
 .../components/tf_graph/demo/index.html       |   98 +-
 .../tf_graph/demo/tf-graph-demo.html          |  202 -
 .../tf_graph/tf-graph-controls.html           |  824 ---
 .../components/tf_graph/tf-graph-icon.html    |  296 --
 9 files changed, 4765 insertions(+), 1471 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_graph/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/demo/demo_datasets.json
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/demo/tf-graph-demo.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/tf-graph-icon.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 8d94a2021b..0efbfc0cf5 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -333,6 +333,7 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo:all_files",
         "//tensorflow/tensorboard/components/tf_globals:all_files",
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph/BUILD b/tensorflow/tensorboard/components/tf_graph/BUILD
new file mode 100644
index 0000000000..7d19bf4266
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph/BUILD
@@ -0,0 +1,60 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph",
+    srcs = [
+        "tf-graph.html",
+        "tf-graph-minimap.html",
+        "tf-graph-scene.html",
+    ],
+    path = "/tf-graph",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "@org_polymer",
+        "@org_polymer_iron_flex_layout",
+        "@org_polymer_iron_icons",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_input",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_radio_group",
+        "@org_polymer_paper_toggle_button",
+        "@org_polymer_paper_tooltip",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph.html",
+        "tf-graph-minimap.html",
+        "tf-graph-scene.html",
+    ],
+    destdir = "tf-graph",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/BUILD b/tensorflow/tensorboard/components/tf_graph/demo/BUILD
new file mode 100644
index 0000000000..30c71890ae
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/demo_datasets.json b/tensorflow/tensorboard/components/tf_graph/demo/demo_datasets.json
deleted file mode 100644
index f5ca9aada7..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/demo/demo_datasets.json
+++ /dev/null
@@ -1,123 +0,0 @@
-[
-  {
-    "name": "Mnist Eval",
-    "path": "mnist_eval.pbtxt"
-  },
-  {
-    "name": "Mnist with summaries (+stats)",
-    "path": "mnist_with_summaries.pbtxt",
-    "runMetadata": [
-      {
-        "tag": "step100",
-        "path": "mnist_with_summaries_step100.pbtxt"
-      },
-      {
-        "tag": "step1000",
-        "path": "mnist_with_summaries_step1000.pbtxt"
-      }
-    ]
-  },
-  {
-    "name": "Mnist Train (with shapes)",
-    "path": "mnist_train_shapes.pbtxt"
-  },
-  {
-    "name": "Inception Train (huge)",
-    "path": "inception_train.pbtxt"
-  },
-  {
-    "name": "Inception Train Eval",
-    "path": "inception_train_eval.pbtxt"
-  },
-  {
-    "name": "Inception Test",
-    "path": "inception_test_eval.pbtxt"
-  },
-  {
-    "name": "PTB Word LSTM Train",
-    "path": "ptb_word_lstm_train.pbtxt"
-  },
-  {
-    "name": "PTB Word LSTM Train Eval",
-    "path": "ptb_word_lstm_train_eval.pbtxt"
-  },
-  {
-    "name": "PTB Word LSTM Test",
-    "path": "ptb_word_lstm_test_eval.pbtxt"
-  },
-  {
-    "name": "Cifar10 Train (+stats)",
-    "path": "cifar10_train.pbtxt",
-    "runMetadata": [
-      {
-        "tag": "step0",
-        "path": "cifar10_train_step0.pbtxt"
-      },
-      {
-        "tag": "step100",
-        "path": "cifar10_train_step100.pbtxt"
-      },
-      {
-        "tag": "step200",
-        "path": "cifar10_train_step200.pbtxt"
-      },
-      {
-        "tag": "step300",
-        "path": "cifar10_train_step300.pbtxt"
-      }
-    ]
-  },
-  {
-    "name": "Cifar10 Multi-GPU Train",
-    "path": "cifar10_multi_gpu_train.pbtxt"
-  },
-  {
-    "name": "Cifar10 Eval (+stats)",
-    "path": "cifar10_eval.pbtxt",
-    "runMetadata": [
-      {
-        "tag": "step0",
-        "path": "cifar10_eval_step0.pbtxt"
-      },
-      {
-        "tag": "step10",
-        "path": "cifar10_eval_step10.pbtxt"
-      },
-      {
-        "tag": "step20",
-        "path": "cifar10_eval_step20.pbtxt"
-      }
-    ]
-  },
-  {
-    "name": "Fatcat LSTM",
-    "path": "fatcat_lstm.pbtxt"
-  },
-  {
-    "name": "Legacy Inception Renamed",
-    "path": "legacy_inception_renamed.pbtxt"
-  },
-  {
-    "name": "Wolfe (Broken)",
-    "path": "wolfe1.pbtxt"
-  },
-  {
-    "name": "Wolfe (Fixed)",
-    "path": "wolfe2.pbtxt"
-  },
-  {
-    "id": "alex",
-    "name": "AlexNet",
-    "path": "alexnet.pbtxt"
-  },
-  {
-    "id": "alexprivate",
-    "name": "AlexNet Private",
-    "path": "alexnet.pbtxt",
-    "private": true
-  },
-  {
-    "name": "TestError404",
-    "path": "nofile"
-  }
-]
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/index.html b/tensorflow/tensorboard/components/tf_graph/demo/index.html
index c89490f44d..52e2f0b934 100644
--- a/tensorflow/tensorboard/components/tf_graph/demo/index.html
+++ b/tensorflow/tensorboard/components/tf_graph/demo/index.html
@@ -15,32 +15,78 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph.html">
+<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 600px;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-demo">
+      <template>
+        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
+        <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            out-graph="{{_graph}}">
+        </tf-graph-loader>
 
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-    <title>tf-graph Demo</title>
-    <!-- Libraries that should be imported in TensorBoard when the Graph visualizer ports to TensorBoard -->
-    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <script src="../../es6-promise/promise.min.js"></script>
-    <link rel="import" href="tf-graph-demo.html">
-    <style>
-      html {
-        width: 100%;
-        height: 100%;
-      }
+        <!-- We color ops in the graph by XLA cluster. -->
+        <tf-graph id="graph" color-by="xla_cluster"></tf-graph>
+      </template>
+      <script>
+        "use strict";
 
-      body {
-        margin: 0;
-        padding: 0;
-        width: 100%;
-        height: 100%;
-      }
-    </style>
-  </head>
+        Polymer({
+          is: "tf-graph-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
 
-  <body unresolved>
-    <tf-graph-demo></tf-graph-demo>
-  </body>
-</html>
+            // This property will be updated by the graph loader.
+            _graph: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_graphUpdated(_graph)',
+          ],
+          _graphUpdated: function(slimGraph) {
+            const tracker = tf.graph.util.getTracker(this.$.loader);
+            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
+                tracker, 100, 'Namespace hierarchy');
+            const hierarchyOptions = {};
+            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
+                function(graphHierarchy) {
+              // We have parsed and built the graph object from a pbtxt file. Render the graph.
+              this.$.graph.set('basicGraph', slimGraph);
+              this.$.graph.set('graphHierarchy', graphHierarchy);
+            }.bind(this));
+          },
+        });
+      </script>
+    </dom-module>
+    <div id='demo-container'>
+      <tf-graph-demo></tf-graph-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/tf-graph-demo.html b/tensorflow/tensorboard/components/tf_graph/demo/tf-graph-demo.html
deleted file mode 100644
index d5fd41dfeb..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/demo/tf-graph-demo.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../../polymer/polymer.html">
-<link rel="import" href="../../tf-graph-board/tf-graph-board.html">
-<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
-<link rel="import" href="../../tf-graph/tf-graph-controls.html">
-
-<!--
-Element for tf-graph demo page
-
-Example:
-
-<tf-graph-demo></tf-graph-demo>
--->
-<dom-module id="tf-graph-demo">
-<template>
-<style>
-
-:host /deep/ {
-  font-family: 'Roboto', sans-serif;
-}
-
-.main {
-  position: absolute;
-  right: 0;
-  left: 250px;
-  height: 100%;
-}
-
-.side {
-  position: absolute;
-  left: 0;
-  width: 250px;
-  height: 100%;
-  border: 1px solid black;
-  box-sizing: border-box;
-}
-
-.all {
-  position: relative;
-  width: 100%;
-  height: 100%
-}
-
-</style>
-<div class="all">
-  <div class="side">
-    <!-- The observatory header component is injected in during vulcanization
-         and an instance of it is initialized and filled here when the demo
-         app initializes. -->
-    <div id="observatory-header"></div>
-    <tf-graph-controls
-        devices-for-stats="{{_devicesForStats}}"
-        color-by-params="[[colorByParams]]"
-        stats="[[stats]]"
-        color-by="{{colorBy}}"
-        datasets="[[datasets]]"
-        render-hierarchy="[[_renderHierarchy]]"
-        selected-dataset="{{selectedDataset}}"
-        selected-file="{{selectedFile}}"
-        selected-metadata-tag="{{selectedMetadataTag}}"
-        show-session-runs-dropdown="[[showSessionRunsDropdown]]"
-        show-upload-button="[[showUploadButton]]"
-    ></tf-graph-controls>
-    <tf-graph-loader id="loader"
-        datasets="[[datasets]]"
-        selected-dataset="[[selectedDataset]]"
-        selected-metadata-tag="[[selectedMetadataTag]]"
-        selected-file="[[selectedFile]]"
-        out-graph-hierarchy="{{graphHierarchy}}"
-        out-graph="{{graph}}"
-        out-stats="{{stats}}"
-        progress="{{_progress}}"
-        out-hierarchy-params="{{_hierarchyParams}}"
-    ></tf-graph-loader>
-  </div>
-  <div class="main">
-    <tf-graph-board id="graphboard"
-        color-by="[[colorBy]]"
-        color-by-params="{{colorByParams}}"
-        devices-for-stats="[[_devicesForStats]]"
-        graph-hierarchy="[[graphHierarchy]]"
-        graph="[[graph]]"
-        hierarchy-params="[[_hierarchyParams]]"
-        progress="[[_progress]]"
-        render-hierarchy="{{_renderHierarchy}}"
-        stats="[[stats]]"
-    ></tf-graph-board>
-  </div>
-</div>
-</template>
-</dom-module>
-
-<script>
-(function(){
-
-Polymer({
-  is: 'tf-graph-demo',
-  properties: {
-    datasets: {
-      type: Object
-    },
-    selectedDataset: {
-      type: Number,
-      value: 0,
-      observer: '_selectedDatasetChanged'
-    },
-    _renderHierarchy: Object,
-    _progress: Object,
-    showSessionRunsDropdown: {
-      type: Boolean,
-      value: true
-    },
-    showUploadButton: {
-      type: Boolean,
-      value: true
-    }
-  },
-  created: function() {
-    let queryParams = tf.graph.util.getQueryParams(location.search);
-    let selectedDataset = 0;
-
-    if (typeof DEMO_DATASETS === 'undefined') {
-      DEMO_DATASETS = 'demo_datasets.json';
-    }
-
-    d3.json(DEMO_DATASETS, function (error, datasets) {
-        let publicDatasets = [];
-
-        if (error) {
-          console.log('Error loading demo datasets:');
-          console.log(error);
-          return;
-        }
-
-        if(typeof DEMO_DIR_PREFIX === 'undefined') {
-          DEMO_DIR_PREFIX = 'tf_model_zoo/';
-        }
-        _.each(datasets, function(dataset, index) {
-          if (queryParams['graphid'] && dataset.id == queryParams['graphid']) {
-            selectedDataset = index;
-          } else if (dataset['private']) {
-            return;
-          }
-
-          dataset.path = this._normalizePath(dataset.path);
-          if (dataset.runMetadata != null) {
-            _.each(dataset.runMetadata, function(metadata) {
-              metadata.path = this._normalizePath(metadata.path);
-            }, this);
-          }
-          publicDatasets.push(dataset);
-        }, this);
-        this.set('datasets', publicDatasets);
-        if (selectedDataset != 0) {
-          this.set('selectedDataset', selectedDataset);
-        }
-    }.bind(this));
-  },
-  ready: function() {
-    if (typeof IS_OBSERVATORY !== 'undefined' && IS_OBSERVATORY) {
-      // Create the header and add it to the DOM. This component is injected in
-      // during vulcanization.
-      document.getElementById('observatory-header').appendChild(
-          document.createElement('tf-graph-observatory-header'));
-
-      this.set('showSessionRunsDropdown', false);
-      this.set('showUploadButton', false);
-    }
-  },
-  _normalizePath: function(path) {
-    return this.resolveUrl(DEMO_DIR_PREFIX + path);
-  },
-  _selectedDatasetChanged: function() {
-    if (this.datasets) {
-      let dataset = this.datasets[this.selectedDataset];
-      let queryParams = '';
-      if (dataset['id']) {
-        queryParams = '?graphid=' + dataset['id'];
-      }
-      window.history.replaceState(
-          null, null, location.pathname + queryParams);
-    }
-  }
-});
-})();
-</script>
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html
deleted file mode 100644
index f2a1b5658f..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-controls.html
+++ /dev/null
@@ -1,824 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-menu/paper-menu.html">
-<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../paper-radio-group/paper-radio-group.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-
-<dom-module id="tf-graph-controls">
-<template>
-<style>
-:host {
-  font-size: 12px;
-  color: gray;
-  --paper-font-subhead: {
-    font-size: 14px;
-    color: gray;
-  };
-  --paper-dropdown-menu-icon: {
-    width: 15px;
-    height: 15px;
-  };
-  --paper-dropdown-menu-button: {
-    padding: 0;
-  };
-  --paper-dropdown-menu-input: {
-    padding: 0;
-  };
-  --paper-item-min-height: 30px;
-}
-
-paper-button[raised].keyboard-focus {
-  font-weight: normal;
-}
-
-.run-dropdown {
-  --paper-input-container: {
-    padding: 9px 0 0 25px;
-  };
-}
-
-.color-dropdown {
-  --paper-input-container: {
-    padding: 9px 0 0 13px;
-  };
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-table td {
-  padding: 0;
-  margin: 0;
-}
-
-.allcontrols {
-  width: 188px;
-  padding: 0 30px;
-}
-
-.legend-holder {
-  position: absolute;
-  bottom: 0;
-  padding-bottom: 10px;
-}
-
-paper-radio-button {
-  display: block;
-  padding: 5px;
-}
-svg.icon {
-  width: 60px;
-  height: 18px;
-}
-.icon ellipse {
-  rx: 10px;
-  ry: 5px;
-  stroke: #CCC;
-  stroke-width: 1px;
-  fill: #FFFFFF;
-  cy: 10px;
-}
-.icon rect {
-  height: 14px;
-  width: 35px;
-  rx: 5px;
-  ry: 5px;
-  stroke: #CCC;
-  stroke-width: 2px;
-  fill: #D9D9D9;
-}
-.domainValues {
-  margin-bottom: 10px;
-  width: 165px;
-}
-.domainStart {
-  float: left;
-}
-.domainEnd {
-  float: right;
-}
-.colorBox {
-  width: 20px;
-}
-
-.image-icon {
-  width: 24px;
-  height: 24px;
-}
-
-.help-icon {
-  height: 15px;
-  margin: 0;
-  padding: 0;
-}
-
-.gray {
-  color: #666;
-}
-
-.title {
-  font-size: 16px;
-  margin: 8px 5px 8px 0;
-  color: black;
-}
-.title small {
-  font-weight: normal;
-}
-.deviceList, .xlaClusterList {
-  max-height: 200px;
-  overflow-y: auto;
-}
-
-#file {
-  padding: 8px 0;
-}
-
-.color-legend-row {
-  clear: both;
-  height: 20px;
-  margin-top: 5px;
-  position: relative;
-}
-
-.color-legend-row svg {
-  position: absolute;
-  top: -1px;
-  width: 40px;
-}
-
-.color-legend-row span.color-legend-value {
-  margin-left: 60px;
-}
-
-#grey-rect {
-  fill: #eee;
-  stroke: #a6a6a6;
-}
-
-#faded-rect {
-  fill: url(#rectHatch);
-  stroke: var(--tb-graph-faded);
-}
-
-.button-text {
-  text-transform: none;
-  padding: 8px 18px 0 18px;
-  font-size: 14px
-}
-
-.upload-button {
-  width: 165px;
-  height: 25px;
-  text-transform: none;
-  margin-top: 4px;
-}
-
-.iconbutton {
-  padding: 2px;
-  width: 30px;
-  height: 30px;
-  color: var(--paper-orange-500);
-}
-
-.hidden-input {
-  height: 0px;
-  width: 0px;
-  overflow:hidden;
-}
-
-.allcontrols .control-holder {
-  display: flex;
-  clear: both;
-}
-
-.allcontrols .control-holder paper-radio-group {
-  margin-top: 5px;
-}
-
-span.counter {
-  font-size: 13px;
-  color: gray;
-}
-
-.runs paper-item {
-  --paper-item: {
-    white-space: nowrap;
-  }
-}
-
-table.control-holder {
-  border: 0;
-  border-collapse: collapse;
-}
-
-table.tf-graph-controls td.input-element-table-data {
-  padding: 0 0 0 20px;
-}
-
-/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
-/*  tooltips do not appear. */
-#color-by-radio-group paper-radio-button {
-  pointer-events: auto !important;
-}
-</style>
-<svg width="0" height="0">
-  <defs>
-    <g id="legend-rect">
-      <rect x="1" y="1" stroke-width="2px" height="14" width="35" rx="5" ry="5"></rect>
-    </g>
-    <g id="grey-rect">
-       <use xmlns:xlink="http://www.w3.org/1999/xlink"
-            xlink:href="#legend-rect"/>
-     </g>
-     <g id="faded-rect">
-       <use xmlns:xlink="http://www.w3.org/1999/xlink"
-            xlink:href="#legend-rect"/>
-     </g>
-  </defs>
-</svg>
-<div class="allcontrols">
-  <div class="control-holder">
-    <paper-icon-button icon="aspect-ratio" class="iconbutton" on-click="fit" alt="Fit to screen">
-    </paper-icon-button>
-    <paper-button class="button-text" on-click="fit">Fit to screen
-    </paper-button>
-  </div>
-  <div class="control-holder">
-    <paper-icon-button icon="file-download" class="iconbutton" on-click="download" alt="Download PNG">
-    </paper-icon-button>
-    <paper-button class="button-text" on-click="download">Download PNG
-    </paper-button>
-    <a href="#" id="graphdownload" class="title" download="graph.png">
-    </a>
-  </div>
-  <div class="control-holder runs">
-    <div class="title">Run <span class="counter">([[datasets.length]])</span></div>
-    <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
-      <paper-menu id="select" class="dropdown-content" selected="{{selectedDataset}}">
-        <template is="dom-repeat" items="[[datasets]]">
-          <paper-item>[[item.name]]</paper-item>
-        </template>
-      </paper-menu>
-    </paper-dropdown-menu>
-  </div>
-  <template is="dom-if" if="[[showSessionRunsDropdown]]">
-    <div class="control-holder">
-      <div class="title">Session runs <span class="counter">([[_numSessionRuns(metadataTags)]])</span></div>
-      <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
-        <paper-menu id="select" class="dropdown-content" selected="{{selectedMetadataTag}}">
-          <template is="dom-repeat" items="[[metadataTags]]">
-            <paper-item>[[item.tag]]</paper-item>
-          </template>
-          <paper-item>None</paper-item>
-        </paper-menu>
-      </paper-dropdown-menu>
-    </div>
-  </template>
-  <template is="dom-if" if="[[showUploadButton]]">
-    <div class="control-holder">
-      <div class="title">Upload</div>
-      <paper-button raised class="text-button upload-button"
-          on-click="_getFile">Choose File</paper-button>
-      <div class="hidden-input">
-        <input type="file" id="file" name="file" on-change="_updateFileInput" />
-      </div>
-    </div>
-  </template>
-  <table class="control-holder">
-    <tr>
-      <td class="title">Trace inputs</td>
-      <td class="input-element-table-data">
-        <paper-toggle-button id="trace-inputs"></paper-toggle-button>
-      </td>
-    </tr>
-    <template is="dom-if" if="[[healthPillsFeatureEnabled]]">
-      <tr>
-        <td class="title">Show health pills</td>
-        <td class="input-element-table-data">
-          <paper-toggle-button checked="{{healthPillsToggledOn}}"></paper-toggle-button>
-        </td>
-      </tr>
-    </template>
-  </table>
-  <div class="control-holder">
-    <div class="title">Color</div>
-    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
-      <paper-radio-button name="structure">Structure</paper-radio-button>
-
-      <paper-radio-button name="device">Device</paper-radio-button>
-
-      <paper-radio-button id="xla-cluster-radio-button"
-                          name="xla_cluster"
-                          disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
-        XLA Cluster
-      </paper-radio-button>
-      <paper-tooltip for="xla-cluster-radio-button" position="right">
-        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
-      </paper-tooltip>
-
-      <paper-radio-button id="compute-time-radio-button"
-                          name="compute_time"
-                          disabled="[[!stats]]">
-        Compute time
-      </paper-radio-button>
-      <paper-tooltip for="compute-time-radio-button" position="right">
-        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
-        FileWriter when a specific session is run.
-      </paper-tooltip>
-
-      <paper-radio-button id="memory-radio-button"
-                          name="memory"
-                          disabled="[[!stats]]">
-        Memory
-      </paper-radio-button>
-      <paper-tooltip for="memory-radio-button" position="right">
-        Coloring by memory is only enabled if the RunMetadata proto is passed to the
-        FileWriter when a specific session is run.
-      </paper-tooltip>
-    </paper-radio-group>
-  </div>
-  <div>
-    <template is="dom-if" if="[[_isGradientColoring(stats, colorBy)]]">
-      <svg width="140" height="20" style="margin: 0 5px" class="color-text">
-        <defs>
-          <linearGradient id="linearGradient" x1="0%" y1="0%" x2="100%" y2="0%">
-            <stop class="start" offset="0%"
-                stop-color$="[[_currentGradientParams.startColor]]"/>
-            <stop class="end" offset="100%"
-                stop-color$="[[_currentGradientParams.endColor]]"/>
-          </linearGradient>
-        </defs>
-        <rect x="0" y="0" width="135" height="20" fill="url(#linearGradient)"
-            stroke="black" />
-      </svg>
-      <div class="domainValues color-text">
-        <div class="domainStart">[[_currentGradientParams.minValue]]</div>
-        <div class="domainEnd">[[_currentGradientParams.maxValue]]</div>
-      </div>
-      <br style="clear: both">
-      <div>Devices included in stats:</div>
-      <div class="deviceList">
-        <table>
-        <template is="dom-repeat" items="[[_getDevices(devicesForStats)]]">
-          <tr>
-            <td>
-              <input type="checkbox" value$="[[item.device]]" checked$="[[item.used]]" on-click="_deviceCheckboxClicked"/>
-            </td>
-            <td>
-              <div>
-                <span>[[item.suffix]]</span>
-                <template is="dom-if" if="[[item.ignoredMsg]]">
-                  <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-                  <paper-tooltip position="right" animation-delay="0">[[item.ignoredMsg]]</paper-tooltip>
-                </template>
-              </div>
-            </td>
-          </tr>
-        </template>
-        </table>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'structure')]]">
-      <div class="color-text">
-        <div class="color-legend-row">
-          <div style="position: absolute;">
-            colors
-          </div>
-          <span class="color-legend-value">same substructure</span>
-        </div>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                 xlink:href="#grey-rect" x="0" y="0"/>
-          </svg>
-          <span class="color-legend-value">unique substructure</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'device')]]">
-      <div class="color-text">
-        <div class="deviceList">
-          <table>
-          <template is="dom-repeat" items="[[colorByParams.device]]">
-            <tr>
-              <td style$="[[_getBackgroundColor(item.color)]]">
-                <div class="colorBox"></div>
-              </td>
-              <td>
-                <div>[[item.device]]</div>
-              </td>
-            </tr>
-          </template>
-          </table>
-        </div>
-        <br/>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                 xlink:href="#grey-rect" x="0" y="0"/>
-          </svg>
-          <span class="color-legend-value">unknown device</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
-      <div class="color-text">
-        <div class="xlaClusterList">
-          <table>
-          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
-            <tr>
-              <td style$="[[_getBackgroundColor(item.color)]]">
-                <div class="colorBox"></div>
-              </td>
-              <td>
-                <div>[[item.xla_cluster]]</div>
-              </td>
-            </tr>
-          </template>
-          </table>
-        </div>
-        <br/>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                 xlink:href="#grey-rect" x="0" y="0"/>
-          </svg>
-          <span class="color-legend-value">unknown XLA cluster</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_statsNotNull(stats)]]">
-      <div class="color-legend-row">
-        <svg>
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                xlink:href="#faded-rect" x="0" y="0"/>
-        </svg>
-        <span class="color-legend-value">unused substructure</span>
-      </div>
-    </template>
-  </div>
-  <!--
-    Due to limited vertical space on the left sidebar, hide the legend whenever
-    we show a list of devices to include in stats.
-  -->
-  <template is="dom-if" if="[[!_isGradientColoring(stats, colorBy)]]">
-    <div class="legend-holder">
-      <table>
-        <tr>
-          <td><div class="title">Graph</div></td>
-          <td>(* = expandable)</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon">
-              <rect transform="translate(3, 1)" height="14" width="35"
-                  rx="5" ry="5"/>
-            </svg>
-          </td>
-          <td>Namespace<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" preserveAspectRatio="xMinYMid meet"
-                viewBox="0 0 10 10">
-              <use xlink:href="#op-node-stamp" fill="white" stroke="#ccc" x="9.5"
-                y="6" />
-            </svg>
-          </td>
-          <td>OpNode</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet"
-                viewBox="0 0 12 12">
-              <use xlink:href="#op-series-horizontal-stamp" fill="white"
-                  stroke="#ccc" x="2" y="2"/>
-            </svg>
-          </td>
-          <td>Unconnected series<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <use xlink:href="#op-series-vertical-stamp"
-                  fill="white" stroke="#ccc" x="2" y="2"/>
-            </svg>
-          </td>
-          <td>Connected series<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon">
-              <circle fill="white" stroke="#848484" cx="10" cy="10" r="5"/>
-            </svg>
-          </td>
-          <td>Constant</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="image-icon" viewBox="0 0 12 12" width="24" height="24">
-              <use x="0" y="0" class="image-icon" xlink:href="#summary-icon"/>
-            </svg>
-          </td>
-          <td>Summary</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <defs>
-                <marker id="ref-arrowhead-legend" fill="#bbb" markerWidth="10"
-                    markerHeight="10" refX="1" refY="5" orient="auto">
-                  <path d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"/>
-                </marker>
-              </defs>
-              <path stroke="#bbb"
-                  d="M2 9 l 23 0" stroke-linecap="round" />
-            </svg>
-          </td>
-          <td>Dataflow edge</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <path stroke="#bbb"
-                d="M2 9 l 23 0" stroke-linecap="round" stroke-dasharray="2, 2" />
-            </svg>
-          </td>
-          <td>Control dependency edge</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <path marker-start="url(#ref-arrowhead-legend)"
-                stroke="#bbb" d="M2 9 l 23 0"
-                stroke-linecap="round" />
-            </svg>
-          </td>
-          <td>Reference edge</td>
-        </tr>
-      </table>
-    </div>
-  </template>
-  </div>
-</template>
-<script>
-(function() { // Private scope.
-/**
- * Stats from device names that match these regexes will be excluded by default.
- * The user can still turn on a device by selecting the checkbox in the device list.
- * See b/29089982 for context.
- */
-var DEVICE_NAMES_EXCLUDE = [
-  {
-    regex: /gpu:[0-9]+$/,
-    msg: 'Excluded by default since this is a CPU thread setting up GPU kernels.'
-  }
-];
-
-Polymer({
-  is: 'tf-graph-controls',
-  properties: {
-    // Public API.
-    stats: {
-      value: null,
-      type: Object,
-      observer: '_statsChanged'
-    },
-    devicesForStats: {
-      value: null,
-      type: Object,
-      notify: true,
-      readonly: true,
-    },
-    colorBy: {
-      type: String,
-      value: 'structure',
-      notify: true,
-      readonly: true
-    },
-    colorByParams: Object,
-    datasets: {
-      type: Array,
-      observer: '_datasetsChanged'
-    },
-    renderHierarchy: {
-      type: Object,
-      notify: true,
-    },
-    metadataTags: {
-      type: Array,
-      computed: '_getMetadataTags(selectedDataset, datasets)'
-    },
-    selectedDataset: {
-      type: Number,
-      notify: true,
-      value: 0,
-      observer: '_selectedDatasetChanged'
-    },
-    selectedFile: {
-      type: Object,
-      notify: true
-    },
-    selectedMetadataTag: {
-      type: Number,
-      notify: true,
-      value: -1
-    },
-    _currentGradientParams: {
-      type: Object,
-      computed: '_getCurrentGradientParams(colorByParams, colorBy)'
-    },
-    showSessionRunsDropdown: {
-      type: Boolean,
-      value: true
-    },
-    showUploadButton: {
-      type: Boolean,
-      value: true
-    },
-    // This stores whether the feature for showing health pills is enabled in the first place.
-    healthPillsFeatureEnabled: Boolean,
-    // This stores whether to show health pills. Only relevant if healthPillsFeatureEnabled. The
-    // user can toggle this value.
-    healthPillsToggledOn: {
-      type: Boolean,
-      notify: true,
-    },
-  },
-  listeners: {
-    'trace-inputs.change': '_traceInputToggleChanged'
-  },
-  _traceInputToggleChanged: function(event) {
-    // Flip the state of the trace inputs flag.
-    this.renderHierarchy.traceInputs = event.target.active;
-    tf.graph.scene.node.traceInputs(this.renderHierarchy);
-  },
-  _xlaClustersProvided: function(renderHierarchy) {
-    return renderHierarchy &&
-        renderHierarchy.hierarchy &&
-        renderHierarchy.hierarchy.xlaClusters.length > 0;
-  },
-  _statsChanged: function(stats) {
-    if (stats == null) {
-      return;
-    }
-    var devicesForStats = {};
-    var devices = _.each(stats.dev_stats, function(d) {
-      // Avoid device names that are ignored by default.
-      var exclude = _.some(DEVICE_NAMES_EXCLUDE, function(rule) {
-        return rule.regex.test(d.device);
-      });
-      if (!exclude) {
-        devicesForStats[d.device] = true;
-      }
-    });
-    this.set('devicesForStats', devicesForStats);
-  },
-  _getDevices: function(devicesForStats) {
-    var devices = _.map(this.stats.dev_stats, function(d) {
-      return d.device;
-    });
-    // Devices names can be long so we remove the longest common prefix
-    // before showing the devices in a list.
-    var suffixes = tf.graph.util.removeCommonPrefix(devices);
-    return _.map(devices, function(device, i) {
-      var ignoredMsg = null;
-      _.each(DEVICE_NAMES_EXCLUDE, function(rule) {
-        if (rule.regex.test(device)) {
-          ignoredMsg = rule.msg;
-        }
-      });
-      return {
-        device: device,
-        suffix: suffixes[i],
-        used: devicesForStats[device],
-        ignoredMsg: ignoredMsg
-      };
-    });
-  },
-  _deviceCheckboxClicked: function(checkbox) {
-    // Update the device map.
-    var devicesForStats = _.extend({}, this.devicesForStats);
-    var device = checkbox.target.value;
-    if (checkbox.target.checked) {
-      devicesForStats[device] = true;
-    } else {
-      delete devicesForStats[device];
-    }
-    this.set('devicesForStats', devicesForStats);
-  },
-  _numSessionRuns: function(metadataTags) {
-    return metadataTags != null ? metadataTags.length : 0;
-  },
-  _getBackgroundColor: function(color) {
-    return 'background-color:' + color;
-  },
-  fit: function() {
-    document.querySelector('#scene').fit();
-  },
-  _isGradientColoring: function(stats, colorBy) {
-    return ["compute_time", "memory"].indexOf(colorBy) !== -1
-        && stats != null;
-  },
-  _equals: function(a, b) {
-    return a === b;
-  },
-  _getCurrentGradientParams: function(colorByParams, colorBy) {
-    if (!this._isGradientColoring(this.stats, colorBy)) {
-      return;
-    }
-    var params = colorByParams[colorBy];
-    var minValue = params.minValue;
-    var maxValue = params.maxValue;
-    if (colorBy === 'memory') {
-      minValue = tf.graph.util.convertUnitsToHumanReadable(
-          minValue, tf.graph.util.MEMORY_UNITS);
-      maxValue = tf.graph.util.convertUnitsToHumanReadable(
-          maxValue, tf.graph.util.MEMORY_UNITS);
-    } else if (colorBy === 'compute_time') {
-      minValue = tf.graph.util.convertUnitsToHumanReadable(
-          minValue, tf.graph.util.TIME_UNITS);
-      maxValue = tf.graph.util.convertUnitsToHumanReadable(
-          maxValue, tf.graph.util.TIME_UNITS);
-    }
-    return {
-      minValue: minValue,
-      maxValue: maxValue,
-      startColor: params.startColor,
-      endColor: params.endColor
-    };
-  },
-  download: function() {
-    this.$.graphdownload.click();
-  },
-  _updateFileInput: function(e) {
-    var file = e.target.files[0];
-    if (!file) {
-      return;
-    }
-    this._setDownloadFilename(file.name);
-    this.set('selectedFile', e);
-  },
-  _datasetsChanged: function(newDatasets, oldDatasets) {
-    if (oldDatasets != null || this.selected == null) {
-      // Select the first dataset by default.
-      this.set('selectedDataset', 0);
-      this._setDownloadFilename(this.datasets[this.selectedDataset].path);
-    }
-  },
-  _getMetadataTags: function(selectedDataset, datasets) {
-    return this.datasets[selectedDataset].runMetadata;
-  },
-  _selectedDatasetChanged: function(newDataset, oldDataset) {
-    if (this.datasets) {
-      this.set('selectedMetadataTag', -1);
-      this.set('colorBy', 'structure');
-      this.$['trace-inputs'].active = false; // Set trace input to off-state.
-      this._setDownloadFilename(this.datasets[newDataset].path);
-    }
-  },
-  _getFile: function() {
-    this.$$("#file").click();
-  },
-  _setDownloadFilename: function(graphPath) {
-    // Strip off everything before the last "/" and strip off the file
-    // extension in order to get the name of the PNG for the graph.
-    var dotIndex = graphPath.lastIndexOf('.');
-    if (dotIndex) {
-      graphPath = graphPath.substring(0, dotIndex);
-    }
-    var slashIndex = graphPath.lastIndexOf('/');
-    if (slashIndex) {
-      graphPath = graphPath.substring(slashIndex + 1);
-    }
-    this.$.graphdownload.setAttribute('download', graphPath + '.png');
-  }
-});
-})(); // Closing private scope.
-</script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-icon.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-icon.html
deleted file mode 100644
index a3e9dc59c5..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-icon.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-
-<dom-module id="tf-graph-icon">
-  <style>
-    .faded-rect {
-      fill: url(#rectHatch);
-    }
-
-    .faded-ellipse {
-      fill: url(#ellipseHatch);
-    }
-
-    .faded-rect, .faded-ellipse, .faded-series {
-      stroke:   var(--tb-graph-faded) !important;
-    }
-  </style>
-  <template>
-    <template is="dom-if" if="[[_isType(node, type, 'OP')]]">
-      <template is="dom-if" if="[[_isConst(node, const)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 10 10">
-          <circle cx="5" cy="5" r="3"
-              fill$="[[_getFill(_computedFill, 'OP')]]"
-              stroke$="[[_getStroke(_computedFill, 'OP')]]" />
-        </svg>
-      </template>
-      <template is="dom-if" if="[[_isSummary(node, summary)]]">
-        <svg width$="[[height]]" height$="[[height]]" viewBox="0 0 12 12">
-          <use x="0" y="0" xlink:href="#summary-icon" />
-        </svg>
-      </template>
-      <template is="dom-if" if="[[_isRegularOp(node, const, summary)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 8">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-              xlink:href="#op-node-stamp"
-              fill$="[[_getFill(_computedFill, 'OP')]]"
-              stroke$="[[_getStroke(_computedFill, 'OP')]]"
-              class$="{{_fadedClass(renderInfo, 'ellipse')}}"
-              x="8" y="4" />
-        </svg>
-      </template>
-    </template>
-    <template is="dom-if" if="[[_isType(node, type, 'META')]]">
-      <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 37 16">
-        <rect x="1" y="1"
-            fill$="[[_getFill(_computedFill, 'META')]]"
-            stroke$="[[_getStroke(_computedFill, 'META')]]"
-            class$="{{_fadedClass(renderInfo, 'rect')}}"
-            stroke-width="2px"
-            height="14" width="35"
-            rx="5" ry="5"/>
-      </svg>
-    </template>
-    <template is="dom-if" if="[[_isType(node, type, 'SERIES')]]">
-      <template is="dom-if" if="[[_isVertical(node, vertical)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 15">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-              xlink:href="#op-series-vertical-stamp"
-              fill$="[[_getFill(_computedFill, 'SERIES')]]"
-              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
-              class$="{{_fadedClass(renderInfo, 'series')}}"
-              x="0" y="2" />
-        </svg>
-      </template>
-      <template is="dom-if" if="[[!_isVertical(node, vertical)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 24 10">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-              xlink:href="#op-series-horizontal-stamp"
-              fill$="[[_getFill(_computedFill, 'SERIES')]]"
-              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
-              class$="{{_fadedClass(renderInfo, 'series')}}"
-              x="0" y="1" />
-        </svg>
-      </template>
-    </template>
-  </template>
-
-  <script>
-    (function() {
-      Polymer({
-        is: 'tf-graph-icon',
-
-        properties: {
-          /**
-           * Node to represent with an icon. Optional, but if specified, its
-           * properties override those defined in the type, vertical, const and
-           * summary properties.
-           * @type {tf.graph.Node}
-           */
-          node: {
-            type: Object,
-            value: null
-          },
-
-          /**
-           * Render node information associated with this node. Optional. If
-           * specified, this is only used when computing the fill of the icon
-           * element.
-           * @type {tf.graph.render.RenderNodeInfo}
-           */
-          renderInfo: {
-            type: Object,
-            value: null
-          },
-
-          /**
-           * String indicating the type of coloring to use for this node, used
-           * only for determining the fill.
-           */
-          colorBy: {
-            type: Object,
-            value: "structural"
-          },
-
-          /**
-           * Function used by structural coloring algorithm to determine which
-           * color to use based on the template ID of the node. Optional.
-           */
-          templateIndex: {
-            type: Function,
-            value: null
-          },
-
-          /** Type of node to draw (ignored if node is set). */
-          type: {
-            type: String,
-            value: null
-          },
-
-          /** Direction for series (ignored for other types). */
-          vertical: {
-            type: Boolean,
-            value: false
-          },
-
-          /** Whether the op is Const (ignored for non-ops). */
-          const: {
-            type: Boolean,
-            value: false
-          },
-
-          /** Whether the op is a Summary (ignored for non-ops). */
-          summary: {
-            type: Boolean,
-            value: false
-          },
-
-          /**
-           * Fill for the icon, optional. If fill is specified and node is not
-           * specified, then this value will override the default for the
-           * element. However, if node is specified, this value will be ignored.
-           */
-          fill: {
-            type: String,
-            value: null
-          },
-
-          /** Height of the SVG element in pixels, used for scaling. */
-          height: {
-            type: Number,
-            value: 20
-          },
-
-          /** The computed fill for the node. **/
-          _computedFill: {
-            type: String,
-            computed:
-              "_getComputedFill(node, renderInfo, colorBy, templateIndex, fill)"
-          }
-
-        },
-
-        /**
-         * Get the computed fill value for the element.
-         */
-        _getComputedFill: function(inputNode, inputRenderInfo, inputColorBy,
-            inputTemplateIndex, inputFill) {
-          if (inputNode && inputRenderInfo &&
-              inputColorBy && inputTemplateIndex) {
-            var ns = tf.graph.scene.node;
-            var colorBy = ns.ColorBy[inputColorBy.toUpperCase()];
-            return ns.getFillForNode(inputTemplateIndex, colorBy,
-                inputRenderInfo, false);
-          }
-          return inputFill;
-        },
-
-        /**
-         * Get the fill value for the element, or if that's not possible, return
-         * the default fill value for the node type.
-         */
-        _getFill: function(inputComputedFill, inputNodeType) {
-          return inputComputedFill || ({
-            OP: tf.graph.render.OpNodeColors.DEFAULT_FILL,
-            META: tf.graph.render.MetanodeColors.DEFAULT_FILL,
-            SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_FILL
-          })[inputNodeType];
-        },
-
-        /**
-         * Get the stroke value for the element, or if that's not possible,
-         * return the default stroke value for the node type.
-         */
-        _getStroke: function(inputComputedFill, inputNodeType) {
-          return inputComputedFill ?
-            tf.graph.scene.node.getStrokeForFill(inputComputedFill) :
-            ({
-              OP: tf.graph.render.OpNodeColors.DEFAULT_STROKE,
-              META: tf.graph.render.MetanodeColors.DEFAULT_STROKE,
-              SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_STROKE
-            })[inputNodeType];
-        },
-
-        /**
-         * Test whether the specified node's type, or the literal type string,
-         * match a particular other type.
-         */
-        _isType: function(inputNode, inputType, targetType) {
-          if (inputNode) {
-            return tf.graph.NodeType[inputNode.type] === targetType;
-          }
-          return inputType === targetType;
-        },
-
-        /**
-         * Test whether the specified node should be represented as a vertical
-         * series. Defaults to the value of the vertical property if node is
-         * not specified.
-         */
-        _isVertical: function(inputNode, inputVertical) {
-          if (inputNode) {
-            return inputNode.hasNonControlEdges;
-          }
-          return !!inputVertical;
-        },
-
-        /**
-         * Test whether the specified node is a constant. Defaults to the value
-         * of the const property if node is not specified.
-         */
-        _isConst: function(inputNode, inputConst) {
-          if (inputNode) {
-            return inputNode.op === 'Const';
-          }
-          return !!inputConst;
-        },
-
-        /**
-         * Test whether the specified node is a summary. Defaults to the value
-         * of the summary property if node is not specified.
-         */
-        _isSummary: function(inputNode, inputSummary) {
-          if (inputNode) {
-            return this._isType(inputNode, null, 'OP') &&
-                inputNode.op.substr(-7) === 'Summary';
-          }
-          return !!inputSummary;
-        },
-
-        /**
-         * Test whether the op node is a regular non-summary non-const node.
-         */
-        _isRegularOp: function(inputNode, inputConst, inputSummary) {
-          return !this._isConst(inputNode, inputConst) &&
-              !this._isSummary(inputNode, inputSummary);
-        },
-
-        _fadedClass: function(itemRenderInfo, shape) {
-          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded-' + shape : '';
-        }
-      });
-    })();
-  </script>
-</dom-module>
-- 
GitLab


From d764056bfeea666898bbec5097ef4a56eedb387c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 02:30:25 -0700
Subject: [PATCH 1148/1563] Fix formatting of some op descriptions by
 separating out a 1-line summary from the main description.

PiperOrigin-RevId: 155482473
---
 tensorflow/core/ops/lookup_ops.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/ops/lookup_ops.cc b/tensorflow/core/ops/lookup_ops.cc
index 498a65690d..dac02dad8b 100644
--- a/tensorflow/core/ops/lookup_ops.cc
+++ b/tensorflow/core/ops/lookup_ops.cc
@@ -479,8 +479,10 @@ REGISTER_OP("MutableDenseHashTable")
     .SetIsStateful()
     .SetShapeFn(TwoElementOutput)
     .Doc(R"doc(
-Creates an empty hash table that uses tensors as the backing store. It uses
-"open addressing" with quadratic reprobing to resolve collisions.
+Creates an empty hash table that uses tensors as the backing store.
+
+It uses "open addressing" with quadratic reprobing to resolve
+collisions.
 
 This op creates a mutable hash table, specifying the type of its keys and
 values. Each value must be a scalar. Data can be inserted into the table using
@@ -516,8 +518,10 @@ REGISTER_OP("MutableDenseHashTableV2")
     .SetIsStateful()
     .SetShapeFn(ScalarOutput)
     .Doc(R"doc(
-Creates an empty hash table that uses tensors as the backing store. It uses
-"open addressing" with quadratic reprobing to resolve collisions.
+Creates an empty hash table that uses tensors as the backing store.
+
+It uses "open addressing" with quadratic reprobing to resolve
+collisions.
 
 This op creates a mutable hash table, specifying the type of its keys and
 values. Each value must be a scalar. Data can be inserted into the table using
-- 
GitLab


From ff0f98bc374bd264560935be5afac0c526be3f00 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 02:35:38 -0700
Subject: [PATCH 1149/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 155482813
---
 tensorflow/core/ops/ops.pbtxt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 6e46d5dda8..06e88e8a52 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -12155,8 +12155,8 @@ op {
     }
     description: "The maximum ratio between number of entries and number of\nbuckets before growing the table. Must be between 0 and 1."
   }
-  summary: "Creates an empty hash table that uses tensors as the backing store. It uses"
-  description: "\"open addressing\" with quadratic reprobing to resolve collisions.\n\nThis op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a scalar. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
+  summary: "Creates an empty hash table that uses tensors as the backing store."
+  description: "It uses \"open addressing\" with quadratic reprobing to resolve\ncollisions.\n\nThis op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a scalar. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
   is_stateful: true
 }
 op {
@@ -12229,8 +12229,8 @@ op {
     }
     description: "The maximum ratio between number of entries and number of\nbuckets before growing the table. Must be between 0 and 1."
   }
-  summary: "Creates an empty hash table that uses tensors as the backing store. It uses"
-  description: "\"open addressing\" with quadratic reprobing to resolve collisions.\n\nThis op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a scalar. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
+  summary: "Creates an empty hash table that uses tensors as the backing store."
+  description: "It uses \"open addressing\" with quadratic reprobing to resolve\ncollisions.\n\nThis op creates a mutable hash table, specifying the type of its keys and\nvalues. Each value must be a scalar. Data can be inserted into the table using\nthe insert operations. It does not support the initialization operation."
   is_stateful: true
 }
 op {
-- 
GitLab


From b8b9124f2e0c863e57ad96ee17f36e57997e4815 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 02:43:06 -0700
Subject: [PATCH 1150/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 155483248
---
 tensorflow/go/op/wrappers.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 7f9cbc0b98..7631ebb75d 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -13951,9 +13951,10 @@ func MutableDenseHashTableV2MaxLoadFactor(value float32) MutableDenseHashTableV2
 	}
 }
 
-// Creates an empty hash table that uses tensors as the backing store. It uses
+// Creates an empty hash table that uses tensors as the backing store.
 //
-// "open addressing" with quadratic reprobing to resolve collisions.
+// It uses "open addressing" with quadratic reprobing to resolve
+// collisions.
 //
 // This op creates a mutable hash table, specifying the type of its keys and
 // values. Each value must be a scalar. Data can be inserted into the table using
-- 
GitLab


From a2ade356755006a2c970d77564e0bb1f70567659 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 08:13:52 -0700
Subject: [PATCH 1151/1563] Adding pointer to .tf_configure.bazelrc in the
 default bazelrc file used by TF containers

PiperOrigin-RevId: 155505438
---
 tensorflow/tools/ci_build/Dockerfile.android           | 1 +
 tensorflow/tools/ci_build/Dockerfile.cpu               | 1 +
 tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu | 1 +
 tensorflow/tools/ci_build/Dockerfile.gpu               | 1 +
 tensorflow/tools/ci_build/Dockerfile.gpu_clang         | 1 +
 tensorflow/tools/ci_build/Dockerfile.hadoop            | 1 +
 tensorflow/tools/docker/Dockerfile.devel               | 2 ++
 tensorflow/tools/docker/Dockerfile.devel-gpu           | 2 ++
 8 files changed, 10 insertions(+)

diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android
index c6679f7882..c420848423 100644
--- a/tensorflow/tools/ci_build/Dockerfile.android
+++ b/tensorflow/tools/ci_build/Dockerfile.android
@@ -12,6 +12,7 @@ RUN /install/install_bazel.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
 
 # Install extra libraries for android sdk.
 RUN apt-get update && apt-get install -y \
diff --git a/tensorflow/tools/ci_build/Dockerfile.cpu b/tensorflow/tools/ci_build/Dockerfile.cpu
index 206108930a..fcff9a11e4 100644
--- a/tensorflow/tools/ci_build/Dockerfile.cpu
+++ b/tensorflow/tools/ci_build/Dockerfile.cpu
@@ -17,3 +17,4 @@ RUN /install/install_golang.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
diff --git a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
index b914f51918..b6b580e013 100644
--- a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
+++ b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
@@ -24,3 +24,4 @@ RUN pip install --upgrade virtualenv
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu b/tensorflow/tools/ci_build/Dockerfile.gpu
index 68493965fa..3d248345bb 100644
--- a/tensorflow/tools/ci_build/Dockerfile.gpu
+++ b/tensorflow/tools/ci_build/Dockerfile.gpu
@@ -19,6 +19,7 @@ RUN /install/install_golang.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
 ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
 
 # Configure the build for our CUDA configuration.
diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu_clang b/tensorflow/tools/ci_build/Dockerfile.gpu_clang
index 00aaa9f760..11a70953e6 100644
--- a/tensorflow/tools/ci_build/Dockerfile.gpu_clang
+++ b/tensorflow/tools/ci_build/Dockerfile.gpu_clang
@@ -27,6 +27,7 @@ RUN /install/build_and_install_clang.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
 ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
 
 # Configure the build for our CUDA configuration.
diff --git a/tensorflow/tools/ci_build/Dockerfile.hadoop b/tensorflow/tools/ci_build/Dockerfile.hadoop
index 489493c26e..c55c460e52 100644
--- a/tensorflow/tools/ci_build/Dockerfile.hadoop
+++ b/tensorflow/tools/ci_build/Dockerfile.hadoop
@@ -16,3 +16,4 @@ RUN /install/install_hadoop.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index a0e0f88d9d..9deca9d486 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -66,6 +66,8 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
 #   https://github.com/bazelbuild/bazel/issues/418
 RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
     >>/etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
+
 # Install the most recent bazel release.
 ENV BAZEL_VERSION 0.4.5
 WORKDIR /
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 743c05ef88..fd0484f7d2 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -66,6 +66,8 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
 #   https://github.com/bazelbuild/bazel/issues/418
 RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
     >>/etc/bazel.bazelrc
+RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
+
 # Install the most recent bazel release.
 ENV BAZEL_VERSION 0.4.5
 WORKDIR /
-- 
GitLab


From 96acbc09ef59bf73c55b8b2dd9556e7967a5f8d8 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Tue, 9 May 2017 08:44:16 -0700
Subject: [PATCH 1152/1563] Don't eval in integer softplus test, since it
 breaks asan

PiperOrigin-RevId: 155508401
---
 tensorflow/python/kernel_tests/softplus_op_test.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/kernel_tests/softplus_op_test.py b/tensorflow/python/kernel_tests/softplus_op_test.py
index 7e4f46c46f..5aa8441e19 100644
--- a/tensorflow/python/kernel_tests/softplus_op_test.py
+++ b/tensorflow/python/kernel_tests/softplus_op_test.py
@@ -86,10 +86,8 @@ class SoftplusTest(test.TestCase):
     self.assertLess(err, 1e-4)
 
   def testWarnInts(self):
-    # NOTE(irving): Actually I don't know how to intercept the warning, but
-    # let's make sure it runs.  I promised I've looked, and there was a warning.
-    with self.test_session():
-      nn_ops.softplus(constant_op.constant(7)).eval()
+    # Running the op triggers address sanitizer errors, so we just make it
+    nn_ops.softplus(constant_op.constant(7))
 
 
 if __name__ == "__main__":
-- 
GitLab


From b9845c6d0d5dc601fb3b58206a7070aa8937af4f Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Tue, 9 May 2017 08:56:07 -0700
Subject: [PATCH 1153/1563] Clean up signature documentation for tf.range

PiperOrigin-RevId: 155509567
---
 tensorflow/tools/docs/pretty_docs.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tensorflow/tools/docs/pretty_docs.py b/tensorflow/tools/docs/pretty_docs.py
index 657d6bf849..918d475e0d 100644
--- a/tensorflow/tools/docs/pretty_docs.py
+++ b/tensorflow/tools/docs/pretty_docs.py
@@ -213,6 +213,14 @@ def _build_module_page(page_info):
 
 def _build_signature(obj_info):
   """Returns a md code block showing the function signature."""
+  # Special case tf.range, since it has an optional first argument
+  if obj_info.full_name == 'tf.range':
+    return (
+        '``` python\n'
+        "range(limit, delta=1, dtype=None, name='range')\n"
+        "range(start, limit, delta=1, dtype=None, name='range')\n"
+        '```\n\n')
+
   signature_template = '\n'.join([
       '``` python',
       '{name}({sig})',
-- 
GitLab


From 1d0b8c007b8bc7f77dd63c74f02d87185071f038 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Tue, 9 May 2017 09:14:16 -0700
Subject: [PATCH 1154/1563] Remove unnecessary copies of value parameters.

PiperOrigin-RevId: 155511618
---
 tensorflow/cc/client/client_session.cc        |  3 +-
 tensorflow/cc/framework/cc_op_gen.cc          |  2 +-
 tensorflow/cc/framework/cc_ops_test.cc        |  3 +-
 tensorflow/cc/gradients/math_grad_test.cc     |  6 ++--
 .../compiler/aot/tfcompile_util_test.cc       |  2 +-
 .../jit/encapsulate_subgraphs_pass_test.cc    |  2 +-
 .../compiler/jit/mark_for_compilation_pass.cc | 15 ++++----
 tensorflow/compiler/tests/randomized_tests.cc | 18 +++++-----
 .../compiler/xla/service/hlo_instruction.cc   |  2 +-
 tensorflow/compiler/xla/shape_util.cc         |  9 ++---
 tensorflow/compiler/xla/shape_util.h          |  5 +--
 tensorflow/compiler/xla/status_macros_test.cc |  2 +-
 .../compiler/xla/tests/dynamic_ops_test.cc    |  6 ++--
 .../compiler/xla/tests/reduce_window_test.cc  |  6 ++--
 tensorflow/compiler/xla/util.cc               |  2 +-
 .../contrib/batching/kernels/batch_kernels.cc |  6 ++--
 .../contrib/nccl/kernels/nccl_manager.cc      |  6 ++--
 tensorflow/contrib/rnn/ops/lstm_ops_test.cc   |  2 +-
 .../session_bundle/session_bundle_test.cc     |  2 +-
 .../tensor_forest/kernels/tree_utils.cc       |  4 +--
 tensorflow/core/common_runtime/executor.cc    |  3 +-
 .../common_runtime/gpu/gpu_tracer_test.cc     |  2 +-
 .../core/common_runtime/memory_types.cc       | 35 ++++++++++---------
 tensorflow/core/common_runtime/memory_types.h |  8 ++---
 .../core/common_runtime/simple_placer_test.cc |  8 ++---
 tensorflow/core/debug/debug_gateway.cc        |  6 ++--
 .../distributed_runtime/master_session.cc     |  2 +-
 .../rpc/grpc_remote_master.cc                 |  6 ++--
 .../rpc/grpc_remote_master.h                  |  2 +-
 .../rpc/grpc_remote_worker.cc                 |  6 ++--
 tensorflow/core/framework/function.cc         |  6 ++--
 .../core/framework/graph_def_util_test.cc     |  2 +-
 tensorflow/core/framework/memory_types.cc     |  4 ++-
 tensorflow/core/framework/memory_types.h      |  2 +-
 .../core/framework/op_def_builder_test.cc     |  2 +-
 tensorflow/core/framework/op_kernel.cc        | 12 ++++---
 tensorflow/core/framework/op_kernel.h         |  5 +--
 tensorflow/core/framework/op_kernel_test.cc   | 15 ++++----
 tensorflow/core/framework/tensor_test.cc      |  3 +-
 tensorflow/core/framework/types.cc            |  4 ++-
 tensorflow/core/framework/types.h             |  2 +-
 tensorflow/core/graph/graph_test.cc           |  4 +--
 tensorflow/core/graph/optimizer_cse.cc        |  9 +++--
 tensorflow/core/graph/optimizer_cse.h         |  3 +-
 tensorflow/core/graph/optimizer_cse_test.cc   |  1 +
 tensorflow/core/kernels/barrier_ops.cc        | 10 +++---
 tensorflow/core/kernels/conv_ops_fused.cc     |  5 +--
 tensorflow/core/kernels/conv_ops_test.cc      |  9 ++---
 tensorflow/core/kernels/crop_and_resize_op.cc |  6 ++--
 tensorflow/core/kernels/debug_ops_test.cc     |  2 +-
 tensorflow/core/kernels/reverse_op_test.cc    |  2 +-
 .../core/kernels/save_restore_tensor.cc       |  3 +-
 .../kernels/segment_reduction_ops_test.cc     |  5 +--
 tensorflow/core/lib/core/threadpool.cc        |  2 +-
 tensorflow/core/lib/jpeg/jpeg_mem.cc          |  3 +-
 .../lib/random/random_distributions_test.cc   |  2 +-
 tensorflow/core/ops/training_ops_test.cc      |  4 +--
 .../core/platform/cloud/oauth_client.cc       |  8 +++--
 tensorflow/core/platform/env.cc               |  3 +-
 tensorflow/core/platform/file_system.cc       |  2 +-
 tensorflow/core/util/tensor_slice_reader.cc   |  3 +-
 .../core/util/tensor_slice_reader_cache.cc    |  5 ++-
 .../core/util/tensor_slice_reader_test.cc     | 22 +++++++-----
 tensorflow/examples/label_image/main.cc       |  9 ++---
 tensorflow/examples/multibox_detector/main.cc |  2 +-
 tensorflow/python/framework/python_op_gen.cc  |  3 +-
 tensorflow/python/lib/core/py_func.cc         |  2 +-
 .../stream_executor/cuda/cuda_driver.cc       |  6 ++--
 .../stream_executor/stream_executor_pimpl.cc  |  7 ++--
 .../graph_transforms/fold_constants_test.cc   |  4 +--
 .../graph_transforms/summarize_graph_main.cc  |  4 +--
 .../tools/tfprof/internal/tfprof_utils.cc     |  2 +-
 72 files changed, 225 insertions(+), 165 deletions(-)

diff --git a/tensorflow/cc/client/client_session.cc b/tensorflow/cc/client/client_session.cc
index 2732f3f501..2879445441 100644
--- a/tensorflow/cc/client/client_session.cc
+++ b/tensorflow/cc/client/client_session.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/cc/client/client_session.h"
 
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "tensorflow/core/platform/env.h"
@@ -31,7 +32,7 @@ class ClientSession::Impl {
   friend class ClientSession;
 
   Impl(Session* session, std::shared_ptr<Graph> graph)
-      : session_(session), graph_(graph) {}
+      : session_(session), graph_(std::move(graph)) {}
 
   static SessionOptions MakeDefaultSessionOptions(const string& target);
   Status MaybeExtendGraph() const;
diff --git a/tensorflow/cc/framework/cc_op_gen.cc b/tensorflow/cc/framework/cc_op_gen.cc
index b7e9948e9d..799492a4eb 100644
--- a/tensorflow/cc/framework/cc_op_gen.cc
+++ b/tensorflow/cc/framework/cc_op_gen.cc
@@ -198,7 +198,7 @@ string PrintTensorProto(const TensorProto& proto) {
                          ").AsTensorProto()");
 }
 
-string PrintAttrValue(string op, const AttrValue& attr_value) {
+string PrintAttrValue(const string& op, const AttrValue& attr_value) {
   switch (attr_value.value_case()) {
     case AttrValue::kS:
       return PrintString(attr_value.s());
diff --git a/tensorflow/cc/framework/cc_ops_test.cc b/tensorflow/cc/framework/cc_ops_test.cc
index 6dc0d84c16..92c97d107d 100644
--- a/tensorflow/cc/framework/cc_ops_test.cc
+++ b/tensorflow/cc/framework/cc_ops_test.cc
@@ -32,7 +32,8 @@ Output Linear(const Scope& scope, Input x, Input w, Input b) {
   return BiasAdd(cop_scopes.last, m, b);
 }
 
-void GetColocationConstraints(Output tensor, std::vector<string>* constraints) {
+void GetColocationConstraints(const Output& tensor,
+                              std::vector<string>* constraints) {
   constraints->clear();
   TF_EXPECT_OK(
       GetNodeAttr(tensor.op().node()->def(), kColocationAttrName, constraints));
diff --git a/tensorflow/cc/gradients/math_grad_test.cc b/tensorflow/cc/gradients/math_grad_test.cc
index d7278929d4..f9ae3b39ea 100644
--- a/tensorflow/cc/gradients/math_grad_test.cc
+++ b/tensorflow/cc/gradients/math_grad_test.cc
@@ -56,9 +56,9 @@ class CWiseUnaryGradTest : public ::testing::Test {
     ATAN
   };
 
-  void TestCWiseGrad(UnaryOpType op_type, std::function<float(int)> x_fn,
-                     std::function<float(float)> dy_fn,
-                     std::function<float(float, float)> dx_fn) {
+  void TestCWiseGrad(UnaryOpType op_type, const std::function<float(int)>& x_fn,
+                     const std::function<float(float)>& dy_fn,
+                     const std::function<float(float, float)>& dx_fn) {
     Tensor x(DT_FLOAT, {2, 3, 2});
     auto x_flat = x.flat<float>();
     for (int i = 0; i < x_flat.size(); ++i) {
diff --git a/tensorflow/compiler/aot/tfcompile_util_test.cc b/tensorflow/compiler/aot/tfcompile_util_test.cc
index 108ab1eab7..c321d3ff4c 100644
--- a/tensorflow/compiler/aot/tfcompile_util_test.cc
+++ b/tensorflow/compiler/aot/tfcompile_util_test.cc
@@ -24,7 +24,7 @@ namespace tensorflow {
 namespace tfcompile {
 namespace {
 
-void ExpectErrorContains(Status status, StringPiece str) {
+void ExpectErrorContains(const Status& status, StringPiece str) {
   EXPECT_NE(Status::OK(), status);
   EXPECT_TRUE(StringPiece(status.error_message()).contains(str))
       << "expected error: " << status.error_message() << " to contain: " << str;
diff --git a/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc b/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc
index faab7bd3d2..bce534684a 100644
--- a/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc
+++ b/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc
@@ -109,7 +109,7 @@ Node* Binary(ops::NodeOut a, ops::NodeOut b,
   return ops::BinaryOp("BinaryTest", a, b, opts);
 }
 
-Node* AddNLike(std::vector<ops::NodeOut> inputs,
+Node* AddNLike(const std::vector<ops::NodeOut>& inputs,
                const GraphDefBuilder::Options& opts) {
   if (opts.HaveError()) return nullptr;
   NodeBuilder node_builder(opts.GetNameForOp("AddN"), "AddNLikeTest",
diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass.cc b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
index b27c07d0d9..711b986d7f 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
@@ -52,14 +52,16 @@ bool HasXLAKernel(const Node& node, const DeviceType& jit_device_type) {
 // Make sure we don't recurse infinitely on recursive functions.
 const int kMaxRecursionDepth = 10;
 
-bool IsCompilableCall(const NodeDef& call_def, DeviceType jit_device_type,
-                      int depth, FunctionLibraryRuntime* lib_runtime);
+bool IsCompilableCall(const NodeDef& call_def,
+                      const DeviceType& jit_device_type, int depth,
+                      FunctionLibraryRuntime* lib_runtime);
 
 // Tests whether 'while_def' is a completely compilable loop.
 // Every operator in the condition and body functions must be compilable for a
 // while loop to be compilable.
-bool IsCompilableWhile(const NodeDef& while_def, DeviceType jit_device_type,
-                       int depth, FunctionLibraryRuntime* lib_runtime) {
+bool IsCompilableWhile(const NodeDef& while_def,
+                       const DeviceType& jit_device_type, int depth,
+                       FunctionLibraryRuntime* lib_runtime) {
   VLOG(2) << "Loop marking: " << while_def.op();
 
   const NameAttrList* name_attr;
@@ -98,8 +100,9 @@ bool IsCompilableWhile(const NodeDef& while_def, DeviceType jit_device_type,
 // Tests whether 'call_def' is a call to a completely compilable function.
 // Every operator in the function must be compilable for a function to be
 // compilable.
-bool IsCompilableCall(const NodeDef& call_def, DeviceType jit_device_type,
-                      int depth, FunctionLibraryRuntime* lib_runtime) {
+bool IsCompilableCall(const NodeDef& call_def,
+                      const DeviceType& jit_device_type, int depth,
+                      FunctionLibraryRuntime* lib_runtime) {
   VLOG(2) << "Function marking: " << call_def.op();
 
   if (depth > kMaxRecursionDepth) {
diff --git a/tensorflow/compiler/tests/randomized_tests.cc b/tensorflow/compiler/tests/randomized_tests.cc
index 7d91594db0..2a71543f3f 100644
--- a/tensorflow/compiler/tests/randomized_tests.cc
+++ b/tensorflow/compiler/tests/randomized_tests.cc
@@ -94,7 +94,7 @@ class OpTestBuilder {
   explicit OpTestBuilder(const string& op_name);
 
   // Adds an input 'tensor'.
-  OpTestBuilder& Input(Tensor tensor);
+  OpTestBuilder& Input(const Tensor& tensor);
 
   // Sets an attribute.
   template <class T>
@@ -111,8 +111,8 @@ class OpTestBuilder {
   // sets it to the NodeDef of the operator under test. Fills 'inputs' and
   // 'outputs' with the names of the input placeholder nodes and the output
   // identity nodes, respectively.
-  Status BuildGraph(string name_prefix, string device, bool use_jit,
-                    GraphDef* graphdef, NodeDef** test_node_def,
+  Status BuildGraph(const string& name_prefix, const string& device,
+                    bool use_jit, GraphDef* graphdef, NodeDef** test_node_def,
                     std::vector<string>* inputs,
                     std::vector<string>* outputs) const;
 
@@ -127,7 +127,7 @@ OpTestBuilder::OpTestBuilder(const string& op_name) {
   node_def_.set_op(op_name);
 }
 
-OpTestBuilder& OpTestBuilder::Input(Tensor tensor) {
+OpTestBuilder& OpTestBuilder::Input(const Tensor& tensor) {
   VLOG(1) << "Adding input: " << tensor.DebugString();
   inputs_.push_back(tensor);
   return *this;
@@ -146,9 +146,9 @@ OpTestBuilder& OpTestBuilder::Attr(StringPiece attr_name,
   return *this;
 }
 
-Status OpTestBuilder::BuildGraph(string name_prefix, string device,
-                                 bool use_jit, GraphDef* graphdef,
-                                 NodeDef** test_node_def,
+Status OpTestBuilder::BuildGraph(const string& name_prefix,
+                                 const string& device, bool use_jit,
+                                 GraphDef* graphdef, NodeDef** test_node_def,
                                  std::vector<string>* inputs,
                                  std::vector<string>* outputs) const {
   OpRegistryInterface* op_registry = OpRegistry::Global();
@@ -209,7 +209,7 @@ class OpTest : public ::testing::Test {
 
   // Runs 'fn' up to --tf_xla_test_repetitions times, or until a failure occurs;
   // whichever happens first.
-  void Repeatedly(std::function<void(void)> fn);
+  void Repeatedly(const std::function<void(void)>& fn);
 
   // Select a random element from 'candidates'.
   template <typename T>
@@ -315,7 +315,7 @@ OpTest::OpTest() {
   TF_CHECK_OK(session_->Create(def));
 }
 
-void OpTest::Repeatedly(std::function<void(void)> fn) {
+void OpTest::Repeatedly(const std::function<void(void)>& fn) {
   int const max_repetitions = tf_xla_test_repetitions;
   for (int i = 0; !HasFailure() && i < max_repetitions; ++i) {
     fn();
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 66fb059975..10ab60cc84 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -1083,7 +1083,7 @@ bool HloInstruction::Identical(
   // general, there is no need to check shape because shape is inferred from the
   // shape of the operands.
   if (opcode() != other.opcode() ||
-      !ContainersEqual(operands(), other.operands(), eq_operands)) {
+      !ContainersEqual(operands(), other.operands(), std::move(eq_operands))) {
     return false;
   }
 
diff --git a/tensorflow/compiler/xla/shape_util.cc b/tensorflow/compiler/xla/shape_util.cc
index ceb29aaea5..d3949918c8 100644
--- a/tensorflow/compiler/xla/shape_util.cc
+++ b/tensorflow/compiler/xla/shape_util.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include <algorithm>
 #include <functional>
 #include <numeric>
+#include <utility>
 #include <vector>
 
 #include "tensorflow/compiler/xla/index_util.h"
@@ -675,7 +676,7 @@ namespace {
 // Helper for ForEachSubshape which visits the subshapes of the given shape in
 // DFS pre-order starting with the index.
 Status ForEachSubshapeHelper(const Shape& shape,
-                             const ShapeUtil::VisitorFunction func,
+                             const ShapeUtil::VisitorFunction& func,
                              ShapeIndex* index) {
   TF_RETURN_IF_ERROR(func(shape, *index));
   if (ShapeUtil::IsTuple(shape)) {
@@ -692,7 +693,7 @@ Status ForEachSubshapeHelper(const Shape& shape,
 // Helper for ForEachMutableSubshape which visits the subshapes of the given
 // shape in DFS pre-order starting with the index.
 Status ForEachMutableSubshapeHelper(
-    Shape* shape, const ShapeUtil::MutatingVisitorFunction func,
+    Shape* shape, const ShapeUtil::MutatingVisitorFunction& func,
     ShapeIndex* index) {
   TF_RETURN_IF_ERROR(func(shape, *index));
   if (ShapeUtil::IsTuple(*shape)) {
@@ -709,13 +710,13 @@ Status ForEachMutableSubshapeHelper(
 }  // namespace
 
 /* static */ Status ShapeUtil::ForEachSubshape(const Shape& shape,
-                                               VisitorFunction func) {
+                                               const VisitorFunction& func) {
   ShapeIndex index;
   return ForEachSubshapeHelper(shape, func, &index);
 }
 
 /* static */ Status ShapeUtil::ForEachMutableSubshape(
-    Shape* shape, MutatingVisitorFunction func) {
+    Shape* shape, const MutatingVisitorFunction& func) {
   ShapeIndex index;
   return ForEachMutableSubshapeHelper(shape, func, &index);
 }
diff --git a/tensorflow/compiler/xla/shape_util.h b/tensorflow/compiler/xla/shape_util.h
index a3da36b7c6..9b9dfccc57 100644
--- a/tensorflow/compiler/xla/shape_util.h
+++ b/tensorflow/compiler/xla/shape_util.h
@@ -299,13 +299,14 @@ class ShapeUtil {
   // pre-order starting with the entire shape (index {}).
   using VisitorFunction = std::function<Status(const Shape& /*subshape*/,
                                                const ShapeIndex& /*index*/)>;
-  static Status ForEachSubshape(const Shape& shape, VisitorFunction func);
+  static Status ForEachSubshape(const Shape& shape,
+                                const VisitorFunction& func);
 
   // Mutating variant of ForEachSubshape.
   using MutatingVisitorFunction =
       std::function<Status(Shape* /*subshape*/, const ShapeIndex& /*index*/)>;
   static Status ForEachMutableSubshape(Shape* shape,
-                                       MutatingVisitorFunction func);
+                                       const MutatingVisitorFunction& func);
 
   // Removes all degenerate dimensions (size one) from the given shape. The
   // stripped minor_to_major preserves the relative ordering of non-degenerate
diff --git a/tensorflow/compiler/xla/status_macros_test.cc b/tensorflow/compiler/xla/status_macros_test.cc
index 5563159776..dead17cdfa 100644
--- a/tensorflow/compiler/xla/status_macros_test.cc
+++ b/tensorflow/compiler/xla/status_macros_test.cc
@@ -73,7 +73,7 @@ Status ReturnStatusError() { return (tensorflow::errors::Internal("foobar")); }
 
 using StatusReturningFunction = std::function<Status()>;
 
-StatusOr<int> CallStatusReturningFunction(StatusReturningFunction func) {
+StatusOr<int> CallStatusReturningFunction(const StatusReturningFunction& func) {
   TF_RETURN_IF_ERROR(func());
   return 42;
 }
diff --git a/tensorflow/compiler/xla/tests/dynamic_ops_test.cc b/tensorflow/compiler/xla/tests/dynamic_ops_test.cc
index 180e851410..cdb4498f4e 100644
--- a/tensorflow/compiler/xla/tests/dynamic_ops_test.cc
+++ b/tensorflow/compiler/xla/tests/dynamic_ops_test.cc
@@ -109,7 +109,7 @@ class DynamicSliceTest : public ClientLibraryTestBase {
   template <typename IndexT>
   void RunR1(const std::vector<float>& input_values,
              const std::vector<IndexT> slice_starts,
-             const std::vector<int64> slice_sizes,
+             const std::vector<int64>& slice_sizes,
              const std::vector<float>& expected_values) {
     ComputationBuilder builder(client_, TestName());
     // Initialize and transfer dynamic slice start indices parameter.
@@ -127,7 +127,7 @@ class DynamicSliceTest : public ClientLibraryTestBase {
   template <typename IndexT>
   void RunR2(const Array2D<float>& input_values,
              const std::vector<IndexT> slice_starts,
-             const std::vector<int64> slice_sizes,
+             const std::vector<int64>& slice_sizes,
              const Array2D<float>& expected_values) {
     ComputationBuilder builder(client_, TestName());
     // Initialize and transfer dynamic slice start indices parameter.
@@ -145,7 +145,7 @@ class DynamicSliceTest : public ClientLibraryTestBase {
   template <typename IndexT>
   void RunR3(const Array3D<float>& input_values,
              const std::vector<IndexT> slice_starts,
-             const std::vector<int64> slice_sizes,
+             const std::vector<int64>& slice_sizes,
              const Array3D<float>& expected_values) {
     ComputationBuilder builder(client_, TestName());
     // Initialize and transfer dynamic slice start indices parameter.
diff --git a/tensorflow/compiler/xla/tests/reduce_window_test.cc b/tensorflow/compiler/xla/tests/reduce_window_test.cc
index 56501e43b5..ceefc05634 100644
--- a/tensorflow/compiler/xla/tests/reduce_window_test.cc
+++ b/tensorflow/compiler/xla/tests/reduce_window_test.cc
@@ -43,7 +43,7 @@ class ReduceWindowTest : public ClientLibraryTestBase {
  public:
   ReduceWindowTest() : builder_(client_, TestName()) {}
 
-  void ReduceWindowAdd(ComputationDataHandle input,
+  void ReduceWindowAdd(const ComputationDataHandle& input,
                        tensorflow::gtl::ArraySlice<int64> window_dimensions,
                        tensorflow::gtl::ArraySlice<int64> window_strides,
                        Padding padding) {
@@ -52,7 +52,7 @@ class ReduceWindowTest : public ClientLibraryTestBase {
                           window_dimensions, window_strides, padding);
   }
 
-  void ReduceWindowMax(ComputationDataHandle input,
+  void ReduceWindowMax(const ComputationDataHandle& input,
                        tensorflow::gtl::ArraySlice<int64> window_dimensions,
                        tensorflow::gtl::ArraySlice<int64> window_strides,
                        Padding padding) {
@@ -61,7 +61,7 @@ class ReduceWindowTest : public ClientLibraryTestBase {
         CreateScalarMax(), window_dimensions, window_strides, padding);
   }
 
-  void ReduceWindowMin(ComputationDataHandle input,
+  void ReduceWindowMin(const ComputationDataHandle& input,
                        tensorflow::gtl::ArraySlice<int64> window_dimensions,
                        tensorflow::gtl::ArraySlice<int64> window_strides,
                        Padding padding) {
diff --git a/tensorflow/compiler/xla/util.cc b/tensorflow/compiler/xla/util.cc
index 0f6bba450e..2f0f6a426f 100644
--- a/tensorflow/compiler/xla/util.cc
+++ b/tensorflow/compiler/xla/util.cc
@@ -33,7 +33,7 @@ namespace {
 // Adds a backtrace to the provided status iff the xla_status_add_backtrace flag
 // is set. This is useful for quickly tracing status errors observed coming out
 // of the service.
-Status MaybeAddBacktrace(Status prior) {
+Status MaybeAddBacktrace(const Status& prior) {
   DCHECK(!prior.ok());
   if (legacy_flags::GetUtilFlags()->xla_status_add_backtrace) {
     return Status{prior.code(),
diff --git a/tensorflow/contrib/batching/kernels/batch_kernels.cc b/tensorflow/contrib/batching/kernels/batch_kernels.cc
index 7f9fc447b1..1e0957298b 100644
--- a/tensorflow/contrib/batching/kernels/batch_kernels.cc
+++ b/tensorflow/contrib/batching/kernels/batch_kernels.cc
@@ -817,7 +817,8 @@ class UnbatchGradResource : public ResourceBase {
 
   // Flushes the information for one batch, given its context and done
   // callback. Clears all information about it from the available_tensors_.
-  Status OutputBatch(OpKernelContext* context, AsyncOpKernel::DoneCallback done)
+  Status OutputBatch(OpKernelContext* context,
+                     const AsyncOpKernel::DoneCallback& done)
       EXCLUSIVE_LOCKS_REQUIRED(mu_) {
     const Tensor& batch_index_t = context->input(1);
     auto batch_index =
@@ -848,7 +849,8 @@ class UnbatchGradResource : public ResourceBase {
   }
 
   // Ingests data from one invocation of the op.
-  Status Compute(OpKernelContext* context, AsyncOpKernel::DoneCallback done) {
+  Status Compute(OpKernelContext* context,
+                 const AsyncOpKernel::DoneCallback& done) {
     const Tensor& data_t = context->input(0);
     const Tensor& batch_index_t = context->input(1);
     const Tensor& grad_t = context->input(2);
diff --git a/tensorflow/contrib/nccl/kernels/nccl_manager.cc b/tensorflow/contrib/nccl/kernels/nccl_manager.cc
index dfdfbc8eea..b289c91bb8 100644
--- a/tensorflow/contrib/nccl/kernels/nccl_manager.cc
+++ b/tensorflow/contrib/nccl/kernels/nccl_manager.cc
@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/contrib/nccl/kernels/nccl_manager.h"
 
+#include <utility>
+
 #ifdef GOOGLE_CUDA
 
 #include "tensorflow/core/lib/core/threadpool.h"
@@ -287,7 +289,7 @@ void NcclManager::AddBroadcastSend(
     const Tensor* in_t, DoneCallback done_callback) {
   std::unique_ptr<Participant> participant(
       new Participant(in_t, nullptr /* out_t */, event_mgr, tensor_stream,
-                      executor, gpu_device_id, done_callback));
+                      executor, gpu_device_id, std::move(done_callback)));
   participant->root = true;
   AddParticipant(num_devices, key, std::move(participant), in_t->dtype(),
                  kBroadcast, ncclSum /* unused */);
@@ -300,7 +302,7 @@ void NcclManager::AddBroadcastRecv(
     Tensor* out_t, DoneCallback done_callback) {
   std::unique_ptr<Participant> participant(
       new Participant(nullptr /* in_t */, out_t, event_mgr, tensor_stream,
-                      executor, gpu_device_id, done_callback));
+                      executor, gpu_device_id, std::move(done_callback)));
   AddParticipant(num_devices, key, std::move(participant), out_t->dtype(),
                  kBroadcast, ncclSum /* unused */);
 }
diff --git a/tensorflow/contrib/rnn/ops/lstm_ops_test.cc b/tensorflow/contrib/rnn/ops/lstm_ops_test.cc
index 7c4d003b83..544cd163c5 100644
--- a/tensorflow/contrib/rnn/ops/lstm_ops_test.cc
+++ b/tensorflow/contrib/rnn/ops/lstm_ops_test.cc
@@ -37,7 +37,7 @@ class LSTMOpsTest : public ::testing::Test {
   }
 };
 
-static string JoinedCopies(string s, int copies) {
+static string JoinedCopies(const string& s, int copies) {
   string res;
   for (int i = 0; i < copies; ++i) {
     strings::StrAppend(&res, i > 0 ? ";" : "", s);
diff --git a/tensorflow/contrib/session_bundle/session_bundle_test.cc b/tensorflow/contrib/session_bundle/session_bundle_test.cc
index fc80b9bec7..ad6264d5c8 100644
--- a/tensorflow/contrib/session_bundle/session_bundle_test.cc
+++ b/tensorflow/contrib/session_bundle/session_bundle_test.cc
@@ -275,7 +275,7 @@ class SessionBundleTest : public ::testing::Test {
   }
   // SetupExport that allows for the variables and meta_graph_def filenames
   // to be overridden.
-  string SetupExport(MetaGraphDefTwiddler twiddler,
+  string SetupExport(const MetaGraphDefTwiddler& twiddler,
                      const string& variables_filename,
                      const string& meta_graph_def_filename) {
     // Construct a unique path name based on the test name.
diff --git a/tensorflow/contrib/tensor_forest/kernels/tree_utils.cc b/tensorflow/contrib/tensor_forest/kernels/tree_utils.cc
index 3692b89f79..fde0e87c9e 100644
--- a/tensorflow/contrib/tensor_forest/kernels/tree_utils.cc
+++ b/tensorflow/contrib/tensor_forest/kernels/tree_utils.cc
@@ -43,8 +43,8 @@ DataColumnTypes FindSparseFeatureSpec(
   return static_cast<DataColumnTypes>(spec.sparse(column_num).original_type());
 }
 
-void GetTwoBest(int max, std::function<float(int)> score_fn, float* best_score,
-                int* best_index, float* second_best_score,
+void GetTwoBest(int max, const std::function<float(int)>& score_fn,
+                float* best_score, int* best_index, float* second_best_score,
                 int* second_best_index) {
   *best_index = -1;
   *second_best_index = -1;
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc
index ed5b87f2f2..ec0c9405dd 100644
--- a/tensorflow/core/common_runtime/executor.cc
+++ b/tensorflow/core/common_runtime/executor.cc
@@ -1213,7 +1213,8 @@ class ExecutorState {
       GUARDED_BY(mu_);
 
   // The unique name of a frame.
-  inline string MakeFrameName(FrameState* frame, int64 iter_id, string name) {
+  inline string MakeFrameName(FrameState* frame, int64 iter_id,
+                              const string& name) {
     return strings::StrCat(frame->frame_name, ";", iter_id, ";", name);
   }
 
diff --git a/tensorflow/core/common_runtime/gpu/gpu_tracer_test.cc b/tensorflow/core/common_runtime/gpu/gpu_tracer_test.cc
index b1be278ab4..aaa25ad345 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_tracer_test.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_tracer_test.cc
@@ -82,7 +82,7 @@ class GPUTracerTest : public ::testing::Test {
   }
 
  protected:
-  void ExpectFailure(Status status, error::Code code) {
+  void ExpectFailure(const Status& status, error::Code code) {
     EXPECT_FALSE(status.ok());
     if (!status.ok()) {
       LOG(INFO) << "Status message: " << status.error_message();
diff --git a/tensorflow/core/common_runtime/memory_types.cc b/tensorflow/core/common_runtime/memory_types.cc
index 80c483e70b..db053dd2fa 100644
--- a/tensorflow/core/common_runtime/memory_types.cc
+++ b/tensorflow/core/common_runtime/memory_types.cc
@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 #include "tensorflow/core/common_runtime/memory_types.h"
 
+#include <utility>
+
 #include "tensorflow/core/framework/memory_types.h"
 #include "tensorflow/core/framework/node_def_builder.h"
 #include "tensorflow/core/graph/node_builder.h"
@@ -43,8 +45,8 @@ struct EndpointEq {
 };
 
 static Status ProcessMemoryTypes(
-    DeviceType device_type, const Graph* g,
-    std::function<Status(const Edge*, MemoryType, MemoryType)> fn) {
+    const DeviceType& device_type, const Graph* g,
+    const std::function<Status(const Edge*, MemoryType, MemoryType)>& fn) {
   if (device_type != DEVICE_GPU) {
     // On non-GPU devices, HOST_MEMORY and DEVICE_MEMORY are always
     // compatible.
@@ -88,17 +90,18 @@ static Status ProcessMemoryTypes(
   return Status::OK();
 }
 
-Status ValidateMemoryTypes(DeviceType device_type, const Graph* g) {
-  return ProcessMemoryTypes(device_type, g, [g](const Edge* e, MemoryType sm,
-                                                MemoryType dm) {
-    if (sm == dm) {
-      return Status::OK();
-    }
-    return errors::Internal(
-        "Memory type mismatch (", sm, " ", dm, ") between :", e->src()->id(),
-        ":", e->src_output(), " and ", e->dst()->id(), ":", e->dst_input(),
-        " : from ", e->src()->DebugString(), " to ", e->dst()->DebugString());
-  });
+Status ValidateMemoryTypes(const DeviceType& device_type, const Graph* g) {
+  return ProcessMemoryTypes(
+      device_type, g, [g](const Edge* e, MemoryType sm, MemoryType dm) {
+        if (sm == dm) {
+          return Status::OK();
+        }
+        return errors::Internal(
+            "Memory type mismatch (", sm, " ", dm,
+            ") between :", e->src()->id(), ":", e->src_output(), " and ",
+            e->dst()->id(), ":", e->dst_input(), " : from ",
+            e->src()->DebugString(), " to ", e->dst()->DebugString());
+      });
 }
 
 static Node* Send(Graph* g, const string& device_name, bool host,
@@ -132,8 +135,8 @@ static Node* Recv(Graph* g, const string& device_name, bool host,
   return ret;
 }
 
-Status EnsureMemoryTypes(DeviceType device_type, const string& device_name,
-                         Graph* g) {
+Status EnsureMemoryTypes(const DeviceType& device_type,
+                         const string& device_name, Graph* g) {
   struct Item {
     const Edge* edge;
     MemoryType sm;
@@ -185,7 +188,7 @@ Status EnsureMemoryTypes(DeviceType device_type, const string& device_name,
   return ValidateMemoryTypes(device_type, g);
 }
 
-Status MemoryTypeForOutput(DeviceType device_type, const Graph* g,
+Status MemoryTypeForOutput(const DeviceType& device_type, const Graph* g,
                            const Node* n, int index, MemoryType* memory_type) {
   MemoryTypeVector inp_mvec;
   MemoryTypeVector out_mvec;
diff --git a/tensorflow/core/common_runtime/memory_types.h b/tensorflow/core/common_runtime/memory_types.h
index ccbb8cffb1..fa0a7595f3 100644
--- a/tensorflow/core/common_runtime/memory_types.h
+++ b/tensorflow/core/common_runtime/memory_types.h
@@ -24,7 +24,7 @@ namespace tensorflow {
 
 // Returns an error iff *g running on a single device of 'device_type'
 // has memory type mismatch for any edge's source and destination.
-Status ValidateMemoryTypes(DeviceType device_type, const Graph* g);
+Status ValidateMemoryTypes(const DeviceType& device_type, const Graph* g);
 
 // Updates '*g' so that every edge's source and destination has
 // compatible memory types by inserting proper HostSend/Recv and
@@ -35,12 +35,12 @@ Status ValidateMemoryTypes(DeviceType device_type, const Graph* g);
 // Returns OK if '*g' is updated properly (ValidateMemoryTypes(g) must
 // be OK). Otherwise, returns an error and '*g' may be in an
 // invalidate state and the caller should discard it.
-Status EnsureMemoryTypes(DeviceType device_type, const string& device_name,
-                         Graph* g);
+Status EnsureMemoryTypes(const DeviceType& device_type,
+                         const string& device_name, Graph* g);
 
 // Get the memory type for 'index'th output of node 'n' in graph 'g', when
 // running on 'device_type'.
-Status MemoryTypeForOutput(DeviceType device_type, const Graph* g,
+Status MemoryTypeForOutput(const DeviceType& device_type, const Graph* g,
                            const Node* n, int index, MemoryType* memory_type);
 
 }  // end namespace tensorflow
diff --git a/tensorflow/core/common_runtime/simple_placer_test.cc b/tensorflow/core/common_runtime/simple_placer_test.cc
index 24f27af5f1..69ed58b33c 100644
--- a/tensorflow/core/common_runtime/simple_placer_test.cc
+++ b/tensorflow/core/common_runtime/simple_placer_test.cc
@@ -237,7 +237,7 @@ class SimplePlacerTest : public ::testing::Test {
 
   Status ReferenceTestHelper(const string& variable_op_type,
                              const string& assign_op_type,
-                             DeviceType expected_device_type);
+                             const DeviceType& expected_device_type);
 };
 
 #define EXPECT_COLOCATED(g, name_a, name_b)                         \
@@ -500,9 +500,9 @@ TEST_F(SimplePlacerTest, TestAssignedGpuDeviceToCpuDevice) {
 // Build a graph containing a Variable op of "variable_op_type" and an
 // Assign op of "assign_op_type", and expect all of the ops to be
 // placed on a device of type "expected_device_type".
-Status SimplePlacerTest::ReferenceTestHelper(const string& variable_op_type,
-                                             const string& assign_op_type,
-                                             DeviceType expected_device_type) {
+Status SimplePlacerTest::ReferenceTestHelper(
+    const string& variable_op_type, const string& assign_op_type,
+    const DeviceType& expected_device_type) {
   Graph g(OpRegistry::Global());
   {  // Scope for temporary variables used to construct g.
     GraphDefBuilder b(GraphDefBuilder::kFailImmediately);
diff --git a/tensorflow/core/debug/debug_gateway.cc b/tensorflow/core/debug/debug_gateway.cc
index 24b9dd799a..1031ea843e 100644
--- a/tensorflow/core/debug/debug_gateway.cc
+++ b/tensorflow/core/debug/debug_gateway.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/debug/debug_gateway.h"
 
+#include <utility>
+
 #include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/common_runtime/session_factory.h"
 #include "tensorflow/core/framework/tensor.h"
@@ -56,11 +58,11 @@ DebugGateway::~DebugGateway() {
 }
 
 void DebugGateway::SetNodeCompletionCallback(NodeCompletionCallback callback) {
-  comp_cb_ = callback;
+  comp_cb_ = std::move(callback);
 }
 
 void DebugGateway::SetNodeValueCallback(NodeValueCallback callback) {
-  val_cb_ = callback;
+  val_cb_ = std::move(callback);
 }
 
 void DebugGateway::CopyTensor(const string& node_name, const int output_slot,
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 50c5d90fc9..73758ade03 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -63,7 +63,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
   ReffedClientGraph(const string& handle, const BuildGraphOptions& bopts,
                     std::unique_ptr<SimpleClientGraph> cg,
                     const SessionOptions& session_opts,
-                    StatsPublisherFactory stats_publisher_factory,
+                    const StatsPublisherFactory& stats_publisher_factory,
                     SimpleGraphExecutionState* execution_state, bool is_partial,
                     WorkerCacheInterface* worker_cache)
       : session_handle_(handle),
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.cc b/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.cc
index c3b76ed31b..bf72d9a7fc 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/distributed_runtime/rpc/grpc_remote_master.h"
 
+#include <utility>
+
 #include "tensorflow/core/distributed_runtime/call_options.h"
 #include "tensorflow/core/distributed_runtime/master_interface.h"
 #include "tensorflow/core/distributed_runtime/rpc/grpc_master_service_impl.h"
@@ -29,7 +31,7 @@ namespace tensorflow {
 // that uses gRPC to talk to the Master service.
 class GrpcRemoteMaster : public MasterInterface {
  public:
-  explicit GrpcRemoteMaster(SharedGrpcChannelPtr client_channel)
+  explicit GrpcRemoteMaster(const SharedGrpcChannelPtr& client_channel)
       : stub_(grpc::MasterService::NewStub(client_channel)) {}
 
   ~GrpcRemoteMaster() override {}
@@ -106,7 +108,7 @@ class GrpcRemoteMaster : public MasterInterface {
   }
 };
 
-MasterInterface* NewGrpcMaster(SharedGrpcChannelPtr channel) {
+MasterInterface* NewGrpcMaster(const SharedGrpcChannelPtr& channel) {
   return new GrpcRemoteMaster(channel);
 }
 
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.h b/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.h
index 881a6b10e3..d661caaa60 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_remote_master.h
@@ -21,7 +21,7 @@ limitations under the License.
 
 namespace tensorflow {
 // Returns a MasterInterface wrapped around the gRPC channel `channel`.
-MasterInterface* NewGrpcMaster(SharedGrpcChannelPtr channel);
+MasterInterface* NewGrpcMaster(const SharedGrpcChannelPtr& channel);
 }  // namespace tensorflow
 
 #endif  // THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_RPC_GRPC_REMOTE_MASTER_H_
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc b/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc
index 36626e1a33..2b1a47a93f 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.h"
 
+#include <utility>
+
 #include "grpc++/grpc++.h"
 
 #include "tensorflow/core/common_runtime/process_util.h"
@@ -37,7 +39,7 @@ class GrpcRemoteWorker : public WorkerInterface {
   explicit GrpcRemoteWorker(SharedGrpcChannelPtr channel,
                             ::grpc::CompletionQueue* completion_queue,
                             WorkerCacheLogger* logger)
-      : channel_(channel),
+      : channel_(std::move(channel)),
         cq_(completion_queue),
         getstatus_(Method(GrpcWorkerMethod::kGetStatus)),
         createworkersession_(Method(GrpcWorkerMethod::kCreateWorkerSession)),
@@ -272,7 +274,7 @@ class GrpcRemoteWorker : public WorkerInterface {
 WorkerInterface* NewGrpcRemoteWorker(SharedGrpcChannelPtr channel,
                                      ::grpc::CompletionQueue* completion_queue,
                                      WorkerCacheLogger* logger) {
-  return new GrpcRemoteWorker(channel, completion_queue, logger);
+  return new GrpcRemoteWorker(std::move(channel), completion_queue, logger);
 }
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index a387d49613..9c47c1da2f 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/framework/function.h"
 
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "tensorflow/core/framework/function.pb_text.h"
@@ -601,7 +602,8 @@ string Print(const GraphDef& gdef) {
   return out;
 }
 
-Status AddDefaultAttrs(const string& op, GetFunctionSignature get_function,
+Status AddDefaultAttrs(const string& op,
+                       const GetFunctionSignature& get_function,
                        InstantiateAttrValueMap* attrs) {
   const OpDef* op_def = nullptr;
   TF_RETURN_IF_ERROR(get_function(op, &op_def));
@@ -987,7 +989,7 @@ Status InstantiateFunction(const FunctionDef& fdef,
   for (const auto& aval : attr_values) {
     m.insert({aval.first, aval.second.proto});
   }
-  return InstantiateFunction(fdef, m, get_function, result);
+  return InstantiateFunction(fdef, m, std::move(get_function), result);
 }
 
 string Canonicalize(const string& funcname, InstantiateAttrValueSlice attrs) {
diff --git a/tensorflow/core/framework/graph_def_util_test.cc b/tensorflow/core/framework/graph_def_util_test.cc
index 8c76a74a4a..1ac322e48e 100644
--- a/tensorflow/core/framework/graph_def_util_test.cc
+++ b/tensorflow/core/framework/graph_def_util_test.cc
@@ -28,7 +28,7 @@ limitations under the License.
 namespace tensorflow {
 namespace {
 
-Status FinalizeOpDef(OpDefBuilder b, OpDef* op_def) {
+Status FinalizeOpDef(const OpDefBuilder& b, OpDef* op_def) {
   OpRegistrationData op_reg_data;
   const Status s = b.Finalize(&op_reg_data);
   *op_def = op_reg_data.op_def;
diff --git a/tensorflow/core/framework/memory_types.cc b/tensorflow/core/framework/memory_types.cc
index 14d8d91490..c1dde1504a 100644
--- a/tensorflow/core/framework/memory_types.cc
+++ b/tensorflow/core/framework/memory_types.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/framework/memory_types.h"
 
+#include <utility>
+
 #include "tensorflow/core/framework/kernel_def.pb.h"
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op_kernel.h"
@@ -64,7 +66,7 @@ MemoryType MTypeFromDType(const DataType dtype) {
 }  // namespace
 
 Status MemoryTypesForNode(const OpRegistryInterface* op_registry,
-                          DeviceType device_type, const NodeDef& ndef,
+                          const DeviceType& device_type, const NodeDef& ndef,
                           MemoryTypeVector* inp_mtypes,
                           MemoryTypeVector* out_mtypes) {
   // Look up the Op registered for this op name.
diff --git a/tensorflow/core/framework/memory_types.h b/tensorflow/core/framework/memory_types.h
index 3d4ca7597a..e35e22f590 100644
--- a/tensorflow/core/framework/memory_types.h
+++ b/tensorflow/core/framework/memory_types.h
@@ -28,7 +28,7 @@ namespace tensorflow {
 // REQUIRES: * '*_memory_types' is not nullptr.
 //           * def has all attrs specified (e.g. using AddDefaultsToNodeDef()).
 Status MemoryTypesForNode(const OpRegistryInterface* op_registry,
-                          DeviceType device_type, const NodeDef& ndef,
+                          const DeviceType& device_type, const NodeDef& ndef,
                           MemoryTypeVector* input_memory_types,
                           MemoryTypeVector* output_memory_types);
 
diff --git a/tensorflow/core/framework/op_def_builder_test.cc b/tensorflow/core/framework/op_def_builder_test.cc
index a6ffd5c596..bde5bb2c39 100644
--- a/tensorflow/core/framework/op_def_builder_test.cc
+++ b/tensorflow/core/framework/op_def_builder_test.cc
@@ -73,7 +73,7 @@ class OpDefBuilderTest : public ::testing::Test {
     }
   }
 
-  void ExpectFailure(const OpDefBuilder& builder, string error) {
+  void ExpectFailure(const OpDefBuilder& builder, const string& error) {
     OpRegistrationData op_reg_data;
     Status status = builder.Finalize(&op_reg_data);
     EXPECT_FALSE(status.ok());
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 6fad379b76..b53daeed0b 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "tensorflow/core/framework/attr_value_util.h"
@@ -807,7 +808,7 @@ static KernelRegistry* GlobalKernelRegistryTyped() {
   return reinterpret_cast<KernelRegistry*>(GlobalKernelRegistry());
 }
 
-static string Key(StringPiece op_type, DeviceType device_type,
+static string Key(StringPiece op_type, const DeviceType& device_type,
                   StringPiece label) {
   return strings::StrCat(op_type, ":", DeviceTypeString(device_type), ":",
                          label);
@@ -892,7 +893,8 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
   return Status::OK();
 }
 
-Status FindKernelRegistration(DeviceType device_type, const NodeDef& node_def,
+Status FindKernelRegistration(const DeviceType& device_type,
+                              const NodeDef& node_def,
                               const KernelRegistration** reg,
                               bool* was_attr_mismatch) {
   *reg = nullptr;
@@ -924,7 +926,7 @@ Status FindKernelRegistration(DeviceType device_type, const NodeDef& node_def,
 
 }  // namespace
 
-Status FindKernelDef(DeviceType device_type, const NodeDef& node_def,
+Status FindKernelDef(const DeviceType& device_type, const NodeDef& node_def,
                      const KernelDef** def, string* kernel_class_name) {
   const KernelRegistration* reg = nullptr;
   bool was_attr_mismatch;
@@ -1006,8 +1008,8 @@ std::unique_ptr<OpKernel> CreateOpKernel(
     DeviceType device_type, DeviceBase* device, Allocator* allocator,
     const NodeDef& node_def, int graph_def_version, Status* status) {
   OpKernel* kernel = nullptr;
-  *status = CreateOpKernel(device_type, device, allocator, nullptr, node_def,
-                           graph_def_version, &kernel);
+  *status = CreateOpKernel(std::move(device_type), device, allocator, nullptr,
+                           node_def, graph_def_version, &kernel);
   return std::unique_ptr<OpKernel>(kernel);
 }
 
diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index d926d7db19..969142ca23 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include <functional>
 
+#include <utility>
 #include <vector>
 #include "tensorflow/core/framework/allocator.h"
 #include "tensorflow/core/framework/cancellation.h"
@@ -227,7 +228,7 @@ class OpKernelConstruction {
                        const DataTypeSlice& output_types,
                        const MemoryTypeSlice& output_memory_types,
                        int graph_def_version, Status* status)
-      : device_type_(device_type),
+      : device_type_(std::move(device_type)),
         device_(device),
         allocator_(allocator),
         def_(node_def),
@@ -1253,7 +1254,7 @@ void* GlobalKernelRegistry();
 // If node_def has a corresponding kernel registered on device_type,
 // returns OK and fill in the kernel def and kernel_class_name. <def> and
 // <kernel_class_name> may be null.
-Status FindKernelDef(DeviceType device_type, const NodeDef& node_def,
+Status FindKernelDef(const DeviceType& device_type, const NodeDef& node_def,
                      const KernelDef** def, string* kernel_class_name);
 
 // Writes a list of all registered kernels to LOG(INFO), to help users debug
diff --git a/tensorflow/core/framework/op_kernel_test.cc b/tensorflow/core/framework/op_kernel_test.cc
index 46d4dbd86a..e8e931b52e 100644
--- a/tensorflow/core/framework/op_kernel_test.cc
+++ b/tensorflow/core/framework/op_kernel_test.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 
 #include <memory>
+#include <utility>
 #include <vector>
 #include "tensorflow/core/framework/allocator.h"
 #include "tensorflow/core/framework/attr_value_util.h"
@@ -133,8 +134,8 @@ class OpKernelTest : public ::testing::Test {
                      const DataTypeVector& outputs) {
     Status status;
     std::unique_ptr<OpKernel> op(CreateOpKernel(
-        device_type, &device_, cpu_allocator(), CreateNodeDef(op_type, inputs),
-        TF_GRAPH_DEF_VERSION, &status));
+        std::move(device_type), &device_, cpu_allocator(),
+        CreateNodeDef(op_type, inputs), TF_GRAPH_DEF_VERSION, &status));
     EXPECT_TRUE(status.ok()) << status;
     EXPECT_TRUE(op != nullptr);
     if (op != nullptr) {
@@ -148,9 +149,9 @@ class OpKernelTest : public ::testing::Test {
     NodeDef node_def;
     protobuf::TextFormat::ParseFromString(ascii_node_def, &node_def);
     Status status;
-    std::unique_ptr<OpKernel> op(CreateOpKernel(device_type, &device_,
-                                                cpu_allocator(), node_def,
-                                                TF_GRAPH_DEF_VERSION, &status));
+    std::unique_ptr<OpKernel> op(
+        CreateOpKernel(std::move(device_type), &device_, cpu_allocator(),
+                       node_def, TF_GRAPH_DEF_VERSION, &status));
     EXPECT_TRUE(op == nullptr);
     EXPECT_FALSE(status.ok());
     if (!status.ok()) {
@@ -384,7 +385,7 @@ class OpKernelBuilderTest : public ::testing::Test {
   }
 
   std::unique_ptr<OpKernel> ExpectSuccess(const string& op_type,
-                                          DeviceType device_type,
+                                          const DeviceType& device_type,
                                           const std::vector<string>& attrs,
                                           DataTypeSlice input_types = {}) {
     Status status;
@@ -423,7 +424,7 @@ class OpKernelBuilderTest : public ::testing::Test {
     return op;
   }
 
-  void ExpectFailure(const string& op_type, DeviceType device_type,
+  void ExpectFailure(const string& op_type, const DeviceType& device_type,
                      const std::vector<string>& attrs, error::Code code) {
     Status status;
     const NodeDef def = CreateNodeDef(op_type, attrs);
diff --git a/tensorflow/core/framework/tensor_test.cc b/tensorflow/core/framework/tensor_test.cc
index c907bbb69f..424b4579d3 100644
--- a/tensorflow/core/framework/tensor_test.cc
+++ b/tensorflow/core/framework/tensor_test.cc
@@ -810,7 +810,8 @@ TEST(Tensor, Slice_Basic) {
 
 namespace {
 template <typename T>
-Tensor MkTensor(DataType dt, TensorShape shape, std::vector<T> init_values) {
+Tensor MkTensor(DataType dt, const TensorShape& shape,
+                std::vector<T> init_values) {
   Tensor x(dt, shape);
   const int limit = x.NumElements();
   int vi = 0;
diff --git a/tensorflow/core/framework/types.cc b/tensorflow/core/framework/types.cc
index a374f848a1..dc396e468a 100644
--- a/tensorflow/core/framework/types.cc
+++ b/tensorflow/core/framework/types.cc
@@ -169,7 +169,9 @@ bool DataTypeFromString(StringPiece sp, DataType* dt) {
   return false;
 }
 
-string DeviceTypeString(DeviceType device_type) { return device_type.type(); }
+string DeviceTypeString(const DeviceType& device_type) {
+  return device_type.type();
+}
 
 string DataTypeSliceString(const DataTypeSlice types) {
   string out;
diff --git a/tensorflow/core/framework/types.h b/tensorflow/core/framework/types.h
index 932d788f23..0a81b1cb9f 100644
--- a/tensorflow/core/framework/types.h
+++ b/tensorflow/core/framework/types.h
@@ -82,7 +82,7 @@ typedef gtl::InlinedVector<DeviceType, 4> DeviceTypeVector;
 
 // Convert the enums to strings for errors:
 string DataTypeString(DataType dtype);
-string DeviceTypeString(DeviceType device_type);
+string DeviceTypeString(const DeviceType& device_type);
 string DataTypeSliceString(const DataTypeSlice dtypes);
 inline string DataTypeVectorString(const DataTypeVector& dtypes) {
   return DataTypeSliceString(dtypes);
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index 502b7b26da..4afc878f76 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -51,8 +51,8 @@ class GraphTest : public ::testing::Test {
   GraphTest() : graph_(OpRegistry::Global()) {}
   ~GraphTest() override {}
 
-  static void VerifyNodes(Node* node, std::vector<Node*> expected_in,
-                          std::vector<Node*> expected_out) {
+  static void VerifyNodes(Node* node, const std::vector<Node*>& expected_in,
+                          const std::vector<Node*>& expected_out) {
     std::vector<Node*> in;
     for (const Edge* e : node->in_edges()) {
       in.push_back(e->src());
diff --git a/tensorflow/core/graph/optimizer_cse.cc b/tensorflow/core/graph/optimizer_cse.cc
index 59dff60ea3..a679eac0e7 100644
--- a/tensorflow/core/graph/optimizer_cse.cc
+++ b/tensorflow/core/graph/optimizer_cse.cc
@@ -39,6 +39,7 @@ limitations under the License.
 #include "tensorflow/core/graph/optimizer_cse.h"
 
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "tensorflow/core/graph/algorithm.h"
@@ -52,7 +53,7 @@ class OptimizerCSE {
  public:
   explicit OptimizerCSE(Graph* g) : g_(g) {}
 
-  bool Optimize(std::function<bool(const Node*)> consider_fn);
+  bool Optimize(const std::function<bool(const Node*)>& consider_fn);
 
  private:
   struct Scratch;
@@ -180,7 +181,8 @@ bool OptimizerCSE::Equivalent(const Node* a, const Node* b, Scratch* scratch) {
   return true;
 }
 
-bool OptimizerCSE::Optimize(std::function<bool(const Node*)> consider_fn) {
+bool OptimizerCSE::Optimize(
+    const std::function<bool(const Node*)>& consider_fn) {
   // This very simple implementation works if the whole graph is one
   // giant basic block (because we just traverse nodes in a
   // topological order). This simple implementation works well
@@ -232,7 +234,8 @@ bool OptimizerCSE::Optimize(std::function<bool(const Node*)> consider_fn) {
   return changed;
 }
 
-bool OptimizeCSE(Graph* g, std::function<bool(const Node*)> consider_fn) {
+bool OptimizeCSE(Graph* g,
+                 const std::function<bool(const Node*)>& consider_fn) {
   OptimizerCSE opt(g);
   return opt.Optimize(consider_fn);
 }
diff --git a/tensorflow/core/graph/optimizer_cse.h b/tensorflow/core/graph/optimizer_cse.h
index 24ec5658d8..b8f3230c70 100644
--- a/tensorflow/core/graph/optimizer_cse.h
+++ b/tensorflow/core/graph/optimizer_cse.h
@@ -29,7 +29,8 @@ namespace tensorflow {
 // during the common subexpression elimination.
 //
 // Returns true if and only if 'g' is mutated.
-extern bool OptimizeCSE(Graph* g, std::function<bool(const Node*)> consider_fn);
+extern bool OptimizeCSE(Graph* g,
+                        const std::function<bool(const Node*)>& consider_fn);
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/graph/optimizer_cse_test.cc b/tensorflow/core/graph/optimizer_cse_test.cc
index 1091af4e45..94250240eb 100644
--- a/tensorflow/core/graph/optimizer_cse_test.cc
+++ b/tensorflow/core/graph/optimizer_cse_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/graph/optimizer_cse.h"
 
+#include <utility>
 #include <vector>
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/tensor.h"
diff --git a/tensorflow/core/kernels/barrier_ops.cc b/tensorflow/core/kernels/barrier_ops.cc
index 03880b9827..83633a1dd9 100644
--- a/tensorflow/core/kernels/barrier_ops.cc
+++ b/tensorflow/core/kernels/barrier_ops.cc
@@ -88,7 +88,7 @@ class Barrier : public ResourceBase {
   template <typename T>
   void TryInsertMany(const Tensor& keys, int component_index,
                      const Tensor& values, OpKernelContext* ctx,
-                     DoneCallback callback) {
+                     const DoneCallback& callback) {
     TensorShape element_shape = values.shape();
     OP_REQUIRES_ASYNC(
         ctx, keys.NumElements() == 0 || element_shape.num_elements() > 0,
@@ -195,7 +195,8 @@ class Barrier : public ResourceBase {
   }
 
   void TryTakeMany(int num_elements, bool allow_small_batch, int64 timeout,
-                   OpKernelContext* ctx, IndicesKeysValuesCallback callback) {
+                   OpKernelContext* ctx,
+                   const IndicesKeysValuesCallback& callback) {
     int num_elements_to_deliver = num_elements;
     {
       mutex_lock lock(mu_);
@@ -247,7 +248,7 @@ class Barrier : public ResourceBase {
   }
 
   void Close(OpKernelContext* ctx, bool cancel_pending_enqueues,
-             DoneCallback callback) {
+             const DoneCallback& callback) {
     mutex_lock lock(mu_);
     // We're allowed to close twice if the first close wasn't a
     // cancel but the second one is.
@@ -399,7 +400,8 @@ class Barrier : public ResourceBase {
   }
 
   void CloseQueueLocked(OpKernelContext* ctx, bool cancel_pending_enqueues,
-                        DoneCallback callback) EXCLUSIVE_LOCKS_REQUIRED(mu_) {
+                        const DoneCallback& callback)
+      EXCLUSIVE_LOCKS_REQUIRED(mu_) {
     // CloseQueueLocked may only be called with mu_ held.
     if (!cancel_pending_enqueues && queue_closed_) {
       callback();
diff --git a/tensorflow/core/kernels/conv_ops_fused.cc b/tensorflow/core/kernels/conv_ops_fused.cc
index 219e6d5e97..f7348f1077 100644
--- a/tensorflow/core/kernels/conv_ops_fused.cc
+++ b/tensorflow/core/kernels/conv_ops_fused.cc
@@ -74,8 +74,9 @@ enum SamplingMode {
 //       my_vector[current] *= 10.0f;
 //     }
 // });
-void FusedConvParallelFor(OpKernelContext* context, int64 begin, int64 end,
-                          std::function<void(int64, int64)> task_function) {
+void FusedConvParallelFor(
+    OpKernelContext* context, int64 begin, int64 end,
+    const std::function<void(int64, int64)>& task_function) {
 // On iOS, the thread management imposes a very big performance penalty, so
 // just call the function directly with no multithreading.
 #if defined(__APPLE__) && defined(IS_MOBILE_PLATFORM)
diff --git a/tensorflow/core/kernels/conv_ops_test.cc b/tensorflow/core/kernels/conv_ops_test.cc
index b122e7f0e8..cd9aa4a53e 100644
--- a/tensorflow/core/kernels/conv_ops_test.cc
+++ b/tensorflow/core/kernels/conv_ops_test.cc
@@ -116,8 +116,9 @@ class FusedResizePadConvOpTest : public OpsTestBase {
                                int input_depth, int resize_width,
                                int resize_height, int y_padding, int x_padding,
                                int filter_size, int filter_count,
-                               bool resize_align_corners, string pad_mode,
-                               int stride, string padding) {
+                               bool resize_align_corners,
+                               const string& pad_mode, int stride,
+                               const string& padding) {
     auto root = tensorflow::Scope::NewRootScope();
     using namespace ::tensorflow::ops;  // NOLINT(build/namespaces)
 
@@ -170,8 +171,8 @@ class FusedResizePadConvOpTest : public OpsTestBase {
   void CompareFusedPadOnlyAndSeparate(int input_width, int input_height,
                                       int input_depth, int y_padding,
                                       int x_padding, int filter_size,
-                                      int filter_count, string pad_mode,
-                                      int stride, string padding) {
+                                      int filter_count, const string& pad_mode,
+                                      int stride, const string& padding) {
     auto root = tensorflow::Scope::NewRootScope();
     using namespace ::tensorflow::ops;  // NOLINT(build/namespaces)
 
diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index 6a748d3462..c5470f81eb 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -79,13 +79,13 @@ static inline Status ParseAndCheckBoxSizes(const Tensor& boxes,
 template <typename Device>
 inline void RunIfBoxIndexIsValid(
     OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
-    int batch_size, Callback compute, Callback done);
+    int batch_size, const Callback& compute, const Callback& done);
 
 // Specialization of CheckValidBoxIndex for a CPUDevice.
 template <>
 inline void RunIfBoxIndexIsValid<CPUDevice>(
     OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
-    int batch_size, Callback compute, Callback done) {
+    int batch_size, const Callback& compute, const Callback& done) {
   const int num_boxes = box_index.dimension(0);
   for (int b = 0; b < num_boxes; ++b) {
     OP_REQUIRES_ASYNC(
@@ -690,7 +690,7 @@ namespace {
 template <>
 inline void RunIfBoxIndexIsValid<GPUDevice>(
     OpKernelContext* context, typename TTypes<int32, 1>::ConstTensor box_index,
-    int batch_size, Callback compute, Callback done) {
+    int batch_size, const Callback& compute, const Callback& done) {
   const int num_boxes = box_index.dimension(0);
   if (num_boxes == 0) {
     compute();
diff --git a/tensorflow/core/kernels/debug_ops_test.cc b/tensorflow/core/kernels/debug_ops_test.cc
index 495db92ef6..487f045cc8 100644
--- a/tensorflow/core/kernels/debug_ops_test.cc
+++ b/tensorflow/core/kernels/debug_ops_test.cc
@@ -36,7 +36,7 @@ namespace tensorflow {
 
 class DebugIdentityOpTest : public OpsTestBase {
  protected:
-  Status Init(DataType input_type, const std::vector<string> debug_urls) {
+  Status Init(DataType input_type, const std::vector<string>& debug_urls) {
     env_ = Env::Default();
 
     TF_CHECK_OK(NodeDefBuilder("op", "DebugIdentity")
diff --git a/tensorflow/core/kernels/reverse_op_test.cc b/tensorflow/core/kernels/reverse_op_test.cc
index 19e25b887d..c6193f378d 100644
--- a/tensorflow/core/kernels/reverse_op_test.cc
+++ b/tensorflow/core/kernels/reverse_op_test.cc
@@ -120,7 +120,7 @@ static SessionOptions GetOptions(int intra_threads) {
 
 // Creates a Graph which "reduce"s a 3D float tensor of "num" elements
 // into a scalar.
-static Graph* Reverse(TensorShape shape, int reverse_axis) {
+static Graph* Reverse(const TensorShape& shape, int reverse_axis) {
   Graph* g = new Graph(OpRegistry::Global());
   Tensor data(DT_FLOAT, shape);
   data.flat<float>().setRandom();
diff --git a/tensorflow/core/kernels/save_restore_tensor.cc b/tensorflow/core/kernels/save_restore_tensor.cc
index 006ef988b5..80d4901740 100644
--- a/tensorflow/core/kernels/save_restore_tensor.cc
+++ b/tensorflow/core/kernels/save_restore_tensor.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include <unordered_map>
 
+#include <utility>
 #include <vector>
 #include "tensorflow/core/kernels/save_restore_tensor.h"
 
@@ -79,7 +80,7 @@ void SaveTensors(
   VLOG(1) << "About to save tensors to file " << filename_t.flat<string>()(0)
           << "...";
   checkpoint::TensorSliceWriter writer(filename_t.flat<string>()(0),
-                                       builder_func);
+                                       std::move(builder_func));
 
   Status s;
   auto tensor_names_flat = tensor_names_t.flat<string>();
diff --git a/tensorflow/core/kernels/segment_reduction_ops_test.cc b/tensorflow/core/kernels/segment_reduction_ops_test.cc
index 0a281835a4..bdf3c12ff9 100644
--- a/tensorflow/core/kernels/segment_reduction_ops_test.cc
+++ b/tensorflow/core/kernels/segment_reduction_ops_test.cc
@@ -40,8 +40,9 @@ limitations under the License.
 namespace tensorflow {
 
 template <typename Index>
-static void BM_SegmentReduction(int iters, string reduction, Index num_rows,
-                                Index num_cols, Index segment_size) {
+static void BM_SegmentReduction(int iters, const string& reduction,
+                                Index num_rows, Index num_cols,
+                                Index segment_size) {
   testing::StopTiming();
   std::unique_ptr<Device> device(
       DeviceFactory::NewDevice("CPU", {}, "/job:a/replica:0/task:0"));
diff --git a/tensorflow/core/lib/core/threadpool.cc b/tensorflow/core/lib/core/threadpool.cc
index 2b10ebeaf7..c8e514df80 100644
--- a/tensorflow/core/lib/core/threadpool.cc
+++ b/tensorflow/core/lib/core/threadpool.cc
@@ -47,7 +47,7 @@ struct EigenEnvironment {
                    const string& name)
       : env_(env), thread_options_(thread_options), name_(name) {}
 
-  EnvThread* CreateThread(std::function<void()> f) {
+  EnvThread* CreateThread(const std::function<void()>& f) {
     return env_->StartThread(thread_options_, name_, [=]() {
       // Set the processor flag to flush denormals to zero.
       port::ScopedFlushDenormal flush;
diff --git a/tensorflow/core/lib/jpeg/jpeg_mem.cc b/tensorflow/core/lib/jpeg/jpeg_mem.cc
index f9846968af..e27904ea12 100644
--- a/tensorflow/core/lib/jpeg/jpeg_mem.cc
+++ b/tensorflow/core/lib/jpeg/jpeg_mem.cc
@@ -337,7 +337,8 @@ uint8* UncompressLow(const void* srcdata, FewerArgsForCompiler* argball) {
 uint8* Uncompress(const void* srcdata, int datasize,
                   const UncompressFlags& flags, int64* nwarn,
                   std::function<uint8*(int, int, int)> allocate_output) {
-  FewerArgsForCompiler argball(datasize, flags, nwarn, allocate_output);
+  FewerArgsForCompiler argball(datasize, flags, nwarn,
+                               std::move(allocate_output));
   uint8* const dstdata = UncompressLow(srcdata, &argball);
 
   const float fraction_read =
diff --git a/tensorflow/core/lib/random/random_distributions_test.cc b/tensorflow/core/lib/random/random_distributions_test.cc
index 531ed78109..28ff5bf6e8 100644
--- a/tensorflow/core/lib/random/random_distributions_test.cc
+++ b/tensorflow/core/lib/random/random_distributions_test.cc
@@ -70,7 +70,7 @@ void FillRandomsWithSingles(PhiloxRandom gen,
 //   z_limit: the maximum z-test we would consider the test to pass;
 template <typename T>
 bool CheckSamplesMoments(const std::vector<T>& samples,
-                         std::function<double(int)> theoretical_moments,
+                         const std::function<double(int)>& theoretical_moments,
                          int max_moments, int stride, T z_limit) {
   const T* const samples_data = &samples[0];
   const int samples_size = samples.size();
diff --git a/tensorflow/core/ops/training_ops_test.cc b/tensorflow/core/ops/training_ops_test.cc
index 9c3489211c..da66fbe4ba 100644
--- a/tensorflow/core/ops/training_ops_test.cc
+++ b/tensorflow/core/ops/training_ops_test.cc
@@ -21,9 +21,9 @@ limitations under the License.
 namespace tensorflow {
 
 // Used for testing the grad+indices handling for SparseApplyXYZ tests.
-static void TestGradAndIndicesErrorHandling(ShapeInferenceTestOp op,
+static void TestGradAndIndicesErrorHandling(const ShapeInferenceTestOp& op,
                                             string shape_spec_middle,
-                                            string shape_spec_end = "") {
+                                            const string& shape_spec_end = "") {
   auto shape_spec = [&shape_spec_middle, shape_spec_end](
       const char* var_spec, const char* grad_indices_spec) {
     return strings::StrCat(var_spec, ";", shape_spec_middle, ";",
diff --git a/tensorflow/core/platform/cloud/oauth_client.cc b/tensorflow/core/platform/cloud/oauth_client.cc
index a3d5b9a6e4..97d6617a04 100644
--- a/tensorflow/core/platform/cloud/oauth_client.cc
+++ b/tensorflow/core/platform/cloud/oauth_client.cc
@@ -43,7 +43,8 @@ constexpr char kJwtType[] = "JWT";
 constexpr char kGrantType[] =
     "urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Ajwt-bearer";
 
-Status ReadJsonValue(Json::Value json, const string& name, Json::Value* value) {
+Status ReadJsonValue(const Json::Value& json, const string& name,
+                     Json::Value* value) {
   if (!value) {
     return errors::FailedPrecondition("'value' cannot be nullptr.");
   }
@@ -55,7 +56,8 @@ Status ReadJsonValue(Json::Value json, const string& name, Json::Value* value) {
   return Status::OK();
 }
 
-Status ReadJsonString(Json::Value json, const string& name, string* value) {
+Status ReadJsonString(const Json::Value& json, const string& name,
+                      string* value) {
   Json::Value json_value;
   TF_RETURN_IF_ERROR(ReadJsonValue(json, name, &json_value));
   if (!json_value.isString()) {
@@ -66,7 +68,7 @@ Status ReadJsonString(Json::Value json, const string& name, string* value) {
   return Status::OK();
 }
 
-Status ReadJsonInt(Json::Value json, const string& name, int64* value) {
+Status ReadJsonInt(const Json::Value& json, const string& name, int64* value) {
   Json::Value json_value;
   TF_RETURN_IF_ERROR(ReadJsonValue(json, name, &json_value));
   if (!json_value.isIntegral()) {
diff --git a/tensorflow/core/platform/env.cc b/tensorflow/core/platform/env.cc
index d729963616..2fdd989c9b 100644
--- a/tensorflow/core/platform/env.cc
+++ b/tensorflow/core/platform/env.cc
@@ -14,6 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include <deque>
+#include <utility>
 #include <vector>
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
@@ -95,7 +96,7 @@ Status Env::GetRegisteredFileSystemSchemes(std::vector<string>* schemes) {
 
 Status Env::RegisterFileSystem(const string& scheme,
                                FileSystemRegistry::Factory factory) {
-  return file_system_registry_->Register(scheme, factory);
+  return file_system_registry_->Register(scheme, std::move(factory));
 }
 
 Status Env::NewRandomAccessFile(const string& fname,
diff --git a/tensorflow/core/platform/file_system.cc b/tensorflow/core/platform/file_system.cc
index 3d7553e6da..2abda45714 100644
--- a/tensorflow/core/platform/file_system.cc
+++ b/tensorflow/core/platform/file_system.cc
@@ -37,7 +37,7 @@ constexpr int kNumThreads = 8;
 
 // Run a function in parallel using a ThreadPool, but skip the ThreadPool
 // on the iOS platform due to its problems with more than a few threads.
-void ForEach(int first, int last, std::function<void(int)> f) {
+void ForEach(int first, int last, const std::function<void(int)>& f) {
 #if TARGET_OS_IPHONE
   for (int i = first; i < last; i++) {
     f(i);
diff --git a/tensorflow/core/util/tensor_slice_reader.cc b/tensorflow/core/util/tensor_slice_reader.cc
index e750b130b9..cd49034719 100644
--- a/tensorflow/core/util/tensor_slice_reader.cc
+++ b/tensorflow/core/util/tensor_slice_reader.cc
@@ -102,7 +102,8 @@ TensorSliceReader::TensorSliceReader(const string& filepattern)
 
 TensorSliceReader::TensorSliceReader(const string& filepattern,
                                      OpenTableFunction open_function)
-    : TensorSliceReader(filepattern, open_function, kLoadAllShards) {}
+    : TensorSliceReader(filepattern, std::move(open_function), kLoadAllShards) {
+}
 
 TensorSliceReader::TensorSliceReader(const string& filepattern,
                                      OpenTableFunction open_function,
diff --git a/tensorflow/core/util/tensor_slice_reader_cache.cc b/tensorflow/core/util/tensor_slice_reader_cache.cc
index cbd2922f54..0f009d7de5 100644
--- a/tensorflow/core/util/tensor_slice_reader_cache.cc
+++ b/tensorflow/core/util/tensor_slice_reader_cache.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/util/tensor_slice_reader_cache.h"
 
+#include <utility>
+
 #include "tensorflow/core/lib/gtl/stl_util.h"
 #include "tensorflow/core/platform/logging.h"
 
@@ -36,7 +38,8 @@ const TensorSliceReader* TensorSliceReaderCacheWrapper::GetReader(
   if (!cache_) {
     cache_ = new TensorSliceReaderCache;
   }
-  return cache_->GetReader(filepattern, open_function, preferred_shard);
+  return cache_->GetReader(filepattern, std::move(open_function),
+                           preferred_shard);
 }
 
 TensorSliceReaderCache::TensorSliceReaderCache() {}
diff --git a/tensorflow/core/util/tensor_slice_reader_test.cc b/tensorflow/core/util/tensor_slice_reader_test.cc
index 8545697886..f4859262e1 100644
--- a/tensorflow/core/util/tensor_slice_reader_test.cc
+++ b/tensorflow/core/util/tensor_slice_reader_test.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <utility>
+
 #include "tensorflow/core/util/tensor_slice_reader.h"
 
 #include "tensorflow/core/framework/types.h"
@@ -48,8 +50,9 @@ namespace {
 //
 // We assume this is a row-major matrix.
 
-void SimpleFloatHelper(TensorSliceWriter::CreateBuilderFunction create_function,
-                       TensorSliceReader::OpenTableFunction open_function) {
+void SimpleFloatHelper(
+    const TensorSliceWriter::CreateBuilderFunction& create_function,
+    TensorSliceReader::OpenTableFunction open_function) {
   const string fname_base = io::JoinPath(testing::TmpDir(), "float_checkpoint");
 
   TensorShape shape({4, 5});
@@ -108,7 +111,7 @@ void SimpleFloatHelper(TensorSliceWriter::CreateBuilderFunction create_function,
 
   // Now we need to read the tensor slices
   const string filepattern = strings::StrCat(fname_base, "_*");
-  TensorSliceReader reader(filepattern, open_function);
+  TensorSliceReader reader(filepattern, std::move(open_function));
   TF_EXPECT_OK(reader.status());
   EXPECT_EQ(2, reader.num_files());
 
@@ -171,9 +174,10 @@ TEST(TensorSliceReaderTest, SimpleFloat) {
 }
 
 template <typename T, typename U>
-void SimpleIntXHelper(TensorSliceWriter::CreateBuilderFunction create_function,
-                      TensorSliceReader::OpenTableFunction open_function,
-                      const string& checkpoint_file) {
+void SimpleIntXHelper(
+    const TensorSliceWriter::CreateBuilderFunction& create_function,
+    TensorSliceReader::OpenTableFunction open_function,
+    const string& checkpoint_file) {
   const string fname_base = io::JoinPath(testing::TmpDir(), checkpoint_file);
 
   TensorShape shape({4, 5});
@@ -232,7 +236,7 @@ void SimpleIntXHelper(TensorSliceWriter::CreateBuilderFunction create_function,
 
   // Now we need to read the tensor slices
   const string filepattern = strings::StrCat(fname_base, "_*");
-  TensorSliceReader reader(filepattern, open_function);
+  TensorSliceReader reader(filepattern, std::move(open_function));
   TF_EXPECT_OK(reader.status());
   EXPECT_EQ(2, reader.num_files());
 
@@ -304,8 +308,8 @@ TEST_SIMPLE_INT(int8, int32)
 TEST_SIMPLE_INT(uint8, int32)
 
 void CachedTensorSliceReaderTesterHelper(
-    TensorSliceWriter::CreateBuilderFunction create_function,
-    TensorSliceReader::OpenTableFunction open_function) {
+    const TensorSliceWriter::CreateBuilderFunction& create_function,
+    const TensorSliceReader::OpenTableFunction& open_function) {
   const string fname_base = io::JoinPath(testing::TmpDir(), "float_checkpoint");
 
   TensorShape shape({4, 5});
diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
index 8e3f69a6d6..ad032f93fd 100644
--- a/tensorflow/examples/label_image/main.cc
+++ b/tensorflow/examples/label_image/main.cc
@@ -32,6 +32,7 @@ limitations under the License.
 // The googlenet_graph.pb file included by default is created from Inception.
 
 #include <fstream>
+#include <utility>
 #include <vector>
 
 #include "tensorflow/cc/ops/const_op.h"
@@ -62,7 +63,7 @@ using tensorflow::int32;
 // Takes a file name, and loads a list of labels from it, one per line, and
 // returns a vector of the strings. It pads with empty strings so the length
 // of the result is a multiple of 16, because our model expects that.
-Status ReadLabelsFile(string file_name, std::vector<string>* result,
+Status ReadLabelsFile(const string& file_name, std::vector<string>* result,
                       size_t* found_label_count) {
   std::ifstream file(file_name);
   if (!file) {
@@ -84,7 +85,7 @@ Status ReadLabelsFile(string file_name, std::vector<string>* result,
 
 // Given an image file name, read in the data, try to decode it as an image,
 // resize it to the requested size, and then scale the values as desired.
-Status ReadTensorFromImageFile(string file_name, const int input_height,
+Status ReadTensorFromImageFile(const string& file_name, const int input_height,
                                const int input_width, const float input_mean,
                                const float input_std,
                                std::vector<Tensor>* out_tensors) {
@@ -138,7 +139,7 @@ Status ReadTensorFromImageFile(string file_name, const int input_height,
 
 // Reads a model graph definition from disk, and creates a session object you
 // can use to run it.
-Status LoadGraph(string graph_file_name,
+Status LoadGraph(const string& graph_file_name,
                  std::unique_ptr<tensorflow::Session>* session) {
   tensorflow::GraphDef graph_def;
   Status load_graph_status =
@@ -185,7 +186,7 @@ Status GetTopLabels(const std::vector<Tensor>& outputs, int how_many_labels,
 // Given the output of a model run, and the name of a file containing the labels
 // this prints out the top five highest-scoring values.
 Status PrintTopLabels(const std::vector<Tensor>& outputs,
-                      string labels_file_name) {
+                      const string& labels_file_name) {
   std::vector<string> labels;
   size_t label_count;
   Status read_labels_status =
diff --git a/tensorflow/examples/multibox_detector/main.cc b/tensorflow/examples/multibox_detector/main.cc
index 0d6875671b..e38704fd98 100644
--- a/tensorflow/examples/multibox_detector/main.cc
+++ b/tensorflow/examples/multibox_detector/main.cc
@@ -159,7 +159,7 @@ Status SaveImage(const Tensor& tensor, const string& file_path) {
 
 // Reads a model graph definition from disk, and creates a session object you
 // can use to run it.
-Status LoadGraph(string graph_file_name,
+Status LoadGraph(const string& graph_file_name,
                  std::unique_ptr<tensorflow::Session>* session) {
   tensorflow::GraphDef graph_def;
   Status load_graph_status =
diff --git a/tensorflow/python/framework/python_op_gen.cc b/tensorflow/python/framework/python_op_gen.cc
index d6fd750f6f..5993d96b97 100644
--- a/tensorflow/python/framework/python_op_gen.cc
+++ b/tensorflow/python/framework/python_op_gen.cc
@@ -391,7 +391,8 @@ string AttrValueToPython(const string& type, const AttrValue& value) {
   }
 }
 
-static string GetPythonOp(const OpDef& op_def, bool is_hidden, string op_name) {
+static string GetPythonOp(const OpDef& op_def, bool is_hidden,
+                          const string& op_name) {
   string result;
   // Map from attr name to the first input arg it is inferred from.
   std::unordered_map<string, string> inferred_attrs;
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
index 3e53f1d69f..89e93a86a9 100644
--- a/tensorflow/python/lib/core/py_func.cc
+++ b/tensorflow/python/lib/core/py_func.cc
@@ -261,7 +261,7 @@ class NumpyTensorBuffer : public TensorBuffer {
     proto->set_requested_bytes(rb);
     proto->set_allocator_name(tensorflow::cpu_allocator()->Name());
   }
-  Tensor MakeTensor(DataType dtype, TensorShape shape) {
+  Tensor MakeTensor(DataType dtype, const TensorShape& shape) {
     CHECK_EQ(len_, shape.num_elements() * DataTypeSize(dtype));
     return Tensor(dtype, shape, this);
   }
diff --git a/tensorflow/stream_executor/cuda/cuda_driver.cc b/tensorflow/stream_executor/cuda/cuda_driver.cc
index 9b8e23babd..76778dbeec 100644
--- a/tensorflow/stream_executor/cuda/cuda_driver.cc
+++ b/tensorflow/stream_executor/cuda/cuda_driver.cc
@@ -15,10 +15,11 @@ limitations under the License.
 
 #include "tensorflow/stream_executor/cuda/cuda_driver.h"
 
-#include <map>
 #include <stdint.h>
 #include <stdlib.h>
+#include <map>
 #include <set>
+#include <utility>
 
 #include "tensorflow/stream_executor/cuda/cuda_diagnostics.h"
 #include "tensorflow/stream_executor/lib/casts.h"
@@ -453,7 +454,8 @@ static port::Status InternalInit() {
   return true;
 }
 
-bool DeviceOptionsToContextFlags(DeviceOptions device_options, int *flags) {
+bool DeviceOptionsToContextFlags(const DeviceOptions &device_options,
+                                 int *flags) {
   static_assert(DeviceOptions::kMask == 0xf,
                 "needs update for new device options");
 
diff --git a/tensorflow/stream_executor/stream_executor_pimpl.cc b/tensorflow/stream_executor/stream_executor_pimpl.cc
index 42fcd5867c..fe5da12639 100644
--- a/tensorflow/stream_executor/stream_executor_pimpl.cc
+++ b/tensorflow/stream_executor/stream_executor_pimpl.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/stream_executor/stream_executor_pimpl.h"
 
 #include <atomic>
+#include <utility>
 
 #include "tensorflow/stream_executor/blas.h"
 #include "tensorflow/stream_executor/fft.h"
@@ -204,7 +205,7 @@ StreamExecutor::~StreamExecutor() {
 port::Status StreamExecutor::Init(int device_ordinal,
                                   DeviceOptions device_options) {
   device_ordinal_ = device_ordinal;
-  return implementation_->Init(device_ordinal, device_options);
+  return implementation_->Init(device_ordinal, std::move(device_options));
 }
 
 port::Status StreamExecutor::Init() {
@@ -619,7 +620,7 @@ bool StreamExecutor::Memset32(Stream *stream, DeviceMemoryBase *location,
 
 bool StreamExecutor::HostCallback(Stream *stream,
                                   std::function<void()> callback) {
-  return implementation_->HostCallback(stream, callback);
+  return implementation_->HostCallback(stream, std::move(callback));
 }
 
 port::Status StreamExecutor::AllocateEvent(Event *event) {
@@ -689,7 +690,7 @@ bool StreamExecutor::DeviceMemoryUsage(int64 *free, int64 *total) const {
 }
 
 void StreamExecutor::EnqueueOnBackgroundThread(std::function<void()> task) {
-  background_threads_->Schedule(task);
+  background_threads_->Schedule(std::move(task));
 }
 
 void StreamExecutor::CreateAllocRecord(void *opaque, uint64 bytes) {
diff --git a/tensorflow/tools/graph_transforms/fold_constants_test.cc b/tensorflow/tools/graph_transforms/fold_constants_test.cc
index dac13f5c32..902f92952a 100644
--- a/tensorflow/tools/graph_transforms/fold_constants_test.cc
+++ b/tensorflow/tools/graph_transforms/fold_constants_test.cc
@@ -72,9 +72,9 @@ class ConstantFoldingTest : public ::testing::Test {
                         {"output_expect_remains"});
   }
 
-  void TestConstantFolding(const GraphDef graph_def,
+  void TestConstantFolding(const GraphDef& graph_def,
                            std::vector<std::pair<string, Tensor> > inputs,
-                           std::vector<string> outputs) {
+                           const std::vector<string>& outputs) {
     std::unique_ptr<tensorflow::Session> unfolded_session(
         tensorflow::NewSession(tensorflow::SessionOptions()));
     TF_ASSERT_OK(unfolded_session->Create(graph_def));
diff --git a/tensorflow/tools/graph_transforms/summarize_graph_main.cc b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
index b893465fd9..ca42159538 100644
--- a/tensorflow/tools/graph_transforms/summarize_graph_main.cc
+++ b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
@@ -50,8 +50,8 @@ void PrintNodeInfo(const NodeDef* node) {
   std::cout << ", shape=" << shape.DebugString() << ") ";
 }
 
-void PrintBenchmarkUsage(const std::vector<const NodeDef*> placeholders,
-                         const std::vector<const NodeDef*> variables,
+void PrintBenchmarkUsage(const std::vector<const NodeDef*>& placeholders,
+                         const std::vector<const NodeDef*>& variables,
                          const std::vector<const NodeDef*> outputs,
                          const string& graph_path) {
   std::vector<const NodeDef*> all_inputs(placeholders);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_utils.cc b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
index 6d557e9193..eb2be35c6e 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_utils.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
@@ -94,7 +94,7 @@ string StripQuote(const string& s) {
   return s.substr(start, end - start + 1);
 }
 
-tensorflow::Status ReturnError(const std::vector<string> pieces, int idx) {
+tensorflow::Status ReturnError(const std::vector<string>& pieces, int idx) {
   string val;
   if (pieces.size() > idx + 1) {
     val = pieces[idx + 1];
-- 
GitLab


From 73e537e7826297d2b238ca276db87f7289bb6eb2 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Tue, 9 May 2017 09:16:04 -0700
Subject: [PATCH 1155/1563] Show entire shapes in random_crop assertion.

Fixes #9708.

PiperOrigin-RevId: 155511759
---
 tensorflow/python/ops/random_ops.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/random_ops.py b/tensorflow/python/ops/random_ops.py
index f06980783a..15613289a0 100644
--- a/tensorflow/python/ops/random_ops.py
+++ b/tensorflow/python/ops/random_ops.py
@@ -300,7 +300,8 @@ def random_crop(value, size, seed=None, name=None):
     shape = array_ops.shape(value)
     check = control_flow_ops.Assert(
         math_ops.reduce_all(shape >= size),
-        ["Need value.shape >= size, got ", shape, size])
+        ["Need value.shape >= size, got ", shape, size],
+        summarize=1000)
     shape = control_flow_ops.with_dependencies([check], shape)
     limit = shape - size + 1
     offset = random_uniform(
-- 
GitLab


From 2ca7c2bdc269b73803d6fa7c199667b987ebeb66 Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@google.com>
Date: Tue, 9 May 2017 09:54:58 -0700
Subject: [PATCH 1156/1563] Add str_util::StringReplace.

PiperOrigin-RevId: 155516212
---
 tensorflow/compiler/aot/codegen.cc           |  3 +-
 tensorflow/compiler/tf2xla/str_util.cc       |  2 +-
 tensorflow/compiler/tf2xla/str_util.h        |  4 ---
 tensorflow/compiler/tf2xla/str_util_test.cc  | 30 ------------------
 tensorflow/core/lib/strings/str_util.cc      | 19 +++++++++++
 tensorflow/core/lib/strings/str_util.h       |  5 +++
 tensorflow/core/lib/strings/str_util_test.cc | 33 ++++++++++++++++++++
 7 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/tensorflow/compiler/aot/codegen.cc b/tensorflow/compiler/aot/codegen.cc
index 042a72745a..a53e82d34b 100644
--- a/tensorflow/compiler/aot/codegen.cc
+++ b/tensorflow/compiler/aot/codegen.cc
@@ -152,8 +152,7 @@ Status AddRewritesForShape(int i, const xla::Shape& shape,
 string RewriteWithName(const string& name, string code,
                        const std::vector<std::pair<string, string>>& rewrites) {
   str_util::ReplaceAllPairs(&code, rewrites);
-  str_util::ReplaceAll(&code, "{{NAME}}", name);
-  return code;
+  return str_util::StringReplace(code, "{{NAME}}", name, /*replace_all=*/true);
 }
 
 // Generate methods for args (inputs).
diff --git a/tensorflow/compiler/tf2xla/str_util.cc b/tensorflow/compiler/tf2xla/str_util.cc
index ce25d63127..2b0834fe7b 100644
--- a/tensorflow/compiler/tf2xla/str_util.cc
+++ b/tensorflow/compiler/tf2xla/str_util.cc
@@ -22,7 +22,7 @@ limitations under the License.
 namespace tensorflow {
 namespace str_util {
 
-void ReplaceAll(string* text, StringPiece from, StringPiece to) {
+static void ReplaceAll(string* text, StringPiece from, StringPiece to) {
   size_t pos = 0;
   while ((pos = text->find(from.data(), pos, from.size())) != string::npos) {
     text->replace(pos, from.size(), to.data(), to.size());
diff --git a/tensorflow/compiler/tf2xla/str_util.h b/tensorflow/compiler/tf2xla/str_util.h
index 4920b1a4d4..51f25009d7 100644
--- a/tensorflow/compiler/tf2xla/str_util.h
+++ b/tensorflow/compiler/tf2xla/str_util.h
@@ -29,10 +29,6 @@ limitations under the License.
 namespace tensorflow {
 namespace str_util {
 
-// Replace all non-overlapping occurrences of from with to in-place in text.  If
-// from is empty, it matches at the beginning of the text and after every byte.
-void ReplaceAll(string* text, StringPiece from, StringPiece to);
-
 // Replace all non-overlapping occurrences of the given (from,to) pairs in-place
 // in text.  If from is empty, it matches at the beginning of the text and after
 // every byte.  Each (from,to) replacement pair is processed in the order it is
diff --git a/tensorflow/compiler/tf2xla/str_util_test.cc b/tensorflow/compiler/tf2xla/str_util_test.cc
index f992007a34..8817f6902a 100644
--- a/tensorflow/compiler/tf2xla/str_util_test.cc
+++ b/tensorflow/compiler/tf2xla/str_util_test.cc
@@ -25,36 +25,6 @@ limitations under the License.
 namespace tensorflow {
 namespace str_util {
 
-class ReplaceAllTest : public ::testing::Test {
- protected:
-  void ExpectReplaceAll(string text, StringPiece from, StringPiece to,
-                        StringPiece want) {
-    ReplaceAll(&text, from, to);
-    EXPECT_EQ(text, want);
-  }
-};
-
-TEST_F(ReplaceAllTest, Simple) {
-  ExpectReplaceAll("", "", "", "");
-  ExpectReplaceAll("", "", "X", "X");
-  ExpectReplaceAll("", "", "XYZ", "XYZ");
-  ExpectReplaceAll("banana", "", "", "banana");
-  ExpectReplaceAll("banana", "", "_", "_b_a_n_a_n_a_");
-  ExpectReplaceAll("banana", "", "__", "__b__a__n__a__n__a__");
-  ExpectReplaceAll("banana", "a", "a", "banana");
-  ExpectReplaceAll("banana", "a", "", "bnn");
-  ExpectReplaceAll("banana", "a", "X", "bXnXnX");
-  ExpectReplaceAll("banana", "a", "XX", "bXXnXXnXX");
-  ExpectReplaceAll("banana", "an", "an", "banana");
-  ExpectReplaceAll("banana", "an", "", "ba");
-  ExpectReplaceAll("banana", "an", "X", "bXXa");
-  ExpectReplaceAll("banana", "an", "XY", "bXYXYa");
-  ExpectReplaceAll("banana", "an", "XYZ", "bXYZXYZa");
-  ExpectReplaceAll("foo {{bar}} baz {{bar}}", "{{bar}}", "X", "foo X baz X");
-  ExpectReplaceAll("foo {{bar}} baz {{bar}}", "{{bar}}", "ABCDEFGHIJKLMNOP",
-                   "foo ABCDEFGHIJKLMNOP baz ABCDEFGHIJKLMNOP");
-}
-
 class ReplaceAllPairsTest : public ::testing::Test {
  protected:
   void ExpectReplaceAllPairs(
diff --git a/tensorflow/core/lib/strings/str_util.cc b/tensorflow/core/lib/strings/str_util.cc
index da369ea516..e9a3a8bdb4 100644
--- a/tensorflow/core/lib/strings/str_util.cc
+++ b/tensorflow/core/lib/strings/str_util.cc
@@ -258,6 +258,25 @@ void TitlecaseString(string* s, StringPiece delimiters) {
   }
 }
 
+string StringReplace(StringPiece s, StringPiece oldsub, StringPiece newsub,
+                     bool replace_all) {
+  // TODO(jlebar): We could avoid having to shift data around in the string if
+  // we had a StringPiece::find() overload that searched for a StringPiece.
+  string res = s.ToString();
+  size_t pos = 0;
+  while ((pos = res.find(oldsub.data(), pos, oldsub.size())) != string::npos) {
+    res.replace(pos, oldsub.size(), newsub.data(), newsub.size());
+    pos += newsub.size();
+    if (oldsub.empty()) {
+      pos++;  // Match at the beginning of the text and after every byte
+    }
+    if (!replace_all) {
+      break;
+    }
+  }
+  return res;
+}
+
 size_t RemoveLeadingWhitespace(StringPiece* text) {
   size_t count = 0;
   const char* ptr = text->data();
diff --git a/tensorflow/core/lib/strings/str_util.h b/tensorflow/core/lib/strings/str_util.h
index bfecfef6cb..af24975ef4 100644
--- a/tensorflow/core/lib/strings/str_util.h
+++ b/tensorflow/core/lib/strings/str_util.h
@@ -85,6 +85,11 @@ string Uppercase(StringPiece s);
 // set of characters that can be used as word boundaries.
 void TitlecaseString(string* s, StringPiece delimiters);
 
+// Replaces the first occurrence (if replace_all is false) or all occurrences
+// (if replace_all is true) of oldsub in s with newsub.
+string StringReplace(StringPiece s, StringPiece oldsub, StringPiece newsub,
+                     bool replace_all);
+
 // Join functionality
 template <typename T>
 string Join(const T& s, const char* sep);
diff --git a/tensorflow/core/lib/strings/str_util_test.cc b/tensorflow/core/lib/strings/str_util_test.cc
index 486690cf57..040f7447e4 100644
--- a/tensorflow/core/lib/strings/str_util_test.cc
+++ b/tensorflow/core/lib/strings/str_util_test.cc
@@ -352,4 +352,37 @@ TEST(TitlecaseString, Basic) {
   ASSERT_EQ(s, "Dense");
 }
 
+TEST(StringReplace, Basic) {
+  EXPECT_EQ("XYZ_XYZ_XYZ", str_util::StringReplace("ABC_ABC_ABC", "ABC", "XYZ",
+                                                   /*replace_all=*/true));
+}
+
+TEST(StringReplace, OnlyFirst) {
+  EXPECT_EQ("XYZ_ABC_ABC", str_util::StringReplace("ABC_ABC_ABC", "ABC", "XYZ",
+                                                   /*replace_all=*/false));
+}
+
+TEST(StringReplace, IncreaseLength) {
+  EXPECT_EQ("a b c",
+            str_util::StringReplace("abc", "b", " b ", /*replace_all=*/true));
+}
+
+TEST(StringReplace, IncreaseLengthMultipleMatches) {
+  EXPECT_EQ("a b  b c",
+            str_util::StringReplace("abbc", "b", " b ", /*replace_all=*/true));
+}
+
+TEST(StringReplace, NoChange) {
+  EXPECT_EQ("abc",
+            str_util::StringReplace("abc", "d", "X", /*replace_all=*/true));
+}
+
+TEST(StringReplace, EmptyStringReplaceFirst) {
+  EXPECT_EQ("", str_util::StringReplace("", "a", "X", /*replace_all=*/false));
+}
+
+TEST(StringReplace, EmptyStringReplaceAll) {
+  EXPECT_EQ("", str_util::StringReplace("", "a", "X", /*replace_all=*/true));
+}
+
 }  // namespace tensorflow
-- 
GitLab


From fd85d42d5d8203b4ce17c2825fd003411c78fbe6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 10:20:55 -0700
Subject: [PATCH 1157/1563] Copy sparse_feature_cross to sparse_ops. Two ops
 will be exposed as sparse_ops._sparse_cross and
 sparse_ops._sparse_cross_hashed. This cl does not touch the kernels and ops
 in contrib.

PiperOrigin-RevId: 155520054
---
 tensorflow/core/kernels/BUILD                 |   7 +
 tensorflow/core/kernels/sparse_cross_op.cc    | 572 ++++++++++++++++++
 tensorflow/core/ops/sparse_ops.cc             |  78 +++
 tensorflow/python/kernel_tests/BUILD          |  12 +
 .../kernel_tests/sparse_cross_op_test.py      | 398 ++++++++++++
 tensorflow/python/ops/hidden_ops.txt          |   1 +
 tensorflow/python/ops/sparse_ops.py           | 120 ++++
 7 files changed, 1188 insertions(+)
 create mode 100644 tensorflow/core/kernels/sparse_cross_op.cc
 create mode 100644 tensorflow/python/kernel_tests/sparse_cross_op_test.py

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index d8873408d7..0e8edaac02 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -3173,6 +3173,7 @@ cc_library(
         ":sparse_add_grad_op",
         ":sparse_add_op",
         ":sparse_concat_op",
+        ":sparse_cross_op",
         ":sparse_dense_binary_op_shared",
         ":sparse_reduce_sum_op",
         ":sparse_reorder_op",
@@ -3217,6 +3218,12 @@ tf_kernel_library(
     deps = SPARSE_DEPS,
 )
 
+tf_kernel_library(
+    name = "sparse_cross_op",
+    prefix = "sparse_cross_op",
+    deps = SPARSE_DEPS,
+)
+
 tf_kernel_library(
     name = "sparse_reduce_sum_op",
     prefix = "sparse_reduce_sum_op",
diff --git a/tensorflow/core/kernels/sparse_cross_op.cc b/tensorflow/core/kernels/sparse_cross_op.cc
new file mode 100644
index 0000000000..2b4d5effda
--- /dev/null
+++ b/tensorflow/core/kernels/sparse_cross_op.cc
@@ -0,0 +1,572 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Contains OP to generate sparse crosses.
+#include <assert.h>
+#include <limits>
+#include <string>
+#include <vector>
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/kernel_def_builder.h"
+#include "tensorflow/core/framework/op_def_builder.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/platform/fingerprint.h"
+#include "tensorflow/core/util/work_sharder.h"
+
+namespace tensorflow {
+
+namespace {
+// An interface that represents a column with batches.
+template <typename InternalType>
+class ColumnInterface {
+ public:
+  // Returns the number of features in the specified batch.
+  virtual int64 FeatureCount(int64 batch) const = 0;
+
+  // Returns the fingerprint of nth feature from the specified batch.
+  InternalType Feature(int64 batch, int64 n) const {
+    InternalType not_used = InternalType();
+    return DoFeature(batch, n, not_used);
+  }
+
+  virtual InternalType DoFeature(int64 batch, int64 n,
+                                 InternalType not_used) const = 0;
+
+  virtual ~ColumnInterface() {}
+};
+
+// A column that is backed by a sparse tensor.
+template <typename InternalType>
+class SparseTensorColumn : public ColumnInterface<InternalType> {
+ public:
+  SparseTensorColumn(const Tensor& values, std::vector<int64> feature_counts,
+                     std::vector<int64> feature_start_indices)
+      : values_(values),
+        feature_counts_(std::move(feature_counts)),
+        feature_start_indices_(std::move(feature_start_indices)) {
+    CHECK_EQ(feature_counts_.size(), feature_start_indices_.size());
+  }
+
+  int64 FeatureCount(int64 batch) const override {
+    return feature_counts_[batch];
+  }
+
+  // InternalType is int64 only when using HashCrosser.
+  int64 DoFeature(int64 batch, int64 n, int64 not_used) const {
+    const int64 start = feature_start_indices_[batch];
+    if (DT_STRING == values_.dtype())
+      return Fingerprint64(values_.vec<string>().data()[start + n]);
+    return values_.vec<int64>().data()[start + n];
+  }
+
+  // InternalType is string or StringPiece when using StringCrosser.
+  string DoFeature(int64 batch, int64 n, string not_used) const {
+    const int64 start = feature_start_indices_[batch];
+    if (DT_STRING == values_.dtype())
+      return values_.vec<string>().data()[start + n];
+    return std::to_string(values_.vec<int64>().data()[start + n]);
+  }
+
+  StringPiece DoFeature(int64 batch, int64 n, StringPiece not_used) const {
+    const int64 start = feature_start_indices_[batch];
+    return values_.vec<string>().data()[start + n];
+  }
+
+  ~SparseTensorColumn() override {}
+
+ private:
+  const Tensor& values_;
+  std::vector<int64> feature_counts_;
+  std::vector<int64> feature_start_indices_;
+};
+
+// A column that is backed by a dense tensor.
+template <typename InternalType>
+class DenseTensorColumn : public ColumnInterface<InternalType> {
+ public:
+  explicit DenseTensorColumn(const Tensor& tensor) : tensor_(tensor) {}
+
+  int64 FeatureCount(int64 batch) const override { return tensor_.dim_size(1); }
+
+  // InternalType is int64 only when using HashCrosser.
+  int64 DoFeature(int64 batch, int64 n, int64 not_used) const {
+    if (DT_STRING == tensor_.dtype())
+      return Fingerprint64(tensor_.matrix<string>()(batch, n));
+    return tensor_.matrix<int64>()(batch, n);
+  }
+
+  // Internal type is string or StringPiece when using StringCrosser.
+  string DoFeature(int64 batch, int64 n, string not_used) const {
+    if (DT_STRING == tensor_.dtype()) return tensor_.matrix<string>()(batch, n);
+    return std::to_string(tensor_.matrix<int64>()(batch, n));
+  }
+
+  StringPiece DoFeature(int64 batch, int64 n, StringPiece not_used) const {
+    return tensor_.matrix<string>()(batch, n);
+  }
+
+  ~DenseTensorColumn() override {}
+
+ private:
+  const Tensor& tensor_;
+};
+
+// Updates Output tensors with sparse crosses.
+template <typename OutType>
+class OutputUpdater {
+ public:
+  OutputUpdater(const std::vector<int64>& output_start_indices,
+                Tensor* indices_out, Tensor* values_out)
+      : output_start_indices_(output_start_indices),
+        indices_out_(indices_out),
+        values_out_(values_out) {}
+
+  void Update(const int64 batch_index, const int64 cross_count,
+              const OutType& cross) const {
+    const int64 output_index = output_start_indices_[batch_index] + cross_count;
+
+    auto indices_matrix = indices_out_->matrix<int64>();
+    indices_matrix(output_index, 0) = batch_index;
+    indices_matrix(output_index, 1) = cross_count;
+
+    auto value_vec = values_out_->vec<OutType>();
+    value_vec(output_index) = cross;
+  }
+
+ private:
+  const std::vector<int64>& output_start_indices_;
+  Tensor* indices_out_;
+  Tensor* values_out_;
+};
+
+// Generates the sparse crosses as concatenation of strings.
+template <typename InternalType>
+class StringCrosser {
+ public:
+  StringCrosser(const std::vector<
+                    std::unique_ptr<ColumnInterface<InternalType>>>& columns,
+                const int64 num_buckets_unused, const uint64 hash_key_unused)
+      : columns_(columns) {}
+
+  string Generate(const int64 batch_index,
+                  const std::vector<int>& permutation) const {
+    static const auto k_feature_separator = "_X_";
+
+    gtl::InlinedVector<InternalType, 6> cross_vec(columns_.size());
+    for (int i = 0; i < permutation.size(); i++) {
+      cross_vec[i] = columns_[i]->Feature(batch_index, permutation[i]);
+    }
+    // TODO(zakaria): this will copy the string twice, might effect
+    // performance.
+    return str_util::Join(cross_vec, k_feature_separator);
+  }
+
+ private:
+  const std::vector<std::unique_ptr<ColumnInterface<InternalType>>>& columns_;
+};
+
+// Generates the sparse crosses as nested hash to avoid string manipulations.
+class HashCrosser {
+ public:
+  HashCrosser(
+      const std::vector<std::unique_ptr<ColumnInterface<int64>>>& columns,
+      const int64 num_buckets, const uint64 hash_key)
+      : columns_(columns), num_buckets_(num_buckets), hash_key_(hash_key) {}
+
+  int64 Generate(const int64 batch_index,
+                 const std::vector<int>& permutation) const {
+    // Do the fingerprint concatenation on uint64.
+    uint64 hashed_output = hash_key_;
+    for (size_t i = 0; i < permutation.size(); ++i) {
+      uint64 hash_i = columns_[i]->Feature(batch_index, permutation[i]);
+      hashed_output = FingerprintCat64(hashed_output, hash_i);
+    }
+    // The return value is int64 based on the number of buckets.
+    if (num_buckets_ > 0) {
+      return hashed_output % num_buckets_;
+    } else {
+      // To prevent negative output we take modulo to max int64.
+      return hashed_output % std::numeric_limits<int64>::max();
+    }
+  }
+
+ private:
+  const std::vector<std::unique_ptr<ColumnInterface<int64>>>& columns_;
+  const int64 num_buckets_;
+  const uint64 hash_key_;
+};
+
+// ProductIterator generates cartesian products based on indices.
+template <typename InternalType>
+class ProductIterator {
+ public:
+  explicit ProductIterator(
+      const std::vector<std::unique_ptr<ColumnInterface<InternalType>>>&
+          columns,
+      int64 batch_index)
+      : columns_(columns), batch_index_(batch_index) {
+    next_permutation_.resize(columns_.size(), 0);
+    // Sets has_next_ to false if any feature column has 0 features.
+    has_next_ = true;
+    for (int i = 0; i < columns_.size(); i++) {
+      if (columns_[i]->FeatureCount(batch_index_) == 0) {
+        has_next_ = false;
+        break;
+      }
+    }
+  }
+
+  std::vector<int> Next() {
+    std::vector<int> permutation(next_permutation_);
+
+    // Generates next permutation, if available.
+    bool carry = true;
+    for (int i = next_permutation_.size() - 1; i >= 0; i--) {
+      if (carry) {
+        next_permutation_[i] = next_permutation_[i] + 1;
+      }
+      if (next_permutation_[i] == columns_[i]->FeatureCount(batch_index_)) {
+        next_permutation_[i] = 0;
+      } else {
+        carry = false;
+        break;
+      }
+    }
+    has_next_ = !carry;
+    return permutation;
+  }
+
+  bool HasNext() { return has_next_; }
+
+ private:
+  bool has_next_;
+  const std::vector<std::unique_ptr<ColumnInterface<InternalType>>>& columns_;
+  const int64 batch_index_;
+  std::vector<int> next_permutation_;
+};
+
+template <bool HASHED_OUTPUT, typename InternalType>
+struct CrossTraits;
+
+template <typename InternalType>
+struct CrossTraits<false, InternalType> {
+  typedef StringCrosser<InternalType> Crosser;
+  typedef OutputUpdater<string> Updater;
+};
+
+template <>
+struct CrossTraits<true, int64> {
+  typedef HashCrosser Crosser;
+  typedef OutputUpdater<int64> Updater;
+};
+}  // namespace
+
+template <bool HASHED_OUTPUT, typename InternalType>
+class SparseCrossOp : public OpKernel {
+ public:
+  explicit SparseCrossOp(OpKernelConstruction* context)
+      : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("num_buckets", &num_buckets_));
+    // Read signed_hash_key_ as int64 since uint64 attributes are not
+    // supported by REGISTER_OP.
+    int64 signed_hash_key_;
+    OP_REQUIRES_OK(context, context->GetAttr("hash_key", &signed_hash_key_));
+    hash_key_ = static_cast<uint64>(signed_hash_key_);
+  }
+
+  void Compute(OpKernelContext* context) override {
+    OpInputList indices_list_in;
+    OP_REQUIRES_OK(context, context->input_list("indices", &indices_list_in));
+    OpInputList values_list_in;
+    OP_REQUIRES_OK(context, context->input_list("values", &values_list_in));
+    OpInputList shapes_list_in;
+    OP_REQUIRES_OK(context, context->input_list("shapes", &shapes_list_in));
+    OpInputList dense_list_in;
+    OP_REQUIRES_OK(context,
+                   context->input_list("dense_inputs", &dense_list_in));
+
+    ValidateInput(context, indices_list_in, values_list_in, shapes_list_in,
+                  dense_list_in);
+
+    std::vector<std::unique_ptr<ColumnInterface<InternalType>>> columns =
+        GenerateColumnsFromInput(indices_list_in, values_list_in,
+                                 shapes_list_in, dense_list_in);
+
+    typename CrossTraits<HASHED_OUTPUT, InternalType>::Crosser
+        crosser(columns, num_buckets_, hash_key_);
+    Tensor* indices_out;
+    Tensor* values_out;
+    Tensor* shape_out;
+    const int64 batch_size = CalculateBatchSize(shapes_list_in, dense_list_in);
+    std::vector<int64> output_start_indices(batch_size);
+    CreateOutputTensors(columns, batch_size, context, &indices_out, &values_out,
+                        &shape_out, &output_start_indices);
+
+    typename CrossTraits<HASHED_OUTPUT, InternalType>::Updater
+        updater(output_start_indices, indices_out, values_out);
+    auto do_work = [this, &columns, crosser, updater](int64 begin, int64 end) {
+      for (int b = begin; b < end; b++) {
+        ProductIterator<InternalType> product_iterator(columns, b);
+        int64 cross_count = 0;
+        while (product_iterator.HasNext()) {
+          const auto permutation = product_iterator.Next();
+          updater.Update(b, cross_count, crosser.Generate(b, permutation));
+          cross_count++;
+        }
+      }
+    };
+
+    auto* worker_threads = context->device()->tensorflow_cpu_worker_threads();
+    // TODO(zakaria): optimize kCostPerUnit
+    const int kCostPerUnit = 5000 * indices_list_in.size();
+    Shard(worker_threads->num_threads, worker_threads->workers, batch_size,
+          kCostPerUnit, do_work);
+  }
+
+ private:
+  // Validates input tensors.
+  void ValidateInput(OpKernelContext* context,
+                     const OpInputList& indices_list_in,
+                     const OpInputList& values_list_in,
+                     const OpInputList& shapes_list_in,
+                     const OpInputList& dense_list_in) {
+    const auto size = indices_list_in.size();
+    // Validates indices_list_in OpInputList.
+    for (int i = 0; i < size; i++) {
+      OP_REQUIRES(
+          context, TensorShapeUtils::IsMatrix(indices_list_in[i].shape()),
+          errors::InvalidArgument(
+              "Input indices should be a matrix but received shape ",
+              indices_list_in[i].shape().DebugString(), " at position ", i));
+      OP_REQUIRES(
+          context, indices_list_in[i].shape().dim_size(1) == 2,
+          errors::InvalidArgument("Expected D2 of index to be 2 got ",
+                                  indices_list_in[i].shape().dim_size(1),
+                                  " at position ", i));
+    }
+
+    // Validates values_list_in OpInputList.
+    OP_REQUIRES(
+        context, values_list_in.size() == size,
+        errors::InvalidArgument("Expected ", size, " input values, got ",
+                                values_list_in.size()));
+    for (int i = 0; i < size; i++) {
+      OP_REQUIRES(
+          context, TensorShapeUtils::IsVector(values_list_in[i].shape()),
+          errors::InvalidArgument(
+              "Input values should be a std::vector but received shape ",
+              values_list_in[i].shape().DebugString(), " at position ", i));
+      OP_REQUIRES(
+          context, indices_list_in[i].shape().dim_size(0) ==
+                       values_list_in[i].shape().dim_size(0),
+          errors::InvalidArgument(
+              "Expected size of values to be ",
+              indices_list_in[i].shape().dim_size(0), " got ",
+              values_list_in[i].shape().dim_size(0), " at position ", i));
+    }
+
+    // Validates shapes_list_in OpInputList
+    OP_REQUIRES(
+        context, shapes_list_in.size() == size,
+        errors::InvalidArgument("Expected ", size, " input shapes, got ",
+                                shapes_list_in.size()));
+    const auto batch_size = CalculateBatchSize(shapes_list_in, dense_list_in);
+    for (int i = 0; i < size; i++) {
+      OP_REQUIRES(
+          context, TensorShapeUtils::IsVector(shapes_list_in[i].shape()),
+          errors::InvalidArgument(
+              "Input shapes should be a std::vector but received shape ",
+              shapes_list_in[i].shape().DebugString(), " at position ", i));
+
+      OP_REQUIRES(
+          context, shapes_list_in[i].vec<int64>().size() == 2,
+          errors::InvalidArgument("shape should imply a 2D tensor, but got ",
+                                  shapes_list_in[i].shape().DebugString(),
+                                  " at position ", i));
+      OP_REQUIRES(context, shapes_list_in[i].vec<int64>()(0) == batch_size,
+                  errors::InvalidArgument(
+                      "Expected batch size ", batch_size, " got ",
+                      shapes_list_in[i].vec<int64>()(0), " at position ", i));
+    }
+
+    // Validates dense_list_in OpInputList
+    for (int i = 0; i < dense_list_in.size(); ++i) {
+      OP_REQUIRES(
+          context, TensorShapeUtils::IsMatrix(dense_list_in[i].shape()),
+          errors::InvalidArgument(
+              "Dense inputs should be a matrix but received shape ",
+              indices_list_in[i].shape().DebugString(), " at position ", i));
+      OP_REQUIRES(context, dense_list_in[i].dim_size(0) == batch_size,
+                  errors::InvalidArgument("Expected batch size ", batch_size,
+                                          " got ", dense_list_in[i].dim_size(0),
+                                          " at dense tensor ", i));
+    }
+  }
+
+  // Calculate the batch size from either the shapes input or the dense input.
+  int64 CalculateBatchSize(const OpInputList& shapes_list_in,
+                           const OpInputList& dense_list_in) {
+    if (shapes_list_in.size() > 0) {
+      return shapes_list_in[0].vec<int64>()(0);
+    }
+
+    if (dense_list_in.size() > 0) {
+      return dense_list_in[0].dim_size(0);
+    }
+
+    return 0;
+  }
+
+  // Generate the columns given the sparse and dense inputs.
+  std::vector<std::unique_ptr<ColumnInterface<InternalType>>>
+  GenerateColumnsFromInput(const OpInputList& indices_list_in,
+                           const OpInputList& values_list_in,
+                           const OpInputList& shapes_list_in,
+                           const OpInputList& dense_list_in) {
+    std::vector<std::unique_ptr<ColumnInterface<InternalType>>> columns;
+    const int64 batch_size = CalculateBatchSize(shapes_list_in, dense_list_in);
+    const int64 number_of_columns = shapes_list_in.size();
+
+    std::vector<std::vector<int64>> feature_counts(number_of_columns,
+                                                   std::vector<int64>());
+    std::vector<std::vector<int64>> feature_start_indices(number_of_columns,
+                                                          std::vector<int64>());
+
+    ExtractFeatureData(indices_list_in, batch_size, &feature_counts,
+                       &feature_start_indices);
+
+    for (int i = 0; i < values_list_in.size(); ++i) {
+      columns.emplace_back(new SparseTensorColumn<InternalType>(
+          values_list_in[i], std::move(feature_counts[i]),
+          std::move(feature_start_indices[i])));
+    }
+    for (int i = 0; i < dense_list_in.size(); ++i) {
+      columns.emplace_back(
+          new DenseTensorColumn<InternalType>(dense_list_in[i]));
+    }
+
+    return columns;
+  }
+
+  // Extracts data about the features and populates feature data.
+  void ExtractFeatureData(
+      const OpInputList& indices_list_in, int64 batch_size,
+      std::vector<std::vector<int64>>* feature_counts,
+      std::vector<std::vector<int64>>* feature_start_indices) {
+    gtl::InlinedVector<int64, 8> current_row(indices_list_in.size(), 0);
+    for (int b = 0; b < batch_size; b++) {
+      for (int i = 0; i < indices_list_in.size(); i++) {
+        const auto indices = indices_list_in[i].matrix<int64>();
+        int64 feature_count = 0;
+        int64 start_index = current_row[i];
+        // Loops until we reach next batch index for current feature column.
+        while (current_row[i] < indices_list_in[i].dim_size(0) &&
+               indices(current_row[i], 0) == b) {
+          feature_count++;
+          current_row[i]++;
+        }
+        (*feature_counts)[i].push_back(feature_count);
+        (*feature_start_indices)[i].push_back(start_index);
+      }
+    }
+  }
+
+  // Allocates output tensors with proper size and sets the shape tensor of
+  // the output SparseTensor.
+  // It also output_start_indices which contains the start indices for each
+  // input in the output SparseTensor.
+  void CreateOutputTensors(
+      const std::vector<std::unique_ptr<ColumnInterface<InternalType>>>&
+          columns,
+      int64 batch_size, OpKernelContext* context, Tensor** indices_out,
+      Tensor** values_out, Tensor** shape_out,
+      std::vector<int64>* output_start_indices) {
+    // Calculates dimensions for output tensors.
+    int64 cross_count_total = 0;
+    int64 max_cross_count = 0;
+    for (int64 b = 0; b < batch_size; b++) {
+      // For each input, sets starting indices in output SparseTensor
+      (*output_start_indices)[b] = cross_count_total;
+      const auto cross_count = CrossCountByBatchIndex(columns, b);
+      max_cross_count = std::max(max_cross_count, cross_count);
+      cross_count_total += cross_count;
+    }
+
+    // Allocates tensors.
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(
+                       0, TensorShape({cross_count_total, 2}), indices_out));
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(1, TensorShape({cross_count_total}),
+                                            values_out));
+    OP_REQUIRES_OK(context,
+                   context->allocate_output(2, TensorShape({2}), shape_out));
+
+    // Sets shape.
+    auto shape_vec = (*shape_out)->vec<int64>();
+    shape_vec(0) = batch_size;
+    shape_vec(1) = max_cross_count;
+  }
+
+  // Returns number of crosses for a given batch_index
+  int64 CrossCountByBatchIndex(
+      const std::vector<std::unique_ptr<ColumnInterface<InternalType>>>&
+          columns,
+      int batch_index) {
+    int64 cross_count = 1;
+    for (int i = 0; i < columns.size(); i++) {
+      const auto feature_count = columns[i]->FeatureCount(batch_index);
+      // If one column is missing any feature, there won't be any cross.
+      if (feature_count == 0) {
+        return 0;
+      }
+      cross_count *= feature_count;
+    }
+    return cross_count;
+  }
+  int64 num_buckets_;
+  uint64 hash_key_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("SparseCross")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<string>("out_type")
+                            .TypeConstraint<string>("internal_type"),
+                        SparseCrossOp<false, StringPiece>);
+
+REGISTER_KERNEL_BUILDER(Name("SparseCross")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<string>("out_type")
+                            .TypeConstraint<int64>("internal_type"),
+                        SparseCrossOp<false, string>);
+
+REGISTER_KERNEL_BUILDER(Name("SparseCross")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<int64>("out_type")
+                            .TypeConstraint<string>("internal_type"),
+                        SparseCrossOp<true, int64>);
+
+REGISTER_KERNEL_BUILDER(Name("SparseCross")
+                            .Device(DEVICE_CPU)
+                            .TypeConstraint<int64>("out_type")
+                            .TypeConstraint<int64>("internal_type"),
+                        SparseCrossOp<true, int64>);
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/ops/sparse_ops.cc b/tensorflow/core/ops/sparse_ops.cc
index b90f7a5dfb..9bbf37cfc2 100644
--- a/tensorflow/core/ops/sparse_ops.cc
+++ b/tensorflow/core/ops/sparse_ops.cc
@@ -456,6 +456,84 @@ concat_dim: Dimension to concatenate along. Must be in range [-rank, rank),
     where rank is the number of dimensions in each input `SparseTensor`.
 )doc");
 
+REGISTER_OP("SparseCross")
+    .Input("indices: N * int64")
+    .Input("values: sparse_types")
+    .Input("shapes: N * int64")
+    .Input("dense_inputs: dense_types")
+    .Output("output_indices: int64")
+    .Output("output_values: out_type")
+    .Output("output_shape: int64")
+    .Attr("N: int >= 0")
+    .Attr("hashed_output: bool")
+    .Attr("num_buckets: int >= 0")
+    .Attr("hash_key: int")
+    .Attr("sparse_types: list({int64, string}) >= 0")
+    .Attr("dense_types: list({int64, string}) >= 0")
+    .Attr("out_type: {int64, string}")
+    .Attr("internal_type: {int64, string}")
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      c->set_output(0, c->Matrix(c->UnknownDim(), 2));
+      c->set_output(1, c->Vector(c->UnknownDim()));
+      c->set_output(2, c->Vector(2));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Generates sparse cross from a list of sparse and dense tensors.
+
+The op takes two lists, one of 2D `SparseTensor` and one of 2D `Tensor`, each
+representing features of one feature column. It outputs a 2D `SparseTensor` with
+the batchwise crosses of these features.
+
+For example, if the inputs are
+
+    inputs[0]: SparseTensor with shape = [2, 2]
+    [0, 0]: "a"
+    [1, 0]: "b"
+    [1, 1]: "c"
+
+    inputs[1]: SparseTensor with shape = [2, 1]
+    [0, 0]: "d"
+    [1, 0]: "e"
+
+    inputs[2]: Tensor [["f"], ["g"]]
+
+then the output will be
+
+    shape = [2, 2]
+    [0, 0]: "a_X_d_X_f"
+    [1, 0]: "b_X_e_X_g"
+    [1, 1]: "c_X_e_X_g"
+
+if hashed_output=true then the output will be
+
+    shape = [2, 2]
+    [0, 0]: FingerprintCat64(
+                Fingerprint64("f"), FingerprintCat64(
+                    Fingerprint64("d"), Fingerprint64("a")))
+    [1, 0]: FingerprintCat64(
+                Fingerprint64("g"), FingerprintCat64(
+                    Fingerprint64("e"), Fingerprint64("b")))
+    [1, 1]: FingerprintCat64(
+                Fingerprint64("g"), FingerprintCat64(
+                    Fingerprint64("e"), Fingerprint64("c")))
+
+indices: 2-D.  Indices of each input `SparseTensor`.
+values: 1-D.   values of each `SparseTensor`.
+shapes: 1-D.   Shapes of each `SparseTensor`.
+dense_inputs: 2-D.    Columns represented by dense `Tensor`.
+hashed_output: If true, returns the hash of the cross instead of the string.
+  This will allow us avoiding string manipulations.
+num_buckets: It is used if hashed_output is true.
+  output = hashed_value%num_buckets if num_buckets > 0 else hashed_value.
+hash_key: Specify the hash_key that will be used by the `FingerprintCat64`
+  function to combine the crosses fingerprints.
+output_indices: 2-D.  Indices of the concatenated `SparseTensor`.
+output_values: 1-D.  Non-empty values of the concatenated or hashed
+  `SparseTensor`.
+output_shape: 1-D.  Shape of the concatenated `SparseTensor`.
+)doc");
+
 REGISTER_OP("SparseSplit")
     .Input("split_dim: int64")
     .Input("indices: int64")
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 95a255f672..6a35d66f1b 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2597,6 +2597,18 @@ tf_py_test(
     ],
 )
 
+tf_py_test(
+    name = "sparse_cross_op_test",
+    size = "small",
+    srcs = ["sparse_cross_op_test.py"],
+    additional_deps = [
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:sparse_ops",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
diff --git a/tensorflow/python/kernel_tests/sparse_cross_op_test.py b/tensorflow/python/kernel_tests/sparse_cross_op_test.py
new file mode 100644
index 0000000000..3d09badf27
--- /dev/null
+++ b/tensorflow/python/kernel_tests/sparse_cross_op_test.py
@@ -0,0 +1,398 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for sparse_cross_op."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy
+
+from tensorflow.python.client import session
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import sparse_ops
+from tensorflow.python.platform import test
+
+
+class SparseCrossOpTest(test.TestCase):
+
+  def test_simple(self):
+    """Tests a simple scenario."""
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor([['batch1-FC1-F1'],
+                             ['batch2-FC1-F1', 'batch2-FC1-F2']]),
+        self._sparse_tensor([['batch1-FC2-F1'],
+                             ['batch2-FC2-F1', 'batch2-FC2-F2']])
+    ])
+    expected_out = self._sparse_tensor([['batch1-FC1-F1_X_batch1-FC2-F1'], [
+        'batch2-FC1-F1_X_batch2-FC2-F1', 'batch2-FC1-F1_X_batch2-FC2-F2',
+        'batch2-FC1-F2_X_batch2-FC2-F1', 'batch2-FC1-F2_X_batch2-FC2-F2'
+    ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_dense(self):
+    """Tests only dense inputs."""
+    op = sparse_ops._sparse_cross([
+        constant_op.constant([['batch1-FC1-F1', 'batch1-FC1-F2'],
+                              ['batch2-FC1-F1', 'batch2-FC1-F2']],
+                             dtypes.string),
+        constant_op.constant([['batch1-FC2-F1', 'batch1-FC2-F2'],
+                              ['batch2-FC2-F1', 'batch2-FC2-F2']],
+                             dtypes.string),
+    ])
+    expected_out = self._sparse_tensor([[
+        'batch1-FC1-F1_X_batch1-FC2-F1', 'batch1-FC1-F1_X_batch1-FC2-F2',
+        'batch1-FC1-F2_X_batch1-FC2-F1', 'batch1-FC1-F2_X_batch1-FC2-F2'
+    ], [
+        'batch2-FC1-F1_X_batch2-FC2-F1', 'batch2-FC1-F1_X_batch2-FC2-F2',
+        'batch2-FC1-F2_X_batch2-FC2-F1', 'batch2-FC1-F2_X_batch2-FC2-F2'
+    ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_integer_mixed_string_sparse(self):
+    """Tests mixed type."""
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor([[11], [333, 55555]]),
+        self._sparse_tensor([['batch1-FC2-F1'],
+                             ['batch2-FC2-F1', 'batch2-FC2-F2']])
+    ])
+    expected_out = self._sparse_tensor([['11_X_batch1-FC2-F1'], [
+        '333_X_batch2-FC2-F1', '333_X_batch2-FC2-F2', '55555_X_batch2-FC2-F1',
+        '55555_X_batch2-FC2-F2'
+    ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_integer_mixed_string_dense(self):
+    """Tests mixed dense inputs."""
+    op = sparse_ops._sparse_cross([
+        constant_op.constant([[11, 333], [55555, 999999]], dtypes.int64),
+        constant_op.constant([['batch1-FC2-F1', 'batch1-FC2-F2'],
+                              ['batch2-FC2-F1', 'batch2-FC2-F2']],
+                             dtypes.string),
+    ])
+    expected_out = self._sparse_tensor([[
+        '11_X_batch1-FC2-F1', '11_X_batch1-FC2-F2', '333_X_batch1-FC2-F1',
+        '333_X_batch1-FC2-F2'
+    ], [
+        '55555_X_batch2-FC2-F1', '55555_X_batch2-FC2-F2',
+        '999999_X_batch2-FC2-F1', '999999_X_batch2-FC2-F2'
+    ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_sparse_cross_dense(self):
+    """Tests sparse and dense inputs."""
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor([['batch1-FC1-F1'],
+                             ['batch2-FC1-F1', 'batch2-FC1-F2']]),
+        constant_op.constant([['batch1-FC2-F1', 'batch1-FC2-F2'],
+                              ['batch2-FC2-F1', 'batch2-FC2-F2']],
+                             dtypes.string),
+    ])
+    expected_out = self._sparse_tensor(
+        [['batch1-FC1-F1_X_batch1-FC2-F1', 'batch1-FC1-F1_X_batch1-FC2-F2'], [
+            'batch2-FC1-F1_X_batch2-FC2-F1', 'batch2-FC1-F1_X_batch2-FC2-F2',
+            'batch2-FC1-F2_X_batch2-FC2-F1', 'batch2-FC1-F2_X_batch2-FC2-F2'
+        ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_integer_sparse_input(self):
+    """Tests mixed type sparse and dense inputs."""
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor([[11], [333, 5555]]),
+        constant_op.constant([['batch1-FC2-F1', 'batch1-FC2-F2'],
+                              ['batch2-FC2-F1', 'batch2-FC2-F2']],
+                             dtypes.string),
+    ])
+    expected_out = self._sparse_tensor(
+        [['11_X_batch1-FC2-F1', '11_X_batch1-FC2-F2'], [
+            '333_X_batch2-FC2-F1', '333_X_batch2-FC2-F2',
+            '5555_X_batch2-FC2-F1', '5555_X_batch2-FC2-F2'
+        ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_permutation_3x3x3(self):
+    """Tests 3x3x3 permutation."""
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor(
+            [['batch1-FC1-F1', 'batch1-FC1-F2', 'batch1-FC1-F3']]),
+        self._sparse_tensor(
+            [['batch1-FC2-F1', 'batch1-FC2-F2', 'batch1-FC2-F3']]),
+        self._sparse_tensor(
+            [['batch1-FC3-F1', 'batch1-FC3-F2', 'batch1-FC3-F3']])
+    ])
+    expected_out = self._sparse_tensor([[
+        'batch1-FC1-F1_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F1_X_batch1-FC2-F1_X_batch1-FC3-F2',
+        'batch1-FC1-F1_X_batch1-FC2-F1_X_batch1-FC3-F3',
+        'batch1-FC1-F1_X_batch1-FC2-F2_X_batch1-FC3-F1',
+        'batch1-FC1-F1_X_batch1-FC2-F2_X_batch1-FC3-F2',
+        'batch1-FC1-F1_X_batch1-FC2-F2_X_batch1-FC3-F3',
+        'batch1-FC1-F1_X_batch1-FC2-F3_X_batch1-FC3-F1',
+        'batch1-FC1-F1_X_batch1-FC2-F3_X_batch1-FC3-F2',
+        'batch1-FC1-F1_X_batch1-FC2-F3_X_batch1-FC3-F3',
+        'batch1-FC1-F2_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F2_X_batch1-FC2-F1_X_batch1-FC3-F2',
+        'batch1-FC1-F2_X_batch1-FC2-F1_X_batch1-FC3-F3',
+        'batch1-FC1-F2_X_batch1-FC2-F2_X_batch1-FC3-F1',
+        'batch1-FC1-F2_X_batch1-FC2-F2_X_batch1-FC3-F2',
+        'batch1-FC1-F2_X_batch1-FC2-F2_X_batch1-FC3-F3',
+        'batch1-FC1-F2_X_batch1-FC2-F3_X_batch1-FC3-F1',
+        'batch1-FC1-F2_X_batch1-FC2-F3_X_batch1-FC3-F2',
+        'batch1-FC1-F2_X_batch1-FC2-F3_X_batch1-FC3-F3',
+        'batch1-FC1-F3_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F3_X_batch1-FC2-F1_X_batch1-FC3-F2',
+        'batch1-FC1-F3_X_batch1-FC2-F1_X_batch1-FC3-F3',
+        'batch1-FC1-F3_X_batch1-FC2-F2_X_batch1-FC3-F1',
+        'batch1-FC1-F3_X_batch1-FC2-F2_X_batch1-FC3-F2',
+        'batch1-FC1-F3_X_batch1-FC2-F2_X_batch1-FC3-F3',
+        'batch1-FC1-F3_X_batch1-FC2-F3_X_batch1-FC3-F1',
+        'batch1-FC1-F3_X_batch1-FC2-F3_X_batch1-FC3-F2',
+        'batch1-FC1-F3_X_batch1-FC2-F3_X_batch1-FC3-F3'
+    ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_permutation_3x1x2(self):
+    """Tests 3x1x2 permutation."""
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor(
+            [['batch1-FC1-F1', 'batch1-FC1-F2', 'batch1-FC1-F3']]),
+        self._sparse_tensor([['batch1-FC2-F1']]),
+        self._sparse_tensor([['batch1-FC3-F1', 'batch1-FC3-F2']])
+    ])
+    expected_out = self._sparse_tensor([[
+        'batch1-FC1-F1_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F1_X_batch1-FC2-F1_X_batch1-FC3-F2',
+        'batch1-FC1-F2_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F2_X_batch1-FC2-F1_X_batch1-FC3-F2',
+        'batch1-FC1-F3_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F3_X_batch1-FC2-F1_X_batch1-FC3-F2'
+    ]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_large_batch(self):
+    """Tests with large batch size to force multithreading."""
+    batch_size = 5000
+    col1 = []
+    col2 = []
+    col3 = []
+    for b in range(batch_size):
+      col1.append(
+          ['batch%d-FC1-F1' % b, 'batch%d-FC1-F2' % b, 'batch%d-FC1-F3' % b])
+      col2.append(['batch%d-FC2-F1' % b])
+      col3.append(['batch%d-FC3-F1' % b, 'batch%d-FC3-F2' % b])
+
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor(col1), self._sparse_tensor(col2),
+        self._sparse_tensor(col3)
+    ])
+
+    col_out = []
+    for b in range(batch_size):
+      col_out.append([
+          'batch%d-FC1-F1_X_batch%d-FC2-F1_X_batch%d-FC3-F1' % (b, b, b),
+          'batch%d-FC1-F1_X_batch%d-FC2-F1_X_batch%d-FC3-F2' % (b, b, b),
+          'batch%d-FC1-F2_X_batch%d-FC2-F1_X_batch%d-FC3-F1' % (b, b, b),
+          'batch%d-FC1-F2_X_batch%d-FC2-F1_X_batch%d-FC3-F2' % (b, b, b),
+          'batch%d-FC1-F3_X_batch%d-FC2-F1_X_batch%d-FC3-F1' % (b, b, b),
+          'batch%d-FC1-F3_X_batch%d-FC2-F1_X_batch%d-FC3-F2' % (b, b, b)
+      ])
+
+    expected_out = self._sparse_tensor(col_out)
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_one_column_empty(self):
+    """Tests when one column is empty.
+
+    The crossed tensor should be empty.
+    """
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor([['batch1-FC1-F1', 'batch1-FC1-F2']]),
+        self._sparse_tensor([], 1),
+        self._sparse_tensor([['batch1-FC3-F1', 'batch1-FC3-F2']])
+    ])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_empty(sess.run(op))
+
+  def test_some_columns_empty(self):
+    """Tests when more than one columns are empty.
+
+    Cross for the corresponding batch should be empty.
+    """
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor([['batch1-FC1-F1', 'batch1-FC1-F2']], 2),
+        self._sparse_tensor([['batch1-FC2-F1'], ['batch2-FC2-F1']], 2),
+        self._sparse_tensor([['batch1-FC3-F1', 'batch1-FC3-F2']], 2)
+    ])
+    expected_out = self._sparse_tensor([[
+        'batch1-FC1-F1_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F1_X_batch1-FC2-F1_X_batch1-FC3-F2',
+        'batch1-FC1-F2_X_batch1-FC2-F1_X_batch1-FC3-F1',
+        'batch1-FC1-F2_X_batch1-FC2-F1_X_batch1-FC3-F2'
+    ]], 2)
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_all_columns_empty(self):
+    """Tests when all columns are empty.
+
+    The crossed tensor should be empty.
+    """
+    op = sparse_ops._sparse_cross([
+        self._sparse_tensor([]), self._sparse_tensor([]),
+        self._sparse_tensor([])
+    ])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_empty(sess.run(op))
+
+  def test_hashed_zero_bucket_no_hash_key(self):
+    op = sparse_ops._sparse_cross_hashed(
+        [
+            self._sparse_tensor([['batch1-FC1-F1']]),
+            self._sparse_tensor([['batch1-FC2-F1']]),
+            self._sparse_tensor([['batch1-FC3-F1']])
+        ])
+    # Check actual hashed output to prevent unintentional hashing changes.
+    expected_out = self._sparse_tensor([[1971693436396284976]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_hashed_zero_bucket(self):
+    op = sparse_ops._sparse_cross_hashed(
+        [
+            self._sparse_tensor([['batch1-FC1-F1']]),
+            self._sparse_tensor([['batch1-FC2-F1']]),
+            self._sparse_tensor([['batch1-FC3-F1']])
+        ],
+        hash_key=sparse_ops._DEFAULT_HASH_KEY + 1)
+    # Check actual hashed output to prevent unintentional hashing changes.
+    expected_out = self._sparse_tensor([[4847552627144134031]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  # TODO(sibyl-Aix6ihai): Add benchmark to compare Hashed vs Non-hashed.
+  def test_hashed_no_hash_key(self):
+    op = sparse_ops._sparse_cross_hashed(
+        [
+            self._sparse_tensor([['batch1-FC1-F1']]),
+            self._sparse_tensor([['batch1-FC2-F1']]),
+            self._sparse_tensor([['batch1-FC3-F1']])
+        ],
+        num_buckets=100)
+    # Check actual hashed output to prevent unintentional hashing changes.
+    expected_out = self._sparse_tensor([[83]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_hashed_output(self):
+    op = sparse_ops._sparse_cross_hashed(
+        [
+            self._sparse_tensor([['batch1-FC1-F1']]),
+            self._sparse_tensor([['batch1-FC2-F1']]),
+            self._sparse_tensor([['batch1-FC3-F1']])
+        ],
+        num_buckets=100,
+        hash_key=sparse_ops._DEFAULT_HASH_KEY + 1)
+    # Check actual hashed output to prevent unintentional hashing changes.
+    expected_out = self._sparse_tensor([[31]])
+    with self.test_session() as sess:
+      self._assert_sparse_tensor_equals(expected_out, sess.run(op))
+
+  def test_hashed__has_no_collision(self):
+    """Tests that fingerprint concatenation has no collisions."""
+    # Although the last 10 bits of 359 and 1024+359 are identical.
+    # As a result, all the crosses shouldn't collide.
+    t1 = constant_op.constant([[359], [359 + 1024]])
+    t2 = constant_op.constant([list(range(10)), list(range(10))])
+    cross = sparse_ops._sparse_cross_hashed(
+        [t2, t1],
+        num_buckets=1024,
+        hash_key=sparse_ops._DEFAULT_HASH_KEY + 1)
+    cross_dense = sparse_ops.sparse_tensor_to_dense(cross)
+    with session.Session():
+      values = cross_dense.eval()
+      self.assertTrue(numpy.not_equal(values[0], values[1]).all())
+
+  def test_hashed_3x1x2(self):
+    """Tests 3x1x2 permutation with hashed output."""
+    op = sparse_ops._sparse_cross_hashed(
+        [
+            self._sparse_tensor(
+                [['batch1-FC1-F1', 'batch1-FC1-F2', 'batch1-FC1-F3']]),
+            self._sparse_tensor([['batch1-FC2-F1']]),
+            self._sparse_tensor([['batch1-FC3-F1', 'batch1-FC3-F2']])
+        ],
+        num_buckets=1000)
+    with self.test_session() as sess:
+      out = sess.run(op)
+      self.assertEqual(6, len(out.values))
+      self.assertAllEqual([[0, i] for i in range(6)], out.indices)
+      self.assertTrue(all(x < 1000 and x >= 0 for x in out.values))
+      all_values_are_different = len(out.values) == len(set(out.values))
+      self.assertTrue(all_values_are_different)
+
+  def _assert_sparse_tensor_empty(self, sp):
+    self.assertEquals(0, sp.indices.size)
+    self.assertEquals(0, sp.values.size)
+    # TODO(zakaria): check if we can ignore the first dim of the shape.
+    self.assertEquals(0, sp.dense_shape[1])
+
+  def _assert_sparse_tensor_equals(self, sp1, sp2):
+    self.assertAllEqual(sp1.indices.eval(), sp2.indices)
+    self.assertAllEqual(sp1.values.eval(), sp2.values)
+    self.assertAllEqual(sp1.dense_shape.eval(), sp2.dense_shape)
+
+  def _sparse_tensor(self, data, batch_size=-1):
+    """Generates a SparseTensor.
+
+    Args:
+      data: Should be a list of list of strings or int64. Each item of the outer
+          list represents a batch. Each item of the batch is a feature of a
+          specific feature column.
+      batch_size: optional batch size, especially for cases when data has no
+          entry for some batches.
+
+    Returns:
+     A SparseTensor.
+    """
+    indices = []
+    values = []
+    max_col_count = 0
+    for batch, batch_ix in zip(data, range(len(data))):
+      for column, column_ix in zip(batch, range(len(batch))):
+        indices.append([batch_ix, column_ix])
+        values.append(column)
+        max_col_count = max(max_col_count, column_ix + 1)
+    shape = [batch_size if batch_size != -1 else len(data), max_col_count]
+    value_type = (dtypes.string if not values or isinstance(values[0], str) else
+                  dtypes.int64)
+    return sparse_tensor.SparseTensor(
+        constant_op.constant(indices, dtypes.int64, [len(indices), 2]),
+        constant_op.constant(values, value_type, [len(indices)]),
+        constant_op.constant(shape, dtypes.int64))
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/ops/hidden_ops.txt b/tensorflow/python/ops/hidden_ops.txt
index ec02ee3e03..57a5b982ab 100644
--- a/tensorflow/python/ops/hidden_ops.txt
+++ b/tensorflow/python/ops/hidden_ops.txt
@@ -330,6 +330,7 @@ SerializeSparse
 SparseAdd
 SparseAddGrad
 SparseConcat
+SparseCross
 SparseSplit
 SparseSelectLastK
 SparseReorder
diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index d6cb7c5be4..5d6f4c0471 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -315,6 +315,126 @@ def sparse_add(a, b, thresh=0):
         a.indices, a.values, a.dense_shape, b)
 
 
+def _sparse_cross(inputs, name=None):
+  """Generates sparse cross from a list of sparse and dense tensors.
+
+  For example, if the inputs are
+  * inputs[0]: SparseTensor with shape = [2, 2]
+    [0, 0]: "a"
+    [1, 0]: "b"
+    [1, 1]: "c"
+  * inputs[1]: SparseTensor with shape = [2, 1]
+    [0, 0]: "d"
+    [1, 0]: "e"
+  * inputs[2]: Tensor [["f"], ["g"]]
+
+  then the output will be:
+    shape = [2, 2]
+    [0, 0]: "a_X_d_X_f"
+    [1, 0]: "b_X_e_X_g"
+    [1, 1]: "c_X_e_X_g"
+
+  Args:
+    inputs: An iterable of `Tensor` or `SparseTensor`.
+    name: Optional name for the op.
+
+  Returns:
+    A `SparseTensor` of type `string`.
+  """
+  return _sparse_cross_internal(inputs=inputs, hashed_output=False, name=name)
+
+
+def _sparse_cross_hashed(inputs, num_buckets=0, hash_key=None, name=None):
+  """Generates hashed sparse cross from a list of sparse and dense tensors.
+
+  For example, if the inputs are
+  * inputs[0]: SparseTensor with shape = [2, 2]
+    [0, 0]: "a"
+    [1, 0]: "b"
+    [1, 1]: "c"
+  * inputs[1]: SparseTensor with shape = [2, 1]
+    [0, 0]: "d"
+    [1, 0]: "e"
+  * inputs[2]: Tensor [["f"], ["g"]]
+
+  then the output will be:
+    shape = [2, 2]
+    [0, 0]: FingerprintCat64(
+                Fingerprint64("f"), FingerprintCat64(
+                    Fingerprint64("d"), Fingerprint64("a")))
+    [1, 0]: FingerprintCat64(
+                Fingerprint64("g"), FingerprintCat64(
+                    Fingerprint64("e"), Fingerprint64("b")))
+    [1, 1]: FingerprintCat64(
+                Fingerprint64("g"), FingerprintCat64(
+                    Fingerprint64("e"), Fingerprint64("c")))
+
+  Args:
+    inputs: An iterable of `Tensor` or `SparseTensor`.
+    num_buckets: An `int` that is `>= 0`.
+      output = hashed_value%num_buckets if num_buckets > 0 else hashed_value.
+    hash_key: Integer hash_key that will be used by the `FingerprintCat64`
+      function. If not given, will use a default key.
+    name: Optional name for the op.
+
+  Returns:
+    A `SparseTensor` of type `int64`.
+  """
+  return _sparse_cross_internal(
+      inputs=inputs,
+      hashed_output=True,
+      num_buckets=num_buckets,
+      hash_key=hash_key,
+      name=name)
+
+
+_DEFAULT_HASH_KEY = 0xDECAFCAFFE
+
+
+def _sparse_cross_internal(
+    inputs, hashed_output=False, num_buckets=0, hash_key=None, name=None):
+  """See gen_sparse_ops._sparse_cross."""
+  if not isinstance(inputs, list):
+    raise TypeError("Inputs must be a list")
+  if not all(isinstance(i, sparse_tensor.SparseTensor) or
+             isinstance(i, ops.Tensor) for i in inputs):
+    raise TypeError("All inputs must be SparseTensors")
+
+  sparse_inputs = [i for i in inputs
+                   if isinstance(i, sparse_tensor.SparseTensor)]
+  dense_inputs = [i for i in inputs
+                  if not isinstance(i, sparse_tensor.SparseTensor)]
+
+  indices = [sp_input.indices for sp_input in sparse_inputs]
+  values = [sp_input.values for sp_input in sparse_inputs]
+  shapes = [sp_input.dense_shape for sp_input in sparse_inputs]
+  out_type = dtypes.int64 if hashed_output else dtypes.string
+
+  internal_type = dtypes.string
+  for i in range(len(values)):
+    if values[i].dtype != dtypes.string:
+      values[i] = math_ops.to_int64(values[i])
+      internal_type = dtypes.int64
+  for i in range(len(dense_inputs)):
+    if dense_inputs[i].dtype != dtypes.string:
+      dense_inputs[i] = math_ops.to_int64(dense_inputs[i])
+      internal_type = dtypes.int64
+
+  indices_out, values_out, shape_out = gen_sparse_ops._sparse_cross(
+      indices=indices,
+      values=values,
+      shapes=shapes,
+      dense_inputs=dense_inputs,
+      hashed_output=hashed_output,
+      num_buckets=num_buckets,
+      hash_key=hash_key or _DEFAULT_HASH_KEY,
+      out_type=out_type,
+      internal_type=internal_type,
+      name=name)
+
+  return sparse_tensor.SparseTensor(indices_out, values_out, shape_out)
+
+
 def sparse_dense_cwise_add(sp_t, dense_t):
   """Adds up a SparseTensor and a dense Tensor, using these special rules:
 
-- 
GitLab


From 9a83416501c4a03d6b7f72a046d1b4ad0238cd3b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 10:22:47 -0700
Subject: [PATCH 1158/1563] [TF:XLA] Fix (u)int64 and
 tensorflow::protobuf_(u)int64 discrepancies

Because of the fact that tensorflow::protobuf_uint64 is defined as uint64_t
while tensorflow::uint64 is defined as unsigned long long, there exist
compiler versions for which the template type matching does not trigger
correctly.
The LiteralUtil::GetMutableRepeatedField<>() API ends up in having an
asymmetric interface because of that, where it needs to be called with
tensorflow::protobuf_(u)int64 for 64bit types.
This CL removes the LiteralUtil::GetMutableRepeatedField<>() API,
confines to Resize<>() the multiple template type expansion, and introduces
a new public GetMutableArraySlice<>() API which does not suffer from the
discrepancies the LiteralUtil::GetMutableRepeatedField<>() had.
PiperOrigin-RevId: 155520416
---
 tensorflow/compiler/xla/literal_util.cc | 238 +++++++++++++-----------
 tensorflow/compiler/xla/literal_util.h  | 201 ++++++++++----------
 tensorflow/compiler/xla/util.h          |   4 +-
 3 files changed, 236 insertions(+), 207 deletions(-)

diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index 3b3e004864..0e0c6dbd67 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -50,7 +50,7 @@ namespace xla {
   return CreateFromShape(ShapeUtil::MakeShape(primitive_type, dimensions));
 }
 
-template <typename T, typename WT>
+template <typename T>
 /* static */ Status LiteralUtil::CopyRange(
     const Literal& src_literal, tensorflow::gtl::ArraySlice<int64> src_base,
     Literal* dest_literal, tensorflow::gtl::ArraySlice<int64> dest_base,
@@ -58,8 +58,8 @@ template <typename T, typename WT>
   const Shape& src_shape = src_literal.shape();
   const Shape& dest_shape = dest_literal->shape();
   tensorflow::gtl::ArraySlice<T> src_data = GetArraySlice<T>(src_literal);
-  tensorflow::protobuf::RepeatedField<WT>* dest_data =
-      GetMutableRepeatedField<WT>(dest_literal);
+  tensorflow::gtl::MutableArraySlice<T> dest_data =
+      GetMutableArraySlice<T>(dest_literal);
 
   TF_RET_CHECK(ShapeUtil::Rank(src_shape) == src_base.size());
   TF_RET_CHECK(ShapeUtil::Rank(dest_shape) == dest_base.size());
@@ -121,14 +121,14 @@ template <typename T, typename WT>
       return CopyRange<uint32>(src_literal, src_base, dest_literal, dest_base,
                                copy_size);
     case U64:
-      return CopyRange<uint64, tensorflow::protobuf_uint64>(
-          src_literal, src_base, dest_literal, dest_base, copy_size);
+      return CopyRange<uint64>(src_literal, src_base, dest_literal, dest_base,
+                               copy_size);
     case S32:
       return CopyRange<int32>(src_literal, src_base, dest_literal, dest_base,
                               copy_size);
     case S64:
-      return CopyRange<int64, tensorflow::protobuf_int64>(
-          src_literal, src_base, dest_literal, dest_base, copy_size);
+      return CopyRange<int64>(src_literal, src_base, dest_literal, dest_base,
+                              copy_size);
     case F32:
       return CopyRange<float>(src_literal, src_base, dest_literal, dest_base,
                               copy_size);
@@ -647,38 +647,28 @@ template <typename T, typename WT>
   CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
   switch (literal->shape().element_type()) {
     case PRED:
-      GetMutableRepeatedField<bool>(literal)->Resize(num_elements, false);
+      Resize<bool>(num_elements, false, literal);
       break;
     case U8:
-      // u8s is an optional "bytes", rather than a repeated field. Therefore its
-      // access methods are somewhat different from the others.
-      literal->mutable_u8s()->resize(num_elements, 0);
+      Resize<uint8>(num_elements, false, literal);
       break;
     case S32:
-      GetMutableRepeatedField<int32>(literal)->Resize(num_elements,
-                                                      /*value=*/0);
+      Resize<int32>(num_elements, 0, literal);
       break;
     case S64:
-      GetMutableRepeatedField<tensorflow::protobuf_int64>(literal)->Resize(
-          num_elements,
-          /*value=*/0);
+      Resize<int64>(num_elements, 0, literal);
       break;
     case U32:
-      GetMutableRepeatedField<uint32>(literal)->Resize(num_elements,
-                                                       /*value=*/0);
+      Resize<uint32>(num_elements, 0, literal);
       break;
     case U64:
-      GetMutableRepeatedField<tensorflow::protobuf_uint64>(literal)->Resize(
-          num_elements,
-          /*value=*/0);
+      Resize<uint64>(num_elements, 0, literal);
       break;
     case F32:
-      GetMutableRepeatedField<float>(literal)->Resize(num_elements,
-                                                      /*value=*/0.0f);
+      Resize<float>(num_elements, 0, literal);
       break;
     case F64:
-      GetMutableRepeatedField<double>(literal)->Resize(num_elements,
-                                                       /*value=*/0.0);
+      Resize<double>(num_elements, 0, literal);
       break;
     default:
       LOG(FATAL) << "primitive type not supported in literals: "
@@ -813,6 +803,77 @@ bool EqualElements(const Literal& literal1, const Literal& literal2,
   }
 }
 
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<bool>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  auto values = literal->mutable_preds();
+  return tensorflow::gtl::MutableArraySlice<bool>(values->mutable_data(),
+                                                  values->size());
+}
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<int32>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  auto values = literal->mutable_s32s();
+  return tensorflow::gtl::MutableArraySlice<int32>(values->mutable_data(),
+                                                   values->size());
+}
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<uint32>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  auto values = literal->mutable_u32s();
+  return tensorflow::gtl::MutableArraySlice<uint32>(values->mutable_data(),
+                                                    values->size());
+}
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<int64>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  static_assert(sizeof(int64) == sizeof(tensorflow::protobuf_int64) &&
+                    alignof(int64) == alignof(tensorflow::protobuf_int64),
+                "The int64 and tensorflow::protobuf_int64 types are not "
+                "compatible");
+  auto values = literal->mutable_s64s();
+  // Because of the fact that tensorflow::protobuf_int64 is defined as int64_t
+  // while tensorflow::int64 is defined as long long, a reinterpret_cast<> is
+  // necessary from the raw data pointer returned by the mutable_data() API.
+  return tensorflow::gtl::MutableArraySlice<int64>(
+      reinterpret_cast<int64*>(values->mutable_data()), values->size());
+}
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<uint64>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  static_assert(sizeof(uint64) == sizeof(tensorflow::protobuf_uint64) &&
+                    alignof(uint64) == alignof(tensorflow::protobuf_uint64),
+                "The uint64 and tensorflow::protobuf_uint64 types are not "
+                "compatible");
+  auto values = literal->mutable_u64s();
+  // Because of the fact that tensorflow::protobuf_uint64 is defined as uint64_t
+  // while tensorflow::uint64 is defined as unsigned long long, a
+  // reinterpret_cast<> is necessary from the raw data pointer returned by the
+  // mutable_data() API.
+  return tensorflow::gtl::MutableArraySlice<uint64>(
+      reinterpret_cast<uint64*>(values->mutable_data()), values->size());
+}
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<float>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  auto values = literal->mutable_f32s();
+  return tensorflow::gtl::MutableArraySlice<float>(values->mutable_data(),
+                                                   values->size());
+}
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<double>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  auto values = literal->mutable_f64s();
+  return tensorflow::gtl::MutableArraySlice<double>(values->mutable_data(),
+                                                    values->size());
+}
+
 template <>
 /* static */ tensorflow::gtl::ArraySlice<bool> LiteralUtil::GetArraySlice<bool>(
     const Literal& literal) {
@@ -820,13 +881,6 @@ template <>
   return literal.preds();
 }
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<bool>*
-LiteralUtil::GetMutableRepeatedField<bool>(Literal* literal) {
-  CHECK(literal->shape().element_type() == PRED);
-  return literal->mutable_preds();
-}
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<uint32>
 LiteralUtil::GetArraySlice<uint32>(const Literal& literal) {
@@ -834,13 +888,6 @@ LiteralUtil::GetArraySlice<uint32>(const Literal& literal) {
   return literal.u32s();
 }
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<uint32>*
-LiteralUtil::GetMutableRepeatedField<uint32>(Literal* literal) {
-  CHECK(literal->shape().element_type() == U32);
-  return literal->mutable_u32s();
-}
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<uint64>
 LiteralUtil::GetArraySlice<uint64>(const Literal& literal) {
@@ -848,14 +895,6 @@ LiteralUtil::GetArraySlice<uint64>(const Literal& literal) {
   return AsUInt64Slice(literal.u64s());
 }
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<tensorflow::protobuf_uint64>*
-LiteralUtil::GetMutableRepeatedField<tensorflow::protobuf_uint64>(
-    Literal* literal) {
-  CHECK(literal->shape().element_type() == U64);
-  return literal->mutable_u64s();
-}
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<int32>
 LiteralUtil::GetArraySlice<int32>(const Literal& literal) {
@@ -863,13 +902,6 @@ LiteralUtil::GetArraySlice<int32>(const Literal& literal) {
   return literal.s32s();
 }
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<int32>*
-LiteralUtil::GetMutableRepeatedField<int32>(Literal* literal) {
-  CHECK(literal->shape().element_type() == S32);
-  return literal->mutable_s32s();
-}
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<int64>
 LiteralUtil::GetArraySlice<int64>(const Literal& literal) {
@@ -877,21 +909,6 @@ LiteralUtil::GetArraySlice<int64>(const Literal& literal) {
   return AsInt64Slice(literal.s64s());
 }
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<tensorflow::protobuf_int64>*
-LiteralUtil::GetMutableRepeatedField<tensorflow::protobuf_int64>(
-    Literal* literal) {
-  CHECK(literal->shape().element_type() == S64);
-  return literal->mutable_s64s();
-}
-
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<float>*
-LiteralUtil::GetMutableRepeatedField<float>(Literal* literal) {
-  CHECK(literal->shape().element_type() == F32);
-  return literal->mutable_f32s();
-}
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<double>
 LiteralUtil::GetArraySlice<double>(const Literal& literal) {
@@ -899,13 +916,6 @@ LiteralUtil::GetArraySlice<double>(const Literal& literal) {
   return literal.f64s();
 }
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<double>*
-LiteralUtil::GetMutableRepeatedField<double>(Literal* literal) {
-  CHECK(literal->shape().element_type() == F64);
-  return literal->mutable_f64s();
-}
-
 template <typename NativeT>
 static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
   for (int64 i = 0; i < ShapeUtil::ElementsIn(literal.shape()); ++i) {
@@ -996,51 +1006,59 @@ static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
 }
 
 template <>
-/* static */ void LiteralUtil::PopulateWithValue(
-    int64 value, tensorflow::gtl::ArraySlice<int64> dimensions,
-    Literal* literal) {
-  *literal->mutable_shape() = ShapeUtil::MakeShape(
-      primitive_util::NativeToPrimitiveType<int64>(), dimensions);
-  tensorflow::protobuf::RepeatedField<tensorflow::protobuf_int64>*
-      repeated_field =
-          GetMutableRepeatedField<tensorflow::protobuf_int64>(literal);
-  for (int64 i = 0; i < ShapeUtil::ElementsIn(literal->shape()); ++i) {
-    repeated_field->Add(value);
-  }
+/* static */ void LiteralUtil::Resize<bool>(int64 num_elements, bool value,
+                                            Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_preds()->Resize(num_elements, value);
 }
 
 template <>
-/* static */ void LiteralUtil::PopulateWithValue(
-    uint64 value, tensorflow::gtl::ArraySlice<int64> dimensions,
-    Literal* literal) {
-  *literal->mutable_shape() = ShapeUtil::MakeShape(
-      primitive_util::NativeToPrimitiveType<uint64>(), dimensions);
-  tensorflow::protobuf::RepeatedField<tensorflow::protobuf_uint64>*
-      repeated_field =
-          GetMutableRepeatedField<tensorflow::protobuf_uint64>(literal);
-  for (int64 i = 0; i < ShapeUtil::ElementsIn(literal->shape()); ++i) {
-    repeated_field->Add(value);
-  }
+/* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
+                                             Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_u8s()->resize(num_elements, value);
+}
+
+template <>
+/* static */ void LiteralUtil::Resize<int32>(int64 num_elements, int32 value,
+                                             Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_s32s()->Resize(num_elements, value);
+}
+
+template <>
+/* static */ void LiteralUtil::Resize<uint32>(int64 num_elements, uint32 value,
+                                              Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_u32s()->Resize(num_elements, value);
+}
+
+template <>
+/* static */ void LiteralUtil::Resize<int64>(int64 num_elements, int64 value,
+                                             Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_s64s()->Resize(num_elements, value);
+}
+
+template <>
+/* static */ void LiteralUtil::Resize<uint64>(int64 num_elements, uint64 value,
+                                              Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_u64s()->Resize(num_elements, value);
 }
 
 template <>
-/* static */ void LiteralUtil::Resize(int64 num_elements, int64 value,
-                                      Literal* literal) {
+/* static */ void LiteralUtil::Resize<float>(int64 num_elements, float value,
+                                             Literal* literal) {
   CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
-  tensorflow::protobuf::RepeatedField<tensorflow::protobuf_int64>*
-      repeated_field =
-          GetMutableRepeatedField<tensorflow::protobuf_int64>(literal);
-  repeated_field->Resize(num_elements, value);
+  literal->mutable_f32s()->Resize(num_elements, value);
 }
 
 template <>
-/* static */ void LiteralUtil::Resize(int64 num_elements, uint64 value,
-                                      Literal* literal) {
+/* static */ void LiteralUtil::Resize<double>(int64 num_elements, double value,
+                                              Literal* literal) {
   CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
-  tensorflow::protobuf::RepeatedField<tensorflow::protobuf_uint64>*
-      repeated_field =
-          GetMutableRepeatedField<tensorflow::protobuf_uint64>(literal);
-  repeated_field->Resize(num_elements, value);
+  literal->mutable_f64s()->Resize(num_elements, value);
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index 8bdf8daff5..19e692f5ac 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -254,6 +254,12 @@ class LiteralUtil {
                   tensorflow::gtl::ArraySlice<int64> multi_index,
                   NativeT value);
 
+  // Retrieves the mutable array slice interface which can be used to manipulate
+  // pre-allocated literal values.
+  template <typename NativeT>
+  static tensorflow::gtl::MutableArraySlice<NativeT> GetMutableArraySlice(
+      Literal* literal);
+
   // Returns the element value at index (0, ..., 0), however many zeroes are
   // required for that index.
   template <typename NativeT>
@@ -421,35 +427,10 @@ class LiteralUtil {
     static_assert(!std::is_same<NativeT, NativeT>::value,
                   "Cannot map native type to primitive type.");
   }
-  template <typename NativeT>
-  static tensorflow::protobuf::RepeatedField<NativeT>* GetMutableRepeatedField(
-      Literal* literal) {
-    // Make the expression depend on the template parameter NativeT so
-    // that this compile-time error only apperas if this function is
-    // instantiated with some concrete type that is not specialized
-    // below.
-    static_assert(!std::is_same<NativeT, NativeT>::value,
-                  "Cannot map native type to primitive type.");
-  }
 
   // Internal template helper for the Copy() API, matching its arguments one by
   // one.
-  //
-  // The double WT template parameter is pretty ugly, but it comes from one of
-  // the gcc versions used for tests, which seems unable to match templates
-  // types uint64 and int64 with tensorflow::protobuf_uint64 and
-  // tensorflow::protobuf_int64, for the GetArraySlice<>() and
-  // GetMutableRepeatedField<>() APIs.
-  // While for the GetArraySlice<>() case the AsUInt64Slice() and
-  // AsInt64Slice() wrappers are taking care via reinterpret_cast<> of the code
-  // pointer parameters, the protocol buffer repeated fields accessories
-  // return a RepeatedField<> pointer, which is not trivially remappable
-  // (unless pretty ugly API forwarder wrapper).
-  // For that gcc version, this creates a mismatch were either things like the
-  // CopyRange<>() API needs to have both specified, or the Get<>() and Set<>()
-  // APIs having to be called with different types (Get<>() with uint64 and
-  // Set<>() with tensorflow::protobuf_uint64).
-  template <typename T, typename WT = T>
+  template <typename T>
   static Status CopyRange(const Literal& src_literal,
                           tensorflow::gtl::ArraySlice<int64> src_base,
                           Literal* dest_literal,
@@ -460,50 +441,28 @@ class LiteralUtil {
 };
 
 // Declarations of template specializations for GetArraySlice and
-// GetMutableRepeatedField. The specializations map native type to XLA primitive
+// GetMutableArraySlice. The specializations map native type to XLA primitive
 // type.
 template <>
 /* static */ tensorflow::gtl::ArraySlice<bool> LiteralUtil::GetArraySlice<bool>(
     const Literal& literal);
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<bool>*
-LiteralUtil::GetMutableRepeatedField<bool>(Literal* literal);
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<uint32>
 LiteralUtil::GetArraySlice<uint32>(const Literal& literal);
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<uint32>*
-LiteralUtil::GetMutableRepeatedField<uint32>(Literal* literal);
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<uint64>
 LiteralUtil::GetArraySlice<uint64>(const Literal& literal);
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<tensorflow::protobuf_uint64>*
-LiteralUtil::GetMutableRepeatedField<tensorflow::protobuf_uint64>(
-    Literal* literal);
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<int32>
 LiteralUtil::GetArraySlice<int32>(const Literal& literal);
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<int32>*
-LiteralUtil::GetMutableRepeatedField<int32>(Literal* literal);
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<int64>
 LiteralUtil::GetArraySlice<int64>(const Literal& literal);
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<tensorflow::protobuf_int64>*
-LiteralUtil::GetMutableRepeatedField<tensorflow::protobuf_int64>(
-    Literal* literal);
-
 template <>
 /* static */ inline tensorflow::gtl::ArraySlice<float>
 LiteralUtil::GetArraySlice<float>(const Literal& literal) {
@@ -511,22 +470,42 @@ LiteralUtil::GetArraySlice<float>(const Literal& literal) {
   return literal.f32s();
 }
 
-template <>
-/* static */ tensorflow::protobuf::RepeatedField<float>*
-LiteralUtil::GetMutableRepeatedField<float>(Literal* literal);
-
 template <>
 /* static */ tensorflow::gtl::ArraySlice<double>
 LiteralUtil::GetArraySlice<double>(const Literal& literal);
 
 template <>
-/* static */ tensorflow::protobuf::RepeatedField<double>*
-LiteralUtil::GetMutableRepeatedField<double>(Literal* literal);
+/* static */ tensorflow::gtl::MutableArraySlice<bool>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<int32>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<uint32>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<int64>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<uint64>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<float>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<double>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
 
 template <typename NativeT>
 /* static */ std::unique_ptr<Literal> LiteralUtil::CreateR0(NativeT value) {
   auto literal = MakeUnique<Literal>();
-  PopulateR0(value, literal.get());
+  PopulateR0<NativeT>(value, literal.get());
   return literal;
 }
 
@@ -757,7 +736,7 @@ template <typename NativeT>
     Literal* literal, tensorflow::gtl::ArraySlice<int64> multi_index,
     NativeT value) {
   int64 linear_index = LinearIndex(*literal, multi_index);
-  GetMutableRepeatedField<NativeT>(literal)->Set(linear_index, value);
+  GetMutableArraySlice<NativeT>(literal).at(linear_index) = value;
 }
 
 template <>
@@ -816,13 +795,12 @@ template <typename NativeT>
   } while (IndexUtil::BumpIndices(literal.shape(), &indices));
 }
 
-template <typename NativeT>
-/* static */ void LiteralUtil::PopulateR0(NativeT value, Literal* literal) {
-  *literal->mutable_shape() = ShapeUtil::MakeShape(
-      primitive_util::NativeToPrimitiveType<NativeT>(), {});
-  tensorflow::protobuf::RepeatedField<NativeT>* repeated_field =
-      GetMutableRepeatedField<NativeT>(literal);
-  repeated_field->Add(value);
+template <>
+/* static */ inline void LiteralUtil::PopulateR0<bool>(bool value,
+                                                       Literal* literal) {
+  *literal->mutable_shape() =
+      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<bool>(), {});
+  literal->mutable_preds()->Add(value);
 }
 
 template <>
@@ -841,6 +819,22 @@ template <>
   literal->mutable_u8s()->push_back(value);
 }
 
+template <>
+/* static */ inline void LiteralUtil::PopulateR0<uint32>(uint32 value,
+                                                         Literal* literal) {
+  *literal->mutable_shape() =
+      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<uint32>(), {});
+  literal->mutable_u32s()->Add(value);
+}
+
+template <>
+/* static */ inline void LiteralUtil::PopulateR0<int32>(int32 value,
+                                                        Literal* literal) {
+  *literal->mutable_shape() =
+      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<int32>(), {});
+  literal->mutable_s32s()->Add(value);
+}
+
 template <>
 /* static */ inline void LiteralUtil::PopulateR0<uint64>(uint64 value,
                                                          Literal* literal) {
@@ -857,6 +851,22 @@ template <>
   literal->mutable_s64s()->Add(value);
 }
 
+template <>
+/* static */ inline void LiteralUtil::PopulateR0<float>(float value,
+                                                        Literal* literal) {
+  *literal->mutable_shape() =
+      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<float>(), {});
+  literal->mutable_f32s()->Add(value);
+}
+
+template <>
+/* static */ inline void LiteralUtil::PopulateR0<double>(double value,
+                                                         Literal* literal) {
+  *literal->mutable_shape() =
+      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<double>(), {});
+  literal->mutable_f64s()->Add(value);
+}
+
 template <typename NativeT>
 /* static */ void LiteralUtil::PopulateR1(
     tensorflow::gtl::ArraySlice<NativeT> values, Literal* literal) {
@@ -1010,8 +1020,8 @@ template <typename NativeT>
   int64 rank = ShapeUtil::Rank(shape);
   TF_RET_CHECK(shape.element_type() ==
                primitive_util::NativeToPrimitiveType<NativeT>());
-  tensorflow::protobuf::RepeatedField<NativeT>* data =
-      GetMutableRepeatedField<NativeT>(literal);
+  tensorflow::gtl::MutableArraySlice<NativeT> data =
+      GetMutableArraySlice<NativeT>(literal);
   if (rank > 0) {
     std::vector<int64> base(rank, 0);
     std::vector<int64> step(rank, 1);
@@ -1026,14 +1036,14 @@ template <typename NativeT>
       std::copy(indexes.begin(), indexes.end(), minor_scan_indexes.begin());
       for (int64 i = 0; i < minor_dimension_size; ++i) {
         minor_scan_indexes[minor_dimension] = i;
-        data->Set(index + i, generator(minor_scan_indexes));
+        data.at(index + i) = generator(minor_scan_indexes);
       }
       return true;
     };
     ShapeUtil::ForEachIndex(shape, base, AsInt64Slice(shape.dimensions()), step,
                             init_function);
   } else {
-    data->Set(0, generator({}));
+    data.at(0) = generator({});
   }
   return Status::OK();
 }
@@ -1044,23 +1054,9 @@ template <typename NativeT>
     Literal* literal) {
   *literal->mutable_shape() = ShapeUtil::MakeShape(
       primitive_util::NativeToPrimitiveType<NativeT>(), dimensions);
-  tensorflow::protobuf::RepeatedField<NativeT>* repeated_field =
-      GetMutableRepeatedField<NativeT>(literal);
-  for (int64 i = 0; i < ShapeUtil::ElementsIn(literal->shape()); ++i) {
-    repeated_field->Add(value);
-  }
+  Resize<NativeT>(ShapeUtil::ElementsIn(literal->shape()), value, literal);
 }
 
-template <>
-/* static */ void LiteralUtil::PopulateWithValue(
-    int64 value, tensorflow::gtl::ArraySlice<int64> dimensions,
-    Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::PopulateWithValue(
-    uint64 value, tensorflow::gtl::ArraySlice<int64> dimensions,
-    Literal* literal);
-
 template <typename NativeSrcT, typename NativeDestT>
 /* static */ std::unique_ptr<Literal> LiteralUtil::Convert(
     const Literal& literal) {
@@ -1080,22 +1076,37 @@ template <typename NativeSrcT, typename NativeDestT>
   return result_literal;
 }
 
-template <typename NativeT>
-/* static */ void LiteralUtil::Resize(int64 num_elements, NativeT value,
-                                      Literal* literal) {
-  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
-  tensorflow::protobuf::RepeatedField<NativeT>* repeated_field =
-      GetMutableRepeatedField<NativeT>(literal);
-  repeated_field->Resize(num_elements, value);
-}
+template <>
+/* static */ void LiteralUtil::Resize<bool>(int64 num_elements, bool value,
+                                            Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int32>(int64 num_elements, int32 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint32>(int64 num_elements, uint32 value,
+                                              Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int64>(int64 num_elements, int64 value,
+                                             Literal* literal);
 
 template <>
-/* static */ void LiteralUtil::Resize(int64 num_elements, int64 value,
-                                      Literal* literal);
+/* static */ void LiteralUtil::Resize<uint64>(int64 num_elements, uint64 value,
+                                              Literal* literal);
 
 template <>
-/* static */ void LiteralUtil::Resize(int64 num_elements, uint64 value,
-                                      Literal* literal);
+/* static */ void LiteralUtil::Resize<float>(int64 num_elements, float value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<double>(int64 num_elements, double value,
+                                              Literal* literal);
 
 template <typename NativeT>
 /* static */ std::unique_ptr<Literal>
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h
index 15a6ef404e..8c24388d73 100644
--- a/tensorflow/compiler/xla/util.h
+++ b/tensorflow/compiler/xla/util.h
@@ -143,11 +143,11 @@ bool ContainersEqual(const Container1T& c1, const Container2T& c2,
 // source and destination. The source starting index is src_base, while the
 // destination one is dest_base.
 template <typename D, typename S>
-void StridedCopy(tensorflow::protobuf::RepeatedField<D>* dest, int64 dest_base,
+void StridedCopy(tensorflow::gtl::MutableArraySlice<D> dest, int64 dest_base,
                  int64 dest_stride, tensorflow::gtl::ArraySlice<S> src,
                  int64 src_base, int64 src_stride, int64 count) {
   for (; count > 0; --count, dest_base += dest_stride, src_base += src_stride) {
-    dest->Set(dest_base, static_cast<D>(src[src_base]));
+    dest[dest_base] = static_cast<D>(src[src_base]);
   }
 }
 
-- 
GitLab


From 1937df84a17f8f520ab2d45d083d65188afd9c62 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 9 May 2017 10:24:22 -0700
Subject: [PATCH 1159/1563] Propagate the cluster to the grappler optimizers:
 this will enable the development of smarter optimizers that can take the
 available hardware into account when optimizing a graph.

PiperOrigin-RevId: 155520653
---
 tensorflow/core/BUILD                         |   2 +
 .../simple_graph_execution_state.cc           |  11 +-
 tensorflow/core/grappler/clusters/BUILD       |  33 ++++-
 .../core/grappler/clusters/single_machine.cc  |   2 +-
 tensorflow/core/grappler/clusters/utils.cc    | 114 ++++++++++++++++++
 tensorflow/core/grappler/clusters/utils.h     |  38 ++++++
 .../core/grappler/clusters/virtual_cluster.cc |  44 +++++++
 .../core/grappler/clusters/virtual_cluster.h  |  46 +++++++
 tensorflow/core/grappler/costs/BUILD          |   4 +-
 .../grappler/costs/op_level_cost_estimator.cc |   2 +-
 .../grappler/costs/op_level_cost_estimator.h  |   1 -
 tensorflow/core/grappler/costs/utils.cc       |  66 +---------
 tensorflow/core/grappler/costs/utils.h        |   7 --
 .../grappler/optimizers/meta_optimizer.cc     |   8 +-
 .../core/grappler/optimizers/meta_optimizer.h |   2 +-
 tensorflow/python/grappler/tf_optimizer.i     |   5 +-
 16 files changed, 300 insertions(+), 85 deletions(-)
 create mode 100644 tensorflow/core/grappler/clusters/utils.cc
 create mode 100644 tensorflow/core/grappler/clusters/utils.h
 create mode 100644 tensorflow/core/grappler/clusters/virtual_cluster.cc
 create mode 100644 tensorflow/core/grappler/clusters/virtual_cluster.h

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 1178d4e5d2..78b67941fe 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1534,6 +1534,8 @@ tf_cuda_library(
                ":proto_text",
                ":protos_all_cc",
                "//tensorflow/core/grappler:grappler_item",
+               "//tensorflow/core/grappler/clusters:utils",
+               "//tensorflow/core/grappler/clusters:virtual_cluster",
                "//tensorflow/core/grappler/optimizers:meta_optimizer",
                "//third_party/eigen3",
                "//tensorflow/core/kernels:required",
diff --git a/tensorflow/core/common_runtime/simple_graph_execution_state.cc b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
index 31e63a9ef7..590b5d47ba 100644
--- a/tensorflow/core/common_runtime/simple_graph_execution_state.cc
+++ b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
@@ -29,6 +29,8 @@ limitations under the License.
 #include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/graph/subgraph.h"
 #include "tensorflow/core/graph/validate.h"
+#include "tensorflow/core/grappler/clusters/utils.h"
+#include "tensorflow/core/grappler/clusters/virtual_cluster.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
 #include "tensorflow/core/lib/core/errors.h"
@@ -267,7 +269,14 @@ Status SimpleGraphExecutionState::InitBaseGraph(
     }
 
     if (s.ok()) {
-      s = grappler::RunMetaOptimizer(item, rewrite_options, &optimized_graph);
+      std::unordered_map<string, DeviceProperties> device_map;
+      for (const auto& device : device_set_->devices()) {
+        device_map[device->name()] =
+            grappler::GetDeviceInfo(device->parsed_name());
+      }
+      grappler::VirtualCluster cluster(device_map);
+      s = grappler::RunMetaOptimizer(item, rewrite_options, &cluster,
+                                     &optimized_graph);
     }
     if (s.ok()) {
       graph_def = &optimized_graph;
diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index 33a716774f..578ec9798e 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -17,6 +17,8 @@ filegroup(
     srcs = glob(
         [
             "cluster.*",
+            "utils.*",
+            "virtual_cluster.*",
         ],
     ),
     visibility = ["//tensorflow:__subpackages__"],
@@ -28,6 +30,21 @@ alias(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+cc_library(
+    name = "utils",
+    srcs = ["utils.cc"],
+    hdrs = [
+        "utils.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//third_party/eigen3",
+    ],
+)
+
 cc_library(
     name = "cluster",
     srcs = ["cluster.cc"],
@@ -44,6 +61,20 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "virtual_cluster",
+    srcs = ["virtual_cluster.cc"],
+    hdrs = [
+        "virtual_cluster.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":cluster",
+        ":utils",
+        "//tensorflow/core:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "single_machine",
     srcs = ["single_machine.cc"],
@@ -53,6 +84,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":cluster",
+        ":utils",
         "//tensorflow/cc:coordinator",
         "//tensorflow/cc:queue_runner",
         "//tensorflow/core:core_cpu",
@@ -60,7 +92,6 @@ cc_library(
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:utils",
-        "//tensorflow/core/grappler/costs:utils",
         "//tensorflow/core/kernels:ops_util",
     ],
 )
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 6bb235b836..e255b17631 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -19,7 +19,7 @@ limitations under the License.
 
 #include "tensorflow/cc/training/queue_runner.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
-#include "tensorflow/core/grappler/costs/utils.h"
+#include "tensorflow/core/grappler/clusters/utils.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/kernels/ops_util.h"
 #include "tensorflow/core/lib/core/errors.h"
diff --git a/tensorflow/core/grappler/clusters/utils.cc b/tensorflow/core/grappler/clusters/utils.cc
new file mode 100644
index 0000000000..24054d240e
--- /dev/null
+++ b/tensorflow/core/grappler/clusters/utils.cc
@@ -0,0 +1,114 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/clusters/utils.h"
+
+#include "third_party/eigen3/Eigen/Core"
+
+#if GOOGLE_CUDA
+#include "cuda/include/cuda.h"
+#include "cuda/include/cuda_runtime_api.h"
+#include "cuda/include/cudnn.h"
+#endif
+
+#include "tensorflow/core/lib/strings/numbers.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/platform/cpu_info.h"
+
+namespace tensorflow {
+namespace grappler {
+
+DeviceProperties GetLocalCPUInfo() {
+  DeviceProperties device;
+  device.set_type("CPU");
+
+  device.set_vendor(port::CPUVendorIDString());
+  // Combine cpu family and model into the model string.
+  device.set_model(
+      strings::StrCat((port::CPUFamily() << 4) + port::CPUModelNum()));
+  device.set_frequency(port::NominalCPUFrequency() * 1e-6);
+  device.set_num_cores(port::NumSchedulableCPUs());
+  device.set_l1_cache_size(Eigen::l1CacheSize());
+  device.set_l2_cache_size(Eigen::l2CacheSize());
+  device.set_l3_cache_size(Eigen::l3CacheSize());
+
+  (*device.mutable_environment())["cpu_instruction_set"] =
+      Eigen::SimdInstructionSetsInUse();
+
+  (*device.mutable_environment())["eigen"] = strings::StrCat(
+      EIGEN_WORLD_VERSION, ".", EIGEN_MAJOR_VERSION, ".", EIGEN_MINOR_VERSION);
+#ifdef EIGEN_USE_LIBXSMM
+  (*device.mutable_environment())["libxsmm"] = LIBXSMM_VERSION;
+#endif
+
+  return device;
+}
+
+DeviceProperties GetLocalGPUInfo(int gpu_id) {
+  DeviceProperties device;
+  device.set_type("GPU");
+
+#if GOOGLE_CUDA
+  cudaDeviceProp properties;
+  cudaError_t error = cudaGetDeviceProperties(&properties, gpu_id);
+  if (error == cudaSuccess) {
+    device.set_vendor("NVidia");
+    device.set_model(properties.name);
+    device.set_frequency(properties.clockRate * 1e-3);
+    device.set_num_cores(properties.multiProcessorCount);
+    device.set_num_registers(properties.regsPerMultiprocessor);
+    // For compute capability less than 5, l1 cache size is configurable to
+    // either 16 KB or 48 KB. We use the initial configuration 16 KB here. For
+    // compute capability larger or equal to 5, l1 cache (unified with texture
+    // cache) size is 24 KB. This number may need to be updated for future
+    // compute capabilities.
+    device.set_l1_cache_size((properties.major < 5) ? 16 * 1024 : 24 * 1024);
+    device.set_l2_cache_size(properties.l2CacheSize);
+    device.set_l3_cache_size(0);
+    device.set_shared_memory_size_per_multiprocessor(
+        properties.sharedMemPerMultiprocessor);
+    device.set_memory_size(properties.totalGlobalMem);
+    // 8 is the number of bits per byte. 2 is accounted for
+    // double data rate (DDR).
+    device.set_bandwidth(properties.memoryBusWidth / 8 *
+                         properties.memoryClockRate * 2);
+  }
+
+  (*device.mutable_environment())["architecture"] =
+      strings::StrCat(properties.major, ".", properties.minor);
+  (*device.mutable_environment())["cuda"] = strings::StrCat(CUDA_VERSION);
+  (*device.mutable_environment())["cudnn"] = strings::StrCat(CUDNN_VERSION);
+#endif
+
+  return device;
+}
+
+DeviceProperties GetDeviceInfo(const DeviceNameUtils::ParsedName& device) {
+  if (device.type == "CPU") {
+    return GetLocalCPUInfo();
+  } else if (device.type == "GPU") {
+    if (device.has_id) {
+      return GetLocalGPUInfo(device.id);
+    } else {
+      return GetLocalGPUInfo(0);
+    }
+  }
+  DeviceProperties result;
+  result.set_type("UNKNOWN");
+  return result;
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/clusters/utils.h b/tensorflow/core/grappler/clusters/utils.h
new file mode 100644
index 0000000000..191942040a
--- /dev/null
+++ b/tensorflow/core/grappler/clusters/utils.h
@@ -0,0 +1,38 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_CLUSTERS_UTILS_H_
+#define TENSORFLOW_GRAPPLER_CLUSTERS_UTILS_H_
+
+#include "tensorflow/core/protobuf/device_properties.pb.h"
+#include "tensorflow/core/util/device_name_utils.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Returns the DeviceProperties of the CPU on which grappler is running.
+DeviceProperties GetLocalCPUInfo();
+
+// Returns the DeviceProperties for the specified GPU attached to the server on
+// which grappler is running.
+DeviceProperties GetLocalGPUInfo(int gpu_id);
+
+// Returns the DeviceProperties of the specified device
+DeviceProperties GetDeviceInfo(const DeviceNameUtils::ParsedName& device);
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_CLUSTERS_UTILS_H_
diff --git a/tensorflow/core/grappler/clusters/virtual_cluster.cc b/tensorflow/core/grappler/clusters/virtual_cluster.cc
new file mode 100644
index 0000000000..4ca4c03dbb
--- /dev/null
+++ b/tensorflow/core/grappler/clusters/virtual_cluster.cc
@@ -0,0 +1,44 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/clusters/virtual_cluster.h"
+
+namespace tensorflow {
+namespace grappler {
+
+VirtualCluster::VirtualCluster(
+    const std::unordered_map<string, DeviceProperties>& devices)
+    : Cluster(0) {
+  devices_ = devices;
+}
+
+VirtualCluster::~VirtualCluster() {}
+
+Status VirtualCluster::Provision() { return Status::OK(); }
+
+Status VirtualCluster::Initialize(const GrapplerItem& item) {
+  return Status::OK();
+}
+
+Status VirtualCluster::Run(const GraphDef& item,
+                           const std::vector<std::pair<string, Tensor>>& feed,
+                           const std::vector<string>& fetch,
+                           RunMetadata* metadata) {
+  return Status::OK();
+
+}
+
+}  // namespace grappler
+}  // namespace tensorflow
diff --git a/tensorflow/core/grappler/clusters/virtual_cluster.h b/tensorflow/core/grappler/clusters/virtual_cluster.h
new file mode 100644
index 0000000000..cd8436a987
--- /dev/null
+++ b/tensorflow/core/grappler/clusters/virtual_cluster.h
@@ -0,0 +1,46 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_GRAPPLER_CLUSTERS_VIRTUAL_CLUSTER_H_
+#define TENSORFLOW_GRAPPLER_CLUSTERS_VIRTUAL_CLUSTER_H_
+
+#include <unordered_map>
+#include "tensorflow/core/grappler/clusters/cluster.h"
+#include "tensorflow/core/protobuf/device_properties.pb.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Create a simple cluster that lists the devices (and their properties)
+// available in a TensorFlow session. This cluster doesn't allow running an
+// actual graph. It is useful however when used in conjusction with costs models
+// that aren't based on the execution of the graph.
+class VirtualCluster : public Cluster {
+ public:
+  VirtualCluster(const std::unordered_map<string, DeviceProperties>& devices);
+
+  ~VirtualCluster() override;
+
+  Status Provision() override;
+  Status Initialize(const GrapplerItem& item) override;
+  Status Run(const GraphDef& item,
+             const std::vector<std::pair<string, Tensor>>& feed,
+             const std::vector<string>& fetch, RunMetadata* metadata) override;
+};
+
+}  // end namespace grappler
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_GRAPPLER_CLUSTERS_VIRTUAL_CLUSTER_H_
diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index 596b288eb7..ceb4050eae 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -118,6 +118,7 @@ cc_library(
     deps = [
         ":op_performance_data_cc",
         "//third_party/eigen3",
+        "//tensorflow/core/grappler/clusters:utils",
         "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
@@ -195,9 +196,8 @@ cc_library(
     deps = [
         ":cost_estimator",
         ":op_performance_data_cc",
-        ":utils",
-        "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:framework",
+        "//tensorflow/core/grappler/clusters:utils",
     ],
 )
 
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
index a6ae2c744c..84e5461d7f 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/grappler/costs/op_level_cost_estimator.h"
 #include "tensorflow/core/framework/attr_value_util.h"
-#include "tensorflow/core/grappler/costs/utils.h"
+#include "tensorflow/core/grappler/clusters/utils.h"
 
 namespace tensorflow {
 namespace grappler {
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.h b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
index 7a594e2a01..78ce69a597 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.h
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
@@ -20,7 +20,6 @@ limitations under the License.
 #include <map>
 #include <string>
 
-#include "tensorflow/core/graph/types.h"
 #include "tensorflow/core/grappler/costs/cost_estimator.h"
 #include "tensorflow/core/grappler/costs/op_performance_data.pb.h"
 #include "tensorflow/core/util/padding.h"
diff --git a/tensorflow/core/grappler/costs/utils.cc b/tensorflow/core/grappler/costs/utils.cc
index e3f11272b2..bdfb17a456 100644
--- a/tensorflow/core/grappler/costs/utils.cc
+++ b/tensorflow/core/grappler/costs/utils.cc
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/core/framework/types.pb.h"
 #include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/graph/tensor_id.h"
+#include "tensorflow/core/grappler/clusters/utils.h"
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/cpu_info.h"
@@ -139,70 +140,5 @@ DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node) {
   return device;
 }
 
-DeviceProperties GetLocalCPUInfo() {
-  DeviceProperties device;
-  device.set_type("CPU");
-
-  device.set_vendor(port::CPUVendorIDString());
-  // Combine cpu family and model into the model string.
-  device.set_model(
-      strings::StrCat((port::CPUFamily() << 4) + port::CPUModelNum()));
-  device.set_frequency(port::NominalCPUFrequency() * 1e-6);
-  device.set_num_cores(port::NumSchedulableCPUs());
-  device.set_l1_cache_size(Eigen::l1CacheSize());
-  device.set_l2_cache_size(Eigen::l2CacheSize());
-  device.set_l3_cache_size(Eigen::l3CacheSize());
-
-  (*device.mutable_environment())["cpu_instruction_set"] =
-      Eigen::SimdInstructionSetsInUse();
-
-  (*device.mutable_environment())["eigen"] = strings::StrCat(
-      EIGEN_WORLD_VERSION, ".", EIGEN_MAJOR_VERSION, ".", EIGEN_MINOR_VERSION);
-#ifdef EIGEN_USE_LIBXSMM
-  (*device.mutable_environment())["libxsmm"] = LIBXSMM_VERSION;
-#endif
-
-  return device;
-}
-
-DeviceProperties GetLocalGPUInfo(int gpu_id) {
-  DeviceProperties device;
-  device.set_type("GPU");
-
-#if GOOGLE_CUDA
-  cudaDeviceProp properties;
-  cudaError_t error = cudaGetDeviceProperties(&properties, gpu_id);
-  if (error == cudaSuccess) {
-    device.set_vendor("NVidia");
-    device.set_model(properties.name);
-    device.set_frequency(properties.clockRate * 1e-3);
-    device.set_num_cores(properties.multiProcessorCount);
-    device.set_num_registers(properties.regsPerMultiprocessor);
-    // For compute capability less than 5, l1 cache size is configurable to
-    // either 16 KB or 48 KB. We use the initial configuration 16 KB here. For
-    // compute capability larger or equal to 5, l1 cache (unified with texture
-    // cache) size is 24 KB. This number may need to be updated for future
-    // compute capabilities.
-    device.set_l1_cache_size((properties.major < 5) ? 16 * 1024 : 24 * 1024);
-    device.set_l2_cache_size(properties.l2CacheSize);
-    device.set_l3_cache_size(0);
-    device.set_shared_memory_size_per_multiprocessor(
-        properties.sharedMemPerMultiprocessor);
-    device.set_memory_size(properties.totalGlobalMem);
-    // 8 is the number of bits per byte. 2 is accounted for
-    // double data rate (DDR).
-    device.set_bandwidth(properties.memoryBusWidth / 8 *
-                         properties.memoryClockRate * 2);
-  }
-
-  (*device.mutable_environment())["architecture"] =
-      strings::StrCat(properties.major, ".", properties.minor);
-  (*device.mutable_environment())["cuda"] = strings::StrCat(CUDA_VERSION);
-  (*device.mutable_environment())["cudnn"] = strings::StrCat(CUDNN_VERSION);
-#endif
-
-  return device;
-}
-
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/utils.h b/tensorflow/core/grappler/costs/utils.h
index 0886dfbde3..32e32a09e1 100644
--- a/tensorflow/core/grappler/costs/utils.h
+++ b/tensorflow/core/grappler/costs/utils.h
@@ -43,13 +43,6 @@ std::vector<OpInfo::TensorProperties> FindInputFeatures(
 // Returns the DeviceProperties of the device on which 'node' runs.
 DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node);
 
-// Returns the DeviceProperties of the CPU on which grappler is running.
-DeviceProperties GetLocalCPUInfo();
-
-// Returns the DeviceProperties for the specified GPU attached to the server on
-// which grappler is running.
-DeviceProperties GetLocalGPUInfo(int gpu_id);
-
 }  // end namespace grappler
 }  // end namespace tensorflow
 
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 2ea5adffeb..23adaab8ed 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -90,13 +90,13 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
   bool already_optimized = false;
   for (const auto& optimizer : optimizers) {
     if (!already_optimized) {
-      TF_RETURN_IF_ERROR(optimizer->Optimize(nullptr, item, optimized_graph));
+      TF_RETURN_IF_ERROR(optimizer->Optimize(cluster, item, optimized_graph));
       already_optimized = true;
     } else {
       GrapplerItem optimized_item = item;
       optimized_item.graph = *optimized_graph;
       TF_RETURN_IF_ERROR(
-          optimizer->Optimize(nullptr, optimized_item, optimized_graph));
+          optimizer->Optimize(cluster, optimized_item, optimized_graph));
     }
   }
   // Copy the graph version.
@@ -116,9 +116,9 @@ bool MetaOptimizerEnabled(const RewriterConfig& cfg) {
 }
 
 Status RunMetaOptimizer(const GrapplerItem& item, const RewriterConfig& cfg,
-                        GraphDef* optimized_graph) {
+                        Cluster* cluster, GraphDef* optimized_graph) {
   MetaOptimizer optimizer(cfg);
-  return optimizer.Optimize(nullptr, item, optimized_graph);
+  return optimizer.Optimize(cluster, item, optimized_graph);
 }
 
 }  // namespace grappler
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.h b/tensorflow/core/grappler/optimizers/meta_optimizer.h
index 9def2cd711..6b950c973d 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.h
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.h
@@ -46,7 +46,7 @@ class MetaOptimizer : public GraphOptimizer {
 bool MetaOptimizerEnabled(const RewriterConfig& cfg);
 
 Status RunMetaOptimizer(const GrapplerItem& item, const RewriterConfig& cfg,
-                        GraphDef* optimized_graph);
+                        Cluster* cluster, GraphDef* optimized_graph);
 
 }  // namespace grappler
 }  // namespace tensorflow
diff --git a/tensorflow/python/grappler/tf_optimizer.i b/tensorflow/python/grappler/tf_optimizer.i
index ab887e63e5..404ce35180 100644
--- a/tensorflow/python/grappler/tf_optimizer.i
+++ b/tensorflow/python/grappler/tf_optimizer.i
@@ -58,6 +58,7 @@ limitations under the License.
   #include "tensorflow/core/framework/graph.pb.h"
   #include "tensorflow/core/grappler/grappler_item.h"
   #include "tensorflow/core/grappler/grappler_item_builder.h"
+  #include "tensorflow/core/grappler/clusters/virtual_cluster.h"
   #include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
   #include "tensorflow/core/protobuf/meta_graph.pb.h"
   #include "tensorflow/core/protobuf/rewriter_config.pb.h"
@@ -69,9 +70,11 @@ PyObject* TF_OptimizeGraph(
     const tensorflow::grappler::ItemConfig item_config;
     std::unique_ptr<tensorflow::grappler::GrapplerItem> grappler_item =
         tensorflow::grappler::GrapplerItemFromMetaGraphDef(graph_id, metagraph, item_config);
+    std::unordered_map<string, tensorflow::DeviceProperties> device_map;
+    tensorflow::grappler::VirtualCluster cluster(device_map);
     tensorflow::GraphDef out_graph;
     tensorflow::Status status = tensorflow::grappler::RunMetaOptimizer(
-        *grappler_item, rewriter_config, &out_graph);
+        *grappler_item, rewriter_config, &cluster, &out_graph);
     tensorflow::Set_TF_Status_from_Status(out_status, status);
     string out_graph_str = out_graph.SerializeAsString();
     PyObject* ret = PyBytes_FromStringAndSize(out_graph_str.data(),
-- 
GitLab


From d9fc16f61e89b12681b24dc4206370e5a74f4c6f Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@google.com>
Date: Tue, 9 May 2017 10:28:51 -0700
Subject: [PATCH 1160/1563] Unbreak HLO graph dumping for graphs that include a
 convolution or a C++ template (e.g. "max<float>").

These descriptions include angle brackets, which we need to sanitize
out.

PiperOrigin-RevId: 155521374
---
 .../compiler/xla/service/hlo_graph_dumper.cc  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
index 9c84c64254..eb2e5dfb37 100644
--- a/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
+++ b/tensorflow/compiler/xla/service/hlo_graph_dumper.cc
@@ -107,6 +107,14 @@ string NodeColorAttributes(ColorScheme color) {
       font_color, stroke_color, fill_color);
 }
 
+// Replaces <> with &lt;&gt;, so that this string is safe(er) for use in a
+// graphviz HTML-like string.
+string HtmlLikeStringSanitize(tensorflow::StringPiece s) {
+  return tensorflow::str_util::StringReplace(
+      tensorflow::str_util::StringReplace(s, "<", "&lt;", /*replace_all=*/true),
+      ">", "&gt;", /*replace_all=*/true);
+}
+
 // Returns the dot graph identifier for the given instruction.
 string InstructionId(const HloInstruction* instruction) {
   return Printf("%lld", reinterpret_cast<uint64>(instruction));
@@ -172,16 +180,21 @@ string InstructionSequenceGraph(
   for (auto& instruction : instructions) {
     ColorScheme color = kYellow;
     string shape = "box";
-    string name = StrCat("<b>", instruction->ExtendedOpcodeStr(), "</b> ",
-                         instruction->name());
+    string name =
+        StrCat("<b>", HtmlLikeStringSanitize(instruction->ExtendedOpcodeStr()),
+               "</b> ", HtmlLikeStringSanitize(instruction->name()));
     if (HloOpcode::kConvolution == instruction->opcode()) {
-      StrAppend(&name, "<br/>",
-                instruction->ConvolutionDimensionNumbersToString(), "<br/>",
-                window_util::ToString(instruction->window()));
+      StrAppend(
+          &name, "<br/>",
+          HtmlLikeStringSanitize(
+              instruction->ConvolutionDimensionNumbersToString()),
+          "<br/>",
+          HtmlLikeStringSanitize(window_util::ToString(instruction->window())));
     }
 
     if (!instruction->metadata().op_name().empty()) {
-      StrAppend(&name, "<br/>", instruction->metadata().op_name());
+      StrAppend(&name, "<br/>",
+                HtmlLikeStringSanitize(instruction->metadata().op_name()));
     }
     if (!instruction->metadata().source_file().empty() &&
         instruction->metadata().source_line() != 0) {
-- 
GitLab


From 04d0b083d1b3a663447b815c59ef94e35f3b3ed9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 10:48:59 -0700
Subject: [PATCH 1161/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 155524343
---
 .../core/ops/compat/ops_history.v1.pbtxt      |  93 ++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 105 ++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index bc40715acc..d67cda2ae2 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -21571,6 +21571,99 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "SparseCross"
+  input_arg {
+    name: "indices"
+    type: DT_INT64
+    number_attr: "N"
+  }
+  input_arg {
+    name: "values"
+    type_list_attr: "sparse_types"
+  }
+  input_arg {
+    name: "shapes"
+    type: DT_INT64
+    number_attr: "N"
+  }
+  input_arg {
+    name: "dense_inputs"
+    type_list_attr: "dense_types"
+  }
+  output_arg {
+    name: "output_indices"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output_values"
+    type_attr: "out_type"
+  }
+  output_arg {
+    name: "output_shape"
+    type: DT_INT64
+  }
+  attr {
+    name: "N"
+    type: "int"
+    has_minimum: true
+  }
+  attr {
+    name: "hashed_output"
+    type: "bool"
+  }
+  attr {
+    name: "num_buckets"
+    type: "int"
+    has_minimum: true
+  }
+  attr {
+    name: "hash_key"
+    type: "int"
+  }
+  attr {
+    name: "sparse_types"
+    type: "list(type)"
+    has_minimum: true
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+  attr {
+    name: "dense_types"
+    type: "list(type)"
+    has_minimum: true
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+  attr {
+    name: "out_type"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+  attr {
+    name: "internal_type"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+}
 op {
   name: "SparseDenseCwiseAdd"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 06e88e8a52..7635bc84ee 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -22474,6 +22474,111 @@ op {
   description: "accepts gradients marked with local_step greater or equal to the most recent\nglobal_step known to the accumulator. The average can be extracted from the\naccumulator, provided sufficient gradients have been accumulated. Extracting the\naverage automatically resets the aggregate to 0, and increments the global_step\nrecorded by the accumulator."
   is_stateful: true
 }
+op {
+  name: "SparseCross"
+  input_arg {
+    name: "indices"
+    description: "2-D.  Indices of each input `SparseTensor`."
+    type: DT_INT64
+    number_attr: "N"
+  }
+  input_arg {
+    name: "values"
+    description: "1-D.   values of each `SparseTensor`."
+    type_list_attr: "sparse_types"
+  }
+  input_arg {
+    name: "shapes"
+    description: "1-D.   Shapes of each `SparseTensor`."
+    type: DT_INT64
+    number_attr: "N"
+  }
+  input_arg {
+    name: "dense_inputs"
+    description: "2-D.    Columns represented by dense `Tensor`."
+    type_list_attr: "dense_types"
+  }
+  output_arg {
+    name: "output_indices"
+    description: "2-D.  Indices of the concatenated `SparseTensor`."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "output_values"
+    description: "1-D.  Non-empty values of the concatenated or hashed\n`SparseTensor`."
+    type_attr: "out_type"
+  }
+  output_arg {
+    name: "output_shape"
+    description: "1-D.  Shape of the concatenated `SparseTensor`."
+    type: DT_INT64
+  }
+  attr {
+    name: "N"
+    type: "int"
+    has_minimum: true
+  }
+  attr {
+    name: "hashed_output"
+    type: "bool"
+    description: "If true, returns the hash of the cross instead of the string.\nThis will allow us avoiding string manipulations."
+  }
+  attr {
+    name: "num_buckets"
+    type: "int"
+    description: "It is used if hashed_output is true.\noutput = hashed_value%num_buckets if num_buckets > 0 else hashed_value."
+    has_minimum: true
+  }
+  attr {
+    name: "hash_key"
+    type: "int"
+    description: "Specify the hash_key that will be used by the `FingerprintCat64`\nfunction to combine the crosses fingerprints."
+  }
+  attr {
+    name: "sparse_types"
+    type: "list(type)"
+    has_minimum: true
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+  attr {
+    name: "dense_types"
+    type: "list(type)"
+    has_minimum: true
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+  attr {
+    name: "out_type"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+  attr {
+    name: "internal_type"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT64
+        type: DT_STRING
+      }
+    }
+  }
+  summary: "Generates sparse cross from a list of sparse and dense tensors."
+  description: "The op takes two lists, one of 2D `SparseTensor` and one of 2D `Tensor`, each\nrepresenting features of one feature column. It outputs a 2D `SparseTensor` with\nthe batchwise crosses of these features.\n\nFor example, if the inputs are\n\n    inputs[0]: SparseTensor with shape = [2, 2]\n    [0, 0]: \"a\"\n    [1, 0]: \"b\"\n    [1, 1]: \"c\"\n\n    inputs[1]: SparseTensor with shape = [2, 1]\n    [0, 0]: \"d\"\n    [1, 0]: \"e\"\n\n    inputs[2]: Tensor [[\"f\"], [\"g\"]]\n\nthen the output will be\n\n    shape = [2, 2]\n    [0, 0]: \"a_X_d_X_f\"\n    [1, 0]: \"b_X_e_X_g\"\n    [1, 1]: \"c_X_e_X_g\"\n\nif hashed_output=true then the output will be\n\n    shape = [2, 2]\n    [0, 0]: FingerprintCat64(\n                Fingerprint64(\"f\"), FingerprintCat64(\n                    Fingerprint64(\"d\"), Fingerprint64(\"a\")))\n    [1, 0]: FingerprintCat64(\n                Fingerprint64(\"g\"), FingerprintCat64(\n                    Fingerprint64(\"e\"), Fingerprint64(\"b\")))\n    [1, 1]: FingerprintCat64(\n                Fingerprint64(\"g\"), FingerprintCat64(\n                    Fingerprint64(\"e\"), Fingerprint64(\"c\")))"
+}
 op {
   name: "SparseDenseCwiseAdd"
   input_arg {
-- 
GitLab


From f6e75f3b78b1ed37f0b4f12a664a88b8cf12dc16 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 10:54:21 -0700
Subject: [PATCH 1162/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 155525165
---
 tensorflow/go/op/wrappers.go | 569 ++++++++++++++++++++---------------
 1 file changed, 320 insertions(+), 249 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 7631ebb75d..3ac185956e 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -1255,65 +1255,6 @@ func SpaceToBatchND(scope *Scope, input tf.Output, block_shape tf.Output, paddin
 	return op.Output(0)
 }
 
-// ListDiffAttr is an optional argument to ListDiff.
-type ListDiffAttr func(optionalAttr)
-
-// ListDiffOutIdx sets the optional out_idx attribute to value.
-// If not specified, defaults to DT_INT32
-func ListDiffOutIdx(value tf.DataType) ListDiffAttr {
-	return func(m optionalAttr) {
-		m["out_idx"] = value
-	}
-}
-
-// Computes the difference between two lists of numbers or strings.
-//
-// Given a list `x` and a list `y`, this operation returns a list `out` that
-// represents all values that are in `x` but not in `y`. The returned list `out`
-// is sorted in the same order that the numbers appear in `x` (duplicates are
-// preserved). This operation also returns a list `idx` that represents the
-// position of each `out` element in `x`. In other words:
-//
-// `out[i] = x[idx[i]] for i in [0, 1, ..., len(out) - 1]`
-//
-// For example, given this input:
-//
-// ```
-// x = [1, 2, 3, 4, 5, 6]
-// y = [1, 3, 5]
-// ```
-//
-// This operation would return:
-//
-// ```
-// out ==> [2, 4, 6]
-// idx ==> [1, 3, 5]
-// ```
-//
-// Arguments:
-//	x: 1-D. Values to keep.
-//	y: 1-D. Values to remove.
-//
-// Returns 1-D. Values present in `x` but not in `y`.1-D. Positions of `x` values preserved in `out`.
-func ListDiff(scope *Scope, x tf.Output, y tf.Output, optional ...ListDiffAttr) (out tf.Output, idx tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "ListDiff",
-		Input: []tf.Input{
-			x, y,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
-}
-
 // SqueezeAttr is an optional argument to Squeeze.
 type SqueezeAttr func(optionalAttr)
 
@@ -9633,13 +9574,271 @@ func SparseTensorDenseAdd(scope *Scope, a_indices tf.Output, a_values tf.Output,
 		return
 	}
 	opspec := tf.OpSpec{
-		Type: "SparseTensorDenseAdd",
+		Type: "SparseTensorDenseAdd",
+		Input: []tf.Input{
+			a_indices, a_values, a_shape, b,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// ListDiffAttr is an optional argument to ListDiff.
+type ListDiffAttr func(optionalAttr)
+
+// ListDiffOutIdx sets the optional out_idx attribute to value.
+// If not specified, defaults to DT_INT32
+func ListDiffOutIdx(value tf.DataType) ListDiffAttr {
+	return func(m optionalAttr) {
+		m["out_idx"] = value
+	}
+}
+
+// Computes the difference between two lists of numbers or strings.
+//
+// Given a list `x` and a list `y`, this operation returns a list `out` that
+// represents all values that are in `x` but not in `y`. The returned list `out`
+// is sorted in the same order that the numbers appear in `x` (duplicates are
+// preserved). This operation also returns a list `idx` that represents the
+// position of each `out` element in `x`. In other words:
+//
+// `out[i] = x[idx[i]] for i in [0, 1, ..., len(out) - 1]`
+//
+// For example, given this input:
+//
+// ```
+// x = [1, 2, 3, 4, 5, 6]
+// y = [1, 3, 5]
+// ```
+//
+// This operation would return:
+//
+// ```
+// out ==> [2, 4, 6]
+// idx ==> [1, 3, 5]
+// ```
+//
+// Arguments:
+//	x: 1-D. Values to keep.
+//	y: 1-D. Values to remove.
+//
+// Returns 1-D. Values present in `x` but not in `y`.1-D. Positions of `x` values preserved in `out`.
+func ListDiff(scope *Scope, x tf.Output, y tf.Output, optional ...ListDiffAttr) (out tf.Output, idx tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ListDiff",
+		Input: []tf.Input{
+			x, y,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1)
+}
+
+// Generates sparse cross from a list of sparse and dense tensors.
+//
+// The op takes two lists, one of 2D `SparseTensor` and one of 2D `Tensor`, each
+// representing features of one feature column. It outputs a 2D `SparseTensor` with
+// the batchwise crosses of these features.
+//
+// For example, if the inputs are
+//
+//     inputs[0]: SparseTensor with shape = [2, 2]
+//     [0, 0]: "a"
+//     [1, 0]: "b"
+//     [1, 1]: "c"
+//
+//     inputs[1]: SparseTensor with shape = [2, 1]
+//     [0, 0]: "d"
+//     [1, 0]: "e"
+//
+//     inputs[2]: Tensor [["f"], ["g"]]
+//
+// then the output will be
+//
+//     shape = [2, 2]
+//     [0, 0]: "a_X_d_X_f"
+//     [1, 0]: "b_X_e_X_g"
+//     [1, 1]: "c_X_e_X_g"
+//
+// if hashed_output=true then the output will be
+//
+//     shape = [2, 2]
+//     [0, 0]: FingerprintCat64(
+//                 Fingerprint64("f"), FingerprintCat64(
+//                     Fingerprint64("d"), Fingerprint64("a")))
+//     [1, 0]: FingerprintCat64(
+//                 Fingerprint64("g"), FingerprintCat64(
+//                     Fingerprint64("e"), Fingerprint64("b")))
+//     [1, 1]: FingerprintCat64(
+//                 Fingerprint64("g"), FingerprintCat64(
+//                     Fingerprint64("e"), Fingerprint64("c")))
+//
+// Arguments:
+//	indices: 2-D.  Indices of each input `SparseTensor`.
+//	values: 1-D.   values of each `SparseTensor`.
+//	shapes: 1-D.   Shapes of each `SparseTensor`.
+//	dense_inputs: 2-D.    Columns represented by dense `Tensor`.
+//	hashed_output: If true, returns the hash of the cross instead of the string.
+// This will allow us avoiding string manipulations.
+//	num_buckets: It is used if hashed_output is true.
+// output = hashed_value%num_buckets if num_buckets > 0 else hashed_value.
+//	hash_key: Specify the hash_key that will be used by the `FingerprintCat64`
+// function to combine the crosses fingerprints.
+//
+//
+//
+// Returns 2-D.  Indices of the concatenated `SparseTensor`.1-D.  Non-empty values of the concatenated or hashed
+// `SparseTensor`.1-D.  Shape of the concatenated `SparseTensor`.
+func SparseCross(scope *Scope, indices []tf.Output, values []tf.Output, shapes []tf.Output, dense_inputs []tf.Output, hashed_output bool, num_buckets int64, hash_key int64, out_type tf.DataType, internal_type tf.DataType) (output_indices tf.Output, output_values tf.Output, output_shape tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"hashed_output": hashed_output, "num_buckets": num_buckets, "hash_key": hash_key, "out_type": out_type, "internal_type": internal_type}
+	opspec := tf.OpSpec{
+		Type: "SparseCross",
+		Input: []tf.Input{
+			tf.OutputList(indices), tf.OutputList(values), tf.OutputList(shapes), tf.OutputList(dense_inputs),
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
+// FractionalMaxPoolAttr is an optional argument to FractionalMaxPool.
+type FractionalMaxPoolAttr func(optionalAttr)
+
+// FractionalMaxPoolPseudoRandom sets the optional pseudo_random attribute to value.
+//
+// value: When set to True, generates the pooling sequence in a
+// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
+// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
+// difference between pseudorandom and random.
+// If not specified, defaults to false
+func FractionalMaxPoolPseudoRandom(value bool) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["pseudo_random"] = value
+	}
+}
+
+// FractionalMaxPoolOverlapping sets the optional overlapping attribute to value.
+//
+// value: When set to True, it means when pooling, the values at the boundary
+// of adjacent pooling cells are used by both cells. For example:
+//
+// `index  0  1  2  3  4`
+//
+// `value  20 5  16 3  7`
+//
+// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
+// The result would be [20, 16] for fractional max pooling.
+// If not specified, defaults to false
+func FractionalMaxPoolOverlapping(value bool) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["overlapping"] = value
+	}
+}
+
+// FractionalMaxPoolDeterministic sets the optional deterministic attribute to value.
+//
+// value: When set to True, a fixed pooling region will be used when
+// iterating over a FractionalMaxPool node in the computation graph. Mainly used
+// in unit test to make FractionalMaxPool deterministic.
+// If not specified, defaults to false
+func FractionalMaxPoolDeterministic(value bool) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["deterministic"] = value
+	}
+}
+
+// FractionalMaxPoolSeed sets the optional seed attribute to value.
+//
+// value: If either seed or seed2 are set to be non-zero, the random number
+// generator is seeded by the given seed.  Otherwise, it is seeded by a
+// random seed.
+// If not specified, defaults to 0
+func FractionalMaxPoolSeed(value int64) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["seed"] = value
+	}
+}
+
+// FractionalMaxPoolSeed2 sets the optional seed2 attribute to value.
+//
+// value: An second seed to avoid seed collision.
+// If not specified, defaults to 0
+func FractionalMaxPoolSeed2(value int64) FractionalMaxPoolAttr {
+	return func(m optionalAttr) {
+		m["seed2"] = value
+	}
+}
+
+// Performs fractional max pooling on the input.
+//
+// Fractional max pooling is slightly different than regular max pooling.  In
+// regular max pooling, you downsize an input set by taking the maximum value of
+// smaller N x N subsections of the set (often 2x2), and try to reduce the set by
+// a factor of N, where N is an integer.  Fractional max pooling, as you might
+// expect from the word "fractional", means that the overall reduction ratio N
+// does not have to be an integer.
+//
+// The sizes of the pooling regions are generated randomly but are fairly uniform.
+// For example, let's look at the height dimension, and the constraints on the
+// list of rows that will be pool boundaries.
+//
+// First we define the following:
+//
+// 1.  input_row_length : the number of rows from the input set
+// 2.  output_row_length : which will be smaller than the input
+// 3.  alpha = input_row_length / output_row_length : our reduction ratio
+// 4.  K = floor(alpha)
+// 5.  row_pooling_sequence : this is the result list of pool boundary rows
+//
+// Then, row_pooling_sequence should satisfy:
+//
+// 1.  a[0] = 0 : the first value of the sequence is 0
+// 2.  a[end] = input_row_length : the last value of the sequence is the size
+// 3.  K <= (a[i+1] - a[i]) <= K+1 : all intervals are K or K+1 size
+// 4.  length(row_pooling_sequence) = output_row_length+1
+//
+// For more details on fractional max pooling, see this paper:
+// [Benjamin Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071)
+//
+// Arguments:
+//	value: 4-D with shape `[batch, height, width, channels]`.
+//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
+// supports row and col dimension and should be >= 1.0. For example, a valid
+// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
+// must be 1.0 because we don't allow pooling on batch and channels
+// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
+// respectively.
+//
+// Returns output tensor after fractional max pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
+func FractionalMaxPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalMaxPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "FractionalMaxPool",
 		Input: []tf.Input{
-			a_indices, a_values, a_shape, b,
+			value,
 		},
+		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1), op.Output(2)
 }
 
 // Concatenates a list of `SparseTensor` along the specified dimension.
@@ -14398,45 +14597,6 @@ func AsString(scope *Scope, input tf.Output, optional ...AsStringAttr) (output t
 	return op.Output(0)
 }
 
-// Says whether the targets are in the top `K` predictions.
-//
-// This outputs a `batch_size` bool array, an entry `out[i]` is `true` if the
-// prediction for the target class is among the top `k` predictions among
-// all predictions for example `i`. Note that the behavior of `InTopK` differs
-// from the `TopK` op in its handling of ties; if multiple classes have the
-// same prediction value and straddle the top-`k` boundary, all of those
-// classes are considered to be in the top `k`.
-//
-// More formally, let
-//
-//   \\(predictions_i\\) be the predictions for all classes for example `i`,
-//   \\(targets_i\\) be the target class for example `i`,
-//   \\(out_i\\) be the output for example `i`,
-//
-// $$out_i = predictions_{i, targets_i} \in TopKIncludingTies(predictions_i)$$
-//
-// Arguments:
-//	predictions: A `batch_size` x `classes` tensor.
-//	targets: A `batch_size` vector of class ids.
-//	k: Number of top elements to look at for computing precision.
-//
-// Returns Computed Precision at `k` as a `bool Tensor`.
-func InTopK(scope *Scope, predictions tf.Output, targets tf.Output, k int64) (precision tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"k": k}
-	opspec := tf.OpSpec{
-		Type: "InTopK",
-		Input: []tf.Input{
-			predictions, targets,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // GatherAttr is an optional argument to Gather.
 type GatherAttr func(optionalAttr)
 
@@ -16622,6 +16782,45 @@ func NotEqual(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	return op.Output(0)
 }
 
+// Says whether the targets are in the top `K` predictions.
+//
+// This outputs a `batch_size` bool array, an entry `out[i]` is `true` if the
+// prediction for the target class is among the top `k` predictions among
+// all predictions for example `i`. Note that the behavior of `InTopK` differs
+// from the `TopK` op in its handling of ties; if multiple classes have the
+// same prediction value and straddle the top-`k` boundary, all of those
+// classes are considered to be in the top `k`.
+//
+// More formally, let
+//
+//   \\(predictions_i\\) be the predictions for all classes for example `i`,
+//   \\(targets_i\\) be the target class for example `i`,
+//   \\(out_i\\) be the output for example `i`,
+//
+// $$out_i = predictions_{i, targets_i} \in TopKIncludingTies(predictions_i)$$
+//
+// Arguments:
+//	predictions: A `batch_size` x `classes` tensor.
+//	targets: A `batch_size` vector of class ids.
+//	k: Number of top elements to look at for computing precision.
+//
+// Returns Computed Precision at `k` as a `bool Tensor`.
+func InTopK(scope *Scope, predictions tf.Output, targets tf.Output, k int64) (precision tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"k": k}
+	opspec := tf.OpSpec{
+		Type: "InTopK",
+		Input: []tf.Input{
+			predictions, targets,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Returns a batched diagonal tensor with a given batched diagonal values.
 //
 // Given a `diagonal`, this operation returns a tensor with the `diagonal` and
@@ -16842,134 +17041,6 @@ func TopKV2(scope *Scope, input tf.Output, k tf.Output, optional ...TopKV2Attr)
 	return op.Output(0), op.Output(1)
 }
 
-// FractionalMaxPoolAttr is an optional argument to FractionalMaxPool.
-type FractionalMaxPoolAttr func(optionalAttr)
-
-// FractionalMaxPoolPseudoRandom sets the optional pseudo_random attribute to value.
-//
-// value: When set to True, generates the pooling sequence in a
-// pseudorandom fashion, otherwise, in a random fashion. Check paper [Benjamin
-// Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071) for
-// difference between pseudorandom and random.
-// If not specified, defaults to false
-func FractionalMaxPoolPseudoRandom(value bool) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["pseudo_random"] = value
-	}
-}
-
-// FractionalMaxPoolOverlapping sets the optional overlapping attribute to value.
-//
-// value: When set to True, it means when pooling, the values at the boundary
-// of adjacent pooling cells are used by both cells. For example:
-//
-// `index  0  1  2  3  4`
-//
-// `value  20 5  16 3  7`
-//
-// If the pooling sequence is [0, 2, 4], then 16, at index 2 will be used twice.
-// The result would be [20, 16] for fractional max pooling.
-// If not specified, defaults to false
-func FractionalMaxPoolOverlapping(value bool) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["overlapping"] = value
-	}
-}
-
-// FractionalMaxPoolDeterministic sets the optional deterministic attribute to value.
-//
-// value: When set to True, a fixed pooling region will be used when
-// iterating over a FractionalMaxPool node in the computation graph. Mainly used
-// in unit test to make FractionalMaxPool deterministic.
-// If not specified, defaults to false
-func FractionalMaxPoolDeterministic(value bool) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["deterministic"] = value
-	}
-}
-
-// FractionalMaxPoolSeed sets the optional seed attribute to value.
-//
-// value: If either seed or seed2 are set to be non-zero, the random number
-// generator is seeded by the given seed.  Otherwise, it is seeded by a
-// random seed.
-// If not specified, defaults to 0
-func FractionalMaxPoolSeed(value int64) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["seed"] = value
-	}
-}
-
-// FractionalMaxPoolSeed2 sets the optional seed2 attribute to value.
-//
-// value: An second seed to avoid seed collision.
-// If not specified, defaults to 0
-func FractionalMaxPoolSeed2(value int64) FractionalMaxPoolAttr {
-	return func(m optionalAttr) {
-		m["seed2"] = value
-	}
-}
-
-// Performs fractional max pooling on the input.
-//
-// Fractional max pooling is slightly different than regular max pooling.  In
-// regular max pooling, you downsize an input set by taking the maximum value of
-// smaller N x N subsections of the set (often 2x2), and try to reduce the set by
-// a factor of N, where N is an integer.  Fractional max pooling, as you might
-// expect from the word "fractional", means that the overall reduction ratio N
-// does not have to be an integer.
-//
-// The sizes of the pooling regions are generated randomly but are fairly uniform.
-// For example, let's look at the height dimension, and the constraints on the
-// list of rows that will be pool boundaries.
-//
-// First we define the following:
-//
-// 1.  input_row_length : the number of rows from the input set
-// 2.  output_row_length : which will be smaller than the input
-// 3.  alpha = input_row_length / output_row_length : our reduction ratio
-// 4.  K = floor(alpha)
-// 5.  row_pooling_sequence : this is the result list of pool boundary rows
-//
-// Then, row_pooling_sequence should satisfy:
-//
-// 1.  a[0] = 0 : the first value of the sequence is 0
-// 2.  a[end] = input_row_length : the last value of the sequence is the size
-// 3.  K <= (a[i+1] - a[i]) <= K+1 : all intervals are K or K+1 size
-// 4.  length(row_pooling_sequence) = output_row_length+1
-//
-// For more details on fractional max pooling, see this paper:
-// [Benjamin Graham, Fractional Max-Pooling](http://arxiv.org/abs/1412.6071)
-//
-// Arguments:
-//	value: 4-D with shape `[batch, height, width, channels]`.
-//	pooling_ratio: Pooling ratio for each dimension of `value`, currently only
-// supports row and col dimension and should be >= 1.0. For example, a valid
-// pooling ratio looks like [1.0, 1.44, 1.73, 1.0]. The first and last elements
-// must be 1.0 because we don't allow pooling on batch and channels
-// dimensions. 1.44 and 1.73 are pooling ratio on height and width dimensions
-// respectively.
-//
-// Returns output tensor after fractional max pooling.row pooling sequence, needed to calculate gradient.column pooling sequence, needed to calculate gradient.
-func FractionalMaxPool(scope *Scope, value tf.Output, pooling_ratio []float32, optional ...FractionalMaxPoolAttr) (output tf.Output, row_pooling_sequence tf.Output, col_pooling_sequence tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"pooling_ratio": pooling_ratio}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "FractionalMaxPool",
-		Input: []tf.Input{
-			value,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
 // RandomCropAttr is an optional argument to RandomCrop.
 type RandomCropAttr func(optionalAttr)
 
@@ -18015,6 +18086,26 @@ func Lgamma(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
+// Returns x / y element-wise for real types.
+//
+// If `x` and `y` are reals, this will return the floating-point division.
+//
+// *NOTE*: `Div` supports broadcasting. More about broadcasting
+// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
+func RealDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "RealDiv",
+		Input: []tf.Input{
+			x, y,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Returns element-wise largest integer not greater than x.
 func Floor(scope *Scope, x tf.Output) (y tf.Output) {
 	if scope.Err() != nil {
@@ -21633,26 +21724,6 @@ func ReaderNumWorkUnitsCompletedV2(scope *Scope, reader_handle tf.Output) (units
 	return op.Output(0)
 }
 
-// Returns x / y element-wise for real types.
-//
-// If `x` and `y` are reals, this will return the floating-point division.
-//
-// *NOTE*: `Div` supports broadcasting. More about broadcasting
-// [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
-func RealDiv(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "RealDiv",
-		Input: []tf.Input{
-			x, y,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // ShapeAttr is an optional argument to Shape.
 type ShapeAttr func(optionalAttr)
 
-- 
GitLab


From 557ab679e730d250d665695d1556d5c2b25f7f07 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Tue, 9 May 2017 11:48:18 -0700
Subject: [PATCH 1163/1563] Docs: Cosmetic tweak to sample test code.

PiperOrigin-RevId: 155532810
---
 tensorflow/docs_src/install/install_java.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 55d9c2c08f..2a907b6e82 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -50,7 +50,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
          <project>
              <modelVersion>4.0.0</modelVersion>
              <groupId>org.myorg</groupId>
-             <artifactId>label-image</artifactId>
+             <artifactId>hellotf</artifactId>
              <version>1.0-SNAPSHOT</version>
              <properties>
                <exec.mainClass>HelloTF</exec.mainClass>
-- 
GitLab


From 1bad658d63e5fb21d321cd680e7451c96e032f7e Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Tue, 9 May 2017 12:32:41 -0700
Subject: [PATCH 1164/1563] Moved transform_features. removed pylint lines from
 test.

PiperOrigin-RevId: 155538004
---
 .../python/feature_column/feature_column.py   |  44 +++++
 .../feature_column/feature_column_test.py     | 171 +++++++++---------
 2 files changed, 132 insertions(+), 83 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 70c38574fb..6efab10efb 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -313,6 +313,50 @@ def make_linear_model(features,
     return predictions
 
 
+def _transform_features(features, feature_columns):
+  """Returns transformed features based on features columns passed in.
+
+  Please note that most probably you would not need to use this function. Please
+  check `make_input_layer` and `make_linear_model` to see whether they will
+  satisfy your use case or not.
+
+  Example:
+
+  ```python
+  # Define features and transformations
+  crosses_a_x_b = crossed_column(
+      columns=["sparse_feature_a", "sparse_feature_b"], hash_bucket_size=10000)
+  price_buckets = bucketized_column(
+      source_column=numeric_column("price"), boundaries=[...])
+
+  columns = [crosses_a_x_b, price_buckets]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  transformed = transform_features(features=features, feature_columns=columns)
+
+  assertCountEqual(columns, transformed.keys())
+  ```
+
+  Args:
+    features: A mapping from key to tensors. `FeatureColumn`s look up via these
+      keys. For example `numeric_column('price') will look at 'price' key in
+      this dict. Values can be a `SparseTensor` or a `Tensor` depends on
+      corresponding `FeatureColumn`.
+    feature_columns: An iterable containing all the `FeatureColumn`s.
+
+  Returns:
+    A `dict` mapping FeatureColumn to `Tensor` and `SparseTensor` values.
+  """
+  _check_feature_columns(feature_columns)
+  outputs = {}
+  with ops.name_scope(
+      None, default_name='transform_features', values=features.values()):
+    builder = _LazyBuilder(features)
+    for column in sorted(feature_columns, key=lambda x: x.name):
+      with ops.name_scope(None, default_name=column.name):
+        outputs[column] = builder.get(column)
+  return outputs
+
+
 def numeric_column(key,
                    shape=(1,),
                    default_value=None,
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 5201811831..bd9a7c8df8 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -274,12 +274,9 @@ class NumericColumnTest(test.TestCase):
       return input_tensor + 2.
 
     price = fc.numeric_column('price', shape=[2], normalizer_fn=_increment_two)
-    builder = fc._LazyBuilder({
-        'price': [[1., 2.], [5., 6.]]
-    })
-    output = builder.get(price)
+    output = fc._transform_features({'price': [[1., 2.], [5., 6.]]}, [price])
     with self.test_session():
-      self.assertAllEqual([[3., 4.], [7., 8.]], output.eval())
+      self.assertAllEqual([[3., 4.], [7., 8.]], output[price].eval())
 
   def test_get_dense_tensor(self):
 
@@ -403,12 +400,12 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[2])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      builder = fc._LazyBuilder({
+      transformed_tensor = fc._transform_features({
           'price': [[-1., 1.], [5., 6.]]
-      })
-      transformed_tensor = builder.get(bucketized_price)
+      }, [bucketized_price])
       with _initialized_session():
-        self.assertAllEqual([[0, 1], [3, 4]], transformed_tensor.eval())
+        self.assertAllEqual([[0, 1], [3, 4]],
+                            transformed_tensor[bucketized_price].eval())
 
   def test_get_dense_tensor_one_input_value(self):
     """Tests _get_dense_tensor() for input with shape=[1]."""
@@ -584,9 +581,7 @@ class HashedCategoricalColumnTest(test.TestCase):
     for column in (original, copy.deepcopy(original)):
       self.assertEqual('aaa', column.name)
       self.assertEqual(10, column.hash_bucket_size)
-      # pylint: disable=protected-access
       self.assertEqual(10, column._num_buckets)
-      # pylint: enable=protected-access
       self.assertEqual(dtypes.string, column.dtype)
 
   def test_parse_config(self):
@@ -607,8 +602,8 @@ class HashedCategoricalColumnTest(test.TestCase):
         values=['omar', 'stringer', 'marlo'],
         indices=[[0, 0], [1, 0], [1, 1]],
         dense_shape=[2, 2])
-    builder = fc._LazyBuilder({'wire': wire_tensor})
-    output = builder.get(hashed_sparse)
+    outputs = fc._transform_features({'wire': wire_tensor}, [hashed_sparse])
+    output = outputs[hashed_sparse]
     # Check exact hashed output. If hashing changes this test will break.
     expected_values = [6, 4, 1]
     with self.test_session():
@@ -1225,23 +1220,19 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
     column = fc.categorical_column_with_vocabulary_file(
         key='aaa', vocabulary_file='path_to_file', vocabulary_size=3)
     self.assertEqual('aaa', column.name)
-    # pylint: disable=protected-access
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.string)
     }, column._parse_example_config)
-    # pylint: enable=protected-access
 
   def test_all_constructor_args(self):
     column = fc.categorical_column_with_vocabulary_file(
         key='aaa', vocabulary_file='path_to_file', vocabulary_size=3,
         num_oov_buckets=4, dtype=dtypes.int32)
-    # pylint: disable=protected-access
     self.assertEqual(7, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int32)
     }, column._parse_example_config)
-    # pylint: enable=protected-access
 
   def test_deep_copy(self):
     """Tests deepcopy of categorical_column_with_hash_bucket."""
@@ -1250,12 +1241,10 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         num_oov_buckets=4, dtype=dtypes.int32)
     for column in (original, copy.deepcopy(original)):
       self.assertEqual('aaa', column.name)
-      # pylint: disable=protected-access
       self.assertEqual(7, column._num_buckets)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int32)
       }, column._parse_example_config)
-      # pylint: enable=protected-access
 
   def test_vocabulary_file_none(self):
     with self.assertRaisesRegexp(ValueError, 'Missing vocabulary_file'):
@@ -1274,9 +1263,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     with self.assertRaisesRegexp(errors.OpError, 'file_does_not_exist'):
       with self.test_session():
         lookup_ops.tables_initializer().run()
@@ -1304,9 +1291,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     with self.assertRaisesRegexp(errors.OpError, 'Invalid vocab_size'):
       with self.test_session():
         lookup_ops.tables_initializer().run()
@@ -1344,9 +1329,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         values=(12, 24, 36),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      # pylint: disable=protected-access
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
-      # pylint: enable=protected-access
 
   def test_invalid_input_dtype_string(self):
     column = fc.categorical_column_with_vocabulary_file(
@@ -1359,9 +1342,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         values=('omar', 'stringer', 'marlo'),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      # pylint: disable=protected-access
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
-      # pylint: enable=protected-access
 
   def test_get_sparse_tensors(self):
     column = fc.categorical_column_with_vocabulary_file(
@@ -1372,10 +1353,8 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1386,16 +1365,33 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
               dense_shape=inputs.dense_shape),
           id_weight_pair.id_tensor.eval())
 
+  def test_transform_feature(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    id_tensor = fc._transform_features({'aaa': inputs}, [column])[column]
+    with _initialized_session():
+      _assert_sparse_tensor_value(self,
+                                  sparse_tensor.SparseTensorValue(
+                                      indices=inputs.indices,
+                                      values=np.array(
+                                          (2, -1, 0), dtype=np.int64),
+                                      dense_shape=inputs.dense_shape),
+                                  id_tensor.eval())
+
   def test_get_sparse_tensors_dense_input(self):
     column = fc.categorical_column_with_vocabulary_file(
         key='aaa',
         vocabulary_file=self._wire_vocabulary_file_name,
         vocabulary_size=self._wire_vocabulary_size)
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
         'aaa': (('marlo', ''), ('skywalker', 'omar'))
     }))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1416,10 +1412,8 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1440,10 +1434,8 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (1, 2)),
         values=('marlo', 'skywalker', 'omar', 'heisenberg'),
         dense_shape=(2, 3))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1466,10 +1458,8 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1490,10 +1480,8 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (2, 2)),
         values=(11, 100, 30, 22),
         dense_shape=(3, 3))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1512,11 +1500,9 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         vocabulary_size=self._warriors_vocabulary_size,
         dtype=dtypes.int32,
         default_value=default_value)
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
         'aaa': ((11, -1, -1), (100, 30, -1), (-1, -1, 22))
     }))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1538,10 +1524,8 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (2, 2)),
         values=(11, 100, 30, 22),
         dense_shape=(3, 3))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1584,34 +1568,28 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
     self.assertEqual('aaa', column.name)
-    # pylint: disable=protected-access
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.string)
     }, column._parse_example_config)
-    # pylint: enable=protected-access
 
   def test_defaults_int(self):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa', vocabulary_list=(12, 24, 36))
     self.assertEqual('aaa', column.name)
-    # pylint: disable=protected-access
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int64)
     }, column._parse_example_config)
-    # pylint: enable=protected-access
 
   def test_all_constructor_args(self):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa', vocabulary_list=(12, 24, 36), dtype=dtypes.int32,
         default_value=-99)
-    # pylint: disable=protected-access
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int32)
     }, column._parse_example_config)
-    # pylint: enable=protected-access
 
   def test_deep_copy(self):
     """Tests deepcopy of categorical_column_with_hash_bucket."""
@@ -1619,12 +1597,10 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         key='aaa', vocabulary_list=(12, 24, 36), dtype=dtypes.int32)
     for column in (original, copy.deepcopy(original)):
       self.assertEqual('aaa', column.name)
-      # pylint: disable=protected-access
       self.assertEqual(3, column._num_buckets)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int32)
       }, column._parse_example_config)
-      # pylint: enable=protected-access
 
   def test_invalid_dtype(self):
     with self.assertRaisesRegexp(ValueError, 'dtype must be string or integer'):
@@ -1677,9 +1653,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         values=(12, 24, 36),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      # pylint: disable=protected-access
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
-      # pylint: enable=protected-access
 
   def test_invalid_input_dtype_string(self):
     column = fc.categorical_column_with_vocabulary_list(
@@ -1690,9 +1664,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         values=('omar', 'stringer', 'marlo'),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      # pylint: disable=protected-access
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
-      # pylint: enable=protected-access
 
   def test_get_sparse_tensors(self):
     column = fc.categorical_column_with_vocabulary_list(
@@ -1702,10 +1674,8 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1720,11 +1690,9 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa',
         vocabulary_list=('omar', 'stringer', 'marlo'))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
         'aaa': (('marlo', ''), ('skywalker', 'omar'))
     }))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1744,10 +1712,8 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1767,10 +1733,8 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (2, 2)),
         values=np.array((11, 100, 30, 22), dtype=np.int32),
         dense_shape=(3, 3))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1788,13 +1752,11 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         vocabulary_list=np.array((30, 35, 11, 23, 22), dtype=np.int32),
         dtype=dtypes.int32,
         default_value=default_value)
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
         'aaa': np.array(
             ((11, -1, -1), (100, 30, -1), (-1, -1, 22)),
             dtype=np.int32)
     }))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1834,24 +1796,20 @@ class IdentityCategoricalColumnTest(test.TestCase):
   def test_constructor(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
     self.assertEqual('aaa', column.name)
-    # pylint: disable=protected-access
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int64)
     }, column._parse_example_config)
-    # pylint: enable=protected-access
 
   def test_deep_copy(self):
     """Tests deepcopy of categorical_column_with_hash_bucket."""
     original = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
     for column in (original, copy.deepcopy(original)):
       self.assertEqual('aaa', column.name)
-      # pylint: disable=protected-access
       self.assertEqual(3, column._num_buckets)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int64)
       }, column._parse_example_config)
-      # pylint: enable=protected-access
 
   def test_invalid_num_buckets_zero(self):
     with self.assertRaisesRegexp(ValueError, 'num_buckets 0 < 1'):
@@ -1878,9 +1836,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         values=('omar', 'stringer', 'marlo'),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'Invalid input, not integer'):
-      # pylint: disable=protected-access
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
-      # pylint: enable=protected-access
 
   def test_get_sparse_tensors(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
@@ -1888,10 +1844,8 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(0, 1, 0),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1904,11 +1858,9 @@ class IdentityCategoricalColumnTest(test.TestCase):
 
   def test_get_sparse_tensors_dense_input(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
         'aaa': ((0, -1), (1, 0))
     }))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1925,10 +1877,8 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(1, -1, 0),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       with self.assertRaisesRegexp(
@@ -1941,10 +1891,8 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(1, 99, 0),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       with self.assertRaisesRegexp(
@@ -1958,10 +1906,8 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(1, -1, 99),
         dense_shape=(2, 2))
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1982,10 +1928,8 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=input_indices,
         values=input_values,
         dense_shape=input_shape)
-    # pylint: disable=protected-access
     id_weight_pair = column._get_sparse_tensors(
         fc._LazyBuilder({'aaa': inputs}))
-    # pylint: enable=protected-access
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2022,5 +1966,66 @@ class IdentityCategoricalColumnTest(test.TestCase):
         self.assertAllClose(((1.,), (5.,)), predictions.eval())
 
 
+class TransformFeaturesTest(test.TestCase):
+
+  # All transform tests are distributed in column test.
+  # Here we only test multi column case and naming
+  def transform_multi_column(self):
+    bucketized_price = fc.bucketized_column(
+        fc.numeric_column('price'), boundaries=[0, 2, 4, 6])
+    hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
+    with ops.Graph().as_default():
+      features = {
+          'price': [[-1.], [5.]],
+          'wire':
+              sparse_tensor.SparseTensor(
+                  values=['omar', 'stringer', 'marlo'],
+                  indices=[[0, 0], [1, 0], [1, 1]],
+                  dense_shape=[2, 2])
+      }
+      transformed = fc._transform_features(features,
+                                           [bucketized_price, hashed_sparse])
+      with _initialized_session():
+        self.assertIn(bucketized_price.name, transformed[bucketized_price].name)
+        self.assertAllEqual([[0], [3]], transformed[bucketized_price].eval())
+        self.assertIn(hashed_sparse.name, transformed[hashed_sparse].name)
+        self.assertAllEqual([6, 4, 1], transformed[hashed_sparse].values.eval())
+
+  def test_column_order(self):
+    """When the column is both dense and sparse, uses sparse tensors."""
+
+    class _LoggerColumn(fc._FeatureColumn):
+
+      def __init__(self, name):
+        self._name = name
+
+      @property
+      def name(self):
+        return self._name
+
+      def _transform_feature(self, inputs):
+        del inputs
+        self.call_order = call_logger['count']
+        call_logger['count'] += 1
+        return 'Anything'
+
+      @property
+      def _parse_example_config(self):
+        pass
+
+    with ops.Graph().as_default():
+      column1 = _LoggerColumn('1')
+      column2 = _LoggerColumn('2')
+      call_logger = {'count': 0}
+      fc._transform_features({}, [column1, column2])
+      self.assertEqual(0, column1.call_order)
+      self.assertEqual(1, column2.call_order)
+
+      call_logger = {'count': 0}
+      fc._transform_features({}, [column2, column1])
+      self.assertEqual(0, column1.call_order)
+      self.assertEqual(1, column2.call_order)
+
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From cc2faf81f988ffcf49269fdc68f27eef07a3ae2c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 13:00:22 -0700
Subject: [PATCH 1165/1563] Automated g4 rollback of changelist 155433842

PiperOrigin-RevId: 155541065
---
 .../compiler/xla/service/hlo_evaluator.cc     | 822 ++++++++----------
 .../compiler/xla/service/hlo_evaluator.h      |  64 +-
 2 files changed, 378 insertions(+), 508 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
index e0447d69aa..1b3babc214 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -46,485 +46,138 @@ limitations under the License.
 
 namespace xla {
 
-template <typename ReturnT>
-class HloEvaluator::TypedVisitor : public DfsHloVisitorWithDefault {
- public:
-  explicit TypedVisitor(HloEvaluator* p) : parent_(p) {}
-
-  Status DefaultAction(HloInstruction* hlo_instruction) override {
-    return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
-                         HloOpcodeString(hlo_instruction->opcode()).c_str());
-  };
-
-  // TODO(b/35950897): many of the stl functions used in the handlers are not
-  // overloaded for every XLA primitive types.
-
-  template <typename NativeT,
-            typename std::enable_if<std::is_unsigned<NativeT>::value>::type* =
-                nullptr>
-  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[abs],
-                        ElementWiseUnaryOp(abs, [](NativeT elem_operand) {
-                          return elem_operand;
-                        }));
-    return Status::OK();
-  };
-
-  template <
-      typename NativeT,
-      typename std::enable_if<std::is_signed<NativeT>::value>::type* = nullptr>
-  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[abs],
-                        ElementWiseUnaryOp(abs, [](NativeT elem_operand) {
-                          return std::abs(elem_operand);
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) override {
-    return HandleAbs<ReturnT>(abs, operand);
-  };
-
-  Status HandleCeil(HloInstruction* ceil, HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[ceil],
-                        ElementWiseUnaryOp(ceil, [](ReturnT elem_operand) {
-                          return std::ceil(elem_operand);
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleCopy(HloInstruction* copy, HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[copy],
-                        ElementWiseUnaryOp(copy, [](ReturnT elem_operand) {
-                          return elem_operand;
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleExp(HloInstruction* exp, HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[exp],
-                        ElementWiseUnaryOp(exp, [](ReturnT elem_operand) {
-                          return std::exp(elem_operand);
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleFloor(HloInstruction* floor, HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[floor],
-                        ElementWiseUnaryOp(floor, [](ReturnT elem_operand) {
-                          return std::floor(elem_operand);
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleIsFinite(HloInstruction* is_finite,
-                        HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[is_finite],
-                        ElementWiseUnaryOp(is_finite, [](ReturnT elem_operand) {
-                          return std::isfinite(elem_operand);
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleLog(HloInstruction* log, HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[log],
-                        ElementWiseUnaryOp(log, [](ReturnT elem_operand) {
-                          return std::log(elem_operand);
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleLogicalNot(HloInstruction* logical_not,
-                          HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[logical_not],
-        ElementWiseUnaryOp(logical_not,
-                           [](ReturnT elem_operand) { return !elem_operand; }));
-    return Status::OK();
-  };
-
-  Status HandleNegate(HloInstruction* negate,
-                      HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[negate],
-                        ElementWiseUnaryOp(negate, [](ReturnT elem_operand) {
-                          return -elem_operand;
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleSign(HloInstruction* sign, HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[sign],
-                        ElementWiseUnaryOp(sign, [](ReturnT elem_operand) {
-                          return (ReturnT(0) < elem_operand) -
-                                 (elem_operand < ReturnT(0));
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleTanh(HloInstruction* tanh, HloInstruction* operand) override {
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[tanh],
-                        ElementWiseUnaryOp(tanh, [](ReturnT elem_operand) {
-                          return std::tanh(elem_operand);
-                        }));
-    return Status::OK();
-  };
-
-  Status HandleMultiply(HloInstruction* multiply, HloInstruction* lhs,
-                        HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[multiply],
-        ElementWiseBinaryOp(multiply, [](ReturnT lhs_elem, ReturnT rhs_elem) {
-          return lhs_elem * rhs_elem;
-        }));
-    return Status::OK();
-  };
-
-  Status HandleSubtract(HloInstruction* subtract, HloInstruction* lhs,
-                        HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[subtract],
-        ElementWiseBinaryOp(subtract, [](ReturnT lhs_elem, ReturnT rhs_elem) {
-          return lhs_elem - rhs_elem;
-        }));
-    return Status::OK();
-  };
-
-  Status HandleAdd(HloInstruction* add, HloInstruction* lhs,
-                   HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[add],
-        ElementWiseBinaryOp(add, [](ReturnT lhs_elem, ReturnT rhs_elem) {
-          return lhs_elem + rhs_elem;
-        }));
-    return Status::OK();
-  };
-
-  Status HandleDivide(HloInstruction* divide, HloInstruction* lhs,
-                      HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[divide],
-        ElementWiseBinaryOp(divide, [](ReturnT lhs_elem, ReturnT rhs_elem) {
-          return lhs_elem / rhs_elem;
-        }));
-    return Status::OK();
-  };
-
-  Status HandleCompare(HloInstruction* compare, HloOpcode opcode,
-                       HloInstruction* lhs, HloInstruction* rhs) override {
-    std::function<bool(ReturnT, ReturnT)> compare_op;
-    switch (opcode) {
-      case HloOpcode::kEq:
-        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el == rhs_el;
-        };
-        break;
-      case HloOpcode::kNe:
-        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el != rhs_el;
-        };
-        break;
-      case HloOpcode::kGe:
-        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el >= rhs_el;
-        };
-        break;
-      case HloOpcode::kGt:
-        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el > rhs_el;
-        };
-        break;
-      case HloOpcode::kLe:
-        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el <= rhs_el;
-        };
-        break;
-      case HloOpcode::kLt:
-        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el < rhs_el;
-        };
-        break;
-      default:
-        LOG(FATAL) << "unhandled HLO opcode for conversion to Comparison: "
-                   << HloOpcodeString(opcode);
-    }
+namespace {
 
-    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
-    // removed.
-    if (!(ShapeUtil::SameDimensions(compare->shape(), rhs->shape()) &&
-          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()))) {
-      return Unimplemented(
-          "Compare operation with mismatched dimensions, likely due to "
-          "broadcasting is unsupported.");
-    }
+template <typename NativeT>
+std::unique_ptr<Literal> ElementWiseUnaryOp(
+    const Shape& shape, std::function<NativeT(NativeT)>&& unary_op,
+    const Literal& operand) {
+  DCHECK(ShapeUtil::SameDimensions(shape, operand.shape()));
 
-    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
-    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
-
-    auto result = LiteralUtil::CreateFromShape(compare->shape());
-    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-    do {
-      LiteralUtil::Set<bool>(
-          result.get(), multi_index,
-          compare_op(LiteralUtil::Get<ReturnT>(lhs_literal, multi_index),
-                     LiteralUtil::Get<ReturnT>(rhs_literal, multi_index)));
-    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-    parent_->evaluated_[compare] = std::move(result);
-
-    return Status::OK();
-  };
-
-  Status HandleMaximum(HloInstruction* maximum, HloInstruction* lhs,
-                       HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[maximum],
-        ElementWiseBinaryOp(maximum, [](ReturnT lhs, ReturnT rhs) {
-          return std::max(lhs, rhs);
-        }));
-    return Status::OK();
-  };
-
-  Status HandleMinimum(HloInstruction* minimum, HloInstruction* lhs,
-                       HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[minimum],
-        ElementWiseBinaryOp(minimum, [](ReturnT lhs_el, ReturnT rhs_el) {
-          return std::min(lhs_el, rhs_el);
-        }));
-    return Status::OK();
-  };
-
-  Status HandlePower(HloInstruction* power, HloInstruction* lhs,
-                     HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[power],
-        ElementWiseBinaryOp(power, [](ReturnT lhs_el, ReturnT rhs_el) {
-          return std::pow(lhs_el, rhs_el);
-        }));
-    return Status::OK();
-  };
-
-  Status HandleRemainder(HloInstruction* remainder, HloInstruction* lhs,
-                         HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[remainder],
-        ElementWiseBinaryOp(remainder, [](ReturnT lhs_el, ReturnT rhs_el) {
-          return std::remainder(lhs_el, rhs_el);
-        }));
-    return Status::OK();
-  };
-
-  Status HandleLogicalAnd(HloInstruction* logical_and, HloInstruction* lhs,
-                          HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[logical_and],
-        ElementWiseBinaryOp(logical_and, [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el && rhs_el;
-        }));
-    return Status::OK();
-  };
-
-  Status HandleLogicalOr(HloInstruction* logical_or, HloInstruction* lhs,
-                         HloInstruction* rhs) override {
-    TF_ASSIGN_OR_RETURN(
-        parent_->evaluated_[logical_or],
-        ElementWiseBinaryOp(logical_or, [](ReturnT lhs_el, ReturnT rhs_el) {
-          return lhs_el || rhs_el;
-        }));
-    return Status::OK();
-  };
-
-  Status HandleClamp(HloInstruction* clamp, HloInstruction* min,
-                     HloInstruction* arg, HloInstruction* max) override {
-    std::function<ReturnT(ReturnT, ReturnT, ReturnT)> clamp_op =
-        [](ReturnT low, ReturnT high, ReturnT value) {
-          return std::max(low, std::min(value, high));
-        };
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[clamp],
-                        ElementWiseTernaryOp(clamp, std::move(clamp_op)));
-    return Status::OK();
-  };
-
-  Status HandleSelect(HloInstruction* select, HloInstruction* pred,
-                      HloInstruction* on_true,
-                      HloInstruction* on_false) override {
-    CHECK(!ShapeUtil::IsTuple(select->shape()));
-    std::function<ReturnT(bool, ReturnT, ReturnT)> select_op =
-        [](bool pred, ReturnT on_true, ReturnT on_false) {
-          if (pred) {
-            return on_true;
-          }
-          return on_false;
-        };
-    TF_ASSIGN_OR_RETURN(parent_->evaluated_[select],
-                        ElementWiseTernaryOp(select, std::move(select_op)));
-    return Status::OK();
-  };
-
-  Status Preprocess(HloInstruction* hlo) override {
-    VLOG(2) << hlo->ToString();
-    return Status::OK();
-  };
-
- private:
-  StatusOr<std::unique_ptr<Literal>> ElementWiseUnaryOp(
-      HloInstruction* instruction,
-      const std::function<ReturnT(ReturnT)>& unary_op) {
-    const auto shape = instruction->shape();
-    const auto* operand = instruction->operand(0);
-
-    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
-    // removed.
-    if (!ShapeUtil::SameDimensions(shape, operand->shape())) {
-      return Unimplemented(
-          "Implicit broadcasting is currently unsupported in HLO evaluator "
-          "Shape Mismatch: %s vs %s",
-          ShapeUtil::HumanString(shape).c_str(),
-          ShapeUtil::HumanString(operand->shape()).c_str());
-    }
+  auto result = LiteralUtil::CreateFromShape(shape);
 
-    const Literal& operand_literal = parent_->GetEvaluatedLiteralFor(operand);
-
-    auto result = LiteralUtil::CreateFromShape(shape);
-
-    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-    do {
-      LiteralUtil::Set<ReturnT>(
-          result.get(), multi_index,
-          unary_op(LiteralUtil::Get<ReturnT>(operand_literal, multi_index)));
-    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-    return std::move(result);
-  };
-
-  StatusOr<std::unique_ptr<Literal>> ElementWiseBinaryOp(
-      HloInstruction* instruction,
-      const std::function<ReturnT(ReturnT, ReturnT)>& binary_op) {
-    const auto shape = instruction->shape();
-    const auto* lhs = instruction->operand(0);
-    const auto* rhs = instruction->operand(1);
-
-    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
-    // removed.
-    if (!(ShapeUtil::SameDimensions(shape, rhs->shape()) &&
-          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()))) {
-      return Unimplemented(
-          "Implicit broadcasting is currently unsupported in HLO evaluator "
-          "Shape Mismatch: %s vs %s vs %s: ",
-          ShapeUtil::HumanString(shape).c_str(),
-          ShapeUtil::HumanString(lhs->shape()).c_str(),
-          ShapeUtil::HumanString(rhs->shape()).c_str());
-    }
+  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+  do {
+    LiteralUtil::Set<NativeT>(
+        result.get(), multi_index,
+        unary_op(LiteralUtil::Get<NativeT>(operand, multi_index)));
+  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
 
-    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
-    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
-
-    auto result = LiteralUtil::CreateFromShape(shape);
-    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-    do {
-      LiteralUtil::Set<ReturnT>(
-          result.get(), multi_index,
-          binary_op(LiteralUtil::Get<ReturnT>(lhs_literal, multi_index),
-                    LiteralUtil::Get<ReturnT>(rhs_literal, multi_index)));
-    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-    return std::move(result);
-  };
-
-  template <typename LhsType, typename RhsType, typename EhsType>
-  StatusOr<std::unique_ptr<Literal>> ElementWiseTernaryOp(
-      HloInstruction* instruction,
-      const std::function<ReturnT(LhsType, RhsType, EhsType)>& ternary_op) {
-    const auto shape = instruction->shape();
-    const auto* lhs = instruction->operand(0);
-    const auto* rhs = instruction->operand(1);
-    const auto* ehs = instruction->operand(2);
-
-    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
-    // removed.
-    if (!(ShapeUtil::SameDimensions(shape, lhs->shape()) &&
-          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()) &&
-          ShapeUtil::SameDimensions(rhs->shape(), ehs->shape()))) {
-      return Unimplemented(
-          "Implicit broadcasting is currently unsupported in HLO evaluator "
-          "Shape Mismatch: %s vs %s vs %s vs %s: ",
-          ShapeUtil::HumanString(shape).c_str(),
-          ShapeUtil::HumanString(lhs->shape()).c_str(),
-          ShapeUtil::HumanString(rhs->shape()).c_str(),
-          ShapeUtil::HumanString(ehs->shape()).c_str());
-    }
+  return result;
+}
+
+template <typename NativeT>
+std::unique_ptr<Literal> ElementWiseBinaryOp(
+    const Shape& shape, std::function<NativeT(NativeT, NativeT)>&& binary_op,
+    const Literal& lhs, const Literal& rhs) {
+  DCHECK(ShapeUtil::SameDimensions(shape, rhs.shape()));
+  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
+
+  auto result = LiteralUtil::CreateFromShape(shape);
+
+  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+  do {
+    LiteralUtil::Set<NativeT>(
+        result.get(), multi_index,
+        binary_op(LiteralUtil::Get<NativeT>(lhs, multi_index),
+                  LiteralUtil::Get<NativeT>(rhs, multi_index)));
+  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+  return result;
+}
+
+template <typename NativeT, typename LhsType, typename RhsType,
+          typename EhsType>
+std::unique_ptr<Literal> ElementWiseTernaryOp(
+    const Shape& shape,
+    std::function<NativeT(LhsType lhs, RhsType rhs, EhsType ehs)>&& ternary_op,
+    const Literal& lhs, const Literal& rhs, const Literal& ehs) {
+  DCHECK(ShapeUtil::SameDimensions(shape, lhs.shape()));
+  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
+  DCHECK(ShapeUtil::SameDimensions(rhs.shape(), ehs.shape()));
+
+  auto result = LiteralUtil::CreateFromShape(shape);
+
+  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+  do {
+    LiteralUtil::Set<NativeT>(
+        result.get(), multi_index,
+        ternary_op(LiteralUtil::Get<LhsType>(lhs, multi_index),
+                   LiteralUtil::Get<RhsType>(rhs, multi_index),
+                   LiteralUtil::Get<EhsType>(ehs, multi_index)));
+  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+  return result;
+}
+
+// Templated abs so that unsigned types can be passed in without warning.
+template <
+    typename NativeT,
+    typename std::enable_if<std::is_unsigned<NativeT>::value>::type* = nullptr>
+NativeT AbsoluteVal(NativeT value) {
+  return value;
+}
+
+template <
+    typename NativeT,
+    typename std::enable_if<std::is_signed<NativeT>::value>::type* = nullptr>
+NativeT AbsoluteVal(NativeT value) {
+  return std::abs(value);
+}
+
+}  // namespace
+
+Status HloEvaluator::DefaultAction(HloInstruction* hlo) {
+  VLOG(2) << "Handle instruction: " << hlo->ToString();
+  Shape shape = hlo->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+
+  TF_ASSIGN_OR_RETURN(evaluated_[hlo], EvaluateBasedOnType(hlo));
+  return Status::OK();
+}
+
+Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
+  VLOG(2) << "HandleParameter: " << parameter->ToString();
+  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
+  VLOG(2) << "Parameter evaluated to: "
+          << LiteralUtil::ToString(*input_literal);
+  CHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
+
+  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
+  return Status::OK();
+}
+
+Status HloEvaluator::HandleConstant(HloInstruction* constant,
+                                    const Literal& literal) {
+  VLOG(2) << "HandleConstant: " << constant->ToString();
+  CHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
 
-    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
-    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
-    const Literal& ehs_literal = parent_->GetEvaluatedLiteralFor(ehs);
-
-    auto result = LiteralUtil::CreateFromShape(shape);
-    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-    do {
-      LiteralUtil::Set<ReturnT>(
-          result.get(), multi_index,
-          ternary_op(LiteralUtil::Get<LhsType>(lhs_literal, multi_index),
-                     LiteralUtil::Get<RhsType>(rhs_literal, multi_index),
-                     LiteralUtil::Get<EhsType>(ehs_literal, multi_index)));
-    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-    return std::move(result);
-  };
-
-  HloEvaluator* parent_;
-};
-
-HloEvaluator::HloEvaluator() {
-  typed_visitors_[PRED] = MakeUnique<TypedVisitor<bool>>(this);
-  typed_visitors_[U8] = MakeUnique<TypedVisitor<uint8>>(this);
-  typed_visitors_[U16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
-    return Unimplemented("unhandled primitive type: U16.");
-  });
-  typed_visitors_[U32] = MakeUnique<TypedVisitor<uint32>>(this);
-  typed_visitors_[U64] = MakeUnique<TypedVisitor<uint64>>(this);
-  typed_visitors_[S8] = MakeUnique<TypedVisitor<int8>>(this);
-  typed_visitors_[S16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
-    return Unimplemented("unhandled primitive type: S16.");
-  });
-  typed_visitors_[S32] = MakeUnique<TypedVisitor<int32>>(this);
-  typed_visitors_[S64] = MakeUnique<TypedVisitor<int64>>(this);
-  typed_visitors_[F16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
-    return Unimplemented("unhandled primitive type: F16.");
-  });
-  typed_visitors_[F32] = MakeUnique<TypedVisitor<float>>(this);
-  typed_visitors_[F64] = MakeUnique<TypedVisitor<double>>(this);
+  evaluated_[constant] = MakeUnique<Literal>(literal);
+  return Status::OK();
 }
 
 StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
     HloComputation* computation,
     tensorflow::gtl::ArraySlice<const Literal*> args) {
   arg_literals_ = args;
-  evaluated_.clear();
-
   TF_RETURN_IF_ERROR(computation->Accept(this));
   return std::move(FindOrDie(evaluated_, computation->root_instruction()));
 }
 
 StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
     HloInstruction* instruction,
-    tensorflow::gtl::ArraySlice<const Literal*> operands) {
+    tensorflow::gtl::ArraySlice<const Literal*> args) {
   DCHECK(hlo_query::AllOperandsAreParametersOrConstants(*instruction));
   Shape shape = instruction->shape();
   TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
 
-  arg_literals_ = operands;
-  evaluated_.clear();
+  arg_literals_ = args;
 
-  // Evaluate operands of Parameter type against the input literals which
-  // caches the evaluated literal results.
+  // Evaluate operands of Parameter type against the input literals which caches
+  // the evaluated literal results.
   for (const auto operand : instruction->operands()) {
     if (operand->opcode() == HloOpcode::kParameter) {
-      const Literal* input_literal = arg_literals_[operand->parameter_number()];
-      VLOG(2) << "Parameter operand evaluated to: "
-              << LiteralUtil::ToString(*input_literal);
-      TF_RET_CHECK(ShapeUtil::Equal(operand->shape(), input_literal->shape()));
-
-      evaluated_[operand] = MakeUnique<Literal>(*input_literal);
+      TF_CHECK_OK(HandleParameter(operand));
     } else if (operand->opcode() == HloOpcode::kConstant) {
       evaluated_[operand] = MakeUnique<Literal>(operand->literal());
     }
@@ -534,24 +187,253 @@ StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
   return std::move(FindOrDie(evaluated_, instruction));
 }
 
-Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
-  VLOG(2) << "HandleParameter: " << parameter->ToString();
-  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
-  VLOG(2) << "Parameter evaluated to: "
-          << LiteralUtil::ToString(*input_literal);
-  DCHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateBasedOnType(
+    HloInstruction* instruction) {
+  Shape shape = instruction->shape();
+  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
 
-  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
-  return Status::OK();
+  switch (shape.element_type()) {
+    case PRED:
+      return EvaluateSameTypedElementwise<bool>(instruction);
+    case U8:
+      return EvaluateSameTypedElementwise<uint8>(instruction);
+    case U16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(U16).c_str());
+    case U32:
+      return EvaluateSameTypedElementwise<uint32>(instruction);
+    case U64:
+      return EvaluateSameTypedElementwise<uint64>(instruction);
+    case S8:
+      return EvaluateSameTypedElementwise<int8>(instruction);
+    case S16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(S16).c_str());
+    case S32:
+      return EvaluateSameTypedElementwise<int32>(instruction);
+    case S64:
+      return EvaluateSameTypedElementwise<int64>(instruction);
+    case F16:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(F16).c_str());
+    case F32:
+      return EvaluateSameTypedElementwise<float>(instruction);
+    case F64:
+      return EvaluateSameTypedElementwise<double>(instruction);
+    default:
+      return Unimplemented("unhandled primitive type: %s.",
+                           PrimitiveType_Name(shape.element_type()).c_str());
+  }
 }
 
-Status HloEvaluator::HandleConstant(HloInstruction* constant,
-                                    const Literal& literal) {
-  VLOG(2) << "HandleConstant: " << constant->ToString();
-  DCHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
-
-  evaluated_[constant] = MakeUnique<Literal>(literal);
-  return Status::OK();
+template <typename NativeT>
+StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateSameTypedElementwise(
+    HloInstruction* instruction) {
+  const std::vector<HloInstruction*>& operands = instruction->operands();
+  HloOpcode opcode = instruction->opcode();
+  const Shape& shape = instruction->shape();
+
+  switch (opcode) {
+    // TODO(b/35950897): many of the stl function used here are not overloaded
+    // for every XLA primitive types.
+
+    // Unary element-wise ops.
+    //
+    case HloOpcode::kAbs:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return AbsoluteVal(operand); },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kCeil:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::ceil(operand); },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kConvert:
+      CHECK_EQ(operands.size(), 1);
+      // TODO(b/35950897): implement Convert.
+      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
+                           HloOpcodeString(opcode).c_str());
+    case HloOpcode::kCopy:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return operand; },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kExp:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::exp(operand); },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kFloor:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::floor(operand); },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kIsFinite:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::isfinite(operand); },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kLog:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::log(operand); },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kLogicalNot:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return !operand; },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kNegate:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return -operand; },
+          GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kSign:
+      CHECK_EQ(operands.size(), 1);
+      CHECK(primitive_util::IsIntegralType(shape.element_type()));
+      return ElementWiseUnaryOp<int>(shape,
+                                     [](NativeT operand) {
+                                       return (NativeT(0) < operand) -
+                                              (operand < NativeT(0));
+                                     },
+                                     GetEvaluatedLiteralFor(operands[0]));
+    case HloOpcode::kTanh:
+      CHECK_EQ(operands.size(), 1);
+      return ElementWiseUnaryOp<NativeT>(
+          shape, [](NativeT operand) { return std::tanh(operand); },
+          GetEvaluatedLiteralFor(operands[0]));
+    // Binary element-wise ops.
+    //
+    case HloOpcode::kAdd:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs + rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kDivide:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs / rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kMultiply:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs * rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kSubtract:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs - rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kEq:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs == rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kGe:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs >= rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kGt:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs > rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kLe:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs <= rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kLt:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs < rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kNe:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<bool>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs != rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kMaximum:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return std::max(lhs, rhs); },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kMinimum:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return std::min(lhs, rhs); },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kPower:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return std::pow(lhs, rhs); },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kRemainder:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape,
+          [](NativeT lhs, NativeT rhs) { return std::remainder(lhs, rhs); },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kLogicalAnd:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs && rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    case HloOpcode::kLogicalOr:
+      CHECK_EQ(operands.size(), 2);
+      return ElementWiseBinaryOp<NativeT>(
+          shape, [](NativeT lhs, NativeT rhs) { return lhs || rhs; },
+          GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]));
+    // Ternary element-wise ops.
+    //
+    case HloOpcode::kClamp: {
+      CHECK_EQ(operands.size(), 3);
+      std::function<NativeT(NativeT, NativeT, NativeT)> clamp_op =
+          [](NativeT low, NativeT high, NativeT value) {
+            return std::max(low, std::min(value, high));
+          };
+      return ElementWiseTernaryOp<NativeT, NativeT, NativeT, NativeT>(
+          shape, std::move(clamp_op), GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]),
+          GetEvaluatedLiteralFor(operands[2]));
+    } break;
+    case HloOpcode::kSelect: {
+      CHECK_EQ(operands.size(), 3);
+      CHECK(!ShapeUtil::IsTuple(shape));
+      std::function<NativeT(bool, NativeT, NativeT)> select_op =
+          [](bool pred, NativeT on_true, NativeT on_false) {
+            if (pred) {
+              return on_true;
+            }
+            return on_false;
+          };
+      return ElementWiseTernaryOp<NativeT, bool, NativeT, NativeT>(
+          shape, std::move(select_op), GetEvaluatedLiteralFor(operands[0]),
+          GetEvaluatedLiteralFor(operands[1]),
+          GetEvaluatedLiteralFor(operands[2]));
+    } break;
+    default:
+      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
+                           HloOpcodeString(opcode).c_str());
+  }
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.h b/tensorflow/compiler/xla/service/hlo_evaluator.h
index e93cb0fc39..6372a6c269 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.h
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.h
@@ -35,21 +35,13 @@ namespace xla {
 // This class is not thread-safe.
 class HloEvaluator : public DfsHloVisitorWithDefault {
  public:
-  HloEvaluator();
+  HloEvaluator() {}
+  ~HloEvaluator() override {}
+
   // Evaluates a HLO computation and an array of pointers to literals.
   // Return the evaluated result as literal if successful.
-  // Precondition: argument literals are corresponds to the input computation's
-  // parameters in their post-ordering. For e.g., consider the following graph:
-  //
-  //                *
-  //            /       \
-  //            +     Parameter1
-  //        /      \
-  //       /        \
-  //    Parameter0  Constant
-  //
-  // The input literals array will have its first literal map to Parameter0 and
-  // the second map to Parameter1.
+  // Precondition: argument literals are in post-order corresponding to the
+  // input instruction's parameters.
   StatusOr<std::unique_ptr<Literal>> Evaluate(
       HloComputation* computation,
       tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
@@ -57,36 +49,40 @@ class HloEvaluator : public DfsHloVisitorWithDefault {
   // Evaluates a single HLO instruction and an array of pointers to literals.
   // Return the evaluated result as literal if successful.
   // Precondition:
-  // 1. argument literals are corresponds to the input instruction's
-  // parameters in their post-orderring.
+  // 1. argument literals are in post-order corresponding to the input
+  // instruction's parameters.
   // 2. the instruction's operands must be of either Parameter or Constant type.
   // TODO(b/35950897): implement more ops other than element-wise ops.
+  // TODO(b/35950897): handle broadcasts.
   StatusOr<std::unique_ptr<Literal>> Evaluate(
       HloInstruction* instruction,
       tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
 
  protected:
-  // Templated DfsHloVisitor. Typically ReturnT here indicates the resulting
-  // literal type of each evaluated Handle* method of a TypedVisitor. One
-  // exception to this is HandleCompare, where the resulting literal type is
-  // always boolean.
-  // Note the forward declaration here is necessary to enable TypedVisitor to
-  // access parent members.
-  template <typename ReturnT>
-  class TypedVisitor;
-
-  // Wraps around instruction handling to infer types before dispatching to
-  // the corresponding typed Visitor.
-  Status DefaultAction(HloInstruction* hlo) override {
-    return hlo->Visit(typed_visitors_.at(hlo->shape().element_type()).get());
-  }
+  // The following methods implement the DfsHloVisitor interface.
+  //
+  // DefaultAction here handles all non-specificialized (i.e., instruction
+  // without corresponding Handle* method) instructions.
+  // TODO(b/35950897): it's likely better to refactor the switches here and push
+  // up the switch to templated methods instead, likely at DfsHloVisitor level.
+  Status DefaultAction(HloInstruction* hlo_instruction) override;
 
   Status HandleParameter(HloInstruction* parameter) override;
-
   Status HandleConstant(HloInstruction* constant,
                         const Literal& literal) override;
 
  private:
+  // Evaluates a single HLO instruction return the result as a Literal if
+  // successful. A Status will be returned on error.
+  StatusOr<std::unique_ptr<Literal>> EvaluateBasedOnType(
+      HloInstruction* instruction);
+
+  // Evaluates an element-wise HLO instruction that has the same output literal
+  // type as the operands' types.
+  template <typename NativeT>
+  StatusOr<std::unique_ptr<Literal>> EvaluateSameTypedElementwise(
+      HloInstruction* instruction);
+
   // Returns the already-evaluated literal result for the instruction.
   // Crash with log if the given instruction has not been evaluated previously.
   const Literal& GetEvaluatedLiteralFor(const HloInstruction* hlo) {
@@ -96,17 +92,9 @@ class HloEvaluator : public DfsHloVisitorWithDefault {
     return *(it->second);
   }
 
-  // Map from a primitive type to its associated (templated) DfsHloVisitor.
-  tensorflow::gtl::FlatMap<PrimitiveType, std::unique_ptr<DfsHloVisitor>>
-      typed_visitors_;
-
   // Tracks the HLO instruciton and its evaluated literal result.
-  // TODO(b/35950897): have better memory management here to free instructions
-  // that are no longer a parent for any other subsequent instruction in
-  // post-orderring.
   tensorflow::gtl::FlatMap<const HloInstruction*, std::unique_ptr<Literal>>
       evaluated_;
-
   // Stores input literals, assuming they are in post-order. Literals are not
   // owned by this class, and they must outlive the lifetime of the instance of
   // this class.
-- 
GitLab


From 98469c23b2f289997c69c0f0bebdb35788ce6bb1 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 9 May 2017 13:58:56 -0700
Subject: [PATCH 1166/1563] Cleaned up the includes of the graph runner.

PiperOrigin-RevId: 155548015
---
 tensorflow/core/common_runtime/graph_runner.cc | 1 +
 tensorflow/core/common_runtime/graph_runner.h  | 9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/common_runtime/graph_runner.cc b/tensorflow/core/common_runtime/graph_runner.cc
index a85fbbf88f..74b2252c7c 100644
--- a/tensorflow/core/common_runtime/graph_runner.cc
+++ b/tensorflow/core/common_runtime/graph_runner.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/common_runtime/graph_runner.h"
 
+#include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/common_runtime/executor.h"
 #include "tensorflow/core/common_runtime/function.h"
 #include "tensorflow/core/common_runtime/memory_types.h"
diff --git a/tensorflow/core/common_runtime/graph_runner.h b/tensorflow/core/common_runtime/graph_runner.h
index 24e8b04c46..1e4ae77227 100644
--- a/tensorflow/core/common_runtime/graph_runner.h
+++ b/tensorflow/core/common_runtime/graph_runner.h
@@ -20,17 +20,12 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "tensorflow/core/common_runtime/device_factory.h"
+#include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/framework/function.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/graph/graph.h"
-#include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/platform/macros.h"
-#include "tensorflow/core/platform/mutex.h"
-#include "tensorflow/core/platform/thread_annotations.h"
-#include "tensorflow/core/platform/types.h"
-#include "tensorflow/core/public/session.h"
+#include "tensorflow/core/platform/env.h"
 
 namespace tensorflow {
 
-- 
GitLab


From a33e339dd676f370307e67e477141bbacf05cc18 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 14:26:49 -0700
Subject: [PATCH 1167/1563] Migrate the tf_graph_board component to use
 webfiles.

PiperOrigin-RevId: 155552095
---
 tensorflow/BUILD                              |    1 +
 .../components/tf_graph_board/BUILD           |   51 +
 .../components/tf_graph_board/demo/BUILD      |   26 +
 .../tf_graph_board/demo/data/graph.pbtxt      | 4606 +++++++++++++++++
 .../components/tf_graph_board/demo/index.html |   98 +
 .../tf_graph_board/tf-graph-board.html        |    1 +
 6 files changed, 4783 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board/demo/index.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 0efbfc0cf5..79de05e266 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -334,6 +334,7 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_globals:all_files",
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_board:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph_board/BUILD b/tensorflow/tensorboard/components/tf_graph_board/BUILD
new file mode 100644
index 0000000000..bae18cbc4f
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board/BUILD
@@ -0,0 +1,51 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_board",
+    srcs = [
+        "tf-graph-board.html",
+    ],
+    path = "/tf-graph-board",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "//tensorflow/tensorboard/components/tf_graph_info",
+        "@org_polymer",
+        "@org_polymer_paper_progress",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-board.html",
+    ],
+    destdir = "tf-graph-board",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_info:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
new file mode 100644
index 0000000000..8b9bf0fc24
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_board/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-board/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_board",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_board/demo/index.html b/tensorflow/tensorboard/components/tf_graph_board/demo/index.html
new file mode 100644
index 0000000000..2563e1595e
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board/demo/index.html
@@ -0,0 +1,98 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-board.html">
+<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Board Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 600px;
+  }
+
+  /** Make the graph take up the entire height of the demo container. */
+  tf-graph-board-demo, #board, #board > div {
+    display: block;
+    height: 100%;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-board-demo">
+      <template>
+        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
+        <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            out-graph="{{_graph}}">
+        </tf-graph-loader>
+
+        <!-- We color ops in the graph by XLA cluster. -->
+        <tf-graph-board id="board" color-by="xla_cluster"></tf-graph-board>
+      </template>
+      <script>
+        "use strict";
+
+        Polymer({
+          is: "tf-graph-board-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
+
+            // This property will be updated by the graph loader.
+            _graph: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_graphUpdated(_graph)',
+          ],
+          _graphUpdated: function(slimGraph) {
+            const tracker = tf.graph.util.getTracker(this.$.loader);
+            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
+                tracker, 100, 'Namespace hierarchy');
+            const hierarchyOptions = {};
+            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
+                function(graphHierarchy) {
+              // We have parsed and built the graph object from a pbtxt file. Render the graph.
+              this.$.board.set('graph', slimGraph);
+              this.$.board.set('graphHierarchy', graphHierarchy);
+            }.bind(this));
+          },
+        });
+      </script>
+    </dom-module>
+    <div id='demo-container'>
+      <tf-graph-board-demo></tf-graph-board-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html b/tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html
index 5909172fbe..0ee694e1e6 100644
--- a/tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html
+++ b/tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html
@@ -17,6 +17,7 @@ limitations under the License.
 
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../tf-graph/tf-graph.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
 <link rel="import" href="../tf-graph-info/tf-graph-info.html">
 <link rel="import" href="../paper-progress/paper-progress.html">
 
-- 
GitLab


From 049f9e6a354a1ccc6f1e97064593dede50f07867 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 14:35:36 -0700
Subject: [PATCH 1168/1563] Fix formatting of some op descriptions. In most
 cases, this means separating out a 1-line summary from the main description.

PiperOrigin-RevId: 155553359
---
 tensorflow/core/ops/control_flow_ops.cc |   5 +-
 tensorflow/core/ops/data_flow_ops.cc    | 169 +++++++++++++-----------
 2 files changed, 96 insertions(+), 78 deletions(-)

diff --git a/tensorflow/core/ops/control_flow_ops.cc b/tensorflow/core/ops/control_flow_ops.cc
index 57224c365d..95f3f0da9d 100644
--- a/tensorflow/core/ops/control_flow_ops.cc
+++ b/tensorflow/core/ops/control_flow_ops.cc
@@ -331,7 +331,10 @@ REGISTER_OP("Abort")
     .Attr("exit_without_error: bool = false")
     .SetShapeFn(shape_inference::NoOutputs)
     .Doc(R"doc(
-Raise a exception to abort the process when called. If exit_without_error is true, the process will exit normally, otherwise it will exit with a SIGABORT signal.
+Raise a exception to abort the process when called.
+
+If exit_without_error is true, the process will exit normally,
+otherwise it will exit with a SIGABORT signal.
 
 Returns nothing but an exception.
 
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index 032ede6459..8bdbc7e135 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -660,20 +660,20 @@ REGISTER_OP("QueueDequeueMany")
     .Attr("timeout_ms: int = -1")
     .SetShapeFn(shape_inference::UnknownShape)
     .Doc(R"doc(
-Dequeues n tuples of one or more tensors from the given queue.
+Dequeues `n` tuples of one or more tensors from the given queue.
 
-If the queue is closed and there are fewer than n elements, then an
+If the queue is closed and there are fewer than `n` elements, then an
 OutOfRange error is returned.
 
 This operation concatenates queue-element component tensors along the
 0th dimension to make a single component tensor.  All of the components
-in the dequeued tuple will have size n in the 0th dimension.
+in the dequeued tuple will have size `n` in the 0th dimension.
 
-This operation has k outputs, where k is the number of components in
-the tuples stored in the given queue, and output i is the ith
+This operation has `k` outputs, where `k` is the number of components in
+the tuples stored in the given queue, and output `i` is the ith
 component of the dequeued tuple.
 
-N.B. If the queue is empty, this operation will block until n elements
+N.B. If the queue is empty, this operation will block until `n` elements
 have been dequeued (or 'timeout_ms' elapses, if specified).
 
 handle: The handle to a queue.
@@ -693,20 +693,20 @@ REGISTER_OP("QueueDequeueManyV2")
     .Attr("timeout_ms: int = -1")
     .SetShapeFn(shape_inference::UnknownShape)
     .Doc(R"doc(
-Dequeues n tuples of one or more tensors from the given queue.
+Dequeues `n` tuples of one or more tensors from the given queue.
 
-If the queue is closed and there are fewer than n elements, then an
+If the queue is closed and there are fewer than `n` elements, then an
 OutOfRange error is returned.
 
 This operation concatenates queue-element component tensors along the
 0th dimension to make a single component tensor.  All of the components
-in the dequeued tuple will have size n in the 0th dimension.
+in the dequeued tuple will have size `n` in the 0th dimension.
 
-This operation has k outputs, where k is the number of components in
-the tuples stored in the given queue, and output i is the ith
+This operation has `k` outputs, where `k` is the number of components in
+the tuples stored in the given queue, and output `i` is the ith
 component of the dequeued tuple.
 
-N.B. If the queue is empty, this operation will block until n elements
+N.B. If the queue is empty, this operation will block until `n` elements
 have been dequeued (or 'timeout_ms' elapses, if specified).
 
 handle: The handle to a queue.
@@ -726,24 +726,24 @@ REGISTER_OP("QueueDequeueUpTo")
     .Attr("timeout_ms: int = -1")
     .SetShapeFn(shape_inference::UnknownShape)
     .Doc(R"doc(
-Dequeues n tuples of one or more tensors from the given queue.
+Dequeues `n` tuples of one or more tensors from the given queue.
 
 This operation is not supported by all queues.  If a queue does not support
 DequeueUpTo, then an Unimplemented error is returned.
 
-If the queue is closed and there are more than 0 but less than n elements
-remaining, then instead of returning an OutOfRange error like
-QueueDequeueMany, less than `n` elements are returned immediately.  If the queue
-is closed and there are 0 elements left in the queue, then an OutOfRange
-error is returned just like in QueueDequeueMany.  Otherwise the behavior
-is identical to QueueDequeueMany:
+If the queue is closed and there are more than 0 but less than `n`
+elements remaining, then instead of returning an OutOfRange error like
+QueueDequeueMany, less than `n` elements are returned immediately.  If
+the queue is closed and there are 0 elements left in the queue, then
+an OutOfRange error is returned just like in QueueDequeueMany.
+Otherwise the behavior is identical to QueueDequeueMany:
 
 This operation concatenates queue-element component tensors along the
 0th dimension to make a single component tensor.  All of the components
-in the dequeued tuple will have size n in the 0th dimension.
+in the dequeued tuple will have size `n` in the 0th dimension.
 
-This operation has k outputs, where k is the number of components in
-the tuples stored in the given queue, and output i is the ith
+This operation has k outputs, where `k` is the number of components in
+the tuples stored in the given queue, and output `i` is the ith
 component of the dequeued tuple.
 
 handle: The handle to a queue.
@@ -763,24 +763,24 @@ REGISTER_OP("QueueDequeueUpToV2")
     .Attr("timeout_ms: int = -1")
     .SetShapeFn(shape_inference::UnknownShape)
     .Doc(R"doc(
-Dequeues n tuples of one or more tensors from the given queue.
+Dequeues `n` tuples of one or more tensors from the given queue.
 
 This operation is not supported by all queues.  If a queue does not support
 DequeueUpTo, then an Unimplemented error is returned.
 
-If the queue is closed and there are more than 0 but less than n elements
-remaining, then instead of returning an OutOfRange error like
-QueueDequeueMany, less than `n` elements are returned immediately.  If the queue
-is closed and there are 0 elements left in the queue, then an OutOfRange
-error is returned just like in QueueDequeueMany.  Otherwise the behavior
-is identical to QueueDequeueMany:
+If the queue is closed and there are more than 0 but less than `n`
+elements remaining, then instead of returning an OutOfRange error like
+QueueDequeueMany, less than `n` elements are returned immediately.  If
+the queue is closed and there are 0 elements left in the queue, then
+an OutOfRange error is returned just like in QueueDequeueMany.
+Otherwise the behavior is identical to QueueDequeueMany:
 
 This operation concatenates queue-element component tensors along the
 0th dimension to make a single component tensor.  All of the components
 in the dequeued tuple will have size n in the 0th dimension.
 
-This operation has k outputs, where k is the number of components in
-the tuples stored in the given queue, and output i is the ith
+This operation has `k` outputs, where `k` is the number of components in
+the tuples stored in the given queue, and output `i` is the ith
 component of the dequeued tuple.
 
 handle: The handle to a queue.
@@ -872,8 +872,10 @@ REGISTER_OP("AccumulatorSetGlobalStep")
       return Status::OK();
     })
     .Doc(R"doc(
-Updates the accumulator with a new value for global_step. Logs warning if the
-accumulator's value is already higher than new_global_step.
+Updates the accumulator with a new value for global_step.
+
+Logs warning if the accumulator's value is already higher than
+new_global_step.
 
 handle: The handle to an accumulator.
 new_global_step: The new global_step value to set.
@@ -891,20 +893,22 @@ REGISTER_OP("ConditionalAccumulator")
       return Status::OK();
     })
     .Doc(R"doc(
-A conditional accumulator for aggregating gradients. The accumulator accepts
-gradients marked with local_step greater or equal to the most recent global_step
-known to the accumulator. The average can be extracted from the accumulator,
-provided sufficient gradients have been accumulated. Extracting the average
-automatically resets the aggregate to 0, and increments the global_step recorded
-by the accumulator.
+A conditional accumulator for aggregating gradients.
+
+The accumulator accepts gradients marked with local_step greater or
+equal to the most recent global_step known to the accumulator. The
+average can be extracted from the accumulator, provided sufficient
+gradients have been accumulated. Extracting the average automatically
+resets the aggregate to 0, and increments the global_step recorded by
+the accumulator.
 
 handle: The handle to the accumulator.
 dtype: The type of the value being accumulated.
 shape: The shape of the values, can be [], in which case shape is unknown.
 container: If non-empty, this accumulator is placed in the given container.
   Otherwise, a default container is used.
-shared_name: If non-empty, this accumulator will be shared under the given name
-  across multiple sessions.
+shared_name: If non-empty, this accumulator will be shared under the
+  given name across multiple sessions.
 )doc");
 
 REGISTER_OP("AccumulatorApplyGradient")
@@ -918,8 +922,9 @@ REGISTER_OP("AccumulatorApplyGradient")
       return Status::OK();
     })
     .Doc(R"doc(
-Applies a gradient to a given accumulator. Does not add if local_step is lesser
-than the accumulator's global_step.
+Applies a gradient to a given accumulator.
+
+Does not add if local_step is lesser than the accumulator's global_step.
 
 handle: The handle to a accumulator.
 local_step: The local_step value at which the gradient was computed.
@@ -942,13 +947,13 @@ REGISTER_OP("AccumulatorTakeGradient")
     })
     .Attr("dtype: numbertype")
     .Doc(R"doc(
-Extracts the average gradient in the given ConditionalAccumulator, provided
-that sufficient (i.e., more than num_required) gradients have been accumulated.
-The op blocks until sufficient gradients have been accumulated.
-If the accumulator has already aggregated more than num_required gradients, it
-returns the average of the accumulated gradients.
-Also automatically increments the recorded global_step in the accumulator by 1,
-and resets the aggregate to 0.
+Extracts the average gradient in the given ConditionalAccumulator.
+
+The op blocks until sufficient (i.e., more than num_required)
+gradients have been accumulated.  If the accumulator has already
+aggregated more than num_required gradients, it returns the average of
+the accumulated gradients.  Also automatically increments the recorded
+global_step in the accumulator by 1, and resets the aggregate to 0.
 
 handle: The handle to an accumulator.
 num_required: Number of gradients required before we return an aggregate.
@@ -969,12 +974,14 @@ REGISTER_OP("SparseConditionalAccumulator")
       return Status::OK();
     })
     .Doc(R"doc(
-A conditional accumulator for aggregating sparse gradients. The accumulator
-accepts gradients marked with local_step greater or equal to the most recent
-global_step known to the accumulator. The average can be extracted from the
-accumulator, provided sufficient gradients have been accumulated. Extracting the
-average automatically resets the aggregate to 0, and increments the global_step
-recorded by the accumulator.
+A conditional accumulator for aggregating sparse gradients.
+
+The accumulator accepts gradients marked with local_step greater or
+equal to the most recent global_step known to the accumulator. The
+average can be extracted from the accumulator, provided sufficient
+gradients have been accumulated. Extracting the average automatically
+resets the aggregate to 0, and increments the global_step recorded by
+the accumulator.
 
 handle: The handle to the accumulator.
 dtype: The type of the value being accumulated.
@@ -999,8 +1006,10 @@ REGISTER_OP("SparseAccumulatorApplyGradient")
       return Status::OK();
     })
     .Doc(R"doc(
-Applies a sparse gradient to a given accumulator. Does not add if local_step is
-lesser than the accumulator's global_step.
+Applies a sparse gradient to a given accumulator.
+
+Does not add if local_step is smaller than the accumulator's
+global_step.
 
 handle: The handle to a accumulator.
 local_step: The local_step value at which the sparse gradient was computed.
@@ -1032,13 +1041,14 @@ REGISTER_OP("SparseAccumulatorTakeGradient")
       return shape_inference::UnknownShape(c);
     })
     .Doc(R"doc(
-Extracts the average sparse gradient in the given SparseConditionalAccumulator,
-provided that sufficient (i.e., more than num_required) gradients have been
-accumulated. The op will blocks until sufficient gradients have been
-accumulated. If the accumulator has already aggregated more than num_required
-gradients, it will return its average of the accumulated gradients.
-Also automatically increments the recorded global_step in the accumulator by 1,
-and resets the aggregate to 0.
+Extracts the average sparse gradient in a SparseConditionalAccumulator.
+
+The op will blocks until sufficient (i.e., more than num_required)
+gradients have been accumulated. If the accumulator has already
+aggregated more than num_required gradients, it will return its
+average of the accumulated gradients.  Also automatically increments
+the recorded global_step in the accumulator by 1, and resets the
+aggregate to 0.
 
 handle: The handle to a SparseConditionalAccumulator.
 num_required: Number of gradients required before we return an aggregate.
@@ -1127,8 +1137,9 @@ REGISTER_OP("TensorArrayV3")
       return Status::OK();
     })
     .Doc(R"doc(
-An array of Tensors of given size, with data written via Write and read
-via Read or Pack.
+An array of Tensors of given size.
+
+Write data via Write and read via Read or Pack.
 
 handle: The handle to the TensorArray.
 flow: A scalar used to control gradient flow.
@@ -1444,8 +1455,10 @@ REGISTER_OP("TensorArrayCloseV3")
       return Status::OK();
     })
     .Doc(R"doc(
-Delete the TensorArray from its resource container.  This enables
-the user to close and release the resource in the middle of a step/run.
+Delete the TensorArray from its resource container.
+
+This enables the user to close and release the resource in the middle
+of a step/run.
 
 handle: The handle to a TensorArray (output of TensorArray or TensorArrayGrad).
 )doc");
@@ -1940,15 +1953,16 @@ REGISTER_OP("Stage")
     .SetShapeFn(shape_inference::UnknownShape)
     .SetIsStateful()
     .Doc(R"doc(
-Stage values similar to a lightweight Enqueue.  The basic functionality of this
-Op is similar to a queue with many fewer capabilities and options.  This Op is
-optimized for performance.
+Stage values similar to a lightweight Enqueue.
+
+The basic functionality of this Op is similar to a queue with many
+fewer capabilities and options.  This Op is optimized for performance.
 
 values: a list of tensors
 container: If non-empty, this queue is placed in the given container. Otherwise,
   a default container is used.
 shared_name: It is necessary to match this name to the matching Unstage Op.
-    )doc");
+)doc");
 
 REGISTER_OP("Unstage")
     .Output("values: dtypes")
@@ -1958,10 +1972,11 @@ REGISTER_OP("Unstage")
     .SetShapeFn(shape_inference::UnknownShape)
     .SetIsStateful()
     .Doc(R"doc(
-Op is similar to a lightweight Dequeue.  The basic funtionality is similar to
-dequeue with many fewer capabilities and options.  This Op is optimized for
-performance.
-    )doc");
+Op is similar to a lightweight Dequeue.
+
+The basic funtionality is similar to dequeue with many fewer
+capabilities and options.  This Op is optimized for performance.
+)doc");
 
 REGISTER_OP("RecordInput")
     .Output("records: string")
-- 
GitLab


From c595425a22702ebc1ca18473601414415088caab Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 14:39:40 -0700
Subject: [PATCH 1169/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 155553956
---
 tensorflow/go/op/wrappers.go | 56 +++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 3ac185956e..5b82e9bf6f 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -2946,7 +2946,10 @@ func AbortExitWithoutError(value bool) AbortAttr {
 	}
 }
 
-// Raise a exception to abort the process when called. If exit_without_error is true, the process will exit normally, otherwise it will exit with a SIGABORT signal.
+// Raise a exception to abort the process when called.
+//
+// If exit_without_error is true, the process will exit normally,
+// otherwise it will exit with a SIGABORT signal.
 //
 // Returns nothing but an exception.
 //
@@ -3436,10 +3439,10 @@ func StageSharedName(value string) StageAttr {
 	}
 }
 
-// Stage values similar to a lightweight Enqueue.  The basic functionality of this
+// Stage values similar to a lightweight Enqueue.
 //
-// Op is similar to a queue with many fewer capabilities and options.  This Op is
-// optimized for performance.
+// The basic functionality of this Op is similar to a queue with many
+// fewer capabilities and options.  This Op is optimized for performance.
 //
 // Arguments:
 //	values: a list of tensors
@@ -3624,9 +3627,10 @@ func ResourceGather(scope *Scope, resource tf.Output, indices tf.Output, dtype t
 	return op.Output(0)
 }
 
-// Delete the TensorArray from its resource container.  This enables
+// Delete the TensorArray from its resource container.
 //
-// the user to close and release the resource in the middle of a step/run.
+// This enables the user to close and release the resource in the middle
+// of a step/run.
 //
 // Arguments:
 //	handle: The handle to a TensorArray (output of TensorArray or TensorArrayGrad).
@@ -4148,24 +4152,24 @@ func QueueDequeueUpToV2TimeoutMs(value int64) QueueDequeueUpToV2Attr {
 	}
 }
 
-// Dequeues n tuples of one or more tensors from the given queue.
+// Dequeues `n` tuples of one or more tensors from the given queue.
 //
 // This operation is not supported by all queues.  If a queue does not support
 // DequeueUpTo, then an Unimplemented error is returned.
 //
-// If the queue is closed and there are more than 0 but less than n elements
-// remaining, then instead of returning an OutOfRange error like
-// QueueDequeueMany, less than `n` elements are returned immediately.  If the queue
-// is closed and there are 0 elements left in the queue, then an OutOfRange
-// error is returned just like in QueueDequeueMany.  Otherwise the behavior
-// is identical to QueueDequeueMany:
+// If the queue is closed and there are more than 0 but less than `n`
+// elements remaining, then instead of returning an OutOfRange error like
+// QueueDequeueMany, less than `n` elements are returned immediately.  If
+// the queue is closed and there are 0 elements left in the queue, then
+// an OutOfRange error is returned just like in QueueDequeueMany.
+// Otherwise the behavior is identical to QueueDequeueMany:
 //
 // This operation concatenates queue-element component tensors along the
 // 0th dimension to make a single component tensor.  All of the components
 // in the dequeued tuple will have size n in the 0th dimension.
 //
-// This operation has k outputs, where k is the number of components in
-// the tuples stored in the given queue, and output i is the ith
+// This operation has `k` outputs, where `k` is the number of components in
+// the tuples stored in the given queue, and output `i` is the ith
 // component of the dequeued tuple.
 //
 // Arguments:
@@ -4233,20 +4237,20 @@ func QueueDequeueManyV2TimeoutMs(value int64) QueueDequeueManyV2Attr {
 	}
 }
 
-// Dequeues n tuples of one or more tensors from the given queue.
+// Dequeues `n` tuples of one or more tensors from the given queue.
 //
-// If the queue is closed and there are fewer than n elements, then an
+// If the queue is closed and there are fewer than `n` elements, then an
 // OutOfRange error is returned.
 //
 // This operation concatenates queue-element component tensors along the
 // 0th dimension to make a single component tensor.  All of the components
-// in the dequeued tuple will have size n in the 0th dimension.
+// in the dequeued tuple will have size `n` in the 0th dimension.
 //
-// This operation has k outputs, where k is the number of components in
-// the tuples stored in the given queue, and output i is the ith
+// This operation has `k` outputs, where `k` is the number of components in
+// the tuples stored in the given queue, and output `i` is the ith
 // component of the dequeued tuple.
 //
-// N.B. If the queue is empty, this operation will block until n elements
+// N.B. If the queue is empty, this operation will block until `n` elements
 // have been dequeued (or 'timeout_ms' elapses, if specified).
 //
 // Arguments:
@@ -4348,10 +4352,10 @@ func UnstageSharedName(value string) UnstageAttr {
 	}
 }
 
-// Op is similar to a lightweight Dequeue.  The basic funtionality is similar to
+// Op is similar to a lightweight Dequeue.
 //
-// dequeue with many fewer capabilities and options.  This Op is optimized for
-// performance.
+// The basic funtionality is similar to dequeue with many fewer
+// capabilities and options.  This Op is optimized for performance.
 func Unstage(scope *Scope, dtypes []tf.DataType, optional ...UnstageAttr) (values []tf.Output) {
 	if scope.Err() != nil {
 		return
@@ -11820,9 +11824,9 @@ func TensorArrayV3TensorArrayName(value string) TensorArrayV3Attr {
 	}
 }
 
-// An array of Tensors of given size, with data written via Write and read
+// An array of Tensors of given size.
 //
-// via Read or Pack.
+// Write data via Write and read via Read or Pack.
 //
 // Arguments:
 //	size: The size of the array.
-- 
GitLab


From 05f9de40701ef51b2a21bd8ffd3d1e357b92db68 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 14:51:01 -0700
Subject: [PATCH 1170/1563] Capture temporary device tensor, so it doesn't get
 deallocated before the kernel runs.

PiperOrigin-RevId: 155555888
---
 tensorflow/core/kernels/crop_and_resize_op.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/kernels/crop_and_resize_op.cc b/tensorflow/core/kernels/crop_and_resize_op.cc
index c5470f81eb..c68a8b0bd2 100644
--- a/tensorflow/core/kernels/crop_and_resize_op.cc
+++ b/tensorflow/core/kernels/crop_and_resize_op.cc
@@ -739,7 +739,10 @@ inline void RunIfBoxIndexIsValid<GPUDevice>(
       errors::Internal("Failed to launch copy of isvalid from device to host."),
       done);
 
-  auto wrapped_callback = [context, isvalid_host_tensor, compute, done]() {
+  // We capture both temporary tensors to prevent them from being deallocated
+  // when ComputeAsync returns and before the closure runs.
+  auto wrapped_callback = [context, isvalid_host_tensor, isvalid_dev_tensor,
+                           compute, done]() {
     const bool isvalid = isvalid_host_tensor.scalar<bool>()();
     OP_REQUIRES_ASYNC(
         context, isvalid,
-- 
GitLab


From 7c40495e2eb27b8fe6d213c80c0c9ed37a82607c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 15:19:06 -0700
Subject: [PATCH 1171/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 155560204
---
 tensorflow/core/ops/ops.pbtxt | 66 +++++++++++++++++------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 7635bc84ee..fb3bbfb567 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -15,8 +15,8 @@ op {
       b: false
     }
   }
-  summary: "Raise a exception to abort the process when called. If exit_without_error is true, the process will exit normally, otherwise it will exit with a SIGABORT signal."
-  description: "Returns nothing but an exception."
+  summary: "Raise a exception to abort the process when called."
+  description: "If exit_without_error is true, the process will exit normally,\notherwise it will exit with a SIGABORT signal.\n\nReturns nothing but an exception."
 }
 op {
   name: "Abs"
@@ -85,8 +85,8 @@ op {
       }
     }
   }
-  summary: "Applies a gradient to a given accumulator. Does not add if local_step is lesser"
-  description: "than the accumulator\'s global_step."
+  summary: "Applies a gradient to a given accumulator."
+  description: "Does not add if local_step is lesser than the accumulator\'s global_step."
 }
 op {
   name: "AccumulatorNumAccumulated"
@@ -116,8 +116,8 @@ op {
     description: "The new global_step value to set."
     type: DT_INT64
   }
-  summary: "Updates the accumulator with a new value for global_step. Logs warning if the"
-  description: "accumulator\'s value is already higher than new_global_step."
+  summary: "Updates the accumulator with a new value for global_step."
+  description: "Logs warning if the accumulator\'s value is already higher than\nnew_global_step."
 }
 op {
   name: "AccumulatorTakeGradient"
@@ -160,8 +160,8 @@ op {
       }
     }
   }
-  summary: "Extracts the average gradient in the given ConditionalAccumulator, provided"
-  description: "that sufficient (i.e., more than num_required) gradients have been accumulated.\nThe op blocks until sufficient gradients have been accumulated.\nIf the accumulator has already aggregated more than num_required gradients, it\nreturns the average of the accumulated gradients.\nAlso automatically increments the recorded global_step in the accumulator by 1,\nand resets the aggregate to 0."
+  summary: "Extracts the average gradient in the given ConditionalAccumulator."
+  description: "The op blocks until sufficient (i.e., more than num_required)\ngradients have been accumulated.  If the accumulator has already\naggregated more than num_required gradients, it returns the average of\nthe accumulated gradients.  Also automatically increments the recorded\nglobal_step in the accumulator by 1, and resets the aggregate to 0."
 }
 op {
   name: "Acos"
@@ -4257,10 +4257,10 @@ op {
     default_value {
       s: ""
     }
-    description: "If non-empty, this accumulator will be shared under the given name\nacross multiple sessions."
+    description: "If non-empty, this accumulator will be shared under the\ngiven name across multiple sessions."
   }
-  summary: "A conditional accumulator for aggregating gradients. The accumulator accepts"
-  description: "gradients marked with local_step greater or equal to the most recent global_step\nknown to the accumulator. The average can be extracted from the accumulator,\nprovided sufficient gradients have been accumulated. Extracting the average\nautomatically resets the aggregate to 0, and increments the global_step recorded\nby the accumulator."
+  summary: "A conditional accumulator for aggregating gradients."
+  description: "The accumulator accepts gradients marked with local_step greater or\nequal to the most recent global_step known to the accumulator. The\naverage can be extracted from the accumulator, provided sufficient\ngradients have been accumulated. Extracting the average automatically\nresets the aggregate to 0, and increments the global_step recorded by\nthe accumulator."
   is_stateful: true
 }
 op {
@@ -15144,8 +15144,8 @@ op {
     }
     description: "If the queue has fewer than n elements, this operation\nwill block for up to timeout_ms milliseconds.\nNote: This option is not supported yet."
   }
-  summary: "Dequeues n tuples of one or more tensors from the given queue."
-  description: "If the queue is closed and there are fewer than n elements, then an\nOutOfRange error is returned.\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size n in the 0th dimension.\n\nThis operation has k outputs, where k is the number of components in\nthe tuples stored in the given queue, and output i is the ith\ncomponent of the dequeued tuple.\n\nN.B. If the queue is empty, this operation will block until n elements\nhave been dequeued (or \'timeout_ms\' elapses, if specified)."
+  summary: "Dequeues `n` tuples of one or more tensors from the given queue."
+  description: "If the queue is closed and there are fewer than `n` elements, then an\nOutOfRange error is returned.\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size `n` in the 0th dimension.\n\nThis operation has `k` outputs, where `k` is the number of components in\nthe tuples stored in the given queue, and output `i` is the ith\ncomponent of the dequeued tuple.\n\nN.B. If the queue is empty, this operation will block until `n` elements\nhave been dequeued (or \'timeout_ms\' elapses, if specified)."
 }
 op {
   name: "QueueDequeueManyV2"
@@ -15179,8 +15179,8 @@ op {
     }
     description: "If the queue has fewer than n elements, this operation\nwill block for up to timeout_ms milliseconds.\nNote: This option is not supported yet."
   }
-  summary: "Dequeues n tuples of one or more tensors from the given queue."
-  description: "If the queue is closed and there are fewer than n elements, then an\nOutOfRange error is returned.\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size n in the 0th dimension.\n\nThis operation has k outputs, where k is the number of components in\nthe tuples stored in the given queue, and output i is the ith\ncomponent of the dequeued tuple.\n\nN.B. If the queue is empty, this operation will block until n elements\nhave been dequeued (or \'timeout_ms\' elapses, if specified)."
+  summary: "Dequeues `n` tuples of one or more tensors from the given queue."
+  description: "If the queue is closed and there are fewer than `n` elements, then an\nOutOfRange error is returned.\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size `n` in the 0th dimension.\n\nThis operation has `k` outputs, where `k` is the number of components in\nthe tuples stored in the given queue, and output `i` is the ith\ncomponent of the dequeued tuple.\n\nN.B. If the queue is empty, this operation will block until `n` elements\nhave been dequeued (or \'timeout_ms\' elapses, if specified)."
   is_stateful: true
 }
 op {
@@ -15216,8 +15216,8 @@ op {
     }
     description: "If the queue has fewer than n elements, this operation\nwill block for up to timeout_ms milliseconds.\nNote: This option is not supported yet."
   }
-  summary: "Dequeues n tuples of one or more tensors from the given queue."
-  description: "This operation is not supported by all queues.  If a queue does not support\nDequeueUpTo, then an Unimplemented error is returned.\n\nIf the queue is closed and there are more than 0 but less than n elements\nremaining, then instead of returning an OutOfRange error like\nQueueDequeueMany, less than `n` elements are returned immediately.  If the queue\nis closed and there are 0 elements left in the queue, then an OutOfRange\nerror is returned just like in QueueDequeueMany.  Otherwise the behavior\nis identical to QueueDequeueMany:\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size n in the 0th dimension.\n\nThis operation has k outputs, where k is the number of components in\nthe tuples stored in the given queue, and output i is the ith\ncomponent of the dequeued tuple."
+  summary: "Dequeues `n` tuples of one or more tensors from the given queue."
+  description: "This operation is not supported by all queues.  If a queue does not support\nDequeueUpTo, then an Unimplemented error is returned.\n\nIf the queue is closed and there are more than 0 but less than `n`\nelements remaining, then instead of returning an OutOfRange error like\nQueueDequeueMany, less than `n` elements are returned immediately.  If\nthe queue is closed and there are 0 elements left in the queue, then\nan OutOfRange error is returned just like in QueueDequeueMany.\nOtherwise the behavior is identical to QueueDequeueMany:\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size `n` in the 0th dimension.\n\nThis operation has k outputs, where `k` is the number of components in\nthe tuples stored in the given queue, and output `i` is the ith\ncomponent of the dequeued tuple."
 }
 op {
   name: "QueueDequeueUpToV2"
@@ -15251,8 +15251,8 @@ op {
     }
     description: "If the queue has fewer than n elements, this operation\nwill block for up to timeout_ms milliseconds.\nNote: This option is not supported yet."
   }
-  summary: "Dequeues n tuples of one or more tensors from the given queue."
-  description: "This operation is not supported by all queues.  If a queue does not support\nDequeueUpTo, then an Unimplemented error is returned.\n\nIf the queue is closed and there are more than 0 but less than n elements\nremaining, then instead of returning an OutOfRange error like\nQueueDequeueMany, less than `n` elements are returned immediately.  If the queue\nis closed and there are 0 elements left in the queue, then an OutOfRange\nerror is returned just like in QueueDequeueMany.  Otherwise the behavior\nis identical to QueueDequeueMany:\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size n in the 0th dimension.\n\nThis operation has k outputs, where k is the number of components in\nthe tuples stored in the given queue, and output i is the ith\ncomponent of the dequeued tuple."
+  summary: "Dequeues `n` tuples of one or more tensors from the given queue."
+  description: "This operation is not supported by all queues.  If a queue does not support\nDequeueUpTo, then an Unimplemented error is returned.\n\nIf the queue is closed and there are more than 0 but less than `n`\nelements remaining, then instead of returning an OutOfRange error like\nQueueDequeueMany, less than `n` elements are returned immediately.  If\nthe queue is closed and there are 0 elements left in the queue, then\nan OutOfRange error is returned just like in QueueDequeueMany.\nOtherwise the behavior is identical to QueueDequeueMany:\n\nThis operation concatenates queue-element component tensors along the\n0th dimension to make a single component tensor.  All of the components\nin the dequeued tuple will have size n in the 0th dimension.\n\nThis operation has `k` outputs, where `k` is the number of components in\nthe tuples stored in the given queue, and output `i` is the ith\ncomponent of the dequeued tuple."
   is_stateful: true
 }
 op {
@@ -21330,8 +21330,8 @@ op {
     type: "bool"
     description: "Boolean indicating whether gradient_shape is unknown, in which\ncase the input is ignored during validation."
   }
-  summary: "Applies a sparse gradient to a given accumulator. Does not add if local_step is"
-  description: "lesser than the accumulator\'s global_step."
+  summary: "Applies a sparse gradient to a given accumulator."
+  description: "Does not add if local_step is smaller than the accumulator\'s\nglobal_step."
 }
 op {
   name: "SparseAccumulatorTakeGradient"
@@ -21384,8 +21384,8 @@ op {
       }
     }
   }
-  summary: "Extracts the average sparse gradient in the given SparseConditionalAccumulator,"
-  description: "provided that sufficient (i.e., more than num_required) gradients have been\naccumulated. The op will blocks until sufficient gradients have been\naccumulated. If the accumulator has already aggregated more than num_required\ngradients, it will return its average of the accumulated gradients.\nAlso automatically increments the recorded global_step in the accumulator by 1,\nand resets the aggregate to 0."
+  summary: "Extracts the average sparse gradient in a SparseConditionalAccumulator."
+  description: "The op will blocks until sufficient (i.e., more than num_required)\ngradients have been accumulated. If the accumulator has already\naggregated more than num_required gradients, it will return its\naverage of the accumulated gradients.  Also automatically increments\nthe recorded global_step in the accumulator by 1, and resets the\naggregate to 0."
 }
 op {
   name: "SparseAdd"
@@ -22470,8 +22470,8 @@ op {
     }
     description: "If non-empty, this accumulator will be shared under the given name\nacross multiple sessions."
   }
-  summary: "A conditional accumulator for aggregating sparse gradients. The accumulator"
-  description: "accepts gradients marked with local_step greater or equal to the most recent\nglobal_step known to the accumulator. The average can be extracted from the\naccumulator, provided sufficient gradients have been accumulated. Extracting the\naverage automatically resets the aggregate to 0, and increments the global_step\nrecorded by the accumulator."
+  summary: "A conditional accumulator for aggregating sparse gradients."
+  description: "The accumulator accepts gradients marked with local_step greater or\nequal to the most recent global_step known to the accumulator. The\naverage can be extracted from the accumulator, provided sufficient\ngradients have been accumulated. Extracting the average automatically\nresets the aggregate to 0, and increments the global_step recorded by\nthe accumulator."
   is_stateful: true
 }
 op {
@@ -24106,8 +24106,8 @@ op {
     }
     description: "It is necessary to match this name to the matching Unstage Op."
   }
-  summary: "Stage values similar to a lightweight Enqueue.  The basic functionality of this"
-  description: "Op is similar to a queue with many fewer capabilities and options.  This Op is\noptimized for performance."
+  summary: "Stage values similar to a lightweight Enqueue."
+  description: "The basic functionality of this Op is similar to a queue with many\nfewer capabilities and options.  This Op is optimized for performance."
   is_stateful: true
 }
 op {
@@ -25219,8 +25219,8 @@ op {
     description: "The handle to a TensorArray (output of TensorArray or TensorArrayGrad)."
     type: DT_RESOURCE
   }
-  summary: "Delete the TensorArray from its resource container.  This enables"
-  description: "the user to close and release the resource in the middle of a step/run."
+  summary: "Delete the TensorArray from its resource container."
+  description: "This enables the user to close and release the resource in the middle\nof a step/run."
   is_stateful: true
 }
 op {
@@ -26011,8 +26011,8 @@ op {
     }
     description: "Overrides the name used for the temporary tensor_array\nresource. Default value is the name of the \'TensorArray\' op (which\nis guaranteed unique)."
   }
-  summary: "An array of Tensors of given size, with data written via Write and read"
-  description: "via Read or Pack."
+  summary: "An array of Tensors of given size."
+  description: "Write data via Write and read via Read or Pack."
   is_stateful: true
 }
 op {
@@ -26918,8 +26918,8 @@ op {
       s: ""
     }
   }
-  summary: "Op is similar to a lightweight Dequeue.  The basic funtionality is similar to"
-  description: "dequeue with many fewer capabilities and options.  This Op is optimized for\nperformance."
+  summary: "Op is similar to a lightweight Dequeue."
+  description: "The basic funtionality is similar to dequeue with many fewer\ncapabilities and options.  This Op is optimized for performance."
   is_stateful: true
 }
 op {
-- 
GitLab


From b661c841c1bb39215661f1b21bd54a4d96ab8ed4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 15:44:49 -0700
Subject: [PATCH 1172/1563] Fix android tests broken by sparse_cross_op.

PiperOrigin-RevId: 155563563
---
 tensorflow/core/kernels/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 0e8edaac02..b1b79021b7 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4301,6 +4301,7 @@ filegroup(
             "string_to_hash_bucket_op.*",
             "sdca_ops.*",
             "sdca_internal.*",
+            "sparse_cross_op.*",
             "text_line_reader_op.*",
             "summary_image_op.*",
             "encode_png_op.*",
-- 
GitLab


From d956e8f6acc9cf9641826e71536ac0d54d6a2d59 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 15:50:20 -0700
Subject: [PATCH 1173/1563] Add feature_column.parse_example_spec method.

PiperOrigin-RevId: 155564265
---
 .../python/feature_column/feature_column.py   | 86 ++++++++++++++++---
 .../feature_column/feature_column_test.py     | 81 +++++++++++++++++
 2 files changed, 153 insertions(+), 14 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 6efab10efb..3ab8ff1b19 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -122,6 +122,7 @@ import abc
 import collections
 
 import numpy as np
+import six
 
 from tensorflow.python.feature_column import lookup_ops
 from tensorflow.python.framework import dtypes
@@ -330,7 +331,7 @@ def _transform_features(features, feature_columns):
       source_column=numeric_column("price"), boundaries=[...])
 
   columns = [crosses_a_x_b, price_buckets]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   transformed = transform_features(features=features, feature_columns=columns)
 
   assertCountEqual(columns, transformed.keys())
@@ -357,6 +358,63 @@ def _transform_features(features, feature_columns):
   return outputs
 
 
+def make_parse_example_spec(feature_columns):
+  """Creates parsing spec dictionary from input feature_columns.
+
+  The returned dictionary can be used as arg 'features' in `tf.parse_example`.
+
+  Typical usage example:
+
+  ```python
+  # Define features and transformations
+  feature_a = categorical_column_with_vocabulary_file(...)
+  feature_b = numeric_column(...)
+  feature_c_bucketized = bucketized_column(numeric_column("feature_c"), ...)
+  feature_a_x_feature_c = crossed_column(
+    columns=[feature_a, feature_c_bucketized], ...)
+
+  feature_columns = set(
+    [feature_b, feature_c_bucketized, feature_a_x_feature_c])
+  features = tf.parse_example(
+      serialized=serialized_examples,
+      features=make_parse_example_spec(feature_columns))
+  ```
+
+  For the above example, make_parse_example_spec would return the dict:
+  {
+    "feature_a": parsing_ops.VarLenFeature(tf.string),
+    "feature_b": parsing_ops.FixedLenFeature([1], dtype=tf.float32),
+    "feature_c": parsing_ops.FixedLenFeature([1], dtype=tf.float32)
+  }
+
+  Args:
+    feature_columns: An iterable containing all feature columns. All items
+      should be instances of classes derived from `_FeatureColumn`.
+
+  Returns:
+    A dict mapping each feature key to a `FixedLenFeature` or `VarLenFeature`
+    value.
+
+  Raises:
+    ValueError: If any of the given `feature_columns` is not a `_FeatureColumn`
+      instance.
+  """
+  result = {}
+  for column in feature_columns:
+    if not isinstance(column, _FeatureColumn):
+      raise ValueError(
+          'All feature_columns must be _FeatureColumn instances. '
+          'Given: {}'.format(column))
+    config = column._parse_example_config  # pylint: disable=protected-access
+    for key, value in six.iteritems(config):
+      if key in result and value != result[key]:
+        raise ValueError(
+            'feature_columns contain different parse_spec for key '
+            '{}. Given {} and {}'.format(key, value, result[key]))
+    result.update(config)
+  return result
+
+
 def numeric_column(key,
                    shape=(1,),
                    default_value=None,
@@ -369,13 +427,13 @@ def numeric_column(key,
   ```python
   price = numeric_column('price')
   columns = [price, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   dense_tensor = make_input_layer(features, columns)
 
   # or
   bucketized_price = bucketized_column(price, boundaries=[...])
   columns = [bucketized_price, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction = make_linear_model(features, columns)
   ```
 
@@ -455,12 +513,12 @@ def bucketized_column(source_column, boundaries):
   price = numeric_column('price')
   bucketized_price = bucketized_column(price, boundaries=[...])
   columns = [bucketized_price, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction = make_linear_model(features, columns)
 
   # or
   columns = [bucketized_price, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   dense_tensor = make_input_layer(features, columns)
   ```
 
@@ -518,13 +576,13 @@ def categorical_column_with_hash_bucket(key,
   ```python
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
   columns = [keywords, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction = make_linear_model(features, columns)
 
   # or
   keywords_embedded = embedding_column(keywords, 16)
   columns = [keywords_embedded, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   dense_tensor = make_input_layer(features, columns)
   ```
 
@@ -580,7 +638,7 @@ def categorical_column_with_vocabulary_file(
       key='states', vocabulary_file='/us/states.txt', vocabulary_size=50,
       num_oov_buckets=5)
   columns = [states, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction = make_linear_model(features, columns)
   ```
 
@@ -594,13 +652,13 @@ def categorical_column_with_vocabulary_file(
       key='states', vocabulary_file='/us/states.txt', vocabulary_size=51,
       default_value=0)
   columns = [states, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction, _, _ = make_linear_model(features, columns)
 
   And to make an embedding with either:
   ```python
   columns = [embedding_column(states, 3),...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   dense_tensor = make_input_layer(features, columns)
   ```
 
@@ -680,14 +738,14 @@ def categorical_column_with_vocabulary_list(
   colors = categorical_column_with_vocabulary_list(
       key='colors', vocabulary_list=('X', 'R', 'G', 'B', 'Y'), default_value=0)
   columns = [colors, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction, _, _ = make_linear_model(features, columns)
   ```
 
   Embedding for a DNN model:
   ```python
   columns = [embedding_column(colors, 3),...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   dense_tensor = make_input_layer(features, columns)
   ```
 
@@ -753,14 +811,14 @@ def categorical_column_with_identity(key, num_buckets, default_value=None):
   video_id = categorical_column_with_identity(
       key='video_id', num_buckets=1000000, default_value=0)
   columns = [video_id, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction, _, _ = make_linear_model(features, columns)
   ```
 
   Embedding for a DNN model:
   ```python
   columns = [embedding_column(video_id, 9),...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   dense_tensor = make_input_layer(features, columns)
   ```
 
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index bd9a7c8df8..8b477c46a8 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
 import copy
 
 import numpy as np
@@ -1189,6 +1190,86 @@ class MakeInputLayerTest(test.TestCase):
         self.assertAllClose([[1., 3.]], net2.eval())
 
 
+class MakeParseExampleSpecTest(test.TestCase):
+
+  class _TestFeatureColumn(
+      fc._FeatureColumn,
+      collections.namedtuple('_TestFeatureColumn', ['parse_config'])):
+
+    @property
+    def _parse_example_config(self):
+      return self.parse_config
+
+  def test_no_feature_columns(self):
+    actual = fc.make_parse_example_spec([])
+    self.assertDictEqual({}, actual)
+
+  def test_invalid_type(self):
+    key1 = 'key1'
+    parse_spec1 = parsing_ops.FixedLenFeature(
+        shape=(2,), dtype=dtypes.float32, default_value=0.)
+    with self.assertRaisesRegexp(
+        ValueError,
+        'All feature_columns must be _FeatureColumn instances.*invalid_column'):
+      fc.make_parse_example_spec(
+          (self._TestFeatureColumn({key1: parse_spec1}), 'invalid_column'))
+
+  def test_one_feature_column(self):
+    key1 = 'key1'
+    parse_spec1 = parsing_ops.FixedLenFeature(
+        shape=(2,), dtype=dtypes.float32, default_value=0.)
+    actual = fc.make_parse_example_spec(
+        (self._TestFeatureColumn({key1: parse_spec1}),))
+    self.assertDictEqual({key1: parse_spec1}, actual)
+
+  def test_two_feature_columns(self):
+    key1 = 'key1'
+    parse_spec1 = parsing_ops.FixedLenFeature(
+        shape=(2,), dtype=dtypes.float32, default_value=0.)
+    key2 = 'key2'
+    parse_spec2 = parsing_ops.VarLenFeature(dtype=dtypes.string)
+    actual = fc.make_parse_example_spec(
+        (self._TestFeatureColumn({key1: parse_spec1}),
+         self._TestFeatureColumn({key2: parse_spec2})))
+    self.assertDictEqual({key1: parse_spec1, key2: parse_spec2}, actual)
+
+  def test_equal_keys_different_parse_spec(self):
+    key1 = 'key1'
+    parse_spec1 = parsing_ops.FixedLenFeature(
+        shape=(2,), dtype=dtypes.float32, default_value=0.)
+    parse_spec2 = parsing_ops.VarLenFeature(dtype=dtypes.string)
+    with self.assertRaisesRegexp(
+        ValueError,
+        'feature_columns contain different parse_spec for key key1'):
+      fc.make_parse_example_spec(
+          (self._TestFeatureColumn({key1: parse_spec1}),
+           self._TestFeatureColumn({key1: parse_spec2})))
+
+  def test_equal_keys_equal_parse_spec(self):
+    key1 = 'key1'
+    parse_spec1 = parsing_ops.FixedLenFeature(
+        shape=(2,), dtype=dtypes.float32, default_value=0.)
+    actual = fc.make_parse_example_spec(
+        (self._TestFeatureColumn({key1: parse_spec1}),
+         self._TestFeatureColumn({key1: parse_spec1})))
+    self.assertDictEqual({key1: parse_spec1}, actual)
+
+  def test_multiple_features_dict(self):
+    """parse_spc for one column is a dict with length > 1."""
+    key1 = 'key1'
+    parse_spec1 = parsing_ops.FixedLenFeature(
+        shape=(2,), dtype=dtypes.float32, default_value=0.)
+    key2 = 'key2'
+    parse_spec2 = parsing_ops.VarLenFeature(dtype=dtypes.string)
+    key3 = 'key3'
+    parse_spec3 = parsing_ops.VarLenFeature(dtype=dtypes.int32)
+    actual = fc.make_parse_example_spec(
+        (self._TestFeatureColumn({key1: parse_spec1}),
+         self._TestFeatureColumn({key2: parse_spec2, key3: parse_spec3})))
+    self.assertDictEqual(
+        {key1: parse_spec1, key2: parse_spec2, key3: parse_spec3}, actual)
+
+
 def _assert_sparse_tensor_value(test_case, expected, actual):
   test_case.assertEqual(np.int64, np.array(actual.indices).dtype)
   test_case.assertAllEqual(expected.indices, actual.indices)
-- 
GitLab


From 2fd1f880254322e50f65b1739fd502b56074e9f2 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 9 May 2017 16:06:49 -0700
Subject: [PATCH 1174/1563] Added missing const qualifier

PiperOrigin-RevId: 155566351
---
 tensorflow/core/common_runtime/shape_refiner.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/common_runtime/shape_refiner.h b/tensorflow/core/common_runtime/shape_refiner.h
index 9709bd0302..75eb81c346 100644
--- a/tensorflow/core/common_runtime/shape_refiner.h
+++ b/tensorflow/core/common_runtime/shape_refiner.h
@@ -70,7 +70,7 @@ class ShapeRefiner {
   }
 
   // Getters and setters for graph_def_version_.
-  int32 graph_def_version() { return graph_def_version_; }
+  int32 graph_def_version() const { return graph_def_version_; }
   void set_graph_def_version(int32 version) { graph_def_version_ = version; }
 
   void set_require_shape_inference_fns(bool require_shape_inference_fns) {
-- 
GitLab


From 96980d5f7a8e5f4ae0d06c23663e2f7fecc2e7ba Mon Sep 17 00:00:00 2001
From: Yuan Yu <yuanbyu@google.com>
Date: Tue, 9 May 2017 16:29:23 -0700
Subject: [PATCH 1175/1563] Fix a bug when applying stop_gradient() on the
 gradient of a while loop. It turned out that I really needed to have
 tf.gradients() to backprop correctly on the gradient loop even if we have a
 stop_gradient on it. So, with this CL, I suspect that we are epsilon away to
 support higher-order gradients for while loops.

PiperOrigin-RevId: 155568884
---
 tensorflow/core/protobuf/control_flow.proto   |  5 +-
 .../kernel_tests/control_flow_ops_py_test.py  | 25 ++++++++
 tensorflow/python/ops/control_flow_grad.py    | 13 +++--
 tensorflow/python/ops/control_flow_ops.py     | 58 ++++++++++++++-----
 4 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/tensorflow/core/protobuf/control_flow.proto b/tensorflow/core/protobuf/control_flow.proto
index 24f42322c0..10a2ce54d7 100644
--- a/tensorflow/core/protobuf/control_flow.proto
+++ b/tensorflow/core/protobuf/control_flow.proto
@@ -61,6 +61,9 @@ message WhileContextDef {
   // List of names for exit tensors.
   repeated string loop_exit_names = 8;
 
+  // List of names for enter tensors.
+  repeated string loop_enter_names = 9;
+
   // Values and external values in control flow context.
-  ValuesDef values_def = 9;
+  ValuesDef values_def = 10;
 }
diff --git a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
index 00f6cc0d6d..405c003cab 100644
--- a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
+++ b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
@@ -45,6 +45,8 @@ from tensorflow.python.ops import gen_data_flow_ops
 from tensorflow.python.ops import gen_logging_ops
 from tensorflow.python.ops import gen_state_ops
 from tensorflow.python.ops import gradients_impl
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import logging_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import resource_variable_ops
@@ -2139,6 +2141,29 @@ class ControlFlowTest(test.TestCase):
       r = gradients_impl.gradients(r, y)[0]
       self.assertEqual(388.0, r.eval())
 
+  def testStopGradMultiFlows(self):
+    with self.test_session():
+      def body(i, y, r):
+        x = variable_scope.get_variable(
+            "x", shape=(), dtype=dtypes.float32,
+            initializer=init_ops.ones_initializer())
+        y *= x
+        return [i + 1, y, r + math_ops.reduce_sum(y)]
+
+      i0 = constant_op.constant(0)
+      y0 = array_ops.ones(5)
+      r0 = constant_op.constant(0.0)
+      cond = lambda i, y, r: i < 1
+      _, _, r = control_flow_ops.while_loop(
+          cond, body, [i0, y0, r0], back_prop=True)
+
+      vars_ = variables.global_variables()
+      grads = linalg_ops.norm(gradients_impl.gradients(r, vars_)[0])
+      z = math_ops.add(r, array_ops.stop_gradient(math_ops.reduce_sum(grads)))
+      result = gradients_impl.gradients(z, vars_)[0]
+      variables.global_variables_initializer().run()
+      self.assertEqual(5.0, result.eval())
+
   def testOneValueCond(self):
     with self.test_session():
       c = array_ops.placeholder(dtypes.int32, shape=[])
diff --git a/tensorflow/python/ops/control_flow_grad.py b/tensorflow/python/ops/control_flow_grad.py
index 133528a1cd..17c0aae4e2 100644
--- a/tensorflow/python/ops/control_flow_grad.py
+++ b/tensorflow/python/ops/control_flow_grad.py
@@ -49,7 +49,7 @@ def _SwitchGrad(op, *grad):
       # This is the second time this Switch is visited. It comes from
       # the non-exit branch of the Switch, so update the second input
       # to the Merge.
-      # TODO: Perform shape inference with this new input.
+      # TODO(yuanbyu): Perform shape inference with this new input.
       if grad[1] is not None:
         # pylint: disable=protected-access
         control_flow_ops._AddNextAndBackEdge(merge_grad, grad[1])
@@ -162,11 +162,14 @@ def _ExitGrad(op, grad):
     dense_shape = grad.dense_shape
     if dense_shape is not None:
       grad_ctxt.AddName(dense_shape.name)
-  enter_fn = control_flow_ops._Enter  # pylint: disable=protected-access
   grad_ctxt.Enter()
-  result = enter_fn(grad, grad_ctxt.name, is_constant=False,
-                    parallel_iterations=grad_ctxt.parallel_iterations,
-                    name="b_exit")
+  # pylint: disable=protected-access
+  result = control_flow_ops._Enter(
+      grad, grad_ctxt.name, is_constant=False,
+      parallel_iterations=grad_ctxt.parallel_iterations,
+      name="b_exit")
+  # pylint: enable=protected-access
+  grad_ctxt.loop_enters.append(result)
   grad_ctxt.Exit()
   return result
 
diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index ad94183e5b..7ee4ca0307 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -335,7 +335,7 @@ def _SwitchRefOrTensor(data, pred, name="Switch"):
     name: A name for this operation (optional).
 
   Returns:
-    `(output_false, output_false)`: If `pred` is true, data will be forwarded to
+    `(output_false, output_true)`: If `pred` is true, data will be forwarded to
     `output_true`, otherwise it goes to `output_false`.
 
   Raises:
@@ -1049,15 +1049,19 @@ class ControlFlowState(object):
     """
     loop_exits = []
     for _, grad_state in self._map.items():
+      # pylint: disable=protected-access
       for y in grad_state.forward_loop_exits:
-        # pylint: disable=protected-access
         if pending_count[y.op._id] == 0:
           grad_state.pending_exits_count -= 1
           if y.op._id not in to_ops_set:
             grad_state.unused_exits.append(y)
           if grad_state.pending_exits_count == 0:
             loop_exits.extend(grad_state.unused_exits)
-        # pylint: enable=protected-access
+      # Need to include Enters in backprop for higher-order gradients.
+      for y in grad_state.forward_context.loop_enters:
+        if pending_count[y.op._id] == 0:
+          pending_count[y.op._id] = 1
+      # pylint: enable=protected-access
     return loop_exits
 
   def EnterGradWhileContext(self, op, before):
@@ -1927,6 +1931,8 @@ class WhileContext(ControlFlowContext):
     self._pivot = None
     # The list of exit tensors for loop variables.
     self._loop_exits = []
+    # The list of enter tensors for loop variables.
+    self._loop_enters = []
 
   def _init_from_proto(self, context_def, import_scope=None):
     """Creates a new `WhileContext` from protocol buffer.
@@ -1956,6 +1962,10 @@ class WhileContext(ControlFlowContext):
     self._loop_exits = [g.as_graph_element(
         ops.prepend_name_scope(exit_name, import_scope))
                         for exit_name in context_def.loop_exit_names]
+    # The list of enter tensors for loop variables.
+    self._loop_enters = [g.as_graph_element(
+        ops.prepend_name_scope(enter_name, import_scope))
+                         for enter_name in context_def.loop_enter_names]
     super(WhileContext, self).__init__(values_def=context_def.values_def,
                                        import_scope=import_scope)
 
@@ -1983,6 +1993,11 @@ class WhileContext(ControlFlowContext):
     """The boolean tensor representing the loop termination condition."""
     return self._pivot
 
+  @property
+  def loop_enters(self):
+    """The list of enter tensors for loop variables."""
+    return self._loop_enters
+
   @property
   def loop_exits(self):
     """The list of exit tensors for loop variables."""
@@ -2016,10 +2031,12 @@ class WhileContext(ControlFlowContext):
           self._pivot_for_body.name, export_scope)
       context_def.pivot_name = ops.strip_name_scope(
           self._pivot.name, export_scope)
-      if self._loop_exits:
-        context_def.loop_exit_names.extend(
-            [ops.strip_name_scope(l.name, export_scope)
-             for l in self._loop_exits])
+      context_def.loop_exit_names.extend(
+          [ops.strip_name_scope(l.name, export_scope)
+           for l in self._loop_exits])
+      context_def.loop_enter_names.extend(
+          [ops.strip_name_scope(l.name, export_scope)
+           for l in self._loop_enters])
       context_def.values_def.MergeFrom(
           super(WhileContext, self)._to_proto(
               export_scope=export_scope))
@@ -2199,6 +2216,8 @@ class WhileContext(ControlFlowContext):
     enter_n = _Enter(n, self._name, is_constant=False,
                      parallel_iterations=self._parallel_iterations,
                      name="f_count")
+    self.loop_enters.append(enter_n)
+
     merge_n = merge([enter_n, enter_n])[0]
     switch_n = switch(merge_n, self._pivot)
 
@@ -2239,6 +2258,8 @@ class WhileContext(ControlFlowContext):
     enter_count = _Enter(count, self._name, is_constant=False,
                          parallel_iterations=self._parallel_iterations,
                          name="b_count")
+    self.loop_enters.append(enter_count)
+
     merge_count = merge([enter_count, enter_count])[0]
     self._pivot_for_pred = merge_count
 
@@ -2326,6 +2347,8 @@ class WhileContext(ControlFlowContext):
     enter_acc = _Enter(acc, self._name, is_constant=False,
                        parallel_iterations=self._parallel_iterations,
                        name="b_acc")
+    self.loop_enters.append(enter_acc)
+
     merge_acc = merge([enter_acc, enter_acc], name="b_acc")[0]
     switch_acc_false, switch_acc_true = switch(merge_acc, self._pivot)
 
@@ -2333,10 +2356,10 @@ class WhileContext(ControlFlowContext):
     next_acc = _NextIteration(add_acc)
     merge_acc.op._update_input(1, next_acc)  # pylint: disable=protected-access
 
-    acc_result = exit(switch_acc_false, name="b_acc")
-    self.loop_exits.append(acc_result)
-    self.ExitResult([acc_result])
-    return acc_result
+    result_acc = exit(switch_acc_false, name="b_acc")
+    self.loop_exits.append(result_acc)
+    self.ExitResult([result_acc])
+    return result_acc
 
   def AddBackPropIndexedSlicesAccumulator(self, op, grad):
     """This is used for accumulating gradients that are IndexedSlices.
@@ -2393,6 +2416,8 @@ class WhileContext(ControlFlowContext):
     enter_acc = [_Enter(x, self._name, is_constant=False,
                         parallel_iterations=self._parallel_iterations,
                         name="b_acc") for x in init_acc]
+    self.loop_enters.extend(enter_acc)
+
     merge_acc = [merge([x, x], name="b_acc")[0] for x in enter_acc]
     switch_acc = [switch(x, self._pivot) for x in merge_acc]
 
@@ -2410,13 +2435,13 @@ class WhileContext(ControlFlowContext):
     for xm, xn in zip(merge_acc, next_acc):
       xm.op._update_input(1, xn)  # pylint: disable=protected-access
 
-    acc_exits = [exit(x[0], name="b_acc") for x in switch_acc]
-    self.loop_exits.extend(acc_exits)
+    exit_acc = [exit(x[0], name="b_acc") for x in switch_acc]
+    self.loop_exits.extend(exit_acc)
 
-    self.ExitResult(acc_exits)
+    self.ExitResult(exit_acc)
     return ops.IndexedSlices(
-        indices=acc_exits[0], values=acc_exits[1],
-        dense_shape=acc_exits[2] if shape_acc is not None else None)
+        indices=exit_acc[0], values=exit_acc[1],
+        dense_shape=exit_acc[2] if shape_acc is not None else None)
 
   def _InitializeValues(self, values):
     """Makes the values known to this context."""
@@ -2467,6 +2492,7 @@ class WhileContext(ControlFlowContext):
     # Fix the control inputs and control flow context of these enter ops.
     self._FixControlInputsAndContext(enter_vars)
     self._InitializeValues(enter_vars)
+    self._loop_enters = enter_vars
 
     merge_vars = [merge([x, x])[0] for x in enter_vars]
     self._pivot_for_pred = merge_vars[0]
-- 
GitLab


From b808475cc65351f16d383a53547f82f9632aeedd Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 16:32:07 -0700
Subject: [PATCH 1176/1563] Remove initialize.h.  The
 REGISTER_MODULE_INITIALIZER macro is used in only one place, and the relevant
 code is more readable (and not even meaningfully longer) without the macro.

PiperOrigin-RevId: 155569181
---
 tensorflow/BUILD                              |  1 -
 tensorflow/compiler/xla/port/BUILD            | 33 ----------------
 tensorflow/compiler/xla/port/initialize.h     | 39 -------------------
 tensorflow/compiler/xla/service/cpu/BUILD     |  1 -
 .../compiler/xla/service/cpu/cpu_compiler.cc  |  7 ++--
 5 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 tensorflow/compiler/xla/port/BUILD
 delete mode 100644 tensorflow/compiler/xla/port/initialize.h

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 79de05e266..32bbe9af63 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -194,7 +194,6 @@ filegroup(
         "//tensorflow/compiler/xla/client:all_files",
         "//tensorflow/compiler/xla/client/lib:all_files",
         "//tensorflow/compiler/xla/legacy_flags:all_files",
-        "//tensorflow/compiler/xla/port:all_files",
         "//tensorflow/compiler/xla/service:all_files",
         "//tensorflow/compiler/xla/service/cpu:all_files",
         "//tensorflow/compiler/xla/service/gpu:all_files",
diff --git a/tensorflow/compiler/xla/port/BUILD b/tensorflow/compiler/xla/port/BUILD
deleted file mode 100644
index 6fc5f1185c..0000000000
--- a/tensorflow/compiler/xla/port/BUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-licenses(["notice"])  # Apache 2.0
-
-# Filegroup used to collect source files for dependency checking.
-filegroup(
-    name = "c_srcs",
-    data = glob([
-        "**/*.cc",
-        "**/*.h",
-    ]),
-    visibility = ["//tensorflow/compiler/xla:internal"],
-)
-
-cc_library(
-    name = "initialize",
-    hdrs = ["initialize.h"],
-    visibility = [
-        "//tensorflow/compiler/xla:__subpackages__",
-    ],
-)
-
-# -----------------------------------------------------------------------------
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/compiler/xla/port/initialize.h b/tensorflow/compiler/xla/port/initialize.h
deleted file mode 100644
index 13d9632f97..0000000000
--- a/tensorflow/compiler/xla/port/initialize.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_COMPILER_XLA_PORT_INITIALIZE_H_
-#define TENSORFLOW_COMPILER_XLA_PORT_INITIALIZE_H_
-
-#undef REGISTER_MODULE_INITIALIZER
-
-namespace xla {
-
-class Initializer {
- public:
-  typedef void (*InitializerFunc)();
-  explicit Initializer(InitializerFunc func) { func(); }
-};
-
-}  // namespace xla
-
-#define REGISTER_INITIALIZER(type, name, body)         \
-  static void google_init_##type##_##name() { body; }  \
-  xla::Initializer google_initializer_##type##_##name( \
-      google_init_##type##_##name)
-
-#define REGISTER_MODULE_INITIALIZER(name, body) \
-  REGISTER_INITIALIZER(module, name, body)
-
-#endif  // TENSORFLOW_COMPILER_XLA_PORT_INITIALIZE_H_
diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD
index 6e24506b38..fbfad70098 100644
--- a/tensorflow/compiler/xla/service/cpu/BUILD
+++ b/tensorflow/compiler/xla/service/cpu/BUILD
@@ -53,7 +53,6 @@ cc_library(
         "//tensorflow/compiler/xla:util",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/legacy_flags:cpu_compiler_flags",
-        "//tensorflow/compiler/xla/port:initialize",
         "//tensorflow/compiler/xla/service:algebraic_simplifier",
         "//tensorflow/compiler/xla/service:buffer_assignment",
         "//tensorflow/compiler/xla/service:buffer_liveness",
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
index 3e6be5a7a2..1ba45e5983 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
@@ -39,7 +39,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/legacy_flags/cpu_compiler_flags.h"
 #include "tensorflow/compiler/xla/literal_util.h"
 #include "tensorflow/compiler/xla/map_util.h"
-#include "tensorflow/compiler/xla/port/initialize.h"
 #include "tensorflow/compiler/xla/protobuf_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/algebraic_simplifier.h"
@@ -683,8 +682,10 @@ int64 CpuCompiler::ShapeSizeBytes(const Shape& shape) const {
 }  // namespace cpu
 }  // namespace xla
 
-REGISTER_MODULE_INITIALIZER(cpu_compiler, {
+static bool InitModule() {
   xla::Compiler::RegisterCompilerFactory(se::host::kHostPlatformId, []() {
     return xla::MakeUnique<xla::cpu::CpuCompiler>();
   });
-});
+  return true;
+}
+static bool module_initialized = InitModule();
-- 
GitLab


From 236ef2c9c7b77f851609cb4ee2d82c1428b66c8c Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Tue, 9 May 2017 19:22:09 -0700
Subject: [PATCH 1177/1563] Make pprof definition deterministic

PiperOrigin-RevId: 155584393
---
 .../contrib/tfprof/python/tools/tfprof/BUILD  |  4 +-
 .../python/tools/tfprof/pprof_profiler.py     |  2 +-
 .../tools/tfprof/pprof_profiler_test.py       |  2 +-
 tensorflow/workspace.bzl                      | 37 ++++---------------
 third_party/pprof.BUILD                       |  2 +-
 5 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
index 0a920780c2..c96f6719e7 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/BUILD
@@ -119,7 +119,7 @@ py_library(
     name = "pprof_profiler",
     srcs = ["pprof_profiler.py"],
     srcs_version = "PY2AND3",
-    deps = ["@pprof_profile_proto//:pprof_proto_py"],
+    deps = ["@com_google_pprof//:pprof_proto_py"],
 )
 
 py_test(
@@ -134,7 +134,7 @@ py_test(
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
-        "@pprof_profile_proto//:pprof_proto_py",
+        "@com_google_pprof//:pprof_proto_py",
     ],
 )
 
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py
index c3fea915a3..c57e45748d 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler.py
@@ -47,7 +47,7 @@ import string
 import sys
 import time
 
-from pprof import profile_pb2
+from proto import profile_pb2
 
 
 if sys.version_info < (3,):
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py
index 13d3fb41ac..6487adf992 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import gzip
 
-from pprof import profile_pb2
+from proto import profile_pb2
 from tensorflow.contrib.tfprof.python.tools.tfprof import pprof_profiler
 from tensorflow.core.framework import step_stats_pb2
 from tensorflow.core.protobuf import config_pb2
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 6a003c4e0e..0a495160ea 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -70,27 +70,6 @@ temp_workaround_http_archive = repository_rule(
     },
 )
 
-def _http_files_with_build_impl(repo_ctx):
-  repo_ctx.template("BUILD", repo_ctx.attr.build_file, {
-      "%prefix%": ".." if _repos_are_siblings() else "external",
-      "%ws%": repo_ctx.attr.repository
-  }, False)
-  for output, urls in repo_ctx.attr.file_urls.items():
-    repo_ctx.download(urls, output,
-                      repo_ctx.attr.sha256, executable=False)
-
-# Downloads a set of files and adds a BUILD file.
-http_files_with_build = repository_rule(
-    implementation = _http_files_with_build_impl,
-    attrs = {
-        "build_file": attr.label(),
-        "repository": attr.string(),
-        # Map from output file to URLs to download that file from.
-        "file_urls": attr.string_list_dict(default = {}),
-        "sha256": attr.string(default = ""),
-    },
-)
-
 
 # Executes specified command with arguments and calls 'fail' if it exited with
 # non-zero code
@@ -638,15 +617,15 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       repository = tf_repo_name,
   )
 
-  http_files_with_build(
-      name = "pprof_profile_proto",
-      file_urls = {
-          "pprof/profile.proto":
-          ["https://raw.githubusercontent.com/google/pprof/master/proto/profile.proto"],
-          "pprof/LICENSE":
-          ["https://raw.githubusercontent.com/google/pprof/master/LICENSE"]},
+  native.new_http_archive(
+      name = "com_google_pprof",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/github.com/google/pprof/archive/c0fb62ec88c411cc91194465e54db2632845b650.tar.gz",
+          "https://github.com/google/pprof/archive/c0fb62ec88c411cc91194465e54db2632845b650.tar.gz",
+      ],
+      sha256 = "e0928ca4aa10ea1e0551e2d7ce4d1d7ea2d84b2abbdef082b0da84268791d0c4",
+      strip_prefix = "pprof-c0fb62ec88c411cc91194465e54db2632845b650",
       build_file = str(Label("//third_party:pprof.BUILD")),
-      repository = tf_repo_name,
   )
 
   ##############################################################################
diff --git a/third_party/pprof.BUILD b/third_party/pprof.BUILD
index 6f27bfc819..edd5209594 100644
--- a/third_party/pprof.BUILD
+++ b/third_party/pprof.BUILD
@@ -10,7 +10,7 @@ exports_files(["pprof/LICENSE"])
 
 py_proto_library(
     name = "pprof_proto_py",
-    srcs = ["pprof/profile.proto"],
+    srcs = ["proto/profile.proto"],
     default_runtime = "@protobuf//:protobuf_python",
     protoc = "@protobuf//:protoc",
     srcs_version = "PY2AND3",
-- 
GitLab


From bca4bb289ba4ae13760f2ab2c6bb19a36743577c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 20:54:30 -0700
Subject: [PATCH 1178/1563] [XLA] Use a templated Visitor for typed evaluation,
 instead of switching on opcode twice.

PiperOrigin-RevId: 155588986
---
 .../compiler/xla/service/hlo_evaluator.cc     | 822 ++++++++++--------
 .../compiler/xla/service/hlo_evaluator.h      |  68 +-
 2 files changed, 512 insertions(+), 378 deletions(-)

diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
index 1b3babc214..e0447d69aa 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -46,138 +46,485 @@ limitations under the License.
 
 namespace xla {
 
-namespace {
-
-template <typename NativeT>
-std::unique_ptr<Literal> ElementWiseUnaryOp(
-    const Shape& shape, std::function<NativeT(NativeT)>&& unary_op,
-    const Literal& operand) {
-  DCHECK(ShapeUtil::SameDimensions(shape, operand.shape()));
-
-  auto result = LiteralUtil::CreateFromShape(shape);
-
-  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-  do {
-    LiteralUtil::Set<NativeT>(
-        result.get(), multi_index,
-        unary_op(LiteralUtil::Get<NativeT>(operand, multi_index)));
-  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-  return result;
-}
-
-template <typename NativeT>
-std::unique_ptr<Literal> ElementWiseBinaryOp(
-    const Shape& shape, std::function<NativeT(NativeT, NativeT)>&& binary_op,
-    const Literal& lhs, const Literal& rhs) {
-  DCHECK(ShapeUtil::SameDimensions(shape, rhs.shape()));
-  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
-
-  auto result = LiteralUtil::CreateFromShape(shape);
-
-  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-  do {
-    LiteralUtil::Set<NativeT>(
-        result.get(), multi_index,
-        binary_op(LiteralUtil::Get<NativeT>(lhs, multi_index),
-                  LiteralUtil::Get<NativeT>(rhs, multi_index)));
-  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-  return result;
-}
-
-template <typename NativeT, typename LhsType, typename RhsType,
-          typename EhsType>
-std::unique_ptr<Literal> ElementWiseTernaryOp(
-    const Shape& shape,
-    std::function<NativeT(LhsType lhs, RhsType rhs, EhsType ehs)>&& ternary_op,
-    const Literal& lhs, const Literal& rhs, const Literal& ehs) {
-  DCHECK(ShapeUtil::SameDimensions(shape, lhs.shape()));
-  DCHECK(ShapeUtil::SameDimensions(lhs.shape(), rhs.shape()));
-  DCHECK(ShapeUtil::SameDimensions(rhs.shape(), ehs.shape()));
-
-  auto result = LiteralUtil::CreateFromShape(shape);
-
-  std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
-  do {
-    LiteralUtil::Set<NativeT>(
-        result.get(), multi_index,
-        ternary_op(LiteralUtil::Get<LhsType>(lhs, multi_index),
-                   LiteralUtil::Get<RhsType>(rhs, multi_index),
-                   LiteralUtil::Get<EhsType>(ehs, multi_index)));
-  } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
-
-  return result;
-}
-
-// Templated abs so that unsigned types can be passed in without warning.
-template <
-    typename NativeT,
-    typename std::enable_if<std::is_unsigned<NativeT>::value>::type* = nullptr>
-NativeT AbsoluteVal(NativeT value) {
-  return value;
-}
-
-template <
-    typename NativeT,
-    typename std::enable_if<std::is_signed<NativeT>::value>::type* = nullptr>
-NativeT AbsoluteVal(NativeT value) {
-  return std::abs(value);
-}
-
-}  // namespace
-
-Status HloEvaluator::DefaultAction(HloInstruction* hlo) {
-  VLOG(2) << "Handle instruction: " << hlo->ToString();
-  Shape shape = hlo->shape();
-  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+template <typename ReturnT>
+class HloEvaluator::TypedVisitor : public DfsHloVisitorWithDefault {
+ public:
+  explicit TypedVisitor(HloEvaluator* p) : parent_(p) {}
+
+  Status DefaultAction(HloInstruction* hlo_instruction) override {
+    return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
+                         HloOpcodeString(hlo_instruction->opcode()).c_str());
+  };
+
+  // TODO(b/35950897): many of the stl functions used in the handlers are not
+  // overloaded for every XLA primitive types.
+
+  template <typename NativeT,
+            typename std::enable_if<std::is_unsigned<NativeT>::value>::type* =
+                nullptr>
+  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[abs],
+                        ElementWiseUnaryOp(abs, [](NativeT elem_operand) {
+                          return elem_operand;
+                        }));
+    return Status::OK();
+  };
+
+  template <
+      typename NativeT,
+      typename std::enable_if<std::is_signed<NativeT>::value>::type* = nullptr>
+  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[abs],
+                        ElementWiseUnaryOp(abs, [](NativeT elem_operand) {
+                          return std::abs(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleAbs(HloInstruction* abs, HloInstruction* operand) override {
+    return HandleAbs<ReturnT>(abs, operand);
+  };
+
+  Status HandleCeil(HloInstruction* ceil, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[ceil],
+                        ElementWiseUnaryOp(ceil, [](ReturnT elem_operand) {
+                          return std::ceil(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleCopy(HloInstruction* copy, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[copy],
+                        ElementWiseUnaryOp(copy, [](ReturnT elem_operand) {
+                          return elem_operand;
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleExp(HloInstruction* exp, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[exp],
+                        ElementWiseUnaryOp(exp, [](ReturnT elem_operand) {
+                          return std::exp(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleFloor(HloInstruction* floor, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[floor],
+                        ElementWiseUnaryOp(floor, [](ReturnT elem_operand) {
+                          return std::floor(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleIsFinite(HloInstruction* is_finite,
+                        HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[is_finite],
+                        ElementWiseUnaryOp(is_finite, [](ReturnT elem_operand) {
+                          return std::isfinite(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleLog(HloInstruction* log, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[log],
+                        ElementWiseUnaryOp(log, [](ReturnT elem_operand) {
+                          return std::log(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleLogicalNot(HloInstruction* logical_not,
+                          HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[logical_not],
+        ElementWiseUnaryOp(logical_not,
+                           [](ReturnT elem_operand) { return !elem_operand; }));
+    return Status::OK();
+  };
+
+  Status HandleNegate(HloInstruction* negate,
+                      HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[negate],
+                        ElementWiseUnaryOp(negate, [](ReturnT elem_operand) {
+                          return -elem_operand;
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleSign(HloInstruction* sign, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[sign],
+                        ElementWiseUnaryOp(sign, [](ReturnT elem_operand) {
+                          return (ReturnT(0) < elem_operand) -
+                                 (elem_operand < ReturnT(0));
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleTanh(HloInstruction* tanh, HloInstruction* operand) override {
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[tanh],
+                        ElementWiseUnaryOp(tanh, [](ReturnT elem_operand) {
+                          return std::tanh(elem_operand);
+                        }));
+    return Status::OK();
+  };
+
+  Status HandleMultiply(HloInstruction* multiply, HloInstruction* lhs,
+                        HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[multiply],
+        ElementWiseBinaryOp(multiply, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem * rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleSubtract(HloInstruction* subtract, HloInstruction* lhs,
+                        HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[subtract],
+        ElementWiseBinaryOp(subtract, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem - rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleAdd(HloInstruction* add, HloInstruction* lhs,
+                   HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[add],
+        ElementWiseBinaryOp(add, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem + rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleDivide(HloInstruction* divide, HloInstruction* lhs,
+                      HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[divide],
+        ElementWiseBinaryOp(divide, [](ReturnT lhs_elem, ReturnT rhs_elem) {
+          return lhs_elem / rhs_elem;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleCompare(HloInstruction* compare, HloOpcode opcode,
+                       HloInstruction* lhs, HloInstruction* rhs) override {
+    std::function<bool(ReturnT, ReturnT)> compare_op;
+    switch (opcode) {
+      case HloOpcode::kEq:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el == rhs_el;
+        };
+        break;
+      case HloOpcode::kNe:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el != rhs_el;
+        };
+        break;
+      case HloOpcode::kGe:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el >= rhs_el;
+        };
+        break;
+      case HloOpcode::kGt:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el > rhs_el;
+        };
+        break;
+      case HloOpcode::kLe:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el <= rhs_el;
+        };
+        break;
+      case HloOpcode::kLt:
+        compare_op = [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el < rhs_el;
+        };
+        break;
+      default:
+        LOG(FATAL) << "unhandled HLO opcode for conversion to Comparison: "
+                   << HloOpcodeString(opcode);
+    }
 
-  TF_ASSIGN_OR_RETURN(evaluated_[hlo], EvaluateBasedOnType(hlo));
-  return Status::OK();
-}
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!(ShapeUtil::SameDimensions(compare->shape(), rhs->shape()) &&
+          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()))) {
+      return Unimplemented(
+          "Compare operation with mismatched dimensions, likely due to "
+          "broadcasting is unsupported.");
+    }
 
-Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
-  VLOG(2) << "HandleParameter: " << parameter->ToString();
-  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
-  VLOG(2) << "Parameter evaluated to: "
-          << LiteralUtil::ToString(*input_literal);
-  CHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
+    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
+    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
+
+    auto result = LiteralUtil::CreateFromShape(compare->shape());
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<bool>(
+          result.get(), multi_index,
+          compare_op(LiteralUtil::Get<ReturnT>(lhs_literal, multi_index),
+                     LiteralUtil::Get<ReturnT>(rhs_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    parent_->evaluated_[compare] = std::move(result);
+
+    return Status::OK();
+  };
+
+  Status HandleMaximum(HloInstruction* maximum, HloInstruction* lhs,
+                       HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[maximum],
+        ElementWiseBinaryOp(maximum, [](ReturnT lhs, ReturnT rhs) {
+          return std::max(lhs, rhs);
+        }));
+    return Status::OK();
+  };
+
+  Status HandleMinimum(HloInstruction* minimum, HloInstruction* lhs,
+                       HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[minimum],
+        ElementWiseBinaryOp(minimum, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return std::min(lhs_el, rhs_el);
+        }));
+    return Status::OK();
+  };
+
+  Status HandlePower(HloInstruction* power, HloInstruction* lhs,
+                     HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[power],
+        ElementWiseBinaryOp(power, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return std::pow(lhs_el, rhs_el);
+        }));
+    return Status::OK();
+  };
+
+  Status HandleRemainder(HloInstruction* remainder, HloInstruction* lhs,
+                         HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[remainder],
+        ElementWiseBinaryOp(remainder, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return std::remainder(lhs_el, rhs_el);
+        }));
+    return Status::OK();
+  };
+
+  Status HandleLogicalAnd(HloInstruction* logical_and, HloInstruction* lhs,
+                          HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[logical_and],
+        ElementWiseBinaryOp(logical_and, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el && rhs_el;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleLogicalOr(HloInstruction* logical_or, HloInstruction* lhs,
+                         HloInstruction* rhs) override {
+    TF_ASSIGN_OR_RETURN(
+        parent_->evaluated_[logical_or],
+        ElementWiseBinaryOp(logical_or, [](ReturnT lhs_el, ReturnT rhs_el) {
+          return lhs_el || rhs_el;
+        }));
+    return Status::OK();
+  };
+
+  Status HandleClamp(HloInstruction* clamp, HloInstruction* min,
+                     HloInstruction* arg, HloInstruction* max) override {
+    std::function<ReturnT(ReturnT, ReturnT, ReturnT)> clamp_op =
+        [](ReturnT low, ReturnT high, ReturnT value) {
+          return std::max(low, std::min(value, high));
+        };
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[clamp],
+                        ElementWiseTernaryOp(clamp, std::move(clamp_op)));
+    return Status::OK();
+  };
+
+  Status HandleSelect(HloInstruction* select, HloInstruction* pred,
+                      HloInstruction* on_true,
+                      HloInstruction* on_false) override {
+    CHECK(!ShapeUtil::IsTuple(select->shape()));
+    std::function<ReturnT(bool, ReturnT, ReturnT)> select_op =
+        [](bool pred, ReturnT on_true, ReturnT on_false) {
+          if (pred) {
+            return on_true;
+          }
+          return on_false;
+        };
+    TF_ASSIGN_OR_RETURN(parent_->evaluated_[select],
+                        ElementWiseTernaryOp(select, std::move(select_op)));
+    return Status::OK();
+  };
+
+  Status Preprocess(HloInstruction* hlo) override {
+    VLOG(2) << hlo->ToString();
+    return Status::OK();
+  };
+
+ private:
+  StatusOr<std::unique_ptr<Literal>> ElementWiseUnaryOp(
+      HloInstruction* instruction,
+      const std::function<ReturnT(ReturnT)>& unary_op) {
+    const auto shape = instruction->shape();
+    const auto* operand = instruction->operand(0);
+
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!ShapeUtil::SameDimensions(shape, operand->shape())) {
+      return Unimplemented(
+          "Implicit broadcasting is currently unsupported in HLO evaluator "
+          "Shape Mismatch: %s vs %s",
+          ShapeUtil::HumanString(shape).c_str(),
+          ShapeUtil::HumanString(operand->shape()).c_str());
+    }
 
-  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
-  return Status::OK();
-}
+    const Literal& operand_literal = parent_->GetEvaluatedLiteralFor(operand);
+
+    auto result = LiteralUtil::CreateFromShape(shape);
+
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<ReturnT>(
+          result.get(), multi_index,
+          unary_op(LiteralUtil::Get<ReturnT>(operand_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    return std::move(result);
+  };
+
+  StatusOr<std::unique_ptr<Literal>> ElementWiseBinaryOp(
+      HloInstruction* instruction,
+      const std::function<ReturnT(ReturnT, ReturnT)>& binary_op) {
+    const auto shape = instruction->shape();
+    const auto* lhs = instruction->operand(0);
+    const auto* rhs = instruction->operand(1);
+
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!(ShapeUtil::SameDimensions(shape, rhs->shape()) &&
+          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()))) {
+      return Unimplemented(
+          "Implicit broadcasting is currently unsupported in HLO evaluator "
+          "Shape Mismatch: %s vs %s vs %s: ",
+          ShapeUtil::HumanString(shape).c_str(),
+          ShapeUtil::HumanString(lhs->shape()).c_str(),
+          ShapeUtil::HumanString(rhs->shape()).c_str());
+    }
 
-Status HloEvaluator::HandleConstant(HloInstruction* constant,
-                                    const Literal& literal) {
-  VLOG(2) << "HandleConstant: " << constant->ToString();
-  CHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
+    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
+    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
+
+    auto result = LiteralUtil::CreateFromShape(shape);
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<ReturnT>(
+          result.get(), multi_index,
+          binary_op(LiteralUtil::Get<ReturnT>(lhs_literal, multi_index),
+                    LiteralUtil::Get<ReturnT>(rhs_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    return std::move(result);
+  };
+
+  template <typename LhsType, typename RhsType, typename EhsType>
+  StatusOr<std::unique_ptr<Literal>> ElementWiseTernaryOp(
+      HloInstruction* instruction,
+      const std::function<ReturnT(LhsType, RhsType, EhsType)>& ternary_op) {
+    const auto shape = instruction->shape();
+    const auto* lhs = instruction->operand(0);
+    const auto* rhs = instruction->operand(1);
+    const auto* ehs = instruction->operand(2);
+
+    // TODO(b/35950897, b/27796129): add DCHECK back once implicit broadcast is
+    // removed.
+    if (!(ShapeUtil::SameDimensions(shape, lhs->shape()) &&
+          ShapeUtil::SameDimensions(lhs->shape(), rhs->shape()) &&
+          ShapeUtil::SameDimensions(rhs->shape(), ehs->shape()))) {
+      return Unimplemented(
+          "Implicit broadcasting is currently unsupported in HLO evaluator "
+          "Shape Mismatch: %s vs %s vs %s vs %s: ",
+          ShapeUtil::HumanString(shape).c_str(),
+          ShapeUtil::HumanString(lhs->shape()).c_str(),
+          ShapeUtil::HumanString(rhs->shape()).c_str(),
+          ShapeUtil::HumanString(ehs->shape()).c_str());
+    }
 
-  evaluated_[constant] = MakeUnique<Literal>(literal);
-  return Status::OK();
+    const Literal& lhs_literal = parent_->GetEvaluatedLiteralFor(lhs);
+    const Literal& rhs_literal = parent_->GetEvaluatedLiteralFor(rhs);
+    const Literal& ehs_literal = parent_->GetEvaluatedLiteralFor(ehs);
+
+    auto result = LiteralUtil::CreateFromShape(shape);
+    std::vector<int64> multi_index(ShapeUtil::Rank(result->shape()), 0);
+    do {
+      LiteralUtil::Set<ReturnT>(
+          result.get(), multi_index,
+          ternary_op(LiteralUtil::Get<LhsType>(lhs_literal, multi_index),
+                     LiteralUtil::Get<RhsType>(rhs_literal, multi_index),
+                     LiteralUtil::Get<EhsType>(ehs_literal, multi_index)));
+    } while (IndexUtil::BumpIndices(result->shape(), &multi_index));
+
+    return std::move(result);
+  };
+
+  HloEvaluator* parent_;
+};
+
+HloEvaluator::HloEvaluator() {
+  typed_visitors_[PRED] = MakeUnique<TypedVisitor<bool>>(this);
+  typed_visitors_[U8] = MakeUnique<TypedVisitor<uint8>>(this);
+  typed_visitors_[U16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
+    return Unimplemented("unhandled primitive type: U16.");
+  });
+  typed_visitors_[U32] = MakeUnique<TypedVisitor<uint32>>(this);
+  typed_visitors_[U64] = MakeUnique<TypedVisitor<uint64>>(this);
+  typed_visitors_[S8] = MakeUnique<TypedVisitor<int8>>(this);
+  typed_visitors_[S16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
+    return Unimplemented("unhandled primitive type: S16.");
+  });
+  typed_visitors_[S32] = MakeUnique<TypedVisitor<int32>>(this);
+  typed_visitors_[S64] = MakeUnique<TypedVisitor<int64>>(this);
+  typed_visitors_[F16] = MakeUnique<FunctionVisitor>([](HloInstruction*) {
+    return Unimplemented("unhandled primitive type: F16.");
+  });
+  typed_visitors_[F32] = MakeUnique<TypedVisitor<float>>(this);
+  typed_visitors_[F64] = MakeUnique<TypedVisitor<double>>(this);
 }
 
 StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
     HloComputation* computation,
     tensorflow::gtl::ArraySlice<const Literal*> args) {
   arg_literals_ = args;
+  evaluated_.clear();
+
   TF_RETURN_IF_ERROR(computation->Accept(this));
   return std::move(FindOrDie(evaluated_, computation->root_instruction()));
 }
 
 StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
     HloInstruction* instruction,
-    tensorflow::gtl::ArraySlice<const Literal*> args) {
+    tensorflow::gtl::ArraySlice<const Literal*> operands) {
   DCHECK(hlo_query::AllOperandsAreParametersOrConstants(*instruction));
   Shape shape = instruction->shape();
   TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
 
-  arg_literals_ = args;
+  arg_literals_ = operands;
+  evaluated_.clear();
 
-  // Evaluate operands of Parameter type against the input literals which caches
-  // the evaluated literal results.
+  // Evaluate operands of Parameter type against the input literals which
+  // caches the evaluated literal results.
   for (const auto operand : instruction->operands()) {
     if (operand->opcode() == HloOpcode::kParameter) {
-      TF_CHECK_OK(HandleParameter(operand));
+      const Literal* input_literal = arg_literals_[operand->parameter_number()];
+      VLOG(2) << "Parameter operand evaluated to: "
+              << LiteralUtil::ToString(*input_literal);
+      TF_RET_CHECK(ShapeUtil::Equal(operand->shape(), input_literal->shape()));
+
+      evaluated_[operand] = MakeUnique<Literal>(*input_literal);
     } else if (operand->opcode() == HloOpcode::kConstant) {
       evaluated_[operand] = MakeUnique<Literal>(operand->literal());
     }
@@ -187,253 +534,24 @@ StatusOr<std::unique_ptr<Literal>> HloEvaluator::Evaluate(
   return std::move(FindOrDie(evaluated_, instruction));
 }
 
-StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateBasedOnType(
-    HloInstruction* instruction) {
-  Shape shape = instruction->shape();
-  TF_CHECK_OK(ShapeUtil::ValidateShape(shape));
+Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
+  VLOG(2) << "HandleParameter: " << parameter->ToString();
+  const Literal* input_literal = arg_literals_[parameter->parameter_number()];
+  VLOG(2) << "Parameter evaluated to: "
+          << LiteralUtil::ToString(*input_literal);
+  DCHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()));
 
-  switch (shape.element_type()) {
-    case PRED:
-      return EvaluateSameTypedElementwise<bool>(instruction);
-    case U8:
-      return EvaluateSameTypedElementwise<uint8>(instruction);
-    case U16:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(U16).c_str());
-    case U32:
-      return EvaluateSameTypedElementwise<uint32>(instruction);
-    case U64:
-      return EvaluateSameTypedElementwise<uint64>(instruction);
-    case S8:
-      return EvaluateSameTypedElementwise<int8>(instruction);
-    case S16:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(S16).c_str());
-    case S32:
-      return EvaluateSameTypedElementwise<int32>(instruction);
-    case S64:
-      return EvaluateSameTypedElementwise<int64>(instruction);
-    case F16:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(F16).c_str());
-    case F32:
-      return EvaluateSameTypedElementwise<float>(instruction);
-    case F64:
-      return EvaluateSameTypedElementwise<double>(instruction);
-    default:
-      return Unimplemented("unhandled primitive type: %s.",
-                           PrimitiveType_Name(shape.element_type()).c_str());
-  }
+  evaluated_[parameter] = MakeUnique<Literal>(*input_literal);
+  return Status::OK();
 }
 
-template <typename NativeT>
-StatusOr<std::unique_ptr<Literal>> HloEvaluator::EvaluateSameTypedElementwise(
-    HloInstruction* instruction) {
-  const std::vector<HloInstruction*>& operands = instruction->operands();
-  HloOpcode opcode = instruction->opcode();
-  const Shape& shape = instruction->shape();
-
-  switch (opcode) {
-    // TODO(b/35950897): many of the stl function used here are not overloaded
-    // for every XLA primitive types.
-
-    // Unary element-wise ops.
-    //
-    case HloOpcode::kAbs:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return AbsoluteVal(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kCeil:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::ceil(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kConvert:
-      CHECK_EQ(operands.size(), 1);
-      // TODO(b/35950897): implement Convert.
-      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
-                           HloOpcodeString(opcode).c_str());
-    case HloOpcode::kCopy:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return operand; },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kExp:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::exp(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kFloor:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::floor(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kIsFinite:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::isfinite(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kLog:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::log(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kLogicalNot:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return !operand; },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kNegate:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return -operand; },
-          GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kSign:
-      CHECK_EQ(operands.size(), 1);
-      CHECK(primitive_util::IsIntegralType(shape.element_type()));
-      return ElementWiseUnaryOp<int>(shape,
-                                     [](NativeT operand) {
-                                       return (NativeT(0) < operand) -
-                                              (operand < NativeT(0));
-                                     },
-                                     GetEvaluatedLiteralFor(operands[0]));
-    case HloOpcode::kTanh:
-      CHECK_EQ(operands.size(), 1);
-      return ElementWiseUnaryOp<NativeT>(
-          shape, [](NativeT operand) { return std::tanh(operand); },
-          GetEvaluatedLiteralFor(operands[0]));
-    // Binary element-wise ops.
-    //
-    case HloOpcode::kAdd:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs + rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kDivide:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs / rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kMultiply:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs * rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kSubtract:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs - rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kEq:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs == rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kGe:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs >= rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kGt:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs > rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLe:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs <= rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLt:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs < rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kNe:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<bool>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs != rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kMaximum:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return std::max(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kMinimum:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return std::min(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kPower:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return std::pow(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kRemainder:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape,
-          [](NativeT lhs, NativeT rhs) { return std::remainder(lhs, rhs); },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLogicalAnd:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs && rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    case HloOpcode::kLogicalOr:
-      CHECK_EQ(operands.size(), 2);
-      return ElementWiseBinaryOp<NativeT>(
-          shape, [](NativeT lhs, NativeT rhs) { return lhs || rhs; },
-          GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]));
-    // Ternary element-wise ops.
-    //
-    case HloOpcode::kClamp: {
-      CHECK_EQ(operands.size(), 3);
-      std::function<NativeT(NativeT, NativeT, NativeT)> clamp_op =
-          [](NativeT low, NativeT high, NativeT value) {
-            return std::max(low, std::min(value, high));
-          };
-      return ElementWiseTernaryOp<NativeT, NativeT, NativeT, NativeT>(
-          shape, std::move(clamp_op), GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]),
-          GetEvaluatedLiteralFor(operands[2]));
-    } break;
-    case HloOpcode::kSelect: {
-      CHECK_EQ(operands.size(), 3);
-      CHECK(!ShapeUtil::IsTuple(shape));
-      std::function<NativeT(bool, NativeT, NativeT)> select_op =
-          [](bool pred, NativeT on_true, NativeT on_false) {
-            if (pred) {
-              return on_true;
-            }
-            return on_false;
-          };
-      return ElementWiseTernaryOp<NativeT, bool, NativeT, NativeT>(
-          shape, std::move(select_op), GetEvaluatedLiteralFor(operands[0]),
-          GetEvaluatedLiteralFor(operands[1]),
-          GetEvaluatedLiteralFor(operands[2]));
-    } break;
-    default:
-      return Unimplemented("unhandled HLO ops for HloEvaluator: %s.",
-                           HloOpcodeString(opcode).c_str());
-  }
+Status HloEvaluator::HandleConstant(HloInstruction* constant,
+                                    const Literal& literal) {
+  VLOG(2) << "HandleConstant: " << constant->ToString();
+  DCHECK(ShapeUtil::Equal(constant->shape(), literal.shape()));
+
+  evaluated_[constant] = MakeUnique<Literal>(literal);
+  return Status::OK();
 }
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.h b/tensorflow/compiler/xla/service/hlo_evaluator.h
index 6372a6c269..50cb32eb85 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.h
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.h
@@ -35,13 +35,21 @@ namespace xla {
 // This class is not thread-safe.
 class HloEvaluator : public DfsHloVisitorWithDefault {
  public:
-  HloEvaluator() {}
-  ~HloEvaluator() override {}
-
+  HloEvaluator();
   // Evaluates a HLO computation and an array of pointers to literals.
   // Return the evaluated result as literal if successful.
-  // Precondition: argument literals are in post-order corresponding to the
-  // input instruction's parameters.
+  // Precondition: argument literals are corresponds to the input computation's
+  // parameters in their post-ordering. For e.g., consider the following graph:
+  //
+  //                *
+  //            /       \
+  //            +     Parameter1
+  //        /      \
+  //       /        \
+  //    Parameter0  Constant
+  //
+  // The input literals array will have its first literal map to Parameter0 and
+  // the second map to Parameter1.
   StatusOr<std::unique_ptr<Literal>> Evaluate(
       HloComputation* computation,
       tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
@@ -49,40 +57,36 @@ class HloEvaluator : public DfsHloVisitorWithDefault {
   // Evaluates a single HLO instruction and an array of pointers to literals.
   // Return the evaluated result as literal if successful.
   // Precondition:
-  // 1. argument literals are in post-order corresponding to the input
-  // instruction's parameters.
+  // 1. argument literals are corresponds to the input instruction's
+  // parameters in their post-orderring.
   // 2. the instruction's operands must be of either Parameter or Constant type.
   // TODO(b/35950897): implement more ops other than element-wise ops.
-  // TODO(b/35950897): handle broadcasts.
   StatusOr<std::unique_ptr<Literal>> Evaluate(
       HloInstruction* instruction,
       tensorflow::gtl::ArraySlice<const Literal*> arg_literals);
 
  protected:
-  // The following methods implement the DfsHloVisitor interface.
-  //
-  // DefaultAction here handles all non-specificialized (i.e., instruction
-  // without corresponding Handle* method) instructions.
-  // TODO(b/35950897): it's likely better to refactor the switches here and push
-  // up the switch to templated methods instead, likely at DfsHloVisitor level.
-  Status DefaultAction(HloInstruction* hlo_instruction) override;
+  // Templated DfsHloVisitor. Typically ReturnT here indicates the resulting
+  // literal type of each evaluated Handle* method of a TypedVisitor. One
+  // exception to this is HandleCompare, where the resulting literal type is
+  // always boolean.
+  // Note the forward declaration here is necessary to enable TypedVisitor to
+  // access parent members.
+  template <typename ReturnT>
+  class TypedVisitor;
+
+  // Wraps around instruction handling to infer types before dispatching to
+  // the corresponding typed Visitor.
+  Status DefaultAction(HloInstruction* hlo) override {
+    return hlo->Visit(typed_visitors_.at(hlo->shape().element_type()).get());
+  }
 
   Status HandleParameter(HloInstruction* parameter) override;
+
   Status HandleConstant(HloInstruction* constant,
                         const Literal& literal) override;
 
  private:
-  // Evaluates a single HLO instruction return the result as a Literal if
-  // successful. A Status will be returned on error.
-  StatusOr<std::unique_ptr<Literal>> EvaluateBasedOnType(
-      HloInstruction* instruction);
-
-  // Evaluates an element-wise HLO instruction that has the same output literal
-  // type as the operands' types.
-  template <typename NativeT>
-  StatusOr<std::unique_ptr<Literal>> EvaluateSameTypedElementwise(
-      HloInstruction* instruction);
-
   // Returns the already-evaluated literal result for the instruction.
   // Crash with log if the given instruction has not been evaluated previously.
   const Literal& GetEvaluatedLiteralFor(const HloInstruction* hlo) {
@@ -92,9 +96,21 @@ class HloEvaluator : public DfsHloVisitorWithDefault {
     return *(it->second);
   }
 
+  // Map from a primitive type to its associated (templated) DfsHloVisitor.
+  // Note: the hash function here is only needed because current gcc std::hash
+  // does not specialize for enum types. This should however be fixed in the
+  // future: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60970#c5
+  tensorflow::gtl::FlatMap<PrimitiveType, std::unique_ptr<DfsHloVisitor>,
+                           std::hash<int>>
+      typed_visitors_;
+
   // Tracks the HLO instruciton and its evaluated literal result.
+  // TODO(b/35950897): have better memory management here to free instructions
+  // that are no longer a parent for any other subsequent instruction in
+  // post-orderring.
   tensorflow::gtl::FlatMap<const HloInstruction*, std::unique_ptr<Literal>>
       evaluated_;
+
   // Stores input literals, assuming they are in post-order. Literals are not
   // owned by this class, and they must outlive the lifetime of the instance of
   // this class.
-- 
GitLab


From fbfff7f859ae3d423d0e4ec07d9583261f73fa10 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 9 May 2017 21:37:44 -0700
Subject: [PATCH 1179/1563] Migrate the tf_graph_dashboard component to use
 webfiles.

Also removed the unused tf_graph_info component.

PiperOrigin-RevId: 155591143
---
 tensorflow/BUILD                              |    1 +
 .../components/tf_graph_dashboard/BUILD       |   57 +
 .../components/tf_graph_dashboard/demo/BUILD  |   24 +
 .../demo/data/graph_run_run1.pbtxt            | 4606 +++++++++++++++++
 .../tf_graph_dashboard/demo/data/runs.json    |    6 +
 .../tf_graph_dashboard/demo/index.html        |   56 +
 6 files changed, 4750 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 32bbe9af63..c4bfb97e5e 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -336,6 +336,7 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_graph_board:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
new file mode 100644
index 0000000000..785d4f658c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
@@ -0,0 +1,57 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_dashboard",
+    srcs = [
+        "tf-graph-dashboard.html",
+    ],
+    path = "/tf-graph-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend",
+        "//tensorflow/tensorboard/components/tf_dashboard_common",
+        "//tensorflow/tensorboard/components/tf_graph",
+        "//tensorflow/tensorboard/components/tf_graph_board",
+        "//tensorflow/tensorboard/components/tf_graph_controls",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-dashboard.html",
+    ],
+    destdir = "tf-graph-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/tf_graph:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_board:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_controls:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_loader:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
new file mode 100644
index 0000000000..d8d8cb643d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_dashboard/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_dashboard",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json
new file mode 100644
index 0000000000..0429aa71f8
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json
@@ -0,0 +1,6 @@
+{
+  "run1": {
+    "graph": true,
+    "scalars": ["foo/sin"]
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html
new file mode 100644
index 0000000000..67756cc129
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="../tf-graph-dashboard.html">
+<link rel="import" href="../../paper-styles/typography.html">
+
+<title>Graph Dashboard Demo</title>
+<style>
+  #demo-container {
+    display: block;
+    height: 900px;
+    position: relative;
+    width: 100%;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="graph-dashboard-demo">
+      <template>
+        <tf-graph-dashboard backend="[[backend]]"></tf-graph-dashboard>
+      </template>
+      <script>
+        Polymer({
+          is: "graph-dashboard-demo",
+          properties: {
+            backend: {
+              type: Object,
+              value: function() {
+                var router = new TF.Backend.router("data", true);
+                return new TF.Backend.Backend(router);
+              },
+            },
+          },
+        });
+      </script>
+    </dom-module>
+    <graph-dashboard-demo id="demo-container"></graph-dashboard-demo>
+  </template>
+</demo-snippet>
-- 
GitLab


From e4f51fc8a2e5bf338159112e4b3dac31bcdf4ae7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 07:06:12 -0700
Subject: [PATCH 1180/1563] [TF:XLA] Optimize the LiteralUtil::Convert() API
 and some refactoring

Optimized the LiteralUtil::Convert() API to use flat scan over the source
and destination literal values.
Performance boost varies with size. A F32->F64 Convert() of a {32, 64, 64, 64} went from ~35s to ~500ms.
Added unittest for LiteralUtil::Convert().
Moved some common/repeated code into a new StrideConfig class.

PiperOrigin-RevId: 155624212
---
 tensorflow/compiler/xla/literal_util.cc      | 125 ++++++++++++++-----
 tensorflow/compiler/xla/literal_util.h       |  90 +++++++++----
 tensorflow/compiler/xla/literal_util_test.cc |  18 +++
 tensorflow/compiler/xla/util.h               |   7 ++
 4 files changed, 186 insertions(+), 54 deletions(-)

diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index 0e0c6dbd67..e3bc856fc0 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -36,6 +36,29 @@ limitations under the License.
 
 namespace xla {
 
+LiteralUtil::StrideConfig::StrideConfig(
+    const Shape& source_shape, const Shape& dest_shape,
+    tensorflow::gtl::ArraySlice<int64> dimensions)
+    : dimensions(dimensions),
+      base(dimensions.size(), 0),
+      step(dimensions.size(), 1) {
+  if (!dimensions.empty()) {
+    // Selects the shape with the highest minor dimension as the one upon
+    // where to run the tight stride loop.
+    if (source_shape.layout().minor_to_major()[0] >=
+        dest_shape.layout().minor_to_major()[0]) {
+      minor_dimension = source_shape.layout().minor_to_major()[0];
+      dest_stride = IndexUtil::GetDimensionStride(dest_shape, minor_dimension);
+    } else {
+      minor_dimension = dest_shape.layout().minor_to_major()[0];
+      source_stride =
+          IndexUtil::GetDimensionStride(source_shape, minor_dimension);
+    }
+    minor_loop_size = dimensions[minor_dimension];
+    step[minor_dimension] = minor_loop_size;
+  }
+}
+
 /* static */ std::unique_ptr<Literal> LiteralUtil::CreateFromShape(
     const Shape& shape) {
   auto literal = MakeUnique<Literal>();
@@ -78,34 +101,30 @@ template <typename T>
     // the index enumaration functor, do a strided copy advancing source index
     // by one (walking through the minor dimension), and destination index by
     // proper stride size at the matching dimension.
-    std::vector<int64> src_indexes(src_base.size(), 0);
-    std::vector<int64> dest_indexes(dest_base.size(), 0);
-    std::vector<int64> base(src_base.size(), 0);
-    std::vector<int64> incr(src_base.size(), 1);
-    int64 sdim = src_shape.layout().minor_to_major()[0];
-    int64 dest_stride = IndexUtil::GetDimensionStride(dest_shape, sdim);
-
-    incr[sdim] = copy_size[sdim];
+    DimensionVector src_indexes(src_base.size(), 0);
+    DimensionVector dest_indexes(dest_base.size(), 0);
+    StrideConfig stride_config(src_shape, dest_shape, copy_size);
+
     auto copy_proc = [&](const std::vector<int64>& indexes) {
       // Map from multi-dimensional index, to source index.
-      std::copy(indexes.begin(), indexes.end(), src_indexes.begin());
-      std::transform(src_indexes.begin(), src_indexes.end(), src_base.begin(),
+      std::transform(indexes.begin(), indexes.end(), src_base.begin(),
                      src_indexes.begin(), std::plus<int64>());
       // Map from multi-dimensional index, to destination index.
-      std::copy(indexes.begin(), indexes.end(), dest_indexes.begin());
-      std::transform(dest_indexes.begin(), dest_indexes.end(),
-                     dest_base.begin(), dest_indexes.begin(),
-                     std::plus<int64>());
+      std::transform(indexes.begin(), indexes.end(), dest_base.begin(),
+                     dest_indexes.begin(), std::plus<int64>());
 
       int64 src_index = LinearIndex(src_literal, src_indexes);
       int64 dest_index = LinearIndex(*dest_literal, dest_indexes);
 
-      StridedCopy(dest_data, dest_index, dest_stride, src_data, src_index, 1,
-                  copy_size[sdim]);
+      StridedCopy(dest_data, dest_index, stride_config.dest_stride, src_data,
+                  src_index, stride_config.source_stride,
+                  stride_config.minor_loop_size);
       return true;
     };
 
-    ShapeUtil::ForEachIndex(src_shape, base, copy_size, incr, copy_proc);
+    ShapeUtil::ForEachIndex(src_shape, stride_config.base,
+                            stride_config.dimensions, stride_config.step,
+                            copy_proc);
   }
   return Status::OK();
 }
@@ -313,9 +332,9 @@ template <typename T>
   *result->mutable_shape()->mutable_layout() = layout;
 
   const Shape& shape = original.shape();
-  std::vector<int64> base(ShapeUtil::Rank(shape), 0);
-  std::vector<int64> copy_size(shape.dimensions().begin(),
-                               shape.dimensions().end());
+  DimensionVector base(ShapeUtil::Rank(shape), 0);
+  DimensionVector copy_size(shape.dimensions().begin(),
+                            shape.dimensions().end());
 
   TF_CHECK_OK(Copy(original, base, result.get(), base, copy_size));
   return result;
@@ -396,7 +415,7 @@ template <typename T>
   CHECK(!ShapeUtil::IsTuple(literal.shape()))
       << "tuple is not supported for reshape";
 
-  std::vector<int64> result_dimensions;
+  DimensionVector result_dimensions;
   for (int64 dnum = 0; dnum < ShapeUtil::Rank(literal.shape()); ++dnum) {
     CHECK_GE(start_indices[dnum], 0);
     CHECK_LE(limit_indices[dnum], literal.shape().dimensions(dnum));
@@ -412,7 +431,7 @@ template <typename T>
   *result_literal->mutable_shape() = result_shape;
   Reserve(ShapeUtil::ElementsIn(result_shape), result_literal.get());
 
-  std::vector<int64> new_indices(ShapeUtil::Rank(result_shape));
+  DimensionVector new_indices(ShapeUtil::Rank(result_shape));
   switch (result_shape.element_type()) {
     case F32:
       LiteralUtil::EachCell<float>(
@@ -649,8 +668,11 @@ template <typename T>
     case PRED:
       Resize<bool>(num_elements, false, literal);
       break;
+    case S8:
+      Resize<int8>(num_elements, 0, literal);
+      break;
     case U8:
-      Resize<uint8>(num_elements, false, literal);
+      Resize<uint8>(num_elements, 0, literal);
       break;
     case S32:
       Resize<int32>(num_elements, 0, literal);
@@ -811,6 +833,26 @@ LiteralUtil::GetMutableArraySlice(Literal* literal) {
                                                   values->size());
 }
 
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<int8>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  // C++11 standard, basic_string 21.4.1.5, values should be stored
+  // contiguously. From C++17 a mutable data() member will be provided.
+  auto values = literal->mutable_u8s();
+  return tensorflow::gtl::MutableArraySlice<int8>(
+      reinterpret_cast<int8*>(&(*values)[0]), values->size());
+}
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<uint8>
+LiteralUtil::GetMutableArraySlice(Literal* literal) {
+  // C++11 standard, basic_string 21.4.1.5, values should be stored
+  // contiguously. From C++17 a mutable data() member will be provided.
+  auto values = literal->mutable_u8s();
+  return tensorflow::gtl::MutableArraySlice<uint8>(
+      reinterpret_cast<uint8*>(&(*values)[0]), values->size());
+}
+
 template <>
 /* static */ tensorflow::gtl::MutableArraySlice<int32>
 LiteralUtil::GetMutableArraySlice(Literal* literal) {
@@ -877,42 +919,60 @@ LiteralUtil::GetMutableArraySlice(Literal* literal) {
 template <>
 /* static */ tensorflow::gtl::ArraySlice<bool> LiteralUtil::GetArraySlice<bool>(
     const Literal& literal) {
-  CHECK(literal.shape().element_type() == PRED);
+  CHECK_EQ(literal.shape().element_type(), PRED);
   return literal.preds();
 }
 
+template <>
+/* static */ tensorflow::gtl::ArraySlice<uint8>
+LiteralUtil::GetArraySlice<uint8>(const Literal& literal) {
+  CHECK_EQ(literal.shape().element_type(), U8);
+  return tensorflow::gtl::ArraySlice<uint8>(
+      reinterpret_cast<const uint8*>(literal.u8s().data()),
+      literal.u8s().size());
+}
+
+template <>
+/* static */ tensorflow::gtl::ArraySlice<int8> LiteralUtil::GetArraySlice<int8>(
+    const Literal& literal) {
+  CHECK_EQ(literal.shape().element_type(), S8);
+  return tensorflow::gtl::ArraySlice<int8>(
+      reinterpret_cast<const int8*>(literal.u8s().data()),
+      literal.u8s().size());
+}
+
 template <>
 /* static */ tensorflow::gtl::ArraySlice<uint32>
 LiteralUtil::GetArraySlice<uint32>(const Literal& literal) {
-  CHECK(literal.shape().element_type() == U32);
+  CHECK_EQ(literal.shape().element_type(), U32);
   return literal.u32s();
 }
 
 template <>
 /* static */ tensorflow::gtl::ArraySlice<uint64>
 LiteralUtil::GetArraySlice<uint64>(const Literal& literal) {
-  CHECK(literal.shape().element_type() == U64);
+  CHECK_EQ(literal.shape().element_type(), U64);
   return AsUInt64Slice(literal.u64s());
 }
 
 template <>
 /* static */ tensorflow::gtl::ArraySlice<int32>
 LiteralUtil::GetArraySlice<int32>(const Literal& literal) {
-  CHECK(literal.shape().element_type() == S32);
+  CHECK_EQ(literal.shape().element_type(), S32);
   return literal.s32s();
 }
 
 template <>
 /* static */ tensorflow::gtl::ArraySlice<int64>
 LiteralUtil::GetArraySlice<int64>(const Literal& literal) {
-  CHECK(literal.shape().element_type() == S64);
+  CHECK_EQ(literal.shape().element_type(), S64);
   return AsInt64Slice(literal.s64s());
 }
 
 template <>
 /* static */ tensorflow::gtl::ArraySlice<double>
 LiteralUtil::GetArraySlice<double>(const Literal& literal) {
-  CHECK(literal.shape().element_type() == F64);
+  CHECK_EQ(literal.shape().element_type(), F64);
   return literal.f64s();
 }
 
@@ -1012,6 +1072,13 @@ template <>
   literal->mutable_preds()->Resize(num_elements, value);
 }
 
+template <>
+/* static */ void LiteralUtil::Resize<int8>(int64 num_elements, int8 value,
+                                            Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_u8s()->resize(num_elements, value);
+}
+
 template <>
 /* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
                                              Literal* literal) {
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index 19e692f5ac..0ea7186040 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -437,6 +437,29 @@ class LiteralUtil {
                           tensorflow::gtl::ArraySlice<int64> dest_base,
                           tensorflow::gtl::ArraySlice<int64> copy_size);
 
+  // Utility structure which is used to create the optimal configuration for
+  // a ShapeUtil::ForEachIndex() scan across two literals.
+  struct StrideConfig {
+    StrideConfig(const Shape& source_shape, const Shape& dest_shape,
+                 tensorflow::gtl::ArraySlice<int64> dimensions);
+
+    // The dimensions of the stride operation. Essentially every dimension
+    // will be iterated from base[i] to base[i]+dimensions[i], in step[i]
+    // steps.
+    tensorflow::gtl::ArraySlice<int64> dimensions;
+    DimensionVector base;
+    DimensionVector step;
+    int64 minor_dimension = 0;
+    // The size of the strides for source and destination. One of the two
+    // (the one looping through its most minor dimension) will be 1, while
+    // the other will be the stride size at the dimension matching the other
+    // shape most minor dimension being scanned.
+    int64 dest_stride = 1;
+    int64 source_stride = 1;
+    // The size of the inner loop on the most minor dimension.
+    int64 minor_loop_size = 1;
+  };
+
   TF_DISALLOW_COPY_AND_ASSIGN(LiteralUtil);
 };
 
@@ -447,6 +470,14 @@ template <>
 /* static */ tensorflow::gtl::ArraySlice<bool> LiteralUtil::GetArraySlice<bool>(
     const Literal& literal);
 
+template <>
+/* static */ tensorflow::gtl::ArraySlice<uint8>
+LiteralUtil::GetArraySlice<uint8>(const Literal& literal);
+
+template <>
+/* static */ tensorflow::gtl::ArraySlice<int8> LiteralUtil::GetArraySlice<int8>(
+    const Literal& literal);
+
 template <>
 /* static */ tensorflow::gtl::ArraySlice<uint32>
 LiteralUtil::GetArraySlice<uint32>(const Literal& literal);
@@ -478,6 +509,14 @@ template <>
 /* static */ tensorflow::gtl::MutableArraySlice<bool>
 LiteralUtil::GetMutableArraySlice(Literal* literal);
 
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<int8>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<uint8>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
 template <>
 /* static */ tensorflow::gtl::MutableArraySlice<int32>
 LiteralUtil::GetMutableArraySlice(Literal* literal);
@@ -1023,25 +1062,22 @@ template <typename NativeT>
   tensorflow::gtl::MutableArraySlice<NativeT> data =
       GetMutableArraySlice<NativeT>(literal);
   if (rank > 0) {
-    std::vector<int64> base(rank, 0);
-    std::vector<int64> step(rank, 1);
-    std::vector<int64> minor_scan_indexes(rank, 0);
-    int64 minor_dimension = shape.layout().minor_to_major()[0];
+    StrideConfig stride_config(shape, shape, AsInt64Slice(shape.dimensions()));
+    DimensionVector minor_scan_indexes(rank, 0);
     int64 minor_dimension_size =
-        ShapeUtil::GetDimension(shape, minor_dimension);
+        ShapeUtil::GetDimension(shape, stride_config.minor_dimension);
 
-    step[minor_dimension] = minor_dimension_size;
     auto init_function = [&](const std::vector<int64>& indexes) {
       int64 index = LinearIndex(*literal, indexes);
       std::copy(indexes.begin(), indexes.end(), minor_scan_indexes.begin());
       for (int64 i = 0; i < minor_dimension_size; ++i) {
-        minor_scan_indexes[minor_dimension] = i;
+        minor_scan_indexes[stride_config.minor_dimension] = i;
         data.at(index + i) = generator(minor_scan_indexes);
       }
       return true;
     };
-    ShapeUtil::ForEachIndex(shape, base, AsInt64Slice(shape.dimensions()), step,
-                            init_function);
+    ShapeUtil::ForEachIndex(shape, stride_config.base, stride_config.dimensions,
+                            stride_config.step, init_function);
   } else {
     data.at(0) = generator({});
   }
@@ -1060,19 +1096,23 @@ template <typename NativeT>
 template <typename NativeSrcT, typename NativeDestT>
 /* static */ std::unique_ptr<Literal> LiteralUtil::Convert(
     const Literal& literal) {
+  const Shape& shape = literal.shape();
   auto result_literal = MakeUnique<Literal>();
-  Shape result_shape = literal.shape();
-  result_shape.set_element_type(
+  Shape* result_shape = result_literal->mutable_shape();
+  *result_shape = shape;
+  result_shape->set_element_type(
       primitive_util::NativeToPrimitiveType<NativeDestT>());
-  *result_literal->mutable_shape() = result_shape;
-  LiteralUtil::Reserve(ShapeUtil::ElementsIn(result_shape),
+  LiteralUtil::Reserve(ShapeUtil::ElementsIn(*result_shape),
                        result_literal.get());
-  LiteralUtil::EachCell<NativeSrcT>(
-      literal,
-      [&](tensorflow::gtl::ArraySlice<int64> indices, NativeSrcT value) {
-        LiteralUtil::Set<NativeDestT>(result_literal.get(), indices,
-                                      static_cast<NativeDestT>(value));
-      });
+  tensorflow::gtl::ArraySlice<NativeSrcT> src_data =
+      GetArraySlice<NativeSrcT>(literal);
+  tensorflow::gtl::MutableArraySlice<NativeDestT> dest_data =
+      GetMutableArraySlice<NativeDestT>(result_literal.get());
+  int64 num_elements = ShapeUtil::ElementsIn(shape);
+
+  for (int64 i = 0; i < num_elements; ++i) {
+    dest_data[i] = static_cast<NativeDestT>(src_data[i]);
+  }
   return result_literal;
 }
 
@@ -1080,6 +1120,10 @@ template <>
 /* static */ void LiteralUtil::Resize<bool>(int64 num_elements, bool value,
                                             Literal* literal);
 
+template <>
+/* static */ void LiteralUtil::Resize<int8>(int64 num_elements, int8 value,
+                                            Literal* literal);
+
 template <>
 /* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
                                              Literal* literal);
@@ -1127,10 +1171,7 @@ LiteralUtil::CreateFullWithMonotonicDim0MajorLayout(
 template <typename NativeT>
 /* static */ std::unique_ptr<Literal> LiteralUtil::Replicate(
     const Literal& input, int64 times) {
-  // Ranks greater than 8 are very rare, so use InlinedVector<int64, 8> to store
-  // the bounds and indices.
-  static constexpr int kInlineRank = 8;
-  tensorflow::gtl::InlinedVector<int64, kInlineRank> bounds = {times};
+  DimensionVector bounds = {times};
   bounds.reserve(input.shape().dimensions_size() + 1);
   for (int64 bound : input.shape().dimensions()) {
     bounds.push_back(bound);
@@ -1144,8 +1185,7 @@ template <typename NativeT>
   }
   Reserve(elements, literal.get());
 
-  tensorflow::gtl::InlinedVector<int64, kInlineRank> output_indices(
-      bounds.size(), 0);
+  DimensionVector output_indices(bounds.size(), 0);
   tensorflow::gtl::ArraySlice<int64> input_indices = output_indices;
   input_indices.remove_prefix(1);
 
diff --git a/tensorflow/compiler/xla/literal_util_test.cc b/tensorflow/compiler/xla/literal_util_test.cc
index 0f214d7f9e..7acb9933da 100644
--- a/tensorflow/compiler/xla/literal_util_test.cc
+++ b/tensorflow/compiler/xla/literal_util_test.cc
@@ -768,5 +768,23 @@ TEST_F(LiteralUtilTest, Populate) {
   }
 }
 
+TEST_F(LiteralUtilTest, ConvertR4) {
+  // clang-format off
+  auto original = LiteralUtil::CreateR4WithLayout<int8>({{
+     {{10, 11, 12, 13}, {14, 15, 16, 17}},
+     {{18, 19, 20, 21}, {22, 23, 24, 25}},
+     {{26, 27, 28, 29}, {30, 31, 32, 33}},
+  }}, layout_r4_dim0major_);
+  auto expected = LiteralUtil::CreateR4WithLayout<uint32>({{
+     {{10, 11, 12, 13}, {14, 15, 16, 17}},
+     {{18, 19, 20, 21}, {22, 23, 24, 25}},
+     {{26, 27, 28, 29}, {30, 31, 32, 33}},
+  }}, layout_r4_dim0major_);
+  // clang-format on
+  auto converted = LiteralUtil::Convert<int8, uint32>(*original);
+
+  EXPECT_TRUE(LiteralUtil::Equal(*expected, *converted));
+}
+
 }  // namespace
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h
index 8c24388d73..62959f2c4c 100644
--- a/tensorflow/compiler/xla/util.h
+++ b/tensorflow/compiler/xla/util.h
@@ -39,6 +39,13 @@ limitations under the License.
 
 namespace xla {
 
+// Ranks greater than 8 are very rare, so use InlinedVector<int64, 8> to store
+// the bounds and indices. And for the rare cases of ranks greater than 8,
+// the InlinedVector will just behave like an std::vector<> and allocate the
+// memory to store its values.
+static constexpr int kInlineRank = 8;
+using DimensionVector = tensorflow::gtl::InlinedVector<int64, kInlineRank>;
+
 // RAII timer that logs with a given label the wall clock time duration in human
 // readable form. This differs from base's ElapsedTimer primarily in that it
 // spits out the human-readable duration form.
-- 
GitLab


From 8b704af8f767c7483fe16ba3e1a6dc104f8a327b Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 10 May 2017 09:21:42 -0700
Subject: [PATCH 1181/1563] [TF:XLA] Split options that pertain to an
 individual call to XlaCompiler::CompileGraph() or
 XlaCompiler::CompileFunction() out of XlaCompiler::Options into a separate
 XlaCompiler::CompileOptions.

Remove the 'prune_unreachable_nodes' options since it was unused.

PiperOrigin-RevId: 155636247
---
 tensorflow/compiler/aot/compile.cc            |  3 +-
 .../compiler/jit/xla_compilation_cache.cc     |  5 +--
 tensorflow/compiler/tf2xla/xla_compiler.cc    | 34 +++++-------------
 tensorflow/compiler/tf2xla/xla_compiler.h     | 35 +++++++++----------
 .../compiler/tf2xla/xla_compiler_test.cc      | 17 +++++----
 tensorflow/compiler/tf2xla/xla_op_kernel.cc   |  4 +--
 tensorflow/compiler/tf2xla/xla_op_kernel.h    |  7 ++--
 .../contrib/xla_tf_graph/xla_tf_graph_util.cc |  5 +--
 .../xla_tf_graph/xla_tf_graph_util_test.cc    |  3 +-
 9 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index 3955cabedf..d0e218ca11 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -297,7 +297,8 @@ Status ConvertGraphToXla(xla::CompileOnlyClient* client,
       compiler.device_mgr(), Env::Default(), compiler.device(),
       graph->versions().producer(), &graph->flib_def(), OptimizerOptions()));
   XlaCompiler::CompilationResult result;
-  TF_RETURN_IF_ERROR(compiler.CompileGraph("tfcompile", std::move(graph),
+  TF_RETURN_IF_ERROR(compiler.CompileGraph(XlaCompiler::CompileOptions(),
+                                           "tfcompile", std::move(graph),
                                            flib_run.get(), xla_args, &result));
   *has_context_arg = result.requires_runtime_context;
   *computation = std::move(result.computation);
diff --git a/tensorflow/compiler/jit/xla_compilation_cache.cc b/tensorflow/compiler/jit/xla_compilation_cache.cc
index 41abea02eb..505b44e9fa 100644
--- a/tensorflow/compiler/jit/xla_compilation_cache.cc
+++ b/tensorflow/compiler/jit/xla_compilation_cache.cc
@@ -270,8 +270,9 @@ Status XlaCompilationCache::Compile(
         OptimizerOptions(), nullptr /* custom_kernel_creator */));
 
     entry->compiled = true;
-    entry->compilation_status = compiler_.CompileFunction(
-        flr.get(), function, args, &entry->compilation_result);
+    entry->compilation_status =
+        compiler_.CompileFunction(XlaCompiler::CompileOptions(), flr.get(),
+                                  function, args, &entry->compilation_result);
   }
   *compilation_result = &entry->compilation_result;
   if (entry->compilation_status.ok() && executable) {
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index 155fc58577..baf8df6f15 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -76,22 +76,9 @@ int64 XlaCompiler::NextStepId() {
   return next_step_id_++;
 }
 
-// Prunes any nodes from a function that are not dependencies of the _Retval
-// nodes. Used to prune stateful ops from within a function body, such as
-// variable initializers, that should not be executed unless requested.
-static void PruneUnreachableNodes(Graph* graph) {
-  std::unordered_set<const Node*> nodes;
-  for (Node* node : graph->nodes()) {
-    if (node->type_string() == "_Retval" ||
-        StringPiece(node->type_string()).ends_with("Send")) {
-      nodes.insert(node);
-    }
-  }
-  PruneForReverseReachability(graph, nodes);
-}
-
 Status XlaCompiler::CompileFunction(
-    FunctionLibraryRuntime* flr, const NameAttrList& function,
+    const XlaCompiler::CompileOptions& options, FunctionLibraryRuntime* flr,
+    const NameAttrList& function,
     const std::vector<XlaCompiler::Argument>& args,
     XlaCompiler::CompilationResult* result) {
   const string function_id = Canonicalize(function.name(), function.attr());
@@ -130,7 +117,7 @@ Status XlaCompiler::CompileFunction(
 
   VLOG(1) << "====================================================";
   TF_RETURN_IF_ERROR(
-      CompileGraph(function_id, std::move(graph), flr, args, result));
+      CompileGraph(options, function_id, std::move(graph), flr, args, result));
   VLOG(1) << "====================================================";
 
   return Status::OK();
@@ -379,7 +366,8 @@ Status BuildComputation(
 
 }  // namespace
 
-Status XlaCompiler::CompileGraph(string const& name,
+Status XlaCompiler::CompileGraph(const XlaCompiler::CompileOptions& options,
+                                 string const& name,
                                  std::unique_ptr<Graph> graph,
                                  FunctionLibraryRuntime* flib,
                                  const std::vector<XlaCompiler::Argument>& args,
@@ -395,31 +383,27 @@ Status XlaCompiler::CompileGraph(string const& name,
                      options_.resolve_compile_time_constants);
   core::ScopedUnref context_unref(context);
 
-  result->tuple_arg = options_.use_tuple_arg;
+  result->tuple_arg = options.use_tuple_arg;
 
   std::vector<XlaContext::Argument> context_args;
-  TF_RETURN_IF_ERROR(BuildArguments(args, options_.use_tuple_arg, &builder,
+  TF_RETURN_IF_ERROR(BuildArguments(args, options.use_tuple_arg, &builder,
                                     &context_args, &result->input_mapping,
                                     &result->xla_input_shapes));
   context->set_args(std::move(context_args));
 
-  if (options_.prune_unreachable_nodes) {
-    PruneUnreachableNodes(graph.get());
-  }
-
   TF_RETURN_IF_ERROR(
       ExecuteGraph(context, std::move(graph), device_, flib, NextStepId()));
 
   int num_nonconst_outputs;
   TF_RETURN_IF_ERROR(BuildComputation(
       context->retvals(), context->variables(), context->has_side_effects(),
-      options_.return_updated_values_for_all_variables, &builder,
+      options.return_updated_values_for_all_variables, &builder,
       &result->computation, &num_nonconst_outputs, &result->variable_updates));
 
   result->requires_runtime_context = context->has_context_parameter();
 
   // Tuple arguments and runtime context parameters are incompatible.
-  CHECK(!(options_.use_tuple_arg && result->requires_runtime_context));
+  CHECK(!(options.use_tuple_arg && result->requires_runtime_context));
 
   VLOG(2) << "Outputs: total: " << context->retvals().size()
           << " nonconstant: " << num_nonconst_outputs;
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.h b/tensorflow/compiler/tf2xla/xla_compiler.h
index 3d28ca3746..d250412168 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.h
+++ b/tensorflow/compiler/tf2xla/xla_compiler.h
@@ -198,6 +198,19 @@ class XlaCompiler {
     // computation.
     bool resolve_compile_time_constants = true;
 
+    // If not nullptr, populate_resource_manager is called with the
+    // compilation device's resource manager when the compilation
+    // device is created, and can be used to create metadata objects
+    // that can be accessed by XLA op kernels.
+    std::function<Status(ResourceMgr*)>* populate_resource_manager = nullptr;
+  };
+
+  explicit XlaCompiler(Options options);
+  ~XlaCompiler();
+
+  // Options pertaining to an individual call to CompileGraph() or
+  // CompileFunction().
+  struct CompileOptions {
     // If `use_tuple_arg` is true, a single tuple parameter will be used for all
     // arguments; if false, each argument gets its own parameter.
     bool use_tuple_arg = false;
@@ -208,23 +221,8 @@ class XlaCompiler {
     // modified by the computation. Used when compiling loop bodies to ensure
     // the input and output signatures match.
     bool return_updated_values_for_all_variables = false;
-
-    // If 'prune_unreachable_nodes' is true, then nodes that are not
-    // dependencies of graph's _Retval nodes will be pruned before compilation.
-    // This is useful to prune stateful operators that should not be executed
-    // from a function body.
-    bool prune_unreachable_nodes = false;
-
-    // If not nullptr, populate_resource_manager is called with the
-    // compilation device's resource manager when the compilation
-    // device is created, and can be used to create metadata objects
-    // that can be accessed by XLA op kernels.
-    std::function<Status(ResourceMgr*)>* populate_resource_manager = nullptr;
   };
 
-  explicit XlaCompiler(Options options);
-  ~XlaCompiler();
-
   // Compiles a Tensorflow function `fn_name_attrs` into an XLA computation.
   // `args` describes the arguments to the function, each of which must either
   // be a runtime-parameter to the XLA computation, a compile-time constant, or
@@ -235,7 +233,8 @@ class XlaCompiler {
   // arguments are returned as host memory tensors in the output list and are
   // not included in the XLA computation's outputs. The XLA computation is
   // null if there are no data-dependent outputs and no side effects.
-  Status CompileFunction(FunctionLibraryRuntime* flr,
+  Status CompileFunction(const CompileOptions& options,
+                         FunctionLibraryRuntime* flr,
                          const NameAttrList& fn_name_attrs,
                          const std::vector<Argument>& args,
                          CompilationResult* result);
@@ -243,8 +242,8 @@ class XlaCompiler {
   // Compiles a tensorflow::Graph into an xla::Computation.
   // Similar to CompileFunction, but takes a Graph as input rather than a
   // function.
-  Status CompileGraph(string const& name, std::unique_ptr<Graph> graph,
-                      FunctionLibraryRuntime* flr,
+  Status CompileGraph(const CompileOptions& options, string const& name,
+                      std::unique_ptr<Graph> graph, FunctionLibraryRuntime* flr,
                       const std::vector<Argument>& args,
                       CompilationResult* result);
 
diff --git a/tensorflow/compiler/tf2xla/xla_compiler_test.cc b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
index 1cc7f4abd1..737d56f4ed 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler_test.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
@@ -131,7 +131,8 @@ TEST_F(XlaCompilerTest, EmptyReturnValues) {
 
   std::unique_ptr<Graph> graph(new Graph(OpRegistry::Global()));
   XlaCompiler::CompilationResult result;
-  TF_ASSERT_OK(compiler.CompileGraph("add", std::move(graph), flr.get(),
+  TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(), "add",
+                                     std::move(graph), flr.get(),
                                      /*args=*/{}, &result));
 
   // No computation should be generated.
@@ -163,8 +164,9 @@ TEST_F(XlaCompilerTest, Simple) {
   auto flr = BuildFunctionLibraryRuntime(compiler);
 
   XlaCompiler::CompilationResult result;
-  TF_ASSERT_OK(
-      compiler.CompileGraph("add", std::move(graph), flr.get(), args, &result));
+  TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(), "add",
+                                     std::move(graph), flr.get(), args,
+                                     &result));
 
   // Tests that the generated computation works.
   std::unique_ptr<xla::Literal> param0_literal =
@@ -219,7 +221,8 @@ TEST_F(XlaCompilerTest, ConstantOutputs) {
     CopyGraph(*graph, graph_copy.get());
 
     XlaCompiler::CompilationResult result;
-    TF_ASSERT_OK(compiler.CompileGraph("constants", std::move(graph_copy),
+    TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(),
+                                       "constants", std::move(graph_copy),
                                        flr.get(), args, &result));
 
     ASSERT_EQ(2, result.outputs.size());
@@ -256,7 +259,8 @@ TEST_F(XlaCompilerTest, ConstantOutputs) {
     CopyGraph(*graph, graph_copy.get());
 
     XlaCompiler::CompilationResult result;
-    TF_ASSERT_OK(compiler.CompileGraph("constants", std::move(graph_copy),
+    TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(),
+                                       "constants", std::move(graph_copy),
                                        flr.get(), args, &result));
 
     ASSERT_EQ(2, result.outputs.size());
@@ -317,7 +321,8 @@ TEST_F(XlaCompilerTest, ResourceManager) {
   EXPECT_EQ(0, resource->Get());
 
   XlaCompiler::CompilationResult result;
-  TF_ASSERT_OK(compiler.CompileGraph("dummy", std::move(graph), flr.get(), args,
+  TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(), "dummy",
+                                     std::move(graph), flr.get(), args,
                                      &result));
 
   EXPECT_EQ(1, resource->Get());
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.cc b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
index a022de36a2..48831ce4c2 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.cc
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
@@ -379,8 +379,8 @@ void XlaOpKernelContext::SetOpHasSideEffects() {
   XlaContext::Get(context_).AddSideEffects();
 }
 
-const XlaCompiler::Options& XlaOpKernelContext::GetCompilerOptions() const {
-  return XlaContext::Get(context_).compiler()->options();
+XlaCompiler* XlaOpKernelContext::compiler() const {
+  return XlaContext::Get(context_).compiler();
 }
 
 void XlaOpKernelContext::CtxFailure(Status s) { context_->CtxFailure(s); }
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.h b/tensorflow/compiler/tf2xla/xla_op_kernel.h
index f97e07bea5..0a8a928418 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.h
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.h
@@ -186,10 +186,9 @@ class XlaOpKernelContext {
   // Returns the underlying OpKernelContext. Use rarely.
   OpKernelContext* op_kernel_context() const { return context_; }
 
-  // Returns the options passed to the XlaCompiler that is being
-  // run. Used for, e.g., While to inherit options needed for nested
-  // computation.
-  const XlaCompiler::Options& GetCompilerOptions() const;
+  // Returns the XlaCompiler that is performing the compilation. Used for, e.g.,
+  // While to compile nested computations.
+  XlaCompiler* compiler() const;
 
   // TODO(phawkins): find a better home for these helpers.
 
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
index f0dabc08a4..c19b58176a 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
@@ -230,8 +230,9 @@ ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
 
   // Compile graph and build computation
   XlaCompiler::CompilationResult result;
-  TF_CHECK_OK(compiler->CompileGraph(GRAPH_NAME, std::move(graph), flr.get(),
-                                     args, &result));
+  TF_CHECK_OK(compiler->CompileGraph(XlaCompiler::CompileOptions(), GRAPH_NAME,
+                                     std::move(graph), flr.get(), args,
+                                     &result));
 
   return result.computation.Snapshot();
 }
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
index 23649957f3..92c8f85933 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
@@ -78,7 +78,8 @@ static void DumpHloGraphForDebug(const std::vector<XlaCompiler::Argument>& args,
 
   // Compile graph
   XlaCompiler::CompilationResult result;
-  TF_CHECK_OK(compiler->CompileGraph("dump", std::move(graph), flr.get(), args,
+  TF_CHECK_OK(compiler->CompileGraph(XlaCompiler::CompileOptions(), "dump",
+                                     std::move(graph), flr.get(), args,
                                      &result));
 
   // Convert to hlo
-- 
GitLab


From 0ea08a755c27affd3b41abdcd081716fcc9c03ad Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 09:44:52 -0700
Subject: [PATCH 1182/1563] Fixes Markdown rendering of UTF-8 strings in
 text_plugin for Python 2.

Markdown does an internal conversion to unicode of any input string passed to it, which fails in case the string contains any non-ASCII characters. This fixes the problem by converting the string to unicode using UTF-8 encoding beforehand.

PiperOrigin-RevId: 155638665
---
 tensorflow/tensorboard/plugins/text/BUILD               | 1 +
 tensorflow/tensorboard/plugins/text/text_plugin.py      | 5 +++--
 tensorflow/tensorboard/plugins/text/text_plugin_test.py | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/plugins/text/BUILD b/tensorflow/tensorboard/plugins/text/BUILD
index 3e1455ea5a..f6ed41375f 100644
--- a/tensorflow/tensorboard/plugins/text/BUILD
+++ b/tensorflow/tensorboard/plugins/text/BUILD
@@ -24,6 +24,7 @@ py_library(
         "@org_mozilla_bleach",
         "@org_pocoo_werkzeug//:werkzeug",
         "@org_pythonhosted_markdown",
+        "@six_archive//:six",
     ],
 )
 
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin.py b/tensorflow/tensorboard/plugins/text/text_plugin.py
index 427a761d1e..280f77a2ae 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin.py
@@ -30,6 +30,7 @@ import bleach
 # pylint: disable=g-bad-import-order
 # Google-only: import markdown_freewisdom
 import markdown
+import six
 # pylint: enable=g-bad-import-order
 from werkzeug import wrappers
 
@@ -95,8 +96,8 @@ def markdown_and_sanitize(markdown_string):
   Returns:
     a string containing sanitized html for input markdown
   """
-  # Convert to utf-8 because we get a bytearray in python3
-  if not isinstance(markdown_string, str):
+  # Convert to utf-8 whenever we have a binary input.
+  if isinstance(markdown_string, six.binary_type):
     markdown_string = markdown_string.decode('utf-8')
 
   string_html = markdown.markdown(
diff --git a/tensorflow/tensorboard/plugins/text/text_plugin_test.py b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
index 91dca289ce..a7f0235889 100644
--- a/tensorflow/tensorboard/plugins/text/text_plugin_test.py
+++ b/tensorflow/tensorboard/plugins/text/text_plugin_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -404,6 +405,10 @@ class TextPluginTest(test.TestCase):
     # The plugin is active because text summaries are available.
     self.assertTrue(self.plugin.is_active())
 
+  def testUnicode(self):
+    self.assertConverted(u'<p>Iñtërnâtiônàlizætiøn⚡💩</p>',
+                         'Iñtërnâtiônàlizætiøn⚡💩')
+
 
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From 39e37da48b20bf46352b92a63d3be7532d043fc6 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Wed, 10 May 2017 09:46:59 -0700
Subject: [PATCH 1183/1563] Remove public op_def() access in op_kernel.h

This is step 1 towards removing protos from the op definition API.

RELNOTES: Remove OpKernelConstruction::op_def() as part of minimizing proto dependencies.
PiperOrigin-RevId: 155638924
---
 tensorflow/core/framework/op_kernel.cc | 4 ++--
 tensorflow/core/framework/op_kernel.h  | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index b53daeed0b..7cfa662ed6 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -90,9 +90,9 @@ OpKernel::OpKernel(OpKernelConstruction* context)
       input_name_map_(context->num_inputs()),
       output_name_map_(context->num_outputs()) {
   OP_REQUIRES_OK(context,
-                 NameRangesForNode(def_, context->op_def(), &input_name_map_,
+                 NameRangesForNode(def_, *context->op_def_, &input_name_map_,
                                    &output_name_map_));
-  OP_REQUIRES_OK(context, CheckOpDeprecation(context->op_def(),
+  OP_REQUIRES_OK(context, CheckOpDeprecation(*context->op_def_,
                                              context->graph_def_version()));
 
   // Kernels executing on GPU tie very few resources on the CPU where the
diff --git a/tensorflow/core/framework/op_kernel.h b/tensorflow/core/framework/op_kernel.h
index 969142ca23..465395d858 100644
--- a/tensorflow/core/framework/op_kernel.h
+++ b/tensorflow/core/framework/op_kernel.h
@@ -278,9 +278,6 @@ class OpKernelConstruction {
   // User-supplied configuration of this operation.
   const NodeDef& def() const { return *def_; }
 
-  // Op registered for this op type.
-  const OpDef& op_def() const { return *op_def_; }
-
   // For inspecting the inputs to this operation.
   int num_inputs() const { return input_types_.size(); }
   DataType input_type(int i) const { return input_types_[i]; }
@@ -354,6 +351,10 @@ class OpKernelConstruction {
   const int graph_def_version_;
   Status* status_;
 
+  // Allow op_def_ across from OpKernel, but not from subclasses.
+  // TODO(irving): Remove protos from this header entirely.
+  friend class OpKernel;
+
   TF_DISALLOW_COPY_AND_ASSIGN(OpKernelConstruction);
 };
 
-- 
GitLab


From f7eff652ad407d8831e4a05f400f4793673eba2c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 10:18:16 -0700
Subject: [PATCH 1184/1563] Merged commit includes the following changes:
 155643058  by cassandrax <cassandrax@google.com>:

    Add indicator_column (formerly known as one_hot_column) to core TensorFlow.

--
155642205  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change.

--

PiperOrigin-RevId: 155643058
---
 .../python/feature_column/feature_column.py   | 161 +++++++++++++++---
 .../feature_column/feature_column_test.py     | 113 ++++++++++++
 2 files changed, 255 insertions(+), 19 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 3ab8ff1b19..50d7e00fd9 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -112,6 +112,9 @@ Example of building model using FeatureColumns, this can be used in a
       columns_to_tensors=columns_to_tensor,
       feature_columns=deep_feature_columns)
   second_layer = fully_connected(first_layer, ...)
+
+NOTE: Functions prefixed with "_" indicate experimental or private parts of
+the API subject to change, and should not be relied upon!
 """
 
 from __future__ import absolute_import
@@ -228,14 +231,13 @@ def make_linear_model(features,
                       trainable=True):
   """Returns a linear prediction `Tensor` based on given `feature_columns`.
 
-  This function generates a weighted sum for each unitss`. Weighted sum
-  refers to logits in classification problems. It refers to the prediction
-  itself for linear regression problems.
+  This function generates a weighted sum based on output dimension `units`.
+  Weighted sum refers to logits in classification problems. It refers to the
+  prediction itself for linear regression problems.
 
-  Main difference of `make_linear_model` and `make_input_layer` is handling of
-  categorical columns. `make_linear_model` treats them as `indicator_column`s
-  while `make_input_layer` explicitly requires wrapping each of them with an
-  `embedding_column` or an `indicator_column`.
+  Note on supported columns: `make_linear_model` treats categorical columns as
+  `indicator_column`s while `make_input_layer` explicitly requires wrapping each
+  of them with an `embedding_column` or an `indicator_column`.
 
   Example:
 
@@ -254,8 +256,7 @@ def make_linear_model(features,
       corresponding `FeatureColumn`.
     feature_columns: An iterable containing all the FeatureColumns. All items
       should be instances of classes derived from FeatureColumn.
-    units: units: An integer, dimensionality of the output space. Default
-      value is 1.
+    units: An integer, dimensionality of the output space. Default value is 1.
     sparse_combiner: A string specifying how to reduce if a sparse column is
       multivalent. Currently "mean", "sqrtn" and "sum" are supported, with "sum"
       the default. "sqrtn" often achieves good accuracy, in particular with
@@ -850,6 +851,32 @@ def categorical_column_with_identity(key, num_buckets, default_value=None):
       key=key, num_buckets=num_buckets, default_value=default_value)
 
 
+def indicator_column(categorical_column):
+  """Represents multi-hot representation of given categorical column.
+
+  Used to wrap any `categorical_column_*`.
+
+  ```python
+  name = indicator_column(categorical_column_with_vocabulary_list('name',
+      ['bob', 'george', 'wanda'])
+  all_feature_columns = [name, ...]
+  dense_tensor = make_input_layer(features, all_feature_columns)
+
+  dense_tensor == [[1, 0, 0]]  # If "name" bytes_list is ["bob"]
+  dense_tensor == [[1, 0, 1]]  # If "name" bytes_list is ["bob", "wanda"]
+  dense_tensor == [[2, 0, 0]]  # If "name" bytes_list is ["bob", "bob"]
+  ```
+
+  Args:
+    categorical_column: A `_CategoricalColumn` which is created by
+      `categorical_column_with_*` or crossed_column functions.
+
+  Returns:
+    An `_IndicatorColumn`.
+  """
+  return _IndicatorColumn(categorical_column)
+
+
 class _FeatureColumn(object):
   """Represents a feature column abstraction.
 
@@ -874,14 +901,14 @@ class _FeatureColumn(object):
 
   @abc.abstractmethod
   def _transform_feature(self, inputs):
-    """Returns transformed `Tensor`, uses `inputs` to access input tensors.
+    """Returns intermediate representation (usually a `Tensor`).
 
-    It uses `inputs` to get either raw feature or transformation of other
-    FeatureColumns.
+    Uses `inputs` to create an intermediate representation (usually a `Tensor`)
+    that other feature columns can use.
 
-    Example input access:
+    Example usage of `inputs`:
     Let's say a Feature column depends on raw feature ('raw') and another
-    `_FeatureColumn` (input_fc). To access corresponding Tensors, inputs will
+    `_FeatureColumn` (input_fc). To access corresponding `Tensor`s, inputs will
     be used as follows:
 
     ```python
@@ -933,7 +960,7 @@ class _DenseColumn(_FeatureColumn):
 
   @abc.abstractproperty
   def _variable_shape(self):
-    """Returns a `TensorShape` of variable compatible with _get_dense_tensor."""
+    """Returns a `TensorShape` representing the shape of the dense `Tensor`."""
     pass
 
   @abc.abstractmethod
@@ -979,7 +1006,7 @@ def _create_dense_column_weighted_sum(
 
 
 class _CategoricalColumn(_FeatureColumn):
-  """Represents a categorical feautre.
+  """Represents a categorical feature.
 
   WARNING: Do not subclass this layer unless you know what you are doing:
   the API is subject to future changes.
@@ -1249,8 +1276,24 @@ class _NumericColumn(_DenseColumn,
     return tensor_shape.TensorShape(self.shape)
 
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    """Returns dense `Tensor` representing numeric feature.
+
+    Args:
+      inputs: A `_LazyBuilder` object to access inputs.
+      weight_collections: Unused `weight_collections` since no variables are
+        created in this function.
+      trainable: Unused `trainable` bool since no variables are created in
+        this function.
+
+    Returns:
+      Dense `Tensor` created within `_transform_feature`.
+    """
+    # Do nothing with weight_collections and trainable since no variables are
+    # created in this function.
     del weight_collections
     del trainable
+    # Feature has been already transformed. Return the intermediate
+    # representation created by _transform_feature.
     return inputs.get(self)
 
 
@@ -1667,8 +1710,8 @@ def _safe_embedding_lookup_sparse(embedding_weights,
   along the last dimension.
 
   Args:
-    embedding_weights:  A list of `P` float tensors or values representing
-        partitioned embedding tensors.  Alternatively, a `PartitionedVariable`,
+    embedding_weights:  A list of `P` float `Tensor`s or values representing
+        partitioned embedding `Tensor`s.  Alternatively, a `PartitionedVariable`
         created by partitioning along dimension 0.  The total unpartitioned
         shape should be `[e_0, e_1, ..., e_m]`, where `e_0` represents the
         vocab size and `e_1, ..., e_m` are the embedding dimensions.
@@ -1689,7 +1732,7 @@ def _safe_embedding_lookup_sparse(embedding_weights,
 
 
   Returns:
-    Dense tensor of shape `[d_0, d_1, ..., d_{n-1}, e_1, ..., e_m]`.
+    Dense `Tensor` of shape `[d_0, d_1, ..., d_{n-1}, e_1, ..., e_m]`.
 
   Raises:
     ValueError: if `embedding_weights` is empty.
@@ -1788,3 +1831,83 @@ def _prune_invalid_ids(sparse_ids, sparse_weights):
   if sparse_weights is not None:
     sparse_weights = sparse_ops.sparse_retain(sparse_weights, is_id_valid)
   return sparse_ids, sparse_weights
+
+
+class _IndicatorColumn(_DenseColumn,
+                       collections.namedtuple('_IndicatorColumn',
+                                              ['categorical_column'])):
+  """Represents a one-hot column for use in deep networks.
+
+  Args:
+    categorical_column: A `_CategoricalColumn` which is created by
+      `categorical_column_with_*` function.
+  """
+
+  @property
+  def name(self):
+    return '{}_indicator'.format(self.categorical_column.name)
+
+  def _transform_feature(self, inputs):
+    """Returns dense `Tensor` representing feature.
+
+    Args:
+      inputs: A `_LazyBuilder` object to access inputs.
+
+    Returns:
+      Transformed feature `Tensor`.
+    """
+    id_weight_pair = self.categorical_column._get_sparse_tensors(inputs)  # pylint: disable=protected-access
+    id_tensor = id_weight_pair.id_tensor
+    weight_tensor = id_weight_pair.weight_tensor
+
+    # If the underlying column is weighted, return the input as a dense tensor.
+    if weight_tensor is not None:
+      weighted_column = sparse_ops.sparse_merge(
+          sp_ids=id_tensor,
+          sp_values=weight_tensor,
+          vocab_size=self._variable_shape[-1])
+      return sparse_ops.sparse_tensor_to_dense(weighted_column)
+
+    dense_id_tensor = sparse_ops.sparse_tensor_to_dense(
+        id_tensor, default_value=-1)
+
+    # One hot must be float for tf.concat reasons since all other inputs to
+    # input_layer are float32.
+    one_hot_id_tensor = array_ops.one_hot(
+        dense_id_tensor,
+        depth=self._variable_shape[-1],
+        on_value=1.0,
+        off_value=0.0)
+
+    # Reduce to get a multi-hot per example.
+    return math_ops.reduce_sum(one_hot_id_tensor, axis=[1])
+
+  @property
+  def _parse_example_config(self):
+    return self.categorical_column._parse_example_config  # pylint: disable=protected-access
+
+  @property
+  def _variable_shape(self):
+    """Returns a `TensorShape` representing the shape of the dense `Tensor`."""
+    return tensor_shape.TensorShape([1, self.categorical_column._num_buckets])  # pylint: disable=protected-access
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    """Returns dense `Tensor` representing feature.
+
+    Args:
+      inputs: A `_LazyBuilder` object to access inputs.
+      weight_collections: Unused `weight_collections` since no variables are
+        created in this function.
+      trainable: Unused `trainable` bool since no variables are created in
+        this function.
+
+    Returns:
+      Dense `Tensor` created within `_transform_feature`.
+    """
+    # Do nothing with weight_collections and trainable since no variables are
+    # created in this function.
+    del weight_collections
+    del trainable
+    # Feature has been already transformed. Return the intermediate
+    # representation created by _transform_feature.
+    return inputs.get(self)
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 8b477c46a8..cf52d2df4f 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -1189,6 +1189,17 @@ class MakeInputLayerTest(test.TestCase):
         self.assertAllClose([[1., 3.]], net1.eval())
         self.assertAllClose([[1., 3.]], net2.eval())
 
+  def test_fails_for_categorical_column(self):
+    animal = fc.categorical_column_with_identity('animal', num_buckets=4)
+    with ops.Graph().as_default():
+      features = {
+          'animal':
+              sparse_tensor.SparseTensor(
+                  indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
+      }
+      with self.assertRaisesRegexp(Exception, 'must be a _DenseColumn'):
+        fc.make_input_layer(features, [animal])
+
 
 class MakeParseExampleSpecTest(test.TestCase):
 
@@ -2108,5 +2119,107 @@ class TransformFeaturesTest(test.TestCase):
       self.assertEqual(1, column2.call_order)
 
 
+class IndicatorColumnTest(test.TestCase):
+
+  def test_indicator_column(self):
+    a = fc.categorical_column_with_hash_bucket('a', 4)
+    indicator_a = fc.indicator_column(a)
+    self.assertEqual(indicator_a.categorical_column.name, 'a')
+    self.assertEqual(indicator_a._variable_shape, [1, 4])
+
+    b = fc.categorical_column_with_hash_bucket('b', hash_bucket_size=100)
+    indicator_b = fc.indicator_column(b)
+    self.assertEqual(indicator_b.categorical_column.name, 'b')
+    self.assertEqual(indicator_b._variable_shape, [1, 100])
+
+  def test_1D_shape_fails(self):
+    with self.assertRaisesRegexp(ValueError, 'must have rank 2'):
+      fc._LazyBuilder({
+          'animal':
+              sparse_tensor.SparseTensor(
+                  indices=[0], values=['fox'], dense_shape=[1])
+      })
+
+  def test_2D_shape_succeeds(self):
+    # TODO(ispir/cassandrax): Swith to categorical_column_with_keys when ready.
+    animal = fc.indicator_column(
+        fc.categorical_column_with_hash_bucket('animal', 4))
+    builder = fc._LazyBuilder({
+        'animal':
+            sparse_tensor.SparseTensor(
+                indices=[[0, 0], [1, 0]],
+                values=['fox', 'fox'],
+                dense_shape=[2, 1])
+    })
+    output = builder.get(animal)
+    with self.test_session():
+      self.assertAllEqual([[0., 0., 1., 0.], [0., 0., 1., 0.]], output.eval())
+
+  def test_multi_hot(self):
+    animal = fc.indicator_column(
+        fc.categorical_column_with_identity('animal', num_buckets=4))
+
+    builder = fc._LazyBuilder({
+        'animal':
+            sparse_tensor.SparseTensor(
+                indices=[[0, 0], [0, 1]], values=[1, 1], dense_shape=[1, 2])
+    })
+    output = builder.get(animal)
+    with self.test_session():
+      self.assertAllEqual([[0., 2., 0., 0.]], output.eval())
+
+  def test_multi_hot2(self):
+    animal = fc.indicator_column(
+        fc.categorical_column_with_identity('animal', num_buckets=4))
+    builder = fc._LazyBuilder({
+        'animal':
+            sparse_tensor.SparseTensor(
+                indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
+    })
+    output = builder.get(animal)
+    with self.test_session():
+      self.assertAllEqual([[0., 1., 1., 0.]], output.eval())
+
+  def test_indicator_column_deep_copy(self):
+    a = fc.categorical_column_with_hash_bucket('a', 4)
+    column = fc.indicator_column(a)
+    column_copy = copy.deepcopy(column)
+    self.assertEqual(column_copy.categorical_column.name, 'a')
+    self.assertEqual(column.name, 'a_indicator')
+    self.assertEqual(column._variable_shape, [1, 4])
+
+  def test_make_linear_model(self):
+    animal = fc.indicator_column(
+        fc.categorical_column_with_identity('animal', num_buckets=4))
+    with ops.Graph().as_default():
+      features = {
+          'animal':
+              sparse_tensor.SparseTensor(
+                  indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
+      }
+
+      predictions = fc.make_linear_model(features, [animal])
+      weight_var = get_linear_model_column_var(animal)
+      with _initialized_session():
+        # All should be zero-initialized.
+        self.assertAllClose([[0.], [0.], [0.], [0.]], weight_var.eval())
+        self.assertAllClose([[0.]], predictions.eval())
+        weight_var.assign([[1.], [2.], [3.], [4.]]).eval()
+        self.assertAllClose([[2. + 3.]], predictions.eval())
+
+  def test_make_input_layer(self):
+    animal = fc.indicator_column(
+        fc.categorical_column_with_identity('animal', num_buckets=4))
+    with ops.Graph().as_default():
+      features = {
+          'animal':
+              sparse_tensor.SparseTensor(
+                  indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
+      }
+      net = fc.make_input_layer(features, [animal])
+      with _initialized_session():
+        self.assertAllClose([[0., 1., 1., 0.]], net.eval())
+
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From 8bda9d06f8a62e995ef14a30d83481874c7720f4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 10:54:34 -0700
Subject: [PATCH 1185/1563] Merged commit includes the following changes:
 155648333  by dumitru <dumitru@google.com>:

    Adding scope argument to slim's DatasetDataProvider.

--
155645726  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal only change.

--

PiperOrigin-RevId: 155648333
---
 .../contrib/slim/python/slim/data/dataset_data_provider.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py b/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py
index f1b425aab7..3a78c0471d 100644
--- a/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py
+++ b/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py
@@ -59,7 +59,8 @@ class DatasetDataProvider(data_provider.DataProvider):
                common_queue_capacity=256,
                common_queue_min=128,
                record_key='record_key',
-               seed=None):
+               seed=None,
+               scope=None):
     """Creates a DatasetDataProvider.
 
     Args:
@@ -76,6 +77,7 @@ class DatasetDataProvider(data_provider.DataProvider):
       record_key: The item name to use for the dataset record keys in the
         provided tensors.
       seed: The seed to use if shuffling.
+      scope: Optional name scope for the ops.
     Raises:
       ValueError: If `record_key` matches one of the items in the dataset.
     """
@@ -88,7 +90,8 @@ class DatasetDataProvider(data_provider.DataProvider):
         shuffle=shuffle,
         capacity=common_queue_capacity,
         min_after_dequeue=common_queue_min,
-        seed=seed)
+        seed=seed,
+        scope=scope)
 
     items = dataset.decoder.list_items()
     tensors = dataset.decoder.decode(data, items)
-- 
GitLab


From 64698dd7bb17dc0796f9635963918059e8a1ebc2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 10:55:16 -0700
Subject: [PATCH 1186/1563] Add `embedding_column`. Add some pydoc to other
 columns. Add weight_collections tests for all columns. Rename embedding
 'weights' -> 'embedding_weights', linear 'weight' -> 'weights', and linear
 'bias_weight' -> 'bias_weights'.

PiperOrigin-RevId: 155648428
---
 tensorflow/python/feature_column/BUILD        |   4 +
 .../python/feature_column/feature_column.py   | 199 +++++-
 .../feature_column/feature_column_test.py     | 623 +++++++++++++++++-
 .../embedding.ckpt.data-00000-of-00001        | Bin 0 -> 24 bytes
 .../testdata/embedding.ckpt.index             | Bin 0 -> 136 bytes
 .../testdata/embedding.ckpt.meta              | Bin 0 -> 4366 bytes
 6 files changed, 792 insertions(+), 34 deletions(-)
 create mode 100644 tensorflow/python/feature_column/testdata/embedding.ckpt.data-00000-of-00001
 create mode 100644 tensorflow/python/feature_column/testdata/embedding.ckpt.index
 create mode 100644 tensorflow/python/feature_column/testdata/embedding.ckpt.meta

diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
index ac7aef96ac..8e26465f26 100644
--- a/tensorflow/python/feature_column/BUILD
+++ b/tensorflow/python/feature_column/BUILD
@@ -39,6 +39,7 @@ py_library(
         "//tensorflow/python:sparse_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:string_ops",
+        "//tensorflow/python:training",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
@@ -48,6 +49,9 @@ py_library(
 filegroup(
     name = "vocabulary_testdata",
     srcs = [
+        "testdata/embedding.ckpt.data-00000-of-00001",
+        "testdata/embedding.ckpt.index",
+        "testdata/embedding.ckpt.meta",
         "testdata/warriors_vocabulary.txt",
         "testdata/wire_vocabulary.txt",
     ],
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 50d7e00fd9..557a543ef2 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -123,6 +123,7 @@ from __future__ import print_function
 
 import abc
 import collections
+import math
 
 import numpy as np
 import six
@@ -144,6 +145,7 @@ from tensorflow.python.ops import string_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.training import checkpoint_utils
 from tensorflow.python.util import nest
 
 
@@ -304,7 +306,7 @@ def make_linear_model(features,
     predictions_no_bias = math_ops.add_n(
         weigthed_sums, name='weighted_sum_no_bias')
     bias = variable_scope.get_variable(
-        'bias_weight',
+        'bias_weights',
         shape=[units],
         initializer=init_ops.zeros_initializer(),
         trainable=trainable,
@@ -416,6 +418,88 @@ def make_parse_example_spec(feature_columns):
   return result
 
 
+def embedding_column(
+    categorical_column, dimension, combiner='mean', initializer=None,
+    ckpt_to_load_from=None, tensor_name_in_ckpt=None, max_norm=None,
+    trainable=True):
+  """`_DenseColumn` that converts from sparse, categorical input.
+
+  Use this when your inputs are sparse, but you want to convert them to a dense
+  representation (e.g., to feed to a DNN).
+
+  Inputs must be `SparseTensor` by way of the provided
+  `categorical_column._get_sparse_tensors`.
+
+  Any of the `categorical_column_*` columns can be provided as input. Here is an
+  example embedding of an identity column for a DNN model:
+
+  ```python
+  video_id = categorical_column_with_identity(
+      key='video_id', num_buckets=1000000, default_value=0)
+  columns = [embedding_column(video_id, 9),...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  dense_tensor = make_input_layer(features, columns)
+  ```
+
+  Args:
+    categorical_column: A `_CategoricalColumn` created by a
+      `categorical_column_with_*` function. This column produces the sparse IDs
+      that are inputs to the embedding lookup.
+    dimension: An integer specifying dimension of the embedding, must be > 0.
+    combiner: A string specifying how to reduce if there are multiple entries
+      in a single row. Currently 'mean', 'sqrtn' and 'sum' are supported, with
+      'mean' the default. 'sqrtn' often achieves good accuracy, in particular
+      with bag-of-words columns. Each of this can be thought as example level
+      normalizations on the column. For more information, see
+      `tf.embedding_lookup_sparse`.
+    initializer: A variable initializer function to be used in embedding
+      variable initialization. If not specified, defaults to
+      `tf.truncated_normal_initializer` with mean `0.0` and standard deviation
+      `1/sqrt(categorical_column._num_buckets)`.
+    ckpt_to_load_from: String representing checkpoint name/pattern fromwhich to
+      restore column weights. Required if `tensor_name_in_ckpt` is not `None`.
+    tensor_name_in_ckpt: Name of the `Tensor` in `ckpt_to_load_from` from
+      which to restore the column weights. Required if `ckpt_to_load_from` is
+      not `None`.
+    max_norm: If not `None`, embedding values are l2-normalized to this value.
+    trainable: Whether or not the embedding is trainable. Default is True.
+
+  Returns:
+    `_DenseColumn` that converts from sparse input.
+
+  Raises:
+    ValueError: if `dimension` not > 0.
+    ValueError: if exactly one of `ckpt_to_load_from` and `tensor_name_in_ckpt`
+      is specified.
+    ValueError: if `initializer` is specified and is not callable.
+  """
+  if (dimension is None) or (dimension < 1):
+    raise ValueError('Invalid dimension {}.'.format(dimension))
+  if (ckpt_to_load_from is None) != (tensor_name_in_ckpt is None):
+    raise ValueError('Must specify both `ckpt_to_load_from` and '
+                     '`tensor_name_in_ckpt` or none of them.')
+
+  if (initializer is not None) and (not callable(initializer)):
+    raise ValueError('initializer must be callable if specified. '
+                     'Embedding of column_name: {}'.format(
+                         categorical_column.name))
+  if initializer is None:
+    # pylint: disable=protected-access
+    initializer = init_ops.truncated_normal_initializer(
+        mean=0.0, stddev=1 / math.sqrt(dimension))
+    # pylint: enable=protected-access
+
+  return _EmbeddingColumn(
+      categorical_column=categorical_column,
+      dimension=dimension,
+      combiner=combiner,
+      initializer=initializer,
+      ckpt_to_load_from=ckpt_to_load_from,
+      tensor_name_in_ckpt=tensor_name_in_ckpt,
+      max_norm=max_norm,
+      trainable=trainable)
+
+
 def numeric_column(key,
                    shape=(1,),
                    default_value=None,
@@ -568,7 +652,7 @@ def categorical_column_with_hash_bucket(key,
   want to distribute your inputs into a finite number of buckets by hashing.
   output_id = Hash(input_feature_string) % bucket_size
 
-  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
   values can be represented by `-1` for int and `''` for string. Note that these
   values are independent of the `default_value` argument.
 
@@ -625,7 +709,7 @@ def categorical_column_with_vocabulary_file(
   `num_oov_buckets` and `default_value` to specify how to include
   out-of-vocabulary values.
 
-  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
   values can be represented by `-1` for int and `''` for string. Note that these
   values are independent of the `default_value` argument.
 
@@ -693,7 +777,6 @@ def categorical_column_with_vocabulary_file(
   if not vocabulary_file:
     raise ValueError('Missing vocabulary_file in {}.'.format(key))
   # `vocabulary_size` isn't required for lookup, but it is for `_num_buckets`.
-  # TODO(ptucker): Should we fail for vocabulary_size==1?
   if (vocabulary_size is None) or (vocabulary_size < 1):
     raise ValueError('Invalid vocabulary_size in {}.'.format(key))
   if num_oov_buckets:
@@ -719,14 +802,14 @@ def categorical_column_with_vocabulary_list(
   """A `_CategoricalColumn` with in-memory vocabulary.
 
   Logic for feature f is:
-  id = f in vocabulary_list ? vocabulary_list.index(f) : default_value
+  id = f in vocabulary_list ? vocabulary_list.index_of(f) : default_value
 
   Use this when your inputs are in string or integer format, and you have an
   in-memory vocabulary mapping each value to an integer ID. By default,
   out-of-vocabulary values are ignored. Use `default_value` to specify how to
   include out-of-vocabulary values.
 
-  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
   values can be represented by `-1` for int and `''` for string. Note that these
   values are independent of the `default_value` argument.
 
@@ -795,11 +878,16 @@ def categorical_column_with_vocabulary_list(
 def categorical_column_with_identity(key, num_buckets, default_value=None):
   """A `_CategoricalColumn` that returns identity values.
 
-  Use this when your inputs are integers in the range `[0, num_buckets)`. Values
-  outside this range will result in `default_value` if specified, otherwise it
-  will fail.
+  Use this when your inputs are integers in the range `[0, num_buckets)`, and
+  you want to use the input value itself as the categorical ID. Values outside
+  this range will result in `default_value` if specified, otherwise it will
+  fail.
+
+  Typically, this is used for contiguous ranges of integer indexes, but
+  it doesn't have to be. This might be inefficient, however, if many of IDs
+  are unused. Consider `categorical_column_with_hash_bucket` in that case.
 
-  `features[key]` are either `Tensor` or `SparseTensor`. If `Tensor`, missing
+  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
   values can be represented by `-1` for int and `''` for string. Note that these
   values are independent of the `default_value` argument.
 
@@ -960,15 +1048,15 @@ class _DenseColumn(_FeatureColumn):
 
   @abc.abstractproperty
   def _variable_shape(self):
-    """Returns a `TensorShape` representing the shape of the dense `Tensor`."""
+    """`TensorShape` of `_get_dense_tensor`, without batch dimension."""
     pass
 
   @abc.abstractmethod
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
     """Returns a `Tensor`.
 
-    The output of this function will be used by model-buildier-functions. For
-    example the pseudo code of `make_input_layer` will be like that:
+    The output of this function will be used by model-builder-functions. For
+    example the pseudo code of `make_input_layer` will be like:
 
     ```python
     def make_input_layer(features, feature_columns, ...):
@@ -982,6 +1070,9 @@ class _DenseColumn(_FeatureColumn):
         will be created) are added.
       trainable: If `True` also add variables to the graph collection
         `GraphKeys.TRAINABLE_VARIABLES` (see ${tf.Variable}).
+
+    Returns:
+      `Tensor` of shape [batch_size] + `_variable_shape`.
     """
     pass
 
@@ -997,7 +1088,7 @@ def _create_dense_column_weighted_sum(
   batch_size = array_ops.shape(tensor)[0]
   tensor = array_ops.reshape(tensor, shape=(batch_size, num_elements))
   weight = variable_scope.get_variable(
-      name='weight',
+      name='weights',
       shape=[num_elements, units],
       initializer=init_ops.zeros_initializer(),
       trainable=trainable,
@@ -1060,7 +1151,7 @@ def _create_categorical_column_weighted_sum(
       trainable=trainable)
   weight = variable_scope.get_variable(
       name='weight',
-      shape=[column._num_buckets, units],  # pylint: disable=protected-access
+      shape=(column._num_buckets, units),  # pylint: disable=protected-access
       initializer=init_ops.zeros_initializer(),
       trainable=trainable,
       collections=weight_collections)
@@ -1365,6 +1456,74 @@ class _BucketizedColumn(_DenseColumn, _CategoricalColumn,
     return _CategoricalColumn.IdWeightPair(sparse_tensor, None)
 
 
+class _EmbeddingColumn(
+    _DenseColumn,
+    collections.namedtuple('_EmbeddingColumn', (
+        'categorical_column', 'dimension', 'combiner', 'initializer',
+        'ckpt_to_load_from', 'tensor_name_in_ckpt', 'max_norm', 'trainable'
+    ))):
+  """See `_embedding_column`."""
+
+  @property
+  def name(self):
+    if not hasattr(self, '_name'):
+      self._name = '{}_embedding'.format(self.categorical_column.name)
+    return self._name
+
+  @property
+  def _parse_example_config(self):
+    # pylint: disable=protected-access
+    return self.categorical_column._parse_example_config
+    # pylint: enable=protected-access
+
+  def _transform_feature(self, inputs):
+    return inputs.get(self.categorical_column)
+
+  @property
+  def _variable_shape(self):
+    if not hasattr(self, '_shape'):
+      self._shape = tensor_shape.vector(self.dimension)
+    return self._shape
+
+  def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
+    # Get sparse IDs and weights.
+    # pylint: disable=protected-access
+    sparse_tensors = self.categorical_column._get_sparse_tensors(
+        inputs, weight_collections=weight_collections, trainable=trainable)
+    # pylint: enable=protected-access
+    sparse_ids = sparse_tensors.id_tensor
+    sparse_weights = sparse_tensors.weight_tensor
+
+    # Create embedding weight, and restore from checkpoint if necessary.
+    embedding_weights = variable_scope.get_variable(
+        name='embedding_weights',
+        # pylint: disable=protected-access
+        shape=(self.categorical_column._num_buckets, self.dimension),
+        # pylint: enable=protected-access
+        dtype=dtypes.float32,
+        initializer=self.initializer,
+        trainable=self.trainable and trainable,
+        collections=weight_collections)
+    if self.ckpt_to_load_from is not None:
+      to_restore = embedding_weights
+      if isinstance(to_restore, variables.PartitionedVariable):
+        # pylint: disable=protected-access
+        to_restore = to_restore._get_variable_list()
+        # pylint: enable=protected-access
+      checkpoint_utils.init_from_checkpoint(self.ckpt_to_load_from, {
+          self.tensor_name_in_ckpt: to_restore
+      })
+
+    # Return embedding lookup result.
+    return _safe_embedding_lookup_sparse(
+        embedding_weights=embedding_weights,
+        sparse_ids=sparse_ids,
+        sparse_weights=sparse_weights,
+        combiner=self.combiner,
+        name='%s_weights' % self.name,
+        max_norm=self.max_norm)
+
+
 def _create_tuple(shape, value):
   """Returns a tuple with given shape and filled with value."""
   if shape:
@@ -1689,7 +1848,7 @@ class _IdentityCategoricalColumn(
 def _safe_embedding_lookup_sparse(embedding_weights,
                                   sparse_ids,
                                   sparse_weights=None,
-                                  combiner=None,
+                                  combiner='mean',
                                   default_id=None,
                                   name=None,
                                   partition_strategy='div',
@@ -1727,7 +1886,7 @@ def _safe_embedding_lookup_sparse(embedding_weights,
     name: A name for this operation (optional).
     partition_strategy: A string specifying the partitioning strategy.
         Currently `"div"` and `"mod"` are supported. Default is `"div"`.
-    max_norm: If not None, all embeddings are l2-normalized to max_norm before
+    max_norm: If not `None`, all embeddings are l2-normalized to max_norm before
         combining.
 
 
@@ -1737,10 +1896,6 @@ def _safe_embedding_lookup_sparse(embedding_weights,
   Raises:
     ValueError: if `embedding_weights` is empty.
   """
-  if combiner is None:
-    logging.warn('The default value of combiner will change from \"mean\" '
-                 'to \"sqrtn\" after 2016/11/01.')
-    combiner = 'mean'
   if embedding_weights is None:
     raise ValueError('Missing embedding_weights %s.' % embedding_weights)
   if isinstance(embedding_weights, variables.PartitionedVariable):
@@ -1751,8 +1906,6 @@ def _safe_embedding_lookup_sparse(embedding_weights,
     raise ValueError('Missing embedding_weights %s.' % embedding_weights)
 
   dtype = sparse_weights.dtype if sparse_weights is not None else None
-  if isinstance(embedding_weights, variables.PartitionedVariable):
-    embedding_weights = list(embedding_weights)
   embedding_weights = [
       ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights
   ]
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index cf52d2df4f..56fe5180d8 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -577,7 +577,6 @@ class HashedCategoricalColumnTest(test.TestCase):
       fc.categorical_column_with_hash_bucket('aaa', 10, dtype=dtypes.float32)
 
   def test_deep_copy(self):
-    """Tests deepcopy of categorical_column_with_hash_bucket."""
     original = fc.categorical_column_with_hash_bucket('aaa', 10)
     for column in (original, copy.deepcopy(original)):
       self.assertEqual('aaa', column.name)
@@ -692,6 +691,19 @@ class HashedCategoricalColumnTest(test.TestCase):
     self.assertIsNone(id_weight_pair.weight_tensor)
     self.assertEqual(builder.get(hashed_sparse), id_weight_pair.id_tensor)
 
+  def test_get_sparse_tensors_weight_collections(self):
+    column = fc.categorical_column_with_hash_bucket('aaa', 10)
+    inputs = sparse_tensor.SparseTensor(
+        values=['omar', 'stringer', 'marlo'],
+        indices=[[0, 0], [1, 0], [1, 1]],
+        dense_shape=[2, 2])
+    column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+
+    self.assertItemsEqual(
+        [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
+    self.assertItemsEqual([], ops.get_collection('my_weights'))
+
   def test_get_sparse_tensors_dense_input(self):
     hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
     builder = fc._LazyBuilder({
@@ -725,7 +737,7 @@ class HashedCategoricalColumnTest(test.TestCase):
 
 def get_linear_model_bias():
   with variable_scope.variable_scope('make_linear_model', reuse=True):
-    return variable_scope.get_variable('bias_weight')
+    return variable_scope.get_variable('bias_weights')
 
 
 def get_linear_model_column_var(column):
@@ -885,8 +897,8 @@ class MakeLinearModelTest(test.TestCase):
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
-        self.assertAllClose([0., 0., 0.], bias.eval())
-        self.assertAllClose([[0., 0., 0.]], price_var.eval())
+        self.assertAllClose(np.zeros((3,)), bias.eval())
+        self.assertAllClose(np.zeros((1, 3)), price_var.eval())
         sess.run(price_var.assign([[10., 100., 1000.]]))
         sess.run(bias.assign([5., 6., 7.]))
         self.assertAllClose([[15., 106., 1007.], [55., 506., 5007.]],
@@ -904,8 +916,8 @@ class MakeLinearModelTest(test.TestCase):
       bias = get_linear_model_bias()
       wire_cast_var = get_linear_model_column_var(wire_cast)
       with _initialized_session() as sess:
-        self.assertAllClose([0., 0., 0.], bias.eval())
-        self.assertAllClose([[0.] * 3] * 4, wire_cast_var.eval())
+        self.assertAllClose(np.zeros((3,)), bias.eval())
+        self.assertAllClose(np.zeros((4, 3)), wire_cast_var.eval())
         sess.run(
             wire_cast_var.assign([[10., 11., 12.], [100., 110., 120.], [
                 1000., 1100., 1200.
@@ -950,8 +962,8 @@ class MakeLinearModelTest(test.TestCase):
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
-        self.assertAllClose([0., 0., 0.], bias.eval())
-        self.assertAllClose([[0., 0., 0.], [0., 0., 0.]], price_var.eval())
+        self.assertAllClose(np.zeros((3,)), bias.eval())
+        self.assertAllClose(np.zeros((2, 3)), price_var.eval())
         sess.run(price_var.assign([[1., 2., 3.], [10., 100., 1000.]]))
         sess.run(bias.assign([2., 3., 4.]))
         self.assertAllClose([[23., 205., 2007.], [67., 613., 6019.]],
@@ -1327,7 +1339,6 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
     }, column._parse_example_config)
 
   def test_deep_copy(self):
-    """Tests deepcopy of categorical_column_with_hash_bucket."""
     original = fc.categorical_column_with_vocabulary_file(
         key='aaa', vocabulary_file='path_to_file', vocabulary_size=3,
         num_oov_buckets=4, dtype=dtypes.int32)
@@ -1476,6 +1487,22 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
                                       dense_shape=inputs.dense_shape),
                                   id_tensor.eval())
 
+  def test_get_sparse_tensors_weight_collections(self):
+    column = fc.categorical_column_with_vocabulary_file(
+        key='aaa',
+        vocabulary_file=self._wire_vocabulary_file_name,
+        vocabulary_size=self._wire_vocabulary_size)
+    inputs = sparse_tensor.SparseTensor(
+        values=['omar', 'stringer', 'marlo'],
+        indices=[[0, 0], [1, 0], [1, 1]],
+        dense_shape=[2, 2])
+    column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+
+    self.assertItemsEqual(
+        [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
+    self.assertItemsEqual([], ops.get_collection('my_weights'))
+
   def test_get_sparse_tensors_dense_input(self):
     column = fc.categorical_column_with_vocabulary_file(
         key='aaa',
@@ -1684,7 +1711,6 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     }, column._parse_example_config)
 
   def test_deep_copy(self):
-    """Tests deepcopy of categorical_column_with_hash_bucket."""
     original = fc.categorical_column_with_vocabulary_list(
         key='aaa', vocabulary_list=(12, 24, 36), dtype=dtypes.int32)
     for column in (original, copy.deepcopy(original)):
@@ -1778,6 +1804,21 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
               dense_shape=inputs.dense_shape),
           id_weight_pair.id_tensor.eval())
 
+  def test_get_sparse_tensors_weight_collections(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=('omar', 'stringer', 'marlo'))
+    inputs = sparse_tensor.SparseTensor(
+        values=['omar', 'stringer', 'marlo'],
+        indices=[[0, 0], [1, 0], [1, 1]],
+        dense_shape=[2, 2])
+    column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+
+    self.assertItemsEqual(
+        [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
+    self.assertItemsEqual([], ops.get_collection('my_weights'))
+
   def test_get_sparse_tensors_dense_input(self):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa',
@@ -1894,7 +1935,6 @@ class IdentityCategoricalColumnTest(test.TestCase):
     }, column._parse_example_config)
 
   def test_deep_copy(self):
-    """Tests deepcopy of categorical_column_with_hash_bucket."""
     original = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
     for column in (original, copy.deepcopy(original)):
       self.assertEqual('aaa', column.name)
@@ -1948,6 +1988,19 @@ class IdentityCategoricalColumnTest(test.TestCase):
               dense_shape=inputs.dense_shape),
           id_weight_pair.id_tensor.eval())
 
+  def test_get_sparse_tensors_weight_collections(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(0, 1, 0),
+        dense_shape=(2, 2))
+    column._get_sparse_tensors(
+        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+
+    self.assertItemsEqual(
+        [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
+    self.assertItemsEqual([], ops.get_collection('my_weights'))
+
   def test_get_sparse_tensors_dense_input(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
     id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
@@ -2221,5 +2274,553 @@ class IndicatorColumnTest(test.TestCase):
         self.assertAllClose([[0., 1., 1., 0.]], net.eval())
 
 
+class EmbeddingColumnTest(test.TestCase):
+
+  def test_defaults(self):
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=3)
+    embedding_dimension = 2
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension)
+    self.assertIs(categorical_column, embedding_column.categorical_column)
+    self.assertEqual(embedding_dimension, embedding_column.dimension)
+    self.assertEqual('mean', embedding_column.combiner)
+    self.assertIsNotNone(embedding_column.initializer)
+    self.assertIsNone(embedding_column.ckpt_to_load_from)
+    self.assertIsNone(embedding_column.tensor_name_in_ckpt)
+    self.assertIsNone(embedding_column.max_norm)
+    self.assertTrue(embedding_column.trainable)
+    self.assertEqual('aaa_embedding', embedding_column.name)
+    self.assertEqual(
+        (embedding_dimension,), embedding_column._variable_shape)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.int64)
+    }, embedding_column._parse_example_config)
+
+  def test_all_constructor_args(self):
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=3)
+    embedding_dimension = 2
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        combiner='my_combiner', initializer=lambda: 'my_initializer',
+        ckpt_to_load_from='my_ckpt', tensor_name_in_ckpt='my_ckpt_tensor',
+        max_norm=42., trainable=False)
+    self.assertIs(categorical_column, embedding_column.categorical_column)
+    self.assertEqual(embedding_dimension, embedding_column.dimension)
+    self.assertEqual('my_combiner', embedding_column.combiner)
+    self.assertEqual('my_initializer', embedding_column.initializer())
+    self.assertEqual('my_ckpt', embedding_column.ckpt_to_load_from)
+    self.assertEqual('my_ckpt_tensor', embedding_column.tensor_name_in_ckpt)
+    self.assertEqual(42., embedding_column.max_norm)
+    self.assertFalse(embedding_column.trainable)
+    self.assertEqual('aaa_embedding', embedding_column.name)
+    self.assertEqual(
+        (embedding_dimension,), embedding_column._variable_shape)
+    self.assertEqual({
+        'aaa': parsing_ops.VarLenFeature(dtypes.int64)
+    }, embedding_column._parse_example_config)
+
+  def test_deep_copy(self):
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=3)
+    embedding_dimension = 2
+    original = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        combiner='my_combiner', initializer=lambda: 'my_initializer',
+        ckpt_to_load_from='my_ckpt', tensor_name_in_ckpt='my_ckpt_tensor',
+        max_norm=42., trainable=False)
+    for embedding_column in (original, copy.deepcopy(original)):
+      self.assertEqual('aaa', embedding_column.categorical_column.name)
+      self.assertEqual(3, embedding_column.categorical_column._num_buckets)
+      self.assertEqual({
+          'aaa': parsing_ops.VarLenFeature(dtypes.int64)
+      }, embedding_column.categorical_column._parse_example_config)
+
+      self.assertEqual(embedding_dimension, embedding_column.dimension)
+      self.assertEqual('my_combiner', embedding_column.combiner)
+      self.assertEqual('my_initializer', embedding_column.initializer())
+      self.assertEqual('my_ckpt', embedding_column.ckpt_to_load_from)
+      self.assertEqual('my_ckpt_tensor', embedding_column.tensor_name_in_ckpt)
+      self.assertEqual(42., embedding_column.max_norm)
+      self.assertFalse(embedding_column.trainable)
+      self.assertEqual('aaa_embedding', embedding_column.name)
+      self.assertEqual(
+          (embedding_dimension,), embedding_column._variable_shape)
+      self.assertEqual({
+          'aaa': parsing_ops.VarLenFeature(dtypes.int64)
+      }, embedding_column._parse_example_config)
+
+  def test_invalid_initializer(self):
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=3)
+    with self.assertRaisesRegexp(ValueError, 'initializer must be callable'):
+      fc.embedding_column(categorical_column, dimension=2, initializer='not_fn')
+
+  def test_get_dense_tensor(self):
+    # Inputs.
+    vocabulary_size = 3
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0), (1, 0), (1, 4), (3, 0)),
+        values=(2, 0, 1, 1),
+        dense_shape=(4, 5))
+
+    # Embedding variable.
+    embedding_dimension = 2
+    embedding_values = (
+        (1., 2.),  # id 0
+        (3., 5.),  # id 1
+        (7., 11.)  # id 2
+    )
+    def _initializer(shape, dtype, partition_info):
+      self.assertAllEqual((vocabulary_size, embedding_dimension), shape)
+      self.assertEqual(dtypes.float32, dtype)
+      self.assertIsNone(partition_info)
+      return embedding_values
+
+    # Expected lookup result, using combiner='mean'.
+    expected_lookups = (
+        # example 0, ids [2], embedding = [7, 11]
+        (7., 11.),
+        # example 1, ids [0, 1], embedding = mean([1, 2] + [3, 5]) = [2, 3.5]
+        (2., 3.5),
+        # example 2, ids [], embedding = [0, 0]
+        (0., 0.),
+        # example 3, ids [1], embedding = [3, 5]
+        (3., 5.),
+    )
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=vocabulary_size)
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        initializer=_initializer)
+
+    # Provide sparse input and get dense result.
+    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
+        'aaa': sparse_input
+    }))
+
+    # Assert expected embedding variable and lookups.
+    global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
+    self.assertItemsEqual(
+        ('embedding_weights:0',), tuple([v.name for v in global_vars]))
+    with _initialized_session():
+      self.assertAllEqual(embedding_values, global_vars[0].eval())
+      self.assertAllEqual(expected_lookups, embedding_lookup.eval())
+
+  def test_get_dense_tensor_3d(self):
+    # Inputs.
+    vocabulary_size = 4
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0, 0), (1, 1, 0), (1, 1, 4), (3, 0, 0), (3, 1, 2)),
+        values=(2, 0, 1, 1, 2),
+        dense_shape=(4, 2, 5))
+
+    # Embedding variable.
+    embedding_dimension = 3
+    embedding_values = (
+        (1., 2., 4.),   # id 0
+        (3., 5., 1.),   # id 1
+        (7., 11., 2.),  # id 2
+        (2., 7., 12.)   # id 3
+    )
+    def _initializer(shape, dtype, partition_info):
+      self.assertAllEqual((vocabulary_size, embedding_dimension), shape)
+      self.assertEqual(dtypes.float32, dtype)
+      self.assertIsNone(partition_info)
+      return embedding_values
+
+    # Expected lookup result, using combiner='mean'.
+    expected_lookups = (
+        # example 0, ids [[2], []], embedding = [[7, 11, 2], [0, 0, 0]]
+        ((7., 11., 2.), (0., 0., 0.)),
+        # example 1, ids [[], [0, 1]], embedding
+        # = mean([[], [1, 2, 4] + [3, 5, 1]]) = [[0, 0, 0], [2, 3.5, 2.5]]
+        ((0., 0., 0.), (2., 3.5, 2.5)),
+        # example 2, ids [[], []], embedding = [[0, 0, 0], [0, 0, 0]]
+        ((0., 0., 0.), (0., 0., 0.)),
+        # example 3, ids [[1], [2]], embedding = [[3, 5, 1], [7, 11, 2]]
+        ((3., 5., 1.), (7., 11., 2.)),
+    )
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=vocabulary_size)
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        initializer=_initializer)
+
+    # Provide sparse input and get dense result.
+    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
+        'aaa': sparse_input
+    }))
+
+    # Assert expected embedding variable and lookups.
+    global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
+    self.assertItemsEqual(
+        ('embedding_weights:0',), tuple([v.name for v in global_vars]))
+    with _initialized_session():
+      self.assertAllEqual(embedding_values, global_vars[0].eval())
+      self.assertAllEqual(expected_lookups, embedding_lookup.eval())
+
+  def test_get_dense_tensor_weight_collections(self):
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0), (1, 0), (1, 4), (3, 0)),
+        values=(2, 0, 1, 1),
+        dense_shape=(4, 5))
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=3)
+    embedding_column = fc.embedding_column(categorical_column, dimension=2)
+
+    # Provide sparse input and get dense result.
+    embedding_column._get_dense_tensor(fc._LazyBuilder({
+        'aaa': sparse_input
+    }), weight_collections=('my_vars',))
+
+    # Assert expected embedding variable and lookups.
+    self.assertItemsEqual(
+        [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
+    my_vars = ops.get_collection('my_vars')
+    self.assertItemsEqual(
+        ('embedding_weights:0',), tuple([v.name for v in my_vars]))
+
+  def test_get_dense_tensor_placeholder_inputs(self):
+    # Inputs.
+    vocabulary_size = 3
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0), (1, 0), (1, 4), (3, 0)),
+        values=(2, 0, 1, 1),
+        dense_shape=(4, 5))
+
+    # Embedding variable.
+    embedding_dimension = 2
+    embedding_values = (
+        (1., 2.),  # id 0
+        (3., 5.),  # id 1
+        (7., 11.)  # id 2
+    )
+    def _initializer(shape, dtype, partition_info):
+      self.assertAllEqual((vocabulary_size, embedding_dimension), shape)
+      self.assertEqual(dtypes.float32, dtype)
+      self.assertIsNone(partition_info)
+      return embedding_values
+
+    # Expected lookup result, using combiner='mean'.
+    expected_lookups = (
+        # example 0, ids [2], embedding = [7, 11]
+        (7., 11.),
+        # example 1, ids [0, 1], embedding = mean([1, 2] + [3, 5]) = [2, 3.5]
+        (2., 3.5),
+        # example 2, ids [], embedding = [0, 0]
+        (0., 0.),
+        # example 3, ids [1], embedding = [3, 5]
+        (3., 5.),
+    )
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=vocabulary_size)
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        initializer=_initializer)
+
+    # Provide sparse input and get dense result.
+    input_indices = array_ops.placeholder(dtype=dtypes.int64)
+    input_values = array_ops.placeholder(dtype=dtypes.int64)
+    input_shape = array_ops.placeholder(dtype=dtypes.int64)
+    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
+        'aaa': sparse_tensor.SparseTensorValue(
+            indices=input_indices,
+            values=input_values,
+            dense_shape=input_shape)
+    }))
+
+    # Assert expected embedding variable and lookups.
+    global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
+    self.assertItemsEqual(
+        ('embedding_weights:0',), tuple([v.name for v in global_vars]))
+    with _initialized_session():
+      self.assertAllEqual(embedding_values, global_vars[0].eval())
+      self.assertAllEqual(expected_lookups, embedding_lookup.eval(
+          feed_dict={
+              input_indices: sparse_input.indices,
+              input_values: sparse_input.values,
+              input_shape: sparse_input.dense_shape,
+          }))
+
+  def test_get_dense_tensor_restore_from_ckpt(self):
+    # Inputs.
+    vocabulary_size = 3
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0), (1, 0), (1, 4), (3, 0)),
+        values=(2, 0, 1, 1),
+        dense_shape=(4, 5))
+
+    # Embedding variable. The checkpoint file contains _embedding_values.
+    embedding_dimension = 2
+    embedding_values = (
+        (1., 2.),  # id 0
+        (3., 5.),  # id 1
+        (7., 11.)  # id 2
+    )
+    ckpt_path = test.test_src_dir_path(
+        'python/feature_column/testdata/embedding.ckpt')
+    ckpt_tensor = 'my_embedding'
+
+    # Expected lookup result, using combiner='mean'.
+    expected_lookups = (
+        # example 0, ids [2], embedding = [7, 11]
+        (7., 11.),
+        # example 1, ids [0, 1], embedding = mean([1, 2] + [3, 5]) = [2, 3.5]
+        (2., 3.5),
+        # example 2, ids [], embedding = [0, 0]
+        (0., 0.),
+        # example 3, ids [1], embedding = [3, 5]
+        (3., 5.),
+    )
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=vocabulary_size)
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        ckpt_to_load_from=ckpt_path,
+        tensor_name_in_ckpt=ckpt_tensor)
+
+    # Provide sparse input and get dense result.
+    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
+        'aaa': sparse_input
+    }))
+
+    # Assert expected embedding variable and lookups.
+    global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
+    self.assertItemsEqual(
+        ('embedding_weights:0',), tuple([v.name for v in global_vars]))
+    with _initialized_session():
+      self.assertAllEqual(embedding_values, global_vars[0].eval())
+      self.assertAllEqual(expected_lookups, embedding_lookup.eval())
+
+  def test_make_linear_model(self):
+    # Inputs.
+    batch_size = 4
+    vocabulary_size = 3
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0), (1, 0), (1, 4), (3, 0)),
+        values=(2, 0, 1, 1),
+        dense_shape=(batch_size, 5))
+
+    # Embedding variable.
+    embedding_dimension = 2
+    embedding_shape = (vocabulary_size, embedding_dimension)
+    zeros_embedding_values = np.zeros(embedding_shape)
+    def _initializer(shape, dtype, partition_info):
+      self.assertAllEqual(embedding_shape, shape)
+      self.assertEqual(dtypes.float32, dtype)
+      self.assertIsNone(partition_info)
+      return zeros_embedding_values
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=vocabulary_size)
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        initializer=_initializer)
+
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          categorical_column.name: sparse_input
+      }, (embedding_column,))
+      expected_var_names = (
+          'make_linear_model/bias_weights:0',
+          'make_linear_model/aaa_embedding/weights:0',
+          'make_linear_model/aaa_embedding/embedding_weights:0',
+      )
+      self.assertItemsEqual(
+          expected_var_names,
+          [v.name for v in ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)])
+      trainable_vars = {
+          v.name: v for v in ops.get_collection(
+              ops.GraphKeys.TRAINABLE_VARIABLES)
+      }
+      self.assertItemsEqual(expected_var_names, trainable_vars.keys())
+      bias = trainable_vars['make_linear_model/bias_weights:0']
+      embedding_weights = trainable_vars[
+          'make_linear_model/aaa_embedding/embedding_weights:0']
+      linear_weights = trainable_vars[
+          'make_linear_model/aaa_embedding/weights:0']
+      with _initialized_session():
+        # Predictions with all zero weights.
+        self.assertAllClose(np.zeros((1,)), bias.eval())
+        self.assertAllClose(zeros_embedding_values, embedding_weights.eval())
+        self.assertAllClose(
+            np.zeros((embedding_dimension, 1)), linear_weights.eval())
+        self.assertAllClose(np.zeros((batch_size, 1)), predictions.eval())
+
+        # Predictions with all non-zero weights.
+        embedding_weights.assign((
+            (1., 2.),  # id 0
+            (3., 5.),  # id 1
+            (7., 11.)  # id 2
+        )).eval()
+        linear_weights.assign(((4.,), (6.,))).eval()
+        # example 0, ids [2], embedding[0] = [7, 11]
+        # example 1, ids [0, 1], embedding[1] = mean([1, 2] + [3, 5]) = [2, 3.5]
+        # example 2, ids [], embedding[2] = [0, 0]
+        # example 3, ids [1], embedding[3] = [3, 5]
+        # sum(embeddings * linear_weights)
+        # = [4*7 + 6*11, 4*2 + 6*3.5, 4*0 + 6*0, 4*3 + 6*5] = [94, 29, 0, 42]
+        self.assertAllClose(((94.,), (29.,), (0.,), (42.,)), predictions.eval())
+
+  def test_make_input_layer(self):
+    # Inputs.
+    vocabulary_size = 3
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0), (1, 0), (1, 4), (3, 0)),
+        values=(2, 0, 1, 1),
+        dense_shape=(4, 5))
+
+    # Embedding variable.
+    embedding_dimension = 2
+    embedding_values = (
+        (1., 2.),  # id 0
+        (3., 5.),  # id 1
+        (7., 11.)  # id 2
+    )
+    def _initializer(shape, dtype, partition_info):
+      self.assertAllEqual((vocabulary_size, embedding_dimension), shape)
+      self.assertEqual(dtypes.float32, dtype)
+      self.assertIsNone(partition_info)
+      return embedding_values
+
+    # Expected lookup result, using combiner='mean'.
+    expected_lookups = (
+        # example 0, ids [2], embedding = [7, 11]
+        (7., 11.),
+        # example 1, ids [0, 1], embedding = mean([1, 2] + [3, 5]) = [2, 3.5]
+        (2., 3.5),
+        # example 2, ids [], embedding = [0, 0]
+        (0., 0.),
+        # example 3, ids [1], embedding = [3, 5]
+        (3., 5.),
+    )
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=vocabulary_size)
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        initializer=_initializer)
+
+    # Provide sparse input and get dense result.
+    input_layer = fc.make_input_layer({
+        'aaa': sparse_input
+    }, (embedding_column,))
+
+    # Assert expected embedding variable and lookups.
+    global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
+    self.assertItemsEqual(
+        ('make_input_layer/aaa_embedding/embedding_weights:0',),
+        tuple([v.name for v in global_vars]))
+    trainable_vars = ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
+    self.assertItemsEqual(
+        ('make_input_layer/aaa_embedding/embedding_weights:0',),
+        tuple([v.name for v in trainable_vars]))
+    with _initialized_session():
+      self.assertAllEqual(embedding_values, trainable_vars[0].eval())
+      self.assertAllEqual(expected_lookups, input_layer.eval())
+
+  def test_make_input_layer_not_trainable(self):
+    # Inputs.
+    vocabulary_size = 3
+    sparse_input = sparse_tensor.SparseTensorValue(
+        # example 0, ids [2]
+        # example 1, ids [0, 1]
+        # example 2, ids []
+        # example 3, ids [1]
+        indices=((0, 0), (1, 0), (1, 4), (3, 0)),
+        values=(2, 0, 1, 1),
+        dense_shape=(4, 5))
+
+    # Embedding variable.
+    embedding_dimension = 2
+    embedding_values = (
+        (1., 2.),  # id 0
+        (3., 5.),  # id 1
+        (7., 11.)  # id 2
+    )
+    def _initializer(shape, dtype, partition_info):
+      self.assertAllEqual((vocabulary_size, embedding_dimension), shape)
+      self.assertEqual(dtypes.float32, dtype)
+      self.assertIsNone(partition_info)
+      return embedding_values
+
+    # Expected lookup result, using combiner='mean'.
+    expected_lookups = (
+        # example 0, ids [2], embedding = [7, 11]
+        (7., 11.),
+        # example 1, ids [0, 1], embedding = mean([1, 2] + [3, 5]) = [2, 3.5]
+        (2., 3.5),
+        # example 2, ids [], embedding = [0, 0]
+        (0., 0.),
+        # example 3, ids [1], embedding = [3, 5]
+        (3., 5.),
+    )
+
+    # Build columns.
+    categorical_column = fc.categorical_column_with_identity(
+        key='aaa', num_buckets=vocabulary_size)
+    embedding_column = fc.embedding_column(
+        categorical_column, dimension=embedding_dimension,
+        initializer=_initializer, trainable=False)
+
+    # Provide sparse input and get dense result.
+    input_layer = fc.make_input_layer({
+        'aaa': sparse_input
+    }, (embedding_column,))
+
+    # Assert expected embedding variable and lookups.
+    global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
+    self.assertItemsEqual(
+        ('make_input_layer/aaa_embedding/embedding_weights:0',),
+        tuple([v.name for v in global_vars]))
+    self.assertItemsEqual(
+        [], ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES))
+    with _initialized_session():
+      self.assertAllEqual(embedding_values, global_vars[0].eval())
+      self.assertAllEqual(expected_lookups, input_layer.eval())
+
+
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/feature_column/testdata/embedding.ckpt.data-00000-of-00001 b/tensorflow/python/feature_column/testdata/embedding.ckpt.data-00000-of-00001
new file mode 100644
index 0000000000000000000000000000000000000000..5cc36d86d60d4a76b1cf005fe207e0d8af0f3f06
GIT binary patch
literal 24
fcmZQzXs~BsU~phyaByH?Sm40G@W6qA!N3s!D&zz4

literal 0
HcmV?d00001

diff --git a/tensorflow/python/feature_column/testdata/embedding.ckpt.index b/tensorflow/python/feature_column/testdata/embedding.ckpt.index
new file mode 100644
index 0000000000000000000000000000000000000000..c1f35a8fcfffed90eb44b3d784f998cafb59d3aa
GIT binary patch
literal 136
zcmZQzVB=tvV&Y(A;1SNPj8Dx?N=-@0%uDBB6ygwK;$RkH;$YH{FqJd+|H8n)z`zJ1
t?yuU^3ZlWB1D_UdU|?j*V=#sb>F#H_Xu;vi2NEEJ!+$q)tCYIm1^~X36ng*w

literal 0
HcmV?d00001

diff --git a/tensorflow/python/feature_column/testdata/embedding.ckpt.meta b/tensorflow/python/feature_column/testdata/embedding.ckpt.meta
new file mode 100644
index 0000000000000000000000000000000000000000..65bc3f2becb000010273d8e9835e7e39d553f5c7
GIT binary patch
literal 4366
zcmd;TU>ADH#%0OH?3j`w#Ky%~p~M&hqAQgcL!{Wa7^{>RLzJYr7(;|uN-7Idt@yck
zjktvwnON9ZnK?Ox*tsgW*c^+CGt={gxVe~%Qqz<eLmC(vg}As_%Mx=+Q$fZEadG9B
zmK2nh#KYy4IN?SrNpbO&CFW$NB$lMc7iT0EqzbVl<>%)}F=;R=iF0w67N^GN<R@om
z=A|PfW-u~xS#YsB=jRodNbz&ALCjZTO#wMli63gY5L-!VUU7br5-%4-2I2`WJuVK<
zl+?VE%#uowLo@RVN=rZv<%S!?7=q+NE*map-_jgVun-?Sg5dC(z{tqO#>L{7?_a=G
z%f%a%n3s~D8=9AymS2<$vKs7PkkwfHz*3x=nj*xUnO7pkB*CC0z{Ls@FhYokq4>&*
zor~3oS(uSYNe~{kR%~1>Moi3{9gK`zIb57Usl_GvMX6y%LR?&I1x2Z8nH3W3LIPYo
zkYI|>OUz9zmS7hW;SvBlEIu(WCB8T(GZ`c*CCJ4NQCDol1`g+9B?&GlONc8cv$#Y9
z6#AMPj0TKcnOtnaiDhJ3B}9@{rd-UyrAatrM+^}f++3VS?81yppp?s1%*7R!Sd^KV
zl#?1}B*hO&ypUwlz{se?$HfW`10e{7mV}hVxj2*a^GXsk^HPh1*osSvGV{`<n1mRV
zB)PbYGZKqZQ^28#EY-otsKsfhXQ*eOTa;{M#9o@0otIypCp1rzYd#~FZf<3KYHm_$
zN=jy4y1r*#W=UpZPG(hVk$w?4(ZrWRQjI>;Rp6wrB@0XGB2Gda%t9<eOdL!~9Lx+1
z3``6R3|jJBZ1KrCiN(c2qFlm4f;sugRu0JaXmP`m5R(D3mJ}CXJR~DQ@?o(M2N#<a
z*i5d8j9l8tI`O$MH#1KNk~OtNVeaE`;^JTwV$fpgG4I(=lDinS#4y~&!o_68K$@Ep
zEAYC>o=R?d%E)C(Y&fBo2B?LD6lv)JIU*TB97s{YB*CD?4od%^=;h*qlqeuUf(b(o
zBg}cYxU4vYm^he0X^iU}3F)D@G)V}QMWu*OL5US4D9+4-d6JQEEaFN`4@mG(ZfTAX
zs78<?FRF?6T5)L-30@-<XO|ec)QL=+LZJ2l@$Sqm%^^W?W**^aBH$NzsBkT0<l;g0
zln_#>t|bgB#F3J&7C&;)%_KxbDJh6rri1hlavxH`%E)z`kxLlajr!0Q6SU<dh2jAz
zV&h0l5Vdi{q`{~~$XU?BfKf{XqtOM@PN-PmD&-PH@kmi>Vu}#FF@@?8Dn@cC7Y`)J
z^udivSV?XOt6eml)HoQ0;H8t21Or2ZJp%)S0|SGD0|UbX2L^@*4h#$ij-a9u+;$OS
zG9VaQplTT!MM6*-)rV3jt|Bu`F{6=z=xF2$;NmJyEKAh~w+3LrA_fZ<UMFr2b|D5Q
z*4+G*)Es2Lv*WB(bGanICPG?o`j8eMxGhr*GhY#AzJ!w)2RpdY!RUmNhEc7;-L7Ed
zO68J4whr95L27owtVC%?z^r5--kJ(7ZX|1jplwqrq`;HH>1`>zE<{ZcTKw=9F)J6d
z5hEj4EtfdhW>9OfC_g7YCAA<mFC{fExe_VgAiIMn4y+y${;+b6T}u|;loRF>6ygUr
z<-iKTQI9h^3%I1gs^Cq3n#X7cmpqz{w2IUTj9h%ERtX`xI4E(8FASszIaf;pqb<b7
z#bU)I!H5~#%NU^v4N_d;C^pbsO>}mrS_#9*rN$)y4!R;pmoPptCr1d}O_hSCKZpmE
zm^j3wT)23^YQZVZ%0NgG%)?C3Rt8cShAOa{GC0V%SuiPuatW6dC1&P<I$ZH((4JSZ
jke!eXmlYQua;;)zAcU>DltL8*RXtV)O5R+YR5J_!eYx7X

literal 0
HcmV?d00001

-- 
GitLab


From 9472ba05620332fb274e643e08228b5c530e3e52 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 11:25:02 -0700
Subject: [PATCH 1187/1563] Automated g4 rollback of changelist 152936284

PiperOrigin-RevId: 155652925
---
 tensorflow/contrib/tensor_forest/python/ops/data_ops.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/contrib/tensor_forest/python/ops/data_ops.py b/tensorflow/contrib/tensor_forest/python/ops/data_ops.py
index 92f7faf7ac..2e54f620d5 100644
--- a/tensorflow/contrib/tensor_forest/python/ops/data_ops.py
+++ b/tensorflow/contrib/tensor_forest/python/ops/data_ops.py
@@ -145,8 +145,7 @@ def ParseDataTensorOrDict(data):
           col_spec.size = shape[1].value
 
         dense_features_size += col_spec.size
-        x = array_ops.reshape(data[k], [-1, 1])
-        dense_features.append(CastToFloat(x))
+        dense_features.append(CastToFloat(data[k]))
 
     processed_dense_features = None
     processed_sparse_features = None
-- 
GitLab


From b9cdcbe3a019f09eee7e7c9c9039e4533931e1e7 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Wed, 10 May 2017 11:39:52 -0700
Subject: [PATCH 1188/1563] Create a TF_Graph alongside the Python graph.

This is a first step towards porting the Python API to use the C API. As the Python Graph and Operations are constructed, an analogous TF_Graph and TF_Operations are created via SWIG. Currently nothing is done with the TF_Graph; a next step will be switching to the new TF_Session API which runs a TF_Graph directly (instead of a GraphDef).

This new functionality is disabled by default and can be manually enabled by setting the _USE_C_API global in ops.py. For this patch I only enabled it for a single test file. I tried enabling it for all TF Python tests and manually disabling it for unsupported tests, but there were too many failing tests (although most tests passed). See ops.py for a TODO list of unsupported functionality.

I benchmarked building an Inception model, and building the TF_Graph incurs a 20% overhead to the total graph construction time. Note that this patch does not remove any existing Python functionality; another next step will be recovering this time by removing redundant Python code. There is no measurable overhead with the new functionality disabled.

PiperOrigin-RevId: 155655064
---
 tensorflow/python/client/tf_session.i  |  69 ++++++++-----
 tensorflow/python/framework/ops.py     | 135 +++++++++++++++++++++++++
 tensorflow/python/ops/math_ops_test.py |   2 +
 3 files changed, 182 insertions(+), 24 deletions(-)

diff --git a/tensorflow/python/client/tf_session.i b/tensorflow/python/client/tf_session.i
index 7c6f1cdd5e..902f02a256 100644
--- a/tensorflow/python/client/tf_session.i
+++ b/tensorflow/python/client/tf_session.i
@@ -156,35 +156,56 @@ tensorflow::ImportNumpy();
       reinterpret_cast<const char*>($1.data), $1.length);
 }
 
-// Include the functions from c_api.h, except TF_Run.
-%ignoreall
-%unignore TF_Code;
-%unignore TF_Status;
-%unignore TF_Buffer;
-%unignore TF_NewBuffer;
-%unignore TF_NewBufferFromString;
-%unignore TF_DeleteBuffer;
-%unignore TF_GetBuffer;
-%unignore TF_NewStatus;
-%unignore TF_DeleteStatus;
-%unignore TF_GetCode;
-%unignore TF_Message;
-%unignore TF_SessionOptions;
+%inline %{
+// Helper function to convert a Python list of Tensors to a C++ vector of
+// TF_Outputs.
+//
+// Caller should have already checked that `py_tensor_list` is a list (this
+// isn't done in this function to allow for function-specific error messages)
+void PyTensorListToVector(PyObject* py_tensor_list,
+                          std::vector<TF_Output>* vec) {
+  size_t size = PyList_Size(py_tensor_list);
+  for (int i = 0; i < size; ++i) {
+    PyObject* item = PyList_GetItem(py_tensor_list, i);
+    TF_Output* input_ptr;
+    SWIG_ConvertPtr(item, reinterpret_cast<void**>(&input_ptr),
+                    SWIGTYPE_p_TF_Output, 0);
+    vec->push_back(*input_ptr);
+  }
+}
+%}
+
+// Converts input Python list of wrapped TF_Outputs into a single array
+%typemap(in) (const TF_Output* inputs, int num_inputs)
+    (std::vector<TF_Output> inputs) {
+  if (!PyList_Check($input)) {
+    SWIG_exception_fail(
+        SWIG_TypeError, "$symname: expected Python list of wrapped TF_Outputs");
+  }
+  PyTensorListToVector($input, &inputs);
+  $1 = inputs.data();
+  $2 = inputs.size();
+}
+
+// TODO(skyewm): SWIG emits a warning for the const char* in TF_WhileParams,
+// skip for now
+%ignore TF_WhileParams;
+%ignore TF_NewWhile;
+%ignore TF_FinishWhile;
+%ignore TF_AbortWhile;
+
+// These are defined below, avoid duplicate definitions
+%ignore TF_Run;
+%ignore TF_PRun;
+%ignore TF_PRunSetup;
+
 %rename("_TF_SetTarget") TF_SetTarget;
 %rename("_TF_SetConfig") TF_SetConfig;
 %rename("_TF_NewSessionOptions") TF_NewSessionOptions;
-%unignore TF_DeleteSessionOptions;
-%unignore TF_NewDeprecatedSession;
-%unignore TF_CloseDeprecatedSession;
-%unignore TF_DeleteDeprecatedSession;
-%unignore TF_ExtendGraph;
-%unignore TF_NewLibrary;
-%unignore TF_LoadLibrary;
-%unignore TF_DeleteLibraryHandle;
-%unignore TF_GetOpList;
+
 %include "tensorflow/c/c_api.h"
-%ignoreall
 
+%ignoreall
 %insert("python") %{
   def TF_NewSessionOptions(target=None, config=None):
     # NOTE: target and config are validated in the session constructor.
diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 0b04904ec2..2581ac6a3c 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -34,8 +34,10 @@ from tensorflow.core.framework import node_def_pb2
 from tensorflow.core.framework import tensor_shape_pb2
 from tensorflow.core.framework import types_pb2
 from tensorflow.core.framework import versions_pb2
+from tensorflow.python import pywrap_tensorflow as c_api
 from tensorflow.python.framework import device as pydev
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
 from tensorflow.python.framework import op_def_registry
 from tensorflow.python.framework import registry
 from tensorflow.python.framework import tensor_shape
@@ -46,6 +48,24 @@ from tensorflow.python.util import decorator_utils
 from tensorflow.python.util import tf_contextlib
 
 
+# Temporary global switch determining if we should enable the work-in-progress
+# calls to the C API. Currently disabled by default but can be manually enabled
+# e.g. in tests. This will be removed once all functionality is supported and
+# there's no performance penalty with it enabled.
+#
+# TODO(skyewm) before we can remove this:
+# - functions
+# - import_graph_def() incrementally adds inputs to ops (i.e. creates an
+#   Operation and then calls _add_input()). The current code requires that all
+#   inputs be specified when creating the Operation (since we call
+#   TF_FinishOperation()).
+# - ops_test.py (and others?) create unregistered op types
+# - while loop
+# - performance (e.g. delete/refactor redundant Python functionality, switch to
+#   new session API)
+_USE_C_API = False
+
+
 def _override_helper(clazz_object, operator, func):
   """Overrides (string) operator on Tensors to call func.
 
@@ -467,6 +487,13 @@ class Tensor(_TensorLike):
     else:
       return "%s:%d" % (self._op.name, self._value_index)
 
+  def _as_tf_output(self):
+    assert self.op._c_op  # pylint: disable=protected-access
+    tf_output = c_api.TF_Output()
+    tf_output.oper = self.op._c_op  # pylint: disable=protected-access
+    tf_output.index = self.value_index
+    return tf_output
+
   def __str__(self):
     return "Tensor(\"%s\"%s%s%s)" % (
         self.name,
@@ -1252,6 +1279,98 @@ class Operation(object):
     self._id_value = self._graph._next_id()  # pylint: disable=protected-access
     self._recompute_node_def()
 
+    if _USE_C_API:
+      assert self._graph._c_graph, (  # pylint: disable=protected-access
+          "_USE_C_API set to False when creating Graph, you may need to "
+          "manually set 'ops._USE_C_API = True' before creating the Graph")
+      if self._op_def:
+        # TODO(skyewm): op_def_library.apply_op() flattens the incoming
+        # inputs. Refactor so we don't have to do this here.
+        grouped_inputs = self._reconstruct_sequence_inputs(
+            self._op_def, self._inputs, self._node_def.attr)
+      else:
+        # If no OpDef is specified, assume all inputs are scalar.
+        grouped_inputs = self._inputs
+
+      self._c_op = self._create_c_op(self._graph, self._node_def,
+                                     grouped_inputs)
+    else:
+      self._c_op = None
+
+  def _create_c_op(self, graph, node_def, inputs):
+    """Creates a TF_Operation.
+
+    Arguments:
+      graph: a `Graph`.
+      node_def: `node_def_pb2.NodeDef` for the operation to create.
+      inputs: A list of `Tensor`s (corresponding to scalar inputs) and lists of
+        `Tensor`s (corresponding to sequence inputs, e.g. "int64 * N",
+        "list(int64)"). The length of the list should be equal to the number of
+        inputs specified by this operation's op def.
+
+    Returns:
+      A wrapped TF_Operation*.
+    """
+    # pylint: disable=protected-access
+    op_desc = c_api.TF_NewOperation(graph._c_graph.g,
+                                    compat.as_str(node_def.op),
+                                    compat.as_str(node_def.name))
+
+    for op_input in inputs:
+      if isinstance(op_input, (list, tuple)):
+        c_api.TF_AddInputList(op_desc, [t._as_tf_output() for t in op_input])
+      else:
+        c_api.TF_AddInput(op_desc, op_input._as_tf_output())
+    # pylint: enable=protected-access
+
+    for name, attr_value in node_def.attr.items():
+      serialized = attr_value.SerializeToString()
+      # TODO(skyewm): this creates and deletes a new TF_Status for every attr.
+      # It might be worth creating a convenient way to re-use the same status.
+      with errors.raise_exception_on_not_ok_status() as status:
+        c_api.TF_SetAttrValueProto(op_desc, compat.as_str(name), serialized,
+                                   status)
+
+    with errors.raise_exception_on_not_ok_status() as status:
+      c_op = c_api.TF_FinishOperation(op_desc, status)
+
+    return c_op
+
+  def _reconstruct_sequence_inputs(self, op_def, inputs, attrs):
+    """Regroups a flat list of input tensors into scalar and sequence inputs.
+
+    Arguments:
+      op_def: The `op_def_pb2.OpDef` (for knowing the input types)
+      inputs: a list of input `Tensor`s to the op.
+      attrs: mapping from attr name to `attr_value_pb2.AttrValue` (these define
+        how long each sequence is)
+
+    Returns:
+      A list of `Tensor`s (corresponding to scalar inputs) and lists of
+      `Tensor`s (corresponding to sequence inputs).
+    """
+    grouped_inputs = []
+    i = 0
+    for input_arg in op_def.input_arg:
+      if input_arg.number_attr:
+        input_len = attrs[input_arg.number_attr].i
+        is_sequence = True
+      elif input_arg.type_list_attr:
+        input_len = len(attrs[input_arg.type_list_attr].list.type)
+        is_sequence = True
+      else:
+        input_len = 1
+        is_sequence = False
+
+      if is_sequence:
+        grouped_inputs.append(inputs[i:i + input_len])
+      else:
+        grouped_inputs.append(inputs[i])
+      i += input_len
+
+    assert i == len(inputs)
+    return grouped_inputs
+
   def colocation_groups(self):
     """Returns the list of colocation groups of the op."""
     default_colocation_group = [compat.as_bytes("loc:@%s" %
@@ -1911,6 +2030,15 @@ def _name_from_scope_name(name):
   return name[:-1] if name[-1] == "/" else name
 
 
+class _ScopedTF_Graph(object):
+
+  def __init__(self):
+    self.g = c_api.TF_NewGraph()
+
+  def __del__(self):
+    c_api.TF_DeleteGraph(self.g)
+
+
 class Graph(object):
   """A TensorFlow computation, represented as a dataflow graph.
 
@@ -2024,6 +2152,13 @@ class Graph(object):
     self._container = ""
     self._registered_ops = op_def_registry.get_registered_ops()
 
+    # TODO(skyewm): fold as much of the above as possible into the C
+    # implementation
+    if _USE_C_API:
+      self._c_graph = _ScopedTF_Graph()
+    else:
+      self._c_graph = None
+
   def _check_not_finalized(self):
     """Check if the graph is finalized.
 
diff --git a/tensorflow/python/ops/math_ops_test.py b/tensorflow/python/ops/math_ops_test.py
index 7dbc8efe16..ed30c4bcfa 100644
--- a/tensorflow/python/ops/math_ops_test.py
+++ b/tensorflow/python/ops/math_ops_test.py
@@ -28,6 +28,8 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
 
+ops._USE_C_API = True
+
 exp = np.exp
 log = np.log
 
-- 
GitLab


From 32482dea01e2fc672eee9df5305bccc0b432eb7b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 11:43:40 -0700
Subject: [PATCH 1189/1563] Change soc op type id by input data types and add
 new hvx ops

PiperOrigin-RevId: 155655617
---
 .../hvx_ops_support_checker_main.cc           |   3 +-
 tensorflow/contrib/makefile/Makefile          |   4 +
 .../contrib/makefile/build_all_android.sh     |  12 +-
 .../build_and_run_inception_hexagon.sh        |  14 +-
 .../core/kernels/hexagon/graph_transferer.cc  |  15 +-
 .../kernels/hexagon/graph_transferer_test.cc  |  18 +-
 .../hexagon/hexagon_control_wrapper.cc        |   4 +-
 .../hexagon/hexagon_ops_definitions.cc        | 269 +++++++++++++++---
 .../kernels/hexagon/hexagon_ops_definitions.h |  20 +-
 .../i_graph_transfer_ops_definitions.h        |   3 +-
 10 files changed, 299 insertions(+), 63 deletions(-)

diff --git a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
index 03b4dcbfa8..3a219bb3e6 100644
--- a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
+++ b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
@@ -54,7 +54,8 @@ static void CheckOpsSupport(const GraphDef& graph_def) {
   std::unordered_set<string> unsupported_ops;
   bool all_supported = true;
   for (const NodeDef& node : graph_def.node()) {
-    const int op_id = ops_definition.GetOpIdFor(node.op());
+    // TODO(satok): Set correct data type if it's given.
+    const int op_id = ops_definition.GetOpIdFor(node.op(), {});
     if (op_id == IGraphTransferOpsDefinitions::INVALID_OP_ID) {
       all_supported = false;
       LOG(ERROR) << "OP type: " << node.op() << " is not supported on hvx. "
diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile
index 2b2e885689..31ad264f08 100644
--- a/tensorflow/contrib/makefile/Makefile
+++ b/tensorflow/contrib/makefile/Makefile
@@ -281,6 +281,10 @@ ifeq ($(TARGET),ANDROID)
 		CXXFLAGS += -DUSE_HEXAGON_LIBS
 	endif
 
+	ifdef ENABLE_EXPERIMENTAL_HEXNN_OPS
+		CXXFLAGS += -DENABLE_EXPERIMENTAL_HEXNN_OPS
+	endif
+
 endif  # ANDROID
 # LINT.ThenChange(//tensorflow/contrib/android/cmake/CMakeLists.txt)
 
diff --git a/tensorflow/contrib/makefile/build_all_android.sh b/tensorflow/contrib/makefile/build_all_android.sh
index 2f3649dac3..161f2df5b2 100755
--- a/tensorflow/contrib/makefile/build_all_android.sh
+++ b/tensorflow/contrib/makefile/build_all_android.sh
@@ -19,6 +19,7 @@ set -e
 
 usage() {
   echo "Usage: NDK_ROOT=<path to ndk root> $(basename "$0") [-s:t:Tx:X]"
+  echo "-E enable experimental hexnn ops"
   echo "-s [sub_makefiles] sub makefiles separated by white space"
   echo "-t [build_target] build target for Android makefile [default=all]"
   echo "-T only build tensorflow"
@@ -31,8 +32,9 @@ if [[ -z "${NDK_ROOT}" ]]; then
     exit 1
 fi
 
-while getopts "s:t:Tx:" opt_name; do
+while getopts "Es:t:Tx:" opt_name; do
   case "$opt_name" in
+    E) ENABLE_EXPERIMENTAL_HEXNN_OPS="true";;
     s) SUB_MAKEFILES="${OPTARG}";;
     t) BUILD_TARGET="${OPTARG}";;
     T) ONLY_MAKE_TENSORFLOW="true";;
@@ -83,16 +85,20 @@ if [[ "${USE_HEXAGON}" == "true" ]]; then
     HEXAGON_INCLUDE=$(cd "tensorflow/core/platform/hexagon" >/dev/null && pwd)
 fi
 
+if [[ "${ENABLE_EXPERIMENTAL_HEXNN_OPS}" == "true" ]]; then
+    EXTRA_MAKE_ARGS+=("ENABLE_EXPERIMENTAL_HEXNN_OPS=true")
+fi
+
 if [[ -z "${BUILD_TARGET}" ]]; then
     make -j"${JOB_COUNT}" -f tensorflow/contrib/makefile/Makefile \
          TARGET=ANDROID NDK_ROOT="${NDK_ROOT}" CC_PREFIX="${CC_PREFIX}" \
 HEXAGON_LIBS="${HEXAGON_LIBS}" HEXAGON_INCLUDE="${HEXAGON_INCLUDE}" \
-SUB_MAKEFILES="${SUB_MAKEFILES}"
+SUB_MAKEFILES="${SUB_MAKEFILES}" ${EXTRA_MAKE_ARGS[@]}
 else
     # BUILD_TARGET explicitly uncommented to allow multiple targets to be
     # passed to make in a single build_all_android.sh invocation.
     make -j"${JOB_COUNT}" -f tensorflow/contrib/makefile/Makefile \
          TARGET=ANDROID NDK_ROOT="${NDK_ROOT}" CC_PREFIX="${CC_PREFIX}" \
 HEXAGON_LIBS="${HEXAGON_LIBS}" HEXAGON_INCLUDE="${HEXAGON_INCLUDE}" \
-SUB_MAKEFILES="${SUB_MAKEFILES}" ${BUILD_TARGET}
+SUB_MAKEFILES="${SUB_MAKEFILES}" ${EXTRA_MAKE_ARGS[@]} ${BUILD_TARGET}
 fi
diff --git a/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh b/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh
index 8ec2c8d034..861bb885c7 100755
--- a/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh
+++ b/tensorflow/contrib/makefile/samples/build_and_run_inception_hexagon.sh
@@ -22,6 +22,7 @@ usage() {
   echo "Optional: NNLIB_DIR=<path to downloaded nnlib dir>"
   echo "-b build only"
   echo "-c test count"
+  echo "-E enable experimental hexnn ops"
   echo "-p use prebuilt hexagon binaries"
   echo "-s skip download if files already exist"
   exit 1
@@ -30,10 +31,11 @@ usage() {
 TEST_COUNT=1
 SKIP_DOWNLOAD_IF_EXIST=false
 
-while getopts "bc:ps" opt_name; do
+while getopts "bc:Eps" opt_name; do
   case "$opt_name" in
-    c) TEST_COUNT="${OPTARG}";;
     b) BUILD_ONLY="true";;
+    c) TEST_COUNT="${OPTARG}";;
+    E) ENABLE_EXPERIMENTAL_HEXNN_OPS="true";;
     p) USE_PREBUILT_HEXAOGON_BINARIES="true";;
     s) SKIP_DOWNLOAD_IF_EXIST="true";;
     *) usage;;
@@ -158,7 +160,11 @@ fi
 if [[ -d "${TF_ROOT_DIR}/tensorflow/contrib/makefile/gen/protobuf" &&
       -d "${TF_ROOT_DIR}/tensorflow/contrib/makefile/gen/protobuf-host" ]]; then
     echo "generated protobuf and protobuf-host found."
-    extra_args+=("-T")
+    EXTRA_ARGS+=("-T")
+fi
+
+if [[ "${ENABLE_EXPERIMENTAL_HEXNN_OPS}" == "true" ]]; then
+    EXTRA_ARGS+=("-E")
 fi
 
 if [[ -z "${CC_PREFIX}" ]]; then
@@ -168,7 +174,7 @@ fi
 CC_PREFIX=${CC_PREFIX} NDK_ROOT=${NDK_ROOT} "${BUILD_ALL_ANDROID_PATH}" \
 -x "${GEN_LIBS_DIR}" \
 -s "${TF_ROOT_DIR}/tensorflow/contrib/makefile/sub_makefiles/hexagon_graph_execution/Makefile.in" \
--t "hexagon_graph_execution" ${extra_args[@]}
+-t "hexagon_graph_execution" ${EXTRA_ARGS[@]}
 
 echo "Download and push inception image"
 HEXAGON_DOWNLOAD_PATH=\
diff --git a/tensorflow/core/kernels/hexagon/graph_transferer.cc b/tensorflow/core/kernels/hexagon/graph_transferer.cc
index e3fc228cc7..6f1616eff3 100644
--- a/tensorflow/core/kernels/hexagon/graph_transferer.cc
+++ b/tensorflow/core/kernels/hexagon/graph_transferer.cc
@@ -309,8 +309,9 @@ Status GraphTransferer::RegisterNode(
     RegisterNodeWithPaddingAndStrides(ops_definitions, shape_refiner, node);
   } else if (IsNodeFlattenReshape(node, shape_refiner)) {
     RegisterFlattenNode(ops_definitions, shape_refiner, node);
-  } else if (ops_definitions.GetOpIdFor(node.type_string()) !=
+  } else if (ops_definitions.GetOpIdFor(node.type_string(), {}) !=
              IGraphTransferOpsDefinitions::INVALID_OP_ID) {
+    // TODO(satok): Set correct data type if it's given.
     RegisterGenericNode(ops_definitions, shape_refiner, node);
   } else {
     return errors::InvalidArgument(node.type_string() +
@@ -458,7 +459,8 @@ void GraphTransferer::RegisterNodeWithPaddingAndStrides(
     const int ksize_id = RegisterConstantShape(kernel_sizes);
     extra_inputs.insert(extra_inputs.begin(), ksize_id);
   }
-  const int op_type_id = ops_definitions.GetOpIdFor(node.type_string());
+  // TODO(satok): Set correct data type if it's given.
+  const int op_type_id = ops_definitions.GetOpIdFor(node.type_string(), {});
   CHECK(op_type_id >= 0 && op_type_id < ops_definitions.GetTotalOpsCount())
       << "Op " << node.type_string() << " not found in map(id = " << op_type_id
       << ")";
@@ -477,7 +479,8 @@ void GraphTransferer::RegisterInputNode(
   CHECK_EQ(node_name_to_id_cache_map_.count(node.name()), 1);
   const int id = node_name_to_id_cache_map_[node.name()];
   const string op_type = node.type_string();
-  const int op_type_id = ops_definitions.GetOpIdFor(op_type);
+  // TODO(satok): Set correct data type if it's given.
+  const int op_type_id = ops_definitions.GetOpIdFor(op_type, {});
   CHECK(op_type_id >= 0 && op_type_id < ops_definitions.GetTotalOpsCount())
       << "Op" << node.name() << ", " << op_type << " is not supported,"
       << op_type_id;
@@ -494,7 +497,8 @@ void GraphTransferer::RegisterFlattenNode(
   CHECK_EQ(node_name_to_id_cache_map_.count(node.name()), 1);
   const int id = node_name_to_id_cache_map_[node.name()];
   const string op_type = IGraphTransferOpsDefinitions::FLATTEN_OP_NAME;
-  const int op_type_id = ops_definitions.GetOpIdFor(op_type);
+  // TODO(satok): Set correct data type if it's given.
+  const int op_type_id = ops_definitions.GetOpIdFor(op_type, {});
   CHECK(op_type_id >= 0 && op_type_id < ops_definitions.GetTotalOpsCount());
 
   AppendNodeParamsWithIoParams(
@@ -509,7 +513,8 @@ void GraphTransferer::RegisterGenericNode(
   VLOG(1) << "Register generic node: " << node.name();
   CHECK_EQ(node_name_to_id_cache_map_.count(node.name()), 1);
   const int id = node_name_to_id_cache_map_[node.name()];
-  const int op_type_id = ops_definitions.GetOpIdFor(node.type_string());
+  // TODO(satok): Set correct data type if it's given.
+  const int op_type_id = ops_definitions.GetOpIdFor(node.type_string(), {});
   CHECK(op_type_id >= 0 && op_type_id < ops_definitions.GetTotalOpsCount());
 
   AppendNodeParamsWithIoParams(
diff --git a/tensorflow/core/kernels/hexagon/graph_transferer_test.cc b/tensorflow/core/kernels/hexagon/graph_transferer_test.cc
index 142c9e1283..ebd4a90330 100644
--- a/tensorflow/core/kernels/hexagon/graph_transferer_test.cc
+++ b/tensorflow/core/kernels/hexagon/graph_transferer_test.cc
@@ -54,16 +54,18 @@ const RemoteFusedGraphExecuteUtils::TensorShapeMap EMPTY_OUTPUT_TENSOR_MAP;
 class TestGraphTransferOpsDefinitions : public IGraphTransferOpsDefinitions {
  public:
   int GetTotalOpsCount() const final { return OP_TYPES.size(); }
-  int GetOpIdFor(const string& op_type) const final {
-    for (int i = 0; i < OP_TYPES.size(); ++i) {
-      if (OP_TYPES[i] == op_type) {
-        return i;
-      }
+
+int GetOpIdFor(const string& op_type, const DataTypeVector&) const final {
+  for (int i = 0; i < OP_TYPES.size(); ++i) {
+    if (OP_TYPES[i] == op_type) {
+      return i;
     }
-    return -1;
   }
-  GraphTransferInfo::Destination GetTransferDestination() const final {
-    return GraphTransferInfo::NOP;
+  return -1;
+}
+
+GraphTransferInfo::Destination GetTransferDestination() const final {
+  return GraphTransferInfo::NOP;
   }
 
  private:
diff --git a/tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc b/tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc
index 4e6944e63e..518b399c37 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_control_wrapper.cc
@@ -88,7 +88,7 @@ bool HexagonControlWrapper::SetupGraph() {
     CHECK_NE(node_info, nullptr);
     node_info->set_type_name(INPUT_OP_NAME);
     node_info->set_soc_op_id(
-        HexagonOpsDefinitions::getInstance().GetOpIdFor(INPUT_OP_NAME));
+        HexagonOpsDefinitions::getInstance().GetOpIdFor(INPUT_OP_NAME, {}));
   }
 
   // Generate a new output node which is connected to graph output node
@@ -106,7 +106,7 @@ bool HexagonControlWrapper::SetupGraph() {
     new_output_node_info.set_node_id(new_output_node_id);
     new_output_node_info.set_type_name(OUTPUT_OP_NAME);
     new_output_node_info.set_soc_op_id(
-        HexagonOpsDefinitions::getInstance().GetOpIdFor(OUTPUT_OP_NAME));
+        HexagonOpsDefinitions::getInstance().GetOpIdFor(OUTPUT_OP_NAME, {}));
     new_output_node_info.set_padding_id(0 /* PADDING_NA_ID */);
     new_output_node_info.set_input_count(1);
     new_output_node_info.set_output_count(0);
diff --git a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
index 099ebe8fb6..67f26b6db9 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.cc
@@ -15,14 +15,18 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h"
 
-#include <unordered_map>
-
 #include "tensorflow/core/framework/types.h"
 
+// CAVEAT: Comment-out the following macro if you want to use experimental
+// hexagon ops.
+//#define ENABLE_EXPERIMENTAL_HEXNN_OPS
+
 namespace tensorflow {
 
 // HVX internal supported ops names
-enum class SupportedOpType {
+// TODO(satok): Remove this map once hexnn lib supports an API to retrieve op id
+// from op name and data type
+enum class HexagonOpsDefinitions::SupportedOpType {
   INPUT,
   OUTPUT,
   NOP,
@@ -38,6 +42,136 @@ enum class SupportedOpType {
   PPRINT_FLOAT,
   PREFREE,
   FLATTEN,
+
+#ifdef ENABLE_EXPERIMENTAL_HEXNN_OPS
+  // With Reference
+  QUANTIZEDCONV2D_8X8TO32,
+  QUANTIZEDCONV2D_8X8TO32_REF,
+  QUANTIZEDMATMUL_8X8TO32,
+  QUANTIZEDMATMUL_8X8TO32_REF,
+  QUANTIZEDOWNANDSHRINKRANGE_32TO8,
+  QUANTIZEDOWNANDSHRINKRANGE_32TO8_REF,
+  QUANTIZEDRELU_8,
+  QUANTIZEDRELU_8_REF,
+  QUANTIZEDRELUX_8,
+  QUANTIZEDRELUX_8_REF,
+  QUANTIZEDMAXPOOL_8,
+  QUANTIZEDMAXPOOL_8_REF,
+  QUANTIZEDAVGPOOL_8,
+  QUANTIZEDAVGPOOL_8_REF,
+  QUANTIZEDCONCAT_8,
+  QUANTIZEDCONCAT_8_REF,
+  QUANTIZEDBIASADD_8P8TO32,
+  QUANTIZEDBIASADD_8P8TO32_REF,
+  MIN_F,
+  MIN_F_REF,
+  MAX_F,
+  MAX_F_REF,
+  QUANTIZE,
+  QUANTIZE_REF,
+  DEQUANTIZE,
+  DEQUANTIZE_REF,
+  SUPERNODE_8X8P8TO8,
+  SUPERNODE_8X8P8TO8_REF,
+
+  QUANTIZEDFLATTEN,
+  SOFTMAX_F,
+  CONV2D_F,
+  MATMUL_F,
+  RELU_F,
+  RELUX_F,
+  AVGPOOL_F,
+  MAXPOOL_F,
+  CONCAT_F,
+  BIASADD_F,
+  LRN_F,
+
+  VARIABLE,
+  ASSIGN,
+  RESHAPE,
+  QUANTIZED_RESHAPE,
+  TANH_F,
+  SIGMOID_F,
+  SLICE_8,
+  SLICE_F,
+  QUANTIZED_SLICE_8,
+  ADD_F,
+  MUL_F,
+  MINIMUM_F,
+  MAXIMAM_F,
+
+  REQUANTIZE_32_TO_8,
+  REQUANTIZE_32_TO_8_REF,
+  REQUANTIZATION_RANGE_32,
+  REQUANTIZATION_RANGE_32_REF,
+
+  NEG_F,
+  SUB_F,
+  ADD_N_F,
+  RANGE_INT32,
+  RANK_INT32,
+  TRANSPOSE_INT32,
+  TRANSPOSE_F,
+  INSTANCE_NORM_F,
+  QUANTIZED_INSTANCENORM_8,
+  QUANTIZED_INSTANCENORM_8_REF,
+  SUB_INT32,
+  ADD_INT32,
+  SPLIT_F,
+  DEQUANTIZE_QINT32_F,
+  PRELU_F,
+  QUANTIZED_PRELU_8,
+  SUM_F,
+  PROD_F,
+  MUL_INT32,
+  LOGICAL_AND_INT32,
+  LOGICALOR_INT32,
+  LOGICAL_XOR_INT32,
+  SPAPE_INT32,
+  PACK_INT32,
+  MIRROR_PAD_F,
+  RESIZE_NEAREST_NEIGHBOR_F,
+  STRIDED_SLICE_INT32,
+  STRIDED_SLICE_F,
+  EXPAND_DIMS_INT32,
+  EXPAND_DIMS_F,
+
+  LOG_SOFTMAX_F,
+  SPLIT_INT32,
+  QUANTIZED_SPLIT_8,
+
+  DECONV_F,
+  QUANTIZED_DECONV_8X8TO32,
+  QUANTIZED_DECONV_8X8TO32_REF,
+
+  QUANTIZED_MUL_8x8to32,
+  QUANTIZED_MUL_8x8to32_REF,
+  QUANTIZED_ADD_8p8to32,
+  QUANTIZED_ADD_8p8to32_REF,
+  QUANTIZED_SIGMOID_8,
+  QUANTIZED_SIGMOID_8_REF,
+  QUANTIZED_TANH_8,
+  QUANTIZED_TANH_8_REF,
+  QUANTIZED_SOFTMAX_8,
+  QUANTIZED_SOFTMAX_8_REF,
+  QUANTIZED_LRN_8,
+  QUANTIZED_LRN_8_REF,
+  QUANTIZED_PAD2D_FRAME_8P,
+  QUANTIZED_PAD2D_FRAME_8P_REF,
+  QUANTIZED_SUB_8P8TO32,
+  QUANTIZED_SUB_8P8TO32_REF,
+  QUANTIZED_MAXIMUM_8,
+  QUANTIZED_MAXIMUM_8_REF,
+  QUANTIZED_MINIMUM_8,
+  QUANTIZED_MINIMUM_8_REF,
+
+  PAD_F,
+  SPACE_TO_BATCH_ND_F,
+  BATCH_TO_SPACE_ND_F,
+  RESIZE_BILINEAR_F,
+  CONCAT_V2_F,
+
+#else
   // With Reference
   QUANTIZEDCONV2D_8X8TO32,
   QUANTIZEDCONV2D_8X8TO32_REF,
@@ -145,43 +279,92 @@ enum class SupportedOpType {
   DECONV_F,
   QUANTIZED_DECONV_8X8TO32,
   QUANTIZED_DECONV_8X8TO32_REF,
+#endif
 
   SUPPORTED_OP_TYPE_COUNT  // TERMINATOR. DO NOT REMOVE
 };
 
-const std::unordered_map<string, SupportedOpType> OP_NAME_TO_SOC_OP_TYPE_MAP{
-    // Custom Op name
-    {"INPUT", SupportedOpType::INPUT},
-    {"OUTPUT", SupportedOpType::OUTPUT},
-    {"NoOp", SupportedOpType::NOP},
-    {IGraphTransferOpsDefinitions::FLATTEN_OP_NAME, SupportedOpType::FLATTEN},
-    // Tensorflow op name
-    {"Const", SupportedOpType::OP_CONST},
-    {"QuantizedConv2D", SupportedOpType::QUANTIZEDCONV2D_8X8TO32},
-    {"QuantizedMatMul", SupportedOpType::QUANTIZEDMATMUL_8X8TO32},
-    {"QuantizeDownAndShrinkRange",
-     SupportedOpType::QUANTIZEDOWNANDSHRINKRANGE_32TO8},
-    {"QuantizedRelu", SupportedOpType::QUANTIZEDRELU_8},
-    {"QuantizedReluX", SupportedOpType::QUANTIZEDRELUX_8},
-    {"QuantizedMaxPool", SupportedOpType::QUANTIZEDMAXPOOL_8},
-    {"QuantizedAvgPool", SupportedOpType::QUANTIZEDAVGPOOL_8},
-    {"QuantizedConcat", SupportedOpType::QUANTIZEDCONCAT_8},
-    {"QuantizedBiasAdd", SupportedOpType::QUANTIZEDBIASADD_8P8TO32},
-    {"Min", SupportedOpType::MIN_F},
-    {"Max", SupportedOpType::MAX_F},
-    {"QuantizeV2", SupportedOpType::QUANTIZE},
-    {"Dequantize", SupportedOpType::DEQUANTIZE},
-    {"Softmax", SupportedOpType::SOFTMAX_F},
-    {"Placeholder", SupportedOpType::NOP},
-    {"RequantizationRange", SupportedOpType::REQUANTIZATION_RANGE_32},
-    {"Requantize", SupportedOpType::REQUANTIZE_32_TO_8},
-    {"QuantizedReshape", SupportedOpType::QUANTIZED_RESHAPE},
-    {"Add", SupportedOpType::ADD_F},
-    {"Sub", SupportedOpType::SUB_F},
-    {"Reshape", SupportedOpType::RESHAPE},
-    {"Identity", SupportedOpType::NOP},
+/* static */ void HexagonOpsDefinitions::EmplaceOpType(
+    const string& op_type, const DataTypeVector& dt_vec,
+    const SupportedOpType supported_op_type,
+    std::unordered_map<string, std::vector<DataTypeToOp>>* map) {
+  if (map->count(op_type) <= 0) {
+    map->emplace(op_type, std::vector<DataTypeToOp>());
+  }
+  map->at(op_type).emplace_back(
+      std::forward_as_tuple(dt_vec, supported_op_type));
+}
+
+/* static */ std::unordered_map<
+    string, std::vector<HexagonOpsDefinitions::DataTypeToOp>>
+HexagonOpsDefinitions::BuildOpNameToSocOpTypeMap() {
+  std::unordered_map<string, std::vector<DataTypeToOp>> op_map;
+  // Custom Op name
+  EmplaceOpType("INPUT", {}, SupportedOpType::INPUT, &op_map);
+  EmplaceOpType("OUTPUT", {}, SupportedOpType::OUTPUT, &op_map);
+  EmplaceOpType("NoOp", {}, SupportedOpType::NOP, &op_map);
+  EmplaceOpType(IGraphTransferOpsDefinitions::FLATTEN_OP_NAME, {},
+                SupportedOpType::FLATTEN, &op_map);
+  // Tensorflow op name
+  // CAVEAT: Keep order of SupportedOpType
+  EmplaceOpType("Identity", {}, SupportedOpType::NOP, &op_map);
+  EmplaceOpType("Placeholder", {}, SupportedOpType::NOP, &op_map);
+  EmplaceOpType("Const", {}, SupportedOpType::OP_CONST, &op_map);
+  EmplaceOpType("QuantizedConv2D", {}, SupportedOpType::QUANTIZEDCONV2D_8X8TO32,
+                &op_map);
+  EmplaceOpType("QuantizedMatMul", {}, SupportedOpType::QUANTIZEDMATMUL_8X8TO32,
+                &op_map);
+  EmplaceOpType("QuantizeDownAndShrinkRange", {},
+                SupportedOpType::QUANTIZEDOWNANDSHRINKRANGE_32TO8, &op_map);
+  EmplaceOpType("QuantizedRelu", {}, SupportedOpType::QUANTIZEDRELU_8, &op_map);
+  EmplaceOpType("QuantizedReluX", {}, SupportedOpType::QUANTIZEDRELUX_8,
+                &op_map);
+  EmplaceOpType("QuantizedMaxPool", {}, SupportedOpType::QUANTIZEDMAXPOOL_8,
+                &op_map);
+  EmplaceOpType("QuantizedAvgPool", {}, SupportedOpType::QUANTIZEDAVGPOOL_8,
+                &op_map);
+  EmplaceOpType("QuantizedConcat", {}, SupportedOpType::QUANTIZEDCONCAT_8,
+                &op_map);
+  EmplaceOpType("QuantizedBiasAdd", {},
+                SupportedOpType::QUANTIZEDBIASADD_8P8TO32, &op_map);
+  EmplaceOpType("Min", {}, SupportedOpType::MIN_F, &op_map);
+  EmplaceOpType("Max", {}, SupportedOpType::MAX_F, &op_map);
+  EmplaceOpType("QuantizeV2", {}, SupportedOpType::QUANTIZE, &op_map);
+  EmplaceOpType("Dequantize", {}, SupportedOpType::DEQUANTIZE, &op_map);
+  EmplaceOpType("Softmax", {}, SupportedOpType::SOFTMAX_F, &op_map);
+  EmplaceOpType("Reshape", {}, SupportedOpType::RESHAPE, &op_map);
+  EmplaceOpType("QuantizedReshape", {}, SupportedOpType::QUANTIZED_RESHAPE,
+                &op_map);
+  EmplaceOpType("Sigmoid", {}, SupportedOpType::SIGMOID_F, &op_map);
+  EmplaceOpType("Slice", {}, SupportedOpType::SLICE_F, &op_map);
+  EmplaceOpType("Add", {}, SupportedOpType::ADD_F, &op_map);
+  EmplaceOpType("Mul", {}, SupportedOpType::MUL_F, &op_map);
+  EmplaceOpType("Requantize", {}, SupportedOpType::REQUANTIZE_32_TO_8, &op_map);
+  EmplaceOpType("RequantizationRange", {},
+                SupportedOpType::REQUANTIZATION_RANGE_32, &op_map);
+  EmplaceOpType("Sub", {}, SupportedOpType::SUB_F, &op_map);
+  EmplaceOpType("Pack", {}, SupportedOpType::PACK_INT32, &op_map);
+  EmplaceOpType("StridedSlice", {}, SupportedOpType::STRIDED_SLICE_F, &op_map);
+  EmplaceOpType("ExpandDims", {}, SupportedOpType::EXPAND_DIMS_F, &op_map);
+#ifdef ENABLE_EXPERIMENTAL_HEXNN_OPS
+  EmplaceOpType("QuantizedMul", {}, SupportedOpType::QUANTIZED_MUL_8x8to32,
+                &op_map);
+  EmplaceOpType("Pad", {}, SupportedOpType::PAD_F, &op_map);
+  EmplaceOpType("SpaceToBatchND", {}, SupportedOpType::SPACE_TO_BATCH_ND_F,
+                &op_map),
+      EmplaceOpType("BatchToSpaceND", {}, SupportedOpType::BATCH_TO_SPACE_ND_F,
+                    &op_map);
+  EmplaceOpType("ResizeBilinear", {}, SupportedOpType::RESIZE_BILINEAR_F,
+                &op_map);
+  EmplaceOpType("ConcatV2", {}, SupportedOpType::CONCAT_V2_F, &op_map);
+  EmplaceOpType("Conv2DBackpropInput", {}, SupportedOpType::DECONV_F, &op_map);
+#endif
+  return op_map;
 };
 
+HexagonOpsDefinitions::HexagonOpsDefinitions()
+    : op_name_to_soc_op_type_map_(BuildOpNameToSocOpTypeMap()) {}
+
 /* static */ const IGraphTransferOpsDefinitions&
 HexagonOpsDefinitions::getInstance() {
   const static HexagonOpsDefinitions instance{};
@@ -192,9 +375,21 @@ int HexagonOpsDefinitions::GetTotalOpsCount() const {
   return static_cast<int>(SupportedOpType::SUPPORTED_OP_TYPE_COUNT);
 }
 
-int HexagonOpsDefinitions::GetOpIdFor(const string& op_type) const {
-  if (OP_NAME_TO_SOC_OP_TYPE_MAP.count(op_type) > 0) {
-    return static_cast<int>(OP_NAME_TO_SOC_OP_TYPE_MAP.at(op_type));
+int HexagonOpsDefinitions::GetOpIdFor(const string& op_type,
+                                      const DataTypeVector& dt_vec) const {
+  if (op_name_to_soc_op_type_map_.count(op_type) > 0) {
+    const std::vector<DataTypeToOp>& dt_to_op_vec =
+        op_name_to_soc_op_type_map_.at(op_type);
+    CHECK(!dt_to_op_vec.empty());
+    // If argument DataType is empty, return the first entry.
+    if (dt_vec.empty()) {
+      return static_cast<int>(std::get<1>(dt_to_op_vec.front()));
+    }
+    for (const DataTypeToOp& data_type_to_op : dt_to_op_vec) {
+      if (std::get<0>(data_type_to_op) == dt_vec) {
+        return static_cast<int>(std::get<1>(data_type_to_op));
+      }
+    }
   }
   return IGraphTransferOpsDefinitions::INVALID_OP_ID;
 }
diff --git a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h
index eca4e16f68..bd1120e1df 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h
+++ b/tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_HEXAGON_HEXAGON_OPS_DEFINITIONS_H_
 #define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_HEXAGON_HEXAGON_OPS_DEFINITIONS_H_
 
+#include <unordered_map>
+
 #include "i_graph_transfer_ops_definitions.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/platform/macros.h"
@@ -29,11 +31,25 @@ class HexagonOpsDefinitions final : public IGraphTransferOpsDefinitions {
   static const IGraphTransferOpsDefinitions& getInstance();
 
   int GetTotalOpsCount() const final;
-  int GetOpIdFor(const string& op_type) const final;
+  int GetOpIdFor(const string& op_type, const DataTypeVector& dt) const final;
   GraphTransferInfo::Destination GetTransferDestination() const final;
 
  private:
-  HexagonOpsDefinitions() = default;
+  enum class SupportedOpType;
+  using DataTypeToOp = std::tuple<DataTypeVector, SupportedOpType>;
+
+  HexagonOpsDefinitions();
+
+  static void EmplaceOpType(
+      const string& op_type, const DataTypeVector& dt_vec,
+      const SupportedOpType supported_op_type,
+      std::unordered_map<string, std::vector<DataTypeToOp>>* map);
+
+  static std::unordered_map<string, std::vector<DataTypeToOp>>
+  BuildOpNameToSocOpTypeMap();
+
+  const std::unordered_map<string, std::vector<DataTypeToOp>>
+      op_name_to_soc_op_type_map_;
 
   TF_DISALLOW_COPY_AND_ASSIGN(HexagonOpsDefinitions);
 };
diff --git a/tensorflow/core/kernels/hexagon/i_graph_transfer_ops_definitions.h b/tensorflow/core/kernels/hexagon/i_graph_transfer_ops_definitions.h
index 031b2e31cc..3d6f493a9c 100644
--- a/tensorflow/core/kernels/hexagon/i_graph_transfer_ops_definitions.h
+++ b/tensorflow/core/kernels/hexagon/i_graph_transfer_ops_definitions.h
@@ -37,7 +37,8 @@ class IGraphTransferOpsDefinitions {
   // Return total ops count supported by SOC
   virtual int GetTotalOpsCount() const = 0;
   // Return op id for given string op name
-  virtual int GetOpIdFor(const string& op_name) const = 0;
+  virtual int GetOpIdFor(const string& op_name,
+                         const DataTypeVector& dt) const = 0;
   // Return destination of transfer
   virtual GraphTransferInfo::Destination GetTransferDestination() const = 0;
 
-- 
GitLab


From 15f32d93a48fa78f7f2f17c0a46f5625637c82aa Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Wed, 10 May 2017 12:31:10 -0700
Subject: [PATCH 1190/1563] get_attr returns dtype objects instead of raw ints

Originally by @Mycosynth, but edited to make it work using
integer conversion.

Fixes #447.

If this breaks you, do an explicit cast of the return of get_attr to int, if you
are parsing a dtype object.

PiperOrigin-RevId: 155661630
---
 RELEASE.md                                    |  4 +++
 tensorflow/python/framework/dtypes.py         |  3 +++
 tensorflow/python/framework/dtypes_test.py    |  4 +--
 tensorflow/python/framework/ops.py            | 10 +++++--
 tensorflow/python/framework/ops_test.py       | 27 +++++++++++++++++++
 .../python/kernel_tests/py_func_test.py       |  4 +--
 .../util/example_parser_configuration.py      |  4 +--
 7 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index f078d336ab..d4e3bac01c 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -18,6 +18,10 @@
   If at all unsure, first test your code with TF 1.1; ensure it raises no
   errors, and then upgrade to TF 1.2.
 
+## Bug Fixes and Other Changes
+* In python, `Operation.get_attr` on type attributes returns the Python DType
+  version of the type to match expected get_attr documentation rather than the
+  protobuf enum.
 
 # Release 1.1.0
 
diff --git a/tensorflow/python/framework/dtypes.py b/tensorflow/python/framework/dtypes.py
index d373bac47a..3e6c04982b 100644
--- a/tensorflow/python/framework/dtypes.py
+++ b/tensorflow/python/framework/dtypes.py
@@ -270,6 +270,9 @@ class DType(object):
     """Returns the string name for this `DType`."""
     return _TYPE_TO_STRING[self._type_enum]
 
+  def __int__(self):
+    return self._type_enum
+
   def __str__(self):
     return "<dtype: %r>" % self.name
 
diff --git a/tensorflow/python/framework/dtypes_test.py b/tensorflow/python/framework/dtypes_test.py
index f04f67ffed..5bb60763b6 100644
--- a/tensorflow/python/framework/dtypes_test.py
+++ b/tensorflow/python/framework/dtypes_test.py
@@ -45,8 +45,8 @@ class TypesTest(test_util.TensorFlowTestCase):
     for datatype_enum in types_pb2.DataType.values():
       if datatype_enum == types_pb2.DT_INVALID:
         continue
-      self.assertEqual(datatype_enum,
-                       dtypes.as_dtype(datatype_enum).as_datatype_enum)
+      dt = dtypes.as_dtype(datatype_enum)
+      self.assertEqual(datatype_enum, dt.as_datatype_enum)
 
   def testAllTypesConvertibleToNumpyDtype(self):
     for datatype_enum in types_pb2.DataType.values():
diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 2581ac6a3c..7f3a7eb876 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -1666,12 +1666,18 @@ class Operation(object):
     if x.HasField("list"):
       for f in fields:
         if getattr(x.list, f):
-          return list(getattr(x.list, f))
+          if f == "type":
+            return [dtypes.as_dtype(x) for x in list(getattr(x.list, f))]
+          else:
+            return list(getattr(x.list, f))
       return []
     else:
       for f in fields:
         if x.HasField(f):
-          return getattr(x, f)
+          if f == "type":
+            return dtypes.as_dtype(getattr(x, f))
+          else:
+            return getattr(x, f)
       assert False, "Unsupported field type in " + str(x)
 
   def run(self, feed_dict=None, session=None):
diff --git a/tensorflow/python/framework/ops_test.py b/tensorflow/python/framework/ops_test.py
index 3e9f047a7d..eae36a8613 100644
--- a/tensorflow/python/framework/ops_test.py
+++ b/tensorflow/python/framework/ops_test.py
@@ -22,6 +22,7 @@ import gc
 import weakref
 
 from tensorflow.core.framework import attr_value_pb2
+from tensorflow.core.framework import types_pb2
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import common_shapes
@@ -356,6 +357,32 @@ class OperationTest(test_util.TensorFlowTestCase):
         ops._NodeDef("noop", "op1"), ops.Graph(), [], [dtypes.float32])
     self.assertEqual("<tf.Operation 'op1' type=noop>", repr(op))
 
+  def testGetAttr(self):
+    list_value = attr_value_pb2.AttrValue.ListValue()
+    list_value.type.append(types_pb2.DT_STRING)
+    list_value.type.append(types_pb2.DT_DOUBLE)
+    op = ops.Operation(
+        ops._NodeDef(
+            "noop",
+            "op1",
+            attrs={
+                "value": attr_value_pb2.AttrValue(i=32),
+                "dtype": attr_value_pb2.AttrValue(type=types_pb2.DT_INT32),
+                "list": attr_value_pb2.AttrValue(list=list_value)
+            }), ops.Graph(), [], [dtypes.int32])
+    self.assertEqual(32, op.get_attr("value"))
+
+    d = op.get_attr("dtype")
+    # First check that d is a DType, because the assertEquals will
+    # work no matter what since DType overrides __eq__
+    self.assertIsInstance(d, dtypes.DType)
+    self.assertEqual(dtypes.int32, d)
+
+    l = op.get_attr("list")
+    for x in l:
+      self.assertIsInstance(x, dtypes.DType)
+    self.assertEqual([dtypes.string, dtypes.double], l)
+
 
 class CreateOpTest(test_util.TensorFlowTestCase):
 
diff --git a/tensorflow/python/kernel_tests/py_func_test.py b/tensorflow/python/kernel_tests/py_func_test.py
index c7fc7dd582..e098cf3ff9 100644
--- a/tensorflow/python/kernel_tests/py_func_test.py
+++ b/tensorflow/python/kernel_tests/py_func_test.py
@@ -186,9 +186,9 @@ class PyOpTest(test.TestCase):
 
       def bad():
         # Non-string python objects aren't supported.
-        return dtypes.float32
+        return {"foo": dtypes.float32}
 
-      z, = script_ops.py_func(bad, [], [dtypes.float64])
+      z, = script_ops.py_func(bad, [], [dtypes.int64])
 
       with self.assertRaisesRegexp(errors.UnimplementedError,
                                    "Unsupported object type"):
diff --git a/tensorflow/python/util/example_parser_configuration.py b/tensorflow/python/util/example_parser_configuration.py
index 8843016a97..a375085176 100644
--- a/tensorflow/python/util/example_parser_configuration.py
+++ b/tensorflow/python/util/example_parser_configuration.py
@@ -101,7 +101,7 @@ def extract_example_parser_configuration(parse_example_op, sess):
     fixed_config.shape.CopyFrom(
         tensor_shape.TensorShape(dense_shapes[i]).as_proto())
 
-    fixed_config.dtype = dense_types[i]
+    fixed_config.dtype = int(dense_types[i])
     # Get the output tensor name.
     fixed_config.values_output_tensor_name = parse_example_op.outputs[
         dense_values_start + i].name
@@ -111,7 +111,7 @@ def extract_example_parser_configuration(parse_example_op, sess):
     key = fetched[sparse_keys_start + i]
     feature_config = config.feature_map[key]
     var_len_feature = feature_config.var_len_feature
-    var_len_feature.dtype = sparse_types[i]
+    var_len_feature.dtype = int(sparse_types[i])
     var_len_feature.indices_output_tensor_name = parse_example_op.outputs[
         sparse_indices_start + i].name
     var_len_feature.values_output_tensor_name = parse_example_op.outputs[
-- 
GitLab


From 1d70e82493f8aee908aea81bed41158d6b9761bf Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Wed, 10 May 2017 13:17:33 -0700
Subject: [PATCH 1191/1563] Java: Allow feeding and fetching colon-separated
 names.

In Python, the string "<operation>:<index>" is referred
to as the "tensor name" (see tf.get_tensor_by_name
at https://www.tensorflow.org/api_docs/python/tf/Graph#get_tensor_by_name)
and this string also appears in the saved model format as the key in
the 'inputs' field of the 'SignatureDef' protocol buffer message.

Accepting such names makes it easier to use saved models in Java
(yes, I know it still isn't easy enough!)
For example, using something like:

import org.tensorflow.SavedModelBundle;
import org.tensorflow.framework.MetaGraphDef;
import org.tensorflow.framework.SignatureDef;

// ...

try (SavedModelBundle model = SavedModelBundle.load(exportDir, "serve")) {
  final SignatureDef sig =
      MetaGraphDef.parseFrom(model.metaGraphDef())
                .getSignatureDefOrThrow(DEFAULT_SERVING_SIGNATURE_DEF_KEY);
  model.session().runner()
    .feed(sig.getInputsOrThrow("inputs").getName())
    .fetch(sig.getOutputsOrThrow("outputs").getName())
    .run()...
}

PiperOrigin-RevId: 155667400
---
 .../src/main/java/org/tensorflow/Session.java | 32 ++++++++++++++++---
 .../test/java/org/tensorflow/SessionTest.java | 30 +++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/tensorflow/java/src/main/java/org/tensorflow/Session.java b/tensorflow/java/src/main/java/org/tensorflow/Session.java
index 45332bc73f..0d071e1674 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/Session.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/Session.java
@@ -120,10 +120,15 @@ public final class Session implements AutoCloseable {
     /**
      * Avoid evaluating {@code operation} and substitute {@code t} for the value it produces.
      *
-     * <p>This method is a shorthand for {@code feed(operation, 0, t)}.
+     * @param operation Is either the string name of the operation, in which case this method is a
+     *     shorthand for {@code feed(operation, 0)}, or it is a string of the form
+     *     <tt>operation_name:output_index</tt> , in which case this method acts like {@code
+     *     feed(operation_name, output_index)}. These colon-separated names are commonly used in the
+     *     {@code SignatureDef} protocol buffer messages that are included in {@link
+     *     SavedModelBundle.metaGraphDef()}.
      */
     public Runner feed(String operation, Tensor t) {
-      return feed(operation, 0, t);
+      return feed(parseOutput(operation), t);
     }
 
     /**
@@ -155,10 +160,15 @@ public final class Session implements AutoCloseable {
     /**
      * Make {@link #run()} return the output of {@code operation}.
      *
-     * <p>This method is a shorthand for {@code fetch(operation, 0)}
+     * @param operation Is either the string name of the operation, in which case this method is a
+     *     shorthand for {@code fetch(operation, 0)}, or it is a string of the form
+     *     <tt>operation_name:output_index</tt> , in which case this method acts like {@code
+     *     fetch(operation_name, output_index)}. These colon-separated names are commonly used in
+     *     the {@code SignatureDef} protocol buffer messages that are included in {@link
+     *     SavedModelBundle.metaGraphDef()}.
      */
     public Runner fetch(String operation) {
-      return fetch(operation, 0);
+      return fetch(parseOutput(operation));
     }
 
     /**
@@ -345,6 +355,20 @@ public final class Session implements AutoCloseable {
       return op;
     }
 
+    private Output parseOutput(String opName) {
+      int colon = opName.lastIndexOf(':');
+      if (colon == -1 || colon == opName.length() - 1) {
+        return new Output(operationByName(opName), 0);
+      }
+      try {
+        String op = opName.substring(0, colon);
+        int index = Integer.parseInt(opName.substring(colon + 1));
+        return new Output(operationByName(op), index);
+      } catch (NumberFormatException e) {
+        return new Output(operationByName(opName), 0);
+      }
+    }
+
     private ArrayList<Output> inputs = new ArrayList<Output>();
     private ArrayList<Tensor> inputTensors = new ArrayList<Tensor>();
     private ArrayList<Output> outputs = new ArrayList<Output>();
diff --git a/tensorflow/java/src/test/java/org/tensorflow/SessionTest.java b/tensorflow/java/src/test/java/org/tensorflow/SessionTest.java
index 2ccbdf51bc..0d2dbc5b88 100644
--- a/tensorflow/java/src/test/java/org/tensorflow/SessionTest.java
+++ b/tensorflow/java/src/test/java/org/tensorflow/SessionTest.java
@@ -62,6 +62,36 @@ public class SessionTest {
     }
   }
 
+  @Test
+  public void runUsingColonSeparatedNames() {
+    try (Graph g = new Graph();
+        Session s = new Session(g)) {
+      Operation split =
+          g.opBuilder("Split", "Split")
+              .addInput(TestUtil.constant(g, "split_dim", 0))
+              .addInput(TestUtil.constant(g, "value", new int[] {1, 2, 3, 4}))
+              .setAttr("num_split", 2)
+              .build();
+      g.opBuilder("Add", "Add")
+          .addInput(split.output(0))
+          .addInput(split.output(1))
+          .build()
+          .output(0);
+      // Fetch using colon separated names.
+      try (Tensor fetched = s.runner().fetch("Split:1").run().get(0)) {
+        final int[] expected = {3, 4};
+        assertArrayEquals(expected, fetched.copyTo(new int[2]));
+      }
+      // Feed using colon separated names.
+      try (Tensor fed = Tensor.create(new int[] {4, 3, 2, 1});
+          Tensor fetched =
+              s.runner().feed("Split:0", fed).feed("Split:1", fed).fetch("Add").run().get(0)) {
+        final int[] expected = {8, 6, 4, 2};
+        assertArrayEquals(expected, fetched.copyTo(new int[4]));
+      }
+    }
+  }
+
   @Test
   public void runWithMetadata() {
     try (Graph g = new Graph();
-- 
GitLab


From bf3e5296f7e2e98a95f260ab797ce2302092fd35 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 13:18:00 -0700
Subject: [PATCH 1192/1563] Add utilities to fuse specified nodes as remote
 fused graph nodes

PiperOrigin-RevId: 155667448
---
 tensorflow/core/kernels/BUILD                 |   1 +
 .../remote_fused_graph_execute_utils.cc       | 602 ++++++++++++++++++
 .../remote_fused_graph_execute_utils.h        |  96 ++-
 .../remote_fused_graph_execute_utils_test.cc  | 452 ++++++++++++-
 4 files changed, 1144 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index b1b79021b7..042c839faa 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4821,6 +4821,7 @@ tf_cc_test(
         "//tensorflow/core:lib_internal",
         "//tensorflow/core:ops",
         "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:remote_fused_graph_ops_op_lib",
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
         "//tensorflow/core:testlib",
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
index b885c5ce09..456611894d 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
@@ -22,10 +22,83 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/shape_refiner.h"
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/graph/algorithm.h"
+#include "tensorflow/core/graph/node_builder.h"
 #include "tensorflow/core/public/session.h"
 #include "tensorflow/core/public/session_options.h"
 
 namespace tensorflow {
+namespace {
+const Node* FindNodeByName(const string& name, const Graph& graph) {
+  for (const Node* node : graph.nodes()) {
+    CHECK_NOTNULL(node);
+    if (node->name() == name) {
+      return node;
+    }
+  }
+  return nullptr;
+}
+
+std::unordered_set<string> BuildNodeSetFromNodeNamesAndPorts(
+    const std::vector<string>& node_names_and_ports) {
+  std::unordered_set<string> retval;
+  for (const string& node_name_and_port : node_names_and_ports) {
+    const TensorId tid = ParseTensorName(node_name_and_port);
+    retval.emplace(tid.first.ToString());
+  }
+  return retval;
+}
+
+Node* FindMutableNodeByName(const string& name, Graph* graph) {
+  for (Node* node : graph->nodes()) {
+    if (node != nullptr && node->name() == name) {
+      return node;
+    }
+  }
+  return nullptr;
+}
+
+const NodeDef* FindNodeDefByName(const string& input,
+                                 const GraphDef& graph_def) {
+  const TensorId tid = ParseTensorName(input);
+  const string name = tid.first.ToString();
+  for (const NodeDef& node_def : graph_def.node()) {
+    if (node_def.name() == name) {
+      return &node_def;
+    }
+  }
+  return nullptr;
+}
+
+string DumpGraphDef(const GraphDef& graph_def) {
+  string out;
+  for (const NodeDef& node : graph_def.node()) {
+    out += strings::StrCat("node: ", node.name(), "\n    input: ");
+    for (const string& input : node.input()) {
+      out += strings::StrCat(input, ", ");
+    }
+    out += "\n";
+  }
+  return out;
+}
+
+string DumpCluster(const RemoteFusedGraphExecuteUtils::ClusterInfo& cluster) {
+  string out;
+  out += "Nodes:\n";
+  for (const string& str : std::get<0>(cluster)) {
+    out += str + ", ";
+  }
+  out += "\nInput border:\n";
+  for (const string& str : std::get<1>(cluster)) {
+    out += str + ", ";
+  }
+  out += "\nOutput border:\n";
+  for (const string& str : std::get<2>(cluster)) {
+    out += str + ", ";
+  }
+  return out;
+}
+
+}  // namespace
 
 /* static */ constexpr const char* const
     RemoteFusedGraphExecuteUtils::ATTR_OUTPUT_DATA_TYPES;
@@ -279,6 +352,26 @@ RemoteFusedGraphExecuteUtils::AddOutputTensorShapeTypeByTensorShapeMap(
   return status;
 }
 
+/* static */ bool RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
+    const GraphDef& graph_def, const string& name_and_port, DataType* data_type,
+    TensorShape* shape) {
+  std::vector<DataType> data_types;
+  std::vector<TensorShape> shapes;
+  const TensorId tid = ParseTensorName(name_and_port);
+  const string node_name = tid.first.ToString();
+  const int port = tid.second;
+  const NodeDef* node_def = FindNodeDefByName(node_name, graph_def);
+  CHECK_NOTNULL(node_def);
+  GetOutputTensorShapeType(*node_def, &data_types, &shapes).IgnoreError();
+  if (data_types.empty()) {
+    return false;
+  }
+  CHECK(data_types.size() > port);
+  *data_type = data_types.at(port);
+  *shape = shapes.at(port);
+  return true;
+}
+
 /* static */ Status RemoteFusedGraphExecuteUtils::PropagateShapeInference(
     const GraphDef& graph_def,
     const std::vector<std::pair<string, Tensor>>& input_node_info_list,
@@ -417,4 +510,513 @@ RemoteFusedGraphExecuteUtils::BuildRemoteGraphInputsAndOutputsFromProto(
                      std::make_pair(tensor.dtype(), tensor.shape())));
 }
 
+/* static */ Status RemoteFusedGraphExecuteUtils::BuildAndAddTensorShapes(
+    const std::vector<std::pair<string, Tensor>>& input_tensors,
+    const bool dry_run_inference, GraphDef* graph_def) {
+  TensorShapeMap tensor_shape_map;
+  if (dry_run_inference) {
+    TF_RETURN_IF_ERROR(DryRunInferenceForAllNode(*graph_def, input_tensors,
+                                                 /*initialize_by_zero=*/true,
+                                                 &tensor_shape_map));
+  } else {
+    ImportGraphDefOptions opts;
+    Graph graph(OpRegistry::Global());
+    ShapeRefiner shape_refiner(graph.versions().producer(),
+                               graph.op_registry());
+    TF_RETURN_IF_ERROR(
+        ImportGraphDef(opts, *graph_def, &graph, &shape_refiner));
+    TF_RETURN_IF_ERROR(PropagateShapeInference(*graph_def, input_tensors,
+                                               &graph, &shape_refiner));
+    TF_RETURN_IF_ERROR(
+        BuildTensorShapeMapFromGraph(graph, shape_refiner, &tensor_shape_map));
+  }
+
+  for (NodeDef& node_def : *graph_def->mutable_node()) {
+    TF_RETURN_IF_ERROR(
+        AddOutputTensorShapeTypeByTensorShapeMap(tensor_shape_map, &node_def));
+  }
+
+  return Status::OK();
+}
+
+/* static */ Status
+RemoteFusedGraphExecuteUtils::BuildRemoteFusedGraphExecuteInfo(
+    const string& executor_name, const GraphDef& subgraph_def,
+    const std::vector<string>& inputs, const std::vector<string>& outputs,
+    const bool require_shape_type, RemoteFusedGraphExecuteInfo* execute_info,
+    DataTypeVector* input_types, DataTypeVector* output_types) {
+  CHECK_NOTNULL(execute_info);
+  CHECK_NOTNULL(input_types);
+  CHECK_NOTNULL(output_types);
+
+  execute_info->Clear();
+  execute_info->set_executor_name(executor_name);
+
+  // copy graph
+  *execute_info->mutable_remote_graph() = subgraph_def;
+
+  for (const string& input : inputs) {
+    DataType dt;
+    TensorShape shape;
+    const bool has_shapetype =
+        GetOutputTensorShapeType(subgraph_def, input, &dt, &shape);
+
+    execute_info->add_graph_input_node_name(input);
+    if (has_shapetype) {
+      RemoteFusedGraphExecuteInfo::TensorShapeTypeProto& tensor_shape_type =
+          *execute_info->add_default_graph_input_tensor_shape();
+      tensor_shape_type.set_dtype(dt);
+      TensorShapeProto& tensor_shape_proto = *tensor_shape_type.mutable_shape();
+      for (const int64 dim : shape.dim_sizes()) {
+        tensor_shape_proto.add_dim()->set_size(dim);
+      }
+      input_types->push_back(dt);
+    } else {
+      CHECK(!require_shape_type)
+          << "No shape type found for " << input << DumpGraphDef(subgraph_def);
+      // Assuming input type is float if no data provided.
+      input_types->push_back(DT_FLOAT);
+    }
+  }
+
+  for (const string& output : outputs) {
+    DataType dt;
+    TensorShape shape;
+    const bool has_shapetype =
+        GetOutputTensorShapeType(subgraph_def, output, &dt, &shape);
+
+    execute_info->add_graph_output_node_name(output);
+    if (has_shapetype) {
+      RemoteFusedGraphExecuteInfo::TensorShapeTypeProto&
+          tensor_shape_type_proto =
+              *execute_info->add_default_graph_output_tensor_shape();
+      tensor_shape_type_proto.set_dtype(dt);
+      TensorShapeProto& tensor_shape_proto =
+          *tensor_shape_type_proto.mutable_shape();
+      for (const int64 dim : shape.dim_sizes()) {
+        tensor_shape_proto.add_dim()->set_size(dim);
+      }
+      output_types->push_back(dt);
+    } else {
+      CHECK(!require_shape_type)
+          << "No shape type found for " << output << DumpGraphDef(subgraph_def);
+      // Assuming output type is float if no data provided.
+      output_types->push_back(DT_FLOAT);
+    }
+  }
+
+  return Status::OK();
+}
+
+/* static */ Status
+RemoteFusedGraphExecuteUtils::BuildRemoteFusedGraphExecuteOpNode(
+    const string& node_name, const string& executor_name,
+    const GraphDef& subgraph_def, const std::vector<string>& inputs,
+    const std::vector<string>& outputs, const bool require_shape_type,
+    Graph* graph, Node** created_node) {
+  CHECK_NOTNULL(graph);
+  CHECK_NOTNULL(created_node);
+
+  RemoteFusedGraphExecuteInfo execute_info;
+  DataTypeVector input_types;
+  DataTypeVector output_types;
+
+  TF_CHECK_OK(RemoteFusedGraphExecuteUtils::BuildRemoteFusedGraphExecuteInfo(
+      executor_name, subgraph_def, inputs, outputs, require_shape_type,
+      &execute_info, &input_types, &output_types));
+
+  std::vector<NodeBuilder::NodeOut> node_out_list;
+  for (const string& input : inputs) {
+    const TensorId tid = ParseTensorName(input);
+    Node* node = FindMutableNodeByName(tid.first.ToString(), graph);
+    CHECK_NOTNULL(node);
+    node_out_list.emplace_back(node, tid.second);
+  }
+
+  const string execute_info_str = execute_info.SerializeAsString();
+
+  auto builder =
+      NodeBuilder(node_name, "RemoteFusedGraphExecute")
+          .Input(node_out_list)
+          .Attr("Tinputs", input_types)
+          .Attr("Toutputs", output_types)
+          .Attr("serialized_remote_fused_graph_execute_info", execute_info_str);
+
+  TF_RETURN_IF_ERROR(builder.Finalize(graph, created_node));
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::BuildIdentityOpNode(
+    const string& node_name, const string& input_node_name,
+    const int input_node_port, const DataType dt, Graph* graph,
+    Node** created_node) {
+  Node* node = FindMutableNodeByName(input_node_name, graph);
+  CHECK_NOTNULL(node);
+  NodeBuilder::NodeOut node_out(node, input_node_port);
+
+  auto builder =
+      NodeBuilder(node_name, "Identity").Input(node_out).Attr("T", dt);
+
+  TF_RETURN_IF_ERROR(builder.Finalize(graph, created_node));
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::ClusterizeNodes(
+    const std::unordered_set<string>& node_names, const GraphDef& graph_def,
+    std::vector<ClusterInfo>* cluster_infos) {
+  Graph graph(OpRegistry::Global());
+  ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
+  TF_RETURN_IF_ERROR(ImportGraphDef({}, graph_def, &graph, &shape_refiner));
+  std::unordered_set<string> remaining_nodes = node_names;
+
+  while (!remaining_nodes.empty()) {
+    ClusterInfo ci;
+
+    // Determine one cluster nodes
+    std::unordered_set<const Node*> visited;
+    std::deque<const Node*> queue;
+    queue.emplace_back(FindNodeByName(*remaining_nodes.begin(), graph));
+    while (!queue.empty()) {
+      const Node* node = queue.front();
+      CHECK_NOTNULL(node);
+      queue.pop_front();
+      const string& node_name = node->name();
+      if (node_names.count(node_name) > 0) {
+        std::get<0>(ci).emplace(node_name);
+        remaining_nodes.erase(node_name);
+      } else {
+        // Edge of subgraph.  Do nothing.
+        continue;
+      }
+      for (const Node* in : node->in_nodes()) {
+        if (visited.insert(in).second) {
+          queue.push_back(in);
+        }
+      }
+      for (const Node* out : node->out_nodes()) {
+        if (visited.insert(out).second) {
+          queue.push_back(out);
+        }
+      }
+    }
+
+    // Determine one cluster border
+    std::vector<string>& border_inputs = std::get<1>(ci);
+    std::vector<string>& border_outputs = std::get<2>(ci);
+    for (const string& node_name : node_names) {
+      Node* node = FindMutableNodeByName(node_name, &graph);
+      CHECK_NOTNULL(node);
+      int input_count = 0;
+      for (const Edge* in_edge : node->in_edges()) {
+        const Node* src_node = in_edge->src();
+        const bool src_is_outside =
+            node_names.count(src_node->name()) <= 0 && !src_node->IsSource();
+        if (src_is_outside) {
+          const string src_name =
+              strings::StrCat(src_node->name(), ":", in_edge->src_output());
+          CHECK_EQ(1, src_node->num_outputs())
+              << "output count of input border node must be one."
+              << src_node->name();
+          if (std::find(border_inputs.begin(), border_inputs.end(), src_name) ==
+              border_inputs.end()) {
+            border_inputs.emplace_back(src_name);
+          }
+        } else {
+          ++input_count;
+        }
+      }
+      CHECK(input_count == 0 || input_count == node->in_edges().size());
+
+      for (const Edge* out_edge : node->out_edges()) {
+        const Node* dst_node = out_edge->dst();
+        CHECK_NOTNULL(dst_node);
+        const bool dst_is_outside = node_names.count(dst_node->name()) <= 0;
+        const string dst_name =
+            strings::StrCat(node->name(), ":", out_edge->src_output());
+        if (dst_is_outside) {
+          if (dst_node->IsSink()) {
+            CHECK_EQ(1, node->num_outputs())
+                << "If you want to specify output node as subgraph output node "
+                << "the output count of the node must be 1 "
+                << "because that node is replaced by identity node.";
+            const string identity_dst_name =
+                strings::StrCat(node->name(), ":", 0);
+            if (std::find(border_outputs.begin(), border_outputs.end(),
+                          identity_dst_name) == border_outputs.end()) {
+              border_outputs.emplace_back(identity_dst_name);
+            }
+          } else {
+            if (std::find(border_outputs.begin(), border_outputs.end(),
+                          dst_name) == border_outputs.end()) {
+              border_outputs.emplace_back(dst_name);
+            }
+          }
+        }
+      }
+    }
+    cluster_infos->emplace_back(ci);
+    VLOG(1) << DumpCluster(ci);
+  }
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::BuildClusterSubgraphDef(
+    const ClusterInfo& cluster, const GraphDef& graph_def,
+    GraphDef* subgraph_def) {
+  const std::unordered_set<string>& node_names = std::get<0>(cluster);
+  const std::unordered_set<string>& border_input_names =
+      BuildNodeSetFromNodeNamesAndPorts(std::get<1>(cluster));
+
+  Graph graph(OpRegistry::Global());
+  ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
+  TF_RETURN_IF_ERROR(ImportGraphDef({}, graph_def, &graph, &shape_refiner));
+
+  for (Node* node : graph.nodes()) {
+    if (node != nullptr && node_names.count(node->name()) <= 0 &&
+        border_input_names.count(node->name()) <= 0 && !node->IsSource() &&
+        !node->IsSink()) {
+      graph.RemoveNode(node);
+    }
+  }
+  graph.ToGraphDef(subgraph_def);
+
+  for (const string& subgraph_input : std::get<1>(cluster)) {
+    const TensorId tid = ParseTensorName(subgraph_input);
+    const string subgraph_input_name = tid.first.ToString();
+    const int subgraph_input_port = tid.second;
+    const NodeDef* node_def = FindNodeDefByName(subgraph_input_name, graph_def);
+    CHECK_NOTNULL(node_def);
+    std::vector<DataType> dt_vec;
+    std::vector<TensorShape> shape_vec;
+    GetOutputTensorShapeType(*node_def, &dt_vec, &shape_vec).IgnoreError();
+    const DataType& dt =
+        dt_vec.empty() ? DT_FLOAT : dt_vec.at(subgraph_input_port);
+    const TensorShape& shape =
+        shape_vec.empty() ? TensorShape({}) : shape_vec.at(subgraph_input_port);
+
+    TF_RETURN_IF_ERROR(ReplaceInputNodeByPlaceHolder(subgraph_input_name, dt,
+                                                     shape, subgraph_def));
+  }
+  VLOG(1) << DumpGraphDef(*subgraph_def);
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+    const std::vector<string>& border_inputs,
+    const std::vector<string>& border_outputs, const GraphDef& graph_def,
+    ClusterInfo* cluster) {
+  Graph graph(OpRegistry::Global());
+  ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
+  TF_RETURN_IF_ERROR(ImportGraphDef({}, graph_def, &graph, &shape_refiner));
+
+  std::unordered_set<const Node*> visited;
+  std::deque<const Node*> queue;
+  for (const string& output : border_outputs) {
+    const TensorId tid = ParseTensorName(output);
+    const string& output_node_name = tid.first.ToString();
+    for (const Node* node : graph.nodes()) {
+      if (output_node_name == node->name()) {
+        queue.push_back(node);
+        visited.insert(node);
+      }
+    }
+  }
+
+  std::unordered_set<const Node*> border_input_nodes;
+  // propagate visit to parent nodes until input nodes
+  while (!queue.empty()) {
+    const Node* node = queue.front();
+    queue.pop_front();
+    for (const Edge* edge : node->in_edges()) {
+      const Node* src_node = edge->src();
+      CHECK_NOTNULL(src_node);
+      const int src_port = edge->src_output();
+      bool input_found = false;
+      for (const string& input : border_inputs) {
+        const TensorId tid = ParseTensorName(input);
+        if (tid.first.ToString() == src_node->name() &&
+            tid.second == src_port) {
+          input_found = true;
+          border_input_nodes.insert(src_node);
+        }
+      }
+      if (visited.insert(src_node).second) {
+        if (!input_found) {
+          queue.push_back(src_node);
+        }
+      }
+    }
+  }
+
+  for (const Node* node : visited) {
+    if (node != nullptr && !node->IsSource() && !node->IsSink() &&
+        border_input_nodes.count(node) <= 0) {
+      std::get<0>(*cluster).insert(node->name());
+    }
+  }
+  std::get<1>(*cluster) = border_inputs;
+  std::get<2>(*cluster) = border_outputs;
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::FuseCluster(
+    const GraphDef& input_graph_def, const std::vector<string>& inputs,
+    const std::vector<string>& outputs,
+    const string& remote_fused_graph_node_name, const ClusterInfo& cluster,
+    const string& remote_graph_executor_name, const bool require_shape_type,
+    GraphDef* output_graph_def) {
+  LOG(INFO) << "Transforming quantized stripped model to a remote fused "
+               "graph execute op by fusing a specified subgraph...";
+
+  CHECK(!remote_graph_executor_name.empty());
+
+  const std::vector<string>& border_inputs = std::get<1>(cluster);
+  const std::vector<string>& border_outputs = std::get<2>(cluster);
+
+  GraphDef subgraph_def;
+  TF_RETURN_IF_ERROR(
+      BuildClusterSubgraphDef(cluster, input_graph_def, &subgraph_def));
+
+  Graph graph(OpRegistry::Global());
+  ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
+  TF_RETURN_IF_ERROR(
+      ImportGraphDef({}, input_graph_def, &graph, &shape_refiner));
+
+  Node* fused_node;
+  TF_RETURN_IF_ERROR(BuildRemoteFusedGraphExecuteOpNode(
+      remote_fused_graph_node_name, remote_graph_executor_name, subgraph_def,
+      border_inputs, border_outputs, require_shape_type, &graph, &fused_node));
+
+  for (const Node* node : graph.nodes()) {
+    for (int i = 0; i < node->num_inputs(); ++i) {
+      const Edge* edge = nullptr;
+      TF_RETURN_IF_ERROR(node->input_edge(i, &edge));
+      for (int j = 0; j < border_outputs.size(); ++j) {
+        const string& output = border_outputs.at(j);
+        const TensorId tid = ParseTensorName(output);
+        const string output_name = tid.first.ToString();
+        Node* src_node = edge->src();
+        if (src_node != nullptr && src_node->name() == output_name &&
+            edge->src_output() == tid.second) {
+          // Source node is replaced by new fused node.
+          Node* dst_node = edge->dst();
+          const int dst_input = edge->dst_input();
+          LOG(INFO) << "Removing existing edge to " << edge->dst()->name()
+                    << " from " << edge->src()->name();
+          graph.RemoveEdge(edge);
+          graph.AddEdge(fused_node, j, dst_node, dst_input);
+        }
+      }
+    }
+  }
+
+  // Replace output nodes by identity nodes which forward outputs from
+  // RemoteFusedGraphExecuteOpNode
+  for (const string& output : outputs) {
+    const TensorId output_tid = ParseTensorName(output);
+    const string output_name = output_tid.first.ToString();
+    for (int i = 0; i < border_outputs.size(); ++i) {
+      const TensorId subgraph_output_tid =
+          ParseTensorName(border_outputs.at(i));
+      const string& subgraph_output_name = subgraph_output_tid.first.ToString();
+      if (output_name == subgraph_output_name) {
+        LOG(INFO) << "As graph output and subgraph output are same, "
+                  << "the graph output node is replaced by identity node";
+        Node* original_output_node = FindMutableNodeByName(output, &graph);
+        CHECK_NOTNULL(original_output_node);
+        CHECK_EQ(1, original_output_node->num_outputs())
+            << "Num outputs should be 1 for " << output << ".";
+        graph.RemoveNode(original_output_node);
+        Node* new_node;
+        TF_RETURN_IF_ERROR(BuildIdentityOpNode(output,
+                                               remote_fused_graph_node_name, i,
+                                               DT_FLOAT, &graph, &new_node));
+        CHECK_NOTNULL(new_node);
+      }
+    }
+  }
+
+  GraphDef result_graph_def;
+
+  graph.ToGraphDef(&result_graph_def);
+
+  ClusterInfo graph_cluster;
+  TF_RETURN_IF_ERROR(
+      BuildClusterByBorder(inputs, outputs, result_graph_def, &graph_cluster));
+
+  // Remove unvisited nodes
+  TF_RETURN_IF_ERROR(BuildClusterSubgraphDef(graph_cluster, result_graph_def,
+                                             output_graph_def));
+
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::FuseRemoteGraphByNodeNames(
+    const GraphDef& input_graph_def, const std::vector<string>& inputs,
+    const std::vector<string>& outputs,
+    const string& remote_fused_graph_node_name_prefix,
+    const std::unordered_set<string>& subgraph_nodes,
+    const string& remote_fused_graph_executor_name,
+    const bool require_shape_type, GraphDef* output_graph_def) {
+  std::vector<ClusterInfo> ci_vec;
+  TF_RETURN_IF_ERROR(RemoteFusedGraphExecuteUtils::ClusterizeNodes(
+      subgraph_nodes, input_graph_def, &ci_vec));
+
+  for (int i = 0; i < ci_vec.size(); ++i) {
+    const string remote_fused_graph_node_name =
+        strings::StrCat(remote_fused_graph_node_name_prefix, "/", i);
+    TF_RETURN_IF_ERROR(FuseCluster(input_graph_def, inputs, outputs,
+                                   remote_fused_graph_node_name, ci_vec.at(i),
+                                   remote_fused_graph_executor_name,
+                                   require_shape_type, output_graph_def));
+  }
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::FuseRemoteGraphByBorder(
+    const GraphDef& input_graph_def, const std::vector<string>& inputs,
+    const std::vector<string>& outputs,
+    const string& remote_fused_graph_node_name,
+    const std::vector<string>& border_inputs,
+    const std::vector<string>& border_outputs,
+    const string& remote_graph_executor_name, const bool require_shape_type,
+    GraphDef* output_graph_def) {
+  ClusterInfo cluster;
+  TF_RETURN_IF_ERROR(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      border_inputs, border_outputs, input_graph_def, &cluster));
+
+  return FuseCluster(
+      input_graph_def, inputs, outputs, remote_fused_graph_node_name, cluster,
+      remote_graph_executor_name, require_shape_type, output_graph_def);
+}
+
+/* static */ Status RemoteFusedGraphExecuteUtils::ReplaceInputNodeByPlaceHolder(
+    const string& input, const DataType type, const TensorShape& shape,
+    GraphDef* graph_def) {
+  const TensorId tid = ParseTensorName(input);
+  CHECK_EQ(0, tid.second);
+  const string node_name = tid.first.ToString();
+  for (NodeDef& node : *graph_def->mutable_node()) {
+    if (node.name() != node_name) {
+      continue;
+    }
+    if (node.op() == "Placeholder") {
+      return Status::OK();
+    } else {
+      NodeDef placeholder_node;
+      placeholder_node.set_op("Placeholder");
+      placeholder_node.set_name(node_name);
+      AddNodeAttr("dtype", type, &placeholder_node);
+      AddNodeAttr("shape", shape, &placeholder_node);
+      // TODO(satok): Remove once we merge attributes
+      AddOutputTensorShapeType({type}, {shape}, &placeholder_node);
+      node.Clear();
+      node = placeholder_node;
+      return Status::OK();
+    }
+  }
+  return errors::InvalidArgument(
+      strings::StrCat(node_name, " not found for replacement."));
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
index a71047d42d..9ec189c85f 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
@@ -17,6 +17,7 @@ limitations under the License.
 #define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_REMOTE_FUSED_GRAPH_EXECUTE_UTILS_H_
 
 #include <unordered_map>
+#include <unordered_set>
 
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/remote_fused_graph_execute_info.pb.h"
@@ -52,9 +53,12 @@ class RemoteFusedGraphExecuteUtils {
   using ExecutorBuildRegistry = std::map<string, ExecutorBuildFunc>;
 
   using TensorShapeType = std::pair<DataType, TensorShape>;
-  using TensorShapeMap =
-      std::unordered_multimap<string /* node name */,
-                              std::pair<int /* port */, TensorShapeType>>;
+  using TensorShapeMap = std::unordered_multimap<string,         // node name
+                                                 std::pair<int,  // port
+                                                           TensorShapeType>>;
+  using ClusterInfo = std::tuple<std::unordered_set<string>,  // node names
+                                 std::vector<string>,         // border inputs
+                                 std::vector<string>>;        // border outputs
 
   // Return registered ExecutorBuildFunc for given name.
   static const ExecutorBuildFunc* GetExecutorBuildFunc(const string& name);
@@ -103,6 +107,10 @@ class RemoteFusedGraphExecuteUtils {
                                          std::vector<DataType>* data_types,
                                          std::vector<TensorShape>* shapes);
 
+  static bool GetOutputTensorShapeType(const GraphDef& graph_def,
+                                       const string& name_and_port,
+                                       DataType* data_type, TensorShape* shape);
+
   static Status PropagateShapeInference(
       const GraphDef& graph_def,
       const std::vector<std::pair<string, Tensor>>& input_node_info_list,
@@ -124,10 +132,92 @@ class RemoteFusedGraphExecuteUtils {
       std::vector<std::pair<string, Tensor>>* inputs,
       std::vector<string>* outputs);
 
+  static Status BuildAndAddTensorShapes(
+      const std::vector<std::pair<string, Tensor>>& input_tensors,
+      const bool dry_run_inference, GraphDef* graph_def);
+
+  // Build remote fused graph execute info
+  static Status BuildRemoteFusedGraphExecuteInfo(
+      const string& executor_name, const GraphDef& subgraph_def,
+      const std::vector<string>& inputs, const std::vector<string>& outputs,
+      const bool require_shape_type, RemoteFusedGraphExecuteInfo* execute_info,
+      DataTypeVector* input_types, DataTypeVector* output_types);
+
+  // Build remote fused graph execute op node by fusing specified subgraph
+  // as remote fused graph execute info
+  static Status BuildRemoteFusedGraphExecuteOpNode(
+      const string& node_name, const string& executor_name,
+      const GraphDef& subgraph_def, const std::vector<string>& inputs,
+      const std::vector<string>& outputs, const bool require_shape_type,
+      Graph* graph, Node** created_node);
+
+  // Build Identity node to forward remote graph node output
+  static Status BuildIdentityOpNode(const string& node_name,
+                                    const string& input_node_name,
+                                    const int input_node_port,
+                                    const DataType dt, Graph* graph,
+                                    Node** created_node);
+
+  // Create clusters of given nodes
+  static Status ClusterizeNodes(const std::unordered_set<string>& node_names,
+                                const GraphDef& graph_def,
+                                std::vector<ClusterInfo>* cluster_infos);
+
+  // Build GraphDef of a given cluster
+  static Status BuildClusterSubgraphDef(const ClusterInfo& cluster,
+                                        const GraphDef& graph_def,
+                                        GraphDef* subgraph_def);
+
+  // Build a cluster by given border
+  // CAVEAT: The border must be consistent for one cluster.
+  static Status BuildClusterByBorder(const std::vector<string>& border_inputs,
+                                     const std::vector<string>& border_outputs,
+                                     const GraphDef& graph_def,
+                                     ClusterInfo* cluster);
+
+  // Fuse one cluster into a newly created RemoteFusedGraphExecuteOp node.
+  // The subgraph is stored as a graph in RemoteFusedGraphExecuteInfo.
+  // CAVEAT1: This transform strips unvisited nodes with given outputs.
+  // CAVEAT2: If you want to use a graph output as a border output,
+  // that graph output node is replaced by an identity node.  Therefore,
+  // the number of output of the node must be 1.
+  static Status FuseCluster(const GraphDef& input_graph_def,
+                            const std::vector<string>& inputs,
+                            const std::vector<string>& outputs,
+                            const string& remote_fused_graph_node_name,
+                            const ClusterInfo& cluster,
+                            const string& remote_graph_executor_name,
+                            const bool require_shape_type,
+                            GraphDef* output_graph_def);
+
+  // Fuse subgraph of specified nodes
+  static Status FuseRemoteGraphByNodeNames(
+      const GraphDef& input_graph_def, const std::vector<string>& inputs,
+      const std::vector<string>& outputs,
+      const string& remote_fused_graph_node_name_prefix,
+      const std::unordered_set<string>& subgraph_nodes,
+      const string& remote_fused_graph_executor_name,
+      const bool require_shape_type, GraphDef* output_graph_def);
+
+  // Fuse subgraph of specified border
+  static Status FuseRemoteGraphByBorder(
+      const GraphDef& input_graph_def, const std::vector<string>& inputs,
+      const std::vector<string>& outputs,
+      const string& remote_fused_graph_node_name,
+      const std::vector<string>& border_inputs,
+      const std::vector<string>& border_outputs,
+      const string& remote_graph_executor_name, const bool require_shape_type,
+      GraphDef* output_graph_def);
+
  private:
   static void EmplaceTensorShapeType(const string& name, const Tensor& tensor,
                                      TensorShapeMap* tensor_shape_map);
 
+  static Status ReplaceInputNodeByPlaceHolder(const string& input,
+                                              const DataType type,
+                                              const TensorShape& shape,
+                                              GraphDef* graph_def);
+
   static ExecutorBuildRegistry* GetExecutorBuildRegistry();
 
   TF_DISALLOW_COPY_AND_ASSIGN(RemoteFusedGraphExecuteUtils);
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
index 52afa5dde1..8bd63d996a 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
@@ -15,18 +15,24 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/remote_fused_graph_execute_utils.h"
 #include "tensorflow/cc/framework/scope.h"
+#include "tensorflow/cc/ops/array_ops.h"
 #include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/math_ops.h"
 #include "tensorflow/core/common_runtime/shape_refiner.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
 #include "tensorflow/core/platform/test.h"
 
 namespace tensorflow {
+namespace {
 
-constexpr const char* const NAME_A = "a";
-constexpr const char* const NAME_B = "b";
-constexpr const char* const NAME_A_PLUS_B = "a_plus_b";
+using ClusterInfo = RemoteFusedGraphExecuteUtils::ClusterInfo;
+
+constexpr const char* const NAME_A = "A";
+constexpr const char* const NAME_B = "B";
+constexpr const char* const NAME_A_PLUS_B = "A_PLUS_B";
 constexpr float NODE_A_VAL = 2.0f;
 constexpr float NODE_B_VAL = 3.0f;
 constexpr float VALUE_TOLERANCE_FLOAT = 1e-8f;
@@ -41,6 +47,154 @@ static NodeDef* GetNodeDef(const string& name, GraphDef* def) {
   return nullptr;
 }
 
+// This function builds the following graph
+//
+//  A         B         C         D         E
+//  |         |         |         |         |
+//  +----+----+         |         +----+----+
+//       |              |              |
+//       F             / \             G
+//       |            |   |           / \
+//       +-----+------+   +-----+----+   +
+//             |                |        |
+//             H                I        |
+//             |                |        |
+//             +-------+--------+        |
+//                     |                 |
+//                     J                 |
+//                     |                 |
+//                     +--------+--------+
+//                              |
+//                              K
+//
+Status BuildMultipleAddGraph(GraphDef* graph_def) {
+  Scope root = tensorflow::Scope::NewRootScope();
+
+  Tensor a_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&a_data, 1.0f);
+  Output a_const = ops::Const(root.WithOpName("A"), Input::Initializer(a_data));
+
+  Tensor b_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&b_data, 1.0f);
+  Output b_const = ops::Const(root.WithOpName("B"), Input::Initializer(b_data));
+
+  Tensor c_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&c_data, 1.0f);
+  Output c_const = ops::Const(root.WithOpName("C"), Input::Initializer(c_data));
+
+  Tensor d_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&d_data, 1.0f);
+  Output d_const = ops::Const(root.WithOpName("D"), Input::Initializer(d_data));
+
+  Tensor e_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&e_data, 1.0f);
+  Output e_const = ops::Const(root.WithOpName("E"), Input::Initializer(e_data));
+
+  Output f_add = ops::Add(root.WithOpName("F"), a_const, b_const);
+
+  Output g_add = ops::Add(root.WithOpName("G"), d_const, e_const);
+
+  Output h_add = ops::Add(root.WithOpName("H"), f_add, c_const);
+
+  Output i_add = ops::Add(root.WithOpName("I"), c_const, g_add);
+
+  Output j_add = ops::Add(root.WithOpName("J"), h_add, i_add);
+
+  Output k_add = ops::Add(root.WithOpName("K"), j_add, g_add);
+
+  TF_RETURN_IF_ERROR(root.ToGraphDef(graph_def));
+
+  return Status::OK();
+}
+
+class FuseRemoteGraphMultipleAddOpsTest : public ::testing::Test {
+ protected:
+  void SetUp() final { TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def_)); }
+
+  void TearDown() final {}
+
+  Status FuseByInOut() {
+    // Feed output shapes and types
+    RemoteFusedGraphExecuteUtils::TensorShapeMap tensor_shape_map;
+    GraphDef graph_def_with_shapetype = graph_def_;
+    TF_RETURN_IF_ERROR(RemoteFusedGraphExecuteUtils::BuildAndAddTensorShapes(
+        input_tensors_, /*dry_run_inference*/ true, &graph_def_with_shapetype));
+
+    return RemoteFusedGraphExecuteUtils::FuseRemoteGraphByBorder(
+        graph_def_with_shapetype, inputs_, outputs_,
+        "remote_fused_graph_node_names", subgraph_input_names_,
+        subgraph_output_names_, "remote_graph_executor_name",
+        /*require_shape_type=*/true, &result_graph_def_);
+  }
+
+  Status FuseByNodes() {
+    return RemoteFusedGraphExecuteUtils::FuseRemoteGraphByNodeNames(
+        graph_def_, inputs_, outputs_, "remote_fused_graph_node_names",
+        subgraph_node_names_, "remote_graph_executor_name",
+        /*require_shape_type=*/false, &result_graph_def_);
+  }
+
+ public:
+  const std::vector<std::pair<string, Tensor>> input_tensors_{
+      {"A", {DT_FLOAT, {1, 1, 1, 1}}}};
+  const std::vector<string> inputs_{"A"};
+  const std::vector<string> outputs_{"K"};
+  GraphDef graph_def_;
+  GraphDef result_graph_def_;
+  std::vector<string> subgraph_input_names_;
+  std::vector<string> subgraph_output_names_;
+  std::unordered_set<string> subgraph_node_names_;
+};
+
+void SetSubgraphArguments(const std::vector<string>& input_names,
+                          const std::vector<string>& output_names,
+                          FuseRemoteGraphMultipleAddOpsTest* fixture) {
+  for (const string& input_name : input_names) {
+    fixture->subgraph_input_names_.emplace_back(input_name);
+  }
+
+  fixture->subgraph_output_names_ = output_names;
+}
+
+template <typename T>
+static string IterToString(const T& set) {
+  string out;
+  for (const string& val : set) {
+    if (!out.empty()) {
+      out += ", ";
+    }
+    out += val;
+  }
+  return out;
+}
+
+static string SummarizeGraphDef(const GraphDef& graph_def) {
+  string out;
+  for (const NodeDef& node : graph_def.node()) {
+    out += strings::StrCat("node: ", node.name(), "\n    input: ");
+    for (const string& input : node.input()) {
+      out += strings::StrCat(input, ", ");
+    }
+    out += "\n";
+  }
+  return out;
+}
+
+static string DumpInOutNames(const std::vector<ClusterInfo>& ci_vec) {
+  for (int i = 0; i < ci_vec.size(); ++i) {
+    LOG(INFO) << "Cluster(" << i << ")";
+    LOG(INFO) << "input: " << IterToString(std::get<1>(ci_vec.at(i)));
+    LOG(INFO) << "output: " << IterToString(std::get<2>(ci_vec.at(i)));
+  }
+  return "";
+}
+
+static void ClearCluster(ClusterInfo* cluster) {
+  std::get<0>(*cluster).clear();
+  std::get<1>(*cluster).clear();
+  std::get<2>(*cluster).clear();
+}
+
 TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphA) {
   GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
       NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
@@ -104,7 +258,7 @@ TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphAB) {
 }
 
 TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphForAllNodes) {
-  // Set Node "a" as an input with value (= 1.0f)
+  // Set Node "A" as an input with value (= 1.0f)
   std::pair<string, Tensor> input_node_info_a;
   input_node_info_a.first = NAME_A;
   input_node_info_a.second = Tensor(DT_FLOAT, {});
@@ -226,4 +380,294 @@ TEST(RemoteFusedGraphExecuteUtils, PropagateAndBuildTensorShapeMap) {
   }
 }
 
+TEST(RemoteFusedGraphExecuteUtils,
+     BuildRemoteFusedGraphExecuteInfoWithShapeInference) {
+  // Build inputs
+  std::pair<string, Tensor> input_node_info_a;
+  input_node_info_a.first = NAME_A;
+  input_node_info_a.second = Tensor(DT_FLOAT, {});
+  input_node_info_a.second.scalar<float>()() = NODE_A_VAL;
+  std::pair<string, Tensor> input_node_info_b;
+  input_node_info_b.first = NAME_B;
+  input_node_info_b.second = Tensor(DT_FLOAT, {});
+  input_node_info_b.second.scalar<float>()() = NODE_B_VAL;
+  const std::vector<std::pair<string, Tensor>> input_tensors{input_node_info_a,
+                                                             input_node_info_b};
+  const std::vector<string> inputs{NAME_A, NAME_B};
+
+  // Build outputs
+  const std::vector<string> outputs = {NAME_A_PLUS_B};
+
+  GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildAndAddTensorShapes(
+      input_tensors, /*dry_run_inference*/ true, &def));
+
+  RemoteFusedGraphExecuteInfo execute_info0;
+  DataTypeVector input_types0;
+  DataTypeVector output_types0;
+
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildRemoteFusedGraphExecuteInfo(
+      "executor", def, inputs, outputs, /*require_shape_type=*/true,
+      &execute_info0, &input_types0, &output_types0));
+
+  EXPECT_EQ(inputs.size(),
+            execute_info0.default_graph_input_tensor_shape_size());
+  EXPECT_EQ(outputs.size(),
+            execute_info0.default_graph_output_tensor_shape_size());
+  EXPECT_EQ(inputs.size(), input_types0.size());
+  EXPECT_EQ(outputs.size(), output_types0.size());
+
+  EXPECT_EQ(def.node_size(), execute_info0.remote_graph().node_size());
+}
+
+TEST(RemoteFusedGraphExecuteUtils, BuildRemoteFusedGraphExecuteOpNode) {
+  const std::vector<string> inputs{NAME_A, NAME_B};
+
+  // Build outputs
+  const std::vector<string> outputs = {NAME_A_PLUS_B};
+
+  const GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+
+  Graph graph(OpRegistry::Global());
+  ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
+  TF_ASSERT_OK(ImportGraphDef({}, def, &graph, &shape_refiner));
+
+  Node* node;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildRemoteFusedGraphExecuteOpNode(
+      "fused_name", "executor", def, inputs, outputs,
+      /*require_shape_type=*/false, &graph, &node));
+}
+
+TEST(RemoteFusedGraphExecuteUtils, ExtractSubgraphNodes) {
+  GraphDef graph_def;
+  TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def));
+  ClusterInfo cluster;
+  const std::unordered_set<string>& node_names = std::get<0>(cluster);
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      {"H", "I"}, {"J"}, graph_def, &cluster));
+  EXPECT_EQ(1, node_names.size()) << IterToString(node_names);
+
+  ClearCluster(&cluster);
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      {"F", "C", "G"}, {"J"}, graph_def, &cluster));
+  EXPECT_EQ(3, node_names.size()) << IterToString(node_names);
+
+  ClearCluster(&cluster);
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      {"A", "B", "C", "D", "E"}, {"J"}, graph_def, &cluster));
+  EXPECT_EQ(5, node_names.size()) << IterToString(node_names);
+
+  ClearCluster(&cluster);
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      {"A", "B", "C", "D", "E"}, {"K"}, graph_def, &cluster));
+  EXPECT_EQ(6, node_names.size()) << IterToString(node_names);
+
+  ClearCluster(&cluster);
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      {"F"}, {"H"}, graph_def, &cluster));
+  EXPECT_EQ(2, node_names.size()) << IterToString(node_names);
+}
+
+TEST(RemoteFusedGraphExecuteUtils, ClusterizeNodes) {
+  GraphDef graph_def;
+  TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def));
+
+  std::vector<ClusterInfo> ci_vec;
+  TF_ASSERT_OK(
+      RemoteFusedGraphExecuteUtils::ClusterizeNodes({"J"}, graph_def, &ci_vec));
+  ASSERT_EQ(1, ci_vec.size());
+  EXPECT_EQ(2, std::get<1>(ci_vec.at(0)).size()) << DumpInOutNames(ci_vec);
+  EXPECT_EQ(1, std::get<2>(ci_vec.at(0)).size()) << DumpInOutNames(ci_vec);
+
+  ci_vec.clear();
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::ClusterizeNodes(
+      {"H", "I", "J"}, graph_def, &ci_vec));
+  ASSERT_EQ(1, ci_vec.size());
+  EXPECT_EQ(3, std::get<1>(ci_vec.at(0)).size()) << DumpInOutNames(ci_vec);
+  EXPECT_EQ(1, std::get<2>(ci_vec.at(0)).size()) << DumpInOutNames(ci_vec);
+
+  ci_vec.clear();
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::ClusterizeNodes(
+      {"F", "C", "G", "H", "I", "J"}, graph_def, &ci_vec));
+  ASSERT_EQ(1, ci_vec.size());
+  EXPECT_EQ(4, std::get<1>(ci_vec.at(0)).size()) << DumpInOutNames(ci_vec);
+  EXPECT_EQ(2, std::get<2>(ci_vec.at(0)).size()) << DumpInOutNames(ci_vec);
+
+  ci_vec.clear();
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::ClusterizeNodes(
+      {"A", "B", "C", "D", "E"}, graph_def, &ci_vec));
+  ASSERT_EQ(5, ci_vec.size());
+
+  ci_vec.clear();
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::ClusterizeNodes(
+      {"A", "B", "D", "E", "F", "G"}, graph_def, &ci_vec));
+  ASSERT_EQ(2, ci_vec.size());
+}
+
+TEST(RemoteFusedGraphExecuteUtils, BuildSubgraphDefByInOut) {
+  GraphDef graph_def;
+  TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def));
+
+  ClusterInfo cluster;
+  GraphDef subgraph_def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      std::vector<string>{"H", "I"}, std::vector<string>{"J"}, graph_def,
+      &cluster));
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterSubgraphDef(
+      cluster, graph_def, &subgraph_def));
+  EXPECT_EQ(3, subgraph_def.node_size());
+
+  ClearCluster(&cluster);
+  subgraph_def.Clear();
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      std::vector<string>{"F", "C", "G"}, std::vector<string>{"J"}, graph_def,
+      &cluster));
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterSubgraphDef(
+      cluster, graph_def, &subgraph_def));
+  EXPECT_EQ(6, subgraph_def.node_size());
+
+  ClearCluster(&cluster);
+  subgraph_def.Clear();
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      std::vector<string>{"A", "B", "C", "D", "E"}, std::vector<string>{"J"},
+      graph_def, &cluster));
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterSubgraphDef(
+      cluster, graph_def, &subgraph_def));
+  EXPECT_EQ(10, subgraph_def.node_size());
+
+  ClearCluster(&cluster);
+  subgraph_def.Clear();
+
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      std::vector<string>{"A", "B", "C", "D", "E"}, std::vector<string>{"K"},
+      graph_def, &cluster));
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterSubgraphDef(
+      cluster, graph_def, &subgraph_def));
+  EXPECT_EQ(11, subgraph_def.node_size());
+
+  ClearCluster(&cluster);
+  subgraph_def.Clear();
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
+      std::vector<string>{"F"}, std::vector<string>{"H"}, graph_def, &cluster));
+  TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterSubgraphDef(
+      cluster, graph_def, &subgraph_def));
+  EXPECT_EQ(3, subgraph_def.node_size());
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_hi_j) {
+  SetSubgraphArguments(std::vector<string>{"H", "I"}, std::vector<string>{"J"},
+                       this);
+
+  TF_ASSERT_OK(FuseByInOut());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(11, result_graph_def_.node_size())
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_fcg_j) {
+  SetSubgraphArguments(std::vector<string>{"F", "C", "G"},
+                       std::vector<string>{"J"}, this);
+
+  TF_ASSERT_OK(FuseByInOut());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(9, result_graph_def_.node_size())
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_abcde_j) {
+  SetSubgraphArguments(std::vector<string>{"A", "B", "C", "D", "E"},
+                       std::vector<string>{"J"}, this);
+
+  TF_ASSERT_OK(FuseByInOut());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(8, result_graph_def_.node_size())
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_abcde_k) {
+  SetSubgraphArguments(std::vector<string>{"A", "B", "C", "D", "E"},
+                       std::vector<string>{"K"}, this);
+
+  TF_ASSERT_OK(FuseByInOut());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(7, result_graph_def_.node_size())
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_h) {
+  subgraph_node_names_ = {"H"};
+
+  TF_ASSERT_OK(FuseByNodes());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(11, result_graph_def_.node_size())
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_hij) {
+  subgraph_node_names_ = {"H", "I", "J"};
+
+  TF_ASSERT_OK(FuseByNodes());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(9, result_graph_def_.node_size())
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_cfghij) {
+  subgraph_node_names_ = {"C", "F", "G", "H", "I", "J"};
+
+  TF_ASSERT_OK(FuseByNodes());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(6, result_graph_def_.node_size())
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_abcdefghij) {
+  subgraph_node_names_ = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"};
+
+  TF_ASSERT_OK(FuseByNodes());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(3, result_graph_def_.node_size())  // "A", "RFG", "K"
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_abcdefghijk) {
+  subgraph_node_names_ = {"A", "B", "C", "D", "E", "F",
+                          "G", "H", "I", "J", "K"};
+
+  TF_ASSERT_OK(FuseByNodes());
+
+  EXPECT_EQ(11, graph_def_.node_size());
+  EXPECT_EQ(3, result_graph_def_.node_size())  // "A", "RFG", "K"
+      << "=== Before: \n"
+      << SummarizeGraphDef(graph_def_) << "\n\n\n=== After: \n"
+      << SummarizeGraphDef(result_graph_def_);
+}
+
+}  // namespace
 }  // namespace tensorflow
-- 
GitLab


From 7e7efbbbc43e46c055c12eb4e7833e9db9e0b18e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 13:19:39 -0700
Subject: [PATCH 1193/1563] Add `weighted_categorical_column`.

PiperOrigin-RevId: 155667634
---
 .../python/feature_column/feature_column.py   | 133 ++++++++-
 .../feature_column/feature_column_test.py     | 258 ++++++++++++++++++
 2 files changed, 387 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 557a543ef2..8ce3878d8c 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -292,19 +292,19 @@ def make_linear_model(features,
     weight_collections.append(ops.GraphKeys.MODEL_VARIABLES)
   with variable_scope.variable_scope(
       None, default_name='make_linear_model', values=features.values()):
-    weigthed_sums = []
+    weighted_sums = []
     builder = _LazyBuilder(features)
     for column in sorted(feature_columns, key=lambda x: x.name):
       with variable_scope.variable_scope(None, default_name=column.name):
         if isinstance(column, _CategoricalColumn):
-          weigthed_sums.append(_create_categorical_column_weighted_sum(
+          weighted_sums.append(_create_categorical_column_weighted_sum(
               column, builder, units, sparse_combiner, weight_collections,
               trainable))
         else:
-          weigthed_sums.append(_create_dense_column_weighted_sum(
+          weighted_sums.append(_create_dense_column_weighted_sum(
               column, builder, units, weight_collections, trainable))
     predictions_no_bias = math_ops.add_n(
-        weigthed_sums, name='weighted_sum_no_bias')
+        weighted_sums, name='weighted_sum_no_bias')
     bias = variable_scope.get_variable(
         'bias_weights',
         shape=[units],
@@ -965,6 +965,77 @@ def indicator_column(categorical_column):
   return _IndicatorColumn(categorical_column)
 
 
+def weighted_categorical_column(
+    categorical_column, weight_column_name, dtype=dtypes.float32):
+  """Applies weight values to a `_CategoricalColumn`.
+
+  Use this when each of your sparse inputs has both an ID and a value. For
+  example, if you're representing text documents as a collection of word
+  frequencies, you can provide 2 parallel sparse input features ('terms' and
+  'frequencies' below).
+
+  Example:
+
+  Input `tf.Example` objects:
+  [
+    features {
+      feature {
+        key: "frequencies"
+        value {float_list {value: 0.3 value: 0.1}}
+      }
+      feature {
+        key: "terms"
+        value {bytes_list {value: "very" value: "model"}}
+      }
+    },
+    features {
+      feature {
+        key: "frequencies"
+        value {float_list {value: 0.4 value: 0.1 value: 0.2}}
+      }
+      feature {
+        key: "terms"
+        value {bytes_list {value: "when" value: "course" value: "human"}}
+      }
+    }
+  ]
+
+  ```python
+  categorical_column = categorical_column_with_hash_bucket(
+      column_name='terms', hash_bucket_size=1000)
+  weighted_column = weighted_categorical_column(
+      categorical_column=categorical_column, weight_column_name='frequencies')
+  columns = [weighted_column, ...]
+  features = tf.parse_example(..., features=parse_example_spec(columns))
+  linear_prediction, _, _ = make_linear_model(features, columns)
+  ```
+
+  This assumes the input dictionary contains a `SparseTensor` for key
+  'terms', and a `SparseTensor` for key 'frequencies'. These 2 tensors must have
+  the same indices and dense shape.
+
+  Args:
+    categorical_column: A `_CategoricalColumn` created by
+      `categorical_column_with_*` functions.
+    weight_column_name: String key for weigth values.
+    dtype: Type of weights, such as `tf.float32`. Only float and integer weights
+      are supported.
+
+  Returns:
+    A `_CategoricalColumn` composed of two sparse features: one represents id,
+    the other represents weight (value) of the id feature in that example.
+
+  Raises:
+    ValueError: if `dtype` is not convertible to float.
+  """
+  if (dtype is None) or not (dtype.is_integer or dtype.is_floating):
+    raise ValueError('dtype {} is not convertible to float.'.format(dtype))
+  return _WeightedCategoricalColumn(
+      categorical_column=categorical_column,
+      weight_column_name=weight_column_name,
+      dtype=dtype)
+
+
 class _FeatureColumn(object):
   """Represents a feature column abstraction.
 
@@ -1844,6 +1915,60 @@ class _IdentityCategoricalColumn(
     return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
 
 
+class _WeightedCategoricalColumn(
+    _CategoricalColumn,
+    collections.namedtuple('_WeightedCategoricalColumn', (
+        'categorical_column', 'weight_column_name', 'dtype'
+    ))):
+  """See `weighted_categorical_column`."""
+
+  @property
+  def name(self):
+    return '{}_weighted_by_{}'.format(
+        self.categorical_column.name, self.weight_column_name)
+
+  @property
+  def _parse_example_config(self):
+    # pylint: disable=protected-access
+    config = self.categorical_column._parse_example_config
+    # pylint: enable=protected-access
+    if self.weight_column_name in config:
+      raise ValueError('Parse config {} already exists for {}.'.format(
+          config[self.weight_column_name], self.weight_column_name))
+    config[self.weight_column_name] = parsing_ops.VarLenFeature(self.dtype)
+    return config
+
+  @property
+  def _num_buckets(self):
+    # pylint: disable=protected-access
+    return self.categorical_column._num_buckets
+    # pylint: enable=protected-access
+
+  def _transform_feature(self, inputs):
+    weight_tensor = inputs.get(self.weight_column_name)
+    if weight_tensor is None:
+      raise ValueError('Missing weights {}.'.format(
+          self.weight_column_name))
+    weight_tensor = sparse_tensor_lib.convert_to_tensor_or_sparse_tensor(
+        weight_tensor)
+    if self.dtype != weight_tensor.dtype.base_dtype:
+      raise ValueError('Bad dtype, expected {}, but got {}.'.format(
+          self.dtype, weight_tensor.dtype))
+    if not isinstance(weight_tensor, sparse_tensor_lib.SparseTensor):
+      # The weight tensor can be a regular Tensor. In this case, sparsify it.
+      weight_tensor = _to_sparse_input(weight_tensor, ignore_value=0.0)
+    if not weight_tensor.dtype.is_floating:
+      weight_tensor = math_ops.to_float(weight_tensor)
+    return (inputs.get(self.categorical_column), weight_tensor)
+
+  def _get_sparse_tensors(
+      self, inputs, weight_collections=None, trainable=None):
+    del weight_collections
+    del trainable
+    tensors = inputs.get(self)
+    return _CategoricalColumn.IdWeightPair(tensors[0], tensors[1])
+
+
 # TODO(zakaria): Move this to embedding_ops and make it public.
 def _safe_embedding_lookup_sparse(embedding_weights,
                                   sparse_ids,
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 56fe5180d8..388e8a2d01 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -2822,5 +2822,263 @@ class EmbeddingColumnTest(test.TestCase):
       self.assertAllEqual(expected_lookups, input_layer.eval())
 
 
+class WeightedCategoricalColumnTest(test.TestCase):
+
+  def test_defaults(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    self.assertEqual('ids_weighted_by_values', column.name)
+    self.assertEqual(3, column._num_buckets)
+    self.assertEqual({
+        'ids': parsing_ops.VarLenFeature(dtypes.int64),
+        'values': parsing_ops.VarLenFeature(dtypes.float32)
+    }, column._parse_example_config)
+
+  def test_deep_copy(self):
+    """Tests deepcopy of categorical_column_with_hash_bucket."""
+    original = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    for column in (original, copy.deepcopy(original)):
+      self.assertEqual('ids_weighted_by_values', column.name)
+      self.assertEqual(3, column._num_buckets)
+      self.assertEqual({
+          'ids': parsing_ops.VarLenFeature(dtypes.int64),
+          'values': parsing_ops.VarLenFeature(dtypes.float32)
+      }, column._parse_example_config)
+
+  def test_invalid_dtype_none(self):
+    with self.assertRaisesRegexp(ValueError, 'is not convertible to float'):
+      fc.weighted_categorical_column(
+          categorical_column=fc.categorical_column_with_identity(
+              key='ids', num_buckets=3),
+          weight_column_name='values',
+          dtype=None)
+
+  def test_invalid_dtype_string(self):
+    with self.assertRaisesRegexp(ValueError, 'is not convertible to float'):
+      fc.weighted_categorical_column(
+          categorical_column=fc.categorical_column_with_identity(
+              key='ids', num_buckets=3),
+          weight_column_name='values',
+          dtype=dtypes.string)
+
+  def test_invalid_input_dtype(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    strings = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('omar', 'stringer', 'marlo'),
+        dense_shape=(2, 2))
+    with self.assertRaisesRegexp(ValueError, 'Bad dtype'):
+      fc._transform_features({'ids': strings, 'values': strings}, (column,))
+
+  def test_column_name_collision(self):
+    with self.assertRaisesRegexp(ValueError, r'Parse config.*already exists'):
+      fc.weighted_categorical_column(
+          categorical_column=fc.categorical_column_with_identity(
+              key='aaa', num_buckets=3),
+          weight_column_name='aaa')._parse_example_config()
+
+  def test_missing_weights(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('omar', 'stringer', 'marlo'),
+        dense_shape=(2, 2))
+    with self.assertRaisesRegexp(
+        ValueError, 'values is not in features dictionary'):
+      fc._transform_features({'ids': inputs}, (column,))
+
+  def test_get_sparse_tensors(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(0, 1, 0),
+        dense_shape=(2, 2))
+    weights = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(0.5, 1.0, 0.1),
+        dense_shape=(2, 2))
+    id_tensor, weight_tensor = fc._transform_features({
+        'ids': inputs,
+        'values': weights,
+    }, (column,))[column]
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array(inputs.values, dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_tensor.eval())
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=weights.indices,
+              values=np.array(weights.values, dtype=np.float32),
+              dense_shape=weights.dense_shape),
+          weight_tensor.eval())
+
+  def test_get_sparse_tensors_dense_input(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    weights = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(0.5, 1.0, 0.1),
+        dense_shape=(2, 2))
+    id_tensor, weight_tensor = fc._transform_features({
+        'ids': ((0, -1), (1, 0)),
+        'values': weights,
+    }, (column,))[column]
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=np.array((0, 1, 0), dtype=np.int64),
+              dense_shape=(2, 2)),
+          id_tensor.eval())
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=weights.indices,
+              values=np.array(weights.values, dtype=np.float32),
+              dense_shape=weights.dense_shape),
+          weight_tensor.eval())
+
+  def test_get_sparse_tensors_dense_weights(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(2, 1, 0),
+        dense_shape=(2, 2))
+    id_tensor, weight_tensor = fc._transform_features({
+        'ids': inputs,
+        'values': ((.5, 0.), (1., .1)),
+    }, (column,))[column]
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array(inputs.values, dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_tensor.eval())
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=np.array((.5, 1., .1), dtype=np.float32),
+              dense_shape=(2, 2)),
+          weight_tensor.eval())
+
+  def test_make_linear_model(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          'ids': sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=(0, 2, 1),
+              dense_shape=(2, 2)),
+          'values': sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=(.5, 1., .1),
+              dense_shape=(2, 2))
+      }, (column,))
+      bias = get_linear_model_bias()
+      weight_var = get_linear_model_column_var(column)
+      with _initialized_session():
+        self.assertAllClose((0.,), bias.eval())
+        self.assertAllClose(((0.,), (0.,), (0.,)), weight_var.eval())
+        self.assertAllClose(((0.,), (0.,)), predictions.eval())
+        weight_var.assign(((1.,), (2.,), (3.,))).eval()
+        # weight_var[0] * weights[0, 0] = 1 * .5 = .5
+        # weight_var[2] * weights[1, 0] + weight_var[1] * weights[1, 1]
+        # = 3*1 + 2*.1 = 3+.2 = 3.2
+        self.assertAllClose(((.5,), (3.2,)), predictions.eval())
+
+  def test_make_linear_model_mismatched_shape(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    with ops.Graph().as_default():
+      with self.assertRaisesRegexp(
+          ValueError, r'Dimensions.*are not compatible'):
+        fc.make_linear_model({
+            'ids': sparse_tensor.SparseTensorValue(
+                indices=((0, 0), (1, 0), (1, 1)),
+                values=(0, 2, 1),
+                dense_shape=(2, 2)),
+            'values': sparse_tensor.SparseTensorValue(
+                indices=((0, 0), (0, 1), (1, 0), (1, 1)),
+                values=(.5, 11., 1., .1),
+                dense_shape=(2, 2))
+        }, (column,))
+
+  def test_make_linear_model_mismatched_dense_values(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          'ids': sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=(0, 2, 1),
+              dense_shape=(2, 2)),
+          'values': ((.5,), (1.,))
+      }, (column,))
+      with _initialized_session():
+        with self.assertRaisesRegexp(errors.OpError, 'Incompatible shapes'):
+          predictions.eval()
+
+  def test_make_linear_model_mismatched_dense_shape(self):
+    column = fc.weighted_categorical_column(
+        categorical_column=fc.categorical_column_with_identity(
+            key='ids', num_buckets=3),
+        weight_column_name='values')
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          'ids': sparse_tensor.SparseTensorValue(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=(0, 2, 1),
+              dense_shape=(2, 2)),
+          'values': ((.5,), (1.,), (.1,))
+      }, (column,))
+      bias = get_linear_model_bias()
+      weight_var = get_linear_model_column_var(column)
+      with _initialized_session():
+        self.assertAllClose((0.,), bias.eval())
+        self.assertAllClose(((0.,), (0.,), (0.,)), weight_var.eval())
+        self.assertAllClose(((0.,), (0.,)), predictions.eval())
+        weight_var.assign(((1.,), (2.,), (3.,))).eval()
+        # weight_var[0] * weights[0, 0] = 1 * .5 = .5
+        # weight_var[2] * weights[1, 0] + weight_var[1] * weights[1, 1]
+        # = 3*1 + 2*.1 = 3+.2 = 3.2
+        self.assertAllClose(((.5,), (3.2,)), predictions.eval())
+
+  # TODO(ptucker): Add test with embedding of weighted categorical.
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From 58bc80f083ab78da82bd0fb000e1019d95f1b7cd Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 13:21:13 -0700
Subject: [PATCH 1194/1563] Add ability to pass example keys through estimator
 and return them in the inference dict for TensorForest estimator.

PiperOrigin-RevId: 155667839
---
 .../contrib/tensor_forest/client/random_forest.py  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/tensor_forest/client/random_forest.py b/tensorflow/contrib/tensor_forest/client/random_forest.py
index 01697df086..6ea1a10853 100644
--- a/tensorflow/contrib/tensor_forest/client/random_forest.py
+++ b/tensorflow/contrib/tensor_forest/client/random_forest.py
@@ -117,6 +117,7 @@ def get_model_fn(params,
                  graph_builder_class,
                  device_assigner,
                  weights_name=None,
+                 keys_name=None,
                  early_stopping_rounds=100,
                  num_trainers=1,
                  trainer_id=0,
@@ -130,6 +131,10 @@ def get_model_fn(params,
     if weights_name and weights_name in features:
       weights = features.pop(weights_name)
 
+    keys = None
+    if keys_name and keys_name in features:
+      keys = features.pop(keys_name)
+
     # If we're doing eval, optionally ignore device_assigner.
     # Also ignore device assigner if we're exporting (mode == INFER)
     dev_assn = device_assigner
@@ -153,6 +158,9 @@ def get_model_fn(params,
         inference[eval_metrics.FEATURE_IMPORTANCE_NAME] = (
             graph_builder.feature_importances())
 
+      if keys is not None:
+        inference[keys_name] = keys
+
     # labels might be None if we're doing prediction (which brings up the
     # question of why we force everything to adhere to a single model_fn).
     loss_deps = []
@@ -236,7 +244,7 @@ class TensorForestEstimator(estimator.Estimator):
 
   def __init__(self, params, device_assigner=None, model_dir=None,
                graph_builder_class=tensor_forest.RandomForestGraphs,
-               config=None, weights_name=None,
+               config=None, weights_name=None, keys_name=None,
                feature_engineering_fn=None,
                early_stopping_rounds=100,
                num_trainers=1, trainer_id=0,
@@ -260,6 +268,9 @@ class TensorForestEstimator(estimator.Estimator):
       weights_name: A string defining feature column name representing
         weights. Will be multiplied by the loss of the example. Used to
         downweight or boost examples during training.
+      keys_name: A string naming one of the features to strip out and
+        pass through into the inference/eval results dict.  Useful for
+        associating specific examples with their prediction.
       feature_engineering_fn: Feature engineering function. Takes features and
         labels which are the output of `input_fn` and returns features and
         labels which will be fed into the model.
@@ -284,6 +295,7 @@ class TensorForestEstimator(estimator.Estimator):
             graph_builder_class,
             device_assigner,
             weights_name=weights_name,
+            keys_name=keys_name,
             early_stopping_rounds=early_stopping_rounds,
             num_trainers=num_trainers,
             trainer_id=trainer_id,
-- 
GitLab


From 01822a426d44b18c311712005e451099761d3823 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Wed, 10 May 2017 13:30:45 -0700
Subject: [PATCH 1195/1563] Allows more properties in core RunConfig to be
 *mutated*.

Also improve the usability that if save_checkpoint_steps is mutated, the save_checkpoint_secs should be set as None, and vice verse.

Fixes #9795

PiperOrigin-RevId: 155668946
---
 .../python/learn/estimators/run_config.py     | 29 -------
 .../learn/estimators/run_config_test.py       | 27 -------
 tensorflow/python/estimator/run_config.py     | 78 +++++++++++++++---
 .../python/estimator/run_config_test.py       | 81 +++++++++++++++++++
 4 files changed, 149 insertions(+), 66 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 937664b116..7af1c541c6 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -298,35 +298,6 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     self._keep_checkpoint_every_n_hours = keep_checkpoint_every_n_hours
     self._model_dir = _get_model_dir(model_dir)
 
-  def replace(self, **kwargs):
-    """Returns a new instance of `RunConfig` replacing specified properties.
-
-    Only the properties in the following list are allowed to be replaced:
-      - `model_dir`,
-      - `tf_random_seed`,
-      - `save_summary_steps`,
-      - `save_checkpoints_steps`,
-      - `save_checkpoints_secs`,
-      - `session_config`,
-      - `keep_checkpoint_max`,
-      - `keep_checkpoint_every_n_hours`,
-
-    Args:
-      **kwargs: keyword named properties with new values.
-
-    Raises:
-      ValueError: If any property name in `kwargs` does not exist or is not
-        allowed to be replaced.
-
-    Returns:
-      a new instance of `RunConfig`.
-    """
-    # In addition to the _DEFAULT_UID_WHITE_LIST, also allow model_dir to be
-    # replaced, as most execution frameworks change it.
-    return super(RunConfig, self)._replace(
-        allowed_properties_list=['model_dir'] + _DEFAULT_UID_WHITE_LIST,
-        **kwargs)
-
   @experimental
   def uid(self, whitelist=None):
     """Generates a 'Unique Identifier' based on all internal fields.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index f7a7a7bd03..16e683d76d 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -256,33 +256,6 @@ class RunConfigTest(test.TestCase):
     self.assertEqual(RANDOM_SEED, new_config.tf_random_seed)
     self.assertEqual(RANDOM_SEED, config.tf_random_seed)
 
-  def test_replace_with_allowed_properties(self):
-    config = run_config_lib.RunConfig().replace(
-        tf_random_seed=11,
-        save_summary_steps=12,
-        save_checkpoints_steps=13,
-        save_checkpoints_secs=14,
-        session_config=15,
-        keep_checkpoint_max=16,
-        keep_checkpoint_every_n_hours=17)
-    self.assertEqual(11, config.tf_random_seed)
-    self.assertEqual(12, config.save_summary_steps)
-    self.assertEqual(13, config.save_checkpoints_steps)
-    self.assertEqual(14, config.save_checkpoints_secs)
-    self.assertEqual(15, config.session_config)
-    self.assertEqual(16, config.keep_checkpoint_max)
-    self.assertEqual(17, config.keep_checkpoint_every_n_hours)
-
-  def test_replace_with_disallowallowed_properties(self):
-    config = run_config_lib.RunConfig(
-        tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
-    with self.assertRaises(ValueError):
-      # tf_random_seed is not allowed to be replaced.
-      config.replace(master=MASTER)
-
-    with self.assertRaises(ValueError):
-      config.replace(some_undefined_property=RANDOM_SEED)
-
   def test_uid_for_different_configs(self):
     config = run_config_lib.RunConfig(
         tf_random_seed=RANDOM_SEED, model_dir=TEST_DIR)
diff --git a/tensorflow/python/estimator/run_config.py b/tensorflow/python/estimator/run_config.py
index 2b6237643d..2de168bd64 100644
--- a/tensorflow/python/estimator/run_config.py
+++ b/tensorflow/python/estimator/run_config.py
@@ -23,6 +23,43 @@ import copy
 import six
 
 
+# A list of the property names in RunConfig user allows to change.
+_DEFAULT_REPLACEABLE_LIST = [
+    'model_dir',
+    'tf_random_seed',
+    'save_summary_steps',
+    'save_checkpoints_steps',
+    'save_checkpoints_secs',
+    'session_config',
+    'keep_checkpoint_max',
+    'keep_checkpoint_every_n_hours',
+]
+
+_SAVE_CKPT_ERR = (
+    '`save_checkpoints_steps` and `save_checkpoints_secs` cannot be both set.'
+)
+
+
+def _validate_save_ckpt(new_copy, replaced_keys):
+  """Validates the save ckpt properties."""
+  # Ensure one (and only one) of save_steps and save_secs is not None.
+  # Also, if user sets one save ckpt property, say steps, the other one (secs)
+  # should be set as None to improve usability.
+
+  save_steps = new_copy.save_checkpoints_steps
+  save_secs = new_copy.save_checkpoints_secs
+  if ('save_checkpoints_steps' in replaced_keys and
+      'save_checkpoints_secs' in replaced_keys):
+    # If user sets both properties explicitly, we need to error out if both
+    # are set or neither of them are set.
+    if save_steps is not None and save_secs is not None:
+      raise ValueError(_SAVE_CKPT_ERR)
+  elif 'save_checkpoints_steps' in replaced_keys and save_steps is not None:
+    new_copy._save_checkpoints_secs = None  # pylint: disable=protected-access
+  elif 'save_checkpoints_secs' in replaced_keys and save_secs is not None:
+    new_copy._save_checkpoints_steps = None  # pylint: disable=protected-access
+
+
 class TaskType(object):
   MASTER = 'master'
   PS = 'ps'
@@ -34,6 +71,13 @@ class RunConfig(object):
 
   def __init__(self):
     self._model_dir = None
+    self._tf_random_seed = 1
+    self._save_summary_steps = 100
+    self._save_checkpoints_secs = 600
+    self._save_checkpoints_steps = None
+    self._session_config = None
+    self._keep_checkpoint_max = 5
+    self._keep_checkpoint_every_n_hours = 10000
 
   @property
   def cluster_spec(self):
@@ -69,31 +113,31 @@ class RunConfig(object):
 
   @property
   def tf_random_seed(self):
-    return 1
+    return self._tf_random_seed
 
   @property
   def save_summary_steps(self):
-    return 100
+    return self._save_summary_steps
 
   @property
   def save_checkpoints_secs(self):
-    return 600
+    return self._save_checkpoints_secs
 
   @property
   def session_config(self):
-    return None
+    return self._session_config
 
   @property
   def save_checkpoints_steps(self):
-    return None
+    return self._save_checkpoints_steps
 
   @property
   def keep_checkpoint_max(self):
-    return 5
+    return self._keep_checkpoint_max
 
   @property
   def keep_checkpoint_every_n_hours(self):
-    return 10000
+    return self._keep_checkpoint_every_n_hours
 
   @property
   def model_dir(self):
@@ -104,18 +148,30 @@ class RunConfig(object):
 
     Only the properties in the following list are allowed to be replaced:
       - `model_dir`.
+      - `tf_random_seed`,
+      - `save_summary_steps`,
+      - `save_checkpoints_steps`,
+      - `save_checkpoints_secs`,
+      - `session_config`,
+      - `keep_checkpoint_max`,
+      - `keep_checkpoint_every_n_hours`,
+
+    In addition, either `save_checkpoints_steps` or `save_checkpoints_secs`
+    can be set (should not be both).
 
     Args:
       **kwargs: keyword named properties with new values.
 
     Raises:
       ValueError: If any property name in `kwargs` does not exist or is not
-        allowed to be replaced.
+        allowed to be replaced, or both `save_checkpoints_steps` and
+        `save_checkpoints_secs` are set.
 
     Returns:
       a new instance of `RunConfig`.
     """
-    return self._replace(allowed_properties_list=['model_dir'], **kwargs)
+    return self._replace(
+        allowed_properties_list=_DEFAULT_REPLACEABLE_LIST, **kwargs)
 
   def _replace(self, allowed_properties_list=None, **kwargs):
     """See `replace`.
@@ -129,7 +185,8 @@ class RunConfig(object):
 
     Raises:
       ValueError: If any property name in `kwargs` does not exist or is not
-        allowed to be replaced.
+        allowed to be replaced, or both `save_checkpoints_steps` and
+        `save_checkpoints_secs` are set.
 
     Returns:
       a new instance of `RunConfig`.
@@ -148,4 +205,5 @@ class RunConfig(object):
           'Replacing {} is not supported. Allowed properties are {}.'.format(
               key, allowed_properties_list))
 
+    _validate_save_ckpt(new_copy, kwargs.keys())
     return new_copy
diff --git a/tensorflow/python/estimator/run_config_test.py b/tensorflow/python/estimator/run_config_test.py
index 3f83ae0c34..581322734a 100644
--- a/tensorflow/python/estimator/run_config_test.py
+++ b/tensorflow/python/estimator/run_config_test.py
@@ -24,10 +24,24 @@ from tensorflow.python.platform import test
 _TEST_DIR = 'test_dir'
 _MASTER = 'master_'
 _NOT_SUPPORTED_REPLACE_PROPERTY_MSG = 'Replacing .*is not supported'
+_SAVE_CKPT_ERR = (
+    '`save_checkpoints_steps` and `save_checkpoints_secs` cannot be both set.'
+)
 
 
 class RunConfigTest(test.TestCase):
 
+  def test_default_property_values(self):
+    config = run_config_lib.RunConfig()
+    self.assertIsNone(config.model_dir)
+    self.assertIsNone(config.session_config)
+    self.assertEqual(1, config.tf_random_seed)
+    self.assertEqual(100, config.save_summary_steps)
+    self.assertEqual(600, config.save_checkpoints_secs)
+    self.assertIsNone(config.save_checkpoints_steps)
+    self.assertEqual(5, config.keep_checkpoint_max)
+    self.assertEqual(10000, config.keep_checkpoint_every_n_hours)
+
   def test_model_dir(self):
     empty_config = run_config_lib.RunConfig()
     self.assertIsNone(empty_config.model_dir)
@@ -35,6 +49,29 @@ class RunConfigTest(test.TestCase):
     new_config = empty_config.replace(model_dir=_TEST_DIR)
     self.assertEqual(_TEST_DIR, new_config.model_dir)
 
+  def test_replace_with_allowed_properties(self):
+    config = run_config_lib.RunConfig().replace(
+        tf_random_seed=11,
+        save_summary_steps=12,
+        save_checkpoints_secs=14,
+        session_config=15,
+        keep_checkpoint_max=16,
+        keep_checkpoint_every_n_hours=17)
+    self.assertEqual(11, config.tf_random_seed)
+    self.assertEqual(12, config.save_summary_steps)
+    self.assertEqual(14, config.save_checkpoints_secs)
+    self.assertEqual(15, config.session_config)
+    self.assertEqual(16, config.keep_checkpoint_max)
+    self.assertEqual(17, config.keep_checkpoint_every_n_hours)
+
+  def test_replace_with_disallowallowed_properties(self):
+    config = run_config_lib.RunConfig()
+    with self.assertRaises(ValueError):
+      # tf_random_seed is not allowed to be replaced.
+      config.replace(master='_master')
+    with self.assertRaises(ValueError):
+      config.replace(some_undefined_property=123)
+
   def test_replace(self):
     config = run_config_lib.RunConfig()
 
@@ -48,5 +85,49 @@ class RunConfigTest(test.TestCase):
       config.replace(some_undefined_property=_MASTER)
 
 
+class RunConfigSaveCheckpointsTest(test.TestCase):
+
+  def test_save_checkpoint(self):
+    empty_config = run_config_lib.RunConfig()
+    self.assertEqual(600, empty_config.save_checkpoints_secs)
+    self.assertIsNone(empty_config.save_checkpoints_steps)
+
+    config_with_steps = empty_config.replace(save_checkpoints_steps=100)
+    del empty_config
+    self.assertEqual(100, config_with_steps.save_checkpoints_steps)
+    self.assertIsNone(config_with_steps.save_checkpoints_secs)
+
+    config_with_secs = config_with_steps.replace(save_checkpoints_secs=200)
+    del config_with_steps
+    self.assertEqual(200, config_with_secs.save_checkpoints_secs)
+    self.assertIsNone(config_with_secs.save_checkpoints_steps)
+
+  def test_save_checkpoint_both_steps_and_secs_are_not_none(self):
+    empty_config = run_config_lib.RunConfig()
+    with self.assertRaisesRegexp(ValueError, _SAVE_CKPT_ERR):
+      empty_config.replace(save_checkpoints_steps=100,
+                           save_checkpoints_secs=200)
+
+  def test_save_checkpoint_both_steps_and_secs_are_none(self):
+    config_with_secs = run_config_lib.RunConfig()
+    config_without_ckpt = config_with_secs.replace(
+        save_checkpoints_steps=None, save_checkpoints_secs=None)
+    self.assertIsNone(config_without_ckpt.save_checkpoints_steps)
+    self.assertIsNone(config_without_ckpt.save_checkpoints_secs)
+
+  def test_save_checkpoint_flip_secs_to_none(self):
+    config_with_secs = run_config_lib.RunConfig()
+    config_without_ckpt = config_with_secs.replace(save_checkpoints_secs=None)
+    self.assertIsNone(config_without_ckpt.save_checkpoints_steps)
+    self.assertIsNone(config_without_ckpt.save_checkpoints_secs)
+
+  def test_save_checkpoint_flip_steps_to_none(self):
+    config_with_steps = run_config_lib.RunConfig().replace(
+        save_checkpoints_steps=100)
+    config_without_ckpt = config_with_steps.replace(save_checkpoints_steps=None)
+    self.assertIsNone(config_without_ckpt.save_checkpoints_steps)
+    self.assertIsNone(config_without_ckpt.save_checkpoints_secs)
+
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From d61efef9e8c1b0abe369ab725534855d85d96dac Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 10 May 2017 13:34:00 -0700
Subject: [PATCH 1196/1563] Add a mechanism for ControlFlowContexts to notify
 outer contexts of nodes added in an inner context. [TF:XLA] Add checks for
 Ref types in encapsulate_subgraphs_pass. Add support for overriding the names
 of the functions generated by encapsulate_subgraphs_pass. Relax an
 over-zealous check when dumping a graph in function.cc

PiperOrigin-RevId: 155669293
---
 .../jit/encapsulate_subgraphs_pass.cc         | 41 +++++++++++++++----
 .../compiler/jit/encapsulate_subgraphs_pass.h |  8 +++-
 .../jit/encapsulate_subgraphs_pass_test.cc    | 33 ++++++++-------
 .../common_runtime/constant_folding_test.cc   |  1 +
 tensorflow/core/framework/function.cc         |  2 +-
 tensorflow/python/ops/control_flow_ops.py     | 29 +++++++++++--
 6 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
index 1d2793d3c5..decea97fc8 100644
--- a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
+++ b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
@@ -88,9 +88,12 @@ class Encapsulator {
 
   // Build a FunctionDef for each subgraph, and add it 'library'. The values of
   // the 'group_attribute' annotations become the function names.
+  // If 'reuse_existing_functions' is set, use an existing function with the
+  // same name, if any.
   // If 'rewrite_subgraph_fn' is set, it is applied to each subgraph before
   // function conversion.
   Status BuildFunctionDefs(const RewriteSubgraphFn& rewrite_subgraph_fn,
+                           bool reuse_existing_functions,
                            FunctionLibraryDefinition* library);
 
   // Write a copy of the input graph to 'graph_out', where the subgraphs are
@@ -236,9 +239,16 @@ Status Encapsulator::SplitIntoSubgraphs() {
         // Create a new _Retval node
         DataType dtype = edge->src()->output_type(edge->src_output());
 
+        if (IsRefType(dtype)) {
+          return errors::InvalidArgument(
+              "Ref Tensors (e.g., Variables) are not supported: tensor ",
+              edge->src()->name(), ":", edge->src_output());
+        }
+
         NodeDef ret_def;
         ret_def.set_op(kRetValOp);
-        ret_def.set_name(src_subgraph.graph->NewName("output"));
+        ret_def.set_name(strings::StrCat(edge->src()->name(), "_",
+                                         edge->src_output(), "_retval"));
         AddNodeAttr("T", dtype, &ret_def);
         AddNodeAttr("index", ret_index, &ret_def);
         Node* ret = src_subgraph.graph->AddNode(ret_def, &s);
@@ -263,8 +273,16 @@ Status Encapsulator::SplitIntoSubgraphs() {
         // This is the first time we have seen this tensor. Create an _Arg node.
         DataType dtype = edge->dst()->input_type(edge->dst_input());
 
+        if (IsRefType(dtype)) {
+          return errors::InvalidArgument(
+              "Ref Tensors (e.g., Variables) are not supported: tensor ",
+              edge->src()->name(), ":", edge->src_output());
+        }
+
         NodeDef arg_def;
-        NodeDefBuilder builder(dst_subgraph.graph->NewName("input"), kArgOp);
+        NodeDefBuilder builder(strings::StrCat(edge->src()->name(), "_",
+                                               edge->src_output(), "_arg"),
+                               kArgOp);
         builder.Attr("T", dtype);
         builder.Attr("index", arg_index);
         s = builder.Finalize(&arg_def);
@@ -291,11 +309,11 @@ Status Encapsulator::SplitIntoSubgraphs() {
 }
 
 Status Encapsulator::BuildFunctionDefs(
-    const RewriteSubgraphFn& rewrite_subgraph_fn,
+    const RewriteSubgraphFn& rewrite_subgraph_fn, bool reuse_existing_functions,
     FunctionLibraryDefinition* library) {
   // For each subgraph, build a FunctionDef.
   for (auto& subgraph_entry : subgraphs_) {
-    const string& name = subgraph_entry.first;
+    string name = subgraph_entry.first;
     Subgraph& subgraph = subgraph_entry.second;
 
     subgraph.call_node_def.set_op(name);
@@ -332,6 +350,8 @@ Status Encapsulator::BuildFunctionDefs(
       for (auto& result : subgraph.results) {
         result.second = output_permutation[result.second];
       }
+
+      name = subgraph.call_node_def.op();
     }
 
     FunctionDef fdef;
@@ -346,7 +366,9 @@ Status Encapsulator::BuildFunctionDefs(
           strings::StrCat("encapsulate_fdef_", name), fdef);
     }
 
-    TF_RETURN_IF_ERROR(library->AddFunctionDef(fdef));
+    if (!reuse_existing_functions || library->Find(name) == nullptr) {
+      TF_RETURN_IF_ERROR(library->AddFunctionDef(fdef));
+    }
   }
   return Status::OK();
 }
@@ -545,14 +567,16 @@ Status Encapsulator::BuildOutputGraph(bool parallel_checking,
 Status EncapsulateSubgraphsInFunctions(
     string group_attribute, const Graph& graph_in,
     const RewriteSubgraphFn& rewrite_subgraph_fn, bool parallel_checking,
-    std::unique_ptr<Graph>* graph_out, FunctionLibraryDefinition* library) {
+    bool reuse_existing_functions, std::unique_ptr<Graph>* graph_out,
+    FunctionLibraryDefinition* library) {
   Status s;
 
   Encapsulator encapsulator(std::move(group_attribute), &graph_in);
   s = encapsulator.SplitIntoSubgraphs();
   if (!s.ok()) return s;
 
-  s = encapsulator.BuildFunctionDefs(rewrite_subgraph_fn, library);
+  s = encapsulator.BuildFunctionDefs(rewrite_subgraph_fn,
+                                     reuse_existing_functions, library);
   if (!s.ok()) return s;
 
   std::unique_ptr<Graph> out(new Graph(library));
@@ -674,7 +698,8 @@ Status EncapsulateSubgraphsPass::Run(
 
   TF_RETURN_IF_ERROR(EncapsulateSubgraphsInFunctions(
       kXlaClusterAttr, **options.graph, rewrite_subgraph,
-      flags->tf_xla_parallel_checking, &graph_out, library));
+      flags->tf_xla_parallel_checking, /*reuse_existing_functions=*/false,
+      &graph_out, library));
 
   if (VLOG_IS_ON(1)) {
     dump_graph::DumpGraphToFile("after_encapsulate_subgraphs", *graph_out,
diff --git a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.h b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.h
index 3ca7dfbf6a..b0987f76c9 100644
--- a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.h
+++ b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.h
@@ -34,6 +34,8 @@ namespace tensorflow {
 // 'input_permutation' and 'output_permutation' are initialized to the identity
 // permutation. 'nodedef' is the NodeDef for the call to the function under
 // construction, provided to allow additional attributes to be set.
+// The rewrite may also change the NodeDef's operator name, and that
+// name will be used as the name of the generated function.
 typedef std::function<Status(
     std::unique_ptr<Graph>* graph, std::vector<int>* input_permutation,
     std::vector<int>* output_permutation, NodeDef* node_def)>
@@ -53,6 +55,9 @@ typedef std::function<Status(
 // output graph, together with a "ParallelCheck" operator, that verifies that
 // the original and encapsulated subgraphs produce similar results.
 //
+// If 'reuse_existing_functions' is set, use an existing function with the
+// same name, if any.
+//
 // TODO(phawkins): currently, some information in control edges
 // is not preserved. Suppose you have A and B in the main
 // graph, C and D in a subgraph. B and C have control deps from A, D has control
@@ -61,7 +66,8 @@ typedef std::function<Status(
 Status EncapsulateSubgraphsInFunctions(
     string group_attribute, const Graph& graph_in,
     const RewriteSubgraphFn& rewrite_subgraph_fn, bool parallel_checking,
-    std::unique_ptr<Graph>* graph_out, FunctionLibraryDefinition* library);
+    bool reuse_existing_functions, std::unique_ptr<Graph>* graph_out,
+    FunctionLibraryDefinition* library);
 
 // The attribute that marks function calls produced by the encapsulate
 // subgraphs pass and that should in turn be compiled via _XlaLaunch operators.
diff --git a/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc b/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc
index bce534684a..a8869c8e2a 100644
--- a/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc
+++ b/tensorflow/compiler/jit/encapsulate_subgraphs_pass_test.cc
@@ -76,7 +76,7 @@ bool EqualFunctionDefLibrary(const FunctionDefLibrary& expected,
 #define TF_EXPECT_FUNCTIONDEFLIBRARY_EQ(expected, actual)         \
   do {                                                            \
     string diff;                                                  \
-    EXPECT_TRUE(EqualFunctionDefLibrary(actual, expected, &diff)) \
+    EXPECT_TRUE(EqualFunctionDefLibrary(expected, actual, &diff)) \
         << diff << "\nActual: " << actual.DebugString();          \
   } while (false)
 
@@ -144,8 +144,9 @@ Status Encapsulate(GraphDef* graphdef, FunctionDefLibrary* library) {
 
   std::unique_ptr<Graph> graph_out;
   s = EncapsulateSubgraphsInFunctions("_encapsulate", *graph,
-                                      /* rewrite_subgraph_fn= */ {},
-                                      /* parallel_checking= */ false,
+                                      /*rewrite_subgraph_fn=*/{},
+                                      /*parallel_checking=*/false,
+                                      /*reuse_existing_functions=*/false,
                                       &graph_out, lib_def.get());
   if (!s.ok()) return s;
 
@@ -205,12 +206,12 @@ TEST(EncapsulateSubgraphsTest, OneFunction) {
 
   *library_expected.add_function() = test::function::XTimesTwo();
   *library_expected.add_function() = FunctionDefHelper::Create(
-      "F1", {"input__0:float", "input__1:float"}, {"output__2:float"}, {},
+      "F1", {"a_0_arg:float", "b_0_arg:float"}, {"c_0_retval:float"}, {},
       {
-          {{"C"}, "UnaryTest", {"input__0"}},
-          {{"c"}, "BinaryTest", {"input__1", "C:o:0"}, {}, {"C"}},
+          {{"C"}, "UnaryTest", {"a_0_arg"}},
+          {{"c"}, "BinaryTest", {"b_0_arg", "C:o:0"}, {}, {"C"}},
       },
-      {{"output__2", "c:o:0"}});
+      {{"c_0_retval", "c:o:0"}});
 
   {
     std::unique_ptr<FunctionLibraryDefinition> lib_def(
@@ -261,17 +262,17 @@ TEST(EncapsulateSubgraphsTest, TwoFunctions) {
 
   *library_expected.add_function() = test::function::XTimesTwo();
   *library_expected.add_function() = FunctionDefHelper::Create(
-      "F1", {"input__0:float"}, {"output__1:float"}, {},
+      "F1", {"a_0_arg:float"}, {"c_0_retval:float"}, {},
       {
-          {{"C"}, "UnaryTest", {"input__0"}},
+          {{"C"}, "UnaryTest", {"a_0_arg"}},
       },
-      {{"output__1", "C:o:0"}});
+      {{"c_0_retval", "C:o:0"}});
   *library_expected.add_function() = FunctionDefHelper::Create(
-      "F2", {"input__0:float", "input__1:float"}, {"output__2:float"}, {},
+      "F2", {"b_0_arg:float", "c_0_arg:float"}, {"d_0_retval:float"}, {},
       {
-          {{"D"}, "BinaryTest", {"input__0", "input__1"}},
+          {{"D"}, "BinaryTest", {"b_0_arg", "c_0_arg"}},
       },
-      {{"output__2", "D:o:0"}});
+      {{"d_0_retval", "D:o:0"}});
 
   {
     std::unique_ptr<FunctionLibraryDefinition> lib_def(
@@ -340,7 +341,8 @@ TEST(EncapsulateSubgraphsTest, InputDeduplication) {
   std::unique_ptr<Graph> graph;
   TF_ASSERT_OK(EncapsulateSubgraphsInFunctions(
       "_cluster", graph_before_encapsulation, /*rewrite_subgraph_fn=*/{},
-      /*parallel_checking=*/false, &graph, &library));
+      /*parallel_checking=*/false, /*reuse_existing_functions=*/false, &graph,
+      &library));
 
   std::vector<string> expected_nodes = {"cluster1", "cluster2", "mul", "x"};
   EXPECT_EQ(expected_nodes, GraphNodes(*graph));
@@ -371,7 +373,8 @@ TEST(EncapsulateSubgraphsTest, ParallelChecking) {
   std::unique_ptr<Graph> graph;
   TF_ASSERT_OK(EncapsulateSubgraphsInFunctions(
       "_cluster", graph_before_encapsulation, /*rewrite_subgraph_fn=*/{},
-      /*parallel_checking=*/true, &graph, &library));
+      /*parallel_checking=*/true, /*reuse_existing_functions=*/false, &graph,
+      &library));
 
   std::vector<string> expected_nodes = {
       "add1", "add2", "cluster1", "cluster1_parallel_check/_0",
diff --git a/tensorflow/core/common_runtime/constant_folding_test.cc b/tensorflow/core/common_runtime/constant_folding_test.cc
index e45490ee06..9cc761a771 100644
--- a/tensorflow/core/common_runtime/constant_folding_test.cc
+++ b/tensorflow/core/common_runtime/constant_folding_test.cc
@@ -282,6 +282,7 @@ TEST_F(ConstantFoldingTest, TestNoReplaceFunctionCall) {
     Status status;
     Node* times_two = s.graph()->AddNode(def, &status);
     TF_ASSERT_OK(status);
+    s.graph()->AddEdge(c.node(), 0, times_two, 0);
 
     auto times_two_send =
         ops::_Send(s.WithOpName("times_two_send"), Output(times_two),
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index 9c47c1da2f..f46bb6e2ed 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -590,7 +590,7 @@ string Print(const GraphDef& gdef) {
   for (size_t i = 0; i < ret.size(); ++i) {
     const NodeDef* n = ret[i];
     if (i > 0) strings::StrAppend(&out, ", ");
-    CHECK_EQ(2, n->attr_size());
+    CHECK_LE(2, n->attr_size());
     CHECK_EQ(1, n->input_size());
     strings::StrAppend(&out, n->input(0), ":", get_type(*n));
   }
diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index 7ee4ca0307..4380f916e2 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -1463,6 +1463,14 @@ class ControlFlowContext(object):
     return internal_control_inputs
   # pylint: enable=protected-access
 
+  def AddInnerOp(self, op):
+    """Notifies a scope about an operator added to an inner scope."""
+    pass
+
+  def GetControlPivot(self):
+    """Returns the pivot node for this context, or None."""
+    return None
+
 
 class CondContext(ControlFlowContext):
   """The context for the conditional construct."""
@@ -2097,6 +2105,8 @@ class WhileContext(ControlFlowContext):
         enter = _Enter(result, self._name, is_constant=True,
                        parallel_iterations=self._parallel_iterations)
         enter.graph.prevent_feeding(enter)
+        if self._outer_context:
+          self._outer_context.AddInnerOp(enter.op)
       # Fix the control inputs and control flow context of these enter ops.
       self._FixControlInputsAndContext([enter])
 
@@ -2166,6 +2176,9 @@ class WhileContext(ControlFlowContext):
       for x in op.outputs:
         op.graph.prevent_feeding(x)
 
+    if self._outer_context:
+      self._outer_context.AddInnerOp(op)
+
   def _MaybeAddControlDependency(self, op):
     """Add a control input to the op if it only depends on loop invariants."""
     def _IsOpFree(op):
@@ -2479,13 +2492,23 @@ class WhileContext(ControlFlowContext):
                     for x in real_vars]
       for x in enter_vars:
         x.graph.prevent_feeding(x)
+        if self._outer_context:
+          self._outer_context.AddInnerOp(x.op)
+
+    # Finds the closest enclosing non-None control pivot.
+    outer_context = self._outer_context
+    control_pivot = None
+    while outer_context is not None and control_pivot is None:
+      control_pivot = outer_context.GetControlPivot()
+      # pylint: disable=protected-access
+      outer_context = outer_context._outer_context
+      # pylint: enable=protected-access
 
-    if self._outer_context:
-      control_pivot = self._outer_context.GetControlPivot().op
+    if control_pivot is not None:
       for var in enter_vars:
         if _IsLoopConstantEnter(var.op.inputs[0].op):
           # pylint: disable=protected-access
-          var.op._add_control_input(control_pivot)
+          var.op._add_control_input(control_pivot.op)
           # pylint: enable=protected-access
     _SetShapeInvariants(real_vars, enter_vars, shape_invariants)
 
-- 
GitLab


From f200cbd5229d9e0378fc679153e291fb9ff202f3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 13:44:07 -0700
Subject: [PATCH 1197/1563] Add support for _RealValuedVarLenColumn to
 {sequence_}input_from_feature_columns.

PiperOrigin-RevId: 155670564
---
 .../layers/python/layers/feature_column.py    |  9 +++++
 .../python/layers/feature_column_ops.py       |  3 +-
 .../python/layers/feature_column_ops_test.py  | 40 +++++++++++++++----
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 917c07398f..4329e22f48 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -1649,6 +1649,15 @@ class _RealValuedVarLenColumn(_FeatureColumn, collections.namedtuple(
     input_tensor = self._normalized_input_tensor(columns_to_tensors[self.name])
     columns_to_tensors[self] = math_ops.to_float(input_tensor)
 
+  # pylint: disable=unused-argument
+  def _to_dnn_input_layer(self,
+                          input_tensor,
+                          weight_collections=None,
+                          trainable=True,
+                          output_rank=2):
+    return _reshape_real_valued_tensor(
+        self._to_dense_tensor(input_tensor), output_rank, self.name)
+
   def _to_dense_tensor(self, input_tensor):
     if not self.is_sparse:
       return input_tensor
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops.py b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
index d010ae6df1..fa0047f05d 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops.py
@@ -856,7 +856,8 @@ def _add_variable_collection(weight_collections):
 # pylint: disable=protected-access
 _SUPPORTED_SEQUENCE_COLUMNS = (fc._OneHotColumn,
                                fc._EmbeddingColumn,
-                               fc._RealValuedColumn)
+                               fc._RealValuedColumn,
+                               fc._RealValuedVarLenColumn)
 
 _FORBIDDEN_SEQUENCE_COLUMNS = (fc._ScatteredEmbeddingColumn,
                                fc._BucketizedColumn,
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index 5e69d41621..a9698163dd 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -633,16 +633,27 @@ class CreateInputLayersForDNNsTest(test.TestCase):
                           fc_core.make_input_layer(features,
                                                    [real_valued]).eval())
 
-  def testRealValuedColumnSparse(self):
-    sparse_real_valued = feature_column._real_valued_var_len_column(
+  def testRealValuedColumnDense(self):
+    var_len_real_valued = feature_column._real_valued_var_len_column(
         "rating", default_value=-1)
-    rating = [[2.0], [-1.0], [5.0]]
+    rating = np.array([[0., 1., 2., -1.],
+                       [3., 4., 5., 6.]])
     features = {"rating": constant_op.constant(rating)}
-    with self.assertRaisesRegexp(
-        ValueError,
-        "Error creating input layer for column: rating.*"):
-      feature_column_ops.input_from_feature_columns(features,
-                                                    [sparse_real_valued])
+    with self.test_session() as sess:
+      output = sess.run(feature_column_ops.input_from_feature_columns(
+          features, [var_len_real_valued]))
+    self.assertAllClose(rating, output)
+
+  def testRealValuedColumnTypeConversion(self):
+    var_len_real_valued = feature_column._real_valued_var_len_column(
+        "rating", default_value=-1)
+    rating = np.array([[0, 1, 2, -1],
+                       [3, 4, 5, 6]])
+    features = {"rating": constant_op.constant(rating, dtype=dtypes.int64)}
+    with self.test_session() as sess:
+      output = sess.run(feature_column_ops.input_from_feature_columns(
+          features, [var_len_real_valued]))
+    self.assertAllClose(rating.astype(np.float32), output)
 
   def testRealValuedColumnWithNormalizer(self):
     real_valued = feature_column.real_valued_column(
@@ -1267,6 +1278,19 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
       model_inputs = sess.run(model_input_tensor)
     self.assertAllClose(measurement_input, model_inputs)
 
+  def testRealValuedVarLenColumn(self):
+    var_len_real_valued = feature_column._real_valued_var_len_column(
+        "rating", default_value=-1)
+    rating = np.array([[0., 1., 2., -1.],
+                       [3., 4., 5., 6.]])
+    features = {"rating": constant_op.constant(rating)}
+    with self.test_session() as sess:
+      output = sess.run(
+          feature_column_ops.sequence_input_from_feature_columns(
+              features, [var_len_real_valued]))
+    reshaped_rating = np.reshape(rating, [2, 4, 1])
+    self.assertAllClose(reshaped_rating, output)
+
   def testRealValuedColumnWithExtraDimensions(self):
     batch_size = 4
     sequence_length = 8
-- 
GitLab


From ab2a1e37c681e9f5f248e3efbaf15a5935c8901a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 14:07:00 -0700
Subject: [PATCH 1198/1563] Merged commit includes the following changes:
 155673782  by ashankar <ashankar@google.com>:

    Windows: Fix bazel builds on Jenkins.

    PR #9580 added TF_NEED_MKL as an argument to the
    configure script. So that needs to be set before
    invoking it on Windows.

--
155671008  by A. Unique TensorFlower <gardener@tensorflow.org>:

    Internal change.

--

PiperOrigin-RevId: 155673782
---
 tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh b/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
index 1488e8d78c..f76c1add24 100644
--- a/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
+++ b/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
@@ -175,6 +175,9 @@ function run_configure_for_cpu_build {
   if [ -z "$CC_OPT_FLAGS" ]; then
     export CC_OPT_FLAGS="-march=native"
   fi
+  if [ -z "$TF_NEED_MKL" ]; then
+    export TF_NEED_MKL=0
+  fi
   echo "" | ./configure
 }
 
-- 
GitLab


From 2526394fb49f42f2eeb74cf85baecf0787b9f291 Mon Sep 17 00:00:00 2001
From: Koan-Sin Tan <koansin.tan@gmail.com>
Date: Thu, 11 May 2017 15:13:54 +0800
Subject: [PATCH 1199/1563] There is no --logtostderror

There is not --logtostderror option. Remove them.
And there should be no backslash in --transforms=...
---
 tensorflow/tools/graph_transforms/README.md               | 7 ++-----
 tensorflow/tools/graph_transforms/summarize_graph_main.cc | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index 9bb438fa71..7e8c51efe6 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -215,7 +215,7 @@ bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --out_graph=optimized_inception_graph.pb \
 --inputs='Mul' \
 --outputs='softmax' \
---transforms='\
+--transforms='
   strip_unused_nodes(type=float, shape="1,299,299,3")
   fold_constants(ignore_errors=true)
   fold_batch_norms
@@ -431,12 +431,11 @@ graph:
 ```bash
 bazel build tensorflow/tools/graph_transforms:transform_graph
 bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
---logtostderr \
 --in_graph=/tmp/quantized_inception.pb \
 --out_graph=/tmp/logged_quantized_inception.pb \
 --inputs=Mul \
 --outputs=softmax \
---transforms='\
+--transforms='
 insert_logging(op=RequantizationRange, show_name=true, message="__requant_min_max:")\
 '
 ```
@@ -450,12 +449,10 @@ log:
 bazel build tensorflow/examples/label_image:label_image
 bazel-bin/tensorflow/examples/label_image/label_image \
 --image=${HOME}/Downloads/grace_hopper.jpg \
---logtostderr \
 --input_layer=Mul \
 --output_layer=softmax \
 --graph=/tmp/logged_quantized_inception.pb \
 --labels=${HOME}/Downloads/imagenet_comp_graph_label_strings.txt \
---logtostderr \
 2>/tmp/min_max_log_small.txt
 ```
 
diff --git a/tensorflow/tools/graph_transforms/summarize_graph_main.cc b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
index b893465fd9..baeb769bfa 100644
--- a/tensorflow/tools/graph_transforms/summarize_graph_main.cc
+++ b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
@@ -94,7 +94,6 @@ void PrintBenchmarkUsage(const std::vector<const NodeDef*> placeholders,
   std::cout << "bazel run tensorflow/tools/benchmark:benchmark_model --";
   std::cout << " --graph=" << graph_path;
   std::cout << " --show_flops";
-  std::cout << " --logtostderr";
   std::cout << " --input_layer=" << input_layer_value;
   std::cout << " --input_layer_type=" << input_layer_type_value;
   std::cout << " --input_layer_shape=" << input_layer_shape_value;
-- 
GitLab


From 770a27161bf9e73860443f62ab539833d39d61b4 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 10 May 2017 15:47:55 -0700
Subject: [PATCH 1200/1563] Introduce one-off solution for vulcanization

This is a simple Java script that inlines HTML, CSS, and JavaScript
with minification. It tries its best to preserve @license data.

The Skylark rule behaves the same as web_library(). It can be bazel
run to get the development web server. It outputs the protobuf, because
protobuf is awesome.

PiperOrigin-RevId: 155686060
---
 WORKSPACE                                     |   8 +-
 tensorflow/BUILD                              |   1 +
 .../tensorflow/tensorboard/vulcanize/BUILD    |  23 ++
 .../tensorboard/vulcanize/Vulcanize.java      | 317 ++++++++++++++++++
 tensorflow/tensorboard/vulcanize.bzl          | 100 ++++++
 5 files changed, 445 insertions(+), 4 deletions(-)
 create mode 100644 tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
 create mode 100644 tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java
 create mode 100644 tensorflow/tensorboard/vulcanize.bzl

diff --git a/WORKSPACE b/WORKSPACE
index b4c80d7aad..7ebb1d488c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,11 +2,11 @@ workspace(name = "org_tensorflow")
 
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "0e38269c55536196c9b0c82a601c683f114901acb6d55f214e0179a3e188ef2a",
-    strip_prefix = "rules_closure-1762d8e6964b9f383b47a57888e55489d2432b61",
+    sha256 = "4be8a887f6f38f883236e77bb25c2da10d506f2bf1a8e5d785c0f35574c74ca4",
+    strip_prefix = "rules_closure-aac19edc557aec9b603cd7ffe359401264ceff0d",
     urls = [
-        "http://bazel-mirror.storage.googleapis.com/github.com/bazelbuild/rules_closure/archive/1762d8e6964b9f383b47a57888e55489d2432b61.tar.gz",  # 2017-05-08
-        "https://github.com/bazelbuild/rules_closure/archive/1762d8e6964b9f383b47a57888e55489d2432b61.tar.gz",
+        "http://bazel-mirror.storage.googleapis.com/github.com/bazelbuild/rules_closure/archive/aac19edc557aec9b603cd7ffe359401264ceff0d.tar.gz",  # 2017-05-10
+        "https://github.com/bazelbuild/rules_closure/archive/aac19edc557aec9b603cd7ffe359401264ceff0d.tar.gz",
     ],
 )
 
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index c4bfb97e5e..981e913f9b 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -366,6 +366,7 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_sorting:all_files",
         "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/components/vz_sorting_d3v4:all_files",
+        "//tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
diff --git a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
new file mode 100644
index 0000000000..07fc3a70a7
--- /dev/null
+++ b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
@@ -0,0 +1,23 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+java_binary(
+    name = "Vulcanize",
+    srcs = ["Vulcanize.java"],
+    deps = [
+        "@com_google_guava",
+        "@com_google_protobuf_java",
+        "@io_bazel_rules_closure//closure/compiler",
+        "@io_bazel_rules_closure//java/io/bazel/rules/closure:webpath",
+        "@io_bazel_rules_closure//java/io/bazel/rules/closure/webfiles:build_info_java_proto",
+        "@io_bazel_rules_closure//java/org/jsoup/nodes",
+        "@org_jsoup",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java
new file mode 100644
index 0000000000..e572415856
--- /dev/null
+++ b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java
@@ -0,0 +1,317 @@
+// Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.tensorflow.tensorboard.vulcanize;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.javascript.jscomp.BasicErrorManager;
+import com.google.javascript.jscomp.CheckLevel;
+import com.google.javascript.jscomp.Compiler;
+import com.google.javascript.jscomp.CompilerOptions;
+import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
+import com.google.javascript.jscomp.CompilerOptions.Reach;
+import com.google.javascript.jscomp.JSError;
+import com.google.javascript.jscomp.PropertyRenamingPolicy;
+import com.google.javascript.jscomp.SourceFile;
+import com.google.javascript.jscomp.VariableRenamingPolicy;
+import com.google.protobuf.TextFormat;
+import io.bazel.rules.closure.Webpath;
+import io.bazel.rules.closure.webfiles.BuildInfo.Webfiles;
+import io.bazel.rules.closure.webfiles.BuildInfo.WebfilesSource;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Comment;
+import org.jsoup.nodes.DataNode;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Html5Printer;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.jsoup.parser.Parser;
+import org.jsoup.parser.Tag;
+
+/** Simple one-off solution for TensorBoard vulcanization. */
+public final class Vulcanize {
+
+  private static final Parser parser = Parser.htmlParser();
+  private static final Map<Webpath, Path> webfiles = new HashMap<>();
+  private static final Set<Webpath> alreadyInlined = new HashSet<>();
+  private static final Set<String> legalese = new HashSet<>();
+  private static final List<String> licenses = new ArrayList<>();
+  private static final List<Webpath> stack = new ArrayList<>();
+  private static Webpath outputPath;
+  private static Node licenseComment;
+  private static boolean nominify;
+
+  public static void main(String[] args) throws IOException {
+    Webpath inputPath = Webpath.get(args[0]);
+    outputPath = Webpath.get(args[1]);
+    Path output = Paths.get(args[2]);
+    for (int i = 3; i < args.length; i++) {
+      Webfiles manifest = loadWebfilesPbtxt(Paths.get(args[i]));
+      for (WebfilesSource src : manifest.getSrcList()) {
+        webfiles.put(Webpath.get(src.getWebpath()), Paths.get(src.getPath()));
+      }
+    }
+    stack.add(inputPath);
+    Document document = parse(Files.readAllBytes(webfiles.get(inputPath)));
+    transform(document);
+    if (licenseComment != null) {
+      licenseComment.attr("comment", String.format("\n%s\n", Joiner.on("\n\n").join(licenses)));
+    }
+    Files.write(
+        output,
+        Html5Printer.stringify(document).getBytes(UTF_8),
+        StandardOpenOption.WRITE,
+        StandardOpenOption.CREATE,
+        StandardOpenOption.TRUNCATE_EXISTING);
+  }
+
+  private static void transform(Node root) throws IOException {
+    Node node = checkNotNull(root);
+    Node newNode;
+    while (true) {
+      newNode = enterNode(node);
+      if (node.equals(root)) {
+        root = newNode;
+      }
+      node = newNode;
+      if (node.childNodeSize() > 0) {
+        node = node.childNode(0);
+      } else {
+        while (true) {
+          newNode = leaveNode(node);
+          if (node.equals(root)) {
+            root = newNode;
+          }
+          node = newNode;
+          if (node.equals(root)) {
+            return;
+          }
+          Node next = node.nextSibling();
+          if (next == null) {
+            if (node.parentNode() == null) {
+              return;
+            }
+            node = verifyNotNull(node.parentNode(), "unexpected root: %s", node);
+          } else {
+            node = next;
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  private static Node enterNode(Node node) throws IOException {
+    Node newNode = node;
+    if (node instanceof Element) {
+      if (node.nodeName().equals("link") && node.attr("rel").equals("import")) {
+        // Inline HTML.
+        Webpath href = me().lookup(Webpath.get(node.attr("href")));
+        if (alreadyInlined.add(href)) {
+          newNode =
+              parse(Files.readAllBytes(checkNotNull(webfiles.get(href), "%s in %s", href, me())));
+          stack.add(href);
+          node.replaceWith(newNode);
+        } else {
+          newNode = new TextNode("", node.baseUri());
+          node.replaceWith(newNode);
+        }
+      } else if (node.nodeName().equals("script")) {
+        nominify = node.hasAttr("nominify");
+        node.removeAttr("nominify");
+        Webpath src;
+        String script;
+        if (node.attr("src").isEmpty()) {
+          // Minify JavaScript.
+          StringBuilder sb = new StringBuilder();
+          for (Node child : node.childNodes()) {
+            if (child instanceof DataNode) {
+              sb.append(((DataNode) child).getWholeData());
+            }
+          }
+          src = me();
+          script = sb.toString();
+        } else {
+          // Inline JavaScript.
+          src = me().lookup(Webpath.get(node.attr("src")));
+          Path other = webfiles.get(src);
+          if (other != null) {
+            script = new String(Files.readAllBytes(other), UTF_8);
+            node.removeAttr("src");
+          } else {
+            src = me();
+            script = "";
+          }
+        }
+        script = minify(src, script);
+        newNode =
+            new Element(Tag.valueOf("script"), node.baseUri(), node.attributes())
+                .appendChild(new DataNode(script, node.baseUri()));
+        node.replaceWith(newNode);
+      } else if (node.nodeName().equals("link")
+          && node.attr("rel").equals("stylesheet")
+          && !node.attr("href").isEmpty()) {
+        // Inline CSS.
+        Webpath href = me().lookup(Webpath.get(node.attr("href")));
+        Path other = webfiles.get(href);
+        if (other != null) {
+          newNode =
+              new Element(Tag.valueOf("style"), node.baseUri(), node.attributes())
+                  .appendChild(
+                      new DataNode(new String(Files.readAllBytes(other), UTF_8), node.baseUri()));
+          newNode.removeAttr("rel");
+          newNode.removeAttr("href");
+          node.replaceWith(newNode);
+        }
+      }
+      rootifyAttribute(newNode, "href");
+      rootifyAttribute(newNode, "src");
+      rootifyAttribute(newNode, "action");
+      rootifyAttribute(newNode, "assetpath");
+    } else if (node instanceof Comment) {
+      String text = ((Comment) node).getData();
+      if (text.contains("@license")) {
+        handleLicense(text);
+        if (licenseComment == null) {
+          licenseComment = node;
+        } else {
+          newNode = new TextNode("", node.baseUri());
+          node.replaceWith(newNode);
+        }
+      } else {
+        newNode = new TextNode("", node.baseUri());
+        node.replaceWith(newNode);
+      }
+    }
+    return newNode;
+  }
+
+  private static String minify(Webpath src, String script) {
+    if (nominify) {
+      return script;
+    }
+    Compiler compiler = new Compiler(new JsPrintlessErrorManager());
+    CompilerOptions options = new CompilerOptions();
+    options.skipAllCompilerPasses(); // too lazy to get externs
+    options.setLanguageIn(LanguageMode.ECMASCRIPT_2016);
+    options.setLanguageOut(LanguageMode.ECMASCRIPT5);
+    options.setContinueAfterErrors(true);
+    options.setManageClosureDependencies(false);
+    options.setRenamingPolicy(VariableRenamingPolicy.LOCAL, PropertyRenamingPolicy.OFF);
+    options.setShadowVariables(true);
+    options.setInlineVariables(Reach.LOCAL_ONLY);
+    options.setFlowSensitiveInlineVariables(true);
+    options.setInlineFunctions(Reach.LOCAL_ONLY);
+    options.setAssumeClosuresOnlyCaptureReferences(false);
+    options.setCheckGlobalThisLevel(CheckLevel.OFF);
+    options.setFoldConstants(true);
+    options.setCoalesceVariableNames(true);
+    options.setDeadAssignmentElimination(true);
+    options.setCollapseVariableDeclarations(true);
+    options.setConvertToDottedProperties(true);
+    options.setLabelRenaming(true);
+    options.setRemoveDeadCode(true);
+    options.setOptimizeArgumentsArray(true);
+    options.setRemoveUnusedVariables(Reach.LOCAL_ONLY);
+    options.setCollapseObjectLiterals(true);
+    options.setProtectHiddenSideEffects(true);
+    //options.setPrettyPrint(true);
+    compiler.disableThreads();
+    compiler.compile(
+        ImmutableList.<SourceFile>of(),
+        ImmutableList.of(SourceFile.fromCode(src.toString(), script)),
+        options);
+    return compiler.toSource();
+  }
+
+  private static void handleLicense(String text) {
+    if (legalese.add(CharMatcher.whitespace().removeFrom(text))) {
+      licenses.add(CharMatcher.anyOf("\r\n").trimFrom(text));
+    }
+  }
+
+  private static Node leaveNode(Node node) {
+    if (node instanceof Document) {
+      stack.remove(stack.size() - 1);
+    }
+    return node;
+  }
+
+  private static Webpath me() {
+    return Iterables.getLast(stack);
+  }
+
+  private static void rootifyAttribute(Node node, String attribute) {
+    String value = node.attr(attribute);
+    if (value.isEmpty()) {
+      return;
+    }
+    Webpath uri = Webpath.get(value);
+    if (webfiles.containsKey(uri)) {
+      node.attr(attribute, outputPath.getParent().relativize(uri).toString());
+    }
+  }
+
+  private static Document parse(byte[] bytes) {
+    return parse(new ByteArrayInputStream(bytes));
+  }
+
+  private static Document parse(InputStream input) {
+    Document document;
+    try {
+      document = Jsoup.parse(input, null, "", parser);
+    } catch (IOException e) {
+      throw new AssertionError("I/O error when parsing byte array D:", e);
+    }
+    document.outputSettings().indentAmount(0);
+    document.outputSettings().prettyPrint(false);
+    return document;
+  }
+
+  private static Webfiles loadWebfilesPbtxt(Path path) throws IOException {
+    Webfiles.Builder build = Webfiles.newBuilder();
+    TextFormat.getParser().merge(new String(Files.readAllBytes(path), UTF_8), build);
+    return build.build();
+  }
+
+  private static final class JsPrintlessErrorManager extends BasicErrorManager {
+
+    @Override
+    public void println(CheckLevel level, JSError error) {}
+
+    @Override
+    public void printSummary() {}
+  }
+}
diff --git a/tensorflow/tensorboard/vulcanize.bzl b/tensorflow/tensorboard/vulcanize.bzl
new file mode 100644
index 0000000000..f7d88047af
--- /dev/null
+++ b/tensorflow/tensorboard/vulcanize.bzl
@@ -0,0 +1,100 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("@io_bazel_rules_closure//closure/private:defs.bzl", "unfurl", "long_path")
+
+def _tensorboard_html_binary(ctx):
+  deps = unfurl(ctx.attr.deps, provider="webfiles")
+  manifests = set(order="link")
+  files = set()
+  for dep in deps:
+    manifests += dep.webfiles.manifests
+    files += dep.data_runfiles.files
+
+  # vulcanize
+  ctx.action(
+      inputs=list(manifests + files),
+      outputs=[ctx.outputs.html],
+      executable=ctx.executable._Vulcanize,
+      arguments=([ctx.attr.input_path,
+                  ctx.attr.output_path,
+                  ctx.outputs.html.path] +
+                 [m.path for m in manifests]),
+      progress_message="Vulcanizing %s" % ctx.attr.input_path)
+
+  # webfiles manifest
+  manifest_srcs = [struct(path=ctx.outputs.html.path,
+                          longpath=long_path(ctx, ctx.outputs.html),
+                          webpath=ctx.attr.output_path)]
+  manifest = ctx.new_file(ctx.configuration.bin_dir,
+                          "%s.pbtxt" % ctx.label.name)
+  ctx.file_action(
+      output=manifest,
+      content=struct(
+          label=str(ctx.label),
+          src=manifest_srcs).to_proto())
+  manifests += [manifest]
+
+  # webfiles server
+  params = struct(
+      label=str(ctx.label),
+      bind="[::]:6006",
+      manifest=[long_path(ctx, man) for man in manifests],
+      external_asset=[struct(webpath=k, path=v)
+                      for k, v in ctx.attr.external_assets.items()])
+  params_file = ctx.new_file(ctx.configuration.bin_dir,
+                             "%s_server_params.pbtxt" % ctx.label.name)
+  ctx.file_action(output=params_file, content=params.to_proto())
+  ctx.file_action(
+      executable=True,
+      output=ctx.outputs.executable,
+      content="#!/bin/sh\nexec %s %s" % (
+          ctx.executable._WebfilesServer.short_path,
+          long_path(ctx, params_file)))
+
+  transitive_runfiles = set()
+  transitive_runfiles += ctx.attr._WebfilesServer.data_runfiles.files
+  for dep in deps:
+    transitive_runfiles += dep.data_runfiles.files
+  return struct(
+      files=set([ctx.outputs.html]),
+      runfiles=ctx.runfiles(
+          files=ctx.files.data + [manifest,
+                                  params_file,
+                                  ctx.outputs.html,
+                                  ctx.outputs.executable],
+          transitive_files=transitive_runfiles))
+
+tensorboard_html_binary = rule(
+    implementation=_tensorboard_html_binary,
+    executable=True,
+    attrs={
+        "input_path": attr.string(mandatory=True),
+        "output_path": attr.string(mandatory=True),
+        "data": attr.label_list(cfg="data", allow_files=True),
+        "deps": attr.label_list(providers=["webfiles"], mandatory=True),
+        "external_assets": attr.string_dict(default={"/_/runfiles": "."}),
+        "_Vulcanize": attr.label(
+            default=Label("//tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize:Vulcanize"),
+            executable=True,
+            cfg="host"),
+        "_WebfilesServer": attr.label(
+            default=Label(
+                "@io_bazel_rules_closure//java/io/bazel/rules/closure/webfiles/server:WebfilesServer"),
+            executable=True,
+            cfg="host"),
+    },
+    outputs={
+        "html": "%{name}.html",
+    })
-- 
GitLab


From e09b0b6ebf6bfea5157a7e8b65b9070e56c1c5f2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 16:03:02 -0700
Subject: [PATCH 1201/1563] Move crossed_column to core.

PiperOrigin-RevId: 155687697
---
 .../python/feature_column/feature_column.py   | 187 +++++++++++++
 .../feature_column/feature_column_test.py     | 256 ++++++++++++++++++
 2 files changed, 443 insertions(+)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 8ce3878d8c..391f3123ac 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -607,6 +607,18 @@ def bucketized_column(source_column, boundaries):
   dense_tensor = make_input_layer(features, columns)
   ```
 
+  `bucketized_column` can also be crossed with another categorical column using
+  `crossed_column`:
+  ```python
+  price = numeric_column('price')
+  # bucketized_column converts numerical feature to a categorical one.
+  bucketized_price = bucketized_column(price, boundaries=[...])
+  # 'keywords' is a string feature.
+  price_x_keywords = crossed_column([bucketized_price, 'keywords'], 50K)
+  all_feature_columns = [price_x_keywords, ...]
+  linear_prediction = make_linear_model(features, all_feature_columns)
+  ```
+
   Args:
     source_column: A one-dimensional dense column which is generated with
       `numeric_column`.
@@ -1036,6 +1048,107 @@ def weighted_categorical_column(
       dtype=dtype)
 
 
+def crossed_column(keys, hash_bucket_size, hash_key=None):
+  """Returns a column for performing crosses of categorical features.
+
+  Crossed features will be hashed according to `hash_bucket_size`. Conceptually,
+  the transformation can be thought of as:
+    Hash(cartesian product of features) % `hash_bucket_size`
+
+  For example, if the input features are:
+  * SparseTensor referred by first key: shape = [2, 2]
+      [0, 0]: "a"
+      [1, 0]: "b"
+      [1, 1]: "c"
+
+  * SparseTensor referred by second key: shape = [2, 1]
+      [0, 0]: "d"
+      [1, 0]: "e"
+
+  then crossed feature will look like:
+      shape = [2, 2]
+      [0, 0]: Hash64("d", Hash64("a")) % hash_bucket_size
+      [1, 0]: Hash64("e", Hash64("b")) % hash_bucket_size
+      [1, 1]: Hash64("e", Hash64("c")) % hash_bucket_size
+
+  Here is an example to create a linear model with crosses of string features:
+  ```python
+  keywords_x_doc_terms = crossed_column(['keywords', 'doc_terms'], 50K)
+  all_feature_columns = [keywords_x_doc_terms, ...]
+  linear_prediction = make_linear_model(features, all_feature_columns)
+  ```
+
+  You could also use vocabulary lookup before crossing:
+  ```python
+  keywords = categorical_column_with_vocabulary_file(
+      'keywords', '/path/to/vocabulary/file', vocabulary_size=1K)
+  keywords_x_doc_terms = crossed_column([keywords, 'doc_terms'], 50K)
+  all_feature_columns = [keywords_x_doc_terms, ...]
+  linear_prediction = make_linear_model(features, all_feature_columns)
+  ```
+
+  If an input feature is of numeric type, you can use
+  `categorical_column_with_identity`, or `bucketized_column`, as in the example:
+  ```python
+  # vertical_id is an integer categorical feature.
+  vertical_id = categorical_column_with_identity('vertical_id', 10K)
+  price = numeric_column('price')
+  # bucketized_column converts numerical feature to a categorical one.
+  bucketized_price = bucketized_column(price, boundaries=[...])
+  vertical_id_x_price = crossed_column([vertical_id, bucketized_price], 50K)
+  all_feature_columns = [vertical_id_x_price, ...]
+  linear_prediction = make_linear_model(features, all_feature_columns)
+  ```
+
+  To use crossed column in DNN model, you need to add it in an embedding column
+  as in this example:
+  ```python
+  vertical_id_x_price = crossed_column([vertical_id, bucketized_price], 50K)
+  vertical_id_x_price_embedded = embedding_column(vertical_id_x_price, 10)
+  dense_tensor = make_input_layer(features, [vertical_id_x_price_embedded, ...])
+  ```
+
+  Args:
+    keys: An iterable identifying the features to be crossed. Each element can
+      be either:
+      * string: Will use the corresponding feature which must be of string type.
+      * `_CategoricalColumn`: Will use the transformed tensor produced by this
+        column. Does not support hashed categorical column.
+    hash_bucket_size: An int > 1. The number of buckets.
+    hash_key: Specify the hash_key that will be used by the `FingerprintCat64`
+      function to combine the crosses fingerprints on SparseCrossOp (optional).
+
+  Returns:
+    A `_CrossedColumn`.
+
+  Raises:
+    ValueError: If `len(keys) < 2`.
+    ValueError: If any of the keys is neither a string nor `_CategoricalColumn`.
+    ValueError: If any of the keys is `_HashedCategoricalColumn`.
+    ValueError: If `hash_bucket_size < 1`.
+  """
+  if not hash_bucket_size or hash_bucket_size < 1:
+    raise ValueError('hash_bucket_size must be > 1. '
+                     'hash_bucket_size: {}'.format(hash_bucket_size))
+  if not keys or len(keys) < 2:
+    raise ValueError(
+        'keys must be a list with length > 1. Given: {}'.format(keys))
+  for key in keys:
+    if (not isinstance(key, six.string_types) and
+        not isinstance(key, _CategoricalColumn)):
+      raise ValueError(
+          'Unsupported key type. All keys must be either string, or '
+          'categorical column except _HashedCategoricalColumn. '
+          'Given: {}'.format(key))
+    if isinstance(key, _HashedCategoricalColumn):
+      raise ValueError(
+          '_HashedCategoricalColumn is not supported. Instead, use the feature '
+          'name as a string. Given: {}'.format(key))
+  return _CrossedColumn(
+      keys=tuple(keys), hash_bucket_size=hash_bucket_size,
+      hash_key=hash_key)
+
+
 class _FeatureColumn(object):
   """Represents a feature column abstraction.
 
@@ -1969,6 +2082,80 @@ class _WeightedCategoricalColumn(
     return _CategoricalColumn.IdWeightPair(tensors[0], tensors[1])
 
 
+class _CrossedColumn(
+    _CategoricalColumn,
+    collections.namedtuple('_CrossedColumn',
+                           ['keys', 'hash_bucket_size', 'hash_key'])):
+  """See `crossed_column`."""
+
+  @property
+  def name(self):
+    feature_names = []
+    for key in _collect_leaf_level_keys(self):
+      if isinstance(key, _FeatureColumn):
+        feature_names.append(key.name)
+      else:  # key must be a string
+        feature_names.append(key)
+    return '_X_'.join(sorted(feature_names))
+
+  @property
+  def _parse_example_config(self):
+    config = {}
+    for key in self.keys:
+      if isinstance(key, _FeatureColumn):
+        config.update(key._parse_example_config)  # pylint: disable=protected-access
+      else:  # key must be a string
+        config.update({key: parsing_ops.VarLenFeature(dtypes.string)})
+    return config
+
+  def _transform_feature(self, inputs):
+    feature_tensors = []
+    for key in _collect_leaf_level_keys(self):
+      if isinstance(key, six.string_types):
+        feature_tensors.append(inputs.get(key))
+      elif isinstance(key, _CategoricalColumn):
+        ids_and_weights = key._get_sparse_tensors(inputs)  # pylint: disable=protected-access
+        if ids_and_weights.weight_tensor is not None:
+          raise ValueError(
+              'crossed_column does not support weight_tensor, but the given '
+              'column populates weight_tensor. '
+              'Given column: {}'.format(key.name))
+        feature_tensors.append(ids_and_weights.id_tensor)
+      else:
+        raise ValueError('Unsupported column type. Given: {}'.format(key))
+    return sparse_ops._sparse_cross_hashed(  # pylint: disable=protected-access
+        inputs=feature_tensors,
+        num_buckets=self.hash_bucket_size,
+        hash_key=self.hash_key)
+
+  @property
+  def _num_buckets(self):
+    """Returns number of buckets in this sparse feature."""
+    return self.hash_bucket_size
+
+  def _get_sparse_tensors(self, inputs, weight_collections=None,
+                          trainable=None):
+    return _CategoricalColumn.IdWeightPair(inputs.get(self), None)
+
+
+def _collect_leaf_level_keys(cross):
+  """Collects base keys by expanding all nested crosses.
+
+  Args:
+    cross: A `_CrossedColumn`.
+
+  Returns:
+    A list of strings or `_CategoricalColumn` instances.
+  """
+  leaf_level_keys = []
+  for k in cross.keys:
+    if isinstance(k, _CrossedColumn):
+      leaf_level_keys.extend(_collect_leaf_level_keys(k))
+    else:
+      leaf_level_keys.append(k)
+  return leaf_level_keys
+
+
 # TODO(zakaria): Move this to embedding_ops and make it public.
 def _safe_embedding_lookup_sparse(embedding_weights,
                                   sparse_ids,
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 388e8a2d01..b09c01d266 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -735,6 +735,262 @@ class HashedCategoricalColumnTest(test.TestCase):
         self.assertAllClose(((4.,), (6.,)), predictions.eval())
 
 
+class CrossedColumnTest(test.TestCase):
+
+  def test_keys_empty(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'keys must be a list with length > 1'):
+      fc.crossed_column([], 10)
+
+  def test_keys_length_one(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'keys must be a list with length > 1'):
+      fc.crossed_column(['a'], 10)
+
+  def test_key_type_unsupported(self):
+    with self.assertRaisesRegexp(ValueError, 'Unsupported key type'):
+      fc.crossed_column(['a', fc.numeric_column('c')], 10)
+
+    with self.assertRaisesRegexp(
+        ValueError, '_HashedCategoricalColumn is not supported'):
+      fc.crossed_column(
+          ['a', fc.categorical_column_with_hash_bucket('c', 10)], 10)
+
+  def test_hash_bucket_size_negative(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'hash_bucket_size must be > 1'):
+      fc.crossed_column(['a', 'c'], -1)
+
+  def test_hash_bucket_size_zero(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'hash_bucket_size must be > 1'):
+      fc.crossed_column(['a', 'c'], 0)
+
+  def test_hash_bucket_size_none(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'hash_bucket_size must be > 1'):
+      fc.crossed_column(['a', 'c'], None)
+
+  def test_name(self):
+    a = fc.numeric_column('a', dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    crossed1 = fc.crossed_column(['d1', 'd2'], 10)
+
+    crossed2 = fc.crossed_column([b, 'c', crossed1], 10)
+    self.assertEqual('a_bucketized_X_c_X_d1_X_d2', crossed2.name)
+
+  def test_name_ordered_alphabetically(self):
+    """Tests that the name does not depend on the order of given columns."""
+    a = fc.numeric_column('a', dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    crossed1 = fc.crossed_column(['d1', 'd2'], 10)
+
+    crossed2 = fc.crossed_column([crossed1, 'c', b], 10)
+    self.assertEqual('a_bucketized_X_c_X_d1_X_d2', crossed2.name)
+
+  def test_name_leaf_keys_ordered_alphabetically(self):
+    """Tests that the name does not depend on the order of given columns."""
+    a = fc.numeric_column('a', dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    crossed1 = fc.crossed_column(['d2', 'c'], 10)
+
+    crossed2 = fc.crossed_column([crossed1, 'd1', b], 10)
+    self.assertEqual('a_bucketized_X_c_X_d1_X_d2', crossed2.name)
+
+  def test_parse_config(self):
+    a = fc.numeric_column('a', shape=[2], dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    crossed = fc.crossed_column([b, 'c'], 10)
+    self.assertEqual({
+        'a': parsing_ops.FixedLenFeature((2,), dtype=dtypes.int32),
+        'c': parsing_ops.VarLenFeature(dtypes.string),
+    }, crossed._parse_example_config)
+
+  def test_num_buckets(self):
+    a = fc.numeric_column('a', shape=[2], dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    crossed = fc.crossed_column([b, 'c'], 15)
+    self.assertEqual(15, crossed._num_buckets)
+
+  def test_deep_copy(self):
+    a = fc.numeric_column('a', dtype=dtypes.int32)
+    b = fc.bucketized_column(a, boundaries=[0, 1])
+    crossed1 = fc.crossed_column(['d1', 'd2'], 10)
+    crossed2 = fc.crossed_column([b, 'c', crossed1], 15, hash_key=5)
+    crossed2_copy = copy.deepcopy(crossed2)
+    self.assertEqual('a_bucketized_X_c_X_d1_X_d2', crossed2_copy.name,)
+    self.assertEqual(15, crossed2_copy.hash_bucket_size)
+    self.assertEqual(5, crossed2_copy.hash_key)
+
+  def test_parse_example(self):
+    price = fc.numeric_column('price', shape=[2])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 50])
+    price_cross_wire = fc.crossed_column([bucketized_price, 'wire'], 10)
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'price':
+                feature_pb2.Feature(float_list=feature_pb2.FloatList(
+                    value=[20., 110.])),
+            'wire':
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=[b'omar', b'stringer'])),
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=price_cross_wire._parse_example_config)
+    self.assertIn('price', features)
+    self.assertIn('wire', features)
+    with self.test_session():
+      self.assertAllEqual([[20., 110.]], features['price'].eval())
+      wire_sparse = features['wire']
+      self.assertAllEqual([[0, 0], [0, 1]], wire_sparse.indices.eval())
+      # Use byte constants to pass the open-source test.
+      self.assertAllEqual([b'omar', b'stringer'], wire_sparse.values.eval())
+      self.assertAllEqual([1, 2], wire_sparse.dense_shape.eval())
+
+  def test_get_sparse_tensors(self):
+    a = fc.numeric_column('a', dtype=dtypes.int32, shape=(2,))
+    b = fc.bucketized_column(a, boundaries=(0, 1))
+    crossed1 = fc.crossed_column(['d1', 'd2'], 10)
+    crossed2 = fc.crossed_column([b, 'c', crossed1], 15, hash_key=5)
+    with ops.Graph().as_default():
+      builder = fc._LazyBuilder({
+          'a': constant_op.constant(((-1., .5), (.5, 1.))),
+          'c': sparse_tensor.SparseTensor(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=['cA', 'cB', 'cC'],
+              dense_shape=(2, 2)),
+          'd1': sparse_tensor.SparseTensor(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=['d1A', 'd1B', 'd1C'],
+              dense_shape=(2, 2)),
+          'd2': sparse_tensor.SparseTensor(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=['d2A', 'd2B', 'd2C'],
+              dense_shape=(2, 2)),
+      })
+      id_weight_pair = crossed2._get_sparse_tensors(builder)
+      with _initialized_session():
+        id_tensor_eval = id_weight_pair.id_tensor.eval()
+        self.assertAllEqual(
+            ((0, 0), (0, 1), (1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5),
+             (1, 6), (1, 7), (1, 8), (1, 9), (1, 10), (1, 11), (1, 12), (1, 13),
+             (1, 14), (1, 15)),
+            id_tensor_eval.indices)
+        # Check exact hashed output. If hashing changes this test will break.
+        # All values are within [0, hash_bucket_size).
+        expected_values = (
+            6, 14, 0, 13, 8, 8, 10, 12, 2, 0, 1, 9, 8, 12, 2, 0, 10, 11)
+        self.assertAllEqual(expected_values, id_tensor_eval.values)
+        self.assertAllEqual((2, 16), id_tensor_eval.dense_shape)
+
+  def test_get_sparse_tensors_simple(self):
+    """Same as test_get_sparse_tensors, but with simpler values."""
+    a = fc.numeric_column('a', dtype=dtypes.int32, shape=(2,))
+    b = fc.bucketized_column(a, boundaries=(0, 1))
+    crossed = fc.crossed_column([b, 'c'], hash_bucket_size=5, hash_key=5)
+    with ops.Graph().as_default():
+      builder = fc._LazyBuilder({
+          'a': constant_op.constant(((-1., .5), (.5, 1.))),
+          'c': sparse_tensor.SparseTensor(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=['cA', 'cB', 'cC'],
+              dense_shape=(2, 2)),
+      })
+      id_weight_pair = crossed._get_sparse_tensors(builder)
+      with _initialized_session():
+        id_tensor_eval = id_weight_pair.id_tensor.eval()
+        self.assertAllEqual(
+            ((0, 0), (0, 1), (1, 0), (1, 1), (1, 2), (1, 3)),
+            id_tensor_eval.indices)
+        # Check exact hashed output. If hashing changes this test will break.
+        # All values are within [0, hash_bucket_size).
+        expected_values = (1, 0, 1, 3, 4, 2)
+        self.assertAllEqual(expected_values, id_tensor_eval.values)
+        self.assertAllEqual((2, 4), id_tensor_eval.dense_shape)
+
+  def test_make_linear_model(self):
+    """Tests make_linear_model.
+
+    Uses data from test_get_sparse_tesnsors_simple.
+    """
+    a = fc.numeric_column('a', dtype=dtypes.int32, shape=(2,))
+    b = fc.bucketized_column(a, boundaries=(0, 1))
+    crossed = fc.crossed_column([b, 'c'], hash_bucket_size=5, hash_key=5)
+    with ops.Graph().as_default():
+      predictions = fc.make_linear_model({
+          'a': constant_op.constant(((-1., .5), (.5, 1.))),
+          'c': sparse_tensor.SparseTensor(
+              indices=((0, 0), (1, 0), (1, 1)),
+              values=['cA', 'cB', 'cC'],
+              dense_shape=(2, 2)),
+      }, (crossed,))
+      bias = get_linear_model_bias()
+      crossed_var = get_linear_model_column_var(crossed)
+      with _initialized_session() as sess:
+        self.assertAllClose((0.,), bias.eval())
+        self.assertAllClose(
+            ((0.,), (0.,), (0.,), (0.,), (0.,)), crossed_var.eval())
+        self.assertAllClose(((0.,), (0.,)), predictions.eval())
+        sess.run(crossed_var.assign(((1.,), (2.,), (3.,), (4.,), (5.,))))
+        # Expected ids after cross = (1, 0, 1, 3, 4, 2)
+        self.assertAllClose(((3.,), (14.,)), predictions.eval())
+        sess.run(bias.assign((.1,)))
+        self.assertAllClose(((3.1,), (14.1,)), predictions.eval())
+
+  def test_make_linear_model_with_weights(self):
+    class _TestColumnWithWeights(fc._CategoricalColumn):
+      """Produces sparse IDs and sparse weights."""
+
+      @property
+      def name(self):
+        return 'test_column'
+
+      @property
+      def _parse_example_config(self):
+        return {
+            self.name: parsing_ops.VarLenFeature(dtypes.int32),
+            '{}_weights'.format(self.name): parsing_ops.VarLenFeature(
+                dtypes.float32),
+            }
+
+      @property
+      def _num_buckets(self):
+        return 5
+
+      def _transform_feature(self, inputs):
+        return (inputs.get(self.name),
+                inputs.get('{}_weights'.format(self.name)))
+
+      def _get_sparse_tensors(self, inputs, weight_collections=None,
+                              trainable=None):
+        """Populates both id_tensor and weight_tensor."""
+        ids_and_weights = inputs.get(self)
+        return fc._CategoricalColumn.IdWeightPair(
+            id_tensor=ids_and_weights[0], weight_tensor=ids_and_weights[1])
+
+    t = _TestColumnWithWeights()
+    crossed = fc.crossed_column([t, 'c'], hash_bucket_size=5, hash_key=5)
+    with ops.Graph().as_default():
+      with self.assertRaisesRegexp(
+          ValueError,
+          'crossed_column does not support weight_tensor.*{}'.format(t.name)):
+        fc.make_linear_model({
+            t.name: sparse_tensor.SparseTensor(
+                indices=((0, 0), (1, 0), (1, 1)),
+                values=[0, 1, 2],
+                dense_shape=(2, 2)),
+            '{}_weights'.format(t.name): sparse_tensor.SparseTensor(
+                indices=((0, 0), (1, 0), (1, 1)),
+                values=[1., 10., 2.],
+                dense_shape=(2, 2)),
+            'c': sparse_tensor.SparseTensor(
+                indices=((0, 0), (1, 0), (1, 1)),
+                values=['cA', 'cB', 'cC'],
+                dense_shape=(2, 2)),
+        }, (crossed,))
+
+
 def get_linear_model_bias():
   with variable_scope.variable_scope('make_linear_model', reuse=True):
     return variable_scope.get_variable('bias_weights')
-- 
GitLab


From c4c22e756888bc46846a09004e3b4986768da606 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 10 May 2017 16:26:10 -0700
Subject: [PATCH 1202/1563] tfdbg CLI: add initial support for command "run
 -p": profiler mode

Accompanying changes:
* In list_profile / lp output, let the time unit be consistent across all ops, so that the results are easier to read.
* Add the --time_unit option flag to list_profile / lp.
* Add start time to the lp output table; allow sorting by start time.

PiperOrigin-RevId: 155690128
---
 tensorflow/python/debug/cli/cli_shared.py     | 35 ++++++++++--
 .../python/debug/cli/cli_shared_test.py       | 20 +++++++
 .../python/debug/cli/profile_analyzer_cli.py  | 53 ++++++++++++++-----
 .../debug/cli/profile_analyzer_cli_test.py    | 44 ++++++++++++++-
 .../python/debug/examples/examples_test.sh    |  3 +-
 tensorflow/python/debug/wrappers/framework.py | 44 +++++++++++----
 tensorflow/python/debug/wrappers/hooks.py     |  2 +
 .../debug/wrappers/local_cli_wrapper.py       | 28 ++++++++--
 .../debug/wrappers/local_cli_wrapper_test.py  | 21 +++++++-
 9 files changed, 215 insertions(+), 35 deletions(-)

diff --git a/tensorflow/python/debug/cli/cli_shared.py b/tensorflow/python/debug/cli/cli_shared.py
index 3deb6dbad6..9164e18bcf 100644
--- a/tensorflow/python/debug/cli/cli_shared.py
+++ b/tensorflow/python/debug/cli/cli_shared.py
@@ -44,6 +44,11 @@ COLOR_RED = "red"
 COLOR_WHITE = "white"
 COLOR_YELLOW = "yellow"
 
+TIME_UNIT_US = "us"
+TIME_UNIT_MS = "ms"
+TIME_UNIT_S = "s"
+TIME_UNITS = [TIME_UNIT_US, TIME_UNIT_MS, TIME_UNIT_S]
+
 
 def bytes_to_readable_str(num_bytes, include_b=False):
   """Generate a human-readable string representing number of bytes.
@@ -75,12 +80,32 @@ def bytes_to_readable_str(num_bytes, include_b=False):
   return result
 
 
-def time_to_readable_str(value):
-  if not value:
+def time_to_readable_str(value_us, force_time_unit=None):
+  """Convert time value to human-readable string.
+
+  Args:
+    value_us: time value in microseconds.
+    force_time_unit: force the output to use the specified time unit. Must be
+      in TIME_UNITS.
+
+  Returns:
+    Human-readable string representation of the time value.
+
+  Raises:
+    ValueError: if force_time_unit value is not in TIME_UNITS.
+  """
+  if not value_us:
     return "0"
-  suffixes = ["us", "ms", "s"]
-  order = min(len(suffixes) - 1, int(math.log(value, 10) / 3))
-  return "{:.3g}{}".format(value / math.pow(10.0, 3*order), suffixes[order])
+  if force_time_unit:
+    if force_time_unit not in TIME_UNITS:
+      raise ValueError("Invalid time unit: %s" % force_time_unit)
+    order = TIME_UNITS.index(force_time_unit)
+    time_unit = force_time_unit
+    return "{:.10g}{}".format(value_us / math.pow(10.0, 3*order), time_unit)
+  else:
+    order = min(len(TIME_UNITS) - 1, int(math.log(value_us, 10) / 3))
+    time_unit = TIME_UNITS[order]
+    return "{:.3g}{}".format(value_us / math.pow(10.0, 3*order), time_unit)
 
 
 def parse_ranges_highlight(ranges_string):
diff --git a/tensorflow/python/debug/cli/cli_shared_test.py b/tensorflow/python/debug/cli/cli_shared_test.py
index fde1d66998..647bbd5f0f 100644
--- a/tensorflow/python/debug/cli/cli_shared_test.py
+++ b/tensorflow/python/debug/cli/cli_shared_test.py
@@ -84,6 +84,26 @@ class TimeToReadableStrTest(test_util.TensorFlowTestCase):
   def testSecondTime(self):
     self.assertEqual("40s", cli_shared.time_to_readable_str(40e6))
 
+  def testForceTimeUnit(self):
+    self.assertEqual("40s",
+                     cli_shared.time_to_readable_str(
+                         40e6, force_time_unit=cli_shared.TIME_UNIT_S))
+    self.assertEqual("40000ms",
+                     cli_shared.time_to_readable_str(
+                         40e6, force_time_unit=cli_shared.TIME_UNIT_MS))
+    self.assertEqual("40000000us",
+                     cli_shared.time_to_readable_str(
+                         40e6, force_time_unit=cli_shared.TIME_UNIT_US))
+    self.assertEqual("4e-05s",
+                     cli_shared.time_to_readable_str(
+                         40, force_time_unit=cli_shared.TIME_UNIT_S))
+    self.assertEqual("0",
+                     cli_shared.time_to_readable_str(
+                         0, force_time_unit=cli_shared.TIME_UNIT_S))
+
+    with self.assertRaisesRegexp(ValueError, r"Invalid time unit: ks"):
+      cli_shared.time_to_readable_str(100, force_time_unit="ks")
+
 
 class GetRunStartIntroAndDescriptionTest(test_util.TensorFlowTestCase):
 
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
index 42440521eb..520d472c5c 100644
--- a/tensorflow/python/debug/cli/profile_analyzer_cli.py
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli.py
@@ -50,6 +50,7 @@ class ProfileDatum(object):
     self.node_exec_stats = node_exec_stats
     self.file_line = file_line
     self.op_type = op_type
+    self.start_time = self.node_exec_stats.all_start_micros
     self.op_time = (self.node_exec_stats.op_end_rel_micros -
                     self.node_exec_stats.op_start_rel_micros)
 
@@ -62,31 +63,45 @@ class ProfileDatum(object):
 class ProfileDataTableView(object):
   """Table View of profiling data."""
 
-  def __init__(self, profile_datum_list):
+  def __init__(self, profile_datum_list, time_unit=cli_shared.TIME_UNIT_US):
     """Constructor.
 
     Args:
       profile_datum_list: List of `ProfileDatum` objects.
+      time_unit: must be in cli_shared.TIME_UNITS.
     """
     self._profile_datum_list = profile_datum_list
+    self.formatted_start_time = [
+        datum.start_time for datum in profile_datum_list]
     self.formatted_op_time = [
-        cli_shared.time_to_readable_str(datum.op_time)
+        cli_shared.time_to_readable_str(datum.op_time,
+                                        force_time_unit=time_unit)
         for datum in profile_datum_list]
     self.formatted_exec_time = [
         cli_shared.time_to_readable_str(
-            datum.node_exec_stats.all_end_rel_micros)
+            datum.node_exec_stats.all_end_rel_micros,
+            force_time_unit=time_unit)
         for datum in profile_datum_list]
-    self._column_sort_ids = [SORT_OPS_BY_OP_NAME, SORT_OPS_BY_OP_TIME,
-                             SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE]
+
+    self._column_names = ["Node",
+                          "Start Time (us)",
+                          "Op Time (%s)" % time_unit,
+                          "Exec Time (%s)" % time_unit,
+                          "Filename:Lineno(function)"]
+    self._column_sort_ids = [SORT_OPS_BY_OP_NAME, SORT_OPS_BY_START_TIME,
+                             SORT_OPS_BY_OP_TIME, SORT_OPS_BY_EXEC_TIME,
+                             SORT_OPS_BY_LINE]
 
   def value(self, row, col):
     if col == 0:
       return self._profile_datum_list[row].node_exec_stats.node_name
     elif col == 1:
-      return self.formatted_op_time[row]
+      return self.formatted_start_time[row]
     elif col == 2:
-      return self.formatted_exec_time[row]
+      return self.formatted_op_time[row]
     elif col == 3:
+      return self.formatted_exec_time[row]
+    elif col == 4:
       return self._profile_datum_list[row].file_line
     else:
       raise IndexError("Invalid column index %d." % col)
@@ -95,10 +110,10 @@ class ProfileDataTableView(object):
     return len(self._profile_datum_list)
 
   def column_count(self):
-    return 4
+    return len(self._column_names)
 
   def column_names(self):
-    return ["Node", "Op Time", "Exec Time", "Filename:Lineno(function)"]
+    return self._column_names
 
   def column_sort_id(self, col):
     return self._column_sort_ids[col]
@@ -246,6 +261,12 @@ class ProfileAnalyzer(object):
         dest="reverse",
         action="store_true",
         help="sort the data in reverse (descending) order")
+    ap.add_argument(
+        "--time_unit",
+        dest="time_unit",
+        type=str,
+        default=cli_shared.TIME_UNIT_US,
+        help="Time unit (" + " | ".join(cli_shared.TIME_UNITS) + ")")
 
     self._arg_parsers["list_profile"] = ap
 
@@ -294,7 +315,7 @@ class ProfileAnalyzer(object):
         output.extend(
             self._get_list_profile_lines(
                 device_stats.device, index, device_count,
-                profile_data, parsed.sort_by, parsed.reverse))
+                profile_data, parsed.sort_by, parsed.reverse, parsed.time_unit))
     return output
 
   def _get_profile_data_generator(self):
@@ -328,7 +349,7 @@ class ProfileAnalyzer(object):
 
   def _get_list_profile_lines(
       self, device_name, device_index, device_count,
-      profile_datum_list, sort_by, sort_reverse):
+      profile_datum_list, sort_by, sort_reverse, time_unit):
     """Get `RichTextLines` object for list_profile command for a given device.
 
     Args:
@@ -341,20 +362,24 @@ class ProfileAnalyzer(object):
           SORT_OPS_BY_MEMORY or SORT_OPS_BY_LINE.
       sort_reverse: (bool) Whether to sort in descending instead of default
           (ascending) order.
+      time_unit: time unit, must be in cli_shared.TIME_UNITS.
 
     Returns:
       `RichTextLines` object containing a table that displays profiling
       information for each op.
     """
-    profile_data = ProfileDataTableView(profile_datum_list)
+    profile_data = ProfileDataTableView(profile_datum_list, time_unit=time_unit)
 
     # Calculate total time early to calculate column widths.
     total_op_time = sum(datum.op_time for datum in profile_datum_list)
     total_exec_time = sum(datum.node_exec_stats.all_end_rel_micros
                           for datum in profile_datum_list)
     device_total_row = [
-        "Device Total", cli_shared.time_to_readable_str(total_op_time),
-        cli_shared.time_to_readable_str(total_exec_time)]
+        "Device Total", "",
+        cli_shared.time_to_readable_str(total_op_time,
+                                        force_time_unit=time_unit),
+        cli_shared.time_to_readable_str(total_exec_time,
+                                        force_time_unit=time_unit)]
 
     # Calculate column widths.
     column_widths = [
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
index 6cc043e1cb..6880e61d3e 100644
--- a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
@@ -130,7 +130,8 @@ class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
 
       self._assertAtLeastOneLineMatches("Device 1 of", prof_output)
       expected_headers = [
-          "Node", "Op Time", "Exec Time", r"Filename:Lineno\(function\)"]
+          "Node", r"Start Time \(us\)", r"Op Time \(.*\)", r"Exec Time \(.*\)",
+          r"Filename:Lineno\(function\)"]
       self._assertAtLeastOneLineMatches(
           ".*".join(expected_headers), prof_output)
       self._assertAtLeastOneLineMatches(r"^Add/", prof_output)
@@ -242,10 +243,49 @@ class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
     self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
     self._assertNoLinesMatch(r"Mul/456", prof_output)
 
+  def testSpecifyingTimeUnit(self):
+    node1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        all_start_micros=123,
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+
+    node2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        all_start_micros=122,
+        op_start_rel_micros=1,
+        op_end_rel_micros=2,
+        all_end_rel_micros=5)
+
+    run_metadata = config_pb2.RunMetadata()
+    device1 = run_metadata.step_stats.dev_stats.add()
+    device1.device = "deviceA"
+    device1.node_stats.extend([node1, node2])
+
+    graph = test.mock.MagicMock()
+    op1 = test.mock.MagicMock()
+    op1.name = "Add/123"
+    op1.traceback = [("a/b/file2", 10, "some_var")]
+    op1.type = "add"
+    op2 = test.mock.MagicMock()
+    op2.name = "Mul/456"
+    op2.traceback = [("a/b/file1", 11, "some_var")]
+    op2.type = "mul"
+    graph.get_operations.return_value = [op1, op2]
+
+    prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
+
+    # Force time unit.
+    prof_output = prof_analyzer.list_profile(["--time_unit", "ms"]).lines
+    self._assertAtLeastOneLineMatches(r"Add/123.*0\.002ms", prof_output)
+    self._assertAtLeastOneLineMatches(r"Mul/456.*0\.005ms", prof_output)
+    self._assertAtLeastOneLineMatches(r"Device Total.*0\.009ms", prof_output)
+
   def _atLeastOneLineMatches(self, pattern, lines):
     pattern_re = re.compile(pattern)
     for line in lines:
-      if pattern_re.match(line):
+      if pattern_re.search(line):
         return True
     return False
 
diff --git a/tensorflow/python/debug/examples/examples_test.sh b/tensorflow/python/debug/examples/examples_test.sh
index 7830954f05..f0f4aee61d 100755
--- a/tensorflow/python/debug/examples/examples_test.sh
+++ b/tensorflow/python/debug/examples/examples_test.sh
@@ -76,7 +76,8 @@ EOF
 CUSTOM_DUMP_ROOT=$(mktemp -d)
 mkdir -p ${CUSTOM_DUMP_ROOT}
 
-cat << EOF | ${DEBUG_TFLEARN_IRIS_BIN} --debug --fake_data --train_steps=1 --dump_root="${CUSTOM_DUMP_ROOT}" --ui_type=readline
+cat << EOF | ${DEBUG_TFLEARN_IRIS_BIN} --debug --fake_data --train_steps=2 --dump_root="${CUSTOM_DUMP_ROOT}" --ui_type=readline
+run -p
 run -f has_inf_or_nan
 EOF
 
diff --git a/tensorflow/python/debug/wrappers/framework.py b/tensorflow/python/debug/wrappers/framework.py
index 0d8616a69f..ea642adbd1 100644
--- a/tensorflow/python/debug/wrappers/framework.py
+++ b/tensorflow/python/debug/wrappers/framework.py
@@ -219,6 +219,9 @@ class OnRunStartAction(object):
   # Run once with debug tensor-watching.
   DEBUG_RUN = "debug_run"
 
+  # Run once with profiler.
+  PROFILE_RUN = "profile_run"
+
   # Run without debug tensor-watching.
   NON_DEBUG_RUN = "non_debug_run"
 
@@ -425,7 +428,7 @@ class BaseDebugWrapperSession(session.SessionInterface):
       decorated_run_options = options or config_pb2.RunOptions()
       run_metadata = run_metadata or config_pb2.RunMetadata()
 
-      self._decorate_run_options(
+      self._decorate_run_options_for_debug(
           decorated_run_options,
           run_start_resp.debug_urls,
           debug_ops=run_start_resp.debug_ops,
@@ -454,6 +457,19 @@ class BaseDebugWrapperSession(session.SessionInterface):
           client_graph_def=self._sess.graph.as_graph_def(),
           tf_error=tf_error)
 
+    elif run_start_resp.action == OnRunStartAction.PROFILE_RUN:
+      decorated_run_options = options or config_pb2.RunOptions()
+      run_metadata = run_metadata or config_pb2.RunMetadata()
+      self._decorate_run_options_for_profile(decorated_run_options)
+      retvals = self._sess.run(fetches,
+                               feed_dict=feed_dict,
+                               options=decorated_run_options,
+                               run_metadata=run_metadata)
+      run_end_req = OnRunEndRequest(
+          run_start_resp.action,
+          run_metadata=run_metadata,
+          client_graph_def=self._sess.graph.as_graph_def())
+
     elif (run_start_resp.action == OnRunStartAction.NON_DEBUG_RUN or
           run_start_resp.action == OnRunStartAction.INVOKE_STEPPER):
       if run_start_resp.action == OnRunStartAction.INVOKE_STEPPER:
@@ -496,14 +512,15 @@ class BaseDebugWrapperSession(session.SessionInterface):
     raise NotImplementedError(
         "partial_run is not implemented for debug-wrapper sessions.")
 
-  def _decorate_run_options(self,
-                            run_options,
-                            debug_urls,
-                            debug_ops="DebugIdentity",
-                            node_name_regex_whitelist=None,
-                            op_type_regex_whitelist=None,
-                            tensor_dtype_regex_whitelist=None,
-                            tolerate_debug_op_creation_failures=False):
+  def _decorate_run_options_for_debug(
+      self,
+      run_options,
+      debug_urls,
+      debug_ops="DebugIdentity",
+      node_name_regex_whitelist=None,
+      op_type_regex_whitelist=None,
+      tensor_dtype_regex_whitelist=None,
+      tolerate_debug_op_creation_failures=False):
     """Modify a RunOptions object for debug tensor watching.
 
     Specifies request for outputting partition graphs. Adds
@@ -534,6 +551,15 @@ class BaseDebugWrapperSession(session.SessionInterface):
         tensor_dtype_regex_whitelist=tensor_dtype_regex_whitelist,
         tolerate_debug_op_creation_failures=tolerate_debug_op_creation_failures)
 
+  def _decorate_run_options_for_profile(self, run_options):
+    """Modify a RunOptions object for profiling TensorFlow graph execution.
+
+    Args:
+      run_options: (RunOptions) the modified RunOptions object.
+    """
+
+    run_options.trace_level = config_pb2.RunOptions.FULL_TRACE
+
   @abc.abstractmethod
   def on_session_init(self, request):
     """Callback invoked during construction of the debug-wrapper session.
diff --git a/tensorflow/python/debug/wrappers/hooks.py b/tensorflow/python/debug/wrappers/hooks.py
index 65713f0b71..c27448e283 100644
--- a/tensorflow/python/debug/wrappers/hooks.py
+++ b/tensorflow/python/debug/wrappers/hooks.py
@@ -130,6 +130,8 @@ class LocalCLIDebugHook(session_run_hook.SessionRunHook,
                   on_run_start_response.tensor_dtype_regex_whitelist),
               tolerate_debug_op_creation_failures=(
                   on_run_start_response.tolerate_debug_op_creation_failures)))
+    elif self._performed_action == framework.OnRunStartAction.PROFILE_RUN:
+      self._decorate_run_options_for_profile(run_args.options)
     elif self._performed_action == framework.OnRunStartAction.INVOKE_STEPPER:
       # The _finalized property must be set to False so that the NodeStepper
       # can insert ops for retrieving TensorHandles.
diff --git a/tensorflow/python/debug/wrappers/local_cli_wrapper.py b/tensorflow/python/debug/wrappers/local_cli_wrapper.py
index 0ba31f986b..fe822df6ce 100644
--- a/tensorflow/python/debug/wrappers/local_cli_wrapper.py
+++ b/tensorflow/python/debug/wrappers/local_cli_wrapper.py
@@ -27,6 +27,7 @@ import tempfile
 from tensorflow.python.debug.cli import analyzer_cli
 from tensorflow.python.debug.cli import cli_shared
 from tensorflow.python.debug.cli import debugger_cli_common
+from tensorflow.python.debug.cli import profile_analyzer_cli
 from tensorflow.python.debug.cli import stepper_cli
 from tensorflow.python.debug.cli import ui_factory
 from tensorflow.python.debug.lib import debug_data
@@ -162,6 +163,12 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
         default="",
         help="Regular-expression filter for tensor dtype to be watched in the "
         "run, e.g., (float32|float64), int.*")
+    ap.add_argument(
+        "-p",
+        "--profile",
+        dest="profile",
+        action="store_true",
+        help="Run and profile TensorFlow graph execution.")
     self._argparsers["run"] = ap
 
     ap = argparse.ArgumentParser(
@@ -318,12 +325,16 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
           passed_filter = self._active_tensor_filter
           self._active_tensor_filter = None
 
-      self._prep_cli_for_run_end(debug_dump, request.tf_error, passed_filter)
+      self._prep_debug_cli_for_run_end(
+          debug_dump, request.tf_error, passed_filter)
 
       self._run_start_response = self._launch_cli()
 
       # Clean up the dump generated by this run.
       self._remove_dump_root()
+    elif request.performed_action == framework.OnRunStartAction.PROFILE_RUN:
+      self._prep_profile_cli_for_run_end(self._sess.graph, request.run_metadata)
+      self._run_start_response = self._launch_cli()
     else:
       # No debug information to show following a non-debug run() call.
       self._run_start_response = None
@@ -336,7 +347,7 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
     if os.path.isdir(self._dump_root):
       shutil.rmtree(self._dump_root)
 
-  def _prep_cli_for_run_end(self, debug_dump, tf_error, passed_filter):
+  def _prep_debug_cli_for_run_end(self, debug_dump, tf_error, passed_filter):
     """Prepare (but not launch) CLI for run-end, with debug dump from the run.
 
     Args:
@@ -391,6 +402,12 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
     if help_intro:
       self._run_cli.set_help_intro(help_intro)
 
+  def _prep_profile_cli_for_run_end(self, py_graph, run_metadata):
+    self._init_command = "lp"
+    self._run_cli = profile_analyzer_cli.create_profiler_ui(
+        py_graph, run_metadata, ui_type=self._ui_type)
+    self._title = "run-end (profiler mode): " + self._run_description
+
   def _launch_cli(self):
     """Launch the interactive command-line interface.
 
@@ -425,13 +442,18 @@ class LocalCLIDebugWrapperSession(framework.BaseDebugWrapperSession):
   def _run_handler(self, args, screen_info=None):
     """Command handler for "run" command during on-run-start."""
 
-    _ = screen_info  # Currently unused.
+    del screen_info  # Currently unused.
 
     parsed = self._argparsers["run"].parse_args(args)
     parsed.node_name_filter = parsed.node_name_filter or None
     parsed.op_type_filter = parsed.op_type_filter or None
     parsed.tensor_dtype_filter = parsed.tensor_dtype_filter or None
 
+    if parsed.profile:
+      raise debugger_cli_common.CommandLineExit(
+          exit_token=framework.OnRunStartResponse(
+              framework.OnRunStartAction.PROFILE_RUN, []))
+
     if parsed.till_filter_pass:
       # For the run-till-bad-numerical-value-appears mode, use the DEBUG_RUN
       # option to access the intermediate tensors, and set the corresponding
diff --git a/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py b/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py
index e22f6e783e..595000fdb6 100644
--- a/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py
+++ b/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py
@@ -71,15 +71,21 @@ class LocalCLIDebuggerWrapperSessionForTest(
         "tf_errors": [],
         "run_start_cli_run_numbers": [],
         "run_end_cli_run_numbers": [],
+        "profiler_py_graphs": [],
+        "profiler_run_metadata": [],
     }
 
   def _prep_cli_for_run_start(self):
     pass
 
-  def _prep_cli_for_run_end(self, debug_dump, tf_error, passed_filter):
+  def _prep_debug_cli_for_run_end(self, debug_dump, tf_error, passed_filter):
     self.observers["debug_dumps"].append(debug_dump)
     self.observers["tf_errors"].append(tf_error)
 
+  def _prep_profile_cli_for_run_end(self, py_graph, run_metadata):
+    self.observers["profiler_py_graphs"].append(py_graph)
+    self.observers["profiler_run_metadata"].append(run_metadata)
+
   def _launch_cli(self):
     if self._is_run_start:
       self.observers["run_start_cli_run_numbers"].append(self._run_call_count)
@@ -468,6 +474,19 @@ class LocalCLIDebugWrapperSessionTest(test_util.TensorFlowTestCase):
     self.assertEqual(1, dumps.size)
     self.assertEqual("w_int_inner", dumps.dumped_tensor_data[0].node_name)
 
+  def testRunUnderProfilerModeWorks(self):
+    wrapped_sess = LocalCLIDebuggerWrapperSessionForTest(
+        [["-p"], []], self.sess)
+
+    wrapped_sess.run(self.w_int)
+
+    self.assertEqual(1, len(wrapped_sess.observers["profiler_run_metadata"]))
+    self.assertTrue(
+        wrapped_sess.observers["profiler_run_metadata"][0].step_stats)
+    self.assertEqual(1, len(wrapped_sess.observers["profiler_py_graphs"]))
+    self.assertIsInstance(
+        wrapped_sess.observers["profiler_py_graphs"][0], ops.Graph)
+
 
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From 91cb0e854ba559c7b0ce657e9fa8c4b9644360b7 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 10 May 2017 17:33:07 -0700
Subject: [PATCH 1203/1563] Add Plottable v3 to TensorBoard build

This introduces a new macro, which is meant to work around the fact that ES6
imports don't work in the browser. This macro concatenates files, comments out
import lines, and adds aliases if necessary. In other words, we're defining the
ES6 module structure in the BUILD file, and ignoring what's in the .ts files.

PiperOrigin-RevId: 155697059
---
 .../tensorboard/components/tf_imports/BUILD   |  57 ---
 .../components/tf_imports_d3v4/BUILD          | 374 ++++++++++++++++--
 .../components/tf_imports_d3v4/plottable.html |   2 +-
 .../vz_histogram_timeseries_d3v4/BUILD        |  24 --
 .../vz-histogram-timeseries.html              |   2 +-
 tensorflow/tensorboard/hacks.bzl              |  80 ++++
 tensorflow/workspace.bzl                      |  16 +
 7 files changed, 448 insertions(+), 107 deletions(-)
 create mode 100644 tensorflow/tensorboard/hacks.bzl

diff --git a/tensorflow/tensorboard/components/tf_imports/BUILD b/tensorflow/tensorboard/components/tf_imports/BUILD
index 8b91502ae2..57164ba443 100644
--- a/tensorflow/tensorboard/components/tf_imports/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports/BUILD
@@ -54,63 +54,6 @@ webfiles(
     deps = [":d3"],
 )
 
-# Generate single TypeScript typings file for d3.js with no ES6 imports.
-#
-# The DefinitelyTyped definition of d3 v4 was written under the assumption that
-# we want to use d3 in a modularized way. We don't want to do that because its
-# import statements use NodeJS namespaces, and the Web Compiler only supports
-# W3C, ECMA, and IETF standards.
-genrule(
-    name = "d3v4_typings",
-    srcs = [
-        # please maintain a reverse topological order
-        "@org_definitelytyped_types_d3_path//:index.d.ts",
-        "@org_definitelytyped_types_d3_time//:index.d.ts",
-        "@org_definitelytyped_types_d3_dsv//:index.d.ts",
-        "@org_definitelytyped_types_d3_color//:index.d.ts",
-        "@org_definitelytyped_types_d3_selection//:index.d.ts",
-        # d3-transition defines stuff in d3-selection wat?
-        # "@org_definitelytyped_types_d3_transition//:index.d.ts",
-        "@org_definitelytyped_types_d3_shape//:index.d.ts",
-        "@org_definitelytyped_types_d3_scale//:index.d.ts",
-        "@org_definitelytyped_types_d3_request//:index.d.ts",
-        "@org_definitelytyped_types_d3_interpolate//:index.d.ts",
-        "@org_definitelytyped_types_d3_drag//:index.d.ts",
-        "@org_definitelytyped_types_d3_brush//:index.d.ts",
-        "@org_definitelytyped_types_d3_axis//:index.d.ts",
-        "@org_definitelytyped_types_d3_zoom//:index.d.ts",
-        "@org_definitelytyped_types_d3_array//:index.d.ts",
-        "@org_definitelytyped_types_d3_chord//:index.d.ts",
-        "@org_definitelytyped_types_d3_collection//:index.d.ts",
-        "@org_definitelytyped_types_d3_dispatch//:index.d.ts",
-        "@org_definitelytyped_types_d3_ease//:index.d.ts",
-        "@org_definitelytyped_types_d3_force//:index.d.ts",
-        "@org_definitelytyped_types_d3_format//:index.d.ts",
-        "@org_definitelytyped_types_d3_hierarchy//:index.d.ts",
-        "@org_definitelytyped_types_d3_polygon//:index.d.ts",
-        "@org_definitelytyped_types_d3_quadtree//:index.d.ts",
-        "@org_definitelytyped_types_d3_queue//:index.d.ts",
-        "@org_definitelytyped_types_d3_random//:index.d.ts",
-        "@org_definitelytyped_types_d3_timer//:index.d.ts",
-        "@org_definitelytyped_types_d3_voronoi//:index.d.ts",
-    ],
-    outs = ["d3v4.d.ts"],
-    cmd = "\n".join([
-        "(",
-        "  echo 'declare namespace d3 {'",
-        "  for f in $(SRCS); do",
-        "    echo",
-        "    echo /////////////////////////////////////////////",
-        "    echo // $$f",
-        "    echo /////////////////////////////////////////////",
-        "    echo",
-        "    sed '/^import /d' $$f",
-        "  done",
-        "  echo '}'",
-        ") >$@",
-    ]),
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
index 2b2d827760..5cf0750872 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -1,18 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
-    name = "d3",
-    srcs = [
-        "d3.html",
-        "@org_d3js_v4",
-    ],
-    path = "/tf-imports-d3v4",
-)
-
 webfiles(
     name = "lodash",
     srcs = ["lodash.html"],
@@ -71,30 +63,364 @@ webfiles(
     ],
 )
 
+webfiles(
+    name = "d3",
+    srcs = [
+        "d3.html",
+        "@org_d3js_v4",
+    ],
+    path = "/tf-imports",
+)
+
 webfiles(
     name = "plottable",
+    srcs = ["plottable.html"],
+    path = "/tf-imports",
+    deps = [
+        ":d3",
+        ":plottable_js_css",
+    ],
+)
+
+webfiles(
+    name = "plottable_js_css",
     srcs = [
-        "plottable.html",
-        # TODO(jart): Replace when Plottable v3 is fixed.
-        "plottable.js",
-        "plottable.css",
-        # "//third_party/javascript/plottable/v3:plottable.css",
-        # "//third_party/javascript/plottable/v3:plottable.js",
+        "@com_palantir_plottable_v3//:package/plottable.css",
+        "@com_palantir_plottable_v3//:package/plottable.js",
     ],
-    path = "/tf-imports-d3v4",
-    deps = [":d3"],
+    path = "/tf-imports",
+    strip_prefix = "package",
+    visibility = ["//visibility:private"],
 )
 
-genrule(
-    name = "TEMPORARY_fake_plottable_css",
-    outs = ["plottable.css"],
-    cmd = "echo >$@",
+# Generate single TypeScript typings file for d3.js with no ES6 imports.
+#
+# The DefinitelyTyped definition of d3 v4 was written under the assumption that
+# we want to use d3 in a modularized way. We don't want to do that because its
+# import statements use NodeJS namespaces, and the Web Compiler only supports
+# W3C, ECMA, and IETF standards.
+tensorboard_typescript_bundle(
+    name = "d3_typings",
+    out = "d3.d.ts",
+    namespace_srcs = {"d3": [
+        "d3-transition.d.ts",
+        "@org_definitelytyped_types_d3_path//:index.d.ts",
+        "@org_definitelytyped_types_d3_time//:index.d.ts",
+        "@org_definitelytyped_types_d3_dsv//:index.d.ts",
+        "@org_definitelytyped_types_d3_color//:index.d.ts",
+        "@org_definitelytyped_types_d3_selection//:index.d.ts",
+        "@org_definitelytyped_types_d3_shape//:index.d.ts",
+        "@org_definitelytyped_types_d3_scale//:index.d.ts",
+        "@org_definitelytyped_types_d3_request//:index.d.ts",
+        "@org_definitelytyped_types_d3_interpolate//:index.d.ts",
+        "@org_definitelytyped_types_d3_drag//:index.d.ts",
+        "@org_definitelytyped_types_d3_brush//:index.d.ts",
+        "@org_definitelytyped_types_d3_axis//:index.d.ts",
+        "@org_definitelytyped_types_d3_zoom//:index.d.ts",
+        "@org_definitelytyped_types_d3_array//:index.d.ts",
+        "@org_definitelytyped_types_d3_chord//:index.d.ts",
+        "@org_definitelytyped_types_d3_collection//:index.d.ts",
+        "@org_definitelytyped_types_d3_dispatch//:index.d.ts",
+        "@org_definitelytyped_types_d3_ease//:index.d.ts",
+        "@org_definitelytyped_types_d3_force//:index.d.ts",
+        "@org_definitelytyped_types_d3_format//:index.d.ts",
+        "@org_definitelytyped_types_d3_hierarchy//:index.d.ts",
+        "@org_definitelytyped_types_d3_polygon//:index.d.ts",
+        "@org_definitelytyped_types_d3_quadtree//:index.d.ts",
+        "@org_definitelytyped_types_d3_queue//:index.d.ts",
+        "@org_definitelytyped_types_d3_random//:index.d.ts",
+        "@org_definitelytyped_types_d3_timer//:index.d.ts",
+        "@org_definitelytyped_types_d3_voronoi//:index.d.ts",
+    ]},
+)
+
+# It would be nice if Plottable released a .d.ts file for plottable.js like
+# they did for previous versions.
+tensorboard_typescript_bundle(
+    name = "plottable_typings",
+    out = "plottable.d.ts",
+    namespace_srcs = {
+        "Plottable": [
+            "@com_palantir_plottable_v3//:package/build/src/core/dataset.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/core/interfaces.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/core/version.d.ts",
+        ],
+        "Plottable.Animators": [
+            "@com_palantir_plottable_v3//:package/build/src/animators/animator.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/animators/easingAnimator.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/animators/nullAnimator.d.ts",
+        ],
+        "Plottable.Axes": [
+            "@com_palantir_plottable_v3//:package/build/src/axes/axis.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/axes/categoryAxis.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/axes/numericAxis.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/axes/timeAxis.d.ts",
+        ],
+        "Plottable.Components": [
+            "@com_palantir_plottable_v3//:package/build/src/components/component.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/componentContainer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/dragBoxLayer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/dragLineLayer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/gridlines.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/group.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/guideLineLayer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/interpolatedColorLegend.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/label.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/legend.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/plotGroup.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/selectionBoxLayer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/table.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/xDragBoxLayer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/components/yDragBoxLayer.d.ts",
+        ],
+        "Plottable.Configs": [
+            "@com_palantir_plottable_v3//:package/build/src/core/config.d.ts",
+        ],
+        "Plottable.Formatters": [
+            "@com_palantir_plottable_v3//:package/build/src/core/formatters.d.ts",
+        ],
+        "Plottable.RenderController": [
+            "@com_palantir_plottable_v3//:package/build/src/core/renderController.d.ts",
+        ],
+        "Plottable.RenderPolicies": [
+            "@com_palantir_plottable_v3//:package/build/src/core/renderPolicy.d.ts",
+        ],
+        "Plottable.SymbolFactories": [
+            "@com_palantir_plottable_v3//:package/build/src/core/symbolFactories.d.ts",
+        ],
+        "Plottable.Dispatchers": [
+            "@com_palantir_plottable_v3//:package/build/src/dispatchers/dispatcher.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/dispatchers/keyDispatcher.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/dispatchers/mouseDispatcher.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/dispatchers/touchDispatcher.d.ts",
+        ],
+        "Plottable.Drawers": [
+            "@com_palantir_plottable_v3//:package/build/src/drawers/arcDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/arcOutlineDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/areaDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/canvasBuffer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/canvasDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/drawStep.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/drawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/lineDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/rectangleDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/segmentDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/svgDrawer.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/drawers/symbolDrawer.d.ts",
+        ],
+        "Plottable.Interactions": [
+            "@com_palantir_plottable_v3//:package/build/src/interactions/clickInteraction.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/interactions/dragInteraction.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/interactions/interaction.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/interactions/keyInteraction.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/interactions/panZoomInteraction.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/interactions/pointerInteraction.d.ts",
+        ],
+        "Plottable.Plots": [
+            "@com_palantir_plottable_v3//:package/build/src/plots/areaPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/barPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/clusteredBarPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/commons.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/linePlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/piePlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/plot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/rectanglePlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/scatterPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/segmentPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/stackedAreaPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/stackedBarPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/waterfallPlot.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/plots/xyPlot.d.ts",
+        ],
+        "Plottable.Scales": [
+            "@com_palantir_plottable_v3//:package/build/src/scales/index.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/categoryScale.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/colorScale.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/interpolatedColorScale.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/linearScale.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/modifiedLogScale.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/quantitativeScale.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/scale.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/scales/timeScale.d.ts",
+        ],
+        "Plottable.Scales.TickGenerators": [
+            "@com_palantir_plottable_v3//:package/build/src/scales/tickGenerators.d.ts",
+        ],
+        "Plottable.Utils": [
+            "@com_palantir_plottable_v3//:package/build/src/utils/addD3SelectionMulti.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/bucket.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/callbackSet.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/coerceD3.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/entityStore.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/makeEnum.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/map.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/set.d.ts",
+            "@com_palantir_plottable_v3//:package/build/src/utils/transformAwareTranslator.d.ts",
+        ],
+        "Plottable.Utils.Array": [
+            "@com_palantir_plottable_v3//:package/build/src/utils/arrayUtils.d.ts",
+        ],
+        "Plottable.Utils.Color": [
+            "@com_palantir_plottable_v3//:package/build/src/utils/colorUtils.d.ts",
+        ],
+        "Plottable.Utils.DOM": [
+            "@com_palantir_plottable_v3//:package/build/src/utils/domUtils.d.ts",
+        ],
+        "Plottable.Utils.Math": [
+            "@com_palantir_plottable_v3//:package/build/src/utils/mathUtils.d.ts",
+        ],
+        "Plottable.Utils.Stacking": [
+            "@com_palantir_plottable_v3//:package/build/src/utils/stackingUtils.d.ts",
+        ],
+        "Plottable.Utils.Window": [
+            "@com_palantir_plottable_v3//:package/build/src/utils/windowUtils.d.ts",
+        ],
+    },
+    namespace_symbol_aliases = {
+        "Plottable.Animators": {
+            "AttributeToAppliedProjector": "Plottable.AttributeToAppliedProjector",
+            "SimpleSelection": "Plottable.SimpleSelection",
+        },
+        "Plottable.Axes": {
+            "Component": "Plottable.Components.Component",
+            "Formatter": "Plottable.Formatters.Formatter",
+            "Point": "Plottable.Point",
+            "QuantitativeScale": "Plottable.Scales.QuantitativeScale",
+            "Scale": "Plottable.Scales.Scale",
+            "Scales": "Plottable.Scales",
+            "SimpleSelection": "Plottable.SimpleSelection",
+            "SpaceRequest": "Plottable.SpaceRequest",
+        },
+        "Plottable.Components": {
+            "Bounds": "Plottable.Bounds",
+            "Formatter": "Plottable.Formatters.Formatter",
+            "IEntity": "Plottable.IEntity",
+            "Interactions": "Plottable.Interactions",
+            "Plots": "Plottable.Plots",
+            "Point": "Plottable.Point",
+            "QuantitativeScale": "Plottable.Scales.QuantitativeScale",
+            "Scales": "Plottable.Scales",
+            "SimpleSelection": "Plottable.SimpleSelection",
+            "SpaceRequest": "Plottable.SpaceRequest",
+            "SymbolFactory": "Plottable.SymbolFactories.SymbolFactory",
+        },
+        "Plottable.RenderController": {
+            "Component": "Plottable.Components.Component",
+            "RenderPolicies": "Plottable.RenderPolicies",
+        },
+        "Plottable.SymbolFactories": {
+            "d3Shape": "d3",
+        },
+        "Plottable.Dispatchers": {
+            "Component": "Plottable.Components.Component",
+            "Dispatchers": "Plottable.Dispatchers",
+            "Point": "Plottable.Point",
+        },
+        "Plottable.Drawers": {
+            "AttributeToAppliedProjector": "Plottable.AttributeToAppliedProjector",
+            "AttributeToProjector": "Plottable.AttributeToProjector",
+            "Dataset": "Plottable.Dataset",
+            "IAccessor": "Plottable.IAccessor",
+            "IAnimator": "Plottable.Animators.IAnimator",
+            "SimpleSelection": "Plottable.SimpleSelection",
+            "SymbolFactory": "Plottable.SymbolFactories.SymbolFactory",
+        },
+        "Plottable.Interactions": {
+            "Component": "Plottable.Components.Component",
+            "Point": "Plottable.Point",
+            "TransformableScale": "Plottable.Scales.TransformableScale",
+        },
+        "Plottable.Plots": {
+            "AppliedDrawStep": "Plottable.Drawers.AppliedDrawStep",
+            "AttributeToProjector": "Plottable.AttributeToProjector",
+            "Bounds": "Plottable.Bounds",
+            "Component": "Plottable.Components.Component",
+            "Dataset": "Plottable.Dataset",
+            "DrawStep": "Plottable.Drawers.DrawStep",
+            "Drawers": "Plottable.Drawers",
+            "Formatter": "Plottable.Formatters.Formatter",
+            "IAccessor": "Plottable.IAccessor",
+            "IAnimator": "Plottable.Animators.IAnimator",
+            "IDrawer": "Plottable.Drawers.IDrawer",
+            "IEntity": "Plottable.IEntity",
+            "IScaleCallback": "Plottable.Scales.IScaleCallback",
+            "Plots": "Plottable.Plots",
+            "Point": "Plottable.Point",
+            "Projector": "Plottable.Projector",
+            "ProxyDrawer": "Plottable.Drawers.ProxyDrawer",
+            "QuantitativeScale": "Plottable.Scales.QuantitativeScale",
+            "Range": "Plottable.Range",
+            "Scale": "Plottable.Scales.Scale",
+            "SimpleSelection": "Plottable.SimpleSelection",
+            "SymbolFactory": "Plottable.SymbolFactories.SymbolFactory",
+            "TransformableScale": "Plottable.Scales.TransformableScale",
+            "Utils": "Plottable.Utils",
+            "d3Shape": "d3",
+        },
+        "Plottable.Scales": {
+            "Dataset": "Plottable.Dataset",
+            "Scales": "Plottable.Scales",
+        },
+        "Plottable.Scales.TickGenerators": {
+            "QuantitativeScale": "Plottable.Scales.QuantitativeScale",
+        },
+        "Plottable.Utils": {
+            "Bounds": "Plottable.Bounds",
+            "Component": "Plottable.Components.Component",
+            "Dataset": "Plottable.Dataset",
+            "IAccessor": "Plottable.IAccessor",
+            "Point": "Plottable.Point",
+            "Range": "Plottable.Range",
+            "SimpleSelection": "Plottable.SimpleSelection",
+            "Utils": "Plottable.Utils",
+        },
+    },
+    namespace_symbol_aliases_public = {
+        "Plottable": {
+            "Axis": "Plottable.Axes.Axis",
+            "AxisOrientation": "Plottable.Axes.AxisOrientation",
+            "ClickCallback": "Plottable.Interactions.ClickCallback",
+            "Component": "Plottable.Components.Component",
+            "ComponentCallback": "Plottable.Components.ComponentCallback",
+            "ComponentContainer": "Plottable.Components.ComponentContainer",
+            "Dispatcher": "Plottable.Dispatchers.Dispatcher",
+            "DragBoxCallback": "Plottable.Components.DragBoxCallback",
+            "DragCallback": "Plottable.Interactions.DragCallback",
+            "EaseFn": "Plottable.Animators.EaseFn",
+            "EaseName": "Plottable.Animators.EaseName",
+            "Easing": "Plottable.Animators.Easing",
+            "Formatter": "Plottable.Formatters.Formatter",
+            "IAnimator": "Plottable.Animators.IAnimator",
+            "IDragLineCallback": "Plottable.Components.IDragLineCallback",
+            "IDrawer": "Plottable.Drawers.IDrawer",
+            "IResizeHandler": "Plottable.Components.IResizeHandler",
+            "IScaleCallback": "Plottable.Scales.IScaleCallback",
+            "Interaction": "Plottable.Interactions.Interaction",
+            "Key": "Plottable.Interactions.Key",
+            "KeyCallback": "Plottable.Interactions.KeyCallback",
+            "Null": "Plottable.Animators.Null",
+            "Plot": "Plottable.Plots.Plot",
+            "PointerCallback": "Plottable.Interactions.PointerCallback",
+            "ProxyDrawer": "Plottable.Drawers.ProxyDrawer",
+            "QuantitativeScale": "Plottable.Scales.QuantitativeScale",
+            "Renderer": "Plottable.Plots.Renderer",
+            "Scale": "Plottable.Scales.Scale",
+            "SymbolFactory": "Plottable.SymbolFactories.SymbolFactory",
+            "TimeInterval": "Plottable.Axes.TimeInterval",
+            "TransformableScale": "Plottable.Scales.TransformableScale",
+            "XAlignment": "Plottable.Components.XAlignment",
+            "XYPlot": "Plottable.Plots.XYPlot",
+            "YAlignment": "Plottable.Components.YAlignment",
+        },
+    },
 )
 
+# Removes the 'declare module' block inside this file, but keeps its content.
 genrule(
-    name = "TEMPORARY_fake_plottable_js",
-    outs = ["plottable.js"],
-    cmd = "echo >$@",
+    name = "kludge_d3_transition",
+    srcs = ["@org_definitelytyped_types_d3_transition//:index.d.ts"],
+    outs = ["d3-transition.d.ts"],
+    cmd = "sed '/^declare module/d' $< | awk '/^}$$/ && !p {p++;next}1' >$@",
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html b/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
index 57f9c1d6d3..60be429438 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
@@ -17,4 +17,4 @@ limitations under the License.
 
 <link rel="import" href="d3.html">
 <script src="plottable.js"></script>
-<link rel="stylesheet" type="text/css" href="plottable.css">
+<link rel="stylesheet" href="plottable.css">
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
index 02c0640742..dbde6790b2 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
@@ -37,27 +37,3 @@ webfiles(
         "@org_polymer_webcomponentsjs",
     ],
 )
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "vz-histogram-timeseries.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-histogram-timeseries",
-    deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html
index 88def1710c..bdba230077 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/vz-histogram-timeseries.html
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 
 <link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-imports-d3v4/d3.html">
+<link rel="import" href="../tf-imports/d3.html">
 
 <!--
 vz-histogram-timeseries creates an element that draws beautiful histograms for
diff --git a/tensorflow/tensorboard/hacks.bzl b/tensorflow/tensorboard/hacks.bzl
new file mode 100644
index 0000000000..f1d4be7906
--- /dev/null
+++ b/tensorflow/tensorboard/hacks.bzl
@@ -0,0 +1,80 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TODO(jart): Merge this file into defs.bzl once that file is sync unified.
+
+def tensorboard_typescript_bundle(
+    name,
+    out,
+    namespace_srcs,
+    namespace_symbol_aliases={},
+    namespace_symbol_aliases_public={},
+    **kwargs):
+  """Rolls TypeScript ES6 modules into one vanilla source file without imports.
+
+  This is a genrule wrapper that concatenates TypeScripts sources inside
+  namespace blocks while removing ^import lines. Because the sources themselves
+  are not parsed, the structure of the modules must be passed to this macro as
+  a Skylark data structure.
+
+  Args:
+    name: Name of this build rule target.
+    out: Path of outputted TypeScript source file.
+    namespace_srcs: Multimap of namespace strings to build file targets. The
+        ordering of the dictionary and nested lists does not matter when
+        generating a typings file, but *does* matter when generating a source
+        file.
+    namespace_symbol_aliases: Map of namespace strings where each value is a
+        map of symbol names to fully qualified symbol names.
+    namespace_symbol_aliases_public: Same as namespace_symbol_aliases but the
+        symbol will be visible to other namespaces.
+  """
+  cmd = ["(", "echo // GENERATED BY TENSORBOARD_TYPESCRIPT_BUNDLE"]
+  inputs = set()
+  for namespace, srcs in namespace_srcs.items():
+    cmd.append("echo")
+    if out[-5:] == ".d.ts":
+      cmd.append("echo 'declare namespace %s {'" % namespace)
+    elif out[-3:] == ".ts":
+      cmd.append("echo 'module %s {'" % namespace)
+    else:
+      fail("'out' must end with .ts or .d.ts: " + out)
+    for symbol, canon in namespace_symbol_aliases.get(namespace, {}).items():
+      cmd.append("echo 'import %s = %s;'" % (symbol, canon))
+    for symbol, canon in namespace_symbol_aliases_public.get(namespace,
+                                                             {}).items():
+      cmd.append("echo 'export import %s = %s;'" % (symbol, canon))
+    inputs += srcs
+    for src in srcs:
+      cmd.append("for f in $(locations %s); do" % src)
+      cmd.append("  echo")
+      cmd.append("  echo /////////////////////////////////////////////////////")
+      cmd.append("  echo // " + namespace)
+      cmd.append("  echo // $$f")
+      cmd.append("  echo /////////////////////////////////////////////////////")
+      cmd.append("  echo")
+      cmd.append("  sed 's!^import !// import !' $$f \\")
+      cmd.append("    | sed 's!^export declare !export !' \\")
+      cmd.append("    | sed '/^export .* from /d' \\")
+      cmd.append("    | sed '/^export {.*};$$/d'")
+      cmd.append("done")
+    cmd.append("echo '}'")
+  cmd.append(") >$@")
+  native.genrule(
+      name = name,
+      srcs = list(inputs),
+      outs = [out],
+      cmd = "\n".join(cmd),
+      **kwargs
+  )
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 0a495160ea..016deb7dd6 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -762,6 +762,22 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       },
   )
 
+  # TODO: Delete previous rule and rename this one org_palantir_plottable
+  filegroup_external(
+      name = "com_palantir_plottable_v3",
+      # no @license header
+      licenses = ["notice"],  # MIT
+      sha256_urls_extract = {
+          # Plottable doesn't have a release tarball on GitHub. Using the
+          # sources directly from git also requires running Node tooling
+          # beforehand to generate files. NPM is the only place to get it.
+          "e3159beb279391c47433789f22b32bac88488cfcad6c0b6ec8605ce6b0081b0d": [
+              "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/plottable/-/plottable-3.1.0.tgz",
+              "https://registry.npmjs.org/plottable/-/plottable-3.1.0.tgz",
+          ],
+      },
+  )
+
   filegroup_external(
       name = "io_github_cpettitt_dagre",
       # no @license header
-- 
GitLab


From 5cacaa4ab72acd278c1faa5b16b16a3527136da8 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 10 May 2017 17:53:47 -0700
Subject: [PATCH 1204/1563] Estimates node completion times for a TF graph
 based on the op level analytical estimates.

PiperOrigin-RevId: 155698917
---
 .../core/grappler/costs/cost_estimator.h      |   6 +-
 .../core/grappler/costs/virtual_placer.cc     |   2 +-
 .../core/grappler/costs/virtual_placer.h      |   2 +-
 tensorflow/core/grappler/op_types.cc          |   5 +
 tensorflow/core/grappler/op_types.h           |   1 +
 tensorflow/core/grappler/optimizers/BUILD     |  37 ++++++
 .../grappler/optimizers/static_schedule.cc    | 121 ++++++++++++++++++
 .../grappler/optimizers/static_schedule.h     |  38 ++++++
 .../optimizers/static_schedule_test.cc        |  84 ++++++++++++
 9 files changed, 292 insertions(+), 4 deletions(-)
 create mode 100644 tensorflow/core/grappler/optimizers/static_schedule.cc
 create mode 100644 tensorflow/core/grappler/optimizers/static_schedule.h
 create mode 100644 tensorflow/core/grappler/optimizers/static_schedule_test.cc

diff --git a/tensorflow/core/grappler/costs/cost_estimator.h b/tensorflow/core/grappler/costs/cost_estimator.h
index 27975458d4..b3fb3522a3 100644
--- a/tensorflow/core/grappler/costs/cost_estimator.h
+++ b/tensorflow/core/grappler/costs/cost_estimator.h
@@ -42,7 +42,8 @@ struct Costs {
   struct MicroSeconds : std::chrono::microseconds {
     MicroSeconds() : std::chrono::microseconds(0) {}
     MicroSeconds(double d) : std::chrono::microseconds(static_cast<int64>(d)) {}
-    MicroSeconds(std::chrono::microseconds& d) : std::chrono::microseconds(d) {}
+    MicroSeconds(const std::chrono::microseconds& d)
+        : std::chrono::microseconds(d) {}
     MicroSeconds& operator=(const std::chrono::microseconds& d) {
       std::chrono::microseconds::operator=(d);
       return *this;
@@ -51,7 +52,8 @@ struct Costs {
   struct NanoSeconds : std::chrono::nanoseconds {
     NanoSeconds() : std::chrono::nanoseconds(0) {}
     NanoSeconds(double d) : std::chrono::nanoseconds(static_cast<int64>(d)) {}
-    NanoSeconds(std::chrono::nanoseconds& d) : std::chrono::nanoseconds(d) {}
+    NanoSeconds(const std::chrono::nanoseconds& d)
+        : std::chrono::nanoseconds(d) {}
     NanoSeconds& operator=(const std::chrono::nanoseconds& d) {
       std::chrono::nanoseconds::operator=(d);
       return *this;
diff --git a/tensorflow/core/grappler/costs/virtual_placer.cc b/tensorflow/core/grappler/costs/virtual_placer.cc
index 25c2c136f3..72736af819 100644
--- a/tensorflow/core/grappler/costs/virtual_placer.cc
+++ b/tensorflow/core/grappler/costs/virtual_placer.cc
@@ -24,7 +24,7 @@ limitations under the License.
 namespace tensorflow {
 namespace grappler {
 
-VirtualPlacer::VirtualPlacer(Cluster* cluster) : has_gpu_(false) {
+VirtualPlacer::VirtualPlacer(const Cluster* cluster) : has_gpu_(false) {
   devices_ = cluster->GetDevices();
   for (const auto& device : cluster->GetDevices()) {
     if (str_util::Lowercase(device.first).find("gpu") != string::npos) {
diff --git a/tensorflow/core/grappler/costs/virtual_placer.h b/tensorflow/core/grappler/costs/virtual_placer.h
index aac039c802..40cd64e37c 100644
--- a/tensorflow/core/grappler/costs/virtual_placer.h
+++ b/tensorflow/core/grappler/costs/virtual_placer.h
@@ -29,7 +29,7 @@ class Cluster;
 // The virtual placer emulates the behavior of the TF placer.
 class VirtualPlacer {
  public:
-  VirtualPlacer(Cluster* cluster);
+  VirtualPlacer(const Cluster* cluster);
 
   const DeviceProperties& get_device(const NodeDef& node) const;
 
diff --git a/tensorflow/core/grappler/op_types.cc b/tensorflow/core/grappler/op_types.cc
index 64bdd91077..543c884ee8 100644
--- a/tensorflow/core/grappler/op_types.cc
+++ b/tensorflow/core/grappler/op_types.cc
@@ -46,5 +46,10 @@ bool IsVariable(const NodeDef& node) {
          op == "VarHandleOp";
 }
 
+bool IsMerge(const NodeDef& node) {
+  const auto op = node.op();
+  return op == "Merge";
+}
+
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/op_types.h b/tensorflow/core/grappler/op_types.h
index 4f2bb2bc05..ce9e4a0628 100644
--- a/tensorflow/core/grappler/op_types.h
+++ b/tensorflow/core/grappler/op_types.h
@@ -26,6 +26,7 @@ bool IsDequeueOp(const NodeDef& node);
 bool IsPlaceholder(const NodeDef& node);
 bool IsTranspose(const NodeDef& node);
 bool IsVariable(const NodeDef& node);
+bool IsMerge(const NodeDef& node);
 
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 5f30dfbaa2..c46ebf2031 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -32,6 +32,43 @@ alias(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+cc_library(
+    name = "static_schedule",
+    srcs = ["static_schedule.cc"],
+    hdrs = [
+        "static_schedule.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:op_types",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/clusters:cluster",
+        "//tensorflow/core/grappler/costs:cost_estimator",
+        "//tensorflow/core/grappler/costs:graph_properties",
+        "//tensorflow/core/grappler/costs:op_level_cost_estimator",
+        "//tensorflow/core/grappler/costs:virtual_placer",
+    ],
+)
+
+cc_test(
+    name = "static_schedule_test",
+    srcs = ["static_schedule_test.cc"],
+    deps = [
+        ":static_schedule",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/clusters:virtual_cluster",
+        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+    ],
+)
+
 cc_library(
     name = "auto_parallel",
     srcs = ["auto_parallel.cc"],
diff --git a/tensorflow/core/grappler/optimizers/static_schedule.cc b/tensorflow/core/grappler/optimizers/static_schedule.cc
new file mode 100644
index 0000000000..1a7f1e04e8
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/static_schedule.cc
@@ -0,0 +1,121 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/static_schedule.h"
+#include <deque>
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/grappler/costs/graph_properties.h"
+#include "tensorflow/core/grappler/costs/op_level_cost_estimator.h"
+#include "tensorflow/core/grappler/costs/virtual_placer.h"
+#include "tensorflow/core/grappler/op_types.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+
+namespace tensorflow {
+namespace grappler {
+
+static Costs::NanoSeconds PredictExecutionTime(
+    const GraphProperties& properties, const OpLevelCostEstimator& estimator,
+    const VirtualPlacer& placer, const NodeDef& node) {
+  OpInfo op_features;
+  op_features.set_op(node.op());
+  *op_features.mutable_attr() = node.attr();
+
+  std::vector<OpInfo::TensorProperties> inputs =
+      properties.GetInputProperties(node.name());
+  for (auto& input : inputs) {
+    op_features.add_inputs()->Swap(&input);
+  }
+
+  DeviceProperties device = placer.get_device(node);
+  op_features.mutable_device()->Swap(&device);
+
+  Costs::NanoSeconds estimate =
+      estimator.PredictCosts(op_features).execution_time;
+  return estimate;
+}
+
+Status EstimateEarliestExecutionTimes(
+    const GrapplerItem& item, const Cluster* cluster,
+    std::unordered_map<const NodeDef*, Costs::NanoSeconds>* completion_times) {
+  std::unordered_map<string, const NodeDef*> name_map;
+  std::unordered_map<const NodeDef*, int> pending_inputs;
+  std::deque<const NodeDef*> ready_nodes;
+  for (const NodeDef& node : item.graph.node()) {
+    name_map[node.name()] = &node;
+    if (node.input_size() == 0) {
+      ready_nodes.push_back(&node);
+      (*completion_times)[&node] = 0;
+    } else if (IsMerge(node)) {
+      // Merge nodes are processed as soon as one of the input becomes
+      // available.
+      pending_inputs[&node] = 1;
+    } else {
+      pending_inputs[&node] = node.input_size();
+    }
+  }
+
+  std::unordered_map<const NodeDef*, std::vector<const NodeDef*>> fanouts;
+  for (const NodeDef& node : item.graph.node()) {
+    for (const string& input : node.input()) {
+      string node_name = NodeName(input);
+      auto it = name_map.find(node_name);
+      if (it == name_map.end()) {
+        return errors::InvalidArgument(
+            strings::StrCat("Unknown input node ", input));
+      }
+      const NodeDef* fanin = it->second;
+      fanouts[fanin].push_back(&node);
+    }
+  }
+  name_map.clear();
+
+  GraphProperties properties(item);
+  TF_RETURN_IF_ERROR(properties.InferStatically());
+  OpLevelCostEstimator estimator;
+  VirtualPlacer placer(cluster);
+
+  while (!ready_nodes.empty()) {
+    const NodeDef* node = ready_nodes.front();
+    ready_nodes.pop_front();
+
+    Costs::NanoSeconds execution_time =
+        PredictExecutionTime(properties, estimator, placer, *node);
+    Costs::NanoSeconds completion_time =
+        execution_time + (*completion_times)[node];
+    (*completion_times)[node] = completion_time;
+
+    for (const NodeDef* fanout : fanouts[node]) {
+      int pending = pending_inputs[fanout];
+      if (pending == 0) {
+        // Already processed. Avoid going through loops more than once.
+        continue;
+      } else if (pending == 1) {
+        ready_nodes.push_back(fanout);
+      }
+      pending_inputs[fanout]--;
+
+      Costs::NanoSeconds ready_time =
+          std::max(completion_time, (*completion_times)[fanout]);
+      (*completion_times)[fanout] = ready_time;
+    }
+  }
+
+  return Status::OK();
+}
+
+}  // end namespace grappler
+}  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/optimizers/static_schedule.h b/tensorflow/core/grappler/optimizers/static_schedule.h
new file mode 100644
index 0000000000..b87d86c88a
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/static_schedule.h
@@ -0,0 +1,38 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_OPTIMIZERS_STATIC_SCHEDULE_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_OPTIMIZERS_STATIC_SCHEDULE_H_
+
+#include <unordered_map>
+
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/clusters/cluster.h"
+#include "tensorflow/core/grappler/costs/cost_estimator.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Compute the earliest time as which the execution of each node in the graph
+// can complete.
+Status EstimateEarliestExecutionTimes(
+    const GrapplerItem& item, const Cluster* cluster,
+    std::unordered_map<const NodeDef*, Costs::NanoSeconds>* execution_times);
+
+}  // namespace grappler
+}  // end namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_OPTIMIZERS_STATIC_SCHEDULE_H_
diff --git a/tensorflow/core/grappler/optimizers/static_schedule_test.cc b/tensorflow/core/grappler/optimizers/static_schedule_test.cc
new file mode 100644
index 0000000000..a96ee69ce3
--- /dev/null
+++ b/tensorflow/core/grappler/optimizers/static_schedule_test.cc
@@ -0,0 +1,84 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/optimizers/static_schedule.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/clusters/virtual_cluster.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h"
+#include "tensorflow/core/grappler/utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class StaticScheduleTest : public ::testing::Test {};
+
+TEST_F(StaticScheduleTest, BasicGraph) {
+  // This trivial graph is so basic there's nothing to prune.
+  TrivialTestGraphInputYielder fake_input(4, 1, 10, false, {"CPU:0"});
+  GrapplerItem item;
+  CHECK(fake_input.NextItem(&item));
+
+  DeviceProperties cpu_device;
+  std::unordered_map<string, DeviceProperties> devices;
+  devices["CPU"] = cpu_device;
+  VirtualCluster cluster(devices);
+
+  std::unordered_map<const NodeDef*, Costs::NanoSeconds> completion_times;
+  Status status =
+      EstimateEarliestExecutionTimes(item, &cluster, &completion_times);
+  TF_EXPECT_OK(status);
+
+  EXPECT_EQ(item.graph.node_size(), completion_times.size());
+}
+
+TEST_F(StaticScheduleTest, BasicGraphWithCtrlDependencies) {
+  // Build a simple graph with a control dependency.
+  tensorflow::Scope s = tensorflow::Scope::NewRootScope();
+
+  Output a = ops::Const(s.WithOpName("a"), 0.0f, {10, 10});
+  Output b = ops::AddN(s.WithOpName("b"), {a});
+  Output c = ops::Identity(s.WithOpName("c"), b);
+  Output d = ops::Identity(s.WithOpName("d"), c);
+  Output e = ops::AddN(s.WithOpName("e"), {d});
+
+  GrapplerItem item;
+  TF_CHECK_OK(s.ToGraphDef(&item.graph));
+
+  // Add a control dependency between c and e.
+  EXPECT_EQ("c", item.graph.node(2).name());
+  EXPECT_EQ("e", item.graph.node(4).name());
+  *item.graph.mutable_node(4)->add_input() = "^c";
+
+  DeviceProperties cpu_device;
+  std::unordered_map<string, DeviceProperties> devices;
+  devices["CPU"] = cpu_device;
+  VirtualCluster cluster(devices);
+
+  std::unordered_map<const NodeDef*, Costs::NanoSeconds> completion_times;
+  Status status =
+      EstimateEarliestExecutionTimes(item, &cluster, &completion_times);
+  TF_EXPECT_OK(status);
+
+  EXPECT_EQ(item.graph.node_size(), completion_times.size());
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
-- 
GitLab


From 79c7dfaca7cd8f119c044db3b1d156dd2be0fad8 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Wed, 10 May 2017 17:55:06 -0700
Subject: [PATCH 1205/1563] Decode raw op should return when input is empty.

PiperOrigin-RevId: 155699009
---
 tensorflow/core/kernels/decode_raw_op.cc             | 2 +-
 tensorflow/python/kernel_tests/decode_raw_op_test.py | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/kernels/decode_raw_op.cc b/tensorflow/core/kernels/decode_raw_op.cc
index 4247abcd71..da247161f9 100644
--- a/tensorflow/core/kernels/decode_raw_op.cc
+++ b/tensorflow/core/kernels/decode_raw_op.cc
@@ -50,7 +50,7 @@ class DecodeRawOp : public OpKernel {
       }
     }
     TensorShape out_shape = input.shape();
-    if (str_size == -1) {  // Empty input
+    if (str_size == -1 || str_size == 0) {  // Empty input
       out_shape.AddDim(1);
       Tensor* output_tensor = nullptr;
       OP_REQUIRES_OK(context, context->allocate_output("output", out_shape,
diff --git a/tensorflow/python/kernel_tests/decode_raw_op_test.py b/tensorflow/python/kernel_tests/decode_raw_op_test.py
index cd7216c527..fbaf335efb 100644
--- a/tensorflow/python/kernel_tests/decode_raw_op_test.py
+++ b/tensorflow/python/kernel_tests/decode_raw_op_test.py
@@ -77,6 +77,14 @@ class DecodeRawOpTest(test.TestCase):
 
       self.assertAllEqual(expected_result, result)
 
+  def testEmptyStringInput(self):
+    with self.test_session():
+      in_bytes = array_ops.placeholder(dtypes.string, shape=[None])
+      decode = parsing_ops.decode_raw(in_bytes, out_type=dtypes.float16)
+
+      result = decode.eval(feed_dict={in_bytes: [""]})
+      self.assertEqual(len(result), 1)
+
 
 if __name__ == "__main__":
   test.main()
-- 
GitLab


From 0e35d4603a8a55e6cc6a2fd979b7b90df9a6dbc4 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 10 May 2017 18:15:39 -0700
Subject: [PATCH 1206/1563] Added ability to compute SCC for a graphdef.

PiperOrigin-RevId: 155700672
---
 tensorflow/BUILD                           |   1 +
 tensorflow/core/grappler/BUILD             |   1 +
 tensorflow/core/grappler/utils/BUILD       |  55 +++
 tensorflow/core/grappler/utils/scc.cc      | 176 +++++++++
 tensorflow/core/grappler/utils/scc.h       |  38 ++
 tensorflow/core/grappler/utils/scc_test.cc | 410 +++++++++++++++++++++
 6 files changed, 681 insertions(+)
 create mode 100644 tensorflow/core/grappler/utils/BUILD
 create mode 100644 tensorflow/core/grappler/utils/scc.cc
 create mode 100644 tensorflow/core/grappler/utils/scc.h
 create mode 100644 tensorflow/core/grappler/utils/scc_test.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 981e913f9b..dd1d521e68 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -282,6 +282,7 @@ filegroup(
         "//tensorflow/core/grappler/costs:all_files",
         "//tensorflow/core/grappler/inputs:all_files",
         "//tensorflow/core/grappler/optimizers:all_files",
+        "//tensorflow/core/grappler/utils:all_files",
         "//tensorflow/core/kernels:all_files",
         "//tensorflow/core/kernels/hexagon:all_files",
         "//tensorflow/core/ops/compat:all_files",
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index 8836f2ffa7..c2ae618420 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -28,6 +28,7 @@ filegroup(
         "//tensorflow/core/grappler/clusters:android_srcs",
         "//tensorflow/core/grappler/inputs:android_srcs",
         "//tensorflow/core/grappler/optimizers:android_srcs",
+        "//tensorflow/core/grappler/utils:android_srcs",
     ],
     visibility = ["//tensorflow:__subpackages__"],
 )
diff --git a/tensorflow/core/grappler/utils/BUILD b/tensorflow/core/grappler/utils/BUILD
new file mode 100644
index 0000000000..0bbd6d65cc
--- /dev/null
+++ b/tensorflow/core/grappler/utils/BUILD
@@ -0,0 +1,55 @@
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+filegroup(
+    name = "mobile_srcs",
+    srcs = [
+        "scc.cc",
+        "scc.h",
+    ],
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+alias(
+    name = "android_srcs",
+    actual = ":mobile_srcs",
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+cc_library(
+    name = "scc",
+    srcs = ["scc.cc"],
+    hdrs = ["scc.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:utils",
+    ],
+)
+
+cc_test(
+    name = "scc_test",
+    srcs = ["scc_test.cc"],
+    deps = [
+        ":scc",
+        "//tensorflow/core:lib_proto_parsing",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler/clusters:virtual_cluster",
+        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+    ],
+)
diff --git a/tensorflow/core/grappler/utils/scc.cc b/tensorflow/core/grappler/utils/scc.cc
new file mode 100644
index 0000000000..6568e99aa3
--- /dev/null
+++ b/tensorflow/core/grappler/utils/scc.cc
@@ -0,0 +1,176 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/utils/scc.h"
+#include <stack>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/utils.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Data structure used to store data for Tarjan's Strongly Connected
+// Components algorithm.
+struct SCCNodeData {
+  SCCNodeData()
+      : node(nullptr),
+        index(-1),
+        lowlink(-1),
+        onstack(false),
+        caller(nullptr),
+        caller_loop_location(-1) {}
+  void ResetStack(int new_index, SCCNodeData* new_caller) {
+    index = new_index;
+    lowlink = new_index;
+    onstack = true;
+    caller = new_caller;
+    caller_loop_location = 0;
+  }
+  const NodeDef* node;
+  int index;
+  int lowlink;
+  bool onstack;
+  std::vector<SCCNodeData*> children;
+  // StrongConnect "call stack" storage.
+  SCCNodeData* caller;       // Node calling StrongConnect
+  int caller_loop_location;  // Index in parent StrongConnect for loop
+};
+
+// Core DFS step of Tarjan's Strongly Connected Component algorithm
+// (implemented using iteration instead of recursion).
+void StrongConnect(SCCNodeData* v, std::stack<SCCNodeData*>* stack, int* index,
+                   std::unordered_map<const NodeDef*, int>* components,
+                   int* scc_index) {
+  // Iterative version of Tarjan's StrongConnect function.
+  // The "call stack" state is composed of a SCCNodeData's caller and
+  // caller_loop_location properties.
+  v->ResetStack(*index /* index */, nullptr /* caller */);
+  ++*index;
+  stack->push(v);
+
+  // No one put v on a StrongConnect call stack, reset caller values.
+  v->caller = nullptr;
+  v->caller_loop_location = 0;
+
+  SCCNodeData* last = v;
+  while (true) {
+    if (last->caller_loop_location < last->children.size()) {
+      // Recursive equivalent: Looping over the children of v (possibly
+      // continuing at v->caller_loop_location after having finished a
+      // recursive call.
+      SCCNodeData* w = last->children[last->caller_loop_location];
+      ++(last->caller_loop_location);  // For loop iterator increment
+      if (w->index == -1) {
+        w->ResetStack(*index /* index */, last /* caller */);
+        ++*index;
+        stack->push(w);
+        last = w;
+      } else if (w->onstack == true) {
+        last->lowlink = std::min(last->lowlink, w->index);
+      }
+    } else {
+      // At the end of v's children
+      if (last->lowlink == last->index) {
+        // v is the root of a strongly connected component
+        SCCNodeData* top;
+        while (true) {
+          top = stack->top();
+          stack->pop();
+          top->onstack = false;
+          (*components)[top->node] = *scc_index;
+          if (top == last) {
+            break;
+          }
+        }
+        ++*scc_index;
+      }
+
+      // Go up the recursive call stack
+      SCCNodeData* next_last = last->caller;
+      if (next_last == nullptr) {
+        // All nodes have been seen; finished.
+        break;
+      } else {
+        next_last->lowlink = std::min(next_last->lowlink, last->lowlink);
+        last = next_last;
+      }
+    }
+  }
+}
+
+// This is an implementation of Tarjan's Strongly Connected Components
+// DFS algorithm.  Most of the hard work is done in the function
+// StrongConnect, which is an iterative reimplementation of the
+// recursive version described here:
+//   https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm
+//
+// The edges for the purpose of this algorithm are directed from input
+// to op (the reverse of the declarations of the NodeDef, which
+// contain in-edges)
+void StronglyConnectedComponents(
+    const GraphDef& graph, std::unordered_map<const NodeDef*, int>* components,
+    int* num_components) {
+  std::stack<SCCNodeData*> stack;
+  std::unordered_map<string, SCCNodeData*> name_to_data;
+  std::vector<SCCNodeData> node_data_container;
+  node_data_container.reserve(graph.node_size());
+  std::unordered_map<const NodeDef*, SCCNodeData*> node_to_data;
+
+  for (const NodeDef& node : graph.node()) {
+    SCCNodeData node_data;
+    node_data.node = &node;
+    node_data_container.push_back(node_data);
+    name_to_data[node.name()] = &(*node_data_container.rbegin());
+    node_to_data[&node] = &(*node_data_container.rbegin());
+  }
+
+  // Create a list of top-level parents (add them to object queue)
+  // Also create a mapping from nodes to their children.
+  for (const NodeDef& node : graph.node()) {
+    for (const string& input : node.input()) {
+      name_to_data[NodeName(input)]->children.push_back(node_to_data[&node]);
+    }
+  }
+
+  components->clear();
+  *num_components = 0;
+  int index = 0;
+  for (auto& v : node_data_container) {
+    if (v.index == -1) {
+      // Node has not yet been visited.  Start a DFS at v.
+      StrongConnect(&v, &stack, &index, components, num_components);
+    }
+  }
+
+  std::vector<int> counts_per_component(*num_components, 0);
+  for (auto& component : *components) {
+    DCHECK(component.second >= 0);
+    DCHECK(component.second < *num_components);
+    counts_per_component[component.second]++;
+  }
+  for (auto& component : *components) {
+    if (counts_per_component[component.second] == 1) {
+      component.second = -1;
+      (*num_components)--;
+    }
+  }
+  (*num_components) += 1;
+}
+
+}  // namespace grappler
+}  // namespace tensorflow
diff --git a/tensorflow/core/grappler/utils/scc.h b/tensorflow/core/grappler/utils/scc.h
new file mode 100644
index 0000000000..8b0577763d
--- /dev/null
+++ b/tensorflow/core/grappler/utils/scc.h
@@ -0,0 +1,38 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_UTILS_SCC_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_UTILS_SCC_H_
+
+#include <unordered_map>
+#include "tensorflow/core/framework/graph.pb.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Compute modified strongly connected components:
+// All nodes that are not part of a loop are assigned the special -1 id
+// All nodes that are part of at least one loop are assigned a positive
+// component id: if 2 nodes v and w are reachable from one another (i.e. if they
+// belong to the same scc), they'll be assigned the same id, otherwise they'll
+// be assigned distinct ids. Returns the number of distinct ids.
+void StronglyConnectedComponents(
+    const GraphDef& graph, std::unordered_map<const NodeDef*, int>* components,
+    int* num_ids);
+
+}  // namespace grappler
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_UTILS_SCC_H_
diff --git a/tensorflow/core/grappler/utils/scc_test.cc b/tensorflow/core/grappler/utils/scc_test.cc
new file mode 100644
index 0000000000..3185cbe232
--- /dev/null
+++ b/tensorflow/core/grappler/utils/scc_test.cc
@@ -0,0 +1,410 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/utils/scc.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/clusters/virtual_cluster.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/inputs/trivial_test_graph_input_yielder.h"
+#include "tensorflow/core/platform/protobuf.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class SCCTest : public ::testing::Test {
+ public:
+  void SetUp() override {
+    std::unordered_map<string, DeviceProperties> devices;
+    DeviceProperties unknown_device;
+    devices["MY_DEVICE"] = unknown_device;
+    cluster_.reset(new VirtualCluster(devices));
+    TF_CHECK_OK(cluster_->Provision());
+  }
+
+  void TearDown() override { cluster_.reset(); }
+
+ protected:
+  static NodeDef CreateNode(const string& name,
+                            gtl::ArraySlice<string> inputs) {
+    NodeDef node;
+    node.set_name(name);
+    for (const string& input : inputs) {
+      node.add_input(input);
+    }
+    return node;
+  }
+
+  std::unique_ptr<VirtualCluster> cluster_;
+};
+
+TEST_F(SCCTest, NoLoops) {
+  // Create a simple graph without any loop.
+  TrivialTestGraphInputYielder fake_input(4, 1, 10, false,
+                                          cluster_->GetDeviceNames());
+  GrapplerItem item;
+  CHECK(fake_input.NextItem(&item));
+
+  std::unordered_map<const NodeDef*, int> components;
+  int num_components;
+  StronglyConnectedComponents(item.graph, &components, &num_components);
+
+  EXPECT_EQ(num_components, 1);
+  for (const auto& node : item.graph.node()) {
+    EXPECT_EQ(-1, components[&node]);
+  }
+}
+
+TEST_F(SCCTest, DisjointCycleAndPath) {
+  GraphDef graph;
+  // Create a cycle
+  *graph.add_node() = CreateNode("a", {"d"});
+  *graph.add_node() = CreateNode("b", {"a"});
+  *graph.add_node() = CreateNode("c", {"b"});
+  *graph.add_node() = CreateNode("d", {"c"});
+
+  // Add a path disjoint from cycle
+  *graph.add_node() = CreateNode("e", {});
+  *graph.add_node() = CreateNode("f", {"e"});
+  *graph.add_node() = CreateNode("g", {"f"});
+  *graph.add_node() = CreateNode("h", {"g"});
+
+  std::vector<const NodeDef*> nodes;
+  std::unordered_map<string, const NodeDef*> name_to_node;
+  for (const auto& n : graph.node()) {
+    nodes.push_back(&n);
+    name_to_node[n.name()] = &n;
+  }
+
+  int num_components;
+  std::unordered_map<const NodeDef*, int> components;
+  StronglyConnectedComponents(graph, &components, &num_components);
+
+  EXPECT_EQ(num_components, 2);
+
+  for (const auto& pair : {std::make_pair("a", "b"), std::make_pair("a", "c"),
+                           std::make_pair("a", "d")}) {
+    EXPECT_EQ(components[name_to_node[pair.first]],
+              components[name_to_node[pair.second]]);
+  }
+
+  for (const auto& node : {"e", "f", "g", "h"})
+    EXPECT_EQ(-1, components[name_to_node[node]]);
+}
+}  // namespace
+
+TEST_F(SCCTest, WikipediaExample) {
+  // Graph with 4 SCCs:
+
+  // SCC1:
+  // a -> b
+  // b -> c
+  // c -> a
+
+  // d -> b
+  // d -> c
+
+  // SCC2:
+  // d -> e
+  // e -> d
+
+  // e -> f
+  // f -> c
+
+  // SCC3:
+  // f -> g
+  // g -> f
+
+  // h -> g
+  // h -> d
+
+  // SCC4:
+  // h -> h
+
+  // NodeDefs define inbound connections (inputs)
+  GraphDef graph;
+  *graph.add_node() = CreateNode("a", {"c"});
+  *graph.add_node() = CreateNode("b", {"a", "d"});
+  *graph.add_node() = CreateNode("c", {"b", "d", "f"});
+  *graph.add_node() = CreateNode("d", {"e"});
+  *graph.add_node() = CreateNode("e", {"d"});
+  *graph.add_node() = CreateNode("f", {"e", "g"});
+  *graph.add_node() = CreateNode("g", {"f", "h"});
+  *graph.add_node() = CreateNode("h", {"h"});
+
+  std::vector<const NodeDef*> nodes;
+  std::unordered_map<string, const NodeDef*> name_to_node;
+  for (const auto& n : graph.node()) {
+    nodes.push_back(&n);
+    name_to_node[n.name()] = &n;
+  }
+
+  int num_components;
+  std::unordered_map<const NodeDef*, int> components;
+  StronglyConnectedComponents(graph, &components, &num_components);
+
+  EXPECT_EQ(num_components, 4);
+  for (const auto& pair :
+       {std::make_pair("a", "b"), std::make_pair("a", "c"),
+        std::make_pair("d", "e"), std::make_pair("f", "g")}) {
+    EXPECT_EQ(components[name_to_node[pair.first]],
+              components[name_to_node[pair.second]]);
+  }
+
+  for (const auto& pair :
+       {std::make_pair("a", "d"), std::make_pair("a", "f"),
+        std::make_pair("a", "h"), std::make_pair("d", "f"),
+        std::make_pair("d", "h"), std::make_pair("f", "h")}) {
+    EXPECT_NE(components[name_to_node[pair.first]],
+              components[name_to_node[pair.second]]);
+  }
+}
+
+TEST_F(SCCTest, TensorFlowLoop) {
+  // Test graph produced in python using:
+  /*
+     with tf.Graph().as_default():
+       i = tf.constant(0)
+       c = lambda i: tf.less(i, 10)
+       b = lambda i: tf.add(i, 1)
+       r = tf.while_loop(c, b, [i])
+       with open('/tmp/graph.txt', 'w') as f:
+         f.write(str(tf.get_default_graph().as_graph_def()))
+  */
+  const string gdef_ascii = R"EOF(
+node {
+  name: "Const"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "while/Enter"
+  op: "Enter"
+  input: "Const"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "frame_name"
+    value {
+      s: "while/while/"
+    }
+  }
+  attr {
+    key: "is_constant"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "parallel_iterations"
+    value {
+      i: 10
+    }
+  }
+}
+node {
+  name: "while/Merge"
+  op: "Merge"
+  input: "while/Enter"
+  input: "while/NextIteration"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/Less/y"
+  op: "Const"
+  input: "^while/Merge"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "while/Less"
+  op: "Less"
+  input: "while/Merge"
+  input: "while/Less/y"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/LoopCond"
+  op: "LoopCond"
+  input: "while/Less"
+}
+node {
+  name: "while/Switch"
+  op: "Switch"
+  input: "while/Merge"
+  input: "while/LoopCond"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@while/Merge"
+      }
+    }
+  }
+}
+node {
+  name: "while/Identity"
+  op: "Identity"
+  input: "while/Switch:1"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/Add/y"
+  op: "Const"
+  input: "^while/Identity"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "while/Add"
+  op: "Add"
+  input: "while/Identity"
+  input: "while/Add/y"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/NextIteration"
+  op: "NextIteration"
+  input: "while/Add"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "while/Exit"
+  op: "Exit"
+  input: "while/Switch"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+versions {
+  producer: 11
+}
+  )EOF";
+
+  GrapplerItem item;
+  CHECK(protobuf::TextFormat::ParseFromString(gdef_ascii, &item.graph));
+
+  std::unordered_map<const NodeDef*, int> components;
+  int num_components;
+  StronglyConnectedComponents(item.graph, &components, &num_components);
+
+  EXPECT_EQ(num_components, 2);
+  for (const auto& node : item.graph.node()) {
+    if (node.name() == "Const" || node.name() == "while/Enter" ||
+        node.name() == "while/Exit") {
+      // These nodes are not part of the loop, they should be assigned the id
+      // -1.
+      EXPECT_EQ(-1, components[&node]);
+    } else {
+      // These nodes are part of the loop, they should be assigned a positive
+      // id.
+      EXPECT_LE(0, components[&node]);
+    }
+  }
+}
+
+}  // namespace grappler
+}  // namespace tensorflow
-- 
GitLab


From 28d2c7b1bf0c6aa7e0f915118fcd4c0be29cbb0e Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 10 May 2017 18:21:23 -0700
Subject: [PATCH 1207/1563] [TF:XLA] Add XLA implementation of
 ResourceApplyAdam.

Add a "graph" property to ResourceVariable for compatibility with Variable.

PiperOrigin-RevId: 155701128
---
 tensorflow/compiler/tests/BUILD               |  14 ++
 tensorflow/compiler/tests/adagrad_test.py     |   2 +-
 tensorflow/compiler/tests/adam_test.py        | 176 ++++++++++++++++++
 .../compiler/tf2xla/kernels/training_ops.cc   | 100 ++++++++++
 .../python/ops/resource_variable_ops.py       |   5 +
 5 files changed, 296 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/compiler/tests/adam_test.py

diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD
index 0592e3d4b1..4fd68a94a5 100644
--- a/tensorflow/compiler/tests/BUILD
+++ b/tensorflow/compiler/tests/BUILD
@@ -65,6 +65,20 @@ tf_xla_py_test(
     ],
 )
 
+tf_xla_py_test(
+    name = "adam_test",
+    size = "small",
+    srcs = ["adam_test.py"],
+    deps = [
+        ":xla_test",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:training",
+    ],
+)
+
 tf_xla_py_test(
     name = "binary_ops_test",
     size = "small",
diff --git a/tensorflow/compiler/tests/adagrad_test.py b/tensorflow/compiler/tests/adagrad_test.py
index 0a2c9e26c6..a5c5885b42 100644
--- a/tensorflow/compiler/tests/adagrad_test.py
+++ b/tensorflow/compiler/tests/adagrad_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Functional tests for aggregate operations."""
+"""Tests for Adagrad."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/compiler/tests/adam_test.py b/tensorflow/compiler/tests/adam_test.py
new file mode 100644
index 0000000000..3215dc36e5
--- /dev/null
+++ b/tensorflow/compiler/tests/adam_test.py
@@ -0,0 +1,176 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for Adam."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.compiler.tests.xla_test import XLATestCase
+from tensorflow.python.framework import constant_op
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import resource_variable_ops
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+from tensorflow.python.training import adam
+
+
+def adam_update_numpy(param,
+                      g_t,
+                      t,
+                      m,
+                      v,
+                      alpha=0.001,
+                      beta1=0.9,
+                      beta2=0.999,
+                      epsilon=1e-8):
+  alpha_t = alpha * np.sqrt(1 - beta2**t) / (1 - beta1**t)
+
+  m_t = beta1 * m + (1 - beta1) * g_t
+  v_t = beta2 * v + (1 - beta2) * g_t * g_t
+
+  param_t = param - alpha_t * m_t / (np.sqrt(v_t) + epsilon)
+  return param_t, m_t, v_t
+
+
+class AdamOptimizerTest(XLATestCase):
+
+  def testBasic(self):
+    for dtype in self.float_types:
+      with self.test_session(), self.test_scope():
+        variable_scope.get_variable_scope().set_use_resource(True)
+
+        # Initialize variables for numpy implementation.
+        m0, v0, m1, v1 = 0.0, 0.0, 0.0, 0.0
+        var0_np = np.array([1.0, 2.0], dtype=dtype)
+        grads0_np = np.array([0.1, 0.1], dtype=dtype)
+        var1_np = np.array([3.0, 4.0], dtype=dtype)
+        grads1_np = np.array([0.01, 0.01], dtype=dtype)
+
+        var0 = resource_variable_ops.ResourceVariable(var0_np)
+        var1 = resource_variable_ops.ResourceVariable(var1_np)
+        grads0 = array_ops.placeholder(dtype)
+        grads1 = array_ops.placeholder(dtype)
+        opt = adam.AdamOptimizer()
+        update = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        variables.global_variables_initializer().run()
+
+        # Fetch params to validate initial values
+        self.assertAllClose([1.0, 2.0], var0.eval())
+        self.assertAllClose([3.0, 4.0], var1.eval())
+
+        beta1_power, beta2_power = opt._get_beta_accumulators()
+
+        # Run 3 steps of Adam
+        for t in range(1, 4):
+          self.assertAllCloseAccordingToType(0.9**t, beta1_power.eval())
+          self.assertAllCloseAccordingToType(0.999**t, beta2_power.eval())
+          update.run(feed_dict={grads0: grads0_np, grads1: grads1_np})
+
+          var0_np, m0, v0 = adam_update_numpy(var0_np, grads0_np, t, m0, v0)
+          var1_np, m1, v1 = adam_update_numpy(var1_np, grads1_np, t, m1, v1)
+
+          # Validate updated params
+          self.assertAllCloseAccordingToType(var0_np, var0.eval())
+          self.assertAllCloseAccordingToType(var1_np, var1.eval())
+
+  def testTensorLearningRate(self):
+    for dtype in self.float_types:
+      with self.test_session(), self.test_scope():
+        variable_scope.get_variable_scope().set_use_resource(True)
+
+        # Initialize variables for numpy implementation.
+        m0, v0, m1, v1 = 0.0, 0.0, 0.0, 0.0
+        var0_np = np.array([1.0, 2.0], dtype=dtype)
+        grads0_np = np.array([0.1, 0.1], dtype=dtype)
+        var1_np = np.array([3.0, 4.0], dtype=dtype)
+        grads1_np = np.array([0.01, 0.01], dtype=dtype)
+
+        var0 = resource_variable_ops.ResourceVariable(var0_np)
+        var1 = resource_variable_ops.ResourceVariable(var1_np)
+        grads0 = array_ops.placeholder(dtype)
+        grads1 = array_ops.placeholder(dtype)
+        opt = adam.AdamOptimizer(constant_op.constant(0.001))
+        update = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        variables.global_variables_initializer().run()
+
+        # Fetch params to validate initial values
+        self.assertAllClose([1.0, 2.0], var0.eval())
+        self.assertAllClose([3.0, 4.0], var1.eval())
+
+        beta1_power, beta2_power = opt._get_beta_accumulators()
+
+        # Run 3 steps of Adam
+        for t in range(1, 4):
+          self.assertAllCloseAccordingToType(0.9**t, beta1_power.eval())
+          self.assertAllCloseAccordingToType(0.999**t, beta2_power.eval())
+          update.run(feed_dict={grads0: grads0_np, grads1: grads1_np})
+
+          var0_np, m0, v0 = adam_update_numpy(var0_np, grads0_np, t, m0, v0)
+          var1_np, m1, v1 = adam_update_numpy(var1_np, grads1_np, t, m1, v1)
+
+          # Validate updated params
+          self.assertAllCloseAccordingToType(var0_np, var0.eval())
+          self.assertAllCloseAccordingToType(var1_np, var1.eval())
+
+  def testSharing(self):
+    for dtype in self.float_types:
+      with self.test_session(), self.test_scope():
+        variable_scope.get_variable_scope().set_use_resource(True)
+
+        # Initialize variables for numpy implementation.
+        m0, v0, m1, v1 = 0.0, 0.0, 0.0, 0.0
+        var0_np = np.array([1.0, 2.0], dtype=dtype)
+        grads0_np = np.array([0.1, 0.1], dtype=dtype)
+        var1_np = np.array([3.0, 4.0], dtype=dtype)
+        grads1_np = np.array([0.01, 0.01], dtype=dtype)
+
+        var0 = resource_variable_ops.ResourceVariable(var0_np)
+        var1 = resource_variable_ops.ResourceVariable(var1_np)
+        grads0 = array_ops.placeholder(dtype)
+        grads1 = array_ops.placeholder(dtype)
+        opt = adam.AdamOptimizer()
+        update1 = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        update2 = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        variables.global_variables_initializer().run()
+
+        beta1_power, beta2_power = opt._get_beta_accumulators()
+
+        # Fetch params to validate initial values
+        self.assertAllClose([1.0, 2.0], var0.eval())
+        self.assertAllClose([3.0, 4.0], var1.eval())
+
+        # Run 3 steps of intertwined Adam1 and Adam2.
+        for t in range(1, 4):
+          self.assertAllCloseAccordingToType(0.9**t, beta1_power.eval())
+          self.assertAllCloseAccordingToType(0.999**t, beta2_power.eval())
+          if t % 2 == 0:
+            update1.run(feed_dict={grads0: grads0_np, grads1: grads1_np})
+          else:
+            update2.run(feed_dict={grads0: grads0_np, grads1: grads1_np})
+
+          var0_np, m0, v0 = adam_update_numpy(var0_np, grads0_np, t, m0, v0)
+          var1_np, m1, v1 = adam_update_numpy(var1_np, grads1_np, t, m1, v1)
+
+          # Validate updated params
+          self.assertAllCloseAccordingToType(var0_np, var0.eval())
+          self.assertAllCloseAccordingToType(var1_np, var1.eval())
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/compiler/tf2xla/kernels/training_ops.cc b/tensorflow/compiler/tf2xla/kernels/training_ops.cc
index f1d81f8714..ddd81cb490 100644
--- a/tensorflow/compiler/tf2xla/kernels/training_ops.cc
+++ b/tensorflow/compiler/tf2xla/kernels/training_ops.cc
@@ -165,6 +165,106 @@ class ResourceApplyAdagrad : public XlaOpKernel {
 };
 REGISTER_XLA_OP(Name("ResourceApplyAdagrad"), ResourceApplyAdagrad);
 
+class ResourceApplyAdam : public XlaOpKernel {
+ public:
+  explicit ResourceApplyAdam(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("T", &dtype_));
+  }
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    DataType var_type, m_type, v_type;
+    TensorShape var_shape, m_shape, v_shape;
+    OP_REQUIRES_OK(ctx, ctx->GetVariableTypeAndShape(0, &var_type, &var_shape));
+    OP_REQUIRES_OK(ctx, ctx->GetVariableTypeAndShape(1, &m_type, &m_shape));
+    OP_REQUIRES_OK(ctx, ctx->GetVariableTypeAndShape(2, &v_type, &v_shape));
+
+    OP_REQUIRES(
+        ctx, dtype_ == var_type && dtype_ == m_type && dtype_ == v_type,
+        errors::InvalidArgument(
+            "Types of variable arguments to ResourceApplyRMSProp must match: ",
+            DataTypeString(dtype_), " vs. ", DataTypeString(var_type), " vs. ",
+            DataTypeString(m_type), " vs. ", DataTypeString(v_type)));
+
+    TensorShape beta1_power_shape = ctx->InputShape(3);
+    TensorShape beta2_power_shape = ctx->InputShape(4);
+    TensorShape lr_shape = ctx->InputShape(5);
+    TensorShape beta1_shape = ctx->InputShape(6);
+    TensorShape beta2_shape = ctx->InputShape(7);
+    TensorShape epsilon_shape = ctx->InputShape(8);
+    TensorShape grad_shape = ctx->InputShape(9);
+
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1_power_shape),
+                errors::InvalidArgument("beta1_power is not a scalar: ",
+                                        beta1_power_shape.DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2_power_shape),
+                errors::InvalidArgument("beta2_power is not a scalar: ",
+                                        beta2_power_shape.DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(lr_shape),
+                errors::InvalidArgument("lr is not a scalar : ",
+                                        lr_shape.DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta1_shape),
+                errors::InvalidArgument("beta1 is not a scalar: ",
+                                        beta1_shape.DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(beta2_shape),
+                errors::InvalidArgument("beta2 is not a scalar: ",
+                                        beta2_shape.DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(epsilon_shape),
+                errors::InvalidArgument("epsilon is not a scalar: ",
+                                        epsilon_shape.DebugString()));
+
+    OP_REQUIRES(ctx, var_shape.IsSameSize(m_shape),
+                errors::InvalidArgument("var and m do not have the same shape",
+                                        var_shape.DebugString(), " ",
+                                        m_shape.DebugString()));
+    OP_REQUIRES(ctx, var_shape.IsSameSize(v_shape),
+                errors::InvalidArgument("var and v do not have the same shape",
+                                        var_shape.DebugString(), " ",
+                                        v_shape.DebugString()));
+    OP_REQUIRES(ctx, var_shape.IsSameSize(grad_shape),
+                errors::InvalidArgument(
+                    "var and grad do not have the same shape",
+                    var_shape.DebugString(), " ", grad_shape.DebugString()));
+
+    xla::ComputationDataHandle var, m, v;
+    OP_REQUIRES_OK(ctx, ctx->ReadVariableInput(0, &var));
+    OP_REQUIRES_OK(ctx, ctx->ReadVariableInput(1, &m));
+    OP_REQUIRES_OK(ctx, ctx->ReadVariableInput(2, &v));
+    xla::ComputationDataHandle beta1_power = ctx->Input(3);
+    xla::ComputationDataHandle beta2_power = ctx->Input(4);
+    xla::ComputationDataHandle lr = ctx->Input(5);
+    xla::ComputationDataHandle beta1 = ctx->Input(6);
+    xla::ComputationDataHandle beta2 = ctx->Input(7);
+    xla::ComputationDataHandle epsilon = ctx->Input(8);
+    xla::ComputationDataHandle grad = ctx->Input(9);
+
+    // alpha <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
+    // m_t <- beta1 * m_{t-1} + (1 - beta1) * g_t
+    // v_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t
+    // variable <- variable - alpha * m_t / (sqrt(v_t) + epsilon)
+
+    xla::ComputationBuilder* b = ctx->builder();
+    xla::ComputationDataHandle half = XlaHelpers::FloatLiteral(b, dtype_, 0.5);
+    xla::ComputationDataHandle one = XlaHelpers::FloatLiteral(b, dtype_, 1.0);
+    xla::ComputationDataHandle two = XlaHelpers::FloatLiteral(b, dtype_, 2.0);
+
+    xla::ComputationDataHandle alpha =
+        b->Div(b->Mul(lr, b->Pow(b->Sub(one, beta2_power), half)),
+               b->Sub(one, beta1_power));
+    m = b->Add(m, b->Mul(b->Sub(grad, m), b->Sub(one, beta1)));
+    v = b->Add(v, b->Mul(b->Sub(b->Pow(grad, two), v), b->Sub(one, beta2)));
+    var =
+        b->Sub(var, b->Div(b->Mul(m, alpha), b->Add(b->Pow(v, half), epsilon)));
+
+    OP_REQUIRES_OK(ctx, ctx->AssignVariable(0, dtype_, var));
+    OP_REQUIRES_OK(ctx, ctx->AssignVariable(1, dtype_, m));
+    OP_REQUIRES_OK(ctx, ctx->AssignVariable(2, dtype_, v));
+  }
+
+ private:
+  DataType dtype_;
+};
+REGISTER_XLA_OP(Name("ResourceApplyAdam"), ResourceApplyAdam);
+
 class ResourceApplyRMSProp : public XlaOpKernel {
  public:
   explicit ResourceApplyRMSProp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {}
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 4b560e62b8..5d3049ebe7 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -256,6 +256,11 @@ class ResourceVariable(object):
     """The device this variable is on."""
     return self._handle.device
 
+  @property
+  def graph(self):
+    """The `Graph` of this variable."""
+    return self._handle.graph
+
   @property
   def name(self):
     """The name of the handle for this variable."""
-- 
GitLab


From 6dd1145d57ae3249e1798ca9fe7e81ded5c95ba8 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 10 May 2017 18:23:47 -0700
Subject: [PATCH 1208/1563] [TF:XLA] Make the function library a
 constructor-time option to XlaCompiler, rather than a
 CompileFunction()/CompileGraph()-time option.

In a subsequent change we plan to add a compilation cache to XlaCompiler, keyed on function name and signature. To avoid incorrect cache hits, we must not use different function libraries in the same XlaCompiler. This change refactors the API so the function library is passed once at construction time, making this invariant more obvious.

PiperOrigin-RevId: 155701318
---
 tensorflow/compiler/aot/compile.cc            | 10 ++--
 .../jit/kernels/xla_device_launch_op.cc       | 38 ++++++++-------
 .../jit/kernels/xla_local_launch_op.cc        | 48 ++++++++++---------
 .../jit/kernels/xla_local_launch_op.h         |  4 ++
 .../compiler/jit/xla_compilation_cache.cc     | 25 +++++-----
 .../compiler/jit/xla_compilation_cache.h      | 12 +++--
 tensorflow/compiler/tf2xla/xla_compiler.cc    | 30 +++++++-----
 tensorflow/compiler/tf2xla/xla_compiler.h     | 18 +++++--
 .../compiler/tf2xla/xla_compiler_test.cc      | 35 +++++---------
 .../contrib/xla_tf_graph/xla_tf_graph_util.cc | 16 ++-----
 .../xla_tf_graph/xla_tf_graph_util_test.cc    | 12 ++---
 11 files changed, 128 insertions(+), 120 deletions(-)

diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index d0e218ca11..4c572fd390 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -289,17 +289,17 @@ Status ConvertGraphToXla(xla::CompileOnlyClient* client,
   // Compile the graph into an XLA computation.
   XlaCompiler::Options compiler_options;
   compiler_options.client = client;
-  compiler_options.device_type = DeviceType(DEVICE_CPU_XLA_JIT);
+  DeviceType device_type(DEVICE_CPU_XLA_JIT);
+  compiler_options.device_type = &device_type;
+  compiler_options.flib_def = &graph->flib_def();
+  compiler_options.graph_def_version = graph->versions().producer();
   compiler_options.allow_cpu_custom_calls = true;
   XlaCompiler compiler(compiler_options);
 
-  std::unique_ptr<FunctionLibraryRuntime> flib_run(NewFunctionLibraryRuntime(
-      compiler.device_mgr(), Env::Default(), compiler.device(),
-      graph->versions().producer(), &graph->flib_def(), OptimizerOptions()));
   XlaCompiler::CompilationResult result;
   TF_RETURN_IF_ERROR(compiler.CompileGraph(XlaCompiler::CompileOptions(),
                                            "tfcompile", std::move(graph),
-                                           flib_run.get(), xla_args, &result));
+                                           xla_args, &result));
   *has_context_arg = result.requires_runtime_context;
   *computation = std::move(result.computation);
 
diff --git a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
index c741ccfb31..497c813d99 100644
--- a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
@@ -34,7 +34,7 @@ namespace tensorflow {
 
 namespace {
 
-Status BuildCompilationCache(ResourceMgr* rm, XlaCompilationCache** compiler) {
+Status BuildCompilationCache(ResourceMgr* rm, XlaCompilationCache** cache) {
   XlaDevice::Metadata* metadata;
   Status s = rm->Lookup<XlaDevice::Metadata>(rm->default_container(),
                                              "xla_metadata", &metadata);
@@ -42,12 +42,8 @@ Status BuildCompilationCache(ResourceMgr* rm, XlaCompilationCache** compiler) {
     return s;
   }
   core::ScopedUnref metadata_ref(metadata);
-  XlaCompiler::Options options;
-  options.device_type = metadata->jit_device_type();
-  options.client = metadata->client();
-  options.allow_cpu_custom_calls = false;
-  options.local_executable_has_hybrid_result = false;
-  *compiler = new XlaCompilationCache(options);
+  *cache =
+      new XlaCompilationCache(metadata->client(), metadata->jit_device_type());
   return Status::OK();
 }
 
@@ -91,23 +87,31 @@ void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
   ResourceMgr* rm = ctx->resource_manager();
   OP_REQUIRES(ctx, rm, errors::Internal("No resource manager."));
 
-  XlaCompilationCache* compiler;
+  XlaCompilationCache* cache;
   OP_REQUIRES_OK(ctx, rm->LookupOrCreate<XlaCompilationCache>(
-                          rm->default_container(), "xla_compiler", &compiler,
-                          [rm](XlaCompilationCache** compiler) {
-                            return BuildCompilationCache(rm, compiler);
+                          rm->default_container(), "xla_compiler", &cache,
+                          [rm](XlaCompilationCache** cache) {
+                            return BuildCompilationCache(rm, cache);
                           }));
   // Holds the reference to the JIT during evaluation. (We could probably
   // free it sooner because the ResourceMgr will retain a reference, but
   // this is more obviously correct.)
-  core::ScopedUnref compiler_ref(compiler);
+  core::ScopedUnref cache_ref(cache);
 
   std::vector<OptionalTensor> variables =
       SnapshotResourceVariables(ctx, num_resource_args_);
 
+  XlaCompiler::Options options;
+  options.client = cache->client();
+  options.device_type = &cache->device_type();
+  options.flib_def = ctx->function_library()->GetFunctionLibraryDefinition();
+  options.graph_def_version = ctx->function_library()->graph_def_version();
+  options.allow_cpu_custom_calls = false;
+  options.local_executable_has_hybrid_result = false;
+
   const XlaCompiler::CompilationResult* kernel;
-  OP_REQUIRES_OK(ctx, compiler->Compile(function_, num_constant_args_,
-                                        variables, ctx, &kernel, nullptr));
+  OP_REQUIRES_OK(ctx, cache->Compile(options, function_, num_constant_args_,
+                                     variables, ctx, &kernel, nullptr));
 
   VLOG(1) << "XLA compilation complete...";
 
@@ -148,8 +152,8 @@ void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
     Env* env = Env::Default();
     auto start_time = env->NowMicros();
     VLOG(1) << "Executing XLA Computation...";
-    auto result = compiler->client()->Execute(kernel->computation, arg_ptrs,
-                                              &execution_options, &profile);
+    auto result = cache->client()->Execute(kernel->computation, arg_ptrs,
+                                           &execution_options, &profile);
     auto elapsed = env->NowMicros() - start_time;
     OP_REQUIRES(ctx, result.ok(), result.status());
 
@@ -158,7 +162,7 @@ void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
 
     if (xla::ShapeUtil::IsTuple(kernel->xla_output_shape)) {
       auto outputs_or_error =
-          compiler->client()->DeconstructTuple(*result.ValueOrDie());
+          cache->client()->DeconstructTuple(*result.ValueOrDie());
       OP_REQUIRES(ctx, outputs_or_error.ok(), outputs_or_error.status());
       outputs = outputs_or_error.ConsumeValueOrDie();
     } else {
diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
index 8b43c7c156..0a2af4050e 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
@@ -148,19 +148,19 @@ XlaLocalLaunchOp::XlaLocalLaunchOp(OpKernelConstruction* ctx)
   OP_REQUIRES(ctx, num_resource_args == 0,
               errors::Unimplemented(
                   "XlaLocalLaunchOp does not support resource variables"));
-}
-
-Status XlaLocalLaunchOp::BuildCompilationCache(XlaCompilationCache** compiler) {
-  gpu::Platform::Id platform_id;
   if (device_type_ == DeviceType(DEVICE_CPU)) {
-    platform_id = gpu::host::kHostPlatformId;
+    platform_id_ = gpu::host::kHostPlatformId;
   } else if (device_type_ == DeviceType(DEVICE_GPU)) {
-    platform_id = gpu::cuda::kCudaPlatformId;
+    platform_id_ = gpu::cuda::kCudaPlatformId;
   } else {
-    return errors::InvalidArgument("Unknown device type for local _XlaLaunch");
+    ctx->SetStatus(
+        errors::InvalidArgument("Unknown device type for local _XlaLaunch"));
+    return;
   }
+}
 
-  auto platform = gpu::MultiPlatformManager::PlatformWithId(platform_id);
+Status XlaLocalLaunchOp::BuildCompilationCache(XlaCompilationCache** cache) {
+  auto platform = gpu::MultiPlatformManager::PlatformWithId(platform_id_);
   if (!platform.ok()) {
     return StreamExecutorUtil::ConvertStatus(platform.status());
   }
@@ -175,12 +175,8 @@ Status XlaLocalLaunchOp::BuildCompilationCache(XlaCompilationCache** compiler) {
     return errors::InvalidArgument("No JIT device registered for ",
                                    device_type_.type());
   }
-  XlaCompiler::Options options;
-  options.device_type = DeviceType(registration->compilation_device_name);
-  options.client = client.ValueOrDie();
-  options.allow_cpu_custom_calls = (platform_id == gpu::host::kHostPlatformId);
-  options.local_executable_has_hybrid_result = true;
-  *compiler = new XlaCompilationCache(options);
+  *cache = new XlaCompilationCache(
+      client.ValueOrDie(), DeviceType(registration->compilation_device_name));
   return Status::OK();
 }
 
@@ -195,23 +191,31 @@ void XlaLocalLaunchOp::Compute(OpKernelContext* ctx) {
   gpu::Stream* stream =
       ctx->op_device_context() ? ctx->op_device_context()->stream() : nullptr;
 
-  XlaCompilationCache* compiler;
+  XlaCompilationCache* cache;
   OP_REQUIRES_OK(ctx, rm->LookupOrCreate<XlaCompilationCache>(
-                          rm->default_container(), "xla_compiler", &compiler,
-                          [this](XlaCompilationCache** compiler) {
-                            return BuildCompilationCache(compiler);
+                          rm->default_container(), "xla_cache", &cache,
+                          [this](XlaCompilationCache** cache) {
+                            return BuildCompilationCache(cache);
                           }));
   // Hold the reference to the JIT during evaluation. (We could probably
   // free it sooner because the ResourceMgr will retain a reference, but
   // this is more obviously correct.)
-  core::ScopedUnref compiler_ref(compiler);
+  core::ScopedUnref cache_ref(cache);
+
+  xla::LocalClient* client = static_cast<xla::LocalClient*>(cache->client());
 
-  xla::LocalClient* client = static_cast<xla::LocalClient*>(compiler->client());
+  XlaCompiler::Options options;
+  options.client = client;
+  options.device_type = &cache->device_type();
+  options.flib_def = ctx->function_library()->GetFunctionLibraryDefinition();
+  options.graph_def_version = ctx->function_library()->graph_def_version();
+  options.allow_cpu_custom_calls = (platform_id_ == gpu::host::kHostPlatformId);
+  options.local_executable_has_hybrid_result = true;
 
   const XlaCompiler::CompilationResult* kernel;
   xla::LocalExecutable* executable;
-  OP_REQUIRES_OK(ctx, compiler->Compile(function_, num_constant_args_, {}, ctx,
-                                        &kernel, &executable));
+  OP_REQUIRES_OK(ctx, cache->Compile(options, function_, num_constant_args_, {},
+                                     ctx, &kernel, &executable));
 
   VLOG(1) << "Executing XLA Computation...";
 
diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.h b/tensorflow/compiler/jit/kernels/xla_local_launch_op.h
index 8023206762..51887cf013 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.h
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.h
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/util/stream_executor_util.h"
 
 namespace tensorflow {
 
@@ -48,6 +49,9 @@ class XlaLocalLaunchOp : public OpKernel {
   DeviceType device_type_;
   NameAttrList function_;
   int num_constant_args_;
+
+  perftools::gputools::Platform::Id platform_id_;
+
   TF_DISALLOW_COPY_AND_ASSIGN(XlaLocalLaunchOp);
 };
 
diff --git a/tensorflow/compiler/jit/xla_compilation_cache.cc b/tensorflow/compiler/jit/xla_compilation_cache.cc
index 505b44e9fa..8238f7d919 100644
--- a/tensorflow/compiler/jit/xla_compilation_cache.cc
+++ b/tensorflow/compiler/jit/xla_compilation_cache.cc
@@ -37,9 +37,9 @@ limitations under the License.
 
 namespace tensorflow {
 
-XlaCompilationCache::XlaCompilationCache(const XlaCompiler::Options& options)
-    : compiler_(options) {}
-
+XlaCompilationCache::XlaCompilationCache(xla::Client* client,
+                                         DeviceType device_type)
+    : client_(client), device_type_(std::move(device_type)) {}
 XlaCompilationCache::~XlaCompilationCache() = default;
 
 string XlaCompilationCache::DebugString() {
@@ -205,8 +205,9 @@ Status BuildArguments(int num_constant_args,
 }  // namespace
 
 Status XlaCompilationCache::Compile(
-    const NameAttrList& function, int num_constant_args,
-    const std::vector<OptionalTensor>& variable_args, OpKernelContext* ctx,
+    const XlaCompiler::Options& options, const NameAttrList& function,
+    int num_constant_args, const std::vector<OptionalTensor>& variable_args,
+    OpKernelContext* ctx,
     const XlaCompiler::CompilationResult** compilation_result,
     xla::LocalExecutable** executable) {
   VLOG(1) << "XlaCompilationCache::Compile " << DebugString();
@@ -263,22 +264,18 @@ Status XlaCompilationCache::Compile(
     TF_RETURN_IF_ERROR(
         BuildArguments(num_constant_args, variable_args, ctx, &args));
 
-    std::unique_ptr<FunctionLibraryRuntime> flr(NewFunctionLibraryRuntime(
-        compiler_.device_mgr(), ctx->env(), compiler_.device(),
-        TF_GRAPH_DEF_VERSION,
-        ctx->function_library()->GetFunctionLibraryDefinition(),
-        OptimizerOptions(), nullptr /* custom_kernel_creator */));
-
+    XlaCompiler compiler(options);
     entry->compiled = true;
     entry->compilation_status =
-        compiler_.CompileFunction(XlaCompiler::CompileOptions(), flr.get(),
-                                  function, args, &entry->compilation_result);
+        compiler.CompileFunction(XlaCompiler::CompileOptions(), function, args,
+                                 &entry->compilation_result);
   }
   *compilation_result = &entry->compilation_result;
   if (entry->compilation_status.ok() && executable) {
     if (entry->executable == nullptr &&
         !entry->compilation_result.computation.IsNull()) {
-      entry->compilation_status = compiler_.BuildExecutable(
+      XlaCompiler compiler(options);
+      entry->compilation_status = compiler.BuildExecutable(
           entry->compilation_result, &entry->executable);
     }
     *executable = entry->executable.get();
diff --git a/tensorflow/compiler/jit/xla_compilation_cache.h b/tensorflow/compiler/jit/xla_compilation_cache.h
index ff67e48d1a..4ffcb68a32 100644
--- a/tensorflow/compiler/jit/xla_compilation_cache.h
+++ b/tensorflow/compiler/jit/xla_compilation_cache.h
@@ -46,7 +46,7 @@ struct OptionalTensor {
 // bound.
 class XlaCompilationCache : public ResourceBase {
  public:
-  explicit XlaCompilationCache(const XlaCompiler::Options& options);
+  XlaCompilationCache(xla::Client* client, DeviceType device_type);
   ~XlaCompilationCache() override;
 
   // Compiles a function into a XlaCompiler::CompilationResult that can be used
@@ -61,19 +61,21 @@ class XlaCompilationCache : public ResourceBase {
   // xla::LocalExecutable and sets `executable to point to it. The resulting
   // executable pointer may be null if the computation has no non-constant
   // outputs.
-  Status Compile(const NameAttrList& function, int num_constant_args,
+  Status Compile(const XlaCompiler::Options& options,
+                 const NameAttrList& function, int num_constant_args,
                  const std::vector<OptionalTensor>& variable_args,
                  OpKernelContext* ctx,
                  const XlaCompiler::CompilationResult** compilation_result,
                  xla::LocalExecutable** executable);
 
-  xla::Client* client() const { return compiler_.client(); }
+  xla::Client* client() const { return client_; }
+  const DeviceType& device_type() const { return device_type_; }
 
   string DebugString() override;
 
  private:
-  XlaCompiler compiler_;
-  std::unique_ptr<FunctionLibraryRuntime> function_library_runtime_;
+  xla::Client* const client_;
+  const DeviceType device_type_;
 
   // Describes the types, shapes and any compile-time constant arguments
   // to a kernel. Key that uniquely identifies a compilation output.
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index baf8df6f15..5ed4393bc5 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -61,12 +61,21 @@ XlaCompiler::XlaCompiler(XlaCompiler::Options options)
     : options_(std::move(options)),
       initialization_status_(Status::OK()),
       next_step_id_(1),
-      device_(new XlaCompilationDevice(SessionOptions(), options_.device_type)),
+      device_(
+          new XlaCompilationDevice(SessionOptions(), *options_.device_type)),
       device_mgr_({device_}) {
+  // We no longer need the device_type.
+  options_.device_type = nullptr;
+
   if (options_.populate_resource_manager) {
     initialization_status_ =
         (*options_.populate_resource_manager)(device_->resource_manager());
   }
+
+  flib_runtime_.reset(NewFunctionLibraryRuntime(
+      &device_mgr_, Env::Default(), device_, options.graph_def_version,
+      options.flib_def, OptimizerOptions(),
+      nullptr /* custom_kernel_creator */));
 }
 
 XlaCompiler::~XlaCompiler() = default;
@@ -77,8 +86,7 @@ int64 XlaCompiler::NextStepId() {
 }
 
 Status XlaCompiler::CompileFunction(
-    const XlaCompiler::CompileOptions& options, FunctionLibraryRuntime* flr,
-    const NameAttrList& function,
+    const XlaCompiler::CompileOptions& options, const NameAttrList& function,
     const std::vector<XlaCompiler::Argument>& args,
     XlaCompiler::CompilationResult* result) {
   const string function_id = Canonicalize(function.name(), function.attr());
@@ -86,14 +94,14 @@ Status XlaCompiler::CompileFunction(
 
   FunctionLibraryRuntime::Handle handle;
   TF_RETURN_IF_ERROR(
-      flr->Instantiate(function.name(), function.attr(), &handle));
+      flib_runtime_->Instantiate(function.name(), function.attr(), &handle));
 
-  const FunctionBody* fbody = flr->GetFunctionBody(handle);
+  const FunctionBody* fbody = flib_runtime_->GetFunctionBody(handle);
   CHECK(fbody);
 
   TF_RETURN_IF_ERROR(CheckSignature(fbody->arg_types, args));
 
-  std::unique_ptr<Graph> graph(new Graph(flr->GetFunctionLibraryDefinition()));
+  std::unique_ptr<Graph> graph(new Graph(options_.flib_def));
   CopyGraph(*fbody->graph, graph.get());
 
   if (VLOG_IS_ON(1)) {
@@ -107,7 +115,8 @@ Status XlaCompiler::CompileFunction(
   opts.set_do_function_inlining(true);
   opts.set_do_constant_folding(true);
   GraphOptimizer optimizer(opts);
-  optimizer.Optimize(flr, flr->env(), /*device=*/nullptr, &graph);
+  optimizer.Optimize(flib_runtime_.get(), flib_runtime_->env(),
+                     /*device=*/nullptr, &graph);
 
   if (VLOG_IS_ON(1)) {
     dump_graph::DumpGraphToFile(
@@ -117,7 +126,7 @@ Status XlaCompiler::CompileFunction(
 
   VLOG(1) << "====================================================";
   TF_RETURN_IF_ERROR(
-      CompileGraph(options, function_id, std::move(graph), flr, args, result));
+      CompileGraph(options, function_id, std::move(graph), args, result));
   VLOG(1) << "====================================================";
 
   return Status::OK();
@@ -369,7 +378,6 @@ Status BuildComputation(
 Status XlaCompiler::CompileGraph(const XlaCompiler::CompileOptions& options,
                                  string const& name,
                                  std::unique_ptr<Graph> graph,
-                                 FunctionLibraryRuntime* flib,
                                  const std::vector<XlaCompiler::Argument>& args,
                                  CompilationResult* result) {
   VLOG(1) << "Executing graph symbolically to populate ComputationBuilder.";
@@ -391,8 +399,8 @@ Status XlaCompiler::CompileGraph(const XlaCompiler::CompileOptions& options,
                                     &result->xla_input_shapes));
   context->set_args(std::move(context_args));
 
-  TF_RETURN_IF_ERROR(
-      ExecuteGraph(context, std::move(graph), device_, flib, NextStepId()));
+  TF_RETURN_IF_ERROR(ExecuteGraph(context, std::move(graph), device_,
+                                  flib_runtime_.get(), NextStepId()));
 
   int num_nonconst_outputs;
   TF_RETURN_IF_ERROR(BuildComputation(
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.h b/tensorflow/compiler/tf2xla/xla_compiler.h
index d250412168..1a089155ce 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.h
+++ b/tensorflow/compiler/tf2xla/xla_compiler.h
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/common_runtime/device_mgr.h"
 #include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/function.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/notification.h"
@@ -176,11 +177,18 @@ class XlaCompiler {
   };
 
   struct Options {
-    // Name of the compilation device to use.
-    DeviceType device_type = DeviceType("");
+    // Name of the compilation device to use. Needs to be live only during
+    // XlaCompiler's constructor.
+    const DeviceType* device_type = nullptr;
 
     xla::Client* client = nullptr;
 
+    // Function library in which to find function definitions. Must be non-null.
+    const FunctionLibraryDefinition* flib_def = nullptr;
+
+    // The graph def version to be compiled.
+    int graph_def_version = TF_GRAPH_DEF_VERSION;
+
     // If 'allow_cpu_custom_calls' is true, kernels may make use of CustomCall()
     // for CPU; additionally, an optional XlaLocalRuntimeContext* may be passed
     // to the computation.
@@ -234,7 +242,6 @@ class XlaCompiler {
   // not included in the XLA computation's outputs. The XLA computation is
   // null if there are no data-dependent outputs and no side effects.
   Status CompileFunction(const CompileOptions& options,
-                         FunctionLibraryRuntime* flr,
                          const NameAttrList& fn_name_attrs,
                          const std::vector<Argument>& args,
                          CompilationResult* result);
@@ -243,7 +250,7 @@ class XlaCompiler {
   // Similar to CompileFunction, but takes a Graph as input rather than a
   // function.
   Status CompileGraph(const CompileOptions& options, string const& name,
-                      std::unique_ptr<Graph> graph, FunctionLibraryRuntime* flr,
+                      std::unique_ptr<Graph> graph,
                       const std::vector<Argument>& args,
                       CompilationResult* result);
 
@@ -256,6 +263,7 @@ class XlaCompiler {
   xla::Client* client() const { return options_.client; }
   XlaCompilationDevice* device() const { return device_; }
   const DeviceMgr* device_mgr() const { return &device_mgr_; }
+  FunctionLibraryRuntime* flib_runtime() const { return flib_runtime_.get(); }
 
   // Retrieves the channel handle associated with `key`. Allocates
   // a new channel handle if none exists.
@@ -280,6 +288,8 @@ class XlaCompiler {
   XlaCompilationDevice* device_;  // Owned by device_mgr_
   DeviceMgr device_mgr_;
 
+  std::unique_ptr<FunctionLibraryRuntime> flib_runtime_;
+
   std::unordered_map<string, xla::ChannelHandle> channels_ GUARDED_BY(mu_);
 
   TF_DISALLOW_COPY_AND_ASSIGN(XlaCompiler);
diff --git a/tensorflow/compiler/tf2xla/xla_compiler_test.cc b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
index 737d56f4ed..11c811613e 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler_test.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
@@ -96,6 +96,8 @@ REGISTER_XLA_OP(Name("DummyReadResource"), DummyReadResourceOp);
 
 class XlaCompilerTest : public ::testing::Test {
  protected:
+  XlaCompilerTest() : cpu_device_type_(DEVICE_CPU_XLA_JIT) {}
+
   void SetUp() override {
     client_ = xla::ClientLibrary::LocalClientOrDie();
 
@@ -107,19 +109,13 @@ class XlaCompilerTest : public ::testing::Test {
 
   XlaCompiler::Options DefaultOptions() {
     XlaCompiler::Options options;
-    options.device_type = DeviceType(DEVICE_CPU_XLA_JIT);
+    options.device_type = &cpu_device_type_;
     options.client = client_;
+    options.flib_def = flib_def_.get();
     return options;
   }
 
-  std::unique_ptr<FunctionLibraryRuntime> BuildFunctionLibraryRuntime(
-      const XlaCompiler& compiler) {
-    return std::unique_ptr<FunctionLibraryRuntime>(NewFunctionLibraryRuntime(
-        compiler.device_mgr(), /*env=*/nullptr, compiler.device(),
-        TF_GRAPH_DEF_VERSION, flib_def_.get(), OptimizerOptions(),
-        /*custom_kernel_creator=*/nullptr));
-  }
-
+  DeviceType cpu_device_type_;
   xla::Client* client_;
   std::unique_ptr<FunctionLibraryDefinition> flib_def_;
 };
@@ -127,12 +123,11 @@ class XlaCompilerTest : public ::testing::Test {
 // Tests compilation of an empty graph.
 TEST_F(XlaCompilerTest, EmptyReturnValues) {
   XlaCompiler compiler(DefaultOptions());
-  auto flr = BuildFunctionLibraryRuntime(compiler);
 
   std::unique_ptr<Graph> graph(new Graph(OpRegistry::Global()));
   XlaCompiler::CompilationResult result;
   TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(), "add",
-                                     std::move(graph), flr.get(),
+                                     std::move(graph),
                                      /*args=*/{}, &result));
 
   // No computation should be generated.
@@ -161,12 +156,10 @@ TEST_F(XlaCompilerTest, Simple) {
 
   // Compiles the graph.
   XlaCompiler compiler(DefaultOptions());
-  auto flr = BuildFunctionLibraryRuntime(compiler);
 
   XlaCompiler::CompilationResult result;
   TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(), "add",
-                                     std::move(graph), flr.get(), args,
-                                     &result));
+                                     std::move(graph), args, &result));
 
   // Tests that the generated computation works.
   std::unique_ptr<xla::Literal> param0_literal =
@@ -215,15 +208,14 @@ TEST_F(XlaCompilerTest, ConstantOutputs) {
     XlaCompiler::Options options = DefaultOptions();
     options.resolve_compile_time_constants = true;
     XlaCompiler compiler(options);
-    auto flr = BuildFunctionLibraryRuntime(compiler);
 
     std::unique_ptr<Graph> graph_copy(new Graph(OpRegistry::Global()));
     CopyGraph(*graph, graph_copy.get());
 
     XlaCompiler::CompilationResult result;
     TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(),
-                                       "constants", std::move(graph_copy),
-                                       flr.get(), args, &result));
+                                       "constants", std::move(graph_copy), args,
+                                       &result));
 
     ASSERT_EQ(2, result.outputs.size());
     EXPECT_TRUE(result.outputs[0].is_constant);
@@ -253,15 +245,14 @@ TEST_F(XlaCompilerTest, ConstantOutputs) {
     XlaCompiler::Options options = DefaultOptions();
     options.resolve_compile_time_constants = false;
     XlaCompiler compiler(options);
-    auto flr = BuildFunctionLibraryRuntime(compiler);
 
     std::unique_ptr<Graph> graph_copy(new Graph(OpRegistry::Global()));
     CopyGraph(*graph, graph_copy.get());
 
     XlaCompiler::CompilationResult result;
     TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(),
-                                       "constants", std::move(graph_copy),
-                                       flr.get(), args, &result));
+                                       "constants", std::move(graph_copy), args,
+                                       &result));
 
     ASSERT_EQ(2, result.outputs.size());
     EXPECT_FALSE(result.outputs[0].is_constant);
@@ -316,14 +307,12 @@ TEST_F(XlaCompilerTest, ResourceManager) {
       };
   options.populate_resource_manager = &populate_function;
   XlaCompiler compiler(options);
-  auto flr = BuildFunctionLibraryRuntime(compiler);
 
   EXPECT_EQ(0, resource->Get());
 
   XlaCompiler::CompilationResult result;
   TF_ASSERT_OK(compiler.CompileGraph(XlaCompiler::CompileOptions(), "dummy",
-                                     std::move(graph), flr.get(), args,
-                                     &result));
+                                     std::move(graph), args, &result));
 
   EXPECT_EQ(1, resource->Get());
 
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
index c19b58176a..87f7cba5f4 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
@@ -195,7 +195,6 @@ Status ConvertOpRequestToXlaNode(const xla::OperationRequest& operation_request,
 }
 
 void SetupXlaCpuClient(std::unique_ptr<FunctionLibraryDefinition>* flib_def,
-                       std::unique_ptr<FunctionLibraryRuntime>* flr,
                        std::unique_ptr<XlaCompiler>* compiler) {
   xla::Client* client = xla::ClientLibrary::LocalClientOrDie();
   XlaOpRegistry::RegisterCompilationKernels();
@@ -205,14 +204,11 @@ void SetupXlaCpuClient(std::unique_ptr<FunctionLibraryDefinition>* flib_def,
 
   // Setup compiler options
   XlaCompiler::Options options;
-  options.device_type = DeviceType(DEVICE_CPU_XLA_JIT);
+  DeviceType device_type(DEVICE_CPU_XLA_JIT);
+  options.device_type = &device_type;
+  options.flib_def = flib_def->get();
   options.client = client;
   compiler->reset(new XlaCompiler(options));
-
-  flr->reset(NewFunctionLibraryRuntime(
-      compiler->get()->device_mgr(), /*env=*/nullptr, compiler->get()->device(),
-      TF_GRAPH_DEF_VERSION, flib_def->get(), OptimizerOptions(),
-      /*custom_kernel_creator=*/nullptr));
 }
 
 }  // namespace
@@ -223,16 +219,14 @@ ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
   CHECK(graph);
 
   std::unique_ptr<FunctionLibraryDefinition> flib_def;
-  std::unique_ptr<FunctionLibraryRuntime> flr;
   std::unique_ptr<XlaCompiler> compiler;
 
-  SetupXlaCpuClient(&flib_def, &flr, &compiler);
+  SetupXlaCpuClient(&flib_def, &compiler);
 
   // Compile graph and build computation
   XlaCompiler::CompilationResult result;
   TF_CHECK_OK(compiler->CompileGraph(XlaCompiler::CompileOptions(), GRAPH_NAME,
-                                     std::move(graph), flr.get(), args,
-                                     &result));
+                                     std::move(graph), args, &result));
 
   return result.computation.Snapshot();
 }
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
index 92c8f85933..7162627562 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
@@ -67,20 +67,16 @@ static void DumpHloGraphForDebug(const std::vector<XlaCompiler::Argument>& args,
 
   // Compiles the graph.
   XlaCompiler::Options options;
-  options.device_type = DeviceType("XLA_CPU_JIT");
+  DeviceType device_type("XLA_CPU_JIT");
+  options.device_type = &device_type;
   options.client = client;
+  options.flib_def = flib_def.get();
   compiler.reset(new XlaCompiler(options));
 
-  flr.reset(NewFunctionLibraryRuntime(compiler->device_mgr(), /*env=*/nullptr,
-                                      compiler->device(), TF_GRAPH_DEF_VERSION,
-                                      flib_def.get(), OptimizerOptions(),
-                                      /*custom_kernel_creator=*/nullptr));
-
   // Compile graph
   XlaCompiler::CompilationResult result;
   TF_CHECK_OK(compiler->CompileGraph(XlaCompiler::CompileOptions(), "dump",
-                                     std::move(graph), flr.get(), args,
-                                     &result));
+                                     std::move(graph), args, &result));
 
   // Convert to hlo
   xla::Computation& computation = result.computation;
-- 
GitLab


From 9d528b8dc22567e239c0eb692eedb1d9e6763fd1 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 10 May 2017 18:29:37 -0700
Subject: [PATCH 1209/1563] Refactor webfiles rule name to web_library

PiperOrigin-RevId: 155701631
---
 .../components/tf_audio_dashboard/BUILD       |   4 +-
 .../components/tf_audio_dashboard/demo/BUILD  |   4 +-
 .../tf_audio_dashboard/demo/data/BUILD        |   4 +-
 .../tensorboard/components/tf_backend/BUILD   |   4 +-
 .../components/tf_color_scale/BUILD           |   4 +-
 .../components/tf_color_scale/demo/BUILD      |   4 +-
 .../components/tf_dashboard_common/BUILD      |   4 +-
 .../components/tf_dashboard_common/demo/BUILD |   4 +-
 .../tf_distribution_dashboard/BUILD           |   4 +-
 .../tf_distribution_dashboard/demo/BUILD      |   4 +-
 .../tf_distribution_dashboard/demo/data/BUILD |   4 +-
 .../tensorboard/components/tf_globals/BUILD   |   4 +-
 .../tensorboard/components/tf_graph/BUILD     |   4 +-
 .../components/tf_graph/demo/BUILD            |   4 +-
 .../components/tf_graph_board/BUILD           |   4 +-
 .../components/tf_graph_board/demo/BUILD      |   4 +-
 .../components/tf_graph_common/BUILD          |   4 +-
 .../components/tf_graph_controls/BUILD        |   4 +-
 .../components/tf_graph_controls/demo/BUILD   |   4 +-
 .../components/tf_graph_dashboard/BUILD       |   4 +-
 .../components/tf_graph_dashboard/demo/BUILD  |   4 +-
 .../components/tf_graph_info/BUILD            |   4 +-
 .../components/tf_graph_info/demo/BUILD       |   4 +-
 .../components/tf_graph_loader/BUILD          |   4 +-
 .../components/tf_graph_loader/demo/BUILD     |   4 +-
 .../components/tf_histogram_dashboard/BUILD   |   4 +-
 .../tf_histogram_dashboard/demo/BUILD         |   4 +-
 .../tf_histogram_dashboard/demo/data/BUILD    |   4 +-
 .../components/tf_image_dashboard/BUILD       |   4 +-
 .../components/tf_image_dashboard/demo/BUILD  |   4 +-
 .../tf_image_dashboard/demo/data/BUILD        |   4 +-
 .../tensorboard/components/tf_imports/BUILD   |  12 +-
 .../components/tf_imports_d3v4/BUILD          |  20 +--
 .../components/tf_scalar_dashboard/BUILD      |   4 +-
 .../components/tf_scalar_dashboard/demo/BUILD |   4 +-
 .../tf_scalar_dashboard/demo/data/BUILD       |   4 +-
 .../tensorboard/components/tf_storage/BUILD   |   4 +-
 .../components/tf_text_dashboard/BUILD        |   4 +-
 .../components/tf_text_dashboard/demo/BUILD   |   4 +-
 .../tf_text_dashboard/demo/data/BUILD         |   4 +-
 .../components/vz_distribution_chart/BUILD    |   4 +-
 .../vz_distribution_chart/demo/BUILD          |   4 +-
 .../components/vz_histogram_timeseries/BUILD  |   4 +-
 .../vz_histogram_timeseries/demo/BUILD        |   4 +-
 .../vz_histogram_timeseries_d3v4/BUILD        |   6 +-
 .../components/vz_line_chart/BUILD            |   4 +-
 .../components/vz_line_chart/demo/BUILD       |   4 +-
 .../tensorboard/components/vz_sorting/BUILD   |   4 +-
 tensorflow/workspace.bzl                      | 146 +++++++++---------
 49 files changed, 182 insertions(+), 182 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
index 004bece78b..9172ebb22a 100644
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_audio_dashboard",
     srcs = [
         "tf-audio-dashboard.html",
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
index 383ea8d1b6..394d7a8fa5 100644
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_audio_dashboard/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-audio-dashboard/demo",
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
index c3824a923d..4c2c2ee9e5 100644
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
@@ -1,10 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "data",
     srcs = glob(["*"]),
     path = "/tf-audio-dashboard/demo/data",
diff --git a/tensorflow/tensorboard/components/tf_backend/BUILD b/tensorflow/tensorboard/components/tf_backend/BUILD
index 66fc429c60..d9f3a035d8 100644
--- a/tensorflow/tensorboard/components/tf_backend/BUILD
+++ b/tensorflow/tensorboard/components/tf_backend/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
@@ -9,7 +9,7 @@ licenses(["notice"])  # Apache 2.0
 
 # TODO(dandelion): Add webfiles support for the test code.
 
-webfiles(
+web_library(
     name = "tf_backend",
     srcs = [
         "tf-backend.html",
diff --git a/tensorflow/tensorboard/components/tf_color_scale/BUILD b/tensorflow/tensorboard/components/tf_color_scale/BUILD
index 52102577b4..3e64fccd2e 100644
--- a/tensorflow/tensorboard/components/tf_color_scale/BUILD
+++ b/tensorflow/tensorboard/components/tf_color_scale/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
@@ -9,7 +9,7 @@ licenses(["notice"])  # Apache 2.0
 
 # TODO(dandelion): Add webfiles support for the test code.
 
-webfiles(
+web_library(
     name = "tf_color_scale",
     srcs = [
         "tf-color-scale.html",
diff --git a/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD b/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
index 00b8a033b8..f0a7fa2235 100644
--- a/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_color_scale/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-color-scale/demo",
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
index efced92dcf..321e4a821e 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
@@ -1,13 +1,13 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_dashboard_common",
     srcs = glob(["*.html"]) + [
         ":ts",
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
index 05cfe34e72..f89b31b002 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_dashboard_common/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = [
         "tf-categorizer-demo.html",
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
index e71bbdea2b..bff6ed6d7d 100644
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_distribution_dashboard",
     srcs = [
         "tf-distribution-dashboard.html",
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
index 238937c0c2..e512d1a5e2 100644
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_distribution_dashboard/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-distribution-dashboard/demo",
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
index 589c1980e4..a4055f34e3 100644
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
@@ -1,10 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "data",
     srcs = glob(["*"]),
     path = "/tf-distribution-dashboard/demo/data",
diff --git a/tensorflow/tensorboard/components/tf_globals/BUILD b/tensorflow/tensorboard/components/tf_globals/BUILD
index 2e5e4b0515..7e81163e80 100644
--- a/tensorflow/tensorboard/components/tf_globals/BUILD
+++ b/tensorflow/tensorboard/components/tf_globals/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
@@ -9,7 +9,7 @@ licenses(["notice"])  # Apache 2.0
 
 # TODO(dandelion): Add webfiles support for the test code.
 
-webfiles(
+web_library(
     name = "tf_globals",
     srcs = [
         "tf-globals.html",
diff --git a/tensorflow/tensorboard/components/tf_graph/BUILD b/tensorflow/tensorboard/components/tf_graph/BUILD
index 7d19bf4266..f950d1a532 100644
--- a/tensorflow/tensorboard/components/tf_graph/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph",
     srcs = [
         "tf-graph.html",
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/BUILD b/tensorflow/tensorboard/components/tf_graph/demo/BUILD
index 30c71890ae..524d0ff767 100644
--- a/tensorflow/tensorboard/components/tf_graph/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_graph/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph/demo",
diff --git a/tensorflow/tensorboard/components/tf_graph_board/BUILD b/tensorflow/tensorboard/components/tf_graph_board/BUILD
index bae18cbc4f..4358e601f4 100644
--- a/tensorflow/tensorboard/components/tf_graph_board/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_board/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph_board",
     srcs = [
         "tf-graph-board.html",
diff --git a/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
index 8b9bf0fc24..2d668769e6 100644
--- a/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_graph_board/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-board/demo",
diff --git a/tensorflow/tensorboard/components/tf_graph_common/BUILD b/tensorflow/tensorboard/components/tf_graph_common/BUILD
index 772abbbd31..50f7a309ed 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_common/BUILD
@@ -1,13 +1,13 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph_common",
     srcs = [
         "tf-graph-common.html",
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/BUILD b/tensorflow/tensorboard/components/tf_graph_controls/BUILD
index af042a98e3..2e2d3b7b47 100644
--- a/tensorflow/tensorboard/components/tf_graph_controls/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_controls/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph_controls",
     srcs = [
         "tf-graph-controls.html",
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
index 213f5e1ee3..c47cb90a03 100644
--- a/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_graph_controls/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-graph-controls/demo",
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
index 785d4f658c..de8f744d05 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph_dashboard",
     srcs = [
         "tf-graph-dashboard.html",
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
index d8d8cb643d..3658f45b15 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_graph_dashboard/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-dashboard/demo",
diff --git a/tensorflow/tensorboard/components/tf_graph_info/BUILD b/tensorflow/tensorboard/components/tf_graph_info/BUILD
index 0196c91905..eec1155769 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_info/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph_info",
     srcs = [
         "tf-graph-icon.html",
diff --git a/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
index abac5ff6ee..a7d59418fd 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_graph_info/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-info/demo",
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/BUILD b/tensorflow/tensorboard/components/tf_graph_loader/BUILD
index ce2dddc809..f163f12e9a 100644
--- a/tensorflow/tensorboard/components/tf_graph_loader/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_loader/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph_loader",
     srcs = [
         "tf-graph-loader.html",
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
index 0fc800489c..b2fc04b2eb 100644
--- a/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_graph_loader/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-loader/demo",
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
index c74eafa658..3f17bda34c 100644
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_histogram_dashboard",
     srcs = [
         "tf-histogram-dashboard.html",
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
index 8350084874..6522d3ad99 100644
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_histogram_dashboard/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-histogram-dashboard/demo",
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
index d396efab73..7e661b84f5 100644
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
@@ -1,10 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "data",
     srcs = glob(["*"]),
     path = "/tf-histogram-dashboard/demo/data",
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
index b69fe6ba22..a82decd16e 100644
--- a/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_image_dashboard",
     srcs = [
         "tf-image-dashboard.html",
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
index 3a42342ca0..730685ee2c 100644
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_image_dashboard/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-image-dashboard/demo",
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
index a613ac66c7..0e4c304068 100644
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
+++ b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
@@ -1,10 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "data",
     srcs = glob(["*"]),
     path = "/tf-image-dashboard/demo/data",
diff --git a/tensorflow/tensorboard/components/tf_imports/BUILD b/tensorflow/tensorboard/components/tf_imports/BUILD
index 57164ba443..ac4c41d00f 100644
--- a/tensorflow/tensorboard/components/tf_imports/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports/BUILD
@@ -1,10 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "d3",
     srcs = [
         "d3.html",
@@ -13,14 +13,14 @@ webfiles(
     path = "/tf-imports",
 )
 
-webfiles(
+web_library(
     name = "lodash",
     srcs = ["lodash.html"],
     path = "/tf-imports",
     deps = ["@com_lodash"],
 )
 
-webfiles(
+web_library(
     name = "graphlib",
     srcs = [
         "graphlib.html",
@@ -30,7 +30,7 @@ webfiles(
     deps = [":lodash"],
 )
 
-webfiles(
+web_library(
     name = "dagre",
     srcs = [
         "dagre.html",
@@ -43,7 +43,7 @@ webfiles(
     ],
 )
 
-webfiles(
+web_library(
     name = "plottable",
     srcs = [
         "plottable.html",
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
index 5cf0750872..dfd8a1ceda 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -1,18 +1,18 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "lodash",
     srcs = ["lodash.html"],
     path = "/tf-imports-d3v4",
     deps = ["@com_lodash"],
 )
 
-webfiles(
+web_library(
     name = "threejs",
     srcs = [
         "threejs.html",
@@ -22,7 +22,7 @@ webfiles(
     path = "/tf-imports",
 )
 
-webfiles(
+web_library(
     name = "numericjs",
     srcs = [
         "numericjs.html",
@@ -31,7 +31,7 @@ webfiles(
     path = "/tf-imports",
 )
 
-webfiles(
+web_library(
     name = "weblas",
     srcs = [
         "weblas.html",
@@ -40,7 +40,7 @@ webfiles(
     path = "/tf-imports",
 )
 
-webfiles(
+web_library(
     name = "graphlib",
     srcs = [
         "graphlib.html",
@@ -50,7 +50,7 @@ webfiles(
     deps = [":lodash"],
 )
 
-webfiles(
+web_library(
     name = "dagre",
     srcs = [
         "dagre.html",
@@ -63,7 +63,7 @@ webfiles(
     ],
 )
 
-webfiles(
+web_library(
     name = "d3",
     srcs = [
         "d3.html",
@@ -72,7 +72,7 @@ webfiles(
     path = "/tf-imports",
 )
 
-webfiles(
+web_library(
     name = "plottable",
     srcs = ["plottable.html"],
     path = "/tf-imports",
@@ -82,7 +82,7 @@ webfiles(
     ],
 )
 
-webfiles(
+web_library(
     name = "plottable_js_css",
     srcs = [
         "@com_palantir_plottable_v3//:package/plottable.css",
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
index 436d0c262d..c1fbf80c4b 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_scalar_dashboard",
     srcs = [
         "tf-scalar-dashboard.html",
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
index 218fda3fdb..6e85abf2d7 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_scalar_dashboard/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-scalar-dashboard/demo",
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
index 7f39d27f60..c8219c0754 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
@@ -1,10 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "data",
     srcs = glob(["*"]),
     path = "/tf-scalar-dashboard/demo/data",
diff --git a/tensorflow/tensorboard/components/tf_storage/BUILD b/tensorflow/tensorboard/components/tf_storage/BUILD
index e796340e03..8b2e006367 100644
--- a/tensorflow/tensorboard/components/tf_storage/BUILD
+++ b/tensorflow/tensorboard/components/tf_storage/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
@@ -9,7 +9,7 @@ licenses(["notice"])  # Apache 2.0
 
 # TODO(dandelion): Add webfiles support for the test code.
 
-webfiles(
+web_library(
     name = "tf_storage",
     srcs = [
         "tf-storage.html",
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
index 71e16db691..7f4c27c6aa 100644
--- a/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_text_dashboard",
     srcs = [
         "tf-text-dashboard.html",
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
index 6cd6702e4b..af13d276cd 100644
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_text_dashboard/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/tf-text-dashboard/demo",
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
index 8adf661396..6da08e5c30 100644
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
+++ b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
@@ -1,10 +1,10 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "data",
     srcs = glob(["*"]),
     path = "/tf-text-dashboard/demo/data/plugin/text",
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
index 5ce98b1d7c..3346805fb0 100644
--- a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
+++ b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
@@ -1,13 +1,13 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "vz_distribution_chart",
     srcs = [
         "vz-distribution-chart.html",
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
index 77f05aa2d4..2c9af4b3dc 100644
--- a/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
+++ b/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/vz_distribution_chart/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/vz-distribution-chart/demo",
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
index 31032a6b23..d36cf2b331 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "vz_histogram_timeseries",
     srcs = [
         "vz-histogram-timeseries.html",
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
index 894de95be6..8feb1c9926 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/vz-histogram-timeseries/demo",
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
index dbde6790b2..4396fc0981 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "vz_histogram_timeseries",
     srcs = [
         "vz-histogram-timeseries.html",
@@ -25,7 +25,7 @@ filegroup(
 )
 
 # bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["demo.html"],
     path = "/vz-histogram-timeseries",
diff --git a/tensorflow/tensorboard/components/vz_line_chart/BUILD b/tensorflow/tensorboard/components/vz_line_chart/BUILD
index 7b13abd721..130d58dec7 100644
--- a/tensorflow/tensorboard/components/vz_line_chart/BUILD
+++ b/tensorflow/tensorboard/components/vz_line_chart/BUILD
@@ -1,13 +1,13 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "vz_line_chart",
     srcs = [
         "vz-line-chart.html",
diff --git a/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
index 84699b67b6..29e12160ea 100644
--- a/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
+++ b/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/vz_line_chart/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"],
     path = "/vz-line-chart/demo",
diff --git a/tensorflow/tensorboard/components/vz_sorting/BUILD b/tensorflow/tensorboard/components/vz_sorting/BUILD
index 8efedb3639..ab5d7c3989 100644
--- a/tensorflow/tensorboard/components/vz_sorting/BUILD
+++ b/tensorflow/tensorboard/components/vz_sorting/BUILD
@@ -1,13 +1,13 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "vz_sorting",
     srcs = [
         "vz-sorting.html",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 016deb7dd6..84c0e89b91 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -4,7 +4,7 @@ load("//third_party/gpus:cuda_configure.bzl", "cuda_configure")
 load("//third_party/sycl:sycl_configure.bzl", "sycl_configure")
 load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external")
 load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles_external")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library_external")
 load("//third_party/py:python_configure.bzl", "python_configure")
 
 
@@ -717,7 +717,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   ##############################################################################
   # TensorBoard JavaScript Production Dependencies
 
-  webfiles_external(
+  web_library_external(
       name = "com_lodash",
       licenses = ["notice"],  # MIT
       sha256 = "0e88207e5f90af4ce8790d6e1e7d09d2702d81bce0bafdc253d18c0a5bf7661e",
@@ -1209,7 +1209,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   ##############################################################################
   # TensorBoard Polymer Dependencies
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_font_roboto",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
@@ -1222,7 +1222,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       srcs = ["roboto.html"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_a11y_announcer",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
@@ -1236,7 +1236,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_a11y_keys_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
@@ -1250,7 +1250,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_ajax",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
@@ -1270,7 +1270,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_autogrow_textarea",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
@@ -1290,7 +1290,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_behaviors",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
@@ -1310,7 +1310,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_checked_element_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
@@ -1328,7 +1328,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_collapse",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
@@ -1345,7 +1345,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_demo_helpers",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
@@ -1370,7 +1370,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_dropdown",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
@@ -1394,7 +1394,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_fit_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
@@ -1408,7 +1408,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_flex_layout",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
@@ -1427,7 +1427,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_form_element_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
@@ -1441,7 +1441,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_icon",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
@@ -1459,7 +1459,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_icons",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
@@ -1488,7 +1488,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_iconset_svg",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
@@ -1505,7 +1505,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_input",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
@@ -1523,7 +1523,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_list",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
@@ -1542,7 +1542,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_menu_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
@@ -1563,7 +1563,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_meta",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
@@ -1577,7 +1577,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_overlay_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
@@ -1601,7 +1601,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_range_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
@@ -1615,7 +1615,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_resizable_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
@@ -1629,7 +1629,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_scroll_target_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
@@ -1643,7 +1643,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_selector",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
@@ -1662,7 +1662,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_iron_validatable_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
@@ -1679,7 +1679,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_marked",
       licenses = ["notice"],  # MIT
       sha256 = "93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
@@ -1692,7 +1692,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       srcs = ["lib/marked.js"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_marked_element",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
@@ -1712,7 +1712,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_neon_animation",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
@@ -1761,7 +1761,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_behaviors",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
@@ -1785,7 +1785,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_button",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
@@ -1805,7 +1805,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_checkbox",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
@@ -1823,7 +1823,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_dialog",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
@@ -1841,7 +1841,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_dialog_behavior",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
@@ -1865,7 +1865,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_dialog_scrollable",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
@@ -1884,7 +1884,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_dropdown_menu",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
@@ -1916,7 +1916,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_header_panel",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
@@ -1933,7 +1933,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_icon_button",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
@@ -1955,7 +1955,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_input",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
@@ -1986,7 +1986,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_item",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
@@ -2011,7 +2011,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_listbox",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
@@ -2029,7 +2029,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_material",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
@@ -2049,7 +2049,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_menu",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
@@ -2074,7 +2074,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_menu_button",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
@@ -2098,7 +2098,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_progress",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
@@ -2117,7 +2117,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_radio_button",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
@@ -2135,7 +2135,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_radio_group",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
@@ -2154,7 +2154,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_ripple",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
@@ -2171,7 +2171,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_slider",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
@@ -2195,7 +2195,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_spinner",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
@@ -2216,7 +2216,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_styles",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
@@ -2247,7 +2247,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_tabs",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
@@ -2276,7 +2276,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_toast",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
@@ -2294,7 +2294,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_toggle_button",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
@@ -2313,7 +2313,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_toolbar",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
@@ -2331,7 +2331,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_paper_tooltip",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
@@ -2348,7 +2348,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
@@ -2365,7 +2365,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_prism",
       licenses = ["notice"],  # MIT
       sha256 = "e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
@@ -2381,7 +2381,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_prism_element",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
@@ -2401,7 +2401,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_promise_polyfill",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
@@ -2420,7 +2420,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       deps = ["@org_polymer"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_web_animations_js",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
@@ -2433,7 +2433,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       srcs = ["web-animations-next-lite.min.js"],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_webcomponentsjs",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
@@ -2462,7 +2462,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   ##############################################################################
   # TensorBoard Testing Dependencies
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_accessibility_developer_tools",
       licenses = ["notice"],  # Apache License 2.0
       sha256 = "1d6a72f401c9d53f68238c617dd43a05cd85ca5aa2e676a5b3c352711448e093",
@@ -2474,7 +2474,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       path = "/accessibility-developer-tools",
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_async",
       licenses = ["notice"],  # MIT
       sha256 = "08655255ae810bf4d1cb1642df57658fcce823776d3ba8f4b46f4bbff6c87ece",
@@ -2486,7 +2486,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       path = "/async",
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_chai",
       licenses = ["notice"],  # MIT
       sha256 = "aca8137bed5bb295bd7173325b7ad604cd2aeb341d739232b4f9f0b26745be90",
@@ -2498,7 +2498,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       path = "/chai",
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_mocha",
       licenses = ["notice"],  # MIT
       sha256 = "13ef37a071196a2fba680799b906555d3f0ab61e80a7e8f73f93e77914590dd4",
@@ -2511,7 +2511,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       path = "/mocha",
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_sinon",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "49edb057695fc9019aae992bf7e677a07de7c6ce2bf9f9facde4a245045d1532",
@@ -2523,7 +2523,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       path = "/sinonjs",
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_sinon_chai",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "b85fc56f713832960b56fe9269ee4bb2cd41edd2ceb130b0936e5bdbed5dea63",
@@ -2535,7 +2535,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       path = "/sinon-chai",
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_stacky",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c659e60f7957d9d80c23a7aacc4d71b19c6421a08f91174c0062de369595acae",
@@ -2547,7 +2547,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       path = "/stacky",
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_npmjs_registry_web_component_tester",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9d4ebd4945df8a936916d4d32b7f280f2a3afa35f79e7ca8ad3ed0a42770c537",
@@ -2574,7 +2574,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
-  webfiles_external(
+  web_library_external(
       name = "org_polymer_test_fixture",
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "59d6cfb1187733b71275becfea181fe0aa1f734df5ff77f5850c806bbbf9a0d9",
-- 
GitLab


From 326ee1883f873695540e7a85f07f52b24e5974a4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 10 May 2017 19:33:03 -0700
Subject: [PATCH 1210/1563] Changes _ReplicaDeviceChooser to not set a task
 number on ops with a non-PS job.

PiperOrigin-RevId: 155705170
---
 tensorflow/python/training/device_setter.py   | 46 +++++++++----------
 .../python/training/device_setter_test.py     | 44 ++++++++++++++++++
 2 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/tensorflow/python/training/device_setter.py b/tensorflow/python/training/device_setter.py
index 85ee10379a..02155a98d7 100644
--- a/tensorflow/python/training/device_setter.py
+++ b/tensorflow/python/training/device_setter.py
@@ -94,31 +94,31 @@ class _ReplicaDeviceChooser(object):
     Returns:
       The device to use for the `Operation`.
     """
+    # If we don't return early here, either merge_devices is True, or op.device
+    # is empty (in which case merging is a no-op). So we can always merge below.
     if not self._merge_devices and op.device:
       return op.device
+
     current_device = pydev.DeviceSpec.from_string(op.device or "")
-    spec = pydev.DeviceSpec()
-    if self._ps_tasks and self._ps_device:
-      node_def = op if isinstance(op, node_def_pb2.NodeDef) else op.node_def
-      if node_def.op in self._ps_ops:
-        device_string = "%s/task:%d" % (
-            self._ps_device, self._ps_strategy(op))
-        if self._merge_devices:
-          spec = pydev.DeviceSpec.from_string(device_string)
-          spec.merge_from(current_device)
-          return spec.to_string()
-        else:
-          return device_string
-    if self._worker_device:
-      if not self._merge_devices:
-        return self._worker_device
-      spec = pydev.DeviceSpec.from_string(self._worker_device)
-
-    if not self._merge_devices:
-      return ""
-
-    spec.merge_from(current_device)
-    return spec.to_string()
+
+    # The ps_device will be used for specified ops (ps_ops) whenever it is
+    # present and ps_tasks is non-zero. However, its task number will only be
+    # set (using ps_strategy) if there is a job field in ps_device that won't be
+    # changed by the job field (if present) in current_device.
+    node_def = op if isinstance(op, node_def_pb2.NodeDef) else op.node_def
+    if self._ps_tasks and self._ps_device and node_def.op in self._ps_ops:
+      ps_device = pydev.DeviceSpec.from_string(self._ps_device)
+
+      current_job, ps_job = current_device.job, ps_device.job
+      if ps_job and (not current_job or current_job == ps_job):
+        ps_device.task = self._ps_strategy(op)
+
+      ps_device.merge_from(current_device)
+      return ps_device.to_string()
+
+    worker_device = pydev.DeviceSpec.from_string(self._worker_device or "")
+    worker_device.merge_from(current_device)
+    return worker_device.to_string()
 
 
 def replica_device_setter(ps_tasks=0, ps_device="/job:ps",
@@ -186,7 +186,7 @@ def replica_device_setter(ps_tasks=0, ps_device="/job:ps",
       cluster_spec = cluster.as_dict()
     else:
       cluster_spec = server_lib.ClusterSpec(cluster).as_dict()
-    # Get ps_job_name from ps_device by striping "/job:".
+    # Get ps_job_name from ps_device by stripping "/job:".
     ps_job_name = pydev.DeviceSpec.from_string(ps_device).job
     if ps_job_name not in cluster_spec or cluster_spec[ps_job_name] is None:
       return None
diff --git a/tensorflow/python/training/device_setter_test.py b/tensorflow/python/training/device_setter_test.py
index bc29e0d21c..85b75502ab 100644
--- a/tensorflow/python/training/device_setter_test.py
+++ b/tensorflow/python/training/device_setter_test.py
@@ -65,6 +65,50 @@ class DeviceSetterTest(test.TestCase):
       self.assertDeviceEqual("/job:ps/task:1", w.initializer.device)
       self.assertDeviceEqual("/job:worker", a.device)
 
+  def testPS2TasksPinVariableToJob(self):
+    with ops.device(
+        device_setter.replica_device_setter(cluster=self._cluster_spec)):
+      v = variables.Variable([1, 2])
+      with ops.device("/job:moon"):
+        w = variables.Variable([2, 1])
+        with ops.device("/job:ps"):  # Explicit PS job will get task set.
+          x = variables.Variable([0, 1])
+      a = v + w + x
+      self.assertDeviceEqual("/job:ps/task:0", v.device)
+      self.assertDeviceEqual("/job:ps/task:0", v.initializer.device)
+      self.assertDeviceEqual("/job:moon", w.device)
+      self.assertDeviceEqual("/job:moon", w.initializer.device)
+      self.assertDeviceEqual("/job:ps/task:1", x.device)
+      self.assertDeviceEqual("/job:ps/task:1", x.initializer.device)
+      self.assertDeviceEqual("/job:worker", a.device)
+
+  def testPS2TasksUseCpuForPS(self):
+    with ops.device(
+        device_setter.replica_device_setter(ps_tasks=1, ps_device="/cpu:0")):
+      v = variables.Variable([1, 2])
+      with ops.device("/job:moon"):
+        w = variables.Variable([2, 1])
+      a = v + w
+      self.assertDeviceEqual("/cpu:0", v.device)
+      self.assertDeviceEqual("/cpu:0", v.initializer.device)
+      self.assertDeviceEqual("/job:moon/cpu:0", w.device)
+      self.assertDeviceEqual("/job:moon/cpu:0", w.initializer.device)
+      self.assertDeviceEqual("/job:worker", a.device)
+
+  def testPS2TasksNoMerging(self):
+    with ops.device(
+        device_setter.replica_device_setter(
+            cluster=self._cluster_spec, merge_devices=False)):
+      v = variables.Variable([1, 2])
+      with ops.device("/job:ps"):  # Won't assign task when merge_devices=False.
+        w = variables.Variable([2, 1])
+      a = v + w
+      self.assertDeviceEqual("/job:ps/task:0", v.device)
+      self.assertDeviceEqual("/job:ps/task:0", v.initializer.device)
+      self.assertDeviceEqual("/job:ps", w.device)
+      self.assertDeviceEqual("/job:ps", w.initializer.device)
+      self.assertDeviceEqual("/job:worker", a.device)
+
   def testPS2TasksWithClusterSpecDict(self):
     with ops.device(
         device_setter.replica_device_setter(cluster=self._cluster_spec.as_dict(
-- 
GitLab


From 947fc02a3bfc9bbddac37be2a252c9b7f1b3598b Mon Sep 17 00:00:00 2001
From: Bjarke Hammersholt Roune <broune@google.com>
Date: Wed, 10 May 2017 19:40:46 -0700
Subject: [PATCH 1211/1563] Fold Pad into ReduceWindow.

PiperOrigin-RevId: 155705565
---
 .../xla/service/algebraic_simplifier.cc       | 64 +++++++++++++++
 .../xla/service/algebraic_simplifier_test.cc  | 81 +++++++++++++++++++
 .../compiler/xla/tests/reduce_window_test.cc  | 11 +++
 tensorflow/compiler/xla/util.cc               |  9 +++
 tensorflow/compiler/xla/util.h                |  4 +
 5 files changed, 169 insertions(+)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index d6dce9745b..f240b1ebe9 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -160,6 +160,10 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
                       tensorflow::gtl::ArraySlice<int64> dimensions,
                       HloComputation* function) override;
 
+  Status HandleReduceWindow(HloInstruction* reduce_window,
+                            HloInstruction* operand, const Window& window,
+                            HloComputation* function) override;
+
   Status HandleReverse(HloInstruction* reverse,
                        HloInstruction* operand) override;
   Status HandleSlice(HloInstruction* slice, HloInstruction* operand) override;
@@ -1096,6 +1100,66 @@ Status AlgebraicSimplifierVisitor::HandleReduce(
   return Status::OK();
 }
 
+Status AlgebraicSimplifierVisitor::HandleReduceWindow(
+    HloInstruction* reduce_window, HloInstruction* operand,
+    const Window& window, HloComputation* function) {
+  VLOG(10) << "Considering folding Pad: " << operand->ToString()
+           << "\ninto reduce-window: " << reduce_window->ToString();
+
+  // This optimization folds a pad op into reduce_window.
+  if (operand->opcode() != HloOpcode::kPad) {
+    VLOG(10) << "Not folding pad into reduce-window as there is no pad.";
+    return Status::OK();
+  }
+
+  // Do not fold interior padding into ReduceWindow since the backends do not
+  // support it.
+  const PaddingConfig& pad_config = operand->padding_config();
+  if (HasInteriorPadding(pad_config)) {
+    VLOG(10) << "Not folding pad into reduce-window due to interior padding.";
+    return Status::OK();
+  }
+
+  // If reduce_window already has padding, the pad value of the pad op and the
+  // init value of reduce_window must match to allow folding the pad.
+  const HloInstruction* pad_value = operand->operand(1);
+  const HloInstruction* reduce_init_value = reduce_window->operand(1);
+  if (pad_value != reduce_init_value) {
+    // The pad value is usually a constant, so we handle that case and do not
+    // try to get more fancy about proving equivalence in cases beyond that.
+    if (pad_value->opcode() != HloOpcode::kConstant ||
+        reduce_init_value->opcode() != HloOpcode::kConstant ||
+        !LiteralUtil::Equal(pad_value->literal(),
+                            reduce_init_value->literal())) {
+      VLOG(10)
+          << "Not folding pad into reduce-window due to different pad values.";
+      return Status::OK();
+    }
+  }
+
+  // Carry out the folding of the pad into reduce_window.
+  VLOG(10) << "Folding pad into reduce-window.";
+  Window new_window = window;
+  const int64 rank = ShapeUtil::Rank(reduce_window->shape());
+  TF_RET_CHECK(pad_config.dimensions_size() == rank);
+  TF_RET_CHECK(window.dimensions_size() == rank);
+  for (int64 i = 0; i < rank; ++i) {
+    const auto& pad_dim = pad_config.dimensions(i);
+    auto& window_dim = *new_window.mutable_dimensions(i);
+    window_dim.set_padding_low(window_dim.padding_low() +
+                               pad_dim.edge_padding_low());
+    window_dim.set_padding_high(window_dim.padding_high() +
+                                pad_dim.edge_padding_high());
+  }
+  return ReplaceWithNewInstruction(
+      reduce_window, HloInstruction::CreateReduceWindow(
+                         /*shape=*/reduce_window->shape(),
+                         /*operand=*/operand->mutable_operand(0),
+                         /*init_value=*/reduce_window->mutable_operand(1),
+                         /*window=*/new_window,
+                         /*reduce_computation=*/function));
+}
+
 Status AlgebraicSimplifierVisitor::HandleTranspose(HloInstruction* transpose) {
   auto operand = transpose->mutable_operand(0);
 
diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
index f4b42055b7..87d8a7165c 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier_test.cc
@@ -41,6 +41,7 @@ namespace {
 AlgebraicSimplifier::ValidBitcastCallback bitcasting_callback() {
   return [](const Shape&, const Shape&) { return true; };
 }
+
 AlgebraicSimplifier::ValidBitcastCallback non_bitcasting_callback() {
   return [](const Shape&, const Shape&) { return false; };
 }
@@ -1547,6 +1548,86 @@ TEST_F(AlgebraicSimplifierTest, ScalarBroadcastToTransposeReshape) {
   EXPECT_TRUE(ShapeUtil::Equal(root->shape(), reshape_shape));
 }
 
+// Test that ReduceWindow(Pad(op, x), y) can simplify to ReduceWindow(op, x).
+TEST_F(AlgebraicSimplifierTest, FoldPadIntoReduceWindow) {
+  HloModule module(TestName());
+  HloComputation::Builder builder(TestName());
+
+  // Create operand to the pad.
+  HloInstruction* operand =
+      builder.AddInstruction(HloInstruction::CreateParameter(
+          0, ShapeUtil::MakeShape(F32, {1, 2, 3, 4}), "p0"));
+
+  // Create the pad.
+  PaddingConfig padding = MakeNoPaddingConfig(4);
+  padding.mutable_dimensions(1)->set_edge_padding_low(1);
+  padding.mutable_dimensions(3)->set_edge_padding_high(2);
+
+  HloInstruction* pad_value = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(5.0f)));
+  HloInstruction* pad = builder.AddInstruction(HloInstruction::CreatePad(
+      ShapeUtil::MakeShape(F32, {1, 3, 3, 5}), operand, pad_value, padding));
+
+  // Create add computation.
+  HloComputation* add_computation = nullptr;
+  {
+    HloComputation::Builder builder(TestName() + ".add");
+    const Shape scalar_shape = ShapeUtil::MakeShape(F32, {});
+    HloInstruction* p0 = builder.AddInstruction(
+        HloInstruction::CreateParameter(0, scalar_shape, "p0"));
+    HloInstruction* p1 = builder.AddInstruction(
+        HloInstruction::CreateParameter(1, scalar_shape, "p1"));
+    builder.AddInstruction(
+        HloInstruction::CreateBinary(scalar_shape, HloOpcode::kAdd, p0, p1));
+    add_computation = module.AddEmbeddedComputation(builder.Build());
+  }
+
+  // Create the reduce-window.
+  Window window;
+  for (int64 i = 0; i < ShapeUtil::Rank(pad->shape()); ++i) {
+    auto* dim = window.add_dimensions();
+    dim->set_size(1);
+    dim->set_padding_low(10);
+    dim->set_padding_high(100);
+    dim->set_window_dilation(1);
+    dim->set_base_dilation(1);
+  }
+  const Shape reduce_window_shape =
+      ShapeUtil::MakeShape(F32, {111, 113, 113, 115});
+  HloInstruction* reduce_init_value = builder.AddInstruction(
+      HloInstruction::CreateConstant(LiteralUtil::CreateR0<float>(5.0f)));
+  HloInstruction* reduce_window =
+      builder.AddInstruction(HloInstruction::CreateReduceWindow(
+          reduce_window_shape, pad, reduce_init_value, window,
+          add_computation));
+
+  // Build the computation and run the simplifier.
+  auto computation = module.AddEntryComputation(builder.Build());
+  HloInstruction* root = computation->root_instruction();
+  EXPECT_EQ(root, reduce_window);
+  AlgebraicSimplifier simplifier(/*is_layout_sensitive=*/false,
+                                 non_bitcasting_callback());
+  ASSERT_TRUE(simplifier.Run(&module).ValueOrDie());
+
+  // Running simplification again should not result in any further changes.
+  ASSERT_FALSE(simplifier.Run(&module).ValueOrDie());
+
+  // Verify the result
+  root = computation->root_instruction();
+  EXPECT_THAT(root, op::ReduceWindow(operand, op::Constant()));
+  EXPECT_TRUE(ShapeUtil::Equal(root->shape(), reduce_window_shape))
+      << ShapeUtil::HumanString(root->shape()) << " vs "
+      << ShapeUtil::HumanString(reduce_window_shape);
+  EXPECT_EQ(root->window().dimensions(0).padding_low(), 10);
+  EXPECT_EQ(root->window().dimensions(1).padding_low(), 11);
+  EXPECT_EQ(root->window().dimensions(2).padding_low(), 10);
+  EXPECT_EQ(root->window().dimensions(3).padding_low(), 10);
+  EXPECT_EQ(root->window().dimensions(0).padding_high(), 100);
+  EXPECT_EQ(root->window().dimensions(1).padding_high(), 100);
+  EXPECT_EQ(root->window().dimensions(2).padding_high(), 100);
+  EXPECT_EQ(root->window().dimensions(3).padding_high(), 102);
+}
+
 TEST_F(AlgebraicSimplifierTest, ReversalOfTrivialDimensionsToBitcast) {
   HloComputation::Builder builder(TestName());
   const Shape shape = ShapeUtil::MakeShape(F32, {448, 2048, 1, 1});
diff --git a/tensorflow/compiler/xla/tests/reduce_window_test.cc b/tensorflow/compiler/xla/tests/reduce_window_test.cc
index ceefc05634..c3b768579a 100644
--- a/tensorflow/compiler/xla/tests/reduce_window_test.cc
+++ b/tensorflow/compiler/xla/tests/reduce_window_test.cc
@@ -182,6 +182,7 @@ TEST_F(ReduceWindowTest, DISABLED_AmongMajor2DimsMediumSizeLargePadding) {
 
   ComputeAndCompareR4<float>(&builder_, *result, {}, ErrorSpec(1e-3, 1e-3));
 }
+
 // TODO(b/31809540): Implement minor dim reduction to reduce num of reshapes.
 TEST_F(ReduceWindowTest, ReduceR4AmongXYMinorSmall) {
   Array4D<float> input_array(2, 2, 4, 16);
@@ -368,6 +369,16 @@ TEST_F(ReduceWindowTest, Add2x2In2x2Disjoint) {
   ComputeAndCompareR2<float>(&builder_, expected, {}, ErrorSpec(0.0001));
 }
 
+TEST_F(ReduceWindowTest, Add1x2In2x2Same) {
+  Array2D<float> input_array({{1.0f, 2.0f}, {3.0f, 4.0f}});
+  auto input = builder_.ConstantR2FromArray2D<float>(input_array);
+  ReduceWindowAdd(input, {1, 2}, {1, 1}, Padding::kSame);
+  Array2D<float> expected({
+      {3.0f, 2.0f}, {7.0f, 4.0f},
+  });
+  ComputeAndCompareR2<float>(&builder_, expected, {}, ErrorSpec(0.0001));
+}
+
 XLA_TEST_F(ReduceWindowTest, Add1x1x2In2x1x2) {
   Array3D<float> input_array(2, 1, 2);
   input_array(0, 0, 0) = 1000;
diff --git a/tensorflow/compiler/xla/util.cc b/tensorflow/compiler/xla/util.cc
index 2f0f6a426f..d467178cb5 100644
--- a/tensorflow/compiler/xla/util.cc
+++ b/tensorflow/compiler/xla/util.cc
@@ -206,6 +206,15 @@ PaddingConfig MakeNoPaddingConfig(int64 rank) {
   return padding_config;
 }
 
+bool HasInteriorPadding(const PaddingConfig& config) {
+  for (const auto& dim : config.dimensions()) {
+    if (dim.interior_padding() != 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
 string HumanReadableNumFlops(double flops, double nanoseconds) {
   if (nanoseconds == 0) {
     return "NaN FLOP/s";
diff --git a/tensorflow/compiler/xla/util.h b/tensorflow/compiler/xla/util.h
index 62959f2c4c..42d5c1d155 100644
--- a/tensorflow/compiler/xla/util.h
+++ b/tensorflow/compiler/xla/util.h
@@ -265,6 +265,10 @@ string VectorString(const std::initializer_list<T>& c) {
 // Returns a PaddingConfig object that represents no padding for the given rank.
 PaddingConfig MakeNoPaddingConfig(int64 rank);
 
+// Returns true if the padding configuration has at least one dimension with
+// non-zero interior padding.
+bool HasInteriorPadding(const PaddingConfig& config);
+
 // Imports the templated FloorOfRatio math function from the TensorFlow
 // namespace, as it is very commonly used.
 template <typename T>
-- 
GitLab


From 8f8855adc604333180bf57f11e00dc70e679974d Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Wed, 10 May 2017 20:12:11 -0700
Subject: [PATCH 1212/1563] Cleanup of a few things in distributions library. 
 Noticed while putting together change for MVNFullCovariance.

* Using assert_none_equal
* Removing redundant asserts in mvn_tril.

PiperOrigin-RevId: 155707155
---
 .../python/kernel_tests/mvn_diag_test.py        |  8 ++++++++
 .../python/kernel_tests/mvn_tril_test.py        |  8 ++++++++
 .../kernel_tests/vector_laplace_diag_test.py    |  8 ++++++++
 .../python/ops/distribution_util.py             |  9 +++------
 .../distributions/python/ops/mvn_diag.py        |  5 ++++-
 .../distributions/python/ops/mvn_tril.py        | 17 ++++-------------
 .../python/ops/vector_laplace_diag.py           |  5 ++++-
 7 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py
index 406cd4ebbe..3f4582eb7e 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_diag_test.py
@@ -103,6 +103,14 @@ class MultivariateNormalDiagTest(test.TestCase):
       self.assertAllClose(cov_mat, np.cov(samps.T),
                           atol=0.05, rtol=0.05)
 
+  def testSingularScaleRaises(self):
+    mu = [-1., 1]
+    diag = [1., 0]
+    with self.test_session():
+      dist = ds.MultivariateNormalDiag(mu, diag, validate_args=True)
+      with self.assertRaisesOpError("Singular"):
+        dist.sample().eval()
+
   def testSampleWithBroadcastScale(self):
     # mu corresponds to a 2-batch of 3-variate normals
     mu = np.zeros([2, 3])
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
index 8c6980ca57..685f32883d 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_tril_test.py
@@ -151,6 +151,14 @@ class MultivariateNormalTriLTest(test.TestCase):
       self.assertAllClose(sample_values.mean(axis=0), mu, atol=1e-2)
       self.assertAllClose(np.cov(sample_values, rowvar=0), sigma, atol=0.06)
 
+  def testSingularScaleRaises(self):
+    with self.test_session():
+      mu = None
+      chol = [[1., 0.], [0., 0.]]
+      mvn = ds.MultivariateNormalTriL(mu, chol, validate_args=True)
+      with self.assertRaisesOpError("Singular operator"):
+        mvn.sample().eval()
+
   def testSampleWithSampleShape(self):
     with self.test_session():
       mu = self._rng.rand(3, 5, 2)
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py b/tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py
index fc04acd90c..c355adeedb 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/vector_laplace_diag_test.py
@@ -92,6 +92,14 @@ class VectorLaplaceDiagTest(test.TestCase):
       self.assertAllClose(cov_mat, np.cov(samps.T),
                           atol=0.05, rtol=0.05)
 
+  def testSingularScaleRaises(self):
+    mu = [-1., 1]
+    diag = [1., 0]
+    with self.test_session():
+      dist = ds.VectorLaplaceDiag(mu, diag, validate_args=True)
+      with self.assertRaisesOpError("Singular"):
+        dist.sample().eval()
+
   def testSampleWithBroadcastScale(self):
     # mu corresponds to a 2-batch of 3-variate normals
     mu = np.zeros([2, 3])
diff --git a/tensorflow/contrib/distributions/python/ops/distribution_util.py b/tensorflow/contrib/distributions/python/ops/distribution_util.py
index 370b4f4a06..5e3b42dd2a 100644
--- a/tensorflow/contrib/distributions/python/ops/distribution_util.py
+++ b/tensorflow/contrib/distributions/python/ops/distribution_util.py
@@ -25,7 +25,6 @@ from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import math_ops
 from tensorflow.python.ops.distributions import util
 from tensorflow.python.ops.distributions.util import *  # pylint: disable=wildcard-import
 
@@ -45,13 +44,11 @@ def make_diag_scale(loc, scale_diag, scale_identity_multiplier,
           check_ops.assert_positive(
               x, message="diagonal part must be positive"),
       ], x)
-    # TODO(b/35157376): Use `assert_none_equal` once it exists.
     return control_flow_ops.with_dependencies([
-        check_ops.assert_greater(
-            math_ops.abs(x),
+        check_ops.assert_none_equal(
+            x,
             array_ops.zeros([], x.dtype),
-            message="diagonal part must be non-zero"),
-    ], x)
+            message="diagonal part must be non-zero")], x)
 
   with ops.name_scope(name, "make_diag_scale",
                       values=[loc, scale_diag, scale_identity_multiplier]):
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_diag.py b/tensorflow/contrib/distributions/python/ops/mvn_diag.py
index e57145b42f..163cf75d99 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_diag.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_diag.py
@@ -197,11 +197,14 @@ class MultivariateNormalDiag(
     with ops.name_scope(name):
       with ops.name_scope("init", values=[
           loc, scale_diag, scale_identity_multiplier]):
+        # No need to validate_args while making diag_scale.  The returned
+        # LinearOperatorDiag has an assert_non_singular method that is called by
+        # the Bijector.
         scale = distribution_util.make_diag_scale(
             loc=loc,
             scale_diag=scale_diag,
             scale_identity_multiplier=scale_identity_multiplier,
-            validate_args=validate_args,
+            validate_args=False,
             assert_positive=False)
     super(MultivariateNormalDiag, self).__init__(
         loc=loc,
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_tril.py b/tensorflow/contrib/distributions/python/ops/mvn_tril.py
index dd5933f62b..d662b25e1e 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_tril.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_tril.py
@@ -21,10 +21,6 @@ from __future__ import print_function
 from tensorflow.contrib import linalg
 from tensorflow.contrib.distributions.python.ops import mvn_linear_operator as mvn_linop
 from tensorflow.python.framework import ops
-from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import check_ops
-from tensorflow.python.ops import control_flow_ops
-from tensorflow.python.ops import math_ops
 from tensorflow.python.ops.distributions import util as distribution_util
 
 
@@ -55,7 +51,7 @@ class MultivariateNormalTriL(
   where:
 
   * `loc` is a vector in `R^k`,
-  * `scale` is a linear operator in `R^{k x k}`, `cov = scale @ scale.T`,
+  * `scale` is a matrix in `R^{k x k}`, `covariance = scale @ scale.T`,
   * `Z` denotes the normalization constant, and,
   * `||y||**2` denotes the squared Euclidean norm of `y`.
 
@@ -191,14 +187,9 @@ class MultivariateNormalTriL(
               is_positive_definite=True,
               assert_proper_shapes=validate_args)
         else:
-          if validate_args:
-            scale_tril = control_flow_ops.with_dependencies([
-                # TODO(b/35157376): Use `assert_none_equal` once it exists.
-                check_ops.assert_greater(
-                    math_ops.abs(array_ops.matrix_diag_part(scale_tril)),
-                    array_ops.zeros([], scale_tril.dtype),
-                    message="`scale_tril` must have non-zero diagonal"),
-            ], scale_tril)
+          # No need to validate that scale_tril is non-singular.
+          # LinearOperatorTriL has an assert_non_singular method that is called
+          # by the Bijector.
           scale = linalg.LinearOperatorTriL(
               scale_tril,
               is_non_singular=True,
diff --git a/tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py b/tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py
index 2dfda81a15..0e3867809a 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_laplace_diag.py
@@ -214,11 +214,14 @@ class VectorLaplaceDiag(
     with ops.name_scope(name):
       with ops.name_scope("init", values=[
           loc, scale_diag, scale_identity_multiplier]):
+        # No need to validate_args while making diag_scale.  The returned
+        # LinearOperatorDiag has an assert_non_singular method that is called by
+        # the Bijector.
         scale = distribution_util.make_diag_scale(
             loc=loc,
             scale_diag=scale_diag,
             scale_identity_multiplier=scale_identity_multiplier,
-            validate_args=validate_args,
+            validate_args=False,
             assert_positive=False)
     super(VectorLaplaceDiag, self).__init__(
         loc=loc,
-- 
GitLab


From 27c89207d2f31fe4b4b42c789b96d62cde4e2133 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 10 May 2017 20:49:53 -0700
Subject: [PATCH 1213/1563] Migrate forked TensorBoard build to webfiles

bazel run tensorflow/tensorboard/components/tf_tensorboard_d3v4:index

This will bring up a local web server and display a vulcanized
TensorBoard that is 95% working, with the exception of tf-graph, which
isn't included.

PiperOrigin-RevId: 155708877
---
 tensorflow/BUILD                              |  28 +
 .../components/tf_audio_dashboard_d3v4/BUILD  |  79 +++
 .../audioDashboardTests.ts                    |  47 ++
 .../audio_run_run1_tag_au1_2Faudio_2F0.json   |   1 +
 .../audio_run_run2_tag_au2_2Faudio_2F0.json   |  20 +
 ...o_index_0_tag_au1_2Faudio_2F0_run_run1.wav | Bin 0 -> 8044 bytes
 ...o_index_0_tag_au2_2Faudio_2F0_run_run2.wav | Bin 0 -> 8044 bytes
 ...o_index_1_tag_au2_2Faudio_2F0_run_run2.wav | Bin 0 -> 490640 bytes
 ...o_index_2_tag_au2_2Faudio_2F0_run_run2.wav | Bin 0 -> 205420 bytes
 .../tf_audio_dashboard_d3v4/data/runs.json    |  10 +
 .../tf_audio_dashboard_d3v4/index.html        |  61 +++
 .../tf_audio_dashboard_d3v4/tests.html        |  38 ++
 .../tf-audio-dashboard.html                   |  87 +++
 .../tf-audio-grid.html                        | 183 +++++++
 .../tf-audio-loader.html                      | 237 +++++++++
 .../components/tf_backend_d3v4/BUILD          |  64 ++-
 .../components/tf_backend_d3v4/test/BUILD     |  56 ++
 .../{ => test}/backendTests.ts                |   8 +-
 .../{ => test}/behaviorTests.ts               |   5 +-
 .../data/audio_run_run1_tag_audio1.json       |   0
 ...pressedHistograms_run_run1_tag_histo1.json |   0
 .../{ => test}/data/example.json              |   0
 .../data/histograms_run_run1_tag_histo1.json  |   0
 .../data/images_run_run1_tag_im1.json         |   0
 ...dividualImage_index_0_tag_im1_run_run1.png | Bin
 .../run_metadata_run_step99_tag_train.pbtxt   |   0
 .../tf_backend_d3v4/{ => test}/data/runs.json |   0
 .../{ => test}/data/scalars.json              |   0
 ...rs_run_run1_tag_cross_entropy__281_29.json |   0
 .../{ => test}/requestManagerTests.ts         |   5 +-
 .../test}/tests.html                          |   9 +-
 .../tf_backend_d3v4/tf-backend.html           |  23 +
 .../components/tf_color_scale_d3v4/BUILD      |  89 ++--
 .../{demo.html => index.html}                 |   9 +-
 .../components/tf_color_scale_d3v4/test/BUILD |  48 ++
 .../{ => test}/colorScaleTests.ts             |   2 +-
 .../tf_color_scale_d3v4/test/tests.html       |  24 +
 .../tf_color_scale_d3v4/tf-color-scale.html   |   4 +-
 .../components/tf_dashboard_common_d3v4/BUILD | 132 +++--
 .../tf_dashboard_common_d3v4/bundle.html      |  24 +
 .../dashboard-style.html                      |   2 +-
 .../run-color-style.html                      |   2 +-
 .../scrollbar-style.html                      |   4 +-
 .../tensorboard-color.html                    |   2 +-
 .../tf_dashboard_common_d3v4/test/BUILD       |  48 ++
 .../tf_dashboard_common_d3v4/test/tests.html  |  24 +
 .../{ => test}/tf-categorizer-tests.ts        |   2 +-
 .../tf-categorizer-demo.html                  |   3 +-
 .../tf-categorizer.html                       |   4 +-
 .../tf-chart-scaffold.html                    |   2 +-
 .../tf-collapsable-pane-demo.html             |   1 +
 .../tf-collapsable-pane.html                  |   4 +-
 .../tf-dashboard-layout.html                  |   2 +-
 .../tf-dashboard.html                         |   4 +-
 .../tf-downloader.html                        |   8 +-
 .../tf-multi-checkbox-demo.html               |   4 +-
 .../tf-multi-checkbox.html                    |  10 +-
 .../tf-no-data-warning.html                   |   2 +-
 .../tf-option-selector.html                   |   2 +-
 .../tf-panes-helper.html                      |   2 +-
 .../tf-regex-group-demo.html                  |   2 +-
 .../tf-regex-group.html                       |  10 +-
 .../tf-run-selector.html                      |   6 +-
 .../tf-sidebar-helper.html                    |   3 +-
 .../tf_distribution_dashboard_d3v4/BUILD      |  41 ++
 ...pressedHistograms_run_run1_tag_histo1.json | 212 ++++++++
 ...pressedHistograms_run_run2_tag_histo1.json | 212 ++++++++
 ...pressedHistograms_run_run2_tag_histo2.json | 212 ++++++++
 .../data/logdir                               |   1 +
 .../data/runs.json                            |   4 +
 .../tf_distribution_dashboard_d3v4/index.html |  62 +++
 .../tf-distribution-dashboard.html            | 124 +++++
 .../components/tf_globals_d3v4/BUILD          |  23 +-
 .../tf_globals_d3v4/tf-globals.html           |  19 +
 .../tf_histogram_dashboard_d3v4/BUILD         |  41 ++
 .../data/histograms_run_run1_tag_histo1.json  |   1 +
 .../data/histograms_run_run2_tag_histo1.json  |   1 +
 .../data/histograms_run_run2_tag_histo2.json  |   1 +
 .../tf_histogram_dashboard_d3v4/data/logdir   |   1 +
 .../data/runs.json                            |   4 +
 .../tf_histogram_dashboard_d3v4/index.html    |  61 +++
 .../tf-histogram-dashboard.html               | 163 ++++++
 .../components/tf_image_dashboard_d3v4/BUILD  |  44 ++
 .../images_run_run1_tag_im1_2Fimage_2F0.json  |   9 +
 .../images_run_run1_tag_im2_2Fimage_2F0.json  |   9 +
 .../images_run_run2_tag_im1_2Fimage_2F0.json  |   9 +
 ...e_tag_im1_2Fimage_2F0_index_0_run_run1.png | Bin 0 -> 118 bytes
 ...e_tag_im1_2Fimage_2F0_index_0_run_run2.png | Bin 0 -> 120 bytes
 ...e_tag_im2_2Fimage_2F0_index_0_run_run1.png | Bin 0 -> 120 bytes
 .../tf_image_dashboard_d3v4/data/logdir       |   1 +
 .../tf_image_dashboard_d3v4/data/runs.json    |  13 +
 .../tf_image_dashboard_d3v4/index.html        |  66 +++
 .../tf-image-dashboard.html                   | 156 ++++++
 .../tf-image-loader.html                      | 233 ++++++++
 .../components/tf_imports_d3v4/BUILD          |   6 +-
 .../components/tf_imports_d3v4/threejs.html   |   1 +
 .../components/tf_option_selector_d3v4/BUILD  |  21 +
 .../tf-option-selector.html                   |  94 ++++
 .../components/tf_scalar_dashboard_d3v4/BUILD |  37 ++
 .../tf_scalar_dashboard_d3v4/demo/BUILD       |  24 +
 .../tf_scalar_dashboard_d3v4/demo/data/logdir |   1 +
 .../demo/data/runs.json                       |   4 +
 .../demo/data/scalars.json                    |   1 +
 .../scalars_run_run1_tag_bar_2Fsquare.json    |   1 +
 .../data/scalars_run_run1_tag_foo_2Fcos.json  |   1 +
 .../data/scalars_run_run1_tag_foo_2Fsin.json  |   1 +
 .../scalars_run_run1_tag_foo_2Fsquare.json    |   1 +
 .../scalars_run_run2_tag_bar_2Fsquare.json    |   1 +
 .../data/scalars_run_run2_tag_foo_2Fcos.json  |   1 +
 .../scalars_run_run2_tag_foo_2Fsquare.json    |   1 +
 .../tf_scalar_dashboard_d3v4/demo/index.html  |  62 +++
 .../tf-scalar-dashboard.html                  | 270 ++++++++++
 .../tf-smoothing-input.html                   | 138 +++++
 .../components/tf_storage_d3v4/BUILD          |  53 +-
 .../components/tf_storage_d3v4/test/BUILD     |  50 ++
 .../{ => test}/storageTests.ts                |   4 +-
 .../tf_storage_d3v4/test/tests.html           |  25 +
 .../tf_storage_d3v4/tf-storage.html           |  21 +
 .../test/data/graph_run_run1.pbtxt            |   9 -
 .../test/data/graph_run_run2.pbtxt            |  15 -
 .../tf_tensorboard/test/data/runs.json        |   1 -
 .../components/tf_tensorboard_d3v4/BUILD      |  80 +++
 .../tf_tensorboard_d3v4/autoReloadBehavior.ts |  60 +++
 .../components/tf_tensorboard_d3v4/demo.html  |  32 ++
 .../components/tf_tensorboard_d3v4/dist.html  |  32 ++
 .../test/autoReloadTests.ts                   |  85 +++
 .../test/e2eTests.html}                       |  10 +-
 .../tf_tensorboard_d3v4/test/e2eTests.ts      |  42 ++
 .../test/fastTabSwitch.html}                  |   8 +-
 .../tf_tensorboard_d3v4/test/fastTabSwitch.ts |  44 ++
 .../tf_tensorboard_d3v4/test/index.html       |  35 ++
 .../test/tensorboardTests.html}               |  30 +-
 .../test/tensorboardTests.ts                  | 136 +++++
 .../tf_tensorboard_d3v4/tf-tensorboard.html   | 351 ++++++++++++
 .../components/tf_text_dashboard_d3v4/BUILD   |  45 ++
 .../tf_text_dashboard_d3v4/data/logdir        |   1 +
 .../tf_text_dashboard_d3v4/data/runs.json     |   1 +
 .../data/text_run_fry_tag_markdown.json       |  32 ++
 .../data/text_run_fry_tag_message.json        |  22 +
 .../data/text_run_leela_tag_message.json      |  22 +
 .../tf_text_dashboard_d3v4/index.html         |  68 +++
 .../tf-text-dashboard.html                    | 109 ++++
 .../tf-text-loader.html                       | 143 +++++
 .../vz_distribution_chart_d3v4/BUILD          |  78 +--
 .../{demo.html => index.html}                 |   7 +-
 .../vz-distribution-chart.html                |   6 +-
 .../vz_histogram_timeseries_d3v4/BUILD        |  25 +-
 .../{demo.html => index.html}                 |   0
 .../components/vz_line_chart_d3v4/BUILD       |  86 +--
 .../{demo.html => index.html}                 |   6 +-
 .../vz_line_chart_d3v4/vz-line-chart.html     |   8 +-
 .../components/vz_projector_d3v4/BUILD        | 501 ++++++++++++------
 .../components/vz_projector_d3v4/bh_tsne.ts   |   1 +
 .../components/vz_projector_d3v4/bundle.html  |  24 +
 .../projectorScatterPlotAdapter.ts            |   4 +-
 .../scatterPlotVisualizerSprites.ts           |   2 +-
 .../components/vz_projector_d3v4/test/BUILD   |  81 +++
 .../vz_projector_d3v4/test/assert.ts          |  16 +
 .../{ => test}/data-provider_test.ts          |  58 +-
 .../vz_projector_d3v4/{ => test}/data_test.ts |  26 +-
 .../scatterPlotRectangleSelector_test.ts      |   2 +-
 .../{ => test}/sptree_test.ts                 |   4 +-
 .../vz_projector_d3v4/test/tests.html         |  24 +
 .../vz_projector_d3v4/{ => test}/util_test.ts |  12 +-
 .../vz-projector-projections-panel_test.ts    |   6 +-
 .../components/vz_sorting_d3v4/BUILD          |  31 +-
 .../components/vz_sorting_d3v4/test/BUILD     |  46 ++
 .../{ => test}/sortingTests.ts                |   5 +-
 .../vz_sorting_d3v4/{ => test}/tests.html     |   4 +-
 .../vz_sorting_d3v4/vz-sorting.html           |  18 +
 tensorflow/tensorboard/demo/BUILD             |  20 +
 tensorflow/tensorboard/demo/data/logdir       |   1 +
 tensorflow/tensorboard/demo/index.html        |  31 --
 173 files changed, 5883 insertions(+), 651 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/audioDashboardTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run1_tag_au1_2Faudio_2F0.json
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run2_tag_au2_2Faudio_2F0.json
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_0_tag_au1_2Faudio_2F0_run_run1.wav
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_0_tag_au2_2Faudio_2F0_run_run2.wav
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_1_tag_au2_2Faudio_2F0_run_run2.wav
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_2_tag_au2_2Faudio_2F0_run_run2.wav
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tests.html
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-grid.html
 create mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-loader.html
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/test/BUILD
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/backendTests.ts (97%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/behaviorTests.ts (97%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/audio_run_run1_tag_audio1.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/compressedHistograms_run_run1_tag_histo1.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/example.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/histograms_run_run1_tag_histo1.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/images_run_run1_tag_im1.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/individualImage_index_0_tag_im1_run_run1.png (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/run_metadata_run_step99_tag_train.pbtxt (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/runs.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/scalars.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/data/scalars_run_run1_tag_cross_entropy__281_29.json (100%)
 rename tensorflow/tensorboard/components/tf_backend_d3v4/{ => test}/requestManagerTests.ts (98%)
 rename tensorflow/tensorboard/components/{tf_storage_d3v4 => tf_backend_d3v4/test}/tests.html (80%)
 create mode 100644 tensorflow/tensorboard/components/tf_backend_d3v4/tf-backend.html
 rename tensorflow/tensorboard/components/tf_color_scale_d3v4/{demo.html => index.html} (90%)
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/test/BUILD
 rename tensorflow/tensorboard/components/tf_color_scale_d3v4/{ => test}/colorScaleTests.ts (97%)
 create mode 100644 tensorflow/tensorboard/components/tf_color_scale_d3v4/test/tests.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html
 rename tensorflow/tensorboard/components/tf_dashboard_common_d3v4/{ => test}/tf-categorizer-tests.ts (98%)
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run1_tag_histo1.json
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo1.json
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo2.json
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/logdir
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/tf-distribution-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_globals_d3v4/tf-globals.html
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run1_tag_histo1.json
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo1.json
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo2.json
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/logdir
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/tf-histogram-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im1_2Fimage_2F0.json
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im2_2Fimage_2F0.json
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run2_tag_im1_2Fimage_2F0.json
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/logdir
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-loader.html
 create mode 100644 tensorflow/tensorboard/components/tf_option_selector_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_option_selector_d3v4/tf-option-selector.html
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/logdir
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_bar_2Fsquare.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fcos.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsin.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsquare.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_bar_2Fsquare.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fcos.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fsquare.json
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-scalar-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-smoothing-input.html
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/test/BUILD
 rename tensorflow/tensorboard/components/tf_storage_d3v4/{ => test}/storageTests.ts (96%)
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/test/tests.html
 create mode 100644 tensorflow/tensorboard/components/tf_storage_d3v4/tf-storage.html
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run1.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run2.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/autoReloadBehavior.ts
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/autoReloadTests.ts
 rename tensorflow/tensorboard/components/{tf_color_scale_d3v4/tests.html => tf_tensorboard_d3v4/test/e2eTests.html} (79%)
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/e2eTests.ts
 rename tensorflow/tensorboard/components/{tf_dashboard_common_d3v4/tests.html => tf_tensorboard_d3v4/test/fastTabSwitch.html} (79%)
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/fastTabSwitch.ts
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/index.html
 rename tensorflow/tensorboard/components/{tf_backend_d3v4/tests.html => tf_tensorboard_d3v4/test/tensorboardTests.html} (60%)
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/tensorboardTests.ts
 create mode 100644 tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/logdir
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_markdown.json
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_message.json
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_leela_tag_message.json
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-loader.html
 rename tensorflow/tensorboard/components/vz_distribution_chart_d3v4/{demo.html => index.html} (96%)
 rename tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/{demo.html => index.html} (100%)
 rename tensorflow/tensorboard/components/vz_line_chart_d3v4/{demo.html => index.html} (99%)
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/bundle.html
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/test/assert.ts
 rename tensorflow/tensorboard/components/vz_projector_d3v4/{ => test}/data-provider_test.ts (53%)
 rename tensorflow/tensorboard/components/vz_projector_d3v4/{ => test}/data_test.ts (80%)
 rename tensorflow/tensorboard/components/vz_projector_d3v4/{ => test}/scatterPlotRectangleSelector_test.ts (96%)
 rename tensorflow/tensorboard/components/vz_projector_d3v4/{ => test}/sptree_test.ts (97%)
 create mode 100644 tensorflow/tensorboard/components/vz_projector_d3v4/test/tests.html
 rename tensorflow/tensorboard/components/vz_projector_d3v4/{ => test}/util_test.ts (79%)
 rename tensorflow/tensorboard/components/vz_projector_d3v4/{ => test}/vz-projector-projections-panel_test.ts (96%)
 create mode 100644 tensorflow/tensorboard/components/vz_sorting_d3v4/test/BUILD
 rename tensorflow/tensorboard/components/vz_sorting_d3v4/{ => test}/sortingTests.ts (97%)
 rename tensorflow/tensorboard/components/vz_sorting_d3v4/{ => test}/tests.html (90%)
 create mode 100644 tensorflow/tensorboard/components/vz_sorting_d3v4/vz-sorting.html
 create mode 100644 tensorflow/tensorboard/demo/BUILD
 create mode 100644 tensorflow/tensorboard/demo/data/logdir
 delete mode 100644 tensorflow/tensorboard/demo/index.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index dd1d521e68..97a9c36877 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -321,37 +321,62 @@ filegroup(
         "//tensorflow/tensorboard/components:all_files",
         "//tensorflow/tensorboard/components/tf_audio_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_audio_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo/data:all_files",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_backend:all_files",
         "//tensorflow/tensorboard/components/tf_backend_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_backend_d3v4/test:all_files",
         "//tensorflow/tensorboard/components/tf_color_scale:all_files",
         "//tensorflow/tensorboard/components/tf_color_scale/demo:all_files",
         "//tensorflow/tensorboard/components/tf_color_scale_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4/test:all_files",
         "//tensorflow/tensorboard/components/tf_dashboard_common:all_files",
         "//tensorflow/tensorboard/components/tf_dashboard_common/demo:all_files",
         "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test:all_files",
         "//tensorflow/tensorboard/components/tf_distribution_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data:all_files",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_globals:all_files",
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph:all_files",
+        "//tensorflow/tensorboard/components/tf_graph/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_board:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_board/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_controls/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_dashboard:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_dashboard/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_info/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_loader/demo:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data:all_files",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_image_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_image_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_image_dashboard/demo/data:all_files",
+        "//tensorflow/tensorboard/components/tf_image_dashboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_imports:all_files",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_option_selector_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_scalar_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data:all_files",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_storage:all_files",
         "//tensorflow/tensorboard/components/tf_storage_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4/test:all_files",
+        "//tensorflow/tensorboard/components/tf_tensorboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_text_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_text_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_text_dashboard/demo/data:all_files",
+        "//tensorflow/tensorboard/components/tf_text_dashboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_data_summary:all_files",
         "//tensorflow/tensorboard/components/vz_distribution_chart:all_files",
         "//tensorflow/tensorboard/components/vz_distribution_chart/demo:all_files",
@@ -364,9 +389,12 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_line_chart_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_projector:all_files",
         "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_projector_d3v4/test:all_files",
         "//tensorflow/tensorboard/components/vz_sorting:all_files",
         "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/components/vz_sorting_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4/test:all_files",
+        "//tensorflow/tensorboard/demo:all_files",
         "//tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize:all_files",
         "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/BUILD
new file mode 100644
index 0000000000..c732074754
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/BUILD
@@ -0,0 +1,79 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_audio_dashboard_d3v4",
+    srcs = [
+        "tf-audio-dashboard.html",
+        "tf-audio-grid.html",
+        "tf-audio-loader.html",
+    ],
+    path = "/tf-audio-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "@org_polymer",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-audio-dashboard/demo",
+    deps = [
+        ":tf_audio_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+web_library(
+    name = "test",
+    testonly = 1,
+    srcs = [
+        "audioDashboardTests.js",
+        "tests.html",
+    ] + glob(["data/**"]),
+    path = "/tf-audio-dashboard/test",
+    deps = [
+        ":tf_audio_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_npmjs_registry_web_component_tester",
+        "@org_polymer",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    testonly = 1,
+    srcs = ["audioDashboardTests.ts"],
+    typings = [
+        "@org_definitelytyped//:chai.d.ts",
+        "@org_definitelytyped//:mocha.d.ts",
+        "@org_definitelytyped//:sinon.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_backend_d3v4:bundle.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/audioDashboardTests.ts b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/audioDashboardTests.ts
new file mode 100644
index 0000000000..f2bf68eb8d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/audioDashboardTests.ts
@@ -0,0 +1,47 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// TODO(dandelion): Fix me.
+declare function fixture(id: string): any;
+declare function stub(x, y: any): void;
+
+describe(
+    'audio dashboard tests', function() {
+      var audioDash;
+      var reloadCount = 0;
+      beforeEach(function() {
+        audioDash = fixture('testElementFixture');
+        var router = TF.Backend.router('data', true);
+        var backend = new TF.Backend.Backend(router);
+        audioDash.backend = backend;
+        stub('tf-audio-loader', {
+          reload: function() { reloadCount++; },
+        });
+      });
+
+      it('calling reload on dashboard reloads the audio-loaders',
+         function(done) {
+           audioDash.backendReload().then(() => {
+             reloadCount = 0;
+             var loaders = [].slice.call(
+                 audioDash.getElementsByTagName('tf-audio-loader'));
+             audioDash.frontendReload();
+             setTimeout(function() {
+               chai.assert.isAbove(reloadCount, 3);
+               done();
+             });
+           });
+         });
+    });
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run1_tag_au1_2Faudio_2F0.json b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run1_tag_au1_2Faudio_2F0.json
new file mode 100644
index 0000000000..7dfe32c711
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run1_tag_au1_2Faudio_2F0.json
@@ -0,0 +1 @@
+[{"query": "index=0&tag=au1%2Faudio%2F0&run=run1", "step": 0, "wall_time": 1461795049.203407, "content_type": "audio/wav"}]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run2_tag_au2_2Faudio_2F0.json b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run2_tag_au2_2Faudio_2F0.json
new file mode 100644
index 0000000000..d29f7931a9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/audio_run_run2_tag_au2_2Faudio_2F0.json
@@ -0,0 +1,20 @@
+[
+  {
+    "query":"index=0&tag=au2%2Faudio%2F0&run=run2",
+    "step":0,
+    "wall_time":1461795049.212815,
+    "content_type":"audio/wav"
+  },
+  {
+    "query":"index=1&tag=au2%2Faudio%2F0&run=run2",
+    "step":42,
+    "wall_time":1461895689.243345,
+    "content_type":"audio/wav"
+  },
+  {
+    "query":"index=2&tag=au2%2Faudio%2F0&run=run2",
+    "step":4242,
+    "wall_time":1461954231.123456,
+    "content_type":"audio/wav"
+  }
+]
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_0_tag_au1_2Faudio_2F0_run_run1.wav b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_0_tag_au1_2Faudio_2F0_run_run1.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f1d24adc0cef5a734e07e8899b9abf8ae26fa228
GIT binary patch
literal 8044
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
Td2!JEIB1?6G+%x+S*R2M8*8KV

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_0_tag_au2_2Faudio_2F0_run_run2.wav b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_0_tag_au2_2Faudio_2F0_run_run2.wav
new file mode 100644
index 0000000000000000000000000000000000000000..006c84338f7313a225830f121bcd95f457de1708
GIT binary patch
literal 8044
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

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_1_tag_au2_2Faudio_2F0_run_run2.wav b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_1_tag_au2_2Faudio_2F0_run_run2.wav
new file mode 100644
index 0000000000000000000000000000000000000000..f27904691f793eb5348b82c4a557991e44c9ab90
GIT binary patch
literal 490640
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%0Diawd
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

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_2_tag_au2_2Faudio_2F0_run_run2.wav b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/individualAudio_index_2_tag_au2_2Faudio_2F0_run_run2.wav
new file mode 100644
index 0000000000000000000000000000000000000000..bbd3ff8bcbb60f786f522b4fbdcf92bff4955106
GIT binary patch
literal 205420
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

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/runs.json b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/runs.json
new file mode 100644
index 0000000000..811a873684
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/data/runs.json
@@ -0,0 +1,10 @@
+{
+  "run1":
+    {
+     "audio": ["au1/audio/0"]
+    },
+  "run2":
+    {
+      "audio": ["au2/audio/0"]
+    }
+}
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/index.html b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/index.html
new file mode 100644
index 0000000000..8e0587084d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/index.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="../../paper-styles/typography.html">
+<link rel="import" href="../tf-audio-dashboard.html">
+
+<title>Audio Dashboard Demo</title>
+<style>
+  #container {
+    height: 300px;
+    width: 100%;
+  }
+
+  html, body {
+    margin: 0;
+    padding: 0;
+    font-family: "RobotoDraft","Roboto",sans-serif;
+  }
+
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="audio-dash-demo">
+      <template>
+        <tf-audio-dashboard id="demo" backend="[[backend]]"></tf-audio-dashboard>
+      </template>
+      <script>
+        Polymer({
+          is: "audio-dash-demo",
+          properties: {
+            backend: {
+              type: Object,
+              value: function() {
+                var router = new TF.Backend.router("data", true);
+                return new TF.Backend.Backend(router);
+              },
+            },
+          },
+        });
+      </script>
+    </dom-module>
+    <audio-dash-demo id="container"></audio-dash-demo>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tests.html b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tests.html
new file mode 100644
index 0000000000..891e8bf0c2
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tests.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<script src="../../web-component-tester/browser.js"></script>
+<link rel="import" href="../../tf-imports/d3.html">
+<link rel="import" href="../tf-audio-dashboard.html">
+<style>
+  html, body {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    font-family: "RobotoDraft","Roboto",sans-serif;
+  }
+</style>
+
+<test-fixture id="testElementFixture">
+  <template>
+    <tf-audio-dashboard></tf-audio-dashboard>
+  </template>
+</test-fixture>
+
+<script src="audioDashboardTests.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-dashboard.html b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-dashboard.html
new file mode 100644
index 0000000000..0353c51628
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-dashboard.html
@@ -0,0 +1,87 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="tf-audio-grid.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+
+<!--
+tf-audio-dashboard displays a dashboard that loads audio from a TensorFlow run.
+
+@element tf-audio-dashboard
+@demo demo/index.html
+-->
+<dom-module id="tf-audio-dashboard">
+  <template>
+    <div class="center">
+      <tf-no-data-warning
+        data-type="audio"
+        show-warning="[[dataNotFound]]"
+      ></tf-no-data-warning>
+      <tf-audio-grid
+        id="audioGrid"
+        run-to-audio="[[run2tag]]"
+        audio-generator="[[dataProvider]]"
+        tags="[[tags]]"
+        runs="[[runs]]"
+      ></tf-audio-grid>
+    </div>
+
+    <style>
+      .center {
+        height: 100%;
+        width: 100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+      }
+      :host {
+        height: 100%;
+        display: block;
+      }
+
+    </style>
+  </template>
+  <script>
+    TF.Dashboard.TfAudioDashboard = Polymer({
+      is: "tf-audio-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
+      properties: {
+        dataType: {value: "audio"},
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("audio"),
+        TF.Dashboard.ReloadBehavior("tf-audio-loader"),
+        TF.Backend.BackendBehavior
+      ],
+      attached: function() {
+        this.async(function() {
+          this.fire("rendered");
+        });
+      },
+      _hasAudio: function(runToAudioChange) {
+        return _.values(runToAudioChange.base).some(function(arr) {
+          return arr.length > 0;
+        });
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-grid.html b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-grid.html
new file mode 100644
index 0000000000..c71d8bdd4b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-grid.html
@@ -0,0 +1,183 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-styles/paper-styles.html">
+<link rel="import" href="tf-audio-loader.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../tf-dashboard-common/scrollbar-style.html">
+
+<!--
+tf-audio-grid creates a grid for examining audio data. The columns correspond
+to runs and the rows correspond to tags. Each cell is an audio clip.
+
+Structurally, it makes extensive use of flexbox for layout: it has a top-level
+columnar flexbox that contains the topRow (run names) and then a
+bottomContainer. The bottomContainer is another columnar flexbox which contains
+repeated audio-rows. Each audio-row is a row flexbox which contains a tag name
+cell, and then audio cells.
+
+In the future, we should improve on the layout by making the tag names and run names have fixed positions
+within the audio-grid, so that when you scroll you always have context (e.g. row and column names in a spreadsheet).
+For now, it just scrolls.
+
+The audio grid provides internal scroll bars (with styling) so that it can be dropped into
+a dashboard in a predictable fashion, even though the internal audio grid may be enormous.
+
+Room for future improvement:
+
+- Make it obvious when an audio didn't load due to the audio not existing.
+- Find some way to collapse sparse audio grids into denser ones (when sparsity
+is high)
+- Fix column/row names
+- Include hook for loading past audio (by step/timestamp? or index?)
+
+@element tf-audio-grid
+-->
+<dom-module id="tf-audio-grid">
+  <template>
+    <style include="scrollbar-style"></style>
+    <div id="fullContainer" class="container scrollbar">
+      <div id="topRow" class="container">
+        <div class="noshrink" id="paddingCell"></div>
+        <template is="dom-if" if="[[_tagsExist(tags)]]">
+          <template
+            is="dom-repeat"
+            items="[[runs]]"
+            as="run"
+          >
+            <div class="run-name-cell noshrink">
+              <span>[[run]]</span>
+            </div>
+          </template>
+        </template>
+      </div>
+      <div id="bottomContainer" class="container">
+        <template
+          is="dom-repeat"
+          items="[[tags]]"
+          as="tag"
+        >
+          <div class="audio-row container noshrink">
+            <div class="tag-name-cell noshrink">
+              <span class="tag-name">[[tag]]</span>
+            </div>
+            <template
+              is="dom-repeat"
+              items="[[runs]]"
+              as="run"
+            >
+              <div class="audio-cell noshrink">
+                <template is="dom-if" if="[[_exists(run, tag, runToAudio.*)]]">
+                  <tf-audio-loader
+                    id="loader"
+                    run="[[run]]"
+                    tag="[[tag]]"
+                    audio-generator="[[audioGenerator]]"
+                  >
+                  </tf-audio-loader>
+                </template>
+              </div>
+            </template>
+          </div>
+        </template>
+      </div>
+    </div>
+    <style>
+      :host {
+        display: block;
+        height: 100%;
+        --audio-cell-min-height: 105px;
+      }
+      .container {
+        display: flex;
+        flex-wrap: nowrap;
+      }
+      #fullContainer {
+        width: 100%;
+        height: 100%;
+        flex-direction: column;
+        padding-top: 20px;
+        overflow: auto;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+      }
+      #topRow {
+        flex-direction: row;
+      }
+      #bottomContainer {
+        flex-direction: column;
+        height: 100%;
+        width: 100%;
+      }
+      .audio-row {
+        flex-direction: row;
+        padding-top: 5px;
+      }
+      .audio-cell {
+        background: #FAFAFA;
+        width: 300px;
+        min-height: var(--audio-cell-min-height);
+        border: 1px solid black;
+        margin-right: 3px;
+        padding: 10px;
+        box-sizing: border-box;
+      }
+      .tag-name-cell {
+        width: 300px;
+        height: var(--audio-cell-min-height);
+        display:flex;
+        flex-direction: column;
+        justify-content: center;
+      }
+      .tag-name {
+        word-wrap: break-word;
+        text-align: center;
+        white-space: nowrap;
+      }
+      .run-name-cell {
+        width: 300px;
+        text-align: center;
+        margin-right: 5px;
+      }
+      .noshrink {
+        flex-shrink: 0;
+      }
+      #paddingCell {
+        width: 300px;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-audio-grid",
+      properties: {
+        runToAudio: Object,
+        tags: Array,
+        runs: Array,
+        audioGenerator: Function,
+      },
+      _tagsExist: function(tags) {
+        return tags && tags.length > 0;
+      },
+      _exists: function (run, tag) {
+        return this.runToAudio[run].indexOf(tag) !== -1;
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-loader.html b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-loader.html
new file mode 100644
index 0000000000..71539537d0
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard_d3v4/tf-audio-loader.html
@@ -0,0 +1,237 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-slider/paper-slider.html">
+<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="../tf-imports/lodash.html">
+
+<!--
+tf-audio-loader loads an individual audio clip from the TensorBoard backend.
+
+Right now it always loads the most recent audio clip. We should add support in the
+future for loading older clips.
+
+@element tf-audio-loader
+-->
+<dom-module id="tf-audio-loader">
+  <style>
+    :host {
+      display: block;
+      --step-slider-knob-color: #424242;
+    }
+
+    img {
+      width: 100%;
+      height: 100%;
+      image-rendering: pixelated;
+    }
+
+    .step-description {
+      font-size: 12px;
+    }
+
+    .step-value {
+      font-weight: bold;
+    }
+
+    #audio-loading-spinner {
+      width: 14px;
+      height: 14px;
+      vertical-align: text-bottom;
+      --paper-spinner-color: var(--tb-orange-strong)
+    }
+
+    #steps {
+      height: 15px;
+      margin: 0 0 0 -15px;
+      /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
+       * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
+       * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
+      width: calc(100% + 31px);
+      --paper-slider-active-color: var(--step-slider-knob-color);
+      --paper-slider-knob-color: var(--step-slider-knob-color);
+      --paper-slider-pin-color: var(--step-slider-knob-color);
+      --paper-slider-knob-start-color: var(--step-slider-knob-color);
+      --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
+      --paper-slider-pin-start-color: var(--step-slider-knob-color);
+    }
+
+    #individual-audio-container audio {
+      margin: 5px 0 0 -10px;
+      width: calc(100% + 20px);
+    }
+  </style>
+  <template>
+    <template is="dom-if" if="[[_metadatas]]">
+      <template is="dom-if" if="[[_hasAtLeastOneStep(_metadatas)]]">
+        <div class="step-description">
+          step
+          <span class="step-value">
+            [[_stepValue]]
+          </span><br>
+          <template is="dom-if" if="[[_stepWallTime]]">
+            [[_stepWallTime]]
+          </template>
+          <paper-spinner-lite active
+                              id="audio-loading-spinner"
+                              hidden$=[[!_isAudioLoading]]></paper-spinner-lite>
+        </div>
+      </template>
+      <template is="dom-if" if="[[_maxStepIndex]]">
+        <paper-slider
+            id="steps"
+            immediate-value="{{_stepIndex}}"
+            max="[[_maxStepIndex]]"
+            max-markers="[[_maxStepIndex]]"
+            snaps
+            step="1"
+            value="{{_stepIndex}}"></paper-slider>
+      </template>
+      <div id="individual-audio-container"></div>
+    </template>
+  </template>
+  <script>
+    "use strict";
+
+    Polymer({
+      is: "tf-audio-loader",
+      properties: {
+        run: String,
+        tag: String,
+        audioGenerator: Function,
+        // todo: document.
+        _metadatas: Array,
+        _stepIndex: Number,
+        _stepValue: {
+          type: Number,
+          computed: "_computeStepValue(_metadatas, _stepIndex)",
+          value: 0,
+        },
+        _stepWallTime: {
+          type: Number,
+          computed: "_computeStepWallTime(_metadatas, _stepIndex)",
+          value: 0,
+        },
+        _maxStepIndex: {
+          type: Number,
+          computed: "_computeMaxStepIndex(_metadatas)",
+          value: 0,
+        },
+        _isAudioLoading: Boolean,
+        // Used to identify stale requests for audio.
+        _audioRequestId: {
+          type: Number,
+          value: 1
+        },
+      },
+      observers: [
+        "_updateAudio(_metadatas, _stepIndex)",
+      ],
+      reload: function() {
+        this.audioGenerator(this.tag, this.run).then(function(metadatas) {
+          // Set the list of available metadata.
+          this.set("_metadatas", metadatas);
+
+          // Set the index to be the last one.
+          this.set("_stepIndex", this._maxStepIndex);
+        }.bind(this));
+      },
+      ready: function() {
+        // Need to test so that it will not error if it is constructed w/o
+        // all properties (so that it's possible to use stub to mock it out)
+        if (this.run != null && this.tag != null && this.audioGenerator != null) {
+          this.reload();
+        }
+      },
+      _updateAudio: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return;
+        }
+
+        // Load new audio.
+        const requestId = ++this._audioRequestId;
+        this.set("_isAudioLoading", true);
+
+        // Create a new audio element. Only replace the previous one once the new audio loads.
+        let audioElement = document.createElement("audio");
+        audioElement.setAttribute("controls", true);
+        audioElement.setAttribute("loop", "loop");
+        let canPlayHandler = function() {
+          if (requestId !== this._audioRequestId) {
+            // This request is no longer relevant.
+            return;
+          }
+
+          // Remove this event listener: "canplay" apparently fires in Chrome every time playing
+          // begins again on loop. So, if we create a new audio element every time that happens, we
+          // don't actually loop.
+          audioElement.removeEventListener("canplay", canPlayHandler);
+
+          let individualAudioContainer = this.$$("#individual-audio-container");
+          individualAudioContainer.innerHTML = "";
+          Polymer.dom(individualAudioContainer).appendChild(audioElement);
+          this.set("_isAudioLoading", false);
+        }.bind(this);
+        audioElement.addEventListener("canplay", canPlayHandler);
+        audioElement.addEventListener("error", function() {
+          if (requestId !== this._audioRequestId) {
+            // This request is no longer relevant.
+            return;
+          }
+
+          // The audio could not be loaded.
+          this.$$("#individual-audio-container").innerHTML = "";
+          this.set("_isAudioLoading", false);
+        }.bind(this));
+
+        // Initiate the request for new audio.
+        var sourceElement = document.createElement("source");
+        let metadata = metadatas[stepIndex];
+        sourceElement.setAttribute("src", metadata.url);
+        sourceElement.setAttribute("type", metadata.content_type);
+        audioElement.appendChild(sourceElement);
+      },
+      _computeStepValue: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas[stepIndex].step;
+      },
+      _computeStepWallTime: function(metadatas, stepIndex) {
+        if (!metadatas || stepIndex >= metadatas.length) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas[stepIndex].wall_time.toString();
+      },
+      _computeMaxStepIndex: function(metadatas) {
+        if (!metadatas || metadatas.length === 0) {
+          // No audio to show. The audio section should be hidden.
+          return 0;
+        }
+        return metadatas.length - 1;
+      },
+      _hasAtLeastOneStep: function(metadatas) {
+        return metadatas && metadatas.length > 0;
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
index e54d0e222c..019283816f 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
@@ -1,43 +1,55 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-tensorboard_ts_library(
-    name = "ts",
+web_library(
+    name = "tf_backend_d3v4",
     srcs = [
-        "backend.ts",
-        "behavior.ts",
-        "requestManager.ts",
-        "router.ts",
-        "urlPathHelpers.ts",
+        "bundle.js",
+        "tf-backend.html",
     ],
+    path = "/tf-backend",
     deps = [
-        "//tensorflow/tensorboard/components/vz_sorting_d3v4:ts",
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/d3_v4:bundle",
-        "//third_party/javascript/typings/lodash",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/sinon",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4",
+        "@org_polymer",
     ],
 )
 
-# TODO(dandelion): Add runners for these tests
-tensorboard_ts_library(
-    name = "tests",
-    srcs = [
-        "backendTests.ts",
-        "behaviorTests.ts",
-        "requestManagerTests.ts",
-    ],
-    deps = [
-        ":ts",
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:bundle.d.ts",
     ],
 )
 
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF.Backend": [
+        "requestManager.ts",
+        "backend.ts",
+        "behavior.ts",
+        "urlPathHelpers.ts",
+        "router.ts",
+    ]},
+    namespace_symbol_aliases = {"TF.Backend": {
+        "compareTagNames": "VZ.Sorting.compareTagNames",
+    }},
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/test/BUILD b/tensorflow/tensorboard/components/tf_backend_d3v4/test/BUILD
new file mode 100644
index 0000000000..00b2be45eb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/test/BUILD
@@ -0,0 +1,56 @@
+package(
+    default_testonly = True,
+    default_visibility = ["//tensorflow:internal"],
+)
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "test",
+    srcs = [
+        "bundle.js",
+        "tests.html",
+    ] + glob(["data/**"]),
+    path = "/tf-backend/test",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "@org_npmjs_registry_web_component_tester",
+        "@org_polymer",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:chai.d.ts",
+        "@org_definitelytyped//:mocha.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_backend_d3v4:bundle.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF.Backend": [
+        "backendTests.ts",
+        "behaviorTests.ts",
+        "requestManagerTests.ts",
+    ]},
+)
+
+filegroup(
+    name = "all_files",
+    testonly = 0,
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/backendTests.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/test/backendTests.ts
similarity index 97%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/backendTests.ts
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/backendTests.ts
index 180c1f5298..648d175621 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/backendTests.ts
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/test/backendTests.ts
@@ -12,10 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-import {Backend, convertBins, filterTags, getRuns, getTags, RunToTag, TYPES} from './backend';
-import {RequestManager} from './requestManager';
-import {Router, router} from './router';
-import {BAD_CHARACTERS, demoify, queryEncoder} from './urlPathHelpers';
+import {Backend, convertBins, filterTags, getRuns, getTags, RunToTag, TYPES} from '../backend';
+import {RequestManager} from '../requestManager';
+import {Router, router} from '../router';
+import {BAD_CHARACTERS, demoify, queryEncoder} from '../urlPathHelpers';
 
 describe('urlPathHelpers', () => {
   it('demoify works as expected', () => {
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/behaviorTests.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/test/behaviorTests.ts
similarity index 97%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/behaviorTests.ts
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/behaviorTests.ts
index 6d55aca5f8..4a74fe01c1 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/behaviorTests.ts
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/test/behaviorTests.ts
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {Backend, getRuns, getTags, RunToTag} from './backend'
-import {BackendBehavior} from './behavior'
+import {Backend, getRuns, getTags, RunToTag} from '../backend'
+import {BackendBehavior} from '../behavior'
 
 declare function fixture(id: string): void;
 
@@ -154,6 +154,7 @@ describe('data-behavior', function() {
     });
   });
 
+  // TODO(dandelion): Fix this test.
   it('reload calls frontendReload', function(done) {
     testElement.frontendReload = function() {
       done();
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/audio_run_run1_tag_audio1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/audio_run_run1_tag_audio1.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/audio_run_run1_tag_audio1.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/audio_run_run1_tag_audio1.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/compressedHistograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/compressedHistograms_run_run1_tag_histo1.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/compressedHistograms_run_run1_tag_histo1.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/compressedHistograms_run_run1_tag_histo1.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/example.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/example.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/example.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/example.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/histograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/histograms_run_run1_tag_histo1.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/histograms_run_run1_tag_histo1.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/histograms_run_run1_tag_histo1.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/images_run_run1_tag_im1.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/images_run_run1_tag_im1.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/images_run_run1_tag_im1.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/images_run_run1_tag_im1.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/individualImage_index_0_tag_im1_run_run1.png b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/individualImage_index_0_tag_im1_run_run1.png
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/individualImage_index_0_tag_im1_run_run1.png
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/individualImage_index_0_tag_im1_run_run1.png
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/run_metadata_run_step99_tag_train.pbtxt b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/run_metadata_run_step99_tag_train.pbtxt
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/run_metadata_run_step99_tag_train.pbtxt
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/run_metadata_run_step99_tag_train.pbtxt
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/runs.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/runs.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/runs.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/runs.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/scalars.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/scalars.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars_run_run1_tag_cross_entropy__281_29.json b/tensorflow/tensorboard/components/tf_backend_d3v4/test/data/scalars_run_run1_tag_cross_entropy__281_29.json
similarity index 100%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/data/scalars_run_run1_tag_cross_entropy__281_29.json
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/data/scalars_run_run1_tag_cross_entropy__281_29.json
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/requestManagerTests.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/test/requestManagerTests.ts
similarity index 98%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/requestManagerTests.ts
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/requestManagerTests.ts
index 8bd46744f5..23a4e8f611 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/requestManagerTests.ts
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/test/requestManagerTests.ts
@@ -13,13 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {RequestManager, RequestNetworkError} from './requestManager';
+import {RequestManager, RequestNetworkError} from '../requestManager';
+
 interface MockRequest {
   resolve: Function;
   reject: Function;
   id: number;
   url: string;
 }
+
 class MockedRequestManager extends RequestManager {
   private resolvers: Function[];
   private rejectors: Function[];
@@ -112,7 +114,6 @@ describe('backend', () => {
             done(new Error('the promise should have rejected'));
           },
           (reject: RequestNetworkError) => {
-            chai.assert.instanceOf(reject, RequestNetworkError);
             chai.assert.include(reject.message, '404');
             chai.assert.include(reject.message, badUrl);
             chai.assert.equal(reject.req.status, 404);
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html b/tensorflow/tensorboard/components/tf_backend_d3v4/test/tests.html
similarity index 80%
rename from tensorflow/tensorboard/components/tf_storage_d3v4/tests.html
rename to tensorflow/tensorboard/components/tf_backend_d3v4/test/tests.html
index 6d395b0702..cdc17c2607 100644
--- a/tensorflow/tensorboard/components/tf_storage_d3v4/tests.html
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/test/tests.html
@@ -22,9 +22,14 @@ limitations under the License.
   <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../polymer/polymer.html">
-  <link rel="import" href="../tf-storage.html">
+  <link rel="import" href="../tf-backend.html">
 </head>
 <body>
-  <script src="storageTests.js"></script>
+  <test-fixture id="testElementFixture">
+    <template>
+      <test-element id="test"></test-element>
+    </template>
+  </test-fixture>
+  <script src="bundle.js"></script>
 </body>
 </html>
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/tf-backend.html b/tensorflow/tensorboard/components/tf_backend_d3v4/tf-backend.html
new file mode 100644
index 0000000000..5bf2663362
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/tf-backend.html
@@ -0,0 +1,23 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../tf-imports/d3.html">
+<link rel="import" href="../vz-sorting/vz-sorting.html">
+
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD b/tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD
index fd7d394a36..5feea12fb4 100644
--- a/tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/BUILD
@@ -1,42 +1,55 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load(
-    "//tensorflow/tensorboard:defs.bzl",
-    "tensorboard_ts_development_sources",
-    "tensorboard_ts_devserver",
-    "tensorboard_ts_library",
-    "tensorboard_webcomponent_library",
-)
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-# TODO(dandelion): Add runner for the test code.
+web_library(
+    name = "tf_color_scale_d3v4",
+    srcs = [
+        "bundle.js",
+        "tf-color-scale.html",
+    ],
+    path = "/tf-color-scale",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer",
+    ],
+)
 
-tensorboard_webcomponent_library(
-    name = "tf_color_scale",
-    srcs = ["tf-color-scale.html"],
-    ts_lib_deps = [":ts"],
+web_library(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-color-scale",
     deps = [
-        "//third_party/javascript/polymer/v1/polymer:lib",
+        ":tf_color_scale_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
     ],
 )
 
-tensorboard_ts_library(
+tensorboard_typescript_genrule(
     name = "ts",
-    srcs = [
-        "colorScale.ts",
-        "palettes.ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
     ],
-    deps = ["//tensorflow/tensorboard/components:common_deps_d3v4"],
 )
 
-tensorboard_ts_library(
-    name = "tests",
-    srcs = ["colorScaleTests.ts"],
-    deps = [
-        ":ts",
-        "//tensorflow/tensorboard/components:common_deps_d3v4",
-    ],
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF": [
+        "palettes.ts",
+        "colorScale.ts",
+    ]},
 )
 
 filegroup(
@@ -44,29 +57,3 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
-
-tensorboard_webcomponent_library(
-    name = "demo",
-    srcs = ["demo.html"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":tf_color_scale",
-        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
-        "//third_party/javascript/polymer/v1/paper-button:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-    ],
-)
-
-tensorboard_ts_devserver(
-    name = "devserver",
-    manifest = ":dev_sources",
-    serving_path = "/demo_out/bundle.js",
-    static_files = [":demo"],
-)
-
-tensorboard_ts_development_sources(
-    name = "dev_sources",
-    deps = [
-        ":ts",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/demo.html b/tensorflow/tensorboard/components/tf_color_scale_d3v4/index.html
similarity index 90%
rename from tensorflow/tensorboard/components/tf_color_scale_d3v4/demo.html
rename to tensorflow/tensorboard/components/tf_color_scale_d3v4/index.html
index 341ce18452..81dfab098c 100644
--- a/tensorflow/tensorboard/components/tf_color_scale_d3v4/demo.html
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/index.html
@@ -19,11 +19,12 @@ limitations under the License.
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>tf-color-scale demo</title>
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-styles/typography.html">
+<link rel="import" href="../tf-imports/d3.html">
 <link rel="import" href="tf-color-scale.html">
-<link rel="import" href="iron-demo-helpers/demo-snippet.html">
-<link rel="import" href="paper-styles/typography.html">
-<link rel="import" href="paper-button/paper-button.html">
-<script src="bundle.js"></script>
 
 <style> body {font-family: "Roboto";}</style>
 <demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/BUILD b/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/BUILD
new file mode 100644
index 0000000000..ac22ab8218
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/BUILD
@@ -0,0 +1,48 @@
+package(
+    default_testonly = True,
+    default_visibility = ["//tensorflow:internal"],
+)
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "test",
+    srcs = [
+        "bundle.js",
+        "tests.html",
+    ],
+    path = "/tf-color-scale/test",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4",
+        "@org_npmjs_registry_web_component_tester",
+        "@org_polymer",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:chai.d.ts",
+        "@org_definitelytyped//:mocha.d.ts",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4:bundle.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF": ["colorScaleTests.ts"]},
+)
+
+filegroup(
+    name = "all_files",
+    testonly = 0,
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScaleTests.ts b/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/colorScaleTests.ts
similarity index 97%
rename from tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScaleTests.ts
rename to tensorflow/tensorboard/components/tf_color_scale_d3v4/test/colorScaleTests.ts
index aa9c601385..78824a772c 100644
--- a/tensorflow/tensorboard/components/tf_color_scale_d3v4/colorScaleTests.ts
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/colorScaleTests.ts
@@ -15,7 +15,7 @@ limitations under the License.
 
 let assert = chai.assert;
 
-import {ColorScale} from './colorScale'
+import {ColorScale} from '../colorScale'
 
 describe('ColorScale', function() {
   let ccs: ColorScale;
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/tests.html b/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/tests.html
new file mode 100644
index 0000000000..eccc32cdec
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/test/tests.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta charset="utf-8">
+<script src="../../web-component-tester/browser.js"></script>
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-color-scale.html">
+<body>
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
index e3ef6cf630..3dedfaf1a1 100644
--- a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
+++ b/tensorflow/tensorboard/components/tf_color_scale_d3v4/tf-color-scale.html
@@ -15,7 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports/d3.html">
 
 <!--
 tf-color-scale is a plumbing component that takes in an array of runs, and produces
@@ -25,4 +26,5 @@ a set of colors.
 @element tf-color-scale
 -->
 <dom-module id="tf-color-scale">
+  <script src="bundle.js"></script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
index 85f06dabb5..5361feaabf 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
@@ -1,23 +1,22 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load(
-    "//tensorflow/tensorboard:defs.bzl",
-    "tensorboard_ts_development_sources",
-    "tensorboard_ts_devserver",
-    "tensorboard_ts_library",
-    "tensorboard_webcomponent_library",
-)
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-tensorboard_webcomponent_library(
-    name = "tf_dashboard_common",
+web_library(
+    name = "tf_dashboard_common_d3v4",
     srcs = [
+        "bundle.html",
+        "bundle.js",
         "dashboard-style.html",
         "run-color-style.html",
         "scrollbar-style.html",
         "tensorboard-color.html",
         "tf-categorizer.html",
+        "tf-chart-scaffold.html",
         "tf-collapsable-pane.html",
         "tf-dashboard.html",
         "tf-dashboard-layout.html",
@@ -30,54 +29,33 @@ tensorboard_webcomponent_library(
         "tf-run-selector.html",
         "tf-sidebar-helper.html",
     ],
-    ts_lib_deps = [":ts"],
-    deps = [
-        "//third_party/javascript/plottable/v3:lib",
-        "//third_party/javascript/polymer/v1/iron-ajax:lib",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/iron-icons:lib",
-        "//third_party/javascript/polymer/v1/paper-button:lib",
-        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
-        "//third_party/javascript/polymer/v1/paper-dialog:lib",
-        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-input:lib",
-        "//third_party/javascript/polymer/v1/paper-item:lib",
-        "//third_party/javascript/polymer/v1/paper-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-slider:lib",
-        "//third_party/javascript/polymer/v1/paper-spinner:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "ts",
-    srcs = [
-        "dashboard-behavior.ts",
-        "reload-behavior.ts",
-        "tf-categorizer.ts",
-        "tf-multi-checkbox.ts",
-        "tf-regex-group.ts",
-    ],
+    path = "/tf-dashboard-common",
     deps = [
-        "//tensorflow/tensorboard/components:common_deps_d3v4",
-        "//tensorflow/tensorboard/components/tf_storage_d3v4:ts",
-        "//tensorflow/tensorboard/components/vz_sorting_d3v4:ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4",
+        "@org_polymer",
+        "@org_polymer_iron_ajax",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_iron_icons",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_checkbox",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_input",
+        "@org_polymer_paper_item",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+        "@org_polymer_paper_styles",
+        "@org_polymer_paper_toggle_button",
     ],
 )
 
-tensorboard_ts_library(
-    name = "tests",
-    srcs = ["tf-categorizer-tests.ts"],
-    deps = [
-        ":ts",
-        "//tensorflow/tensorboard/components:common_deps_d3v4",
-    ],
-)
-
-tensorboard_webcomponent_library(
+web_library(
     name = "demo",
     srcs = [
         "tf-categorizer-demo.html",
@@ -85,26 +63,46 @@ tensorboard_webcomponent_library(
         "tf-multi-checkbox-demo.html",
         "tf-regex-group-demo.html",
     ],
+    path = "/tf-dashboard-common",
     deps = [
-        ":tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_color_scale_d3v4:tf_color_scale",
-        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        ":tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
     ],
 )
 
-tensorboard_ts_devserver(
-    name = "devserver",
-    manifest = ":dev_sources",
-    serving_path = "/demo_out/bundle.js",
-    static_files = [":demo"],
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:bundle.d.ts",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:bundle.d.ts",
+    ],
 )
 
-tensorboard_ts_development_sources(
-    name = "dev_sources",
-    deps = [
-        ":ts",
-    ],
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF.Dashboard": [
+        "tf-categorizer.ts",
+        "dashboard-behavior.ts",
+        "reload-behavior.ts",
+        "tf-multi-checkbox.ts",
+        "tf-regex-group.ts",
+    ]},
+    namespace_symbol_aliases = {"TF.Dashboard": {
+        "compareTagNames": "VZ.Sorting.compareTagNames",
+        "getObjectInitializer": "TF.URIStorage.getObjectInitializer",
+        "getObjectObserver": "TF.URIStorage.getObjectObserver",
+        "getStringInitializer": "TF.URIStorage.getStringInitializer",
+        "getStringObserver": "TF.URIStorage.getStringObserver",
+    }},
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html
new file mode 100644
index 0000000000..514b8b7d72
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html
@@ -0,0 +1,24 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports/d3.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../tf-storage/tf-storage.html">
+<link rel="import" href="../vz-sorting/vz-sorting.html">
+
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html
index 1eccc020eb..6629e5bfc2 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/dashboard-style.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="paper-styles/paper-styles.html">
+<link rel="import" href="../paper-styles/paper-styles.html">
 <link rel="import" href="tensorboard-color.html">
 
 <dom-module id="dashboard-style">
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html
index ff4cfacc91..b15861694f 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/run-color-style.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="paper-styles/paper-styles.html">
+<link rel="import" href="../paper-styles/paper-styles.html">
 
 <dom-module id="run-color-style">
   <template>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html
index b345781e2e..bfd61f6619 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/scrollbar-style.html
@@ -15,8 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="paper-styles/paper-styles.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-styles/paper-styles.html">
 
 <dom-module id="scrollbar-style">
   <template>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html
index 4d95351edb..7f9ca64614 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tensorboard-color.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 
 <style is="custom-style">
 
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD
new file mode 100644
index 0000000000..f3ce8d09e2
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD
@@ -0,0 +1,48 @@
+package(
+    default_testonly = True,
+    default_visibility = ["//tensorflow:internal"],
+)
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "test",
+    srcs = [
+        "bundle.js",
+        "tests.html",
+    ],
+    path = "/tf-dashboard-common/test",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "@org_npmjs_registry_web_component_tester",
+        "@org_polymer",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:chai.d.ts",
+        "@org_definitelytyped//:mocha.d.ts",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:bundle.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF.Dashboard": ["tf-categorizer-tests.ts"]},
+)
+
+filegroup(
+    name = "all_files",
+    testonly = 0,
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html
new file mode 100644
index 0000000000..121b0dc1a5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta charset="utf-8">
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<script src="../../web-component-tester/browser.js"></script>
+<link rel="import" href="../tf-dashboard.html">
+<body>
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-tests.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tf-categorizer-tests.ts
similarity index 98%
rename from tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-tests.ts
rename to tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tf-categorizer-tests.ts
index bf70d9d4bb..f280d77f66 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-tests.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tf-categorizer-tests.ts
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {topLevelNamespaceCategorizer, Category, Categorizer, defineCategory, _categorizer} from './tf-categorizer'
+import {topLevelNamespaceCategorizer, Category, Categorizer, defineCategory, _categorizer} from '../tf-categorizer'
 
 let assert = chai.assert;
 
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
index 6692962763..758f024e88 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
@@ -19,8 +19,7 @@ limitations under the License.
 <html>
  <head>
   <link rel="import" href="tf-categorizer.html">
-  <script src="bundle.js"></script>
-
+  <link rel="import" href="bundle.html">
  </head>
  <body>
   <style>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
index 0b563fa4bd..c22c56a3b9 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
@@ -15,8 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="tf-regex-group.html">
 <link rel="import" href="tensorboard-color.html">
 
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
index fd5320be39..9cacb7f5c8 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 
 <!--
 tf-chart-scaffold is responsible for providing data from TensorBoard to charts.
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
index 6c8bdb92ee..1c4ed1529c 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
@@ -19,6 +19,7 @@ limitations under the License.
 <html>
  <head>
    <link rel="import" href="tf-collapsable-pane.html">
+   <link rel="import" href="bundle.html">
    
  </head>
  <body>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html
index 96b4337668..e82540127f 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane.html
@@ -15,8 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="iron-collapse/iron-collapse.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
 
 <dom-module id="tf-collapsable-pane">
   <template>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html
index 058b0d5946..e0e8a2b52c 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard-layout.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="scrollbar-style.html">
 <link rel="import" href="tensorboard-color.html">
 
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
index 039da39ecb..1e136936da 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
@@ -15,10 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="tf-dashboard-layout.html">
 <link rel="import" href="tensorboard-color.html">
 <link rel="import" href="dashboard-style.html">
 <link rel="import" href="tf-downloader.html">
 <link rel="import" href="tf-no-data-warning.html">
-
+<link rel="import" href="bundle.html">
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html
index dd87a47222..7191425959 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-downloader.html
@@ -15,10 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="paper-menu/paper-menu.html">
-<link rel="import" href="paper-item/paper-item.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../paper-menu/paper-menu.html">
+<link rel="import" href="../paper-item/paper-item.html">
 
 <dom-module id="tf-downloader">
   <template>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
index 2877a2364f..642bc86ca6 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
@@ -18,9 +18,9 @@ limitations under the License.
 
 <html>
 <head>
+<link rel="import" href="../tf-color-scale/tf-color-scale.html">
 <link rel="import" href="tf-multi-checkbox.html">
-<link rel="import" href="tf-color-scale.html">
-<script src="bundle.js"></script>
+<link rel="import" href="bundle.html">
 
 </head>
 <body>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
index b45657f7d8..c7db79f74b 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="iron-icons/iron-icons.html">
-<link rel="import" href="paper-checkbox/paper-checkbox.html">
-<link rel="import" href="paper-icon-button/paper-icon-button.html">
-<link rel="import" href="paper-input/paper-input.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-icons/iron-icons.html">
+<link rel="import" href="../paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-input/paper-input.html">
 <link rel="import" href="scrollbar-style.html">
 <link rel="import" href="run-color-style.html">
 
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html
index d22d341590..c90efac1d6 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-no-data-warning.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 
 <!--
 Display a warning when there is no data found.
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html
index d11d43d78a..547a558ad0 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-option-selector.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="tensorboard-color.html">
 
 <!--
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html
index 1a850c8999..155259d329 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-panes-helper.html
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="tf-collapsable-pane.html">
 <link rel="import" href="tf-no-data-warning.html">
 <link rel="import" href="tf-chart-scaffold.html">
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
index bf4cc03f34..051a58e270 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
@@ -19,7 +19,7 @@ limitations under the License.
 <html>
  <head>
    <link rel="import" href="tf-regex-group.html">
-   <script src="bundle.js"></script>
+   <link rel="import" href="bundle.html">
  </head>
  <body>
   <style>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
index 60ec40f29d..1434606d24 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="paper-icon-button/paper-icon-button.html">
-<link rel="import" href="iron-icons/iron-icons.html">
-<link rel="import" href="paper-toggle-button/paper-toggle-button.html">
-<link rel="import" href="paper-input/paper-input.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../iron-icons/iron-icons.html">
+<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../paper-input/paper-input.html">
 
 <!--
 `tf-regex-group` provides an input component for a group of regular expressions.
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html
index d2b6b1b194..e3d8a91fd0 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-run-selector.html
@@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="paper-button/paper-button.html">
-<link rel="import" href="paper-dialog/paper-dialog.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-dialog/paper-dialog.html">
 <link rel="import" href="tf-multi-checkbox.html">
 <link rel="import" href="scrollbar-style.html">
 
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html
index cde812205b..5eb8537040 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-sidebar-helper.html
@@ -15,7 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports/lodash.html">
 <link rel="import" href="tf-categorizer.html">
 <link rel="import" href="tf-run-selector.html">
 
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/BUILD
new file mode 100644
index 0000000000..ace02adfba
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/BUILD
@@ -0,0 +1,41 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_distribution_dashboard_d3v4",
+    srcs = ["tf-distribution-dashboard.html"],
+    path = "/tf-distribution-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "//tensorflow/tensorboard/components/vz_distribution_chart_d3v4",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-distribution-dashboard",
+    deps = [
+        ":tf_distribution_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run1_tag_histo1.json
new file mode 100644
index 0000000000..a6765285b1
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run1_tag_histo1.json
@@ -0,0 +1,212 @@
+[
+    [
+        0.0,
+        0,
+        [
+            [
+                0,
+                -2.3150592308536755
+            ],
+            [
+                668,
+                -2.0967547155036605
+            ],
+            [
+                1587,
+                -1.4326244423655616
+            ],
+            [
+                3085,
+                -0.8871306575801902
+            ],
+            [
+                5000,
+                -0.09312398815580714
+            ],
+            [
+                6915,
+                0.2584093405812282
+            ],
+            [
+                8413,
+                0.8895470642005087
+            ],
+            [
+                9332,
+                1.3198979614453679
+            ],
+            [
+                10000,
+                1.6793308878855118
+            ]
+        ]
+    ],
+    [
+        100.0,
+        10,
+        [
+            [
+                0,
+                -1.3417572789138936
+            ],
+            [
+                668,
+                -1.183563374619141
+            ],
+            [
+                1587,
+                -0.48920418783271574
+            ],
+            [
+                3085,
+                0.29326906896076954
+            ],
+            [
+                5000,
+                0.56953784145381
+            ],
+            [
+                6915,
+                0.8684655583499333
+            ],
+            [
+                8413,
+                1.4133127368907181
+            ],
+            [
+                9332,
+                1.906140650457873
+            ],
+            [
+                10000,
+                2.135771998171255
+            ]
+        ]
+    ],
+    [
+        200.0,
+        20,
+        [
+            [
+                0,
+                -1.5066917525035333
+            ],
+            [
+                668,
+                -1.3910909571770793
+            ],
+            [
+                1587,
+                -0.902737218885874
+            ],
+            [
+                3085,
+                -0.3807791904765027
+            ],
+            [
+                5000,
+                0.38900200905253046
+            ],
+            [
+                6915,
+                0.8209734209339482
+            ],
+            [
+                8413,
+                1.302385856695965
+            ],
+            [
+                9332,
+                1.9324626053521639
+            ],
+            [
+                10000,
+                2.957505317875451
+            ]
+        ]
+    ],
+    [
+        300.0,
+        30,
+        [
+            [
+                0,
+                -0.5430457051469562
+            ],
+            [
+                668,
+                -0.4626161834245273
+            ],
+            [
+                1587,
+                0.21573949543027715
+            ],
+            [
+                3085,
+                0.37353741100174215
+            ],
+            [
+                5000,
+                0.6891407881591103
+            ],
+            [
+                6915,
+                1.0927156232630852
+            ],
+            [
+                8413,
+                1.2745337159550916
+            ],
+            [
+                9332,
+                1.4321116832891605
+            ],
+            [
+                10000,
+                2.1913774993059034
+            ]
+        ]
+    ],
+    [
+        400.0,
+        40,
+        [
+            [
+                0,
+                -0.3584790755077172
+            ],
+            [
+                668,
+                -0.33301611509753215
+            ],
+            [
+                1587,
+                -0.1089466072951948
+            ],
+            [
+                3085,
+                0.5792199847585249
+            ],
+            [
+                5000,
+                1.220854943811942
+            ],
+            [
+                6915,
+                1.759829438421432
+            ],
+            [
+                8413,
+                2.3072559906741614
+            ],
+            [
+                9332,
+                2.753036118353921
+            ],
+            [
+                10000,
+                3.0267252195784047
+            ]
+        ]
+    ]
+]
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo1.json b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo1.json
new file mode 100644
index 0000000000..9e8a55b3f2
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo1.json
@@ -0,0 +1,212 @@
+[
+    [
+        0.0,
+        0,
+        [
+            [
+                0,
+                -3.6801669545044846
+            ],
+            [
+                668,
+                -3.192188140974744
+            ],
+            [
+                1587,
+                -2.3414678549368806
+            ],
+            [
+                3085,
+                -0.9632173471995873
+            ],
+            [
+                5000,
+                -0.3214892636797772
+            ],
+            [
+                6915,
+                0.11870794142185205
+            ],
+            [
+                8413,
+                0.8895470642005087
+            ],
+            [
+                9332,
+                1.183563374619141
+            ],
+            [
+                10000,
+                2.665663810418372
+            ]
+        ]
+    ],
+    [
+        100.0,
+        10,
+        [
+            [
+                0,
+                -3.564793583751807
+            ],
+            [
+                668,
+                -3.376844436865802
+            ],
+            [
+                1587,
+                -1.0366615731293798
+            ],
+            [
+                3085,
+                -0.27318696312672563
+            ],
+            [
+                5000,
+                0.9718642422053263
+            ],
+            [
+                6915,
+                2.5765662807928194
+            ],
+            [
+                8413,
+                3.1415385101545126
+            ],
+            [
+                9332,
+                4.085981768607621
+            ],
+            [
+                10000,
+                4.623079406808927
+            ]
+        ]
+    ],
+    [
+        200.0,
+        20,
+        [
+            [
+                0,
+                -2.235172510433281
+            ],
+            [
+                668,
+                -2.004569042815611
+            ],
+            [
+                1587,
+                -1.2015432383370985
+            ],
+            [
+                3085,
+                0.11835464933202625
+            ],
+            [
+                5000,
+                0.56953784145381
+            ],
+            [
+                6915,
+                1.202844810963146
+            ],
+            [
+                8413,
+                2.689066032283515
+            ],
+            [
+                9332,
+                2.8494015726499944
+            ],
+            [
+                10000,
+                3.481377676013788
+            ]
+        ]
+    ],
+    [
+        300.0,
+        30,
+        [
+            [
+                0,
+                -3.360113978269659
+            ],
+            [
+                668,
+                -2.8293185004961043
+            ],
+            [
+                1587,
+                -1.5992540502266783
+            ],
+            [
+                3085,
+                0.14393860259807117
+            ],
+            [
+                5000,
+                1.47723448201245
+            ],
+            [
+                6915,
+                1.9510057389110733
+            ],
+            [
+                8413,
+                2.833176104473626
+            ],
+            [
+                9332,
+                4.142405216576347
+            ],
+            [
+                10000,
+                4.706937777668589
+            ]
+        ]
+    ],
+    [
+        400.0,
+        40,
+        [
+            [
+                0,
+                -2.599286228987632
+            ],
+            [
+                668,
+                -2.240365897443259
+            ],
+            [
+                1587,
+                -1.5992540502266783
+            ],
+            [
+                3085,
+                -0.9101893288861387
+            ],
+            [
+                5000,
+                0.7580548669750213
+            ],
+            [
+                6915,
+                1.6009864433919474
+            ],
+            [
+                8413,
+                2.3504002974280036
+            ],
+            [
+                9332,
+                2.7907805263353733
+            ],
+            [
+                10000,
+                3.5098048900144323
+            ]
+        ]
+    ]
+]
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo2.json b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo2.json
new file mode 100644
index 0000000000..7c8836f624
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/compressedHistograms_run_run2_tag_histo2.json
@@ -0,0 +1,212 @@
+[
+    [
+        0.0,
+        0,
+        [
+            [
+                0,
+                -1.9291158122759586
+            ],
+            [
+                668,
+                -1.5970765333488954
+            ],
+            [
+                1587,
+                -1.0923120348519078
+            ],
+            [
+                3085,
+                -0.6688082872192093
+            ],
+            [
+                5000,
+                0.09312398815580714
+            ],
+            [
+                6915,
+                0.44532789251701854
+            ],
+            [
+                8413,
+                0.8238009655877649
+            ],
+            [
+                9332,
+                1.0357232383581656
+            ],
+            [
+                10000,
+                1.2741043689144438
+            ]
+        ]
+    ],
+    [
+        100.0,
+        10,
+        [
+            [
+                0,
+                -0.7780725642449806
+            ],
+            [
+                668,
+                -0.7138496178727424
+            ],
+            [
+                1587,
+                -0.5448932415735014
+            ],
+            [
+                3085,
+                -0.24370397454796228
+            ],
+            [
+                5000,
+                0.42790220995778355
+            ],
+            [
+                6915,
+                0.6191730643365096
+            ],
+            [
+                8413,
+                0.752059342118037
+            ],
+            [
+                9332,
+                1.0451472255274825
+            ],
+            [
+                10000,
+                2.5559479569222825
+            ]
+        ]
+    ],
+    [
+        200.0,
+        20,
+        [
+            [
+                0,
+                -1.3876904425996377
+            ],
+            [
+                668,
+                -1.1464188862638496
+            ],
+            [
+                1587,
+                -0.4049955219067526
+            ],
+            [
+                3085,
+                0.04721394862139682
+            ],
+            [
+                5000,
+                0.56953784145381
+            ],
+            [
+                6915,
+                1.3221859041483333
+            ],
+            [
+                8413,
+                1.6188495656305735
+            ],
+            [
+                9332,
+                1.7613953069723651
+            ],
+            [
+                10000,
+                2.3257482385477384
+            ]
+        ]
+    ],
+    [
+        300.0,
+        30,
+        [
+            [
+                0,
+                -1.600772629982185
+            ],
+            [
+                668,
+                -1.1548516185367033
+            ],
+            [
+                1587,
+                -0.260387173785447
+            ],
+            [
+                3085,
+                0.17416570914366614
+            ],
+            [
+                5000,
+                0.47069243095356195
+            ],
+            [
+                6915,
+                1.1559276581637614
+            ],
+            [
+                8413,
+                2.0474031182051404
+            ],
+            [
+                9332,
+                2.18821711651116
+            ],
+            [
+                10000,
+                2.2393193406467518
+            ]
+        ]
+    ],
+    [
+        400.0,
+        40,
+        [
+            [
+                0,
+                -0.8286852465281818
+            ],
+            [
+                668,
+                -0.7815041529866706
+            ],
+            [
+                1587,
+                -0.3334896444053469
+            ],
+            [
+                3085,
+                0.21085213041026643
+            ],
+            [
+                5000,
+                0.5177616740489182
+            ],
+            [
+                6915,
+                1.077122434649409
+            ],
+            [
+                8413,
+                1.5898009703967424
+            ],
+            [
+                9332,
+                1.8859097291499742
+            ],
+            [
+                10000,
+                2.0954239138728523
+            ]
+        ]
+    ]
+]
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/logdir b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/logdir
new file mode 100644
index 0000000000..b6362b45d7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/logdir
@@ -0,0 +1 @@
+{"logdir": "/foo/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/runs.json b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/runs.json
new file mode 100644
index 0000000000..739262a9fb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/data/runs.json
@@ -0,0 +1,4 @@
+{
+  "run1": {"compressedHistograms": ["histo1"]},
+  "run2": {"compressedHistograms": ["histo2", "histo1"]}
+}
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/index.html b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/index.html
new file mode 100644
index 0000000000..5e825f13f5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/index.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="../paper-styles/typography.html">
+<link rel="import" href="tf-distribution-dashboard.html">
+
+<title>Distribution Dashboard Demo</title>
+<style>
+  #container {
+    height: 800px;
+    width: 100%;
+    display: block;
+  }
+
+  html, body {
+    margin: 0;
+    padding: 0;
+    font-family: "RobotoDraft","Roboto",sans-serif;
+  }
+
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="distribution-dash-demo">
+      <template>
+        <tf-distribution-dashboard id="demo" backend="[[backend]]"></tf-distribution-dashboard>
+      </template>
+      <script>
+        Polymer({
+          is: "distribution-dash-demo",
+          properties: {
+            backend: {
+              type: Object,
+              value: function() {
+                var router = new TF.Backend.router("data", true);
+                return new TF.Backend.Backend(router);
+              },
+            },
+          },
+        });
+      </script>
+    </dom-module>
+    <distribution-dash-demo id="container"></distribution-dash-demo>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/tf-distribution-dashboard.html b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/tf-distribution-dashboard.html
new file mode 100644
index 0000000000..063bd8d099
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4/tf-distribution-dashboard.html
@@ -0,0 +1,124 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+<link rel="import" href="../tf-color-scale/tf-color-scale.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-dashboard-common/tf-option-selector.html">
+<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
+<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../vz-distribution-chart/vz-distribution-chart.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+
+<!--
+tf-distribution-dashboard is a complete frontend that loads runs from a backend,
+and creates chart panes that display data for those runs.
+
+It provides a x type selector and the normal tf-sidebar-helper options, by
+which the user can customize how data is organized and displayed.
+
+Each chart has a button that can toggle whether it is "expanded"; expanded
+charts are larger.
+
+Organizationally, the #plumbing div contains components that have no concrete
+manifestation and just effect data bindings or data loading. The .sidebar div
+contains shared controls provided by tf-sidebar-helper. The .center div
+contains vz-distribution-charts embedded inside tf-panes-helper's.
+-->
+<dom-module id="tf-distribution-dashboard">
+  <template>
+    <div id="plumbing">
+      <tf-color-scale
+        id="colorScale"
+        runs="[[runs]]"
+        out-color-scale="{{_colorScale}}"
+      ></tf-color-scale>
+    </div>
+
+    <tf-dashboard-layout>
+      <div class="sidebar">
+        <tf-sidebar-helper
+          backend="[[backend]]"
+          categories="{{_categories}}"
+          color-scale="[[_colorScale]]"
+          run2tag="[[run2tag]]"
+          runs="[[runs]]"
+          selected-runs="{{_selectedRuns}}"
+          >
+        <div class="sidebar-section">
+          <tf-option-selector
+            id="xTypeSelector"
+            name="Horizontal Axis"
+            selected-id="{{_xType}}"
+            >
+            <paper-button id="step">step</paper-button>
+            <paper-button id="relative">relative</paper-button>
+            <paper-button id="wall_time">wall</paper-button>
+          </tf-option-selector>
+        </div>
+        </tf-sidebar-helper>
+      </div>
+
+      <div class="center">
+        <tf-panes-helper
+          categories="[[_categories]]"
+          color-scale="[[_colorScale]]"
+          data-type="[[dataType]]"
+          data-provider="[[dataProvider]]"
+          data-not-found="[[dataNotFound]]"
+          run2tag="[[run2tag]]"
+          selected-runs="[[_selectedRuns]]"
+          repeat-for-runs
+          >
+          <template>
+            <vz-distribution-chart
+              x-type="[[_xType]]"
+              color-scale="[[_colorScale]]"
+              ></vz-distribution-chart>
+          </template>
+        </tf-panes-helper>
+      </div>
+    </tf-dashboard-layout>
+
+    <style include="dashboard-style"></style>
+  </template>
+
+  <script>
+    TF.Dashboard.TfDistributionDashboard = Polymer({
+      is: "tf-distribution-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("distributions"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.BackendBehavior,
+      ],
+      properties: {
+        backend: Object,
+        _xType: {
+          type: String,
+          value: "step"
+        },
+        dataType: {value: "compressedHistogram"},
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD b/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
index 202e72aaa6..699cd3239b 100644
--- a/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
@@ -1,12 +1,29 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-tensorboard_ts_library(
+web_library(
+    name = "tf_globals_d3v4",
+    srcs = [
+        "bundle.js",
+        "tf-globals.html",
+    ],
+    path = "/tf-globals",
+)
+
+tensorboard_typescript_genrule(
     name = "ts",
-    srcs = ["globals.ts"],
+    srcs = ["bundle.ts"],
+)
+
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF.Globals": ["globals.ts"]},
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/tf_globals_d3v4/tf-globals.html b/tensorflow/tensorboard/components/tf_globals_d3v4/tf-globals.html
new file mode 100644
index 0000000000..b0fd74d4f2
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_globals_d3v4/tf-globals.html
@@ -0,0 +1,19 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="bundle.js"></script>
+
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/BUILD
new file mode 100644
index 0000000000..8ef115e6d5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/BUILD
@@ -0,0 +1,41 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_histogram_dashboard_d3v4",
+    srcs = ["tf-histogram-dashboard.html"],
+    path = "/tf-histogram-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-histogram-dashboard",
+    deps = [
+        ":tf_histogram_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run1_tag_histo1.json
new file mode 100644
index 0000000000..a5600a356e
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run1_tag_histo1.json
@@ -0,0 +1 @@
+[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo1.json b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo1.json
new file mode 100644
index 0000000000..407c375d2f
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo1.json
@@ -0,0 +1 @@
+[[400.0, 40, [-2.599286228987632, 3.5098048900144323, 20.0, 10.792285491200078, 66.66796979177158, [-2.379100905625872, -1.9661990955585713, -1.624957930213695, -1.47723448201245, -1.109868130738129, -1.0089710279437536, -0.42790220995778355, -0.2195814928486969, 0.47069243095356195, 0.7580548669750213, 0.917246389039776, 1.3429404381931362, 1.624957930213695, 1.7874537232350647, 2.1628190051144287, 2.6170109961884593, 2.8787120958073054, 3.8315657995195243], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0, 1.0, 1.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo2.json b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo2.json
new file mode 100644
index 0000000000..752b621ab0
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/histograms_run_run2_tag_histo2.json
@@ -0,0 +1 @@
+[[400.0, 40, [-0.8286852465281818, 2.0954239138728523, 20.0, 13.546880465642861, 24.14836803774091, [-0.7580548669750213, -0.38900200905253046, -0.06996543062044111, 0.07696197368248522, 0.19961953895336082, 0.2656936063469233, 0.29226296698161564, 0.5177616740489182, 0.7580548669750213, 0.917246389039776, 1.109868130738129, 1.220854943811942, 1.624957930213695, 2.1628190051144287], [2.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 2.0, 1.0, 1.0, 1.0, 2.0, 3.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/logdir b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/logdir
new file mode 100644
index 0000000000..b6362b45d7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/logdir
@@ -0,0 +1 @@
+{"logdir": "/foo/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/runs.json b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/runs.json
new file mode 100644
index 0000000000..cbe657af6b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/data/runs.json
@@ -0,0 +1,4 @@
+{
+	"run1": {"histograms": ["histo1"]}, 
+	"run2": {"histograms": ["histo2", "histo1"]}
+}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/index.html b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/index.html
new file mode 100644
index 0000000000..c8d02f990d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/index.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="../paper-styles/typography.html">
+<link rel="import" href="tf-histogram-dashboard.html">
+
+<title>Distribution Dashboard Demo</title>
+<style>
+  #container {
+    height: 800px;
+    display: block;
+  }
+
+  html, body {
+    margin: 0;
+    padding: 0;
+    font-family: "RobotoDraft","Roboto",sans-serif;
+  }
+
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="histogram-dash-demo">
+      <template>
+        <tf-histogram-dashboard id="demo" backend="[[backend]]"></tf-histogram-dashboard>
+      </template>
+      <script>
+        Polymer({
+          is: "histogram-dash-demo",
+          properties: {
+            backend: {
+              type: Object,
+              value: function() {
+                var router = new TF.Backend.router("data", true);
+                return new TF.Backend.Backend(router);
+              },
+            },
+          },
+        });
+      </script>
+    </dom-module>
+    <histogram-dash-demo id="container"></histogram-dash-demo>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/tf-histogram-dashboard.html b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/tf-histogram-dashboard.html
new file mode 100644
index 0000000000..d9967961eb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4/tf-histogram-dashboard.html
@@ -0,0 +1,163 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+<link rel="import" href="../tf-color-scale/tf-color-scale.html">
+<link rel="import" href="../tf-dashboard-common/tf-categorizer.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
+<link rel="import" href="../tf-dashboard-common/tf-option-selector.html">
+<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../vz-histogram-timeseries/vz-histogram-timeseries.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+
+<!--
+tf-histogram-dashboard is a complete frontend that loads runs from a backend,
+and creates chart panes that display data for those runs.
+
+It provides a mode and time property selector, together with the selectors
+provided by tf-sidebar-helper, by which the user can customize how data is
+organized and displayed.
+
+Each chart has a button that can toggle whether it is "selected"; selectedRuns
+charts are larger.
+
+Organizationally, the #plumbing div contains components that have no concrete
+manifestation and just effect data bindings or data loading. The .sidebar div
+contains shared controls provided by tf-sidebar-helper. The .center div
+contains vz-histogram-timeseries embedded inside tf-panes-helper's.
+-->
+<dom-module id="tf-histogram-dashboard">
+  <template>
+    <div id="plumbing">
+      <tf-color-scale
+        id="colorScale"
+        runs="[[runs]]"
+        out-color-scale="{{_colorScale}}"
+      ></tf-color-scale>
+    </div>
+
+    <tf-dashboard-layout>
+      <div class="sidebar">
+        <tf-sidebar-helper
+          backend="[[backend]]"
+          categories="{{_categories}}"
+          color-scale="[[_colorScale]]"
+          run2tag="[[run2tag]]"
+          runs="[[runs]]"
+          selected-runs="{{_selectedRuns}}"
+          show-download-links="{{_showDownloadLinks}}"
+          >
+          <div class="sidebar-section">
+            <tf-option-selector
+              id="histogramModeSelector"
+              name="Histogram Mode"
+              selected-id="{{_histogramMode}}"
+              >
+              <paper-button id="overlay">overlay</paper-button>
+              <paper-button id="offset">offset</paper-button>
+            </tf-option-selector>
+          </div>
+          <div class="sidebar-section">
+            <tf-option-selector
+              id="timePropertySelector"
+              name="Offset Time Axis"
+              selected-id="{{_timeProperty}}"
+              >
+              <paper-button id="step">step</paper-button>
+              <paper-button id="relative">relative</paper-button>
+              <paper-button id="wall_time">wall</paper-button>
+            </tf-option-selector>
+          </tf-sidebar-helper>
+       </div>
+      </div>
+
+      <div class="center">
+        <tf-panes-helper
+          categories="[[_categories]]"
+          color-scale="[[_colorScale]]"
+          data-type="[[dataType]]"
+          data-provider="[[dataProvider]]"
+          data-not-found="[[dataNotFound]]"
+          run2tag="[[run2tag]]"
+          selected-runs="[[_selectedRuns]]"
+          repeat-for-runs
+          >
+          <template>
+            <vz-histogram-timeseries
+              time-property="[[_timeProperty]]"
+              mode="[[_histogramMode]]"
+              color-scale="[[_colorScaleFunction]]"
+              ></vz-histogram-timeseries>
+          </template>
+        </tf-panes-helper>
+      </div>
+    </tf-dashboard-layout>
+
+    <style include="dashboard-style"></style>
+    <style>
+      tf-panes-helper {
+        --card-expanded-height: 500px;
+        --card-expanded-width: 700px;
+      }
+    </style>
+  </template>
+
+  <script>
+    TF.Dashboard.TfHistogramDashboard = Polymer({
+      is: "tf-histogram-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("histograms"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.BackendBehavior,
+      ],
+      properties: {
+        backend: Object,
+        dataType: {
+          type: String,
+          value: "histogram"
+        },
+        _histogramMode: {
+          type: String,
+          value: "offset"
+        },
+        _timeProperty: {
+          type: String,
+          value: "step"
+        },
+        _colorScaleFunction: {
+          type: Function,
+          computed: "_getColorScaleFunction(_colorScale)"
+        },
+      },
+      attached: function() {
+        this.async(function() {
+          this.fire("rendered");
+        });
+      },
+      _getColorScaleFunction: function() {
+        return this._colorScale.scale.bind(this._colorScale);
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/BUILD
new file mode 100644
index 0000000000..fcb242d5da
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/BUILD
@@ -0,0 +1,44 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_image_dashboard_d3v4",
+    srcs = [
+        "tf-image-dashboard.html",
+        "tf-image-loader.html",
+    ],
+    path = "/tf-image-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "@org_polymer",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+    ],
+)
+
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-image-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_image_dashboard_d3v4",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im1_2Fimage_2F0.json b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im1_2Fimage_2F0.json
new file mode 100644
index 0000000000..3dec432213
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im1_2Fimage_2F0.json
@@ -0,0 +1,9 @@
+[
+  {
+    "wall_time":1459200389.088045,
+    "width":4,
+    "height":4,
+    "step":0,
+    "query":"tag=im1%2Fimage%2F0&index=0&run=run1"
+  }
+]
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im2_2Fimage_2F0.json b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im2_2Fimage_2F0.json
new file mode 100644
index 0000000000..16152b8626
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run1_tag_im2_2Fimage_2F0.json
@@ -0,0 +1,9 @@
+[
+  {
+    "wall_time":1459200389.093653,
+    "width":4,
+    "height":4,
+    "step":0,
+    "query":"tag=im2%2Fimage%2F0&index=0&run=run1"
+  }
+]
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run2_tag_im1_2Fimage_2F0.json b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run2_tag_im1_2Fimage_2F0.json
new file mode 100644
index 0000000000..a717b79c5d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/images_run_run2_tag_im1_2Fimage_2F0.json
@@ -0,0 +1,9 @@
+[
+  {
+    "wall_time":1459200389.117463,
+    "width":4,
+    "height":4,
+    "step":0,
+    "query":"tag=im1%2Fimage%2F0&index=0&run=run2"
+  }
+]
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png
new file mode 100644
index 0000000000000000000000000000000000000000..346fd0076be28b9338152c4d49a32fc5ed685e44
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0y~yU|<1Z4kiW$2DQnYnhXpKww^AIAsjQ4=VWAW{@wpZ
z@m<IBR3@F`R$ZALr;bR^%sF!?(!@pe>fz?dchx6~Q;hfBoVfp2kjQy9?!vRJ3<sJ8
WHS6x#YB4Y{FnGH9xvX<aXaWGmYbV_R

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png
new file mode 100644
index 0000000000000000000000000000000000000000..26d2d10acaf8511efeb03169853092d09252215b
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0y~yU|<1Z4kiW$2DQnYnhXpK_MR?|AsjOqO&Cu9XV@>Y
zoq=hK(6yA=_RpE`s=vE;`NN_6TLL$Vv)niJ-K!AlrTxXOg^6*d%G0O%S2r_VS;!>a
Y_*eYp(Uuw^1_lNOPgg&ebxsLQ0Es*&3jhEB

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c4190629429e0929962c4f20bd1a1602620e4bd
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0y~yU|<1Z4kiW$2DQnYnhXpK_MR?|AsjOqO&Cu9XV5>o
zf5zd(4s6;hLLM<+VR-wEU#juaeU<mCn7=5C%zEE0sr<hrWC7#<D@(-exTN=Je%XDr
Yvqj>ciqM=K1_lNOPgg&ebxsLQ0F@UfEC2ui

literal 0
HcmV?d00001

diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/logdir b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/logdir
new file mode 100644
index 0000000000..c7d82022cc
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/logdir
@@ -0,0 +1 @@
+{"logdir": "/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/runs.json b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/runs.json
new file mode 100644
index 0000000000..b75de5b661
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/data/runs.json
@@ -0,0 +1,13 @@
+{
+   "run1":{
+      "images":[
+         "im1/image/0",
+         "im2/image/0"
+      ]
+   },
+   "run2":{
+      "images":[
+         "im1/image/0"
+      ]
+   }
+}
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/index.html b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/index.html
new file mode 100644
index 0000000000..f9ea187952
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/index.html
@@ -0,0 +1,66 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+  <head>
+    <script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
+    <link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="tf-image-dashboard.html">
+    <title>Image Dashboard Demo</title>
+    <style>
+      #container{
+        width: 1000px;
+        height: 800px;
+        border: 2px solid grey;
+      }
+      html,body {
+        height: 100%;
+      }
+    </style>
+  </head>
+  <body>
+    <demo-snippet>
+      <template>
+        <dom-module id="image-dash-demo">
+          <template>
+            <tf-image-dashboard id="demo" backend="[[backend]]">
+            </tf-image-dashboard>
+          </template>
+          <script>
+            Polymer({
+              is: "image-dash-demo",
+              properties: {
+                backend: {
+                  type: Object,
+                  value: function() {
+                    var path = "data";
+                    var router = new TF.Backend.router(path, true);
+                    return new TF.Backend.Backend(router);
+                  },
+                },
+              },
+            });
+          </script>
+        </dom-module>
+        <div id="container">
+          <image-dash-demo></image-dash-demo>
+        </div>
+      </template>
+    </demo-snippet>
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-dashboard.html b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-dashboard.html
new file mode 100644
index 0000000000..0700a8c0e7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-dashboard.html
@@ -0,0 +1,156 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-dialog/paper-dialog.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+<link rel="import" href="../tf-color-scale/tf-color-scale.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
+<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
+<link rel="import" href="tf-image-loader.html">
+
+<!--
+tf-image-dashboard displays a dashboard that loads images from a TensorFlow run.
+-->
+<dom-module id="tf-image-dashboard">
+  <template>
+    <paper-dialog with-backdrop id="actual-image-size-dialog"></paper-dialog>
+    <div id="plumbing">
+      <tf-color-scale
+        id="colorScale"
+        runs="[[runs]]"
+        out-color-scale="{{_colorScale}}"
+        ></tf-color-scale>
+    </div>
+
+    <tf-dashboard-layout>
+      <div class="sidebar">
+        <tf-sidebar-helper
+          backend="[[backend]]"
+          categories="{{_categories}}"
+          color-scale="[[_colorScale]]"
+          run2tag="[[run2tag]]"
+          runs="[[runs]]"
+          selected-runs="{{_selectedRuns}}"
+          >
+        </tf-sidebar-helper>
+      </div>
+      <div class="center">
+        <tf-panes-helper
+          categories="[[_categories]]"
+          color-scale="[[_colorScale]]"
+          data-type="[[dataType]]"
+          data-provider="[[dataProvider]]"
+          data-not-found="[[dataNotFound]]"
+          run2tag="[[run2tag]]"
+          selected-runs="[[_selectedRuns]]"
+          repeat-for-runs
+          >
+          <template>
+            <tf-image-loader color-scale="[[_colorScale]]"></tf-image-loader>
+            <paper-icon-button
+              class="actual-size-button"
+              icon="aspect-ratio"
+              on-tap="_showActualSize"
+              title="Show the image at its true pixel size"
+              ></paper-icon-button>
+          </template>
+        </tf-panes-helper>
+      </div>
+    </tf-dashboard-layout>
+    <style include="dashboard-style"></style>
+    <style>
+      tf-panes-helper {
+        --card-width: 340px;
+        --card-height: auto;
+        --card-expanded-width: 700px;
+        --card-expanded-height: auto;
+      }
+
+      .actual-size-button {
+        background: #fff;
+        border-radius: 100%;
+        bottom: -35px;
+        color: #2196f3;
+        height: 32px;
+        left: 35px;
+        padding: 4px;
+        pointer-events: auto;
+        position: absolute;
+        width: 32px;
+      }
+
+      .actual-size-button-selected {
+        background: var(--tb-ui-light-accent);
+      }
+
+      #actual-image-size-dialog {
+        overflow: auto;
+      }
+    </style>
+  </template>
+  <script>
+    TF.Dashboard.TfImageDashboard = Polymer({
+      is: "tf-image-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
+      properties: {
+        backend: Object,
+        dataType: {
+          type: String,
+          value: "image"
+        },
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("images"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.BackendBehavior,
+      ],
+      attached: function() {
+        this.async(function() {
+          this.fire("rendered");
+        });
+      },
+      _showActualSize: function(e) {
+        var currentTarget = Polymer.dom(e.currentTarget);
+        var card = currentTarget.node.closest('.card');
+
+        // Create a full-size copy of the image.
+        var newImage = card.querySelector('#img').cloneNode();
+        newImage.style.height = 'auto';
+        newImage.style.width = 'auto';
+        newImage.style.margin = 0;
+        newImage.style.padding = 0;
+        newImage.classList.add("actual-size-image");
+
+        // When the user clicks on the image, empty and close the dialog.
+        var dialog = this.$$('#actual-image-size-dialog');
+        newImage.addEventListener('click', function() {
+          dialog.close();
+        });
+
+        // Update dialog content. Show the dialog.
+        dialog.innerHTML = '';
+        dialog.appendChild(newImage);
+        dialog.open();
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-loader.html b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-loader.html
new file mode 100644
index 0000000000..d9ba013dce
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_image_dashboard_d3v4/tf-image-loader.html
@@ -0,0 +1,233 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-slider/paper-slider.html">
+<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../tf-imports/d3.html">
+
+<!--
+tf-image-loader loads an individual image from the TensorBoard backend.
+
+Right now it always loads the most recent image. We should add support in the
+future for loading older images.
+-->
+<dom-module id="tf-image-loader">
+  <template>
+    <div id="image-annotation">
+      <template is="dom-if" if="[[_hasAtLeastOneStep]]">
+        step
+        <span class="step-value">
+          [[_stepValue]]
+        </span>
+        <template is="dom-if" if="[[_currentWallTime]]">
+          ([[_currentWallTime]])
+        </template>
+        <paper-spinner-lite active hidden$=[[!_isImageLoading]]></paper-spinner-lite>
+      </template>
+      <template is="dom-if" if="[[_hasMultipleSteps]]">
+        <paper-slider
+          id="steps"
+          immediate-value="{{_stepIndex}}"
+          max="[[_maxStepIndex]]"
+          max-markers="[[_maxStepIndex]]"
+          snaps
+          step="1"
+          value="{{_stepIndex}}"></paper-slider>
+      </template>
+    </div>
+
+    <div id="main-image-container"></div>
+
+    <style>
+      :host {
+        display: block;
+        width: 100%;
+        height: auto;
+        position: relative;
+        --step-slider-knob-color: #424242;
+      }
+
+      #image-annotation {
+        border-left: 4px solid;
+        padding-left: 5px;
+        font-size: 12px;
+        margin: -10px 0 10px 0;
+      }
+
+      #image-annotation .step-value {
+        font-weight: bold;
+      }
+
+      #image-annotation paper-spinner-lite {
+        width: 14px;
+        height: 14px;
+        vertical-align: text-bottom;
+        --paper-spinner-color: var(--tb-orange-strong)
+      }
+
+      #steps {
+        height: 15px;
+        margin: 0 0 0 -15px;
+        /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
+         * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
+         * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
+        width: calc(100% + 31px);
+        --paper-slider-active-color: var(--step-slider-knob-color);
+        --paper-slider-knob-color: var(--step-slider-knob-color);
+        --paper-slider-pin-color: var(--step-slider-knob-color);
+        --paper-slider-knob-start-color: var(--step-slider-knob-color);
+        --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
+        --paper-slider-pin-start-color: var(--step-slider-knob-color);
+      }
+
+      #main-image-container img {
+        border: 1px solid #f5f5f5;
+        image-rendering: -moz-crisp-edges;
+        image-rendering: pixelated;
+        display: block;
+        width: 100%;
+        height: auto;
+      }
+    </style>
+  </template>
+  <script>
+    "use strict";
+
+    Polymer({
+      is: "tf-image-loader",
+      properties: {
+        colorScale: Object,
+        run: String,
+        // This is an array of Tensorboard Image&Datum objects (See backend.ts for details). The
+        // properties of objects in this array are
+        // {
+        //   width: number,
+        //   height: number,
+        //   wall_time: Date,
+        //   step: number,
+        //   url: string,
+        // }
+        _steps: {
+          type: Array,
+          value: [],
+          notify: true,
+        },
+        _stepIndex: {
+          type: Number,
+          notify: true,
+        },
+        _hasAtLeastOneStep: {
+          type: Boolean,
+          computed: "_computeHasAtLeastOneStep(_steps)",
+        },
+        _hasMultipleSteps: {
+          type: Boolean,
+          computed: "_computeHasMultipleSteps(_steps)",
+        },
+        _stepValue: {
+          type: Number,
+          computed: "_computeStepValue(_stepIndex)",
+        },
+        _currentWallTime: {
+          type: Number,
+          computed: "_computeCurrentWallTime(_stepIndex)",
+        },
+        _maxStepIndex: {
+          type: Number,
+          computed: "_computeMaxStepIndex(_steps)",
+        },
+        // We use a strictly increasing index to make sure that we don't settle on a stale image.
+        _currentImageLoadIndex: {
+          type: Number,
+          value: 1,
+        },
+        _isImageLoading: {
+          type: Boolean,
+          value: false,
+        },
+      },
+      observers: [
+        "_updateImageUrl(_steps, _stepIndex)",
+      ],
+      redraw: function() {
+        // Other dashboards logic requires a redraw method to be defined. redraw is called at
+        // various places such as when the image is expanded.
+        this.setSeriesData(this.run, this._steps);
+      },
+      setVisibleSeries: function(runs) {
+        // Do nothing.
+      },
+      setSeriesData: function(run, steps) {
+        this.set("run", run);
+        this.set("_steps", steps);
+        this.set("_stepIndex", steps.length - 1);
+
+        // Update the border color based on the run.
+        var color = this.colorScale.scale(run);
+        this.$$("#image-annotation").style.borderColor = color;
+      },
+      _updateImageUrl: function(steps, stepIndex) {
+        // We manually change the image URL (instead of binding to the image's src attribute)
+        // because we would like to manage what happens when the image starts to / finishes loading.
+        if (!steps.length) {
+          return;
+        }
+
+        let img = new Image();
+        img.id = "img"; // '#img' used to select the image in tf-image-dashboard.
+
+        const loadIndex = ++this._currentImageLoadIndex;
+        img.onload = img.onerror = (function() {
+          if (loadIndex != this._currentImageLoadIndex) {
+            // This load is no longer relevant.
+            return;
+          }
+
+          // The new image has finished loading. Remove the old image. Add the new one.
+          let mainImageContainer = this.$$("#main-image-container");
+          mainImageContainer.innerHTML = "";
+          Polymer.dom(mainImageContainer).appendChild(img);
+
+          // The image has finished loading (or has erred and failed to load).
+          this.set("_isImageLoading", false);
+        }).bind(this);
+
+        // Load the new image.
+        this.set("_isImageLoading", true);
+        img.src = steps[stepIndex].url;
+      },
+      _computeHasAtLeastOneStep: function(steps) {
+        return !!steps && steps.length > 0;
+      },
+      _computeHasMultipleSteps: function(steps) {
+        return !!steps && steps.length > 1;
+      },
+      _computeStepValue: function(stepIndex) {
+        return this._steps[stepIndex].step;
+      },
+      _computeCurrentWallTime: function(stepIndex) {
+        return this._steps[stepIndex].wall_time.toString();
+      },
+      _computeMaxStepIndex: function(steps) {
+        return steps.length - 1;
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
index dfd8a1ceda..edf759052f 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -8,7 +8,7 @@ licenses(["notice"])  # Apache 2.0
 web_library(
     name = "lodash",
     srcs = ["lodash.html"],
-    path = "/tf-imports-d3v4",
+    path = "/tf-imports",
     deps = ["@com_lodash"],
 )
 
@@ -46,7 +46,7 @@ web_library(
         "graphlib.html",
         "@io_github_cpettitt_graphlib",
     ],
-    path = "/tf-imports-d3v4",
+    path = "/tf-imports",
     deps = [":lodash"],
 )
 
@@ -56,7 +56,7 @@ web_library(
         "dagre.html",
         "@io_github_cpettitt_dagre",
     ],
-    path = "/tf-imports-d3v4",
+    path = "/tf-imports",
     deps = [
         ":graphlib",
         ":lodash",
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html b/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
index 75b016f0e8..36386a5095 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
@@ -16,3 +16,4 @@ limitations under the License.
 -->
 
 <script src="three.js"></script>
+<script src="OrbitControls.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_option_selector_d3v4/BUILD b/tensorflow/tensorboard/components/tf_option_selector_d3v4/BUILD
new file mode 100644
index 0000000000..db5d07b095
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_option_selector_d3v4/BUILD
@@ -0,0 +1,21 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_option_selector_d3v4",
+    srcs = ["tf-option-selector.html"],
+    path = "/tf-option-selector",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_option_selector_d3v4/tf-option-selector.html b/tensorflow/tensorboard/components/tf_option_selector_d3v4/tf-option-selector.html
new file mode 100644
index 0000000000..d6fc9d6861
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_option_selector_d3v4/tf-option-selector.html
@@ -0,0 +1,94 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+
+<!--
+tf-option-selector is a simple component that has buttons as content and
+provides a "selectedId" property that is one of the IDs of the buttons inside it.
+-->
+<dom-module id="tf-option-selector">
+  <template>
+    <div id="wrap">
+      <h3>[[name]]</h3>
+      <div class="content-wrapper"><content></content></div>
+    </div>
+    <style>
+      .content-wrapper ::content > * {
+        width: 30%;
+        font-size: 13px;
+        background: none;
+        margin-top: 10px;
+        color: var(--tb-ui-dark-accent);
+      }
+
+      .content-wrapper ::content :first-of-type {
+        margin-left: 0;
+      }
+
+      .content-wrapper ::content .selected {
+        background-color: var(--tb-ui-dark-accent);
+        color: white!important;
+      }
+
+      h3 {
+        color: var(--paper-grey-800);
+        margin: 0;
+        font-weight: normal;
+        font-size: 14px;
+        margin-bottom: 5px;
+        display: block;
+        pointer-events: none;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-option-selector",
+      properties: {
+        name: String,
+        selectedId: {
+          type: String,
+          notify: true,
+          observer: '_selectedIdChanged'
+        }
+      },
+      attached: function() {
+        this.async(function() {
+          this.getEffectiveChildren().forEach(function(node) {
+            this.listen(node, 'tap', '_selectTarget');
+          }.bind(this));
+        });
+      },
+      _selectTarget: function(e) {
+        this.selectedId = e.currentTarget.id;
+      },
+      _selectedIdChanged: function() {
+        var selected = this.queryEffectiveChildren('#' + this.selectedId);
+        if (!selected) {
+          return;
+        }
+
+        this.getEffectiveChildren().forEach(function(node) {
+          node.classList.remove("selected");
+        });
+        selected.classList.add("selected");
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/BUILD
new file mode 100644
index 0000000000..3b9f38feab
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/BUILD
@@ -0,0 +1,37 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_scalar_dashboard_d3v4",
+    srcs = [
+        "tf-scalar-dashboard.html",
+        "tf-smoothing-input.html",
+    ],
+    path = "/tf-scalar-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "//tensorflow/tensorboard/components/vz_line_chart_d3v4",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_paper_checkbox",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_input",
+        "@org_polymer_paper_item",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD
new file mode 100644
index 0000000000..322fcfc3bc
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-scalar-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/logdir b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/logdir
new file mode 100644
index 0000000000..b6362b45d7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/logdir
@@ -0,0 +1 @@
+{"logdir": "/foo/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/runs.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/runs.json
new file mode 100644
index 0000000000..d45f530763
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/runs.json
@@ -0,0 +1,4 @@
+{
+  "run1": {"scalars": ["foo/sin", "foo/cos", "foo/square", "bar/square"]},
+  "run2": {"scalars": ["foo/cos", "foo/square", "bar/square"]}
+}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars.json
new file mode 100644
index 0000000000..bc269395b6
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars.json
@@ -0,0 +1 @@
+{"run2": {"foo/cos": [[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/square": [[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]]}, "run1": {"foo/sin": [[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]], "foo/cos": [[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]}}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_bar_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_bar_2Fsquare.json
new file mode 100644
index 0000000000..6d584fb4a9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_bar_2Fsquare.json
@@ -0,0 +1 @@
+[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fcos.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fcos.json
new file mode 100644
index 0000000000..025eaa16e9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fcos.json
@@ -0,0 +1 @@
+[[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsin.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsin.json
new file mode 100644
index 0000000000..eae69dd78f
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsin.json
@@ -0,0 +1 @@
+[[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsquare.json
new file mode 100644
index 0000000000..6d584fb4a9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run1_tag_foo_2Fsquare.json
@@ -0,0 +1 @@
+[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_bar_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_bar_2Fsquare.json
new file mode 100644
index 0000000000..6d584fb4a9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_bar_2Fsquare.json
@@ -0,0 +1 @@
+[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fcos.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fcos.json
new file mode 100644
index 0000000000..dd3593f9d1
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fcos.json
@@ -0,0 +1 @@
+[[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fsquare.json
new file mode 100644
index 0000000000..0ff9ef0551
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/data/scalars_run_run2_tag_foo_2Fsquare.json
@@ -0,0 +1 @@
+[[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html
new file mode 100644
index 0000000000..586ee2a47d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="../tf-scalar-dashboard.html">
+<link rel="import" href="../../paper-styles/typography.html">
+
+<title>Scalar Dashboard Demo</title>
+<style>
+  #container {
+    height: 900px;
+    width: 100%;
+    display: block;
+  }
+
+  html, body {
+    margin: 0;
+    padding: 0;
+    font-family: "RobotoDraft","Roboto",sans-serif;
+  }
+
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="scalar-dash-demo">
+      <template>
+        <tf-scalar-dashboard id="demo" backend="[[backend]]"></tf-scalar-dashboard>
+      </template>
+      <script>
+        Polymer({
+          is: "scalar-dash-demo",
+          properties: {
+            backend: {
+              type: Object,
+              value: function() {
+                var router = new TF.Backend.router("data", true);
+                return new TF.Backend.Backend(router);
+              },
+            },
+          },
+        });
+      </script>
+    </dom-module>
+    <scalar-dash-demo id="container"></scalar-dash-demo>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-scalar-dashboard.html b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-scalar-dashboard.html
new file mode 100644
index 0000000000..b91cd90c03
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-scalar-dashboard.html
@@ -0,0 +1,270 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="tf-smoothing-input.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+<link rel="import" href="../tf-color-scale/tf-color-scale.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-dashboard-common/tf-option-selector.html">
+<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
+<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../vz-line-chart/vz-line-chart.html">
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-menu/paper-menu.html">
+<link rel="import" href="../paper-item/paper-item.html">
+
+<!--
+tf-scalar-dashboard is a complete frontend that loads runs from a backend,
+and creates chart panes that display data for those runs.
+
+It provides a categorizer, run selector, and x type selector, by which the user
+can customize how data is organized and displayed.
+
+Each chart has a button that can toggle whether it is "expanded"; expanded
+charts are larger.
+
+Organizationally, the #plumbing div contains components that have no concrete
+manifestation and just effect data bindings or data loading. The .sidebar div
+contains shared controls provided by tf-sidebar-helper. The .center div
+contains vz-line-charts embedded inside tf-panes-helper's.
+-->
+<dom-module id="tf-scalar-dashboard">
+  <template>
+    <div id="plumbing">
+      <tf-color-scale
+        id="colorScale"
+        runs="[[runs]]"
+        out-color-scale="{{_colorScale}}"
+      ></tf-color-scale>
+    </div>
+
+    <tf-dashboard-layout>
+      <div class="sidebar">
+        <tf-sidebar-helper
+          backend="[[backend]]"
+          categories="{{_categories}}"
+          color-scale="[[_colorScale]]"
+          run2tag="[[run2tag]]"
+          runs="[[runs]]"
+          selected-runs="{{_selectedRuns}}"
+          >
+          <div class="extend-first-section">
+            <div class="line-item">
+              <paper-checkbox
+              id="download-option"
+              checked="{{_showDownloadLinks}}"
+              >Show data download links</paper-checkbox>
+            </div>
+              <div class="line-item">
+                <paper-checkbox
+                id="outliersCheckbox"
+                checked="{{_ignoreYOutliers}}"
+                >Ignore outliers in chart scaling</paper-checkbox>
+              </div>
+            <div id="tooltip-sorting">
+              <div id="tooltip-sorting-label">Tooltip sorting method:</div>
+              <paper-dropdown-menu
+                no-label-float
+                selected-item-label="{{_tooltipSortingMethod}}"
+                >
+                <paper-menu class="dropdown-content" selected="0">
+                  <paper-item>default</paper-item>
+                  <paper-item>descending</paper-item>
+                  <paper-item>ascending</paper-item>
+                  <paper-item>nearest</paper-item>
+                </paper-menu>
+              </paper-dropdown-menu>
+            </div>
+          </div>
+          <div class="sidebar-section">
+            <tf-smoothing-input
+              weight="{{_smoothingWeight}}"
+              step="0.001"
+              min="0"
+              max="1"
+              ></tf-smoothing-input>
+          </div>
+          <div class="sidebar-section">
+            <tf-option-selector
+              id="xTypeSelector"
+              name="Horizontal Axis"
+              selected-id="{{_xType}}"
+              >
+              <paper-button id="step">step</paper-button>
+              <paper-button id="relative">relative</paper-button>
+              <paper-button id="wall_time">wall</paper-button>
+            </tf-option-selector>
+          </div>
+        </tf-sidebar-helper>
+      </div>
+      <div class="center">
+        <tf-panes-helper
+          categories="[[_categories]]"
+          color-scale="[[_colorScale]]"
+          data-type="[[dataType]]"
+          data-provider="[[dataProvider]]"
+          data-not-found="[[dataNotFound]]"
+          run2tag="[[run2tag]]"
+          selected-runs="[[_selectedRuns]]"
+          show-download-links="[[_showDownloadLinks]]"
+          download-link-url-function="[[scalarUrl]]"
+          >
+          <template>
+            <vz-line-chart
+              x-type="[[_xType]]"
+              color-scale="[[_colorScale]]"
+              smoothing-enabled="[[_smoothingEnabled]]"
+              smoothing-weight="[[_smoothingWeight]]"
+              tooltip-sorting-method="[[_tooltipSortingMethod]]"
+              ignore-y-outliers="[[_ignoreYOutliers]]"
+              ></vz-line-chart>
+            <paper-icon-button
+              class="log-button"
+              icon="line-weight"
+              on-tap="toggleLogScale"
+              title="Toggle y-axis log scale"
+              ></paper-icon-button>
+          </template>
+        </tf-panes-helper>
+      </div>
+    </tf-dashboard-layout>
+
+    <style include="dashboard-style"></style>
+    <style>
+      .log-button {
+        position: absolute;
+        left: 35px;
+        bottom: -35px;
+        color: #2196F3;
+        background: #fff;
+        width: 32px;
+        height: 32px;
+        padding: 4px;
+        border-radius: 100%;
+      }
+
+      .log-button-selected {
+        background: var(--tb-ui-light-accent);
+      }
+
+      #tooltip-sorting {
+        display: flex;
+        font-size: 14px;
+        margin-top: 5px;
+      }
+
+      #tooltip-sorting-label {
+        margin-top: 13px;
+        margin-left: 28px;
+      }
+
+      #tooltip-sorting paper-dropdown-menu {
+        margin-left: 10px;
+        --paper-input-container-focus-color: var(--tb-orange-strong);
+        width: 105px;
+      }
+      .line-item {
+        display: block;
+        padding-top: 5px;
+      }
+    </style>
+
+  </template>
+
+  <script>
+    TF.Dashboard.TfScalarDashboard = Polymer({
+      is: "tf-scalar-dashboard",
+      factoryImpl: function(backend, router) {
+        this.backend = backend;
+        this.router = router;
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("scalars"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.BackendBehavior,
+      ],
+      properties: {
+        backend: Object,
+        dataType: {
+          type: String,
+          value: "scalar"
+        },
+        router: Object,
+        scalarUrl: {
+          type: Function,
+          computed: "_getScalarUrl(router)"
+        },
+        _showDownloadLinks: {
+          type: Boolean,
+          notify: true,
+          value: TF.URIStorage.getBooleanInitializer('_showDownloadLinks',
+              false, true),
+          observer: '_showDownloadLinksObserver'
+        },
+        _smoothingWeight: {
+          type: Number,
+          notify: true,
+          value: TF.URIStorage.getNumberInitializer('_smoothingWeight', 0.6),
+          observer: '_smoothingWeightObserver'
+        },
+        _smoothingEnabled: {
+          type: Boolean,
+          computed: '_computeSmoothingEnabled(_smoothingWeight)'
+        },
+        _ignoreYOutliers: {
+          type: Boolean,
+          value: TF.URIStorage.getBooleanInitializer('_ignoreYOutliers', true, true),
+          observer: '_ignoreYOutliersObserver',
+        },
+        _xType: {
+          type: String,
+          value: "step"
+        }
+      },
+      attached: function() {
+        this.async(function() {
+          this.fire("rendered");
+        });
+      },
+      _getScalarUrl: function() {
+        return this.router.scalars;
+      },
+      _showDownloadLinksObserver: TF.URIStorage.getBooleanObserver(
+          '_showDownloadLinks', /*default=*/ false, /*useLocalStorage=*/ true),
+      _smoothingWeightObserver: TF.URIStorage.getNumberObserver(
+          '_smoothingWeight', 0.6),
+      _ignoreYOutliersObserver: TF.URIStorage.getBooleanObserver(
+          '_ignoreYOutliers', /*default=*/ true, /*useLocalStorage=*/true),
+      _computeSmoothingEnabled: function(_smoothingWeight) {
+        return _smoothingWeight > 0;
+      },
+      toggleLogScale: function(e) {
+        var currentTarget = Polymer.dom(e.currentTarget);
+        var button = currentTarget.parentNode.querySelector('.log-button');
+        var chart = currentTarget.parentNode.querySelector('vz-line-chart');
+
+        button.classList.toggle("log-button-selected");
+        chart.yScaleType = chart.yScaleType === 'log' ? 'linear' : 'log';
+        chart.redraw();
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-smoothing-input.html b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-smoothing-input.html
new file mode 100644
index 0000000000..a076033000
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/tf-smoothing-input.html
@@ -0,0 +1,138 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-slider/paper-slider.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../tf-imports/lodash.html">
+
+<!--
+tf-smoothing-input creates an input component for exponential smoothing.
+-->
+<dom-module id="tf-smoothing-input">
+  <template>
+    <h3 class="title">Smoothing</h3>
+    <div class="smoothing-block">
+      <paper-slider
+        id="slider"
+        value="{{weight}}"
+        immediate-value="{{_immediateWeightNumberForPaperSlider}}"
+        type="number"
+        step="[[step]]"
+        min="[[min]]"
+        max="[[max]]"
+        ></paper-slider>
+      <paper-input
+        id="input"
+        label="weight"
+        no-label-float
+        value="{{_inputWeightStringForPaperInput}}"
+        type="number"
+        step="[[step]]"
+        min="[[min]]"
+        max="[[max]]"
+        ></paper-input>
+    </div>
+    <style>
+      .title {
+        color: var(--paper-grey-800);
+        margin: 0;
+        font-weight: normal;
+        font-size: 14px;
+        margin-bottom: 5px;
+      }
+
+      .smoothing-block {
+        display: flex;
+      }
+
+      paper-slider {
+        margin-left: 12px;
+        --paper-slider-knob-color: var(--tb-orange-strong);
+        --paper-slider-active-color: var(--tb-orange-strong);
+        flex-grow: 2;
+      }
+
+      paper-input {
+        --paper-input-container-focus-color: var(--tb-orange-strong);
+        --paper-input-container-input: {
+          font-size: 14px;
+        };
+        --paper-input-container-label: {
+          font-size: 14px;
+        };
+        width: 60px;
+      }
+    </style>
+  </template>
+  <script>
+    Polymer({
+      is: "tf-smoothing-input",
+
+      properties: {
+        step: Number,
+        max: Number,
+        min: Number,
+
+        weight: {
+          type: Number,
+          value: 0.6,
+          notify: true
+        },
+
+        _immediateWeightNumberForPaperSlider: {
+          type: Number,
+          notify: true,
+          observer: '_immediateWeightNumberForPaperSliderChanged'
+        },
+
+        // Paper input treats values as strings even if you specify them as
+        // numbers.
+        _inputWeightStringForPaperInput: {
+          type: String,
+          notify: true,
+          observer: '_inputWeightStringForPaperInputChanged'
+        }
+      },
+
+      _updateWeight: _.debounce(function(val) {
+        this.weight = val;
+      }, 250),
+
+      _immediateWeightNumberForPaperSliderChanged: function() {
+        this._inputWeightStringForPaperInput =
+            this._immediateWeightNumberForPaperSlider.toString();
+        this._updateWeight.call(this, this._immediateWeightNumberForPaperSlider);
+      },
+
+      _inputWeightStringForPaperInputChanged: function() {
+        if (+this._inputWeightStringForPaperInput < 0) {
+          this._inputWeightStringForPaperInput = '0';
+        }
+        else if (+this._inputWeightStringForPaperInput > 1) {
+          this._inputWeightStringForPaperInput = '1';
+        }
+
+        var d = +this._inputWeightStringForPaperInput;
+        if (!isNaN(d)) {
+          this._updateWeight.call(this, d);
+        }
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD b/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
index 877f026319..7a8cde6bde 100644
--- a/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
@@ -1,33 +1,50 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-# TODO(dandelion): Add test runner.
-
-tensorboard_ts_library(
-    name = "ts",
-    srcs = ["storage.ts"],
+web_library(
+    name = "tf_storage_d3v4",
+    srcs = [
+        "bundle.js",
+        "tf-storage.html",
+    ],
+    path = "/tf-storage",
     deps = [
-        "//tensorflow/tensorboard/components/tf_globals_d3v4:ts",
-        "//third_party/javascript/lodash:lodash-module",
-        "//third_party/javascript/typings/lodash",
+        "//tensorflow/tensorboard/components/tf_globals_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
     ],
 )
 
-tensorboard_ts_library(
-    name = "tests",
-    srcs = ["storageTests.ts"],
-    deps = [
-        ":ts",
-        "//tensorflow/tensorboard/components/tf_globals_d3v4:ts",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/sinon",
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:bundle.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
     ],
 )
 
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF.URIStorage": [
+        "storage.ts",
+    ]},
+    namespace_symbol_aliases = {"TF.URIStorage": {
+        "TABS": "TF.Globals.TABS",
+        "USE_HASH": "TF.Globals.USE_HASH",
+        "getFakeHash": "TF.Globals.getFakeHash",
+        "setFakeHash": "TF.Globals.setFakeHash",
+    }},
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/test/BUILD b/tensorflow/tensorboard/components/tf_storage_d3v4/test/BUILD
new file mode 100644
index 0000000000..472976f000
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/test/BUILD
@@ -0,0 +1,50 @@
+package(
+    default_testonly = True,
+    default_visibility = ["//tensorflow:internal"],
+)
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "test",
+    srcs = [
+        "bundle.js",
+        "tests.html",
+    ],
+    path = "/tf-storage/test",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_storage_d3v4",
+        "@org_npmjs_registry_web_component_tester",
+        "@org_polymer",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:chai.d.ts",
+        "@org_definitelytyped//:mocha.d.ts",
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:bundle.d.ts",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:bundle.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"TF.URIStorage": ["storageTests.ts"]},
+    namespace_symbol_aliases = {"TF.URIStorage": {"TABS": "TF.Globals.TABS"}},
+)
+
+filegroup(
+    name = "all_files",
+    testonly = 0,
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts b/tensorflow/tensorboard/components/tf_storage_d3v4/test/storageTests.ts
similarity index 96%
rename from tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
rename to tensorflow/tensorboard/components/tf_storage_d3v4/test/storageTests.ts
index adc4dde716..82dc51f05d 100644
--- a/tensorflow/tensorboard/components/tf_storage_d3v4/storageTests.ts
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/test/storageTests.ts
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-import {TAB, getString, getNumber, getObject, setString, setNumber, setObject} from './storage';
-import {TABS} from '../tf_globals_d3v4/globals';
+import {TAB, getString, getNumber, getObject, setString, setNumber, setObject} from '../storage';
+import {TABS} from '../../tf-globals/globals';
 
 /* tslint:disable:no-namespace */
 describe('URIStorage', () => {
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/test/tests.html b/tensorflow/tensorboard/components/tf_storage_d3v4/test/tests.html
new file mode 100644
index 0000000000..e0553c7d3c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/test/tests.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta charset="utf-8">
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<script src="../../web-component-tester/browser.js"></script>
+<link rel="import" href="../../polymer/polymer.html">
+<link rel="import" href="../tf-storage.html">
+<body>
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/tf-storage.html b/tensorflow/tensorboard/components/tf_storage_d3v4/tf-storage.html
new file mode 100644
index 0000000000..91b8976519
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/tf-storage.html
@@ -0,0 +1,21 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../tf-globals/tf-globals.html">
+<link rel="import" href="../tf-imports/lodash.html">
+
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run1.pbtxt b/tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run1.pbtxt
deleted file mode 100644
index 2a6af32840..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run1.pbtxt
+++ /dev/null
@@ -1,9 +0,0 @@
-node {
-  name: "a"
-  op: "matmul"
-}
-node {
-  name: "b"
-  op: "matmul"
-  input: "a:0"
-}
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run2.pbtxt b/tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run2.pbtxt
deleted file mode 100644
index a5a4d65d5c..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run2.pbtxt
+++ /dev/null
@@ -1,15 +0,0 @@
-node {
-  name: "a"
-  op: "matmul"
-}
-node {
-  name: "b"
-  op: "matmul"
-  input: "a:0"
-}
-node {
-  name: "c"
-  op: "matmul"
-  input: "a:0"
-  input: "b:0"
-}
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/data/runs.json b/tensorflow/tensorboard/components/tf_tensorboard/test/data/runs.json
deleted file mode 100644
index 10b2821b30..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/data/runs.json
+++ /dev/null
@@ -1 +0,0 @@
-{"run2": {"graph": true, "histograms": [], "scalars": [], "compressedHistograms": [], "images": []}, "run1": {"graph": true, "histograms": [], "scalars": [], "compressedHistograms": [], "images": []}}
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD
new file mode 100644
index 0000000000..683302bb45
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD
@@ -0,0 +1,80 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:vulcanize.bzl", "tensorboard_html_binary")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_tensorboard_d3v4",
+    srcs = [
+        "tf-tensorboard.html",
+        ":ts",
+    ],
+    path = "/tf-tensorboard",
+    deps = [
+        "@org_polymer_iron_icons",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_checkbox",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_header_panel",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_tabs",
+        "@org_polymer_paper_toolbar",
+        "@org_polymer",
+        "//tensorflow/tensorboard/components/tf_audio_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_globals_d3v4",
+        # "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_image_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4",
+        "//tensorflow/tensorboard/components/tf_text_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/vz_projector_d3v4",
+    ],
+)
+
+web_library(
+    name = "demo",
+    srcs = ["demo.html"],
+    path = "/tf-tensorboard",
+    deps = [
+        ":tf_tensorboard_d3v4",
+        "//tensorflow/tensorboard/demo:demo_data",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+web_library(
+    name = "dist",
+    srcs = ["dist.html"],
+    path = "/tf-tensorboard",
+    deps = [
+        ":tf_tensorboard_d3v4",
+        "//tensorflow/tensorboard/demo:demo_data",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_html_binary(
+    name = "index",
+    # input_path = "/tf-dashboard-common/tf-chart-scaffold.html",
+    input_path = "/tf-tensorboard/dist.html",
+    output_path = "/index.html",
+    deps = [":dist"],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["autoReloadBehavior.ts"],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/autoReloadBehavior.ts b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/autoReloadBehavior.ts
new file mode 100644
index 0000000000..1f6b4cf641
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/autoReloadBehavior.ts
@@ -0,0 +1,60 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module TF.TensorBoard {
+  export var AUTORELOAD_LOCALSTORAGE_KEY = 'TF.TensorBoard.autoReloadEnabled';
+
+  var getAutoReloadFromLocalStorage: () => boolean = () => {
+    var val = window.localStorage.getItem(AUTORELOAD_LOCALSTORAGE_KEY);
+    return val === 'true' || val == null;  // defaults to true
+  };
+
+  export var AutoReloadBehavior = {
+    properties: {
+      autoReloadEnabled: {
+        type: Boolean,
+        observer: '_autoReloadObserver',
+        value: getAutoReloadFromLocalStorage,
+      },
+      _autoReloadId: {
+        type: Number,
+      },
+      autoReloadIntervalSecs: {
+        type: Number,
+        value: 30,
+      },
+    },
+    detached: function() {
+      window.clearTimeout(this._autoReloadId);
+    },
+    _autoReloadObserver: function(autoReload) {
+      window.localStorage.setItem(AUTORELOAD_LOCALSTORAGE_KEY, autoReload);
+      if (autoReload) {
+        var _this = this;
+        this._autoReloadId = window.setTimeout(
+            this._doAutoReload.bind(this), this.autoReloadIntervalSecs * 1000);
+      } else {
+        window.clearTimeout(this._autoReloadId);
+      }
+    },
+    _doAutoReload: function() {
+      if (this.reload == null) {
+        throw new Error('AutoReloadBehavior requires a reload method');
+      }
+      this.reload();
+      this._autoReloadId = window.setTimeout(
+          this._doAutoReload.bind(this), this.autoReloadIntervalSecs * 1000);
+    }
+  };
+}
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html
new file mode 100644
index 0000000000..95f5b718a5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<title>TensorBoard</title>
+<style>
+  html, body {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    font-family: "RobotoDraft", "Roboto", sans-serif;
+  }
+</style>
+<script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMQAAADECAMAAAD3eH5ZAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAD/UExURfFlKfaELvFmKfNyK/67NvWALf68Nv69NvNxK/20NfyyNP22NfN0K/JrKvqhMv2zNf25Nf24Nf23NfeOL/yzNPyvNPJoKviWMPmeMfN1K/WBLfePL/FnKfeML/qlMvR7LPmcMfeLL/aJLvR5LPFoKfJuKvR3LP66NvywNPeNL/V/LfaILv21Nf26NfNzK/NvK/R6LPmaMfyxNPqfMvV+LfurM/iSMPmbMfJvKvmdMfumM/qiMvmZMfytNPJqKvysNPN2K/iYMPNwK/upM/JtKvJsKviVMPaHLvaGLvJpKvR8LPaKLvqkMvuqM/aFLvR4LPuoM/iTMPWDLfiRMPmYMXS0ngkAAALoSURBVHja7drnctpAFIbhFUISSKJ3MKYa0+y4xTW9937/15JkJhlTjhrSrHRmvuf/as6L0YLFCgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBJ6njenqspzgnPrsrGX9Zpi2tCrmnc6+dYNthVY5WpMmxQLWPdMsOuYVwzNj3ei2t3mQwaV43BJPDCS2NbJ5aEeuX/+9qcjQOtfFIkIkrvY2g4MVcmOBsFWbowKO/kNyj62gRpJcDaPBlxLr1B0zdG0C/8LzbJiJrshuvy1gzlA9+rD8mIkuyIJjFE3/dqnYwoSm7IUEPoD/wut8iIguSIDjlFxe/yfXL5vuSI21BTZLLhXoOILMO8Hxwa/L8bI0LfmUdhGowb2ZvT0e57pFNDgB06IlVyjmmIBl2T/nl9Rw6SD9GgSG/Q0uQkaW3XhmovKQ3eFQ4N2Uo9OQ1eFZsNerf7vP+rO4rhmY1Lg3vFVoP8+8BXg1sFnwbnCk4NThW8GuiKBDdkVVtTNFvNelVsNqTbyWnIOM2oeTRoyWvwmpJHg/ucXBrcJuXT4DwrpwZi2vy0VCx8YtXg/D2bU4OfiuQ3eFfE2KD4bfCqiLNB993gXsGlwa2CT4NzBacGIVQ6YsipQdh0xEdODUKjIxrSp88onZ8zbbFLg1DoiFO5BXvDGv2My9/JhUT8JUZTI0yDaNHLBzIbvqTDNYhUiVw/kdjQ1kM2CHFDPjKW+KzyRTF0g/ga9w9y+fANQpxvX8CU+Ny7FUWDeF3Y+g3lROIf4k0UDX9eCyvO531PyYhHga9zvPZJU5b73Y/eXj8Hv9D48n6HaF5LbcjRt8TZTtda5M1DfXnbkX1C0SHCFKzQB5Fe8op4GNGNHavvZESbVwT5r6W1xyuCPBY3Y9YgDqzknH/e3YfNzzuL30l0IebrZ5kKtuDIXt1n868ET6kf3/49tLvrCcZyF8Pu215dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcPIbNrBhOaBXucoAAAAASUVORK5CYII=">
+<link rel="import" href="tf-tensorboard.html">
+
+<tf-tensorboard demo-dir="/data" use-hash></tf-tensorboard>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html
new file mode 100644
index 0000000000..89bcfb733e
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<title>TensorBoard</title>
+<style>
+  html, body {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    font-family: "RobotoDraft", "Roboto", sans-serif;
+  }
+</style>
+<script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMQAAADECAMAAAD3eH5ZAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAD/UExURfFlKfaELvFmKfNyK/67NvWALf68Nv69NvNxK/20NfyyNP22NfN0K/JrKvqhMv2zNf25Nf24Nf23NfeOL/yzNPyvNPJoKviWMPmeMfN1K/WBLfePL/FnKfeML/qlMvR7LPmcMfeLL/aJLvR5LPFoKfJuKvR3LP66NvywNPeNL/V/LfaILv21Nf26NfNzK/NvK/R6LPmaMfyxNPqfMvV+LfurM/iSMPmbMfJvKvmdMfumM/qiMvmZMfytNPJqKvysNPN2K/iYMPNwK/upM/JtKvJsKviVMPaHLvaGLvJpKvR8LPaKLvqkMvuqM/aFLvR4LPuoM/iTMPWDLfiRMPmYMXS0ngkAAALoSURBVHja7drnctpAFIbhFUISSKJ3MKYa0+y4xTW9937/15JkJhlTjhrSrHRmvuf/as6L0YLFCgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBJ6njenqspzgnPrsrGX9Zpi2tCrmnc6+dYNthVY5WpMmxQLWPdMsOuYVwzNj3ei2t3mQwaV43BJPDCS2NbJ5aEeuX/+9qcjQOtfFIkIkrvY2g4MVcmOBsFWbowKO/kNyj62gRpJcDaPBlxLr1B0zdG0C/8LzbJiJrshuvy1gzlA9+rD8mIkuyIJjFE3/dqnYwoSm7IUEPoD/wut8iIguSIDjlFxe/yfXL5vuSI21BTZLLhXoOILMO8Hxwa/L8bI0LfmUdhGowb2ZvT0e57pFNDgB06IlVyjmmIBl2T/nl9Rw6SD9GgSG/Q0uQkaW3XhmovKQ3eFQ4N2Uo9OQ1eFZsNerf7vP+rO4rhmY1Lg3vFVoP8+8BXg1sFnwbnCk4NThW8GuiKBDdkVVtTNFvNelVsNqTbyWnIOM2oeTRoyWvwmpJHg/ucXBrcJuXT4DwrpwZi2vy0VCx8YtXg/D2bU4OfiuQ3eFfE2KD4bfCqiLNB993gXsGlwa2CT4NzBacGIVQ6YsipQdh0xEdODUKjIxrSp88onZ8zbbFLg1DoiFO5BXvDGv2My9/JhUT8JUZTI0yDaNHLBzIbvqTDNYhUiVw/kdjQ1kM2CHFDPjKW+KzyRTF0g/ga9w9y+fANQpxvX8CU+Ny7FUWDeF3Y+g3lROIf4k0UDX9eCyvO531PyYhHga9zvPZJU5b73Y/eXj8Hv9D48n6HaF5LbcjRt8TZTtda5M1DfXnbkX1C0SHCFKzQB5Fe8op4GNGNHavvZESbVwT5r6W1xyuCPBY3Y9YgDqzknH/e3YfNzzuL30l0IebrZ5kKtuDIXt1n868ET6kf3/49tLvrCcZyF8Pu215dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcPIbNrBhOaBXucoAAAAASUVORK5CYII=">
+<link rel="import" href="tf-tensorboard.html">
+<body>
+<tf-tensorboard use-hash></tf-tensorboard>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/autoReloadTests.ts b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/autoReloadTests.ts
new file mode 100644
index 0000000000..0f049d40ab
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/autoReloadTests.ts
@@ -0,0 +1,85 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+declare function fixture(id: string): void;
+window.HTMLImports.whenReady(() => {
+  Polymer({
+    is: 'autoreload-test-element',
+    behaviors: [TF.TensorBoard.AutoReloadBehavior],
+  });
+
+  describe('autoReload-behavior', function() {
+    var testElement;
+    var ls = window.localStorage;
+    var key = TF.TensorBoard.AUTORELOAD_LOCALSTORAGE_KEY;
+    var clock;
+    var callCount: number;
+
+    beforeEach(function() {
+      ls.setItem(key, 'false');  // start it turned off so we can mutate fns
+      testElement = fixture('autoReloadFixture');
+      callCount = 0;
+      testElement.reload = function() { callCount++; };
+    });
+
+    before(function() { clock = sinon.useFakeTimers(); });
+
+    after(function() { clock.restore(); });
+
+    it('reads and writes autoReload state from localStorage', function() {
+      ls.removeItem(key);
+      testElement = fixture('autoReloadFixture');
+      chai.assert.isTrue(
+          testElement.autoReloadEnabled, 'autoReload defaults to true');
+      chai.assert.equal(ls.getItem(key), 'true', 'autoReload setting saved');
+      testElement = fixture('autoReloadFixture');
+      chai.assert.isTrue(
+          testElement.autoReloadEnabled, 'read true from localStorage');
+      testElement.autoReloadEnabled = false;
+      chai.assert.equal(ls.getItem(key), 'false', 'autoReload setting saved');
+      testElement = fixture('autoReloadFixture');
+      chai.assert.isFalse(
+          testElement.autoReloadEnabled, 'read false setting properly');
+      testElement.autoReloadEnabled = true;
+      chai.assert.equal(ls.getItem(key), 'true', 'saved true setting');
+    });
+
+    it('reloads every interval secs when autoReloading', function() {
+      testElement.autoReloadIntervalSecs = 1;
+      testElement.autoReloadEnabled = true;
+      clock.tick(1000);
+      chai.assert.equal(callCount, 1, 'ticking clock triggered call');
+      clock.tick(20 * 1000);
+      chai.assert.equal(callCount, 21, 'ticking clock 20s triggered 20 calls');
+    });
+
+    it('can cancel pending autoReload', function() {
+      testElement.autoReloadIntervalSecs = 10;
+      testElement.autoReloadEnabled = true;
+      clock.tick(5 * 1000);
+      testElement.autoReloadEnabled = false;
+      clock.tick(20 * 1000);
+      chai.assert.equal(callCount, 0, 'callCount is 0');
+    });
+
+    it('throws an error in absence of reload method', function() {
+      testElement.reload = undefined;
+      testElement.autoReloadIntervalSecs = 1;
+      testElement.autoReloadEnabled = true;
+      chai.assert.throws(function() {
+        clock.tick(5000);
+      });
+    });
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tests.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/e2eTests.html
similarity index 79%
rename from tensorflow/tensorboard/components/tf_color_scale_d3v4/tests.html
rename to tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/e2eTests.html
index 9a2a174349..5efc02ef98 100644
--- a/tensorflow/tensorboard/components/tf_color_scale_d3v4/tests.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/e2eTests.html
@@ -18,14 +18,14 @@ limitations under the License.
 
 <html>
 <head>
-  <meta charset="utf-8">
-  <script src="../../web-component-tester/browser.js"></script>
   <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../tf-imports/d3.html">
+  <link rel="import" href="../tf-tensorboard.html">
+  <link rel="stylesheet" type="text/css" href="../../../lib/css/global.css">
 </head>
 <body>
-    <script src="../colorScale.js"></script>
-    <script src="../palettes.js"></script>
-    <script src="colorScaleTests.js"></script>
+  <tf-tensorboard demo-dir="data/"></tf-tensorboard>
+  <script src="e2eTests.js"></script>
 </body>
 </html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/e2eTests.ts b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/e2eTests.ts
new file mode 100644
index 0000000000..2308298ced
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/e2eTests.ts
@@ -0,0 +1,42 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+describe('end-to-end test', () => {
+  window.HTMLImports.whenReady(() => {
+    let tb = d3.select('tf-tensorboard');
+    var tabs = (<any>tb.node()).$.tabs;
+
+    function testTab(tabIndex: number) {
+      it(`selecting ${TF.Globals.TABS[tabIndex]} tab`, done => {
+        // Every dashboard emits a rendered event when it is done rendering.
+        tb.on('rendered', () => done());
+        tabs.set('selected', tabIndex);
+      });
+    }
+    // Listen for when the default tab has rendered and test other tabs after.
+    tb.on('rendered', () => {
+      // The default tab already rendered. Test everything else.
+      // If a bug happened while rendering the default tab, the test would
+      // have failed. Re-selecting the default tab and listening for
+      // "rendered" event won't work since the content is not re-stamped.
+      let selected = +tabs.get('selected');
+      for (let i = 0; i < TF.Globals.TABS.length; i++) {
+        if (i !== selected) {
+          testTab(i);
+        }
+      }
+    });
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tests.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/fastTabSwitch.html
similarity index 79%
rename from tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tests.html
rename to tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/fastTabSwitch.html
index 270a2522b9..88bb6edc48 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tests.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/fastTabSwitch.html
@@ -18,14 +18,14 @@ limitations under the License.
 
 <html>
 <head>
-  <meta charset="utf-8">
   <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
   <link rel="import" href="../../tf-imports/d3.html">
-  <link rel="import" href="../../vz-sorting/vz-sorting.html">
+  <link rel="import" href="../tf-tensorboard.html">
+  <link rel="stylesheet" type="text/css" href="../../../lib/css/global.css">
 </head>
 <body>
-  <script src="../categorizer.js"></script>
-  <script src="categorizerTest.js"></script>
+  <tf-tensorboard demo-dir="data/"></tf-tensorboard>
+  <script src="fastTabSwitch.js"></script>
 </body>
 </html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/fastTabSwitch.ts b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/fastTabSwitch.ts
new file mode 100644
index 0000000000..4dd62a0c38
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/fastTabSwitch.ts
@@ -0,0 +1,44 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+describe('fast tab switch', () => {
+  window.HTMLImports.whenReady(() => {
+    let tb = d3.select('tf-tensorboard');
+    var tabs = (<any>tb.node()).$.tabs;
+
+    // This test will select the events tab. Once the events tab
+    // renders, will select the graph tab, and immediately select
+    // the images tab wihout waiting for the graph tab to finish
+    // rendering. Finally, it finishes when the images tab
+    // has rendered and no errors were thrown.
+    let eventsTabIndex = TF.Globals.TABS.indexOf('events');
+    let imagesTabIndex = TF.Globals.TABS.indexOf('images');
+    let graphTabIndex = TF.Globals.TABS.indexOf('graphs');
+
+    // Listen for when the events tab rendered.
+    tb.on('rendered', () => {
+      it('switching to graph tab and immediately to images', done => {
+        // Select the graph tab.
+        tabs.set('selected', graphTabIndex);
+        // Interrupt graph rendering by immediately selecting the images tab
+        // and finish when the images tab has rendered.
+        tb.on('rendered', () => done());
+        tabs.set('selected', imagesTabIndex);
+      });
+    });
+    // Select the events tab.
+    tabs.set('selected', eventsTabIndex);
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/index.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/index.html
new file mode 100644
index 0000000000..8806f36fad
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/index.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../web-component-tester/browser.js"></script>
+</head>
+<body>
+<script>
+// Run the tests for each main component in tensorboard.
+WCT.loadSuites([
+  'tensorboardTests.html',
+  // TODO: re-enable or remove. b/30163860
+  // 'e2eTests.html',
+  'fastTabSwitch.html'
+]);
+</script>
+</body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/tests.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/tensorboardTests.html
similarity index 60%
rename from tensorflow/tensorboard/components/tf_backend_d3v4/tests.html
rename to tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/tensorboardTests.html
index 7f51861d25..2122cb79b1 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/tests.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/tensorboardTests.html
@@ -18,29 +18,27 @@ limitations under the License.
 
 <html>
 <head>
-  <meta charset="utf-8">
+  <link rel="import" href="../../polymer/polymer.html">
   <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../polymer/polymer.html">
-  <link rel="import" href="../../tf-imports/d3.html">
-  <link rel="import" href="../../vz-sorting/vz-sorting.html">
+  <link rel="import" href="../tf-tensorboard.html">
+  <link rel="stylesheet" type="text/css" href="../../../lib/css/global.css">
 </head>
 <body>
-  <test-fixture id="testElementFixture">
+  <test-fixture id="tensorboardFixture">
     <template>
-      <test-element
-        id="test"
-      ></test-element>
+      <tf-tensorboard>
+        <span id="inject-me">Injected content should be rendered by the element.</span>
+      </tf-tensorboard>
     </template>
   </test-fixture>
-    <script src="../requestManager.js"></script>
-    <script src="../urlPathHelpers.js"></script>
-    <script src="../router.js"></script>
-    <script src="../backend.js"></script>
-    <script src="../behavior.js"></script>
 
-    <script src="requestManagerTest.js"></script>
-    <script src="backendTests.js"></script>
-    <script src="behaviorTests.js"></script>
+  <test-fixture id="autoReloadFixture">
+    <template>
+      <autoreload-test-element></autoreload-test-element>
+    </template>
+  </test-fixture>
+  <script src="tensorboardTests.js"></script>
+  <script src="autoReloadTests.js"></script>
 </body>
 </html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/tensorboardTests.ts b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/tensorboardTests.ts
new file mode 100644
index 0000000000..3c7fe2c9e7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/test/tensorboardTests.ts
@@ -0,0 +1,136 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+describe('tf-tensorboard tests', () => {
+  window.HTMLImports.whenReady(() => {
+    let tensorboard: any;
+    beforeEach(function() {
+      tensorboard = fixture('tensorboardFixture');
+      tensorboard.demoDir = 'data';
+      tensorboard.autoReloadEnabled = false;
+    });
+
+    it('specified tabs are correct', function(done) {
+      setTimeout(function() {
+        let tabs = tensorboard.$.tabs.getElementsByTagName('paper-tab');
+        let tabMode = Array.prototype.map.call(tabs, (x) => x.dataMode);
+        chai.assert.deepEqual(tabMode, TF.Globals.TABS, 'mode is correct');
+        let tabText =
+            Array.prototype.map.call(tabs, (x) => x.innerText.toLowerCase());
+        chai.assert.deepEqual(tabText, TF.Globals.TABS, 'text is correct');
+        done();
+      });
+    });
+
+    it('respects router manually provided', function() {
+      let router = TF.Backend.router('data', true);
+      tensorboard.router = router;
+      tensorboard.demoDir = null;
+      chai.assert.equal(tensorboard._backend.router, router);
+    });
+
+    it('renders injected content', function() {
+      let injected = tensorboard.querySelector('#inject-me');
+      chai.assert.isNotNull(injected);
+    });
+
+    describe('reloading the selected dashboard', function() {
+      TF.Globals.TABS.forEach((name, tabIndex) => {
+        // These tabs do not support reload mode.
+        if (name === 'graphs' || name === 'projections') {
+          return;
+        }
+        it(`${name}: calling reload reloads dashboard`, function(done) {
+          tensorboard.$.tabs.set('selected', tabIndex);
+          setTimeout(function() {
+            let called = false;
+            tensorboard.selectedDashboard().reload = function() {
+              called = true;
+            };
+            tensorboard.reload();
+            chai.assert.isFalse(
+                tensorboard.$$('#reload-button').disabled,
+                'reload button not disabled');
+            chai.assert.isTrue(called, `reload was called`);
+            done();
+          });
+        });
+      });
+    });
+
+    it('reload is disabled for graph dashboard', function(done) {
+      let idx = TF.Globals.TABS.indexOf('graphs');
+      chai.assert.notEqual(idx, -1, 'graphs was found');
+      tensorboard.$.tabs.set('selected', idx);
+      setTimeout(
+          function() {  // async so that the queued tab change will happen
+            let called = false;
+            tensorboard.selectedDashboard().reload = function() {
+              called = true;
+            };
+            tensorboard.reload();
+            chai.assert.isTrue(
+                tensorboard.$$('#reload-button').disabled,
+                'reload button disabled');
+            chai.assert.isFalse(called, `reload was not called`);
+            done();
+          });
+    });
+
+    describe('top right global icons', function() {
+      it('Clicking the reload button will call reload', function() {
+        let called = false;
+        tensorboard.reload = function() { called = true; };
+        tensorboard.$$('#reload-button').click();
+        chai.assert.isTrue(called);
+      });
+
+      it('settings pane is hidden', function() {
+        chai.assert.equal(tensorboard.$.settings.style['display'], 'none');
+      });
+
+      it('settings icon button opens the settings pane', function(done) {
+        tensorboard.$$('#settings-button').click();
+        // This test is a little hacky since we depend on polymer's
+        // async behavior, which is difficult to predict.
+
+        // keep checking until the panel is visible. error with a timeout if it
+        // is broken.
+        function verify() {
+          if (tensorboard.$.settings.style['display'] !== 'none') {
+            done();
+          } else {
+            setTimeout(verify, 3);  // wait and see if it becomes true
+          }
+        }
+        verify();
+      });
+
+      it('Autoreload checkbox toggle works', function() {
+        let checkbox = tensorboard.$$('#auto-reload-checkbox');
+        chai.assert.equal(checkbox.checked, tensorboard.autoReloadEnabled);
+        let oldValue = checkbox.checked;
+        checkbox.click();
+        chai.assert.notEqual(oldValue, checkbox.checked);
+        chai.assert.equal(checkbox.checked, tensorboard.autoReloadEnabled);
+      });
+
+      it('Autoreload checkbox contains correct interval info', function() {
+        let checkbox = tensorboard.$$('#auto-reload-checkbox');
+        let timeInSeconds = tensorboard.autoReloadIntervalSecs + 's';
+        chai.assert.include(checkbox.innerText, timeInSeconds);
+      });
+    });
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html
new file mode 100644
index 0000000000..f3f5d590f9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html
@@ -0,0 +1,351 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-icons/iron-icons.html">
+<link rel="import" href="../paper-tabs/paper-tabs.html">
+<link rel="import" href="../paper-dialog/paper-dialog.html">
+<link rel="import" href="../paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../paper-toolbar/paper-toolbar.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-header-panel/paper-header-panel.html">
+<link rel="import" href="../tf-globals/tf-globals.html">
+<link rel="import" href="../tf-scalar-dashboard/tf-scalar-dashboard.html">
+<link rel="import" href="../tf-distribution-dashboard/tf-distribution-dashboard.html">
+<link rel="import" href="../tf-histogram-dashboard/tf-histogram-dashboard.html">
+<link rel="import" href="../tf-image-dashboard/tf-image-dashboard.html">
+<link rel="import" href="../tf-audio-dashboard/tf-audio-dashboard.html">
+<!-- <link rel="import" href="../tf-graph-dashboard/tf-graph-dashboard.html"> -->
+<link rel="import" href="../tf-text-dashboard/tf-text-dashboard.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+<link rel="import" href="../tf-storage/tf-storage.html">
+<link rel="import" href="../vz-projector/vz-projector-dashboard.html">
+
+<!--
+tf-tensorboard is the frontend entry point for TensorBoard.
+
+It implements a toolbar (via paper-header-panel and paper-toolbar) that
+allows the user to toggle between various dashboards.
+-->
+<script src="autoReloadBehavior.js"></script>
+<dom-module id="tf-tensorboard">
+  <template>
+    <paper-dialog with-backdrop id="settings">
+      <h2>Settings</h2>
+      <paper-checkbox id="auto-reload-checkbox" checked="{{autoReloadEnabled}}">
+        Reload data every <span>[[autoReloadIntervalSecs]]</span>s.
+      </paper-checkbox>
+    </paper-dialog>
+    <paper-header-panel>
+      <paper-toolbar id="toolbar">
+        <div id="toolbar-content">
+          <div class="toolbar-title">TensorBoard</div>
+          <paper-tabs selected="{{modeIndex}}" noink class="tabs" id="tabs">
+            <template is="dom-repeat" items="[[tabs]]">
+              <template is="dom-if" if="[[_isTabEnabled(item)]]">
+                <paper-tab data-mode="[[item]]">[[item]]</paper-tab>
+              </template>
+            </template>
+          </paper-tabs>
+          <div class="global-actions">
+            <paper-icon-button
+              icon="refresh"
+              on-tap="reload"
+              disabled$="[[_isReloadDisabled(mode)]]"
+              id="reload-button"
+            ></paper-icon-button>
+            <paper-icon-button
+              icon="settings"
+              on-tap="openSettings"
+              id="settings-button"
+            ></paper-icon-button>
+            <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md" tabindex="-1">
+              <paper-icon-button icon="help-outline"></paper-icon-button>
+            </a>
+          </div>
+        </div>
+      </paper-toolbar>
+
+      <div id="content" class="fit">
+        <content id="injected-overview"></content>
+
+        <template is="dom-if" if="[[_modeIsScalars(mode)]]">
+          <tf-scalar-dashboard
+            id="scalars"
+            backend="[[_backend]]"
+            router="[[router]]"
+          ></tf-scalar-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsImages(mode)]]">
+          <tf-image-dashboard
+            id="images"
+            backend="[[_backend]]"
+          ></tf-image-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsAudio(mode)]]">
+          <tf-audio-dashboard
+            id="audio"
+            backend="[[_backend]]"
+          ></tf-audio-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsGraphs(mode)]]">
+          <tf-graph-dashboard
+            id="graphs"
+            backend="[[_backend]]"
+            debugger-data-enabled="[[_debuggerDataEnabled]]"
+          ></tf-graph-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsDistributions(mode)]]">
+          <tf-distribution-dashboard
+            id="distributions"
+            backend="[[_backend]]"
+          ></tf-distribution-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsHistograms(mode)]]">
+          <tf-histogram-dashboard
+            id="histograms"
+            backend="[[_backend]]"
+          ></tf-histogram-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsEmbeddings(mode)]]">
+          <vz-projector-dashboard
+            id="projector"
+            route-prefix="/data/plugin/projector">
+          </vz-projector-dashboard>
+        </template>
+
+        <template is="dom-if" if="[[_modeIsText(mode)]]">
+          <tf-text-dashboard
+            id="text"
+            backend="[[_backend]]">
+          </tf-text-dashboard>
+        </template>
+      </div>
+    </paper-header-panel>
+
+    <style>
+      :host {
+        height: 100%;
+        display: block;
+        background-color: var(--paper-grey-100);
+      }
+
+      #toolbar {
+        background-color: var(--tb-toolbar-background-color, --tb-orange-strong);
+        -webkit-font-smoothing: antialiased;
+      }
+
+      .toolbar-title {
+        font-size: 20px;
+        margin-left: 10px;
+        text-rendering: optimizeLegibility;
+        letter-spacing: -0.025em;
+        font-weight: 500;
+        flex-grow: 2;
+        display: var(--tb-toolbar-title-display, block);
+      }
+
+      .tabs {
+        flex-grow: 1;
+        text-transform: uppercase;
+        height: 100%;
+      }
+
+      paper-tabs {
+        --paper-tabs-selection-bar-color: white;
+      }
+
+      .global-actions {
+        flex-grow: 2;
+        display: inline-flex; /* Ensure that icons stay aligned */
+        justify-content: flex-end;
+        text-align: right;
+        color: white;
+      }
+
+      .global-actions a {
+        color: white;
+      }
+
+      #toolbar-content {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      #content {
+        height: 100%;
+      }
+
+      [disabled] {
+        opacity: 0.2;
+        color: white;
+      }
+
+    </style>
+  </template>
+  <script>
+    "use strict";
+
+    Polymer({
+      is: "tf-tensorboard",
+      behaviors: [TF.TensorBoard.AutoReloadBehavior],
+      properties: {
+        router: {
+          type: Object,
+          value: function() {
+            return TF.Backend.router();
+          },
+        },
+        _backend: {
+          type: Object,
+          computed: "_makeBackend(router, demoDir)",
+        },
+        _debuggerDataEnabled: {
+          type: Boolean,
+          value: function() {
+            // For now, Tensorboard only shows debugger data if the debugger_data GET param is set
+            // to enabled.
+            let match = window.location.href.match(/[&\?]debugger_data=enabled/);
+            return match && match.length == 1;
+          },
+        },
+        // Which tab is selected (scalars, graph, images etc).
+        mode: {
+          type: String,
+          computed: '_getModeFromIndex(modeIndex)',
+          notify: true,
+        },
+        tabs: {
+          type: Array,
+          readOnly: true,
+          value: TF.Globals.TABS,
+        },
+        // If this is set to a string, TensorBoard will switch to "demo mode"
+        // and attempt to load serialized json data from that directory. You can
+        // generate conformant json using
+        // tensorboard/scripts/serialize_tensorboard.py
+        demoDir: {
+          type: String,
+          value: null,
+        },
+        // Set this to true to store state in URI hash. Should be true for all non-test purposes.
+        useHash: {
+          type: Boolean,
+          value: false,
+        },
+        disabledTabs: String,
+      },
+      _isTabEnabled: function(tab) {
+        if (this.disabledTabs != null &&
+            this.disabledTabs.split(',').indexOf(tab) >= 0) {
+          return false;
+        }
+        return true;
+      },
+      _getModeFromIndex: function(modeIndex) {
+        var mode = this.tabs[modeIndex];
+        TF.URIStorage.setString(TF.URIStorage.TAB, mode);
+        return mode;
+      },
+      _makeBackend: function(router, demoDir) {
+        // use the demoDir if it is set, otherwise use the provided router
+        if (demoDir != null) {
+          router = TF.Backend.router(demoDir, true);
+        }
+        return new TF.Backend.Backend(router);
+      },
+      _isReloadDisabled: function(mode) {
+        return !this._debuggerDataEnabled && this._modeIsGraphs(mode);
+      },
+      _modeIsScalars: function(mode) {
+        return mode === "scalars";
+      },
+      _modeIsImages: function(mode) {
+        return mode === "images";
+      },
+      _modeIsAudio: function(mode) {
+        return mode === "audio";
+      },
+      _modeIsGraphs: function(mode) {
+        return mode === "graphs";
+      },
+      _modeIsEmbeddings: function(mode) {
+        return mode === "embeddings";
+      },
+      _modeIsDistributions: function(mode) {
+        return mode === "distributions";
+      },
+      _modeIsHistograms: function(mode) {
+        return mode === "histograms";
+      },
+      _modeIsText: function(mode) {
+        return mode === "text";
+      },
+      selectedDashboard: function() {
+        var dashboard = this.$$("#" + this.mode);
+        if (dashboard == null) {
+          throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
+        }
+        return dashboard;
+      },
+      ready: function() {
+        TF.Globals.USE_HASH = this.useHash;
+
+        this._getModeFromHash();
+        window.addEventListener('hashchange', function() {
+          this._getModeFromHash();
+        }.bind(this));
+      },
+      _getModeFromHash: function() {
+        var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
+        var modeIndex = this.tabs.indexOf(tabName);
+        if (modeIndex == -1 && this.modeIndex == null) {
+          // Select the first tab as default.
+          this.set('modeIndex', 0);
+        }
+        if (modeIndex != -1 && modeIndex != this.modeIndex) {
+          this.set('modeIndex', modeIndex);
+        }
+      },
+      reload: function() {
+        if (this._modeIsEmbeddings(this.mode)) {
+          return;
+        }
+        if (!this._debuggerDataEnabled && this._modeIsGraphs(this.mode)) {
+          return;
+        }
+        this.selectedDashboard().reload();
+      },
+      openSettings: function() {
+        this.$.settings.open();
+      },
+    });
+  </script>
+  <script src="autoReloadBehavior.js"></script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/BUILD
new file mode 100644
index 0000000000..c15cf2fdc4
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/BUILD
@@ -0,0 +1,45 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_text_dashboard_d3v4",
+    srcs = [
+        "tf-text-dashboard.html",
+        "tf-text-loader.html",
+    ],
+    path = "/tf-text-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_color_scale_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "@org_polymer",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_material",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+    ],
+)
+
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-text-dashboard",
+    deps = [
+        ":tf_text_dashboard_d3v4",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/logdir b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/logdir
new file mode 100644
index 0000000000..c7d82022cc
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/logdir
@@ -0,0 +1 @@
+{"logdir": "/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/runs.json b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/runs.json
new file mode 100644
index 0000000000..aea7de5f91
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/runs.json
@@ -0,0 +1 @@
+{"fry": ["message", "markdown"], "leela": ["message"]}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_markdown.json b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_markdown.json
new file mode 100644
index 0000000000..94183ae13d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_markdown.json
@@ -0,0 +1,32 @@
+[
+  {
+    "wall_time": 1489715207.593146,
+    "step": 0,
+    "text": "<p><em>Italics1</em> <em>Italics2</em> <strong>bold1</strong> <strong>bold2</strong></p>"
+  },
+  {
+    "wall_time": 1489715207.593801,
+    "step": 1,
+    "text": "<ol>\n<li>List item one.</li>\n<li>List item two.</li>\n<li>Sublist</li>\n<li>Sublist2</li>\n<li>List continues.</li>\n</ol>"
+  },
+  {
+    "wall_time": 1489715207.594842,
+    "step": 2,
+    "text": "<table>\n<thead>\n<tr>\n<th>An</th>\n<th>Example</th>\n<th>Table</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>A</td>\n<td>B</td>\n<td>C</td>\n</tr>\n<tr>\n<td>1</td>\n<td>2</td>\n<td>3</td>\n</tr>\n</tbody>\n</table>"
+  },
+  {
+    "wall_time": 1489715207.595761,
+    "step": 3,
+    "text": "<p>hello <a><em>you</em></a></p>"
+  },
+  {
+    "wall_time": 1489715207.595761,
+    "step": 4,
+    "text": "<p><a href=\"http://tensorflow.org\">TensorFlow</a></p>"
+  },
+  {
+    "wall_time": 1489715207.595761,
+    "step": 530234352,
+    "text": "&lt;script&gt;alert('xss')&lt;/script&gt;"
+  }
+]
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_message.json b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_message.json
new file mode 100644
index 0000000000..e8cc006c0d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_fry_tag_message.json
@@ -0,0 +1,22 @@
+[
+  {
+    "wall_time": 1489715207.593146,
+    "step": 0,
+    "text": "fry loves garnet"
+  },
+  {
+    "wall_time": 1489715207.593801,
+    "step": 1,
+    "text": "fry loves amethyst"
+  },
+  {
+    "wall_time": 1489715207.594842,
+    "step": 2,
+    "text": "fry loves pearl"
+  },
+  {
+    "wall_time": 1489715207.595761,
+    "step": 3,
+    "text": "fry loves steven"
+  }
+]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_leela_tag_message.json b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_leela_tag_message.json
new file mode 100644
index 0000000000..5a6d259893
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/data/text_run_leela_tag_message.json
@@ -0,0 +1,22 @@
+[
+  {
+    "step": 0,
+    "wall_time": 1489715207.607792,
+    "text": "leela loves garnet and feels strongly about various issues of the day including the two-cent titanium tax and whether nixon's head contributes to greenhouse gas emissions"
+  },
+  {
+    "step": 1,
+    "wall_time": 1489715207.609011,
+    "text": "leela loves amethyst"
+  },
+  {
+    "step": 2,
+    "wall_time": 1489715207.610028,
+    "text": "leela loves pearl"
+  },
+  {
+    "step": 3,
+    "wall_time": 1489715207.611142,
+    "text": "leela loves someverylongwordwithoutanybreaksorspacessowecanseehowthatishandledbythefrontend"
+  }
+]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/index.html b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/index.html
new file mode 100644
index 0000000000..77d19b948c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/index.html
@@ -0,0 +1,68 @@
+<!doctype html>
+<!--
+@license
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+  <head>
+    <script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
+    <link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="tf-text-dashboard.html">
+    <title>text Dashboard Demo</title>
+    <style>
+      #container{
+        height: 800px;
+        border: 2px solid grey;
+      }
+      html, body {
+        margin: 0;
+        padding: 0;
+        height: 100%;
+        font-family: "RobotoDraft","Roboto",sans-serif;
+      }
+    </style>
+  </head>
+  <body>
+    <demo-snippet>
+      <template>
+        <dom-module id="text-dash-demo">
+          <template>
+            <tf-text-dashboard id="demo" backend="[[backend]]">
+            </tf-text-dashboard>
+          </template>
+          <script>
+            Polymer({
+              is: "text-dash-demo",
+              properties: {
+                backend: {
+                  type: Object,
+                  value: function() {
+                    var path = "data";
+                    var router = new TF.Backend.router(path, true);
+                    return new TF.Backend.Backend(router);
+                  },
+                },
+              },
+            });
+          </script>
+        </dom-module>
+        <div id="container">
+          <text-dash-demo></text-dash-demo>
+        </div>
+      </template>
+    </demo-snippet>
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-dashboard.html b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-dashboard.html
new file mode 100644
index 0000000000..4c0b34055d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-dashboard.html
@@ -0,0 +1,109 @@
+<!--
+@license
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-dialog/paper-dialog.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+<link rel="import" href="../tf-color-scale/tf-color-scale.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
+<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
+<link rel="import" href="tf-text-loader.html">
+
+<!--
+tf-text-dashboard displays a dashboard that loads texts from a TensorFlow run.
+-->
+<dom-module id="tf-text-dashboard">
+  <template>
+    <paper-dialog with-backdrop id="actual-text-size-dialog"></paper-dialog>
+    <div id="plumbing">
+      <tf-color-scale
+        id="colorScale"
+        runs="[[runs]]"
+        out-color-scale="{{_colorScale}}"
+        ></tf-color-scale>
+    </div>
+
+    <tf-dashboard-layout>
+      <div class="sidebar">
+        <tf-sidebar-helper
+          backend="[[backend]]"
+          categories="{{_categories}}"
+          color-scale="[[_colorScale]]"
+          run2tag="[[run2tag]]"
+          runs="[[runs]]"
+          selected-runs="{{_selectedRuns}}"
+          >
+        </tf-sidebar-helper>
+      </div>
+      <div class="center">
+        <tf-panes-helper
+          categories="[[_categories]]"
+          color-scale="[[_colorScale]]"
+          data-type="[[dataType]]"
+          data-provider="[[dataProvider]]"
+          data-not-found="[[dataNotFound]]"
+          run2tag="[[run2tag]]"
+          selected-runs="[[_selectedRuns]]"
+          repeat-for-runs
+          >
+          <template>
+            <tf-text-loader color-scale="[[_colorScale]]"></tf-text-loader>
+          </template>
+        </tf-panes-helper>
+      </div>
+    </tf-dashboard-layout>
+    <style include="dashboard-style"></style>
+    <style>
+      tf-panes-helper {
+        --card-width: 100%;
+        --card-height: auto;
+        --card-expanded-width: 100%;
+        --card-expanded-height: 1000px;
+        --card-padding: 0 5px 5px 5px;
+        --show-expand-button: none;
+      }
+
+    </style>
+  </template>
+  <script>
+    TF.Dashboard.TfTextDashboard = Polymer({
+      is: "tf-text-dashboard",
+      factoryImpl: function(backend) {
+        this.backend = backend;
+      },
+      properties: {
+        backend: Object,
+        dataType: {
+          type: String,
+          value: "text"
+        },
+      },
+      behaviors: [
+        TF.Dashboard.DashboardBehavior("text"),
+        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
+        TF.Backend.BackendBehavior,
+      ],
+      attached: function() {
+        this.async(function() {
+          this.fire("rendered");
+        });
+      },
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-loader.html b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-loader.html
new file mode 100644
index 0000000000..374e0478dd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_text_dashboard_d3v4/tf-text-loader.html
@@ -0,0 +1,143 @@
+<!--
+@license
+Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-material/paper-material.html">
+<link rel="import" href="../tf-dashboard-common/scrollbar-style.html">
+<link rel="import" href="../tf-imports/d3.html">
+
+<!--
+tf-text-loader displays markdown text data from the Text plugin.
+-->
+
+<style>
+  tf-text-loader p {
+    margin: 0.3em 0;
+  }
+
+  tf-text-loader table {
+    border-collapse: collapse;
+  }
+
+  tf-text-loader table th {
+    font-weight: 600;
+  }
+
+  tf-text-loader table th,
+  tf-text-loader table td {
+    padding: 6px 13px;
+    border: 1px solid #dfe2e5;
+  }
+
+  tf-text-loader table tr {
+    background-color: #fff;
+    border-top: 1px solid #c6cbd1;
+  }
+
+</style>
+<dom-module id="tf-text-loader">
+
+  <!-- Set the innerHTML with the textual content, so we can render the
+   html generated by our markdown parser. Note this content is always
+   sanitized by the backend, so xss attacks are not possible.
+  -->
+  <template>
+    <style include="scrollbar-style"></style>
+    <paper-material elevation="1" id="outer" class="container scrollbar">
+      <template id="repeater" is="dom-repeat" items="[[_texts]]">
+      <paper-material elevation="1" class="step-container">
+        step <span class="step-value">[[_numfmt(item.step)]]</span>
+      </paper-material>
+      <paper-material elevation="1" inner-h-t-m-l="[[item.text]]" class="text">
+        </paper-material>
+      </template>
+    </paper-material>
+
+
+    <style>
+      #outer {
+        display: block;
+        overflow: auto;
+        max-height: 500px;
+        position: relative;
+        border-radius: 3px;
+        border: 2px solid black;
+      }
+      .text {
+        margin: 0 10px 10px 10px;
+        border-radius: 0 3px 3px 3px;
+        background-color: white;
+        padding: 5px;
+        word-break: break-word;
+      }
+      .step-container {
+        border-left: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        border-top: 1px solid #ccc;
+        border-radius: 3px 3px 0 0;
+        font-style: italic;
+        margin-top: 10px;
+        background-color: var(--tb-ui-light-accent);
+        display: inline-block;
+        margin-left: 9px;
+        padding: 3px;
+        font-size: 12px;
+      }
+
+    </style>
+
+  </template>
+  <script>
+    Polymer({
+      is: "tf-text-loader",
+      properties: {
+        colorScale: Object,
+        run: String,
+        // This is an array of Tensorboard Text&Datum objects (See backend.ts for details). The
+        // properties of objects in this array are
+        // {
+        //   wall_time: Date,
+        //   step: number,
+        //   text: string,
+        // }
+        // they are ordered from most recent to oldest
+        _texts: {
+          type: Array,
+          value: [],
+        },
+
+      },
+      redraw: function() {
+        // Other dashboards logic requires a redraw method to be defined.
+      },
+      setVisibleSeries: function(runs) {
+        // Do nothing.
+      },
+      setSeriesData: function(run, texts) {
+        this.set("run", run);
+        this.set("_texts", texts.reverse());
+
+        // Update the border color based on the run.
+        var color = this.colorScale.scale(run);
+        this.$$("#outer").style.borderColor = color;
+      },
+      _numfmt: function(n) {
+        return d3.format(",")(n);
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
index 384fc6f44c..3ff60d5143 100644
--- a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/BUILD
@@ -1,62 +1,62 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load(
-    "//tensorflow/tensorboard:defs.bzl",
-    "tensorboard_ts_development_sources",
-    "tensorboard_ts_devserver",
-    "tensorboard_ts_library",
-    "tensorboard_webcomponent_library",
-)
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-tensorboard_ts_library(
-    name = "ts",
-    srcs = ["vz-distribution-chart.ts"],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps_d3v4",
-        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:ts",
-        "//third_party/javascript/lodash:lodash-module",
-        "//third_party/javascript/plottable/v3:bundle",
-    ],
-)
-
-tensorboard_webcomponent_library(
-    name = "vz_distribution_chart",
+web_library(
+    name = "vz_distribution_chart_d3v4",
     srcs = [
-        "demo.html",
+        "bundle.js",
         "vz-distribution-chart.html",
     ],
-    ts_lib_deps = [":ts"],
+    path = "/vz-distribution-chart",
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/plottable/v3:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable",
+        "//tensorflow/tensorboard/components/vz_line_chart_d3v4",
+        "@org_polymer",
     ],
 )
 
-tensorboard_webcomponent_library(
+web_library(
     name = "demo",
-    srcs = ["demo.html"],
-    visibility = ["//visibility:public"],
+    srcs = ["index.html"],
+    path = "/vz-distribution-chart",
     deps = [
-        ":vz_distribution_chart",
-        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        ":vz_distribution_chart_d3v4",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
     ],
 )
 
-tensorboard_ts_devserver(
-    name = "devserver",
-    manifest = ":dev_sources",
-    serving_path = "/demo_out/bundle.js",
-    static_files = [":demo"],
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/vz_line_chart_d3v4:bundle.d.ts",
+    ],
 )
 
-tensorboard_ts_development_sources(
-    name = "dev_sources",
-    deps = [":ts"],
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"VZ": [
+        "vz-distribution-chart.ts",
+    ]},
+    namespace_symbol_aliases = {"VZ": {
+        "Dataset": "Plottable.Dataset",
+        "ChartHelpers": "VZ.ChartHelpers",
+    }},
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/demo.html b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/index.html
similarity index 96%
rename from tensorflow/tensorboard/components/vz_distribution_chart_d3v4/demo.html
rename to tensorflow/tensorboard/components/vz_distribution_chart_d3v4/index.html
index 0a1a344056..39db09354b 100644
--- a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/demo.html
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/index.html
@@ -21,11 +21,10 @@ limitations under the License.
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>vz-distribution chart demo</title>
+    <script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="import" href="vz-distribution-chart.html">
-    <link rel="import" href="iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="paper-styles/typography.html">
-    <script src="bundle.js"></script>
-
+    <link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="../paper-styles/typography.html">
     <style type="text/css">
       body {
         font-family: "Roboto";
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html
index f274a4c24c..3c517bd164 100644
--- a/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html
+++ b/tensorflow/tensorboard/components/vz_distribution_chart_d3v4/vz-distribution-chart.html
@@ -15,8 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="plottable-library/plottable_css.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports/plottable.html">
+<link rel="import" href="../vz-line-chart/vz-line-chart.html">
 
 <dom-module id="vz-distribution-chart">
   <template>
@@ -40,4 +41,5 @@ limitations under the License.
 
     </style>
   </template>
+  <script src="bundle.js"></script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
index 4396fc0981..30adc0ad3a 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
@@ -1,16 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
 web_library(
-    name = "vz_histogram_timeseries",
-    srcs = [
-        "vz-histogram-timeseries.html",
-    ],
+    name = "vz_histogram_timeseries_d3v4",
+    srcs = ["vz-histogram-timeseries.html"],
     path = "/vz-histogram-timeseries",
     deps = [
         "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
@@ -18,22 +14,21 @@ web_library(
     ],
 )
 
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
 web_library(
     name = "demo",
-    srcs = ["demo.html"],
+    srcs = ["index.html"],
     path = "/vz-histogram-timeseries",
     deps = [
-        ":vz_histogram_timeseries",
+        ":vz_histogram_timeseries_d3v4",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_button",
         "@org_polymer_paper_styles",
         "@org_polymer_webcomponentsjs",
     ],
 )
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/demo.html b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/index.html
similarity index 100%
rename from tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/demo.html
rename to tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/index.html
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
index fd460b3608..f6690c3d7d 100644
--- a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
@@ -1,62 +1,68 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load(
-    "//tensorflow/tensorboard:defs.bzl",
-    "tensorboard_ts_development_sources",
-    "tensorboard_ts_devserver",
-    "tensorboard_ts_library",
-    "tensorboard_webcomponent_library",
-)
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-tensorboard_ts_library(
-    name = "ts",
+web_library(
+    name = "vz_line_chart_d3v4",
     srcs = [
-        "dragZoomInteraction.ts",
-        "vz-chart-helpers.ts",
-        "vz-line-chart.ts",
+        "bundle.js",
+        "vz-line-chart.html",
     ],
-    deps = [
-        "//tensorflow/tensorboard/components:common_deps_d3v4",
-        "//third_party/javascript/lodash:lodash-module",
-        "//third_party/javascript/plottable/v3:bundle",
-    ],
-)
-
-tensorboard_webcomponent_library(
-    name = "vz_line_chart",
-    srcs = ["vz-line-chart.html"],
-    ts_lib_deps = [":ts"],
+    path = "/vz-line-chart",
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/plottable/v3:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable",
+        "@org_polymer",
     ],
 )
 
-tensorboard_webcomponent_library(
+web_library(
     name = "demo",
-    srcs = ["demo.html"],
-    visibility = ["//visibility:public"],
+    srcs = ["index.html"],
+    path = "/vz-line-chart",
     deps = [
-        ":vz_line_chart",
-        "//third_party/javascript/polymer/v1/iron-demo-helpers:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        ":vz_line_chart_d3v4",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
     ],
 )
 
-tensorboard_ts_devserver(
-    name = "devserver",
-    manifest = ":dev_sources",
-    serving_path = "/demo_out/bundle.js",
-    static_files = [":demo"],
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
+    ],
 )
 
-tensorboard_ts_development_sources(
-    name = "dev_sources",
-    deps = [":ts"],
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {
+        "VZ.ChartHelpers": [
+            "vz-chart-helpers.ts",
+        ],
+        "VZ": [
+            "vz-line-chart.ts",
+            "dragZoomInteraction.ts",
+        ],
+    },
+    namespace_symbol_aliases = {
+        "VZ.ChartHelpers": {
+            "Dataset": "Plottable.Dataset",
+        },
+    },
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/demo.html b/tensorflow/tensorboard/components/vz_line_chart_d3v4/index.html
similarity index 99%
rename from tensorflow/tensorboard/components/vz_line_chart_d3v4/demo.html
rename to tensorflow/tensorboard/components/vz_line_chart_d3v4/index.html
index 4293e9791e..fb571a5183 100644
--- a/tensorflow/tensorboard/components/vz_line_chart_d3v4/demo.html
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/index.html
@@ -21,10 +21,10 @@ limitations under the License.
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>vz-line-chart demo</title>
+    <script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="import" href="vz-line-chart.html">
-    <link rel="import" href="iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="paper-styles/typography.html">
-    <script src="bundle.js"></script>
+    <link rel="import" href="../iron-demo-helpers/demo-snippet.html">
+    <link rel="import" href="../paper-styles/typography.html">
     <style type="text/css">
       body {
         font-family: "Roboto";
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html
index 13b46d8bbf..85e24ae4be 100644
--- a/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/vz-line-chart.html
@@ -15,8 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="polymer/polymer.html">
-<link rel="import" href="plottable-library/plottable_css.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports/d3.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../tf-imports/plottable.html">
+
 <!--
 vz-line-chart creates an element that draws a line chart for
 displaying event values.
@@ -122,4 +125,5 @@ such as different X scales (linear and temporal), tooltips and smoothing.
 
     </style>
   </template>
+  <script src="bundle.js"></script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
index d9703d080d..29a6244593 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
@@ -1,179 +1,354 @@
-package(default_visibility = [":projector_group"])
+package(default_visibility = ["//tensorflow:internal"])
 
-load(
-    "//tensorflow/tensorboard:defs.bzl",
-    "tensorboard_karma_web_test_suite",
-    "tensorboard_ts_config",
-    "tensorboard_ts_declaration",
-    "tensorboard_ts_development_sources",
-    "tensorboard_ts_library",
-    "tensorboard_webcomponent_library",
-)
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**"],
-        exclude = [
-            "OWNERS",
-            "tsconfig.json",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-# Visibility group for all clients of projector.
-package_group(
-    name = "projector_group",
-    packages = [
-        "//apps/labs/towerbridge/...",
-        "//experimental/bigpicture/projector/...",
-        "//java/com/google/apps/labs/towerbridge/...",
-        "//learning/vis/projector/...",
-        "//tensorflow/tensorboard/...",
-    ],
-)
-
-tensorboard_ts_declaration(
-    name = "external",
-    srcs = ["external.d.ts"],
-)
-
-tensorboard_ts_library(
-    name = "ts_lib",
-    srcs = glob(
-        ["*.ts"],
-        exclude = [
-            "*.d.ts",
-            "*_test.ts",
-            "bh_tsne.ts",
-            "sptree.ts",
-        ],
-    ),
-    runtime_deps = [
-        "//third_party/javascript/numericjs",
-        "//third_party/javascript/threejs/r77:threejs",
-        "//third_party/javascript/threejs/r77/examples/js/controls:orbitcontrols",
-        "//third_party/javascript/weblas",
-    ],
-    deps = [
-        ":external",
-        ":tsne_ts_lib",
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/typings/d3_v4:bundle",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/threejs:three",
-        "//third_party/javascript/typings/webcomponents_js",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "tsne_ts_lib",
+web_library(
+    name = "vz_projector_d3v4",
     srcs = [
-        "bh_tsne.ts",
-        "sptree.ts",
-    ],
-)
-
-_PROJECTOR_LIB_DEPS = [
-    "//third_party/javascript/polymer/v1/iron-collapse:lib",
-    "//third_party/javascript/polymer/v1/iron-icons:lib",
-    "//third_party/javascript/polymer/v1/paper-button:lib",
-    "//third_party/javascript/polymer/v1/paper-checkbox:lib",
-    "//third_party/javascript/polymer/v1/paper-dialog:lib",
-    "//third_party/javascript/polymer/v1/paper-dialog-scrollable:lib",
-    "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
-    "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-    "//third_party/javascript/polymer/v1/paper-input:lib",
-    "//third_party/javascript/polymer/v1/paper-item:lib",
-    "//third_party/javascript/polymer/v1/paper-listbox:lib",
-    "//third_party/javascript/polymer/v1/paper-slider:lib",
-    "//third_party/javascript/polymer/v1/paper-spinner:lib",
-    "//third_party/javascript/polymer/v1/paper-toast:lib",
-    "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
-    "//third_party/javascript/polymer/v1/paper-tooltip:lib",
-    "//third_party/javascript/polymer/v1/polymer:lib",
-]
-
-_PROJECTOR_DESTDIR = "vz-projector"
-
-_PROJECTOR_LIB_TS_LIB_DEPS = [
-    ":ts_lib",
-    ":tsne_ts_lib",
-]
-
-# Standalone embedding projector demos should depend on this target. We
-# exclude the HTML file for the dashboard itself. Demos do not need that
-# HTML file. This was introduced because standalone demos as of today
-# have an additional Closure pass that uses a compilation configuration
-# stricter than that of TensorBoard.
-tensorboard_webcomponent_library(
-    name = "lib",
-    srcs = glob(
-        ["*.html"],
-        exclude = ["vz-projector-dashboard.html"],
-    ),
-    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
-    destdir = _PROJECTOR_DESTDIR,
-    deps = _PROJECTOR_LIB_DEPS,
-)
-
-# TensorBoard, however, should depend on this target, which includes
-# the HTML file for the dashboard.
-tensorboard_webcomponent_library(
-    name = "lib_for_tensorboard",
-    srcs = glob(["*.html"]),
-    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
-    destdir = _PROJECTOR_DESTDIR,
-    deps = _PROJECTOR_LIB_DEPS,
-)
-
-### Tests ###
-
-tensorboard_ts_library(
-    name = "ts_test",
-    testonly = 1,
-    srcs = glob(["*_test.ts"]),
-    runtime_deps = [
-        "//third_party/javascript/polymer/v1/polymer:lib_all_js",
+        "bundle.html",
+        "bundle.js",
+        "styles.html",
+        "vz-projector.html",
+        "vz-projector-app.html",
+        "vz-projector-bookmark-panel.html",
+        "vz-projector-colab.html",
+        "vz-projector-dashboard.html",
+        "vz-projector-data-panel.html",
+        "vz-projector-input.html",
+        "vz-projector-inspector-panel.html",
+        "vz-projector-legend.html",
+        "vz-projector-metadata-card.html",
+        "vz-projector-projections-panel.html",
     ],
+    path = "/vz-projector",
+    visibility = ["//visibility:public"],
     deps = [
-        ":ts_lib",
-        ":tsne_ts_lib",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/jasmine:jasmine_without_externs",
-        "//third_party/javascript/typings/mocha",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:numericjs",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:threejs",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:weblas",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_iron_icons",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_checkbox",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_dialog_scrollable",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_input",
+        "@org_polymer_paper_item",
+        "@org_polymer_paper_listbox",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+        "@org_polymer_paper_styles",
+        "@org_polymer_paper_toast",
+        "@org_polymer_paper_toggle_button",
+        "@org_polymer_paper_tooltip",
     ],
 )
 
-tensorboard_ts_development_sources(
-    name = "dev_sources_for_test",
-    testonly = 1,
-    runtime_deps = [
-        "//third_party/javascript/chai",
-        "//third_party/javascript/mocha",
-    ],
-    deps = [
-        ":ts_test",
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "external.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "//third_party/javascript/typings/threejs:three.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
     ],
 )
 
-# To run locally, run :all_tests_local
-tensorboard_karma_web_test_suite(
-    name = "all_tests",
-    size = "medium",
-    browsers = ["//testing/web/browsers:chrome-linux"],
-    manifest = ":dev_sources_for_test",
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {
+        "VZ.Projector.Heap": ["heap.ts"],
+        "VZ.Projector.Label": ["label.ts"],
+        "VZ.Projector.SPTree": ["sptree.ts"],
+        "VZ.Projector.BhTsne": ["bh_tsne.ts"],
+        "VZ.Projector.Logging": ["logging.ts"],
+        "VZ.Projector.RenderContext": ["renderContext.ts"],
+        "VZ.Projector.ScatterPlotRectangleSelector": ["scatterPlotRectangleSelector.ts"],
+        "VZ.Projector.AnalyticsLogger": ["analyticsLogger.ts"],
+        "VZ.Projector.Util": ["util.ts"],
+        "VZ.Projector.Data": ["data.ts"],
+        "VZ.Projector.DataProvider": ["data-provider.ts"],
+        "VZ.Projector.DataProviderDemo": ["data-provider-demo.ts"],
+        "VZ.Projector.DataProviderProto": ["data-provider-proto.ts"],
+        "VZ.Projector.DataProviderServer": ["data-provider-server.ts"],
+        "VZ.Projector.Knn": ["knn.ts"],
+        "VZ.Projector.ProjectorEventContext": ["projectorEventContext.ts"],
+        "VZ.Projector.ScatterPlot": ["scatterPlot.ts"],
+        "VZ.Projector.ScatterPlotVisualizer3DLabels": ["scatterPlotVisualizer3DLabels.ts"],
+        "VZ.Projector.ScatterPlotVisualizerCanvasLabels": ["scatterPlotVisualizerCanvasLabels.ts"],
+        "VZ.Projector.ScatterPlotVisualizerPolylines": ["scatterPlotVisualizerPolylines.ts"],
+        "VZ.Projector.ScatterPlotVisualizerSprites": ["scatterPlotVisualizerSprites.ts"],
+        "VZ.Projector.ScatterPlotVisualizer": ["scatterPlotVisualizer.ts"],
+        "VZ.Projector.ProjectorScatterPlotAdapter": ["projectorScatterPlotAdapter.ts"],
+        "VZ.Projector.Vector": ["vector.ts"],
+        "VZ.Projector.ProjectorUtil": ["vz-projector-util.ts"],
+        "VZ.Projector.ProjectorBookmarkPanel": ["vz-projector-bookmark-panel.ts"],
+        "VZ.Projector.ProjectorDataPanel": ["vz-projector-data-panel.ts"],
+        "VZ.Projector.ProjectorInput": ["vz-projector-input.ts"],
+        "VZ.Projector.ProjectorInspectorPanel": ["vz-projector-inspector-panel.ts"],
+        "VZ.Projector.ProjectorLegend": ["vz-projector-legend.ts"],
+        "VZ.Projector.ProjectorMetadataCard": ["vz-projector-metadata-card.ts"],
+        "VZ.Projector.ProjectorProjectionsPanel": ["vz-projector-projections-panel.ts"],
+        "VZ.Projector": ["vz-projector.ts"],
+    },
+    namespace_symbol_aliases = {
+        "VZ.Projector.AnalyticsLogger": {
+            "ProjectionType": "VZ.Projector.Data.ProjectionType",
+        },
+        "VZ.Projector.BhTsne": {
+            "SPNode": "VZ.Projector.SPTree.SPNode",
+            "SPTree": "VZ.Projector.SPTree.SPTree",
+        },
+        "VZ.Projector.DataProviderDemo": {
+            "DataProvider": "VZ.Projector.DataProvider.DataProvider",
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "EmbeddingInfo": "VZ.Projector.DataProvider.EmbeddingInfo",
+            "ProjectorConfig": "VZ.Projector.DataProvider.ProjectorConfig",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "TENSORS_MSG_ID": "VZ.Projector.DataProvider.TENSORS_MSG_ID",
+            "dataProvider": "VZ.Projector.DataProvider",
+            "logging": "VZ.Projector.Logging",
+        },
+        "VZ.Projector.DataProviderProto": {
+            "DataPoint": "VZ.Projector.Data.DataPoint",
+            "DataProto": "VZ.Projector.Data.DataProto",
+            "DataProvider": "VZ.Projector.DataProvider.DataProvider",
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "PointMetadata": "VZ.Projector.Data.PointMetadata",
+            "ProjectorConfig": "VZ.Projector.DataProvider.ProjectorConfig",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "analyzeMetadata": "VZ.Projector.DataProvider.analyzeMetadata",
+        },
+        "VZ.Projector.DataProviderServer": {
+            "DataProvider": "VZ.Projector.DataProvider.DataProvider",
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "EmbeddingInfo": "VZ.Projector.DataProvider.EmbeddingInfo",
+            "ProjectorConfig": "VZ.Projector.DataProvider.ProjectorConfig",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "dataProvider": "VZ.Projector.DataProvider",
+            "logging": "VZ.Projector.Logging",
+        },
+        "VZ.Projector.DataProvider": {
+            "ColumnStats": "VZ.Projector.Data.ColumnStats",
+            "DataPoint": "VZ.Projector.Data.DataPoint",
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "PointMetadata": "VZ.Projector.Data.PointMetadata",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "logging": "VZ.Projector.Logging",
+            "runAsyncTask": "VZ.Projector.Util.runAsyncTask",
+        },
+        "VZ.Projector.Data": {
+            "SpriteMetadata": "VZ.Projector.DataProvider.SpriteMetadata",
+            "TSNE": "VZ.Projector.BhTsne.TSNE",
+            "knn": "VZ.Projector.Knn",
+            "logging": "VZ.Projector.Logging",
+            "scatterPlot": "VZ.Projector.ScatterPlot",
+            "util": "VZ.Projector.Util",
+            "vector": "VZ.Projector.Vector",
+        },
+        "VZ.Projector.Knn": {
+            "KMin": "VZ.Projector.Heap.KMin",
+            "Vector": "VZ.Projector.Vector.Vector",
+            "logging": "VZ.Projector.Logging",
+            "runAsyncTask": "VZ.Projector.Util.runAsyncTask",
+            "vector": "VZ.Projector.Vector",
+        },
+        "VZ.Projector.ProjectorEventContext": {
+            "DistanceFunction": "VZ.Projector.Data.DistanceFunction",
+            "NearestEntry": "VZ.Projector.Knn.NearestEntry",
+            "Projection": "VZ.Projector.Data.Projection",
+        },
+        "VZ.Projector.ProjectorScatterPlotAdapter": {
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "DistanceFunction": "VZ.Projector.Data.DistanceFunction",
+            "LabelRenderParams": "VZ.Projector.RenderContext.LabelRenderParams",
+            "NearestEntry": "VZ.Projector.Knn.NearestEntry",
+            "Projection": "VZ.Projector.Data.Projection",
+            "ProjectionComponents3D": "VZ.Projector.Data.ProjectionComponents3D",
+            "ProjectorEventContext": "VZ.Projector.ProjectorEventContext.ProjectorEventContext",
+            "ScatterPlot": "VZ.Projector.ScatterPlot.ScatterPlot",
+            "ScatterPlotVisualizer3DLabels": "VZ.Projector.ScatterPlotVisualizer3DLabels.ScatterPlotVisualizer3DLabels",
+            "ScatterPlotVisualizerCanvasLabels": "VZ.Projector.ScatterPlotVisualizerCanvasLabels.ScatterPlotVisualizerCanvasLabels",
+            "ScatterPlotVisualizerPolylines": "VZ.Projector.ScatterPlotVisualizerPolylines.ScatterPlotVisualizerPolylines",
+            "ScatterPlotVisualizerSprites": "VZ.Projector.ScatterPlotVisualizerSprites.ScatterPlotVisualizerSprites",
+            "State": "VZ.Projector.Data.State",
+            "vector": "VZ.Projector.Vector",
+        },
+        "VZ.Projector.ScatterPlot": {
+            "BoundingBox": "VZ.Projector.ScatterPlotRectangleSelector.BoundingBox",
+            "CameraType": "VZ.Projector.RenderContext.CameraType",
+            "LabelRenderParams": "VZ.Projector.RenderContext.LabelRenderParams",
+            "Point2D": "VZ.Projector.Vector.Point2D",
+            "Point3D": "VZ.Projector.Vector.Point3D",
+            "ProjectorEventContext": "VZ.Projector.ProjectorEventContext.ProjectorEventContext",
+            "RenderContext": "VZ.Projector.RenderContext.RenderContext",
+            "ScatterPlotRectangleSelector": "VZ.Projector.ScatterPlotRectangleSelector.ScatterPlotRectangleSelector",
+            "ScatterPlotVisualizer": "VZ.Projector.ScatterPlotVisualizer.ScatterPlotVisualizer",
+            "util": "VZ.Projector.Util",
+        },
+        "VZ.Projector.ScatterPlotVisualizer3DLabels": {
+            "RenderContext": "VZ.Projector.RenderContext.RenderContext",
+            "ScatterPlotVisualizer": "VZ.Projector.ScatterPlotVisualizer.ScatterPlotVisualizer",
+            "util": "VZ.Projector.Util",
+        },
+        "VZ.Projector.ScatterPlotVisualizerCanvasLabels": {
+            "BoundingBox": "VZ.Projector.Label.BoundingBox",
+            "CameraType": "VZ.Projector.RenderContext.CameraType",
+            "CollisionGrid": "VZ.Projector.Label.CollisionGrid",
+            "RenderContext": "VZ.Projector.RenderContext.RenderContext",
+            "ScatterPlotVisualizer": "VZ.Projector.ScatterPlotVisualizer.ScatterPlotVisualizer",
+            "util": "VZ.Projector.Util",
+        },
+        "VZ.Projector.ScatterPlotVisualizerPolylines": {
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "RenderContext": "VZ.Projector.RenderContext.RenderContext",
+            "ScatterPlotVisualizer": "VZ.Projector.ScatterPlotVisualizer.ScatterPlotVisualizer",
+            "util": "VZ.Projector.Util",
+        },
+        "VZ.Projector.ScatterPlotVisualizerSprites": {
+            "CameraType": "VZ.Projector.RenderContext.CameraType",
+            "RenderContext": "VZ.Projector.RenderContext.RenderContext",
+            "ScatterPlotVisualizer": "VZ.Projector.ScatterPlotVisualizer.ScatterPlotVisualizer",
+            "util": "VZ.Projector.Util",
+        },
+        "VZ.Projector.ScatterPlotVisualizer": {
+            "RenderContext": "VZ.Projector.RenderContext.RenderContext",
+        },
+        "VZ.Projector.Util": {
+            "DataPoint": "VZ.Projector.Data.DataPoint",
+            "Point2D": "VZ.Projector.Vector.Point2D",
+            "logging": "VZ.Projector.Logging",
+        },
+        "VZ.Projector.Vector": {
+            "assert": "VZ.Projector.Util.assert",
+        },
+        "VZ.Projector.ProjectorBookmarkPanel": {
+            "DataProvider": "VZ.Projector.DataProvider.DataProvider",
+            "EmbeddingInfo": "VZ.Projector.DataProvider.EmbeddingInfo",
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+            "Projector": "VZ.Projector.Projector",
+            "ProjectorEventContext": "VZ.Projector.ProjectorEventContext.ProjectorEventContext",
+            "State": "VZ.Projector.Data.State",
+            "logging": "VZ.Projector.Logging",
+        },
+        "VZ.Projector.ProjectorDataPanel": {
+            "ColorLegendRenderInfo": "VZ.Projector.ProjectorLegend.ColorLegendRenderInfo",
+            "ColorLegendThreshold": "VZ.Projector.ProjectorLegend.ColorLegendThreshold",
+            "ColorOption": "VZ.Projector.Data.ColorOption",
+            "ColumnStats": "VZ.Projector.Data.ColumnStats",
+            "DataProvider": "VZ.Projector.DataProvider.DataProvider",
+            "EmbeddingInfo": "VZ.Projector.DataProvider.EmbeddingInfo",
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+            "Projector": "VZ.Projector.Projector",
+            "ProjectorConfig": "VZ.Projector.DataProvider.ProjectorConfig",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "parseRawMetadata": "VZ.Projector.DataProvider.parseRawMetadata",
+            "parseRawTensors": "VZ.Projector.DataProvider.parseRawTensors",
+            "util": "VZ.Projector.Util",
+        },
+        "VZ.Projector.ProjectorInput": {
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+        },
+        "VZ.Projector.ProjectorInspectorPanel": {
+            "DistanceFunction": "VZ.Projector.Data.DistanceFunction",
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+            "Projector": "VZ.Projector.Projector",
+            "ProjectorEventContext": "VZ.Projector.ProjectorEventContext.ProjectorEventContext",
+            "ProjectorInput": "VZ.Projector.ProjectorInput.ProjectorInput",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "adapter": "VZ.Projector.ProjectorScatterPlotAdapter",
+            "knn": "VZ.Projector.Knn",
+            "util": "VZ.Projector.Util",
+            "vector": "VZ.Projector.Vector",
+        },
+        "VZ.Projector.ProjectorLegend": {
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+        },
+        "VZ.Projector.ProjectorMetadataCard": {
+            "PointMetadata": "VZ.Projector.Data.PointMetadata",
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+        },
+        "VZ.Projector.ProjectorProjectionsPanel": {
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+            "Projection": "VZ.Projector.Data.Projection",
+            "ProjectionType": "VZ.Projector.Data.ProjectionType",
+            "Projector": "VZ.Projector.Projector",
+            "ProjectorInput": "VZ.Projector.ProjectorInput.ProjectorInput",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "Vector": "VZ.Projector.Vector.Vector",
+            "data": "VZ.Projector.Data",
+            "util": "VZ.Projector.Util",
+            "vector": "VZ.Projector.Vector",
+        },
+        "VZ.Projector": {
+            "AnalyticsLogger": "VZ.Projector.AnalyticsLogger.AnalyticsLogger",
+            "BookmarkPanel": "VZ.Projector.ProjectorBookmarkPanel.BookmarkPanel",
+            "ColorOption": "VZ.Projector.Data.ColorOption",
+            "ColumnStats": "VZ.Projector.Data.ColumnStats",
+            "DataPanel": "VZ.Projector.ProjectorDataPanel.DataPanel",
+            "DataPoint": "VZ.Projector.Data.DataPoint",
+            "DataProto": "VZ.Projector.Data.DataProto",
+            "DataProvider": "VZ.Projector.DataProvider.DataProvider",
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "DemoDataProvider": "VZ.Projector.DataProviderDemo.DemoDataProvider",
+            "DistanceFunction": "VZ.Projector.Data.DistanceFunction",
+            "DistanceMetricChangedListener": "VZ.Projector.ProjectorEventContext.DistanceMetricChangedListener",
+            "EmbeddingInfo": "VZ.Projector.DataProvider.EmbeddingInfo",
+            "HoverListener": "VZ.Projector.ProjectorEventContext.HoverListener",
+            "InspectorPanel": "VZ.Projector.ProjectorInspectorPanel.InspectorPanel",
+            "MetadataCard": "VZ.Projector.ProjectorMetadataCard.MetadataCard",
+            "MouseMode": "VZ.Projector.ScatterPlot.MouseMode",
+            "PointMetadata": "VZ.Projector.Data.PointMetadata",
+            "PolymerElement": "VZ.Projector.ProjectorUtil.PolymerElement",
+            "PolymerHTMLElement": "VZ.Projector.ProjectorUtil.PolymerHTMLElement",
+            "Projection": "VZ.Projector.Data.Projection",
+            "ProjectionChangedListener": "VZ.Projector.ProjectorEventContext.ProjectionChangedListener",
+            "ProjectionsPanel": "VZ.Projector.ProjectorProjectionsPanel.ProjectionsPanel",
+            "ProjectorEventContext": "VZ.Projector.ProjectorEventContext.ProjectorEventContext",
+            "ProjectorScatterPlotAdapter": "VZ.Projector.ProjectorScatterPlotAdapter.ProjectorScatterPlotAdapter",
+            "ProtoDataProvider": "VZ.Projector.DataProviderProto.ProtoDataProvider",
+            "SelectionChangedListener": "VZ.Projector.ProjectorEventContext.SelectionChangedListener",
+            "ServerDataProvider": "VZ.Projector.DataProviderServer.ServerDataProvider",
+            "ServingMode": "VZ.Projector.DataProvider.ServingMode",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "data": "VZ.Projector.Data",
+            "knn": "VZ.Projector.Knn",
+            "logging": "VZ.Projector.Logging",
+            "stateGetAccessorDimensions": "VZ.Projector.Data.stateGetAccessorDimensions",
+            "util": "VZ.Projector.Util",
+        },
+    },
 )
 
-# Generate a TypeScript IDE project by running this target.
-tensorboard_ts_config(
-    name = "tsconfig",
-    deps = [
-        ":ts_lib",
-        ":ts_test",
-        ":tsne_ts_lib",
-    ],
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
 )
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts
index 9d2df65f56..063d57ec40 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/bh_tsne.ts
@@ -22,6 +22,7 @@ limitations under the License.
  */
 
 /**
+ * @license
  * The MIT License (MIT)
  * Copyright (c) 2015 Andrej Karpathy
  * Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/bundle.html b/tensorflow/tensorboard/components/vz_projector_d3v4/bundle.html
new file mode 100644
index 0000000000..2837fed870
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/bundle.html
@@ -0,0 +1,24 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-imports/d3.html">
+<link rel="import" href="../tf-imports/numericjs.html">
+<link rel="import" href="../tf-imports/threejs.html">
+<link rel="import" href="../tf-imports/weblas.html">
+
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts
index bb09e2b153..9d6df953d6 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/projectorScatterPlotAdapter.ts
@@ -378,8 +378,8 @@ export class ProjectorScatterPlotAdapter {
     }
 
     return new LabelRenderParams(
-        visibleLabels, labelStrings, scale, opacityFlags, LABEL_FONT_SIZE,
-        fillColors, strokeColors);
+        new Float32Array(visibleLabels), labelStrings, scale, opacityFlags,
+        LABEL_FONT_SIZE, fillColors, strokeColors);
   }
 
   generatePointScaleFactorArray(
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts
index 8adc9a9bd2..be9c1703c7 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizerSprites.ts
@@ -330,7 +330,7 @@ export class ScatterPlotVisualizerSprites implements ScatterPlotVisualizer {
 
   setSpriteAtlas(
       spriteImage: HTMLImageElement, spriteDimensions: [number, number],
-      spriteIndices: Uint8Array) {
+      spriteIndices: Float32Array) {
     this.disposeTextureAtlas();
     this.createTextureFromSpriteAtlas(
         spriteImage, spriteDimensions, spriteIndices);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD
new file mode 100644
index 0000000000..3536893748
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD
@@ -0,0 +1,81 @@
+package(
+    default_testonly = True,
+    default_visibility = ["//tensorflow:internal"],
+)
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "test",
+    srcs = [
+        "bundle.js",
+        "tests.html",
+    ],
+    path = "/vz-projector/test",
+    deps = [
+        "//tensorflow/tensorboard/components/vz_projector_d3v4",
+        "@org_npmjs_registry_web_component_tester",
+        "@org_polymer",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:chai.d.ts",
+        "@org_definitelytyped//:mocha.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "//third_party/javascript/typings/threejs:three.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
+        "//tensorflow/tensorboard/components/vz_projector_d3v4:bundle.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {
+        "VZ.Projector.Test": [
+            "assert.ts",
+            "sptree_test.ts",
+            "data_test.ts",
+            "data-provider_test.ts",
+            "util_test.ts",
+
+            # TODO(smilkov): Migrate these away from jasmine.
+            # "scatterPlotRectangleSelector_test.ts",
+            # "vz-projector-projections-panel_test.ts",
+        ],
+    },
+    namespace_symbol_aliases = {
+        "VZ.Projector.Test": {
+            "BoundingBox": "VZ.Projector.ScatterPlotRectangleSelector.BoundingBox",
+            "DataPoint": "VZ.Projector.Data.DataPoint",
+            "DataSet": "VZ.Projector.Data.DataSet",
+            "ProjectionsPanel": "VZ.Projector.ProjectorProjectionsPanel.ProjectionsPanel",
+            "SPTree": "VZ.Projector.SPTree.SPTree",
+            "ScatterPlotRectangleSelector": "VZ.Projector.ScatterPlotRectangleSelector.ScatterPlotRectangleSelector",
+            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
+            "State": "VZ.Projector.Data.State",
+            "State": "VZ.Projector.Data.State",
+            "data_provider": "VZ.Projector.DataProvider",
+            "stateGetAccessorDimensions": "VZ.Projector.Data.stateGetAccessorDimensions",
+            "util": "VZ.Projector.Util",
+        },
+    },
+)
+
+filegroup(
+    name = "all_files",
+    testonly = 0,
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/test/assert.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/test/assert.ts
new file mode 100644
index 0000000000..f489517a7f
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/assert.ts
@@ -0,0 +1,16 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+const assert = chai.assert;
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/test/data-provider_test.ts
similarity index 53%
rename from tensorflow/tensorboard/components/vz_projector_d3v4/data-provider_test.ts
rename to tensorflow/tensorboard/components/vz_projector_d3v4/test/data-provider_test.ts
index 01b89ca700..59a42ffbfd 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/data-provider_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/data-provider_test.ts
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {DataPoint, SpriteAndMetadataInfo} from './data';
-import * as data_provider from './data-provider';
+import {DataPoint, SpriteAndMetadataInfo} from '../data';
+import * as data_provider from '../data-provider';
 
 /**
  * Converts a string to an ArrayBuffer.
@@ -48,15 +48,15 @@ describe('parse tensors', () => {
         .then((tensorsArrayBuffer: ArrayBuffer) => {
           data_provider.parseTensors(tensorsArrayBuffer)
               .then((data: DataPoint[]) => {
-                expect(data.length).toBe(2);
+                assert.equal(2, data.length);
 
-                expect(data[0].vector).toEqual(new Float32Array(tensors[0]));
-                expect(data[0].index).toEqual(0);
-                expect(data[0].projections).toBeNull();
+                assert.deepEqual(new Float32Array(tensors[0]), data[0].vector);
+                assert.equal(0, data[0].index);
+                assert.isNull(data[0].projections);
 
-                expect(data[1].vector).toEqual(new Float32Array(tensors[1]));
-                expect(data[1].index).toEqual(1);
-                expect(data[1].projections).toBeNull();
+                assert.deepEqual(new Float32Array(tensors[1]), data[1].vector);
+                assert.equal(1, data[1].index);
+                assert.isNull(data[1].projections);
                 doneFn();
               });
         });
@@ -68,27 +68,27 @@ describe('parse tensors', () => {
         .then((metadataArrayBuffer: ArrayBuffer) => {
           data_provider.parseMetadata(metadataArrayBuffer)
               .then((spriteAndMetadataInfo: SpriteAndMetadataInfo) => {
-                expect(spriteAndMetadataInfo.stats.length).toBe(2);
-                expect(spriteAndMetadataInfo.stats[0].name)
-                    .toBe(metadata[0][0]);
-                expect(spriteAndMetadataInfo.stats[0].isNumeric).toBe(false);
-                expect(spriteAndMetadataInfo.stats[0].tooManyUniqueValues)
-                    .toBe(false);
-                expect(spriteAndMetadataInfo.stats[1].name)
-                    .toBe(metadata[0][1]);
-                expect(spriteAndMetadataInfo.stats[1].isNumeric).toBe(true);
-                expect(spriteAndMetadataInfo.stats[1].tooManyUniqueValues)
-                    .toBe(false);
+                assert.equal(2, spriteAndMetadataInfo.stats.length);
+                assert.equal(metadata[0][0],
+                             spriteAndMetadataInfo.stats[0].name);
+                assert.isFalse(spriteAndMetadataInfo.stats[0].isNumeric);
+                assert.isFalse(
+                    spriteAndMetadataInfo.stats[0].tooManyUniqueValues);
+                assert.equal(metadata[0][1],
+                             spriteAndMetadataInfo.stats[1].name);
+                assert.isTrue(spriteAndMetadataInfo.stats[1].isNumeric);
+                assert.isFalse(
+                    spriteAndMetadataInfo.stats[1].tooManyUniqueValues);
 
-                expect(spriteAndMetadataInfo.pointsInfo.length).toBe(2);
-                expect(spriteAndMetadataInfo.pointsInfo[0]['label'])
-                    .toBe(metadata[1][0]);
-                expect(spriteAndMetadataInfo.pointsInfo[0]['fakecol'])
-                    .toBe(+metadata[1][1]);
-                expect(spriteAndMetadataInfo.pointsInfo[1]['label'])
-                    .toBe(metadata[2][0]);
-                expect(spriteAndMetadataInfo.pointsInfo[1]['fakecol'])
-                    .toBe(+metadata[2][1]);
+                assert.equal(2, spriteAndMetadataInfo.pointsInfo.length);
+                assert.equal(metadata[1][0],
+                             spriteAndMetadataInfo.pointsInfo[0]['label']);
+                assert.equal(+metadata[1][1],
+                             spriteAndMetadataInfo.pointsInfo[0]['fakecol']);
+                assert.equal(metadata[2][0],
+                             spriteAndMetadataInfo.pointsInfo[1]['label']);
+                assert.equal(+metadata[2][1],
+                             spriteAndMetadataInfo.pointsInfo[1]['fakecol']);
                 doneFn();
               });
         });
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/data_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/test/data_test.ts
similarity index 80%
rename from tensorflow/tensorboard/components/vz_projector_d3v4/data_test.ts
rename to tensorflow/tensorboard/components/vz_projector_d3v4/test/data_test.ts
index 924ae3a929..5e47c091c5 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/data_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/data_test.ts
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {DataPoint, DataSet, State, stateGetAccessorDimensions} from './data';
+import {DataPoint, DataSet, State, stateGetAccessorDimensions} from '../data';
 
 /**
  * Helper method that makes a list of points given an array of
@@ -44,8 +44,8 @@ describe('constructor_with_sequences', () => {
     // one sequence 0->2->3.
     const points = makePointsWithSequences([2, -1, 3, -1]);
     let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(1);
-    expect(dataset.sequences[0].pointIndices).toEqual([0, 2, 3]);
+    assert.equal(1, dataset.sequences.length);
+    assert.deepEqual([0, 2, 3], dataset.sequences[0].pointIndices);
   });
 
   it('Simple forward pointing sequences, __next__ metadata format', () => {
@@ -53,14 +53,14 @@ describe('constructor_with_sequences', () => {
     // one sequence 0->2->3.
     const points = makePointsWithSequences([2, -1, 3, -1], '__next__');
     let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(1);
-    expect(dataset.sequences[0].pointIndices).toEqual([0, 2, 3]);
+    assert.equal(1, dataset.sequences.length);
+    assert.deepEqual([0, 2, 3], dataset.sequences[0].pointIndices);
   });
 
   it('No sequences', () => {
     let points = makePointsWithSequences([-1, -1, -1, -1]);
     let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(0);
+    assert.equal(0, dataset.sequences.length);
   });
 
   it('A sequence that goes backwards and forward in the array', () => {
@@ -68,8 +68,8 @@ describe('constructor_with_sequences', () => {
     // one sequence 3->1->0->2.
     let points = makePointsWithSequences([2, 0, -1, 1]);
     let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(1);
-    expect(dataset.sequences[0].pointIndices).toEqual([3, 1, 0, 2]);
+    assert.equal(1, dataset.sequences.length);
+    assert.deepEqual([3, 1, 0, 2], dataset.sequences[0].pointIndices);
   });
 });
 
@@ -78,27 +78,27 @@ describe('stateGetAccessorDimensions', () => {
     const state = new State();
     state.selectedProjection = 'tsne';
     state.tSNEis3d = false;
-    expect(stateGetAccessorDimensions(state)).toEqual([0, 1]);
+    assert.deepEqual([0, 1], stateGetAccessorDimensions(state));
   });
 
   it('returns [0, 1, 2] for 3d t-SNE', () => {
     const state = new State();
     state.selectedProjection = 'tsne';
     state.tSNEis3d = true;
-    expect(stateGetAccessorDimensions(state)).toEqual([0, 1, 2]);
+    assert.deepEqual([0, 1, 2], stateGetAccessorDimensions(state));
   });
 
   it('returns pca component dimensions array for pca', () => {
     const state = new State();
     state.selectedProjection = 'pca';
     state.pcaComponentDimensions = [13, 12, 11, 10];
-    expect(stateGetAccessorDimensions(state))
-        .toEqual(state.pcaComponentDimensions);
+    assert.deepEqual(state.pcaComponentDimensions,
+                     stateGetAccessorDimensions(state));
   });
 
   it('returns ["x", "y"] for custom projections', () => {
     const state = new State();
     state.selectedProjection = 'custom';
-    expect(stateGetAccessorDimensions(state)).toEqual(['x', 'y']);
+    assert.deepEqual(['x', 'y'], stateGetAccessorDimensions(state));
   });
 });
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/test/scatterPlotRectangleSelector_test.ts
similarity index 96%
rename from tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector_test.ts
rename to tensorflow/tensorboard/components/vz_projector_d3v4/test/scatterPlotRectangleSelector_test.ts
index 91cb10a97e..0ee6cf620d 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotRectangleSelector_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/scatterPlotRectangleSelector_test.ts
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {BoundingBox, ScatterPlotRectangleSelector} from './scatterPlotRectangleSelector';
+import {BoundingBox, ScatterPlotRectangleSelector} from '../scatterPlotRectangleSelector';
 
 describe('selector callbacks make bounding box start bottom left', () => {
   let containerElement: HTMLElement;
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/sptree_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/test/sptree_test.ts
similarity index 97%
rename from tensorflow/tensorboard/components/vz_projector_d3v4/sptree_test.ts
rename to tensorflow/tensorboard/components/vz_projector_d3v4/test/sptree_test.ts
index 440680bdf1..7e340ea62f 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/sptree_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/sptree_test.ts
@@ -13,9 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {SPTree} from './sptree';
-
-const assert = chai.assert;
+import {SPTree} from '../sptree';
 
 it('simple 2D data', () => {
   let data = [
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/test/tests.html b/tensorflow/tensorboard/components/vz_projector_d3v4/test/tests.html
new file mode 100644
index 0000000000..dd43079bde
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/tests.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta charset="utf-8">
+<script src="../../web-component-tester/browser.js"></script>
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../bundle.html">
+<body>
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/util_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/test/util_test.ts
similarity index 79%
rename from tensorflow/tensorboard/components/vz_projector_d3v4/util_test.ts
rename to tensorflow/tensorboard/components/vz_projector_d3v4/test/util_test.ts
index f7c0027c81..c18db95eed 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/util_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/util_test.ts
@@ -12,31 +12,31 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-import * as util from './util';
+import * as util from '../util';
 
 describe('getURLParams', () => {
   it('search query with valid param returns correct object', () => {
     let urlParams = util.getURLParams('?config=http://google.com/');
-    expect(urlParams).toEqual({'config': 'http://google.com/'});
+    assert.deepEqual({'config': 'http://google.com/'}, urlParams);
   });
 
   it('search query with multiple valid params returns correct object', () => {
     let urlParams = util.getURLParams('?config=http://google.com/&foo=bar');
-    expect(urlParams).toEqual({'config': 'http://google.com/', 'foo': 'bar'});
+    assert.deepEqual({'config': 'http://google.com/', 'foo': 'bar'}, urlParams);
   });
 
   it('search query with valid param with URL encoded characters', () => {
     let urlParams = util.getURLParams('?config=http://google.com/%20search');
-    expect(urlParams).toEqual({'config': 'http://google.com/ search'});
+    assert.deepEqual({'config': 'http://google.com/ search'}, urlParams);
   });
 
   it('search query with pound sign', () => {
     let urlParams = util.getURLParams('?config=http://google.com/#foo');
-    expect(urlParams).toEqual({'config': 'http://google.com/'});
+    assert.deepEqual({'config': 'http://google.com/'}, urlParams);
   });
 
   it('no search query returns empty object', () => {
     let urlParams = util.getURLParams('');
-    expect(urlParams).toEqual({});
+    assert.deepEqual({}, urlParams);
   });
 });
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel_test.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/test/vz-projector-projections-panel_test.ts
similarity index 96%
rename from tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel_test.ts
rename to tensorflow/tensorboard/components/vz_projector_d3v4/test/vz-projector-projections-panel_test.ts
index fd1acf6f08..2bf0c6eb48 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-projections-panel_test.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/vz-projector-projections-panel_test.ts
@@ -12,10 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
-import {State} from './data';
-import {ProjectionsPanel} from './vz-projector-projections-panel';
-
-const assert = chai.assert;
+import {State} from '../data';
+import {ProjectionsPanel} from '../vz-projector-projections-panel';
 
 describe('restoreUIFromBookmark', () => {
   let projectionsPanel: ProjectionsPanel;
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD b/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
index 6e6ce525b4..189a6a69ac 100644
--- a/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
@@ -1,23 +1,30 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
 
-tensorboard_ts_library(
+web_library(
+    name = "vz_sorting_d3v4",
+    srcs = [
+        "bundle.js",
+        "vz-sorting.html",
+    ],
+    path = "/vz-sorting",
+    visibility = ["//visibility:public"],
+)
+
+tensorboard_typescript_genrule(
     name = "ts",
-    srcs = ["sorting.ts"],
+    srcs = ["bundle.ts"],
 )
 
-tensorboard_ts_library(
-    name = "tests",
-    srcs = ["sortingTests.ts"],
-    deps = [
-        ":ts",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/sinon",
-    ],
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"VZ.Sorting": ["sorting.ts"]},
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/test/BUILD b/tensorflow/tensorboard/components/vz_sorting_d3v4/test/BUILD
new file mode 100644
index 0000000000..4993cf841d
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/test/BUILD
@@ -0,0 +1,46 @@
+package(
+    default_testonly = True,
+    default_visibility = ["//tensorflow:internal"],
+)
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "test",
+    srcs = [
+        "bundle.js",
+        "tests.html",
+    ],
+    path = "/vz-sorting/test",
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4",
+        "@org_npmjs_registry_web_component_tester",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = ["bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:mocha.d.ts",
+        "@org_definitelytyped//:chai.d.ts",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:bundle.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "bundle",
+    out = "bundle.ts",
+    namespace_srcs = {"VZ.Sorting": ["sortingTests.ts"]},
+)
+
+filegroup(
+    name = "all_files",
+    testonly = 0,
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/sortingTests.ts b/tensorflow/tensorboard/components/vz_sorting_d3v4/test/sortingTests.ts
similarity index 97%
rename from tensorflow/tensorboard/components/vz_sorting_d3v4/sortingTests.ts
rename to tensorflow/tensorboard/components/vz_sorting_d3v4/test/sortingTests.ts
index 4cfbfeb4ea..510685cb4b 100644
--- a/tensorflow/tensorboard/components/vz_sorting_d3v4/sortingTests.ts
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/test/sortingTests.ts
@@ -13,12 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {compareTagNames} from './sorting';
-
-const assert = chai.assert;
+import {compareTagNames} from '../sorting';
 
 describe('compareTagNames', () => {
 
+  const assert = chai.assert;
   const sortTagNames = (a) => a.sort(compareTagNames);
 
   it('is asciibetical', () => {
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/tests.html b/tensorflow/tensorboard/components/vz_sorting_d3v4/test/tests.html
similarity index 90%
rename from tensorflow/tensorboard/components/vz_sorting_d3v4/tests.html
rename to tensorflow/tensorboard/components/vz_sorting_d3v4/test/tests.html
index 7148bfb418..d1b4a1db31 100644
--- a/tensorflow/tensorboard/components/vz_sorting_d3v4/tests.html
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/test/tests.html
@@ -19,5 +19,5 @@ limitations under the License.
 <meta charset="utf-8">
 <script src="../../web-component-tester/browser.js"></script>
 <body>
-<script src="../sorting.js"></script>
-<script src="sortingTests.js"></script>
+<script src="../bundle.js"></script>
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/vz-sorting.html b/tensorflow/tensorboard/components/vz_sorting_d3v4/vz-sorting.html
new file mode 100644
index 0000000000..9f925951cb
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/vz-sorting.html
@@ -0,0 +1,18 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/demo/BUILD b/tensorflow/tensorboard/demo/BUILD
new file mode 100644
index 0000000000..66065af044
--- /dev/null
+++ b/tensorflow/tensorboard/demo/BUILD
@@ -0,0 +1,20 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# THIS PACKAGE HAS MOVED
+# See tensorflow/tensorboard/components/tf_tensorboard_d3v4:demo
+
+web_library(
+    name = "demo_data",
+    srcs = glob(["data/**"]),
+    path = "/",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/demo/data/logdir b/tensorflow/tensorboard/demo/data/logdir
new file mode 100644
index 0000000000..b6362b45d7
--- /dev/null
+++ b/tensorflow/tensorboard/demo/data/logdir
@@ -0,0 +1 @@
+{"logdir": "/foo/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/demo/index.html b/tensorflow/tensorboard/demo/index.html
deleted file mode 100644
index 581f8a2723..0000000000
--- a/tensorflow/tensorboard/demo/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<!-- This demo index file serves statically serialized TensorBoard json.
-It is essentially a mocked version of the TensorBoard backend. -->
-<html>
-<head>
-  <script src="../components/webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="import" href="../components/tf_tensorboard/tf-tensorboard.html">
-    <link rel="stylesheet" type="text/css" href="../lib/css/global.css">
-    <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMQAAADECAMAAAD3eH5ZAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAD/UExURfFlKfaELvFmKfNyK/67NvWALf68Nv69NvNxK/20NfyyNP22NfN0K/JrKvqhMv2zNf25Nf24Nf23NfeOL/yzNPyvNPJoKviWMPmeMfN1K/WBLfePL/FnKfeML/qlMvR7LPmcMfeLL/aJLvR5LPFoKfJuKvR3LP66NvywNPeNL/V/LfaILv21Nf26NfNzK/NvK/R6LPmaMfyxNPqfMvV+LfurM/iSMPmbMfJvKvmdMfumM/qiMvmZMfytNPJqKvysNPN2K/iYMPNwK/upM/JtKvJsKviVMPaHLvaGLvJpKvR8LPaKLvqkMvuqM/aFLvR4LPuoM/iTMPWDLfiRMPmYMXS0ngkAAALoSURBVHja7drnctpAFIbhFUISSKJ3MKYa0+y4xTW9937/15JkJhlTjhrSrHRmvuf/as6L0YLFCgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBJ6njenqspzgnPrsrGX9Zpi2tCrmnc6+dYNthVY5WpMmxQLWPdMsOuYVwzNj3ei2t3mQwaV43BJPDCS2NbJ5aEeuX/+9qcjQOtfFIkIkrvY2g4MVcmOBsFWbowKO/kNyj62gRpJcDaPBlxLr1B0zdG0C/8LzbJiJrshuvy1gzlA9+rD8mIkuyIJjFE3/dqnYwoSm7IUEPoD/wut8iIguSIDjlFxe/yfXL5vuSI21BTZLLhXoOILMO8Hxwa/L8bI0LfmUdhGowb2ZvT0e57pFNDgB06IlVyjmmIBl2T/nl9Rw6SD9GgSG/Q0uQkaW3XhmovKQ3eFQ4N2Uo9OQ1eFZsNerf7vP+rO4rhmY1Lg3vFVoP8+8BXg1sFnwbnCk4NThW8GuiKBDdkVVtTNFvNelVsNqTbyWnIOM2oeTRoyWvwmpJHg/ucXBrcJuXT4DwrpwZi2vy0VCx8YtXg/D2bU4OfiuQ3eFfE2KD4bfCqiLNB993gXsGlwa2CT4NzBacGIVQ6YsipQdh0xEdODUKjIxrSp88onZ8zbbFLg1DoiFO5BXvDGv2My9/JhUT8JUZTI0yDaNHLBzIbvqTDNYhUiVw/kdjQ1kM2CHFDPjKW+KzyRTF0g/ga9w9y+fANQpxvX8CU+Ny7FUWDeF3Y+g3lROIf4k0UDX9eCyvO531PyYhHga9zvPZJU5b73Y/eXj8Hv9D48n6HaF5LbcjRt8TZTtda5M1DfXnbkX1C0SHCFKzQB5Fe8op4GNGNHavvZESbVwT5r6W1xyuCPBY3Y9YgDqzknH/e3YfNzzuL30l0IebrZ5kKtuDIXt1n868ET6kf3/49tLvrCcZyF8Pu215dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcPIbNrBhOaBXucoAAAAASUVORK5CYII=">
-</head>
-<body>
-  <tf-tensorboard demo-dir="data/" use-hash></tf-tensorboard>
-</body>
-</html>
-- 
GitLab


From ee112cff56081fb9d0b74c987a8935acc360b05c Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Wed, 10 May 2017 21:12:21 -0700
Subject: [PATCH 1214/1563] Merge changes from github.

PiperOrigin-RevId: 155709893
---
 .gitignore                                    |   3 +
 CONTRIBUTING.md                               |   2 +-
 configure                                     |  99 ++-
 .../xla/service/allocation_tracker.cc         |   5 +-
 .../compiler/xla/service/allocation_tracker.h |   6 +-
 tensorflow/compiler/xla/service/cpu/BUILD     |   1 +
 .../lib/quantiles/weighted_quantiles_stream.h |   1 +
 tensorflow/contrib/cmake/CMakeLists.txt       |   6 +
 tensorflow/contrib/cmake/tf_python.cmake      |   1 -
 tensorflow/contrib/cmake/tf_shared_lib.cmake  |   7 +
 .../contrib/cmake/tools/create_def_file.py    |   8 +-
 .../python/ops/operator_pd_identity.py        |   2 +-
 .../keras/python/keras/datasets/imdb.py       |   2 +-
 .../keras/python/keras/datasets/reuters.py    |   2 +-
 .../keras/python/keras/engine/topology.py     |   2 +-
 .../keras/python/keras/engine/training.py     |   2 +-
 .../python/keras/layers/normalization.py      |   2 +-
 .../contrib/keras/python/keras/models.py      |   2 +-
 .../python/keras/preprocessing/sequence.py    |   2 +-
 .../contrib/labeled_tensor/python/ops/core.py |   2 +-
 .../layers/python/layers/feature_column.py    |   4 +-
 .../python/layers/feature_column_ops_test.py  |   4 +-
 .../python/layers/feature_column_test.py      |   2 +-
 .../contrib/layers/python/layers/layers.py    |  12 +-
 .../learn/estimators/dynamic_rnn_estimator.py |   8 +-
 .../learn/python/learn/estimators/head.py     |   2 +-
 .../python/learn/estimators/head_test.py      |   2 +-
 .../learn/python/learn/estimators/kmeans.py   |   1 +
 .../estimators/state_saving_rnn_estimator.py  |   8 +-
 .../contrib/learn/python/learn/monitors.py    |   2 +-
 tensorflow/contrib/makefile/README.md         |   2 +-
 tensorflow/contrib/rnn/__init__.py            |   1 +
 .../python/kernel_tests/core_rnn_cell_test.py |  38 +
 .../rnn/python/kernel_tests/rnn_cell_test.py  |  58 ++
 tensorflow/contrib/rnn/python/ops/rnn_cell.py | 175 +++++
 .../seq2seq/python/ops/attention_wrapper.py   |   2 +-
 .../example/export_half_plus_two.py           |   2 +-
 .../contrib/slim/python/slim/learning_test.py |   2 +-
 .../kernel_tests/sparsemax_loss_test.py       |   4 +-
 .../python/kernel_tests/sparsemax_test.py     |   4 +-
 .../tensor_forest/client/random_forest.py     |   2 +-
 .../training/python/training/evaluation.py    |   2 +-
 .../training/python/training/feeder.py        |   4 +-
 .../training/python/training/feeder_test.py   |   2 +-
 .../training/python/training/hparam.py        |   2 +-
 .../training/python/training/training_test.py |   2 +-
 tensorflow/core/BUILD                         |   7 +-
 .../core/common_runtime/visitable_allocator.h |   2 +-
 .../rpc/grpc_tensor_coding.cc                 |   2 +-
 tensorflow/core/framework/tensor.cc           |  43 +-
 tensorflow/core/framework/tensor.h            |  41 +-
 tensorflow/core/framework/tensor_test.cc      | 217 +++++-
 tensorflow/core/graph/mkl_layout_pass.cc      | 595 ++++++++++-----
 tensorflow/core/graph/mkl_layout_pass_test.cc | 720 ++++++++++++++++--
 .../core/graph/mkl_tfconversion_pass.cc       |  36 +-
 .../core/graph/mkl_tfconversion_pass_test.cc  |   4 +-
 tensorflow/core/kernels/BUILD                 |   8 +
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |   9 +-
 tensorflow/core/kernels/mkl_concat_op.cc      |   3 +
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |   4 +-
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |  11 +-
 .../core/kernels/mkl_conv_grad_input_ops.cc   |   6 +-
 tensorflow/core/kernels/mkl_conv_ops.cc       |  42 +-
 tensorflow/core/kernels/mkl_identity_op.cc    |  63 ++
 tensorflow/core/kernels/mkl_lrn_op.cc         |  72 +-
 tensorflow/core/kernels/mkl_matmul_op.cc      |  16 +-
 tensorflow/core/kernels/mkl_maxpooling_op.cc  |  27 +-
 .../core/kernels/mkl_pooling_ops_common.cc    |   2 +-
 tensorflow/core/kernels/mkl_relu_op.cc        |  60 +-
 tensorflow/core/kernels/mkl_reshape_op.cc     |   2 +-
 tensorflow/core/kernels/mkl_tfconv_op.cc      |   2 +-
 tensorflow/core/ops/array_ops.cc              |  17 +
 tensorflow/core/util/mkl_util.h               |  44 +-
 tensorflow/docs_src/community/style_guide.md  |   6 +-
 tensorflow/docs_src/extend/adding_an_op.md    |   6 +-
 tensorflow/docs_src/get_started/monitors.md   |   2 +-
 tensorflow/docs_src/install/install_java.md   |   2 +-
 .../performance/performance_models.md         |   2 +-
 tensorflow/examples/label_image/main.cc       |   4 +-
 .../examples/tutorials/estimators/abalone.py  |  16 +-
 tensorflow/java/BUILD                         |  12 +
 .../main/java/org/tensorflow/Operation.java   |  24 +
 .../java/src/main/native/operation_jni.cc     |  18 +
 .../java/src/main/native/operation_jni.h      |  10 +
 .../java/org/tensorflow/OperationTest.java    |  66 ++
 tensorflow/python/client/session.py           |   3 +
 .../python/debug/cli/debugger_cli_common.py   |   2 +-
 .../python/debug/cli/profile_analyzer_cli.py  |   2 +-
 tensorflow/python/debug/lib/debug_data.py     |   2 +-
 tensorflow/python/debug/wrappers/hooks.py     |   2 +-
 tensorflow/python/framework/importer.py       |   3 +
 tensorflow/python/framework/importer_test.py  |  11 +
 tensorflow/python/framework/subscribe.py      |   2 +-
 tensorflow/python/framework/test_util.py      |   2 +-
 .../python/kernel_tests/linalg_ops_test.py    |   2 +-
 tensorflow/python/layers/normalization.py     |   2 +-
 tensorflow/python/ops/array_ops.py            |  18 +-
 tensorflow/python/ops/ctc_ops.py              |   6 +-
 tensorflow/python/ops/gradients_impl.py       |  22 -
 tensorflow/python/ops/init_ops.py             |   1 +
 tensorflow/python/ops/logging_ops.py          |   6 +-
 tensorflow/python/ops/math_ops.py             |   2 +-
 tensorflow/python/ops/metrics_impl.py         |   6 +-
 tensorflow/python/ops/parsing_ops.py          |   2 +-
 tensorflow/python/tools/saved_model_cli.py    |   4 +-
 tensorflow/python/training/coordinator.py     |   2 +-
 tensorflow/python/util/deprecation.py         |   2 +-
 tensorflow/stream_executor/lib/statusor.h     |   2 +-
 .../event_multiplexer_test.py                 |  15 +
 tensorflow/tensorflow.bzl                     |   2 +-
 .../ci_build/install/install_auditwheel.sh    |   2 +-
 .../ci_build/install/install_deb_packages.sh  |   4 +
 tensorflow/tools/ci_build/linux/cmake/run.sh  |   0
 .../tools/ci_build/osx/libtensorflow_cpu.sh   |   1 +
 .../tools/ci_build/osx/libtensorflow_gpu.sh   |   1 +
 .../ci_build/windows/bazel/common_env.sh      |   1 +
 tensorflow/tools/docs/py_guide_parser.py      |   2 +-
 tensorflow/workspace.bzl                      |  25 +-
 .../eigen3/unsupported/Eigen/CXX11/Tensor     |   8 +-
 third_party/grpc.BUILD                        |   2 +
 third_party/jemalloc.BUILD                    |   3 +
 third_party/llvm/llvm.BUILD                   |   4 +
 third_party/mkl/BUILD                         |   1 +
 third_party/py/python_configure.bzl           |  81 +-
 tools/tf_env_collect.sh                       |   8 +-
 125 files changed, 2306 insertions(+), 687 deletions(-)
 create mode 100644 tensorflow/core/kernels/mkl_identity_op.cc
 create mode 100644 tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
 mode change 100755 => 100644 tensorflow/tools/ci_build/linux/cmake/run.sh
 mode change 100644 => 100755 tools/tf_env_collect.sh

diff --git a/.gitignore b/.gitignore
index da5d14a9b7..bdcb067fc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@ node_modules
 /.bazelrc
 /.tf_configure.bazelrc
 /bazel-*
+/bazel_pip
+/third_party/eigen3/mkl_include
+/third_party/mkl/*
 /tools/python_bin_path.sh
 /tools/git/gen
 /pip_test
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c36ef1ecd3..c78b6b1a15 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ TensorFlow coding style.
 * Include unit tests when you contribute new features, as they help to
   a) prove that your code works correctly, b) guard against future breaking
   changes to lower the maintenance cost.
-* Bug fixes also generally require unit tests, because the presense of bugs
+* Bug fixes also generally require unit tests, because the presence of bugs
   usually indicates insufficient test coverage.
 * Keep API compatibility in mind when you change code in core TensorFlow,
   e.g., code in [tensorflow/core](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/core) and  [tensorflow/python](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/python).
diff --git a/configure b/configure
index 7f68a8f5d4..308369efd3 100755
--- a/configure
+++ b/configure
@@ -147,17 +147,17 @@ function setup_python {
   # Set-up env variables used by python_configure.bzl
   write_action_env_to_bazelrc "PYTHON_BIN_PATH" "$PYTHON_BIN_PATH"
   write_action_env_to_bazelrc "PYTHON_LIB_PATH" "$PYTHON_LIB_PATH"
-  write_to_bazelrc "build --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
-  write_to_bazelrc "build --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
+  write_to_bazelrc "build --define PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\""
+  write_to_bazelrc "build --define PYTHON_LIB_PATH=\"$PYTHON_LIB_PATH\""
   write_to_bazelrc "build --force_python=py$python_major_version"
   write_to_bazelrc "build --host_force_python=py$python_major_version"
-  write_to_bazelrc "build --python${python_major_version}_path=$PYTHON_BIN_PATH"
+  write_to_bazelrc "build --python${python_major_version}_path=\"$PYTHON_BIN_PATH\""
   write_to_bazelrc "test --force_python=py$python_major_version"
   write_to_bazelrc "test --host_force_python=py$python_major_version"
-  write_to_bazelrc "test --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
-  write_to_bazelrc "test --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
-  write_to_bazelrc "run --define PYTHON_BIN_PATH=$PYTHON_BIN_PATH"
-  write_to_bazelrc "run --define PYTHON_LIB_PATH=$PYTHON_LIB_PATH"
+  write_to_bazelrc "test --define PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\""
+  write_to_bazelrc "test --define PYTHON_LIB_PATH=\"$PYTHON_LIB_PATH\""
+  write_to_bazelrc "run --define PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\""
+  write_to_bazelrc "run --define PYTHON_LIB_PATH=\"$PYTHON_LIB_PATH\""
 
   # Write tools/python_bin_path.sh
   echo "export PYTHON_BIN_PATH=\"$PYTHON_BIN_PATH\"" > tools/python_bin_path.sh
@@ -180,35 +180,60 @@ fi
 setup_python
 
 ## Set up MKL related environment settings
-if false; then # Disable building with MKL for now
-  while [ "$TF_NEED_MKL" == "" ]; do
+while [ "$TF_NEED_MKL" == "" ]; do
+  fromuser=""
+  read -p "Do you wish to build TensorFlow with MKL support? [y/N] " INPUT
+  fromuser="1"
+  case $INPUT in
+    [Yy]* ) echo "MKL support will be enabled for TensorFlow"; TF_NEED_MKL=1;;
+    [Nn]* ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
+    "" ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
+    * ) echo "Invalid selection: " $INPUT;;
+  esac
+done
+
+OSNAME=`uname -s`
+
+if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
+  while [ "$TF_DOWNLOAD_MKL" == "" ]; do
     fromuser=""
-    read -p "Do you wish to build TensorFlow with MKL support (experimental)? [y/N] " INPUT
+    read -p "Do you wish to download MKL LIB from the web? [Y/n] " INPUT
     fromuser="1"
     case $INPUT in
-      [Yy]* ) echo "MKL support (experimental) (will be enabled for TensorFlow"; TF_NEED_MKL=1;;
-      [Nn]* ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
-      "" ) echo "No MKL support will be enabled for TensorFlow"; TF_NEED_MKL=0;;
-      * ) echo "Invalid selection: " $INPUT;;
+      [Yy]* ) TF_DOWNLOAD_MKL=1;;
+      [Nn]* ) TF_DOWNLOAD_MKL=0;;
+      "" )    TF_DOWNLOAD_MKL=1;;
+      * )     echo "Invalid selection: " $INPUT; exit 1;;
     esac
   done
 
-  OSNAME=`uname -s`
-
-  if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
+  if [[ "$TF_DOWNLOAD_MKL" == "1" ]]; then
     DST=`dirname $0`
-    ARCHIVE_BASENAME=mklml_lnx_2017.0.2.20170209.tgz
-    GITHUB_RELEASE_TAG=v0.5
+    ARCHIVE_BASENAME=mklml_lnx_2018.0.20170425.tgz
+    GITHUB_RELEASE_TAG=v0.7
     MKLURL="https://github.com/01org/mkl-dnn/releases/download/$GITHUB_RELEASE_TAG/$ARCHIVE_BASENAME"
-    if ! [ -e "$DST/third_party/mkl/$ARCHIVE_BASENAME" ]; then
-      wget --no-check-certificate -P $DST/third_party/mkl/ $MKLURL
+    if ! [ -e "${DST}/third_party/mkl/${ARCHIVE_BASENAME}" ]; then
+      curl -fSsL -o "${DST}/third_party/mkl/${ARCHIVE_BASENAME}" "${MKLURL}"
     fi
     tar -xzf $DST/third_party/mkl/$ARCHIVE_BASENAME -C $DST/third_party/mkl/
     extracted_dir_name="${ARCHIVE_BASENAME%.*}"
     MKL_INSTALL_PATH=$DST/third_party/mkl/$extracted_dir_name
     MKL_INSTALL_PATH=`${PYTHON_BIN_PATH} -c "import os; print(os.path.realpath(os.path.expanduser('${MKL_INSTALL_PATH}')))"`
 
-    if [ "$OSNAME" == "Linux" ]; then
+  else
+    default_mkl_path=/opt/intel/mklml
+    fromuser=""
+    read -p "Please specify the location where MKL is installed. [Default is $default_mkl_path]: " MKL_INSTALL_PATH
+    fromuser="1"
+    if [ -z "$MKL_INSTALL_PATH" ]; then
+      MKL_INSTALL_PATH=$default_mkl_path
+    fi
+    # Result returned from "read" will be used unexpanded. That make "~" unuseable.
+    # Going through one more level of expansion to handle that.
+    MKL_INSTALL_PATH=`${PYTHON_BIN_PATH} -c "import os; print(os.path.realpath(os.path.expanduser('${MKL_INSTALL_PATH}')))"`
+  fi
+
+  if [ "$OSNAME" == "Linux" ]; then
       # Full MKL configuration
       MKL_RT_LIB_PATH="lib/intel64/libmkl_rt.so" #${TF_MKL_EXT}#TODO version?
       MKL_RT_OMP_LIB_PATH="../compiler/lib/intel64/libiomp5.so" #TODO VERSION?
@@ -216,24 +241,29 @@ if false; then # Disable building with MKL for now
       # MKL-ML configuration
       MKL_ML_LIB_PATH="lib/libmklml_intel.so" #${TF_MKL_EXT}#TODO version?
       MKL_ML_OMP_LIB_PATH="lib/libiomp5.so" #TODO VERSION?
-    elif [ "$OSNAME" == "Darwin" ]; then
+  elif [ "$OSNAME" == "Darwin" ]; then
       echo "Darwin is unsupported yet";
       exit 1
-    fi
+  fi
 
-    if [ -e "$MKL_INSTALL_PATH/${MKL_ML_LIB_PATH}" ]; then
+  if [ -e "$MKL_INSTALL_PATH/${MKL_ML_LIB_PATH}" ]; then
       ln -sf $MKL_INSTALL_PATH/${MKL_ML_LIB_PATH} third_party/mkl/
       ln -sf $MKL_INSTALL_PATH/${MKL_ML_OMP_LIB_PATH} third_party/mkl/
       ln -sf $MKL_INSTALL_PATH/include third_party/mkl/
       ln -sf $MKL_INSTALL_PATH/include third_party/eigen3/mkl_include
-    else
-      echo "ERROR: $MKL_INSTALL_PATH/${MKL_ML_LIB_PATH} does not exist";
-      exit 1
-    fi
-
-    if [ -z "$fromuser" ]; then
+      loc=$(locate -e libdl.so.2 | sed -n 1p)
+      ln -sf $loc third_party/mkl/libdl.so.2
+  elif [ -e "$MKL_INSTALL_PATH/${MKL_RT_LIB_PATH}" ]; then
+      ln -sf $MKL_INSTALL_PATH/${MKL_RT_LIB_PATH} third_party/mkl/
+      ln -sf $MKL_INSTALL_PATH/${MKL_RT_OMP_LIB_PATH} third_party/mkl/
+      ln -sf $MKL_INSTALL_PATH/include third_party/mkl/
+      ln -sf $MKL_INSTALL_PATH/include third_party/eigen3/mkl_include
+      loc=$(locate -e libdl.so.2 | sed -n 1p)
+      ln -sf $loc third_party/mkl/libdl.so.2
+  else
+      echo "ERROR: $MKL_INSTALL_PATH/${MKL_ML_LIB_PATH} nor $MKL_INSTALL_PATH/${MKL_RT_LIB_PATH} exists";
       exit 1
-    fi
+  fi
 
 cat > third_party/mkl/mkl.config <<EOF
 # MKL_INSTALL_PATH refers to the location of MKL root folder. The MKL header and library
@@ -241,9 +271,8 @@ cat > third_party/mkl/mkl.config <<EOF
 MKL_INSTALL_PATH=$MKL_INSTALL_PATH
 EOF
 
-  fi # TF_NEED_MKL
-  ################## MKL
-fi # Disable building with MKL for now
+fi # TF_NEED_MKL
+## End MKL setup
 
 ## Set up architecture-dependent optimization flags.
 if [ -z "$CC_OPT_FLAGS" ]; then
diff --git a/tensorflow/compiler/xla/service/allocation_tracker.cc b/tensorflow/compiler/xla/service/allocation_tracker.cc
index 49a621810e..83759a7a0c 100644
--- a/tensorflow/compiler/xla/service/allocation_tracker.cc
+++ b/tensorflow/compiler/xla/service/allocation_tracker.cc
@@ -64,8 +64,9 @@ GlobalDataHandle AllocationTracker::RegisterInternal(
     auto& allocation = FindOrDie(handle_to_allocation_, handle);
     int ref_count = allocation->ref_count();
     CHECK_GT(ref_count, 0);
-    VLOG(2) << "ref_count: " << ref_count << " -> " << ref_count + 1;
-    allocation->increment_ref_count();
+    VLOG(2) << "ref_count: " << ref_count << " -> " <<
+            (ref_count + initial_ref_count);
+    allocation->increment_ref_count(initial_ref_count);
   } else {
     handle = next_handle_++;
     VLOG(2) << "ref_count: " << initial_ref_count;
diff --git a/tensorflow/compiler/xla/service/allocation_tracker.h b/tensorflow/compiler/xla/service/allocation_tracker.h
index e007680016..ebbf35b6fe 100644
--- a/tensorflow/compiler/xla/service/allocation_tracker.h
+++ b/tensorflow/compiler/xla/service/allocation_tracker.h
@@ -63,10 +63,10 @@ class Allocation {
     CHECK_GE(ref_count_, 0);
     return ref_count_;
   }
-  void increment_ref_count() {
+  void increment_ref_count(int inc) {
     CHECK_GT(ref_count_, 0);
-    CHECK_LT(ref_count_, INT_MAX);
-    ++ref_count_;
+    CHECK_LE(ref_count_, INT_MAX - inc);
+    ref_count_ += inc;
   }
   void decrement_ref_count() {
     CHECK_GT(ref_count_, 0);
diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD
index fbfad70098..affb5f9906 100644
--- a/tensorflow/compiler/xla/service/cpu/BUILD
+++ b/tensorflow/compiler/xla/service/cpu/BUILD
@@ -97,6 +97,7 @@ cc_library(
     name = "simple_orc_jit",
     srcs = ["simple_orc_jit.cc"],
     hdrs = ["simple_orc_jit.h"],
+    linkopts = ["-ldl"],
     deps = [
         ":compiler_functor",
         ":cpu_runtime",
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
index daf0e48000..fd577ad712 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_stream.h
@@ -17,6 +17,7 @@
 
 #include <memory>
 #include <vector>
+#include <cmath>
 
 #include "tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_buffer.h"
 #include "tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary.h"
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index af7b4fb386..83b405fd4e 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -229,6 +229,12 @@ if (tensorflow_ENABLE_GPU)
   endif()
 endif()
 
+# Find python executable
+include(FindPythonInterp)
+if(NOT ${PYTHONINTERP_FOUND})
+    message(FATAL_ERROR "CMake was unable to find a python interpreter.")
+endif()
+
 # Let's get to work!
 include(tf_core_framework.cmake)
 # NOTE: Disabled until issue #3996 is fixed.
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 9e2eb71b4c..bfd6a18c78 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -27,7 +27,6 @@
 
 # 1. Resolve the installed version of Python (for Python.h and python).
 # TODO(mrry): Parameterize the build script to enable Python 3 building.
-include(FindPythonInterp)
 if(NOT PYTHON_INCLUDE_DIR)
   set(PYTHON_NOT_FOUND false)
   exec_program("${PYTHON_EXECUTABLE}"
diff --git a/tensorflow/contrib/cmake/tf_shared_lib.cmake b/tensorflow/contrib/cmake/tf_shared_lib.cmake
index 47289fd9d2..9385ac52e9 100644
--- a/tensorflow/contrib/cmake/tf_shared_lib.cmake
+++ b/tensorflow/contrib/cmake/tf_shared_lib.cmake
@@ -82,6 +82,13 @@ target_link_libraries(tensorflow PRIVATE
     tf_protos_cc
 )
 
+# There is a bug in GCC 5 resulting in undefined reference to a __cpu_model function when
+# linking to the tensorflow library. Adding the following libraries fixes it.
+# See issue on github: https://github.com/tensorflow/tensorflow/issues/9593
+if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0)
+    target_link_libraries(tensorflow PRIVATE gcc_s gcc)
+endif()
+
 if(WIN32)
   add_dependencies(tensorflow tensorflow_static)
 endif(WIN32)
diff --git a/tensorflow/contrib/cmake/tools/create_def_file.py b/tensorflow/contrib/cmake/tools/create_def_file.py
index 9bd287d0d7..b16a5eadb0 100644
--- a/tensorflow/contrib/cmake/tools/create_def_file.py
+++ b/tensorflow/contrib/cmake/tools/create_def_file.py
@@ -44,7 +44,7 @@ UNDNAME = "undname.exe"
 DUMPBIN = "dumpbin.exe"
 
 # Exclude if matched
-EXCLUDE_RE = re.compile(r"deleting destructor|::internal::")
+EXCLUDE_RE = re.compile(r"RTTI|deleting destructor|::internal::")
 
 # Include if matched before exclude
 INCLUDEPRE_RE = re.compile(r"google::protobuf::internal::ExplicitlyConstructed|"
@@ -141,17 +141,17 @@ def main():
           continue
         if not INCLUDE_RE.search(line):
           continue
-          
+
       if "deleting destructor" in line:
         # Some of the symbols convered by INCLUDEPRE_RE export deleting
         # destructor symbols, which is a bad idea.
         # So we filter out such symbols here.
         continue
-          
+
       if DATA_EXCLUDE_RE.search(line):
         def_fp.write("\t" + decorated + "\n")
       else:
-        def_fp.write("\t" + decorated + " DATA\n")      
+        def_fp.write("\t" + decorated + " DATA\n")
       taken.add(decorated)
   exit_code = proc.wait()
   if exit_code != 0:
diff --git a/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py b/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py
index e6947bf609..4cee299790 100644
--- a/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py
+++ b/tensorflow/contrib/distributions/python/ops/operator_pd_identity.py
@@ -115,7 +115,7 @@ class OperatorPDIdentity(operator_pd.OperatorPDBase):
     """Static check that the argument `x` is proper `shape`, `dtype`."""
     # x is a typical argument e.g. to matmul or solve.  In both cases, x should
     # have the same type/shape since this is a square matrix.  These checks are
-    # ususally not needed since we ususally have some tensor backing this
+    # usually not needed since we usually have some tensor backing this
     # distribution, and the calls to tf.matmul do a shape/type check.
     #
     # Static checks only for efficiency, the identity should be fast.
diff --git a/tensorflow/contrib/keras/python/keras/datasets/imdb.py b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
index bafd92aca6..5c087fe63f 100644
--- a/tensorflow/contrib/keras/python/keras/datasets/imdb.py
+++ b/tensorflow/contrib/keras/python/keras/datasets/imdb.py
@@ -41,7 +41,7 @@ def load_data(path='imdb.npz',
       num_words: max number of words to include. Words are ranked
           by how often they occur (in the training set) and only
           the most frequent words are kept
-      skip_top: skip the top N most frequently occuring words
+      skip_top: skip the top N most frequently occurring words
           (which may not be informative).
       maxlen: truncate sequences after this length.
       seed: random seed for sample shuffling.
diff --git a/tensorflow/contrib/keras/python/keras/datasets/reuters.py b/tensorflow/contrib/keras/python/keras/datasets/reuters.py
index 81e940a846..b1c22fee63 100644
--- a/tensorflow/contrib/keras/python/keras/datasets/reuters.py
+++ b/tensorflow/contrib/keras/python/keras/datasets/reuters.py
@@ -43,7 +43,7 @@ def load_data(path='reuters.npz',
       num_words: max number of words to include. Words are ranked
           by how often they occur (in the training set) and only
           the most frequent words are kept
-      skip_top: skip the top N most frequently occuring words
+      skip_top: skip the top N most frequently occurring words
           (which may not be informative).
       maxlen: truncate sequences after this length.
       test_split: Fraction of the dataset to be used as test data.
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 0336fc4bf4..3d9ed51a1c 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -649,7 +649,7 @@ class Layer(tf_base_layers.Layer):
                           'but was passed an input_mask: ' + str(mask))
       # masking not explicitly supported: return None as mask
       return None
-    # if masking is explictly supported, by default
+    # if masking is explicitly supported, by default
     # carry over the input mask
     return mask
 
diff --git a/tensorflow/contrib/keras/python/keras/engine/training.py b/tensorflow/contrib/keras/python/keras/engine/training.py
index ba6201713e..96d1c2f262 100644
--- a/tensorflow/contrib/keras/python/keras/engine/training.py
+++ b/tensorflow/contrib/keras/python/keras/engine/training.py
@@ -245,7 +245,7 @@ def _check_array_lengths(inputs, targets, weights):
 
 
 def _check_loss_and_target_compatibility(targets, loss_fns, output_shapes):
-  """Does validation on the compatiblity of targets and loss functions.
+  """Does validation on the compatibility of targets and loss functions.
 
   This helps prevent users from using loss functions incorrectly.
 
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index df77401aee..ea229fdce1 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -169,7 +169,7 @@ class BatchNormalization(Layer):
 
       def normalize_inference():
         if needs_broadcasting:
-          # In this case we must explictly broadcast all parameters.
+          # In this case we must explicitly broadcast all parameters.
           broadcast_moving_mean = K.reshape(self.moving_mean, broadcast_shape)
           broadcast_moving_variance = K.reshape(self.moving_variance,
                                                 broadcast_shape)
diff --git a/tensorflow/contrib/keras/python/keras/models.py b/tensorflow/contrib/keras/python/keras/models.py
index 52456a4bb5..1c041091fc 100644
--- a/tensorflow/contrib/keras/python/keras/models.py
+++ b/tensorflow/contrib/keras/python/keras/models.py
@@ -221,7 +221,7 @@ def load_model(filepath, custom_objects=None):
         obj: object, dict, or list.
 
     Returns:
-        The same structure, where occurences
+        The same structure, where occurrences
             of a custom object name have been replaced
             with the custom object.
     """
diff --git a/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py b/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py
index 5a24a63b01..692a359ead 100644
--- a/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py
+++ b/tensorflow/contrib/keras/python/keras/preprocessing/sequence.py
@@ -156,7 +156,7 @@ def skipgrams(sequence,
           of word indices (integers). If using a `sampling_table`,
           word indices are expected to match the rank
           of the words in a reference dataset (e.g. 10 would encode
-          the 10-th most frequently occuring token).
+          the 10-th most frequently occurring token).
           Note that index 0 is expected to be a non-word and will be skipped.
       vocabulary_size: int. maximum possible word index + 1
       window_size: int. actually half-window.
diff --git a/tensorflow/contrib/labeled_tensor/python/ops/core.py b/tensorflow/contrib/labeled_tensor/python/ops/core.py
index 393c7f93f3..e6aded92ca 100644
--- a/tensorflow/contrib/labeled_tensor/python/ops/core.py
+++ b/tensorflow/contrib/labeled_tensor/python/ops/core.py
@@ -810,7 +810,7 @@ def axis_order_scope(axis_order=None):
   Example usage:
 
     with lt.axis_order_scope(['x', 'y', 'z']):
-      # result is guranteed to have the correct axis order
+      # result is guaranteed to have the correct axis order
       result = w + b
 
   You can nest scopes, in which case only the inner-most scope applies, e.g.,
diff --git a/tensorflow/contrib/layers/python/layers/feature_column.py b/tensorflow/contrib/layers/python/layers/feature_column.py
index 4329e22f48..e1a27335ab 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column.py
@@ -451,7 +451,7 @@ class _SparseColumn(
     return input_tensor
 
   def is_compatible(self, other_column):
-    """Check compatability of two sparse columns."""
+    """Check compatibility of two sparse columns."""
     if self.lookup_config and other_column.lookup_config:
       return self.lookup_config == other_column.lookup_config
     compatible = (self.length == other_column.length and
@@ -2129,7 +2129,7 @@ class _CrossedColumn(
         "columns", "hash_bucket_size", "hash_key", "combiner",
         "ckpt_to_load_from", "tensor_name_in_ckpt"
     ])):
-  """Represents a cross transformation also known as conjuction or combination.
+  """Represents a cross transformation also known as conjunction or combination.
 
   Instances of this class are immutable. It crosses given `columns`. Crossed
   column output will be hashed to hash_bucket_size.
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index a9698163dd..74d8f24071 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -1505,8 +1505,8 @@ class SequenceInputFromFeatureColumnTest(test.TestCase):
     expected_input_shape = [4, 3, embedding_dimension]
     self.assertAllEqual(expected_input_shape, model_input.shape)
 
-    # `ids_tensor` consists of 7 instances of <empty>, 3 occurences of "b",
-    # 2 occurences of "c" and 1 instance of "a".
+    # `ids_tensor` consists of 7 instances of <empty>, 3 occurrences of "b",
+    # 2 occurrences of "c" and 1 instance of "a".
     expected_gradient_values = sorted([0., 3., 2., 1.] * embedding_dimension)
     actual_gradient_values = np.sort(gradients[0].values, axis=None)
     self.assertAllClose(expected_gradient_values, actual_gradient_values)
diff --git a/tensorflow/contrib/layers/python/layers/feature_column_test.py b/tensorflow/contrib/layers/python/layers/feature_column_test.py
index aa3912a408..0f606a787d 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_test.py
@@ -173,7 +173,7 @@ class FeatureColumnTest(test.TestCase):
     for i in range(len(b1_value)):
       self.assertAllClose(b1_value[i], b2_value[i])
 
-    # Test the case when a shared_embedding_name is explictly specified.
+    # Test the case when a shared_embedding_name is explicitly specified.
     d = fc.shared_embedding_columns(
         [a1, a2],
         dimension=4,
diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 32ca0c38d9..7a429f75bb 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -278,7 +278,7 @@ def _fused_batch_norm(
         trainable=trainable_gamma)
 
     # Create moving_mean and moving_variance variables and add them to the
-    # appropiate collections.
+    # appropriate collections.
     moving_mean_collections = utils.get_variable_collections(
         variables_collections, 'moving_mean')
     moving_mean_initializer = param_initializers.get(
@@ -632,7 +632,7 @@ def batch_norm(inputs,
                                        trainable=trainable)
 
     # Create moving_mean and moving_variance variables and add them to the
-    # appropiate collections. We disable variable partitioning while creating
+    # appropriate collections. We disable variable partitioning while creating
     # them, because assign_moving_average is not yet supported for partitioned
     # variables.
     partitioner = variable_scope.get_variable_scope().partitioner
@@ -1087,7 +1087,7 @@ def convolution2d_transpose(
   """Adds a convolution2d_transpose with an optional batch normalization layer.
 
   The function creates a variable called `weights`, representing the
-  kernel, that is convolved with the input. If `batch_norm_params` is `None`, a
+  kernel, that is convolved with the input. If `normalizer_fn` is `None`, a
   second variable called 'biases' is added to the result of the operation.
 
   Args:
@@ -1847,9 +1847,9 @@ def separable_convolution2d(
   This op first performs a depthwise convolution that acts separately on
   channels, creating a variable called `depthwise_weights`. If `num_outputs`
   is not None, it adds a pointwise convolution that mixes channels, creating a
-  variable called `pointwise_weights`. Then, if `batch_norm_params` is None,
-  it adds bias to the result, creating a variable called 'biases', otherwise
-  it adds a batch normalization layer. It finally applies an activation function
+  variable called `pointwise_weights`. Then, if `normalizer_fn` is None,
+  it adds bias to the result, creating a variable called 'biases', otherwise,
+  the `normalizer_fn` is applied. It finally applies an activation function
   to produce the end result.
 
   Args:
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
index d86ef8d477..fc092fccd7 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
@@ -115,7 +115,7 @@ def dict_to_state_tuple(input_dict, cell):
 
 
 def _concatenate_context_input(sequence_input, context_input):
-  """Replicates `context_input` accross all timesteps of `sequence_input`.
+  """Replicates `context_input` across all timesteps of `sequence_input`.
 
   Expands dimension 1 of `context_input` then tiles it `sequence_length` times.
   This value is appended to `sequence_input` on dimension 2 and the result is
@@ -177,7 +177,7 @@ def build_sequence_input(features,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features i.e. features that apply accross all time
+      describing context features i.e. features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     weight_collections: List of graph collections to which weights are added.
@@ -419,7 +419,7 @@ def _get_dynamic_rnn_model_fn(
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     predict_probabilities: A boolean indicating whether to predict probabilities
@@ -603,7 +603,7 @@ class DynamicRnnEstimator(estimator.Estimator):
         describing sequence features. All items in the iterable should be
         instances of classes derived from `FeatureColumn`.
       context_feature_columns: An iterable containing all the feature columns
-        describing context features, i.e., features that apply accross all time
+        describing context features, i.e., features that apply across all time
         steps. All items in the set should be instances of classes derived from
         `FeatureColumn`.
       num_classes: the number of classes for a classification problem. Only
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 25f2922bf8..52b4213463 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -163,7 +163,7 @@ class Head(object):
           ModeFnOps.loss to compute and apply gradients.
       logits: logits `Tensor` to be used by the head.
       logits_input: `Tensor` from which to build logits, often needed when you
-        don't want to compute the logits. Typicaly this is the activation of the
+        don't want to compute the logits. Typically this is the activation of the
         last hidden layer in a DNN. Some heads (like the ones responsible for
         candidate sampling) intrinsically avoid computing full logits and only
         accepts logits_input.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index d5777088de..f7934fc188 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -895,7 +895,7 @@ class BinaryClassificationHeadTest(test.TestCase):
       _assert_summary_tags(self, ["loss"])
       # logloss: z:label, x:logit
       # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
-      # expected_loss is (total_weighted_loss)/1 since htere is 1 nonzero
+      # expected_loss is (total_weighted_loss)/1 since there is 1 nonzero
       # weight.
       expected_loss = 0.062652342
       _assert_metrics(
diff --git a/tensorflow/contrib/learn/python/learn/estimators/kmeans.py b/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
index 5be07d271d..a473cf46d5 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/kmeans.py
@@ -29,6 +29,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import state_ops
+from tensorflow.python.summary import summary
 from tensorflow.python.ops.control_flow_ops import with_dependencies
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.summary import summary
diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
index 02acd70812..9cb4c3515a 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator.py
@@ -144,7 +144,7 @@ def _prepare_features_for_sqss(features, labels, mode,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
 
@@ -261,7 +261,7 @@ def _read_batch(cell,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     num_threads: The Python integer number of threads enqueuing input examples
@@ -420,7 +420,7 @@ def _get_rnn_model_fn(cell_type,
       describing sequence features. All items in the set should be instances
       of classes derived from `FeatureColumn`.
     context_feature_columns: An iterable containing all the feature columns
-      describing context features, i.e., features that apply accross all time
+      describing context features, i.e., features that apply across all time
       steps. All items in the set should be instances of classes derived from
       `FeatureColumn`.
     predict_probabilities: A boolean indicating whether to predict probabilities
@@ -563,7 +563,7 @@ class StateSavingRnnEstimator(estimator.Estimator):
         describing sequence features. All items in the set should be instances
         of classes derived from `FeatureColumn`.
       context_feature_columns: An iterable containing all the feature columns
-        describing context features, i.e., features that apply accross all time
+        describing context features, i.e., features that apply across all time
         steps. All items in the set should be instances of classes derived from
         `FeatureColumn`.
       num_classes: The number of classes for categorization. Used only and
diff --git a/tensorflow/contrib/learn/python/learn/monitors.py b/tensorflow/contrib/learn/python/learn/monitors.py
index 50ad988b87..e97992fd20 100644
--- a/tensorflow/contrib/learn/python/learn/monitors.py
+++ b/tensorflow/contrib/learn/python/learn/monitors.py
@@ -474,7 +474,7 @@ class LoggingTrainable(EveryN):
 
   def every_n_step_begin(self, step):
     super(LoggingTrainable, self).every_n_step_begin(step)
-    # Get a list of trainable variables at the begining of every N steps.
+    # Get a list of trainable variables at the beginning of every N steps.
     # We cannot get this in __init__ because train_op has not been generated.
     trainables = ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES,
                                     scope=self._scope)
diff --git a/tensorflow/contrib/makefile/README.md b/tensorflow/contrib/makefile/README.md
index f061b58775..9ba5c035a2 100644
--- a/tensorflow/contrib/makefile/README.md
+++ b/tensorflow/contrib/makefile/README.md
@@ -295,7 +295,7 @@ itself, you'll see it's broken up into host and target sections. If you are
 cross-compiling, you should look at customizing the target settings to match
 what you need for your desired system.
 
-## Dependency Managment
+## Dependency Management
 
 The Makefile loads in a list of dependencies stored in text files. These files
 are generated from the main Bazel build by running 
diff --git a/tensorflow/contrib/rnn/__init__.py b/tensorflow/contrib/rnn/__init__.py
index d2f9cde4f6..2420c3e179 100644
--- a/tensorflow/contrib/rnn/__init__.py
+++ b/tensorflow/contrib/rnn/__init__.py
@@ -46,6 +46,7 @@ See @{$python/contrib.rnn} guide.
 @@IntersectionRNNCell
 @@PhasedLSTMCell
 @@HighwayWrapper
+@@GLSTMCell
 
 ### RNNCell wrappers
 @@AttentionCellWrapper
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
index f4589e3d9e..89ad0fcd75 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
@@ -194,6 +194,44 @@ class RNNCellTest(test.TestCase):
              m.name: 0.1 * np.ones([1, 4])})
         self.assertEqual(len(res), 2)
 
+  def testBasicLSTMCellDimension0Error(self):
+    """Tests that dimension 0 in both(x and m) shape must be equal."""
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root", initializer=init_ops.constant_initializer(0.5)):
+        num_units = 2
+        state_size = num_units * 2
+        batch_size = 3
+        input_size = 4
+        x = array_ops.zeros([batch_size, input_size])
+        m = array_ops.zeros([batch_size - 1, state_size])
+        with self.assertRaises(ValueError):
+          g, out_m = core_rnn_cell_impl.BasicLSTMCell(
+              num_units, state_is_tuple=False)(x, m)
+          sess.run([variables_lib.global_variables_initializer()])
+          sess.run([g, out_m],
+                   {x.name: 1 * np.ones([batch_size, input_size]),
+               m.name: 0.1 * np.ones([batch_size - 1, state_size])})
+
+  def testBasicLSTMCellStateSizeError(self):
+    """Tests that state_size must be num_units * 2."""
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root", initializer=init_ops.constant_initializer(0.5)):
+        num_units = 2
+        state_size = num_units * 3 # state_size must be num_units * 2
+        batch_size = 3
+        input_size = 4
+        x = array_ops.zeros([batch_size, input_size])
+        m = array_ops.zeros([batch_size, state_size])
+        with self.assertRaises(ValueError):
+          g, out_m = core_rnn_cell_impl.BasicLSTMCell(
+              num_units, state_is_tuple=False)(x, m)
+          sess.run([variables_lib.global_variables_initializer()])
+          sess.run([g, out_m],
+                   {x.name: 1 * np.ones([batch_size, input_size]),
+                    m.name: 0.1 * np.ones([batch_size, state_size])})
+
   def testBasicLSTMCellStateTupleType(self):
     with self.test_session():
       with variable_scope.variable_scope(
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
index 33fd35c1a3..334baa5f9c 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/rnn_cell_test.py
@@ -904,6 +904,64 @@ class RNNCellTest(test.TestCase):
       # States are left untouched
       self.assertAllClose(res[2], res[3])
 
+  def testGLSTMCell(self):
+    # Ensure that G-LSTM matches LSTM when number_of_groups = 1
+    batch_size = 2
+    num_units = 4
+    number_of_groups = 1
+
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root1", initializer=init_ops.constant_initializer(0.5)):
+        x = array_ops.ones([batch_size, num_units])
+        # When number_of_groups = 1, G-LSTM is equivalent to regular LSTM
+        gcell = rnn_cell.GLSTMCell(num_units=num_units,
+                                   number_of_groups=number_of_groups)
+        cell = core_rnn_cell_impl.LSTMCell(num_units=num_units)
+        self.assertTrue(isinstance(gcell.state_size, tuple))
+        zero_state = gcell.zero_state(batch_size=batch_size,
+                                      dtype=dtypes.float32)
+        gh, gs = gcell(x, zero_state)
+        h, g = cell(x, zero_state)
+
+        sess.run([variables.global_variables_initializer()])
+        glstm_result = sess.run([gh, gs])
+        lstm_result = sess.run([h, g])
+
+        self.assertAllClose(glstm_result[0], lstm_result[0], 1e-5)
+        self.assertAllClose(glstm_result[1], lstm_result[1], 1e-5)
+
+    # Test that G-LSTM subgroup act like corresponding sub-LSTMs
+    batch_size = 2
+    num_units = 4
+    number_of_groups = 2
+
+    with self.test_session() as sess:
+      with variable_scope.variable_scope(
+          "root2", initializer=init_ops.constant_initializer(0.5)):
+        # input for G-LSTM with 2 groups
+        glstm_input = array_ops.ones([batch_size, num_units])
+        gcell = rnn_cell.GLSTMCell(num_units=num_units,
+                                   number_of_groups=number_of_groups)
+        gcell_zero_state = gcell.zero_state(batch_size=batch_size,
+                                            dtype=dtypes.float32)
+        gh, gs = gcell(glstm_input, gcell_zero_state)
+
+        # input for LSTM cell simulating single G-LSTM group
+        lstm_input = array_ops.ones([batch_size, num_units / number_of_groups])
+        # note division by number_of_groups. This cell one simulates G-LSTM group
+        cell = core_rnn_cell_impl.LSTMCell(num_units=
+                                           int(num_units / number_of_groups))
+        cell_zero_state = cell.zero_state(batch_size=batch_size,
+                                          dtype=dtypes.float32)
+        h, g = cell(lstm_input, cell_zero_state)
+
+        sess.run([variables.global_variables_initializer()])
+        [gh_res, h_res] = sess.run([gh, h])
+        self.assertAllClose(gh_res[:, 0:int(num_units / number_of_groups)],
+                            h_res, 1e-5)
+        self.assertAllClose(gh_res[:, int(num_units / number_of_groups):],
+                            h_res, 1e-5)
 
 class LayerNormBasicLSTMCellTest(test.TestCase):
 
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index ad23e532b1..7a0f894404 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -1923,3 +1923,178 @@ class PhasedLSTMCell(core_rnn_cell.RNNCell):
     new_state = core_rnn_cell.LSTMStateTuple(new_c, new_h)
 
     return new_h, new_state
+
+
+class GLSTMCell(core_rnn_cell.RNNCell):
+  """Group LSTM cell (G-LSTM).
+
+  The implementation is based on:
+
+    https://arxiv.org/abs/1703.10722
+
+  O. Kuchaiev and B. Ginsburg
+  "Factorization Tricks for LSTM Networks", ICLR 2017 workshop.
+  """
+
+  def __init__(self, num_units, initializer=None, num_proj=None,
+               number_of_groups=1, forget_bias=1.0, activation=math_ops.tanh,
+               reuse=None):
+    """Initialize the parameters of G-LSTM cell.
+
+    Args:
+      num_units: int, The number of units in the G-LSTM cell
+      initializer: (optional) The initializer to use for the weight and
+        projection matrices.
+      num_proj: (optional) int, The output dimensionality for the projection
+        matrices.  If None, no projection is performed.
+      number_of_groups: (optional) int, number of groups to use.
+        If `number_of_groups` is 1, then it should be equivalent to LSTM cell
+      forget_bias: Biases of the forget gate are initialized by default to 1
+        in order to reduce the scale of forgetting at the beginning of
+        the training.
+      activation: Activation function of the inner states.
+      reuse: (optional) Python boolean describing whether to reuse variables
+        in an existing scope.  If not `True`, and the existing scope already
+        has the given variables, an error is raised.
+
+    Raises:
+      ValueError: If `num_units` or `num_proj` is not divisible by 
+        `number_of_groups`.
+    """
+    super(GLSTMCell, self).__init__(_reuse=reuse)
+    self._num_units = num_units
+    self._initializer = initializer
+    self._num_proj = num_proj
+    self._forget_bias = forget_bias
+    self._activation = activation
+    self._number_of_groups = number_of_groups
+
+    if self._num_units % self._number_of_groups != 0:
+      raise ValueError("num_units must be divisible by number_of_groups")
+    if self._num_proj:
+      if self._num_proj % self._number_of_groups != 0:
+        raise ValueError("num_proj must be divisible by number_of_groups")
+      self._group_shape = [int(self._num_proj / self._number_of_groups),
+                           int(self._num_units / self._number_of_groups)]
+    else:
+      self._group_shape = [int(self._num_units / self._number_of_groups),
+                           int(self._num_units / self._number_of_groups)]
+
+    if num_proj:
+      self._state_size = core_rnn_cell.LSTMStateTuple(num_units, num_proj)
+      self._output_size = num_proj
+    else:
+      self._state_size = core_rnn_cell.LSTMStateTuple(num_units, num_units)
+      self._output_size = num_units
+
+  @property
+  def state_size(self):
+    return self._state_size
+
+  @property
+  def output_size(self):
+    return self._output_size
+
+  def _get_input_for_group(self, inputs, group_id, group_size):
+    """Slices inputs into groups to prepare for processing by cell's groups
+
+    Args:
+      inputs: cell input or it's previous state,
+              a Tensor, 2D, [batch x num_units]
+      group_id: group id, a Scalar, for which to prepare input
+      group_size: size of the group
+
+    Returns:
+      subset of inputs corresponding to group "group_id",
+      a Tensor, 2D, [batch x num_units/number_of_groups]
+    """
+    return array_ops.slice(input_=inputs,
+                           begin=[0, group_id * group_size],
+                           size=[self._batch_size, group_size],
+                           name=("GLSTM_group%d_input_generation" % group_id))
+
+  def call(self, inputs, state):
+    """Run one step of G-LSTM.
+
+    Args:
+      inputs: input Tensor, 2D, [batch x num_units].
+      state: this must be a tuple of state Tensors, both `2-D`,
+      with column sizes `c_state` and `m_state`.
+
+    Returns:
+      A tuple containing:
+
+      - A `2-D, [batch x output_dim]`, Tensor representing the output of the
+        G-LSTM after reading `inputs` when previous state was `state`.
+        Here output_dim is:
+           num_proj if num_proj was set,
+           num_units otherwise.
+      - LSTMStateTuple representing the new state of G-LSTM  cell
+        after reading `inputs` when the previous state was `state`.
+
+    Raises:
+      ValueError: If input size cannot be inferred from inputs via
+        static shape inference.
+    """
+    (c_prev, m_prev) = state
+
+    self._batch_size = inputs.shape[0].value or array_ops.shape(inputs)[0]
+    dtype = inputs.dtype
+    scope = vs.get_variable_scope()
+    with vs.variable_scope(scope, initializer=self._initializer):
+      i_parts = []
+      j_parts = []
+      f_parts = []
+      o_parts = []
+
+      for group_id in range(self._number_of_groups):
+        with vs.variable_scope("group%d" % group_id):
+          x_g_id = array_ops.concat(
+            [self._get_input_for_group(inputs, group_id,
+                                       self._group_shape[0]),
+             self._get_input_for_group(m_prev, group_id,
+                                       self._group_shape[0])], axis=1)
+          R_k = _linear(x_g_id, 4 * self._group_shape[1], bias=False)
+          i_k, j_k, f_k, o_k = array_ops.split(R_k, 4, 1)
+
+        i_parts.append(i_k)
+        j_parts.append(j_k)
+        f_parts.append(f_k)
+        o_parts.append(o_k)
+
+      bi = vs.get_variable(name="bias_i",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+      bj = vs.get_variable(name="bias_j",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+      bf = vs.get_variable(name="bias_f",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+      bo = vs.get_variable(name="bias_o",
+                           shape=[self._num_units],
+                           dtype=dtype,
+                           initializer=
+                           init_ops.constant_initializer(0.0, dtype=dtype))
+
+      i = nn_ops.bias_add(array_ops.concat(i_parts, axis=1), bi)
+      j = nn_ops.bias_add(array_ops.concat(j_parts, axis=1), bj)
+      f = nn_ops.bias_add(array_ops.concat(f_parts, axis=1), bf)
+      o = nn_ops.bias_add(array_ops.concat(o_parts, axis=1), bo)
+
+    c = (math_ops.sigmoid(f + self._forget_bias) * c_prev +
+         math_ops.sigmoid(i) * math_ops.tanh(j))
+    m = math_ops.sigmoid(o) * self._activation(c)
+
+    if self._num_proj is not None:
+      with vs.variable_scope("projection"):
+        m = _linear(m, self._num_proj, bias=False)
+
+    new_state = core_rnn_cell.LSTMStateTuple(c, m)
+    return m, new_state
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index d3fc8d1d0d..8d1c0c59e0 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -498,7 +498,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     if probability_fn is None:
       probability_fn = nn_ops.softmax
     else:
-      if not callable(cell_input_fn):
+      if not callable(probability_fn):
         raise TypeError(
             "probability_fn must be callable, saw type: %s"
             % type(probability_fn).__name__)
diff --git a/tensorflow/contrib/session_bundle/example/export_half_plus_two.py b/tensorflow/contrib/session_bundle/example/export_half_plus_two.py
index 08ca47058c..4a56509e59 100644
--- a/tensorflow/contrib/session_bundle/example/export_half_plus_two.py
+++ b/tensorflow/contrib/session_bundle/example/export_half_plus_two.py
@@ -97,7 +97,7 @@ def Export(export_dir, use_checkpoint_v2):
     }
 
     # Create two filename assets and corresponding tensors.
-    # TODO(b/26254158) Consider adding validation of file existance as well as
+    # TODO(b/26254158) Consider adding validation of file existence as well as
     # hashes (e.g. sha1) for consistency.
     original_filename1 = tf.constant("hello1.txt")
     tf.add_to_collection(tf.GraphKeys.ASSET_FILEPATHS, original_filename1)
diff --git a/tensorflow/contrib/slim/python/slim/learning_test.py b/tensorflow/contrib/slim/python/slim/learning_test.py
index cf3a878450..83d45f6f5a 100644
--- a/tensorflow/contrib/slim/python/slim/learning_test.py
+++ b/tensorflow/contrib/slim/python/slim/learning_test.py
@@ -840,7 +840,7 @@ class TrainTest(test.TestCase):
         # Initialize the variables.
         sess.run(variables_lib.global_variables_initializer())
 
-        # Get the intial weights and biases values.
+        # Get the initial weights and biases values.
         weights_values, biases_values = sess.run([weights, biases])
         self.assertGreater(np.linalg.norm(weights_values), 0)
         self.assertAlmostEqual(np.linalg.norm(biases_values), 0)
diff --git a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py
index 89dbcd96f8..c8b4e472c9 100644
--- a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py
+++ b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_loss_test.py
@@ -159,7 +159,7 @@ class SparsemaxLossTest(test.TestCase):
     self.assertShapeEqual(q, tf_sparsemax_op)
 
   def _test_gradient_against_estimate(self, dtype, random, use_gpu):
-    """check sparsemax-loss Rop, aginst estimated-loss Rop"""
+    """check sparsemax-loss Rop, against estimated-loss Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10)).astype(dtype)
     q = np.zeros((test_obs, 10)).astype(dtype)
     q[np.arange(0, test_obs), np.random.randint(0, 10, size=test_obs)] = 1
@@ -178,7 +178,7 @@ class SparsemaxLossTest(test.TestCase):
     self.assertLess(err, 1e-4)
 
   def _test_gradient_against_numpy(self, dtype, random, use_gpu):
-    """check sparsemax-loss Rop, aginst numpy Rop"""
+    """check sparsemax-loss Rop, against numpy Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10))
     q = np.zeros((test_obs, 10))
     q[np.arange(0, test_obs), np.random.randint(0, 10, size=test_obs)] = 1
diff --git a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py
index eafac1b9ae..82d36ee9cb 100644
--- a/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py
+++ b/tensorflow/contrib/sparsemax/python/kernel_tests/sparsemax_test.py
@@ -188,7 +188,7 @@ class SparsemaxTest(test.TestCase):
     self.assertShapeEqual(z, tf_sparsemax_op)
 
   def _test_gradient_against_estimate(self, dtype, random, use_gpu):
-    """check sparsemax Rop, aginst estimated Rop"""
+    """check sparsemax Rop, against estimated Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10)).astype(dtype)
 
     logits = array_ops.placeholder(dtype, name='z')
@@ -204,7 +204,7 @@ class SparsemaxTest(test.TestCase):
     self.assertLess(err, 1e-4)
 
   def _test_gradient_against_numpy(self, dtype, random, use_gpu):
-    """check sparsemax Rop, aginst numpy Rop"""
+    """check sparsemax Rop, against numpy Rop"""
     z = random.uniform(low=-3, high=3, size=(test_obs, 10)).astype(dtype)
 
     logits = constant_op.constant(z, name='z')
diff --git a/tensorflow/contrib/tensor_forest/client/random_forest.py b/tensorflow/contrib/tensor_forest/client/random_forest.py
index 6ea1a10853..0ba636c697 100644
--- a/tensorflow/contrib/tensor_forest/client/random_forest.py
+++ b/tensorflow/contrib/tensor_forest/client/random_forest.py
@@ -79,7 +79,7 @@ class TensorForestLossHook(session_run_hook.SessionRunHook):
     current_loss = run_values.results['current_loss']
     current_step = run_values.results['global_step']
     self.steps += 1
-    # Gaurd against the global step going backwards, which might happen
+    # Guard against the global step going backwards, which might happen
     # if we recover from something.
     if self.last_step == -1 or self.last_step > current_step:
       logging.info('TensorForestLossHook resetting last_step.')
diff --git a/tensorflow/contrib/training/python/training/evaluation.py b/tensorflow/contrib/training/python/training/evaluation.py
index 8a985fe0e2..bc0c60c85c 100644
--- a/tensorflow/contrib/training/python/training/evaluation.py
+++ b/tensorflow/contrib/training/python/training/evaluation.py
@@ -254,7 +254,7 @@ def checkpoints_iterator(checkpoint_dir,
         logging.info('Timed-out waiting for a checkpoint.')
         return
       if timeout_fn():
-        # The timeout_fn indicated that we are truely done.
+        # The timeout_fn indicated that we are truly done.
         return
       else:
         # The timeout_fn indicated that more checkpoints may come.
diff --git a/tensorflow/contrib/training/python/training/feeder.py b/tensorflow/contrib/training/python/training/feeder.py
index a7f43cc07e..a5cd7c5c94 100644
--- a/tensorflow/contrib/training/python/training/feeder.py
+++ b/tensorflow/contrib/training/python/training/feeder.py
@@ -18,7 +18,7 @@
 
 This helper handles the plumbing in order to set up a feeder task to
 push generated inputs to a pool of remote consumers; or to run an
-identical feeding mechanism in a seperate thread in the same process.
+identical feeding mechanism in a separate thread in the same process.
 
 Example usage for distributed feeding:
 
@@ -331,7 +331,7 @@ class Feeder(object):
     they never close their queue. Second, they are added to the
     `Feeder.REMOTE_QUEUE_RUNNERS` collection, rather than
     `ops.GraphKeys.QUEUE_RUNNERS`, so they can be started/stopped
-    seperately.
+    separately.
 
     Args:
       queue: The queue.
diff --git a/tensorflow/contrib/training/python/training/feeder_test.py b/tensorflow/contrib/training/python/training/feeder_test.py
index 4d5cf9eff2..f3a2fee046 100644
--- a/tensorflow/contrib/training/python/training/feeder_test.py
+++ b/tensorflow/contrib/training/python/training/feeder_test.py
@@ -156,7 +156,7 @@ class FeederTest(test.TestCase):
     coord.join()
 
   def testFeederSeparateThread(self):
-    # Start a feeder on a seperate thread, but with a shared local queue
+    # Start a feeder on a separate thread, but with a shared local queue
     servers = self._create_local_cluster(worker=1)
     coord = coordinator.Coordinator()
     feed_thread = FeederThread(self, coord, servers, 'worker', 0)
diff --git a/tensorflow/contrib/training/python/training/hparam.py b/tensorflow/contrib/training/python/training/hparam.py
index 1d17782820..2e08593699 100644
--- a/tensorflow/contrib/training/python/training/hparam.py
+++ b/tensorflow/contrib/training/python/training/hparam.py
@@ -164,7 +164,7 @@ class HParams(object):
   import argparse
   parser = argparse.ArgumentParser(description='Train my model.')
   parser.add_argument('--hparams', type=str,
-                      help='Comma seperated list of "name=value" pairs.')
+                      help='Comma separated list of "name=value" pairs.')
   args = parser.parse_args()
   ...
   def my_program():
diff --git a/tensorflow/contrib/training/python/training/training_test.py b/tensorflow/contrib/training/python/training/training_test.py
index e7c8fcd2a0..0af79cf2e3 100644
--- a/tensorflow/contrib/training/python/training/training_test.py
+++ b/tensorflow/contrib/training/python/training/training_test.py
@@ -508,7 +508,7 @@ class TrainTest(test.TestCase):
         # Initialize the variables.
         session.run(variables_lib2.global_variables_initializer())
 
-        # Get the intial weights and biases values.
+        # Get the initial weights and biases values.
         weights_values, biases_values = session.run([weights, biases])
         self.assertGreater(np.linalg.norm(weights_values), 0)
         self.assertAlmostEqual(np.linalg.norm(biases_values), 0)
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 78b67941fe..484ef3bf4a 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -741,6 +741,7 @@ cc_library(
         "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
         "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_identity_op",
         "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
@@ -1287,7 +1288,10 @@ cc_library(
     ] + tf_additional_verbs_lib_defines(),
     linkopts = select({
         "//tensorflow:freebsd": [],
-        "//conditions:default": ["-ldl"],
+        "//conditions:default": [
+            "-ldl",
+            "-lpthread",
+        ],
     }),
     deps = tf_additional_lib_deps() + [
         ":lib_hash_crc32c_accelerate_internal",
@@ -2127,6 +2131,7 @@ tf_cc_test_mkl(
         "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
         "//tensorflow/core/kernels:mkl_fused_batch_norm_op",
+        "//tensorflow/core/kernels:mkl_identity_op",
         "//tensorflow/core/kernels:mkl_lrn_op",
         "//tensorflow/core/kernels:mkl_pooling_ops",
         "//tensorflow/core/kernels:mkl_relu_op",
diff --git a/tensorflow/core/common_runtime/visitable_allocator.h b/tensorflow/core/common_runtime/visitable_allocator.h
index c83e4a4e3a..8edf922d11 100644
--- a/tensorflow/core/common_runtime/visitable_allocator.h
+++ b/tensorflow/core/common_runtime/visitable_allocator.h
@@ -44,7 +44,7 @@ class VisitableAllocator : public Allocator {
 };
 
 // Needed for cases when a VisitableAllocator gets wrapped for tracking.
-// Multiple-inheritance is considered acceptible in this case because
+// Multiple-inheritance is considered acceptable in this case because
 // VisitableAllocator is a pure virtual interface and only TrackingAllocator
 // has default implementation.
 class TrackingVisitableAllocator : public TrackingAllocator,
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
index ba206890ce..90e311a493 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_tensor_coding.cc
@@ -166,7 +166,7 @@ void EncodeTensorToByteBuffer(bool is_dead, const Tensor& val,
         (e_skeleton.size() +
          VarLengthEncodingSize(TensorProto::kTensorContentFieldNumber,
                                tdata.size()));
-    string header;  // All of RecvTensorRequest except the tensor() field
+    string header;  // All of RecvTensorResponse except the tensor() field
     response.AppendToString(&header);
 
     size_t expected_size =
diff --git a/tensorflow/core/framework/tensor.cc b/tensorflow/core/framework/tensor.cc
index ecb9810d83..d049da1c9d 100644
--- a/tensorflow/core/framework/tensor.cc
+++ b/tensorflow/core/framework/tensor.cc
@@ -902,42 +902,27 @@ void Tensor::FillDescription(TensorDescription* description) const {
 }
 
 gtl::InlinedVector<int64, 4> Tensor::ComputeFlatInnerDims(
-    int64 num_out_dims) const {
-  if (num_out_dims == dims()) {
-    return shape_.dim_sizes();
-  }
+    gtl::ArraySlice<int64> orig, int64 num_out_dims) {
   gtl::InlinedVector<int64, 4> out_dims(num_out_dims, 0);
-  const int64 num_elements = NumElements();
-  int64 prod_out_dims = 1;
-  for (int64 out_dim = num_out_dims - 1; out_dim > 0; --out_dim) {
-    const int64 in_dim = out_dim + (dims() - num_out_dims);
-    out_dims[out_dim] = (in_dim >= dims() || in_dim < 0) ? 1 : dim_size(in_dim);
-    prod_out_dims *= out_dims[out_dim];
-  }
-  if (prod_out_dims != 0) {
-    out_dims[0] = num_elements / prod_out_dims;
-  } else {
-    out_dims[0] = 0;
+  int64 offset = orig.size() - num_out_dims;
+  for (int64 out_dim = num_out_dims - 1; out_dim >= 0; --out_dim) {
+    const int64 in_dim = out_dim + offset;
+    out_dims[out_dim] = in_dim < 0 ? 1 : orig[in_dim];
+  }
+  for (int64 in_dim = 0; in_dim < offset; ++in_dim) {
+    out_dims[0] *= orig[in_dim];
   }
   return out_dims;
 }
 
 gtl::InlinedVector<int64, 4> Tensor::ComputeFlatOuterDims(
-    int64 num_out_dims) const {
-  if (num_out_dims == dims()) {
-    return shape_.dim_sizes();
-  }
+    gtl::ArraySlice<int64> orig, int64 num_out_dims) {
   gtl::InlinedVector<int64, 4> out_dims(num_out_dims, 0);
-  const int64 num_elements = NumElements();
-  int64 prod_out_dims = 1;
-  for (int64 out_dim = 0; out_dim < num_out_dims - 1; ++out_dim) {
-    out_dims[out_dim] = out_dim >= dims() ? 1 : dim_size(out_dim);
-    prod_out_dims *= out_dims[out_dim];
-  }
-  if (prod_out_dims != 0) {
-    out_dims[num_out_dims - 1] = num_elements / prod_out_dims;
-  } else {
-    out_dims[num_out_dims - 1] = 0;
+  for (int64 out_dim = 0; out_dim <= num_out_dims - 1; ++out_dim) {
+    out_dims[out_dim] = out_dim >= orig.size() ? 1 : orig[out_dim];
+  }
+  for (int64 in_dim = num_out_dims; in_dim < orig.size(); ++in_dim) {
+    out_dims[num_out_dims - 1] *= orig[in_dim];
   }
   return out_dims;
 }
diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 103da4c1b3..753548de84 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -304,6 +304,15 @@ class Tensor {
   template <typename T, size_t NDIMS = 2>
   typename TTypes<T, NDIMS>::Tensor flat_outer_dims();
 
+  /// Returns the data as an Eigen::Tensor with NDIMS dimensions, collapsing the
+  /// first 'begin' Tensor dimensions into the first dimension of the result and
+  /// the Tensor dimensions of the last dims() - 'begin' - NDIMS into the last
+  /// dimension of the result. If 'begin' < 0 then the the |'begin'| leading
+  /// dimensions of size 1 will be added. If 'begin' + NDIMS > dims() then
+  /// 'begin' + NDIMS - dims() trailing dimensions of size 1 will be added.
+  template <typename T, size_t NDIMS = 3>
+  typename TTypes<T, NDIMS>::Tensor flat_inner_outer_dims(int64 begin);
+
   template <typename T, size_t NDIMS>
   typename TTypes<T, NDIMS>::Tensor shaped(gtl::ArraySlice<int64> new_sizes);
 
@@ -386,6 +395,9 @@ class Tensor {
   template <typename T, size_t NDIMS = 2>
   typename TTypes<T, NDIMS>::ConstTensor flat_outer_dims() const;
 
+  template <typename T, size_t NDIMS = 3>
+  typename TTypes<T, NDIMS>::Tensor flat_inner_outer_dims(int64 begin) const;
+
   /// Render the first `max_entries` values in `*this` into a string.
   string SummarizeValue(int64 max_entries) const;
 
@@ -429,10 +441,11 @@ class Tensor {
       gtl::ArraySlice<int64> new_sizes,
       Eigen::array<Eigen::DenseIndex, NDIMS>* dims) const;
 
-  // TODO(rmlarsen): These shouldn't hardcode '4' so that it lines up with
   // TensorShape's InlineVector.
-  gtl::InlinedVector<int64, 4> ComputeFlatInnerDims(int64 num_out_dims) const;
-  gtl::InlinedVector<int64, 4> ComputeFlatOuterDims(int64 num_out_dims) const;
+  static gtl::InlinedVector<int64, 4> ComputeFlatInnerDims(
+      gtl::ArraySlice<int64> orig, int64 num_out_dims);
+  static gtl::InlinedVector<int64, 4> ComputeFlatOuterDims(
+      gtl::ArraySlice<int64> orig, int64 num_out_dims);
 
   TensorShape shape_;
   TensorBuffer* buf_;
@@ -638,22 +651,36 @@ typename TTypes<T>::ConstScalar Tensor::scalar() const {
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_dims() {
-  return shaped<T, NDIMS>(ComputeFlatInnerDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(shape_.dim_sizes(), NDIMS));
 }
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::flat_outer_dims() {
-  return shaped<T, NDIMS>(ComputeFlatOuterDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatOuterDims(shape_.dim_sizes(), NDIMS));
+}
+
+template <typename T, size_t NDIMS>
+typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) {
+  gtl::InlinedVector<int64,4> flat_outer = ComputeFlatOuterDims(
+      shape_.dim_sizes(), begin + NDIMS);
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_inner_dims() const {
-  return shaped<T, NDIMS>(ComputeFlatInnerDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(shape_.dim_sizes(), NDIMS));
 }
 
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::ConstTensor Tensor::flat_outer_dims() const {
-  return shaped<T, NDIMS>(ComputeFlatOuterDims(NDIMS));
+  return shaped<T, NDIMS>(ComputeFlatOuterDims(shape_.dim_sizes(), NDIMS));
+}
+
+template <typename T, size_t NDIMS>
+typename TTypes<T, NDIMS>::Tensor Tensor::flat_inner_outer_dims(int64 begin) const {
+  gtl::InlinedVector<int64,4> flat_outer = ComputeFlatOuterDims(
+      shape_.dim_sizes(), begin + NDIMS);
+  return shaped<T, NDIMS>(ComputeFlatInnerDims(flat_outer, NDIMS));
 }
 
 inline Tensor::Tensor(const Tensor& other)
diff --git a/tensorflow/core/framework/tensor_test.cc b/tensorflow/core/framework/tensor_test.cc
index 424b4579d3..2d756ef2c3 100644
--- a/tensorflow/core/framework/tensor_test.cc
+++ b/tensorflow/core/framework/tensor_test.cc
@@ -202,11 +202,18 @@ TEST(Tensor_QInt32, Simple) {
   TestCopies<qint32>(t);
 }
 
-TEST(Tensor_Float, Reshape) {
-  Tensor t(DT_FLOAT, TensorShape({2, 3, 4, 5}));
-  EXPECT_TRUE(t.shape().IsSameSize(TensorShape({2, 3, 4, 5})));
+class TensorReshapeTest : public ::testing::Test {
+protected:
+  Tensor t;
+  Tensor zero_t;
+
+  TensorReshapeTest() : t(DT_FLOAT, TensorShape({2, 3, 4, 5})),
+      zero_t(DT_FLOAT, TensorShape({3, 0, 2, 0, 5})) {}
+
+  virtual void SetUp() {
+    EXPECT_TRUE(t.shape().IsSameSize(TensorShape({2, 3, 4, 5})));
+    EXPECT_TRUE(zero_t.shape().IsSameSize(TensorShape({3, 0, 2, 0, 5})));
 
-  {
     auto tensor = t.tensor<float, 4>();
     EXPECT_EQ(2, tensor.dimension(0));
     EXPECT_EQ(3, tensor.dimension(1));
@@ -217,6 +224,11 @@ TEST(Tensor_Float, Reshape) {
     tensor(0, 0, 0, 0) = 0.01f;
     tensor(1, 2, 3, 4) = 0.02f;
   }
+
+};
+
+TEST_F(TensorReshapeTest, Reshape) {
+  LOG(INFO) << "shaped";
   {
     auto shaped = t.shaped<float, 1>({120});
     EXPECT_EQ(120, shaped.dimension(0));
@@ -248,6 +260,10 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(shaped(0, 0, 0, 0), 0.01f);
     EXPECT_EQ(shaped(1, 2, 3, 4), 0.02f);
   }
+}
+
+TEST_F(TensorReshapeTest, Flat) {
+  LOG(INFO) << "flat";
   {
     auto flat = t.flat<float>();
     EXPECT_EQ(flat(0), 0.01f);
@@ -255,6 +271,10 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat(0), 0.01f);
     EXPECT_EQ(flat(119), 0.02f);
   }
+}
+
+TEST_F(TensorReshapeTest, FlatInnerDims) {
+  LOG(INFO) << "flat_inner_dims";
   {
     auto flat_inner_dims = t.flat_inner_dims<float>();
     EXPECT_EQ(24, flat_inner_dims.dimension(0));
@@ -262,13 +282,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(0, 0), 0.01f);
     EXPECT_EQ(flat_inner_dims(23, 4), 0.02f);
   }
-  {
-    auto flat_outer_dims = t.flat_outer_dims<float>();
-    EXPECT_EQ(2, flat_outer_dims.dimension(0));
-    EXPECT_EQ(60, flat_outer_dims.dimension(1));
-    EXPECT_EQ(flat_outer_dims(0, 0), 0.01f);
-    EXPECT_EQ(flat_outer_dims(1, 59), 0.02f);
-  }
   {
     auto flat_inner_dims = t.flat_inner_dims<float, 3>();
     EXPECT_EQ(6, flat_inner_dims.dimension(0));
@@ -277,14 +290,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(0, 0, 0), 0.01f);
     EXPECT_EQ(flat_inner_dims(5, 3, 4), 0.02f);
   }
-  {
-    auto flat_outer_dims = t.flat_outer_dims<float, 3>();
-    EXPECT_EQ(2, flat_outer_dims.dimension(0));
-    EXPECT_EQ(3, flat_outer_dims.dimension(1));
-    EXPECT_EQ(20, flat_outer_dims.dimension(2));
-    EXPECT_EQ(flat_outer_dims(0, 0, 0), 0.01f);
-    EXPECT_EQ(flat_outer_dims(1, 2, 19), 0.02f);
-  }
   {
     auto flat_inner_dims = t.flat_inner_dims<float, 5>();
     EXPECT_EQ(1, flat_inner_dims.dimension(0));
@@ -295,6 +300,44 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_inner_dims(0, 0, 0, 0, 0), 0.01f);
     EXPECT_EQ(flat_inner_dims(0, 1, 2, 3, 4), 0.02f);
   }
+  {
+    auto flat_inner_dims = zero_t.flat_inner_dims<float>();
+    EXPECT_EQ(0, flat_inner_dims.dimension(0));
+    EXPECT_EQ(5, flat_inner_dims.dimension(1));
+  }
+  {
+    auto flat_inner_dims = zero_t.flat_inner_dims<float, 3>();
+    EXPECT_EQ(0, flat_inner_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_dims.dimension(2));
+  }
+  {
+    auto flat_inner_dims = zero_t.flat_inner_dims<float, 5>();
+    EXPECT_EQ(3, flat_inner_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_dims.dimension(2));
+    EXPECT_EQ(0, flat_inner_dims.dimension(3));
+    EXPECT_EQ(5, flat_inner_dims.dimension(4));
+  }
+}
+
+TEST_F(TensorReshapeTest, FlatOuterDims) {
+  LOG(INFO) << "flat_outer_dims";
+  {
+    auto flat_outer_dims = t.flat_outer_dims<float>();
+    EXPECT_EQ(2, flat_outer_dims.dimension(0));
+    EXPECT_EQ(60, flat_outer_dims.dimension(1));
+    EXPECT_EQ(flat_outer_dims(0, 0), 0.01f);
+    EXPECT_EQ(flat_outer_dims(1, 59), 0.02f);
+  }
+  {
+    auto flat_outer_dims = t.flat_outer_dims<float, 3>();
+    EXPECT_EQ(2, flat_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_outer_dims.dimension(1));
+    EXPECT_EQ(20, flat_outer_dims.dimension(2));
+    EXPECT_EQ(flat_outer_dims(0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_outer_dims(1, 2, 19), 0.02f);
+  }
   {
     auto flat_outer_dims = t.flat_outer_dims<float, 5>();
     EXPECT_EQ(2, flat_outer_dims.dimension(0));
@@ -305,8 +348,6 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(flat_outer_dims(0, 0, 0, 0, 0), 0.01f);
     EXPECT_EQ(flat_outer_dims(1, 2, 3, 4, 0), 0.02f);
   }
-
-  Tensor zero_t(DT_FLOAT, TensorShape({3, 0, 2, 0, 5}));
   {
     auto flat_outer_dims = zero_t.flat_outer_dims<float>();
     EXPECT_EQ(3, flat_outer_dims.dimension(0));
@@ -326,24 +367,132 @@ TEST(Tensor_Float, Reshape) {
     EXPECT_EQ(0, flat_outer_dims.dimension(3));
     EXPECT_EQ(5, flat_outer_dims.dimension(4));
   }
+}
+
+TEST_F(TensorReshapeTest, FlatInnerOuterDims) {
+  LOG(INFO) << "flat_inner_outer_dims";
   {
-    auto flat_inner_dims = zero_t.flat_inner_dims<float>();
-    EXPECT_EQ(0, flat_inner_dims.dimension(0));
-    EXPECT_EQ(5, flat_inner_dims.dimension(1));
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 4>(0);
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(1, 2, 3, 4), 0.02f);
   }
   {
-    auto flat_inner_dims = zero_t.flat_inner_dims<float, 3>();
-    EXPECT_EQ(0, flat_inner_dims.dimension(0));
-    EXPECT_EQ(0, flat_inner_dims.dimension(1));
-    EXPECT_EQ(5, flat_inner_dims.dimension(2));
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 6>(-2);
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(5));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 3, 4), 0.02f);
   }
   {
-    auto flat_inner_dims = zero_t.flat_inner_dims<float, 5>();
-    EXPECT_EQ(3, flat_inner_dims.dimension(0));
-    EXPECT_EQ(0, flat_inner_dims.dimension(1));
-    EXPECT_EQ(2, flat_inner_dims.dimension(2));
-    EXPECT_EQ(0, flat_inner_dims.dimension(3));
-    EXPECT_EQ(5, flat_inner_dims.dimension(4));
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 6>(0);
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(5));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(1, 2, 3, 4, 0, 0), 0.02f);
+  }
+  {
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 8>(-2);
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(5));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(6));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(7));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 3, 4, 0, 0), 0.02f);
+  }
+  {
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 3>(1);
+    EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(5, 3, 4), 0.02f);
+  }
+  {
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 5>(1);
+    EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(4, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(5, 3, 4, 0, 0), 0.02f);
+  }
+  {
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 3>(0);
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(20, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(1, 2, 19), 0.02f);
+  }
+  {
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 5>(-2);
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(1, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(20, flat_inner_outer_dims.dimension(4));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 0, 0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(0, 0, 1, 2, 19), 0.02f);
+  }
+  {
+    auto flat_inner_outer_dims = t.flat_inner_outer_dims<float, 2>(1);
+    EXPECT_EQ(6, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(20, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(flat_inner_outer_dims(0, 0), 0.01f);
+    EXPECT_EQ(flat_inner_outer_dims(5, 19), 0.02f);
+  }
+  {
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2>(0);
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+  }
+  {
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(0);
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(2));
+  }
+  {
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 5>(0);
+    EXPECT_EQ(3, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(2));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(3));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(4));
+  }
+  {
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 2>(3);
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(1));
+  }
+  {
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(2);
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(5, flat_inner_outer_dims.dimension(2));
+  }
+  {
+    auto flat_inner_outer_dims = zero_t.flat_inner_outer_dims<float, 3>(1);
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(0));
+    EXPECT_EQ(2, flat_inner_outer_dims.dimension(1));
+    EXPECT_EQ(0, flat_inner_outer_dims.dimension(2));
   }
 }
 
diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc
index 09b632a165..94741a11ff 100644
--- a/tensorflow/core/graph/mkl_layout_pass.cc
+++ b/tensorflow/core/graph/mkl_layout_pass.cc
@@ -35,6 +35,7 @@ limitations under the License.
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/hash/hash.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/util/tensor_format.h"
 
 #include "tensorflow/core/graph/mkl_layout_pass.h"
 #include "tensorflow/core/util/mkl_util.h"
@@ -272,6 +273,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     csinfo_.conv2d_grad_filter = "Conv2DBackpropFilter";
     csinfo_.fused_batch_norm = "FusedBatchNorm";
     csinfo_.fused_batch_norm_grad = "FusedBatchNormGrad";
+    csinfo_.identity = "Identity";
     csinfo_.lrn = "LRN";
     csinfo_.lrn_grad = "LRNGrad";
     csinfo_.matmul = "MatMul";
@@ -280,51 +282,75 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     csinfo_.mkl_conv2d = "_MklConv2D";
     csinfo_.mkl_conv2d_with_bias = "_MklConv2DWithBias";
     csinfo_.mkl_conv2d_with_bias_backprop_bias =
-        "_MklConv2DWithBiasBackpropBias";
-    csinfo_.relu = "Relu";
-    csinfo_.reshape = "Reshape";
-    csinfo_.relu_grad = "ReluGrad";
-    csinfo_.split = "Split";
+                                   "_MklConv2DWithBiasBackpropBias";
+    csinfo_.relu                  = "Relu";
+    csinfo_.relu_grad             = "ReluGrad";
+    csinfo_.reshape               = "Reshape";
+    csinfo_.split                 = "Split";
 
     // NOTE: names are alphabetically sorted.
-    rinfo_.push_back({csinfo_.avg_pool, GetMklOpName(csinfo_.avg_pool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
+    rinfo_.push_back({csinfo_.avg_pool,
+                      GetMklOpName(csinfo_.avg_pool),
+                      CopyAttrsPooling, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.avg_pool_grad,
-                      GetMklOpName(csinfo_.avg_pool_grad), 2, CopyAttrsPooling,
-                      AlwaysRewrite});
-    rinfo_.push_back({csinfo_.concat, GetMklOpName(csinfo_.concat), 0,
-                      CopyAttrsConcat, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.concatv2, GetMklOpName(csinfo_.concatv2), 0,
-                      CopyAttrsConcatV2, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.conv2d, GetMklOpName(csinfo_.conv2d), 2,
-                      CopyAttrsConv2D, AlwaysRewrite});
+                      GetMklOpName(csinfo_.avg_pool_grad),
+                      CopyAttrsPooling, AlwaysRewrite, nullptr});
+    // BiasAddGrad gets written into Conv2DWithBiasBackpropBias depending
+    // on if context contains Conv2D.
+    rinfo_.push_back({csinfo_.bias_add_grad,
+                      csinfo_.mkl_conv2d_with_bias_backprop_bias,
+                      CopyAttrsBiasAddGrad, ContextMatchRewrite,
+                      &biasaddgrad_conv2dwithbias_context_});
+    // BiasAddGrad gets written into BiasAddGrad depending on if context
+    // contains MatMul.
+    rinfo_.push_back({csinfo_.bias_add_grad, csinfo_.matmul,
+                      CopyAttrsBiasAddGrad, ContextMatchRewrite,
+                      &biasaddgrad_matmul_context_});
+    rinfo_.push_back({csinfo_.concat,
+                      GetMklOpName(csinfo_.concat),
+                      CopyAttrsConcat, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.concatv2,
+                      GetMklOpName(csinfo_.concatv2),
+                      CopyAttrsConcatV2, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.conv2d,
+                      GetMklOpName(csinfo_.conv2d),
+                      CopyAttrsConv2D, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.conv2d_grad_filter,
-                      GetMklOpName(csinfo_.conv2d_grad_filter), 3,
-                      CopyAttrsConv2D, AlwaysRewrite});
+                      GetMklOpName(csinfo_.conv2d_grad_filter),
+                      CopyAttrsConv2D, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.conv2d_grad_input,
-                      GetMklOpName(csinfo_.conv2d_grad_input), 3,
-                      CopyAttrsConv2D, AlwaysRewrite});
+                      GetMklOpName(csinfo_.conv2d_grad_input),
+                      CopyAttrsConv2D, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.fused_batch_norm,
-                      GetMklOpName(csinfo_.fused_batch_norm), 5,
-                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
+                      GetMklOpName(csinfo_.fused_batch_norm),
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite, nullptr});
     rinfo_.push_back({csinfo_.fused_batch_norm_grad,
-                      GetMklOpName(csinfo_.fused_batch_norm_grad), 5,
-                      CopyAttrsFusedBatchNorm, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.lrn, GetMklOpName(csinfo_.lrn), 1, CopyAttrsLRN,
-                      AlwaysRewrite});
-    rinfo_.push_back({csinfo_.lrn_grad, GetMklOpName(csinfo_.lrn_grad), 3,
-                      CopyAttrsLRN, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.max_pool, GetMklOpName(csinfo_.max_pool), 1,
-                      CopyAttrsPooling, AlwaysRewrite});
+                      GetMklOpName(csinfo_.fused_batch_norm_grad),
+                      CopyAttrsFusedBatchNorm, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.identity,
+                      GetMklOpName(csinfo_.identity),
+                      CopyAttrsIdentity, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.lrn,
+                      GetMklOpName(csinfo_.lrn),
+                      CopyAttrsLRN, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.lrn_grad,
+                      GetMklOpName(csinfo_.lrn_grad),
+                      CopyAttrsLRN, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.max_pool,
+                      GetMklOpName(csinfo_.max_pool),
+                      CopyAttrsPooling, NonDepthBatchWisePoolRewrite, nullptr});
     rinfo_.push_back({csinfo_.max_pool_grad,
-                      GetMklOpName(csinfo_.max_pool_grad), 3, CopyAttrsPooling,
-                      AlwaysRewrite});
-    rinfo_.push_back({csinfo_.relu, GetMklOpName(csinfo_.relu), 1,
-                      CopyAttrsRelu, AlwaysRewrite});
-    rinfo_.push_back({csinfo_.reshape, GetMklOpName(csinfo_.reshape), 2,
-                      CopyAttrsReshape, AlwaysRewrite});
-
-    // TODO(inteltf): we do not support ReluGrad and BiasAddGrad yet.
+                      GetMklOpName(csinfo_.max_pool_grad),
+                      CopyAttrsPooling, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.relu,
+                      GetMklOpName(csinfo_.relu),
+                      CopyAttrsRelu, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.relu_grad,
+                      GetMklOpName(csinfo_.relu_grad),
+                      CopyAttrsRelu, AlwaysRewrite, nullptr});
+    rinfo_.push_back({csinfo_.reshape,
+                      GetMklOpName(csinfo_.reshape),
+                      CopyAttrsReshape, AlwaysRewrite, nullptr});
 
     // Add info about which ops to add workspace edge to and the slots.
     wsinfo_.push_back({csinfo_.lrn, csinfo_.lrn_grad, 0, 2, 1, 3});
@@ -338,8 +364,15 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     // maxhops in backward data-flow graph. Since input of forward nodes
     // (Conv2D) directly goes to backward nodes, we do not expect the
     // hop-distance would be more than few nodes.
-    cinfo_.push_back({csinfo_.bias_add_grad, csinfo_.mkl_conv2d_with_bias,
-                      kNodeMergeContextMaxDepth});
+    biasaddgrad_matmul_context_ = {csinfo_.bias_add_grad, csinfo_.matmul,
+                                   kNodeMergeContextMaxDepth};
+
+    biasaddgrad_conv2dwithbias_context_ = {csinfo_.bias_add_grad,
+                                   csinfo_.mkl_conv2d_with_bias,
+                                   kNodeMergeContextMaxDepth};
+
+    cinfo_.push_back(&biasaddgrad_matmul_context_);
+    cinfo_.push_back(&biasaddgrad_conv2dwithbias_context_);
   }
 
   // Standard interface to run pass
@@ -354,7 +387,16 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // @return true, if and only if graph is mutated; false otherwise.
   bool RunPass(std::unique_ptr<Graph>* g);
 
- private:
+  /// Structure to specify the context information used in a node rewrite rule
+  typedef struct {
+    string node;     // Name of the node to be rewritten
+    string fwd;      // Name of the node in the forward pass that this node
+                     // corresponds to
+    size_t max_hop;  // Maximum number of hops the fwd is located
+                     // from this node. If the fwd is farther than max_hop
+                     // then we do not rewrite the node.
+  } ContextInfo;
+
   /// Structure to specify the name of an original node, its new name after
   /// rewrite, the number of inputs to the original node, the function to
   /// be used to copy attributes for the op, and the rule (if any) which
@@ -362,11 +404,12 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   typedef struct {
     string name;      // Original name of op of the node in the graph
     string new_name;  // New name of the op of the node in the graph
-    int num_ins;      // The number of inputs to the original op type
     // A function handler to copy attributes from an old node to a new node.
     std::function<void(const Node*, NodeBuilder*)> copy_attrs;
-    std::function<bool(const Node*)> rewrite_rule;  // A rule under which to
-                                                    // rewrite this node.
+    // A rule under which to rewrite this node
+    std::function<bool(const Node*, const ContextInfo* c)> rewrite_rule;
+    // ContextInfo, if any, to be used for rewrite
+    ContextInfo* context;
   } RewriteInfo;
 
   /// Structure to specify a forward op, a backward op, and the slot numbers
@@ -393,16 +436,6 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string new_node;  // Name of the node after merge
   } MergeInfo;
 
-  /// Structure to specify the context information used in a node rewrite rule
-  typedef struct {
-    string node;     // Name of the node to be rewritten
-    string fwd;      // Name of the node in the forward pass that this node
-                     // corresponds to
-    size_t max_hop;  // Maximum number of hops the fwd is located
-                     // from this node. If the fwd is farther than max_hop
-                     // then we do not rewrite the node.
-  } ContextInfo;
-
   /// Structure to store all constant strings
   /// NOTE: names are alphabetically sorted.
   struct {
@@ -417,6 +450,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string conv2d_grad_filter;
     string fused_batch_norm;
     string fused_batch_norm_grad;
+    string identity;
     string lrn;
     string lrn_grad;
     string matmul;
@@ -427,10 +461,11 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     string mkl_conv2d_with_bias_backprop_bias;
     string relu;
     string relu_grad;
-    string split;
     string reshape;
+    string split;
   } csinfo_;
 
+ private:
   /// Maintain info about nodes to rewrite
   std::vector<RewriteInfo> rinfo_;
 
@@ -441,7 +476,11 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   std::vector<MergeInfo> minfo_;
 
   /// Maintain info about nodes to rewrite
-  static std::vector<ContextInfo> cinfo_;
+  static std::vector<ContextInfo*> cinfo_;
+
+  /// Context variables used in referencing rules
+  static ContextInfo biasaddgrad_matmul_context_;
+  static ContextInfo biasaddgrad_conv2dwithbias_context_;
 
   /// Hash table to maintain nodes visited in the graph.
   std::unordered_set<const Node*> visited_nodes_;
@@ -464,19 +503,6 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // Clear all visited nodes
   inline void UnMarkRewrittenNodes() { visited_nodes_.clear(); }
 
-  // Is this a graph node that can accept variable number of inputs?
-  // Return true if yes, false otherwise.
-  //
-  // Concat, Split are vararg nodes.
-  inline bool IsVarArgNode(Node* n) {
-    if (n->type_string() == csinfo_.concat ||
-        n->type_string() == csinfo_.concatv2 ||
-        n->type_string() == csinfo_.split) {
-      return true;
-    }
-    return false;
-  }
-
   // Is OpDef::ArgDef a list type? It could be N * T or list(type).
   // Refer to opdef.proto for details of list type.
   inline bool ArgIsList(const OpDef::ArgDef& arg) const {
@@ -510,6 +536,39 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
     return string(kMklOpPrefix) + name;
   }
 
+  // Can op represented by node 'n' run on DEVICE_CPU?
+  // Op can run on CPU with MKL if the runtime assigned device or the
+  // user requested device contains device CPU, or both are empty.
+  bool CanOpRunOnCPUDevice(const Node* n) {
+    bool result = true;
+    string reason;
+
+    // Substring that should be checked for in device name for CPU device.
+    const char* const kCPUDeviceSubStr = "cpu";
+
+    // If Op has been specifically assigned to a non-CPU device, then No.
+    if (!n->assigned_device_name().empty() &&
+        !StringPiece(n->assigned_device_name()).contains(kCPUDeviceSubStr)) {
+      result = false;
+      reason = "Op has been assigned a runtime device that is not CPU.";
+    }
+
+    // If user has specifically assigned this op to a non-CPU device, then No.
+    if (!n->def().device().empty() &&
+        !StringPiece(n->def().device()).contains(kCPUDeviceSubStr)) {
+      result = false;
+      reason = "User has assigned a device that is not CPU.";
+    }
+
+    if (result == false) {
+      VLOG(1) << "MklLayoutRewritePass: Skipping rewriting of the node "
+              << n->type_string() << ", reason: " << reason;
+    }
+
+    // Otherwise Yes.
+    return result;
+  }
+
   // Return a node that can be merged with input node 'n'
   //
   // @return pointer to the node if we can find such a
@@ -538,13 +597,46 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
 
   // Default rewrite rule to be used in scenario 1 for rewrite.
   // @return - true (since we want to always rewrite)
-  static bool AlwaysRewrite(const Node* n) { return true; }
-  // Rewrite rule that uses context-information for matching
+  static bool AlwaysRewrite(const Node* n, const ContextInfo* c = nullptr) {
+    return true;
+  }
+
+  // Check if we are performing pooling on depth or batch. If it is, then we
+  // do not rewrite MaxPool node to Mkl version.
+  // @return - true (if it is not a depth/batch wise pooling case);
+  //           false otherwise.
+  static bool NonDepthBatchWisePoolRewrite(const Node* n,
+                                           const ContextInfo* c) {
+    CHECK_NOTNULL(n);
+
+    string data_format_str;
+    TensorFormat data_format;
+    std::vector<int32> ksize, strides;
+    CHECK_EQ(GetNodeAttr(n->def(), "ksize", &ksize).ok(), true);
+    CHECK_EQ(GetNodeAttr(n->def(), "strides", &strides).ok(), true);
+    CHECK_EQ(GetNodeAttr(n->def(), "data_format", &data_format_str).ok(),
+             true);
+    CHECK_EQ(FormatFromString(data_format_str, &data_format), true);
+
+    // Condition that specifies non-batch-wise and non-depth-wise pooling.
+    if (GetTensorDim(ksize,   data_format, 'N') == 1 &&
+        GetTensorDim(strides, data_format, 'N') == 1 &&
+        GetTensorDim(ksize,   data_format, 'C') == 1 &&
+        GetTensorDim(strides, data_format, 'C') == 1) {
+      return true;
+    }
+
+    return false;
+  }
+
+  // Rewrite rule that uses context-information for matching,
   // used in scenario 2.
   //
   // @input - Node 'n' for which to search for matching context
-  // @return - true if matching context is found; false otherwise.
-  static bool ContextMatchRewrite(const Node* n);
+  // @input - The context 'c' under which to rewrite
+  // @return - true if we can rewrite node under context 'c';
+  //           false otherwise.
+  static bool ContextMatchRewrite(const Node* n, const ContextInfo* c);
 
   // Helper function that searches the matching contextinfo for the node.
   // Implements depth-first search in the data dependence graph for the
@@ -598,6 +690,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // node that we are constructing.
   //
   // @input g - input graph,
+  // @input orig_node - Original node that we are rewriting
   // @input inputs - inputs to old node that we are using for constructing
   //                 new inputs,
   // @input input_idx - the index in the 'inputs' vector pointing to the
@@ -608,11 +701,10 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // @output output_nodes - the list of new nodes creating Mkl tensors
   //
   // @return None
-  void GetNodesProducingMklTensorList(
-      std::unique_ptr<Graph>* g,
-      const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
-      int* input_idx, int list_length,
-      std::vector<NodeBuilder::NodeOut>* output_nodes);
+  void GetNodesProducingMklTensorList(std::unique_ptr<Graph>* g,
+    Node* orig_node, const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes);
 
   // Get a node that will feed an Mkl tensor to the new
   // node that we are constructing. The output node could be (1) 'n'
@@ -620,6 +712,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // if 'n' is not an Mkl layer.
   //
   // @input g - input graph,
+  // @input orig_node - Original node that we are rewriting,
   // @input n - Node based on which we are creating Mkl node,
   // @input n_output_slot - the output slot of node 'n'
   //            which is feeding to the node that we are constructing
@@ -627,9 +720,8 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   // @output mkl_node_output_slot - the slot number of mkl_node that
   //                                will feed the tensor
   // @return None
-  void GetNodeProducingMklTensor(std::unique_ptr<Graph>* g, Node* n,
-                                 int n_output_slot, Node** mkl_node,
-                                 int* mkl_node_output_slot);
+  void GetNodeProducingMklTensor(std::unique_ptr<Graph>* g, Node* orig_node,
+    Node* n, int n_output_slot, Node** mkl_node, int* mkl_node_output_slot);
 
   // Setup new inputs using old inputs 'inputs' for the rewritten node in 'nb'
   // in graph 'g'. Original node is input in 'old_node'. Inputs to 'nb' are
@@ -680,6 +772,7 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
   static void CopyAttrsConcatV2(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsConv2D(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsFusedBatchNorm(const Node* orig_node, NodeBuilder* nb);
+  static void CopyAttrsIdentity(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsLRN(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsPooling(const Node* orig_node, NodeBuilder* nb);
   static void CopyAttrsRelu(const Node* orig_node, NodeBuilder* nb);
@@ -695,13 +788,18 @@ class MklLayoutRewritePass : public GraphOptimizationPass {
                                    Node* orig_node);
 };
 
-std::vector<MklLayoutRewritePass::ContextInfo> MklLayoutRewritePass::cinfo_;
+MklLayoutRewritePass::ContextInfo
+  MklLayoutRewritePass::biasaddgrad_conv2dwithbias_context_;
+MklLayoutRewritePass::ContextInfo
+  MklLayoutRewritePass::biasaddgrad_matmul_context_;
+std::vector<MklLayoutRewritePass::ContextInfo*> MklLayoutRewritePass::cinfo_;
 
-// We register Mkl rewrite pass for phase 1 in post rewrite group.
+// We register Mkl rewrite pass for phase 1 in post partitioning group.
 // We register it here so that we get a complete picture of all users of Mkl
 // nodes. Do not change the ordering of the Mkl passes.
-REGISTER_OPTIMIZATION(OptimizationPassRegistry::POST_REWRITE_FOR_EXEC, 1,
-                      MklLayoutRewritePass);
+const OptimizationPassRegistry::Grouping kMklLayoutRewritePassGroup =
+    OptimizationPassRegistry::POST_PARTITIONING;
+REGISTER_OPTIMIZATION(kMklLayoutRewritePassGroup, 1, MklLayoutRewritePass);
 
 //////////////////////////////////////////////////////////////////////////
 //           Helper functions for creating new node
@@ -737,27 +835,14 @@ void MklLayoutRewritePass::GetNodesProducingTFTensorList(
 
   while (list_length != 0) {
     CHECK_GT(list_length, 0);
-    CHECK_LE(*input_idx, inputs.size());
+    CHECK_LT(*input_idx, inputs.size());
     Node* n = inputs[*input_idx].first;
     int slot = inputs[*input_idx].second;
-    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
-    // If input node 'n' is producing a list/array output at output
-    // slot 'slot' then we need to find out the length of that list/array.
-    if (ArgIsList(arg)) {
-      int N = GetTensorListLength(arg, n);
-      CHECK_LE(N, list_length);
-      for (int j = 0; j < N; j++) {
-        output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
-      }
-      (*input_idx)++;
-      list_length -= N;
-    } else {
-      // But if input node 'n' is just producing a single tensor at
-      // output slot 'slot' then we just add that single node.
-      output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
-      (*input_idx)++;
-      list_length--;
-    }
+    // If input node 'n' is just producing a single tensor at
+    // output slot 'slot' then we just add that single node.
+    output_nodes->push_back(NodeBuilder::NodeOut(n, slot));
+    (*input_idx)++;
+    list_length--;
   }
 }
 
@@ -775,20 +860,39 @@ void MklLayoutRewritePass::GetDummyMklTensorNode(std::unique_ptr<Graph>* g,
   TensorShape dummy_shape({8});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                  .Attr("value", proto)
-                  .Attr("dtype", dt)
-                  .Device(orig_node->def().device())  // We place this node on
-                                                      // the same device as the
-                                                      // device of the original
-                                                      // node.
-                  .Finalize(&**g, out));
+               .Attr("value", proto)
+               .Attr("dtype", dt)
+               .Device(orig_node->def().device())  // We place this node on
+                                                   // the same device as the
+                                                   // device of the original
+                                                   // node.
+               .Finalize(&**g, out));
+
+  // If number of inputs to the original node is > 0, then we add
+  // control dependency between 1st input (index 0) of the original node and
+  // the dummy Mkl node. This is needed because control-flow ops such as Enter,
+  // Merge, etc, require frame_name of the dummy Mkl node to be same as the
+  // rewritten node. Adding control edge between 1st input of the original node
+  // and the dummy Mkl node ensures that the dummy node is in the same frame
+  // as the original node. Choosing 1st input is not necessary - any input of
+  // the original node is fine because all the inputs of a node are always in
+  // the same frame.
+  if (orig_node->num_inputs() > 0) {
+    Node* orig_input0 = nullptr;
+    TF_CHECK_OK(orig_node->input_node(0,
+                                      const_cast<const Node**>(&orig_input0)));
+    CHECK_NOTNULL((*g)->AddControlEdge(orig_input0, *out));
+  }
+
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
 void MklLayoutRewritePass::GetNodesProducingMklTensorList(
     std::unique_ptr<Graph>* g,
-    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs, int* input_idx,
-    int list_length, std::vector<NodeBuilder::NodeOut>* output_nodes) {
+    Node* orig_node,
+    const gtl::InlinedVector<std::pair<Node*, int>, 4>& inputs,
+    int* input_idx, int list_length,
+    std::vector<NodeBuilder::NodeOut>* output_nodes) {
   CHECK_LT(*input_idx, inputs.size());
   CHECK_GT(list_length, 0);
   CHECK_NOTNULL(output_nodes);
@@ -796,38 +900,19 @@ void MklLayoutRewritePass::GetNodesProducingMklTensorList(
 
   while (list_length != 0) {
     CHECK_GT(list_length, 0);
-    CHECK_LE(*input_idx, inputs.size());
+    CHECK_LT(*input_idx, inputs.size());
     Node* n = inputs[*input_idx].first;
     int slot = inputs[*input_idx].second;
-    const OpDef::ArgDef& arg = n->op_def().output_arg(slot);
-    // We need to check first if the input edge is going to carry a
-    // single tensor or a list of tensors. If it is a list of tensors,
-    // then we need to create list of Mkl dummy nodes.
-    if (ArgIsList(arg)) {
-      // If input node 'n' is producing a list/array output at output
-      // slot 'slot' then we need to find out the length of that list/array.
-      int N = GetTensorListLength(arg, n);
-      CHECK_LE(N, list_length);
-      Node* mkl_node = nullptr;
-      int mkl_node_output_slot = 0;
-      // If it is a list, then create a list of Mkl dummy nodes.
-      for (int j = 0; j < N; j++) {
-        GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
-        output_nodes->push_back(
-            NodeBuilder::NodeOut(mkl_node, mkl_node_output_slot));
-      }
-      (*input_idx)++;
-      list_length -= N;
-    } else {
-      // If it is not a list, then create a single Mkl tensor node.
-      Node* mkl_node = nullptr;
-      int mkl_node_output_slot = 0;
-      GetNodeProducingMklTensor(g, n, slot, &mkl_node, &mkl_node_output_slot);
-      output_nodes->push_back(
-          NodeBuilder::NodeOut(mkl_node, mkl_node_output_slot));
-      (*input_idx)++;
-      list_length--;
-    }
+    // If 'n' is producing a single tensor, then create a single Mkl tensor
+    // node.
+    Node* mkl_node = nullptr;
+    int mkl_node_output_slot = 0;
+    GetNodeProducingMklTensor(g, orig_node, n, slot, &mkl_node,
+                              &mkl_node_output_slot);
+    output_nodes->push_back(NodeBuilder::NodeOut(mkl_node,
+                                                mkl_node_output_slot));
+    (*input_idx)++;
+    list_length--;
   }
 }
 
@@ -835,9 +920,9 @@ void MklLayoutRewritePass::GetNodesProducingMklTensorList(
 // node that we are constructing. An input node could be (1) 'n'
 // if it is Mkl layer, or (2) a dummy node producing dummy Mkl tensor
 // if 'n' is not an Mkl layer.
-void MklLayoutRewritePass::GetNodeProducingMklTensor(
-    std::unique_ptr<Graph>* g, Node* n, int n_output_slot, Node** mkl_node,
-    int* mkl_node_output_slot) {
+void MklLayoutRewritePass::GetNodeProducingMklTensor(std::unique_ptr<Graph>* g,
+    Node* orig_node, Node* n,
+    int n_output_slot, Node** mkl_node, int* mkl_node_output_slot) {
   CHECK_NOTNULL(n);
   CHECK_NOTNULL(mkl_node);
   CHECK_NOTNULL(mkl_node_output_slot);
@@ -860,7 +945,7 @@ void MklLayoutRewritePass::GetNodeProducingMklTensor(
     // to create a dummy node that will feed a dummy Mkl tensor to this node.
     // DummyMklTensor node has no input and generates only 1 output
     // (dummy Mkl tensor) as output slot number 0.
-    GetDummyMklTensorNode(g, mkl_node, n);
+    GetDummyMklTensorNode(g, mkl_node, orig_node);
     CHECK_NOTNULL(*mkl_node);
     *mkl_node_output_slot = 0;
   }
@@ -926,16 +1011,16 @@ int MklLayoutRewritePass::SetUpContiguousInputs(
     if (ArgIsList(arg)) {
       std::vector<NodeBuilder::NodeOut> new_node_inputs;
       int N = GetTensorListLength(arg, old_node);
-      GetNodesProducingMklTensorList(g, old_node_inputs, &iidx, N,
-                                     &new_node_inputs);
+      GetNodesProducingMklTensorList(g, old_node, old_node_inputs, &iidx,
+                                     N, &new_node_inputs);
       nb->Input(new_node_inputs);
       nn_slot_idx++;
     } else {
       Node* mkl_node = nullptr;
       int mkl_node_output_slot = 0;
-      GetNodeProducingMklTensor(g, old_node_inputs[iidx].first,
-                                old_node_inputs[iidx].second, &mkl_node,
-                                &mkl_node_output_slot);
+      GetNodeProducingMklTensor(g, old_node, old_node_inputs[iidx].first,
+                                old_node_inputs[iidx].second,
+                                &mkl_node, &mkl_node_output_slot);
       nb->Input(mkl_node, mkl_node_output_slot);
       iidx++;
       nn_slot_idx++;
@@ -1020,13 +1105,30 @@ void MklLayoutRewritePass::GetDummyWorkspaceTensorNode(
   TensorShape dummy_shape({1});
   dummy_shape.AsProto(proto.mutable_tensor_shape());
   TF_CHECK_OK(NodeBuilder((*g)->NewName("DMT"), "Const")
-                  .Attr("value", proto)
-                  .Attr("dtype", dt)
-                  .Device(orig_node->def().device())  // We place this node on
-                                                      // same the device as the
-                                                      // device of the original
-                                                      // node.
-                  .Finalize(&**g, out));
+                .Attr("value", proto)
+                .Attr("dtype", dt)
+                .Device(orig_node->def().device())  // We place this node on
+                                                    // same the device as the
+                                                    // device of the original
+                                                    // node.
+                .Finalize(&**g, out));
+
+  // If number of inputs to the original node is > 0, then we add
+  // control dependency between 1st input (index 0) of the original node and
+  // the dummy Mkl node. This is needed because control-flow ops such as Enter,
+  // Merge, etc, require frame_name of the dummy Mkl node to be same as the
+  // rewritten node. Adding control edge between 1st input of the original node
+  // and the dummy Mkl node ensures that the dummy node is in the same frame
+  // as the original node. Choosing 1st input is not necessary - any input of
+  // the original node is fine because all the inputs of a node are always in
+  // the same frame.
+  if (orig_node->num_inputs() > 0) {
+    Node* orig_input0 = nullptr;
+    TF_CHECK_OK(orig_node->input_node(0,
+                                      const_cast<const Node**>(&orig_input0)));
+    CHECK_NOTNULL((*g)->AddControlEdge(orig_input0, *out));
+  }
+
   (*out)->set_assigned_device_name(orig_node->assigned_device_name());
 }
 
@@ -1179,6 +1281,16 @@ void MklLayoutRewritePass::CopyAttrsBiasAddGrad(const Node* orig_node,
   nb->Attr("data_format", data_format);
 }
 
+void MklLayoutRewritePass::CopyAttrsIdentity(const Node* orig_node,
+                                             NodeBuilder* nb) {
+  DataType T;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  // Add attributes to new node.
+  nb->Attr("T", T);
+}
+
 void MklLayoutRewritePass::CopyAttrsLRN(const Node* orig_node,
                                         NodeBuilder* nb) {
   DataType T;
@@ -1235,6 +1347,19 @@ void MklLayoutRewritePass::CopyAttrsRelu(const Node* orig_node,
   nb->Attr("T", T);
 }
 
+void MklLayoutRewritePass::CopyAttrsReshape(const Node* orig_node,
+                                           NodeBuilder* nb) {
+  DataType T;
+  DataType Tshape;
+
+  // Get all attributes from old node.
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
+  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tshape", &Tshape));
+  // Add attributes to new node.
+  nb->Attr("T", T);
+  nb->Attr("Tshape", Tshape);
+}
+
 void MklLayoutRewritePass::CopyAttrsSplit(const Node* orig_node,
                                           NodeBuilder* nb) {
   DataType T;
@@ -1303,20 +1428,6 @@ void MklLayoutRewritePass::CopyAttrsFusedBatchNorm(const Node* orig_node,
   nb->Attr("is_training", is_training);
 }
 
-void MklLayoutRewritePass::CopyAttrsReshape(const Node* orig_node,
-                                            NodeBuilder* nb) {
-  DataType T;
-  DataType Tshape;
-
-  // Get all attributes from old node.
-  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "T", &T));
-  TF_CHECK_OK(GetNodeAttr(orig_node->def(), "Tshape", &Tshape));
-
-  // Add attributes to new node.
-  nb->Attr("T", T);
-  nb->Attr("Tshape", Tshape);
-}
-
 //////////////////////////////////////////////////////////////////////////
 //           Helper functions related to node merge pass
 //////////////////////////////////////////////////////////////////////////
@@ -1353,8 +1464,9 @@ Node* MklLayoutRewritePass::CheckForNodeMerge(const Node* a) const {
       continue;
     }
 
+    const int B_in = b->num_inputs();
     gtl::InlinedVector<Node*, 4> b_control_edges;
-    gtl::InlinedVector<std::pair<Node*, int>, 4> b_in(N_in);
+    gtl::InlinedVector<std::pair<Node*, int>, 4> b_in(B_in);
     FillInputs(b, &b_control_edges, &b_in);
 
     // Shouldn't merge if a and b have different control edges.
@@ -1438,7 +1550,7 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     CHECK_EQ(succ->in_edges().size(), 2);
     Node* oper3_mkl = nullptr;  // Mkl tensor corresponding to oper3
     int oper3_mkl_slot = 0;     // For dummy MKL tensor node, output slot is 0.
-    GetDummyMklTensorNode(g, &oper3_mkl, succ);  // Get dummy Mkl tensor node
+    GetDummyMklTensorNode(g, &oper3_mkl, pred);  // Get dummy Mkl tensor node
     // as BiasAdd does not have Mkl tensor as input.
     CHECK_NOTNULL(oper3_mkl);
 
@@ -1483,9 +1595,38 @@ Status MklLayoutRewritePass::MergeNode(std::unique_ptr<Graph>* g, Node* succ,
     // Set the Mkl layer label for this op.
     new_node->AddAttr("_kernel", mkl_op_registry::kMklOpLabel);
 
+    // Incoming data edges from 'pred' node and 'succ' node to new 'new_node'
+    // node are already copied in BuildNode. We handle control edges now.
+    for (const Edge* e : pred->in_edges()) {
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(e->src(), new_node));
+      }
+    }
+    for (const Edge* e : succ->in_edges()) {
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(e->src(), new_node));
+      }
+    }
+
     // Incoming edges are fixed, we will fix the outgoing edges now.
+    // First, we will fix outgoing control edges from 'pred' node.
+    // We don't need to handle outgoing data edges from 'pred' node
+    // because pred has only 1 output going to succ node (we enforced
+    // this check for merge already).
+    for (const Edge* e : pred->out_edges()) {
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(new_node, e->dst()));
+      }
+    }
+
+    // Second, we will fix outgoing control and data edges from 'succ' node.
     for (const Edge* e : succ->out_edges()) {
-      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
+      if (e->IsControlEdge()) {
+        CHECK_NOTNULL((*g)->AddControlEdge(new_node, e->dst()));
+      } else {
+        CHECK_NOTNULL((*g)->AddEdge(new_node, e->src_output(), e->dst(),
+                                  e->dst_input()));
+      }
     }
 
     // Copy device assigned to old node to new node.
@@ -1550,18 +1691,22 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
             "data_format or T attribute or devices of BiasAddGrad and "
             "Conv2D do not match. Will skip node rewrite optimization");
       }
+    } else if (orig_node->type_string() == csinfo_.bias_add_grad &&
+               ri->new_name == csinfo_.matmul) {
+      // When BiasAddGrad has MatMul in context, we do not do any rewrite
+      // and leave BiasAddGrad as it is. But we check for this condition
+      // when we check for node rewrite rule. So we should not even come
+      // here for MatMul. So we will fail now.
+        return Status(
+            error::Code::INVALID_ARGUMENT,
+            "No rewrite is required for BiasAddGrad for MatMul context.");
     }
   }
 
   // Get all inputs.
-  const int num = orig_node->in_edges().size();
-  // Check the number of inputs against the user-specified value for non-vararg
-  // nodes.
-  if (!IsVarArgNode(orig_node)) {
-    CHECK_EQ(num, ri->num_ins);
-  }
+  const int num_inputs = orig_node->in_edges().size();
   gtl::InlinedVector<Node*, 4> control_edges;
-  gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num);
+  gtl::InlinedVector<std::pair<Node*, int>, 4> inputs(num_inputs);
   FillInputs(orig_node, &control_edges, &inputs);
 
   // Build new node. We use same name as original node, but change the op name.
@@ -1596,8 +1741,15 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
   TF_CHECK_OK(nb.Finalize(&**g, &new_node));
   CHECK_NOTNULL(new_node);
 
-  // Incoming edges from 'orig_node' node to new 'new_node' node are already
-  // copied in BuildNode. Copy outgoing edges from 'orig_node' node to new
+  // Incoming data edges from 'orig_node' node to new 'new_node' node are
+  // already copied in BuildNode. We need to handle control edges now.
+  for (const Edge* e : orig_node->in_edges()) {
+    if (e->IsControlEdge()) {
+      CHECK_NOTNULL((*g)->AddControlEdge(e->src(), new_node));
+    }
+  }
+
+  // Copy outgoing edges from 'orig_node' node to new
   // 'new_node' node, since the output also follows same ordering among
   // Tensorflow tensors and Mkl tensors. We need to connect Tensorflow
   // tensors appropriately. Specifically, nth output of the original node
@@ -1605,15 +1757,12 @@ Status MklLayoutRewritePass::RewriteNode(std::unique_ptr<Graph>* g,
   // of the tensors. For the contiguous ordering of the tensors, it will be n.
   // GetTensorDataIndex provides this mapping function.
   for (const Edge* e : orig_node->out_edges()) {
-    // We need to handle control-edges by using their original slot number.
-    // Generally, -1 is reserved for control slot.
-    if (e->src_output() < 0) {
-      (*g)->AddEdge(new_node, e->src_output(), e->dst(), e->dst_input());
+    if (e->IsControlEdge()) {
+      CHECK_NOTNULL((*g)->AddControlEdge(new_node, e->dst()));
     } else {
-      (*g)->AddEdge(
-          new_node,
-          GetTensorDataIndex(e->src_output(), e->src()->num_outputs()),
-          e->dst(), e->dst_input());
+      CHECK_NOTNULL((*g)->AddEdge(new_node, GetTensorDataIndex(e->src_output(),
+                            e->src()->num_outputs()),
+                    e->dst(), e->dst_input()));
     }
   }
 
@@ -1640,8 +1789,8 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n,
   bool is_matching_cinfo_found = false;
   std::vector<const ContextInfo*> mci;
   for (auto ci = cinfo_.cbegin(); ci != cinfo_.cend(); ++ci) {
-    if (n->type_string() == ci->node) {
-      mci.push_back(&*ci);
+    if (n->type_string() == (*ci)->node) {
+      mci.push_back(*ci);
       is_matching_cinfo_found = true;
     }
   }
@@ -1701,9 +1850,10 @@ MklLayoutRewritePass::SearchMatchingContext(const Node* n,
   return nullptr;
 }
 
-bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n) {
+bool MklLayoutRewritePass::ContextMatchRewrite(const Node* n,
+                                               const ContextInfo* c) {
   const Node* fwd_node = nullptr;
-  return SearchMatchingContext(n, &fwd_node) != nullptr;
+  return SearchMatchingContext(n, &fwd_node) == c;
 }
 
 const MklLayoutRewritePass::RewriteInfo*
@@ -1719,18 +1869,29 @@ MklLayoutRewritePass::CheckForNodeRewrite(const Node* n) const {
     return nullptr;
   }
 
-  if (!mkl_op_registry::IsMklOp(GetMklOpName(n->type_string()), T)) {
-    return nullptr;
+  // BiasAddGrad is not an Mkl layer, so we make an exception for it.
+  if (n->type_string() != csinfo_.bias_add_grad) {
+    if (!mkl_op_registry::IsMklOp(GetMklOpName(n->type_string()), T)) {
+      return nullptr;
+    }
   }
 
   // We support 2 types of node rewrites:
-  // 1. Rewriting BiasAddGrad depending on its context.
+  // 1. Rewriting BiasAddGrad depending on its MklConv2DWithBias context.
   // 2. Rewriting an op to Mkl op always
   // We return true if any of these 2 conditions is met.
 
   // Find matching RewriteInfo and then check that rewrite rule applies.
   for (auto ri = rinfo_.cbegin(); ri != rinfo_.cend(); ++ri) {
-    if (n->type_string().compare(ri->name) == 0 && ri->rewrite_rule(n)) {
+    if (n->type_string().compare(ri->name) == 0 &&
+        ri->rewrite_rule(n, ri->context)) {
+      // If we are rewriting BiasAddGrad into BiasAddGrad for MatMul context,
+      // then we just return directly.
+      if (n->type_string() == csinfo_.bias_add_grad &&
+          ri->context->fwd == csinfo_.matmul &&
+          ri->new_name == csinfo_.bias_add_grad) {
+        return nullptr;
+      }
       return &*ri;
     }
   }
@@ -1753,7 +1914,8 @@ bool MklLayoutRewritePass::RunPass(std::unique_ptr<Graph>* g) {
   GetReversePostOrder(**g, &order);  // This will give us topological sort.
 
   for (Node* n : order) {
-    if (!n->IsOp()) {
+    // If node is not an op or it cannot run on CPU device, then skip.
+    if (!n->IsOp() || !CanOpRunOnCPUDevice(n)) {
       continue;
     }
 
@@ -1801,18 +1963,31 @@ bool RunMklLayoutRewritePass(std::unique_ptr<Graph>* g) {
   return MklLayoutRewritePass().RunPass(g);
 }
 
-Status MklLayoutRewritePass::Run(const GraphOptimizationPassOptions& options) {
-  if (options.graph == nullptr) {
+Status MklLayoutRewritePass::Run(
+  const GraphOptimizationPassOptions& options) {
+  if (options.graph == nullptr && options.partition_graphs == nullptr) {
     return Status::OK();
   }
 
-  // Get the ownership of graph
-  std::unique_ptr<Graph>* g = std::move(options.graph);
-
-  RunPass(g);
-
-  // Return the ownership of graph back
-  options.graph->reset(g->release());
+  auto process_graph = [&](std::unique_ptr<Graph>* g) {
+    // Get the ownership of a graph
+    std::unique_ptr<Graph>* ng = std::move(g);
+    RunPass(ng);
+    // Return the ownership of a graph back
+    g->reset(ng->release());
+  };
+
+  if (kMklLayoutRewritePassGroup !=
+      OptimizationPassRegistry::POST_PARTITIONING) {
+    // For any pre-partitioning phase, a graph is stored in options.graph.
+    process_graph(options.graph);
+  } else {
+    // For post partitioning phase, graphs are stored in
+    // options.partition_graphs.
+    for (auto& pg : *options.partition_graphs) {
+      process_graph(&pg.second);
+    }
+  }
 
   return Status::OK();
 }
diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc
index 6e72baf84e..3c4a5263af 100644
--- a/tensorflow/core/graph/mkl_layout_pass_test.cc
+++ b/tensorflow/core/graph/mkl_layout_pass_test.cc
@@ -39,7 +39,11 @@ limitations under the License.
 namespace tensorflow {
 namespace {
 
-static void InitGraph(const string& s, Graph* graph) {
+const char kCPUDevice[] = "/job:a/replica:0/task:0/cpu:0";
+const char kGPUDevice[] = "/job:a/replica:0/task:0/gpu:0";
+
+static void InitGraph(const string& s, Graph* graph,
+                      const string& device = kCPUDevice) {
   GraphDef graph_def;
 
   auto parser = protobuf::TextFormat::Parser();
@@ -47,14 +51,18 @@ static void InitGraph(const string& s, Graph* graph) {
   CHECK(parser.MergeFromString(s, &graph_def)) << s;
   GraphConstructorOptions opts;
   TF_CHECK_OK(ConvertGraphDefToGraph(opts, graph_def, graph));
+
+  for (Node* node : graph->nodes()) {
+    node->set_assigned_device_name(device);
+  }
 }
 
 class MklLayoutPassTest : public ::testing::Test {
  public:
   MklLayoutPassTest() : graph_(OpRegistry::Global()) {}
 
-  void InitGraph(const string& s) {
-    ::tensorflow::InitGraph(s, &graph_);
+  void InitGraph(const string& s, const string& device = kCPUDevice) {
+    ::tensorflow::InitGraph(s, &graph_, device);
     original_ = CanonicalGraphString(&graph_);
   }
 
@@ -114,7 +122,8 @@ REGISTER_OP("InputList").Output("o: N * float").Attr("N: int").SetIsStateful();
 REGISTER_OP("HalfInput").Output("o: half").SetIsStateful();
 REGISTER_OP("Int32Input").Output("o: int32").SetIsStateful();
 REGISTER_OP("_MklInput").Output("o: uint8").SetIsStateful();
-REGISTER_OP("_MklInput2").Output("o: uint8").Output("o1: uint8").SetIsStateful();
+REGISTER_OP("_MklInput2").Output("o: uint8")
+                        .Output("o1: uint8").SetIsStateful();
 
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to node merge optiimization
@@ -162,8 +171,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);E(_MklConv2DWithBias);"
-            "M(_MklInput);N(_MklInput);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
-            "DMT/_0->E:5;E->Z;M->E:3;N->E:4;Y->Z:1");
+            "M(_MklInput);N(_MklInput);Y(Input);Z(Sub)|A->E;"
+            "A:control->DMT/_0:control;B->E:1;D->E:2;DMT/_0->E:5;E->Z;M->E:3;"
+            "N->E:4;Y->Z:1");
 }
 
 // C=_MklConv2D(A,M:1,B,N:1); E=BiasAdd(C,D); Z=Sub(E,Y) (for interleaved)
@@ -194,8 +204,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive1) {
       " input: ['E', 'Y']}");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);E(_MklConv2DWithBias);"
-            "M(_MklInput2);N(_MklInput2);Y(Input);Z(Sub)|A->E;B->E:1;D->E:2;"
-            "DMT/_0->E:5;E->Z;M:1->E:3;N:1->E:4;Y->Z:1");
+            "M(_MklInput2);N(_MklInput2);Y(Input);Z(Sub)|A->E;"
+            "A:control->DMT/_0:control;B->E:1;D->E:2;DMT/_0->E:5;E->Z;"
+            "M:1->E:3;N:1->E:4;Y->Z:1");
 }
 
 // C=Conv2D(A,B); E=BiasAdd(C,D); Z=Sub(E,Y);
@@ -226,8 +237,9 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Positive2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);E(_MklConv2DWithBias);Y(Input);Z(Sub)|"
-            "A->E;B->E:1;D->E:2;DMT/_0->E:3;DMT/_1->E:4;DMT/_2->E:5;"
-            "E->Z;Y->Z:1");
+            "A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;B->E:1;D->E:2;DMT/_0->E:3;DMT/_1->E:4;"
+            "DMT/_2->E:5;E->Z;Y->Z:1");
 }
 
 // Graph contains only _MklConv2D, no AddBias.
@@ -330,9 +342,6 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_Negative_AttrMismatch) {
             "N(_MklInput)|A->C;B->C:1;C->E;D->E:1;M->C:2;N->C:3");
 }
 
-// Disabling Conv2DBackpropBias test for now as we have disabled rewrite
-// of BiasAddGrad into BackpropBias
-#if 0
 // Test set 2: _MklConv2D..BiasAddGrad -> _MklConv2DWithBiasBackpropBias
 // rewrite tests
 
@@ -361,18 +370,17 @@ TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Positive) {
       " input: ['E'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(_MklConv2DWithBias);DMT/_0(Const);"
-            "E(Sub);F(_MklConv2DWithBiasBackpropBias);M(_MklInput);N(_MklInput);"
-            "O(_MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;DMT/_0->F:1;E->F;"
-            "M->D:3;N->D:4;O->D:5");
+            "E(Sub);F(_MklConv2DWithBiasBackpropBias);M(_MklInput);"
+            "N(_MklInput);O(_MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;"
+            "DMT/_0->F:1;E->F;E:control->DMT/_0:control;M->D:3;N->D:4;"
+            "O->D:5");
 }
-#endif
 
-// No _MklConv2D in context, but Conv2D in context.
-// Only Conv2D would be rewritten to _MklConv2D, but no rewrite
-// for BiasAddGrad should happen.
+// No _MklConv2DWithBias in context, but _MklConv2D in context.
+// No rewrite for BiasAddGrad should happen.
 // C=_MklConv2D(A,M,B,N); D=Sub(C,A); E=BiasAddGrad(D) (for interleaved)
 // C=_MklConv2D(A,B,M,N); D=Sub(C,A); E=BiasAddGrad(D) (for contiguous)
-TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_No_MklConv2DWithBias) {
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_Neg_NoMklConv2DWithBias) {
   InitGraph(
       "node { name: 'A' op: 'Input'}"
       "node { name: 'B' op: 'Input'}"
@@ -507,8 +515,10 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Basic) {
       "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['B', 'C'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Input);B(Input);C(_MklConv2D);D(Mul);DMT/_0(Const);DMT/_1(Const)|"
-            "A->C;B->C:1;B->D;C->D:1;DMT/_0->C:2;DMT/_1->C:3");
+            "A(Input);B(Input);C(_MklConv2D);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->C;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;B->D;C->D:1;DMT/_0->C:2;"
+            "DMT/_1->C:3");
 }
 
 // 2 Conv2D Ops in sequence. Both should get transformed and 1st Conv2D will
@@ -535,7 +545,9 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Positive1) {
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(_MklConv2D);D(_MklConv2D);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;B->C:1;C->D:1;C->E;"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->C;A->D;"
+            "A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;B->C:1;C->D:1;C->E;"
             "C:1->D:3;D->E:1;DMT/_0->C:2;DMT/_1->C:3;DMT/_2->D:2");
 }
 
@@ -558,6 +570,50 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_Negative_UnsupportedType) {
             "A->C;B->C:1;B->D;C->D:1");
 }
 
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2DGradFilter_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Int32Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Conv2DBackpropFilter'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Int32Input);C(Input);D(_MklConv2DBackpropFilter);"
+            "DMT/_0(Const);DMT/_1(Const);DMT/_2(Const);E(Mul)|"
+            "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:4;DMT/_2->D:5");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2DGradInput_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Int32Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Conv2DBackpropInput'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['B', 'A', 'C']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Int32Input);C(Input);D(_MklConv2DBackpropInput);"
+            "DMT/_0(Const);DMT/_1(Const);DMT/_2(Const);E(Mul)|"
+            "A->D:1;A->E;B->D;B:control->DMT/_0:control;"
+            "B:control->DMT/_1:control;B:control->DMT/_2:control;C->D:2;"
+            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+}
+
 // Concat Op test: Concat with no Mkl layer feeding it
 TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Basic) {
   InitGraph(
@@ -572,13 +628,14 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Basic) {
       "node { name: 'D' op: 'Concat'"
       " attr { key: 'T'                value { type: DT_FLOAT } }"
       " attr { key: 'N'                value { i: 2 } }"
-      " input: ['A', 'B']}"
+      " input: ['A', 'B:0', 'B:1']}"
       "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Const);B(InputList);C(Input);D(_MklConcat);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D;B->D:1;B->D:2;C->E;"
-            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;A:control->DMT/_2:control;B->D:1;"
+            "B:1->D:2;C->E;D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
 }
 
 // Concat with 2 Mkl layers feeding it
@@ -616,9 +673,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_Mkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(_MklConv2D);"
-            "F(_MklConv2D);G(Const);H(_MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "F(_MklConv2D);G(Const);H(_MklConcat);I(Mul)|A->E;A->I;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "B->E:1;C->F;C:control->DMT/_0:control;C:control->DMT/_1:control;"
             "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
-            "DMT/_4->H:3;E->H:1;E:1->H:4;F->H:2;F:1->H:5;G->H;H->I:1");
+            "DMT/_4->H:3;E->H:1;E:1->H:4;F->H:2;F:1->H:5;G->H;"
+            "G:control->DMT/_4:control;H->I:1");
 }
 
 // Concat with 1 Mkl and 1 non-Mkl layer feeding it
@@ -651,12 +711,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_Concat_Input_MixedMkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);E(_MklConv2D);F(Mul);G(Const);"
-            "H(_MklConcat);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "H(_MklConcat);I(Mul)|A->E;A->I;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
             "DMT/_1->E:3;DMT/_2->H:3;DMT/_3->H:5;E->H:1;E:1->H:4;F->H:2;"
-            "G->H;H->I:1");
+            "G->H;G:control->DMT/_2:control;G:control->DMT/_3:control;H->I:1");
 }
 
-#if 0
 // ConcatV2 Op test: ConcatV2 with no Mkl layer feeding it
 TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Basic) {
   InitGraph(
@@ -676,11 +736,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Basic) {
       "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['C', 'D'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
-            "A(Const);B(InputList);C(Input);D(_MklConcat);DMT/_0(Const);"
-            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D:2;B->D;B:1->D:1;C->E;"
-            "D->E:1;DMT/_0->D:3;DMT/_1->D:4;DMT/_2->D:5");
+            "A(Const);B(InputList);C(Input);D(_MklConcatV2);DMT/_0(Const);"
+            "DMT/_1(Const);DMT/_2(Const);E(Mul)|A->D:2;B->D;B:1->D:1;"
+            "B:control->DMT/_0:control;B:control->DMT/_1:control;"
+            "B:control->DMT/_2:control;C->E;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:4;DMT/_2->D:5");
 }
-#endif
 
 // ConcatV2 with 2 Mkl layers feeding it
 TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_Mkl) {
@@ -718,9 +779,12 @@ TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_Mkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(_MklConv2D);"
-            "F(_MklConv2D);G(Const);H(_MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;"
+            "F(_MklConv2D);G(Const);H(_MklConcatV2);I(Mul)|A->E;A->I;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;B->E:1;C->F;"
+            "C:control->DMT/_0:control;C:control->DMT/_1:control;"
             "D->F:1;DMT/_0->F:2;DMT/_1->F:3;DMT/_2->E:2;DMT/_3->E:3;"
-            "DMT/_4->H:5;E->H;E:1->H:3;F->H:1;F:1->H:4;G->H:2;H->I:1");
+            "DMT/_4->H:5;E->H;E:1->H:3;E:control->DMT/_4:control;F->H:1;"
+            "F:1->H:4;G->H:2;H->I:1");
 }
 
 // ConcatV2 with 1 Mkl and 1 non-Mkl layer feeding it
@@ -754,11 +818,175 @@ TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_Input_MixedMkl) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);E(_MklConv2D);F(Mul);G(Const);"
-            "H(_MklConcatV2);I(Mul)|A->E;A->I;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
-            "DMT/_1->E:3;DMT/_2->H:4;DMT/_3->H:5;E->H;E:1->H:3;F->H:1;"
+            "H(_MklConcatV2);I(Mul)|A->E;A->I;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->E:1;C->F;D->F:1;DMT/_0->E:2;"
+            "DMT/_1->E:3;DMT/_2->H:4;DMT/_3->H:5;E->H;E:1->H:3;"
+            "E:control->DMT/_2:control;E:control->DMT/_3:control;F->H:1;"
             "G->H:2;H->I:1");
 }
 
+TEST_F(MklLayoutPassTest, NodeRewrite_Relu_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Relu'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklRelu);C(Mul);DMT/_0(Const)|A->B;A->C;"
+            "A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ReluGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'ReluGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(_MklReluGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->C;A->D;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;C->D:1;DMT/_0->C:2;DMT/_1->C:3");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ReluReluGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Relu'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'ReluGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklRelu);C(_MklReluGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->B;A->C;A->D;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;B:1->C:3;C->D:1;DMT/_0->B:1;"
+            "DMT/_1->C:2");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPool_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'AvgPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklAvgPool);C(Mul);DMT/_0(Const)|A->B;A->C;"
+            "A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPoolGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Int32Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'AvgPoolGrad' "
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['B', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Int32Input);B(Input);C(_MklAvgPoolGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const)|A->C;A:control->DMT/_0:control;"
+            "A:control->DMT/_1:control;B->C:1;B->D;C->D:1;DMT/_0->C:2;"
+            "DMT/_1->C:3");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPoolAvgPoolGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'I' op: 'Int32Input'}"
+      "node { name: 'B' op: 'AvgPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'AvgPoolGrad' "
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:3, i:3} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:2, i:2} } }"
+      " input: ['I', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(_MklAvgPool);C(_MklAvgPoolGrad);D(Mul);DMT/_0(Const);"
+            "DMT/_1(Const);I(Int32Input)|A->B;A->D;A:control->DMT/_0:control;"
+            "B->C:1;B:1->C:3;C->D:1;DMT/_0->B:1;DMT/_1->C:2;I->C;"
+            "I:control->DMT/_1:control");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_FusedBatchNormGrad_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'FusedBatchNormGrad'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'epsilon'      value { f: 0.0001 } }"
+      " attr { key: 'is_training'  value { b: true } }"
+      " input: ['A', 'B', 'C', 'D', 'E'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'F'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Input);"
+            "F(_MklFusedBatchNormGrad);G(Mul)|A->F;A->G;"
+            "A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->F:1;C->F:2;D->F:3;"
+            "DMT/_0->F:5;DMT/_1->F:6;DMT/_2->F:7;DMT/_3->F:8;DMT/_4->F:9;"
+            "E->F:4;F->G:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_FusedBatchNorm_Positive) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'FusedBatchNorm'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'epsilon'      value { f: 0.0001 } }"
+      " attr { key: 'is_training'  value { b: true } }"
+      " input: ['A', 'B', 'C', 'D', 'E'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'F'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
+            "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Input);"
+            "F(_MklFusedBatchNorm);G(Mul)|A->F;A->G;"
+            "A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->F:1;C->F:2;D->F:3;"
+            "DMT/_0->F:5;DMT/_1->F:6;DMT/_2->F:7;DMT/_3->F:8;DMT/_4->F:9;"
+            "E->F:4;F->G:1");
+}
+
 /////////////////////////////////////////////////////////////////////
 //  Unit tests related to rewriting node for workspace edges
 /////////////////////////////////////////////////////////////////////
@@ -802,13 +1030,13 @@ TEST_F(MklLayoutPassTest, MaxPoolLRN_Positive) {
       "node { name: 'H' op: 'Input'}"
       "node { name: 'I' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
       " input: ['H', 'G'] }");
-  EXPECT_EQ(
-      DoMklLayoutOptimizationPass(),
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
       "A(Input);B(_MklLRN);C(_MklMaxPool);D(Input);DMT/_0(Const);DMT/_1(Const);"
-      "DMT/_2(Const);E(_MklMaxPoolGrad);F(Input);G(_MklLRNGrad);H(Input);I(Mul)|"
-      "A->B;B->C;B->E;B->G:2;B:1->G:3;B:2->C:1;B:2->E:4;B:2->G:6;B:3->G:7;"
-      "C->E:1;C:1->E:3;C:2->E:5;C:3->E:7;D->E:2;DMT/_0->B:1;DMT/_1->E:6;"
-      "DMT/_2->G:5;E->G;E:1->G:4;F->G:1;G->I:1;H->I");
+      "DMT/_2(Const);E(_MklMaxPoolGrad);F(Input);G(_MklLRNGrad);H(Input);"
+      "I(Mul)|A->B;A:control->DMT/_0:control;B->C;B->E;B->G:2;B:1->G:3;"
+      "B:2->C:1;B:2->E:4;B:2->G:6;B:3->G:7;B:control->DMT/_1:control;C->E:1;"
+      "C:1->E:3;C:2->E:5;C:3->E:7;D->E:2;DMT/_0->B:1;DMT/_1->E:6;DMT/_2->G:5;"
+      "E->G;E:1->G:4;E:control->DMT/_2:control;F->G:1;G->I:1;H->I");
 }
 
 /* Test LRN->LRNGrad replacement by workspace nodes. */
@@ -838,8 +1066,9 @@ TEST_F(MklLayoutPassTest, LRN_Positive) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);E(_MklLRNGrad);F(Mul)|"
-            "A->B;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;C->E;C->F;D->E:1;"
-            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:5;E->F:1");
+            "A->B;A:control->DMT/_0:control;B->E:2;B:1->E:3;B:2->E:6;B:3->E:7;"
+            "C->E;C->F;C:control->DMT/_1:control;C:control->DMT/_2:control;"
+            "D->E:1;DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:5;E->F:1");
 }
 
 /* Test LRN->LRNGrad replacement when only one of them is present. */
@@ -858,7 +1087,7 @@ TEST_F(MklLayoutPassTest, LRN_Negative1) {
       " input: ['A', 'B'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklLRN);C(Mul);DMT/_0(Const)|"
-            "A->B;A->C;B->C:1;DMT/_0->B:1");
+            "A->B;A->C;A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
 }
 
 /* Test LRN->LRNGrad replacement when only one of them is present. */
@@ -880,8 +1109,10 @@ TEST_F(MklLayoutPassTest, LRN_Negative2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(_MklLRNGrad);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
-            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
-            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+            "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:7;DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
 }
 
 /* Test LRN->LRNGrad negative case, where single LRN feeds
@@ -920,9 +1151,13 @@ TEST_F(MklLayoutPassTest, LRN_Negative3) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);"
             "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);DMT/_5(Const);"
-            "DMT/_6(Const);E(_MklLRNGrad);F(_MklLRNGrad);G(Mul)|A->B;B->E:2;"
-            "B->F:1;B:1->E:3;B:2->E:6;B:2->F:5;B:3->E:7;C->E;C->F;D->E:1;"
-            "D->F:2;DMT/_0->B:1;DMT/_1->F:3;DMT/_2->F:7;DMT/_3->F:4;"
+            "DMT/_6(Const);E(_MklLRNGrad);F(_MklLRNGrad);G(Mul)|A->B;"
+            "A:control->DMT/_0:control;B->E:2;"
+            "B->F:1;B:1->E:3;B:2->E:6;B:2->F:5;B:3->E:7;C->E;C->F;"
+            "C:control->DMT/_1:control;C:control->DMT/_2:control;"
+            "C:control->DMT/_3:control;C:control->DMT/_4:control;"
+            "C:control->DMT/_5:control;C:control->DMT/_6:control;"
+            "D->E:1;D->F:2;DMT/_0->B:1;DMT/_1->F:3;DMT/_2->F:7;DMT/_3->F:4;"
             "DMT/_4->F:6;DMT/_5->E:4;DMT/_6->E:5;E->G;F->G:1");
 }
 
@@ -951,8 +1186,9 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Positive) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklMaxPool);C(Input);D(Input);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);E(_MklMaxPoolGrad);F(Mul)|"
-            "A->B;B->E:1;B:1->E:3;B:2->E:5;B:3->E:7;C->E;C->F;D->E:2;"
-            "DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:6;E->F:1");
+            "A->B;A:control->DMT/_0:control;B->E:1;B:1->E:3;B:2->E:5;B:3->E:7;"
+            "C->E;C->F;C:control->DMT/_1:control;C:control->DMT/_2:control;"
+            "D->E:2;DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:6;E->F:1");
 }
 
 // Test MaxPool>MaxPoolGrad replacement when only one of them is present.
@@ -972,7 +1208,7 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative1) {
       " input: ['A', 'B'] }");
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(_MklMaxPool);C(Mul);DMT/_0(Const)|"
-            "A->B;A->C;B->C:1;DMT/_0->B:1");
+            "A->B;A->C;A:control->DMT/_0:control;B->C:1;DMT/_0->B:1");
 }
 
 // Test MaxPoolGrad replacement when only one of them is present.
@@ -995,8 +1231,374 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) {
   EXPECT_EQ(DoMklLayoutOptimizationPass(),
             "A(Input);B(Input);C(Input);D(_MklMaxPoolGrad);DMT/_0(Const);"
             "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Mul)|"
-            "A->D;A->E;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;DMT/_1->D:7;"
-            "DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+            "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;"
+            "A:control->DMT/_2:control;A:control->DMT/_3:control;"
+            "A:control->DMT/_4:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;"
+            "DMT/_1->D:7;DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6");
+}
+
+// Test MaxPool handling for batch-wise pooling (NCHW)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative3) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 2, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for batch-wise pooling (NCHW)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative4) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 2, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative5) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:2, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NCHW)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative6) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:2, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for batch-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative7) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 2, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for batch-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative8) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 2, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative9) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:2} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Test MaxPool handling for depth-wise pooling (NHWC)
+// No rewrite should take place in such case
+TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative10) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:2} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }");
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+/////////////////////////////////////////////////////////////////////
+
+// Single Conv2D Op on GPU device
+// No rewrite should happen
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2D_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Conv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B']}"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['B', 'C'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Conv2D);D(Mul)|A->C;B->C:1;B->D;C->D:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DBackprop_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'O' op: '_MklInput'}"
+      "node { name: 'D' op: '_MklConv2DWithBias'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C', 'M', 'N', 'O']}"
+      "node { name: 'E' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['D', 'A']}"
+      "node { name: 'F' op: 'BiasAddGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['E'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(_MklConv2DWithBias);"
+            "E(Sub);F(BiasAddGrad);M(_MklInput);N(_MklInput);"
+            "O(_MklInput)|A->D;A->E:1;B->D:1;C->D:2;D->E;E->F;"
+            "M->D:3;N->D:4;O->D:5");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_Conv2DGradFilter_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Int32Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Conv2DBackpropFilter'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'C']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'D'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Int32Input);C(Input);D(Conv2DBackpropFilter);E(Mul)|"
+            "A->D;A->E;B->D:1;C->D:2;D->E:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_Relu_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Relu'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Relu);C(Mul)|A->B;A->C;B->C:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ReluGrad_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'ReluGrad'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }"
+      "node { name: 'D' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'C'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(ReluGrad);D(Mul)|A->C;A->D;B->C:1;C->D:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_MaxPool_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'MaxPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(MaxPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_AvgPool_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'AvgPool'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NHWC' } }"
+      " attr { key: 'ksize'        value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'      value { s: 'VALID' } }"
+      " attr { key: 'strides'      value { list: {i: 1, i:1, i:1, i:1} } }"
+      " input: ['A'] }"
+      "node { name: 'C' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'B'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(AvgPool);C(Mul)|A->B;A->C;B->C:1");
+}
+
+// Concat Op test: Concat with no Mkl layer feeding it
+TEST_F(MklLayoutPassTest, NodeRewrite_Concat_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Concat'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['A', 'B:0', 'B:1']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(Concat);E(Mul)|A->D;"
+            "B->D:1;B:1->D:2;C->E;D->E:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_ConcatV2_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Const' "
+      " attr { key: 'dtype' value { type: DT_INT32 } }"
+      " attr { key: 'value' value { "
+      "    tensor { dtype: DT_INT32 tensor_shape { dim { size: 1 } } "
+      "    int_val: 0 } } } }"
+      "node { name: 'B' op: 'InputList'"
+      " attr { key: 'N'                value { i: 2 } }}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'ConcatV2'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'Tidx'             value { type: DT_INT32 } }"
+      " attr { key: 'N'                value { i: 2 } }"
+      " input: ['B:0', 'B:1', 'A']}"
+      "node { name: 'E' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['C', 'D'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Const);B(InputList);C(Input);D(ConcatV2);E(Mul)|"
+            "A->D:2;B->D;B:1->D:1;C->E;D->E:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeRewrite_FusedBatchNorm_DeviceTest) {
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'C' op: 'Input'}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'Input'}"
+      "node { name: 'F' op: 'FusedBatchNorm'"
+      " attr { key: 'T'            value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'  value { s: 'NCHW' } }"
+      " attr { key: 'epsilon'      value { f: 0.0001 } }"
+      " attr { key: 'is_training'  value { b: true } }"
+      " input: ['A', 'B', 'C', 'D', 'E'] }"
+      "node { name: 'G' op: 'Mul' attr { key: 'T' value { type: DT_FLOAT } }"
+      " input: ['A', 'F'] }", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(Input);D(Input);E(Input);"
+            "F(FusedBatchNorm);G(Mul)|A->F;A->G;B->F:1;C->F:2;D->F:3;"
+            "E->F:4;F->G:1");
+}
+
+TEST_F(MklLayoutPassTest, NodeMerge_Conv2DWithBias_DeviceTest) {
+  CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
+  InitGraph(
+      "node { name: 'A' op: 'Input'}"
+      "node { name: 'B' op: 'Input'}"
+      "node { name: 'M' op: '_MklInput'}"
+      "node { name: 'N' op: '_MklInput'}"
+      "node { name: 'C' op: '_MklConv2D'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " attr { key: 'use_cudnn_on_gpu' value { b: false } }"
+      " attr { key: 'strides'          value { list: {i: 1, i:1, i:1, i:1} } }"
+      " attr { key: 'padding'          value { s: 'SAME' } }"
+      " input: ['A', 'B', 'M', 'N']}"
+      "node { name: 'D' op: 'Input'}"
+      "node { name: 'E' op: 'BiasAdd'"
+      " attr { key: 'T'                value { type: DT_FLOAT } }"
+      " attr { key: 'data_format'      value { s: 'NCHW' } }"
+      " input: ['C', 'D'] }"
+      "node { name: 'Y' op: 'Input'}"
+      "node { name: 'Z' op: 'Sub'"
+      " attr {key: 'T'                 value { type: DT_FLOAT } }"
+      " input: ['E', 'Y']}", kGPUDevice);
+  EXPECT_EQ(DoMklLayoutOptimizationPass(),
+            "A(Input);B(Input);C(_MklConv2D);D(Input);E(BiasAdd);"
+            "M(_MklInput);N(_MklInput);Y(Input);Z(Sub)|A->C;"
+            "B->C:1;C->E;D->E:1;E->Z;M->C:2;N->C:3;Y->Z:1");
 }
 
 /////////////////////////////////////////////////////////////////////
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc
index 55c280719c..590b3d030f 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc
@@ -98,12 +98,13 @@ class MklToTfConversionPass : public GraphOptimizationPass {
   Status InsertConversionNodeOnEdge(std::unique_ptr<Graph>* g, Edge*);
 };
 
-// We register MklToTf insertion for phase 1 in post-partition grouping.
-// We register this pass after partitioning so that we get a complete
-// picture of inputs and outputs of the nodes in the graphs.
+// We register MklToTf insertion for phase 2 in post-partition grouping
+// because we register MklLayoutRewritePass for phase 1 in post-partition
+// grouping. We register this pass after partitioning so that we get a
+// complete picture of inputs and outputs of the nodes in the graphs.
 const OptimizationPassRegistry::Grouping kMklTfConvPassGroup =
     OptimizationPassRegistry::POST_PARTITIONING;
-REGISTER_OPTIMIZATION(kMklTfConvPassGroup, 1, MklToTfConversionPass);
+REGISTER_OPTIMIZATION(kMklTfConvPassGroup, 2, MklToTfConversionPass);
 
 Status MklToTfConversionPass::InsertConversionNodeOnEdge(
     std::unique_ptr<Graph>* g, Edge* e) {
@@ -121,10 +122,12 @@ Status MklToTfConversionPass::InsertConversionNodeOnEdge(
   string data_format;
 
   TF_CHECK_OK(GetNodeAttr(src->def(), "T", &src_datatype));
-  TF_CHECK_OK(GetNodeAttr(dst->def(), "T", &dst_datatype));
-  if (src_datatype != dst_datatype) {
-    string err_msg = "T attribute of " + src->name() + " and " + dst->name() +
-                     " do not match. Will not insert" +
+  bool dst_dtype_found = GetNodeAttr(dst->def(), "T", &dst_datatype) ==
+                          Status::OK();
+  // We compare source and destination datatypes only when both are found.
+  if (dst_dtype_found && (src_datatype != dst_datatype)) {
+    string err_msg = "T attribute of " + src->name() + " and " +
+                      dst->name() + " do not match. Will not insert" +
                      " MklToTf node in such case.";
     return Status(error::Code::INVALID_ARGUMENT, err_msg.c_str());
   }
@@ -202,18 +205,19 @@ bool MklToTfConversionPass::RunPass(std::unique_ptr<Graph>* g) {
             << src->type_string() << " and " << dst->type_string();
 
     // Let's get source and destination data type.
-    DataType src_datatype = DT_INVALID;
-    if (GetNodeAttr(src->def(), "T", &src_datatype) != Status::OK()) {
-      continue;
-    }
     // We cannot check datatype on destination node because destination node
     // may not be Mkl node.
-    DataType dst_datatype = DT_INVALID;
-    GetNodeAttr(dst->def(), "T", &dst_datatype);
+    DataType src_datatype;
+    DataType dst_datatype;
+    bool src_is_mkl_op = (GetNodeAttr(src->def(), "T", &src_datatype) ==
+                            Status::OK() &&
+                          IsMklSupportedOp(src->type_string(), src_datatype));
+    bool dst_is_mkl_op = (GetNodeAttr(dst->def(), "T", &dst_datatype) ==
+                            Status::OK() &&
+                          IsMklSupportedOp(dst->type_string(), dst_datatype));
 
     // Check if src with is Mkl-compliant, while dst is not Mkl-compliant.
-    if (IsMklSupportedOp(src->type_string(), src_datatype) &&
-        !IsMklSupportedOp(dst->type_string(), dst_datatype)) {
+    if (src_is_mkl_op && !dst_is_mkl_op) {
       VLOG(1) << "MklToTfConversionPass: Scheduled nodes " << src->name()
               << " and " << dst->name() << " for inserting conversion nodes";
       candidate_edges.push_back(const_cast<Edge*>(e));
diff --git a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
index bd2cb0989c..90bef11164 100644
--- a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
+++ b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc
@@ -149,7 +149,7 @@ TEST_F(MklToTfConversionPass, Positive) {
         " input: ['C', 'D']}");
     EXPECT_EQ(DoRunMklToTfConversionPass(),
               "A(Input);B(Input);C(_MklConv2D);D(Input);E(Sub);M(_MklInput);"
-              "_Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:2;C->Mkl2Tf/_0;"
+              "Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:2;C->Mkl2Tf/_0;"
               "C:1->Mkl2Tf/_0:1;D->E:1;M->C:1;Mkl2Tf/_0->E;N->C:3");
   } else {
     CHECK_EQ(kTensorOrdering, MklTfTensorOrdering::TENSORS_CONTIGUOUS);
@@ -172,7 +172,7 @@ TEST_F(MklToTfConversionPass, Positive) {
         " input: ['C', 'D']}");
     EXPECT_EQ(DoRunMklToTfConversionPass(),
               "A(Input);B(Input);C(_MklConv2D);D(Input);E(Sub);M(_MklInput);"
-              "_Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:1;C->Mkl2Tf/_0;"
+              "Mkl2Tf/_0(_MklToTf);N(_MklInput)|A->C;B->C:1;C->Mkl2Tf/_0;"
               "C:1->Mkl2Tf/_0:1;D->E:1;M->C:2;Mkl2Tf/_0->E;N->C:3");
   }
 }
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 042c839faa..75921a87b5 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4945,6 +4945,14 @@ tf_mkl_kernel_library(
     ],
 )
 
+tf_mkl_kernel_library(
+    name = "mkl_identity_op",
+    prefix = "mkl_identity_op",
+    deps = ARRAY_DEPS + [
+        "//third_party/mkl:intel_binary_blob",
+    ],
+)
+
 tf_mkl_kernel_library(
     name = "mkl_lrn_op",
     prefix = "mkl_lrn_op",
diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
index 8bd1724e32..d90baee069 100644
--- a/tensorflow/core/kernels/mkl_avgpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -343,11 +343,10 @@ class MklAvgPoolingGradOp : public OpKernel {
       if (!outbackprop_in_mkl_format) {
         // For avgpooling, tensor_in_shape should have 1 dimension, and 4
         // elements.
-        OP_REQUIRES(
-            context,
-            tensor_in_shape.dims() == 1 && tensor_in_shape.NumElements() == 4,
-            errors::InvalidArgument("original input shape must be "
-                                    "1-dimensional and 4 elements"));
+        OP_REQUIRES(context, tensor_in_shape.dims() == 1 &&
+                                 tensor_in_shape.NumElements() == 4,
+                    errors::InvalidArgument("original input shape must be "
+                                            "1-dimensional and 4 elements"));
 
         // For avgpooling, out_backprop should have 4 dimensions.
         OP_REQUIRES(context, out_backprop.dims() == 4,
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
index 27930c44a6..094ab1c6c6 100644
--- a/tensorflow/core/kernels/mkl_concat_op.cc
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -265,6 +265,7 @@ class MklConcatOp : public OpKernel {
           s.GetDimension() > 0 ? s.GetSizes()[concat_dim] : 1;
     }
     mkl_context.MklCreateInputLayouts(context, input_shapes);
+    OP_REQUIRES_OK(context, context->status());
 
     CHECK_EQ(dnnConcatCreate_F32(&mkl_context.prim_concat, NULL, N,
                                  &mkl_context.lt_inputs[0]),
@@ -316,12 +317,14 @@ class MklConcatOp : public OpKernel {
 
     mkl_context.mkl_tmp_tensors.resize(N);
     mkl_context.MklPrepareConcatInputs(context, input_tensors);
+    OP_REQUIRES_OK(context, context->status());
 
     // Execute primitive.
     CHECK_EQ(dnnExecute_F32(mkl_context.prim_concat, mkl_context.concat_res),
              E_SUCCESS);
 
     mkl_context.MklCleanup();
+    OP_REQUIRES_OK(context, context->status());
   }
 
  private:
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
index 8a1006a8e9..d4364d31e4 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -38,9 +38,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
+#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
-#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -252,7 +252,7 @@ class MklConv2DCustomBackpropBiasOp : public OpKernel {
 };
 
 #define REGISTER_CPU_KERNELS(T)                                     \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBiasBackpropBias")     \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBiasBackpropBias")    \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
index 6381b527a1..dc6b88e953 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -37,9 +37,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
+#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
-#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -266,8 +266,11 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
     int input_offsets[2];
     size_t conv_strides[2];
     MklShape input_shape, grad_filter_shape, out_backprop_shape;
-    dnnPrimitive_t prim_conv_bwdfilter, convert_bwdfilter;
-    dnnLayout_t lt_input, lt_grad_filter, lt_out_backprop;
+    dnnPrimitive_t prim_conv_bwdfilter = nullptr;
+    dnnPrimitive_t convert_bwdfilter = nullptr;
+    dnnLayout_t lt_input = nullptr;
+    dnnLayout_t lt_grad_filter = nullptr;
+    dnnLayout_t lt_out_backprop = nullptr;
     void* conv_res[dnnResourceNumber];
 
     void MklCleanup() {
@@ -409,7 +412,7 @@ class MklConv2DCustomBackpropFilterOp : public OpKernel {
 };
 
 #define REGISTER_MKL_FILTER_KERNELS(T)                              \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropFilter")           \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropFilter")          \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index 638ce4c024..c97f1dd7b7 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -23,8 +23,6 @@ limitations under the License.
 #define EIGEN_USE_THREADS
 #include <algorithm>
 #include <vector>
-#include "third_party/mkl/include/mkl_dnn.h"
-#include "third_party/mkl/include/mkl_dnn_types.h"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -42,6 +40,8 @@ limitations under the License.
 #include "tensorflow/core/util/tensor_format.h"
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
 
 namespace tensorflow {
 
@@ -342,7 +342,7 @@ class MklConv2DCustomBackpropInputOp : public OpKernel {
 };
 
 #define REGISTER_MKL_CPU_KERNELS(T)                                 \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropInput")            \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DBackpropInput")           \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index b818819b02..76b9f1798d 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -36,9 +36,9 @@ limitations under the License.
 #include "tensorflow/core/util/padding.h"
 #include "tensorflow/core/util/tensor_format.h"
 
+#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
-#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -98,19 +98,18 @@ class MklConv2DOp : public OpKernel {
                                         filter.shape().DebugString()));
 
     for (int i = 0; i < 3; i++) {
-      OP_REQUIRES(
-          context,
-          FastBoundsCheck(filter.dim_size(i), std::numeric_limits<int>::max()),
-          errors::InvalidArgument("filter too large"));
+      OP_REQUIRES(context, FastBoundsCheck(filter.dim_size(i),
+                                           std::numeric_limits<int>::max()),
+                  errors::InvalidArgument("filter too large"));
     }
 
     const int64 input_depth =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'C')
                             : GetTensorDim(input, data_format_, 'C');
-    OP_REQUIRES(context, input_depth == filter.dim_size(2),
-                errors::InvalidArgument(
-                    "input and filter must have the same depth: ", input_depth,
-                    " vs ", filter.dim_size(2)));
+    OP_REQUIRES(
+        context, input_depth == filter.dim_size(2),
+        errors::InvalidArgument("input and filter must have the same depth: ",
+                                input_depth, " vs ", filter.dim_size(2)));
     // The last dimension for filter is out_depth.
     const int out_depth = static_cast<int>(filter.dim_size(3));
 
@@ -119,10 +118,9 @@ class MklConv2DOp : public OpKernel {
     const int64 input_rows_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'H')
                             : GetTensorDim(input, data_format_, 'H');
-    OP_REQUIRES(
-        context,
-        FastBoundsCheck(input_rows_raw, std::numeric_limits<int>::max()),
-        errors::InvalidArgument("Input rows too large"));
+    OP_REQUIRES(context, FastBoundsCheck(input_rows_raw,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("Input rows too large"));
     const int input_rows = static_cast<int>(input_rows_raw);
     const int filter_rows = static_cast<int>(filter.dim_size(0));
 
@@ -131,10 +129,9 @@ class MklConv2DOp : public OpKernel {
     const int64 input_cols_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'W')
                             : GetTensorDim(input, data_format_, 'W');
-    OP_REQUIRES(
-        context,
-        FastBoundsCheck(input_cols_raw, std::numeric_limits<int>::max()),
-        errors::InvalidArgument("Input cols too large"));
+    OP_REQUIRES(context, FastBoundsCheck(input_cols_raw,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("Input cols too large"));
     const int input_cols = static_cast<int>(input_cols_raw);
     const int filter_cols = static_cast<int>(filter.dim_size(1));
 
@@ -142,10 +139,9 @@ class MklConv2DOp : public OpKernel {
     const int64 input_batch_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'N')
                             : GetTensorDim(input, data_format_, 'N');
-    OP_REQUIRES(
-        context,
-        FastBoundsCheck(input_batch_raw, std::numeric_limits<int>::max()),
-        errors::InvalidArgument("batch is too large"));
+    OP_REQUIRES(context, FastBoundsCheck(input_batch_raw,
+                                         std::numeric_limits<int>::max()),
+                errors::InvalidArgument("batch is too large"));
     const int batch = static_cast<int>(input_batch_raw);
 
     // For now we take the stride from the second and third dimensions only (we
@@ -438,12 +434,12 @@ class MklConv2DOp : public OpKernel {
 };
 
 #define REGISTER_MKL_CPU(T)                                         \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2D")                         \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2D")                        \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
                           MklConv2DOp<CPUDevice, T, false>);        \
-  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBias")                 \
+  REGISTER_KERNEL_BUILDER(Name("_MklConv2DWithBias")                \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_identity_op.cc b/tensorflow/core/kernels/mkl_identity_op.cc
new file mode 100644
index 0000000000..e138cc2e95
--- /dev/null
+++ b/tensorflow/core/kernels/mkl_identity_op.cc
@@ -0,0 +1,63 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/array_ops.cc.
+#ifdef INTEL_MKL
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/logging.h"
+
+#include "tensorflow/core/util/mkl_util.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
+
+namespace tensorflow {
+typedef Eigen::ThreadPoolDevice CPUDevice;
+template <typename Device, typename T>
+class MklIdentityOp : public OpKernel {
+ public:
+  explicit MklIdentityOp(OpKernelConstruction* context) : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    MklShape mkl_shape_input;
+    GetMklShape(context, 0, &mkl_shape_input);
+    bool input_in_mkl_format = mkl_shape_input.IsMklTensor();
+
+    if (input_in_mkl_format) {
+      ForwarMklTensorInToOut(context, 0, 0);
+    } else {
+      FowardTfTensorInToOut(context, 0, 0);
+    }
+  }
+
+  bool IsExpensive() override { return false; }
+};
+
+#define REGISTER_MKL_CPU(T)                                                   \
+  REGISTER_KERNEL_BUILDER(Name("_MklIdentity")                                \
+                            .Device(DEVICE_CPU)                               \
+                            .TypeConstraint<T>("T")                           \
+                            .Label(mkl_op_registry::kMklOpLabel),             \
+                        MklIdentityOp<CPUDevice, T>);                         \
+
+TF_CALL_float(REGISTER_MKL_CPU);
+#undef REGISTER_MKL_CPU
+}  // namespace tensorflow
+#endif // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
index edca8e2553..ac432e13ce 100644
--- a/tensorflow/core/kernels/mkl_lrn_op.cc
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -104,6 +104,15 @@ class MklLRNOp : public OpKernel {
       return;
     }
 
+    // TODO(inteltf) MKL will support depth radius not equal to 2 in the future
+    if (depth_radius_ != 2) {
+      Tensor converted_tensor =
+          ConvertMklToTF<T>(context, input, mkl_context.input_shape);
+      mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
+                                    beta_, converted_tensor);
+      return;
+    }
+
     if (input_in_mkl_format) {
       // MKL supports normalization over channel dimension only
       if (mkl_context.input_shape.tf_dim_idx(mkl_context.in_dims - 1) ==
@@ -112,8 +121,10 @@ class MklLRNOp : public OpKernel {
             static_cast<dnnLayout_t>(mkl_context.input_shape.GetCurLayout());
         workspace_enabled_ = true;
       } else {
+        Tensor converted_tensor =
+            ConvertMklToTF<T>(context, input, mkl_context.input_shape);
         mkl_context.MklDefaultToEigen(context, depth_radius_, bias_, alpha_,
-                                      beta_, input);
+                                      beta_, converted_tensor);
         return;
       }
     }
@@ -160,9 +171,7 @@ class MklLRNOp : public OpKernel {
     MklShape input_shape;
     dnnPrimitive_t lrn_fwd = nullptr;
     dnnPrimitive_t convert_input = nullptr;
-    /* dnnPrimitive_t convert_output; */
     dnnLayout_t lt_input = nullptr;
-    /* dnnLayout_t lt_output; */
     dnnLayout_t lt_internal_input = nullptr;
     dnnLayout_t lt_internal_workspace = nullptr;
     dnnLayout_t lt_internal_output = nullptr;
@@ -267,7 +276,7 @@ class MklLRNOp : public OpKernel {
     }
 
     // Fallback implementation - Taken from lrn_op.cc
-    // TODO(intelft) Check if we can use EigenLRNOp directly instead of making a
+    // TODO(inteltf) Check if we can use EigenLRNOp directly instead of making a
     // copy.
     void MklDefaultToEigen(OpKernelContext* context, int depth_radius_,
                            float bias_, float alpha_, float beta_,
@@ -378,6 +387,7 @@ class MklLRNGradOp : public OpKernel {
       mkl_context.MklDefaultToEigen(context);
       return;
     }
+
     if (ingrad_in_mkl_format || inimage_in_mkl_format) {
       const MklShape* tmp_mkl_shape = (ingrad_in_mkl_format)
                                           ? &mkl_context.ingrad_shape
@@ -459,11 +469,11 @@ class MklLRNGradOp : public OpKernel {
         const_cast<void*>(static_cast<const void*>(output->flat<T>().data()));
 
     Tensor mkl_tmp_input_buf_tensor, mkl_tmp_image_buf_tensor,
-        mkl_tmp_outimage_buf_tensor, mkl_tmp_workspace_buf_tensor;
+        mkl_tmp_outimage_buf_tensor;
     // Convert Inputs if needed
-    mkl_context.MklPrepareLRNGradInput(
-        context, &mkl_tmp_input_buf_tensor, &mkl_tmp_image_buf_tensor,
-        &mkl_tmp_outimage_buf_tensor, &mkl_tmp_workspace_buf_tensor);
+    mkl_context.MklPrepareLRNGradInput(context, &mkl_tmp_input_buf_tensor,
+                                       &mkl_tmp_image_buf_tensor,
+                                       &mkl_tmp_outimage_buf_tensor);
 
     // We do not do any conversion for output. But we simply emit it
     // in MKL format.
@@ -489,14 +499,11 @@ class MklLRNGradOp : public OpKernel {
     MklShape ingrad_shape, inimage_shape, outimage_shape;
     dnnPrimitive_t lrn_bwd = nullptr;
     dnnPrimitive_t convert_input = nullptr;
-    /* dnnPrimitive_t convert_output; */
     dnnLayout_t lt_input = nullptr;
     dnnLayout_t lt_output = nullptr;
     dnnLayout_t lt_bdw_input = nullptr;
     dnnLayout_t lt_workspace = nullptr;
     dnnLayout_t lt_internal_input = nullptr;
-    /* dnnLayout_t lt_internal_workspace;
-    dnnLayout_t lt_internal_output; */
     void* res_lrn_bwd[dnnResourceNumber];
 
     // prepare mkl input
@@ -523,11 +530,13 @@ class MklLRNGradOp : public OpKernel {
     void MklPrepareLRNGradInput(OpKernelContext* context,
                                 Tensor* mkl_tmp_input_buf_tensor,
                                 Tensor* mkl_tmp_image_buf_tensor,
-                                Tensor* mkl_tmp_outimage_buf_tensor,
-                                Tensor* mkl_tmp_workspace_buf_tensor) {
+                                Tensor* mkl_tmp_outimage_buf_tensor) {
       const Tensor& in_grads = MklGetInput(context, 0);
       const Tensor& in_image = MklGetInput(context, 1);
       const Tensor& out_image = MklGetInput(context, 2);
+      const Tensor& workspace = MklGetInput(
+          context,
+          3); /*Worskpsace is enabled, get the buffer to the workspace */
 
       void* user_input = const_cast<void*>(
           static_cast<const void*>(in_grads.flat<T>().data()));
@@ -535,6 +544,9 @@ class MklLRNGradOp : public OpKernel {
           static_cast<const void*>(in_image.flat<T>().data()));
       void* user_fwd_output = const_cast<void*>(
           static_cast<const void*>(out_image.flat<T>().data()));
+      void* workspace_buffer = const_cast<void*>(
+          static_cast<const void*>(workspace.flat<T>().data()));
+
       CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&lt_workspace, lrn_bwd,
                                                 dnnResourceWorkspace),
                E_SUCCESS);
@@ -609,9 +621,7 @@ class MklLRNGradOp : public OpKernel {
         res_lrn_bwd[dnnResourceDst] = user_fwd_output;
       }
 
-      // Allocate buffer for workspace.
-      AllocTmpBuffer(context, mkl_tmp_workspace_buf_tensor, lt_workspace,
-                     &res_lrn_bwd[dnnResourceWorkspace]);
+      res_lrn_bwd[dnnResourceWorkspace] = workspace_buffer;
     }
 
     // Fallback implementation - Taken from lrn_op.cc
@@ -619,14 +629,36 @@ class MklLRNGradOp : public OpKernel {
     // copy.
     void MklDefaultToEigen(OpKernelContext* context) {
       // CHECK(false);
-      Tensor in_grads = MklGetInput(context, 0);
-      Tensor in_image = MklGetInput(context, 1);
-      Tensor out_image = MklGetInput(context, 2);
+
+      Tensor in_grads;
+      Tensor in_image;
+      Tensor out_image;
 
       GetMklShape(context, 0, &ingrad_shape);
       GetMklShape(context, 1, &inimage_shape);
       GetMklShape(context, 2, &outimage_shape);
 
+      if (ingrad_shape.IsMklTensor()) {
+        in_grads =
+            ConvertMklToTF<T>(context, MklGetInput(context, 0), ingrad_shape);
+      } else {
+        in_grads = MklGetInput(context, 0);
+      }
+
+      if (inimage_shape.IsMklTensor()) {
+        in_image =
+            ConvertMklToTF<T>(context, MklGetInput(context, 1), inimage_shape);
+      } else {
+        in_image = MklGetInput(context, 1);
+      }
+
+      if (outimage_shape.IsMklTensor()) {
+        out_image =
+            ConvertMklToTF<T>(context, MklGetInput(context, 2), outimage_shape);
+      } else {
+        out_image = MklGetInput(context, 2);
+      }
+
       const int64 batch = static_cast<int64>(in_grads.dim_size(0));
       const int64 rows = static_cast<int64>(in_grads.dim_size(1));
       const int64 cols = static_cast<int64>(in_grads.dim_size(2));
@@ -677,7 +709,7 @@ class MklLRNGradOp : public OpKernel {
       Shard(worker_threads.num_threads, worker_threads.workers, nodes * batch,
             depth * depth, shard);
     }
-
+		
     // release mkl resources
     void Mklcleanup() {
       bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
diff --git a/tensorflow/core/kernels/mkl_matmul_op.cc b/tensorflow/core/kernels/mkl_matmul_op.cc
index 3ba28c13ed..e43b75e250 100644
--- a/tensorflow/core/kernels/mkl_matmul_op.cc
+++ b/tensorflow/core/kernels/mkl_matmul_op.cc
@@ -199,15 +199,13 @@ class MklMatMulOp : public OpKernel {
   }
 };
 
-#define REGISTER_CPU(T)                                                      \
-  REGISTER_KERNEL_BUILDER(                                                   \
-      Name("MatMul").Device(DEVICE_CPU).TypeConstraint<T>("T"),              \
-      MklMatMulOp<CPUDevice, T, false /* cublas, ignored for CPU */>);       \
-  REGISTER_KERNEL_BUILDER(                                                   \
-      Name("MatMul").Device(DEVICE_CPU).TypeConstraint<T>("T").Label("MKL"), \
-      MklMatMulOp<CPUDevice, T, false /* cublas, ignored for CPU */>)
-
-// TODO:Consider template specialization when adding/removing additional types
+#define REGISTER_CPU(T)                                         \
+  REGISTER_KERNEL_BUILDER(                                      \
+      Name("MatMul").Device(DEVICE_CPU).TypeConstraint<T>("T"), \
+      MklMatMulOp<CPUDevice, T, false /* cublas, ignored for CPU */>);
+
+// TODO(inteltf) Consider template specialization when adding/removing
+// additional types
 TF_CALL_float(REGISTER_CPU);
 TF_CALL_double(REGISTER_CPU);
 TF_CALL_complex64(REGISTER_CPU);
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index e27881f882..1e0ee258b0 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -276,11 +276,6 @@ class MklMaxPoolingGradOp : public OpKernel {
     mkl_context.pooling_res[dnnResourceDiffSrc] = const_cast<void*>(
         static_cast<const void*>(output_tensor->flat<T>().data()));
 
-    int64 output_size = output_tensor->NumElements();
-    for (int64 i = 0; i < output_size; ++i) {
-      (static_cast<float*>(mkl_context.pooling_res[dnnResourceDiffSrc]))[i] = 0;
-    }
-
     CHECK_EQ(
         dnnExecute_F32(mkl_context.prim_pooling_bwd, mkl_context.pooling_res),
         E_SUCCESS);
@@ -387,19 +382,18 @@ class MklMaxPoolingGradOp : public OpKernel {
       if (workspace_enabled == false) {
         if (convert_input != nullptr) {
           if (input_in_mkl_format == false) {
-            CHECK_EQ(dnnConversionExecute_F32(
-                         convert_input,
-                         const_cast<void*>(static_cast<const void*>(
-                             tensor_in.flat<T>().data())),
-                         input_buf),
-                     E_SUCCESS);
+            CHECK_EQ(
+                dnnConversionExecute_F32(
+                    convert_input, const_cast<void*>(static_cast<const void*>(
+                                       tensor_in.flat<T>().data())),
+                    input_buf),
+                E_SUCCESS);
             CHECK_EQ(dnnDelete_F32(convert_input), E_SUCCESS);
             convert_input = nullptr;
           } else {
             input_shape.GetConvertedFlatData(
-                lt_input_prim,
-                const_cast<void*>(
-                    static_cast<const void*>(tensor_in.flat<T>().data())),
+                lt_input_prim, const_cast<void*>(static_cast<const void*>(
+                                   tensor_in.flat<T>().data())),
                 input_buf);
           }
           pooling_resfwd[dnnResourceSrc] = input_buf;
@@ -444,9 +438,8 @@ class MklMaxPoolingGradOp : public OpKernel {
           CHECK_EQ(dnnDelete_F32(convert_outbackprop), E_SUCCESS);
         } else {
           output_backprop_shape.GetConvertedFlatData(
-              lt_outbackprop_prim,
-              const_cast<void*>(
-                  static_cast<const void*>(out_backprop.flat<T>().data())),
+              lt_outbackprop_prim, const_cast<void*>(static_cast<const void*>(
+                                       out_backprop.flat<T>().data())),
               outbackprop_buf);
         }
         pooling_res[dnnResourceDiffDst] = outbackprop_buf;
diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.cc b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
index d88bd4c640..65e8852cfb 100644
--- a/tensorflow/core/kernels/mkl_pooling_ops_common.cc
+++ b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
@@ -14,8 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #ifdef INTEL_MKL
-#include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
 #include <vector>
+#include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/framework/common_shape_fns.h"
 
diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc
index 25c8359cc5..0c66f73141 100644
--- a/tensorflow/core/kernels/mkl_relu_op.cc
+++ b/tensorflow/core/kernels/mkl_relu_op.cc
@@ -16,17 +16,17 @@ limitations under the License.
 // See docs in ../ops/nn_ops.cc.
 #ifdef INTEL_MKL
 
-#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 
-#include "third_party/mkl/include/mkl_dnn.h"
-#include "third_party/mkl/include/mkl_dnn_types.h"
 #include "tensorflow/core/platform/default/logging.h"
 #include "tensorflow/core/util/mkl_util.h"
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
 
 namespace tensorflow {
 
@@ -194,45 +194,29 @@ class MklReluGradOp : public OpKernel {
 
       void* user_i = static_cast<void*>(const_cast<T*>(a.flat<T>().data()));
       void* user_g = static_cast<void*>(const_cast<T*>(g.flat<T>().data()));
-
-      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(
-                   &mkl_lt_internal_grad, prim_relu_bwd, dnnResourceDiffDst),
-               E_SUCCESS);
-
-      CHECK_EQ(dnnLayoutCreateFromPrimitive_F32(&mkl_lt_internal_input,
-                                                prim_relu_bwd, dnnResourceSrc),
-               E_SUCCESS);
-
-      if (!dnnLayoutCompare_F32(mkl_lt_internal_grad, lt_grad)) {
-        AllocTmpBuffer(context, mkl_tmp_grad_buf_tensor, mkl_lt_internal_grad,
-                       &relu_res[dnnResourceDiffDst]);
-        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_grad, lt_grad,
-                                         mkl_lt_internal_grad),
+      dnnPrimitive_t cv_input_to_grad = NULL;
+      Tensor mkl_tmp_buf_tensor;
+      void* mkl_buffer_convert = nullptr;
+
+      // if input and grad are not in the same layout, do a conversion between
+      // them.
+      if (!dnnLayoutCompare_F32(lt_input, lt_grad)) {
+        AllocTmpBuffer(context, &mkl_tmp_buf_tensor, lt_grad,
+                       &mkl_buffer_convert);
+        CHECK_EQ(dnnConversionCreate_F32(&cv_input_to_grad, lt_input, lt_grad),
                  E_SUCCESS);
-        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_grad, user_g,
-                                          relu_res[dnnResourceDiffDst]),
-                 E_SUCCESS);
-        dnnDelete_F32(cv_user_to_reluB_grad);
-      } else {
-        relu_res[dnnResourceDiffDst] = user_g;
-      }
 
-      if (!dnnLayoutCompare_F32(mkl_lt_internal_input, lt_input)) {
-        AllocTmpBuffer(context, mkl_tmp_input_buf_tensor, mkl_lt_internal_input,
-                       &relu_res[dnnResourceSrc]);
-        CHECK_EQ(dnnConversionCreate_F32(&cv_user_to_reluB_input, lt_input,
-                                         mkl_lt_internal_input),
-                 E_SUCCESS);
-        CHECK_EQ(dnnConversionExecute_F32(cv_user_to_reluB_input, user_i,
-                                          relu_res[dnnResourceSrc]),
+        CHECK_EQ(dnnConversionExecute_F32(cv_input_to_grad, user_i,
+                                          mkl_buffer_convert),
                  E_SUCCESS);
-        dnnDelete_F32(cv_user_to_reluB_input);
+        relu_res[dnnResourceSrc] = mkl_buffer_convert;
+        dnnDelete_F32(cv_input_to_grad);
       } else {
         relu_res[dnnResourceSrc] = user_i;
       }
 
-      dnnLayoutDelete_F32(mkl_lt_internal_input);
-      dnnLayoutDelete_F32(mkl_lt_internal_grad);
+      relu_res[dnnResourceDiffDst] = user_g;
+
     }
 
     void MklCreateInputLayouts(OpKernelContext* context) {
@@ -331,7 +315,7 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
   mkl_context.MklCreateInputLayouts(context);
   float negative_slope = 0.0;
   CHECK_EQ(dnnReLUCreateBackward_F32(&mkl_context.prim_relu_bwd, NULL,
-                                     mkl_context.lt_grad, mkl_context.lt_input,
+                                     mkl_context.lt_grad, mkl_context.lt_grad,
                                      negative_slope),
            E_SUCCESS);
   Tensor mkl_tmp_grad_buf_tensor, mkl_tmp_input_buf_tensor;
@@ -380,12 +364,12 @@ void MklReluGradOp<Device, T>::Compute(OpKernelContext* context) {
 /* Register DNN kernels for supported operations and supported types - right now
  * it is only Relu and f32*/
 #define REGISTER_RELU_MKL_SUPPORTED_KERNELS_TYPES(type)             \
-  REGISTER_KERNEL_BUILDER(Name("_MklRelu")                           \
+  REGISTER_KERNEL_BUILDER(Name("_MklRelu")                          \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<type>("T")            \
                               .Label(mkl_op_registry::kMklOpLabel), \
                           MklReluOp<CPUDevice, type>);              \
-  REGISTER_KERNEL_BUILDER(Name("_MklReluGrad")                       \
+  REGISTER_KERNEL_BUILDER(Name("_MklReluGrad")                      \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<type>("T")            \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_reshape_op.cc b/tensorflow/core/kernels/mkl_reshape_op.cc
index 753a8b52b4..593aa3a2fd 100644
--- a/tensorflow/core/kernels/mkl_reshape_op.cc
+++ b/tensorflow/core/kernels/mkl_reshape_op.cc
@@ -129,7 +129,7 @@ class MklReshapeOp : public OpKernel {
         return;
       }
     } else {
-      CopyTFTensorInToOut(context, 0, 0, shape);
+      CopyTfTensorInToOutWithShape(context, 0, 0, shape);
     }
   }
 };
diff --git a/tensorflow/core/kernels/mkl_tfconv_op.cc b/tensorflow/core/kernels/mkl_tfconv_op.cc
index c31ef5c255..588d6874dd 100644
--- a/tensorflow/core/kernels/mkl_tfconv_op.cc
+++ b/tensorflow/core/kernels/mkl_tfconv_op.cc
@@ -106,7 +106,7 @@ class MklToTfOp : public OpKernel {
 ///////////////////////////////////////////////////////////
 
 #define REGISTER_CPU(T)                                             \
-  REGISTER_KERNEL_BUILDER(Name("MklToTf")                           \
+  REGISTER_KERNEL_BUILDER(Name("_MklToTf")                          \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index cf68680bb3..a1d09bd503 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1542,6 +1542,23 @@ REGISTER_OP("Identity")
 Return a tensor with the same shape and contents as the input tensor or value.
 )Doc");
 
+#ifdef INTEL_MKL
+REGISTER_OP("_MklIdentity")
+    .Input("input: T")
+    .Input("mkl_input: uint8")
+    .Output("output: T")
+    .Output("mkl_output: uint8")
+    .Attr("T: type")
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      c->set_output(0, c->input(0));
+      c->set_output_handle_dtype(0, c->input_handle_dtype(0));
+      c->set_output_handle_shape(0, c->input_handle_shape(0));
+      return Status::OK();
+    })
+    .Doc(R"Doc( Mkl implementation of IdentityOp
+)Doc");
+#endif
+
 // --------------------------------------------------------------------------
 REGISTER_OP("RefIdentity")
     .Input("input: Ref(T)")
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h
index 897b174eff..6a37256ea9 100644
--- a/tensorflow/core/util/mkl_util.h
+++ b/tensorflow/core/util/mkl_util.h
@@ -542,8 +542,8 @@ inline int64 GetMklTensorDim(const MklShape& mkl_shape, char dimension) {
   return mkl_shape.dim_size(index);
 }
 
-inline void CopyMklTensorInToOut(OpKernelContext* context, int idx_in,
-                                 int idx_out) {
+inline void CopyMklTensorInToOut(OpKernelContext* context,
+                                 int idx_in, int idx_out) {
   int num_inputs = context->num_inputs();
   int num_outputs = context->num_outputs();
   int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
@@ -563,8 +563,9 @@ inline void CopyMklTensorInToOut(OpKernelContext* context, int idx_in,
   context->set_output(idx_meta_out, meta_output);
 }
 
-inline void CopyTFTensorInToOut(OpKernelContext* context, int idx_in,
-                                int idx_out, const TensorShape& shape) {
+inline void CopyTfTensorInToOutWithShape(OpKernelContext* context,
+                                         int idx_in, int idx_out,
+                                         const TensorShape& shape) {
   int num_inputs = context->num_inputs();
   int num_outputs = context->num_outputs();
   int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
@@ -580,6 +581,41 @@ inline void CopyTFTensorInToOut(OpKernelContext* context, int idx_in,
   context->set_output(idx_data_out, output);
 }
 
+inline void FowardTfTensorInToOut(OpKernelContext* context,
+                                  int idx_in, int idx_out) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+
+  MklShape mkl_shape_output;
+  mkl_shape_output.SetMklTensor(false);
+  AllocateOutputSetMklShape(context, idx_out, mkl_shape_output);
+  if (IsRefType(context->input_dtype(idx_data_in))) {
+    context->forward_ref_input_to_ref_output(idx_data_in, idx_data_out);
+  } else {
+    context->set_output(idx_data_out, context->input(idx_data_in));
+  }
+}
+
+inline void ForwarMklTensorInToOut(OpKernelContext* context,
+                                   int idx_in, int idx_out) {
+  int num_inputs = context->num_inputs();
+  int num_outputs = context->num_outputs();
+  int idx_data_in = GetTensorDataIndex(idx_in, num_inputs);
+  int idx_meta_in = GetTensorMetaDataIndex(idx_in, num_inputs);
+  int idx_data_out = GetTensorDataIndex(idx_out, num_outputs);
+  int idx_meta_out = GetTensorMetaDataIndex(idx_out, num_outputs);
+
+  if (IsRefType(context->input_dtype(idx_data_in))) {
+    context->forward_ref_input_to_ref_output(idx_data_in, idx_data_out);
+    context->forward_ref_input_to_ref_output(idx_meta_in, idx_meta_out);
+  } else {
+    context->set_output(idx_data_out, context->input(idx_data_in));
+    context->set_output(idx_meta_out, context->input(idx_meta_in));
+  }
+}
+
 namespace mkl_op_registry {
 static const char* kMklOpLabel = "MklOp";
 static const char* kMklOpLabelPattern = "label='MklOp'";
diff --git a/tensorflow/docs_src/community/style_guide.md b/tensorflow/docs_src/community/style_guide.md
index 767e33c3d0..f90a6cf938 100644
--- a/tensorflow/docs_src/community/style_guide.md
+++ b/tensorflow/docs_src/community/style_guide.md
@@ -162,9 +162,9 @@ operation.
   - `reuse`: `bool` indicator if the variable should be reused if
              it's present in the scope.
 
-* Layers that behave differently during training should have:
-  - `is_training`: `bool` to indicate if a training graph is been built.
-
+* Layers that behave differently during training should take:
+  - `is_training`: `bool` indicator to conditionally choose different 
+                   computation paths (e.g. using `tf.cond`) during execution.
 
 Example:
 
diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index 99933b75b4..3586794418 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -42,7 +42,7 @@ To incorporate your custom op you'll need to:
     Python @{tf.test.compute_gradient_error$gradient checker}.
     See
     [`relu_op_test.py`](https://www.tensorflow.org/code/tensorflow/python/kernel_tests/relu_op_test.py) as
-    an example that does tests the forward functions of Relu-like operators and
+    an example that tests the forward functions of Relu-like operators and
     their gradients.
 
 PREREQUISITES:
@@ -345,7 +345,7 @@ building the `.so` file.
 >   the older ABI. If you compile your op library with `gcc>=5`, add
 >   `-D_GLIBCXX_USE_CXX11_ABI=0` to the command line to make the library
 >   compatible with the older abi.
->   Furthermore if you are using TensorFlow package created from source remember to add `-cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"`
+>   Furthermore if you are using TensorFlow package created from source remember to add `--cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"`
 >   as bazel command to compile the Python package.
 
 ### Compile the op using bazel (TensorFlow source installation)
@@ -382,7 +382,7 @@ TensorFlow Python API provides the
 load the dynamic library and register the op with the TensorFlow
 framework. `load_op_library` returns a Python module that contains the Python
 wrappers for the op and the kernel. Thus, once you have built the op, you can
-do the following to run it from Python :
+do the following to run it from Python:
 
 ```python
 import tensorflow as tf
diff --git a/tensorflow/docs_src/get_started/monitors.md b/tensorflow/docs_src/get_started/monitors.md
index cb4ef70eeb..d9c605b013 100644
--- a/tensorflow/docs_src/get_started/monitors.md
+++ b/tensorflow/docs_src/get_started/monitors.md
@@ -65,7 +65,7 @@ if __name__ == "__main__":
 
 Copy the above code into a file, and download the corresponding
 [training](http://download.tensorflow.org/data/iris_training.csv) and
-@{tf.test} data sets to the same
+[test](http://download.tensorflow.org/data/iris_test.csv) data sets to the same
 directory.
 
 In the following sections, you'll progressively make updates to the above code
diff --git a/tensorflow/docs_src/install/install_java.md b/tensorflow/docs_src/install/install_java.md
index 2a907b6e82..72d0c7b1ff 100644
--- a/tensorflow/docs_src/install/install_java.md
+++ b/tensorflow/docs_src/install/install_java.md
@@ -106,7 +106,7 @@ As an example, these steps will create a Maven project that uses TensorFlow:
 
 
 The preceding command should output <tt>Hello from <i>version</i></tt>. If it
-does, you've succesfully set up TensorFlow for Java and are ready to use it in
+does, you've successfully set up TensorFlow for Java and are ready to use it in
 Maven projects. If not, check
 [Stack Overflow](http://stackoverflow.com/questions/tagged/tensorflow)
 for possible solutions.  You can skip reading the rest of this document.
diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index d415c29aa1..9ca1e77ff5 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -140,7 +140,7 @@ performance and increase the flexiblity of models.
 Most TensorFlow operations used by a CNN support both NHWC and NCHW data format.
 On GPU, NCHW is faster. But on CPU, NHWC is sometimes faster.
 
-Building a model to support both date formats keeps the model flexible and
+Building a model to support both data formats keeps the model flexible and
 capable of operating optimally regardless of platform. Most TensorFlow
 operations used by a CNN support both NHWC and NCHW data format. The benchmark
 script was written to support both NCHW and NHWC. NCHW should always be used
diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
index ad032f93fd..3351109f45 100644
--- a/tensorflow/examples/label_image/main.cc
+++ b/tensorflow/examples/label_image/main.cc
@@ -308,11 +308,11 @@ int main(int argc, char* argv[]) {
   }
 
   // This is for automated testing to make sure we get the expected result with
-  // the default settings. We know that label 866 (military uniform) should be
+  // the default settings. We know that label 653 (military uniform) should be
   // the top label for the Admiral Hopper image.
   if (self_test) {
     bool expected_matches;
-    Status check_status = CheckTopLabel(outputs, 866, &expected_matches);
+    Status check_status = CheckTopLabel(outputs, 653, &expected_matches);
     if (!check_status.ok()) {
       LOG(ERROR) << "Running check failed: " << check_status;
       return -1;
diff --git a/tensorflow/examples/tutorials/estimators/abalone.py b/tensorflow/examples/tutorials/estimators/abalone.py
index 932ce8a8b2..3c0ea2e409 100644
--- a/tensorflow/examples/tutorials/estimators/abalone.py
+++ b/tensorflow/examples/tutorials/estimators/abalone.py
@@ -134,12 +134,22 @@ def main(unused_argv):
 
   # Instantiate Estimator
   nn = tf.contrib.learn.Estimator(model_fn=model_fn, params=model_params)
-
+  
+  def get_train_inputs():
+    x = tf.constant(training_set.data)
+    y = tf.constant(training_set.target)
+    return x, y
+  
   # Fit
-  nn.fit(x=training_set.data, y=training_set.target, steps=5000)
+  nn.fit(input_fn=get_train_inputs, steps=5000)
 
   # Score accuracy
-  ev = nn.evaluate(x=test_set.data, y=test_set.target, steps=1)
+  def get_test_inputs():
+    x = tf.constant(test_set.data)
+    y = tf.constant(test_set.target)
+    return x, y
+  
+  ev = nn.evaluate(input_fn=get_test_inputs, steps=1)
   print("Loss: %s" % ev["loss"])
   print("Root Mean Squared Error: %s" % ev["rmse"])
 
diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD
index f2904ad5a6..a8910248c1 100644
--- a/tensorflow/java/BUILD
+++ b/tensorflow/java/BUILD
@@ -54,6 +54,18 @@ java_test(
     ],
 )
 
+java_test(
+    name = "OperationTest",
+    size = "small",
+    srcs = ["src/test/java/org/tensorflow/OperationTest.java"],
+    test_class = "org.tensorflow.OperationTest",
+    deps = [
+        ":tensorflow",
+        ":testutil",
+        "@junit",
+    ],
+)
+
 java_test(
     name = "SavedModelBundleTest",
     size = "small",
diff --git a/tensorflow/java/src/main/java/org/tensorflow/Operation.java b/tensorflow/java/src/main/java/org/tensorflow/Operation.java
index 48db554e07..43dbaf125c 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/Operation.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/Operation.java
@@ -70,6 +70,28 @@ public final class Operation {
     }
   }
 
+  /**
+   * Returns the size of the list of Tensors produced by this operation.
+   *
+   * <p>An Operation has multiple named outputs, each of which produces either
+   * a single tensor or a list of tensors. This method returns the size of
+   * the list of tensors for a specific named output of the operation.
+   *
+   * @param name identifier of the list of tensors (of which there may
+   *        be many) produced by this operation.
+   * @returns the size of the list of Tensors produced by this named output.
+   * @throws IllegalArgumentException if this operation has no output
+   *         with the provided name.
+   */
+  public int outputListLength(final String name) {
+    Graph.Reference r = graph.ref();
+    try {
+      return outputListLength(unsafeNativeHandle, name);
+    } finally {
+      r.close();
+    }
+  }
+
   /** Returns a symbolic handle to one of the tensors produced by this operation. */
   public Output output(int idx) {
     return new Output(this, idx);
@@ -108,6 +130,8 @@ public final class Operation {
 
   private static native int numOutputs(long handle);
 
+  private static native int outputListLength(long handle, String name);
+
   private static native long[] shape(long graphHandle, long opHandle, int output);
 
   private static native int dtype(long graphHandle, long opHandle, int output);
diff --git a/tensorflow/java/src/main/native/operation_jni.cc b/tensorflow/java/src/main/native/operation_jni.cc
index 32e59bc0ae..b3d5fc4ec3 100644
--- a/tensorflow/java/src/main/native/operation_jni.cc
+++ b/tensorflow/java/src/main/native/operation_jni.cc
@@ -66,6 +66,24 @@ JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_numOutputs(JNIEnv* env,
   return TF_OperationNumOutputs(op);
 }
 
+JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_outputListLength(JNIEnv* env,
+                                                                      jclass clazz,
+                                                                      jlong handle,
+                                                                      jstring name) {
+  TF_Operation* op = requireHandle(env, handle);
+  if (op == nullptr) return 0;
+
+  TF_Status* status = TF_NewStatus();
+
+  const char* cname = env->GetStringUTFChars(name, nullptr);
+  int result = TF_OperationOutputListLength(op, cname, status);
+  env->ReleaseStringUTFChars(name, cname);
+
+  throwExceptionIfNotOK(env, status);
+  TF_DeleteStatus(status);
+  return result;
+}
+
 JNIEXPORT jlongArray JNICALL Java_org_tensorflow_Operation_shape(
     JNIEnv* env, jclass clazz, jlong graph_handle, jlong op_handle,
     jint output_index) {
diff --git a/tensorflow/java/src/main/native/operation_jni.h b/tensorflow/java/src/main/native/operation_jni.h
index 6292a48069..b5d156f7c2 100644
--- a/tensorflow/java/src/main/native/operation_jni.h
+++ b/tensorflow/java/src/main/native/operation_jni.h
@@ -46,6 +46,16 @@ JNIEXPORT jstring JNICALL Java_org_tensorflow_Operation_type(JNIEnv *, jclass,
 JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_numOutputs(JNIEnv *,
                                                                 jclass, jlong);
 
+/*
+ * Class:     org_tensorflow_Operation
+ * Method:    outputListLength
+ * Signature: (JLjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_tensorflow_Operation_outputListLength(JNIEnv *,
+                                                                      jclass,
+                                                                      jlong,
+                                                                      jstring);
+
 /*
  * Class:     org_tensorflow_Operation
  * Method:    shape
diff --git a/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java b/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
new file mode 100644
index 0000000000..53bd511b5b
--- /dev/null
+++ b/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
@@ -0,0 +1,66 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+package org.tensorflow;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.List;
+
+/** Unit tests for {@link org.tensorflow.Operation}. */
+@RunWith(JUnit4.class)
+public class OperationTest {
+
+  @Test
+  public void  outputListLengthFailsOnInvalidName() {
+    try (Graph g = new Graph()) {
+      Operation op = g.opBuilder("Add", "Add")
+          .addInput(TestUtil.constant(g, "x", 1))
+          .addInput(TestUtil.constant(g, "y", 2))
+          .build();
+      assertEquals(1, op.outputListLength("z"));
+
+      try {
+        op.outputListLength("unknown");
+        fail("Did not catch bad name");
+      } catch (IllegalArgumentException iae) {
+        // expected
+      }
+    }
+  }
+
+  @Test
+  public void outputListLength() {
+    assertEquals(1, split(new int[]{0, 1}, 1));
+    assertEquals(2, split(new int[]{0, 1}, 2));
+    assertEquals(3, split(new int[]{0, 1, 2}, 3));
+  }
+
+  private int split(int[] values, int num_split) {
+    try (Graph g = new Graph()) {
+      return g.opBuilder("Split", "Split")
+          .addInput(TestUtil.constant(g, "split_dim", 0))
+          .addInput(TestUtil.constant(g, "values", values))
+          .setAttr("num_split", num_split)
+          .build()
+          .outputListLength("output");
+    }
+  }
+}
diff --git a/tensorflow/python/client/session.py b/tensorflow/python/client/session.py
index 7981defe78..700e95c0b9 100644
--- a/tensorflow/python/client/session.py
+++ b/tensorflow/python/client/session.py
@@ -594,6 +594,9 @@ class BaseSession(SessionInterface):
       try:
         status = tf_session.TF_NewStatus()
         tf_session.TF_DeleteDeprecatedSession(self._session, status)
+      except AttributeError:
+        # 'NoneType' object has no attribute 'TF_NewStatus'
+        pass
       finally:
         if status is not None:
           tf_session.TF_DeleteStatus(status)
diff --git a/tensorflow/python/debug/cli/debugger_cli_common.py b/tensorflow/python/debug/cli/debugger_cli_common.py
index 64a22e6be4..889fc6a8f6 100644
--- a/tensorflow/python/debug/cli/debugger_cli_common.py
+++ b/tensorflow/python/debug/cli/debugger_cli_common.py
@@ -648,7 +648,7 @@ class CommandHandlerRegistry(object):
         3) the handler is found for the prefix, but it fails to return a
           RichTextLines or raise any exception.
       CommandLineExit:
-        If the command handler raises this type of exception, tihs method will
+        If the command handler raises this type of exception, this method will
         simply pass it along.
     """
     if not prefix:
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
index 520d472c5c..3837717767 100644
--- a/tensorflow/python/debug/cli/profile_analyzer_cli.py
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli.py
@@ -56,7 +56,7 @@ class ProfileDatum(object):
 
   @property
   def exec_time(self):
-    """Measures compute function exection time plus pre- and post-processing."""
+    """Measures compute function execution time plus pre- and post-processing."""
     return self.node_exec_stats.all_end_rel_micros
 
 
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index ce4bc82e0a..de1e1ce017 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -975,7 +975,7 @@ class DebugDumpDir(object):
       slot = datum.output_slot
       # In some cases (e.g., system clocks with insufficient precision),
       # the upstream and downstream tensors may have identical timestamps, the
-      # following check examines this possibilty and avoids raising an error if
+      # following check examines this possibility and avoids raising an error if
       # that is the case.
       if not self._satisfied_at_timestamp(
           pending_inputs[node], datum.timestamp, start_i=i + 1):
diff --git a/tensorflow/python/debug/wrappers/hooks.py b/tensorflow/python/debug/wrappers/hooks.py
index c27448e283..f6194f5fad 100644
--- a/tensorflow/python/debug/wrappers/hooks.py
+++ b/tensorflow/python/debug/wrappers/hooks.py
@@ -66,7 +66,7 @@ class LocalCLIDebugHook(session_run_hook.SessionRunHook,
     """Add a tensor filter.
 
     See doc of `LocalCLIDebugWrapperSession.add_tensor_filter()` for details.
-    Override default behavior to accomodate the possibility of this method being
+    Override default behavior to accommodate the possibility of this method being
     called prior to the initialization of the underlying
     `LocalCLIDebugWrapperSession` object.
 
diff --git a/tensorflow/python/framework/importer.py b/tensorflow/python/framework/importer.py
index fcddd9546d..ed579224d3 100644
--- a/tensorflow/python/framework/importer.py
+++ b/tensorflow/python/framework/importer.py
@@ -275,6 +275,9 @@ def import_graph_def(graph_def, input_map=None, return_elements=None,
 
     # 1. Add operations without their inputs.
     for node in graph_def.node:
+      # Check to see if this op's name matches a previously seen op
+      if node.name in name_to_op:
+        raise ValueError('Duplicate name \'%s\' in GraphDef.' % node.name)
       # Set any default attr values that aren't present.
       if node.op not in op_dict:
         raise ValueError('No op named %s in defined operations.' % node.op)
diff --git a/tensorflow/python/framework/importer_test.py b/tensorflow/python/framework/importer_test.py
index c4ccc3d189..2b2398f833 100644
--- a/tensorflow/python/framework/importer_test.py
+++ b/tensorflow/python/framework/importer_test.py
@@ -685,6 +685,17 @@ class ImportGraphDefTest(test.TestCase):
       self.assertEqual("return_elements must be a list of strings.",
                        str(e.exception))
 
+  def testDuplicateOperationNames(self):
+    with ops.Graph().as_default():
+      with self.assertRaises(ValueError) as e:
+        importer.import_graph_def(
+            self._MakeGraphDef("""
+            node { name: 'A' op: 'Oi' }
+            node { name: 'B' op: 'Oi' }
+            node { name: 'A' op: 'Oi' }
+            """))
+      self.assertEqual("Duplicate name 'A' in GraphDef.", str(e.exception))
+
   def testWithExtensionAndAttr(self):
     with ops.Graph().as_default() as g:
       c = constant_op.constant(5.0, dtype=dtypes.float32, name="c")
diff --git a/tensorflow/python/framework/subscribe.py b/tensorflow/python/framework/subscribe.py
index 91c6e33f22..2654bca31c 100644
--- a/tensorflow/python/framework/subscribe.py
+++ b/tensorflow/python/framework/subscribe.py
@@ -276,7 +276,7 @@ def subscribe(tensors, side_effects):
     Subscribed tensors, which are identity copies of the passed in tensors
       in the same passed in structure, but the graph has been modified
       such that these are downstream of the control dependencies for
-      the side effect graphs. Use these functionally equivelant tensors
+      the side effect graphs. Use these functionally equivalent tensors
       instead of the passed in tensors for further construction or running.
   """
   if not hasattr(side_effects, '__iter__'):
diff --git a/tensorflow/python/framework/test_util.py b/tensorflow/python/framework/test_util.py
index c3169e23a5..ac551a6e1a 100644
--- a/tensorflow/python/framework/test_util.py
+++ b/tensorflow/python/framework/test_util.py
@@ -250,7 +250,7 @@ class TensorFlowTestCase(googletest.TestCase):
     """Returns a unique temporary directory for the test to use.
 
     If you call this method multiple times during in a test, it will return the
-    same folder. However, accross different runs the directories will be
+    same folder. However, across different runs the directories will be
     different. This will ensure that across different runs tests will not be
     able to pollute each others environment.
     If you need multiple unique directories within a single test, you should
diff --git a/tensorflow/python/kernel_tests/linalg_ops_test.py b/tensorflow/python/kernel_tests/linalg_ops_test.py
index 153d4ab662..2d31ac85b0 100644
--- a/tensorflow/python/kernel_tests/linalg_ops_test.py
+++ b/tensorflow/python/kernel_tests/linalg_ops_test.py
@@ -28,7 +28,7 @@ from tensorflow.python.platform import test
 
 
 def _random_pd_matrix(n, rng):
-  """Random postive definite matrix."""
+  """Random positive definite matrix."""
   temp = rng.randn(n, n)
   return temp.dot(temp.T)
 
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index f92ea9b05f..b3d28f010f 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -322,7 +322,7 @@ class BatchNormalization(base.Layer):
 
     def _broadcast(v):
       if needs_broadcasting and v is not None:
-        # In this case we must explictly broadcast all parameters.
+        # In this case we must explicitly broadcast all parameters.
         return array_ops.reshape(v, broadcast_shape)
       return v
 
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index f3bcb6ce77..f1c4d922e0 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1690,21 +1690,21 @@ def meshgrid(*args, **kwargs):
   results in
 
   ```prettyprint
-    X = [[1, 1, 1],
-         [2, 2, 2],
-         [3, 3, 3]]
-    Y = [[4, 5, 6],
-         [4, 5, 6],
-         [4, 5, 6]]
+    X = [[1, 2, 3],
+         [1, 2, 3],
+         [1, 2, 3]]
+    Y = [[4, 4, 4],
+         [5, 5, 5],
+         [6, 6, 6]]
   ```
 
   Args:
-    *args: `Tensor`s with rank 1
-    indexing: Either 'xy' or 'ij' (optional, default: 'xy')
+    *args: `Tensor`s with rank 1.
+    indexing: Either 'xy' or 'ij' (optional, default: 'xy').
     name: A name for the operation (optional).
 
   Returns:
-    outputs: A list of N `Tensor`s with rank N
+    outputs: A list of N `Tensor`s with rank N.
   """
 
   indexing = kwargs.pop("indexing", "xy")
diff --git a/tensorflow/python/ops/ctc_ops.py b/tensorflow/python/ops/ctc_ops.py
index ee5b2952f4..69edaa2c40 100644
--- a/tensorflow/python/ops/ctc_ops.py
+++ b/tensorflow/python/ops/ctc_ops.py
@@ -35,11 +35,9 @@ def ctc_loss(labels, inputs, sequence_length,
 
   This op implements the CTC loss as presented in the article:
 
-  A. Graves, S. Fernandez, F. Gomez, J. Schmidhuber.
+  [A. Graves, S. Fernandez, F. Gomez, J. Schmidhuber.
   Connectionist Temporal Classification: Labelling Unsegmented Sequence Data
-  with Recurrent Neural Networks. ICML 2006, Pittsburgh, USA, pp. 369-376.
-
-  http://www.cs.toronto.edu/~graves/icml_2006.pdf
+  with Recurrent Neural Networks. ICML 2006, Pittsburgh, USA, pp. 369-376.](http://www.cs.toronto.edu/~graves/icml_2006.pdf)
 
   Input requirements:
 
diff --git a/tensorflow/python/ops/gradients_impl.py b/tensorflow/python/ops/gradients_impl.py
index 2adf8f05d8..bd8a5c86ac 100644
--- a/tensorflow/python/ops/gradients_impl.py
+++ b/tensorflow/python/ops/gradients_impl.py
@@ -273,28 +273,6 @@ def _VerifyGeneratedGradients(grads, op):
   if len(grads) != len(op.inputs):
     raise ValueError("Num gradients %d generated for op %s do not match num "
                      "inputs %d" % (len(grads), op.node_def, len(op.inputs)))
-    for i in xrange(len(grads)):
-      grad = grads[i]
-      inp = op.inputs[i]
-      if grad is None:
-        continue
-      if grad.dtype.is_floating:
-        if not inp.dtype.is_floating:
-          raise TypeError("Gradient type %s generated for real-valued op %s "
-                           "with type %s must be real" %
-                           (dtypes.as_dtype(grad.dtype).name, op.node_def,
-                            dtypes.as_dtype(inp.dtype).name))
-      elif grad.dtype.is_complex:
-        if not inp.dtype.is_complex:
-          raise TypeError("Gradient type %s generated for complex-valued op %s"
-                           " with type %s must be complex" %
-                           (dtypes.as_dtype(grad.dtype).name, op.node_def,
-                            dtypes.as_dtype(inp.dtype).name))
-      else:
-        raise TypeError("Gradient type %s generated for op %s "
-                         "with type %s must be either real or complex" %
-                         (dtypes.as_dtype(grad.dtype).name, op.node_def,
-                          dtypes.as_dtype(inp.dtype).name))
 
 
 def _StopOps(from_ops, pending_count):
diff --git a/tensorflow/python/ops/init_ops.py b/tensorflow/python/ops/init_ops.py
index 42b4f952bb..1e2f999995 100644
--- a/tensorflow/python/ops/init_ops.py
+++ b/tensorflow/python/ops/init_ops.py
@@ -41,6 +41,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import math_ops
 
 
 class Initializer(object):
diff --git a/tensorflow/python/ops/logging_ops.py b/tensorflow/python/ops/logging_ops.py
index dbb13e0c8f..08e3f83a0b 100644
--- a/tensorflow/python/ops/logging_ops.py
+++ b/tensorflow/python/ops/logging_ops.py
@@ -86,7 +86,7 @@ def histogram_summary(tag, values, collections=None, name=None):
   This ops is deprecated. Please switch to tf.summary.histogram.
 
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The generated
   [`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
@@ -190,7 +190,7 @@ def audio_summary(tag,
 
   This op is deprecated. Please switch to tf.summary.audio.
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The summary has up to `max_outputs` summary values containing audio. The
   audio is built from `tensor` which must be 3-D with shape `[batch_size,
@@ -326,7 +326,7 @@ def scalar_summary(tags, values, collections=None, name=None):
 
   This ops is deprecated. Please switch to tf.summary.scalar.
   For an explanation of why this op was deprecated, and information on how to
-  migrate, look ['here'](https://www.tensorflow.org/code/tensorflow/contrib/deprecated/__init__.py)
+  migrate, look ['here'](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/deprecated/__init__.py)
 
   The input `tags` and `values` must have the same shape.  The generated
   summary has a summary value for each tag-value pair in `tags` and `values`.
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index b762205cf7..158016ff37 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -2331,7 +2331,7 @@ def tensordot(a, b, axes, name=None):
     using `array_ops.transpose` and `array_ops.reshape`. The method takes a
     tensor and performs the correct transpose and reshape operation for a given
     set of indices. It returns the reshaped tensor as well as a list of indices
-    necesary to reshape the tensor again after matrix multiplication.
+    necessary to reshape the tensor again after matrix multiplication.
 
     Args:
       a: `Tensor`.
diff --git a/tensorflow/python/ops/metrics_impl.py b/tensorflow/python/ops/metrics_impl.py
index 28ed3af9d7..0d35f50894 100644
--- a/tensorflow/python/ops/metrics_impl.py
+++ b/tensorflow/python/ops/metrics_impl.py
@@ -1735,7 +1735,7 @@ def _streaming_sparse_true_positive_at_k(labels,
     A tuple of `Variable` and update `Operation`.
 
   Raises:
-    ValueError: If `weights` is not `None` and has an incomptable shape.
+    ValueError: If `weights` is not `None` and has an incompatible shape.
   """
   with ops.name_scope(
       name, _at_k_name('true_positive', k, class_id=class_id),
@@ -1831,7 +1831,7 @@ def _streaming_sparse_false_negative_at_k(labels,
     A tuple of `Variable` and update `Operation`.
 
   Raises:
-    ValueError: If `weights` is not `None` and has an incomptable shape.
+    ValueError: If `weights` is not `None` and has an incompatible shape.
   """
   with ops.name_scope(
       name, _at_k_name('false_negative', k, class_id=class_id),
@@ -2653,7 +2653,7 @@ def _streaming_sparse_false_positive_at_k(labels,
     A tuple of `Variable` and update `Operation`.
 
   Raises:
-    ValueError: If `weights` is not `None` and has an incomptable shape.
+    ValueError: If `weights` is not `None` and has an incompatible shape.
   """
   with ops.name_scope(
       name, _at_k_name('false_positive', k, class_id=class_id),
diff --git a/tensorflow/python/ops/parsing_ops.py b/tensorflow/python/ops/parsing_ops.py
index 796ea20eb7..c2f9961731 100644
--- a/tensorflow/python/ops/parsing_ops.py
+++ b/tensorflow/python/ops/parsing_ops.py
@@ -58,7 +58,7 @@ class SparseFeature(
         ["index_key", "value_key", "dtype", "size", "already_sorted"])):
   """Configuration for parsing a sparse input feature from an `Example`.
 
-  Note, preferrably use `VarLenFeature` (possibly in combination with a
+  Note, preferably use `VarLenFeature` (possibly in combination with a
   `SequenceExample`) in order to parse out `SparseTensor`s instead of
   `SparseFeature` due to its simplicity.
 
diff --git a/tensorflow/python/tools/saved_model_cli.py b/tensorflow/python/tools/saved_model_cli.py
index e19b187681..e1be305505 100644
--- a/tensorflow/python/tools/saved_model_cli.py
+++ b/tensorflow/python/tools/saved_model_cli.py
@@ -489,7 +489,7 @@ def show(args):
   else:
     # If no tag is specified, display all tag_set, if no signaure_def key is
     # specified, display all SignatureDef keys, else show input output tensor
-    # infomation corresponding to the given SignatureDef key
+    # information corresponding to the given SignatureDef key
     if args.tag_set is None:
       _show_tag_sets(args.dir)
     else:
@@ -562,7 +562,7 @@ def create_parser():
   parser_show.add_argument(
       '--all',
       action='store_true',
-      help='if set, will output all infomation in given SavedModel')
+      help='if set, will output all information in given SavedModel')
   parser_show.add_argument(
       '--tag_set',
       type=str,
diff --git a/tensorflow/python/training/coordinator.py b/tensorflow/python/training/coordinator.py
index fea2f8240e..d234df71c1 100644
--- a/tensorflow/python/training/coordinator.py
+++ b/tensorflow/python/training/coordinator.py
@@ -366,7 +366,7 @@ class Coordinator(object):
     # If any thread is still alive, wait for the grace period to expire.
     # By the time this check is executed, threads may still be shutting down,
     # so we add a sleep of increasing duration to give them a chance to shut
-    # down without loosing too many cycles.
+    # down without losing too many cycles.
     # The sleep duration is limited to the remaining grace duration.
     stop_wait_secs = 0.001
     while any(t.is_alive() for t in threads) and stop_grace_period_secs >= 0.0:
diff --git a/tensorflow/python/util/deprecation.py b/tensorflow/python/util/deprecation.py
index 73fc3e2408..1e1599afb4 100644
--- a/tensorflow/python/util/deprecation.py
+++ b/tensorflow/python/util/deprecation.py
@@ -182,7 +182,7 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples):
     return d
 
   def _get_deprecated_positional_arguments(names_to_ok_vals, arg_spec):
-    """Builds a dictionary from deprecated arguments to thier spec.
+    """Builds a dictionary from deprecated arguments to their spec.
 
     Returned dict is keyed by argument name.
     Each value is a DeprecatedArgSpec with the following fields:
diff --git a/tensorflow/stream_executor/lib/statusor.h b/tensorflow/stream_executor/lib/statusor.h
index 06278d5152..bb423e390a 100644
--- a/tensorflow/stream_executor/lib/statusor.h
+++ b/tensorflow/stream_executor/lib/statusor.h
@@ -135,7 +135,7 @@ class StatusOr {
   // operators, to support move-only types and avoid unnecessary copying.
   StatusOr(T&& value);  // NOLINT
 
-  // Move conversion operator to avoid unecessary copy.
+  // Move conversion operator to avoid unnecessary copy.
   // T must be assignable from U.
   // Not marked with explicit so the implicit conversion can happen.
   template <typename U>
diff --git a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
index ded1856d7e..a97f39e87f 100644
--- a/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
+++ b/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py
@@ -124,16 +124,19 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.stubs.CleanUp()
 
   def testEmptyLoader(self):
+    """Tests empty EventMultiplexer creation."""
     x = event_multiplexer.EventMultiplexer()
     self.assertEqual(x.Runs(), {})
 
   def testRunNamesRespected(self):
+    """Tests two EventAccumulators inserted/accessed in EventMultiplexer."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     self.assertItemsEqual(sorted(x.Runs().keys()), ['run1', 'run2'])
     self.assertEqual(x._GetAccumulator('run1')._path, 'path1')
     self.assertEqual(x._GetAccumulator('run2')._path, 'path2')
 
   def testReload(self):
+    """EventAccumulators should Reload after EventMultiplexer call it."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     self.assertFalse(x._GetAccumulator('run1').reload_called)
     self.assertFalse(x._GetAccumulator('run2').reload_called)
@@ -142,6 +145,7 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertTrue(x._GetAccumulator('run2').reload_called)
 
   def testScalars(self):
+    """Tests Scalars function returns suitable values."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
 
     run1_actual = x.Scalars('run1', 'sv1')
@@ -150,6 +154,7 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertEqual(run1_expected, run1_actual)
 
   def testHealthPills(self):
+    """Tests HealthPills() returns events associated with run1/Add."""
     self.stubs.Set(event_accumulator, 'EventAccumulator',
                    functools.partial(
                        _GetFakeAccumulator,
@@ -172,11 +177,13 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertItemsEqual(['Add'], x.GetOpsWithHealthPills('run1'))
 
   def testExceptions(self):
+    """KeyError should be raised when accessing non-existing keys."""
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
     with self.assertRaises(KeyError):
       x.Scalars('sv1', 'xxx')
 
   def testInitialization(self):
+    """Tests EventMultiplexer is created properly with its params."""
     x = event_multiplexer.EventMultiplexer()
     self.assertEqual(x.Runs(), {})
     x = event_multiplexer.EventMultiplexer({'run1': 'path1', 'run2': 'path2'})
@@ -185,6 +192,14 @@ class EventMultiplexerTest(test_util.TensorFlowTestCase):
     self.assertEqual(x._GetAccumulator('run2')._path, 'path2')
 
   def testAddRunsFromDirectory(self):
+    """Tests AddRunsFromDirectory function.
+
+    Tests the following scenarios:
+    - When the directory does not exist.
+    - When the directory is empty.
+    - When the directory has empty subdirectory.
+    - Contains proper EventAccumulators after adding events.
+    """
     x = event_multiplexer.EventMultiplexer()
     tmpdir = self.get_temp_dir()
     join = os.path.join
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index ff4222032d..348745f8d2 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -1185,7 +1185,7 @@ def tf_version_info_genrule():
       ],
       outs=["util/version_info.cc"],
       cmd=
-      "$(PYTHON_BIN_PATH) $(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
+      "$(location //tensorflow/tools/git:gen_git_source.py) --generate $(SRCS) \"$@\"",
       local=1,
       tools=[clean_dep("//tensorflow/tools/git:gen_git_source.py")],)
 
diff --git a/tensorflow/tools/ci_build/install/install_auditwheel.sh b/tensorflow/tools/ci_build/install/install_auditwheel.sh
index 2538a393d3..e6f6124d56 100755
--- a/tensorflow/tools/ci_build/install/install_auditwheel.sh
+++ b/tensorflow/tools/ci_build/install/install_auditwheel.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-sudo pip3 install auditwheel
+sudo pip3 install auditwheel==1.5.0
 
 set +e
 patchelf_location=$(which patchelf)
diff --git a/tensorflow/tools/ci_build/install/install_deb_packages.sh b/tensorflow/tools/ci_build/install/install_deb_packages.sh
index 6b160bbe03..da1f2199d0 100755
--- a/tensorflow/tools/ci_build/install/install_deb_packages.sh
+++ b/tensorflow/tools/ci_build/install/install_deb_packages.sh
@@ -46,6 +46,7 @@ apt-get install -y --no-install-recommends \
     git \
     libcurl4-openssl-dev \
     libtool \
+    mlocate \
     openjdk-8-jdk \
     openjdk-8-jre-headless \
     pkg-config \
@@ -63,6 +64,9 @@ apt-get install -y --no-install-recommends \
     zip \
     zlib1g-dev
 
+# populate the database
+updatedb
+
 if [[ "$1" != "--without_cmake" ]]; then
   apt-get install -y --no-install-recommends \
     cmake
diff --git a/tensorflow/tools/ci_build/linux/cmake/run.sh b/tensorflow/tools/ci_build/linux/cmake/run.sh
old mode 100755
new mode 100644
diff --git a/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh b/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh
index 762c531725..d90a1b905d 100755
--- a/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh
+++ b/tensorflow/tools/ci_build/osx/libtensorflow_cpu.sh
@@ -28,6 +28,7 @@ export TF_NEED_GCP=0
 export TF_NEED_HDFS=0
 export TF_NEED_CUDA=0
 export TF_NEED_OPENCL=0
+export TF_NEED_MKL=0
 export COMPUTECPP_PATH="/usr/local"
 
 export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
diff --git a/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh b/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh
index 1da5e8c2bf..79973647c1 100755
--- a/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh
+++ b/tensorflow/tools/ci_build/osx/libtensorflow_gpu.sh
@@ -29,6 +29,7 @@ export PYTHON_BIN_PATH="/usr/bin/python"
 export TF_NEED_GCP=0
 export TF_NEED_HDFS=0
 export TF_NEED_OPENCL=0
+export TF_NEED_MKL=0
 export COMPUTECPP_PATH="/usr/local"
 
 export PATH="/usr/local/cuda/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
diff --git a/tensorflow/tools/ci_build/windows/bazel/common_env.sh b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
index b993747521..e4e3861710 100644
--- a/tensorflow/tools/ci_build/windows/bazel/common_env.sh
+++ b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
@@ -34,6 +34,7 @@ export BAZEL_SH="C:/tools/msys64/usr/bin/bash"
 
 # Set Python path for ./configure
 export PYTHON_BIN_PATH="C:/Program Files/Anaconda3/python"
+export PYTHON_LIB_PATH="C:/Program Files/Anaconda3/lib/site-packages"
 
 # Set Python path for cc_configure.bzl
 export BAZEL_PYTHON="C:/Program Files/Anaconda3/python"
diff --git a/tensorflow/tools/docs/py_guide_parser.py b/tensorflow/tools/docs/py_guide_parser.py
index 3ca6d11b84..245643cb32 100644
--- a/tensorflow/tools/docs/py_guide_parser.py
+++ b/tensorflow/tools/docs/py_guide_parser.py
@@ -34,7 +34,7 @@ def md_files_in_dir(py_guide_src_dir):
 class PyGuideParser(object):
   """Simple parsing of a guide .md file.
 
-  Decendents can override the process_*() functions (called by process())
+  Descendants can override the process_*() functions (called by process())
   to either record infromation from the guide, or call replace_line()
   to affect the return value of process().
   """
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 84c0e89b91..b8cd04323c 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -8,6 +8,19 @@ load("@io_bazel_rules_closure//closure:defs.bzl", "web_library_external")
 load("//third_party/py:python_configure.bzl", "python_configure")
 
 
+def _is_windows(repository_ctx):
+  """Returns true if the host operating system is windows."""
+  return repository_ctx.os.name.lower().find("windows") != -1
+
+
+def _get_env_var(repository_ctx, name):
+  """Find an environment variable."""
+  if name in repository_ctx.os.environ:
+    return repository_ctx.os.environ[name]
+  else:
+    return None
+
+
 # Parse the bazel version string from `native.bazel_version`.
 def _parse_bazel_version(bazel_version):
   # Remove commit from version.
@@ -74,7 +87,7 @@ temp_workaround_http_archive = repository_rule(
 # Executes specified command with arguments and calls 'fail' if it exited with
 # non-zero code
 def _execute_and_check_ret_code(repo_ctx, cmd_and_args):
-  result = repo_ctx.execute(cmd_and_args)
+  result = repo_ctx.execute(cmd_and_args, timeout=10)
   if result.return_code != 0:
     fail(("Non-zero return code({1}) when executing '{0}':\n" + "Stdout: {2}\n"
           + "Stderr: {3}").format(" ".join(cmd_and_args), result.return_code,
@@ -84,9 +97,15 @@ def _execute_and_check_ret_code(repo_ctx, cmd_and_args):
 # Apply a patch_file to the repository root directory
 # Runs 'patch -p1'
 def _apply_patch(repo_ctx, patch_file):
-  _execute_and_check_ret_code(repo_ctx, [
+  cmd = [
       "patch", "-p1", "-d", repo_ctx.path("."), "-i", repo_ctx.path(patch_file)
-  ])
+  ]
+  if _is_windows(repo_ctx):
+    bazel_sh = _get_env_var(repo_ctx, "BAZEL_SH")
+    if not bazel_sh:
+      fail("BAZEL_SH environment variable is not set")
+    cmd = [bazel_sh, "-c", " ".join(cmd)]
+  _execute_and_check_ret_code(repo_ctx, cmd)
 
 
 # Download the repository and apply a patch to its root
diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
index 00d2e7c0c7..861a87b68b 100644
--- a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
+++ b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
@@ -1,9 +1,11 @@
-#ifdef _WIN32
-#define sleep(seconds) Sleep(1000*seconds)
-#endif  // _WIN32
 #include "unsupported/Eigen/CXX11/Tensor"
 
 #ifdef _WIN32
+#ifndef SLEEP_FUNC_HEADER_GUARD
+#define SLEEP_FUNC_HEADER_GUARD
+inline void sleep(unsigned int seconds) { Sleep(1000*seconds); }
+#endif
+
 // On Windows, Eigen will include Windows.h, which defines various
 // macros that conflict with TensorFlow symbols. Undefine them here to
 // prevent clashes.
diff --git a/third_party/grpc.BUILD b/third_party/grpc.BUILD
index 1d1e2222de..1699f6a854 100644
--- a/third_party/grpc.BUILD
+++ b/third_party/grpc.BUILD
@@ -176,6 +176,7 @@ cc_library(
         ".",
         "include",
     ],
+    linkopts = ["-lpthread"],
     deps = [
     ],
 )
@@ -1782,6 +1783,7 @@ cc_library(
         ".",
         "include",
     ],
+    linkopts = ["-lpthread"],
     deps = [
         ":gpr",
         ":grpc_unsecure",
diff --git a/third_party/jemalloc.BUILD b/third_party/jemalloc.BUILD
index 8ed13c51a5..3a9a9a80f2 100644
--- a/third_party/jemalloc.BUILD
+++ b/third_party/jemalloc.BUILD
@@ -94,6 +94,9 @@ cc_library(
         "@%ws%//tensorflow:linux_ppc64le": [
             "-lpthread",
         ],
+        "@%ws%//tensorflow:linux_x86_64": [
+            "-lpthread",
+        ],
         "//conditions:default": [
         ],
     }),
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 15aa53962d..005ae21ee8 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -1714,6 +1714,10 @@ cc_library(
         "include/llvm/Support/DataTypes.h",
         "include/llvm/ExecutionEngine/ObjectMemoryBuffer.h",
     ],
+    linkopts = [
+        "-lpthread",
+        "-ldl",
+    ],
     deps = [
         ":config",
         ":demangle",
diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD
index 7e95ebd355..8c86766eff 100644
--- a/third_party/mkl/BUILD
+++ b/third_party/mkl/BUILD
@@ -16,6 +16,7 @@ load(
 cc_library(
     name = "intel_binary_blob",
     srcs = if_mkl([
+        "libdl.so.2",
         "libmklml_intel.so",
         "libiomp5.so",
     ]),
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index 928bd333c6..c453645db5 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -58,21 +58,53 @@ def _is_windows(repository_ctx):
   return False
 
 
+def _execute(repository_ctx, cmdline, error_msg=None, error_details=None,
+             empty_stdout_fine=False):
+  """Executes an arbitrary shell command.
+
+  Args:
+    repository_ctx: the repository_ctx object
+    cmdline: list of strings, the command to execute
+    error_msg: string, a summary of the error if the command fails
+    error_details: string, details about the error or steps to fix it
+    empty_stdout_fine: bool, if True, an empty stdout result is fine, otherwise
+      it's an error
+  Return:
+    the result of repository_ctx.execute(cmdline)
+  """
+  result = repository_ctx.execute(cmdline)
+  if result.stderr or not (empty_stdout_fine or result.stdout):
+    _python_configure_fail(
+        "\n".join([
+            error_msg.strip() if error_msg else "Repository command failed",
+            result.stderr.strip(),
+            error_details if error_details else ""]))
+  return result
+
+
 def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name):
   """returns a genrule to symlink all files in a directory."""
   # Get the list of files under this directory
   find_result = None
   if _is_windows(repository_ctx):
-    find_result = repository_ctx.execute([
-        "dir", src_dir, "/b", "/s", "/a-d",
-    ])
+    find_result = _execute(
+        repository_ctx,
+        ["cmd.exe", "/c", "dir", src_dir.replace("/", "\\"), "/b", "/s",
+         "/a-d"],
+        empty_stdout_fine=True)
+    # src_files will be used to compute BUILD rules, where path must use
+    # forward slashes.
+    src_files = find_result.stdout.replace("\\", "/").splitlines()
+    # Create a list with the src_dir stripped to use for outputs.
+    fwdslashes_src_dir = src_dir.replace("\\", "/")
+    dest_files = [e.replace(fwdslashes_src_dir, "") for e in src_files]
   else:
-    find_result = repository_ctx.execute([
-        "find", src_dir, "-follow", "-type", "f",
-    ])
-  # Create a list with the src_dir stripped to use for outputs.
-  dest_files = find_result.stdout.replace(src_dir, '').splitlines()
-  src_files = find_result.stdout.splitlines()
+    find_result = _execute(
+        repository_ctx, ["find", src_dir, "-follow", "-type", "f"],
+        empty_stdout_fine=True)
+    # Create a list with the src_dir stripped to use for outputs.
+    dest_files = find_result.stdout.replace(src_dir, '').splitlines()
+    src_files = find_result.stdout.splitlines()
   command = []
   command_windows = []
   outs = []
@@ -136,26 +168,27 @@ def _check_python_bin(repository_ctx, python_bin):
 
 def _get_python_include(repository_ctx, python_bin):
   """Gets the python include path."""
-  result = repository_ctx.execute([python_bin, "-c",
-                                   'from __future__ import print_function;' +
-                                   'from distutils import sysconfig;' +
-                                   'print(sysconfig.get_python_inc())'])
-  if result == "":
-    _python_configure_fail(
-        "Problem getting python include path.  Is distutils installed?")
+  result = _execute(repository_ctx,
+                    [python_bin, "-c",
+                     'from __future__ import print_function;' +
+                     'from distutils import sysconfig;' +
+                     'print(sysconfig.get_python_inc())'],
+                    error_msg="Problem getting python include path.",
+                    error_details=("Is the Python binary path set up right? " +
+                                   "(See ./configure or BAZEL_BIN_PATH.) " +
+                                   "Is distutils installed?"))
   return result.stdout.splitlines()[0]
 
 
 def _get_numpy_include(repository_ctx, python_bin):
   """Gets the numpy include path."""
-  result = repository_ctx.execute([python_bin, "-c",
-                                   'from __future__ import print_function;' +
-                                   'import numpy;' +
-                                   ' print(numpy.get_include());'])
-  if result == "":
-    _python_configure_fail(
-        "Problem getting numpy include path.  Is numpy installed?")
-  return result.stdout.splitlines()[0]
+  return _execute(repository_ctx,
+                  [python_bin, "-c",
+                   'from __future__ import print_function;' +
+                   'import numpy;' +
+                   ' print(numpy.get_include());'],
+                  error_msg="Problem getting numpy include path.",
+                  error_details="Is numpy installed?").stdout.splitlines()[0]
 
 
 def _create_local_python_repository(repository_ctx):
diff --git a/tools/tf_env_collect.sh b/tools/tf_env_collect.sh
old mode 100644
new mode 100755
index 71b17f4b7b..abeebeadea
--- a/tools/tf_env_collect.sh
+++ b/tools/tf_env_collect.sh
@@ -42,7 +42,7 @@ fi
 
 echo >> $OUTPUT_FILE
 echo '== compiler =====================================================' >> $OUTPUT_FILE
-c++ --version &>> $OUTPUT_FILE
+c++ --version 2>&1 >> $OUTPUT_FILE
 
 echo >> $OUTPUT_FILE
 echo '== uname -a =====================================================' >> $OUTPUT_FILE
@@ -50,7 +50,7 @@ uname -a >> $OUTPUT_FILE
 
 echo >> $OUTPUT_FILE
 echo '== check pips ===================================================' >> $OUTPUT_FILE
-pip list 2>&1 | grep "proto\|numpy\|tensorflow" &>> $OUTPUT_FILE
+pip list 2>&1 | grep "proto\|numpy\|tensorflow" >> $OUTPUT_FILE
 
 
 echo >> $OUTPUT_FILE
@@ -67,7 +67,7 @@ print("tf.COMPILER_VERSION = %s" % tf.GIT_VERSION)
 with tf.Session() as sess:
   print("Sanity check: %r" % sess.run(tf.constant([1,2,3])[:1]))
 EOF
-python /tmp/check_tf.py &>> ${OUTPUT_FILE}
+python /tmp/check_tf.py 2>&1  >> ${OUTPUT_FILE}
 
 DEBUG_LD=libs python -c "import tensorflow"  2>>${OUTPUT_FILE} > /tmp/loadedlibs
 grep libcudnn.so /tmp/loadedlibs >> $OUTPUT_FILE
@@ -88,7 +88,7 @@ fi
 
 echo >> $OUTPUT_FILE >> $OUTPUT_FILE
 echo '== nvidia-smi ===================================================' >> $OUTPUT_FILE
-nvidia-smi &>> $OUTPUT_FILE
+nvidia-smi 2>&1 >> $OUTPUT_FILE
 
 echo >> $OUTPUT_FILE
 
-- 
GitLab


From 99706cf26befc2b86606557d01f14b32bf7c73f7 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 10 May 2017 22:07:14 -0700
Subject: [PATCH 1215/1563] Fix build by adding three.d.ts typing

PiperOrigin-RevId: 155712533
---
 tensorflow/tensorboard/components/vz_projector_d3v4/BUILD  | 2 +-
 .../tensorboard/components/vz_projector_d3v4/test/BUILD    | 2 +-
 tensorflow/workspace.bzl                                   | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
index 29a6244593..b388999a53 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
@@ -59,7 +59,7 @@ tensorboard_typescript_genrule(
     typings = [
         "external.d.ts",
         "@org_definitelytyped//:polymer.d.ts",
-        "//third_party/javascript/typings/threejs:three.d.ts",
+        "@org_definitelytyped//:three.d.ts",
         "@org_definitelytyped//:webcomponents.js.d.ts",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
     ],
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD
index 3536893748..e76c84e8f3 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/test/BUILD
@@ -31,7 +31,7 @@ tensorboard_typescript_genrule(
         "@org_definitelytyped//:chai.d.ts",
         "@org_definitelytyped//:mocha.d.ts",
         "@org_definitelytyped//:polymer.d.ts",
-        "//third_party/javascript/typings/threejs:three.d.ts",
+        "@org_definitelytyped//:three.d.ts",
         "@org_definitelytyped//:webcomponents.js.d.ts",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index b8cd04323c..00a7b7f009 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -894,6 +894,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
           ],
+          "9453c3e6bae824e90758c3b38975c1ed77e6abd79bf513bcb08368fcdb14898e": [
+              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f5407eba29c04fb8387c86df27512bd055b195d2/threejs/three.d.ts",
+              "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f5407eba29c04fb8387c86df27512bd055b195d2/threejs/three.d.ts",
+          ],
           "691756a6eb455f340c9e834de0d49fff269e7b8c1799c2454465dcd6a4435b80": [
               "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/46719185c564694c5583c4b7ad94dbb786ecad46/webcomponents.js/webcomponents.js.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/46719185c564694c5583c4b7ad94dbb786ecad46/webcomponents.js/webcomponents.js.d.ts",
@@ -1875,7 +1879,6 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "paper-dialog-common.css",
           "paper-dialog-shared-styles.html",
       ],
-      suppress = ["cssSyntax"],
       deps = [
           "@org_polymer",
           "@org_polymer_iron_flex_layout",
@@ -2491,6 +2494,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
       strip_prefix = "package",
       path = "/accessibility-developer-tools",
+      suppress = ["strictDependencies"],
   )
 
   web_library_external(
@@ -2603,4 +2607,5 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "https://github.com/PolymerElements/test-fixture/archive/v2.0.1.tar.gz",
       ],
       path = "/test-fixture",
+      suppress = ["strictDependencies"],
   )
-- 
GitLab


From 1e390f5f7992f3ae5f9ecfc91ebe3d711efe0b7d Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <kramerb@google.com>
Date: Thu, 11 May 2017 06:58:04 -0700
Subject: [PATCH 1216/1563] Add a test for zero-dimensional copies with
 different layouts, which are nops.

PiperOrigin-RevId: 155744287
---
 tensorflow/compiler/xla/tests/BUILD        |  1 +
 tensorflow/compiler/xla/tests/copy_test.cc | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/tensorflow/compiler/xla/tests/BUILD b/tensorflow/compiler/xla/tests/BUILD
index f8a4c65109..d7644a0513 100644
--- a/tensorflow/compiler/xla/tests/BUILD
+++ b/tensorflow/compiler/xla/tests/BUILD
@@ -891,6 +891,7 @@ xla_test(
     name = "copy_test",
     srcs = ["copy_test.cc"],
     deps = [
+        ":client_library_test_base",
         "//tensorflow/compiler/xla:array2d",
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:util",
diff --git a/tensorflow/compiler/xla/tests/copy_test.cc b/tensorflow/compiler/xla/tests/copy_test.cc
index 29e2950533..8ea97e67d6 100644
--- a/tensorflow/compiler/xla/tests/copy_test.cc
+++ b/tensorflow/compiler/xla/tests/copy_test.cc
@@ -24,6 +24,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
+#include "tensorflow/compiler/xla/tests/client_library_test_base.h"
 #include "tensorflow/compiler/xla/tests/hlo_test_base.h"
 #include "tensorflow/compiler/xla/tests/literal_test_util.h"
 #include "tensorflow/compiler/xla/tests/test_macros.h"
@@ -256,6 +257,22 @@ XLA_TEST_F(CopyOpTest, CopyConstantR4Layout0312_MultipleTilesPerLayer) {
   TestCopyConstantLayoutR4(2, 14, 5, 35, {0, 3, 1, 2});
 }
 
+using CopyOpClientTest = ClientLibraryTestBase;
+
+XLA_TEST_F(CopyOpClientTest, Copy0x0) {
+  Shape in_shape = ShapeUtil::MakeShapeWithLayout(F32, {0, 0}, {0, 1});
+  Shape out_shape = ShapeUtil::MakeShapeWithLayout(F32, {0, 0}, {1, 0});
+  auto empty = LiteralUtil::CreateFromShape(in_shape);
+
+  ComputationBuilder builder(client_, TestName());
+  auto param0 = builder.Parameter(0, in_shape, "input");
+  auto input_data = client_->TransferToServer(*empty).ConsumeValueOrDie();
+
+  auto actual = ExecuteAndTransfer(&builder, {input_data.get()}, &out_shape)
+                    .ConsumeValueOrDie();
+  LiteralTestUtil::ExpectEqual(*empty, *actual);
+}
+
 }  // namespace
 }  // namespace xla
 
-- 
GitLab


From 851982c0e3c543306f3942f92bc4bdbc0d50d1f7 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 11 May 2017 08:30:16 -0700
Subject: [PATCH 1217/1563] [TF:XLA] Add function compilation cache.

PiperOrigin-RevId: 155751485
---
 tensorflow/compiler/aot/compile.cc            |  2 +-
 .../jit/kernels/xla_device_launch_op.cc       |  4 +--
 .../jit/kernels/xla_local_launch_op.cc        |  2 +-
 .../compiler/jit/xla_compilation_cache.cc     |  2 +-
 tensorflow/compiler/tf2xla/xla_compiler.cc    | 34 ++++++++++++++++---
 tensorflow/compiler/tf2xla/xla_compiler.h     | 13 ++++++-
 .../compiler/tf2xla/xla_compiler_test.cc      |  8 ++---
 .../contrib/xla_tf_graph/xla_tf_graph_util.cc |  2 +-
 .../xla_tf_graph/xla_tf_graph_util_test.cc    |  2 +-
 9 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index 4c572fd390..162e719ade 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -301,7 +301,7 @@ Status ConvertGraphToXla(xla::CompileOnlyClient* client,
                                            "tfcompile", std::move(graph),
                                            xla_args, &result));
   *has_context_arg = result.requires_runtime_context;
-  *computation = std::move(result.computation);
+  *computation = std::move(*result.computation);
 
   int num_const_results = 0;
   for (int i = 0; i < result.outputs.size(); ++i) {
diff --git a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
index 497c813d99..cb6c14901b 100644
--- a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
@@ -121,7 +121,7 @@ void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
   // Runs the computation, if any. There might not be a computation if all
   // outputs were compile-time constants.
   std::vector<std::unique_ptr<xla::GlobalData>> outputs;
-  if (!kernel->computation.IsNull()) {
+  if (!kernel->computation->IsNull()) {
     auto opaque_shape = xla::ShapeUtil::MakeOpaqueShape();
 
     // Builds the inputs to the computation.
@@ -152,7 +152,7 @@ void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
     Env* env = Env::Default();
     auto start_time = env->NowMicros();
     VLOG(1) << "Executing XLA Computation...";
-    auto result = cache->client()->Execute(kernel->computation, arg_ptrs,
+    auto result = cache->client()->Execute(*kernel->computation, arg_ptrs,
                                            &execution_options, &profile);
     auto elapsed = env->NowMicros() - start_time;
     OP_REQUIRES(ctx, result.ok(), result.status());
diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
index 0a2af4050e..032ded54e6 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
@@ -225,7 +225,7 @@ void XlaLocalLaunchOp::Compute(OpKernelContext* ctx) {
 
   std::unique_ptr<xla::ShapedBuffer> output;
   bool output_is_tuple;
-  if (!kernel->computation.IsNull()) {
+  if (!kernel->computation->IsNull()) {
     // Build xla::ShapedBuffers that point directly to the Tensor buffers.
     std::vector<std::unique_ptr<xla::ShapedBuffer>> arg_buffers;
     arg_buffers.reserve(kernel->xla_input_shapes.size() + 1);
diff --git a/tensorflow/compiler/jit/xla_compilation_cache.cc b/tensorflow/compiler/jit/xla_compilation_cache.cc
index 8238f7d919..82af304169 100644
--- a/tensorflow/compiler/jit/xla_compilation_cache.cc
+++ b/tensorflow/compiler/jit/xla_compilation_cache.cc
@@ -273,7 +273,7 @@ Status XlaCompilationCache::Compile(
   *compilation_result = &entry->compilation_result;
   if (entry->compilation_status.ok() && executable) {
     if (entry->executable == nullptr &&
-        !entry->compilation_result.computation.IsNull()) {
+        !entry->compilation_result.computation->IsNull()) {
       XlaCompiler compiler(options);
       entry->compilation_status = compiler.BuildExecutable(
           entry->compilation_result, &entry->executable);
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index 5ed4393bc5..d246e7f9ac 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -57,6 +57,18 @@ Status CheckSignature(const DataTypeVector& types,
 
 }  // namespace
 
+bool XlaCompiler::Argument::operator==(
+    const XlaCompiler::Argument& other) const {
+  if (std::tie(kind, type, shape, name) !=
+      std::tie(other.kind, other.type, other.shape, other.name)) {
+    return false;
+  }
+  if (constant_value.shape() != other.constant_value.shape()) {
+    return false;
+  }
+  return constant_value.tensor_data() == other.constant_value.tensor_data();
+}
+
 XlaCompiler::XlaCompiler(XlaCompiler::Options options)
     : options_(std::move(options)),
       initialization_status_(Status::OK()),
@@ -85,6 +97,11 @@ int64 XlaCompiler::NextStepId() {
   return next_step_id_++;
 }
 
+uint64 XlaCompiler::SignatureHash::operator()(
+    const std::pair<string, std::vector<Argument>>& signature) const {
+  return std::hash<string>()(signature.first);
+}
+
 Status XlaCompiler::CompileFunction(
     const XlaCompiler::CompileOptions& options, const NameAttrList& function,
     const std::vector<XlaCompiler::Argument>& args,
@@ -92,6 +109,12 @@ Status XlaCompiler::CompileFunction(
   const string function_id = Canonicalize(function.name(), function.attr());
   VLOG(1) << "XlaCompiler::CompileFunction " << function_id;
 
+  auto it = cache_.find({function_id, args});
+  if (it != cache_.end()) {
+    *result = it->second;
+    return Status::OK();
+  }
+
   FunctionLibraryRuntime::Handle handle;
   TF_RETURN_IF_ERROR(
       flib_runtime_->Instantiate(function.name(), function.attr(), &handle));
@@ -129,6 +152,7 @@ Status XlaCompiler::CompileFunction(
       CompileGraph(options, function_id, std::move(graph), args, result));
   VLOG(1) << "====================================================";
 
+  cache_[{function_id, args}] = *result;
   return Status::OK();
 }
 
@@ -155,7 +179,7 @@ Status XlaCompiler::BuildExecutable(
   build_options.set_has_hybrid_result(
       options_.local_executable_has_hybrid_result);
 
-  auto compile_result = local_client->Compile(result.computation,
+  auto compile_result = local_client->Compile(*result.computation,
                                               argument_layouts, build_options);
   if (!compile_result.ok()) {
     return compile_result.status();
@@ -403,10 +427,12 @@ Status XlaCompiler::CompileGraph(const XlaCompiler::CompileOptions& options,
                                   flib_runtime_.get(), NextStepId()));
 
   int num_nonconst_outputs;
+  result->computation = std::make_shared<xla::Computation>();
   TF_RETURN_IF_ERROR(BuildComputation(
       context->retvals(), context->variables(), context->has_side_effects(),
       options.return_updated_values_for_all_variables, &builder,
-      &result->computation, &num_nonconst_outputs, &result->variable_updates));
+      result->computation.get(), &num_nonconst_outputs,
+      &result->variable_updates));
 
   result->requires_runtime_context = context->has_context_parameter();
 
@@ -427,13 +453,13 @@ Status XlaCompiler::CompileGraph(const XlaCompiler::CompileOptions& options,
     }
   }
 
-  if (result->computation.IsNull()) {
+  if (result->computation->IsNull()) {
     return Status::OK();
   }
 
   // Compute the output shapes, if there is a computation with non-constant
   // outputs.
-  auto computation_shape = client()->GetComputationShape(result->computation);
+  auto computation_shape = client()->GetComputationShape(*result->computation);
   if (!computation_shape.ok()) {
     return computation_shape.status();
   }
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.h b/tensorflow/compiler/tf2xla/xla_compiler.h
index 1a089155ce..15f723ad78 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.h
+++ b/tensorflow/compiler/tf2xla/xla_compiler.h
@@ -113,6 +113,8 @@ class XlaCompiler {
 
     // The name of this argument, used for debugging.
     string name;
+
+    bool operator==(const Argument& other) const;
   };
 
   struct OutputDescription {
@@ -173,7 +175,7 @@ class XlaCompiler {
 
     // The XLA computation built from the tensorflow subgraph. May be null
     // if the output consists solely of compile-time constants.
-    xla::Computation computation;
+    std::shared_ptr<xla::Computation> computation;
   };
 
   struct Options {
@@ -290,6 +292,15 @@ class XlaCompiler {
 
   std::unique_ptr<FunctionLibraryRuntime> flib_runtime_;
 
+  struct SignatureHash {
+    uint64 operator()(
+        const std::pair<string, std::vector<Argument>>& signature) const;
+  };
+
+  std::unordered_map<std::pair<string, std::vector<Argument>>,
+                     CompilationResult, SignatureHash>
+      cache_;
+
   std::unordered_map<string, xla::ChannelHandle> channels_ GUARDED_BY(mu_);
 
   TF_DISALLOW_COPY_AND_ASSIGN(XlaCompiler);
diff --git a/tensorflow/compiler/tf2xla/xla_compiler_test.cc b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
index 11c811613e..58d74057d1 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler_test.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
@@ -131,7 +131,7 @@ TEST_F(XlaCompilerTest, EmptyReturnValues) {
                                      /*args=*/{}, &result));
 
   // No computation should be generated.
-  EXPECT_EQ(0, result.computation.handle().handle());
+  EXPECT_EQ(0, result.computation->handle().handle());
 }
 
 // Tests compilation and execution of a graph that adds two tensors.
@@ -173,7 +173,7 @@ TEST_F(XlaCompilerTest, Simple) {
 
   std::unique_ptr<xla::GlobalData> actual =
       client_
-          ->Execute(result.computation, {param0_data.get(), param1_data.get()})
+          ->Execute(*result.computation, {param0_data.get(), param1_data.get()})
           .ConsumeValueOrDie();
   std::unique_ptr<xla::Literal> actual_literal =
       client_->Transfer(*actual).ConsumeValueOrDie();
@@ -230,7 +230,7 @@ TEST_F(XlaCompilerTest, ConstantOutputs) {
         client_->TransferToServer(*param0_literal).ConsumeValueOrDie();
 
     std::unique_ptr<xla::GlobalData> actual =
-        client_->Execute(result.computation, {param0_data.get()})
+        client_->Execute(*result.computation, {param0_data.get()})
             .ConsumeValueOrDie();
     std::unique_ptr<xla::Literal> actual_literal =
         client_->Transfer(*actual).ConsumeValueOrDie();
@@ -265,7 +265,7 @@ TEST_F(XlaCompilerTest, ConstantOutputs) {
         client_->TransferToServer(*param0_literal).ConsumeValueOrDie();
 
     std::unique_ptr<xla::GlobalData> actual =
-        client_->Execute(result.computation, {param0_data.get()})
+        client_->Execute(*result.computation, {param0_data.get()})
             .ConsumeValueOrDie();
     std::unique_ptr<xla::Literal> actual_literal =
         client_->Transfer(*actual).ConsumeValueOrDie();
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
index 87f7cba5f4..302aa6457a 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util.cc
@@ -228,7 +228,7 @@ ConvertTfGraphToXlaSessionModule(const std::vector<XlaCompiler::Argument>& args,
   TF_CHECK_OK(compiler->CompileGraph(XlaCompiler::CompileOptions(), GRAPH_NAME,
                                      std::move(graph), args, &result));
 
-  return result.computation.Snapshot();
+  return result.computation->Snapshot();
 }
 
 xla::StatusOr<std::unordered_map<int64, XlaNode>>
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
index 7162627562..beb4c8009b 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
@@ -79,7 +79,7 @@ static void DumpHloGraphForDebug(const std::vector<XlaCompiler::Argument>& args,
                                      std::move(graph), args, &result));
 
   // Convert to hlo
-  xla::Computation& computation = result.computation;
+  xla::Computation& computation = *result.computation;
 
   xla::Service* service(
       static_cast<xla::Service*>(xla::ClientLibrary::GetXlaService(
-- 
GitLab


From 0f08bba479b290684e215db3eed82a14a61d9270 Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Thu, 11 May 2017 08:46:31 -0700
Subject: [PATCH 1218/1563] Enables SDCAOptimizer work with dense vectors (of
 rank 1). By extension, tf.contrib.learn.SVM,
 tf.contrib.learn.LinearClassifier (when using the SDCA optimizer),
 SDCALogisticClassifier and SDCALinearRegressor can also work with dense
 vectors.

PiperOrigin-RevId: 155753008
---
 .../python/learn/estimators/linear_test.py      |  4 ++--
 .../learn/python/learn/estimators/svm_test.py   | 10 +++++-----
 .../python/sdca_estimator_test.py               |  8 ++++----
 .../linear_optimizer/python/sdca_optimizer.py   | 17 ++++++++++++++---
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/linear_test.py b/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
index ededd3cdb9..9147ca9abb 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
@@ -782,7 +782,7 @@ class LinearClassifierTest(test.TestCase):
           'example_id':
               constant_op.constant(['1', '2', '3']),
           'price':
-              constant_op.constant([[0.4], [0.6], [0.3]]),
+              constant_op.constant([0.4, 0.6, 0.3]),
           'country':
               sparse_tensor.SparseTensor(
                   values=['IT', 'US', 'GB'],
@@ -1451,7 +1451,7 @@ class LinearRegressorTest(test.TestCase):
           'example_id':
               constant_op.constant(['1', '2', '3']),
           'price':
-              constant_op.constant([[0.6], [0.8], [0.3]]),
+              constant_op.constant([0.6, 0.8, 0.3]),
           'sq_footage':
               constant_op.constant([[900.0], [700.0], [600.0]]),
           'country':
diff --git a/tensorflow/contrib/learn/python/learn/estimators/svm_test.py b/tensorflow/contrib/learn/python/learn/estimators/svm_test.py
index ccb33cae1e..f67f181d1a 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/svm_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/svm_test.py
@@ -59,9 +59,9 @@ class SVMTest(test.TestCase):
     def input_fn():
       return {
           'example_id': constant_op.constant(['1', '2', '3']),
-          'feature1': constant_op.constant([[0.5], [1.0], [1.0]]),
-          'feature2': constant_op.constant([[1.0], [-1.0], [0.5]]),
-      }, constant_op.constant([[1], [0], [1]])
+          'feature1': constant_op.constant([0.5, 1.0, 1.0]),
+          'feature2': constant_op.constant([1.0, -1.0, 0.5]),
+      }, constant_op.constant([1, 0, 1])
 
     feature1 = feature_column.real_valued_column('feature1')
     feature2 = feature_column.real_valued_column('feature2')
@@ -142,7 +142,7 @@ class SVMTest(test.TestCase):
     def input_fn():
       return {
           'example_id': constant_op.constant(['1', '2', '3']),
-          'feature1': constant_op.constant([[0.5], [1.0], [1.0]]),
+          'feature1': constant_op.constant([0.5, 1.0, 1.0]),
           'feature2': constant_op.constant([[1.0], [-1.0], [0.5]]),
       }, constant_op.constant([[1], [0], [1]])
 
@@ -223,7 +223,7 @@ class SVMTest(test.TestCase):
           'example_id':
               constant_op.constant(['1', '2', '3']),
           'price':
-              constant_op.constant([[0.6], [0.8], [0.3]]),
+              constant_op.constant([0.6, 0.8, 0.3]),
           'sq_footage':
               constant_op.constant([[900.0], [700.0], [600.0]]),
           'country':
diff --git a/tensorflow/contrib/linear_optimizer/python/sdca_estimator_test.py b/tensorflow/contrib/linear_optimizer/python/sdca_estimator_test.py
index 81434621bd..32b7f956e4 100644
--- a/tensorflow/contrib/linear_optimizer/python/sdca_estimator_test.py
+++ b/tensorflow/contrib/linear_optimizer/python/sdca_estimator_test.py
@@ -35,7 +35,7 @@ class SDCALogisticClassifierTest(test.TestCase):
     def input_fn():
       return {
           'example_id': constant_op.constant(['1', '2']),
-          'maintenance_cost': constant_op.constant([[500.0], [200.0]]),
+          'maintenance_cost': constant_op.constant([500.0, 200.0]),
           'sq_footage': constant_op.constant([[800.0], [600.0]]),
           'weights': constant_op.constant([[1.0], [1.0]])
       }, constant_op.constant([[0], [1]])
@@ -77,7 +77,7 @@ class SDCALogisticClassifierTest(test.TestCase):
     def input_fn():
       return {
           'example_id': constant_op.constant(['1', '2', '3']),
-          'price': constant_op.constant([[600.0], [1000.0], [400.0]]),
+          'price': constant_op.constant([600.0, 1000.0, 400.0]),
           'sq_footage': constant_op.constant([[1000.0], [600.0], [700.0]]),
           'weights': constant_op.constant([[1.0], [1.0], [1.0]])
       }, constant_op.constant([[1], [0], [1]])
@@ -196,7 +196,7 @@ class SDCALogisticClassifierTest(test.TestCase):
           'price':
               constant_op.constant([[0.6], [0.8], [0.3]]),
           'sq_footage':
-              constant_op.constant([[900.0], [700.0], [600.0]]),
+              constant_op.constant([900.0, 700.0, 600.0]),
           'country':
               sparse_tensor.SparseTensor(
                   values=['IT', 'US', 'GB'],
@@ -296,7 +296,7 @@ class SDCALinearRegressorTest(test.TestCase):
           'example_id':
               constant_op.constant(['1', '2', '3']),
           'price':
-              constant_op.constant([[0.4], [0.6], [0.3]]),
+              constant_op.constant([0.4, 0.6, 0.3]),
           'country':
               sparse_tensor.SparseTensor(
                   values=['IT', 'US', 'GB'],
diff --git a/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py b/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py
index 65a7116c23..92d022f2a3 100644
--- a/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py
+++ b/tensorflow/contrib/linear_optimizer/python/sdca_optimizer.py
@@ -19,7 +19,9 @@ from __future__ import print_function
 from tensorflow.contrib import layers
 from tensorflow.contrib.linear_optimizer.python.ops import sdca_ops
 from tensorflow.contrib.linear_optimizer.python.ops.sparse_feature_column import SparseFeatureColumn
+from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 
 
@@ -137,9 +139,18 @@ class SDCAOptimizer(object):
         transformed_tensor = features[column]
         if isinstance(column, layers.feature_column._RealValuedColumn):  # pylint: disable=protected-access
           # A real-valued column corresponds to a dense feature in SDCA. A
-          # transformed tensor corresponding to a RealValuedColumn has rank 2
-          # (its shape is typically [batch_size, column.dimension]) and so it
-          # can be passed to SDCA as is.
+          # transformed tensor corresponding to a RealValuedColumn should have
+          # rank at most 2. In order to be passed to SDCA, its rank needs to be
+          # exactly 2 (i.e., its shape should be [batch_size, column.dim]).
+          check_rank_op = control_flow_ops.Assert(
+              math_ops.less_equal(array_ops.rank(transformed_tensor), 2),
+              ['transformed_tensor shouls have rank at most 2.'])
+          # Reshape to [batch_size, dense_column_dimension].
+          with ops.control_dependencies([check_rank_op]):
+            transformed_tensor = array_ops.reshape(transformed_tensor, [
+                array_ops.shape(transformed_tensor)[0], -1
+            ])
+
           dense_features.append(transformed_tensor)
           # For real valued columns, the variables list contains exactly one
           # element.
-- 
GitLab


From c397ed659f78e5a0fbb2a6099550f80c3ed9ad49 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 11 May 2017 08:59:53 -0700
Subject: [PATCH 1219/1563] Improved code formatting.

PiperOrigin-RevId: 155754247
---
 tensorflow/core/framework/tensor_test.cc      |  8 ++--
 tensorflow/core/kernels/mkl_avgpooling_op.cc  |  9 +++--
 tensorflow/core/kernels/mkl_concat_op.cc      |  2 +-
 .../core/kernels/mkl_conv_grad_bias_ops.cc    |  2 +-
 .../core/kernels/mkl_conv_grad_filter_ops.cc  |  2 +-
 .../core/kernels/mkl_conv_grad_input_ops.cc   |  4 +-
 tensorflow/core/kernels/mkl_conv_ops.cc       | 38 ++++++++++---------
 .../core/kernels/mkl_fused_batch_norm_op.cc   |  4 +-
 tensorflow/core/kernels/mkl_identity_op.cc    | 16 ++++----
 tensorflow/core/kernels/mkl_lrn_op.cc         |  6 +--
 tensorflow/core/kernels/mkl_matmul_op.cc      | 12 +++---
 tensorflow/core/kernels/mkl_maxpooling_op.cc  | 22 ++++++-----
 .../core/kernels/mkl_pooling_ops_common.cc    |  2 +-
 tensorflow/core/kernels/mkl_relu_op.cc        |  7 ++--
 .../java/org/tensorflow/OperationTest.java    | 18 ++++-----
 15 files changed, 79 insertions(+), 73 deletions(-)

diff --git a/tensorflow/core/framework/tensor_test.cc b/tensorflow/core/framework/tensor_test.cc
index 2d756ef2c3..2626402ccd 100644
--- a/tensorflow/core/framework/tensor_test.cc
+++ b/tensorflow/core/framework/tensor_test.cc
@@ -203,12 +203,13 @@ TEST(Tensor_QInt32, Simple) {
 }
 
 class TensorReshapeTest : public ::testing::Test {
-protected:
+ protected:
   Tensor t;
   Tensor zero_t;
 
-  TensorReshapeTest() : t(DT_FLOAT, TensorShape({2, 3, 4, 5})),
-      zero_t(DT_FLOAT, TensorShape({3, 0, 2, 0, 5})) {}
+  TensorReshapeTest()
+      : t(DT_FLOAT, TensorShape({2, 3, 4, 5})),
+        zero_t(DT_FLOAT, TensorShape({3, 0, 2, 0, 5})) {}
 
   virtual void SetUp() {
     EXPECT_TRUE(t.shape().IsSameSize(TensorShape({2, 3, 4, 5})));
@@ -224,7 +225,6 @@ protected:
     tensor(0, 0, 0, 0) = 0.01f;
     tensor(1, 2, 3, 4) = 0.02f;
   }
-
 };
 
 TEST_F(TensorReshapeTest, Reshape) {
diff --git a/tensorflow/core/kernels/mkl_avgpooling_op.cc b/tensorflow/core/kernels/mkl_avgpooling_op.cc
index d90baee069..8bd1724e32 100644
--- a/tensorflow/core/kernels/mkl_avgpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_avgpooling_op.cc
@@ -343,10 +343,11 @@ class MklAvgPoolingGradOp : public OpKernel {
       if (!outbackprop_in_mkl_format) {
         // For avgpooling, tensor_in_shape should have 1 dimension, and 4
         // elements.
-        OP_REQUIRES(context, tensor_in_shape.dims() == 1 &&
-                                 tensor_in_shape.NumElements() == 4,
-                    errors::InvalidArgument("original input shape must be "
-                                            "1-dimensional and 4 elements"));
+        OP_REQUIRES(
+            context,
+            tensor_in_shape.dims() == 1 && tensor_in_shape.NumElements() == 4,
+            errors::InvalidArgument("original input shape must be "
+                                    "1-dimensional and 4 elements"));
 
         // For avgpooling, out_backprop should have 4 dimensions.
         OP_REQUIRES(context, out_backprop.dims() == 4,
diff --git a/tensorflow/core/kernels/mkl_concat_op.cc b/tensorflow/core/kernels/mkl_concat_op.cc
index 094ab1c6c6..d8a8cc74bf 100644
--- a/tensorflow/core/kernels/mkl_concat_op.cc
+++ b/tensorflow/core/kernels/mkl_concat_op.cc
@@ -445,7 +445,7 @@ class MklConcatOp : public OpKernel {
                               .HostMemory("concat_dim")                     \
                               .Label(mkl_op_registry::kMklOpLabel),         \
                           MklConcatOp<CPUDevice, type, NAME_IS_CONCAT_DIM>) \
-  REGISTER_KERNEL_BUILDER(Name("_MklConcatV2")                               \
+  REGISTER_KERNEL_BUILDER(Name("_MklConcatV2")                              \
                               .Device(DEVICE_CPU)                           \
                               .TypeConstraint<type>("T")                    \
                               .TypeConstraint<int32>("Tidx")                \
diff --git a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
index d4364d31e4..1831448df6 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
@@ -38,9 +38,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
-#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
diff --git a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
index dc6b88e953..b60bcf70e7 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
@@ -37,9 +37,9 @@ limitations under the License.
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
 
-#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index c97f1dd7b7..5613b674e5 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -23,6 +23,8 @@ limitations under the License.
 #define EIGEN_USE_THREADS
 #include <algorithm>
 #include <vector>
+#include "third_party/mkl/include/mkl_dnn.h"
+#include "third_party/mkl/include/mkl_dnn_types.h"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
@@ -40,8 +42,6 @@ limitations under the License.
 #include "tensorflow/core/util/tensor_format.h"
 #include "tensorflow/core/util/use_cudnn.h"
 #include "tensorflow/core/util/work_sharder.h"
-#include "third_party/mkl/include/mkl_dnn.h"
-#include "third_party/mkl/include/mkl_dnn_types.h"
 
 namespace tensorflow {
 
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index 76b9f1798d..0620e3fc91 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -36,9 +36,9 @@ limitations under the License.
 #include "tensorflow/core/util/padding.h"
 #include "tensorflow/core/util/tensor_format.h"
 
-#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -98,18 +98,19 @@ class MklConv2DOp : public OpKernel {
                                         filter.shape().DebugString()));
 
     for (int i = 0; i < 3; i++) {
-      OP_REQUIRES(context, FastBoundsCheck(filter.dim_size(i),
-                                           std::numeric_limits<int>::max()),
-                  errors::InvalidArgument("filter too large"));
+      OP_REQUIRES(
+          context,
+          FastBoundsCheck(filter.dim_size(i), std::numeric_limits<int>::max()),
+          errors::InvalidArgument("filter too large"));
     }
 
     const int64 input_depth =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'C')
                             : GetTensorDim(input, data_format_, 'C');
-    OP_REQUIRES(
-        context, input_depth == filter.dim_size(2),
-        errors::InvalidArgument("input and filter must have the same depth: ",
-                                input_depth, " vs ", filter.dim_size(2)));
+    OP_REQUIRES(context, input_depth == filter.dim_size(2),
+                errors::InvalidArgument(
+                    "input and filter must have the same depth: ", input_depth,
+                    " vs ", filter.dim_size(2)));
     // The last dimension for filter is out_depth.
     const int out_depth = static_cast<int>(filter.dim_size(3));
 
@@ -118,9 +119,10 @@ class MklConv2DOp : public OpKernel {
     const int64 input_rows_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'H')
                             : GetTensorDim(input, data_format_, 'H');
-    OP_REQUIRES(context, FastBoundsCheck(input_rows_raw,
-                                         std::numeric_limits<int>::max()),
-                errors::InvalidArgument("Input rows too large"));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(input_rows_raw, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("Input rows too large"));
     const int input_rows = static_cast<int>(input_rows_raw);
     const int filter_rows = static_cast<int>(filter.dim_size(0));
 
@@ -129,9 +131,10 @@ class MklConv2DOp : public OpKernel {
     const int64 input_cols_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'W')
                             : GetTensorDim(input, data_format_, 'W');
-    OP_REQUIRES(context, FastBoundsCheck(input_cols_raw,
-                                         std::numeric_limits<int>::max()),
-                errors::InvalidArgument("Input cols too large"));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(input_cols_raw, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("Input cols too large"));
     const int input_cols = static_cast<int>(input_cols_raw);
     const int filter_cols = static_cast<int>(filter.dim_size(1));
 
@@ -139,9 +142,10 @@ class MklConv2DOp : public OpKernel {
     const int64 input_batch_raw =
         input_in_mkl_format ? GetMklTensorDim(mkl_context.input_shape, 'N')
                             : GetTensorDim(input, data_format_, 'N');
-    OP_REQUIRES(context, FastBoundsCheck(input_batch_raw,
-                                         std::numeric_limits<int>::max()),
-                errors::InvalidArgument("batch is too large"));
+    OP_REQUIRES(
+        context,
+        FastBoundsCheck(input_batch_raw, std::numeric_limits<int>::max()),
+        errors::InvalidArgument("batch is too large"));
     const int batch = static_cast<int>(input_batch_raw);
 
     // For now we take the stride from the second and third dimensions only (we
diff --git a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
index 512e799d15..d533536802 100644
--- a/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
+++ b/tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
@@ -326,7 +326,7 @@ class MklFusedBatchNormOp : public OpKernel {
 };
 
 #define REGISTER_MKL_CPU(T)                                         \
-  REGISTER_KERNEL_BUILDER(Name("_MklFusedBatchNorm")                 \
+  REGISTER_KERNEL_BUILDER(Name("_MklFusedBatchNorm")                \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
@@ -677,7 +677,7 @@ class MklFusedBatchNormGradOp : public OpKernel {
 };
 
 #define REGISTER_MKL_CPU(T)                                         \
-  REGISTER_KERNEL_BUILDER(Name("_MklFusedBatchNormGrad")             \
+  REGISTER_KERNEL_BUILDER(Name("_MklFusedBatchNormGrad")            \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_identity_op.cc b/tensorflow/core/kernels/mkl_identity_op.cc
index e138cc2e95..cb7ea7e7f9 100644
--- a/tensorflow/core/kernels/mkl_identity_op.cc
+++ b/tensorflow/core/kernels/mkl_identity_op.cc
@@ -24,9 +24,9 @@ limitations under the License.
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
 
-#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 typedef Eigen::ThreadPoolDevice CPUDevice;
@@ -50,14 +50,14 @@ class MklIdentityOp : public OpKernel {
   bool IsExpensive() override { return false; }
 };
 
-#define REGISTER_MKL_CPU(T)                                                   \
-  REGISTER_KERNEL_BUILDER(Name("_MklIdentity")                                \
-                            .Device(DEVICE_CPU)                               \
-                            .TypeConstraint<T>("T")                           \
-                            .Label(mkl_op_registry::kMklOpLabel),             \
-                        MklIdentityOp<CPUDevice, T>);                         \
+#define REGISTER_MKL_CPU(T)                                         \
+  REGISTER_KERNEL_BUILDER(Name("_MklIdentity")                      \
+                              .Device(DEVICE_CPU)                   \
+                              .TypeConstraint<T>("T")               \
+                              .Label(mkl_op_registry::kMklOpLabel), \
+                          MklIdentityOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_MKL_CPU);
 #undef REGISTER_MKL_CPU
 }  // namespace tensorflow
-#endif // INTEL_MKL
+#endif  // INTEL_MKL
diff --git a/tensorflow/core/kernels/mkl_lrn_op.cc b/tensorflow/core/kernels/mkl_lrn_op.cc
index ac432e13ce..8f6c12d0d1 100644
--- a/tensorflow/core/kernels/mkl_lrn_op.cc
+++ b/tensorflow/core/kernels/mkl_lrn_op.cc
@@ -709,7 +709,7 @@ class MklLRNGradOp : public OpKernel {
       Shard(worker_threads.num_threads, worker_threads.workers, nodes * batch,
             depth * depth, shard);
     }
-		
+
     // release mkl resources
     void Mklcleanup() {
       bool ingrad_in_mkl_format = ingrad_shape.IsMklTensor();
@@ -736,12 +736,12 @@ class MklLRNGradOp : public OpKernel {
 };
 
 #define REGISTER_MKL_LRN_CPU(T)                                     \
-  REGISTER_KERNEL_BUILDER(Name("_MklLRN")                            \
+  REGISTER_KERNEL_BUILDER(Name("_MklLRN")                           \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
                           MklLRNOp<T>);                             \
-  REGISTER_KERNEL_BUILDER(Name("_MklLRNGrad")                        \
+  REGISTER_KERNEL_BUILDER(Name("_MklLRNGrad")                       \
                               .Device(DEVICE_CPU)                   \
                               .TypeConstraint<T>("T")               \
                               .Label(mkl_op_registry::kMklOpLabel), \
diff --git a/tensorflow/core/kernels/mkl_matmul_op.cc b/tensorflow/core/kernels/mkl_matmul_op.cc
index e43b75e250..16143191a3 100644
--- a/tensorflow/core/kernels/mkl_matmul_op.cc
+++ b/tensorflow/core/kernels/mkl_matmul_op.cc
@@ -25,11 +25,11 @@ limitations under the License.
 
 #if defined(INTEL_MKL)
 
+#include "third_party/mkl/include/mkl_cblas.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/kernels/fill_functor.h"
-#include "third_party/mkl/include/mkl_cblas.h"
 
 namespace tensorflow {
 
@@ -56,11 +56,11 @@ class MklMatMulOp : public OpKernel {
     dim_pair[0].first = transpose_a_ ? 0 : 1;
     dim_pair[0].second = transpose_b_ ? 1 : 0;
 
-    OP_REQUIRES(ctx,
-                a.dim_size(dim_pair[0].first) == b.dim_size(dim_pair[0].second),
-                errors::InvalidArgument("Matrix size-incompatible: In[0]: ",
-                                        a.shape().DebugString(), ", In[1]: ",
-                                        b.shape().DebugString()));
+    OP_REQUIRES(
+        ctx, a.dim_size(dim_pair[0].first) == b.dim_size(dim_pair[0].second),
+        errors::InvalidArgument(
+            "Matrix size-incompatible: In[0]: ", a.shape().DebugString(),
+            ", In[1]: ", b.shape().DebugString()));
     int a_dim_remaining = 1 - dim_pair[0].first;
     int b_dim_remaining = 1 - dim_pair[0].second;
     TensorShape out_shape(
diff --git a/tensorflow/core/kernels/mkl_maxpooling_op.cc b/tensorflow/core/kernels/mkl_maxpooling_op.cc
index 1e0ee258b0..44e1b93dba 100644
--- a/tensorflow/core/kernels/mkl_maxpooling_op.cc
+++ b/tensorflow/core/kernels/mkl_maxpooling_op.cc
@@ -382,18 +382,19 @@ class MklMaxPoolingGradOp : public OpKernel {
       if (workspace_enabled == false) {
         if (convert_input != nullptr) {
           if (input_in_mkl_format == false) {
-            CHECK_EQ(
-                dnnConversionExecute_F32(
-                    convert_input, const_cast<void*>(static_cast<const void*>(
-                                       tensor_in.flat<T>().data())),
-                    input_buf),
-                E_SUCCESS);
+            CHECK_EQ(dnnConversionExecute_F32(
+                         convert_input,
+                         const_cast<void*>(static_cast<const void*>(
+                             tensor_in.flat<T>().data())),
+                         input_buf),
+                     E_SUCCESS);
             CHECK_EQ(dnnDelete_F32(convert_input), E_SUCCESS);
             convert_input = nullptr;
           } else {
             input_shape.GetConvertedFlatData(
-                lt_input_prim, const_cast<void*>(static_cast<const void*>(
-                                   tensor_in.flat<T>().data())),
+                lt_input_prim,
+                const_cast<void*>(
+                    static_cast<const void*>(tensor_in.flat<T>().data())),
                 input_buf);
           }
           pooling_resfwd[dnnResourceSrc] = input_buf;
@@ -438,8 +439,9 @@ class MklMaxPoolingGradOp : public OpKernel {
           CHECK_EQ(dnnDelete_F32(convert_outbackprop), E_SUCCESS);
         } else {
           output_backprop_shape.GetConvertedFlatData(
-              lt_outbackprop_prim, const_cast<void*>(static_cast<const void*>(
-                                       out_backprop.flat<T>().data())),
+              lt_outbackprop_prim,
+              const_cast<void*>(
+                  static_cast<const void*>(out_backprop.flat<T>().data())),
               outbackprop_buf);
         }
         pooling_res[dnnResourceDiffDst] = outbackprop_buf;
diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.cc b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
index 65e8852cfb..d88bd4c640 100644
--- a/tensorflow/core/kernels/mkl_pooling_ops_common.cc
+++ b/tensorflow/core/kernels/mkl_pooling_ops_common.cc
@@ -14,8 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #ifdef INTEL_MKL
-#include <vector>
 #include "tensorflow/core/kernels/mkl_pooling_ops_common.h"
+#include <vector>
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/framework/common_shape_fns.h"
 
diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc
index 0c66f73141..f77bdf665e 100644
--- a/tensorflow/core/kernels/mkl_relu_op.cc
+++ b/tensorflow/core/kernels/mkl_relu_op.cc
@@ -16,17 +16,17 @@ limitations under the License.
 // See docs in ../ops/nn_ops.cc.
 #ifdef INTEL_MKL
 
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/numeric_op.h"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/core/errors.h"
-#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 
-#include "tensorflow/core/platform/default/logging.h"
-#include "tensorflow/core/util/mkl_util.h"
 #include "third_party/mkl/include/mkl_dnn.h"
 #include "third_party/mkl/include/mkl_dnn_types.h"
+#include "tensorflow/core/platform/default/logging.h"
+#include "tensorflow/core/util/mkl_util.h"
 
 namespace tensorflow {
 
@@ -216,7 +216,6 @@ class MklReluGradOp : public OpKernel {
       }
 
       relu_res[dnnResourceDiffDst] = user_g;
-
     }
 
     void MklCreateInputLayouts(OpKernelContext* context) {
diff --git a/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java b/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
index 53bd511b5b..101839e6d7 100644
--- a/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
+++ b/tensorflow/java/src/test/java/org/tensorflow/OperationTest.java
@@ -22,19 +22,19 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import java.util.List;
 
 /** Unit tests for {@link org.tensorflow.Operation}. */
 @RunWith(JUnit4.class)
 public class OperationTest {
 
   @Test
-  public void  outputListLengthFailsOnInvalidName() {
+  public void outputListLengthFailsOnInvalidName() {
     try (Graph g = new Graph()) {
-      Operation op = g.opBuilder("Add", "Add")
-          .addInput(TestUtil.constant(g, "x", 1))
-          .addInput(TestUtil.constant(g, "y", 2))
-          .build();
+      Operation op =
+          g.opBuilder("Add", "Add")
+              .addInput(TestUtil.constant(g, "x", 1))
+              .addInput(TestUtil.constant(g, "y", 2))
+              .build();
       assertEquals(1, op.outputListLength("z"));
 
       try {
@@ -48,9 +48,9 @@ public class OperationTest {
 
   @Test
   public void outputListLength() {
-    assertEquals(1, split(new int[]{0, 1}, 1));
-    assertEquals(2, split(new int[]{0, 1}, 2));
-    assertEquals(3, split(new int[]{0, 1, 2}, 3));
+    assertEquals(1, split(new int[] {0, 1}, 1));
+    assertEquals(2, split(new int[] {0, 1}, 2));
+    assertEquals(3, split(new int[] {0, 1, 2}, 3));
   }
 
   private int split(int[] values, int num_split) {
-- 
GitLab


From 168210843dc8da758f96ca73fc110e4de0d4ce76 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Thu, 11 May 2017 09:26:17 -0700
Subject: [PATCH 1220/1563] Add note clarifying tie breaking behavior.
 END_PUBLIC

BEGIN_PUBLIC
Automated g4 rollback of changelist 152465844

PiperOrigin-RevId: 155756924
---
 tensorflow/core/ops/math_ops.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index 01b35064b2..79a8be0048 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -1270,6 +1270,8 @@ REGISTER_OP("ArgMax")
     .Doc(R"doc(
 Returns the index with the largest value across dimensions of a tensor.
 
+Note that in case of ties the identity of the return value is not guaranteed.
+
 dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
   of the input Tensor to reduce across. For vectors, use dimension = 0.
 )doc");
@@ -1284,6 +1286,8 @@ REGISTER_OP("ArgMin")
     .Doc(R"doc(
 Returns the index with the smallest value across dimensions of a tensor.
 
+Note that in case of ties the identity of the return value is not guaranteed.
+
 dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
   of the input Tensor to reduce across. For vectors, use dimension = 0.
 )doc");
-- 
GitLab


From b456315662c84a0721a7db33ddd55ef9d8cde639 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 10:02:12 -0700
Subject: [PATCH 1221/1563] Fix expected error text in feature_column_test.py.

PiperOrigin-RevId: 155760913
---
 tensorflow/contrib/layers/python/layers/feature_column_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column_test.py b/tensorflow/contrib/layers/python/layers/feature_column_test.py
index 0f606a787d..b6a8b6bdda 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_test.py
@@ -441,7 +441,7 @@ class FeatureColumnTest(test.TestCase):
     sparse_tensor = sparse_tensor_lib.SparseTensor(
         values=[2.0, 5.0], indices=[[0, 0], [2, 0]], dense_shape=[3, 1])
     with self.assertRaisesRegexp(
-        ValueError, "Calling an abstract method."):
+        ValueError, "Set is_sparse to False"):
       real_valued_column._to_dnn_input_layer(sparse_tensor)
 
   def testRealValuedColumnDeepCopy(self):
-- 
GitLab


From 51caa2b03f2975be51ab3f03999f35046b34f4af Mon Sep 17 00:00:00 2001
From: Chris Song <sjhshy@gmail.com>
Date: Thu, 11 May 2017 18:27:22 +0000
Subject: [PATCH 1222/1563] Fix misspells.

---
 tensorflow/cc/framework/gradients_test.cc                     | 2 +-
 tensorflow/cc/saved_model/loader.cc                           | 2 +-
 tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc   | 2 +-
 tensorflow/compiler/xla/service/gpu/ir_emitter.cc             | 2 +-
 .../xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc       | 2 +-
 tensorflow/compiler/xla/service/gpu/while_transformer.cc      | 2 +-
 tensorflow/compiler/xla/service/layout_assignment.cc          | 4 ++--
 tensorflow/compiler/xla/tests/deallocation_test.cc            | 2 +-
 tensorflow/compiler/xla/tests/literal_test_util.cc            | 2 +-
 tensorflow/compiler/xla/tests/reduce_test.cc                  | 2 +-
 .../lib/quantiles/weighted_quantiles_summary_test.cc          | 2 +-
 .../opt/python/training/drop_stale_gradient_optimizer_test.py | 4 ++--
 tensorflow/core/common_runtime/gpu/gpu_util.cc                | 4 ++--
 tensorflow/core/grappler/costs/measuring_cost_estimator.cc    | 2 +-
 tensorflow/core/grappler/costs/robust_stats.cc                | 2 +-
 tensorflow/core/kernels/basic_ops_benchmark_test.cc           | 2 +-
 tensorflow/core/kernels/deep_conv2d.cc                        | 2 +-
 tensorflow/core/lib/gtl/inlined_vector_test.cc                | 2 +-
 tensorflow/core/ops/sdca_ops.cc                               | 2 +-
 tensorflow/core/platform/cloud/google_auth_provider.cc        | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tensorflow/cc/framework/gradients_test.cc b/tensorflow/cc/framework/gradients_test.cc
index 7783bdce3a..6a24982581 100644
--- a/tensorflow/cc/framework/gradients_test.cc
+++ b/tensorflow/cc/framework/gradients_test.cc
@@ -260,7 +260,7 @@ TEST_F(GradientsTest, StackUnstack_StopBackprop) {
 }
 
 TEST_F(GradientsTest, DependentGradOutputs) {
-  // Tests that dependant gradients (in this case the gradients w.r.t to the
+  // Tests that dependent gradients (in this case the gradients w.r.t to the
   // output and one input of MatMul) are computed properly.
 
   // Create two chained MatMul ops.
diff --git a/tensorflow/cc/saved_model/loader.cc b/tensorflow/cc/saved_model/loader.cc
index b144bfc33e..908aa01a34 100644
--- a/tensorflow/cc/saved_model/loader.cc
+++ b/tensorflow/cc/saved_model/loader.cc
@@ -36,7 +36,7 @@ auto* load_attempt_count = monitoring::Counter<2>::New(
     "status");
 auto* load_latency = monitoring::Counter<1>::New(
     "/tensorflow/cc/saved_model/load_latency",
-    "Latency in microseconds for SavedModels that were succesfully loaded.",
+    "Latency in microseconds for SavedModels that were successfully loaded.",
     "model_path");
 constexpr char kLoadAttemptFail[] = "fail";
 constexpr char kLoadAttemptSuccess[] = "success";
diff --git a/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc b/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc
index 1667ab3679..e57eb0bdee 100644
--- a/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc
@@ -113,7 +113,7 @@ StatusOr<llvm::Value*> GpuElementalIrEmitter::EmitMathCall(
     tensorflow::gtl::ArraySlice<llvm::Value*> operands,
     tensorflow::gtl::ArraySlice<PrimitiveType> input_types,
     PrimitiveType output_type) const {
-  // Binary math functions tranform are of type [T] -> T.
+  // Binary math functions transform are of type [T] -> T.
   for (PrimitiveType input_type : input_types) {
     if (output_type != input_type) {
       return Unimplemented("Input type ≠ output type: %s ≠ %s",
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emitter.cc b/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
index e60978df0a..36619a8454 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
@@ -399,7 +399,7 @@ Status IrEmitter::HandleDot(HloInstruction* dot,
   llvm::Type* accum_type = target_array.GetElementLlvmType();
   llvm::Value* accum_address = llvm_ir::EmitAllocaAtFunctionEntry(
       accum_type,       // The pointee type of the alloca instruction.
-      "accum_address",  // The name of the alloca instuction.
+      "accum_address",  // The name of the alloca instruction.
       &ir_builder_);
 
   // Initialize the accumulator in the preheader to zero.
diff --git a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
index 485216837d..383729185d 100644
--- a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
+++ b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
@@ -396,7 +396,7 @@ StatusOr<string> CompileModuleToPtx(llvm::Module* module,
 
   // The LLVM IR verifier performs sanity checking on the IR. This helps
   // discover problems and report them in a meaningful manner, rather than let
-  // later passes report obscure assertions becasue of unfulfilled invariants.
+  // later passes report obscure assertions because of unfulfilled invariants.
   module_passes.add(llvm::createVerifierPass());
 
   // Create the function-level pass manager. It needs data layout information
diff --git a/tensorflow/compiler/xla/service/gpu/while_transformer.cc b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
index 46a5d303b7..61bc6f6055 100644
--- a/tensorflow/compiler/xla/service/gpu/while_transformer.cc
+++ b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
@@ -168,7 +168,7 @@ class MatcherBase {
   virtual ~MatcherBase() {}
 
   // Attempts to match each ExprTree in 'expr_trees_'.
-  // Returns OK on the first succesful match, error status otherwise.
+  // Returns OK on the first successful match, error status otherwise.
   virtual tensorflow::Status Run() {
     Status status;
     for (const ExprTree& expr_tree : expr_trees_) {
diff --git a/tensorflow/compiler/xla/service/layout_assignment.cc b/tensorflow/compiler/xla/service/layout_assignment.cc
index d413621cfe..d3932ca741 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment.cc
@@ -1041,7 +1041,7 @@ StatusOr<Layout> InferArrayLayout(
                                   *first_buffer_layout)) {
       // The points-to set is ambiguous for this index and the different source
       // buffers have different layouts. This case is possible in valid XLA
-      // computations because we do not propagate BufferLayoutConstaints to all
+      // computations because we do not propagate BufferLayoutConstraints to all
       // LogicalBuffers which may alias the constrained LogicalBuffer at some
       // point in the computation.
       return FailedPrecondition(
@@ -1254,7 +1254,7 @@ Status LayoutAssignment::RunOnComputation(
   TF_ASSIGN_OR_RETURN(auto points_to_analysis,
                       TuplePointsToAnalysis::Run(computation->parent()));
 
-  // Construct LayoutConstaints with all layout constraints of the computation.
+  // Construct LayoutConstraints with all layout constraints of the computation.
   LayoutConstraints constraints(*points_to_analysis, computation);
 
   // Add constraints required for correctness on all backends (eg, entry
diff --git a/tensorflow/compiler/xla/tests/deallocation_test.cc b/tensorflow/compiler/xla/tests/deallocation_test.cc
index 94f34f753b..cc3c4a2a5e 100644
--- a/tensorflow/compiler/xla/tests/deallocation_test.cc
+++ b/tensorflow/compiler/xla/tests/deallocation_test.cc
@@ -52,7 +52,7 @@ TEST_F(DeallocationTest, DeallocateScalar) {
   builder.ConstantR0<float>(42.0);
   auto global_data = ExecuteAndCheckTransfer(&builder, {});
 
-  // A result can be transfered an arbitrary number of times.  Add an extra
+  // A result can be transferred an arbitrary number of times.  Add an extra
   // transfer here so we're not just testing that a second call to Transfer
   // fails.
   ASSERT_IS_OK(client_->Transfer(*global_data).status());
diff --git a/tensorflow/compiler/xla/tests/literal_test_util.cc b/tensorflow/compiler/xla/tests/literal_test_util.cc
index ef81db6fd6..23453db57b 100644
--- a/tensorflow/compiler/xla/tests/literal_test_util.cc
+++ b/tensorflow/compiler/xla/tests/literal_test_util.cc
@@ -314,7 +314,7 @@ class NearComparator {
 
  private:
   // EXPECTs that the two given scalar values are within the error bound. Keeps
-  // track of how many mismatches have occured to keep the size of the output
+  // track of how many mismatches have occurred to keep the size of the output
   // manageable.
   template <typename NativeT>
   bool ExpectValuesNear(NativeT expected, NativeT actual) {
diff --git a/tensorflow/compiler/xla/tests/reduce_test.cc b/tensorflow/compiler/xla/tests/reduce_test.cc
index d00a317534..feb2b465fc 100644
--- a/tensorflow/compiler/xla/tests/reduce_test.cc
+++ b/tensorflow/compiler/xla/tests/reduce_test.cc
@@ -61,7 +61,7 @@ namespace {
 class ReduceTest : public ClientLibraryTestBase {
  protected:
   ReduceTest() {
-    // Implementation note: layed out z >> y >> x by default.
+    // Implementation note: laid out z >> y >> x by default.
     // clang-format off
     literal_2d_ = LiteralUtil::CreateR2<float>({
       // x0   x1   x2
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
index 0bdfb40664..8de154483e 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
@@ -75,7 +75,7 @@ TEST_F(WeightedQuantilesSummaryTest, BuildFromBuffer) {
   Summary summary;
   summary.BuildFromBufferEntries(buffer1_->GenerateEntryList());
 
-  // We expect no approximation error because no compress operation occured.
+  // We expect no approximation error because no compress operation occurred.
   EXPECT_EQ(summary.ApproximationError(), 0);
 
   // Check first and last elements in the summary.
diff --git a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
index 4f0bc0ce2f..53232082e1 100644
--- a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
+++ b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
@@ -184,7 +184,7 @@ class DropStaleGradientOptimizerTest(test.TestCase):
     thread_0.join()
     thread_1.join()
 
-    # With 2 workers and max staleness set to 0, only cheif worker will update
+    # With 2 workers and max staleness set to 0, only chief worker will update
     # var_0 and var_1.
     self.assertAllEqual(1, sessions[0].run(global_step))
     self.assertAllEqual(1.0, sessions[0].run(stale_counter))
@@ -250,7 +250,7 @@ class DropStaleGradientOptimizerTest(test.TestCase):
     thread_1.join()
     thread_2.join()
 
-    # With 3 workers and max staleness set to 0, only cheif worker will update
+    # With 3 workers and max staleness set to 0, only chief worker will update
     # var_0 and var_1.
     self.assertAllEqual(1, sessions[0].run(global_step))
     self.assertAllEqual(2.0, sessions[0].run(stale_counter))
diff --git a/tensorflow/core/common_runtime/gpu/gpu_util.cc b/tensorflow/core/common_runtime/gpu/gpu_util.cc
index 522db80d7f..71f82ec9a1 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_util.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_util.cc
@@ -227,7 +227,7 @@ void GPUUtil::DeviceToDeviceCopy(DeviceContext* send_dev_context,
     }
     // Since we want to use the memory from recv_stream in the
     // send_device_to_device_stream, add a dependency to make sure the memory is
-    // truely free.
+    // truly free.
     // TODO(zhengxq): remove this dependency when we switch to a better way
     // to make sure the memory is free.
     send_device_to_device_stream->ThenWaitFor(recv_stream);
@@ -322,7 +322,7 @@ void GPUUtil::CopyCPUTensorToGPU(const Tensor* cpu_tensor,
     done(errors::Internal("No send gpu copy-out-stream is available."));
     return;
   }
-  // Wait for the recv-stream to make sure the buffer is truely available.
+  // Wait for the recv-stream to make sure the buffer is truly available.
   recv_host_to_device_stream->ThenWaitFor(recv_stream);
 
   const int64 total_bytes = cpu_tensor->TotalBytes();
diff --git a/tensorflow/core/grappler/costs/measuring_cost_estimator.cc b/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
index 6179dc05c1..9262883b2a 100644
--- a/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
@@ -73,7 +73,7 @@ Status MeasuringCostEstimator::PredictCosts(const GraphDef& optimized_graph,
       return;
     }
     if (!local_status.ok()) {
-      // Discard the data if the run wasn't sucessful.
+      // Discard the data if the run wasn't successful.
       barrier.DecrementCount();
       return;
     }
diff --git a/tensorflow/core/grappler/costs/robust_stats.cc b/tensorflow/core/grappler/costs/robust_stats.cc
index dba6efae0f..9866bc8688 100644
--- a/tensorflow/core/grappler/costs/robust_stats.cc
+++ b/tensorflow/core/grappler/costs/robust_stats.cc
@@ -47,7 +47,7 @@ static double Median(std::vector<double> &&values) {
   // nth_element.
   const auto lower_middle = std::max_element(values.begin(), middle);
   // Preventing overflow. We know that '*lower_middle <= *middle'.
-  // If both are on oposite sides of zero, the sum won't overflow, otherwise
+  // If both are on opposite sides of zero, the sum won't overflow, otherwise
   // the difference won't overflow.
   if (*lower_middle <= 0 && *middle >= 0) {
     return (*lower_middle + *middle) / 2;
diff --git a/tensorflow/core/kernels/basic_ops_benchmark_test.cc b/tensorflow/core/kernels/basic_ops_benchmark_test.cc
index 54532318ce..5726062938 100644
--- a/tensorflow/core/kernels/basic_ops_benchmark_test.cc
+++ b/tensorflow/core/kernels/basic_ops_benchmark_test.cc
@@ -22,7 +22,7 @@ limitations under the License.
 
 namespace tensorflow {
 
-// We focus on the single thread performance of runing ops.
+// We focus on the single thread performance of running ops.
 static SessionOptions InitOptions() {
   SessionOptions opts;
   opts.config.set_intra_op_parallelism_threads(1);
diff --git a/tensorflow/core/kernels/deep_conv2d.cc b/tensorflow/core/kernels/deep_conv2d.cc
index 9e6d8e42a4..a481401479 100644
--- a/tensorflow/core/kernels/deep_conv2d.cc
+++ b/tensorflow/core/kernels/deep_conv2d.cc
@@ -1069,7 +1069,7 @@ struct DeepConv2D<CPUDevice, T> {
       // Allocate temporary buffer 'buffer2', which is first used for
       // transformed input tiles, then re-used for transformed output tiles.
       // Calculate required buffer size for 'buffer2' as max required buffer
-      // between input and output tranform buffer sizes.
+      // between input and output transform buffer sizes.
       const int64 buffer2_tile_transform_size =
           tile_spatial_size * num_tiles * in_depth;
       const int64 buffer2_out_transform_size =
diff --git a/tensorflow/core/lib/gtl/inlined_vector_test.cc b/tensorflow/core/lib/gtl/inlined_vector_test.cc
index b957fedc4a..6e3c083f58 100644
--- a/tensorflow/core/lib/gtl/inlined_vector_test.cc
+++ b/tensorflow/core/lib/gtl/inlined_vector_test.cc
@@ -816,7 +816,7 @@ static void BM_StdVectorFillString(int iters, int len) {
   }
   testing::ItemsProcessed(int64{iters} * len);
   // The purpose of the benchmark is to verify that inlined vector is
-  // efficient when moving is more efficent than copying. To do so, we
+  // efficient when moving is more efficient than copying. To do so, we
   // use strings that are larger than the small string optimization.
   CHECK(!StringRepresentedInline(strings[0]));
 }
diff --git a/tensorflow/core/ops/sdca_ops.cc b/tensorflow/core/ops/sdca_ops.cc
index b9a37119b7..dea75a1af8 100644
--- a/tensorflow/core/ops/sdca_ops.cc
+++ b/tensorflow/core/ops/sdca_ops.cc
@@ -105,7 +105,7 @@ example_weights: a vector which contains the weight associated with each
 example_labels: a vector which contains the label/target associated with each
   example.
 sparse_indices: a list of vectors where each value is the indices which has
-  corresponding weights in sparse_weights. This field maybe ommitted for the
+  corresponding weights in sparse_weights. This field maybe omitted for the
   dense approach.
 sparse_weights: a list of vectors where each value is the weight associated with
   a sparse feature group.
diff --git a/tensorflow/core/platform/cloud/google_auth_provider.cc b/tensorflow/core/platform/cloud/google_auth_provider.cc
index 6f29d4597f..f70b431b65 100644
--- a/tensorflow/core/platform/cloud/google_auth_provider.cc
+++ b/tensorflow/core/platform/cloud/google_auth_provider.cc
@@ -67,7 +67,7 @@ constexpr char kGceTokenUrl[] =
 // The authentication token scope to request.
 constexpr char kOAuthScope[] = "https://www.googleapis.com/auth/cloud-platform";
 
-// The default intial delay between retries with exponential backoff.
+// The default initial delay between retries with exponential backoff.
 constexpr int kInitialRetryDelayUsec = 500000;  // 0.5 sec
 
 /// Returns whether the given path points to a readable file.
-- 
GitLab


From c39029d8de940248eb4610489b53eda0e07a2752 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 10:03:03 -0700
Subject: [PATCH 1223/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 155761031
---
 tensorflow/core/ops/ops.pbtxt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index fb3bbfb567..7b9ace903c 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -1552,6 +1552,7 @@ op {
     }
   }
   summary: "Returns the index with the largest value across dimensions of a tensor."
+  description: "Note that in case of ties the identity of the return value is not guaranteed."
 }
 op {
   name: "ArgMin"
@@ -1604,6 +1605,7 @@ op {
     }
   }
   summary: "Returns the index with the smallest value across dimensions of a tensor."
+  description: "Note that in case of ties the identity of the return value is not guaranteed."
 }
 op {
   name: "AsString"
-- 
GitLab


From 9df9f6b4dd4af59685e594979aa7f58c14271684 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 10:10:12 -0700
Subject: [PATCH 1224/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 155762112
---
 tensorflow/go/op/wrappers.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 5b82e9bf6f..a5ee885fc1 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -18481,6 +18481,8 @@ func Requantize(scope *Scope, input tf.Output, input_min tf.Output, input_max tf
 
 // Returns the index with the smallest value across dimensions of a tensor.
 //
+// Note that in case of ties the identity of the return value is not guaranteed.
+//
 // Arguments:
 //
 //	dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
@@ -19493,6 +19495,8 @@ func IsFinite(scope *Scope, x tf.Output) (y tf.Output) {
 
 // Returns the index with the largest value across dimensions of a tensor.
 //
+// Note that in case of ties the identity of the return value is not guaranteed.
+//
 // Arguments:
 //
 //	dimension: int32, 0 <= dimension < rank(input).  Describes which dimension
-- 
GitLab


From 5407d8951263f8961a6d124b35bbbeb7762253a1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 10:43:00 -0700
Subject: [PATCH 1225/1563] Add a freeze_graph api that can take in GraphDef
 and SaverDef protos instead of files.

PiperOrigin-RevId: 155766519
---
 tensorflow/python/tools/freeze_graph.py | 111 ++++++++++++++++--------
 1 file changed, 74 insertions(+), 37 deletions(-)

diff --git a/tensorflow/python/tools/freeze_graph.py b/tensorflow/python/tools/freeze_graph.py
index 38e3e17a88..bd046a7fd0 100644
--- a/tensorflow/python/tools/freeze_graph.py
+++ b/tensorflow/python/tools/freeze_graph.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Converts checkpoint variables into Const ops in a standalone GraphDef file.
+r"""Converts checkpoint variables into Const ops in a standalone GraphDef file.
 
 This script is designed to take a GraphDef proto, a SaverDef proto, and a set of
 variable values stored in a checkpoint file, and output a GraphDef with all of
@@ -55,29 +55,20 @@ from tensorflow.python.training import saver as saver_lib
 FLAGS = None
 
 
-def freeze_graph(input_graph,
-                 input_saver,
-                 input_binary,
-                 input_checkpoint,
-                 output_node_names,
-                 restore_op_name,
-                 filename_tensor_name,
-                 output_graph,
-                 clear_devices,
-                 initializer_nodes,
-                 variable_names_blacklist=""):
+def freeze_graph_with_def_protos(
+    input_graph_def,
+    input_saver_def,
+    input_checkpoint,
+    output_node_names,
+    restore_op_name,
+    filename_tensor_name,
+    output_graph,
+    clear_devices,
+    initializer_nodes,
+    variable_names_blacklist=""):
   """Converts all variables in a graph and checkpoint into constants."""
-
   del restore_op_name, filename_tensor_name  # Unused by updated loading code.
 
-  if not gfile.Exists(input_graph):
-    print("Input graph file '" + input_graph + "' does not exist!")
-    return -1
-
-  if input_saver and not gfile.Exists(input_saver):
-    print("Input saver file '" + input_saver + "' does not exist!")
-    return -1
-
   # 'input_checkpoint' may be a prefix if we're using Saver V2 format
   if not saver_lib.checkpoint_exists(input_checkpoint):
     print("Input checkpoint '" + input_checkpoint + "' doesn't exist!")
@@ -87,13 +78,6 @@ def freeze_graph(input_graph,
     print("You need to supply the name of a node to --output_node_names.")
     return -1
 
-  input_graph_def = graph_pb2.GraphDef()
-  mode = "rb" if input_binary else "r"
-  with gfile.FastGFile(input_graph, mode) as f:
-    if input_binary:
-      input_graph_def.ParseFromString(f.read())
-    else:
-      text_format.Merge(f.read(), input_graph_def)
   # Remove all the explicit device specifications for this node. This helps to
   # make the graph more portable.
   if clear_devices:
@@ -103,15 +87,9 @@ def freeze_graph(input_graph,
   _ = importer.import_graph_def(input_graph_def, name="")
 
   with session.Session() as sess:
-    if input_saver:
-      with gfile.FastGFile(input_saver, mode) as f:
-        saver_def = saver_pb2.SaverDef()
-        if input_binary:
-          saver_def.ParseFromString(f.read())
-        else:
-          text_format.Merge(f.read(), saver_def)
-        saver = saver_lib.Saver(saver_def=saver_def)
-        saver.restore(sess, input_checkpoint)
+    if input_saver_def:
+      saver = saver_lib.Saver(saver_def=input_saver_def)
+      saver.restore(sess, input_checkpoint)
     else:
       var_list = {}
       reader = pywrap_tensorflow.NewCheckpointReader(input_checkpoint)
@@ -142,6 +120,65 @@ def freeze_graph(input_graph,
   print("%d ops in the final graph." % len(output_graph_def.node))
 
 
+def _parse_input_graph_proto(input_graph, input_binary):
+  """Parser input tensorflow graph into GraphDef proto."""
+  if not gfile.Exists(input_graph):
+    print("Input graph file '" + input_graph + "' does not exist!")
+    return -1
+  input_graph_def = graph_pb2.GraphDef()
+  mode = "rb" if input_binary else "r"
+  with gfile.FastGFile(input_graph, mode) as f:
+    if input_binary:
+      input_graph_def.ParseFromString(f.read())
+    else:
+      text_format.Merge(f.read(), input_graph_def)
+  return input_graph_def
+
+
+def _parse_input_saver_proto(input_saver, input_binary):
+  """Parser input tensorflow Saver into SaverDef proto."""
+  if not gfile.Exists(input_saver):
+    print("Input saver file '" + input_saver + "' does not exist!")
+    return -1
+  mode = "rb" if input_binary else "r"
+  with gfile.FastGFile(input_saver, mode) as f:
+    saver_def = saver_pb2.SaverDef()
+    if input_binary:
+      saver_def.ParseFromString(f.read())
+    else:
+      text_format.Merge(f.read(), saver_def)
+  return saver_def
+
+
+def freeze_graph(input_graph,
+                 input_saver,
+                 input_binary,
+                 input_checkpoint,
+                 output_node_names,
+                 restore_op_name,
+                 filename_tensor_name,
+                 output_graph,
+                 clear_devices,
+                 initializer_nodes,
+                 variable_names_blacklist=""):
+  """Converts all variables in a graph and checkpoint into constants."""
+  input_graph_def = _parse_input_graph_proto(input_graph, input_binary)
+  input_saver_def = None
+  if input_saver:
+    input_saver_def = _parse_input_saver_proto(input_saver, input_binary)
+  freeze_graph_with_def_protos(
+      input_graph_def,
+      input_saver_def,
+      input_checkpoint,
+      output_node_names,
+      restore_op_name,
+      filename_tensor_name,
+      output_graph,
+      clear_devices,
+      initializer_nodes,
+      variable_names_blacklist)
+
+
 def main(unused_args):
   freeze_graph(FLAGS.input_graph, FLAGS.input_saver, FLAGS.input_binary,
                FLAGS.input_checkpoint, FLAGS.output_node_names,
-- 
GitLab


From 8c28f1a2f97858ea949764588d62a02e1ca7a112 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 10:48:25 -0700
Subject: [PATCH 1226/1563] Make cmake run.sh executable.

PiperOrigin-RevId: 155767313
---
 tensorflow/tools/ci_build/linux/cmake/run.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tensorflow/tools/ci_build/linux/cmake/run.sh

diff --git a/tensorflow/tools/ci_build/linux/cmake/run.sh b/tensorflow/tools/ci_build/linux/cmake/run.sh
old mode 100644
new mode 100755
-- 
GitLab


From 1f69227b32d9505439aa132667922091be5fca7d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 10:58:52 -0700
Subject: [PATCH 1227/1563] This change reduces the CPU time spent adding nodes
 to a graph.  For an example large graph (13k nodes, 20k edges), this change
 reduces the CPU time spent loading the graph by 5%.

The existing code uses a long sequence of string comparisons and tests, whenever a node is added.  The CHECK(class_ == NC_UNITIALIZED) statement can never actually test anything, because all of the string comparisons (except those against empty strings, which serve no purpose) test against a disjoint set of strings, so no collisions are possible.

PiperOrigin-RevId: 155768893
---
 tensorflow/core/graph/graph.cc | 75 ++++++++++++++++++----------------
 tensorflow/core/graph/graph.h  |  4 ++
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index a68a8f2509..dabc5a7849 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -30,6 +30,45 @@ const int Graph::kControlSlot = -1;
 
 // Node
 
+#define REF_CLASS(key, value) \
+  {key, value}, { "Ref" key, value }
+
+const std::unordered_map<string, Node::NodeClass>& Node::kNodeClassTable =
+    *new std::unordered_map<string, Node::NodeClass>({
+        // Keep in same order as NodeClass values
+        REF_CLASS("Switch", NC_SWITCH),
+        REF_CLASS("Merge", NC_MERGE),
+        REF_CLASS("Enter", NC_ENTER),
+        REF_CLASS("Exit", NC_EXIT),
+        REF_CLASS("NextIteration", NC_NEXT_ITERATION),
+        {"LoopCond", NC_LOOP_COND},
+        {"ControlTrigger", NC_CONTROL_TRIGGER},
+        {"_Send", NC_SEND},
+        {"_HostSend", NC_HOST_SEND},
+        {"_Recv", NC_RECV},
+        {"_HostRecv", NC_HOST_RECV},
+        {"Const", NC_CONSTANT},
+        {"HostConst", NC_CONSTANT},
+        {"Variable", NC_VARIABLE},
+        {"VariableV2", NC_VARIABLE},
+        REF_CLASS("Identity", NC_IDENTITY),
+        {"GetSessionHandle", NC_GET_SESSION_HANDLE},
+        {"GetSessionHandleV2", NC_GET_SESSION_HANDLE},
+        {"GetSessionTensor", NC_GET_SESSION_TENSOR},
+        {"DeleteSessionTensor", NC_DELETE_SESSION_TENSOR},
+    });
+
+#undef REF_CLASS
+
+Node::NodeClass Node::GetNodeClassForOp(const string& ts) {
+  auto it = kNodeClassTable.find(ts);
+  if (it != kNodeClassTable.end()) {
+    return it->second;
+  } else {
+    return NC_OTHER;
+  }
+}
+
 string Node::DebugString() const {
   string ret = strings::StrCat("{name:'", name(), "' id:", id_);
   if (IsSource()) {
@@ -70,41 +109,7 @@ void Node::Initialize(int id, int cost_id, Properties* props) {
   }
   props_ = props;
   // Initialize the class_ based on the type string
-  const string& ts = this->type_string();
-  class_ = NC_UNINITIALIZED;
-
-#define SET_CLASS(enum_val, ts, str1, str2)        \
-  do {                                             \
-    if ((((ts) == (str1)) || ((ts) == (str2)))) {  \
-      /* Cannot be member of more than one class*/ \
-      CHECK(class_ == NC_UNINITIALIZED);           \
-      class_ = (enum_val);                         \
-    }                                              \
-  } while (0)
-
-  SET_CLASS(NC_SWITCH, ts, "Switch", "RefSwitch");
-  SET_CLASS(NC_MERGE, ts, "Merge", "RefMerge");
-  SET_CLASS(NC_ENTER, ts, "Enter", "RefEnter");
-  SET_CLASS(NC_EXIT, ts, "Exit", "RefExit");
-  SET_CLASS(NC_NEXT_ITERATION, ts, "NextIteration", "RefNextIteration");
-  SET_CLASS(NC_LOOP_COND, ts, "LoopCond", "");
-  SET_CLASS(NC_CONTROL_TRIGGER, ts, "ControlTrigger", "");
-  SET_CLASS(NC_SEND, ts, "_Send", "");
-  SET_CLASS(NC_HOST_SEND, ts, "_HostSend", "");
-  SET_CLASS(NC_RECV, ts, "_Recv", "");
-  SET_CLASS(NC_HOST_RECV, ts, "_HostRecv", "");
-  SET_CLASS(NC_CONSTANT, ts, "Const", "HostConst");
-  SET_CLASS(NC_VARIABLE, ts, "Variable", "");
-  SET_CLASS(NC_VARIABLE, ts, "VariableV2", "");
-  SET_CLASS(NC_IDENTITY, ts, "Identity", "RefIdentity");
-  SET_CLASS(NC_GET_SESSION_HANDLE, ts, "GetSessionHandle", "");
-  SET_CLASS(NC_GET_SESSION_HANDLE, ts, "GetSessionHandleV2", "");
-  SET_CLASS(NC_GET_SESSION_TENSOR, ts, "GetSessionTensor", "");
-  SET_CLASS(NC_DELETE_SESSION_TENSOR, ts, "DeleteSessionTensor", "");
-  if (class_ == NC_UNINITIALIZED) {
-    class_ = NC_OTHER;  // Catch all
-  }
-#undef SET_CLASS
+  class_ = GetNodeClassForOp(props->node_def_.op());
 }
 
 void Node::Clear() {
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index bbb3af196d..ac22dfc324 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -221,6 +221,10 @@ class Node {
     NC_OTHER  // Not a special kind of node
   };
 
+  static const std::unordered_map<string, NodeClass>& kNodeClassTable;
+
+  static NodeClass GetNodeClassForOp(const string& ts);
+
   int id_;       // -1 until Initialize() is called
   int cost_id_;  // -1 if there is no corresponding cost accounting node
   NodeClass class_;
-- 
GitLab


From 31415474123c27197c8553314366425ff2331d36 Mon Sep 17 00:00:00 2001
From: Alexey Surkov <surkov@google.com>
Date: Thu, 11 May 2017 11:09:58 -0700
Subject: [PATCH 1228/1563] Automatically abort stuck transmissions.

HttpRequest now uses a progress callback from libcurl to detect and abort transmissions which haven't made any progress for a significant time.

PiperOrigin-RevId: 155770703
---
 .../core/platform/cloud/http_request.cc       | 47 ++++++++++-
 tensorflow/core/platform/cloud/http_request.h | 20 ++++-
 .../core/platform/cloud/http_request_test.cc  | 77 +++++++++++++++++++
 3 files changed, 142 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/platform/cloud/http_request.cc b/tensorflow/core/platform/cloud/http_request.cc
index 825741f614..2d0141e50e 100644
--- a/tensorflow/core/platform/cloud/http_request.cc
+++ b/tensorflow/core/platform/cloud/http_request.cc
@@ -35,6 +35,10 @@ constexpr uint32 kRequestTimeoutSeconds = 3600;  // 1 hour
 // Timeout for the connection phase.
 constexpr uint32 kConnectTimeoutSeconds = 120;  // 2 minutes
 
+// The maximum period of request inactivity, after which the request
+// is terminated.
+constexpr uint64 kInactivityTimeoutSeconds = 60;  // 1 minute
+
 // Proxy to the real libcurl implementation.
 class LibCurlProxy : public LibCurl {
  public:
@@ -75,6 +79,13 @@ class LibCurlProxy : public LibCurl {
     return ::curl_easy_setopt(curl, option, param);
   }
 
+  CURLcode curl_easy_setopt(CURL* curl, CURLoption option,
+                            int (*param)(void* clientp, curl_off_t dltotal,
+                                         curl_off_t dlnow, curl_off_t ultotal,
+                                         curl_off_t ulnow)) override {
+    return ::curl_easy_setopt(curl, option, param);
+  }
+
   CURLcode curl_easy_perform(CURL* curl) override {
     return ::curl_easy_perform(curl);
   }
@@ -111,7 +122,8 @@ class LibCurlProxy : public LibCurl {
 
 HttpRequest::HttpRequest() : HttpRequest(LibCurlProxy::Load()) {}
 
-HttpRequest::HttpRequest(LibCurl* libcurl) : libcurl_(libcurl) {
+HttpRequest::HttpRequest(LibCurl* libcurl, Env* env)
+    : libcurl_(libcurl), env_(env) {
   default_response_buffer_.reserve(CURL_MAX_WRITE_SIZE);
 }
 
@@ -152,6 +164,12 @@ Status HttpRequest::Init() {
   libcurl_->curl_easy_setopt(curl_, CURLOPT_HTTP_VERSION,
                              CURL_HTTP_VERSION_2_0);
 
+  // Set up the progress meter.
+  libcurl_->curl_easy_setopt(curl_, CURLOPT_NOPROGRESS, 0ULL);
+  libcurl_->curl_easy_setopt(curl_, CURLOPT_XFERINFODATA, this);
+  libcurl_->curl_easy_setopt(curl_, CURLOPT_XFERINFOFUNCTION,
+                             &HttpRequest::ProgressCallback);
+
   // If response buffer is not set, libcurl will print results to stdout,
   // so we always set it.
   is_initialized_ = true;
@@ -470,4 +488,31 @@ string HttpRequest::GetResponseHeader(const string& name) const {
 
 uint64 HttpRequest::GetResponseCode() const { return response_code_; }
 
+// Cancels the transmission if no progress has been made for too long.
+int HttpRequest::ProgressCallback(void* this_object, curl_off_t dltotal,
+                                  curl_off_t dlnow, curl_off_t ultotal,
+                                  curl_off_t ulnow) {
+  auto that = reinterpret_cast<HttpRequest*>(this_object);
+  const auto now = that->env_->NowSeconds();
+  const auto current_progress = dlnow + ulnow;
+  if (that->last_progress_timestamp_ == 0 ||
+      current_progress > that->last_progress_bytes_) {
+    // This is the first time the callback is called or some progress
+    // was made since the last tick.
+    that->last_progress_timestamp_ = now;
+    that->last_progress_bytes_ = current_progress;
+    return 0;
+  }
+
+  if (now - that->last_progress_timestamp_ > kInactivityTimeoutSeconds) {
+    LOG(ERROR) << "The transmission has been stuck at " << current_progress
+               << " bytes for " << now - that->last_progress_timestamp_
+               << " seconds and will be aborted.";
+    return 1;  // Will abort the request.
+  }
+
+  // No progress was made since the last call, but we should wait a bit longer.
+  return 0;
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/platform/cloud/http_request.h b/tensorflow/core/platform/cloud/http_request.h
index 5365c45ca9..afcbb9f35c 100644
--- a/tensorflow/core/platform/cloud/http_request.h
+++ b/tensorflow/core/platform/cloud/http_request.h
@@ -23,6 +23,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/platform/types.h"
@@ -50,7 +51,9 @@ class HttpRequest {
   };
 
   HttpRequest();
-  explicit HttpRequest(LibCurl* libcurl);
+  explicit HttpRequest(LibCurl* libcurl)
+      : HttpRequest(libcurl, Env::Default()) {}
+  HttpRequest(LibCurl* libcurl, Env* env);
   virtual ~HttpRequest();
 
   virtual Status Init();
@@ -123,11 +126,16 @@ class HttpRequest {
   /// A header callback in the form which can be accepted by libcurl.
   static size_t HeaderCallback(const void* ptr, size_t size, size_t nmemb,
                                void* this_object);
+  /// A progress meter callback in the form which can be accepted by libcurl.
+  static int ProgressCallback(void* this_object, curl_off_t dltotal,
+                              curl_off_t dlnow, curl_off_t ultotal,
+                              curl_off_t ulnow);
   Status CheckInitialized() const;
   Status CheckMethodNotSet() const;
   Status CheckNotSent() const;
 
   LibCurl* libcurl_;
+  Env* env_;
 
   FILE* put_body_ = nullptr;
 
@@ -144,6 +152,12 @@ class HttpRequest {
   std::unordered_map<string, string> response_headers_;
   uint64 response_code_ = 0;
 
+  // The timestamp of the last activity related to the request execution, in
+  // seconds since epoch.
+  uint64 last_progress_timestamp_ = 0;
+  // The last progress in terms of bytes transmitted.
+  curl_off_t last_progress_bytes_ = 0;
+
   // Members to enforce the usage flow.
   bool is_initialized_ = false;
   bool is_uri_set_ = false;
@@ -173,6 +187,10 @@ class LibCurl {
   virtual CURLcode curl_easy_setopt(CURL* curl, CURLoption option,
                                     size_t (*param)(const void*, size_t, size_t,
                                                     void*)) = 0;
+  virtual CURLcode curl_easy_setopt(
+      CURL* curl, CURLoption option,
+      int (*param)(void* clientp, curl_off_t dltotal, curl_off_t dlnow,
+                   curl_off_t ultotal, curl_off_t ulnow)) = 0;
   virtual CURLcode curl_easy_perform(CURL* curl) = 0;
   virtual CURLcode curl_easy_getinfo(CURL* curl, CURLINFO info,
                                      uint64* value) = 0;
diff --git a/tensorflow/core/platform/cloud/http_request_test.cc b/tensorflow/core/platform/cloud/http_request_test.cc
index b918a3a8cd..6d66dfdee1 100644
--- a/tensorflow/core/platform/cloud/http_request_test.cc
+++ b/tensorflow/core/platform/cloud/http_request_test.cc
@@ -25,11 +25,26 @@ namespace {
 
 const string kTestContent = "random original scratch content";
 
+class FakeEnv : public EnvWrapper {
+ public:
+  FakeEnv() : EnvWrapper(Env::Default()) {}
+
+  uint64 NowSeconds() override { return now_; }
+  uint64 now_ = 10000;
+};
+
 // A fake proxy that pretends to be libcurl.
 class FakeLibCurl : public LibCurl {
  public:
   FakeLibCurl(const string& response_content, uint64 response_code)
       : response_content_(response_content), response_code_(response_code) {}
+  FakeLibCurl(const string& response_content, uint64 response_code,
+              std::vector<std::tuple<uint64, curl_off_t>> progress_ticks,
+              FakeEnv* env)
+      : response_content_(response_content),
+        response_code_(response_code),
+        progress_ticks_(std::move(progress_ticks)),
+        env_(env) {}
   FakeLibCurl(const string& response_content, uint64 response_code,
               const std::vector<string>& response_headers)
       : response_content_(response_content),
@@ -86,6 +101,9 @@ class FakeLibCurl : public LibCurl {
       case CURLOPT_READDATA:
         read_data_ = reinterpret_cast<FILE*>(param);
         break;
+      case CURLOPT_XFERINFODATA:
+        progress_data_ = param;
+        break;
       default:
         break;
     }
@@ -112,6 +130,13 @@ class FakeLibCurl : public LibCurl {
     }
     return CURLE_OK;
   }
+  CURLcode curl_easy_setopt(CURL* curl, CURLoption option,
+                            int (*param)(void* clientp, curl_off_t dltotal,
+                                         curl_off_t dlnow, curl_off_t ultotal,
+                                         curl_off_t ulnow)) override {
+    progress_callback_ = param;
+    return CURLE_OK;
+  }
   CURLcode curl_easy_perform(CURL* curl) override {
     if (read_data_) {
       char buffer[3];
@@ -134,6 +159,12 @@ class FakeLibCurl : public LibCurl {
       strncpy(error_buffer_, curl_easy_perform_error_message_.c_str(),
               curl_easy_perform_error_message_.size() + 1);
     }
+    for (const auto& tick : progress_ticks_) {
+      env_->now_ = std::get<0>(tick);
+      if (progress_callback_(progress_data_, 0, std::get<1>(tick), 0, 0)) {
+        return CURLE_ABORTED_BY_CALLBACK;
+      }
+    }
     return curl_easy_perform_result_;
   }
   CURLcode curl_easy_getinfo(CURL* curl, CURLINFO info,
@@ -212,10 +243,17 @@ class FakeLibCurl : public LibCurl {
   FILE* read_data_ = nullptr;
   size_t (*read_callback_)(void* ptr, size_t size, size_t nmemb,
                            FILE* userdata) = &fread;
+  int (*progress_callback_)(void* clientp, curl_off_t dltotal, curl_off_t dlnow,
+                            curl_off_t ultotal, curl_off_t ulnow) = nullptr;
+  void* progress_data_ = nullptr;
   // Outcome of performing the request.
   string posted_content_;
   CURLcode curl_easy_perform_result_ = CURLE_OK;
   string curl_easy_perform_error_message_;
+  // A vector of <timestamp, progress in bytes> pairs that represent the
+  // progress of a transmission.
+  std::vector<std::tuple<uint64, curl_off_t>> progress_ticks_;
+  FakeEnv* env_ = nullptr;
 };
 
 TEST(HttpRequestTest, GetRequest) {
@@ -547,5 +585,44 @@ TEST(HttpRequestTest, ErrorReturnsNoResponse) {
   EXPECT_EQ("", string(scratch.begin(), scratch.end()));
 }
 
+TEST(HttpRequestTest, ProgressIsOk) {
+  // Imitate a steady progress.
+  FakeEnv env;
+  FakeLibCurl libcurl(
+      "test", 200,
+      {
+          std::make_tuple(100, 0) /* timestamp 100, 0 bytes */,
+          std::make_tuple(110, 0) /* timestamp 110, 0 bytes */,
+          std::make_tuple(200, 100) /* timestamp 200, 100 bytes */
+      },
+      &env);
+  HttpRequest http_request(&libcurl, &env);
+  TF_EXPECT_OK(http_request.Init());
+  TF_EXPECT_OK(http_request.SetUri("http://www.testuri.com"));
+  TF_EXPECT_OK(http_request.Send());
+}
+
+TEST(HttpRequestTest, ProgressIsStuck) {
+  // Imitate a transmission that got stuck for more than a minute.
+  FakeEnv env;
+  FakeLibCurl libcurl(
+      "test", 200,
+      {
+          std::make_tuple(100, 10) /* timestamp 100, 10 bytes */,
+          std::make_tuple(130, 10) /* timestamp 130, 10 bytes */,
+          std::make_tuple(170, 10) /* timestamp 170, 10 bytes */
+      },
+      &env);
+  HttpRequest http_request(&libcurl, &env);
+  TF_EXPECT_OK(http_request.Init());
+  TF_EXPECT_OK(http_request.SetUri("http://www.testuri.com"));
+  auto status = http_request.Send();
+  EXPECT_EQ(error::UNAVAILABLE, status.code());
+  EXPECT_EQ(
+      "Error executing an HTTP request (HTTP response code 200, "
+      "error code 42, error message '')",
+      status.error_message());
+}
+
 }  // namespace
 }  // namespace tensorflow
-- 
GitLab


From 3e4c2f6408beaecd3ab3bf8dd199bc5a8d150361 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 11 May 2017 11:12:25 -0700
Subject: [PATCH 1229/1563] Added a regression test for the graph rewriter
 options

PiperOrigin-RevId: 155771050
---
 tensorflow/python/client/session_test.py | 39 ++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 040cc33315..5a42c50fff 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -31,6 +31,7 @@ from six.moves import xrange  # pylint: disable=redefined-builtin
 from tensorflow.core.lib.core import error_codes_pb2
 from tensorflow.core.protobuf import cluster_pb2
 from tensorflow.core.protobuf import config_pb2
+from tensorflow.core.protobuf import rewriter_config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.framework import common_shapes
 from tensorflow.python.framework import constant_op
@@ -45,6 +46,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
@@ -2099,6 +2101,43 @@ class SessionTest(test_util.TensorFlowTestCase):
       res = sess.partial_run(h, r2, feed_dict={c: 3})
       self.assertEqual(9, res)
 
+  def testGraphOptimizer(self):
+    rewrite_options = rewriter_config_pb2.RewriterConfig(
+        disable_model_pruning=False, constant_folding=True)
+    graph_options = config_pb2.GraphOptions(
+        rewrite_options=rewrite_options, build_cost_model=1)
+    config = config_pb2.ConfigProto(graph_options=graph_options)
+
+    with ops.Graph().as_default() as g:
+      r1 = random_ops.random_normal(shape=[2, 3], name='R1')
+      r2 = random_ops.random_normal(shape=[2, 3], name='R2')
+      copy1 = array_ops.stop_gradient(r1)
+      copy2 = array_ops.identity(r2)
+      result = copy1 + copy2
+
+      with session.Session(graph=g, config=config) as sess:
+        metadata = config_pb2.RunMetadata()
+        sess.run(result, run_metadata=metadata)
+
+    # Check that we optimized the graph by looking at the cost model: the add
+    # node should have been reconnected directly to the R1 and R2 nodes.
+    found_valid_nodes = 0
+    for node in metadata.cost_graph.node:
+      if node.name == 'R1':
+        r1_cost_id = node.id
+        found_valid_nodes += 1
+      if node.name == 'R2':
+        r2_cost_id = node.id
+        found_valid_nodes += 1
+      if node.name == 'add':
+        if node.input_info[0].preceding_node == r1_cost_id:
+          self.assertEqual(node.input_info[1].preceding_node, r2_cost_id)
+          found_valid_nodes += 1
+        elif node.input_info[0].preceding_node == r2_cost_id:
+          self.assertEqual(node.input_info[1].preceding_node, r1_cost_id)
+          found_valid_nodes += 1
+    self.assertEqual(3, found_valid_nodes)
+
 
 if __name__ == '__main__':
   googletest.main()
-- 
GitLab


From be15e9eb12a2c61f9b0fef98e94967e64af1f6a1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 11:38:51 -0700
Subject: [PATCH 1230/1563] Add option to CTCLoss to skip items with shorter
 labels than inputs (returns 0-gradient).

The default behavior is preserved, namely to return an InvalidArgument which stops
training when such an invalid item is encountered.

PiperOrigin-RevId: 155774918
---
 tensorflow/core/kernels/ctc_loss_op.cc        |  7 +-
 tensorflow/core/ops/ctc_ops.cc                |  4 ++
 .../core/util/ctc/ctc_loss_calculator.h       | 69 +++++++++++--------
 tensorflow/python/ops/ctc_ops.py              | 13 +++-
 .../tools/api/golden/tensorflow.nn.pbtxt      |  2 +-
 5 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/tensorflow/core/kernels/ctc_loss_op.cc b/tensorflow/core/kernels/ctc_loss_op.cc
index 05d0169b11..426382edec 100644
--- a/tensorflow/core/kernels/ctc_loss_op.cc
+++ b/tensorflow/core/kernels/ctc_loss_op.cc
@@ -42,6 +42,8 @@ class CTCLossOp : public OpKernel {
                                      &preprocess_collapse_repeated_));
     OP_REQUIRES_OK(ctx,
                    ctx->GetAttr("ctc_merge_repeated", &ctc_merge_repeated_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("ignore_longer_outputs_than_inputs",
+                                     &ignore_longer_outputs_than_inputs_));
   }
 
   void Compute(OpKernelContext* ctx) override {
@@ -150,12 +152,15 @@ class CTCLossOp : public OpKernel {
     OP_REQUIRES_OK(ctx, ctc_loss_calculator.CalculateLoss(
                             seq_len_t, labels_t, input_list_t,
                             preprocess_collapse_repeated_, ctc_merge_repeated_,
-                            &loss_t, &gradient_list_t, &workers));
+                            ignore_longer_outputs_than_inputs_, &loss_t,
+                            &gradient_list_t, &workers));
   }
 
  private:
   bool preprocess_collapse_repeated_;
   bool ctc_merge_repeated_;
+  bool ignore_longer_outputs_than_inputs_;
+
   TF_DISALLOW_COPY_AND_ASSIGN(CTCLossOp);
 };
 
diff --git a/tensorflow/core/ops/ctc_ops.cc b/tensorflow/core/ops/ctc_ops.cc
index c94ce577c0..3d8c533935 100644
--- a/tensorflow/core/ops/ctc_ops.cc
+++ b/tensorflow/core/ops/ctc_ops.cc
@@ -31,6 +31,7 @@ REGISTER_OP("CTCLoss")
     .Input("sequence_length: int32")
     .Attr("preprocess_collapse_repeated: bool = false")
     .Attr("ctc_merge_repeated: bool = true")
+    .Attr("ignore_longer_outputs_than_inputs: bool = false")
     .Output("loss: float")
     .Output("gradient: float")
     .SetShapeFn([](InferenceContext* c) {
@@ -75,6 +76,9 @@ preprocess_collapse_repeated: Scalar, if true then repeated labels are
 ctc_merge_repeated: Scalar.  If set to false, *during* CTC calculation
   repeated non-blank labels will not be merged and are interpreted as
   individual labels.  This is a simplified version of CTC.
+ignore_longer_outputs_than_inputs: Scalar. If set to true, during CTC
+  calculation items have longer input sequences than output sequences
+  are ignored by returning zero-gradient for those items.
 loss: A vector (batch) containing log-probabilities.
 gradient: The gradient of `loss`.  3-D, shape:
   `(max_time x batch_size x num_classes)`.
diff --git a/tensorflow/core/util/ctc/ctc_loss_calculator.h b/tensorflow/core/util/ctc/ctc_loss_calculator.h
index eacadd65af..567bad38c3 100644
--- a/tensorflow/core/util/ctc/ctc_loss_calculator.h
+++ b/tensorflow/core/util/ctc/ctc_loss_calculator.h
@@ -65,7 +65,8 @@ class CTCLossCalculator {
   Status CalculateLoss(const VectorIn& seq_len, const LabelSequences& labels,
                        const std::vector<MatrixIn>& inputs,
                        bool preprocess_collapse_repeated,
-                       bool ctc_merge_repeated, VectorOut* loss,
+                       bool ctc_merge_repeated,
+                       bool ignore_longer_outputs_than_inputs, VectorOut* loss,
                        std::vector<MatrixOut>* gradients,
                        DeviceBase::CpuWorkerThreads* workers = nullptr) const;
 
@@ -90,7 +91,8 @@ class CTCLossCalculator {
   // batch.  Return value:
   //    max_{b in batch_size} l_primes[b].size()
   template <typename Vector>
-  Status PopulateLPrimes(bool preprocess_collapse_repeated, int batch_size,
+  Status PopulateLPrimes(bool preprocess_collapse_repeated,
+                         bool ignore_longer_outputs_than_inputs, int batch_size,
                          int num_classes, const Vector& seq_len,
                          const LabelSequences& labels, size_t* max_u_prime,
                          LabelSequences* l_primes) const;
@@ -108,7 +110,8 @@ template <typename VectorIn, typename VectorOut, typename MatrixIn,
 Status CTCLossCalculator::CalculateLoss(
     const VectorIn& seq_len, const LabelSequences& labels,
     const std::vector<MatrixIn>& inputs, bool preprocess_collapse_repeated,
-    bool ctc_merge_repeated, VectorOut* loss, std::vector<MatrixOut>* gradients,
+    bool ctc_merge_repeated, bool ignore_longer_outputs_than_inputs,
+    VectorOut* loss, std::vector<MatrixOut>* gradients,
     DeviceBase::CpuWorkerThreads* workers) const {
   auto num_time_steps = inputs.size();
 
@@ -155,20 +158,31 @@ Status CTCLossCalculator::CalculateLoss(
   // and calculate the maximum necessary allocation size.
   LabelSequences l_primes(batch_size);
   size_t max_u_prime = 0;
-  Status l_p_ret =
-      PopulateLPrimes(preprocess_collapse_repeated, batch_size, num_classes,
-                      seq_len, labels, &max_u_prime, &l_primes);
+  Status l_p_ret = PopulateLPrimes(
+      preprocess_collapse_repeated, ignore_longer_outputs_than_inputs,
+      batch_size, num_classes, seq_len, labels, &max_u_prime, &l_primes);
   if (!l_p_ret.ok()) {
     return l_p_ret;
   }
 
   // Process each item in a batch in parallel, using at most kMaxThreads.
-  auto ComputeLossAndGradients = [this, num_classes, &l_primes, &seq_len,
-                                  &inputs, requires_backprop,
-                                  ctc_merge_repeated, &loss, &gradients](
-      int64 start_row, int64 limit_row) {
+  auto ComputeLossAndGradients = [this, num_classes, &labels, &l_primes,
+                                  &seq_len, &inputs, requires_backprop,
+                                  ctc_merge_repeated,
+                                  ignore_longer_outputs_than_inputs, &loss,
+                                  &gradients](int64 start_row,
+                                              int64 limit_row) {
     for (int b = start_row; b < limit_row; b++) {
-      if (seq_len(b) == 0) {
+      // Return zero gradient for empty sequences or sequences with labels
+      // longer than input, which is not supported by CTC.
+      if (seq_len(b) == 0 ||
+          (ignore_longer_outputs_than_inputs &&
+           labels[b].size() > seq_len(b) - this->output_delay_)) {
+        VLOG(1) << "The sequence length is either zero or shorter than the "
+                   "target output (CTC works only with shorter target sequence "
+                   "than input sequence). You can turn this into a warning by "
+                   "using the flag ignore_longer_outputs_than_inputs - "
+                << b << ": " << str_util::Join(labels[b], " ");
         continue;
       }
 
@@ -263,12 +277,11 @@ Status CTCLossCalculator::CalculateLoss(
 }
 
 template <typename Vector>
-Status CTCLossCalculator::PopulateLPrimes(bool preprocess_collapse_repeated,
-                                          int batch_size, int num_classes,
-                                          const Vector& seq_len,
-                                          const LabelSequences& labels,
-                                          size_t* max_u_prime,
-                                          LabelSequences* l_primes) const {
+Status CTCLossCalculator::PopulateLPrimes(
+    bool preprocess_collapse_repeated, bool ignore_longer_outputs_than_inputs,
+    int batch_size, int num_classes, const Vector& seq_len,
+    const LabelSequences& labels, size_t* max_u_prime,
+    LabelSequences* l_primes) const {
   // labels is a Label array of size batch_size
   if (labels.size() != batch_size) {
     return errors::InvalidArgument("labels.size() != batch_size: ",
@@ -311,9 +324,6 @@ Status CTCLossCalculator::PopulateLPrimes(bool preprocess_collapse_repeated,
       }
     }
 
-    // Make sure there is enough time to output the target indices.
-    int time = seq_len(b) - output_delay_;
-    int required_time = label.size();
     for (int l_i : l) {
       if (l_i < 0) {
         return errors::InvalidArgument(
@@ -325,14 +335,19 @@ Status CTCLossCalculator::PopulateLPrimes(bool preprocess_collapse_repeated,
             num_classes, ", batch: ", b, " labels: ", str_util::Join(l, ","));
       }
     }
-    if (required_time > time) {
-      return errors::InvalidArgument(
-          "Not enough time for target transition sequence ("
-          "required: ",
-          required_time, ", available: ", time,
-          "), skipping data instance in batch: ", b);
+    if (!ignore_longer_outputs_than_inputs) {
+      // Make sure there is enough time to output the target indices.
+      int time = seq_len(b) - output_delay_;
+      int required_time = label.size();
+      if (required_time > time) {
+        return errors::InvalidArgument(
+            "Not enough time for target transition sequence ("
+            "required: ",
+            required_time, ", available: ", time, ")", b,
+            "You can turn this error into a warning by using the flag "
+            "ignore_longer_outputs_than_inputs");
+      }
     }
-
     // Target indices with blanks before each index and a blank at the end.
     // Length U' = 2U + 1.
     // Convert l to l_prime
diff --git a/tensorflow/python/ops/ctc_ops.py b/tensorflow/python/ops/ctc_ops.py
index 69edaa2c40..4ea4d9ed2d 100644
--- a/tensorflow/python/ops/ctc_ops.py
+++ b/tensorflow/python/ops/ctc_ops.py
@@ -30,7 +30,8 @@ from tensorflow.python.ops.nn_grad import _BroadcastMul
 # pylint: disable=protected-access, invalid-name
 def ctc_loss(labels, inputs, sequence_length,
              preprocess_collapse_repeated=False,
-             ctc_merge_repeated=True, time_major=True):
+             ctc_merge_repeated=True,
+             ignore_longer_outputs_than_inputs=False, time_major=True):
   """Computes the CTC (Connectionist Temporal Classification) Loss.
 
   This op implements the CTC loss as presented in the article:
@@ -94,6 +95,11 @@ def ctc_loss(labels, inputs, sequence_length,
 
     Untested.  Very likely will not learn to output repeated classes.
 
+  The `ignore_longer_outputs_than_inputs` option allows to specify the behavior
+  of the CTCLoss when dealing with sequences that have longer outputs than
+  inputs. If true, the CTCLoss will simply return zero gradient for those
+  items, otherwise an InvalidArgument error is returned, stopping training.
+
   Args:
     labels: An `int32` `SparseTensor`.
       `labels.indices[i, :] == [b, t]` means `labels.values[i]` stores
@@ -111,6 +117,8 @@ def ctc_loss(labels, inputs, sequence_length,
     preprocess_collapse_repeated: Boolean.  Default: False.
       If True, repeated labels are collapsed prior to the CTC calculation.
     ctc_merge_repeated: Boolean.  Default: True.
+    ignore_longer_outputs_than_inputs: Boolean. Default: False.
+      If True, sequences with longer outputs than inputs will be ignored.
     time_major: The shape format of the `inputs` Tensors.
       If True, these `Tensors` must be shaped `[max_time, batch_size, num_classes]`.
       If False, these `Tensors` must be shaped `[batch_size, max_time, num_classes]`.
@@ -140,7 +148,8 @@ def ctc_loss(labels, inputs, sequence_length,
       labels.values,
       sequence_length,
       preprocess_collapse_repeated=preprocess_collapse_repeated,
-      ctc_merge_repeated=ctc_merge_repeated)
+      ctc_merge_repeated=ctc_merge_repeated,
+      ignore_longer_outputs_than_inputs=ignore_longer_outputs_than_inputs)
 
   return loss
 
diff --git a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
index 3a448798b2..b1b60fbdcb 100644
--- a/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.nn.pbtxt
@@ -90,7 +90,7 @@ tf_module {
   }
   member_method {
     name: "ctc_loss"
-    argspec: "args=[\'labels\', \'inputs\', \'sequence_length\', \'preprocess_collapse_repeated\', \'ctc_merge_repeated\', \'time_major\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'True\'], "
+    argspec: "args=[\'labels\', \'inputs\', \'sequence_length\', \'preprocess_collapse_repeated\', \'ctc_merge_repeated\', \'ignore_longer_outputs_than_inputs\', \'time_major\'], varargs=None, keywords=None, defaults=[\'False\', \'True\', \'False\', \'True\'], "
   }
   member_method {
     name: "depthwise_conv2d"
-- 
GitLab


From f2bbf4b9e7d2559ea9667ec791843a19f0f776fc Mon Sep 17 00:00:00 2001
From: Yutaka Leon <yleon@google.com>
Date: Thu, 11 May 2017 11:56:51 -0700
Subject: [PATCH 1231/1563] Move back lookup_ops from feature_column/ to
 contrib/lookup/ since they are using V1 kernels and we want core use the V2
 kernels.

PiperOrigin-RevId: 155777403
---
 tensorflow/contrib/lookup/BUILD               | 12 +++++++++-
 tensorflow/contrib/lookup/__init__.py         |  2 +-
 .../lookup}/lookup_ops.py                     |  0
 tensorflow/python/BUILD                       |  3 +--
 tensorflow/python/feature_column/BUILD        | 23 +------------------
 .../python/feature_column/feature_column.py   |  4 ++--
 6 files changed, 16 insertions(+), 28 deletions(-)
 rename tensorflow/{python/feature_column => contrib/lookup}/lookup_ops.py (100%)

diff --git a/tensorflow/contrib/lookup/BUILD b/tensorflow/contrib/lookup/BUILD
index bbbd340352..b0475c41c9 100644
--- a/tensorflow/contrib/lookup/BUILD
+++ b/tensorflow/contrib/lookup/BUILD
@@ -9,14 +9,24 @@ package(default_visibility = ["//tensorflow:internal"])
 
 load("//tensorflow:tensorflow.bzl", "py_test")
 
+# TODO(yleon): Refactor after one we switching to the V2 kernels.
 py_library(
     name = "lookup_py",
     srcs = [
         "__init__.py",
+        "lookup_ops.py",
     ],
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/python/feature_column:lookup_ops",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:lookup_ops_gen",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python:training",
+        "//tensorflow/python:util",
     ],
 )
 
diff --git a/tensorflow/contrib/lookup/__init__.py b/tensorflow/contrib/lookup/__init__.py
index a5fcdc7b42..dbd64cf042 100644
--- a/tensorflow/contrib/lookup/__init__.py
+++ b/tensorflow/contrib/lookup/__init__.py
@@ -47,7 +47,7 @@ from __future__ import division
 from __future__ import print_function
 
 # pylint: disable=unused-import,wildcard-import
-from tensorflow.python.feature_column.lookup_ops import *
+from tensorflow.contrib.lookup.lookup_ops import *
 # pylint: enable=unused-import,wildcard-import
 
 from tensorflow.python.util.all_util import remove_undocumented
diff --git a/tensorflow/python/feature_column/lookup_ops.py b/tensorflow/contrib/lookup/lookup_ops.py
similarity index 100%
rename from tensorflow/python/feature_column/lookup_ops.py
rename to tensorflow/contrib/lookup/lookup_ops.py
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index e9f7a68045..feab1e2fbc 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -82,7 +82,6 @@ py_library(
         "//third_party/py/numpy",
         "//tensorflow/python/estimator:estimator_py",
         "//tensorflow/python/feature_column:feature_column",
-        "//tensorflow/python/feature_column:lookup_ops",
         "//tensorflow/python/ops/losses",
         "//tensorflow/python/ops/distributions",
         "//tensorflow/python/saved_model",
@@ -1061,7 +1060,7 @@ tf_gen_op_wrapper_private_py(
     require_shape_functions = True,
     visibility = [
         "//learning/brain/python/ops:__pkg__",
-        "//tensorflow/python/feature_column:__pkg__",
+        "//tensorflow/contrib/lookup:__pkg__",
         "//tensorflow/python/kernel_tests:__pkg__",
     ],
 )
diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
index 8e26465f26..1b1790d280 100644
--- a/tensorflow/python/feature_column/BUILD
+++ b/tensorflow/python/feature_column/BUILD
@@ -29,10 +29,10 @@ py_library(
     srcs = ["feature_column.py"],
     srcs_version = "PY2AND3",
     deps = [
-        ":lookup_ops",
         "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:init_ops",
+        "//tensorflow/python:lookup_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
@@ -72,24 +72,3 @@ py_test(
         "//tensorflow/python:training",
     ],
 )
-
-# TODO(ptucker,yleon): Move along with 3p/tf/contrib/lookup.
-# Test is still in 3p/tf/contrib/lookup.
-py_library(
-    name = "lookup_ops",
-    srcs = [
-        "lookup_ops.py",
-    ],
-    srcs_version = "PY2AND3",
-    deps = [
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:control_flow_ops",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:lookup_ops_gen",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:string_ops",
-        "//tensorflow/python:training",
-        "//tensorflow/python:util",
-    ],
-)
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 391f3123ac..c9baef0695 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -128,7 +128,6 @@ import math
 import numpy as np
 import six
 
-from tensorflow.python.feature_column import lookup_ops
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
@@ -137,6 +136,7 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import lookup_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import parsing_ops
@@ -1950,7 +1950,7 @@ class _VocabularyListCategoricalColumn(
       input_tensor = math_ops.to_int64(input_tensor)
 
     return lookup_ops.index_table_from_tensor(
-        mapping=tuple(self.vocabulary_list),
+        vocabulary_list=tuple(self.vocabulary_list),
         default_value=self.default_value,
         dtype=key_dtype,
         name='{}_lookup'.format(self.key)).lookup(input_tensor)
-- 
GitLab


From 6e595abac2f8201e110c6a9facb99c32e6bdb5a3 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Thu, 11 May 2017 12:04:30 -0700
Subject: [PATCH 1232/1563] Deleted duplicate linkopts keyword

---
 third_party/grpc.BUILD | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/third_party/grpc.BUILD b/third_party/grpc.BUILD
index 4b6d2e3511..b79259618f 100644
--- a/third_party/grpc.BUILD
+++ b/third_party/grpc.BUILD
@@ -177,9 +177,6 @@ cc_library(
         "include",
     ],
     linkopts = ["-lpthread"],
-    deps = [
-    ],
-    linkopts = ["-lpthread"],
 )
 
 cc_library(
@@ -1790,7 +1787,6 @@ cc_library(
         ":grpc_unsecure",
         "//external:protobuf_clib",
     ],
-    linkopts = ["-lpthread"],
 )
 
 cc_library(
-- 
GitLab


From 5ccf7d3223ef7efdb853c32a26cc417adae2e403 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 11:59:06 -0700
Subject: [PATCH 1233/1563] This is running all the benchmark tests on k20,
 k40, and k80. We had to allow all cpu-platforms for k80.

PiperOrigin-RevId: 155777715
---
 tensorflow/tools/test/run_and_gather_logs_lib.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tools/test/run_and_gather_logs_lib.py b/tensorflow/tools/test/run_and_gather_logs_lib.py
index ebb527bc09..e803d5cdac 100644
--- a/tensorflow/tools/test/run_and_gather_logs_lib.py
+++ b/tensorflow/tools/test/run_and_gather_logs_lib.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 import os
+import re
 import shlex
 import subprocess
 import tempfile
@@ -26,6 +27,7 @@ import time
 
 from tensorflow.core.util import test_log_pb2
 from tensorflow.python.platform import gfile
+from tensorflow.tools.test import gpu_info_lib
 from tensorflow.tools.test import system_info_lib
 
 
@@ -93,7 +95,8 @@ def process_benchmarks(log_files):
   return benchmarks
 
 
-def run_and_gather_logs(name, test_name, test_args, benchmark_type):
+def run_and_gather_logs(name, test_name, test_args,
+                        benchmark_type):
   """Run the bazel test given by test_name.  Gather and return the logs.
 
   Args:
@@ -148,8 +151,17 @@ def run_and_gather_logs(name, test_name, test_args, benchmark_type):
     if not log_files:
       raise MissingLogsError("No log files found at %s." % test_file_prefix)
 
+    test_adjusted_name = name
+    gpu_config = gpu_info_lib.gather_gpu_devices()
+    if gpu_config:
+      gpu_name = gpu_config[0].model
+      gpu_short_name_match = re.search(r"Tesla [KP][4,8]0", gpu_name)
+      if gpu_short_name_match:
+        gpu_short_name = gpu_short_name_match.group(0)
+        test_adjusted_name = name + "|" + gpu_short_name.replace(" ", "_")
+
     return (process_test_logs(
-        name,
+        test_adjusted_name,
         test_name=test_name,
         test_args=test_args,
         benchmark_type=benchmark_type,
-- 
GitLab


From 999a07105baa551dc84d34a24d45fcbd4894fd20 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Thu, 11 May 2017 12:06:00 -0700
Subject: [PATCH 1234/1563] Deleted duplicate linkopts keyword

---
 third_party/llvm/llvm.BUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 8f64422032..005ae21ee8 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -1723,7 +1723,6 @@ cc_library(
         ":demangle",
         "@zlib_archive//:zlib",
     ],
-    linkopts = ["-lpthread", "-ldl"],
 )
 
 cc_library(
-- 
GitLab


From 912eaee77be9a042578c7566436fd4838b97fd05 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 12:06:19 -0700
Subject: [PATCH 1235/1563] Fixing some indenting issues in Markdown.

PiperOrigin-RevId: 155778725
---
 tensorflow/docs_src/tutorials/wide.md         | 25 ++++++++-----------
 .../docs_src/tutorials/wide_and_deep.md       | 25 ++++++++-----------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/tensorflow/docs_src/tutorials/wide.md b/tensorflow/docs_src/tutorials/wide.md
index e530e6e1ac..ce82009903 100644
--- a/tensorflow/docs_src/tutorials/wide.md
+++ b/tensorflow/docs_src/tutorials/wide.md
@@ -17,22 +17,19 @@ To try the code for this tutorial:
 2.  Download [the tutorial code](https://www.tensorflow.org/code/tensorflow/examples/learn/wide_n_deep_tutorial.py).
 
 3.  Install the pandas data analysis library. tf.learn doesn't require pandas, but it does support it, and this tutorial uses pandas. To install pandas:
-    1. Get `pip`:
 
-       ```shell
-       # Ubuntu/Linux 64-bit
-       $ sudo apt-get install python-pip python-dev
+    a. Get `pip`:
 
-       # Mac OS X
-       $ sudo easy_install pip
-       $ sudo easy_install --upgrade six
-       ```
+        # Ubuntu/Linux 64-bit
+        $ sudo apt-get install python-pip python-dev
 
-    2. Use `pip` to install pandas:
+        # Mac OS X
+        $ sudo easy_install pip
+        $ sudo easy_install --upgrade six
 
-       ```shell
-       $ sudo pip install pandas
-       ```
+    b. Use `pip` to install pandas:
+
+        $ sudo pip install pandas
 
     If you have trouble installing pandas, consult the
     [instructions](http://pandas.pydata.org/pandas-docs/stable/install.html)
@@ -41,9 +38,7 @@ To try the code for this tutorial:
 4. Execute the tutorial code with the following command to train the linear
 model described in this tutorial:
 
-   ```shell
-   $ python wide_n_deep_tutorial.py --model_type=wide
-   ```
+        $ python wide_n_deep_tutorial.py --model_type=wide
 
 Read on to find out how this code builds its linear model.
 
diff --git a/tensorflow/docs_src/tutorials/wide_and_deep.md b/tensorflow/docs_src/tutorials/wide_and_deep.md
index fda78f47c4..77c905fd51 100644
--- a/tensorflow/docs_src/tutorials/wide_and_deep.md
+++ b/tensorflow/docs_src/tutorials/wide_and_deep.md
@@ -43,22 +43,19 @@ To try the code for this tutorial:
 2.  Download [the tutorial code](https://www.tensorflow.org/code/tensorflow/examples/learn/wide_n_deep_tutorial.py).
 
 3.  Install the pandas data analysis library. tf.learn doesn't require pandas, but it does support it, and this tutorial uses pandas. To install pandas:
-    1. Get `pip`:
 
-       ```bsh
-       # Ubuntu/Linux 64-bit
-       $ sudo apt-get install python-pip python-dev
+    a. Get `pip`:
 
-       # Mac OS X
-       $ sudo easy_install pip
-       $ sudo easy_install --upgrade six
-      ```
+        # Ubuntu/Linux 64-bit
+        $ sudo apt-get install python-pip python-dev
 
-    2. Use `pip` to install pandas:
+        # Mac OS X
+        $ sudo easy_install pip
+        $ sudo easy_install --upgrade six
 
-       ```bsh
-       $ sudo pip install pandas
-       ```
+    b. Use `pip` to install pandas:
+
+        $ sudo pip install pandas
 
     If you have trouble installing pandas, consult the
     [instructions](http://pandas.pydata.org/pandas-docs/stable/install.html)
@@ -67,9 +64,7 @@ To try the code for this tutorial:
 4. Execute the tutorial code with the following command to train the linear
 model described in this tutorial:
 
-   ```shell
-   $ python wide_n_deep_tutorial.py --model_type=wide_n_deep
-   ```
+        $ python wide_n_deep_tutorial.py --model_type=wide_n_deep
 
 Read on to find out how this code builds its linear model.
 
-- 
GitLab


From 323986c34e5b3467c671f171a3b278340cb597a3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 12:10:20 -0700
Subject: [PATCH 1236/1563] Reduce CPU time and transient heap demand during
 graph loading.

PiperOrigin-RevId: 155779280
---
 .../core/common_runtime/simple_placer.cc      | 17 +++--
 tensorflow/core/framework/node_def_util.cc    | 69 ++++++++++++++++++-
 tensorflow/core/framework/node_def_util.h     | 14 ++++
 tensorflow/core/framework/op_kernel.cc        |  7 +-
 4 files changed, 97 insertions(+), 10 deletions(-)

diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc
index 5ab3f20648..8808d52d3e 100644
--- a/tensorflow/core/common_runtime/simple_placer.cc
+++ b/tensorflow/core/common_runtime/simple_placer.cc
@@ -34,6 +34,11 @@ namespace tensorflow {
 
 namespace {
 
+// We hoist the conversion from C-style string literal to StringPiece here,
+// so that we can avoid the many repeated calls to strlen().
+const StringPiece kColocationAttrNameStringPiece(kColocationAttrName);
+const StringPiece kColocationGroupPrefixStringPiece(kColocationGroupPrefix);
+
 // Returns a list of devices sorted by preferred type and then name
 // from 'devices' whose type is in 'supported_device_types'.  This
 // function searches the device types in 'supported_device_types' and
@@ -71,24 +76,26 @@ void ColocationGroups(const Node& node,
   std::vector<string> class_specs;
   // TODO(vrv): We should consider adding a GetNodeAttr that returns a
   // StringPiece, to avoid a copy.
-  Status s = GetNodeAttr(node.def(), kColocationAttrName, &class_specs);
-  if (!s.ok()) {
+  if (!GetNodeAttrSimple(node.def(), kColocationAttrNameStringPiece,
+                         &class_specs)) {
     // No attribute value is equivalent to the empty colocation_group.
-    *colocation_groups = {strings::StrCat(kColocationGroupPrefix, node.name())};
+    *colocation_groups = {
+        strings::StrCat(kColocationGroupPrefixStringPiece, node.name())};
     return;
   }
 
   bool found_spec = false;
   for (const string& class_spec : class_specs) {
     StringPiece spec(class_spec);
-    if (spec.Consume(kColocationGroupPrefix)) {
+    if (spec.Consume(kColocationGroupPrefixStringPiece)) {
       found_spec = true;
       colocation_groups->emplace_back(class_spec);
     }
   }
 
   if (!found_spec) {
-    *colocation_groups = {strings::StrCat(kColocationGroupPrefix, node.name())};
+    *colocation_groups = {
+        strings::StrCat(kColocationGroupPrefixStringPiece, node.name())};
   }
 }
 
diff --git a/tensorflow/core/framework/node_def_util.cc b/tensorflow/core/framework/node_def_util.cc
index 7e8ad50717..36c0842924 100644
--- a/tensorflow/core/framework/node_def_util.cc
+++ b/tensorflow/core/framework/node_def_util.cc
@@ -79,9 +79,24 @@ string SummarizeNodeDef(const NodeDef& node_def) {
 }
 
 const AttrValue* AttrSlice::Find(StringPiece attr_name) const {
-  auto iter = attrs_->find(attr_name.ToString());
-  if (iter == attrs_->end()) return nullptr;
-  return &iter->second;
+  // Currently, the collection used for NodeDef::attr() (google::protobuf::Map)
+  // requires that the keys used for lookups have type 'const string&'. Because
+  // this method takes a StringPiece, it is necessary to allocate a temporary
+  // string, copy attr_name to it, and then use that temporary string for the
+  // lookup. This causes an excessive number of short-lived allocations, and for
+  // large graphs, this can be a significant cost.
+  //
+  // Because most nodes have a small number of attributes, a simple linear scan
+  // is generally more efficient than a hashed lookup.  If google::protobuf::Map
+  // changes so that it supports efficient lookups using StringPiece instead of
+  // const string&, then this code could be changed to use attrs_->find() again.
+
+  for (const auto& attr : *attrs_) {
+    if (attr.first == attr_name) {
+      return &attr.second;
+    }
+  }
+  return nullptr;
 }
 
 Status AttrSlice::Find(StringPiece attr_name,
@@ -125,7 +140,41 @@ Status AttrSlice::Find(StringPiece attr_name,
     return Status::OK();                                                      \
   }
 
+#define DEFINE_GET_ATTR_SIMPLE(TYPE, FIELD, ATTR_TYPE, APPEND_OP, CAST, ...) \
+  bool GetNodeAttrSimple(const AttrSlice& attrs, StringPiece attr_name,      \
+                         TYPE* value) {                                      \
+    const AttrValue* attr_value = attrs.Find(attr_name);                     \
+    if (attr_value == nullptr) {                                             \
+      return false;                                                          \
+    }                                                                        \
+    Status s = AttrValueHasType(*attr_value, ATTR_TYPE);                     \
+    if (!s.ok()) {                                                           \
+      return false;                                                          \
+    }                                                                        \
+    const auto& v = attr_value->FIELD();                                     \
+    __VA_ARGS__;                                                             \
+    *value = CAST;                                                           \
+    return true;                                                             \
+  }                                                                          \
+  bool GetNodeAttrSimple(const AttrSlice& attrs, StringPiece attr_name,      \
+                         std::vector<TYPE>* value) {                         \
+    const AttrValue* attr_value = attrs.Find(attr_name);                     \
+    if (attr_value == nullptr) {                                             \
+      return false;                                                          \
+    }                                                                        \
+    Status s = AttrValueHasType(*attr_value, "list(" ATTR_TYPE ")");         \
+    if (!s.ok()) {                                                           \
+      return false;                                                          \
+    }                                                                        \
+    for (const auto& v : attr_value->list().FIELD()) {                       \
+      __VA_ARGS__;                                                           \
+      value->APPEND_OP(CAST);                                                \
+    }                                                                        \
+    return true;                                                             \
+  }
+
 DEFINE_GET_ATTR(string, s, "string", emplace_back, v, ;)
+DEFINE_GET_ATTR_SIMPLE(string, s, "string", emplace_back, v, ;)
 DEFINE_GET_ATTR(int64, i, "int", emplace_back, v, ;)
 DEFINE_GET_ATTR(int32, i, "int", emplace_back, static_cast<int32>(v),
                 if (static_cast<int64>(static_cast<int32>(v)) != v) {
@@ -156,6 +205,20 @@ DEFINE_GET_ATTR(Tensor, tensor, "tensor", emplace_back, t, Tensor t;
 
 #undef DEFINE_GET_ATTR
 
+static const string& kEmptyString = *new string();
+
+const string& GetNodeAttrString(const AttrSlice& attrs, StringPiece attr_name) {
+  const AttrValue* attr_value = attrs.Find(attr_name);
+  if (attr_value == nullptr) {
+    return kEmptyString;
+  }
+  Status s = AttrValueHasType(*attr_value, "string");
+  if (!s.ok()) {
+    return kEmptyString;
+  }
+  return attr_value->s();
+}
+
 Status GetNodeAttr(const AttrSlice& attrs, StringPiece attr_name,
                    DataTypeVector* value) {
   const AttrValue* attr_value;
diff --git a/tensorflow/core/framework/node_def_util.h b/tensorflow/core/framework/node_def_util.h
index 5c4d227268..018e4d15f2 100644
--- a/tensorflow/core/framework/node_def_util.h
+++ b/tensorflow/core/framework/node_def_util.h
@@ -153,6 +153,20 @@ Status GetNodeAttr(const AttrSlice& attrs, StringPiece attr_name,
 Status GetNodeAttr(const AttrSlice& attrs, StringPiece attr_name,
                    std::vector<NameAttrList>* value);  // type: "list(func)"
 
+// Look up the attr with name attr_name and set *value to its value.  If no
+// attr with attr_name is found in node_def, or the attr does not have
+// a matching type, false is returned.
+bool GetNodeAttrSimple(const AttrSlice& attrs, StringPiece attr_name,
+                       string* value);  // type: "string"
+bool GetNodeAttrSimple(const AttrSlice& attrs, StringPiece attr_name,
+                       std::vector<string>* value);  // type: "string"
+
+// Look up the attr with name attr_name and return a reference to its value.
+// If no attr with attr_name is found in node_def, or the attr does not have
+// a matching type, a reference to an empty string is returned.
+// REQUIRES: Must not use the returned value beyond the lifetime of node_def.
+const string& GetNodeAttrString(const AttrSlice& attrs, StringPiece attr_name);
+
 // Computes the input and output types for a specific node.
 // REQUIRES: ValidateOpDef(op_def).ok()
 Status InOutTypesForNode(const NodeDef& node_def, const OpDef& op_def,
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 7cfa662ed6..422ee80720 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -893,14 +893,17 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
   return Status::OK();
 }
 
+static const StringPiece kKernelAttr("_kernel");
+
 Status FindKernelRegistration(const DeviceType& device_type,
                               const NodeDef& node_def,
                               const KernelRegistration** reg,
                               bool* was_attr_mismatch) {
   *reg = nullptr;
   *was_attr_mismatch = false;
-  string label;  // Label defaults to empty if not found in NodeDef.
-  GetNodeAttr(node_def, "_kernel", &label).IgnoreError();
+  // Label defaults to empty if not found in NodeDef.
+  const string& label = GetNodeAttrString(node_def, kKernelAttr);
+
   const string key = Key(node_def.op(), device_type, label);
   auto regs = GlobalKernelRegistryTyped()->equal_range(key);
   for (auto iter = regs.first; iter != regs.second; ++iter) {
-- 
GitLab


From b37da7a32c366d4163da9ed42ed9ab0c84e695be Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 12:12:13 -0700
Subject: [PATCH 1237/1563] Add timeline support in tfprof

This CL mainly adds timeline support in three views of tfprof.
It includes a few other small changes:
1. Handle the case that one Op fires multiple kernels.
2. Remove the requirements for CostGraph for easier user adoption, for now.
3. Some speed improvements in graph view.
4. Consolidate the all kinds of tfprof output into one -output option.

PiperOrigin-RevId: 155779520
---
 tensorflow/contrib/tfprof/README.md           |  78 +----
 .../python/tools/tfprof/model_analyzer.py     |  10 +-
 .../tools/tfprof/model_analyzer_test.py       |  38 +--
 .../tools/tfprof/print_model_analysis_test.py |   9 +-
 .../python/tools/tfprof/tfprof_logger.py      |  10 +-
 tensorflow/tools/tfprof/README.md             |  64 +++-
 .../tools/tfprof/g3doc/code_timeline.png      | Bin 0 -> 45674 bytes
 .../tools/tfprof/g3doc/graph_timeline.png     | Bin 0 -> 168051 bytes
 .../tools/tfprof/g3doc/scope_timeline.png     | Bin 0 -> 24944 bytes
 tensorflow/tools/tfprof/internal/BUILD        |  58 +++-
 .../tfprof/internal/print_model_analysis.cc   |  11 +-
 .../tools/tfprof/internal/tfprof_code.cc      |  17 +-
 .../tools/tfprof/internal/tfprof_code.h       |  20 +-
 .../tools/tfprof/internal/tfprof_graph.cc     |  23 +-
 .../tools/tfprof/internal/tfprof_graph.h      |  29 +-
 .../tools/tfprof/internal/tfprof_node.cc      |  26 +-
 .../tools/tfprof/internal/tfprof_node.h       |  68 ++--
 .../tools/tfprof/internal/tfprof_node_show.cc | 296 ++++++++++++++++++
 .../tools/tfprof/internal/tfprof_node_show.h  | 173 ++++++++++
 .../tools/tfprof/internal/tfprof_options.cc   | 134 +++++++-
 .../tools/tfprof/internal/tfprof_options.h    |  43 ++-
 .../tools/tfprof/internal/tfprof_scope.cc     |  12 +-
 .../tools/tfprof/internal/tfprof_scope.h      |  19 +-
 .../tools/tfprof/internal/tfprof_show.cc      | 168 ++--------
 .../tools/tfprof/internal/tfprof_show.h       |  32 +-
 .../tools/tfprof/internal/tfprof_show_code.cc | 161 +---------
 .../tools/tfprof/internal/tfprof_show_code.h  |  33 +-
 .../tools/tfprof/internal/tfprof_show_test.cc |   2 +-
 .../tools/tfprof/internal/tfprof_stats.cc     |  27 +-
 .../tfprof/internal/tfprof_stats_test.cc      |  40 +--
 .../tfprof/internal/tfprof_tensor_test.cc     |   2 +-
 .../tools/tfprof/internal/tfprof_timeline.cc  | 245 +++++++++++++++
 .../tools/tfprof/internal/tfprof_timeline.h   | 147 +++++++++
 .../tfprof/internal/tfprof_timeline_test.cc   |  92 ++++++
 .../tools/tfprof/internal/tfprof_utils.cc     |  14 +-
 tensorflow/tools/tfprof/tfprof_main.cc        |  32 +-
 tensorflow/tools/tfprof/tfprof_options.proto  |   2 +-
 tensorflow/tools/tfprof/tfprof_output.proto   |   3 +-
 38 files changed, 1470 insertions(+), 668 deletions(-)
 create mode 100644 tensorflow/tools/tfprof/g3doc/code_timeline.png
 create mode 100644 tensorflow/tools/tfprof/g3doc/graph_timeline.png
 create mode 100644 tensorflow/tools/tfprof/g3doc/scope_timeline.png
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_node_show.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_node_show.h
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline.h
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc

diff --git a/tensorflow/contrib/tfprof/README.md b/tensorflow/contrib/tfprof/README.md
index d891ecdc9a..5bfa0247a5 100644
--- a/tensorflow/contrib/tfprof/README.md
+++ b/tensorflow/contrib/tfprof/README.md
@@ -2,81 +2,25 @@
 
 # Full Docment in tensorflow/tools/tfprof/README.md
 
-Author: Xin Pan (xpan@google.com, github: panyx0718)
+Author: Xin Pan (xpan@google.com, github: panyx0718), Jon Shlens, Yao Zhang
 
 Consultants: Jon Shlens, Pete Warden
 
 ###Major Features
 
 1.  Measure model parameters, float operations, tensor shapes.
-2.  Measure op execution times, requested memory size and device placement.
+2.  Profile op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  3 ways to view and explore TensorFlow model profiles
+4.  Selectively group, filter, account and order ops.
 
-    *  Organize by Python code call stack.
-    *  Organize by TensorFlow operation name scope hierarchies.
-    *  Organize by TensorFlow operation inputs/outputs graph.
+####tfprof supports 3 views to organize TensorFlow model profiles
 
-5.  Selectively grouping/filtering/accounting/ordering ops.
+    *  code view: Stats are associated your Python codes and organized as call stacks.
+    *  scope view: Stats are organized as name scope hierarchies.
+    *  graph view: Stats are organized as Tensorflow Op graph.
 
-tfprof can be used as Python API, Interactive CLI and One-shot Script.
+####For each view, there are 3 ways to display outputs:
 
-## Python API Tutorials
-
-tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
-
-### Examine the shapes and sizes of all trainiable Variables.
-```python
-# Print trainable variable parameter statistics to stdout.
-param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    tfprof_options=tf.contrib.tfprof.model_analyzer.
-        TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
-
-# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
-# It organize the statistics
-# of each graph node in tree scructure. Let's print the root below.
-sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
-```
-
-### Examine the number of floating point operations
-``` python
-# Print to stdout an analysis of the number of floating point operations in the
-# model broken down by individual operations.
-#
-# Note: Only Ops with RegisterStatistics('flops') defined have flop stats. It
-# also requires complete shape information. It is common that shape is unknown
-# statically. To complete the shape, provide run-time shape information with
-# tf.RunMetadata to the API (See next example on how to provide RunMetadata).
-tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    tfprof_options=tf.contrib.tfprof.model_analyzer.FLOAT_OPS_OPTIONS)
-```
-
-### Examine the timing and memory usage
-You will first need to run the following set up in your model in order to
-compute the memory and timing statistics.
-
-```python
-# Generate the meta information for the model that contains the memory usage
-# and timing information.
-run_metadata = tf.RunMetadata()
-with tf.Session() as sess:
-  _ = sess.run(train_op,
-               options=tf.RunOptions(trace_level=tf.RunOptions.FULL_TRACE),
-               run_metadata=run_metadata)
-```
-
-Finally, you may run `print_model_analysis` to explore the timing and memory
-demands of the model.
-
-``` python
-# Print to stdout an analysis of the memory usage and the timing information
-# from running the graph broken down by operations.
-tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    run_meta=run_metadata,
-    tfprof_options=tf.contrib.tfprof.model_analyzer.PRINT_ALL_TIMING_MEMORY)
-```
-
-Users can change ```tfprof_options``` to fully leverage tfprof's power.
+    *  stdout: Results are written to stdout.
+    *  timeline: Visualized in chrome browser as time series.
+    *  file: Results are dumped to file.
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
index 13b407d815..17dff69edd 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
@@ -45,7 +45,7 @@ TRAINABLE_VARS_PARAMS_STAT_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['params'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -65,7 +65,7 @@ FLOAT_OPS_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['float_ops'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -87,7 +87,7 @@ PRINT_PARAMS_ON_DEVICE = {
     'hide_name_regexes': [],
     'account_displayed_op_only': False,
     'select': ['device', 'params'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -107,7 +107,7 @@ PRINT_ALL_TIMING_MEMORY = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['micros', 'bytes'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -178,7 +178,7 @@ def print_model_analysis(graph,
   opts.account_displayed_op_only = tfprof_options['account_displayed_op_only']
   for p in tfprof_options['select']:
     opts.select.append(p)
-  opts.viz = tfprof_options['viz']
+  opts.output = tfprof_options['output']
   opts.dump_to_file = tfprof_options['dump_to_file']
 
   run_meta_str = run_meta.SerializeToString() if run_meta else b''
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
index 55167576e2..afd8563e78 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
@@ -35,13 +35,14 @@ class PrintModelAnalysisTest(test.TestCase):
   def testDumpToFile(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = lib.BuildSmallModel()
       model_analyzer.print_model_analysis(sess.graph, tfprof_options=opts)
 
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         self.assertEqual(u'_TFProfRoot (--/451 params)\n'
                          '  DW (3x3x3x6, 162/162 params)\n'
                          '  DW2 (2x2x6x12, 288/288 params)\n'
@@ -51,15 +52,14 @@ class PrintModelAnalysisTest(test.TestCase):
   def testSelectEverything(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
     opts['account_type_regexes'] = ['.*']
     opts['select'] = [
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device', 'op_types'
     ]
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
@@ -72,17 +72,18 @@ class PrintModelAnalysisTest(test.TestCase):
       model_analyzer.print_model_analysis(
           sess.graph, run_meta, tfprof_options=opts)
 
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         # pylint: disable=line-too-long
         self.assertEqual(
-            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  ScalarW (1, 1/1 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|VariableV2|_trainable_variables)\n    ScalarW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    ScalarW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      ScalarW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        ScalarW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        ScalarW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        ScalarW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    ScalarW/read (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
+            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  ScalarW (1, 1/1 params, 0/0 flops, 0B/0B, VariableV2|_trainable_variables)\n    ScalarW/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    ScalarW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      ScalarW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        ScalarW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        ScalarW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        ScalarW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    ScalarW/read (0/0 params, 0/0 flops, 0B/0B, Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
             f.read())
         # pylint: enable=line-too-long
 
   def testSimpleCodeView(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
     opts['account_type_regexes'] = ['.*']
     opts['show_name_regexes'] = ['.*model_analyzer_testlib.*']
     opts['account_displayed_op_only'] = False
@@ -92,9 +93,7 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
     ]
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
@@ -107,7 +106,7 @@ class PrintModelAnalysisTest(test.TestCase):
       model_analyzer.print_model_analysis(
           sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
 
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         # pylint: disable=line-too-long
         self.assertEqual(
             '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB)\n  model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n  model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/1 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/162 params, 0/0 flops, 0B/1.30KB)\n  model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/5.83k flops, 0B/432B)\n  model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/288 params, 0/0 flops, 0B/2.30KB)\n  model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/4.61k flops, 0B/384B)\n',
@@ -117,15 +116,14 @@ class PrintModelAnalysisTest(test.TestCase):
   def testComplexCodeView(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
     opts['account_type_regexes'] = ['.*']
     opts['show_name_regexes'] = ['.*model_analyzer_testlib.py.*']
     opts['account_displayed_op_only'] = False
     opts['select'] = ['params', 'float_ops']
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildFullModel()
 
       sess.run(variables.global_variables_initializer())
@@ -139,7 +137,7 @@ class PrintModelAnalysisTest(test.TestCase):
           sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
 
       # pylint: disable=line-too-long
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         self.assertEqual(
             '_TFProfRoot (0/2.84k params, 0/54.08k flops)\n  model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_... (0/1.80k params, 0/41.76k flops)\n    model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops)\n    model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/4 params, 0/0 flops)\n    model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/648 params, 0/0 flops)\n    model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/23.33k flops)\n    model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/1.15k params, 0/0 flops)\n    model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/18.43k flops)\n  model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c... (0/1.04k params, 0/4.13k flops)\n  model_analyzer_testlib.py:62:BuildFullModel:target = array_op... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min... (0/0 params, 0/8.19k flops)\n',
             f.read())
@@ -170,9 +168,7 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device'
     ]
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
index aa133d3142..c3e9fc9cc0 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
@@ -51,7 +51,7 @@ TEST_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['params'],
-    'viz': False
+    'output': 'stdout',
 }
 
 # pylint: enable=bad-whitespace
@@ -92,7 +92,7 @@ class PrintModelAnalysisTest(test.TestCase):
     opts.account_displayed_op_only = TEST_OPTIONS['account_displayed_op_only']
     for p in TEST_OPTIONS['select']:
       opts.select.append(p)
-    opts.viz = TEST_OPTIONS['viz']
+    opts.output = TEST_OPTIONS['output']
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = self._BuildSmallModel()
@@ -116,7 +116,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -128,7 +127,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 648
-      device: "/device:CPU:0"
       children {
       name: "DW/Assign"
       exec_micros: 0
@@ -136,7 +134,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -217,7 +214,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -231,7 +227,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
index cd3912bbfb..e6d504d516 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
@@ -62,7 +62,7 @@ def _fill_missing_graph_shape(graph, run_meta):
   return graph
 
 
-def _get_logged_ops(graph, run_meta=None, add_trace=False):
+def _get_logged_ops(graph, run_meta=None, add_trace=True):
   """Extract trainable model parameters and FLOPs for ops from a Graph.
 
   Args:
@@ -120,9 +120,8 @@ def _get_logged_ops(graph, run_meta=None, add_trace=False):
   return logged_ops
 
 
-def _merge_default_with_oplog(graph, op_log=None,
-                              run_meta=None,
-                              add_trace=False):
+def _merge_default_with_oplog(graph, op_log=None, run_meta=None,
+                              add_trace=True):
   """Merge the tfprof default extra info with caller's op_log.
 
   Args:
@@ -154,8 +153,7 @@ def _merge_default_with_oplog(graph, op_log=None,
   return tmp_op_log
 
 
-def write_op_log(graph, log_dir, op_log=None, run_meta=None,
-                 add_trace=False):
+def write_op_log(graph, log_dir, op_log=None, run_meta=None, add_trace=True):
   """Log provided 'op_log', and add additional model information below.
 
     The API also assigns ops in tf.trainable_variables() an op type called
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index 52d376d5f5..69f09411a9 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -1,6 +1,6 @@
 # tfprof: A Profiling Tool for TensorFlow Models
 
-Author: Xin Pan (xpan@google.com, github: panyx0718)
+Author: Xin Pan (xpan@google.com, github: panyx0718), Jon Shlens, Yao Zhang
 
 Consultants: Jon Shlens, Pete Warden
 
@@ -8,15 +8,22 @@ Consultants: Jon Shlens, Pete Warden
 ###Major Features
 
 1.  Measure model parameters, float operations, tensor shapes.
-2.  Measure op execution times, requested memory size and device placement.
+2.  Profile op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  3 ways to view and explore TensorFlow model profiles
+4.  Selectively group, filter, account and order ops.
 
-    *  Organize by Python code call stack.
-    *  Organize by TensorFlow operation name scope hierarchies.
-    *  Organize by TensorFlow operation inputs/outputs graph.
+####tfprof supports 3 views to organize TensorFlow model profiles
+
+    *  code view: Stats are associated your Python codes and organized as call stacks.
+    *  scope view: Stats are organized as name scope hierarchies.
+    *  graph view: Stats are organized as Tensorflow Op graph.
+
+####For each view, there are 3 ways to display outputs:
+
+    *  stdout: Results are written to stdout.
+    *  timeline: Visualized in chrome browser as time series.
+    *  file: Results are dumped to file.
 
-5.  Selectively grouping/filtering/accounting/ordering ops.
 
 [Python API Tutorials](#python-api-tutorials): It can be called directly from
 Python codes. Results are either printed
@@ -83,13 +90,11 @@ compute the memory and timing statistics.
 #
 # Note: When run on GPU, a kernel is first scheduled (enqueued) and then
 #       executed asynchronously. tfprof only tracks the execution time.
-#       Which is from proto CostGraphDef::Node::compute_cost.
 #       In addition, a substantial of time might be spent between Python and
 #       TensorFlow runtime, which is also not tracked by tfprof.
 #
-config = tf.ConfigProto(graph_options=tf.GraphOptions(build_cost_model=1))
 run_metadata = tf.RunMetadata()
-with tf.Session(config=config) as sess:
+with tf.Session() as sess:
   _ = sess.run(train_op,
                options=tf.RunOptions(trace_level=tf.RunOptions.FULL_TRACE),
                run_metadata=run_metadata)
@@ -121,6 +126,18 @@ tf.contrib.tfprof.model_analyzer.print_model_analysis(
 
 Users can change ```tfprof_options``` to fully leverage tfprof's power.
 
+```
+For example set opts['output'] = 'timeline:outfile=<filename>' to
+generate a timeline json file. Open a Chrome Browser, open URL
+chrome://tracing, and load the json file. Below are 2 examples of graph
+view and scope view. See code view example in later examples.
+```
+
+<left>
+![CodeTimeline](g3doc/graph_timeline.png)
+![CodeTimeline](g3doc/scope_timeline.png)
+</left>
+
 
 ## CLI Tutorials
 
@@ -197,8 +214,14 @@ tfprof>
 # supported select fileds. Availability depends on --[run_meta|checkpoint|op_log]_path.
 # [bytes|micros|params|float_ops|num_hidden_ops|tensor_value|device|op_types]
 -select                     params
--viz                        false
--dump_to_file
+# format: output_type:key=value,key=value...
+# output_types: stdout (default), timeline, file.
+# key=value pairs:
+#   1. timeline: outfile=<filename>
+#   2. file: outfile=<filename>
+#   3. stdout: None.
+# E.g. timeline:outfile=/tmp/timeline.json
+-output
 ```
 
 3) I want to see which line of my python codes costs most time!
@@ -222,6 +245,12 @@ _TFProfRoot (0us/22.44ms)
         model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
 ```
 
+Set ```-output timeline:outfile=<filename>``` to generate timeline instead of stdout.
+<left>
+![CodeTimeline](g3doc/code_timeline.png)
+</left>
+
+
 4) I want to see the `BatchNorm`'s gamma value in checkpoint.
 
 ```shell
@@ -423,10 +452,10 @@ the tool adds all `Variables` inside `tf.trainable_variables()` to
 12) Run tfprof in one-shot mode and dump result to file.
 
 ```shell
-# Printed to stdout if --dump_to_file is not set.
+# By default output to stdout. Use -output option to change output types.
 tfprof scope --graph_path=graph.pbtxt  \
              --max_depth=3 \
-             --dump_to_file="/tmp/dump"
+             --output="file:outfile=/tmp/dump"
 Reading Files...
 Parsing GraphDef...
 Preparing Views...
@@ -538,4 +567,9 @@ as long as they match the `-account_xxx` options.
 
 `-select`: Comma-separated list of metrics to show: [bytes|micros|params|float_ops|num_hidden_ops|tensor_value|device|op_types].
 
-`-dump_to_file`: Dump the output to a file, instead of terminal.
+`-output`: Output results as stdout, file or timeline.
+The format is ```output_type:key=value,key=value```.
+For example: ```timeline:outfile=<filename>```.
+timeline: key=outfile, value=<filename>.
+stdout: none.
+file: key=outfile, value=<filename>.
diff --git a/tensorflow/tools/tfprof/g3doc/code_timeline.png b/tensorflow/tools/tfprof/g3doc/code_timeline.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5ab246f7da14c0384a5704aa8053a97540a9dab
GIT binary patch
literal 45674
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
J);T3K0RX~K!#4l`

literal 0
HcmV?d00001

diff --git a/tensorflow/tools/tfprof/g3doc/graph_timeline.png b/tensorflow/tools/tfprof/g3doc/graph_timeline.png
new file mode 100644
index 0000000000000000000000000000000000000000..255a91fd5ff6005086f7d4a1dfdd43cc8d115ee1
GIT binary patch
literal 168051
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
E0CyO~SO5S3

literal 0
HcmV?d00001

diff --git a/tensorflow/tools/tfprof/g3doc/scope_timeline.png b/tensorflow/tools/tfprof/g3doc/scope_timeline.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d95af84aac473e68b30fc6fbefa99d4431948f
GIT binary patch
literal 24944
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

literal 0
HcmV?d00001

diff --git a/tensorflow/tools/tfprof/internal/BUILD b/tensorflow/tools/tfprof/internal/BUILD
index adace89985..e90f0ec40a 100644
--- a/tensorflow/tools/tfprof/internal/BUILD
+++ b/tensorflow/tools/tfprof/internal/BUILD
@@ -21,6 +21,7 @@ cc_library(
         ":tfprof_options",
         ":tfprof_scope",
         ":tfprof_show",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -30,6 +31,20 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_timeline",
+    srcs = ["tfprof_timeline.cc"],
+    hdrs = ["tfprof_timeline.h"],
+    deps = [
+        ":tfprof_node_show",
+        ":tfprof_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+        "@jsoncpp_git//:jsoncpp",
+    ],
+)
+
 cc_library(
     name = "tfprof_node",
     srcs = ["tfprof_node.cc"],
@@ -71,7 +86,7 @@ cc_library(
         ":tfprof_node",
         ":tfprof_options",
         ":tfprof_show_code",
-        ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:c_api",
         "//tensorflow/c:checkpoint_reader",
@@ -93,6 +108,7 @@ cc_library(
         ":tfprof_options",
         ":tfprof_show",
         ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -102,6 +118,21 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_node_show",
+    srcs = ["tfprof_node_show.cc"],
+    hdrs = ["tfprof_node_show.h"],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_node",
+        ":tfprof_options",
+        ":tfprof_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "tfprof_show",
     srcs = ["tfprof_show.cc"],
@@ -109,8 +140,10 @@ cc_library(
     deps = [
         ":tfprof_constants",
         ":tfprof_node",
+        ":tfprof_node_show",
         ":tfprof_options",
         ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -127,10 +160,12 @@ cc_library(
     deps = [
         ":tfprof_constants",
         ":tfprof_node",
+        ":tfprof_node_show",
         ":tfprof_options",
         ":tfprof_scope",
         ":tfprof_show",
         ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -166,6 +201,27 @@ tf_cc_test(
     ],
 )
 
+tf_cc_test(
+    name = "tfprof_timeline_test",
+    srcs = ["tfprof_timeline_test.cc"],
+    data = [
+        "testdata/graph.pbtxt",
+        "testdata/run_meta",
+    ],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_options",
+        ":tfprof_stats",
+        ":tfprof_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "tfprof_utils",
     srcs = ["tfprof_utils.cc"],
diff --git a/tensorflow/tools/tfprof/internal/print_model_analysis.cc b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
index c816e3209e..f73675e8a7 100644
--- a/tensorflow/tools/tfprof/internal/print_model_analysis.cc
+++ b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
@@ -56,11 +56,14 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
   TFStats tf_stats(std::move(graph_ptr), std::move(run_meta_ptr),
                    std::move(op_log_ptr), std::move(ckpt_reader));
 
-  Options opts = Options::FromProtoStr(*options);
+  Options opts;
+  tensorflow::Status s = Options::FromProtoStr(*options, &opts);
+  if (!s.ok()) {
+    fprintf(stderr, "%s\n", s.ToString().c_str());
+    return "";
+  }
 
-  // TODO(xpan): We should have dump_to_file/print_stdout/etc to control
-  // side-effects independently instead of one controlling the other.
-  if (opts.dump_to_file.empty()) {
+  if (opts.output_type == kOutput[1]) {
     printf("\n=========================Options=============================\n");
     printf("%s", opts.ToString().c_str());
     printf("\n==================Model Analysis Report======================\n");
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.cc b/tensorflow/tools/tfprof/internal/tfprof_code.cc
index 5618a52286..9739db1e0b 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_code.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.cc
@@ -25,7 +25,6 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/regexp.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -99,7 +98,8 @@ CodeNode* TFCode::BuildCodeNodes(TFCodeNode* root) {
   return code_root_ptr;
 }
 
-const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
+const ShowCodeNode* TFCode::ShowInternal(const Options& opts,
+                                         Timeline* timeline) {
   // Search from roots recursively to find start node, if start_name_regexes
   // is specified.
   tfprof_trace_root_.reset(new TFCodeNode(kTFProfRoot));
@@ -117,7 +117,11 @@ const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
   tfprof_code_root_->children.assign(roots.begin(), roots.end());
   Account({tfprof_code_root_.get()}, opts);
 
-  return PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
+  CodeNode* root = PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
+  if (timeline) {
+    timeline->GenerateCodeTimeline(root);
+  }
+  return root;
 }
 
 std::vector<CodeNode*> TFCode::SearchRoot(std::vector<CodeNode*> roots,
@@ -170,8 +174,13 @@ std::vector<CodeNode*> TFCode::PrintScope(const std::vector<CodeNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (CodeNode* sc : show_cnodes) {
-        children_str += sc->formatted_str;
+        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
+          children_str += sc->formatted_str;
+          sc->formatted_str.clear();
+        }
         node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        sc->mutable_proto()->mutable_children()->Clear();
+        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.h b/tensorflow/tools/tfprof/internal/tfprof_code.h
index 7c517e6b0e..d7a28624f1 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_code.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.h
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
@@ -37,22 +38,6 @@ limitations under the License.
 namespace tensorflow {
 namespace tfprof {
 
-class CodeNode : public ShowCodeNode {
- public:
-  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
-  ~CodeNode() override {}
-
-  void AggregateTotalStats(CodeNode* node) {
-    ShowCodeNode::AggregateTotalStats(node);
-  }
-
-  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
-
-  void ResetTotalStats() { ShowCodeNode::ResetTotalStats(); }
-
-  std::vector<CodeNode*> children;
-};
-
 class TFCode : public TFShowCode {
  public:
   explicit TFCode() : code_root_(nullptr), trace_root_(nullptr) {}
@@ -65,7 +50,8 @@ class TFCode : public TFShowCode {
  private:
   CodeNode* BuildCodeNodes(TFCodeNode* root);
 
-  const ShowCodeNode* ShowInternal(const Options& opts) override;
+  const ShowCodeNode* ShowInternal(const Options& opts,
+                                   Timeline* timeline) override;
 
   std::vector<CodeNode*> SearchRoot(std::vector<CodeNode*> roots,
                                     const std::vector<string>& regexes);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.cc b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
index 1623d9f8c4..23084146c2 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
@@ -66,7 +66,7 @@ void TFGraph::Build() {
   }
 }
 
-const ShowNode* TFGraph::ShowInternal(const Options& opts) {
+const ShowNode* TFGraph::ShowInternal(const Options& opts, Timeline* timeline) {
   // Search the nodes to start from.
   std::vector<GraphNode*> roots = roots_;
   if (opts.start_name_regexes.size() != 1 ||
@@ -81,11 +81,13 @@ const ShowNode* TFGraph::ShowInternal(const Options& opts) {
   std::map<string, int64> account_visits;
   Account({root}, opts, &account_visits);
 
-  if (opts.viz) {
-    printf("Visualizing feature disabled...\n");
-  }
   std::set<string> visits;
-  return PrintGraph({root}, opts, 1, 0, 0, &visits)[0];
+  root = PrintGraph({root}, opts, 1, 0, 0, &visits)[0];
+
+  if (timeline) {
+    timeline->GenerateGraphTimeline(root);
+  }
+  return root;
 }
 
 std::vector<GraphNode*> TFGraph::SearchRoot(
@@ -155,8 +157,14 @@ std::vector<GraphNode*> TFGraph::PrintGraph(const std::vector<GraphNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (GraphNode* sc : show_cnodes) {
-        children_str += sc->formatted_str;
-        node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
+          children_str += sc->formatted_str;
+          sc->formatted_str.clear();
+        }
+        // This swap and reinit pattern is critical for performance.
+        node->mutable_proto()->add_children()->Swap(sc->mutable_proto());
+        sc->ReInit();
+        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
@@ -181,7 +189,6 @@ std::vector<GraphNode*> TFGraph::PrintGraph(const std::vector<GraphNode*> roots,
           node->formatted_str += value_str;
         }
       }
-
       node->formatted_str += children_str;
       show_nodes.push_back(node);
     } else {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.h b/tensorflow/tools/tfprof/internal/tfprof_graph.h
index 75979d020c..4d4aa8b2b1 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.h
@@ -37,32 +37,6 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-class GraphNode : public ShowNode {
- public:
-  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
-    mutable_proto()->set_inputs(node->inputs().size());
-    mutable_proto()->set_total_inputs(0);
-  }
-
-  void AggregateTotalStats(GraphNode* node) {
-    ShowNode::AggregateTotalStats(node);
-    mutable_proto()->set_total_inputs(proto().total_inputs() +
-                                      node->proto().total_inputs() + 1);
-  }
-
-  void AddSelfToTotalStats() {
-    ShowNode::AddSelfToTotalStats();
-    mutable_proto()->set_total_inputs(proto().total_inputs() +
-                                      proto().inputs());
-  }
-
-  void ResetTotalStats() {
-    ShowNode::ResetTotalStats();
-    mutable_proto()->set_total_inputs(0);
-  }
-
-  std::vector<GraphNode*> children;
-};
 
 // Organize tensorflow ops in a graph structure, pointing from output ops
 // to input ops.
@@ -77,7 +51,8 @@ class TFGraph : public TFShow {
   void Build() override;
 
  private:
-  const ShowNode* ShowInternal(const Options& opts) override;
+  const ShowNode* ShowInternal(const Options& opts,
+                               Timeline* timeline) override;
 
   bool ShouldShowIfExtra(ShowNode* node, const Options& opts,
                          int depth) override {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.cc b/tensorflow/tools/tfprof/internal/tfprof_node.cc
index 5f018addb4..74c8fcbe48 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.cc
@@ -20,20 +20,22 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
+// Notes about start and end time from the NodeExecStats proto.
+// For GPU, there is no difference between op_end_rel_micros and
+// all_end_rel_micros. All are kernel times.
+// For CPU, op_end_rel is the kernel time, while all_end_rel_micros includes
+// some post-processing.
+// Here, we only consider kernel time for simplicity.
 void TFGraphNode::AddStepStat(const string& device,
                               const NodeExecStats* step_stat) {
-  if (!device.empty()) {
-    // This might override device from GraphDef.
-    device_ = device;
-  }
   step_stat_ = step_stat;
+  CHECK(step_stat_);
 
-  op_start_micros_ = step_stat_->all_start_micros();
-  if (step_stat_->op_end_rel_micros() && step_stat_->op_start_rel_micros()) {
-    op_schedule_micros_ =
-        step_stat_->op_end_rel_micros() - step_stat_->op_start_rel_micros();
-  }
-  all_spent_micros_ = step_stat_->all_end_rel_micros();
+  string dev = str_util::Lowercase(device);
+
+  devices_.insert(dev);
+  op_kernel_execs_[dev].push_back(std::make_pair(
+      step_stat_->all_start_micros(), step_stat_->op_end_rel_micros()));
 
   for (const auto& output : step_stat_->output()) {
     if (output.has_tensor_description() &&
@@ -44,9 +46,5 @@ void TFGraphNode::AddStepStat(const string& device,
     }
   }
 }
-
-void TFGraphNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
-  kernel_compute_micros_ = cost_node->compute_cost();
-}
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.h b/tensorflow/tools/tfprof/internal/tfprof_node.h
index 235904ea6c..8e57db7ba2 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.h
@@ -23,12 +23,12 @@ limitations under the License.
 
 #include "tensorflow/core/framework/allocation_description.pb.h"
 #include "tensorflow/core/framework/attr_value.pb.h"
-#include "tensorflow/core/framework/cost_graph.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/framework/tensor_description.pb.h"
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 
@@ -41,10 +41,6 @@ class TFGraphNode {
       : node_(node),
         code_(nullptr),
         step_stat_(nullptr),
-        op_start_micros_(0),
-        op_schedule_micros_(0),
-        kernel_compute_micros_(0),
-        all_spent_micros_(0),
         requested_bytes_(0),
         float_ops_(0) {
     if (!node) return;
@@ -69,38 +65,51 @@ class TFGraphNode {
       update_shape(shape_vec);
     }
     op_types_.insert(node->op());
-    device_ = node->device();
   }
 
   TFGraphNode() : TFGraphNode(nullptr) {}
 
-  void AddInput(TFGraphNode* input) { inputs_[input->name()] = input; }
+  void AddInput(TFGraphNode* input, int64 output_idx) {
+    inputs_[input->name()] = input;
+    output_idx_[input->name()] = output_idx;
+  }
 
   void AddOpType(const string& op_type) { op_types_.insert(op_type); }
 
   void AddStepStat(const string& device, const NodeExecStats* step_stat);
 
-  // Add CostGraphDef::Node.
-  void AddNodeStat(const CostGraphDef::Node* cost_node);
-
   void AddFloatOps(int64 float_ops) { float_ops_ = float_ops; }
 
   void AddCode(const CodeDef* code) { code_ = code; }
 
   const string& name() const { return node_->name(); }
   const NodeDef* node_def() { return node_; }
+
+  const NodeExecStats* step_stats() const { return step_stat_; }
+
   const std::map<string, TFGraphNode*>& inputs() const { return inputs_; }
-  int64 op_start_micros() { return op_start_micros_; }
-  // This is time spent in Op::Compute(), which is GPU kernel schedule time.
-  // Currently not used.
-  int64 op_schedule_micros() { return op_schedule_micros_; }
+  const std::map<string, int64>& output_idx() { return output_idx_; }
+
   // This is time spent in kernel execution.
-  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
-  int64 all_spent_micros() { return all_spent_micros_; }
+  int64 kernel_exec_micros() const {
+    if (!step_stat_) return 0;
+    int64 total = 0;
+    for (const auto& execs : op_kernel_execs_) {
+      for (const auto& exec : execs.second) {
+        total += exec.second;
+      }
+    }
+    return total;
+  }
+  const std::map<string, std::vector<std::pair<int64, int64>>>&
+  op_kernel_execs() const {
+    return op_kernel_execs_;
+  }
+
   int64 requested_bytes() const { return requested_bytes_; }
   int64 float_ops() const { return float_ops_; }
   const CodeDef* code() { return code_; }
-  string device() const { return device_; }
+  std::set<string> devices() const { return devices_; }
   const std::set<string>& op_types() const { return op_types_; }
 
   const std::vector<int64>& shape() const { return shape_; }
@@ -109,17 +118,19 @@ class TFGraphNode {
   void update_shape(const std::vector<int64>& shape) { shape_ = shape; }
 
   std::map<string, TFGraphNode*> inputs_;
+  std::map<string, int64> output_idx_;
+
   const NodeDef* node_;
   const CodeDef* code_;
   const NodeExecStats* step_stat_;
 
   std::vector<int64> shape_;
   std::set<string> op_types_;
-  string device_;
-  int64 op_start_micros_;
-  int64 op_schedule_micros_;
-  int64 kernel_compute_micros_;
-  int64 all_spent_micros_;
+
+  // device -> vector of {op_start_micros, op_kernel_exec_micros} pairs.
+  std::map<string, std::vector<std::pair<int64, int64>>> op_kernel_execs_;
+
+  std::set<string> devices_;
   int64 requested_bytes_;
   int64 float_ops_;
 };
@@ -128,7 +139,7 @@ class TFCodeNode {
  public:
   TFCodeNode(const string& trace)
       : trace_(trace),
-        kernel_compute_micros_(0),
+        kernel_exec_micros_(0),
         requested_bytes_(0),
         float_ops_(0) {}
 
@@ -138,16 +149,15 @@ class TFCodeNode {
     }
     nodes_[node->name()] = node;
 
-    kernel_compute_micros_ += node->kernel_compute_micros();
+    kernel_exec_micros_ += node->kernel_exec_micros();
     requested_bytes_ += node->requested_bytes();
     float_ops_ += node->float_ops();
     op_types_.insert(node->op_types().begin(), node->op_types().end());
     if (node->shape().size() > 0) {
       shapes_.push_back(node->shape());
     }
-    if (!node->device().empty()) {
-      devices_.insert(node->device());
-    }
+    std::set<string> devices = node->devices();
+    devices_.insert(devices.begin(), devices.end());
   }
   const std::map<string, const TFGraphNode*>& graph_nodes() const {
     return nodes_;
@@ -165,7 +175,7 @@ class TFCodeNode {
 
   const string& name() const { return trace_; }
 
-  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
+  int64 kernel_exec_micros() const { return kernel_exec_micros_; }
 
   int64 requested_bytes() const { return requested_bytes_; }
 
@@ -180,7 +190,7 @@ class TFCodeNode {
  private:
   const string trace_;
   std::set<string> op_types_;
-  int64 kernel_compute_micros_;
+  int64 kernel_exec_micros_;
   int64 requested_bytes_;
   int64 float_ops_;
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node_show.cc b/tensorflow/tools/tfprof/internal/tfprof_node_show.cc
new file mode 100644
index 0000000000..2b5390676d
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_node_show.cc
@@ -0,0 +1,296 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
+
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+
+namespace tensorflow {
+namespace tfprof {
+ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
+  ReInit();
+}
+
+void ShowNode::ReInit() {
+  mutable_proto()->set_name(name());
+  for (const string& device : node->devices()) {
+    *mutable_proto()->mutable_devices()->Add() = device;
+  }
+  mutable_proto()->set_exec_micros(node->kernel_exec_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shape().empty()) {
+    int64 params = 1;
+    bool complete_shape = true;
+    for (int64 d : node->shape()) {
+      // Sometimes parameters could be <0 when a dim is unknown.
+      if (d < 0) {
+        complete_shape = false;
+        break;
+      }
+      params *= d;
+    }
+    if (complete_shape) {
+      mutable_proto()->set_parameters(proto_.parameters() + params);
+    } else {
+      fprintf(stderr, "Incomplete shape.");
+    }
+  }
+}
+
+string ShowNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    const string shape = FormatShapes(node->shape());
+    if (!shape.empty()) {
+      info.push_back(shape);
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (proto().devices_size() > 0) {
+      info.push_back(str_util::Join(proto().devices(), "|"));
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    if (proto().devices_size() > 0) {
+      op_types.insert(str_util::Join(proto().devices(), "|"));
+    }
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
+
+const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
+
+void ShowNode::AggregateTotalStats(ShowNode* node) {
+  TFGraphNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
+
+ShowCodeNode::ShowCodeNode(const TFCodeNode* node) : node(node), account(true) {
+  std::vector<ScopeNode> snodes;
+  for (auto it : node->graph_nodes()) {
+    ScopeNode snode(it.second);
+    snodes.push_back(snode);
+    snodes[snodes.size() - 1].AddSelfToTotalStats();
+    *mutable_proto()->mutable_graph_nodes()->Add() =
+        snodes[snodes.size() - 1].proto();
+  }
+
+  mutable_proto()->set_name(name());
+  mutable_proto()->set_exec_micros(node->kernel_exec_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shapes().empty()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      int64 params = 1;
+      bool complete_shape = true;
+      for (int64 d : shape) {
+        // Sometimes parameters could be <0 when a dim is unknown.
+        if (d < 0) {
+          complete_shape = false;
+          break;
+        }
+        params *= d;
+      }
+      if (complete_shape) {
+        mutable_proto()->set_parameters(proto().parameters() + params);
+      } else {
+        fprintf(stderr, "Incomplete shape.");
+      }
+    }
+  }
+}
+
+string ShowCodeNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowCodeNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  std::vector<string> shapes;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      if (!shape.empty()) {
+        shapes.push_back(FormatShapes(shape));
+      }
+    }
+    if (!shapes.empty()) {
+      info.push_back(str_util::Join(shapes, "|"));
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (!node->devices().empty()) {
+      info.push_back(str_util::Join(node->devices(), "|"));
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    op_types.insert(node->devices().cbegin(), node->devices().cend());
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
+
+const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
+
+void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
+  TFCodeNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowCodeNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowCodeNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node_show.h b/tensorflow/tools/tfprof/internal/tfprof_node_show.h
new file mode 100644
index 0000000000..4ce0f63f9b
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_node_show.h
@@ -0,0 +1,173 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Nodes used for different views.
+// ScopeNode is for scope view. GraphNode is for graph view and CodeNode
+// is for code view.
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+class ShowNode {
+ public:
+  explicit ShowNode(const TFGraphNode* node);
+  virtual ~ShowNode() {}
+
+  const string& name() const { return node->name(); }
+  TFGraphNodeProto* mutable_proto();
+  const TFGraphNodeProto& proto() const;
+
+  void ReInit();
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFGraphNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFGraphNodeProto proto_;
+};
+
+class GraphNode : public ShowNode {
+ public:
+  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
+    mutable_proto()->set_inputs(node->inputs().size());
+    mutable_proto()->set_total_inputs(0);
+  }
+
+  void ReInit() {
+    ShowNode::ReInit();
+    mutable_proto()->set_inputs(node->inputs().size());
+    mutable_proto()->set_total_inputs(0);
+  }
+
+  void AggregateTotalStats(GraphNode* node) {
+    ShowNode::AggregateTotalStats(node);
+    mutable_proto()->set_total_inputs(proto().total_inputs() +
+                                      node->proto().total_inputs() + 1);
+  }
+
+  void AddSelfToTotalStats() {
+    ShowNode::AddSelfToTotalStats();
+    mutable_proto()->set_total_inputs(proto().total_inputs() +
+                                      proto().inputs());
+  }
+
+  void ResetTotalStats() {
+    ShowNode::ResetTotalStats();
+    mutable_proto()->set_total_inputs(0);
+    show_children.clear();
+  }
+
+  std::vector<GraphNode*> children;
+  std::vector<GraphNode*> show_children;
+};
+
+class ScopeNode : public ShowNode {
+ public:
+  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
+  ~ScopeNode() override {}
+
+  void ReInit() { ShowNode::ReInit(); }
+
+  void AggregateTotalStats(ScopeNode* node) {
+    ShowNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() {
+    ShowNode::ResetTotalStats();
+    show_children.clear();
+  }
+
+  std::vector<ScopeNode*> children;
+  std::vector<ScopeNode*> show_children;
+};
+
+class ShowCodeNode {
+ public:
+  explicit ShowCodeNode(const TFCodeNode* node);
+  virtual ~ShowCodeNode() {}
+
+  const string& name() const { return node->name(); }
+  TFCodeNodeProto* mutable_proto();
+  const TFCodeNodeProto& proto() const;
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFCodeNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowCodeNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFCodeNodeProto proto_;
+};
+
+class CodeNode : public ShowCodeNode {
+ public:
+  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
+  ~CodeNode() override {}
+
+  void AggregateTotalStats(CodeNode* node) {
+    ShowCodeNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() {
+    ShowCodeNode::ResetTotalStats();
+    show_children.clear();
+  }
+
+  std::vector<CodeNode*> children;
+  std::vector<CodeNode*> show_children;
+};
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.cc b/tensorflow/tools/tfprof/internal/tfprof_options.cc
index 03282533ff..f592a4cf8c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.cc
@@ -17,16 +17,133 @@ limitations under the License.
 
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/tfprof_options.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
+namespace {
+string KeyValueToStr(const std::map<string, string>& kv_map) {
+  std::vector<string> kv_vec;
+  kv_vec.reserve(kv_map.size());
+  for (const auto& pair : kv_map) {
+    kv_vec.push_back(strings::StrCat(pair.first, "=", pair.second));
+  }
+  return str_util::Join(kv_vec, ",");
+}
+}  // namespace
+
+tensorflow::Status ParseOutput(const string& output_opt, string* output_type,
+                               std::map<string, string>* output_options) {
+  // The default is to use stdout.
+  if (output_opt.empty()) {
+    *output_type = kOutput[1];
+    return tensorflow::Status::OK();
+  }
+
+  std::set<string> output_types(kOutput,
+                                kOutput + sizeof(kOutput) / sizeof(*kOutput));
+  auto opt_split = output_opt.find(":");
+  std::vector<string> kv_split;
+  if (opt_split == output_opt.npos) {
+    if (output_types.find(output_opt) == output_types.end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("E.g. Unknown output type: %s, Valid types: %s\n",
+                          output_opt.c_str(),
+                          str_util::Join(output_types, ",").c_str()));
+    }
+    *output_type = output_opt;
+  } else {
+    *output_type = output_opt.substr(0, opt_split);
+    if (output_types.find(*output_type) == output_types.end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("E.g. Unknown output type: %s, Valid types: %s\n",
+                          output_type->c_str(),
+                          str_util::Join(output_types, ",").c_str()));
+    }
+    kv_split = str_util::Split(output_opt.substr(opt_split + 1), ",",
+                               str_util::SkipEmpty());
+  }
 
-Options Options::FromProtoStr(const string& opts_proto_str) {
+  std::set<string> valid_options;
+  std::set<string> required_options;
+  if (*output_type == kOutput[0]) {
+    valid_options.insert(
+        kTimelineOpts,
+        kTimelineOpts + sizeof(kTimelineOpts) / sizeof(*kTimelineOpts));
+    required_options.insert(
+        kTimelineRequiredOpts,
+        kTimelineRequiredOpts +
+            sizeof(kTimelineRequiredOpts) / sizeof(*kTimelineRequiredOpts));
+  } else if (*output_type == kOutput[2]) {
+    valid_options.insert(kFileOpts,
+                         kFileOpts + sizeof(kFileOpts) / sizeof(*kFileOpts));
+    required_options.insert(kFileRequiredOpts,
+                            kFileRequiredOpts + sizeof(kFileRequiredOpts) /
+                                                    sizeof(*kFileRequiredOpts));
+  }
+
+  for (const string& kv_str : kv_split) {
+    const std::vector<string> kv =
+        str_util::Split(kv_str, "=", str_util::SkipEmpty());
+    if (kv.size() != 2) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          "Visualize format: -output timeline:key=value,key=value,...");
+    }
+    if (valid_options.find(kv[0]) == valid_options.end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("Unrecognized options %s for output_type: %s\n",
+                          kv[0].c_str(), output_type->c_str()));
+    }
+    (*output_options)[kv[0]] = kv[1];
+  }
+
+  for (const string& opt : required_options) {
+    if (output_options->find(opt) == output_options->end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("Missing required output_options for %s\n"
+                          "E.g. -output %s:%s=...\n",
+                          output_type->c_str(), output_type->c_str(),
+                          opt.c_str()));
+    }
+  }
+  return tensorflow::Status::OK();
+}
+
+tensorflow::Status Options::FromProtoStr(const string& opts_proto_str,
+                                         Options* opts) {
   OptionsProto opts_pb;
-  CHECK(opts_pb.ParseFromString(opts_proto_str));
-  Options opts(
+  if (!opts_pb.ParseFromString(opts_proto_str)) {
+    return tensorflow::Status(
+        tensorflow::error::INTERNAL,
+        strings::StrCat("Failed to parse option string from Python API: ",
+                        opts_proto_str));
+  }
+
+  string output_type;
+  std::map<string, string> output_options;
+  tensorflow::Status s =
+      ParseOutput(opts_pb.output(), &output_type, &output_options);
+  if (!s.ok()) return s;
+
+  if (!opts_pb.dump_to_file().empty()) {
+    fprintf(stderr,
+            "-dump_to_file option is deprecated. "
+            "Please use -output file:outfile=<filename>\n");
+    fprintf(stderr, "-output %s is overwritten with -output file:outfile=%s\n",
+            opts_pb.output().c_str(), opts_pb.dump_to_file().c_str());
+    output_type = kOutput[2];
+    output_options.clear();
+    output_options[kFileOpts[0]] = opts_pb.dump_to_file();
+  }
+
+  *opts = Options(
       opts_pb.max_depth(), opts_pb.min_bytes(), opts_pb.min_micros(),
       opts_pb.min_params(), opts_pb.min_float_ops(),
       std::vector<string>(opts_pb.device_regexes().begin(),
@@ -44,8 +161,8 @@ Options Options::FromProtoStr(const string& opts_proto_str) {
                           opts_pb.hide_name_regexes().end()),
       opts_pb.account_displayed_op_only(),
       std::vector<string>(opts_pb.select().begin(), opts_pb.select().end()),
-      opts_pb.viz(), opts_pb.dump_to_file());
-  return opts;
+      output_type, output_options);
+  return tensorflow::Status::OK();
 }
 
 string Options::ToString() const {
@@ -64,8 +181,7 @@ string Options::ToString() const {
       "%-28s%s\n"
       "%-28s%s\n"
       "%-28s%s\n"
-      "%-28s%s\n"
-      "%-28s%s\n",
+      "%-28s%s:%s\n",
       kOptions[0], max_depth, kOptions[1], min_bytes, kOptions[2], min_micros,
       kOptions[3], min_params, kOptions[4], min_float_ops, kOptions[5],
       str_util::Join(device_regexes, ",").c_str(), kOptions[6],
@@ -76,8 +192,8 @@ string Options::ToString() const {
       str_util::Join(show_name_regexes, ",").c_str(), kOptions[11],
       str_util::Join(hide_name_regexes, ",").c_str(), kOptions[12],
       (account_displayed_op_only ? "true" : "false"), kOptions[13],
-      str_util::Join(select, ",").c_str(), kOptions[14],
-      (viz ? "true" : "false"), kOptions[15], dump_to_file.c_str());
+      str_util::Join(select, ",").c_str(), kOptions[14], output_type.c_str(),
+      KeyValueToStr(output_options).c_str());
   return s;
 }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.h b/tensorflow/tools/tfprof/internal/tfprof_options.h
index 0a9f2768e0..cf48b4de81 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.h
@@ -22,6 +22,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/status.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -40,8 +41,7 @@ static const char* const kOptions[] = {
     "-hide_name_regexes",
     "-account_displayed_op_only",
     "-select",
-    "-viz",
-    "-dump_to_file",
+    "-output",
 };
 
 static const char* const kOrderBy[] = {
@@ -58,11 +58,30 @@ static const char* const kCmds[] = {
     "scope", "graph", "code", "set", "help",
 };
 
+static const char* const kOutput[] = {"timeline", "stdout", "file"};
+
+static const char* const kTimelineOpts[] = {
+    "outfile",
+};
+
+static const char* const kTimelineRequiredOpts[] = {"outfile"};
+
+static const char* const kFileOpts[] = {
+    "outfile",
+};
+
+static const char* const kFileRequiredOpts[] = {
+    "outfile",
+};
+
 struct Options {
  public:
-  static Options FromProtoStr(const string& opts_proto_str);
+  static tensorflow::Status FromProtoStr(const string& opts_proto_str,
+                                         Options* opts);
 
   virtual ~Options() {}
+  Options()
+      : Options(0, 0, 0, 0, 0, {}, "", {}, {}, {}, {}, {}, false, {}, "", {}) {}
   Options(int max_depth, tensorflow::int64 min_bytes,
           tensorflow::int64 min_micros, tensorflow::int64 min_params,
           tensorflow::int64 min_float_ops,
@@ -73,7 +92,8 @@ struct Options {
           const std::vector<string>& show_name_regexes,
           const std::vector<string>& hide_name_regexes,
           bool account_displayed_op_only, const std::vector<string>& select,
-          bool viz, const string& dump_to_file = "")
+          const string& output_type,
+          const std::map<string, string>& output_options)
       : max_depth(max_depth),
         min_bytes(min_bytes),
         min_micros(min_micros),
@@ -88,8 +108,8 @@ struct Options {
         hide_name_regexes(hide_name_regexes),
         account_displayed_op_only(account_displayed_op_only),
         select(select.begin(), select.end()),
-        viz(viz),
-        dump_to_file(dump_to_file) {}
+        output_type(output_type),
+        output_options(output_options) {}
 
   string ToString() const;
 
@@ -109,10 +129,17 @@ struct Options {
   bool account_displayed_op_only;
 
   std::set<string> select;
-  bool viz;
-  string dump_to_file;
+
+  string output_type;
+  std::map<string, string> output_options;
 };
 
+// Parse the -output option.
+// 'output_opt': User input string with format: output_type:key=value,key=value.
+// 'output_type' and 'output_options' are extracted from 'output_opt'.
+tensorflow::Status ParseOutput(const string& output_opt, string* output_type,
+                               std::map<string, string>* output_options);
+
 }  // namespace tfprof
 }  // namespace tensorflow
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.cc b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
index b4aef717c8..fe525c4bd8 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
@@ -72,7 +72,7 @@ void TFScope::Build() {
   }
 }
 
-const ShowNode* TFScope::ShowInternal(const Options& opts) {
+const ShowNode* TFScope::ShowInternal(const Options& opts, Timeline* timeline) {
   // Search from roots recursively to find start node, if start_name_regexes
   // is specified.
   std::vector<ScopeNode*> roots = roots_;
@@ -86,6 +86,9 @@ const ShowNode* TFScope::ShowInternal(const Options& opts) {
   Account({root}, opts);
 
   root = PrintScope({root}, opts, 1, 0)[0];
+  if (timeline) {
+    timeline->GenerateScopeTimeline(root);
+  }
   return root;
 }
 
@@ -139,8 +142,13 @@ std::vector<ScopeNode*> TFScope::PrintScope(const std::vector<ScopeNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (ScopeNode* sc : show_cnodes) {
-        children_str += sc->formatted_str;
+        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
+          children_str += sc->formatted_str;
+          sc->formatted_str.clear();
+        }
         node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        sc->mutable_proto()->mutable_children()->Clear();
+        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.h b/tensorflow/tools/tfprof/internal/tfprof_scope.h
index 2e2e4f5266..7bdcc794cd 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.h
@@ -37,22 +37,6 @@ limitations under the License.
 namespace tensorflow {
 namespace tfprof {
 
-class ScopeNode : public ShowNode {
- public:
-  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
-  ~ScopeNode() override {}
-
-  void AggregateTotalStats(ScopeNode* node) {
-    ShowNode::AggregateTotalStats(node);
-  }
-
-  void AddSelfToTotalStats() { ShowNode::AddSelfToTotalStats(); }
-
-  void ResetTotalStats() { ShowNode::ResetTotalStats(); }
-
-  std::vector<ScopeNode*> children;
-};
-
 class TFScope : public TFShow {
  public:
   explicit TFScope(checkpoint::CheckpointReader* ckpt_reader)
@@ -64,7 +48,8 @@ class TFScope : public TFShow {
   void Build() override;
 
  private:
-  const ShowNode* ShowInternal(const Options& opts) override;
+  const ShowNode* ShowInternal(const Options& opts,
+                               Timeline* timeline) override;
 
   ScopeNode* CreateParentNode(const string& name);
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.cc b/tensorflow/tools/tfprof/internal/tfprof_show.cc
index 932dfb3893..b96db5468e 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.cc
@@ -18,155 +18,32 @@ limitations under the License.
 #include <memory>
 #include <set>
 
-#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/regexp.h"
 
 namespace tensorflow {
 namespace tfprof {
-ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
-  mutable_proto()->set_name(name());
-  if (!node->device().empty()) {
-    mutable_proto()->set_device(node->device());
-  }
-  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
-  mutable_proto()->set_float_ops(node->float_ops());
-
-  if (!node->shape().empty()) {
-    int64 params = 1;
-    bool complete_shape = true;
-    for (int64 d : node->shape()) {
-      // Sometimes parameters could be <0 when a dim is unknown.
-      if (d < 0) {
-        complete_shape = false;
-        break;
-      }
-      params *= d;
-    }
-    if (complete_shape) {
-      mutable_proto()->set_parameters(proto_.parameters() + params);
-    } else {
-      fprintf(stderr, "Incomplete shape.");
-    }
-  }
-}
-
-string ShowNode::Format(const Options& opts) {
-  if (opts.select.empty()) {
-    return name();
-  }
-  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
-}
-
-string ShowNode::FormatMeta(const Options& opts) {
-  std::vector<string> info;
-  if (opts.select.find(kShown[2]) != opts.select.end()) {
-    const string shape = FormatShapes(node->shape());
-    if (!shape.empty()) {
-      info.push_back(shape);
-    }
-    string params = FormatNumber(proto().total_parameters()) + " params";
-    if (account) {
-      params = FormatNumber(proto().parameters()) + "/" + params;
-    } else {
-      params = "--/" + params;
-    }
-    info.push_back(params);
-  }
-  if (opts.select.find(kShown[3]) != opts.select.end()) {
-    string fops = FormatNumber(proto().total_float_ops()) + " flops";
-    if (account) {
-      fops = FormatNumber(proto().float_ops()) + "/" + fops;
-    } else {
-      fops = "--/" + fops;
-    }
-    info.push_back(fops);
-  }
-  if (opts.select.find(kShown[0]) != opts.select.end()) {
-    string memory = FormatMemory(proto().total_requested_bytes());
-    if (account) {
-      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
-
-    } else {
-      memory = "--/" + memory;
-    }
-    info.push_back(memory);
-  }
-  if (opts.select.find(kShown[1]) != opts.select.end()) {
-    string time = FormatTime(proto().total_exec_micros());
-    if (account) {
-      time = FormatTime(proto().exec_micros()) + "/" + time;
-    } else {
-      time = "--/" + time;
-    }
-    info.push_back(time);
-  }
-  if (opts.select.find(kShown[6]) != opts.select.end()) {
-    if (!proto().device().empty()) {
-      info.push_back(proto().device());
-    }
-  }
-  if (opts.select.find(kShown[7]) != opts.select.end()) {
-    std::set<string> op_types = node->op_types();
-    // Device is considered a type.
-    if (!proto().device().empty()) {
-      op_types.insert(proto().device());
-    }
-    info.push_back(str_util::Join(op_types, "|"));
-  }
-  return str_util::Join(info, ", ");
-}
-
-TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
-
-const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
-
-void ShowNode::AggregateTotalStats(ShowNode* node) {
-  TFGraphNodeProto* node_pb = node->mutable_proto();
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         node_pb->total_exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             node_pb->total_requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        node_pb->total_parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       node_pb->total_float_ops());
-}
-
-void ShowNode::AddSelfToTotalStats() {
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         proto().exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             proto().requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        proto().parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       proto().float_ops());
-}
-
-void ShowNode::ResetTotalStats() {
-  mutable_proto()->set_total_exec_micros(0);
-  mutable_proto()->set_total_requested_bytes(0);
-  mutable_proto()->set_total_parameters(0);
-  mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
-}
 
 const TFGraphNodeProto& TFShow::Show(const Options& opts) {
-  const ShowNode* root = ShowInternal(opts);
-  if (opts.dump_to_file.empty()) {
-    printf("%s", root->formatted_str.c_str());
-    fflush(stdout);
-  } else {
-    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
-                                 root->formatted_str);
+  if (opts.output_type == kOutput[0]) {
+    Timeline timeline(opts.output_options.at(kTimelineOpts[0]));
+    return ShowInternal(opts, &timeline)->proto();
+  } else if (opts.output_type == kOutput[2]) {
+    const ShowNode* root = ShowInternal(opts, nullptr);
+    Status s =
+        WriteStringToFile(Env::Default(), opts.output_options.at(kFileOpts[0]),
+                          root->formatted_str);
     if (!s.ok()) {
       fprintf(stderr, "%s\n", s.ToString().c_str());
     }
+    return root->proto();
+  } else {
+    const ShowNode* root = ShowInternal(opts, nullptr);
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+    return root->proto();
   }
-  return root->proto();
 }
 
 bool TFShow::LookUpCheckPoint(const string& name,
@@ -206,10 +83,13 @@ bool TFShow::ShouldShow(ShowNode* node, const Options& opts, int depth) {
     show = true;
   } else {
     for (const string& regex : opts.device_regexes) {
-      if (RE2::FullMatch(node->proto().device(), regex)) {
-        show = true;
-        break;
+      for (const string& device : node->proto().devices()) {
+        if (RE2::FullMatch(device, regex)) {
+          show = true;
+          break;
+        }
       }
+      if (show) break;
     }
   }
   // Don't show if device_regexes don't cover it.
@@ -255,11 +135,11 @@ bool TFShow::ShouldAccount(ShowNode* node, const Options& opts) {
         return true;
       }
     }
-    if (RE2::FullMatch(node->proto().device(), regex)) {
-      return true;
-    }
+    for (const string& device : node->proto().devices())
+      if (RE2::FullMatch(device, regex)) {
+        return true;
+      }
   }
-
   return false;
 }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.h b/tensorflow/tools/tfprof/internal/tfprof_show.h
index 5e85b81a72..803b301044 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.h
@@ -28,40 +28,15 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
-class ShowNode {
- public:
-  explicit ShowNode(const TFGraphNode* node);
-  virtual ~ShowNode() {}
-
-  const string& name() const { return node->name(); }
-  TFGraphNodeProto* mutable_proto();
-  const TFGraphNodeProto& proto() const;
-
-  string Format(const Options& opts);
-
-  string FormatMeta(const Options& opts);
-
-  const TFGraphNode* node;
-  bool account;
-  string formatted_str;
-
- protected:
-  void AggregateTotalStats(ShowNode* node);
-
-  void AddSelfToTotalStats();
-
-  void ResetTotalStats();
-
-  TFGraphNodeProto proto_;
-};
-
 class TFShow {
  public:
   explicit TFShow(checkpoint::CheckpointReader* ckpt_reader)
@@ -72,7 +47,8 @@ class TFShow {
   const TFGraphNodeProto& Show(const Options& opts);
 
  protected:
-  virtual const ShowNode* ShowInternal(const Options& opts) = 0;
+  virtual const ShowNode* ShowInternal(const Options& opts,
+                                       Timeline* timeline) = 0;
 
   bool LookUpCheckPoint(const string& name,
                         std::unique_ptr<TFProfTensor>* tensor);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
index 17c0073c7e..cfec09ad19 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
@@ -26,159 +26,26 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-ShowCodeNode::ShowCodeNode(const TFCodeNode* node) : node(node), account(true) {
-  std::vector<ScopeNode> snodes;
-  for (auto it : node->graph_nodes()) {
-    ScopeNode snode(it.second);
-    snodes.push_back(snode);
-    snodes[snodes.size() - 1].AddSelfToTotalStats();
-    *mutable_proto()->mutable_graph_nodes()->Add() =
-        snodes[snodes.size() - 1].proto();
-  }
-
-  mutable_proto()->set_name(name());
-  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
-  mutable_proto()->set_float_ops(node->float_ops());
-
-  if (!node->shapes().empty()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      int64 params = 1;
-      bool complete_shape = true;
-      for (int64 d : shape) {
-        // Sometimes parameters could be <0 when a dim is unknown.
-        if (d < 0) {
-          complete_shape = false;
-          break;
-        }
-        params *= d;
-      }
-      if (complete_shape) {
-        mutable_proto()->set_parameters(proto().parameters() + params);
-      } else {
-        fprintf(stderr, "Incomplete shape.");
-      }
-    }
-  }
-}
-
-string ShowCodeNode::Format(const Options& opts) {
-  if (opts.select.empty()) {
-    return name();
-  }
-  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
-}
-
-string ShowCodeNode::FormatMeta(const Options& opts) {
-  std::vector<string> info;
-  std::vector<string> shapes;
-  if (opts.select.find(kShown[2]) != opts.select.end()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      if (!shape.empty()) {
-        shapes.push_back(FormatShapes(shape));
-      }
-    }
-    if (!shapes.empty()) {
-      info.push_back(str_util::Join(shapes, "|"));
-    }
-    string params = FormatNumber(proto().total_parameters()) + " params";
-    if (account) {
-      params = FormatNumber(proto().parameters()) + "/" + params;
-    } else {
-      params = "--/" + params;
-    }
-    info.push_back(params);
-  }
-  if (opts.select.find(kShown[3]) != opts.select.end()) {
-    string fops = FormatNumber(proto().total_float_ops()) + " flops";
-    if (account) {
-      fops = FormatNumber(proto().float_ops()) + "/" + fops;
-    } else {
-      fops = "--/" + fops;
-    }
-    info.push_back(fops);
-  }
-  if (opts.select.find(kShown[0]) != opts.select.end()) {
-    string memory = FormatMemory(proto().total_requested_bytes());
-    if (account) {
-      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
-
-    } else {
-      memory = "--/" + memory;
-    }
-    info.push_back(memory);
-  }
-  if (opts.select.find(kShown[1]) != opts.select.end()) {
-    string time = FormatTime(proto().total_exec_micros());
-    if (account) {
-      time = FormatTime(proto().exec_micros()) + "/" + time;
-    } else {
-      time = "--/" + time;
-    }
-    info.push_back(time);
-  }
-  if (opts.select.find(kShown[6]) != opts.select.end()) {
-    if (!node->devices().empty()) {
-      info.push_back(str_util::Join(node->devices(), "|"));
-    }
-  }
-  if (opts.select.find(kShown[7]) != opts.select.end()) {
-    std::set<string> op_types = node->op_types();
-    // Device is considered a type.
-    op_types.insert(node->devices().cbegin(), node->devices().cend());
-    info.push_back(str_util::Join(op_types, "|"));
-  }
-  return str_util::Join(info, ", ");
-}
-
-TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
-
-const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
-
-void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
-  TFCodeNodeProto* node_pb = node->mutable_proto();
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         node_pb->total_exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             node_pb->total_requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        node_pb->total_parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       node_pb->total_float_ops());
-}
-
-void ShowCodeNode::AddSelfToTotalStats() {
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         proto().exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             proto().requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        proto().parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       proto().float_ops());
-}
-
-void ShowCodeNode::ResetTotalStats() {
-  mutable_proto()->set_total_exec_micros(0);
-  mutable_proto()->set_total_requested_bytes(0);
-  mutable_proto()->set_total_parameters(0);
-  mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
-}
 
 const TFCodeNodeProto& TFShowCode::Show(const Options& opts) {
-  const ShowCodeNode* root = ShowInternal(opts);
-  if (opts.dump_to_file.empty()) {
-    printf("%s", root->formatted_str.c_str());
-    fflush(stdout);
-  } else {
-    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
-                                 root->formatted_str);
+  if (opts.output_type == kOutput[0]) {
+    Timeline timeline(opts.output_options.at(kTimelineOpts[0]));
+    return ShowInternal(opts, &timeline)->proto();
+  } else if (opts.output_type == kOutput[2]) {
+    const ShowCodeNode* root = ShowInternal(opts, nullptr);
+    Status s =
+        WriteStringToFile(Env::Default(), opts.output_options.at(kFileOpts[0]),
+                          root->formatted_str);
     if (!s.ok()) {
       fprintf(stderr, "%s\n", s.ToString().c_str());
     }
+    return root->proto();
+  } else {
+    const ShowCodeNode* root = ShowInternal(opts, nullptr);
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+    return root->proto();
   }
-  return root->proto();
 }
 
 bool TFShowCode::ShouldShow(ShowCodeNode* node, const Options& opts,
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.h b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
index afe0fa4473..cbfd38945f 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-// Parent class and utilities for tfprof_graph and tfprof_scope.
+// Parent class and utilities for tfprof_code.
 
 #ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
 #define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
@@ -28,39 +28,15 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
-class ShowCodeNode {
- public:
-  explicit ShowCodeNode(const TFCodeNode* node);
-  virtual ~ShowCodeNode() {}
-
-  const string& name() const { return node->name(); }
-  TFCodeNodeProto* mutable_proto();
-  const TFCodeNodeProto& proto() const;
-
-  string Format(const Options& opts);
-
-  string FormatMeta(const Options& opts);
-
-  const TFCodeNode* node;
-  bool account;
-  string formatted_str;
-
- protected:
-  void AggregateTotalStats(ShowCodeNode* node);
-
-  void AddSelfToTotalStats();
-
-  void ResetTotalStats();
-
-  TFCodeNodeProto proto_;
-};
 
 class TFShowCode {
  public:
@@ -71,7 +47,8 @@ class TFShowCode {
   const TFCodeNodeProto& Show(const Options& opts);
 
  protected:
-  virtual const ShowCodeNode* ShowInternal(const Options& opts) = 0;
+  virtual const ShowCodeNode* ShowInternal(const Options& opts,
+                                           Timeline* timeline) = 0;
 
   bool LookUpCheckPoint(const string& name,
                         std::unique_ptr<TFProfTensor>* tensor);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_test.cc b/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
index ffaa576639..f0621c9af0 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
@@ -75,7 +75,7 @@ TEST_F(TFProfShowTest, DumpScopeMode) {
                {"VariableV2"},  // accout_type_regexes
                {".*"}, {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               false, dump_file);
+               "file", {{"outfile", dump_file}});
   tf_stats_->PrintGraph("scope", opts);
 
   string dump_str;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.cc b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
index 13ff6e7246..566b4cee44 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
@@ -19,6 +19,8 @@ limitations under the License.
 #include <utility>
 
 #include "tensorflow/core/framework/step_stats.pb.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -92,10 +94,16 @@ void TFStats::ParseGraph() {
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     const NodeDef* node_def = it->second.node_def();
     for (string node_input : node_def->input()) {
+      int output_idx = 0;
       // input name format can be: "^node:src_output"
       auto prefix_pos = node_input.find(":");
       if (prefix_pos != node_input.npos) {
-        node_input.substr(0, prefix_pos);
+        std::vector<string> input_parts = str_util::Split(node_input, ":");
+        CHECK(input_parts.size() == 2)
+            << "Unknown NodeDef.input format: " << node_input;
+        node_input = input_parts[0];
+        CHECK(strings::safe_strto32(input_parts[1], &output_idx))
+            << "Failed to parse integer: " << output_idx;
       }
       if (node_input.substr(0, 1) == "^") {
         node_input = node_input.substr(1);
@@ -104,7 +112,7 @@ void TFStats::ParseGraph() {
       if (input_node == nodes_map_.end()) {
         continue;
       }
-      it->second.AddInput(&input_node->second);
+      it->second.AddInput(&input_node->second, output_idx);
     }
   }
 }
@@ -137,21 +145,6 @@ void TFStats::ParseRunMeta() {
       node->second.AddStepStat(dev_stat.device(), &node_stat);
     }
   }
-
-  if (!run_meta_->has_cost_graph()) {
-    fprintf(stderr,
-            "Missing CostGraphDef in RunMetadata.\nMaybe you forget to"
-            "set tf.ConfigProto(graph_options=tf.GraphOptions("
-            "build_cost_model=1)) to Session()\n");
-  } else {
-    for (const auto& node_pb : run_meta_->cost_graph().node()) {
-      auto node = nodes_map_.find(node_pb.name());
-      if (node == nodes_map_.end()) {
-        continue;
-      }
-      node->second.AddNodeStat(&node_pb);
-    }
-  }
 }
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
index b913161f6a..eb01425e04 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
@@ -74,8 +74,8 @@ TEST_F(TFProfStatsTest, CustomOpType) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name",
                {kTrainableVarType},  // accout_type_regexes
                {".*"}, {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               false);
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "",
+               {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -84,20 +84,20 @@ TEST_F(TFProfStatsTest, CustomOpType) {
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
       "370\nchildren {\n  name: \"conv2d/bias\"\n  exec_micros: 1\n  "
       "requested_bytes: 20\n  parameters: 5\n  total_exec_micros: 1\n  "
-      "total_requested_bytes: 20\n  total_parameters: 5\n  device: "
+      "total_requested_bytes: 20\n  total_parameters: 5\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 0\n  "
       "total_float_ops: 0\n}\nchildren {\n  name: \"conv2d/kernel\"\n  "
       "exec_micros: 1\n  requested_bytes: 540\n  parameters: 135\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 540\n  total_parameters: "
-      "135\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "135\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/bias\"\n  "
       "exec_micros: 1\n  requested_bytes: 20\n  parameters: 5\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 20\n  total_parameters: "
-      "5\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "5\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/kernel\"\n  "
       "exec_micros: 2\n  requested_bytes: 900\n  parameters: 225\n  "
       "total_exec_micros: 2\n  total_requested_bytes: 900\n  total_parameters: "
-      "225\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "225\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nfloat_ops: 0\ntotal_float_ops: 0\n",
       &expected));
   EXPECT_EQ(expected.DebugString(), root.DebugString());
@@ -107,7 +107,7 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
   Options opts(
       3, 0, 0, 0, 0, {".*"}, "name", {kCkptVarType},  // accout_type_regexes
       {".*"}, {""}, {".*"}, {""}, false,
-      {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, false);
+      {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -116,20 +116,20 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
       "370\nchildren {\n  name: \"conv2d/bias\"\n  exec_micros: 1\n  "
       "requested_bytes: 20\n  parameters: 5\n  total_exec_micros: 1\n  "
-      "total_requested_bytes: 20\n  total_parameters: 5\n  device: "
+      "total_requested_bytes: 20\n  total_parameters: 5\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 0\n  "
       "total_float_ops: 0\n}\nchildren {\n  name: \"conv2d/kernel\"\n  "
       "exec_micros: 1\n  requested_bytes: 540\n  parameters: 135\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 540\n  total_parameters: "
-      "135\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "135\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/bias\"\n  "
       "exec_micros: 1\n  requested_bytes: 20\n  parameters: 5\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 20\n  total_parameters: "
-      "5\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "5\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/kernel\"\n  "
       "exec_micros: 2\n  requested_bytes: 900\n  parameters: 225\n  "
       "total_exec_micros: 2\n  total_requested_bytes: 900\n  total_parameters: "
-      "225\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "225\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nfloat_ops: 0\ntotal_float_ops: 0\n",
       &expected));
   EXPECT_EQ(expected.DebugString(), root.DebugString());
@@ -139,8 +139,8 @@ TEST_F(TFProfStatsTest, TestGraph) {
   Options opts(100, 0, 10000, 0, 0, {".*"}, "name", {".*"},
                {"cost.*"},  // start_name_regexes
                {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               false);
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "",
+               {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("graph", opts);
 
   TFGraphNodeProto expected;
@@ -154,7 +154,7 @@ TEST_F(TFProfStatsTest, TestGraph) {
 
 TEST_F(TFProfStatsTest, TestFloatOps) {
   Options opts(10, 0, 0, 0, 1, {".*"}, "name", {".*"}, {".*"}, {""}, {".*"},
-               {""}, false, {"float_ops"}, false);
+               {""}, false, {"float_ops"}, "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -163,19 +163,19 @@ TEST_F(TFProfStatsTest, TestFloatOps) {
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
       "8656\ntotal_parameters: 370\nchildren {\n  name: \"conv2d/BiasAdd\"\n  "
       "exec_micros: 12\n  requested_bytes: 1440\n  total_exec_micros: 12\n  "
-      "total_requested_bytes: 1440\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 1440\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 360\n  "
       "total_float_ops: 360\n}\nchildren {\n  name: \"conv2d/convolution\"\n  "
       "exec_micros: 60\n  requested_bytes: 1440\n  total_exec_micros: 60\n  "
-      "total_requested_bytes: 1440\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 1440\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 19440\n  "
       "total_float_ops: 19440\n}\nchildren {\n  name: \"conv2d_2/BiasAdd\"\n  "
       "exec_micros: 2\n  requested_bytes: 640\n  total_exec_micros: 2\n  "
-      "total_requested_bytes: 640\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 640\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 160\n  "
       "total_float_ops: 160\n}\nchildren {\n  name: \"conv2d_2/convolution\"\n "
       " exec_micros: 13\n  requested_bytes: 640\n  total_exec_micros: 13\n  "
-      "total_requested_bytes: 640\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 640\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 14400\n  "
       "total_float_ops: 14400\n}\nfloat_ops: 0\ntotal_float_ops: 34360\n",
       &expected));
@@ -186,7 +186,7 @@ TEST_F(TFProfStatsTest, TestAccountShownNameOnly) {
   Options opts(100, 0, 0, 0, 0, {".*"}, "name", {".*"}, {".*"}, {""},
                {"unit_2_1.*DW"},  // show_name_regexes.
                {""}, true,        // account_displayed_op_only.
-               {"params"}, false);
+               {"params"}, "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -202,7 +202,7 @@ TEST_F(TFProfStatsTest, TestShowTensorValue) {
   Options opts(10, 0, 0, 0, 0, {".*"}, "name", {".*"}, {".*"}, {""},
                {"unit_1_0.*gamma"}, {""}, false,
                {"tensor_value"},  // Show tensor value from checkpoint.
-               false);
+               "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
   TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
diff --git a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
index 95759f9d47..79a781210d 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
@@ -57,7 +57,7 @@ class TFProfTensorTest : public ::testing::Test {
 TEST_F(TFProfTensorTest, Basics) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name", {"VariableV2"}, {".*"}, {""},
                {".*"}, {""}, false, {"tensor_value"},  // show the tensor value.
-               false);
+               "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline.cc b/tensorflow/tools/tfprof/internal/tfprof_timeline.cc
new file mode 100644
index 0000000000..a5640c0e56
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_timeline.cc
@@ -0,0 +1,245 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
+
+#include <utility>
+
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+Json::Value ChromeTraceFormatter::CreateEvent(const string& ph,
+                                              const string& category,
+                                              const string& name, int64 pid,
+                                              int64 tid, int64 ts) {
+  Json::Value event(Json::objectValue);
+  event["ph"] = Json::Value(ph);
+  event["cat"] = Json::Value(category);
+  event["name"] = Json::Value(name);
+  event["pid"] = Json::Value(pid);
+  event["tid"] = Json::Value(tid);
+  event["ts"] = Json::Value(ts);
+  return event;
+}
+
+void ChromeTraceFormatter::EmitPID(const string& name, int64 pid) {
+  Json::Value event(Json::objectValue);
+  event["name"] = Json::Value("process_name");
+  event["ph"] = Json::Value("M");
+  event["pid"] = Json::Value(pid);
+  Json::Value args(Json::objectValue);
+  args["name"] = Json::Value(name);
+  event["args"] = args;
+  metadata_.push_back(event);
+}
+
+void ChromeTraceFormatter::EmitRegion(int64 ts, int64 duration, int64 pid,
+                                      int64 tid, const string& category,
+                                      const string& name, Json::Value args) {
+  Json::Value event = CreateEvent("X", category, name, pid, tid, ts);
+  event["dur"] = Json::Value(duration);
+  event["args"] = std::move(args);
+  metadata_.push_back(event);
+}
+
+void ChromeTraceFormatter::EmitFlowStart(const string& name, int64 ts,
+                                         int64 pid, int64 tid, int64 flow_id) {
+  Json::Value event = CreateEvent("s", "DataFlow", name, pid, tid, ts);
+  event["id"] = flow_id;
+  events_.push_back(event);
+}
+
+void ChromeTraceFormatter::EmitFlowEnd(const string& name, int64 ts, int64 pid,
+                                       int64 tid, int64 flow_id) {
+  Json::Value event = CreateEvent("t", "DataFlow", name, pid, tid, ts);
+  event["id"] = flow_id;
+  events_.push_back(event);
+}
+
+string ChromeTraceFormatter::Format() {
+  Json::Value trace;
+  trace["traceEvents"] = Json::Value(Json::arrayValue);
+  for (const Json::Value& v : metadata_) {
+    trace["traceEvents"].append(v);
+  }
+  for (const Json::Value& v : events_) {
+    trace["traceEvents"].append(v);
+  }
+  return trace.toStyledString();
+}
+
+void Timeline::GenerateGraphTimeline(const GraphNode* gnode) {
+  fprintf(stdout, "adding graph nodes.\n");
+  AddGraphNode(gnode);
+  AllocateLanes();
+  fprintf(stdout, "generating trace file.\n");
+  int64 flow_id = 1;
+  for (const auto& process : alloc_nodes_) {
+    for (const auto& lane : process.second) {
+      for (const auto& node : lane.second) {
+        TimeNode* tnode = node.second;
+
+        Json::Value args(Json::objectValue);
+        args["name"] = Json::Value(tnode->name);
+        args["op"] = Json::Value(tnode->name);
+        chrome_formatter_.EmitRegion(node.first, tnode->exec_micros,
+                                     process.first, lane.first, "Op",
+                                     tnode->name, args);
+
+        for (TimeNode* next_tnode : node.second->next_tnodes) {
+          chrome_formatter_.EmitFlowStart(
+              tnode->name + "_flow", tnode->start_micros + tnode->exec_micros,
+              process.first, lane.first, flow_id);
+          chrome_formatter_.EmitFlowEnd(
+              tnode->name + "_flow", next_tnode->start_micros,
+              next_tnode->process->pid, next_tnode->tid, flow_id);
+          flow_id += 1;
+        }
+      }
+    }
+  }
+  OutputTimeline();
+}
+
+void Timeline::GenerateScopeTimeline(const ScopeNode* node) {
+  std::set<int64> visited_depth;
+  EmitTreeNode(node, 0, node->proto().total_exec_micros(), 0, &visited_depth);
+  OutputTimeline();
+}
+
+void Timeline::GenerateCodeTimeline(const CodeNode* node) {
+  std::set<int64> visited_depth;
+  EmitTreeNode(node, 0, node->proto().total_exec_micros(), 0, &visited_depth);
+  OutputTimeline();
+}
+
+void Timeline::OutputTimeline() {
+  Status s =
+      WriteStringToFile(Env::Default(), outfile_, chrome_formatter_.Format());
+  if (!s.ok()) {
+    fprintf(stderr, "Failed to write timeline file: %s\nError: %s\n",
+            outfile_.c_str(), s.ToString().c_str());
+    return;
+  }
+  fprintf(stdout, "\n******************************************************\n");
+  fprintf(stdout,
+          "Timeline file is written to %s.\n"
+          "Open a Chrome browser, enter URL chrome://tracing and "
+          "load the timeline file.",
+          outfile_.c_str());
+  fprintf(stdout, "\n******************************************************\n");
+  fflush(stdout);
+}
+
+std::vector<TimeNode*> Timeline::AddGraphNode(const GraphNode* gnode) {
+  std::vector<TimeNode*> tnodes;
+  if (!gnode) return tnodes;
+
+  std::vector<TimeNode*> shown_cinputs;
+  for (GraphNode* schild : gnode->show_children) {
+    std::vector<TimeNode*> inputs = AddGraphNode(schild);
+    shown_cinputs.insert(shown_cinputs.end(), inputs.begin(), inputs.end());
+  }
+  if (!gnode->node->step_stats()) {
+    return shown_cinputs;
+  }
+
+  const TFGraphNode* node = gnode->node;
+  for (const auto& kernel_execs : node->op_kernel_execs()) {
+    const string& device = kernel_execs.first;
+    const std::vector<std::pair<int64, int64>>& execs = kernel_execs.second;
+
+    if (process_.find(device) == process_.end()) {
+      int64 pid = AllocatePID();
+      process_[device].reset(new Process(pid));
+      chrome_formatter_.EmitPID(device, pid);
+    }
+    Process* p = process_[device].get();
+
+    for (const auto& exec : execs) {
+      int64 start_micros = exec.first;
+      int64 exec_micros = exec.second;
+      // TODO(xpan): There might be start time duplication here.
+      if (tnodes_[device].find(start_micros) == tnodes_[device].end()) {
+        // TODO(xpan): Give each kernel call a unique_name.
+        tnodes_[device][start_micros].reset(
+            new TimeNode(p, node->name(), start_micros, exec_micros));
+      }
+      TimeNode* tnode_ptr = tnodes_[device][start_micros].get();
+
+      for (int i = 0; i < shown_cinputs.size(); i++) {
+        shown_cinputs[i]->next_tnodes.push_back(tnode_ptr);
+      }
+      tnodes.push_back(tnode_ptr);
+    }
+  }
+  return tnodes;
+}
+
+void Timeline::AllocateLanes() {
+  for (auto& process : tnodes_) {
+    Process* p = process_[process.first].get();
+    for (auto& tnode : process.second) {
+      int64 start_time = tnode.second->start_micros;
+      int64 end_time = tnode.second->exec_micros - 1;
+
+      int64 l = -1;
+      for (int i = 0; i < p->lanes.size(); ++i) {
+        const auto& lane = p->lanes[i];
+        auto cur_it = lane.lower_bound(start_time);
+        if (cur_it == lane.end()) {
+          --cur_it;
+        }
+        l = i;
+        for (; cur_it != lane.begin(); --cur_it) {
+          if (cur_it->second < start_time) {
+            break;
+          }
+          if (cur_it->first <= end_time) {
+            l = -1;
+            break;
+          }
+        }
+        if (l >= 0) {
+          break;
+        }
+      }
+      if (l < 0) {
+        l = p->lanes.size();
+        std::map<int64, int64> nlane;
+        nlane[start_time] = end_time;
+        p->lanes.push_back(nlane);
+      } else {
+        p->lanes[l][start_time] = end_time;
+      }
+      tnode.second->tid = l;
+      alloc_nodes_[p->pid][l][start_time] = tnode.second.get();
+    }
+  }
+}
+
+int64 Timeline::AllocatePID() {
+  int64 cur_pid = next_pid_;
+  next_pid_ += 1;
+  return cur_pid;
+}
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline.h b/tensorflow/tools/tfprof/internal/tfprof_timeline.h
new file mode 100644
index 0000000000..3d26874abd
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_timeline.h
@@ -0,0 +1,147 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
+
+#include "include/json/json.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/step_stats.pb.h"
+#include "tensorflow/core/protobuf/config.pb.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+typedef std::map<string, string> Event;
+
+class ChromeTraceFormatter {
+ public:
+  ChromeTraceFormatter() {}
+
+  Json::Value CreateEvent(const string& ph, const string& category,
+                          const string& name, int64 pid, int64 tid, int64 ts);
+
+  void EmitPID(const string& name, int64 pid);
+
+  void EmitRegion(int64 ts, int64 duration, int64 pid, int64 tid,
+                  const string& category, const string& name, Json::Value args);
+
+  void EmitFlowStart(const string& name, int64 ts, int64 pid, int64 tid,
+                     int64 flow_id);
+
+  void EmitFlowEnd(const string& name, int64 ts, int64 pid, int64 tid,
+                   int64 flow_id);
+
+  string Format();
+
+ private:
+  std::vector<Json::Value> events_;
+  std::vector<Json::Value> metadata_;
+};
+
+class Process {
+ public:
+  Process(int64 pid) : pid(pid) {}
+
+  // Each lane is a map from start_time to end_time.
+  std::vector<std::map<int64, int64>> lanes;
+  int64 pid;
+};
+
+class TimeNode {
+ public:
+  TimeNode(Process* process, const string& name, int64 start_micros,
+           int64 exec_micros)
+      : process(process),
+        name(name),
+        start_micros(start_micros),
+        exec_micros(exec_micros),
+        tid(-1) {}
+  virtual ~TimeNode() {}
+
+  Process* process;
+  string name;
+  int64 start_micros;
+  int64 exec_micros;
+  int64 tid;
+  std::vector<TimeNode*> next_tnodes;
+};
+
+class Timeline {
+ public:
+  Timeline(const string& outfile) : outfile_(outfile) {}
+  ~Timeline() {}
+
+  void GenerateGraphTimeline(const GraphNode* gnode);
+
+  void GenerateScopeTimeline(const ScopeNode* node);
+
+  void GenerateCodeTimeline(const CodeNode* node);
+
+ private:
+  void OutputTimeline();
+
+  template <typename Node>
+  void EmitTreeNode(const Node* node, int64 start_time, int64 duration,
+                    int64 depth, std::set<int64>* visited_depth) {
+    if (visited_depth->find(depth) == visited_depth->end()) {
+      chrome_formatter_.EmitPID(strings::StrCat("Scope:", depth), depth);
+      visited_depth->insert(depth);
+    }
+
+    Json::Value args(Json::objectValue);
+    args["name"] = Json::Value(node->name());
+    args["op"] = Json::Value(node->name());
+    chrome_formatter_.EmitRegion(start_time, duration, depth, 0, "Op",
+                                 node->name(), args);
+
+    int64 total_micros = 0;
+    int64 c_start_time = start_time;
+    for (const Node* child : node->show_children) {
+      int64 total_exec_micros = child->proto().total_exec_micros();
+      if (total_exec_micros <= 0) {
+        continue;
+      }
+      EmitTreeNode(child, c_start_time, total_exec_micros, depth + 1,
+                   visited_depth);
+      c_start_time += total_exec_micros;
+      total_micros += total_exec_micros;
+    }
+    CHECK(total_micros <= duration) << node->name() << " parent:" << duration
+                                    << " children:" << total_micros;
+  }
+
+  std::vector<TimeNode*> AddGraphNode(const GraphNode* gnode);
+
+  void AllocateLanes();
+
+  int64 AllocatePID();
+
+  const string outfile_;
+  int64 next_pid_ = 0;
+  int64 allocator_pid_ = -1;
+  ChromeTraceFormatter chrome_formatter_;
+  std::map<string, int64> device_pids_;
+
+  std::map<string, std::unique_ptr<Process>> process_;
+  std::map<int64, std::map<int64, std::map<int64, TimeNode*>>> alloc_nodes_;
+  std::map<string, std::map<int64, std::unique_ptr<TimeNode>>> tnodes_;
+};
+
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc b/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc
new file mode 100644
index 0000000000..2dfe6ab335
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc
@@ -0,0 +1,92 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_stats.h"
+
+#include <utility>
+
+#include "tensorflow/c/checkpoint_reader.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/hash/hash.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/protobuf/config.pb.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+class TFProfTimelineTest : public ::testing::Test {
+ protected:
+  TFProfTimelineTest() {
+    string graph_path =
+        io::JoinPath(testing::TensorFlowSrcRoot(),
+                     "tools/tfprof/internal/testdata/graph.pbtxt");
+    std::unique_ptr<tensorflow::GraphDef> graph_pb(new tensorflow::GraphDef());
+    TF_CHECK_OK(ReadGraphDef(Env::Default(), graph_path, graph_pb.get()));
+
+    std::unique_ptr<tensorflow::RunMetadata> run_meta_pb(
+        new tensorflow::RunMetadata());
+    string run_meta_path =
+        io::JoinPath(testing::TensorFlowSrcRoot(),
+                     "tools/tfprof/internal/testdata/run_meta");
+    TF_CHECK_OK(
+        ReadBinaryProto(Env::Default(), run_meta_path, run_meta_pb.get()));
+
+    tf_stats_.reset(new TFStats(std::move(graph_pb), std::move(run_meta_pb),
+                                nullptr, nullptr));
+  }
+
+  std::unique_ptr<TFStats> tf_stats_;
+};
+
+// Before adding test, first dump the json file and
+// manually check it's correct
+TEST_F(TFProfTimelineTest, GraphView) {
+  string dump_file = io::JoinPath(testing::TmpDir(), "dump");
+  Options opts(10000, 0, 0, 0, 0, {".*"}, "name",
+               {".*"},  // accout_type_regexes
+               {".*"}, {""}, {".*"}, {""}, false,
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
+               "timeline", {{"outfile", dump_file}});
+  tf_stats_->PrintGraph("graph", opts);
+
+  string dump_str;
+  TF_CHECK_OK(ReadFileToString(Env::Default(), dump_file, &dump_str));
+  EXPECT_EQ(14171250174278825648ull, Hash64(dump_str));
+}
+
+TEST_F(TFProfTimelineTest, ScopeView) {
+  string dump_file = io::JoinPath(testing::TmpDir(), "dump");
+  Options opts(5, 0, 0, 0, 0, {".*"}, "name", {".*"},  // accout_type_regexes
+               {".*"}, {""}, {".*"}, {""}, false,
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
+               "timeline", {{"outfile", dump_file}});
+  tf_stats_->PrintGraph("scope", opts);
+
+  string dump_str;
+  TF_CHECK_OK(ReadFileToString(Env::Default(), dump_file, &dump_str));
+  EXPECT_EQ(2355241164346147404ull, Hash64(dump_str));
+}
+
+// TODO(xpan): tfprof_log is too large to include in testdata when adding
+// code traces.
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_utils.cc b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
index eb2be35c6e..8e55e009d3 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_utils.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
@@ -251,19 +251,13 @@ tensorflow::Status ParseCmdLine(const string& line, string* cmd,
       opts->select = requested_set;
       ++i;
     } else if (pieces[i] == tensorflow::tfprof::kOptions[14]) {
-      if ((pieces.size() > i + 1 && pieces[i + 1].find("-") == 0) ||
-          pieces.size() == i + 1) {
-        opts->viz = true;
-      } else if (!StringToBool(pieces[i + 1], &opts->viz)) {
-        return ReturnError(pieces, i);
-      } else {
-        ++i;
-      }
-    } else if (pieces[i] == tensorflow::tfprof::kOptions[15]) {
       if (pieces.size() <= i + 1) {
         return ReturnError(pieces, i);
       }
-      opts->dump_to_file = StripQuote(pieces[i + 1]);
+
+      tensorflow::Status s =
+          ParseOutput(pieces[i + 1], &opts->output_type, &opts->output_options);
+      if (!s.ok()) return s;
       ++i;
     } else {
       return ReturnError(pieces, i);
diff --git a/tensorflow/tools/tfprof/tfprof_main.cc b/tensorflow/tools/tfprof/tfprof_main.cc
index dd18a4ad3c..a4c0b024c4 100644
--- a/tensorflow/tools/tfprof/tfprof_main.cc
+++ b/tensorflow/tools/tfprof/tfprof_main.cc
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/protobuf/config.pb.h"
 #include "tensorflow/core/util/command_line_flags.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
@@ -82,8 +83,7 @@ int main(int argc, char** argv) {
   tensorflow::string FLAGS_hide_name_regexes;
   bool FLAGS_account_displayed_op_only = false;
   tensorflow::string FLAGS_select = "params";
-  bool FLAGS_viz = false;
-  tensorflow::string FLAGS_dump_to_file = "";
+  tensorflow::string FLAGS_output = "";
   for (int i = 0; i < argc; i++) {
     fprintf(stderr, "%s\n", argv[i]);
   }
@@ -117,7 +117,7 @@ int main(int argc, char** argv) {
                        &FLAGS_account_displayed_op_only,
                        "account displayed op only"),
       tensorflow::Flag("select", &FLAGS_select, "select"),
-      tensorflow::Flag("dump_to_file", &FLAGS_dump_to_file, "dump to file"),
+      tensorflow::Flag("output", &FLAGS_output, "output"),
   };
   tensorflow::string usage = tensorflow::Flags::Usage(argv[0], flag_list);
   bool parse_ok = tensorflow::Flags::Parse(&argc, argv, flag_list);
@@ -144,6 +144,12 @@ int main(int argc, char** argv) {
   std::vector<tensorflow::string> select =
       Split(FLAGS_select, ',', tensorflow::str_util::SkipEmpty());
 
+  string output_type;
+  std::map<string, string> output_options;
+  tensorflow::Status s = tensorflow::tfprof::ParseOutput(
+      FLAGS_output, &output_type, &output_options);
+  CHECK(s.ok()) << s.ToString();
+
   tensorflow::string cmd = "";
   if (argc == 1 && FLAGS_graph_path.empty()) {
     printf("1) go/tfprof: Tutorial.\n");
@@ -186,10 +192,18 @@ int main(int argc, char** argv) {
 
   std::unique_ptr<tensorflow::tfprof::OpLog> op_log(
       new tensorflow::tfprof::OpLog());
-  if (!ReadBinaryProto(tensorflow::Env::Default(), FLAGS_op_log_path,
-                       op_log.get())
-           .ok()) {
-    op_log.release();
+  if (!FLAGS_op_log_path.empty()) {
+    string op_log_str;
+    s = tensorflow::ReadFileToString(tensorflow::Env::Default(),
+                                     FLAGS_op_log_path, &op_log_str);
+    if (!s.ok()) {
+      fprintf(stderr, "Failed to read op_log_path: %s\n", s.ToString().c_str());
+      return 1;
+    }
+    if (!tensorflow::ParseProtoUnlimited(op_log.get(), op_log_str)) {
+      fprintf(stderr, "Failed to parse op_log_path\n");
+      return 1;
+    }
   }
 
   std::unique_ptr<tensorflow::checkpoint::CheckpointReader> ckpt_reader;
@@ -212,8 +226,8 @@ int main(int argc, char** argv) {
       FLAGS_max_depth, FLAGS_min_bytes, FLAGS_min_micros, FLAGS_min_params,
       FLAGS_min_float_ops, device_regexes, FLAGS_order_by, account_type_regexes,
       start_name_regexes, trim_name_regexes, show_name_regexes,
-      hide_name_regexes, FLAGS_account_displayed_op_only, select, FLAGS_viz,
-      FLAGS_dump_to_file);
+      hide_name_regexes, FLAGS_account_displayed_op_only, select, output_type,
+      output_options);
 
   if (cmd == tensorflow::tfprof::kCmds[2]) {
     tf_stat.PrintCode(opts);
diff --git a/tensorflow/tools/tfprof/tfprof_options.proto b/tensorflow/tools/tfprof/tfprof_options.proto
index 9d269a0995..84a2e14005 100644
--- a/tensorflow/tools/tfprof/tfprof_options.proto
+++ b/tensorflow/tools/tfprof/tfprof_options.proto
@@ -19,6 +19,6 @@ message OptionsProto {
   repeated string hide_name_regexes = 12;
   optional bool account_displayed_op_only = 13;
   repeated string select = 14;
-  optional bool viz = 15;
+  optional string output = 15;
   optional string dump_to_file = 16;
 }
diff --git a/tensorflow/tools/tfprof/tfprof_output.proto b/tensorflow/tools/tfprof/tfprof_output.proto
index 78dd056662..93e6c1233c 100644
--- a/tensorflow/tools/tfprof/tfprof_output.proto
+++ b/tensorflow/tools/tfprof/tfprof_output.proto
@@ -31,7 +31,8 @@ message TFGraphNodeProto {
   // Number of inputs to the op.
   optional int64 inputs = 5;
   // Device the op is assigned to.
-  optional string device = 10;
+  // Since an op can fire multiple kernel calls, there can be multiple devices.
+  repeated string devices = 10;
 
   // The following are the aggregated stats from all accounted descendants and
   // the op itself. The actual descendants depend on the data structure used
-- 
GitLab


From 011da3f1c022237a5d68601a2a318cff45f0a38d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 12:18:25 -0700
Subject: [PATCH 1238/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 155780263
---
 .../core/ops/compat/ops_history.v1.pbtxt      | 48 +++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |  8 ++++
 2 files changed, 56 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index d67cda2ae2..75fabe1606 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -3768,6 +3768,54 @@ op {
     }
   }
 }
+op {
+  name: "CTCLoss"
+  input_arg {
+    name: "inputs"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "labels_indices"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "labels_values"
+    type: DT_INT32
+  }
+  input_arg {
+    name: "sequence_length"
+    type: DT_INT32
+  }
+  output_arg {
+    name: "loss"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "gradient"
+    type: DT_FLOAT
+  }
+  attr {
+    name: "preprocess_collapse_repeated"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "ctc_merge_repeated"
+    type: "bool"
+    default_value {
+      b: true
+    }
+  }
+  attr {
+    name: "ignore_longer_outputs_than_inputs"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+}
 op {
   name: "Cast"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 7b9ace903c..6ea21edb4d 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -3845,6 +3845,14 @@ op {
     }
     description: "Scalar.  If set to false, *during* CTC calculation\nrepeated non-blank labels will not be merged and are interpreted as\nindividual labels.  This is a simplified version of CTC."
   }
+  attr {
+    name: "ignore_longer_outputs_than_inputs"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "Scalar. If set to true, during CTC\ncalculation items have longer input sequences than output sequences\nare ignored by returning zero-gradient for those items."
+  }
   summary: "Calculates the CTC Loss (log probability) for each batch entry.  Also calculates"
   description: "the gradient.  This class performs the softmax operation for you, so inputs\nshould be e.g. linear projections of outputs by an LSTM."
 }
-- 
GitLab


From 6479ba550226263e1da8a58ad6c81095693e2751 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 12:24:44 -0700
Subject: [PATCH 1239/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 155780999
---
 tensorflow/go/op/wrappers.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index a5ee885fc1..76e30e0c32 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -3381,6 +3381,18 @@ func CTCLossCtcMergeRepeated(value bool) CTCLossAttr {
 	}
 }
 
+// CTCLossIgnoreLongerOutputsThanInputs sets the optional ignore_longer_outputs_than_inputs attribute to value.
+//
+// value: Scalar. If set to true, during CTC
+// calculation items have longer input sequences than output sequences
+// are ignored by returning zero-gradient for those items.
+// If not specified, defaults to false
+func CTCLossIgnoreLongerOutputsThanInputs(value bool) CTCLossAttr {
+	return func(m optionalAttr) {
+		m["ignore_longer_outputs_than_inputs"] = value
+	}
+}
+
 // Calculates the CTC Loss (log probability) for each batch entry.  Also calculates
 //
 // the gradient.  This class performs the softmax operation for you, so inputs
-- 
GitLab


From e838f3302e1329c5f6cd9a8004e54aa0a5c1cae3 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Thu, 11 May 2017 12:36:20 -0700
Subject: [PATCH 1240/1563] Turned a bazel dependency error into a warning to
 keep the build going

---
 tensorflow/tensorboard/components/tf_graph_info/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/tensorboard/components/tf_graph_info/BUILD b/tensorflow/tensorboard/components/tf_graph_info/BUILD
index eec1155769..95bdff9acf 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_info/BUILD
@@ -15,6 +15,7 @@ web_library(
         "tf-node-list-item.html",
     ],
     path = "/tf-graph-info",
+    suppress = ["strictDependencies"],
     deps = [
         "//tensorflow/tensorboard/components/tf_dashboard_common",
         "//tensorflow/tensorboard/components/tf_graph_common",
-- 
GitLab


From e1e820efb0e46dafd70d8a776b26962927e64454 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Thu, 11 May 2017 13:15:04 -0700
Subject: [PATCH 1241/1563] Improve the docstring for learn_runner with new
 experiment_fn.

PiperOrigin-RevId: 155787311
---
 .../learn/python/learn/learn_runner.py        | 25 +++++++++++++++----
 .../learn/python/learn/learn_runner_test.py   |  3 ++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/learn_runner.py b/tensorflow/contrib/learn/python/learn/learn_runner.py
index 983ac7462a..a3398a87e1 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner.py
@@ -68,7 +68,8 @@ def _wrapped_experiment_fn_with_uid_check(experiment_fn, require_hparams=False):
     if not isinstance(run_config, run_config_lib.RunConfig):
       raise ValueError('`run_config` must be `RunConfig` instance')
     if not run_config.model_dir:
-      raise ValueError('Must specify a model directory in `run_config`.')
+      raise ValueError(
+          'Must specify a model directory `model_dir` in `run_config`.')
     if hparams is not None and not isinstance(hparams, hparam_lib.HParams):
       raise ValueError('`hparams` must be `HParams` instance')
     if require_hparams and hparams is None:
@@ -110,6 +111,10 @@ def run(experiment_fn, output_dir=None, schedule=None, run_config=None,
   Example with `run_config` (Recommended):
   ```
     def _create_my_experiment(run_config, hparams):
+
+        # You can change a subset of the run_config properties as
+        #   run_config = run_config.replace(save_checkpoints_steps=500)
+
         return tf.contrib.learn.Experiment(
           estimator=my_estimator(config=run_config, hparams=hparams),
           train_input_fn=my_train_input,
@@ -118,8 +123,17 @@ def run(experiment_fn, output_dir=None, schedule=None, run_config=None,
     learn_runner.run(
       experiment_fn=_create_my_experiment,
       run_config=run_config_lib.RunConfig(model_dir="some/output/dir"),
-      schedule="train",
+      schedule="train_and_evaluate",
       hparams=_create_default_hparams())
+  ```
+  or simply as
+  ```
+    learn_runner.run(
+      experiment_fn=_create_my_experiment,
+      run_config=run_config_lib.RunConfig(model_dir="some/output/dir"))
+  ```
+  if `hparams` is not used by the `Estimator`. On a single machine, `schedule`
+  defaults to `train_and_evaluate`.
 
   Example with `output_dir` (deprecated):
   ```
@@ -147,7 +161,8 @@ def run(experiment_fn, output_dir=None, schedule=None, run_config=None,
       It must return an `Experiment`. For this case, `output_dir` must be None.
     output_dir: Base output directory [Deprecated].
     schedule: The name of the  method in the `Experiment` to run.
-    run_config: `RunConfig` instance. If set, `output_dir` must be None.
+    run_config: `RunConfig` instance. The `run_config.model_dir` must be
+      non-empty. If `run_config` is set, `output_dir` must be None.
     hparams: `HParams` instance. The default hyper-parameters, which will be
       passed to the `experiment_fn` if `run_config` is not None.
 
@@ -157,8 +172,8 @@ def run(experiment_fn, output_dir=None, schedule=None, run_config=None,
   Raises:
     ValueError: If both `output_dir` and `run_config` are empty or set,
       `schedule` is None but no task type is set in the built experiment's
-      config, the task type has no default, or `schedule` doesn't reference a
-      member of `Experiment`.
+      config, the task type has no default, `run_config.model_dir` is empty or
+      `schedule` doesn't reference a member of `Experiment`.
     TypeError: `schedule` references non-callable member.
   """
 
diff --git a/tensorflow/contrib/learn/python/learn/learn_runner_test.py b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
index 77bdcaeb7e..b61a42a1c7 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner_test.py
@@ -36,7 +36,8 @@ patch = test.mock.patch
 _MODIR_DIR = "/tmp"
 _HPARAMS = hparam_lib.HParams(learning_rate=0.01)
 _MUST_SPECIFY_OUTPUT_DIR_MSG = "Must specify an output directory"
-_MISSING_MODEL_DIR_ERR_MSG = "Must specify a model directory in `run_config`."
+_MISSING_MODEL_DIR_ERR_MSG = (
+    "Must specify a model directory `model_dir` in `run_config`.")
 _EXP_NOT_CALLABLE_MSG = "Experiment builder .* is not callable"
 _INVALID_HPARAMS_ERR_MSG = "`hparams` must be `HParams` instance"
 _NOT_EXP_TYPE_MSG = "Experiment builder did not return an Experiment"
-- 
GitLab


From 3c2dc3baaae762b00d90761f47265411f54033b3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 13:27:35 -0700
Subject: [PATCH 1242/1563] Renames _parse_example_config to
 _parse_example_spec, adds tests and other cleanup.

PiperOrigin-RevId: 155788799
---
 .../python/feature_column/feature_column.py   |  64 ++-
 .../feature_column/feature_column_test.py     | 366 +++++++++++++++---
 2 files changed, 345 insertions(+), 85 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index c9baef0695..f0a7de8668 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -408,7 +408,7 @@ def make_parse_example_spec(feature_columns):
       raise ValueError(
           'All feature_columns must be _FeatureColumn instances. '
           'Given: {}'.format(column))
-    config = column._parse_example_config  # pylint: disable=protected-access
+    config = column._parse_example_spec  # pylint: disable=protected-access
     for key, value in six.iteritems(config):
       if key in result and value != result[key]:
         raise ValueError(
@@ -484,10 +484,8 @@ def embedding_column(
                      'Embedding of column_name: {}'.format(
                          categorical_column.name))
   if initializer is None:
-    # pylint: disable=protected-access
     initializer = init_ops.truncated_normal_initializer(
         mean=0.0, stddev=1 / math.sqrt(dimension))
-    # pylint: enable=protected-access
 
   return _EmbeddingColumn(
       categorical_column=categorical_column,
@@ -1197,7 +1195,7 @@ class _FeatureColumn(object):
     pass
 
   @abc.abstractproperty
-  def _parse_example_config(self):
+  def _parse_example_spec(self):
     """Returns a `tf.Example` parsing spec as dict.
 
     It is used for get_parsing_spec for `tf.parse_example`. Returned spec is a
@@ -1207,11 +1205,11 @@ class _FeatureColumn(object):
 
     Let's say a Feature column depends on raw feature ('raw') and another
     `_FeatureColumn` (input_fc). One possible implementation of
-    _parse_example_config is as follows:
+    _parse_example_spec is as follows:
 
     ```python
     spec = {'raw': tf.FixedLenFeature(...)}
-    spec.update(input_fc._parse_example_config)
+    spec.update(input_fc._parse_example_spec)
     return spec
     ```
     """
@@ -1428,9 +1426,7 @@ class _LazyBuilder(object):
 
     column = key
     logging.debug('Transforming feature_column %s.', column)
-    # pylint: disable=protected-access
-    transformed = column._transform_feature(self)
-    # pylint: enable=protected-access
+    transformed = column._transform_feature(self)  # pylint: disable=protected-access
     if transformed is None:
       raise ValueError('Column {} is not supported.'.format(column.name))
     self._feature_tensors[column] = transformed
@@ -1529,7 +1525,7 @@ class _NumericColumn(_DenseColumn,
     return self.key
 
   @property
-  def _parse_example_config(self):
+  def _parse_example_spec(self):
     return {
         self.key:
             parsing_ops.FixedLenFeature(self.shape, self.dtype,
@@ -1582,8 +1578,8 @@ class _BucketizedColumn(_DenseColumn, _CategoricalColumn,
     return '{}_bucketized'.format(self.source_column.name)
 
   @property
-  def _parse_example_config(self):
-    return self.source_column._parse_example_config  # pylint: disable=protected-access
+  def _parse_example_spec(self):
+    return self.source_column._parse_example_spec  # pylint: disable=protected-access
 
   def _transform_feature(self, inputs):
     source_tensor = inputs.get(self.source_column)
@@ -1655,10 +1651,8 @@ class _EmbeddingColumn(
     return self._name
 
   @property
-  def _parse_example_config(self):
-    # pylint: disable=protected-access
-    return self.categorical_column._parse_example_config
-    # pylint: enable=protected-access
+  def _parse_example_spec(self):
+    return self.categorical_column._parse_example_spec  # pylint: disable=protected-access
 
   def _transform_feature(self, inputs):
     return inputs.get(self.categorical_column)
@@ -1671,19 +1665,15 @@ class _EmbeddingColumn(
 
   def _get_dense_tensor(self, inputs, weight_collections=None, trainable=None):
     # Get sparse IDs and weights.
-    # pylint: disable=protected-access
-    sparse_tensors = self.categorical_column._get_sparse_tensors(
+    sparse_tensors = self.categorical_column._get_sparse_tensors(  # pylint: disable=protected-access
         inputs, weight_collections=weight_collections, trainable=trainable)
-    # pylint: enable=protected-access
     sparse_ids = sparse_tensors.id_tensor
     sparse_weights = sparse_tensors.weight_tensor
 
     # Create embedding weight, and restore from checkpoint if necessary.
     embedding_weights = variable_scope.get_variable(
         name='embedding_weights',
-        # pylint: disable=protected-access
-        shape=(self.categorical_column._num_buckets, self.dimension),
-        # pylint: enable=protected-access
+        shape=(self.categorical_column._num_buckets, self.dimension),  # pylint: disable=protected-access
         dtype=dtypes.float32,
         initializer=self.initializer,
         trainable=self.trainable and trainable,
@@ -1691,9 +1681,7 @@ class _EmbeddingColumn(
     if self.ckpt_to_load_from is not None:
       to_restore = embedding_weights
       if isinstance(to_restore, variables.PartitionedVariable):
-        # pylint: disable=protected-access
-        to_restore = to_restore._get_variable_list()
-        # pylint: enable=protected-access
+        to_restore = to_restore._get_variable_list()  # pylint: disable=protected-access
       checkpoint_utils.init_from_checkpoint(self.ckpt_to_load_from, {
           self.tensor_name_in_ckpt: to_restore
       })
@@ -1824,7 +1812,7 @@ class _HashedCategoricalColumn(
     return self.key
 
   @property
-  def _parse_example_config(self):
+  def _parse_example_spec(self):
     return {self.key: parsing_ops.VarLenFeature(self.dtype)}
 
   def _transform_feature(self, inputs):
@@ -1875,7 +1863,7 @@ class _VocabularyFileCategoricalColumn(
     return self.key
 
   @property
-  def _parse_example_config(self):
+  def _parse_example_spec(self):
     return {self.key: parsing_ops.VarLenFeature(self.dtype)}
 
   def _transform_feature(self, inputs):
@@ -1927,7 +1915,7 @@ class _VocabularyListCategoricalColumn(
     return self.key
 
   @property
-  def _parse_example_config(self):
+  def _parse_example_spec(self):
     return {self.key: parsing_ops.VarLenFeature(self.dtype)}
 
   def _transform_feature(self, inputs):
@@ -1978,7 +1966,7 @@ class _IdentityCategoricalColumn(
     return self.key
 
   @property
-  def _parse_example_config(self):
+  def _parse_example_spec(self):
     return {self.key: parsing_ops.VarLenFeature(dtypes.int64)}
 
   def _transform_feature(self, inputs):
@@ -2041,10 +2029,8 @@ class _WeightedCategoricalColumn(
         self.categorical_column.name, self.weight_column_name)
 
   @property
-  def _parse_example_config(self):
-    # pylint: disable=protected-access
-    config = self.categorical_column._parse_example_config
-    # pylint: enable=protected-access
+  def _parse_example_spec(self):
+    config = self.categorical_column._parse_example_spec  # pylint: disable=protected-access
     if self.weight_column_name in config:
       raise ValueError('Parse config {} already exists for {}.'.format(
           config[self.weight_column_name], self.weight_column_name))
@@ -2053,9 +2039,7 @@ class _WeightedCategoricalColumn(
 
   @property
   def _num_buckets(self):
-    # pylint: disable=protected-access
-    return self.categorical_column._num_buckets
-    # pylint: enable=protected-access
+    return self.categorical_column._num_buckets  # pylint: disable=protected-access
 
   def _transform_feature(self, inputs):
     weight_tensor = inputs.get(self.weight_column_name)
@@ -2099,11 +2083,11 @@ class _CrossedColumn(
     return '_X_'.join(sorted(feature_names))
 
   @property
-  def _parse_example_config(self):
+  def _parse_example_spec(self):
     config = {}
     for key in self.keys:
       if isinstance(key, _FeatureColumn):
-        config.update(key._parse_example_config)  # pylint: disable=protected-access
+        config.update(key._parse_example_spec)  # pylint: disable=protected-access
       else:  # key must be a string
         config.update({key: parsing_ops.VarLenFeature(dtypes.string)})
     return config
@@ -2348,8 +2332,8 @@ class _IndicatorColumn(_DenseColumn,
     return math_ops.reduce_sum(one_hot_id_tensor, axis=[1])
 
   @property
-  def _parse_example_config(self):
-    return self.categorical_column._parse_example_config  # pylint: disable=protected-access
+  def _parse_example_spec(self):
+    return self.categorical_column._parse_example_spec  # pylint: disable=protected-access
 
   @property
   def _variable_shape(self):
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index b09c01d266..977ab81ff6 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -65,7 +65,7 @@ class LazyColumnTest(test.TestCase):
         return cache.get('a')
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         pass
 
     builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
@@ -88,7 +88,7 @@ class LazyColumnTest(test.TestCase):
         return 'Output'
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         pass
 
     builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
@@ -108,7 +108,7 @@ class LazyColumnTest(test.TestCase):
         return 'Output'
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         pass
 
     features = {'a': [[2], [3.]]}
@@ -135,7 +135,7 @@ class LazyColumnTest(test.TestCase):
         pass
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         pass
 
     builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
@@ -222,11 +222,11 @@ class NumericColumnTest(test.TestCase):
     a = fc.numeric_column('aaa', shape=[2, 3], default_value=2.)
     self.assertEqual(((2., 2., 2.), (2., 2., 2.)), a.default_value)
 
-  def test_parse_config(self):
+  def test_parse_spec(self):
     a = fc.numeric_column('aaa', shape=[2, 3], dtype=dtypes.int32)
     self.assertEqual({
         'aaa': parsing_ops.FixedLenFeature((2, 3), dtype=dtypes.int32)
-    }, a._parse_example_config)
+    }, a._parse_example_spec)
 
   def test_parse_example_no_default_value(self):
     price = fc.numeric_column('price', shape=[2])
@@ -238,7 +238,7 @@ class NumericColumnTest(test.TestCase):
         }))
     features = parsing_ops.parse_example(
         serialized=[data.SerializeToString()],
-        features=price._parse_example_config)
+        features=fc.make_parse_example_spec([price]))
     self.assertIn('price', features)
     with self.test_session():
       self.assertAllEqual([[20., 110.]], features['price'].eval())
@@ -260,7 +260,7 @@ class NumericColumnTest(test.TestCase):
     features = parsing_ops.parse_example(
         serialized=[data.SerializeToString(),
                     no_data.SerializeToString()],
-        features=price._parse_example_config)
+        features=fc.make_parse_example_spec([price]))
     self.assertIn('price', features)
     with self.test_session():
       self.assertAllEqual([[20., 110.], [11., 11.]], features['price'].eval())
@@ -362,12 +362,12 @@ class BucketizedColumnTest(test.TestCase):
     b = fc.bucketized_column(a, boundaries=[0, 1])
     self.assertEqual('aaa_bucketized', b.name)
 
-  def test_parse_config(self):
+  def test_parse_spec(self):
     a = fc.numeric_column('aaa', shape=[2], dtype=dtypes.int32)
     b = fc.bucketized_column(a, boundaries=[0, 1])
     self.assertEqual({
         'aaa': parsing_ops.FixedLenFeature((2,), dtype=dtypes.int32)
-    }, b._parse_example_config)
+    }, b._parse_example_spec)
 
   def test_variable_shape(self):
     a = fc.numeric_column('aaa', shape=[2], dtype=dtypes.int32)
@@ -392,7 +392,7 @@ class BucketizedColumnTest(test.TestCase):
         }))
     features = parsing_ops.parse_example(
         serialized=[data.SerializeToString()],
-        features=bucketized_price._parse_example_config)
+        features=fc.make_parse_example_spec([bucketized_price]))
     self.assertIn('price', features)
     with self.test_session():
       self.assertAllEqual([[20., 110.]], features['price'].eval())
@@ -584,17 +584,38 @@ class HashedCategoricalColumnTest(test.TestCase):
       self.assertEqual(10, column._num_buckets)
       self.assertEqual(dtypes.string, column.dtype)
 
-  def test_parse_config(self):
+  def test_parse_spec_string(self):
     a = fc.categorical_column_with_hash_bucket('aaa', 10)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.string)
-    }, a._parse_example_config)
+    }, a._parse_example_spec)
 
-  def test_parse_config_int(self):
+  def test_parse_spec_int(self):
     a = fc.categorical_column_with_hash_bucket('aaa', 10, dtype=dtypes.int32)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int32)
-    }, a._parse_example_config)
+    }, a._parse_example_spec)
+
+  def test_parse_example(self):
+    a = fc.categorical_column_with_hash_bucket('aaa', 10)
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=[b'omar', b'stringer']))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a]))
+    self.assertIn('aaa', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([b'omar', b'stringer'], dtype=np.object_),
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
 
   def test_strings_should_be_hashed(self):
     hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
@@ -797,14 +818,14 @@ class CrossedColumnTest(test.TestCase):
     crossed2 = fc.crossed_column([crossed1, 'd1', b], 10)
     self.assertEqual('a_bucketized_X_c_X_d1_X_d2', crossed2.name)
 
-  def test_parse_config(self):
+  def test_parse_spec(self):
     a = fc.numeric_column('a', shape=[2], dtype=dtypes.int32)
     b = fc.bucketized_column(a, boundaries=[0, 1])
     crossed = fc.crossed_column([b, 'c'], 10)
     self.assertEqual({
         'a': parsing_ops.FixedLenFeature((2,), dtype=dtypes.int32),
         'c': parsing_ops.VarLenFeature(dtypes.string),
-    }, crossed._parse_example_config)
+    }, crossed._parse_example_spec)
 
   def test_num_buckets(self):
     a = fc.numeric_column('a', shape=[2], dtype=dtypes.int32)
@@ -837,7 +858,7 @@ class CrossedColumnTest(test.TestCase):
         }))
     features = parsing_ops.parse_example(
         serialized=[data.SerializeToString()],
-        features=price_cross_wire._parse_example_config)
+        features=fc.make_parse_example_spec([price_cross_wire]))
     self.assertIn('price', features)
     self.assertIn('wire', features)
     with self.test_session():
@@ -848,6 +869,29 @@ class CrossedColumnTest(test.TestCase):
       self.assertAllEqual([b'omar', b'stringer'], wire_sparse.values.eval())
       self.assertAllEqual([1, 2], wire_sparse.dense_shape.eval())
 
+  def test_transform_feature(self):
+    price = fc.numeric_column('price', shape=[2])
+    bucketized_price = fc.bucketized_column(price, boundaries=[0, 50])
+    hash_bucket_size = 10
+    price_cross_wire = fc.crossed_column(
+        [bucketized_price, 'wire'], hash_bucket_size)
+    features = {
+        'price': constant_op.constant([[1., 2.], [5., 6.]]),
+        'wire': sparse_tensor.SparseTensor(
+            values=['omar', 'stringer', 'marlo'],
+            indices=[[0, 0], [1, 0], [1, 1]],
+            dense_shape=[2, 2]),
+    }
+    outputs = fc._transform_features(features, [price_cross_wire])
+    output = outputs[price_cross_wire]
+    with self.test_session() as sess:
+      output_val = sess.run(output)
+      self.assertAllEqual(
+          [[0, 0], [0, 1], [1, 0], [1, 1], [1, 2], [1, 3]], output_val.indices)
+      for val in output_val.values:
+        self.assertIn(val, list(range(hash_bucket_size)))
+      self.assertAllEqual([2, 4], output_val.dense_shape)
+
   def test_get_sparse_tensors(self):
     a = fc.numeric_column('a', dtype=dtypes.int32, shape=(2,))
     b = fc.bucketized_column(a, boundaries=(0, 1))
@@ -947,7 +991,7 @@ class CrossedColumnTest(test.TestCase):
         return 'test_column'
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         return {
             self.name: parsing_ops.VarLenFeature(dtypes.int32),
             '{}_weights'.format(self.name): parsing_ops.VarLenFeature(
@@ -1020,7 +1064,7 @@ class MakeLinearModelTest(test.TestCase):
         pass
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         pass
 
     with self.assertRaisesRegexp(
@@ -1102,7 +1146,7 @@ class MakeLinearModelTest(test.TestCase):
         return 'dense_and_sparse_column'
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         return {self.name: parsing_ops.VarLenFeature(self.dtype)}
 
       def _transform_feature(self, inputs):
@@ -1473,11 +1517,11 @@ class MakeParseExampleSpecTest(test.TestCase):
 
   class _TestFeatureColumn(
       fc._FeatureColumn,
-      collections.namedtuple('_TestFeatureColumn', ['parse_config'])):
+      collections.namedtuple('_TestFeatureColumn', ['parse_spec'])):
 
     @property
-    def _parse_example_config(self):
-      return self.parse_config
+    def _parse_example_spec(self):
+      return self.parse_spec
 
   def test_no_feature_columns(self):
     actual = fc.make_parse_example_spec([])
@@ -1583,7 +1627,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.string)
-    }, column._parse_example_config)
+    }, column._parse_example_spec)
 
   def test_all_constructor_args(self):
     column = fc.categorical_column_with_vocabulary_file(
@@ -1592,7 +1636,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
     self.assertEqual(7, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int32)
-    }, column._parse_example_config)
+    }, column._parse_example_spec)
 
   def test_deep_copy(self):
     original = fc.categorical_column_with_vocabulary_file(
@@ -1603,7 +1647,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
       self.assertEqual(7, column._num_buckets)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int32)
-      }, column._parse_example_config)
+      }, column._parse_example_spec)
 
   def test_vocabulary_file_none(self):
     with self.assertRaisesRegexp(ValueError, 'Missing vocabulary_file'):
@@ -1703,6 +1747,28 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
 
+  def test_parse_example(self):
+    a = fc.categorical_column_with_vocabulary_file(
+        key='aaa', vocabulary_file='path_to_file', vocabulary_size=3)
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=[b'omar', b'stringer']))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a]))
+    self.assertIn('aaa', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([b'omar', b'stringer'], dtype=np.object_),
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
+
   def test_get_sparse_tensors(self):
     column = fc.categorical_column_with_vocabulary_file(
         key='aaa',
@@ -1946,7 +2012,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.string)
-    }, column._parse_example_config)
+    }, column._parse_example_spec)
 
   def test_defaults_int(self):
     column = fc.categorical_column_with_vocabulary_list(
@@ -1955,7 +2021,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int64)
-    }, column._parse_example_config)
+    }, column._parse_example_spec)
 
   def test_all_constructor_args(self):
     column = fc.categorical_column_with_vocabulary_list(
@@ -1964,7 +2030,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int32)
-    }, column._parse_example_config)
+    }, column._parse_example_spec)
 
   def test_deep_copy(self):
     original = fc.categorical_column_with_vocabulary_list(
@@ -1974,7 +2040,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
       self.assertEqual(3, column._num_buckets)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int32)
-      }, column._parse_example_config)
+      }, column._parse_example_spec)
 
   def test_invalid_dtype(self):
     with self.assertRaisesRegexp(ValueError, 'dtype must be string or integer'):
@@ -2040,6 +2106,50 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
 
+  def test_parse_example_string(self):
+    a = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=[b'omar', b'stringer']))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a]))
+    self.assertIn('aaa', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([b'omar', b'stringer'], dtype=np.object_),
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
+
+  def test_parse_example_int(self):
+    a = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=(11, 21, 31))
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(int64_list=feature_pb2.Int64List(
+                    value=[11, 21]))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a]))
+    self.assertIn('aaa', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=[11, 21],
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
+
   def test_get_sparse_tensors(self):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa',
@@ -2060,6 +2170,24 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
               dense_shape=inputs.dense_shape),
           id_weight_pair.id_tensor.eval())
 
+  def test_transform_feature(self):
+    column = fc.categorical_column_with_vocabulary_list(
+        key='aaa',
+        vocabulary_list=('omar', 'stringer', 'marlo'))
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=('marlo', 'skywalker', 'omar'),
+        dense_shape=(2, 2))
+    id_tensor = fc._transform_features({'aaa': inputs}, [column])[column]
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((2, -1, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_tensor.eval())
+
   def test_get_sparse_tensors_weight_collections(self):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa',
@@ -2188,7 +2316,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int64)
-    }, column._parse_example_config)
+    }, column._parse_example_spec)
 
   def test_deep_copy(self):
     original = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
@@ -2197,7 +2325,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
       self.assertEqual(3, column._num_buckets)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int64)
-      }, column._parse_example_config)
+      }, column._parse_example_spec)
 
   def test_invalid_num_buckets_zero(self):
     with self.assertRaisesRegexp(ValueError, 'num_buckets 0 < 1'):
@@ -2226,6 +2354,27 @@ class IdentityCategoricalColumnTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, 'Invalid input, not integer'):
       column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
 
+  def test_parse_example(self):
+    a = fc.categorical_column_with_identity(key='aaa', num_buckets=30)
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(int64_list=feature_pb2.Int64List(
+                    value=[11, 21]))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a]))
+    self.assertIn('aaa', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([11, 21], dtype=np.int64),
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
+
   def test_get_sparse_tensors(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
     inputs = sparse_tensor.SparseTensorValue(
@@ -2244,6 +2393,22 @@ class IdentityCategoricalColumnTest(test.TestCase):
               dense_shape=inputs.dense_shape),
           id_weight_pair.id_tensor.eval())
 
+  def test_transform_feature(self):
+    column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    inputs = sparse_tensor.SparseTensorValue(
+        indices=((0, 0), (1, 0), (1, 1)),
+        values=(0, 1, 0),
+        dense_shape=(2, 2))
+    id_tensor = fc._transform_features({'aaa': inputs}, [column])[column]
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=inputs.indices,
+              values=np.array((0, 1, 0), dtype=np.int64),
+              dense_shape=inputs.dense_shape),
+          id_tensor.eval())
+
   def test_get_sparse_tensors_weight_collections(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
     inputs = sparse_tensor.SparseTensorValue(
@@ -2411,7 +2576,7 @@ class TransformFeaturesTest(test.TestCase):
         return 'Anything'
 
       @property
-      def _parse_example_config(self):
+      def _parse_example_spec(self):
         pass
 
     with ops.Graph().as_default():
@@ -2489,7 +2654,7 @@ class IndicatorColumnTest(test.TestCase):
     with self.test_session():
       self.assertAllEqual([[0., 1., 1., 0.]], output.eval())
 
-  def test_indicator_column_deep_copy(self):
+  def test_deep_copy(self):
     a = fc.categorical_column_with_hash_bucket('a', 4)
     column = fc.indicator_column(a)
     column_copy = copy.deepcopy(column)
@@ -2497,6 +2662,44 @@ class IndicatorColumnTest(test.TestCase):
     self.assertEqual(column.name, 'a_indicator')
     self.assertEqual(column._variable_shape, [1, 4])
 
+  def test_parse_example(self):
+    a = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
+    a_indicator = fc.indicator_column(a)
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=[b'omar', b'stringer']))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a_indicator]))
+    self.assertIn('aaa', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([b'omar', b'stringer'], dtype=np.object_),
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
+
+  def test_transform(self):
+    a = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
+    a_indicator = fc.indicator_column(a)
+    features = {
+        'aaa': sparse_tensor.SparseTensorValue(
+            indices=((0, 0), (1, 0), (1, 1)),
+            values=('marlo', 'skywalker', 'omar'),
+            dense_shape=(2, 2))
+    }
+    indicator_tensor = fc._transform_features(
+        features, [a_indicator])[a_indicator]
+    with _initialized_session():
+      self.assertAllEqual([[0, 0, 1], [1, 0, 0]], indicator_tensor.eval())
+
   def test_make_linear_model(self):
     animal = fc.indicator_column(
         fc.categorical_column_with_identity('animal', num_buckets=4))
@@ -2551,7 +2754,7 @@ class EmbeddingColumnTest(test.TestCase):
         (embedding_dimension,), embedding_column._variable_shape)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int64)
-    }, embedding_column._parse_example_config)
+    }, embedding_column._parse_example_spec)
 
   def test_all_constructor_args(self):
     categorical_column = fc.categorical_column_with_identity(
@@ -2575,7 +2778,7 @@ class EmbeddingColumnTest(test.TestCase):
         (embedding_dimension,), embedding_column._variable_shape)
     self.assertEqual({
         'aaa': parsing_ops.VarLenFeature(dtypes.int64)
-    }, embedding_column._parse_example_config)
+    }, embedding_column._parse_example_spec)
 
   def test_deep_copy(self):
     categorical_column = fc.categorical_column_with_identity(
@@ -2591,7 +2794,7 @@ class EmbeddingColumnTest(test.TestCase):
       self.assertEqual(3, embedding_column.categorical_column._num_buckets)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int64)
-      }, embedding_column.categorical_column._parse_example_config)
+      }, embedding_column.categorical_column._parse_example_spec)
 
       self.assertEqual(embedding_dimension, embedding_column.dimension)
       self.assertEqual('my_combiner', embedding_column.combiner)
@@ -2605,7 +2808,7 @@ class EmbeddingColumnTest(test.TestCase):
           (embedding_dimension,), embedding_column._variable_shape)
       self.assertEqual({
           'aaa': parsing_ops.VarLenFeature(dtypes.int64)
-      }, embedding_column._parse_example_config)
+      }, embedding_column._parse_example_spec)
 
   def test_invalid_initializer(self):
     categorical_column = fc.categorical_column_with_identity(
@@ -2613,6 +2816,45 @@ class EmbeddingColumnTest(test.TestCase):
     with self.assertRaisesRegexp(ValueError, 'initializer must be callable'):
       fc.embedding_column(categorical_column, dimension=2, initializer='not_fn')
 
+  def test_parse_example(self):
+    a = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
+    a_embedded = fc.embedding_column(a, dimension=2)
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=[b'omar', b'stringer']))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a_embedded]))
+    self.assertIn('aaa', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([b'omar', b'stringer'], dtype=np.object_),
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
+
+  def test_transform_feature(self):
+    a = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
+    a_embedded = fc.embedding_column(a, dimension=2)
+    features = {
+        'aaa': sparse_tensor.SparseTensor(
+            indices=((0, 0), (1, 0), (1, 1)),
+            values=(0, 1, 0),
+            dense_shape=(2, 2))
+    }
+    outputs = fc._transform_features(features, [a, a_embedded])
+    output_a = outputs[a]
+    output_embedded = outputs[a_embedded]
+    with _initialized_session():
+      _assert_sparse_tensor_value(
+          self, output_a.eval(), output_embedded.eval())
+
   def test_get_dense_tensor(self):
     # Inputs.
     vocabulary_size = 3
@@ -3090,7 +3332,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
     self.assertEqual({
         'ids': parsing_ops.VarLenFeature(dtypes.int64),
         'values': parsing_ops.VarLenFeature(dtypes.float32)
-    }, column._parse_example_config)
+    }, column._parse_example_spec)
 
   def test_deep_copy(self):
     """Tests deepcopy of categorical_column_with_hash_bucket."""
@@ -3104,7 +3346,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
       self.assertEqual({
           'ids': parsing_ops.VarLenFeature(dtypes.int64),
           'values': parsing_ops.VarLenFeature(dtypes.float32)
-      }, column._parse_example_config)
+      }, column._parse_example_spec)
 
   def test_invalid_dtype_none(self):
     with self.assertRaisesRegexp(ValueError, 'is not convertible to float'):
@@ -3139,7 +3381,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
       fc.weighted_categorical_column(
           categorical_column=fc.categorical_column_with_identity(
               key='aaa', num_buckets=3),
-          weight_column_name='aaa')._parse_example_config()
+          weight_column_name='aaa')._parse_example_spec()
 
   def test_missing_weights(self):
     column = fc.weighted_categorical_column(
@@ -3154,7 +3396,41 @@ class WeightedCategoricalColumnTest(test.TestCase):
         ValueError, 'values is not in features dictionary'):
       fc._transform_features({'ids': inputs}, (column,))
 
-  def test_get_sparse_tensors(self):
+  def test_parse_example(self):
+    a = fc.categorical_column_with_vocabulary_list(
+        key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
+    a_weighted = fc.weighted_categorical_column(a, weight_column_name='weights')
+    data = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            'aaa':
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=[b'omar', b'stringer'])),
+            'weights':
+                feature_pb2.Feature(float_list=feature_pb2.FloatList(
+                    value=[1., 10.]))
+        }))
+    features = parsing_ops.parse_example(
+        serialized=[data.SerializeToString()],
+        features=fc.make_parse_example_spec([a_weighted]))
+    self.assertIn('aaa', features)
+    self.assertIn('weights', features)
+    with self.test_session():
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([b'omar', b'stringer'], dtype=np.object_),
+              dense_shape=[1, 2]),
+          features['aaa'].eval())
+      _assert_sparse_tensor_value(
+          self,
+          sparse_tensor.SparseTensorValue(
+              indices=[[0, 0], [0, 1]],
+              values=np.array([1., 10.], dtype=np.float32),
+              dense_shape=[1, 2]),
+          features['weights'].eval())
+
+  def test_transform_features(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
@@ -3187,7 +3463,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
               dense_shape=weights.dense_shape),
           weight_tensor.eval())
 
-  def test_get_sparse_tensors_dense_input(self):
+  def test_transform_features_dense_input(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
@@ -3216,7 +3492,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
               dense_shape=weights.dense_shape),
           weight_tensor.eval())
 
-  def test_get_sparse_tensors_dense_weights(self):
+  def test_transform_features_dense_weights(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-- 
GitLab


From 20be1353372dbb6f2db4b152a37453a2d4e0af14 Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Thu, 11 May 2017 13:45:36 -0700
Subject: [PATCH 1243/1563] Added sample benchmark.

PiperOrigin-RevId: 155791315
---
 tensorflow/BUILD                              |  1 +
 tensorflow/examples/benchmark/BUILD           | 31 ++++++++++++
 .../examples/benchmark/sample_benchmark.py    | 50 +++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 tensorflow/examples/benchmark/BUILD
 create mode 100644 tensorflow/examples/benchmark/sample_benchmark.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 97a9c36877..f835c219dc 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -292,6 +292,7 @@ filegroup(
         "//tensorflow/core/util/ctc:all_files",
         "//tensorflow/core/util/tensor_bundle:all_files",
         "//tensorflow/examples/android:all_files",
+        "//tensorflow/examples/benchmark:all_files",
         "//tensorflow/examples/how_tos/reading_data:all_files",
         "//tensorflow/examples/image_retraining:all_files",
         "//tensorflow/examples/label_image:all_files",
diff --git a/tensorflow/examples/benchmark/BUILD b/tensorflow/examples/benchmark/BUILD
new file mode 100644
index 0000000000..c4bb0a5bd9
--- /dev/null
+++ b/tensorflow/examples/benchmark/BUILD
@@ -0,0 +1,31 @@
+# Description:
+# Examples of adding a benchmark to TensorFlow.
+
+load(
+    "//tensorflow/tools/test:performance.bzl",
+    "tf_py_logged_benchmark",
+)
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+py_test(
+    name = "sample_benchmark",
+    srcs = ["sample_benchmark.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow:tensorflow_py",
+    ],
+)
+
+tf_py_logged_benchmark(
+    name = "sample_logged_benchmark",
+    target = "//tensorflow/examples/benchmark:sample_benchmark",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**/*"]),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/examples/benchmark/sample_benchmark.py b/tensorflow/examples/benchmark/sample_benchmark.py
new file mode 100644
index 0000000000..e98d7a2b5f
--- /dev/null
+++ b/tensorflow/examples/benchmark/sample_benchmark.py
@@ -0,0 +1,50 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Sample TensorFlow benchmark."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import time
+
+import tensorflow as tf
+
+
+# Define a class that extends from tf.test.Benchmark.
+class SampleBenchmark(tf.test.Benchmark):
+
+  # Note: benchmark method name must start with `benchmark`.
+  def benchmarkSum(self):
+    with tf.Session() as sess:
+      x = tf.constant(10)
+      y = tf.constant(5)
+      result = tf.add(x, y)
+
+      iters = 100
+      start_time = time.time()
+      for _ in range(iters):
+        sess.run(result)
+      total_wall_time = time.time() - start_time
+
+      # Call report_benchmark to report a metric value.
+      self.report_benchmark(
+          name="sum_wall_time",
+          # This value should always be per iteration.
+          wall_time=total_wall_time/iters,
+          iters=iters)
+
+
+if __name__ == "__main__":
+  tf.test.main()
-- 
GitLab


From 20f9b5da8d7477c6cc86ee24fd1c78eb41f789f0 Mon Sep 17 00:00:00 2001
From: Sanders Kleinfeld <skleinfeld@google.com>
Date: Thu, 11 May 2017 13:52:58 -0700
Subject: [PATCH 1244/1563] Update to Custom Estimators docs to use input_fn
 for both .fit() and .evaluate(). Follow-up to PR #9617

PiperOrigin-RevId: 155792276
---
 tensorflow/docs_src/extend/estimators.md | 32 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/tensorflow/docs_src/extend/estimators.md b/tensorflow/docs_src/extend/estimators.md
index c5444c59ca..f972ee5f50 100644
--- a/tensorflow/docs_src/extend/estimators.md
+++ b/tensorflow/docs_src/extend/estimators.md
@@ -37,14 +37,17 @@ measurements. You'll learn how to do the following:
 ## Prerequisites
 
 This tutorial assumes you already know tf.contrib.learn API basics, such as
-feature columns and `fit()` operations. If you've never used tf.contrib.learn
-before, or need a refresher, you should first review the following tutorials:
+feature columns, input functions, and `fit()`/`evaluate()`/`predict()`
+operations. If you've never used tf.contrib.learn before, or need a refresher,
+you should first review the following tutorials:
 
 *   @{$tflearn$tf.contrib.learn Quickstart}: Quick introduction to
     training a neural network using tf.contrib.learn.
 *   @{$wide$TensorFlow Linear Model Tutorial}: Introduction to
     feature columns, and an overview on building a linear classifier in
     tf.contrib.learn.
+*   @{$input_fn$Building Input Functions with tf.contrib.learn}: Overview of how
+    to construct an input_fn to preprocess and feed data into your models.
 
 ## An Abalone Age Predictor {#abalone-predictor}
 
@@ -239,7 +242,7 @@ nn = tf.contrib.learn.Estimator(
 *   `params`: An optional dict of hyperparameters (e.g., learning rate, dropout)
     that will be passed into the `model_fn`.
 
-NOTE: Just like `tf.contrib.learn`'s predefined regressors and classifiers, the
+Note: Just like `tf.contrib.learn`'s predefined regressors and classifiers, the
 `Estimator` initializer also accepts the general configuration arguments
 `model_dir` and `config`.
 
@@ -252,7 +255,7 @@ code (highlighted in bold below), right after the logging configuration:
 <strong># Learning rate for the model
 LEARNING_RATE = 0.001</strong></code></pre>
 
-NOTE: Here, `LEARNING_RATE` is set to `0.001`, but you can tune this value as
+Note: Here, `LEARNING_RATE` is set to `0.001`, but you can tune this value as
 needed to achieve the best results during model training.
 
 Then, add the following code to `main()`, which creates the dict `model_params`
@@ -576,7 +579,7 @@ required arguments:
         algorithm
         (@{tf.train.RMSPropOptimizer})
 
-NOTE: The `optimize_loss` function supports additional optional arguments to
+Note: The `optimize_loss` function supports additional optional arguments to
 further configure the optimizer, such as for implementing decay. See the
 @{tf.contrib.layers.optimize_loss$API docs} for more info.
 
@@ -654,15 +657,30 @@ Add the following code to the end of `main()` to fit the neural network to the
 training data and evaluate accuracy:
 
 ```python
+def get_train_inputs():
+  x = tf.constant(training_set.data)
+  y = tf.constant(training_set.target)
+  return x, y
+
 # Fit
-nn.fit(x=training_set.data, y=training_set.target, steps=5000)
+nn.fit(input_fn=get_train_inputs, steps=5000)
+
+def get_test_inputs():
+  x = tf.constant(test_set.data)
+  y = tf.constant(test_set.target)
+  return x, y
 
 # Score accuracy
-ev = nn.evaluate(x=test_set.data, y=test_set.target, steps=1)
+ev = nn.evaluate(input_fn=get_test_inputs, steps=1)
 print("Loss: %s" % ev["loss"])
 print("Root Mean Squared Error: %s" % ev["rmse"])
 ```
 
+Note: The above code uses input functions to feed feature (`x`) and label (`y`)
+`Tensor`s into the model for both training (`get_train_inputs()`) and evaluation
+(`get_test_inputs()`). To learn more about input functions, see the tutorial
+@{$input_fn$Building Input Functions with tf.contrib.learn}.
+
 Then run the code. You should see output like the following:
 
 ```none
-- 
GitLab


From bf0363bf3f5a32993f7275c2f5a55ec2962da4a3 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Thu, 11 May 2017 14:08:31 -0700
Subject: [PATCH 1245/1563] MultivariateNormalFullCovariance added to
 contrib/distributions/ This MVN is parameterized by the full covariance
 matrix, *not* the square root (as the others are).

PiperOrigin-RevId: 155794471
---
 tensorflow/contrib/distributions/BUILD        |  17 ++
 tensorflow/contrib/distributions/__init__.py  |   2 +
 .../kernel_tests/mvn_full_covariance_test.py  | 169 ++++++++++++++++
 .../python/ops/mvn_full_covariance.py         | 187 ++++++++++++++++++
 4 files changed, 375 insertions(+)
 create mode 100644 tensorflow/contrib/distributions/python/kernel_tests/mvn_full_covariance_test.py
 create mode 100644 tensorflow/contrib/distributions/python/ops/mvn_full_covariance.py

diff --git a/tensorflow/contrib/distributions/BUILD b/tensorflow/contrib/distributions/BUILD
index 2b3c373ba0..8dea2763f2 100644
--- a/tensorflow/contrib/distributions/BUILD
+++ b/tensorflow/contrib/distributions/BUILD
@@ -302,6 +302,23 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "mvn_full_covariance_test",
+    size = "small",
+    srcs = ["python/kernel_tests/mvn_full_covariance_test.py"],
+    additional_deps = [
+        ":distributions_py",
+        "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 cuda_py_test(
     name = "mvn_tril_test",
     size = "small",
diff --git a/tensorflow/contrib/distributions/__init__.py b/tensorflow/contrib/distributions/__init__.py
index f6e08ce51f..1fddad5368 100644
--- a/tensorflow/contrib/distributions/__init__.py
+++ b/tensorflow/contrib/distributions/__init__.py
@@ -36,6 +36,7 @@ from tensorflow.contrib.distributions.python.ops.logistic import *
 from tensorflow.contrib.distributions.python.ops.mixture import *
 from tensorflow.contrib.distributions.python.ops.mvn_diag import *
 from tensorflow.contrib.distributions.python.ops.mvn_diag_plus_low_rank import *
+from tensorflow.contrib.distributions.python.ops.mvn_full_covariance import *
 from tensorflow.contrib.distributions.python.ops.mvn_tril import *
 from tensorflow.contrib.distributions.python.ops.negative_binomial import *
 from tensorflow.contrib.distributions.python.ops.normal_conjugate_posteriors import *
@@ -116,6 +117,7 @@ _allowed_symbols = [
     'StudentTWithAbsDfSoftplusScale',
     'Uniform',
     'MultivariateNormalDiag',
+    'MultivariateNormalFullCovariance',
     'MultivariateNormalTriL',
     'MultivariateNormalDiagPlusLowRank',
     'MultivariateNormalDiagWithSoftplusScale',
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/mvn_full_covariance_test.py b/tensorflow/contrib/distributions/python/kernel_tests/mvn_full_covariance_test.py
new file mode 100644
index 0000000000..6dfab46ebe
--- /dev/null
+++ b/tensorflow/contrib/distributions/python/kernel_tests/mvn_full_covariance_test.py
@@ -0,0 +1,169 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for MultivariateNormalFullCovariance."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+from scipy import stats
+from tensorflow.contrib import distributions
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn_ops
+from tensorflow.python.platform import test
+
+
+ds = distributions
+rng = np.random.RandomState(42)
+
+
+class MultivariateNormalFullCovarianceTest(test.TestCase):
+
+  def _random_pd_matrix(self, *shape):
+    mat = rng.rand(*shape)
+    chol = ds.matrix_diag_transform(mat, transform=nn_ops.softplus)
+    chol = array_ops.matrix_band_part(chol, -1, 0)
+    return math_ops.matmul(chol, chol, adjoint_b=True).eval()
+
+  def testRaisesIfInitializedWithNonSymmetricMatrix(self):
+    with self.test_session():
+      mu = [1., 2.]
+      sigma = [[1., 0.], [1., 1.]]  # Nonsingular, but not symmetric
+      mvn = ds.MultivariateNormalFullCovariance(mu, sigma, validate_args=True)
+      with self.assertRaisesOpError("not symmetric"):
+        mvn.covariance().eval()
+
+  def testDoesNotRaiseIfInitializedWithSymmetricMatrix(self):
+    with self.test_session():
+      mu = rng.rand(10)
+      sigma = self._random_pd_matrix(10, 10)
+      mvn = ds.MultivariateNormalFullCovariance(mu, sigma, validate_args=True)
+      # Should not raise
+      mvn.covariance().eval()
+
+  def testLogPDFScalarBatch(self):
+    with self.test_session():
+      mu = rng.rand(2)
+      sigma = self._random_pd_matrix(2, 2)
+      mvn = ds.MultivariateNormalFullCovariance(mu, sigma, validate_args=True)
+      x = rng.rand(2)
+
+      log_pdf = mvn.log_prob(x)
+      pdf = mvn.prob(x)
+
+      scipy_mvn = stats.multivariate_normal(mean=mu, cov=sigma)
+
+      expected_log_pdf = scipy_mvn.logpdf(x)
+      expected_pdf = scipy_mvn.pdf(x)
+      self.assertEqual((), log_pdf.get_shape())
+      self.assertEqual((), pdf.get_shape())
+      self.assertAllClose(expected_log_pdf, log_pdf.eval())
+      self.assertAllClose(expected_pdf, pdf.eval())
+
+  def testLogPDFScalarBatchCovarianceNotProvided(self):
+    with self.test_session():
+      mu = rng.rand(2)
+      mvn = ds.MultivariateNormalFullCovariance(
+          mu, covariance_matrix=None, validate_args=True)
+      x = rng.rand(2)
+
+      log_pdf = mvn.log_prob(x)
+      pdf = mvn.prob(x)
+
+      # Initialize a scipy_mvn with the default covariance.
+      scipy_mvn = stats.multivariate_normal(mean=mu, cov=np.eye(2))
+
+      expected_log_pdf = scipy_mvn.logpdf(x)
+      expected_pdf = scipy_mvn.pdf(x)
+      self.assertEqual((), log_pdf.get_shape())
+      self.assertEqual((), pdf.get_shape())
+      self.assertAllClose(expected_log_pdf, log_pdf.eval())
+      self.assertAllClose(expected_pdf, pdf.eval())
+
+  def testShapes(self):
+    with self.test_session():
+      mu = rng.rand(3, 5, 2)
+      covariance = self._random_pd_matrix(3, 5, 2, 2)
+
+      mvn = ds.MultivariateNormalFullCovariance(
+          mu, covariance, validate_args=True)
+
+      # Shapes known at graph construction time.
+      self.assertEqual((2,), tuple(mvn.event_shape.as_list()))
+      self.assertEqual((3, 5), tuple(mvn.batch_shape.as_list()))
+
+      # Shapes known at runtime.
+      self.assertEqual((2,), tuple(mvn.event_shape_tensor().eval()))
+      self.assertEqual((3, 5), tuple(mvn.batch_shape_tensor().eval()))
+
+  def _random_mu_and_sigma(self, batch_shape, event_shape):
+    # This ensures sigma is positive def.
+    mat_shape = batch_shape + event_shape + event_shape
+    mat = rng.randn(*mat_shape)
+    perm = np.arange(mat.ndim)
+    perm[-2:] = [perm[-1], perm[-2]]
+    sigma = np.matmul(mat, np.transpose(mat, perm))
+
+    mu_shape = batch_shape + event_shape
+    mu = rng.randn(*mu_shape)
+
+    return mu, sigma
+
+  def testKLBatch(self):
+    batch_shape = (2,)
+    event_shape = (3,)
+    with self.test_session():
+      mu_a, sigma_a = self._random_mu_and_sigma(batch_shape, event_shape)
+      mu_b, sigma_b = self._random_mu_and_sigma(batch_shape, event_shape)
+      mvn_a = ds.MultivariateNormalFullCovariance(
+          loc=mu_a,
+          covariance_matrix=sigma_a,
+          validate_args=True)
+      mvn_b = ds.MultivariateNormalFullCovariance(
+          loc=mu_b,
+          covariance_matrix=sigma_b,
+          validate_args=True)
+
+      kl = ds.kl_divergence(mvn_a, mvn_b)
+      self.assertEqual(batch_shape, kl.get_shape())
+
+      kl_v = kl.eval()
+      expected_kl_0 = _compute_non_batch_kl(mu_a[0, :], sigma_a[0, :, :],
+                                            mu_b[0, :], sigma_b[0, :])
+      expected_kl_1 = _compute_non_batch_kl(mu_a[1, :], sigma_a[1, :, :],
+                                            mu_b[1, :], sigma_b[1, :])
+      self.assertAllClose(expected_kl_0, kl_v[0])
+      self.assertAllClose(expected_kl_1, kl_v[1])
+
+
+def _compute_non_batch_kl(mu_a, sigma_a, mu_b, sigma_b):
+  """Non-batch KL for N(mu_a, sigma_a), N(mu_b, sigma_b)."""
+  # Check using numpy operations
+  # This mostly repeats the tensorflow code _kl_mvn_mvn(), but in numpy.
+  # So it is important to also check that KL(mvn, mvn) = 0.
+  sigma_b_inv = np.linalg.inv(sigma_b)
+
+  t = np.trace(sigma_b_inv.dot(sigma_a))
+  q = (mu_b - mu_a).dot(sigma_b_inv).dot(mu_b - mu_a)
+  k = mu_a.shape[0]
+  l = np.log(np.linalg.det(sigma_b) / np.linalg.det(sigma_a))
+
+  return 0.5 * (t + q - k + l)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_full_covariance.py b/tensorflow/contrib/distributions/python/ops/mvn_full_covariance.py
new file mode 100644
index 0000000000..84809d8dc4
--- /dev/null
+++ b/tensorflow/contrib/distributions/python/ops/mvn_full_covariance.py
@@ -0,0 +1,187 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Multivariate Normal distribution class initialized with a full covariance."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.distributions.python.ops import mvn_tril
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import linalg_ops
+
+
+__all__ = [
+    "MultivariateNormalFullCovariance",
+]
+
+
+class MultivariateNormalFullCovariance(mvn_tril.MultivariateNormalTriL):
+  """The multivariate normal distribution on `R^k`.
+
+  The Multivariate Normal distribution is defined over `R^k` and parameterized
+  by a (batch of) length-`k` `loc` vector (aka "mu") and a (batch of) `k x k`
+  `covariance_matrix` matrices that are the covariance.
+  This is different than the other multivariate normals, which are parameterized
+  by a matrix more akin to the standard deviation.
+
+  #### Mathematical Details
+
+  The probability density function (pdf) is, with `@` as matrix multiplication,
+
+  ```none
+  pdf(x; loc, covariance_matrix) = exp(-0.5 ||y||**2) / Z,
+  y = (x - loc)^T @ inv(covariance_matrix) @ (x - loc)
+  Z = (2 pi)**(0.5 k) |det(covariance_matrix)|**(0.5).
+  ```
+
+  where:
+
+  * `loc` is a vector in `R^k`,
+  * `covariance_matrix` is an `R^{k x k}` symmetric positive definite matrix,
+  * `Z` denotes the normalization constant, and,
+  * `||y||**2` denotes the squared Euclidean norm of `y`.
+
+  Additional leading dimensions (if any) in `loc` and `covariance_matrix` allow
+  for batch dimensions.
+
+  The MultivariateNormal distribution is a member of the [location-scale
+  family](https://en.wikipedia.org/wiki/Location-scale_family), i.e., it can be
+  constructed e.g. as,
+
+  ```none
+  X ~ MultivariateNormal(loc=0, scale=1)   # Identity scale, zero shift.
+  scale = Cholesky(covariance_matrix)
+  Y = scale @ X + loc
+  ```
+
+  #### Examples
+
+  ```python
+  ds = tf.contrib.distributions
+
+  # Initialize a single 3-variate Gaussian.
+  mu = [1., 2, 3]
+  cov = [[ 0.36,  0.12,  0.06],
+         [ 0.12,  0.29, -0.13],
+         [ 0.06, -0.13,  0.26]]
+  mvn = ds.MultivariateNormalFullCovariance(
+      loc=mu,
+      covariance_matrix=cov)
+
+  mvn.mean().eval()
+  # ==> [1., 2, 3]
+
+  # Covariance agrees with covariance_matrix.
+  mvn.covariance().eval()
+  # ==> [[ 0.36,  0.12,  0.06],
+  #      [ 0.12,  0.29, -0.13],
+  #      [ 0.06, -0.13,  0.26]]
+
+  # Compute the pdf of an observation in `R^3` ; return a scalar.
+  mvn.prob([-1., 0, 1]).eval()  # shape: []
+
+  # Initialize a 2-batch of 3-variate Gaussians.
+  mu = [[1., 2, 3],
+        [11, 22, 33]]              # shape: [2, 3]
+  covariance_matrix = ...  # shape: [2, 3, 3], symmetric, positive definite.
+  mvn = ds.MultivariateNormalFullCovariance(
+      loc=mu,
+      covariance=covariance_matrix)
+
+  # Compute the pdf of two `R^3` observations; return a length-2 vector.
+  x = [[-0.9, 0, 0.1],
+       [-10, 0, 9]]     # shape: [2, 3]
+  mvn.prob(x).eval()    # shape: [2]
+
+  ```
+
+  """
+
+  def __init__(self,
+               loc=None,
+               covariance_matrix=None,
+               validate_args=False,
+               allow_nan_stats=True,
+               name="MultivariateNormalFullCovariance"):
+    """Construct Multivariate Normal distribution on `R^k`.
+
+    The `batch_shape` is the broadcast shape between `loc` and
+    `covariance_matrix` arguments.
+
+    The `event_shape` is given by last dimension of the matrix implied by
+    `covariance_matrix`. The last dimension of `loc` (if provided) must
+    broadcast with this.
+
+    A non-batch `covariance_matrix` matrix is a `k x k` symmetric positive
+    definite matrix.  In other words it is (real) symmetric with all eigenvalues
+    strictly positive.
+
+    Additional leading dimensions (if any) will index batches.
+
+    Args:
+      loc: Floating-point `Tensor`. If this is set to `None`, `loc` is
+        implicitly `0`. When specified, may have shape `[B1, ..., Bb, k]` where
+        `b >= 0` and `k` is the event size.
+      covariance_matrix: Floating-point, symmetric positive definite `Tensor` of
+        same `dtype` as `loc`.  The strict upper triangle of `covariance_matrix`
+        is ignored, so if `covariance_matrix` is not symmetric no error will be
+        raised (unless `validate_args is True`).  `covariance_matrix` has shape
+        `[B1, ..., Bb, k, k]` where `b >= 0` and `k` is the event size.
+      validate_args: Python `bool`, default `False`. When `True` distribution
+        parameters are checked for validity despite possibly degrading runtime
+        performance. When `False` invalid inputs may silently render incorrect
+        outputs.
+      allow_nan_stats: Python `bool`, default `True`. When `True`,
+        statistics (e.g., mean, mode, variance) use the value "`NaN`" to
+        indicate the result is undefined. When `False`, an exception is raised
+        if one or more of the statistic's batch members are undefined.
+      name: Python `str` name prefixed to Ops created by this class.
+
+    Raises:
+      ValueError: if neither `loc` nor `covariance_matrix` are specified.
+    """
+    parameters = locals()
+
+    # Convert the covariance_matrix up to a scale_tril and call MVNTriL.
+    with ops.name_scope(name):
+      with ops.name_scope("init", values=[loc, covariance_matrix]):
+        if covariance_matrix is None:
+          scale_tril = None
+        else:
+          covariance_matrix = ops.convert_to_tensor(
+              covariance_matrix, name="covariance_matrix")
+          if validate_args:
+            assert_symmetric = check_ops.assert_equal(
+                covariance_matrix,
+                array_ops.matrix_transpose(covariance_matrix),
+                message="Matrix was not symmetric.")
+            covariance_matrix = control_flow_ops.with_dependencies(
+                [assert_symmetric], covariance_matrix)
+          # No need to validate that covariance_matrix is non-singular.
+          # LinearOperatorTriL has an assert_non_singular method that is called
+          # by the Bijector.
+          # However, cholesky() ignores the upper triangular part, so we do need
+          # to separately assert symmetric.
+          scale_tril = linalg_ops.cholesky(covariance_matrix)
+        super(MultivariateNormalFullCovariance, self).__init__(
+            loc=loc,
+            scale_tril=scale_tril,
+            validate_args=validate_args,
+            allow_nan_stats=allow_nan_stats)
+    self._parameters = parameters
-- 
GitLab


From dce5a71d588079c86f74033a06e600fb7710ab9b Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Thu, 11 May 2017 14:09:33 -0700
Subject: [PATCH 1246/1563] FeatureColumn: Improved error message if there is a
 batch_size mismatch and shapes known at compile time.

PiperOrigin-RevId: 155794598
---
 .../python/feature_column/feature_column.py   |  25 ++++
 .../feature_column/feature_column_test.py     | 129 ++++++++++++++++++
 2 files changed, 154 insertions(+)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index f0a7de8668..b5a533d15e 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -212,7 +212,9 @@ def make_input_layer(features,
       None, default_name='make_input_layer', values=features.values()):
     builder = _LazyBuilder(features)
     output_tensors = []
+    ordered_columns = []
     for column in sorted(feature_columns, key=lambda x: x.name):
+      ordered_columns.append(column)
       with variable_scope.variable_scope(None, default_name=column.name):
         tensor = column._get_dense_tensor(  # pylint: disable=protected-access
             builder,
@@ -222,6 +224,7 @@ def make_input_layer(features,
         batch_size = array_ops.shape(tensor)[0]
         tensor = array_ops.reshape(tensor, shape=(batch_size, num_elements))
         output_tensors.append(tensor)
+    _verify_static_batch_size_equality(output_tensors, ordered_columns)
     return array_ops.concat(output_tensors, 1)
 
 
@@ -293,9 +296,11 @@ def make_linear_model(features,
   with variable_scope.variable_scope(
       None, default_name='make_linear_model', values=features.values()):
     weighted_sums = []
+    ordered_columns = []
     builder = _LazyBuilder(features)
     for column in sorted(feature_columns, key=lambda x: x.name):
       with variable_scope.variable_scope(None, default_name=column.name):
+        ordered_columns.append(column)
         if isinstance(column, _CategoricalColumn):
           weighted_sums.append(_create_categorical_column_weighted_sum(
               column, builder, units, sparse_combiner, weight_collections,
@@ -303,6 +308,7 @@ def make_linear_model(features,
         else:
           weighted_sums.append(_create_dense_column_weighted_sum(
               column, builder, units, weight_collections, trainable))
+    _verify_static_batch_size_equality(weighted_sums, ordered_columns)
     predictions_no_bias = math_ops.add_n(
         weighted_sums, name='weighted_sum_no_bias')
     bias = variable_scope.get_variable(
@@ -1495,12 +1501,15 @@ def _to_sparse_input(input_tensor, ignore_value=None):
 
 
 def _check_feature_columns(feature_columns):
+  """Verifies feature_columns input."""
   if isinstance(feature_columns, dict):
     raise ValueError('Expected feature_columns to be iterable, found dict.')
   for column in feature_columns:
     if not isinstance(column, _FeatureColumn):
       raise ValueError('Items of feature_columns must be a _FeatureColumn.'
                        'Given: {}.'.format(column))
+  if not feature_columns:
+    raise ValueError('feature_columns must not be empty.')
   name_to_column = dict()
   for column in feature_columns:
     if column.name in name_to_column:
@@ -2360,3 +2369,19 @@ class _IndicatorColumn(_DenseColumn,
     # Feature has been already transformed. Return the intermediate
     # representation created by _transform_feature.
     return inputs.get(self)
+
+
+def _verify_static_batch_size_equality(tensors, columns):
+  # bath_size is a tf.Dimension object.
+  expected_batch_size = None
+  for i in range(0, len(tensors)):
+    if tensors[i].shape[0].value is not None:
+      if expected_batch_size is None:
+        bath_size_column_index = i
+        expected_batch_size = tensors[i].shape[0]
+      elif not expected_batch_size.is_compatible_with(tensors[i].shape[0]):
+        raise ValueError(
+            'Batch size (first dimension) of each feature must be same. '
+            'Batch size of columns ({}, {}): ({}, {})'.format(
+                columns[bath_size_column_index].name, columns[i].name,
+                expected_batch_size, tensors[i].shape[0]))
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 977ab81ff6..7d4b59a5e5 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -1047,6 +1047,11 @@ def get_linear_model_column_var(column):
 
 class MakeLinearModelTest(test.TestCase):
 
+  def test_raises_if_empty_feature_columns(self):
+    with self.assertRaisesRegexp(ValueError,
+                                 'feature_columns must not be empty'):
+      fc.make_linear_model(features={}, feature_columns=[])
+
   def test_should_be_feature_column(self):
     with self.assertRaisesRegexp(ValueError, 'must be a _FeatureColumn'):
       fc.make_linear_model(
@@ -1417,9 +1422,74 @@ class MakeLinearModelTest(test.TestCase):
       self.assertIn('price_b', my_vars[1].name)
       self.assertIn('wire_cast', my_vars[2].name)
 
+  def test_static_batch_size_mismatch(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': [[1.], [5.], [7.]],  # batchsize = 3
+          'price2': [[3.], [4.]]  # batchsize = 2
+      }
+    with self.assertRaisesRegexp(
+        ValueError,
+        'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
+      fc.make_linear_model(features, [price1, price2])
+
+  def test_subset_of_static_batch_size_mismatch(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    price3 = fc.numeric_column('price3')
+    with ops.Graph().as_default():
+      features = {
+          'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 3
+          'price2': [[3.], [4.]],  # batchsize = 2
+          'price3': [[3.], [4.], [5.]]  # batchsize = 3
+      }
+      with self.assertRaisesRegexp(
+          ValueError,
+          'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
+        fc.make_linear_model(features, [price1, price2, price3])
+
+  def test_runtime_batch_size_mismatch(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 3
+          'price2': [[3.], [4.]]  # batchsize = 2
+      }
+      predictions = fc.make_linear_model(features, [price1, price2])
+      with _initialized_session() as sess:
+        with self.assertRaisesRegexp(errors.OpError,
+                                     'must have the same size and shape'):
+          sess.run(
+              predictions, feed_dict={features['price1']: [[1.], [5.], [7.]]})
+
+  def test_runtime_batch_size_matches(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
+          'price2': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
+      }
+      predictions = fc.make_linear_model(features, [price1, price2])
+      with _initialized_session() as sess:
+        sess.run(
+            predictions,
+            feed_dict={
+                features['price1']: [[1.], [5.]],
+                features['price2']: [[1.], [5.]],
+            })
+
 
 class MakeInputLayerTest(test.TestCase):
 
+  def test_raises_if_empty_feature_columns(self):
+    with self.assertRaisesRegexp(ValueError,
+                                 'feature_columns must not be empty'):
+      fc.make_input_layer(features={}, feature_columns=[])
+
   def test_should_be_dense_column(self):
     with self.assertRaisesRegexp(ValueError, 'must be a _DenseColumn'):
       fc.make_input_layer(
@@ -1512,6 +1582,65 @@ class MakeInputLayerTest(test.TestCase):
       with self.assertRaisesRegexp(Exception, 'must be a _DenseColumn'):
         fc.make_input_layer(features, [animal])
 
+  def test_static_batch_size_mismatch(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': [[1.], [5.], [7.]],  # batchsize = 3
+          'price2': [[3.], [4.]]  # batchsize = 2
+      }
+      with self.assertRaisesRegexp(
+          ValueError,
+          'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
+        fc.make_input_layer(features, [price1, price2])
+
+  def test_subset_of_static_batch_size_mismatch(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    price3 = fc.numeric_column('price3')
+    with ops.Graph().as_default():
+      features = {
+          'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 3
+          'price2': [[3.], [4.]],  # batchsize = 2
+          'price3': [[3.], [4.], [5.]]  # batchsize = 3
+      }
+      with self.assertRaisesRegexp(
+          ValueError,
+          'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
+        fc.make_input_layer(features, [price1, price2, price3])
+
+  def test_runtime_batch_size_mismatch(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 3
+          'price2': [[3.], [4.]]  # batchsize = 2
+      }
+      net = fc.make_input_layer(features, [price1, price2])
+      with _initialized_session() as sess:
+        with self.assertRaisesRegexp(errors.OpError,
+                                     'Dimensions of inputs should match'):
+          sess.run(net, feed_dict={features['price1']: [[1.], [5.], [7.]]})
+
+  def test_runtime_batch_size_matches(self):
+    price1 = fc.numeric_column('price1')
+    price2 = fc.numeric_column('price2')
+    with ops.Graph().as_default():
+      features = {
+          'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
+          'price2': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
+      }
+      net = fc.make_input_layer(features, [price1, price2])
+      with _initialized_session() as sess:
+        sess.run(
+            net,
+            feed_dict={
+                features['price1']: [[1.], [5.]],
+                features['price2']: [[1.], [5.]],
+            })
+
 
 class MakeParseExampleSpecTest(test.TestCase):
 
-- 
GitLab


From 4e3e8ca367eb9203ba2df07a3826be0005c18157 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 14:48:21 -0700
Subject: [PATCH 1247/1563] Handle 1d weights.

PiperOrigin-RevId: 155799189
---
 .../learn/python/learn/estimators/head.py     |  31 +++-
 .../python/learn/estimators/head_test.py      | 145 +++++++++++++++++-
 2 files changed, 161 insertions(+), 15 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index 52b4213463..e4ef6996d8 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -163,10 +163,10 @@ class Head(object):
           ModeFnOps.loss to compute and apply gradients.
       logits: logits `Tensor` to be used by the head.
       logits_input: `Tensor` from which to build logits, often needed when you
-        don't want to compute the logits. Typically this is the activation of the
-        last hidden layer in a DNN. Some heads (like the ones responsible for
-        candidate sampling) intrinsically avoid computing full logits and only
-        accepts logits_input.
+        don't want to compute the logits. Typically this is the activation of
+        the last hidden layer in a DNN. Some heads (like the ones responsible
+        for candidate sampling) intrinsically avoid computing full logits and
+        only accepts logits_input.
       scope: Optional scope for `variable_scope`.
 
     Returns:
@@ -1646,12 +1646,27 @@ class _MultiHead(Head):
 
 
 def _weight_tensor(features, weight_column_name):
-  """Returns weights as 1d `Tensor`."""
+  """Returns weights as `Tensor` of rank 0, or at least 2."""
   if not weight_column_name:
     return None
-  with ops.name_scope(None, "weight_tensor",
-                      tuple(six.itervalues(features))):
-    return math_ops.to_float(features[weight_column_name])
+  if weight_column_name not in features:
+    raise ValueError("Weights {} missing from features.".format(
+        weight_column_name))
+  with ops.name_scope(None, "weight_tensor", tuple(six.itervalues(features))):
+    weight_tensor = math_ops.to_float(features[weight_column_name])
+    shape = weight_tensor.get_shape()
+    rank = shape.ndims
+    # We don't bother with expanding dims of non-staticly shaped tensors or
+    # scalars, and >1d is already in a good format.
+    if rank == 1:
+      logging.warning(
+          "Weights {} has shape {}, expanding to make it 2d.",
+          weight_column_name, shape)
+      return (
+          sparse_ops.sparse_reshape(weight_tensor, (-1, 1))
+          if isinstance(weight_tensor, sparse_tensor.SparseTensor) else
+          array_ops.reshape(weight_tensor, (-1, 1)))
+    return weight_tensor
 
 
 # TODO(zakaria): This function is needed for backward compatibility and should
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head_test.py b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
index f7934fc188..012b919d63 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head_test.py
@@ -225,20 +225,56 @@ class RegressionHeadTest(test.TestCase):
       _assert_summary_tags(self, ["loss"])
       _assert_metrics(self, 5. / 3, {"loss": 5. / 3}, model_fn_ops)
 
-  def testRegressionWithWeights(self):
+  def testRegressionWithScalarWeights(self):
+    head = head_lib.regression_head(weight_column_name="label_weight")
+    with ops.Graph().as_default(), session.Session():
+      weights = 2.
+      labels = ((0.,), (1.,), (1.,))
+      model_fn_ops = head.create_model_fn_ops(
+          features={"label_weight": weights},
+          labels=labels,
+          mode=model_fn.ModeKeys.TRAIN,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=((1.,), (1.,), (3.,)))
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["loss"])
+      _assert_metrics(self, (weights * 5.) / len(labels), {
+          "loss": (weights * 5.) / (weights * len(labels))
+      }, model_fn_ops)
+
+  def testRegressionWith1DWeights(self):
+    head = head_lib.regression_head(weight_column_name="label_weight")
+    with ops.Graph().as_default(), session.Session():
+      weights = (2., 5., 0.)
+      labels = ((0.,), (1.,), (1.,))
+      model_fn_ops = head.create_model_fn_ops(
+          features={"label_weight": weights},
+          labels=labels,
+          mode=model_fn.ModeKeys.TRAIN,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=((1.,), (1.,), (3.,)))
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["loss"])
+      _assert_metrics(self, 2. / len(labels), {"loss": 2. / np.sum(weights)},
+                      model_fn_ops)
+
+  def testRegressionWith2DWeights(self):
     head = head_lib.regression_head(weight_column_name="label_weight")
     with ops.Graph().as_default(), session.Session():
       weights = ((2.,), (5.,), (0.,))
+      labels = ((0.,), (1.,), (1.,))
       model_fn_ops = head.create_model_fn_ops(
           features={"label_weight": weights},
-          labels=((0.,), (1.,), (1.,)),
+          labels=labels,
           mode=model_fn.ModeKeys.TRAIN,
           train_op_fn=head_lib.no_op_train_fn,
           logits=((1.,), (1.,), (3.,)))
       self._assert_output_alternatives(model_fn_ops)
       _assert_no_variables(self)
       _assert_summary_tags(self, ["loss"])
-      _assert_metrics(self, 2. / len(weights), {"loss": 2. / np.sum(weights)},
+      _assert_metrics(self, 2. / len(labels), {"loss": 2. / np.sum(weights)},
                       model_fn_ops)
 
   def testRegressionWithCenteredBias(self):
@@ -525,7 +561,7 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
 
-  def testMultiLabelWithWeight(self):
+  def testMultiLabelWithScalarWeight(self):
     n_classes = 3
     head = head_lib.multi_label_head(
         n_classes=n_classes,
@@ -544,7 +580,23 @@ class MultiLabelHeadTest(test.TestCase):
       _assert_metrics(self, .089985214,
                       self._expected_eval_metrics(.89985214), model_fn_ops)
 
-  def testMultiLabelWithMultiDimensionalWeight(self):
+  def testMultiLabelWith1DWeight(self):
+    n_classes = 3
+    head = head_lib.multi_label_head(
+        n_classes=n_classes,
+        weight_column_name="label_weight",
+        metric_class_ids=range(n_classes))
+    with ops.Graph().as_default(), session.Session():
+      with self.assertRaisesRegexp(
+          ValueError, "weights can not be broadcast to values"):
+        head.create_model_fn_ops(
+            features={"label_weight": (.1, .1, .1)},
+            labels=self._labels,
+            mode=model_fn.ModeKeys.TRAIN,
+            train_op_fn=head_lib.no_op_train_fn,
+            logits=self._logits)
+
+  def testMultiLabelWith2DWeight(self):
     n_classes = 3
     head = head_lib.multi_label_head(
         n_classes=n_classes,
@@ -843,7 +895,42 @@ class BinaryClassificationHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
 
-  def testBinaryClassificationWithWeights(self):
+  def testBinaryClassificationWith1DWeights(self):
+    n_classes = 2
+    head = head_lib.multi_class_head(
+        n_classes=n_classes, weight_column_name="label_weight")
+    with ops.Graph().as_default(), session.Session():
+      weights = (1., 0.)
+      # logloss: z:label, x:logit
+      # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
+      model_fn_ops = head.create_model_fn_ops(
+          features={"label_weight": weights},
+          labels=self._labels,
+          mode=model_fn.ModeKeys.TRAIN,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=self._logits)
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["loss"])
+      expected_total_loss = .31326166
+      _assert_metrics(
+          self,
+          expected_total_loss / len(weights),
+          {
+              "accuracy": 1. / 1,
+              "accuracy/baseline_label_mean": 1. / 1,
+              "accuracy/threshold_0.500000_mean": 1. / 1,
+              "auc": 0. / 1,
+              "labels/actual_label_mean": 1. / 1,
+              "labels/prediction_mean": .731059,  # softmax
+              # eval loss is weighted loss divided by sum of weights.
+              "loss": expected_total_loss,
+              "precision/positive_threshold_0.500000_mean": 1. / 1,
+              "recall/positive_threshold_0.500000_mean": 1. / 1,
+          },
+          model_fn_ops)
+
+  def testBinaryClassificationWith2DWeights(self):
     n_classes = 2
     head = head_lib.multi_class_head(
         n_classes=n_classes, weight_column_name="label_weight")
@@ -1154,6 +1241,30 @@ class MultiClassHeadTest(test.TestCase):
       _assert_metrics(self, expected_loss * weight,
                       self._expected_eval_metrics(expected_loss), model_fn_ops)
 
+  def testMultiClassWith1DWeight(self):
+    n_classes = 3
+    head = head_lib.multi_class_head(
+        n_classes=n_classes,
+        weight_column_name="label_weight",
+        metric_class_ids=range(n_classes))
+    with ops.Graph().as_default(), session.Session():
+      weight = .1
+      weights = (weight,)
+      # logloss: z:label, x:logit
+      # z * -log(sigmoid(x)) + (1 - z) * -log(1 - sigmoid(x))
+      model_fn_ops = head.create_model_fn_ops(
+          features={"label_weight": weights},
+          labels=self._labels,
+          mode=model_fn.ModeKeys.TRAIN,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=self._logits)
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["loss"])
+      expected_loss = 1.5514447
+      _assert_metrics(self, expected_loss * weight,
+                      self._expected_eval_metrics(expected_loss), model_fn_ops)
+
   def testMultiClassWith2DWeight(self):
     n_classes = 3
     head = head_lib.multi_class_head(
@@ -1457,7 +1568,27 @@ class BinarySvmHeadTest(test.TestCase):
           "loss": expected_loss,
       }, model_fn_ops)
 
-  def testBinarySVMWithWeights(self):
+  def testBinarySVMWith1DWeights(self):
+    head = head_lib.binary_svm_head(weight_column_name="weights")
+    with ops.Graph().as_default(), session.Session():
+      weights = (7., 11.)
+      model_fn_ops = head.create_model_fn_ops(
+          # We have to add an extra dim here for weights broadcasting to work.
+          features={"weights": weights},
+          mode=model_fn.ModeKeys.TRAIN,
+          labels=self._labels,
+          train_op_fn=head_lib.no_op_train_fn,
+          logits=self._predictions)
+      self._assert_output_alternatives(model_fn_ops)
+      _assert_no_variables(self)
+      _assert_summary_tags(self, ["loss"])
+      expected_weighted_losses = np.multiply(weights, self._expected_losses)
+      _assert_metrics(self, np.mean(expected_weighted_losses), {
+          "accuracy": 1.,
+          "loss": np.sum(expected_weighted_losses) / np.sum(weights),
+      }, model_fn_ops)
+
+  def testBinarySVMWith2DWeights(self):
     head = head_lib.binary_svm_head(weight_column_name="weights")
     with ops.Graph().as_default(), session.Session():
       weights = (7., 11.)
-- 
GitLab


From 61d56290b0172e8a20aaad9a1d1c7f7f78fa5b6a Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 11 May 2017 15:06:47 -0700
Subject: [PATCH 1248/1563] Use coarse grained namespace for storage

PiperOrigin-RevId: 155801412
---
 .../components/tf_dashboard_common_d3v4/BUILD      |  5 +----
 .../tf_dashboard_common_d3v4/tf-categorizer.ts     |  2 +-
 .../tf_dashboard_common_d3v4/tf-multi-checkbox.ts  | 14 +++++++-------
 .../tf_dashboard_common_d3v4/tf-regex-group.ts     |  8 +++++---
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
index 5361feaabf..fe6efd706d 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
@@ -98,10 +98,7 @@ tensorboard_typescript_bundle(
     ]},
     namespace_symbol_aliases = {"TF.Dashboard": {
         "compareTagNames": "VZ.Sorting.compareTagNames",
-        "getObjectInitializer": "TF.URIStorage.getObjectInitializer",
-        "getObjectObserver": "TF.URIStorage.getObjectObserver",
-        "getStringInitializer": "TF.URIStorage.getStringInitializer",
-        "getStringObserver": "TF.URIStorage.getStringObserver",
+        "storage": "TF.URIStorage",
     }},
 )
 
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
index c9da9a17eb..60bf10e0b6 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
@@ -14,7 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
-import {compareTagNames} from '../vz_sorting_d3v4/sorting'
+import {compareTagNames} from '../vz-sorting/sorting';
 
 /**
  * This module contains methods that allow sorting tags into 'categories'.
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts
index 51206dd18c..44a14a21cf 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.ts
@@ -13,9 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import * as _ from 'lodash'
-
-import {getObjectInitializer, getObjectObserver, getStringInitializer, getStringObserver} from '../tf_storage_d3v4/storage'
+import * as _ from 'lodash';
+import * as storage from '../tf-storage/storage';
 
 Polymer({
   is: 'tf-multi-checkbox',
@@ -28,7 +27,7 @@ Polymer({
     },  // All the runs in consideration
     regexInput: {
       type: String,
-      value: getStringInitializer('regexInput', ''),
+      value: storage.getStringInitializer('regexInput', ''),
       observer: '_regexInputObserver',
     },  // Regex for filtering the runs
     regex: {type: Object, computed: '_makeRegex(regexInput)'},
@@ -40,7 +39,7 @@ Polymer({
       // if a run is explicitly enabled, True, if explicitly disabled, False.
       // if undefined, default value (enable for first k runs, disable after).
       type: Object,
-      value: getObjectInitializer('runSelectionState', {}),
+      value: storage.getObjectInitializer('runSelectionState', {}),
       observer: '_storeRunToIsCheckedMapping',
     },
     // (Allows state to persist across regex filtering)
@@ -91,7 +90,8 @@ Polymer({
   observers: [
     '_setIsolatorIcon(runSelectionState, names)',
   ],
-  _storeRunToIsCheckedMapping: getObjectObserver('runSelectionState', {}),
+  _storeRunToIsCheckedMapping:
+      storage.getObjectObserver('runSelectionState', {}),
   _makeRegex: function(regex) {
     try {
       return new RegExp(regex)
@@ -176,7 +176,7 @@ Polymer({
   _isChecked: function(item, outSelectedChange) {
     return this.outSelected.indexOf(item) != -1;
   },
-  _regexInputObserver: getStringObserver('regexInput', ''),
+  _regexInputObserver: storage.getStringObserver('regexInput', ''),
   toggleAll: function() {
     var _this = this;
     var anyToggledOn = this.namesMatchingRegex.some(function(n) {
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts
index 2c11be0e0b..92a0eb6a0b 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.ts
@@ -13,14 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {getObjectInitializer, getObjectObserver} from '../tf_storage_d3v4/storage'
+import * as storage from '../tf-storage/storage';
 
 Polymer({
   is: 'tf-regex-group',
   properties: {
     rawRegexes: {
       type: Array,
-      value: getObjectInitializer('rawRegexes', [{regex: '', valid: true}]),
+      value: storage.getObjectInitializer(
+          'rawRegexes', [{regex: '', valid: true}]),
     },
     regexes:
         {type: Array, computed: 'usableRegexes(rawRegexes.*)', notify: true},
@@ -30,7 +31,8 @@ Polymer({
     'checkValidity(rawRegexes.*)',
     '_uriStoreRegexes(rawRegexes.*)',
   ],
-  _uriStoreRegexes: getObjectObserver('rawRegexes', [{regex: '', valid: true}]),
+  _uriStoreRegexes:
+      storage.getObjectObserver('rawRegexes', [{regex: '', valid: true}]),
   checkValidity: function(x) {
     var match = x.path.match(/rawRegexes\.(\d+)\.regex/);
     if (match) {
-- 
GitLab


From e52fc916bc23e0fe99ccc5f2cf76bccfabfbd932 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 11 May 2017 15:09:48 -0700
Subject: [PATCH 1249/1563] Improved regression test

PiperOrigin-RevId: 155801810
---
 .../grappler/costs/op_level_cost_estimator.cc |  8 ++-
 .../core/grappler/costs/virtual_placer.cc     |  2 +-
 .../optimizers/static_schedule_test.cc        | 60 ++++++++++++++++---
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
index 84e5461d7f..5298dc7565 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.cc
@@ -77,7 +77,13 @@ std::pair<double, double> OpLevelCostEstimator::GetDeviceInfo(
   }
 
   if (device.type() == "CPU") {
-    const DeviceProperties local_cpu = GetLocalCPUInfo();
+    DeviceProperties local_cpu;
+    if (device.num_cores() <= 0 || device.frequency() <= 0) {
+      local_cpu = GetLocalCPUInfo();
+    } else {
+      local_cpu = device;
+    }
+
     // Check if vector instructions are available, and refine performance
     // prediction based on this.
     // Frequencies are stored in MHz in the DeviceProperties.
diff --git a/tensorflow/core/grappler/costs/virtual_placer.cc b/tensorflow/core/grappler/costs/virtual_placer.cc
index 72736af819..dc2ca30b00 100644
--- a/tensorflow/core/grappler/costs/virtual_placer.cc
+++ b/tensorflow/core/grappler/costs/virtual_placer.cc
@@ -42,7 +42,7 @@ const DeviceProperties& VirtualPlacer::get_device(const NodeDef& node) const {
     if (it != devices_.end()) {
       return it->second;
     }
-    if (DeviceNameUtils::ParseFullName(node.device(), &parsed)) {
+    if (DeviceNameUtils::ParseLocalName(node.device(), &parsed)) {
       string device_name =
           strings::StrCat("/job:localhost/replica:0/task:0/",
                           str_util::Lowercase(parsed.type), ":", parsed.id);
diff --git a/tensorflow/core/grappler/optimizers/static_schedule_test.cc b/tensorflow/core/grappler/optimizers/static_schedule_test.cc
index a96ee69ce3..31d400823c 100644
--- a/tensorflow/core/grappler/optimizers/static_schedule_test.cc
+++ b/tensorflow/core/grappler/optimizers/static_schedule_test.cc
@@ -27,7 +27,23 @@ namespace tensorflow {
 namespace grappler {
 namespace {
 
-class StaticScheduleTest : public ::testing::Test {};
+class StaticScheduleTest : public ::testing::Test {
+ public:
+  VirtualCluster CreateVirtualCluster() const {
+    // Invent a CPU so that predictions remain the same from machine to machine.
+    DeviceProperties cpu_device;
+    cpu_device.set_type("CPU");
+    cpu_device.set_frequency(1000);
+    cpu_device.set_num_cores(4);
+    cpu_device.set_bandwidth(32);
+    cpu_device.set_l1_cache_size(32 * 1024);
+    cpu_device.set_l2_cache_size(256 * 1024);
+    cpu_device.set_l3_cache_size(4 * 1024 * 1024);
+    std::unordered_map<string, DeviceProperties> devices;
+    devices["/job:localhost/replica:0/task:0/cpu:0"] = cpu_device;
+    return VirtualCluster(devices);
+  }
+};
 
 TEST_F(StaticScheduleTest, BasicGraph) {
   // This trivial graph is so basic there's nothing to prune.
@@ -35,10 +51,7 @@ TEST_F(StaticScheduleTest, BasicGraph) {
   GrapplerItem item;
   CHECK(fake_input.NextItem(&item));
 
-  DeviceProperties cpu_device;
-  std::unordered_map<string, DeviceProperties> devices;
-  devices["CPU"] = cpu_device;
-  VirtualCluster cluster(devices);
+  VirtualCluster cluster(CreateVirtualCluster());
 
   std::unordered_map<const NodeDef*, Costs::NanoSeconds> completion_times;
   Status status =
@@ -46,6 +59,24 @@ TEST_F(StaticScheduleTest, BasicGraph) {
   TF_EXPECT_OK(status);
 
   EXPECT_EQ(item.graph.node_size(), completion_times.size());
+
+  for (auto time : completion_times) {
+    if (time.first->name() == "Const/Const") {
+      EXPECT_EQ(Costs::NanoSeconds(0), time.second);
+    } else if (time.first->name() == "x") {
+      EXPECT_EQ(Costs::NanoSeconds(250000), time.second);
+    } else if (time.first->name() == "AddN") {
+      EXPECT_EQ(Costs::NanoSeconds(1500000), time.second);
+    } else if (time.first->name() == "AddN_1") {
+      EXPECT_EQ(Costs::NanoSeconds(2750000), time.second);
+    } else if (time.first->name() == "AddN_2") {
+      EXPECT_EQ(Costs::NanoSeconds(4000000), time.second);
+    } else if (time.first->name() == "AddN_3") {
+      EXPECT_EQ(Costs::NanoSeconds(5250000), time.second);
+    } else if (time.first->name() == "y") {
+      EXPECT_EQ(Costs::NanoSeconds(6500000), time.second);
+    }
+  }
 }
 
 TEST_F(StaticScheduleTest, BasicGraphWithCtrlDependencies) {
@@ -66,10 +97,7 @@ TEST_F(StaticScheduleTest, BasicGraphWithCtrlDependencies) {
   EXPECT_EQ("e", item.graph.node(4).name());
   *item.graph.mutable_node(4)->add_input() = "^c";
 
-  DeviceProperties cpu_device;
-  std::unordered_map<string, DeviceProperties> devices;
-  devices["CPU"] = cpu_device;
-  VirtualCluster cluster(devices);
+  VirtualCluster cluster(CreateVirtualCluster());
 
   std::unordered_map<const NodeDef*, Costs::NanoSeconds> completion_times;
   Status status =
@@ -77,6 +105,20 @@ TEST_F(StaticScheduleTest, BasicGraphWithCtrlDependencies) {
   TF_EXPECT_OK(status);
 
   EXPECT_EQ(item.graph.node_size(), completion_times.size());
+
+  for (auto time : completion_times) {
+    if (time.first->name() == "a") {
+      EXPECT_EQ(Costs::NanoSeconds(0), time.second);
+    } else if (time.first->name() == "b") {
+      EXPECT_EQ(Costs::NanoSeconds(12500000), time.second);
+    } else if (time.first->name() == "c") {
+      EXPECT_EQ(Costs::NanoSeconds(12500000), time.second);
+    } else if (time.first->name() == "d") {
+      EXPECT_EQ(Costs::NanoSeconds(12500000), time.second);
+    } else if (time.first->name() == "e") {
+      EXPECT_EQ(Costs::NanoSeconds(25000000), time.second);
+    }
+  }
 }
 
 }  // namespace
-- 
GitLab


From 33d977e9c95b57dd0690d716432742a3ab71af4c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 15:40:04 -0700
Subject: [PATCH 1250/1563] Making tf.case deterministic when given an
 unordered dictionary of predicates.

PiperOrigin-RevId: 155805373
---
 tensorflow/python/ops/control_flow_ops.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/ops/control_flow_ops.py b/tensorflow/python/ops/control_flow_ops.py
index 4380f916e2..96ace6e79b 100644
--- a/tensorflow/python/ops/control_flow_ops.py
+++ b/tensorflow/python/ops/control_flow_ops.py
@@ -50,6 +50,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import collections
+
 import six
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
@@ -2985,6 +2987,11 @@ def case(pred_fn_pairs, default, exclusive=False, strict=False, name="case"):
   a callable, they are implicitly unpacked to single values. This
   behavior is disabled by passing `strict=True`.
 
+  If an unordered dictionary is used for `pred_fn_pairs`, the order of the
+  conditional tests is not guaranteed. However, the order is guaranteed to be
+  deterministic, so that variables created in conditional branches are created
+  in fixed order across runs.
+
   Example 1:
     Pseudocode:
     ```
@@ -3040,11 +3047,14 @@ def case(pred_fn_pairs, default, exclusive=False, strict=False, name="case"):
           or isinstance(pfp, dict)):
     raise TypeError("fns must be a list, tuple, or dict")
   if isinstance(pfp, dict):
-    pfp = pfp.items()
-    if not exclusive:
-      logging.warn("%s: Provided dictionary of predicate/fn pairs, but "
-                   "exclusive=False.  Order of conditional tests is "
-                   "not guaranteed.", name)
+    if isinstance(pfp, collections.OrderedDict):
+      pfp = pfp.items()
+    else:
+      pfp = sorted(pfp.items(), key=lambda item: item[0].name)
+      if not exclusive:
+        logging.warn("%s: An unordered dictionary of predicate/fn pairs was "
+                     "provided, but exclusive=False. The order of conditional "
+                     "tests is deterministic but not guaranteed.", name)
   for tup in pfp:
     if not isinstance(tup, _basetuple) or len(tup) != 2:
       raise TypeError("Each entry in pred_fn_pairs must be a 2-tuple")
-- 
GitLab


From a9c50eabd8f19d9695a5b017c7a33921fbbd8f78 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 15:44:08 -0700
Subject: [PATCH 1251/1563] Fixes markdown formatting.

PiperOrigin-RevId: 155806609
---
 tensorflow/python/layers/normalization.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index b3d28f010f..bbb11dbfe1 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -365,12 +365,14 @@ def batch_normalization(inputs,
   Note: the operations which update the `moving_mean` and `moving_variance`
   variables will not be added as dependencies of your training operation and so
   must be run separately. For example:
+
   ```
   extra_update_ops = tf.get_collection(tf.GraphKeys.UPDATE_OPS)
   sess.run([train_op, extra_update_ops], ...)
   ```
   Alternatively, add the operations as a dependency to your training operation
   manually, and then just run your training operation as normal:
+
   ```
   extra_update_ops = tf.get_collection(tf.GraphKeys.UPDATE_OPS)
   with tf.control_dependencies(extra_update_ops):
-- 
GitLab


From 90b32e54da641f023e72fc80222bf2acbfb57a4c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 16:02:56 -0700
Subject: [PATCH 1252/1563] Rename some fields, from discussion in
 go/tf-feature-column and other cls.

PiperOrigin-RevId: 155809199
---
 .../python/layers/feature_column_ops_test.py  |  56 ++---
 .../python/feature_column/feature_column.py   | 123 +++++-----
 .../feature_column/feature_column_test.py     | 225 +++++++++---------
 3 files changed, 197 insertions(+), 207 deletions(-)

diff --git a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
index 74d8f24071..797a7c11db 100644
--- a/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
+++ b/tensorflow/contrib/layers/python/layers/feature_column_ops_test.py
@@ -599,7 +599,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     }
     columns = [one_hot_column, embedding_column, real_valued_column]
     output = feature_column_ops.input_from_feature_columns(features, columns)
-    output_core = fc_core.make_input_layer(features, columns)
+    output_core = fc_core.input_layer(features, columns)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
@@ -616,8 +616,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
       self.assertAllClose(output.eval(), features["price"].eval())
       # Verify cross compatibility: Core builder output should equal to contrib.
       self.assertAllClose(output.eval(),
-                          fc_core.make_input_layer(features,
-                                                   [real_valued]).eval())
+                          fc_core.input_layer(features, [real_valued]).eval())
 
   def testRealValuedColumnWithMultiDimensions(self):
     real_valued = feature_column.real_valued_column("price", 2)
@@ -630,8 +629,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
       self.assertAllClose(output.eval(), features["price"].eval())
       # Verify cross compatibility: Core builder output should equal to contrib.
       self.assertAllClose(output.eval(),
-                          fc_core.make_input_layer(features,
-                                                   [real_valued]).eval())
+                          fc_core.input_layer(features, [real_valued]).eval())
 
   def testRealValuedColumnDense(self):
     var_len_real_valued = feature_column._real_valued_var_len_column(
@@ -665,8 +663,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
       self.assertAllClose(output.eval(), features["price"].eval() - 2)
       # Verify cross compatibility: Core builder output should equal to contrib.
       self.assertAllClose(output.eval(),
-                          fc_core.make_input_layer(features,
-                                                   [real_valued]).eval())
+                          fc_core.input_layer(features, [real_valued]).eval())
 
   def testRealValuedColumnWithMultiDimensionsAndNormalizer(self):
     real_valued = feature_column.real_valued_column(
@@ -680,8 +677,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
       self.assertAllClose(output.eval(), features["price"].eval() - 2)
       # Verify cross compatibility: Core builder output should equal to contrib.
       self.assertAllClose(output.eval(),
-                          fc_core.make_input_layer(features,
-                                                   [real_valued]).eval())
+                          fc_core.input_layer(features, [real_valued]).eval())
 
   def testBucketizedColumnWithNormalizerSucceedsForDNN(self):
     bucket = feature_column.bucketized_column(
@@ -695,7 +691,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     with self.test_session():
       self.assertAllClose(output.eval(), expected)
       self.assertAllClose(output.eval(),
-                          fc_core.make_input_layer(features, [bucket]).eval())
+                          fc_core.input_layer(features, [bucket]).eval())
 
   def testBucketizedColumnWithMultiDimensionsSucceedsForDNN(self):
     bucket = feature_column.bucketized_column(
@@ -711,7 +707,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     with self.test_session():
       self.assertAllClose(output.eval(), expected)
       self.assertAllClose(output.eval(),
-                          fc_core.make_input_layer(features, [bucket]).eval())
+                          fc_core.input_layer(features, [bucket]).eval())
 
   def testOneHotColumnFromWeightedSparseColumnSucceedsForDNN(self):
     ids_column = feature_column.sparse_column_with_keys(
@@ -730,7 +726,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     one_hot_column = feature_column.one_hot_column(weighted_ids_column)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_column])
-    output_core = fc_core.make_input_layer(features, [one_hot_column])
+    output_core = fc_core.input_layer(features, [one_hot_column])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
@@ -750,7 +746,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     features = {"ids": ids_tensor}
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
-    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
+    output_core = fc_core.input_layer(features, [one_hot_sparse])
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
@@ -771,7 +767,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     features = {"ids": ids_tensor}
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
-    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
+    output_core = fc_core.input_layer(features, [one_hot_sparse])
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
@@ -794,7 +790,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     }
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
-    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
+    output_core = fc_core.input_layer(features, [one_hot_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual([[0, 0, 1, 0], [0, 1, 0, 0], [1, 0, 1, 0]],
@@ -812,7 +808,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     one_hot_sparse = feature_column.one_hot_column(hashed_sparse)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [one_hot_sparse])
-    output_core = fc_core.make_input_layer(features, [one_hot_sparse])
+    output_core = fc_core.input_layer(features, [one_hot_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
@@ -830,7 +826,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     embeded_sparse = feature_column.embedding_column(hashed_sparse, 10)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [embeded_sparse])
-    output_core = fc_core.make_input_layer(features, [embeded_sparse])
+    output_core = fc_core.input_layer(features, [embeded_sparse])
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(output.eval().shape, [4, 10])
@@ -853,7 +849,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     grad = gradients_impl.gradients(output, weights)
     # Calcuates the tensors calculated by FC core libs. Later, the values will
     # be compared with the contrib version.
-    output_core = fc_core.make_input_layer(
+    output_core = fc_core.input_layer(
         features, [embedded_sparse], weight_collections=["my_collection_core"])
     weights_core = ops.get_collection("my_collection_core")
     grad_core = gradients_impl.gradients(output_core, weights_core)
@@ -884,7 +880,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
         initializer=init_ops.constant_initializer(init_value))
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [embeded_sparse])
-    output_core = fc_core.make_input_layer(features, [embeded_sparse])
+    output_core = fc_core.input_layer(features, [embeded_sparse])
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
@@ -938,7 +934,7 @@ class CreateInputLayersForDNNsTest(test.TestCase):
     embeded_sparse = feature_column.embedding_column(weighted_ids, 10)
     output = feature_column_ops.input_from_feature_columns(features,
                                                            [embeded_sparse])
-    output_core = fc_core.make_input_layer(features, [embeded_sparse])
+    output_core = fc_core.input_layer(features, [embeded_sparse])
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
@@ -1600,7 +1596,7 @@ class WeightedSumTest(test.TestCase):
     features = {"wire": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [hashed_sparse], num_outputs=5)
-    logits_core = fc_core.make_linear_model(features, [hashed_sparse], units=5)
+    logits_core = fc_core.linear_model(features, [hashed_sparse], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
@@ -1618,7 +1614,7 @@ class WeightedSumTest(test.TestCase):
     features = {"wire": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [hashed_sparse], num_outputs=5)
-    logits_core = fc_core.make_linear_model(features, [hashed_sparse], units=5)
+    logits_core = fc_core.linear_model(features, [hashed_sparse], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
@@ -1632,7 +1628,7 @@ class WeightedSumTest(test.TestCase):
     features = {"wire": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [hashed_sparse], num_outputs=5)
-    logits_core = fc_core.make_linear_model(features, [hashed_sparse], units=5)
+    logits_core = fc_core.linear_model(features, [hashed_sparse], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
@@ -1654,7 +1650,7 @@ class WeightedSumTest(test.TestCase):
     features = {"ids": ids_tensor, "weights": weights_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [weighted_ids], num_outputs=5)
-    logits_core = fc_core.make_linear_model(features, [weighted_ids], units=5)
+    logits_core = fc_core.linear_model(features, [weighted_ids], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       lookup_ops.tables_initializer().run()
@@ -1672,7 +1668,7 @@ class WeightedSumTest(test.TestCase):
     features = {"ids": ids_tensor, "weights": weights_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [weighted_ids], num_outputs=5)
-    logits_core = fc_core.make_linear_model(features, [weighted_ids], units=5)
+    logits_core = fc_core.linear_model(features, [weighted_ids], units=5)
 
     with self.test_session():
       variables_lib.global_variables_initializer().run()
@@ -1694,7 +1690,7 @@ class WeightedSumTest(test.TestCase):
     features = {"aaa": wire_tensor, "bbb": wire_tensor}
     logits, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [crossed], num_outputs=5)
-    logits_core = fc_core.make_linear_model(features, [crossed], units=5)
+    logits_core = fc_core.linear_model(features, [crossed], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
       self.assertAllEqual(logits.eval().shape, [2, 5])
@@ -1733,7 +1729,7 @@ class WeightedSumTest(test.TestCase):
       output, column_to_variable, _ = (
           feature_column_ops.weighted_sum_from_feature_columns(
               features, [movies], num_outputs=1))
-      logits_core = fc_core.make_linear_model(features, [movies])
+      logits_core = fc_core.linear_model(features, [movies])
 
       with self.test_session() as sess:
         variables_lib.initialize_all_variables().run()
@@ -1791,7 +1787,7 @@ class WeightedSumTest(test.TestCase):
     }
     output, _, _ = feature_column_ops.weighted_sum_from_feature_columns(
         features, [real_valued, bucket, hashed_sparse, crossed], num_outputs=5)
-    output_core = fc_core.make_linear_model(
+    output_core = fc_core.linear_model(
         features, [real_valued, bucket, hashed_sparse, crossed], units=5)
     with self.test_session():
       variables_lib.global_variables_initializer().run()
@@ -2206,7 +2202,7 @@ class WeightedSumTest(test.TestCase):
       output, column_to_variable, _ = (
           feature_column_ops.weighted_sum_from_feature_columns(
               features, [bucket], num_outputs=1))
-      output_core = fc_core.make_linear_model(features, [bucket])
+      output_core = fc_core.linear_model(features, [bucket])
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
         lookup_ops.tables_initializer().run()
@@ -2237,7 +2233,7 @@ class WeightedSumTest(test.TestCase):
       output, column_to_variable, _ = (
           feature_column_ops.weighted_sum_from_feature_columns(
               features, [bucket, country], num_outputs=1))
-      output_core = fc_core.make_linear_model(features, [bucket, country])
+      output_core = fc_core.linear_model(features, [bucket, country])
       with self.test_session() as sess:
         variables_lib.global_variables_initializer().run()
         lookup_ops.tables_initializer().run()
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index b5a533d15e..41d0be794a 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -149,10 +149,10 @@ from tensorflow.python.training import checkpoint_utils
 from tensorflow.python.util import nest
 
 
-def make_input_layer(features,
-                     feature_columns,
-                     weight_collections=None,
-                     trainable=True):
+def input_layer(features,
+                feature_columns,
+                weight_collections=None,
+                trainable=True):
   """Returns a dense `Tensor` as input layer based on given `feature_columns`.
 
   Generally a single example in training data is described with FeatureColumns.
@@ -166,7 +166,7 @@ def make_input_layer(features,
   keywords_embedded = embedding_column(
       categorical_column_with_hash_bucket("keywords", 10K), dimensions=16)
   all_feature_columns = [price, keywords_embedded, ...]
-  dense_tensor = make_input_layer(features, all_feature_columns)
+  dense_tensor = input_layer(features, all_feature_columns)
   for units in [128, 64, 32]:
     dense_tensor = tf.layers.dense(dense_tensor, units, tf.nn.relu)
   prediction = tf.layers.dense(dense_tensor, 1)
@@ -209,7 +209,7 @@ def make_input_layer(features,
   if ops.GraphKeys.MODEL_VARIABLES not in weight_collections:
     weight_collections.append(ops.GraphKeys.MODEL_VARIABLES)
   with variable_scope.variable_scope(
-      None, default_name='make_input_layer', values=features.values()):
+      None, default_name='input_layer', values=features.values()):
     builder = _LazyBuilder(features)
     output_tensors = []
     ordered_columns = []
@@ -228,20 +228,20 @@ def make_input_layer(features,
     return array_ops.concat(output_tensors, 1)
 
 
-def make_linear_model(features,
-                      feature_columns,
-                      units=1,
-                      sparse_combiner='sum',
-                      weight_collections=None,
-                      trainable=True):
+def linear_model(features,
+                 feature_columns,
+                 units=1,
+                 sparse_combiner='sum',
+                 weight_collections=None,
+                 trainable=True):
   """Returns a linear prediction `Tensor` based on given `feature_columns`.
 
   This function generates a weighted sum based on output dimension `units`.
   Weighted sum refers to logits in classification problems. It refers to the
   prediction itself for linear regression problems.
 
-  Note on supported columns: `make_linear_model` treats categorical columns as
-  `indicator_column`s while `make_input_layer` explicitly requires wrapping each
+  Note on supported columns: `linear_model` treats categorical columns as
+  `indicator_column`s while `input_layer` explicitly requires wrapping each
   of them with an `embedding_column` or an `indicator_column`.
 
   Example:
@@ -251,7 +251,7 @@ def make_linear_model(features,
   price_buckets = bucketized_column(price, boundaries=[0., 10., 100., 1000.])
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
   all_feature_columns = [price_buckets, keywords, ...]
-  prediction = make_linear_model(features, all_feature_columns)
+  prediction = linear_model(features, all_feature_columns)
   ```
 
   Args:
@@ -294,7 +294,7 @@ def make_linear_model(features,
   if ops.GraphKeys.MODEL_VARIABLES not in weight_collections:
     weight_collections.append(ops.GraphKeys.MODEL_VARIABLES)
   with variable_scope.variable_scope(
-      None, default_name='make_linear_model', values=features.values()):
+      None, default_name='linear_model', values=features.values()):
     weighted_sums = []
     ordered_columns = []
     builder = _LazyBuilder(features)
@@ -327,7 +327,7 @@ def _transform_features(features, feature_columns):
   """Returns transformed features based on features columns passed in.
 
   Please note that most probably you would not need to use this function. Please
-  check `make_input_layer` and `make_linear_model` to see whether they will
+  check `input_layer` and `linear_model` to see whether they will
   satisfy your use case or not.
 
   Example:
@@ -444,7 +444,7 @@ def embedding_column(
       key='video_id', num_buckets=1000000, default_value=0)
   columns = [embedding_column(video_id, 9),...]
   features = tf.parse_example(..., features=parse_example_spec(columns))
-  dense_tensor = make_input_layer(features, columns)
+  dense_tensor = input_layer(features, columns)
   ```
 
   Args:
@@ -517,13 +517,13 @@ def numeric_column(key,
   price = numeric_column('price')
   columns = [price, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  dense_tensor = make_input_layer(features, columns)
+  dense_tensor = input_layer(features, columns)
 
   # or
   bucketized_price = bucketized_column(price, boundaries=[...])
   columns = [bucketized_price, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  linear_prediction = make_linear_model(features, columns)
+  linear_prediction = linear_model(features, columns)
   ```
 
   Args:
@@ -603,12 +603,12 @@ def bucketized_column(source_column, boundaries):
   bucketized_price = bucketized_column(price, boundaries=[...])
   columns = [bucketized_price, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  linear_prediction = make_linear_model(features, columns)
+  linear_prediction = linear_model(features, columns)
 
   # or
   columns = [bucketized_price, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  dense_tensor = make_input_layer(features, columns)
+  dense_tensor = input_layer(features, columns)
   ```
 
   `bucketized_column` can also be crossed with another categorical column using
@@ -620,7 +620,7 @@ def bucketized_column(source_column, boundaries):
   # 'keywords' is a string feature.
   price_x_keywords = crossed_column([bucketized_price, 'keywords'], 50K)
   all_feature_columns = [price_x_keywords, ...]
-  linear_prediction = make_linear_model(features, all_feature_columns)
+  linear_prediction = linear_model(features, all_feature_columns)
   ```
 
   Args:
@@ -678,13 +678,13 @@ def categorical_column_with_hash_bucket(key,
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
   columns = [keywords, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  linear_prediction = make_linear_model(features, columns)
+  linear_prediction = linear_model(features, columns)
 
   # or
   keywords_embedded = embedding_column(keywords, 16)
   columns = [keywords_embedded, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  dense_tensor = make_input_layer(features, columns)
+  dense_tensor = input_layer(features, columns)
   ```
 
   Args:
@@ -740,7 +740,7 @@ def categorical_column_with_vocabulary_file(
       num_oov_buckets=5)
   columns = [states, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  linear_prediction = make_linear_model(features, columns)
+  linear_prediction = linear_model(features, columns)
   ```
 
   Example with `default_value`:
@@ -754,13 +754,13 @@ def categorical_column_with_vocabulary_file(
       default_value=0)
   columns = [states, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  linear_prediction, _, _ = make_linear_model(features, columns)
+  linear_prediction, _, _ = linear_model(features, columns)
 
   And to make an embedding with either:
   ```python
   columns = [embedding_column(states, 3),...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  dense_tensor = make_input_layer(features, columns)
+  dense_tensor = input_layer(features, columns)
   ```
 
   Args:
@@ -839,14 +839,14 @@ def categorical_column_with_vocabulary_list(
       key='colors', vocabulary_list=('X', 'R', 'G', 'B', 'Y'), default_value=0)
   columns = [colors, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  linear_prediction, _, _ = make_linear_model(features, columns)
+  linear_prediction, _, _ = linear_model(features, columns)
   ```
 
   Embedding for a DNN model:
   ```python
   columns = [embedding_column(colors, 3),...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  dense_tensor = make_input_layer(features, columns)
+  dense_tensor = input_layer(features, columns)
   ```
 
   Args:
@@ -917,14 +917,14 @@ def categorical_column_with_identity(key, num_buckets, default_value=None):
       key='video_id', num_buckets=1000000, default_value=0)
   columns = [video_id, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  linear_prediction, _, _ = make_linear_model(features, columns)
+  linear_prediction, _, _ = linear_model(features, columns)
   ```
 
   Embedding for a DNN model:
   ```python
   columns = [embedding_column(video_id, 9),...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
-  dense_tensor = make_input_layer(features, columns)
+  dense_tensor = input_layer(features, columns)
   ```
 
   Args:
@@ -964,7 +964,7 @@ def indicator_column(categorical_column):
   name = indicator_column(categorical_column_with_vocabulary_list('name',
       ['bob', 'george', 'wanda'])
   all_feature_columns = [name, ...]
-  dense_tensor = make_input_layer(features, all_feature_columns)
+  dense_tensor = input_layer(features, all_feature_columns)
 
   dense_tensor == [[1, 0, 0]]  # If "name" bytes_list is ["bob"]
   dense_tensor == [[1, 0, 1]]  # If "name" bytes_list is ["bob", "wanda"]
@@ -982,7 +982,7 @@ def indicator_column(categorical_column):
 
 
 def weighted_categorical_column(
-    categorical_column, weight_column_name, dtype=dtypes.float32):
+    categorical_column, weight_feature_key, dtype=dtypes.float32):
   """Applies weight values to a `_CategoricalColumn`.
 
   Use this when each of your sparse inputs has both an ID and a value. For
@@ -995,24 +995,24 @@ def weighted_categorical_column(
   Input `tf.Example` objects:
   [
     features {
-      feature {
-        key: "frequencies"
-        value {float_list {value: 0.3 value: 0.1}}
-      }
       feature {
         key: "terms"
         value {bytes_list {value: "very" value: "model"}}
       }
-    },
-    features {
       feature {
         key: "frequencies"
-        value {float_list {value: 0.4 value: 0.1 value: 0.2}}
+        value {float_list {value: 0.3 value: 0.1}}
       }
+    },
+    features {
       feature {
         key: "terms"
         value {bytes_list {value: "when" value: "course" value: "human"}}
       }
+      feature {
+        key: "frequencies"
+        value {float_list {value: 0.4 value: 0.1 value: 0.2}}
+      }
     }
   ]
 
@@ -1020,10 +1020,10 @@ def weighted_categorical_column(
   categorical_column = categorical_column_with_hash_bucket(
       column_name='terms', hash_bucket_size=1000)
   weighted_column = weighted_categorical_column(
-      categorical_column=categorical_column, weight_column_name='frequencies')
+      categorical_column=categorical_column, weight_feature_key='frequencies')
   columns = [weighted_column, ...]
   features = tf.parse_example(..., features=parse_example_spec(columns))
-  linear_prediction, _, _ = make_linear_model(features, columns)
+  linear_prediction, _, _ = linear_model(features, columns)
   ```
 
   This assumes the input dictionary contains a `SparseTensor` for key
@@ -1033,7 +1033,7 @@ def weighted_categorical_column(
   Args:
     categorical_column: A `_CategoricalColumn` created by
       `categorical_column_with_*` functions.
-    weight_column_name: String key for weigth values.
+    weight_feature_key: String key for weight values.
     dtype: Type of weights, such as `tf.float32`. Only float and integer weights
       are supported.
 
@@ -1048,7 +1048,7 @@ def weighted_categorical_column(
     raise ValueError('dtype {} is not convertible to float.'.format(dtype))
   return _WeightedCategoricalColumn(
       categorical_column=categorical_column,
-      weight_column_name=weight_column_name,
+      weight_feature_key=weight_feature_key,
       dtype=dtype)
 
 
@@ -1079,7 +1079,7 @@ def crossed_column(keys, hash_bucket_size, hash_key=None):
   ```python
   keywords_x_doc_terms = crossed_column(['keywords', 'doc_terms'], 50K)
   all_feature_columns = [keywords_x_doc_terms, ...]
-  linear_prediction = make_linear_model(features, all_feature_columns)
+  linear_prediction = linear_model(features, all_feature_columns)
   ```
 
   You could also use vocabulary lookup before crossing:
@@ -1088,7 +1088,7 @@ def crossed_column(keys, hash_bucket_size, hash_key=None):
       'keywords', '/path/to/vocabulary/file', vocabulary_size=1K)
   keywords_x_doc_terms = crossed_column([keywords, 'doc_terms'], 50K)
   all_feature_columns = [keywords_x_doc_terms, ...]
-  linear_prediction = make_linear_model(features, all_feature_columns)
+  linear_prediction = linear_model(features, all_feature_columns)
   ```
 
   If an input feature is of numeric type, you can use
@@ -1101,7 +1101,7 @@ def crossed_column(keys, hash_bucket_size, hash_key=None):
   bucketized_price = bucketized_column(price, boundaries=[...])
   vertical_id_x_price = crossed_column([vertical_id, bucketized_price], 50K)
   all_feature_columns = [vertical_id_x_price, ...]
-  linear_prediction = make_linear_model(features, all_feature_columns)
+  linear_prediction = linear_model(features, all_feature_columns)
   ```
 
   To use crossed column in DNN model, you need to add it in an embedding column
@@ -1109,7 +1109,7 @@ def crossed_column(keys, hash_bucket_size, hash_key=None):
   ```python
   vertical_id_x_price = crossed_column([vertical_id, bucketized_price], 50K)
   vertical_id_x_price_embedded = embedding_column(vertical_id_x_price, 10)
-  dense_tensor = make_input_layer(features, [vertical_id_x_price_embedded, ...])
+  dense_tensor = input_layer(features, [vertical_id_x_price_embedded, ...])
   ```
 
   Args:
@@ -1244,10 +1244,10 @@ class _DenseColumn(_FeatureColumn):
     """Returns a `Tensor`.
 
     The output of this function will be used by model-builder-functions. For
-    example the pseudo code of `make_input_layer` will be like:
+    example the pseudo code of `input_layer` will be like:
 
     ```python
-    def make_input_layer(features, feature_columns, ...):
+    def input_layer(features, feature_columns, ...):
       outputs = [fc._get_dense_tensor(...) for fc in feature_columns]
       return tf.concat(outputs)
     ```
@@ -1267,7 +1267,7 @@ class _DenseColumn(_FeatureColumn):
 
 def _create_dense_column_weighted_sum(
     column, builder, units, weight_collections, trainable):
-  """Create a weighted sum of a dense column for make_linear_model."""
+  """Create a weighted sum of a dense column for linear_model."""
   tensor = column._get_dense_tensor(  # pylint: disable=protected-access
       builder,
       weight_collections=weight_collections,
@@ -1332,7 +1332,7 @@ class _CategoricalColumn(_FeatureColumn):
 
 def _create_categorical_column_weighted_sum(
     column, builder, units, sparse_combiner, weight_collections, trainable):
-  """Create a weighted sum of a categorical column for make_linear_model."""
+  """Create a weighted sum of a categorical column for linear_model."""
   sparse_tensors = column._get_sparse_tensors(  # pylint: disable=protected-access
       builder,
       weight_collections=weight_collections,
@@ -1371,7 +1371,7 @@ class _LazyBuilder(object):
     bucketized_age = fc.bucketized_column(fc.numeric_column("age"), ...)
     keywords = fc.categorical_column_with_hash_buckets("keywords", ...)
     age_X_keywords = fc.crossed_column([bucketized_age, keywords])
-    ... = make_linear_model(features,
+    ... = linear_model(features,
                             [bucketized_age, keywords, age_X_keywords]
   ```
 
@@ -2028,22 +2028,22 @@ class _IdentityCategoricalColumn(
 class _WeightedCategoricalColumn(
     _CategoricalColumn,
     collections.namedtuple('_WeightedCategoricalColumn', (
-        'categorical_column', 'weight_column_name', 'dtype'
+        'categorical_column', 'weight_feature_key', 'dtype'
     ))):
   """See `weighted_categorical_column`."""
 
   @property
   def name(self):
     return '{}_weighted_by_{}'.format(
-        self.categorical_column.name, self.weight_column_name)
+        self.categorical_column.name, self.weight_feature_key)
 
   @property
   def _parse_example_spec(self):
     config = self.categorical_column._parse_example_spec  # pylint: disable=protected-access
-    if self.weight_column_name in config:
+    if self.weight_feature_key in config:
       raise ValueError('Parse config {} already exists for {}.'.format(
-          config[self.weight_column_name], self.weight_column_name))
-    config[self.weight_column_name] = parsing_ops.VarLenFeature(self.dtype)
+          config[self.weight_feature_key], self.weight_feature_key))
+    config[self.weight_feature_key] = parsing_ops.VarLenFeature(self.dtype)
     return config
 
   @property
@@ -2051,10 +2051,9 @@ class _WeightedCategoricalColumn(
     return self.categorical_column._num_buckets  # pylint: disable=protected-access
 
   def _transform_feature(self, inputs):
-    weight_tensor = inputs.get(self.weight_column_name)
+    weight_tensor = inputs.get(self.weight_feature_key)
     if weight_tensor is None:
-      raise ValueError('Missing weights {}.'.format(
-          self.weight_column_name))
+      raise ValueError('Missing weights {}.'.format(self.weight_feature_key))
     weight_tensor = sparse_tensor_lib.convert_to_tensor_or_sparse_tensor(
         weight_tensor)
     if self.dtype != weight_tensor.dtype.base_dtype:
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 7d4b59a5e5..7d0a92026d 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -312,11 +312,11 @@ class NumericColumnTest(test.TestCase):
         'aaa', shape=[1, 2], default_value=np.array([[3., 2.]]))
     self.assertEqual(a.default_value, ((3., 2.),))
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
       features = {'price': [[1.], [5.]]}
-      predictions = fc.make_linear_model(features, [price])
+      predictions = fc.linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
@@ -497,13 +497,13 @@ class BucketizedColumnTest(test.TestCase):
     self.assertAllEqual(a_bucketized_copy._variable_shape, (2, 3))
     self.assertEqual(a_bucketized_copy.boundaries, (0, 1))
 
-  def test_make_linear_model_one_input_value(self):
-    """Tests make_linear_model() for input with shape=[1]."""
+  def test_linear_model_one_input_value(self):
+    """Tests linear_model() for input with shape=[1]."""
     price = fc.numeric_column('price', shape=[1])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
       features = {'price': [[-1.], [1.], [5.], [6.]]}
-      predictions = fc.make_linear_model(features, [bucketized_price])
+      predictions = fc.linear_model(features, [bucketized_price])
       bias = get_linear_model_bias()
       bucketized_price_var = get_linear_model_column_var(bucketized_price)
       with _initialized_session() as sess:
@@ -522,13 +522,13 @@ class BucketizedColumnTest(test.TestCase):
         sess.run(bias.assign([1.]))
         self.assertAllClose([[11.], [21.], [41.], [51.]], predictions.eval())
 
-  def test_make_linear_model_two_input_values(self):
-    """Tests make_linear_model() for input with shape=[2]."""
+  def test_linear_model_two_input_values(self):
+    """Tests linear_model() for input with shape=[2]."""
     price = fc.numeric_column('price', shape=[2])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
       features = {'price': [[-1., 1.], [5., 6.]]}
-      predictions = fc.make_linear_model(features, [bucketized_price])
+      predictions = fc.linear_model(features, [bucketized_price])
       bias = get_linear_model_bias()
       bucketized_price_var = get_linear_model_column_var(bucketized_price)
       with _initialized_session() as sess:
@@ -734,11 +734,11 @@ class HashedCategoricalColumnTest(test.TestCase):
     self.assertIsNone(id_weight_pair.weight_tensor)
     self.assertEqual(builder.get(hashed_sparse), id_weight_pair.id_tensor)
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     wire_column = fc.categorical_column_with_hash_bucket('wire', 4)
     self.assertEqual(4, wire_column._num_buckets)
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           wire_column.name: sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=('marlo', 'skywalker', 'omar'),
@@ -953,8 +953,8 @@ class CrossedColumnTest(test.TestCase):
         self.assertAllEqual(expected_values, id_tensor_eval.values)
         self.assertAllEqual((2, 4), id_tensor_eval.dense_shape)
 
-  def test_make_linear_model(self):
-    """Tests make_linear_model.
+  def test_linear_model(self):
+    """Tests linear_model.
 
     Uses data from test_get_sparse_tesnsors_simple.
     """
@@ -962,7 +962,7 @@ class CrossedColumnTest(test.TestCase):
     b = fc.bucketized_column(a, boundaries=(0, 1))
     crossed = fc.crossed_column([b, 'c'], hash_bucket_size=5, hash_key=5)
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           'a': constant_op.constant(((-1., .5), (.5, 1.))),
           'c': sparse_tensor.SparseTensor(
               indices=((0, 0), (1, 0), (1, 1)),
@@ -982,7 +982,7 @@ class CrossedColumnTest(test.TestCase):
         sess.run(bias.assign((.1,)))
         self.assertAllClose(((3.1,), (14.1,)), predictions.eval())
 
-  def test_make_linear_model_with_weights(self):
+  def test_linear_model_with_weights(self):
     class _TestColumnWithWeights(fc._CategoricalColumn):
       """Produces sparse IDs and sparse weights."""
 
@@ -1019,7 +1019,7 @@ class CrossedColumnTest(test.TestCase):
       with self.assertRaisesRegexp(
           ValueError,
           'crossed_column does not support weight_tensor.*{}'.format(t.name)):
-        fc.make_linear_model({
+        fc.linear_model({
             t.name: sparse_tensor.SparseTensor(
                 indices=((0, 0), (1, 0), (1, 1)),
                 values=[0, 1, 2],
@@ -1036,13 +1036,13 @@ class CrossedColumnTest(test.TestCase):
 
 
 def get_linear_model_bias():
-  with variable_scope.variable_scope('make_linear_model', reuse=True):
+  with variable_scope.variable_scope('linear_model', reuse=True):
     return variable_scope.get_variable('bias_weights')
 
 
 def get_linear_model_column_var(column):
   return ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES,
-                            'make_linear_model/' + column.name)[0]
+                            'linear_model/' + column.name)[0]
 
 
 class MakeLinearModelTest(test.TestCase):
@@ -1050,12 +1050,11 @@ class MakeLinearModelTest(test.TestCase):
   def test_raises_if_empty_feature_columns(self):
     with self.assertRaisesRegexp(ValueError,
                                  'feature_columns must not be empty'):
-      fc.make_linear_model(features={}, feature_columns=[])
+      fc.linear_model(features={}, feature_columns=[])
 
   def test_should_be_feature_column(self):
     with self.assertRaisesRegexp(ValueError, 'must be a _FeatureColumn'):
-      fc.make_linear_model(
-          features={'a': [[0]]}, feature_columns='NotSupported')
+      fc.linear_model(features={'a': [[0]]}, feature_columns='NotSupported')
 
   def test_should_be_dense_or_categorical_column(self):
 
@@ -1074,19 +1073,19 @@ class MakeLinearModelTest(test.TestCase):
 
     with self.assertRaisesRegexp(
         ValueError, 'must be either a _DenseColumn or _CategoricalColumn'):
-      fc.make_linear_model(
+      fc.linear_model(
           features={'a': [[0]]}, feature_columns=[NotSupportedColumn()])
 
   def test_does_not_support_dict_columns(self):
     with self.assertRaisesRegexp(
         ValueError, 'Expected feature_columns to be iterable, found dict.'):
-      fc.make_linear_model(
+      fc.linear_model(
           features={'a': [[0]]}, feature_columns={'a': fc.numeric_column('a')})
 
   def test_raises_if_duplicate_name(self):
     with self.assertRaisesRegexp(
         ValueError, 'Duplicate feature column name found for columns'):
-      fc.make_linear_model(
+      fc.linear_model(
           features={'a': [[0]]},
           feature_columns=[fc.numeric_column('a'),
                            fc.numeric_column('a')])
@@ -1095,7 +1094,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
       features = {'price': [[1.], [5.]]}
-      predictions = fc.make_linear_model(features, [price])
+      predictions = fc.linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
@@ -1112,7 +1111,7 @@ class MakeLinearModelTest(test.TestCase):
           indices=[[0, 0], [1, 0], [1, 1]],
           dense_shape=[2, 2])
       features = {'wire_cast': wire_tensor}
-      predictions = fc.make_linear_model(features, [wire_cast])
+      predictions = fc.linear_model(features, [wire_cast])
       bias = get_linear_model_bias()
       wire_cast_var = get_linear_model_column_var(wire_cast)
       with _initialized_session() as sess:
@@ -1131,7 +1130,7 @@ class MakeLinearModelTest(test.TestCase):
           indices=[[0, 0], [1, 0], [1, 1]],
           dense_shape=[2, 2])
       features = {'wire_cast': wire_tensor, 'price': [[1.], [5.]]}
-      predictions = fc.make_linear_model(features, [wire_cast, price])
+      predictions = fc.linear_model(features, [wire_cast, price])
       bias = get_linear_model_bias()
       wire_cast_var = get_linear_model_column_var(wire_cast)
       price_var = get_linear_model_column_var(price)
@@ -1184,7 +1183,7 @@ class MakeLinearModelTest(test.TestCase):
           indices=[[0, 0], [1, 0], [1, 1]],
           dense_shape=[2, 2])
       features = {dense_and_sparse_column.name: sp_tensor}
-      predictions = fc.make_linear_model(features, [dense_and_sparse_column])
+      predictions = fc.linear_model(features, [dense_and_sparse_column])
       bias = get_linear_model_bias()
       dense_and_sparse_column_var = get_linear_model_column_var(
           dense_and_sparse_column)
@@ -1198,7 +1197,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
       features = {'price': [[1.], [5.]]}
-      predictions = fc.make_linear_model(features, [price], units=3)
+      predictions = fc.linear_model(features, [price], units=3)
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
@@ -1217,7 +1216,7 @@ class MakeLinearModelTest(test.TestCase):
           indices=[[0, 0], [1, 0], [1, 1]],
           dense_shape=[2, 2])
       features = {'wire_cast': wire_tensor}
-      predictions = fc.make_linear_model(features, [wire_cast], units=3)
+      predictions = fc.linear_model(features, [wire_cast], units=3)
       bias = get_linear_model_bias()
       wire_cast_var = get_linear_model_column_var(wire_cast)
       with _initialized_session() as sess:
@@ -1235,7 +1234,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
       features = {'price': [[1., 2.], [5., 6.]]}
-      predictions = fc.make_linear_model(features, [price])
+      predictions = fc.linear_model(features, [price])
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
         self.assertAllClose([[0.], [0.]], price_var.eval())
@@ -1250,7 +1249,7 @@ class MakeLinearModelTest(test.TestCase):
           indices=[[0, 0], [1, 0], [1, 1]],
           dense_shape=[2, 2])
       features = {'wire_cast': wire_tensor}
-      predictions = fc.make_linear_model(
+      predictions = fc.linear_model(
           features, [wire_cast], sparse_combiner='mean')
       bias = get_linear_model_bias()
       wire_cast_var = get_linear_model_column_var(wire_cast)
@@ -1263,7 +1262,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
       features = {'price': [[1., 2.], [5., 6.]]}
-      predictions = fc.make_linear_model(features, [price], units=3)
+      predictions = fc.linear_model(features, [price], units=3)
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
@@ -1278,7 +1277,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
       features = {'price': [[1.], [5.]]}
-      predictions = fc.make_linear_model(features, [price])
+      predictions = fc.linear_model(features, [price])
       with _initialized_session():
         with self.assertRaisesRegexp(Exception, 'requested shape has 4'):
           predictions.eval()
@@ -1287,7 +1286,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price', shape=[1, 2])
     with ops.Graph().as_default():
       features = {'price': [[[1., 2.]], [[5., 6.]]]}
-      predictions = fc.make_linear_model(features, [price])
+      predictions = fc.linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       with _initialized_session() as sess:
@@ -1305,7 +1304,7 @@ class MakeLinearModelTest(test.TestCase):
           'price1': [[1., 2.], [5., 6.]],
           'price2': [[3.], [4.]]
       }
-      predictions = fc.make_linear_model(features, [price1, price2])
+      predictions = fc.linear_model(features, [price1, price2])
       bias = get_linear_model_bias()
       price1_var = get_linear_model_column_var(price1)
       price2_var = get_linear_model_column_var(price2)
@@ -1323,7 +1322,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price')
     with ops.Graph().as_default() as g:
       features = {'price': [[1.], [5.]]}
-      fc.make_linear_model(features, [price], weight_collections=['my-vars'])
+      fc.linear_model(features, [price], weight_collections=['my-vars'])
       my_vars = g.get_collection('my-vars')
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
@@ -1336,7 +1335,7 @@ class MakeLinearModelTest(test.TestCase):
       wire_tensor = sparse_tensor.SparseTensor(
           values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
       features = {'wire_cast': wire_tensor}
-      fc.make_linear_model(
+      fc.linear_model(
           features, [wire_cast], weight_collections=['my-vars'])
       my_vars = g.get_collection('my-vars')
       bias = get_linear_model_bias()
@@ -1348,7 +1347,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price')
     with ops.Graph().as_default() as g:
       features = {'price': [[1.], [5.]]}
-      fc.make_linear_model(features, [price])
+      fc.linear_model(features, [price])
       bias = get_linear_model_bias()
       price_var = get_linear_model_column_var(price)
       trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
@@ -1361,7 +1360,7 @@ class MakeLinearModelTest(test.TestCase):
       wire_tensor = sparse_tensor.SparseTensor(
           values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
       features = {'wire_cast': wire_tensor}
-      fc.make_linear_model(features, [wire_cast])
+      fc.linear_model(features, [wire_cast])
       trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
       bias = get_linear_model_bias()
       wire_cast_var = get_linear_model_column_var(wire_cast)
@@ -1372,7 +1371,7 @@ class MakeLinearModelTest(test.TestCase):
     price = fc.numeric_column('price')
     with ops.Graph().as_default() as g:
       features = {'price': [[1.], [5.]]}
-      fc.make_linear_model(features, [price], trainable=False)
+      fc.linear_model(features, [price], trainable=False)
       trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
       self.assertEqual([], trainable_vars)
 
@@ -1382,7 +1381,7 @@ class MakeLinearModelTest(test.TestCase):
       wire_tensor = sparse_tensor.SparseTensor(
           values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
       features = {'wire_cast': wire_tensor}
-      fc.make_linear_model(features, [wire_cast], trainable=False)
+      fc.linear_model(features, [wire_cast], trainable=False)
       trainable_vars = g.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
       self.assertEqual([], trainable_vars)
 
@@ -1398,7 +1397,7 @@ class MakeLinearModelTest(test.TestCase):
               sparse_tensor.SparseTensor(
                   values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
       }
-      fc.make_linear_model(
+      fc.linear_model(
           features, [price_a, wire_cast, price_b],
           weight_collections=['my-vars'])
       my_vars = g.get_collection('my-vars')
@@ -1414,7 +1413,7 @@ class MakeLinearModelTest(test.TestCase):
               sparse_tensor.SparseTensor(
                   values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
       }
-      fc.make_linear_model(
+      fc.linear_model(
           features, [wire_cast, price_b, price_a],
           weight_collections=['my-vars'])
       my_vars = g.get_collection('my-vars')
@@ -1433,7 +1432,7 @@ class MakeLinearModelTest(test.TestCase):
     with self.assertRaisesRegexp(
         ValueError,
         'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
-      fc.make_linear_model(features, [price1, price2])
+      fc.linear_model(features, [price1, price2])
 
   def test_subset_of_static_batch_size_mismatch(self):
     price1 = fc.numeric_column('price1')
@@ -1448,7 +1447,7 @@ class MakeLinearModelTest(test.TestCase):
       with self.assertRaisesRegexp(
           ValueError,
           'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
-        fc.make_linear_model(features, [price1, price2, price3])
+        fc.linear_model(features, [price1, price2, price3])
 
   def test_runtime_batch_size_mismatch(self):
     price1 = fc.numeric_column('price1')
@@ -1458,7 +1457,7 @@ class MakeLinearModelTest(test.TestCase):
           'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 3
           'price2': [[3.], [4.]]  # batchsize = 2
       }
-      predictions = fc.make_linear_model(features, [price1, price2])
+      predictions = fc.linear_model(features, [price1, price2])
       with _initialized_session() as sess:
         with self.assertRaisesRegexp(errors.OpError,
                                      'must have the same size and shape'):
@@ -1473,7 +1472,7 @@ class MakeLinearModelTest(test.TestCase):
           'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
           'price2': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
       }
-      predictions = fc.make_linear_model(features, [price1, price2])
+      predictions = fc.linear_model(features, [price1, price2])
       with _initialized_session() as sess:
         sess.run(
             predictions,
@@ -1488,11 +1487,11 @@ class MakeInputLayerTest(test.TestCase):
   def test_raises_if_empty_feature_columns(self):
     with self.assertRaisesRegexp(ValueError,
                                  'feature_columns must not be empty'):
-      fc.make_input_layer(features={}, feature_columns=[])
+      fc.input_layer(features={}, feature_columns=[])
 
   def test_should_be_dense_column(self):
     with self.assertRaisesRegexp(ValueError, 'must be a _DenseColumn'):
-      fc.make_input_layer(
+      fc.input_layer(
           features={'a': [[0]]},
           feature_columns=[
               fc.categorical_column_with_hash_bucket('wire_cast', 4)
@@ -1501,13 +1500,13 @@ class MakeInputLayerTest(test.TestCase):
   def test_does_not_support_dict_columns(self):
     with self.assertRaisesRegexp(
         ValueError, 'Expected feature_columns to be iterable, found dict.'):
-      fc.make_input_layer(
+      fc.input_layer(
           features={'a': [[0]]}, feature_columns={'a': fc.numeric_column('a')})
 
   def test_raises_if_duplicate_name(self):
     with self.assertRaisesRegexp(
         ValueError, 'Duplicate feature column name found for columns'):
-      fc.make_input_layer(
+      fc.input_layer(
           features={'a': [[0]]},
           feature_columns=[fc.numeric_column('a'),
                            fc.numeric_column('a')])
@@ -1516,7 +1515,7 @@ class MakeInputLayerTest(test.TestCase):
     price = fc.numeric_column('price')
     with ops.Graph().as_default():
       features = {'price': [[1.], [5.]]}
-      net = fc.make_input_layer(features, [price])
+      net = fc.input_layer(features, [price])
       with _initialized_session():
         self.assertAllClose([[1.], [5.]], net.eval())
 
@@ -1524,7 +1523,7 @@ class MakeInputLayerTest(test.TestCase):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
       features = {'price': [[1., 2.], [5., 6.]]}
-      net = fc.make_input_layer(features, [price])
+      net = fc.input_layer(features, [price])
       with _initialized_session():
         self.assertAllClose([[1., 2.], [5., 6.]], net.eval())
 
@@ -1532,7 +1531,7 @@ class MakeInputLayerTest(test.TestCase):
     price = fc.numeric_column('price', shape=2)
     with ops.Graph().as_default():
       features = {'price': [[1.], [5.]]}
-      net = fc.make_input_layer(features, [price])
+      net = fc.input_layer(features, [price])
       with _initialized_session():
         with self.assertRaisesRegexp(Exception, 'requested shape has 4'):
           net.eval()
@@ -1541,7 +1540,7 @@ class MakeInputLayerTest(test.TestCase):
     price = fc.numeric_column('price', shape=[1, 2])
     with ops.Graph().as_default():
       features = {'price': [[[1., 2.]], [[5., 6.]]]}
-      net = fc.make_input_layer(features, [price])
+      net = fc.input_layer(features, [price])
       with _initialized_session():
         self.assertAllClose([[1., 2.], [5., 6.]], net.eval())
 
@@ -1553,7 +1552,7 @@ class MakeInputLayerTest(test.TestCase):
           'price1': [[1., 2.], [5., 6.]],
           'price2': [[3.], [4.]]
       }
-      net = fc.make_input_layer(features, [price1, price2])
+      net = fc.input_layer(features, [price1, price2])
       with _initialized_session():
         self.assertAllClose([[1., 2., 3.], [5., 6., 4.]], net.eval())
 
@@ -1565,8 +1564,8 @@ class MakeInputLayerTest(test.TestCase):
           'price_a': [[1.]],
           'price_b': [[3.]],
       }
-      net1 = fc.make_input_layer(features, [price_a, price_b])
-      net2 = fc.make_input_layer(features, [price_b, price_a])
+      net1 = fc.input_layer(features, [price_a, price_b])
+      net2 = fc.input_layer(features, [price_b, price_a])
       with _initialized_session():
         self.assertAllClose([[1., 3.]], net1.eval())
         self.assertAllClose([[1., 3.]], net2.eval())
@@ -1580,7 +1579,7 @@ class MakeInputLayerTest(test.TestCase):
                   indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
       }
       with self.assertRaisesRegexp(Exception, 'must be a _DenseColumn'):
-        fc.make_input_layer(features, [animal])
+        fc.input_layer(features, [animal])
 
   def test_static_batch_size_mismatch(self):
     price1 = fc.numeric_column('price1')
@@ -1593,7 +1592,7 @@ class MakeInputLayerTest(test.TestCase):
       with self.assertRaisesRegexp(
           ValueError,
           'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
-        fc.make_input_layer(features, [price1, price2])
+        fc.input_layer(features, [price1, price2])
 
   def test_subset_of_static_batch_size_mismatch(self):
     price1 = fc.numeric_column('price1')
@@ -1608,7 +1607,7 @@ class MakeInputLayerTest(test.TestCase):
       with self.assertRaisesRegexp(
           ValueError,
           'Batch size \(first dimension\) of each feature must be same.'):  # pylint: disable=anomalous-backslash-in-string
-        fc.make_input_layer(features, [price1, price2, price3])
+        fc.input_layer(features, [price1, price2, price3])
 
   def test_runtime_batch_size_mismatch(self):
     price1 = fc.numeric_column('price1')
@@ -1618,7 +1617,7 @@ class MakeInputLayerTest(test.TestCase):
           'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 3
           'price2': [[3.], [4.]]  # batchsize = 2
       }
-      net = fc.make_input_layer(features, [price1, price2])
+      net = fc.input_layer(features, [price1, price2])
       with _initialized_session() as sess:
         with self.assertRaisesRegexp(errors.OpError,
                                      'Dimensions of inputs should match'):
@@ -1632,7 +1631,7 @@ class MakeInputLayerTest(test.TestCase):
           'price1': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
           'price2': array_ops.placeholder(dtype=dtypes.int64),  # batchsize = 2
       }
-      net = fc.make_input_layer(features, [price1, price2])
+      net = fc.input_layer(features, [price1, price2])
       with _initialized_session() as sess:
         sess.run(
             net,
@@ -2106,7 +2105,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
               dense_shape=inputs.dense_shape),
           id_weight_pair.id_tensor.eval())
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     wire_column = fc.categorical_column_with_vocabulary_file(
         key='wire',
         vocabulary_file=self._wire_vocabulary_file_name,
@@ -2114,7 +2113,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         num_oov_buckets=1)
     self.assertEqual(4, wire_column._num_buckets)
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           wire_column.name: sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=('marlo', 'skywalker', 'omar'),
@@ -2413,13 +2412,13 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
               dense_shape=(3, 3)),
           id_weight_pair.id_tensor.eval())
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     wire_column = fc.categorical_column_with_vocabulary_list(
         key='aaa',
         vocabulary_list=('omar', 'stringer', 'marlo'))
     self.assertEqual(3, wire_column._num_buckets)
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           wire_column.name: sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=('marlo', 'skywalker', 'omar'),
@@ -2639,11 +2638,11 @@ class IdentityCategoricalColumnTest(test.TestCase):
               input_shape: (2, 2),
           }))
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
     self.assertEqual(3, column._num_buckets)
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           column.name: sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=(0, 2, 1),
@@ -2829,7 +2828,7 @@ class IndicatorColumnTest(test.TestCase):
     with _initialized_session():
       self.assertAllEqual([[0, 0, 1], [1, 0, 0]], indicator_tensor.eval())
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     animal = fc.indicator_column(
         fc.categorical_column_with_identity('animal', num_buckets=4))
     with ops.Graph().as_default():
@@ -2839,7 +2838,7 @@ class IndicatorColumnTest(test.TestCase):
                   indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
       }
 
-      predictions = fc.make_linear_model(features, [animal])
+      predictions = fc.linear_model(features, [animal])
       weight_var = get_linear_model_column_var(animal)
       with _initialized_session():
         # All should be zero-initialized.
@@ -2848,7 +2847,7 @@ class IndicatorColumnTest(test.TestCase):
         weight_var.assign([[1.], [2.], [3.], [4.]]).eval()
         self.assertAllClose([[2. + 3.]], predictions.eval())
 
-  def test_make_input_layer(self):
+  def test_input_layer(self):
     animal = fc.indicator_column(
         fc.categorical_column_with_identity('animal', num_buckets=4))
     with ops.Graph().as_default():
@@ -2857,7 +2856,7 @@ class IndicatorColumnTest(test.TestCase):
               sparse_tensor.SparseTensor(
                   indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
       }
-      net = fc.make_input_layer(features, [animal])
+      net = fc.input_layer(features, [animal])
       with _initialized_session():
         self.assertAllClose([[0., 1., 1., 0.]], net.eval())
 
@@ -3251,7 +3250,7 @@ class EmbeddingColumnTest(test.TestCase):
       self.assertAllEqual(embedding_values, global_vars[0].eval())
       self.assertAllEqual(expected_lookups, embedding_lookup.eval())
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     # Inputs.
     batch_size = 4
     vocabulary_size = 3
@@ -3282,13 +3281,13 @@ class EmbeddingColumnTest(test.TestCase):
         initializer=_initializer)
 
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           categorical_column.name: sparse_input
       }, (embedding_column,))
       expected_var_names = (
-          'make_linear_model/bias_weights:0',
-          'make_linear_model/aaa_embedding/weights:0',
-          'make_linear_model/aaa_embedding/embedding_weights:0',
+          'linear_model/bias_weights:0',
+          'linear_model/aaa_embedding/weights:0',
+          'linear_model/aaa_embedding/embedding_weights:0',
       )
       self.assertItemsEqual(
           expected_var_names,
@@ -3298,11 +3297,11 @@ class EmbeddingColumnTest(test.TestCase):
               ops.GraphKeys.TRAINABLE_VARIABLES)
       }
       self.assertItemsEqual(expected_var_names, trainable_vars.keys())
-      bias = trainable_vars['make_linear_model/bias_weights:0']
+      bias = trainable_vars['linear_model/bias_weights:0']
       embedding_weights = trainable_vars[
-          'make_linear_model/aaa_embedding/embedding_weights:0']
+          'linear_model/aaa_embedding/embedding_weights:0']
       linear_weights = trainable_vars[
-          'make_linear_model/aaa_embedding/weights:0']
+          'linear_model/aaa_embedding/weights:0']
       with _initialized_session():
         # Predictions with all zero weights.
         self.assertAllClose(np.zeros((1,)), bias.eval())
@@ -3326,7 +3325,7 @@ class EmbeddingColumnTest(test.TestCase):
         # = [4*7 + 6*11, 4*2 + 6*3.5, 4*0 + 6*0, 4*3 + 6*5] = [94, 29, 0, 42]
         self.assertAllClose(((94.,), (29.,), (0.,), (42.,)), predictions.eval())
 
-  def test_make_input_layer(self):
+  def test_input_layer(self):
     # Inputs.
     vocabulary_size = 3
     sparse_input = sparse_tensor.SparseTensorValue(
@@ -3371,24 +3370,22 @@ class EmbeddingColumnTest(test.TestCase):
         initializer=_initializer)
 
     # Provide sparse input and get dense result.
-    input_layer = fc.make_input_layer({
-        'aaa': sparse_input
-    }, (embedding_column,))
+    input_layer = fc.input_layer({'aaa': sparse_input}, (embedding_column,))
 
     # Assert expected embedding variable and lookups.
     global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
     self.assertItemsEqual(
-        ('make_input_layer/aaa_embedding/embedding_weights:0',),
+        ('input_layer/aaa_embedding/embedding_weights:0',),
         tuple([v.name for v in global_vars]))
     trainable_vars = ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
     self.assertItemsEqual(
-        ('make_input_layer/aaa_embedding/embedding_weights:0',),
+        ('input_layer/aaa_embedding/embedding_weights:0',),
         tuple([v.name for v in trainable_vars]))
     with _initialized_session():
       self.assertAllEqual(embedding_values, trainable_vars[0].eval())
       self.assertAllEqual(expected_lookups, input_layer.eval())
 
-  def test_make_input_layer_not_trainable(self):
+  def test_input_layer_not_trainable(self):
     # Inputs.
     vocabulary_size = 3
     sparse_input = sparse_tensor.SparseTensorValue(
@@ -3433,14 +3430,12 @@ class EmbeddingColumnTest(test.TestCase):
         initializer=_initializer, trainable=False)
 
     # Provide sparse input and get dense result.
-    input_layer = fc.make_input_layer({
-        'aaa': sparse_input
-    }, (embedding_column,))
+    input_layer = fc.input_layer({'aaa': sparse_input}, (embedding_column,))
 
     # Assert expected embedding variable and lookups.
     global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
     self.assertItemsEqual(
-        ('make_input_layer/aaa_embedding/embedding_weights:0',),
+        ('input_layer/aaa_embedding/embedding_weights:0',),
         tuple([v.name for v in global_vars]))
     self.assertItemsEqual(
         [], ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES))
@@ -3455,7 +3450,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     self.assertEqual('ids_weighted_by_values', column.name)
     self.assertEqual(3, column._num_buckets)
     self.assertEqual({
@@ -3468,7 +3463,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
     original = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     for column in (original, copy.deepcopy(original)):
       self.assertEqual('ids_weighted_by_values', column.name)
       self.assertEqual(3, column._num_buckets)
@@ -3482,7 +3477,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
       fc.weighted_categorical_column(
           categorical_column=fc.categorical_column_with_identity(
               key='ids', num_buckets=3),
-          weight_column_name='values',
+          weight_feature_key='values',
           dtype=None)
 
   def test_invalid_dtype_string(self):
@@ -3490,14 +3485,14 @@ class WeightedCategoricalColumnTest(test.TestCase):
       fc.weighted_categorical_column(
           categorical_column=fc.categorical_column_with_identity(
               key='ids', num_buckets=3),
-          weight_column_name='values',
+          weight_feature_key='values',
           dtype=dtypes.string)
 
   def test_invalid_input_dtype(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     strings = sparse_tensor.SparseTensorValue(
         indices=((0, 0), (1, 0), (1, 1)),
         values=('omar', 'stringer', 'marlo'),
@@ -3510,13 +3505,13 @@ class WeightedCategoricalColumnTest(test.TestCase):
       fc.weighted_categorical_column(
           categorical_column=fc.categorical_column_with_identity(
               key='aaa', num_buckets=3),
-          weight_column_name='aaa')._parse_example_spec()
+          weight_feature_key='aaa')._parse_example_spec()
 
   def test_missing_weights(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     inputs = sparse_tensor.SparseTensorValue(
         indices=((0, 0), (1, 0), (1, 1)),
         values=('omar', 'stringer', 'marlo'),
@@ -3528,7 +3523,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
   def test_parse_example(self):
     a = fc.categorical_column_with_vocabulary_list(
         key='aaa', vocabulary_list=('omar', 'stringer', 'marlo'))
-    a_weighted = fc.weighted_categorical_column(a, weight_column_name='weights')
+    a_weighted = fc.weighted_categorical_column(a, weight_feature_key='weights')
     data = example_pb2.Example(features=feature_pb2.Features(
         feature={
             'aaa':
@@ -3563,7 +3558,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     inputs = sparse_tensor.SparseTensorValue(
         indices=((0, 0), (1, 0), (1, 1)),
         values=(0, 1, 0),
@@ -3596,7 +3591,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     weights = sparse_tensor.SparseTensorValue(
         indices=((0, 0), (1, 0), (1, 1)),
         values=(0.5, 1.0, 0.1),
@@ -3625,7 +3620,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     inputs = sparse_tensor.SparseTensorValue(
         indices=((0, 0), (1, 0), (1, 1)),
         values=(2, 1, 0),
@@ -3650,13 +3645,13 @@ class WeightedCategoricalColumnTest(test.TestCase):
               dense_shape=(2, 2)),
           weight_tensor.eval())
 
-  def test_make_linear_model(self):
+  def test_linear_model(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           'ids': sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=(0, 2, 1),
@@ -3678,15 +3673,15 @@ class WeightedCategoricalColumnTest(test.TestCase):
         # = 3*1 + 2*.1 = 3+.2 = 3.2
         self.assertAllClose(((.5,), (3.2,)), predictions.eval())
 
-  def test_make_linear_model_mismatched_shape(self):
+  def test_linear_model_mismatched_shape(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     with ops.Graph().as_default():
       with self.assertRaisesRegexp(
           ValueError, r'Dimensions.*are not compatible'):
-        fc.make_linear_model({
+        fc.linear_model({
             'ids': sparse_tensor.SparseTensorValue(
                 indices=((0, 0), (1, 0), (1, 1)),
                 values=(0, 2, 1),
@@ -3697,13 +3692,13 @@ class WeightedCategoricalColumnTest(test.TestCase):
                 dense_shape=(2, 2))
         }, (column,))
 
-  def test_make_linear_model_mismatched_dense_values(self):
+  def test_linear_model_mismatched_dense_values(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           'ids': sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=(0, 2, 1),
@@ -3714,13 +3709,13 @@ class WeightedCategoricalColumnTest(test.TestCase):
         with self.assertRaisesRegexp(errors.OpError, 'Incompatible shapes'):
           predictions.eval()
 
-  def test_make_linear_model_mismatched_dense_shape(self):
+  def test_linear_model_mismatched_dense_shape(self):
     column = fc.weighted_categorical_column(
         categorical_column=fc.categorical_column_with_identity(
             key='ids', num_buckets=3),
-        weight_column_name='values')
+        weight_feature_key='values')
     with ops.Graph().as_default():
-      predictions = fc.make_linear_model({
+      predictions = fc.linear_model({
           'ids': sparse_tensor.SparseTensorValue(
               indices=((0, 0), (1, 0), (1, 1)),
               values=(0, 2, 1),
-- 
GitLab


From 7c2a524feb9eb7623fa5f60107593fc7347a03e9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 16:13:37 -0700
Subject: [PATCH 1253/1563] Android Example: Adding CMake for Gradle build

PiperOrigin-RevId: 155810524
---
 tensorflow/examples/android/build.gradle      | 117 ++++++++++++------
 .../examples/android/jni/CMakeLists.txt       |  51 ++++++++
 2 files changed, 128 insertions(+), 40 deletions(-)
 create mode 100644 tensorflow/examples/android/jni/CMakeLists.txt

diff --git a/tensorflow/examples/android/build.gradle b/tensorflow/examples/android/build.gradle
index 4f241027f4..5a173b129b 100644
--- a/tensorflow/examples/android/build.gradle
+++ b/tensorflow/examples/android/build.gradle
@@ -7,20 +7,46 @@
 // libraries back into the appropriate directory.
 //
 // Alternatively, experimental support for Makefile builds is provided by
-// setting buildWithMake below to true. This will allow building the demo
+// setting nativeBuildSystem below to 'makefile'. This will allow building the demo
 // on Windows machines, but note that full equivalence with the Bazel
 // build is not yet guaranteed. See comments below for caveats and tips
 // for speeding up the build, such as as enabling ccache.
-
-// Set to true to build with make.
 // NOTE: Running a make build will cause subsequent Bazel builds to *fail*
 // unless the contrib/makefile/downloads/ and gen/ dirs are deleted afterwards.
-def buildWithMake = false
+
+// The cmake build only creates libtensorflow_demo.so. In this situation,
+// libtensorflow_inference.so will be acquired via the tensorflow.aar dependency.
+
+// It is necessary to customize Gradle's build directory, as otherwise
+// it will conflict with the BUILD file used by Bazel on case-insensitive OSs.
+project.buildDir = 'gradleBuild'
+getProject().setBuildDir('gradleBuild')
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'org.apache.httpcomponents:httpclient:4.5.2'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+// set to 'bazel', 'cmake', 'makefile', 'none'
+def nativeBuildSystem = 'bazel'
 
 // Controls output directory in APK and CPU type for Bazel builds.
 // NOTE: Does not affect the Makefile build target API (yet), which currently
 // assumes armeabi-v7a. If building with make, changing this will require
 // editing the Makefile as well.
+// The CMake build has only been tested with armeabi-v7a; others may not work.
 def cpuType = 'armeabi-v7a'
 
 // Output directory in the local directory for packaging into the APK.
@@ -30,62 +56,66 @@ def nativeOutDir = 'libs/' + cpuType
 def nativeBuildRule = 'buildNativeBazel'
 def demoLibPath = '../../../bazel-bin/tensorflow/examples/android/libtensorflow_demo.so'
 def inferenceLibPath = '../../../bazel-bin/tensorflow/contrib/android/libtensorflow_inference.so'
-if (buildWithMake) {
+if (nativeBuildSystem == 'makefile') {
     nativeBuildRule = 'buildNativeMake'
     demoLibPath = '../../../tensorflow/contrib/makefile/gen/lib/libtensorflow_demo.so'
     inferenceLibPath = '../../../tensorflow/contrib/makefile/gen/lib/libtensorflow_inference.so'
 }
 
-// Defines the NDK location for Makefile builds. Does *not* affect Bazel builds.
-// Override with your absolute NDK location if this fails to get the location
-// automatically.
-def makeNdkRoot = System.getenv('NDK_ROOT')
-
 // If building with Bazel, this is the location of the bazel binary.
 // NOTE: Bazel does not yet support building for Android on Windows,
 // so in this case the Makefile build must be used as described above.
 def bazelLocation = '/usr/local/bin/bazel'
 
-project.buildDir = 'gradleBuild'
-getProject().setBuildDir('gradleBuild')
-
 // import DownloadModels task
 project.ext.ASSET_DIR = projectDir.toString() + '/assets'
 project.ext.TMP_DIR   = project.buildDir.toString() + '/downloads'
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
-    }
-}
-
 apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
     buildToolsVersion "25.0.2"
 
+    if (nativeBuildSystem == 'cmake') {
+        defaultConfig {
+            applicationId = 'com.tensorflow.demo'
+            minSdkVersion 21
+            targetSdkVersion 23
+            ndk {
+                abiFilters "${cpuType}"
+            }
+            externalNativeBuild {
+                cmake {
+                    arguments '-DANDROID_TOOLCHAIN=gcc', '-DANDROID_STL=gnustl_static'
+                }
+            }
+        }
+        externalNativeBuild {
+            cmake {
+                path './jni/CMakeLists.txt'
+            }
+        }
+    }
+
     lintOptions {
         abortOnError false
     }
 
     sourceSets {
         main {
-            // TensorFlow Java API sources.
-            java {
-                srcDir '../../java/src/main/java'
-                exclude '**/examples/**'
+            if (nativeBuildSystem == 'bazel' || nativeBuildSystem == 'makefile') {
+                // TensorFlow Java API sources.
+                java {
+                    srcDir '../../java/src/main/java'
+                    exclude '**/examples/**'
+                }
+
+                // Android TensorFlow wrappers, etc.
+                java {
+                    srcDir '../../contrib/android/java'
+                }
             }
-
-            // Android TensorFlow wrappers, etc.
-            java {
-                srcDir '../../contrib/android/java'
-            }
-
             // Android demo app sources.
             java {
                 srcDir 'src'
@@ -115,7 +145,7 @@ task buildNativeBazel(type: Exec) {
 }
 
 task buildNativeMake(type: Exec) {
-    environment "NDK_ROOT", makeNdkRoot
+    environment "NDK_ROOT", android.ndkDirectory
     // Tip: install ccache and uncomment the following to speed up
     // builds significantly.
     // environment "CC_PREFIX", 'ccache'
@@ -138,13 +168,14 @@ task copyNativeLibs(type: Copy) {
     fileMode 0644
 }
 
-
 tasks.whenTaskAdded { task ->
-    if (task.name == 'assembleDebug') {
-        task.dependsOn 'copyNativeLibs'
-    }
-    if (task.name == 'assembleRelease') {
-        task.dependsOn 'copyNativeLibs'
+    if (nativeBuildSystem == 'bazel' || nativeBuildSystem == 'makefile') {
+        if (task.name == 'assembleDebug') {
+            task.dependsOn 'copyNativeLibs'
+        }
+        if (task.name == 'assembleRelease') {
+            task.dependsOn 'copyNativeLibs'
+        }
     }
 }
 
@@ -152,3 +183,9 @@ tasks.whenTaskAdded { task ->
 // place them in the "assets" directory and comment out this line.
 apply from: "download-models.gradle"
 
+
+dependencies {
+    if (nativeBuildSystem == 'cmake' || nativeBuildSystem == 'none') {
+        compile 'org.tensorflow:tensorflow-android:1.2.0-preview'
+    }
+}
diff --git a/tensorflow/examples/android/jni/CMakeLists.txt b/tensorflow/examples/android/jni/CMakeLists.txt
new file mode 100644
index 0000000000..c8238464f5
--- /dev/null
+++ b/tensorflow/examples/android/jni/CMakeLists.txt
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+project(TENSORFLOW_DEMO)
+cmake_minimum_required(VERSION 3.4.1)
+
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+get_filename_component(TF_SRC_ROOT ${CMAKE_SOURCE_DIR}/../../../..  ABSOLUTE)
+get_filename_component(SAMPLE_SRC_DIR  ${CMAKE_SOURCE_DIR}/..  ABSOLUTE)
+
+if (ANDROID_ABI MATCHES "^armeabi-v7a$")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=softfp -mfpu=neon")
+elseif(ANDROID_ABI MATCHES "^arm64-v8a")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -ftree-vectorize")
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTANDALONE_DEMO_LIB \
+                    -std=c++11 -fno-exceptions -fno-rtti -O2 -Wno-narrowing \
+                    -fPIE")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} \
+                              -Wl,--allow-multiple-definition \
+                              -Wl,--whole-archive -fPIE -v")
+
+file(GLOB_RECURSE tensorflow_demo_sources ${SAMPLE_SRC_DIR}/jni/*.*)
+add_library(tensorflow_demo SHARED
+            ${tensorflow_demo_sources})
+target_include_directories(tensorflow_demo PRIVATE
+                           ${TF_SRC_ROOT}
+                           ${CMAKE_SOURCE_DIR})
+
+target_link_libraries(tensorflow_demo
+                      android
+                      log
+                      jnigraphics
+                      m
+                      atomic
+                      z)
-- 
GitLab


From 98ccdcd2a0a0835a2804a00d66fcd6014df099bc Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 11 May 2017 16:23:15 -0700
Subject: [PATCH 1254/1563] Automated g4 rollback of changelist 155779520

PiperOrigin-RevId: 155811666
---
 tensorflow/contrib/tfprof/README.md           |  78 ++++-
 .../python/tools/tfprof/model_analyzer.py     |  10 +-
 .../tools/tfprof/model_analyzer_test.py       |  38 ++-
 .../tools/tfprof/print_model_analysis_test.py |   9 +-
 .../python/tools/tfprof/tfprof_logger.py      |  10 +-
 tensorflow/tools/tfprof/README.md             |  64 +---
 .../tools/tfprof/g3doc/code_timeline.png      | Bin 45674 -> 0 bytes
 .../tools/tfprof/g3doc/graph_timeline.png     | Bin 168051 -> 0 bytes
 .../tools/tfprof/g3doc/scope_timeline.png     | Bin 24944 -> 0 bytes
 tensorflow/tools/tfprof/internal/BUILD        |  58 +---
 .../tfprof/internal/print_model_analysis.cc   |  11 +-
 .../tools/tfprof/internal/tfprof_code.cc      |  17 +-
 .../tools/tfprof/internal/tfprof_code.h       |  20 +-
 .../tools/tfprof/internal/tfprof_graph.cc     |  23 +-
 .../tools/tfprof/internal/tfprof_graph.h      |  29 +-
 .../tools/tfprof/internal/tfprof_node.cc      |  26 +-
 .../tools/tfprof/internal/tfprof_node.h       |  68 ++--
 .../tools/tfprof/internal/tfprof_node_show.cc | 296 ------------------
 .../tools/tfprof/internal/tfprof_node_show.h  | 173 ----------
 .../tools/tfprof/internal/tfprof_options.cc   | 134 +-------
 .../tools/tfprof/internal/tfprof_options.h    |  43 +--
 .../tools/tfprof/internal/tfprof_scope.cc     |  12 +-
 .../tools/tfprof/internal/tfprof_scope.h      |  19 +-
 .../tools/tfprof/internal/tfprof_show.cc      | 168 ++++++++--
 .../tools/tfprof/internal/tfprof_show.h       |  32 +-
 .../tools/tfprof/internal/tfprof_show_code.cc | 161 +++++++++-
 .../tools/tfprof/internal/tfprof_show_code.h  |  33 +-
 .../tools/tfprof/internal/tfprof_show_test.cc |   2 +-
 .../tools/tfprof/internal/tfprof_stats.cc     |  27 +-
 .../tfprof/internal/tfprof_stats_test.cc      |  40 +--
 .../tfprof/internal/tfprof_tensor_test.cc     |   2 +-
 .../tools/tfprof/internal/tfprof_timeline.cc  | 245 ---------------
 .../tools/tfprof/internal/tfprof_timeline.h   | 147 ---------
 .../tfprof/internal/tfprof_timeline_test.cc   |  92 ------
 .../tools/tfprof/internal/tfprof_utils.cc     |  14 +-
 tensorflow/tools/tfprof/tfprof_main.cc        |  32 +-
 tensorflow/tools/tfprof/tfprof_options.proto  |   2 +-
 tensorflow/tools/tfprof/tfprof_output.proto   |   3 +-
 38 files changed, 668 insertions(+), 1470 deletions(-)
 delete mode 100644 tensorflow/tools/tfprof/g3doc/code_timeline.png
 delete mode 100644 tensorflow/tools/tfprof/g3doc/graph_timeline.png
 delete mode 100644 tensorflow/tools/tfprof/g3doc/scope_timeline.png
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_node_show.cc
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_node_show.h
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline.cc
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline.h
 delete mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc

diff --git a/tensorflow/contrib/tfprof/README.md b/tensorflow/contrib/tfprof/README.md
index 5bfa0247a5..d891ecdc9a 100644
--- a/tensorflow/contrib/tfprof/README.md
+++ b/tensorflow/contrib/tfprof/README.md
@@ -2,25 +2,81 @@
 
 # Full Docment in tensorflow/tools/tfprof/README.md
 
-Author: Xin Pan (xpan@google.com, github: panyx0718), Jon Shlens, Yao Zhang
+Author: Xin Pan (xpan@google.com, github: panyx0718)
 
 Consultants: Jon Shlens, Pete Warden
 
 ###Major Features
 
 1.  Measure model parameters, float operations, tensor shapes.
-2.  Profile op execution times, requested memory size and device placement.
+2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  Selectively group, filter, account and order ops.
+4.  3 ways to view and explore TensorFlow model profiles
 
-####tfprof supports 3 views to organize TensorFlow model profiles
+    *  Organize by Python code call stack.
+    *  Organize by TensorFlow operation name scope hierarchies.
+    *  Organize by TensorFlow operation inputs/outputs graph.
 
-    *  code view: Stats are associated your Python codes and organized as call stacks.
-    *  scope view: Stats are organized as name scope hierarchies.
-    *  graph view: Stats are organized as Tensorflow Op graph.
+5.  Selectively grouping/filtering/accounting/ordering ops.
 
-####For each view, there are 3 ways to display outputs:
+tfprof can be used as Python API, Interactive CLI and One-shot Script.
 
-    *  stdout: Results are written to stdout.
-    *  timeline: Visualized in chrome browser as time series.
-    *  file: Results are dumped to file.
+## Python API Tutorials
+
+tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
+
+### Examine the shapes and sizes of all trainiable Variables.
+```python
+# Print trainable variable parameter statistics to stdout.
+param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
+    tf.get_default_graph(),
+    tfprof_options=tf.contrib.tfprof.model_analyzer.
+        TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
+
+# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
+# It organize the statistics
+# of each graph node in tree scructure. Let's print the root below.
+sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
+```
+
+### Examine the number of floating point operations
+``` python
+# Print to stdout an analysis of the number of floating point operations in the
+# model broken down by individual operations.
+#
+# Note: Only Ops with RegisterStatistics('flops') defined have flop stats. It
+# also requires complete shape information. It is common that shape is unknown
+# statically. To complete the shape, provide run-time shape information with
+# tf.RunMetadata to the API (See next example on how to provide RunMetadata).
+tf.contrib.tfprof.model_analyzer.print_model_analysis(
+    tf.get_default_graph(),
+    tfprof_options=tf.contrib.tfprof.model_analyzer.FLOAT_OPS_OPTIONS)
+```
+
+### Examine the timing and memory usage
+You will first need to run the following set up in your model in order to
+compute the memory and timing statistics.
+
+```python
+# Generate the meta information for the model that contains the memory usage
+# and timing information.
+run_metadata = tf.RunMetadata()
+with tf.Session() as sess:
+  _ = sess.run(train_op,
+               options=tf.RunOptions(trace_level=tf.RunOptions.FULL_TRACE),
+               run_metadata=run_metadata)
+```
+
+Finally, you may run `print_model_analysis` to explore the timing and memory
+demands of the model.
+
+``` python
+# Print to stdout an analysis of the memory usage and the timing information
+# from running the graph broken down by operations.
+tf.contrib.tfprof.model_analyzer.print_model_analysis(
+    tf.get_default_graph(),
+    run_meta=run_metadata,
+    tfprof_options=tf.contrib.tfprof.model_analyzer.PRINT_ALL_TIMING_MEMORY)
+```
+
+Users can change ```tfprof_options``` to fully leverage tfprof's power.
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
index 17dff69edd..13b407d815 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
@@ -45,7 +45,7 @@ TRAINABLE_VARS_PARAMS_STAT_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['params'],
-    'output': 'stdout',
+    'viz': False,
     'dump_to_file': ''
 }
 
@@ -65,7 +65,7 @@ FLOAT_OPS_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['float_ops'],
-    'output': 'stdout',
+    'viz': False,
     'dump_to_file': ''
 }
 
@@ -87,7 +87,7 @@ PRINT_PARAMS_ON_DEVICE = {
     'hide_name_regexes': [],
     'account_displayed_op_only': False,
     'select': ['device', 'params'],
-    'output': 'stdout',
+    'viz': False,
     'dump_to_file': ''
 }
 
@@ -107,7 +107,7 @@ PRINT_ALL_TIMING_MEMORY = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['micros', 'bytes'],
-    'output': 'stdout',
+    'viz': False,
     'dump_to_file': ''
 }
 
@@ -178,7 +178,7 @@ def print_model_analysis(graph,
   opts.account_displayed_op_only = tfprof_options['account_displayed_op_only']
   for p in tfprof_options['select']:
     opts.select.append(p)
-  opts.output = tfprof_options['output']
+  opts.viz = tfprof_options['viz']
   opts.dump_to_file = tfprof_options['dump_to_file']
 
   run_meta_str = run_meta.SerializeToString() if run_meta else b''
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
index afd8563e78..55167576e2 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
@@ -35,14 +35,13 @@ class PrintModelAnalysisTest(test.TestCase):
   def testDumpToFile(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
-    outfile = os.path.join(test.get_temp_dir(), 'dump')
-    opts['output'] = 'file:outfile=' + outfile
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = lib.BuildSmallModel()
       model_analyzer.print_model_analysis(sess.graph, tfprof_options=opts)
 
-      with gfile.Open(outfile, 'r') as f:
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
         self.assertEqual(u'_TFProfRoot (--/451 params)\n'
                          '  DW (3x3x3x6, 162/162 params)\n'
                          '  DW2 (2x2x6x12, 288/288 params)\n'
@@ -52,14 +51,15 @@ class PrintModelAnalysisTest(test.TestCase):
   def testSelectEverything(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
-    outfile = os.path.join(test.get_temp_dir(), 'dump')
-    opts['output'] = 'file:outfile=' + outfile
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
     opts['account_type_regexes'] = ['.*']
     opts['select'] = [
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device', 'op_types'
     ]
 
-    with session.Session() as sess, ops.device('/cpu:0'):
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
@@ -72,18 +72,17 @@ class PrintModelAnalysisTest(test.TestCase):
       model_analyzer.print_model_analysis(
           sess.graph, run_meta, tfprof_options=opts)
 
-      with gfile.Open(outfile, 'r') as f:
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
         # pylint: disable=line-too-long
         self.assertEqual(
-            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  ScalarW (1, 1/1 params, 0/0 flops, 0B/0B, VariableV2|_trainable_variables)\n    ScalarW/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    ScalarW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      ScalarW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        ScalarW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        ScalarW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        ScalarW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    ScalarW/read (0/0 params, 0/0 flops, 0B/0B, Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
+            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  ScalarW (1, 1/1 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|VariableV2|_trainable_variables)\n    ScalarW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    ScalarW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      ScalarW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        ScalarW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        ScalarW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        ScalarW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    ScalarW/read (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
             f.read())
         # pylint: enable=line-too-long
 
   def testSimpleCodeView(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    outfile = os.path.join(test.get_temp_dir(), 'dump')
-    opts['output'] = 'file:outfile=' + outfile
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
     opts['account_type_regexes'] = ['.*']
     opts['show_name_regexes'] = ['.*model_analyzer_testlib.*']
     opts['account_displayed_op_only'] = False
@@ -93,7 +92,9 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
     ]
 
-    with session.Session() as sess, ops.device('/cpu:0'):
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
@@ -106,7 +107,7 @@ class PrintModelAnalysisTest(test.TestCase):
       model_analyzer.print_model_analysis(
           sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
 
-      with gfile.Open(outfile, 'r') as f:
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
         # pylint: disable=line-too-long
         self.assertEqual(
             '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB)\n  model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n  model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/1 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/162 params, 0/0 flops, 0B/1.30KB)\n  model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/5.83k flops, 0B/432B)\n  model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/288 params, 0/0 flops, 0B/2.30KB)\n  model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/4.61k flops, 0B/384B)\n',
@@ -116,14 +117,15 @@ class PrintModelAnalysisTest(test.TestCase):
   def testComplexCodeView(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    outfile = os.path.join(test.get_temp_dir(), 'dump')
-    opts['output'] = 'file:outfile=' + outfile
+    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
     opts['account_type_regexes'] = ['.*']
     opts['show_name_regexes'] = ['.*model_analyzer_testlib.py.*']
     opts['account_displayed_op_only'] = False
     opts['select'] = ['params', 'float_ops']
 
-    with session.Session() as sess, ops.device('/cpu:0'):
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
       x = lib.BuildFullModel()
 
       sess.run(variables.global_variables_initializer())
@@ -137,7 +139,7 @@ class PrintModelAnalysisTest(test.TestCase):
           sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
 
       # pylint: disable=line-too-long
-      with gfile.Open(outfile, 'r') as f:
+      with gfile.Open(opts['dump_to_file'], 'r') as f:
         self.assertEqual(
             '_TFProfRoot (0/2.84k params, 0/54.08k flops)\n  model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_... (0/1.80k params, 0/41.76k flops)\n    model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops)\n    model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/4 params, 0/0 flops)\n    model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/648 params, 0/0 flops)\n    model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/23.33k flops)\n    model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/1.15k params, 0/0 flops)\n    model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/18.43k flops)\n  model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c... (0/1.04k params, 0/4.13k flops)\n  model_analyzer_testlib.py:62:BuildFullModel:target = array_op... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min... (0/0 params, 0/8.19k flops)\n',
             f.read())
@@ -168,7 +170,9 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device'
     ]
 
-    with session.Session() as sess, ops.device('/cpu:0'):
+    config = config_pb2.ConfigProto(
+        graph_options=config_pb2.GraphOptions(build_cost_model=1))
+    with session.Session(config=config) as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
index c3e9fc9cc0..aa133d3142 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
@@ -51,7 +51,7 @@ TEST_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['params'],
-    'output': 'stdout',
+    'viz': False
 }
 
 # pylint: enable=bad-whitespace
@@ -92,7 +92,7 @@ class PrintModelAnalysisTest(test.TestCase):
     opts.account_displayed_op_only = TEST_OPTIONS['account_displayed_op_only']
     for p in TEST_OPTIONS['select']:
       opts.select.append(p)
-    opts.output = TEST_OPTIONS['output']
+    opts.viz = TEST_OPTIONS['viz']
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = self._BuildSmallModel()
@@ -116,6 +116,7 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
+      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -127,6 +128,7 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 648
+      device: "/device:CPU:0"
       children {
       name: "DW/Assign"
       exec_micros: 0
@@ -134,6 +136,7 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
+      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -214,6 +217,7 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
+      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -227,6 +231,7 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
+      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
index e6d504d516..cd3912bbfb 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
@@ -62,7 +62,7 @@ def _fill_missing_graph_shape(graph, run_meta):
   return graph
 
 
-def _get_logged_ops(graph, run_meta=None, add_trace=True):
+def _get_logged_ops(graph, run_meta=None, add_trace=False):
   """Extract trainable model parameters and FLOPs for ops from a Graph.
 
   Args:
@@ -120,8 +120,9 @@ def _get_logged_ops(graph, run_meta=None, add_trace=True):
   return logged_ops
 
 
-def _merge_default_with_oplog(graph, op_log=None, run_meta=None,
-                              add_trace=True):
+def _merge_default_with_oplog(graph, op_log=None,
+                              run_meta=None,
+                              add_trace=False):
   """Merge the tfprof default extra info with caller's op_log.
 
   Args:
@@ -153,7 +154,8 @@ def _merge_default_with_oplog(graph, op_log=None, run_meta=None,
   return tmp_op_log
 
 
-def write_op_log(graph, log_dir, op_log=None, run_meta=None, add_trace=True):
+def write_op_log(graph, log_dir, op_log=None, run_meta=None,
+                 add_trace=False):
   """Log provided 'op_log', and add additional model information below.
 
     The API also assigns ops in tf.trainable_variables() an op type called
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index 69f09411a9..52d376d5f5 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -1,6 +1,6 @@
 # tfprof: A Profiling Tool for TensorFlow Models
 
-Author: Xin Pan (xpan@google.com, github: panyx0718), Jon Shlens, Yao Zhang
+Author: Xin Pan (xpan@google.com, github: panyx0718)
 
 Consultants: Jon Shlens, Pete Warden
 
@@ -8,22 +8,15 @@ Consultants: Jon Shlens, Pete Warden
 ###Major Features
 
 1.  Measure model parameters, float operations, tensor shapes.
-2.  Profile op execution times, requested memory size and device placement.
+2.  Measure op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  Selectively group, filter, account and order ops.
+4.  3 ways to view and explore TensorFlow model profiles
 
-####tfprof supports 3 views to organize TensorFlow model profiles
-
-    *  code view: Stats are associated your Python codes and organized as call stacks.
-    *  scope view: Stats are organized as name scope hierarchies.
-    *  graph view: Stats are organized as Tensorflow Op graph.
-
-####For each view, there are 3 ways to display outputs:
-
-    *  stdout: Results are written to stdout.
-    *  timeline: Visualized in chrome browser as time series.
-    *  file: Results are dumped to file.
+    *  Organize by Python code call stack.
+    *  Organize by TensorFlow operation name scope hierarchies.
+    *  Organize by TensorFlow operation inputs/outputs graph.
 
+5.  Selectively grouping/filtering/accounting/ordering ops.
 
 [Python API Tutorials](#python-api-tutorials): It can be called directly from
 Python codes. Results are either printed
@@ -90,11 +83,13 @@ compute the memory and timing statistics.
 #
 # Note: When run on GPU, a kernel is first scheduled (enqueued) and then
 #       executed asynchronously. tfprof only tracks the execution time.
+#       Which is from proto CostGraphDef::Node::compute_cost.
 #       In addition, a substantial of time might be spent between Python and
 #       TensorFlow runtime, which is also not tracked by tfprof.
 #
+config = tf.ConfigProto(graph_options=tf.GraphOptions(build_cost_model=1))
 run_metadata = tf.RunMetadata()
-with tf.Session() as sess:
+with tf.Session(config=config) as sess:
   _ = sess.run(train_op,
                options=tf.RunOptions(trace_level=tf.RunOptions.FULL_TRACE),
                run_metadata=run_metadata)
@@ -126,18 +121,6 @@ tf.contrib.tfprof.model_analyzer.print_model_analysis(
 
 Users can change ```tfprof_options``` to fully leverage tfprof's power.
 
-```
-For example set opts['output'] = 'timeline:outfile=<filename>' to
-generate a timeline json file. Open a Chrome Browser, open URL
-chrome://tracing, and load the json file. Below are 2 examples of graph
-view and scope view. See code view example in later examples.
-```
-
-<left>
-![CodeTimeline](g3doc/graph_timeline.png)
-![CodeTimeline](g3doc/scope_timeline.png)
-</left>
-
 
 ## CLI Tutorials
 
@@ -214,14 +197,8 @@ tfprof>
 # supported select fileds. Availability depends on --[run_meta|checkpoint|op_log]_path.
 # [bytes|micros|params|float_ops|num_hidden_ops|tensor_value|device|op_types]
 -select                     params
-# format: output_type:key=value,key=value...
-# output_types: stdout (default), timeline, file.
-# key=value pairs:
-#   1. timeline: outfile=<filename>
-#   2. file: outfile=<filename>
-#   3. stdout: None.
-# E.g. timeline:outfile=/tmp/timeline.json
--output
+-viz                        false
+-dump_to_file
 ```
 
 3) I want to see which line of my python codes costs most time!
@@ -245,12 +222,6 @@ _TFProfRoot (0us/22.44ms)
         model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
 ```
 
-Set ```-output timeline:outfile=<filename>``` to generate timeline instead of stdout.
-<left>
-![CodeTimeline](g3doc/code_timeline.png)
-</left>
-
-
 4) I want to see the `BatchNorm`'s gamma value in checkpoint.
 
 ```shell
@@ -452,10 +423,10 @@ the tool adds all `Variables` inside `tf.trainable_variables()` to
 12) Run tfprof in one-shot mode and dump result to file.
 
 ```shell
-# By default output to stdout. Use -output option to change output types.
+# Printed to stdout if --dump_to_file is not set.
 tfprof scope --graph_path=graph.pbtxt  \
              --max_depth=3 \
-             --output="file:outfile=/tmp/dump"
+             --dump_to_file="/tmp/dump"
 Reading Files...
 Parsing GraphDef...
 Preparing Views...
@@ -567,9 +538,4 @@ as long as they match the `-account_xxx` options.
 
 `-select`: Comma-separated list of metrics to show: [bytes|micros|params|float_ops|num_hidden_ops|tensor_value|device|op_types].
 
-`-output`: Output results as stdout, file or timeline.
-The format is ```output_type:key=value,key=value```.
-For example: ```timeline:outfile=<filename>```.
-timeline: key=outfile, value=<filename>.
-stdout: none.
-file: key=outfile, value=<filename>.
+`-dump_to_file`: Dump the output to a file, instead of terminal.
diff --git a/tensorflow/tools/tfprof/g3doc/code_timeline.png b/tensorflow/tools/tfprof/g3doc/code_timeline.png
deleted file mode 100644
index c5ab246f7da14c0384a5704aa8053a97540a9dab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45674
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
J);T3K0RX~K!#4l`

diff --git a/tensorflow/tools/tfprof/g3doc/graph_timeline.png b/tensorflow/tools/tfprof/g3doc/graph_timeline.png
deleted file mode 100644
index 255a91fd5ff6005086f7d4a1dfdd43cc8d115ee1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168051
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
E0CyO~SO5S3

diff --git a/tensorflow/tools/tfprof/g3doc/scope_timeline.png b/tensorflow/tools/tfprof/g3doc/scope_timeline.png
deleted file mode 100644
index c6d95af84aac473e68b30fc6fbefa99d4431948f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24944
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

diff --git a/tensorflow/tools/tfprof/internal/BUILD b/tensorflow/tools/tfprof/internal/BUILD
index e90f0ec40a..adace89985 100644
--- a/tensorflow/tools/tfprof/internal/BUILD
+++ b/tensorflow/tools/tfprof/internal/BUILD
@@ -21,7 +21,6 @@ cc_library(
         ":tfprof_options",
         ":tfprof_scope",
         ":tfprof_show",
-        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -31,20 +30,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "tfprof_timeline",
-    srcs = ["tfprof_timeline.cc"],
-    hdrs = ["tfprof_timeline.h"],
-    deps = [
-        ":tfprof_node_show",
-        ":tfprof_utils",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/tools/tfprof:protos_all_cc",
-        "@jsoncpp_git//:jsoncpp",
-    ],
-)
-
 cc_library(
     name = "tfprof_node",
     srcs = ["tfprof_node.cc"],
@@ -86,7 +71,7 @@ cc_library(
         ":tfprof_node",
         ":tfprof_options",
         ":tfprof_show_code",
-        ":tfprof_timeline",
+        ":tfprof_tensor",
         ":tfprof_utils",
         "//tensorflow/c:c_api",
         "//tensorflow/c:checkpoint_reader",
@@ -108,7 +93,6 @@ cc_library(
         ":tfprof_options",
         ":tfprof_show",
         ":tfprof_tensor",
-        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -118,21 +102,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "tfprof_node_show",
-    srcs = ["tfprof_node_show.cc"],
-    hdrs = ["tfprof_node_show.h"],
-    deps = [
-        ":tfprof_constants",
-        ":tfprof_node",
-        ":tfprof_options",
-        ":tfprof_utils",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/tools/tfprof:protos_all_cc",
-    ],
-)
-
 cc_library(
     name = "tfprof_show",
     srcs = ["tfprof_show.cc"],
@@ -140,10 +109,8 @@ cc_library(
     deps = [
         ":tfprof_constants",
         ":tfprof_node",
-        ":tfprof_node_show",
         ":tfprof_options",
         ":tfprof_tensor",
-        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -160,12 +127,10 @@ cc_library(
     deps = [
         ":tfprof_constants",
         ":tfprof_node",
-        ":tfprof_node_show",
         ":tfprof_options",
         ":tfprof_scope",
         ":tfprof_show",
         ":tfprof_tensor",
-        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -201,27 +166,6 @@ tf_cc_test(
     ],
 )
 
-tf_cc_test(
-    name = "tfprof_timeline_test",
-    srcs = ["tfprof_timeline_test.cc"],
-    data = [
-        "testdata/graph.pbtxt",
-        "testdata/run_meta",
-    ],
-    deps = [
-        ":tfprof_constants",
-        ":tfprof_options",
-        ":tfprof_stats",
-        ":tfprof_utils",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:protos_all_cc",
-        "//tensorflow/core:test",
-        "//tensorflow/core:test_main",
-        "//tensorflow/core:testlib",
-        "//tensorflow/tools/tfprof:protos_all_cc",
-    ],
-)
-
 cc_library(
     name = "tfprof_utils",
     srcs = ["tfprof_utils.cc"],
diff --git a/tensorflow/tools/tfprof/internal/print_model_analysis.cc b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
index f73675e8a7..c816e3209e 100644
--- a/tensorflow/tools/tfprof/internal/print_model_analysis.cc
+++ b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
@@ -56,14 +56,11 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
   TFStats tf_stats(std::move(graph_ptr), std::move(run_meta_ptr),
                    std::move(op_log_ptr), std::move(ckpt_reader));
 
-  Options opts;
-  tensorflow::Status s = Options::FromProtoStr(*options, &opts);
-  if (!s.ok()) {
-    fprintf(stderr, "%s\n", s.ToString().c_str());
-    return "";
-  }
+  Options opts = Options::FromProtoStr(*options);
 
-  if (opts.output_type == kOutput[1]) {
+  // TODO(xpan): We should have dump_to_file/print_stdout/etc to control
+  // side-effects independently instead of one controlling the other.
+  if (opts.dump_to_file.empty()) {
     printf("\n=========================Options=============================\n");
     printf("%s", opts.ToString().c_str());
     printf("\n==================Model Analysis Report======================\n");
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.cc b/tensorflow/tools/tfprof/internal/tfprof_code.cc
index 9739db1e0b..5618a52286 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_code.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.cc
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/regexp.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -98,8 +99,7 @@ CodeNode* TFCode::BuildCodeNodes(TFCodeNode* root) {
   return code_root_ptr;
 }
 
-const ShowCodeNode* TFCode::ShowInternal(const Options& opts,
-                                         Timeline* timeline) {
+const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
   // Search from roots recursively to find start node, if start_name_regexes
   // is specified.
   tfprof_trace_root_.reset(new TFCodeNode(kTFProfRoot));
@@ -117,11 +117,7 @@ const ShowCodeNode* TFCode::ShowInternal(const Options& opts,
   tfprof_code_root_->children.assign(roots.begin(), roots.end());
   Account({tfprof_code_root_.get()}, opts);
 
-  CodeNode* root = PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
-  if (timeline) {
-    timeline->GenerateCodeTimeline(root);
-  }
-  return root;
+  return PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
 }
 
 std::vector<CodeNode*> TFCode::SearchRoot(std::vector<CodeNode*> roots,
@@ -174,13 +170,8 @@ std::vector<CodeNode*> TFCode::PrintScope(const std::vector<CodeNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (CodeNode* sc : show_cnodes) {
-        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
-          children_str += sc->formatted_str;
-          sc->formatted_str.clear();
-        }
+        children_str += sc->formatted_str;
         node->mutable_proto()->add_children()->MergeFrom(sc->proto());
-        sc->mutable_proto()->mutable_children()->Clear();
-        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.h b/tensorflow/tools/tfprof/internal/tfprof_code.h
index d7a28624f1..7c517e6b0e 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_code.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.h
@@ -30,7 +30,6 @@ limitations under the License.
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
@@ -38,6 +37,22 @@ limitations under the License.
 namespace tensorflow {
 namespace tfprof {
 
+class CodeNode : public ShowCodeNode {
+ public:
+  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
+  ~CodeNode() override {}
+
+  void AggregateTotalStats(CodeNode* node) {
+    ShowCodeNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() { ShowCodeNode::ResetTotalStats(); }
+
+  std::vector<CodeNode*> children;
+};
+
 class TFCode : public TFShowCode {
  public:
   explicit TFCode() : code_root_(nullptr), trace_root_(nullptr) {}
@@ -50,8 +65,7 @@ class TFCode : public TFShowCode {
  private:
   CodeNode* BuildCodeNodes(TFCodeNode* root);
 
-  const ShowCodeNode* ShowInternal(const Options& opts,
-                                   Timeline* timeline) override;
+  const ShowCodeNode* ShowInternal(const Options& opts) override;
 
   std::vector<CodeNode*> SearchRoot(std::vector<CodeNode*> roots,
                                     const std::vector<string>& regexes);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.cc b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
index 23084146c2..1623d9f8c4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
@@ -66,7 +66,7 @@ void TFGraph::Build() {
   }
 }
 
-const ShowNode* TFGraph::ShowInternal(const Options& opts, Timeline* timeline) {
+const ShowNode* TFGraph::ShowInternal(const Options& opts) {
   // Search the nodes to start from.
   std::vector<GraphNode*> roots = roots_;
   if (opts.start_name_regexes.size() != 1 ||
@@ -81,13 +81,11 @@ const ShowNode* TFGraph::ShowInternal(const Options& opts, Timeline* timeline) {
   std::map<string, int64> account_visits;
   Account({root}, opts, &account_visits);
 
-  std::set<string> visits;
-  root = PrintGraph({root}, opts, 1, 0, 0, &visits)[0];
-
-  if (timeline) {
-    timeline->GenerateGraphTimeline(root);
+  if (opts.viz) {
+    printf("Visualizing feature disabled...\n");
   }
-  return root;
+  std::set<string> visits;
+  return PrintGraph({root}, opts, 1, 0, 0, &visits)[0];
 }
 
 std::vector<GraphNode*> TFGraph::SearchRoot(
@@ -157,14 +155,8 @@ std::vector<GraphNode*> TFGraph::PrintGraph(const std::vector<GraphNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (GraphNode* sc : show_cnodes) {
-        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
-          children_str += sc->formatted_str;
-          sc->formatted_str.clear();
-        }
-        // This swap and reinit pattern is critical for performance.
-        node->mutable_proto()->add_children()->Swap(sc->mutable_proto());
-        sc->ReInit();
-        node->show_children.push_back(sc);
+        children_str += sc->formatted_str;
+        node->mutable_proto()->add_children()->MergeFrom(sc->proto());
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
@@ -189,6 +181,7 @@ std::vector<GraphNode*> TFGraph::PrintGraph(const std::vector<GraphNode*> roots,
           node->formatted_str += value_str;
         }
       }
+
       node->formatted_str += children_str;
       show_nodes.push_back(node);
     } else {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.h b/tensorflow/tools/tfprof/internal/tfprof_graph.h
index 4d4aa8b2b1..75979d020c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.h
@@ -37,6 +37,32 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
+class GraphNode : public ShowNode {
+ public:
+  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
+    mutable_proto()->set_inputs(node->inputs().size());
+    mutable_proto()->set_total_inputs(0);
+  }
+
+  void AggregateTotalStats(GraphNode* node) {
+    ShowNode::AggregateTotalStats(node);
+    mutable_proto()->set_total_inputs(proto().total_inputs() +
+                                      node->proto().total_inputs() + 1);
+  }
+
+  void AddSelfToTotalStats() {
+    ShowNode::AddSelfToTotalStats();
+    mutable_proto()->set_total_inputs(proto().total_inputs() +
+                                      proto().inputs());
+  }
+
+  void ResetTotalStats() {
+    ShowNode::ResetTotalStats();
+    mutable_proto()->set_total_inputs(0);
+  }
+
+  std::vector<GraphNode*> children;
+};
 
 // Organize tensorflow ops in a graph structure, pointing from output ops
 // to input ops.
@@ -51,8 +77,7 @@ class TFGraph : public TFShow {
   void Build() override;
 
  private:
-  const ShowNode* ShowInternal(const Options& opts,
-                               Timeline* timeline) override;
+  const ShowNode* ShowInternal(const Options& opts) override;
 
   bool ShouldShowIfExtra(ShowNode* node, const Options& opts,
                          int depth) override {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.cc b/tensorflow/tools/tfprof/internal/tfprof_node.cc
index 74c8fcbe48..5f018addb4 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.cc
@@ -20,22 +20,20 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-// Notes about start and end time from the NodeExecStats proto.
-// For GPU, there is no difference between op_end_rel_micros and
-// all_end_rel_micros. All are kernel times.
-// For CPU, op_end_rel is the kernel time, while all_end_rel_micros includes
-// some post-processing.
-// Here, we only consider kernel time for simplicity.
 void TFGraphNode::AddStepStat(const string& device,
                               const NodeExecStats* step_stat) {
+  if (!device.empty()) {
+    // This might override device from GraphDef.
+    device_ = device;
+  }
   step_stat_ = step_stat;
-  CHECK(step_stat_);
-
-  string dev = str_util::Lowercase(device);
 
-  devices_.insert(dev);
-  op_kernel_execs_[dev].push_back(std::make_pair(
-      step_stat_->all_start_micros(), step_stat_->op_end_rel_micros()));
+  op_start_micros_ = step_stat_->all_start_micros();
+  if (step_stat_->op_end_rel_micros() && step_stat_->op_start_rel_micros()) {
+    op_schedule_micros_ =
+        step_stat_->op_end_rel_micros() - step_stat_->op_start_rel_micros();
+  }
+  all_spent_micros_ = step_stat_->all_end_rel_micros();
 
   for (const auto& output : step_stat_->output()) {
     if (output.has_tensor_description() &&
@@ -46,5 +44,9 @@ void TFGraphNode::AddStepStat(const string& device,
     }
   }
 }
+
+void TFGraphNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
+  kernel_compute_micros_ = cost_node->compute_cost();
+}
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.h b/tensorflow/tools/tfprof/internal/tfprof_node.h
index 8e57db7ba2..235904ea6c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.h
@@ -23,12 +23,12 @@ limitations under the License.
 
 #include "tensorflow/core/framework/allocation_description.pb.h"
 #include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/cost_graph.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/framework/tensor_description.pb.h"
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 
@@ -41,6 +41,10 @@ class TFGraphNode {
       : node_(node),
         code_(nullptr),
         step_stat_(nullptr),
+        op_start_micros_(0),
+        op_schedule_micros_(0),
+        kernel_compute_micros_(0),
+        all_spent_micros_(0),
         requested_bytes_(0),
         float_ops_(0) {
     if (!node) return;
@@ -65,51 +69,38 @@ class TFGraphNode {
       update_shape(shape_vec);
     }
     op_types_.insert(node->op());
+    device_ = node->device();
   }
 
   TFGraphNode() : TFGraphNode(nullptr) {}
 
-  void AddInput(TFGraphNode* input, int64 output_idx) {
-    inputs_[input->name()] = input;
-    output_idx_[input->name()] = output_idx;
-  }
+  void AddInput(TFGraphNode* input) { inputs_[input->name()] = input; }
 
   void AddOpType(const string& op_type) { op_types_.insert(op_type); }
 
   void AddStepStat(const string& device, const NodeExecStats* step_stat);
 
+  // Add CostGraphDef::Node.
+  void AddNodeStat(const CostGraphDef::Node* cost_node);
+
   void AddFloatOps(int64 float_ops) { float_ops_ = float_ops; }
 
   void AddCode(const CodeDef* code) { code_ = code; }
 
   const string& name() const { return node_->name(); }
   const NodeDef* node_def() { return node_; }
-
-  const NodeExecStats* step_stats() const { return step_stat_; }
-
   const std::map<string, TFGraphNode*>& inputs() const { return inputs_; }
-  const std::map<string, int64>& output_idx() { return output_idx_; }
-
+  int64 op_start_micros() { return op_start_micros_; }
+  // This is time spent in Op::Compute(), which is GPU kernel schedule time.
+  // Currently not used.
+  int64 op_schedule_micros() { return op_schedule_micros_; }
   // This is time spent in kernel execution.
-  int64 kernel_exec_micros() const {
-    if (!step_stat_) return 0;
-    int64 total = 0;
-    for (const auto& execs : op_kernel_execs_) {
-      for (const auto& exec : execs.second) {
-        total += exec.second;
-      }
-    }
-    return total;
-  }
-  const std::map<string, std::vector<std::pair<int64, int64>>>&
-  op_kernel_execs() const {
-    return op_kernel_execs_;
-  }
-
+  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
+  int64 all_spent_micros() { return all_spent_micros_; }
   int64 requested_bytes() const { return requested_bytes_; }
   int64 float_ops() const { return float_ops_; }
   const CodeDef* code() { return code_; }
-  std::set<string> devices() const { return devices_; }
+  string device() const { return device_; }
   const std::set<string>& op_types() const { return op_types_; }
 
   const std::vector<int64>& shape() const { return shape_; }
@@ -118,19 +109,17 @@ class TFGraphNode {
   void update_shape(const std::vector<int64>& shape) { shape_ = shape; }
 
   std::map<string, TFGraphNode*> inputs_;
-  std::map<string, int64> output_idx_;
-
   const NodeDef* node_;
   const CodeDef* code_;
   const NodeExecStats* step_stat_;
 
   std::vector<int64> shape_;
   std::set<string> op_types_;
-
-  // device -> vector of {op_start_micros, op_kernel_exec_micros} pairs.
-  std::map<string, std::vector<std::pair<int64, int64>>> op_kernel_execs_;
-
-  std::set<string> devices_;
+  string device_;
+  int64 op_start_micros_;
+  int64 op_schedule_micros_;
+  int64 kernel_compute_micros_;
+  int64 all_spent_micros_;
   int64 requested_bytes_;
   int64 float_ops_;
 };
@@ -139,7 +128,7 @@ class TFCodeNode {
  public:
   TFCodeNode(const string& trace)
       : trace_(trace),
-        kernel_exec_micros_(0),
+        kernel_compute_micros_(0),
         requested_bytes_(0),
         float_ops_(0) {}
 
@@ -149,15 +138,16 @@ class TFCodeNode {
     }
     nodes_[node->name()] = node;
 
-    kernel_exec_micros_ += node->kernel_exec_micros();
+    kernel_compute_micros_ += node->kernel_compute_micros();
     requested_bytes_ += node->requested_bytes();
     float_ops_ += node->float_ops();
     op_types_.insert(node->op_types().begin(), node->op_types().end());
     if (node->shape().size() > 0) {
       shapes_.push_back(node->shape());
     }
-    std::set<string> devices = node->devices();
-    devices_.insert(devices.begin(), devices.end());
+    if (!node->device().empty()) {
+      devices_.insert(node->device());
+    }
   }
   const std::map<string, const TFGraphNode*>& graph_nodes() const {
     return nodes_;
@@ -175,7 +165,7 @@ class TFCodeNode {
 
   const string& name() const { return trace_; }
 
-  int64 kernel_exec_micros() const { return kernel_exec_micros_; }
+  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
 
   int64 requested_bytes() const { return requested_bytes_; }
 
@@ -190,7 +180,7 @@ class TFCodeNode {
  private:
   const string trace_;
   std::set<string> op_types_;
-  int64 kernel_exec_micros_;
+  int64 kernel_compute_micros_;
   int64 requested_bytes_;
   int64 float_ops_;
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node_show.cc b/tensorflow/tools/tfprof/internal/tfprof_node_show.cc
deleted file mode 100644
index 2b5390676d..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_node_show.cc
+++ /dev/null
@@ -1,296 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
-
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/stringprintf.h"
-
-namespace tensorflow {
-namespace tfprof {
-ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
-  ReInit();
-}
-
-void ShowNode::ReInit() {
-  mutable_proto()->set_name(name());
-  for (const string& device : node->devices()) {
-    *mutable_proto()->mutable_devices()->Add() = device;
-  }
-  mutable_proto()->set_exec_micros(node->kernel_exec_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
-  mutable_proto()->set_float_ops(node->float_ops());
-
-  if (!node->shape().empty()) {
-    int64 params = 1;
-    bool complete_shape = true;
-    for (int64 d : node->shape()) {
-      // Sometimes parameters could be <0 when a dim is unknown.
-      if (d < 0) {
-        complete_shape = false;
-        break;
-      }
-      params *= d;
-    }
-    if (complete_shape) {
-      mutable_proto()->set_parameters(proto_.parameters() + params);
-    } else {
-      fprintf(stderr, "Incomplete shape.");
-    }
-  }
-}
-
-string ShowNode::Format(const Options& opts) {
-  if (opts.select.empty()) {
-    return name();
-  }
-  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
-}
-
-string ShowNode::FormatMeta(const Options& opts) {
-  std::vector<string> info;
-  if (opts.select.find(kShown[2]) != opts.select.end()) {
-    const string shape = FormatShapes(node->shape());
-    if (!shape.empty()) {
-      info.push_back(shape);
-    }
-    string params = FormatNumber(proto().total_parameters()) + " params";
-    if (account) {
-      params = FormatNumber(proto().parameters()) + "/" + params;
-    } else {
-      params = "--/" + params;
-    }
-    info.push_back(params);
-  }
-  if (opts.select.find(kShown[3]) != opts.select.end()) {
-    string fops = FormatNumber(proto().total_float_ops()) + " flops";
-    if (account) {
-      fops = FormatNumber(proto().float_ops()) + "/" + fops;
-    } else {
-      fops = "--/" + fops;
-    }
-    info.push_back(fops);
-  }
-  if (opts.select.find(kShown[0]) != opts.select.end()) {
-    string memory = FormatMemory(proto().total_requested_bytes());
-    if (account) {
-      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
-
-    } else {
-      memory = "--/" + memory;
-    }
-    info.push_back(memory);
-  }
-  if (opts.select.find(kShown[1]) != opts.select.end()) {
-    string time = FormatTime(proto().total_exec_micros());
-    if (account) {
-      time = FormatTime(proto().exec_micros()) + "/" + time;
-    } else {
-      time = "--/" + time;
-    }
-    info.push_back(time);
-  }
-  if (opts.select.find(kShown[6]) != opts.select.end()) {
-    if (proto().devices_size() > 0) {
-      info.push_back(str_util::Join(proto().devices(), "|"));
-    }
-  }
-  if (opts.select.find(kShown[7]) != opts.select.end()) {
-    std::set<string> op_types = node->op_types();
-    // Device is considered a type.
-    if (proto().devices_size() > 0) {
-      op_types.insert(str_util::Join(proto().devices(), "|"));
-    }
-    info.push_back(str_util::Join(op_types, "|"));
-  }
-  return str_util::Join(info, ", ");
-}
-
-TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
-
-const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
-
-void ShowNode::AggregateTotalStats(ShowNode* node) {
-  TFGraphNodeProto* node_pb = node->mutable_proto();
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         node_pb->total_exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             node_pb->total_requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        node_pb->total_parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       node_pb->total_float_ops());
-}
-
-void ShowNode::AddSelfToTotalStats() {
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         proto().exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             proto().requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        proto().parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       proto().float_ops());
-}
-
-void ShowNode::ResetTotalStats() {
-  mutable_proto()->set_total_exec_micros(0);
-  mutable_proto()->set_total_requested_bytes(0);
-  mutable_proto()->set_total_parameters(0);
-  mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
-}
-
-ShowCodeNode::ShowCodeNode(const TFCodeNode* node) : node(node), account(true) {
-  std::vector<ScopeNode> snodes;
-  for (auto it : node->graph_nodes()) {
-    ScopeNode snode(it.second);
-    snodes.push_back(snode);
-    snodes[snodes.size() - 1].AddSelfToTotalStats();
-    *mutable_proto()->mutable_graph_nodes()->Add() =
-        snodes[snodes.size() - 1].proto();
-  }
-
-  mutable_proto()->set_name(name());
-  mutable_proto()->set_exec_micros(node->kernel_exec_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
-  mutable_proto()->set_float_ops(node->float_ops());
-
-  if (!node->shapes().empty()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      int64 params = 1;
-      bool complete_shape = true;
-      for (int64 d : shape) {
-        // Sometimes parameters could be <0 when a dim is unknown.
-        if (d < 0) {
-          complete_shape = false;
-          break;
-        }
-        params *= d;
-      }
-      if (complete_shape) {
-        mutable_proto()->set_parameters(proto().parameters() + params);
-      } else {
-        fprintf(stderr, "Incomplete shape.");
-      }
-    }
-  }
-}
-
-string ShowCodeNode::Format(const Options& opts) {
-  if (opts.select.empty()) {
-    return name();
-  }
-  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
-}
-
-string ShowCodeNode::FormatMeta(const Options& opts) {
-  std::vector<string> info;
-  std::vector<string> shapes;
-  if (opts.select.find(kShown[2]) != opts.select.end()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      if (!shape.empty()) {
-        shapes.push_back(FormatShapes(shape));
-      }
-    }
-    if (!shapes.empty()) {
-      info.push_back(str_util::Join(shapes, "|"));
-    }
-    string params = FormatNumber(proto().total_parameters()) + " params";
-    if (account) {
-      params = FormatNumber(proto().parameters()) + "/" + params;
-    } else {
-      params = "--/" + params;
-    }
-    info.push_back(params);
-  }
-  if (opts.select.find(kShown[3]) != opts.select.end()) {
-    string fops = FormatNumber(proto().total_float_ops()) + " flops";
-    if (account) {
-      fops = FormatNumber(proto().float_ops()) + "/" + fops;
-    } else {
-      fops = "--/" + fops;
-    }
-    info.push_back(fops);
-  }
-  if (opts.select.find(kShown[0]) != opts.select.end()) {
-    string memory = FormatMemory(proto().total_requested_bytes());
-    if (account) {
-      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
-
-    } else {
-      memory = "--/" + memory;
-    }
-    info.push_back(memory);
-  }
-  if (opts.select.find(kShown[1]) != opts.select.end()) {
-    string time = FormatTime(proto().total_exec_micros());
-    if (account) {
-      time = FormatTime(proto().exec_micros()) + "/" + time;
-    } else {
-      time = "--/" + time;
-    }
-    info.push_back(time);
-  }
-  if (opts.select.find(kShown[6]) != opts.select.end()) {
-    if (!node->devices().empty()) {
-      info.push_back(str_util::Join(node->devices(), "|"));
-    }
-  }
-  if (opts.select.find(kShown[7]) != opts.select.end()) {
-    std::set<string> op_types = node->op_types();
-    // Device is considered a type.
-    op_types.insert(node->devices().cbegin(), node->devices().cend());
-    info.push_back(str_util::Join(op_types, "|"));
-  }
-  return str_util::Join(info, ", ");
-}
-
-TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
-
-const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
-
-void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
-  TFCodeNodeProto* node_pb = node->mutable_proto();
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         node_pb->total_exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             node_pb->total_requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        node_pb->total_parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       node_pb->total_float_ops());
-}
-
-void ShowCodeNode::AddSelfToTotalStats() {
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         proto().exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             proto().requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        proto().parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       proto().float_ops());
-}
-
-void ShowCodeNode::ResetTotalStats() {
-  mutable_proto()->set_total_exec_micros(0);
-  mutable_proto()->set_total_requested_bytes(0);
-  mutable_proto()->set_total_parameters(0);
-  mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
-}
-
-}  // namespace tfprof
-}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node_show.h b/tensorflow/tools/tfprof/internal/tfprof_node_show.h
deleted file mode 100644
index 4ce0f63f9b..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_node_show.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// Nodes used for different views.
-// ScopeNode is for scope view. GraphNode is for graph view and CodeNode
-// is for code view.
-
-#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
-#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "tensorflow/core/framework/graph.pb.h"
-#include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
-#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
-
-namespace tensorflow {
-namespace tfprof {
-
-class ShowNode {
- public:
-  explicit ShowNode(const TFGraphNode* node);
-  virtual ~ShowNode() {}
-
-  const string& name() const { return node->name(); }
-  TFGraphNodeProto* mutable_proto();
-  const TFGraphNodeProto& proto() const;
-
-  void ReInit();
-
-  string Format(const Options& opts);
-
-  string FormatMeta(const Options& opts);
-
-  const TFGraphNode* node;
-  bool account;
-  string formatted_str;
-
- protected:
-  void AggregateTotalStats(ShowNode* node);
-
-  void AddSelfToTotalStats();
-
-  void ResetTotalStats();
-
-  TFGraphNodeProto proto_;
-};
-
-class GraphNode : public ShowNode {
- public:
-  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
-    mutable_proto()->set_inputs(node->inputs().size());
-    mutable_proto()->set_total_inputs(0);
-  }
-
-  void ReInit() {
-    ShowNode::ReInit();
-    mutable_proto()->set_inputs(node->inputs().size());
-    mutable_proto()->set_total_inputs(0);
-  }
-
-  void AggregateTotalStats(GraphNode* node) {
-    ShowNode::AggregateTotalStats(node);
-    mutable_proto()->set_total_inputs(proto().total_inputs() +
-                                      node->proto().total_inputs() + 1);
-  }
-
-  void AddSelfToTotalStats() {
-    ShowNode::AddSelfToTotalStats();
-    mutable_proto()->set_total_inputs(proto().total_inputs() +
-                                      proto().inputs());
-  }
-
-  void ResetTotalStats() {
-    ShowNode::ResetTotalStats();
-    mutable_proto()->set_total_inputs(0);
-    show_children.clear();
-  }
-
-  std::vector<GraphNode*> children;
-  std::vector<GraphNode*> show_children;
-};
-
-class ScopeNode : public ShowNode {
- public:
-  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
-  ~ScopeNode() override {}
-
-  void ReInit() { ShowNode::ReInit(); }
-
-  void AggregateTotalStats(ScopeNode* node) {
-    ShowNode::AggregateTotalStats(node);
-  }
-
-  void AddSelfToTotalStats() { ShowNode::AddSelfToTotalStats(); }
-
-  void ResetTotalStats() {
-    ShowNode::ResetTotalStats();
-    show_children.clear();
-  }
-
-  std::vector<ScopeNode*> children;
-  std::vector<ScopeNode*> show_children;
-};
-
-class ShowCodeNode {
- public:
-  explicit ShowCodeNode(const TFCodeNode* node);
-  virtual ~ShowCodeNode() {}
-
-  const string& name() const { return node->name(); }
-  TFCodeNodeProto* mutable_proto();
-  const TFCodeNodeProto& proto() const;
-
-  string Format(const Options& opts);
-
-  string FormatMeta(const Options& opts);
-
-  const TFCodeNode* node;
-  bool account;
-  string formatted_str;
-
- protected:
-  void AggregateTotalStats(ShowCodeNode* node);
-
-  void AddSelfToTotalStats();
-
-  void ResetTotalStats();
-
-  TFCodeNodeProto proto_;
-};
-
-class CodeNode : public ShowCodeNode {
- public:
-  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
-  ~CodeNode() override {}
-
-  void AggregateTotalStats(CodeNode* node) {
-    ShowCodeNode::AggregateTotalStats(node);
-  }
-
-  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
-
-  void ResetTotalStats() {
-    ShowCodeNode::ResetTotalStats();
-    show_children.clear();
-  }
-
-  std::vector<CodeNode*> children;
-  std::vector<CodeNode*> show_children;
-};
-}  // namespace tfprof
-}  // namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.cc b/tensorflow/tools/tfprof/internal/tfprof_options.cc
index f592a4cf8c..03282533ff 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.cc
@@ -17,133 +17,16 @@ limitations under the License.
 
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/tfprof_options.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
-namespace {
-string KeyValueToStr(const std::map<string, string>& kv_map) {
-  std::vector<string> kv_vec;
-  kv_vec.reserve(kv_map.size());
-  for (const auto& pair : kv_map) {
-    kv_vec.push_back(strings::StrCat(pair.first, "=", pair.second));
-  }
-  return str_util::Join(kv_vec, ",");
-}
-}  // namespace
-
-tensorflow::Status ParseOutput(const string& output_opt, string* output_type,
-                               std::map<string, string>* output_options) {
-  // The default is to use stdout.
-  if (output_opt.empty()) {
-    *output_type = kOutput[1];
-    return tensorflow::Status::OK();
-  }
-
-  std::set<string> output_types(kOutput,
-                                kOutput + sizeof(kOutput) / sizeof(*kOutput));
-  auto opt_split = output_opt.find(":");
-  std::vector<string> kv_split;
-  if (opt_split == output_opt.npos) {
-    if (output_types.find(output_opt) == output_types.end()) {
-      return tensorflow::Status(
-          tensorflow::error::INVALID_ARGUMENT,
-          strings::Printf("E.g. Unknown output type: %s, Valid types: %s\n",
-                          output_opt.c_str(),
-                          str_util::Join(output_types, ",").c_str()));
-    }
-    *output_type = output_opt;
-  } else {
-    *output_type = output_opt.substr(0, opt_split);
-    if (output_types.find(*output_type) == output_types.end()) {
-      return tensorflow::Status(
-          tensorflow::error::INVALID_ARGUMENT,
-          strings::Printf("E.g. Unknown output type: %s, Valid types: %s\n",
-                          output_type->c_str(),
-                          str_util::Join(output_types, ",").c_str()));
-    }
-    kv_split = str_util::Split(output_opt.substr(opt_split + 1), ",",
-                               str_util::SkipEmpty());
-  }
 
-  std::set<string> valid_options;
-  std::set<string> required_options;
-  if (*output_type == kOutput[0]) {
-    valid_options.insert(
-        kTimelineOpts,
-        kTimelineOpts + sizeof(kTimelineOpts) / sizeof(*kTimelineOpts));
-    required_options.insert(
-        kTimelineRequiredOpts,
-        kTimelineRequiredOpts +
-            sizeof(kTimelineRequiredOpts) / sizeof(*kTimelineRequiredOpts));
-  } else if (*output_type == kOutput[2]) {
-    valid_options.insert(kFileOpts,
-                         kFileOpts + sizeof(kFileOpts) / sizeof(*kFileOpts));
-    required_options.insert(kFileRequiredOpts,
-                            kFileRequiredOpts + sizeof(kFileRequiredOpts) /
-                                                    sizeof(*kFileRequiredOpts));
-  }
-
-  for (const string& kv_str : kv_split) {
-    const std::vector<string> kv =
-        str_util::Split(kv_str, "=", str_util::SkipEmpty());
-    if (kv.size() != 2) {
-      return tensorflow::Status(
-          tensorflow::error::INVALID_ARGUMENT,
-          "Visualize format: -output timeline:key=value,key=value,...");
-    }
-    if (valid_options.find(kv[0]) == valid_options.end()) {
-      return tensorflow::Status(
-          tensorflow::error::INVALID_ARGUMENT,
-          strings::Printf("Unrecognized options %s for output_type: %s\n",
-                          kv[0].c_str(), output_type->c_str()));
-    }
-    (*output_options)[kv[0]] = kv[1];
-  }
-
-  for (const string& opt : required_options) {
-    if (output_options->find(opt) == output_options->end()) {
-      return tensorflow::Status(
-          tensorflow::error::INVALID_ARGUMENT,
-          strings::Printf("Missing required output_options for %s\n"
-                          "E.g. -output %s:%s=...\n",
-                          output_type->c_str(), output_type->c_str(),
-                          opt.c_str()));
-    }
-  }
-  return tensorflow::Status::OK();
-}
-
-tensorflow::Status Options::FromProtoStr(const string& opts_proto_str,
-                                         Options* opts) {
+Options Options::FromProtoStr(const string& opts_proto_str) {
   OptionsProto opts_pb;
-  if (!opts_pb.ParseFromString(opts_proto_str)) {
-    return tensorflow::Status(
-        tensorflow::error::INTERNAL,
-        strings::StrCat("Failed to parse option string from Python API: ",
-                        opts_proto_str));
-  }
-
-  string output_type;
-  std::map<string, string> output_options;
-  tensorflow::Status s =
-      ParseOutput(opts_pb.output(), &output_type, &output_options);
-  if (!s.ok()) return s;
-
-  if (!opts_pb.dump_to_file().empty()) {
-    fprintf(stderr,
-            "-dump_to_file option is deprecated. "
-            "Please use -output file:outfile=<filename>\n");
-    fprintf(stderr, "-output %s is overwritten with -output file:outfile=%s\n",
-            opts_pb.output().c_str(), opts_pb.dump_to_file().c_str());
-    output_type = kOutput[2];
-    output_options.clear();
-    output_options[kFileOpts[0]] = opts_pb.dump_to_file();
-  }
-
-  *opts = Options(
+  CHECK(opts_pb.ParseFromString(opts_proto_str));
+  Options opts(
       opts_pb.max_depth(), opts_pb.min_bytes(), opts_pb.min_micros(),
       opts_pb.min_params(), opts_pb.min_float_ops(),
       std::vector<string>(opts_pb.device_regexes().begin(),
@@ -161,8 +44,8 @@ tensorflow::Status Options::FromProtoStr(const string& opts_proto_str,
                           opts_pb.hide_name_regexes().end()),
       opts_pb.account_displayed_op_only(),
       std::vector<string>(opts_pb.select().begin(), opts_pb.select().end()),
-      output_type, output_options);
-  return tensorflow::Status::OK();
+      opts_pb.viz(), opts_pb.dump_to_file());
+  return opts;
 }
 
 string Options::ToString() const {
@@ -181,7 +64,8 @@ string Options::ToString() const {
       "%-28s%s\n"
       "%-28s%s\n"
       "%-28s%s\n"
-      "%-28s%s:%s\n",
+      "%-28s%s\n"
+      "%-28s%s\n",
       kOptions[0], max_depth, kOptions[1], min_bytes, kOptions[2], min_micros,
       kOptions[3], min_params, kOptions[4], min_float_ops, kOptions[5],
       str_util::Join(device_regexes, ",").c_str(), kOptions[6],
@@ -192,8 +76,8 @@ string Options::ToString() const {
       str_util::Join(show_name_regexes, ",").c_str(), kOptions[11],
       str_util::Join(hide_name_regexes, ",").c_str(), kOptions[12],
       (account_displayed_op_only ? "true" : "false"), kOptions[13],
-      str_util::Join(select, ",").c_str(), kOptions[14], output_type.c_str(),
-      KeyValueToStr(output_options).c_str());
+      str_util::Join(select, ",").c_str(), kOptions[14],
+      (viz ? "true" : "false"), kOptions[15], dump_to_file.c_str());
   return s;
 }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.h b/tensorflow/tools/tfprof/internal/tfprof_options.h
index cf48b4de81..0a9f2768e0 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.h
@@ -22,7 +22,6 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/lib/core/status.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -41,7 +40,8 @@ static const char* const kOptions[] = {
     "-hide_name_regexes",
     "-account_displayed_op_only",
     "-select",
-    "-output",
+    "-viz",
+    "-dump_to_file",
 };
 
 static const char* const kOrderBy[] = {
@@ -58,30 +58,11 @@ static const char* const kCmds[] = {
     "scope", "graph", "code", "set", "help",
 };
 
-static const char* const kOutput[] = {"timeline", "stdout", "file"};
-
-static const char* const kTimelineOpts[] = {
-    "outfile",
-};
-
-static const char* const kTimelineRequiredOpts[] = {"outfile"};
-
-static const char* const kFileOpts[] = {
-    "outfile",
-};
-
-static const char* const kFileRequiredOpts[] = {
-    "outfile",
-};
-
 struct Options {
  public:
-  static tensorflow::Status FromProtoStr(const string& opts_proto_str,
-                                         Options* opts);
+  static Options FromProtoStr(const string& opts_proto_str);
 
   virtual ~Options() {}
-  Options()
-      : Options(0, 0, 0, 0, 0, {}, "", {}, {}, {}, {}, {}, false, {}, "", {}) {}
   Options(int max_depth, tensorflow::int64 min_bytes,
           tensorflow::int64 min_micros, tensorflow::int64 min_params,
           tensorflow::int64 min_float_ops,
@@ -92,8 +73,7 @@ struct Options {
           const std::vector<string>& show_name_regexes,
           const std::vector<string>& hide_name_regexes,
           bool account_displayed_op_only, const std::vector<string>& select,
-          const string& output_type,
-          const std::map<string, string>& output_options)
+          bool viz, const string& dump_to_file = "")
       : max_depth(max_depth),
         min_bytes(min_bytes),
         min_micros(min_micros),
@@ -108,8 +88,8 @@ struct Options {
         hide_name_regexes(hide_name_regexes),
         account_displayed_op_only(account_displayed_op_only),
         select(select.begin(), select.end()),
-        output_type(output_type),
-        output_options(output_options) {}
+        viz(viz),
+        dump_to_file(dump_to_file) {}
 
   string ToString() const;
 
@@ -129,17 +109,10 @@ struct Options {
   bool account_displayed_op_only;
 
   std::set<string> select;
-
-  string output_type;
-  std::map<string, string> output_options;
+  bool viz;
+  string dump_to_file;
 };
 
-// Parse the -output option.
-// 'output_opt': User input string with format: output_type:key=value,key=value.
-// 'output_type' and 'output_options' are extracted from 'output_opt'.
-tensorflow::Status ParseOutput(const string& output_opt, string* output_type,
-                               std::map<string, string>* output_options);
-
 }  // namespace tfprof
 }  // namespace tensorflow
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.cc b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
index fe525c4bd8..b4aef717c8 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
@@ -72,7 +72,7 @@ void TFScope::Build() {
   }
 }
 
-const ShowNode* TFScope::ShowInternal(const Options& opts, Timeline* timeline) {
+const ShowNode* TFScope::ShowInternal(const Options& opts) {
   // Search from roots recursively to find start node, if start_name_regexes
   // is specified.
   std::vector<ScopeNode*> roots = roots_;
@@ -86,9 +86,6 @@ const ShowNode* TFScope::ShowInternal(const Options& opts, Timeline* timeline) {
   Account({root}, opts);
 
   root = PrintScope({root}, opts, 1, 0)[0];
-  if (timeline) {
-    timeline->GenerateScopeTimeline(root);
-  }
   return root;
 }
 
@@ -142,13 +139,8 @@ std::vector<ScopeNode*> TFScope::PrintScope(const std::vector<ScopeNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (ScopeNode* sc : show_cnodes) {
-        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
-          children_str += sc->formatted_str;
-          sc->formatted_str.clear();
-        }
+        children_str += sc->formatted_str;
         node->mutable_proto()->add_children()->MergeFrom(sc->proto());
-        sc->mutable_proto()->mutable_children()->Clear();
-        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.h b/tensorflow/tools/tfprof/internal/tfprof_scope.h
index 7bdcc794cd..2e2e4f5266 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.h
@@ -37,6 +37,22 @@ limitations under the License.
 namespace tensorflow {
 namespace tfprof {
 
+class ScopeNode : public ShowNode {
+ public:
+  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
+  ~ScopeNode() override {}
+
+  void AggregateTotalStats(ScopeNode* node) {
+    ShowNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() { ShowNode::ResetTotalStats(); }
+
+  std::vector<ScopeNode*> children;
+};
+
 class TFScope : public TFShow {
  public:
   explicit TFScope(checkpoint::CheckpointReader* ckpt_reader)
@@ -48,8 +64,7 @@ class TFScope : public TFShow {
   void Build() override;
 
  private:
-  const ShowNode* ShowInternal(const Options& opts,
-                               Timeline* timeline) override;
+  const ShowNode* ShowInternal(const Options& opts) override;
 
   ScopeNode* CreateParentNode(const string& name);
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.cc b/tensorflow/tools/tfprof/internal/tfprof_show.cc
index b96db5468e..932dfb3893 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.cc
@@ -18,32 +18,155 @@ limitations under the License.
 #include <memory>
 #include <set>
 
+#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/regexp.h"
 
 namespace tensorflow {
 namespace tfprof {
+ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
+  mutable_proto()->set_name(name());
+  if (!node->device().empty()) {
+    mutable_proto()->set_device(node->device());
+  }
+  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shape().empty()) {
+    int64 params = 1;
+    bool complete_shape = true;
+    for (int64 d : node->shape()) {
+      // Sometimes parameters could be <0 when a dim is unknown.
+      if (d < 0) {
+        complete_shape = false;
+        break;
+      }
+      params *= d;
+    }
+    if (complete_shape) {
+      mutable_proto()->set_parameters(proto_.parameters() + params);
+    } else {
+      fprintf(stderr, "Incomplete shape.");
+    }
+  }
+}
+
+string ShowNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    const string shape = FormatShapes(node->shape());
+    if (!shape.empty()) {
+      info.push_back(shape);
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (!proto().device().empty()) {
+      info.push_back(proto().device());
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    if (!proto().device().empty()) {
+      op_types.insert(proto().device());
+    }
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
+
+const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
+
+void ShowNode::AggregateTotalStats(ShowNode* node) {
+  TFGraphNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
 
 const TFGraphNodeProto& TFShow::Show(const Options& opts) {
-  if (opts.output_type == kOutput[0]) {
-    Timeline timeline(opts.output_options.at(kTimelineOpts[0]));
-    return ShowInternal(opts, &timeline)->proto();
-  } else if (opts.output_type == kOutput[2]) {
-    const ShowNode* root = ShowInternal(opts, nullptr);
-    Status s =
-        WriteStringToFile(Env::Default(), opts.output_options.at(kFileOpts[0]),
-                          root->formatted_str);
+  const ShowNode* root = ShowInternal(opts);
+  if (opts.dump_to_file.empty()) {
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+  } else {
+    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
+                                 root->formatted_str);
     if (!s.ok()) {
       fprintf(stderr, "%s\n", s.ToString().c_str());
     }
-    return root->proto();
-  } else {
-    const ShowNode* root = ShowInternal(opts, nullptr);
-    printf("%s", root->formatted_str.c_str());
-    fflush(stdout);
-    return root->proto();
   }
+  return root->proto();
 }
 
 bool TFShow::LookUpCheckPoint(const string& name,
@@ -83,13 +206,10 @@ bool TFShow::ShouldShow(ShowNode* node, const Options& opts, int depth) {
     show = true;
   } else {
     for (const string& regex : opts.device_regexes) {
-      for (const string& device : node->proto().devices()) {
-        if (RE2::FullMatch(device, regex)) {
-          show = true;
-          break;
-        }
+      if (RE2::FullMatch(node->proto().device(), regex)) {
+        show = true;
+        break;
       }
-      if (show) break;
     }
   }
   // Don't show if device_regexes don't cover it.
@@ -135,11 +255,11 @@ bool TFShow::ShouldAccount(ShowNode* node, const Options& opts) {
         return true;
       }
     }
-    for (const string& device : node->proto().devices())
-      if (RE2::FullMatch(device, regex)) {
-        return true;
-      }
+    if (RE2::FullMatch(node->proto().device(), regex)) {
+      return true;
+    }
   }
+
   return false;
 }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.h b/tensorflow/tools/tfprof/internal/tfprof_show.h
index 803b301044..5e85b81a72 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.h
@@ -28,15 +28,40 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
+class ShowNode {
+ public:
+  explicit ShowNode(const TFGraphNode* node);
+  virtual ~ShowNode() {}
+
+  const string& name() const { return node->name(); }
+  TFGraphNodeProto* mutable_proto();
+  const TFGraphNodeProto& proto() const;
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFGraphNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFGraphNodeProto proto_;
+};
+
 class TFShow {
  public:
   explicit TFShow(checkpoint::CheckpointReader* ckpt_reader)
@@ -47,8 +72,7 @@ class TFShow {
   const TFGraphNodeProto& Show(const Options& opts);
 
  protected:
-  virtual const ShowNode* ShowInternal(const Options& opts,
-                                       Timeline* timeline) = 0;
+  virtual const ShowNode* ShowInternal(const Options& opts) = 0;
 
   bool LookUpCheckPoint(const string& name,
                         std::unique_ptr<TFProfTensor>* tensor);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
index cfec09ad19..17c0073c7e 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
@@ -26,26 +26,159 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
+ShowCodeNode::ShowCodeNode(const TFCodeNode* node) : node(node), account(true) {
+  std::vector<ScopeNode> snodes;
+  for (auto it : node->graph_nodes()) {
+    ScopeNode snode(it.second);
+    snodes.push_back(snode);
+    snodes[snodes.size() - 1].AddSelfToTotalStats();
+    *mutable_proto()->mutable_graph_nodes()->Add() =
+        snodes[snodes.size() - 1].proto();
+  }
+
+  mutable_proto()->set_name(name());
+  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shapes().empty()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      int64 params = 1;
+      bool complete_shape = true;
+      for (int64 d : shape) {
+        // Sometimes parameters could be <0 when a dim is unknown.
+        if (d < 0) {
+          complete_shape = false;
+          break;
+        }
+        params *= d;
+      }
+      if (complete_shape) {
+        mutable_proto()->set_parameters(proto().parameters() + params);
+      } else {
+        fprintf(stderr, "Incomplete shape.");
+      }
+    }
+  }
+}
+
+string ShowCodeNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowCodeNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  std::vector<string> shapes;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      if (!shape.empty()) {
+        shapes.push_back(FormatShapes(shape));
+      }
+    }
+    if (!shapes.empty()) {
+      info.push_back(str_util::Join(shapes, "|"));
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (!node->devices().empty()) {
+      info.push_back(str_util::Join(node->devices(), "|"));
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    op_types.insert(node->devices().cbegin(), node->devices().cend());
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
+
+const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
+
+void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
+  TFCodeNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowCodeNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowCodeNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
 
 const TFCodeNodeProto& TFShowCode::Show(const Options& opts) {
-  if (opts.output_type == kOutput[0]) {
-    Timeline timeline(opts.output_options.at(kTimelineOpts[0]));
-    return ShowInternal(opts, &timeline)->proto();
-  } else if (opts.output_type == kOutput[2]) {
-    const ShowCodeNode* root = ShowInternal(opts, nullptr);
-    Status s =
-        WriteStringToFile(Env::Default(), opts.output_options.at(kFileOpts[0]),
-                          root->formatted_str);
+  const ShowCodeNode* root = ShowInternal(opts);
+  if (opts.dump_to_file.empty()) {
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+  } else {
+    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
+                                 root->formatted_str);
     if (!s.ok()) {
       fprintf(stderr, "%s\n", s.ToString().c_str());
     }
-    return root->proto();
-  } else {
-    const ShowCodeNode* root = ShowInternal(opts, nullptr);
-    printf("%s", root->formatted_str.c_str());
-    fflush(stdout);
-    return root->proto();
   }
+  return root->proto();
 }
 
 bool TFShowCode::ShouldShow(ShowCodeNode* node, const Options& opts,
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.h b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
index cbfd38945f..afe0fa4473 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-// Parent class and utilities for tfprof_code.
+// Parent class and utilities for tfprof_graph and tfprof_scope.
 
 #ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
 #define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
@@ -28,15 +28,39 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
+class ShowCodeNode {
+ public:
+  explicit ShowCodeNode(const TFCodeNode* node);
+  virtual ~ShowCodeNode() {}
+
+  const string& name() const { return node->name(); }
+  TFCodeNodeProto* mutable_proto();
+  const TFCodeNodeProto& proto() const;
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFCodeNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowCodeNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFCodeNodeProto proto_;
+};
 
 class TFShowCode {
  public:
@@ -47,8 +71,7 @@ class TFShowCode {
   const TFCodeNodeProto& Show(const Options& opts);
 
  protected:
-  virtual const ShowCodeNode* ShowInternal(const Options& opts,
-                                           Timeline* timeline) = 0;
+  virtual const ShowCodeNode* ShowInternal(const Options& opts) = 0;
 
   bool LookUpCheckPoint(const string& name,
                         std::unique_ptr<TFProfTensor>* tensor);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_test.cc b/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
index f0621c9af0..ffaa576639 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
@@ -75,7 +75,7 @@ TEST_F(TFProfShowTest, DumpScopeMode) {
                {"VariableV2"},  // accout_type_regexes
                {".*"}, {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               "file", {{"outfile", dump_file}});
+               false, dump_file);
   tf_stats_->PrintGraph("scope", opts);
 
   string dump_str;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.cc b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
index 566b4cee44..13ff6e7246 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
@@ -19,8 +19,6 @@ limitations under the License.
 #include <utility>
 
 #include "tensorflow/core/framework/step_stats.pb.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -94,16 +92,10 @@ void TFStats::ParseGraph() {
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     const NodeDef* node_def = it->second.node_def();
     for (string node_input : node_def->input()) {
-      int output_idx = 0;
       // input name format can be: "^node:src_output"
       auto prefix_pos = node_input.find(":");
       if (prefix_pos != node_input.npos) {
-        std::vector<string> input_parts = str_util::Split(node_input, ":");
-        CHECK(input_parts.size() == 2)
-            << "Unknown NodeDef.input format: " << node_input;
-        node_input = input_parts[0];
-        CHECK(strings::safe_strto32(input_parts[1], &output_idx))
-            << "Failed to parse integer: " << output_idx;
+        node_input.substr(0, prefix_pos);
       }
       if (node_input.substr(0, 1) == "^") {
         node_input = node_input.substr(1);
@@ -112,7 +104,7 @@ void TFStats::ParseGraph() {
       if (input_node == nodes_map_.end()) {
         continue;
       }
-      it->second.AddInput(&input_node->second, output_idx);
+      it->second.AddInput(&input_node->second);
     }
   }
 }
@@ -145,6 +137,21 @@ void TFStats::ParseRunMeta() {
       node->second.AddStepStat(dev_stat.device(), &node_stat);
     }
   }
+
+  if (!run_meta_->has_cost_graph()) {
+    fprintf(stderr,
+            "Missing CostGraphDef in RunMetadata.\nMaybe you forget to"
+            "set tf.ConfigProto(graph_options=tf.GraphOptions("
+            "build_cost_model=1)) to Session()\n");
+  } else {
+    for (const auto& node_pb : run_meta_->cost_graph().node()) {
+      auto node = nodes_map_.find(node_pb.name());
+      if (node == nodes_map_.end()) {
+        continue;
+      }
+      node->second.AddNodeStat(&node_pb);
+    }
+  }
 }
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
index eb01425e04..b913161f6a 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
@@ -74,8 +74,8 @@ TEST_F(TFProfStatsTest, CustomOpType) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name",
                {kTrainableVarType},  // accout_type_regexes
                {".*"}, {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "",
-               {});
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
+               false);
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -84,20 +84,20 @@ TEST_F(TFProfStatsTest, CustomOpType) {
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
       "370\nchildren {\n  name: \"conv2d/bias\"\n  exec_micros: 1\n  "
       "requested_bytes: 20\n  parameters: 5\n  total_exec_micros: 1\n  "
-      "total_requested_bytes: 20\n  total_parameters: 5\n  devices: "
+      "total_requested_bytes: 20\n  total_parameters: 5\n  device: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 0\n  "
       "total_float_ops: 0\n}\nchildren {\n  name: \"conv2d/kernel\"\n  "
       "exec_micros: 1\n  requested_bytes: 540\n  parameters: 135\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 540\n  total_parameters: "
-      "135\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "135\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/bias\"\n  "
       "exec_micros: 1\n  requested_bytes: 20\n  parameters: 5\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 20\n  total_parameters: "
-      "5\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "5\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/kernel\"\n  "
       "exec_micros: 2\n  requested_bytes: 900\n  parameters: 225\n  "
       "total_exec_micros: 2\n  total_requested_bytes: 900\n  total_parameters: "
-      "225\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "225\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nfloat_ops: 0\ntotal_float_ops: 0\n",
       &expected));
   EXPECT_EQ(expected.DebugString(), root.DebugString());
@@ -107,7 +107,7 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
   Options opts(
       3, 0, 0, 0, 0, {".*"}, "name", {kCkptVarType},  // accout_type_regexes
       {".*"}, {""}, {".*"}, {""}, false,
-      {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "", {});
+      {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, false);
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -116,20 +116,20 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
       "370\nchildren {\n  name: \"conv2d/bias\"\n  exec_micros: 1\n  "
       "requested_bytes: 20\n  parameters: 5\n  total_exec_micros: 1\n  "
-      "total_requested_bytes: 20\n  total_parameters: 5\n  devices: "
+      "total_requested_bytes: 20\n  total_parameters: 5\n  device: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 0\n  "
       "total_float_ops: 0\n}\nchildren {\n  name: \"conv2d/kernel\"\n  "
       "exec_micros: 1\n  requested_bytes: 540\n  parameters: 135\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 540\n  total_parameters: "
-      "135\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "135\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/bias\"\n  "
       "exec_micros: 1\n  requested_bytes: 20\n  parameters: 5\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 20\n  total_parameters: "
-      "5\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "5\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/kernel\"\n  "
       "exec_micros: 2\n  requested_bytes: 900\n  parameters: 225\n  "
       "total_exec_micros: 2\n  total_requested_bytes: 900\n  total_parameters: "
-      "225\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "225\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nfloat_ops: 0\ntotal_float_ops: 0\n",
       &expected));
   EXPECT_EQ(expected.DebugString(), root.DebugString());
@@ -139,8 +139,8 @@ TEST_F(TFProfStatsTest, TestGraph) {
   Options opts(100, 0, 10000, 0, 0, {".*"}, "name", {".*"},
                {"cost.*"},  // start_name_regexes
                {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "",
-               {});
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
+               false);
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("graph", opts);
 
   TFGraphNodeProto expected;
@@ -154,7 +154,7 @@ TEST_F(TFProfStatsTest, TestGraph) {
 
 TEST_F(TFProfStatsTest, TestFloatOps) {
   Options opts(10, 0, 0, 0, 1, {".*"}, "name", {".*"}, {".*"}, {""}, {".*"},
-               {""}, false, {"float_ops"}, "", {});
+               {""}, false, {"float_ops"}, false);
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -163,19 +163,19 @@ TEST_F(TFProfStatsTest, TestFloatOps) {
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
       "8656\ntotal_parameters: 370\nchildren {\n  name: \"conv2d/BiasAdd\"\n  "
       "exec_micros: 12\n  requested_bytes: 1440\n  total_exec_micros: 12\n  "
-      "total_requested_bytes: 1440\n  total_parameters: 0\n  devices: "
+      "total_requested_bytes: 1440\n  total_parameters: 0\n  device: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 360\n  "
       "total_float_ops: 360\n}\nchildren {\n  name: \"conv2d/convolution\"\n  "
       "exec_micros: 60\n  requested_bytes: 1440\n  total_exec_micros: 60\n  "
-      "total_requested_bytes: 1440\n  total_parameters: 0\n  devices: "
+      "total_requested_bytes: 1440\n  total_parameters: 0\n  device: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 19440\n  "
       "total_float_ops: 19440\n}\nchildren {\n  name: \"conv2d_2/BiasAdd\"\n  "
       "exec_micros: 2\n  requested_bytes: 640\n  total_exec_micros: 2\n  "
-      "total_requested_bytes: 640\n  total_parameters: 0\n  devices: "
+      "total_requested_bytes: 640\n  total_parameters: 0\n  device: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 160\n  "
       "total_float_ops: 160\n}\nchildren {\n  name: \"conv2d_2/convolution\"\n "
       " exec_micros: 13\n  requested_bytes: 640\n  total_exec_micros: 13\n  "
-      "total_requested_bytes: 640\n  total_parameters: 0\n  devices: "
+      "total_requested_bytes: 640\n  total_parameters: 0\n  device: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 14400\n  "
       "total_float_ops: 14400\n}\nfloat_ops: 0\ntotal_float_ops: 34360\n",
       &expected));
@@ -186,7 +186,7 @@ TEST_F(TFProfStatsTest, TestAccountShownNameOnly) {
   Options opts(100, 0, 0, 0, 0, {".*"}, "name", {".*"}, {".*"}, {""},
                {"unit_2_1.*DW"},  // show_name_regexes.
                {""}, true,        // account_displayed_op_only.
-               {"params"}, "", {});
+               {"params"}, false);
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -202,7 +202,7 @@ TEST_F(TFProfStatsTest, TestShowTensorValue) {
   Options opts(10, 0, 0, 0, 0, {".*"}, "name", {".*"}, {".*"}, {""},
                {"unit_1_0.*gamma"}, {""}, false,
                {"tensor_value"},  // Show tensor value from checkpoint.
-               "", {});
+               false);
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
   TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
diff --git a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
index 79a781210d..95759f9d47 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
@@ -57,7 +57,7 @@ class TFProfTensorTest : public ::testing::Test {
 TEST_F(TFProfTensorTest, Basics) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name", {"VariableV2"}, {".*"}, {""},
                {".*"}, {""}, false, {"tensor_value"},  // show the tensor value.
-               "", {});
+               false);
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline.cc b/tensorflow/tools/tfprof/internal/tfprof_timeline.cc
deleted file mode 100644
index a5640c0e56..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_timeline.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
-
-#include <utility>
-
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/strcat.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
-
-namespace tensorflow {
-namespace tfprof {
-
-Json::Value ChromeTraceFormatter::CreateEvent(const string& ph,
-                                              const string& category,
-                                              const string& name, int64 pid,
-                                              int64 tid, int64 ts) {
-  Json::Value event(Json::objectValue);
-  event["ph"] = Json::Value(ph);
-  event["cat"] = Json::Value(category);
-  event["name"] = Json::Value(name);
-  event["pid"] = Json::Value(pid);
-  event["tid"] = Json::Value(tid);
-  event["ts"] = Json::Value(ts);
-  return event;
-}
-
-void ChromeTraceFormatter::EmitPID(const string& name, int64 pid) {
-  Json::Value event(Json::objectValue);
-  event["name"] = Json::Value("process_name");
-  event["ph"] = Json::Value("M");
-  event["pid"] = Json::Value(pid);
-  Json::Value args(Json::objectValue);
-  args["name"] = Json::Value(name);
-  event["args"] = args;
-  metadata_.push_back(event);
-}
-
-void ChromeTraceFormatter::EmitRegion(int64 ts, int64 duration, int64 pid,
-                                      int64 tid, const string& category,
-                                      const string& name, Json::Value args) {
-  Json::Value event = CreateEvent("X", category, name, pid, tid, ts);
-  event["dur"] = Json::Value(duration);
-  event["args"] = std::move(args);
-  metadata_.push_back(event);
-}
-
-void ChromeTraceFormatter::EmitFlowStart(const string& name, int64 ts,
-                                         int64 pid, int64 tid, int64 flow_id) {
-  Json::Value event = CreateEvent("s", "DataFlow", name, pid, tid, ts);
-  event["id"] = flow_id;
-  events_.push_back(event);
-}
-
-void ChromeTraceFormatter::EmitFlowEnd(const string& name, int64 ts, int64 pid,
-                                       int64 tid, int64 flow_id) {
-  Json::Value event = CreateEvent("t", "DataFlow", name, pid, tid, ts);
-  event["id"] = flow_id;
-  events_.push_back(event);
-}
-
-string ChromeTraceFormatter::Format() {
-  Json::Value trace;
-  trace["traceEvents"] = Json::Value(Json::arrayValue);
-  for (const Json::Value& v : metadata_) {
-    trace["traceEvents"].append(v);
-  }
-  for (const Json::Value& v : events_) {
-    trace["traceEvents"].append(v);
-  }
-  return trace.toStyledString();
-}
-
-void Timeline::GenerateGraphTimeline(const GraphNode* gnode) {
-  fprintf(stdout, "adding graph nodes.\n");
-  AddGraphNode(gnode);
-  AllocateLanes();
-  fprintf(stdout, "generating trace file.\n");
-  int64 flow_id = 1;
-  for (const auto& process : alloc_nodes_) {
-    for (const auto& lane : process.second) {
-      for (const auto& node : lane.second) {
-        TimeNode* tnode = node.second;
-
-        Json::Value args(Json::objectValue);
-        args["name"] = Json::Value(tnode->name);
-        args["op"] = Json::Value(tnode->name);
-        chrome_formatter_.EmitRegion(node.first, tnode->exec_micros,
-                                     process.first, lane.first, "Op",
-                                     tnode->name, args);
-
-        for (TimeNode* next_tnode : node.second->next_tnodes) {
-          chrome_formatter_.EmitFlowStart(
-              tnode->name + "_flow", tnode->start_micros + tnode->exec_micros,
-              process.first, lane.first, flow_id);
-          chrome_formatter_.EmitFlowEnd(
-              tnode->name + "_flow", next_tnode->start_micros,
-              next_tnode->process->pid, next_tnode->tid, flow_id);
-          flow_id += 1;
-        }
-      }
-    }
-  }
-  OutputTimeline();
-}
-
-void Timeline::GenerateScopeTimeline(const ScopeNode* node) {
-  std::set<int64> visited_depth;
-  EmitTreeNode(node, 0, node->proto().total_exec_micros(), 0, &visited_depth);
-  OutputTimeline();
-}
-
-void Timeline::GenerateCodeTimeline(const CodeNode* node) {
-  std::set<int64> visited_depth;
-  EmitTreeNode(node, 0, node->proto().total_exec_micros(), 0, &visited_depth);
-  OutputTimeline();
-}
-
-void Timeline::OutputTimeline() {
-  Status s =
-      WriteStringToFile(Env::Default(), outfile_, chrome_formatter_.Format());
-  if (!s.ok()) {
-    fprintf(stderr, "Failed to write timeline file: %s\nError: %s\n",
-            outfile_.c_str(), s.ToString().c_str());
-    return;
-  }
-  fprintf(stdout, "\n******************************************************\n");
-  fprintf(stdout,
-          "Timeline file is written to %s.\n"
-          "Open a Chrome browser, enter URL chrome://tracing and "
-          "load the timeline file.",
-          outfile_.c_str());
-  fprintf(stdout, "\n******************************************************\n");
-  fflush(stdout);
-}
-
-std::vector<TimeNode*> Timeline::AddGraphNode(const GraphNode* gnode) {
-  std::vector<TimeNode*> tnodes;
-  if (!gnode) return tnodes;
-
-  std::vector<TimeNode*> shown_cinputs;
-  for (GraphNode* schild : gnode->show_children) {
-    std::vector<TimeNode*> inputs = AddGraphNode(schild);
-    shown_cinputs.insert(shown_cinputs.end(), inputs.begin(), inputs.end());
-  }
-  if (!gnode->node->step_stats()) {
-    return shown_cinputs;
-  }
-
-  const TFGraphNode* node = gnode->node;
-  for (const auto& kernel_execs : node->op_kernel_execs()) {
-    const string& device = kernel_execs.first;
-    const std::vector<std::pair<int64, int64>>& execs = kernel_execs.second;
-
-    if (process_.find(device) == process_.end()) {
-      int64 pid = AllocatePID();
-      process_[device].reset(new Process(pid));
-      chrome_formatter_.EmitPID(device, pid);
-    }
-    Process* p = process_[device].get();
-
-    for (const auto& exec : execs) {
-      int64 start_micros = exec.first;
-      int64 exec_micros = exec.second;
-      // TODO(xpan): There might be start time duplication here.
-      if (tnodes_[device].find(start_micros) == tnodes_[device].end()) {
-        // TODO(xpan): Give each kernel call a unique_name.
-        tnodes_[device][start_micros].reset(
-            new TimeNode(p, node->name(), start_micros, exec_micros));
-      }
-      TimeNode* tnode_ptr = tnodes_[device][start_micros].get();
-
-      for (int i = 0; i < shown_cinputs.size(); i++) {
-        shown_cinputs[i]->next_tnodes.push_back(tnode_ptr);
-      }
-      tnodes.push_back(tnode_ptr);
-    }
-  }
-  return tnodes;
-}
-
-void Timeline::AllocateLanes() {
-  for (auto& process : tnodes_) {
-    Process* p = process_[process.first].get();
-    for (auto& tnode : process.second) {
-      int64 start_time = tnode.second->start_micros;
-      int64 end_time = tnode.second->exec_micros - 1;
-
-      int64 l = -1;
-      for (int i = 0; i < p->lanes.size(); ++i) {
-        const auto& lane = p->lanes[i];
-        auto cur_it = lane.lower_bound(start_time);
-        if (cur_it == lane.end()) {
-          --cur_it;
-        }
-        l = i;
-        for (; cur_it != lane.begin(); --cur_it) {
-          if (cur_it->second < start_time) {
-            break;
-          }
-          if (cur_it->first <= end_time) {
-            l = -1;
-            break;
-          }
-        }
-        if (l >= 0) {
-          break;
-        }
-      }
-      if (l < 0) {
-        l = p->lanes.size();
-        std::map<int64, int64> nlane;
-        nlane[start_time] = end_time;
-        p->lanes.push_back(nlane);
-      } else {
-        p->lanes[l][start_time] = end_time;
-      }
-      tnode.second->tid = l;
-      alloc_nodes_[p->pid][l][start_time] = tnode.second.get();
-    }
-  }
-}
-
-int64 Timeline::AllocatePID() {
-  int64 cur_pid = next_pid_;
-  next_pid_ += 1;
-  return cur_pid;
-}
-
-}  // namespace tfprof
-}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline.h b/tensorflow/tools/tfprof/internal/tfprof_timeline.h
deleted file mode 100644
index 3d26874abd..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_timeline.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
-#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
-
-#include "include/json/json.h"
-#include "tensorflow/core/framework/graph.pb.h"
-#include "tensorflow/core/framework/step_stats.pb.h"
-#include "tensorflow/core/protobuf/config.pb.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
-
-namespace tensorflow {
-namespace tfprof {
-
-typedef std::map<string, string> Event;
-
-class ChromeTraceFormatter {
- public:
-  ChromeTraceFormatter() {}
-
-  Json::Value CreateEvent(const string& ph, const string& category,
-                          const string& name, int64 pid, int64 tid, int64 ts);
-
-  void EmitPID(const string& name, int64 pid);
-
-  void EmitRegion(int64 ts, int64 duration, int64 pid, int64 tid,
-                  const string& category, const string& name, Json::Value args);
-
-  void EmitFlowStart(const string& name, int64 ts, int64 pid, int64 tid,
-                     int64 flow_id);
-
-  void EmitFlowEnd(const string& name, int64 ts, int64 pid, int64 tid,
-                   int64 flow_id);
-
-  string Format();
-
- private:
-  std::vector<Json::Value> events_;
-  std::vector<Json::Value> metadata_;
-};
-
-class Process {
- public:
-  Process(int64 pid) : pid(pid) {}
-
-  // Each lane is a map from start_time to end_time.
-  std::vector<std::map<int64, int64>> lanes;
-  int64 pid;
-};
-
-class TimeNode {
- public:
-  TimeNode(Process* process, const string& name, int64 start_micros,
-           int64 exec_micros)
-      : process(process),
-        name(name),
-        start_micros(start_micros),
-        exec_micros(exec_micros),
-        tid(-1) {}
-  virtual ~TimeNode() {}
-
-  Process* process;
-  string name;
-  int64 start_micros;
-  int64 exec_micros;
-  int64 tid;
-  std::vector<TimeNode*> next_tnodes;
-};
-
-class Timeline {
- public:
-  Timeline(const string& outfile) : outfile_(outfile) {}
-  ~Timeline() {}
-
-  void GenerateGraphTimeline(const GraphNode* gnode);
-
-  void GenerateScopeTimeline(const ScopeNode* node);
-
-  void GenerateCodeTimeline(const CodeNode* node);
-
- private:
-  void OutputTimeline();
-
-  template <typename Node>
-  void EmitTreeNode(const Node* node, int64 start_time, int64 duration,
-                    int64 depth, std::set<int64>* visited_depth) {
-    if (visited_depth->find(depth) == visited_depth->end()) {
-      chrome_formatter_.EmitPID(strings::StrCat("Scope:", depth), depth);
-      visited_depth->insert(depth);
-    }
-
-    Json::Value args(Json::objectValue);
-    args["name"] = Json::Value(node->name());
-    args["op"] = Json::Value(node->name());
-    chrome_formatter_.EmitRegion(start_time, duration, depth, 0, "Op",
-                                 node->name(), args);
-
-    int64 total_micros = 0;
-    int64 c_start_time = start_time;
-    for (const Node* child : node->show_children) {
-      int64 total_exec_micros = child->proto().total_exec_micros();
-      if (total_exec_micros <= 0) {
-        continue;
-      }
-      EmitTreeNode(child, c_start_time, total_exec_micros, depth + 1,
-                   visited_depth);
-      c_start_time += total_exec_micros;
-      total_micros += total_exec_micros;
-    }
-    CHECK(total_micros <= duration) << node->name() << " parent:" << duration
-                                    << " children:" << total_micros;
-  }
-
-  std::vector<TimeNode*> AddGraphNode(const GraphNode* gnode);
-
-  void AllocateLanes();
-
-  int64 AllocatePID();
-
-  const string outfile_;
-  int64 next_pid_ = 0;
-  int64 allocator_pid_ = -1;
-  ChromeTraceFormatter chrome_formatter_;
-  std::map<string, int64> device_pids_;
-
-  std::map<string, std::unique_ptr<Process>> process_;
-  std::map<int64, std::map<int64, std::map<int64, TimeNode*>>> alloc_nodes_;
-  std::map<string, std::map<int64, std::unique_ptr<TimeNode>>> tnodes_;
-};
-
-}  // namespace tfprof
-}  // namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc b/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc
deleted file mode 100644
index 2dfe6ab335..0000000000
--- a/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/tools/tfprof/internal/tfprof_stats.h"
-
-#include <utility>
-
-#include "tensorflow/c/checkpoint_reader.h"
-#include "tensorflow/core/framework/graph.pb.h"
-#include "tensorflow/core/lib/hash/hash.h"
-#include "tensorflow/core/lib/io/path.h"
-#include "tensorflow/core/platform/env.h"
-#include "tensorflow/core/platform/test.h"
-#include "tensorflow/core/protobuf/config.pb.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
-#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
-#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
-
-namespace tensorflow {
-namespace tfprof {
-class TFProfTimelineTest : public ::testing::Test {
- protected:
-  TFProfTimelineTest() {
-    string graph_path =
-        io::JoinPath(testing::TensorFlowSrcRoot(),
-                     "tools/tfprof/internal/testdata/graph.pbtxt");
-    std::unique_ptr<tensorflow::GraphDef> graph_pb(new tensorflow::GraphDef());
-    TF_CHECK_OK(ReadGraphDef(Env::Default(), graph_path, graph_pb.get()));
-
-    std::unique_ptr<tensorflow::RunMetadata> run_meta_pb(
-        new tensorflow::RunMetadata());
-    string run_meta_path =
-        io::JoinPath(testing::TensorFlowSrcRoot(),
-                     "tools/tfprof/internal/testdata/run_meta");
-    TF_CHECK_OK(
-        ReadBinaryProto(Env::Default(), run_meta_path, run_meta_pb.get()));
-
-    tf_stats_.reset(new TFStats(std::move(graph_pb), std::move(run_meta_pb),
-                                nullptr, nullptr));
-  }
-
-  std::unique_ptr<TFStats> tf_stats_;
-};
-
-// Before adding test, first dump the json file and
-// manually check it's correct
-TEST_F(TFProfTimelineTest, GraphView) {
-  string dump_file = io::JoinPath(testing::TmpDir(), "dump");
-  Options opts(10000, 0, 0, 0, 0, {".*"}, "name",
-               {".*"},  // accout_type_regexes
-               {".*"}, {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               "timeline", {{"outfile", dump_file}});
-  tf_stats_->PrintGraph("graph", opts);
-
-  string dump_str;
-  TF_CHECK_OK(ReadFileToString(Env::Default(), dump_file, &dump_str));
-  EXPECT_EQ(14171250174278825648ull, Hash64(dump_str));
-}
-
-TEST_F(TFProfTimelineTest, ScopeView) {
-  string dump_file = io::JoinPath(testing::TmpDir(), "dump");
-  Options opts(5, 0, 0, 0, 0, {".*"}, "name", {".*"},  // accout_type_regexes
-               {".*"}, {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               "timeline", {{"outfile", dump_file}});
-  tf_stats_->PrintGraph("scope", opts);
-
-  string dump_str;
-  TF_CHECK_OK(ReadFileToString(Env::Default(), dump_file, &dump_str));
-  EXPECT_EQ(2355241164346147404ull, Hash64(dump_str));
-}
-
-// TODO(xpan): tfprof_log is too large to include in testdata when adding
-// code traces.
-
-}  // namespace tfprof
-}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_utils.cc b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
index 8e55e009d3..eb2be35c6e 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_utils.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
@@ -251,13 +251,19 @@ tensorflow::Status ParseCmdLine(const string& line, string* cmd,
       opts->select = requested_set;
       ++i;
     } else if (pieces[i] == tensorflow::tfprof::kOptions[14]) {
+      if ((pieces.size() > i + 1 && pieces[i + 1].find("-") == 0) ||
+          pieces.size() == i + 1) {
+        opts->viz = true;
+      } else if (!StringToBool(pieces[i + 1], &opts->viz)) {
+        return ReturnError(pieces, i);
+      } else {
+        ++i;
+      }
+    } else if (pieces[i] == tensorflow::tfprof::kOptions[15]) {
       if (pieces.size() <= i + 1) {
         return ReturnError(pieces, i);
       }
-
-      tensorflow::Status s =
-          ParseOutput(pieces[i + 1], &opts->output_type, &opts->output_options);
-      if (!s.ok()) return s;
+      opts->dump_to_file = StripQuote(pieces[i + 1]);
       ++i;
     } else {
       return ReturnError(pieces, i);
diff --git a/tensorflow/tools/tfprof/tfprof_main.cc b/tensorflow/tools/tfprof/tfprof_main.cc
index a4c0b024c4..dd18a4ad3c 100644
--- a/tensorflow/tools/tfprof/tfprof_main.cc
+++ b/tensorflow/tools/tfprof/tfprof_main.cc
@@ -30,7 +30,6 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/init_main.h"
-#include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/protobuf/config.pb.h"
 #include "tensorflow/core/util/command_line_flags.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
@@ -83,7 +82,8 @@ int main(int argc, char** argv) {
   tensorflow::string FLAGS_hide_name_regexes;
   bool FLAGS_account_displayed_op_only = false;
   tensorflow::string FLAGS_select = "params";
-  tensorflow::string FLAGS_output = "";
+  bool FLAGS_viz = false;
+  tensorflow::string FLAGS_dump_to_file = "";
   for (int i = 0; i < argc; i++) {
     fprintf(stderr, "%s\n", argv[i]);
   }
@@ -117,7 +117,7 @@ int main(int argc, char** argv) {
                        &FLAGS_account_displayed_op_only,
                        "account displayed op only"),
       tensorflow::Flag("select", &FLAGS_select, "select"),
-      tensorflow::Flag("output", &FLAGS_output, "output"),
+      tensorflow::Flag("dump_to_file", &FLAGS_dump_to_file, "dump to file"),
   };
   tensorflow::string usage = tensorflow::Flags::Usage(argv[0], flag_list);
   bool parse_ok = tensorflow::Flags::Parse(&argc, argv, flag_list);
@@ -144,12 +144,6 @@ int main(int argc, char** argv) {
   std::vector<tensorflow::string> select =
       Split(FLAGS_select, ',', tensorflow::str_util::SkipEmpty());
 
-  string output_type;
-  std::map<string, string> output_options;
-  tensorflow::Status s = tensorflow::tfprof::ParseOutput(
-      FLAGS_output, &output_type, &output_options);
-  CHECK(s.ok()) << s.ToString();
-
   tensorflow::string cmd = "";
   if (argc == 1 && FLAGS_graph_path.empty()) {
     printf("1) go/tfprof: Tutorial.\n");
@@ -192,18 +186,10 @@ int main(int argc, char** argv) {
 
   std::unique_ptr<tensorflow::tfprof::OpLog> op_log(
       new tensorflow::tfprof::OpLog());
-  if (!FLAGS_op_log_path.empty()) {
-    string op_log_str;
-    s = tensorflow::ReadFileToString(tensorflow::Env::Default(),
-                                     FLAGS_op_log_path, &op_log_str);
-    if (!s.ok()) {
-      fprintf(stderr, "Failed to read op_log_path: %s\n", s.ToString().c_str());
-      return 1;
-    }
-    if (!tensorflow::ParseProtoUnlimited(op_log.get(), op_log_str)) {
-      fprintf(stderr, "Failed to parse op_log_path\n");
-      return 1;
-    }
+  if (!ReadBinaryProto(tensorflow::Env::Default(), FLAGS_op_log_path,
+                       op_log.get())
+           .ok()) {
+    op_log.release();
   }
 
   std::unique_ptr<tensorflow::checkpoint::CheckpointReader> ckpt_reader;
@@ -226,8 +212,8 @@ int main(int argc, char** argv) {
       FLAGS_max_depth, FLAGS_min_bytes, FLAGS_min_micros, FLAGS_min_params,
       FLAGS_min_float_ops, device_regexes, FLAGS_order_by, account_type_regexes,
       start_name_regexes, trim_name_regexes, show_name_regexes,
-      hide_name_regexes, FLAGS_account_displayed_op_only, select, output_type,
-      output_options);
+      hide_name_regexes, FLAGS_account_displayed_op_only, select, FLAGS_viz,
+      FLAGS_dump_to_file);
 
   if (cmd == tensorflow::tfprof::kCmds[2]) {
     tf_stat.PrintCode(opts);
diff --git a/tensorflow/tools/tfprof/tfprof_options.proto b/tensorflow/tools/tfprof/tfprof_options.proto
index 84a2e14005..9d269a0995 100644
--- a/tensorflow/tools/tfprof/tfprof_options.proto
+++ b/tensorflow/tools/tfprof/tfprof_options.proto
@@ -19,6 +19,6 @@ message OptionsProto {
   repeated string hide_name_regexes = 12;
   optional bool account_displayed_op_only = 13;
   repeated string select = 14;
-  optional string output = 15;
+  optional bool viz = 15;
   optional string dump_to_file = 16;
 }
diff --git a/tensorflow/tools/tfprof/tfprof_output.proto b/tensorflow/tools/tfprof/tfprof_output.proto
index 93e6c1233c..78dd056662 100644
--- a/tensorflow/tools/tfprof/tfprof_output.proto
+++ b/tensorflow/tools/tfprof/tfprof_output.proto
@@ -31,8 +31,7 @@ message TFGraphNodeProto {
   // Number of inputs to the op.
   optional int64 inputs = 5;
   // Device the op is assigned to.
-  // Since an op can fire multiple kernel calls, there can be multiple devices.
-  repeated string devices = 10;
+  optional string device = 10;
 
   // The following are the aggregated stats from all accounted descendants and
   // the op itself. The actual descendants depend on the data structure used
-- 
GitLab


From 6f5f9838947e7f00681067f321eed7802e8eae87 Mon Sep 17 00:00:00 2001
From: Eli Bendersky <eliben@google.com>
Date: Thu, 11 May 2017 16:44:46 -0700
Subject: [PATCH 1255/1563] [XLA] Improve the documentation of our
 service/client classes a bit

Also kill dead code

PiperOrigin-RevId: 155814264
---
 tensorflow/compiler/xla/client/local_client.cc   |  8 --------
 tensorflow/compiler/xla/client/local_client.h    |  8 --------
 tensorflow/compiler/xla/service/local_service.cc | 15 ---------------
 tensorflow/compiler/xla/service/local_service.h  |  8 --------
 tensorflow/compiler/xla/service_interface.h      |  5 ++++-
 5 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/tensorflow/compiler/xla/client/local_client.cc b/tensorflow/compiler/xla/client/local_client.cc
index 452462287c..0de58ea7dc 100644
--- a/tensorflow/compiler/xla/client/local_client.cc
+++ b/tensorflow/compiler/xla/client/local_client.cc
@@ -253,14 +253,6 @@ StatusOr<std::unique_ptr<GlobalData>> LocalClient::AllocateBufferOnDevice(
   return std::unique_ptr<GlobalData>(new GlobalData(local_service_, handle));
 }
 
-tensorflow::Status LocalClient::ResolveArguments(
-    const tensorflow::gtl::ArraySlice<const GlobalDataHandle*> arguments,
-    int device_ordinal,
-    std::vector<perftools::gputools::DeviceMemoryBase>* argument_ptrs) {
-  return local_service_->ResolveArguments(arguments, device_ordinal,
-                                          argument_ptrs);
-}
-
 se::Platform* LocalClient::platform() const {
   return local_service_->backend().platform();
 }
diff --git a/tensorflow/compiler/xla/client/local_client.h b/tensorflow/compiler/xla/client/local_client.h
index 94d5610639..49ffed4dde 100644
--- a/tensorflow/compiler/xla/client/local_client.h
+++ b/tensorflow/compiler/xla/client/local_client.h
@@ -158,14 +158,6 @@ class LocalClient : public Client {
   LocalClient(const LocalClient&) = delete;
   void operator=(const LocalClient&) = delete;
 
-  // For an array of arguments held on the local service, validate
-  // that each is placed on the specified device_ordinal, and return
-  // the DeviceMemoryBase corresponding to each argument.
-  tensorflow::Status ResolveArguments(
-      const tensorflow::gtl::ArraySlice<const GlobalDataHandle*> arguments,
-      int device_ordinal,
-      std::vector<perftools::gputools::DeviceMemoryBase>* argument_ptrs);
-
   // Return a handle to a buffer large enough to hold shape, allocated
   // on device_ordinal on the local service. If
   // allocate_space_for_deep_copy, the buffer is large enough to hold
diff --git a/tensorflow/compiler/xla/service/local_service.cc b/tensorflow/compiler/xla/service/local_service.cc
index 6947c5d2e1..8184dbabc8 100644
--- a/tensorflow/compiler/xla/service/local_service.cc
+++ b/tensorflow/compiler/xla/service/local_service.cc
@@ -77,21 +77,6 @@ LocalService::LocalService(std::unique_ptr<Backend> execute_backend,
   runs_in_client_process_ = true;
 }
 
-tensorflow::Status LocalService::ResolveArguments(
-    const tensorflow::gtl::ArraySlice<const GlobalDataHandle*> arguments,
-    int device_ordinal,
-    std::vector<perftools::gputools::DeviceMemoryBase>* argument_ptrs) {
-  TF_ASSIGN_OR_RETURN(std::vector<const Allocation*> arg_allocations,
-                      ResolveAndValidateArguments(
-                          arguments, execute_backend_.get(), device_ordinal));
-  argument_ptrs->resize(arg_allocations.size());
-  for (int i = 0; i < arguments.size(); ++i) {
-    const Allocation& allocation = *arg_allocations[i];
-    (*argument_ptrs)[i] = allocation.device_memory();
-  }
-  return tensorflow::Status::OK();
-}
-
 namespace {
 // Returns the space required to allocate a shape. If
 // allocate_space_for_deep_copy the space includes all sub-buffers of
diff --git a/tensorflow/compiler/xla/service/local_service.h b/tensorflow/compiler/xla/service/local_service.h
index a1a2ef98e9..767a3ab697 100644
--- a/tensorflow/compiler/xla/service/local_service.h
+++ b/tensorflow/compiler/xla/service/local_service.h
@@ -43,14 +43,6 @@ class LocalService : public Service {
   static StatusOr<std::unique_ptr<LocalService>> NewService(
       const ServiceOptions& options);
 
-  // For an array of arguments, validate that each is placed on the
-  // specified device_ordinal, and return the DeviceMemoryBase
-  // corresponding to each argument.
-  tensorflow::Status ResolveArguments(
-      const tensorflow::gtl::ArraySlice<const GlobalDataHandle*> arguments,
-      int device_ordinal,
-      std::vector<perftools::gputools::DeviceMemoryBase>* argument_ptrs);
-
   // Return a handle to a buffer large enough to hold shape, allocated
   // on device_ordinal. If allocate_space_for_deep_copy, the buffer is
   // large enough to hold all sub-buffers of a tuple shape, otherwise
diff --git a/tensorflow/compiler/xla/service_interface.h b/tensorflow/compiler/xla/service_interface.h
index 2159386152..c8851d2ca5 100644
--- a/tensorflow/compiler/xla/service_interface.h
+++ b/tensorflow/compiler/xla/service_interface.h
@@ -21,7 +21,10 @@ limitations under the License.
 
 namespace xla {
 
-// Defines the interface for an XLA service.
+// Defines the interface for an XLA service on the client side. This service
+// helps abstract around the actual implementation of a service - the service
+// can be local (running in the same process), or remote - in which case an RPC
+// stub is used as the implementation.
 class ServiceInterface {
  public:
   ServiceInterface() {}
-- 
GitLab


From 1bc8c7e757e9d3af3c9ca4fb5abc8d4bd55922fb Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 11 May 2017 17:02:33 -0700
Subject: [PATCH 1256/1563] tfdbg: reduce the amount of computation in
 examples_test.sh

PiperOrigin-RevId: 155816174
---
 tensorflow/python/debug/examples/examples_test.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/debug/examples/examples_test.sh b/tensorflow/python/debug/examples/examples_test.sh
index f0f4aee61d..0b5401a7f2 100755
--- a/tensorflow/python/debug/examples/examples_test.sh
+++ b/tensorflow/python/debug/examples/examples_test.sh
@@ -66,10 +66,10 @@ run
 exit
 EOF
 
-# Use a large enough "run -t" number to let the process end properly.
-cat << EOF | ${DEBUG_MNIST_BIN} --debug --fake_data --ui_type=readline
+cat << EOF | ${DEBUG_MNIST_BIN} --debug --max_steps=1 --fake_data --ui_type=readline
+run -t 1
+run --node_name_filter hidden --op_type_filter MatMul
 run -f has_inf_or_nan
-run -t 1000
 EOF
 
 # Test the custom dump_root option.
-- 
GitLab


From 6487cc13037a06c5223bdd4c1457fe88277c4dca Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 11 May 2017 17:10:36 -0700
Subject: [PATCH 1257/1563] Remove all-imports.html reference

It's better to directly reference what we need, rather than going through proxy
import files.

PiperOrigin-RevId: 155817083
---
 .../tensorboard/components/tf_graph_info/tf-node-info.html     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html b/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
index 0715777370..f1455acaee 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
+++ b/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
@@ -19,7 +19,8 @@ limitations under the License.
 <link rel="import" href="../iron-list/iron-list.html">
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-item/all-imports.html">
+<link rel="import" href="../paper-item/paper-item.html">
+<link rel="import" href="../paper-item/paper-item-body.html">
 <link rel="import" href="../tf-graph-common/tf-graph-common.html">
 <link rel="import" href="tf-graph-icon.html">
 <link rel="import" href="tf-node-list-item.html">
-- 
GitLab


From cb56822129b71afd6009e34e074f90cbcc5bea25 Mon Sep 17 00:00:00 2001
From: Andrew Harp <andrewharp@google.com>
Date: Thu, 11 May 2017 17:15:26 -0700
Subject: [PATCH 1258/1563] Clarify in java/README.md that the instructions
 there do not apply to Android.

PiperOrigin-RevId: 155817593
---
 tensorflow/java/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/java/README.md b/tensorflow/java/README.md
index 3838fbef42..337b55bccf 100644
--- a/tensorflow/java/README.md
+++ b/tensorflow/java/README.md
@@ -3,7 +3,7 @@
 > *WARNING*: The TensorFlow Java API is not currently covered by the TensorFlow
 > [API stability guarantees](https://www.tensorflow.org/programmers_guide/version_semantics).
 >
-> For using TensorFlow on Android refer to
+> For using TensorFlow on Android refer instead to
 > [contrib/android](https://www.tensorflow.org/code/tensorflow/contrib/android),
 > [makefile](https://www.tensorflow.org/code/tensorflow/contrib/makefile#android)
 > and/or the [Android demo](https://www.tensorflow.org/code/tensorflow/examples/android).
-- 
GitLab


From 5f9facb82605d4d98e1ace503f683b96f1468446 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 11 May 2017 17:41:58 -0700
Subject: [PATCH 1259/1563] Add Polymer iron-component-page dependency

This is a dependency of tf_graph in Tensorboard.

PiperOrigin-RevId: 155819863
---
 tensorflow/workspace.bzl | 68 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 00a7b7f009..5d0b4ff085 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -1245,6 +1245,24 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       srcs = ["roboto.html"],
   )
 
+  web_library_external(
+      name = "org_polymer_hydrolysis",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "703b50f6b00f9e0546b5a3451da57bb20f77a166e27e4967923b9e835bab9b80",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/github.com/Polymer/polymer-analyzer/archive/v1.19.3.tar.gz",
+          "https://github.com/Polymer/polymer-analyzer/archive/v1.19.3.tar.gz",
+      ],
+      strip_prefix = "polymer-analyzer-1.19.3",
+      path = "/hydrolysis",
+      srcs = [
+          "hydrolysis-analyzer.html",
+          "hydrolysis.html",
+          "hydrolysis.js",
+      ],
+      deps = ["@org_polymer"],
+  )
+
   web_library_external(
       name = "org_polymer_iron_a11y_announcer",
       licenses = ["notice"],  # BSD-3-Clause
@@ -1351,6 +1369,31 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
+  web_library_external(
+      name = "org_polymer_iron_component_page",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "3636e8b9a1f229fc33b5aad3933bd02a9825f66e679a0be31855d7c8245c4b4b",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-component-page/archive/v1.1.4.tar.gz",
+          "https://github.com/PolymerElements/iron-component-page/archive/v1.1.4.tar.gz",
+      ],
+      strip_prefix = "iron-component-page-1.1.4",
+      path = "/iron-component-page",
+      srcs = ["iron-component-page.html"],
+      deps = [
+          "@org_polymer",
+          "@org_polymer_hydrolysis",
+          "@org_polymer_iron_ajax",
+          "@org_polymer_iron_doc_viewer",
+          "@org_polymer_iron_flex_layout",
+          "@org_polymer_iron_icons",
+          "@org_polymer_iron_selector",
+          "@org_polymer_paper_header_panel",
+          "@org_polymer_paper_styles",
+          "@org_polymer_paper_toolbar",
+      ],
+  )
+
   web_library_external(
       name = "org_polymer_iron_collapse",
       licenses = ["notice"],  # BSD-3-Clause
@@ -1393,6 +1436,31 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       ],
   )
 
+  web_library_external(
+      name = "org_polymer_iron_doc_viewer",
+      licenses = ["notice"],  # BSD-3-Clause
+      sha256 = "f0e9dfbbcd94d7e88ce82cb61e615406ace63c185fee9396f7f182206ca5cc9a",
+      urls = [
+          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-doc-viewer/archive/v1.0.12.tar.gz",
+          "https://github.com/PolymerElements/iron-doc-viewer/archive/v1.0.12.tar.gz",
+      ],
+      strip_prefix = "iron-doc-viewer-1.0.12",
+      path = "/iron-doc-viewer",
+      srcs = [
+          "iron-doc-property-styles.html",
+          "iron-doc-property.html",
+          "iron-doc-viewer-styles.html",
+          "iron-doc-viewer.html",
+      ],
+      deps = [
+          "@org_polymer",
+          "@org_polymer_marked_element",
+          "@org_polymer_paper_button",
+          "@org_polymer_paper_styles",
+          "@org_polymer_prism_element",
+      ],
+  )
+
   web_library_external(
       name = "org_polymer_iron_dropdown",
       licenses = ["notice"],  # BSD-3-Clause
-- 
GitLab


From 14221c1fd4155d80341feea61896a4d8abc7ae78 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 18:10:02 -0700
Subject: [PATCH 1260/1563] Determine the version of sed based on the output of
 "--version" rather than ${OSTYPE}. The later approach is not reliable when an
 user installed GNU sed in Darwin systems like macOS.

PiperOrigin-RevId: 155822030
---
 tensorflow/contrib/makefile/download_dependencies.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/makefile/download_dependencies.sh b/tensorflow/contrib/makefile/download_dependencies.sh
index 58d1dc6f0a..f123111df8 100755
--- a/tensorflow/contrib/makefile/download_dependencies.sh
+++ b/tensorflow/contrib/makefile/download_dependencies.sh
@@ -30,9 +30,13 @@ RE2_URL="$(grep -o 'http.*github.com/google/re2/.*tar\.gz' "${BZL_FILE_PATH}" |
 replace_by_sed() {
   local regex="${1}"
   shift
-  if echo "${OSTYPE}" | grep -q darwin; then
+  # Detect the version of sed by the return value of "--version" flag. GNU-sed
+  # supports "--version" while BSD-sed doesn't.
+  if ! sed --version >/dev/null 2>&1; then
+    # BSD-sed.
     sed -i '' -e "${regex}" "$@"
   else
+    # GNU-sed.
     sed -i -e "${regex}" "$@"
   fi
 }
-- 
GitLab


From a5b9ef0ec0e9a4f5c42157755ffd180a90063e2b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 18:17:37 -0700
Subject: [PATCH 1261/1563] Add timeline support in tfprof

This CL mainly adds timeline support in three views of tfprof.
It includes a few other small changes:
1. Handle the case that one Op fires multiple kernels.
2. Remove the requirements for CostGraph for easier user adoption, for now.
3. Some speed improvements in graph view.
4. Consolidate the all kinds of tfprof output into one -output option.

PiperOrigin-RevId: 155822542
---
 tensorflow/contrib/tfprof/README.md           |  78 +----
 .../python/tools/tfprof/model_analyzer.py     |  10 +-
 .../tools/tfprof/model_analyzer_test.py       |  38 +--
 .../tools/tfprof/print_model_analysis_test.py |   9 +-
 .../python/tools/tfprof/tfprof_logger.py      |  10 +-
 tensorflow/tools/tfprof/README.md             |  64 +++-
 .../tools/tfprof/g3doc/code_timeline.png      | Bin 0 -> 45674 bytes
 .../tools/tfprof/g3doc/graph_timeline.png     | Bin 0 -> 168051 bytes
 .../tools/tfprof/g3doc/scope_timeline.png     | Bin 0 -> 24944 bytes
 tensorflow/tools/tfprof/internal/BUILD        |  58 +++-
 .../tfprof/internal/print_model_analysis.cc   |  11 +-
 .../tools/tfprof/internal/tfprof_code.cc      |  17 +-
 .../tools/tfprof/internal/tfprof_code.h       |  20 +-
 .../tools/tfprof/internal/tfprof_graph.cc     |  23 +-
 .../tools/tfprof/internal/tfprof_graph.h      |  29 +-
 .../tools/tfprof/internal/tfprof_node.cc      |  26 +-
 .../tools/tfprof/internal/tfprof_node.h       |  68 ++--
 .../tools/tfprof/internal/tfprof_node_show.cc | 296 ++++++++++++++++++
 .../tools/tfprof/internal/tfprof_node_show.h  | 173 ++++++++++
 .../tools/tfprof/internal/tfprof_options.cc   | 134 +++++++-
 .../tools/tfprof/internal/tfprof_options.h    |  43 ++-
 .../tools/tfprof/internal/tfprof_scope.cc     |  12 +-
 .../tools/tfprof/internal/tfprof_scope.h      |  19 +-
 .../tools/tfprof/internal/tfprof_show.cc      | 168 ++--------
 .../tools/tfprof/internal/tfprof_show.h       |  32 +-
 .../tools/tfprof/internal/tfprof_show_code.cc | 161 +---------
 .../tools/tfprof/internal/tfprof_show_code.h  |  33 +-
 .../tools/tfprof/internal/tfprof_show_test.cc |   2 +-
 .../tools/tfprof/internal/tfprof_stats.cc     |  27 +-
 .../tfprof/internal/tfprof_stats_test.cc      |  40 +--
 .../tfprof/internal/tfprof_tensor_test.cc     |   2 +-
 .../tools/tfprof/internal/tfprof_timeline.cc  | 245 +++++++++++++++
 .../tools/tfprof/internal/tfprof_timeline.h   | 147 +++++++++
 .../tfprof/internal/tfprof_timeline_test.cc   |  92 ++++++
 .../tools/tfprof/internal/tfprof_utils.cc     |  14 +-
 tensorflow/tools/tfprof/tfprof_main.cc        |  32 +-
 tensorflow/tools/tfprof/tfprof_options.proto  |   2 +-
 tensorflow/tools/tfprof/tfprof_output.proto   |   3 +-
 38 files changed, 1470 insertions(+), 668 deletions(-)
 create mode 100644 tensorflow/tools/tfprof/g3doc/code_timeline.png
 create mode 100644 tensorflow/tools/tfprof/g3doc/graph_timeline.png
 create mode 100644 tensorflow/tools/tfprof/g3doc/scope_timeline.png
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_node_show.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_node_show.h
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline.cc
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline.h
 create mode 100644 tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc

diff --git a/tensorflow/contrib/tfprof/README.md b/tensorflow/contrib/tfprof/README.md
index d891ecdc9a..5bfa0247a5 100644
--- a/tensorflow/contrib/tfprof/README.md
+++ b/tensorflow/contrib/tfprof/README.md
@@ -2,81 +2,25 @@
 
 # Full Docment in tensorflow/tools/tfprof/README.md
 
-Author: Xin Pan (xpan@google.com, github: panyx0718)
+Author: Xin Pan (xpan@google.com, github: panyx0718), Jon Shlens, Yao Zhang
 
 Consultants: Jon Shlens, Pete Warden
 
 ###Major Features
 
 1.  Measure model parameters, float operations, tensor shapes.
-2.  Measure op execution times, requested memory size and device placement.
+2.  Profile op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  3 ways to view and explore TensorFlow model profiles
+4.  Selectively group, filter, account and order ops.
 
-    *  Organize by Python code call stack.
-    *  Organize by TensorFlow operation name scope hierarchies.
-    *  Organize by TensorFlow operation inputs/outputs graph.
+####tfprof supports 3 views to organize TensorFlow model profiles
 
-5.  Selectively grouping/filtering/accounting/ordering ops.
+    *  code view: Stats are associated your Python codes and organized as call stacks.
+    *  scope view: Stats are organized as name scope hierarchies.
+    *  graph view: Stats are organized as Tensorflow Op graph.
 
-tfprof can be used as Python API, Interactive CLI and One-shot Script.
+####For each view, there are 3 ways to display outputs:
 
-## Python API Tutorials
-
-tfprof is part of TensorFlow core. Simply ```import tensorflow as tf```.
-
-### Examine the shapes and sizes of all trainiable Variables.
-```python
-# Print trainable variable parameter statistics to stdout.
-param_stats = tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    tfprof_options=tf.contrib.tfprof.model_analyzer.
-        TRAINABLE_VARS_PARAMS_STAT_OPTIONS)
-
-# param_stats is tensorflow.tfprof.TFGraphNodeProto proto.
-# It organize the statistics
-# of each graph node in tree scructure. Let's print the root below.
-sys.stdout.write('total_params: %d\n' % param_stats.total_parameters)
-```
-
-### Examine the number of floating point operations
-``` python
-# Print to stdout an analysis of the number of floating point operations in the
-# model broken down by individual operations.
-#
-# Note: Only Ops with RegisterStatistics('flops') defined have flop stats. It
-# also requires complete shape information. It is common that shape is unknown
-# statically. To complete the shape, provide run-time shape information with
-# tf.RunMetadata to the API (See next example on how to provide RunMetadata).
-tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    tfprof_options=tf.contrib.tfprof.model_analyzer.FLOAT_OPS_OPTIONS)
-```
-
-### Examine the timing and memory usage
-You will first need to run the following set up in your model in order to
-compute the memory and timing statistics.
-
-```python
-# Generate the meta information for the model that contains the memory usage
-# and timing information.
-run_metadata = tf.RunMetadata()
-with tf.Session() as sess:
-  _ = sess.run(train_op,
-               options=tf.RunOptions(trace_level=tf.RunOptions.FULL_TRACE),
-               run_metadata=run_metadata)
-```
-
-Finally, you may run `print_model_analysis` to explore the timing and memory
-demands of the model.
-
-``` python
-# Print to stdout an analysis of the memory usage and the timing information
-# from running the graph broken down by operations.
-tf.contrib.tfprof.model_analyzer.print_model_analysis(
-    tf.get_default_graph(),
-    run_meta=run_metadata,
-    tfprof_options=tf.contrib.tfprof.model_analyzer.PRINT_ALL_TIMING_MEMORY)
-```
-
-Users can change ```tfprof_options``` to fully leverage tfprof's power.
+    *  stdout: Results are written to stdout.
+    *  timeline: Visualized in chrome browser as time series.
+    *  file: Results are dumped to file.
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
index 13b407d815..17dff69edd 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer.py
@@ -45,7 +45,7 @@ TRAINABLE_VARS_PARAMS_STAT_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['params'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -65,7 +65,7 @@ FLOAT_OPS_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['float_ops'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -87,7 +87,7 @@ PRINT_PARAMS_ON_DEVICE = {
     'hide_name_regexes': [],
     'account_displayed_op_only': False,
     'select': ['device', 'params'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -107,7 +107,7 @@ PRINT_ALL_TIMING_MEMORY = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['micros', 'bytes'],
-    'viz': False,
+    'output': 'stdout',
     'dump_to_file': ''
 }
 
@@ -178,7 +178,7 @@ def print_model_analysis(graph,
   opts.account_displayed_op_only = tfprof_options['account_displayed_op_only']
   for p in tfprof_options['select']:
     opts.select.append(p)
-  opts.viz = tfprof_options['viz']
+  opts.output = tfprof_options['output']
   opts.dump_to_file = tfprof_options['dump_to_file']
 
   run_meta_str = run_meta.SerializeToString() if run_meta else b''
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
index 55167576e2..afd8563e78 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
@@ -35,13 +35,14 @@ class PrintModelAnalysisTest(test.TestCase):
   def testDumpToFile(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = lib.BuildSmallModel()
       model_analyzer.print_model_analysis(sess.graph, tfprof_options=opts)
 
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         self.assertEqual(u'_TFProfRoot (--/451 params)\n'
                          '  DW (3x3x3x6, 162/162 params)\n'
                          '  DW2 (2x2x6x12, 288/288 params)\n'
@@ -51,15 +52,14 @@ class PrintModelAnalysisTest(test.TestCase):
   def testSelectEverything(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
     opts['account_type_regexes'] = ['.*']
     opts['select'] = [
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device', 'op_types'
     ]
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
@@ -72,17 +72,18 @@ class PrintModelAnalysisTest(test.TestCase):
       model_analyzer.print_model_analysis(
           sess.graph, run_meta, tfprof_options=opts)
 
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         # pylint: disable=line-too-long
         self.assertEqual(
-            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  ScalarW (1, 1/1 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|VariableV2|_trainable_variables)\n    ScalarW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    ScalarW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      ScalarW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        ScalarW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        ScalarW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        ScalarW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    ScalarW/read (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
+            '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|VariableV2|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  ScalarW (1, 1/1 params, 0/0 flops, 0B/0B, VariableV2|_trainable_variables)\n    ScalarW/Assign (0/0 params, 0/0 flops, 0B/0B, Assign)\n    ScalarW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      ScalarW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        ScalarW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        ScalarW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        ScalarW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        ScalarW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    ScalarW/read (0/0 params, 0/0 flops, 0B/0B, Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
             f.read())
         # pylint: enable=line-too-long
 
   def testSimpleCodeView(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
     opts['account_type_regexes'] = ['.*']
     opts['show_name_regexes'] = ['.*model_analyzer_testlib.*']
     opts['account_displayed_op_only'] = False
@@ -92,9 +93,7 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device',
     ]
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
@@ -107,7 +106,7 @@ class PrintModelAnalysisTest(test.TestCase):
       model_analyzer.print_model_analysis(
           sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
 
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         # pylint: disable=line-too-long
         self.assertEqual(
             '_TFProfRoot (0/451 params, 0/10.44k flops, 0B/5.28KB)\n  model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops, 0B/864B)\n  model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/1 params, 0/0 flops, 0B/0B)\n  model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/162 params, 0/0 flops, 0B/1.30KB)\n  model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/5.83k flops, 0B/432B)\n  model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/288 params, 0/0 flops, 0B/2.30KB)\n  model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/4.61k flops, 0B/384B)\n',
@@ -117,15 +116,14 @@ class PrintModelAnalysisTest(test.TestCase):
   def testComplexCodeView(self):
     ops.reset_default_graph()
     opts = model_analyzer.TRAINABLE_VARS_PARAMS_STAT_OPTIONS.copy()
-    opts['dump_to_file'] = os.path.join(test.get_temp_dir(), 'dump')
+    outfile = os.path.join(test.get_temp_dir(), 'dump')
+    opts['output'] = 'file:outfile=' + outfile
     opts['account_type_regexes'] = ['.*']
     opts['show_name_regexes'] = ['.*model_analyzer_testlib.py.*']
     opts['account_displayed_op_only'] = False
     opts['select'] = ['params', 'float_ops']
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildFullModel()
 
       sess.run(variables.global_variables_initializer())
@@ -139,7 +137,7 @@ class PrintModelAnalysisTest(test.TestCase):
           sess.graph, run_meta, tfprof_cmd='code', tfprof_options=opts)
 
       # pylint: disable=line-too-long
-      with gfile.Open(opts['dump_to_file'], 'r') as f:
+      with gfile.Open(outfile, 'r') as f:
         self.assertEqual(
             '_TFProfRoot (0/2.84k params, 0/54.08k flops)\n  model_analyzer_testlib.py:56:BuildFullModel:seq.append(array_... (0/1.80k params, 0/41.76k flops)\n    model_analyzer_testlib.py:33:BuildSmallModel:image = array_ops... (0/0 params, 0/0 flops)\n    model_analyzer_testlib.py:37:BuildSmallModel:initializer=init_... (0/4 params, 0/0 flops)\n    model_analyzer_testlib.py:41:BuildSmallModel:initializer=init_... (0/648 params, 0/0 flops)\n    model_analyzer_testlib.py:42:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/23.33k flops)\n    model_analyzer_testlib.py:46:BuildSmallModel:initializer=init_... (0/1.15k params, 0/0 flops)\n    model_analyzer_testlib.py:47:BuildSmallModel:x = nn_ops.conv2d... (0/0 params, 0/18.43k flops)\n  model_analyzer_testlib.py:60:BuildFullModel:cell, array_ops.c... (0/1.04k params, 0/4.13k flops)\n  model_analyzer_testlib.py:62:BuildFullModel:target = array_op... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:63:BuildFullModel:loss = nn_ops.l2_... (0/0 params, 0/0 flops)\n  model_analyzer_testlib.py:65:BuildFullModel:return sgd_op.min... (0/0 params, 0/8.19k flops)\n',
             f.read())
@@ -170,9 +168,7 @@ class PrintModelAnalysisTest(test.TestCase):
         'bytes', 'params', 'float_ops', 'num_hidden_ops', 'device'
     ]
 
-    config = config_pb2.ConfigProto(
-        graph_options=config_pb2.GraphOptions(build_cost_model=1))
-    with session.Session(config=config) as sess, ops.device('/cpu:0'):
+    with session.Session() as sess, ops.device('/cpu:0'):
       x = lib.BuildSmallModel()
 
       sess.run(variables.global_variables_initializer())
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
index aa133d3142..c3e9fc9cc0 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
@@ -51,7 +51,7 @@ TEST_OPTIONS = {
     'hide_name_regexes': [],
     'account_displayed_op_only': True,
     'select': ['params'],
-    'viz': False
+    'output': 'stdout',
 }
 
 # pylint: enable=bad-whitespace
@@ -92,7 +92,7 @@ class PrintModelAnalysisTest(test.TestCase):
     opts.account_displayed_op_only = TEST_OPTIONS['account_displayed_op_only']
     for p in TEST_OPTIONS['select']:
       opts.select.append(p)
-    opts.viz = TEST_OPTIONS['viz']
+    opts.output = TEST_OPTIONS['output']
 
     with session.Session() as sess, ops.device('/cpu:0'):
       _ = self._BuildSmallModel()
@@ -116,7 +116,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -128,7 +127,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 648
-      device: "/device:CPU:0"
       children {
       name: "DW/Assign"
       exec_micros: 0
@@ -136,7 +134,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -217,7 +214,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
@@ -231,7 +227,6 @@ class PrintModelAnalysisTest(test.TestCase):
       total_exec_micros: 0
       total_requested_bytes: 0
       total_parameters: 0
-      device: "/device:CPU:0"
       float_ops: 0
       total_float_ops: 0
       }
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
index cd3912bbfb..e6d504d516 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
@@ -62,7 +62,7 @@ def _fill_missing_graph_shape(graph, run_meta):
   return graph
 
 
-def _get_logged_ops(graph, run_meta=None, add_trace=False):
+def _get_logged_ops(graph, run_meta=None, add_trace=True):
   """Extract trainable model parameters and FLOPs for ops from a Graph.
 
   Args:
@@ -120,9 +120,8 @@ def _get_logged_ops(graph, run_meta=None, add_trace=False):
   return logged_ops
 
 
-def _merge_default_with_oplog(graph, op_log=None,
-                              run_meta=None,
-                              add_trace=False):
+def _merge_default_with_oplog(graph, op_log=None, run_meta=None,
+                              add_trace=True):
   """Merge the tfprof default extra info with caller's op_log.
 
   Args:
@@ -154,8 +153,7 @@ def _merge_default_with_oplog(graph, op_log=None,
   return tmp_op_log
 
 
-def write_op_log(graph, log_dir, op_log=None, run_meta=None,
-                 add_trace=False):
+def write_op_log(graph, log_dir, op_log=None, run_meta=None, add_trace=True):
   """Log provided 'op_log', and add additional model information below.
 
     The API also assigns ops in tf.trainable_variables() an op type called
diff --git a/tensorflow/tools/tfprof/README.md b/tensorflow/tools/tfprof/README.md
index 52d376d5f5..69f09411a9 100644
--- a/tensorflow/tools/tfprof/README.md
+++ b/tensorflow/tools/tfprof/README.md
@@ -1,6 +1,6 @@
 # tfprof: A Profiling Tool for TensorFlow Models
 
-Author: Xin Pan (xpan@google.com, github: panyx0718)
+Author: Xin Pan (xpan@google.com, github: panyx0718), Jon Shlens, Yao Zhang
 
 Consultants: Jon Shlens, Pete Warden
 
@@ -8,15 +8,22 @@ Consultants: Jon Shlens, Pete Warden
 ###Major Features
 
 1.  Measure model parameters, float operations, tensor shapes.
-2.  Measure op execution times, requested memory size and device placement.
+2.  Profile op execution times, requested memory size and device placement.
 3.  Inspect checkpoint tensors' shapes and their values.
-4.  3 ways to view and explore TensorFlow model profiles
+4.  Selectively group, filter, account and order ops.
 
-    *  Organize by Python code call stack.
-    *  Organize by TensorFlow operation name scope hierarchies.
-    *  Organize by TensorFlow operation inputs/outputs graph.
+####tfprof supports 3 views to organize TensorFlow model profiles
+
+    *  code view: Stats are associated your Python codes and organized as call stacks.
+    *  scope view: Stats are organized as name scope hierarchies.
+    *  graph view: Stats are organized as Tensorflow Op graph.
+
+####For each view, there are 3 ways to display outputs:
+
+    *  stdout: Results are written to stdout.
+    *  timeline: Visualized in chrome browser as time series.
+    *  file: Results are dumped to file.
 
-5.  Selectively grouping/filtering/accounting/ordering ops.
 
 [Python API Tutorials](#python-api-tutorials): It can be called directly from
 Python codes. Results are either printed
@@ -83,13 +90,11 @@ compute the memory and timing statistics.
 #
 # Note: When run on GPU, a kernel is first scheduled (enqueued) and then
 #       executed asynchronously. tfprof only tracks the execution time.
-#       Which is from proto CostGraphDef::Node::compute_cost.
 #       In addition, a substantial of time might be spent between Python and
 #       TensorFlow runtime, which is also not tracked by tfprof.
 #
-config = tf.ConfigProto(graph_options=tf.GraphOptions(build_cost_model=1))
 run_metadata = tf.RunMetadata()
-with tf.Session(config=config) as sess:
+with tf.Session() as sess:
   _ = sess.run(train_op,
                options=tf.RunOptions(trace_level=tf.RunOptions.FULL_TRACE),
                run_metadata=run_metadata)
@@ -121,6 +126,18 @@ tf.contrib.tfprof.model_analyzer.print_model_analysis(
 
 Users can change ```tfprof_options``` to fully leverage tfprof's power.
 
+```
+For example set opts['output'] = 'timeline:outfile=<filename>' to
+generate a timeline json file. Open a Chrome Browser, open URL
+chrome://tracing, and load the json file. Below are 2 examples of graph
+view and scope view. See code view example in later examples.
+```
+
+<left>
+![CodeTimeline](g3doc/graph_timeline.png)
+![CodeTimeline](g3doc/scope_timeline.png)
+</left>
+
 
 ## CLI Tutorials
 
@@ -197,8 +214,14 @@ tfprof>
 # supported select fileds. Availability depends on --[run_meta|checkpoint|op_log]_path.
 # [bytes|micros|params|float_ops|num_hidden_ops|tensor_value|device|op_types]
 -select                     params
--viz                        false
--dump_to_file
+# format: output_type:key=value,key=value...
+# output_types: stdout (default), timeline, file.
+# key=value pairs:
+#   1. timeline: outfile=<filename>
+#   2. file: outfile=<filename>
+#   3. stdout: None.
+# E.g. timeline:outfile=/tmp/timeline.json
+-output
 ```
 
 3) I want to see which line of my python codes costs most time!
@@ -222,6 +245,12 @@ _TFProfRoot (0us/22.44ms)
         model_analyzer_test.py:134:testComplexCodeView:sess.run(variable... (0us/0us)
 ```
 
+Set ```-output timeline:outfile=<filename>``` to generate timeline instead of stdout.
+<left>
+![CodeTimeline](g3doc/code_timeline.png)
+</left>
+
+
 4) I want to see the `BatchNorm`'s gamma value in checkpoint.
 
 ```shell
@@ -423,10 +452,10 @@ the tool adds all `Variables` inside `tf.trainable_variables()` to
 12) Run tfprof in one-shot mode and dump result to file.
 
 ```shell
-# Printed to stdout if --dump_to_file is not set.
+# By default output to stdout. Use -output option to change output types.
 tfprof scope --graph_path=graph.pbtxt  \
              --max_depth=3 \
-             --dump_to_file="/tmp/dump"
+             --output="file:outfile=/tmp/dump"
 Reading Files...
 Parsing GraphDef...
 Preparing Views...
@@ -538,4 +567,9 @@ as long as they match the `-account_xxx` options.
 
 `-select`: Comma-separated list of metrics to show: [bytes|micros|params|float_ops|num_hidden_ops|tensor_value|device|op_types].
 
-`-dump_to_file`: Dump the output to a file, instead of terminal.
+`-output`: Output results as stdout, file or timeline.
+The format is ```output_type:key=value,key=value```.
+For example: ```timeline:outfile=<filename>```.
+timeline: key=outfile, value=<filename>.
+stdout: none.
+file: key=outfile, value=<filename>.
diff --git a/tensorflow/tools/tfprof/g3doc/code_timeline.png b/tensorflow/tools/tfprof/g3doc/code_timeline.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5ab246f7da14c0384a5704aa8053a97540a9dab
GIT binary patch
literal 45674
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
J);T3K0RX~K!#4l`

literal 0
HcmV?d00001

diff --git a/tensorflow/tools/tfprof/g3doc/graph_timeline.png b/tensorflow/tools/tfprof/g3doc/graph_timeline.png
new file mode 100644
index 0000000000000000000000000000000000000000..255a91fd5ff6005086f7d4a1dfdd43cc8d115ee1
GIT binary patch
literal 168051
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
E0CyO~SO5S3

literal 0
HcmV?d00001

diff --git a/tensorflow/tools/tfprof/g3doc/scope_timeline.png b/tensorflow/tools/tfprof/g3doc/scope_timeline.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d95af84aac473e68b30fc6fbefa99d4431948f
GIT binary patch
literal 24944
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

literal 0
HcmV?d00001

diff --git a/tensorflow/tools/tfprof/internal/BUILD b/tensorflow/tools/tfprof/internal/BUILD
index adace89985..e90f0ec40a 100644
--- a/tensorflow/tools/tfprof/internal/BUILD
+++ b/tensorflow/tools/tfprof/internal/BUILD
@@ -21,6 +21,7 @@ cc_library(
         ":tfprof_options",
         ":tfprof_scope",
         ":tfprof_show",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -30,6 +31,20 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_timeline",
+    srcs = ["tfprof_timeline.cc"],
+    hdrs = ["tfprof_timeline.h"],
+    deps = [
+        ":tfprof_node_show",
+        ":tfprof_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+        "@jsoncpp_git//:jsoncpp",
+    ],
+)
+
 cc_library(
     name = "tfprof_node",
     srcs = ["tfprof_node.cc"],
@@ -71,7 +86,7 @@ cc_library(
         ":tfprof_node",
         ":tfprof_options",
         ":tfprof_show_code",
-        ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:c_api",
         "//tensorflow/c:checkpoint_reader",
@@ -93,6 +108,7 @@ cc_library(
         ":tfprof_options",
         ":tfprof_show",
         ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -102,6 +118,21 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "tfprof_node_show",
+    srcs = ["tfprof_node_show.cc"],
+    hdrs = ["tfprof_node_show.h"],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_node",
+        ":tfprof_options",
+        ":tfprof_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "tfprof_show",
     srcs = ["tfprof_show.cc"],
@@ -109,8 +140,10 @@ cc_library(
     deps = [
         ":tfprof_constants",
         ":tfprof_node",
+        ":tfprof_node_show",
         ":tfprof_options",
         ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -127,10 +160,12 @@ cc_library(
     deps = [
         ":tfprof_constants",
         ":tfprof_node",
+        ":tfprof_node_show",
         ":tfprof_options",
         ":tfprof_scope",
         ":tfprof_show",
         ":tfprof_tensor",
+        ":tfprof_timeline",
         ":tfprof_utils",
         "//tensorflow/c:checkpoint_reader",
         "//tensorflow/core:lib",
@@ -166,6 +201,27 @@ tf_cc_test(
     ],
 )
 
+tf_cc_test(
+    name = "tfprof_timeline_test",
+    srcs = ["tfprof_timeline_test.cc"],
+    data = [
+        "testdata/graph.pbtxt",
+        "testdata/run_meta",
+    ],
+    deps = [
+        ":tfprof_constants",
+        ":tfprof_options",
+        ":tfprof_stats",
+        ":tfprof_utils",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+        "//tensorflow/tools/tfprof:protos_all_cc",
+    ],
+)
+
 cc_library(
     name = "tfprof_utils",
     srcs = ["tfprof_utils.cc"],
diff --git a/tensorflow/tools/tfprof/internal/print_model_analysis.cc b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
index c816e3209e..f73675e8a7 100644
--- a/tensorflow/tools/tfprof/internal/print_model_analysis.cc
+++ b/tensorflow/tools/tfprof/internal/print_model_analysis.cc
@@ -56,11 +56,14 @@ string PrintModelAnalysis(const string* graph, const string* run_meta,
   TFStats tf_stats(std::move(graph_ptr), std::move(run_meta_ptr),
                    std::move(op_log_ptr), std::move(ckpt_reader));
 
-  Options opts = Options::FromProtoStr(*options);
+  Options opts;
+  tensorflow::Status s = Options::FromProtoStr(*options, &opts);
+  if (!s.ok()) {
+    fprintf(stderr, "%s\n", s.ToString().c_str());
+    return "";
+  }
 
-  // TODO(xpan): We should have dump_to_file/print_stdout/etc to control
-  // side-effects independently instead of one controlling the other.
-  if (opts.dump_to_file.empty()) {
+  if (opts.output_type == kOutput[1]) {
     printf("\n=========================Options=============================\n");
     printf("%s", opts.ToString().c_str());
     printf("\n==================Model Analysis Report======================\n");
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.cc b/tensorflow/tools/tfprof/internal/tfprof_code.cc
index 5618a52286..9739db1e0b 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_code.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.cc
@@ -25,7 +25,6 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/regexp.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
-#include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -99,7 +98,8 @@ CodeNode* TFCode::BuildCodeNodes(TFCodeNode* root) {
   return code_root_ptr;
 }
 
-const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
+const ShowCodeNode* TFCode::ShowInternal(const Options& opts,
+                                         Timeline* timeline) {
   // Search from roots recursively to find start node, if start_name_regexes
   // is specified.
   tfprof_trace_root_.reset(new TFCodeNode(kTFProfRoot));
@@ -117,7 +117,11 @@ const ShowCodeNode* TFCode::ShowInternal(const Options& opts) {
   tfprof_code_root_->children.assign(roots.begin(), roots.end());
   Account({tfprof_code_root_.get()}, opts);
 
-  return PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
+  CodeNode* root = PrintScope({tfprof_code_root_.get()}, opts, 1, 0)[0];
+  if (timeline) {
+    timeline->GenerateCodeTimeline(root);
+  }
+  return root;
 }
 
 std::vector<CodeNode*> TFCode::SearchRoot(std::vector<CodeNode*> roots,
@@ -170,8 +174,13 @@ std::vector<CodeNode*> TFCode::PrintScope(const std::vector<CodeNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (CodeNode* sc : show_cnodes) {
-        children_str += sc->formatted_str;
+        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
+          children_str += sc->formatted_str;
+          sc->formatted_str.clear();
+        }
         node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        sc->mutable_proto()->mutable_children()->Clear();
+        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
diff --git a/tensorflow/tools/tfprof/internal/tfprof_code.h b/tensorflow/tools/tfprof/internal/tfprof_code.h
index 7c517e6b0e..d7a28624f1 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_code.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_code.h
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_show_code.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
@@ -37,22 +38,6 @@ limitations under the License.
 namespace tensorflow {
 namespace tfprof {
 
-class CodeNode : public ShowCodeNode {
- public:
-  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
-  ~CodeNode() override {}
-
-  void AggregateTotalStats(CodeNode* node) {
-    ShowCodeNode::AggregateTotalStats(node);
-  }
-
-  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
-
-  void ResetTotalStats() { ShowCodeNode::ResetTotalStats(); }
-
-  std::vector<CodeNode*> children;
-};
-
 class TFCode : public TFShowCode {
  public:
   explicit TFCode() : code_root_(nullptr), trace_root_(nullptr) {}
@@ -65,7 +50,8 @@ class TFCode : public TFShowCode {
  private:
   CodeNode* BuildCodeNodes(TFCodeNode* root);
 
-  const ShowCodeNode* ShowInternal(const Options& opts) override;
+  const ShowCodeNode* ShowInternal(const Options& opts,
+                                   Timeline* timeline) override;
 
   std::vector<CodeNode*> SearchRoot(std::vector<CodeNode*> roots,
                                     const std::vector<string>& regexes);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.cc b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
index 1623d9f8c4..23084146c2 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.cc
@@ -66,7 +66,7 @@ void TFGraph::Build() {
   }
 }
 
-const ShowNode* TFGraph::ShowInternal(const Options& opts) {
+const ShowNode* TFGraph::ShowInternal(const Options& opts, Timeline* timeline) {
   // Search the nodes to start from.
   std::vector<GraphNode*> roots = roots_;
   if (opts.start_name_regexes.size() != 1 ||
@@ -81,11 +81,13 @@ const ShowNode* TFGraph::ShowInternal(const Options& opts) {
   std::map<string, int64> account_visits;
   Account({root}, opts, &account_visits);
 
-  if (opts.viz) {
-    printf("Visualizing feature disabled...\n");
-  }
   std::set<string> visits;
-  return PrintGraph({root}, opts, 1, 0, 0, &visits)[0];
+  root = PrintGraph({root}, opts, 1, 0, 0, &visits)[0];
+
+  if (timeline) {
+    timeline->GenerateGraphTimeline(root);
+  }
+  return root;
 }
 
 std::vector<GraphNode*> TFGraph::SearchRoot(
@@ -155,8 +157,14 @@ std::vector<GraphNode*> TFGraph::PrintGraph(const std::vector<GraphNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (GraphNode* sc : show_cnodes) {
-        children_str += sc->formatted_str;
-        node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
+          children_str += sc->formatted_str;
+          sc->formatted_str.clear();
+        }
+        // This swap and reinit pattern is critical for performance.
+        node->mutable_proto()->add_children()->Swap(sc->mutable_proto());
+        sc->ReInit();
+        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
@@ -181,7 +189,6 @@ std::vector<GraphNode*> TFGraph::PrintGraph(const std::vector<GraphNode*> roots,
           node->formatted_str += value_str;
         }
       }
-
       node->formatted_str += children_str;
       show_nodes.push_back(node);
     } else {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_graph.h b/tensorflow/tools/tfprof/internal/tfprof_graph.h
index 75979d020c..4d4aa8b2b1 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_graph.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_graph.h
@@ -37,32 +37,6 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-class GraphNode : public ShowNode {
- public:
-  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
-    mutable_proto()->set_inputs(node->inputs().size());
-    mutable_proto()->set_total_inputs(0);
-  }
-
-  void AggregateTotalStats(GraphNode* node) {
-    ShowNode::AggregateTotalStats(node);
-    mutable_proto()->set_total_inputs(proto().total_inputs() +
-                                      node->proto().total_inputs() + 1);
-  }
-
-  void AddSelfToTotalStats() {
-    ShowNode::AddSelfToTotalStats();
-    mutable_proto()->set_total_inputs(proto().total_inputs() +
-                                      proto().inputs());
-  }
-
-  void ResetTotalStats() {
-    ShowNode::ResetTotalStats();
-    mutable_proto()->set_total_inputs(0);
-  }
-
-  std::vector<GraphNode*> children;
-};
 
 // Organize tensorflow ops in a graph structure, pointing from output ops
 // to input ops.
@@ -77,7 +51,8 @@ class TFGraph : public TFShow {
   void Build() override;
 
  private:
-  const ShowNode* ShowInternal(const Options& opts) override;
+  const ShowNode* ShowInternal(const Options& opts,
+                               Timeline* timeline) override;
 
   bool ShouldShowIfExtra(ShowNode* node, const Options& opts,
                          int depth) override {
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.cc b/tensorflow/tools/tfprof/internal/tfprof_node.cc
index 5f018addb4..74c8fcbe48 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.cc
@@ -20,20 +20,22 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
+// Notes about start and end time from the NodeExecStats proto.
+// For GPU, there is no difference between op_end_rel_micros and
+// all_end_rel_micros. All are kernel times.
+// For CPU, op_end_rel is the kernel time, while all_end_rel_micros includes
+// some post-processing.
+// Here, we only consider kernel time for simplicity.
 void TFGraphNode::AddStepStat(const string& device,
                               const NodeExecStats* step_stat) {
-  if (!device.empty()) {
-    // This might override device from GraphDef.
-    device_ = device;
-  }
   step_stat_ = step_stat;
+  CHECK(step_stat_);
 
-  op_start_micros_ = step_stat_->all_start_micros();
-  if (step_stat_->op_end_rel_micros() && step_stat_->op_start_rel_micros()) {
-    op_schedule_micros_ =
-        step_stat_->op_end_rel_micros() - step_stat_->op_start_rel_micros();
-  }
-  all_spent_micros_ = step_stat_->all_end_rel_micros();
+  string dev = str_util::Lowercase(device);
+
+  devices_.insert(dev);
+  op_kernel_execs_[dev].push_back(std::make_pair(
+      step_stat_->all_start_micros(), step_stat_->op_end_rel_micros()));
 
   for (const auto& output : step_stat_->output()) {
     if (output.has_tensor_description() &&
@@ -44,9 +46,5 @@ void TFGraphNode::AddStepStat(const string& device,
     }
   }
 }
-
-void TFGraphNode::AddNodeStat(const CostGraphDef::Node* cost_node) {
-  kernel_compute_micros_ = cost_node->compute_cost();
-}
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node.h b/tensorflow/tools/tfprof/internal/tfprof_node.h
index 235904ea6c..8e57db7ba2 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_node.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_node.h
@@ -23,12 +23,12 @@ limitations under the License.
 
 #include "tensorflow/core/framework/allocation_description.pb.h"
 #include "tensorflow/core/framework/attr_value.pb.h"
-#include "tensorflow/core/framework/cost_graph.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/framework/tensor_description.pb.h"
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/tfprof_log.pb.h"
 
@@ -41,10 +41,6 @@ class TFGraphNode {
       : node_(node),
         code_(nullptr),
         step_stat_(nullptr),
-        op_start_micros_(0),
-        op_schedule_micros_(0),
-        kernel_compute_micros_(0),
-        all_spent_micros_(0),
         requested_bytes_(0),
         float_ops_(0) {
     if (!node) return;
@@ -69,38 +65,51 @@ class TFGraphNode {
       update_shape(shape_vec);
     }
     op_types_.insert(node->op());
-    device_ = node->device();
   }
 
   TFGraphNode() : TFGraphNode(nullptr) {}
 
-  void AddInput(TFGraphNode* input) { inputs_[input->name()] = input; }
+  void AddInput(TFGraphNode* input, int64 output_idx) {
+    inputs_[input->name()] = input;
+    output_idx_[input->name()] = output_idx;
+  }
 
   void AddOpType(const string& op_type) { op_types_.insert(op_type); }
 
   void AddStepStat(const string& device, const NodeExecStats* step_stat);
 
-  // Add CostGraphDef::Node.
-  void AddNodeStat(const CostGraphDef::Node* cost_node);
-
   void AddFloatOps(int64 float_ops) { float_ops_ = float_ops; }
 
   void AddCode(const CodeDef* code) { code_ = code; }
 
   const string& name() const { return node_->name(); }
   const NodeDef* node_def() { return node_; }
+
+  const NodeExecStats* step_stats() const { return step_stat_; }
+
   const std::map<string, TFGraphNode*>& inputs() const { return inputs_; }
-  int64 op_start_micros() { return op_start_micros_; }
-  // This is time spent in Op::Compute(), which is GPU kernel schedule time.
-  // Currently not used.
-  int64 op_schedule_micros() { return op_schedule_micros_; }
+  const std::map<string, int64>& output_idx() { return output_idx_; }
+
   // This is time spent in kernel execution.
-  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
-  int64 all_spent_micros() { return all_spent_micros_; }
+  int64 kernel_exec_micros() const {
+    if (!step_stat_) return 0;
+    int64 total = 0;
+    for (const auto& execs : op_kernel_execs_) {
+      for (const auto& exec : execs.second) {
+        total += exec.second;
+      }
+    }
+    return total;
+  }
+  const std::map<string, std::vector<std::pair<int64, int64>>>&
+  op_kernel_execs() const {
+    return op_kernel_execs_;
+  }
+
   int64 requested_bytes() const { return requested_bytes_; }
   int64 float_ops() const { return float_ops_; }
   const CodeDef* code() { return code_; }
-  string device() const { return device_; }
+  std::set<string> devices() const { return devices_; }
   const std::set<string>& op_types() const { return op_types_; }
 
   const std::vector<int64>& shape() const { return shape_; }
@@ -109,17 +118,19 @@ class TFGraphNode {
   void update_shape(const std::vector<int64>& shape) { shape_ = shape; }
 
   std::map<string, TFGraphNode*> inputs_;
+  std::map<string, int64> output_idx_;
+
   const NodeDef* node_;
   const CodeDef* code_;
   const NodeExecStats* step_stat_;
 
   std::vector<int64> shape_;
   std::set<string> op_types_;
-  string device_;
-  int64 op_start_micros_;
-  int64 op_schedule_micros_;
-  int64 kernel_compute_micros_;
-  int64 all_spent_micros_;
+
+  // device -> vector of {op_start_micros, op_kernel_exec_micros} pairs.
+  std::map<string, std::vector<std::pair<int64, int64>>> op_kernel_execs_;
+
+  std::set<string> devices_;
   int64 requested_bytes_;
   int64 float_ops_;
 };
@@ -128,7 +139,7 @@ class TFCodeNode {
  public:
   TFCodeNode(const string& trace)
       : trace_(trace),
-        kernel_compute_micros_(0),
+        kernel_exec_micros_(0),
         requested_bytes_(0),
         float_ops_(0) {}
 
@@ -138,16 +149,15 @@ class TFCodeNode {
     }
     nodes_[node->name()] = node;
 
-    kernel_compute_micros_ += node->kernel_compute_micros();
+    kernel_exec_micros_ += node->kernel_exec_micros();
     requested_bytes_ += node->requested_bytes();
     float_ops_ += node->float_ops();
     op_types_.insert(node->op_types().begin(), node->op_types().end());
     if (node->shape().size() > 0) {
       shapes_.push_back(node->shape());
     }
-    if (!node->device().empty()) {
-      devices_.insert(node->device());
-    }
+    std::set<string> devices = node->devices();
+    devices_.insert(devices.begin(), devices.end());
   }
   const std::map<string, const TFGraphNode*>& graph_nodes() const {
     return nodes_;
@@ -165,7 +175,7 @@ class TFCodeNode {
 
   const string& name() const { return trace_; }
 
-  int64 kernel_compute_micros() const { return kernel_compute_micros_; }
+  int64 kernel_exec_micros() const { return kernel_exec_micros_; }
 
   int64 requested_bytes() const { return requested_bytes_; }
 
@@ -180,7 +190,7 @@ class TFCodeNode {
  private:
   const string trace_;
   std::set<string> op_types_;
-  int64 kernel_compute_micros_;
+  int64 kernel_exec_micros_;
   int64 requested_bytes_;
   int64 float_ops_;
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node_show.cc b/tensorflow/tools/tfprof/internal/tfprof_node_show.cc
new file mode 100644
index 0000000000..2b5390676d
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_node_show.cc
@@ -0,0 +1,296 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
+
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/stringprintf.h"
+
+namespace tensorflow {
+namespace tfprof {
+ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
+  ReInit();
+}
+
+void ShowNode::ReInit() {
+  mutable_proto()->set_name(name());
+  for (const string& device : node->devices()) {
+    *mutable_proto()->mutable_devices()->Add() = device;
+  }
+  mutable_proto()->set_exec_micros(node->kernel_exec_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shape().empty()) {
+    int64 params = 1;
+    bool complete_shape = true;
+    for (int64 d : node->shape()) {
+      // Sometimes parameters could be <0 when a dim is unknown.
+      if (d < 0) {
+        complete_shape = false;
+        break;
+      }
+      params *= d;
+    }
+    if (complete_shape) {
+      mutable_proto()->set_parameters(proto_.parameters() + params);
+    } else {
+      fprintf(stderr, "Incomplete shape.");
+    }
+  }
+}
+
+string ShowNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    const string shape = FormatShapes(node->shape());
+    if (!shape.empty()) {
+      info.push_back(shape);
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (proto().devices_size() > 0) {
+      info.push_back(str_util::Join(proto().devices(), "|"));
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    if (proto().devices_size() > 0) {
+      op_types.insert(str_util::Join(proto().devices(), "|"));
+    }
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
+
+const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
+
+void ShowNode::AggregateTotalStats(ShowNode* node) {
+  TFGraphNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
+
+ShowCodeNode::ShowCodeNode(const TFCodeNode* node) : node(node), account(true) {
+  std::vector<ScopeNode> snodes;
+  for (auto it : node->graph_nodes()) {
+    ScopeNode snode(it.second);
+    snodes.push_back(snode);
+    snodes[snodes.size() - 1].AddSelfToTotalStats();
+    *mutable_proto()->mutable_graph_nodes()->Add() =
+        snodes[snodes.size() - 1].proto();
+  }
+
+  mutable_proto()->set_name(name());
+  mutable_proto()->set_exec_micros(node->kernel_exec_micros());
+  mutable_proto()->set_requested_bytes(node->requested_bytes());
+  mutable_proto()->set_float_ops(node->float_ops());
+
+  if (!node->shapes().empty()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      int64 params = 1;
+      bool complete_shape = true;
+      for (int64 d : shape) {
+        // Sometimes parameters could be <0 when a dim is unknown.
+        if (d < 0) {
+          complete_shape = false;
+          break;
+        }
+        params *= d;
+      }
+      if (complete_shape) {
+        mutable_proto()->set_parameters(proto().parameters() + params);
+      } else {
+        fprintf(stderr, "Incomplete shape.");
+      }
+    }
+  }
+}
+
+string ShowCodeNode::Format(const Options& opts) {
+  if (opts.select.empty()) {
+    return name();
+  }
+  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
+}
+
+string ShowCodeNode::FormatMeta(const Options& opts) {
+  std::vector<string> info;
+  std::vector<string> shapes;
+  if (opts.select.find(kShown[2]) != opts.select.end()) {
+    for (const std::vector<int64>& shape : node->shapes()) {
+      if (!shape.empty()) {
+        shapes.push_back(FormatShapes(shape));
+      }
+    }
+    if (!shapes.empty()) {
+      info.push_back(str_util::Join(shapes, "|"));
+    }
+    string params = FormatNumber(proto().total_parameters()) + " params";
+    if (account) {
+      params = FormatNumber(proto().parameters()) + "/" + params;
+    } else {
+      params = "--/" + params;
+    }
+    info.push_back(params);
+  }
+  if (opts.select.find(kShown[3]) != opts.select.end()) {
+    string fops = FormatNumber(proto().total_float_ops()) + " flops";
+    if (account) {
+      fops = FormatNumber(proto().float_ops()) + "/" + fops;
+    } else {
+      fops = "--/" + fops;
+    }
+    info.push_back(fops);
+  }
+  if (opts.select.find(kShown[0]) != opts.select.end()) {
+    string memory = FormatMemory(proto().total_requested_bytes());
+    if (account) {
+      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
+
+    } else {
+      memory = "--/" + memory;
+    }
+    info.push_back(memory);
+  }
+  if (opts.select.find(kShown[1]) != opts.select.end()) {
+    string time = FormatTime(proto().total_exec_micros());
+    if (account) {
+      time = FormatTime(proto().exec_micros()) + "/" + time;
+    } else {
+      time = "--/" + time;
+    }
+    info.push_back(time);
+  }
+  if (opts.select.find(kShown[6]) != opts.select.end()) {
+    if (!node->devices().empty()) {
+      info.push_back(str_util::Join(node->devices(), "|"));
+    }
+  }
+  if (opts.select.find(kShown[7]) != opts.select.end()) {
+    std::set<string> op_types = node->op_types();
+    // Device is considered a type.
+    op_types.insert(node->devices().cbegin(), node->devices().cend());
+    info.push_back(str_util::Join(op_types, "|"));
+  }
+  return str_util::Join(info, ", ");
+}
+
+TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
+
+const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
+
+void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
+  TFCodeNodeProto* node_pb = node->mutable_proto();
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         node_pb->total_exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             node_pb->total_requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        node_pb->total_parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       node_pb->total_float_ops());
+}
+
+void ShowCodeNode::AddSelfToTotalStats() {
+  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
+                                         proto().exec_micros());
+  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
+                                             proto().requested_bytes());
+  mutable_proto()->set_total_parameters(proto().total_parameters() +
+                                        proto().parameters());
+  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
+                                       proto().float_ops());
+}
+
+void ShowCodeNode::ResetTotalStats() {
+  mutable_proto()->set_total_exec_micros(0);
+  mutable_proto()->set_total_requested_bytes(0);
+  mutable_proto()->set_total_parameters(0);
+  mutable_proto()->set_total_float_ops(0);
+  mutable_proto()->mutable_children()->Clear();
+}
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_node_show.h b/tensorflow/tools/tfprof/internal/tfprof_node_show.h
new file mode 100644
index 0000000000..4ce0f63f9b
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_node_show.h
@@ -0,0 +1,173 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Nodes used for different views.
+// ScopeNode is for scope view. GraphNode is for graph view and CodeNode
+// is for code view.
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+class ShowNode {
+ public:
+  explicit ShowNode(const TFGraphNode* node);
+  virtual ~ShowNode() {}
+
+  const string& name() const { return node->name(); }
+  TFGraphNodeProto* mutable_proto();
+  const TFGraphNodeProto& proto() const;
+
+  void ReInit();
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFGraphNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFGraphNodeProto proto_;
+};
+
+class GraphNode : public ShowNode {
+ public:
+  explicit GraphNode(TFGraphNode* node) : ShowNode(node) {
+    mutable_proto()->set_inputs(node->inputs().size());
+    mutable_proto()->set_total_inputs(0);
+  }
+
+  void ReInit() {
+    ShowNode::ReInit();
+    mutable_proto()->set_inputs(node->inputs().size());
+    mutable_proto()->set_total_inputs(0);
+  }
+
+  void AggregateTotalStats(GraphNode* node) {
+    ShowNode::AggregateTotalStats(node);
+    mutable_proto()->set_total_inputs(proto().total_inputs() +
+                                      node->proto().total_inputs() + 1);
+  }
+
+  void AddSelfToTotalStats() {
+    ShowNode::AddSelfToTotalStats();
+    mutable_proto()->set_total_inputs(proto().total_inputs() +
+                                      proto().inputs());
+  }
+
+  void ResetTotalStats() {
+    ShowNode::ResetTotalStats();
+    mutable_proto()->set_total_inputs(0);
+    show_children.clear();
+  }
+
+  std::vector<GraphNode*> children;
+  std::vector<GraphNode*> show_children;
+};
+
+class ScopeNode : public ShowNode {
+ public:
+  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
+  ~ScopeNode() override {}
+
+  void ReInit() { ShowNode::ReInit(); }
+
+  void AggregateTotalStats(ScopeNode* node) {
+    ShowNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() {
+    ShowNode::ResetTotalStats();
+    show_children.clear();
+  }
+
+  std::vector<ScopeNode*> children;
+  std::vector<ScopeNode*> show_children;
+};
+
+class ShowCodeNode {
+ public:
+  explicit ShowCodeNode(const TFCodeNode* node);
+  virtual ~ShowCodeNode() {}
+
+  const string& name() const { return node->name(); }
+  TFCodeNodeProto* mutable_proto();
+  const TFCodeNodeProto& proto() const;
+
+  string Format(const Options& opts);
+
+  string FormatMeta(const Options& opts);
+
+  const TFCodeNode* node;
+  bool account;
+  string formatted_str;
+
+ protected:
+  void AggregateTotalStats(ShowCodeNode* node);
+
+  void AddSelfToTotalStats();
+
+  void ResetTotalStats();
+
+  TFCodeNodeProto proto_;
+};
+
+class CodeNode : public ShowCodeNode {
+ public:
+  explicit CodeNode(const TFCodeNode* node) : ShowCodeNode(node) {}
+  ~CodeNode() override {}
+
+  void AggregateTotalStats(CodeNode* node) {
+    ShowCodeNode::AggregateTotalStats(node);
+  }
+
+  void AddSelfToTotalStats() { ShowCodeNode::AddSelfToTotalStats(); }
+
+  void ResetTotalStats() {
+    ShowCodeNode::ResetTotalStats();
+    show_children.clear();
+  }
+
+  std::vector<CodeNode*> children;
+  std::vector<CodeNode*> show_children;
+};
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_NODE_SHOW_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.cc b/tensorflow/tools/tfprof/internal/tfprof_options.cc
index 03282533ff..f592a4cf8c 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.cc
@@ -17,16 +17,133 @@ limitations under the License.
 
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/tfprof_options.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
+namespace {
+string KeyValueToStr(const std::map<string, string>& kv_map) {
+  std::vector<string> kv_vec;
+  kv_vec.reserve(kv_map.size());
+  for (const auto& pair : kv_map) {
+    kv_vec.push_back(strings::StrCat(pair.first, "=", pair.second));
+  }
+  return str_util::Join(kv_vec, ",");
+}
+}  // namespace
+
+tensorflow::Status ParseOutput(const string& output_opt, string* output_type,
+                               std::map<string, string>* output_options) {
+  // The default is to use stdout.
+  if (output_opt.empty()) {
+    *output_type = kOutput[1];
+    return tensorflow::Status::OK();
+  }
+
+  std::set<string> output_types(kOutput,
+                                kOutput + sizeof(kOutput) / sizeof(*kOutput));
+  auto opt_split = output_opt.find(":");
+  std::vector<string> kv_split;
+  if (opt_split == output_opt.npos) {
+    if (output_types.find(output_opt) == output_types.end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("E.g. Unknown output type: %s, Valid types: %s\n",
+                          output_opt.c_str(),
+                          str_util::Join(output_types, ",").c_str()));
+    }
+    *output_type = output_opt;
+  } else {
+    *output_type = output_opt.substr(0, opt_split);
+    if (output_types.find(*output_type) == output_types.end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("E.g. Unknown output type: %s, Valid types: %s\n",
+                          output_type->c_str(),
+                          str_util::Join(output_types, ",").c_str()));
+    }
+    kv_split = str_util::Split(output_opt.substr(opt_split + 1), ",",
+                               str_util::SkipEmpty());
+  }
 
-Options Options::FromProtoStr(const string& opts_proto_str) {
+  std::set<string> valid_options;
+  std::set<string> required_options;
+  if (*output_type == kOutput[0]) {
+    valid_options.insert(
+        kTimelineOpts,
+        kTimelineOpts + sizeof(kTimelineOpts) / sizeof(*kTimelineOpts));
+    required_options.insert(
+        kTimelineRequiredOpts,
+        kTimelineRequiredOpts +
+            sizeof(kTimelineRequiredOpts) / sizeof(*kTimelineRequiredOpts));
+  } else if (*output_type == kOutput[2]) {
+    valid_options.insert(kFileOpts,
+                         kFileOpts + sizeof(kFileOpts) / sizeof(*kFileOpts));
+    required_options.insert(kFileRequiredOpts,
+                            kFileRequiredOpts + sizeof(kFileRequiredOpts) /
+                                                    sizeof(*kFileRequiredOpts));
+  }
+
+  for (const string& kv_str : kv_split) {
+    const std::vector<string> kv =
+        str_util::Split(kv_str, "=", str_util::SkipEmpty());
+    if (kv.size() != 2) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          "Visualize format: -output timeline:key=value,key=value,...");
+    }
+    if (valid_options.find(kv[0]) == valid_options.end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("Unrecognized options %s for output_type: %s\n",
+                          kv[0].c_str(), output_type->c_str()));
+    }
+    (*output_options)[kv[0]] = kv[1];
+  }
+
+  for (const string& opt : required_options) {
+    if (output_options->find(opt) == output_options->end()) {
+      return tensorflow::Status(
+          tensorflow::error::INVALID_ARGUMENT,
+          strings::Printf("Missing required output_options for %s\n"
+                          "E.g. -output %s:%s=...\n",
+                          output_type->c_str(), output_type->c_str(),
+                          opt.c_str()));
+    }
+  }
+  return tensorflow::Status::OK();
+}
+
+tensorflow::Status Options::FromProtoStr(const string& opts_proto_str,
+                                         Options* opts) {
   OptionsProto opts_pb;
-  CHECK(opts_pb.ParseFromString(opts_proto_str));
-  Options opts(
+  if (!opts_pb.ParseFromString(opts_proto_str)) {
+    return tensorflow::Status(
+        tensorflow::error::INTERNAL,
+        strings::StrCat("Failed to parse option string from Python API: ",
+                        opts_proto_str));
+  }
+
+  string output_type;
+  std::map<string, string> output_options;
+  tensorflow::Status s =
+      ParseOutput(opts_pb.output(), &output_type, &output_options);
+  if (!s.ok()) return s;
+
+  if (!opts_pb.dump_to_file().empty()) {
+    fprintf(stderr,
+            "-dump_to_file option is deprecated. "
+            "Please use -output file:outfile=<filename>\n");
+    fprintf(stderr, "-output %s is overwritten with -output file:outfile=%s\n",
+            opts_pb.output().c_str(), opts_pb.dump_to_file().c_str());
+    output_type = kOutput[2];
+    output_options.clear();
+    output_options[kFileOpts[0]] = opts_pb.dump_to_file();
+  }
+
+  *opts = Options(
       opts_pb.max_depth(), opts_pb.min_bytes(), opts_pb.min_micros(),
       opts_pb.min_params(), opts_pb.min_float_ops(),
       std::vector<string>(opts_pb.device_regexes().begin(),
@@ -44,8 +161,8 @@ Options Options::FromProtoStr(const string& opts_proto_str) {
                           opts_pb.hide_name_regexes().end()),
       opts_pb.account_displayed_op_only(),
       std::vector<string>(opts_pb.select().begin(), opts_pb.select().end()),
-      opts_pb.viz(), opts_pb.dump_to_file());
-  return opts;
+      output_type, output_options);
+  return tensorflow::Status::OK();
 }
 
 string Options::ToString() const {
@@ -64,8 +181,7 @@ string Options::ToString() const {
       "%-28s%s\n"
       "%-28s%s\n"
       "%-28s%s\n"
-      "%-28s%s\n"
-      "%-28s%s\n",
+      "%-28s%s:%s\n",
       kOptions[0], max_depth, kOptions[1], min_bytes, kOptions[2], min_micros,
       kOptions[3], min_params, kOptions[4], min_float_ops, kOptions[5],
       str_util::Join(device_regexes, ",").c_str(), kOptions[6],
@@ -76,8 +192,8 @@ string Options::ToString() const {
       str_util::Join(show_name_regexes, ",").c_str(), kOptions[11],
       str_util::Join(hide_name_regexes, ",").c_str(), kOptions[12],
       (account_displayed_op_only ? "true" : "false"), kOptions[13],
-      str_util::Join(select, ",").c_str(), kOptions[14],
-      (viz ? "true" : "false"), kOptions[15], dump_to_file.c_str());
+      str_util::Join(select, ",").c_str(), kOptions[14], output_type.c_str(),
+      KeyValueToStr(output_options).c_str());
   return s;
 }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_options.h b/tensorflow/tools/tfprof/internal/tfprof_options.h
index 0a9f2768e0..cf48b4de81 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_options.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_options.h
@@ -22,6 +22,7 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/status.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -40,8 +41,7 @@ static const char* const kOptions[] = {
     "-hide_name_regexes",
     "-account_displayed_op_only",
     "-select",
-    "-viz",
-    "-dump_to_file",
+    "-output",
 };
 
 static const char* const kOrderBy[] = {
@@ -58,11 +58,30 @@ static const char* const kCmds[] = {
     "scope", "graph", "code", "set", "help",
 };
 
+static const char* const kOutput[] = {"timeline", "stdout", "file"};
+
+static const char* const kTimelineOpts[] = {
+    "outfile",
+};
+
+static const char* const kTimelineRequiredOpts[] = {"outfile"};
+
+static const char* const kFileOpts[] = {
+    "outfile",
+};
+
+static const char* const kFileRequiredOpts[] = {
+    "outfile",
+};
+
 struct Options {
  public:
-  static Options FromProtoStr(const string& opts_proto_str);
+  static tensorflow::Status FromProtoStr(const string& opts_proto_str,
+                                         Options* opts);
 
   virtual ~Options() {}
+  Options()
+      : Options(0, 0, 0, 0, 0, {}, "", {}, {}, {}, {}, {}, false, {}, "", {}) {}
   Options(int max_depth, tensorflow::int64 min_bytes,
           tensorflow::int64 min_micros, tensorflow::int64 min_params,
           tensorflow::int64 min_float_ops,
@@ -73,7 +92,8 @@ struct Options {
           const std::vector<string>& show_name_regexes,
           const std::vector<string>& hide_name_regexes,
           bool account_displayed_op_only, const std::vector<string>& select,
-          bool viz, const string& dump_to_file = "")
+          const string& output_type,
+          const std::map<string, string>& output_options)
       : max_depth(max_depth),
         min_bytes(min_bytes),
         min_micros(min_micros),
@@ -88,8 +108,8 @@ struct Options {
         hide_name_regexes(hide_name_regexes),
         account_displayed_op_only(account_displayed_op_only),
         select(select.begin(), select.end()),
-        viz(viz),
-        dump_to_file(dump_to_file) {}
+        output_type(output_type),
+        output_options(output_options) {}
 
   string ToString() const;
 
@@ -109,10 +129,17 @@ struct Options {
   bool account_displayed_op_only;
 
   std::set<string> select;
-  bool viz;
-  string dump_to_file;
+
+  string output_type;
+  std::map<string, string> output_options;
 };
 
+// Parse the -output option.
+// 'output_opt': User input string with format: output_type:key=value,key=value.
+// 'output_type' and 'output_options' are extracted from 'output_opt'.
+tensorflow::Status ParseOutput(const string& output_opt, string* output_type,
+                               std::map<string, string>* output_options);
+
 }  // namespace tfprof
 }  // namespace tensorflow
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.cc b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
index b4aef717c8..fe525c4bd8 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.cc
@@ -72,7 +72,7 @@ void TFScope::Build() {
   }
 }
 
-const ShowNode* TFScope::ShowInternal(const Options& opts) {
+const ShowNode* TFScope::ShowInternal(const Options& opts, Timeline* timeline) {
   // Search from roots recursively to find start node, if start_name_regexes
   // is specified.
   std::vector<ScopeNode*> roots = roots_;
@@ -86,6 +86,9 @@ const ShowNode* TFScope::ShowInternal(const Options& opts) {
   Account({root}, opts);
 
   root = PrintScope({root}, opts, 1, 0)[0];
+  if (timeline) {
+    timeline->GenerateScopeTimeline(root);
+  }
   return root;
 }
 
@@ -139,8 +142,13 @@ std::vector<ScopeNode*> TFScope::PrintScope(const std::vector<ScopeNode*> roots,
       show_cnodes = SortNodes(show_cnodes, opts);
       string children_str;
       for (ScopeNode* sc : show_cnodes) {
-        children_str += sc->formatted_str;
+        if (opts.output_type == kOutput[1] || opts.output_type == kOutput[2]) {
+          children_str += sc->formatted_str;
+          sc->formatted_str.clear();
+        }
         node->mutable_proto()->add_children()->MergeFrom(sc->proto());
+        sc->mutable_proto()->mutable_children()->Clear();
+        node->show_children.push_back(sc);
         if (opts.account_displayed_op_only) {
           node->AggregateTotalStats(sc);
         }
diff --git a/tensorflow/tools/tfprof/internal/tfprof_scope.h b/tensorflow/tools/tfprof/internal/tfprof_scope.h
index 2e2e4f5266..7bdcc794cd 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_scope.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_scope.h
@@ -37,22 +37,6 @@ limitations under the License.
 namespace tensorflow {
 namespace tfprof {
 
-class ScopeNode : public ShowNode {
- public:
-  explicit ScopeNode(const TFGraphNode* node) : ShowNode(node) {}
-  ~ScopeNode() override {}
-
-  void AggregateTotalStats(ScopeNode* node) {
-    ShowNode::AggregateTotalStats(node);
-  }
-
-  void AddSelfToTotalStats() { ShowNode::AddSelfToTotalStats(); }
-
-  void ResetTotalStats() { ShowNode::ResetTotalStats(); }
-
-  std::vector<ScopeNode*> children;
-};
-
 class TFScope : public TFShow {
  public:
   explicit TFScope(checkpoint::CheckpointReader* ckpt_reader)
@@ -64,7 +48,8 @@ class TFScope : public TFShow {
   void Build() override;
 
  private:
-  const ShowNode* ShowInternal(const Options& opts) override;
+  const ShowNode* ShowInternal(const Options& opts,
+                               Timeline* timeline) override;
 
   ScopeNode* CreateParentNode(const string& name);
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.cc b/tensorflow/tools/tfprof/internal/tfprof_show.cc
index 932dfb3893..b96db5468e 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.cc
@@ -18,155 +18,32 @@ limitations under the License.
 #include <memory>
 #include <set>
 
-#include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/regexp.h"
 
 namespace tensorflow {
 namespace tfprof {
-ShowNode::ShowNode(const TFGraphNode* node) : node(node), account(true) {
-  mutable_proto()->set_name(name());
-  if (!node->device().empty()) {
-    mutable_proto()->set_device(node->device());
-  }
-  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
-  mutable_proto()->set_float_ops(node->float_ops());
-
-  if (!node->shape().empty()) {
-    int64 params = 1;
-    bool complete_shape = true;
-    for (int64 d : node->shape()) {
-      // Sometimes parameters could be <0 when a dim is unknown.
-      if (d < 0) {
-        complete_shape = false;
-        break;
-      }
-      params *= d;
-    }
-    if (complete_shape) {
-      mutable_proto()->set_parameters(proto_.parameters() + params);
-    } else {
-      fprintf(stderr, "Incomplete shape.");
-    }
-  }
-}
-
-string ShowNode::Format(const Options& opts) {
-  if (opts.select.empty()) {
-    return name();
-  }
-  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
-}
-
-string ShowNode::FormatMeta(const Options& opts) {
-  std::vector<string> info;
-  if (opts.select.find(kShown[2]) != opts.select.end()) {
-    const string shape = FormatShapes(node->shape());
-    if (!shape.empty()) {
-      info.push_back(shape);
-    }
-    string params = FormatNumber(proto().total_parameters()) + " params";
-    if (account) {
-      params = FormatNumber(proto().parameters()) + "/" + params;
-    } else {
-      params = "--/" + params;
-    }
-    info.push_back(params);
-  }
-  if (opts.select.find(kShown[3]) != opts.select.end()) {
-    string fops = FormatNumber(proto().total_float_ops()) + " flops";
-    if (account) {
-      fops = FormatNumber(proto().float_ops()) + "/" + fops;
-    } else {
-      fops = "--/" + fops;
-    }
-    info.push_back(fops);
-  }
-  if (opts.select.find(kShown[0]) != opts.select.end()) {
-    string memory = FormatMemory(proto().total_requested_bytes());
-    if (account) {
-      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
-
-    } else {
-      memory = "--/" + memory;
-    }
-    info.push_back(memory);
-  }
-  if (opts.select.find(kShown[1]) != opts.select.end()) {
-    string time = FormatTime(proto().total_exec_micros());
-    if (account) {
-      time = FormatTime(proto().exec_micros()) + "/" + time;
-    } else {
-      time = "--/" + time;
-    }
-    info.push_back(time);
-  }
-  if (opts.select.find(kShown[6]) != opts.select.end()) {
-    if (!proto().device().empty()) {
-      info.push_back(proto().device());
-    }
-  }
-  if (opts.select.find(kShown[7]) != opts.select.end()) {
-    std::set<string> op_types = node->op_types();
-    // Device is considered a type.
-    if (!proto().device().empty()) {
-      op_types.insert(proto().device());
-    }
-    info.push_back(str_util::Join(op_types, "|"));
-  }
-  return str_util::Join(info, ", ");
-}
-
-TFGraphNodeProto* ShowNode::mutable_proto() { return &proto_; }
-
-const TFGraphNodeProto& ShowNode::proto() const { return proto_; }
-
-void ShowNode::AggregateTotalStats(ShowNode* node) {
-  TFGraphNodeProto* node_pb = node->mutable_proto();
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         node_pb->total_exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             node_pb->total_requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        node_pb->total_parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       node_pb->total_float_ops());
-}
-
-void ShowNode::AddSelfToTotalStats() {
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         proto().exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             proto().requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        proto().parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       proto().float_ops());
-}
-
-void ShowNode::ResetTotalStats() {
-  mutable_proto()->set_total_exec_micros(0);
-  mutable_proto()->set_total_requested_bytes(0);
-  mutable_proto()->set_total_parameters(0);
-  mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
-}
 
 const TFGraphNodeProto& TFShow::Show(const Options& opts) {
-  const ShowNode* root = ShowInternal(opts);
-  if (opts.dump_to_file.empty()) {
-    printf("%s", root->formatted_str.c_str());
-    fflush(stdout);
-  } else {
-    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
-                                 root->formatted_str);
+  if (opts.output_type == kOutput[0]) {
+    Timeline timeline(opts.output_options.at(kTimelineOpts[0]));
+    return ShowInternal(opts, &timeline)->proto();
+  } else if (opts.output_type == kOutput[2]) {
+    const ShowNode* root = ShowInternal(opts, nullptr);
+    Status s =
+        WriteStringToFile(Env::Default(), opts.output_options.at(kFileOpts[0]),
+                          root->formatted_str);
     if (!s.ok()) {
       fprintf(stderr, "%s\n", s.ToString().c_str());
     }
+    return root->proto();
+  } else {
+    const ShowNode* root = ShowInternal(opts, nullptr);
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+    return root->proto();
   }
-  return root->proto();
 }
 
 bool TFShow::LookUpCheckPoint(const string& name,
@@ -206,10 +83,13 @@ bool TFShow::ShouldShow(ShowNode* node, const Options& opts, int depth) {
     show = true;
   } else {
     for (const string& regex : opts.device_regexes) {
-      if (RE2::FullMatch(node->proto().device(), regex)) {
-        show = true;
-        break;
+      for (const string& device : node->proto().devices()) {
+        if (RE2::FullMatch(device, regex)) {
+          show = true;
+          break;
+        }
       }
+      if (show) break;
     }
   }
   // Don't show if device_regexes don't cover it.
@@ -255,11 +135,11 @@ bool TFShow::ShouldAccount(ShowNode* node, const Options& opts) {
         return true;
       }
     }
-    if (RE2::FullMatch(node->proto().device(), regex)) {
-      return true;
-    }
+    for (const string& device : node->proto().devices())
+      if (RE2::FullMatch(device, regex)) {
+        return true;
+      }
   }
-
   return false;
 }
 
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show.h b/tensorflow/tools/tfprof/internal/tfprof_show.h
index 5e85b81a72..803b301044 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show.h
@@ -28,40 +28,15 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
-class ShowNode {
- public:
-  explicit ShowNode(const TFGraphNode* node);
-  virtual ~ShowNode() {}
-
-  const string& name() const { return node->name(); }
-  TFGraphNodeProto* mutable_proto();
-  const TFGraphNodeProto& proto() const;
-
-  string Format(const Options& opts);
-
-  string FormatMeta(const Options& opts);
-
-  const TFGraphNode* node;
-  bool account;
-  string formatted_str;
-
- protected:
-  void AggregateTotalStats(ShowNode* node);
-
-  void AddSelfToTotalStats();
-
-  void ResetTotalStats();
-
-  TFGraphNodeProto proto_;
-};
-
 class TFShow {
  public:
   explicit TFShow(checkpoint::CheckpointReader* ckpt_reader)
@@ -72,7 +47,8 @@ class TFShow {
   const TFGraphNodeProto& Show(const Options& opts);
 
  protected:
-  virtual const ShowNode* ShowInternal(const Options& opts) = 0;
+  virtual const ShowNode* ShowInternal(const Options& opts,
+                                       Timeline* timeline) = 0;
 
   bool LookUpCheckPoint(const string& name,
                         std::unique_ptr<TFProfTensor>* tensor);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
index 17c0073c7e..cfec09ad19 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.cc
@@ -26,159 +26,26 @@ limitations under the License.
 
 namespace tensorflow {
 namespace tfprof {
-ShowCodeNode::ShowCodeNode(const TFCodeNode* node) : node(node), account(true) {
-  std::vector<ScopeNode> snodes;
-  for (auto it : node->graph_nodes()) {
-    ScopeNode snode(it.second);
-    snodes.push_back(snode);
-    snodes[snodes.size() - 1].AddSelfToTotalStats();
-    *mutable_proto()->mutable_graph_nodes()->Add() =
-        snodes[snodes.size() - 1].proto();
-  }
-
-  mutable_proto()->set_name(name());
-  mutable_proto()->set_exec_micros(node->kernel_compute_micros());
-  mutable_proto()->set_requested_bytes(node->requested_bytes());
-  mutable_proto()->set_float_ops(node->float_ops());
-
-  if (!node->shapes().empty()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      int64 params = 1;
-      bool complete_shape = true;
-      for (int64 d : shape) {
-        // Sometimes parameters could be <0 when a dim is unknown.
-        if (d < 0) {
-          complete_shape = false;
-          break;
-        }
-        params *= d;
-      }
-      if (complete_shape) {
-        mutable_proto()->set_parameters(proto().parameters() + params);
-      } else {
-        fprintf(stderr, "Incomplete shape.");
-      }
-    }
-  }
-}
-
-string ShowCodeNode::Format(const Options& opts) {
-  if (opts.select.empty()) {
-    return name();
-  }
-  return strings::Printf("%s (%s)", name().c_str(), FormatMeta(opts).c_str());
-}
-
-string ShowCodeNode::FormatMeta(const Options& opts) {
-  std::vector<string> info;
-  std::vector<string> shapes;
-  if (opts.select.find(kShown[2]) != opts.select.end()) {
-    for (const std::vector<int64>& shape : node->shapes()) {
-      if (!shape.empty()) {
-        shapes.push_back(FormatShapes(shape));
-      }
-    }
-    if (!shapes.empty()) {
-      info.push_back(str_util::Join(shapes, "|"));
-    }
-    string params = FormatNumber(proto().total_parameters()) + " params";
-    if (account) {
-      params = FormatNumber(proto().parameters()) + "/" + params;
-    } else {
-      params = "--/" + params;
-    }
-    info.push_back(params);
-  }
-  if (opts.select.find(kShown[3]) != opts.select.end()) {
-    string fops = FormatNumber(proto().total_float_ops()) + " flops";
-    if (account) {
-      fops = FormatNumber(proto().float_ops()) + "/" + fops;
-    } else {
-      fops = "--/" + fops;
-    }
-    info.push_back(fops);
-  }
-  if (opts.select.find(kShown[0]) != opts.select.end()) {
-    string memory = FormatMemory(proto().total_requested_bytes());
-    if (account) {
-      memory = FormatMemory(proto().requested_bytes()) + "/" + memory;
-
-    } else {
-      memory = "--/" + memory;
-    }
-    info.push_back(memory);
-  }
-  if (opts.select.find(kShown[1]) != opts.select.end()) {
-    string time = FormatTime(proto().total_exec_micros());
-    if (account) {
-      time = FormatTime(proto().exec_micros()) + "/" + time;
-    } else {
-      time = "--/" + time;
-    }
-    info.push_back(time);
-  }
-  if (opts.select.find(kShown[6]) != opts.select.end()) {
-    if (!node->devices().empty()) {
-      info.push_back(str_util::Join(node->devices(), "|"));
-    }
-  }
-  if (opts.select.find(kShown[7]) != opts.select.end()) {
-    std::set<string> op_types = node->op_types();
-    // Device is considered a type.
-    op_types.insert(node->devices().cbegin(), node->devices().cend());
-    info.push_back(str_util::Join(op_types, "|"));
-  }
-  return str_util::Join(info, ", ");
-}
-
-TFCodeNodeProto* ShowCodeNode::mutable_proto() { return &proto_; }
-
-const TFCodeNodeProto& ShowCodeNode::proto() const { return proto_; }
-
-void ShowCodeNode::AggregateTotalStats(ShowCodeNode* node) {
-  TFCodeNodeProto* node_pb = node->mutable_proto();
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         node_pb->total_exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             node_pb->total_requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        node_pb->total_parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       node_pb->total_float_ops());
-}
-
-void ShowCodeNode::AddSelfToTotalStats() {
-  mutable_proto()->set_total_exec_micros(proto().total_exec_micros() +
-                                         proto().exec_micros());
-  mutable_proto()->set_total_requested_bytes(proto().total_requested_bytes() +
-                                             proto().requested_bytes());
-  mutable_proto()->set_total_parameters(proto().total_parameters() +
-                                        proto().parameters());
-  mutable_proto()->set_total_float_ops(proto().total_float_ops() +
-                                       proto().float_ops());
-}
-
-void ShowCodeNode::ResetTotalStats() {
-  mutable_proto()->set_total_exec_micros(0);
-  mutable_proto()->set_total_requested_bytes(0);
-  mutable_proto()->set_total_parameters(0);
-  mutable_proto()->set_total_float_ops(0);
-  mutable_proto()->mutable_children()->Clear();
-}
 
 const TFCodeNodeProto& TFShowCode::Show(const Options& opts) {
-  const ShowCodeNode* root = ShowInternal(opts);
-  if (opts.dump_to_file.empty()) {
-    printf("%s", root->formatted_str.c_str());
-    fflush(stdout);
-  } else {
-    Status s = WriteStringToFile(Env::Default(), opts.dump_to_file,
-                                 root->formatted_str);
+  if (opts.output_type == kOutput[0]) {
+    Timeline timeline(opts.output_options.at(kTimelineOpts[0]));
+    return ShowInternal(opts, &timeline)->proto();
+  } else if (opts.output_type == kOutput[2]) {
+    const ShowCodeNode* root = ShowInternal(opts, nullptr);
+    Status s =
+        WriteStringToFile(Env::Default(), opts.output_options.at(kFileOpts[0]),
+                          root->formatted_str);
     if (!s.ok()) {
       fprintf(stderr, "%s\n", s.ToString().c_str());
     }
+    return root->proto();
+  } else {
+    const ShowCodeNode* root = ShowInternal(opts, nullptr);
+    printf("%s", root->formatted_str.c_str());
+    fflush(stdout);
+    return root->proto();
   }
-  return root->proto();
 }
 
 bool TFShowCode::ShouldShow(ShowCodeNode* node, const Options& opts,
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_code.h b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
index afe0fa4473..cbfd38945f 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_code.h
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_code.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-// Parent class and utilities for tfprof_graph and tfprof_scope.
+// Parent class and utilities for tfprof_code.
 
 #ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
 #define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_SHOW_CODE_H_
@@ -28,39 +28,15 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_node.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_tensor.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
 #include "tensorflow/tools/tfprof/tfprof_output.pb.h"
 
 namespace tensorflow {
 namespace tfprof {
-class ShowCodeNode {
- public:
-  explicit ShowCodeNode(const TFCodeNode* node);
-  virtual ~ShowCodeNode() {}
-
-  const string& name() const { return node->name(); }
-  TFCodeNodeProto* mutable_proto();
-  const TFCodeNodeProto& proto() const;
-
-  string Format(const Options& opts);
-
-  string FormatMeta(const Options& opts);
-
-  const TFCodeNode* node;
-  bool account;
-  string formatted_str;
-
- protected:
-  void AggregateTotalStats(ShowCodeNode* node);
-
-  void AddSelfToTotalStats();
-
-  void ResetTotalStats();
-
-  TFCodeNodeProto proto_;
-};
 
 class TFShowCode {
  public:
@@ -71,7 +47,8 @@ class TFShowCode {
   const TFCodeNodeProto& Show(const Options& opts);
 
  protected:
-  virtual const ShowCodeNode* ShowInternal(const Options& opts) = 0;
+  virtual const ShowCodeNode* ShowInternal(const Options& opts,
+                                           Timeline* timeline) = 0;
 
   bool LookUpCheckPoint(const string& name,
                         std::unique_ptr<TFProfTensor>* tensor);
diff --git a/tensorflow/tools/tfprof/internal/tfprof_show_test.cc b/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
index ffaa576639..f0621c9af0 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_show_test.cc
@@ -75,7 +75,7 @@ TEST_F(TFProfShowTest, DumpScopeMode) {
                {"VariableV2"},  // accout_type_regexes
                {".*"}, {""}, {".*"}, {""}, false,
                {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               false, dump_file);
+               "file", {{"outfile", dump_file}});
   tf_stats_->PrintGraph("scope", opts);
 
   string dump_str;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats.cc b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
index 13ff6e7246..566b4cee44 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats.cc
@@ -19,6 +19,8 @@ limitations under the License.
 #include <utility>
 
 #include "tensorflow/core/framework/step_stats.pb.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
 
 namespace tensorflow {
 namespace tfprof {
@@ -92,10 +94,16 @@ void TFStats::ParseGraph() {
   for (auto it = nodes_map_.begin(); it != nodes_map_.end(); it++) {
     const NodeDef* node_def = it->second.node_def();
     for (string node_input : node_def->input()) {
+      int output_idx = 0;
       // input name format can be: "^node:src_output"
       auto prefix_pos = node_input.find(":");
       if (prefix_pos != node_input.npos) {
-        node_input.substr(0, prefix_pos);
+        std::vector<string> input_parts = str_util::Split(node_input, ":");
+        CHECK(input_parts.size() == 2)
+            << "Unknown NodeDef.input format: " << node_input;
+        node_input = input_parts[0];
+        CHECK(strings::safe_strto32(input_parts[1], &output_idx))
+            << "Failed to parse integer: " << output_idx;
       }
       if (node_input.substr(0, 1) == "^") {
         node_input = node_input.substr(1);
@@ -104,7 +112,7 @@ void TFStats::ParseGraph() {
       if (input_node == nodes_map_.end()) {
         continue;
       }
-      it->second.AddInput(&input_node->second);
+      it->second.AddInput(&input_node->second, output_idx);
     }
   }
 }
@@ -137,21 +145,6 @@ void TFStats::ParseRunMeta() {
       node->second.AddStepStat(dev_stat.device(), &node_stat);
     }
   }
-
-  if (!run_meta_->has_cost_graph()) {
-    fprintf(stderr,
-            "Missing CostGraphDef in RunMetadata.\nMaybe you forget to"
-            "set tf.ConfigProto(graph_options=tf.GraphOptions("
-            "build_cost_model=1)) to Session()\n");
-  } else {
-    for (const auto& node_pb : run_meta_->cost_graph().node()) {
-      auto node = nodes_map_.find(node_pb.name());
-      if (node == nodes_map_.end()) {
-        continue;
-      }
-      node->second.AddNodeStat(&node_pb);
-    }
-  }
 }
 }  // namespace tfprof
 }  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
index b913161f6a..eb01425e04 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_stats_test.cc
@@ -74,8 +74,8 @@ TEST_F(TFProfStatsTest, CustomOpType) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name",
                {kTrainableVarType},  // accout_type_regexes
                {".*"}, {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               false);
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "",
+               {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -84,20 +84,20 @@ TEST_F(TFProfStatsTest, CustomOpType) {
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
       "370\nchildren {\n  name: \"conv2d/bias\"\n  exec_micros: 1\n  "
       "requested_bytes: 20\n  parameters: 5\n  total_exec_micros: 1\n  "
-      "total_requested_bytes: 20\n  total_parameters: 5\n  device: "
+      "total_requested_bytes: 20\n  total_parameters: 5\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 0\n  "
       "total_float_ops: 0\n}\nchildren {\n  name: \"conv2d/kernel\"\n  "
       "exec_micros: 1\n  requested_bytes: 540\n  parameters: 135\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 540\n  total_parameters: "
-      "135\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "135\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/bias\"\n  "
       "exec_micros: 1\n  requested_bytes: 20\n  parameters: 5\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 20\n  total_parameters: "
-      "5\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "5\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/kernel\"\n  "
       "exec_micros: 2\n  requested_bytes: 900\n  parameters: 225\n  "
       "total_exec_micros: 2\n  total_requested_bytes: 900\n  total_parameters: "
-      "225\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "225\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nfloat_ops: 0\ntotal_float_ops: 0\n",
       &expected));
   EXPECT_EQ(expected.DebugString(), root.DebugString());
@@ -107,7 +107,7 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
   Options opts(
       3, 0, 0, 0, 0, {".*"}, "name", {kCkptVarType},  // accout_type_regexes
       {".*"}, {""}, {".*"}, {""}, false,
-      {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, false);
+      {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -116,20 +116,20 @@ TEST_F(TFProfStatsTest, CheckPointOpType) {
       "0\ntotal_exec_micros: 5\ntotal_requested_bytes: 1480\ntotal_parameters: "
       "370\nchildren {\n  name: \"conv2d/bias\"\n  exec_micros: 1\n  "
       "requested_bytes: 20\n  parameters: 5\n  total_exec_micros: 1\n  "
-      "total_requested_bytes: 20\n  total_parameters: 5\n  device: "
+      "total_requested_bytes: 20\n  total_parameters: 5\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 0\n  "
       "total_float_ops: 0\n}\nchildren {\n  name: \"conv2d/kernel\"\n  "
       "exec_micros: 1\n  requested_bytes: 540\n  parameters: 135\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 540\n  total_parameters: "
-      "135\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "135\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/bias\"\n  "
       "exec_micros: 1\n  requested_bytes: 20\n  parameters: 5\n  "
       "total_exec_micros: 1\n  total_requested_bytes: 20\n  total_parameters: "
-      "5\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "5\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nchildren {\n  name: \"conv2d_1/kernel\"\n  "
       "exec_micros: 2\n  requested_bytes: 900\n  parameters: 225\n  "
       "total_exec_micros: 2\n  total_requested_bytes: 900\n  total_parameters: "
-      "225\n  device: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
+      "225\n  devices: \"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: "
       "0\n  total_float_ops: 0\n}\nfloat_ops: 0\ntotal_float_ops: 0\n",
       &expected));
   EXPECT_EQ(expected.DebugString(), root.DebugString());
@@ -139,8 +139,8 @@ TEST_F(TFProfStatsTest, TestGraph) {
   Options opts(100, 0, 10000, 0, 0, {".*"}, "name", {".*"},
                {"cost.*"},  // start_name_regexes
                {""}, {".*"}, {""}, false,
-               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
-               false);
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"}, "",
+               {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("graph", opts);
 
   TFGraphNodeProto expected;
@@ -154,7 +154,7 @@ TEST_F(TFProfStatsTest, TestGraph) {
 
 TEST_F(TFProfStatsTest, TestFloatOps) {
   Options opts(10, 0, 0, 0, 1, {".*"}, "name", {".*"}, {".*"}, {""}, {".*"},
-               {""}, false, {"float_ops"}, false);
+               {""}, false, {"float_ops"}, "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -163,19 +163,19 @@ TEST_F(TFProfStatsTest, TestFloatOps) {
       "0\ntotal_exec_micros: 96\ntotal_requested_bytes: "
       "8656\ntotal_parameters: 370\nchildren {\n  name: \"conv2d/BiasAdd\"\n  "
       "exec_micros: 12\n  requested_bytes: 1440\n  total_exec_micros: 12\n  "
-      "total_requested_bytes: 1440\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 1440\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 360\n  "
       "total_float_ops: 360\n}\nchildren {\n  name: \"conv2d/convolution\"\n  "
       "exec_micros: 60\n  requested_bytes: 1440\n  total_exec_micros: 60\n  "
-      "total_requested_bytes: 1440\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 1440\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 19440\n  "
       "total_float_ops: 19440\n}\nchildren {\n  name: \"conv2d_2/BiasAdd\"\n  "
       "exec_micros: 2\n  requested_bytes: 640\n  total_exec_micros: 2\n  "
-      "total_requested_bytes: 640\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 640\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 160\n  "
       "total_float_ops: 160\n}\nchildren {\n  name: \"conv2d_2/convolution\"\n "
       " exec_micros: 13\n  requested_bytes: 640\n  total_exec_micros: 13\n  "
-      "total_requested_bytes: 640\n  total_parameters: 0\n  device: "
+      "total_requested_bytes: 640\n  total_parameters: 0\n  devices: "
       "\"/job:localhost/replica:0/task:0/cpu:0\"\n  float_ops: 14400\n  "
       "total_float_ops: 14400\n}\nfloat_ops: 0\ntotal_float_ops: 34360\n",
       &expected));
@@ -186,7 +186,7 @@ TEST_F(TFProfStatsTest, TestAccountShownNameOnly) {
   Options opts(100, 0, 0, 0, 0, {".*"}, "name", {".*"}, {".*"}, {""},
                {"unit_2_1.*DW"},  // show_name_regexes.
                {""}, true,        // account_displayed_op_only.
-               {"params"}, false);
+               {"params"}, "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
@@ -202,7 +202,7 @@ TEST_F(TFProfStatsTest, TestShowTensorValue) {
   Options opts(10, 0, 0, 0, 0, {".*"}, "name", {".*"}, {".*"}, {""},
                {"unit_1_0.*gamma"}, {""}, false,
                {"tensor_value"},  // Show tensor value from checkpoint.
-               false);
+               "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
   TFGraphNodeProto expected;
   CHECK(protobuf::TextFormat::ParseFromString(
diff --git a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
index 95759f9d47..79a781210d 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_tensor_test.cc
@@ -57,7 +57,7 @@ class TFProfTensorTest : public ::testing::Test {
 TEST_F(TFProfTensorTest, Basics) {
   Options opts(3, 0, 0, 0, 0, {".*"}, "name", {"VariableV2"}, {".*"}, {""},
                {".*"}, {""}, false, {"tensor_value"},  // show the tensor value.
-               false);
+               "", {});
   const TFGraphNodeProto& root = tf_stats_->PrintGraph("scope", opts);
 
   TFGraphNodeProto expected;
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline.cc b/tensorflow/tools/tfprof/internal/tfprof_timeline.cc
new file mode 100644
index 0000000000..a5640c0e56
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_timeline.cc
@@ -0,0 +1,245 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_timeline.h"
+
+#include <utility>
+
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+Json::Value ChromeTraceFormatter::CreateEvent(const string& ph,
+                                              const string& category,
+                                              const string& name, int64 pid,
+                                              int64 tid, int64 ts) {
+  Json::Value event(Json::objectValue);
+  event["ph"] = Json::Value(ph);
+  event["cat"] = Json::Value(category);
+  event["name"] = Json::Value(name);
+  event["pid"] = Json::Value(pid);
+  event["tid"] = Json::Value(tid);
+  event["ts"] = Json::Value(ts);
+  return event;
+}
+
+void ChromeTraceFormatter::EmitPID(const string& name, int64 pid) {
+  Json::Value event(Json::objectValue);
+  event["name"] = Json::Value("process_name");
+  event["ph"] = Json::Value("M");
+  event["pid"] = Json::Value(pid);
+  Json::Value args(Json::objectValue);
+  args["name"] = Json::Value(name);
+  event["args"] = args;
+  metadata_.push_back(event);
+}
+
+void ChromeTraceFormatter::EmitRegion(int64 ts, int64 duration, int64 pid,
+                                      int64 tid, const string& category,
+                                      const string& name, Json::Value args) {
+  Json::Value event = CreateEvent("X", category, name, pid, tid, ts);
+  event["dur"] = Json::Value(duration);
+  event["args"] = std::move(args);
+  metadata_.push_back(event);
+}
+
+void ChromeTraceFormatter::EmitFlowStart(const string& name, int64 ts,
+                                         int64 pid, int64 tid, int64 flow_id) {
+  Json::Value event = CreateEvent("s", "DataFlow", name, pid, tid, ts);
+  event["id"] = flow_id;
+  events_.push_back(event);
+}
+
+void ChromeTraceFormatter::EmitFlowEnd(const string& name, int64 ts, int64 pid,
+                                       int64 tid, int64 flow_id) {
+  Json::Value event = CreateEvent("t", "DataFlow", name, pid, tid, ts);
+  event["id"] = flow_id;
+  events_.push_back(event);
+}
+
+string ChromeTraceFormatter::Format() {
+  Json::Value trace;
+  trace["traceEvents"] = Json::Value(Json::arrayValue);
+  for (const Json::Value& v : metadata_) {
+    trace["traceEvents"].append(v);
+  }
+  for (const Json::Value& v : events_) {
+    trace["traceEvents"].append(v);
+  }
+  return trace.toStyledString();
+}
+
+void Timeline::GenerateGraphTimeline(const GraphNode* gnode) {
+  fprintf(stdout, "adding graph nodes.\n");
+  AddGraphNode(gnode);
+  AllocateLanes();
+  fprintf(stdout, "generating trace file.\n");
+  int64 flow_id = 1;
+  for (const auto& process : alloc_nodes_) {
+    for (const auto& lane : process.second) {
+      for (const auto& node : lane.second) {
+        TimeNode* tnode = node.second;
+
+        Json::Value args(Json::objectValue);
+        args["name"] = Json::Value(tnode->name);
+        args["op"] = Json::Value(tnode->name);
+        chrome_formatter_.EmitRegion(node.first, tnode->exec_micros,
+                                     process.first, lane.first, "Op",
+                                     tnode->name, args);
+
+        for (TimeNode* next_tnode : node.second->next_tnodes) {
+          chrome_formatter_.EmitFlowStart(
+              tnode->name + "_flow", tnode->start_micros + tnode->exec_micros,
+              process.first, lane.first, flow_id);
+          chrome_formatter_.EmitFlowEnd(
+              tnode->name + "_flow", next_tnode->start_micros,
+              next_tnode->process->pid, next_tnode->tid, flow_id);
+          flow_id += 1;
+        }
+      }
+    }
+  }
+  OutputTimeline();
+}
+
+void Timeline::GenerateScopeTimeline(const ScopeNode* node) {
+  std::set<int64> visited_depth;
+  EmitTreeNode(node, 0, node->proto().total_exec_micros(), 0, &visited_depth);
+  OutputTimeline();
+}
+
+void Timeline::GenerateCodeTimeline(const CodeNode* node) {
+  std::set<int64> visited_depth;
+  EmitTreeNode(node, 0, node->proto().total_exec_micros(), 0, &visited_depth);
+  OutputTimeline();
+}
+
+void Timeline::OutputTimeline() {
+  Status s =
+      WriteStringToFile(Env::Default(), outfile_, chrome_formatter_.Format());
+  if (!s.ok()) {
+    fprintf(stderr, "Failed to write timeline file: %s\nError: %s\n",
+            outfile_.c_str(), s.ToString().c_str());
+    return;
+  }
+  fprintf(stdout, "\n******************************************************\n");
+  fprintf(stdout,
+          "Timeline file is written to %s.\n"
+          "Open a Chrome browser, enter URL chrome://tracing and "
+          "load the timeline file.",
+          outfile_.c_str());
+  fprintf(stdout, "\n******************************************************\n");
+  fflush(stdout);
+}
+
+std::vector<TimeNode*> Timeline::AddGraphNode(const GraphNode* gnode) {
+  std::vector<TimeNode*> tnodes;
+  if (!gnode) return tnodes;
+
+  std::vector<TimeNode*> shown_cinputs;
+  for (GraphNode* schild : gnode->show_children) {
+    std::vector<TimeNode*> inputs = AddGraphNode(schild);
+    shown_cinputs.insert(shown_cinputs.end(), inputs.begin(), inputs.end());
+  }
+  if (!gnode->node->step_stats()) {
+    return shown_cinputs;
+  }
+
+  const TFGraphNode* node = gnode->node;
+  for (const auto& kernel_execs : node->op_kernel_execs()) {
+    const string& device = kernel_execs.first;
+    const std::vector<std::pair<int64, int64>>& execs = kernel_execs.second;
+
+    if (process_.find(device) == process_.end()) {
+      int64 pid = AllocatePID();
+      process_[device].reset(new Process(pid));
+      chrome_formatter_.EmitPID(device, pid);
+    }
+    Process* p = process_[device].get();
+
+    for (const auto& exec : execs) {
+      int64 start_micros = exec.first;
+      int64 exec_micros = exec.second;
+      // TODO(xpan): There might be start time duplication here.
+      if (tnodes_[device].find(start_micros) == tnodes_[device].end()) {
+        // TODO(xpan): Give each kernel call a unique_name.
+        tnodes_[device][start_micros].reset(
+            new TimeNode(p, node->name(), start_micros, exec_micros));
+      }
+      TimeNode* tnode_ptr = tnodes_[device][start_micros].get();
+
+      for (int i = 0; i < shown_cinputs.size(); i++) {
+        shown_cinputs[i]->next_tnodes.push_back(tnode_ptr);
+      }
+      tnodes.push_back(tnode_ptr);
+    }
+  }
+  return tnodes;
+}
+
+void Timeline::AllocateLanes() {
+  for (auto& process : tnodes_) {
+    Process* p = process_[process.first].get();
+    for (auto& tnode : process.second) {
+      int64 start_time = tnode.second->start_micros;
+      int64 end_time = tnode.second->exec_micros - 1;
+
+      int64 l = -1;
+      for (int i = 0; i < p->lanes.size(); ++i) {
+        const auto& lane = p->lanes[i];
+        auto cur_it = lane.lower_bound(start_time);
+        if (cur_it == lane.end()) {
+          --cur_it;
+        }
+        l = i;
+        for (; cur_it != lane.begin(); --cur_it) {
+          if (cur_it->second < start_time) {
+            break;
+          }
+          if (cur_it->first <= end_time) {
+            l = -1;
+            break;
+          }
+        }
+        if (l >= 0) {
+          break;
+        }
+      }
+      if (l < 0) {
+        l = p->lanes.size();
+        std::map<int64, int64> nlane;
+        nlane[start_time] = end_time;
+        p->lanes.push_back(nlane);
+      } else {
+        p->lanes[l][start_time] = end_time;
+      }
+      tnode.second->tid = l;
+      alloc_nodes_[p->pid][l][start_time] = tnode.second.get();
+    }
+  }
+}
+
+int64 Timeline::AllocatePID() {
+  int64 cur_pid = next_pid_;
+  next_pid_ += 1;
+  return cur_pid;
+}
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline.h b/tensorflow/tools/tfprof/internal/tfprof_timeline.h
new file mode 100644
index 0000000000..3d26874abd
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_timeline.h
@@ -0,0 +1,147 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
+#define THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
+
+#include "include/json/json.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/step_stats.pb.h"
+#include "tensorflow/core/protobuf/config.pb.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_node_show.h"
+
+namespace tensorflow {
+namespace tfprof {
+
+typedef std::map<string, string> Event;
+
+class ChromeTraceFormatter {
+ public:
+  ChromeTraceFormatter() {}
+
+  Json::Value CreateEvent(const string& ph, const string& category,
+                          const string& name, int64 pid, int64 tid, int64 ts);
+
+  void EmitPID(const string& name, int64 pid);
+
+  void EmitRegion(int64 ts, int64 duration, int64 pid, int64 tid,
+                  const string& category, const string& name, Json::Value args);
+
+  void EmitFlowStart(const string& name, int64 ts, int64 pid, int64 tid,
+                     int64 flow_id);
+
+  void EmitFlowEnd(const string& name, int64 ts, int64 pid, int64 tid,
+                   int64 flow_id);
+
+  string Format();
+
+ private:
+  std::vector<Json::Value> events_;
+  std::vector<Json::Value> metadata_;
+};
+
+class Process {
+ public:
+  Process(int64 pid) : pid(pid) {}
+
+  // Each lane is a map from start_time to end_time.
+  std::vector<std::map<int64, int64>> lanes;
+  int64 pid;
+};
+
+class TimeNode {
+ public:
+  TimeNode(Process* process, const string& name, int64 start_micros,
+           int64 exec_micros)
+      : process(process),
+        name(name),
+        start_micros(start_micros),
+        exec_micros(exec_micros),
+        tid(-1) {}
+  virtual ~TimeNode() {}
+
+  Process* process;
+  string name;
+  int64 start_micros;
+  int64 exec_micros;
+  int64 tid;
+  std::vector<TimeNode*> next_tnodes;
+};
+
+class Timeline {
+ public:
+  Timeline(const string& outfile) : outfile_(outfile) {}
+  ~Timeline() {}
+
+  void GenerateGraphTimeline(const GraphNode* gnode);
+
+  void GenerateScopeTimeline(const ScopeNode* node);
+
+  void GenerateCodeTimeline(const CodeNode* node);
+
+ private:
+  void OutputTimeline();
+
+  template <typename Node>
+  void EmitTreeNode(const Node* node, int64 start_time, int64 duration,
+                    int64 depth, std::set<int64>* visited_depth) {
+    if (visited_depth->find(depth) == visited_depth->end()) {
+      chrome_formatter_.EmitPID(strings::StrCat("Scope:", depth), depth);
+      visited_depth->insert(depth);
+    }
+
+    Json::Value args(Json::objectValue);
+    args["name"] = Json::Value(node->name());
+    args["op"] = Json::Value(node->name());
+    chrome_formatter_.EmitRegion(start_time, duration, depth, 0, "Op",
+                                 node->name(), args);
+
+    int64 total_micros = 0;
+    int64 c_start_time = start_time;
+    for (const Node* child : node->show_children) {
+      int64 total_exec_micros = child->proto().total_exec_micros();
+      if (total_exec_micros <= 0) {
+        continue;
+      }
+      EmitTreeNode(child, c_start_time, total_exec_micros, depth + 1,
+                   visited_depth);
+      c_start_time += total_exec_micros;
+      total_micros += total_exec_micros;
+    }
+    CHECK(total_micros <= duration) << node->name() << " parent:" << duration
+                                    << " children:" << total_micros;
+  }
+
+  std::vector<TimeNode*> AddGraphNode(const GraphNode* gnode);
+
+  void AllocateLanes();
+
+  int64 AllocatePID();
+
+  const string outfile_;
+  int64 next_pid_ = 0;
+  int64 allocator_pid_ = -1;
+  ChromeTraceFormatter chrome_formatter_;
+  std::map<string, int64> device_pids_;
+
+  std::map<string, std::unique_ptr<Process>> process_;
+  std::map<int64, std::map<int64, std::map<int64, TimeNode*>>> alloc_nodes_;
+  std::map<string, std::map<int64, std::unique_ptr<TimeNode>>> tnodes_;
+};
+
+}  // namespace tfprof
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_TOOLS_TFPROF_INTERNAL_TFPROF_TIMELINE_H_
diff --git a/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc b/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc
new file mode 100644
index 0000000000..2dfe6ab335
--- /dev/null
+++ b/tensorflow/tools/tfprof/internal/tfprof_timeline_test.cc
@@ -0,0 +1,92 @@
+/* Copyright 2016 The TensorFlow Authors All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/tools/tfprof/internal/tfprof_stats.h"
+
+#include <utility>
+
+#include "tensorflow/c/checkpoint_reader.h"
+#include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/lib/hash/hash.h"
+#include "tensorflow/core/lib/io/path.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/protobuf/config.pb.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_constants.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_options.h"
+#include "tensorflow/tools/tfprof/internal/tfprof_utils.h"
+#include "tensorflow/tools/tfprof/tfprof_log.pb.h"
+#include "tensorflow/tools/tfprof/tfprof_output.pb.h"
+
+namespace tensorflow {
+namespace tfprof {
+class TFProfTimelineTest : public ::testing::Test {
+ protected:
+  TFProfTimelineTest() {
+    string graph_path =
+        io::JoinPath(testing::TensorFlowSrcRoot(),
+                     "tools/tfprof/internal/testdata/graph.pbtxt");
+    std::unique_ptr<tensorflow::GraphDef> graph_pb(new tensorflow::GraphDef());
+    TF_CHECK_OK(ReadGraphDef(Env::Default(), graph_path, graph_pb.get()));
+
+    std::unique_ptr<tensorflow::RunMetadata> run_meta_pb(
+        new tensorflow::RunMetadata());
+    string run_meta_path =
+        io::JoinPath(testing::TensorFlowSrcRoot(),
+                     "tools/tfprof/internal/testdata/run_meta");
+    TF_CHECK_OK(
+        ReadBinaryProto(Env::Default(), run_meta_path, run_meta_pb.get()));
+
+    tf_stats_.reset(new TFStats(std::move(graph_pb), std::move(run_meta_pb),
+                                nullptr, nullptr));
+  }
+
+  std::unique_ptr<TFStats> tf_stats_;
+};
+
+// Before adding test, first dump the json file and
+// manually check it's correct
+TEST_F(TFProfTimelineTest, GraphView) {
+  string dump_file = io::JoinPath(testing::TmpDir(), "dump");
+  Options opts(10000, 0, 0, 0, 0, {".*"}, "name",
+               {".*"},  // accout_type_regexes
+               {".*"}, {""}, {".*"}, {""}, false,
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
+               "timeline", {{"outfile", dump_file}});
+  tf_stats_->PrintGraph("graph", opts);
+
+  string dump_str;
+  TF_CHECK_OK(ReadFileToString(Env::Default(), dump_file, &dump_str));
+  EXPECT_EQ(14171250174278825648ull, Hash64(dump_str));
+}
+
+TEST_F(TFProfTimelineTest, ScopeView) {
+  string dump_file = io::JoinPath(testing::TmpDir(), "dump");
+  Options opts(5, 0, 0, 0, 0, {".*"}, "name", {".*"},  // accout_type_regexes
+               {".*"}, {""}, {".*"}, {""}, false,
+               {"params", "bytes", "micros", "float_ops", "num_hidden_ops"},
+               "timeline", {{"outfile", dump_file}});
+  tf_stats_->PrintGraph("scope", opts);
+
+  string dump_str;
+  TF_CHECK_OK(ReadFileToString(Env::Default(), dump_file, &dump_str));
+  EXPECT_EQ(2355241164346147404ull, Hash64(dump_str));
+}
+
+// TODO(xpan): tfprof_log is too large to include in testdata when adding
+// code traces.
+
+}  // namespace tfprof
+}  // namespace tensorflow
diff --git a/tensorflow/tools/tfprof/internal/tfprof_utils.cc b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
index eb2be35c6e..8e55e009d3 100644
--- a/tensorflow/tools/tfprof/internal/tfprof_utils.cc
+++ b/tensorflow/tools/tfprof/internal/tfprof_utils.cc
@@ -251,19 +251,13 @@ tensorflow::Status ParseCmdLine(const string& line, string* cmd,
       opts->select = requested_set;
       ++i;
     } else if (pieces[i] == tensorflow::tfprof::kOptions[14]) {
-      if ((pieces.size() > i + 1 && pieces[i + 1].find("-") == 0) ||
-          pieces.size() == i + 1) {
-        opts->viz = true;
-      } else if (!StringToBool(pieces[i + 1], &opts->viz)) {
-        return ReturnError(pieces, i);
-      } else {
-        ++i;
-      }
-    } else if (pieces[i] == tensorflow::tfprof::kOptions[15]) {
       if (pieces.size() <= i + 1) {
         return ReturnError(pieces, i);
       }
-      opts->dump_to_file = StripQuote(pieces[i + 1]);
+
+      tensorflow::Status s =
+          ParseOutput(pieces[i + 1], &opts->output_type, &opts->output_options);
+      if (!s.ok()) return s;
       ++i;
     } else {
       return ReturnError(pieces, i);
diff --git a/tensorflow/tools/tfprof/tfprof_main.cc b/tensorflow/tools/tfprof/tfprof_main.cc
index dd18a4ad3c..cfe239da22 100644
--- a/tensorflow/tools/tfprof/tfprof_main.cc
+++ b/tensorflow/tools/tfprof/tfprof_main.cc
@@ -30,6 +30,7 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/init_main.h"
+#include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/protobuf/config.pb.h"
 #include "tensorflow/core/util/command_line_flags.h"
 #include "tensorflow/tools/tfprof/internal/tfprof_options.h"
@@ -82,8 +83,7 @@ int main(int argc, char** argv) {
   tensorflow::string FLAGS_hide_name_regexes;
   bool FLAGS_account_displayed_op_only = false;
   tensorflow::string FLAGS_select = "params";
-  bool FLAGS_viz = false;
-  tensorflow::string FLAGS_dump_to_file = "";
+  tensorflow::string FLAGS_output = "";
   for (int i = 0; i < argc; i++) {
     fprintf(stderr, "%s\n", argv[i]);
   }
@@ -117,7 +117,7 @@ int main(int argc, char** argv) {
                        &FLAGS_account_displayed_op_only,
                        "account displayed op only"),
       tensorflow::Flag("select", &FLAGS_select, "select"),
-      tensorflow::Flag("dump_to_file", &FLAGS_dump_to_file, "dump to file"),
+      tensorflow::Flag("output", &FLAGS_output, "output"),
   };
   tensorflow::string usage = tensorflow::Flags::Usage(argv[0], flag_list);
   bool parse_ok = tensorflow::Flags::Parse(&argc, argv, flag_list);
@@ -144,6 +144,12 @@ int main(int argc, char** argv) {
   std::vector<tensorflow::string> select =
       Split(FLAGS_select, ',', tensorflow::str_util::SkipEmpty());
 
+  tensorflow::string output_type;
+  std::map<tensorflow::string, tensorflow::string> output_options;
+  tensorflow::Status s = tensorflow::tfprof::ParseOutput(
+      FLAGS_output, &output_type, &output_options);
+  CHECK(s.ok()) << s.ToString();
+
   tensorflow::string cmd = "";
   if (argc == 1 && FLAGS_graph_path.empty()) {
     printf("1) go/tfprof: Tutorial.\n");
@@ -186,10 +192,18 @@ int main(int argc, char** argv) {
 
   std::unique_ptr<tensorflow::tfprof::OpLog> op_log(
       new tensorflow::tfprof::OpLog());
-  if (!ReadBinaryProto(tensorflow::Env::Default(), FLAGS_op_log_path,
-                       op_log.get())
-           .ok()) {
-    op_log.release();
+  if (!FLAGS_op_log_path.empty()) {
+    tensorflow::string op_log_str;
+    s = tensorflow::ReadFileToString(tensorflow::Env::Default(),
+                                     FLAGS_op_log_path, &op_log_str);
+    if (!s.ok()) {
+      fprintf(stderr, "Failed to read op_log_path: %s\n", s.ToString().c_str());
+      return 1;
+    }
+    if (!tensorflow::ParseProtoUnlimited(op_log.get(), op_log_str)) {
+      fprintf(stderr, "Failed to parse op_log_path\n");
+      return 1;
+    }
   }
 
   std::unique_ptr<tensorflow::checkpoint::CheckpointReader> ckpt_reader;
@@ -212,8 +226,8 @@ int main(int argc, char** argv) {
       FLAGS_max_depth, FLAGS_min_bytes, FLAGS_min_micros, FLAGS_min_params,
       FLAGS_min_float_ops, device_regexes, FLAGS_order_by, account_type_regexes,
       start_name_regexes, trim_name_regexes, show_name_regexes,
-      hide_name_regexes, FLAGS_account_displayed_op_only, select, FLAGS_viz,
-      FLAGS_dump_to_file);
+      hide_name_regexes, FLAGS_account_displayed_op_only, select, output_type,
+      output_options);
 
   if (cmd == tensorflow::tfprof::kCmds[2]) {
     tf_stat.PrintCode(opts);
diff --git a/tensorflow/tools/tfprof/tfprof_options.proto b/tensorflow/tools/tfprof/tfprof_options.proto
index 9d269a0995..84a2e14005 100644
--- a/tensorflow/tools/tfprof/tfprof_options.proto
+++ b/tensorflow/tools/tfprof/tfprof_options.proto
@@ -19,6 +19,6 @@ message OptionsProto {
   repeated string hide_name_regexes = 12;
   optional bool account_displayed_op_only = 13;
   repeated string select = 14;
-  optional bool viz = 15;
+  optional string output = 15;
   optional string dump_to_file = 16;
 }
diff --git a/tensorflow/tools/tfprof/tfprof_output.proto b/tensorflow/tools/tfprof/tfprof_output.proto
index 78dd056662..93e6c1233c 100644
--- a/tensorflow/tools/tfprof/tfprof_output.proto
+++ b/tensorflow/tools/tfprof/tfprof_output.proto
@@ -31,7 +31,8 @@ message TFGraphNodeProto {
   // Number of inputs to the op.
   optional int64 inputs = 5;
   // Device the op is assigned to.
-  optional string device = 10;
+  // Since an op can fire multiple kernel calls, there can be multiple devices.
+  repeated string devices = 10;
 
   // The following are the aggregated stats from all accounted descendants and
   // the op itself. The actual descendants depend on the data structure used
-- 
GitLab


From 3f575b42994949f0d52b71cac84570b74f2d13c6 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 18:18:23 -0700
Subject: [PATCH 1262/1563] Migrate the tf_graph_app component to use webfiles.

This is the last of the graph-related components to migrate. This component is not used by TensorBoard, but rather by other apps (such as colab) to embed the graph explorer.

PiperOrigin-RevId: 155822603
---
 tensorflow/BUILD                              |  2 +
 .../tensorboard/components/tf_graph_app/BUILD | 59 +++++++++++++++++++
 .../components/tf_graph_app/demo/BUILD        | 23 ++++++++
 .../tf_graph_app/demo/{ => data}/graph.pbtxt  |  0
 .../components/tf_graph_app/demo/index.html   | 48 +++++++--------
 .../components/tf_graph_app/tf-graph-app.html |  2 +
 6 files changed, 107 insertions(+), 27 deletions(-)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
 rename tensorflow/tensorboard/components/tf_graph_app/demo/{ => data}/graph.pbtxt (100%)

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index f835c219dc..8e7ce37935 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -343,6 +343,8 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph:all_files",
         "//tensorflow/tensorboard/components/tf_graph/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_app:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_app/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_board:all_files",
         "//tensorflow/tensorboard/components/tf_graph_board/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph_app/BUILD b/tensorflow/tensorboard/components/tf_graph_app/BUILD
new file mode 100644
index 0000000000..4d49386fdf
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app/BUILD
@@ -0,0 +1,59 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+webfiles(
+    name = "tf_graph_app",
+    srcs = [
+        "index.html",
+        "tf-graph-app.html",
+    ],
+    path = "/tf-graph-app",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_board",
+        "//tensorflow/tensorboard/components/tf_graph_controls",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer",
+        "@org_polymer_iron_component_page",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "index.html",
+        "tf-graph-app.html",
+    ],
+    destdir = "tf-graph-app",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_board:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_controls:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_loader:legacy",
+        "//third_party/javascript/polymer/v1/iron-list:lib",
+        "//third_party/javascript/polymer/v1/paper-radio-group:lib",
+        "//third_party/javascript/polymer/v1/paper-tooltip:lib",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
new file mode 100644
index 0000000000..d5408318f4
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
@@ -0,0 +1,23 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_app/demo
+webfiles(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-app/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_app",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_app/demo/data/graph.pbtxt
similarity index 100%
rename from tensorflow/tensorboard/components/tf_graph_app/demo/graph.pbtxt
rename to tensorflow/tensorboard/components/tf_graph_app/demo/data/graph.pbtxt
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/index.html b/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
index 0897cdd08b..0bd984380b 100644
--- a/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
+++ b/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
@@ -15,31 +15,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="import" href="../tf-graph-app.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-  <style>
-  body {
-    margin: 0;
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="import" href="../tf-graph-app.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<style>
+  /** Make the graph app tall enough so the bottom legend does not overlap with the top. */
+  tf-graph-app, .container.tf-graph-app {
+    display: block;
+    height: 700px;
   }
-  </style>
-</head>
-<body>
-  <h3>Answer to the Ultimate Question of Life, the Universe, and Everything</h3>
-  <demo-snippet>
-    <template>
-      <tf-graph-app id="tfgraph"></tf-graph-app>
-      <script>
-        let g = document.querySelector("#tfgraph");
-        fetch("graph.pbtxt", {credentials: "include"}).then(r => r.text()).then(pbtxt => {
-          g.pbtxt = pbtxt;
-        });
-      </script>
-    </template>
-  </demo-snippet>
-</body>
-</html>
+</style>
+<h3>Answer to the Ultimate Question of Life, the Universe, and Everything</h3>
+<demo-snippet>
+  <template>
+    <tf-graph-app></tf-graph-app>
+    <script>
+      fetch("data/graph.pbtxt", {credentials: "include"}).then(r => r.text()).then(pbtxt => {
+        document.querySelector("tf-graph-app").pbtxt = pbtxt;
+      });
+    </script>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html b/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
index b349acd5b9..3365d7a100 100644
--- a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
+++ b/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
@@ -120,6 +120,8 @@ Polymer({
   },
   _updateGraph: function() {
     var blob = new Blob([this.pbtxt]);
+
+    // TODO(chizeng): Find out why we call a private method here and do away with the call.
     this.$.loader._parseAndConstructHierarchicalGraph(null, blob);
   }
 });
-- 
GitLab


From dbb78c7783c32f8f3dc86364dc10d7d51cf61277 Mon Sep 17 00:00:00 2001
From: Mortada Mehyar <mortada@users.noreply.github.com>
Date: Thu, 11 May 2017 18:55:02 -0700
Subject: [PATCH 1263/1563] Fix typos in high performance models docs (#9845)

---
 tensorflow/docs_src/performance/benchmarks.md      |  4 ++--
 .../docs_src/performance/performance_models.md     | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tensorflow/docs_src/performance/benchmarks.md b/tensorflow/docs_src/performance/benchmarks.md
index 6bbc98ac0d..47ab028e20 100644
--- a/tensorflow/docs_src/performance/benchmarks.md
+++ b/tensorflow/docs_src/performance/benchmarks.md
@@ -4,7 +4,7 @@
 
 A selection of image classification models were tested across multiple platforms
 to create a point of reference for the TensorFlow community. The
-[Methodology](#methodology) section details how the test were executed and has
+[Methodology](#methodology) section details how the tests were executed and has
 links to the scripts used.
 
 ## Results for image classification models
@@ -355,7 +355,7 @@ ResNet-50   | distributed_replicated | n/a                    | True
 ResNet-152  | distributed_replicated | n/a                    | True
 
 To simplify server setup, EC2 instances (p2.8xlarge) running worker servers also
-ran parameter servers. Equal numbers of parameter servers and work servers were
+ran parameter servers. Equal numbers of parameter servers and worker servers were
 used with the following exceptions:
 
 *   InceptionV3: 8 instances / 6 parameter servers
diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index 9ca1e77ff5..f384a51114 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -62,12 +62,12 @@ and executed in parallel. The image preprocessing ops include operations such as
 image decoding, distortion, and resizing.
 
 Once the images are through preprocessing, they are concatenated together into 8
-batch size 32 tensors. Rather than use @{tf.concat} for this purpose, which is
-implemented as a single op that waits for all the inputs to be ready before
-concatenating them together, @{tf.parallel_stack} is used. @{tf.parallel_stack}
-allocates an uninitialized tensor as an output, and each input tensor is written
-to its designated portion of the output tensor as soon as the input is
-available.
+tensors each with a batch-size of 32. Rather than using @{tf.concat} for this
+purpose, which is implemented as a single op that waits for all the inputs to be
+ready before concatenating them together, @{tf.parallel_stack} is used.
+@{tf.parallel_stack} allocates an uninitialized tensor as an output, and each
+input tensor is written to its designated portion of the output tensor as soon
+as the input is available.
 
 When all the input tensors are finished, the output tensor is passed along in
 the graph. This effectively hides all the memory latency with the long tail of
@@ -142,7 +142,7 @@ On GPU, NCHW is faster. But on CPU, NHWC is sometimes faster.
 
 Building a model to support both data formats keeps the model flexible and
 capable of operating optimally regardless of platform. Most TensorFlow
-operations used by a CNN support both NHWC and NCHW data format. The benchmark
+operations used by a CNN support both NHWC and NCHW data formats. The benchmark
 script was written to support both NCHW and NHWC. NCHW should always be used
 when training with GPUs. NHWC is sometimes faster on CPU. A flexible model can
 be trained on GPUs using NCHW with inference done on CPU using NHWC with the
-- 
GitLab


From 8364dd7d8c9a1ff1ea311b3e70c120ca34215f94 Mon Sep 17 00:00:00 2001
From: Wei Ho <weiho@google.com>
Date: Thu, 11 May 2017 19:08:52 -0700
Subject: [PATCH 1264/1563] Adds warning about non-determinism in returned
 TensorSlice ordering.

PiperOrigin-RevId: 155825601
---
 tensorflow/core/util/tensor_bundle/tensor_bundle.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.h b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
index 3ca243966f..b0bddf7e42 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.h
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
@@ -212,6 +212,10 @@ class BundleReader {
 
   // Looks up the slices of the tensor keyed by "key".  On OK, "slices"
   // is non-empty if and only if the tensor is a partitioned tensor.
+  //
+  // Warning - there is no guaranteed ordering for the returned slices, so
+  // a slice with a larger start index in some dimension could come before
+  // another slice with a smaller start index in the same dimension.
   // REQUIRES: status().ok()
   Status LookupTensorSlices(StringPiece key, std::vector<TensorSlice>* slices)
       TF_MUST_USE_RESULT;
-- 
GitLab


From cfdf449ae2daa749e66565f846808bb9e5c1bff5 Mon Sep 17 00:00:00 2001
From: David Soergel <soergel@google.com>
Date: Thu, 11 May 2017 19:19:46 -0700
Subject: [PATCH 1265/1563] Update TensorForest to provide output_alternatives
 for serving.

Also, fix reversed inference dict key constants.

PiperOrigin-RevId: 155826149
---
 .../tensor_forest/client/eval_metrics.py      |  4 ++--
 .../tensor_forest/client/random_forest.py     | 21 +++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/tensor_forest/client/eval_metrics.py b/tensorflow/contrib/tensor_forest/client/eval_metrics.py
index c99f9b7c12..1726986354 100644
--- a/tensorflow/contrib/tensor_forest/client/eval_metrics.py
+++ b/tensorflow/contrib/tensor_forest/client/eval_metrics.py
@@ -27,8 +27,8 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn
 
-INFERENCE_PROB_NAME = prediction_key.PredictionKey.CLASSES
-INFERENCE_PRED_NAME = prediction_key.PredictionKey.PROBABILITIES
+INFERENCE_PROB_NAME = prediction_key.PredictionKey.PROBABILITIES
+INFERENCE_PRED_NAME = prediction_key.PredictionKey.CLASSES
 
 FEATURE_IMPORTANCE_NAME = 'global_feature_importance'
 
diff --git a/tensorflow/contrib/tensor_forest/client/random_forest.py b/tensorflow/contrib/tensor_forest/client/random_forest.py
index 0ba636c697..0da1f78755 100644
--- a/tensorflow/contrib/tensor_forest/client/random_forest.py
+++ b/tensorflow/contrib/tensor_forest/client/random_forest.py
@@ -19,8 +19,10 @@ from __future__ import print_function
 
 from tensorflow.contrib import framework as contrib_framework
 
+from tensorflow.contrib.learn.python.learn.estimators import constants
 from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators import model_fn as model_fn_lib
+from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 
 from tensorflow.contrib.tensor_forest.client import eval_metrics
 from tensorflow.contrib.tensor_forest.python import tensor_forest
@@ -145,15 +147,29 @@ def get_model_fn(params,
     graph_builder = graph_builder_class(params,
                                         device_assigner=dev_assn)
     inference = {}
+    output_alternatives = None
     if (mode == model_fn_lib.ModeKeys.EVAL or
         mode == model_fn_lib.ModeKeys.INFER):
       inference[eval_metrics.INFERENCE_PROB_NAME] = (
           graph_builder.inference_graph(features))
 
-      if not params.regression:
+      if params.regression:
+        predictions = {
+            None: inference[eval_metrics.INFERENCE_PROB_NAME]}
+        output_alternatives = {
+            None: (constants.ProblemType.LINEAR_REGRESSION, predictions)}
+      else:
         inference[eval_metrics.INFERENCE_PRED_NAME] = math_ops.argmax(
             inference[eval_metrics.INFERENCE_PROB_NAME], 1)
 
+        predictions = {
+            prediction_key.PredictionKey.PROBABILITIES:
+                inference[eval_metrics.INFERENCE_PROB_NAME],
+            prediction_key.PredictionKey.CLASSES:
+                inference[eval_metrics.INFERENCE_PRED_NAME]}
+        output_alternatives = {
+            None: (constants.ProblemType.CLASSIFICATION, predictions)}
+
       if report_feature_importances:
         inference[eval_metrics.FEATURE_IMPORTANCE_NAME] = (
             graph_builder.feature_importances())
@@ -205,7 +221,8 @@ def get_model_fn(params,
         loss=training_loss,
         train_op=training_graph,
         training_hooks=training_hooks,
-        scaffold=scaffold)
+        scaffold=scaffold,
+        output_alternatives=output_alternatives)
 
   return _model_fn
 
-- 
GitLab


From d0afbc17dd4afc859bbcdf014d76d0756ba1cd3d Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 11 May 2017 19:21:51 -0700
Subject: [PATCH 1266/1563] Use new mirror.bazel.build hostname

PiperOrigin-RevId: 155826248
---
 WORKSPACE                |   2 +-
 tensorflow/workspace.bzl | 334 +++++++++++++++++++--------------------
 2 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 7ebb1d488c..b2d6fb542b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -5,7 +5,7 @@ http_archive(
     sha256 = "4be8a887f6f38f883236e77bb25c2da10d506f2bf1a8e5d785c0f35574c74ca4",
     strip_prefix = "rules_closure-aac19edc557aec9b603cd7ffe359401264ceff0d",
     urls = [
-        "http://bazel-mirror.storage.googleapis.com/github.com/bazelbuild/rules_closure/archive/aac19edc557aec9b603cd7ffe359401264ceff0d.tar.gz",  # 2017-05-10
+        "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/aac19edc557aec9b603cd7ffe359401264ceff0d.tar.gz",  # 2017-05-10
         "https://github.com/bazelbuild/rules_closure/archive/aac19edc557aec9b603cd7ffe359401264ceff0d.tar.gz",
     ],
 )
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 5d0b4ff085..502d7e973c 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -150,7 +150,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "eigen_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
+          "http://mirror.bazel.build/bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
           "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
       ],
       sha256 = "ca7beac153d4059c02c8fc59816c82d54ea47fe58365e8aded4082ded0b820c4",
@@ -161,7 +161,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "libxsmm_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/hfp/libxsmm/archive/1.8.tar.gz",
+          "http://mirror.bazel.build/github.com/hfp/libxsmm/archive/1.8.tar.gz",
           "https://github.com/hfp/libxsmm/archive/1.8.tar.gz",
       ],
       sha256 = "0330201afb5525d0950ec861fec9dd75eb40a03845ebe03d2c635cf8bfc14fea",
@@ -177,7 +177,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "ortools_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
+          "http://mirror.bazel.build/github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
           "https://github.com/google/or-tools/archive/253f7955c6a1fd805408fba2e42ac6d45b312d15.tar.gz",
       ],
       sha256 = "932075525642b04ac6f1b50589f1df5cd72ec2f448b721fd32234cf183f0e755",
@@ -188,7 +188,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.http_archive(
       name = "com_googlesource_code_re2",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
+          "http://mirror.bazel.build/github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
           "https://github.com/google/re2/archive/b94b7cd42e9f02673cd748c1ac1d16db4052514c.tar.gz",
       ],
       sha256 = "bd63550101e056427c9e7ff12a408c1c8b74e9803f393ca916b2926fc2c4906f",
@@ -198,7 +198,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.http_archive(
       name = "gemmlowp",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
+          "http://mirror.bazel.build/github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
           "https://github.com/google/gemmlowp/archive/a6f29d8ac48d63293f845f2253eccbf86bc28321.tar.gz",
       ],
       sha256 = "75d40ea8e68b0d1644f052fffe8f14a410b2a73d40ccb859a95c0578d194ec26",
@@ -208,7 +208,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "farmhash_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
+          "http://mirror.bazel.build/github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
           "https://github.com/google/farmhash/archive/92e897b282426729f4724d91a637596c7e2fe28f.zip",
       ],
       sha256 = "4c626d1f306bda2c6804ab955892f803f5245f4dcaecb4979dc08b091256da54",
@@ -224,7 +224,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "highwayhash",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
+          "http://mirror.bazel.build/github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
           "https://github.com/google/highwayhash/archive/dfcb97ca4fe9277bf9dc1802dd979b071896453b.tar.gz",
       ],
       sha256 = "0f30a15b1566d93f146c8d149878a06e91d9bb7ec2cfd76906df62a82be4aac9",
@@ -235,7 +235,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "nasm",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.bz2",
+          "http://mirror.bazel.build/www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.bz2",
           "http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2",
       ],
       sha256 = "00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
@@ -246,7 +246,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "jpeg",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
+          "http://mirror.bazel.build/github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
           "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.1.tar.gz",
       ],
       sha256 = "c15a9607892113946379ccea3ca8b85018301b200754f209453ab21674268e77",
@@ -258,7 +258,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "png_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/glennrp/libpng/archive/v1.2.53.zip",
+          "http://mirror.bazel.build/github.com/glennrp/libpng/archive/v1.2.53.zip",
           "https://github.com/glennrp/libpng/archive/v1.2.53.zip",
       ],
       sha256 = "c35bcc6387495ee6e757507a68ba036d38ad05b415c2553b3debe2a57647a692",
@@ -269,7 +269,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "gif_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
+          "http://mirror.bazel.build/ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz",
       ],
@@ -281,7 +281,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "six_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
+          "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
           "http://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
       ],
       sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
@@ -292,7 +292,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "org_pythonhosted_markdown",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
+          "http://mirror.bazel.build/pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
           "https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d/Markdown-2.6.8.tar.gz",
       ],
       strip_prefix = "Markdown-2.6.8",
@@ -303,7 +303,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "org_html5lib",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",
+          "http://mirror.bazel.build/github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",
           "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz",  # identical to 1.0b8
       ],
       sha256 = "184257f98539159a433e2a2197309657ae1283b4c44dbd9c87b2f02ff36adce8",
@@ -314,7 +314,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "org_mozilla_bleach",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/mozilla/bleach/archive/v1.5.tar.gz",
+          "http://mirror.bazel.build/github.com/mozilla/bleach/archive/v1.5.tar.gz",
           "https://github.com/mozilla/bleach/archive/v1.5.tar.gz",
       ],
       strip_prefix = "bleach-1.5",
@@ -325,7 +325,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "org_pocoo_werkzeug",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
+          "http://mirror.bazel.build/pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
           "https://pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263/Werkzeug-0.11.10.tar.gz",
       ],
       strip_prefix = "Werkzeug-0.11.10",
@@ -341,7 +341,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   patched_http_archive(
       name = "protobuf",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
+          "http://mirror.bazel.build/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
       sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
@@ -359,7 +359,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.http_archive(
       name = "com_google_protobuf",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
+          "http://mirror.bazel.build/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
       sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
@@ -369,7 +369,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.http_archive(
       name = "com_google_protobuf_cc",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
+          "http://mirror.bazel.build/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
           "https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
       ],
       sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
@@ -379,7 +379,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "gmock_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/googletest/archive/release-1.8.0.zip",
+          "http://mirror.bazel.build/github.com/google/googletest/archive/release-1.8.0.zip",
           "https://github.com/google/googletest/archive/release-1.8.0.zip",
       ],
       sha256 = "f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
@@ -400,7 +400,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.http_archive(
       name = "com_github_gflags_gflags",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/gflags/gflags/archive/f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz",
+          "http://mirror.bazel.build/github.com/gflags/gflags/archive/f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz",
           "https://github.com/gflags/gflags/archive/f8a0efe03aa69b3336d8e228b37d4ccb17324b88.tar.gz",
       ],
       sha256 = "4d222fab8f1ede4709cdff417d15a1336f862d7334a81abf76d09c15ecf9acd1",
@@ -416,7 +416,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "pcre",
       sha256 = "ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
+          "http://mirror.bazel.build/ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
           "http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz",
       ],
       strip_prefix = "pcre-8.39",
@@ -427,7 +427,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "swig",
       sha256 = "58a475dbbd4a4d7075e5fe86d4e54c9edde39847cdb96a3053d87cb64a23a453",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
+          "http://mirror.bazel.build/ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
           "http://pilotfiber.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz",
       ],
@@ -439,7 +439,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "curl",
       sha256 = "ff3e80c1ca6a068428726cd7dd19037a47cc538ce58ef61c59587191039b2ca6",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/curl.haxx.se/download/curl-7.49.1.tar.gz",
+          "http://mirror.bazel.build/curl.haxx.se/download/curl-7.49.1.tar.gz",
           "https://curl.haxx.se/download/curl-7.49.1.tar.gz",
       ],
       strip_prefix = "curl-7.49.1",
@@ -462,7 +462,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "grpc",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
+          "http://mirror.bazel.build/github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
           "https://github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz",
       ],
       sha256 = "a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31",
@@ -486,7 +486,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "linenoise",
       sha256 = "7f51f45887a3d31b4ce4fa5965210a5e64637ceac12720cfce7954d6a2e812f7",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
+          "http://mirror.bazel.build/github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
           "https://github.com/antirez/linenoise/archive/c894b9e59f02203dbe4e2be657572cf88c4230c3.tar.gz",
       ],
       strip_prefix = "linenoise-c894b9e59f02203dbe4e2be657572cf88c4230c3",
@@ -498,7 +498,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "llvm",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/llvm-mirror/llvm/archive/13790c8735a78a029dec92d80f5633418d9ffdd6.tar.gz",
+          "http://mirror.bazel.build/github.com/llvm-mirror/llvm/archive/13790c8735a78a029dec92d80f5633418d9ffdd6.tar.gz",
           "https://github.com/llvm-mirror/llvm/archive/13790c8735a78a029dec92d80f5633418d9ffdd6.tar.gz",
       ],
       sha256 = "da4fc7147f1e2706977822934d1b245dcb6248930f8089129362ada14f6119dd",
@@ -510,7 +510,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "jsoncpp_git",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
+          "http://mirror.bazel.build/github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
           "https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz",
       ],
       sha256 = "07d34db40593d257324ec5fb9debc4dc33f29f8fb44e33a2eeb35503e61d0fe2",
@@ -526,7 +526,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.http_archive(
       name = "boringssl",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",
+          "http://mirror.bazel.build/github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",
           "https://github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",  # 2016-07-11
       ],
       sha256 = "025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
@@ -536,7 +536,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "nanopb_git",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
+          "http://mirror.bazel.build/github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
           "https://github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz",
       ],
       sha256 = "ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33",
@@ -552,7 +552,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "zlib_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/zlib.net/zlib-1.2.8.tar.gz",
+          "http://mirror.bazel.build/zlib.net/zlib-1.2.8.tar.gz",
           "http://zlib.net/fossils/zlib-1.2.8.tar.gz",
       ],
       sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
@@ -568,7 +568,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "fft2d",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
+          "http://mirror.bazel.build/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
           "http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz",
       ],
       sha256 = "52bb637c70b971958ec79c9c8752b1df5ff0218a4db4510e60826e0cb79b5296",
@@ -578,7 +578,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "snappy",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/snappy/archive/1.1.4.zip",
+          "http://mirror.bazel.build/github.com/google/snappy/archive/1.1.4.zip",
           "https://github.com/google/snappy/archive/1.1.4.zip",
       ],
       sha256 = "6c74d2b663170d68184da353cdd71b5b7d57bc8888ef1e99b4929b5d680dba54",
@@ -590,7 +590,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "nccl_archive",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/nvidia/nccl/archive/ccfc4567dc3e2a37fb42cfbc64d10eb526e7da7b.tar.gz",
+          "http://mirror.bazel.build/github.com/nvidia/nccl/archive/ccfc4567dc3e2a37fb42cfbc64d10eb526e7da7b.tar.gz",
           "https://github.com/nvidia/nccl/archive/ccfc4567dc3e2a37fb42cfbc64d10eb526e7da7b.tar.gz",
       ],
       sha256 = "6c34a0862d9f8ed4ad5984c6a8206b351957bb14cf6ad7822720f285f4aada04",
@@ -603,7 +603,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "junit",
       jar_sha256 = "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
       jar_urls = [
-          "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
+          "http://mirror.bazel.build/repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
           "http://maven.ibiblio.org/maven2/junit/junit/4.12/junit-4.12.jar",
       ],
@@ -616,7 +616,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "org_hamcrest_core",
       jar_sha256 = "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
       jar_urls = [
-          "http://bazel-mirror.storage.googleapis.com/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
+          "http://mirror.bazel.build/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
           "http://maven.ibiblio.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
       ],
@@ -627,7 +627,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "jemalloc",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
+          "http://mirror.bazel.build/github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
           "https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz",
       ],
       sha256 = "3c8f25c02e806c3ce0ab5fb7da1817f89fc9732709024e2a81b6b82f7cc792a8",
@@ -639,7 +639,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "com_google_pprof",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/google/pprof/archive/c0fb62ec88c411cc91194465e54db2632845b650.tar.gz",
+          "http://mirror.bazel.build/github.com/google/pprof/archive/c0fb62ec88c411cc91194465e54db2632845b650.tar.gz",
           "https://github.com/google/pprof/archive/c0fb62ec88c411cc91194465e54db2632845b650.tar.gz",
       ],
       sha256 = "e0928ca4aa10ea1e0551e2d7ce4d1d7ea2d84b2abbdef082b0da84268791d0c4",
@@ -664,23 +664,23 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],
       sha256_urls_extract_macos = {
           "47109a00cac344d80296c195451bb5eee7c21727fcef1594384ddfe1f852957a": [
-              "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
+              "http://mirror.bazel.build/nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-darwin-x64.tar.xz",
           ],
       },
       sha256_urls_windows = {
           "606c44c42d17866c017c50c0afadad411d9492ac4281d2431b937f881911614e": [
-              "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/win-x64/node.exe",
+              "http://mirror.bazel.build/nodejs.org/dist/v4.3.2/win-x64/node.exe",
               "http://nodejs.org/dist/v4.3.2/win-x64/node.exe",
           ],
           "451a40570099a95488d6438f175813629e0430f87f23c8659bc18dc42494820a": [
-              "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/win-x64/node.lib",
+              "http://mirror.bazel.build/nodejs.org/dist/v4.3.2/win-x64/node.lib",
               "http://nodejs.org/dist/v4.3.2/win-x64/node.lib",
           ],
       },
       sha256_urls_extract = {
           "4350d0431b49697517c6cca5d66adf5f74eb9101c52f52ae959fa94225822d44": [
-              "http://bazel-mirror.storage.googleapis.com/nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
+              "http://mirror.bazel.build/nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
               "http://nodejs.org/dist/v4.3.2/node-v4.3.2-linux-x64.tar.xz",
           ],
       },
@@ -699,11 +699,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # Apache 2.0
       sha256_urls = {
           "8465342c318f9c4cf0a29b109fa63ee3742dd4dc7080d05d9fd8f604814d04cf": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js",
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js",
           ],
           "a67e36da3029d232e4e938e61a0a3302f516d71e7100d54dbf5362ad8618e994": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/lib.es6.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/lib.es6.d.ts",
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/lib.es6.d.ts",
           ],
       },
@@ -741,7 +741,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256 = "0e88207e5f90af4ce8790d6e1e7d09d2702d81bce0bafdc253d18c0a5bf7661e",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/lodash/lodash/archive/3.10.1.tar.gz",
+          "http://mirror.bazel.build/github.com/lodash/lodash/archive/3.10.1.tar.gz",
           "https://github.com/lodash/lodash/archive/3.10.1.tar.gz",
       ],
       strip_prefix = "lodash-3.10.1",
@@ -755,7 +755,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "dfaca3b8485bee735788cc6eebca82ea25719adc1fb8911c7799c6bd5a95df3b": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
               "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
           ],
       },
@@ -767,15 +767,15 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "77510d7538dbd3b59f1c8a06f68131b38562e3be546364747618d5112723e818": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
+              "http://mirror.bazel.build/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.css",
           ],
           "cd46dc709b01cd361e8399f797760871a6a207bc832e08fcff385ced02ef2b43": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.d.ts",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.d.ts",
           ],
           "32647b0fb4175fa875a71e6d56c761b88d975186ed6a8820e2c7854165a8988d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
               "https://raw.githubusercontent.com/palantir/plottable/v1.16.1/plottable.js",
           ],
       },
@@ -791,7 +791,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           # sources directly from git also requires running Node tooling
           # beforehand to generate files. NPM is the only place to get it.
           "e3159beb279391c47433789f22b32bac88488cfcad6c0b6ec8605ce6b0081b0d": [
-              "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/plottable/-/plottable-3.1.0.tgz",
+              "http://mirror.bazel.build/registry.npmjs.org/plottable/-/plottable-3.1.0.tgz",
               "https://registry.npmjs.org/plottable/-/plottable-3.1.0.tgz",
           ],
       },
@@ -803,7 +803,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "7323829ddd77924a69e2b1235ded3eac30acd990da0f037e0fbd3c8e9035b50d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
               "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
           ],
       },
@@ -815,7 +815,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "772045d412b1513b549be991c2e1846c38019429d43974efcae943fbe83489bf": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
               "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
           ],
       },
@@ -827,7 +827,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "f138fce57f673ca8a633f4aee5ae5b6fcb6ad0de59069a42a74e996fd04d8fcc": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
               "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
           ],
       },
@@ -839,7 +839,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256_urls = {
           "bc1e38838f5c5c8e040132d41efee6bfddbef728210bd566479dc1694af1d3f5": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
               "https://raw.githubusercontent.com/d3/d3/v3.5.15/d3.js",
           ],
       },
@@ -852,7 +852,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256_urls_extract = {
           "b5fac5b296bc196e6aa7b59f9e33986fc44d23d59a0e211705187be9e35b943d": [
-              "http://bazel-mirror.storage.googleapis.com/github.com/d3/d3/releases/download/v4.8.0/d3.zip",
+              "http://mirror.bazel.build/github.com/d3/d3/releases/download/v4.8.0/d3.zip",
               "https://github.com/d3/d3/releases/download/v4.8.0/d3.zip",
           ],
       },
@@ -871,35 +871,35 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "b7da645f6e5555feb7aeede73775da0023ce2257df9c8e76c9159266035a9c0d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/chai/chai.d.ts",
           ],
           "177293828c7a206bf2a7f725753d51396d38668311aa37c96445f91bbf8128a7": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/6e2f2280ef16ef277049d0ce8583af167d586c59/d3/d3.d.ts",  # v3
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/6e2f2280ef16ef277049d0ce8583af167d586c59/d3/d3.d.ts",  # v3
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/6e2f2280ef16ef277049d0ce8583af167d586c59/d3/d3.d.ts",  # v3
           ],
           "e4cd3d5de0eb3bc7b1063b50d336764a0ac82a658b39b5cf90511f489ffdee60": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/efd40e67ff323f7147651bdbef03c03ead7b1675/lodash/lodash.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/efd40e67ff323f7147651bdbef03c03ead7b1675/lodash/lodash.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/efd40e67ff323f7147651bdbef03c03ead7b1675/lodash/lodash.d.ts",
           ],
           "695a03dd2ccb238161d97160b239ab841562710e5c4e42886aefd4ace2ce152e": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/ebc69904eb78f94030d5d517b42db20867f679c0/mocha/mocha.d.ts",
           ],
           "513ccd9ee1c708881120eeacd56788fc3b3da8e5c6172b20324cebbe858803fe": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/708609e0764daeb5eb64104af7aca50c520c4e6e/sinon/sinon.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/708609e0764daeb5eb64104af7aca50c520c4e6e/sinon/sinon.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/708609e0764daeb5eb64104af7aca50c520c4e6e/sinon/sinon.d.ts",
           ],
           "44eba36339bd1c0792072b7b204ee926fe5ffe1e9e2da916e67ac55548e3668a": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/a872802c0c84ba98ff207d5e673a1fa867c67fd6/polymer/polymer.d.ts",
           ],
           "9453c3e6bae824e90758c3b38975c1ed77e6abd79bf513bcb08368fcdb14898e": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f5407eba29c04fb8387c86df27512bd055b195d2/threejs/three.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f5407eba29c04fb8387c86df27512bd055b195d2/threejs/three.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/f5407eba29c04fb8387c86df27512bd055b195d2/threejs/three.d.ts",
           ],
           "691756a6eb455f340c9e834de0d49fff269e7b8c1799c2454465dcd6a4435b80": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/46719185c564694c5583c4b7ad94dbb786ecad46/webcomponents.js/webcomponents.js.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/46719185c564694c5583c4b7ad94dbb786ecad46/webcomponents.js/webcomponents.js.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/46719185c564694c5583c4b7ad94dbb786ecad46/webcomponents.js/webcomponents.js.d.ts",
           ],
       },
@@ -910,7 +910,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "61e7abb7b1f01fbcb0cab8cf39003392f422566209edd681fbd070eaa84ca000": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-array/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-array/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-array/index.d.ts",
           ],
       },
@@ -921,7 +921,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "95f75c8dcc89850b2e72581d96a7b5f46ea4ac852f828893f141f14a597421f9": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-axis/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-axis/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-axis/index.d.ts",
           ],
       },
@@ -932,7 +932,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "a2738e693ce8a8640c2d29001e77582c9c361fd23bda44db471629866b60ada7": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-brush/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-brush/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-brush/index.d.ts",
           ],
       },
@@ -943,7 +943,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "c54d24756eb6d744b31e538ad9bab3a75f6d54e2288b29cc72338d4a057d3e83": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-chord/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-chord/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-chord/index.d.ts",
           ],
       },
@@ -954,7 +954,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "f987667167b1d2970911247e325eb1c37ca0823646f81ccec837ae59039822f7": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-collection/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-collection/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-collection/index.d.ts",
           ],
       },
@@ -965,7 +965,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "9580c81f38ddcce7be0ac9bd3d0d083adebc34e17441709f90b9e4dcd1c19a56": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-color/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-color/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-color/index.d.ts",
           ],
       },
@@ -976,7 +976,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "169f80b4cceca8e2e9ed384d81a5db0624cc01a26451dfb5a7e0cec6ea9cfb06": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dispatch/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dispatch/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dispatch/index.d.ts",
           ],
       },
@@ -987,7 +987,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "08d35d139dde58c2722be98d718d01204fd6167d310f09b379e832f3c741489d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-drag/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-drag/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-drag/index.d.ts",
           ],
       },
@@ -998,7 +998,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "62594d00cf9e4bb895339c8e56f64330e202a5eb2a0fa580a1f6e6336f2c93ce": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dsv/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dsv/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-dsv/index.d.ts",
           ],
       },
@@ -1009,7 +1009,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "d1cf8f99b7bf758c2ba3c0a4ce553e151d4d9b4cf45a6e8bd0edec7ce90f725b": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-ease/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-ease/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-ease/index.d.ts",
           ],
       },
@@ -1020,7 +1020,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "288421e2008668d2076a4684657dd3d29b992832ef02c552981eb94a91042553": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-force/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-force/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-force/index.d.ts",
           ],
       },
@@ -1031,7 +1031,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "b42cb17e580c1fd0b64d478f7bd80ca806efaefda24426a833cf1f30a7275bca": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-format/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-format/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-format/index.d.ts",
           ],
       },
@@ -1042,7 +1042,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "a5683f5835d8716c6b89c075235078438cfab5897023ed720bfa492e244e969e": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-hierarchy/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-hierarchy/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-hierarchy/index.d.ts",
           ],
       },
@@ -1053,7 +1053,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "590a71b741323ac3139b333ec8b743e24717fdd5b32bcff48ee521162a9dfe1c": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-interpolate/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-interpolate/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-interpolate/index.d.ts",
           ],
       },
@@ -1064,7 +1064,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "96f35ba041bcaa265e2b373ee675177410d44d31c980e4f7fbeefd4bcba15b00": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-path/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-path/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-path/index.d.ts",
           ],
       },
@@ -1075,7 +1075,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "ce453451e8105cac6a4f4a4263ca2142ebb4bf442e342f470a81da691f220fcb": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-polygon/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-polygon/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-polygon/index.d.ts",
           ],
       },
@@ -1086,7 +1086,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "238e278f1be5d6985a19800800cffee80f81199f71d848e3bbc288d1791a6f90": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-quadtree/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-quadtree/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-quadtree/index.d.ts",
           ],
       },
@@ -1097,7 +1097,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "e6ae19aad83495475653578de64fb9d6bf9764eda6c84d70f7935ec84bcc482e": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-queue/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-queue/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-queue/index.d.ts",
           ],
       },
@@ -1108,7 +1108,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "d31b92ed86c23ec0a4776f99fa81ff033c95b96c8304d8aa9baf3b94af779aa8": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-random/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-random/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-random/index.d.ts",
           ],
       },
@@ -1119,7 +1119,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "44bb7b07d977028e6567540a3303b06fc9b33fb0960bc75c520e0733c840d89f": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-request/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-request/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-request/index.d.ts",
           ],
       },
@@ -1130,7 +1130,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "02ce7c644ba34bd1abb84da2e832f248b048b6a23812be4365bd837f186c9f1f": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-scale/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-scale/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-scale/index.d.ts",
           ],
       },
@@ -1141,7 +1141,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "699043ddb28dfa5e46d87bc6a24cfc6d604237f298259d3fb3c7066e05e8c86e": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-selection/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-selection/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-selection/index.d.ts",
           ],
       },
@@ -1152,7 +1152,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "62668a7aaaf6232762b544f9f89c0f557ca7cfb0cd343a358dda7ecbe26f5739": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-shape/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-shape/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-shape/index.d.ts",
           ],
       },
@@ -1163,7 +1163,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "0502490ce682fd9265fb1d5d693ce6cd82e3b05e5f5ee3433731266ecb03d5fc": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-time/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-time/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-time/index.d.ts",
           ],
       },
@@ -1174,7 +1174,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "6f191f9aea704aa64b1defa40dfdff1447a6e6bb815feff1660f894500a9c94d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-timer/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-timer/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-timer/index.d.ts",
           ],
       },
@@ -1185,7 +1185,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "a0a7c0c9bfb5c7d6d9d22a8d16b4484b66d13f2ed226954037546cb3da4098ba": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-transition/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-transition/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-transition/index.d.ts",
           ],
       },
@@ -1196,7 +1196,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "c6bd5f229f915151d0ef678fe50b1aa6a62334ea0a8c6fc0effbac9f7032efc7": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-voronoi/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-voronoi/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-voronoi/index.d.ts",
           ],
       },
@@ -1207,7 +1207,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "a25dc17fbd304cf7a0e5e7bbb8339c930d464eb40c4d6e5f839ce9c0191f4110": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-zoom/index.d.ts",
+              "http://mirror.bazel.build/raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-zoom/index.d.ts",
               "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1550dfd1b8e38d9bf104b3fd16ea9bf98a2b358e/types/d3-zoom/index.d.ts",
           ],
       },
@@ -1219,11 +1219,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "7aff264bd84c90bed3c72a4dc31db8c19151853c6df6980f52b01d3e9872c82d": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/build/three.js",
           ],
           "0e98ded15bb7fe398a655667e76b39909d36c0973a8950d01c62f65f93161c27": [
-              "http://bazel-mirror.storage.googleapis.com/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
+              "http://mirror.bazel.build/raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/ad419d40bdaab80abbb34b8f359b4ee840033a02/examples/js/controls/OrbitControls.js",
           ],
       },
@@ -1237,7 +1237,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "fae51429b56a4a4c15f1f0c23b733c7095940cc9c04c275fa7adb3bf055b23b3",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
           "https://github.com/PolymerElements/font-roboto/archive/v1.0.1.tar.gz",
       ],
       strip_prefix = "font-roboto-1.0.1",
@@ -1250,7 +1250,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "703b50f6b00f9e0546b5a3451da57bb20f77a166e27e4967923b9e835bab9b80",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/Polymer/polymer-analyzer/archive/v1.19.3.tar.gz",
+          "http://mirror.bazel.build/github.com/Polymer/polymer-analyzer/archive/v1.19.3.tar.gz",
           "https://github.com/Polymer/polymer-analyzer/archive/v1.19.3.tar.gz",
       ],
       strip_prefix = "polymer-analyzer-1.19.3",
@@ -1268,7 +1268,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6bce143db7a374a68535ec8b861a5f30e81f2f1e4ee36a55bda2a891f6fd2818",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
       ],
       strip_prefix = "iron-a11y-announcer-1.0.5",
@@ -1282,7 +1282,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6823efc47a83208fd51d39c5a1d3eb0c0bebc705df1ce01310509da22a13ebd2",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
           "https://github.com/PolymerElements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
       ],
       strip_prefix = "iron-a11y-keys-behavior-1.1.8",
@@ -1296,7 +1296,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9162d8af4611e911ac3ebbfc08bb7038ac04f6e79a9287b1476fe36ad6770bc5",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/iron-ajax/archive/v1.2.0.tar.gz",
       ],
       strip_prefix = "iron-ajax-1.2.0",
@@ -1316,7 +1316,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "50bbb901d2c8f87462e3552e3d671a552faa12c37c485e548d7a234ebffbc427",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
       ],
       strip_prefix = "iron-autogrow-textarea-1.0.12",
@@ -1336,7 +1336,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a1e8d4b7a13f3d36beba9c2a6b186ed33a53e6af2e79f98c1fcc7e85e7b53f89",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
           "https://github.com/PolymerElements/iron-behaviors/archive/v1.0.17.tar.gz",
       ],
       strip_prefix = "iron-behaviors-1.0.17",
@@ -1356,7 +1356,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "539a0e1c4df0bc702d3bd342388e4e56c77ec4c2066cce69e41426a69f92e8bd",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
       ],
       strip_prefix = "iron-checked-element-behavior-1.0.4",
@@ -1374,7 +1374,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "3636e8b9a1f229fc33b5aad3933bd02a9825f66e679a0be31855d7c8245c4b4b",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-component-page/archive/v1.1.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-component-page/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/iron-component-page/archive/v1.1.4.tar.gz",
       ],
       strip_prefix = "iron-component-page-1.1.4",
@@ -1399,7 +1399,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "275808994a609a2f9923e2dd2db1957945ab141ba840eadc33f19e1f406d600e",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
           "https://github.com/PolymerElements/iron-collapse/archive/v1.0.8.tar.gz",
       ],
       strip_prefix = "iron-collapse-1.0.8",
@@ -1416,7 +1416,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "aa7458492a6ac3d1f6344640a4c2ab07bce64e7ad0422b83b5d665707598cce6",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-demo-helpers/archive/v1.1.0.tar.gz",
       ],
       strip_prefix = "iron-demo-helpers-1.1.0",
@@ -1441,7 +1441,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "f0e9dfbbcd94d7e88ce82cb61e615406ace63c185fee9396f7f182206ca5cc9a",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-doc-viewer/archive/v1.0.12.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-doc-viewer/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/iron-doc-viewer/archive/v1.0.12.tar.gz",
       ],
       strip_prefix = "iron-doc-viewer-1.0.12",
@@ -1466,7 +1466,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "f7e4a31d096d10d8af1920397695cb17f3eb1cbe5e5ff91a861dabfcc085f376",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/iron-dropdown/archive/v1.4.0.tar.gz",
       ],
       strip_prefix = "iron-dropdown-1.4.0",
@@ -1490,7 +1490,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "10132a2ea309a37c4c07b8fead71f64abc588ee6107931e34680f5f36dd8291e",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/iron-fit-behavior/archive/v1.2.5.tar.gz",
       ],
       strip_prefix = "iron-fit-behavior-1.2.5",
@@ -1504,7 +1504,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "79287f6ca1c2d4e003f68b88fe19d03a1b6a0011e2b4cae579fe4d1474163a2e",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/iron-flex-layout/archive/v1.3.0.tar.gz",
       ],
       strip_prefix = "iron-flex-layout-1.3.0",
@@ -1523,7 +1523,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "1dd9371c638e5bc2ecba8a64074aa680dfb8712198e9612f9ed24d387efc8f26",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
       ],
       strip_prefix = "iron-form-element-behavior-1.0.6",
@@ -1537,7 +1537,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9ed58a69159a02c07a6050d242e6d4e585a29f3245b8c8c390cfd52ddb786dc4",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/iron-icon/archive/v1.0.11.tar.gz",
       ],
       strip_prefix = "iron-icon-1.0.11",
@@ -1555,7 +1555,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "3b18542c147c7923dc3a36b1a51984a73255d610f297d43c9aaccc52859bd0d0",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/iron-icons/archive/v1.1.3.tar.gz",
       ],
       strip_prefix = "iron-icons-1.1.3",
@@ -1584,7 +1584,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7e3925b7e63a7d22524c4b43ce16ab80d06a576649644783643c11a003284368",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
           "https://github.com/PolymerElements/iron-iconset-svg/archive/v1.1.0.tar.gz",
       ],
       strip_prefix = "iron-iconset-svg-1.1.0",
@@ -1601,7 +1601,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c505101ead08ab25526b1f49baecc8c28b4221b92a65e7334c783bdc81553c36",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
           "https://github.com/PolymerElements/iron-input/archive/1.0.10.tar.gz",
       ],
       strip_prefix = "iron-input-1.0.10",
@@ -1619,7 +1619,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "72a6530b9f0ad5557f5d287845792a0ada74d8b159198e27f940e226313dc116",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
           "https://github.com/PolymerElements/iron-list/archive/v1.3.9.tar.gz",
       ],
       strip_prefix = "iron-list-1.3.9",
@@ -1638,7 +1638,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ad27889343bc9a709258b073f69abc028bb1ffd3fdb975cd2d3939f7f5d7bb6c",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
           "https://github.com/PolymerElements/iron-menu-behavior/archive/v1.1.10.tar.gz",
       ],
       strip_prefix = "iron-menu-behavior-1.1.10",
@@ -1659,7 +1659,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "fb05e6031bae6b4effe5f15d44b3f548d5807f9e3b3aa2442ba17cf4b8b84361",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-meta/archive/v1.1.1.tar.gz",
       ],
       strip_prefix = "iron-meta-1.1.1",
@@ -1673,7 +1673,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "3df5b54ff2e0510c87a2aff8c9d730d3fe83d3d11277cc1a49fa29b549acb46c",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
           "https://github.com/PolymerElements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
       ],
       strip_prefix = "iron-overlay-behavior-1.10.1",
@@ -1697,7 +1697,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "b2f2b6d52284542330bd30b586e217926eb0adec5e13934a3cef557717c22dc2",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/iron-range-behavior/archive/v1.0.4.tar.gz",
       ],
       strip_prefix = "iron-range-behavior-1.0.4",
@@ -1711,7 +1711,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a87a78ee9223c2f6afae7fc94a3ff91cbce6f7e2a7ed3f2979af7945c9281616",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
       ],
       strip_prefix = "iron-resizable-behavior-1.0.3",
@@ -1725,7 +1725,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "d0de0c804b1ec91d814754144afd9da1cdb082690de88bd5e47fd5f41990746f",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
           "https://github.com/PolymerElements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
       ],
       strip_prefix = "iron-scroll-target-behavior-1.0.3",
@@ -1739,7 +1739,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ba28a47443bad3b744611c9d7a79fb21dbdf2e35edc5ef8f812e2dcd72b16747",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
           "https://github.com/PolymerElements/iron-selector/archive/v1.5.2.tar.gz",
       ],
       strip_prefix = "iron-selector-1.5.2",
@@ -1758,7 +1758,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "aef4901e68043824f36104799269573dd345ffaac494186e466fdc79c06fdb63",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
       ],
       strip_prefix = "iron-validatable-behavior-1.1.1",
@@ -1775,7 +1775,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256 = "93d30bd593736ca440938d77808b7ef5972da0f3fcfe4ae63ae7b4ce117da2cb",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/chjj/marked/archive/v0.3.2.zip",
+          "http://mirror.bazel.build/github.com/chjj/marked/archive/v0.3.2.zip",
           "https://github.com/chjj/marked/archive/v0.3.2.zip",
       ],
       strip_prefix = "marked-0.3.2",
@@ -1788,7 +1788,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7547616df95f8b903757e6afbabfcdba5322c2bcec3f17c726b8bba5adf4bc5f",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/marked-element/archive/v1.1.3.tar.gz",
       ],
       strip_prefix = "marked-element-1.1.3",
@@ -1808,7 +1808,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "8800c314a76b2da190a2b203259c1091f6d38e0057ed37c2a3d0b734980fa9a5",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/neon-animation/archive/v1.2.2.tar.gz",
       ],
       strip_prefix = "neon-animation-1.2.2",
@@ -1857,7 +1857,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7cfcb9082ef9909da262df6b5c120bc62dbeaff278cb563e8fc60465ddd387e5",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
           "https://github.com/PolymerElements/paper-behaviors/archive/v1.0.12.tar.gz",
       ],
       strip_prefix = "paper-behaviors-1.0.12",
@@ -1881,7 +1881,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "896c0a7e34bfcce63fc23c63e105ed9c4d62fa3a6385b7161e1e5cd4058820a6",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
           "https://github.com/PolymerElements/paper-button/archive/v1.0.11.tar.gz",
       ],
       strip_prefix = "paper-button-1.0.11",
@@ -1901,7 +1901,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6828a6954a048b1230fbd2606faffbae950ba1d042175b96ec50ae355786a166",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-checkbox/archive/v1.4.0.tar.gz",
       ],
       strip_prefix = "paper-checkbox-1.4.0",
@@ -1919,7 +1919,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c6a9709e7f528d03dcd574503c18b72d4751ca30017346d16e6a791d37ed9259",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
           "https://github.com/PolymerElements/paper-dialog/archive/v1.0.4.tar.gz",
       ],
       strip_prefix = "paper-dialog-1.0.4",
@@ -1937,7 +1937,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a7e0e27ce63554bc14f384cf94bcfa24da8dc5f5120dfd565f45e166261aee40",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
       ],
       strip_prefix = "paper-dialog-behavior-1.2.5",
@@ -1960,7 +1960,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a2e69283e7674f782c44d811387a0f8da2d01fac0172743d1add65e253e6b5ff",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
           "https://github.com/PolymerElements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
       ],
       strip_prefix = "paper-dialog-scrollable-1.1.5",
@@ -1979,7 +1979,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9d88f654ec03ee9be211df9e69bede9e8a22b51bf1dbcc63b79762e4256d81ad",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
           "https://github.com/PolymerElements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
       ],
       strip_prefix = "paper-dropdown-menu-1.4.0",
@@ -2011,7 +2011,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "0db4bd8a4bf6f20dcd0dffb4f907b31c93a8647c9c021344239cf30b40b87075",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-header-panel/archive/v1.1.4.tar.gz",
       ],
       strip_prefix = "paper-header-panel-1.1.4",
@@ -2028,7 +2028,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9cba5bcfd6aeb4c41581c1392c678cf2278d360e9d122f4d9db54a9ebb404496",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
           "https://github.com/PolymerElements/paper-icon-button/archive/v1.1.3.tar.gz",
       ],
       strip_prefix = "paper-icon-button-1.1.3",
@@ -2050,7 +2050,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "17c3dea9bb1c2026cc61324696c6c774214a0dc37686b91ca214a6af550994db",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
           "https://github.com/PolymerElements/paper-input/archive/v1.1.18.tar.gz",
       ],
       strip_prefix = "paper-input-1.1.18",
@@ -2081,7 +2081,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "12ee0dcb61b0d5721c5988571f6974d7b2211e97724f4195893fbcc9058cdac8",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-item/archive/v1.1.4.tar.gz",
       ],
       strip_prefix = "paper-item-1.1.4",
@@ -2106,7 +2106,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "3cb35f4fe9a3f15185a9e91711dba8f27e9291c8cd371ebf1be21b8f1d5f65fb",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-listbox/archive/v1.1.2.tar.gz",
       ],
       strip_prefix = "paper-listbox-1.1.2",
@@ -2124,7 +2124,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "09f6c8bd6ddbea2be541dc86306efe41cdfb31bec0b69d35a5dc29772bbc8506",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
           "https://github.com/PolymerElements/paper-material/archive/v1.0.6.tar.gz",
       ],
       strip_prefix = "paper-material-1.0.6",
@@ -2144,7 +2144,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "a3cee220926e315f7412236b3628288774694447c0da4428345f36d0f127ba3b",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
           "https://github.com/PolymerElements/paper-menu/archive/v1.2.2.tar.gz",
       ],
       strip_prefix = "paper-menu-1.2.2",
@@ -2169,7 +2169,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "be3290c288a2bd4f9887213db22c75add99cc29ff4d088100c0bc4eb0e57997b",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
           "https://github.com/PolymerElements/paper-menu-button/archive/v1.5.1.tar.gz",
       ],
       strip_prefix = "paper-menu-button-1.5.1",
@@ -2193,7 +2193,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "2b6776b2f023c1f344feea17ba29b58d879e46f8ed43b7256495054b5183fff6",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-progress/archive/v1.0.9.tar.gz",
       ],
       strip_prefix = "paper-progress-1.0.9",
@@ -2212,7 +2212,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6e911d0c308aa388136b3af79d1bdcbe5a1f4159cbc79d71efb4ff3b6c0b4e91",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-radio-button/archive/v1.1.2.tar.gz",
       ],
       strip_prefix = "paper-radio-button-1.1.2",
@@ -2230,7 +2230,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "7885ad1f81e9dcc03dcea4139b54a201ff55c18543770cd44f94530046c9e163",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
           "https://github.com/PolymerElements/paper-radio-group/archive/v1.0.9.tar.gz",
       ],
       strip_prefix = "paper-radio-group-1.0.9",
@@ -2249,7 +2249,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ba76bfb1c737260a8a103d3ca97faa1f7c3288c7db9b2519f401b7a782147c09",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
           "https://github.com/PolymerElements/paper-ripple/archive/v1.0.5.tar.gz",
       ],
       strip_prefix = "paper-ripple-1.0.5",
@@ -2266,7 +2266,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "08e7c541dbf5d2e959208810bfc03188e82ced87e4d30d325172967f67962c3c",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
           "https://github.com/PolymerElements/paper-slider/archive/v1.0.10.tar.gz",
       ],
       strip_prefix = "paper-slider-1.0.10",
@@ -2290,7 +2290,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6a752907fab7899cbeed15b478e7b9299047c15fbf9d1561d6eb4d204bdbd178",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
           "https://github.com/PolymerElements/paper-spinner/archive/v1.1.1.tar.gz",
       ],
       strip_prefix = "paper-spinner-1.1.1",
@@ -2311,7 +2311,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "6d26b0a4c286402098853dc7388f6b22f30dfb7a74e47b34992ac03380144bb2",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-styles/archive/v1.1.4.tar.gz",
       ],
       strip_prefix = "paper-styles-1.1.4",
@@ -2342,7 +2342,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c23b6a5221db35e5b1ed3eb8e8696b952572563e285adaec96aba1e3134db825",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
           "https://github.com/PolymerElements/paper-tabs/archive/v1.7.0.tar.gz",
       ],
       strip_prefix = "paper-tabs-1.7.0",
@@ -2371,7 +2371,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "55f623712ed1f2bae6d6fadc522a2458e083ccd44cc0a907672547e7b10758a9",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
           "https://github.com/PolymerElements/paper-toast/archive/v1.3.0.tar.gz",
       ],
       strip_prefix = "paper-toast-1.3.0",
@@ -2389,7 +2389,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "4aa7cf0396fa2994a8bc2ac6e8428f48b07b945bb7c41bd52041ef5827b45de3",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
           "https://github.com/PolymerElements/paper-toggle-button/archive/v1.2.0.tar.gz",
       ],
       strip_prefix = "paper-toggle-button-1.2.0",
@@ -2408,7 +2408,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "dbddffc0654d9fb5fb48843087eebe16bf7a134902495a664c96c11bf8a2c63d",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
           "https://github.com/PolymerElements/paper-toolbar/archive/v1.1.4.tar.gz",
       ],
       strip_prefix = "paper-toolbar-1.1.4",
@@ -2426,7 +2426,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "4c6667acf01f73da14c3cbc0aa574bf14280304567987ee0314534328377d2ad",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
           "https://github.com/PolymerElements/paper-tooltip/archive/v1.1.2.tar.gz",
       ],
       strip_prefix = "paper-tooltip-1.1.2",
@@ -2444,7 +2444,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       sha256 = "07a9e62ffb52193da3af09adda2fbac5cc690439978520e2d03e783863f65f91",
       strip_prefix = "polymer-1.7.0",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/polymer/polymer/archive/v1.7.0.tar.gz",
+          "http://mirror.bazel.build/github.com/polymer/polymer/archive/v1.7.0.tar.gz",
           "https://github.com/polymer/polymer/archive/v1.7.0.tar.gz",
       ],
       path = "/polymer",
@@ -2460,7 +2460,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256 = "e06eb54f2a80e6b3cd0bd4d59f900423bcaee53fc03998a056df63740c684683",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
+          "http://mirror.bazel.build/github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
           "https://github.com/PrismJS/prism/archive/abee2b7587f1925e57777044270e2a1860810994.tar.gz",
       ],
       strip_prefix = "prism-abee2b7587f1925e57777044270e2a1860810994",
@@ -2476,7 +2476,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "ad70bf9cd5bbdf525d465e1b0658867ab4022193eb9c74087a839044b46312b4",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
           "https://github.com/PolymerElements/prism-element/archive/1.0.4.tar.gz",
       ],
       strip_prefix = "prism-element-1.0.4",
@@ -2497,7 +2497,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       sha256 = "4495450e5d884c3e16b537b43afead7f84d17c7dc061bcfcbf440eac083e4ef5",
       strip_prefix = "promise-polyfill-1.0.0",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
           "https://github.com/PolymerLabs/promise-polyfill/archive/v1.0.0.tar.gz",
       ],
       path = "/promise-polyfill",
@@ -2515,7 +2515,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "f8bd760cbdeba131f6790bd5abe170bcbf7b1755ff58ed16d0b82fa8a7f34a7f",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
+          "http://mirror.bazel.build/github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
           "https://github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
       ],
       strip_prefix = "web-animations-js-2.2.1",
@@ -2528,7 +2528,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "138c43306ee0a6d699ddca9b3c6b0f4982974ea8b7bdad291ea7276c72301df9",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
+          "http://mirror.bazel.build/github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
           "https://github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
       ],
       strip_prefix = "webcomponentsjs-0.7.22",
@@ -2557,7 +2557,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # Apache License 2.0
       sha256 = "1d6a72f401c9d53f68238c617dd43a05cd85ca5aa2e676a5b3c352711448e093",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.10.0.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.10.0.tgz",
           "https://registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.10.0.tgz",
       ],
       strip_prefix = "package",
@@ -2570,7 +2570,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256 = "08655255ae810bf4d1cb1642df57658fcce823776d3ba8f4b46f4bbff6c87ece",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/async/-/async-1.5.0.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/async/-/async-1.5.0.tgz",
           "https://registry.npmjs.org/async/-/async-1.5.0.tgz",
       ],
       strip_prefix = "package",
@@ -2582,7 +2582,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256 = "aca8137bed5bb295bd7173325b7ad604cd2aeb341d739232b4f9f0b26745be90",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/chai/-/chai-3.5.0.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/chai/-/chai-3.5.0.tgz",
           "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
       ],
       strip_prefix = "package",
@@ -2594,7 +2594,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # MIT
       sha256 = "13ef37a071196a2fba680799b906555d3f0ab61e80a7e8f73f93e77914590dd4",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
           "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
       ],
       suppress = ["strictDependencies"],
@@ -2607,7 +2607,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "49edb057695fc9019aae992bf7e677a07de7c6ce2bf9f9facde4a245045d1532",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/sinon/-/sinon-1.17.4.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/sinon/-/sinon-1.17.4.tgz",
           "https://registry.npmjs.org/sinon/-/sinon-1.17.4.tgz",
       ],
       strip_prefix = "package/lib",
@@ -2619,7 +2619,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "b85fc56f713832960b56fe9269ee4bb2cd41edd2ceb130b0936e5bdbed5dea63",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/sinon-chai/-/sinon-chai-2.8.0.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/sinon-chai/-/sinon-chai-2.8.0.tgz",
           "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.8.0.tgz",
       ],
       strip_prefix = "package",
@@ -2631,7 +2631,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "c659e60f7957d9d80c23a7aacc4d71b19c6421a08f91174c0062de369595acae",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
           "https://registry.npmjs.org/stacky/-/stacky-1.3.1.tgz",
       ],
       strip_prefix = "package",
@@ -2643,7 +2643,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       licenses = ["notice"],  # BSD-3-Clause
       sha256 = "9d4ebd4945df8a936916d4d32b7f280f2a3afa35f79e7ca8ad3ed0a42770c537",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/registry.npmjs.org/web-component-tester/-/web-component-tester-4.3.6.tgz",
+          "http://mirror.bazel.build/registry.npmjs.org/web-component-tester/-/web-component-tester-4.3.6.tgz",
           "https://registry.npmjs.org/web-component-tester/-/web-component-tester-4.3.6.tgz",
       ],
       strip_prefix = "package",
@@ -2671,7 +2671,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       sha256 = "59d6cfb1187733b71275becfea181fe0aa1f734df5ff77f5850c806bbbf9a0d9",
       strip_prefix = "test-fixture-2.0.1",
       urls = [
-          "http://bazel-mirror.storage.googleapis.com/github.com/PolymerElements/test-fixture/archive/v2.0.1.tar.gz",
+          "http://mirror.bazel.build/github.com/PolymerElements/test-fixture/archive/v2.0.1.tar.gz",
           "https://github.com/PolymerElements/test-fixture/archive/v2.0.1.tar.gz",
       ],
       path = "/test-fixture",
-- 
GitLab


From 7d8ea3d8c7577e9a674892c57327f8084a87e6e1 Mon Sep 17 00:00:00 2001
From: Junwei Pan <pandevirus@gmail.com>
Date: Wed, 10 May 2017 20:09:31 -0700
Subject: [PATCH 1267/1563] Fix broken links

---
 tensorflow/examples/android/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/examples/android/README.md b/tensorflow/examples/android/README.md
index 0414566b98..08fb20e995 100644
--- a/tensorflow/examples/android/README.md
+++ b/tensorflow/examples/android/README.md
@@ -28,9 +28,9 @@ on API >= 14 devices.
         using Deep Neural Networks](https://arxiv.org/abs/1312.2249) to
         localize and track people in the camera preview in real-time.
 3. [TF Stylize](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/android/src/org/tensorflow/demo/StylizeActivity.java):
-        Uses a model based on [A Learned Representation For Artistic Style]
-        (https://arxiv.org/abs/1610.07629) to restyle the camera preview image
-        to that of a number of different artists.
+        Uses a model based on [A Learned Representation For Artistic
+        Style](https://arxiv.org/abs/1610.07629) to restyle the camera preview 
+        image to that of a number of different artists.
 
 <img src="sample_images/classify1.jpg" width="30%"><img src="sample_images/stylize1.jpg" width="30%"><img src="sample_images/detect1.jpg" width="30%">
 
-- 
GitLab


From 688f5a6c77bd97e116f55e130872ea0713f9cdb1 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 21:32:32 -0700
Subject: [PATCH 1268/1563] [XLA] Add test cases for implicit broadcasting.

PiperOrigin-RevId: 155832642
---
 .../xla/tests/broadcast_simple_test.cc        | 245 ++++++++++++++++++
 1 file changed, 245 insertions(+)

diff --git a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
index c8030aade8..0ad1cf3e8c 100644
--- a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
+++ b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
@@ -127,6 +127,251 @@ XLA_TEST_F(BroadcastSimpleTest, InDimensionAndDegenerateBroadcasting) {
   ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
 }
 
+struct R3ImplicitBroadcastSpec {
+  std::array<int64, 3> output_bounds;
+  std::array<int64, 3> minor2major_layout;
+  std::array<int64, 3> input_bounds;
+  HloOpcode op;
+} kR3ImplicitBroadcastTestCases[] = {
+    {{{1, 1, 1}}, {{2, 1, 0}}, {{1, 1, 1}}, HloOpcode::kAdd},
+    {{{3, 4, 5}}, {{2, 1, 0}}, {{1, 1, 5}}, HloOpcode::kMaximum},
+    {{{3, 4, 5}}, {{2, 1, 0}}, {{1, 4, 1}}, HloOpcode::kMinimum},
+    {{{3, 4, 5}}, {{2, 1, 0}}, {{3, 1, 1}}, HloOpcode::kMultiply},
+    {{{3, 4, 5}}, {{2, 1, 0}}, {{1, 1, 1}}, HloOpcode::kAdd},
+    {{{3, 4, 5}}, {{2, 1, 0}}, {{1, 4, 5}}, HloOpcode::kAdd},
+    {{{3, 4, 5}}, {{2, 1, 0}}, {{3, 4, 1}}, HloOpcode::kAdd},
+    {{{3, 4, 5}}, {{2, 1, 0}}, {{3, 1, 5}}, HloOpcode::kAdd},
+    {{{3, 199, 5}}, {{2, 1, 0}}, {{1, 199, 1}}, HloOpcode::kMinimum},
+    {{{3, 4, 199}}, {{2, 1, 0}}, {{1, 1, 199}}, HloOpcode::kAdd},
+};
+
+class BroadcastR3ImplicitTest
+    : public BroadcastSimpleTest,
+      public ::testing::WithParamInterface<R3ImplicitBroadcastSpec> {};
+
+XLA_TEST_P(BroadcastR3ImplicitTest, Doit) {
+  const R3ImplicitBroadcastSpec& spec = GetParam();
+  ComputationBuilder builder(client_, TestName());
+  const Shape r3_shape = ShapeUtil::MakeShapeWithLayout(
+      F32, spec.output_bounds, spec.minor2major_layout);
+  Array3D<float> r3_array(spec.output_bounds[0], spec.output_bounds[1],
+                          spec.output_bounds[2]);
+  r3_array.FillRandom(1.0, 2.5, 56789);
+  auto r3_input =
+      LiteralUtil::Relayout(*LiteralUtil::CreateR3FromArray3D(r3_array),
+                            LayoutUtil::MakeLayout(spec.minor2major_layout));
+  std::unique_ptr<GlobalData> r3_global_data =
+      client_->TransferToServer(*r3_input).ConsumeValueOrDie();
+
+  const Shape r3_implicit_shape = ShapeUtil::MakeShapeWithLayout(
+      F32, spec.input_bounds, spec.minor2major_layout);
+  Array3D<float> r3_implicit_array(spec.input_bounds[0], spec.input_bounds[1],
+                                   spec.input_bounds[2]);
+  r3_implicit_array.FillRandom(1.0, 0.2, 56789);
+  auto r3_implicit_input = LiteralUtil::Relayout(
+      *LiteralUtil::CreateR3FromArray3D(r3_implicit_array),
+      LayoutUtil::MakeLayout(spec.minor2major_layout));
+  std::unique_ptr<GlobalData> r3_implicit_global_data =
+      client_->TransferToServer(*r3_implicit_input).ConsumeValueOrDie();
+
+  auto r3_implicit_parameter = builder.Parameter(0, r3_implicit_shape, "input");
+  auto r3_parameter = builder.Parameter(1, r3_shape, "input");
+  ComputationDataHandle op;
+  switch (spec.op) {
+    case HloOpcode::kMinimum: {
+      auto tmp_op = builder.Min(r3_implicit_parameter, r3_parameter);
+      op.Swap(&tmp_op);
+      break;
+    }
+    case HloOpcode::kMaximum: {
+      auto tmp_op = builder.Max(r3_implicit_parameter, r3_parameter);
+      op.Swap(&tmp_op);
+      break;
+    }
+    case HloOpcode::kMultiply: {
+      auto tmp_op = builder.Mul(r3_implicit_parameter, r3_parameter);
+      op.Swap(&tmp_op);
+      break;
+    }
+    default: {
+      // Default to Add
+      auto tmp_op = builder.Add(r3_implicit_parameter, r3_parameter);
+      op.Swap(&tmp_op);
+    }
+  }
+
+  Array3D<float> expected_array(spec.output_bounds[0], spec.output_bounds[1],
+                                spec.output_bounds[2]);
+  auto Each = ([&](tensorflow::gtl::ArraySlice<int64> indices, float* value) {
+    float r3_implicit = r3_implicit_array(indices[0] % spec.input_bounds[0],
+                                          indices[1] % spec.input_bounds[1],
+                                          indices[2] % spec.input_bounds[2]);
+    float r3 = r3_array(indices[0], indices[1], indices[2]);
+    switch (spec.op) {
+      case HloOpcode::kMinimum: {
+        *value = std::min(r3_implicit, r3);
+        break;
+      }
+      case HloOpcode::kMaximum: {
+        *value = std::max(r3_implicit, r3);
+        break;
+      }
+      case HloOpcode::kMultiply: {
+        *value = r3_implicit * r3;
+        break;
+      }
+      default: {
+        // Default to Add
+        *value = r3_implicit + r3;
+        break;
+      }
+    }
+  });
+
+  int n1 = expected_array.n1();
+  int n2 = expected_array.n2();
+  int n3 = expected_array.n3();
+  for (int64 i = 0; i < n1; i++) {
+    for (int64 j = 0; j < n2; j++) {
+      for (int64 k = 0; k < n3; k++) {
+        Each({i, j, k}, &expected_array(i, j, k));
+      }
+    }
+  }
+  auto expected = LiteralUtil::CreateR3FromArray3D(expected_array);
+  ComputeAndCompareLiteral(
+      &builder, *expected,
+      {r3_implicit_global_data.get(), r3_global_data.get()},
+      ErrorSpec(1e-7, 1e-7));
+}
+
+INSTANTIATE_TEST_CASE_P(BroadcastR3ImplicitTestInstances,
+                        BroadcastR3ImplicitTest,
+                        ::testing::ValuesIn(kR3ImplicitBroadcastTestCases));
+
+// r1 and r3's dim0 matches, and r1's dim1 and dim2 have size 1:
+XLA_TEST_F(BroadcastSimpleTest, Add3DTo3DDegenerate_1_2) {
+  ComputationBuilder b(client_, TestName());
+  ComputationDataHandle r1h;
+  ComputationDataHandle r3h;
+
+  Array3D<float> r1d = {{{1}}, {{2}}};
+  Array3D<float> r3d = {{{1, 2}, {3, 4}}, {{5, 6}, {7, 8}}};
+  auto r1 = CreateR3Parameter(r1d, 1, "r1", &b, &r1h);
+  auto r3 = CreateR3Parameter(r3d, 0, "r3", &b, &r3h);
+
+  b.Add(r3h, r1h);
+
+  auto expected =
+      LiteralUtil::CreateR3<float>({{{2, 3}, {4, 5}}, {{7, 8}, {9, 10}}});
+
+  ComputeAndCompareLiteral(&b, *expected, {r3.get(), r1.get()},
+                           ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add3DTo3DDegenerate_0_1) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 = b.ConstantLiteral(*LiteralUtil::CreateR3<float>({{{1, 2}}}));
+  auto r3 = b.ConstantLiteral(
+      *LiteralUtil::CreateR3<float>({{{1, 2}, {3, 4}}, {{5, 6}, {7, 8}}}));
+  b.Add(r3, r1);
+
+  auto expected =
+      LiteralUtil::CreateR3<float>({{{2, 4}, {4, 6}}, {{6, 8}, {8, 10}}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add3DTo3DDegenerate_0_2) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 = b.ConstantLiteral(*LiteralUtil::CreateR3<float>({{{1}, {2}}}));
+  auto r3 = b.ConstantLiteral(
+      *LiteralUtil::CreateR3<float>({{{1, 2}, {3, 4}}, {{5, 6}, {7, 8}}}));
+  b.Add(r3, r1);
+
+  auto expected =
+      LiteralUtil::CreateR3<float>({{{2, 3}, {5, 6}}, {{6, 7}, {9, 10}}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add3DTo3DDegenerate_0) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 =
+      b.ConstantLiteral(*LiteralUtil::CreateR3<float>({{{1, 2}, {3, 4}}}));
+  auto r3 = b.ConstantLiteral(
+      *LiteralUtil::CreateR3<float>({{{1, 2}, {3, 4}}, {{5, 6}, {7, 8}}}));
+  b.Add(r3, r1);
+
+  auto expected =
+      LiteralUtil::CreateR3<float>({{{2, 4}, {6, 8}}, {{6, 8}, {10, 12}}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add3DTo3DDegenerate_1) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 =
+      b.ConstantLiteral(*LiteralUtil::CreateR3<float>({{{1, 2}}, {{3, 4}}}));
+  auto r3 = b.ConstantLiteral(
+      *LiteralUtil::CreateR3<float>({{{1, 2}, {3, 4}}, {{5, 6}, {7, 8}}}));
+  b.Add(r3, r1);
+
+  auto expected =
+      LiteralUtil::CreateR3<float>({{{2, 4}, {4, 6}}, {{8, 10}, {10, 12}}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add3DTo3DDegenerate_2) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 = b.ConstantLiteral(
+      *LiteralUtil::CreateR3<float>({{{1}, {2}}, {{3}, {4}}}));
+  auto r3 = b.ConstantLiteral(
+      *LiteralUtil::CreateR3<float>({{{1, 2}, {3, 4}}, {{5, 6}, {7, 8}}}));
+  b.Add(r3, r1);
+
+  auto expected =
+      LiteralUtil::CreateR3<float>({{{2, 3}, {5, 6}}, {{8, 9}, {11, 12}}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add3DTo3DDegenerate_0_1_2) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 = b.ConstantLiteral(*LiteralUtil::CreateR3<float>({{{1}}}));
+  auto r3 = b.ConstantLiteral(
+      *LiteralUtil::CreateR3<float>({{{1, 2}, {3, 4}}, {{5, 6}, {7, 8}}}));
+  b.Add(r3, r1);
+
+  auto expected =
+      LiteralUtil::CreateR3<float>({{{2, 3}, {4, 5}}, {{6, 7}, {8, 9}}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add2DTo2DDegenerate_0) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 = b.ConstantLiteral(*LiteralUtil::CreateR2<float>({{1, 2}}));
+  auto r2 = b.ConstantLiteral(*LiteralUtil::CreateR2<float>({{1, 2}, {3, 4}}));
+  b.Add(r2, r1);
+
+  auto expected = LiteralUtil::CreateR2<float>({{2, 4}, {4, 6}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
+XLA_TEST_F(BroadcastSimpleTest, Add2DTo2DDegenerate_1) {
+  ComputationBuilder b(client_, TestName());
+  auto r1 = b.ConstantLiteral(*LiteralUtil::CreateR2<float>({{1}, {2}}));
+  auto r2 = b.ConstantLiteral(*LiteralUtil::CreateR2<float>({{1, 2}, {3, 4}}));
+  b.Add(r2, r1);
+
+  auto expected = LiteralUtil::CreateR2<float>({{2, 3}, {5, 6}});
+
+  ComputeAndCompareLiteral(&b, *expected, {}, ErrorSpec(0.0001));
+}
+
 XLA_TEST_F(BroadcastSimpleTest, Add1DTo3DInDim0) {
   ComputationBuilder b(client_, TestName());
   auto r1 = b.ConstantR1<float>({10, 20});
-- 
GitLab


From eb0a59f003977332b7363526fcfd0b3f4311492b Mon Sep 17 00:00:00 2001
From: "Yuan (Terry) Tang" <terrytangyuan@users.noreply.github.com>
Date: Fri, 12 May 2017 01:10:39 -0400
Subject: [PATCH 1269/1563] Fixes #9654: Allow model_fn being a member function
 of a class (#9807)

* Fixes #9654: Allow model_fn being a member function of a class

* Remove self from arg instead of changing a const
---
 tensorflow/python/estimator/estimator.py      |  7 +++++--
 tensorflow/python/estimator/estimator_test.py | 11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index c97efc127a..735bfca4f7 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -739,7 +739,7 @@ def _model_fn_args(fn):
 
 def _verify_model_fn_args(model_fn, params):
   """Verifies model fn arguments."""
-  args = _model_fn_args(model_fn)
+  args = set(_model_fn_args(model_fn))
   if 'features' not in args:
     raise ValueError('model_fn (%s) must include features argument.' % model_fn)
   if 'labels' not in args:
@@ -752,7 +752,10 @@ def _verify_model_fn_args(model_fn, params):
     logging.warning('Estimator\'s model_fn (%s) includes params '
                     'argument, but params are not passed to Estimator.',
                     model_fn)
-  non_valid_args = list(set(args) - _VALID_MODEL_FN_ARGS)
+  if tf_inspect.ismethod(model_fn):
+    if 'self' in args:
+      args.remove('self')
+  non_valid_args = list(args - _VALID_MODEL_FN_ARGS)
   if non_valid_args:
     raise ValueError('model_fn (%s) has following not expected args: %s' %
                      (model_fn, non_valid_args))
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 5c8c3a2626..037357a961 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -256,6 +256,17 @@ class EstimatorConstructorTest(test.TestCase):
         features, labels, 'something')
     estimator.Estimator(model_fn=new_model_fn)
 
+  def test_if_model_fn_is_a_member_function_of_a_class(self):
+
+    class ModelFnClass(object):
+      def __init__(self):
+        estimator.Estimator(model_fn=self.model_fn)
+
+      def model_fn(self, features, labels, mode):
+        _, _, _ = features, labels, mode
+
+    ModelFnClass()
+
 
 def dummy_input_fn():
   return ({'x': constant_op.constant([[1], [1]])},
-- 
GitLab


From a33022c1470ce1334766b0cad38d9e91c17a2e5d Mon Sep 17 00:00:00 2001
From: Liangliang He <lliang.he@gmail.com>
Date: Fri, 12 May 2017 13:11:33 +0800
Subject: [PATCH 1270/1563] Fix verbs compile error (#9791)

---
 tensorflow/contrib/verbs/rdma.cc                |  7 ++-----
 tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc | 15 ++++++---------
 tensorflow/contrib/verbs/rdma_rendezvous_mgr.h  |  7 +++----
 tensorflow/contrib/verbs/verbs_server_lib.cc    | 14 ++++----------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/tensorflow/contrib/verbs/rdma.cc b/tensorflow/contrib/verbs/rdma.cc
index 05df05de35..bfd00ba3f5 100644
--- a/tensorflow/contrib/verbs/rdma.cc
+++ b/tensorflow/contrib/verbs/rdma.cc
@@ -778,11 +778,8 @@ void RdmaTensorBuffer::SendNextItem() {
         EnqueueItem(key_with_step_id);
       }
     };
-    // Use default session (legacy_session_)
-    // TODO use WorkerSessionForSession
-    // need to pass in session handle
-    channel_->adapter_->worker_env_->session_mgr->LegacySession()
-        ->rendezvous_mgr->RecvLocalAsync(step_id, parsed, cb);
+    channel_->adapter_->worker_env_->rendezvous_mgr
+        ->RecvLocalAsync(step_id, parsed, cb);
   }
 }
 
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
index 8cbdfaa943..d665f92cd9 100644
--- a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
@@ -29,9 +29,9 @@ namespace tensorflow {
 
 class RdmaRemoteRendezvous : public BaseRemoteRendezvous {
  public:
-  RdmaRemoteRendezvous(const WorkerEnv* env, const string& worker_name,
+  RdmaRemoteRendezvous(const WorkerEnv* env,
                        int64 step_id, RdmaMgr* rdma_mgr)
-      : BaseRemoteRendezvous(env, worker_name, step_id, true),
+      : BaseRemoteRendezvous(env, step_id, true),
         rdma_mgr_(rdma_mgr) {}
 
  protected:
@@ -133,15 +133,12 @@ void RdmaRemoteRendezvous::RecvFromRemoteAsync(
   rb->SendNextItem();
 }
 
-RdmaRendezvousMgr::RdmaRendezvousMgr(const WorkerEnv* env,
-                                     const string& worker_name,
-                                     WorkerCacheInterface* worker_cache)
-    : BaseRendezvousMgr(env, worker_name) {}
+RdmaRendezvousMgr::RdmaRendezvousMgr(const WorkerEnv* env)
+    : BaseRendezvousMgr(env) {}
 
 BaseRemoteRendezvous* RdmaRendezvousMgr::Create(int64 step_id,
-                                                const WorkerEnv* worker_env,
-                                                const string& worker_name) {
-  return new RdmaRemoteRendezvous(worker_env, worker_name, step_id, rdma_mgr_);
+                                                const WorkerEnv* worker_env) {
+  return new RdmaRemoteRendezvous(worker_env, step_id, rdma_mgr_);
 }
 
 }  // end namespace tensorflow
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
index 57cd4bf5e4..2dedd6c48f 100644
--- a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
@@ -45,13 +45,12 @@ namespace tensorflow {
 // RendezvousMgr must have keys generated by Rendezvous::CreateKey.
 class RdmaRendezvousMgr : public BaseRendezvousMgr {
  public:
-  explicit RdmaRendezvousMgr(const WorkerEnv* env, const string& worker_name,
-                             WorkerCacheInterface* worker_cache);
+  explicit RdmaRendezvousMgr(const WorkerEnv* env);
   void SetRdmaMgr(RdmaMgr* rdma_mgr) { rdma_mgr_ = rdma_mgr; }
 
  protected:
-  BaseRemoteRendezvous* Create(int64 step_id, const WorkerEnv* worker_env,
-                               const string& worker_name) override;
+  BaseRemoteRendezvous* Create(int64 step_id,
+                               const WorkerEnv* worker_env) override;
 
  private:
   RdmaMgr* rdma_mgr_;
diff --git a/tensorflow/contrib/verbs/verbs_server_lib.cc b/tensorflow/contrib/verbs/verbs_server_lib.cc
index b061c81d2d..c359724935 100644
--- a/tensorflow/contrib/verbs/verbs_server_lib.cc
+++ b/tensorflow/contrib/verbs/verbs_server_lib.cc
@@ -27,10 +27,8 @@ namespace tensorflow {
 
 namespace {
 // static utility function
-RendezvousMgrInterface* NewRdmaRendezvousMgr(
-    const WorkerEnv* env, const string& worker_name,
-    WorkerCacheInterface* worker_cache) {
-  return new RdmaRendezvousMgr(env, worker_name, worker_cache);
+RendezvousMgrInterface* NewRdmaRendezvousMgr(const WorkerEnv* env) {
+  return new RdmaRendezvousMgr(env);
 }
 
 }  // namespace
@@ -56,7 +54,7 @@ Status VerbsServer::ChannelCacheFactory(const ServerDef& server_def,
   TF_RETURN_IF_ERROR(ParseChannelSpec(server_def, &channel_spec));
 
   *channel_cache =
-      NewGrpcChannelCache(channel_spec, GetChannelCreationFunction(server_def));
+      NewGrpcChannelCache(channel_spec, GetChannelCreationFunction());
 
   const string host_port = (*channel_cache)->TranslateTask(name_prefix);
   int requested_port;
@@ -86,11 +84,7 @@ Status VerbsServer::Init(ServiceInitFunction service_func,
     rdma_mgr_ = new RdmaMgr(worker_env(), channel_cache_);
     // set rdma_mgr for verbs_service and rdma_rendezvous_mgr
     verbs_service_->SetRdmaMgr(rdma_mgr_);
-    // hardcoded to default session (legacy_session_)
-    // TODO: use WorkerSessionForSession
-    // need to pass in session handle
-    dynamic_cast<RdmaRendezvousMgr*>(
-        worker_env()->session_mgr->LegacySession()->rendezvous_mgr.get())
+    dynamic_cast<RdmaRendezvousMgr*>(worker_env()->rendezvous_mgr)
         ->SetRdmaMgr(rdma_mgr_);
   }
   return s;
-- 
GitLab


From 183e2c953a81e1a5a7a8b9df2534778b5ae48379 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 11 May 2017 22:33:20 -0700
Subject: [PATCH 1271/1563] [XLA] Emit FCMP_UNE (true if unordered) instead of
 FCMP_ONE (false if unordered) for not_equal operation to be more compliant
 with TF and other languages.

PiperOrigin-RevId: 155835642
---
 .../compiler/xla/service/elemental_ir_emitter.cc | 16 ++++++++++------
 .../xla/tests/array_elementwise_ops_test.cc      | 12 ++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/tensorflow/compiler/xla/service/elemental_ir_emitter.cc b/tensorflow/compiler/xla/service/elemental_ir_emitter.cc
index a04815dad9..bea1da4044 100644
--- a/tensorflow/compiler/xla/service/elemental_ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/elemental_ir_emitter.cc
@@ -240,14 +240,18 @@ StatusOr<llvm::Value*> ElementalIrEmitter::EmitFloatBinaryOp(
       return ir_builder_->CreateFDiv(lhs_value, rhs_value);
     case HloOpcode::kRemainder:
       return ir_builder_->CreateFRem(lhs_value, rhs_value);
-
-    // The 'O' prefix on the LLVM ops means "ordered" compare where comparisons
-    // with NAN always return false.
+    // LLVM comparisons can be "unordered" (U) or "ordered" (O) -- ordered
+    // comparisons always return false when one of the operands is NaN, whereas
+    // unordered comparisons return true.
+    //
+    // We use ordered comparisons for everything except kNe, where we use an
+    // unordered comparison.  This makes x != y equivalent to !(x == y), and
+    // matches C++'s semantics.
     case HloOpcode::kEq:
       return llvm_ir::EmitComparison(llvm::CmpInst::FCMP_OEQ, lhs_value,
                                      rhs_value, ir_builder_);
     case HloOpcode::kNe:
-      return llvm_ir::EmitComparison(llvm::CmpInst::FCMP_ONE, lhs_value,
+      return llvm_ir::EmitComparison(llvm::CmpInst::FCMP_UNE, lhs_value,
                                      rhs_value, ir_builder_);
     case HloOpcode::kLt:
       return llvm_ir::EmitComparison(llvm::CmpInst::FCMP_OLT, lhs_value,
@@ -739,11 +743,11 @@ llvm_ir::ElementGenerator ElementalIrEmitter::MakeElementGenerator(
           const HloInstruction* operand = hlo->operand(operand_idx);
           auto true_block = llvm_ir::CreateBasicBlock(
               exit_block, tensorflow::strings::StrCat(
-                              "concat_index_from_operand", operand_idx),
+                      "concat_index_from_operand", operand_idx),
               ir_builder_);
           auto false_block = llvm_ir::CreateBasicBlock(
               exit_block, tensorflow::strings::StrCat(
-                              "concat_index_not_from_operand", operand_idx),
+                      "concat_index_not_from_operand", operand_idx),
               ir_builder_);
           auto concat_dim_size =
               llvm::ConstantInt::get(source_index[concat_dim]->getType(),
diff --git a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
index e682f285e0..2c748b6a7e 100644
--- a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
+++ b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
@@ -486,6 +486,18 @@ XLA_TEST_F(ArrayElementwiseOpTest, CompareEqZeroElementS32s) {
   ComputeAndCompareR1<bool>(&builder, {}, {});
 }
 
+TEST_F(ArrayElementwiseOpTest, CompareNeF32s) {
+  // Disable fast-math because we're operating on NaNs.
+  SetFastMathDisabled(true);
+
+  ComputationBuilder builder(client_, TestName());
+  auto lhs = builder.ConstantR1<float>({-2.5f, 25.5f, 2.25f, NAN, 6.0f});
+  auto rhs = builder.ConstantR1<float>({10.0f, 25.5f, 1.0f, 10.0f, NAN});
+  auto compare = builder.Ne(lhs, rhs);
+
+  ComputeAndCompareR1<bool>(&builder, {true, false, true, true, true}, {});
+}
+
 TEST_F(ArrayElementwiseOpTest, CompareNeS32s) {
   const int32 min = std::numeric_limits<int32>::min();
   const int32 max = std::numeric_limits<int32>::max();
-- 
GitLab


From deb4382989913f4f4d941bbdc3c31020c54980db Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 12 May 2017 00:09:15 -0700
Subject: [PATCH 1272/1563] Added a sanity check

PiperOrigin-RevId: 155840396
---
 tensorflow/core/grappler/costs/virtual_placer.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/costs/virtual_placer.cc b/tensorflow/core/grappler/costs/virtual_placer.cc
index dc2ca30b00..eafa6789fe 100644
--- a/tensorflow/core/grappler/costs/virtual_placer.cc
+++ b/tensorflow/core/grappler/costs/virtual_placer.cc
@@ -25,8 +25,9 @@ namespace tensorflow {
 namespace grappler {
 
 VirtualPlacer::VirtualPlacer(const Cluster* cluster) : has_gpu_(false) {
+  CHECK(cluster);
   devices_ = cluster->GetDevices();
-  for (const auto& device : cluster->GetDevices()) {
+  for (const auto& device : devices_) {
     if (str_util::Lowercase(device.first).find("gpu") != string::npos) {
       has_gpu_ = true;
     }
-- 
GitLab


From e094f0bb3f21ae9eb78525069b6d3164dd8e10a4 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 01:11:09 -0700
Subject: [PATCH 1273/1563] Let users of tf-graph-app specify just a URL of a
 pbtxt file to load instead of having to provide the full contents of a pbtxt
 file.

This nicely makes the progress bar take loading of the pbtxt file into account. It also makes tf-graph-app easier to use in some cases.

PiperOrigin-RevId: 155843642
---
 .../tensorboard/components/tf_graph_app/BUILD |  4 +--
 .../components/tf_graph_app/demo/BUILD        |  4 +--
 .../components/tf_graph_app/demo/index.html   |  7 +---
 .../components/tf_graph_app/tf-graph-app.html | 35 +++++++++++++++----
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_app/BUILD b/tensorflow/tensorboard/components/tf_graph_app/BUILD
index 4d49386fdf..499bd621c8 100644
--- a/tensorflow/tensorboard/components/tf_graph_app/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_app/BUILD
@@ -1,12 +1,12 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
-webfiles(
+web_library(
     name = "tf_graph_app",
     srcs = [
         "index.html",
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
index d5408318f4..147cb0947c 100644
--- a/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
@@ -1,11 +1,11 @@
 package(default_visibility = ["//tensorflow:internal"])
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "webfiles")
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
 
 licenses(["notice"])  # Apache 2.0
 
 # bazel run //third_party/tensorflow/tensorboard/components/tf_graph_app/demo
-webfiles(
+web_library(
     name = "demo",
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-app/demo",
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/index.html b/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
index 0bd984380b..f71feea390 100644
--- a/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
+++ b/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
@@ -29,11 +29,6 @@ limitations under the License.
 <h3>Answer to the Ultimate Question of Life, the Universe, and Everything</h3>
 <demo-snippet>
   <template>
-    <tf-graph-app></tf-graph-app>
-    <script>
-      fetch("data/graph.pbtxt", {credentials: "include"}).then(r => r.text()).then(pbtxt => {
-        document.querySelector("tf-graph-app").pbtxt = pbtxt;
-      });
-    </script>
+    <tf-graph-app pbtxt-file-location="data/graph.pbtxt"></tf-graph-app>
   </template>
 </demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html b/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
index 3365d7a100..915b54a06a 100644
--- a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
+++ b/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
@@ -111,19 +111,42 @@ Polymer({
   is: 'tf-graph-app',
   properties: {
     stats: Object,
+
+    // To use tf-graph-app, specify one of these 2 properties. Provide either
+    // 1. The path to a pbtxt file to load (pbtxtFileLocation). This option nicely makes the
+    //    progress bar include the time it takes to load the file across the network. The path could
+    //    be either a relative path or an absolute URL (of a resource that supports CORS).
+    // 2. The raw contents of a pbtxt file (pbtxt).
+    // Do not set both of these 2 properties.
+    pbtxtFileLocation: {
+      type: String,
+      observer: '_updateGraph',
+    },
     pbtxt: {
       type: String,
       observer: '_updateGraph',
     },
+
     _renderHierarchy: Object,
-    _progress: Object
+    _progress: Object,
   },
   _updateGraph: function() {
-    var blob = new Blob([this.pbtxt]);
-
-    // TODO(chizeng): Find out why we call a private method here and do away with the call.
-    this.$.loader._parseAndConstructHierarchicalGraph(null, blob);
-  }
+    if (this.pbtxtFileLocation) {
+      // Fetch a pbtxt file. The fetching will be part of the loading sequence.
+      this.$.loader.datasets = [{
+        // Just name the dataset based on the file location.
+        "name": this.pbtxtFileLocation,
+        "path": this.pbtxtFileLocation,
+      }];
+      this.$.loader.set('selectedDataset', 0);
+    } else if (this.pbtxt) {
+      // Render the provided pbtxt.
+      var blob = new Blob([this.pbtxt]);
+
+      // TODO(chizeng): Find out why we call a private method here and do away with the call.
+      this.$.loader._parseAndConstructHierarchicalGraph(null, blob);
+    }
+  },
 });
 })();
 </script>
-- 
GitLab


From 69249af5d1f2fe03235302ff5774ee61ee12e3d3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 02:33:15 -0700
Subject: [PATCH 1274/1563] Move _maybe_save_assets and its helper functions to
 the top level.

They do not depend on any state of class SavedModelBuilder.

PiperOrigin-RevId: 155848011
---
 tensorflow/python/saved_model/builder_impl.py | 156 +++++++++---------
 1 file changed, 79 insertions(+), 77 deletions(-)

diff --git a/tensorflow/python/saved_model/builder_impl.py b/tensorflow/python/saved_model/builder_impl.py
index 667cecef65..6899cb10a9 100644
--- a/tensorflow/python/saved_model/builder_impl.py
+++ b/tensorflow/python/saved_model/builder_impl.py
@@ -96,53 +96,13 @@ class SavedModelBuilder(object):
     # weights.
     self._has_saved_variables = False
 
-  def _asset_path_from_tensor(self, path_tensor):
-    """Returns the filepath value stored in constant `path_tensor`.
-
-    Args:
-      path_tensor: Tensor of a file-path.
-
-    Returns:
-      The string value i.e. path of the tensor, if valid.
-
-    Raises:
-      TypeError if tensor does not match expected op type, dtype or value.
-    """
-    if not isinstance(path_tensor, ops.Tensor):
-      raise TypeError("Asset path tensor must be a Tensor.")
-    if path_tensor.op.type != "Const":
-      raise TypeError("Asset path tensor must be of type constant.")
-    if path_tensor.dtype != dtypes.string:
-      raise TypeError("Asset path tensor must be of dtype string.")
-    str_values = path_tensor.op.get_attr("value").string_val
-    if len(str_values) != 1:
-      raise TypeError("Asset path tensor must be a scalar.")
-    return str_values[0]
-
-  def _add_asset_to_collection(self, asset_filename, asset_tensor):
-    """Builds an asset proto and adds it to the asset collection of the graph.
-
-    Args:
-      asset_filename: The filename of the asset to be added.
-      asset_tensor: The asset tensor used to populate the tensor info of the
-          asset proto.
-    """
-    asset_proto = meta_graph_pb2.AssetFileDef()
-    asset_proto.filename = asset_filename
-    asset_proto.tensor_info.name = asset_tensor.name
-
-    asset_any_proto = Any()
-    asset_any_proto.Pack(asset_proto)
-    ops.add_to_collection(constants.ASSETS_KEY, asset_any_proto)
-
   def _save_and_write_assets(self, assets_collection_to_add=None):
     """Saves asset to the meta graph and writes asset files to disk.
 
     Args:
       assets_collection_to_add: The collection where the asset paths are setup.
     """
-    asset_source_filepath_list = self._maybe_save_assets(
-        assets_collection_to_add)
+    asset_source_filepath_list = _maybe_save_assets(assets_collection_to_add)
 
     # Return if there are no assets to write.
     if len(asset_source_filepath_list) is 0:
@@ -201,42 +161,6 @@ class SavedModelBuilder(object):
         raise TypeError("main_op needs to be an Operation: %r" % main_op)
       ops.add_to_collection(constants.MAIN_OP_KEY, main_op)
 
-  def _maybe_save_assets(self, assets_collection_to_add=None):
-    """Saves assets to the meta graph.
-
-    Args:
-      assets_collection_to_add: The collection where the asset paths are setup.
-
-    Returns:
-      The list of filepaths to the assets in the assets collection.
-
-    Raises:
-      ValueError: Indicating an invalid filepath tensor.
-    """
-    asset_source_filepath_list = []
-
-    if assets_collection_to_add is None:
-      tf_logging.info("No assets to save.")
-      return asset_source_filepath_list
-
-    # Iterate over the supplied asset collection, build the `AssetFile` proto
-    # and add them to the collection with key `constants.ASSETS_KEY`, in the
-    # graph.
-    for asset_tensor in assets_collection_to_add:
-      asset_source_filepath = self._asset_path_from_tensor(asset_tensor)
-      if not asset_source_filepath:
-        raise ValueError("Invalid asset filepath tensor %s" % asset_tensor)
-
-      asset_source_filename = os.path.basename(asset_source_filepath)
-
-      # Build `AssetFile` proto and add it to the asset collection in the graph.
-      self._add_asset_to_collection(asset_source_filename, asset_tensor)
-
-      asset_source_filepath_list.append(asset_source_filepath)
-
-    tf_logging.info("Assets added to graph.")
-    return asset_source_filepath_list
-
   def _tag_and_add_meta_graph(self, meta_graph_def, tags, signature_def_map):
     """Tags the meta graph def and adds it to the SavedModel.
 
@@ -475,3 +399,81 @@ class SavedModelBuilder(object):
     tf_logging.info("SavedModel written to: %s", path)
 
     return path
+
+
+def _maybe_save_assets(assets_collection_to_add=None):
+  """Saves assets to the meta graph.
+
+  Args:
+    assets_collection_to_add: The collection where the asset paths are setup.
+
+  Returns:
+    The list of filepaths to the assets in the assets collection.
+
+  Raises:
+    ValueError: Indicating an invalid filepath tensor.
+  """
+  asset_source_filepath_list = []
+
+  if assets_collection_to_add is None:
+    tf_logging.info("No assets to save.")
+    return asset_source_filepath_list
+
+  # Iterate over the supplied asset collection, build the `AssetFile` proto
+  # and add them to the collection with key `constants.ASSETS_KEY`, in the
+  # graph.
+  for asset_tensor in assets_collection_to_add:
+    asset_source_filepath = _asset_path_from_tensor(asset_tensor)
+    if not asset_source_filepath:
+      raise ValueError("Invalid asset filepath tensor %s" % asset_tensor)
+
+    asset_source_filename = os.path.basename(asset_source_filepath)
+
+    # Build `AssetFile` proto and add it to the asset collection in the graph.
+    _add_asset_to_collection(asset_source_filename, asset_tensor)
+
+    asset_source_filepath_list.append(asset_source_filepath)
+
+  tf_logging.info("Assets added to graph.")
+  return asset_source_filepath_list
+
+
+def _asset_path_from_tensor(path_tensor):
+  """Returns the filepath value stored in constant `path_tensor`.
+
+  Args:
+    path_tensor: Tensor of a file-path.
+
+  Returns:
+    The string value i.e. path of the tensor, if valid.
+
+  Raises:
+    TypeError if tensor does not match expected op type, dtype or value.
+  """
+  if not isinstance(path_tensor, ops.Tensor):
+    raise TypeError("Asset path tensor must be a Tensor.")
+  if path_tensor.op.type != "Const":
+    raise TypeError("Asset path tensor must be of type constant.")
+  if path_tensor.dtype != dtypes.string:
+    raise TypeError("Asset path tensor must be of dtype string.")
+  str_values = path_tensor.op.get_attr("value").string_val
+  if len(str_values) != 1:
+    raise TypeError("Asset path tensor must be a scalar.")
+  return str_values[0]
+
+
+def _add_asset_to_collection(asset_filename, asset_tensor):
+  """Builds an asset proto and adds it to the asset collection of the graph.
+
+  Args:
+    asset_filename: The filename of the asset to be added.
+    asset_tensor: The asset tensor used to populate the tensor info of the
+        asset proto.
+  """
+  asset_proto = meta_graph_pb2.AssetFileDef()
+  asset_proto.filename = asset_filename
+  asset_proto.tensor_info.name = asset_tensor.name
+
+  asset_any_proto = Any()
+  asset_any_proto.Pack(asset_proto)
+  ops.add_to_collection(constants.ASSETS_KEY, asset_any_proto)
-- 
GitLab


From 5f10181420cf991d05b668e054239768d892eea9 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Fri, 12 May 2017 03:45:53 -0700
Subject: [PATCH 1275/1563] Fix python doc generation example in
 `documentation.md` Add error checking to `generate_lib.py`

fixes: #1574
PiperOrigin-RevId: 155852240
---
 tensorflow/docs_src/community/documentation.md |  2 +-
 tensorflow/tools/docs/generate_lib.py          | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/community/documentation.md b/tensorflow/docs_src/community/documentation.md
index 27b8c8d302..31a10d1f15 100644
--- a/tensorflow/docs_src/community/documentation.md
+++ b/tensorflow/docs_src/community/documentation.md
@@ -178,7 +178,7 @@ tensorflow`).  Run the following command to compile TensorFlow and generate the
 documentation in the `/tmp/tfdocs` dir:
 
     bazel run tools/docs:generate -- \
-              --src_dir=`pwd`/tensorflow/docs_src/ \
+              --src_dir="$(pwd)/docs_src/" \
               --output_dir=/tmp/tfdocs/
 
 Note: You must set `src_dir` and `output_dir` to absolute file paths.
diff --git a/tensorflow/tools/docs/generate_lib.py b/tensorflow/tools/docs/generate_lib.py
index d974f0f1af..3494c7f8c5 100644
--- a/tensorflow/tools/docs/generate_lib.py
+++ b/tensorflow/tools/docs/generate_lib.py
@@ -64,8 +64,16 @@ def write_docs(output_dir, parser_config, yaml_toc):
     parser_config: A `parser.ParserConfig` object, containing all the necessary
       indices.
     yaml_toc: Set to `True` to generate a "_toc.yaml" file.
+
+  Raises:
+    ValueError: if `output_dir` is not an absolute path
   """
   # Make output_dir.
+  if not os.path.isabs(output_dir):
+    raise ValueError(
+        "'output_dir' must be an absolute path.\n"
+        "    output_dir='%s'" % output_dir)
+
   try:
     if not os.path.exists(output_dir):
       os.makedirs(output_dir)
@@ -257,6 +265,14 @@ class _DocInfo(object):
 def build_doc_index(src_dir):
   """Build an index from a keyword designating a doc to _DocInfo objects."""
   doc_index = {}
+  if not os.path.isabs(src_dir):
+    raise ValueError("'src_dir' must be an absolute path.\n"
+                     "    src_dir='%s'" % src_dir)
+
+  if not os.path.exists(src_dir):
+    raise ValueError("'src_dir' path must exist.\n"
+                     "    src_dir='%s'" % src_dir)
+
   for dirpath, _, filenames in os.walk(src_dir):
     suffix = os.path.relpath(path=dirpath, start=src_dir)
     for base_name in filenames:
-- 
GitLab


From 8a13f77edad2c39e10dddd0043c8b97f6e08751d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 04:02:01 -0700
Subject: [PATCH 1276/1563] Add floor_div op to android build

PiperOrigin-RevId: 155853026
---
 tensorflow/contrib/makefile/tf_op_files.txt | 3 +++
 tensorflow/core/kernels/BUILD               | 1 +
 2 files changed, 4 insertions(+)

diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index e4cee308a3..2143f3b925 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -139,12 +139,15 @@ tensorflow/core/kernels/cwise_op_less.cc
 tensorflow/core/kernels/cwise_op_isfinite.cc
 tensorflow/core/kernels/cwise_op_greater_equal.cc
 tensorflow/core/kernels/cwise_op_greater.cc
+tensorflow/core/kernels/cwise_op_floor_div.cc
+tensorflow/core/kernels/cwise_op_floor.cc
 tensorflow/core/kernels/cwise_op_exp.cc
 tensorflow/core/kernels/cwise_op_equal_to_2.cc
 tensorflow/core/kernels/cwise_op_equal_to_1.cc
 tensorflow/core/kernels/cwise_op_div.cc
 tensorflow/core/kernels/cwise_op_add_2.cc
 tensorflow/core/kernels/cwise_op_add_1.cc
+tensorflow/core/kernels/cwise_op_abs.cc
 tensorflow/core/kernels/ctc_decoder_ops.cc
 tensorflow/core/kernels/crop_and_resize_op.cc
 tensorflow/core/kernels/conv_ops_using_gemm.cc
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 75921a87b5..fe1986dedd 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4132,6 +4132,7 @@ filegroup(
         "cwise_op_equal_to_2.cc",
         "cwise_op_exp.cc",
         "cwise_op_floor.cc",
+        "cwise_op_floor_div.cc",
         "cwise_op_greater.cc",
         "cwise_op_greater_equal.cc",
         "cwise_op_isfinite.cc",
-- 
GitLab


From ebb278520add4b046e283f81398df03395b5d342 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Fri, 12 May 2017 05:29:21 -0700
Subject: [PATCH 1277/1563] Give clear errors for bad input names.

PiperOrigin-RevId: 155857515
---
 tensorflow/python/tools/strip_unused_lib.py  | 17 +++++++++++++++-
 tensorflow/python/tools/strip_unused_test.py | 21 ++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/tools/strip_unused_lib.py b/tensorflow/python/tools/strip_unused_lib.py
index 8f9e20ab8e..b1d1956076 100644
--- a/tensorflow/python/tools/strip_unused_lib.py
+++ b/tensorflow/python/tools/strip_unused_lib.py
@@ -41,14 +41,26 @@ def strip_unused(input_graph_def, input_node_names, output_node_names,
         a list that specifies one value per input node name.
 
   Returns:
-    A GraphDef with all unnecessary ops removed.
+    A `GraphDef` with all unnecessary ops removed.
+
+  Raises:
+    ValueError: If any element in `input_node_names` refers to a tensor instead
+      of an operation.
+    KeyError: If any element in `input_node_names` is not found in the graph.
   """
+  for name in input_node_names:
+    if ":" in name:
+      raise ValueError("Name '%s' appears to refer to a Tensor, "
+                       "not a Operation." % name)
+
   # Here we replace the nodes we're going to override as inputs with
   # placeholders so that any unused nodes that are inputs to them are
   # automatically stripped out by extract_sub_graph().
+  not_found = {name for name in input_node_names}
   inputs_replaced_graph_def = graph_pb2.GraphDef()
   for node in input_graph_def.node:
     if node.name in input_node_names:
+      not_found.remove(node.name)
       placeholder_node = node_def_pb2.NodeDef()
       placeholder_node.op = "Placeholder"
       placeholder_node.name = node.name
@@ -67,6 +79,9 @@ def strip_unused(input_graph_def, input_node_names, output_node_names,
     else:
       inputs_replaced_graph_def.node.extend([copy.deepcopy(node)])
 
+  if not_found:
+    raise KeyError("The following input nodes were not found: %s\n" % not_found)
+
   output_graph_def = graph_util.extract_sub_graph(inputs_replaced_graph_def,
                                                   output_node_names)
   return output_graph_def
diff --git a/tensorflow/python/tools/strip_unused_test.py b/tensorflow/python/tools/strip_unused_test.py
index d492a0e822..7cf0c3e3ed 100644
--- a/tensorflow/python/tools/strip_unused_test.py
+++ b/tensorflow/python/tools/strip_unused_test.py
@@ -58,16 +58,25 @@ class StripUnusedTest(test_util.TensorFlowTestCase):
     # routine.
     input_graph_path = os.path.join(self.get_temp_dir(), input_graph_name)
     input_binary = False
-    input_node_names = "wanted_input_node"
     output_binary = True
     output_node_names = "output_node"
     output_graph_path = os.path.join(self.get_temp_dir(), output_graph_name)
 
-    strip_unused_lib.strip_unused_from_files(input_graph_path, input_binary,
-                                             output_graph_path, output_binary,
-                                             input_node_names,
-                                             output_node_names,
-                                             dtypes.float32.as_datatype_enum)
+    def strip(input_node_names):
+      strip_unused_lib.strip_unused_from_files(input_graph_path, input_binary,
+                                               output_graph_path, output_binary,
+                                               input_node_names,
+                                               output_node_names,
+                                               dtypes.float32.as_datatype_enum)
+
+    with self.assertRaises(KeyError):
+      strip("does_not_exist")
+
+    with self.assertRaises(ValueError):
+      strip("wanted_input_node:0")
+
+    input_node_names = "wanted_input_node"
+    strip(input_node_names)
 
     # Now we make sure the variable is now a constant, and that the graph still
     # produces the expected result.
-- 
GitLab


From bae71921dfc6efb9880add651aaee1292715a282 Mon Sep 17 00:00:00 2001
From: Paul Van Eck <pvaneck@us.ibm.com>
Date: Fri, 12 May 2017 06:35:31 -0700
Subject: [PATCH 1278/1563] Fix how-to reference in distributed runtime README
 (#9772)

The current link 404s, and now that the website documentation
has been updated, the link can now point there.

Signed-off-by: Paul Van Eck <pvaneck@us.ibm.com>
---
 tensorflow/core/distributed_runtime/README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tensorflow/core/distributed_runtime/README.md b/tensorflow/core/distributed_runtime/README.md
index ab1771e294..d22cd2a45b 100644
--- a/tensorflow/core/distributed_runtime/README.md
+++ b/tensorflow/core/distributed_runtime/README.md
@@ -5,6 +5,4 @@ distributed TensorFlow runtime, using [gRPC](http://grpc.io) for inter-process
 communication.
 
 To learn how to use the distributed runtime to create a TensorFlow cluster,
-see the "Distributed TensorFlow" How To, which is available [in this
-repository](../../g3doc/how_tos/distributed/index.md), and will be available
-on the TensorFlow website after the next version is released.
+see the [Distributed TensorFlow](https://www.tensorflow.org/deploy/distributed) How-To.
-- 
GitLab


From 31d3881b4b276b5aab004e69129f05d3a4c51174 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Fri, 12 May 2017 06:53:00 -0700
Subject: [PATCH 1279/1563] Fixed build error

---
 tensorflow/tensorboard/components/tf_graph_info/BUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_info/BUILD b/tensorflow/tensorboard/components/tf_graph_info/BUILD
index 95bdff9acf..cf40db7965 100644
--- a/tensorflow/tensorboard/components/tf_graph_info/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_info/BUILD
@@ -15,7 +15,10 @@ web_library(
         "tf-node-list-item.html",
     ],
     path = "/tf-graph-info",
-    suppress = ["strictDependencies"],
+    suppress = [
+        "strictDependencies",
+        "superfluousSuppress",
+    ],
     deps = [
         "//tensorflow/tensorboard/components/tf_dashboard_common",
         "//tensorflow/tensorboard/components/tf_graph_common",
-- 
GitLab


From 1ffc07e3dcab201e6cff239770108995f03da1d1 Mon Sep 17 00:00:00 2001
From: Xiaolin Lin <xlin615@gmail.com>
Date: Fri, 12 May 2017 07:03:45 -0700
Subject: [PATCH 1280/1563] correct the article (a->an) used before ubuntu
 (uu-boon-tuu) (#9769)

* correct the article used before ubuntu (uu-boon-tuu)

* note for adding additional options in compiling CUDA kernel
---
 tensorflow/docs_src/extend/adding_an_op.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index 3586794418..a8c28e98c9 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -317,7 +317,7 @@ or `clang` available on your system. The binary PIP package installs the header
 files and the library that you need to compile your op in locations that are
 system specific. However, the TensorFlow python library provides the
 `get_include` function to get the header directory.
-Here is the output of this function on a Ubuntu machine.
+Here is the output of this function on an Ubuntu machine.
 
 ```bash
 $ python
@@ -1215,6 +1215,8 @@ you'll need to specify the path explicitly in the second (g++) command above.
 For example, add `-L /usr/local/cuda-8.0/lib64/` if your CUDA is installed in
 `/usr/local/cuda-8.0`.
 
+>   Note in some linux settings, additional options to `nvcc` compiling step are needed. Add `-D_MWAITXINTRIN_H_INCLUDED` to the `nvcc` command line to avoid errors from `mwaitxintrin.h`.
+
 ### Implement the gradient in Python {#implement-gradient}
 
 Given a graph of ops, TensorFlow uses automatic differentiation
-- 
GitLab


From 53dc8ab2a14f913583cc259930f35d777bc7cc81 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Fri, 12 May 2017 07:13:53 -0700
Subject: [PATCH 1281/1563] Add newline to fix tuple output description
 formatting.

PiperOrigin-RevId: 155863837
---
 tensorflow/python/framework/python_op_gen.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/framework/python_op_gen.cc b/tensorflow/python/framework/python_op_gen.cc
index 5993d96b97..0326c7f5a8 100644
--- a/tensorflow/python/framework/python_op_gen.cc
+++ b/tensorflow/python/framework/python_op_gen.cc
@@ -283,7 +283,7 @@ static string GetReturns(const OpDef& op_def,
           out_names[i] = strings::StrCat("output", i);
         }
       }
-      strings::Appendf(&result, "    A tuple of `Tensor` objects (%s).\n",
+      strings::Appendf(&result, "    A tuple of `Tensor` objects (%s).\n\n",
                        str_util::Join(out_names, ", ").c_str());
       for (int i = 0; i < num_outs; ++i) {
         string desc = strings::StrCat(out_names[i], ": ");
-- 
GitLab


From f850ff3113125ba9f20b714074b921c2e40ba8c7 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 07:27:52 -0700
Subject: [PATCH 1282/1563] Optimize using C++ backend, and fixing incorrect
 implementation

---
 .../python/training/gradient_descent_dc.py    | 108 +++++++++---------
 1 file changed, 51 insertions(+), 57 deletions(-)

diff --git a/tensorflow/python/training/gradient_descent_dc.py b/tensorflow/python/training/gradient_descent_dc.py
index 26431fbb00..931203c7b7 100644
--- a/tensorflow/python/training/gradient_descent_dc.py
+++ b/tensorflow/python/training/gradient_descent_dc.py
@@ -20,71 +20,65 @@ from __future__ import print_function
 
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import math_ops
-from tensorflow.python.ops import resource_variable_ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import variables
 from tensorflow.python.training import optimizer
 from tensorflow.python.training import training_ops
 
+class GradientDescentDCOptimizer(optimizer.Optimizer):
 
-class GradientDescentOptimizerDC(optimizer.Optimizer):
-  """Optimizer that implements the gradient descent algorithm with delay compensation.
-  
-  See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
-  ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
-  """
-  
-  # Values for gate_gradients.
-  GATE_NONE = 0
-  GATE_OP = 1
-  GATE_GRAPH = 2
+    """Optimizer that implements the gradient descent algorithm with delay
+    compensation.
 
-  def __init__(self, learning_rate, variance_parameter, use_locking=False, name="GradientDescentDC"):
-    """Construct a new gradient descent optimizer with delay compensation.
-
-    Args:
-      learning_rate: A Tensor or a floating point value.  The learning
-        rate to use.
-      variance_parameter: A Tensor or a floating point value. The lambda value to use.
-      use_locking: If True use locks for update operations.
-      name: Optional name prefix for the operations created when applying
-        gradients. Defaults to "GradientDescentDC".
+    See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
+    ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
     """
-    super(GradientDescentOptimizerDC, self).__init__(use_locking, name)
-    self._learning_rate = learning_rate
-    self._lambda = variance_parameter
 
-  def compute_gradients(self, loss, var_list=None,
-                        gate_gradients=GATE_OP,
-                        aggregation_method=None,
-                        colocate_gradients_with_ops=False,
-                        grad_loss=None):
-    grads_and_vars = super(GradientDescentOptimizerDC, self).compute_gradients(loss, var_list, gate_gradients, aggregation_method, colocate_gradients_with_ops, grad_loss)
-    for _, var in grads_and_vars:
-      var2 = tf.identity(var.initialized_value())
-      self._get_or_make_slot(var, var2, "var_bak", self._name)
-    return grads_and_vars
+    def __init__(self, learning_rate, variance_parameter, num_workers=1,
+                 use_locking=False, name="GradientDescentDC"):
+        """Construct a new gradient descent optimizer with delay compensation.
 
-  def _apply_dense(self, grad, var):
-    var_bak = self.get_slot(var, "var_bak")
-    return training_ops.apply_gradient_descent(
-        var,
-        math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
-        math_ops.add(grad, math_ops.multiply(math_ops.multiply(grad, math_ops.cast(self._lambda_tensor, grad.dtype.base_dtype)), math_ops.subtract(var, var_bak))),
-        use_locking=self._use_locking).op
+        Args:
+          learning_rate: A Tensor or a floating point value.  The learning
+            rate to use.
+          variance_parameter: A Tensor or a floating point value. The lambda
+            value to use.
+          num_workers: A value to indicate number of workers computing gradients
+            asynchronously.
+          use_locking: If True use locks for update operations.
+          name: Optional name prefix for the operations created when applying
+            gradients. Defaults to "GradientDescentDC".
+        """
+        if num_workers <= 0:
+            raise ValueError("num_workers must be positive: %s" % num_workers)
+        super(GradientDescentDCOptimizer, self).__init__(use_locking, name)
+        self._learning_rate = learning_rate
+        self._lambda = variance_parameter
+        self._num_workers = num_workers
 
-  def _resource_apply_dense(self, grad, handle):
-    var_bak = self.get_slot(handle.handle, "var_bak")
-    return training_ops.resource_apply_gradient_descent(
-        handle.handle, math_ops.cast(self._learning_rate_tensor, grad.dtype.base_dtype),
-        math_ops.add(grad, math_ops.multiply(math_ops.multiply(grad, math_ops.cast(self._lambda_tensor, grad.dtype.base_dtype)), math_ops.subtract(handle.handle, var_bak))),
-        use_locking=self._use_locking)
+    def _create_slots(self, var_list):
+        """Initialize slots for all the vars of each worker to store
+            the previous values of it
+        """
+        for index in range(self._num_workers):
+            for v in var_list:
+                var2 = array_ops.identity(v.initialized_value())
+                self._get_or_make_slot(v, var2, "var_bak_{0}".format(index),
+                                       self._name)
 
-  def _create_slots(self, var_list):
-    for v in var_list:
-      var2 = tf.identity(v.initialized_value())
-      self._get_or_make_slot(v, var2, "var_bak", self._name)
+    def _apply_dense(self, grad, var, worker_index=0):
+        # Get previous value of the variable from the slot
+        var_bak = self.get_slot(var, "var_bak_{0}".format(worker_index))
+        return training_ops.apply_gradient_descent_dc(
+            var,
+            math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
+            grad,
+            math_ops.cast(self._lambda_tensor, var.dtype.base_dtype),
+            var_bak,
+            use_locking=self._use_locking).op
 
-  def _prepare(self):
-    self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
-                                                       name="learning_rate")
-    self._lambda_tensor = ops.convert_to_tensor(self._lambda,
-                                                      name="lambda")
+    def _prepare(self):
+        self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
+                                                           name="learning_rate")
+        self._lambda_tensor = ops.convert_to_tensor(self._lambda,
+                                                    name="lambda")
-- 
GitLab


From f8ba1e9cac766ff68231e92e5cca42e64e2ef43a Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 07:28:15 -0700
Subject: [PATCH 1283/1563] Create gradient_descent_dc_test.py

---
 .../training/gradient_descent_dc_test.py      | 128 ++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 tensorflow/python/training/gradient_descent_dc_test.py

diff --git a/tensorflow/python/training/gradient_descent_dc_test.py b/tensorflow/python/training/gradient_descent_dc_test.py
new file mode 100644
index 0000000000..704569f1fe
--- /dev/null
+++ b/tensorflow/python/training/gradient_descent_dc_test.py
@@ -0,0 +1,128 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Functional test for GradientDescentDC."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import resources
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+from tensorflow.python.training import gradient_descent_dc
+
+
+class GradientDescentDCOptimizerTest(test.TestCase):
+
+    def testBasic(self):
+        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+            with self.test_session():
+                var0 = variables.Variable([1.0, 2.0], dtype=dtype)
+                var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+                grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
+                grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
+                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
+                    learning_rate=3.0,
+                    variance_parameter=2.0,
+                    num_workers=1)
+                sgd_op = optimizer.apply_gradients(
+                    zip([grads0, grads1], [var0, var1]), worker_index=0)
+                variables.global_variables_initializer().run()
+                # Fetch params to validate initial values
+                self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
+                self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
+                # Run 1 step of sgd
+                sgd_op.run()
+                # Validate updated params
+                self.assertAllCloseAccordingToType(
+                    [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
+                self.assertAllCloseAccordingToType(
+                    [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
+
+    def testTensorLearningRate(self):
+        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+            with self.test_session():
+                var0 = variables.Variable([1.0, 2.0], dtype=dtype)
+                var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+                grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
+                grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
+                lrate = constant_op.constant(3.0)
+                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
+                    learning_rate=lrate,
+                    variance_parameter=2.0,
+                    num_workers=1)
+                sgd_op = optimizer.apply_gradients(
+                    zip([grads0, grads1], [var0, var1]),
+                    worker_index=0)
+                variables.global_variables_initializer().run()
+                # Fetch params to validate initial values
+                self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
+                self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
+                # Run 1 step of sgd
+                sgd_op.run()
+                # Validate updated params
+                self.assertAllCloseAccordingToType(
+                    [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
+                self.assertAllCloseAccordingToType(
+                    [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
+
+    def testGradWrtRef(self):
+        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+            with self.test_session():
+                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
+                    learning_rate=3.0,
+                    variance_parameter=2.0,
+                    num_workers=1)
+                values = [1.0, 3.0]
+                vars_ = [variables.Variable([v], dtype=dtype) for v in values]
+                grads_and_vars = optimizer.compute_gradients(
+                    vars_[0] + vars_[1], vars_)
+                variables.global_variables_initializer().run()
+                for grad, _ in grads_and_vars:
+                    self.assertAllCloseAccordingToType([1.0], grad.eval())
+
+    def testWithGlobalStep(self):
+        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+            with self.test_session():
+                global_step = variables.Variable(0, trainable=False)
+                var0 = variables.Variable([1.0, 2.0], dtype=dtype)
+                var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+                grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
+                grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
+                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
+                    learning_rate=3.0,
+                    variance_parameter=2.0,
+                    num_workers=1)
+                sgd_op = optimizer.apply_gradients(
+                    zip([grads0, grads1], [var0, var1]),
+                    global_step=global_step,
+                    worker_index=0)
+                variables.global_variables_initializer().run()
+                # Fetch params to validate initial values
+                self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
+                self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
+                # Run 1 step of sgd
+                sgd_op.run()
+                # Validate updated params and global_step
+                self.assertAllCloseAccordingToType(
+                    [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
+                self.assertAllCloseAccordingToType(
+                    [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
+                self.assertAllCloseAccordingToType(1, global_step.eval())
+
+if __name__ == "__main__":
+    test.main()
-- 
GitLab


From e82faa9128df5b5d06ced068b02eefa2e2dff35d Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 07:30:45 -0700
Subject: [PATCH 1284/1563] Add ApplyGradientDescentDC

---
 tensorflow/core/ops/training_ops.cc | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 2027bf4603..676ac55d95 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -101,6 +101,30 @@ delta: The change.
 use_locking: If `True`, the subtraction will be protected by a lock;
   otherwise the behavior is undefined, but may exhibit less contention.
 )doc");
+    
+REGISTER_OP("ApplyGradientDescentDC")
+    .Input("var: Ref(T)")
+    .Input("alpha: T")
+    .Input("delta: T")
+    .Input("lambda: T")
+    .Input("var_bak: Ref(T)")
+    .Output("out: Ref(T)")
+    .Attr("T: numbertype")
+    .Attr("use_locking: bool = false")
+    .SetShapeFn(ApplyGradientDescentShapeFn)
+    .Doc(R"doc(
+var -= alpha * (delta + lambda * delta * (var - var_bak))
+Update '*var_bak' by changing it to the new value of 'var'
+
+var: Should be from a Variable().
+alpha: Scaling factor. Must be a scalar.
+delta: The change.
+lambda: The variance paramter.
+var_bak: Same as "var".
+out: Same as "var".
+use_locking: If `True`, the subtraction will be protected by a lock;
+  otherwise the behavior is undefined, but may exhibit less contention.
+)doc");
 
 static Status ApplyProximalGradientDescentShapeFn(InferenceContext* c,
                                                   bool sparse) {
-- 
GitLab


From e9d79a96a129e0391a0f7508ca864e5bfe9aaa90 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 07:33:42 -0700
Subject: [PATCH 1285/1563] Add GradientDescentDC C++ op

---
 tensorflow/core/kernels/training_ops.cc | 75 +++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index c7a5ea3a9c..e2219a0450 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -57,6 +57,18 @@ struct ApplyGradientDescent<SYCLDevice, T> {
   }
 };
 #endif
+    
+template <typename T>
+struct ApplyGradientDescentDC<CPUDevice, T> {
+  void operator()(const CPUDevice& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::ConstScalar lr,
+                  typename TTypes<T>::ConstFlat grad,
+                  typename TTypes<T>::ConstScalar variance,
+                  typename TTypes<T>::Flat var_bak) {
+    var.device(d) -= lr() * (grad + variance() * grad * (var - var_bak));
+    var_bak.device(d) = var;
+  }
+};
 
 template <typename T>
 struct ApplyAdadelta<CPUDevice, T> {
@@ -451,6 +463,69 @@ REGISTER_KERNELS(GPU, double);
 #endif
 #undef REGISTER_CPU_KERNELS
 #undef REGISTER_KERNELS
+    
+template <typename Device, typename T>
+class ApplyGradientDescentDCOp : public OpKernel {
+ public:
+  explicit ApplyGradientDescentDCOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0});
+    Tensor var;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES(
+        ctx, var.IsInitialized(),
+        errors::FailedPrecondition(
+            "Attempting to use uninitialized variables: ", def().input(0)));
+    const Tensor& alpha = ctx->input(1);
+    OP_REQUIRES(ctx, IsLegacyScalar(alpha.shape()),
+                errors::InvalidArgument("alpha is not a scalar: ",
+                                        alpha.shape().DebugString()));
+    const Tensor& delta = ctx->input(2);
+    OP_REQUIRES(
+        ctx, var.shape().IsSameSize(delta.shape()),
+        errors::InvalidArgument("var and delta do not have the same shape",
+                                var.shape().DebugString(), " ",
+                                delta.shape().DebugString()));
+    const Tensor& lambda = ctx->input(3);
+    OP_REQUIRES(ctx, IsLegacyScalar(lambda.shape()),
+                errors::InvalidArgument("lambda is not a scalar: ",
+                                        lambda.shape().DebugString()));
+    Tensor var_bak;
+    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 4, use_exclusive_lock_, &var_bak));
+    OP_REQUIRES(
+        ctx, var_bak.shape().IsSameSize(var.shape()),
+        errors::InvalidArgument("var_bak and var do not have the same shape",
+                                var_bak.shape().DebugString(), " ",
+                                var.shape().DebugString()));
+
+    const Device& device = ctx->template eigen_device<Device>();
+    functor::ApplyGradientDescentDC<Device, T>()(
+        device, var.flat<T>(), alpha.scalar<T>(), delta.flat<T>(),
+         lambda.scalar<T>(), var_bak.flat<T>()
+    );
+
+    MaybeForwardRefInputToRefOutput(ctx, 0, 0);
+  }
+
+ private:
+  bool use_exclusive_lock_;
+};
+
+#define REGISTER_KERNELS(D, T)                                                 \
+  REGISTER_KERNEL_BUILDER(                                                     \
+      Name("ApplyGradientDescentDC").Device(DEVICE_##D).TypeConstraint<T>("T"),\
+      ApplyGradientDescentDCOp<D##Device, T>);
+#define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T);
+
+TF_CALL_half(REGISTER_CPU_KERNELS);
+TF_CALL_float(REGISTER_CPU_KERNELS);
+TF_CALL_double(REGISTER_CPU_KERNELS);
+
+#undef REGISTER_CPU_KERNELS
+#undef REGISTER_KERNELS
 
 template <typename Device, typename T>
 class ApplyAdadeltaOp : public OpKernel {
-- 
GitLab


From fed7d59ada2a0085a12c313b11cdb5038a4ca6c6 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 07:34:51 -0700
Subject: [PATCH 1286/1563] Add header for GradientDescentDC

---
 tensorflow/core/kernels/training_ops.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index 6b599656ce..33de08432b 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -33,6 +33,15 @@ struct ApplyGradientDescent {
                   typename TTypes<T>::ConstScalar alpha,
                   typename TTypes<T>::ConstFlat delta);
 };
+    
+template <typename Device, typename T>
+struct ApplyGradientDescentDC {
+  void operator()(const Device& d, typename TTypes<T>::Flat var,
+                  typename TTypes<T>::ConstScalar alpha,
+                  typename TTypes<T>::ConstFlat delta,
+                  typename TTypes<T>::ConstScalar lambda,
+                  typename TTypes<T>::Flat var_bak);
+};
 
 template <typename Device, typename T>
 struct ApplyAdadelta {
-- 
GitLab


From 9bcaca14552b17adedd8e31551d23f80ce0f1a06 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 07:36:25 -0700
Subject: [PATCH 1287/1563] Add asynchronous methods for op updates

---
 tensorflow/python/training/optimizer.py | 32 +++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/training/optimizer.py b/tensorflow/python/training/optimizer.py
index 3c5130d42a..18c0ab33af 100644
--- a/tensorflow/python/training/optimizer.py
+++ b/tensorflow/python/training/optimizer.py
@@ -101,6 +101,14 @@ class _RefVariableProcessor(_OptimizableVariable):
       # pylint: disable=protected-access
       return optimizer._apply_sparse_duplicate_indices(g, self._v)
 
+  def update_op_asynchronous(self, optimizer, g, index):
+    if isinstance(g, ops.Tensor):
+      return optimizer._apply_dense(g, self._v, index)
+    else:
+      assert isinstance(g, ops.IndexedSlices), ("Gradient ", g, " is neither a "
+                                                "tensor nor IndexedSlices.")
+      # pylint: disable=protected-access
+      return optimizer._apply_sparse_duplicate_indices(g, self._v, index)
 
 class _DenseReadResourceVariableProcessor(_OptimizableVariable):
   """Processor for dense ResourceVariables."""
@@ -115,6 +123,9 @@ class _DenseReadResourceVariableProcessor(_OptimizableVariable):
     # pylint: disable=protected-access
     return optimizer._resource_apply_dense(g, self._v.op.inputs[0])
 
+  def update_op_asynchronous(self, optimizer, g, index):
+    # pylint: disable=protected-access
+    return optimizer._resource_apply_dense(g, self._v.op.inputs[0], index)
 
 class _DenseResourceVariableProcessor(_OptimizableVariable):
   """Processor for dense ResourceVariables."""
@@ -132,6 +143,12 @@ class _DenseResourceVariableProcessor(_OptimizableVariable):
           g.values, self._v, g.indices)
     return optimizer._resource_apply_dense(g, self._v)
 
+  def update_op_asynchronous(self, optimizer, g, index):
+    # pylint: disable=protected-access
+    if isinstance(g, ops.IndexedSlices):
+      return optimizer._resource_apply_sparse_duplicate_indices(
+          g.values, self._v, g.indices, index)
+    return optimizer._resource_apply_dense(g, self._v, index)
 
 class _StreamingModelPortProcessor(_OptimizableVariable):
   """Processor for streaming ModelPorts."""
@@ -277,7 +294,7 @@ class Optimizer(object):
   def minimize(self, loss, global_step=None, var_list=None,
                gate_gradients=GATE_OP, aggregation_method=None,
                colocate_gradients_with_ops=False, name=None,
-               grad_loss=None):
+               grad_loss=None, worker_index=None):
     """Add operations to minimize `loss` by updating `var_list`.
 
     This method simply combines calls `compute_gradients()` and
@@ -300,6 +317,8 @@ class Optimizer(object):
         the corresponding op.
       name: Optional name for the returned operation.
       grad_loss: Optional. A `Tensor` holding the gradient computed for `loss`.
+      worker_index: Optional. A value to indicate the instance of worker
+        minimizing if computing asynchronously.
 
     Returns:
       An Operation that updates the variables in `var_list`.  If `global_step`
@@ -322,7 +341,8 @@ class Optimizer(object):
           ([str(v) for _, v in grads_and_vars], loss))
 
     return self.apply_gradients(grads_and_vars, global_step=global_step,
-                                name=name)
+                                name=name,
+                                worker_index=worker_index)
 
   def compute_gradients(self, loss, var_list=None,
                         gate_gradients=GATE_OP,
@@ -392,7 +412,7 @@ class Optimizer(object):
          if g is not None and v.dtype != dtypes.resource])
     return grads_and_vars
 
-  def apply_gradients(self, grads_and_vars, global_step=None, name=None):
+  def apply_gradients(self, grads_and_vars, global_step=None, name=None, worker_index=None):
     """Apply gradients to variables.
 
     This is the second part of `minimize()`. It returns an `Operation` that
@@ -453,7 +473,11 @@ class Optimizer(object):
         # We colocate all ops created in _apply_dense or _apply_sparse
         # on the same device as the variable.
         with ops.name_scope("update_" + var.op.name), ops.colocate_with(var):
-          update_ops.append(processor.update_op(self, grad))
+          if worker_index is None:
+            update_ops.append(processor.update_op(self, grad))
+          else:
+            update_ops.append(processor.update_op_asynchronous(self, grad,
+                                                        worker_index))
       if global_step is None:
         apply_updates = self._finish(update_ops, name)
       else:
-- 
GitLab


From 1a31f09d1cd49f6d4efafa8ad19efb4389409edb Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 07:42:31 -0700
Subject: [PATCH 1288/1563] Fix formatting issues

---
 tensorflow/python/training/optimizer.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/training/optimizer.py b/tensorflow/python/training/optimizer.py
index 18c0ab33af..1e4e039129 100644
--- a/tensorflow/python/training/optimizer.py
+++ b/tensorflow/python/training/optimizer.py
@@ -341,8 +341,7 @@ class Optimizer(object):
           ([str(v) for _, v in grads_and_vars], loss))
 
     return self.apply_gradients(grads_and_vars, global_step=global_step,
-                                name=name,
-                                worker_index=worker_index)
+                                name=name, worker_index=worker_index)
 
   def compute_gradients(self, loss, var_list=None,
                         gate_gradients=GATE_OP,
@@ -412,7 +411,11 @@ class Optimizer(object):
          if g is not None and v.dtype != dtypes.resource])
     return grads_and_vars
 
-  def apply_gradients(self, grads_and_vars, global_step=None, name=None, worker_index=None):
+  def apply_gradients(self,
+                      grads_and_vars,
+                      global_step=None,
+                      name=None,
+                      worker_index=None):
     """Apply gradients to variables.
 
     This is the second part of `minimize()`. It returns an `Operation` that
@@ -425,6 +428,8 @@ class Optimizer(object):
         variables have been updated.
       name: Optional name for the returned operation.  Default to the
         name passed to the `Optimizer` constructor.
+      worker_index: Optional value to indicate the instance of worker
+        minimizing if computing asynchronously.
 
     Returns:
       An `Operation` that applies the specified gradients. If `global_step`
@@ -477,7 +482,7 @@ class Optimizer(object):
             update_ops.append(processor.update_op(self, grad))
           else:
             update_ops.append(processor.update_op_asynchronous(self, grad,
-                                                        worker_index))
+                worker_index))
       if global_step is None:
         apply_updates = self._finish(update_ops, name)
       else:
-- 
GitLab


From ac348186c119dd397cd42d18fc4b4d48a70df6ce Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 08:14:25 -0700
Subject: [PATCH 1289/1563] Add ability to use GradientDescentDC

---
 tensorflow/python/training/training.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index bdf3d9c017..3d16433ac4 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -19,6 +19,7 @@ See the @{$python/train} guide.
 
 @@Optimizer
 @@GradientDescentOptimizer
+@@GradientDescentDCOptimizer
 @@AdadeltaOptimizer
 @@AdagradOptimizer
 @@AdagradDAOptimizer
@@ -114,6 +115,7 @@ from tensorflow.python.training.moving_averages import ExponentialMovingAverage
 from tensorflow.python.training.optimizer import Optimizer
 from tensorflow.python.training.rmsprop import RMSPropOptimizer
 from tensorflow.python.training.gradient_descent import GradientDescentOptimizer
+from tensorflow.python.training.gradient_descent_dc import GradientDescentDCOptimizer
 from tensorflow.python.training.proximal_gradient_descent import ProximalGradientDescentOptimizer
 from tensorflow.python.training.sync_replicas_optimizer import SyncReplicasOptimizer
 
-- 
GitLab


From 733bff53926717bb9583d4833ba062c58f27960f Mon Sep 17 00:00:00 2001
From: Dan Ringwalt <ringwalt@google.com>
Date: Fri, 12 May 2017 08:22:25 -0700
Subject: [PATCH 1290/1563] Add a tf.contrib.util.create_example utility for
 building Example protos.

PiperOrigin-RevId: 155868794
---
 tensorflow/contrib/util/BUILD                 | 19 +++-
 tensorflow/contrib/util/__init__.py           |  3 +-
 tensorflow/contrib/util/create_example.py     | 61 +++++++++++++
 .../contrib/util/create_example_test.py       | 86 +++++++++++++++++++
 4 files changed, 167 insertions(+), 2 deletions(-)
 create mode 100644 tensorflow/contrib/util/create_example.py
 create mode 100644 tensorflow/contrib/util/create_example_test.py

diff --git a/tensorflow/contrib/util/BUILD b/tensorflow/contrib/util/BUILD
index 5ad8e3dd35..a6d3ca7242 100644
--- a/tensorflow/contrib/util/BUILD
+++ b/tensorflow/contrib/util/BUILD
@@ -64,12 +64,29 @@ cc_binary(
 
 py_library(
     name = "util_py",
-    srcs = glob(["**/*.py"]),
+    srcs = glob(
+        ["**/*.py"],
+        exclude = ["**/*_test.py"],
+    ),
     srcs_version = "PY2AND3",
     deps = [
+        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:framework",
         "//tensorflow/python:platform",
         "//tensorflow/python:util",
+        "//third_party/py/numpy",
+    ],
+)
+
+py_test(
+    name = "create_example_test",
+    srcs = ["create_example_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":util_py",
+        "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:platform_test",
+        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/util/__init__.py b/tensorflow/contrib/util/__init__.py
index 08741cf8ca..d976a3f208 100644
--- a/tensorflow/contrib/util/__init__.py
+++ b/tensorflow/contrib/util/__init__.py
@@ -18,6 +18,7 @@
 See @{$python/contrib.util} guide.
 
 @@constant_value
+@@create_example
 @@make_tensor_proto
 @@make_ndarray
 @@ops_used_by_graph_def
@@ -30,11 +31,11 @@ from __future__ import division
 from __future__ import print_function
 
 # pylint: disable=unused-import
+from tensorflow.contrib.util.create_example import create_example
 from tensorflow.python.framework.meta_graph import ops_used_by_graph_def
 from tensorflow.python.framework.meta_graph import stripped_op_list_for_graph
 from tensorflow.python.framework.tensor_util import constant_value
 from tensorflow.python.framework.tensor_util import make_tensor_proto
 from tensorflow.python.framework.tensor_util import MakeNdarray as make_ndarray
-# pylint: disable=unused_import
 from tensorflow.python.util.all_util import remove_undocumented
 remove_undocumented(__name__)
diff --git a/tensorflow/contrib/util/create_example.py b/tensorflow/contrib/util/create_example.py
new file mode 100644
index 0000000000..8cb6e8809b
--- /dev/null
+++ b/tensorflow/contrib/util/create_example.py
@@ -0,0 +1,61 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Utilities for constructing Example protos.
+
+Takes ndarrays, lists, or tuples for each feature.
+
+@@create_example
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.core.example import example_pb2
+
+
+def create_example(**features):
+  """Constructs a `tf.train.Example` from the given features.
+
+  Args:
+    **features: Maps feature name to an integer, float, or string ndarray, or
+        another object convertible to an ndarray (list, tuple, etc).
+
+  Returns:
+    A `tf.train.Example` with the features.
+
+  Raises:
+    ValueError: if a feature is not integer, float, or string.
+  """
+  example = example_pb2.Example()
+  for name in features:
+    feature = example.features.feature[name]
+    values = np.asarray(features[name])
+    # Encode unicode using UTF-8.
+    if values.dtype.kind == 'U':
+      values = np.vectorize(lambda string: string.encode('utf-8'))(values)
+
+    if values.dtype.kind == 'i':
+      feature.int64_list.value.extend(values.astype(np.int64).ravel())
+    elif values.dtype.kind == 'f':
+      feature.float_list.value.extend(values.astype(np.float32).ravel())
+    elif values.dtype.kind == 'S':
+      feature.bytes_list.value.extend(values.ravel())
+    else:
+      raise ValueError('Feature "%s" has unexpected dtype: %s' % (name,
+                                                                  values.dtype))
+  return example
diff --git a/tensorflow/contrib/util/create_example_test.py b/tensorflow/contrib/util/create_example_test.py
new file mode 100644
index 0000000000..091b6c75d0
--- /dev/null
+++ b/tensorflow/contrib/util/create_example_test.py
@@ -0,0 +1,86 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the Example creation utilities."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib import util
+from tensorflow.core.example import example_pb2
+from tensorflow.python.platform import googletest
+
+
+class CreateExampleTest(googletest.TestCase):
+
+  def testCreateExample_empty(self):
+    self.assertEqual(util.create_example(), example_pb2.Example())
+
+    # np.asarray([]) == np.array([], dtype=np.float64), but the dtype should not
+    # matter here.
+    actual = util.create_example(foo=[], bar=())
+    expected = example_pb2.Example()
+    expected.features.feature['foo'].float_list.value.extend([])
+    expected.features.feature['bar'].float_list.value.extend([])
+    self.assertEqual(actual, expected)
+
+  def testCreateExample_scalars(self):
+    actual = util.create_example(foo=3, bar=4.2, baz='x', qux=b'y')
+    expected = example_pb2.Example()
+    expected.features.feature['foo'].int64_list.value.append(3)
+    # 4.2 cannot be represented exactly in floating point.
+    expected.features.feature['bar'].float_list.value.append(np.float32(4.2))
+    expected.features.feature['baz'].bytes_list.value.append(b'x')
+    expected.features.feature['qux'].bytes_list.value.append(b'y')
+    self.assertEqual(actual, expected)
+
+  def testCreateExample_listContainingString(self):
+    actual = util.create_example(foo=[3, 4.2, 'foo'])
+    # np.asarray([3, 4.2, 'foo']) == np.array(['3', '4.2', 'foo'])
+    expected = example_pb2.Example()
+    expected.features.feature['foo'].bytes_list.value.extend(
+        [b'3', b'4.2', b'foo'])
+    self.assertEqual(actual, expected)
+
+  def testCreateExample_lists_tuples_ranges(self):
+    actual = util.create_example(
+        foo=[1, 2, 3, 4, 5], bar=(0.5, 0.25, 0.125), baz=range(3))
+    expected = example_pb2.Example()
+    expected.features.feature['foo'].int64_list.value.extend([1, 2, 3, 4, 5])
+    expected.features.feature['bar'].float_list.value.extend([0.5, 0.25, 0.125])
+    expected.features.feature['baz'].int64_list.value.extend([0, 1, 2])
+    self.assertEqual(actual, expected)
+
+  def testCreateExample_ndarrays(self):
+    a = np.random.random((3, 4, 5)).astype(np.float32)
+    b = np.random.randint(low=1, high=10, size=(6, 5, 4))
+    actual = util.create_example(A=a, B=b)
+    expected = example_pb2.Example()
+    expected.features.feature['A'].float_list.value.extend(a.ravel())
+    expected.features.feature['B'].int64_list.value.extend(b.ravel())
+    self.assertEqual(actual, expected)
+
+  def testCreateExample_unicode(self):
+    actual = util.create_example(A=[u'\u4242', u'\u5555'])
+    expected = example_pb2.Example()
+    expected.features.feature['A'].bytes_list.value.extend(
+        [u'\u4242'.encode('utf-8'), u'\u5555'.encode('utf-8')])
+    self.assertEqual(actual, expected)
+
+
+if __name__ == '__main__':
+  googletest.main()
-- 
GitLab


From 30ee13330eed3affc2ffbf4e2d4749b4e99befc4 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 12 May 2017 08:38:51 -0700
Subject: [PATCH 1291/1563] Ensure that the minimum cost estimate is 1 ns.

PiperOrigin-RevId: 155870101
---
 .../grappler/optimizers/static_schedule.cc    |  4 +++-
 .../grappler/optimizers/static_schedule.h     |  3 +++
 .../optimizers/static_schedule_test.cc        | 24 +++++++++----------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/tensorflow/core/grappler/optimizers/static_schedule.cc b/tensorflow/core/grappler/optimizers/static_schedule.cc
index 1a7f1e04e8..e31499eac6 100644
--- a/tensorflow/core/grappler/optimizers/static_schedule.cc
+++ b/tensorflow/core/grappler/optimizers/static_schedule.cc
@@ -45,7 +45,9 @@ static Costs::NanoSeconds PredictExecutionTime(
 
   Costs::NanoSeconds estimate =
       estimator.PredictCosts(op_features).execution_time;
-  return estimate;
+
+  // Make sure our estimates are at least one nanosecond per node.
+  return std::max(estimate, Costs::NanoSeconds(1));
 }
 
 Status EstimateEarliestExecutionTimes(
diff --git a/tensorflow/core/grappler/optimizers/static_schedule.h b/tensorflow/core/grappler/optimizers/static_schedule.h
index b87d86c88a..0dd82b0dab 100644
--- a/tensorflow/core/grappler/optimizers/static_schedule.h
+++ b/tensorflow/core/grappler/optimizers/static_schedule.h
@@ -28,6 +28,9 @@ namespace grappler {
 
 // Compute the earliest time as which the execution of each node in the graph
 // can complete.
+// In our estimation, we ensure that each node takes at least one nanosecond to
+// execute: therefore the execution times can be used to derive a topological
+// ordering of the graph (at least as long as there is no loop in the graph).
 Status EstimateEarliestExecutionTimes(
     const GrapplerItem& item, const Cluster* cluster,
     std::unordered_map<const NodeDef*, Costs::NanoSeconds>* execution_times);
diff --git a/tensorflow/core/grappler/optimizers/static_schedule_test.cc b/tensorflow/core/grappler/optimizers/static_schedule_test.cc
index 31d400823c..f53feaca4c 100644
--- a/tensorflow/core/grappler/optimizers/static_schedule_test.cc
+++ b/tensorflow/core/grappler/optimizers/static_schedule_test.cc
@@ -62,19 +62,19 @@ TEST_F(StaticScheduleTest, BasicGraph) {
 
   for (auto time : completion_times) {
     if (time.first->name() == "Const/Const") {
-      EXPECT_EQ(Costs::NanoSeconds(0), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(1), time.second);
     } else if (time.first->name() == "x") {
-      EXPECT_EQ(Costs::NanoSeconds(250000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(250001), time.second);
     } else if (time.first->name() == "AddN") {
-      EXPECT_EQ(Costs::NanoSeconds(1500000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(1500001), time.second);
     } else if (time.first->name() == "AddN_1") {
-      EXPECT_EQ(Costs::NanoSeconds(2750000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(2750001), time.second);
     } else if (time.first->name() == "AddN_2") {
-      EXPECT_EQ(Costs::NanoSeconds(4000000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(4000001), time.second);
     } else if (time.first->name() == "AddN_3") {
-      EXPECT_EQ(Costs::NanoSeconds(5250000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(5250001), time.second);
     } else if (time.first->name() == "y") {
-      EXPECT_EQ(Costs::NanoSeconds(6500000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(6500001), time.second);
     }
   }
 }
@@ -108,15 +108,15 @@ TEST_F(StaticScheduleTest, BasicGraphWithCtrlDependencies) {
 
   for (auto time : completion_times) {
     if (time.first->name() == "a") {
-      EXPECT_EQ(Costs::NanoSeconds(0), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(1), time.second);
     } else if (time.first->name() == "b") {
-      EXPECT_EQ(Costs::NanoSeconds(12500000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(12500001), time.second);
     } else if (time.first->name() == "c") {
-      EXPECT_EQ(Costs::NanoSeconds(12500000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(12500002), time.second);
     } else if (time.first->name() == "d") {
-      EXPECT_EQ(Costs::NanoSeconds(12500000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(12500003), time.second);
     } else if (time.first->name() == "e") {
-      EXPECT_EQ(Costs::NanoSeconds(25000000), time.second);
+      EXPECT_EQ(Costs::NanoSeconds(25000003), time.second);
     }
   }
 }
-- 
GitLab


From 827c00e769e7a104921355591b7dc6177092e1e3 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 12 May 2017 09:39:09 -0700
Subject: [PATCH 1292/1563] Fix some linter issues with tensor.h

PiperOrigin-RevId: 155875914
---
 tensorflow/core/framework/tensor.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tensorflow/core/framework/tensor.h b/tensorflow/core/framework/tensor.h
index 753548de84..5810970a38 100644
--- a/tensorflow/core/framework/tensor.h
+++ b/tensorflow/core/framework/tensor.h
@@ -103,9 +103,9 @@ class Tensor {
   /// Copy constructor.
   Tensor(const Tensor& other);
 
-  /// \brief Move constructor. After this call, <other> is safely destructible and can
-  /// be assigned to, but other calls on it (e.g. shape manipulation) are not
-  /// valid.
+  /// \brief Move constructor. After this call, <other> is safely destructible
+  /// and can be assigned to, but other calls on it (e.g. shape manipulation)
+  /// are not valid.
   Tensor(Tensor&& other);
 
   ~Tensor();
@@ -542,7 +542,6 @@ typename TTypes<T, NDIMS>::ConstTensor Tensor::tensor() const {
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::bit_casted_tensor() {
   CHECK(IsAligned());
-  ;
   return typename TTypes<T, NDIMS>::Tensor(base<T>(),
                                            shape().AsEigenDSizes<NDIMS>());
 }
@@ -550,7 +549,6 @@ typename TTypes<T, NDIMS>::Tensor Tensor::bit_casted_tensor() {
 template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::ConstTensor Tensor::bit_casted_tensor() const {
   CHECK(IsAligned());
-  ;
   return typename TTypes<T, NDIMS>::ConstTensor(base<const T>(),
                                                 shape().AsEigenDSizes<NDIMS>());
 }
@@ -581,7 +579,6 @@ template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::Tensor Tensor::bit_casted_shaped(
     gtl::ArraySlice<int64> new_sizes) {
   CHECK(IsAligned());
-  ;
   Eigen::array<Eigen::DenseIndex, NDIMS> dims;
   FillDimsAndValidateCompatibleShape<NDIMS>(new_sizes, &dims);
   return typename TTypes<T, NDIMS>::Tensor(base<T>(), dims);
@@ -622,7 +619,6 @@ template <typename T, size_t NDIMS>
 typename TTypes<T, NDIMS>::ConstTensor Tensor::bit_casted_shaped(
     gtl::ArraySlice<int64> new_sizes) const {
   CHECK(IsAligned());
-  ;
   Eigen::array<Eigen::DenseIndex, NDIMS> dims;
   FillDimsAndValidateCompatibleShape(&dims, new_sizes);
   return typename TTypes<T, NDIMS>::ConstTensor(base<T>(), dims);
-- 
GitLab


From bdb9eb0f5252a17cb0c4bbc4189226d0ddc779d3 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Fri, 12 May 2017 09:59:58 -0700
Subject: [PATCH 1293/1563] Adds property values checks in RunConfig.

PiperOrigin-RevId: 155878342
---
 .../learn/estimators/run_config_test.py       |  8 +--
 tensorflow/python/estimator/run_config.py     | 40 +++++++++++++-
 .../python/estimator/run_config_test.py       | 54 ++++++++++++++++++-
 3 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
index 16e683d76d..6e2a2690ae 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config_test.py
@@ -22,6 +22,7 @@ import copy
 import json
 
 from tensorflow.contrib.learn.python.learn.estimators import run_config as run_config_lib
+from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.estimator import run_config as core_run_config
 from tensorflow.python.platform import test
 from tensorflow.python.training import server_lib
@@ -289,14 +290,15 @@ class RunConfigTest(test.TestCase):
         save_summary_steps=12,
         save_checkpoints_steps=13,
         save_checkpoints_secs=14,
-        session_config=15,
+        session_config=config_pb2.ConfigProto(allow_soft_placement=True),
         keep_checkpoint_max=16,
         keep_checkpoint_every_n_hours=17)
     self.assertEqual(11, config.tf_random_seed)
     self.assertEqual(12, config.save_summary_steps)
     self.assertEqual(13, config.save_checkpoints_steps)
     self.assertEqual(14, config.save_checkpoints_secs)
-    self.assertEqual(15, config.session_config)
+    self.assertEqual(config_pb2.ConfigProto(allow_soft_placement=True),
+                     config.session_config)
     self.assertEqual(16, config.keep_checkpoint_max)
     self.assertEqual(17, config.keep_checkpoint_every_n_hours)
 
@@ -305,7 +307,7 @@ class RunConfigTest(test.TestCase):
         save_summary_steps=22,
         save_checkpoints_steps=23,
         save_checkpoints_secs=24,
-        session_config=25,
+        session_config=config_pb2.ConfigProto(allow_soft_placement=False),
         keep_checkpoint_max=26,
         keep_checkpoint_every_n_hours=27)
     self.assertEqual(config.uid(), new_config.uid())
diff --git a/tensorflow/python/estimator/run_config.py b/tensorflow/python/estimator/run_config.py
index 2de168bd64..30ba18d07d 100644
--- a/tensorflow/python/estimator/run_config.py
+++ b/tensorflow/python/estimator/run_config.py
@@ -22,6 +22,8 @@ import copy
 
 import six
 
+from tensorflow.core.protobuf import config_pb2
+
 
 # A list of the property names in RunConfig user allows to change.
 _DEFAULT_REPLACEABLE_LIST = [
@@ -40,7 +42,7 @@ _SAVE_CKPT_ERR = (
 )
 
 
-def _validate_save_ckpt(new_copy, replaced_keys):
+def _validate_save_ckpt_with_replaced_keys(new_copy, replaced_keys):
   """Validates the save ckpt properties."""
   # Ensure one (and only one) of save_steps and save_secs is not None.
   # Also, if user sets one save ckpt property, say steps, the other one (secs)
@@ -48,6 +50,7 @@ def _validate_save_ckpt(new_copy, replaced_keys):
 
   save_steps = new_copy.save_checkpoints_steps
   save_secs = new_copy.save_checkpoints_secs
+
   if ('save_checkpoints_steps' in replaced_keys and
       'save_checkpoints_secs' in replaced_keys):
     # If user sets both properties explicitly, we need to error out if both
@@ -60,6 +63,37 @@ def _validate_save_ckpt(new_copy, replaced_keys):
     new_copy._save_checkpoints_steps = None  # pylint: disable=protected-access
 
 
+def _validate_properties(run_config):
+  """Validates the properties."""
+  def _validate(property_name, cond, message):
+    property_value = getattr(run_config, property_name)
+    if property_value is not None and not cond(property_value):
+      raise ValueError(message)
+
+  _validate('model_dir', lambda dir: dir,
+            message='model_dir should be non-empty')
+
+  _validate('save_summary_steps', lambda steps: steps >= 0,
+            message='save_summary_steps should be >= 0')
+
+  _validate('save_checkpoints_steps', lambda steps: steps >= 0,
+            message='save_checkpoints_steps should be >= 0')
+  _validate('save_checkpoints_secs', lambda secs: secs >= 0,
+            message='save_checkpoints_secs should be >= 0')
+
+  _validate('session_config',
+            lambda sc: isinstance(sc, config_pb2.ConfigProto),
+            message='session_config must be instance of ConfigProto')
+
+  _validate('keep_checkpoint_max', lambda keep_max: keep_max >= 0,
+            message='keep_checkpoint_max should be >= 0')
+  _validate('keep_checkpoint_every_n_hours', lambda keep_hours: keep_hours > 0,
+            message='keep_checkpoint_every_n_hours should be > 0')
+
+  _validate('tf_random_seed', lambda seed: isinstance(seed, six.integer_types),
+            message='tf_random_seed must be integer.')
+
+
 class TaskType(object):
   MASTER = 'master'
   PS = 'ps'
@@ -78,6 +112,7 @@ class RunConfig(object):
     self._session_config = None
     self._keep_checkpoint_max = 5
     self._keep_checkpoint_every_n_hours = 10000
+    _validate_properties(self)
 
   @property
   def cluster_spec(self):
@@ -205,5 +240,6 @@ class RunConfig(object):
           'Replacing {} is not supported. Allowed properties are {}.'.format(
               key, allowed_properties_list))
 
-    _validate_save_ckpt(new_copy, kwargs.keys())
+    _validate_save_ckpt_with_replaced_keys(new_copy, kwargs.keys())
+    _validate_properties(new_copy)
     return new_copy
diff --git a/tensorflow/python/estimator/run_config_test.py b/tensorflow/python/estimator/run_config_test.py
index 581322734a..18d5b2a3f6 100644
--- a/tensorflow/python/estimator/run_config_test.py
+++ b/tensorflow/python/estimator/run_config_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.estimator import run_config as run_config_lib
 from tensorflow.python.platform import test
 
@@ -27,6 +28,14 @@ _NOT_SUPPORTED_REPLACE_PROPERTY_MSG = 'Replacing .*is not supported'
 _SAVE_CKPT_ERR = (
     '`save_checkpoints_steps` and `save_checkpoints_secs` cannot be both set.'
 )
+_MODEL_DIR_ERR = 'model_dir should be non-empty'
+_SAVE_SUMMARY_STEPS_ERR = 'save_summary_steps should be >= 0'
+_SAVE_CKPT_STEPS_ERR = 'save_checkpoints_steps should be >= 0'
+_SAVE_CKPT_SECS_ERR = 'save_checkpoints_secs should be >= 0'
+_SESSION_CONFIG_ERR = 'session_config must be instance of ConfigProto'
+_KEEP_CKPT_MAX_ERR = 'keep_checkpoint_max should be >= 0'
+_KEEP_CKPT_HOURS_ERR = 'keep_checkpoint_every_n_hours should be > 0'
+_TF_RANDOM_SEED_ERR = 'tf_random_seed must be integer'
 
 
 class RunConfigTest(test.TestCase):
@@ -50,20 +59,41 @@ class RunConfigTest(test.TestCase):
     self.assertEqual(_TEST_DIR, new_config.model_dir)
 
   def test_replace_with_allowed_properties(self):
+    session_config = config_pb2.ConfigProto(allow_soft_placement=True)
+
     config = run_config_lib.RunConfig().replace(
         tf_random_seed=11,
         save_summary_steps=12,
         save_checkpoints_secs=14,
-        session_config=15,
+        session_config=session_config,
         keep_checkpoint_max=16,
         keep_checkpoint_every_n_hours=17)
     self.assertEqual(11, config.tf_random_seed)
     self.assertEqual(12, config.save_summary_steps)
     self.assertEqual(14, config.save_checkpoints_secs)
-    self.assertEqual(15, config.session_config)
+    self.assertEqual(session_config, config.session_config)
     self.assertEqual(16, config.keep_checkpoint_max)
     self.assertEqual(17, config.keep_checkpoint_every_n_hours)
 
+  def test_replace_none_value(self):
+    config = run_config_lib.RunConfig().replace(
+        tf_random_seed=None,
+        model_dir=None,
+        save_summary_steps=None,
+        save_checkpoints_secs=None,
+        save_checkpoints_steps=None,
+        session_config=None,
+        keep_checkpoint_max=None,
+        keep_checkpoint_every_n_hours=None)
+    self.assertIsNone(config.tf_random_seed)
+    self.assertIsNone(config.model_dir)
+    self.assertIsNone(config.save_summary_steps)
+    self.assertIsNone(config.save_checkpoints_secs)
+    self.assertIsNone(config.save_checkpoints_steps)
+    self.assertIsNone(config.session_config)
+    self.assertIsNone(config.keep_checkpoint_max)
+    self.assertIsNone(config.keep_checkpoint_every_n_hours)
+
   def test_replace_with_disallowallowed_properties(self):
     config = run_config_lib.RunConfig()
     with self.assertRaises(ValueError):
@@ -84,6 +114,26 @@ class RunConfigTest(test.TestCase):
         ValueError, _NOT_SUPPORTED_REPLACE_PROPERTY_MSG):
       config.replace(some_undefined_property=_MASTER)
 
+  def test_replace_invalid_values(self):
+    config = run_config_lib.RunConfig()
+
+    with self.assertRaisesRegexp(ValueError, _MODEL_DIR_ERR):
+      config.replace(model_dir='')
+    with self.assertRaisesRegexp(ValueError, _SAVE_SUMMARY_STEPS_ERR):
+      config.replace(save_summary_steps=-1)
+    with self.assertRaisesRegexp(ValueError, _SAVE_CKPT_STEPS_ERR):
+      config.replace(save_checkpoints_steps=-1)
+    with self.assertRaisesRegexp(ValueError, _SAVE_CKPT_SECS_ERR):
+      config.replace(save_checkpoints_secs=-1)
+    with self.assertRaisesRegexp(ValueError, _SESSION_CONFIG_ERR):
+      config.replace(session_config={})
+    with self.assertRaisesRegexp(ValueError, _KEEP_CKPT_MAX_ERR):
+      config.replace(keep_checkpoint_max=-1)
+    with self.assertRaisesRegexp(ValueError, _KEEP_CKPT_HOURS_ERR):
+      config.replace(keep_checkpoint_every_n_hours=0)
+    with self.assertRaisesRegexp(ValueError, _TF_RANDOM_SEED_ERR):
+      config.replace(tf_random_seed=1.0)
+
 
 class RunConfigSaveCheckpointsTest(test.TestCase):
 
-- 
GitLab


From d42b946974f2f4a39f029e3f4dc9d4394fe1a475 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 10:02:38 -0700
Subject: [PATCH 1294/1563] Get rid of gEmptyAlphaNum while there are still no
 users

PiperOrigin-RevId: 155878745
---
 tensorflow/core/lib/strings/strcat.cc | 2 --
 tensorflow/core/lib/strings/strcat.h  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tensorflow/core/lib/strings/strcat.cc b/tensorflow/core/lib/strings/strcat.cc
index b078e8cf94..3e864c4f28 100644
--- a/tensorflow/core/lib/strings/strcat.cc
+++ b/tensorflow/core/lib/strings/strcat.cc
@@ -27,8 +27,6 @@ limitations under the License.
 namespace tensorflow {
 namespace strings {
 
-AlphaNum gEmptyAlphaNum("");
-
 AlphaNum::AlphaNum(const Eigen::half &f)
     : piece_(digits_, strlen(FloatToBuffer(static_cast<float>(f), digits_))) {}
 
diff --git a/tensorflow/core/lib/strings/strcat.h b/tensorflow/core/lib/strings/strcat.h
index 9434b94411..8e35549ed4 100644
--- a/tensorflow/core/lib/strings/strcat.h
+++ b/tensorflow/core/lib/strings/strcat.h
@@ -144,8 +144,6 @@ class AlphaNum {
   TF_DISALLOW_COPY_AND_ASSIGN(AlphaNum);
 };
 
-extern AlphaNum gEmptyAlphaNum;
-
 // ----------------------------------------------------------------------
 // StrCat()
 //    This merges the given strings or numbers, with no delimiter.  This
-- 
GitLab


From 954c6f8065d38a57cb8951eef4d9f4ba7d4b608d Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Fri, 12 May 2017 11:03:11 -0700
Subject: [PATCH 1295/1563] Add control inputs to underlying TF_Graph with C
 API.

PiperOrigin-RevId: 155886892
---
 tensorflow/python/framework/ops.py      | 12 ++++++---
 tensorflow/python/framework/ops_test.py | 35 ++++++++++++++++---------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index 7f3a7eb876..b56f4bf120 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -1293,11 +1293,11 @@ class Operation(object):
         grouped_inputs = self._inputs
 
       self._c_op = self._create_c_op(self._graph, self._node_def,
-                                     grouped_inputs)
+                                     grouped_inputs, self._control_inputs)
     else:
       self._c_op = None
 
-  def _create_c_op(self, graph, node_def, inputs):
+  def _create_c_op(self, graph, node_def, inputs, control_inputs):
     """Creates a TF_Operation.
 
     Arguments:
@@ -1307,6 +1307,7 @@ class Operation(object):
         `Tensor`s (corresponding to sequence inputs, e.g. "int64 * N",
         "list(int64)"). The length of the list should be equal to the number of
         inputs specified by this operation's op def.
+      control_inputs: A list of `Operation`s to set as control dependencies.
 
     Returns:
       A wrapped TF_Operation*.
@@ -1315,14 +1316,19 @@ class Operation(object):
     op_desc = c_api.TF_NewOperation(graph._c_graph.g,
                                     compat.as_str(node_def.op),
                                     compat.as_str(node_def.name))
-
+    # Add inputs
     for op_input in inputs:
       if isinstance(op_input, (list, tuple)):
         c_api.TF_AddInputList(op_desc, [t._as_tf_output() for t in op_input])
       else:
         c_api.TF_AddInput(op_desc, op_input._as_tf_output())
+
+    # Add control inputs
+    for control_input in control_inputs:
+      c_api.TF_AddControlInput(op_desc, control_input._c_op)
     # pylint: enable=protected-access
 
+    # Add attrs
     for name, attr_value in node_def.attr.items():
       serialized = attr_value.SerializeToString()
       # TODO(skyewm): this creates and deletes a new TF_Status for every attr.
diff --git a/tensorflow/python/framework/ops_test.py b/tensorflow/python/framework/ops_test.py
index eae36a8613..32d9d52d00 100644
--- a/tensorflow/python/framework/ops_test.py
+++ b/tensorflow/python/framework/ops_test.py
@@ -37,6 +37,7 @@ from tensorflow.python.framework import test_ops
 from tensorflow.python.framework import test_ops_2
 from tensorflow.python.framework import test_util
 from tensorflow.python.framework import versions
+from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import resources
@@ -1053,18 +1054,28 @@ class ComparisonTest(test_util.TensorFlowTestCase):
 class ControlDependenciesTest(test_util.TensorFlowTestCase):
 
   def testBasic(self):
-    g = ops.Graph()
-    a = _apply_op(g, "const", [], [dtypes.float32])
-    b = _apply_op(g, "const", [], [dtypes.float32])
-    with g.control_dependencies([a]):
-      c = _apply_op(g, "const", [], [dtypes.float32])
-      d = _apply_op(g, "identity", [b], [dtypes.float32])
-      e = _apply_op(g, "identity", [c], [dtypes.float32])
-
-    self.assertEqual(c.op.control_inputs, [a.op])
-    self.assertEqual(d.op.control_inputs, [a.op])
-    # e should be dominated by c.
-    self.assertEqual(e.op.control_inputs, [])
+    ops._USE_C_API = True
+    try:
+      g = ops.Graph()
+      with g.as_default():
+        # Creating unregistered ops with _apply_op() doesn't work with the C API
+        # TODO(skyewm): address this more consistently. Possible solutions are
+        # to use registered ops in all tests, create a way to register ops in
+        # Python tests, or conditionally disable the op registration check in
+        # the C API.
+        a = constant_op.constant(1.0)
+        b = constant_op.constant(1.0)
+        with g.control_dependencies([a]):
+          c = constant_op.constant(1.0)
+          d = array_ops.identity(b)
+          e = array_ops.identity(c)
+
+      self.assertEqual(c.op.control_inputs, [a.op])
+      self.assertEqual(d.op.control_inputs, [a.op])
+      # e should be dominated by c.
+      self.assertEqual(e.op.control_inputs, [])
+    finally:
+      ops._USE_C_API = False
 
   def testBasicWithConversion(self):
     g = ops.Graph()
-- 
GitLab


From 365b5c1c322df7870688d9f08320d4012ef1b6bc Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Fri, 12 May 2017 11:03:35 -0700
Subject: [PATCH 1296/1563] Bugfix for proto file changes introduced in recent
 while_loop/stop_gradient PR.

PiperOrigin-RevId: 155886984
---
 tensorflow/core/protobuf/control_flow.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/protobuf/control_flow.proto b/tensorflow/core/protobuf/control_flow.proto
index 10a2ce54d7..48f5032254 100644
--- a/tensorflow/core/protobuf/control_flow.proto
+++ b/tensorflow/core/protobuf/control_flow.proto
@@ -62,8 +62,8 @@ message WhileContextDef {
   repeated string loop_exit_names = 8;
 
   // List of names for enter tensors.
-  repeated string loop_enter_names = 9;
+  repeated string loop_enter_names = 10;
 
   // Values and external values in control flow context.
-  ValuesDef values_def = 10;
+  ValuesDef values_def = 9;
 }
-- 
GitLab


From 04891087aa887ac744c5ec2d991314b5b3c4f78e Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Fri, 12 May 2017 11:14:24 -0700
Subject: [PATCH 1297/1563] Make all the image decode ops handle all formats

Too many users try to decode pngs as jpegs.  Now, if you pass a png to
decode_jpeg, or a gif to decode_png, it silently does what the user was
expecting.

Unfortunately, tf.image.decode_image still exists as a separate thing in
Python, since decode_gif returns 4-D shapes incompatible with the other ops.  A
future CL could clean that up, but it's hard to do in a backwards compatible
way.  As is, decode_png and decode_jpeg will bail if you try to decode an
animated gif, and produce 3-D images for nonanimated gifs.

Also fix some crash-on-error bugs and memory leak bugs in gif_io.cc.

RELNOTES: Make decode_jpeg/decode_png/decode_gif handle all formats, since users frequently try to decode an image as the wrong type.

Fixes #9786.

PiperOrigin-RevId: 155888493
---
 tensorflow/core/BUILD                      |   1 +
 tensorflow/core/kernels/BUILD              |  24 +-
 tensorflow/core/kernels/decode_gif_op.cc   |  66 -----
 tensorflow/core/kernels/decode_image_op.cc | 315 +++++++++++++++++++++
 tensorflow/core/kernels/decode_jpeg_op.cc  | 104 -------
 tensorflow/core/kernels/decode_png_op.cc   | 118 --------
 tensorflow/core/lib/gif/gif_io.cc          |  25 +-
 tensorflow/core/lib/gif/testdata/lena.gif  | Bin 0 -> 2393 bytes
 tensorflow/core/lib/strings/str_util.cc    |   2 +-
 tensorflow/core/lib/strings/str_util.h     |   2 +-
 tensorflow/core/ops/image_ops.cc           |  11 +-
 tensorflow/python/ops/image_ops_test.py    |  33 +++
 12 files changed, 380 insertions(+), 321 deletions(-)
 delete mode 100644 tensorflow/core/kernels/decode_gif_op.cc
 create mode 100644 tensorflow/core/kernels/decode_image_op.cc
 delete mode 100644 tensorflow/core/kernels/decode_jpeg_op.cc
 delete mode 100644 tensorflow/core/kernels/decode_png_op.cc
 create mode 100644 tensorflow/core/lib/gif/testdata/lena.gif

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 484ef3bf4a..c361bb5370 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -2736,6 +2736,7 @@ filegroup(
         # -- hand-edited variant: stops after a restart marker
         "lib/jpeg/testdata/corrupt34_4.jpg",
         # GIF data
+        "lib/gif/testdata/lena.gif",
         "lib/gif/testdata/scan.gif",
         # GIF data with optimization
         "lib/gif/testdata/optimized.gif",
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index fe1986dedd..5e5044981c 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -1624,9 +1624,7 @@ cc_library(
         ":attention_ops",
         ":colorspace_op",
         ":crop_and_resize_op",
-        ":decode_gif_op",
-        ":decode_jpeg_op",
-        ":decode_png_op",
+        ":decode_image_op",
         ":draw_bounding_box_op",
         ":encode_jpeg_op",
         ":encode_png_op",
@@ -1691,20 +1689,8 @@ tf_kernel_library(
 )
 
 tf_kernel_library(
-    name = "decode_jpeg_op",
-    prefix = "decode_jpeg_op",
-    deps = IMAGE_DEPS,
-)
-
-tf_kernel_library(
-    name = "decode_png_op",
-    prefix = "decode_png_op",
-    deps = IMAGE_DEPS,
-)
-
-tf_kernel_library(
-    name = "decode_gif_op",
-    prefix = "decode_gif_op",
+    name = "decode_image_op",
+    prefix = "decode_image_op",
     deps = IMAGE_DEPS,
 )
 
@@ -4305,11 +4291,9 @@ filegroup(
             "sparse_cross_op.*",
             "text_line_reader_op.*",
             "summary_image_op.*",
+            "decode_image_op.*",
             "encode_png_op.*",
-            "decode_png_op.*",
             "encode_jpeg_op.*",
-            "decode_jpeg_op.*",
-            "decode_gif_op.*",
             "identity_reader_op.*",
             "remote_fused_graph_execute_op.*",
             "fixed_length_record_reader_op.*",
diff --git a/tensorflow/core/kernels/decode_gif_op.cc b/tensorflow/core/kernels/decode_gif_op.cc
deleted file mode 100644
index 2bc17f8a30..0000000000
--- a/tensorflow/core/kernels/decode_gif_op.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// See docs in ../ops/image_ops.cc
-
-#include <memory>
-#include "tensorflow/core/framework/op_kernel.h"
-#include "tensorflow/core/framework/register_types.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/framework/tensor_shape.h"
-#include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/framework/types.pb.h"
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/lib/gif/gif_io.h"
-#include "tensorflow/core/platform/logging.h"
-
-namespace tensorflow {
-
-// Decode the contents of a GIF file
-class DecodeGifOp : public OpKernel {
- public:
-  explicit DecodeGifOp(OpKernelConstruction* context) : OpKernel(context) {}
-  void Compute(OpKernelContext* context) override {
-    const Tensor& contents = context->input(0);
-    OP_REQUIRES(context, TensorShapeUtils::IsScalar(contents.shape()),
-                errors::InvalidArgument("contents must be scalar, got shape ",
-                                        contents.shape().DebugString()));
-
-    // Start decoding image to get shape details
-    const StringPiece input = contents.scalar<string>()();
-
-    // Decode image, allocating tensor once the image size is known
-    Tensor* output = nullptr;
-    OP_REQUIRES(
-        context,
-        gif::Decode(input.data(), input.size(),
-                    [=, &output](int num_frames, int width, int height,
-                                 int channels) -> uint8* {
-                      Status status(context->allocate_output(
-                          0, TensorShape({num_frames, height, width, channels}),
-                          &output));
-                      if (!status.ok()) {
-                        VLOG(1) << status;
-                        context->SetStatus(status);
-                        return nullptr;
-                      }
-                      return output->flat<uint8>().data();
-                    }),
-        errors::InvalidArgument("Invalid GIF data, size ", input.size()));
-  }
-};
-REGISTER_KERNEL_BUILDER(Name("DecodeGif").Device(DEVICE_CPU), DecodeGifOp);
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/decode_image_op.cc b/tensorflow/core/kernels/decode_image_op.cc
new file mode 100644
index 0000000000..76f8c22543
--- /dev/null
+++ b/tensorflow/core/kernels/decode_image_op.cc
@@ -0,0 +1,315 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/image_ops.cc
+
+#include <memory>
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/gif/gif_io.h"
+#include "tensorflow/core/lib/jpeg/jpeg_mem.h"
+#include "tensorflow/core/lib/png/png_io.h"
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+namespace {
+
+enum FileFormat {
+  kUnknownFormat = 0,
+  kPngFormat = 1,
+  kJpgFormat = 2,
+  kGifFormat = 3,
+};
+
+// Classify the contents of a file based on starting bytes (the magic number).
+FileFormat ClassifyFileFormat(StringPiece data) {
+  // The 4th byte of JPEG is '\xe0' or '\xe1', so check just the first three
+  if (data.starts_with("\xff\xd8\xff")) return kJpgFormat;
+  if (data.starts_with("\x89PNG\r\n\x1a\n")) return kPngFormat;
+  if (data.starts_with("\x47\x49\x46\x38")) return kGifFormat;
+  return kUnknownFormat;
+}
+
+string FileFormatString(FileFormat magic, StringPiece data) {
+  switch (magic) {
+    case kPngFormat:
+      return "PNG";
+    case kJpgFormat:
+      return "JPEG";
+    case kGifFormat:
+      return "GIF";
+    default: {
+      if (data.empty()) return "empty file";
+      return strings::StrCat("unknown format starting with '",
+                             str_util::CEscape(data.substr(0, 16)), "'");
+    }
+  }
+}
+
+// Decode an image (either jpeg, png, or gif).  We use a single op so that
+// users don't have to care about which format they have.
+class DecodeImageOp : public OpKernel {
+ public:
+  explicit DecodeImageOp(OpKernelConstruction* context) : OpKernel(context) {
+    // Determine which op we are: jpeg, png, gif, or any
+    if (type_string() == "DecodeJpeg") {
+      format_ = kJpgFormat;
+    } else if (type_string() == "DecodePng") {
+      format_ = kPngFormat;
+    } else if (type_string() == "DecodeGif") {
+      format_ = kGifFormat;
+    } else {
+      OP_REQUIRES_OK(context,
+                     errors::InvalidArgument("Bad op type ", type_string()));
+    }
+
+    if (format_ == kGifFormat) {
+      channels_ = 3;
+    } else {
+      OP_REQUIRES_OK(context, context->GetAttr("channels", &channels_));
+      OP_REQUIRES(
+          context,
+          channels_ == 0 || channels_ == 1 || channels_ == 3 || channels_ == 4,
+          errors::InvalidArgument("channels must be 0, 1, 3, or 4, got ",
+                                  channels_));
+    }
+    flags_.components = channels_;
+
+    // In the case of png, we support uint16 output
+    if (format_ == kPngFormat) {
+      DataType dt;
+      OP_REQUIRES_OK(context, context->GetAttr("dtype", &dt));
+      OP_REQUIRES(
+          context, dt == DataType::DT_UINT8 || dt == DataType::DT_UINT16,
+          errors::InvalidArgument("Type must be uint8 or uint16, got ", dt));
+      if (dt == DataType::DT_UINT8) {
+        channel_bits_ = 8;
+      } else {
+        channel_bits_ = 16;
+      }
+    }
+
+    // The TensorFlow-chosen default for jpeg decoding is IFAST, sacrificing
+    // image quality for speed.
+    flags_.dct_method = JDCT_IFAST;
+
+    if (format_ == kJpgFormat) {
+      OP_REQUIRES_OK(context, context->GetAttr("ratio", &flags_.ratio));
+      OP_REQUIRES(context,
+                  flags_.ratio == 1 || flags_.ratio == 2 || flags_.ratio == 4 ||
+                      flags_.ratio == 8,
+                  errors::InvalidArgument("ratio must be 1, 2, 4, or 8, got ",
+                                          flags_.ratio));
+      OP_REQUIRES_OK(context, context->GetAttr("fancy_upscaling",
+                                               &flags_.fancy_upscaling));
+      OP_REQUIRES_OK(context,
+                     context->GetAttr("try_recover_truncated",
+                                      &flags_.try_recover_truncated_jpeg));
+      OP_REQUIRES_OK(context,
+                     context->GetAttr("acceptable_fraction",
+                                      &flags_.min_acceptable_fraction));
+
+      string dct_method;
+      OP_REQUIRES_OK(context, context->GetAttr("dct_method", &dct_method));
+      OP_REQUIRES(
+          context,
+          (dct_method.empty() || dct_method == "INTEGER_FAST" ||
+           dct_method == "INTEGER_ACCURATE"),
+          errors::InvalidArgument("dct_method must be one of "
+                                  "{'', 'INTEGER_FAST', 'INTEGER_ACCURATE'}"));
+      if (dct_method == "INTEGER_FAST") {
+        flags_.dct_method = JDCT_IFAST;
+      } else if (dct_method == "INTEGER_ACCURATE") {
+        flags_.dct_method = JDCT_ISLOW;
+      }
+    }
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& contents = context->input(0);
+    OP_REQUIRES(context, TensorShapeUtils::IsScalar(contents.shape()),
+                errors::InvalidArgument("contents must be scalar, got shape ",
+                                        contents.shape().DebugString()));
+
+    // Determine format
+    const StringPiece input = contents.scalar<string>()();
+    const auto magic = ClassifyFileFormat(input);
+    OP_REQUIRES(
+        context,
+        magic == kJpgFormat || magic == kPngFormat || magic == kGifFormat,
+        errors::InvalidArgument("Expected image (JPEG, PNG, or GIF), got ",
+                                FileFormatString(magic, input)));
+    OP_REQUIRES(context, input.size() <= std::numeric_limits<int>::max(),
+                errors::InvalidArgument(
+                    FileFormatString(magic, input),
+                    " contents are too large for int: ", input.size()));
+    OP_REQUIRES(context, magic == kPngFormat || channel_bits_ == 8,
+                errors::InvalidArgument(FileFormatString(magic, input),
+                                        " does not support uint16 output"));
+
+    switch (magic) {
+      case kJpgFormat:
+        DecodeJpeg(context, input);
+        break;
+      case kPngFormat:
+        DecodePng(context, input);
+        break;
+      case kGifFormat:
+        DecodeGif(context, input);
+        break;
+      default:
+        LOG(FATAL) << "Should never get here after check above";
+        break;
+    }
+  }
+
+  void DecodeJpeg(OpKernelContext* context, StringPiece input) {
+    OP_REQUIRES(context, channels_ == 0 || channels_ == 1 || channels_ == 3,
+                errors::InvalidArgument(
+                    "channels must be 0, 1, or 3 for JPEG, got ", channels_));
+
+    // Decode jpeg, allocating tensor once the size is known
+    Tensor* output = nullptr;
+    OP_REQUIRES(
+        context,
+        jpeg::Uncompress(
+            input.data(), input.size(), flags_, nullptr /* nwarn */,
+            [=, &output](int width, int height, int channels) -> uint8* {
+              Status status(context->allocate_output(
+                  0,
+                  format_ == kGifFormat
+                      ? TensorShape({1, height, width, channels})
+                      : TensorShape({height, width, channels}),
+                  &output));
+              if (!status.ok()) {
+                VLOG(1) << status;
+                context->SetStatus(status);
+                return nullptr;
+              }
+              return output->flat<uint8>().data();
+            }),
+        errors::InvalidArgument("Invalid JPEG data, size ", input.size()));
+  }
+
+  void DecodePng(OpKernelContext* context, StringPiece input) {
+    // Start decoding png to get shape details
+    png::DecodeContext decode;
+    OP_REQUIRES(context,
+                png::CommonInitDecode(input, channels_, channel_bits_, &decode),
+                errors::InvalidArgument("Invalid PNG header, data size ",
+                                        input.size()));
+
+    // Verify that width and height are not too large:
+    // - verify width and height don't overflow int.
+    // - width can later be multiplied by channels_ and sizeof(uint16), so
+    //   verify single dimension is not too large.
+    // - verify when width and height are multiplied together, there are a few
+    //   bits to spare as well.
+    const int width = static_cast<int>(decode.width);
+    const int height = static_cast<int>(decode.height);
+    const int64 total_size =
+        static_cast<int64>(width) * static_cast<int64>(height);
+    if (width != static_cast<int64>(decode.width) || width <= 0 ||
+        width >= (1LL << 27) || height != static_cast<int64>(decode.height) ||
+        height <= 0 || height >= (1LL << 27) || total_size >= (1LL << 29)) {
+      png::CommonFreeDecode(&decode);
+      OP_REQUIRES(context, false,
+                  errors::InvalidArgument("PNG size too large for int: ",
+                                          decode.width, " by ", decode.height));
+    }
+
+    // Allocate tensor
+    Tensor* output = nullptr;
+    const auto status = context->allocate_output(
+        0,
+        format_ == kGifFormat ? TensorShape({1, height, width, decode.channels})
+                              : TensorShape({height, width, decode.channels}),
+        &output);
+    if (!status.ok()) png::CommonFreeDecode(&decode);
+    OP_REQUIRES_OK(context, status);
+
+    if (channel_bits_ == 8) {
+      // Finish decoding png
+      OP_REQUIRES(
+          context,
+          png::CommonFinishDecode(
+              reinterpret_cast<png_bytep>(output->flat<uint8>().data()),
+              decode.channels * width * sizeof(uint8), &decode),
+          errors::InvalidArgument("Invalid PNG data, size ", input.size()));
+    } else {
+      // Finish decoding png
+      OP_REQUIRES(
+          context,
+          png::CommonFinishDecode(
+              reinterpret_cast<png_bytep>(output->flat<uint16>().data()),
+              decode.channels * width * sizeof(uint16), &decode),
+          errors::InvalidArgument("Invalid PNG data, size ", input.size()));
+    }
+  }
+
+  void DecodeGif(OpKernelContext* context, StringPiece input) {
+    OP_REQUIRES(context, channels_ == 0 || channels_ == 3,
+                errors::InvalidArgument("channels must be 0 or 3 for GIF, got ",
+                                        channels_));
+
+    // Decode GIF, allocating tensor once the size is known.
+    Tensor* output = nullptr;
+    OP_REQUIRES(
+        context,
+        gif::Decode(input.data(), input.size(),
+                    [=, &output](int num_frames, int width, int height,
+                                 int channels) -> uint8* {
+                      Status status;
+                      if (format_ == kGifFormat) {
+                        status = context->allocate_output(
+                            0,
+                            TensorShape({num_frames, height, width, channels}),
+                            &output);
+                      } else if (num_frames == 1) {
+                        status = context->allocate_output(
+                            0, TensorShape({height, width, channels}), &output);
+                      } else {
+                        status = errors::InvalidArgument(
+                            "Got ", num_frames, " frames, but animated gifs ",
+                            "can only be decoded by tf.image.decode_gif or ",
+                            "tf.image.decode_image");
+                      }
+                      if (!status.ok()) {
+                        VLOG(1) << status;
+                        context->SetStatus(status);
+                        return nullptr;
+                      }
+                      return output->flat<uint8>().data();
+                    }),
+        errors::InvalidArgument("Invalid GIF data, size ", input.size()));
+  }
+
+ private:
+  FileFormat format_;
+  int channels_;
+  int channel_bits_ = 8;
+  jpeg::UncompressFlags flags_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("DecodeJpeg").Device(DEVICE_CPU), DecodeImageOp);
+REGISTER_KERNEL_BUILDER(Name("DecodePng").Device(DEVICE_CPU), DecodeImageOp);
+REGISTER_KERNEL_BUILDER(Name("DecodeGif").Device(DEVICE_CPU), DecodeImageOp);
+
+}  // namespace
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/decode_jpeg_op.cc b/tensorflow/core/kernels/decode_jpeg_op.cc
deleted file mode 100644
index b795f39550..0000000000
--- a/tensorflow/core/kernels/decode_jpeg_op.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// See docs in ../ops/image_ops.cc
-
-#include <memory>
-#include "tensorflow/core/framework/op_kernel.h"
-#include "tensorflow/core/framework/register_types.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/framework/tensor_shape.h"
-#include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/lib/jpeg/jpeg_mem.h"
-#include "tensorflow/core/platform/logging.h"
-
-namespace tensorflow {
-
-// Decode the contents of a JPEG file
-class DecodeJpegOp : public OpKernel {
- public:
-  explicit DecodeJpegOp(OpKernelConstruction* context) : OpKernel(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("channels", &flags_.components));
-    OP_REQUIRES(context, flags_.components == 0 || flags_.components == 1 ||
-                             flags_.components == 3,
-                errors::InvalidArgument("channels must be 0, 1, or 3, got ",
-                                        flags_.components));
-    OP_REQUIRES_OK(context, context->GetAttr("ratio", &flags_.ratio));
-    OP_REQUIRES(context, flags_.ratio == 1 || flags_.ratio == 2 ||
-                             flags_.ratio == 4 || flags_.ratio == 8,
-                errors::InvalidArgument("ratio must be 1, 2, 4, or 8, got ",
-                                        flags_.ratio));
-    OP_REQUIRES_OK(
-        context, context->GetAttr("fancy_upscaling", &flags_.fancy_upscaling));
-    OP_REQUIRES_OK(context,
-                   context->GetAttr("try_recover_truncated",
-                                    &flags_.try_recover_truncated_jpeg));
-    OP_REQUIRES_OK(context, context->GetAttr("acceptable_fraction",
-                                             &flags_.min_acceptable_fraction));
-
-    string dct_method;
-    OP_REQUIRES_OK(context, context->GetAttr("dct_method", &dct_method));
-    OP_REQUIRES(
-        context, (dct_method.empty() || dct_method == "INTEGER_FAST" ||
-                  dct_method == "INTEGER_ACCURATE"),
-        errors::InvalidArgument("dct_method must be one of "
-                                "{'', 'INTEGER_FAST', 'INTEGER_ACCURATE'}"));
-    if (dct_method == "INTEGER_FAST") {
-      flags_.dct_method = JDCT_IFAST;
-    } else if (dct_method == "INTEGER_ACCURATE") {
-      flags_.dct_method = JDCT_ISLOW;
-    } else {
-      // The TensorFlow-chosen default is IFAST, sacrificing decoding
-      // image quality for speed.
-      flags_.dct_method = JDCT_IFAST;
-    }
-  }
-
-  void Compute(OpKernelContext* context) override {
-    const Tensor& contents = context->input(0);
-    OP_REQUIRES(context, TensorShapeUtils::IsScalar(contents.shape()),
-                errors::InvalidArgument("contents must be scalar, got shape ",
-                                        contents.shape().DebugString()));
-    const StringPiece input = contents.scalar<string>()();
-    OP_REQUIRES(context, input.size() <= std::numeric_limits<int>::max(),
-                errors::InvalidArgument("JPEG contents are too large for int: ",
-                                        input.size()));
-
-    // Decode image, allocating tensor once the image size is known
-    Tensor* output = NULL;
-    OP_REQUIRES(
-        context,
-        jpeg::Uncompress(
-            input.data(), input.size(), flags_, nullptr /* nwarn */,
-            [=, &output](int width, int height, int channels) -> uint8* {
-              Status status(context->allocate_output(
-                  0, TensorShape({height, width, channels}), &output));
-              if (!status.ok()) {
-                VLOG(1) << status;
-                context->SetStatus(status);
-                return nullptr;
-              }
-              return output->flat<uint8>().data();
-            }),
-        errors::InvalidArgument("Invalid JPEG data, size ", input.size()));
-  }
-
- private:
-  jpeg::UncompressFlags flags_;
-};
-REGISTER_KERNEL_BUILDER(Name("DecodeJpeg").Device(DEVICE_CPU), DecodeJpegOp);
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/decode_png_op.cc b/tensorflow/core/kernels/decode_png_op.cc
deleted file mode 100644
index 1906ae7746..0000000000
--- a/tensorflow/core/kernels/decode_png_op.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// See docs in ../ops/image_ops.cc
-
-#include <memory>
-#include "tensorflow/core/framework/op_kernel.h"
-#include "tensorflow/core/framework/register_types.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/framework/tensor_shape.h"
-#include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/framework/types.pb.h"
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/lib/png/png_io.h"
-#include "tensorflow/core/platform/logging.h"
-
-namespace tensorflow {
-
-// Decode the contents of a PNG file
-class DecodePngOp : public OpKernel {
- public:
-  explicit DecodePngOp(OpKernelConstruction* context) : OpKernel(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("channels", &channels_));
-    OP_REQUIRES(context, channels_ == 0 || channels_ == 1 || channels_ == 3 ||
-                             channels_ == 4,
-                errors::InvalidArgument("channels must be 0, 1, 3, or 4, got ",
-                                        channels_));
-
-    DataType dt;
-    OP_REQUIRES_OK(context, context->GetAttr("dtype", &dt));
-    OP_REQUIRES(
-        context, dt == DataType::DT_UINT8 || dt == DataType::DT_UINT16,
-        errors::InvalidArgument("Type must be UINT8 or UINT16, got ", dt));
-    if (dt == DataType::DT_UINT8) {
-      desired_channel_bits_ = 8;
-    } else {
-      desired_channel_bits_ = 16;
-    }
-  }
-
-  void Compute(OpKernelContext* context) override {
-    const Tensor& contents = context->input(0);
-    OP_REQUIRES(context, TensorShapeUtils::IsScalar(contents.shape()),
-                errors::InvalidArgument("contents must be scalar, got shape ",
-                                        contents.shape().DebugString()));
-
-    // Start decoding image to get shape details
-    const StringPiece data = contents.scalar<string>()();
-    png::DecodeContext decode;
-    OP_REQUIRES(
-        context,
-        png::CommonInitDecode(data, channels_, desired_channel_bits_, &decode),
-        errors::InvalidArgument("Invalid PNG header, data size ", data.size()));
-
-    // Verify that width and height are not too large:
-    // - verify width and height don't overflow int.
-    // - width can later be multiplied by channels_ and sizeof(uint16), so
-    //   verify single dimension is not too large.
-    // - verify when width and height are multiplied together, there are a few
-    //   bits to spare as well.
-    const int width = static_cast<int>(decode.width);
-    const int height = static_cast<int>(decode.height);
-    const int64 total_size =
-        static_cast<int64>(width) * static_cast<int64>(height);
-    if (width != static_cast<int64>(decode.width) || width <= 0 ||
-        width >= (1LL << 27) || height != static_cast<int64>(decode.height) ||
-        height <= 0 || height >= (1LL << 27) || total_size >= (1LL << 29)) {
-      png::CommonFreeDecode(&decode);
-      OP_REQUIRES(context, false,
-                  errors::InvalidArgument("PNG size too large for int: ",
-                                          decode.width, " by ", decode.height));
-    }
-
-    // Allocate tensor
-    Tensor* output = nullptr;
-    const auto status = context->allocate_output(
-        0, TensorShape({height, width, decode.channels}), &output);
-    if (!status.ok()) png::CommonFreeDecode(&decode);
-    OP_REQUIRES_OK(context, status);
-
-    if (desired_channel_bits_ == 8) {
-      // Finish decoding image
-      OP_REQUIRES(
-          context,
-          png::CommonFinishDecode(
-              reinterpret_cast<png_bytep>(output->flat<uint8>().data()),
-              decode.channels * width * sizeof(uint8), &decode),
-          errors::InvalidArgument("Invalid PNG data, size ", data.size()));
-    } else {
-      // Finish decoding image
-      OP_REQUIRES(
-          context,
-          png::CommonFinishDecode(
-              reinterpret_cast<png_bytep>(output->flat<uint16>().data()),
-              decode.channels * width * sizeof(uint16), &decode),
-          errors::InvalidArgument("Invalid PNG data, size ", data.size()));
-    }
-  }
-
- private:
-  int channels_;
-  int desired_channel_bits_;
-};
-REGISTER_KERNEL_BUILDER(Name("DecodePng").Device(DEVICE_CPU), DecodePngOp);
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/lib/gif/gif_io.cc b/tensorflow/core/lib/gif/gif_io.cc
index df8887b1c4..db230b1e56 100644
--- a/tensorflow/core/lib/gif/gif_io.cc
+++ b/tensorflow/core/lib/gif/gif_io.cc
@@ -16,6 +16,7 @@ limitations under the License.
 // Functions to read images in GIF format.
 
 #include "tensorflow/core/lib/gif/gif_io.h"
+#include "tensorflow/core/lib/gtl/cleanup.h"
 #include "tensorflow/core/platform/gif.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/mem.h"
@@ -26,7 +27,7 @@ namespace gif {
 
 int input_callback(GifFileType* gif_file, GifByteType* buf, int size) {
   if (gif_file->UserData && memcpy(buf, gif_file->UserData, size)) {
-    gif_file->UserData = ((uint8_t*)gif_file->UserData) + size;
+    gif_file->UserData = reinterpret_cast<uint8_t*>(gif_file->UserData) + size;
     return size;
   }
   return 0;
@@ -37,6 +38,13 @@ uint8* Decode(const void* srcdata, int datasize,
   int error_code = D_GIF_SUCCEEDED;
   GifFileType* gif_file =
       DGifOpen(const_cast<void*>(srcdata), &input_callback, &error_code);
+  const auto cleanup = gtl::MakeCleanup([gif_file]() {
+    int error_code = D_GIF_SUCCEEDED;
+    if (gif_file && DGifCloseFile(gif_file, &error_code) != GIF_OK) {
+      LOG(WARNING) << "Fail to close gif file, reason: "
+                   << GifErrorString(error_code);
+    }
+  });
   if (error_code != D_GIF_SUCCEEDED) {
     LOG(ERROR) << "Fail to open gif file, reason: "
                << GifErrorString(error_code);
@@ -52,12 +60,13 @@ uint8* Decode(const void* srcdata, int datasize,
     return nullptr;
   }
 
-  int num_frames = gif_file->ImageCount;
-  int width = gif_file->SWidth;
-  int height = gif_file->SHeight;
-  int channel = 3;
+  const int num_frames = gif_file->ImageCount;
+  const int width = gif_file->SWidth;
+  const int height = gif_file->SHeight;
+  const int channel = 3;
 
-  uint8* dstdata = allocate_output(num_frames, width, height, channel);
+  uint8* const dstdata = allocate_output(num_frames, width, height, channel);
+  if (!dstdata) return nullptr;
   for (int k = 0; k < num_frames; k++) {
     SavedImage* this_image = &gif_file->SavedImages[k];
     GifImageDesc* img_desc = &this_image->ImageDesc;
@@ -84,10 +93,6 @@ uint8* Decode(const void* srcdata, int datasize,
     }
   }
 
-  if (DGifCloseFile(gif_file, &error_code) != GIF_OK) {
-    LOG(WARNING) << "Fail to close gif file, reason: "
-                 << GifErrorString(error_code);
-  }
   return dstdata;
 }
 
diff --git a/tensorflow/core/lib/gif/testdata/lena.gif b/tensorflow/core/lib/gif/testdata/lena.gif
new file mode 100644
index 0000000000000000000000000000000000000000..12980a3b28af48982e50386f94f9a1c112a10f18
GIT binary patch
literal 2393
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
AHvj+t

literal 0
HcmV?d00001

diff --git a/tensorflow/core/lib/strings/str_util.cc b/tensorflow/core/lib/strings/str_util.cc
index e9a3a8bdb4..c68e14f09f 100644
--- a/tensorflow/core/lib/strings/str_util.cc
+++ b/tensorflow/core/lib/strings/str_util.cc
@@ -25,7 +25,7 @@ namespace str_util {
 
 static char hex_char[] = "0123456789abcdef";
 
-string CEscape(const string& src) {
+string CEscape(StringPiece src) {
   string dest;
 
   for (unsigned char c : src) {
diff --git a/tensorflow/core/lib/strings/str_util.h b/tensorflow/core/lib/strings/str_util.h
index af24975ef4..669f0d3c52 100644
--- a/tensorflow/core/lib/strings/str_util.h
+++ b/tensorflow/core/lib/strings/str_util.h
@@ -30,7 +30,7 @@ namespace str_util {
 
 // Returns a version of 'src' where unprintable characters have been
 // escaped using C-style escape sequences.
-string CEscape(const string& src);
+string CEscape(StringPiece src);
 
 // Copies "source" to "dest", rewriting C-style escape sequences --
 // '\n', '\r', '\\', '\ooo', etc -- to their ASCII equivalents.
diff --git a/tensorflow/core/ops/image_ops.cc b/tensorflow/core/ops/image_ops.cc
index 41a3aa0c38..cfcf2d1ff9 100644
--- a/tensorflow/core/ops/image_ops.cc
+++ b/tensorflow/core/ops/image_ops.cc
@@ -349,6 +349,9 @@ The attr `ratio` allows downscaling the image by an integer factor during
 decoding.  Allowed values are: 1, 2, 4, and 8.  This is much faster than
 downscaling the image later.
 
+This op also supports decoding PNGs and non-animated GIFs since the interface is
+the same, though it is cleaner to use `tf.image.decode_image`.
+
 contents: 0-D.  The JPEG-encoded image.
 channels: Number of color channels for the decoded image.
 ratio: Downscaling ratio.
@@ -525,6 +528,9 @@ Accepted values are:
 If needed, the PNG-encoded image is transformed to match the requested number
 of color channels.
 
+This op also supports decoding JPEGs and non-animated GIFs since the interface
+is the same, though it is cleaner to use `tf.image.decode_image`.
+
 contents: 0-D.  The PNG-encoded image.
 channels: Number of color channels for the decoded image.
 image: 3-D with shape `[height, width, channels]`.
@@ -576,7 +582,10 @@ Decode the first frame of a GIF-encoded image to a uint8 tensor.
 GIF with frame or transparency compression are not supported
 convert animated GIF from compressed to uncompressed by:
 
-convert $src.gif -coalesce $dst.gif
+    convert $src.gif -coalesce $dst.gif
+
+This op also supports decoding JPEGs and PNGs, though it is cleaner to use
+`tf.image.decode_image`.
 
 contents: 0-D.  The GIF-encoded image.
 image: 4-D with shape `[num_frames, height, width, 3]`. RGB order
diff --git a/tensorflow/python/ops/image_ops_test.py b/tensorflow/python/ops/image_ops_test.py
index 1a70d46507..492dbe6d13 100644
--- a/tensorflow/python/ops/image_ops_test.py
+++ b/tensorflow/python/ops/image_ops_test.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 import colorsys
+import functools
 import math
 import os
 import time
@@ -2792,5 +2793,37 @@ class TotalVariationTest(test_util.TensorFlowTestCase):
     self._test(multi, tot_var * np.array([1.0, 1.1, 1.2]))
 
 
+class FormatTest(test_util.TensorFlowTestCase):
+
+  def testFormats(self):
+    prefix = "tensorflow/core/lib"
+    paths = ("png/testdata/lena_gray.png", "jpeg/testdata/jpeg_merge_test1.jpg",
+             "gif/testdata/lena.gif")
+    decoders = {
+        "jpeg": functools.partial(image_ops.decode_jpeg, channels=3),
+        "png": functools.partial(image_ops.decode_png, channels=3),
+        "gif": lambda s: array_ops.squeeze(image_ops.decode_gif(s), axis=0),
+    }
+    with self.test_session():
+      for path in paths:
+        contents = io_ops.read_file(os.path.join(prefix, path)).eval()
+        images = {}
+        for name, decode in decoders.items():
+          image = decode(contents).eval()
+          self.assertEqual(image.ndim, 3)
+          for prev_name, prev in images.items():
+            print("path %s, names %s %s, shapes %s %s" %
+                  (path, name, prev_name, image.shape, prev.shape))
+            self.assertAllEqual(image, prev)
+          images[name] = image
+
+  def testError(self):
+    path = "tensorflow/core/lib/gif/testdata/scan.gif"
+    with self.test_session():
+      for decode in image_ops.decode_jpeg, image_ops.decode_png:
+        with self.assertRaisesOpError(r"Got 12 frames"):
+          decode(io_ops.read_file(path)).eval()
+
+
 if __name__ == "__main__":
   googletest.main()
-- 
GitLab


From 1f50f3d5d6bc7ed9bfcd70b83fde066077c3359f Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Fri, 12 May 2017 11:30:09 -0700
Subject: [PATCH 1298/1563] FeatureColumn: Reshape sparse tensors for linear
 models.

PiperOrigin-RevId: 155890727
---
 .../python/feature_column/feature_column.py   | 19 +++++++++++++++--
 .../feature_column/feature_column_test.py     | 21 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 41d0be794a..c827804c73 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -1330,6 +1330,13 @@ class _CategoricalColumn(_FeatureColumn):
     pass
 
 
+def _sparse_reshape(inputs, shape):
+  # Satisfies sparse_reshape assumptions such as dtype int64.
+  # shape is a list.
+  return sparse_ops.sparse_reshape(inputs,
+                                   math_ops.cast(shape, dtypes.int64))
+
+
 def _create_categorical_column_weighted_sum(
     column, builder, units, sparse_combiner, weight_collections, trainable):
   """Create a weighted sum of a categorical column for linear_model."""
@@ -1337,6 +1344,14 @@ def _create_categorical_column_weighted_sum(
       builder,
       weight_collections=weight_collections,
       trainable=trainable)
+  id_tensor = _sparse_reshape(sparse_tensors.id_tensor, [
+      array_ops.shape(sparse_tensors.id_tensor)[0], -1
+  ])
+  weight_tensor = sparse_tensors.weight_tensor
+  if weight_tensor is not None:
+    weight_tensor = _sparse_reshape(weight_tensor,
+                                    [array_ops.shape(weight_tensor)[0], -1])
+
   weight = variable_scope.get_variable(
       name='weight',
       shape=(column._num_buckets, units),  # pylint: disable=protected-access
@@ -1345,8 +1360,8 @@ def _create_categorical_column_weighted_sum(
       collections=weight_collections)
   return _safe_embedding_lookup_sparse(
       weight,
-      sparse_tensors.id_tensor,
-      sparse_weights=sparse_tensors.weight_tensor,
+      id_tensor,
+      sparse_weights=weight_tensor,
       combiner=sparse_combiner,
       name='weighted_sum')
 
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 7d0a92026d..156aa38208 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -1241,6 +1241,27 @@ class MakeLinearModelTest(test.TestCase):
         sess.run(price_var.assign([[10.], [100.]]))
         self.assertAllClose([[210.], [650.]], predictions.eval())
 
+  def test_sparse_multi_rank(self):
+    wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
+    with ops.Graph().as_default():
+      wire_tensor = array_ops.sparse_placeholder(dtypes.string)
+      wire_value = sparse_tensor.SparseTensorValue(
+          values=['omar', 'stringer', 'marlo', 'omar'],  # hashed = [2, 0, 3, 2]
+          indices=[[0, 0, 0], [0, 1, 0], [1, 0, 0], [1, 0, 1]],
+          dense_shape=[2, 2, 2])
+      features = {'wire_cast': wire_tensor}
+      predictions = fc.linear_model(features, [wire_cast])
+      wire_cast_var = get_linear_model_column_var(wire_cast)
+      with _initialized_session() as sess:
+        self.assertAllClose(np.zeros((4, 1)), wire_cast_var.eval())
+        self.assertAllClose(
+            np.zeros((2, 1)),
+            predictions.eval(feed_dict={wire_tensor: wire_value}))
+        sess.run(wire_cast_var.assign([[10.], [100.], [1000.], [10000.]]))
+        self.assertAllClose(
+            [[1010.], [11000.]],
+            predictions.eval(feed_dict={wire_tensor: wire_value}))
+
   def test_sparse_combiner(self):
     wire_cast = fc.categorical_column_with_hash_bucket('wire_cast', 4)
     with ops.Graph().as_default():
-- 
GitLab


From 6ecf9d143f98c318f008199d9cb6da00b483cf45 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 11:34:18 -0700
Subject: [PATCH 1299/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 155891274
---
 tensorflow/core/ops/ops.pbtxt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 6ea21edb4d..8cbebb0041 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -5536,7 +5536,7 @@ op {
     type: DT_UINT8
   }
   summary: "Decode the first frame of a GIF-encoded image to a uint8 tensor."
-  description: "GIF with frame or transparency compression are not supported\nconvert animated GIF from compressed to uncompressed by:\n\nconvert $src.gif -coalesce $dst.gif"
+  description: "GIF with frame or transparency compression are not supported\nconvert animated GIF from compressed to uncompressed by:\n\n    convert $src.gif -coalesce $dst.gif\n\nThis op also supports decoding JPEGs and PNGs, though it is cleaner to use\n`tf.image.decode_image`."
 }
 op {
   name: "DecodeJSONExample"
@@ -5614,7 +5614,7 @@ op {
     description: "string specifying a hint about the algorithm used for\ndecompression.  Defaults to \"\" which maps to a system-specific\ndefault.  Currently valid values are [\"INTEGER_FAST\",\n\"INTEGER_ACCURATE\"].  The hint may be ignored (e.g., the internal\njpeg library changes to a version that does not have that specific\noption.)"
   }
   summary: "Decode a JPEG-encoded image to a uint8 tensor."
-  description: "The attr `channels` indicates the desired number of color channels for the\ndecoded image.\n\nAccepted values are:\n\n*   0: Use the number of channels in the JPEG-encoded image.\n*   1: output a grayscale image.\n*   3: output an RGB image.\n\nIf needed, the JPEG-encoded image is transformed to match the requested number\nof color channels.\n\nThe attr `ratio` allows downscaling the image by an integer factor during\ndecoding.  Allowed values are: 1, 2, 4, and 8.  This is much faster than\ndownscaling the image later."
+  description: "The attr `channels` indicates the desired number of color channels for the\ndecoded image.\n\nAccepted values are:\n\n*   0: Use the number of channels in the JPEG-encoded image.\n*   1: output a grayscale image.\n*   3: output an RGB image.\n\nIf needed, the JPEG-encoded image is transformed to match the requested number\nof color channels.\n\nThe attr `ratio` allows downscaling the image by an integer factor during\ndecoding.  Allowed values are: 1, 2, 4, and 8.  This is much faster than\ndownscaling the image later.\n\nThis op also supports decoding PNGs and non-animated GIFs since the interface is\nthe same, though it is cleaner to use `tf.image.decode_image`."
 }
 op {
   name: "DecodePng"
@@ -5650,7 +5650,7 @@ op {
     }
   }
   summary: "Decode a PNG-encoded image to a uint8 or uint16 tensor."
-  description: "The attr `channels` indicates the desired number of color channels for the\ndecoded image.\n\nAccepted values are:\n\n*   0: Use the number of channels in the PNG-encoded image.\n*   1: output a grayscale image.\n*   3: output an RGB image.\n*   4: output an RGBA image.\n\nIf needed, the PNG-encoded image is transformed to match the requested number\nof color channels."
+  description: "The attr `channels` indicates the desired number of color channels for the\ndecoded image.\n\nAccepted values are:\n\n*   0: Use the number of channels in the PNG-encoded image.\n*   1: output a grayscale image.\n*   3: output an RGB image.\n*   4: output an RGBA image.\n\nIf needed, the PNG-encoded image is transformed to match the requested number\nof color channels.\n\nThis op also supports decoding JPEGs and non-animated GIFs since the interface\nis the same, though it is cleaner to use `tf.image.decode_image`."
 }
 op {
   name: "DecodeRaw"
-- 
GitLab


From a20ebced22db1be959cdc9875f1a797fd3367712 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 11:37:42 -0700
Subject: [PATCH 1300/1563] [XLA:CPU] Prep work for thread-parallel XLA CPU
 backend. *) Plumbs intra op thread parallelism value through to XLA backend.
 *) Service execution uses inter/intra op pools from backend. *) LocalService
 execution uses intra op pool from backend for XLA parallel ops,    and intra
 op pool passed in ExecutableRunOptions for eigen ops.

PiperOrigin-RevId: 155891730
---
 .../jit/kernels/xla_local_launch_op.cc        | 16 +++--
 .../jit/kernels/xla_local_launch_op.h         |  3 +-
 .../compiler/xla/client/client_library.cc     | 12 ++++
 .../compiler/xla/client/client_library.h      |  5 ++
 .../compiler/xla/client/local_client.cc       | 11 +++-
 tensorflow/compiler/xla/service/backend.cc    | 64 +++++++++++++++----
 tensorflow/compiler/xla/service/backend.h     | 32 +++++++++-
 .../service/cpu/parallel_cpu_executable.cc    | 20 +++---
 .../xla/service/cpu/parallel_cpu_executable.h |  4 +-
 .../compiler/xla/service/local_service.cc     |  9 ++-
 tensorflow/compiler/xla/service/service.cc    | 25 ++++++--
 tensorflow/compiler/xla/service/service.h     |  5 ++
 .../service/service_executable_run_options.h  | 14 +++-
 tensorflow/compiler/xla/tests/BUILD           |  3 +
 .../compiler/xla/tests/hlo_test_base.cc       |  5 +-
 .../xla/tests/local_client_test_base.cc       | 30 ++++++++-
 .../xla/tests/local_client_test_base.h        |  4 ++
 17 files changed, 210 insertions(+), 52 deletions(-)

diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
index 032ded54e6..a58abcbdff 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
@@ -159,13 +159,17 @@ XlaLocalLaunchOp::XlaLocalLaunchOp(OpKernelConstruction* ctx)
   }
 }
 
-Status XlaLocalLaunchOp::BuildCompilationCache(XlaCompilationCache** cache) {
+Status XlaLocalLaunchOp::BuildCompilationCache(OpKernelContext* ctx,
+                                               XlaCompilationCache** cache) {
   auto platform = gpu::MultiPlatformManager::PlatformWithId(platform_id_);
   if (!platform.ok()) {
     return StreamExecutorUtil::ConvertStatus(platform.status());
   }
-  auto client =
-      xla::ClientLibrary::GetOrCreateLocalClient(platform.ValueOrDie());
+  xla::LocalClientOptions client_options;
+  client_options.set_platform(platform.ValueOrDie());
+  client_options.set_intra_op_parallelism_threads(
+      ctx->device()->tensorflow_cpu_worker_threads()->num_threads);
+  auto client = xla::ClientLibrary::GetOrCreateLocalClient(client_options);
   if (!client.ok()) {
     return client.status();
   }
@@ -194,8 +198,8 @@ void XlaLocalLaunchOp::Compute(OpKernelContext* ctx) {
   XlaCompilationCache* cache;
   OP_REQUIRES_OK(ctx, rm->LookupOrCreate<XlaCompilationCache>(
                           rm->default_container(), "xla_cache", &cache,
-                          [this](XlaCompilationCache** cache) {
-                            return BuildCompilationCache(cache);
+                          [this, ctx](XlaCompilationCache** cache) {
+                            return BuildCompilationCache(ctx, cache);
                           }));
   // Hold the reference to the JIT during evaluation. (We could probably
   // free it sooner because the ResourceMgr will retain a reference, but
@@ -264,8 +268,6 @@ void XlaLocalLaunchOp::Compute(OpKernelContext* ctx) {
     xla::ExecutableRunOptions run_options;
     run_options.set_stream(stream);
     run_options.set_allocator(&xla_allocator);
-    run_options.set_inter_op_thread_pool(
-        ctx->device()->tensorflow_cpu_worker_threads()->workers);
     run_options.set_intra_op_thread_pool(&ctx->eigen_cpu_device());
     Env* env = Env::Default();
     auto start_time = env->NowMicros();
diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.h b/tensorflow/compiler/jit/kernels/xla_local_launch_op.h
index 51887cf013..5e4d3336a9 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.h
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.h
@@ -44,7 +44,8 @@ class XlaLocalLaunchOp : public OpKernel {
 
  private:
   // Builds a XlaCompilationCache class suitable for the current device.
-  Status BuildCompilationCache(XlaCompilationCache** compiler);
+  Status BuildCompilationCache(OpKernelContext* ctx,
+                               XlaCompilationCache** compiler);
 
   DeviceType device_type_;
   NameAttrList function_;
diff --git a/tensorflow/compiler/xla/client/client_library.cc b/tensorflow/compiler/xla/client/client_library.cc
index eb9a7ff2ac..8238261e1c 100644
--- a/tensorflow/compiler/xla/client/client_library.cc
+++ b/tensorflow/compiler/xla/client/client_library.cc
@@ -43,6 +43,16 @@ int LocalClientOptions::number_of_replicas() const {
   return number_of_replicas_;
 }
 
+LocalClientOptions& LocalClientOptions::set_intra_op_parallelism_threads(
+    int num_threads) {
+  intra_op_parallelism_threads_ = num_threads;
+  return *this;
+}
+
+int LocalClientOptions::intra_op_parallelism_threads() const {
+  return intra_op_parallelism_threads_;
+}
+
 /* static */ ClientLibrary& ClientLibrary::Singleton() {
   static ClientLibrary* c = new ClientLibrary;
   return *c;
@@ -77,6 +87,8 @@ ClientLibrary::~ClientLibrary() = default;
   ServiceOptions service_options;
   service_options.set_platform(platform);
   service_options.set_number_of_replicas(replica_count);
+  service_options.set_intra_op_parallelism_threads(
+      options.intra_op_parallelism_threads());
 
   auto instance = MakeUnique<LocalInstance>();
   TF_ASSIGN_OR_RETURN(instance->service,
diff --git a/tensorflow/compiler/xla/client/client_library.h b/tensorflow/compiler/xla/client/client_library.h
index 49f4541437..3ddd235d0e 100644
--- a/tensorflow/compiler/xla/client/client_library.h
+++ b/tensorflow/compiler/xla/client/client_library.h
@@ -53,9 +53,14 @@ class LocalClientOptions {
   LocalClientOptions& set_number_of_replicas(int number_of_replicas);
   int number_of_replicas() const;
 
+  // Sets the thread pool size for parallel execution of an individual operator.
+  LocalClientOptions& set_intra_op_parallelism_threads(int num_threads);
+  int intra_op_parallelism_threads() const;
+
  private:
   perftools::gputools::Platform* platform_ = nullptr;
   int number_of_replicas_ = -1;
+  int intra_op_parallelism_threads_ = -1;
 };
 
 class ClientLibrary {
diff --git a/tensorflow/compiler/xla/client/local_client.cc b/tensorflow/compiler/xla/client/local_client.cc
index 0de58ea7dc..02cf57e763 100644
--- a/tensorflow/compiler/xla/client/local_client.cc
+++ b/tensorflow/compiler/xla/client/local_client.cc
@@ -185,8 +185,15 @@ StatusOr<std::unique_ptr<ShapedBuffer>> LocalExecutable::Run(
   if (options.allocator() == nullptr) {
     actual_options.set_allocator(backend_->memory_allocator());
   }
-  ServiceExecutableRunOptions service_options(actual_options,
-                                              backend_->StreamBorrower());
+
+  // For local client execution on CPU backends:
+  // *) The thread pool used for eigen CPU ops is from
+  //    ExecutableRunOptions.eigen_intra_op_thread_pool.
+  // *) The thread pool used for XLA CPU ops is from
+  //    backend_->eigen_intra_op_thread_pool().
+  ServiceExecutableRunOptions service_options(
+      actual_options, backend_->StreamBorrower(),
+      backend_->eigen_intra_op_thread_pool());
 
   if (executable_->dumping()) {
     return ExecuteAndDump(&service_options, arguments);
diff --git a/tensorflow/compiler/xla/service/backend.cc b/tensorflow/compiler/xla/service/backend.cc
index 5c05417c6d..1913617fec 100644
--- a/tensorflow/compiler/xla/service/backend.cc
+++ b/tensorflow/compiler/xla/service/backend.cc
@@ -41,13 +41,39 @@ namespace se = ::perftools::gputools;
 
 namespace xla {
 
+BackendOptions& BackendOptions::set_platform(
+    perftools::gputools::Platform* platform) {
+  platform_ = platform;
+  return *this;
+}
+
+perftools::gputools::Platform* BackendOptions::platform() const {
+  return platform_;
+}
+
+BackendOptions& BackendOptions::set_number_of_replicas(int number_of_replicas) {
+  number_of_replicas_ = number_of_replicas;
+  return *this;
+}
+
+int BackendOptions::number_of_replicas() const { return number_of_replicas_; }
+
+BackendOptions& BackendOptions::set_intra_op_parallelism_threads(
+    int num_threads) {
+  intra_op_parallelism_threads_ = num_threads;
+  return *this;
+}
+
+int BackendOptions::intra_op_parallelism_threads() const {
+  return intra_op_parallelism_threads_;
+}
+
 // Define this in .cc file to avoid having to include eigen or forward declare
 // these types in the header.
 struct Backend::EigenThreadPoolWrapper {
-  explicit EigenThreadPoolWrapper()
-      : pool(new tensorflow::thread::ThreadPool(
-            tensorflow::Env::Default(), "XLAEigen",
-            tensorflow::port::NumSchedulableCPUs())),
+  explicit EigenThreadPoolWrapper(const int num_threads)
+      : pool(new tensorflow::thread::ThreadPool(tensorflow::Env::Default(),
+                                                "XLAEigen", num_threads)),
         wrapper(new tensorflow::EigenThreadPoolWrapper(pool.get())),
         device(new Eigen::ThreadPoolDevice(wrapper.get(),
                                            wrapper->NumThreads())) {}
@@ -58,18 +84,21 @@ struct Backend::EigenThreadPoolWrapper {
 };
 
 /* static */ StatusOr<std::unique_ptr<Backend>> Backend::CreateBackend(
-    perftools::gputools::Platform* platform, int64 replica_count) {
+    const BackendOptions& options) {
+  int64 replica_count = options.number_of_replicas();
   if (replica_count == -1) {
     legacy_flags::BackendFlags* flags = legacy_flags::GetBackendFlags();
     replica_count = flags->xla_replicas;
   }
+  perftools::gputools::Platform* platform = options.platform();
   TF_ASSIGN_OR_RETURN(auto compiler, Compiler::GetForPlatform(platform));
   TF_ASSIGN_OR_RETURN(auto stream_executors,
                       PlatformUtil::GetStreamExecutors(platform));
   TF_ASSIGN_OR_RETURN(auto transfer_manager,
                       TransferManager::GetForPlatform(platform));
-  std::unique_ptr<Backend> backend(new Backend(
-      replica_count, platform, compiler, stream_executors, transfer_manager));
+  std::unique_ptr<Backend> backend(
+      new Backend(replica_count, platform, compiler, stream_executors,
+                  transfer_manager, options.intra_op_parallelism_threads()));
   TF_RETURN_IF_ERROR(backend->PoolStreams(kInitialStreamsToPool,
                                           backend->default_stream_executor()));
   return std::move(backend);
@@ -79,7 +108,9 @@ struct Backend::EigenThreadPoolWrapper {
 Backend::CreateDefaultBackend() {
   TF_ASSIGN_OR_RETURN(se::Platform * platform,
                       PlatformUtil::GetDefaultPlatform());
-  return CreateBackend(platform);
+  BackendOptions backend_options;
+  backend_options.set_platform(platform);
+  return CreateBackend(backend_options);
 }
 
 tensorflow::Status Backend::PoolStreams(int n, se::StreamExecutor* executor) {
@@ -114,7 +145,7 @@ Backend::Backend(
     int64 replica_count, perftools::gputools::Platform* platform,
     Compiler* compiler,
     tensorflow::gtl::ArraySlice<se::StreamExecutor*> stream_executors,
-    TransferManager* transfer_manager)
+    TransferManager* transfer_manager, int intra_op_parallelism_threads)
     : platform_(platform),
       compiler_(compiler),
       transfer_manager_(transfer_manager),
@@ -144,7 +175,11 @@ Backend::Backend(
     inter_op_thread_pool_.reset(new tensorflow::thread::ThreadPool(
         tensorflow::Env::Default(), "xla_inter_op",
         tensorflow::port::NumSchedulableCPUs()));
-    intra_op_thread_pool_wrapper_.reset(new EigenThreadPoolWrapper());
+    const int num_threads = intra_op_parallelism_threads > 0
+                                ? intra_op_parallelism_threads
+                                : tensorflow::port::NumSchedulableCPUs();
+    intra_op_thread_pool_wrapper_.reset(
+        new EigenThreadPoolWrapper(num_threads));
   }
 }
 
@@ -190,10 +225,17 @@ tensorflow::thread::ThreadPool* Backend::inter_op_thread_pool() const {
 
 const Eigen::ThreadPoolDevice* Backend::eigen_intra_op_thread_pool_device()
     const {
-  if (intra_op_thread_pool_wrapper_ == nullptr) return nullptr;
+  if (intra_op_thread_pool_wrapper_ == nullptr) {
+    return nullptr;
+  }
   return intra_op_thread_pool_wrapper_->device.get();
 }
 
+tensorflow::thread::ThreadPool* Backend::eigen_intra_op_thread_pool() const {
+  if (intra_op_thread_pool_wrapper_ == nullptr) return nullptr;
+  return intra_op_thread_pool_wrapper_->pool.get();
+}
+
 StatusOr<perftools::gputools::StreamExecutor*> Backend::stream_executor(
     int device_ordinal) const {
   if (device_ordinal < 0 ||
diff --git a/tensorflow/compiler/xla/service/backend.h b/tensorflow/compiler/xla/service/backend.h
index 9f6829b7d9..1068bac277 100644
--- a/tensorflow/compiler/xla/service/backend.h
+++ b/tensorflow/compiler/xla/service/backend.h
@@ -39,6 +39,31 @@ struct ThreadPoolDevice;
 
 namespace xla {
 
+// Options to configure the backend when it is created.
+class BackendOptions {
+ public:
+  // Set the platform backing the backend, or nullptr for the default platform.
+  BackendOptions& set_platform(perftools::gputools::Platform* platform);
+  perftools::gputools::Platform* platform() const;
+
+  // Set the number of replicas to use when compiling replicated
+  // programs. The default is -1 meaning that the value is read from
+  // the xla_replicas flag.
+  BackendOptions& set_number_of_replicas(int number_of_replicas);
+  int number_of_replicas() const;
+
+  // Sets the thread pool size for parallel execution of an individual operator.
+  // The default value of -1 will result in initializing the thread pool with
+  // the number of threads equal to the number of cores in the system.
+  BackendOptions& set_intra_op_parallelism_threads(int num_threads);
+  int intra_op_parallelism_threads() const;
+
+ private:
+  perftools::gputools::Platform* platform_ = nullptr;
+  int number_of_replicas_ = -1;
+  int intra_op_parallelism_threads_ = -1;
+};
+
 // Class which encapsulates an XLA backend. It includes everything necessary
 // to compile and execute computations on a particular platform.
 //
@@ -53,9 +78,9 @@ class Backend {
   static constexpr int kInitialStreamsToPool = 8;
 
   // Creates a new backend for the given platform with the given number of
-  // replicas. A value of -1 means to use the flag value.
+  // replicas.
   static StatusOr<std::unique_ptr<Backend>> CreateBackend(
-      perftools::gputools::Platform* platform, int64 replica_count = -1);
+      const BackendOptions& options);
 
   // Creates a backend for the default platform. The default platform is defined
   // in PlatformUtil.
@@ -150,6 +175,7 @@ class Backend {
   // For the host platform, returns the configured eigen threadpool device to be
   // used for scheduling work. For other platforms, returns NULL.
   const Eigen::ThreadPoolDevice* eigen_intra_op_thread_pool_device() const;
+  tensorflow::thread::ThreadPool* eigen_intra_op_thread_pool() const;
 
   // Resets the devices associated with this backend.
   Status ResetDevices();
@@ -160,7 +186,7 @@ class Backend {
           Compiler* compiler,
           tensorflow::gtl::ArraySlice<perftools::gputools::StreamExecutor*>
               stream_executors,
-          TransferManager* transfer_manager);
+          TransferManager* transfer_manager, int intra_op_parallelism_threads);
   Backend(const Backend&) = delete;
   Backend& operator=(const Backend&) = delete;
 
diff --git a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc
index 7a4723e8d7..cadad10910 100644
--- a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc
+++ b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc
@@ -146,7 +146,7 @@ Status ParallelCpuExecutable::AllocateBuffers(
 }
 
 Status ParallelCpuExecutable::ExecuteComputeFunctions(
-    const ExecutableRunOptions* run_options,
+    const ServiceExecutableRunOptions* run_options,
     tensorflow::gtl::ArraySlice<const ShapedBuffer*> arguments,
     tensorflow::gtl::ArraySlice<se::DeviceMemoryBase> buffers,
     HloExecutionProfile* hlo_execution_profile) {
@@ -160,7 +160,7 @@ Status ParallelCpuExecutable::ExecuteComputeFunctions(
 }
 
 Status ParallelCpuExecutable::ExecuteComputeFunctions(
-    const ExecutableRunOptions* run_options,
+    const ServiceExecutableRunOptions* run_options,
     tensorflow::gtl::ArraySlice<se::DeviceMemoryBase> arguments,
     tensorflow::gtl::ArraySlice<se::DeviceMemoryBase> buffers,
     HloExecutionProfile* hlo_execution_profile) {
@@ -214,7 +214,7 @@ Status ParallelCpuExecutable::ExecuteComputeFunctions(
 
   void** temps_array = buffer_pointers.data();
   uint64* profile_counters_array = profile_counters.data();
-  auto* thread_pool = CHECK_NOTNULL(run_options->inter_op_thread_pool());
+  auto* thread_pool = CHECK_NOTNULL(run_options->xla_intra_op_thread_pool());
   tensorflow::mutex completion_queue_lock;
   tensorflow::condition_variable completion_queue_cv;
   std::deque<HloInstruction*> completion_queue;
@@ -251,11 +251,12 @@ Status ParallelCpuExecutable::ExecuteComputeFunctions(
                      });
       auto function = FindOrDie(functions, instruction);
       // The thread pool entry takes ownership of |operand_buffers|.
+      const auto* exec_run_options = &run_options->run_options();
       thread_pool->Schedule([instruction, &completion_queue,
                              &completion_queue_lock, &completion_queue_cv,
-                             result_buffer, run_options, operand_buffers,
+                             result_buffer, exec_run_options, operand_buffers,
                              temps_array, profile_counters_array, function] {
-        function(result_buffer, run_options, operand_buffers, temps_array,
+        function(result_buffer, exec_run_options, operand_buffers, temps_array,
                  profile_counters_array);
         delete[] operand_buffers;
         // Push the completed HLO instruction on the queue, the main thread
@@ -345,9 +346,8 @@ ParallelCpuExecutable::ExecuteOnStream(
   const BufferAllocation::Index result_index = result_slice.index();
   VLOG(3) << "result index: " << result_index;
 
-  TF_RETURN_IF_ERROR(ExecuteComputeFunctions(&run_options->run_options(),
-                                             arguments, device_allocations,
-                                             hlo_execution_profile));
+  TF_RETURN_IF_ERROR(ExecuteComputeFunctions(
+      run_options, arguments, device_allocations, hlo_execution_profile));
 
   // Mark the buffers that are actually live (used in the output) when the
   // computation finishes executing.
@@ -400,8 +400,8 @@ StatusOr<std::unique_ptr<ShapedBuffer>> ParallelCpuExecutable::ExecuteOnStream(
   TF_RETURN_IF_ERROR(AllocateBuffers(
       memory_allocator, stream->parent()->device_ordinal(), &buffers));
 
-  TF_RETURN_IF_ERROR(ExecuteComputeFunctions(
-      &run_options->run_options(), arguments, buffers, hlo_execution_profile));
+  TF_RETURN_IF_ERROR(ExecuteComputeFunctions(run_options, arguments, buffers,
+                                             hlo_execution_profile));
 
   // Copy DeviceMemoryBase values which contain the array(s) of the result into
   // the respective location in ShapedBuffer which is returned to the caller.
diff --git a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h
index 7223de9f07..6e1239d590 100644
--- a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h
+++ b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h
@@ -96,14 +96,14 @@ class ParallelCpuExecutable : public Executable {
   // Calls the generated functions in 'function_names_', performing the
   // computation with the given arguments using the supplied buffers.
   Status ExecuteComputeFunctions(
-      const ExecutableRunOptions* run_options,
+      const ServiceExecutableRunOptions* run_options,
       tensorflow::gtl::ArraySlice<perftools::gputools::DeviceMemoryBase>
           arguments,
       tensorflow::gtl::ArraySlice<perftools::gputools::DeviceMemoryBase>
           buffers,
       HloExecutionProfile* hlo_execution_profile);
   Status ExecuteComputeFunctions(
-      const ExecutableRunOptions* run_options,
+      const ServiceExecutableRunOptions* run_options,
       tensorflow::gtl::ArraySlice<const ShapedBuffer*> arguments,
       tensorflow::gtl::ArraySlice<perftools::gputools::DeviceMemoryBase>
           buffers,
diff --git a/tensorflow/compiler/xla/service/local_service.cc b/tensorflow/compiler/xla/service/local_service.cc
index 8184dbabc8..78d21233c7 100644
--- a/tensorflow/compiler/xla/service/local_service.cc
+++ b/tensorflow/compiler/xla/service/local_service.cc
@@ -60,9 +60,12 @@ namespace xla {
     TF_ASSIGN_OR_RETURN(platform, PlatformUtil::GetDefaultPlatform());
   }
 
-  TF_ASSIGN_OR_RETURN(
-      std::unique_ptr<Backend> backend,
-      Backend::CreateBackend(platform, options.number_of_replicas()));
+  BackendOptions backend_options;
+  backend_options.set_platform(platform)
+      .set_number_of_replicas(options.number_of_replicas())
+      .set_intra_op_parallelism_threads(options.intra_op_parallelism_threads());
+  TF_ASSIGN_OR_RETURN(std::unique_ptr<Backend> backend,
+                      Backend::CreateBackend(backend_options));
 
   TF_ASSIGN_OR_RETURN(std::unique_ptr<Backend> compute_constant_backend,
                       CreateComputeConstantBackend());
diff --git a/tensorflow/compiler/xla/service/service.cc b/tensorflow/compiler/xla/service/service.cc
index c001e705de..42450dfcae 100644
--- a/tensorflow/compiler/xla/service/service.cc
+++ b/tensorflow/compiler/xla/service/service.cc
@@ -112,6 +112,16 @@ ServiceOptions& ServiceOptions::set_number_of_replicas(int number_of_replicas) {
 
 int ServiceOptions::number_of_replicas() const { return number_of_replicas_; }
 
+ServiceOptions& ServiceOptions::set_intra_op_parallelism_threads(
+    int num_threads) {
+  intra_op_parallelism_threads_ = num_threads;
+  return *this;
+}
+
+int ServiceOptions::intra_op_parallelism_threads() const {
+  return intra_op_parallelism_threads_;
+}
+
 /* static */ StatusOr<std::unique_ptr<Service>> Service::NewService(
     perftools::gputools::Platform* platform) {
   ServiceOptions default_options;
@@ -126,9 +136,10 @@ int ServiceOptions::number_of_replicas() const { return number_of_replicas_; }
   if (platform == nullptr) {
     TF_ASSIGN_OR_RETURN(platform, PlatformUtil::GetDefaultPlatform());
   }
-  TF_ASSIGN_OR_RETURN(
-      execute_backend,
-      Backend::CreateBackend(platform, options.number_of_replicas()));
+  BackendOptions backend_options;
+  backend_options.set_platform(platform);
+  backend_options.set_number_of_replicas(options.number_of_replicas());
+  TF_ASSIGN_OR_RETURN(execute_backend, Backend::CreateBackend(backend_options));
   TF_ASSIGN_OR_RETURN(std::unique_ptr<Backend> compute_constant_backend,
                       CreateComputeConstantBackend());
   std::unique_ptr<Service> service(new Service(
@@ -142,7 +153,10 @@ Service::CreateComputeConstantBackend() {
                       PlatformUtil::GetSupportedPlatforms());
   for (auto* platform : platforms) {
     if (platform->id() == se::host::kHostPlatformId) {
-      return Backend::CreateBackend(platform, /*replica_count=*/1);
+      BackendOptions backend_options;
+      backend_options.set_platform(platform);
+      backend_options.set_number_of_replicas(1);
+      return Backend::CreateBackend(backend_options);
     }
   }
   return NotFound("CPU platform not found");
@@ -573,7 +587,8 @@ StatusOr<GlobalDataHandle> Service::ExecuteAndRegisterResult(
     options.set_inter_op_thread_pool(backend->inter_op_thread_pool());
     options.set_intra_op_thread_pool(
         backend->eigen_intra_op_thread_pool_device());
-    run_options.emplace_back(options, backend->StreamBorrower());
+    run_options.emplace_back(options, backend->StreamBorrower(),
+                             backend->inter_op_thread_pool());
   }
 
   perftools::gputools::DeviceMemoryBase result;
diff --git a/tensorflow/compiler/xla/service/service.h b/tensorflow/compiler/xla/service/service.h
index 0e0e7c4e21..05a955137f 100644
--- a/tensorflow/compiler/xla/service/service.h
+++ b/tensorflow/compiler/xla/service/service.h
@@ -63,9 +63,14 @@ class ServiceOptions {
   ServiceOptions& set_number_of_replicas(int number_of_replicas);
   int number_of_replicas() const;
 
+  // Sets the thread pool size for parallel execution of an individual operator.
+  ServiceOptions& set_intra_op_parallelism_threads(int num_threads);
+  int intra_op_parallelism_threads() const;
+
  private:
   perftools::gputools::Platform* platform_ = nullptr;
   int number_of_replicas_ = -1;
+  int intra_op_parallelism_threads_ = -1;
 };
 
 // The XLA service object, which is the same across all
diff --git a/tensorflow/compiler/xla/service/service_executable_run_options.h b/tensorflow/compiler/xla/service/service_executable_run_options.h
index 0d4b214f5f..017e5ef09e 100644
--- a/tensorflow/compiler/xla/service/service_executable_run_options.h
+++ b/tensorflow/compiler/xla/service/service_executable_run_options.h
@@ -30,10 +30,12 @@ class ServiceExecutableRunOptions {
   using StreamBorrower =
       std::function<StatusOr<Pool<perftools::gputools::Stream>::SmartPtr>(int)>;
 
-  explicit ServiceExecutableRunOptions(ExecutableRunOptions run_options,
-                                       StreamBorrower borrow_stream = nullptr)
+  explicit ServiceExecutableRunOptions(
+      ExecutableRunOptions run_options, StreamBorrower borrow_stream = nullptr,
+      tensorflow::thread::ThreadPool* xla_intra_op_thread_pool = nullptr)
       : run_options_(std::move(run_options)),
-        borrow_stream_(std::move(borrow_stream)) {}
+        borrow_stream_(std::move(borrow_stream)),
+        xla_intra_op_thread_pool_(xla_intra_op_thread_pool) {}
 
   // Returns reference or pointer to `ExecutableRunOptions` member.
   const ExecutableRunOptions& run_options() const { return run_options_; }
@@ -53,9 +55,15 @@ class ServiceExecutableRunOptions {
                : Status(tensorflow::error::UNIMPLEMENTED, "No stream cache");
   }
 
+  // Returns reference to thread pool for execution of XLA ops on CPU backend.
+  tensorflow::thread::ThreadPool* xla_intra_op_thread_pool() const {
+    return xla_intra_op_thread_pool_;
+  }
+
  private:
   ExecutableRunOptions run_options_;
   StreamBorrower borrow_stream_;
+  tensorflow::thread::ThreadPool* xla_intra_op_thread_pool_;
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/tests/BUILD b/tensorflow/compiler/xla/tests/BUILD
index d7644a0513..e0c2b9ab09 100644
--- a/tensorflow/compiler/xla/tests/BUILD
+++ b/tensorflow/compiler/xla/tests/BUILD
@@ -200,11 +200,13 @@ cc_library(
         "//tensorflow/compiler/xla/service:device_memory_allocator",
         "//tensorflow/compiler/xla/service:local_service",
         "//tensorflow/compiler/xla/service:platform_util",
+        "//tensorflow/compiler/xla/service:pool",
         "//tensorflow/compiler/xla/service:shaped_buffer",
         "//tensorflow/compiler/xla/service:transfer_manager",
         "//tensorflow/compiler/xla/tests:client_library_test_base",
         "//tensorflow/core:lib",
         "//tensorflow/core:stream_executor_no_cuda",
+        "//third_party/eigen3",
     ],
 )
 
@@ -1362,6 +1364,7 @@ cc_test(
         "//tensorflow/compiler/xla/client:computation_builder",
         "//tensorflow/compiler/xla/service:computation_tracker",
         "//tensorflow/compiler/xla/service:local_service",
+        "//tensorflow/core:lib",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/tests/hlo_test_base.cc b/tensorflow/compiler/xla/tests/hlo_test_base.cc
index 4e956bc00c..f741ff38b5 100644
--- a/tensorflow/compiler/xla/tests/hlo_test_base.cc
+++ b/tensorflow/compiler/xla/tests/hlo_test_base.cc
@@ -111,8 +111,9 @@ StatusOr<se::DeviceMemoryBase> HloTestBase::Execute(
       backend_->eigen_intra_op_thread_pool_device());
 
   HloExecutionProfile hlo_execution_profile;
-  ServiceExecutableRunOptions service_run_options(run_options,
-                                                  backend_->StreamBorrower());
+  ServiceExecutableRunOptions service_run_options(
+      run_options, backend_->StreamBorrower(),
+      backend_->inter_op_thread_pool());
   TF_ASSIGN_OR_RETURN(
       se::DeviceMemoryBase result,
       executable->ExecuteOnStream(&service_run_options, arguments,
diff --git a/tensorflow/compiler/xla/tests/local_client_test_base.cc b/tensorflow/compiler/xla/tests/local_client_test_base.cc
index 7fe4c9020f..7fcf687655 100644
--- a/tensorflow/compiler/xla/tests/local_client_test_base.cc
+++ b/tensorflow/compiler/xla/tests/local_client_test_base.cc
@@ -17,12 +17,19 @@ limitations under the License.
 
 #include <vector>
 
+#define EIGEN_USE_THREADS
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/compiler/xla/client/local_client.h"
 #include "tensorflow/compiler/xla/map_util.h"
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/status_macros.h"
 #include "tensorflow/compiler/xla/test_helpers.h"
+#include "tensorflow/core/common_runtime/eigen_thread_pool.h"
+#include "tensorflow/core/lib/core/threadpool.h"
+#include "tensorflow/core/platform/cpu_info.h"
+#include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/logging.h"
 
 namespace xla {
@@ -91,16 +98,34 @@ int64 TestAllocator::deallocation_count(int device_ordinal) const {
   return allocator_;
 }
 
+// Define this in .cc file to avoid having to include eigen or forward declare
+// these types in the header.
+struct LocalClientTestBase::EigenThreadPoolWrapper {
+  explicit EigenThreadPoolWrapper()
+      : pool(new tensorflow::thread::ThreadPool(
+            tensorflow::Env::Default(), "XLAEigenTest", /*num_threads=*/2)),
+        wrapper(new tensorflow::EigenThreadPoolWrapper(pool.get())),
+        device(new Eigen::ThreadPoolDevice(wrapper.get(),
+                                           wrapper->NumThreads())) {}
+
+  std::unique_ptr<tensorflow::thread::ThreadPool> pool;
+  std::unique_ptr<tensorflow::EigenThreadPoolWrapper> wrapper;
+  std::unique_ptr<Eigen::ThreadPoolDevice> device;
+};
+
 LocalClientTestBase::LocalClientTestBase(
     perftools::gputools::Platform* platform)
     : local_client_(
-          ClientLibrary::GetOrCreateLocalClient(platform).ValueOrDie()) {
+          ClientLibrary::GetOrCreateLocalClient(platform).ValueOrDie()),
+      thread_pool_wrapper_(new EigenThreadPoolWrapper()) {
   stream_executor_ = PlatformUtil::GetStreamExecutors(local_client_->platform())
                          .ValueOrDie()[local_client_->default_device_ordinal()];
   transfer_manager_ =
       TransferManager::GetForPlatform(local_client_->platform()).ValueOrDie();
 }
 
+LocalClientTestBase::~LocalClientTestBase() {}
+
 std::unique_ptr<ScopedShapedBuffer>
 LocalClientTestBase::LiteralToScopedShapedBuffer(const Literal& literal) {
   return LiteralToScopedShapedBuffer(literal,
@@ -190,8 +215,7 @@ ExecutableRunOptions LocalClientTestBase::DefaultExecutableRunOptions() const {
   ExecutableRunOptions run_options;
   run_options.set_inter_op_thread_pool(
       local_client_->backend().inter_op_thread_pool());
-  run_options.set_intra_op_thread_pool(
-      local_client_->backend().eigen_intra_op_thread_pool_device());
+  run_options.set_intra_op_thread_pool(thread_pool_wrapper_->device.get());
   run_options.set_allocator(GetOrCreateAllocator(local_client_->platform()));
   return run_options;
 }
diff --git a/tensorflow/compiler/xla/tests/local_client_test_base.h b/tensorflow/compiler/xla/tests/local_client_test_base.h
index 4e7b05cea6..e3c3bb46cf 100644
--- a/tensorflow/compiler/xla/tests/local_client_test_base.h
+++ b/tensorflow/compiler/xla/tests/local_client_test_base.h
@@ -74,8 +74,10 @@ class TestAllocator : public StreamExecutorMemoryAllocator {
 // A base class for tests which exercise the LocalClient interface.
 class LocalClientTestBase : public ::testing::Test {
  protected:
+  struct EigenThreadPoolWrapper;
   explicit LocalClientTestBase(
       perftools::gputools::Platform* platform = nullptr);
+  virtual ~LocalClientTestBase();
 
   static TestAllocator* GetOrCreateAllocator(
       perftools::gputools::Platform* platform);
@@ -142,6 +144,8 @@ class LocalClientTestBase : public ::testing::Test {
   TransferManager* transfer_manager_;
 
   LocalClient* local_client_;
+
+  std::unique_ptr<EigenThreadPoolWrapper> thread_pool_wrapper_;
 };
 
 }  // namespace xla
-- 
GitLab


From 93055ac3a08c1f5b200629d7c0a146601f7782fa Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 11:39:40 -0700
Subject: [PATCH 1301/1563] Register GPU kernels for shape ops with bool input.

PiperOrigin-RevId: 155891979
---
 tensorflow/core/kernels/shape_ops.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tensorflow/core/kernels/shape_ops.cc b/tensorflow/core/kernels/shape_ops.cc
index 177a32464b..d78c6d2639 100644
--- a/tensorflow/core/kernels/shape_ops.cc
+++ b/tensorflow/core/kernels/shape_ops.cc
@@ -82,6 +82,7 @@ REGISTER_KERNEL_BUILDER(Name("Shape")
                           ShapeOp<int64>);
 
 TF_CALL_NUMBER_TYPES_NO_INT32(REGISTER_GPU_KERNEL);
+TF_CALL_bool(REGISTER_GPU_KERNEL);
 #undef REGISTER_GPU_KERNEL
 
 // A special GPU kernel for int32.
@@ -131,6 +132,7 @@ REGISTER_KERNEL_BUILDER(Name("ShapeN")
                           ShapeNOp<int64>)
 
 TF_CALL_NUMBER_TYPES_NO_INT32(REGISTER_GPU_KERNEL);
+TF_CALL_bool(REGISTER_GPU_KERNEL);
 #undef REGISTER_GPU_KERNEL
 
 // A special GPU kernel for int32.
@@ -277,6 +279,7 @@ REGISTER_KERNEL_BUILDER(Name("Size")
                               .HostMemory("output"),             \
                           SizeOp<int64>);
 TF_CALL_NUMBER_TYPES_NO_INT32(REGISTER_GPU_KERNEL);
+TF_CALL_bool(REGISTER_GPU_KERNEL);
 #undef REGISTER_GPU_KERNEL
 
 // A special GPU kernel for int32.
@@ -351,6 +354,7 @@ REGISTER_KERNEL_BUILDER(Name("ExpandDims")
                               .HostMemory("dim"),            \
                           ExpandDimsOp);
 TF_CALL_NUMBER_TYPES_NO_INT32(REGISTER_GPU_KERNEL);
+TF_CALL_bool(REGISTER_GPU_KERNEL);
 #undef REGISTER_GPU_KERNEL
 
 REGISTER_KERNEL_BUILDER(Name("ExpandDims")
@@ -395,6 +399,7 @@ REGISTER_KERNEL_BUILDER(Name("Squeeze").Device(DEVICE_CPU), SqueezeOp);
       Name("Squeeze").Device(DEVICE_GPU).TypeConstraint<type>("T"), \
       SqueezeOp);
 TF_CALL_NUMBER_TYPES_NO_INT32(REGISTER_GPU_KERNEL);
+TF_CALL_bool(REGISTER_GPU_KERNEL);
 #undef REGISTER_GPU_KERNEL
 
 // A special GPU kernel for int32.
-- 
GitLab


From 60de81d9e4a629c093ed088857c56ab1780c8f8e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 11:42:29 -0700
Subject: [PATCH 1302/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 155892333
---
 tensorflow/go/op/wrappers.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 76e30e0c32..c2e91e53b1 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -5177,7 +5177,10 @@ func HSVToRGB(scope *Scope, images tf.Output) (output tf.Output) {
 // GIF with frame or transparency compression are not supported
 // convert animated GIF from compressed to uncompressed by:
 //
-// convert $src.gif -coalesce $dst.gif
+//     convert $src.gif -coalesce $dst.gif
+//
+// This op also supports decoding JPEGs and PNGs, though it is cleaner to use
+// `tf.image.decode_image`.
 //
 // Arguments:
 //	contents: 0-D.  The GIF-encoded image.
@@ -5233,6 +5236,9 @@ func DecodePngDtype(value tf.DataType) DecodePngAttr {
 // If needed, the PNG-encoded image is transformed to match the requested number
 // of color channels.
 //
+// This op also supports decoding JPEGs and non-animated GIFs since the interface
+// is the same, though it is cleaner to use `tf.image.decode_image`.
+//
 // Arguments:
 //	contents: 0-D.  The PNG-encoded image.
 //
@@ -5375,6 +5381,9 @@ func DecodeJpegDctMethod(value string) DecodeJpegAttr {
 // decoding.  Allowed values are: 1, 2, 4, and 8.  This is much faster than
 // downscaling the image later.
 //
+// This op also supports decoding PNGs and non-animated GIFs since the interface is
+// the same, though it is cleaner to use `tf.image.decode_image`.
+//
 // Arguments:
 //	contents: 0-D.  The JPEG-encoded image.
 //
-- 
GitLab


From 74520ebc5bd8d62969beb4b4cd1bcac6b988436b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 11:44:43 -0700
Subject: [PATCH 1303/1563] Added #include of correct header file for getting
 LIBXSMM version.

PiperOrigin-RevId: 155892615
---
 tensorflow/core/grappler/clusters/BUILD    | 15 +++++++++++++--
 tensorflow/core/grappler/clusters/utils.cc |  4 ++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index 578ec9798e..da372eb823 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -30,6 +30,14 @@ alias(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+config_setting(
+    name = "xsmm",
+    licenses = ["notice"],
+    values = {
+        "define": "tensorflow_xsmm=1",
+    },
+)
+
 cc_library(
     name = "utils",
     srcs = ["utils.cc"],
@@ -38,11 +46,14 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        "//third_party/eigen3",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
-        "//third_party/eigen3",
-    ],
+    ] + select({
+        ":xsmm": ["@libxsmm_archive//:xsmm_avx"],
+        "//conditions:default": [],
+    }),
 )
 
 cc_library(
diff --git a/tensorflow/core/grappler/clusters/utils.cc b/tensorflow/core/grappler/clusters/utils.cc
index 24054d240e..592e4b789d 100644
--- a/tensorflow/core/grappler/clusters/utils.cc
+++ b/tensorflow/core/grappler/clusters/utils.cc
@@ -23,6 +23,10 @@ limitations under the License.
 #include "cuda/include/cudnn.h"
 #endif
 
+#ifdef EIGEN_USE_LIBXSMM
+#include "include/libxsmm.h"
+#endif
+
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/cpu_info.h"
-- 
GitLab


From 3baad15d0da1699f9845a7557e693e44bcdf075f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 11:48:02 -0700
Subject: [PATCH 1304/1563] [XLA] Remove unused parameter in buffer assignment.

No functional change. hlos_to_allocate was an optional argument to restrict the set of hlos in buffer assignment, but it is never used.

PiperOrigin-RevId: 155893028
---
 .../compiler/xla/service/buffer_assignment.cc | 49 ++++++-------------
 .../compiler/xla/service/buffer_assignment.h  | 15 ++----
 2 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index a79468f939..47560fefea 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -488,11 +488,9 @@ Status GatherComputationsByAllocationType(
 /* static */
 StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::Run(
     const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-    LogicalBuffer::SizeFunction buffer_size, int64 alignment,
-    const std::vector<const HloInstruction*>* hlos_to_allocate) {
+    LogicalBuffer::SizeFunction buffer_size, int64 alignment) {
   BufferAssigner assigner(std::move(buffer_size), alignment);
-  return assigner.CreateAssignment(module, std::move(hlo_ordering),
-                                   hlos_to_allocate);
+  return assigner.CreateAssignment(module, std::move(hlo_ordering));
 }
 
 bool BufferAssigner::MaybeAssignBuffer(BufferAllocation* allocation,
@@ -545,7 +543,6 @@ bool BufferAssigner::MaybeAssignBuffer(BufferAllocation* allocation,
 
 Status BufferAssigner::AssignBuffersForComputation(
     const HloComputation* computation, bool is_thread_local,
-    const FlatSet<const HloInstruction*>* hlos_to_allocate,
     const FlatSet<const LogicalBuffer*>& colocated_buffers,
     const FlatSet<BufferAllocation::Index>& colocated_allocations,
     FlatMap<const HloComputation*, FlatSet<const LogicalBuffer*>>*
@@ -555,16 +552,13 @@ Status BufferAssigner::AssignBuffersForComputation(
   // size.
   std::vector<const LogicalBuffer*> sorted_buffers;
   for (auto& instruction : computation->instructions()) {
-    if (hlos_to_allocate == nullptr ||
-        hlos_to_allocate->count(instruction.get()) > 0) {
-      // Add all buffers which this instruction defines. Instruction which don't
-      // define buffers (eg, bitcast which just forwards a pointer) don't need
-      // any allocations.
-      for (const LogicalBuffer* buffer :
-           assignment->points_to_analysis().GetBuffersDefinedByInstruction(
-               instruction.get())) {
-        sorted_buffers.push_back(buffer);
-      }
+    // Add all buffers which this instruction defines. Instruction which don't
+    // define buffers (eg, bitcast which just forwards a pointer) don't need
+    // any allocations.
+    for (const LogicalBuffer* buffer :
+         assignment->points_to_analysis().GetBuffersDefinedByInstruction(
+             instruction.get())) {
+      sorted_buffers.push_back(buffer);
     }
   }
 
@@ -1150,30 +1144,15 @@ void BufferAssigner::AssignColocatedBufferSets(
 }
 
 StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
-    const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-    const std::vector<const HloInstruction*>* hlos_to_allocate) {
+    const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering) {
   TF_ASSIGN_OR_RETURN(std::unique_ptr<BufferLiveness> liveness,
                       BufferLiveness::Run(module, std::move(hlo_ordering)));
 
   VLOG(1) << "Assigning buffers to module " << module->name();
-  if (hlos_to_allocate != nullptr) {
-    VLOG(3) << "LogicalBuffer assignment restricted to hlos: ";
-    for (auto hlo : *hlos_to_allocate) {
-      VLOG(3) << "  " << hlo->parent()->name() << "::" << hlo->name();
-    }
-  }
   XLA_VLOG_LINES(2, module->ToString());
   XLA_VLOG_LINES(3, liveness->ToString());
   XLA_VLOG_LINES(3, liveness->points_to_analysis().ToString());
 
-  // Set of HLO's to allocate if hlos_to_allocate is given. Passed as a set to
-  // AssignBuffersForComputation for fast membership testing.
-  std::unique_ptr<FlatSet<const HloInstruction*>> hlo_set;
-  if (hlos_to_allocate != nullptr) {
-    hlo_set = MakeUnique<FlatSet<const HloInstruction*>>(
-        hlos_to_allocate->begin(), hlos_to_allocate->end());
-  }
-
   // Can't use MakeUnique because BufferAssignment constructor is private.
   std::unique_ptr<BufferAssignment> assignment(
       new BufferAssignment(module, std::move(liveness), alignment_));
@@ -1201,9 +1180,9 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
       buffers_to_assign_sequentially;
   for (auto* computation : global_computations) {
     TF_RETURN_IF_ERROR(AssignBuffersForComputation(
-        computation, /*is_thread_local=*/false, hlo_set.get(),
-        colocated_buffers, colocated_allocations,
-        &buffers_to_assign_sequentially, assignment.get()));
+        computation, /*is_thread_local=*/false, colocated_buffers,
+        colocated_allocations, &buffers_to_assign_sequentially,
+        assignment.get()));
   }
   // Assign buffers with sequential ordering, if any. If all global computations
   // are sequential, we can run heap simuation on the whole module, which
@@ -1219,7 +1198,7 @@ StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::CreateAssignment(
   for (auto* computation : thread_local_computations) {
     TF_RET_CHECK(computation != module->entry_computation());
     TF_RETURN_IF_ERROR(AssignBuffersForComputation(
-        computation, /*is_thread_local=*/true, hlo_set.get(), colocated_buffers,
+        computation, /*is_thread_local=*/true, colocated_buffers,
         colocated_allocations, /*buffers_to_assign_sequentially=*/nullptr,
         assignment.get()));
   }
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.h b/tensorflow/compiler/xla/service/buffer_assignment.h
index 7e96caf0f4..9774a3174a 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.h
+++ b/tensorflow/compiler/xla/service/buffer_assignment.h
@@ -400,13 +400,10 @@ class BufferAssigner {
   // Build and return a BufferAssignment for the given module. The given
   // HloOrdering is used to determine buffer liveness. buffer_size is a function
   // which returns the size of a LogicalBuffer. Alignment is the the minimum
-  // alignment of any buffer. If hlos_to_allocate is not null then only
-  // instructions in this vector are considered for buffer assignment. If
-  // hlos_to_allocate is null then all instructions are considered.
+  // alignment of any buffer.
   static StatusOr<std::unique_ptr<BufferAssignment>> Run(
       const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-      LogicalBuffer::SizeFunction buffer_size, int64 alignment,
-      const std::vector<const HloInstruction*>* hlos_to_allocate = nullptr);
+      LogicalBuffer::SizeFunction buffer_size, int64 alignment);
 
  private:
   explicit BufferAssigner(LogicalBuffer::SizeFunction buffer_size,
@@ -416,18 +413,14 @@ class BufferAssigner {
 
   // Create a buffer assignment.
   StatusOr<std::unique_ptr<BufferAssignment>> CreateAssignment(
-      const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-      const std::vector<const HloInstruction*>* hlos_to_allocate = nullptr);
+      const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering);
 
   // Assigns buffers to the instructions in the given computation. "assignment"
   // is modified to reflect the new buffer assignments. If is_thread_local is
   // true, then all assigned buffers have the is_thread_local flag set to
-  // true. If hlos_to_allocate is not null it indicates which HLOs to include in
-  // buffer assignment. If null, all instructions in the computation are
-  // included.
+  // true.
   Status AssignBuffersForComputation(
       const HloComputation* computation, bool is_thread_local,
-      const tensorflow::gtl::FlatSet<const HloInstruction*>* hlos_to_allocate,
       const tensorflow::gtl::FlatSet<const LogicalBuffer*>& colocated_buffers,
       const tensorflow::gtl::FlatSet<BufferAllocation::Index>&
           colocated_allocations,
-- 
GitLab


From 1aea0e8ce30fa625ab6ebbbd43fbf7f2307e2105 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 11:49:19 -0700
Subject: [PATCH 1305/1563] Make decode_image decode JPEG-EXIF files as JPEG.

PiperOrigin-RevId: 155893199
---
 tensorflow/python/ops/image_ops_impl.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/ops/image_ops_impl.py b/tensorflow/python/ops/image_ops_impl.py
index c79f413c5e..cf7be5759e 100644
--- a/tensorflow/python/ops/image_ops_impl.py
+++ b/tensorflow/python/ops/image_ops_impl.py
@@ -1328,11 +1328,11 @@ def decode_image(contents, channels=None, name=None):
   with ops.name_scope(name, 'decode_image') as scope:
     if channels not in (None, 0, 1, 3):
       raise ValueError('channels must be in (None, 0, 1, 3)')
-    substr = string_ops.substr(contents, 0, 4)
+    substr = string_ops.substr(contents, 0, 3)
 
     def _gif():
       # Create assert op to check that bytes are GIF decodable
-      is_gif = math_ops.equal(substr, b'\x47\x49\x46\x38', name='is_gif')
+      is_gif = math_ops.equal(substr, b'\x47\x49\x46', name='is_gif')
       decode_msg = 'Unable to decode bytes as JPEG, PNG, or GIF'
       assert_decode = control_flow_ops.Assert(is_gif, [decode_msg])
       # Create assert to make sure that channels is not set to 1
@@ -1348,13 +1348,15 @@ def decode_image(contents, channels=None, name=None):
       return gen_image_ops.decode_png(contents, channels)
 
     def check_png():
-      is_png = math_ops.equal(substr, b'\211PNG', name='is_png')
+      is_png = math_ops.equal(substr, b'\211PN', name='is_png')
       return control_flow_ops.cond(is_png, _png, _gif, name='cond_png')
 
     def _jpeg():
       return gen_image_ops.decode_jpeg(contents, channels)
 
-    is_jpeg = math_ops.equal(substr, b'\xff\xd8\xff\xe0', name='is_jpeg')
+    # Decode normal JPEG images (start with \xff\xd8\xff\xe0)
+    # as well as JPEG images with EXIF data (start with \xff\xd8\xff\xe1).
+    is_jpeg = math_ops.equal(substr, b'\xff\xd8\xff', name='is_jpeg')
     return control_flow_ops.cond(is_jpeg, _jpeg, check_png, name='cond_jpeg')
 
 
-- 
GitLab


From f8a98002491b7cd5f04ec7def6fa7dc30a66215a Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Fri, 12 May 2017 11:57:54 -0700
Subject: [PATCH 1306/1563] Reenable test.

PiperOrigin-RevId: 155894188
---
 tensorflow/python/kernel_tests/bias_op_test.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/kernel_tests/bias_op_test.py b/tensorflow/python/kernel_tests/bias_op_test.py
index fe5f0f319d..42ba665725 100644
--- a/tensorflow/python/kernel_tests/bias_op_test.py
+++ b/tensorflow/python/kernel_tests/bias_op_test.py
@@ -184,11 +184,8 @@ class BiasAddTest(test.TestCase):
       if dtype == dtypes.float64:
         threshold = 1e-10
       self.assertAllClose(tensor_jacob_t, tensor_jacob_n, threshold, threshold)
-      # TODO(annarev): Re-add assertion for float16, float32 dtypes and NCHW
-      # once we figure out why this check started failing with cuda mavx.
-      if dtype == dtypes.float64 or data_format != "NCHW":
-        self.assertAllClose(bias_jacob_t, bias_jacob_n, threshold, threshold)
-        self.assertAllClose(grad_jacob_t, grad_jacob_n, threshold, threshold)
+      self.assertAllClose(bias_jacob_t, bias_jacob_n, threshold, threshold)
+      self.assertAllClose(grad_jacob_t, grad_jacob_n, threshold, threshold)
 
   def testGradientTensor(self):
     for (data_format, use_gpu) in GetTestConfigs():
-- 
GitLab


From 7d785f1e18af9d22d940f18aac6e8c9ffd268b22 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Fri, 12 May 2017 12:38:21 -0700
Subject: [PATCH 1307/1563] C API: Do not ignore errors in shape inference when
 constructing the graph.

Fixes #9826

PiperOrigin-RevId: 155898632
---
 tensorflow/c/c_api.cc                         | 12 +--
 tensorflow/c/c_api_test.cc                    | 83 ++++++++++++++-----
 .../org/tensorflow/OperationBuilderTest.java  |  2 +-
 tensorflow/python/BUILD                       |  1 +
 tensorflow/python/ops/math_ops_test.py        |  7 +-
 5 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index 0f66a47b4a..bbc18569ad 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -1101,14 +1101,14 @@ static TF_Operation* TF_FinishOperationLocked(TF_OperationDescription* desc,
 
     if (status->status.ok()) {
       // Run shape inference function for newly added node.
-      //
-      // TODO(b/28152992): Enable returning the result of this
-      // code-path once we have converted all python shape functions
-      // to call their C++ versions.
-      desc->graph->refiner.AddNode(ret).IgnoreError();
-
+      status->status = desc->graph->refiner.AddNode(ret);
+    }
+    if (status->status.ok()) {
       // Add the node to the name-to-node mapping.
       desc->graph->name_map[ret->name()] = ret;
+    } else if (ret != nullptr) {
+      desc->graph->graph.RemoveNode(ret);
+      ret = nullptr;
     }
   }
 
diff --git a/tensorflow/c/c_api_test.cc b/tensorflow/c/c_api_test.cc
index 0ddc59db20..cdb7406c86 100644
--- a/tensorflow/c/c_api_test.cc
+++ b/tensorflow/c/c_api_test.cc
@@ -23,6 +23,7 @@ limitations under the License.
 #include "tensorflow/cc/saved_model/tag_constants.h"
 #include "tensorflow/core/example/example.pb.h"
 #include "tensorflow/core/example/feature.pb.h"
+#include "tensorflow/core/framework/common_shape_fns.h"
 #include "tensorflow/core/framework/graph.pb_text.h"
 #include "tensorflow/core/framework/node_def.pb_text.h"
 #include "tensorflow/core/framework/node_def_util.h"
@@ -278,6 +279,19 @@ static void Int32Deallocator(void* data, size_t, void* arg) {
   delete[] static_cast<int32*>(data);
 }
 
+// Create a tensor with values of type TF_INT8 provided by `values`.
+static TF_Tensor* Int8Tensor(const int64_t* dims, int num_dims,
+                             const char* values) {
+  int64_t num_values = 1;
+  for (int i = 0; i < num_dims; ++i) {
+    num_values *= dims[i];
+  }
+  TF_Tensor* t =
+      TF_AllocateTensor(TF_INT8, dims, num_dims, sizeof(char) * num_values);
+  memcpy(TF_TensorData(t), values, sizeof(char) * num_values);
+  return t;
+}
+
 static TF_Tensor* Int32Tensor(int32 v) {
   const int num_bytes = sizeof(int32);
   int32* values = new int32[1];
@@ -293,16 +307,21 @@ TF_Operation* Placeholder(TF_Graph* graph, TF_Status* s,
   return TF_FinishOperation(desc, s);
 }
 
-TF_Operation* ScalarConst(int32 v, TF_Graph* graph, TF_Status* s,
-                          const char* name = "scalar") {
-  unique_tensor_ptr tensor(Int32Tensor(v), TF_DeleteTensor);
+TF_Operation* Const(TF_Tensor* t, TF_Graph* graph, TF_Status* s,
+                    const char* name = "const") {
   TF_OperationDescription* desc = TF_NewOperation(graph, "Const", name);
-  TF_SetAttrTensor(desc, "value", tensor.get(), s);
+  TF_SetAttrTensor(desc, "value", t, s);
   if (TF_GetCode(s) != TF_OK) return nullptr;
-  TF_SetAttrType(desc, "dtype", TF_INT32);
+  TF_SetAttrType(desc, "dtype", TF_TensorType(t));
   return TF_FinishOperation(desc, s);
 }
 
+TF_Operation* ScalarConst(int32 v, TF_Graph* graph, TF_Status* s,
+                          const char* name = "scalar") {
+  unique_tensor_ptr tensor(Int32Tensor(v), TF_DeleteTensor);
+  return Const(tensor.get(), graph, s, name);
+}
+
 TF_Operation* Add(TF_Operation* l, TF_Operation* r, TF_Graph* graph,
                   TF_Status* s, const char* name = "add") {
   TF_OperationDescription* desc = TF_NewOperation(graph, "AddN", name);
@@ -1093,6 +1112,35 @@ TEST(CAPI, SessionPRun) {
   TF_DeleteStatus(s);
 }
 
+TEST(CAPI, ShapeInferenceError) {
+  // TF_FinishOperation should fail if the shape of the added operation cannot
+  // be inferred.
+  TF_Status* status = TF_NewStatus();
+  TF_Graph* graph = TF_NewGraph();
+
+  // Create this failure by trying to add two nodes with incompatible shapes
+  // (A tensor with shape [2] and a tensor with shape [3] cannot be added).
+  const char data[] = {1, 2, 3};
+  const int64_t vec2_dims[] = {2};
+  unique_tensor_ptr vec2_tensor(
+      Int8Tensor(vec2_dims, TF_ARRAYSIZE(vec2_dims), data), TF_DeleteTensor);
+  TF_Operation* vec2 = Const(vec2_tensor.get(), graph, status, "vec2");
+  ASSERT_EQ(TF_OK, TF_GetCode(status)) << TF_Message(status);
+
+  const int64_t vec3_dims[] = {3};
+  unique_tensor_ptr vec3_tensor(
+      Int8Tensor(vec3_dims, TF_ARRAYSIZE(vec3_dims), data), TF_DeleteTensor);
+  TF_Operation* vec3 = Const(vec3_tensor.get(), graph, status, "vec3");
+  ASSERT_EQ(TF_OK, TF_GetCode(status)) << TF_Message(status);
+
+  TF_Operation* add = Add(vec2, vec3, graph, status);
+  ASSERT_NE(TF_OK, TF_GetCode(status));
+  ASSERT_TRUE(add == nullptr);
+
+  TF_DeleteGraph(graph);
+  TF_DeleteStatus(status);
+}
+
 TEST(CAPI, ColocateWith) {
   TF_Status* s = TF_NewStatus();
   TF_Graph* graph = TF_NewGraph();
@@ -1535,7 +1583,8 @@ Test op with no grad registered.
 
 x: input
 y: output
-)doc");
+)doc")
+    .SetShapeFn(tensorflow::shape_inference::UnknownShape);
 
 class CApiGradientsTest : public ::testing::Test {
  protected:
@@ -1801,18 +1850,6 @@ TEST_F(CApiGradientsTest, OpWithNoGradientRegistered_NoGradInputs) {
   TestGradientsError(false);
 }
 
-// Create a tensor with values of type TF_INT8 provided by `values`.
-TF_Tensor* Int8Tensor(const int64_t* dims, int num_dims, const char* values) {
-  int64_t num_values = 1;
-  for (int i = 0; i < num_dims; ++i) {
-    num_values *= dims[i];
-  }
-  TF_Tensor* t =
-      TF_AllocateTensor(TF_INT8, dims, num_dims, sizeof(char) * num_values);
-  memcpy(TF_TensorData(t), values, sizeof(char) * num_values);
-  return t;
-}
-
 void StringVectorToArrays(const std::vector<string>& v,
                           std::unique_ptr<const void* []>* ptrs,
                           std::unique_ptr<size_t[]>* lens) {
@@ -1828,9 +1865,13 @@ void StringVectorToArrays(const std::vector<string>& v,
 // Registers two ops, each with a single attribute called 'v'.
 // The attribute in one op will have a type 'type', the other
 // will have list(type).
-#define ATTR_TEST_REGISTER_OP(type)                            \
-  REGISTER_OP("CApiAttributesTestOp" #type).Attr("v: " #type); \
-  REGISTER_OP("CApiAttributesTestOpList" #type).Attr("v: list(" #type ")")
+#define ATTR_TEST_REGISTER_OP(type)                           \
+  REGISTER_OP("CApiAttributesTestOp" #type)                   \
+      .Attr("v: " #type)                                      \
+      .SetShapeFn(tensorflow::shape_inference::UnknownShape); \
+  REGISTER_OP("CApiAttributesTestOpList" #type)               \
+      .Attr("v: list(" #type ")")                             \
+      .SetShapeFn(tensorflow::shape_inference::UnknownShape)
 ATTR_TEST_REGISTER_OP(string);
 ATTR_TEST_REGISTER_OP(int);
 ATTR_TEST_REGISTER_OP(float);
diff --git a/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java b/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
index 951136180d..9dc400a3d3 100644
--- a/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
+++ b/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
@@ -101,7 +101,7 @@ public class OperationBuilderTest {
       assertTrue(hasNode(g, "StringAndBool"));
       // int (TF "int" attributes are 64-bit signed, so a Java long).
       g.opBuilder("RandomUniform", "Int")
-          .addInput(TestUtil.constant(g, "RandomUniformShape", 1))
+          .addInput(TestUtil.constant(g, "RandomUniformShape", new int[]{1}))
           .setAttr("seed", 10)
           .setAttr("dtype", DataType.FLOAT)
           .build();
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index feab1e2fbc..d2b0f45c72 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2184,6 +2184,7 @@ cuda_py_test(
     srcs = ["ops/math_ops_test.py"],
     additional_deps = [
         ":array_ops",
+        ":errors",
         ":framework_for_generated_wrappers",
         ":framework_test_lib",
         ":gradients",
diff --git a/tensorflow/python/ops/math_ops_test.py b/tensorflow/python/ops/math_ops_test.py
index ed30c4bcfa..120827d18b 100644
--- a/tensorflow/python/ops/math_ops_test.py
+++ b/tensorflow/python/ops/math_ops_test.py
@@ -20,6 +20,7 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
@@ -55,7 +56,8 @@ class ReduceTest(test_util.TensorFlowTestCase):
   def testReduceInvalidAxis(self):
     x = np.array([[1, 2, 3], [4, 5, 6]], dtype=np.int32)
     axis = np.array([[0], [1]])
-    with self.assertRaisesRegexp(ValueError, "must be at most rank 1"):
+    with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                 "must be at most rank 1"):
       math_ops.reduce_sum(x, axis)
 
 
@@ -280,7 +282,8 @@ class AddNTest(test_util.TensorFlowTestCase):
     for _ in range(98):
       partials.append(math_ops.add_n([constant_op.constant(1)]))
     partials.append(
-        math_ops.add_n([constant_op.constant(1), constant_op.constant(1)]))
+        math_ops.add_n([constant_op.constant(1),
+                        constant_op.constant(1)]))
 
     res = math_ops.add_n(partials) + constant_op.constant(0)
     with self.test_session(use_gpu=True):
-- 
GitLab


From 063bdbe773ba520d6a232f278567a16411a90597 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Fri, 12 May 2017 13:10:31 -0700
Subject: [PATCH 1308/1563] Make sparse_reshape work well with output of
 tf.shape.

PiperOrigin-RevId: 155902266
---
 tensorflow/python/feature_column/feature_column.py  | 13 +++----------
 .../python/kernel_tests/sparse_reshape_op_test.py   | 12 ++++++++++++
 tensorflow/python/ops/sparse_ops.py                 |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index c827804c73..4802992a65 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -1330,13 +1330,6 @@ class _CategoricalColumn(_FeatureColumn):
     pass
 
 
-def _sparse_reshape(inputs, shape):
-  # Satisfies sparse_reshape assumptions such as dtype int64.
-  # shape is a list.
-  return sparse_ops.sparse_reshape(inputs,
-                                   math_ops.cast(shape, dtypes.int64))
-
-
 def _create_categorical_column_weighted_sum(
     column, builder, units, sparse_combiner, weight_collections, trainable):
   """Create a weighted sum of a categorical column for linear_model."""
@@ -1344,13 +1337,13 @@ def _create_categorical_column_weighted_sum(
       builder,
       weight_collections=weight_collections,
       trainable=trainable)
-  id_tensor = _sparse_reshape(sparse_tensors.id_tensor, [
+  id_tensor = sparse_ops.sparse_reshape(sparse_tensors.id_tensor, [
       array_ops.shape(sparse_tensors.id_tensor)[0], -1
   ])
   weight_tensor = sparse_tensors.weight_tensor
   if weight_tensor is not None:
-    weight_tensor = _sparse_reshape(weight_tensor,
-                                    [array_ops.shape(weight_tensor)[0], -1])
+    weight_tensor = sparse_ops.sparse_reshape(
+        weight_tensor, [array_ops.shape(weight_tensor)[0], -1])
 
   weight = variable_scope.get_variable(
       name='weight',
diff --git a/tensorflow/python/kernel_tests/sparse_reshape_op_test.py b/tensorflow/python/kernel_tests/sparse_reshape_op_test.py
index 42874ea9b7..e87fa0c94c 100644
--- a/tensorflow/python/kernel_tests/sparse_reshape_op_test.py
+++ b/tensorflow/python/kernel_tests/sparse_reshape_op_test.py
@@ -78,6 +78,18 @@ class SparseReshapeTest(test.TestCase):
       self.assertAllEqual(output_val.values, input_val.values)
       self.assertAllEqual(output_val.dense_shape, input_val.dense_shape)
 
+  def testWorksWellWithTfShape(self):
+    with self.test_session(use_gpu=False) as sess:
+      sp_input = self._SparseTensorPlaceholder()
+      input_val = self._SparseTensorValue_5x6()
+      shape = array_ops.shape(sp_input)  # tf.shape generates int32 output
+      sp_output = sparse_ops.sparse_reshape(sp_input, shape)
+
+      output_val = sess.run(sp_output, {sp_input: input_val})
+      self.assertAllEqual(output_val.indices, input_val.indices)
+      self.assertAllEqual(output_val.values, input_val.values)
+      self.assertAllEqual(output_val.dense_shape, input_val.dense_shape)
+
   def testFeedSameShapeWithInferredDim(self):
     with self.test_session(use_gpu=False) as sess:
       sp_input = self._SparseTensorPlaceholder()
diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 5d6f4c0471..23afb13d4f 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -556,7 +556,7 @@ def sparse_reshape(sp_input, shape, name=None):
       number of elements than `sp_input`.
   """
   sp_input = _convert_to_sparse_tensor(sp_input)
-  shape = ops.convert_to_tensor(shape, dtype=dtypes.int64)
+  shape = math_ops.cast(shape, dtype=dtypes.int64)
 
   with ops.name_scope(name, "SparseReshape", [sp_input]) as name:
     reshaped_ind, reshaped_shape = gen_sparse_ops._sparse_reshape(
-- 
GitLab


From fbd0309df5e0814d983c409142eb8192b371f4d2 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Fri, 12 May 2017 13:25:02 -0700
Subject: [PATCH 1309/1563] [TF:XLA] Update LLVM to upstream release r302782.

PiperOrigin-RevId: 155903819
---
 tensorflow/workspace.bzl    | 8 ++++----
 third_party/llvm/llvm.BUILD | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 502d7e973c..5e9edee5cb 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -498,11 +498,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   temp_workaround_http_archive(
       name = "llvm",
       urls = [
-          "http://mirror.bazel.build/github.com/llvm-mirror/llvm/archive/13790c8735a78a029dec92d80f5633418d9ffdd6.tar.gz",
-          "https://github.com/llvm-mirror/llvm/archive/13790c8735a78a029dec92d80f5633418d9ffdd6.tar.gz",
+          "http://mirror.bazel.build/github.com/llvm-mirror/llvm/archive/c978c0ff91f7c4ea58cfbd8f378e51c6af2c2b4b.tar.gz",
+          "https://github.com/llvm-mirror/llvm/archive/c978c0ff91f7c4ea58cfbd8f378e51c6af2c2b4b.tar.gz",
       ],
-      sha256 = "da4fc7147f1e2706977822934d1b245dcb6248930f8089129362ada14f6119dd",
-      strip_prefix = "llvm-13790c8735a78a029dec92d80f5633418d9ffdd6",
+      sha256 = "42c57d798a037d9dea692ce1da8ff4d24966ab5a40494015b374341e43411a37",
+      strip_prefix = "llvm-c978c0ff91f7c4ea58cfbd8f378e51c6af2c2b4b",
       build_file = str(Label("//third_party/llvm:llvm.BUILD")),
       repository = tf_repo_name,
   )
diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD
index 005ae21ee8..15aa53962d 100644
--- a/third_party/llvm/llvm.BUILD
+++ b/third_party/llvm/llvm.BUILD
@@ -1714,10 +1714,6 @@ cc_library(
         "include/llvm/Support/DataTypes.h",
         "include/llvm/ExecutionEngine/ObjectMemoryBuffer.h",
     ],
-    linkopts = [
-        "-lpthread",
-        "-ldl",
-    ],
     deps = [
         ":config",
         ":demangle",
-- 
GitLab


From 465ba5545047b4c901cd48c8a7f5a8ff9583c4ab Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Fri, 12 May 2017 13:50:39 -0700
Subject: [PATCH 1310/1563] Edits to the tf.contrib.kernel_methods README and
 tutorial

PiperOrigin-RevId: 155906923
---
 tensorflow/contrib/kernel_methods/README.md   | 24 ++++---
 .../contrib/kernel_methods/g3doc/tutorial.md  | 66 ++++++++++---------
 2 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/tensorflow/contrib/kernel_methods/README.md b/tensorflow/contrib/kernel_methods/README.md
index 1913800af0..44ed9670a0 100644
--- a/tensorflow/contrib/kernel_methods/README.md
+++ b/tensorflow/contrib/kernel_methods/README.md
@@ -17,21 +17,19 @@ out_tensor = kernel_mapper.map(in_tensor)
 ...  # code that consumes out_tensor.
 ```
 
-Currently, there is a [RandomFourierFeatureMapper]
-(https://www.tensorflow.org/code/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features.py) implemented that maps dense
-input to dense output.
+Currently, there is a [RandomFourierFeatureMapper](https://www.tensorflow.org/code/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features.py) implemented that maps dense input to dense
+output. More mappers are on the way.
 
 ## Kernel-based Estimators
-tf.contrib.learn Estimators that use kernel mappers internally to discover
-non-linearities in the data. These canned estimators map their input features
-using kernel mapper Ops and then apply linear models to the mapped
-features. Combining kernel mappers with linear models and different loss
-functions leads to a variety of models: linear and non-linear SVMs, linear
-regression (with and without kernels) and (multinomial) logistic regression
-(with and without kernels).
-
-Currently there is a [KernelLinearClassifier]
-(https://www.tensorflow.org/code/tensorflow/contrib/kernel_methods/python/kernel_estimators.py) implemented but more pre-packaged estimators
+These are estimators inheriting from the @{tf.contrib.learn.Estimator} class and
+use kernel mappers internally to discover non-linearities in the data. These
+canned estimators map their input features using kernel mapper Ops and then
+apply linear models to the mapped features. Combining kernel mappers with linear
+models and different loss functions leads to a variety of models: linear and
+non-linear SVMs, linear regression (with and without kernels) and (multinomial)
+logistic regression (with and without kernels).
+
+Currently there is a [KernelLinearClassifier](https://www.tensorflow.org/code/tensorflow/contrib/kernel_methods/python/kernel_estimators.py) implemented but more pre-packaged estimators
 are on the way.
 
 Sample usage:
diff --git a/tensorflow/contrib/kernel_methods/g3doc/tutorial.md b/tensorflow/contrib/kernel_methods/g3doc/tutorial.md
index 51000080a7..64c2adf9f3 100644
--- a/tensorflow/contrib/kernel_methods/g3doc/tutorial.md
+++ b/tensorflow/contrib/kernel_methods/g3doc/tutorial.md
@@ -1,12 +1,16 @@
-# Improving classification using explicit kernel methods
+# Improving Linear Models Using Explicit Kernel Methods
 
 In this tutorial, we demonstrate how combining (explicit) kernel methods with
 linear models can drastically increase the latters' quality of predictions
-without significantly increasing training and inference times. Currently,
-explicit kernel mappings are supported for dense features. Support for sparse
-features is in the works.
+without significantly increasing training and inference times. Unlike dual
+kernel methods, explicit (primal) kernel methods scale well with the size of the
+training dataset both in terms of training/inference times and in terms of
+memory requirements.
 
-We will use [tf.contrib.learn](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn) (TensorFlow's high-level Machine Learning API) Estimators for our ML models.
+Currently, explicit kernel mappings are supported for dense features. Support
+for sparse features is in the works.
+
+We will use [tf.contrib.learn](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn) (TensorFlow's high-level Machine Learning API) Estimators for our ML models. The
 tf.contrib.learn API reduces the boilerplate code one needs to write for
 configuring, training and evaluating models and will let us focus on the core
 ideas. If you are not familiar with this API, [tf.contrib.learn Quickstart](https://www.tensorflow.org/get_started/tflearn) is a good place to start. We
@@ -35,9 +39,10 @@ In order to feed data to a tf.contrib.learn Estimator, it is helpful to convert
 it to Tensors. For this, we will use an `input function` which adds Ops to the
 TensorFlow graph that, when executed, create mini-batches of Tensors to be used
 downstream. For more background on input functions, check
-[Building Input Functions with tf.contrib.learn](https://www.tensorflow.org/get_started/input_fn). In this example, we will use the `tf.train.shuffle_batch` Op which,
-besides converting numpy arrays to Tensors, allows us to specify the batch_size
-and whether to randomize the input every time the input_fn Ops are executed
+[Building Input Functions with tf.contrib.learn](https://www.tensorflow.org/get_started/input_fn).
+In this example, we will use the `tf.train.shuffle_batch` Op which, besides
+converting numpy arrays to Tensors, allows us to specify the batch_size and
+whether to randomize the input every time the input_fn Ops are executed
 (randomization typically expedites convergence during training). The full code
 for loading and preparing the data is shown in the snippet below. In this
 example, we use mini-batches of size 256 for training and the entire sample (5K
@@ -70,9 +75,10 @@ eval_input_fn = get_input_fn(data.validation, batch_size=5000)
 ```
 
 ## Training a simple linear model
-We can now train a linear model over the MNIST dataset. We will use the  [tf.contrib.learn.LinearClassifier](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/linear.py) estimator with 10 classes (representing the 10
-digits). The input features form a 784-dimensional (dense) vector which can be
-specified as follows:
+We can now train a linear model over the MNIST dataset. We will use the
+[tf.contrib.learn.LinearClassifier](https://www.tensorflow.org/code/tensorflow/contrib/learn/python/learn/estimators/linear.py) estimator with 10 classes (representing the 10 digits).
+The input features form a 784-dimensional (dense) vector which can be specified
+as follows:
 
 ```python
 image_column = tf.contrib.layers.real_valued_column('images', dimension=784)
@@ -99,7 +105,7 @@ eval_metrics = estimator.evaluate(input_fn=eval_input_fn, steps=1)
 print(eval_metrics)
 ```
 On eval data, the loss (i.e., the value of the objective function being
-minimized during training) lies between **0.25 and 0.30** (depending on the
+minimized during training) lies between **0.25** and **0.30** (depending on the
 parameters used) while the accuracy of the classifier is approximately **92.5%**
 (training is randomized so the exact loss and accuracy will vary). Also, the
 training time is around 25 seconds (this will also vary based on the machine you
@@ -109,11 +115,10 @@ In addition to experimenting with the (training) batch size and the number of
 training steps, there are a couple other parameters that can be tuned as well.
 For instance, you can change the optimization method used to minimize the loss
 by explicitly selecting another optimizer from the collection of
-[available optimizers]
-(https://www.tensorflow.org/code/tensorflow/python/training).
-As an example, the following code constructs a LinearClassifer estimator that
+[available optimizers](https://www.tensorflow.org/code/tensorflow/python/training).
+As an example, the following code constructs a LinearClassifier estimator that
 uses the Follow-The-Regularized-Leader (FTRL) optimization strategy with a
-specific learning rate and l2-regularization.
+specific learning rate and L2-regularization.
 
 
 ```python
@@ -135,15 +140,13 @@ input space to another feature space (of possibly higher dimension) where the
 (transformed) features are (almost) linearly separable and then apply a linear
 model on the mapped features. This is shown in the following figure:
 
-<div style="text-align:center">
-<img src="./kernel_mapping.png">
-</div>
+![image](./kernel_mapping.png)
 
 **Technical details overview:** In this example we will use **Random Fourier
-Features** (introduced in the ["Random Features for Large-Scale Kernel Machines"]
-(https://people.eecs.berkeley.edu/~brecht/papers/07.rah.rec.nips.pdf) paper by
+Features** (introduced in the
+["Random Features for Large-Scale Kernel Machines"](https://people.eecs.berkeley.edu/~brecht/papers/07.rah.rec.nips.pdf) paper by
 Rahimi and Recht) to map the input data. Random Fourier Features map a vector
-$$\mathbf{x} \in \mathbb{R}^d$$ to $$\mathbf{x'} \in \mathbb{R}^D$$ via the
+\\(\mathbf{x} \in \mathbb{R}^d\\) to \\(\mathbf{x'} \in \mathbb{R}^D\\) via the
 following mapping:
 
 $$
@@ -151,11 +154,11 @@ RFFM(\cdot): \mathbb{R}^d \to \mathbb{R}^D, \quad
 RFFM(\mathbf{x}) =  \cos(\mathbf{\Omega} \cdot \mathbf{x}+ \mathbf{b})
 $$
 
-where $$\mathbf{\Omega} \in \mathbb{R}^{D \times d}$$,
-$$\mathbf{x} \in \mathbb{R}^d,$$ $$\mathbf{b} \in \mathbb{R}^D$$ and cosine is
-applied elementwise.
+where \\(\mathbf{\Omega} \in \mathbb{R}^{D \times d}\\),
+\\(\mathbf{x} \in \mathbb{R}^d,\\) \\(\mathbf{b} \in \mathbb{R}^D\\) and the
+cosine is applied element-wise.
 
-In this example, the entries of $$\mathbf{\Omega}$$ and $$\mathbf{b}$$ are
+In this example, the entries of \\(\mathbf{\Omega}\\) and \\(\mathbf{b}\\) are
 sampled from distributions such that the mapping satisfies the following
 property:
 
@@ -175,7 +178,7 @@ for more details.
 pre-packaged `tf.contrib.learn` estimator that combines the power of explicit
 kernel mappings with linear models. Its API is very similar to that of the
 LinearClassifier with the additional ability to specify a list of explicit
-kernel mappings to be apply to each feature used by the classifier. The
+kernel mappings to be applied to each feature used by the classifier. The
 following code snippet demonstrates how to replace LinearClassifier with
 KernelLinearClassifier.
 
@@ -219,7 +222,7 @@ instruct the classifier to first map the initial 784-dimensional images to
 2000-dimensional vectors using random Fourier features and then learn a linear
 model on the transformed vectors. Note that, besides the output dimension, there
 is one more parameter (stddev) involved. This parameter is the standard
-deviation ($$\sigma$$) of the approximated RBF kernel and controls the
+deviation (\\(\sigma\\)) of the approximated RBF kernel and controls the
 similarity measure used in classification. This parameter is typically
 determined via hyperparameter tuning.
 
@@ -260,14 +263,17 @@ time respectively.
 ![image](./acc_vs_outdim.png)  ![image](./acc-vs-trn_time.png)
 
 
-## Explicit Kernel Mappings: summary and practical tips
+## Explicit kernel mappings: summary and practical tips
 * Explicit kernel mappings combine the predictive power of non-linear models
 with the scalability of linear models.
+* Unlike traditional dual kernel methods, they can scale to millions or hundreds
+of millions of samples.
 * Random Fourier Features can be particularly effective for datasets with dense
 features.
 * The parameters of the kernel mapping are often data-dependent. Model quality
 can be very sensitive to these parameters. Use hyperparameter tuning to find the
 optimal values.
 * If you have multiple numerical features, concatinate them into a single
-multi-dimensional one and apply the kernel mapping to the concatenated vector.
+multi-dimensional feature and apply the kernel mapping to the concatenated
+vector.
 
-- 
GitLab


From 09ec81b9d01e9523b926c50d98d91a1154c3fc55 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 14:13:15 -0700
Subject: [PATCH 1311/1563] Rename 'weight' variable to 'weights' for
 consistency.

PiperOrigin-RevId: 155909817
---
 tensorflow/python/feature_column/feature_column.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 4802992a65..ce864fe051 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -1346,7 +1346,7 @@ def _create_categorical_column_weighted_sum(
         weight_tensor, [array_ops.shape(weight_tensor)[0], -1])
 
   weight = variable_scope.get_variable(
-      name='weight',
+      name='weights',
       shape=(column._num_buckets, units),  # pylint: disable=protected-access
       initializer=init_ops.zeros_initializer(),
       trainable=trainable,
-- 
GitLab


From 31a072d92585c15aebb9cfdc7cf06390d0ab8972 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 14:16:18 -0700
Subject: [PATCH 1312/1563] Add tests for shape ops with bool inputs.

PiperOrigin-RevId: 155910218
---
 .../python/kernel_tests/shape_ops_test.py     | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/tensorflow/python/kernel_tests/shape_ops_test.py b/tensorflow/python/kernel_tests/shape_ops_test.py
index dbc52acb79..97d61d52af 100644
--- a/tensorflow/python/kernel_tests/shape_ops_test.py
+++ b/tensorflow/python/kernel_tests/shape_ops_test.py
@@ -147,6 +147,14 @@ class ShapeOpsTest(test.TestCase):
     self._testAll(np.random.randn(2, 3, 5, 7, 11))
     self._testAll(np.random.randn(2, 3, 5, 7, 11, 13))
 
+  def testBool(self):
+    self._testAll(np.random.choice((False, True), size=(2,)))
+    self._testAll(np.random.choice((False, True), size=(2, 3)))
+    self._testAll(np.random.choice((False, True), size=(2, 3, 5)))
+    self._testAll(np.random.choice((False, True), size=(2, 3, 5, 7)))
+    self._testAll(np.random.choice((False, True), size=(2, 3, 5, 7, 11)))
+    self._testAll(np.random.choice((False, True), size=(2, 3, 5, 7, 11, 13)))
+
   # Disabled because it takes too long to run, but manually verified
   # as passing at time of writing.
   def _test64BitOutput(self):
@@ -197,12 +205,38 @@ class ShapeOpsTest(test.TestCase):
     self._compareExpandDimsAll(np.zeros([2, 3, 5]), -3)
     self._compareExpandDimsAll(np.zeros([2, 3, 5]), -4)
 
+  def testExpandDimsBool(self):
+    choice = lambda s: np.random.choice((False, True), size=s)
+    self._compareExpandDimsAll(choice([2]), 0)
+    self._compareExpandDimsAll(choice([2]), 1)
+    self._compareExpandDimsAll(choice([2]), -1)
+
+    self._compareExpandDimsAll(choice([2, 3]), 0)
+    self._compareExpandDimsAll(choice([2, 3]), 1)
+    self._compareExpandDimsAll(choice([2, 3]), 2)
+    self._compareExpandDimsAll(choice([2, 3]), -1)
+    self._compareExpandDimsAll(choice([2, 3]), -2)
+
+    self._compareExpandDimsAll(choice([2, 3, 5]), 0)
+    self._compareExpandDimsAll(choice([2, 3, 5]), 1)
+    self._compareExpandDimsAll(choice([2, 3, 5]), 2)
+    self._compareExpandDimsAll(choice([2, 3, 5]), 3)
+
+    self._compareExpandDimsAll(choice([2, 3, 5]), -1)
+    self._compareExpandDimsAll(choice([2, 3, 5]), -2)
+    self._compareExpandDimsAll(choice([2, 3, 5]), -3)
+    self._compareExpandDimsAll(choice([2, 3, 5]), -4)
+
   def testExpandDimsErrors(self):
     with self.test_session():
       self.assertRaises(ValueError, array_ops.expand_dims,
                         np.zeros([2, 3, 5]), -5)
+      self.assertRaises(ValueError, array_ops.expand_dims,
+                        [False, True, True], -5)
       self.assertRaises(ValueError, array_ops.expand_dims,
                         np.zeros([2, 3, 5]), 4)
+      self.assertRaises(ValueError, array_ops.expand_dims,
+                        [False, True, True], 4)
 
   def testExpandDimsGradient(self):
     with self.test_session():
@@ -220,6 +254,10 @@ class ShapeOpsTest(test.TestCase):
       self.assertAllEqual([7], array_ops.expand_dims(inp, 0).eval())
       self.assertAllEqual([7], array_ops.expand_dims(inp, -1).eval())
 
+      inp = constant_op.constant(True)
+      self.assertAllEqual([True], array_ops.expand_dims(inp, 0).eval())
+      self.assertAllEqual([True], array_ops.expand_dims(inp, -1).eval())
+
   def _compareSqueeze(self, x, squeeze_dims, use_gpu):
     with self.test_session(use_gpu=use_gpu):
       if squeeze_dims:
@@ -250,6 +288,18 @@ class ShapeOpsTest(test.TestCase):
     # Squeeze on both ends.
     self._compareSqueezeAll(np.zeros([1, 2, 1, 3, 1]))
 
+  def testSqueezeBool(self):
+    choice = lambda s: np.random.choice((False, True), size=s)
+    # Nothing to squeeze.
+    self._compareSqueezeAll(choice([2]))
+    self._compareSqueezeAll(choice([2, 3]))
+
+    # Squeeze the middle element away.
+    self._compareSqueezeAll(choice([2, 1, 2]))
+
+    # Squeeze on both ends.
+    self._compareSqueezeAll(choice([1, 2, 1, 3, 1]))
+
   def testSqueezeSpecificDimension(self):
     # Positive squeeze dim index.
     self._compareSqueezeAll(np.zeros([1, 2, 1, 3, 1]), [0])
@@ -261,6 +311,18 @@ class ShapeOpsTest(test.TestCase):
     self._compareSqueezeAll(np.zeros([1, 2, 1, 3, 1]), [-3, -5])
     self._compareSqueezeAll(np.zeros([1, 2, 1, 3, 1]), [-3, -5, -1])
 
+  def testSqueezeSpecificDimensionBool(self):
+    choice = lambda s: np.random.choice((False, True), size=s)
+    # Positive squeeze dim index.
+    self._compareSqueezeAll(choice([1, 2, 1, 3, 1]), [0])
+    self._compareSqueezeAll(choice([1, 2, 1, 3, 1]), [2, 4])
+    self._compareSqueezeAll(choice([1, 2, 1, 3, 1]), [0, 4, 2])
+
+    # Negative squeeze dim index.
+    self._compareSqueezeAll(choice([1, 2, 1, 3, 1]), [-1])
+    self._compareSqueezeAll(choice([1, 2, 1, 3, 1]), [-3, -5])
+    self._compareSqueezeAll(choice([1, 2, 1, 3, 1]), [-3, -5, -1])
+
   def testSqueezeAllOnes(self):
     # Numpy squeezes a 1 element tensor into a zero dimensional tensor.
     # Verify that we do the same.
@@ -271,6 +333,16 @@ class ShapeOpsTest(test.TestCase):
         tf_ans = tensor.eval()
         self.assertEqual(np.shape(1), tf_ans.shape)
 
+  def testSqueezeAllOnesBool(self):
+    # Numpy squeezes a 1 element tensor into a zero dimensional tensor.
+    # Verify that we do the same.
+    for use_gpu in [False, True]:
+      with self.test_session(use_gpu=use_gpu):
+        tensor = array_ops.squeeze([[[False]]], [])
+        self.assertEqual(np.shape(1), tensor.get_shape())
+        tf_ans = tensor.eval()
+        self.assertEqual(np.shape(1), tf_ans.shape)
+
   def testSqueezeOnlyOnes(self):
     for use_gpu in [False, True]:
       with self.test_session(use_gpu=use_gpu):
-- 
GitLab


From 065a39d8d2e5ef57117ca038b236c3c8827602ac Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Fri, 12 May 2017 14:29:37 -0700
Subject: [PATCH 1313/1563] Small refactoring of python op generation.

PiperOrigin-RevId: 155911841
---
 tensorflow/python/framework/python_op_gen.cc | 39 ++++++++++----------
 tensorflow/python/framework/python_op_gen.h  |  1 +
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tensorflow/python/framework/python_op_gen.cc b/tensorflow/python/framework/python_op_gen.cc
index 0326c7f5a8..220868168a 100644
--- a/tensorflow/python/framework/python_op_gen.cc
+++ b/tensorflow/python/framework/python_op_gen.cc
@@ -391,8 +391,25 @@ string AttrValueToPython(const string& type, const AttrValue& value) {
   }
 }
 
-static string GetPythonOp(const OpDef& op_def, bool is_hidden,
-                          const string& op_name) {
+void GenerateLowerCaseOpName(const string& str, string* result) {
+  const char joiner = '_';
+  const int last_index = str.size() - 1;
+  for (int i = 0; i <= last_index; ++i) {
+    const char c = str[i];
+    // Emit a joiner only if a previous-lower-to-now-upper or a
+    // now-upper-to-next-lower transition happens.
+    if (isupper(c) && (i > 0)) {
+      if (islower(str[i - 1]) || ((i < last_index) && islower(str[i + 1]))) {
+        result->push_back(joiner);
+      }
+    }
+    result->push_back(tolower(c));
+  }
+}
+
+}  // namespace
+
+string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
   string result;
   // Map from attr name to the first input arg it is inferred from.
   std::unordered_map<string, string> inferred_attrs;
@@ -629,24 +646,6 @@ static string GetPythonOp(const OpDef& op_def, bool is_hidden,
   return result;
 }
 
-void GenerateLowerCaseOpName(const string& str, string* result) {
-  const char joiner = '_';
-  const int last_index = str.size() - 1;
-  for (int i = 0; i <= last_index; ++i) {
-    const char c = str[i];
-    // Emit a joiner only if a previous-lower-to-now-upper or a
-    // now-upper-to-next-lower transition happens.
-    if (isupper(c) && (i > 0)) {
-      if (islower(str[i - 1]) || ((i < last_index) && islower(str[i + 1]))) {
-        result->push_back(joiner);
-      }
-    }
-    result->push_back(tolower(c));
-  }
-}
-
-}  // namespace
-
 string GetPythonOps(const OpList& ops, const std::vector<string>& hidden_ops,
                     bool require_shapes) {
   string result;
diff --git a/tensorflow/python/framework/python_op_gen.h b/tensorflow/python/framework/python_op_gen.h
index e51eacbc17..d865c23874 100644
--- a/tensorflow/python/framework/python_op_gen.h
+++ b/tensorflow/python/framework/python_op_gen.h
@@ -31,6 +31,7 @@ void PrintPythonOps(const OpList& ops, const std::vector<string>& hidden_ops,
                     bool require_shapes);
 string GetPythonOps(const OpList& ops, const std::vector<string>& hidden_ops,
                     bool require_shapes);
+string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name);
 
 // Get the python wrappers for a list of ops in a OpList.
 // `op_list_buf` should be a pointer to a buffer containing
-- 
GitLab


From 014086d6e12bf9b386d1c2866903a87bbf787aa0 Mon Sep 17 00:00:00 2001
From: Stephan Hoyer <shoyer@google.com>
Date: Fri, 12 May 2017 14:32:14 -0700
Subject: [PATCH 1314/1563] Implement SoftplusGradGrad

PiperOrigin-RevId: 155912145
---
 .../python/kernel_tests/softplus_op_test.py   | 36 +++++++++++++++++++
 tensorflow/python/ops/nn_grad.py              | 13 +++++++
 2 files changed, 49 insertions(+)

diff --git a/tensorflow/python/kernel_tests/softplus_op_test.py b/tensorflow/python/kernel_tests/softplus_op_test.py
index 5aa8441e19..b8e7c50a37 100644
--- a/tensorflow/python/kernel_tests/softplus_op_test.py
+++ b/tensorflow/python/kernel_tests/softplus_op_test.py
@@ -22,6 +22,7 @@ import numpy as np
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import gradient_checker
+from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import nn_ops
 import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import test
@@ -85,6 +86,41 @@ class SoftplusTest(test.TestCase):
     print("softplus (float) gradient err = ", err)
     self.assertLess(err, 1e-4)
 
+  def testGradGrad(self):
+    with self.test_session():
+      x = constant_op.constant(
+          [-0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 0.5, 0.7, 0.9],
+          shape=[2, 5],
+          name="x")
+      y = nn_ops.softplus(x, name="softplus")
+      (grad,) = gradients_impl.gradients(y, x)
+      x_init = np.asarray(
+          [[-0.9, -0.7, -0.5, -0.3, -0.1], [0.1, 0.3, 0.5, 0.7, 0.9]],
+          dtype=np.float32,
+          order="F")
+      err = gradient_checker.compute_gradient_error(
+          x, [2, 5], grad, [2, 5], x_init_value=x_init)
+    print("softplus (float) gradient of gradient err = ", err)
+    self.assertLess(err, 5e-5)
+
+  def testGradGradGrad(self):
+    with self.test_session():
+      x = constant_op.constant(
+          [-0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 0.5, 0.7, 0.9],
+          shape=[2, 5],
+          name="x")
+      y = nn_ops.softplus(x, name="softplus")
+      (grad,) = gradients_impl.gradients(y, x)
+      (grad_grad,) = gradients_impl.gradients(grad, x)
+      x_init = np.asarray(
+          [[-0.9, -0.7, -0.5, -0.3, -0.1], [0.1, 0.3, 0.5, 0.7, 0.9]],
+          dtype=np.float32,
+          order="F")
+      err = gradient_checker.compute_gradient_error(
+          x, [2, 5], grad_grad, [2, 5], x_init_value=x_init)
+    print("softplus (float) third-order gradient err = ", err)
+    self.assertLess(err, 5e-5)
+
   def testWarnInts(self):
     # Running the op triggers address sanitizer errors, so we just make it
     nn_ops.softplus(constant_op.constant(7))
diff --git a/tensorflow/python/ops/nn_grad.py b/tensorflow/python/ops/nn_grad.py
index b1f50fd341..028d82aa4d 100644
--- a/tensorflow/python/ops/nn_grad.py
+++ b/tensorflow/python/ops/nn_grad.py
@@ -349,6 +349,19 @@ def _SoftplusGrad(op, grad):
   return gen_nn_ops._softplus_grad(grad, op.inputs[0])
 
 
+@ops.RegisterGradient("SoftplusGrad")
+def _SoftplusGradGrad(op, grad):
+  # Let:
+  #   y = tf.nn.softplus(x)
+  #   dx = gen_nn_ops._softplus_grad(dy, x) = dy / (1 + exp(-x))
+  # This op computes (ddy, d2x) from op.inputs == [dy, x] and grad == ddx.
+  dy, x = op.inputs
+  with ops.control_dependencies([grad.op]):
+    ddy = gen_nn_ops._softplus_grad(grad, x)  # pylint: disable=protected-access
+    d2x = grad * dy / (math_ops.exp(-x) + 2.0 + math_ops.exp(x))
+    return (ddy, d2x)
+
+
 @ops.RegisterGradient("Softsign")
 def _SoftsignGrad(op, grad):
   return gen_nn_ops._softsign_grad(grad, op.inputs[0])
-- 
GitLab


From 6448f41d0b0ee45fea482ee14952f006245feb56 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 14:38:43 -0700
Subject: [PATCH 1315/1563] Add env variable to use BFCAllocator as a CPU
 allocator in ProcessState

PiperOrigin-RevId: 155912848
---
 .../core/common_runtime/gpu/process_state.cc  | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/common_runtime/gpu/process_state.cc b/tensorflow/core/common_runtime/gpu/process_state.cc
index cee7b6d78a..0e21e37fd3 100644
--- a/tensorflow/core/common_runtime/gpu/process_state.cc
+++ b/tensorflow/core/common_runtime/gpu/process_state.cc
@@ -159,9 +159,36 @@ Allocator* ProcessState::GetCPUAllocator(int numa_node) {
   numa_node = 0;
   mutex_lock lock(mu_);
   while (cpu_allocators_.size() <= static_cast<size_t>(numa_node)) {
-    Allocator* allocator =
-        new PoolAllocator(100 /*pool_size_limit*/, true /*auto_resize*/,
-                          new BasicCPUAllocator(), new NoopRounder, "cpu_pool");
+    bool use_bfc_allocator = false;
+    // TODO(reedwm): Switch default to BGFAllocator if it's at least as fast and
+    // efficient.
+    Status status = ReadBoolFromEnvVar("TF_CPU_ALLOCATOR_USE_BFC", false,
+                                       &use_bfc_allocator);
+    if (!status.ok()) {
+      LOG(ERROR) << "GetCPUAllocator: " << status.error_message();
+    }
+    Allocator* allocator;
+    if (use_bfc_allocator) {
+      // TODO(reedwm): evaluate whether 64GB by default is the best choice.
+      int64 cpu_mem_limit_in_mb = -1;
+      Status status = ReadInt64FromEnvVar("TF_CPU_BFC_MEM_LIMIT_IN_MB",
+                                          1LL << 16 /*64GB max by default*/,
+                                          &cpu_mem_limit_in_mb);
+      if (!status.ok()) {
+        LOG(ERROR) << "GetCPUAllocator: " << status.error_message();
+      }
+      int64 cpu_mem_limit = cpu_mem_limit_in_mb * (1LL << 20);
+      allocator = new BFCAllocator(new BasicCPUAllocator(), cpu_mem_limit,
+                                   true /*allow_growth*/,
+                                   "bfc_cpu_allocator_for_gpu" /*name*/);
+      VLOG(2) << "Using BFCAllocator with memory limit of "
+              << cpu_mem_limit_in_mb << " MB for ProcessState CPU allocator";
+    } else {
+      allocator = new PoolAllocator(
+          100 /*pool_size_limit*/, true /*auto_resize*/,
+          new BasicCPUAllocator(), new NoopRounder, "cpu_pool");
+      VLOG(2) << "Using PoolAllocator for ProcessState CPU allocator";
+    }
     if (LogMemory::IsEnabled()) {
       // Wrap the allocator to track allocation ids for better logging
       // at the cost of performance.
-- 
GitLab


From 80d5ca130fb7155c18db840cbccb104fceaa7fc3 Mon Sep 17 00:00:00 2001
From: Sergio Guadarrama <sguada@google.com>
Date: Fri, 12 May 2017 14:47:54 -0700
Subject: [PATCH 1316/1563] Only log if log_every_n_steps > 0.

PiperOrigin-RevId: 155913994
---
 tensorflow/contrib/slim/python/slim/learning.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/learning.py b/tensorflow/contrib/slim/python/slim/learning.py
index b70d612f55..43a1193d13 100644
--- a/tensorflow/contrib/slim/python/slim/learning.py
+++ b/tensorflow/contrib/slim/python/slim/learning.py
@@ -696,8 +696,9 @@ def train(train_op,
         else:
           should_stop_op = constant_op.constant(False)
         train_step_kwargs['should_stop'] = should_stop_op
-        train_step_kwargs['should_log'] = math_ops.equal(
-            math_ops.mod(global_step, log_every_n_steps), 0)
+        if log_every_n_steps > 0:
+          train_step_kwargs['should_log'] = math_ops.equal(
+              math_ops.mod(global_step, log_every_n_steps), 0)
         if is_chief and trace_every_n_steps is not None:
           train_step_kwargs['should_trace'] = math_ops.equal(
               math_ops.mod(global_step, trace_every_n_steps), 0)
-- 
GitLab


From be9af9685c86ffc87a6877560afdf8a4eccd4246 Mon Sep 17 00:00:00 2001
From: Petros Mol <pmol@google.com>
Date: Fri, 12 May 2017 14:54:23 -0700
Subject: [PATCH 1317/1563] Replace jpg image with png image.

PiperOrigin-RevId: 155914806
---
 .../kernel_methods/g3doc/kernel_mapping.jpg     | Bin 7330 -> 0 bytes
 .../kernel_methods/g3doc/kernel_mapping.png     | Bin 0 -> 28251 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.jpg
 create mode 100644 tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.png

diff --git a/tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.jpg b/tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.jpg
deleted file mode 100644
index fd69fac76ee4cd85b18f594c8026a3398552071d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7330
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

diff --git a/tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.png b/tensorflow/contrib/kernel_methods/g3doc/kernel_mapping.png
new file mode 100644
index 0000000000000000000000000000000000000000..e63303dab45d671acbeb839b22726ac0877dffae
GIT binary patch
literal 28251
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

literal 0
HcmV?d00001

-- 
GitLab


From 49a259db1517834be954e037497564ea70ce56a1 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Fri, 12 May 2017 15:39:26 -0700
Subject: [PATCH 1318/1563] [tf contrib seq2seq] Updates to AttentionMechanism
 API

* Move the probability_fn into the AttentionMechanism and out of AttentionWrapper.
* Propagate the previous alignment through the attention state and pass it to the AttentionMechanism.
* Simplify the unit tests.

Necessary for colin's monotonic attention.

PiperOrigin-RevId: 155920141
---
 .../kernel_tests/attention_wrapper_test.py    | 742 +++---------------
 .../seq2seq/python/ops/attention_wrapper.py   | 111 ++-
 2 files changed, 191 insertions(+), 662 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
index 40b50338ad..b8b420e10a 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/attention_wrapper_test.py
@@ -19,7 +19,7 @@ from __future__ import division
 from __future__ import print_function
 # pylint: enable=unused-import
 
-import sys
+import collections
 import functools
 
 import numpy as np
@@ -46,15 +46,27 @@ BasicDecoderOutput = basic_decoder.BasicDecoderOutput  # pylint: disable=invalid
 float32 = np.float32
 int32 = np.int32
 array = np.array
+dtype = np.dtype
+
+
+class ResultSummary(
+    collections.namedtuple('ResultSummary', ('shape', 'dtype', 'mean'))):
+  pass
+
+
+def get_result_summary(x):
+  if isinstance(x, np.ndarray):
+    return ResultSummary(x.shape, x.dtype, x.mean())
+  return x
 
 
 class AttentionWrapperTest(test.TestCase):
 
-  def assertAllClose(self, *args, **kwargs):
-    kwargs["atol"] = 1e-4  # For GPU tests
-    kwargs["rtol"] = 1e-4  # For GPU tests
-    return super(AttentionWrapperTest, self).assertAllClose(
-        *args, **kwargs)
+  def assertAllCloseOrEqual(self, x, y, **kwargs):
+    if isinstance(x, np.ndarray) or isinstance(x, float):
+      return super(AttentionWrapperTest, self).assertAllClose(x, y, **kwargs)
+    else:
+      self.assertAllEqual(x, y, **kwargs)
 
   def testAttentionWrapperState(self):
     num_fields = len(wrapper.AttentionWrapperState._fields)  # pylint: disable=protected-access
@@ -71,7 +83,7 @@ class AttentionWrapperTest(test.TestCase):
                          alignment_history=False,
                          expected_final_alignment_history=None,
                          attention_layer_size=6,
-                         name=""):
+                         name=''):
     encoder_sequence_length = [3, 2, 3, 1, 0]
     decoder_sequence_length = [2, 0, 1, 2, 3]
     batch_size = 5
@@ -98,7 +110,7 @@ class AttentionWrapperTest(test.TestCase):
 
     with self.test_session(use_gpu=True) as sess:
       with vs.variable_scope(
-          "root",
+          'root',
           initializer=init_ops.random_normal_initializer(stddev=0.01, seed=3)):
         cell = core_rnn_cell.LSTMCell(cell_depth)
         cell = wrapper.AttentionWrapper(
@@ -147,192 +159,53 @@ class AttentionWrapperTest(test.TestCase):
 
       sess.run(variables.global_variables_initializer())
       sess_results = sess.run({
-          "final_outputs": final_outputs,
-          "final_state": final_state,
-          "state_alignment_history": state_alignment_history,
+          'final_outputs': final_outputs,
+          'final_state': final_state,
+          'state_alignment_history': state_alignment_history,
       })
 
-      print("Copy/paste (%s)\nexpected_final_output = " % name,
-            sess_results["final_outputs"])
-      sys.stdout.flush()
-      print("Copy/paste (%s)\nexpected_final_state = " % name,
-            sess_results["final_state"])
-      sys.stdout.flush()
-      print("Copy/paste (%s)\nexpected_final_alignment_history = " % name,
-            np.asarray(sess_results["state_alignment_history"]))
-      sys.stdout.flush()
-      nest.map_structure(self.assertAllClose, expected_final_output,
-                         sess_results["final_outputs"])
-      nest.map_structure(self.assertAllClose, expected_final_state,
-                         sess_results["final_state"])
+      final_output_info = nest.map_structure(get_result_summary,
+                                             sess_results['final_outputs'])
+      final_state_info = nest.map_structure(get_result_summary,
+                                            sess_results['final_state'])
+      print('Copy/paste:\nexpected_final_output = %s' % str(final_output_info))
+      print('expected_final_state = %s' % str(final_state_info))
+      nest.map_structure(self.assertAllCloseOrEqual, expected_final_output,
+                         final_output_info)
+      nest.map_structure(self.assertAllCloseOrEqual, expected_final_state,
+                         final_state_info)
       if alignment_history:  # by default, the wrapper emits attention as output
-        self.assertAllClose(
+        final_alignment_history_info = nest.map_structure(
+            get_result_summary, sess_results['state_alignment_history'])
+        print('expected_final_alignment_history = %s' %
+              str(final_alignment_history_info))
+        nest.map_structure(
+            self.assertAllCloseOrEqual,
             # outputs are batch major but the stacked TensorArray is time major
-            sess_results["state_alignment_history"],
-            expected_final_alignment_history)
+            expected_final_alignment_history,
+            final_alignment_history_info)
 
   def testBahdanauNotNormalized(self):
     create_attention_mechanism = wrapper.BahdanauAttention
 
     expected_final_output = BasicDecoderOutput(
-        rnn_output=array(
-            [[[
-                2.04633363e-03, 1.89259532e-03, 2.09550979e-03, -3.81628517e-03,
-                -4.36160620e-03, -6.43933658e-03
-            ], [
-                2.41885195e-03, 2.02089013e-03, 2.05879519e-03, -3.85483308e-03,
-                -3.51473060e-03, -6.14458136e-03
-            ], [
-                2.02294230e-03, 2.06955452e-03, 2.34797411e-03, -3.62816593e-03,
-                -3.80352931e-03, -6.27150526e-03
-            ]], [[
-                4.89025004e-03, -1.97221269e-03, 3.34283570e-03,
-                -2.79326970e-03, 3.63148772e-03, -4.79645561e-03
-            ], [
-                5.13446378e-03, -2.03941623e-03, 3.51774949e-03,
-                -2.83448119e-03, 3.14159272e-03, -5.31486655e-03
-            ], [
-                5.20701287e-03, -2.21262546e-03, 3.58187454e-03,
-                -2.85831164e-03, 3.20822699e-03, -5.20829484e-03
-            ]], [[
-                -1.34046993e-03, -9.99792013e-04, -2.11631414e-03,
-                -1.85202830e-03, -5.26227616e-03, -9.08544939e-03
-            ], [
-                -1.35486713e-03, -1.04408595e-03, -1.96779310e-03,
-                -1.80004584e-03, -5.61304903e-03, -9.34211537e-03
-            ], [
-                -1.12452905e-03, -7.68281636e-04, -1.99770415e-03,
-                -1.88058324e-03, -5.01882844e-03, -9.32228006e-03
-            ]], [[
-                1.52967637e-03, -3.97213362e-03, -9.64699371e-04,
-                8.51419638e-04, -1.29806029e-03, 6.56482670e-03
-            ], [
-                1.22562144e-03, -4.56351135e-03, -1.08190742e-03,
-                8.27267300e-04, -2.10060296e-03, 6.43097097e-03
-            ], [
-                9.93521884e-04, -4.37386986e-03, -1.41534151e-03,
-                6.44790183e-04, -2.16482091e-03, 6.68301852e-03
-            ]], [[
-                -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
-                -1.56512906e-04, 9.63474595e-05
-            ], [
-                -1.04306288e-04, -1.37411975e-04, 2.82689070e-05,
-                6.56487318e-05, -1.48634164e-04, -1.84347919e-05
-            ], [
-                1.24452345e-04, 2.20821079e-04, 4.07114130e-04, 2.18028668e-04,
-                2.73401442e-04, -2.69805576e-04
-            ]]],
-            dtype=float32),
-        sample_id=array(
-            [[2, 0, 2], [0, 0, 0], [1, 1, 1], [5, 5, 5], [3, 3, 2]],
-            dtype=int32))
-
+        rnn_output=ResultSummary(
+            shape=(5, 3, 6), dtype=dtype('float32'), mean=-0.00083043973),
+        sample_id=ResultSummary(shape=(5, 3), dtype=dtype('int32'), mean=2.0))
     expected_final_state = AttentionWrapperState(
         cell_state=LSTMStateTuple(
-            c=array(
-                [[
-                    -2.18977481e-02, -8.04181397e-03, -1.48273818e-03,
-                    1.61075518e-02, -1.37986457e-02, -7.57964421e-03,
-                    -8.28644261e-03, -1.18742418e-02, 1.78838037e-02
-                ], [
-                    1.74201727e-02, -1.41931782e-02, -3.88098788e-03,
-                    3.19711640e-02, -3.54694054e-02, -2.14694049e-02,
-                    -6.21706853e-03, -1.69323490e-03, -1.94494929e-02
-                ], [
-                    -1.14532551e-02, 8.77828151e-03, -1.62972715e-02,
-                    -1.39963031e-02, 1.34832524e-02, -1.04488730e-02,
-                    6.16201758e-03, -9.41041857e-03, -6.57599326e-03
-                ], [
-                    -4.74753827e-02, -1.19123599e-02, -7.40140676e-05,
-                    4.10552323e-02, -1.36711076e-03, 2.11795494e-02,
-                    -2.80460101e-02, -5.44509329e-02, -2.91906092e-02
-                ], [
-                    2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
-                    5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
-                    -5.05525898e-03, 2.19191350e-02, 1.62497871e-02
-                ]],
-                dtype=float32),
-            h=array(
-                [[
-                    -1.09847616e-02, -3.97357112e-03, -7.54502777e-04,
-                    7.91223347e-03, -7.02199014e-03, -3.80705344e-03,
-                    -4.22102772e-03, -6.05491130e-03, 8.92073940e-03
-                ], [
-                    8.68115202e-03, -7.16950046e-03, -1.88387593e-03,
-                    1.62680726e-02, -1.76830068e-02, -1.06620435e-02,
-                    -3.07523785e-03, -8.46023730e-04, -9.99386702e-03
-                ], [
-                    -5.71225956e-03, 4.50055022e-03, -8.07653368e-03,
-                    -6.94842264e-03, 6.75687613e-03, -5.12083014e-03,
-                    3.06244940e-03, -4.61752573e-03, -3.23935854e-03
-                ], [
-                    -2.37231534e-02, -5.88526297e-03, -3.72226204e-05,
-                    2.01789513e-02, -6.75848918e-04, 1.06686372e-02,
-                    -1.42624676e-02, -2.69628745e-02, -1.45034352e-02
-                ], [
-                    1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
-                    2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
-                    -2.54477374e-03, 1.11598391e-02, 7.94144534e-03
-                ]],
-                dtype=float32)),
-        attention=array(
-            [[
-                0.00202294, 0.00206955, 0.00234797, -0.00362817, -0.00380353,
-                -0.00627151
-            ], [
-                0.00520701, -0.00221263, 0.00358187, -0.00285831, 0.00320823,
-                -0.00520829
-            ], [
-                -0.00112453, -0.00076828, -0.0019977, -0.00188058, -0.00501883,
-                -0.00932228
-            ], [
-                0.00099352, -0.00437387, -0.00141534, 0.00064479, -0.00216482,
-                0.00668302
-            ], [
-                0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
-                -0.00026981
-            ]],
-            dtype=float32),
+            c=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0039763632),
+            h=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0019849765)),
+        attention=ResultSummary(
+            shape=(5, 6), dtype=dtype('float32'), mean=-0.00081052497),
         time=3,
+        alignments=ResultSummary(
+            shape=(5, 8), dtype=dtype('float32'), mean=0.125),
         alignment_history=())
-
-    expected_final_alignment_history = [[[
-        0.12586178, 0.12272788, 0.1271652, 0.12484902, 0.12484902, 0.12484902,
-        0.12484902, 0.12484902
-    ], [
-        0.12612638, 0.12516938, 0.12478404, 0.12478404, 0.12478404, 0.12478404,
-        0.12478404, 0.12478404
-    ], [
-        0.12595113, 0.12515794, 0.1255464, 0.1246689, 0.1246689, 0.1246689,
-        0.1246689, 0.1246689
-    ], [
-        0.12492912, 0.12501013, 0.12501013, 0.12501013, 0.12501013, 0.12501013,
-        0.12501013, 0.12501013
-    ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
-        0.12586173, 0.12272781, 0.12716517, 0.12484905, 0.12484905, 0.12484905,
-        0.12484905, 0.12484905
-    ], [
-        0.12612617, 0.1251694, 0.12478408, 0.12478408, 0.12478408, 0.12478408,
-        0.12478408, 0.12478408
-    ], [
-        0.12595108, 0.12515777, 0.1255464, 0.12466895, 0.12466895, 0.12466895,
-        0.12466895, 0.12466895
-    ], [
-        0.12492914, 0.12501012, 0.12501012, 0.12501012, 0.12501012, 0.12501012,
-        0.12501012, 0.12501012
-    ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]], [[
-        0.12586181, 0.12272815, 0.12716556, 0.12484891, 0.12484891, 0.12484891,
-        0.12484891, 0.12484891
-    ], [
-        0.12612608, 0.12516941, 0.12478409, 0.12478409, 0.12478409, 0.12478409,
-        0.12478409, 0.12478409
-    ], [
-        0.12595116, 0.12515792, 0.12554643, 0.1246689, 0.1246689, 0.1246689,
-        0.1246689, 0.1246689
-    ], [
-        0.1249292, 0.12501012, 0.12501012, 0.12501012, 0.12501012, 0.12501012,
-        0.12501012, 0.12501012
-    ], [0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125, 0.125]]]
+    expected_final_alignment_history = ResultSummary(
+        shape=(3, 5, 8), dtype=dtype('float32'), mean=0.12500001)
 
     self._testWithAttention(
         create_attention_mechanism,
@@ -340,263 +213,54 @@ class AttentionWrapperTest(test.TestCase):
         expected_final_state,
         alignment_history=True,
         expected_final_alignment_history=expected_final_alignment_history,
-        name="testBahdanauNotNormalized")
+        name='testBahdanauNotNormalized')
 
   def testBahdanauNormalized(self):
     create_attention_mechanism = functools.partial(
         wrapper.BahdanauAttention, normalize=True)
 
     expected_final_output = BasicDecoderOutput(
-        rnn_output=array(
-            [[[
-                1.27064800e-02, 3.57783446e-03, 8.22613202e-03, -1.61504047e-03,
-                -1.12555185e-02, -3.92740499e-03
-            ], [
-                1.30781950e-02, 3.70747922e-03, 8.18992872e-03, -1.65389013e-03,
-                -1.04098395e-02, -3.63383139e-03
-            ], [
-                1.26833543e-02, 3.75790196e-03, 8.48123431e-03, -1.42690970e-03,
-                -1.07016256e-02, -3.76088684e-03
-            ]], [[
-                6.88417302e-03, -2.04071682e-03, 4.17768257e-03,
-                -4.51408979e-03, 4.90086433e-03, -6.85973791e-03
-            ], [
-                7.12782983e-03, -2.10783770e-03, 4.35227761e-03,
-                -4.55496181e-03, 4.41066315e-03, -7.37757795e-03
-            ], [
-                7.20011396e-03, -2.28102156e-03, 4.41620918e-03,
-                -4.57867794e-03, 4.47713351e-03, -7.27072079e-03
-            ]], [[
-                -2.20676698e-03, -1.43745833e-03, -1.99429039e-03,
-                -1.44722988e-03, -7.45461835e-03, -9.80243273e-03
-            ], [
-                -2.22120387e-03, -1.48139545e-03, -1.84528576e-03,
-                -1.39490096e-03, -7.80559657e-03, -1.00586927e-02
-            ], [
-                -1.99079141e-03, -1.20571791e-03, -1.87507609e-03,
-                -1.47541985e-03, -7.21158786e-03, -1.00391749e-02
-            ]], [[
-                1.48755650e-03, -3.89118027e-03, -9.40889120e-04,
-                8.36852356e-04, -1.28285377e-03, 6.41521579e-03
-            ], [
-                1.18351437e-03, -4.48258361e-03, -1.05809816e-03,
-                8.12723883e-04, -2.08540238e-03, 6.28142804e-03
-            ], [
-                9.51444614e-04, -4.29300033e-03, -1.39154412e-03,
-                6.30271854e-04, -2.14963360e-03, 6.53359853e-03
-            ]], [[
-                -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
-                -1.56512906e-04, 9.63474595e-05
-            ], [
-                -1.04306288e-04, -1.37411975e-04, 2.82689070e-05,
-                6.56487318e-05, -1.48634164e-04, -1.84347919e-05
-            ], [
-                1.24452345e-04, 2.20821079e-04, 4.07114130e-04, 2.18028668e-04,
-                2.73401442e-04, -2.69805576e-04
-            ]]],
-            dtype=float32),
-        sample_id=array(
-            [[0, 0, 0], [0, 0, 0], [1, 3, 1], [5, 5, 5], [3, 3, 2]],
-            dtype=int32))
-
+        rnn_output=ResultSummary(
+            shape=(5, 3, 6), dtype=dtype('float32'), mean=-0.00040482997),
+        sample_id=ResultSummary(
+            shape=(5, 3), dtype=dtype('int32'), mean=1.8666666666666667))
     expected_final_state = AttentionWrapperState(
         cell_state=LSTMStateTuple(
-            c=array(
-                [[
-                    -2.19953191e-02, -7.81358499e-03, -1.42740645e-03,
-                    1.62037201e-02, -1.38600282e-02, -7.60386931e-03,
-                    -8.42390209e-03, -1.18884994e-02, 1.78821683e-02
-                ], [
-                    1.74096227e-02, -1.41773149e-02, -3.89175024e-03,
-                    3.19635086e-02, -3.54669318e-02, -2.14924756e-02,
-                    -6.20695669e-03, -1.73213519e-03, -1.94583312e-02
-                ], [
-                    -1.14590004e-02, 8.76899902e-03, -1.62825100e-02,
-                    -1.39863417e-02, 1.34333782e-02, -1.04652103e-02,
-                    6.13503950e-03, -9.39247012e-03, -6.57595927e-03
-                ], [
-                    -4.74739373e-02, -1.19136302e-02, -7.36713409e-05,
-                    4.10547927e-02, -1.36768632e-03, 2.11772211e-02,
-                    -2.80480143e-02, -5.44514954e-02, -2.91903671e-02
-                ], [
-                    2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
-                    5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
-                    -5.05525898e-03, 2.19191350e-02, 1.62497871e-02
-                ]],
-                dtype=float32),
-            h=array(
-                [[
-                    -1.10325804e-02, -3.86056723e-03, -7.26287195e-04,
-                    7.95945339e-03, -7.05253659e-03, -3.81913339e-03,
-                    -4.29130904e-03, -6.06246945e-03, 8.91948957e-03
-                ], [
-                    8.67583323e-03, -7.16136536e-03, -1.88911252e-03,
-                    1.62639488e-02, -1.76817775e-02, -1.06735229e-02,
-                    -3.07015004e-03, -8.65494134e-04, -9.99815390e-03
-                ], [
-                    -5.71519835e-03, 4.49585915e-03, -8.06909613e-03,
-                    -6.94347266e-03, 6.73189852e-03, -5.12895826e-03,
-                    3.04909074e-03, -4.60868096e-03, -3.23936995e-03
-                ], [
-                    -2.37224363e-02, -5.88588836e-03, -3.70502457e-05,
-                    2.01787297e-02, -6.76134136e-04, 1.06674768e-02,
-                    -1.42634623e-02, -2.69631669e-02, -1.45033086e-02
-                ], [
-                    1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
-                    2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
-                    -2.54477374e-03, 1.11598391e-02, 7.94144534e-03
-                ]],
-                dtype=float32)),
-        attention=array(
-            [[
-                0.01268335, 0.0037579, 0.00848123, -0.00142691, -0.01070163,
-                -0.00376089
-            ], [
-                0.00720011, -0.00228102, 0.00441621, -0.00457868, 0.00447713,
-                -0.00727072
-            ], [
-                -0.00199079, -0.00120572, -0.00187508, -0.00147542, -0.00721159,
-                -0.01003917
-            ], [
-                0.00095144, -0.004293, -0.00139154, 0.00063027, -0.00214963,
-                0.0065336
-            ], [
-                0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
-                -0.00026981
-            ]],
-            dtype=float32),
+            c=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0039785588),
+            h=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0019861322)),
+        attention=ResultSummary(
+            shape=(5, 6), dtype=dtype('float32'), mean=-0.00038488387),
         time=3,
+        alignments=ResultSummary(
+            shape=(5, 8), dtype=dtype('float32'), mean=0.125),
         alignment_history=())
 
     self._testWithAttention(
         create_attention_mechanism,
         expected_final_output,
         expected_final_state,
-        name="testBahdanauNormalized")
+        name='testBahdanauNormalized')
 
   def testLuongNotNormalized(self):
     create_attention_mechanism = wrapper.LuongAttention
 
     expected_final_output = BasicDecoderOutput(
-        rnn_output=array(
-            [[[
-                1.74922391e-03, 1.85935036e-03, 1.90880906e-03, -3.96941090e-03,
-                -4.17229906e-03, -6.65769773e-03
-            ], [
-                1.99638237e-03, 1.91135216e-03, 1.73234346e-03, -4.00905171e-03,
-                -3.15058464e-03, -6.34974428e-03
-            ], [
-                2.08854163e-03, 2.13832827e-03, 2.49780947e-03, -3.52849509e-03,
-                -3.96897132e-03, -6.12034509e-03
-            ]], [[
-                4.76492243e-03, -1.97180966e-03, 3.29327444e-03,
-                -2.68205139e-03, 3.55229783e-03, -4.66645230e-03
-            ], [
-                5.24956919e-03, -2.00631656e-03, 3.53828911e-03,
-                -2.96283513e-03, 3.20920302e-03, -5.43697737e-03
-            ], [
-                5.30424621e-03, -2.17913301e-03, 3.59509978e-03,
-                -2.97106663e-03, 3.26450402e-03, -5.31189423e-03
-            ]], [[
-                -1.36440888e-03, -9.75572329e-04, -2.11284542e-03,
-                -1.84616144e-03, -5.31351101e-03, -9.12462734e-03
-            ], [
-                -1.41863467e-03, -1.11081311e-03, -1.94056751e-03,
-                -1.74311269e-03, -5.76282106e-03, -9.29267984e-03
-            ], [
-                -1.12129003e-03, -8.15156149e-04, -2.01535341e-03,
-                -1.89556007e-03, -5.04226238e-03, -9.37188603e-03
-            ]], [[
-                1.55163277e-03, -4.01433324e-03, -9.77111282e-04,
-                8.59013060e-04, -1.30598655e-03, 6.64281659e-03
-            ], [
-                1.26811734e-03, -4.64518648e-03, -1.10593368e-03,
-                8.41954607e-04, -2.11594440e-03, 6.58190623e-03
-            ], [
-                1.02682540e-03, -4.43787826e-03, -1.43417739e-03,
-                6.56281307e-04, -2.17684195e-03, 6.80128345e-03
-            ]], [[
-                -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
-                -1.56512906e-04, 9.63474595e-05
-            ], [
-                -1.04306288e-04, -1.37411975e-04, 2.82689070e-05,
-                6.56487318e-05, -1.48634164e-04, -1.84347919e-05
-            ], [
-                1.24452345e-04, 2.20821079e-04, 4.07114130e-04, 2.18028668e-04,
-                2.73401442e-04, -2.69805576e-04
-            ]]],
-            dtype=float32),
-        sample_id=array(
-            [[2, 0, 2], [0, 0, 0], [1, 1, 1], [5, 5, 5], [3, 3, 2]],
-            dtype=int32))
-
+        rnn_output=ResultSummary(
+            shape=(5, 3, 6), dtype=dtype('float32'), mean=-0.00084602338),
+        sample_id=ResultSummary(shape=(5, 3), dtype=dtype('int32'), mean=2.0))
     expected_final_state = AttentionWrapperState(
         cell_state=LSTMStateTuple(
-            c=array(
-                [[
-                    -2.18942575e-02, -8.05099495e-03, -1.48526859e-03,
-                    1.61030665e-02, -1.37967104e-02, -7.57982396e-03,
-                    -8.28088820e-03, -1.18743815e-02, 1.78839806e-02
-                ], [
-                    1.74203254e-02, -1.41929490e-02, -3.88103351e-03,
-                    3.19709182e-02, -3.54691371e-02, -2.14697979e-02,
-                    -6.21709181e-03, -1.69324467e-03, -1.94495786e-02
-                ], [
-                    -1.14536462e-02, 8.77809525e-03, -1.62965059e-02,
-                    -1.39955431e-02, 1.34810507e-02, -1.04491040e-02,
-                    6.16097450e-03, -9.40943789e-03, -6.57613343e-03
-                ], [
-                    -4.74765450e-02, -1.19113335e-02, -7.42897391e-05,
-                    4.10555862e-02, -1.36665069e-03, 2.11814232e-02,
-                    -2.80444007e-02, -5.44504896e-02, -2.91908123e-02
-                ], [
-                    2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
-                    5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
-                    -5.05525898e-03, 2.19191350e-02, 1.62497871e-02
-                ]],
-                dtype=float32),
-            h=array(
-                [[
-                    -1.09830676e-02, -3.97811923e-03, -7.55793473e-04,
-                    7.91002903e-03, -7.02103321e-03, -3.80714820e-03,
-                    -4.21818346e-03, -6.05497835e-03, 8.92084371e-03
-                ], [
-                    8.68122280e-03, -7.16937613e-03, -1.88389909e-03,
-                    1.62679367e-02, -1.76828820e-02, -1.06622437e-02,
-                    -3.07524228e-03, -8.46030540e-04, -9.99389403e-03
-                ], [
-                    -5.71245840e-03, 4.50045895e-03, -8.07614625e-03,
-                    -6.94804778e-03, 6.75577158e-03, -5.12094703e-03,
-                    3.06193763e-03, -4.61703911e-03, -3.23943049e-03
-                ], [
-                    -2.37237271e-02, -5.88475820e-03, -3.73612711e-05,
-                    2.01791357e-02, -6.75620860e-04, 1.06695695e-02,
-                    -1.42616741e-02, -2.69626491e-02, -1.45035451e-02
-                ], [
-                    1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
-                    2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
-                    -2.54477374e-03, 1.11598391e-02, 7.94144534e-03
-                ]],
-                dtype=float32)),
-        attention=array(
-            [[
-                0.00208854, 0.00213833, 0.00249781, -0.0035285, -0.00396897,
-                -0.00612035
-            ], [
-                0.00530425, -0.00217913, 0.0035951, -0.00297107, 0.0032645,
-                -0.00531189
-            ], [
-                -0.00112129, -0.00081516, -0.00201535, -0.00189556, -0.00504226,
-                -0.00937189
-            ], [
-                0.00102683, -0.00443788, -0.00143418, 0.00065628, -0.00217684,
-                0.00680128
-            ], [
-                0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
-                -0.00026981
-            ]],
-            dtype=float32),
+            c=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0039764317),
+            h=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0019850098)),
+        attention=ResultSummary(
+            shape=(5, 6), dtype=dtype('float32'), mean=-0.00080144603),
         time=3,
+        alignments=ResultSummary(
+            shape=(5, 8), dtype=dtype('float32'), mean=0.125),
         alignment_history=())
 
     self._testWithAttention(
@@ -604,132 +268,27 @@ class AttentionWrapperTest(test.TestCase):
         expected_final_output,
         expected_final_state,
         attention_mechanism_depth=9,
-        name="testLuongNotNormalized")
+        name='testLuongNotNormalized')
 
   def testLuongScaled(self):
     create_attention_mechanism = functools.partial(
         wrapper.LuongAttention, scale=True)
 
     expected_final_output = BasicDecoderOutput(
-        rnn_output=array(
-            [[[
-                1.74922391e-03, 1.85935036e-03, 1.90880906e-03, -3.96941090e-03,
-                -4.17229906e-03, -6.65769773e-03
-            ], [
-                1.99638237e-03, 1.91135216e-03, 1.73234346e-03, -4.00905171e-03,
-                -3.15058464e-03, -6.34974428e-03
-            ], [
-                2.08854163e-03, 2.13832827e-03, 2.49780947e-03, -3.52849509e-03,
-                -3.96897132e-03, -6.12034509e-03
-            ]], [[
-                4.76492243e-03, -1.97180966e-03, 3.29327444e-03,
-                -2.68205139e-03, 3.55229783e-03, -4.66645230e-03
-            ], [
-                5.24956919e-03, -2.00631656e-03, 3.53828911e-03,
-                -2.96283513e-03, 3.20920302e-03, -5.43697737e-03
-            ], [
-                5.30424621e-03, -2.17913301e-03, 3.59509978e-03,
-                -2.97106663e-03, 3.26450402e-03, -5.31189423e-03
-            ]], [[
-                -1.36440888e-03, -9.75572329e-04, -2.11284542e-03,
-                -1.84616144e-03, -5.31351101e-03, -9.12462734e-03
-            ], [
-                -1.41863467e-03, -1.11081311e-03, -1.94056751e-03,
-                -1.74311269e-03, -5.76282106e-03, -9.29267984e-03
-            ], [
-                -1.12129003e-03, -8.15156149e-04, -2.01535341e-03,
-                -1.89556007e-03, -5.04226238e-03, -9.37188603e-03
-            ]], [[
-                1.55163277e-03, -4.01433324e-03, -9.77111282e-04,
-                8.59013060e-04, -1.30598655e-03, 6.64281659e-03
-            ], [
-                1.26811734e-03, -4.64518648e-03, -1.10593368e-03,
-                8.41954607e-04, -2.11594440e-03, 6.58190623e-03
-            ], [
-                1.02682540e-03, -4.43787826e-03, -1.43417739e-03,
-                6.56281307e-04, -2.17684195e-03, 6.80128345e-03
-            ]], [[
-                -3.78854020e-04, 5.62231544e-05, 1.06837302e-04, 1.87137164e-04,
-                -1.56512906e-04, 9.63474595e-05
-            ], [
-                -1.04306288e-04, -1.37411975e-04, 2.82689070e-05,
-                6.56487318e-05, -1.48634164e-04, -1.84347919e-05
-            ], [
-                1.24452345e-04, 2.20821079e-04, 4.07114130e-04, 2.18028668e-04,
-                2.73401442e-04, -2.69805576e-04
-            ]]],
-            dtype=float32),
-        sample_id=array(
-            [[2, 0, 2], [0, 0, 0], [1, 1, 1], [5, 5, 5], [3, 3, 2]],
-            dtype=int32))
-
+        rnn_output=ResultSummary(
+            shape=(5, 3, 6), dtype=dtype('float32'), mean=-0.00084602338),
+        sample_id=ResultSummary(shape=(5, 3), dtype=dtype('int32'), mean=2.0))
     expected_final_state = AttentionWrapperState(
         cell_state=LSTMStateTuple(
-            c=array(
-                [[
-                    -2.18942575e-02, -8.05099495e-03, -1.48526859e-03,
-                    1.61030665e-02, -1.37967104e-02, -7.57982396e-03,
-                    -8.28088820e-03, -1.18743815e-02, 1.78839806e-02
-                ], [
-                    1.74203254e-02, -1.41929490e-02, -3.88103351e-03,
-                    3.19709182e-02, -3.54691371e-02, -2.14697979e-02,
-                    -6.21709181e-03, -1.69324467e-03, -1.94495786e-02
-                ], [
-                    -1.14536462e-02, 8.77809525e-03, -1.62965059e-02,
-                    -1.39955431e-02, 1.34810507e-02, -1.04491040e-02,
-                    6.16097450e-03, -9.40943789e-03, -6.57613343e-03
-                ], [
-                    -4.74765450e-02, -1.19113335e-02, -7.42897391e-05,
-                    4.10555862e-02, -1.36665069e-03, 2.11814232e-02,
-                    -2.80444007e-02, -5.44504896e-02, -2.91908123e-02
-                ], [
-                    2.25644894e-02, -1.40382675e-03, 1.92396250e-02,
-                    5.49034867e-03, -1.27930511e-02, -3.15603940e-03,
-                    -5.05525898e-03, 2.19191350e-02, 1.62497871e-02
-                ]],
-                dtype=float32),
-            h=array(
-                [[
-                    -1.09830676e-02, -3.97811923e-03, -7.55793473e-04,
-                    7.91002903e-03, -7.02103321e-03, -3.80714820e-03,
-                    -4.21818346e-03, -6.05497835e-03, 8.92084371e-03
-                ], [
-                    8.68122280e-03, -7.16937613e-03, -1.88389909e-03,
-                    1.62679367e-02, -1.76828820e-02, -1.06622437e-02,
-                    -3.07524228e-03, -8.46030540e-04, -9.99389403e-03
-                ], [
-                    -5.71245840e-03, 4.50045895e-03, -8.07614625e-03,
-                    -6.94804778e-03, 6.75577158e-03, -5.12094703e-03,
-                    3.06193763e-03, -4.61703911e-03, -3.23943049e-03
-                ], [
-                    -2.37237271e-02, -5.88475820e-03, -3.73612711e-05,
-                    2.01791357e-02, -6.75620860e-04, 1.06695695e-02,
-                    -1.42616741e-02, -2.69626491e-02, -1.45035451e-02
-                ], [
-                    1.12585640e-02, -6.92534202e-04, 9.88917705e-03,
-                    2.75237625e-03, -6.56115822e-03, -1.57997780e-03,
-                    -2.54477374e-03, 1.11598391e-02, 7.94144534e-03
-                ]],
-                dtype=float32)),
-        attention=array(
-            [[
-                0.00208854, 0.00213833, 0.00249781, -0.0035285, -0.00396897,
-                -0.00612035
-            ], [
-                0.00530425, -0.00217913, 0.0035951, -0.00297107, 0.0032645,
-                -0.00531189
-            ], [
-                -0.00112129, -0.00081516, -0.00201535, -0.00189556, -0.00504226,
-                -0.00937189
-            ], [
-                0.00102683, -0.00443788, -0.00143418, 0.00065628, -0.00217684,
-                0.00680128
-            ], [
-                0.00012445, 0.00022082, 0.00040711, 0.00021803, 0.0002734,
-                -0.00026981
-            ]],
-            dtype=float32),
+            c=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0039764317),
+            h=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0019850098)),
+        attention=ResultSummary(
+            shape=(5, 6), dtype=dtype('float32'), mean=-0.00080144603),
         time=3,
+        alignments=ResultSummary(
+            shape=(5, 8), dtype=dtype('float32'), mean=0.125),
         alignment_history=())
 
     self._testWithAttention(
@@ -737,116 +296,27 @@ class AttentionWrapperTest(test.TestCase):
         expected_final_output,
         expected_final_state,
         attention_mechanism_depth=9,
-        name="testLuongScaled")
+        name='testLuongScaled')
 
   def testNotUseAttentionLayer(self):
     create_attention_mechanism = wrapper.BahdanauAttention
 
     expected_final_output = BasicDecoderOutput(
-        rnn_output=array(
-            [[[
-                -0.24223405, -0.07791166, 0.15451428, 0.24738294, 0.30900395,
-                -0.24685201, 0.04992372, 0.18749543, -0.15878429, -0.13678923
-            ], [
-                -0.2422339, -0.07791159, 0.15451418, 0.24738279, 0.30900383,
-                -0.24685188, 0.04992369, 0.18749531, -0.15878411, -0.13678911
-            ], [
-                -0.2422343, -0.07791215, 0.15451413, 0.24738336, 0.30900475,
-                -0.2468522, 0.04992349, 0.18749571, -0.158785, -0.13678965
-            ]], [[
-                0.40035266, 0.12299616, -0.06085059, -0.09197108, 0.11368551,
-                -0.15302914, 0.00566157, -0.26885766, 0.08546552, 0.18886778
-            ], [
-                0.40035242, 0.12299603, -0.06085056, -0.09197091, 0.11368536,
-                -0.15302882, 0.0056615, -0.26885763, 0.08546554, 0.18886763
-            ], [
-                0.40035242, 0.122996, -0.06085056, -0.09197087, 0.11368532,
-                -0.1530287, 0.00566146, -0.26885769, 0.08546556, 0.18886761
-            ]], [[
-                -0.4311333, 0.07519469, -0.01551808, 0.1913045, -0.02693807,
-                -0.21668895, -0.02155721, 0.0013397, 0.21180844, 0.25578707
-            ], [
-                -0.43113309, 0.07519454, -0.01551818, 0.19130446, -0.0269379,
-                -0.21668854, -0.021557, 0.00133975, 0.21180828, 0.25578681
-            ], [
-                -0.43113324, 0.07519463, -0.01551815, 0.1913045, -0.02693798,
-                -0.21668874, -0.02155712, 0.00133973, 0.21180835, 0.25578696
-            ]], [[
-                0.07059932, 0.16451572, 0.01174669, 0.04646531, 0.1427598,
-                0.0794456, -0.10852993, 0.15306188, 0.02151393, -0.05590061
-            ], [
-                0.07059933, 0.16451576, 0.01174669, 0.04646532, 0.14275983,
-                0.07944562, -0.10852996, 0.15306193, 0.02151394, -0.05590062
-            ], [
-                0.07059937, 0.16451585, 0.0117467, 0.04646534, 0.1427599,
-                0.07944567, -0.10853001, 0.153062, 0.02151395, -0.05590065
-            ]], [[0., 0., 0., 0., 0., 0., 0., 0., 0.,
-                  0.], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.],
-                 [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]]],
-            dtype=float32),
-        sample_id=array(
-            [[4, 4, 4], [0, 0, 0], [9, 9, 9], [1, 1, 1], [0, 0, 0]],
-            dtype=int32))
-
+        rnn_output=ResultSummary(
+            shape=(5, 3, 10), dtype=dtype('float32'), mean=0.019546926),
+        sample_id=ResultSummary(
+            shape=(5, 3), dtype=dtype('int32'), mean=2.7999999999999998))
     expected_final_state = AttentionWrapperState(
         cell_state=LSTMStateTuple(
-            c=array(
-                [[
-                    -0.0181195, -0.01675365, -0.00510353, 0.01559796,
-                    -0.01251448, -0.00437002, -0.01243257, -0.01720199,
-                    0.02274928
-                ], [
-                    0.01259979, -0.00839985, -0.00374037, 0.03136262,
-                    -0.03486227, -0.02466441, -0.00496157, -0.00461032,
-                    -0.02098336
-                ], [
-                    -0.00781067, 0.00315682, -0.0138283, -0.01149793,
-                    0.00485562, -0.01343193, 0.0085915, -0.00632846, -0.01052086
-                ], [
-                    -0.04184828, -0.01223641, 0.0009445, 0.03911434, 0.0043249,
-                    0.02220661, -0.03006243, -0.05418363, -0.02615385
-                ], [
-                    0.02282745, -0.00143833, 0.01918138, 0.00545033,
-                    -0.01258384, -0.00303765, -0.00511231, 0.02166323,
-                    0.01638841
-                ]],
-                dtype=float32),
-            h=array(
-                [[
-                    -0.00910065, -0.00827571, -0.00259689, 0.00764857,
-                    -0.00635579, -0.00218579, -0.00633918, -0.00875511,
-                    0.01134532
-                ], [
-                    0.00626597, -0.004241, -0.00181303, 0.01597157, -0.0173375,
-                    -0.01224921, -0.00244522, -0.00231299, -0.0107822
-                ], [
-                    -0.00391383, 0.00162017, -0.00682621, -0.00570264,
-                    0.00244099, -0.00659772, 0.00426475, -0.00309861,
-                    -0.00520028
-                ], [
-                    -0.02087484, -0.00603306, 0.00047561, 0.01920062,
-                    0.00213875, 0.01115329, -0.0152659, -0.02687523, -0.01297523
-                ], [
-                    0.01138975, -0.00070959, 0.00986007, 0.0027323, -0.00645386,
-                    -0.00152054, -0.00257339, 0.01103063, 0.00800891
-                ]],
-                dtype=float32)),
-        attention=array(
-            [[
-                -0.2422343, -0.07791215, 0.15451413, 0.24738336, 0.30900475,
-                -0.2468522, 0.04992349, 0.18749571, -0.158785, -0.13678965
-            ], [
-                0.40035242, 0.122996, -0.06085056, -0.09197087, 0.11368532,
-                -0.1530287, 0.00566146, -0.26885769, 0.08546556, 0.18886761
-            ], [
-                -0.43113324, 0.07519463, -0.01551815, 0.1913045, -0.02693798,
-                -0.21668874, -0.02155712, 0.00133973, 0.21180835, 0.25578696
-            ], [
-                0.07059937, 0.16451585, 0.0117467, 0.04646534, 0.1427599,
-                0.07944567, -0.10853001, 0.153062, 0.02151395, -0.05590065
-            ], [0., 0., 0., 0., 0., 0., 0., 0., 0., 0.]],
-            dtype=float32),
+            c=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.0041728448),
+            h=ResultSummary(
+                shape=(5, 9), dtype=dtype('float32'), mean=-0.002085865)),
+        attention=ResultSummary(
+            shape=(5, 10), dtype=dtype('float32'), mean=0.019546915),
         time=3,
+        alignments=ResultSummary(
+            shape=(5, 8), dtype=dtype('float32'), mean=0.125),
         alignment_history=())
 
     self._testWithAttention(
@@ -854,8 +324,8 @@ class AttentionWrapperTest(test.TestCase):
         expected_final_output,
         expected_final_state,
         attention_layer_size=None,
-        name="testNotUseAttentionLayer")
+        name='testNotUseAttentionLayer')
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 8d1c0c59e0..686a85e4e7 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -121,8 +121,13 @@ class _BaseAttentionMechanism(AttentionMechanism):
     2. Preprocessing and storing the memory.
   """
 
-  def __init__(self, query_layer, memory, memory_sequence_length=None,
-               memory_layer=None, check_inner_dims_defined=True,
+  def __init__(self,
+               query_layer,
+               memory,
+               probability_fn,
+               memory_sequence_length=None,
+               memory_layer=None,
+               check_inner_dims_defined=True,
                name=None):
     """Construct base AttentionMechanism class.
 
@@ -132,6 +137,9 @@ class _BaseAttentionMechanism(AttentionMechanism):
         provided, the shape of `query` must match that of `memory_layer`.
       memory: The memory to query; usually the output of an RNN encoder.  This
         tensor should be shaped `[batch_size, max_time, ...]`.
+      probability_fn: A `callable`.  Converts the score and previous alignments
+        to probabilities. Its signature should be:
+        `probabilities = probability_fn(score, previous_alignments)`.
       memory_sequence_length (optional): Sequence lengths for the batch entries
         in memory.  If provided, the memory tensor rows are masked with zeros
         for values past the respective sequence lengths.
@@ -154,6 +162,10 @@ class _BaseAttentionMechanism(AttentionMechanism):
           "memory_layer is not a Layer: %s" % type(memory_layer).__name__)
     self._query_layer = query_layer
     self._memory_layer = memory_layer
+    if not callable(probability_fn):
+      raise TypeError("probability_fn must be callable, saw type: %s" %
+                      type(probability_fn).__name__)
+    self._probability_fn = probability_fn
     with ops.name_scope(
         name, "BaseAttentionMechanismInit", nest.flatten(memory)):
       self._values = _prepare_memory(
@@ -164,6 +176,8 @@ class _BaseAttentionMechanism(AttentionMechanism):
           else self._values)
       self._batch_size = (
           self._keys.shape[0].value or array_ops.shape(self._keys)[0])
+      self._alignments_size = (self._keys.shape[1].value or
+                               array_ops.shape(self._keys)[1])
 
   @property
   def memory_layer(self):
@@ -185,6 +199,29 @@ class _BaseAttentionMechanism(AttentionMechanism):
   def batch_size(self):
     return self._batch_size
 
+  @property
+  def alignments_size(self):
+    return self._alignments_size
+
+  def initial_alignments(self, batch_size, dtype):
+    """Creates the initial alignment values for the `AttentionWrapper` class.
+
+    This is important for AttentionMechanisms that use the previous alignment
+    to calculate the alignment at the next time step (e.g. monotonic attention).
+
+    The default behavior is to return a tensor of all zeros.
+
+    Args:
+      batch_size: `int32` scalar, the batch_size.
+      dtype: The `dtype`.
+
+    Returns:
+      A `dtype` tensor shaped `[batch_size, alignments_size]`
+      (`alignments_size` is the values' `max_time`).
+    """
+    max_time = self._alignments_size
+    return _zero_state_tensors(max_time, batch_size, dtype)
+
 
 class LuongAttention(_BaseAttentionMechanism):
   """Implements Luong-style (multiplicative) attention scoring.
@@ -208,6 +245,7 @@ class LuongAttention(_BaseAttentionMechanism):
                memory,
                memory_sequence_length=None,
                scale=False,
+               probability_fn=None,
                name="LuongAttention"):
     """Construct the AttentionMechanism mechanism.
 
@@ -219,31 +257,43 @@ class LuongAttention(_BaseAttentionMechanism):
         in memory.  If provided, the memory tensor rows are masked with zeros
         for values past the respective sequence lengths.
       scale: Python boolean.  Whether to scale the energy term.
+      probability_fn: (optional) A `callable`.  Converts the score to
+        probabilities.  The default is @{tf.nn.softmax}. Other options include
+        @{tf.contrib.seq2seq.hardmax} and @{tf.contrib.sparsemax.sparsemax}.
+        Its signature should be: `probabilities = probability_fn(score)`.
       name: Name to use when creating ops.
     """
     # For LuongAttention, we only transform the memory layer; thus
     # num_units **must** match expected the query depth.
+    if probability_fn is None:
+      probability_fn = nn_ops.softmax
+    wrapped_probability_fn = lambda score, _: probability_fn(score)
     super(LuongAttention, self).__init__(
         query_layer=None,
         memory_layer=layers_core.Dense(
             num_units, name="memory_layer", use_bias=False),
         memory=memory,
+        probability_fn=wrapped_probability_fn,
         memory_sequence_length=memory_sequence_length,
         name=name)
     self._num_units = num_units
     self._scale = scale
     self._name = name
 
-  def __call__(self, query):
+  def __call__(self, query, previous_alignments):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
+      previous_alignments: Tensor of dtype matching `self.values` and shape
+        `[batch_size, alignments_size]`
+        (`alignments_size` is memory's `max_time`).
 
     Returns:
-      score: Tensor of dtype matching `self.values` and shape
-        `[batch_size, max_time]` (`max_time` is memory's `max_time`).
+      alignments: Tensor of dtype matching `self.values` and shape
+        `[batch_size, alignments_size]` (`alignments_size` is memory's
+        `max_time`).
 
     Raises:
       ValueError: If `key` and `query` depths do not match.
@@ -281,7 +331,8 @@ class LuongAttention(_BaseAttentionMechanism):
             "attention_g", dtype=dtype, initializer=1.)
         score = g * score
 
-    return score
+    alignments = self._probability_fn(score, previous_alignments)
+    return alignments
 
 
 class BahdanauAttention(_BaseAttentionMechanism):
@@ -311,6 +362,7 @@ class BahdanauAttention(_BaseAttentionMechanism):
                memory,
                memory_sequence_length=None,
                normalize=False,
+               probability_fn=None,
                name="BahdanauAttention"):
     """Construct the Attention mechanism.
 
@@ -322,30 +374,42 @@ class BahdanauAttention(_BaseAttentionMechanism):
         in memory.  If provided, the memory tensor rows are masked with zeros
         for values past the respective sequence lengths.
       normalize: Python boolean.  Whether to normalize the energy term.
+      probability_fn: (optional) A `callable`.  Converts the score to
+        probabilities.  The default is @{tf.nn.softmax}. Other options include
+        @{tf.contrib.seq2seq.hardmax} and @{tf.contrib.sparsemax.sparsemax}.
+        Its signature should be: `probabilities = probability_fn(score)`.
       name: Name to use when creating ops.
     """
+    if probability_fn is None:
+      probability_fn = nn_ops.softmax
+    wrapped_probability_fn = lambda score, _: probability_fn(score)
     super(BahdanauAttention, self).__init__(
         query_layer=layers_core.Dense(
             num_units, name="query_layer", use_bias=False),
         memory_layer=layers_core.Dense(
             num_units, name="memory_layer", use_bias=False),
         memory=memory,
+        probability_fn=wrapped_probability_fn,
         memory_sequence_length=memory_sequence_length,
         name=name)
     self._num_units = num_units
     self._normalize = normalize
     self._name = name
 
-  def __call__(self, query):
+  def __call__(self, query, previous_alignments):
     """Score the query based on the keys and values.
 
     Args:
       query: Tensor of dtype matching `self.values` and shape
         `[batch_size, query_depth]`.
+      previous_alignments: Tensor of dtype matching `self.values` and shape
+        `[batch_size, alignments_size]`
+        (`alignments_size` is memory's `max_time`).
 
     Returns:
-      score: Tensor of dtype matching `self.values` and shape
-        `[batch_size, max_time]` (`max_time` is memory's `max_time`).
+      alignments: Tensor of dtype matching `self.values` and shape
+        `[batch_size, alignments_size]` (`alignments_size` is memory's
+        `max_time`).
     """
     with variable_scope.variable_scope(None, "bahdanau_attention", [query]):
       processed_query = self.query_layer(query) if self.query_layer else query
@@ -373,20 +437,23 @@ class BahdanauAttention(_BaseAttentionMechanism):
         score = math_ops.reduce_sum(v * math_ops.tanh(keys + processed_query),
                                     [2])
 
-    return score
+    alignments = self._probability_fn(score, previous_alignments)
+    return alignments
 
 
 class AttentionWrapperState(
     collections.namedtuple("AttentionWrapperState",
-                           ("cell_state", "attention", "time",
+                           ("cell_state", "attention", "time", "alignments",
                             "alignment_history"))):
   """`namedtuple` storing the state of a `AttentionWrapper`.
 
   Contains:
 
-    - `cell_state`: The state of the wrapped `RNNCell`.
+    - `cell_state`: The state of the wrapped `RNNCell` at the previous time
+      step.
     - `attention`: The attention emitted at the previous time step.
     - `time`: int32 scalar containing the current time step.
+    - `alignments`: The alignment emitted at the previous time step.
     - `alignment_history`: (if enabled) a `TensorArray` containing alignment
        matrices from all time steps.  Call `stack()` to convert to a `Tensor`.
   """
@@ -443,7 +510,6 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
                attention_layer_size=None,
                alignment_history=False,
                cell_input_fn=None,
-               probability_fn=None,
                output_attention=True,
                initial_cell_state=None,
                name=None):
@@ -461,9 +527,6 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         time major `TensorArray` on which you must call `stack()`).
       cell_input_fn: (optional) A `callable`.  The default is:
         `lambda inputs, attention: array_ops.concat([inputs, attention], -1)`.
-      probability_fn: (optional) A `callable`.  Converts the score to
-        probabilities.  The default is @{tf.nn.softmax}. Other options include
-        @{tf.contrib.seq2seq.hardmax} and @{tf.contrib.sparsemax.sparsemax}.
       output_attention: Python bool.  If `True` (default), the output at each
         time step is the attention value.  This is the behavior of Luong-style
         attention mechanisms.  If `False`, the output at each time step is
@@ -495,13 +558,6 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         raise TypeError(
             "cell_input_fn must be callable, saw type: %s"
             % type(cell_input_fn).__name__)
-    if probability_fn is None:
-      probability_fn = nn_ops.softmax
-    else:
-      if not callable(probability_fn):
-        raise TypeError(
-            "probability_fn must be callable, saw type: %s"
-            % type(probability_fn).__name__)
 
     if attention_layer_size is not None:
       self._attention_layer = layers_core.Dense(
@@ -514,7 +570,6 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
     self._cell = cell
     self._attention_mechanism = attention_mechanism
     self._cell_input_fn = cell_input_fn
-    self._probability_fn = probability_fn
     self._output_attention = output_attention
     self._alignment_history = alignment_history
     with ops.name_scope(name, "AttentionWrapperInit"):
@@ -553,6 +608,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         cell_state=self._cell.state_size,
         time=tensor_shape.TensorShape([]),
         attention=self._attention_size,
+        alignments=self._attention_mechanism.alignments_size,
         alignment_history=())  # alignment_history is sometimes a TensorArray
 
   def zero_state(self, batch_size, dtype):
@@ -586,6 +642,8 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
           time=array_ops.zeros([], dtype=dtypes.int32),
           attention=_zero_state_tensors(self._attention_size, batch_size,
                                         dtype),
+          alignments=self._attention_mechanism.initial_alignments(
+              batch_size, dtype),
           alignment_history=alignment_history)
 
   def call(self, inputs, state):
@@ -637,8 +695,8 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       cell_output = array_ops.identity(
           cell_output, name="checked_cell_output")
 
-    score = self._attention_mechanism(cell_output)
-    alignments = self._probability_fn(score)
+    alignments = self._attention_mechanism(
+        cell_output, previous_alignments=state.alignments)
 
     # Reshape from [batch_size, memory_time] to [batch_size, 1, memory_time]
     expanded_alignments = array_ops.expand_dims(alignments, 1)
@@ -671,6 +729,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
         time=state.time + 1,
         cell_state=next_cell_state,
         attention=attention,
+        alignments=alignments,
         alignment_history=alignment_history)
 
     if self._output_attention:
-- 
GitLab


From 9d1c319ac8b21f24937a1174c95eaf92756fcfc3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 15:43:34 -0700
Subject: [PATCH 1319/1563] In drop_stale_optmizer, move apply_gradients out of
 with ops.colocate_with(global_step) context to support the case of multiple
 parameter server. Also support the case when grad is None in grad_and_var
 pair.

PiperOrigin-RevId: 155920593
---
 .../opt/python/training/drop_stale_gradient_optimizer.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py
index 586991a4b3..f20c172ee3 100644
--- a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py
+++ b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer.py
@@ -96,15 +96,16 @@ class DropStaleGradientOptimizer(optimizer.Optimizer):
       grad = grad_and_var[0]
       if isinstance(grad, ops.Tensor):
         gradients.append(grad)
-      else:
+      elif grad is not None:
         gradients.append(grad.op)
 
     with ops.control_dependencies(gradients), ops.colocate_with(global_step):
       staleness = gen_array_ops.reshape(
           global_step - self._local_step, shape=())
-      conditional_update = stale_counter.assign_add(control_flow_ops.cond(
-          gen_math_ops.less_equal(staleness, self._staleness),
-          _AcceptGradientOp, _DropGradientOp))
+
+    conditional_update = stale_counter.assign_add(control_flow_ops.cond(
+        gen_math_ops.less_equal(staleness, self._staleness),
+        _AcceptGradientOp, _DropGradientOp))
 
     summary.scalar(
         "Gradient staleness percentage",
-- 
GitLab


From 0f34fa5b447c1bf22e0f509b95474c37aa5c98ba Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 16:02:12 -0700
Subject: [PATCH 1320/1563] Name change follow-up to cl/155809199.

PiperOrigin-RevId: 155922660
---
 tensorflow/python/feature_column/feature_column_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 156aa38208..2fc68b3ca7 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -1045,7 +1045,7 @@ def get_linear_model_column_var(column):
                             'linear_model/' + column.name)[0]
 
 
-class MakeLinearModelTest(test.TestCase):
+class LinearModelTest(test.TestCase):
 
   def test_raises_if_empty_feature_columns(self):
     with self.assertRaisesRegexp(ValueError,
@@ -1503,7 +1503,7 @@ class MakeLinearModelTest(test.TestCase):
             })
 
 
-class MakeInputLayerTest(test.TestCase):
+class InputLayerTest(test.TestCase):
 
   def test_raises_if_empty_feature_columns(self):
     with self.assertRaisesRegexp(ValueError,
-- 
GitLab


From e986f2d6965cd45ef5c90673518d259c028e3134 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Fri, 12 May 2017 16:27:02 -0700
Subject: [PATCH 1321/1563] Made the device_cost_impl_ accessible to
 subclasses.

PiperOrigin-RevId: 155925151
---
 tensorflow/core/grappler/costs/op_level_cost_estimator.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.h b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
index 78ce69a597..266b633922 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.h
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
@@ -132,7 +132,7 @@ class OpLevelCostEstimator {
       const TensorShapeProto& original_filter_shape, const OpInfo& op_features,
       bool* found_unknown_shapes);
 
- private:
+ protected:
   typedef std::function<Costs(const OpInfo& op_feature)> CostImpl;
   std::map<string, CostImpl> device_cost_impl_;
 };
-- 
GitLab


From 9116895a81400ece215ab0202f89d269e59042ea Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 12 May 2017 16:32:43 -0700
Subject: [PATCH 1322/1563] Change name to DelayCompensatedGradientDescent

---
 tensorflow/core/kernels/training_ops.cc       | 22 +++++-----
 tensorflow/core/kernels/training_ops.h        |  4 +-
 tensorflow/core/ops/training_ops.cc           | 12 +++---
 ... => delay_compensated_gradient_descent.py} | 13 +++---
 ...elay_compensated_gradient_descent_test.py} | 42 ++++++++++---------
 tensorflow/python/training/training.py        |  2 +
 6 files changed, 52 insertions(+), 43 deletions(-)
 rename tensorflow/python/training/{gradient_descent_dc.py => delay_compensated_gradient_descent.py} (88%)
 rename tensorflow/python/training/{gradient_descent_dc_test.py => delay_compensated_gradient_descent_test.py} (79%)

diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index e2219a0450..bcdd4d0b8a 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -57,9 +57,9 @@ struct ApplyGradientDescent<SYCLDevice, T> {
   }
 };
 #endif
-    
+
 template <typename T>
-struct ApplyGradientDescentDC<CPUDevice, T> {
+struct ApplyDelayCompensatedGradientDescent<CPUDevice, T> {
   void operator()(const CPUDevice& d, typename TTypes<T>::Flat var,
                   typename TTypes<T>::ConstScalar lr,
                   typename TTypes<T>::ConstFlat grad,
@@ -463,11 +463,11 @@ REGISTER_KERNELS(GPU, double);
 #endif
 #undef REGISTER_CPU_KERNELS
 #undef REGISTER_KERNELS
-    
+
 template <typename Device, typename T>
-class ApplyGradientDescentDCOp : public OpKernel {
+class ApplyDelayCompensatedGradientDescentOp : public OpKernel {
  public:
-  explicit ApplyGradientDescentDCOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
+  explicit ApplyDelayCompensatedGradientDescentOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
     OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
   }
 
@@ -502,7 +502,7 @@ class ApplyGradientDescentDCOp : public OpKernel {
                                 var.shape().DebugString()));
 
     const Device& device = ctx->template eigen_device<Device>();
-    functor::ApplyGradientDescentDC<Device, T>()(
+    functor::ApplyDelayCompensatedGradientDescent<Device, T>()(
         device, var.flat<T>(), alpha.scalar<T>(), delta.flat<T>(),
          lambda.scalar<T>(), var_bak.flat<T>()
     );
@@ -514,10 +514,12 @@ class ApplyGradientDescentDCOp : public OpKernel {
   bool use_exclusive_lock_;
 };
 
-#define REGISTER_KERNELS(D, T)                                                 \
-  REGISTER_KERNEL_BUILDER(                                                     \
-      Name("ApplyGradientDescentDC").Device(DEVICE_##D).TypeConstraint<T>("T"),\
-      ApplyGradientDescentDCOp<D##Device, T>);
+#define REGISTER_KERNELS(D, T)                                 \
+  REGISTER_KERNEL_BUILDER(                                     \
+      Name("ApplyDelayCompensatedGradientDescent")             \
+          .Device(DEVICE_##D)                                  \
+          .TypeConstraint<T>("T"),                             \
+      ApplyDelayCompensatedGradientDescentOp<D##Device, T>);
 #define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T);
 
 TF_CALL_half(REGISTER_CPU_KERNELS);
diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index 33de08432b..b315463dc3 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -33,9 +33,9 @@ struct ApplyGradientDescent {
                   typename TTypes<T>::ConstScalar alpha,
                   typename TTypes<T>::ConstFlat delta);
 };
-    
+
 template <typename Device, typename T>
-struct ApplyGradientDescentDC {
+struct ApplyDelayCompensatedGradientDescent {
   void operator()(const Device& d, typename TTypes<T>::Flat var,
                   typename TTypes<T>::ConstScalar alpha,
                   typename TTypes<T>::ConstFlat delta,
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 676ac55d95..f683f25f7e 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -101,8 +101,8 @@ delta: The change.
 use_locking: If `True`, the subtraction will be protected by a lock;
   otherwise the behavior is undefined, but may exhibit less contention.
 )doc");
-    
-REGISTER_OP("ApplyGradientDescentDC")
+
+REGISTER_OP("ApplyDelayCompensatedGradientDescent")
     .Input("var: Ref(T)")
     .Input("alpha: T")
     .Input("delta: T")
@@ -1028,7 +1028,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1067,7 +1067,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1099,7 +1099,7 @@ momentum: Momentum. Must be a scalar.
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1136,7 +1136,7 @@ momentum: Momentum. Must be a scalar.
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
diff --git a/tensorflow/python/training/gradient_descent_dc.py b/tensorflow/python/training/delay_compensated_gradient_descent.py
similarity index 88%
rename from tensorflow/python/training/gradient_descent_dc.py
rename to tensorflow/python/training/delay_compensated_gradient_descent.py
index 931203c7b7..26dfd0209e 100644
--- a/tensorflow/python/training/gradient_descent_dc.py
+++ b/tensorflow/python/training/delay_compensated_gradient_descent.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-"""GradientDescentDC for TensorFlow."""
+"""DelayCompensatedGradientDescentOptimizer for TensorFlow."""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
@@ -25,7 +25,7 @@ from tensorflow.python.ops import variables
 from tensorflow.python.training import optimizer
 from tensorflow.python.training import training_ops
 
-class GradientDescentDCOptimizer(optimizer.Optimizer):
+class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
 
     """Optimizer that implements the gradient descent algorithm with delay
     compensation.
@@ -35,7 +35,7 @@ class GradientDescentDCOptimizer(optimizer.Optimizer):
     """
 
     def __init__(self, learning_rate, variance_parameter, num_workers=1,
-                 use_locking=False, name="GradientDescentDC"):
+                 use_locking=False, name="DelayCompensatedGradientDescent"):
         """Construct a new gradient descent optimizer with delay compensation.
 
         Args:
@@ -47,11 +47,12 @@ class GradientDescentDCOptimizer(optimizer.Optimizer):
             asynchronously.
           use_locking: If True use locks for update operations.
           name: Optional name prefix for the operations created when applying
-            gradients. Defaults to "GradientDescentDC".
+            gradients. Defaults to "DelayCompensatedGradientDescent".
         """
         if num_workers <= 0:
             raise ValueError("num_workers must be positive: %s" % num_workers)
-        super(GradientDescentDCOptimizer, self).__init__(use_locking, name)
+        super(DelayCompensatedGradientDescentOptimizer, self).__init__(
+            use_locking, name)
         self._learning_rate = learning_rate
         self._lambda = variance_parameter
         self._num_workers = num_workers
@@ -69,7 +70,7 @@ class GradientDescentDCOptimizer(optimizer.Optimizer):
     def _apply_dense(self, grad, var, worker_index=0):
         # Get previous value of the variable from the slot
         var_bak = self.get_slot(var, "var_bak_{0}".format(worker_index))
-        return training_ops.apply_gradient_descent_dc(
+        return training_ops.apply_delay_compensated_gradient_descent(
             var,
             math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
             grad,
diff --git a/tensorflow/python/training/gradient_descent_dc_test.py b/tensorflow/python/training/delay_compensated_gradient_descent_test.py
similarity index 79%
rename from tensorflow/python/training/gradient_descent_dc_test.py
rename to tensorflow/python/training/delay_compensated_gradient_descent_test.py
index 704569f1fe..06142ae18a 100644
--- a/tensorflow/python/training/gradient_descent_dc_test.py
+++ b/tensorflow/python/training/delay_compensated_gradient_descent_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Functional test for GradientDescentDC."""
+"""Functional test for DelayCompensatedGradientDescentOptimizer."""
 
 from __future__ import absolute_import
 from __future__ import division
@@ -23,10 +23,10 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import resources
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
-from tensorflow.python.training import gradient_descent_dc
+from tensorflow.python.training import delay_compensated_gradient_descent
 
 
-class GradientDescentDCOptimizerTest(test.TestCase):
+class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
 
     def testBasic(self):
         for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
@@ -35,10 +35,11 @@ class GradientDescentDCOptimizerTest(test.TestCase):
                 var1 = variables.Variable([3.0, 4.0], dtype=dtype)
                 grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
                 grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
-                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
-                    learning_rate=3.0,
-                    variance_parameter=2.0,
-                    num_workers=1)
+                optimizer = (delay_compensated_gradient_descent.
+                             DelayCompensatedGradientDescentOptimizer)(
+                                 learning_rate=3.0,
+                                 variance_parameter=2.0,
+                                 num_workers=1)
                 sgd_op = optimizer.apply_gradients(
                     zip([grads0, grads1], [var0, var1]), worker_index=0)
                 variables.global_variables_initializer().run()
@@ -61,10 +62,11 @@ class GradientDescentDCOptimizerTest(test.TestCase):
                 grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
                 grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
                 lrate = constant_op.constant(3.0)
-                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
-                    learning_rate=lrate,
-                    variance_parameter=2.0,
-                    num_workers=1)
+                optimizer = (delay_compensated_gradient_descent.
+                             DelayCompensatedGradientDescentOptimizer)(
+                                 learning_rate=3.0,
+                                 variance_parameter=2.0,
+                                 num_workers=1)
                 sgd_op = optimizer.apply_gradients(
                     zip([grads0, grads1], [var0, var1]),
                     worker_index=0)
@@ -83,10 +85,11 @@ class GradientDescentDCOptimizerTest(test.TestCase):
     def testGradWrtRef(self):
         for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
             with self.test_session():
-                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
-                    learning_rate=3.0,
-                    variance_parameter=2.0,
-                    num_workers=1)
+                optimizer = (delay_compensated_gradient_descent.
+                             DelayCompensatedGradientDescentOptimizer)(
+                                 learning_rate=3.0,
+                                 variance_parameter=2.0,
+                                 num_workers=1)
                 values = [1.0, 3.0]
                 vars_ = [variables.Variable([v], dtype=dtype) for v in values]
                 grads_and_vars = optimizer.compute_gradients(
@@ -103,10 +106,11 @@ class GradientDescentDCOptimizerTest(test.TestCase):
                 var1 = variables.Variable([3.0, 4.0], dtype=dtype)
                 grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
                 grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
-                optimizer = gradient_descent_dc.GradientDescentDCOptimizer(
-                    learning_rate=3.0,
-                    variance_parameter=2.0,
-                    num_workers=1)
+                optimizer = (delay_compensated_gradient_descent.
+                             DelayCompensatedGradientDescentOptimizer)(
+                                 learning_rate=3.0,
+                                 variance_parameter=2.0,
+                                 num_workers=1)
                 sgd_op = optimizer.apply_gradients(
                     zip([grads0, grads1], [var0, var1]),
                     global_step=global_step,
diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index bdf3d9c017..edf0e93eec 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -19,6 +19,7 @@ See the @{$python/train} guide.
 
 @@Optimizer
 @@GradientDescentOptimizer
+@@DelayCompensatedGradientDescentOptimizer
 @@AdadeltaOptimizer
 @@AdagradOptimizer
 @@AdagradDAOptimizer
@@ -114,6 +115,7 @@ from tensorflow.python.training.moving_averages import ExponentialMovingAverage
 from tensorflow.python.training.optimizer import Optimizer
 from tensorflow.python.training.rmsprop import RMSPropOptimizer
 from tensorflow.python.training.gradient_descent import GradientDescentOptimizer
+from tensorflow.python.training.delay_compensated_gradient_descent import DelayCompensatedGradientDescentOptimizer
 from tensorflow.python.training.proximal_gradient_descent import ProximalGradientDescentOptimizer
 from tensorflow.python.training.sync_replicas_optimizer import SyncReplicasOptimizer
 
-- 
GitLab


From 185ee7c455c8b9a738c0bae255812156fb41a91e Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Fri, 12 May 2017 16:41:58 -0700
Subject: [PATCH 1323/1563] Add @license comments

The authors of these JavaScript libraries have notice licenses, yet do not have
@license comments. So we have to go to extra trouble in order to comply with
their licensing terms.

PiperOrigin-RevId: 155926635
---
 .../components/tf_imports_d3v4/d3.html        | 32 +++++++++++++++++++
 .../components/tf_imports_d3v4/dagre.html     | 24 ++++++++++++++
 .../components/tf_imports_d3v4/numericjs.html | 25 +++++++++++++++
 .../components/tf_imports_d3v4/plottable.html | 24 ++++++++++++++
 .../components/tf_imports_d3v4/threejs.html   | 24 ++++++++++++++
 .../components/tf_imports_d3v4/weblas.html    | 24 ++++++++++++++
 tensorflow/workspace.bzl                      |  1 -
 7 files changed, 153 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/d3.html b/tensorflow/tensorboard/components/tf_imports_d3v4/d3.html
index d2c6cd8b5f..2772db39a8 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/d3.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/d3.html
@@ -15,4 +15,36 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+<!--
+@license
+d3
+Copyright 2010-2017 Mike Bostock
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the author nor the names of contributors may be used to
+  endorse or promote products derived from this software without specific prior
+  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
 <script src="d3.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html b/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
index 11164dc504..1e2f6ef9af 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/dagre.html
@@ -15,6 +15,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+<!--
+@license
+Dagre
+Copyright (c) 2012-2014 Chris Pettitt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
 <link rel="import" href="lodash.html">
 <link rel="import" href="graphlib.html">
 
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html b/tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html
index adcae2ddfa..7559054aab 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/numericjs.html
@@ -15,4 +15,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+<!--
+@license
+Numeric Javascript
+Copyright (C) 2011 by Sébastien Loisel
+Copyright (c) 2011 Alberto Santini <albertosantini@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
 <script src="numeric.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html b/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
index 60be429438..2c3e10a7c4 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/plottable.html
@@ -15,6 +15,30 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+<!--
+@license
+Plottable.js
+Copyright (c) 2014-2017 Palantir Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
 <link rel="import" href="d3.html">
 <script src="plottable.js"></script>
 <link rel="stylesheet" href="plottable.css">
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html b/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
index 36386a5095..d6adad43b0 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/threejs.html
@@ -15,5 +15,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+<!--
+@license
+three.js
+Copyright (c) 2010-2013 three.js authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
 <script src="three.js"></script>
 <script src="OrbitControls.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html b/tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html
index 078017faf0..054d04ea85 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/weblas.html
@@ -15,4 +15,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+<!--
+@license
+weblas
+Copyright (c) 2015 Waylon Flinn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+-->
+
 <script src="weblas.js"></script>
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 5e9edee5cb..bf916a731c 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -811,7 +811,6 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
 
   filegroup_external(
       name = "io_github_cpettitt_graphlib",
-      # no @license header
       licenses = ["notice"],  # MIT
       sha256_urls = {
           "772045d412b1513b549be991c2e1846c38019429d43974efcae943fbe83489bf": [
-- 
GitLab


From 9ee50fec84a1255ae9f356ae350ac001947d7b0c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 12 May 2017 17:59:58 -0700
Subject: [PATCH 1324/1563] Changed MIN_SDK version to 8.0 when building iOS
 libraries.

PiperOrigin-RevId: 155932884
---
 tensorflow/contrib/makefile/Makefile                | 2 +-
 tensorflow/contrib/makefile/compile_ios_protobuf.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile
index 31ad264f08..305ed0d11e 100644
--- a/tensorflow/contrib/makefile/Makefile
+++ b/tensorflow/contrib/makefile/Makefile
@@ -297,7 +297,7 @@ ifeq ($(TARGET),IOS)
 	IPHONESIMULATOR_SYSROOT := $(shell xcrun --sdk iphonesimulator \
 	--show-sdk-path)
 	IOS_SDK_VERSION := $(shell xcrun --sdk iphoneos --show-sdk-version)
-	MIN_SDK_VERSION := 8.2
+	MIN_SDK_VERSION := 8.0
 # Override IOS_ARCH with ARMV7, ARMV7S, ARM64, or I386.
 	IOS_ARCH := X86_64
 	ifeq ($(IOS_ARCH),ARMV7)
diff --git a/tensorflow/contrib/makefile/compile_ios_protobuf.sh b/tensorflow/contrib/makefile/compile_ios_protobuf.sh
index 12f34b38d0..d1012a6c93 100755
--- a/tensorflow/contrib/makefile/compile_ios_protobuf.sh
+++ b/tensorflow/contrib/makefile/compile_ios_protobuf.sh
@@ -41,7 +41,7 @@ IPHONEOS_SYSROOT=`xcrun --sdk iphoneos --show-sdk-path`
 IPHONESIMULATOR_PLATFORM=`xcrun --sdk iphonesimulator --show-sdk-platform-path`
 IPHONESIMULATOR_SYSROOT=`xcrun --sdk iphonesimulator --show-sdk-path`
 IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version`
-MIN_SDK_VERSION=8.2
+MIN_SDK_VERSION=8.0
 
 CFLAGS="-DNDEBUG -Os -pipe -fPIC -fno-exceptions"
 CXXFLAGS="${CFLAGS} -std=c++11 -stdlib=libc++"
-- 
GitLab


From f9d0d3205f7d0522dcd6f6d7e2d32896275fc78c Mon Sep 17 00:00:00 2001
From: Neal Wu <wun@google.com>
Date: Fri, 12 May 2017 18:12:04 -0700
Subject: [PATCH 1325/1563] Remove erroneous comment from resnet_v2.py

PiperOrigin-RevId: 155933792
---
 tensorflow/contrib/slim/python/slim/nets/resnet_v2.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
index bd811e3726..63e8f1ff35 100644
--- a/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
+++ b/tensorflow/contrib/slim/python/slim/nets/resnet_v2.py
@@ -25,8 +25,6 @@ introduced by:
 
 The key difference of the full preactivation 'v2' variant compared to the
 'v1' variant in [1] is the use of batch normalization before every weight layer.
-Another difference is that 'v2' ResNets do not include an activation function in
-the main pathway. Also see [2; Fig. 4e].
 
 Typical use:
 
-- 
GitLab


From 7930c794ae1775b0131134cb5bf4f062bb850e9c Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Fri, 12 May 2017 19:07:55 -0700
Subject: [PATCH 1326/1563] Fix TensorBoard dashboard common regression

If the script that calls Polymer() isn't in the same HTML file that declares
the DOM element, then it needs to be wrapped with window.HTMLImports.onReady.
Rather than putting a callback in the source, the TypeScript compilation was
just broken down into finer grained units.

PiperOrigin-RevId: 155936270
---
 .../components/tf_dashboard_common_d3v4/BUILD | 81 ++++++++++++++-----
 .../tf_dashboard_common_d3v4/bundle.html      | 24 ------
 .../tf_dashboard_common_d3v4/test/BUILD       |  3 +-
 .../tf_dashboard_common_d3v4/test/tests.html  |  2 +-
 .../test/tf-categorizer-tests.ts              | 33 ++++----
 .../tf-categorizer-demo.html                  |  1 -
 .../tf-categorizer.html                       |  4 +
 .../tf-categorizer.ts                         |  2 +
 .../tf-collapsable-pane-demo.html             |  1 -
 .../tf-dashboard.html                         |  3 +-
 .../tf-multi-checkbox-demo.html               |  1 -
 .../tf-multi-checkbox.html                    |  3 +
 .../tf-regex-group-demo.html                  |  1 -
 .../tf-regex-group.html                       |  2 +
 .../tf_scalar_dashboard_d3v4/demo/BUILD       |  5 +-
 .../tf_scalar_dashboard_d3v4/demo/index.html  |  4 +-
 16 files changed, 101 insertions(+), 69 deletions(-)
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
index fe6efd706d..564028ba3c 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
@@ -9,23 +9,25 @@ licenses(["notice"])  # Apache 2.0
 web_library(
     name = "tf_dashboard_common_d3v4",
     srcs = [
-        "bundle.html",
-        "bundle.js",
         "dashboard-style.html",
         "run-color-style.html",
         "scrollbar-style.html",
         "tensorboard-color.html",
         "tf-categorizer.html",
+        "tf-categorizer-bundle.js",
         "tf-chart-scaffold.html",
         "tf-collapsable-pane.html",
         "tf-dashboard.html",
+        "tf-dashboard.js",
         "tf-dashboard-layout.html",
         "tf-downloader.html",
         "tf-multi-checkbox.html",
+        "tf-multi-checkbox-bundle.js",
         "tf-no-data-warning.html",
         "tf-option-selector.html",
         "tf-panes-helper.html",
         "tf-regex-group.html",
+        "tf-regex-group-bundle.js",
         "tf-run-selector.html",
         "tf-sidebar-helper.html",
     ],
@@ -33,7 +35,6 @@ web_library(
     deps = [
         "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
-        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable",
         "//tensorflow/tensorboard/components/tf_storage_d3v4",
         "//tensorflow/tensorboard/components/vz_sorting_d3v4",
         "@org_polymer",
@@ -72,34 +73,74 @@ web_library(
     ],
 )
 
+tensorboard_typescript_bundle(
+    name = "tf_categorizer_bundle",
+    out = "tf-categorizer-bundle.ts",
+    namespace_srcs = {"TF.Dashboard.Categorizer": ["tf-categorizer.ts"]},
+    namespace_symbol_aliases = {"TF.Dashboard.Categorizer": {"compareTagNames": "VZ.Sorting.compareTagNames"}},
+)
+
 tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = ["bundle.ts"],
+    name = "tf_categorizer_ts",
+    srcs = ["tf-categorizer-bundle.ts"],
     typings = [
         "@org_definitelytyped//:lodash.d.ts",
         "@org_definitelytyped//:polymer.d.ts",
         "@org_definitelytyped//:webcomponents.js.d.ts",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
-        "//tensorflow/tensorboard/components/tf_imports_d3v4:plottable.d.ts",
-        "//tensorflow/tensorboard/components/tf_storage_d3v4:bundle.d.ts",
         "//tensorflow/tensorboard/components/vz_sorting_d3v4:bundle.d.ts",
     ],
 )
 
 tensorboard_typescript_bundle(
-    name = "bundle",
-    out = "bundle.ts",
-    namespace_srcs = {"TF.Dashboard": [
-        "tf-categorizer.ts",
-        "dashboard-behavior.ts",
-        "reload-behavior.ts",
-        "tf-multi-checkbox.ts",
-        "tf-regex-group.ts",
-    ]},
-    namespace_symbol_aliases = {"TF.Dashboard": {
-        "compareTagNames": "VZ.Sorting.compareTagNames",
-        "storage": "TF.URIStorage",
-    }},
+    name = "tf_regex_group_bundle",
+    out = "tf-regex-group-bundle.ts",
+    namespace_srcs = {"TF.Dashboard.RegexGroup": ["tf-regex-group.ts"]},
+    namespace_symbol_aliases = {"TF.Dashboard.RegexGroup": {"storage": "TF.URIStorage"}},
+)
+
+tensorboard_typescript_genrule(
+    name = "tf_regex_group_ts",
+    srcs = ["tf-regex-group-bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:bundle.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "tf_multi_checkbox_bundle",
+    out = "tf-multi-checkbox-bundle.ts",
+    namespace_srcs = {"TF.Dashboard.MultiCheckbox": ["tf-multi-checkbox.ts"]},
+    namespace_symbol_aliases = {"TF.Dashboard.MultiCheckbox": {"storage": "TF.URIStorage"}},
+)
+
+tensorboard_typescript_genrule(
+    name = "tf_multi_checkbox_ts",
+    srcs = ["tf-multi-checkbox-bundle.ts"],
+    typings = [
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:bundle.d.ts",
+    ],
+)
+
+tensorboard_typescript_bundle(
+    name = "tf_dashboard_bundle",
+    out = "tf-dashboard.ts",
+    namespace_srcs = {
+        "TF.Dashboard": [
+            "dashboard-behavior.ts",
+            "reload-behavior.ts",
+        ],
+    },
+)
+
+tensorboard_typescript_genrule(
+    name = "tf_dashboard_ts",
+    srcs = ["tf-dashboard.ts"],
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html
deleted file mode 100644
index 514b8b7d72..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/bundle.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-imports/d3.html">
-<link rel="import" href="../tf-imports/lodash.html">
-<link rel="import" href="../tf-storage/tf-storage.html">
-<link rel="import" href="../vz-sorting/vz-sorting.html">
-
-<script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD
index f3ce8d09e2..fc9912d54a 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/BUILD
@@ -30,7 +30,7 @@ tensorboard_typescript_genrule(
     typings = [
         "@org_definitelytyped//:chai.d.ts",
         "@org_definitelytyped//:mocha.d.ts",
-        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:bundle.d.ts",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:tf-categorizer-bundle.d.ts",
     ],
 )
 
@@ -38,6 +38,7 @@ tensorboard_typescript_bundle(
     name = "bundle",
     out = "bundle.ts",
     namespace_srcs = {"TF.Dashboard": ["tf-categorizer-tests.ts"]},
+    namespace_symbol_aliases = {"TF.Dashboard": {"cat": "TF.Dashboard.Categorizer"}},
 )
 
 filegroup(
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html
index 121b0dc1a5..cd33cee474 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tests.html
@@ -19,6 +19,6 @@ limitations under the License.
 <meta charset="utf-8">
 <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
 <script src="../../web-component-tester/browser.js"></script>
-<link rel="import" href="../tf-dashboard.html">
+<link rel="import" href="../tf-categorizer.html">
 <body>
 <script src="bundle.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tf-categorizer-tests.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tf-categorizer-tests.ts
index f280d77f66..a786f39b4f 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tf-categorizer-tests.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test/tf-categorizer-tests.ts
@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-import {topLevelNamespaceCategorizer, Category, Categorizer, defineCategory, _categorizer} from '../tf-categorizer'
+import * as cat from '../tf-categorizer';
 
 let assert = chai.assert;
 
 describe('categorizer', () => {
   describe('topLevelNamespaceCategorizer', () => {
     it('returns empty array on empty tags', () => {
-      assert.lengthOf(topLevelNamespaceCategorizer([]), 0);
+      assert.lengthOf(cat.topLevelNamespaceCategorizer([]), 0);
     });
 
     it('handles a simple case', () => {
@@ -33,7 +33,7 @@ describe('categorizer', () => {
         {name: 'foo2', tags: ['foo2/bar', 'foo2/zod']},
         {name: 'gosh', tags: ['gosh/lod/mar', 'gosh/lod/ned']},
       ];
-      assert.deepEqual(topLevelNamespaceCategorizer(simple), expected);
+      assert.deepEqual(cat.topLevelNamespaceCategorizer(simple), expected);
     });
 
     it('orders the categories', () => {
@@ -46,12 +46,12 @@ describe('categorizer', () => {
         {name: 'f', tags: ['f']},
         {name: 'g', tags: ['g']},
       ];
-      assert.deepEqual(topLevelNamespaceCategorizer(test), expected);
+      assert.deepEqual(cat.topLevelNamespaceCategorizer(test), expected);
     });
 
     it('handles cases where category names overlap node names', () => {
       let test = ['a', 'a/a', 'a/b', 'a/c', 'b', 'b/a'];
-      let actual = topLevelNamespaceCategorizer(test);
+      const actual = cat.topLevelNamespaceCategorizer(test);
       let expected = [
         {name: 'a', tags: ['a', 'a/a', 'a/b', 'a/c']},
         {name: 'b', tags: ['b', 'b/a']},
@@ -61,25 +61,26 @@ describe('categorizer', () => {
 
     it('handles singleton case', () => {
       assert.deepEqual(
-          topLevelNamespaceCategorizer(['a']), [{name: 'a', tags: ['a']}]);
+          cat.topLevelNamespaceCategorizer(['a']), [{name: 'a', tags: ['a']}]);
     });
   });
 
   describe('customCategorizer', () => {
-    function noFallbackCategorizer(tags: string[]): Category[] {
+    function noFallbackCategorizer(tags: string[]): cat.Category[] {
       return [];
     }
 
     function testCategorizer(
-        defs: string[], fallback: Categorizer, tags: string[]): Category[] {
-      let catDefs = defs.map(defineCategory);
-      return _categorizer(catDefs, fallback)(tags);
+        defs: string[], fallback: cat.Categorizer,
+        tags: string[]): cat.Category[] {
+      const catDefs = defs.map(cat.defineCategory);
+      return cat._categorizer(catDefs, fallback)(tags);
     }
 
     it('categorizes by regular expression', () => {
       let defs = ['foo..', 'bar..'];
       let tags = ['fooab', 'fooxa', 'barts', 'barms'];
-      let actual = testCategorizer(defs, noFallbackCategorizer, tags);
+      const actual = testCategorizer(defs, noFallbackCategorizer, tags);
       let expected = [
         {name: 'foo..', tags: ['fooab', 'fooxa']},
         {name: 'bar..', tags: ['barms', 'barts']},
@@ -89,7 +90,7 @@ describe('categorizer', () => {
 
     it('matches non-exclusively', () => {
       let tags = ['abc', 'bar', 'zod'];
-      let actual =
+      const actual =
           testCategorizer(['...', 'bar'], noFallbackCategorizer, tags);
       let expected = [
         {name: '...', tags: ['abc', 'bar', 'zod']},
@@ -99,7 +100,7 @@ describe('categorizer', () => {
     });
 
     it('creates categories for unmatched rules', () => {
-      let actual =
+      const actual =
           testCategorizer(['a', 'b', 'c'], noFallbackCategorizer, []);
       let expected = [
         {name: 'a', tags: []},
@@ -112,7 +113,7 @@ describe('categorizer', () => {
     it('category regexs work with special characters', () => {
       let defs = ['^\\w+$', '^\\d+$', '^\\/..$'];
       let tags = ['foo', '3243', '/xa'];
-      let actual = testCategorizer(defs, noFallbackCategorizer, tags);
+      const actual = testCategorizer(defs, noFallbackCategorizer, tags);
       let expected = [
         {name: '^\\w+$', tags: ['3243', 'foo']},
         {name: '^\\d+$', tags: ['3243']},
@@ -125,13 +126,13 @@ describe('categorizer', () => {
       let tags = ['a', 'z', 'c', 'd', 'e', 'x', 'f', 'y', 'g'];
       let sorted = tags.slice().sort();
       let expected = [{name: '.*', tags: sorted}];
-      let actual = testCategorizer(['.*'], noFallbackCategorizer, tags);
+      const actual = testCategorizer(['.*'], noFallbackCategorizer, tags);
       assert.deepEqual(actual, expected);
     });
 
     it('if nonexclusive: all tags passed to fallback', () => {
       let passedToDefault = null;
-      function defaultCategorizer(tags: string[]): Category[] {
+      function defaultCategorizer(tags: string[]): cat.Category[] {
         passedToDefault = tags;
         return [];
       }
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
index 758f024e88..23babaaecc 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer-demo.html
@@ -19,7 +19,6 @@ limitations under the License.
 <html>
  <head>
   <link rel="import" href="tf-categorizer.html">
-  <link rel="import" href="bundle.html">
  </head>
  <body>
   <style>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
index c22c56a3b9..6388ab5e7d 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.html
@@ -17,6 +17,9 @@ limitations under the License.
 
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../tf-imports/d3.html">
+<link rel="import" href="../tf-imports/lodash.html">
+<link rel="import" href="../vz-sorting/vz-sorting.html">
 <link rel="import" href="tf-regex-group.html">
 <link rel="import" href="tensorboard-color.html">
 
@@ -56,4 +59,5 @@ categories are exclusive.
       }
     </style>
   </template>
+  <script src="tf-categorizer-bundle.js"></script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
index 60bf10e0b6..5d33078097 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
@@ -14,6 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
+import * as _ from 'lodash';
+
 import {compareTagNames} from '../vz-sorting/sorting';
 
 /**
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
index 1c4ed1529c..6c8bdb92ee 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
@@ -19,7 +19,6 @@ limitations under the License.
 <html>
  <head>
    <link rel="import" href="tf-collapsable-pane.html">
-   <link rel="import" href="bundle.html">
    
  </head>
  <body>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
index 1e136936da..475c2cef3b 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-dashboard.html
@@ -21,4 +21,5 @@ limitations under the License.
 <link rel="import" href="dashboard-style.html">
 <link rel="import" href="tf-downloader.html">
 <link rel="import" href="tf-no-data-warning.html">
-<link rel="import" href="bundle.html">
+
+<script src="tf-dashboard.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
index 642bc86ca6..d0f5aa6f27 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox-demo.html
@@ -20,7 +20,6 @@ limitations under the License.
 <head>
 <link rel="import" href="../tf-color-scale/tf-color-scale.html">
 <link rel="import" href="tf-multi-checkbox.html">
-<link rel="import" href="bundle.html">
 
 </head>
 <body>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
index c7db79f74b..8a56616f82 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-multi-checkbox.html
@@ -20,6 +20,8 @@ limitations under the License.
 <link rel="import" href="../paper-checkbox/paper-checkbox.html">
 <link rel="import" href="../paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../tf-storage/tf-storage.html">
+<link rel="import" href="../tf-imports/lodash.html">
 <link rel="import" href="scrollbar-style.html">
 <link rel="import" href="run-color-style.html">
 
@@ -154,4 +156,5 @@ handle these situations gracefully.
     }
   </style>
   </template>
+  <script src="tf-multi-checkbox-bundle.js"></script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
index 051a58e270..3565fec179 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group-demo.html
@@ -19,7 +19,6 @@ limitations under the License.
 <html>
  <head>
    <link rel="import" href="tf-regex-group.html">
-   <link rel="import" href="bundle.html">
  </head>
  <body>
   <style>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
index 1434606d24..e68b306ee3 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-regex-group.html
@@ -20,6 +20,7 @@ limitations under the License.
 <link rel="import" href="../iron-icons/iron-icons.html">
 <link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../tf-storage/tf-storage.html">
 
 <!--
 `tf-regex-group` provides an input component for a group of regular expressions.
@@ -94,4 +95,5 @@ more regexes).
       </template>
     </div>
   </template>
+  <script src="tf-regex-group-bundle.js"></script>
 </dom-module>
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD
index 322fcfc3bc..e3977205cb 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/BUILD
@@ -6,11 +6,14 @@ licenses(["notice"])  # Apache 2.0
 
 web_library(
     name = "demo",
-    srcs = ["index.html"] + glob(["data/**"]),
+    srcs = ["index.html"],
     path = "/tf-scalar-dashboard/demo",
     deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
         "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4",
+        "//tensorflow/tensorboard/demo:demo_data",
+        "@org_polymer",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_styles",
         "@org_polymer_webcomponentsjs",
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html
index 586ee2a47d..7429c87b87 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo/index.html
@@ -17,9 +17,11 @@ limitations under the License.
 -->
 
 <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../../polymer/polymer.html">
 <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
 <link rel="import" href="../tf-scalar-dashboard.html">
 <link rel="import" href="../../paper-styles/typography.html">
+<link rel="import" href="../../tf-backend/tf-backend.html">
 
 <title>Scalar Dashboard Demo</title>
 <style>
@@ -49,7 +51,7 @@ limitations under the License.
             backend: {
               type: Object,
               value: function() {
-                var router = new TF.Backend.router("data", true);
+                var router = new TF.Backend.router("/data", true);
                 return new TF.Backend.Backend(router);
               },
             },
-- 
GitLab


From 3320564488380cb0c1362f76ad8022b08145b6ee Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 12 May 2017 20:35:38 -0700
Subject: [PATCH 1327/1563] tfdbg: apply nomac tag to grpc_session_debug_test

PiperOrigin-RevId: 155939202
---
 tensorflow/core/debug/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/core/debug/BUILD b/tensorflow/core/debug/BUILD
index c46e9e4c63..2fc49d4412 100644
--- a/tensorflow/core/debug/BUILD
+++ b/tensorflow/core/debug/BUILD
@@ -227,6 +227,7 @@ tf_cc_test(
     size = "medium",
     srcs = ["grpc_session_debug_test.cc"],
     linkstatic = tf_kernel_tests_linkstatic(),
+    tags = ["nomac"],  # b/38276817
     deps = [
         ":debug_grpc_testlib",
         ":debug_io_utils",
-- 
GitLab


From 7cb059717dd9012188db194faa8a14a006a80e2a Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Fri, 12 May 2017 20:57:54 -0700
Subject: [PATCH 1328/1563] Improve Polymer test fixture definition

PiperOrigin-RevId: 155939905
---
 tensorflow/workspace.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index bf916a731c..2a206b0acd 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -2674,5 +2674,5 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           "https://github.com/PolymerElements/test-fixture/archive/v2.0.1.tar.gz",
       ],
       path = "/test-fixture",
-      suppress = ["strictDependencies"],
+      exclude = ["test/**"],
   )
-- 
GitLab


From 97b22e5859161ed593bdf64482f7a5f27e03b0af Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Fri, 12 May 2017 21:43:23 -0700
Subject: [PATCH 1329/1563] FeatureColumn: (public) docstring cleanup.

PiperOrigin-RevId: 155941388
---
 .../python/feature_column/feature_column.py   | 226 ++++++++++--------
 1 file changed, 122 insertions(+), 104 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index ce864fe051..61c02a2fc6 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -21,57 +21,60 @@ canned ${tf.estimator.Estimator}s.
 When using FeatureColumns with `Estimators`, the type of feature column you
 should choose depends on (1) the feature type and (2) the model type.
 
-(1) Feature type:
+1. Feature type:
 
- * Continuous features can be represented by `numeric_column`.
- * Categorical features can be represented by any `categorical_column_with_*`
- column:
-  - `categorical_column_with_keys`
-  - `categorical_column_with_vocabulary_file`
-  - `categorical_column_with_hash_bucket`
-  - `categorical_column_with_integerized_feature`
+  * Continuous features can be represented by `numeric_column`.
+  * Categorical features can be represented by any `categorical_column_with_*`
+  column:
+    - `categorical_column_with_vocabulary_list`
+    - `categorical_column_with_vocabulary_file`
+    - `categorical_column_with_hash_bucket`
+    - `categorical_column_with_identity`
+    - `weighted_categorical_column`
 
-(2) Model type:
+2. Model type:
 
- * Deep neural network models (`DNNClassifier`, `DNNRegressor`).
+  * Deep neural network models (`DNNClassifier`, `DNNRegressor`).
 
-   Continuous features can be directly fed into deep neural network models.
+    Continuous features can be directly fed into deep neural network models.
 
-     age_column = numeric_column("age")
+      age_column = numeric_column("age")
 
-   To feed sparse features into DNN models, wrap the column with
-   `embedding_column` or `indicator_column`. `indicator_column` is recommended
-   for features with only a few possible values. For features with many possible
-   values, `embedding_column` is recommended.
+    To feed sparse features into DNN models, wrap the column with
+    `embedding_column` or `indicator_column`. `indicator_column` is recommended
+    for features with only a few possible values. For features with many
+    possible values, to reduce the size of your model, `embedding_column` is
+    recommended.
 
-     embedded_dept_column = embedding_column(
-       categorical_column_with_keys("department", ["math", "philosphy", ...]),
-       dimension=10)
+      embedded_dept_column = embedding_column(
+          categorical_column_with_vocabulary_list(
+              "department", ["math", "philosphy", ...]), dimension=10)
 
-* Wide (aka linear) models (`LinearClassifier`, `LinearRegressor`).
+  * Wide (aka linear) models (`LinearClassifier`, `LinearRegressor`).
 
-   Sparse features can be fed directly into linear models. They behave like an
-   indicator column but with an efficient implementation.
+    Sparse features can be fed directly into linear models. They behave like an
+    indicator column but with an efficient implementation.
 
-     dept_column = categorical_column_with_keys("department",
-       ["math", "philosophy", "english"])
+      dept_column = categorical_column_with_vocabulary_list("department",
+          ["math", "philosophy", "english"])
 
-   It is recommended that continuous features be bucketized before being
-   fed into linear models.
+    It is recommended that continuous features be bucketized before being
+    fed into linear models.
 
-     bucketized_age_column = bucketized_column(
-      source_column=age_column,
-      boundaries=[18, 25, 30, 35, 40, 45, 50, 55, 60, 65])
+      bucketized_age_column = bucketized_column(
+          source_column=age_column,
+          boundaries=[18, 25, 30, 35, 40, 45, 50, 55, 60, 65])
 
-   Sparse features can be crossed (also known as conjuncted or combined) in
-   order to form non-linearities, and then fed into linear models.
+    Sparse features can be crossed (also known as conjuncted or combined) in
+    order to form non-linearities, and then fed into linear models.
 
-    cross_dept_age_column = crossed_column(
-      columns=[department_column, bucketized_age_column],
-      hash_bucket_size=1000)
+      cross_dept_age_column = crossed_column(
+          columns=["department", bucketized_age_column],
+          hash_bucket_size=1000)
 
 Example of building canned `Estimator`s using FeatureColumns:
 
+  ```python
   # Define features and transformations
   deep_feature_columns = [age_column, embedded_dept_column]
   wide_feature_columns = [dept_column, bucketized_age_column,
@@ -94,24 +97,27 @@ Example of building canned `Estimator`s using FeatureColumns:
       dnn_feature_columns=deep_feature_columns,
       dnn_hidden_units=[500, 250, 50])
   estimator.train(...)
+  ```
 
 
 FeatureColumns can also be transformed into a generic input layer for
-custom models using `input_from_feature_columns`.
+custom models using `input_layer`.
 
 Example of building model using FeatureColumns, this can be used in a
 `model_fn` which is given to the {tf.estimator.Estimator}:
 
+  ```python
   # Building model via layers
 
   deep_feature_columns = [age_column, embedded_dept_column]
   columns_to_tensor = parse_feature_columns_from_examples(
       serialized=my_data,
       feature_columns=deep_feature_columns)
-  first_layer = input_from_feature_columns(
-      columns_to_tensors=columns_to_tensor,
+  first_layer = input_layer(
+      features=columns_to_tensor,
       feature_columns=deep_feature_columns)
   second_layer = fully_connected(first_layer, ...)
+  ```
 
 NOTE: Functions prefixed with "_" indicate experimental or private parts of
 the API subject to change, and should not be relied upon!
@@ -165,23 +171,24 @@ def input_layer(features,
   price = numeric_column('price')
   keywords_embedded = embedding_column(
       categorical_column_with_hash_bucket("keywords", 10K), dimensions=16)
-  all_feature_columns = [price, keywords_embedded, ...]
-  dense_tensor = input_layer(features, all_feature_columns)
+  columns = [price, keywords_embedded, ...]
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
+  dense_tensor = input_layer(features, columns)
   for units in [128, 64, 32]:
     dense_tensor = tf.layers.dense(dense_tensor, units, tf.nn.relu)
   prediction = tf.layers.dense(dense_tensor, 1)
   ```
 
   Args:
-    features: A mapping from key to tensors. `FeatureColumn`s look up via these
-      keys. For example `numeric_column('price') will look at 'price' key in
+    features: A mapping from key to tensors. `_FeatureColumn`s look up via these
+      keys. For example `numeric_column('price')` will look at 'price' key in
       this dict. Values can be a `SparseTensor` or a `Tensor` depends on
-      corresponding `FeatureColumn`.
-    feature_columns: An iterable containing all the `FeatureColumn`s. All items
-      should be instances of classes derived from `_DenseColumn` such as
-      `numeric_column`, `embedding_column`, `bucketized_column`,
-      `indicator_column`. If you have categorical features, you can wrap them
-      with with an `embedding_column` or `indicator_column`.
+      corresponding `_FeatureColumn`.
+    feature_columns: An iterable containing the FeatureColumns to use as inputs
+      to your model. All items should be instances of classes derived from
+      `_DenseColumn` such as `numeric_column`, `embedding_column`,
+      `bucketized_column`, `indicator_column`. If you have categorical features,
+      you can wrap them with an `embedding_column` or `indicator_column`.
     weight_collections: A list of collection names to which the Variable will be
       added. Note that, variables will also be added to collections
       `tf.GraphKeys.GLOBAL_VARIABLES` and `ops.GraphKeys.MODEL_VARIABLES`.
@@ -250,17 +257,20 @@ def linear_model(features,
   price = numeric_column('price')
   price_buckets = bucketized_column(price, boundaries=[0., 10., 100., 1000.])
   keywords = categorical_column_with_hash_bucket("keywords", 10K)
-  all_feature_columns = [price_buckets, keywords, ...]
-  prediction = linear_model(features, all_feature_columns)
+  keywords_price = crossed_column('keywords', price_buckets, ...)
+  columns = [price_buckets, keywords, keywords_price ...]
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
+  prediction = linear_model(features, columns)
   ```
 
   Args:
-    features: A mapping from key to tensors. `FeatureColumn`s look up via these
+    features: A mapping from key to tensors. `_FeatureColumn`s look up via these
       keys. For example `numeric_column('price')` will look at 'price' key in
       this dict. Values are `Tensor` or `SparseTensor` depending on
-      corresponding `FeatureColumn`.
-    feature_columns: An iterable containing all the FeatureColumns. All items
-      should be instances of classes derived from FeatureColumn.
+      corresponding `_FeatureColumn`.
+    feature_columns: An iterable containing the FeatureColumns to use as inputs
+      to your model. All items should be instances of classes derived from
+      `_FeatureColumn`s.
     units: An integer, dimensionality of the output space. Default value is 1.
     sparse_combiner: A string specifying how to reduce if a sparse column is
       multivalent. Currently "mean", "sqrtn" and "sum" are supported, with "sum"
@@ -347,14 +357,14 @@ def _transform_features(features, feature_columns):
   ```
 
   Args:
-    features: A mapping from key to tensors. `FeatureColumn`s look up via these
-      keys. For example `numeric_column('price') will look at 'price' key in
+    features: A mapping from key to tensors. `_FeatureColumn`s look up via these
+      keys. For example `numeric_column('price')` will look at 'price' key in
       this dict. Values can be a `SparseTensor` or a `Tensor` depends on
-      corresponding `FeatureColumn`.
-    feature_columns: An iterable containing all the `FeatureColumn`s.
+      corresponding `_FeatureColumn`.
+    feature_columns: An iterable containing all the `_FeatureColumn`s.
 
   Returns:
-    A `dict` mapping FeatureColumn to `Tensor` and `SparseTensor` values.
+    A `dict` mapping `_FeatureColumn` to `Tensor` and `SparseTensor` values.
   """
   _check_feature_columns(feature_columns)
   outputs = {}
@@ -376,14 +386,13 @@ def make_parse_example_spec(feature_columns):
 
   ```python
   # Define features and transformations
-  feature_a = categorical_column_with_vocabulary_file(...)
   feature_b = numeric_column(...)
   feature_c_bucketized = bucketized_column(numeric_column("feature_c"), ...)
   feature_a_x_feature_c = crossed_column(
-    columns=[feature_a, feature_c_bucketized], ...)
+      columns=["feature_a", feature_c_bucketized], ...)
 
   feature_columns = set(
-    [feature_b, feature_c_bucketized, feature_a_x_feature_c])
+      [feature_b, feature_c_bucketized, feature_a_x_feature_c])
   features = tf.parse_example(
       serialized=serialized_examples,
       features=make_parse_example_spec(feature_columns))
@@ -433,17 +442,15 @@ def embedding_column(
   Use this when your inputs are sparse, but you want to convert them to a dense
   representation (e.g., to feed to a DNN).
 
-  Inputs must be `SparseTensor` by way of the provided
-  `categorical_column._get_sparse_tensors`.
-
-  Any of the `categorical_column_*` columns can be provided as input. Here is an
-  example embedding of an identity column for a DNN model:
+  Inputs must be a `_CategoricalColumn` created by any of the
+  `categorical_column_*` function. Here is an example embedding of an identity
+  column for a DNN model:
 
   ```python
   video_id = categorical_column_with_identity(
       key='video_id', num_buckets=1000000, default_value=0)
   columns = [embedding_column(video_id, 9),...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   dense_tensor = input_layer(features, columns)
   ```
 
@@ -461,8 +468,8 @@ def embedding_column(
     initializer: A variable initializer function to be used in embedding
       variable initialization. If not specified, defaults to
       `tf.truncated_normal_initializer` with mean `0.0` and standard deviation
-      `1/sqrt(categorical_column._num_buckets)`.
-    ckpt_to_load_from: String representing checkpoint name/pattern fromwhich to
+      `1/sqrt(dimension)`.
+    ckpt_to_load_from: String representing checkpoint name/pattern from which to
       restore column weights. Required if `tensor_name_in_ckpt` is not `None`.
     tensor_name_in_ckpt: Name of the `Tensor` in `ckpt_to_load_from` from
       which to restore the column weights. Required if `ckpt_to_load_from` is
@@ -547,11 +554,11 @@ def numeric_column(key,
       value of the tensor after `default_value` is applied for parsing.
       Normalizer function takes the input `Tensor` as its argument, and returns
       the output `Tensor`. (e.g. lambda x: (x - 3.0) / 4.2). Please note that
-      even though most common use case of this function is normalization, it can
-      be used for any kind of Tensorflow transformations.
+      even though the most common use case of this function is normalization, it
+      can be used for any kind of Tensorflow transformations.
 
   Returns:
-    A _NumericColumn.
+    A `_NumericColumn`.
 
   Raises:
     TypeError: if any dimension in shape is not an int
@@ -619,8 +626,9 @@ def bucketized_column(source_column, boundaries):
   bucketized_price = bucketized_column(price, boundaries=[...])
   # 'keywords' is a string feature.
   price_x_keywords = crossed_column([bucketized_price, 'keywords'], 50K)
-  all_feature_columns = [price_x_keywords, ...]
-  linear_prediction = linear_model(features, all_feature_columns)
+  columns = [price_x_keywords, ...]
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
+  linear_prediction = linear_model(features, columns)
   ```
 
   Args:
@@ -668,9 +676,10 @@ def categorical_column_with_hash_bucket(key,
   want to distribute your inputs into a finite number of buckets by hashing.
   output_id = Hash(input_feature_string) % bucket_size
 
-  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
-  values can be represented by `-1` for int and `''` for string. Note that these
-  values are independent of the `default_value` argument.
+  For input dictionary `features`, `features[key]` is either `Tensor` or
+  `SparseTensor`. If `Tensor`, missing values can be represented by `-1` for int
+  and `''` for string. Note that these values are independent of the
+  `default_value` argument.
 
   Example:
 
@@ -725,9 +734,10 @@ def categorical_column_with_vocabulary_file(
   `num_oov_buckets` and `default_value` to specify how to include
   out-of-vocabulary values.
 
-  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
-  values can be represented by `-1` for int and `''` for string. Note that these
-  values are independent of the `default_value` argument.
+  For input dictionary `features`, `features[key]` is either `Tensor` or
+  `SparseTensor`. If `Tensor`, missing values can be represented by `-1` for int
+  and `''` for string. Note that these values are independent of the
+  `default_value` argument.
 
   Example with `num_oov_buckets`:
   File '/us/states.txt' contains 50 lines, each with a 2-character U.S. state
@@ -755,6 +765,7 @@ def categorical_column_with_vocabulary_file(
   columns = [states, ...]
   features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction, _, _ = linear_model(features, columns)
+  ```
 
   And to make an embedding with either:
   ```python
@@ -777,7 +788,7 @@ def categorical_column_with_vocabulary_file(
       the input value. A positive `num_oov_buckets` can not be specified with
       `default_value`.
     default_value: The integer ID value to return for out-of-vocabulary feature
-      values, defaults to -1. This can not be specified with a positive
+      values, defaults to `-1`. This can not be specified with a positive
       `num_oov_buckets`.
     dtype: The type of features. Only string and integer types are supported.
 
@@ -818,16 +829,17 @@ def categorical_column_with_vocabulary_list(
   """A `_CategoricalColumn` with in-memory vocabulary.
 
   Logic for feature f is:
-  id = f in vocabulary_list ? vocabulary_list.index_of(f) : default_value
+  id = vocabulary_list.index_of(f) if f in vocabulary_list else default_value
 
   Use this when your inputs are in string or integer format, and you have an
   in-memory vocabulary mapping each value to an integer ID. By default,
   out-of-vocabulary values are ignored. Use `default_value` to specify how to
   include out-of-vocabulary values.
 
-  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
-  values can be represented by `-1` for int and `''` for string. Note that these
-  values are independent of the `default_value` argument.
+  For input dictionary `features`, `features[key]` is either `Tensor` or
+  `SparseTensor`. If `Tensor`, missing values can be represented by `-1` for int
+  and `''` for string. Note that these values are independent of the
+  `default_value` argument.
 
   In the following examples, each input in `vocabulary_list` is assigned an ID
   0-4 corresponding to its index (e.g., input 'B' produces output 2). All other
@@ -903,9 +915,10 @@ def categorical_column_with_identity(key, num_buckets, default_value=None):
   it doesn't have to be. This might be inefficient, however, if many of IDs
   are unused. Consider `categorical_column_with_hash_bucket` in that case.
 
-  `features[key]` is either `Tensor` or `SparseTensor`. If `Tensor`, missing
-  values can be represented by `-1` for int and `''` for string. Note that these
-  values are independent of the `default_value` argument.
+  For input dictionary `features`, `features[key]` is either `Tensor` or
+  `SparseTensor`. If `Tensor`, missing values can be represented by `-1` for int
+  and `''` for string. Note that these values are independent of the
+  `default_value` argument.
 
   In the following examples, each input in the range `[0, 1000000)` is assigned
   the same value. All other inputs are assigned `default_value` 0. Note that a
@@ -958,13 +971,15 @@ def categorical_column_with_identity(key, num_buckets, default_value=None):
 def indicator_column(categorical_column):
   """Represents multi-hot representation of given categorical column.
 
-  Used to wrap any `categorical_column_*`.
+  Used to wrap any `categorical_column_*` (e.g., to feed to DNN). Use
+  `embedding_column` if the inputs are sparse.
 
   ```python
   name = indicator_column(categorical_column_with_vocabulary_list('name',
       ['bob', 'george', 'wanda'])
-  all_feature_columns = [name, ...]
-  dense_tensor = input_layer(features, all_feature_columns)
+  columns = [name, ...]
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
+  dense_tensor = input_layer(features, columns)
 
   dense_tensor == [[1, 0, 0]]  # If "name" bytes_list is ["bob"]
   dense_tensor == [[1, 0, 1]]  # If "name" bytes_list is ["bob", "wanda"]
@@ -973,7 +988,7 @@ def indicator_column(categorical_column):
 
   Args:
     categorical_column: A `_CategoricalColumn` which is created by
-      `categorical_column_with_*` or crossed_column functions.
+      `categorical_column_with_*` or `crossed_column` functions.
 
   Returns:
     An `_IndicatorColumn`.
@@ -1022,7 +1037,7 @@ def weighted_categorical_column(
   weighted_column = weighted_categorical_column(
       categorical_column=categorical_column, weight_feature_key='frequencies')
   columns = [weighted_column, ...]
-  features = tf.parse_example(..., features=parse_example_spec(columns))
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
   linear_prediction, _, _ = linear_model(features, columns)
   ```
 
@@ -1078,8 +1093,9 @@ def crossed_column(keys, hash_bucket_size, hash_key=None):
   Here is an example to create a linear model with crosses of string features:
   ```python
   keywords_x_doc_terms = crossed_column(['keywords', 'doc_terms'], 50K)
-  all_feature_columns = [keywords_x_doc_terms, ...]
-  linear_prediction = linear_model(features, all_feature_columns)
+  columns = [keywords_x_doc_terms, ...]
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
+  linear_prediction = linear_model(features, columns)
   ```
 
   You could also use vocabulary lookup before crossing:
@@ -1087,8 +1103,9 @@ def crossed_column(keys, hash_bucket_size, hash_key=None):
   keywords = categorical_column_with_vocabulary_file(
       'keywords', '/path/to/vocabulary/file', vocabulary_size=1K)
   keywords_x_doc_terms = crossed_column([keywords, 'doc_terms'], 50K)
-  all_feature_columns = [keywords_x_doc_terms, ...]
-  linear_prediction = linear_model(features, all_feature_columns)
+  columns = [keywords_x_doc_terms, ...]
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
+  linear_prediction = linear_model(features, columns)
   ```
 
   If an input feature is of numeric type, you can use
@@ -1100,8 +1117,9 @@ def crossed_column(keys, hash_bucket_size, hash_key=None):
   # bucketized_column converts numerical feature to a categorical one.
   bucketized_price = bucketized_column(price, boundaries=[...])
   vertical_id_x_price = crossed_column([vertical_id, bucketized_price], 50K)
-  all_feature_columns = [vertical_id_x_price, ...]
-  linear_prediction = linear_model(features, all_feature_columns)
+  columns = [vertical_id_x_price, ...]
+  features = tf.parse_example(..., features=make_parse_example_spec(columns))
+  linear_prediction = linear_model(features, columns)
   ```
 
   To use crossed column in DNN model, you need to add it in an embedding column
@@ -1362,7 +1380,7 @@ def _create_categorical_column_weighted_sum(
 class _LazyBuilder(object):
   """Handles caching of transformations while building the model.
 
-  `FeatureColumn` specifies how to digest an input column to the network. Some
+  `_FeatureColumn` specifies how to digest an input column to the network. Some
   feature columns require data transformations. This class caches those
   transformations.
 
@@ -1373,12 +1391,12 @@ class _LazyBuilder(object):
   `_LazyBuilder` caches all previously transformed columns.
 
   Example:
-  We're trying to use the following `FeatureColumns`:
+  We're trying to use the following `_FeatureColumn`s:
 
   ```python
     bucketized_age = fc.bucketized_column(fc.numeric_column("age"), ...)
     keywords = fc.categorical_column_with_hash_buckets("keywords", ...)
-    age_X_keywords = fc.crossed_column([bucketized_age, keywords])
+    age_X_keywords = fc.crossed_column([bucketized_age, "keywords"])
     ... = linear_model(features,
                             [bucketized_age, keywords, age_X_keywords]
   ```
@@ -1395,8 +1413,8 @@ class _LazyBuilder(object):
       features: A mapping from feature column to objects that are `Tensor` or
         `SparseTensor`, or can be converted to same via
         `sparse_tensor.convert_to_tensor_or_sparse_tensor`. A `string` key
-        signifies a base feature (not-transformed). A `FeatureColumn` key
-        means that this `Tensor` is the output of an existing `FeatureColumn`
+        signifies a base feature (not-transformed). A `_FeatureColumn` key
+        means that this `Tensor` is the output of an existing `_FeatureColumn`
         which can be reused.
     """
     self._features = features.copy()
-- 
GitLab


From 61306357e5777ba559307005f8f03ac7af3c8562 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Sat, 13 May 2017 10:52:13 -0700
Subject: [PATCH 1330/1563] Delete .mention-bot file, not used anymore.

---
 .mention-bot | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 .mention-bot

diff --git a/.mention-bot b/.mention-bot
deleted file mode 100644
index 9e4858977f..0000000000
--- a/.mention-bot
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "maxReviewers": 2,
-  "numFilesToCheck": 10,
-  "userBlacklist": ["tensorflower-gardener"],
-  "requiredOrgs": ["tensorflow"],
-  "skipAlreadyAssignedPR": true,
-  "skipAlreadyMentionedPR": true,
-  "skipTitle": "Branch",
-  "delayed": true,
-  "delayedUntil": "10m"
-}
-- 
GitLab


From e1a14e2d2fdcf5b5cab1f262e397b898cc8f4ac6 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Sat, 13 May 2017 22:06:33 -0400
Subject: [PATCH 1331/1563] Temporarily disbale
 //tensorflow/contrib/factorization:gmm_test

---
 tensorflow/contrib/factorization/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index 8dc78da6ba..60e7c8f160 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -138,6 +138,7 @@ tf_py_test(
         "//tensorflow/python:platform_test",
     ],
     tags = [
+        "no_pip",  # b/38283730
         "notsan",  # Flaky: b/30756419
     ],
 )
-- 
GitLab


From e4633442278246a175ea51db01eb16fcbc01342e Mon Sep 17 00:00:00 2001
From: Eric Liu <ioeric@google.com>
Date: Sun, 14 May 2017 09:43:33 -0700
Subject: [PATCH 1332/1563] [Tensorboard] Calculate rewritten node name (e.g.
 "X/Y/(Y)") correctly.

PiperOrigin-RevId: 155995810
---
 .../components/tf_graph_common/graph.ts            |  6 +++---
 .../components/tf_graph_common/test/graph-test.ts  | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_common/graph.ts b/tensorflow/tensorboard/components/tf_graph_common/graph.ts
index 1b0abcfd85..e60ee0e0f2 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/graph.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/graph.ts
@@ -409,9 +409,9 @@ export function joinStatsInfoWithGraph(
       // Lookup the node in the graph by its original name, e.g. A. If not
       // found, lookup by the rewritten name A/(A) in case the name is both
       // a namespace and a node name.
-      let nodeName = nodeStats.node_name in graph.nodes ? nodeStats.node_name :
-                                                          nodeStats.node_name +
-              NAMESPACE_DELIM + '(' + nodeStats.node_name + ')';
+      const nodeName = nodeStats.node_name in graph.nodes ?
+          nodeStats.node_name :
+          getStrictName(nodeStats.node_name);
 
       // Couldn't find a matching node.
       if (!(nodeName in graph.nodes)) {
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts b/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
index af3030197e..5b546e9dd3 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
@@ -33,6 +33,12 @@ suite('graph', () => {
         op: "MatMul"
         input: "Q:2"
         input: "W"
+      }
+      node {
+        name: "XX/YY/(YY)"
+        op: "MatMul"
+        input: "Q:2"
+        input: "W"
       }`);
     let statsPbtxt = tf.graph.test.util.stringToArrayBuffer(`step_stats {
       dev_stats {
@@ -47,6 +53,11 @@ suite('graph', () => {
           all_start_micros: 12
           all_end_rel_micros: 4
         }
+        node_stats {
+          node_name: "XX/YY"
+          all_start_micros: 20
+          all_end_rel_micros: 4
+        }
       }
     }`);
 
@@ -64,6 +75,7 @@ suite('graph', () => {
             assert.isTrue(slimGraph.nodes['X'] != null);
             assert.isTrue(slimGraph.nodes['W'] != null);
             assert.isTrue(slimGraph.nodes['Q'] != null);
+            assert.isTrue(slimGraph.nodes['XX/YY(YY)'] != null);
 
             let firstInputOfX = slimGraph.nodes['X'].inputs[0];
             assert.equal(firstInputOfX.name, 'Q');
@@ -76,6 +88,8 @@ suite('graph', () => {
             tf.graph.parser.parseStatsPbTxt(statsPbtxt).then(stepStats => {
               tf.graph.joinStatsInfoWithGraph(slimGraph, stepStats);
               assert.equal(slimGraph.nodes['Q'].stats.getTotalMicros(), 6);
+              assert.equal(
+                  slimGraph.nodes['XX/YY/(YY)'].stats.getTotalMicros(), 4);
               done();
             });
           });
-- 
GitLab


From 4343f75c9c077b6a9b394888e320fdabb94fd977 Mon Sep 17 00:00:00 2001
From: Elliot Saba <staticfloat@gmail.com>
Date: Sun, 14 May 2017 11:05:40 -0700
Subject: [PATCH 1333/1563] No longer use openjdk8 PPA in Dockerfile.devel
 (#9884)

* No longer use openjdk8 PPA in Dockerfile.devel

Ubuntu 16.04 has an openjdk8 package, so use that instead of a PPA with a backported version, which was a holdover from when the base image was ubuntu 14.04

* Make the same changes to Dockerfile.devel-gpu
---
 tensorflow/tools/docker/Dockerfile.devel     | 14 ++------------
 tensorflow/tools/docker/Dockerfile.devel-gpu | 14 ++------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index 9deca9d486..bf748f881b 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         unzip \
         zip \
         zlib1g-dev \
+        openjdk-8-jdk \
+        openjdk-8-jre-headless \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -46,18 +48,6 @@ COPY run_jupyter.sh /
 
 # Set up Bazel.
 
-# We need to add a custom PPA to pick up JDK8, since trusty doesn't
-# have an openjdk8 backport.  openjdk-r is maintained by a reliable contributor:
-# Matthias Klose (https://launchpad.net/~doko).  It will do until
-# we either update the base image beyond 14.04 or openjdk-8 is
-# finally backported to trusty; see e.g.
-#   https://bugs.launchpad.net/trusty-backports/+bug/1368094
-RUN add-apt-repository -y ppa:openjdk-r/ppa && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-8-jre-headless && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
 # Running bazel inside a `docker build` command causes trouble, cf:
 #   https://github.com/bazelbuild/bazel/issues/134
 # The easiest solution is to set up a bazelrc file forcing --batch.
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index fd0484f7d2..6b10c8603e 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         unzip \
         zip \
         zlib1g-dev \
+        openjdk-8-jdk \
+        openjdk-8-jre-headless \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -46,18 +48,6 @@ COPY run_jupyter.sh /
 
 # Set up Bazel.
 
-# We need to add a custom PPA to pick up JDK8, since trusty doesn't
-# have an openjdk8 backport.  openjdk-r is maintained by a reliable contributor:
-# Matthias Klose (https://launchpad.net/~doko).  It will do until
-# we either update the base image beyond 14.04 or openjdk-8 is
-# finally backported to trusty; see e.g.
-#   https://bugs.launchpad.net/trusty-backports/+bug/1368094
-RUN add-apt-repository -y ppa:openjdk-r/ppa && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-8-jre-headless && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
 # Running bazel inside a `docker build` command causes trouble, cf:
 #   https://github.com/bazelbuild/bazel/issues/134
 # The easiest solution is to set up a bazelrc file forcing --batch.
-- 
GitLab


From 383fd63a6586cc3d5463df0d3ec0c7f88a59674c Mon Sep 17 00:00:00 2001
From: David Norman <DavidNorman@users.noreply.github.com>
Date: Sun, 14 May 2017 19:15:16 +0100
Subject: [PATCH 1334/1563] Implement strided slice (stride > 2) in tf2xla
 (#9812)

* Implement strides > 1 in strided slice

* Adding comments and adjusting style as per review

* Update test to use all numeric types

* correct indentation
---
 tensorflow/compiler/tests/BUILD               |  13 ++
 tensorflow/compiler/tests/slice_ops_test.py   | 142 ++++++++++++++++++
 .../tf2xla/kernels/strided_slice_op.cc        |  36 ++++-
 3 files changed, 187 insertions(+), 4 deletions(-)
 create mode 100644 tensorflow/compiler/tests/slice_ops_test.py

diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD
index 4fd68a94a5..19f7ff8354 100644
--- a/tensorflow/compiler/tests/BUILD
+++ b/tensorflow/compiler/tests/BUILD
@@ -170,6 +170,19 @@ tf_xla_py_test(
     ],
 )
 
+tf_xla_py_test(
+    name = "slice_ops_test",
+    size = "small",
+    srcs = ["slice_ops_test.py"],
+    deps = [
+        ":xla_test",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:data_flow_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 tf_xla_py_test(
     name = "function_test",
     size = "small",
diff --git a/tensorflow/compiler/tests/slice_ops_test.py b/tensorflow/compiler/tests/slice_ops_test.py
new file mode 100644
index 0000000000..795885f830
--- /dev/null
+++ b/tensorflow/compiler/tests/slice_ops_test.py
@@ -0,0 +1,142 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for slicing."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.compiler.tests.xla_test import XLATestCase
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import googletest
+
+class SliceTest(XLATestCase):
+
+  def test1D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[10])
+        with self.test_scope():
+          o = array_ops.slice(i, [2], [4])
+        params = {
+          i: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([2, 3, 4, 5], result)
+
+  def test3D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[3, 3, 10])
+        with self.test_scope():
+          o = array_ops.slice(i, [1, 2, 2], [1, 1, 4])
+        params = {
+          i: [[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+               [9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+               [5, 3, 1, 7, 9, 2, 4, 6, 8, 0]],
+              [[5, 5, 5, 5, 5, 5, 5, 5, 5, 5],
+               [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+               [8, 7, 6, 5, 4, 3, 2, 1, 8, 7]],
+              [[7, 5, 7, 5, 7, 5, 7, 5, 7, 5],
+               [1, 2, 1, 2, 1, 2, 1, 2, 1, 2],
+               [9, 8, 7, 9, 8, 7, 9, 8, 7, 9]]]
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([[[6, 5, 4, 3]]], result)
+
+class StridedSliceTest(XLATestCase):
+
+  def test1D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [2], [6], [2])
+        params = {
+          i: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([2, 4], result)
+
+  def test1DNegtiveStride(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [6], [2], [-2])
+        params = {
+          i: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([6, 4], result)
+
+  def test3D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[3, 3, 10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [0, 2, 2], [2, 3, 6], [1, 1, 2])
+        params = {
+          i: [[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+               [9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+               [5, 3, 1, 7, 9, 2, 4, 6, 8, 0]],
+              [[5, 5, 5, 5, 5, 5, 5, 5, 5, 5],
+               [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+               [8, 7, 6, 5, 4, 3, 2, 1, 8, 7]],
+              [[7, 5, 7, 5, 7, 5, 7, 5, 7, 5],
+               [1, 2, 1, 2, 1, 2, 1, 2, 1, 2],
+               [9, 8, 7, 9, 8, 7, 9, 8, 7, 9]]]
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([[[1, 9]],
+                             [[6, 4]]], result)
+
+  def test3DNegativeStride(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[3, 4, 10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [2, 2, 6], [0, 0, 2], [-1, -1, -2])
+        params = {
+          i: [[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+               [9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+               [5, 3, 1, 7, 9, 2, 4, 6, 8, 0],
+               [4, 5, 2, 4, 3, 7, 6, 8, 9, 4]],
+              [[5, 5, 5, 5, 5, 5, 5, 5, 5, 5],
+               [4, 3, 4, 5, 7, 6, 5, 3, 4, 5],
+               [8, 7, 6, 5, 4, 3, 2, 1, 8, 7],
+               [7, 1, 7, 1, 8, 1, 8, 1, 3, 1]],
+              [[7, 5, 7, 5, 7, 5, 7, 5, 7, 5],
+               [1, 2, 1, 2, 1, 2, 1, 2, 1, 2],
+               [9, 8, 7, 9, 8, 7, 9, 8, 7, 9],
+               [9, 9, 5, 5, 6, 6, 3, 3, 6, 6]]]
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([[[9, 8],
+                              [1, 1]],
+                             [[2, 4],
+                              [5, 7]]], result)
+
+if __name__ == "__main__":
+  googletest.main()
diff --git a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
index 03e02299e3..bbe157bbea 100644
--- a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
+++ b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
@@ -77,11 +77,9 @@ class StridedSliceOp : public XlaOpKernel {
 
     gtl::InlinedVector<int64, 4> dimensions_to_reverse;
     gtl::InlinedVector<int64, 4> slice_begin, slice_end;
+    bool simple_strides = true;
     for (int i = 0; i < begin.size(); ++i) {
-      // TODO(phawkins): implement strides != 1 when b/30878775 is fixed.
-      OP_REQUIRES(
-          ctx, strides[i] == 1 || strides[i] == -1,
-          errors::Unimplemented("Strides != 1 or -1 are not yet implemented"));
+      simple_strides &= (std::abs(strides[i]) == 1);
       if (strides[i] > 0) {
         slice_begin.push_back(begin[i]);
         slice_end.push_back(end[i]);
@@ -99,6 +97,36 @@ class StridedSliceOp : public XlaOpKernel {
       slice = ctx->builder()->Rev(slice, dimensions_to_reverse);
     }
 
+    // If at least one of the strides is > 1 (or < -1) then use Slice
+    // to pull out each of the strided slices, and Concat to put them
+    // together again.
+    if (!simple_strides) {
+
+      // Re-adjust the begin and end now that the periphery has been
+      // sliced away.
+      for (int d = 0; d < strides.size(); ++d) {
+        slice_end[d] -= slice_begin[d];
+        slice_begin[d] = 0;
+      }
+
+      for (int d = 0; d < strides.size(); ++d) {
+        int64 stride = std::abs(strides[d]);
+        if (stride > 1) {
+          std::vector<xla::ComputationDataHandle> to_concat;
+          int64 end = slice_end[d];
+          for (int64 i = 0; i < end; i += stride) {
+            slice_begin[d] = i;
+            slice_end[d] = i+1;
+            to_concat.push_back(ctx->builder()->Slice(slice, slice_begin,
+                                                      slice_end));
+          }
+          slice = ctx->builder()->ConcatInDim(to_concat, d);
+          slice_begin[d] = 0;
+          slice_end[d] = to_concat.size();
+        }
+      }
+    }
+
     slice = ctx->builder()->Reshape(slice, final_shape.dim_sizes());
     ctx->SetOutput(0, slice);
   }
-- 
GitLab


From a8271ea7e5cc416903e8eb58c0bb8040d784902b Mon Sep 17 00:00:00 2001
From: KB Sriram <kbsriram@gmail.com>
Date: Sun, 14 May 2017 15:20:38 -0700
Subject: [PATCH 1335/1563] Add control input dependency to Java bindings
 (#9815)

* Add control input dependency to Java bindings

Add a builder method to OperationBuilder to allow adding
control inputs to Operations.

* Simplify test, inline call and improve javadoc
---
 .../java/org/tensorflow/OperationBuilder.java | 27 ++++++++++++++++++
 .../src/main/native/operation_builder_jni.cc  | 14 ++++++++++
 .../src/main/native/operation_builder_jni.h   |  8 ++++++
 .../org/tensorflow/OperationBuilderTest.java  | 28 +++++++++++++++++++
 4 files changed, 77 insertions(+)

diff --git a/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java b/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java
index cd59cf504a..8f2b936eb0 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java
@@ -73,6 +73,31 @@ public final class OperationBuilder {
     return this;
   }
 
+  /**
+   * Ensure that the operation does not execute before the control operation does.
+   *
+   * <p>A control input is an Operation that must be executed before
+   * running the operation currently being built.
+   *
+   * <p>For example, an Assert operation may be added as a control
+   * input for this operation. The Assert now behaves as a
+   * pre-condition that will always verify itself before running the
+   * operation.
+   *
+   * @param control operation that must be executed before running this
+   *     operation.
+   * @return the OperationBuilder instance for chaining.
+   */
+  public OperationBuilder addControlInput(Operation control) {
+    Graph.Reference r = graph.ref();
+    try {
+      addControlInput(unsafeNativeHandle, control.getUnsafeNativeHandle());
+    } finally {
+      r.close();
+    }
+    return this;
+  }
+
   public OperationBuilder addInputList(Output[] inputs) {
     Graph.Reference r = graph.ref();
     try {
@@ -244,6 +269,8 @@ public final class OperationBuilder {
 
   private static native void addInputList(long handle, long[] opHandles, int[] indices);
 
+  private static native void addControlInput(long handle, long opHandle);
+
   private static native void setDevice(long handle, String device);
 
   // The names of all the setAttr* family functions below correspond to the C library types, not the
diff --git a/tensorflow/java/src/main/native/operation_builder_jni.cc b/tensorflow/java/src/main/native/operation_builder_jni.cc
index 5724c54f91..4c54eecd9b 100644
--- a/tensorflow/java/src/main/native/operation_builder_jni.cc
+++ b/tensorflow/java/src/main/native/operation_builder_jni.cc
@@ -115,6 +115,20 @@ JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addInputList(
   TF_AddInputList(d, o.get(), n);
 }
 
+JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addControlInput(
+    JNIEnv* env, jclass clazz, jlong handle, jlong op_handle) {
+  if (op_handle == 0) {
+    throwException(env, kIllegalStateException,
+                   "control input is not valid, "
+                   "perhaps the Graph containing it has been closed()?");
+    return;
+  }
+  TF_Operation* control = reinterpret_cast<TF_Operation*>(op_handle);
+  TF_OperationDescription* d = requireHandle(env, handle);
+  if (d == nullptr) return;
+  TF_AddControlInput(d, control);
+}
+
 JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_setDevice(
     JNIEnv* env, jclass clazz, jlong handle, jstring device) {
   TF_OperationDescription* d = requireHandle(env, handle);
diff --git a/tensorflow/java/src/main/native/operation_builder_jni.h b/tensorflow/java/src/main/native/operation_builder_jni.h
index ae953c0fd6..9b64c32820 100644
--- a/tensorflow/java/src/main/native/operation_builder_jni.h
+++ b/tensorflow/java/src/main/native/operation_builder_jni.h
@@ -55,6 +55,14 @@ JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addInput(
 JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addInputList(
     JNIEnv *, jclass, jlong, jlongArray, jintArray);
 
+/*
+ * Class:     org_tensorflow_OperationBuilder
+ * Method:    addControlInput
+ * Signature: (JJ)V
+ */
+JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addControlInput(
+    JNIEnv *, jclass, jlong, jlong);
+
 /*
  * Class:     org_tensorflow_OperationBuilder
  * Method:    setDevice
diff --git a/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java b/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
index 951136180d..6b141587b8 100644
--- a/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
+++ b/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
@@ -149,6 +149,34 @@ public class OperationBuilderTest {
     }
   }
 
+  @Test
+  public void addControlInput() {
+    try (Graph g = new Graph();
+         Session s = new Session(g);
+         Tensor yes = Tensor.create(true);
+         Tensor no = Tensor.create(false)) {
+      Output placeholder = TestUtil.placeholder(g, "boolean", DataType.BOOL);
+      Operation check = g.opBuilder("Assert", "assert")
+          .addInput(placeholder)
+          .addInputList(new Output[]{placeholder})
+          .build();
+      Operation noop = g.opBuilder("NoOp", "noop")
+          .addControlInput(check)
+          .build();
+
+      // No problems when the Assert check succeeds
+      s.runner().feed(placeholder, yes).addTarget(noop).run();
+
+      // Exception thrown by the execution of the Assert node
+      try {
+        s.runner().feed(placeholder, no).addTarget(noop).run();
+        fail("Did not run control operation.");
+      } catch (IllegalArgumentException e) {
+        // expected
+      }
+    }
+  }
+
   private static boolean hasNode(Graph g, String name) {
     return g.operation(name) != null;
   }
-- 
GitLab


From 45f4d963f218340cdc3620a9fc0350655023f87d Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Sun, 14 May 2017 19:31:26 -0700
Subject: [PATCH 1336/1563] Automated g4 rollback of changelist 155305963

PiperOrigin-RevId: 156011931
---
 .../compiler/xla/service/gpu/gpu_compiler.cc  | 62 +++++++------------
 .../compiler/xla/service/gpu/gpu_compiler.h   |  1 -
 .../xla/service/gpu/gpu_executable.cc         | 13 +---
 .../compiler/xla/service/gpu/gpu_executable.h | 19 +++---
 .../compiler/xla/service/gpu/kernel_thunk.cc  |  9 ++-
 5 files changed, 37 insertions(+), 67 deletions(-)

diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index af5cf8ca4b..dc3a289a71 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -188,52 +188,41 @@ tensorflow::Status PrepareHloModuleForIrEmitting(
   return pipeline.Run(hlo_module).status();
 }
 
-// Invokes the ptxas tool on the given PTX string, and stores the resulting
-// SASS in *cubin. If -v 2 or greater, runs ptxas with -v and dumps the
-// resulting stderr (which contains register allocation info, etc.)
-// to VLOG(2). If ptxas binary is not found *sass is set to "".
-Status CompilePTX(const string& ptx, int cc_major, int cc_minor,
-                  string* cubin) {
-  *cubin = "";
-
+// Invokes the ptxas tool on the given PTX string, and dumps its output.
+void DumpPtxasInfo(const string& ptx) {
   const string ptxas_path =
       tensorflow::io::JoinPath(tensorflow::CudaRoot(), "bin/ptxas");
-
   // Do not log PTX stats if ptxas is not found at the given path.
-  LOG(INFO) << "Invoking ptxas at path \"" << ptxas_path << "\".";
-  TF_RETURN_IF_ERROR(tensorflow::Env::Default()->FileExists(ptxas_path));
+  if (!tensorflow::Env::Default()->FileExists(ptxas_path).ok()) {
+    LOG(WARNING)
+        << "Failed to dump PTX stats because ptxas is not found at path \""
+        << ptxas_path << "\".";
+    return;
+  }
 
   // Write `ptx` into a temporary file.
   char tempdir_template[] = "/tmp/ptxXXXXXX";
   char* tempdir_name = mkdtemp(tempdir_template);
   CHECK_NOTNULL(tempdir_name);
   string ptx_path = tensorflow::io::JoinPath(tempdir_name, "ptx");
-
   TF_CHECK_OK(
       tensorflow::WriteStringToFile(tensorflow::Env::Default(), ptx_path, ptx));
   LOG(INFO) << "ptx file written to: " << ptx_path;
 
   // Invoke ptxas and collect its output.
-  tensorflow::SubProcess ptxas_info;
-  string arch = tensorflow::strings::StrCat("sm_", cc_major, cc_minor);
-  string cubin_path = tensorflow::io::JoinPath(tempdir_name, "cubin");
-
-  if (VLOG_IS_ON(2)) {
-    ptxas_info.SetProgram(ptxas_path, {ptxas_path, "-v", "-o", cubin_path,
-                                       "-arch", arch, ptx_path});
-  } else {
-    ptxas_info.SetProgram(
-        ptxas_path, {ptxas_path, "-o", cubin_path, "-arch", arch, ptx_path});
-  }
-  ptxas_info.SetChannelAction(tensorflow::CHAN_STDERR, tensorflow::ACTION_PIPE);
-  CHECK(ptxas_info.Start());
+  tensorflow::SubProcess ptxas_info_dumper;
+  ptxas_info_dumper.SetProgram(ptxas_path, {ptxas_path, ptx_path, "-o",
+                                            "/dev/null", "-v", "-arch=sm_35"});
+  ptxas_info_dumper.SetChannelAction(tensorflow::CHAN_STDERR,
+                                     tensorflow::ACTION_PIPE);
+  CHECK(ptxas_info_dumper.Start());
   string stderr_output;
-  int ptxas_exit_status = ptxas_info.Communicate(
+  int exit_status = ptxas_info_dumper.Communicate(
       /*stdin_input=*/nullptr, /*stdout_output=*/nullptr, &stderr_output);
-
-  TF_RET_CHECK(ptxas_exit_status == 0);
-  return tensorflow::ReadFileToString(tensorflow::Env::Default(), cubin_path,
-                                      cubin);
+  XLA_LOG_LINES(tensorflow::INFO, stderr_output);
+  if (exit_status != 0) {
+    LOG(FATAL) << "Invalid PTX. See the error message above for reasons.";
+  }
 }
 
 }  // namespace
@@ -309,14 +298,10 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
 
   // Reserve space for the PTX to be generated for this module.
   string* ptx;
-  string* cubin;
   {
     tensorflow::mutex_lock lock(mutex_);
     generated_ptxes_.emplace_back(MakeUnique<string>());
     ptx = generated_ptxes_.back().get();
-
-    generated_cubins_.emplace_back(MakeUnique<string>());
-    cubin = generated_cubins_.back().get();
   }
   int cc_major, cc_minor;
   if (!stream_exec->GetDeviceDescription().cuda_compute_capability(&cc_major,
@@ -333,6 +318,9 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
   XLA_VLOG_LINES(2, llvm_ir::DumpModuleToString(llvm_module));
   VLOG(2) << "PTX:";
   XLA_VLOG_LINES(2, *ptx);
+  if (VLOG_IS_ON(2)) {
+    DumpPtxasInfo(*ptx);
+  }
 
   auto thunk_schedule = MakeUnique<ThunkSchedule>(
       ir_emitter.ConsumeThunkSequence(), std::move(stream_assignment),
@@ -340,13 +328,9 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
   VLOG(2) << "Printing the thunk schedule...";
   XLA_VLOG_LINES(2, thunk_schedule->ToString());
 
-  TF_RET_CHECK(CompilePTX(*ptx, cc_major, cc_minor, cubin).ok());
-
   auto* gpu_executable =
-      new GpuExecutable(*cubin, *ptx, {cc_major, cc_minor},
-                        std::move(thunk_schedule), std::move(hlo_module),
+      new GpuExecutable(*ptx, std::move(thunk_schedule), std::move(hlo_module),
                         std::move(module_config), std::move(buffer_assignment));
-
   if (flags->xla_gpu_embed_ir) {
     DCHECK_NE("", ir_module_string_before_opt);
     gpu_executable->set_ir_module_string(ir_module_string_before_opt);
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.h b/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
index 99c7ba5199..22f492b422 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
@@ -71,7 +71,6 @@ class GpuCompiler : public Compiler {
   // StreamExecutor (b/24776264).
   tensorflow::mutex mutex_;
   std::vector<std::unique_ptr<string>> generated_ptxes_ GUARDED_BY(mutex_);
-  std::vector<std::unique_ptr<string>> generated_cubins_ GUARDED_BY(mutex_);
 
   // The size in bytes of a pointer. Used for computing ShapeSizeBytes.
   int64 pointer_size_;
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_executable.cc b/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
index b4b788162f..32f0368b4b 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
@@ -107,17 +107,13 @@ class HloExecutionProfiler {
 
 // Implementation note: HLO profiling is always enabled for GPU executables,
 // since we can use timers around thunks.
-GpuExecutable::GpuExecutable(tensorflow::StringPiece cubin,
-                             tensorflow::StringPiece ptx,
-                             std::pair<int, int> compute_capability,
+GpuExecutable::GpuExecutable(tensorflow::StringPiece ptx,
                              std::unique_ptr<ThunkSchedule> thunk_schedule,
                              std::unique_ptr<HloModule> hlo_module,
                              std::unique_ptr<HloModuleConfig> module_config,
                              std::unique_ptr<BufferAssignment> assignment)
     : Executable(std::move(hlo_module), std::move(module_config)),
-      cubin_(cubin),
       ptx_(ptx),
-      compute_capability_(compute_capability),
       thunk_schedule_(std::move(thunk_schedule)),
       assignment_(std::move(assignment)) {}
 
@@ -190,13 +186,6 @@ StatusOr<se::DeviceMemoryBase> GpuExecutable::ExecuteOnStream(
   // false.
   TF_RET_CHECK(!module_config().has_hybrid_result());
 
-  // Ensure the compute capability of the cubin and the stream match.
-  std::pair<int, int> stream_compute_compatibility;
-  stream->parent()->GetDeviceDescription().cuda_compute_capability(
-      &stream_compute_compatibility.first,
-      &stream_compute_compatibility.second);
-  TF_RET_CHECK(stream_compute_compatibility == compute_capability_);
-
   BufferAllocations::Builder buffer_allocations_builder;
   for (BufferAllocation::Index i = 0; i < assignment_->Allocations().size();
        ++i) {
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_executable.h b/tensorflow/compiler/xla/service/gpu/gpu_executable.h
index 09a92c4e4c..e308de79ba 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_executable.h
+++ b/tensorflow/compiler/xla/service/gpu/gpu_executable.h
@@ -40,17 +40,15 @@ limitations under the License.
 
 namespace xla {
 namespace gpu {
+
 // GPU-targeting implementation of the XLA Executable interface.
 //
 // Launches the given CUDA kernel via the StreamExecutor.
-
-// GPUExecutable should eventually be updated to associate a compute
-// capability with the PTX and store multiple cubins, each with their own
-// associated CC's, rather than including CC as a property of GpuExecutable.
+//
+// This is an immutable data type after initialization, and thus thread safe.
 class GpuExecutable : public Executable {
  public:
-  GpuExecutable(tensorflow::StringPiece cubin, tensorflow::StringPiece ptx,
-                std::pair<int, int> compute_capability,
+  GpuExecutable(tensorflow::StringPiece ptx,
                 std::unique_ptr<ThunkSchedule> thunk_schedule,
                 std::unique_ptr<HloModule> hlo_module,
                 std::unique_ptr<HloModuleConfig> module_config,
@@ -64,8 +62,7 @@ class GpuExecutable : public Executable {
     ir_module_string_ = ir_module_string;
   }
 
-  // Returns the compiled CUDA binary for the computation.
-  tensorflow::StringPiece cubin() const { return cubin_; }
+  // Returns the compiled PTX for the computation.
   tensorflow::StringPiece ptx() const { return ptx_; }
 
   StatusOr<perftools::gputools::DeviceMemoryBase> ExecuteOnStream(
@@ -107,10 +104,8 @@ class GpuExecutable : public Executable {
   // This string should be modified only before ExecuteOnStream.
   string ir_module_string_;
 
-  // The reference to the compiled PTX & CUDA binary for the computation.
-  tensorflow::StringPiece cubin_;
-  tensorflow::StringPiece ptx_;
-  std::pair<int, int> compute_capability_;
+  // The reference to the compiled PTX for the computation.
+  const tensorflow::StringPiece ptx_;
 
   // The thunks to be invoked by this GpuExecutable. They are generated by the
   // IrEmitter.
diff --git a/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc b/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc
index 48ccc63f3d..69399e36c4 100644
--- a/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc
+++ b/tensorflow/compiler/xla/service/gpu/kernel_thunk.cc
@@ -41,10 +41,13 @@ tensorflow::Status KernelThunk::Initialize(const GpuExecutable& executable) {
     // Already initialized by another thread.
     return tensorflow::Status::OK();
   }
-  loader_spec_.reset(new se::MultiKernelLoaderSpec(io_buffers_.size() + 1));
 
-  tensorflow::StringPiece cubin = executable.cubin();
-  loader_spec_->AddCudaCubinInMemory(cubin.data(), kernel_name_);
+  loader_spec_.reset(new se::MultiKernelLoaderSpec(io_buffers_.size() + 1));
+  tensorflow::StringPiece ptx = executable.ptx();
+  // Convert tensorflow::StringPiece to se::port::StringPiece because
+  // StreamExecutor uses the latter.
+  loader_spec_->AddCudaPtxInMemory(
+      se::port::StringPiece(ptx.data(), ptx.size()), kernel_name_);
   return tensorflow::Status::OK();
 }
 
-- 
GitLab


From 114d8ba25ff2e245f15fd7e82f427531b874b168 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Sun, 14 May 2017 22:12:14 -0700
Subject: [PATCH 1337/1563] Made TensorBoard frontend request health pills
 under the __debugger_data__ run, the run specially designated for events
 related to debugger data.

PiperOrigin-RevId: 156017693
---
 tensorflow/tensorboard/components/tf_backend/backend.ts    | 7 ++++++-
 .../tensorboard/components/tf_backend_d3v4/backend.ts      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_backend/backend.ts b/tensorflow/tensorboard/components/tf_backend/backend.ts
index 54d89a6bbb..befa6991dd 100644
--- a/tensorflow/tensorboard/components/tf_backend/backend.ts
+++ b/tensorflow/tensorboard/components/tf_backend/backend.ts
@@ -226,7 +226,12 @@ module TF.Backend {
      */
     public healthPills(nodeNames: string[], step?: number):
         Promise<HealthPillsResponse> {
-      let postData = {'node_names': JSON.stringify(nodeNames)};
+      const postData = {
+        'node_names': JSON.stringify(nodeNames),
+
+        // Events files with debugger data fall under this special run.
+        'run': '__debugger_data__',
+      };
       if (step !== undefined) {
         // The user requested health pills for a specific step. This request
         // might be slow since the backend reads events sequentially from disk.
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts
index 2f3b561d87..2e1282394b 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/backend.ts
@@ -236,7 +236,12 @@ export class Backend {
    */
   public healthPills(nodeNames: string[], step?: number):
       Promise<HealthPillsResponse> {
-    const postData = {'node_names': JSON.stringify(nodeNames)};
+    const postData = {
+      'node_names': JSON.stringify(nodeNames),
+
+      // Events files with debugger data fall under this special run.
+      'run': '__debugger_data__',
+    };
     if (step !== undefined) {
       // The user requested health pills for a specific step. This request
       // might be slow since the backend reads events sequentially from disk.
-- 
GitLab


From 2b90ef158b9dd07b71453f3254a6a8a16501cdfa Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 04:03:31 -0700
Subject: [PATCH 1338/1563] Fix importing a scoped metagraph into a graph that
 has an active name scope.

PiperOrigin-RevId: 156038375
---
 tensorflow/python/framework/meta_graph.py      | 13 ++++++++-----
 tensorflow/python/framework/meta_graph_test.py | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/framework/meta_graph.py b/tensorflow/python/framework/meta_graph.py
index 7b13fcfbdf..783612c942 100644
--- a/tensorflow/python/framework/meta_graph.py
+++ b/tensorflow/python/framework/meta_graph.py
@@ -503,6 +503,9 @@ def import_scoped_meta_graph(meta_graph_or_file,
         input_graph_def, name=(import_scope or ""), input_map=input_map,
         producer_op_list=producer_op_list)
 
+    scope_to_prepend_to_names = "/".join(
+        [part for part in [graph.get_name_scope(), import_scope] if part])
+
     # Restores all the other collections.
     for key, col_def in meta_graph_def.collection_def.items():
       # Don't add unbound_inputs to the new graph.
@@ -524,13 +527,13 @@ def import_scoped_meta_graph(meta_graph_or_file,
           proto = proto_type()
           proto.ParseFromString(value)
           graph.add_to_collection(
-              key, from_proto(proto, import_scope=import_scope))
+              key, from_proto(proto, import_scope=scope_to_prepend_to_names))
       else:
         field = getattr(col_def, kind)
         if kind == "node_list":
           for value in field.value:
             col_op = graph.as_graph_element(
-                ops.prepend_name_scope(value, import_scope))
+                ops.prepend_name_scope(value, scope_to_prepend_to_names))
             graph.add_to_collection(key, col_op)
         elif kind == "int64_list":
           # NOTE(opensource): This force conversion is to work around the fact
@@ -541,13 +544,13 @@ def import_scoped_meta_graph(meta_graph_or_file,
         else:
           for value in field.value:
             graph.add_to_collection(
-                key, ops.prepend_name_scope(value, import_scope))
+                key, ops.prepend_name_scope(value, scope_to_prepend_to_names))
 
     var_list = {}
     variables = graph.get_collection(ops.GraphKeys.GLOBAL_VARIABLES,
-                                     scope=import_scope)
+                                     scope=scope_to_prepend_to_names)
     for v in variables:
-      var_list[ops.strip_name_scope(v.name, import_scope)] = v
+      var_list[ops.strip_name_scope(v.name, scope_to_prepend_to_names)] = v
 
   return var_list
 
diff --git a/tensorflow/python/framework/meta_graph_test.py b/tensorflow/python/framework/meta_graph_test.py
index 49d5997784..6b9d2512cf 100644
--- a/tensorflow/python/framework/meta_graph_test.py
+++ b/tensorflow/python/framework/meta_graph_test.py
@@ -335,6 +335,20 @@ class ScopedMetaGraphTest(test.TestCase):
     for a, b in zip(orig_meta_graphs, new_meta_graphs):
       test_util.assert_meta_graph_protos_equal(self, a, b)
 
+  def testScopedImportUnderNameScope(self):
+    graph = ops.Graph()
+    with graph.as_default():
+      variables.Variable(initial_value=1.0, trainable=True, name="myvar")
+    meta_graph_def, _ = meta_graph.export_scoped_meta_graph(graph=graph)
+
+    graph = ops.Graph()
+    with graph.as_default():
+      with ops.name_scope("foo"):
+        imported_variables = meta_graph.import_scoped_meta_graph(
+            meta_graph_def, import_scope="bar")
+        self.assertEqual(len(imported_variables), 1)
+        self.assertEqual(imported_variables.values()[0].name, "foo/bar/myvar:0")
+
   def testScopedImportWithSelectedCollections(self):
     meta_graph_filename = os.path.join(
         _TestDir("selected_collections_import"), "meta_graph.pb")
-- 
GitLab


From 68d198ee4999a8661a3249b15d108b08b0da8811 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 06:12:46 -0700
Subject: [PATCH 1339/1563] Fixing issue with cuda configuration when cuda
 symlinked directories have a single file

PiperOrigin-RevId: 156046172
---
 third_party/gpus/cuda_configure.bzl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index 0fef94cf9c..6994db0a04 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -785,8 +785,10 @@ def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name,
   outs = []
   for i in range(len(dest_files)):
     if dest_files[i] != "":
-      command.append('ln -s ' + src_files[i] + ' $(@D)/' +
-                     dest_dir + dest_files[i])
+      # If we have only one file to link we do not want to use the dest_dir, as
+      # $(@D) will include the full path to the file.
+      dest = ' $(@D)/' + dest_dir + dest_files[i] if len(dest_files) != 1 else ' $(@D)' + dest_files[i]
+      command.append('ln -s ' + src_files[i] + dest)
       outs.append('      "' + dest_dir + dest_files[i] + '",')
   genrule = _genrule(src_dir, genrule_name, " && ".join(command),
                      "\n".join(outs))
-- 
GitLab


From a3f1377b3856dd7951afc8654d3f28c1477f4d8c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 07:53:51 -0700
Subject: [PATCH 1340/1563] Automated g4 rollback of changelist 155505438

PiperOrigin-RevId: 156053314
---
 tensorflow/tools/ci_build/Dockerfile.android  |  1 -
 tensorflow/tools/ci_build/Dockerfile.cpu      |  1 -
 .../ci_build/Dockerfile.debian.jessie.cpu     |  1 -
 tensorflow/tools/ci_build/Dockerfile.gpu      |  1 -
 .../tools/ci_build/Dockerfile.gpu_clang       |  1 -
 tensorflow/tools/ci_build/Dockerfile.hadoop   |  1 -
 tensorflow/tools/docker/Dockerfile.devel      |  2 -
 tensorflow/tools/docker/Dockerfile.devel-gpu  |  2 -
 third_party/py/python_configure.bzl           | 50 ++++++++++++++-----
 9 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android
index c420848423..c6679f7882 100644
--- a/tensorflow/tools/ci_build/Dockerfile.android
+++ b/tensorflow/tools/ci_build/Dockerfile.android
@@ -12,7 +12,6 @@ RUN /install/install_bazel.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
 
 # Install extra libraries for android sdk.
 RUN apt-get update && apt-get install -y \
diff --git a/tensorflow/tools/ci_build/Dockerfile.cpu b/tensorflow/tools/ci_build/Dockerfile.cpu
index fcff9a11e4..206108930a 100644
--- a/tensorflow/tools/ci_build/Dockerfile.cpu
+++ b/tensorflow/tools/ci_build/Dockerfile.cpu
@@ -17,4 +17,3 @@ RUN /install/install_golang.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
diff --git a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
index b6b580e013..b914f51918 100644
--- a/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
+++ b/tensorflow/tools/ci_build/Dockerfile.debian.jessie.cpu
@@ -24,4 +24,3 @@ RUN pip install --upgrade virtualenv
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu b/tensorflow/tools/ci_build/Dockerfile.gpu
index 3d248345bb..68493965fa 100644
--- a/tensorflow/tools/ci_build/Dockerfile.gpu
+++ b/tensorflow/tools/ci_build/Dockerfile.gpu
@@ -19,7 +19,6 @@ RUN /install/install_golang.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
 ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
 
 # Configure the build for our CUDA configuration.
diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu_clang b/tensorflow/tools/ci_build/Dockerfile.gpu_clang
index 11a70953e6..00aaa9f760 100644
--- a/tensorflow/tools/ci_build/Dockerfile.gpu_clang
+++ b/tensorflow/tools/ci_build/Dockerfile.gpu_clang
@@ -27,7 +27,6 @@ RUN /install/build_and_install_clang.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
 ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
 
 # Configure the build for our CUDA configuration.
diff --git a/tensorflow/tools/ci_build/Dockerfile.hadoop b/tensorflow/tools/ci_build/Dockerfile.hadoop
index c55c460e52..489493c26e 100644
--- a/tensorflow/tools/ci_build/Dockerfile.hadoop
+++ b/tensorflow/tools/ci_build/Dockerfile.hadoop
@@ -16,4 +16,3 @@ RUN /install/install_hadoop.sh
 
 # Set up the master bazelrc configuration file.
 COPY install/.bazelrc /etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index 9deca9d486..a0e0f88d9d 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -66,8 +66,6 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
 #   https://github.com/bazelbuild/bazel/issues/418
 RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
     >>/etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
-
 # Install the most recent bazel release.
 ENV BAZEL_VERSION 0.4.5
 WORKDIR /
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index fd0484f7d2..743c05ef88 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -66,8 +66,6 @@ RUN echo "startup --batch" >>/etc/bazel.bazelrc
 #   https://github.com/bazelbuild/bazel/issues/418
 RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
     >>/etc/bazel.bazelrc
-RUN echo "import %workspace%/.tf_configure.bazelrc" >> /etc/bazel.bazelrc
-
 # Install the most recent bazel release.
 ENV BAZEL_VERSION 0.4.5
 WORKDIR /
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index c453645db5..b2d0e250e7 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -149,6 +149,39 @@ def _genrule(src_dir, genrule_name, command, outs):
   )
 
 
+def _get_python_lib(repository_ctx, python_bin):
+  """Gets the python lib path."""
+  print_lib = ("<<END\n" +
+      "from __future__ import print_function\n" +
+      "import site\n" +
+      "import os\n" +
+      "\n" +
+      "try:\n" +
+      "  input = raw_input\n" +
+      "except NameError:\n" +
+      "  pass\n" +
+      "\n" +
+      "python_paths = []\n" +
+      "if os.getenv('PYTHONPATH') is not None:\n" +
+      "  python_paths = os.getenv('PYTHONPATH').split(':')\n" +
+      "try:\n" +
+      "  library_paths = site.getsitepackages()\n" +
+      "except AttributeError:\n" +
+      " from distutils.sysconfig import get_python_lib\n" +
+      " library_paths = [get_python_lib()]\n" +
+      "all_paths = set(python_paths + library_paths)\n" +
+      "paths = []\n" +
+      "for path in all_paths:\n" +
+      "  if os.path.isdir(path):\n" +
+      "    paths.append(path)\n" +
+      "if len(paths) >=1:\n" +
+      "  print(paths[0])\n" +
+      "END")
+  cmd = '%s - %s' % (python_bin, print_lib)
+  result = repository_ctx.execute(["bash", "-c", cmd])
+  return result.stdout.strip('\n')
+
+
 def _check_python_lib(repository_ctx, python_lib):
   """Checks the python lib path."""
   cmd = 'test -d "%s" -a -x "%s"' % (python_lib, python_lib)
@@ -201,19 +234,10 @@ def _create_local_python_repository(repository_ctx):
   if repository_ctx.attr.local_checks:
     python_bin = _get_env_var(repository_ctx, _PYTHON_BIN_PATH)
     _check_python_bin(repository_ctx, python_bin)
-    python_lib = _get_env_var(repository_ctx, _PYTHON_LIB_PATH, '')
-    if python_lib == '':
-      # If we could not find the python lib we will create an empty config that
-      # will allow non-compilation targets to build correctly (e.g., smoke
-      # tests).
-      empty_config = True
-      _python_configure_warning('PYTHON_LIB_PATH was not set;' +
-                                ' python setup cannot complete successfully.' +
-                                ' Please run ./configure.')
-    else:
-      _check_python_lib(repository_ctx, python_lib)
-      python_include = _get_python_include(repository_ctx, python_bin)
-      numpy_include = _get_numpy_include(repository_ctx, python_bin) + '/numpy'
+    python_lib = _get_env_var(repository_ctx, _PYTHON_LIB_PATH, _get_python_lib(repository_ctx, python_bin))
+    _check_python_lib(repository_ctx, python_lib)
+    python_include = _get_python_include(repository_ctx, python_bin)
+    numpy_include = _get_numpy_include(repository_ctx, python_bin) + '/numpy'
   else:
     # Otherwise, we assume user provides all paths (via ENV or attrs)
     python_include = _get_env_var(repository_ctx, _PYTHON_INCLUDE_PATH,
-- 
GitLab


From 6d43171b4169c1e41bdb98275cd629005c89cb4e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 08:57:14 -0700
Subject: [PATCH 1341/1563] Fix type error: convert "view" to "list" for
 indexing.

PiperOrigin-RevId: 156059413
---
 tensorflow/python/framework/meta_graph_test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/framework/meta_graph_test.py b/tensorflow/python/framework/meta_graph_test.py
index 6b9d2512cf..10236576ea 100644
--- a/tensorflow/python/framework/meta_graph_test.py
+++ b/tensorflow/python/framework/meta_graph_test.py
@@ -347,7 +347,8 @@ class ScopedMetaGraphTest(test.TestCase):
         imported_variables = meta_graph.import_scoped_meta_graph(
             meta_graph_def, import_scope="bar")
         self.assertEqual(len(imported_variables), 1)
-        self.assertEqual(imported_variables.values()[0].name, "foo/bar/myvar:0")
+        self.assertEqual(list(imported_variables.values())[0].name,
+                         "foo/bar/myvar:0")
 
   def testScopedImportWithSelectedCollections(self):
     meta_graph_filename = os.path.join(
-- 
GitLab


From 28b732d618fac7692b53af3680b408b464356c98 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 09:25:14 -0700
Subject: [PATCH 1342/1563] Refactor core/BUILD dependencies to avoid circular
 dependency with grappler.

Remove grappler from android_srcs.

PiperOrigin-RevId: 156062586
---
 tensorflow/core/BUILD                         | 176 ++++++++++++++----
 .../simple_graph_execution_state.cc           |  14 +-
 tensorflow/core/grappler/BUILD                |  25 ---
 tensorflow/core/grappler/clusters/BUILD       |  18 --
 tensorflow/core/grappler/costs/BUILD          |   6 +-
 tensorflow/core/grappler/inputs/BUILD         |  16 --
 tensorflow/core/grappler/optimizers/BUILD     |  26 +--
 tensorflow/core/grappler/utils/BUILD          |  15 --
 8 files changed, 161 insertions(+), 135 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index c361bb5370..a0d56df4aa 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -854,7 +854,6 @@ filegroup(
         "//tensorflow/core/platform/default/build_config:android_srcs",
         "//tensorflow/core/util/ctc:android_srcs",
         "//tensorflow/core/util/tensor_bundle:android_srcs",
-        "//tensorflow/core/grappler:android_srcs",
         "common_runtime/gpu/gpu_tracer.cc",
         "common_runtime/gpu/gpu_tracer.h",
     ] + glob(
@@ -1492,42 +1491,153 @@ cc_library(
     deps = ["//tensorflow/core/platform/default/build_config:protos_cc"],
 )
 
+CORE_CPU_BASE_HDRS = [
+    "common_runtime/device.h",
+    "common_runtime/graph_runner.h",
+    "common_runtime/shape_refiner.h",
+    "framework/versions.h",
+    "graph/algorithm.h",
+    "graph/colors.h",
+    "graph/control_flow.h",
+    "graph/costmodel.h",
+    "graph/default_device.h",
+    "graph/edgeset.h",
+    "graph/graph.h",
+    "graph/graph_constructor.h",
+    "graph/graph_def_builder.h",
+    "graph/graph_partition.h",
+    "graph/mkl_layout_pass.h",
+    "graph/mkl_tfconversion_pass.h",
+    "graph/node_builder.h",
+    "graph/optimizer_cse.h",
+    "graph/subgraph.h",
+    "graph/tensor_id.h",
+    "graph/testlib.h",
+    "graph/types.h",
+    "graph/validate.h",
+]
+
+tf_cuda_library(
+    name = "core_cpu_base",
+    srcs = [
+        "common_runtime/shape_refiner.cc",
+        "common_runtime/shape_refiner.h",
+        "framework/versions.h",
+        "graph/algorithm.cc",
+        "graph/colors.cc",
+        "graph/control_flow.cc",
+        "graph/costmodel.cc",
+        "graph/edgeset.cc",
+        "graph/graph.cc",
+        "graph/graph_constructor.cc",
+        "graph/graph_def_builder.cc",
+        "graph/graph_partition.cc",
+        "graph/mkl_layout_pass.cc",
+        "graph/mkl_tfconversion_pass.cc",
+        "graph/node_builder.cc",
+        "graph/optimizer_cse.cc",
+        "graph/subgraph.cc",
+        "graph/tensor_id.cc",
+        "graph/validate.cc",
+        "public/session.h",
+        "public/session_options.h",
+        "public/version.h",
+    ],
+    hdrs = CORE_CPU_BASE_HDRS,
+    copts = tf_copts(),
+    deps = [
+        ":framework",
+        ":framework_internal",
+        ":lib",
+        ":lib_internal",
+        ":proto_text",
+        ":protos_all_cc",
+        "//tensorflow/core/kernels:required",
+        "//third_party/eigen3",
+    ],
+    alwayslink = 1,
+)
+
 tf_cuda_library(
     name = "core_cpu_internal",
-    srcs = glob(
-        [
-            "client/**/*.cc",
-            "common_runtime/*.h",
-            "common_runtime/*.cc",
-            "framework/versions.h",
-            "graph/**/*.h",
-            "graph/**/*.cc",
-            "public/session.h",
-            "public/session_options.h",
-            "public/version.h",
-        ],
-        exclude = [
-            "**/*test*",
-            "**/*main.cc",
-            "common_runtime/direct_session.cc",
-            "common_runtime/direct_session.h",
-            "common_runtime/gpu_device_context.h",
-        ],
-    ),
-    hdrs = glob(
-        [
-            "common_runtime/*.h",
-            "framework/versions.h",
-            "graph/**/*.h",
-        ],
-        exclude = [
-            "**/*test*",
-            "common_runtime/direct_session.h",
-            "common_runtime/gpu_device_context.h",
-        ],
-    ),
+    srcs = [
+        "common_runtime/allocator_retry.cc",
+        "common_runtime/bfc_allocator.cc",
+        "common_runtime/build_graph_options.cc",
+        "common_runtime/constant_folding.cc",
+        "common_runtime/copy_tensor.cc",
+        "common_runtime/costmodel_manager.cc",
+        "common_runtime/debugger_state_interface.cc",
+        "common_runtime/device.cc",
+        "common_runtime/device_factory.cc",
+        "common_runtime/device_mgr.cc",
+        "common_runtime/device_set.cc",
+        "common_runtime/executor.cc",
+        "common_runtime/function.cc",
+        "common_runtime/graph_optimizer.cc",
+        "common_runtime/graph_runner.cc",
+        "common_runtime/local_device.cc",
+        "common_runtime/memory_types.cc",
+        "common_runtime/optimization_registry.cc",
+        "common_runtime/parallel_concat_optimizer.cc",
+        "common_runtime/process_util.cc",
+        "common_runtime/renamed_device.cc",
+        "common_runtime/rendezvous_mgr.cc",
+        "common_runtime/resource_variable_read_optimizer.cc",
+        "common_runtime/session.cc",
+        "common_runtime/session_factory.cc",
+        "common_runtime/session_options.cc",
+        "common_runtime/session_state.cc",
+        "common_runtime/simple_graph_execution_state.cc",
+        "common_runtime/simple_placer.cc",
+        "common_runtime/stats_publisher_interface.cc",
+        "common_runtime/step_stats_collector.cc",
+        "common_runtime/threadpool_device.cc",
+        "common_runtime/threadpool_device_factory.cc",
+        "graph/gradients.cc",
+        "graph/quantize_training.cc",
+        "public/session.h",
+        "public/session_options.h",
+        "public/version.h",
+    ],
+    hdrs = CORE_CPU_BASE_HDRS + [
+        "common_runtime/allocator_retry.h",
+        "common_runtime/bfc_allocator.h",
+        "common_runtime/build_graph_options.h",
+        "common_runtime/constant_folding.h",
+        "common_runtime/copy_tensor.h",
+        "common_runtime/costmodel_manager.h",
+        "common_runtime/debugger_state_interface.h",
+        "common_runtime/device_factory.h",
+        "common_runtime/device_mgr.h",
+        "common_runtime/device_set.h",
+        "common_runtime/dma_helper.h",
+        "common_runtime/eigen_thread_pool.h",
+        "common_runtime/executor.h",
+        "common_runtime/function.h",
+        "common_runtime/graph_optimizer.h",
+        "common_runtime/local_device.h",
+        "common_runtime/memory_types.h",
+        "common_runtime/mkl_cpu_allocator.h",
+        "common_runtime/optimization_registry.h",
+        "common_runtime/pending_counts.h",
+        "common_runtime/process_util.h",
+        "common_runtime/profile_handler.h",
+        "common_runtime/renamed_device.h",
+        "common_runtime/rendezvous_mgr.h",
+        "common_runtime/session_factory.h",
+        "common_runtime/simple_graph_execution_state.h",
+        "common_runtime/simple_placer.h",
+        "common_runtime/stats_publisher_interface.h",
+        "common_runtime/step_stats_collector.h",
+        "common_runtime/threadpool_device.h",
+        "common_runtime/visitable_allocator.h",
+        "graph/gradients.h",
+        "graph/quantize_training.h",
+    ],
     copts = tf_copts(),
     deps = [
+               ":core_cpu_base",
                ":framework",
                ":framework_internal",
                ":function_ops_op_lib",
diff --git a/tensorflow/core/common_runtime/simple_graph_execution_state.cc b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
index 590b5d47ba..47cf29d403 100644
--- a/tensorflow/core/common_runtime/simple_graph_execution_state.cc
+++ b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
@@ -29,10 +29,6 @@ limitations under the License.
 #include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/graph/subgraph.h"
 #include "tensorflow/core/graph/validate.h"
-#include "tensorflow/core/grappler/clusters/utils.h"
-#include "tensorflow/core/grappler/clusters/virtual_cluster.h"
-#include "tensorflow/core/grappler/grappler_item.h"
-#include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
@@ -41,6 +37,13 @@ limitations under the License.
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/util/util.h"
 
+#ifndef IS_MOBILE_PLATFORM
+#include "tensorflow/core/grappler/clusters/utils.h"
+#include "tensorflow/core/grappler/clusters/virtual_cluster.h"
+#include "tensorflow/core/grappler/grappler_item.h"
+#include "tensorflow/core/grappler/optimizers/meta_optimizer.h"
+#endif  // IS_MOBILE_PLATFORM
+
 namespace tensorflow {
 
 SimpleGraphExecutionState::SimpleGraphExecutionState(
@@ -236,6 +239,8 @@ Status SimpleGraphExecutionState::InitBaseGraph(
   GraphDef optimized_graph;
   const RewriterConfig& rewrite_options =
       session_options_->config.graph_options().rewrite_options();
+
+#ifndef IS_MOBILE_PLATFORM
   if (grappler::MetaOptimizerEnabled(rewrite_options)) {
     // Adding this functionalty in steps. The first step is to make sure
     // we don't break dependencies. The second step will be to turn the
@@ -282,6 +287,7 @@ Status SimpleGraphExecutionState::InitBaseGraph(
       graph_def = &optimized_graph;
     }
   }
+#endif  // IS_MOBILE_PLATFORM
 
   std::unique_ptr<Graph> new_graph(new Graph(OpRegistry::Global()));
   GraphConstructorOptions opts;
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index c2ae618420..57b7550ef0 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -14,31 +14,6 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
-filegroup(
-    name = "mobile_srcs",
-    srcs = [
-        "devices.cc",
-        "devices.h",
-        "grappler_item.cc",
-        "grappler_item.h",
-        "op_types.cc",
-        "op_types.h",
-        "utils.cc",
-        "utils.h",
-        "//tensorflow/core/grappler/clusters:android_srcs",
-        "//tensorflow/core/grappler/inputs:android_srcs",
-        "//tensorflow/core/grappler/optimizers:android_srcs",
-        "//tensorflow/core/grappler/utils:android_srcs",
-    ],
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-alias(
-    name = "android_srcs",
-    actual = ":mobile_srcs",
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
 cc_library(
     name = "op_types",
     srcs = ["op_types.cc"],
diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD
index da372eb823..556eb1dbc5 100644
--- a/tensorflow/core/grappler/clusters/BUILD
+++ b/tensorflow/core/grappler/clusters/BUILD
@@ -12,24 +12,6 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
-filegroup(
-    name = "mobile_srcs",
-    srcs = glob(
-        [
-            "cluster.*",
-            "utils.*",
-            "virtual_cluster.*",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-alias(
-    name = "android_srcs",
-    actual = ":mobile_srcs",
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
 config_setting(
     name = "xsmm",
     licenses = ["notice"],
diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index ceb4050eae..43c727f381 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -39,7 +39,7 @@ cc_library(
     deps = [
         ":op_performance_data_cc",
         ":utils",
-        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:core_cpu_base",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:grappler_item",
         "//tensorflow/core/grappler/clusters:cluster",
@@ -119,7 +119,7 @@ cc_library(
         ":op_performance_data_cc",
         "//third_party/eigen3",
         "//tensorflow/core/grappler/clusters:utils",
-        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:core_cpu_base",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
@@ -227,7 +227,7 @@ cc_library(
         ":virtual_placer",
         ":virtual_scheduler",
         "//tensorflow/core:core_cpu",
-        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:core_cpu_base",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:grappler_item",
diff --git a/tensorflow/core/grappler/inputs/BUILD b/tensorflow/core/grappler/inputs/BUILD
index 0cbcf48271..37047b2b82 100644
--- a/tensorflow/core/grappler/inputs/BUILD
+++ b/tensorflow/core/grappler/inputs/BUILD
@@ -12,22 +12,6 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
-filegroup(
-    name = "mobile_srcs",
-    srcs = glob(
-        [
-            "utils.*",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-alias(
-    name = "android_srcs",
-    actual = ":mobile_srcs",
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
 cc_library(
     name = "utils",
     srcs = [
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index c46ebf2031..849c148f4d 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -12,26 +12,6 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
-filegroup(
-    name = "mobile_srcs",
-    srcs = glob(
-        [
-            "*_optimizer.*",
-            "auto_parallel.*",
-            "constant_folding.*",
-            "model_pruner.*",
-            "graph_rewriter.*",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-alias(
-    name = "android_srcs",
-    actual = ":mobile_srcs",
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
 cc_library(
     name = "static_schedule",
     srcs = ["static_schedule.cc"],
@@ -207,9 +187,12 @@ cc_library(
     deps = [
         ":graph_optimizer",
         ":graph_rewriter",
+        ":static_schedule",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:grappler_item",
         "//tensorflow/core/grappler:utils",
+        "//tensorflow/core/grappler/costs:graph_properties",
+        "//tensorflow/core/grappler/utils:scc",
     ],
 )
 
@@ -219,12 +202,13 @@ cc_test(
     deps = [
         ":memory_optimizer",
         "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:ops",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
         "//tensorflow/core/grappler:grappler_item",
         "//tensorflow/core/grappler:utils",
-        "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
+        "//tensorflow/core/grappler/clusters:virtual_cluster",
     ],
 )
 
diff --git a/tensorflow/core/grappler/utils/BUILD b/tensorflow/core/grappler/utils/BUILD
index 0bbd6d65cc..e1a3c574a6 100644
--- a/tensorflow/core/grappler/utils/BUILD
+++ b/tensorflow/core/grappler/utils/BUILD
@@ -12,21 +12,6 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
-filegroup(
-    name = "mobile_srcs",
-    srcs = [
-        "scc.cc",
-        "scc.h",
-    ],
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-alias(
-    name = "android_srcs",
-    actual = ":mobile_srcs",
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
 cc_library(
     name = "scc",
     srcs = ["scc.cc"],
-- 
GitLab


From ec3035c70da74b16a1268a28a11e808840e99588 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Mon, 15 May 2017 09:26:58 -0700
Subject: [PATCH 1343/1563] Make tf.feature_column public

PiperOrigin-RevId: 156062790
---
 tensorflow/python/BUILD                       |   2 +-
 tensorflow/python/__init__.py                 |   2 +
 tensorflow/python/feature_column/BUILD        |  12 +-
 tensorflow/python/feature_column/__init__.py  |   0
 .../feature_column/feature_column_lib.py      |  43 +++
 .../feature_column/feature_column_test.py     | 336 +++++++++---------
 .../golden/tensorflow.feature_column.pbtxt    |  55 +++
 tensorflow/tools/api/golden/tensorflow.pbtxt  |   4 +
 tensorflow/tools/ci_build/ci_sanity.sh        |   2 +
 9 files changed, 288 insertions(+), 168 deletions(-)
 create mode 100644 tensorflow/python/feature_column/__init__.py
 create mode 100644 tensorflow/python/feature_column/feature_column_lib.py
 create mode 100644 tensorflow/tools/api/golden/tensorflow.feature_column.pbtxt

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index d2b0f45c72..50f083fb21 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -81,7 +81,7 @@ py_library(
         ":weights_broadcast_ops",
         "//third_party/py/numpy",
         "//tensorflow/python/estimator:estimator_py",
-        "//tensorflow/python/feature_column:feature_column",
+        "//tensorflow/python/feature_column:feature_column_py",
         "//tensorflow/python/ops/losses",
         "//tensorflow/python/ops/distributions",
         "//tensorflow/python/saved_model",
diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py
index 6336ca2310..d4f8b8b2f8 100644
--- a/tensorflow/python/__init__.py
+++ b/tensorflow/python/__init__.py
@@ -75,6 +75,7 @@ from tensorflow.python.ops.standard_ops import *
 
 # Bring in subpackages.
 from tensorflow.python.estimator import estimator_lib as estimator
+from tensorflow.python.feature_column import feature_column_lib as feature_column
 from tensorflow.python.layers import layers
 from tensorflow.python.ops import image_ops as image
 from tensorflow.python.ops import metrics
@@ -212,6 +213,7 @@ _allowed_symbols.extend([
     'compat',
     'errors',
     'estimator',
+    'feature_column',
     'flags',
     'gfile',
     'graph_util',
diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
index 1b1790d280..e86e4dcab1 100644
--- a/tensorflow/python/feature_column/BUILD
+++ b/tensorflow/python/feature_column/BUILD
@@ -24,6 +24,16 @@ filegroup(
     visibility = ["//tensorflow:__subpackages__"],
 )
 
+py_library(
+    name = "feature_column_py",
+    srcs = ["feature_column_lib.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":feature_column",
+        "//tensorflow/python:util",
+    ],
+)
+
 py_library(
     name = "feature_column",
     srcs = ["feature_column.py"],
@@ -64,7 +74,7 @@ py_test(
     srcs_version = "PY2AND3",
     tags = ["no_pip"],
     deps = [
-        ":feature_column",
+        ":feature_column_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_test_lib",
diff --git a/tensorflow/python/feature_column/__init__.py b/tensorflow/python/feature_column/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tensorflow/python/feature_column/feature_column_lib.py b/tensorflow/python/feature_column/feature_column_lib.py
new file mode 100644
index 0000000000..8a57986764
--- /dev/null
+++ b/tensorflow/python/feature_column/feature_column_lib.py
@@ -0,0 +1,43 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""FeatureColumns: tools for ingesting and representing features."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+# pylint: disable=unused-import,line-too-long,wildcard-import
+from tensorflow.python.feature_column.feature_column import *
+
+from tensorflow.python.util.all_util import remove_undocumented
+# pylint: enable=unused-import,line-too-long
+
+_allowed_symbols = [
+    'input_layer',
+    'linear_model',
+    'make_parse_example_spec',
+    'embedding_column',
+    'crossed_column',
+    'numeric_column',
+    'bucketized_column',
+    'categorical_column_with_hash_bucket',
+    'categorical_column_with_vocabulary_file',
+    'categorical_column_with_vocabulary_list',
+    'categorical_column_with_identity',
+    'weighted_categorical_column',
+    'indicator_column',
+]
+
+remove_undocumented(__name__, allowed_exception_list=_allowed_symbols)
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 2fc68b3ca7..83250b5d1d 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -26,7 +26,12 @@ import numpy as np
 from tensorflow.core.example import example_pb2
 from tensorflow.core.example import feature_pb2
 from tensorflow.python.client import session
-from tensorflow.python.feature_column import feature_column as fc
+from tensorflow.python.feature_column import feature_column_lib as fc
+from tensorflow.python.feature_column.feature_column import _CategoricalColumn
+from tensorflow.python.feature_column.feature_column import _DenseColumn
+from tensorflow.python.feature_column.feature_column import _FeatureColumn
+from tensorflow.python.feature_column.feature_column import _LazyBuilder
+from tensorflow.python.feature_column.feature_column import _transform_features
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors
@@ -51,7 +56,7 @@ class LazyColumnTest(test.TestCase):
 
   def test_transormations_called_once(self):
 
-    class TransformCounter(fc._FeatureColumn):
+    class TransformCounter(_FeatureColumn):
 
       def __init__(self):
         self.num_transform = 0
@@ -68,7 +73,7 @@ class LazyColumnTest(test.TestCase):
       def _parse_example_spec(self):
         pass
 
-    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
+    builder = _LazyBuilder(features={'a': [[2], [3.]]})
     column = TransformCounter()
     self.assertEqual(0, column.num_transform)
     builder.get(column)
@@ -78,7 +83,7 @@ class LazyColumnTest(test.TestCase):
 
   def test_returns_transform_output(self):
 
-    class Transformer(fc._FeatureColumn):
+    class Transformer(_FeatureColumn):
 
       @property
       def name(self):
@@ -91,14 +96,14 @@ class LazyColumnTest(test.TestCase):
       def _parse_example_spec(self):
         pass
 
-    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
+    builder = _LazyBuilder(features={'a': [[2], [3.]]})
     column = Transformer()
     self.assertEqual('Output', builder.get(column))
     self.assertEqual('Output', builder.get(column))
 
   def test_does_not_pollute_given_features_dict(self):
 
-    class Transformer(fc._FeatureColumn):
+    class Transformer(_FeatureColumn):
 
       @property
       def name(self):
@@ -112,19 +117,19 @@ class LazyColumnTest(test.TestCase):
         pass
 
     features = {'a': [[2], [3.]]}
-    builder = fc._LazyBuilder(features=features)
+    builder = _LazyBuilder(features=features)
     builder.get(Transformer())
     self.assertEqual(['a'], list(features.keys()))
 
   def test_error_if_feature_is_not_found(self):
-    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
+    builder = _LazyBuilder(features={'a': [[2], [3.]]})
     with self.assertRaisesRegexp(ValueError,
                                  'bbb is not in features dictionary'):
       builder.get('bbb')
 
   def test_not_supported_feature_column(self):
 
-    class NotAProperColumn(fc._FeatureColumn):
+    class NotAProperColumn(_FeatureColumn):
 
       @property
       def name(self):
@@ -138,7 +143,7 @@ class LazyColumnTest(test.TestCase):
       def _parse_example_spec(self):
         pass
 
-    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
+    builder = _LazyBuilder(features={'a': [[2], [3.]]})
     with self.assertRaisesRegexp(ValueError,
                                  'NotAProperColumn is not supported'):
       builder.get(NotAProperColumn())
@@ -148,7 +153,7 @@ class LazyColumnTest(test.TestCase):
     class NotAFeatureColumn(object):
       pass
 
-    builder = fc._LazyBuilder(features={'a': [[2], [3.]]})
+    builder = _LazyBuilder(features={'a': [[2], [3.]]})
     with self.assertRaisesRegexp(
         TypeError, '"key" must be either a "str" or "_FeatureColumn".'):
       builder.get(NotAFeatureColumn())
@@ -275,7 +280,7 @@ class NumericColumnTest(test.TestCase):
       return input_tensor + 2.
 
     price = fc.numeric_column('price', shape=[2], normalizer_fn=_increment_two)
-    output = fc._transform_features({'price': [[1., 2.], [5., 6.]]}, [price])
+    output = _transform_features({'price': [[1., 2.], [5., 6.]]}, [price])
     with self.test_session():
       self.assertAllEqual([[3., 4.], [7., 8.]], output[price].eval())
 
@@ -285,14 +290,12 @@ class NumericColumnTest(test.TestCase):
       return input_tensor + 2.
 
     price = fc.numeric_column('price', shape=[2], normalizer_fn=_increment_two)
-    builder = fc._LazyBuilder({
-        'price': [[1., 2.], [5., 6.]]
-    })
+    builder = _LazyBuilder({'price': [[1., 2.], [5., 6.]]})
     self.assertEqual(builder.get(price), price._get_dense_tensor(builder))
 
   def test_sparse_tensor_not_supported(self):
     price = fc.numeric_column('price')
-    builder = fc._LazyBuilder({
+    builder = _LazyBuilder({
         'price':
             sparse_tensor.SparseTensor(
                 indices=[[0, 0]], values=[0.3], dense_shape=[1, 1])
@@ -401,7 +404,7 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[2])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      transformed_tensor = fc._transform_features({
+      transformed_tensor = _transform_features({
           'price': [[-1., 1.], [5., 6.]]
       }, [bucketized_price])
       with _initialized_session():
@@ -413,9 +416,7 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[1])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      builder = fc._LazyBuilder({
-          'price': [[-1.], [1.], [5.], [6.]]
-      })
+      builder = _LazyBuilder({'price': [[-1.], [1.], [5.], [6.]]})
       with _initialized_session():
         bucketized_price_tensor = bucketized_price._get_dense_tensor(builder)
         self.assertAllClose(
@@ -431,9 +432,7 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[2])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      builder = fc._LazyBuilder({
-          'price': [[-1., 1.], [5., 6.]]
-      })
+      builder = _LazyBuilder({'price': [[-1., 1.], [5., 6.]]})
       with _initialized_session():
         bucketized_price_tensor = bucketized_price._get_dense_tensor(builder)
         self.assertAllClose(
@@ -447,9 +446,7 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[1])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      builder = fc._LazyBuilder({
-          'price': [[-1.], [1.], [5.], [6.]]
-      })
+      builder = _LazyBuilder({'price': [[-1.], [1.], [5.], [6.]]})
       with _initialized_session() as sess:
         id_weight_pair = bucketized_price._get_sparse_tensors(builder)
         self.assertIsNone(id_weight_pair.weight_tensor)
@@ -464,9 +461,7 @@ class BucketizedColumnTest(test.TestCase):
     price = fc.numeric_column('price', shape=[2])
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 2, 4, 6])
     with ops.Graph().as_default():
-      builder = fc._LazyBuilder({
-          'price': [[-1., 1.], [5., 6.]]
-      })
+      builder = _LazyBuilder({'price': [[-1., 1.], [5., 6.]]})
       with _initialized_session() as sess:
         id_weight_pair = bucketized_price._get_sparse_tensors(builder)
         self.assertIsNone(id_weight_pair.weight_tensor)
@@ -481,7 +476,7 @@ class BucketizedColumnTest(test.TestCase):
   def test_sparse_tensor_input_not_supported(self):
     price = fc.numeric_column('price')
     bucketized_price = fc.bucketized_column(price, boundaries=[0, 1])
-    builder = fc._LazyBuilder({
+    builder = _LazyBuilder({
         'price':
             sparse_tensor.SparseTensor(
                 indices=[[0, 0]], values=[0.3], dense_shape=[1, 1])
@@ -623,7 +618,7 @@ class HashedCategoricalColumnTest(test.TestCase):
         values=['omar', 'stringer', 'marlo'],
         indices=[[0, 0], [1, 0], [1, 1]],
         dense_shape=[2, 2])
-    outputs = fc._transform_features({'wire': wire_tensor}, [hashed_sparse])
+    outputs = _transform_features({'wire': wire_tensor}, [hashed_sparse])
     output = outputs[hashed_sparse]
     # Check exact hashed output. If hashing changes this test will break.
     expected_values = [6, 4, 1]
@@ -653,7 +648,7 @@ class HashedCategoricalColumnTest(test.TestCase):
         values=[101.],
         indices=[[0, 0]],
         dense_shape=[1, 1])
-    builder = fc._LazyBuilder({
+    builder = _LazyBuilder({
         'a_int': int_tensor,
         'a_string': string_tensor,
         'a_float': float_tensor
@@ -668,7 +663,7 @@ class HashedCategoricalColumnTest(test.TestCase):
         'wire', 10, dtype=dtypes.int64)
     wire_tensor = sparse_tensor.SparseTensor(
         values=['omar'], indices=[[0, 0]], dense_shape=[1, 1])
-    builder = fc._LazyBuilder({'wire': wire_tensor})
+    builder = _LazyBuilder({'wire': wire_tensor})
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
       builder.get(hashed_sparse)
 
@@ -679,7 +674,7 @@ class HashedCategoricalColumnTest(test.TestCase):
         values=[101, 201, 301],
         indices=[[0, 0], [1, 0], [1, 1]],
         dense_shape=[2, 2])
-    builder = fc._LazyBuilder({'wire': wire_tensor})
+    builder = _LazyBuilder({'wire': wire_tensor})
     output = builder.get(hashed_sparse)
     # Check exact hashed output. If hashing changes this test will break.
     expected_values = [3, 7, 5]
@@ -693,7 +688,7 @@ class HashedCategoricalColumnTest(test.TestCase):
         values=constant_op.constant([101, 201, 301], dtype=dtypes.int32),
         indices=[[0, 0], [1, 0], [1, 1]],
         dense_shape=[2, 2])
-    builder = fc._LazyBuilder({'wire': wire_tensor})
+    builder = _LazyBuilder({'wire': wire_tensor})
     output = builder.get(hashed_sparse)
     # Check exact hashed output. If hashing changes this test will break.
     expected_values = [3, 7, 5]
@@ -702,11 +697,12 @@ class HashedCategoricalColumnTest(test.TestCase):
 
   def test_get_sparse_tensors(self):
     hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
-    builder = fc._LazyBuilder({
-        'wire': sparse_tensor.SparseTensor(
-            values=['omar', 'stringer', 'marlo'],
-            indices=[[0, 0], [1, 0], [1, 1]],
-            dense_shape=[2, 2])
+    builder = _LazyBuilder({
+        'wire':
+            sparse_tensor.SparseTensor(
+                values=['omar', 'stringer', 'marlo'],
+                indices=[[0, 0], [1, 0], [1, 1]],
+                dense_shape=[2, 2])
     })
     id_weight_pair = hashed_sparse._get_sparse_tensors(builder)
     self.assertIsNone(id_weight_pair.weight_tensor)
@@ -719,7 +715,9 @@ class HashedCategoricalColumnTest(test.TestCase):
         indices=[[0, 0], [1, 0], [1, 1]],
         dense_shape=[2, 2])
     column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+        _LazyBuilder({
+            'aaa': inputs
+        }), weight_collections=('my_weights',))
 
     self.assertItemsEqual(
         [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
@@ -727,9 +725,7 @@ class HashedCategoricalColumnTest(test.TestCase):
 
   def test_get_sparse_tensors_dense_input(self):
     hashed_sparse = fc.categorical_column_with_hash_bucket('wire', 10)
-    builder = fc._LazyBuilder({
-        'wire': (('omar', ''), ('stringer', 'marlo'))
-    })
+    builder = _LazyBuilder({'wire': (('omar', ''), ('stringer', 'marlo'))})
     id_weight_pair = hashed_sparse._get_sparse_tensors(builder)
     self.assertIsNone(id_weight_pair.weight_tensor)
     self.assertEqual(builder.get(hashed_sparse), id_weight_pair.id_tensor)
@@ -882,7 +878,7 @@ class CrossedColumnTest(test.TestCase):
             indices=[[0, 0], [1, 0], [1, 1]],
             dense_shape=[2, 2]),
     }
-    outputs = fc._transform_features(features, [price_cross_wire])
+    outputs = _transform_features(features, [price_cross_wire])
     output = outputs[price_cross_wire]
     with self.test_session() as sess:
       output_val = sess.run(output)
@@ -898,20 +894,24 @@ class CrossedColumnTest(test.TestCase):
     crossed1 = fc.crossed_column(['d1', 'd2'], 10)
     crossed2 = fc.crossed_column([b, 'c', crossed1], 15, hash_key=5)
     with ops.Graph().as_default():
-      builder = fc._LazyBuilder({
-          'a': constant_op.constant(((-1., .5), (.5, 1.))),
-          'c': sparse_tensor.SparseTensor(
-              indices=((0, 0), (1, 0), (1, 1)),
-              values=['cA', 'cB', 'cC'],
-              dense_shape=(2, 2)),
-          'd1': sparse_tensor.SparseTensor(
-              indices=((0, 0), (1, 0), (1, 1)),
-              values=['d1A', 'd1B', 'd1C'],
-              dense_shape=(2, 2)),
-          'd2': sparse_tensor.SparseTensor(
-              indices=((0, 0), (1, 0), (1, 1)),
-              values=['d2A', 'd2B', 'd2C'],
-              dense_shape=(2, 2)),
+      builder = _LazyBuilder({
+          'a':
+              constant_op.constant(((-1., .5), (.5, 1.))),
+          'c':
+              sparse_tensor.SparseTensor(
+                  indices=((0, 0), (1, 0), (1, 1)),
+                  values=['cA', 'cB', 'cC'],
+                  dense_shape=(2, 2)),
+          'd1':
+              sparse_tensor.SparseTensor(
+                  indices=((0, 0), (1, 0), (1, 1)),
+                  values=['d1A', 'd1B', 'd1C'],
+                  dense_shape=(2, 2)),
+          'd2':
+              sparse_tensor.SparseTensor(
+                  indices=((0, 0), (1, 0), (1, 1)),
+                  values=['d2A', 'd2B', 'd2C'],
+                  dense_shape=(2, 2)),
       })
       id_weight_pair = crossed2._get_sparse_tensors(builder)
       with _initialized_session():
@@ -934,12 +934,14 @@ class CrossedColumnTest(test.TestCase):
     b = fc.bucketized_column(a, boundaries=(0, 1))
     crossed = fc.crossed_column([b, 'c'], hash_bucket_size=5, hash_key=5)
     with ops.Graph().as_default():
-      builder = fc._LazyBuilder({
-          'a': constant_op.constant(((-1., .5), (.5, 1.))),
-          'c': sparse_tensor.SparseTensor(
-              indices=((0, 0), (1, 0), (1, 1)),
-              values=['cA', 'cB', 'cC'],
-              dense_shape=(2, 2)),
+      builder = _LazyBuilder({
+          'a':
+              constant_op.constant(((-1., .5), (.5, 1.))),
+          'c':
+              sparse_tensor.SparseTensor(
+                  indices=((0, 0), (1, 0), (1, 1)),
+                  values=['cA', 'cB', 'cC'],
+                  dense_shape=(2, 2)),
       })
       id_weight_pair = crossed._get_sparse_tensors(builder)
       with _initialized_session():
@@ -983,7 +985,7 @@ class CrossedColumnTest(test.TestCase):
         self.assertAllClose(((3.1,), (14.1,)), predictions.eval())
 
   def test_linear_model_with_weights(self):
-    class _TestColumnWithWeights(fc._CategoricalColumn):
+    class _TestColumnWithWeights(_CategoricalColumn):
       """Produces sparse IDs and sparse weights."""
 
       @property
@@ -1010,7 +1012,7 @@ class CrossedColumnTest(test.TestCase):
                               trainable=None):
         """Populates both id_tensor and weight_tensor."""
         ids_and_weights = inputs.get(self)
-        return fc._CategoricalColumn.IdWeightPair(
+        return _CategoricalColumn.IdWeightPair(
             id_tensor=ids_and_weights[0], weight_tensor=ids_and_weights[1])
 
     t = _TestColumnWithWeights()
@@ -1058,7 +1060,7 @@ class LinearModelTest(test.TestCase):
 
   def test_should_be_dense_or_categorical_column(self):
 
-    class NotSupportedColumn(fc._FeatureColumn):
+    class NotSupportedColumn(_FeatureColumn):
 
       @property
       def name(self):
@@ -1143,7 +1145,7 @@ class LinearModelTest(test.TestCase):
   def test_dense_and_sparse_column(self):
     """When the column is both dense and sparse, uses sparse tensors."""
 
-    class _DenseAndSparseColumn(fc._DenseColumn, fc._CategoricalColumn):
+    class _DenseAndSparseColumn(_DenseColumn, _CategoricalColumn):
 
       @property
       def name(self):
@@ -1174,7 +1176,7 @@ class LinearModelTest(test.TestCase):
             indices=[[0, 0], [1, 0], [1, 1]],
             values=[2, 0, 3],
             dense_shape=[2, 2])
-        return fc._CategoricalColumn.IdWeightPair(sp_tensor, None)
+        return _CategoricalColumn.IdWeightPair(sp_tensor, None)
 
     dense_and_sparse_column = _DenseAndSparseColumn()
     with ops.Graph().as_default():
@@ -1664,9 +1666,9 @@ class InputLayerTest(test.TestCase):
 
 class MakeParseExampleSpecTest(test.TestCase):
 
-  class _TestFeatureColumn(
-      fc._FeatureColumn,
-      collections.namedtuple('_TestFeatureColumn', ['parse_spec'])):
+  class _TestFeatureColumn(_FeatureColumn,
+                           collections.namedtuple('_TestFeatureColumn',
+                                                  ['parse_spec'])):
 
     @property
     def _parse_example_spec(self):
@@ -1815,7 +1817,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+    column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     with self.assertRaisesRegexp(errors.OpError, 'file_does_not_exist'):
       with self.test_session():
         lookup_ops.tables_initializer().run()
@@ -1843,7 +1845,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+    column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     with self.assertRaisesRegexp(errors.OpError, 'Invalid vocab_size'):
       with self.test_session():
         lookup_ops.tables_initializer().run()
@@ -1881,7 +1883,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         values=(12, 24, 36),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
 
   def test_invalid_input_dtype_string(self):
     column = fc.categorical_column_with_vocabulary_file(
@@ -1894,7 +1896,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         values=('omar', 'stringer', 'marlo'),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
 
   def test_parse_example(self):
     a = fc.categorical_column_with_vocabulary_file(
@@ -1927,8 +1929,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -1948,7 +1949,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    id_tensor = fc._transform_features({'aaa': inputs}, [column])[column]
+    id_tensor = _transform_features({'aaa': inputs}, [column])[column]
     with _initialized_session():
       _assert_sparse_tensor_value(self,
                                   sparse_tensor.SparseTensorValue(
@@ -1968,7 +1969,9 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=[[0, 0], [1, 0], [1, 1]],
         dense_shape=[2, 2])
     column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+        _LazyBuilder({
+            'aaa': inputs
+        }), weight_collections=('my_weights',))
 
     self.assertItemsEqual(
         [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
@@ -1979,9 +1982,10 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         key='aaa',
         vocabulary_file=self._wire_vocabulary_file_name,
         vocabulary_size=self._wire_vocabulary_size)
-    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
-        'aaa': (('marlo', ''), ('skywalker', 'omar'))
-    }))
+    id_weight_pair = column._get_sparse_tensors(
+        _LazyBuilder({
+            'aaa': (('marlo', ''), ('skywalker', 'omar'))
+        }))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2002,8 +2006,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2024,8 +2027,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (1, 2)),
         values=('marlo', 'skywalker', 'omar', 'heisenberg'),
         dense_shape=(2, 3))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2048,8 +2050,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2070,8 +2071,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (2, 2)),
         values=(11, 100, 30, 22),
         dense_shape=(3, 3))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2090,9 +2090,10 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         vocabulary_size=self._warriors_vocabulary_size,
         dtype=dtypes.int32,
         default_value=default_value)
-    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
-        'aaa': ((11, -1, -1), (100, 30, -1), (-1, -1, 22))
-    }))
+    id_weight_pair = column._get_sparse_tensors(
+        _LazyBuilder({
+            'aaa': ((11, -1, -1), (100, 30, -1), (-1, -1, 22))
+        }))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2114,8 +2115,7 @@ class VocabularyFileCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (2, 2)),
         values=(11, 100, 30, 22),
         dense_shape=(3, 3))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2242,7 +2242,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         values=(12, 24, 36),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
 
   def test_invalid_input_dtype_string(self):
     column = fc.categorical_column_with_vocabulary_list(
@@ -2253,7 +2253,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         values=('omar', 'stringer', 'marlo'),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'dtype must be compatible'):
-      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
 
   def test_parse_example_string(self):
     a = fc.categorical_column_with_vocabulary_list(
@@ -2307,8 +2307,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2327,7 +2326,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    id_tensor = fc._transform_features({'aaa': inputs}, [column])[column]
+    id_tensor = _transform_features({'aaa': inputs}, [column])[column]
     with _initialized_session():
       _assert_sparse_tensor_value(
           self,
@@ -2346,7 +2345,9 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=[[0, 0], [1, 0], [1, 1]],
         dense_shape=[2, 2])
     column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+        _LazyBuilder({
+            'aaa': inputs
+        }), weight_collections=('my_weights',))
 
     self.assertItemsEqual(
         [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
@@ -2356,9 +2357,10 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
     column = fc.categorical_column_with_vocabulary_list(
         key='aaa',
         vocabulary_list=('omar', 'stringer', 'marlo'))
-    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
-        'aaa': (('marlo', ''), ('skywalker', 'omar'))
-    }))
+    id_weight_pair = column._get_sparse_tensors(
+        _LazyBuilder({
+            'aaa': (('marlo', ''), ('skywalker', 'omar'))
+        }))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2378,8 +2380,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=('marlo', 'skywalker', 'omar'),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2399,8 +2400,7 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1), (2, 2)),
         values=np.array((11, 100, 30, 22), dtype=np.int32),
         dense_shape=(3, 3))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2418,11 +2418,12 @@ class VocabularyListCategoricalColumnTest(test.TestCase):
         vocabulary_list=np.array((30, 35, 11, 23, 22), dtype=np.int32),
         dtype=dtypes.int32,
         default_value=default_value)
-    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
-        'aaa': np.array(
-            ((11, -1, -1), (100, 30, -1), (-1, -1, 22)),
-            dtype=np.int32)
-    }))
+    id_weight_pair = column._get_sparse_tensors(
+        _LazyBuilder({
+            'aaa':
+                np.array(
+                    ((11, -1, -1), (100, 30, -1), (-1, -1, 22)), dtype=np.int32)
+        }))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2501,7 +2502,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         values=('omar', 'stringer', 'marlo'),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'Invalid input, not integer'):
-      column._get_sparse_tensors(fc._LazyBuilder({'aaa': inputs}))
+      column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
 
   def test_parse_example(self):
     a = fc.categorical_column_with_identity(key='aaa', num_buckets=30)
@@ -2530,8 +2531,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(0, 1, 0),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2548,7 +2548,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(0, 1, 0),
         dense_shape=(2, 2))
-    id_tensor = fc._transform_features({'aaa': inputs}, [column])[column]
+    id_tensor = _transform_features({'aaa': inputs}, [column])[column]
     with _initialized_session():
       _assert_sparse_tensor_value(
           self,
@@ -2565,7 +2565,9 @@ class IdentityCategoricalColumnTest(test.TestCase):
         values=(0, 1, 0),
         dense_shape=(2, 2))
     column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}), weight_collections=('my_weights',))
+        _LazyBuilder({
+            'aaa': inputs
+        }), weight_collections=('my_weights',))
 
     self.assertItemsEqual(
         [], ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES))
@@ -2573,9 +2575,10 @@ class IdentityCategoricalColumnTest(test.TestCase):
 
   def test_get_sparse_tensors_dense_input(self):
     column = fc.categorical_column_with_identity(key='aaa', num_buckets=3)
-    id_weight_pair = column._get_sparse_tensors(fc._LazyBuilder({
-        'aaa': ((0, -1), (1, 0))
-    }))
+    id_weight_pair = column._get_sparse_tensors(
+        _LazyBuilder({
+            'aaa': ((0, -1), (1, 0))
+        }))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2592,8 +2595,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(1, -1, 0),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       with self.assertRaisesRegexp(
@@ -2606,8 +2608,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(1, 99, 0),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       with self.assertRaisesRegexp(
@@ -2621,8 +2622,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(1, -1, 99),
         dense_shape=(2, 2))
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2643,8 +2643,7 @@ class IdentityCategoricalColumnTest(test.TestCase):
         indices=input_indices,
         values=input_values,
         dense_shape=input_shape)
-    id_weight_pair = column._get_sparse_tensors(
-        fc._LazyBuilder({'aaa': inputs}))
+    id_weight_pair = column._get_sparse_tensors(_LazyBuilder({'aaa': inputs}))
     self.assertIsNone(id_weight_pair.weight_tensor)
     with _initialized_session():
       _assert_sparse_tensor_value(
@@ -2698,8 +2697,8 @@ class TransformFeaturesTest(test.TestCase):
                   indices=[[0, 0], [1, 0], [1, 1]],
                   dense_shape=[2, 2])
       }
-      transformed = fc._transform_features(features,
-                                           [bucketized_price, hashed_sparse])
+      transformed = _transform_features(features,
+                                        [bucketized_price, hashed_sparse])
       with _initialized_session():
         self.assertIn(bucketized_price.name, transformed[bucketized_price].name)
         self.assertAllEqual([[0], [3]], transformed[bucketized_price].eval())
@@ -2709,7 +2708,7 @@ class TransformFeaturesTest(test.TestCase):
   def test_column_order(self):
     """When the column is both dense and sparse, uses sparse tensors."""
 
-    class _LoggerColumn(fc._FeatureColumn):
+    class _LoggerColumn(_FeatureColumn):
 
       def __init__(self, name):
         self._name = name
@@ -2732,12 +2731,12 @@ class TransformFeaturesTest(test.TestCase):
       column1 = _LoggerColumn('1')
       column2 = _LoggerColumn('2')
       call_logger = {'count': 0}
-      fc._transform_features({}, [column1, column2])
+      _transform_features({}, [column1, column2])
       self.assertEqual(0, column1.call_order)
       self.assertEqual(1, column2.call_order)
 
       call_logger = {'count': 0}
-      fc._transform_features({}, [column2, column1])
+      _transform_features({}, [column2, column1])
       self.assertEqual(0, column1.call_order)
       self.assertEqual(1, column2.call_order)
 
@@ -2757,7 +2756,7 @@ class IndicatorColumnTest(test.TestCase):
 
   def test_1D_shape_fails(self):
     with self.assertRaisesRegexp(ValueError, 'must have rank 2'):
-      fc._LazyBuilder({
+      _LazyBuilder({
           'animal':
               sparse_tensor.SparseTensor(
                   indices=[0], values=['fox'], dense_shape=[1])
@@ -2767,7 +2766,7 @@ class IndicatorColumnTest(test.TestCase):
     # TODO(ispir/cassandrax): Swith to categorical_column_with_keys when ready.
     animal = fc.indicator_column(
         fc.categorical_column_with_hash_bucket('animal', 4))
-    builder = fc._LazyBuilder({
+    builder = _LazyBuilder({
         'animal':
             sparse_tensor.SparseTensor(
                 indices=[[0, 0], [1, 0]],
@@ -2782,7 +2781,7 @@ class IndicatorColumnTest(test.TestCase):
     animal = fc.indicator_column(
         fc.categorical_column_with_identity('animal', num_buckets=4))
 
-    builder = fc._LazyBuilder({
+    builder = _LazyBuilder({
         'animal':
             sparse_tensor.SparseTensor(
                 indices=[[0, 0], [0, 1]], values=[1, 1], dense_shape=[1, 2])
@@ -2794,7 +2793,7 @@ class IndicatorColumnTest(test.TestCase):
   def test_multi_hot2(self):
     animal = fc.indicator_column(
         fc.categorical_column_with_identity('animal', num_buckets=4))
-    builder = fc._LazyBuilder({
+    builder = _LazyBuilder({
         'animal':
             sparse_tensor.SparseTensor(
                 indices=[[0, 0], [0, 1]], values=[1, 2], dense_shape=[1, 2])
@@ -2844,8 +2843,7 @@ class IndicatorColumnTest(test.TestCase):
             values=('marlo', 'skywalker', 'omar'),
             dense_shape=(2, 2))
     }
-    indicator_tensor = fc._transform_features(
-        features, [a_indicator])[a_indicator]
+    indicator_tensor = _transform_features(features, [a_indicator])[a_indicator]
     with _initialized_session():
       self.assertAllEqual([[0, 0, 1], [1, 0, 0]], indicator_tensor.eval())
 
@@ -2997,7 +2995,7 @@ class EmbeddingColumnTest(test.TestCase):
             values=(0, 1, 0),
             dense_shape=(2, 2))
     }
-    outputs = fc._transform_features(features, [a, a_embedded])
+    outputs = _transform_features(features, [a, a_embedded])
     output_a = outputs[a]
     output_embedded = outputs[a_embedded]
     with _initialized_session():
@@ -3049,9 +3047,10 @@ class EmbeddingColumnTest(test.TestCase):
         initializer=_initializer)
 
     # Provide sparse input and get dense result.
-    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
-        'aaa': sparse_input
-    }))
+    embedding_lookup = embedding_column._get_dense_tensor(
+        _LazyBuilder({
+            'aaa': sparse_input
+        }))
 
     # Assert expected embedding variable and lookups.
     global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
@@ -3108,9 +3107,10 @@ class EmbeddingColumnTest(test.TestCase):
         initializer=_initializer)
 
     # Provide sparse input and get dense result.
-    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
-        'aaa': sparse_input
-    }))
+    embedding_lookup = embedding_column._get_dense_tensor(
+        _LazyBuilder({
+            'aaa': sparse_input
+        }))
 
     # Assert expected embedding variable and lookups.
     global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
@@ -3136,9 +3136,10 @@ class EmbeddingColumnTest(test.TestCase):
     embedding_column = fc.embedding_column(categorical_column, dimension=2)
 
     # Provide sparse input and get dense result.
-    embedding_column._get_dense_tensor(fc._LazyBuilder({
-        'aaa': sparse_input
-    }), weight_collections=('my_vars',))
+    embedding_column._get_dense_tensor(
+        _LazyBuilder({
+            'aaa': sparse_input
+        }), weight_collections=('my_vars',))
 
     # Assert expected embedding variable and lookups.
     self.assertItemsEqual(
@@ -3195,12 +3196,14 @@ class EmbeddingColumnTest(test.TestCase):
     input_indices = array_ops.placeholder(dtype=dtypes.int64)
     input_values = array_ops.placeholder(dtype=dtypes.int64)
     input_shape = array_ops.placeholder(dtype=dtypes.int64)
-    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
-        'aaa': sparse_tensor.SparseTensorValue(
-            indices=input_indices,
-            values=input_values,
-            dense_shape=input_shape)
-    }))
+    embedding_lookup = embedding_column._get_dense_tensor(
+        _LazyBuilder({
+            'aaa':
+                sparse_tensor.SparseTensorValue(
+                    indices=input_indices,
+                    values=input_values,
+                    dense_shape=input_shape)
+        }))
 
     # Assert expected embedding variable and lookups.
     global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
@@ -3259,9 +3262,10 @@ class EmbeddingColumnTest(test.TestCase):
         tensor_name_in_ckpt=ckpt_tensor)
 
     # Provide sparse input and get dense result.
-    embedding_lookup = embedding_column._get_dense_tensor(fc._LazyBuilder({
-        'aaa': sparse_input
-    }))
+    embedding_lookup = embedding_column._get_dense_tensor(
+        _LazyBuilder({
+            'aaa': sparse_input
+        }))
 
     # Assert expected embedding variable and lookups.
     global_vars = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES)
@@ -3519,7 +3523,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
         values=('omar', 'stringer', 'marlo'),
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(ValueError, 'Bad dtype'):
-      fc._transform_features({'ids': strings, 'values': strings}, (column,))
+      _transform_features({'ids': strings, 'values': strings}, (column,))
 
   def test_column_name_collision(self):
     with self.assertRaisesRegexp(ValueError, r'Parse config.*already exists'):
@@ -3539,7 +3543,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
         dense_shape=(2, 2))
     with self.assertRaisesRegexp(
         ValueError, 'values is not in features dictionary'):
-      fc._transform_features({'ids': inputs}, (column,))
+      _transform_features({'ids': inputs}, (column,))
 
   def test_parse_example(self):
     a = fc.categorical_column_with_vocabulary_list(
@@ -3588,7 +3592,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(0.5, 1.0, 0.1),
         dense_shape=(2, 2))
-    id_tensor, weight_tensor = fc._transform_features({
+    id_tensor, weight_tensor = _transform_features({
         'ids': inputs,
         'values': weights,
     }, (column,))[column]
@@ -3617,7 +3621,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(0.5, 1.0, 0.1),
         dense_shape=(2, 2))
-    id_tensor, weight_tensor = fc._transform_features({
+    id_tensor, weight_tensor = _transform_features({
         'ids': ((0, -1), (1, 0)),
         'values': weights,
     }, (column,))[column]
@@ -3646,7 +3650,7 @@ class WeightedCategoricalColumnTest(test.TestCase):
         indices=((0, 0), (1, 0), (1, 1)),
         values=(2, 1, 0),
         dense_shape=(2, 2))
-    id_tensor, weight_tensor = fc._transform_features({
+    id_tensor, weight_tensor = _transform_features({
         'ids': inputs,
         'values': ((.5, 0.), (1., .1)),
     }, (column,))[column]
diff --git a/tensorflow/tools/api/golden/tensorflow.feature_column.pbtxt b/tensorflow/tools/api/golden/tensorflow.feature_column.pbtxt
new file mode 100644
index 0000000000..4c633a850f
--- /dev/null
+++ b/tensorflow/tools/api/golden/tensorflow.feature_column.pbtxt
@@ -0,0 +1,55 @@
+path: "tensorflow.feature_column"
+tf_module {
+  member_method {
+    name: "bucketized_column"
+    argspec: "args=[\'source_column\', \'boundaries\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "categorical_column_with_hash_bucket"
+    argspec: "args=[\'key\', \'hash_bucket_size\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'string\'>\"], "
+  }
+  member_method {
+    name: "categorical_column_with_identity"
+    argspec: "args=[\'key\', \'num_buckets\', \'default_value\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "categorical_column_with_vocabulary_file"
+    argspec: "args=[\'key\', \'vocabulary_file\', \'vocabulary_size\', \'num_oov_buckets\', \'default_value\', \'dtype\'], varargs=None, keywords=None, defaults=[\'0\', \'None\', \"<dtype: \'string\'>\"], "
+  }
+  member_method {
+    name: "categorical_column_with_vocabulary_list"
+    argspec: "args=[\'key\', \'vocabulary_list\', \'dtype\', \'default_value\'], varargs=None, keywords=None, defaults=[\'None\', \'-1\'], "
+  }
+  member_method {
+    name: "crossed_column"
+    argspec: "args=[\'keys\', \'hash_bucket_size\', \'hash_key\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "embedding_column"
+    argspec: "args=[\'categorical_column\', \'dimension\', \'combiner\', \'initializer\', \'ckpt_to_load_from\', \'tensor_name_in_ckpt\', \'max_norm\', \'trainable\'], varargs=None, keywords=None, defaults=[\'mean\', \'None\', \'None\', \'None\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "indicator_column"
+    argspec: "args=[\'categorical_column\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "input_layer"
+    argspec: "args=[\'features\', \'feature_columns\', \'weight_collections\', \'trainable\'], varargs=None, keywords=None, defaults=[\'None\', \'True\'], "
+  }
+  member_method {
+    name: "linear_model"
+    argspec: "args=[\'features\', \'feature_columns\', \'units\', \'sparse_combiner\', \'weight_collections\', \'trainable\'], varargs=None, keywords=None, defaults=[\'1\', \'sum\', \'None\', \'True\'], "
+  }
+  member_method {
+    name: "make_parse_example_spec"
+    argspec: "args=[\'feature_columns\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "numeric_column"
+    argspec: "args=[\'key\', \'shape\', \'default_value\', \'dtype\', \'normalizer_fn\'], varargs=None, keywords=None, defaults=[\'(1,)\', \'None\', \"<dtype: \'float32\'>\", \'None\'], "
+  }
+  member_method {
+    name: "weighted_categorical_column"
+    argspec: "args=[\'categorical_column\', \'weight_feature_key\', \'dtype\'], varargs=None, keywords=None, defaults=[\"<dtype: \'float32\'>\"], "
+  }
+}
diff --git a/tensorflow/tools/api/golden/tensorflow.pbtxt b/tensorflow/tools/api/golden/tensorflow.pbtxt
index 046d82c2d5..f0fdd69390 100644
--- a/tensorflow/tools/api/golden/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.pbtxt
@@ -292,6 +292,10 @@ tf_module {
     name: "estimator"
     mtype: "<type \'module\'>"
   }
+  member {
+    name: "feature_column"
+    mtype: "<type \'module\'>"
+  }
   member {
     name: "flags"
     mtype: "<type \'module\'>"
diff --git a/tensorflow/tools/ci_build/ci_sanity.sh b/tensorflow/tools/ci_build/ci_sanity.sh
index 9ecf16c46f..fd2874df91 100755
--- a/tensorflow/tools/ci_build/ci_sanity.sh
+++ b/tensorflow/tools/ci_build/ci_sanity.sh
@@ -92,6 +92,8 @@ do_pylint() {
   ERROR_WHITELIST="^tensorflow/python/framework/function_test\.py.*\[E1123.*noinline "\
 "^tensorflow/python/platform/default/_gfile\.py.*\[E0301.*non-iterator "\
 "^tensorflow/python/platform/default/_googletest\.py.*\[E0102.*function\salready\sdefined "\
+"^tensorflow/python/feature_column/feature_column_test\.py.*\[E0110.*abstract-class-instantiated "\
+"^tensorflow/contrib/layers/python/layers/feature_column\.py.*\[E0110.*abstract-class-instantiated "\
 "^tensorflow/python/platform/gfile\.py.*\[E0301.*non-iterator"
 
   echo "ERROR_WHITELIST=\"${ERROR_WHITELIST}\""
-- 
GitLab


From 18727ef581297437e20d6df4a08b60e8b021f284 Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Mon, 15 May 2017 09:43:42 -0700
Subject: [PATCH 1344/1563] .assert_positive_definite and .assert_non_singular
 default implementations added to LinearOperator base class.

Previously I was avoiding these because they are inefficient...however, the
desire to have a consistent API is overriding this.

PiperOrigin-RevId: 156064641
---
 .../linear_operator_full_matrix_test.py       |  69 ++++++++++++
 .../linalg/python/ops/linear_operator.py      | 105 ++++++++++++++++--
 2 files changed, 166 insertions(+), 8 deletions(-)

diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
index 12c299683a..528bc3ed12 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_full_matrix_test.py
@@ -17,12 +17,15 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import numpy as np
+
 from tensorflow.contrib import linalg as linalg_lib
 from tensorflow.contrib.linalg.python.ops import linear_operator_test_util
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import random_seed
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 
 linalg = linalg_lib
@@ -72,6 +75,44 @@ class SquareLinearOperatorFullMatrixTest(
     # Auto-detected.
     self.assertTrue(operator.is_square)
 
+  def test_assert_non_singular_raises_if_cond_too_big_but_finite(self):
+    with self.test_session():
+      tril = linear_operator_test_util.random_tril_matrix(
+          shape=(50, 50), dtype=np.float32)
+      diag = np.logspace(-2, 2, 50).astype(np.float32)
+      tril = array_ops.matrix_set_diag(tril, diag)
+      matrix = math_ops.matmul(tril, tril, transpose_b=True).eval()
+      operator = linalg.LinearOperatorFullMatrix(matrix)
+      with self.assertRaisesOpError("Singular matrix"):
+        # Ensure that we have finite condition number...just HUGE.
+        cond = np.linalg.cond(matrix)
+        self.assertTrue(np.isfinite(cond))
+        self.assertGreater(cond, 1e12)
+        operator.assert_non_singular().run()
+
+  def test_assert_non_singular_raises_if_cond_infinite(self):
+    with self.test_session():
+      matrix = [[1., 1.], [1., 1.]]
+      # We don't pass the is_self_adjoint hint here, which means we take the
+      # generic code path.
+      operator = linalg.LinearOperatorFullMatrix(matrix)
+      with self.assertRaisesOpError("Singular matrix"):
+        operator.assert_non_singular().run()
+
+  def test_assert_self_adjoint(self):
+    matrix = [[0., 1.], [0., 1.]]
+    operator = linalg.LinearOperatorFullMatrix(matrix)
+    with self.test_session():
+      with self.assertRaisesOpError("not equal to its adjoint"):
+        operator.assert_self_adjoint().run()
+
+  def test_assert_positive_definite(self):
+    matrix = [[1., 1.], [1., 1.]]
+    operator = linalg.LinearOperatorFullMatrix(matrix, is_self_adjoint=True)
+    with self.test_session():
+      with self.assertRaisesOpError("Cholesky decomposition was not success"):
+        operator.assert_positive_definite().run()
+
 
 class SquareLinearOperatorFullMatrixSymmetricPositiveDefiniteTest(
     linear_operator_test_util.SquareLinearOperatorDerivedClassTest):
@@ -136,6 +177,34 @@ class SquareLinearOperatorFullMatrixSymmetricPositiveDefiniteTest(
     self.assertTrue(operator._can_use_cholesky)
     self.assertTrue(operator.is_square)
 
+  def test_assert_non_singular(self):
+    matrix = [[1., 1.], [1., 1.]]
+    operator = linalg.LinearOperatorFullMatrix(
+        matrix, is_self_adjoint=True, is_positive_definite=True)
+    with self.test_session():
+      # Cholesky decomposition may fail, so the error is not specific to
+      # non-singular.
+      with self.assertRaisesOpError(""):
+        operator.assert_non_singular().run()
+
+  def test_assert_self_adjoint(self):
+    matrix = [[0., 1.], [0., 1.]]
+    operator = linalg.LinearOperatorFullMatrix(
+        matrix, is_self_adjoint=True, is_positive_definite=True)
+    with self.test_session():
+      with self.assertRaisesOpError("not equal to its adjoint"):
+        operator.assert_self_adjoint().run()
+
+  def test_assert_positive_definite(self):
+    matrix = [[1., 1.], [1., 1.]]
+    operator = linalg.LinearOperatorFullMatrix(
+        matrix, is_self_adjoint=True, is_positive_definite=True)
+    with self.test_session():
+      # Cholesky decomposition may fail, so the error is not specific to
+      # non-singular.
+      with self.assertRaisesOpError(""):
+        operator.assert_positive_definite().run()
+
 
 class NonSquareLinearOperatorFullMatrixTest(
     linear_operator_test_util.NonSquareLinearOperatorDerivedClassTest):
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator.py b/tensorflow/contrib/linalg/python/ops/linear_operator.py
index 8d0a1d7de2..605ab1511d 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator.py
@@ -21,12 +21,16 @@ from __future__ import print_function
 import abc
 import contextlib
 
+import numpy as np
+
 from tensorflow.contrib import framework as contrib_framework
 from tensorflow.contrib.linalg.python.ops import linear_operator_util
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
 from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import tf_logging as logging
 
 __all__ = ["LinearOperator"]
 
@@ -456,14 +460,70 @@ class LinearOperator(object):
       return self._cached_range_dimension_tensor
 
   def _assert_non_singular(self):
+    """Private default implementation of _assert_non_singular."""
+    logging.warn(
+        "Using (possibly slow) default implementation of assert_non_singular."
+        "  Requires conversion to a dense matrix and O(N^3) operations.")
+    if self._can_use_cholesky():
+      return self.assert_positive_definite()
+    else:
+      singular_values = linalg_ops.svd(
+          self._get_cached_dense_matrix(), compute_uv=False)
+      # TODO(langmore) Add .eig and .cond as methods.
+      cond = (math_ops.reduce_max(singular_values, axis=-1) /
+              math_ops.reduce_min(singular_values, axis=-1))
+      return check_ops.assert_less(
+          cond,
+          self._max_condition_number_to_be_non_singular(),
+          message="Singular matrix up to precision epsilon.")
     raise NotImplementedError("assert_non_singular is not implemented.")
 
+  def _max_condition_number_to_be_non_singular(self):
+    """Return the maximum condition number that we consider nonsingular."""
+    with ops.name_scope("max_nonsingular_condition_number"):
+      dtype_eps = np.finfo(self.dtype.as_numpy_dtype).eps
+      eps = math_ops.cast(
+          math_ops.reduce_max([
+              100.,
+              math_ops.cast(self.range_dimension_tensor(), self.dtype),
+              math_ops.cast(self.domain_dimension_tensor(), self.dtype)
+          ]), self.dtype) * dtype_eps
+      return 1. / eps
+
   def assert_non_singular(self, name="assert_non_singular"):
-    """Returns an `Op` that asserts this operator is non singular."""
+    """Returns an `Op` that asserts this operator is non singular.
+
+    This operator is considered non-singular if
+
+    ```
+    ConditionNumber < max{100, range_dimension, domain_dimension} * eps,
+    eps := np.finfo(self.dtype.as_numpy_dtype).eps
+    ```
+
+    Args:
+      name:  A string name to prepend to created ops.
+
+    Returns:
+      An `Assert` `Op`, that, when run, will raise an `InvalidArgumentError` if
+        the operator is singular.
+    """
     with self._name_scope(name):
       return self._assert_non_singular()
 
   def _assert_positive_definite(self):
+    """Default implementation of _assert_positive_definite."""
+    logging.warn(
+        "Using (possibly slow) default implementation of "
+        "assert_positive_definite."
+        "  Requires conversion to a dense matrix and O(N^3) operations.")
+    # If the operator is self-adjoint, then checking that
+    # Cholesky decomposition succeeds + results in positive diag is necessary
+    # and sufficient.
+    if self.is_self_adjoint:
+      return check_ops.assert_positive(
+          array_ops.matrix_diag_part(self._get_cached_chol()),
+          message="Matrix was not positive definite.")
+    # We have no generic check for positive definite.
     raise NotImplementedError("assert_positive_definite is not implemented.")
 
   def assert_positive_definite(self, name="assert_positive_definite"):
@@ -477,16 +537,35 @@ class LinearOperator(object):
       name:  A name to give this `Op`.
 
     Returns:
-      An `Op` that asserts this operator is positive definite.
+      An `Assert` `Op`, that, when run, will raise an `InvalidArgumentError` if
+        the operator is not positive definite.
     """
     with self._name_scope(name):
       return self._assert_positive_definite()
 
   def _assert_self_adjoint(self):
-    raise NotImplementedError("assert_self_adjoint is not implemented.")
+    dense = self._get_cached_dense_matrix()
+    logging.warn(
+        "Using (possibly slow) default implementation of assert_self_adjoint."
+        "  Requires conversion to a dense matrix.")
+    return check_ops.assert_equal(
+        dense,
+        linear_operator_util.matrix_adjoint(dense),
+        message="Matrix was not equal to its adjoint.")
 
   def assert_self_adjoint(self, name="assert_self_adjoint"):
-    """Returns an `Op` that asserts this operator is self-adjoint."""
+    """Returns an `Op` that asserts this operator is self-adjoint.
+
+    Here we check that this operator is *exactly* equal to its hermitian
+    transpose.
+
+    Args:
+      name:  A string name to prepend to created ops.
+
+    Returns:
+      An `Assert` `Op`, that, when run, will raise an `InvalidArgumentError` if
+        the operator is not self-adjoint.
+    """
     with self._name_scope(name):
       return self._assert_self_adjoint()
 
@@ -526,6 +605,9 @@ class LinearOperator(object):
       return self._apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
   def _determinant(self):
+    logging.warn(
+        "Using (possibly slow) default implementation of determinant."
+        "  Requires conversion to a dense matrix and O(N^3) operations.")
     if self._can_use_cholesky():
       return math_ops.exp(self.log_abs_determinant())
     return linalg_ops.matrix_determinant(self._matrix)
@@ -550,6 +632,9 @@ class LinearOperator(object):
       return self._determinant()
 
   def _log_abs_determinant(self):
+    logging.warn(
+        "Using (possibly slow) default implementation of determinant."
+        "  Requires conversion to a dense matrix and O(N^3) operations.")
     if self._can_use_cholesky():
       diag = array_ops.matrix_diag_part(self._get_cached_chol())
       return 2 * math_ops.reduce_sum(math_ops.log(diag), reduction_indices=[-1])
@@ -576,9 +661,13 @@ class LinearOperator(object):
       return self._log_abs_determinant()
 
   def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    """Default implementation of _solve."""
     if self.is_square is False:
       raise NotImplementedError(
           "Solve is not yet implemented for non-square operators.")
+    logging.warn(
+        "Using (possibly slow) default implementation of solve."
+        "  Requires conversion to a dense matrix and O(N^3) operations.")
     rhs = linear_operator_util.matrix_adjoint(rhs) if adjoint_arg else rhs
     if self._can_use_cholesky():
       return linalg_ops.cholesky_solve(self._get_cached_chol(), rhs)
@@ -643,6 +732,8 @@ class LinearOperator(object):
 
   def _to_dense(self):
     """Generic and often inefficient implementation.  Override often."""
+    logging.warn("Using (possibly slow) default implementation of to_dense."
+                 "  Converts by self.matmul(identity).")
     if self.batch_shape.is_fully_defined():
       batch_shape = self.batch_shape
     else:
@@ -663,7 +754,7 @@ class LinearOperator(object):
 
   def _diag_part(self):
     """Generic and often inefficient implementation.  Override often."""
-    return array_ops.matrix_diag_part(self.to_dense())
+    return array_ops.matrix_diag_part(self._get_cached_dense_matrix())
 
   def diag_part(self, name="diag_part"):
     """Efficiently get the [batch] diagonal part of this operator.
@@ -695,7 +786,7 @@ class LinearOperator(object):
 
   def _add_to_tensor(self, x):
     # Override if a more efficient implementation is available.
-    return self.to_dense() + x
+    return self._get_cached_dense_matrix() + x
 
   def add_to_tensor(self, x, name="add_to_tensor"):
     """Add matrix represented by this operator to `x`.  Equivalent to `A + x`.
@@ -723,8 +814,6 @@ class LinearOperator(object):
     return self._cached_dense_matrix
 
   def _get_cached_chol(self):
-    if not self._can_use_cholesky():
-      return None
     if not hasattr(self, "_cached_chol"):
       self._cached_chol = linalg_ops.cholesky(self._get_cached_dense_matrix())
     return self._cached_chol
-- 
GitLab


From 68624983042b2ff8aa4caa5ce29b199952fb1d4c Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Mon, 15 May 2017 10:36:11 -0700
Subject: [PATCH 1345/1563] StridedSliceAssign for resource variables.

PiperOrigin-RevId: 156071948
---
 tensorflow/core/kernels/BUILD                 |   1 +
 tensorflow/core/kernels/strided_slice_op.cc   | 198 +++++++++++-------
 tensorflow/core/ops/array_ops.cc              |  26 +++
 .../python/kernel_tests/array_ops_test.py     |  18 +-
 tensorflow/python/ops/array_ops.py            |   3 +-
 .../python/ops/resource_variable_ops.py       |  26 +++
 tensorflow/python/ops/variables.py            |  24 +++
 7 files changed, 217 insertions(+), 79 deletions(-)

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 5e5044981c..7a980f8f68 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -108,6 +108,7 @@ tf_kernel_library(
     deps = [
         ":bounds_check",
         ":ops_util",
+        ":variable_ops",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
         "//third_party/eigen3",
diff --git a/tensorflow/core/kernels/strided_slice_op.cc b/tensorflow/core/kernels/strided_slice_op.cc
index 24884578ea..20a6adc493 100644
--- a/tensorflow/core/kernels/strided_slice_op.cc
+++ b/tensorflow/core/kernels/strided_slice_op.cc
@@ -32,6 +32,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/kernels/bounds_check.h"
 #include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/kernels/variable_ops.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
 #include "tensorflow/core/platform/prefetch.h"
@@ -294,8 +295,16 @@ class StridedSliceAssignOp : public OpKernel {
     gtl::InlinedVector<int64, 4> end;
     gtl::InlinedVector<int64, 4> strides;
 
-    context->forward_ref_input_to_ref_output(0, 0);
-    Tensor old_lhs = context->mutable_input(0, true);
+    Tensor old_lhs;
+    if (context->input_dtype(0) == DT_RESOURCE) {
+      Var* v;
+      OP_REQUIRES_OK(context,
+                     LookupResource(context, HandleFromInput(context, 0), &v));
+      old_lhs = *v->tensor();
+    } else {
+      context->forward_ref_input_to_ref_output(0, 0);
+      old_lhs = context->mutable_input(0, true);
+    }
 
     ShapeReadWriteFromTensorShape wrapped_processing_shape(&processing_shape);
     ShapeReadWriteFromTensorShape wrapped_final_shape(&final_shape);
@@ -354,28 +363,35 @@ class StridedSliceAssignOp : public OpKernel {
   int32 ellipsis_mask, new_axis_mask, shrink_axis_mask;
 };
 
-#define REGISTER_STRIDED_SLICE(type)                           \
-  REGISTER_KERNEL_BUILDER(Name("StridedSlice")                 \
-                              .Device(DEVICE_CPU)              \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides"),          \
-                          StridedSliceOp<CPUDevice, type>)     \
-  REGISTER_KERNEL_BUILDER(Name("StridedSliceGrad")             \
-                              .Device(DEVICE_CPU)              \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("shape")             \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides"),          \
-                          StridedSliceGradOp<CPUDevice, type>) \
-  REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")           \
-                              .Device(DEVICE_CPU)              \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides"),          \
+#define REGISTER_STRIDED_SLICE(type)                             \
+  REGISTER_KERNEL_BUILDER(Name("StridedSlice")                   \
+                              .Device(DEVICE_CPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides"),            \
+                          StridedSliceOp<CPUDevice, type>)       \
+  REGISTER_KERNEL_BUILDER(Name("StridedSliceGrad")               \
+                              .Device(DEVICE_CPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("shape")               \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides"),            \
+                          StridedSliceGradOp<CPUDevice, type>)   \
+  REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")             \
+                              .Device(DEVICE_CPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides"),            \
+                          StridedSliceAssignOp<CPUDevice, type>) \
+  REGISTER_KERNEL_BUILDER(Name("ResourceStridedSliceAssign")     \
+                              .Device(DEVICE_CPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides"),            \
                           StridedSliceAssignOp<CPUDevice, type>)
 
 TF_CALL_ALL_TYPES(REGISTER_STRIDED_SLICE);
@@ -385,31 +401,39 @@ REGISTER_STRIDED_SLICE(bfloat16);
 
 #if GOOGLE_CUDA
 
-#define REGISTER_GPU(type)                                     \
-  REGISTER_KERNEL_BUILDER(Name("StridedSlice")                 \
-                              .Device(DEVICE_GPU)              \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides")           \
-                              .TypeConstraint<int32>("Index"), \
-                          StridedSliceOp<GPUDevice, type>)     \
-  REGISTER_KERNEL_BUILDER(Name("StridedSliceGrad")             \
-                              .Device(DEVICE_GPU)              \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("shape")             \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides")           \
-                              .TypeConstraint<int32>("Index"), \
-                          StridedSliceGradOp<GPUDevice, type>) \
-  REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")           \
-                              .Device(DEVICE_GPU)              \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides")           \
-                              .TypeConstraint<int32>("Index"), \
+#define REGISTER_GPU(type)                                       \
+  REGISTER_KERNEL_BUILDER(Name("StridedSlice")                   \
+                              .Device(DEVICE_GPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides")             \
+                              .TypeConstraint<int32>("Index"),   \
+                          StridedSliceOp<GPUDevice, type>)       \
+  REGISTER_KERNEL_BUILDER(Name("StridedSliceGrad")               \
+                              .Device(DEVICE_GPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("shape")               \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides")             \
+                              .TypeConstraint<int32>("Index"),   \
+                          StridedSliceGradOp<GPUDevice, type>)   \
+  REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")             \
+                              .Device(DEVICE_GPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides")             \
+                              .TypeConstraint<int32>("Index"),   \
+                          StridedSliceAssignOp<GPUDevice, type>) \
+  REGISTER_KERNEL_BUILDER(Name("ResourceStridedSliceAssign")     \
+                              .Device(DEVICE_GPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("begin")               \
+                              .HostMemory("end")                 \
+                              .HostMemory("strides")             \
+                              .TypeConstraint<int32>("Index"),   \
                           StridedSliceAssignOp<GPUDevice, type>)
 
 TF_CALL_GPU_NUMBER_TYPES(REGISTER_GPU);
@@ -449,36 +473,53 @@ REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")
                             .HostMemory("end")
                             .HostMemory("strides"),
                         StridedSliceAssignOp<CPUDevice, int32>)
+REGISTER_KERNEL_BUILDER(Name("ResourceStridedSliceAssign")
+                            .Device(DEVICE_GPU)
+                            .TypeConstraint<int32>("T")
+                            .TypeConstraint<int32>("Index")
+                            .HostMemory("ref")
+                            .HostMemory("begin")
+                            .HostMemory("end")
+                            .HostMemory("strides"),
+                        StridedSliceAssignOp<CPUDevice, int32>)
 #undef REGISTER_GPU
 
 #endif  // GOOGLE_CUDA
 
 #ifdef TENSORFLOW_USE_SYCL
-#define REGISTER_SYCL(type)                                    \
-  REGISTER_KERNEL_BUILDER(Name("StridedSlice")                 \
-                              .Device(DEVICE_SYCL)             \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides")           \
-                              .TypeConstraint<int32>("Index"), \
-                          StridedSliceOp<SYCLDevice, type>)    \
-  REGISTER_KERNEL_BUILDER(Name("StridedSliceGrad")             \
-                              .Device(DEVICE_SYCL)             \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("shape")             \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides")           \
-                              .TypeConstraint<int32>("Index"), \
-                          StridedSliceGradOp<SYCLDevice, type>)\
-  REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")           \
-                              .Device(DEVICE_SYCL)             \
-                              .TypeConstraint<type>("T")       \
-                              .HostMemory("begin")             \
-                              .HostMemory("end")               \
-                              .HostMemory("strides")           \
-                              .TypeConstraint<int32>("Index"), \
+#define REGISTER_SYCL(type)                                       \
+  REGISTER_KERNEL_BUILDER(Name("StridedSlice")                    \
+                              .Device(DEVICE_SYCL)                \
+                              .TypeConstraint<type>("T")          \
+                              .HostMemory("begin")                \
+                              .HostMemory("end")                  \
+                              .HostMemory("strides")              \
+                              .TypeConstraint<int32>("Index"),    \
+                          StridedSliceOp<SYCLDevice, type>)       \
+  REGISTER_KERNEL_BUILDER(Name("StridedSliceGrad")                \
+                              .Device(DEVICE_SYCL)                \
+                              .TypeConstraint<type>("T")          \
+                              .HostMemory("shape")                \
+                              .HostMemory("begin")                \
+                              .HostMemory("end")                  \
+                              .HostMemory("strides")              \
+                              .TypeConstraint<int32>("Index"),    \
+                          StridedSliceGradOp<SYCLDevice, type>)   \
+  REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")              \
+                              .Device(DEVICE_SYCL)                \
+                              .TypeConstraint<type>("T")          \
+                              .HostMemory("begin")                \
+                              .HostMemory("end")                  \
+                              .HostMemory("strides")              \
+                              .TypeConstraint<int32>("Index"),    \
+                          StridedSliceAssignOp<SYCLDevice, type>) \
+  REGISTER_KERNEL_BUILDER(Name("ResourceStridedSliceAssign")      \
+                              .Device(DEVICE_SYCL)                \
+                              .TypeConstraint<type>("T")          \
+                              .HostMemory("begin")                \
+                              .HostMemory("end")                  \
+                              .HostMemory("strides")              \
+                              .TypeConstraint<int32>("Index"),    \
                           StridedSliceAssignOp<SYCLDevice, type>)
 
 REGISTER_SYCL(float);
@@ -517,6 +558,15 @@ REGISTER_KERNEL_BUILDER(Name("StridedSliceAssign")
                             .HostMemory("end")
                             .HostMemory("strides"),
                         StridedSliceAssignOp<CPUDevice, int32>)
+REGISTER_KERNEL_BUILDER(Name("ResourceStridedSliceAssign")
+                            .Device(DEVICE_SYCL)
+                            .TypeConstraint<int32>("T")
+                            .TypeConstraint<int32>("Index")
+                            .HostMemory("ref")
+                            .HostMemory("begin")
+                            .HostMemory("end")
+                            .HostMemory("strides"),
+                        StridedSliceAssignOp<CPUDevice, int32>)
 #undef REGISTER_SYCL
 #endif // TENSORFLOW_USE_SYCL
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index a1d09bd503..3d52a29de5 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -2485,6 +2485,32 @@ shape must be exactly the shape produced by the slice of `ref`.
 // broadcasting.
 // --------------------------------------------------------------------------
 
+REGISTER_OP("ResourceStridedSliceAssign")
+    .Input("ref: resource")
+    .Input("begin: Index")
+    .Input("end: Index")
+    .Input("strides: Index")
+    .Input("value: T")
+    .Attr("T: type")
+    .Attr("Index: {int32, int64}")
+    .Attr("begin_mask: int = 0")
+    .Attr("end_mask: int = 0")
+    .Attr("ellipsis_mask: int = 0")
+    .Attr("new_axis_mask: int = 0")
+    .Attr("shrink_axis_mask: int = 0")
+    .SetShapeFn(shape_inference::NoOutputs)
+    .Doc(R"doc(
+Assign `value` to the sliced l-value reference of `ref`.
+
+The values of `value` are assigned to the positions in the variable
+`ref` that are selected by the slice parameters. The slice parameters
+`begin, `end`, `strides`, etc. work exactly as in `StridedSlice`.
+
+NOTE this op currently does not support broadcasting and so `value`'s
+shape must be exactly the shape produced by the slice of `ref`.
+
+)doc");
+
 REGISTER_OP("Tile")
     .Input("input: T")
     .Input("multiples: Tmultiples")
diff --git a/tensorflow/python/kernel_tests/array_ops_test.py b/tensorflow/python/kernel_tests/array_ops_test.py
index 23d8e89283..49695dd3ca 100644
--- a/tensorflow/python/kernel_tests/array_ops_test.py
+++ b/tensorflow/python/kernel_tests/array_ops_test.py
@@ -33,6 +33,7 @@ from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import gradients_impl
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test as test_lib
@@ -807,9 +808,10 @@ class StridedSliceBenchmark(test_lib.Benchmark):
 
 class StridedSliceAssignChecker(object):
 
-  def __init__(self, test, x, tensor_type=dtypes.float32):
+  def __init__(self, test, x, tensor_type=dtypes.float32, use_resource=False):
     self.tensor_type = tensor_type
     self.test = test
+    self._use_resource = use_resource
 
     self.x_np = np.array(x).astype(tensor_type.as_numpy_dtype)
     # Give the value a non-zero imaginary component for complex types.
@@ -824,7 +826,10 @@ class StridedSliceAssignChecker(object):
       value -= 1j * value
 
     with self.test.test_session(use_gpu=True) as sess:
-      var = variables.Variable(self.x)
+      if self._use_resource:
+        var = resource_variable_ops.ResourceVariable(self.x)
+      else:
+        var = variables.Variable(self.x)
       sess.run(variables.initialize_variables([var]))
       val = sess.run(var[index].assign(value))
       # val_copy is used to check that tf.assign works equivalently to the
@@ -846,9 +851,10 @@ class SliceAssignTest(test_util.TensorFlowTestCase):
         bar = foo[:2].assign(constant_op.constant([1, 2]))
         sess.run(bar)
 
-  def testSliceAssign(self):
+  def doTestSliceAssign(self, use_resource):
     for dtype in STRIDED_SLICE_TYPES:
       checker = StridedSliceAssignChecker(self, [[1, 2, 3], [4, 5, 6]],
+                                          use_resource=use_resource,
                                           tensor_type=dtype)
       # Check if equal
       checker[:] = [[10, 20, 30], [40, 50, 60]]
@@ -873,6 +879,12 @@ class SliceAssignTest(test_util.TensorFlowTestCase):
     checker2[...] = 6  # ellipsis
     checker2[None] = [6]  # new axis
 
+  def testSliceAssign(self):
+    self.doTestSliceAssign(use_resource=False)
+
+  def testSliceAssignResource(self):
+    self.doTestSliceAssign(use_resource=True)
+
   def testUninitialized(self):
     with self.assertRaisesRegexp(
         errors.FailedPreconditionError,
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index f1c4d922e0..d06eb77987 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -673,8 +673,7 @@ def strided_slice(input_,
     if name is None:
       name = parent_name + "_assign"
 
-    return gen_array_ops.strided_slice_assign(
-        ref=var,
+    return var._strided_slice_assign(
         begin=begin,
         end=end,
         strides=strides,
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 5d3049ebe7..842bb48d0f 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -25,6 +25,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import gen_array_ops
 from tensorflow.python.ops import gen_resource_variable_ops
 from tensorflow.python.ops import variables
 # go/tf-wildcard-import
@@ -435,6 +436,31 @@ class ResourceVariable(object):
             ops.convert_to_tensor(value, dtype=self.dtype), name=name)]):
       return self.read_value()
 
+  def _strided_slice_assign(self,
+                            begin,
+                            end,
+                            strides,
+                            value,
+                            name,
+                            begin_mask,
+                            end_mask,
+                            ellipsis_mask,
+                            new_axis_mask,
+                            shrink_axis_mask):
+    with ops.control_dependencies([gen_array_ops.resource_strided_slice_assign(
+        ref=self.handle,
+        begin=begin,
+        end=end,
+        strides=strides,
+        value=value,
+        name=name,
+        begin_mask=begin_mask,
+        end_mask=end_mask,
+        ellipsis_mask=ellipsis_mask,
+        new_axis_mask=new_axis_mask,
+        shrink_axis_mask=shrink_axis_mask)]):
+      return self.value()
+
 
 # pylint: disable=unused-argument,protected-access
 def _dense_var_to_tensor(var, dtype=None, name=None, as_ref=False):
diff --git a/tensorflow/python/ops/variables.py b/tensorflow/python/ops/variables.py
index 33523f1a71..d5ffd9ac33 100644
--- a/tensorflow/python/ops/variables.py
+++ b/tensorflow/python/ops/variables.py
@@ -24,6 +24,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import gen_array_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.util import compat
@@ -569,6 +570,29 @@ class Variable(object):
         sparse_delta.values,
         use_locking=use_locking)
 
+  def _strided_slice_assign(self,
+                            begin,
+                            end,
+                            strides,
+                            value,
+                            name,
+                            begin_mask,
+                            end_mask,
+                            ellipsis_mask,
+                            new_axis_mask,
+                            shrink_axis_mask):
+    return gen_array_ops.strided_slice_assign(ref=self._ref(),
+                                              begin=begin,
+                                              end=end,
+                                              strides=strides,
+                                              value=value,
+                                              name=name,
+                                              begin_mask=begin_mask,
+                                              end_mask=end_mask,
+                                              ellipsis_mask=ellipsis_mask,
+                                              new_axis_mask=new_axis_mask,
+                                              shrink_axis_mask=shrink_axis_mask)
+
   def count_up_to(self, limit):
     """Increments this variable until it reaches `limit`.
 
-- 
GitLab


From 32b3f6501eb2d644398936bc4884719ba59bd168 Mon Sep 17 00:00:00 2001
From: Junwei Pan <pandevirus@gmail.com>
Date: Mon, 15 May 2017 10:48:12 -0700
Subject: [PATCH 1346/1563] Add and update reference for crelu and relu6
 (#9803)

---
 tensorflow/python/ops/nn_ops.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 61fda3a798..b76f1f4be3 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -1324,7 +1324,7 @@ def crelu(features, name=None):
   Concatenates a ReLU which selects only the positive part of the activation
   with a ReLU which selects only the *negative* part of the activation.
   Note that as a result this non-linearity doubles the depth of the activations.
-  Source: https://arxiv.org/abs/1603.05201
+  Source: [Understanding and Improving Convolutional Neural Networks via Concatenated Rectified Linear Units. W. Shang, et al.](https://arxiv.org/abs/1603.05201) 
 
   Args:
     features: A `Tensor` with type `float`, `double`, `int32`, `int64`, `uint8`,
@@ -1342,6 +1342,7 @@ def crelu(features, name=None):
 
 def relu6(features, name=None):
   """Computes Rectified Linear 6: `min(max(features, 0), 6)`.
+  Source: [Convolutional Deep Belief Networks on CIFAR-10. A. Krizhevsky](http://www.cs.utoronto.ca/~kriz/conv-cifar10-aug2010.pdf)
 
   Args:
     features: A `Tensor` with type `float`, `double`, `int32`, `int64`, `uint8`,
-- 
GitLab


From 0b50067a21e8d7293ec1ac6f0c4144930dc1cae5 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Mon, 15 May 2017 10:46:32 -0700
Subject: [PATCH 1347/1563] Reset TensorFlow when destructing the SingleMachine
 cluster

PiperOrigin-RevId: 156073357
---
 tensorflow/core/grappler/clusters/single_machine.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index e255b17631..540819bc59 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -59,6 +59,8 @@ SingleMachine::~SingleMachine() {
   // Reset the thread-pool so that there are no outstanding Session::Run(...)s
   // when we delete the session.
   thread_pool_.reset();
+
+  Reset(options_, {}).IgnoreError();
 }
 
 Status SingleMachine::Provision() {
-- 
GitLab


From d5b91405c0641e2067f7bb6a6c57e74b2a884418 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 10:48:56 -0700
Subject: [PATCH 1348/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 156073803
---
 .../core/ops/compat/ops_history.v1.pbtxt      | 73 ++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 | 75 +++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 75fabe1606..5dd18d4ba3 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -18420,6 +18420,79 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "ResourceStridedSliceAssign"
+  input_arg {
+    name: "ref"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "begin"
+    type_attr: "Index"
+  }
+  input_arg {
+    name: "end"
+    type_attr: "Index"
+  }
+  input_arg {
+    name: "strides"
+    type_attr: "Index"
+  }
+  input_arg {
+    name: "value"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "Index"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "begin_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "end_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "ellipsis_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "new_axis_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "shrink_axis_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "Restore"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 8cbebb0041..8079555128 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -18872,6 +18872,81 @@ op {
   description: "Note that in dense implementation of this algorithm, ms and mom will\nupdate even if the grad is zero, but in this sparse implementation, ms\nand mom will not update in iterations during which the grad is zero.\n\nmean_square = decay * mean_square + (1-decay) * gradient ** 2\nDelta = learning_rate * gradient / sqrt(mean_square + epsilon)\n\nms <- rho * ms_{t-1} + (1-rho) * grad * grad\nmom <- momentum * mom_{t-1} + lr * grad / sqrt(ms + epsilon)\nvar <- var - mom"
   is_stateful: true
 }
+op {
+  name: "ResourceStridedSliceAssign"
+  input_arg {
+    name: "ref"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "begin"
+    type_attr: "Index"
+  }
+  input_arg {
+    name: "end"
+    type_attr: "Index"
+  }
+  input_arg {
+    name: "strides"
+    type_attr: "Index"
+  }
+  input_arg {
+    name: "value"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "Index"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "begin_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "end_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "ellipsis_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "new_axis_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  attr {
+    name: "shrink_axis_mask"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  summary: "Assign `value` to the sliced l-value reference of `ref`."
+  description: "The values of `value` are assigned to the positions in the variable\n`ref` that are selected by the slice parameters. The slice parameters\n`begin, `end`, `strides`, etc. work exactly as in `StridedSlice`.\n\nNOTE this op currently does not support broadcasting and so `value`\'s\nshape must be exactly the shape produced by the slice of `ref`."
+  is_stateful: true
+}
 op {
   name: "Restore"
   input_arg {
-- 
GitLab


From 03bad01fa62b5a47caf9011114877a3a59152042 Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Mon, 15 May 2017 10:52:13 -0700
Subject: [PATCH 1349/1563] Add a tutorial that explains the TensorBoard
 histogram dashboard.

PiperOrigin-RevId: 156074304
---
 tensorflow/docs_src/get_started/leftnav_files |   1 +
 .../get_started/tensorboard_histograms.md     | 243 ++++++++++++++++++
 tensorflow/python/summary/summary.py          |   5 +
 3 files changed, 249 insertions(+)
 create mode 100644 tensorflow/docs_src/get_started/tensorboard_histograms.md

diff --git a/tensorflow/docs_src/get_started/leftnav_files b/tensorflow/docs_src/get_started/leftnav_files
index d688d27ae2..812f248d3e 100644
--- a/tensorflow/docs_src/get_started/leftnav_files
+++ b/tensorflow/docs_src/get_started/leftnav_files
@@ -9,3 +9,4 @@ monitors.md
 summaries_and_tensorboard.md
 embedding_viz.md
 graph_viz.md
+tensorboard_histograms.md
diff --git a/tensorflow/docs_src/get_started/tensorboard_histograms.md b/tensorflow/docs_src/get_started/tensorboard_histograms.md
new file mode 100644
index 0000000000..b3dd13497e
--- /dev/null
+++ b/tensorflow/docs_src/get_started/tensorboard_histograms.md
@@ -0,0 +1,243 @@
+# TensorBoard Histogram Dashboard
+
+The TensorBoard Histogram Dashboard displays how the distribution of some
+`Tensor` in your TensorFlow graph has changed over time. It does this by showing
+many histograms visualizations of your tensor at different points in time.
+
+## A Basic Example
+
+Let's start with a simple case: a normally-distributed variable, where the mean
+shifts over time.
+TensorFlow has an op
+[`tf.random_normal`](https://www.tensorflow.org/api_docs/python/tf/random_normal)
+which is perfect for this purpose. As is usually the case with TensorBoard, we
+will ingest data using a summary op; in this case,
+['tf.summary.histogram'](https://www.tensorflow.org/api_docs/python/tf/summary/histogram).
+For a primer on how summaries work, please see the general
+[TensorBoard tutorial](https://www.tensorflow.org/get_started/summaries_and_tensorboard).
+
+Here is a code snippet that will generate some histogram summaries containing
+normally distributed data, where the mean of the distribution increases over
+time.
+
+```python
+import tensorflow as tf
+
+k = tf.placeholder(tf.float32)
+
+# Make a normal distribution, with a shifting mean
+mean_moving_normal = tf.random_normal(shape=[1000], mean=(5*k), stddev=1)
+# Record that distribution into a histogram summary
+tf.summary.histogram("normal/moving_mean", mean_moving_normal)
+
+# Setup a session and summary writer
+sess = tf.Session()
+writer = tf.summary.FileWriter("/tmp/histogram_example")
+
+# Setup a loop and write the summaries to disk
+N = 400
+for step in range(N):
+  k_val = step/float(N)
+  summ = sess.run(summaries, feed_dict={k: k_val})
+  writer.add_summary(summ, global_step=step)
+```
+
+Once that code runs, we can load the data into TensorBoard via the command line:
+
+
+```sh
+tensorboard --logdir=/tmp/histogram_example
+```
+
+Once TensorBoard is running, load it in Chrome or Firefox and navigate to the
+Histogram Dashboard. Then we can see a histogram visualization for our normally
+distributed data.
+
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/1_moving_mean.png)
+
+`tf.summary.histogram` takes an arbitrarily sized and shaped Tensor, and
+compresses it into a histogram data structure consisting of many bins with
+widths and counts. For example, let's say we want to organize the numbers
+`[0.5, 1.1, 1.3, 2.2, 2.9, 2.99]` into bins. We could make three bins:
+* a bin
+containing everything from 0 to 1 (it would contain one element, 0.5),
+* a bin
+containing everything from 1-2 (it would contain two elements, 1.1 and 1.3),
+* a bin containing everything from 2-3 (it would contain three elements: 2.2,
+2.9 and 2.99).
+
+TensorFlow uses a similar approach to create bins, but unlike in our example, it
+doesn't create integer bins. For large, sparse datasets, that might result in
+many thousands of bins.
+Instead, [the bins are exponentially distributed, with many bins close to 0 and
+comparatively few bins for very large numbers.](https://github.com/tensorflow/tensorflow/blob/c8b59c046895fa5b6d79f73e0b5817330fcfbfc1/tensorflow/core/lib/histogram/histogram.cc#L28)
+However, visualizing exponentially-distributed bins is tricky; if height is used
+to encode count, then wider bins take more space, even if they have the same
+number of elements. Conversely, encoding count in the area makes height
+comparisons impossible. Instead, the histograms [resample the data](https://github.com/tensorflow/tensorflow/blob/17c47804b86e340203d451125a721310033710f1/tensorflow/tensorboard/components/tf_backend/backend.ts#L400)
+into uniform bins. This can lead to unfortunate artifacts in some cases.
+
+Each slice in the histogram visualizer displays a single histogram.
+The slices are organized by step;
+older slices (e.g. step 0) are further "back" and darker, while newer slices
+(e.g. step 400) are close to the foreground, and lighter in color.
+The y-axis on the right shows the step number.
+
+You can mouse over the histogram to see tooltips with some more detailed
+information. For example, in the following image we can see that the histogram
+at timestep 176 has a bin centered at 2.25 with 177 elements in that bin.
+
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/2_moving_mean_tooltip.png)
+
+Also, you may note that the histogram slices are not always evenly spaced in
+step count or time. This is because TensorBoard uses
+[reservoir sampling](https://en.wikipedia.org/wiki/Reservoir_sampling) to keep a
+subset of all the histograms, to save on memory. Reservoir sampling guarantees
+that every sample has an equal likelihood of being included, but because it is
+a randomized algorithm, the samples chosen don't occur at even steps.
+
+## Overlay Mode
+
+There is a control on the left of the dashboard that allows you to toggle the
+histogram mode from "offset" to "overlay":
+
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/3_overlay_offset.png)
+
+In "offset" mode, the visualization rotates 45 degrees, so that the individual
+histogram slices are no longer spread out in time, but instead are all plotted
+on the same y-axis.
+
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/4_overlay.png)
+Now, each slice is a separate line on the chart, and the y-axis shows the item
+count within each bucket. Darker lines are older, earlier steps, and lighter
+lines are more recent, later steps. Once again, you can mouse over the chart to
+see some additional information.
+
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/5_overlay_tooltips.png)
+
+In general, the overlay visualization is useful if you want to directly compare
+the counts of different histograms.
+
+## Multimodal Distributions
+
+The Histogram Dashboard is great for visualizing multimodal
+distributions. Let's construct a simple bimodal distribution by concatenating
+the outputs from two different normal distributions. The code will look like
+this:
+
+```python
+import tensorflow as tf
+
+k = tf.placeholder(tf.float32)
+
+# Make a normal distribution, with a shifting mean
+mean_moving_normal = tf.random_normal(shape=[1000], mean=(5*k), stddev=1)
+# Record that distribution into a histogram summary
+tf.summary.histogram("normal/moving_mean", mean_moving_normal)
+
+# Make a normal distribution with shrinking variance
+variance_shrinking_normal = tf.random_normal(shape=[1000], mean=0, stddev=1-(k))
+# Record that distribution too
+tf.summary.histogram("normal/shrinking_variance", variance_shrinking_normal)
+
+# Let's combine both of those distributions into one dataset
+normal_combined = tf.concat([mean_moving_normal, variance_shrinking_normal], 0)
+# We add another histogram summary to record the combined distribution
+tf.summary.histogram("normal/bimodal", normal_combined)
+
+summaries = tf.summary.merge_all()
+
+# Setup a session and summary writer
+sess = tf.Session()
+writer = tf.summary.FileWriter("/tmp/histogram_example")
+
+# Setup a loop and write the summaries to disk
+N = 400
+for step in range(N):
+  k_val = step/float(N)
+  summ = sess.run(summaries, feed_dict={k: k_val})
+  writer.add_summary(summ, global_step=step)
+```
+
+You already remember our "moving mean" normal distribution from the example
+above. Now we also have a "shrinking variance" distribution. Side-by-side, they
+look like this:
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/6_two_distributions.png)
+
+When we concatenate them, we get a chart that clearly reveals the divergent,
+bimodal structure:
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/7_bimodal.png)
+
+## Some more distributions
+
+Just for fun, let's generate and visualize a few more distributions, and then
+combine them all into one chart. Here's the code we'll use:
+
+```python
+import tensorflow as tf
+
+k = tf.placeholder(tf.float32)
+
+# Make a normal distribution, with a shifting mean
+mean_moving_normal = tf.random_normal(shape=[1000], mean=(5*k), stddev=1)
+# Record that distribution into a histogram summary
+tf.summary.histogram("normal/moving_mean", mean_moving_normal)
+
+# Make a normal distribution with shrinking variance
+variance_shrinking_normal = tf.random_normal(shape=[1000], mean=0, stddev=1-(k))
+# Record that distribution too
+tf.summary.histogram("normal/shrinking_variance", variance_shrinking_normal)
+
+# Let's combine both of those distributions into one dataset
+normal_combined = tf.concat([mean_moving_normal, variance_shrinking_normal], 0)
+# We add another histogram summary to record the combined distribution
+tf.summary.histogram("normal/bimodal", normal_combined)
+
+# Add a gamma distribution
+gamma = tf.random_gamma(shape=[1000], alpha=k)
+tf.summary.histogram("gamma", gamma)
+
+# And a poisson distribution
+poisson = tf.random_poisson(shape=[1000], lam=k)
+tf.summary.histogram("poisson", poisson)
+
+# And a uniform distribution
+uniform = tf.random_uniform(shape=[1000], maxval=k*10)
+tf.summary.histogram("uniform", uniform)
+
+# Finally, combine everything together!
+all_distributions = [mean_moving_normal, variance_shrinking_normal,
+                     gamma, poisson, uniform]
+all_combined = tf.concat(all_distributions, 0)
+tf.summary.histogram("all_combined", all_combined)
+
+summaries = tf.summary.merge_all()
+
+# Setup a session and summary writer
+sess = tf.Session()
+writer = tf.summary.FileWriter("/tmp/histogram_example")
+
+# Setup a loop and write the summaries to disk
+N = 400
+for step in range(N):
+  k_val = step/float(N)
+  summ = sess.run(summaries, feed_dict={k: k_val})
+  writer.add_summary(summ, global_step=step)
+```
+### Gamma Distribution
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/8_gamma.png)
+
+### Uniform Distribution
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/9_uniform.png)
+
+### Poisson Distribution
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/10_poisson.png)
+The poisson distribution is defined over the integers. So, all of the values
+being generated are perfect integers. The histogram compression moves the data
+into floating-point bins, causing the visualization to show little
+bumps over the integer values rather than perfect spikes.
+
+### All Together Now
+Finally, we can concatenate all of the data into one funny-looking curve.
+![](https://www.tensorflow.org/images/tensorboard/histogram_dashboard/11_all_combined.png)
+
diff --git a/tensorflow/python/summary/summary.py b/tensorflow/python/summary/summary.py
index d130588fa2..efcc59465a 100644
--- a/tensorflow/python/summary/summary.py
+++ b/tensorflow/python/summary/summary.py
@@ -190,6 +190,11 @@ def histogram(name, values, collections=None):
   # pylint: disable=line-too-long
   """Outputs a `Summary` protocol buffer with a histogram.
 
+  Adding a histogram summary makes it possible to visualize your data's
+  distribution in TensorBoard. You can see a detailed explanation of the
+  TensorBoard histogram dashboard
+  [here](https://www.tensorflow.org/get_started/tensorboard_histograms).
+
   The generated
   [`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
   has one summary value containing a histogram for `values`.
-- 
GitLab


From 471cd893237de86dcd38ae39e677ad8a229d0f1e Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Mon, 15 May 2017 10:52:57 -0700
Subject: [PATCH 1350/1563] Remove TensorBoard README reference to Event
 Accumulator, which isn't part of the public API and will probably leave the
 TensorFlow repo soon.

PiperOrigin-RevId: 156074411
---
 tensorflow/tensorboard/README.md | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/tensorflow/tensorboard/README.md b/tensorflow/tensorboard/README.md
index c9e997044c..20be8593cb 100644
--- a/tensorflow/tensorboard/README.md
+++ b/tensorflow/tensorboard/README.md
@@ -303,19 +303,14 @@ events. This behavior may be disabled with the flag
 
 ### How can I export data from TensorBoard?
 
-If you'd like to export data to visualize elsewhere (e.g. iPython Notebook),
-that's possible too. You can directly depend on the underlying classes that
-TensorBoard uses for loading data: `python/summary/event_accumulator.py` (for
-loading data from a single run) or `python/summary/event_multiplexer.py` (for
-loading data from multiple runs, and keeping it organized). These classes load
-groups of event files, discard data that was "orphaned" by TensorFlow crashes,
-and organize the data by tag.
-
-As another option, there is a script
-(`tensorboard/scripts/serialize_tensorboard.py`) which will load a logdir just
-like TensorBoard does, but write all of the data out to disk as json instead of
-starting a server. This script is setup to make "fake TensorBoard backends" for
-testing, so it is a bit rough around the edges.
+The Scalar Dashboard supports exporting data; you can click the "enable
+download links" option in the left-hand bar. Then, each plot will provide
+download links for the data it contains.
+
+If you need access to the full dataset, you can read the event files that
+TensorBoard consumes by using the [`summary_iterator`](https://github.com/tensorflow/tensorflow/blob/e7f333b5f8b3c53b21d149d8d14c0cebbde431aa/tensorflow/python/summary/summary_iterator.py#L313)
+method.
+
 
 ### Can I overlap multiple plots?
 
-- 
GitLab


From ea2dd45c65bdaa907502a1e410b3142f1db16ef0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 10:54:23 -0700
Subject: [PATCH 1351/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 156074643
---
 tensorflow/go/op/wrappers.go | 71 ++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index c2e91e53b1..bc915789da 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -4345,6 +4345,77 @@ func QueueEnqueueV2(scope *Scope, handle tf.Output, components []tf.Output, opti
 	return scope.AddOperation(opspec)
 }
 
+// ResourceStridedSliceAssignAttr is an optional argument to ResourceStridedSliceAssign.
+type ResourceStridedSliceAssignAttr func(optionalAttr)
+
+// ResourceStridedSliceAssignBeginMask sets the optional begin_mask attribute to value.
+// If not specified, defaults to 0
+func ResourceStridedSliceAssignBeginMask(value int64) ResourceStridedSliceAssignAttr {
+	return func(m optionalAttr) {
+		m["begin_mask"] = value
+	}
+}
+
+// ResourceStridedSliceAssignEndMask sets the optional end_mask attribute to value.
+// If not specified, defaults to 0
+func ResourceStridedSliceAssignEndMask(value int64) ResourceStridedSliceAssignAttr {
+	return func(m optionalAttr) {
+		m["end_mask"] = value
+	}
+}
+
+// ResourceStridedSliceAssignEllipsisMask sets the optional ellipsis_mask attribute to value.
+// If not specified, defaults to 0
+func ResourceStridedSliceAssignEllipsisMask(value int64) ResourceStridedSliceAssignAttr {
+	return func(m optionalAttr) {
+		m["ellipsis_mask"] = value
+	}
+}
+
+// ResourceStridedSliceAssignNewAxisMask sets the optional new_axis_mask attribute to value.
+// If not specified, defaults to 0
+func ResourceStridedSliceAssignNewAxisMask(value int64) ResourceStridedSliceAssignAttr {
+	return func(m optionalAttr) {
+		m["new_axis_mask"] = value
+	}
+}
+
+// ResourceStridedSliceAssignShrinkAxisMask sets the optional shrink_axis_mask attribute to value.
+// If not specified, defaults to 0
+func ResourceStridedSliceAssignShrinkAxisMask(value int64) ResourceStridedSliceAssignAttr {
+	return func(m optionalAttr) {
+		m["shrink_axis_mask"] = value
+	}
+}
+
+// Assign `value` to the sliced l-value reference of `ref`.
+//
+// The values of `value` are assigned to the positions in the variable
+// `ref` that are selected by the slice parameters. The slice parameters
+// `begin, `end`, `strides`, etc. work exactly as in `StridedSlice`.
+//
+// NOTE this op currently does not support broadcasting and so `value`'s
+// shape must be exactly the shape produced by the slice of `ref`.
+//
+// Returns the created operation.
+func ResourceStridedSliceAssign(scope *Scope, ref tf.Output, begin tf.Output, end tf.Output, strides tf.Output, value tf.Output, optional ...ResourceStridedSliceAssignAttr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "ResourceStridedSliceAssign",
+		Input: []tf.Input{
+			ref, begin, end, strides, value,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
 // UnstageAttr is an optional argument to Unstage.
 type UnstageAttr func(optionalAttr)
 
-- 
GitLab


From 5d628d2cecdbf1f95565d70e32a8d90ac8150e47 Mon Sep 17 00:00:00 2001
From: Dan Ringwalt <ringwalt@google.com>
Date: Mon, 15 May 2017 10:59:58 -0700
Subject: [PATCH 1352/1563] Automated g4 rollback of changelist 155868794

PiperOrigin-RevId: 156075609
---
 tensorflow/contrib/util/BUILD                 | 19 +---
 tensorflow/contrib/util/__init__.py           |  3 +-
 tensorflow/contrib/util/create_example.py     | 61 -------------
 .../contrib/util/create_example_test.py       | 86 -------------------
 4 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 tensorflow/contrib/util/create_example.py
 delete mode 100644 tensorflow/contrib/util/create_example_test.py

diff --git a/tensorflow/contrib/util/BUILD b/tensorflow/contrib/util/BUILD
index a6d3ca7242..5ad8e3dd35 100644
--- a/tensorflow/contrib/util/BUILD
+++ b/tensorflow/contrib/util/BUILD
@@ -64,29 +64,12 @@ cc_binary(
 
 py_library(
     name = "util_py",
-    srcs = glob(
-        ["**/*.py"],
-        exclude = ["**/*_test.py"],
-    ),
+    srcs = glob(["**/*.py"]),
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:framework",
         "//tensorflow/python:platform",
         "//tensorflow/python:util",
-        "//third_party/py/numpy",
-    ],
-)
-
-py_test(
-    name = "create_example_test",
-    srcs = ["create_example_test.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":util_py",
-        "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:platform_test",
-        "//third_party/py/numpy",
     ],
 )
 
diff --git a/tensorflow/contrib/util/__init__.py b/tensorflow/contrib/util/__init__.py
index d976a3f208..08741cf8ca 100644
--- a/tensorflow/contrib/util/__init__.py
+++ b/tensorflow/contrib/util/__init__.py
@@ -18,7 +18,6 @@
 See @{$python/contrib.util} guide.
 
 @@constant_value
-@@create_example
 @@make_tensor_proto
 @@make_ndarray
 @@ops_used_by_graph_def
@@ -31,11 +30,11 @@ from __future__ import division
 from __future__ import print_function
 
 # pylint: disable=unused-import
-from tensorflow.contrib.util.create_example import create_example
 from tensorflow.python.framework.meta_graph import ops_used_by_graph_def
 from tensorflow.python.framework.meta_graph import stripped_op_list_for_graph
 from tensorflow.python.framework.tensor_util import constant_value
 from tensorflow.python.framework.tensor_util import make_tensor_proto
 from tensorflow.python.framework.tensor_util import MakeNdarray as make_ndarray
+# pylint: disable=unused_import
 from tensorflow.python.util.all_util import remove_undocumented
 remove_undocumented(__name__)
diff --git a/tensorflow/contrib/util/create_example.py b/tensorflow/contrib/util/create_example.py
deleted file mode 100644
index 8cb6e8809b..0000000000
--- a/tensorflow/contrib/util/create_example.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Utilities for constructing Example protos.
-
-Takes ndarrays, lists, or tuples for each feature.
-
-@@create_example
-"""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import numpy as np
-
-from tensorflow.core.example import example_pb2
-
-
-def create_example(**features):
-  """Constructs a `tf.train.Example` from the given features.
-
-  Args:
-    **features: Maps feature name to an integer, float, or string ndarray, or
-        another object convertible to an ndarray (list, tuple, etc).
-
-  Returns:
-    A `tf.train.Example` with the features.
-
-  Raises:
-    ValueError: if a feature is not integer, float, or string.
-  """
-  example = example_pb2.Example()
-  for name in features:
-    feature = example.features.feature[name]
-    values = np.asarray(features[name])
-    # Encode unicode using UTF-8.
-    if values.dtype.kind == 'U':
-      values = np.vectorize(lambda string: string.encode('utf-8'))(values)
-
-    if values.dtype.kind == 'i':
-      feature.int64_list.value.extend(values.astype(np.int64).ravel())
-    elif values.dtype.kind == 'f':
-      feature.float_list.value.extend(values.astype(np.float32).ravel())
-    elif values.dtype.kind == 'S':
-      feature.bytes_list.value.extend(values.ravel())
-    else:
-      raise ValueError('Feature "%s" has unexpected dtype: %s' % (name,
-                                                                  values.dtype))
-  return example
diff --git a/tensorflow/contrib/util/create_example_test.py b/tensorflow/contrib/util/create_example_test.py
deleted file mode 100644
index 091b6c75d0..0000000000
--- a/tensorflow/contrib/util/create_example_test.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Tests for the Example creation utilities."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import numpy as np
-
-from tensorflow.contrib import util
-from tensorflow.core.example import example_pb2
-from tensorflow.python.platform import googletest
-
-
-class CreateExampleTest(googletest.TestCase):
-
-  def testCreateExample_empty(self):
-    self.assertEqual(util.create_example(), example_pb2.Example())
-
-    # np.asarray([]) == np.array([], dtype=np.float64), but the dtype should not
-    # matter here.
-    actual = util.create_example(foo=[], bar=())
-    expected = example_pb2.Example()
-    expected.features.feature['foo'].float_list.value.extend([])
-    expected.features.feature['bar'].float_list.value.extend([])
-    self.assertEqual(actual, expected)
-
-  def testCreateExample_scalars(self):
-    actual = util.create_example(foo=3, bar=4.2, baz='x', qux=b'y')
-    expected = example_pb2.Example()
-    expected.features.feature['foo'].int64_list.value.append(3)
-    # 4.2 cannot be represented exactly in floating point.
-    expected.features.feature['bar'].float_list.value.append(np.float32(4.2))
-    expected.features.feature['baz'].bytes_list.value.append(b'x')
-    expected.features.feature['qux'].bytes_list.value.append(b'y')
-    self.assertEqual(actual, expected)
-
-  def testCreateExample_listContainingString(self):
-    actual = util.create_example(foo=[3, 4.2, 'foo'])
-    # np.asarray([3, 4.2, 'foo']) == np.array(['3', '4.2', 'foo'])
-    expected = example_pb2.Example()
-    expected.features.feature['foo'].bytes_list.value.extend(
-        [b'3', b'4.2', b'foo'])
-    self.assertEqual(actual, expected)
-
-  def testCreateExample_lists_tuples_ranges(self):
-    actual = util.create_example(
-        foo=[1, 2, 3, 4, 5], bar=(0.5, 0.25, 0.125), baz=range(3))
-    expected = example_pb2.Example()
-    expected.features.feature['foo'].int64_list.value.extend([1, 2, 3, 4, 5])
-    expected.features.feature['bar'].float_list.value.extend([0.5, 0.25, 0.125])
-    expected.features.feature['baz'].int64_list.value.extend([0, 1, 2])
-    self.assertEqual(actual, expected)
-
-  def testCreateExample_ndarrays(self):
-    a = np.random.random((3, 4, 5)).astype(np.float32)
-    b = np.random.randint(low=1, high=10, size=(6, 5, 4))
-    actual = util.create_example(A=a, B=b)
-    expected = example_pb2.Example()
-    expected.features.feature['A'].float_list.value.extend(a.ravel())
-    expected.features.feature['B'].int64_list.value.extend(b.ravel())
-    self.assertEqual(actual, expected)
-
-  def testCreateExample_unicode(self):
-    actual = util.create_example(A=[u'\u4242', u'\u5555'])
-    expected = example_pb2.Example()
-    expected.features.feature['A'].bytes_list.value.extend(
-        [u'\u4242'.encode('utf-8'), u'\u5555'.encode('utf-8')])
-    self.assertEqual(actual, expected)
-
-
-if __name__ == '__main__':
-  googletest.main()
-- 
GitLab


From eef5ba595d201c7caa104437fc29353063cc0cfd Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Mon, 15 May 2017 11:08:13 -0700
Subject: [PATCH 1353/1563] Mark flaky test as flaky.

PiperOrigin-RevId: 156076909
---
 tensorflow/contrib/learn/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD
index 148f2708c8..9d5d1a8413 100644
--- a/tensorflow/contrib/learn/BUILD
+++ b/tensorflow/contrib/learn/BUILD
@@ -1035,6 +1035,7 @@ py_test(
     srcs_version = "PY2AND3",
     tags = [
         "manual",  # http://b/31032996
+        "notap",  # TODO(b/37950026): Test is flaky
     ],
     deps = [
         ":learn",
-- 
GitLab


From 54efd636b504aad368eea254eca2970a16d457f6 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 15 May 2017 11:10:49 -0700
Subject: [PATCH 1354/1563] Update RNN helpers to be able to handle dynamic
 state sizes.

This fixes a bug I introduced previously by adding the alignment into the AttentionWrapper's state (since the alignment's size may have to be a Tensor - the encoder's max_time is not usually static).

PiperOrigin-RevId: 156077314
---
 .../state_saving_rnn_estimator_test.py        |  2 +-
 .../python/kernel_tests/seq2seq_test.py       |  4 +-
 tensorflow/contrib/rnn/python/ops/core_rnn.py |  7 +-
 .../python/kernel_tests/basic_decoder_test.py |  2 +-
 tensorflow/python/ops/rnn.py                  | 12 +--
 tensorflow/python/ops/rnn_cell_impl.py        | 91 ++++++++++++-------
 6 files changed, 71 insertions(+), 47 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
index 886aab5b4f..442247409d 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/state_saving_rnn_estimator_test.py
@@ -525,7 +525,7 @@ class StateSavingRNNEstimatorLearningTest(test.TestCase):
     num_classes = 2
     num_unroll = 32
     sequence_length = 32
-    train_steps = 200
+    train_steps = 300
     eval_steps = 20
     num_units = [4]
     learning_rate = 0.5
diff --git a/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py b/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py
index 8dcfb775b2..2898935a47 100644
--- a/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py
+++ b/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py
@@ -942,8 +942,8 @@ class Seq2SeqTest(test.TestCase):
         perplexities[bucket].append(math.exp(float(res[1])))
       for bucket in range(len(buckets)):
         if len(perplexities[bucket]) > 1:  # Assert that perplexity went down.
-          self.assertLess(perplexities[bucket][-1],  # 10% margin of error.
-                          1.1 * perplexities[bucket][0])
+          self.assertLess(perplexities[bucket][-1],  # 20% margin of error.
+                          1.2 * perplexities[bucket][0])
 
   def testModelWithBooleanFeedPrevious(self):
     """Test the model behavior when feed_previous is True.
diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn.py b/tensorflow/contrib/rnn/python/ops/core_rnn.py
index d254e717d5..bbfa6b8850 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn.py
@@ -31,7 +31,7 @@ from tensorflow.python.util import nest
 
 
 # pylint: disable=protected-access
-_state_size_with_prefix = rnn_cell_impl._state_size_with_prefix
+_concat = rnn_cell_impl._concat
 _infer_state_dtype = rnn._infer_state_dtype
 _reverse_seq = rnn._reverse_seq
 _rnn_step = rnn._rnn_step
@@ -159,11 +159,10 @@ def static_rnn(cell, inputs, initial_state=None, dtype=None,
             "sequence_length must be a vector of length batch_size")
       def _create_zero_output(output_size):
         # convert int to TensorShape if necessary
-        size = _state_size_with_prefix(output_size, prefix=[batch_size])
+        size = _concat(batch_size, output_size)
         output = array_ops.zeros(
             array_ops.stack(size), _infer_state_dtype(dtype, state))
-        shape = _state_size_with_prefix(
-            output_size, prefix=[fixed_batch_size.value])
+        shape = _concat(fixed_batch_size.value, output_size, static=True)
         output.set_shape(tensor_shape.TensorShape(shape))
         return output
 
diff --git a/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py b/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py
index 6b57293c6f..8fc4ecfc82 100644
--- a/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py
+++ b/tensorflow/contrib/seq2seq/python/kernel_tests/basic_decoder_test.py
@@ -124,7 +124,7 @@ class BasicDecoderTest(test.TestCase):
     vocabulary_size = 7
     cell_depth = vocabulary_size  # cell's logits must match vocabulary size
     input_depth = 10
-    start_tokens = [0] * batch_size
+    start_tokens = np.random.randint(0, vocabulary_size, size=batch_size)
     end_token = 1
 
     with self.test_session(use_gpu=True) as sess:
diff --git a/tensorflow/python/ops/rnn.py b/tensorflow/python/ops/rnn.py
index f7e98c941a..475c49091e 100644
--- a/tensorflow/python/ops/rnn.py
+++ b/tensorflow/python/ops/rnn.py
@@ -33,7 +33,7 @@ from tensorflow.python.util import nest
 
 
 # pylint: disable=protected-access
-_state_size_with_prefix = rnn_cell_impl._state_size_with_prefix
+_concat = rnn_cell_impl._concat
 # pylint: enable=protected-access
 
 
@@ -660,7 +660,7 @@ def _dynamic_rnn_loop(cell,
 
   # Prepare dynamic conditional copying of state & output
   def _create_zero_arrays(size):
-    size = _state_size_with_prefix(size, prefix=[batch_size])
+    size = _concat(batch_size, size)
     return array_ops.zeros(
         array_ops.stack(size), _infer_state_dtype(dtype, state))
 
@@ -746,8 +746,8 @@ def _dynamic_rnn_loop(cell,
 
   # Restore some shape information
   for output, output_size in zip(final_outputs, flat_output_size):
-    shape = _state_size_with_prefix(
-        output_size, prefix=[const_time_steps, const_batch_size])
+    shape = _concat(
+        [const_time_steps, const_batch_size], output_size, static=True)
     output.set_shape(shape)
 
   final_outputs = nest.pack_sequence_as(
@@ -981,9 +981,7 @@ def raw_rnn(cell, loop_fn,
     emit_ta = nest.pack_sequence_as(structure=emit_structure,
                                     flat_sequence=flat_emit_ta)
     flat_zero_emit = [
-        array_ops.zeros(
-            _state_size_with_prefix(size_i, prefix=[batch_size]),
-            dtype_i)
+        array_ops.zeros(_concat(batch_size, size_i), dtype_i)
         for size_i, dtype_i in zip(flat_emit_size, flat_emit_dtypes)]
     zero_emit = nest.pack_sequence_as(structure=emit_structure,
                                       flat_sequence=flat_zero_emit)
diff --git a/tensorflow/python/ops/rnn_cell_impl.py b/tensorflow/python/ops/rnn_cell_impl.py
index c7ac742b5d..cc2d9d037c 100644
--- a/tensorflow/python/ops/rnn_cell_impl.py
+++ b/tensorflow/python/ops/rnn_cell_impl.py
@@ -26,6 +26,7 @@ from __future__ import print_function
 
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.framework import tensor_util
 from tensorflow.python.layers import base as base_layer
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import variable_scope as vs
@@ -33,48 +34,74 @@ from tensorflow.python.ops import variables as tf_variables
 from tensorflow.python.util import nest
 
 
-def _state_size_with_prefix(state_size, prefix=None):
-  """Helper function that enables int or TensorShape shape specification.
+def _concat(prefix, suffix, static=False):
+  """Concat that enables int, Tensor, or TensorShape values.
 
-  This function takes a size specification, which can be an integer or a
-  TensorShape, and converts it into a list of integers. One may specify any
-  additional dimensions that precede the final state size specification.
+  This function takes a size specification, which can be an integer, a
+  TensorShape, or a Tensor, and converts it into a concatenated Tensor
+  (if static = False) or a list of integers (if static = True).
 
   Args:
-    state_size: TensorShape or int that specifies the size of a tensor.
-    prefix: optional additional list of dimensions to prepend.
+    prefix: The prefix; usually the batch size (and/or time step size).
+      (TensorShape, int, or Tensor.)
+    suffix: TensorShape, int, or Tensor.
+    static: If `True`, return a python list with possibly unknown dimensions.
+      Otherwise return a `Tensor`.
 
   Returns:
-    result_state_size: list of dimensions the resulting tensor size.
+    shape: the concatenation of prefix and suffix.
+
+  Raises:
+    ValueError: if `suffix` is not a scalar or vector (or TensorShape).
+    ValueError: if prefix or suffix was `None` and asked for dynamic
+      Tensors out.
   """
-  result_state_size = tensor_shape.as_shape(state_size).as_list()
-  if prefix is not None:
-    if not isinstance(prefix, list):
-      raise TypeError("prefix of _state_size_with_prefix should be a list.")
-    result_state_size = prefix + result_state_size
-  return result_state_size
+  if isinstance(prefix, ops.Tensor):
+    p = prefix
+    p_static = tensor_util.constant_value(prefix)
+    if p.shape.ndims == 0:
+      p = array_ops.expand_dims(p, 0)
+    elif p.shape.ndims != 1:
+      raise ValueError("prefix tensor must be either a scalar or vector, "
+                       "but saw tensor: %s" % p)
+  else:
+    p = tensor_shape.as_shape(prefix)
+    p = p.as_list() if p.ndims is not None else None
+    p_static = p
+  if isinstance(suffix, ops.Tensor):
+    s = suffix
+    s_static = tensor_util.constant_value(suffix)
+    if s.shape.ndims == 0:
+      s = array_ops.expand_dims(s, 0)
+    elif s.shape.ndims != 1:
+      raise ValueError("suffix tensor must be either a scalar or vector, "
+                       "but saw tensor: %s" % s)
+  else:
+    s = tensor_shape.as_shape(suffix)
+    s = s.as_list() if s.ndims is not None else None
+    s_static = s
+
+  if static:
+    shape = tensor_shape.as_shape(p_static).concatenate(s_static)
+    shape = shape.as_list() if shape.ndims is not None else None
+  else:
+    if p is None or s is None:
+      raise ValueError("Provided a prefix or suffix of None: %s and %s"
+                       % (prefix, suffix))
+    shape = array_ops.concat((p, s), 0)
+  return shape
 
 
 def _zero_state_tensors(state_size, batch_size, dtype):
   """Create tensors of zeros based on state_size, batch_size, and dtype."""
-  if nest.is_sequence(state_size):
-    state_size_flat = nest.flatten(state_size)
-    zeros_flat = [
-        array_ops.zeros(
-            array_ops.stack(_state_size_with_prefix(
-                s, prefix=[batch_size])),
-            dtype=dtype) for s in state_size_flat
-    ]
-    for s, z in zip(state_size_flat, zeros_flat):
-      z.set_shape(_state_size_with_prefix(s, prefix=[None]))
-    zeros = nest.pack_sequence_as(structure=state_size,
-                                  flat_sequence=zeros_flat)
-  else:
-    zeros_size = _state_size_with_prefix(state_size, prefix=[batch_size])
-    zeros = array_ops.zeros(array_ops.stack(zeros_size), dtype=dtype)
-    zeros.set_shape(_state_size_with_prefix(state_size, prefix=[None]))
-
-  return zeros
+  def get_state_shape(s):
+    """Combine s with batch_size to get a proper tensor shape."""
+    c = _concat(batch_size, s)
+    c_static = _concat(batch_size, s, static=True)
+    size = array_ops.zeros(c, dtype=dtype)
+    size.set_shape(c_static)
+    return size
+  return nest.map_structure(get_state_shape, state_size)
 
 
 class _RNNCell(base_layer.Layer):
-- 
GitLab


From 0dda9d4a87c04b7dc2717957ce3c17ed26bd2ffa Mon Sep 17 00:00:00 2001
From: ddurham2 <ddurham@davyandbeth.com>
Date: Mon, 15 May 2017 13:38:13 -0500
Subject: [PATCH 1355/1563] fixing $PATH search when running ffmpeg.  Previous
 code bailed on first failure of realpath() which didn't proceed to rest of
 $PATH (#9888)

---
 tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
index e520139e65..a4dd3a642f 100644
--- a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
+++ b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
@@ -70,8 +70,7 @@ bool IsBinaryInstalled(const string& binary_name) {
     const string binary_path = io::JoinPath(dir, binary_name);
     char absolute_path[PATH_MAX + 1];
     if (::realpath(binary_path.c_str(), absolute_path) == NULL) {
-      LOG(ERROR) << "Invalid binary path: " << binary_path;
-      return false;
+      continue;
     }
     struct stat statinfo;
     int result = ::stat(absolute_path, &statinfo);
-- 
GitLab


From ad24ce18411d47ab8148d8698453940c50e880d0 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Mon, 15 May 2017 12:12:38 -0700
Subject: [PATCH 1356/1563] Fix use of incorrect OpDef from another graph's
 function library in Graph::CopyNode().

PiperOrigin-RevId: 156086326
---
 tensorflow/core/graph/graph.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index dabc5a7849..d765959ca0 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -304,6 +304,17 @@ Node* Graph::CopyNode(Node* node) {
   props->Ref();
   Node* copy = AllocateNode(props, node);
   copy->set_assigned_device_name(node->assigned_device_name());
+
+  // Since the OpDef of a function may be owned by the Graph that owns 'node',
+  // relookup the OpDef in the target graph. If it differs, then clone the
+  // node properties with the updated OpDef.
+  const OpDef* op_def;
+  TF_CHECK_OK(ops_.LookUpOpDef(node->type_string(), &op_def));
+  if (op_def != props->op_def_) {
+    copy->MaybeCopyOnWrite();
+    copy->props_->op_def_ = op_def;
+  }
+
   return copy;
 }
 
-- 
GitLab


From 652252e0d2d54769b3a37212eaf06939bb68e99a Mon Sep 17 00:00:00 2001
From: Neal Wu <wun@google.com>
Date: Mon, 15 May 2017 12:39:26 -0700
Subject: [PATCH 1357/1563] Fixed the documentation for tf.layers.conv2d to
 indicate that `use_bias` takes precedence over `bias_initializer`

PiperOrigin-RevId: 156089552
---
 tensorflow/python/layers/convolutional.py | 134 +++++++++++-----------
 1 file changed, 65 insertions(+), 69 deletions(-)

diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py
index 938161f426..707d30b0e0 100644
--- a/tensorflow/python/layers/convolutional.py
+++ b/tensorflow/python/layers/convolutional.py
@@ -42,9 +42,9 @@ class _Conv(base.Layer):
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
-  a bias vector is created and added to the outputs. Finally, if
-  `activation` is not `None`, it is applied to the outputs as well.
+  outputs. If `use_bias` is True, a bias vector is created and added to the
+  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
+  as well.
 
   Arguments:
     rank: An integer, the rank of the convolution, e.g. "2" for 2D convolution.
@@ -70,8 +70,8 @@ class _Conv(base.Layer):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -193,9 +193,9 @@ class Conv1D(_Conv):
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
-  a bias vector is created and added to the outputs. Finally, if
-  `activation` is not `None`, it is applied to the outputs as well.
+  outputs. If `use_bias` is True, a bias vector is created and added to the
+  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
+  as well.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -220,8 +220,8 @@ class Conv1D(_Conv):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -286,9 +286,9 @@ def conv1d(inputs,
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
-  a bias vector is created and added to the outputs. Finally, if
-  `activation` is not `None`, it is applied to the outputs as well.
+  outputs. If `use_bias` is True, a bias vector is created and added to the
+  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
+  as well.
 
   Arguments:
     inputs: Tensor input.
@@ -314,8 +314,8 @@ def conv1d(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -354,9 +354,9 @@ class Conv2D(_Conv):
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
-  a bias vector is created and added to the outputs. Finally, if
-  `activation` is not `None`, it is applied to the outputs as well.
+  outputs. If `use_bias` is True, a bias vector is created and added to the
+  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
+  as well.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -388,8 +388,8 @@ class Conv2D(_Conv):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -454,9 +454,9 @@ def conv2d(inputs,
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
-  a bias vector is created and added to the outputs. Finally, if
-  `activation` is not `None`, it is applied to the outputs as well.
+  outputs. If `use_bias` is True, a bias vector is created and added to the
+  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
+  as well.
 
   Arguments:
     inputs: Tensor input.
@@ -489,8 +489,8 @@ def conv2d(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -529,9 +529,9 @@ class Conv3D(_Conv):
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
-  a bias vector is created and added to the outputs. Finally, if
-  `activation` is not `None`, it is applied to the outputs as well.
+  outputs. If `use_bias` is True, a bias vector is created and added to the
+  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
+  as well.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -564,8 +564,8 @@ class Conv3D(_Conv):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -630,9 +630,9 @@ def conv3d(inputs,
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
-  a bias vector is created and added to the outputs. Finally, if
-  `activation` is not `None`, it is applied to the outputs as well.
+  outputs. If `use_bias` is True, a bias vector is created and added to the
+  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
+  as well.
 
   Arguments:
     inputs: Tensor input.
@@ -666,8 +666,8 @@ def conv3d(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -704,11 +704,10 @@ def conv3d(inputs,
 class SeparableConv2D(Conv2D):
   """Depthwise separable 2D convolution.
 
-  This layer performs a depthwise convolution that acts separately on
-  channels, followed by a pointwise convolution that mixes channels.
-  If `use_bias` is True and a bias initializer is provided,
-  it adds a bias vector to the output.
-  It then optionally applies an activation function to produce the final output.
+  This layer performs a depthwise convolution that acts separately on channels,
+  followed by a pointwise convolution that mixes channels. If `use_bias` is
+  True, it adds a bias vector to the output. It then optionally applies an
+  activation function to produce the final output.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -742,8 +741,8 @@ class SeparableConv2D(Conv2D):
     use_bias: Boolean, whether the layer uses a bias.
     depthwise_initializer: An initializer for the depthwise convolution kernel.
     pointwise_initializer: An initializer for the pointwise convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     depthwise_regularizer: Optional regularizer for the depthwise
       convolution kernel.
     pointwise_regularizer: Optional regularizer for the pointwise
@@ -891,11 +890,10 @@ def separable_conv2d(inputs,
                      reuse=None):
   """Functional interface for the depthwise separable 2D convolution layer.
 
-  This layer performs a depthwise convolution that acts separately on
-  channels, followed by a pointwise convolution that mixes channels.
-  If `use_bias` is True and a bias initializer is provided,
-  it adds a bias vector to the output.
-  It then optionally applies an activation function to produce the final output.
+  This layer performs a depthwise convolution that acts separately on channels,
+  followed by a pointwise convolution that mixes channels. If `use_bias` is
+  True, it adds a bias vector to the output. It then optionally applies an
+  activation function to produce the final output.
 
   Arguments:
     inputs: Input tensor.
@@ -930,8 +928,8 @@ def separable_conv2d(inputs,
     use_bias: Boolean, whether the layer uses a bias.
     depthwise_initializer: An initializer for the depthwise convolution kernel.
     pointwise_initializer: An initializer for the pointwise convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     depthwise_regularizer: Optional regularizer for the depthwise
       convolution kernel.
     pointwise_regularizer: Optional regularizer for the pointwise
@@ -974,12 +972,11 @@ def separable_conv2d(inputs,
 class Conv2DTranspose(Conv2D):
   """Transposed 2D convolution layer (sometimes called 2D Deconvolution).
 
-  The need for transposed convolutions generally arises
-  from the desire to use a transformation going in the opposite direction
-  of a normal convolution, i.e., from something that has the shape of the
-  output of some convolution to something that has the shape of its input
-  while maintaining a connectivity pattern that is compatible with
-  said convolution.
+  The need for transposed convolutions generally arises from the desire to use a
+  transformation going in the opposite direction of a normal convolution, i.e.,
+  from something that has the shape of the output of some convolution to
+  something that has the shape of its input while maintaining a connectivity
+  pattern that is compatible with said convolution.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -1000,8 +997,8 @@ class Conv2DTranspose(Conv2D):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -1144,12 +1141,11 @@ def conv2d_transpose(inputs,
                      reuse=None):
   """Functional interface for transposed 2D convolution layer.
 
-  The need for transposed convolutions generally arises
-  from the desire to use a transformation going in the opposite direction
-  of a normal convolution, i.e., from something that has the shape of the
-  output of some convolution to something that has the shape of its input
-  while maintaining a connectivity pattern that is compatible with
-  said convolution.
+  The need for transposed convolutions generally arises from the desire to use a
+  transformation going in the opposite direction of a normal convolution, i.e.,
+  from something that has the shape of the output of some convolution to
+  something that has the shape of its input while maintaining a connectivity
+  pattern that is compatible with said convolution.
 
   Arguments:
     inputs: Input tensor.
@@ -1171,8 +1167,8 @@ def conv2d_transpose(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If `None`, then no
-      bias will be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -1230,8 +1226,8 @@ class Conv3DTranspose(Conv3D):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If `None`, then no
-      bias will be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -1415,8 +1411,8 @@ def conv3d_transpose(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. If None, no bias will
-      be applied.
+    bias_initializer: An initializer for the bias vector. Will be ignored if
+      `use_bias` is `False`.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
-- 
GitLab


From f2047a3570aabbde03230343adb6fc1a5604a1fd Mon Sep 17 00:00:00 2001
From: Piyush Chaudhary <pc1905@nyu.edu>
Date: Mon, 15 May 2017 16:22:33 -0400
Subject: [PATCH 1358/1563] Update Graph.java (#9852)

---
 tensorflow/java/src/main/java/org/tensorflow/Graph.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/java/src/main/java/org/tensorflow/Graph.java b/tensorflow/java/src/main/java/org/tensorflow/Graph.java
index 42d7f48464..c08fa9b145 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/Graph.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/Graph.java
@@ -20,7 +20,7 @@ package org.tensorflow;
  *
  * <p>Instances of a Graph are thread-safe.
  *
- * <p><b>WARNING:</b> Resources consumed by the Graph object msut be explicitly freed by invoking
+ * <p><b>WARNING:</b> Resources consumed by the Graph object must be explicitly freed by invoking
  * the {@link #close()} method then the Graph object is no longer needed.
  */
 public final class Graph implements AutoCloseable {
-- 
GitLab


From b30762d39b0039919f99e7315f6348516b646b46 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 13:36:18 -0700
Subject: [PATCH 1359/1563] PiperOrigin-RevId: 156096819

---
 tensorflow/contrib/learn/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD
index 9d5d1a8413..bf1171d355 100644
--- a/tensorflow/contrib/learn/BUILD
+++ b/tensorflow/contrib/learn/BUILD
@@ -1031,6 +1031,7 @@ py_test(
 py_test(
     name = "export_test",
     size = "small",
+    timeout = "moderate",
     srcs = ["python/learn/utils/export_test.py"],
     srcs_version = "PY2AND3",
     tags = [
-- 
GitLab


From 0bc0566a95a5815eaff1cc3a20a7f9e58e3843bc Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 13:37:45 -0700
Subject: [PATCH 1360/1563] Import gradient definitions in embedding_ops,
 instead of having to import them in client code.

PiperOrigin-RevId: 156097017
---
 tensorflow/python/BUILD                              | 1 +
 tensorflow/python/kernel_tests/BUILD                 | 1 -
 tensorflow/python/kernel_tests/embedding_ops_test.py | 1 -
 tensorflow/python/ops/embedding_ops.py               | 2 ++
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 50f083fb21..e9627f7862 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -1332,6 +1332,7 @@ py_library(
     deps = [
         ":array_ops",
         ":clip_ops",
+        ":data_flow_grad",
         ":data_flow_ops",
         ":framework",
         ":framework_for_generated_wrappers",
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 6a35d66f1b..6689d6a6b4 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2379,7 +2379,6 @@ cuda_py_test(
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:data_flow_grad",
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework",
diff --git a/tensorflow/python/kernel_tests/embedding_ops_test.py b/tensorflow/python/kernel_tests/embedding_ops_test.py
index 8cd3788257..2bd21fb01d 100644
--- a/tensorflow/python/kernel_tests/embedding_ops_test.py
+++ b/tensorflow/python/kernel_tests/embedding_ops_test.py
@@ -36,7 +36,6 @@ from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
-import tensorflow.python.ops.data_flow_grad  # pylint: disable=unused-import
 from tensorflow.python.platform import test
 from tensorflow.python.platform import tf_logging
 from tensorflow.python.util import compat
diff --git a/tensorflow/python/ops/embedding_ops.py b/tensorflow/python/ops/embedding_ops.py
index 168ca7fefc..315e7d4b43 100644
--- a/tensorflow/python/ops/embedding_ops.py
+++ b/tensorflow/python/ops/embedding_ops.py
@@ -26,6 +26,8 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import clip_ops
+# Imports gradient definitions.
+from tensorflow.python.ops import data_flow_grad  # pylint: disable=unused-import
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import resource_variable_ops
-- 
GitLab


From 5b47c8b6e38fa4b74304d8265c22d53ee385c03b Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Mon, 15 May 2017 13:40:52 -0700
Subject: [PATCH 1361/1563] Improve the docstring in Experiment

PiperOrigin-RevId: 156097464
---
 tensorflow/contrib/learn/python/learn/experiment.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index 85d45aef7a..d82bc321e7 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -511,6 +511,8 @@ class Experiment(object):
     (via constructor). The model will be first trained for
     `train_steps_per_iteration`, and then be evaluated in turns.
 
+    This method is intended for single machine usage.
+
     This differs from `train_and_evaluate` as follows:
       1. The procedure will have train and evaluation in turns. The model
       will be trained for a number of steps (usuallly smaller than `train_steps`
-- 
GitLab


From d319541a809b6f19e04c65a7a186d684b4000ed9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 13:56:20 -0700
Subject: [PATCH 1362/1563] Add copy_from_scaffold parameter in the Scaffold
 constructor. This allows creating a new Scaffold instance from an exiting one
 by copying the fields of the original scaffold and replacing those that are
 provided in the constructor.

PiperOrigin-RevId: 156099660
---
 .../python/training/monitored_session.py      | 19 +++++-
 .../python/training/monitored_session_test.py | 62 +++++++++++++++++++
 .../golden/tensorflow.train.-scaffold.pbtxt   |  2 +-
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index a891bae5f2..7f737399ab 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -102,7 +102,8 @@ class Scaffold(object):
                ready_for_local_init_op=None,
                local_init_op=None,
                summary_op=None,
-               saver=None):
+               saver=None,
+               copy_from_scaffold=None):
     """Create a scaffold.
 
     Args:
@@ -125,10 +126,26 @@ class Scaffold(object):
         string tensor containing a serialized `Summary` proto.
       saver: Optional `tf.train.Saver` object to use to save and restore
         variables.
+      copy_from_scaffold: Optional scaffold object to copy fields from. Its
+        fields will be overwritten by the provided fields in this function.
     """
+    if copy_from_scaffold:
+      if not isinstance(copy_from_scaffold, Scaffold):
+        raise TypeError('copy_from_scaffold is not a Scaffold instance.')
+      init_op = init_op or copy_from_scaffold.init_op
+      init_feed_dict = init_feed_dict or copy_from_scaffold.init_feed_dict
+      # Use the original init_fn provided by the user to init the new Scaffold.
+      init_fn = init_fn or copy_from_scaffold._user_init_fn  # pylint: disable=protected-access
+      ready_op = ready_op or copy_from_scaffold.ready_op
+      ready_for_local_init_op = ready_for_local_init_op or (
+          copy_from_scaffold.ready_for_local_init_op)
+      local_init_op = local_init_op or copy_from_scaffold.local_init_op
+      summary_op = summary_op or copy_from_scaffold.summary_op
+      saver = saver or copy_from_scaffold.saver
 
     # NOTE(touts): modifying the init function to be passed the scaffold is a
     # hack to make it easy to find the saver.  Is there a better way?
+    self._user_init_fn = init_fn
     if init_fn:
       self._init_fn = lambda sess: init_fn(self, sess)
     else:
diff --git a/tensorflow/python/training/monitored_session_test.py b/tensorflow/python/training/monitored_session_test.py
index 41f8fb3486..85a5ceeb08 100644
--- a/tensorflow/python/training/monitored_session_test.py
+++ b/tensorflow/python/training/monitored_session_test.py
@@ -147,6 +147,68 @@ class ScaffoldTest(test.TestCase):
                                    'Graph is finalized and cannot be modified'):
         constant_op.constant([0])
 
+  def test_new_scaffold_from_default_scaffold(self):
+    scaffold1 = monitored_session.Scaffold()
+    with ops.Graph().as_default():
+      variables.Variable([1])
+      saver = saver_lib.Saver()
+      scaffold2 = monitored_session.Scaffold(
+          init_op=2,
+          init_feed_dict=3,
+          init_fn=lambda scaffold, sess: 4,
+          ready_op=5,
+          ready_for_local_init_op=6,
+          local_init_op=7,
+          saver=saver,
+          copy_from_scaffold=scaffold1)
+
+      scaffold2.finalize()
+      self.assertEqual(2, scaffold2.init_op)
+      self.assertEqual(3, scaffold2.init_feed_dict)
+      self.assertTrue(callable(scaffold2.init_fn))
+      self.assertEqual(5, scaffold2.ready_op)
+      self.assertEqual(6, scaffold2.ready_for_local_init_op)
+      self.assertEqual(7, scaffold2.local_init_op)
+      self.assertEqual(saver, scaffold2.saver)
+
+  def test_new_scaffold_from_existing_scaffold(self):
+    with ops.Graph().as_default():
+      variables.Variable([1])
+      saver = saver_lib.Saver()
+      scaffold1 = monitored_session.Scaffold(
+          init_op=2,
+          init_feed_dict=3,
+          init_fn=lambda scaffold, sess: 4,
+          ready_op=5,
+          ready_for_local_init_op=6,
+          local_init_op=7,
+          saver=saver)
+
+      scaffold2 = monitored_session.Scaffold(
+          init_op=4,
+          init_feed_dict=6,
+          init_fn=lambda scaffold, sess: 8,
+          ready_op=10,
+          ready_for_local_init_op=12,
+          local_init_op=14,
+          saver=saver,
+          copy_from_scaffold=scaffold1)
+
+      scaffold2.finalize()
+      self.assertEqual(4, scaffold2.init_op)
+      self.assertEqual(6, scaffold2.init_feed_dict)
+      self.assertTrue(callable(scaffold2.init_fn))
+      self.assertEqual(10, scaffold2.ready_op)
+      self.assertEqual(12, scaffold2.ready_for_local_init_op)
+      self.assertEqual(14, scaffold2.local_init_op)
+      self.assertEqual(saver, scaffold2.saver)
+
+  def test_copy_from_scaffold_is_scaffold(self):
+    with ops.Graph().as_default():
+      with self.assertRaisesRegexp(
+          TypeError, 'copy_from_scaffold is not a Scaffold instance'):
+        monitored_session.Scaffold(copy_from_scaffold=1)
+
 
 def _test_dir(temp_dir, test_name):
   """Create an empty dir to use for tests.
diff --git a/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
index 21234fe739..62b956c5ef 100644
--- a/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-scaffold.pbtxt
@@ -36,7 +36,7 @@ tf_class {
   }
   member_method {
     name: "__init__"
-    argspec: "args=[\'self\', \'init_op\', \'init_feed_dict\', \'init_fn\', \'ready_op\', \'ready_for_local_init_op\', \'local_init_op\', \'summary_op\', \'saver\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
+    argspec: "args=[\'self\', \'init_op\', \'init_feed_dict\', \'init_fn\', \'ready_op\', \'ready_for_local_init_op\', \'local_init_op\', \'summary_op\', \'saver\', \'copy_from_scaffold\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
   }
   member_method {
     name: "finalize"
-- 
GitLab


From 74d0126d52b5227ff32d7aeba43144b4edb4be4e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 14:18:46 -0700
Subject: [PATCH 1363/1563] Correct gradient calculation for some
 complex-valued functions.

Tensorflow expects the gradients for holomorphic functions to produce
the conjugate of their complex derivative. A short discussion is at
#3348

Correct existing math gradient implementations appropriately, and add
test cases for complex inputs.

PiperOrigin-RevId: 156102913
---
 tensorflow/cc/gradients/math_grad.cc      | 114 +++++----
 tensorflow/cc/gradients/math_grad_test.cc | 285 +++++++++++++++++++---
 2 files changed, 326 insertions(+), 73 deletions(-)

diff --git a/tensorflow/cc/gradients/math_grad.cc b/tensorflow/cc/gradients/math_grad.cc
index aff0653139..5a2c6d11fb 100644
--- a/tensorflow/cc/gradients/math_grad.cc
+++ b/tensorflow/cc/gradients/math_grad.cc
@@ -21,6 +21,17 @@ namespace tensorflow {
 namespace ops {
 namespace {
 
+// Conjugate helper function returns the conjugate of an Output if it
+// is complex valued.
+Output ConjugateHelper(const Scope& scope, const Output& out) {
+  DataType dtype = out.type();
+  if (dtype == DT_COMPLEX64 || dtype == DT_COMPLEX128) {
+    return Conj(scope, out);
+  } else {
+    return out;
+  }
+}
+
 // TODO(andydavis) Add control dependencies to gradient functions (as needed).
 
 Status AbsGrad(const Scope& scope, const Operation& op,
@@ -44,9 +55,11 @@ REGISTER_GRADIENT_OP("Neg", NegGrad);
 Status InvGrad(const Scope& scope, const Operation& op,
                const std::vector<Output>& grad_inputs,
                std::vector<Output>* grad_outputs) {
-  // dx = dy * (-1 * (y * y))
+  // dy/dx = -1/x^2 = -y^2
+  auto dydx = Neg(scope, Square(scope, op.output(0)));
+  // grad(x) = grad(y) * conj(dy/dx)
   grad_outputs->push_back(
-      Mul(scope, grad_inputs[0], Neg(scope, Square(scope, op.output(0)))));
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Inv", InvGrad);
@@ -55,10 +68,12 @@ REGISTER_GRADIENT_OP("Reciprocal", InvGrad);
 Status SquareGrad(const Scope& scope, const Operation& op,
                   const std::vector<Output>& grad_inputs,
                   std::vector<Output>* grad_outputs) {
-  // dx = dy * (2 * x)
+  // dy/dx = (2 * x)
   auto two = Cast(scope, Const(scope, 2), op.input(0).type());
+  auto dydx = Mul(scope, two, op.input(0));
+  // grad(x) = grad(y) * conj(dy/dx)
   grad_outputs->push_back(
-      Mul(scope, grad_inputs[0], Mul(scope, two, op.input(0))));
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Square", SquareGrad);
@@ -68,11 +83,12 @@ Status SqrtGrad(const Scope& scope, const Operation& op,
                 std::vector<Output>* grad_outputs) {
   // y = sqrt(x)
   // dy/dx =  0.5 * (1 / sqrt(x)) = 0.5 * (1 / y)
-  // dx = dy * (0.5 * (1 / y))
   auto y_inv = Reciprocal(scope, op.output(0));
   auto half = Cast(scope, Const(scope, 0.5), op.input(0).type());
-  auto dx = Mul(scope, grad_inputs[0], Mul(scope, half, y_inv));
-  grad_outputs->push_back(dx);
+  auto dydx = Mul(scope, half, y_inv);
+  // grad(x) = grad(y) * conj(dy/dx)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Sqrt", SqrtGrad);
@@ -82,14 +98,14 @@ Status RsqrtGrad(const Scope& scope, const Operation& op,
                  std::vector<Output>* grad_outputs) {
   // y = 1/x^1/2 = x^-1/2
   // dy/dx = -1/2 * x^-3/2 = -1/2 * x^-1/2 * x^-1 = -1/2 * y * x^-1
-  // dx = dy * (-1/2 * y * x^-1)
   auto x_inv = Reciprocal(scope, op.input(0));
   auto y = op.output(0);
   auto neghalf = Cast(scope, Const(scope, -0.5), op.input(0).type());
   auto a = Mul(scope, neghalf, x_inv);
-  auto b = Mul(scope, a, y);
-  auto dx = Mul(scope, grad_inputs[0], b);
-  grad_outputs->push_back(dx);
+  auto dydx = Mul(scope, a, y);
+  // grad(x) = grad(y) * conj(dy/dx)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Rsqrt", RsqrtGrad);
@@ -97,10 +113,11 @@ REGISTER_GRADIENT_OP("Rsqrt", RsqrtGrad);
 Status ExpGrad(const Scope& scope, const Operation& op,
                const std::vector<Output>& grad_inputs,
                std::vector<Output>* grad_outputs) {
-  // y = exp(x)
-  // dy/dx = exp(x)
-  // dx = dy * y
-  grad_outputs->push_back(Mul(scope, grad_inputs[0], op.output(0)));
+  // dy/dx = exp(x) = y
+  // grad(x) = grad(y) * conj(dy/dx)
+  //         = grad(y) * conj(y)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, op.output(0))));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Exp", ExpGrad);
@@ -108,10 +125,12 @@ REGISTER_GRADIENT_OP("Exp", ExpGrad);
 Status Expm1Grad(const Scope& scope, const Operation& op,
                  const std::vector<Output>& grad_inputs,
                  std::vector<Output>* grad_outputs) {
-  // f(x) = expm1(x)
-  // df/dx = exp(x)
-  // dx = dy * exp(x)
-  grad_outputs->push_back(Mul(scope, grad_inputs[0], Exp(scope, op.input(0))));
+  // y = expm1(x)
+  // dy/dx = exp(x)
+  auto dydx = Exp(scope, op.input(0));
+  // grad(x) = grad(y) * conj(dy/dx)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Expm1", Expm1Grad);
@@ -119,11 +138,12 @@ REGISTER_GRADIENT_OP("Expm1", Expm1Grad);
 Status LogGrad(const Scope& scope, const Operation& op,
                const std::vector<Output>& grad_inputs,
                std::vector<Output>* grad_outputs) {
-  // f(x) = log(x) = y
-  // df/dx = 1 / x
-  // dx = dy * (1 / x)
+  // y = log(x)
+  // dy/dx = 1 / x
+  auto dydx = Reciprocal(scope, op.input(0));
+  // grad(x) = grad(y) * conj(dy/dx)
   grad_outputs->push_back(
-      Mul(scope, grad_inputs[0], Reciprocal(scope, op.input(0))));
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Log", LogGrad);
@@ -131,12 +151,13 @@ REGISTER_GRADIENT_OP("Log", LogGrad);
 Status Log1pGrad(const Scope& scope, const Operation& op,
                  const std::vector<Output>& grad_inputs,
                  std::vector<Output>* grad_outputs) {
-  // f(x) = log1p(x) = y
-  // df/dx = 1 / (1 + x)
-  // dx = dy * (1 / (1 + x))
+  // y = log1p(x)
+  // dy/dx = 1 / (1 + x)
   auto one = Cast(scope, Const(scope, 1.0), op.input(0).type());
+  auto dydx = Reciprocal(scope, Add(scope, one, op.input(0)));
+  // grad(x) = grad(y) * conj(dy/dx)
   grad_outputs->push_back(
-      Div(scope, grad_inputs[0], Add(scope, one, op.input(0))));
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Log1p", Log1pGrad);
@@ -146,11 +167,12 @@ Status TanhGrad(const Scope& scope, const Operation& op,
                 std::vector<Output>* grad_outputs) {
   // y = tanh(x)
   // dy/dx = 1 - (tanh(x))^2 = 1 - y^2
-  // dx = dy * (1 - y^2)
   auto y2 = Square(scope, op.output(0));
   auto one = Cast(scope, Const(scope, 1.0), op.input(0).type());
-  auto dx = Mul(scope, grad_inputs[0], Sub(scope, one, y2));
-  grad_outputs->push_back(dx);
+  auto dydx = Sub(scope, one, y2);
+  // grad(x) = grad(y) * conj(dy/dx)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Tanh", TanhGrad);
@@ -160,11 +182,13 @@ Status SigmoidGrad(const Scope& scope, const Operation& op,
                    std::vector<Output>* grad_outputs) {
   // y = 1 / (1 + exp(-x))
   // dy/dx = y * (1 - y)
-  // dx = dy * y * (1 - y)
   auto y = op.output(0);
   auto one = Cast(scope, Const(scope, 1.0), op.input(0).type());
-  auto dx = Mul(scope, grad_inputs[0], Mul(scope, y, Sub(scope, one, y)));
-  grad_outputs->push_back(dx);
+  auto dydx = Mul(scope, y, Sub(scope, one, y));
+  // dx = dy * y * (1 - y)
+  // grad(x) = grad(y) * conj(dy/dx)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Sigmoid", SigmoidGrad);
@@ -185,9 +209,10 @@ Status SinGrad(const Scope& scope, const Operation& op,
                std::vector<Output>* grad_outputs) {
   // y = sin(x)
   // dy/dx = cos(x)
-  // dx = dy * cos(x)
-  auto dx = Mul(scope, grad_inputs[0], Cos(scope, op.input(0)));
-  grad_outputs->push_back(dx);
+  auto dydx = Cos(scope, op.input(0));
+  // grad(x) = grad(y) * conj(dy/dx)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Sin", SinGrad);
@@ -197,9 +222,10 @@ Status CosGrad(const Scope& scope, const Operation& op,
                std::vector<Output>* grad_outputs) {
   // y = cos(x)
   // dy/dx = -sin(x)
-  // dx = dy * -sin(x)
-  auto dx = Mul(scope, grad_inputs[0], Neg(scope, Sin(scope, op.input(0))));
-  grad_outputs->push_back(dx);
+  auto dydx = Neg(scope, Sin(scope, op.input(0)));
+  // grad(x) = grad(y) * conj(dy/dx)
+  grad_outputs->push_back(
+      Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx)));
   return scope.status();
 }
 REGISTER_GRADIENT_OP("Cos", CosGrad);
@@ -208,12 +234,12 @@ Status AsinGrad(const Scope& scope, const Operation& op,
                 const std::vector<Output>& grad_inputs,
                 std::vector<Output>* grad_outputs) {
   // y = asin(x)
-  // dy/dx = 1 / (1 - x * x)^1/2
-  // dx = dy * (1 / (1 - x * x)^1/2)
+  // dy/dx = 1 / sqrt(1 - x^2)
   auto x2 = Square(scope, op.input(0));
   auto one = Cast(scope, Const(scope, 1.0), op.input(0).type());
   auto dydx = Reciprocal(scope, Sqrt(scope, Sub(scope, one, x2)));
-  auto dx = Mul(scope, grad_inputs[0], dydx);
+  // grad(x) = grad(y) * conj(dy/dx)
+  auto dx = Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx));
   grad_outputs->push_back(dx);
   return scope.status();
 }
@@ -239,9 +265,9 @@ Status TanGrad(const Scope& scope, const Operation& op,
                std::vector<Output>* grad_outputs) {
   // y = tan(x)
   // dy/dx = sec(x)^2 = 1 / cos(x)^2
-  // dx = dy * (1 / cos(x)^2)
   auto dydx = Square(scope, Reciprocal(scope, Cos(scope, op.input(0))));
-  auto dx = Mul(scope, grad_inputs[0], dydx);
+  // grad(x) = grad(y) * conj(dy/dx)
+  auto dx = Mul(scope, grad_inputs[0], ConjugateHelper(scope, dydx));
   grad_outputs->push_back(dx);
   return scope.status();
 }
diff --git a/tensorflow/cc/gradients/math_grad_test.cc b/tensorflow/cc/gradients/math_grad_test.cc
index f9ae3b39ea..de6baa1769 100644
--- a/tensorflow/cc/gradients/math_grad_test.cc
+++ b/tensorflow/cc/gradients/math_grad_test.cc
@@ -56,23 +56,25 @@ class CWiseUnaryGradTest : public ::testing::Test {
     ATAN
   };
 
-  void TestCWiseGrad(UnaryOpType op_type, const std::function<float(int)>& x_fn,
-                     const std::function<float(float)>& dy_fn,
-                     const std::function<float(float, float)>& dx_fn) {
-    Tensor x(DT_FLOAT, {2, 3, 2});
-    auto x_flat = x.flat<float>();
+  template <typename T>
+  void TestCWiseGrad(UnaryOpType op_type, const std::function<T(int)>& x_fn,
+                     const std::function<T(const T&)>& dy_fn,
+                     const std::function<T(const T&, const T&)>& dx_fn) {
+    DataType dtype = DataTypeToEnum<T>::v();
+    Tensor x(dtype, {2, 3, 2});
+    auto x_flat = x.flat<T>();
     for (int i = 0; i < x_flat.size(); ++i) {
       x_flat(i) = x_fn(i);
     }
 
-    Tensor dy(DT_FLOAT, {2, 3, 2});
-    auto dy_flat = dy.flat<float>();
+    Tensor dy(dtype, {2, 3, 2});
+    auto dy_flat = dy.flat<T>();
     for (int i = 0; i < dy_flat.size(); ++i) {
       dy_flat(i) = dy_fn(x_flat(i));
     }
 
-    Tensor dx(DT_FLOAT, {2, 3, 2});
-    auto dx_flat = dx.flat<float>();
+    Tensor dx(dtype, {2, 3, 2});
+    auto dx_flat = dx.flat<T>();
     for (int i = 0; i < dx_flat.size(); ++i) {
       dx_flat(i) = dx_fn(x_flat(i), dy_flat(i));
     }
@@ -146,7 +148,19 @@ class CWiseUnaryGradTest : public ::testing::Test {
     test::ExpectClose(output, dx);
   }
 
-  float RV(std::vector<float> v) { return v[random::New64() % v.size()]; }
+  float RV(const std::vector<float>& v) {
+    return v[random::New64() % v.size()];
+  }
+
+  complex64 CRV(const std::vector<complex64>& v) {
+    return v[random::New64() % v.size()];
+  }
+
+  complex64 conjugate(const complex64& val) {
+    return complex64(val.real(), -val.imag());
+  }
+
+  const complex64 one_{1.0, 0};
 
   Scope scope_;
 };
@@ -155,14 +169,14 @@ TEST_F(CWiseUnaryGradTest, Abs) {
   auto x_fn = [this](const int i) { return RV({-1, 0, 1}); };
   auto dy_fn = [this](const float x) { return x + RV({-2, 2, -3, 3, -4, 4}); };
   auto dx_fn = [this](const float x, const float dy) { return x * dy; };
-  TestCWiseGrad(ABS, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(ABS, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Neg) {
   auto x_fn = [this](const int i) { return RV({-1, 0, 1}); };
   auto dy_fn = [this](const float x) { return x + RV({-2, 2, -3, 3, -4, 4}); };
   auto dx_fn = [this](const float x, const float dy) { return -dy; };
-  TestCWiseGrad(NEG, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(NEG, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Reciprocal) {
@@ -171,14 +185,36 @@ TEST_F(CWiseUnaryGradTest, Reciprocal) {
   auto dx_fn = [this](const float x, const float dy) {
     return -(1 / (x * x)) * dy;
   };
-  TestCWiseGrad(INV, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(INV, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Reciprocal_Complex) {
+  auto x_fn = [this](const int i) { return CRV({{-1, 0}, {1, 0}, {2, -1}}); };
+  auto dy_fn = [this](const complex64 x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64 x, const complex64 dy) {
+    return -conjugate(one_ / (x * x)) * dy;
+  };
+  TestCWiseGrad<complex64>(INV, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Square) {
   auto x_fn = [this](const int i) { return RV({0, -1, 1, -2, 2, -3, 3}); };
   auto dy_fn = [this](const float x) { return RV({0, -7, 7, -8, 8, -9, 9}); };
   auto dx_fn = [this](const float x, const float dy) { return 2 * x * dy; };
-  TestCWiseGrad(SQUARE, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(SQUARE, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Square_Complex) {
+  auto x_fn = [this](const int i) { return CRV({{-1, 0}, {1, 0}, {2, -1}}); };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return conjugate(complex64(2, 0) * x) * dy;
+  };
+  TestCWiseGrad<complex64>(SQUARE, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Sqrt) {
@@ -187,7 +223,18 @@ TEST_F(CWiseUnaryGradTest, Sqrt) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * 0.5 * (1.0 / std::sqrt(x));
   };
-  TestCWiseGrad(SQRT, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(SQRT, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Sqrt_Complex) {
+  auto x_fn = [this](const int i) { return CRV({{-1, 0}, {1, 0}, {2, -1}}); };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return conjugate(complex64(0.5, 0) / std::sqrt(x)) * dy;
+  };
+  TestCWiseGrad<complex64>(SQRT, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Rsqrt) {
@@ -196,7 +243,18 @@ TEST_F(CWiseUnaryGradTest, Rsqrt) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * -0.5 * (1 / std::sqrt(x)) * (1 / x);
   };
-  TestCWiseGrad(RSQRT, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(RSQRT, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Rsqrt_Complex) {
+  auto x_fn = [this](const int i) { return CRV({{-1, 0}, {1, 0}, {2, -1}}); };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return conjugate(complex64(-0.5, 0) / std::sqrt(x) / x) * dy;
+  };
+  TestCWiseGrad<complex64>(RSQRT, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Exp) {
@@ -205,7 +263,18 @@ TEST_F(CWiseUnaryGradTest, Exp) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * std::exp(x);
   };
-  TestCWiseGrad(EXP, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(EXP, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Exp_Complex) {
+  auto x_fn = [this](const int i) { return CRV({{-1, 0}, {1, 0}, {2, -1}}); };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy * conjugate(std::exp(x));
+  };
+  TestCWiseGrad<complex64>(EXP, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Expm1) {
@@ -214,14 +283,36 @@ TEST_F(CWiseUnaryGradTest, Expm1) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * std::exp(x);
   };
-  TestCWiseGrad(EXPM1, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(EXPM1, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Expm1_Complex) {
+  auto x_fn = [this](const int i) { return CRV({{-1, 0}, {1, 0}, {2, -1}}); };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy * conjugate(std::exp(x));
+  };
+  TestCWiseGrad<complex64>(EXPM1, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Log) {
   auto x_fn = [this](const int i) { return RV({-1, 1, -2, 2, -3, 3, -4, 4}); };
   auto dy_fn = [this](const float x) { return x + RV({-2, 2, -3, 3, -4, 4}); };
   auto dx_fn = [this](const float x, const float dy) { return dy * (1.0 / x); };
-  TestCWiseGrad(LOG, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(LOG, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Log_Complex) {
+  auto x_fn = [this](const int i) { return CRV({{-1, 0}, {1, 0}, {2, -1}}); };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy * conjugate(one_ / x);
+  };
+  TestCWiseGrad<complex64>(LOG, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Log1p) {
@@ -230,7 +321,20 @@ TEST_F(CWiseUnaryGradTest, Log1p) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * (1.0 / (1.0 + x));
   };
-  TestCWiseGrad(LOG1P, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(LOG1P, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Log1p_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{0, 0}, {1e-6, 0}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy / (one_ + conjugate(x));
+  };
+  TestCWiseGrad<complex64>(LOG1P, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Tanh) {
@@ -240,7 +344,21 @@ TEST_F(CWiseUnaryGradTest, Tanh) {
     const float y = std::tanh(x);
     return dy * (1.0 - y * y);
   };
-  TestCWiseGrad(TANH, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(TANH, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Tanh_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 1}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    const complex64 y = std::tanh(x);
+    return dy * conjugate((one_ - y * y));
+  };
+  TestCWiseGrad<complex64>(TANH, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Sigmoid) {
@@ -250,14 +368,28 @@ TEST_F(CWiseUnaryGradTest, Sigmoid) {
     const float y = 1.0 / (1.0 + std::exp(-x));
     return dy * y * (1.0 - y);
   };
-  TestCWiseGrad(SIGMOID, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(SIGMOID, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Sigmoid_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 0}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    const complex64 y = one_ / (one_ + std::exp(-x));
+    return dy * conjugate(y * (one_ - y));
+  };
+  TestCWiseGrad<complex64>(SIGMOID, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Sign) {
   auto x_fn = [this](const int i) { return RV({0, -1, 1, -2, 2, -3, 3}); };
   auto dy_fn = [this](const float x) { return x + RV({-2, 2, -3, 3, -4, 4}); };
   auto dx_fn = [this](const float x, const float dy) { return 0.0; };
-  TestCWiseGrad(SIGN, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(SIGN, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Sin) {
@@ -266,7 +398,20 @@ TEST_F(CWiseUnaryGradTest, Sin) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * std::cos(x);
   };
-  TestCWiseGrad(SIN, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(SIN, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Sin_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 1}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy * conjugate(std::cos(x));
+  };
+  TestCWiseGrad<complex64>(SIN, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Cos) {
@@ -275,7 +420,20 @@ TEST_F(CWiseUnaryGradTest, Cos) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * -1.0 * std::sin(x);
   };
-  TestCWiseGrad(COS, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(COS, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Cos_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 1}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy * conjugate(-std::sin(x));
+  };
+  TestCWiseGrad<complex64>(COS, x_fn, dy_fn, dx_fn);
 }
 
 TEST_F(CWiseUnaryGradTest, Asin) {
@@ -284,7 +442,24 @@ TEST_F(CWiseUnaryGradTest, Asin) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * (1.0 / std::sqrt(1.0 - x * x));
   };
-  TestCWiseGrad(ASIN, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(ASIN, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Asin_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 1}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy / conjugate(std::sqrt(one_ - x * x));
+  };
+  // TODO(kbsriram)
+  // Enable test when the asin kernel supports complex numbers
+  if (false) {
+    TestCWiseGrad<complex64>(ASIN, x_fn, dy_fn, dx_fn);
+  }
 }
 
 TEST_F(CWiseUnaryGradTest, Acos) {
@@ -293,7 +468,24 @@ TEST_F(CWiseUnaryGradTest, Acos) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * (-1.0 / std::sqrt(1.0 - x * x));
   };
-  TestCWiseGrad(ACOS, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(ACOS, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Acos_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 1}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy / -conjugate(std::sqrt(one_ - x * x));
+  };
+  // TODO(kbsriram)
+  // Add test when the acos kernel supports complex numbers
+  if (false) {
+    TestCWiseGrad<complex64>(ACOS, x_fn, dy_fn, dx_fn);
+  }
 }
 
 TEST_F(CWiseUnaryGradTest, Tan) {
@@ -303,7 +495,25 @@ TEST_F(CWiseUnaryGradTest, Tan) {
     const float cosx = std::cos(x);
     return dy * (1 / (cosx * cosx));
   };
-  TestCWiseGrad(TAN, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(TAN, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Tan_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 1}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    const complex64 cosx = std::cos(x);
+    return dy / conjugate(cosx * cosx);
+  };
+  // TODO(kbsriram)
+  // Enable when tan kernel supports complex inputs
+  if (false) {
+    TestCWiseGrad<complex64>(TAN, x_fn, dy_fn, dx_fn);
+  }
 }
 
 TEST_F(CWiseUnaryGradTest, Atan) {
@@ -312,7 +522,24 @@ TEST_F(CWiseUnaryGradTest, Atan) {
   auto dx_fn = [this](const float x, const float dy) {
     return dy * (1 / (1 + x * x));
   };
-  TestCWiseGrad(ATAN, x_fn, dy_fn, dx_fn);
+  TestCWiseGrad<float>(ATAN, x_fn, dy_fn, dx_fn);
+}
+
+TEST_F(CWiseUnaryGradTest, Atan_Complex) {
+  auto x_fn = [this](const int i) {
+    return CRV({{1, 0}, {0, 1}, {2, -1}, {1, 2}, {3, 4}});
+  };
+  auto dy_fn = [this](const complex64& x) {
+    return x + CRV({{-2, 2}, {-3, 3}, {1, -4}});
+  };
+  auto dx_fn = [this](const complex64& x, const complex64& dy) {
+    return dy / (one_ + x * x);
+  };
+  // TODO(kbsriram)
+  // Add test when the atan kernel supports complex numbers
+  if (false) {
+    TestCWiseGrad<complex64>(ATAN, x_fn, dy_fn, dx_fn);
+  }
 }
 
 class CWiseUnaryComplexGradTest : public ::testing::Test {
-- 
GitLab


From 0cb8f748006def504f97aa15ebff1d73bb48a986 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Mon, 15 May 2017 15:10:55 -0700
Subject: [PATCH 1364/1563] Support core feature columns in contrib canned
 Estimators.

PiperOrigin-RevId: 156110352
---
 tensorflow/contrib/learn/BUILD                |  1 +
 .../learn/python/learn/estimators/dnn.py      | 21 ++++++--
 .../learn/estimators/dnn_linear_combined.py   | 53 +++++++++++++------
 .../estimators/dnn_linear_combined_test.py    | 47 ++++++++++++++++
 .../learn/python/learn/estimators/dnn_test.py | 44 +++++++++++++++
 .../learn/python/learn/estimators/linear.py   | 29 ++++++----
 .../python/learn/estimators/linear_test.py    | 27 ++++++++++
 7 files changed, 190 insertions(+), 32 deletions(-)

diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD
index bf1171d355..f313c46143 100644
--- a/tensorflow/contrib/learn/BUILD
+++ b/tensorflow/contrib/learn/BUILD
@@ -68,6 +68,7 @@ py_library(
         "//tensorflow/python:variables",
         "//tensorflow/python/estimator:estimator_py",
         "//tensorflow/python/estimator:inputs",
+        "//tensorflow/python/feature_column:feature_column_py",
         "//tensorflow/python/saved_model:builder",
         "//tensorflow/python/saved_model:loader",
         "//tensorflow/python/saved_model:signature_constants",
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn.py b/tensorflow/contrib/learn/python/learn/estimators/dnn.py
index 285ed4c186..5e6288af99 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn.py
@@ -24,6 +24,7 @@ from tensorflow.contrib import layers
 from tensorflow.contrib.framework import deprecated
 from tensorflow.contrib.framework import deprecated_arg_values
 from tensorflow.contrib.framework.python.ops import variables as contrib_variables
+from tensorflow.contrib.layers.python.layers import feature_column
 from tensorflow.contrib.layers.python.layers import optimizers
 from tensorflow.contrib.learn.python.learn import metric_spec
 from tensorflow.contrib.learn.python.learn.estimators import dnn_linear_combined
@@ -32,6 +33,7 @@ from tensorflow.contrib.learn.python.learn.estimators import head as head_lib
 from tensorflow.contrib.learn.python.learn.estimators import model_fn
 from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.contrib.learn.python.learn.utils import export
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.ops import nn
 from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.ops import variable_scope
@@ -125,11 +127,20 @@ def _dnn_model_fn(features, labels, mode, params, config=None):
         "input_from_feature_columns",
         values=tuple(six.itervalues(features)),
         partitioner=input_layer_partitioner) as input_layer_scope:
-      net = layers.input_from_feature_columns(
-          columns_to_tensors=features,
-          feature_columns=feature_columns,
-          weight_collections=[parent_scope],
-          scope=input_layer_scope)
+      if all([
+          isinstance(fc, feature_column._FeatureColumn)  # pylint: disable=protected-access
+          for fc in feature_columns
+      ]):
+        net = layers.input_from_feature_columns(
+            columns_to_tensors=features,
+            feature_columns=feature_columns,
+            weight_collections=[parent_scope],
+            scope=input_layer_scope)
+      else:
+        net = fc_core.input_layer(
+            features=features,
+            feature_columns=feature_columns,
+            weight_collections=[parent_scope])
 
     for layer_id, num_hidden_units in enumerate(hidden_units):
       with variable_scope.variable_scope(
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
index 53c71c6f3e..7266122350 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py
@@ -33,6 +33,7 @@ from tensorflow.contrib.learn.python.learn.estimators import head as head_lib
 from tensorflow.contrib.learn.python.learn.estimators import model_fn
 from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.contrib.learn.python.learn.utils import export
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import nn
@@ -230,11 +231,20 @@ def _dnn_linear_combined_model_fn(features, labels, mode, params, config=None):
           "input_from_feature_columns",
           values=tuple(six.itervalues(features)),
           partitioner=input_layer_partitioner) as dnn_input_scope:
-        net = layers.input_from_feature_columns(
-            columns_to_tensors=features,
-            feature_columns=dnn_feature_columns,
-            weight_collections=[dnn_parent_scope],
-            scope=dnn_input_scope)
+        if all([
+            isinstance(fc, feature_column_lib._FeatureColumn)  # pylint: disable=protected-access
+            for fc in dnn_feature_columns
+        ]):
+          net = layers.input_from_feature_columns(
+              columns_to_tensors=features,
+              feature_columns=dnn_feature_columns,
+              weight_collections=[dnn_parent_scope],
+              scope=dnn_input_scope)
+        else:
+          net = fc_core.input_layer(
+              features=features,
+              feature_columns=dnn_feature_columns,
+              weight_collections=[dnn_parent_scope])
 
       for layer_id, num_hidden_units in enumerate(dnn_hidden_units):
         with variable_scope.variable_scope(
@@ -277,20 +287,29 @@ def _dnn_linear_combined_model_fn(features, labels, mode, params, config=None):
         linear_parent_scope,
         values=tuple(six.itervalues(features)),
         partitioner=linear_partitioner) as scope:
-      if joint_linear_weights:
-        linear_logits, _, _ = layers.joint_weighted_sum_from_feature_columns(
-            columns_to_tensors=features,
-            feature_columns=linear_feature_columns,
-            num_outputs=head.logits_dimension,
-            weight_collections=[linear_parent_scope],
-            scope=scope)
+      if all([isinstance(fc, feature_column_lib._FeatureColumn)  # pylint: disable=protected-access
+              for fc in linear_feature_columns]):
+        if joint_linear_weights:
+          linear_logits, _, _ = layers.joint_weighted_sum_from_feature_columns(
+              columns_to_tensors=features,
+              feature_columns=linear_feature_columns,
+              num_outputs=head.logits_dimension,
+              weight_collections=[linear_parent_scope],
+              scope=scope)
+        else:
+          linear_logits, _, _ = layers.weighted_sum_from_feature_columns(
+              columns_to_tensors=features,
+              feature_columns=linear_feature_columns,
+              num_outputs=head.logits_dimension,
+              weight_collections=[linear_parent_scope],
+              scope=scope)
       else:
-        linear_logits, _, _ = layers.weighted_sum_from_feature_columns(
-            columns_to_tensors=features,
+        linear_logits = fc_core.linear_model(
+            features=features,
             feature_columns=linear_feature_columns,
-            num_outputs=head.logits_dimension,
-            weight_collections=[linear_parent_scope],
-            scope=scope)
+            units=head.logits_dimension,
+            weight_collections=[linear_parent_scope])
+
       _add_layer_summary(linear_logits, scope.name)
 
   # Combine logits and build full model.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py
index 14caa0a5b5..181a8cab1c 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined_test.py
@@ -36,6 +36,7 @@ from tensorflow.contrib.learn.python.learn.estimators import run_config
 from tensorflow.contrib.learn.python.learn.estimators import test_data
 from tensorflow.contrib.learn.python.learn.metric_spec import MetricSpec
 from tensorflow.contrib.metrics.python.ops import metric_ops
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -420,6 +421,52 @@ class DNNLinearCombinedClassifierTest(test.TestCase):
     scores = classifier.evaluate(input_fn=_input_fn, steps=100)
     _assert_metrics_in_range(('accuracy', 'auc'), scores)
 
+  def testEstimatorWithCoreFeatureColumns(self):
+    """Tests binary classification using Tensor data as input."""
+
+    def _input_fn():
+      iris = test_data.prepare_iris_data_for_logistic_regression()
+      features = {}
+      for i in range(4):
+        # The following shows how to provide the Tensor data for
+        # RealValuedColumns.
+        features.update({
+            str(i):
+                array_ops.reshape(
+                    constant_op.constant(iris.data[:, i], dtype=dtypes.float32),
+                    [-1, 1])
+        })
+      # The following shows how to provide the SparseTensor data for
+      # a SparseColumn.
+      features['dummy_sparse_column'] = sparse_tensor.SparseTensor(
+          values=['en', 'fr', 'zh'],
+          indices=[[0, 0], [0, 1], [60, 0]],
+          dense_shape=[len(iris.target), 2])
+      labels = array_ops.reshape(
+          constant_op.constant(iris.target, dtype=dtypes.int32), [-1, 1])
+      return features, labels
+
+    iris = test_data.prepare_iris_data_for_logistic_regression()
+    cont_features = [fc_core.numeric_column(str(i)) for i in range(4)]
+    linear_features = [
+        fc_core.bucketized_column(
+            cont_features[i],
+            sorted(set(test_data.get_quantile_based_buckets(
+                iris.data[:, i], 10)))) for i in range(4)
+    ]
+    linear_features.append(
+        fc_core.categorical_column_with_hash_bucket(
+            'dummy_sparse_column', hash_bucket_size=100))
+
+    classifier = dnn_linear_combined.DNNLinearCombinedClassifier(
+        linear_feature_columns=linear_features,
+        dnn_feature_columns=cont_features,
+        dnn_hidden_units=[3, 3])
+
+    classifier.fit(input_fn=_input_fn, steps=100)
+    scores = classifier.evaluate(input_fn=_input_fn, steps=100)
+    _assert_metrics_in_range(('accuracy', 'auc'), scores)
+
   def testTrainWithPartitionedVariables(self):
     """Tests training with partitioned variables."""
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_test.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_test.py
index 1930915119..615af24cd3 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dnn_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_test.py
@@ -38,6 +38,7 @@ from tensorflow.contrib.learn.python.learn.estimators import run_config
 from tensorflow.contrib.learn.python.learn.estimators import test_data
 from tensorflow.contrib.learn.python.learn.metric_spec import MetricSpec
 from tensorflow.contrib.metrics.python.ops import metric_ops
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import sparse_tensor
@@ -325,6 +326,49 @@ class DNNClassifierTest(test.TestCase):
       for i in range(expected_n_classes):
         self._assertInRange(0.0, 1.0, probabilities[b][i])
 
+  def testEstimatorWithCoreFeatureColumns(self):
+
+    def _input_fn(num_epochs=None):
+      features = {
+          'age':
+              input_lib.limit_epochs(
+                  constant_op.constant([[.8], [0.2], [.1]]),
+                  num_epochs=num_epochs),
+          'language':
+              sparse_tensor.SparseTensor(
+                  values=input_lib.limit_epochs(
+                      ['en', 'fr', 'zh'], num_epochs=num_epochs),
+                  indices=[[0, 0], [0, 1], [2, 0]],
+                  dense_shape=[3, 2])
+      }
+      return features, constant_op.constant([[1], [0], [0]], dtype=dtypes.int32)
+
+    language_column = fc_core.categorical_column_with_hash_bucket(
+        'language', hash_bucket_size=20)
+    feature_columns = [
+        fc_core.embedding_column(language_column, dimension=1),
+        fc_core.numeric_column('age')
+    ]
+
+    classifier = dnn.DNNClassifier(
+        n_classes=2,
+        feature_columns=feature_columns,
+        hidden_units=[10, 10],
+        config=run_config.RunConfig(tf_random_seed=1))
+
+    classifier.fit(input_fn=_input_fn, steps=50)
+
+    scores = classifier.evaluate(input_fn=_input_fn, steps=1)
+    self._assertInRange(0.0, 1.0, scores['accuracy'])
+    self.assertIn('loss', scores)
+    predict_input_fn = functools.partial(_input_fn, num_epochs=1)
+    predicted_classes = list(
+        classifier.predict_classes(input_fn=predict_input_fn, as_iterable=True))
+    self._assertBinaryPredictions(3, predicted_classes)
+    predictions = list(
+        classifier.predict(input_fn=predict_input_fn, as_iterable=True))
+    self.assertAllEqual(predicted_classes, predictions)
+
   def testLogisticRegression_TensorData(self):
     """Tests binary classification using tensor data as input."""
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/linear.py b/tensorflow/contrib/learn/python/learn/estimators/linear.py
index bff4dc8d63..8a595a7901 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/linear.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/linear.py
@@ -27,11 +27,13 @@ from tensorflow.contrib import layers
 from tensorflow.contrib.framework import deprecated
 from tensorflow.contrib.framework import deprecated_arg_values
 from tensorflow.contrib.framework.python.ops import variables as contrib_variables
+from tensorflow.contrib.layers.python.layers import feature_column
 from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators import head as head_lib
 from tensorflow.contrib.learn.python.learn.estimators import prediction_key
 from tensorflow.contrib.learn.python.learn.utils import export
 from tensorflow.contrib.linear_optimizer.python import sdca_optimizer
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
@@ -148,17 +150,24 @@ def _linear_model_fn(features, labels, mode, params, config=None):
       parent_scope,
       values=tuple(six.itervalues(features)),
       partitioner=partitioner) as scope:
-    if joint_weights:
-      layer_fn = layers.joint_weighted_sum_from_feature_columns
+    if all([isinstance(fc, feature_column._FeatureColumn)  # pylint: disable=protected-access
+            for fc in feature_columns]):
+      if joint_weights:
+        layer_fn = layers.joint_weighted_sum_from_feature_columns
+      else:
+        layer_fn = layers.weighted_sum_from_feature_columns
+      logits, _, _ = layer_fn(
+          columns_to_tensors=features,
+          feature_columns=feature_columns,
+          num_outputs=head.logits_dimension,
+          weight_collections=[parent_scope],
+          scope=scope)
     else:
-      layer_fn = layers.weighted_sum_from_feature_columns
-        
-    logits, _, _ = layer_fn(
-            columns_to_tensors=features,
-            feature_columns=feature_columns,
-            num_outputs=head.logits_dimension,
-            weight_collections=[parent_scope],
-            scope=scope)
+      logits = fc_core.linear_model(
+          features=features,
+          feature_columns=feature_columns,
+          units=head.logits_dimension,
+          weight_collections=[parent_scope])
 
     def _train_op_fn(loss):
       global_step = contrib_variables.get_global_step()
diff --git a/tensorflow/contrib/learn/python/learn/estimators/linear_test.py b/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
index 9147ca9abb..145d5c40fa 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/linear_test.py
@@ -37,6 +37,7 @@ from tensorflow.contrib.learn.python.learn.estimators import test_data
 from tensorflow.contrib.learn.python.learn.metric_spec import MetricSpec
 from tensorflow.contrib.linear_optimizer.python import sdca_optimizer as sdca_optimizer_lib
 from tensorflow.contrib.metrics.python.ops import metric_ops
+from tensorflow.python.feature_column import feature_column as fc_core
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import sparse_tensor
@@ -235,6 +236,32 @@ class LinearClassifierTest(test.TestCase):
     scores = classifier.evaluate(input_fn=_input_fn, steps=1)
     self.assertGreater(scores['accuracy'], 0.9)
 
+  def testEstimatorWithCoreFeatureColumns(self):
+
+    def _input_fn(num_epochs=None):
+      features = {
+          'age':
+              input_lib.limit_epochs(
+                  constant_op.constant([[.8], [0.2], [.1]]),
+                  num_epochs=num_epochs),
+          'language':
+              sparse_tensor.SparseTensor(
+                  values=input_lib.limit_epochs(
+                      ['en', 'fr', 'zh'], num_epochs=num_epochs),
+                  indices=[[0, 0], [0, 1], [2, 0]],
+                  dense_shape=[3, 2])
+      }
+      return features, constant_op.constant([[1], [0], [0]], dtype=dtypes.int32)
+
+    language_column = fc_core.categorical_column_with_hash_bucket(
+        'language', hash_bucket_size=20)
+    feature_columns = [language_column, fc_core.numeric_column('age')]
+
+    classifier = linear.LinearClassifier(feature_columns=feature_columns)
+    classifier.fit(input_fn=_input_fn, steps=100)
+    scores = classifier.evaluate(input_fn=_input_fn, steps=1)
+    self.assertGreater(scores['accuracy'], 0.9)
+
   def testLogisticRegression_MatrixData_Labels1D(self):
     """Same as the last test, but labels shape is [100] instead of [100, 1]."""
 
-- 
GitLab


From e08e54e8b232d95038c1f2a1ddd4d26664323100 Mon Sep 17 00:00:00 2001
From: Ido Shamay <idoshamay@gmail.com>
Date: Tue, 16 May 2017 01:17:09 +0300
Subject: [PATCH 1365/1563] verbs: Configure IB/RoCE QPs MTU according to the
 port MTU (#9667)

* verbs: Configure IB/RoCE QPs MTU according to the port MTU

* fix indent for linting
---
 tensorflow/contrib/verbs/rdma.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/verbs/rdma.cc b/tensorflow/contrib/verbs/rdma.cc
index bfd00ba3f5..c9ce754a37 100644
--- a/tensorflow/contrib/verbs/rdma.cc
+++ b/tensorflow/contrib/verbs/rdma.cc
@@ -476,7 +476,11 @@ void RdmaChannel::Connect(const RdmaAddress& remoteAddr) {
     struct ibv_qp_attr attr;
     memset(&attr, 0, sizeof(ibv_qp_attr));
     attr.qp_state = IBV_QPS_RTR;
-    attr.path_mtu = IBV_MTU_4096;
+    struct ibv_port_attr port_attr;
+    CHECK(!ibv_query_port(adapter_->context_, (uint8_t)1, &port_attr))
+        << "Query port failed";
+    // This assumes both QP's ports are configured with the same MTU
+    attr.path_mtu = port_attr.active_mtu;
     attr.dest_qp_num = remoteAddr.qpn;
     attr.rq_psn = remoteAddr.psn;
     attr.max_dest_rd_atomic = 1;
-- 
GitLab


From e91712dee2c87c614d0a6db7f197079ca46e6dfe Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Mon, 15 May 2017 15:15:27 -0700
Subject: [PATCH 1366/1563] Add control dependencies to prevent nodes from
 being swapped back in too soon.

PiperOrigin-RevId: 156110919
---
 tensorflow/core/grappler/optimizers/BUILD     |   1 -
 .../grappler/optimizers/memory_optimizer.cc   | 176 ++++++++++++++++--
 .../optimizers/memory_optimizer_test.cc       |  22 ++-
 tensorflow/python/BUILD                       |  17 ++
 .../python/grappler/memory_optimizer_test.py  |  89 +++++++++
 5 files changed, 290 insertions(+), 15 deletions(-)
 create mode 100644 tensorflow/python/grappler/memory_optimizer_test.py

diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 849c148f4d..07c7ea1fc1 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -192,7 +192,6 @@ cc_library(
         "//tensorflow/core/grappler:grappler_item",
         "//tensorflow/core/grappler:utils",
         "//tensorflow/core/grappler/costs:graph_properties",
-        "//tensorflow/core/grappler/utils:scc",
     ],
 )
 
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer.cc b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
index faf2ce153a..1ed7cab4ab 100644
--- a/tensorflow/core/grappler/optimizers/memory_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer.cc
@@ -20,8 +20,10 @@ limitations under the License.
 
 #include "tensorflow/core/framework/attr_value.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/costs/graph_properties.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/grappler/optimizers/graph_rewriter.h"
+#include "tensorflow/core/grappler/optimizers/static_schedule.h"
 #include "tensorflow/core/grappler/utils.h"
 
 namespace tensorflow {
@@ -101,26 +103,178 @@ std::pair<NodeDef*, NodeDef*> BuildSwapPair(NodeDef* node, int input_to_swap,
   return std::make_pair(swap_out_node, swap_in_node);
 }
 
+static int64 EstimateSize(const OpInfo::TensorProperties& t) {
+  DataType dtype = t.dtype();
+  int64 size = DataTypeSize(dtype);
+  TensorShapeProto shape = t.shape();
+  if (shape.unknown_rank()) {
+    // Can't infer the size if the rank is unknown. It has to be at least a
+    // scalar though.
+    return size;
+  }
+  // If one of the dimensions is unknown statically, assume it's at least one.
+  for (int i = 0; i < shape.dim_size(); ++i) {
+    if (shape.dim(i).size() < 0) {
+      shape.mutable_dim(i)->set_size(1);
+    }
+  }
+  int64 num_elems = TensorShape(shape).num_elements();
+  return num_elems * size;
+}
+
+struct SwapInfo {
+  std::vector<int> inputs_to_swap;
+  Costs::NanoSeconds time_to_swap = 0;
+};
+
+static const NodeDef* FindSwapTrigger(
+    const NodeDef* node, const SwapInfo& swap_info,
+    const std::unordered_map<string, const NodeDef*>& name_map,
+    const std::unordered_map<const NodeDef*, Costs::NanoSeconds>&
+        execution_times) {
+  // max_trigger_time stores the time before which the swap operation needs to
+  // be started in order to load the data back onto the accelerator without
+  // delaying the downstream computation.
+  Costs::NanoSeconds max_trigger_time(0);
+  std::set<string> possible_inputs;
+  for (int i = 0; i < node->input_size(); ++i) {
+    const string input_node_name = NodeName(node->input(i));
+    auto it1 = name_map.find(input_node_name);
+    if (it1 == name_map.end()) {
+      return nullptr;
+    }
+    const NodeDef* input_node = it1->second;
+
+    auto it2 = execution_times.find(input_node);
+    if (it2 == execution_times.end()) {
+      return nullptr;
+    }
+    max_trigger_time = std::max(max_trigger_time, it2->second);
+    possible_inputs.insert(input_node_name);
+  }
+
+  for (const int i : swap_info.inputs_to_swap) {
+    const string input_node_name = NodeName(node->input(i));
+    possible_inputs.erase(input_node_name);
+  }
+  if (possible_inputs.empty()) {
+    return nullptr;
+  }
+
+  max_trigger_time -= swap_info.time_to_swap;
+
+  std::map<Costs::NanoSeconds, const NodeDef*> candidates;
+  while (!possible_inputs.empty()) {
+    const string input_node_name = *possible_inputs.begin();
+    possible_inputs.erase(possible_inputs.begin());
+    auto it1 = name_map.find(input_node_name);
+    if (it1 == name_map.end()) {
+      return nullptr;
+    }
+    const NodeDef* input_node = it1->second;
+    // Don't jump over frames, since adding a control dependency from one frame
+    // to the next isn't supported. Don't go through branches, since we don't
+    // know whether they'll be executed or not.
+    if (input_node->op() == "NextIteration" || input_node->op() == "Switch" ||
+        input_node->op() == "Merge") {
+      continue;
+    }
+    auto it2 = execution_times.find(input_node);
+    if (it2 == execution_times.end()) {
+      return nullptr;
+    }
+    if (it2->second < max_trigger_time) {
+      candidates[it2->second] = input_node;
+    } else {
+      for (const string& fanin : input_node->input()) {
+        possible_inputs.insert(NodeName(fanin));
+      }
+    }
+  }
+
+  // Select the candidate that will execute last, since we want to swap the data
+  // back at the last minute while still allowing enough time for data to be
+  // swapped back timely to feed the downstream nodes.
+  if (!candidates.empty()) {
+    return candidates.rbegin()->second;
+  }
+  return nullptr;
+}
+
 Status MemoryOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
                                  GraphDef* optimized_graph) {
   *optimized_graph = item.graph;
 
+  // Figure out what needs to be swapped;
+  std::unordered_map<NodeDef*, SwapInfo> nodes_to_swap;
   for (auto& node : *optimized_graph->mutable_node()) {
-    if (node.attr().count("swap_to_host") == 0) {
-      continue;
+    if (node.attr().count("_swap_to_host") != 0) {
+      SwapInfo& swap_info = nodes_to_swap[&node];
+      const AttrValue& val = node.attr().at("_swap_to_host");
+      if (val.has_list()) {
+        for (int64 input_id : val.list().i()) {
+          swap_info.inputs_to_swap.push_back(input_id);
+        }
+      } else {
+        int64 input_id = val.i();
+        swap_info.inputs_to_swap.push_back(input_id);
+      }
     }
+  }
+  if (nodes_to_swap.empty()) {
+    // Nothing to do.
+    return Status::OK();
+  }
 
+  {
+    // Estimate the size of the data to swap for each node.
+    GraphProperties properties(item);
+    TF_RETURN_IF_ERROR(properties.InferStatically());
+    for (auto& swap : nodes_to_swap) {
+      const NodeDef* node = swap.first;
+      std::vector<OpInfo::TensorProperties> props =
+          properties.GetInputProperties(node->name());
+      SwapInfo& swap_info = swap.second;
+      int64 bytes_to_swap = 0;
+      for (int64 input_id : swap_info.inputs_to_swap) {
+        const OpInfo::TensorProperties& t = props[input_id];
+        bytes_to_swap += EstimateSize(t);
+      }
+      // Let's assume we're going to swap over PCIe running at 16 GBps.
+      swap_info.time_to_swap = bytes_to_swap / 16;
+    }
+  }
+
+  std::unordered_map<const NodeDef*, Costs::NanoSeconds> execution_times;
+  TF_RETURN_IF_ERROR(
+      EstimateEarliestExecutionTimes(item, cluster, &execution_times));
+
+  std::unordered_map<string, const NodeDef*> name_map;
+  for (const auto& node : item.graph.node()) {
+    name_map[node.name()] = &node;
+  }
+
+  for (auto& swap : nodes_to_swap) {
+    NodeDef* node = swap.first;
+    SwapInfo& swap_info = swap.second;
+
+    // Make sure the tensor isn't swapped back in right away: look for node that
+    // will execute just before we need to swap the data back, and add a control
+    // dependency from that node to the swap node.
+    const NodeDef* trigger =
+        FindSwapTrigger(node, swap_info, name_map, execution_times);
+    if (!trigger) {
+      continue;
+    }
     // Swap all the tensors that are marked with the 'swap_to_host' attribute.
-    for (int input_id : node.attr().at("swap_to_host").list().i()) {
+    for (int input_id : swap_info.inputs_to_swap) {
       std::pair<NodeDef*, NodeDef*> swap_nodes =
-          BuildSwapPair(&node, input_id, optimized_graph);
-      *swap_nodes.first->add_input() = node.input(input_id);
-      *node.mutable_input(input_id) = swap_nodes.second->name();
-
-      // TODO(bsteiner): Make sure the tensor isn't swapped back in right away
-      // by adding a control dependency to delay the execution of the swap.
-      // string trigger;
-      //*swap_nodes.second->add_input() = strings::StrCat("^", trigger);
+          BuildSwapPair(node, input_id, optimized_graph);
+      *swap_nodes.first->add_input() = node->input(input_id);
+      *node->mutable_input(input_id) = swap_nodes.second->name();
+
+      // Add the control dependency needed to delay the execution of the swap.
+      *swap_nodes.second->add_input() = strings::StrCat("^", trigger->name());
     }
   }
 
diff --git a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
index c230a40fe5..a4f8e22e1d 100644
--- a/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
+++ b/tensorflow/core/grappler/optimizers/memory_optimizer_test.cc
@@ -19,6 +19,7 @@ limitations under the License.
 
 #include "tensorflow/cc/ops/standard_ops.h"
 #include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/clusters/virtual_cluster.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/grappler/utils.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
@@ -114,7 +115,19 @@ TEST_F(RecomputeSubgraphTest, MultiNode) {
   EXPECT_EQ("^BN1Grad", recomputed_c->input(1).substr(0, 8));
 }
 
-class MemoryOptimizerTest : public ::testing::Test {};
+class MemoryOptimizerTest : public ::testing::Test {
+ public:
+  static VirtualCluster CreateVirtualCluster() {
+    DeviceProperties cpu_device;
+    cpu_device.set_type("CPU");
+    cpu_device.set_frequency(1000);
+    cpu_device.set_num_cores(4);
+    cpu_device.set_bandwidth(32);
+    std::unordered_map<string, DeviceProperties> devices;
+    devices["/job:localhost/replica:0/task:0/cpu:0"] = cpu_device;
+    return VirtualCluster(devices);
+  }
+};
 
 TEST_F(MemoryOptimizerTest, SimpleSwapping) {
   // Build a simple graph with an op that's marked for swapping.
@@ -132,12 +145,14 @@ TEST_F(MemoryOptimizerTest, SimpleSwapping) {
   EXPECT_EQ(5, item.graph.node_size());
   EXPECT_EQ(NodeName(e.name()), item.graph.node(4).name());
   AttrValue& val =
-      (*item.graph.mutable_node(4)->mutable_attr())["swap_to_host"];
+      (*item.graph.mutable_node(4)->mutable_attr())["_swap_to_host"];
   val.mutable_list()->add_i(0);
 
+  VirtualCluster cluster(CreateVirtualCluster());
+
   MemoryOptimizer optimizer;
   GraphDef output;
-  Status status = optimizer.Optimize(nullptr, item, &output);
+  Status status = optimizer.Optimize(&cluster, item, &output);
   TF_EXPECT_OK(status);
 
   EXPECT_EQ(7, output.node_size());
@@ -156,6 +171,7 @@ TEST_F(MemoryOptimizerTest, SimpleSwapping) {
 
   EXPECT_EQ(NodeName(b.name()), swap_out.input(0));
   EXPECT_EQ(NodeName(swap_out.name()), swap_in.input(0));
+  EXPECT_EQ("^c", swap_in.input(1));
 }
 
 }  // namespace
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index e9627f7862..648745e931 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -3612,3 +3612,20 @@ py_test(
         "//third_party/py/numpy",
     ],
 )
+
+py_test(
+    name = "memory_optimizer_test",
+    size = "medium",
+    srcs = [
+        "grappler/memory_optimizer_test.py",
+    ],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":client_testlib",
+        ":framework_for_generated_wrappers",
+        ":math_ops",
+        ":tf_optimizer",
+        "//tensorflow/core:protos_all_py",
+        "//third_party/py/numpy",
+    ],
+)
diff --git a/tensorflow/python/grappler/memory_optimizer_test.py b/tensorflow/python/grappler/memory_optimizer_test.py
new file mode 100644
index 0000000000..581f17c2ca
--- /dev/null
+++ b/tensorflow/python/grappler/memory_optimizer_test.py
@@ -0,0 +1,89 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the swig wrapper tf_optimizer."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.core.protobuf import rewriter_config_pb2
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import meta_graph
+from tensorflow.python.framework import ops
+from tensorflow.python.grappler import tf_optimizer
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class MemoryOptimizerTest(test.TestCase):
+  """Tests the Grappler memory optimizer."""
+
+  def testNoSwapping(self):
+    """Make sure the graph is preserved when there is nothing to swap."""
+    a = constant_op.constant(10, name='a')
+    b = constant_op.constant(20, name='b')
+    c = math_ops.add_n([a, b], name='c')
+    d = math_ops.add_n([b, c], name='d')
+    train_op = ops.get_collection_ref(ops.GraphKeys.TRAIN_OP)
+    train_op.append(d)
+    mg = meta_graph.create_meta_graph_def(graph=ops.get_default_graph())
+
+    rewriter_config = rewriter_config_pb2.RewriterConfig(
+        memory_optimization=rewriter_config_pb2.RewriterConfig.MANUAL)
+    graph = tf_optimizer.OptimizeGraph(rewriter_config, mg)
+
+    self.assertEqual(len(graph.node), 4)
+    self.assertItemsEqual([node.name
+                           for node in graph.node], ['a', 'b', 'c', 'd'])
+
+  def testSimpleSwap(self):
+    """Check that the swap annotations are followed."""
+    a = constant_op.constant(10, name='a')
+    b = constant_op.constant(20, name='b')
+    c = math_ops.add_n([a, b], name='c')
+    d = math_ops.add_n([b, c], name='d')
+    train_op = ops.get_collection_ref(ops.GraphKeys.TRAIN_OP)
+    train_op.append(d)
+
+    d.op.node_def.attr['_swap_to_host'].i = 0
+
+    mg = meta_graph.create_meta_graph_def(graph=ops.get_default_graph())
+
+    rewriter_config = rewriter_config_pb2.RewriterConfig(
+        memory_optimization=rewriter_config_pb2.RewriterConfig.MANUAL)
+    graph = tf_optimizer.OptimizeGraph(rewriter_config, mg)
+
+    self.assertEqual(len(graph.node), 6)
+    self.assertItemsEqual([node.name for node in graph.node], [
+        'a',
+        'b',
+        'c',
+        'd',
+        'swap_in_d_0',
+        'swap_out_d_0',
+    ])
+    for node in graph.node:
+      if node.name == 'swap_in_d_0':
+        self.assertEqual('swap_out_d_0', node.input[0])
+        self.assertEqual('^b', node.input[1])
+      elif node.name == 'swap_out_d_0':
+        self.assertEqual('b', node.input[0])
+      elif node.name == 'd':
+        self.assertEqual('swap_in_d_0', node.input[0])
+        self.assertEqual('c', node.input[1])
+
+
+if __name__ == '__main__':
+  test.main()
-- 
GitLab


From 237fcedbdcbaa01768308011528ea3d4e261c0f5 Mon Sep 17 00:00:00 2001
From: Scott Sievert <stsievert@users.noreply.github.com>
Date: Mon, 15 May 2017 17:21:59 -0500
Subject: [PATCH 1367/1563] DOC: formats momentum calculation for web (#9802)

* Add input function for training and testing (#9617)

* Add input function for training and testing

Estimator is decoupled from Scikit Learn interface by moving into separate class SKCompat. Arguments x, y and batch_size are only available in the SKCompat class, Estimator will only accept input_fn

* remove extra comma

* DOC: format documentation for momentum calculation
---
 tensorflow/python/training/momentum.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/training/momentum.py b/tensorflow/python/training/momentum.py
index e42f3b639c..ffd7c12c42 100644
--- a/tensorflow/python/training/momentum.py
+++ b/tensorflow/python/training/momentum.py
@@ -28,8 +28,11 @@ class MomentumOptimizer(optimizer.Optimizer):
   """Optimizer that implements the Momentum algorithm.
 
   Computes (if `use_nesterov = False`):
-    accumulation = momentum * accumulation + gradient
-    variable -= learning_rate * accumulation
+  
+  ```
+  accumulation = momentum * accumulation + gradient
+  variable -= learning_rate * accumulation
+  ```
 
   Note that in the dense version of this algorithm, `accumulation` is updated
   and applied regardless of a gradient's value, whereas the sparse version (when
-- 
GitLab


From 15d9f00fa6a7d4be0c1d8705912c28b704c66797 Mon Sep 17 00:00:00 2001
From: Mark Wong <mark.sl.wong@gmail.com>
Date: Mon, 15 May 2017 15:24:04 -0700
Subject: [PATCH 1368/1563] Allows Tensorflow to be built directly from a
 Visual Studio solution on (#9666)

Windows.  Also enables Debug builds for Windows.
---
 tensorflow/contrib/cmake/CMakeLists.txt                 | 7 +++++--
 tensorflow/contrib/cmake/external/googletest.cmake      | 2 +-
 tensorflow/contrib/cmake/external/grpc.cmake            | 6 +++---
 tensorflow/contrib/cmake/external/jsoncpp.cmake         | 2 +-
 tensorflow/contrib/cmake/external/png.cmake             | 4 +++-
 tensorflow/contrib/cmake/external/protobuf.cmake        | 6 ++++--
 tensorflow/contrib/cmake/external/zlib.cmake            | 3 ++-
 tensorflow/contrib/cmake/tf_python.cmake                | 4 ++--
 tensorflow/core/distributed_runtime/message_wrappers.cc | 2 ++
 tensorflow/core/kernels/depthwise_conv_op.cc            | 2 ++
 10 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 83b405fd4e..10ac577018 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -61,15 +61,18 @@ add_definitions(-DEIGEN_AVOID_STL_ARRAY)
 if(WIN32)
   add_definitions(-DNOMINMAX -D_WIN32_WINNT=0x0A00 -DLANG_CXX11 -DCOMPILER_MSVC)
   add_definitions(-DWIN32 -DOS_WIN -D_MBCS -DWIN64 -DWIN32_LEAN_AND_MEAN -DNOGDI -DPLATFORM_WINDOWS)
-  add_definitions(-DTENSORFLOW_USE_EIGEN_THREADPOOL -DEIGEN_HAS_C99_MATH -D_ITERATOR_DEBUG_LEVEL=0)
+  add_definitions(-DTENSORFLOW_USE_EIGEN_THREADPOOL -DEIGEN_HAS_C99_MATH)
   add_definitions(-DTF_COMPILE_LIBRARY)
-  add_definitions(-DNDEBUG /O2)  # Equivalent of -c opt in Bazel.
   add_definitions(/bigobj /nologo /EHsc /GF /FC /MP /Gm-)
   # Suppress warnings to reduce build log size.
   add_definitions(/wd4267 /wd4244 /wd4800 /wd4503 /wd4554 /wd4996 /wd4348 /wd4018)
   add_definitions(/wd4099 /wd4146 /wd4267 /wd4305 /wd4307)
   add_definitions(/wd4715 /wd4722 /wd4723 /wd4838 /wd4309 /wd4334)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_ITERATOR_DEBUG_LEVEL=0")
+  set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /D_ITERATOR_DEBUG_LEVEL=0")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /D_ITERATOR_DEBUG_LEVEL=0")
 endif()
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
diff --git a/tensorflow/contrib/cmake/external/googletest.cmake b/tensorflow/contrib/cmake/external/googletest.cmake
index c370f46d2a..d09bb02890 100644
--- a/tensorflow/contrib/cmake/external/googletest.cmake
+++ b/tensorflow/contrib/cmake/external/googletest.cmake
@@ -21,7 +21,7 @@ set(googletest_TAG ec44c6c1675c25b9827aacd08c02433cccde7780)
 
 if(WIN32)
   set(googletest_STATIC_LIBRARIES
-      ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/${CMAKE_BUILD_TYPE}/gtest.lib)
+      ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/$(Configuration)/gtest.lib)
 else()
   set(googletest_STATIC_LIBRARIES
       ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/${CMAKE_BUILD_TYPE}/gtest.a)
diff --git a/tensorflow/contrib/cmake/external/grpc.cmake b/tensorflow/contrib/cmake/external/grpc.cmake
index 46ea519f09..d7201680ce 100644
--- a/tensorflow/contrib/cmake/external/grpc.cmake
+++ b/tensorflow/contrib/cmake/external/grpc.cmake
@@ -21,9 +21,9 @@ set(GRPC_TAG 3bc78cd0b5bd784a235c01612d634b1ec5f8fb97)
 
 if(WIN32)
   set(grpc_STATIC_LIBRARIES
-      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/${CMAKE_BUILD_TYPE}/grpc++_unsecure.lib
-      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/${CMAKE_BUILD_TYPE}/grpc_unsecure.lib
-      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/${CMAKE_BUILD_TYPE}/gpr.lib)
+      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/$(Configuration)/grpc++_unsecure.lib
+      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/$(Configuration)/grpc_unsecure.lib
+      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/$(Configuration)/gpr.lib)
 else()
   set(grpc_STATIC_LIBRARIES
       ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/libgrpc++_unsecure.a
diff --git a/tensorflow/contrib/cmake/external/jsoncpp.cmake b/tensorflow/contrib/cmake/external/jsoncpp.cmake
index 1ef49681a6..5127d7e8f7 100644
--- a/tensorflow/contrib/cmake/external/jsoncpp.cmake
+++ b/tensorflow/contrib/cmake/external/jsoncpp.cmake
@@ -23,7 +23,7 @@ set(jsoncpp_LIBRARIES ${jsoncpp_BUILD}/obj/so/libjsoncpp.so)
 set(jsoncpp_INCLUDES ${jsoncpp_BUILD})
 
 if(WIN32)
-  set(jsoncpp_STATIC_LIBRARIES ${jsoncpp_BUILD}/${CMAKE_BUILD_TYPE}/jsoncpp.lib)
+  set(jsoncpp_STATIC_LIBRARIES ${jsoncpp_BUILD}/$(Configuration)/jsoncpp.lib)
 else()
   set(jsoncpp_STATIC_LIBRARIES ${jsoncpp_BUILD}/libjsoncpp.a)
 endif()
diff --git a/tensorflow/contrib/cmake/external/png.cmake b/tensorflow/contrib/cmake/external/png.cmake
index 05e9688d1f..2b2bd47d1c 100644
--- a/tensorflow/contrib/cmake/external/png.cmake
+++ b/tensorflow/contrib/cmake/external/png.cmake
@@ -21,7 +21,9 @@ set(png_BUILD ${CMAKE_BINARY_DIR}/png/src/png)
 set(png_INSTALL ${CMAKE_BINARY_DIR}/png/install)
 
 if(WIN32)
-  set(png_STATIC_LIBRARIES ${CMAKE_BINARY_DIR}/png/install/lib/libpng12_static.lib)
+  set(png_STATIC_LIBRARIES 
+    debug ${CMAKE_BINARY_DIR}/png/install/lib/libpng12_staticd.lib
+    optimized ${CMAKE_BINARY_DIR}/png/install/lib/libpng12_static.lib)
 else()
   set(png_STATIC_LIBRARIES ${CMAKE_BINARY_DIR}/png/install/lib/libpng12.a)
 endif()
diff --git a/tensorflow/contrib/cmake/external/protobuf.cmake b/tensorflow/contrib/cmake/external/protobuf.cmake
index 6cd9c11750..d600d8c3c0 100644
--- a/tensorflow/contrib/cmake/external/protobuf.cmake
+++ b/tensorflow/contrib/cmake/external/protobuf.cmake
@@ -19,8 +19,10 @@ set(PROTOBUF_URL https://github.com/mrry/protobuf.git)  # Includes MSVC fix.
 set(PROTOBUF_TAG 1d2c7b6c7376f396c8c7dd9b6afd2d4f83f3cb05)
 
 if(WIN32)
-  set(protobuf_STATIC_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/${CMAKE_BUILD_TYPE}/libprotobuf.lib)
-  set(PROTOBUF_PROTOC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/${CMAKE_BUILD_TYPE}/protoc.exe)
+  set(protobuf_STATIC_LIBRARIES 
+    debug ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/$(Configuration)/libprotobufd.lib
+    optimized ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/$(Configuration)/libprotobuf.lib)
+  set(PROTOBUF_PROTOC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/$(Configuration)/protoc.exe)
   set(PROTOBUF_ADDITIONAL_CMAKE_OPTIONS	-Dprotobuf_MSVC_STATIC_RUNTIME:BOOL=OFF -A x64)
 else()
   set(protobuf_STATIC_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/libprotobuf.a)
diff --git a/tensorflow/contrib/cmake/external/zlib.cmake b/tensorflow/contrib/cmake/external/zlib.cmake
index 8cfde90438..c8af611e1e 100644
--- a/tensorflow/contrib/cmake/external/zlib.cmake
+++ b/tensorflow/contrib/cmake/external/zlib.cmake
@@ -22,7 +22,8 @@ set(ZLIB_TAG 50893291621658f355bc5b4d450a8d06a563053d)
 
 if(WIN32)
   set(zlib_STATIC_LIBRARIES
-      ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/zlibstatic.lib)
+      debug ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/zlibstaticd.lib
+      optimized ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/zlibstatic.lib)
 else()
   set(zlib_STATIC_LIBRARIES
       ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/libz.a)
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index bfd6a18c78..3670e4678b 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -863,9 +863,9 @@ add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
                                    ${CMAKE_CURRENT_BINARY_DIR}/tf_python/)
 if(WIN32)
   add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pywrap_tensorflow_internal.dll
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$(Configuration)/pywrap_tensorflow_internal.dll
                                      ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/python/_pywrap_tensorflow_internal.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pywrap_tensorflow_internal.lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$(Configuration)/pywrap_tensorflow_internal.lib
                                      ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/python/)
 else()
   add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
diff --git a/tensorflow/core/distributed_runtime/message_wrappers.cc b/tensorflow/core/distributed_runtime/message_wrappers.cc
index b077975ea5..f3bab589a1 100644
--- a/tensorflow/core/distributed_runtime/message_wrappers.cc
+++ b/tensorflow/core/distributed_runtime/message_wrappers.cc
@@ -516,6 +516,7 @@ CostGraphDef* InMemoryRunGraphResponse::mutable_cost_graph() {
 
 RunGraphResponse* InMemoryRunGraphResponse::get_proto() {
   LOG(FATAL) << "Cannot get a mutable protobuf for an InMemoryRunGraphResponse";
+  return NULL;
 }
 
 size_t OwnedProtoRunGraphResponse::num_recvs() const {
@@ -634,6 +635,7 @@ RunMetadata* InMemoryRunStepResponse::mutable_metadata() { return &metadata_; }
 
 RunStepResponse* InMemoryRunStepResponse::get_proto() {
   LOG(FATAL) << "Cannot get a mutable protobuf for an InMemoryRunStepResponse";
+  return NULL;
 }
 
 size_t OwnedProtoRunStepResponse::num_tensors() const {
diff --git a/tensorflow/core/kernels/depthwise_conv_op.cc b/tensorflow/core/kernels/depthwise_conv_op.cc
index 26d45f79d8..2e7213f956 100644
--- a/tensorflow/core/kernels/depthwise_conv_op.cc
+++ b/tensorflow/core/kernels/depthwise_conv_op.cc
@@ -441,7 +441,9 @@ class DepthwiseConv2dNativeOp : public BinaryOp<T> {
       DepthwiseConv2dNativeOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_CPU_KERNEL);
+#if defined(PLATFORM_WINDOWS) && !defined(_DEBUG)
 TF_CALL_double(REGISTER_CPU_KERNEL);
+#endif
 
 #if GOOGLE_CUDA
 REGISTER_KERNEL_BUILDER(
-- 
GitLab


From 060b7e25aaebda78a858456ba37ee36b1f5dc65d Mon Sep 17 00:00:00 2001
From: Sherry Moore <sherrym@google.com>
Date: Mon, 15 May 2017 15:24:14 -0700
Subject: [PATCH 1369/1563] Ignore TypeError when striping or prepending name
 scopes.

PiperOrigin-RevId: 156112135
---
 tensorflow/python/framework/ops.py       | 24 +++++++++++++++++-------
 tensorflow/python/training/saver_test.py | 12 ++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index b56f4bf120..c481726429 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -4373,10 +4373,15 @@ def strip_name_scope(name, export_scope):
     is None.
   """
   if export_scope:
-    # Strips export_scope/, export_scope///,
-    # ^export_scope/, loc:@export_scope/.
-    str_to_replace = r"([\^]|loc:@|^)" + export_scope + r"[\/]+(.*)"
-    return re.sub(str_to_replace, r"\1\2", compat.as_str(name), count=1)
+    try:
+      # Strips export_scope/, export_scope///,
+      # ^export_scope/, loc:@export_scope/.
+      str_to_replace = r"([\^]|loc:@|^)" + export_scope + r"[\/]+(.*)"
+      return re.sub(str_to_replace, r"\1\2", compat.as_str(name), count=1)
+    except TypeError as e:
+      # If the name is not of a type we can process, simply return it.
+      logging.warning(e)
+      return name
   else:
     return name
 
@@ -4393,9 +4398,14 @@ def prepend_name_scope(name, import_scope):
     is None.
   """
   if import_scope:
-    str_to_replace = r"([\^]|loc:@|^)(.*)"
-    return re.sub(str_to_replace, r"\1" + import_scope + r"/\2",
-                  compat.as_str(name))
+    try:
+      str_to_replace = r"([\^]|loc:@|^)(.*)"
+      return re.sub(str_to_replace, r"\1" + import_scope + r"/\2",
+                    compat.as_str(name))
+    except TypeError as e:
+      # If the name is not of a type we can process, simply return it.
+      logging.warning(e)
+      return name
   else:
     return name
 
diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py
index cb6cf2f75b..5d1f434a56 100644
--- a/tensorflow/python/training/saver_test.py
+++ b/tensorflow/python/training/saver_test.py
@@ -2087,6 +2087,18 @@ class ScopedGraphTest(test.TestCase):
         biases3 = variables.Variable(array_ops.zeros([10]), name="biases")
         logits = math_ops.matmul(hidden2, weights3) + biases3
         ops_lib.add_to_collection("logits", logits)
+
+        # Adds user_defined proto in three formats: string, bytes and Any.
+        # Any proto should just pass through.
+        queue_runner = queue_runner_pb2.QueueRunnerDef(queue_name="test_queue")
+        ops_lib.add_to_collection("user_defined_string_collection",
+                                  str(queue_runner))
+        ops_lib.add_to_collection("user_defined_bytes_collection",
+                                  queue_runner.SerializeToString())
+        any_buf = Any()
+        any_buf.Pack(queue_runner)
+        ops_lib.add_to_collection("user_defined_any_collection", any_buf)
+
       _, var_list = meta_graph.export_scoped_meta_graph(
           filename=os.path.join(test_dir, exported_filename),
           graph=ops_lib.get_default_graph(),
-- 
GitLab


From 751515f10626fef3b88175921a0eb495ae93a1aa Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 15:29:25 -0700
Subject: [PATCH 1370/1563] Neon-based depthwiseconv op.

PiperOrigin-RevId: 156112836
---
 tensorflow/BUILD                              |   1 +
 tensorflow/core/BUILD                         |   1 +
 tensorflow/core/kernels/neon/BUILD            |  43 ++
 .../core/kernels/neon/depthwiseconv_float.h   | 725 ++++++++++++++++++
 .../kernels/neon/neon_depthwise_conv_op.cc    | 200 +++++
 tensorflow/core/kernels/neon/types.h          |  71 ++
 tensorflow/python/kernel_tests/BUILD          |  15 +
 .../neon_depthwise_conv_op_test.py            | 287 +++++++
 8 files changed, 1343 insertions(+)
 create mode 100644 tensorflow/core/kernels/neon/BUILD
 create mode 100644 tensorflow/core/kernels/neon/depthwiseconv_float.h
 create mode 100644 tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
 create mode 100644 tensorflow/core/kernels/neon/types.h
 create mode 100644 tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 8e7ce37935..fb7189ff1f 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -285,6 +285,7 @@ filegroup(
         "//tensorflow/core/grappler/utils:all_files",
         "//tensorflow/core/kernels:all_files",
         "//tensorflow/core/kernels/hexagon:all_files",
+        "//tensorflow/core/kernels/neon:all_files",
         "//tensorflow/core/ops/compat:all_files",
         "//tensorflow/core/platform/cloud:all_files",
         "//tensorflow/core/platform/default/build_config:all_files",
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index a0d56df4aa..28ef29d563 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -737,6 +737,7 @@ cc_library(
         "//tensorflow/core/kernels:array_not_windows",
         "//tensorflow/core/kernels:math_not_windows",
         "//tensorflow/core/kernels:quantized_ops",
+        "//tensorflow/core/kernels/neon:neon_depthwise_conv_op",
     ]) + if_mkl([
         "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
diff --git a/tensorflow/core/kernels/neon/BUILD b/tensorflow/core/kernels/neon/BUILD
new file mode 100644
index 0000000000..7641516e3b
--- /dev/null
+++ b/tensorflow/core/kernels/neon/BUILD
@@ -0,0 +1,43 @@
+# Description:
+# Kernel implementations using Neon intrinsics.
+#
+package(
+    default_visibility = ["//visibility:public"],
+    features = ["-parse_headers"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load(
+    "//tensorflow:tensorflow.bzl",
+    "tf_kernel_library",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+tf_kernel_library(
+    name = "neon_depthwise_conv_op",
+    hdrs = [
+        "depthwiseconv_float.h",
+        "types.h",
+    ],
+    prefix = "neon_depthwise_conv_op",
+    deps = [
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:nn_ops_op_lib",
+        "//tensorflow/core/kernels:ops_util",
+        "@gemmlowp//:gemmlowp",
+    ],
+)
diff --git a/tensorflow/core/kernels/neon/depthwiseconv_float.h b/tensorflow/core/kernels/neon/depthwiseconv_float.h
new file mode 100644
index 0000000000..acd58a644f
--- /dev/null
+++ b/tensorflow/core/kernels/neon/depthwiseconv_float.h
@@ -0,0 +1,725 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
+
+#include "public/gemmlowp.h"
+#include "tensorflow/core/kernels/neon/types.h"
+
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
+#define USE_NEON
+#include <arm_neon.h>
+#endif
+
+namespace tensorflow {
+namespace neon {
+
+// Implementation of float DepthwiseConv
+
+template <bool kAllowStrided, int kFixedInputDepth, int kFixedDepthMultiplier>
+struct FloatDepthwiseConvKernel {};
+
+#ifdef USE_NEON
+
+template <>
+struct FloatDepthwiseConvKernel<false, 8, 1> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Load the filters
+    float32x4_t filter[2];
+    for (int i = 0; i < 2; i++) {
+      filter[i] = vld1q_f32(filter_ptr + 4 * i);
+    }
+    int outp = 0;
+    // Handle 2 output pixels at a time.
+    for (; outp <= num_output_pixels - 2; outp += 2) {
+      // Load the inputs
+      float32x4_t input[4];
+      for (int i = 0; i < 4; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 16;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[4];
+      for (int i = 0; i < 4; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      acc[0] = vmlaq_f32(acc[0], input[0], filter[0]);
+      acc[1] = vmlaq_f32(acc[1], input[1], filter[1]);
+      acc[2] = vmlaq_f32(acc[2], input[2], filter[0]);
+      acc[3] = vmlaq_f32(acc[3], input[3], filter[1]);
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 4; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 16;
+    }
+    // Handle one output pixel at a time.
+    for (; outp < num_output_pixels; outp++) {
+      // Load the inputs
+      float32x4_t input[2];
+      for (int i = 0; i < 2; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 8;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[2];
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vmlaq_f32(acc[i], input[i], filter[i]);
+      }
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 2; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 8;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<false, 2, 1> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    const float32x2_t filters = vld1_f32(filter_ptr);
+    const float32x4_t filters_dup2 = vcombine_f32(filters, filters);
+    int outp = 0;
+    // Handle 8 output pixels at a time.
+    for (; outp <= num_output_pixels - 8; outp += 8) {
+      // Load the inputs
+      float32x4_t input[4];
+      for (int i = 0; i < 4; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 16;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[4];
+      for (int i = 0; i < 4; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      for (int i = 0; i < 4; i++) {
+        acc[i] = vmlaq_f32(acc[i], input[i], filters_dup2);
+      }
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 4; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 16;
+    }
+    // Handle 4 output pixels at a time.
+    for (; outp <= num_output_pixels - 4; outp += 4) {
+      // Load the inputs
+      float32x4_t input[2];
+      for (int i = 0; i < 2; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 8;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[2];
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vmlaq_f32(acc[i], input[i], filters_dup2);
+      }
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 2; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 8;
+    }
+    // Handle 2 output pixels at a time.
+    for (; outp <= num_output_pixels - 2; outp += 2) {
+      // Load the inputs
+      const float32x4_t input = vld1q_f32(input_ptr);
+      input_ptr += 4;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc = vld1q_f32(acc_buffer_ptr);
+      // Multiply-accumulate
+      acc = vmlaq_f32(acc, input, filters_dup2);
+      // Store the accumulators back to acc_buffer
+      vst1q_f32(acc_buffer_ptr, acc);
+      acc_buffer_ptr += 4;
+    }
+    // Handle 1 output pixel at a time
+    for (; outp < num_output_pixels; outp++) {
+      // Load the inputs
+      const float32x2_t input = vld1_f32(input_ptr);
+      input_ptr += 2;
+      // Load the accumulators from acc_buffer
+      float32x2_t acc = vld1_f32(acc_buffer_ptr);
+      // Multiply-accumulate
+      acc = vmla_f32(acc, input, filters);
+      // Store the accumulators back to acc_buffer
+      vst1_f32(acc_buffer_ptr, acc);
+      acc_buffer_ptr += 2;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<true, 0, 1> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Handle one output pixel at a time.
+    for (int outp = 0; outp < num_output_pixels; outp++) {
+      const float* local_filter_ptr = filter_ptr;
+      const float* local_input_ptr = input_ptr;
+      int ic = 0;
+      // Handle 16 input channels at a time.
+      for (; ic <= input_depth - 16; ic += 16) {
+        // Load the filters
+        float32x4_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 16;
+        // Load the inputs
+        float32x4_t input[4];
+        for (int i = 0; i < 4; i++) {
+          input[i] = vld1q_f32(local_input_ptr + 4 * i);
+        }
+        local_input_ptr += 16;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vmlaq_f32(acc[i], input[i], filter[i]);
+        }
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 16;
+      }
+      // Handle 4 input channels at a time.
+      for (; ic <= input_depth - 4; ic += 4) {
+        // Load the filters
+        float32x4_t filter;
+        filter = vld1q_f32(local_filter_ptr);
+        local_filter_ptr += 4;
+        // Load the inputs
+        float32x4_t input;
+        input = vld1q_f32(local_input_ptr);
+        local_input_ptr += 4;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc;
+        acc = vld1q_f32(acc_buffer_ptr);
+        // Multiply-accumulate
+        acc = vmlaq_f32(acc, input, filter);
+        // Store the accumulators back to acc_buffer
+        vst1q_f32(acc_buffer_ptr, acc);
+        acc_buffer_ptr += 4;
+      }
+      // Handle one input channel at a time.
+      for (; ic < input_depth; ic++) {
+        const float input_val = *local_input_ptr++;
+        const float filter_val = *local_filter_ptr++;
+        *acc_buffer_ptr++ += filter_val * input_val;
+      }
+      input_ptr += input_ptr_increment;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<true, 0, 8> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Handle one output pixel at a time.
+    for (int outp = 0; outp < num_output_pixels; outp++) {
+      const float* local_filter_ptr = filter_ptr;
+      const float* local_input_ptr = input_ptr;
+      int ic = 0;
+      // Handle 2 input channels at a time.
+      for (; ic <= input_depth - 2; ic += 2) {
+        // Load the filters
+        float32x4_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 16;
+        // Load the inputs
+        const float32x2_t input = vld1_f32(local_input_ptr);
+        local_input_ptr += 2;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmlaq_lane_f32(acc[0], filter[0], input, 0);
+        acc[1] = vmlaq_lane_f32(acc[1], filter[1], input, 0);
+        acc[2] = vmlaq_lane_f32(acc[2], filter[2], input, 1);
+        acc[3] = vmlaq_lane_f32(acc[3], filter[3], input, 1);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 16;
+      }
+      // Handle one input channel at a time.
+      for (; ic < input_depth; ic++) {
+        // Load the filters
+        float32x4_t filter[2];
+        for (int i = 0; i < 2; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 8;
+        // Load the inputs
+        const float input_val = *local_input_ptr++;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[2];
+        for (int i = 0; i < 2; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        for (int i = 0; i < 2; i++) {
+          acc[i] = vmlaq_n_f32(acc[i], filter[i], input_val);
+        }
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 2; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 8;
+      }
+      input_ptr += input_ptr_increment;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<true, 0, 2> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Handle one output pixel at a time.
+    for (int outp = 0; outp < num_output_pixels; outp++) {
+      const float* local_filter_ptr = filter_ptr;
+      const float* local_input_ptr = input_ptr;
+      int ic = 0;
+      // Handle 8 input channels at a time.
+      for (; ic <= input_depth - 8; ic += 8) {
+        // Load the filters
+        float32x4_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 16;
+        // Load the inputs
+        float32x4x2_t input_dup2[2];
+        for (int i = 0; i < 2; i++) {
+          const float32x4_t input = vld1q_f32(local_input_ptr + 4 * i);
+          input_dup2[i] = vzipq_f32(input, input);
+        }
+        local_input_ptr += 8;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmlaq_f32(acc[0], filter[0], input_dup2[0].val[0]);
+        acc[1] = vmlaq_f32(acc[1], filter[1], input_dup2[0].val[1]);
+        acc[2] = vmlaq_f32(acc[2], filter[2], input_dup2[1].val[0]);
+        acc[3] = vmlaq_f32(acc[3], filter[3], input_dup2[1].val[1]);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 16;
+      }
+      // Handle 4 input channels at a time.
+      for (; ic <= input_depth - 4; ic += 4) {
+        // Load the filters
+        float32x2_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1_f32(local_filter_ptr + 2 * i);
+        }
+        local_filter_ptr += 8;
+        // Load the inputs
+        const float32x4_t input = vld1q_f32(local_input_ptr);
+        local_input_ptr += 4;
+        // Load the accumulators from acc_buffer
+        float32x2_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1_f32(acc_buffer_ptr + 2 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmla_lane_f32(acc[0], filter[0], vget_low_f32(input), 0);
+        acc[1] = vmla_lane_f32(acc[1], filter[1], vget_low_f32(input), 1);
+        acc[2] = vmla_lane_f32(acc[2], filter[2], vget_high_f32(input), 0);
+        acc[3] = vmla_lane_f32(acc[3], filter[3], vget_high_f32(input), 1);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1_f32(acc_buffer_ptr + 2 * i, acc[i]);
+        }
+        acc_buffer_ptr += 8;
+      }
+      // Handle 2 input channels at a time.
+      for (; ic <= input_depth - 2; ic += 2) {
+        // Load the filters
+        const float32x4_t filter = vld1q_f32(local_filter_ptr);
+        local_filter_ptr += 4;
+        // Load the inputs
+        const float32x2_t input = vld1_f32(local_input_ptr);
+        local_input_ptr += 2;
+        // Load the accumulators from acc_buffer
+        float32x2_t acc[2];
+        for (int i = 0; i < 2; i++) {
+          acc[i] = vld1_f32(acc_buffer_ptr + 2 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmla_lane_f32(acc[0], vget_low_f32(filter), input, 0);
+        acc[1] = vmla_lane_f32(acc[1], vget_high_f32(filter), input, 1);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 2; i++) {
+          vst1_f32(acc_buffer_ptr + 2 * i, acc[i]);
+        }
+        acc_buffer_ptr += 4;
+      }
+      // Handle one input channel at a time.
+      for (; ic < input_depth; ic++) {
+        // Load the inputs
+        const float input_val = *local_input_ptr++;
+        // Multiply-accumulate
+        for (int i = 0; i < 2; i++) {
+          acc_buffer_ptr[i] += local_filter_ptr[i] * input_val;
+        }
+        local_filter_ptr += 2;
+        acc_buffer_ptr += 2;
+      }
+      input_ptr += input_ptr_increment;
+    }
+  }
+};
+#endif
+
+// Accumulates the effect of one row of the filter, on a segment of one row
+// of the output, accessing the corresponding one row of the input.
+template <bool kAllowStrided, int kFixedInputDepth, int kFixedDepthMultiplier>
+void FloatDepthwiseConvAccumRow(int stride, int input_depth, int input_width,
+                                const float* input_data, int pad_width,
+                                int depth_multiplier, int filter_width,
+                                const float* filter_data,
+                                int out_x_buffer_start, int out_x_buffer_end,
+                                int output_depth, float* acc_buffer) {
+#ifdef GEMMLOWP_PROFILING
+  gemmlowp::ScopedProfilingLabel label(__PRETTY_FUNCTION__);
+#endif
+  // Sanity check parameters. This is important in particular to ensure
+  // that we keep the number of template instantiations minimal, so we don't
+  // increase binary size unnecessarily.
+  static_assert(kFixedDepthMultiplier || !kFixedInputDepth, "");
+  static_assert(kFixedInputDepth || kAllowStrided, "");
+  DCHECK(stride == 1 || kAllowStrided);
+  if (kFixedInputDepth) {
+    DCHECK_EQ(input_depth, kFixedInputDepth);
+  }
+  if (kFixedDepthMultiplier) {
+    DCHECK_EQ(depth_multiplier, kFixedDepthMultiplier);
+  }
+  DCHECK_EQ(output_depth, input_depth * depth_multiplier);
+  const int input_ptr_increment = stride * input_depth;
+  const float* filter_base_ptr = filter_data;
+  for (int filter_x = 0; filter_x < filter_width; ++filter_x) {
+    // For the current (filter_x, filter_y) point in the filter,
+    // compute the boundaries of the corresponding output row segment.
+    int out_x_loop_start_unclampled = 0;
+    int out_x_loop_end_unclampled = 0;
+    if (kAllowStrided) {
+      if (stride == 2) {
+        out_x_loop_start_unclampled = (pad_width - filter_x + 1) / 2;
+        out_x_loop_end_unclampled =
+            (pad_width + input_width - filter_x + 1) / 2;
+      } else if (stride == 4) {
+        out_x_loop_start_unclampled = (pad_width - filter_x + 3) / 4;
+        out_x_loop_end_unclampled =
+            (pad_width + input_width - filter_x + 3) / 4;
+      } else {
+        out_x_loop_start_unclampled =
+            (pad_width - filter_x + stride - 1) / stride;
+        out_x_loop_end_unclampled =
+            (pad_width + input_width - filter_x + stride - 1) / stride;
+      }
+    } else {
+      out_x_loop_start_unclampled = pad_width - filter_x;
+      out_x_loop_end_unclampled = pad_width + input_width - filter_x;
+    }
+    // The kernel will have to iterate on the segment of the
+    // output row that starts at out_x_loop_start and out_x_loop_end.
+    const int out_x_loop_start =
+        std::max(out_x_buffer_start, out_x_loop_start_unclampled);
+    const int out_x_loop_end =
+        std::min(out_x_buffer_end, out_x_loop_end_unclampled);
+
+    float* acc_buffer_ptr =
+        acc_buffer + (out_x_loop_start - out_x_buffer_start) * output_depth;
+    const int in_x_origin = (out_x_loop_start * stride) - pad_width + filter_x;
+    const float* input_ptr = input_data + in_x_origin * input_depth;
+    const int num_output_pixels = out_x_loop_end - out_x_loop_start;
+    FloatDepthwiseConvKernel<kAllowStrided, kFixedInputDepth,
+                             kFixedDepthMultiplier>::Run(num_output_pixels,
+                                                         input_depth,
+                                                         depth_multiplier,
+                                                         input_ptr,
+                                                         input_ptr_increment,
+                                                         filter_base_ptr,
+                                                         acc_buffer_ptr);
+    filter_base_ptr += output_depth;
+  }
+}
+
+// generic fallback of FloatDepthwiseConvAccumRow, portable, non-templatized.
+inline void FloatDepthwiseConvAccumRowGeneric(
+    int stride, int input_depth, int input_width, const float* input_data,
+    int pad_width, int depth_multiplier, int filter_width,
+    const float* filter_data, int out_x_buffer_start, int out_x_buffer_end,
+    int output_depth, float* acc_buffer) {
+  gemmlowp::ScopedProfilingLabel label("DepthwiseConvAccumRowGeneric (slow)");
+
+  VLOG(1) << "DepthwiseConv2d using slow path with "
+          << "stride = " << stride << ", "
+          << "input_depth = " << input_depth << ", "
+          << "depth_multiplier = " << depth_multiplier << ".";
+
+  const float* filter_base_ptr = filter_data;
+  for (int filter_x = 0; filter_x < filter_width; ++filter_x) {
+    const int out_x_loop_start = std::max(
+        out_x_buffer_start, (pad_width - filter_x + stride - 1) / stride);
+    const int out_x_loop_end =
+        std::min(out_x_buffer_end,
+                 (pad_width + input_width - filter_x + stride - 1) / stride);
+
+    float* acc_buffer_ptr =
+        acc_buffer + (out_x_loop_start - out_x_buffer_start) * output_depth;
+    const int in_x_origin = (out_x_loop_start * stride) - pad_width + filter_x;
+    const float* input_ptr = input_data + in_x_origin * input_depth;
+    const int input_ptr_increment = (stride - 1) * input_depth;
+    for (int out_x = out_x_loop_start; out_x < out_x_loop_end; out_x++) {
+      const float* filter_ptr = filter_base_ptr;
+      for (int ic = 0; ic < input_depth; ++ic) {
+        const float input_val = *input_ptr++;
+        for (int m = 0; m < depth_multiplier; m++) {
+          const float filter_val = *filter_ptr++;
+          *acc_buffer_ptr++ += filter_val * input_val;
+        }
+      }
+      input_ptr += input_ptr_increment;
+    }
+    filter_base_ptr += output_depth;
+  }
+}
+
+// Initializes the accumulator buffer with bias values.
+inline void DepthwiseConvInitAccBuffer(int num_output_pixels, int output_depth,
+                                       const float* bias_data,
+                                       float* acc_buffer) {
+  // TODO(benoitjacob): This might need optimized specializations
+  // for small output_depth values, if that ever becomes an important
+  // case (like it was for some quantized DepthwiseConv cases).
+  for (int i = 0; i < num_output_pixels; i++) {
+    memcpy(acc_buffer + i * output_depth, bias_data,
+           sizeof(acc_buffer[0]) * output_depth);
+  }
+}
+
+template <FusedActivationFunctionType Ac>
+void DepthwiseConv(const float* input_data, const Dims<4>& input_dims,
+                   const float* filter_data, const Dims<4>& filter_dims,
+                   const float* bias_data, const Dims<4>& bias_dims, int stride,
+                   int pad_width, int pad_height, int depth_multiplier,
+                   float* output_data, const Dims<4>& output_dims) {
+  gemmlowp::ScopedProfilingLabel label("DepthwiseConv");
+  static_assert(Ac == FusedActivationFunctionType::kNone ||
+                    Ac == FusedActivationFunctionType::kRelu ||
+                    Ac == FusedActivationFunctionType::kRelu6 ||
+                    Ac == FusedActivationFunctionType::kRelu1,
+                "");
+  const int batches = MatchingArraySize(input_dims, 3, output_dims, 3);
+  const int output_depth = MatchingArraySize(filter_dims, 0, output_dims, 0);
+  const int input_height = ArraySize(input_dims, 2);
+  const int input_width = ArraySize(input_dims, 1);
+  const int input_depth = ArraySize(input_dims, 0);
+  const int filter_height = ArraySize(filter_dims, 2);
+  const int filter_width = ArraySize(filter_dims, 1);
+  const int output_height = ArraySize(output_dims, 2);
+  const int output_width = ArraySize(output_dims, 1);
+  DCHECK(output_depth == input_depth * depth_multiplier);
+
+  static const int kAccBufferMaxSize = 1024;
+  float acc_buffer[kAccBufferMaxSize];
+  DCHECK_GE(kAccBufferMaxSize, output_depth)
+      << "Too small kAccBufferMaxSize for this model!";
+  const int kOutputPixelsInAccBuffer = kAccBufferMaxSize / output_depth;
+  const int kAccBufferActualSize = kOutputPixelsInAccBuffer * output_depth;
+  DCHECK_LE(kOutputPixelsInAccBuffer * output_depth, kAccBufferActualSize);
+  DCHECK_LE(kAccBufferActualSize, kAccBufferMaxSize);
+  DCHECK_GE(kOutputPixelsInAccBuffer, 1);
+
+  // row_accum_func will point to the core accumulation function to be used
+  // for this DepthwiseConv op.
+  auto* row_accum_func = FloatDepthwiseConvAccumRowGeneric;
+
+  const int kMaxFixedDepthMultiplier = 8;
+  int fixed_depth_multiplier = 0;
+  if (depth_multiplier <= kMaxFixedDepthMultiplier) {
+    fixed_depth_multiplier = depth_multiplier;
+  }
+  // kMaxUnrolling is the max number of output values that we aim to handle
+  // in one unrolled iteration of the inner loop. For practical performance
+  // reasons, it is limited by the number of available registers. We could
+  // fine-tune it depending on the architecture, but that's not worth doing
+  // since this whole code is not very optimized to begin with. The
+  // present value reflects what's realistic on ARM 32bit NEON with 16 128-bit
+  // vector registers.
+  const int kMaxUnrolling = 8;
+  int fixed_input_depth = 0;
+  if (fixed_depth_multiplier &&
+      input_depth * fixed_depth_multiplier <= kMaxUnrolling) {
+    fixed_input_depth = input_depth;
+  }
+#define TF_NEON_USE_DEPTHWISECONV_KERNEL(ALLOW_STRIDED, FIXED_INPUT_DEPTH, \
+                                         FIXED_DEPTH_MULTIPLIER)           \
+  if ((stride == 1 || ALLOW_STRIDED) &&                                    \
+      fixed_input_depth == FIXED_INPUT_DEPTH &&                            \
+      fixed_depth_multiplier == FIXED_DEPTH_MULTIPLIER) {                  \
+    row_accum_func =                                                       \
+        FloatDepthwiseConvAccumRow<ALLOW_STRIDED, FIXED_INPUT_DEPTH,       \
+                                   FIXED_DEPTH_MULTIPLIER>;                \
+  }
+
+#ifdef USE_NEON
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 1)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 8)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 2)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(false, 8, 1)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(false, 2, 1)
+#endif  // USE_NEON
+
+#undef TF_NEON_USE_DEPTHWISECONV_KERNEL
+
+  // Now that we have determined row_accum_func, we can start work.
+  float* output_ptr = output_data;
+  for (int b = 0; b < batches; ++b) {
+    for (int out_y = 0; out_y < output_height; ++out_y) {
+      const int in_y_origin = (out_y * stride) - pad_height;
+      const int filter_y_start = std::max(0, -in_y_origin);
+      const int filter_y_end =
+          std::min(filter_height, input_height - in_y_origin);
+      for (int out_x_buffer_start = 0; out_x_buffer_start < output_width;
+           out_x_buffer_start += kOutputPixelsInAccBuffer) {
+        const int out_x_buffer_end = std::min(
+            output_width, out_x_buffer_start + kOutputPixelsInAccBuffer);
+        // We call a 'pixel' a group of activation that share all but the
+        // 'depth'/'channel' coordinate. num_output_pixels is the number of
+        // output pixels that we will accumulate in this loop iteration.
+        const int num_output_pixels = out_x_buffer_end - out_x_buffer_start;
+        // Initialize our local accumulator with the bias values, so we don't
+        // have to add them later.
+        DepthwiseConvInitAccBuffer(num_output_pixels, output_depth, bias_data,
+                                   acc_buffer);
+        // Accumulation loop. Most of the time should be spent in here.
+        for (int filter_y = filter_y_start; filter_y < filter_y_end;
+             ++filter_y) {
+          const int in_y = in_y_origin + filter_y;
+          row_accum_func(stride, input_depth, input_width,
+                         input_data + in_y * input_dims.strides[2] +
+                             b * input_dims.strides[3],
+                         pad_width, depth_multiplier, filter_width,
+                         filter_data + filter_y * filter_dims.strides[2],
+                         out_x_buffer_start, out_x_buffer_end, output_depth,
+                         acc_buffer);
+        }
+        // Finished accumulating. Now store to destination.
+        const int num_output_values = output_depth * num_output_pixels;
+        int i = 0;
+// TODO(benoitjacob) optimized code goes here
+#ifdef USE_NEON
+        // Handle 16 values at a time
+        for (; i <= num_output_values - 16; i += 16) {
+          float32x4_t acc[4];
+          for (int k = 0; k < 4; k++) {
+            acc[k] = vld1q_f32(acc_buffer + i + 4 * k);
+          }
+          if (Ac == FusedActivationFunctionType::kRelu) {
+            for (int k = 0; k < 4; k++) {
+              acc[k] = vmaxq_f32(vdupq_n_f32(0.f), acc[k]);
+            }
+          } else if (Ac == FusedActivationFunctionType::kRelu6) {
+            for (int k = 0; k < 4; k++) {
+              acc[k] = vmaxq_f32(vdupq_n_f32(0.f),
+                                 vminq_f32(vdupq_n_f32(6.f), acc[k]));
+            }
+          } else if (Ac == FusedActivationFunctionType::kRelu1) {
+            for (int k = 0; k < 4; k++) {
+              acc[k] = vmaxq_f32(vdupq_n_f32(-1.f),
+                                 vminq_f32(vdupq_n_f32(1.f), acc[k]));
+            }
+          }
+          for (int k = 0; k < 4; k++) {
+            vst1q_f32(output_ptr + 4 * k, acc[k]);
+          }
+          output_ptr += 16;
+        }
+        // Handle 4 values at a time
+        for (; i <= num_output_values - 4; i += 4) {
+          float32x4_t acc = vld1q_f32(acc_buffer + i);
+          if (Ac == FusedActivationFunctionType::kRelu) {
+            acc = vmaxq_f32(vdupq_n_f32(0.f), acc);
+          } else if (Ac == FusedActivationFunctionType::kRelu6) {
+            acc = vmaxq_f32(vdupq_n_f32(0.f), vminq_f32(vdupq_n_f32(6.f), acc));
+          } else if (Ac == FusedActivationFunctionType::kRelu1) {
+            acc =
+                vmaxq_f32(vdupq_n_f32(-1.f), vminq_f32(vdupq_n_f32(1.f), acc));
+          }
+          vst1q_f32(output_ptr, acc);
+          output_ptr += 4;
+        }
+#endif
+        // Handle leftover values, one by one. This is very slow.
+        for (; i < num_output_values; i++) {
+          float acc = acc_buffer[i];
+          if (Ac == FusedActivationFunctionType::kRelu) {
+            acc = std::max(0.f, acc);
+          } else if (Ac == FusedActivationFunctionType::kRelu6) {
+            acc = std::max(0.f, std::min(6.f, acc));
+          } else if (Ac == FusedActivationFunctionType::kRelu1) {
+            acc = std::max(-1.f, std::min(1.f, acc));
+          }
+          *output_ptr++ = acc;
+        }
+      }
+    }
+  }
+}
+
+}  // end namespace neon
+}  // end namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
diff --git a/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc b/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
new file mode 100644
index 0000000000..54b2a10dd8
--- /dev/null
+++ b/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
@@ -0,0 +1,200 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include <algorithm>
+#include <cmath>
+#include <type_traits>
+
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/neon/depthwiseconv_float.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/mem.h"
+#include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/util/padding.h"
+
+namespace tensorflow {
+
+// A version of tensorflow/core/kernels/depthwise_conv_op.cc that
+// uses the neon intrinsics.
+class NeonDepthwiseConv2dNativeOp : public BinaryOp<float> {
+ public:
+  explicit NeonDepthwiseConv2dNativeOp(OpKernelConstruction* context)
+      : BinaryOp<float>(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &strides_));
+    OP_REQUIRES(context, strides_.size() == 4,
+                errors::InvalidArgument("Sliding window strides field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES(context, strides_[1] == strides_[2],
+                errors::InvalidArgument(
+                    "Current implementation only supports equal length "
+                    "strides in the row and column dimensions."));
+    OP_REQUIRES(
+        context, (strides_[0] == 1 && strides_[3] == 1),
+        errors::InvalidArgument("Current implementation does not yet support "
+                                "strides in the batch and depth dimensions."));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input = context->input(0);
+    const Tensor& filter = context->input(1);
+
+    // For 2D convolution, there should be 4 dimensions.
+    OP_REQUIRES(context, input.dims() == 4,
+                errors::InvalidArgument("input must be 4-dimensional",
+                                        input.shape().DebugString()));
+    OP_REQUIRES(context, filter.dims() == 4,
+                errors::InvalidArgument("filter must be 4-dimensional: ",
+                                        filter.shape().DebugString()));
+
+    const int32 in_depth = input.dim_size(3);
+    OP_REQUIRES(
+        context, in_depth == filter.dim_size(2),
+        errors::InvalidArgument("input and filter must have the same depth: ",
+                                in_depth, " vs ", filter.dim_size(2)));
+    const int32 batch = input.dim_size(0);
+    const int32 input_rows = input.dim_size(1);
+    const int32 input_cols = input.dim_size(2);
+
+    const int32 filter_rows = filter.dim_size(0);
+    const int32 filter_cols = filter.dim_size(1);
+    const int32 depth_multiplier = filter.dim_size(3);
+
+    const int32 out_depth = in_depth * depth_multiplier;
+
+    const int32 stride = strides_[1];
+
+    int64 out_rows = 0, out_cols = 0, pad_rows = 0, pad_cols = 0;
+    OP_REQUIRES_OK(context,
+                   GetWindowedOutputSize(input_rows, filter_rows, stride,
+                                         padding_, &out_rows, &pad_rows));
+    OP_REQUIRES_OK(context,
+                   GetWindowedOutputSize(input_cols, filter_cols, stride,
+                                         padding_, &out_cols, &pad_cols));
+    TensorShape out_shape({batch, out_rows, out_cols, out_depth});
+    OP_REQUIRES(
+        context, out_shape.num_elements() <= 2147483647,
+        errors::InvalidArgument("total number of outputs should be within the "
+                                "range of int which is used in the GPU kernel",
+                                in_depth, " vs ", filter.dim_size(2)));
+
+    // Output tensor is of the following dimensions:
+    // [ in_batch, out_rows, out_cols, out_depth ]
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(context, context->allocate_output(0, out_shape, &output));
+
+    VLOG(2) << "NeonDepthwiseConv2dNative: "
+            << " Input: [" << batch << ", " << input_rows << ", " << input_cols
+            << ", " << in_depth << "]; Filter: [" << filter_rows << ", "
+            << filter_cols << ", " << in_depth << ", " << depth_multiplier
+            << "]; stride = " << stride << ", pad_rows = " << pad_rows
+            << ", pad_cols = " << pad_cols << ", output: [" << batch << ", "
+            << out_rows << ", " << out_cols << ", " << out_depth << "]";
+
+    // If there is nothing to compute, return.
+    if (out_shape.num_elements() == 0) {
+      return;
+    }
+
+    const float* input_ptr = input.template flat<float>().data();
+    const float* filter_ptr = filter.template flat<float>().data();
+    float* output_ptr = output->template flat<float>().data();
+
+    auto input_neon_dims = ToNeonDims(input.shape());
+    auto filter_neon_dims = FilterToNeonDims(filter.shape());
+    auto bias_neon_dims = BiasNeonDims(filter.shape());
+
+    int64 bias_size = bias_neon_dims.sizes[3] * bias_neon_dims.strides[3];
+    float* bias_ptr = static_cast<float*>(port::AlignedMalloc(
+        bias_size * sizeof(float), Allocator::kAllocatorAlignment));
+    memset(bias_ptr, 0, bias_size * sizeof(float));
+
+    neon::DepthwiseConv<neon::FusedActivationFunctionType::kNone>(
+        input_ptr, input_neon_dims, filter_ptr, filter_neon_dims, bias_ptr,
+        bias_neon_dims, stride, pad_cols, pad_rows, depth_multiplier,
+        output_ptr, ToNeonDims(out_shape));
+
+    port::AlignedFree(bias_ptr);
+  }
+
+ private:
+  void SetNeonDimStrides(neon::Dims<4>* d) {
+    int64 stride = 1;
+    for (int i = 0; i < 4; ++i) {
+      d->strides[i] = stride;
+      stride *= d->sizes[i];
+    }
+  }
+
+  neon::Dims<4> ToNeonDims(const TensorShape& input) {
+    // Dims in the neon kernels are channel, x, y, batch order.
+    neon::Dims<4> result;
+    result.sizes[0] = input.dim_size(3);
+    result.sizes[1] = input.dim_size(2);
+    result.sizes[2] = input.dim_size(1);
+    result.sizes[3] = input.dim_size(0);
+    SetNeonDimStrides(&result);
+    return result;
+  }
+
+  neon::Dims<4> FilterToNeonDims(const TensorShape& filter) {
+    // Dims in the neon kernels are channel, x, y, batch order.
+    neon::Dims<4> result;
+    result.sizes[0] = filter.dim_size(2) * filter.dim_size(3);
+    result.sizes[1] = filter.dim_size(1);
+    result.sizes[2] = filter.dim_size(0);
+    result.sizes[3] = 1;
+    SetNeonDimStrides(&result);
+
+    return result;
+  }
+
+  neon::Dims<4> BiasNeonDims(const TensorShape& filter) {
+    // Dims in the neon kernels are channel, x, y, batch order.
+    // Bias has only output channel set.
+    neon::Dims<4> result;
+    result.sizes[0] = filter.dim_size(3);  // output channels
+    result.sizes[1] = 1;
+    result.sizes[2] = 1;
+    result.sizes[3] = 1;
+    SetNeonDimStrides(&result);
+
+    return result;
+  }
+
+  std::vector<int32> strides_;
+  Padding padding_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(NeonDepthwiseConv2dNativeOp);
+};
+
+#define REGISTER_CPU_KERNEL(T)                            \
+  REGISTER_KERNEL_BUILDER(Name("DepthwiseConv2dNative")   \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<float>("T") \
+                              .Label("neon"),             \
+                          NeonDepthwiseConv2dNativeOp);
+
+TF_CALL_float(REGISTER_CPU_KERNEL);
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/neon/types.h b/tensorflow/core/kernels/neon/types.h
new file mode 100644
index 0000000000..e258ee0dfb
--- /dev/null
+++ b/tensorflow/core/kernels/neon/types.h
@@ -0,0 +1,71 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
+
+namespace tensorflow {
+namespace neon {
+
+enum class FusedActivationFunctionType { kNone, kRelu6, kRelu1, kRelu };
+
+template <int N>
+struct Dims {
+  int sizes[N];
+  int strides[N];
+};
+
+inline int Offset(const Dims<4>& dims, int i0, int i1, int i2, int i3) {
+  DCHECK(i0 >= 0 && i0 < dims.sizes[0]);
+  DCHECK(i1 >= 0 && i1 < dims.sizes[1]);
+  DCHECK(i2 >= 0 && i2 < dims.sizes[2]);
+  DCHECK(i3 >= 0 && i3 < dims.sizes[3]);
+  return i0 * dims.strides[0] + i1 * dims.strides[1] + i2 * dims.strides[2] +
+         i3 * dims.strides[3];
+}
+
+// Get array size, DCHECKing that the dim index is in range.
+template <int N>
+int ArraySize(const Dims<N>& array, int index) {
+  DCHECK(index >= 0 && index < N);
+  return array.sizes[index];
+}
+
+// Get common array size, DCHECKing that they all agree.
+template <typename ArrayType1, typename ArrayType2>
+int MatchingArraySize(const ArrayType1& array1, int index1,
+                      const ArrayType2& array2, int index2) {
+  DCHECK_EQ(ArraySize(array1, index1), ArraySize(array2, index2));
+  return ArraySize(array1, index1);
+}
+
+template <typename ArrayType1, typename ArrayType2, typename... Args>
+int MatchingArraySize(const ArrayType1& array1, int index1,
+                      const ArrayType2& array2, int index2, Args... args) {
+  DCHECK_EQ(ArraySize(array1, index1), ArraySize(array2, index2));
+  return MatchingArraySize(array1, index1, args...);
+}
+
+inline int RequiredBufferSizeForDims(const Dims<4>& dims) {
+  int max_offset = 0;
+  for (int i = 0; i < 4; i++) {
+    max_offset += (dims.sizes[i] - 1) * dims.strides[i];
+  }
+  return max_offset + 1;
+}
+
+}  // end namespace neon
+}  // end namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 6689d6a6b4..fb886aaf7d 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2087,6 +2087,21 @@ cuda_py_test(
     ],
 )
 
+tf_py_test(
+    name = "neon_depthwise_conv_op_test",
+    size = "medium",
+    srcs = ["neon_depthwise_conv_op_test.py"],
+    additional_deps = [
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:nn",
+        "//tensorflow/python:nn_grad",
+        "//tensorflow/python:nn_ops",
+    ],
+)
+
 cuda_py_test(
     name = "division_future_test",
     size = "medium",
diff --git a/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py b/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py
new file mode 100644
index 0000000000..30795eed8a
--- /dev/null
+++ b/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py
@@ -0,0 +1,287 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Functional tests for neon kernel for depthwise convolutional operations."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import nn_impl
+from tensorflow.python.ops import nn_ops
+import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
+from tensorflow.python.platform import test
+
+
+def ConfigsToTest():
+  """Iterator for different convolution shapes, strides and paddings.
+
+  Yields:
+    Tuple (input_size, filter_size, out_size, stride, padding), the depthwise
+    convolution parameters.
+  """
+  input_sizes = [[4, 5, 5, 48], [4, 8, 8, 84], [4, 17, 17, 48], [4, 35, 35, 2],
+                 [4, 147, 147, 2], [3, 299, 299, 3], [5, 183, 183, 1]]
+  filter_sizes = [[1, 1, 48, 2], [1, 3, 84, 1], [3, 1, 48, 4], [5, 5, 2, 1],
+                  [3, 3, 2, 8], [2, 2, 3, 8], [5, 5, 1, 2]]
+  out_sizes = [[4, 5, 5, 96], [4, 8, 8, 84], [4, 17, 17, 192], [4, 35, 35, 2],
+               [4, 49, 49, 16], [3, 150, 150, 24], [5, 92, 92, 2]]
+  strides = [1, 1, 1, 1, 3, 2, 2]
+  # pylint: disable=invalid-name
+  VALID = "VALID"
+  SAME = "SAME"
+  # pylint: enable=invalid-name
+  paddings = [SAME, SAME, SAME, SAME, VALID, SAME, SAME, SAME]
+  for i, f, o, s, p in zip(input_sizes, filter_sizes, out_sizes, strides,
+                           paddings):
+    yield i, f, o, s, p
+
+
+def CheckGradConfigsToTest():
+  """Iterator for different convolution shapes, strides and paddings.
+
+  compute_gradient_error() is very expensive. So the configs should be
+  relatively small.
+
+  Yields:
+    Tuple (input_size, filter_size, out_size, stride, padding), the depthwise
+    convolution parameters.
+  """
+  input_sizes = [[2, 5, 8, 1], [4, 5, 5, 1], [2, 4, 4, 2], [1, 15, 15, 2],
+                 [2, 15, 16, 1]]
+  filter_sizes = [[4, 4, 1, 2], [2, 2, 1, 2], [3, 1, 2, 2], [1, 3, 2, 1],
+                  [3, 3, 1, 2]]
+  out_sizes = [[2, 5, 8, 2], [4, 2, 2, 2], [2, 4, 4, 4], [1, 15, 15, 2],
+               [2, 5, 5, 2]]
+  strides = [1, 2, 1, 1, 3]
+  # pylint: disable=invalid-name
+  VALID = "VALID"
+  SAME = "SAME"
+  # pylint: enable=invalid-name
+  paddings = [SAME, VALID, SAME, SAME, VALID]
+  for i, f, o, s, p in zip(input_sizes, filter_sizes, out_sizes, strides,
+                           paddings):
+    yield i, f, o, s, p
+
+
+class DepthwiseConv2DTest(test.TestCase):
+
+  # This is testing that depthwise_conv2d and depthwise_conv2d_native
+  # produce the same results.  It also tests that NCHW and NWHC
+  # formats agree, by comparing the depthwise_conv2d_native with
+  # 'NCHW' format (with transposition) matches the 'NHWC' format using
+  # the higher level interface.
+  def _VerifyValues(self,
+                    tensor_in_sizes,
+                    filter_in_sizes,
+                    stride,
+                    padding,
+                    use_gpu,
+                    data_format="NHWC"):
+    """Verifies the output values of the convolution function.
+
+    Args:
+      tensor_in_sizes: Input tensor dimensions in
+        [batch, input_rows, input_cols, input_depth].
+      filter_in_sizes: Filter tensor dimensions in
+        [filter_rows, filter_cols, input_depth, depth_multiplier].
+      stride: Stride.
+      padding: Padding type.
+      use_gpu: Whether to use GPU.
+      data_format: The data_format of the input.  "NHWC" or "NCHW".
+    """
+    total_size_1 = 1
+    total_size_2 = 1
+    for s in tensor_in_sizes:
+      total_size_1 *= s
+    for s in filter_in_sizes:
+      total_size_2 *= s
+    # Initializes the input and filter tensor with numbers incrementing from 1.
+    x1 = [f * 1.0 for f in range(1, total_size_1 + 1)]
+    x2 = [f * 1.0 for f in range(1, total_size_2 + 1)]
+    with self.test_session(use_gpu=use_gpu) as sess:
+      with sess.graph._kernel_label_map({"DepthwiseConv2dNative": "neon"}):
+        t1 = constant_op.constant(x1, shape=tensor_in_sizes)
+        t1.set_shape(tensor_in_sizes)
+        t2 = constant_op.constant(x2, shape=filter_in_sizes)
+
+      native_t1 = t1
+      strides = [1, stride, stride, 1]
+      if data_format == "NCHW":
+        # Transpose from NWHC input to NCHW
+        # Ex. [4, 5, 5, 48] to [4, 48, 5, 5]
+        native_t1 = array_ops.transpose(t1, [0, 3, 1, 2])
+        strides = [1, 1, stride, stride]
+
+      conv_native = nn_ops.depthwise_conv2d_native(
+          native_t1,
+          t2,
+          strides=strides,
+          data_format=data_format,
+          padding=padding)
+
+      if data_format == "NCHW":
+        # Transpose back from NCHW to NHWC
+        conv_native = array_ops.transpose(conv_native, [0, 2, 3, 1])
+
+      conv_interface = nn_impl.depthwise_conv2d(
+          t1, t2, strides=[1, stride, stride, 1], padding=padding)
+
+      native_result = sess.run(conv_native)
+      interface_result = sess.run(conv_interface)
+
+    print("depthwise conv_2d: ", tensor_in_sizes, "*", filter_in_sizes,
+          ", stride:", stride, ", padding: ", padding, ", max diff: ",
+          np.amax(np.absolute(native_result - interface_result)))
+    self.assertArrayNear(
+        np.ravel(native_result), np.ravel(interface_result), 1e-5)
+    self.assertShapeEqual(native_result, conv_native)
+    self.assertShapeEqual(native_result, conv_interface)
+
+  def testDepthwiseConv2D(self):
+    for index, (input_size, filter_size, _, stride,
+                padding) in enumerate(ConfigsToTest()):
+      print("Processing ", index, "th config.")
+      if index == 2:
+        self._VerifyValues(
+            input_size, filter_size, stride, padding, use_gpu=True)
+      self._VerifyValues(
+          input_size, filter_size, stride, padding, use_gpu=False)
+
+  def testDepthwiseConv2DFormat(self):
+    if not test.is_gpu_available():
+      return
+
+    for index, (input_size, filter_size, _, stride,
+                padding) in enumerate(ConfigsToTest()):
+      print("Processing ", index, "th config.")
+      self._VerifyValues(
+          input_size,
+          filter_size,
+          stride,
+          padding,
+          use_gpu=True,
+          data_format="NCHW")
+
+# This is testing against hand calculated results.
+
+  def _VerifyHandValues(self, tensor_in_sizes, filter_in_sizes, stride, padding,
+                        expected, use_gpu):
+    """Verifies the output values of the depthwise convolution function.
+
+    Args:
+      tensor_in_sizes: Input tensor dimensions in
+        [batch, input_rows, input_cols, input_depth].
+      filter_in_sizes: Filter tensor dimensions in
+        [filter_rows, filter_cols, input_depth, depth_multiplier].
+      stride: Stride.
+      padding: Padding type.
+      expected: An array containing the expected operation outputs.
+      use_gpu: Whether to use GPU.
+    """
+    total_size_1 = 1
+    total_size_2 = 1
+    for s in tensor_in_sizes:
+      total_size_1 *= s
+    for s in filter_in_sizes:
+      total_size_2 *= s
+    # Initializes the input tensor with array containing incrementing
+    # numbers from 1.
+    x1 = [f * 1.0 for f in range(1, total_size_1 + 1)]
+    x2 = [f * 1.0 for f in range(1, total_size_2 + 1)]
+    with self.test_session(use_gpu=use_gpu) as sess:
+      with sess.graph._kernel_label_map({"DepthwiseConv2dNative": "neon"}):
+        t1 = constant_op.constant(x1, shape=tensor_in_sizes)
+        t1.set_shape(tensor_in_sizes)
+        t2 = constant_op.constant(x2, shape=filter_in_sizes)
+        conv = nn_ops.depthwise_conv2d_native(
+            t1, t2, strides=[1, stride, stride, 1], padding=padding)
+        value = sess.run(conv)
+    print("value = ", value)
+    self.assertArrayNear(expected, np.ravel(value), 1e-5)
+    self.assertShapeEqual(value, conv)
+
+  def testConv2D2x2Filter(self):
+    # The inputs look like this (it's a 3 x 2 matrix, each of depth 2):
+    #
+    # [ (1.0, 2.0), (3.0,  4.0), ( 5.0,  6.0) ]
+    # [ (7.0, 8.0), (9.0, 10.0), (11.0, 12.0) ]
+    #  We can view this as two inputs
+    #
+    #  input depth 0:
+    #
+    #  [ 1.0,  3.0,  5.0 ]
+    #  [ 7.0,  9.0, 11.0 ]
+    #
+    #  input depth 1:
+    #
+    #  [ 2.0,  4.0,  6.0 ]
+    #  [ 8.0, 10.0, 12.0 ]
+    #
+    # The filter looks like this (it has two 2 x 2 patches, each generating 2
+    # depths):
+    #
+    #  filter #0:
+    #
+    #  [ (1.0,  3.0), ( 5.0,  7.0)]
+    #  [ (9.0, 11.0), (13.0, 15.0)]
+    #
+    #  filter #1:
+    #
+    #  [ ( 2.0,  4.0), ( 6.0,  8.0)]
+    #  [ (10.0, 12.0), (14.0, 16.0)]
+    #
+    # So the outputs are:
+    #
+    # (position 0, 0: in_depth 0, output_depth 0 -- using filter #0)
+    #  1.0 * 1.0 + 7.0 * 9.0 + 3.0 * 5.0 + 9.0 * 13.0 = 196
+    # (position 0, 0: in_depth 0, output_depth 1 -- using filter #1)
+    #  1.0 * 2.0 + 7.0 * 10.0 + 3.0 * 6.0 + 9.0 * 14.0 = 216
+    # (position 0, 0: in_depth 1, output_depth 2 -- using filter #0)
+    #  2.0 * 3.0 + 8.0 * 11.0 + 4.0 * 7.0 + 10.0 * 15.0 = 272
+    # (position 0, 0: in_depth 1, output_depth 3 -- using filter #1)
+    #  2.0 * 4.0 + 8.0 * 12.0 + 4.0 * 8.0 + 10.0 * 16.0 = 296
+    #
+    # (position 1, 0: in_depth 0, output_depth 0 -- using filter #0)
+    #  3.0 * 1.0 + 9.0 * 9.0 + 5.0 * 5.0 + 11.0 * 13.0 = 252
+    # (position 1, 0: in_depth 0, output_depth 1 -- using filter #1)
+    #  3.0 * 2.0 + 9.0 * 10.0 + 5.0 * 6.0 + 11.0 * 14.0 = 280
+    # (position 1, 0: in_depth 1, output_depth 2 -- using filter #0)
+    #  4.0 * 3.0 + 10.0 * 11.0 + 6.0 * 7.0 + 12.0 * 15.0 = 344
+    # (position 1, 0: in_depth 1, output_depth 3 -- using filter #1)
+    #  4.0 * 4.0 + 10.0 * 12.0 + 6.0 * 8.0 + 12.0 * 16.0 = 376
+    expected_output = [196, 216, 272, 296, 252, 280, 344, 376]
+    self._VerifyHandValues(
+        tensor_in_sizes=[1, 2, 3, 2],
+        filter_in_sizes=[2, 2, 2, 2],
+        stride=1,
+        padding="VALID",
+        expected=expected_output,
+        use_gpu=False)
+
+    self._VerifyHandValues(
+        tensor_in_sizes=[1, 2, 3, 2],
+        filter_in_sizes=[2, 2, 2, 2],
+        stride=1,
+        padding="VALID",
+        expected=expected_output,
+        use_gpu=True)
+
+
+if __name__ == "__main__":
+  test.main()
-- 
GitLab


From 8831aa7d33423a3cb679a0a27a76d37f0a852ec8 Mon Sep 17 00:00:00 2001
From: James Qin <jamesqin@google.com>
Date: Mon, 15 May 2017 15:44:36 -0700
Subject: [PATCH 1371/1563] Change CudnnRNN default input mode from
 "auto_select" to "linear_input".

When input_size == num_units, previous CudnnRNN skips adding a linear layer
between network input and the 1st layer. Other TF RNN implementations always
adds a linear layer in between in this case.

This change avoids potential surprises by having Cudnn RNN do the same.

PiperOrigin-RevId: 156114646
---
 tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc         | 1 +
 .../cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py   | 6 ++++--
 tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py  | 8 +++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc b/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc
index a5cf8b8c18..2c631b064b 100644
--- a/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc
+++ b/tensorflow/contrib/cudnn_rnn/ops/cudnn_rnn_ops.cc
@@ -185,6 +185,7 @@ REGISTER_OP("CudnnRNNBackprop")
     .Input("output_h_backprop: T")
     .Input("output_c_backprop: T")
     .Input("reserve_space: T")
+    .SetIsStateful()
     .Output("input_backprop: T")
     .Output("input_h_backprop: T")
     .Output("input_c_backprop: T")
diff --git a/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py b/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
index 559878ce96..08ec3076e4 100644
--- a/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
+++ b/tensorflow/contrib/cudnn_rnn/python/kernel_tests/cudnn_rnn_ops_test.py
@@ -43,6 +43,7 @@ class CudnnRNNTest(TensorFlowTestCase):
                    num_layers,
                    num_units,
                    input_size,
+                   input_mode="linear_input",
                    dropout=0.):
     if rnn_mode == "lstm":
       model = cudnn_rnn_ops.CudnnLSTM(
@@ -187,7 +188,8 @@ class CudnnRNNTest(TensorFlowTestCase):
                               expected, tolerance):
     random_seed.set_random_seed(5678)
     model = self._CreateModel(rnn_mode, num_layers, num_units, input_size,
-                              dropout)
+                              input_mode="auto_select",
+                              dropout=dropout)
     has_input_c = (rnn_mode == "lstm")
     params_size_t = model.params_size()
     input_data = array_ops.ones([seq_length, batch_size, input_size])
@@ -309,7 +311,7 @@ class CudnnRNNTest(TensorFlowTestCase):
     has_input_c = (rnn_mode == "lstm")
     random_seed.set_random_seed(1234)
     model = self._CreateModel(rnn_mode, num_layers, num_units, input_size,
-                              dropout)
+                              dropout=dropout)
     params_size_t = model.params_size()
     input_data = variables.Variable(
         random_ops.random_uniform([seq_length, batch_size, input_size]))
diff --git a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
index a97c955fcb..4f70b275e8 100644
--- a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
+++ b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
@@ -160,7 +160,7 @@ class _CudnnRNN(object):
                num_layers,
                num_units,
                input_size,
-               input_mode="auto_select",
+               input_mode="linear_input",
                direction="unidirectional",
                dropout=0.,
                seed=0):
@@ -174,8 +174,10 @@ class _CudnnRNN(object):
       input_size: the size of the input, it could be different from the
           num_units.
       input_mode: indicate whether there is a linear projection between the
-          input and The actual computation before the first layer. It could be
-          'skip_input', 'linear_input' or 'auto_select'.
+          input and the actual computation before the first layer. It could be
+          'linear_input', 'skip_input' or 'auto_select'.
+          'linear_input' (default) always applies a linear projection of input
+          onto RNN hidden state. (standard RNN behavior).
           'skip_input' is only allowed when input_size == num_units;
           'auto_select' implies 'skip_input' when input_size == num_units;
           otherwise, it implies 'linear_input'.
-- 
GitLab


From 411bf52131a24fc284cf97a8af7f553e9520358d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 15:52:37 -0700
Subject: [PATCH 1372/1563] Compiled graph-related components using d3v4. No
 console errors appear when panning or zooming the graph.

Much functionality is still broken, however. We decided to submit this change for now to unblock other efforts such as dropping the gulp pipeline.

PiperOrigin-RevId: 156115711
---
 tensorflow/BUILD                              |   15 +
 .../components/tf_graph_app_d3v4/BUILD        |   59 +
 .../components/tf_graph_app_d3v4/demo/BUILD   |   23 +
 .../tf_graph_app_d3v4/demo/data/graph.pbtxt   |   90 +
 .../tf_graph_app_d3v4/demo/index.html         |   34 +
 .../components/tf_graph_app_d3v4/index.html   |   30 +
 .../tf_graph_app_d3v4/tf-graph-app.html       |  152 +
 .../components/tf_graph_board_d3v4/BUILD      |   28 +
 .../components/tf_graph_board_d3v4/demo/BUILD |   26 +
 .../tf_graph_board_d3v4/demo/data/graph.pbtxt | 4606 +++++++++++++++++
 .../tf_graph_board_d3v4/demo/index.html       |   98 +
 .../tf_graph_board_d3v4/tf-graph-board.html   |  255 +
 .../components/tf_graph_common_d3v4/BUILD     |   41 +
 .../tf_graph_common_d3v4/annotation.ts        |  239 +
 .../components/tf_graph_common_d3v4/colors.ts |  130 +
 .../components/tf_graph_common_d3v4/common.ts |   31 +
 .../tf_graph_common_d3v4/contextmenu.ts       |   75 +
 .../components/tf_graph_common_d3v4/edge.ts   |  343 ++
 .../tf_graph_common_d3v4/externs.ts           |   85 +
 .../components/tf_graph_common_d3v4/graph.ts  | 1257 +++++
 .../tf_graph_common_d3v4/hierarchy.ts         |  807 +++
 .../components/tf_graph_common_d3v4/layout.ts |  758 +++
 .../tf_graph_common_d3v4/minimap.ts           |  327 ++
 .../components/tf_graph_common_d3v4/node.ts   | 1072 ++++
 .../components/tf_graph_common_d3v4/parser.ts |  284 +
 .../components/tf_graph_common_d3v4/proto.ts  |  143 +
 .../components/tf_graph_common_d3v4/render.ts | 1633 ++++++
 .../components/tf_graph_common_d3v4/scene.ts  |  680 +++
 .../tf_graph_common_d3v4/template.ts          |  305 ++
 .../tf_graph_common_d3v4/test/graph-test.ts   |  103 +
 .../test/hierarchy-test.ts                    |   23 +
 .../tf_graph_common_d3v4/test/index.html      |   34 +
 .../tf_graph_common_d3v4/test/layout-test.ts  |   23 +
 .../tf_graph_common_d3v4/test/parser-test.ts  |   83 +
 .../tf_graph_common_d3v4/test/util-test.ts    |   56 +
 .../tf_graph_common_d3v4/test/util.ts         |   31 +
 .../tf_graph_common_d3v4/tf-graph-common.html |   38 +
 .../components/tf_graph_common_d3v4/util.ts   |  291 ++
 .../components/tf_graph_controls_d3v4/BUILD   |   32 +
 .../tf_graph_controls_d3v4/demo/BUILD         |   24 +
 .../tf_graph_controls_d3v4/demo/index.html    |   49 +
 .../tf-graph-controls.html                    |  829 +++
 .../components/tf_graph_d3v4/BUILD            |   37 +
 .../components/tf_graph_d3v4/demo/BUILD       |   26 +
 .../tf_graph_d3v4/demo/data/graph.pbtxt       | 4606 +++++++++++++++++
 .../components/tf_graph_d3v4/demo/index.html  |   92 +
 .../tf_graph_d3v4/tf-graph-minimap.html       |   88 +
 .../tf_graph_d3v4/tf-graph-scene.html         | 1052 ++++
 .../components/tf_graph_d3v4/tf-graph.html    |  316 ++
 .../components/tf_graph_dashboard_d3v4/BUILD  |   30 +
 .../tf_graph_dashboard_d3v4/demo/BUILD        |   24 +
 .../demo/data/graph_run_run1.pbtxt            | 4606 +++++++++++++++++
 .../demo/data/runs.json                       |    6 +
 .../tf_graph_dashboard_d3v4/demo/index.html   |   56 +
 .../tf-graph-dashboard.html                   |  304 ++
 .../components/tf_graph_info_d3v4/BUILD       |   35 +
 .../components/tf_graph_info_d3v4/demo/BUILD  |   26 +
 .../tf_graph_info_d3v4/demo/data/graph.pbtxt  | 4606 +++++++++++++++++
 .../tf_graph_info_d3v4/demo/index.html        |   94 +
 .../tf_graph_info_d3v4/tf-graph-icon.html     |  296 ++
 .../tf_graph_info_d3v4/tf-graph-info.html     |  354 ++
 .../tf_graph_info_d3v4/tf-node-info.html      |  651 +++
 .../tf_graph_info_d3v4/tf-node-list-item.html |  138 +
 .../components/tf_graph_loader_d3v4/BUILD     |   25 +
 .../tf_graph_loader_d3v4/demo/BUILD           |   24 +
 .../demo/data/graph.pbtxt                     | 4606 +++++++++++++++++
 .../tf_graph_loader_d3v4/demo/index.html      |   75 +
 .../tf_graph_loader_d3v4/test/index.html      |   30 +
 .../tf_graph_loader_d3v4/test/loader.ts       |   25 +
 .../tf_graph_loader_d3v4/tf-graph-loader.html |  184 +
 70 files changed, 37654 insertions(+)
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app_d3v4/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_app_d3v4/tf-graph-app.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_board_d3v4/tf-graph-board.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/colors.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/common.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/contextmenu.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/externs.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/graph.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/hierarchy.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/parser.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/proto.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/render.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/template.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/test/graph-test.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/test/hierarchy-test.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/test/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/test/layout-test.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/test/parser-test.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util-test.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/tf-graph-common.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_controls_d3v4/tf-graph-controls.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_d3v4/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-minimap.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/graph_run_run1.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/runs.json
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-icon.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-info.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-list-item.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/data/graph.pbtxt
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/index.html
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/loader.ts
 create mode 100644 tensorflow/tensorboard/components/tf_graph_loader_d3v4/tf-graph-loader.html

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index fb7189ff1f..a3c0bd9a5b 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -346,17 +346,32 @@ filegroup(
         "//tensorflow/tensorboard/components/tf_graph/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_app:all_files",
         "//tensorflow/tensorboard/components/tf_graph_app/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_app_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_app_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_board:all_files",
         "//tensorflow/tensorboard/components/tf_graph_board/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_board_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_board_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_controls_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_graph_dashboard/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_info_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_info_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader/demo:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4:all_files",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data:all_files",
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
new file mode 100644
index 0000000000..6da6243893
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
@@ -0,0 +1,59 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_app_d3v4",
+    srcs = [
+        "index.html",
+        "tf-graph-app.html",
+    ],
+    path = "/tf-graph-app",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_board_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_controls_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4",
+        "@org_polymer",
+        "@org_polymer_iron_component_page",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "index.html",
+        "tf-graph-app.html",
+    ],
+    destdir = "tf-graph-app",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_board:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_controls:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_loader:legacy",
+        "//third_party/javascript/polymer/v1/iron-list:lib",
+        "//third_party/javascript/polymer/v1/paper-radio-group:lib",
+        "//third_party/javascript/polymer/v1/paper-tooltip:lib",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD
new file mode 100644
index 0000000000..147cb0947c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD
@@ -0,0 +1,23 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_app/demo
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-app/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_app",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..8b95b258df
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/data/graph.pbtxt
@@ -0,0 +1,90 @@
+node {
+  name: "life"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "universe"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 40
+      }
+    }
+  }
+}
+node {
+  name: "everything"
+  op: "Const"
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Add"
+  op: "Add"
+  input: "life"
+  input: "universe"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+node {
+  name: "answer"
+  op: "Add"
+  input: "Add"
+  input: "everything"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+}
+versions {
+  producer: 10
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/index.html
new file mode 100644
index 0000000000..f71feea390
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/index.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="import" href="../tf-graph-app.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<style>
+  /** Make the graph app tall enough so the bottom legend does not overlap with the top. */
+  tf-graph-app, .container.tf-graph-app {
+    display: block;
+    height: 700px;
+  }
+</style>
+<h3>Answer to the Ultimate Question of Life, the Universe, and Everything</h3>
+<demo-snippet>
+  <template>
+    <tf-graph-app pbtxt-file-location="data/graph.pbtxt"></tf-graph-app>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/index.html b/tensorflow/tensorboard/components/tf_graph_app_d3v4/index.html
new file mode 100644
index 0000000000..c80fbf4f63
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/index.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+  <head>
+    <title>vz-vega</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="../webcomponentsjs/webcomponents-lite.js"></script>
+    <link rel="import" href="../iron-component-page/iron-component-page.html">
+  </head>
+  <body>
+    <iron-component-page src="tf-graph-app.html"></iron-component-page>
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/tf-graph-app.html b/tensorflow/tensorboard/components/tf_graph_app_d3v4/tf-graph-app.html
new file mode 100644
index 0000000000..915b54a06a
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/tf-graph-app.html
@@ -0,0 +1,152 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-graph-board/tf-graph-board.html">
+<link rel="import" href="../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../tf-graph-controls/tf-graph-controls.html">
+
+<!--
+Stand alone element of tf-graph for embedding.
+
+The pbtxt format is the stringified version of the graphdef.
+
+    <tf-graph-app pbtxt="[[pbtxt]]"></tf-graph-app>
+
+    import tensorflow as tf
+    life = tf.constant(2, name='life')
+    universe = tf.constant(40, name='universe')
+    everything = tf.constant(0, name='everything')
+    lifeuniverse = tf.add(life, universe)
+    answer = tf.add(lifeuniverse, everything, name='answer')
+    open("graph.pbtxt", "w").write(str(tf.get_default_graph().as_graph_def()))
+
+@demo demo/index.html
+-->
+<dom-module id="tf-graph-app">
+<template>
+<style>
+
+:host /deep/ {
+  font-family: 'Roboto', sans-serif;
+}
+
+.main {
+  position: absolute;
+  right: 0;
+  left: 250px;
+  height: 100%;
+}
+
+.side {
+  position: absolute;
+  left: 0;
+  width: 250px;
+  height: 100%;
+  border: 1px solid black;
+  box-sizing: border-box;
+}
+
+.all {
+  position: relative;
+  width: 100%;
+  height: 100%
+}
+
+.container {
+  height: 650px;
+}
+
+</style>
+<div class="container">
+  <div class="all">
+    <div class="side">
+      <tf-graph-controls
+          color-by-params="[[colorByParams]]"
+          stats="[[stats]]"
+          color-by="{{colorBy}}"
+          render-hierarchy="[[_renderHierarchy]]"
+      ></tf-graph-controls>
+      <tf-graph-loader id="loader"
+          out-graph-hierarchy="{{graphHierarchy}}"
+          out-graph="{{graph}}"
+          out-stats="{{stats}}"
+          progress="{{_progress}}"
+      ></tf-graph-loader>
+    </div>
+    <div class="main">
+      <tf-graph-board id="graphboard"
+          graph-hierarchy="[[graphHierarchy]]"
+          graph="[[graph]]"
+          stats="[[stats]]"
+          progress="[[_progress]]"
+          color-by="[[colorBy]]"
+          color-by-params="{{colorByParams}}"
+          render-hierarchy="{{_renderHierarchy}}"
+      ></tf-graph-board>
+    </div>
+  </div>
+</div>
+</template>
+</dom-module>
+
+<script>
+(function(){
+
+Polymer({
+  is: 'tf-graph-app',
+  properties: {
+    stats: Object,
+
+    // To use tf-graph-app, specify one of these 2 properties. Provide either
+    // 1. The path to a pbtxt file to load (pbtxtFileLocation). This option nicely makes the
+    //    progress bar include the time it takes to load the file across the network. The path could
+    //    be either a relative path or an absolute URL (of a resource that supports CORS).
+    // 2. The raw contents of a pbtxt file (pbtxt).
+    // Do not set both of these 2 properties.
+    pbtxtFileLocation: {
+      type: String,
+      observer: '_updateGraph',
+    },
+    pbtxt: {
+      type: String,
+      observer: '_updateGraph',
+    },
+
+    _renderHierarchy: Object,
+    _progress: Object,
+  },
+  _updateGraph: function() {
+    if (this.pbtxtFileLocation) {
+      // Fetch a pbtxt file. The fetching will be part of the loading sequence.
+      this.$.loader.datasets = [{
+        // Just name the dataset based on the file location.
+        "name": this.pbtxtFileLocation,
+        "path": this.pbtxtFileLocation,
+      }];
+      this.$.loader.set('selectedDataset', 0);
+    } else if (this.pbtxt) {
+      // Render the provided pbtxt.
+      var blob = new Blob([this.pbtxt]);
+
+      // TODO(chizeng): Find out why we call a private method here and do away with the call.
+      this.$.loader._parseAndConstructHierarchicalGraph(null, blob);
+    }
+  },
+});
+})();
+</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD
new file mode 100644
index 0000000000..7203a9333b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD
@@ -0,0 +1,28 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_board_d3v4",
+    srcs = [
+        "tf-graph-board.html",
+    ],
+    path = "/tf-graph-board",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_info_d3v4",
+        "@org_polymer",
+        "@org_polymer_paper_progress",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD
new file mode 100644
index 0000000000..2d668769e6
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_board/demo
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-board/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_board",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/index.html
new file mode 100644
index 0000000000..2563e1595e
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/index.html
@@ -0,0 +1,98 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-board.html">
+<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Board Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 600px;
+  }
+
+  /** Make the graph take up the entire height of the demo container. */
+  tf-graph-board-demo, #board, #board > div {
+    display: block;
+    height: 100%;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-board-demo">
+      <template>
+        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
+        <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            out-graph="{{_graph}}">
+        </tf-graph-loader>
+
+        <!-- We color ops in the graph by XLA cluster. -->
+        <tf-graph-board id="board" color-by="xla_cluster"></tf-graph-board>
+      </template>
+      <script>
+        "use strict";
+
+        Polymer({
+          is: "tf-graph-board-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
+
+            // This property will be updated by the graph loader.
+            _graph: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_graphUpdated(_graph)',
+          ],
+          _graphUpdated: function(slimGraph) {
+            const tracker = tf.graph.util.getTracker(this.$.loader);
+            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
+                tracker, 100, 'Namespace hierarchy');
+            const hierarchyOptions = {};
+            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
+                function(graphHierarchy) {
+              // We have parsed and built the graph object from a pbtxt file. Render the graph.
+              this.$.board.set('graph', slimGraph);
+              this.$.board.set('graphHierarchy', graphHierarchy);
+            }.bind(this));
+          },
+        });
+      </script>
+    </dom-module>
+    <div id='demo-container'>
+      <tf-graph-board-demo></tf-graph-board-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_board_d3v4/tf-graph-board.html b/tensorflow/tensorboard/components/tf_graph_board_d3v4/tf-graph-board.html
new file mode 100644
index 0000000000..0ee694e1e6
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_board_d3v4/tf-graph-board.html
@@ -0,0 +1,255 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-graph/tf-graph.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="../tf-graph-info/tf-graph-info.html">
+<link rel="import" href="../paper-progress/paper-progress.html">
+
+<!--
+Element for putting tf-graph and tf-graph-info side by side.
+
+Example
+
+  <tf-graph-board graph=[[graph]]></tf-graph-board>
+
+-->
+<dom-module id="tf-graph-board">
+<template>
+<style>
+::host {
+  display: block;
+}
+
+/deep/ .close {
+  position: absolute;
+  cursor: pointer;
+  left: 15px;
+  bottom: 15px;
+}
+
+.container {
+  width: 100%;
+  height: 100%;
+  opacity: 1;
+}
+
+.container.loading {
+  cursor: progress;
+  opacity: 0.1;
+}
+
+.container.loading.error {
+  cursor: auto;
+}
+
+#info {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  padding: 0px;
+  max-width: 380px;
+  min-width: 320px;
+  background-color: rgba(255,255,255,0.9);
+  @apply(--shadow-elevation-2dp);
+}
+
+#main {
+  width: 100%;
+  height: 100%;
+}
+
+#progress-bar {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  position: absolute;
+  top: 40px;
+  left: 0;
+  font-size: 13px;
+}
+
+#progress-msg {
+  width: 400px;
+  margin-bottom: 5px;
+}
+
+paper-progress {
+  width: 400px;
+  --paper-progress-height: 6px;
+  --paper-progress-active-color: #f3913e;
+}
+
+.context-menu {
+  position: absolute;
+  display: none;
+  background-color: #e2e2e2;
+  border-radius: 2px;
+  font-size: 14px;
+  min-width: 150px;
+  border: 1px solid #d4d4d4;
+}
+
+/deep/ .context-menu ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  cursor: default;
+}
+
+/deep/ .context-menu ul li {
+  padding: 4px 16px;
+}
+
+/deep/ .context-menu ul li:hover {
+  background-color: #f3913e;
+  color: white;
+}
+</style>
+<template is="dom-if" if="[[_isNotComplete(progress)]]">
+  <div id="progress-bar">
+    <div id="progress-msg">[[progress.msg]]</div>
+    <paper-progress value="[[progress.value]]"></paper-progress>
+  </div>
+</template>
+<div class$="[[_getContainerClass(progress)]]">
+  <div id="main">
+    <tf-graph id="graph"
+              graph-hierarchy="{{graphHierarchy}}"
+              basic-graph="[[graph]]"
+              hierarchy-params="[[hierarchyParams]]"
+              render-hierarchy="{{renderHierarchy}}"
+              devices-for-stats="[[devicesForStats]]"
+              stats="[[stats]]"
+              selected-node="{{_selectedNode}}"
+              highlighted-node="{{_highlightedNode}}"
+              color-by="[[colorBy]]"
+              color-by-params="{{colorByParams}}"
+              progress="{{progress}}"
+              node-names-to-health-pills="[[nodeNamesToHealthPills]]"
+              health-pill-step-index="[[healthPillStepIndex]]"
+    ></tf-graph>
+  </div>
+  <div id="info">
+    <tf-graph-info id="graph-info"
+              title="selected"
+              graph-hierarchy="[[graphHierarchy]]"
+              render-hierarchy="[[renderHierarchy]]"
+              graph="[[graph]]"
+              selected-node="{{_selectedNode}}"
+              selected-node-include="{{_selectedNodeInclude}}"
+              highlighted-node="{{_highlightedNode}}"
+              color-by="[[colorBy]]"
+              color-by-params="[[colorByParams]]"
+              debugger-data-enabled="[[debuggerDataEnabled]]"
+              are-health-pills-loading="[[areHealthPillsLoading]]"
+              node-names-to-health-pills="[[nodeNamesToHealthPills]]"
+              all-steps-mode-enabled="{{allStepsModeEnabled}}"
+              specific-health-pill-step="{{specificHealthPillStep}}"
+              health-pill-step-index="{{healthPillStepIndex}}"
+    ></tf-graph-info>
+  </div>
+  <div class="context-menu"></div>
+</div>
+</template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'tf-graph-board',
+  properties: {
+    // Public API.
+    graphHierarchy: Object,
+    graph: Object,
+    stats: Object,
+    /**
+     * @type {value: number, msg: string}
+     *
+     * A number between 0 and 100 denoting the % of progress
+     * for the progress bar and the displayed message.
+     */
+    progress: Object,
+    colorBy: String,
+    colorByParams: {
+      type: Object,
+      notify: true
+    },
+    renderHierarchy: {
+      type: Object,
+      notify: true
+    },
+    // Whether debugger data is enabled for this instance of Tensorboard.
+    debuggerDataEnabled: Boolean,
+    // Whether health pills are currently being loaded.
+    areHealthPillsLoading: Boolean,
+    // A mapping between node name to the tf.graph.scene.HealthPill to render.
+    nodeNamesToHealthPills: Object,
+    // Whether the user can request health pills for individual steps from the server. This can be
+    // slow compared the default of showing sampled health pills.
+    allStepsModeEnabled: {
+      type: Boolean,
+      notify: true,
+      value: false,
+    },
+    // Relevant if allStepsModeEnabled. The specific step for which to fetch health pills from the
+    // server for.
+    specificHealthPillStep: {
+      type: Number,
+      notify: true,
+      value: 0,
+    },
+    // The step of health pills to show throughout the graph.
+    healthPillStepIndex: Number,
+    // Private API: Data routing between child components.
+    _selectedNode: String,
+    // The enum value of the include property of the selected node.
+    _selectedNodeInclude: Number,
+    _highlightedNode: String
+  },
+  listeners: {
+    'node-toggle-extract': '_nodeToggleExtract'
+  },
+  observers: [
+    '_updateNodeInclude(_selectedNode)'
+  ],
+  /** True if the progress is not complete yet (< 100 %). */
+  _isNotComplete: function(progress) {
+    return progress.value < 100;
+  },
+  _getContainerClass: function(progress) {
+    var result = 'container';
+    if (progress.error) {
+      result += ' error';
+    }
+    if (this._isNotComplete(progress)) {
+      result += ' loading';
+    }
+    return result;
+  },
+  _updateNodeInclude: function(nodeName) {
+    var node = this.graphHierarchy.node(nodeName);
+    this.set("_selectedNodeInclude",
+      node ? node.include : tf.graph.InclusionType.UNSPECIFIED);
+  },
+  _nodeToggleExtract: function() {
+    this._updateNodeInclude(this._selectedNode);
+  }
+});
+</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD
new file mode 100644
index 0000000000..9b7dcef8bc
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD
@@ -0,0 +1,41 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_common_d3v4",
+    srcs = [
+        "tf-graph-common.html",
+        ":ts",
+    ],
+    path = "/tf-graph-common",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:dagre",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:graphlib",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
+        "@org_polymer",
+    ],
+)
+
+tensorboard_typescript_genrule(
+    name = "ts",
+    srcs = glob(["*.ts"]),
+    typings = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3.d.ts",
+        "@org_definitelytyped//:lodash.d.ts",
+        "@org_definitelytyped//:polymer.d.ts",
+        "@org_definitelytyped//:webcomponents.js.d.ts",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts
new file mode 100644
index 0000000000..6db0cd5519
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts
@@ -0,0 +1,239 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph.scene.annotation {
+  /**
+   * Populate a given annotation container group
+   *
+   *     <g class='{in|out}-annotations'></g>
+   *
+   * with annotation group of the following structure:
+   *
+   * <g class='annotation'>
+   *   <g class='annotation-node'>
+   *   <!--
+   *   Content here determined by Scene.node.buildGroup.
+   *   -->
+   *   </g>
+   * </g>
+   *
+   * @param container selection of the container.
+   * @param annotationData node.{in|out}Annotations
+   * @param d node to build group for.
+   * @param sceneElement <tf-graph-scene> polymer element.
+   * @return selection of appended objects
+   */
+  export function buildGroup(
+      container, annotationData: render.AnnotationList,
+      d: render.RenderNodeInfo, sceneElement) {
+    // Select all children and join with data.
+    let annotationGroups =
+        container
+            .selectAll(function() {
+              // using d3's selector function
+              // See https://github.com/mbostock/d3/releases/tag/v2.0.0
+              // (It's not listed in the d3 wiki.)
+              return this.childNodes;
+            })
+            .data(annotationData.list, d => { return d.node.name; });
+
+    annotationGroups.enter()
+        .append('g')
+        .attr('data-name', a => { return a.node.name; })
+        .each(function(a) {
+          let aGroup = d3.select(this);
+
+          // Add annotation to the index in the scene
+          sceneElement.addAnnotationGroup(a, d, aGroup);
+          // Append annotation edge
+          let edgeType = Class.Annotation.EDGE;
+          let metaedge = a.renderMetaedgeInfo && a.renderMetaedgeInfo.metaedge;
+          if (metaedge && !metaedge.numRegularEdges) {
+            edgeType += ' ' + Class.Annotation.CONTROL_EDGE;
+          }
+          // If any edges are reference edges, add the reference edge class.
+          if (metaedge && metaedge.numRefEdges) {
+            edgeType += ' ' + Class.Edge.REF_LINE;
+          }
+          edge.appendEdge(aGroup, a, sceneElement, edgeType);
+
+          if (a.annotationType !== render.AnnotationType.ELLIPSIS) {
+            addAnnotationLabelFromNode(aGroup, a);
+            buildShape(aGroup, a);
+          } else {
+            addAnnotationLabel(
+                aGroup, a.node.name, a, Class.Annotation.ELLIPSIS);
+          }
+        });
+
+    annotationGroups
+        .attr(
+            'class',
+            a => {
+              return Class.Annotation.GROUP + ' ' +
+                  annotationToClassName(a.annotationType) + ' ' +
+                  node.nodeClass(a);
+            })
+        .each(function(a) {
+          let aGroup = d3.select(this);
+          update(aGroup, d, a, sceneElement);
+          if (a.annotationType !== render.AnnotationType.ELLIPSIS) {
+            addInteraction(aGroup, d, a, sceneElement);
+          }
+        });
+
+    annotationGroups.exit()
+        .each(function(a) {
+          let aGroup = d3.select(this);
+
+          // Remove annotation from the index in the scene
+          sceneElement.removeAnnotationGroup(a, d, aGroup);
+        })
+        .remove();
+    return annotationGroups;
+};
+
+/**
+ * Maps an annotation enum to a class name used in css rules.
+ */
+function annotationToClassName(annotationType: render.AnnotationType) {
+  return (render.AnnotationType[annotationType] || '').toLowerCase() || null;
+}
+
+function buildShape(aGroup, a: render.Annotation) {
+  if (a.annotationType === render.AnnotationType.SUMMARY) {
+    let summary = selectOrCreateChild(aGroup, 'use');
+    summary
+      .attr('class', 'summary')
+      .attr('xlink:href', '#summary-icon')
+      .attr('cursor', 'pointer');
+  } else {
+    let shape = node.buildShape(aGroup, a, Class.Annotation.NODE);
+    // add title tag to get native tooltips
+    selectOrCreateChild(shape, 'title').text(a.node.name);
+  }
+}
+
+function addAnnotationLabelFromNode(aGroup, a: render.Annotation) {
+  let namePath = a.node.name.split('/');
+  let text = namePath[namePath.length - 1];
+  return addAnnotationLabel(aGroup, text, a, null);
+}
+
+function addAnnotationLabel(
+    aGroup, label: string, a: render.Annotation, additionalClassNames) {
+  let classNames = Class.Annotation.LABEL;
+  if (additionalClassNames) {
+    classNames += ' ' + additionalClassNames;
+  }
+  let txtElement = aGroup.append('text')
+                       .attr('class', classNames)
+                       .attr('dy', '.35em')
+                       .attr('text-anchor', a.isIn ? 'end' : 'start')
+                       .text(label);
+
+  return tf.graph.scene.node.enforceLabelWidth(txtElement, -1);
+}
+
+function addInteraction(selection, d: render.RenderNodeInfo,
+    annotation: render.Annotation, sceneElement) {
+  selection
+      .on('mouseover',
+          a => {
+            sceneElement.fire(
+                'annotation-highlight',
+                {name: a.node.name, hostName: d.node.name});
+          })
+      .on('mouseout',
+          a => {
+            sceneElement.fire(
+                'annotation-unhighlight',
+                {name: a.node.name, hostName: d.node.name});
+          })
+      .on('click', a => {
+        // Stop this event's propagation so that it isn't also considered a
+        // graph-select.
+        (<Event>d3.event).stopPropagation();
+        sceneElement.fire(
+            'annotation-select', {name: a.node.name, hostName: d.node.name});
+      });
+  if (annotation.annotationType !== render.AnnotationType.SUMMARY &&
+      annotation.annotationType !== render.AnnotationType.CONSTANT) {
+    selection.on(
+        'contextmenu', contextmenu.getMenu(
+                           node.getContextMenu(annotation.node, sceneElement)));
+  }
+};
+
+/**
+ * Adjust annotation's position.
+ *
+ * @param aGroup selection of a 'g.annotation' element.
+ * @param d Host node data.
+ * @param a annotation node data.
+ * @param sceneElement <tf-graph-scene> polymer element.
+ */
+function update(aGroup, d: render.RenderNodeInfo, a: render.Annotation,
+    sceneElement) {
+  let cx = layout.computeCXPositionOfNodeShape(d);
+  // Annotations that point to embedded nodes (constants,summary)
+  // don't have a render information attached so we don't stylize these.
+  // Also we don't stylize ellipsis annotations (the string '... and X more').
+  if (a.renderNodeInfo &&
+      a.annotationType !== render.AnnotationType.ELLIPSIS) {
+    node.stylize(aGroup, a.renderNodeInfo, sceneElement,
+      Class.Annotation.NODE);
+  }
+
+  if (a.annotationType === render.AnnotationType.SUMMARY) {
+    // Update the width of the annotation to give space for the image.
+    a.width += 10;
+  }
+
+  // label position
+  aGroup.select('text.' + Class.Annotation.LABEL).transition().attr({
+    x: cx + a.dx + (a.isIn ? -1 : 1) * (a.width / 2 + a.labelOffset),
+    y: d.y + a.dy
+  });
+
+  // Some annotations (such as summary) are represented using a 12x12 image tag.
+  // Purposely omitted units (e.g. pixels) since the images are vector graphics.
+  // If there is an image, we adjust the location of the image to be vertically
+  // centered with the node and horizontally centered between the arrow and the
+  // text label.
+  aGroup.select('use.summary').transition().attr({
+    x: cx + a.dx - 3,
+    y: d.y + a.dy - 6
+  });
+
+  // Node position (only one of the shape selection will be non-empty.)
+  positionEllipse(
+      aGroup.select('.' + Class.Annotation.NODE + ' ellipse'), cx + a.dx,
+      d.y + a.dy, a.width, a.height);
+  positionRect(
+      aGroup.select('.' + Class.Annotation.NODE + ' rect'), cx + a.dx,
+      d.y + a.dy, a.width, a.height);
+  positionRect(
+      aGroup.select('.' + Class.Annotation.NODE + ' use'), cx + a.dx,
+      d.y + a.dy, a.width, a.height);
+
+  // Edge position
+  aGroup.select('path.' + Class.Annotation.EDGE).transition().attr('d', a => {
+    // map relative position to absolute position
+    let points = a.points.map(p => { return {x: p.dx + cx, y: p.dy + d.y}; });
+    return edge.interpolate(points);
+  });
+};
+
+} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/colors.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/colors.ts
new file mode 100644
index 0000000000..40f91f7d2d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/colors.ts
@@ -0,0 +1,130 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+module tf {
+  /**
+   * Mapping from color palette name to color palette, which contains
+   * exact colors for multiple states of a single color palette.
+   */
+  export let COLORS = [
+    {
+      'name': 'Google Blue',
+      'color': '#4184f3',
+      'active': '#3a53c5',
+      'disabled': '#cad8fc'
+    },
+    {
+      'name': 'Google Red',
+      'color': '#db4437',
+      'active': '#8f2a0c',
+      'disabled': '#e8c6c1'
+    },
+    {
+      'name': 'Google Yellow',
+      'color': '#f4b400',
+      'active': '#db9200',
+      'disabled': '#f7e8b0'
+    },
+    {
+      'name': 'Google Green',
+      'color': '#0f9d58',
+      'active': '#488046',
+      'disabled': '#c2e1cc'
+    },
+    {
+      'name': 'Purple',
+      'color': '#aa46bb',
+      'active': '#5c1398',
+      'disabled': '#d7bce6'
+    },
+    {
+      'name': 'Teal',
+      'color': '#00abc0',
+      'active': '#47828e',
+      'disabled': '#c2eaf2'
+    },
+    {
+      'name': 'Deep Orange',
+      'color': '#ff6f42',
+      'active': '#ca4a06',
+      'disabled': '#f2cbba'
+    },
+    {
+      'name': 'Lime',
+      'color': '#9d9c23',
+      'active': '#7f771d',
+      'disabled': '#f1f4c2'
+    },
+    {
+      'name': 'Indigo',
+      'color': '#5b6abf',
+      'active': '#3e47a9',
+      'disabled': '#c5c8e8'
+    },
+    {
+      'name': 'Pink',
+      'color': '#ef6191',
+      'active': '#ca1c60',
+      'disabled': '#e9b9ce'
+    },
+    {
+      'name': 'Deep Teal',
+      'color': '#00786a',
+      'active': '#2b4f43',
+      'disabled': '#bededa'
+    },
+    {
+      'name': 'Deep Pink',
+      'color': '#c1175a',
+      'active': '#75084f',
+      'disabled': '#de8cae'
+    },
+    {
+      'name': 'Gray',
+      'color': '#9E9E9E',   // 500
+      'active': '#424242',  // 800
+      'disabled': 'F5F5F5'  // 100
+    }
+  ].reduce((m, c) => {
+    m[c.name] = c;
+    return m;
+  }, {});
+
+  /**
+   * Mapping from op category to color palette name
+   * e.g.,  OP_GROUP_COLORS['state_ops'] = 'Google Blue';
+   */
+  export let OP_GROUP_COLORS = [
+    {
+      color: 'Google Red',
+      groups: [
+        'gen_legacy_ops', 'legacy_ops', 'legacy_flogs_input',
+        'legacy_image_input', 'legacy_input_example_input',
+        'legacy_sequence_input', 'legacy_seti_input_input'
+      ]
+    },
+    {color: 'Deep Orange', groups: ['constant_ops']},
+    {color: 'Indigo', groups: ['state_ops']},
+    {color: 'Purple', groups: ['nn_ops', 'nn']},
+    {color: 'Google Green', groups: ['math_ops']},
+    {color: 'Lime', groups: ['array_ops']},
+    {color: 'Teal', groups: ['control_flow_ops', 'data_flow_ops']},
+    {color: 'Pink', groups: ['summary_ops']},
+    {color: 'Deep Pink', groups: ['io_ops']}
+  ].reduce((m, c) => {
+    c.groups.forEach(function(group) { m[group] = c.color; });
+    return m;
+  }, {});
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/common.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/common.ts
new file mode 100644
index 0000000000..e7eac54e58
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/common.ts
@@ -0,0 +1,31 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * @fileoverview Common interfaces for the tensorflow graph visualizer.
+ */
+
+module tf {
+  /**
+   * Tracks task progress. Each task being passed a progress tracker needs
+   * to call the below-defined methods to notify the caller about the gradual
+   * progress of the task.
+   */
+  export interface ProgressTracker {
+    updateProgress(incrementValue: number): void;
+    setMessage(msg: string): void;
+    reportError(msg: string, err: Error): void;
+  }
+} // close module tf
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/contextmenu.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/contextmenu.ts
new file mode 100644
index 0000000000..8121cf9f6d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/contextmenu.ts
@@ -0,0 +1,75 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+module tf.graph.scene.contextmenu {
+
+/** Function that converts data to a title string. */
+export interface TitleFunction {
+  (data: any): string;
+}
+
+/** Function that takes action based on item clicked in the context menu. */
+export interface ActionFunction {
+  (elem: any, d: any, i: number): void;
+}
+
+/**
+ * The interface for an item in the context menu
+ */
+export interface ContextMenuItem {
+  title: TitleFunction;
+  action: ActionFunction;
+}
+
+/**
+ * Returns the event listener, which can be used as an argument for the d3
+ * selection.on function. Renders the context menu that is to be displayed
+ * in response to the event.
+ */
+export function getMenu(menu: ContextMenuItem[]) {
+  let menuSelection = d3.select('.context-menu');
+  // Close the menu when anything else is clicked.
+  d3.select('body').on(
+      'click.context', function() { menuSelection.style('display', 'none'); });
+
+  // Function called to populate the context menu.
+  return function(data, index: number): void {
+    // Position and display the menu.
+    let event = <MouseEvent>d3.event;
+    menuSelection
+      .style('display', 'block')
+      .style('left', (event.layerX + 1) + 'px')
+      .style('top', (event.layerY + 1) + 'px');
+
+    // Stop the event from propagating further.
+    event.preventDefault();
+    event.stopPropagation();
+
+    // Add provided items to the context menu.
+    menuSelection.html('');
+    let list = menuSelection.append('ul');
+    list.selectAll('li')
+        .data(menu)
+        .enter()
+        .append('li')
+        .html(function(d) { return d.title(data); })
+        .on('click', (d, i) => {
+          d.action(this, data, index);
+          menuSelection.style('display', 'none');
+        });
+  };
+};
+
+} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
new file mode 100644
index 0000000000..f3768e169b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
@@ -0,0 +1,343 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph.scene.edge {
+
+/** Delimiter between dimensions when showing sizes of tensors. */
+const TENSOR_SHAPE_DELIM = '×';
+
+/** The minimum stroke width of an edge. */
+export const MIN_EDGE_WIDTH = 0.75;
+
+/** The maximum stroke width of an edge. */
+export const MAX_EDGE_WIDTH = 12;
+
+/** The exponent used in the power scale for edge thickness. */
+const EDGE_WIDTH_SCALE_EXPONENT = 0.3;
+
+/** The domain (min and max value) for the edge width. */
+const DOMAIN_EDGE_WIDTH_SCALE = [1, 5E6];
+
+export const EDGE_WIDTH_SCALE = d3.scalePow()
+      .exponent(EDGE_WIDTH_SCALE_EXPONENT)
+      .domain(DOMAIN_EDGE_WIDTH_SCALE)
+      .range([MIN_EDGE_WIDTH, MAX_EDGE_WIDTH])
+      .clamp(true);
+
+let arrowheadMap =
+    d3.scaleQuantize<String>().domain([MIN_EDGE_WIDTH, MAX_EDGE_WIDTH]).range([
+      'small', 'medium', 'large', 'xlarge'
+    ]);
+
+/** Minimum stroke width to put edge labels in the middle of edges */
+const CENTER_EDGE_LABEL_MIN_STROKE_WIDTH = 2.5;
+
+export type EdgeData = {v: string, w: string, label: render.RenderMetaedgeInfo};
+
+export function getEdgeKey(edgeObj: EdgeData) {
+  return edgeObj.v + EDGE_KEY_DELIM + edgeObj.w;
+}
+
+/**
+ * Select or Create a 'g.edges' group to a given sceneGroup
+ * and builds a number of 'g.edge' groups inside the group.
+ *
+ * Structure Pattern:
+ *
+ * <g class='edges'>
+ *   <g class='edge'>
+ *     <path class='edgeline'/>
+ *   </g>
+ *   ...
+ * </g>
+ *
+ *
+ * @param sceneGroup container
+ * @param graph
+ * @param sceneElement <tf-graph-scene> polymer element.
+ * @return selection of the created nodeGroups
+ */
+export function buildGroup(sceneGroup,
+    graph: graphlib.Graph<render.RenderNodeInfo, render.RenderMetaedgeInfo>,
+    sceneElement) {
+  let edges: EdgeData[] = [];
+  edges = _.reduce(graph.edges(), (edges, edgeObj) => {
+    let edgeLabel = graph.edge(edgeObj);
+    edges.push({
+      v: edgeObj.v,
+      w: edgeObj.w,
+      label: edgeLabel
+    });
+    return edges;
+  }, edges);
+
+  let container =
+      scene.selectOrCreateChild(sceneGroup, 'g', Class.Edge.CONTAINER);
+
+  // Select all children and join with data.
+  // (Note that all children of g.edges are g.edge)
+  let edgeGroups = (container as any).selectAll('g.edge').data(edges, getEdgeKey);
+
+  // Make edges a group to support rendering multiple lines for metaedge
+  edgeGroups.enter()
+      .append('g')
+      .attr('class', Class.Edge.GROUP)
+      .attr('data-edge', getEdgeKey)
+      .each(function(d: EdgeData) {
+        let edgeGroup = d3.select(this);
+        d.label.edgeGroup = edgeGroup;
+        // index node group for quick highlighting
+        sceneElement._edgeGroupIndex[getEdgeKey(d)] = edgeGroup;
+
+        // Add line during enter because we're assuming that type of line
+        // normally does not change.
+        appendEdge(edgeGroup, d, sceneElement);
+      })
+      .merge(edgeGroups)
+      .each(position)
+      .each(function(d) {
+    stylize(d3.select(this), d, sceneElement);
+  });
+
+  edgeGroups.exit()
+    .each(d => {
+      delete sceneElement._edgeGroupIndex[getEdgeKey(d)];
+    })
+    .remove();
+  return edgeGroups;
+};
+
+/**
+ * Returns the label for the given base edge.
+ * The label is the shape of the underlying tensor.
+ */
+export function getLabelForBaseEdge(
+    baseEdge: BaseEdge, renderInfo: render.RenderGraphInfo): string {
+  let node = <OpNode>renderInfo.getNodeByName(baseEdge.v);
+  if (node.outputShapes == null || node.outputShapes.length === 0) {
+    return null;
+  }
+  let shape = node.outputShapes[baseEdge.outputTensorIndex];
+  if (shape == null) {
+    return null;
+  }
+  if (shape.length === 0) {
+    return 'scalar';
+  }
+  return shape.map(size => { return size === -1 ? '?' : size; })
+      .join(TENSOR_SHAPE_DELIM);
+}
+
+/**
+ * Creates the label for the given metaedge. If the metaedge consists
+ * of only 1 tensor, and it's shape is known, the label will contain that
+ * shape. Otherwise, the label will say the number of tensors in the metaedge.
+ */
+export function getLabelForEdge(metaedge: Metaedge,
+    renderInfo: render.RenderGraphInfo): string {
+  let isMultiEdge = metaedge.baseEdgeList.length > 1;
+  return isMultiEdge ?
+      metaedge.baseEdgeList.length + ' tensors' :
+      getLabelForBaseEdge(metaedge.baseEdgeList[0], renderInfo);
+}
+
+/**
+ * Shortens the path enought such that the tip of the start/end marker will
+ * point to the start/end of the path. The marker can be of arbitrary size.
+ *
+ * @param points Array of path control points.
+ * @param marker D3 selection of the <marker> svg element.
+ * @param isStart Is the marker a `start-marker`. If false, the marker is
+ *     an `end-marker`.
+ * @return The new array of control points.
+ */
+function adjustPathPointsForMarker(points: render.Point[],
+    marker: d3.Selection<any, any, any, any>, isStart: boolean): render.Point[] {
+  let lineFunc = d3.line<render.Point>()
+    .x(d => d.x)
+    .y(d => d.y);
+  let path =
+      d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'path'))
+          .attr('d', lineFunc(points));
+  let markerWidth = +marker.attr('markerWidth');
+  let viewBox = marker.attr('viewBox').split(' ').map(Number);
+  let viewBoxWidth = viewBox[2] - viewBox[0];
+  let refX = +marker.attr('refX');
+  let pathNode = <SVGPathElement> path.node();
+  if (isStart) {
+    let fractionStickingOut = refX / viewBoxWidth;
+    let length = markerWidth * fractionStickingOut;
+    let point = pathNode.getPointAtLength(length);
+    // Figure out how many segments of the path we need to remove in order
+    // to shorten the path.
+    let segIndex = pathNode.getPathSegAtLength(length);
+    // Update the very first segment.
+    points[segIndex - 1] = {x: point.x, y: point.y};
+    // Ignore every point before segIndex - 1.
+    return points.slice(segIndex - 1);
+  } else {
+    let fractionStickingOut = 1 - refX / viewBoxWidth;
+    let length = pathNode.getTotalLength() - markerWidth * fractionStickingOut;
+    let point = pathNode.getPointAtLength(length);
+    // Figure out how many segments of the path we need to remove in order
+    // to shorten the path.
+    let segIndex = pathNode.getPathSegAtLength(length);
+    // Update the very last segment.
+    points[segIndex] = {x: point.x, y: point.y};
+    // Ignore every point after segIndex.
+    return points.slice(0, segIndex + 1);
+  }
+}
+
+/**
+ * For a given d3 selection and data object, create a path to represent the
+ * edge described in d.label.
+ *
+ * If d.label is defined, it will be a RenderMetaedgeInfo instance. It
+ * will sometimes be undefined, for example for some Annotation edges for which
+ * there is no underlying Metaedge in the hierarchical graph.
+ */
+export function appendEdge(edgeGroup, d: EdgeData,
+    sceneElement: {renderHierarchy: render.RenderGraphInfo},
+    edgeClass?: string) {
+  let size = 1;
+  if (d.label != null && d.label.metaedge != null) {
+    // There is an underlying Metaedge.
+    size = d.label.metaedge.totalSize;
+  }
+  edgeClass = edgeClass || Class.Edge.LINE; // set default type
+
+  if (d.label && d.label.structural) {
+    edgeClass += ' ' + Class.Edge.STRUCTURAL;
+  }
+  // Give the path a unique id, which will be used to link
+  // the textPath (edge label) to this path.
+  let pathId = 'path_' + getEdgeKey(d);
+  let strokeWidth = sceneElement.renderHierarchy.edgeWidthScale(size);
+
+  let path = edgeGroup.append('path')
+                 .attr('id', pathId)
+                 .attr('class', edgeClass)
+                 .style('stroke-width', strokeWidth + 'px');
+
+  // Check if there is a reference edge and add an arrowhead of the right size.
+  if (d.label && d.label.metaedge && d.label.metaedge.numRefEdges) {
+    let markerId = `ref-arrowhead-${arrowheadMap(strokeWidth)}`;
+    path.style('marker-start', `url(#${markerId})`);
+    d.label.startMarkerId = markerId;
+  }
+
+  if (d.label == null || d.label.metaedge == null) {
+    // There is no associated metaedge, thus no text.
+    // This happens for annotation edges.
+    return;
+  }
+  let labelForEdge = getLabelForEdge(d.label.metaedge,
+      sceneElement.renderHierarchy);
+  if (labelForEdge == null) {
+    // We have no information to show on this edge.
+    return;
+  }
+
+  // Put edge label in the middle of edge only if the edge is thick enough.
+  let baseline = strokeWidth > CENTER_EDGE_LABEL_MIN_STROKE_WIDTH ?
+      'central' :
+      'text-after-edge';
+
+  edgeGroup.append('text')
+      .append('textPath')
+        .attr('xlink:href', '#' + pathId)
+        .attr('startOffset', '50%')
+        .attr('text-anchor', 'middle')
+        .attr('dominant-baseline', 'central')
+      .text(labelForEdge);
+};
+
+export let interpolate = d3.line<{x: number, y: number}>()
+                             .curve(d3.curveBasis)
+                             .x((d) => { return d.x;})
+                             .y((d) => { return d.y;});
+
+/**
+ * Returns a tween interpolator for the endpoint of an edge path.
+ */
+function getEdgePathInterpolator(d: EdgeData, i: number, a: string) {
+  let renderMetaedgeInfo = <render.RenderMetaedgeInfo> d.label;
+  let adjoiningMetaedge = renderMetaedgeInfo.adjoiningMetaedge;
+  let points = renderMetaedgeInfo.points;
+
+  // Adjust the path so that start/end markers point to the end
+  // of the path.
+  if (d.label.startMarkerId) {
+    points = adjustPathPointsForMarker(
+        points, d3.select('#' + d.label.startMarkerId), true);
+  }
+  if (d.label.endMarkerId) {
+    points = adjustPathPointsForMarker(
+        points, d3.select('#' + d.label.endMarkerId), false);
+  }
+
+  if (!adjoiningMetaedge) {
+    return d3.interpolate(a, interpolate(points));
+  }
+
+  let renderPath = this;
+
+  // Get the adjoining path that matches the adjoining metaedge.
+  let adjoiningPath =
+    <SVGPathElement>((<HTMLElement>adjoiningMetaedge.edgeGroup.node())
+      .firstChild);
+
+  // Find the desired SVGPoint along the adjoining path, then convert those
+  // coordinates into the space of the renderPath using its Current
+  // Transformation Matrix (CTM).
+  let inbound = renderMetaedgeInfo.metaedge.inbound;
+
+  return function(t) {
+    let adjoiningPoint = adjoiningPath
+      .getPointAtLength(inbound ? adjoiningPath.getTotalLength() : 0)
+      .matrixTransform(adjoiningPath.getCTM())
+      .matrixTransform(renderPath.getCTM().inverse());
+
+    // Update the relevant point in the renderMetaedgeInfo's points list, then
+    // re-interpolate the path.
+    let index = inbound ? 0 : points.length - 1;
+    points[index].x = adjoiningPoint.x;
+    points[index].y = adjoiningPoint.y;
+    let dPath = interpolate(points);
+    return dPath;
+  };
+}
+
+function position(d) {
+  d3.select(this)
+      .select('path.' + Class.Edge.LINE)
+      .transition()
+      .attrTween('d', getEdgePathInterpolator as any);
+};
+
+/**
+ * For a given d3 selection and data object, mark the edge as a control
+ * dependency if it contains only control edges.
+ *
+ * d's label property will be a RenderMetaedgeInfo object.
+ */
+function stylize(edgeGroup, d: EdgeData, stylize) {
+  edgeGroup.classed('faded', d.label.isFadedOut);
+  let metaedge = d.label.metaedge;
+  edgeGroup.select('path.' + Class.Edge.LINE)
+      .classed('control-dep', metaedge && !metaedge.numRegularEdges);
+};
+
+} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/externs.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/externs.ts
new file mode 100644
index 0000000000..7c0d168a42
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/externs.ts
@@ -0,0 +1,85 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * @fileoverview Extern declarations for tensorflow graph visualizer.
+ *     This file contains compiler stubs for external dependencies whos
+ *     implementations are defined at runtime.
+ */
+
+declare module graphlib {
+  interface GraphOptions {
+    name?: string;
+    /**
+     * Direction for rank nodes. Can be TB, BT, LR, or RL, where T = top,
+     * B = bottom, L = left, and R = right.
+     */
+    rankdir?: string;
+    type?: string|number;
+    /** Number of pixels between each rank in the layout. */
+    ranksep?: number;
+    /** Number of pixels that separate nodes horizontally in the layout. */
+    nodesep?: number;
+    /** Number of pixels that separate edges horizontally in the layout */
+    edgesep?: number;
+  }
+
+  export interface EdgeObject {
+    v: string;
+    w: string;
+    name?: string;
+  }
+
+  export class Graph<N, E> {
+    constructor(opt?: Object);
+    setNode(name: string, value?: N): void;
+    hasNode(name: string): boolean;
+    setEdge(fromName: string, toName: string, value?: E): void;
+    hasEdge(fromName: string, toName: string): boolean;
+    edge(fromName: string, toName: string): E;
+    edge(edgeObject: EdgeObject): E;
+    removeEdge(v: string, w: string): void;
+    nodes(): string[];
+    node(name: string): N;
+    removeNode(name: string): void;
+    setGraph(graphOptions: GraphOptions): void;
+    graph(): GraphOptions;
+    nodeCount(): number;
+    neighbors(name: string): string[];
+    successors(name: string): string[];
+    predecessors(name: string): string[];
+    edges(): EdgeObject[];
+    outEdges(name: string): E[];
+    inEdges(name: string): E[];
+    /**
+     * Returns those nodes in the graph that have no in-edges.
+     * Takes O(|V|) time.
+     */
+    sources(): string[];
+    /**
+     * Remove the node with the id v in the graph or do nothing if
+     * the node is not in the graph. If the node was removed this
+     * function also removes any incident edges. Returns the graph,
+     * allowing this to be chained with other functions. Takes O(|E|) time.
+     */
+    removeNode(name: string): Graph<N, E>;
+    setParent(name: string, parentName: string): void;
+  }
+}
+
+/**
+ * Declaring dagre var used for dagre layout.
+ */
+declare var dagre: {layout(graph: graphlib.Graph<any, any>): void;};
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/graph.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/graph.ts
new file mode 100644
index 0000000000..1b0abcfd85
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/graph.ts
@@ -0,0 +1,1257 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph {
+
+/** Delimiter used in node names to denote namespaces. */
+export const NAMESPACE_DELIM = '/';
+export const ROOT_NAME = '__root__';
+
+/** Attribute key used for storing attributes that are too large. */
+export const LARGE_ATTRS_KEY = '_too_large_attrs';
+/**
+ * Maximum allowed size in bytes, before the attribute is considered large
+ * and filtered out of the graph.
+ */
+export const LIMIT_ATTR_SIZE = 1024;
+
+// Separator between the source and the destination name of the edge.
+export const EDGE_KEY_DELIM = '--';
+
+export enum GraphType {FULL, EMBEDDED, META, SERIES, CORE, SHADOW, BRIDGE,
+    EDGE};
+export enum NodeType {META, OP, SERIES, BRIDGE, ELLIPSIS};
+
+/** Indicates if a node is to be included in the main graph when rendered. */
+export enum InclusionType {INCLUDE, EXCLUDE, UNSPECIFIED};
+
+/** Indicates if a series is to be grouped in the graph when rendered. */
+export enum SeriesGroupingType {GROUP, UNGROUP};
+
+/** Attribute key reserved for the shapes of the output tensors. */
+const OUTPUT_SHAPES_KEY = '_output_shapes';
+
+/** Attribute key reserved for the XLA cluster that an op runs on. */
+const _XLA_CLUSTER_KEY = '_XlaCluster';
+
+/**
+ * A BaseEdge is the label object (in the graphlib sense) for an edge in the
+ * original, full graph produced after parsing. Subsequent graphs, like those
+ * which belong to Metanodes, should not use BaseEdge objects, but instead
+ * contain Metaedges (which in turn may contain any number of BaseEdges).
+ */
+export interface BaseEdge extends graphlib.EdgeObject {
+  isControlDependency: boolean;
+  isReferenceEdge: boolean;
+  /** The index of the output tensor of the source node. */
+  outputTensorIndex: number;
+}
+
+/**
+ * A SlimGraph is inspired by graphlib.Graph, but having only the functionality
+ * that we need.
+ */
+export class SlimGraph {
+  nodes: { [nodeName: string]: OpNode };
+  edges: BaseEdge[];
+
+  constructor() {
+    this.nodes = {};
+    this.edges = [];
+  }
+}
+
+export interface NormalizedInput {
+  name: string;
+  /** The index of the output tensor of the source node. */
+  outputTensorIndex: number;
+  isControlDependency: boolean;
+}
+
+export interface BuildParams {
+  enableEmbedding: boolean;
+  inEmbeddingTypes: string[];
+  outEmbeddingTypes: string[];
+  refEdges: { [inputEdge: string]: boolean };
+}
+
+/**
+ * The most basic information about a node in the hierarchical graph.
+ */
+export interface Node {
+  /** The name of the node, used frequently to look up nodes by name. */
+  name: string;
+  /** Which type of node this is. */
+  type: NodeType;
+  /**
+   * Whether this node is a type that may contain other nodes. Those types
+   * should extend from GroupNode.
+   *
+   * For an OpNode, isGroupNode will be false, even though it may have
+   * embeddings. These embedding Nodes will have their parentNode set to the
+   * OpNode. However, embeddings are later rendered as annotations, not as
+   * children to be made visible on expansion (like a Metanode or SeriesNode).
+   */
+  isGroupNode: boolean;
+  /**
+   * The number of nodes this node represents. For OpNodes, this will be 1, and
+   * for GroupNodes it will be a count of the total number of descendents it
+   * contains.
+   */
+  cardinality: number;
+  /**
+   * The Node which is this Node's parent. This is of type Node and not
+   * GroupNode because of embeddings, which will have a parent OpNode.
+   */
+  parentNode: Node;
+  /** Runtime execution stats for this node, if available */
+  stats: NodeStats;
+  /** If the node is to be included or excluded from the main graph when
+   *  rendered. Defaults to UNSPECIFIED, which means that the rendering
+   *  algorithm determines if it will be included or not. Then can be set to
+   *  INCLUDE or EXCLUDE manually by the user.
+   */
+  include: InclusionType;
+  /**
+   * Node attributes specify customizable visual aspects of a node and
+   * application-specific metadata associated with a node. The name
+   * 'nodeAttributes' is meant to avoid naming-conflicts with the 'attr' in
+   * subclasses of Node.
+   */
+  nodeAttributes: {[key: string]: any;};
+}
+
+export type TensorShape = number[];
+
+export interface OpNode extends Node {
+  op: string;
+  // The device on which the op ran. Null if it is unknown.
+  device: string;
+  attr: {key: string, value: any}[];
+  inputs: NormalizedInput[];
+  inEmbeddings: OpNode[];
+  outEmbeddings: OpNode[];
+  // The name of the SeriesNode that can contain this node in its series.
+  // If there is no such node, then this is null.
+  owningSeries: string;
+  /**
+   * Array of tensor shapes. Null if the number of output tensors is unknown,
+   * otherwise the length will equal the number of output tensors.
+   *
+   * Each tensor shape is an array of numbers, or null. Details:
+   * - null means unknown rank, and therefore entire shape is unknown.
+   * - [4, 2, 1] means rank-3 tensor of size 4x2x1.
+   * - [] means a scalar (rank-0 tensor).
+   * - [1] means rank-1 tensor of size 1 (not the same as scalar).
+   * - [5, -1, 3] means rank-3 tensor of shape is 5x?x3. The size
+   *       of the middle dimension is unknown (encoded as -1).
+   */
+  outputShapes: TensorShape[];
+  // The XLA Cluster on which the op ran. Null if it is unknown.
+  xlaCluster: string;
+}
+
+export interface BridgeNode extends Node {
+  /**
+   * Whether this bridge node represents edges coming into its parent node.
+   */
+  inbound: boolean;
+}
+
+/**
+ * A node that is used when there are more than the maximum number of allowed
+ * annotations hanging off of a node.  This node represents an ellipsis
+ * annotation, indicating a number of additional annotations.
+ */
+export interface EllipsisNode extends Node {
+  /**
+   * The number of nodes this ellipsis represents.
+   */
+  numMoreNodes: number;
+
+  /**
+   * Sets the number of nodes this ellipsis represents and changes the node
+   * name accordingly.
+   */
+  setNumMoreNodes(numNodes: number);
+}
+
+export interface GroupNode extends Node {
+  /**
+   * The metagraph contains nodes and metaedges between the immediate children
+   * of this group. The node label objects may be other GroupNodes (like
+   * SeriesNodes and Metanodes) or individual OpNodes. All edge label objects
+   * are Metaedges, each of which contains references to the original
+   * BaseEdge(s) from which it was created.
+   */
+  metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
+
+  /**
+   * The bridgegraph contains only edges which link immediate children of this
+   * group with nodes outside of the metagraph. As in the metagraph, all edge
+   * label objects are Metaedges which contain references to the original
+   * BaseEdge(s) that contribute to it.
+   *
+   * For a Metaedge in the bridgegraph, its external endpoint will be the same
+   * as the metagraph edge from which it came. This is most easily explained
+   * by example.
+   *
+   * Consider an original graph that contains a BaseEdge A/B/C->Z/Y/X.
+   *
+   *     +-------+    (BaseEdge)     +-------+
+   *     | A/B/C |>----------------->| Z/Y/X |
+   *     +-------+                   +-------+
+   *
+   * When we construct the Root's metagraph, it will contain nodes for A and Z,
+   * and a Metaedge A->Z. The A->Z Metaedge will contain the original BaseEdge
+   * A/B/C->Z/Y/X in its baseEdgeGraph. The Root's bridgegraph will always be
+   * empty.
+   *
+   *     +---+    (Root.metagraph edge)    +---+
+   *     | A |>--------------------------->| Z |
+   *     +---+                             +---+
+   *
+   * Now consider the Metanode A. Its metagraph will contain a Metanode for A/B
+   * and no edges. A's bridgegraph will have one Metaedge from A/B->Z, which
+   * was derived from the Root's Metaedge A->Z. That Metaedge will contain the
+   * original BaseEdge in its baseEdgeGraph.
+   *
+   *     +---------+
+   *     | A       |
+   *     |  +---+  |   (A.bridgegraph edge)    +---+
+   *     |  | B |>---------------------------->| Z |
+   *     |  +---+  |                           +---+
+   *     +---------+
+   *
+   * Finally, consider the Metanode A/B. Its metagraph will contain a Metanode
+   * for A/B/C and again no edges. A/B's bridgegraph will have one Metaedge
+   * from A/B/C->Z, which was derived from A's bridgegraph Metaedge A/B->Z.
+   * As before, the A/B/C->Z Metaedge will contain the original BaseEdge in its
+   * baseEdgeGraph.
+   *
+   *     +---------------+
+   *     | A             |
+   *     |  +---------+  |
+   *     |  | B       |  |
+   *     |  |  +---+  |  |   (A/B.bridgegraph edge)      +---+
+   *     |  |  | C |>----------------------------------->| Z |
+   *     |  |  +---+  |  |                               +---+
+   *     |  +---------+  |
+   *     +---------------+
+   *
+   * Likewise, under the Metanode Z and Z/Y, to compute the bridgegraph, we'll
+   * end up with Metaedges A->Z/Y and A->Z/Y/X respectively. So the original
+   * BaseEdge A/B/C->Z/Y/X becomes four different Metaedges in four different
+   * bridgegraphs:
+   *
+   *   + A/B->Z in GroupNode A's bridgegraph,
+   *   + A/B/C->Z in GroupNode A/B's bridgegraph,
+   *   + A->Z/Y in GroupNode Z's bridgegraph, and
+   *   + A->Z/Y/X in GroupNode Z/Y's bridgegraph.
+   *
+   * Considering any BaseEdge then, if N is the number of path segments in the
+   * source and M is the number of path segments in the destination, then the
+   * total number of bridgegraph edges you could create would be (N-1)(M-1).
+   *
+   * For this reason, it is computationally expensive to generate all the
+   * bridgegraphs for all the Metanodes, and instead they should be computed
+   * on demand as needed.
+   */
+  bridgegraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
+
+  /**
+   * Stores how many times each device name appears in its children
+   * op nodes. Used to color group nodes by devices.
+   */
+  deviceHistogram: {[device: string]: number};
+
+  /**
+   * Flag indicating whether this GroupNode's metagraph contains any edges that
+   * are not control edges. Used to quickly determine how to draw a collapsed
+   * series (vertically or horizontally).
+   */
+  hasNonControlEdges: boolean;
+}
+
+export interface Metanode extends GroupNode {
+  depth: number;
+  templateId: string;
+  opHistogram: {[op: string]: number};
+  getFirstChild(): GroupNode|OpNode;
+  getRootOp(): OpNode;
+  /** Return name of all leaves inside a metanode. */
+  leaves(): string[];
+}
+
+export interface SeriesNode extends GroupNode {
+  hasLoop: boolean;
+  prefix: string;
+  suffix: string;
+  clusterId: number;
+  ids: number[];
+  parent: string;
+}
+
+export class EllipsisNodeImpl implements EllipsisNode {
+  name: string;
+  numMoreNodes: number;
+  stats: NodeStats;
+  type: NodeType;
+  isGroupNode: boolean;
+  cardinality: number;
+  parentNode: Node;
+  include: InclusionType;
+  nodeAttributes: {[key: string]: any;};
+  /**
+   * Constructs a new ellipsis annotation node.
+   *
+   * @param numNodes The number of additional annotations this node represents.
+   */
+  constructor(numNodes: number) {
+    this.type = NodeType.ELLIPSIS;
+    this.isGroupNode = false;
+    this.cardinality = 1;
+    this.parentNode = null;
+    this.stats = null;
+    this.setNumMoreNodes(numNodes);
+    this.include = InclusionType.UNSPECIFIED;
+  }
+
+  setNumMoreNodes(numNodes: number) {
+    this.numMoreNodes = numNodes;
+    this.name = '... ' + numNodes + ' more';
+  }
+};
+
+/**
+ * A label object for nodes in the full graph and leaf nodes in the render
+ * graph.
+ */
+export class OpNodeImpl implements OpNode {
+  name: string;
+  op: string;
+  device: string;
+  stats: NodeStats;
+  attr: {key: string, value: any}[];
+  inputs: NormalizedInput[];
+  type: NodeType;
+  isGroupNode: boolean;
+  cardinality: number;
+  inEmbeddings: OpNode[];
+  outEmbeddings: OpNode[];
+  parentNode: Node;
+  include: InclusionType;
+  owningSeries: string;
+  outputShapes: TensorShape[];
+  nodeAttributes: {[key: string]: any;};
+  xlaCluster: string;
+
+  /**
+   * Constructs a new Op node.
+   *
+   * @param rawNode The raw node.
+   */
+  constructor(rawNode: tf.graph.proto.NodeDef) {
+    this.op = rawNode.op;
+    this.name = rawNode.name;
+    this.device = rawNode.device;
+    this.attr = rawNode.attr;
+    // An array of normalized inputs that denote the incoming edges to
+    // the current node. Each input contains the normalized name of the
+    // source node, whether it has a number part and whether it is a
+    // control dependency.
+    this.inputs = normalizeInputs(rawNode.input);
+    this.outputShapes = extractOutputShapes(rawNode.attr);
+    this.xlaCluster = extractXlaCluster(rawNode.attr);
+    // additional properties
+    this.type = NodeType.OP;
+    this.isGroupNode = false;
+    this.cardinality = 1;
+    this.inEmbeddings = [];
+    this.outEmbeddings = [];
+    this.parentNode = null;
+    this.include = InclusionType.UNSPECIFIED;
+    this.owningSeries = null;
+  }
+};
+
+export function createMetanode(name: string, opt = {}): Metanode {
+  return new MetanodeImpl(name, opt);
+}
+
+/**
+ * Joins the information from the stats file (memory, compute time) with the
+ * graph information.
+ */
+export function joinStatsInfoWithGraph(
+    graph: SlimGraph, stats: tf.graph.proto.StepStats,
+    devicesForStats?: {[device: string]: boolean}): void {
+  // Reset stats for each node.
+  _.each(graph.nodes, node => { node.stats = null; });
+
+  _.each(stats.dev_stats, devStats => {
+    // Ignore devices that are not selected.
+    if (devicesForStats && !devicesForStats[devStats.device]) {
+      return;
+    }
+    _.each(devStats.node_stats, nodeStats => {
+      // Lookup the node in the graph by its original name, e.g. A. If not
+      // found, lookup by the rewritten name A/(A) in case the name is both
+      // a namespace and a node name.
+      let nodeName = nodeStats.node_name in graph.nodes ? nodeStats.node_name :
+                                                          nodeStats.node_name +
+              NAMESPACE_DELIM + '(' + nodeStats.node_name + ')';
+
+      // Couldn't find a matching node.
+      if (!(nodeName in graph.nodes)) {
+        return;
+      }
+
+      // Compute the total bytes used.
+      let totalBytes = 0;
+      if (nodeStats.memory) {
+        _.each(nodeStats.memory, alloc => {
+        if (alloc.total_bytes) {
+            if (alloc.total_bytes > 0) {
+              totalBytes += Number(alloc.total_bytes);
+            } else {
+              /* tslint:disable */
+              console.log(
+                  'ignoring negative memory allocation for ' + nodeName);
+              /* tslint:enable */
+            }
+          }
+        });
+      }
+      let outputSize: number[][] = null;
+      if (nodeStats.output) {
+        outputSize = _.map(nodeStats.output, output => {
+          return _.map(output.tensor_description.shape.dim,
+              dim => Number(dim.size));
+        });
+      }
+      graph.nodes[nodeName].device = devStats.device;
+      if (graph.nodes[nodeName].stats == null) {
+        graph.nodes[nodeName].stats = new NodeStats(outputSize);
+      }
+      graph.nodes[nodeName].stats.addBytesAllocation(totalBytes);
+      if (nodeStats.all_end_rel_micros) {
+        if (nodeStats.all_end_rel_micros > 0) {
+          graph.nodes[nodeName].stats.addExecutionTime(
+              nodeStats.all_start_micros,
+              nodeStats.all_start_micros + nodeStats.all_end_rel_micros);
+        } else {
+          /* tslint:disable */
+          console.log('ignoring negative runtime for ' + nodeName);
+          /* tslint:enable */
+        }
+      }
+    });
+  });
+}
+
+/**
+ * Execution stats for the node.
+ */
+export class NodeStats {
+  constructor(outputSize: number[][]) { this.outputSize = outputSize; }
+
+  /**
+   * Add the start and end time for a particular kernel execution of this op.
+   * Ops can have multiple kernel executions within the same session run.
+   */
+  addExecutionTime(startTime: number, endTime: number) {
+    if (this.startTime != null) {
+      this.startTime = Math.min(this.startTime, startTime);
+    } else {
+      this.startTime = startTime;
+    }
+    if (this.endTime != null) {
+      this.endTime = Math.max(this.endTime, endTime);
+    } else {
+      this.endTime = endTime;
+    }
+  }
+
+  /**
+   * Add the bytes allocated for a particular kernel execution of this op.
+   * Ops can have multiple kernel executions within the same session run.
+   */
+  addBytesAllocation(totalBytes: number) {
+    if (this.totalBytes != null) {
+      this.totalBytes = Math.max(this.totalBytes, totalBytes);
+    } else {
+      this.totalBytes = totalBytes;
+    }
+  }
+
+  /**
+   * Absolute start time for the very first kernel execution of this op.
+   */
+  startTime: number;
+  /**
+   * Absolute end time for the very last kernel execution of this op.
+   */
+  endTime: number;
+  /**
+   * Total number of bytes used for the node. Sum of all children
+   * if it is a Group node.
+   */
+  totalBytes = 0;
+
+  /**
+   * The shape of each output tensors, if there are any.
+   * Empty if it is a Group node.
+   */
+  outputSize: number[][];
+
+  /**
+   * Combines the specified stats with the current stats.
+   * Modifies the current object. This method is used to
+   * compute aggregate stats for group nodes.
+   */
+  combine(stats: NodeStats): void {
+    if (stats.totalBytes != null) {
+      this.totalBytes += stats.totalBytes;
+    }
+    if (stats.getTotalMicros() != null) {
+      this.addExecutionTime(stats.startTime, stats.endTime);
+    }
+  }
+
+  /**
+   * Total number of compute time in microseconds used for the node.
+   * Sum of all children if it is a Group node. Null if it is unknown.
+   * This method can not be scaffolded under a getter attribute because
+   * ECMAScript 5 does not support getter attributes.
+   */
+  getTotalMicros(): number {
+    if (this.startTime == null || this.endTime == null) {
+      return null;
+    }
+    return this.endTime - this.startTime;
+  }
+}
+
+export class MetanodeImpl implements Metanode {
+  name: string;
+  stats: NodeStats;
+  type: NodeType;
+  depth: number;
+  isGroupNode: boolean;
+  cardinality: number;
+  metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
+  bridgegraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
+  templateId: string;
+  opHistogram: {[op: string]: number};
+  deviceHistogram: {[op: string]: number};
+  parentNode: Node;
+  hasNonControlEdges: boolean;
+  include: InclusionType;
+  nodeAttributes: {[key: string]: any;};
+
+  /** A label object for meta-nodes in the graph hierarchy */
+  constructor(name: string, opt = {}) {
+    this.name = name;
+    this.type = NodeType.META;
+    /** number of levels under this group */
+    this.depth = 1;
+    this.isGroupNode = true;
+    /** # of leaf nodes (including embedded ones) */
+    this.cardinality = 0;
+    /** graph contains metanodes, nodes, edges
+     * and metaedges for main items within this metanode
+     */
+    this.metagraph =
+      createGraph<GroupNode|OpNode, Metaedge>(name, GraphType.META, opt);
+    /** bridgegraph must be constructed lazily-see hierarchy.getBridgegraph() */
+    this.bridgegraph = null;
+    /**
+     * A dictionary that count ops type of nodes in this metanode
+     * (op type => count).
+     */
+    this.opHistogram = {};
+    this.deviceHistogram = {};
+    /** unique id for a metanode of similar subgraph */
+    this.templateId = null;
+    /** Metanode which contains this node, if any */
+    this.parentNode = null;
+    this.hasNonControlEdges = false;
+    this.include = InclusionType.UNSPECIFIED;
+  }
+
+  getFirstChild(): GroupNode|OpNode {
+    return this.metagraph.node(this.metagraph.nodes()[0]);
+  }
+
+  /**
+   * Returns the op node associated with the metanode.
+   * For example, if the metanode is 'sgd', the associated
+   * op node is sgd/(sgd).
+   */
+  getRootOp(): OpNode {
+    let nameSplit = this.name.split('/');
+    let rootOpName = this.name + '/(' + nameSplit[nameSplit.length - 1] + ')';
+    return <OpNode>this.metagraph.node(rootOpName);
+  }
+
+  /**
+   * Return an array of the names of all the leaves (non-GroupNodes) inside
+   * this metanode. This performs a breadth-first search of the tree, so
+   * immediate child leaves will appear earlier in the output array than
+   * descendant leaves.
+   */
+  leaves(): string[] {
+    let leaves = [];
+    let queue = [<Node> this];
+    let metagraph; // Defined here due to a limitation of ES6->5 compilation.
+    while (queue.length) {
+      let node = queue.shift();
+      if (node.isGroupNode) {
+        metagraph = (<GroupNode> node).metagraph;
+        _.each(metagraph.nodes(), name => queue.push(metagraph.node(name)));
+      } else {
+        leaves.push(node.name);
+      }
+    }
+    return leaves;
+  }
+};
+
+export interface Metaedge extends graphlib.EdgeObject {
+
+  /**
+   * Stores the original BaseEdges represented by this Metaedge.
+   */
+  baseEdgeList: BaseEdge[];
+
+  /**
+   * Whether this edge represents a relationship that is inbound (or outbound)
+   * to the object which contains this information. For example, in a Metanode's
+   * bridgegraph, each edge connects an immediate child to something outside
+   * the Metanode. If the destination of the edge is inside the Metanode, then
+   * its inbound property should be true. If the destination is outside the
+   * Metanode, then its inbound property should be false.
+   *
+   * The property is optional because not all edges can be described as
+   * inbound/outbound. For example, in a Metanode's metagraph, all of the edges
+   * connect immediate children of the Metanode. None should have an inbound
+   * property, or they should be null/undefined.
+   */
+  inbound?: boolean;
+
+  /**
+   * Number of regular edges (not control dependency edges).
+   */
+  numRegularEdges: number;
+
+  /**
+   * Number of control dependency edges.
+   */
+  numControlEdges: number;
+
+  /**
+   * Number of reference edges, which is an edge to an operation
+   * that takes a reference to its input and changes its value.
+   */
+  numRefEdges: number;
+
+  /**
+   * Total size (number of units) of all the tensors flowing through this edge.
+   */
+  totalSize: number;
+
+  addBaseEdge(edge: BaseEdge, h: hierarchy.Hierarchy): void;
+}
+
+export function createMetaedge(v: string, w: string): Metaedge {
+  return new MetaedgeImpl(v, w);
+}
+
+/**
+ * A label object for edges between metanodes of subgraphs in the render graph.
+ */
+export class MetaedgeImpl implements Metaedge {
+  v: string;
+  w: string;
+  baseEdgeList: BaseEdge[];
+  inbound: boolean;
+  numRegularEdges: number;
+  numControlEdges: number;
+  numRefEdges: number;
+  totalSize: number;
+
+  constructor(v: string, w: string) {
+    this.v = v;
+    this.w = w;
+    this.baseEdgeList = [];
+    this.inbound = null;
+    this.numRegularEdges = 0;
+    this.numControlEdges = 0;
+    this.numRefEdges = 0;
+    this.totalSize = 0;
+  }
+
+  addBaseEdge(edge: BaseEdge, h: hierarchy.Hierarchy): void {
+    this.baseEdgeList.push(edge);
+    if (edge.isControlDependency) {
+      this.numControlEdges += 1;
+    } else {
+      this.numRegularEdges += 1;
+    }
+    if (edge.isReferenceEdge) {
+      this.numRefEdges += 1;
+    }
+    // Compute the size of the tensor flowing through this
+    // base edge.
+    this.totalSize += MetaedgeImpl.computeSizeOfEdge(edge, h);
+    h.maxMetaEdgeSize = Math.max(h.maxMetaEdgeSize, this.totalSize);
+  }
+
+  private static computeSizeOfEdge(edge: BaseEdge, h: hierarchy.Hierarchy):
+      number {
+    let opNode = <OpNode> h.node(edge.v);
+    if (opNode.outputShapes == null) {
+      // No shape information. Asssume a single number. This gives
+      // a lower bound for the total size.
+      return 1;
+    }
+    h.hasShapeInfo = true;
+    // Sum the sizes of all output tensors.
+    return _(opNode.outputShapes).map(shape => {
+      // If the shape is unknown, treat it as 1 when computing
+      // total size. This gives a lower bound for the total size.
+      if (shape == null) {
+        return 1;
+      }
+      // Multiply all shapes to get the total size of the tensor.
+      // E.g. The total size of [4, 2, 1] is 4 * 2 * 1.
+      return _(shape).reduce((accumulated, currSize) => {
+        // If this particular dimension is unknown, treat
+        // it as 1 when computing total size. This gives a lower bound
+        // for the total size.
+        if (currSize === -1) {
+          currSize = 1;
+        }
+        return accumulated * currSize;
+      }, 1);
+    }).sum();
+  }
+}
+
+export function createSeriesNode(prefix: string, suffix: string,
+    parent: string, clusterId: number, name: string): SeriesNode {
+  return new SeriesNodeImpl(prefix, suffix, parent, clusterId, name);
+}
+
+export function getSeriesNodeName(prefix: string, suffix: string,
+    parent: string, startId?: number, endId?: number): string {
+  let numRepresentation =
+      (typeof startId !== 'undefined' && typeof endId !== 'undefined') ?
+      '[' + startId + '-' + endId + ']' :
+      '#';
+  let pattern = prefix + numRepresentation + suffix;
+  return (parent ? parent + '/' : '') + pattern;
+}
+
+class SeriesNodeImpl implements SeriesNode {
+  name: string;
+  type: NodeType;
+  stats: NodeStats;
+  hasLoop: boolean;
+  prefix: string;
+  suffix: string;
+  clusterId: number;
+  ids: number[];
+  parent: string;
+  isGroupNode: boolean;
+  cardinality: number;
+  metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
+  bridgegraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
+  parentNode: Node;
+  deviceHistogram: {[op: string]: number};
+  hasNonControlEdges: boolean;
+  include: InclusionType;
+  nodeAttributes: {[key: string]: any;};
+
+  constructor(prefix: string, suffix: string, parent: string,
+      clusterId: number, name: string) {
+    this.name = name || getSeriesNodeName(prefix, suffix, parent);
+    this.type = NodeType.SERIES;
+    this.hasLoop = false;
+    this.prefix = prefix;
+    this.suffix = suffix;
+    this.clusterId = clusterId;
+    this.ids = [];
+    this.parent = parent;
+    this.isGroupNode = true;
+    this.cardinality = 0;
+    this.metagraph = createGraph<Metanode, Metaedge>(name, GraphType.SERIES);
+    // bridgegraph must be constructed lazily-see hierarchy.getBridgegraph()
+    this.bridgegraph = null;
+    this.parentNode = null;
+    this.deviceHistogram = {};
+    this.hasNonControlEdges = false;
+    this.include = InclusionType.UNSPECIFIED;
+  }
+}
+
+/**
+ * Extracts the shapes of the output tensors from the attr property in the
+ * node proto.
+ */
+// tslint:disable-next-line:no-any
+function extractOutputShapes(attr: Array<{key: string, value: any}>):
+    TensorShape[] {
+  let result = null;
+  // We don't know anything about the output tensors.
+  if (!attr) {
+    return null;
+  }
+  for (let i = 0; i < attr.length; i++) {
+    let {key, value} = attr[i];
+    if (key === OUTPUT_SHAPES_KEY) {
+      if (!value.list.shape) {
+        // The OUTPUT_SHAPES_KEY lacks a value. We know nothing about the shape.
+        return null;
+      }
+
+      // Map all output tensors into array of numbers denoting their shape.
+      let result = value.list.shape.map(shape => {
+        if (shape.unknown_rank) {
+          // This output tensor is of unknown rank. We don't know if it is a
+          // scalar, or a tensor, or of what shape it is.
+          return null;
+        }
+        if (shape.dim == null ||
+            (shape.dim.length === 1 && shape.dim[0].size == null)) {
+          // This output tensor is a scalar.
+          return [];
+        }
+        // This output tensor has a known rank. Map each dimension size
+        // into a number.
+        return shape.dim.map(dim => {
+          // Size can be -1 if this particular dimension is unknown.
+          return dim.size;
+        });
+      });
+      // Since we already processed it, remove the entry from the attribute
+      // list (saves memory).
+      attr.splice(i, 1);
+      return result;
+    }
+  }
+  // We didn't find OUTPUT_SHAPES_KEY in attributes, so we don't know anything
+  // about the output tensors.
+  return null;
+}
+
+/**
+ * Extracts the XLA Cluster that an op runs on from the attrs of the OpNode.
+ * @param attr The attr property.
+ * @return A string that is the name of the cluster. Or null if it could not be
+ *     determined.
+ */
+// tslint:disable-next-line:no-any
+function extractXlaCluster(attr: Array<{key: string, value: any}>): string|
+    null {
+  if (!attr) {
+    return null;
+  }
+
+  // Find the attribute for XLA cluster if there is one.
+  for (let i = 0; i < attr.length; i++) {
+    if (attr[i].key === _XLA_CLUSTER_KEY) {
+      return attr[i].value['s'] || null;
+    }
+  }
+  return null;
+}
+
+/**
+ * Normalizes the inputs and extracts associated metadata:
+ * 1) Inputs can contain a colon followed by a number at the end
+ *    (e.g. inputName:1) and we remove this from the input name, and take note
+ *    that the input was numbered.
+ * 2) Control dependency inputs contain caret at the beginning and we
+ *    remove this and annotate the edge as a control dependency.
+ * @param inputs Array of unnormalized names of input nodes.
+ */
+function normalizeInputs(inputs: string[]): NormalizedInput[] {
+  let normalizedInputs: NormalizedInput[] = [];
+  _.each(inputs, inputName => {
+    let start = inputName[0] === '^';
+    let colon = inputName.lastIndexOf(':');
+    let end = colon !== -1 &&
+      inputName.length - colon > 1 &&
+      !(/\D/).test(inputName.substring(colon + 1)) ?
+      colon : inputName.length;
+    let name = inputName.substring(start ? 1 : 0, end);
+    if (normalizedInputs.length === 0 ||
+      name !== normalizedInputs[normalizedInputs.length - 1].name) {
+      normalizedInputs.push({
+        name: name,
+        outputTensorIndex:
+            end === inputName.length ? 0 : Number(inputName.slice(colon + 1)),
+        isControlDependency: start
+      });
+    }
+  });
+  return normalizedInputs;
+}
+
+function addEdgeToGraph(
+    graph: SlimGraph, inputName: string, outputNode: OpNode,
+    input: NormalizedInput, params: BuildParams, index: number) {
+  // Don't allow loops in the graph.
+  if (inputName === outputNode.name) {
+    return;
+  }
+  // Check if this op type and input number corresponds to a
+  // reference edge using the refEdges dictionary in the params.
+  let isRefEdge = params.refEdges[outputNode.op + ' ' + index] === true;
+  graph.edges.push({
+    v: inputName,
+    w: outputNode.name,
+    outputTensorIndex: input.outputTensorIndex,
+    isControlDependency: input.isControlDependency,
+    isReferenceEdge: isRefEdge
+  });
+}
+
+export function build(
+    rawNodes: tf.graph.proto.NodeDef[], params: BuildParams,
+    tracker: ProgressTracker): Promise<SlimGraph|void> {
+  /**
+   * A dictionary that maps each in-embedding node name to the node
+   * object.
+   */
+  let inEmbedding: {[nodeName: string]: OpNode} = {};
+  /**
+   * A dictionary that maps each out-embedding node name to the node
+   * object.
+   */
+  let outEmbedding: {[nodeName: string]: OpNode} = {};
+  /**
+   * A dictionary that maps each node name to an array of the node's
+   * out-embedding node label objects.
+   */
+  let outEmbeddings: {[inputName: string]: OpNode[]} = {};
+  let isInEmbeddedPred = getEmbedPredicate(params.inEmbeddingTypes);
+  let isOutEmbeddedPred = getEmbedPredicate(params.outEmbeddingTypes);
+  let embeddingNodeNames: string[] = [];
+  /**
+   * A list of all the non-embedding node names which appear in the processed
+   * list of raw nodes. Here we pre-allocate enough room for all the rawNodes,
+   * even though there will some number of embeddings. The excess array length
+   * is spliced off later.
+   *
+   * Experimentation shows that around 30% of the array will go unused, and
+   * even for very large networks that amounts to less than 10k spaces.
+   */
+  let nodeNames = new Array<string>(rawNodes.length);
+
+  return tf.graph.util
+      .runAsyncTask(
+          'Normalizing names', 30,
+          () => {
+            let opNodes = new Array<OpNode>(rawNodes.length);
+            let index = 0;
+            _.each(rawNodes, rawNode => {
+              let opNode = new OpNodeImpl(rawNode);
+              if (isInEmbeddedPred(opNode)) {
+                embeddingNodeNames.push(opNode.name);
+                inEmbedding[opNode.name] = opNode;
+                return;
+              }
+
+              if (isOutEmbeddedPred(opNode)) {
+                embeddingNodeNames.push(opNode.name);
+                outEmbedding[opNode.name] = opNode;
+                _.each(opNode.inputs, input => {
+                  let inputName = input.name;
+                  outEmbeddings[inputName] = outEmbeddings[inputName] || [];
+                  outEmbeddings[inputName].push(opNode);
+                });
+                return;
+              }
+              // The node is not an embedding, so add it to the names and nodes
+              // lists.
+              opNodes[index] = opNode;
+              nodeNames[index] = opNode.name;
+              index++;
+            });
+            opNodes.splice(index);
+            nodeNames.splice(index);
+            return opNodes;
+          },
+          tracker)
+      .then((opNodes) => {
+        // Create the graph data structure from the graphlib library.
+        return tf.graph.util.runAsyncTask(
+            'Building the data structure', 70, () => {
+              let normalizedNameDict =
+                  mapStrictHierarchy(nodeNames, embeddingNodeNames);
+              let graph = new SlimGraph;
+
+              // Add the nodes to the graph.
+              _.each(opNodes, opNode => {
+                let normalizedName =
+                    normalizedNameDict[opNode.name] || opNode.name;
+                graph.nodes[normalizedName] = opNode;
+                // Check if the node has out-embeddings. If yes, add them to the
+                // node.
+                if (opNode.name in outEmbeddings) {
+                  opNode.outEmbeddings = outEmbeddings[opNode.name];
+                  // Normalize the names of the out-embeddings.
+                  _.each(opNode.outEmbeddings, node => {
+                    node.name = normalizedNameDict[node.name] || node.name;
+                  });
+                }
+                // Update the name of the node.
+                opNode.name = normalizedName;
+              });
+
+              // Visit each node's inputs to add the edges to the graph. If the
+              // input
+              // is an in-embedding, then add it to the node's in-embeddings
+              // instead.
+              _.each(opNodes, opNode => {
+                _.each(opNode.inputs, (input, i) => {
+                  let inputName = input.name;
+                  if (inputName in inEmbedding) {
+                    let inEmbedNode = inEmbedding[inputName];
+                    opNode.inEmbeddings.push(inEmbedNode);
+                    // Move the inputs of the in-embedding node into incoming
+                    // edges of
+                    // the main node. E.g. the control dependency of a constant
+                    // node
+                    // should be moved to the op node where the constant is
+                    // embedded.
+                    for (let embedInput of inEmbedNode.inputs) {
+                      addEdgeToGraph(
+                          graph, normalizedNameDict[embedInput.name] ||
+                              embedInput.name,
+                          opNode, embedInput, params, i);
+                    }
+                  } else if (inputName in outEmbedding) {
+                    // Move the inputs of the out-embedding node into inputs of
+                    // the main node where the out-embedding points to.
+                    let outEmbedNode = outEmbedding[inputName];
+                    for (let embedInput of outEmbedNode.inputs) {
+                      addEdgeToGraph(
+                          graph, normalizedNameDict[embedInput.name] ||
+                              embedInput.name,
+                          opNode, input, params, i);
+                    }
+                  } else {
+                    addEdgeToGraph(
+                        graph, normalizedNameDict[inputName] || inputName,
+                        opNode, input, params, i);
+                  }
+                });
+              });
+
+              // Normalize the names of in-embeddings.
+              _.each(inEmbedding, (node, name) => {
+                node.name = normalizedNameDict[node.name] || node.name;
+              });
+
+              return graph;
+            }, tracker);
+      });
+};
+
+/**
+ * Create a new graphlib.Graph() instance with default parameters
+ */
+export function createGraph<N, E>(name: string, type, opt = {}):
+    graphlib.Graph<N, E> {
+  let graph = new graphlib.Graph<N, E>(opt);
+  graph.setGraph({
+    name: name,
+    rankdir: 'BT',  // BT,TB,LR,RL
+    type: type
+  });
+  return graph;
+};
+
+/**
+ * Create a predicate for checking whether a node should be embedded based on
+ * the specified types.
+ */
+function getEmbedPredicate(types: string[]) {
+  return function(node: OpNode) {
+    // check types
+    for (let i = 0; i < types.length; i++) {
+      let regExp = new RegExp(types[i]);
+      if (node.op.match(regExp)) { return true; }
+    }
+    return false;
+  };
+};
+
+/**
+ * Returns a strict node name (name => name/(name)) to avoid conflicts
+ * where the node name is also a namespace.
+ */
+export function getStrictName(name: string): string {
+  let parts = name.split(NAMESPACE_DELIM);
+  return name + NAMESPACE_DELIM + '(' + parts[parts.length - 1] + ')';
+}
+
+/**
+ * For each op node (embedding or non-embedding), rename it if there is a
+ * non-embedding node under its namespace. For example, assume node name 'A'.
+ * If there is a non-embedding node under its namespace (e.g. 'A/B'), 'A' will
+ * be renamed to 'A/(A)'. Then the namespace 'A' will contain 2 nodes: '(A)'
+ * and 'B'. If all the nodes under 'A' are embedding nodes (e.g. constant and
+ * summary), keep 'A' as an Op node and don't create a namespace.
+ *
+ * @param nodeNames An array of regular (non-embedding) node names.
+ * @param embeddingNodeNames An array of embedding node names.
+ * @return Dictionary object mapping names that need to be renamed to
+ *     new names.
+ */
+function mapStrictHierarchy(nodeNames: string[],
+    embeddingNodeNames: string[]): {[oldName: string]: string} {
+  /** Dictionary that maps the old new to the new name */
+  let newNameDictionary: {[oldName: string]: string} = {};
+  /** Set used to store all namespaces. */
+  let namespaceSet: {[namespace: string]: boolean} = {};
+  // sort the nodes to make prefix check faster
+  nodeNames.sort();
+  // look for nodes with a prefix a,a/b -> a/(a),a/b
+  for (let i = 0; i < nodeNames.length - 1; ++i) {
+    let a = nodeNames[i];
+    // Get all the parent namespaces of the current node
+    // and add them in the namespace set.
+    _.each(getHierarchicalPath(a).slice(0, -1), ns => {
+      namespaceSet[ns] = true;
+    });
+    for (let j = i + 1; j < nodeNames.length; ++j) {
+      let b = nodeNames[j];
+      if (_.startsWith(b, a)) {
+        if (b.length > a.length && b.charAt(a.length) === NAMESPACE_DELIM) {
+          newNameDictionary[a] = getStrictName(a);
+          break;
+        }
+      } else {
+        break;
+      }
+    }
+  }
+  // Go through all the embedding node names and rename them in case they
+  // collide with namespaces.
+  _.each(embeddingNodeNames, embeddingName => {
+    if (embeddingName in namespaceSet) {
+      // Rename to follow strict hierarchy.
+      newNameDictionary[embeddingName] = getStrictName(embeddingName);
+    }
+  });
+  return newNameDictionary;
+};
+
+/**
+ * Returns a list of the degrees of each node in the graph.
+ */
+function degreeSequence(graph: graphlib.Graph<any, any>): number[] {
+  let degrees = graph.nodes().map(function(name) {
+    return graph.neighbors(name).length;
+  });
+  degrees.sort();
+  return degrees;
+};
+
+/**
+ * Returns if the degree sequence of the two graphs is the same.
+ */
+export function hasSimilarDegreeSequence(graph1: graphlib.Graph<any, any>,
+    graph2: graphlib.Graph<any, any>): boolean {
+  let dg1 = degreeSequence(graph1);
+  let dg2 = degreeSequence(graph2);
+
+  for (let i = 0; i < dg1.length; i++) {
+    if (dg1[i] !== dg2[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
+/**
+ * Returns the hierarchical path of the current node, based on the node's name.
+ * For example, if the name is 'a/b/c', the returned path is
+ * ['a', 'a/b', 'a/b/c'].
+ */
+export function getHierarchicalPath(name: string,
+  seriesNames?: { [name: string]: string }): string[] {
+  let path: string[] = [];
+  let i = name.indexOf(NAMESPACE_DELIM);
+  // Push all parent portions of the path.
+  while (i >= 0) {
+    path.push(name.substring(0, i));
+    i = name.indexOf(NAMESPACE_DELIM, i + 1);
+  }
+  // If the node's path is under a series, then add the series node name to the
+  // hierarchical path as the parent of the leaf.
+  if (seriesNames) {
+    let seriesName = seriesNames[name];
+    if (seriesName) {
+      path.push(seriesName);
+    }
+  }
+  // Push the leaf of the path.
+  path.push(name);
+  return path;
+};
+
+/**
+ * Returns the string for the node inclusion toggle button, dependant
+ * on the provided current InclusionType.
+ */
+export function getIncludeNodeButtonString(include: InclusionType) {
+  if (include === tf.graph.InclusionType.EXCLUDE) {
+    return 'Add to main graph';
+  } else {
+    return 'Remove from main graph';
+  }
+};
+
+/**
+ * Returns the string for the series node grouping toggle button, dependant
+ * on the provided current SeriesGroupingType.
+ */
+export function getGroupSeriesNodeButtonString(group: SeriesGroupingType) {
+  if (group === tf.graph.SeriesGroupingType.GROUP) {
+    return 'Ungroup this series of nodes';
+  } else {
+    return 'Group this series of nodes';
+  }
+};
+
+/**
+ * Toggle the node series grouping option in the provided map, setting it
+ * to ungroup if the series is not already in the map.
+ */
+export function toggleNodeSeriesGroup(
+  map: { [name: string]: tf.graph.SeriesGroupingType }, name: string) {
+  if (!(name in map) || map[name] === tf.graph.SeriesGroupingType.GROUP) {
+    map[name] = tf.graph.SeriesGroupingType.UNGROUP;
+  } else {
+    map[name] = tf.graph.SeriesGroupingType.GROUP;
+  }
+};
+
+} // close module tf.graph
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/hierarchy.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/hierarchy.ts
new file mode 100644
index 0000000000..889607ac50
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/hierarchy.ts
@@ -0,0 +1,807 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+/**
+ * Package for the Graph Hierarchy for TensorFlow graph.
+ */
+module tf.graph.hierarchy {
+
+/**
+ * Class used as output for getPredecessors and getSuccessors methods
+ */
+export interface Edges {
+  control: Metaedge[];
+  regular: Metaedge[];
+}
+
+export interface Hierarchy {
+  root: Metanode;
+  templates: {[templateId: string]: string[]};
+  /** List of all device names */
+  devices: string[];
+  /** List of all XLA cluster names */
+  xlaClusters: string[];
+  /** True if at least one tensor in the graph has shape information */
+  hasShapeInfo: boolean;
+  /** The maximum size across all meta edges. Used for scaling thickness. */
+  maxMetaEdgeSize: number;
+  getNodeMap(): {[nodeName: string]: GroupNode|OpNode};
+  node(name: string): GroupNode|OpNode;
+  setNode(name: string, node: GroupNode|OpNode): void;
+  getBridgegraph(nodeName: string): graphlib.Graph<GroupNode|OpNode, Metaedge>;
+  getPredecessors(nodeName: string): Edges;
+  getSuccessors(nodeName: string): Edges;
+  getTopologicalOrdering(nodeName: string): { [childName: string]: number };
+  getTemplateIndex(): (string) => number;
+}
+
+/**
+ * Class for the Graph Hierarchy for TensorFlow graph.
+ */
+class HierarchyImpl implements Hierarchy {
+  root: Metanode;
+  templates: {[templateId: string]: string[]};
+  private index: {[nodeName: string]: GroupNode|OpNode};
+  devices: string[];
+  xlaClusters: string[];
+  hasShapeInfo = false;
+  maxMetaEdgeSize = 1;
+  orderings: { [nodeName: string]: { [childName: string]: number } };
+
+  constructor() {
+    this.root = createMetanode(ROOT_NAME, {compound: true});
+    this.templates = null;
+    this.devices = null;
+    /**
+     * @type {Object} Dictionary object that maps node name to the node
+     * (could be op-node, metanode, or series-node)
+     */
+    this.index = {};
+    this.index[ROOT_NAME] = this.root;
+    this.orderings = {};
+  }
+
+  getNodeMap(): {[nodeName: string]: GroupNode|OpNode} {
+    return this.index;
+  }
+
+  node(name: string): GroupNode|OpNode {
+    return this.index[name];
+  }
+
+  setNode(name: string, node: GroupNode|OpNode): void {
+    this.index[name] = node;
+  }
+
+  /**
+   * Given the name of a node in this hierarchy, get its bridgegraph, creating
+   * it on the fly if necessary. If the node is not a GroupNode, then this
+   * method returns null. If the provided name does not map to a node in the
+   * hierarchy, an error will be thrown.
+   */
+  getBridgegraph(nodeName: string): graphlib.Graph<GroupNode|OpNode, Metaedge> {
+    let node = this.index[nodeName];
+    if (!node) {
+      throw Error('Could not find node in hierarchy: ' + nodeName);
+    }
+    if (!('metagraph' in node)) {
+      return null;
+    }
+    let groupNode = <GroupNode> node;
+    if (groupNode.bridgegraph) {
+      return groupNode.bridgegraph;
+    }
+    let bridgegraph = groupNode.bridgegraph =
+        createGraph<GroupNode|OpNode, Metaedge>(
+            'BRIDGEGRAPH', GraphType.BRIDGE);
+    if (!node.parentNode || !('metagraph' in node.parentNode)) {
+      return bridgegraph;
+    }
+
+    let parentNode = <GroupNode>node.parentNode;
+    let parentMetagraph = parentNode.metagraph;
+    let parentBridgegraph = this.getBridgegraph(parentNode.name);
+
+    // For each of the parent node's two Metaedge containing graphs, process
+    // each Metaedge involving this node.
+    _.each([parentMetagraph, parentBridgegraph], parentGraph => {
+      _(parentGraph.edges())
+        .filter(e => e.v === nodeName || e.w === nodeName)
+        .each(parentEdgeObj => {
+
+          let inbound = parentEdgeObj.w === nodeName;
+          let parentMetaedge = parentGraph.edge(parentEdgeObj);
+
+          // The parent's Metaedge represents some number of underlying
+          // BaseEdges from the original full graph. For each of those, we need
+          // to determine which immediate child is involved and make sure
+          // there's a Metaedge in the bridgegraph that covers it.
+          _.each(parentMetaedge.baseEdgeList, baseEdge => {
+
+            // Based on the direction, figure out which is the descendant node
+            // and which is the 'other' node (sibling of parent or ancestor).
+            let [descendantName, otherName] =
+              inbound ?
+                [baseEdge.w, parentEdgeObj.v] :
+                [baseEdge.v, parentEdgeObj.w];
+
+            // Determine the immediate child containing this descendant node.
+            let childName = this.getChildName(nodeName, descendantName);
+
+            // Look for an existing Metaedge in the bridgegraph (or create a
+            // new one) that covers the relationship between child and other.
+            let bridgeEdgeObj = <graphlib.EdgeObject> {
+              v: inbound ? otherName : childName,
+              w: inbound ? childName : otherName,
+            };
+            let bridgeMetaedge = bridgegraph.edge(bridgeEdgeObj);
+            if (!bridgeMetaedge) {
+              bridgeMetaedge = createMetaedge(bridgeEdgeObj.v, bridgeEdgeObj.w);
+              bridgeMetaedge.inbound = inbound;
+              bridgegraph.setEdge(bridgeEdgeObj.v, bridgeEdgeObj.w,
+                  bridgeMetaedge);
+            }
+
+            // Copy the BaseEdge from the parent's Metaedge into this
+            // bridgegraph Metaedge.
+            bridgeMetaedge.addBaseEdge(baseEdge, this);
+          });
+        })
+        .value(); // force lodash chain execution.
+    });
+
+    return bridgegraph;
+  }
+
+  /**
+   * Utility function for determining the name of the immediate child under a
+   * node for a given descendant path. If the descendant corresponds to no
+   * immediate child, an error is thrown.
+   */
+  getChildName(nodeName: string, descendantName: string): string {
+    // Walk up the hierarchy from the descendant to find the child.
+    let currentNode: Node = this.index[descendantName];
+    while (currentNode) {
+      if (currentNode.parentNode && currentNode.parentNode.name === nodeName) {
+        return currentNode.name;
+      }
+      currentNode = currentNode.parentNode;
+    }
+    throw Error(
+        'Could not find immediate child for descendant: ' + descendantName);
+  };
+
+  /** Given the name of a node, return its incoming metaedges. */
+  getPredecessors(nodeName: string): Edges {
+    let node = this.index[nodeName];
+    if (!node) {
+      throw Error('Could not find node with name: ' + nodeName);
+    }
+
+    let predecessors = this.getOneWayEdges(node, true);
+    // Add embedded predecessors, such as constants.
+    if (!node.isGroupNode) {
+      _.each((<OpNode>node).inEmbeddings, embeddedNode => {
+        _.each((<OpNode>node).inputs, input => {
+          if (input.name === embeddedNode.name) {
+            // Make a new metaedge holding the edge between the
+            // node and the in-embedding.
+            let metaedge = new MetaedgeImpl(embeddedNode.name, nodeName);
+            metaedge.addBaseEdge(
+                {
+                  isControlDependency: input.isControlDependency,
+                  outputTensorIndex: input.outputTensorIndex,
+                  isReferenceEdge: false,
+                  v: embeddedNode.name,
+                  w: nodeName
+                },
+                this);
+            predecessors.regular.push(metaedge);
+          }
+        });
+      });
+    }
+    return predecessors;
+  }
+
+  /**
+   * Given the name of a node, return its outgoing metaedges.
+   *
+   * This is the inverse of getPredecessors(). See that method's documentation
+   * for an in-depth example.
+   */
+  getSuccessors(nodeName: string): Edges {
+    let node = this.index[nodeName];
+    if (!node) {
+      throw Error('Could not find node with name: ' + nodeName);
+    }
+
+    let successors = this.getOneWayEdges(node, false);
+
+    // Add embedded successors, such as summaries.
+    if (!node.isGroupNode) {
+      _.each((<OpNode>node).outEmbeddings, embeddedNode => {
+        _.each(embeddedNode.inputs, input => {
+          if (input.name === nodeName) {
+            // Make a new metaedge holding the edge between the
+            // node and the out-embedding.
+            let metaedge = new MetaedgeImpl(nodeName, embeddedNode.name);
+            metaedge.addBaseEdge(
+                {
+                  isControlDependency: input.isControlDependency,
+                  outputTensorIndex: input.outputTensorIndex,
+                  isReferenceEdge: false,
+                  v: nodeName,
+                  w: embeddedNode.name
+                },
+                this);
+            successors.regular.push(metaedge);
+          }
+        });
+      });
+    }
+    return successors;
+  }
+
+  /** Helper method for getPredecessors and getSuccessors */
+  getOneWayEdges(node: GroupNode|OpNode, inEdges: boolean) {
+    let edges: Edges = {control: [], regular: []};
+    // A node with no parent cannot have any edges.
+    if (!node.parentNode || !node.parentNode.isGroupNode) {
+      return edges;
+    }
+    let parentNode = <GroupNode> node.parentNode;
+    let metagraph = parentNode.metagraph;
+    let bridgegraph = this.getBridgegraph(parentNode.name);
+    findEdgeTargetsInGraph(metagraph, node, inEdges, edges);
+    findEdgeTargetsInGraph(bridgegraph, node, inEdges, edges);
+    return edges;
+  }
+
+  /**
+   * For a given GroupNode, get or calculate an object which describes a
+   * topological ordering of child nodes within that GroupNode's metagraph.
+   *
+   * This ordering is used when rendering bridge control edges which are
+   * sometimes backwards relative to the dataflow.
+   *
+   * For example, say we have a graph with two edges A->B and A->C, and we're
+   * interested in the ordering under ROOT. In this case, any of the following
+   * would be legitimate return values:
+   *
+   *  - { 'A': 0, 'B': 1, 'C': 2 } -- most likely
+   *  - { 'A': 0, 'B': 2, 'C': 1 } -- less likely
+   *  - { 'A': 12, 'B': 100, 'C': 99 } -- unlikely, but still OK
+   *
+   * The algorithm does not guarantee that all numbers from 0-N (where N is
+   * the number of nodes) appear exactly once. Rather it guarantees that if
+   * there is a path between two nodes, the earlier one will have a lower
+   * number in the ordering hash.
+   *
+   * When generating the ordering, we ignore control Metaedges (those which
+   * represent only BaseEdges that have isControlDependency set to true).
+   *
+   * If there is no node with the specified name, an error is thrown. If the
+   * node with the specified name is not a group node, null is returned.
+   */
+  getTopologicalOrdering(nodeName: string): { [childName: string]: number } {
+    let node = this.index[nodeName];
+    if (!node) {
+      throw Error('Could not find node with name: ' + nodeName);
+    }
+    if (!node.isGroupNode) {
+      return null;
+    }
+    if (nodeName in this.orderings) {
+      return this.orderings[nodeName];
+    }
+
+    // Mapping of a child node names to lists of their successors.
+    let successors: { [childName: string]: string[] } = {};
+
+    // Set of node names which have appeared as a destination.
+    let destinations: { [childName: string]: boolean } = {};
+
+    let metagraph = (<GroupNode> node).metagraph;
+    _.each(metagraph.edges(), (e: graphlib.EdgeObject) => {
+      if (!metagraph.edge(e).numRegularEdges) {
+        return; // Skip control edges.
+      }
+
+      // Keep track of successors and destinations.
+      if (!(e.v in successors)) {
+        successors[e.v] = [];
+      }
+      successors[e.v].push(e.w);
+      destinations[e.w] = true;
+    });
+
+    // Seed the queue with true sources (those that are not destinations).
+    let queue: string[] =
+      _.difference(_.keys(successors), _.keys(destinations));
+
+    // Produce an ordering by traversing the graph breadth first.
+    let ordering = this.orderings[nodeName] = {};
+    let index = 0;
+    while (queue.length) {
+      let childName = queue.shift();
+      ordering[childName] = index++;
+      _.each(successors[childName], succName => queue.push(succName));
+      delete successors[childName]; // Prevent cycles from infinite looping.
+    }
+    return ordering;
+  }
+
+  /**
+   * Returns a d3 Ordinal function that can be used to look up the index of
+   * a node based on its template id.
+   */
+  getTemplateIndex(): (string) => number {
+    let templateNames = d3.keys(this.templates);
+    let templateIndex = d3.scaleOrdinal()
+        .domain(templateNames)
+        .range(d3.range(0, templateNames.length));
+    return (templateId: string) => <number>templateIndex(templateId);
+  }
+}
+
+/**
+ * Internal utility function - given a graph (should be either a metagraph or a
+ * bridgegraph) and a node which is known to be in that graph, determine
+ * the other ends of edges that involve that node in the direction specified
+ * by whether it's inbound.
+ *
+ * For example if you wanted to find the predecessors of a node, you'd call
+ * this method for the parent's metagraph and bridgegraph, specifying inbound
+ * as true (look at the source of inbound edges to the specified node).
+ *
+ * Discovered target names are appended to the targets array.
+ */
+function findEdgeTargetsInGraph(
+    graph: graphlib.Graph<GroupNode|OpNode, Metaedge>,
+    node: Node, inbound: boolean, targets: Edges): void {
+  let edges = inbound ? graph.inEdges(node.name) : graph.outEdges(node.name);
+  _.each(edges, e => {
+    let metaedge = graph.edge(e);
+    let targetList =
+        metaedge.numRegularEdges ? targets.regular : targets.control;
+    targetList.push(metaedge);
+  });
+}
+
+export interface HierarchyParams {
+  verifyTemplate: boolean;
+  seriesNodeMinSize: number;
+  seriesMap: { [name: string]: tf.graph.SeriesGroupingType };
+}
+
+/**
+ * @param graph The raw graph.
+ * @param params Parameters used when building a hierarchy.
+ */
+export function build(graph: tf.graph.SlimGraph, params: HierarchyParams,
+    tracker: ProgressTracker): Promise<Hierarchy|void> {
+  let h = new HierarchyImpl();
+  let seriesNames: { [name: string]: string } = {};
+  return tf.graph.util
+      .runAsyncTask(
+          'Adding nodes', 20,
+          () => {
+            // Get all the possible device and XLA cluster names.
+            let deviceNames = {};
+            let xlaClusterNames = {};
+            _.each(graph.nodes, (node, nodeName) => {
+              if (node.device) {
+                deviceNames[node.device] = true;
+              }
+
+              if (node.xlaCluster) {
+                xlaClusterNames[node.xlaCluster] = true;
+              }
+            });
+
+            h.devices = _.keys(deviceNames);
+            h.xlaClusters = _.keys(xlaClusterNames);
+
+            addNodes(h, graph);
+          },
+          tracker)
+      .then(() => {
+        return tf.graph.util.runAsyncTask('Detect series', 20, () => {
+          if (params.seriesNodeMinSize > 0) {
+            groupSeries(
+                h.root, h, seriesNames, params.seriesNodeMinSize,
+                params.seriesMap);
+          }
+        }, tracker);
+      })
+      .then(() => {
+        return tf.graph.util.runAsyncTask('Adding edges', 30, () => {
+          addEdges(h, graph, seriesNames);
+        }, tracker);
+      })
+      .then(() => {
+        return tf.graph.util.runAsyncTask(
+            'Finding similar subgraphs', 30, () => {
+              h.templates = template.detect(h, params.verifyTemplate);
+            }, tracker);
+      })
+      .then(() => {
+        return h;
+      });
+};
+
+export function joinAndAggregateStats(
+    h: Hierarchy, stats: tf.graph.proto.StepStats) {
+  // Get all the possible device names.
+  let deviceNames = {};
+  _.each(h.root.leaves(), nodeName => {
+    let leaf = <OpNode> h.node(nodeName);
+    if (leaf.device != null) {
+      deviceNames[leaf.device] = true;
+    }
+  });
+  h.devices = _.keys(deviceNames);
+
+  // Reset stats for each group node.
+  _.each(h.getNodeMap(), (node, nodeName) => {
+    if (node.isGroupNode) {
+      node.stats = new NodeStats(null);
+      (<GroupNode>node).deviceHistogram = {};
+    }
+  });
+
+  // Bubble-up the stats and device distribution from leaves to parents.
+  _.each(h.root.leaves(), nodeName => {
+    let leaf = <OpNode> h.node(nodeName);
+    let node = <GroupNode|OpNode> leaf;
+    while (node.parentNode != null) {
+      if (leaf.device != null) {
+        let deviceHistogram = (<GroupNode>node.parentNode).deviceHistogram;
+        deviceHistogram[leaf.device] = (deviceHistogram[leaf.device] || 0) + 1;
+      }
+      if (leaf.stats != null) {
+        node.parentNode.stats.combine(leaf.stats);
+      }
+      node = <GroupNode> node.parentNode;
+    }
+  });
+}
+
+/**
+ * Creates the metanodes in the hierarchical graph and assigns parent-child
+ * relationship between them.
+ */
+function addNodes(h: Hierarchy, graph: SlimGraph) {
+  _.each(graph.nodes, (node, nodeName) => {
+    let path = getHierarchicalPath(node.name);
+    let parent: Metanode = h.root;
+
+    parent.depth = Math.max(path.length, parent.depth);
+
+    // Create parent metanodes for each depth. For example if the node name
+    // is 'a/b/c', then create metanodes 'a' and 'a/b', where 'a/b' is a child
+    // of a.
+    for (let i = 0; i < path.length; i++) {
+      parent.depth = Math.max(parent.depth, path.length - i);
+      parent.cardinality += node.cardinality;
+      parent.opHistogram[node.op] = (parent.opHistogram[node.op] || 0) + 1;
+      if (node.device != null) {
+        parent.deviceHistogram[node.device] =
+            (parent.deviceHistogram[node.device] || 0) + 1;
+      }
+      if (i === path.length - 1) { break; }
+      let name = path[i];
+      let child = <Metanode>h.node(name);
+      if (!child) {
+        child = createMetanode(name);
+        child.parentNode = parent;
+        h.setNode(name, child);
+        parent.metagraph.setNode(name, child);
+      }
+      parent = child;
+    }
+    // Assuming node name is 'a/b/c', assign the OpNode as a child of the
+    // metanode 'a/b'.
+    h.setNode(node.name, node);
+    node.parentNode = parent;
+    parent.metagraph.setNode(node.name, node);
+
+    // Add each of the in-embeddings and out-embeddings in the hierarchy.
+    _.each(node.inEmbeddings, function(embedding) {
+      h.setNode(embedding.name, embedding);
+      embedding.parentNode = node;
+    });
+    _.each(node.outEmbeddings, function(embedding) {
+      h.setNode(embedding.name, embedding);
+      embedding.parentNode = node;
+    });
+  });
+};
+
+/**
+ * For each metanode in the hierarchical graph, this method adds:
+ * the edges in the metagraph. These are edges between nodes
+ * that share the same parent.
+ */
+function addEdges(h: Hierarchy, graph: SlimGraph,
+    seriesNames: { [name: string]: string }) {
+
+  let nodeIndex = h.getNodeMap();
+
+  // Ancestor paths for the source and destination nodes of an edge. These are
+  // reused for each edge rather than allocating new ones. It's about 10% faster
+  // than allocating new ones on each pass through the loop.
+  let sourcePath: string[] = [];
+  let destPath: string[] = [];
+
+  // Insert the ancestor path for a node into the provided array, including the
+  // node itself. Return the index of the last node inserted (always ROOT).
+  let getPath = (node: Node, path: string[]): number => {
+    let i = 0;
+    while (node) {
+      path[i++] = node.name;
+      node = node.parentNode;
+    }
+    return i - 1;
+  };
+
+  _.each(graph.edges, baseEdge => {
+
+    // Get the hierarchical paths for the source and destination of the edge.
+    let sourceAncestorIndex = getPath(graph.nodes[baseEdge.v], sourcePath);
+    let destAncestorIndex = getPath(graph.nodes[baseEdge.w], destPath);
+
+    // If the hierarchical path cannot be found for either endpoint, then we
+    // cannot create the edge. This happens for example when a node has a
+    // control dependency on a summary node, which are embedded.
+    if (sourceAncestorIndex === -1 || destAncestorIndex === -1) {
+      return;
+    }
+
+    // Find the lowest shared ancestor between source and dest by looking for
+    // the highest nodes that differ between their ancestor paths.
+    while (sourcePath[sourceAncestorIndex] === destPath[destAncestorIndex]) {
+      sourceAncestorIndex--;
+      destAncestorIndex--;
+      if (sourceAncestorIndex < 0 || destAncestorIndex < 0) {
+        // This would only occur if the two nodes were the same (a cycle in the
+        // graph), or if one endpoint was a strict ancestor of the other. The
+        // latter shouldn't happen because we rename nodes which are both
+        // metanodes and op nodes. E.g. 'A/B' becomes 'A/B/(B)'.
+        throw Error('No difference found between ancestor paths.');
+      }
+    }
+
+    let sharedAncestorNode =
+      <GroupNode>nodeIndex[sourcePath[sourceAncestorIndex + 1]];
+    let sourceAncestorName = sourcePath[sourceAncestorIndex];
+    let destAncestorName = destPath[destAncestorIndex];
+
+    // Find or create the Metaedge which should contain this BaseEdge inside
+    // the shared ancestor.
+    let metaedge =
+      sharedAncestorNode.metagraph.edge(sourceAncestorName, destAncestorName);
+    if (!metaedge) {
+      metaedge = createMetaedge(sourceAncestorName, destAncestorName);
+      sharedAncestorNode.metagraph
+        .setEdge(sourceAncestorName, destAncestorName, metaedge);
+    }
+    if (!sharedAncestorNode.hasNonControlEdges &&
+        !baseEdge.isControlDependency) {
+      sharedAncestorNode.hasNonControlEdges = true;
+    }
+    metaedge.addBaseEdge(baseEdge, h);
+  });
+};
+
+/**
+ * Using the hierarchy template information, detect series in the provided
+ * metanode.  For each detected series, create a new SeriesNode
+ * and remove series members from the metanode's metagraph and move them to
+ * the new series node's metagraph.
+ *
+ * @param metanode
+ * @param hierarchy
+ * @param seriesNames Map of node names to their series they are contained in.
+ *     This should be provided empty and is populated by this method.
+ * @param threshold If the series has this many nodes or more, then group them
+ *     into a series.
+ * @param map Map of series names to their series grouping type, if one has
+ *     been set.
+ * @return A dictionary from node name to series node name that contains the
+ *     node.
+ */
+function groupSeries(metanode: Metanode, hierarchy: Hierarchy,
+    seriesNames: { [name: string]: string }, threshold: number,
+    map: { [name: string]: tf.graph.SeriesGroupingType }) {
+  let metagraph = metanode.metagraph;
+  _.each(metagraph.nodes(), n => {
+    let child = metagraph.node(n);
+    if (child.type === tf.graph.NodeType.META) {
+      groupSeries(<Metanode>child, hierarchy, seriesNames, threshold, map);
+    }
+  });
+
+  let clusters = clusterNodes(metagraph);
+  let seriesDict = detectSeries(clusters, metagraph);
+
+  // Add each series node to the graph and add its grouped children to its own
+  // metagraph.
+  _.each(seriesDict, function(seriesNode: SeriesNode, seriesName: string) {
+    let nodeMemberNames = seriesNode.metagraph.nodes();
+    _.each(nodeMemberNames, n => {
+      let child = <OpNode>metagraph.node(n);
+      if (!child.owningSeries) {
+        child.owningSeries = seriesName;
+      }
+    });
+    // If the series contains less than the threshold number of nodes and
+    // this series has not been adding to the series map, then set this
+    // series to be shown ungrouped in the map.
+    if (nodeMemberNames.length < threshold && !(seriesNode.name in map)) {
+      map[seriesNode.name] = tf.graph.SeriesGroupingType.UNGROUP;
+    }
+    // If the series is in the map as ungrouped then do not group the series.
+    if (seriesNode.name in map
+      && map[seriesNode.name] === tf.graph.SeriesGroupingType.UNGROUP) {
+      return;
+    }
+    hierarchy.setNode(seriesName, seriesNode); // add to the index
+    metagraph.setNode(seriesName, seriesNode);
+    _.each(nodeMemberNames, n => {
+      let child = <OpNode> metagraph.node(n);
+      seriesNode.metagraph.setNode(n, child);
+      seriesNode.parentNode = child.parentNode;
+      seriesNode.cardinality++;
+      if (child.device != null) {
+        seriesNode.deviceHistogram[child.device] =
+            (seriesNode.deviceHistogram[child.device] || 0) + 1;
+      }
+      child.parentNode = seriesNode;
+      seriesNames[n] = seriesName;
+      // Remove now-grouped node from its original parent's metagraph.
+      metagraph.removeNode(n);
+    });
+  });
+};
+
+/** cluster op-nodes with similar op */
+function clusterNodes(metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>):
+    {[clusterId: string]: string[]} {
+  let result: {[clusterId: string]: string[]} = {};
+  return  _.reduce(metagraph.nodes(),
+      (clusters: {[clusterId: string]: string[]}, n: string) => {
+    let child = metagraph.node(n);
+    if (child.type === NodeType.META) {
+      // skip metanodes
+      return clusters;
+    }
+    let template = (<OpNode>child).op;
+    if (template) {
+      clusters[template] = clusters[template] || [];
+      clusters[template].push(child.name);
+    }
+    return clusters;
+  }, result);
+}
+
+/**
+ * For each cluster of op-nodes based op type, try to detect groupings.
+ * Infer series name using by trying to find pattern '<number>' in the node
+ * name.
+ *
+ * @param clusters Dictionary output from clusterNodes().
+ * @param metagraph
+ * @return A dictionary from series name => seriesNode
+ */
+function detectSeries(clusters: {[clusterId: string]: string[]},
+     metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>):
+     {[seriesName: string]: SeriesNode} {
+  let seriesDict: {[seriesName: string]: SeriesNode} = {};
+  _.each(clusters, function(members, clusterId: string) {
+    if (members.length <= 1) { return; } // isolated clusters can't make series
+
+    /** @type {Object}  A dictionary mapping seriesName to seriesInfoArray,
+     * which is an array that contains objects with name, id, prefix, suffix,
+     * and parent properties.
+     */
+    let candidatesDict: {[seriesName: string]: SeriesNode[]} = {};
+
+    // Group all nodes that have the same name, with the exception of a
+    // number at the end of the name after an underscore, which is allowed to
+    // vary.
+    _.each(members, function(name: string) {
+      let isGroup = name.charAt(name.length - 1) === '*';
+      let namepath = name.split('/');
+      let leaf = namepath[namepath.length - 1];
+      let parent = namepath.slice(0, namepath.length - 1).join('/');
+      let matches = leaf.match(/^(\D*)_(\d+)$/);
+
+      let prefix;
+      let id;
+      let suffix = '';
+      if (matches) {         // if found '<number>' in the name, assign id.
+        prefix = matches[1]; // the front non-numeric characters
+        id = matches[2]; // the digits
+      } else {  // for node without '_<number>', make them zero-th items.
+        prefix = isGroup ? leaf.substr(0, leaf.length - 1) : leaf;
+        id = 0;
+        suffix = isGroup ? '*' : '';
+      }
+      let seriesName = getSeriesNodeName(prefix, suffix, parent);
+      candidatesDict[seriesName] = candidatesDict[seriesName] || [];
+      let seriesNode = createSeriesNode(prefix, suffix, parent, +id, name);
+      candidatesDict[seriesName].push(seriesNode);
+    });
+
+    // In each group of nodes, group nodes in bunches that have monotonically
+    // increasing numbers in their names.  Each of these bunches is a series.
+    _.each(candidatesDict, function(seriesInfoArray: SeriesNode[], seriesName) {
+      if (seriesInfoArray.length < 2) {
+        return;
+      }
+      seriesInfoArray.sort(function(a, b) {
+        return (+a.clusterId) - (+b.clusterId);
+      });
+
+      // Loop through the nodes sorted by its detected series number, grouping
+      // all nodes with monotonically-increasing series numbers.
+      let seriesNodes = [seriesInfoArray[0]];
+      for (let index = 1; index < seriesInfoArray.length; index++) {
+        let nextNode = seriesInfoArray[index];
+        if (nextNode.clusterId === seriesNodes[seriesNodes.length - 1].clusterId
+            + 1) {
+          seriesNodes.push(nextNode);
+          continue;
+        }
+        addSeriesToDict(seriesNodes, seriesDict, +clusterId, metagraph);
+        seriesNodes = [nextNode];
+      }
+      addSeriesToDict(seriesNodes, seriesDict, +clusterId, metagraph);
+    });
+  });
+  return seriesDict;
+}
+
+/**
+ * Add a series to the provided dictionary mapping series names to series.
+ *
+ * @param seriesNodes the nodes in the series. Contains
+ *     name, id, prefix, suffix and parent properties of the node.
+ * @param seriesDict the dictionary of series
+ * @param clusterId ID of the template of the nodes of the series
+ * @param metagraph
+ */
+function addSeriesToDict(seriesNodes: SeriesNode[],
+    seriesDict: {[seriesName: string]: SeriesNode},
+    clusterId: number,
+    metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>) {
+  if (seriesNodes.length > 1) {
+    let curSeriesName = getSeriesNodeName(
+      seriesNodes[0].prefix, seriesNodes[0].suffix,
+      seriesNodes[0].parent, seriesNodes[0].clusterId,
+      seriesNodes[seriesNodes.length - 1].clusterId);
+    let curSeriesNode = createSeriesNode(seriesNodes[0].prefix,
+      seriesNodes[0].suffix, seriesNodes[0].parent, clusterId,
+      curSeriesName);
+    _.each(seriesNodes, function(node) {
+      curSeriesNode.ids.push(node.clusterId);
+      curSeriesNode.metagraph.setNode(node.name, metagraph.node(node.name));
+    });
+    seriesDict[curSeriesName] = curSeriesNode;
+  }
+}
+
+} // close module tf.graph.hierarchy
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts
new file mode 100644
index 0000000000..11f41cfdd0
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts
@@ -0,0 +1,758 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph.layout {
+
+/** Set of parameters that define the look and feel of the graph. */
+export const PARAMS = {
+  animation: {
+    /** Default duration for graph animations in ms. */
+    duration: 250
+  },
+  graph: {
+    /** Graph parameter for metanode. */
+    meta: {
+      /**
+       * Dagre's nodesep param - number of pixels that
+       * separate nodes horizontally in the layout.
+       *
+       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
+       */
+      nodeSep: 5,
+      /**
+       * Dagre's ranksep param - number of pixels
+       * between each rank in the layout.
+       *
+       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
+       */
+      rankSep: 25,
+      /**
+       * Dagre's edgesep param - number of pixels that separate
+       * edges horizontally in the layout.
+       */
+      edgeSep: 5,
+    },
+    /** Graph parameter for metanode. */
+    series: {
+      /**
+       * Dagre's nodesep param - number of pixels that
+       * separate nodes horizontally in the layout.
+       *
+       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
+       */
+      nodeSep: 5,
+      /**
+       * Dagre's ranksep param - number of pixels
+       * between each rank in the layout.
+       *
+       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
+       */
+      rankSep: 25,
+      /**
+       * Dagre's edgesep param - number of pixels that separate
+       * edges horizontally in the layout.
+       */
+      edgeSep: 5
+    },
+    /**
+     * Padding is used to correctly position the graph SVG inside of its parent
+     * element. The padding amounts are applied using an SVG transform of X and
+     * Y coordinates.
+     */
+    padding: {paddingTop: 40, paddingLeft: 20}
+  },
+  subscene: {
+    meta: {
+      paddingTop: 10,
+      paddingBottom: 10,
+      paddingLeft: 10,
+      paddingRight: 10,
+      /**
+       * Used to leave room for the label on top of the highest node in
+       * the core graph.
+       */
+      labelHeight: 20,
+      /** X-space between each extracted node and the core graph. */
+      extractXOffset: 15,
+      /** Y-space between each extracted node. */
+      extractYOffset: 20
+    },
+    series: {
+      paddingTop: 10,
+      paddingBottom: 10,
+      paddingLeft: 10,
+      paddingRight: 10,
+      labelHeight: 10
+    }
+  },
+  nodeSize: {
+    /** Size of meta nodes. */
+    meta: {
+      radius: 5,
+      width: 60,
+      maxLabelWidth: 52,
+      /** A scale for the node's height based on number of nodes inside */
+      height: d3.scaleLinear().domain([1, 200]).range([15, 60]).clamp(true),
+      /** The radius of the circle denoting the expand button. */
+      expandButtonRadius: 3
+    },
+    /** Size of op nodes. */
+    op: {
+      width: 15,
+      height: 6,
+      radius: 3,  // for making annotation touching ellipse
+      labelOffset: -8,
+      maxLabelWidth: 30
+    },
+    /** Size of series nodes. */
+    series: {
+      expanded: {
+        // For expanded series nodes, width and height will be
+        // computed to account for the subscene.
+        radius: 10,
+        labelOffset: 0,
+      },
+      vertical: {
+        // When unexpanded, series whose underlying metagraphs contain
+        // one or more non-control edges will show as a vertical stack
+        // of ellipses.
+        width: 16,
+        height: 13,
+        labelOffset: -13,
+      },
+      horizontal: {
+        // When unexpanded, series whose underlying metagraphs contain
+        // no non-control edges will show as a horizontal stack of
+        // ellipses.
+        width: 24,
+        height: 8,
+        radius: 10,  // Forces annotations to center line.
+        labelOffset: -10,
+      },
+    },
+    /** Size of bridge nodes. */
+    bridge: {
+      // NOTE: bridge nodes will normally be invisible, but they must
+      // take up some space so that the layout step leaves room for
+      // their edges.
+      width: 20,
+      height: 20,
+      radius: 2,
+      labelOffset: 0
+    }
+  },
+  shortcutSize: {
+    /** Size of shortcuts for op nodes */
+    op: {width: 10, height: 4},
+    /** Size of shortcuts for meta nodes */
+    meta: {width: 12, height: 4, radius: 1},
+    /** Size of shortcuts for series nodes */
+    series: {
+      width: 14,
+      height: 4,
+    }
+  },
+  annotations: {
+    /** Maximum possible width of the bounding box for in annotations */
+    inboxWidth: 50,
+    /** Maximum possible width of the bounding box for out annotations */
+    outboxWidth: 50,
+    /** X-space between the shape and each annotation-node. */
+    xOffset: 10,
+    /** Y-space between each annotation-node. */
+    yOffset: 3,
+    /** X-space between each annotation-node and its label. */
+    labelOffset: 2,
+    /** Defines the max width for annotation label */
+    maxLabelWidth: 120
+  },
+  constant: {size: {width: 4, height: 4}},
+  series: {
+    /** Maximum number of repeated item for unexpanded series node. */
+    maxStackCount: 3,
+    /**
+     * Positioning offset ratio for collapsed stack
+     * of parallel series (series without edges between its members).
+     */
+    parallelStackOffsetRatio: 0.2,
+    /**
+     * Positioning offset ratio for collapsed stack
+     * of tower series (series with edges between its members).
+     */
+    towerStackOffsetRatio: 0.5
+  },
+  minimap: {
+    /** The maximum width/height the minimap can have. */
+    size: 150
+  }
+};
+
+/** Calculate layout for a scene of a group node. */
+export function layoutScene(renderNodeInfo: render.RenderGroupNodeInfo): void {
+  // Update layout, size, and annotations of its children nodes and edges.
+  if (renderNodeInfo.node.isGroupNode) {
+    layoutChildren(renderNodeInfo);
+  }
+
+  // Update position of its children nodes and edges
+  if (renderNodeInfo.node.type === NodeType.META) {
+    layoutMetanode(renderNodeInfo);
+  } else if (renderNodeInfo.node.type === NodeType.SERIES) {
+    layoutSeriesNode(renderNodeInfo);
+  }
+};
+
+/**
+ * Updates the total width of an unexpanded node which includes the size of its
+ * in and out annotations.
+ */
+function updateTotalWidthOfNode(renderInfo: render.RenderNodeInfo): void {
+  renderInfo.inboxWidth = renderInfo.inAnnotations.list.length > 0 ?
+      PARAMS.annotations.inboxWidth : 0;
+  renderInfo.outboxWidth = renderInfo.outAnnotations.list.length > 0 ?
+      PARAMS.annotations.outboxWidth : 0;
+  // Assign the width of the core box (the main shape of the node).
+  renderInfo.coreBox.width = renderInfo.width;
+  renderInfo.coreBox.height = renderInfo.height;
+  // TODO(jimbo): Account for font width rather than using a magic number.
+  let labelLength = renderInfo.node.name.length -
+      renderInfo.node.name.lastIndexOf(NAMESPACE_DELIM) - 1;
+  let charWidth = 3; // 3 pixels per character.
+  // Compute the total width of the node.
+  renderInfo.width = Math.max(renderInfo.coreBox.width +
+      renderInfo.inboxWidth + renderInfo.outboxWidth,
+      labelLength * charWidth);
+
+}
+
+/**
+ * Update layout, size, and annotations of its children nodes and edges.
+ */
+function layoutChildren(renderNodeInfo: render.RenderGroupNodeInfo): void {
+  let children = renderNodeInfo.coreGraph.nodes().map(n => {
+    return renderNodeInfo.coreGraph.node(n);
+  }).concat(renderNodeInfo.isolatedInExtract,
+      renderNodeInfo.isolatedOutExtract);
+
+  _.each(children, childNodeInfo => {
+    // Set size of each child
+    switch (childNodeInfo.node.type) {
+      case NodeType.OP:
+        _.extend(childNodeInfo, PARAMS.nodeSize.op);
+        break;
+      case NodeType.BRIDGE:
+        _.extend(childNodeInfo, PARAMS.nodeSize.bridge);
+        break;
+      case NodeType.META:
+        if (!childNodeInfo.expanded) {
+          // Set fixed width and scalable height based on cardinality
+          _.extend(childNodeInfo, PARAMS.nodeSize.meta);
+          childNodeInfo.height =
+              PARAMS.nodeSize.meta.height(childNodeInfo.node.cardinality);
+        } else {
+          let childGroupNodeInfo =
+            <render.RenderGroupNodeInfo>childNodeInfo;
+          layoutScene(childGroupNodeInfo); // Recursively layout its subscene.
+        }
+        break;
+      case NodeType.SERIES:
+        if (childNodeInfo.expanded) {
+          _.extend(childNodeInfo, PARAMS.nodeSize.series.expanded);
+          let childGroupNodeInfo =
+            <render.RenderGroupNodeInfo>childNodeInfo;
+          layoutScene(childGroupNodeInfo); // Recursively layout its subscene.
+        } else {
+          let childGroupNodeInfo =
+            <render.RenderGroupNodeInfo>childNodeInfo;
+          let seriesParams =
+            childGroupNodeInfo.node.hasNonControlEdges ?
+              PARAMS.nodeSize.series.vertical :
+              PARAMS.nodeSize.series.horizontal;
+          _.extend(childNodeInfo, seriesParams);
+        }
+        break;
+      default:
+        throw Error('Unrecognized node type: ' + childNodeInfo.node.type);
+    }
+    // Compute total width of un-expanded nodes. Width of expanded nodes
+    // has already been computed.
+    if (!childNodeInfo.expanded) {
+      updateTotalWidthOfNode(childNodeInfo);
+    }
+    // Layout each child's annotations
+    layoutAnnotation(childNodeInfo);
+  });
+}
+
+/**
+ * Calculate layout for a graph using dagre
+ * @param graph the graph to be laid out
+ * @param params layout parameters
+ * @return width and height of the core graph
+ */
+function dagreLayout(
+    graph: graphlib.Graph<render.RenderNodeInfo, render.RenderMetaedgeInfo>,
+    params): {height: number, width: number} {
+  _.extend(graph.graph(), {
+    nodesep: params.nodeSep,
+    ranksep: params.rankSep,
+    edgesep: params.edgeSep
+  });
+  let bridgeNodeNames = [];
+  let nonBridgeNodeNames = [];
+
+  // Split out nodes into bridge and non-bridge nodes, and calculate the total
+  // width we should use for bridge nodes.
+  _.each(graph.nodes(), nodeName => {
+    let nodeInfo = graph.node(nodeName);
+    if (nodeInfo.node.type === NodeType.BRIDGE) {
+      bridgeNodeNames.push(nodeName);
+    } else {
+      nonBridgeNodeNames.push(nodeName);
+    }
+  });
+
+  // If there are no non-bridge nodes, then the graph has zero size.
+  if (!nonBridgeNodeNames.length) {
+    return {
+      width: 0,
+      height: 0,
+    };
+  }
+  dagre.layout(graph);
+
+  // Calculate the true bounding box of the graph by iterating over nodes and
+  // edges rather than accepting dagre's word for it. In particular, we should
+  // ignore the extra-wide bridge nodes and bridge edges, and allow for
+  // annotation boxes and labels.
+  let minX = Infinity;
+  let minY = Infinity;
+  let maxX = -Infinity;
+  let maxY = -Infinity;
+  _.each(nonBridgeNodeNames, nodeName => {
+    let nodeInfo = graph.node(nodeName);
+    let w = 0.5 * nodeInfo.width;
+    let x1 = nodeInfo.x - w;
+    let x2 = nodeInfo.x + w;
+    minX = x1 < minX ? x1 : minX;
+    maxX = x2 > maxX ? x2 : maxX;
+    // TODO(jimbo): Account for the height of labels above op nodes here.
+    let h = 0.5 * nodeInfo.height;
+    let y1 = nodeInfo.y - h;
+    let y2 = nodeInfo.y + h;
+    minY = y1 < minY ? y1 : minY;
+    maxY = y2 > maxY ? y2 : maxY;
+  });
+  _.each(graph.edges(), edgeObj => {
+    let edgeInfo = graph.edge(edgeObj);
+    if (edgeInfo.structural) {
+      return; // Skip structural edges from min/max calculations.
+    }
+
+    // Since the node size passed to dagre includes the in and out
+    // annotations, the endpoints of the edge produced by dagre may not
+    // point to the actual node shape (rectangle, ellipse). We correct the
+    // end-points by finding the intersection of a line between the
+    // next-to-last (next-to-first) point and the destination (source)
+    // rectangle.
+    let sourceNode = graph.node(edgeInfo.metaedge.v);
+    let destNode = graph.node(edgeInfo.metaedge.w);
+
+    // Straight 3-points edges are special case, since they are curved after
+    // our default correction. To keep them straight, we remove the mid point
+    // and correct the first and the last point to be the center of the
+    // source and destination node respectively.
+    if (edgeInfo.points.length === 3 && isStraightLine(edgeInfo.points)) {
+      if (sourceNode != null) {
+        let cxSource = sourceNode.expanded ?
+            sourceNode.x : computeCXPositionOfNodeShape(sourceNode);
+        edgeInfo.points[0].x = cxSource;
+      }
+      if (destNode != null) {
+        let cxDest = destNode.expanded ?
+            destNode.x : computeCXPositionOfNodeShape(destNode);
+        edgeInfo.points[2].x = cxDest;
+      }
+      // Remove the middle point so the edge doesn't curve.
+      edgeInfo.points = [edgeInfo.points[0], edgeInfo.points[1]];
+    }
+    // Correct the destination endpoint of the edge.
+    let nextToLastPoint = edgeInfo.points[edgeInfo.points.length - 2];
+    // The destination node might be null if this is a bridge edge.
+    if (destNode != null) {
+      edgeInfo.points[edgeInfo.points.length - 1] =
+          intersectPointAndNode(nextToLastPoint, destNode);
+    }
+    // Correct the source endpoint of the edge.
+    let secondPoint = edgeInfo.points[1];
+    // The source might be null if this is a bridge edge.
+    if (sourceNode != null) {
+      edgeInfo.points[0] = intersectPointAndNode(secondPoint, sourceNode);
+    }
+
+    _.each(edgeInfo.points, (point: render.Point) => {
+        minX = point.x < minX ? point.x : minX;
+        maxX = point.x > maxX ? point.x : maxX;
+        minY = point.y < minY ? point.y : minY;
+        maxY = point.y > maxY ? point.y : maxY;
+      });
+  });
+
+  // Shift all nodes and edge points to account for the left-padding amount,
+  // and the invisible bridge nodes.
+  _.each(graph.nodes(), nodeName => {
+    let nodeInfo = graph.node(nodeName);
+    nodeInfo.x -= minX;
+    nodeInfo.y -= minY;
+  });
+  _.each(graph.edges(), edgeObj => {
+    _.each(graph.edge(edgeObj).points, (point: render.Point) => {
+        point.x -= minX;
+        point.y -= minY;
+      });
+  });
+
+  return {
+    width: maxX - minX,
+    height: maxY - minY
+  };
+}
+
+/** Layout a metanode. Only called for an expanded node. */
+function layoutMetanode(renderNodeInfo: render.RenderGroupNodeInfo): void {
+  // First, copy params specific to meta nodes onto this render info object.
+  let params = PARAMS.subscene.meta;
+  _.extend(renderNodeInfo, params);
+  // Invoke dagre.layout() on the core graph and record the bounding box
+  // dimensions.
+  _.extend(renderNodeInfo.coreBox,
+      dagreLayout(renderNodeInfo.coreGraph, PARAMS.graph.meta));
+
+  // Calculate the position of nodes in isolatedInExtract relative to the
+  // top-left corner of inExtractBox (the bounding box for all inExtract nodes)
+  // and calculate the size of the inExtractBox.
+  let maxInExtractWidth = _.max(renderNodeInfo.isolatedInExtract,
+      renderNode => renderNode.width).width;
+  renderNodeInfo.inExtractBox.width = maxInExtractWidth != null ?
+      maxInExtractWidth : 0;
+
+  renderNodeInfo.inExtractBox.height =
+    _.reduce(renderNodeInfo.isolatedInExtract, (height, child, i) => {
+      let yOffset = i > 0 ? params.extractYOffset : 0;
+      // use width/height here to avoid overlaps between extracts
+      child.x = 0;
+      child.y = height + yOffset + child.height / 2;
+      return height + yOffset + child.height;
+    }, 0);
+
+  // Calculate the position of nodes in isolatedOutExtract relative to the
+  // top-left corner of outExtractBox (the bounding box for all outExtract
+  // nodes) and calculate the size of the outExtractBox.
+  let maxOutExtractWidth = _.max(renderNodeInfo.isolatedOutExtract,
+      renderNode => renderNode.width).width;
+  renderNodeInfo.outExtractBox.width = maxOutExtractWidth != null ?
+      maxOutExtractWidth : 0;
+
+  renderNodeInfo.outExtractBox.height =
+    _.reduce(renderNodeInfo.isolatedOutExtract, (height, child, i) => {
+      let yOffset = i > 0 ? params.extractYOffset : 0;
+      // use width/height here to avoid overlaps between extracts
+      child.x = 0;
+      child.y = height + yOffset + child.height / 2;
+      return height + yOffset + child.height;
+    }, 0);
+
+  // Compute the total padding between the core graph, in-extract and
+  // out-extract boxes.
+  let numParts = 0;
+  if (renderNodeInfo.isolatedInExtract.length > 0) {
+    numParts++;
+  }
+  if (renderNodeInfo.isolatedOutExtract.length > 0) {
+    numParts++;
+  }
+  if (renderNodeInfo.coreGraph.nodeCount() > 0) {
+    numParts++;
+  }
+  let offset = PARAMS.subscene.meta.extractXOffset;
+  let padding = numParts <= 1 ? 0 : (numParts  <= 2 ? offset : 2 * offset);
+
+  // Add the in-extract and out-extract width to the core box width.
+  renderNodeInfo.coreBox.width += renderNodeInfo.inExtractBox.width +
+      renderNodeInfo.outExtractBox.width + padding;
+  renderNodeInfo.coreBox.height =
+    params.labelHeight +
+    Math.max(
+      renderNodeInfo.inExtractBox.height,
+      renderNodeInfo.coreBox.height,
+      renderNodeInfo.outExtractBox.height
+  );
+  // Determine the whole metanode's width (from left to right).
+  renderNodeInfo.width = renderNodeInfo.coreBox.width +
+      params.paddingLeft + params.paddingRight;
+
+  // Determine the whole metanode's height (from top to bottom).
+  renderNodeInfo.height =
+      renderNodeInfo.paddingTop +
+      renderNodeInfo.coreBox.height +
+      renderNodeInfo.paddingBottom;
+}
+
+/**
+ * Calculate layout for series node's core graph. Only called for an expanded
+ * series.
+ */
+function layoutSeriesNode(node: render.RenderGroupNodeInfo): void {
+  let graph = node.coreGraph;
+
+  let params = PARAMS.subscene.series;
+  _.extend(node, params);
+
+  // Layout the core.
+  _.extend(node.coreBox, dagreLayout(node.coreGraph, PARAMS.graph.series));
+
+  _.each(graph.nodes(), nodeName => {
+    graph.node(nodeName).excluded = false;
+  });
+
+  // Series do not have in/outExtractBox so no need to include them here.
+  node.width = node.coreBox.width + params.paddingLeft + params.paddingRight;
+  node.height = node.coreBox.height + params.paddingTop + params.paddingBottom;
+}
+
+/**
+ * Calculate layout for annotations of a given node.
+ * This will modify positions of the given node and its annotations.
+ *
+ * @see tf.graph.render.Node and tf.graph.render.Annotation
+ * for description of each property of each render node.
+ *
+ */
+function layoutAnnotation(renderNodeInfo: render.RenderNodeInfo): void {
+  // If the render node is an expanded metanode, then its annotations will not
+  // be visible and we should skip the annotation calculations.
+  if (renderNodeInfo.expanded) {
+    return;
+  }
+
+  let inAnnotations = renderNodeInfo.inAnnotations.list;
+  let outAnnotations = renderNodeInfo.outAnnotations.list;
+
+  // Calculate size for in-annotations
+  _.each(inAnnotations, a => sizeAnnotation(a));
+
+  // Calculate size for out-annotations
+  _.each(outAnnotations, a => sizeAnnotation(a));
+
+  let params = PARAMS.annotations;
+
+  // Calculate annotation node position (a.dx, a.dy)
+  // and total height for in-annotations
+  // After this chunk of code:
+  // inboxHeight = sum of annotation heights+ (annotation.length - 1 * yOffset)
+  let inboxHeight = _.reduce(inAnnotations,
+      (height, a, i) => {
+        let yOffset = i > 0 ? params.yOffset : 0;
+        a.dx = -(renderNodeInfo.coreBox.width + a.width) / 2 - params.xOffset;
+        a.dy = height + yOffset + a.height / 2;
+        return height + yOffset + a.height;
+      }, 0);
+
+  _.each(inAnnotations, a => {
+    a.dy -= inboxHeight / 2;
+
+    a.labelOffset = params.labelOffset;
+  });
+
+  // Calculate annotation node position (a.dx, a.dy)
+  // and total height for out-annotations
+  // After this chunk of code:
+  // outboxHeight = sum of annotation heights +
+  //                (annotation.length - 1 * yOffset)
+  let outboxHeight = _.reduce(outAnnotations,
+      (height, a, i) => {
+        let yOffset = i > 0 ? params.yOffset : 0;
+        a.dx = (renderNodeInfo.coreBox.width + a.width) / 2 + params.xOffset;
+        a.dy = height + yOffset + a.height / 2;
+        return height + yOffset + a.height;
+      }, 0);
+
+  _.each(outAnnotations, a => {
+    // adjust by (half of ) the total height
+    // so dy is relative to the host node's center.
+    a.dy -= outboxHeight / 2;
+
+    a.labelOffset = params.labelOffset;
+  });
+
+  // Creating scales for touch point between the in-annotation edges
+  // and their hosts.
+
+  let inTouchHeight =
+      Math.min(renderNodeInfo.height / 2 - renderNodeInfo.radius,
+          inboxHeight / 2);
+  inTouchHeight = inTouchHeight < 0 ? 0 : inTouchHeight;
+
+  let inY = d3.scaleLinear()
+    .domain([0, inAnnotations.length - 1])
+    .range([-inTouchHeight, inTouchHeight]);
+
+  // Calculate annotation edge position
+  _.each(inAnnotations, (a, i) => {
+    a.points = [
+      // The annotation node end
+      {
+        dx: a.dx + a.width / 2,
+        dy: a.dy
+      },
+
+      // The host node end
+      {
+        dx: - renderNodeInfo.coreBox.width / 2,
+        // only use scale if there are more than one,
+        // otherwise center it vertically
+        dy: inAnnotations.length > 1 ? inY(i) : 0
+      }
+    ];
+  });
+
+  // Creating scales for touch point between the out-annotation edges
+  // and their hosts.
+  let outTouchHeight =
+      Math.min(renderNodeInfo.height / 2 - renderNodeInfo.radius,
+          outboxHeight / 2);
+  outTouchHeight = outTouchHeight < 0 ? 0 : outTouchHeight;
+  let outY = d3.scaleLinear()
+    .domain([0, outAnnotations.length - 1])
+    .range([-outTouchHeight, outTouchHeight]);
+
+  _.each(outAnnotations, (a, i) => {
+    // Add point from the border of the annotation node
+    a.points = [
+      // The host node end
+      {
+        dx: renderNodeInfo.coreBox.width / 2,
+        // only use scale if there are more than one,
+        // otherwise center it vertically
+        dy: outAnnotations.length > 1 ? outY(i) : 0
+      },
+      // The annotation node end
+      {
+        dx: a.dx - a.width / 2,
+        dy: a.dy
+      }
+    ];
+  });
+
+  renderNodeInfo.height =
+      Math.max(renderNodeInfo.height, inboxHeight, outboxHeight);
+}
+
+/**
+ * Set size of an annotation node.
+ */
+function sizeAnnotation(a: render.Annotation): void {
+  switch (a.annotationType) {
+    case render.AnnotationType.CONSTANT:
+      _.extend(a, PARAMS.constant.size);
+      break;
+    case render.AnnotationType.SHORTCUT:
+      if (a.node.type === NodeType.OP) {
+        _.extend(a, PARAMS.shortcutSize.op);
+      } else if (a.node.type === NodeType.META) {
+        _.extend(a, PARAMS.shortcutSize.meta);
+      } else if (a.node.type === NodeType.SERIES) {
+        _.extend(a, PARAMS.shortcutSize.series);
+      } else {
+        throw Error('Invalid node type: ' + a.node.type);
+      }
+      break;
+    case render.AnnotationType.SUMMARY:
+      _.extend(a, PARAMS.constant.size);
+      break;
+  }
+}
+
+/**
+ * Determines the center position of the node's shape. The position depends
+ * on if the node has in and out-annotations.
+ */
+export function computeCXPositionOfNodeShape(renderInfo: render.RenderNodeInfo):
+    number {
+  if (renderInfo.expanded) {
+    return renderInfo.x;
+  }
+  let dx = renderInfo.inAnnotations.list.length ? renderInfo.inboxWidth : 0;
+  return renderInfo.x - renderInfo.width / 2 + dx +
+      renderInfo.coreBox.width / 2;
+}
+
+/** Returns the angle (in degrees) between two points. */
+function angleBetweenTwoPoints(a: render.Point, b: render.Point): number {
+  let dx = b.x - a.x;
+  let dy = b.y - a.y;
+  return 180 * Math.atan(dy / dx) / Math.PI;
+}
+
+/**
+ * Returns if a line going through the specified points is a straight line.
+ */
+function isStraightLine(points: render.Point[]) {
+  let angle = angleBetweenTwoPoints(points[0], points[1]);
+  for (let i = 1; i < points.length - 1; i++) {
+    let newAngle = angleBetweenTwoPoints(points[i], points[i + 1]);
+    // Have a tolerance of 1 degree.
+    if (Math.abs(newAngle - angle) > 1) {
+      return false;
+    }
+    angle = newAngle;
+  }
+  return true;
+}
+
+/**
+ * Returns the intersection of a line between the provided point
+ * and the provided rectangle.
+ */
+function intersectPointAndNode(
+    point: render.Point, node: render.RenderNodeInfo): render.Point {
+  // cx and cy are the center of the rectangle.
+  let cx = node.expanded ?
+     node.x : computeCXPositionOfNodeShape(node);
+  let cy = node.y;
+  // Calculate the slope
+  let dx = point.x - cx;
+  let dy = point.y - cy;
+  let w = node.expanded ? node.width : node.coreBox.width;
+  let h = node.expanded ? node.height : node.coreBox.height;
+  let deltaX, deltaY;
+  if (Math.abs(dy) * w / 2  > Math.abs(dx) * h / 2) {
+    // The intersection is above or below the rectangle.
+    if (dy < 0) {
+      h = -h;
+    }
+    deltaX = dy === 0 ? 0 : h / 2 * dx / dy;
+    deltaY = h / 2;
+  } else {
+    // The intersection is left or right of the rectangle.
+    if (dx < 0) {
+      w = -w;
+    }
+    deltaX = w / 2;
+    deltaY = dx === 0 ? 0 : w / 2 * dy / dx;
+  }
+  return {x: cx + deltaX, y: cy + deltaY};
+}
+
+} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts
new file mode 100644
index 0000000000..9a07323a1d
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts
@@ -0,0 +1,327 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.scene {
+
+/** Show minimap when the viewpoint area is less than X% of the whole area. */
+const FRAC_VIEWPOINT_AREA: number = 0.8;
+
+export class Minimap {
+  /** The minimap container. */
+  private minimap: HTMLElement;
+  /** The canvas used for drawing the mini version of the svg. */
+  private canvas: HTMLCanvasElement;
+  /** A buffer canvas used for temporary drawing to avoid flickering. */
+  private canvasBuffer: HTMLCanvasElement;
+  private download: HTMLLinkElement;
+  private downloadCanvas: HTMLCanvasElement;
+
+  /** The minimap svg used for holding the viewpoint rectangle. */
+  private minimapSvg: SVGSVGElement;
+  /** The rectangle showing the current viewpoint. */
+  private viewpoint: SVGRectElement;
+  /**
+   * The scale factor for the minimap. The factor is determined automatically
+   * so that the minimap doesn't violate the maximum width/height specified
+   * in the constructor. The minimap maintains the same aspect ratio as the
+   * original svg.
+   */
+  private scaleMinimap: number;
+  /** The main svg element. */
+  private svg: SVGSVGElement;
+  /** The svg group used for panning and zooming the main svg. */
+  private zoomG: SVGGElement;
+  /** The zoom behavior of the main svg. */
+  private mainZoom: d3.ZoomBehavior<any, any>;
+  /** The maximum width and height for the minimap. */
+  private maxWandH: number;
+  /** The last translation vector used in the main svg. */
+  private translate: [number, number];
+  /** The last scaling factor used in the main svg. */
+  private scaleMain: number;
+  /** The coordinates of the viewpoint rectangle. */
+  private viewpointCoord: {x: number, y: number};
+  /** The current size of the minimap */
+  private minimapSize: {width: number, height: number};
+  /** Padding (px) due to the main labels of the graph. */
+  private labelPadding: number;
+  /**
+   * Constructs a new minimap.
+   *
+   * @param svg The main svg element.
+   * @param zoomG The svg group used for panning and zooming the main svg.
+   * @param mainZoom The main zoom behavior.
+   * @param minimap The minimap container.
+   * @param maxWandH The maximum width/height for the minimap.
+   * @param labelPadding Padding in pixels due to the main graph labels.
+   */
+  constructor(svg: SVGSVGElement, zoomG: SVGGElement,
+      mainZoom: d3.ZoomBehavior<any, any>, minimap: HTMLElement,
+      maxWandH: number, labelPadding: number) {
+    this.svg = svg;
+    this.labelPadding = labelPadding;
+    this.zoomG = zoomG;
+    this.mainZoom = mainZoom;
+    this.maxWandH = maxWandH;
+    let $minimap = d3.select(minimap);
+    // The minimap will have 2 main components: the canvas showing the content
+    // and an svg showing a rectangle of the currently zoomed/panned viewpoint.
+    let $minimapSvg = $minimap.select('svg');
+
+    // Make the viewpoint rectangle draggable.
+    let $viewpoint = $minimapSvg.select('rect');
+    let dragmove = (d) => {
+      this.viewpointCoord.x = (<DragEvent>d3.event).x;
+      this.viewpointCoord.y = (<DragEvent>d3.event).y;
+      this.updateViewpoint();
+    };
+    this.viewpointCoord = {x: 0, y: 0};
+    let drag = d3.drag().subject(Object).on('drag', dragmove);
+    $viewpoint.datum(this.viewpointCoord as any).call(drag);
+
+    // Make the minimap clickable.
+    $minimapSvg.on('click', () => {
+      if ((<Event>d3.event).defaultPrevented) {
+        // This click was part of a drag event, so suppress it.
+        return;
+      }
+      // Update the coordinates of the viewpoint.
+      let width = Number($viewpoint.attr('width'));
+      let height = Number($viewpoint.attr('height'));
+      let clickCoords = d3.mouse($minimapSvg.node() as any);
+      this.viewpointCoord.x = clickCoords[0] - width / 2;
+      this.viewpointCoord.y = clickCoords[1] - height / 2;
+      this.updateViewpoint();
+    });
+    this.viewpoint = <SVGRectElement>$viewpoint.node();
+    this.minimapSvg = <SVGSVGElement>$minimapSvg.node();
+    this.minimap = minimap;
+    this.canvas = <HTMLCanvasElement>$minimap.select('canvas.first').node();
+    this.canvasBuffer =
+        <HTMLCanvasElement>$minimap.select('canvas.second').node();
+    this.downloadCanvas =
+        <HTMLCanvasElement>$minimap.select('canvas.download').node();
+    d3.select(this.downloadCanvas).style('display', 'none');
+    this.update();
+  }
+
+  /**
+   * Updates the position and the size of the viewpoint rectangle.
+   * It also notifies the main svg about the new panned position.
+   */
+  private updateViewpoint(): void {
+    // Update the coordinates of the viewpoint rectangle.
+    d3.select(this.viewpoint)
+        .attr('x', this.viewpointCoord.x)
+        .attr('y', this.viewpointCoord.y);
+    // Update the translation vector of the main svg to reflect the
+    // new viewpoint.
+    let mainX = - this.viewpointCoord.x * this.scaleMain / this.scaleMinimap;
+    let mainY = - this.viewpointCoord.y * this.scaleMain / this.scaleMinimap;
+    this.mainZoom.translateBy(d3.select(this.zoomG), mainX, mainY);
+
+  }
+
+  /**
+   * Redraws the minimap. Should be called whenever the main svg
+   * was updated (e.g. when a node was expanded).
+   */
+  update(): void {
+    let sceneSize = null;
+    try {
+      // Get the size of the entire scene.
+      sceneSize = this.zoomG.getBBox();
+      if (sceneSize.width === 0) {
+        // There is no scene anymore. We have been detached from the dom.
+        return;
+      }
+    } catch (e) {
+      // Firefox produced NS_ERROR_FAILURE if we have been
+      // detached from the dom.
+      return;
+    }
+    let $download = d3.select('#graphdownload');
+    this.download = <HTMLLinkElement>$download.node();
+    $download.on('click', d => {
+      this.download.href = this.downloadCanvas.toDataURL('image/png');
+    });
+
+    let $svg = d3.select(this.svg);
+    // Read all the style rules in the document and embed them into the svg.
+    // The svg needs to be self contained, i.e. all the style rules need to be
+    // embedded so the canvas output matches the origin.
+    let stylesText = '';
+    for (let k = 0; k < document.styleSheets.length; k++) {
+      try {
+        let cssRules = (<any>document.styleSheets[k]).cssRules ||
+          (<any>document.styleSheets[k]).rules;
+        if (cssRules == null) {
+          continue;
+        }
+        for (let i = 0; i < cssRules.length; i++) {
+          // Remove tf-* selectors from the styles.
+          stylesText +=
+              cssRules[i].cssText.replace(/ ?tf-[\w-]+ ?/g, '') + '\n';
+        }
+      } catch (e) {
+        if (e.name !== 'SecurityError') {
+          throw e;
+        }
+      }
+    }
+
+    // Temporarily add the css rules to the main svg.
+    let svgStyle = $svg.append('style');
+    svgStyle.text(stylesText);
+
+    // Temporarily remove the zoom/pan transform from the main svg since we
+    // want the minimap to show a zoomed-out and centered view.
+    let $zoomG = d3.select(this.zoomG);
+    let zoomTransform = $zoomG.attr('transform');
+    $zoomG.attr('transform', null);
+
+    // Since we add padding, account for that here.
+    sceneSize.height += this.labelPadding * 2;
+    sceneSize.width += this.labelPadding * 2;
+
+    // Temporarily assign an explicit width/height to the main svg, since
+    // it doesn't have one (uses flex-box), but we need it for the canvas
+    // to work.
+    $svg
+      .attr('width', sceneSize.width)
+      .attr('height', sceneSize.height);
+
+    // Since the content inside the svg changed (e.g. a node was expanded),
+    // the aspect ratio have also changed. Thus, we need to update the scale
+    // factor of the minimap. The scale factor is determined such that both
+    // the width and height of the minimap are <= maximum specified w/h.
+    this.scaleMinimap =
+        this.maxWandH / Math.max(sceneSize.width, sceneSize.height);
+
+    this.minimapSize = {
+      width: sceneSize.width * this.scaleMinimap,
+      height: sceneSize.height * this.scaleMinimap
+    };
+
+    // Update the size of the minimap's svg, the buffer canvas and the
+    // viewpoint rect.
+    d3.select(this.minimapSvg).attr(<any>this.minimapSize);
+    d3.select(this.canvasBuffer).attr(<any>this.minimapSize);
+
+    // Download canvas width and height are multiples of the style width and
+    // height in order to increase pixel density of the PNG for clarity.
+    d3.select(this.downloadCanvas).style(
+      <any>{ width: sceneSize.width, height: sceneSize.height });
+    d3.select(this.downloadCanvas).attr(
+      <any>{ width: sceneSize.width * 3, height: sceneSize.height * 3 });
+
+    if (this.translate != null && this.zoom != null) {
+      // Update the viewpoint rectangle shape since the aspect ratio of the
+      // map has changed.
+      requestAnimationFrame(() => this.zoom());
+    }
+
+    // Serialize the main svg to a string which will be used as the rendering
+    // content for the canvas.
+    let svgXml = (new XMLSerializer()).serializeToString(this.svg);
+
+    // Now that the svg is serialized for rendering, remove the temporarily
+    // assigned styles, explicit width and height and bring back the pan/zoom
+    // transform.
+    svgStyle.remove();
+    $svg.attr('width', null).attr('height', null);
+
+    $zoomG.attr('transform', zoomTransform);
+    let image = new Image();
+    image.onload = () => {
+      // Draw the svg content onto the buffer canvas.
+      let context = this.canvasBuffer.getContext('2d');
+      context.clearRect(0, 0, this.canvasBuffer.width,
+          this.canvasBuffer.height);
+      context.drawImage(image, 0, 0,
+        this.minimapSize.width, this.minimapSize.height);
+      requestAnimationFrame(() => {
+        // Hide the old canvas and show the new buffer canvas.
+        d3.select(this.canvasBuffer).style('display', null);
+        d3.select(this.canvas).style('display', 'none');
+        // Swap the two canvases.
+        [this.canvas, this.canvasBuffer] = [this.canvasBuffer, this.canvas];
+      });
+      let downloadContext = this.downloadCanvas.getContext('2d');
+      downloadContext.clearRect(0, 0, this.downloadCanvas.width,
+        this.downloadCanvas.height);
+      downloadContext.drawImage(image, 0, 0,
+        this.downloadCanvas.width, this.downloadCanvas.height);
+    };
+    image.onerror = () => {
+      let blob = new Blob([svgXml], {type: 'image/svg+xml;charset=utf-8'});
+      image.src = URL.createObjectURL(blob);
+    };
+    image.src =
+        'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svgXml);
+  }
+
+  /**
+   * Handles changes in zooming/panning. Should be called from the main svg
+   * to notify that a zoom/pan was performed and this minimap will update it's
+   * viewpoint rectangle.
+   *
+   * @param translate The translate vector, or none to use the last used one.
+   * @param scale The scaling factor, or none to use the last used one.
+   */
+  zoom(transform?: d3.ZoomTransform): void {
+    if (this.scaleMinimap == null) {
+      // Scene is not ready yet.
+      return;
+    }
+    // Update the new translate and scale params, only if specified.
+    if (transform) {
+      this.translate = [transform.x, transform.y];
+      this.scaleMain = transform.k;
+    }
+
+    // Update the location of the viewpoint rectangle.
+    let svgRect = this.svg.getBoundingClientRect();
+    let $viewpoint = d3.select(this.viewpoint);
+    this.viewpointCoord.x = -this.translate[0] * this.scaleMinimap /
+        this.scaleMain;
+    this.viewpointCoord.y = -this.translate[1] * this.scaleMinimap /
+        this.scaleMain;
+    let viewpointWidth = svgRect.width * this.scaleMinimap / this.scaleMain;
+    let viewpointHeight = svgRect.height * this.scaleMinimap / this.scaleMain;
+    $viewpoint
+      .attr('x', this.viewpointCoord.x)
+      .attr('y', this.viewpointCoord.y)
+      .attr('width', viewpointWidth)
+      .attr('height', viewpointHeight);
+    // Show/hide the minimap depending on the viewpoint area as fraction of the
+    // whole minimap.
+    let mapWidth = this.minimapSize.width;
+    let mapHeight = this.minimapSize.height;
+    let x = this.viewpointCoord.x;
+    let y = this.viewpointCoord.y;
+    let w = Math.min(Math.max(0, x + viewpointWidth), mapWidth) -
+        Math.min(Math.max(0, x), mapWidth);
+    let h = Math.min(Math.max(0, y + viewpointHeight), mapHeight) -
+        Math.min(Math.max(0, y), mapHeight);
+    let fracIntersect = (w * h) / (mapWidth * mapHeight);
+    if (fracIntersect < FRAC_VIEWPOINT_AREA) {
+      this.minimap.classList.remove('hidden');
+    } else {
+      this.minimap.classList.add('hidden');
+    }
+  }
+}
+
+} // close module tf.scene
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
new file mode 100644
index 0000000000..e66818f4c8
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
@@ -0,0 +1,1072 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph.scene.node {
+  import RenderNodeInfo = tf.graph.render.RenderNodeInfo;
+  /**
+   * Select or Create a 'g.nodes' group to a given sceneGroup
+   * and builds a number of 'g.node' groups inside the group.
+   *
+   * Structure Pattern:
+   *
+   * <g class='nodes'>
+   *   <g class='node'>
+   *     <g class='in-annotations'>
+   *       ...
+   *     </g>
+   *     <g class='out-annotations'>
+   *       ...
+   *     </g>
+   *     <g class='nodeshape'>
+   *      <!--
+   *      Content of the node shape should be for the node itself. For example a
+   *      Metanode would have a <rect> with rounded edges, an op would have an
+   *      <ellipse>. More complex nodes like series may contain multiple
+   *      elements which are conditionally visible based on whether the node is
+   *      expanded.
+   *      -->
+   *     </g>
+   *     <text class='label'>node name</text>
+   *     <g class='subscene'>
+   *       <!--
+   *       Content of  the subscene (only for metanode and series node).
+   *
+   *       Subscene is a svg group that contains content of the
+   *       metanode's metagraph that is recursively generated by Scene.build().
+   *
+   *       When the graph is expanded multiple times, a subscene can contain
+   *       nested subscenes inside.
+   *       -->
+   *     </g>
+   *   </g>
+   *   ...
+   * </g>
+   *
+   *
+   * @param sceneGroup selection of the container
+   * @param nodeData array of render node information to map
+   * @param sceneElement <tf-graph-scene> polymer element
+   * @return selection of the created nodeGroups
+   */
+  export function buildGroup(
+      sceneGroup, nodeData: render.RenderNodeInfo[], sceneElement) {
+    let container =
+        scene.selectOrCreateChild(sceneGroup, 'g', Class.Node.CONTAINER);
+    // Select all children and join with data.
+    // (Note that all children of g.nodes are g.node)
+    let nodeGroups =
+        (container as any)
+            .selectAll('g')
+            .data(nodeData, (d) => {
+              // make sure that we don't have to swap shape type
+              return d.node.name + ':' + d.node.type;
+            });
+
+    // ENTER
+    nodeGroups.enter()
+        .append('g')
+        .attr('data-name', d => { return d.node.name; })
+        .each(function(d) {
+          let nodeGroup = d3.select(this);
+          // index node group for quick stylizing
+          sceneElement.addNodeGroup(d.node.name, nodeGroup);
+        })
+        .merge(nodeGroups)
+        // ENTER + UPDATE
+        .attr('class', d => { return Class.Node.GROUP + ' ' + nodeClass(d); })
+        .each(function(d) {
+          let nodeGroup = d3.select(this);
+          // Add g.in-annotations (always add -- to keep layer order
+          // consistent.)
+          let inAnnotationBox =
+              scene.selectOrCreateChild(nodeGroup, 'g', Class.Annotation.INBOX);
+          annotation.buildGroup(
+              inAnnotationBox, d.inAnnotations, d, sceneElement);
+
+          // Add g.out-annotations  (always add -- to keep layer order
+          // consistent.)
+          let outAnnotationBox = scene.selectOrCreateChild(
+              nodeGroup, 'g', Class.Annotation.OUTBOX);
+          annotation.buildGroup(
+              outAnnotationBox, d.outAnnotations, d, sceneElement);
+
+          // Build .shape first (background of the node).
+          let shape = buildShape(nodeGroup, d, Class.Node.SHAPE);
+          if (d.node.isGroupNode) {
+            addButton(shape, d, sceneElement);
+          }
+          addInteraction(shape, d, sceneElement);
+
+          // Build subscene on the top.
+          subsceneBuild(nodeGroup, <render.RenderGroupNodeInfo>d, sceneElement);
+
+          // Build label last. Should be on top of everything else.
+          let label = labelBuild(nodeGroup, d, sceneElement);
+          // Do not add interaction to metanode labels as they live inside the
+          // metanode shape which already has the same interactions.
+          addInteraction(label, d, sceneElement, d.node.type === NodeType.META);
+
+          stylize(nodeGroup, d, sceneElement);
+          position(nodeGroup, d);
+        });
+
+    // EXIT
+    nodeGroups.exit()
+        .each(function(d) {
+          // remove all indices on remove
+          sceneElement.removeNodeGroup(d.node.name);
+
+          let nodeGroup = d3.select(this);
+          if (d.inAnnotations.list.length > 0) {
+            nodeGroup.select('.' + Class.Annotation.INBOX)
+                .selectAll('.' + Class.Annotation.GROUP)
+                .each(a => { sceneElement.removeAnnotationGroup(a, d); });
+          }
+          if (d.outAnnotations.list.length > 0) {
+            nodeGroup.select('.' + Class.Annotation.OUTBOX)
+                .selectAll('.' + Class.Annotation.GROUP)
+                .each(a => { sceneElement.removeAnnotationGroup(a, d); });
+          }
+        })
+        .remove();
+    return nodeGroups;
+};
+
+/**
+ * Update or remove the subscene of a render group node depending on whether it
+ * is a expanded. If the node is not a group node, this method has no effect.
+ *
+ * @param nodeGroup selection of the container
+ * @param renderNodeInfo the render information for the node.
+ * @param sceneElement <tf-graph-scene> polymer element.
+ * @return Selection of the subscene group, or null if node group does not have
+ *        a subscene. Op nodes, bridge nodes and unexpanded group nodes will
+ *        not have a subscene.
+ */
+function subsceneBuild(nodeGroup,
+    renderNodeInfo: render.RenderGroupNodeInfo, sceneElement) {
+  if (renderNodeInfo.node.isGroupNode) {
+    if (renderNodeInfo.expanded) {
+      // Recursively build the subscene.
+      return scene.buildGroup(nodeGroup, renderNodeInfo, sceneElement,
+        Class.Subscene.GROUP);
+    }
+    // Clean out existing subscene if the node is not expanded.
+    scene.selectChild(nodeGroup, 'g', Class.Subscene.GROUP).remove();
+  }
+  return null;
+};
+
+/**
+ * Translate the subscene of the given node group
+ */
+function subscenePosition(nodeGroup, d: render.RenderNodeInfo) {
+  let x0 = d.x - d.width / 2.0 + d.paddingLeft;
+  let y0 = d.y - d.height / 2.0 + d.paddingTop;
+
+  let subscene = scene.selectChild(nodeGroup, 'g', Class.Subscene.GROUP);
+  scene.translate(subscene, x0, y0);
+};
+
+/**
+ * Add an expand/collapse button to a group node
+ *
+ * @param selection The group node selection.
+ * @param d Info about the node being rendered.
+ * @param sceneElement <tf-graph-scene> polymer element.
+ */
+function addButton(selection, d: render.RenderNodeInfo, sceneElement) {
+  let group =
+      scene.selectOrCreateChild(selection, 'g', Class.Node.BUTTON_CONTAINER);
+  scene.selectOrCreateChild(group, 'circle', Class.Node.BUTTON_CIRCLE);
+  scene.selectOrCreateChild(group, 'path', Class.Node.EXPAND_BUTTON)
+      .attr('d', 'M0,-2.2 V2.2 M-2.2,0 H2.2');
+  scene.selectOrCreateChild(group, 'path', Class.Node.COLLAPSE_BUTTON)
+      .attr('d', 'M-2.2,0 H2.2');
+  (group as any).on('click', (d: any) => {
+    // Stop this event's propagation so that it isn't also considered a
+    // node-select.
+    (<Event>d3.event).stopPropagation();
+    sceneElement.fire('node-toggle-expand', {name: d.node.name});
+  });
+  scene.positionButton(group, d);
+};
+
+/**
+ * Fire node-* events when the selection is interacted.
+ *
+ * @param disableInteraction When true, have the provided selection
+ * ignore all pointer events. Used for text labels inside of metanodes, which
+ * don't need interaction as their surrounding shape has interaction, and if
+ * given interaction would cause conflicts with the expand/collapse button.
+ */
+function addInteraction(selection, d: render.RenderNodeInfo,
+    sceneElement, disableInteraction?: boolean) {
+  if (disableInteraction) {
+    selection.attr('pointer-events', 'none');
+    return;
+  }
+
+  let contextMenuFunction = contextmenu.getMenu(
+    getContextMenu(d.node, sceneElement));
+  selection
+      .on('dblclick',
+          d => {
+            sceneElement.fire('node-toggle-expand', {name: d.node.name});
+          })
+      .on('mouseover',
+          d => {
+            // don't send mouseover over expanded group,
+            // otherwise it is causing too much glitches
+            if (sceneElement.isNodeExpanded(d)) {
+              return;
+            }
+
+            sceneElement.fire('node-highlight', {name: d.node.name});
+          })
+      .on('mouseout',
+          d => {
+            // don't send mouseover over expanded group,
+            // otherwise it is causing too much glitches
+            if (sceneElement.isNodeExpanded(d)) {
+              return;
+            }
+
+            sceneElement.fire('node-unhighlight', {name: d.node.name});
+          })
+      .on('click',
+          d => {
+            // Stop this event's propagation so that it isn't also considered
+            // a graph-select.
+            (<Event>d3.event).stopPropagation();
+            sceneElement.fire('node-select', {name: d.node.name});
+          })
+      .on('contextmenu', (d, i) => {
+        sceneElement.fire('node-select', {name: d.node.name});
+        contextMenuFunction.call(d, i);
+      });
+};
+
+/**
+ * Returns the d3 context menu specification for the provided node.
+ */
+export function getContextMenu(node: Node, sceneElement) {
+  let menu = [{
+    title: (d): string => {
+      return getIncludeNodeButtonString(node.include);
+    },
+    action: (elm, d, i) => {
+      sceneElement.fire('node-toggle-extract', {name: node.name});
+    }
+  }];
+  if (canBeInSeries(node)) {
+    menu.push({
+      title: d => { return getGroupSettingLabel(node); },
+      action: (elm, d, i) => {
+        sceneElement.fire(
+            'node-toggle-seriesgroup', {name: getSeriesName(node)});
+      }
+    });
+  }
+  return menu;
+}
+
+/** Returns if a node can be part of a grouped series */
+export function canBeInSeries(node: Node) {
+  return getSeriesName(node) !== null;
+}
+
+/**
+ * Returns the name of the possible grouped series containing this node.
+ * Returns null if the node cannot be part of a grouped series of nodes.
+ */
+export function getSeriesName(node: Node) {
+  if (!node) {
+    return null;
+  }
+  if (node.type === NodeType.SERIES) {
+    return node.name;
+  }
+  if (node.type === NodeType.OP) {
+    let op = <OpNode>node;
+    return op.owningSeries;
+  }
+  return null;
+}
+
+/**
+ * Returns the SeriesNode that represents the series that the provided node
+ * is contained in (or itself if the provided node is itself a SeriesNode).
+ * Returns null if the node is not rendered as part of a series.
+ */
+function getContainingSeries(node: Node) {
+  let s: SeriesNode = null;
+  if (!node) {
+    return null;
+  } else if (node.type === NodeType.SERIES) {
+    s = <SeriesNode>node;
+  } else if (node.parentNode && node.parentNode.type === NodeType.SERIES) {
+    s = <SeriesNode>node.parentNode;
+  }
+  return s;
+}
+
+/**
+ * Returns the label for a button to toggle the group setting of the provided
+ * node.
+ */
+export function getGroupSettingLabel(node: Node) {
+  return tf.graph.getGroupSeriesNodeButtonString(
+    getContainingSeries(node) !== null ? tf.graph.SeriesGroupingType.GROUP :
+     tf.graph.SeriesGroupingType.UNGROUP);
+}
+
+/**
+ * Append svg text for label and assign data.
+ * @param nodeGroup
+ * @param renderNodeInfo The render node information for the label.
+ * @param sceneElement <tf-graph-scene> polymer element.
+ */
+function labelBuild(nodeGroup, renderNodeInfo: render.RenderNodeInfo,
+    sceneElement) {
+  let namePath = renderNodeInfo.node.name.split('/');
+  let text = namePath[namePath.length - 1];
+
+  // Truncate long labels for unexpanded Metanodes.
+  let useFontScale = renderNodeInfo.node.type === NodeType.META &&
+    !renderNodeInfo.expanded;
+
+  let label = scene.selectOrCreateChild(nodeGroup, 'text', Class.Node.LABEL);
+
+  // Make sure the label is visually on top among its siblings.
+  let labelNode = <HTMLElement> label.node();
+  labelNode.parentNode.appendChild(labelNode);
+
+  label.attr('dy', '.35em').attr('text-anchor', 'middle');
+  if (useFontScale) {
+    if (text.length > sceneElement.maxMetanodeLabelLength) {
+      text = text.substr(0, sceneElement.maxMetanodeLabelLength - 2) + '...';
+    }
+    let scale = getLabelFontScale(sceneElement);
+    label.attr('font-size', scale(text.length) + 'px');
+  }
+
+  let txtElement = <d3.Selection<any, any, any, any>>label.text(text);
+  enforceLabelWidth(txtElement, renderNodeInfo.node.type, renderNodeInfo);
+  return label;
+}
+/**
+ * This function shortens text which would exceed the maximum pixel width of
+ * a label.
+ *
+ * @param txtElementSelection The text element containing the label's text as d3
+ * selection.
+ * @param nodeType The type of the node the label belongs to. If the node is
+ * an annotation, the value is -1. Label widths are defined in
+ * layout.PARAMS.nodeSize.{meta|op|...}.maxLabelWidth for nodes and
+ * layout.PARAMS.annotations.labelWidth for annotations.
+ * @param renderNodeInfo The render information about the node, required to
+ * determine whether META nodes are collapsed or expanded.
+ */
+export function enforceLabelWidth(
+    txtElementSelection: d3.Selection<any, any, any, any>, nodeType: NodeType | number,
+    renderNodeInfo?: render.RenderNodeInfo) {
+  // Get text element itself and its on-screen width.
+  let txtNode = <SVGTextElement>txtElementSelection.node();
+  let computedTxtLength = txtNode.getComputedTextLength();
+  let labelContent = txtNode.textContent;
+
+  // Get maximum length from settings.
+  let maxLength = null;
+  switch (nodeType) {
+    case NodeType.META:
+      if (renderNodeInfo && !renderNodeInfo.expanded) {  // Only trim text if
+        // node expanded.
+        maxLength = layout.PARAMS.nodeSize.meta.maxLabelWidth;
+      }
+      break;
+
+    case NodeType.OP:
+      maxLength = layout.PARAMS.nodeSize.op.maxLabelWidth;
+      break;
+
+    case -1:
+      maxLength = layout.PARAMS.annotations.maxLabelWidth;
+      break;
+
+    default:
+      break;
+  }
+
+  // Return if no max length provided for node type, or current label length is
+  // less than or equal to the provided length limit.
+  if (maxLength === null || computedTxtLength <= maxLength) {
+    return;
+  }
+
+  // Find the index of the character which exceeds the width.
+  // getSubStringLength performs far better than getComputedTextLength, and
+  // results in a 3x speed-up on average.
+  let index = 1;
+  while (txtNode.getSubStringLength(0, index) < maxLength) {
+    index++;
+  }
+
+  // Shorten the label starting at the string length known to be one
+  // character above max pixel length.
+  // When shortened the original label's substring is concatenated with
+  // '...', baseText contains the substring not including the '...'.
+  let baseText = <string>txtNode.textContent.substr(0, index);
+  do {
+    baseText = baseText.substr(0, baseText.length - 1);
+
+    // Recompute text length.
+    txtNode.textContent = baseText + '...';
+    computedTxtLength = txtNode.getComputedTextLength();
+  } while (computedTxtLength > maxLength && baseText.length > 0);
+
+  // Add tooltip with full name and return.
+  return txtElementSelection.append('title').text(labelContent);
+}
+
+/**
+ * d3 scale used for sizing font of labels, used by labelBuild,
+ * initialized once by getLabelFontScale.
+ */
+let fontScale = null;
+function getLabelFontScale(sceneElement) {
+  if (!fontScale) {
+    fontScale = d3.scaleLinear()
+      .domain([sceneElement.maxMetanodeLabelLengthLargeFont,
+        sceneElement.maxMetanodeLabelLength])
+      .range([sceneElement.maxMetanodeLabelLengthFontSize,
+        sceneElement.minMetanodeLabelLengthFontSize]).clamp(true);
+  }
+  return fontScale;
+}
+
+/**
+ * Set label position of a given node group
+ */
+function labelPosition(nodeGroup, cx: number, cy: number,
+    yOffset: number) {
+  scene.selectChild(nodeGroup, 'text', Class.Node.LABEL)
+      .transition()
+      .attr('x', cx)
+      .attr('y', cy + yOffset);
+};
+
+/**
+ * Select or append/insert shape for a node and assign renderNode
+ * as the shape's data.
+ *
+ * @param nodeGroup
+ * @param d Render node information.
+ * @param nodeClass class for the element.
+ * @return Selection of the shape.
+ */
+export function buildShape(nodeGroup, d, nodeClass: string) {
+  // Create a group to house the underlying visual elements.
+  let shapeGroup = scene.selectOrCreateChild(nodeGroup, 'g', nodeClass);
+  // TODO(jimbo): DOM structure should be templated in HTML somewhere, not JS.
+  switch (d.node.type) {
+    case NodeType.OP:
+      scene.selectOrCreateChild(shapeGroup, 'ellipse', Class.Node.COLOR_TARGET);
+      break;
+    case NodeType.SERIES:
+      // Choose the correct stamp to use to represent this series.
+      let stampType = 'annotation';
+      let groupNodeInfo = <render.RenderGroupNodeInfo>d;
+      if (groupNodeInfo.coreGraph) {
+        stampType =
+            groupNodeInfo.node.hasNonControlEdges ? 'vertical' : 'horizontal';
+      }
+      let classList = [Class.Node.COLOR_TARGET];
+      if (groupNodeInfo.isFadedOut) {
+        classList.push('faded-ellipse');
+      }
+      scene.selectOrCreateChild(shapeGroup, 'use', classList)
+          .attr('xlink:href', '#op-series-' + stampType + '-stamp');
+      scene.selectOrCreateChild(shapeGroup, 'rect', Class.Node.COLOR_TARGET)
+          .attr('rx', d.radius).attr('ry', d.radius);
+      break;
+    case NodeType.BRIDGE:
+      scene.selectOrCreateChild(shapeGroup, 'rect', Class.Node.COLOR_TARGET)
+          .attr('rx', d.radius).attr('ry', d.radius);
+      break;
+    case NodeType.META:
+      scene.selectOrCreateChild(shapeGroup, 'rect', Class.Node.COLOR_TARGET)
+          .attr('rx', d.radius).attr('ry', d.radius);
+      break;
+    default:
+      throw Error('Unrecognized node type: ' + d.node.type);
+  }
+  return shapeGroup;
+};
+
+export function nodeClass(d: render.RenderNodeInfo) {
+  switch (d.node.type) {
+    case NodeType.OP:
+      return Class.OPNODE;
+    case NodeType.META:
+      return Class.METANODE;
+    case NodeType.SERIES:
+      return Class.SERIESNODE;
+    case NodeType.BRIDGE:
+      return Class.BRIDGENODE;
+    case NodeType.ELLIPSIS:
+      return Class.ELLIPSISNODE;
+  };
+  throw Error('Unrecognized node type: ' + d.node.type);
+};
+
+/** Modify node and its subscene and its label's positional attributes */
+function position(nodeGroup, d: render.RenderNodeInfo) {
+  let shapeGroup = scene.selectChild(nodeGroup, 'g', Class.Node.SHAPE);
+  let cx = layout.computeCXPositionOfNodeShape(d);
+  switch (d.node.type) {
+    case NodeType.OP: {
+      // position shape
+      let shape = scene.selectChild(shapeGroup, 'ellipse');
+      scene.positionEllipse(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
+      labelPosition(nodeGroup, cx, d.y, d.labelOffset);
+      break;
+    }
+    case NodeType.META: {
+      // position shape
+      let shape = scene.selectChild(shapeGroup, 'rect');
+      if (d.expanded) {
+        scene.positionRect(shape, d.x, d.y, d.width, d.height);
+        subscenePosition(nodeGroup, d);
+        // put label on top
+        labelPosition(nodeGroup, cx, d.y,
+          - d.height / 2 + d.labelHeight / 2);
+      } else {
+        scene.positionRect(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
+        labelPosition(nodeGroup, cx, d.y, 0);
+      }
+      break;
+    }
+    case NodeType.SERIES: {
+      let shape = scene.selectChild(shapeGroup, 'use');
+      if (d.expanded) {
+        scene.positionRect(shape, d.x, d.y, d.width, d.height);
+        subscenePosition(nodeGroup, d);
+        // put label on top
+        labelPosition(nodeGroup, cx, d.y,
+          - d.height / 2 + d.labelHeight / 2);
+      } else {
+        scene.positionRect(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
+        labelPosition(nodeGroup, cx, d.y, d.labelOffset);
+      }
+      break;
+    }
+    case NodeType.BRIDGE: {
+      // position shape
+      // NOTE: In reality, these will not be visible, but it helps to put them
+      // in the correct position for debugging purposes.
+      let shape = scene.selectChild(shapeGroup, 'rect');
+      scene.positionRect(shape, d.x, d.y, d.width, d.height);
+      break;
+    }
+    default: { throw Error('Unrecognized node type: ' + d.node.type); }
+  }
+};
+
+/** Enum specifying the options to color nodes by */
+export enum ColorBy {STRUCTURE, DEVICE, XLA_CLUSTER, COMPUTE_TIME, MEMORY}
+;
+
+/**
+ * Returns the fill color for the node given its state and the 'color by'
+ * option.
+ */
+export function getFillForNode(templateIndex, colorBy,
+    renderInfo: render.RenderNodeInfo, isExpanded: boolean): string {
+  let colorParams = render.MetanodeColors;
+  switch (colorBy) {
+    case ColorBy.STRUCTURE:
+      if (renderInfo.node.type === NodeType.META) {
+        let tid = (<Metanode>renderInfo.node).templateId;
+        return tid === null ?
+          colorParams.UNKNOWN :
+          colorParams.STRUCTURE_PALETTE(templateIndex(tid), isExpanded);
+      } else if (renderInfo.node.type === NodeType.SERIES) {
+        // If expanded, we're showing the background rect, which we want to
+        // appear gray. Otherwise we're showing a stack of ellipses which we
+        // want to show white.
+        return isExpanded ? colorParams.EXPANDED_COLOR : 'white';
+      } else if (renderInfo.node.type === NodeType.BRIDGE) {
+        return renderInfo.structural ?
+            '#f0e' :
+            (<BridgeNode>renderInfo.node).inbound ? '#0ef' : '#fe0';
+      } else {
+        // Op nodes are white.
+        return 'white';
+      }
+    case ColorBy.DEVICE:
+      if (renderInfo.deviceColors == null) {
+        // Return the hue for unknown device.
+        return colorParams.UNKNOWN;
+      }
+      let id = renderInfo.node.name;
+      let escapedId = tf.graph.util.escapeQuerySelector(id);
+      let gradientDefs = d3.select('svg#svg defs #linearGradients');
+      let linearGradient = gradientDefs.select('linearGradient#' + escapedId);
+      // If the linear gradient is not there yet, create it.
+      if (linearGradient.size() === 0) {
+        linearGradient = gradientDefs.append('linearGradient').attr('id', id);
+        // Re-create the stops of the linear gradient.
+        linearGradient.selectAll('*').remove();
+        let cumulativeProportion = 0;
+        // For each device, create a stop using the proportion of that device.
+        _.each(renderInfo.deviceColors, d => {
+          let color = d.color;
+          linearGradient.append('stop')
+              .attr('offset', cumulativeProportion)
+              .attr('stop-color', color);
+          linearGradient.append('stop')
+              .attr('offset', cumulativeProportion + d.proportion)
+              .attr('stop-color', color);
+          cumulativeProportion += d.proportion;
+        });
+      }
+      return isExpanded ? colorParams.EXPANDED_COLOR : `url(#${escapedId})`;
+    case ColorBy.XLA_CLUSTER:
+      return isExpanded ? colorParams.EXPANDED_COLOR :
+                          renderInfo.xlaClusterColor || colorParams.UNKNOWN;
+    case ColorBy.COMPUTE_TIME:
+      return isExpanded ?
+        colorParams.EXPANDED_COLOR : renderInfo.computeTimeColor ||
+        colorParams.UNKNOWN;
+    case ColorBy.MEMORY:
+      return isExpanded ?
+        colorParams.EXPANDED_COLOR : renderInfo.memoryColor ||
+        colorParams.UNKNOWN;
+    default:
+      throw new Error('Unknown case to color nodes by');
+  }
+}
+
+/**
+ * Modify node style by toggling class and assign attributes (only for things
+ * that can't be done in css).
+ */
+export function stylize(nodeGroup, renderInfo: render.RenderNodeInfo,
+    sceneElement, nodeClass?) {
+  nodeClass = nodeClass || Class.Node.SHAPE;
+  let isHighlighted = sceneElement.isNodeHighlighted(renderInfo.node.name);
+  let isSelected = sceneElement.isNodeSelected(renderInfo.node.name);
+  let isExtract = renderInfo.isInExtract || renderInfo.isOutExtract;
+  let isExpanded = renderInfo.expanded;
+  let isFadedOut = renderInfo.isFadedOut;
+  nodeGroup.classed('highlighted', isHighlighted);
+  nodeGroup.classed('selected', isSelected);
+  nodeGroup.classed('extract', isExtract);
+  nodeGroup.classed('expanded', isExpanded);
+  nodeGroup.classed('faded', isFadedOut);
+
+  // Main node always exists here and it will be reached before subscene,
+  // so d3 selection is fine here.
+  let node = nodeGroup.select('.' + nodeClass + ' .' + Class.Node.COLOR_TARGET);
+  let fillColor = getFillForNode(sceneElement.templateIndex,
+    ColorBy[sceneElement.colorBy.toUpperCase()],
+    renderInfo, isExpanded);
+  node.style('fill', fillColor);
+
+  // Choose outline to be darker version of node color if the node is a single
+  // color and is not selected.
+  node.style('stroke', isSelected ? null : getStrokeForFill(fillColor));
+};
+
+/**
+ * Given a node's fill color/gradient, determine the stroke for the node.
+ */
+export function getStrokeForFill(fill: string) {
+  // If node is colored by a gradient, then use a dark gray outline.
+  return fill.substring(0, 3) === 'url' ?
+      render.MetanodeColors.GRADIENT_OUTLINE :
+      d3.rgb(fill).darker().toString();
+}
+
+/**
+ * Finds selected node and highlights all nodes which are providing direct
+ * or indirect input to the node and all edges connecting these nodes
+ * together and to the selected node.
+ *
+ * @param renderGraphInfo Information on the rendered state of the graph.
+ */
+export function traceInputs(renderGraphInfo: tf.graph.render.RenderGraphInfo) {
+  // Reset all styling.
+  d3.selectAll('.input-highlight').classed('input-highlight', false);
+  d3.selectAll('.non-input').classed('non-input', false);
+  d3.selectAll('.input-parent').classed('input-parent', false);
+  d3.selectAll('.input-child').classed('input-child', false);
+  d3.selectAll('.input-edge-highlight').classed('input-edge-highlight', false);
+  d3.selectAll('.non-input-edge-highlight')
+      .classed('non-input-edge-highlight', false);
+  d3.selectAll('.input-highlight-selected')
+      .classed('input-highlight-selected', false);
+
+  // Extract currently selected node. Return if input tracing disabled or no
+  // node is selected.
+  let selectedNodeSelectorString = 'g.node.selected,g.op.selected';
+  let node = d3.select(selectedNodeSelectorString);
+  let currentNode = undefined;
+  if (renderGraphInfo && renderGraphInfo.traceInputs && node && node[0] &&
+      node[0][0]) {
+    currentNode = node[0][0] as Element;
+  } else {
+    return;
+  }
+  let nodeName = currentNode.getAttribute('data-name');
+  let opNodes = _getAllContainedOpNodes(nodeName, renderGraphInfo);
+  let allTracedNodes = {};
+  _.each(opNodes, function(nodeInstance) {
+    allTracedNodes =
+        traceAllInputsOfOpNode(renderGraphInfo, nodeInstance, allTracedNodes);
+  });
+
+  d3.selectAll(selectedNodeSelectorString)
+    // Remove the input-highlight from the selected node.
+    .classed('input-highlight', false)
+    // Add input-highlight-selected class to selected node, which allows
+    // treating the selected not as a special case of an input node.
+    .classed('input-highlight-selected', true)
+
+  // Highlight all parent nodes of each OpNode as input parent to allow
+  // specific highlighting.
+  let highlightedNodes = Object.keys(allTracedNodes);
+  let visibleNodes =
+      _findVisibleParentsFromOpNodes(renderGraphInfo, highlightedNodes);
+  _markParentsOfNodes(visibleNodes);
+
+  // Attach class to all non-input nodes and edges for styling.
+  d3.selectAll(
+        'g.node:not(.selected):not(.input-highlight)' +
+        ':not(.input-parent):not(.input-children)')
+      .classed('non-input', true)
+      .each(function(d: RenderNodeInfo) {
+        // Mark all nodes with the specified name as non-inputs. This
+        // results in Annotation nodes which are attached to inputs to be
+        // tagged as well.
+        let nodeName = d.node.name;
+        d3.selectAll(`[data-name="${nodeName}"]`).classed('non-input', true);
+      });
+  d3.selectAll('g.edge:not(.input-edge-highlight)')
+      .classed('non-input-edge-highlight', true);
+}
+
+/**
+ * Recursively find all op nodes contained by the node identified by the
+ * provided name.
+ * @param nodeName The meta or op node of which the OpNode instances are
+ * required.
+ * @param renderGraphInfo The rendered graph information object.
+ * @returns {Array} An array of OpNodeImpl instances.
+ */
+export function _getAllContainedOpNodes(
+    nodeName: string, renderGraphInfo: tf.graph.render.RenderGraphInfo) {
+  let opNodes = [];
+
+  // Get current node.
+  let node = renderGraphInfo.getNodeByName(nodeName) as tf.graph.GroupNode |
+      tf.graph.OpNode;
+
+  // If node is already OpNode then return the node plus its input embeddings.
+  if (node instanceof tf.graph.OpNodeImpl) {
+    return [node].concat(node.inEmbeddings);
+  }
+
+  // Otherwise, make recursive call for each node contained by the GroupNode.
+  let childNodeNames = (node as tf.graph.GroupNode).metagraph.nodes();
+  _.each(childNodeNames, function(childNodeName) {
+    opNodes =
+        opNodes.concat(_getAllContainedOpNodes(childNodeName, renderGraphInfo));
+  });
+
+  return opNodes;
+}
+
+/**
+ * When resolving inputs of a node the visible parent node of each input
+ * node (i.e. the first parent which is rendered to the screen) needs to be
+ * found, and since such a node may contain several input OpNodes a map
+ * of the visible parent to all the input OpNodes it contains is provided by
+ * opNodes.
+ */
+interface VisibleParent {
+  visibleParent: Node;
+  opNodes: OpNode[];
+}
+
+export function traceAllInputsOfOpNode(
+    renderGraphInfo: tf.graph.render.RenderGraphInfo, startNode: OpNode,
+    allTracedNodes: Object) {
+  // To prevent infinite loops due to cyclical relationships and improving
+  // performance by tracing OpNode which is input to 2+ nodes only once.
+  if (allTracedNodes[startNode.name]) {
+    return allTracedNodes;
+  } else {
+    allTracedNodes[startNode.name] = true;
+  }
+  // Extract the inputs.
+  let inputs = startNode.inputs;
+  // Get visible parent.
+  let currentVisibleParent = getVisibleParent(renderGraphInfo, startNode);
+  // Mark as input node.
+  d3.select(`.node[data-name="${currentVisibleParent.name}"]`)
+      .classed('input-highlight', true);
+
+  // Find the visible parent of each input.
+  let visibleInputs = {};
+  _.each(inputs, function(nodeInstance) {
+    let resolvedNode = renderGraphInfo.getNodeByName(nodeInstance.name);
+    if (resolvedNode === undefined) {
+      // Node could not be found in rendered Hierarchy, which happens when
+      // tracing inputs of a SummaryNode.
+      return;
+    }
+    // Ensure node is resolved to OpNode if name collision with Metanode exists.
+    if (resolvedNode instanceof MetanodeImpl) {
+      let resolvedNodeName = tf.graph.getStrictName(resolvedNode.name);
+      resolvedNode = renderGraphInfo.getNodeByName(resolvedNodeName) as OpNode;
+    }
+
+    let visibleParent = getVisibleParent(renderGraphInfo, resolvedNode);
+
+    // Append OpNode to visible parent entry.
+    let visibleInputsEntry = visibleInputs[visibleParent.name];
+    if (visibleInputsEntry) {
+      visibleInputsEntry.opNodes.push(resolvedNode);
+    } else {  // Create new entry.
+      visibleInputs[visibleParent.name] = {
+        visibleParent: visibleParent,
+        opNodes: [resolvedNode]
+      } as VisibleParent;
+    }
+  });
+
+  // Find all parents of the start node.
+  let startNodeParents = {};
+  let indexedStartNodeParents = [currentVisibleParent];
+  startNodeParents[currentVisibleParent.name] = {
+    traced: false,
+    index: 0,
+    connectionEndpoints: []
+  };
+
+  let currentNode = currentVisibleParent as Node;
+  for (let index = 1; currentNode.name !== tf.graph.ROOT_NAME; index++) {
+    currentNode = currentNode.parentNode;
+    startNodeParents[currentNode.name] = {
+      traced: false,
+      index: index,
+      connectionEndpoints: []
+    };
+    indexedStartNodeParents[index] = currentNode;
+  }
+
+  // Find first mutual parent of each input node and highlight connection.
+  _.forOwn(visibleInputs, function(visibleParentInfo: VisibleParent, key) {
+    let nodeInstance = visibleParentInfo.visibleParent;
+    // Make recursive call for each input-OpNode contained by the visible
+    // parent.
+    _.each(visibleParentInfo.opNodes, function(opNode: OpNode) {
+      allTracedNodes =
+          traceAllInputsOfOpNode(renderGraphInfo, opNode, allTracedNodes);
+    });
+
+    if (nodeInstance.name !== currentVisibleParent.name) {
+      _createVisibleTrace(
+          nodeInstance, startNodeParents, indexedStartNodeParents);
+    }
+  });
+
+  return allTracedNodes;
+}
+
+/**
+ * Colors the edges to connect the passed node to the start node. This is
+ * done by:
+ *
+ * a) Finding the first (visible) common parent in the rendered
+ * hierarchy.
+ * NB: There are 2 types of connections:
+ * 1) Direct connections between node A
+ * and B, marked below as II,
+ * 2) Connections from any node A to its parent, A'. Marked below as I and III.
+ * For type 2 connection you need to know the inner-nested node, the
+ * direct parent, and the ultimate destination of the connection.
+ *
+ *  A_parent      B_parent
+ * +--------+    +---------+
+ * |        |    |         |
+ * |  +--+ I| II |III+--+  |
+ * |  |A +---------->+B |  |
+ * |  +--+  |    |   +--+  |
+ * |        |    |         |
+ * +--------+    +---------+
+ *
+ *
+ * b) Highlighting the direct connection between the parents of A and B,
+ * called A_parent and B_parent, s.t. A_parent and B_parent are children of the
+ * mutual parent of A and B found in a), marked above as II.
+ *
+ * c) Highlighting the connection from A to A_parent and B to B_parent
+ * (through all layers of parents between A and A_parent and B and B_parent,
+ * respectively). Marked above as I and III.
+ *
+ * @param nodeInstance The instance of the node to use as destination node, B.
+ * @param startNodeParents Map of startNodeParent names to information objects
+ * about the parent.
+ * @param indexedStartNodeParents An array of all parents of the start node.
+ * This is required to find the child of the mutual parent which is a parent
+ * of the start node.
+ * @private
+ */
+function _createVisibleTrace(
+    nodeInstance: Node, startNodeParents, indexedStartNodeParents: Node[]) {
+  let currentNode = nodeInstance;
+  let previousNode = nodeInstance;
+
+  // Ascend through parents until a mutual parent is found with the start
+  // node.
+  let destinationParentPairs = [];
+  while (!startNodeParents[currentNode.name]) {
+    if (previousNode.name !== currentNode.name) {
+      destinationParentPairs.push([previousNode, currentNode]);
+    }
+    previousNode = currentNode;
+    currentNode = currentNode.parentNode;
+  }
+
+  // Connection between nodes is drawn between the parents of each
+  // respective node, both of which share the mutual parent.
+  let startNodeIndex = startNodeParents[currentNode.name].index;
+  let startNodeName =
+      indexedStartNodeParents[Math.max(startNodeIndex - 1, 0)].name;
+
+  let startNodeTopParentName = startNodeName;
+  let targetNodeTopParentName = previousNode.name;
+
+  let endNodeName = previousNode.name;
+  d3.selectAll(`[data-edge="${endNodeName}--${startNodeName}"]`)
+      .classed('input-edge-highlight', true);
+
+  // Trace up the parents of the input.
+  _.each(destinationParentPairs, function(value) {
+    let inner = value[0];
+    let outer = value[1];
+    let edgeSelector = `[data-edge="${inner.name}--${startNodeTopParentName}` +
+        `~~${outer.name}~~OUT"]`;
+    d3.selectAll(edgeSelector).classed('input-edge-highlight', true);
+  });
+
+  // Trace up the parents of the start node.
+  for (let index = 1; index < startNodeIndex; index++) {
+    let inner = indexedStartNodeParents[index - 1];
+    let outer = indexedStartNodeParents[index];
+    let edgeSelector = `[data-edge="${targetNodeTopParentName}~~${outer.name}` +
+        `~~IN--${inner.name}"]`;
+    d3.selectAll(edgeSelector).classed('input-edge-highlight', true);
+  }
+}
+
+/**
+ * Creates map { [name: string] -> Node } of all visible / rendered parents
+ * of the nodes identified by the node names passed in.
+ *
+ * @param renderGraphInfo The information on the rendered graph.
+ * @param nodeNames String array of node names.
+ * @returns {[nodeName: string]: Node}
+ * @private
+ */
+function _findVisibleParentsFromOpNodes(renderGraphInfo, nodeNames: string[]) {
+  let visibleParents: {[nodeName: string]: Node} = {};
+  _.each(nodeNames, function(nodeName) {
+    let currentNode = renderGraphInfo.getNodeByName(nodeName);
+    let visibleParent = getVisibleParent(renderGraphInfo, currentNode);
+    visibleParents[visibleParent.name] = visibleParent;
+  });
+
+  return visibleParents;
+}
+
+/**
+ * Traverse through the parents of all nodes in the list and mark each
+ * encountered node as input-parent.
+ * @param visibleNodes Map of input nodes, have to be visible/rendered when
+ * called.
+ * @private
+ */
+function _markParentsOfNodes(visibleNodes: {[nodeName: string]: Node}) {
+  _.forOwn(visibleNodes, function(nodeInstance: Node) {
+    // Mark all parents of the node as input-parents.
+    let currentNode = nodeInstance;
+
+    while (currentNode.name !== tf.graph.ROOT_NAME) {
+      let renderedElement = d3.select(`.node[data-name="${currentNode.name}"]`);
+      // Only mark the element as a parent node to an input if it is not
+      // marked as input node itself.
+      if (renderedElement[0][0] &&
+          !renderedElement.classed('input-highlight') &&
+          !renderedElement.classed('selected') &&
+          // OpNode only parent if start node is embedded node, in which case
+          // the OpNode should be faded as well.
+          !renderedElement.classed('op')) {
+        renderedElement.classed('input-parent', true);
+      }
+      currentNode = currentNode.parentNode;
+    }
+  });
+}
+
+/**
+ * Find the parent of the passed in op node which is expanded. This is done
+ * by going through all parents until the parent's parent is expanded, thus
+ * finding the first unexpanded parent which is rendered on the screen.
+ * @param renderGraphInfo The graph info object used to gain access to the
+ * render info of the parents.
+ * @param currentNode The node whose parent is to be found.
+ * @returns Node
+ */
+export function getVisibleParent(
+    renderGraphInfo: tf.graph.render.RenderGraphInfo,
+    currentNode: tf.graph.Node) {
+  let found = false;
+  let currentParent = currentNode;
+
+  while (!found) {
+    // Get parent element, to extract name.
+    currentNode = currentParent;
+    currentParent = currentNode.parentNode;
+
+    if (currentParent === undefined) {
+      found = true;
+    } else {
+      let renderNode = renderGraphInfo.getRenderNodeByName(currentParent.name);
+      // Found if node is rendered on the screen (renderNode truthy), and
+      // the parent is either expanded (i.e. it is a metanode or seriesnode)
+      // or the parent is an OpNode in which case currentNode is an embedded
+      // node which has another OpNode as parent.
+      if (renderNode &&
+          (renderNode.expanded || currentParent instanceof graph.OpNodeImpl)) {
+        found = true;
+      }
+    }
+  }  // Close while loop.
+  return currentNode;
+}
+}  // Close module.
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/parser.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/parser.ts
new file mode 100644
index 0000000000..04d879ef91
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/parser.ts
@@ -0,0 +1,284 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph.parser {
+
+/**
+ * Parses a native js value, which can be either a string, boolean or number.
+ *
+ * @param value The value to be parsed.
+ */
+function parseValue(value: string): string|number|boolean {
+  if (value === 'true') {
+    return true;
+  }
+  if (value === 'false') {
+    return false;
+  }
+  let firstChar = value[0];
+  if (firstChar === '"') {
+    return value.substring(1, value.length - 1);
+  }
+  let num = parseFloat(value);
+  return isNaN(num) ? value : num;
+}
+
+/**
+ * Fetches a text file and returns a promise of the result.
+ */
+export function fetchPbTxt(filepath: string): Promise<ArrayBuffer> {
+  return new Promise<ArrayBuffer>(function(resolve, reject) {
+    const request = new XMLHttpRequest();
+    request.open('GET', filepath);
+    request.responseType = 'arraybuffer';
+
+    request.onerror = () => reject(request.status);
+    request.onload = () => resolve(request.response);
+
+    request.send(null);
+  });
+}
+
+/**
+ * Fetches the metadata file, parses it and returns a promise of the result.
+ */
+export function fetchAndParseMetadata(path: string, tracker: ProgressTracker) {
+  return tf.graph.util
+      .runTask(
+          'Reading metadata pbtxt', 40,
+          () => {
+            if (path == null) {
+              return Promise.resolve(null);
+            }
+            return fetchPbTxt(path);
+          },
+          tracker)
+      .then((arrayBuffer: ArrayBuffer) => {
+        return tf.graph.util.runAsyncPromiseTask(
+            'Parsing metadata.pbtxt', 60, () => {
+              return arrayBuffer != null ? parseStatsPbTxt(arrayBuffer) :
+                                           Promise.resolve(null);
+            }, tracker);
+      });
+}
+
+/**
+ * Fetches the graph file, parses it and returns a promise of the result. The
+ * result will be undefined if the graph is empty.
+ */
+export function fetchAndParseGraphData(path: string, pbTxtFile: Blob,
+    tracker: ProgressTracker) {
+  return tf.graph.util
+      .runTask(
+          'Reading graph pbtxt', 40,
+          () => {
+            if (pbTxtFile) {
+              return new Promise<ArrayBuffer>(function(resolve, reject) {
+                let fileReader = new FileReader();
+                fileReader.onload = () => resolve(fileReader.result);
+                fileReader.onerror = () => reject(fileReader.error);
+                fileReader.readAsArrayBuffer(pbTxtFile);
+              });
+            } else {
+              return fetchPbTxt(path);
+            }
+          },
+          tracker)
+      .then((arrayBuffer: ArrayBuffer) => {
+        return tf.graph.util.runTask('Parsing graph.pbtxt', 60, () => {
+          return parseGraphPbTxt(arrayBuffer);
+        }, tracker);
+      });
+}
+
+/**
+ * Parse a file object in a streaming fashion line by line (or custom delim).
+ * Can handle very large files.
+ * @param input The file object as an array buffer.
+ * @param callback The callback called on each line
+ * @param chunkSize The size of each read chunk. (optional)
+ * @param delim The delimiter used to split a line. (optional)
+ * @returns A promise for when it is finished.
+ */
+export function streamParse(
+    arrayBuffer: ArrayBuffer, callback: (string) => void,
+    chunkSize: number = 1000000, delim: string = '\n'): Promise<boolean> {
+  return new Promise<boolean>(function(resolve, reject) {
+    let offset = 0;
+    let bufferSize = arrayBuffer.byteLength - 1;
+    let data = '';
+
+    function readHandler(str) {
+      offset += chunkSize;
+      let parts = str.split(delim);
+      let first = data + parts[0];
+      if (parts.length === 1) {
+        data = first;
+        readChunk(offset, chunkSize);
+        return;
+      }
+      data = parts[parts.length - 1];
+      callback(first);
+      for (let i = 1; i < parts.length - 1; i++) {
+        callback(parts[i]);
+      }
+      if (offset >= bufferSize) {
+        if (data) {
+          callback(data);
+        }
+        resolve(true);
+        return;
+      }
+      readChunk(offset, chunkSize);
+    }
+
+    function readChunk(offset: number, size: number) {
+      const arrayBufferChunk = arrayBuffer.slice(offset, offset + size);
+
+      const blob = new Blob([arrayBufferChunk]);
+      const file = new FileReader();
+      file.onload = (e: any) => readHandler(e.target.result);
+      file.readAsText(blob);
+    }
+
+    readChunk(offset, chunkSize);
+  });
+}
+
+/**
+ * Since proto-txt doesn't explicitly say whether an attribute is repeated
+ * (an array) or not, we keep a hard-coded list of attributes that are known
+ * to be repeated. This list is used in parsing time to convert repeated
+ * attributes into arrays even when the attribute only shows up once in the
+ * object.
+ */
+const GRAPH_REPEATED_FIELDS: {[attrPath: string]: boolean} = {
+  'node': true,
+  'node.input': true,
+  'node.attr': true,
+  'node.attr.value.list.type': true,
+  'node.attr.value.shape.dim': true,
+  'node.attr.value.tensor.string_val': true,
+  'node.attr.value.tensor.tensor_shape.dim': true,
+  'node.attr.value.list.shape': true,
+  'node.attr.value.list.shape.dim': true,
+  'node.attr.value.list.s': true
+};
+
+const METADATA_REPEATED_FIELDS: {[attrPath: string]: boolean} = {
+  'step_stats.dev_stats': true,
+  'step_stats.dev_stats.node_stats': true,
+  'step_stats.dev_stats.node_stats.output': true,
+  'step_stats.dev_stats.node_stats.memory': true,
+  'step_stats.dev_stats.node_stats.output.tensor_description.shape.dim': true
+};
+
+/**
+ * Parses an ArrayBuffer of a proto txt file into a raw Graph object.
+ */
+export function parseGraphPbTxt(input: ArrayBuffer):
+    Promise<tf.graph.proto.NodeDef[]> {
+  return parsePbtxtFile(input, GRAPH_REPEATED_FIELDS).then(obj => obj['node']);
+}
+
+/**
+ * Parses an ArrayBuffer of a proto txt file into a StepStats object.
+ */
+export function parseStatsPbTxt(input: ArrayBuffer):
+    Promise<tf.graph.proto.StepStats> {
+  return parsePbtxtFile(input, METADATA_REPEATED_FIELDS)
+      .then(obj => obj['step_stats']);
+}
+
+/**
+ * Parses a ArrayBuffer of a proto txt file into javascript object.
+ *
+ * @param input The ArrayBuffer or file object implementing slice.
+ * @param repeatedFields Map (Set) of all the repeated fields, since you can't
+ *   tell directly from the pbtxt if a field is repeated or not.
+ * @returns The parsed object.
+ */
+function parsePbtxtFile(
+    input: ArrayBuffer,
+    repeatedFields: {[attrPath: string]: boolean}): Promise<Object> {
+  let output: { [name: string]: any; } = {};
+  let stack = [];
+  let path: string[] = [];
+  let current: { [name: string]: any; } = output;
+
+  function splitNameAndValueInAttribute(line: string) {
+    let colonIndex = line.indexOf(':');
+    let name = line.substring(0, colonIndex).trim();
+    let value = parseValue(line.substring(colonIndex + 2).trim());
+    return {
+      name: name,
+      value: value
+    };
+  }
+
+  /**
+   * Adds a value, given the attribute name and the host object. If the
+   * attribute already exists, but is not an array, it will convert it to an
+   * array of values.
+   *
+   * @param obj The host object that holds the attribute.
+   * @param name The attribute name (key).
+   * @param value The attribute value.
+   * @param path A path that identifies the attribute. Used to check if
+   *     an attribute is an array or not.
+   */
+  function addAttribute(obj: Object, name: string,
+      value: Object|string|number|boolean, path: string[]): void {
+    // We treat 'node' specially since it is done so often.
+    let existingValue = obj[name];
+    if (existingValue == null) {
+      obj[name] = path.join('.') in repeatedFields ? [value] : value;
+    } else if (Array.isArray(existingValue)) {
+      existingValue.push(value);
+    } else {
+      obj[name] = [existingValue, value];
+    }
+  }
+
+  // Run through the file a line at a time.
+  return streamParse(input, function(line: string) {
+    if (!line) {
+      return;
+    }
+    line = line.trim();
+
+    switch (line[line.length - 1]) {
+      case '{':  // create new object
+        let name = line.substring(0, line.length - 2).trim();
+        let newValue: { [name: string]: any; } = {};
+        stack.push(current);
+        path.push(name);
+        addAttribute(current, name, newValue, path);
+        current = newValue;
+        break;
+      case '}':
+        current = stack.pop();
+        path.pop();
+        break;
+      default:
+        let x = splitNameAndValueInAttribute(line);
+        addAttribute(current, x.name, x.value, path.concat(x.name));
+        break;
+    }
+  }).then(function() {
+    return output;
+  });
+}
+
+} // Close module tf.graph.parser.
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/proto.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/proto.ts
new file mode 100644
index 0000000000..eda73e45c3
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/proto.ts
@@ -0,0 +1,143 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * @fileoverview Interfaces that parallel proto definitions in
+ * third_party/tensorflow/core/framework/...
+ *     graph.proto
+ *     step_stats.proto
+ * These should stay in sync.
+ */
+module tf.graph.proto {
+  /**
+   * TensorFlow node definition as defined in the graph.proto file.
+   */
+  export interface NodeDef {
+    /** Name of the node */
+    name: string;
+    /** List of nodes that are inputs for this node. */
+    input: string[];
+    /** The name of the device where the computation will run. */
+    device: string;
+    /** The name of the operation associated with this node. */
+    op: string;
+    /** List of attributes that describe/modify the operation. */
+    attr: {key: string, value: Object}[];
+  }
+
+  /**
+   * Generic graph as defined in the graph_explorer.proto file.
+   */
+  export interface GenericGraph {
+    /** List of nodes in the graph */
+    node: GenericNode[];
+    /** List of nodes in the graph */
+    edge: GenericEdge[];
+    /** List of attributes that describe/modify the operation. */
+    attr: Array<{[key: string]: any}>;
+  }
+
+  /**
+   * GenericEdge corresponds to the Edge message in graph_explorer.proto.
+   */
+  export interface GenericEdge {
+    /** Name of the source node. */
+    source: string;
+    /** Name of the target node. */
+    target: string;
+    /** Attributes of the edge. */
+    edge_attr: Array<{[key: string]: any}>;
+  }
+
+  /**
+   * GenericNode corresponds to the Node message in graph_explorer.proto.
+   */
+  export interface GenericNode {
+    /** Name of the node */
+    name: string;
+    /** Attributes of a leaf node or leaf nodes within a metanode. */
+    node_attr: Array<{[key: string]: any}>;
+    /** Attributes of a metanode. */
+    metanode_attr: Array<{[key: string]: any}>;
+  }
+
+  /**
+   * TensorFlow stats file definition as defined in the stats proto file.
+   */
+  export interface StepStats {
+    dev_stats: {device: string, node_stats: NodeExecStats[]}[];
+  }
+
+  /**
+   * TensorFlow stats for a node as defined in the step_stats proto file.
+   */
+  export interface NodeExecStats {
+    node_name: string;
+    // The next 4 properties are currently stored as string in json
+    // and must be parsed.
+    all_start_micros: number;
+    op_start_rel_micros: number;
+    op_end_rel_micros: number;
+    all_end_rel_micros: number;
+    memory: {
+      allocator_name: string;
+      total_bytes: number;  // Stored as string in json and should be parsed.
+      peak_bytes: number;   // Stored as string in json and should be parsed.
+    }[];
+    /** Output sizes recorded for a single execution of a graph node */
+    output: NodeOutput[];
+    timeline_label: string;
+    scheduled_micros: string;
+    thread_id: string;
+  }
+
+  /**
+   * Description for the output tensor(s) of an operation in the graph as
+   * defined in the step_stats.proto file.
+   */
+  export interface NodeOutput {
+    slot: number;  // Stored as string in json and should be parsed.
+    tensor_description: {
+      /** Data type of tensor elements */
+      dtype: string;
+      /** Shape of the tensor */
+      shape: {
+        /**
+         * Dimensions of the tensor, such as [{name: 'input', size: 30},
+         * {name: 'output', size: 40}] for a 30 x 40 2D tensor.  The names
+         * are optional. The order of entries in 'dim' matters: It indicates
+         * the layout of the values in the tensor in-memory representation.
+         */
+        dim: {
+          /** Size of the tensor in that dimension */
+          size: number,  // Stored as string in json and should be parsed.
+          /** Optional name of the tensor dimension */
+          name?: string
+        }[];
+      };
+      /** Information about the size and allocator used for the data */
+      allocation_description: {
+        // The next 2 properties are stored as string in json and
+        // should be parsed.
+        /** Total number of bytes requested */
+        requested_bytes: number;
+        /** Total number of bytes allocated, if known */
+        allocated_bytes?: number;
+        /** Name of the allocator used */
+        allocator_name: string;
+      };
+    };
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/render.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/render.ts
new file mode 100644
index 0000000000..474e358ba9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/render.ts
@@ -0,0 +1,1633 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+/**
+ * Package for the Render Hierarchy for TensorFlow graph.
+ */
+module tf.graph.render {
+
+export type Point = {x: number, y: number};
+
+/**
+ * Color parameters for op nodes.
+ */
+export let OpNodeColors = {DEFAULT_FILL: 'white', DEFAULT_STROKE: '#b2b2b2'};
+
+/**
+ * Color parameters for node encoding.
+ * @type {Object}
+ */
+export let MetanodeColors = {
+  /**
+   * Default fill and stroke to use when no other information is available.
+   */
+  DEFAULT_FILL: '#d9d9d9',
+  DEFAULT_STROKE: '#a6a6a6',
+  SATURATION: 0.6,
+  LIGHTNESS: 0.85,
+  /**
+   * Neutral color to use when the node is expanded (used when coloring by
+   * compute time, memory and device).
+   */
+  EXPANDED_COLOR: '#f0f0f0',
+  /**
+   * Standard hue values for node color palette.
+   */
+  HUES: [220, 100, 180, 40, 20, 340, 260, 300, 140, 60],
+  STRUCTURE_PALETTE(id: number, lightened?: boolean) {
+    // The code below is a flexible way to computationally create a set
+    // of colors that go well together.
+    let hues = MetanodeColors.HUES;
+    let n = hues.length;
+    let hue = hues[id % n];
+    let m = Math.sin(hue * Math.PI / 360);
+    let sat = lightened ? 30 : 90 - 60 * m;
+    let light = lightened ? 95 : 80;
+    return d3.hsl(hue, .01 * sat, .01 * light).toString();
+  },
+  DEVICE_PALETTE(index: number): string {
+    return MetanodeColors.STRUCTURE_PALETTE(index);
+  },
+  XLA_CLUSTER_PALETTE(index: number): string {
+    return MetanodeColors.STRUCTURE_PALETTE(index);
+  },
+  UNKNOWN: '#eee',
+  GRADIENT_OUTLINE: '#888'
+};
+
+/**
+ * Color parameters for op nodes.
+ */
+export let SeriesNodeColors = {
+  DEFAULT_FILL: 'white',
+  DEFAULT_STROKE: '#b2b2b2'
+};
+
+/**
+ * Parameters that affect how the graph is rendered on the screen.
+ */
+const PARAMS = {
+  /**
+   * Whether to extract high degree nodes from the core part of the graph.
+   */
+  enableExtraction: true,
+  /**
+   * The minimum number of nodes for a graph to have in order for high in and
+   * out degree nodes to be extracted in auxiliary. The aim here is to prevent
+   * nodes from being extracted from small graphs.
+   */
+  minNodeCountForExtraction: 15,
+  /**
+   * The minimum in or out degree a node must have in order to be possibly
+   * extracted.
+   */
+  minDegreeForExtraction: 5,
+  /**
+   * Maximum number of control edges a node can have before they aren't
+   * displayed.
+   */
+  maxControlDegree: 4,
+  /**
+   * Maximum in (for outbound bridge paths) or out (for inbound bridge paths)
+   * degree of a node allowed for a bridge path to be rendered to it from a
+   * subhierarchy of nodes. Having a max prevents having too many nodes emanate
+   * from a subhierarchy and crowding up.
+   */
+  maxBridgePathDegree: 4,
+  /**
+   * Types patterns for predefined out-extract nodes, which are
+   * sink-like nodes that will be extracted from the main graph.
+   */
+  outExtractTypes: [
+    'NoOp'  // NoOps are sink-like used for managing control dependencies.
+  ],
+
+  /**
+   * Types patterns for predefined in-extract nodes, which are
+   * source-like nodes that will be extracted from the main graph.
+   */
+  inExtractTypes: [],
+
+  /**
+   * When removing edges from a high degree node, remove all of its edges if
+   * detachAllEdgesForHighDegree is true.  Otherwise remove all in-edges if
+   * the node has high in-degree, or all out-edges if the node has high
+   * out-degree.
+   */
+  detachAllEdgesForHighDegree: true,
+
+  /**
+   * After extracting high in/out degree nodes and predefined
+   * source-like/sink-like, extract isolated nodes to the side
+   * if this extractIsolatedNodesWithAnnotationsOnOneSide is true.
+   */
+  extractIsolatedNodesWithAnnotationsOnOneSide: true,
+
+  /**
+   * Whether to add bridge nodes and edges to the core when building the
+   * subhierarchy of an expanded metanode. See buildSubhierarchy().
+   */
+  enableBridgegraph: true,
+
+  /**
+   * 2 colors, for the minimum and maximum value respectively, whenever we
+   * have a gradient scale.
+   */
+  minMaxColors: ['#fff5f0', '#fb6a4a'],
+
+  /**
+   * Maximum number of annotations to be displayed on a node before an
+   * ellipsis is used.
+   */
+  maxAnnotations: 5
+};
+
+/**
+ * Stores the rendering information, such as x and y coordinates,
+ * for each node in the graph.
+ */
+export class RenderGraphInfo {
+  hierarchy: hierarchy.Hierarchy;
+  private displayingStats: boolean;
+  private index: {[nodeName: string]: RenderNodeInfo};
+  private renderedOpNames: string[];
+  private deviceColorMap: d3.ScaleOrdinal<string, string>;
+  private xlaClusterColorMap: d3.ScaleOrdinal<string, string>;
+  private memoryUsageScale: d3.ScaleLinear<string, string>;
+  private computeTimeScale: d3.ScaleLinear<string, string>;
+  /** Scale for the thickness of edges when there is no shape information. */
+  edgeWidthScale:
+      d3.ScaleLinear<number, number> | d3.ScalePower<number, number>;
+  // Since the rendering information for each node is constructed lazily,
+  // upon node's expansion by the user, we keep a map between the node's name
+  // and whether the rendering information was already constructed for that
+  // node.
+  private hasSubhierarchy: {[nodeName: string]: boolean};
+  root: RenderGroupNodeInfo;
+  traceInputs: Boolean;
+
+  constructor(hierarchy: hierarchy.Hierarchy, displayingStats: boolean) {
+    this.hierarchy = hierarchy;
+    this.displayingStats = displayingStats;
+    this.index = {};
+    this.renderedOpNames = [];
+
+    this.computeScales();
+    // Maps node name to whether the rendering hierarchy was already
+    // constructed.
+    this.hasSubhierarchy = {};
+    this.root = new RenderGroupNodeInfo(hierarchy.root);
+    this.index[hierarchy.root.name] = this.root;
+    this.renderedOpNames.push(hierarchy.root.name);
+    this.buildSubhierarchy(hierarchy.root.name);
+    this.root.expanded = true;
+    this.traceInputs = false;
+  }
+
+  computeScales() {
+    this.deviceColorMap = d3.scaleOrdinal<string>()
+        .domain(this.hierarchy.devices)
+        .range(_.map(d3.range(this.hierarchy.devices.length),
+                     MetanodeColors.DEVICE_PALETTE));
+
+    this.xlaClusterColorMap =
+        d3.scaleOrdinal<string>()
+            .domain(this.hierarchy.xlaClusters)
+            .range(_.map(
+                d3.range(this.hierarchy.xlaClusters.length),
+                MetanodeColors.XLA_CLUSTER_PALETTE));
+
+    let topLevelGraph = this.hierarchy.root.metagraph;
+    // Find the maximum and minimum memory usage.
+    let memoryExtent = d3.extent(topLevelGraph.nodes(),
+        (nodeName, index) => {
+      let node = topLevelGraph.node(nodeName);
+      // Some ops don't have stats at all.
+      if (node.stats != null) {
+        return node.stats.totalBytes;
+      }
+    });
+    this.memoryUsageScale = d3.scaleLinear<string, string>()
+        .domain(memoryExtent)
+        .range(PARAMS.minMaxColors);
+
+    // Find also the minimum and maximum compute time.
+    let computeTimeExtent = d3.extent(topLevelGraph.nodes(),
+        (nodeName, index) => {
+      let node = topLevelGraph.node(nodeName);
+      // Some ops don't have stats at all.
+      if (node.stats != null) {
+        return node.stats.getTotalMicros();
+      }
+    });
+    this.computeTimeScale = d3.scaleLinear<string, string>()
+        .domain(computeTimeExtent)
+        .range(PARAMS.minMaxColors);
+
+    this.edgeWidthScale = this.hierarchy.hasShapeInfo ?
+      scene.edge.EDGE_WIDTH_SCALE :
+      d3.scaleLinear()
+        .domain([1, this.hierarchy.maxMetaEdgeSize])
+        .range([scene.edge.MIN_EDGE_WIDTH, scene.edge.MAX_EDGE_WIDTH]);
+  }
+
+  /**
+   * Get a previously created RenderNodeInfo by its node name.
+   */
+  getRenderNodeByName(nodeName: string): RenderNodeInfo {
+    return this.index[nodeName];
+  }
+
+  /**
+   * Get the underlying node in the hierarchical graph by its name.
+   */
+  getNodeByName(nodeName: string): Node {
+    return this.hierarchy.node(nodeName);
+  }
+
+  /**
+   * Get a previously created RenderNodeInfo for the specified node name,
+   * or create one if it hasn't been created yet.
+   */
+  getOrCreateRenderNodeByName(nodeName: string): RenderNodeInfo {
+    // Polymer may invoke this with null.
+    if (!nodeName) {
+      return null;
+    }
+
+    if (nodeName in this.index) {
+      return this.index[nodeName];
+    }
+
+    let node = this.hierarchy.node(nodeName);
+    // Exit early if the node does not exist in the hierarchy. This can happen
+    // when a graph is reloaded while the infocard points to a node not visible
+    // at the top-level.
+    if (!node) {
+      return null;
+    }
+    let renderInfo = node.isGroupNode ?
+        new RenderGroupNodeInfo(<GroupNode>node) :
+        new RenderNodeInfo(node);
+    this.index[nodeName] = renderInfo;
+    this.renderedOpNames.push(nodeName);
+
+    if (node.stats) {
+      renderInfo.memoryColor = this.memoryUsageScale(node.stats.totalBytes);
+      renderInfo.computeTimeColor =
+          this.computeTimeScale(node.stats.getTotalMicros());
+    }
+
+    if (!node.isGroupNode) {
+      let clusterName = (node as OpNode).xlaCluster;
+      if (clusterName) {
+        renderInfo.xlaClusterColor = this.xlaClusterColorMap(clusterName);
+      }
+    }
+
+    // We only fade nodes when we're displaying stats.
+    renderInfo.isFadedOut = this.displayingStats &&
+        !tf.graph.util.hasDisplayableNodeStats(node.stats);
+
+    if (node.isGroupNode) {
+      // Make a list of tuples (device, proportion), where proportion
+      // is the fraction of op nodes that have that device.
+      let pairs = _.pairs((<GroupNode>node).deviceHistogram);
+      if (pairs.length > 0) {
+        // Compute the total # of devices.
+        let numDevices = _.sum(pairs, _.last);
+        renderInfo.deviceColors = _.map(pairs, pair => ({
+              color: this.deviceColorMap(pair[0]),
+              // Normalize to a proportion of total # of devices.
+              proportion: pair[1] / numDevices
+            }));
+      }
+    } else {
+      let device = (<OpNode>renderInfo.node).device;
+      if (device) {
+        renderInfo.deviceColors = [{
+          color: this.deviceColorMap(device),
+          proportion: 1.0
+        }];
+      }
+    }
+
+    return this.index[nodeName];
+  }
+
+  /**
+   * Return the nearest ancestor node, including itself, that is visible
+   * in the visualization. This method is used so that we can select
+   * (highlight) a node that isn't drawn yet, by selecting (highlighting)
+   * its nearest ancestor that has been drawn.
+   */
+  getNearestVisibleAncestor(name: string): string {
+    let path = getHierarchicalPath(name);
+    for (let i = 0; i < path.length; i++) {
+      let nodeName = path[i];
+      // Op nodes have expanded set to false by default.
+      if (!this.getRenderNodeByName(nodeName).expanded) {
+        return nodeName;
+      }
+    }
+    // Fallthrough. If everything was expanded return the node.
+    return name;
+  }
+
+  // TODO(jimbo): Delete this an any code it touches (all deprecated).
+  setDepth(depth: number): void {
+    setGroupNodeDepth(this.root, +depth);
+  }
+
+  /**
+   * Returns true if the renderNode is an isolated node within its parent node.
+   */
+  isNodeAuxiliary(renderNode: RenderNodeInfo): boolean {
+    let parentNode = <RenderGroupNodeInfo>this.getRenderNodeByName(
+      renderNode.node.parentNode.name);
+    let found = _.find(parentNode.isolatedInExtract, node => {
+      return node.node.name === renderNode.node.name;
+    });
+    if (found) {
+      return true;
+    }
+    found = _.find(parentNode.isolatedOutExtract, node => {
+      return node.node.name === renderNode.node.name;
+    });
+    return !!found;
+  }
+
+  /**
+   * Returns a list of ops that have been rendered so far for this graph. More
+   * ops may later be rendered if the user expands nodes for instance. The list
+   * returned here can only stay the same size or grow on successive calls.
+   */
+  getNamesOfRenderedOps(): string[] {
+    return this.renderedOpNames;
+  }
+
+  buildSubhierarchy(nodeName: string): void {
+    // Terminate if the rendering hierarchy was already constructed
+    // for this node.
+    if (nodeName in this.hasSubhierarchy) {
+      return;
+    }
+
+    let renderNodeInfo = this.index[nodeName];
+
+    // If it is not a meta node or a series node, don't do anything.
+    if (renderNodeInfo.node.type !== NodeType.META &&
+        renderNodeInfo.node.type !== NodeType.SERIES) {
+      return;
+    }
+
+    // At this point we know the rendering information is about a group node.
+    let renderGroupNodeInfo = <RenderGroupNodeInfo> renderNodeInfo;
+    let metagraph = renderGroupNodeInfo.node.metagraph;
+    let coreGraph = renderGroupNodeInfo.coreGraph;
+
+    // Create render nodes to represent each child from the metagraph. Although
+    // these will initially be added to the coreGraph, they may later be
+    // extracted. Also, due to extraction, the coreGraph may contain disjoint
+    // groups between which there is no visible path (other than annotations).
+    _.each(metagraph.nodes(), childName => {
+
+      let childRenderInfo = this.getOrCreateRenderNodeByName(childName);
+      let childNode = childRenderInfo.node;
+
+      coreGraph.setNode(childName, childRenderInfo);
+
+      if (!childNode.isGroupNode) {
+        _.each((<OpNode>childNode).inEmbeddings, embedding => {
+          let renderMetaedgeInfo = new RenderMetaedgeInfo(null);
+          addInAnnotation(childRenderInfo, embedding, null, renderMetaedgeInfo,
+              AnnotationType.CONSTANT);
+          this.index[embedding.name] = new RenderNodeInfo(embedding);
+        });
+        _.each((<OpNode>childNode).outEmbeddings, embedding => {
+          let renderMetaedgeInfo = new RenderMetaedgeInfo(null);
+          addOutAnnotation(childRenderInfo, embedding, null, renderMetaedgeInfo,
+              AnnotationType.SUMMARY);
+          this.index[embedding.name] = new RenderNodeInfo(embedding);
+        });
+      }
+
+    });
+
+    // Add render metaedge info for edges in the metagraph.
+    _.each(metagraph.edges(), edgeObj => {
+      let metaedge = metagraph.edge(edgeObj);
+      let renderMetaedgeInfo = new RenderMetaedgeInfo(metaedge);
+      renderMetaedgeInfo.isFadedOut =
+          this.index[edgeObj.v].isFadedOut || this.index[edgeObj.w].isFadedOut;
+      coreGraph.setEdge(edgeObj.v, edgeObj.w, renderMetaedgeInfo);
+    });
+
+    if (PARAMS.enableExtraction &&
+        renderGroupNodeInfo.node.type === NodeType.META) {
+      extractHighDegrees(renderGroupNodeInfo);
+    }
+
+    // Record that we constructed the rendering hierarchy for this node, so we
+    // don't construct it another time.
+    this.hasSubhierarchy[nodeName] = true;
+
+    // Look up the parent node's render information and short circuit if none.
+    let parentNode = renderGroupNodeInfo.node.parentNode;
+    if (!parentNode) {
+      return;
+    }
+    let parentNodeInfo =
+      <RenderGroupNodeInfo> this.index[parentNode.name];
+
+    // Utility function for computing the name of a bridge node.
+    let getBridgeNodeName = (inbound, ...rest) =>
+        rest.concat([inbound ? 'IN' : 'OUT']).join('~~');
+
+    // Build out the bridgegraph.
+    let bridgegraph = this.hierarchy.getBridgegraph(nodeName);
+
+    // Look for popular nodes so we can make annotations instead of paths.
+    let otherCounts = {
+      // Counts of edges coming INTO other nodes by name (outgoing from self).
+      in: <{[nodeName: string]: number}> {},
+      // Counts of edges going OUT from other nodes by name (coming into self).
+      out: <{[nodeName: string]: number}> {},
+      // Counts of all control edges involving other nodes by name.
+      control: <{[nodeName: string]: number}> {},
+    };
+    _.each(bridgegraph.edges(), e => {
+      // An edge is inbound if its destination node is in the metagraph.
+      let inbound = !!metagraph.node(e.w);
+      let otherName = inbound ? e.v : e.w;
+      let metaedge = bridgegraph.edge(e);
+      if (!metaedge.numRegularEdges) {
+        otherCounts.control[otherName] =
+          (otherCounts.control[otherName] || 0) + 1;
+      } else if (inbound) {
+        otherCounts.out[otherName] = (otherCounts.out[otherName] || 0) + 1;
+      } else {
+        otherCounts.in[otherName] = (otherCounts.in[otherName] || 0) + 1;
+      }
+    });
+
+    // Add annotations and edges for bridgegraph relationships.
+    let hierarchyNodeMap = this.hierarchy.getNodeMap();
+    _.each(bridgegraph.edges(), bridgeEdgeObj => {
+      let bridgeMetaedge = bridgegraph.edge(bridgeEdgeObj);
+
+      // Determine whether this bridge edge is incoming by checking the
+      // metagraph for a node that matches the destination end.
+      let inbound = !!metagraph.node(bridgeEdgeObj.w);
+
+      // Based on the direction of the edge, one endpoint will be an immediate
+      // child of this renderNodeInfo, and the other endpoint will be a sibling
+      // of the parent (or an ancestor further up).
+      let [childName, otherName] =
+        inbound ?
+          [bridgeEdgeObj.w, bridgeEdgeObj.v] :
+          [bridgeEdgeObj.v, bridgeEdgeObj.w];
+
+      let childRenderInfo = this.index[childName];
+      let otherRenderInfo = this.index[otherName];
+      let otherNode =
+        otherRenderInfo ?
+          otherRenderInfo.node :
+          hierarchyNodeMap[otherName];
+
+      // Determine whether this edge is a control edge between nodes where
+      // either node is high-degree with respect to control edges. This will
+      // be a signal to show it as an annotation instead of a bridge edge.
+      let isHighDegreeControlEdge = !bridgeMetaedge.numRegularEdges &&
+        otherCounts.control[otherName] > PARAMS.maxControlDegree;
+
+      let [, childAnnotations] =
+        inbound ?
+          [renderNodeInfo.inAnnotations, childRenderInfo.inAnnotations] :
+          [renderNodeInfo.outAnnotations, childRenderInfo.outAnnotations];
+
+      // Don't render a bridge path if the other node has in or out degree above
+      // a threshold, lest bridge paths emanating out of a metagraph crowd up,
+      // as was the case for the Fatcat LSTM lstm_1 > lstm_1 metagraph.
+      let otherDegreeCount =
+          (inbound ? otherCounts.out : otherCounts.in)[otherName];
+      let isOtherHighDegree = otherDegreeCount > PARAMS.maxBridgePathDegree;
+
+      // The adjoining render metaedge info from the parent's coreGraph, if any.
+      // It will either be a Metaedge involving this node directly, if it
+      // previously came from a metagraph, or it'll be a Metaedge involving
+      // a previously created bridge node standing in for the other node.
+      let adjoiningMetaedge = null;
+
+      // We can only hope to render a bridge path if:
+      //  - bridgegraph paths are enabled,
+      //  - the other node is not too high-degree,
+      //  - the child is in the core (not extracted for being high-degree), and
+      //  - there's a path (in the traversal sense) between child and other.
+      let canDrawBridgePath = false;
+      if (PARAMS.enableBridgegraph &&
+          !isOtherHighDegree &&
+          !isHighDegreeControlEdge &&
+          childRenderInfo.isInCore()) {
+
+        // Utility function for finding an adjoining metaedge.
+        let findAdjoiningMetaedge = targetName => {
+          let adjoiningEdgeObj: graphlib.EdgeObject =
+            inbound ?
+              { v: targetName, w: nodeName } :
+              { v: nodeName, w: targetName };
+          return <RenderMetaedgeInfo>
+            parentNodeInfo.coreGraph.edge(adjoiningEdgeObj);
+        };
+
+        adjoiningMetaedge = findAdjoiningMetaedge(otherName);
+        if (!adjoiningMetaedge) {
+          adjoiningMetaedge = findAdjoiningMetaedge(
+              getBridgeNodeName(inbound, otherName, parentNode.name));
+        }
+
+        canDrawBridgePath = !!adjoiningMetaedge;
+      }
+
+      // Although dataflow edges are acyclic, control dependency edges may
+      // actually point 'backwards' in the graph. If this bridgeMetaedge is
+      // a control dependency, we need to determine whether it's backwards
+      // pointing so that we render it appropriately.
+      //
+      // For instance, say we're rendering a graph with nodes named A/B and Z/Y,
+      // and we're currently rendering the bridgegraph for A. Further, let's say
+      // that there was an original BaseEdge from A/B->Z/Y and a CONTROL EDGE
+      // from Z/Y=>A/B.
+      //
+      //     +----------------+
+      //     | A              |
+      //     |  +-----+       |         +------+
+      //     |  | B   |>----->|>------->| Z    |
+      //     |  |     |       |         |      |
+      //     |  |     |   *   |         |      |
+      //     |  |     |<=====<|<=======<|      |
+      //     |  +-----+       |         +------+
+      //     +----------------+
+      //
+      // When we render the subhierarchy for Metanode A, we'll come across a
+      // control-only Metaedge in the bridgegraph from Z=>A/B (*). The question
+      // is whether this edge is backwards.
+      //
+      // To answer that question, we follow the chain of adjoining metaedges
+      // until we reach the topmost one. In this case, that's the control-only
+      // Metaedge Z=>A in the ROOT's metagraph. We determine that this edge
+      // is backwards by looking at the topological ordering of ROOT's metagraph
+      // (which ignores control edges) and seeing that Z comes AFTER A.
+      //
+      // The property of being backwards is independent of whether the edge
+      // is inbound or outbound. In the preceding example, if we were building
+      // the subhierarchy for Z, we'd find bridge edge Z/Y=>A, walk to its
+      // topmost adjoining metaedge Z=>A and discover that it's backwards.
+      let backwards = false;
+      if (adjoiningMetaedge && !bridgeMetaedge.numRegularEdges) {
+        // Find the top-most adjoining render metaedge information, and the
+        // GroupNode whose metagraph must contain the associated metaedge.
+        let topAdjoiningMetaedge = adjoiningMetaedge;
+        let topGroupNode = parentNodeInfo.node;
+        while (topAdjoiningMetaedge.adjoiningMetaedge) {
+          topAdjoiningMetaedge = topAdjoiningMetaedge.adjoiningMetaedge;
+          topGroupNode = <GroupNode>topGroupNode.parentNode;
+        }
+
+        // Check against the topological ordering for the top node. The current
+        // bridge metaedge we're evaluating is backwards if its source comes
+        // after its destination.
+        let ordering = this.hierarchy.getTopologicalOrdering(topGroupNode.name);
+        let e = topAdjoiningMetaedge.metaedge;
+        backwards = ordering[e.v] > ordering[e.w];
+      }
+
+      // Render backwards control edges as annotations.
+      canDrawBridgePath = canDrawBridgePath && !backwards;
+
+      // If we can't make a bridge path for any reason, then we add an
+      // annotation instead.
+      if (!canDrawBridgePath) {
+        childAnnotations.push(new Annotation(
+            otherNode,
+            otherRenderInfo,
+            new RenderMetaedgeInfo(bridgeMetaedge),
+            AnnotationType.SHORTCUT,
+            inbound));
+        return;
+      }
+
+      // At this point, all conditions have been met for drawing a bridge path.
+
+      // Find or create the IN/OUT node representing otherNode.
+      let bridgeContainerName = getBridgeNodeName(inbound, nodeName);
+      let bridgeNodeName = getBridgeNodeName(inbound, otherName, nodeName);
+      let bridgeNodeRenderInfo = coreGraph.node(bridgeNodeName);
+      if (!bridgeNodeRenderInfo) {
+
+        // Find or create the directional container for the bridge node.
+        let bridgeContainerInfo = coreGraph.node(bridgeContainerName);
+        if (!bridgeContainerInfo) {
+          let bridgeContainerNode: BridgeNode = {
+            // Important node properties.
+            name: bridgeContainerName,
+            type: NodeType.BRIDGE,
+            // Unused node properties.
+            isGroupNode: false,
+            cardinality: 0,
+            parentNode: null,
+            stats: null,
+            include: InclusionType.UNSPECIFIED,
+            // BridgeNode properties.
+            inbound: inbound,
+            nodeAttributes: {},
+          };
+          bridgeContainerInfo =
+            new RenderNodeInfo(bridgeContainerNode);
+          this.index[bridgeContainerName] = bridgeContainerInfo;
+          coreGraph.setNode(bridgeContainerName, bridgeContainerInfo);
+        }
+
+        let bridgeNode: BridgeNode = {
+          // Important node properties.
+          name: bridgeNodeName,
+          type: NodeType.BRIDGE,
+          // Unimportant node properties.
+          isGroupNode: false,
+          cardinality: 1,
+          parentNode: null,
+          stats: null,
+          include: InclusionType.UNSPECIFIED,
+          // BridgeNode properties.
+          inbound: inbound,
+          nodeAttributes: {},
+        };
+        bridgeNodeRenderInfo = new RenderNodeInfo(bridgeNode);
+        this.index[bridgeNodeName] = bridgeNodeRenderInfo;
+        coreGraph.setNode(bridgeNodeName, bridgeNodeRenderInfo);
+
+        // Set bridgeNode to be a graphlib child of the container node.
+        coreGraph.setParent(bridgeNodeName, bridgeContainerName);
+        bridgeContainerInfo.node.cardinality++;
+      }
+
+      // Create and add a bridge render metaedge.
+      let bridgeRenderMetaedge =
+        new RenderMetaedgeInfo(bridgeMetaedge);
+      bridgeRenderMetaedge.adjoiningMetaedge = adjoiningMetaedge;
+      inbound ?
+        coreGraph.setEdge(bridgeNodeName, childName, bridgeRenderMetaedge) :
+        coreGraph.setEdge(childName, bridgeNodeName, bridgeRenderMetaedge);
+
+    }); // End _.each(bridgegraph.edges).
+
+    // For each bridge container (IN and/or OUT), add structural edges between
+    // terminal nodes and that container. A terminal node is one which has no
+    // non-bridge edges in the direction of the container.
+    //
+    // For example, consider a Metanode A which contains two child nodes A/B
+    // and A/C. Let's say it has one edge in the metagraph from A/B->A/C, and
+    // one edge in the bridgegraph from Z->A/C.
+    //
+    // At this point, we've added a container bridge node IN to house all
+    // incoming bridge nodes. We've also added a bridge node Z' (with parent IN)
+    // to A, and a bridge edge from Z'->C.
+    //
+    //     +----------------------+
+    //     | A          +---+     |
+    //     |    +------>| C |     |
+    //     |    |       +---+     |
+    //     |    |         ^       |
+    //     |    |         |       |
+    //     |    |    +----|----+  |
+    //     |    |    | IN |    |  |
+    //     |  +---+  |  +---+  |  |
+    //     |  | B |  |  | Z'|  |  |
+    //     |  +---+  |  +---+  |  |
+    //     |         +---------+  |
+    //     +----------------------+
+    //
+    // With no other help, dagre would lay out B and Z' on the same level,
+    // because both of them have no incoming edges. In other words, B is a
+    // terminal node in the INCOMING direction.
+    //
+    // But we want to force dagre to lay out Z' (and everything in IN) lower
+    // than all non-bridge nodes, so that there's enough room for the bridge
+    // edges after they've been adjusted to meet up with paths coming in from
+    // outside.
+    //
+    // To force Z' (and all other bridge nodes) to be lowest in the graph, we
+    // identify terminal nodes like B and give them structural edges to
+    // a new structural bridge node S which we add to IN.
+    //
+    //     +----------------------+
+    //     | A          +---+     |
+    //     |       +--->| C |     |
+    //     |       |    +---+     |
+    //     |     +---+    ^       |
+    //     |     | B |    |       |
+    //     |     +---+    |       |
+    //     |       ^      |       |
+    //     |       |      |       |
+    //     |  +----|------|----+  |
+    //     |  |IN  |      |    |  |
+    //     |  |  +---+  +---+  |  |
+    //     |  |  | S |  | Z'|  |  |
+    //     |  |  +---+  +---+  |  |
+    //     |  +----------------+  |
+    //     +----------------------+
+    //
+    // This ensures that dagre will lay out the bridge containers strictly at
+    // the ends of the graph. The structural edges will never be seen in the
+    // visualization except as a debugging aid.
+    _.each([true, false], inbound => {
+      let bridgeContainerName = getBridgeNodeName(inbound, nodeName);
+      let bridgeContainerInfo = coreGraph.node(bridgeContainerName);
+      if (!bridgeContainerInfo) {
+        return;
+      }
+      _.each(coreGraph.nodes(), childName => {
+        // Short-circuit if this child is a bridge node or it's not a terminal
+        // node in the direction we're interested in.
+        let childNodeInfo = coreGraph.node(childName);
+        if (childNodeInfo.node.type === NodeType.BRIDGE) {
+          return;
+        }
+        let isTerminal = inbound ?
+          !coreGraph.predecessors(childName).length :
+          !coreGraph.successors(childName).length;
+        if (!isTerminal) {
+          return;
+        }
+
+        // Find or create a bridge node in the container for all structural
+        // metaedges. It would have been nice to skip this step and simply
+        // set a metaedge between the terminal node and the container node, but
+        // in that case, something about the graph upsets dagre.layout()'s
+        // longestPath algorithm (was getting errors due to an undefined).
+        let structuralNodeName =
+            getBridgeNodeName(inbound, nodeName, 'STRUCTURAL_TARGET');
+        let structuralRenderInfo = coreGraph.node(structuralNodeName);
+        if (!structuralRenderInfo) {
+          let bridgeNode: BridgeNode = {
+            // Important Node properties.
+            name: structuralNodeName,
+            type: NodeType.BRIDGE,
+            // Unimportant Node properties.
+            isGroupNode: false,
+            cardinality: 1,
+            parentNode: null,
+            stats: null,
+            include: InclusionType.UNSPECIFIED,
+            // BridgeNode properties.
+            inbound: inbound,
+            nodeAttributes: {},
+          };
+          structuralRenderInfo = new RenderNodeInfo(bridgeNode);
+          structuralRenderInfo.structural = true;
+          this.index[structuralNodeName] = structuralRenderInfo;
+          coreGraph.setNode(structuralNodeName, structuralRenderInfo);
+          bridgeContainerInfo.node.cardinality++;
+          coreGraph.setParent(structuralNodeName, bridgeContainerName);
+        }
+
+        // Create the structural Metaedge and insert it.
+        let structuralMetaedgeInfo = new RenderMetaedgeInfo(null);
+        structuralMetaedgeInfo.structural = true;
+        structuralMetaedgeInfo.weight--; // Reduce weight for dagre layout.
+        inbound ?
+          coreGraph.setEdge(
+              structuralNodeName, childName, structuralMetaedgeInfo) :
+          coreGraph.setEdge(
+              childName, structuralNodeName, structuralMetaedgeInfo);
+      });
+    });
+  }
+}
+
+/**
+ * A class for rendering annotation object which contains label
+ * about the node embedded as annotation, type of annotation and the location
+ * of both the annotation's node and edge.
+ *
+ * Annotation objects include embedded constants, embedded summary, and
+ * edge shortcuts.
+ */
+export class Annotation {
+  node: Node;
+  renderNodeInfo: RenderNodeInfo;
+  renderMetaedgeInfo: RenderMetaedgeInfo;
+  annotationType: AnnotationType;
+  /**
+   * Center position of annotation relative to the host
+   * node's center x.
+   */
+  dx: number;
+  /**
+   * Center position of annotation relative to the host
+   * node's center y.
+   */
+  dy: number;
+  width: number;
+  height: number;
+  /**
+   * The names of nodes on either side of this edge.
+   */
+  v: string;
+  w: string;
+  /**
+   * A flag whether it is an in-annotation (if true) or
+   * out-annotation  (if false).
+   */
+  isIn: boolean;
+  /** Label horizontal offset from the end of the node shape */
+  labelOffset: number;
+  /**
+   * Array of points for edges from the annotation to its host
+   * node. Each point contains the point location, relative to
+   * the host node's center.
+   */
+  points: {dx: number, dy: number}[];
+
+  /**
+   * Creates a new Annotation.
+   *
+   * @param node The underlying node this annotation points to.
+   * @param renderNodeInfo The render information for the underlying node
+   *     this annotation points to. This can be null if the annotation
+   *     denotes an embedding (constant, summary), in which case we
+   *     use the node property.
+   * @param renderMetaedgeInfo The render information for the edge associated
+   *     with the annotation.
+   * @param type The type of the annotation.
+   * @param isIn True if it is an in-annotation. False if it is an
+   *     out-annotation.
+   */
+  constructor(node: Node, renderNodeInfo: RenderNodeInfo,
+      renderMetaedgeInfo: RenderMetaedgeInfo, type: AnnotationType,
+      isIn: boolean) {
+    this.node = node;
+    this.renderNodeInfo = renderNodeInfo;
+    this.renderMetaedgeInfo = renderMetaedgeInfo;
+    this.annotationType = type;
+    // Properties specified by layout
+    this.dx = 0;
+    this.dy = 0;
+    this.width = 0;
+    this.height = 0;
+    // Properties needed for generating an ID for the edge's path element if
+    // this annotation is associated with a metaedge.
+    if (renderMetaedgeInfo && renderMetaedgeInfo.metaedge) {
+      this.v = renderMetaedgeInfo.metaedge.v;
+      this.w = renderMetaedgeInfo.metaedge.w;
+    }
+
+    this.isIn = isIn;
+    this.points = [];
+  }
+};
+
+export enum AnnotationType {SHORTCUT, CONSTANT, SUMMARY, ELLIPSIS};
+
+/**
+ * Manages a list of annotations. Two will be used for each
+ * RenderNodeInfo, one for in annotations and one for out annotations.
+ */
+export class AnnotationList {
+  /**
+   * List of visually drawable annotations, may include an ellipses annotation
+   * if the number added exceeds the number specified by maxAnnotations.
+   */
+  list: Annotation[];
+
+  /**
+   * Set of nodes which have been added as annotations to this list, so we can
+   * prevent duplicates.
+   */
+  nodeNames: { [nodeName: string]: boolean };
+
+  constructor() {
+    this.list = [];
+    this.nodeNames = {};
+  }
+
+  /**
+   * Append an annotation to the list, or a stand-in ellipsis annotation instead
+   * if this would make it too many.
+   */
+  push(annotation: Annotation): void {
+    if (annotation.node.name in this.nodeNames) {
+      return; // Skip duplicate annotation.
+    }
+    this.nodeNames[annotation.node.name] = true;
+
+    if (this.list.length < PARAMS.maxAnnotations) {
+      this.list.push(annotation);
+      return;
+    }
+
+    let lastAnnotation = this.list[this.list.length - 1];
+    if (lastAnnotation.annotationType === AnnotationType.ELLIPSIS) {
+      let ellipsisNode = <EllipsisNode>lastAnnotation.node;
+      ellipsisNode.setNumMoreNodes(++ellipsisNode.numMoreNodes);
+      return;
+    }
+
+    let ellipsisNode = new tf.graph.EllipsisNodeImpl(1);
+    this.list.push(new Annotation(ellipsisNode,
+        new RenderNodeInfo(ellipsisNode), null,
+        AnnotationType.ELLIPSIS, annotation.isIn));
+  }
+}
+
+/**
+ * Contains rendering information about a node in the hierarchical graph.
+ */
+export class RenderNodeInfo {
+  /** Reference to the original underlying Node from the hierarchical graph. */
+  node: Node;
+  /** Whether the node is expanded or not. */
+  expanded: boolean;
+  /**
+   * List of rendering information about in-annotations like constants and
+   * shortcuts to high-degree nodes.
+   */
+  inAnnotations: AnnotationList;
+  /**
+   * List of rendering information about out-annotations (e.g. summary nodes)
+   */
+  outAnnotations: AnnotationList;
+
+  // --- Params specified by layout --- //
+
+  /** Center x position */
+  x: number;
+  /** Center y position */
+  y: number;
+  /**
+   * Total width of the node's shape, including in- and out-annotations. This
+   * property is used by dagre to layout the graph.
+   */
+  width: number;
+  /**
+   * Total height of the node's shape, including in- and out-annotations. This
+   * property is used by dagre to layout the graph.
+   */
+  height: number;
+  /**
+   * Size of the main box of the node, excluding in- and out-annotations. This
+   * property is used to draw the rectangle/ellipse shape denoting the node.
+   */
+  coreBox: {
+    width: number,
+    height: number,
+  };
+
+  /** Width of the bounding box for all in-annotations. */
+  inboxWidth: number;
+  /** Width of the bounding box for all out-annotations. */
+  outboxWidth: number;
+  /**
+   * Whether the node should be excluded from the scene.
+   * This is only used when there are too many items in a series so we only
+   * want to include top N ones.
+   */
+  // TODO(jimbo): Now that series rendering is non-recursive, remove this and
+  // all its uses from the code base.
+  excluded: boolean;
+
+  // --- Params used in drawing the bridge paths --- //
+
+  /**
+   * All bridge nodes are meant to be invisible, but whereas most represent a
+   * relationship from the underlying graph hierarchy, some exist solely for
+   * layout reasons. Specifically, those bridge nodes which have only structural
+   * rendering metaedges.
+   */
+  structural: boolean;
+
+  // --- Params for the size of the node box --- //
+
+  /** Label vertical offset from the center of node shape */
+  labelOffset: number;
+  /** Rectangle radius (for making rounded rectangle) */
+  radius: number;
+
+  // --- Params for expanded node --- //
+
+  /** Label height for expanded node. */
+  labelHeight: number;
+  // Paddings between inner subscene and the border of the expanded node.
+  paddingTop: number;
+  paddingLeft: number;
+  paddingRight: number;
+  paddingBottom: number;
+
+  /**
+   * Whether a node is extracted as source-like (having high out-degree or
+   * matching predefined in-extract pattern.)
+   */
+  isInExtract: boolean;
+  /**
+   * Whether a node is extracted as sink-like (having high in-degree or matching
+   * predefined out-extract pattern.)
+   */
+  isOutExtract: boolean;
+
+  /**
+   * List of (color, proportion) tuples based on the proportion of devices of
+   * its children. If this node is an op node, this list will have only one
+   * color with proportion 1.0.
+   */
+  deviceColors: Array<{color: string, proportion: number}>;
+
+  /**
+   * Color according to the XLA cluster of this node.
+   */
+  xlaClusterColor: string;
+
+  /**
+   * Color according to the memory usage of this node.
+   */
+  memoryColor: string;
+
+  /**
+   * Color according to the compute time of this node.
+   */
+  computeTimeColor: string;
+
+  /**
+   * Whether this node is faded out. Used when displaying stats.
+   */
+  isFadedOut: boolean;
+
+  constructor(node: Node) {
+    this.node = node;
+    this.expanded = false;
+    this.inAnnotations = new AnnotationList();
+    this.outAnnotations = new AnnotationList();
+    // Params specified by layout
+    this.x = 0;
+    this.y = 0;
+    this.width = 0;
+    this.height = 0;
+    this.inboxWidth = 0;
+    this.outboxWidth = 0;
+
+    this.excluded = false;
+
+    // Params for bridge paths.
+    this.structural = false;
+
+    // Params for node box.
+    this.labelOffset = 0;
+    this.radius = 0;
+
+    // Params for expanded node
+    this.labelHeight = 0;
+    this.paddingTop = 0;
+    this.paddingLeft = 0;
+    this.paddingRight = 0;
+    this.paddingBottom = 0;
+    this.isInExtract = false;
+    this.isOutExtract = false;
+    this.coreBox = {width: 0, height: 0};
+
+    // By default, we don't fade nodes out. Default to false for safety.
+    this.isFadedOut = false;
+  }
+
+  isInCore(): boolean {
+    return !this.isInExtract && !this.isOutExtract;
+  }
+}
+
+/**
+ * Contains rendering information about a Metaedge from the underlying
+ * hierarchical graph. It may be from either a metagraph or a bridgegraph.
+ */
+export class RenderMetaedgeInfo {
+  /**
+   * Reference to the original underlying Metaedge from the hierarchical graph,
+   * if any. This will be null for the edges which connect OpNodes to their
+   * embeddings, for example.
+   */
+  metaedge: Metaedge;
+
+  /**
+   * Reference to the adjoining RenderMetaedgeInfo from the parent's
+   * coreGraph. This is used during layout to determine the point at which this
+   * edge should touch the node's bounding box. This property will be null for
+   * edges which terminate at a node on both ends (all non-bridge edges).
+   */
+  adjoiningMetaedge: RenderMetaedgeInfo;
+
+  /**
+   * Most of the time, a RenderMetaedgeInfo object represents a real
+   * edge between nodes in the underlying graph structure. But sometimes, an
+   * edge only exists for layout purposes. These structural edges are added
+   * during buildSubhierarchy() to force dagre.layout() to put bridge nodes
+   * at the ends of the flow.
+   * @see buildSubhierarchy()
+   */
+  structural: boolean;
+
+  /**
+   * Weight of the edge, used by dagre when deciding how important an edge is.
+   * Edges with higher weight are made shorter and straighter. The default
+   * dagre uses is 1.
+   */
+  weight: number;
+
+  /**
+   * X and Y coordinate pairs of the points in the path of the edge.
+   * @see tf.graph.node.subsceneAdjustPaths
+   */
+  points: Point[];
+
+  /**
+   * D3 selection of the group containing the path that displays this edge.
+   */
+  edgeGroup: d3.Selection<RenderMetaedgeInfo & any, any, any, any>;
+
+  /** Id of the <marker> used as a start-marker for the edge path. */
+  startMarkerId: string;
+
+  /** Id of the <marker> used as an end-marker for the edge path. */
+  endMarkerId: string;
+
+  /**
+   * Whether this edge is faded out. Used for fading out unused edges when
+   * displaying run statistics.
+   */
+  isFadedOut: boolean;
+
+  constructor(metaedge: Metaedge) {
+    this.metaedge = metaedge;
+    this.adjoiningMetaedge = null;
+    this.structural = false;
+    this.weight = 1;
+    this.isFadedOut = false;
+  }
+}
+
+function addInAnnotation(node: RenderNodeInfo, predecessor: Node,
+    predecessorRenderInfo: RenderNodeInfo,
+    edge: RenderMetaedgeInfo, type: AnnotationType): void {
+  let annotation = new Annotation(predecessor, predecessorRenderInfo, edge,
+      type, true);
+  node.inAnnotations.push(annotation);
+}
+
+function addOutAnnotation(node: RenderNodeInfo, successor: Node,
+    successorRenderInfo: RenderNodeInfo, edge: RenderMetaedgeInfo,
+    type: AnnotationType): void {
+  let annotation = new Annotation(successor, successorRenderInfo, edge,
+      type, false);
+  node.outAnnotations.push(annotation);
+}
+
+function setGraphDepth(graph: graphlib.Graph<RenderNodeInfo, any>,
+    depth: number) {
+  _.each(graph.nodes(), nodeName => {
+    let child = graph.node(nodeName);
+    child.expanded = depth > 1; // set all child of depth 1 to collapsed
+    if (depth > 0) {
+      switch (child.node.type) {
+        case NodeType.META:
+        case NodeType.SERIES:
+          setGroupNodeDepth(<RenderGroupNodeInfo>child, depth - 1);
+          break;
+        // Do nothing for leaf
+      }
+    }
+  });
+};
+
+export class RenderGroupNodeInfo extends RenderNodeInfo {
+  node: GroupNode;
+  /**
+   * The core graph is derived from the underlying node's metagraph, minus
+   * the extracted source-like and sink-like nodes.
+   */
+  coreGraph: graphlib.Graph<RenderNodeInfo, RenderMetaedgeInfo>;
+  /** Size of the bounding box for a metanode's isolated in-extract children. */
+  inExtractBox: {width: number, height: number};
+  /**
+   * Size of the bounding box for a metanode's isolated out-extract children.
+   */
+  outExtractBox: {width: number, height: number};
+  /** Array of isolated in-extract nodes. */
+  isolatedInExtract: RenderNodeInfo[];
+  /** Array of isolated out-extract nodes. */
+  isolatedOutExtract: RenderNodeInfo[];
+
+  constructor(groupNode: GroupNode) {
+    super(groupNode);
+    let metagraph = groupNode.metagraph;
+    let gl = metagraph.graph();
+    this.coreGraph =
+        createGraph<RenderNodeInfo, RenderMetaedgeInfo>(
+            gl.name, GraphType.CORE, { compound: true });
+    this.inExtractBox = {width: 0, height: 0};
+    this.outExtractBox = {width: 0, height: 0};
+    this.isolatedInExtract = [];
+    this.isolatedOutExtract = [];
+  }
+}
+
+function setGroupNodeDepth(renderInfo: RenderGroupNodeInfo,
+    depth: number): void {
+  if (renderInfo.coreGraph) {
+    setGraphDepth(renderInfo.coreGraph, depth);
+  }
+}
+
+/**
+ * Remove an edge from the graph and add annotations to both ends of the edge.
+ *
+ * @param The core graph.
+ * @param v Source name.
+ * @param w Sink name.
+ */
+function createShortcut(
+    graph: graphlib.Graph<RenderNodeInfo, RenderMetaedgeInfo>,
+    v: string, w: string) {
+  let src = graph.node(v);
+  let sink = graph.node(w);
+  let edge = graph.edge(v, w);
+
+  // If either of the nodes is explicitly included in the main graph and
+  // both nodes are in the main graph then do not create the shortcut
+  // and instead keep the real edge.
+  if ((src.node.include === InclusionType.INCLUDE ||
+       sink.node.include === InclusionType.INCLUDE) &&
+      src.node.include !== InclusionType.EXCLUDE &&
+      sink.node.include !== InclusionType.EXCLUDE) {
+    return;
+  }
+
+  // Add each annotation.
+  addOutAnnotation(src, sink.node, sink, edge, AnnotationType.SHORTCUT);
+  addInAnnotation(sink, src.node, src, edge, AnnotationType.SHORTCUT);
+
+  // Remove the edge from the core graph.
+  graph.removeEdge(v, w);
+}
+
+/**
+ * Remove edges from a node, and set its isOutExtract property to true,
+ * and remove the node and move it to isolatedOutExtract.
+ *
+ * If detachAllEdgesForHighDegree or forceDetach is true, extract all of its
+ * edges. Otherwise, only extract all in-edges.
+ */
+function makeOutExtract(renderNode: RenderGroupNodeInfo, n: string,
+    forceDetach?: boolean) {
+  let graph = renderNode.coreGraph;
+  let child = graph.node(n);
+  child.isOutExtract = true;
+
+  _.each(graph.predecessors(n), (p, index) => {
+    createShortcut(graph, p, n);
+  });
+
+  if (PARAMS.detachAllEdgesForHighDegree || forceDetach) {
+    _.each(graph.successors(n), (s, index) => {
+      createShortcut(graph, n, s);
+    });
+  }
+
+  // Remove the node from the core graph if it no longer has neighbors.
+  if (graph.neighbors(n).length === 0) {
+    child.node.include = InclusionType.EXCLUDE;
+    renderNode.isolatedOutExtract.push(child);
+    graph.removeNode(n);
+  }
+}
+
+/**
+ * Remove edges from a node, set its isInExtract property to true,
+ * and remove the node and move it to isolatedInExtract.
+ *
+ * If detachAllEdgesForHighDegree or forceDetach is true, extract all of its
+ * edges. Otherwise, only remove all out-edges.
+ */
+export function makeInExtract(renderNode: RenderGroupNodeInfo, n: string,
+    forceDetach?: boolean) {
+  let graph = renderNode.coreGraph;
+  let child = graph.node(n);
+  child.isInExtract = true;
+
+  _.each(graph.successors(n), (s, index) => {
+    createShortcut(graph, n, s);
+  });
+
+  if (PARAMS.detachAllEdgesForHighDegree || forceDetach) {
+    _.each(graph.predecessors(n), (p, index) => {
+      createShortcut(graph, p, n);
+    });
+  }
+
+  // Remove the node from the core graph if it no longer has neighbors.
+  if (graph.neighbors(n).length === 0) {
+    child.node.include = InclusionType.EXCLUDE;
+    renderNode.isolatedInExtract.push(child);
+    graph.removeNode(n);
+  }
+}
+
+/**
+ * Check whether the node's type is a member of the given list of types.
+ *
+ * @param node Node.
+ * @param types List of type to match.
+ */
+function hasTypeIn(node: Node, types: string[]): boolean {
+  if (node.type === NodeType.OP) {
+    for (let i = 0; i < types.length; i++) {
+      if ((<OpNode>node).op === types[i]) { return true; }
+    }
+  } else if (node.type === NodeType.META) {
+    let rootOpNode = (<Metanode>node).getRootOp();
+    if (rootOpNode) {
+      for (let i = 0; i < types.length; i++) {
+        if (rootOpNode.op === types[i]) { return true; }
+      }
+    }
+  }
+  return false;
+}
+
+/** Move nodes that are specified to be excluded out of the core graph. */
+function extractSpecifiedNodes(renderNode: RenderGroupNodeInfo) {
+  let graph = renderNode.coreGraph;
+  _.each(graph.nodes(), n => {
+    let renderInfo = graph.node(n);
+    if (renderInfo.node.include === InclusionType.EXCLUDE) {
+      if (renderNode.coreGraph.outEdges(n).length >
+          renderNode.coreGraph.inEdges(n).length) {
+        makeOutExtract(renderNode, n, true);
+      } else {
+        makeInExtract(renderNode, n, true);
+      }
+    }
+  });
+}
+
+/** Remove edges from pre-defined out-extract patterns */
+function extractPredefinedSink(renderNode: RenderGroupNodeInfo) {
+  let graph = renderNode.coreGraph;
+  _.each(graph.nodes(), n => {
+    let renderInfo = graph.node(n);
+    if (renderInfo.node.include !== InclusionType.UNSPECIFIED) {
+      return;
+    }
+    if (hasTypeIn(renderInfo.node, PARAMS.outExtractTypes)) {
+      makeOutExtract(renderNode, n);
+    }
+  });
+}
+
+/** Remove edges from pre-defined in-extract patterns */
+function extractPredefinedSource(renderNode) {
+  let graph = renderNode.coreGraph;
+  _.each(graph.nodes(), n => {
+    let renderInfo = graph.node(n);
+    if (renderInfo.node.include !== InclusionType.UNSPECIFIED) {
+      return;
+    }
+    if (hasTypeIn(renderInfo.node, PARAMS.inExtractTypes)) {
+      makeInExtract(renderNode, n);
+    }
+  });
+}
+
+/** Extract nodes deemed to have either high in-degree or high out-degree. */
+function extractHighInOrOutDegree(renderNode: RenderGroupNodeInfo) {
+  let graph = renderNode.coreGraph;
+
+  // Create mappings from node to in and out degrees. Count the number of valid
+  // nodes along the way.
+  let nodeToInDegree = {};
+  let nodeToOutDegree = {};
+  let validNodeCount = 0;
+  _.each(graph.nodes(), currentNode => {
+    if (graph.node(currentNode).node.include !== InclusionType.UNSPECIFIED) {
+      // This node is not included in the first place.
+      return;
+    }
+
+    // Count the in and out degrees based on only regular edges, unless there
+    // are no regular edges, in which case use the number of control edges.
+    // This is done so that control edges don't affect if nodes are extracted
+    // from the core graph, unless the node is only used for control.
+    let inDegree =
+        _.reduce(graph.predecessors(currentNode), (inDegree, pred) => {
+          let metaedge = graph.edge(pred, currentNode).metaedge;
+          return inDegree + (metaedge.numRegularEdges ? 1 : 0);
+        }, 0);
+    if (inDegree === 0 && graph.predecessors(currentNode).length > 0) {
+      inDegree = graph.predecessors(currentNode).length;
+    }
+
+    let outDegree =
+        _.reduce(graph.successors(currentNode), (outDegree, succ) => {
+          let metaedge = graph.edge(currentNode, succ).metaedge;
+          return outDegree + (metaedge.numRegularEdges ? 1 : 0);
+        }, 0);
+    if (outDegree === 0 && graph.successors(currentNode).length > 0) {
+      outDegree = graph.successors(currentNode).length;
+    }
+
+    // Store the in and out degrees of this node to avoid recomputing.
+    nodeToInDegree[currentNode] = inDegree;
+    nodeToOutDegree[currentNode] = outDegree;
+    validNodeCount++;
+  });
+
+  if (validNodeCount < PARAMS.minNodeCountForExtraction) {
+    // This graph has few nodes. Do not extract any nodes.
+    return;
+  }
+
+  // We only extract if the node has a min in or out degree greater than this.
+  let minUpperBound = PARAMS.minDegreeForExtraction - 1;
+
+  // Mark for extraction nodes with in-degree > Q3 + (Q3 - Q1).
+  let q3Index = Math.round(validNodeCount * 0.75);
+  let q1Index = Math.round(validNodeCount * 0.25);
+  let sortedByInDegree = Object.keys(nodeToInDegree).sort((node0, node1) => {
+    return nodeToInDegree[node0] - nodeToInDegree[node1];
+  });
+  let inDegreeQ3 = nodeToInDegree[sortedByInDegree[q3Index]];
+  let inDegreeQ1 = nodeToInDegree[sortedByInDegree[q1Index]];
+  let inDegreeUpperBound = inDegreeQ3 + inDegreeQ3 - inDegreeQ1;
+  // Only extract if the upper bound is high enough.
+  inDegreeUpperBound = Math.max(inDegreeUpperBound, minUpperBound);
+  for (let i = validNodeCount - 1;
+       nodeToInDegree[sortedByInDegree[i]] > inDegreeUpperBound; i--) {
+    // Extract a high in-degree node.
+    makeInExtract(renderNode, sortedByInDegree[i]);
+  }
+
+  // Mark for extraction nodes with out-degree > Q3 + (Q3 - Q1) * 4.
+  let sortedByOutDegree = Object.keys(nodeToOutDegree).sort((node0, node1) => {
+    return nodeToOutDegree[node0] - nodeToOutDegree[node1];
+  });
+  let outDegreeQ3 = nodeToOutDegree[sortedByOutDegree[q3Index]];
+  let outDegreeQ1 = nodeToOutDegree[sortedByOutDegree[q1Index]];
+  // The upper bound for extracting out-degree nodes is higher than that for
+  // extracting in-degree ones (Note the "* 4") because, in practice, some
+  // graphs look worse with a smaller out-degree bound. For instance, a smaller
+  // out-degree bound removes the convolution nodes from cifar 10 train's graph.
+  let outDegreeUpperBound = outDegreeQ3 + (outDegreeQ3 - outDegreeQ1) * 4;
+  // Only extract if the upper bound is high enough.
+  outDegreeUpperBound = Math.max(outDegreeUpperBound, minUpperBound);
+  for (let i = validNodeCount - 1;
+       nodeToOutDegree[sortedByOutDegree[i]] > outDegreeUpperBound; i--) {
+    let node = graph.node(sortedByOutDegree[i]);
+    if (!node || node.isInExtract) {
+      // This node has already been extracted due to high in-degree. It might
+      // have been removed from the graph in general (during in-degree
+      // extraction) due to a lack of neighbors. Do not extract this node twice.
+      continue;
+    }
+
+    // Extract a high out-degree node that has not already been extracted.
+    makeOutExtract(renderNode, sortedByOutDegree[i]);
+  }
+}
+
+/** Remove control edges from nodes that have too many control edges */
+function removeControlEdges(renderNode: RenderGroupNodeInfo) {
+  let graph = renderNode.coreGraph;
+
+  // Collect control edges into a map by node name.
+  let map = <{[nodeName: string]: graphlib.EdgeObject[]}>{};
+  _.each(graph.edges(), e => {
+    if (!graph.edge(e).metaedge.numRegularEdges) {
+      (map[e.v] = map[e.v] || []).push(e);
+      (map[e.w] = map[e.w] || []).push(e);
+    }
+  });
+
+  // For each node with too many control edges, turn them into annotations.
+  _.each(map, (edges, nodeName) => {
+    if (edges.length > PARAMS.maxControlDegree) {
+      _.each(edges, e => createShortcut(graph, e.v, e.w));
+    }
+  });
+}
+
+/**
+ * Given an integer, picks a hue that is far apart from other colors.
+ * The formula for picking color that avoid collision is:
+ *     hue = (color range * golden ratio * index) % color range
+ */
+export function mapIndexToHue(id: number): number {
+  let GOLDEN_RATIO = 1.61803398875;
+  // Hue of 0 is reserved for the gray nodes.
+  let MIN_HUE = 1;
+  let MAX_HUE = 359;
+  let COLOR_RANGE = MAX_HUE - MIN_HUE;
+  return MIN_HUE + ((COLOR_RANGE * GOLDEN_RATIO * id) % COLOR_RANGE);
+};
+
+/**
+ * Remove edges and add to annotation instead.
+ *
+ * For root node, consider predefined types for source and sink.
+ * We do not extract predefined type from non-root so that Variables and the
+ * sgd node (op type = 'NoOp') do not get extract from inside own group.
+ *
+ * The order of extraction is important here as swapping the order can totally
+ * screw up the graph layout.
+ *
+ * @param {Render.Node} renderNode Node to manipulate.
+ */
+function extractHighDegrees(renderNode: RenderGroupNodeInfo) {
+
+  extractSpecifiedNodes(renderNode);
+
+  if (PARAMS.outExtractTypes) {
+    extractPredefinedSink(renderNode);
+  }
+
+  // This has to come before extract high in-degree to protect the core part
+  // that takes many variables.
+  if (PARAMS.inExtractTypes) {
+    extractPredefinedSource(renderNode);
+  }
+
+  extractHighInOrOutDegree(renderNode);
+
+  if (PARAMS.maxControlDegree) {
+    removeControlEdges(renderNode);
+  }
+
+  // Extract isolated nodes, which can be
+  // (1) source-like and sink-like nodes that are not originally isolated but
+  //     become isolated after further removal.
+  // (2) isolated nodes with annotations on one-side.  These might be either
+  //     - nodes that originally have high out-degree but because we remove
+  //       high in-degree nodes first, they no longer have high in-degree when
+  //       we check.  (Detecting all high-degree before removing also leads to
+  //       another problem.)
+  //     - nodes that do not have high degree, but their neighbors are all
+  //       extracted, so it might make sense to extract them too.
+
+  let graph = renderNode.coreGraph;
+  _.each(graph.nodes(), n => {
+    let child = graph.node(n);
+    let degree = graph.neighbors(n).length;
+    if (child.node.include !== InclusionType.UNSPECIFIED) {
+      return;
+    }
+    if (degree === 0) {
+      let hasOutAnnotations = child.outAnnotations.list.length > 0;
+      let hasInAnnotations = child.inAnnotations.list.length > 0;
+
+      if (child.isInExtract) { // Is source-like.
+        // This case only happens if detachAllEdgesForHighDegree is false.
+        // (Otherwise all source-like nodes are all isolated already.)
+        renderNode.isolatedInExtract.push(child);
+        child.node.include = InclusionType.EXCLUDE;
+        graph.removeNode(n);
+      } else if (child.isOutExtract) { // Is sink-like.
+        // This case only happens if detachAllEdgesForHighDegree is false.
+        // // (Otherwise all sink-like nodes are all isolated already.)
+        renderNode.isolatedOutExtract.push(child);
+        child.node.include = InclusionType.EXCLUDE;
+        graph.removeNode(n);
+      } else if (PARAMS.extractIsolatedNodesWithAnnotationsOnOneSide) {
+        if (hasOutAnnotations && !hasInAnnotations) {
+          child.isInExtract = true; // for ones with high out-annotations
+          renderNode.isolatedInExtract.push(child);
+          child.node.include = InclusionType.EXCLUDE;
+          graph.removeNode(n);
+        } else if (hasInAnnotations && !hasOutAnnotations) {
+          child.isOutExtract = true; // for ones with high in-annotations
+          renderNode.isolatedOutExtract.push(child);
+          child.node.include = InclusionType.EXCLUDE;
+          graph.removeNode(n);
+        } else {
+          // if a low degree node has both in- & out- annotations, do nothing
+          // because it is unclear which side it should go to.
+        }
+      }
+    }
+  });
+}
+} // close module tf.graph.render
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
new file mode 100644
index 0000000000..06f03e910a
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
@@ -0,0 +1,680 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph.scene {
+  const svgNamespace = 'http://www.w3.org/2000/svg';
+
+  /** Enums element class of objects in the scene */
+  export let Class = {
+    Node: {
+      // <g> element that contains nodes.
+      CONTAINER: 'nodes',
+      // <g> element that contains detail about a node.
+      GROUP: 'node',
+      // <g> element that contains visual elements (like rect, ellipse).
+      SHAPE: 'nodeshape',
+      // <*> element(s) under SHAPE that should receive color updates.
+      COLOR_TARGET: 'nodecolortarget',
+      // <text> element showing the node's label.
+      LABEL: 'nodelabel',
+      // <g> element that contains all visuals for the expand/collapse
+      // button for expandable group nodes.
+      BUTTON_CONTAINER: 'buttoncontainer',
+      // <circle> element that surrounds expand/collapse buttons.
+      BUTTON_CIRCLE: 'buttoncircle',
+      // <path> element of the expand button.
+      EXPAND_BUTTON: 'expandbutton',
+      // <path> element of the collapse button.
+      COLLAPSE_BUTTON: 'collapsebutton'
+    },
+    Edge: {
+      CONTAINER: 'edges',
+      GROUP: 'edge',
+      LINE: 'edgeline',
+      REF_LINE: 'refline',
+      STRUCTURAL: 'structural'
+    },
+    Annotation: {
+      OUTBOX: 'out-annotations',
+      INBOX: 'in-annotations',
+      GROUP: 'annotation',
+      NODE: 'annotation-node',
+      EDGE: 'annotation-edge',
+      CONTROL_EDGE: 'annotation-control-edge',
+      LABEL: 'annotation-label',
+      ELLIPSIS: 'annotation-ellipsis'
+    },
+    Scene: {
+      GROUP: 'scene',
+      CORE: 'core',
+      INEXTRACT: 'in-extract',
+      OUTEXTRACT: 'out-extract'
+    },
+    Subscene: {GROUP: 'subscene'},
+    OPNODE: 'op',
+    METANODE: 'meta',
+    SERIESNODE: 'series',
+    BRIDGENODE: 'bridge',
+    ELLIPSISNODE: 'ellipsis'
+  };
+
+  /**
+   * A health pill encapsulates an overview of tensor element values. The value
+   * field is a list of 12 numbers that shed light on the status of the tensor.
+   * Visualized in health pills are the 3rd through 8th (inclusive) numbers of
+   * health pill values. Those 6 numbers are counts of tensor elements that fall
+   * under -Inf, negative, 0, positive, +Inf, NaN (in that order).
+   *
+   * Please keep this interface consistent with HealthPillDatum within
+   * backend.ts.
+   */
+  export interface HealthPill {
+    node_name: string;
+    output_slot: number;
+    value: number[];
+    wall_time: number;
+    step: number;
+  }
+  ;
+
+  /**
+   * Encapsulates how to render a single entry in a health pill. Each entry
+   * corresponds to a category of tensor element values.
+   */
+  export interface HealthPillEntry {
+    background_color: string;
+    label: string;
+  }
+  ;
+  export let healthPillEntries: HealthPillEntry[] = [
+    {
+      background_color: '#CC2F2C',
+      label: 'NaN',
+    },
+    {
+      background_color: '#FF8D00',
+      label: '- ∞',
+    },
+    {
+      background_color: '#EAEAEA',
+      label: '-',
+    },
+    {
+      background_color: '#A5A5A5',
+      label: '0',
+    },
+    {
+      background_color: '#262626',
+      label: '+',
+    },
+    {
+      background_color: '#003ED4',
+      label: '+ ∞',
+    },
+  ];
+
+  /**
+   * Helper method for fitting the graph in the svg view.
+   *
+   * @param svg The main svg.
+   * @param zoomG The svg group used for panning and zooming.
+   * @param d3zoom The zoom behavior.
+   * @param callback Called when the fitting is done.
+   */
+  export function fit(svg, zoomG, d3zoom, callback) {
+    let svgRect = svg.getBoundingClientRect();
+    let sceneSize = null;
+    try {
+      sceneSize = zoomG.getBBox();
+      if (sceneSize.width === 0) {
+        // There is no scene anymore. We have been detached from the dom.
+        return;
+      }
+    } catch (e) {
+      // Firefox produced NS_ERROR_FAILURE if we have been
+      // detached from the dom.
+      return;
+    }
+    let scale = 0.9 *
+        Math.min(
+            svgRect.width / sceneSize.width, svgRect.height / sceneSize.height,
+            2);
+    let params = layout.PARAMS.graph;
+    const transform = d3.zoomIdentity
+        .scale(scale)
+        .translate(params.padding.paddingLeft, params.padding.paddingTop);
+
+    d3.select(zoomG)
+        .transition()
+        .duration(500)
+        .call(d3zoom.transform, transform)
+        .on('end.fitted', () => {
+          // Remove the listener for the zoomend event,
+          // so we don't get called at the end of regular zoom events,
+          // just those that fit the graph to screen.
+          d3zoom.on('end.fitted', null);
+          callback();
+        });
+};
+
+/**
+ * Helper method for panning the graph to center on the provided node,
+ * if the node is currently off-screen.
+ *
+ * @param nodeName The node to center the graph on
+ * @param svg The root SVG element for the graph
+ * @param zoomG The svg group used for panning and zooming.
+ * @param d3zoom The zoom behavior.
+ * @return True if the graph had to be panned to display the
+ *            provided node.
+ */
+export function panToNode(nodeName: String, svg, zoomG, d3zoom): boolean {
+  let node = <SVGAElement>d3
+                 .select('[data-name="' + nodeName + '"].' + Class.Node.GROUP)
+                 .node();
+  if (!node) {
+    return false;
+  }
+  let translate = d3zoom.translate();
+  // Check if the selected node is off-screen in either
+  // X or Y dimension in either direction.
+  let nodeBox = node.getBBox();
+  let nodeCtm = node.getScreenCTM();
+  let pointTL = svg.createSVGPoint();
+  let pointBR = svg.createSVGPoint();
+  pointTL.x = nodeBox.x;
+  pointTL.y = nodeBox.y;
+  pointBR.x = nodeBox.x + nodeBox.width;
+  pointBR.y = nodeBox.y + nodeBox.height;
+  pointTL = pointTL.matrixTransform(nodeCtm);
+  pointBR = pointBR.matrixTransform(nodeCtm);
+  let isOutsideOfBounds = (start, end, bound) => {
+    return end < 0 || start > bound;
+  };
+  let svgRect = svg.getBoundingClientRect();
+  if (isOutsideOfBounds(pointTL.x, pointBR.x, svgRect.width) ||
+      isOutsideOfBounds(pointTL.y, pointBR.y, svgRect.height)) {
+    // Determine the amount to transform the graph in both X and Y
+    // dimensions in order to center the selected node. This takes into
+    // acount the position of the node, the size of the svg scene, the
+    // amount the scene has been scaled by through zooming, and any previous
+    // transform already performed by this logic.
+    let centerX = (pointTL.x + pointBR.x) / 2;
+    let centerY = (pointTL.y + pointBR.y) / 2;
+    let dx = ((svgRect.width / 2) - centerX);
+    let dy = ((svgRect.height / 2) - centerY);
+    let zoomEvent = d3zoom.translate([translate[0] + dx, translate[1] + dy])
+        .event;
+    d3.select(zoomG).transition().duration(500).call(zoomEvent);
+    return true;
+  }
+  return false;
+};
+
+/**
+ * Given a container d3 selection, select a child svg element of a given tag
+ * and class if exists or append / insert one otherwise.  If multiple children
+ * matches the tag and class name, returns only the first one.
+ *
+ * @param container
+ * @param tagName tag name.
+ * @param className (optional) Class name or a list of class names.
+ * @param before (optional) reference DOM node for insertion.
+ * @return selection of the element
+ */
+export function selectOrCreateChild(
+    container, tagName: string, className?: string | string[], before?) {
+  let child = selectChild(container, tagName, className);
+  if (!child.empty()) {
+    return child;
+  }
+  let newElement =
+      document.createElementNS('http://www.w3.org/2000/svg', tagName);
+
+  if (className instanceof Array) {
+    for (let i = 0; i < className.length; i++) {
+      newElement.classList.add(className[i]);
+    }
+  } else {
+    newElement.classList.add(className);
+  }
+
+  if (before) { // if before exists, insert
+    container.node().insertBefore(newElement, before);
+  } else { // otherwise, append
+    container.node().appendChild(newElement);
+  }
+  return d3.select(newElement)
+           // need to bind data to emulate d3_selection.append
+           .datum(container.datum());
+};
+
+/**
+ * Given a container d3 selection, select a child element of a given tag and
+ * class. If multiple children matches the tag and class name, returns only
+ * the first one.
+ *
+ * @param container
+ * @param tagName tag name.
+ * @param className (optional) Class name or list of class names.
+ * @return selection of the element, or an empty selection
+ */
+export function selectChild(
+    container, tagName: string, className?: string | string[]) {
+  let children = container.node().childNodes;
+  for (let i = 0; i < children.length; i++) {
+    let child = children[i];
+    if (child.tagName === tagName) {
+      if (className instanceof Array) {
+        let hasAllClasses = true;
+        for (let j = 0; j < className.length; j++) {
+          hasAllClasses =
+              hasAllClasses && child.classList.contains(className[j]);
+        }
+        if (hasAllClasses) {
+          return d3.select(child);
+        }
+      } else if ((!className || child.classList.contains(className))) {
+        return d3.select(child);
+      }
+    }
+  }
+  return d3.select(null);
+};
+
+/**
+ * Select or create a sceneGroup and build/update its nodes and edges.
+ *
+ * Structure Pattern:
+ *
+ * <g class='scene'>
+ *   <g class='core'>
+ *     <g class='edges'>
+ *       ... stuff from tf.graph.scene.edges.build ...
+ *     </g>
+ *     <g class='nodes'>
+ *       ... stuff from tf.graph.scene.nodes.build ...
+ *     </g>
+ *   </g>
+ *   <g class='in-extract'>
+ *     <g class='nodes'>
+ *       ... stuff from tf.graph.scene.nodes.build ...
+ *     </g>
+ *   </g>
+ *   <g class='out-extract'>
+ *     <g class='nodes'>
+ *       ... stuff from tf.graph.scene.nodes.build ...
+ *     </g>
+ *   </g>
+ * </g>
+ *
+ * @param container D3 selection of the parent.
+ * @param renderNode render node of a metanode or series node.
+ * @param sceneElement <tf-graph-scene> polymer element.
+ * @param sceneClass class attribute of the scene (default='scene').
+ */
+export function buildGroup(container,
+    renderNode: render.RenderGroupNodeInfo,
+    sceneElement,
+    sceneClass: string) {
+  sceneClass = sceneClass || Class.Scene.GROUP;
+  let isNewSceneGroup = selectChild(container, 'g', sceneClass).empty();
+  let sceneGroup = selectOrCreateChild(container, 'g', sceneClass);
+
+  // core
+  let coreGroup = selectOrCreateChild(sceneGroup, 'g', Class.Scene.CORE);
+  let coreNodes = _.reduce(renderNode.coreGraph.nodes(), (nodes, name) => {
+                    let node = renderNode.coreGraph.node(name);
+                    if (!node.excluded) {
+                      nodes.push(node);
+                    }
+                    return nodes;
+                  }, []);
+
+  if (renderNode.node.type === NodeType.SERIES) {
+    // For series, we want the first item on top, so reverse the array so
+    // the first item in the series becomes last item in the top, and thus
+    // is rendered on the top.
+    coreNodes.reverse();
+  }
+
+  // Create the layer of edges for this scene (paths).
+  edge.buildGroup(coreGroup, renderNode.coreGraph, sceneElement);
+
+  // Create the layer of nodes for this scene (ellipses, rects etc).
+  node.buildGroup(coreGroup, coreNodes, sceneElement);
+
+  // In-extract
+  if (renderNode.isolatedInExtract.length > 0) {
+    let inExtractGroup =
+        selectOrCreateChild(sceneGroup, 'g', Class.Scene.INEXTRACT);
+    node.buildGroup(inExtractGroup, renderNode.isolatedInExtract,
+        sceneElement);
+  } else {
+    selectChild(sceneGroup, 'g', Class.Scene.INEXTRACT).remove();
+  }
+
+  // Out-extract
+  if (renderNode.isolatedOutExtract.length > 0) {
+    let outExtractGroup =
+        selectOrCreateChild(sceneGroup, 'g', Class.Scene.OUTEXTRACT);
+    node.buildGroup(outExtractGroup, renderNode.isolatedOutExtract,
+        sceneElement);
+  } else {
+    selectChild(sceneGroup, 'g', Class.Scene.OUTEXTRACT).remove();
+  }
+
+  position(sceneGroup, renderNode);
+
+  // Fade in the scene group if it didn't already exist.
+  if (isNewSceneGroup) {
+    sceneGroup.attr('opacity', 0).transition().attr('opacity', 1);
+  }
+
+  return sceneGroup;
+};
+
+/**
+ * Given a scene's svg group, set  g.in-extract, g.coreGraph, g.out-extract svg
+ * groups' position relative to the scene.
+ *
+ * @param sceneGroup
+ * @param renderNode render node of a metanode or series node.
+ */
+function position(sceneGroup, renderNode: render.RenderGroupNodeInfo) {
+  // Translate scenes down by the label height so that when showing graphs in
+  // expanded metanodes, the graphs are below the labels.  Do not shift them
+  // down for series nodes as series nodes don't have labels inside of their
+  // bounding boxes.
+  let yTranslate = renderNode.node.type === NodeType.SERIES ?
+    0 : layout.PARAMS.subscene.meta.labelHeight;
+
+  // core
+  translate(selectChild(sceneGroup, 'g', Class.Scene.CORE), 0, yTranslate);
+
+  // in-extract
+  let hasInExtract = renderNode.isolatedInExtract.length > 0;
+  let hasOutExtract = renderNode.isolatedOutExtract.length > 0;
+
+  if (hasInExtract) {
+    let offset = layout.PARAMS.subscene.meta.extractXOffset;
+    let inExtractX = renderNode.coreBox.width -
+      renderNode.inExtractBox.width / 2 - renderNode.outExtractBox.width -
+          (hasOutExtract ? offset : 0);
+    translate(
+        selectChild(sceneGroup, 'g', Class.Scene.INEXTRACT), inExtractX,
+        yTranslate);
+  }
+
+  // out-extract
+  if (hasOutExtract) {
+    let outExtractX = renderNode.coreBox.width -
+      renderNode.outExtractBox.width / 2;
+    translate(
+        selectChild(sceneGroup, 'g', Class.Scene.OUTEXTRACT), outExtractX,
+        yTranslate);
+  }
+};
+
+/** Adds a click listener to a group that fires a graph-select event */
+export function addGraphClickListener(graphGroup, sceneElement) {
+  d3.select(graphGroup).on('click', () => {
+    sceneElement.fire('graph-select');
+  });
+};
+
+/** Helper for adding transform: translate(x0, y0) */
+export function translate(selection, x0: number, y0: number) {
+  // If it is already placed on the screen, make it a transition.
+  if (selection.attr('transform') != null) {
+    selection = selection.transition('position');
+  }
+  selection.attr('transform', 'translate(' + x0 + ',' + y0 + ')');
+};
+
+/**
+ * Helper for setting position of a svg rect
+ * @param rect rect to set position of.
+ * @param cx Center x.
+ * @param cy Center x.
+ * @param width Width to set.
+ * @param height Height to set.
+ */
+export function positionRect(rect, cx: number, cy: number, width: number,
+    height: number) {
+  rect.transition().attr({
+    x: cx - width / 2,
+    y: cy - height / 2,
+    width: width,
+    height: height
+  });
+};
+
+/**
+ * Helper for setting position of a svg expand/collapse button
+ * @param button container group
+ * @param renderNode the render node of the group node to position
+ *        the button on.
+ */
+export function positionButton(button, renderNode: render.RenderNodeInfo) {
+  let cx = layout.computeCXPositionOfNodeShape(renderNode);
+  // Position the button in the top-right corner of the group node,
+  // with space given the draw the button inside of the corner.
+  let width = renderNode.expanded ?
+      renderNode.width : renderNode.coreBox.width;
+  let height = renderNode.expanded ?
+      renderNode.height : renderNode.coreBox.height;
+  let x = cx + width / 2 - 6;
+  let y = renderNode.y - height / 2 + 6;
+  // For unexpanded series nodes, the button has special placement due
+  // to the unique visuals of this group node.
+  if (renderNode.node.type === NodeType.SERIES && !renderNode.expanded) {
+    x += 10;
+    y -= 2;
+  }
+  let translateStr = 'translate(' + x + ',' + y + ')';
+  button.selectAll('path').transition().attr('transform', translateStr);
+  button.select('circle').transition().attr(
+      {cx: x, cy: y, r: layout.PARAMS.nodeSize.meta.expandButtonRadius});
+};
+
+/**
+ * Helper for setting position of a svg ellipse
+ * @param ellipse ellipse to set position of.
+ * @param cx Center x.
+ * @param cy Center x.
+ * @param width Width to set.
+ * @param height Height to set.
+ */
+export function positionEllipse(ellipse, cx: number, cy: number,
+    width: number, height: number) {
+  ellipse.transition().attr({
+    cx: cx,
+    cy: cy,
+    rx: width / 2,
+    ry: height / 2
+  });
+};
+
+/**
+ * @param {number} stat A stat for a health pill (such as mean or variance).
+ * @param {boolean} shouldRoundOnesDigit Whether to round this number to the
+ *     ones digit. Useful for say int, uint, and bool output types.
+ * @return {string} A human-friendly string representation of that stat.
+ */
+export function humanizeHealthPillStat(stat, shouldRoundOnesDigit) {
+  if (shouldRoundOnesDigit) {
+    return stat.toFixed(0);
+  }
+
+  if (Math.abs(stat) >= 1) {
+    return stat.toFixed(1);
+  }
+  return stat.toExponential(1);
+}
+
+/**
+ * Renders a health pill for an op atop a node.
+ */
+function _addHealthPill(
+    nodeGroupElement: SVGElement, healthPill: HealthPill,
+    nodeInfo: render.RenderNodeInfo) {
+  // Check if text already exists at location.
+  d3.select(nodeGroupElement.parentNode as any).selectAll('.health-pill').remove();
+
+  if (!nodeInfo || !healthPill) {
+    return;
+  }
+
+  let lastHealthPillData = healthPill.value;
+
+  // For now, we only visualize the 6 values that summarize counts of tensor
+  // elements of various categories: -Inf, negative, 0, positive, Inf, and NaN.
+  let lastHealthPillOverview = lastHealthPillData.slice(2, 8);
+  let totalCount = lastHealthPillData[1];
+
+  let healthPillWidth = 60;
+  let healthPillHeight = 10;
+  if (nodeInfo.node.type === tf.graph.NodeType.OP) {
+    // Use a smaller health pill for op nodes (rendered as smaller ellipses).
+    healthPillWidth /= 2;
+    healthPillHeight /= 2;
+  }
+
+  let healthPillGroup = document.createElementNS(svgNamespace, 'g');
+  healthPillGroup.classList.add('health-pill');
+
+  // Define the gradient for the health pill.
+  let healthPillDefs = document.createElementNS(svgNamespace, 'defs');
+  healthPillGroup.appendChild(healthPillDefs);
+  let healthPillGradient =
+      document.createElementNS(svgNamespace, 'linearGradient');
+  const healthPillGradientId = 'health-pill-gradient';
+  healthPillGradient.setAttribute('id', healthPillGradientId);
+  let titleOnHoverTextEntries = [];
+  let cumulativeCount = 0;
+  let previousOffset = '0%';
+  for (let i = 0; i < lastHealthPillOverview.length; i++) {
+    if (!lastHealthPillOverview[i]) {
+      // Exclude empty categories.
+      continue;
+    }
+    cumulativeCount += lastHealthPillOverview[i];
+
+    // Create a color interval using 2 stop elements.
+    let stopElement0 = document.createElementNS(svgNamespace, 'stop');
+    stopElement0.setAttribute('offset', previousOffset);
+    stopElement0.setAttribute(
+        'stop-color', healthPillEntries[i].background_color);
+    healthPillGradient.appendChild(stopElement0);
+
+    let stopElement1 = document.createElementNS(svgNamespace, 'stop');
+    let percent = (cumulativeCount * 100 / totalCount) + '%';
+    stopElement1.setAttribute('offset', percent);
+    stopElement1.setAttribute(
+        'stop-color', healthPillEntries[i].background_color);
+    healthPillGradient.appendChild(stopElement1);
+    previousOffset = percent;
+
+    // Include this number in the title that appears on hover.
+    titleOnHoverTextEntries.push(
+        healthPillEntries[i].label + ': ' + lastHealthPillOverview[i]);
+  }
+  healthPillDefs.appendChild(healthPillGradient);
+
+  // Create the rectangle for the health pill.
+  let rect = document.createElementNS(svgNamespace, 'rect');
+  rect.setAttribute('fill', 'url(#' + healthPillGradientId + ')');
+  rect.setAttribute('width', String(healthPillWidth));
+  rect.setAttribute('height', String(healthPillHeight));
+  healthPillGroup.appendChild(rect);
+
+  // Show a title with specific counts on hover.
+  let titleSvg = document.createElementNS(svgNamespace, 'title');
+  titleSvg.textContent = titleOnHoverTextEntries.join(', ');
+  healthPillGroup.appendChild(titleSvg);
+
+  // Center this health pill just right above the node for the op.
+  let healthPillX = nodeInfo.x - healthPillWidth / 2;
+  let healthPillY = nodeInfo.y - healthPillHeight - nodeInfo.height / 2 - 2;
+  if (nodeInfo.labelOffset < 0) {
+    // The label is positioned above the node. Do not occlude the label.
+    healthPillY += nodeInfo.labelOffset;
+  }
+
+  if (lastHealthPillOverview[2] || lastHealthPillOverview[3] ||
+      lastHealthPillOverview[4]) {
+    // At least 1 "non-Inf and non-NaN" value exists (a -, 0, or + value). Show
+    // stats on tensor values.
+
+    // Determine if we should display the output range as integers.
+    let shouldRoundOnesDigit = false;
+    let node = nodeInfo.node as OpNode;
+    let attributes = node.attr;
+    if (attributes && attributes.length) {
+      // Find the attribute for output type if there is one.
+      for (let i = 0; i < attributes.length; i++) {
+        if (attributes[i].key === 'T') {
+          // Note whether the output type is an integer.
+          let outputType = attributes[i].value['type'];
+          shouldRoundOnesDigit =
+              outputType && /^DT_(BOOL|INT|UINT)/.test(outputType);
+          break;
+        }
+      }
+    }
+
+    let statsSvg = document.createElementNS(svgNamespace, 'text');
+    const minString =
+        humanizeHealthPillStat(lastHealthPillData[8], shouldRoundOnesDigit);
+    const maxString =
+        humanizeHealthPillStat(lastHealthPillData[9], shouldRoundOnesDigit);
+    statsSvg.textContent = minString + ' ~ ' + maxString;
+    statsSvg.classList.add('health-pill-stats');
+    statsSvg.setAttribute('x', String(healthPillWidth / 2));
+    statsSvg.setAttribute('y', '-2');
+    healthPillGroup.appendChild(statsSvg);
+  }
+
+  healthPillGroup.setAttribute(
+      'transform', 'translate(' + healthPillX + ', ' + healthPillY + ')');
+
+  Polymer.dom(nodeGroupElement.parentNode).appendChild(healthPillGroup);
+}
+
+/**
+ * Adds health pills (which visualize tensor summaries) to a graph group.
+ * @param svgRoot The root SVG element of the graph to add heath pills to.
+ * @param nodeNamesToHealthPills An object mapping node name to health pill.
+ * @param colors A list of colors to use.
+ */
+export function addHealthPills(
+    svgRoot: SVGElement, nodeNamesToHealthPills: {[key: string]: HealthPill[]},
+    healthPillStepIndex: number) {
+  if (!nodeNamesToHealthPills) {
+    // No health pill information available.
+    return;
+  }
+
+  let svgRootSelection = d3.select(svgRoot);
+  svgRootSelection.selectAll('g.nodeshape')
+      .each(function(nodeInfo: render.RenderNodeInfo) {
+        // Only show health pill data for this node if it is available.
+        let healthPills = nodeNamesToHealthPills[nodeInfo.node.name];
+        let healthPill = healthPills ? healthPills[healthPillStepIndex] : null;
+        _addHealthPill((this as SVGElement), healthPill, nodeInfo);
+      });
+};
+
+} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/template.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/template.ts
new file mode 100644
index 0000000000..7800d46029
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/template.ts
@@ -0,0 +1,305 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+module tf.graph.template {
+
+/**
+ * Detect repeating patterns of subgraphs.
+ * Assign templateId to each subgraph if it belongs to a template.
+ * Returns clusters of similar subgraphs .
+ *
+ * @param graph
+ * @param verifyTemplate whether to run the template verification algorithm
+ * @return a dict (template id => Array of node names)
+ */
+export function detect(h, verifyTemplate): {[templateId: string]: string[]} {
+  // In any particular subgraph, there are either
+  // - leaf nodes (which do not have subgraph)
+  // - metanode nodes - some of them have only one member (singular metanode)
+  //                    and some have multiple members (non-singular metanode)
+
+  // First, generate a nearest neighbor hash of metanode nodes.
+  let nnGroups = clusterSimilarSubgraphs(h);
+
+  // For each metanode, compare its subgraph (starting from shallower groups)
+  // and assign template id.
+  let templates = groupTemplateAndAssignId(nnGroups, verifyTemplate);
+
+  // Sort the templates by minimum level in the graph at which they appear,
+  // as this leads to optimal setting of the colors of each template for
+  // maximum differentiation.
+  return <{[templateId: string]: string[]}>_(templates)
+      .pairs()
+      .sortBy(function(pair: {level: number, nodes: string[]}[]) {
+        return pair[1].level;
+      })
+      .map(function(pair: {level: number, nodes: string[]}[]) {
+        return [pair[0], pair[1].nodes];
+      })
+      .object()
+      .value();
+};
+
+/**
+ * @return Unique string for a metanode based on depth, |V|, |E| and
+ * op type histogram.
+ */
+function getSignature(metanode) {
+  // depth=<number> |V|=<number> |E|=<number>
+  let props = _.map(
+                   {
+                     'depth': metanode.depth,
+                     '|V|': metanode.metagraph.nodes().length,
+                     '|E|': metanode.metagraph.edges().length
+                   },
+                   function(v, k) { return k + '=' + v; })
+                  .join(' ');
+
+  // optype1=count1,optype2=count2
+  let ops = _.map(metanode.opHistogram, function(count, op) {
+               return op + '=' + count;
+             }).join(',');
+
+  return props + ' [ops] ' + ops;
+}
+
+/**
+ * Generate a nearest neighbor hash of metanodes
+ * based on depth, |V|, |E|, and opHistogram of their subgraph
+ * (excluding leaf nodes and singular metanodes).
+ * @param graph The graph
+ * @return Array of pairs of [signature,
+ *   Object with min level of the template and an Array of tf.graph.Group]
+ *   sort by ascending order of minimum depth at which metanode appears.
+ */
+function clusterSimilarSubgraphs(h: hierarchy.Hierarchy) {
+  /** a dict from metanode.signature() => Array of tf.graph.Groups */
+  let hashDict = _(h.getNodeMap()).reduce(
+      (hash, node: OpNode|Metanode, name) => {
+    if (node.type !== NodeType.META) {
+        return hash;
+    }
+    let levelOfMetaNode = name.split('/').length - 1;
+    let signature = getSignature(node);
+    let templateInfo = hash[signature] ||
+      {nodes: [], level: levelOfMetaNode};
+    hash[signature] = templateInfo;
+    templateInfo.nodes.push(node);
+    if (templateInfo.level > levelOfMetaNode) {
+      templateInfo.level = levelOfMetaNode;
+    }
+    return hash;
+  }, {});
+
+  return _(hashDict)
+      .pairs()
+      // filter nn metanode with only one member
+      .filter(function(pair: {level: number, nodes: string[]}) {
+        return pair[1].nodes.length > 1;
+      })
+      .sortBy(function(pair: {level: number, nodes: string[]}) {
+        // sort by depth
+        // (all members in the same nnGroup has equal depth)
+        return pair[1].nodes[0].depth;
+      })
+      .value();
+}
+
+function groupTemplateAndAssignId(nnGroups, verifyTemplate) {
+  // For each metanode, compare its subgraph (starting from shallower groups)
+  // and assign template id.
+  let result: {[templateId: string]: {level: number, nodes: string[]}} = {};
+  return _.reduce(nnGroups, function(templates, nnGroupPair) {
+    let signature = nnGroupPair[0],
+      nnGroup = nnGroupPair[1].nodes,
+      clusters = [];
+
+    nnGroup.forEach(function(metanode) {
+      // check with each existing cluster
+      for (let i = 0; i < clusters.length; i++) {
+        let similar = !verifyTemplate ||
+                      isSimilarSubgraph(
+                        clusters[i].metanode.metagraph,
+                        metanode.metagraph
+                      );
+        // if similar, just add this metanode to the cluster
+        if (similar) {
+          // get template from the first one
+          metanode.templateId = clusters[i].metanode.templateId;
+          clusters[i].members.push(metanode.name);
+          return;
+        }
+      }
+      // otherwise create a new cluster with id 'signature [count] '
+      metanode.templateId = signature + '[' + clusters.length + ']';
+      clusters.push({
+        metanode: metanode,
+        members: [metanode.name]
+      });
+    });
+
+    clusters.forEach(function(c) {
+      templates[c.metanode.templateId] = {
+        level: nnGroupPair[1].level,
+        nodes: c.members
+      };
+    });
+    return templates;
+  }, result);
+}
+
+function sortNodes(names: string[],
+    graph: graphlib.Graph<Metanode|OpNode, Metaedge>, prefix: string) {
+  return _.sortByAll(names,
+    function(name) {
+      let node = graph.node(name);
+      return (<OpNode>node).op;
+    },
+    function(name) {
+      let node = graph.node(name);
+      return (<Metanode>node).templateId;
+    },
+    function(name) {
+      return graph.neighbors(name).length;
+    },
+    function(name) {
+      return graph.predecessors(name).length;
+    },
+    function(name) {
+      return graph.successors(name).length;
+    },
+    function(name) {
+      return name.substr(prefix.length);
+    });
+}
+
+function isSimilarSubgraph(g1: graphlib.Graph<any, any>,
+    g2: graphlib.Graph<any, any>) {
+  if (!tf.graph.hasSimilarDegreeSequence(g1, g2)) {
+      return false;
+  }
+
+  // if we want to skip, just return true here.
+  // return true;
+
+  // Verify sequence by running DFS
+  let g1prefix = g1.graph().name;
+  let g2prefix = g2.graph().name;
+
+  let visited1 = {};
+  let visited2 = {};
+  let stack = [];
+
+  /**
+   * push sources or successors into the stack
+   * if the visiting pattern has been similar.
+   */
+  function stackPushIfNotDifferent(n1, n2) {
+    let sub1 = n1.substr(g1prefix.length),
+      sub2 = n2.substr(g2prefix.length);
+
+    /* tslint:disable */
+    if (visited1[sub1] ^ visited2[sub1]) {
+      console.warn(
+          'different visit pattern', '[' + g1prefix + ']', sub1,
+          '[' + g2prefix + ']', sub2);
+      return true;
+    }
+    /* tslint:enable */
+    if (!visited1[sub1]) { // implied && !visited2[sub2]
+      visited1[sub1] = visited2[sub2] = true;
+      stack.push({n1: n1, n2: n2});
+    }
+
+    return false;
+  }
+
+  // check if have same # of sources then sort and push
+  let sources1 = g1.sources();
+  let sources2 = g2.sources();
+  if (sources1.length !== sources2.length) {
+    /* tslint:disable */
+    console.log('different source length');
+    /* tslint:enable */
+    return false;
+  }
+  sources1 = sortNodes(sources1, g1, g1prefix);
+  sources2 = sortNodes(sources2, g2, g2prefix);
+
+  for (let i = 0; i < sources1.length; i++) {
+    let different = stackPushIfNotDifferent(sources1[i], sources2[i]);
+    if (different) {
+        return false;
+    }
+  }
+
+  while (stack.length > 0) {
+    let cur = stack.pop();
+
+    // check node
+    let similar = isSimilarNode(g1.node(cur.n1), g2.node(cur.n2));
+    if (!similar) {
+        return false;
+    }
+
+    // check if have same # of successors then sort and push
+    let succ1 = g1.successors(cur.n1), succ2 = g2.successors(cur.n2);
+    if (succ1.length !== succ2.length) {
+      /* tslint:disable */
+      console.log('# of successors mismatch', succ1, succ2);
+      /* tslint:enable */
+      return false;
+    }
+    succ1 = sortNodes(succ1, g1, g1prefix);
+    succ2 = sortNodes(succ2, g2, g2prefix);
+
+    for (let j = 0; j < succ1.length; j++) {
+      let different = stackPushIfNotDifferent(succ1[j], succ2[j]);
+      if (different) {
+          return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+/**
+ * Returns if two nodes have identical structure.
+ */
+function isSimilarNode(n1: OpNode|Metanode|SeriesNode,
+    n2: OpNode|Metanode|SeriesNode): boolean {
+  if (n1.type === NodeType.META) {
+    // compare metanode
+    let metanode1 = <Metanode> n1;
+    let metanode2 = <Metanode> n2;
+    return metanode1.templateId && metanode2.templateId &&
+        metanode1.templateId === metanode2.templateId;
+  } else if (n1.type === NodeType.OP && n2.type === NodeType.OP) {
+    // compare leaf node
+    return (<OpNode>n1).op === (<OpNode>n2).op;
+  } else if (n1.type === NodeType.SERIES && n2.type === NodeType.SERIES) {
+    // compare series node sizes and operations
+    // (only need to check one op as all op nodes are identical in series)
+    let sn1 = <SeriesNode> n1;
+    let sn2 = <SeriesNode> n2;
+    let seriesnode1Count = sn1.metagraph.nodeCount();
+    return (seriesnode1Count === sn2.metagraph.nodeCount() &&
+      (seriesnode1Count === 0 ||
+      ((<OpNode>sn1.metagraph.node(sn1.metagraph.nodes()[0])).op ===
+          (<OpNode>sn2.metagraph.node(sn2.metagraph.nodes()[0])).op)));
+  }
+  return false;
+}
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/graph-test.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/graph-test.ts
new file mode 100644
index 0000000000..af3030197e
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/graph-test.ts
@@ -0,0 +1,103 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+suite('graph', () => {
+  let assert = chai.assert;
+
+  test('graphlib exists', () => { assert.isTrue(graphlib != null); });
+
+  test('simple graph contruction', done => {
+    let pbtxt = tf.graph.test.util.stringToArrayBuffer(`
+      node {
+        name: "Q"
+        op: "Input"
+      }
+      node {
+        name: "W"
+        op: "Input"
+      }
+      node {
+        name: "X"
+        op: "MatMul"
+        input: "Q:2"
+        input: "W"
+      }`);
+    let statsPbtxt = tf.graph.test.util.stringToArrayBuffer(`step_stats {
+      dev_stats {
+        device: "cpu"
+        node_stats {
+          node_name: "Q"
+          all_start_micros: 10
+          all_end_rel_micros: 4
+        }
+        node_stats {
+          node_name: "Q"
+          all_start_micros: 12
+          all_end_rel_micros: 4
+        }
+      }
+    }`);
+
+    let buildParams: tf.graph.BuildParams = {
+      enableEmbedding: true,
+      inEmbeddingTypes: ['Const'],
+      outEmbeddingTypes: ['^[a-zA-Z]+Summary$'],
+      refEdges: {}
+    };
+    let dummyTracker =
+        tf.graph.util.getTracker({set: () => { return; }, progress: 0});
+    tf.graph.parser.parseGraphPbTxt(pbtxt).then(nodes => {
+      tf.graph.build(nodes, buildParams, dummyTracker)
+          .then((slimGraph: tf.graph.SlimGraph) => {
+            assert.isTrue(slimGraph.nodes['X'] != null);
+            assert.isTrue(slimGraph.nodes['W'] != null);
+            assert.isTrue(slimGraph.nodes['Q'] != null);
+
+            let firstInputOfX = slimGraph.nodes['X'].inputs[0];
+            assert.equal(firstInputOfX.name, 'Q');
+            assert.equal(firstInputOfX.outputTensorIndex, 2);
+
+            let secondInputOfX = slimGraph.nodes['X'].inputs[1];
+            assert.equal(secondInputOfX.name, 'W');
+            assert.equal(secondInputOfX.outputTensorIndex, 0);
+
+            tf.graph.parser.parseStatsPbTxt(statsPbtxt).then(stepStats => {
+              tf.graph.joinStatsInfoWithGraph(slimGraph, stepStats);
+              assert.equal(slimGraph.nodes['Q'].stats.getTotalMicros(), 6);
+              done();
+            });
+          });
+    });
+  });
+
+  test('health pill numbers round correctly', () => {
+    // Integers are rounded to the ones place.
+    assert.equal(tf.graph.scene.humanizeHealthPillStat(42.0, true), '42');
+
+    // Numbers with magnitude >= 1 are rounded to the tenths place.
+    assert.equal(tf.graph.scene.humanizeHealthPillStat(1, false), '1.0');
+    assert.equal(tf.graph.scene.humanizeHealthPillStat(42.42, false), '42.4');
+    assert.equal(tf.graph.scene.humanizeHealthPillStat(-42.42, false), '-42.4');
+
+    // Numbers with magnitude < 1 are written in scientific notation rounded to
+    // the tenths place.
+    assert.equal(tf.graph.scene.humanizeHealthPillStat(0, false), '0.0e+0');
+    assert.equal(tf.graph.scene.humanizeHealthPillStat(0.42, false), '4.2e-1');
+    assert.equal(
+        tf.graph.scene.humanizeHealthPillStat(-0.042, false), '-4.2e-2');
+  });
+
+  // TODO(bp): write tests.
+});
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/hierarchy-test.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/hierarchy-test.ts
new file mode 100644
index 0000000000..fa62ffe2c7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/hierarchy-test.ts
@@ -0,0 +1,23 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+suite('graph', () => {
+  let assert = chai.assert;
+
+  test('graphlib exists', () => { assert.isTrue(graphlib != null); });
+
+  // TODO(bp): write tests.
+
+});
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/index.html b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/index.html
new file mode 100644
index 0000000000..7564167129
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/index.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../tf-graph-common.html">
+</head>
+<body>
+  <script src="parser-test.js"></script>
+  <script src="graph-test.js"></script>
+  <script src="hierarchy-test.js"></script>
+  <script src="layout-test.js"></script>
+  <script src="util-test.js"></script>
+  <script src="util.js"></script>
+</body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/layout-test.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/layout-test.ts
new file mode 100644
index 0000000000..b4884413c9
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/layout-test.ts
@@ -0,0 +1,23 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+suite('layout', () => {
+  let assert = chai.assert;
+
+  test('dagre exists', () => { assert.isTrue(dagre != null); });
+
+  // TODO(bp): write tests.
+
+});
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/parser-test.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/parser-test.ts
new file mode 100644
index 0000000000..7c73178c1c
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/parser-test.ts
@@ -0,0 +1,83 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+suite('parser', () => {
+  let assert = chai.assert;
+
+  test('simple pbtxt', done => {
+    let pbtxt = tf.graph.test.util.stringToArrayBuffer(`node {
+       name: "Q"
+       op: "Input"
+     }
+     node {
+       name: "W"
+       op: "Input"
+     }
+     node {
+       name: "X"
+       op: "MatMul"
+       input: "Q"
+       input: "W"
+     }`);
+    tf.graph.parser.parseGraphPbTxt(pbtxt).then(nodes => {
+      assert.isTrue(nodes != null && nodes.length === 3);
+
+      assert.equal('Q', nodes[0].name);
+      assert.equal('Input', nodes[0].op);
+
+      assert.equal('W', nodes[1].name);
+      assert.equal('Input', nodes[1].op);
+
+      assert.equal('X', nodes[2].name);
+      assert.equal('MatMul', nodes[2].op);
+      assert.equal('Q', nodes[2].input[0]);
+      assert.equal('W', nodes[2].input[1]);
+
+      done();
+    });
+  });
+
+  test('stats pbtxt parsing', done => {
+    let statsPbtxt = tf.graph.test.util.stringToArrayBuffer(`step_stats {
+      dev_stats {
+        device: "cpu"
+        node_stats {
+          node_name: "Q"
+          all_start_micros: 10
+          all_end_rel_micros: 4
+        }
+        node_stats {
+          node_name: "Q"
+          all_start_micros: 12
+          all_end_rel_micros: 4
+        }
+      }
+    }`);
+    tf.graph.parser.parseStatsPbTxt(statsPbtxt).then(stepStats => {
+      assert.equal(stepStats.dev_stats.length, 1);
+      assert.equal(stepStats.dev_stats[0].device, 'cpu');
+      assert.equal(stepStats.dev_stats[0].node_stats.length, 2);
+      assert.equal(stepStats.dev_stats[0].node_stats[0].all_start_micros, 10);
+      assert.equal(stepStats.dev_stats[0].node_stats[1].node_name, 'Q');
+      assert.equal(stepStats.dev_stats[0].node_stats[1].all_end_rel_micros, 4);
+      done();
+    });
+  });
+
+  test('d3 exists', () => { assert.isTrue(d3 != null); });
+
+  // TODO(nsthorat): write tests.
+
+});
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util-test.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util-test.ts
new file mode 100644
index 0000000000..4535d24888
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util-test.ts
@@ -0,0 +1,56 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+suite('util', () => {
+  let assert = chai.assert;
+
+  test('remove common prefix', () => {
+
+    // Empty array.
+    let result = tf.graph.util.removeCommonPrefix([]);
+    assert.deepEqual(result, []);
+
+    // No common prefix.
+    result = tf.graph.util.removeCommonPrefix(['a', 'b', 'c']);
+    assert.deepEqual(result, ['a', 'b', 'c']);
+
+    // One of the elements is empty string.
+    result = tf.graph.util.removeCommonPrefix(['a/b', '', 'a/c']);
+    assert.deepEqual(result, ['a/b', '', 'a/c']);
+
+    // Only one string.
+    result = tf.graph.util.removeCommonPrefix(['a/b/c']);
+    assert.deepEqual(result, ['a/b/c']);
+
+    // `q/w/` is the common prefix. Expect `q/w/` to be removed.
+    result = tf.graph.util.removeCommonPrefix(['q/w/a', 'q/w/b', 'q/w/c/f']);
+    assert.deepEqual(result, ['a', 'b', 'c/f']);
+
+    // `q/w/` is the common prefix and also an element. Expect nothing to be
+    // removed since the common prefix is also an element in the array.
+    result = tf.graph.util.removeCommonPrefix(['q/w/', 'q/w/b', 'q/w/c/f']);
+    assert.deepEqual(result, ['q/w/', 'q/w/b', 'q/w/c/f']);
+  });
+
+  test('query params', () => {
+    // Starts with question mark.
+    let queryParams = tf.graph.util.getQueryParams('?foo=1&bar=2');
+    assert.deepEqual(queryParams, {'foo': '1', 'bar': '2'});
+
+    // No question mark.
+    queryParams = tf.graph.util.getQueryParams('foo=1&bar=2');
+    assert.deepEqual(queryParams, {'foo': '1', 'bar': '2'});
+  });
+});
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util.ts
new file mode 100644
index 0000000000..bc73b735ed
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/test/util.ts
@@ -0,0 +1,31 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+
+/* tslint:disable:no-namespace */
+module tf.graph.test.util {
+  /**
+   * Converts a utf-8 string to an ArrayBuffer.
+   */
+  export function stringToArrayBuffer(str): ArrayBuffer {
+    let buf = new ArrayBuffer(str.length);
+    let bufView = new Uint8Array(buf);
+    for (let i = 0, strLen = str.length; i < strLen; i++) {
+      bufView[i] = str.charCodeAt(i);
+    }
+    return buf;
+  }
+
+}  // module
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/tf-graph-common.html b/tensorflow/tensorboard/components/tf_graph_common_d3v4/tf-graph-common.html
new file mode 100644
index 0000000000..a460072a38
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/tf-graph-common.html
@@ -0,0 +1,38 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../tf-imports/d3.html">
+<link rel="import" href="../tf-imports/dagre.html">
+<link rel="import" href="../tf-imports/graphlib.html">
+<link rel="import" href="../tf-imports/lodash.html">
+
+<script src="colors.js"></script>
+<script src="common.js"></script>
+<script src="externs.js"></script>
+<script src="graph.js"></script>
+<script src="hierarchy.js"></script>
+<script src="layout.js"></script>
+<script src="parser.js"></script>
+<script src="proto.js"></script>
+<script src="render.js"></script>
+<script src="annotation.js"></script>
+<script src="contextmenu.js"></script>
+<script src="edge.js"></script>
+<script src="node.js"></script>
+<script src="scene.js"></script>
+<script src="template.js"></script>
+<script src="util.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts
new file mode 100644
index 0000000000..7f4d329e79
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts
@@ -0,0 +1,291 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+/**
+ * @fileoverview Utility functions for the tensorflow graph visualizer.
+ */
+
+module tf.graph.util {
+  /**
+   * Recommended delay (ms) when running an expensive task asynchronously
+   * that gives enough time for the progress bar to update its UI.
+   */
+  const ASYNC_TASK_DELAY = 20;
+
+  export function time<T>(msg: string, task: () => T) {
+    let start = Date.now();
+    let result = task();
+    /* tslint:disable */
+    console.log(msg, ':', Date.now() - start, 'ms');
+    /* tslint:enable */
+    return result;
+  }
+
+  /**
+   * Creates a tracker that sets the progress property of the
+   * provided polymer component. The provided component must have
+   * a property called 'progress' that is not read-only. The progress
+   * property is an object with a numerical 'value' property and a
+   * string 'msg' property.
+   */
+  export function getTracker(polymerComponent: any) {
+    return {
+      setMessage: function(msg) {
+        polymerComponent.set(
+            'progress', {value: polymerComponent.progress.value, msg: msg});
+      },
+      updateProgress: function(value) {
+        polymerComponent.set('progress', {
+          value: polymerComponent.progress.value + value,
+          msg: polymerComponent.progress.msg
+        });
+      },
+      reportError: function(msg: string, err) {
+        // Log the stack trace in the console.
+        console.error(err.stack);
+        // And send a user-friendly message to the UI.
+        polymerComponent.set(
+            'progress',
+            {value: polymerComponent.progress.value, msg: msg, error: true});
+      },
+    };
+  }
+
+  /**
+   * Creates a tracker for a subtask given the parent tracker, the total
+   * progress
+   * of the subtask and the subtask message. The parent task should pass a
+   * subtracker to its subtasks. The subtask reports its own progress which
+   * becames relative to the main task.
+   */
+  export function getSubtaskTracker(
+      parentTracker: ProgressTracker, impactOnTotalProgress: number,
+      subtaskMsg: string): ProgressTracker {
+    return {
+      setMessage: function(progressMsg) {
+        // The parent should show a concatenation of its message along with
+        // its subtask tracker message.
+        parentTracker.setMessage(subtaskMsg + ': ' + progressMsg);
+      },
+      updateProgress: function(incrementValue) {
+        // Update the parent progress relative to the child progress.
+        // For example, if the sub-task progresses by 30%, and the impact on the
+        // total progress is 50%, then the task progresses by 30% * 50% = 15%.
+        parentTracker.updateProgress(
+            incrementValue * impactOnTotalProgress / 100);
+      },
+      reportError: function(msg: string, err: Error) {
+        // The parent should show a concatenation of its message along with
+        // its subtask error message.
+        parentTracker.reportError(subtaskMsg + ': ' + msg, err);
+      }
+    };
+  }
+
+  /**
+   * Runs an expensive task and return the result.
+   */
+  export function runTask<T>(
+      msg: string, incProgressValue: number, task: () => T,
+      tracker: ProgressTracker): T {
+    // Update the progress message to say the current running task.
+    tracker.setMessage(msg);
+    // Run the expensive task with a delay that gives enough time for the
+    // UI to update.
+    try {
+      let result = tf.graph.util.time(msg, task);
+      // Update the progress value.
+      tracker.updateProgress(incProgressValue);
+      // Return the result to be used by other tasks.
+      return result;
+    } catch (e) {
+      // Errors that happen inside asynchronous tasks are
+      // reported to the tracker using a user-friendly message.
+      tracker.reportError('Failed ' + msg, e);
+    }
+  }
+
+  /**
+   * Runs an expensive task asynchronously and returns a promise of the result.
+   */
+  export function runAsyncTask<T>(
+      msg: string, incProgressValue: number, task: () => T,
+      tracker: ProgressTracker): Promise<T> {
+    return new Promise((resolve, reject) => {
+      // Update the progress message to say the current running task.
+      tracker.setMessage(msg);
+      // Run the expensive task with a delay that gives enough time for the
+      // UI to update.
+      setTimeout(function() {
+        try {
+          let result = tf.graph.util.time(msg, task);
+          // Update the progress value.
+          tracker.updateProgress(incProgressValue);
+          // Return the result to be used by other tasks.
+          resolve(result);
+        } catch (e) {
+          // Errors that happen inside asynchronous tasks are
+          // reported to the tracker using a user-friendly message.
+          tracker.reportError('Failed ' + msg, e);
+        }
+      }, ASYNC_TASK_DELAY);
+    });
+  }
+
+  /**
+   * Asynchronously runs an expensive task that returns a promise. Updates the
+   * tracker's progress after the promise resolves. Returns a new promise that
+   * resolves after the progress is updated.
+   */
+  export function runAsyncPromiseTask<T>(
+      msg: string, incProgressValue: number, task: () => Promise<T>,
+      tracker: ProgressTracker): Promise<T> {
+    return new Promise((resolve, reject) => {
+      let handleError = function(e) {
+        // Errors that happen inside asynchronous tasks are
+        // reported to the tracker using a user-friendly message.
+        tracker.reportError('Failed ' + msg, e);
+        reject(e);
+      };
+
+      // Update the progress message to say the current running task.
+      tracker.setMessage(msg);
+      // Run the expensive task with a delay that gives enough time for the
+      // UI to update.
+      setTimeout(function() {
+        try {
+          let start = Date.now();
+          task()
+              .then(function(value) {
+                /* tslint:disable */
+                console.log(msg, ':', Date.now() - start, 'ms');
+                // Update the progress value.
+                tracker.updateProgress(incProgressValue);
+                // Return the result to be used by other tasks.
+                resolve(value);
+              })
+              .catch(handleError);
+        } catch (e) {
+          handleError(e);
+        }
+      }, ASYNC_TASK_DELAY);
+    });
+  }
+
+  /**
+   * Returns a query selector with escaped special characters that are not
+   * allowed in a query selector.
+   */
+  export function escapeQuerySelector(querySelector: string): string {
+    return querySelector.replace(/([:.\[\],/\\\(\)])/g, '\\$1');
+  }
+
+  // For unit conversion.
+  export const MEMORY_UNITS = [
+    // Atomic unit.
+    {symbol: 'B'},
+    // numUnits specifies how many previous units this unit contains.
+    {symbol: 'KB', numUnits: 1024}, {symbol: 'MB', numUnits: 1024},
+    {symbol: 'GB', numUnits: 1024}, {symbol: 'TB', numUnits: 1024},
+    {symbol: 'PB', numUnits: 1024}
+  ];
+  export const TIME_UNITS = [
+    // Atomic unit. Finest granularity in TensorFlow stat collection.
+    {symbol: 'µs'},
+    // numUnits specifies how many previous units this unit contains.
+    {symbol: 'ms', numUnits: 1000}, {symbol: 's', numUnits: 1000},
+    {symbol: 'min', numUnits: 60}, {symbol: 'hr', numUnits: 60},
+    {symbol: 'days', numUnits: 24}
+  ];
+
+  /**
+   * Returns the human readable version of the unit.
+   * (e.g. 1.35 GB, 23 MB, 34 ms, 6.53 min etc).
+   */
+  export function convertUnitsToHumanReadable(value, units, unitIndex) {
+    unitIndex = unitIndex == null ? 0 : unitIndex;
+    if (unitIndex + 1 < units.length &&
+        value >= units[unitIndex + 1].numUnits) {
+      return tf.graph.util.convertUnitsToHumanReadable(
+          value / units[unitIndex + 1].numUnits, units, unitIndex + 1);
+    }
+    // toPrecision() has the tendency to return a number in scientific
+    // notation and (number - 0) brings it back to normal notation.
+    return (value.toPrecision(3) - 0) + ' ' + units[unitIndex].symbol;
+  }
+
+  export function hasDisplayableNodeStats(stats: NodeStats) {
+    if (stats &&
+        (stats.totalBytes > 0 || stats.getTotalMicros() > 0 ||
+         stats.outputSize)) {
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Given a list of strings, it returns a new list of strings with the longest
+   * common prefix removed. If the common prefix is one of the strings in the
+   * list, it returns the original strings.
+   */
+  export function removeCommonPrefix(strings: string[]) {
+    if (strings.length < 2) {
+      return strings;
+    }
+
+    let index = 0;
+    let largestIndex = 0;
+    // Find the shortest name across all strings.
+    let minLength = _.min(_.map(strings, str => str.length));
+    while (true) {
+      index++;
+      let prefixes = _.map(strings, str => str.substring(0, index));
+      let allTheSame = prefixes.every((prefix, i) => {
+        return (i === 0 ? true : prefix === prefixes[i - 1]);
+      });
+      if (allTheSame) {
+        if (index >= minLength) {
+          // There is a string whose whole name is a prefix to other string.
+          // In this case, we return the original list of string.
+          return strings;
+        }
+        largestIndex = index;
+      } else {
+        break;
+      }
+    }
+    return _.map(strings, str => str.substring(largestIndex));
+  }
+
+  /**
+   * Given a queryString, aka ?foo=1&bar=2, return the object representation.
+   */
+  export function getQueryParams(queryString: string) {
+    if (queryString.charAt(0) === '?') {
+      queryString = queryString.slice(1);
+    }
+
+    let queryParams = _.chain(queryString.split('&'))
+                          .map((item) => {
+                            if (item) {
+                              return item.split('=');
+                            }
+                          })
+                          .compact()
+                          .value();
+
+    return _.object(queryParams);
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD
new file mode 100644
index 0000000000..d5f9a76eb2
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD
@@ -0,0 +1,32 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_controls_d3v4",
+    srcs = [
+        "tf-graph-controls.html",
+    ],
+    path = "/tf-graph-controls",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "@org_polymer",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_radio_group",
+        "@org_polymer_paper_toggle_button",
+        "@org_polymer_paper_tooltip",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD
new file mode 100644
index 0000000000..c47cb90a03
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_controls/demo
+web_library(
+    name = "demo",
+    srcs = ["index.html"],
+    path = "/tf-graph-controls/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_controls",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/index.html
new file mode 100644
index 0000000000..8b12641b28
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/index.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-controls.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Controls Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 700px;
+    position: relative;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-controls-demo">
+      <template>
+        <tf-graph-controls
+            id="controls"
+            color-by="structure"
+        ></tf-graph-controls>
+      </template>
+      <script>
+        Polymer({
+          is: "tf-graph-controls-demo",
+        });
+      </script>
+    </dom-module>
+    <div id="demo-container">
+      <tf-graph-controls-demo></tf-graph-controls-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/tf-graph-controls.html b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/tf-graph-controls.html
new file mode 100644
index 0000000000..10faf29bbc
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/tf-graph-controls.html
@@ -0,0 +1,829 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-menu/paper-menu.html">
+<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../paper-radio-group/paper-radio-group.html">
+<link rel="import" href="../paper-tooltip/paper-tooltip.html">
+<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
+
+<dom-module id="tf-graph-controls">
+<template>
+<style>
+:host {
+  font-size: 12px;
+  color: gray;
+  --paper-font-subhead: {
+    font-size: 14px;
+    color: gray;
+  };
+  --paper-dropdown-menu-icon: {
+    width: 15px;
+    height: 15px;
+  };
+  --paper-dropdown-menu-button: {
+    padding: 0;
+  };
+  --paper-dropdown-menu-input: {
+    padding: 0;
+  };
+  --paper-item-min-height: 30px;
+}
+
+paper-button[raised].keyboard-focus {
+  font-weight: normal;
+}
+
+.run-dropdown {
+  --paper-input-container: {
+    padding: 9px 0 0 25px;
+  };
+}
+
+.color-dropdown {
+  --paper-input-container: {
+    padding: 9px 0 0 13px;
+  };
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+table td {
+  padding: 0;
+  margin: 0;
+}
+
+.allcontrols {
+  width: 188px;
+  padding: 0 30px;
+}
+
+.legend-holder {
+  position: absolute;
+  bottom: 0;
+  padding-bottom: 10px;
+}
+
+paper-radio-button {
+  display: block;
+  padding: 5px;
+}
+svg.icon {
+  width: 60px;
+  height: 18px;
+}
+.icon ellipse {
+  rx: 10px;
+  ry: 5px;
+  stroke: #CCC;
+  stroke-width: 1px;
+  fill: #FFFFFF;
+  cy: 10px;
+}
+.icon rect {
+  height: 14px;
+  width: 35px;
+  rx: 5px;
+  ry: 5px;
+  stroke: #CCC;
+  stroke-width: 2px;
+  fill: #D9D9D9;
+}
+.domainValues {
+  margin-bottom: 10px;
+  width: 165px;
+}
+.domainStart {
+  float: left;
+}
+.domainEnd {
+  float: right;
+}
+.colorBox {
+  width: 20px;
+}
+
+.image-icon {
+  width: 24px;
+  height: 24px;
+}
+
+.help-icon {
+  height: 15px;
+  margin: 0;
+  padding: 0;
+}
+
+.gray {
+  color: #666;
+}
+
+.title {
+  font-size: 16px;
+  margin: 8px 5px 8px 0;
+  color: black;
+}
+.title small {
+  font-weight: normal;
+}
+.deviceList, .xlaClusterList {
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+#file {
+  padding: 8px 0;
+}
+
+.color-legend-row {
+  clear: both;
+  height: 20px;
+  margin-top: 5px;
+  position: relative;
+}
+
+.color-legend-row svg {
+  position: absolute;
+  top: -1px;
+  width: 40px;
+}
+
+.color-legend-row span.color-legend-value {
+  margin-left: 60px;
+}
+
+#grey-rect {
+  fill: #eee;
+  stroke: #a6a6a6;
+}
+
+#faded-rect {
+  fill: url(#rectHatch);
+  stroke: var(--tb-graph-faded);
+}
+
+.button-text {
+  text-transform: none;
+  padding: 8px 18px 0 18px;
+  font-size: 14px
+}
+
+.upload-button {
+  width: 165px;
+  height: 25px;
+  text-transform: none;
+  margin-top: 4px;
+}
+
+.iconbutton {
+  padding: 2px;
+  width: 30px;
+  height: 30px;
+  color: var(--paper-orange-500);
+}
+
+.hidden-input {
+  height: 0px;
+  width: 0px;
+  overflow:hidden;
+}
+
+.allcontrols .control-holder {
+  display: flex;
+  clear: both;
+}
+
+.allcontrols .control-holder paper-radio-group {
+  margin-top: 5px;
+}
+
+span.counter {
+  font-size: 13px;
+  color: gray;
+}
+
+.runs paper-item {
+  --paper-item: {
+    white-space: nowrap;
+  }
+}
+
+table.control-holder {
+  border: 0;
+  border-collapse: collapse;
+}
+
+table.tf-graph-controls td.input-element-table-data {
+  padding: 0 0 0 20px;
+}
+
+/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
+/*  tooltips do not appear. */
+#color-by-radio-group paper-radio-button {
+  pointer-events: auto !important;
+}
+</style>
+<svg width="0" height="0">
+  <defs>
+    <g id="legend-rect">
+      <rect x="1" y="1" stroke-width="2px" height="14" width="35" rx="5" ry="5"></rect>
+    </g>
+    <g id="grey-rect">
+       <use xmlns:xlink="http://www.w3.org/1999/xlink"
+            xlink:href="#legend-rect"/>
+     </g>
+     <g id="faded-rect">
+       <use xmlns:xlink="http://www.w3.org/1999/xlink"
+            xlink:href="#legend-rect"/>
+     </g>
+  </defs>
+</svg>
+<div class="allcontrols">
+  <div class="control-holder">
+    <paper-icon-button icon="aspect-ratio" class="iconbutton" on-click="fit" alt="Fit to screen">
+    </paper-icon-button>
+    <paper-button class="button-text" on-click="fit">Fit to screen
+    </paper-button>
+  </div>
+  <div class="control-holder">
+    <paper-icon-button icon="file-download" class="iconbutton" on-click="download" alt="Download PNG">
+    </paper-icon-button>
+    <paper-button class="button-text" on-click="download">Download PNG
+    </paper-button>
+    <a href="#" id="graphdownload" class="title" download="graph.png">
+    </a>
+  </div>
+  <div class="control-holder runs">
+    <div class="title">Run <span class="counter">([[datasets.length]])</span></div>
+    <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
+      <paper-menu id="select" class="dropdown-content" selected="{{selectedDataset}}">
+        <template is="dom-repeat" items="[[datasets]]">
+          <paper-item>[[item.name]]</paper-item>
+        </template>
+      </paper-menu>
+    </paper-dropdown-menu>
+  </div>
+  <template is="dom-if" if="[[showSessionRunsDropdown]]">
+    <div class="control-holder">
+      <div class="title">Session runs <span class="counter">([[_numSessionRuns(metadataTags)]])</span></div>
+      <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
+        <paper-menu id="select" class="dropdown-content" selected="{{selectedMetadataTag}}">
+          <template is="dom-repeat" items="[[metadataTags]]">
+            <paper-item>[[item.tag]]</paper-item>
+          </template>
+          <paper-item>None</paper-item>
+        </paper-menu>
+      </paper-dropdown-menu>
+    </div>
+  </template>
+  <template is="dom-if" if="[[showUploadButton]]">
+    <div class="control-holder">
+      <div class="title">Upload</div>
+      <paper-button raised class="text-button upload-button"
+          on-click="_getFile">Choose File</paper-button>
+      <div class="hidden-input">
+        <input type="file" id="file" name="file" on-change="_updateFileInput" />
+      </div>
+    </div>
+  </template>
+  <table class="control-holder">
+    <tr>
+      <td class="title">Trace inputs</td>
+      <td class="input-element-table-data">
+        <paper-toggle-button id="trace-inputs"></paper-toggle-button>
+      </td>
+    </tr>
+    <template is="dom-if" if="[[healthPillsFeatureEnabled]]">
+      <tr>
+        <td class="title">Show health pills</td>
+        <td class="input-element-table-data">
+          <paper-toggle-button checked="{{healthPillsToggledOn}}"></paper-toggle-button>
+        </td>
+      </tr>
+    </template>
+  </table>
+  <div class="control-holder">
+    <div class="title">Color</div>
+    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
+      <paper-radio-button name="structure">Structure</paper-radio-button>
+
+      <paper-radio-button name="device">Device</paper-radio-button>
+
+      <paper-radio-button id="xla-cluster-radio-button"
+                          name="xla_cluster"
+                          disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
+        XLA Cluster
+      </paper-radio-button>
+      <paper-tooltip for="xla-cluster-radio-button" position="right">
+        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
+      </paper-tooltip>
+
+      <paper-radio-button id="compute-time-radio-button"
+                          name="compute_time"
+                          disabled="[[!stats]]">
+        Compute time
+      </paper-radio-button>
+      <paper-tooltip for="compute-time-radio-button" position="right">
+        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
+
+      <paper-radio-button id="memory-radio-button"
+                          name="memory"
+                          disabled="[[!stats]]">
+        Memory
+      </paper-radio-button>
+      <paper-tooltip for="memory-radio-button" position="right">
+        Coloring by memory is only enabled if the RunMetadata proto is passed to the
+        FileWriter when a specific session is run.
+      </paper-tooltip>
+    </paper-radio-group>
+  </div>
+  <div>
+    <template is="dom-if" if="[[_isGradientColoring(stats, colorBy)]]">
+      <svg width="140" height="20" style="margin: 0 5px" class="color-text">
+        <defs>
+          <linearGradient id="linearGradient" x1="0%" y1="0%" x2="100%" y2="0%">
+            <stop class="start" offset="0%"
+                stop-color$="[[_currentGradientParams.startColor]]"/>
+            <stop class="end" offset="100%"
+                stop-color$="[[_currentGradientParams.endColor]]"/>
+          </linearGradient>
+        </defs>
+        <rect x="0" y="0" width="135" height="20" fill="url(#linearGradient)"
+            stroke="black" />
+      </svg>
+      <div class="domainValues color-text">
+        <div class="domainStart">[[_currentGradientParams.minValue]]</div>
+        <div class="domainEnd">[[_currentGradientParams.maxValue]]</div>
+      </div>
+      <br style="clear: both">
+      <div>Devices included in stats:</div>
+      <div class="deviceList">
+        <table>
+        <template is="dom-repeat" items="[[_getDevices(devicesForStats)]]">
+          <tr>
+            <td>
+              <input type="checkbox" value$="[[item.device]]" checked$="[[item.used]]" on-click="_deviceCheckboxClicked"/>
+            </td>
+            <td>
+              <div>
+                <span>[[item.suffix]]</span>
+                <template is="dom-if" if="[[item.ignoredMsg]]">
+                  <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
+                  <paper-tooltip position="right" animation-delay="0">[[item.ignoredMsg]]</paper-tooltip>
+                </template>
+              </div>
+            </td>
+          </tr>
+        </template>
+        </table>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'structure')]]">
+      <div class="color-text">
+        <div class="color-legend-row">
+          <div style="position: absolute;">
+            colors
+          </div>
+          <span class="color-legend-value">same substructure</span>
+        </div>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                 xlink:href="#grey-rect" x="0" y="0"/>
+          </svg>
+          <span class="color-legend-value">unique substructure</span>
+        </div>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'device')]]">
+      <div class="color-text">
+        <div class="deviceList">
+          <table>
+          <template is="dom-repeat" items="[[colorByParams.device]]">
+            <tr>
+              <td style$="[[_getBackgroundColor(item.color)]]">
+                <div class="colorBox"></div>
+              </td>
+              <td>
+                <div>[[item.device]]</div>
+              </td>
+            </tr>
+          </template>
+          </table>
+        </div>
+        <br/>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                 xlink:href="#grey-rect" x="0" y="0"/>
+          </svg>
+          <span class="color-legend-value">unknown device</span>
+        </div>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
+      <div class="color-text">
+        <div class="xlaClusterList">
+          <table>
+          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
+            <tr>
+              <td style$="[[_getBackgroundColor(item.color)]]">
+                <div class="colorBox"></div>
+              </td>
+              <td>
+                <div>[[item.xla_cluster]]</div>
+              </td>
+            </tr>
+          </template>
+          </table>
+        </div>
+        <br/>
+        <div class="color-legend-row">
+          <svg>
+            <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                 xlink:href="#grey-rect" x="0" y="0"/>
+          </svg>
+          <span class="color-legend-value">unknown XLA cluster</span>
+        </div>
+      </div>
+    </template>
+    <template is="dom-if" if="[[_statsNotNull(stats)]]">
+      <div class="color-legend-row">
+        <svg>
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+                xlink:href="#faded-rect" x="0" y="0"/>
+        </svg>
+        <span class="color-legend-value">unused substructure</span>
+      </div>
+    </template>
+  </div>
+  <!--
+    Due to limited vertical space on the left sidebar, hide the legend whenever
+    we show a list of devices to include in stats.
+  -->
+  <template is="dom-if" if="[[!_isGradientColoring(stats, colorBy)]]">
+    <div class="legend-holder">
+      <table>
+        <tr>
+          <td><div class="title">Graph</div></td>
+          <td>(* = expandable)</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon">
+              <rect transform="translate(3, 1)" height="14" width="35"
+                  rx="5" ry="5"/>
+            </svg>
+          </td>
+          <td>Namespace<span class="gray">*</span></td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" preserveAspectRatio="xMinYMid meet"
+                viewBox="0 0 10 10">
+              <use xlink:href="#op-node-stamp" fill="white" stroke="#ccc" x="9.5"
+                y="6" />
+            </svg>
+          </td>
+          <td>OpNode</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet"
+                viewBox="0 0 12 12">
+              <use xlink:href="#op-series-horizontal-stamp" fill="white"
+                  stroke="#ccc" x="2" y="2"/>
+            </svg>
+          </td>
+          <td>Unconnected series<span class="gray">*</span></td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <use xlink:href="#op-series-vertical-stamp"
+                  fill="white" stroke="#ccc" x="2" y="2"/>
+            </svg>
+          </td>
+          <td>Connected series<span class="gray">*</span></td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon">
+              <circle fill="white" stroke="#848484" cx="10" cy="10" r="5"/>
+            </svg>
+          </td>
+          <td>Constant</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="image-icon" viewBox="0 0 12 12" width="24" height="24">
+              <use x="0" y="0" class="image-icon" xlink:href="#summary-icon"/>
+            </svg>
+          </td>
+          <td>Summary</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <defs>
+                <marker id="ref-arrowhead-legend" fill="#bbb" markerWidth="10"
+                    markerHeight="10" refX="1" refY="5" orient="auto">
+                  <path d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"/>
+                </marker>
+              </defs>
+              <path stroke="#bbb"
+                  d="M2 9 l 23 0" stroke-linecap="round" />
+            </svg>
+          </td>
+          <td>Dataflow edge</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <path stroke="#bbb"
+                d="M2 9 l 23 0" stroke-linecap="round" stroke-dasharray="2, 2" />
+            </svg>
+          </td>
+          <td>Control dependency edge</td>
+        </tr>
+        <tr>
+          <td>
+            <svg class="icon" height="15px"
+                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
+              <path marker-start="url(#ref-arrowhead-legend)"
+                stroke="#bbb" d="M2 9 l 23 0"
+                stroke-linecap="round" />
+            </svg>
+          </td>
+          <td>Reference edge</td>
+        </tr>
+      </table>
+    </div>
+  </template>
+  </div>
+</template>
+</dom-module>
+
+<script>
+(function() { // Private scope.
+/**
+ * Stats from device names that match these regexes will be excluded by default.
+ * The user can still turn on a device by selecting the checkbox in the device list.
+ * See b/29089982 for context.
+ */
+var DEVICE_NAMES_EXCLUDE = [
+  {
+    regex: /gpu:[0-9]+$/,
+    msg: 'Excluded by default since this is a CPU thread setting up GPU kernels.'
+  }
+];
+
+Polymer({
+  is: 'tf-graph-controls',
+  properties: {
+    // Public API.
+    stats: {
+      value: null,
+      type: Object,
+      observer: '_statsChanged'
+    },
+    devicesForStats: {
+      value: null,
+      type: Object,
+      notify: true,
+      readonly: true,
+    },
+    colorBy: {
+      type: String,
+      value: 'structure',
+      notify: true,
+      readonly: true
+    },
+    colorByParams: Object,
+    datasets: {
+      type: Array,
+      observer: '_datasetsChanged'
+    },
+    renderHierarchy: {
+      type: Object,
+      notify: true,
+    },
+    metadataTags: {
+      type: Array,
+      computed: '_getMetadataTags(selectedDataset, datasets)'
+    },
+    selectedDataset: {
+      type: Number,
+      notify: true,
+      value: 0,
+      observer: '_selectedDatasetChanged'
+    },
+    selectedFile: {
+      type: Object,
+      notify: true
+    },
+    selectedMetadataTag: {
+      type: Number,
+      notify: true,
+      value: -1
+    },
+    _currentGradientParams: {
+      type: Object,
+      computed: '_getCurrentGradientParams(colorByParams, colorBy)'
+    },
+    showSessionRunsDropdown: {
+      type: Boolean,
+      value: true
+    },
+    showUploadButton: {
+      type: Boolean,
+      value: true
+    },
+    // This stores whether the feature for showing health pills is enabled in the first place.
+    healthPillsFeatureEnabled: Boolean,
+    // This stores whether to show health pills. Only relevant if healthPillsFeatureEnabled. The
+    // user can toggle this value.
+    healthPillsToggledOn: {
+      type: Boolean,
+      notify: true,
+    },
+  },
+  listeners: {
+    'trace-inputs.change': '_traceInputToggleChanged'
+  },
+  _traceInputToggleChanged: function(event) {
+    // Flip the state of the trace inputs flag.
+    this.renderHierarchy.traceInputs = event.target.active;
+    tf.graph.scene.node.traceInputs(this.renderHierarchy);
+  },
+  _xlaClustersProvided: function(renderHierarchy) {
+    return renderHierarchy &&
+        renderHierarchy.hierarchy &&
+        renderHierarchy.hierarchy.xlaClusters.length > 0;
+  },
+  _statsChanged: function(stats) {
+    if (stats == null) {
+      return;
+    }
+    var devicesForStats = {};
+    var devices = _.each(stats.dev_stats, function(d) {
+      // Avoid device names that are ignored by default.
+      var exclude = _.some(DEVICE_NAMES_EXCLUDE, function(rule) {
+        return rule.regex.test(d.device);
+      });
+      if (!exclude) {
+        devicesForStats[d.device] = true;
+      }
+    });
+    this.set('devicesForStats', devicesForStats);
+  },
+  _getDevices: function(devicesForStats) {
+    var devices = _.map(this.stats.dev_stats, function(d) {
+      return d.device;
+    });
+    // Devices names can be long so we remove the longest common prefix
+    // before showing the devices in a list.
+    var suffixes = tf.graph.util.removeCommonPrefix(devices);
+    return _.map(devices, function(device, i) {
+      var ignoredMsg = null;
+      _.each(DEVICE_NAMES_EXCLUDE, function(rule) {
+        if (rule.regex.test(device)) {
+          ignoredMsg = rule.msg;
+        }
+      });
+      return {
+        device: device,
+        suffix: suffixes[i],
+        used: devicesForStats[device],
+        ignoredMsg: ignoredMsg
+      };
+    });
+  },
+  _deviceCheckboxClicked: function(checkbox) {
+    // Update the device map.
+    var devicesForStats = _.extend({}, this.devicesForStats);
+    var device = checkbox.target.value;
+    if (checkbox.target.checked) {
+      devicesForStats[device] = true;
+    } else {
+      delete devicesForStats[device];
+    }
+    this.set('devicesForStats', devicesForStats);
+  },
+  _numSessionRuns: function(metadataTags) {
+    return metadataTags != null ? metadataTags.length : 0;
+  },
+  _getBackgroundColor: function(color) {
+    return 'background-color:' + color;
+  },
+  fit: function() {
+    document.querySelector('#scene').fit();
+  },
+  _isGradientColoring: function(stats, colorBy) {
+    return ["compute_time", "memory"].indexOf(colorBy) !== -1
+        && stats != null;
+  },
+  _equals: function(a, b) {
+    return a === b;
+  },
+  _getCurrentGradientParams: function(colorByParams, colorBy) {
+    if (!this._isGradientColoring(this.stats, colorBy)) {
+      return;
+    }
+    var params = colorByParams[colorBy];
+    var minValue = params.minValue;
+    var maxValue = params.maxValue;
+    if (colorBy === 'memory') {
+      minValue = tf.graph.util.convertUnitsToHumanReadable(
+          minValue, tf.graph.util.MEMORY_UNITS);
+      maxValue = tf.graph.util.convertUnitsToHumanReadable(
+          maxValue, tf.graph.util.MEMORY_UNITS);
+    } else if (colorBy === 'compute_time') {
+      minValue = tf.graph.util.convertUnitsToHumanReadable(
+          minValue, tf.graph.util.TIME_UNITS);
+      maxValue = tf.graph.util.convertUnitsToHumanReadable(
+          maxValue, tf.graph.util.TIME_UNITS);
+    }
+    return {
+      minValue: minValue,
+      maxValue: maxValue,
+      startColor: params.startColor,
+      endColor: params.endColor
+    };
+  },
+  download: function() {
+    this.$.graphdownload.click();
+  },
+  _updateFileInput: function(e) {
+    var file = e.target.files[0];
+    if (!file) {
+      return;
+    }
+    this._setDownloadFilename(file.name);
+    this.set('selectedFile', e);
+  },
+  _datasetsChanged: function(newDatasets, oldDatasets) {
+    if (oldDatasets != null || this.selected == null) {
+      // Select the first dataset by default.
+      this.set('selectedDataset', 0);
+      this._setDownloadFilename(this.datasets[this.selectedDataset].path);
+    }
+  },
+  _getMetadataTags: function(selectedDataset, datasets) {
+    return this.datasets[selectedDataset].runMetadata;
+  },
+  _selectedDatasetChanged: function(newDataset, oldDataset) {
+    if (this.datasets) {
+      this.set('selectedMetadataTag', -1);
+      this.set('colorBy', 'structure');
+      this.$['trace-inputs'].active = false; // Set trace input to off-state.
+      this._setDownloadFilename(this.datasets[newDataset].path);
+    }
+  },
+  _getFile: function() {
+    this.$$("#file").click();
+  },
+  _setDownloadFilename: function(graphPath) {
+    // Strip off everything before the last "/" and strip off the file
+    // extension in order to get the name of the PNG for the graph.
+    var dotIndex = graphPath.lastIndexOf('.');
+    if (dotIndex) {
+      graphPath = graphPath.substring(0, dotIndex);
+    }
+    var slashIndex = graphPath.lastIndexOf('/');
+    if (slashIndex) {
+      graphPath = graphPath.substring(slashIndex + 1);
+    }
+    this.$.graphdownload.setAttribute('download', graphPath + '.png');
+  },
+  _statsNotNull: function(stats) {
+    return stats !== null;
+  },
+});
+})(); // Closing private scope.
+</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_d3v4/BUILD
new file mode 100644
index 0000000000..367baeb67b
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/BUILD
@@ -0,0 +1,37 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_d3v4",
+    srcs = [
+        "tf-graph.html",
+        "tf-graph-minimap.html",
+        "tf-graph-scene.html",
+    ],
+    path = "/tf-graph",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "@org_polymer",
+        "@org_polymer_iron_flex_layout",
+        "@org_polymer_iron_icons",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_dropdown_menu",
+        "@org_polymer_paper_input",
+        "@org_polymer_paper_menu",
+        "@org_polymer_paper_radio_group",
+        "@org_polymer_paper_toggle_button",
+        "@org_polymer_paper_tooltip",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD
new file mode 100644
index 0000000000..524d0ff767
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph/demo
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph",
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/index.html
new file mode 100644
index 0000000000..52e2f0b934
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/index.html
@@ -0,0 +1,92 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph.html">
+<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 600px;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-demo">
+      <template>
+        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
+        <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            out-graph="{{_graph}}">
+        </tf-graph-loader>
+
+        <!-- We color ops in the graph by XLA cluster. -->
+        <tf-graph id="graph" color-by="xla_cluster"></tf-graph>
+      </template>
+      <script>
+        "use strict";
+
+        Polymer({
+          is: "tf-graph-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
+
+            // This property will be updated by the graph loader.
+            _graph: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_graphUpdated(_graph)',
+          ],
+          _graphUpdated: function(slimGraph) {
+            const tracker = tf.graph.util.getTracker(this.$.loader);
+            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
+                tracker, 100, 'Namespace hierarchy');
+            const hierarchyOptions = {};
+            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
+                function(graphHierarchy) {
+              // We have parsed and built the graph object from a pbtxt file. Render the graph.
+              this.$.graph.set('basicGraph', slimGraph);
+              this.$.graph.set('graphHierarchy', graphHierarchy);
+            }.bind(this));
+          },
+        });
+      </script>
+    </dom-module>
+    <div id='demo-container'>
+      <tf-graph-demo></tf-graph-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-minimap.html b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-minimap.html
new file mode 100644
index 0000000000..5fc16c0520
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-minimap.html
@@ -0,0 +1,88 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<script src="../tf-graph-common/minimap.js"></script>
+
+<dom-module id="tf-graph-minimap">
+<template>
+<style>
+:host {
+  background-color:white;
+  transition: opacity .3s linear;
+  pointer-events: auto;
+}
+
+:host.hidden {
+  opacity: 0;
+  pointer-events: none;
+}
+
+canvas {
+  border: 1px solid #999;
+}
+
+rect {
+  fill: white;
+  stroke: #111111;
+  stroke-width: 1px;
+  fill-opacity: 0;
+  filter: url(#minimapDropShadow);
+  cursor: move;
+}
+
+svg {
+  position: absolute;
+}
+</style>
+<svg>
+  <defs>
+    <filter id="minimapDropShadow" x="-20%" y="-20%" width="150%" height="150%">
+      <feOffset result="offOut" in="SourceGraphic" dx="1" dy="1"></feOffset>
+      <feColorMatrix result="matrixOut" in="offOut" type="matrix" values="0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.5 0"></feColorMatrix>
+      <feGaussianBlur result="blurOut" in="matrixOut" stdDeviation="2"></feGaussianBlur>
+      <feBlend in="SourceGraphic" in2="blurOut" mode="normal"></feBlend>
+    </filter>
+  </defs>
+  <rect></rect>
+</svg>
+<canvas class="first"></canvas>
+<!-- Additional canvas to use as buffer to avoid flickering between updates -->
+<canvas class="second"></canvas>
+<canvas class="download"></canvas>
+</template>
+<script>
+Polymer({
+  is: 'tf-graph-minimap',
+
+  /**
+   * Initializes the minimap and returns a minimap object to notify when
+   * things update.
+   *
+   * @param svg The main svg element.
+   * @param zoomG The svg group used for panning and zooming the main svg.
+   * @param mainZoom The main zoom behavior.
+   * @param maxWandH The maximum width/height for the minimap.
+   * @param labelPadding Padding in pixels due to the main graph labels.
+   */
+  init: function(svg, zoomG, mainZoom, maxWAndH, labelPadding) {
+    return new tf.scene.Minimap(svg, zoomG, mainZoom, this, maxWAndH,
+        labelPadding);
+  }
+});
+</script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
new file mode 100644
index 0000000000..95d9d16f85
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
@@ -0,0 +1,1052 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="tf-graph-minimap.html">
+
+<!--
+  A module that takes a render hierarchy as input and produces an SVG DOM using
+  dagre and d3.
+-->
+<dom-module id="tf-graph-scene">
+<template>
+<style>
+:host {
+  display: flex;
+  width: 100%;
+  font-size: 20px;
+}
+
+::content #svg {
+  overflow: hidden;
+  flex: 1;
+  height: 100%;
+  width: 100%;
+}
+
+::content #hidden {
+  position: fixed;
+  top: 0px;
+  visibility: hidden;
+}
+
+/* --- Node and annotation-node for Metanode --- */
+
+::content .meta > .nodeshape > rect,
+::content .meta > .annotation-node > rect {
+  cursor: pointer;
+  fill: hsl(0, 0%, 70%);
+}
+
+::content .node.meta.highlighted > .nodeshape > rect,
+::content .node.meta.highlighted > .annotation-node > rect {
+  stroke-width: 2;
+}
+
+::content .annotation.meta.highlighted > .nodeshape > rect,
+::content .annotation.meta.highlighted > .annotation-node > rect {
+  stroke-width: 1;
+}
+
+::content .meta.selected > .nodeshape > rect,
+::content .meta.selected > .annotation-node > rect {
+  stroke: red;
+  stroke-width: 2;
+}
+
+::content .node.meta.selected.expanded > .nodeshape > rect,
+::content .node.meta.selected.expanded > .annotation-node > rect {
+  stroke: red;
+  stroke-width: 3;
+}
+
+::content .annotation.meta.selected > .nodeshape > rect,
+::content .annotation.meta.selected > .annotation-node > rect {
+  stroke: red;
+  stroke-width: 2;
+}
+
+::content .node.meta.selected.expanded.highlighted > .nodeshape > rect,
+::content .node.meta.selected.expanded.highlighted > .annotation-node > rect {
+  stroke: red;
+  stroke-width: 4;
+}
+
+::content .faded,
+::content .faded rect,
+::content .faded ellipse,
+::content .faded path,
+::content .faded use,
+::content #rectHatch line,
+::content #ellipseHatch line {
+  color: #e0d4b3 !important;
+  fill: white;
+  stroke: #e0d4b3 !important;
+}
+
+
+::content .faded path {
+  stroke-width: 1px !important;
+}
+
+::content .faded rect {
+  fill: url(#rectHatch) !important;
+}
+
+::content .faded ellipse,
+::content .faded use {
+  fill: url(#ellipseHatch) !important;
+}
+
+::content .faded text {
+  opacity: 0;
+}
+
+/* Rules used for input-tracing. */
+::content .input-highlight > * > rect,
+::content .input-highlight > * > ellipse,
+::content .input-highlight > * > use
+{
+  fill: white;
+  stroke: #ff9800 !important;
+}
+
+/*  - Faded non-input styling */
+::content .non-input > * > rect,
+::content .non-input > * > ellipse,
+::content .non-input > * > use,
+/* For Const nodes. */
+::content .non-input > * > .constant:not([class*="input-highlight"]) >
+  .annotation-node > ellipse,
+/* For styling of annotation nodes of non-input nodes. */
+::content .non-input > g > .annotation > .annotation-node > rect {
+  stroke: #e0d4b3 !important;
+  stroke-width: inherit;
+  stroke-dasharray: inherit;
+}
+
+
+::content .non-input path {
+  visibility: hidden;
+}
+
+::content .non-input > .nodeshape > rect,
+::content .non-input > .annotation-node > rect,
+/* For styling of annotation nodes of non-input nodes. */
+::content .non-input > g > .annotation > .annotation-node > rect
+{
+  fill: url(#rectHatch) !important;
+}
+
+::content .non-input ellipse,
+::content .non-input use {
+  fill: url(#ellipseHatch) !important;
+}
+
+::content .non-input > text {
+  opacity: 0;
+}
+
+::content .non-input .annotation > .annotation-edge {
+  marker-end: url(#annotation-arrowhead-faded);
+}
+
+::content .non-input .annotation > .annotation-edge.refline {
+  marker-start: url(#ref-annotation-arrowhead-faded);
+}
+
+/* Input edges. */
+::content .input-edge-highlight > text {
+  fill: black !important;
+}
+::content .input-edge-highlight > path,
+::content .input-highlight > .in-annotations > .annotation > .annotation-edge,
+::content .input-highlight-selected > .in-annotations > .annotation >
+.annotation-edge {
+  stroke: #999 !important;
+}
+
+/* Non-input edges. */
+::content .non-input-edge-highlight,
+::content .non-input > g > .annotation > path,
+/* Annotation styles (label and edges respectively). */
+::content .non-input > g >
+.annotation:not(.input-highlight):not(.input-highlight-selected) >
+.annotation-label
+/*.annotation-edge*/
+{
+  visibility: hidden;
+}
+
+/* --- Op Node --- */
+
+::content .op > .nodeshape > ellipse,
+::content .op > .annotation-node > ellipse {
+  cursor: pointer;
+  fill: #fff;
+  stroke: #ccc;
+}
+
+::content .op.selected > .nodeshape > ellipse,
+::content .op.selected > .annotation-node > ellipse {
+  stroke: red;
+  stroke-width: 2;
+}
+
+::content .op.highlighted > .nodeshape > ellipse,
+::content .op.highlighted > .annotation-node > ellipse {
+  stroke-width: 2;
+}
+
+/* --- Series Node --- */
+
+/* By default, don't show the series background <rect>. */
+::content .series > .nodeshape > rect {
+  fill: hsl(0, 0%, 70%);
+  fill-opacity: 0;
+  stroke-dasharray: 5, 5;
+  stroke-opacity: 0;
+  cursor: pointer;
+}
+
+/* Once expanded, show the series background <rect> and hide the <use>. */
+::content .series.expanded > .nodeshape > rect {
+  fill-opacity: 0.15;
+  stroke: hsl(0, 0%, 70%);
+  stroke-opacity: 1;
+}
+::content .series.expanded > .nodeshape > use {
+  visibility: hidden;
+}
+
+/**
+ * TODO(jimbo): Simplify this by applying a stable class name to all <g>
+ * elements that currently have either the nodeshape or annotation-node classes.
+ */
+::content .series > .nodeshape > use ,
+::content .series > .annotation-node > use {
+  stroke: #ccc;
+}
+::content .series.highlighted > .nodeshape > use ,
+::content .series.highlighted > .annotation-node > use {
+  stroke-width: 2;
+}
+::content .series.selected > .nodeshape > use ,
+::content .series.selected > .annotation-node > use {
+  stroke: red;
+  stroke-width: 2;
+}
+
+::content .series.selected > .nodeshape > rect {
+  stroke: red;
+  stroke-width: 2;
+}
+
+::content .annotation.series.selected > .annotation-node > use {
+  stroke: red;
+  stroke-width: 2;
+}
+
+/* --- Bridge Node --- */
+::content .bridge > .nodeshape > rect {
+  stroke: #f0f;
+  opacity: 0.2;
+  display: none;
+}
+
+/* --- Structural Elements --- */
+::content .edge > path.edgeline.structural {
+  stroke: #f0f;
+  opacity: 0.2;
+  display: none;
+}
+
+/* --- Series Nodes --- */
+
+/* Hide the rect for a series' annotation. */
+::content .series > .annotation-node > rect {
+  display: none;
+}
+
+/* --- Node label --- */
+
+
+::content .node > text.nodelabel {
+  cursor: pointer;
+  fill: #444;
+}
+
+::content .meta.expanded > text.nodelabel {
+  font-size: 9px;
+}
+
+::content .series > text.nodelabel {
+  font-size: 8px;
+}
+
+::content .op > text.nodelabel {
+  font-size: 6px;
+}
+
+::content .bridge > text.nodelabel {
+  display: none;
+}
+
+::content .node.meta.expanded > text.nodelabel{
+  cursor: normal;
+}
+
+::content .annotation.meta.highlighted > text.annotation-label {
+  fill: #50A3F7;
+}
+
+::content .annotation.meta.selected > text.annotation-label {
+  fill: #4285F4;
+}
+
+/* --- Annotation --- */
+
+/* only applied for annotations that are not summary or constant.
+(.summary, .constant gets overriden below) */
+::content .annotation > .annotation-node > * {
+  stroke-width: 0.5;
+  stroke-dasharray: 1, 1;
+}
+
+::content .annotation.summary > .annotation-node > *,
+::content .annotation.constant > .annotation-node > * {
+  stroke-width: 1;
+  stroke-dasharray: none;
+}
+
+::content .annotation > .annotation-edge {
+  fill: none;
+  stroke: #aaa;
+  stroke-width: 0.5;
+  marker-end: url(#annotation-arrowhead);
+}
+
+::content .faded .annotation > .annotation-edge {
+  marker-end: url(#annotation-arrowhead-faded);
+}
+
+::content .annotation > .annotation-edge.refline {
+  marker-start: url(#ref-annotation-arrowhead);
+}
+
+::content .faded .annotation > .annotation-edge.refline {
+  marker-start: url(#ref-annotation-arrowhead-faded);
+}
+
+::content .annotation > .annotation-control-edge {
+  stroke-dasharray: 1, 1;
+}
+
+::content #annotation-arrowhead {
+  fill: #aaa;
+}
+
+::content #annotation-arrowhead-faded {
+  fill: #e0d4b3;
+}
+
+::content #ref-annotation-arrowhead {
+  fill: #aaa;
+}
+
+::content #ref-annotation-arrowhead-faded {
+  fill: #e0d4b3;
+}
+
+::content .annotation > .annotation-label {
+  font-size: 5px;
+  cursor: pointer;
+}
+::content .annotation > .annotation-label.annotation-ellipsis {
+  cursor: default;
+}
+
+/* Hide annotations on expanded meta nodes since they're redundant. */
+::content .expanded > .in-annotations,
+::content .expanded > .out-annotations {
+  display: none;
+}
+
+/* --- Annotation: Constant --- */
+
+::content .constant > .annotation-node > ellipse {
+  cursor: pointer;
+  fill: white;
+  stroke: #848484;
+}
+
+::content .constant.selected > .annotation-node > ellipse {
+  fill: white;
+  stroke: red;
+}
+
+::content .constant.highlighted > .annotation-node > ellipse {
+  stroke-width: 1.5;
+}
+
+/* --- Annotation: Summary --- */
+
+::content .summary > .annotation-node > ellipse {
+  cursor: pointer;
+  fill: #DB4437;
+  stroke: #DB4437;
+}
+
+::content .summary.selected > .annotation-node > ellipse {
+  fill: #A52714;
+  stroke: #A52714;
+}
+
+::content .summary.highlighted > .annotation-node > ellipse {
+  stroke-width: 1.5;
+}
+
+/* --- Edge --- */
+
+::content .edge > path.edgeline {
+  fill: none;
+  stroke: #bbb;
+  stroke-linecap: round;
+  stroke-width: 0.75;
+}
+
+/* Labels showing tensor shapes on edges */
+::content .edge > text {
+  font-size: 3.5px;
+  fill: #666;
+}
+
+::content .ref-arrowhead {
+  fill: #bbb;
+}
+
+::content .edge .control-dep {
+  stroke-dasharray: 2, 2;
+}
+
+/* --- Group node expand/collapse button --- */
+
+/* Hides expand/collapse buttons when a node isn't expanded or highlighted. Using
+   incredibly small opacity so that the bounding box of the <g> parent still takes
+   this container into account even when it isn't visible */
+::content .node:not(.highlighted):not(.expanded) > .nodeshape > .buttoncontainer {
+  opacity: 0.01;
+}
+::content .node.highlighted > .nodeshape > .buttoncontainer {
+  cursor: pointer;
+}
+::content .buttoncircle {
+  fill: #E7811D;
+}
+::content .buttoncircle:hover {
+  fill: #B96717;
+}
+::content .expandbutton,
+::content .collapsebutton {
+  stroke: white;
+}
+/* Do not let the path elements in the button take pointer focus */
+::content .node > .nodeshape > .buttoncontainer > .expandbutton,
+::content .node > .nodeshape > .buttoncontainer > .collapsebutton {
+  pointer-events: none;
+}
+/* Only show the expand button when a node is collapsed and only show the
+   collapse button when a node is expanded. */
+::content .node.expanded > .nodeshape > .buttoncontainer > .expandbutton {
+  display: none;
+}
+::content .node:not(.expanded) > .nodeshape > .buttoncontainer > .collapsebutton {
+  display: none;
+}
+
+::content .health-pill-stats {
+  font-size: 4px;
+  text-anchor: middle;
+}
+
+::content .health-pill rect {
+  filter: url(#health-pill-shadow);
+  rx: 3;
+  ry: 3;
+}
+
+.titleContainer {
+  position: relative;
+  top: 20px;
+}
+
+.title {
+  position: absolute;
+}
+
+.auxTitle {
+  position: absolute;
+}
+
+#minimap {
+  position: absolute;
+  right: 20px;
+  bottom: 20px;
+}
+</style>
+<div class="titleContainer">
+  <div id="title" class="title">Main Graph</div>
+  <div id="auxTitle" class="auxTitle">Auxiliary Nodes</div>
+</div>
+<svg id="svg">
+  <defs>
+
+    <!-- Arrow heads for edge paths of different predefined sizes. -->
+    <path id="ref-arrowhead-path" d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"/>
+    <marker class="ref-arrowhead" id="ref-arrowhead-small" viewBox="0 0 10 10" markerWidth="10" markerHeight="10"
+      refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
+      <use xlink:href="#ref-arrowhead-path" />
+    </marker>
+    <marker class="ref-arrowhead" id="ref-arrowhead-medium" viewBox="0 0 10 10" markerWidth="13" markerHeight="13"
+        refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
+      <use xlink:href="#ref-arrowhead-path" />
+    </marker>
+    <marker class="ref-arrowhead" id="ref-arrowhead-large" viewBox="0 0 10 10" markerWidth="16" markerHeight="16"
+        refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
+      <use xlink:href="#ref-arrowhead-path" />
+    </marker>
+    <marker class="ref-arrowhead" id="ref-arrowhead-xlarge" viewBox="0 0 10 10" markerWidth="20" markerHeight="20"
+        refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
+      <use xlink:href="#ref-arrowhead-path" />
+    </marker>
+
+    <!-- Arrow head for annotation edge paths. -->
+    <marker id="annotation-arrowhead" markerWidth="5" markerHeight="5"
+      refX="5" refY="2.5" orient="auto">
+      <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"/>
+    </marker>
+    <marker id="annotation-arrowhead-faded" markerWidth="5" markerHeight="5"
+      refX="5" refY="2.5" orient="auto">
+      <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"/>
+    </marker>
+    <marker id="ref-annotation-arrowhead" markerWidth="5" markerHeight="5"
+      refX="0" refY="2.5" orient="auto">
+      <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"/>
+    </marker>
+    <marker id="ref-annotation-arrowhead-faded" markerWidth="5" markerHeight="5"
+      refX="0" refY="2.5" orient="auto">
+      <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"/>
+    </marker>
+    <!-- Template for an Op node ellipse. -->
+    <ellipse id="op-node-stamp"
+        rx="7.5" ry="3" stroke="inherit" fill="inherit" />
+    <!-- Template for an Op node annotation ellipse (smaller). -->
+    <ellipse id="op-node-annotation-stamp"
+        rx="5" ry="2" stroke="inherit" fill="inherit" />
+    <!-- Vertically stacked series of Op nodes when unexpanded. -->
+    <g id="op-series-vertical-stamp">
+      <use xlink:href="#op-node-stamp" x="8" y="9" />
+      <use xlink:href="#op-node-stamp" x="8" y="6" />
+      <use xlink:href="#op-node-stamp" x="8" y="3" />
+    </g>
+    <!-- Horizontally stacked series of Op nodes when unexpanded. -->
+    <g id="op-series-horizontal-stamp">
+      <use xlink:href="#op-node-stamp" x="16" y="4" />
+      <use xlink:href="#op-node-stamp" x="12" y="4" />
+      <use xlink:href="#op-node-stamp" x="8" y="4" />
+    </g>
+    <!-- Horizontally stacked series of Op nodes for annotation. -->
+    <g id="op-series-annotation-stamp">
+      <use xlink:href="#op-node-annotation-stamp" x="9" y="2" />
+      <use xlink:href="#op-node-annotation-stamp" x="7" y="2" />
+      <use xlink:href="#op-node-annotation-stamp" x="5" y="2" />
+    </g>
+    <svg id="summary-icon" fill="#848484" height="12" viewBox="0 0 24 24" width="12">
+      <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z" />
+    </svg>
+    <!--
+      Where the linearGradient for each node is stored. Used when coloring
+      by proportions of devices.
+    -->
+    <g id="linearGradients"></g>
+
+    <!-- Hatch patterns for faded out nodes. -->
+    <pattern id="rectHatch" patternTransform="rotate(45 0 0)" width="5" height="5" patternUnits="userSpaceOnUse">
+      <line x1="0" y1="0" x2="0" y2="5" style="stroke-width: 1"/>
+    </pattern>
+    <pattern id="ellipseHatch" patternTransform="rotate(45 0 0)" width="2" height="2" patternUnits="userSpaceOnUse">
+      <line x1="0" y1="0" x2="0" y2="2" style="stroke-width: 1"/>
+    </pattern>
+
+    <!-- A shadow for health pills. -->
+    <filter id="health-pill-shadow" x="-40%" y="-40%" width="180%" height="180%">
+      <feGaussianBlur in="SourceAlpha" stdDeviation="0.8"/>
+      <feOffset dx="0" dy="0" result="offsetblur"/>
+      <feFlood flood-color="#000000"/>
+      <feComposite in2="offsetblur" operator="in"/>
+      <feMerge>
+        <feMergeNode/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+  </defs>
+  <!-- Make a large rectangle that fills the svg space so that
+  zoom events get captured on safari -->
+  <rect fill="white" width="10000" height="10000"></rect>
+  <g id="root"></g>
+</svg>
+<tf-graph-minimap id="minimap"></tf-graph-minimap>
+</template>
+<script>
+Polymer({
+  is: 'tf-graph-scene',
+  properties: {
+    renderHierarchy: Object,
+    name: String,
+    colorBy: String,
+
+    // For each render hierarchy, we only fit it to the viewport once (when the scene is attached to
+    // the DOM). We do not fit the hierarchy again (unless the user clicks the reset button). For
+    // instance, if the user enters a certain view in the graph, switches to another dashboard, and
+    // returns to the graph dashboard, the user expects the previous view. These properties enable
+    // that behavior.
+
+    /** Whether the scene has fit the current render hierarchy (to the viewport) at least once. */
+    _hasRenderHierarchyBeenFitOnce: Boolean,
+    /** Whether this scene element is currently attached to a parent element. */
+    _isAttached: Boolean,
+
+    /** @type {d3_zoom} d3 zoom object */
+    _zoom: Object,
+    highlightedNode: {
+      type: String,
+      observer: '_highlightedNodeChanged'
+    },
+    selectedNode: {
+      type: String,
+      observer: '_selectedNodeChanged'
+    },
+    /** Keeps track of if the graph has been zoomed/panned since loading */
+    _zoomed: {
+      type: Boolean,
+      observer: '_onZoomChanged',
+      value: false
+    },
+    /** Keeps track of the starting coordinates of a graph zoom/pan */
+    _zoomStartCoords: {
+      type: Array,
+      value: null
+    },
+    /** Keeps track of the current coordinates of a graph zoom/pan */
+    _zoomCoords: {
+      type: Array,
+      value: null
+    },
+    /** Maximum distance of a zoom event for it to be interpreted as a click */
+    _maxZoomDistanceForClick: {
+      type: Number,
+      value: 20
+    },
+    /**
+     * @type {d3.scale.ordinal}
+     * Scale mapping from template name to a number between 0 and N-1
+     * where N is the number of different template names. Used by
+     * tf.graph.scene.node when computing node color by structure.
+     */
+    templateIndex: Function,
+    /**
+     * @type {tf.scene.Minimap}
+     * A minimap object to notify for zoom events.
+     */
+    minimap: Object,
+    /*
+     * Dictionary for easily stylizing nodes when state changes.
+     * _nodeGroupIndex[nodeName] = d3_selection of the nodeGroup
+     */
+    _nodeGroupIndex: {
+      type: Object,
+      value: function() { return {}; }
+    },
+    /*
+     * Dictionary for easily stylizing annotation nodes when state changes.
+     * _annotationGroupIndex[nodeName][hostNodeName] =
+     *   d3_selection of the annotationGroup
+     */
+    _annotationGroupIndex: {
+      type: Object,
+      value: function() { return {}; }
+    },
+    /*
+     * Dictionary for easily stylizing edges when state changes.
+     * _edgeGroupIndex[edgeName] = d3_selection of the edgeGroup
+     */
+    _edgeGroupIndex: {
+      type: Object,
+      value: function() { return {}; }
+    },
+    /**
+     * Max font size for metanode label strings.
+     */
+    maxMetanodeLabelLengthFontSize: {
+      type: Number,
+      value: 9
+    },
+    /**
+     * Min font size for metanode label strings.
+     */
+    minMetanodeLabelLengthFontSize: {
+      type: Number,
+      value: 6
+    },
+    /**
+     * Metanode label strings longer than this are given smaller fonts.
+     */
+    maxMetanodeLabelLengthLargeFont: {
+      type: Number,
+      value: 11
+    },
+    /**
+     * Metanode label strings longer than this are truncated with ellipses.
+     */
+    maxMetanodeLabelLength: {
+      type: Number,
+      value: 18
+    },
+    progress: Object,
+    // A mapping between node name to the tf.graph.scene.HealthPill to render.
+    nodeNamesToHealthPills: Object,
+    // The step of health pills to show throughout the graph.
+    healthPillStepIndex: Number,
+  },
+  observers: [
+    '_colorByChanged(colorBy)',
+    '_renderHierarchyChanged(renderHierarchy)',
+    // Animation and fitting must come after the observer for the hierarchy changing because we must
+    // first build the render hierarchy.
+    '_animateAndFit(_isAttached, renderHierarchy)',
+    '_updateHealthPills(nodeNamesToHealthPills, healthPillStepIndex)',
+  ],
+  getNode: function(nodeName) {
+    return this.renderHierarchy.getRenderNodeByName(nodeName);
+  },
+  isNodeExpanded: function(node) {
+    return node.expanded;
+  },
+  setNodeExpanded: function(renderNode) {
+    this._build(this.renderHierarchy);
+    this._updateLabels(!this._zoomed);
+  },
+  /**
+   * Resets the state of the component. Called whenever the whole graph
+   * (dataset) changes.
+   */
+  _resetState: function() {
+    // Reset the state of the component.
+    this._nodeGroupIndex = {};
+    this._annotationGroupIndex = {};
+    this._edgeGroupIndex = {};
+    this._updateLabels(false);
+    // Remove all svg elements under the 'root' svg group.
+    d3.select(this.$.svg).select('#root').selectAll('*').remove();
+    // And the defs.
+    d3.select(this.$.svg).select('defs #linearGradients')
+        .selectAll('*').remove();
+  },
+  /** Main method for building the scene */
+  _build: function(renderHierarchy) {
+    this.templateIndex = renderHierarchy.hierarchy.getTemplateIndex();
+    tf.graph.util.time('tf-graph-scene (layout):', function() {
+      // layout the scene for this meta / series node
+      tf.graph.layout.layoutScene(renderHierarchy.root, this);
+    }.bind(this));
+
+    tf.graph.util.time('tf-graph-scene (build scene):', function() {
+      tf.graph.scene.buildGroup(d3.select(this.$.root), renderHierarchy.root, this);
+      tf.graph.scene.addGraphClickListener(this.$.svg, this);
+      tf.graph.scene.node.traceInputs(renderHierarchy);
+    }.bind(this));
+    // Update the minimap again when the graph is done animating.
+    setTimeout(function() {
+      this._updateHealthPills(this.nodeNamesToHealthPills, this.healthPillStepIndex);
+      this.minimap.update();
+    }.bind(this), tf.graph.layout.PARAMS.animation.duration);
+  },
+  ready: function() {
+    this._zoom = d3.zoom()
+      .on('end', function() {
+        if (this._zoomStartCoords) {
+          // Calculate the total distance dragged during the zoom event.
+          // If it is sufficiently small, then fire an event indicating
+          // that zooming has ended. Otherwise wait to fire the zoom end
+          // event, so that a mouse click registered as part of this zooming
+          // is ignored (as this mouse click was part of a zooming, and should
+          // not be used to indicate an actual click on the graph).
+          var dragDistance = Math.sqrt(
+            Math.pow(this._zoomStartCoords[0] - this._zoomCoords[0], 2) +
+            Math.pow(this._zoomStartCoords[1] - this._zoomCoords[1], 2));
+          if (dragDistance < this._maxZoomDistanceForClick) {
+            this._fireEnableClick();
+          } else {
+            setTimeout(this._fireEnableClick.bind(this), 50);
+          }
+        }
+        this._zoomStartCoords = null;
+      }.bind(this))
+      .on('zoom', function() {
+        // Store the coordinates of the zoom event
+        this._zoomCoords = [d3.event.transform.x, d3.event.transform.y];
+
+        // If this is the first zoom event after a zoom-end, then
+        // store the coordinates as the start coordinates as well,
+        // and fire an event to indicate that zooming has started.
+        // This doesn't use the zoomstart event, as d3 sends this
+        // event on mouse-down, even if there has been no dragging
+        // done to translate the graph around.
+        if (!this._zoomStartCoords) {
+          this._zoomStartCoords = this._zoomCoords;
+          this.fire('disable-click');
+        }
+        this._zoomed = true;
+        d3.select(this.$.root).attr('transform', d3.event.transform);
+        // Notify the minimap.
+        this.minimap.zoom(d3.event.transform);
+      }.bind(this));
+    d3.select(this.$.svg).call(this._zoom)
+      .on('dblclick.zoom', null);
+    d3.select(window).on('resize', function() {
+      // Notify the minimap that the user's window was resized.
+      // The minimap will figure out the new dimensions of the main svg
+      // and will use the existing translate and scale params.
+      this.minimap.zoom();
+    }.bind(this));
+    // Initialize the minimap.
+    this.minimap = this.$.minimap.init(this.$.svg, this.$.root, this._zoom,
+        tf.graph.layout.PARAMS.minimap.size,
+        tf.graph.layout.PARAMS.subscene.meta.labelHeight);
+  },
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
+  _renderHierarchyChanged: function(renderHierarchy) {
+    this._hasRenderHierarchyBeenFitOnce = false;
+    this._resetState();
+    this._build(renderHierarchy);
+  },
+  _animateAndFit: function(isAttached, renderHierarchy) {
+    if (this._hasRenderHierarchyBeenFitOnce || !isAttached) {
+      // Do not animate and fit if the scene has already fitted this render hierarchy once. Or if
+      // the graph dashboard is not attached (in which case the scene lacks DOM info for fitting).
+      return;
+    }
+
+    // Fit to screen after the graph is done animating.
+    setTimeout(this.fit.bind(this), tf.graph.layout.PARAMS.animation.duration);
+  },
+  _updateLabels: function(showLabels) {
+    var mainGraphTitleElement = this.getElementsByClassName('title')[0];
+    var titleStyle = mainGraphTitleElement.style;
+    var auxTitleStyle = this.getElementsByClassName('auxTitle')[0].style;
+    var core = d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
+      tf.graph.scene.Class.Scene.CORE).node();
+    // Only show labels if the graph is fully loaded.
+    if (showLabels && core && this.progress && this.progress.value === 100) {
+      var aux =
+        d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
+          tf.graph.scene.Class.Scene.INEXTRACT).node() ||
+        d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
+          tf.graph.scene.Class.Scene.OUTEXTRACT).node();
+      var coreX = core.getCTM().e;
+      var auxX = aux ? aux.getCTM().e : null;
+      titleStyle.display = 'inline';
+      titleStyle.left = coreX + 'px';
+      if (auxX !== null && auxX !== coreX) {
+        auxTitleStyle.display = 'inline';
+
+        // Make sure that the aux title is positioned rightwards enough so as to
+        // prevent overlap with the main graph title.
+        auxX = Math.max(
+            coreX + mainGraphTitleElement.getBoundingClientRect().width, auxX);
+
+        auxTitleStyle.left = auxX + 'px';
+      } else {
+        auxTitleStyle.display = 'none';
+      }
+    } else {
+      titleStyle.display='none';
+      auxTitleStyle.display = 'none';
+    }
+  },
+  /**
+    * Called whenever the user changed the 'color by' option in the
+    * UI controls.
+    */
+  _colorByChanged: function() {
+    if (this.renderHierarchy != null) {
+      // We iterate through each svg node and update its state.
+      _.each(this._nodeGroupIndex, function(nodeGroup, nodeName) {
+        this._updateNodeState(nodeName);
+      }, this);
+      // Notify also the minimap.
+      this.minimap.update();
+    }
+  },
+  fit: function() {
+    this._hasRenderHierarchyBeenFitOnce = true;
+    tf.graph.scene.fit(this.$.svg, this.$.root, this._zoom, function() {
+      this._zoomed = false;
+    }.bind(this));
+  },
+  isNodeSelected: function(n) {
+    return n === this.selectedNode;
+  },
+  isNodeHighlighted: function(n) {
+    return n === this.highlightedNode;
+  },
+  addAnnotationGroup: function(a, d, selection) {
+    var an = a.node.name;
+    this._annotationGroupIndex[an] = this._annotationGroupIndex[an] || {};
+    this._annotationGroupIndex[an][d.node.name] = selection;
+  },
+  getAnnotationGroupsIndex: function(a) {
+    return this._annotationGroupIndex[a];
+  },
+  removeAnnotationGroup: function(a, d) {
+    delete this._annotationGroupIndex[a.node.name][d.node.name];
+  },
+  addNodeGroup: function(n, selection) {
+    this._nodeGroupIndex[n] = selection;
+  },
+  getNodeGroup: function(n) {
+    return this._nodeGroupIndex[n];
+  },
+  removeNodeGroup: function(n) {
+    delete this._nodeGroupIndex[n];
+  },
+  addEdgeGroup: function(n, selection) {
+    this._edgeGroupIndex[e] = selection;
+  },
+  getEdgeGroup: function(e) {
+    return this._edgeGroupIndex[e];
+  },
+  _updateHealthPills: function(nodeNamesToHealthPills, healthPillStepIndex) {
+    tf.graph.scene.addHealthPills(
+        this.$.svg, nodeNamesToHealthPills, healthPillStepIndex);
+  },
+  /**
+   * Update node and annotation node of the given name.
+   * @param  {String} n node name
+   */
+  _updateNodeState: function(n) {
+    var node = this.getNode(n);
+    var nodeGroup = this.getNodeGroup(n);
+
+    if (nodeGroup) {
+      tf.graph.scene.node.stylize(nodeGroup, node, this);
+    }
+
+    var annotationGroupIndex = this.getAnnotationGroupsIndex(n);
+    _.each(annotationGroupIndex, function(aGroup, hostName) {
+      tf.graph.scene.node.stylize(aGroup, node, this,
+          tf.graph.scene.Class.Annotation.NODE);
+    }, this);
+  },
+
+  /**
+   * Handles new node selection. 1) Updates the selected-state of each node,
+   * 2) triggers input tracing.
+   * @param selectedNode {string} The name of the newly selected node.
+   * @param oldSelectedNode {string} The name of the previously selected node.
+   * @private
+   */
+  _selectedNodeChanged: function(selectedNode, oldSelectedNode) {
+    if (selectedNode === oldSelectedNode) {
+      return;
+    }
+
+    if (selectedNode) {
+      this._updateNodeState(selectedNode);
+    }
+    if (oldSelectedNode) {
+      this._updateNodeState(oldSelectedNode);
+    }
+
+    tf.graph.scene.node.traceInputs(this.renderHierarchy);
+
+    if (!selectedNode) {
+      return;
+    }
+
+
+    // Update the minimap to reflect the highlighted (selected) node.
+    this.minimap.update();
+    var node = this.renderHierarchy.hierarchy.node(selectedNode);
+    var nodeParents = [];
+    // Create list of all metanode parents of the selected node.
+    while (node.parentNode != null
+        && node.parentNode.name != tf.graph.ROOT_NAME) {
+      node = node.parentNode;
+      nodeParents.push(node.name);
+    }
+    // Ensure each parent metanode is built and expanded.
+    var topParentNodeToBeExpanded;
+    _.forEachRight(nodeParents, function(parentName) {
+      this.renderHierarchy.buildSubhierarchy(parentName);
+      var renderNode = this.renderHierarchy.getRenderNodeByName(parentName);
+      if (renderNode.node.isGroupNode && !renderNode.expanded) {
+        renderNode.expanded = true;
+        if (!topParentNodeToBeExpanded) {
+          topParentNodeToBeExpanded = renderNode;
+        }
+      }
+    }, this);
+    // If any expansion was needed to display this selected node, then
+    // inform the scene of the top-most expansion.
+    if (topParentNodeToBeExpanded) {
+      this.setNodeExpanded(topParentNodeToBeExpanded);
+      this._zoomed = true;
+    }
+
+    if (tf.graph.scene.panToNode(selectedNode, this.$.svg, this.$.root,
+        this._zoom)) {
+      this._zoomed = true;
+    }
+  },
+  _highlightedNodeChanged: function(highlightedNode, oldHighlightedNode) {
+    if (highlightedNode === oldHighlightedNode) {
+      return;
+    }
+
+    if (highlightedNode) {
+      this._updateNodeState(highlightedNode);
+    }
+    if (oldHighlightedNode) {
+      this._updateNodeState(oldHighlightedNode);
+    }
+  },
+  _onZoomChanged: function() {
+    this._updateLabels(!this._zoomed);
+  },
+  _fireEnableClick: function() {
+    this.fire('enable-click');
+  },
+});
+</script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph.html b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph.html
new file mode 100644
index 0000000000..efbf065a40
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph.html
@@ -0,0 +1,316 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
+<link rel="import" href="../iron-icons/iron-icons.html">
+<link rel="import" href="../paper-button/paper-button.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="tf-graph-scene.html">
+
+<dom-module id="tf-graph">
+<template>
+<style>
+.container {
+  width: 100%;
+  height: 100%;
+  background: white;
+  box-shadow: 0 1px 5px rgba(0,0,0,0.2);
+}
+
+.vertical {
+  width:100%;
+  height:100%;
+  @apply(--layout-vertical);
+}
+
+.auto {
+  @apply(--layout-flex-auto);
+  @apply(--layout-vertical);
+}
+
+h2 {
+  text-align: center;
+}
+
+paper-button {
+  text-transform: none;
+}
+</style>
+<div class="container">
+  <div class="vertical">
+    <template is="dom-if" if="[[title]]">
+      <h2>[[title]]</h2>
+    </template>
+    <tf-graph-scene id="scene" class="auto"
+          render-hierarchy="[[renderHierarchy]]"
+          highlighted-node="[[_getVisible(highlightedNode)]]"
+          selected-node="{{selectedNode}}"
+          color-by="[[colorBy]]"
+          progress="[[progress]]"
+          node-names-to-health-pills="[[nodeNamesToHealthPills]]"
+          health-pill-step-index="{{healthPillStepIndex}}"
+    ></tf-graph-scene>
+  </div>
+</div>
+</template>
+</dom-module>
+
+<script>
+Polymer({
+
+  is: 'tf-graph',
+
+  properties: {
+    graphHierarchy: {
+      type: Object,
+      notify: true,
+      observer: '_graphChanged'
+    },
+    basicGraph: Object,
+    stats: Object,
+    devicesForStats: Object,
+    hierarchyParams: Object,
+    progress: {
+      type: Object,
+      notify: true,
+    },
+    title: String,
+    selectedNode: {
+      type: String,
+      notify: true,
+    },
+    highlightedNode: {
+      type: String,
+      notify: true
+    },
+    /** What to color the nodes by (compute time, memory, device etc.) */
+    colorBy: String,
+    colorByParams: {
+      type: Object,
+      notify: true,
+      readOnly: true, // Produces and doesn't consume.
+    },
+    renderHierarchy: {
+      type: Object,
+      readOnly: true,
+      notify: true,
+    },
+    _renderDepth: {
+      type: Number,
+      value: 1
+    },
+    _allowGraphSelect: {
+      type: Boolean,
+      value: true
+    },
+    // A mapping between node name to the tf.graph.scene.HealthPill to render.
+    nodeNamesToHealthPills: Object,
+    // The step of health pills to show throughout the graph.
+    healthPillStepIndex: Number,
+  },
+  observers: [
+    '_statsChanged(stats, devicesForStats)',
+    '_buildRenderHierarchy(graphHierarchy)'
+  ],
+  _statsChanged: function(stats, devicesForStats) {
+    if (this.graphHierarchy) {
+      if (stats && devicesForStats) {
+        tf.graph.joinStatsInfoWithGraph(this.basicGraph, stats, devicesForStats);
+        tf.graph.hierarchy.joinAndAggregateStats(this.graphHierarchy, stats);
+      }
+      // Recompute the rendering information.
+      this._buildRenderHierarchy(this.graphHierarchy);
+    }
+  },
+  _buildRenderHierarchy: function(graphHierarchy) {
+    tf.graph.util.time('new tf.graph.render.Hierarchy', function() {
+      if (graphHierarchy.root.type !== tf.graph.NodeType.META) {
+        // root must be metanode but sometimes Polymer's dom-if has not
+        // remove tf-graph element yet in <tf-node-info>
+        // and thus mistakenly pass non-metanode to this module.
+        return;
+      }
+      var renderGraph = new tf.graph.render.RenderGraphInfo(
+          graphHierarchy, !!this.stats /** displayingStats */);
+      // Producing the 'color by' parameters to be consumed
+      // by the tf-graph-controls panel. It contains information about the
+      // min and max values and their respective colors, as well as list
+      // of devices with their respective colors.
+
+      function getColorParamsFromScale(scale) {
+        return {
+          minValue: scale.domain()[0],
+          maxValue: scale.domain()[1],
+          startColor: scale.range()[0],
+          endColor: scale.range()[1]
+        };
+      }
+
+      this._setColorByParams({
+        compute_time: getColorParamsFromScale(renderGraph.computeTimeScale),
+        memory: getColorParamsFromScale(renderGraph.memoryUsageScale),
+        device: _.map(renderGraph.deviceColorMap.domain(),
+            function(deviceName) {
+          return {
+            device: deviceName,
+            color: renderGraph.deviceColorMap(deviceName)
+          };
+        }),
+        xla_cluster: _.map(renderGraph.xlaClusterColorMap.domain(),
+            function(xlaClusterName) {
+          return {
+            xla_cluster: xlaClusterName,
+            color: renderGraph.xlaClusterColorMap(xlaClusterName)
+          };
+        }),
+      });
+      this._setRenderHierarchy(renderGraph);
+      this.async(function() {
+        this.fire("rendered");
+      });
+    }.bind(this));
+  },
+  _getVisible: function(name) {
+    if (!name) {
+      return name;
+    }
+    return this.renderHierarchy.getNearestVisibleAncestor(name);
+  },
+  listeners: {
+    'graph-select': '_graphSelected',
+    'disable-click': '_disableClick',
+    'enable-click': '_enableClick',
+    // Nodes
+    'node-toggle-expand': '_nodeToggleExpand',
+    'node-select': '_nodeSelected',
+    'node-highlight': '_nodeHighlighted',
+    'node-unhighlight': '_nodeUnhighlighted',
+    'node-toggle-extract': '_nodeToggleExtract',
+    'node-toggle-seriesgroup': '_nodeToggleSeriesGroup',
+
+    // Annotations
+
+    /* Note: currently highlighting/selecting annotation node has the same
+      * behavior as highlighting/selecting actual node so we point to the same
+      * set of event listeners.  However, we might redesign this to be a bit
+      * different.
+      */
+    'annotation-select': '_nodeSelected',
+    'annotation-highlight': '_nodeHighlighted',
+    'annotation-unhighlight': '_nodeUnhighlighted',
+  },
+  _graphChanged: function() {
+    // When a new graph is loaded, fire this event so that there is no
+    // info-card being displayed for the previously-loaded graph.
+    this.fire('graph-select');
+  },
+  _graphSelected: function(event) {
+    // Graph selection is not allowed during an active zoom event, as the
+    // click seen during a zoom/pan is part of the zooming and does not
+    // indicate a user desire to click on a specific section of the graph.
+    if (this._allowGraphSelect) {
+      this.set('selectedNode', null);
+    }
+    // Reset this variable as a bug in d3 zoom behavior can cause zoomend
+    // callback not to be called if a right-click happens during a zoom event.
+    this._allowGraphSelect = true;
+  },
+  _disableClick: function(event) {
+    this._allowGraphSelect = false;
+  },
+  _enableClick: function(event) {
+    this._allowGraphSelect = true;
+  },
+  _nodeSelected: function(event) {
+    if (this._allowGraphSelect) {
+      this.set('selectedNode', event.detail.name);
+    }
+    // Reset this variable as a bug in d3 zoom behavior can cause zoomend
+    // callback not to be called if a right-click happens during a zoom event.
+    this._allowGraphSelect = true;
+  },
+  _nodeHighlighted: function(event) {
+    this.set('highlightedNode', event.detail.name);
+  },
+  _nodeUnhighlighted: function(event) {
+    this.set('highlightedNode', null);
+  },
+  _nodeToggleExpand: function(event) {
+    // Immediately select the node that is about to be expanded.
+    this._nodeSelected(event);
+
+    // Compute the sub-hierarchy scene.
+    var nodeName = event.detail.name;
+    var renderNode = this.renderHierarchy.getRenderNodeByName(nodeName);
+    // Op nodes are not expandable.
+    if (renderNode.node.type === tf.graph.NodeType.OP) {
+      return;
+    }
+    this.renderHierarchy.buildSubhierarchy(nodeName);
+    renderNode.expanded = !renderNode.expanded;
+
+    // Expand the node with some delay so that the user can immediately see
+    // the visual effect of selecting that node, before the expansion is
+    // done.
+    this.async(function() {
+      this.querySelector('#scene').setNodeExpanded(renderNode);
+    }, 75);
+  },
+  _nodeToggleExtract: function(event) {
+    // Toggle the include setting of the specified node appropriately.
+    var nodeName = event.detail.name;
+    var renderNode = this.renderHierarchy.getRenderNodeByName(nodeName);
+    if (renderNode.node.include == tf.graph.InclusionType.INCLUDE) {
+      renderNode.node.include = tf.graph.InclusionType.EXCLUDE;
+    } else if (renderNode.node.include == tf.graph.InclusionType.EXCLUDE) {
+      renderNode.node.include = tf.graph.InclusionType.INCLUDE;
+    } else {
+      renderNode.node.include =
+       this.renderHierarchy.isNodeAuxiliary(renderNode)
+          ? tf.graph.InclusionType.INCLUDE : tf.graph.InclusionType.EXCLUDE;
+    }
+
+    // Rebuild the render hierarchy.
+    this._buildRenderHierarchy(this.graphHierarchy);
+  },
+  _nodeToggleSeriesGroup: function(event) {
+    // Toggle the group setting of the specified node appropriately.
+    var nodeName = event.detail.name;
+    tf.graph.toggleNodeSeriesGroup(this.hierarchyParams.seriesMap, nodeName);
+
+    // Rebuild the render hierarchy with the updated series grouping map.
+    this.set('progress', {
+      value: 0,
+      msg: ''
+    });
+    var tracker = tf.graph.util.getTracker(this);
+    var hierarchyTracker = tf.graph.util.getSubtaskTracker(tracker, 100,
+          'Namespace hierarchy');
+    tf.graph.hierarchy.build(this.basicGraph, this.hierarchyParams, hierarchyTracker)
+    .then(function(graphHierarchy) {
+      this.set('graphHierarchy', graphHierarchy);
+      this._buildRenderHierarchy(this.graphHierarchy);
+    }.bind(this));
+  },
+  not: function(x) {
+    return !x;
+  }
+});
+</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD
new file mode 100644
index 0000000000..0cee324f48
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD
@@ -0,0 +1,30 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_dashboard_d3v4",
+    srcs = [
+        "tf-graph-dashboard.html",
+    ],
+    path = "/tf-graph-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_backend_d3v4",
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_board_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_controls_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/BUILD
new file mode 100644
index 0000000000..74238d78e2
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_dashboard/demo
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-dashboard/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/graph_run_run1.pbtxt b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/graph_run_run1.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/graph_run_run1.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/runs.json b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/runs.json
new file mode 100644
index 0000000000..0429aa71f8
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/data/runs.json
@@ -0,0 +1,6 @@
+{
+  "run1": {
+    "graph": true,
+    "scalars": ["foo/sin"]
+  }
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/index.html
new file mode 100644
index 0000000000..67756cc129
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo/index.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<link rel="import" href="../tf-graph-dashboard.html">
+<link rel="import" href="../../paper-styles/typography.html">
+
+<title>Graph Dashboard Demo</title>
+<style>
+  #demo-container {
+    display: block;
+    height: 900px;
+    position: relative;
+    width: 100%;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="graph-dashboard-demo">
+      <template>
+        <tf-graph-dashboard backend="[[backend]]"></tf-graph-dashboard>
+      </template>
+      <script>
+        Polymer({
+          is: "graph-dashboard-demo",
+          properties: {
+            backend: {
+              type: Object,
+              value: function() {
+                var router = new TF.Backend.router("data", true);
+                return new TF.Backend.Backend(router);
+              },
+            },
+          },
+        });
+      </script>
+    </dom-module>
+    <graph-dashboard-demo id="demo-container"></graph-dashboard-demo>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html
new file mode 100644
index 0000000000..bfc52a0a44
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html
@@ -0,0 +1,304 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../tf-graph-board/tf-graph-board.html">
+<link rel="import" href="../tf-graph-controls/tf-graph-controls.html">
+<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
+<link rel="import" href="../tf-backend/tf-backend.html">
+
+<!--
+tf-graph-dashboard displays a graph from a TensorFlow run.
+
+It has simple behavior: Creates a url-generator and run-generator
+to talk to the backend, and then passes the runsWithGraph (list of runs with
+associated graphs) along with the url generator into tf-graph-board for display.
+
+If there are multiple runs with graphs, the first run's graph is shown
+by default. The user can select a different run from a dropdown menu.
+-->
+<dom-module id="tf-graph-dashboard">
+<template>
+<tf-no-data-warning
+  data-type="graph"
+  show-warning="[[_datasetsEmpty(_datasets)]]"
+></tf-no-data-warning>
+<template is="dom-if" if="[[!_datasetsEmpty(_datasets)]]">
+<tf-dashboard-layout>
+<div class="sidebar">
+  <tf-graph-controls id="controls"
+        devices-for-stats="{{_devicesForStats}}"
+        color-by-params="[[_colorByParams]]"
+        stats="[[_stats]]"
+        color-by="{{_colorBy}}"
+        datasets="[[_datasets]]"
+        render-hierarchy="[[_renderHierarchy]]"
+        selected-dataset="{{_selectedDataset}}"
+        selected-file="{{_selectedFile}}"
+        selected-metadata-tag="{{_selectedMetadataTag}}"
+        health-pills-feature-enabled="[[debuggerDataEnabled]]"
+        health-pills-toggled-on="{{healthPillsToggledOn}}"
+  ></tf-graph-controls>
+  <tf-graph-loader id="loader"
+        datasets="[[_datasets]]"
+        selected-dataset="[[_selectedDataset]]"
+        selected-metadata-tag="[[_selectedMetadataTag]]"
+        selected-file="[[_selectedFile]]"
+        out-graph-hierarchy="{{_graphHierarchy}}"
+        out-graph="{{_graph}}"
+        out-stats="{{_stats}}"
+        progress="{{_progress}}"
+out-hierarchy-params="{{_hierarchyParams}}"
+  ></tf-graph-loader>
+</div>
+<div class="center">
+    <tf-graph-board id="graphboard"
+        devices-for-stats="[[_devicesForStats]]"
+        color-by="[[_colorBy]]"
+        color-by-params="{{_colorByParams}}"
+        graph-hierarchy="[[_graphHierarchy]]"
+        graph="[[_graph]]"
+        hierarchy-params="[[_hierarchyParams]]"
+        progress="[[_progress]]"
+        debugger-data-enabled="[[debuggerDataEnabled]]"
+        are-health-pills-loading="[[_areHealthPillsLoading]]"
+        node-names-to-health-pills="[[_nodeNamesToHealthPills]]"
+        all-steps-mode-enabled="{{allStepsModeEnabled}}"
+        specific-health-pill-step="{{specificHealthPillStep}}"
+        health-pill-step-index="[[_healthPillStepIndex]]"
+        render-hierarchy="{{_renderHierarchy}}"
+        stats="[[_stats]]"
+    ></tf-graph-board>
+</div>
+</tf-dashboard-layout>
+</template>
+<style>
+
+:host /deep/ {
+  font-family: 'Roboto', sans-serif;
+}
+
+.center {
+  position: relative;
+  height: 100%;
+}
+
+</style>
+</template>
+</dom-module>
+
+<script>
+"use strict";
+
+(function() {
+TF.Dashboard.TfGraphDashboard = Polymer({
+  is: 'tf-graph-dashboard',
+  factoryImpl: function(backend, debuggerDataEnabled) {
+    this.backend = backend;
+    this.debuggerDataEnabled = debuggerDataEnabled;
+  },
+  behaviors: [
+    TF.Dashboard.DashboardBehavior("graphs"),
+    TF.Dashboard.ReloadBehavior("tf-graph-dashboard"),
+    TF.Backend.Behavior,
+  ],
+  properties: {
+    _datasets: Object,
+    _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
+    backend: Object,
+    debuggerDataEnabled: Boolean,
+    allStepsModeEnabled: Boolean,
+    specificHealthPillStep: {type: Number, value: 0},
+    healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
+    _isAttached: Boolean,
+    // Whether this dashboard is initialized. This dashboard should only be initialized once.
+    _initialized: Boolean,
+    // Whether health pills are currently being loaded, in which case we may want to say show a
+    // spinner.
+    _areHealthPillsLoading: Boolean,
+    // Maps the names of nodes to an array of health pills (HealthPillDatums).
+    _nodeNamesToHealthPills: {
+      type: Object,
+      value: {},
+    },
+    _healthPillStepIndex: Number,
+    // A strictly increasing ID. Each request for health pills has a unique ID. This helps us
+    // identify stale requests.
+    _healthPillRequestId: {type: Number, value: 1},
+    // The setTimeout ID for the pending request for health pills at a specific step.
+    _healthPillStepRequestTimerId: Number,
+    // The request for health pills at a specific step (as opposed to all sampled health pills) may
+    // involve slow disk reads. Hence, we throttle to 1 of those requests every this many ms.
+    _healthPillStepRequestTimerDelay: {
+      type: Number,
+      value: 500,
+      readOnly: true,
+    },
+    runs: Array,
+  },
+  listeners: {
+    'node-toggle-expand': '_handleNodeToggleExpand',
+  },
+  observers: [
+    '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+    '_maybeInitializeDashboard(backend, _isAttached)',
+  ],
+  attached: function() {
+    this.set('_isAttached', true);
+  },
+  detached: function() {
+    this.set('_isAttached', false);
+  },
+  reload: function() {
+    if (!this.debuggerDataEnabled ||
+        !this.healthPillsToggledOn ||
+        !this._renderHierarchy ||
+        this._datasetsEmpty(this._datasets)) {
+      // Do not load debugger data if the feature is disabled, if the user toggled off the feature,
+      // or if the graph itself has not loaded yet. We need the graph to load so that we know which
+      // nodes to request health pills for.
+      return;
+    }
+
+    // Request debugger data on graph reloads, but do not re-request the graph itself. The graph
+    // would not change across reloads.
+    this._requestHealthPills();
+  },
+  _maybeInitializeDashboard: function(backend, isAttached) {
+    if (this._initialized || !backend || !isAttached) {
+      // Either this dashboard is already initialized ... or we are not yet ready to initialize.
+      return;
+    }
+    if (typeof ga !== 'undefined' && ga != null) {
+      ga('send', {hitType: 'pageview', page: '/v/graph'});
+    }
+    // Set this to true so we only initialize once.
+    this._initialized = true;
+    Promise.all([backend.graphRuns(), backend.runMetadataRuns()])
+      .then(function(result) {
+        var runsWithGraph = result[0].sort(VZ.Sorting.compareTagNames);
+        var runToMetadata = result[1];
+        var datasets = _.map(runsWithGraph, function(runName) {
+          return {
+            name: runName,
+            path: backend.router.graph(
+                runName, tf.graph.LIMIT_ATTR_SIZE, tf.graph.LARGE_ATTRS_KEY),
+            runMetadata: runToMetadata[runName] ? _.map(
+              runToMetadata[runName].sort(VZ.Sorting.compareTagNames), function(tag) {
+                return {
+                  tag: tag,
+                  path: backend.router.runMetadata(tag, runName)
+                };
+              }, this) : []
+          };
+        }, this);
+        this.set('_datasets', datasets);
+      }.bind(this));
+  },
+  _requestHealthPills: function() {
+    this.set('_areHealthPillsLoading', true);
+    const requestId = ++this._healthPillRequestId;
+
+    if (this._healthPillStepRequestTimerId !== null) {
+      // A request for health pills is already scheduled to be initiated. Clear it, and schedule a
+      // new request.
+      window.clearTimeout(this._healthPillStepRequestTimerId);
+      this._healthPillStepRequestTimerId = null;
+    }
+
+    if (this.allStepsModeEnabled) {
+      // This path may be slow. Schedule network requests to start some time later. If another
+      // request is scheduled in the mean time, drop this current request.
+      this._healthPillStepRequestTimerId = setTimeout(function() {
+        this._healthPillStepRequestTimerId = null;
+        this._initiateNetworkRequestForHealthPills(requestId);
+      }.bind(this), this._healthPillStepRequestTimerDelay);
+    } else {
+      // The user is fetching sampled steps. This path is fast, so no need to throttle. Directly
+      // fetch the health pills across the network.
+      this._initiateNetworkRequestForHealthPills(requestId);
+    }
+  },
+  // Initiates the network request for health pills. Do not directly call this method - network
+  // requests may be throttled. Instead, call _requestHealthPills, which uses this method.
+  _initiateNetworkRequestForHealthPills: function(requestId) {
+    if (this._healthPillRequestId !== requestId) {
+      // This possibly scheduled request was outdated before it was even sent across the network. Do
+      // not bother initiating it.
+      return;
+    }
+
+    const specificStep = this.allStepsModeEnabled ? this.specificHealthPillStep : undefined;
+    this.backend.healthPills(this._renderHierarchy.getNamesOfRenderedOps(), specificStep).then(
+        function(result) {
+      if (!this.healthPillsToggledOn) {
+        // The user has opted to hide health pills via the toggle button.
+        return;
+      }
+
+      if (requestId !== this._healthPillRequestId) {
+        // This response is no longer relevant.
+        return;
+      }
+
+      // Set the index for which step to show for the health pills. By default, show the last step.
+      // A precondition we assume (that Tensorboard's reservoir sampling guarantees) is that all
+      // node names should be mapped to the same number of steps.
+      for (let nodeName in result) {
+        this.set('_healthPillStepIndex', result[nodeName].length - 1);
+        break;
+      }
+
+      this.set('_nodeNamesToHealthPills', result);
+      this.set('_areHealthPillsLoading', false);
+      this.set('_healthPillStepRequestTimerId', null);
+    }.bind(this));
+  },
+  _datasetsEmpty: function(datasets) {
+    return !datasets || !datasets.length;
+  },
+  _renderHierarchyChanged: function(renderHierarchy) {
+    // Reload any data on the graph when the render hierarchy (which determines which nodes are
+    // rendered) changes.
+    this.reload();
+  },
+  _handleNodeToggleExpand: function() {
+    // Nodes were toggled. We may need to request health pills for more nodes.
+    this._requestHealthPills();
+  },
+  _healthPillsToggledOnChanged: function(healthPillsToggledOn) {
+    if (healthPillsToggledOn) {
+      // Load health pills.
+      this.reload();
+    } else {
+      // Remove all health pills by setting an empty mapping.
+      this.set('_nodeNamesToHealthPills', {});
+    }
+  },
+  // Fetch health pills for a specific step if applicable.
+  _maybeFetchHealthPillsAtSpecificStep: function(allStepsModeEnabled, specificHealthPillStep) {
+    if (!this._renderHierarchy) {
+      // The graph is not ready yet.
+      return;
+    }
+
+    this._requestHealthPills();
+  },
+});
+})();
+</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD
new file mode 100644
index 0000000000..f84726e7c7
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD
@@ -0,0 +1,35 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_info_d3v4",
+    srcs = [
+        "tf-graph-icon.html",
+        "tf-graph-info.html",
+        "tf-node-info.html",
+        "tf-node-list-item.html",
+    ],
+    path = "/tf-graph-info",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "@org_polymer",
+        "@org_polymer_iron_collapse",
+        "@org_polymer_iron_list",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_item",
+        "@org_polymer_paper_slider",
+        "@org_polymer_paper_spinner",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD
new file mode 100644
index 0000000000..a7d59418fd
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD
@@ -0,0 +1,26 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_info/demo
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-info/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common",
+        "//tensorflow/tensorboard/components/tf_graph_info",
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/index.html
new file mode 100644
index 0000000000..f7d2ef7ee5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/index.html
@@ -0,0 +1,94 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-info.html">
+<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Info Demo</title>
+<style>
+  #demo-container {
+    border: 2px solid #808080;
+    width: 1000px;
+    height: 600px;
+  }
+</style>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-info-demo">
+      <template>
+        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
+        <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            out-graph="{{_graph}}">
+        </tf-graph-loader>
+
+        <tf-graph-info id="info" title="selected"></tf-graph-info>
+      </template>
+      <script>
+        "use strict";
+
+        Polymer({
+          is: "tf-graph-info-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
+
+            // This property will be updated by the graph loader.
+            _graph: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_graphUpdated(_graph)',
+          ],
+          _graphUpdated: function(slimGraph) {
+            const tracker = tf.graph.util.getTracker(this.$.loader);
+            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
+                tracker, 100, 'Namespace hierarchy');
+            const hierarchyOptions = {};
+            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
+                function(graphHierarchy) {
+              // We have parsed and built the graph object from a pbtxt file. Show info.
+              this.$.info.set('graph', slimGraph);
+              this.$.info.set('graphHierarchy', graphHierarchy);
+
+              // Select a node within that graph.
+              this.$.info.set('selectedNode', 'GradientDescent/learning_rate');
+            }.bind(this));
+          },
+        });
+      </script>
+    </dom-module>
+    <div id='demo-container'>
+      <tf-graph-info-demo></tf-graph-info-demo>
+    </div>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-icon.html b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-icon.html
new file mode 100644
index 0000000000..a3e9dc59c5
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-icon.html
@@ -0,0 +1,296 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+
+<dom-module id="tf-graph-icon">
+  <style>
+    .faded-rect {
+      fill: url(#rectHatch);
+    }
+
+    .faded-ellipse {
+      fill: url(#ellipseHatch);
+    }
+
+    .faded-rect, .faded-ellipse, .faded-series {
+      stroke:   var(--tb-graph-faded) !important;
+    }
+  </style>
+  <template>
+    <template is="dom-if" if="[[_isType(node, type, 'OP')]]">
+      <template is="dom-if" if="[[_isConst(node, const)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 10 10">
+          <circle cx="5" cy="5" r="3"
+              fill$="[[_getFill(_computedFill, 'OP')]]"
+              stroke$="[[_getStroke(_computedFill, 'OP')]]" />
+        </svg>
+      </template>
+      <template is="dom-if" if="[[_isSummary(node, summary)]]">
+        <svg width$="[[height]]" height$="[[height]]" viewBox="0 0 12 12">
+          <use x="0" y="0" xlink:href="#summary-icon" />
+        </svg>
+      </template>
+      <template is="dom-if" if="[[_isRegularOp(node, const, summary)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 8">
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+              xlink:href="#op-node-stamp"
+              fill$="[[_getFill(_computedFill, 'OP')]]"
+              stroke$="[[_getStroke(_computedFill, 'OP')]]"
+              class$="{{_fadedClass(renderInfo, 'ellipse')}}"
+              x="8" y="4" />
+        </svg>
+      </template>
+    </template>
+    <template is="dom-if" if="[[_isType(node, type, 'META')]]">
+      <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 37 16">
+        <rect x="1" y="1"
+            fill$="[[_getFill(_computedFill, 'META')]]"
+            stroke$="[[_getStroke(_computedFill, 'META')]]"
+            class$="{{_fadedClass(renderInfo, 'rect')}}"
+            stroke-width="2px"
+            height="14" width="35"
+            rx="5" ry="5"/>
+      </svg>
+    </template>
+    <template is="dom-if" if="[[_isType(node, type, 'SERIES')]]">
+      <template is="dom-if" if="[[_isVertical(node, vertical)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 15">
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+              xlink:href="#op-series-vertical-stamp"
+              fill$="[[_getFill(_computedFill, 'SERIES')]]"
+              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
+              class$="{{_fadedClass(renderInfo, 'series')}}"
+              x="0" y="2" />
+        </svg>
+      </template>
+      <template is="dom-if" if="[[!_isVertical(node, vertical)]]">
+        <svg height$="[[height]]"
+            preserveAspectRatio="xMinYMid meet" viewBox="0 0 24 10">
+          <use xmlns:xlink="http://www.w3.org/1999/xlink"
+              xlink:href="#op-series-horizontal-stamp"
+              fill$="[[_getFill(_computedFill, 'SERIES')]]"
+              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
+              class$="{{_fadedClass(renderInfo, 'series')}}"
+              x="0" y="1" />
+        </svg>
+      </template>
+    </template>
+  </template>
+
+  <script>
+    (function() {
+      Polymer({
+        is: 'tf-graph-icon',
+
+        properties: {
+          /**
+           * Node to represent with an icon. Optional, but if specified, its
+           * properties override those defined in the type, vertical, const and
+           * summary properties.
+           * @type {tf.graph.Node}
+           */
+          node: {
+            type: Object,
+            value: null
+          },
+
+          /**
+           * Render node information associated with this node. Optional. If
+           * specified, this is only used when computing the fill of the icon
+           * element.
+           * @type {tf.graph.render.RenderNodeInfo}
+           */
+          renderInfo: {
+            type: Object,
+            value: null
+          },
+
+          /**
+           * String indicating the type of coloring to use for this node, used
+           * only for determining the fill.
+           */
+          colorBy: {
+            type: Object,
+            value: "structural"
+          },
+
+          /**
+           * Function used by structural coloring algorithm to determine which
+           * color to use based on the template ID of the node. Optional.
+           */
+          templateIndex: {
+            type: Function,
+            value: null
+          },
+
+          /** Type of node to draw (ignored if node is set). */
+          type: {
+            type: String,
+            value: null
+          },
+
+          /** Direction for series (ignored for other types). */
+          vertical: {
+            type: Boolean,
+            value: false
+          },
+
+          /** Whether the op is Const (ignored for non-ops). */
+          const: {
+            type: Boolean,
+            value: false
+          },
+
+          /** Whether the op is a Summary (ignored for non-ops). */
+          summary: {
+            type: Boolean,
+            value: false
+          },
+
+          /**
+           * Fill for the icon, optional. If fill is specified and node is not
+           * specified, then this value will override the default for the
+           * element. However, if node is specified, this value will be ignored.
+           */
+          fill: {
+            type: String,
+            value: null
+          },
+
+          /** Height of the SVG element in pixels, used for scaling. */
+          height: {
+            type: Number,
+            value: 20
+          },
+
+          /** The computed fill for the node. **/
+          _computedFill: {
+            type: String,
+            computed:
+              "_getComputedFill(node, renderInfo, colorBy, templateIndex, fill)"
+          }
+
+        },
+
+        /**
+         * Get the computed fill value for the element.
+         */
+        _getComputedFill: function(inputNode, inputRenderInfo, inputColorBy,
+            inputTemplateIndex, inputFill) {
+          if (inputNode && inputRenderInfo &&
+              inputColorBy && inputTemplateIndex) {
+            var ns = tf.graph.scene.node;
+            var colorBy = ns.ColorBy[inputColorBy.toUpperCase()];
+            return ns.getFillForNode(inputTemplateIndex, colorBy,
+                inputRenderInfo, false);
+          }
+          return inputFill;
+        },
+
+        /**
+         * Get the fill value for the element, or if that's not possible, return
+         * the default fill value for the node type.
+         */
+        _getFill: function(inputComputedFill, inputNodeType) {
+          return inputComputedFill || ({
+            OP: tf.graph.render.OpNodeColors.DEFAULT_FILL,
+            META: tf.graph.render.MetanodeColors.DEFAULT_FILL,
+            SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_FILL
+          })[inputNodeType];
+        },
+
+        /**
+         * Get the stroke value for the element, or if that's not possible,
+         * return the default stroke value for the node type.
+         */
+        _getStroke: function(inputComputedFill, inputNodeType) {
+          return inputComputedFill ?
+            tf.graph.scene.node.getStrokeForFill(inputComputedFill) :
+            ({
+              OP: tf.graph.render.OpNodeColors.DEFAULT_STROKE,
+              META: tf.graph.render.MetanodeColors.DEFAULT_STROKE,
+              SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_STROKE
+            })[inputNodeType];
+        },
+
+        /**
+         * Test whether the specified node's type, or the literal type string,
+         * match a particular other type.
+         */
+        _isType: function(inputNode, inputType, targetType) {
+          if (inputNode) {
+            return tf.graph.NodeType[inputNode.type] === targetType;
+          }
+          return inputType === targetType;
+        },
+
+        /**
+         * Test whether the specified node should be represented as a vertical
+         * series. Defaults to the value of the vertical property if node is
+         * not specified.
+         */
+        _isVertical: function(inputNode, inputVertical) {
+          if (inputNode) {
+            return inputNode.hasNonControlEdges;
+          }
+          return !!inputVertical;
+        },
+
+        /**
+         * Test whether the specified node is a constant. Defaults to the value
+         * of the const property if node is not specified.
+         */
+        _isConst: function(inputNode, inputConst) {
+          if (inputNode) {
+            return inputNode.op === 'Const';
+          }
+          return !!inputConst;
+        },
+
+        /**
+         * Test whether the specified node is a summary. Defaults to the value
+         * of the summary property if node is not specified.
+         */
+        _isSummary: function(inputNode, inputSummary) {
+          if (inputNode) {
+            return this._isType(inputNode, null, 'OP') &&
+                inputNode.op.substr(-7) === 'Summary';
+          }
+          return !!inputSummary;
+        },
+
+        /**
+         * Test whether the op node is a regular non-summary non-const node.
+         */
+        _isRegularOp: function(inputNode, inputConst, inputSummary) {
+          return !this._isConst(inputNode, inputConst) &&
+              !this._isSummary(inputNode, inputSummary);
+        },
+
+        _fadedClass: function(itemRenderInfo, shape) {
+          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded-' + shape : '';
+        }
+      });
+    })();
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-info.html b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-info.html
new file mode 100644
index 0000000000..b33e1e00d0
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-graph-info.html
@@ -0,0 +1,354 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-slider/paper-slider.html">
+<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="tf-node-info.html">
+
+<dom-module id="tf-graph-info">
+<template>
+<style>
+:host {
+  font-size: 12px;
+  margin: 0;
+  padding: 0;
+  display: block;
+}
+
+h2 {
+  padding: 0;
+  text-align: center;
+  margin: 0;
+}
+
+.health-pill-legend {
+  padding: 15px;
+}
+
+.health-pill-legend h2 {
+  text-align: left;
+}
+
+.health-pill-entry {
+  margin: 10px 10px 10px 0;
+}
+
+.health-pill-entry .color-preview {
+  width: 26px;
+  height: 26px;
+  border-radius: 3px;
+  display: inline-block;
+  margin: 0 10px 0 0;
+}
+
+.health-pill-entry .color-label, .health-pill-entry .tensor-count {
+  color: #777;
+  display: inline-block;
+  height: 26px;
+  font-size: 22px;
+  line-height: 26px;
+  vertical-align: top;
+}
+
+.health-pill-entry .tensor-count {
+  float: right;
+}
+
+#health-pill-step-slider {
+  width: 100%;
+  margin: 0 0 0 -15px;
+  /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
+   * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
+   * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2.
+   * Apparently, the paper-slider lacks a mixin for those padding values. */
+  width: calc(100% + 31px);
+}
+
+#health-pills-loading-spinner {
+  width: 20px;
+  height: 20px;
+  vertical-align: top;
+}
+
+#health-pill-step-number-input {
+  text-align: center;
+  vertical-align: top;
+}
+</style>
+<template is="dom-if" if="{{selectedNode}}">
+  <paper-material elevation="1" class="card">
+    <tf-node-info graph-hierarchy="[[graphHierarchy]]"
+                  render-hierarchy="[[renderHierarchy]]"
+                  flat-graph="[[graph]]"
+                  node-name="[[selectedNode]]"
+                  node-include="[[selectedNodeInclude]]"
+                  highlighted-node="{{highlightedNode}}"
+                  color-by="[[colorBy]]">
+    </tf-node-info>
+  </paper-material>
+</template>
+<template is="dom-if" if="[[_healthPillsAvailable(debuggerDataEnabled, nodeNamesToHealthPills)]]">
+  <paper-material elevation="1" class="card health-pill-legend">
+    <div class="title">
+      Enable all (not just sampled) steps. Requires slow disk read.
+    </div>
+    <paper-toggle-button id="enableAllStepsModeToggle" checked="{{allStepsModeEnabled}}">
+    </paper-toggle-button>
+    <h2>
+      Step of Health Pills:
+      <template is="dom-if" if="[[allStepsModeEnabled]]">
+        <input type="number"
+               id="health-pill-step-number-input"
+               min="0"
+               max="[[_biggestStepEverSeen]]"
+               value="{{specificHealthPillStep::input}}">
+      </template>
+      <template is="dom-if" if="[[!allStepsModeEnabled]]">
+        [[_currentStepDisplayValue]]
+      </template>
+
+      <paper-spinner-lite active
+                          hidden$=[[!areHealthPillsLoading]]
+                          id="health-pills-loading-spinner"></paper-spinner-lite>
+    </h2>
+    <template is="dom-if" if="[[allStepsModeEnabled]]">
+      <paper-slider
+            id="health-pill-step-slider"
+            immediate-value="{{specificHealthPillStep}}"
+            max="[[_biggestStepEverSeen]]"
+            snaps
+            step="1"
+            value="{{specificHealthPillStep}}"></paper-slider>
+    </template>
+    <template is="dom-if" if="[[!allStepsModeEnabled]]">
+      <template is="dom-if" if="[[_maxStepIndex]]">
+        <paper-slider
+              id="health-pill-step-slider"
+              immediate-value="{{healthPillStepIndex}}"
+              max="[[_maxStepIndex]]"
+              snaps
+              step="1"
+              value="{{healthPillStepIndex}}"></paper-slider>
+      </template>
+    </template>
+    <h2>
+      Health Pill
+      <template is="dom-if" if="[[healthPillValuesForSelectedNode]]">
+        Counts for Selected Node
+      </template>
+      <template is="dom-if" if="[[!healthPillValuesForSelectedNode]]">
+        Legend
+      </template>
+    </h2>
+    <template is="dom-repeat" items="[[healthPillEntries]]">
+      <div class="health-pill-entry">
+        <div class="color-preview" style="background:[[item.background_color]]"></div>
+        <div class="color-label">[[item.label]]</div>
+        <div class="tensor-count">
+          [[_computeTensorCountString(healthPillValuesForSelectedNode, index)]]
+        </div>
+      </div>
+    </template>
+  </paper-material>
+</template>
+</template>
+<script>
+"use strict";
+
+(function() {
+  Polymer({
+    is: 'tf-graph-info',
+
+    properties: {
+      title: String,
+      graphHierarchy: Object,
+      graph: Object,
+      renderHierarchy: Object,
+      nodeNamesToHealthPills: Object,
+      healthPillStepIndex: {
+        type: Number,
+        notify: true,
+      },
+      // Only relevant if we are in all steps mode, in which case the user may want to view health
+      // pills for a specific step.
+      specificHealthPillStep: {
+        type: Number,
+        value: 0,
+        notify: true,
+      },
+      colorBy: String,
+      // Two-ways
+      selectedNode: {
+        type: String,
+        notify: true
+      },
+      highlightedNode: {
+        type: String,
+        notify: true
+      },
+      // The enum value of the include property of the selected node.
+      selectedNodeInclude: {
+        type: Number,
+        notify: true
+      },
+      // Whether debugger data is enabled for this instance of Tensorboard.
+      debuggerDataEnabled: Boolean,
+      // Whether health pills are currently being loaded, in which case we show a spinner (and the
+      // current health pills shown might be out of date).
+      areHealthPillsLoading: Boolean,
+      healthPillEntries: {
+        type: Array,
+        value: tf.graph.scene.healthPillEntries,
+        readOnly: true,
+      },
+      healthPillValuesForSelectedNode: {
+        type: Array,
+        computed: '_computeHealthPillForNode(nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading)',
+      },
+      // When all-steps mode is enabled, the user can request health pills for any step. In this
+      // mode, Tensorboard makes a request every time the user drags the slider to a different step.
+      allStepsModeEnabled: {
+        type: Boolean,
+        notify: true,
+      },
+      // The biggest step value ever seen. Used to determine what steps of health pills to let the
+      // user fetch in all steps mode.
+      _biggestStepEverSeen: {
+        type: Number,
+        computed: '_computeBiggestStepEverSeen(nodeNamesToHealthPills)',
+      },
+      _maxStepIndex: {
+        type: Number,
+        computed: '_computeMaxStepIndex(nodeNamesToHealthPills)',
+      },
+      _currentStepDisplayValue: {
+        type: String,
+        computed: '_computeCurrentStepDisplayValue(nodeNamesToHealthPills, healthPillStepIndex, allStepsModeEnabled, specificHealthPillStep, areHealthPillsLoading)',
+      },
+    },
+    listeners: {
+      'node-list-item-click': '_nodeListItemClicked',
+      'node-list-item-mouseover': '_nodeListItemMouseover',
+      'node-list-item-mouseout': '_nodeListItemMouseout'
+    },
+    _nodeListItemClicked: function(event) {
+      this.selectedNode = event.detail.nodeName;
+    },
+    _nodeListItemMouseover: function(event) {
+      this.highlightedNode = event.detail.nodeName;
+    },
+    _nodeListItemMouseout: function() {
+      this.highlightedNode = null;
+    },
+    _healthPillsAvailable: function(debuggerDataEnabled, nodeNamesToHealthPills) {
+      // So long as there is a mapping (even if empty) from node name to health pills, show the
+      // legend and slider. We do that because, even if no health pills exist at the current step,
+      // the user may desire to change steps, and the slider must show for the user to do that.
+      return debuggerDataEnabled && nodeNamesToHealthPills;
+    },
+    _computeTensorCountString: function(healthPillValuesForSelectedNode, valueIndex) {
+      if (!healthPillValuesForSelectedNode) {
+        // No health pill data is available.
+        return '';
+      }
+
+      return healthPillValuesForSelectedNode[valueIndex].toFixed(0);
+    },
+    _computeHealthPillForNode: function(
+        nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading) {
+      if (areHealthPillsLoading) {
+        // Health pills are loading. Do not render data that is out of date.
+        return null;
+      }
+
+      if (!selectedNode) {
+        // No node is selected.
+        return null;
+      }
+
+      const healthPills = nodeNamesToHealthPills[selectedNode];
+      if (!healthPills) {
+        // This node lacks a health pill.
+        return null;
+      }
+
+      // If all steps mode is enabled, we use the first health pill in the list because the JSON
+      // response from the server is a mapping between node name and a list of 1 health pill.
+      const healthPill = healthPills[allStepsModeEnabled ? 0 : healthPillStepIndex];
+      if (!healthPill) {
+        // This node lacks a health pill at the current step.
+        return null;
+      }
+
+      // The health pill count values start at 2. Each health pill contains 6 values.
+      return healthPill.value.slice(2, 8);
+    },
+    _computeCurrentStepDisplayValue: function(
+        nodeNamesToHealthPills,
+        healthPillStepIndex,
+        allStepsModeEnabled,
+        specificHealthPillStep,
+        areHealthPillsLoading) {
+      if (allStepsModeEnabled) {
+        // The user seeks health pills for specific step from the server.
+        return specificHealthPillStep.toFixed(0);
+      }
+
+      if (areHealthPillsLoading) {
+        // The current step is undefined.
+        return 0;
+      }
+
+      for (let nodeName in nodeNamesToHealthPills) {
+        // All nodes have the same number of steps stored, so only examine 1 node. We cannot
+        // directly index into the nodeNamesToHealthPills object because we do not have a key.
+        // If all steps mode is enabled, we only have 1 step to show.
+        return nodeNamesToHealthPills[nodeName][healthPillStepIndex].step.toFixed(0);
+      }
+
+      // The current step could not be computed.
+      return 0;
+    },
+    _computeBiggestStepEverSeen: function(nodeNamesToHealthPills) {
+      for (let nodeName in nodeNamesToHealthPills) {
+        // All nodes have the same number of steps stored, so only examine 1 node.
+        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
+        // of the array will be greater than 1.
+        var healthPills = nodeNamesToHealthPills[nodeName];
+        return Math.max(this._biggestStepEverSeen, healthPills[healthPills.length - 1].step);
+      }
+
+      // No steps seen so far. Default to 0.
+      return this._biggestStepEverSeen || 0;
+    },
+    _computeMaxStepIndex: function(nodeNamesToHealthPills) {
+      for (let nodeName in nodeNamesToHealthPills) {
+        // All nodes have the same number of steps stored, so only examine 1 node.
+        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
+        // of the array will be greater than 1.
+        return nodeNamesToHealthPills[nodeName].length - 1;
+      }
+
+      // Return a falsy value. The slider should be hidden.
+      return 0;
+    },
+  });
+})();
+</script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html
new file mode 100644
index 0000000000..0715777370
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html
@@ -0,0 +1,651 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../iron-collapse/iron-collapse.html">
+<link rel="import" href="../iron-list/iron-list.html">
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../paper-item/all-imports.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
+<link rel="import" href="tf-graph-icon.html">
+<link rel="import" href="tf-node-list-item.html">
+
+<dom-module id="tf-node-info">
+  <style>
+  .sub-list-group {
+    font-weight: 500;
+    font-size: 12pt;
+    padding-bottom: 8px;
+    width: 100%;
+  }
+
+  .sub-list {
+    max-height: 300px;
+    overflow-y: scroll;
+  }
+
+  .attr-left {
+    float: left;
+    width: 30%;
+    word-wrap: break-word;
+    color: #565656;
+    font-size: 11pt;
+    font-weight: 400;
+  }
+
+  .attr-right {
+    margin-left: 30%;
+    word-wrap: break-word;
+    color: #565656;
+    font-weight: 400;
+  }
+
+  .sub-list-table {
+    display: table;
+    width: 100%;
+  }
+
+  .sub-list-table-row {
+    display: table-row;
+  }
+
+  .sub-list-table-row .sub-list-table-cell:last-child {
+    text-align: right;
+  }
+
+  .sub-list-table-cell {
+    color: #565656;
+    display: table-cell;
+    font-size: 11pt;
+    font-weight: 400;
+    max-width: 200px;
+    padding: 0 4px;
+  }
+
+  paper-item {
+    padding: 0;
+    background: #e9e9e9;
+  }
+
+  paper-item-body[two-line] {
+    min-height: 0;
+    padding: 8px 12px 4px;
+  }
+
+  .expandedInfo {
+    padding: 8px 12px;
+  }
+
+  .controlDeps {
+    padding: 0 0 0 8px;
+  }
+
+  .node-name {
+    white-space: normal;
+    word-wrap: break-word;
+    font-size: 14pt;
+    font-weight: 500;
+  }
+
+  .node-icon {
+    float: right;
+  }
+
+  .subtitle {
+    font-size: 12pt;
+    color: #5e5e5e;
+  }
+
+  .controlLine {
+    font-size: 11pt;
+    font-weight: 400;
+  }
+
+  .toggle-button {
+    float: right;
+    max-height: 20px;
+    max-width: 20px;
+    padding: 0;
+  }
+
+  .control-toggle-button {
+    float: left;
+    max-height: 20px;
+    max-width: 20px;
+    padding: 0;
+  }
+
+  .toggle-include-group {
+    padding-top: 4px;
+  }
+
+  .toggle-include {
+    margin: 5px 6px;
+    text-transform: none;
+    padding: 4px 6px;
+    font-size: 10pt;
+    background-color: #fafafa;
+    color: #666;
+  }
+
+  .toggle-include:hover {
+    background-color: var(--google-yellow-100);
+  }
+
+  .non-control-list-item {
+    padding-left: 10px;
+  }
+  </style>
+  <template>
+    <paper-item>
+      <paper-item-body two-line>
+        <div>
+          <paper-icon-button
+            icon="{{_getToggleIcon(_expanded)}}"
+            on-click="_toggleExpanded"
+            class="toggle-button">
+          </paper-icon-button>
+          <div class="node-name" id="nodetitle"></div>
+        </div>
+        <div secondary>
+          <tf-graph-icon class="node-icon" node="[[_node]]"
+              render-info="[[_getRenderInfo(nodeName, renderHierarchy)]]"
+              color-by="[[colorBy]]"
+              template-index="[[_templateIndex]]"
+              ></tf-graph-icon>
+          <template is="dom-if" if="{{_node.op}}">
+            <div class="subtitle">
+              Operation:
+              <span>[[_node.op]]</span>
+            </div>
+          </template>
+          <template is="dom-if" if="{{_node.metagraph}}">
+            <div class="subtitle">
+              Subgraph:
+              <span>[[_node.cardinality]]</span> nodes
+            </div>
+          </template>
+        </div>
+      </paper-item-body>
+    </paper-item>
+    <iron-collapse opened="{{_expanded}}">
+    <template is="dom-if" if="{{_expanded}}" restamp="true">
+      <div class="expandedInfo">
+        <div class="sub-list-group attributes">
+          Attributes
+          (<span>[[_attributes.length]]</span>)
+          <iron-list class="sub-list" id ="attributesList"
+                    items="[[_attributes]]">
+            <template>
+              <div>
+                <div class="attr-left">[[item.key]]</div>
+                <div class="attr-right">[[item.value]]</div>
+              </div>
+            </template>
+          </iron-list>
+        </div>
+
+        <template is="dom-if" if="{{_device}}">
+          <div class="sub-list-group device">
+            <div class="attr-left">Device</div>
+            <div class="attr-right">[[_device]]</div>
+          </div>
+        </template>
+
+        <div class="sub-list-group predecessors">
+          Inputs
+          (<span>[[_totalPredecessors]]</span>)
+          <iron-list class="sub-list" id ="inputsList"
+                    items="[[_predecessors.regular]]">
+            <template>
+              <tf-node-list-item
+                  class="non-control-list-item"
+                  card-node="[[_node]]"
+                  item-node="[[item.node]]"
+                  edge-label="[[item.edgeLabel]]"
+                  item-render-info="[[item.renderInfo]]"
+                  name="[[item.name]]"
+                  item-type="predecessors"
+                  color-by="[[colorBy]]"
+                  template-index="[[_templateIndex]]">
+              </tf-node-list-item>
+            </template>
+          </iron-list>
+          <template is="dom-if" if="[[_predecessors.control.length]]">
+            <div class="controlDeps">
+              <div class="controlLine">
+                <paper-icon-button
+                  icon="{{_getToggleIcon(_openedControlPred)}}"
+                  on-click="_toggleControlPred"
+                  class="control-toggle-button">
+                </paper-icon-button>
+                Control dependencies
+              </div>
+              <iron-collapse opened="{{_openedControlPred}}" no-animation>
+                <template is="dom-if" if="{{_openedControlPred}}" restamp="true">
+                  <iron-list class="sub-list" items="[[_predecessors.control]]">
+                    <template>
+                      <tf-node-list-item
+                          card-node="[[_node]]"
+                          item-node="[[item.node]]"
+                          item-render-info="[[item.renderInfo]]"
+                          name="[[item.name]]"
+                          item-type="predecessors"
+                          color-by="[[colorBy]]"
+                          template-index="[[_templateIndex]]">
+                      </tf-node-list-item>
+                    </template>
+                  </iron-list>
+                </template>
+              </iron-collapse>
+            </div>
+          </template>
+        </div>
+
+        <div class="sub-list-group successors">
+          Outputs
+          (<span>[[_totalSuccessors]]</span>)
+          <iron-list class="sub-list" id ="outputsList"
+                    items="[[_successors.regular]]">
+            <template>
+              <tf-node-list-item
+                  class="non-control-list-item"
+                  card-node="[[_node]]"
+                  item-node="[[item.node]]"
+                  edge-label="[[item.edgeLabel]]"
+                  item-render-info="[[item.renderInfo]]"
+                  name="[[item.name]]"
+                  item-type="successor"
+                  color-by="[[colorBy]]"
+                  template-index="[[_templateIndex]]">
+              </tf-node-list-item>
+            </template>
+          </iron-list>
+          <template is="dom-if" if="[[_successors.control.length]]">
+            <div class="controlDeps">
+              <div class="controlLine">
+                <paper-icon-button
+                  icon="{{_getToggleIcon(_openedControlSucc)}}"
+                  on-click="_toggleControlSucc"
+                  class="control-toggle-button">
+                </paper-icon-button>
+                Control dependencies
+              </div>
+              <iron-collapse opened="{{_openedControlSucc}}" no-animation>
+                <template is="dom-if" if="{{_openedControlSucc}}" restamp="true">
+                  <iron-list class="sub-list" items="[[_successors.control]]">
+                    <template>
+                      <tf-node-list-item
+                          card-node="[[_node]]"
+                          item-node="[[item.node]]"
+                          item-render-info="[[item.renderInfo]]"
+                          name="[[item.name]]"
+                          item-type="successors"
+                          color-by="[[colorBy]]"
+                          template-index="[[_templateIndex]]">
+                      </tf-node-list-item>
+                    </template>
+                  </iron-list>
+                </template>
+              </iron-collapse>
+            </div>
+          </template>
+        </div>
+        <template is="dom-if" if="{{_hasDisplayableNodeStats}}">
+          <div class="sub-list-group node-stats">
+            Node Stats
+            <div class="sub-list-table">
+              <template is="dom-if" if="{{_nodeStats.totalBytes}}">
+                <div class="sub-list-table-row">
+                  <div class="sub-list-table-cell">Memory</div>
+                  <div class="sub-list-table-cell">[[_nodeStatsFormattedBytes]]</div>
+                </div>
+              </template>
+              <template is="dom-if" if="{{_getTotalMicros(_nodeStats)}}">
+                <div class="sub-list-table-row">
+                  <div class="sub-list-table-cell">Compute Time</div>
+                  <div class="sub-list-table-cell">[[_nodeStatsFormattedComputeTime]]</div>
+                </div>
+              </template>
+              <template is="dom-if" if="{{_nodeStats.outputSize}}">
+                <div class="sub-list-table-row">
+                  <div class="sub-list-table-cell">Tensor Output Sizes</div>
+                  <div class="sub-list-table-cell">
+                    <template is="dom-repeat" items="{{_nodeStatsFormattedOutputSizes}}">
+                      [[item]] <br/>
+                    </template>
+                  </div>
+                </div>
+              </template>
+            </div>
+          </div>
+        </template>
+        <div class="toggle-include-group">
+          <paper-button raised class="toggle-include" on-click="_toggleInclude">
+            <span>[[_auxButtonText]]</span>
+          </paper-button>
+        </div>
+        <template is="dom-if" if="{{_isInSeries(_node)}}">
+          <div class="toggle-include-group">
+            <paper-button raised class="toggle-include" on-click="_toggleGroup">
+              <span>[[_groupButtonText]]</span>
+            </paper-button>
+          </div>
+        </template>
+      </div>
+    </template>
+    </iron-collapse>
+  </template>
+
+  <script>
+    (function() {
+      Polymer({
+        is: 'tf-node-info',
+
+        properties: {
+          nodeName: String,
+          graphHierarchy: Object,
+          renderHierarchy: Object,
+          /** What to color the nodes by (compute time, memory, device etc.) */
+          colorBy: String,
+          _templateIndex: {
+            type: Function,
+            computed: '_getTemplateIndex(graphHierarchy)'
+          },
+          _node: {
+            type: Object,
+            computed: '_getNode(nodeName, graphHierarchy)',
+            observer: '_resetState'
+          },
+          _nodeStats: {
+            type: Object,
+            computed: '_getNodeStats(nodeName, graphHierarchy)',
+            observer: '_resetState'
+          },
+          _hasDisplayableNodeStats: {
+            type: Object,
+            computed: '_getHasDisplayableNodeStats(_nodeStats)',
+          },
+          _nodeStatsFormattedBytes: {
+            type: String,
+            computed: '_getNodeStatsFormattedBytes(_nodeStats)',
+          },
+          _nodeStatsFormattedComputeTime: {
+            type: String,
+            computed: '_getNodeStatsFormattedComputeTime(_nodeStats)',
+          },
+          _nodeStatsFormattedOutputSizes: {
+            type: Array,
+            computed: '_getNodeStatsFormattedOutputSizes(_nodeStats)',
+          },
+          // The enum value of the include property of the selected node.
+          nodeInclude: {
+            type: Number,
+            observer: '_nodeIncludeStateChanged'
+          },
+          _attributes: {
+            type: Array,
+            computed: '_getAttributes(_node)'
+          },
+          _device: {
+            type: String,
+            computed: '_getDevice(_node)'
+          },
+          _successors: {
+            type: Object,
+            computed: '_getSuccessors(_node, graphHierarchy)'
+          },
+          _predecessors: {
+            type: Object,
+            computed: '_getPredecessors(_node, graphHierarchy)'
+          },
+          _subnodes: {
+            type: Array,
+            computed: '_getSubnodes(_node)'
+          },
+          _expanded: {
+            type: Boolean,
+            value: true
+          },
+          _totalPredecessors: {
+            type: Number,
+            computed: '_getTotalPred(_predecessors)'
+          },
+          _totalSuccessors: {
+            type: Number,
+            computed: '_getTotalSucc(_successors)'
+          },
+          _openedControlPred: {
+            type: Boolean,
+            value: false
+          },
+          _openedControlSucc: {
+            type: Boolean,
+            value: false
+          },
+          _auxButtonText: String,
+          _groupButtonText: String
+        },
+        expandNode: function() {
+          this.fire('_node.expand', this.node);
+        },
+        _getTemplateIndex: function(graphHierarchy) {
+          return graphHierarchy.getTemplateIndex();
+        },
+        _getNode: function(nodeName, graphHierarchy) {
+          return graphHierarchy.node(nodeName);
+        },
+        _getNodeStats: function(nodeName, graphHierarchy) {
+          var node = this._getNode(nodeName, graphHierarchy);
+          if (node) {
+            return node.stats;
+          }
+          return null;
+        },
+        _getTotalMicros: function(stats) {
+          return stats.getTotalMicros();
+        },
+        _getHasDisplayableNodeStats: function(stats) {
+          return tf.graph.util.hasDisplayableNodeStats(stats);
+        },
+        _getNodeStatsFormattedBytes: function(stats) {
+          if (!stats || !stats.totalBytes) {
+            return;
+          }
+
+          return tf.graph.util.convertUnitsToHumanReadable(
+              stats.totalBytes, tf.graph.util.MEMORY_UNITS);
+        },
+        _getNodeStatsFormattedComputeTime: function(stats) {
+          if (!stats || !stats.getTotalMicros()) {
+            return;
+          }
+
+          return tf.graph.util.convertUnitsToHumanReadable(
+              stats.getTotalMicros(), tf.graph.util.TIME_UNITS);
+        },
+        _getNodeStatsFormattedOutputSizes: function(stats) {
+          if (!stats || !stats.outputSize || !stats.outputSize.length) {
+            return;
+          }
+
+          return _.map(stats.outputSize, function(shape) {
+            if (shape.length === 0) {
+              return "scalar";
+            }
+            return "[" + shape.join(", ") + "]";
+          });
+        },
+        _getPrintableHTMLNodeName: function(nodeName) {
+          // Insert an optional line break before each slash so that
+          // long node names wrap cleanly at path boundaries.
+          return (nodeName || '').replace(/\//g, '<wbr>/');
+        },
+        _getRenderInfo: function(nodeName, renderHierarchy) {
+          return this.renderHierarchy.getOrCreateRenderNodeByName(nodeName);
+        },
+        _getAttributes: function(node) {
+          this.async(this._resizeList.bind(this, "#attributesList"));
+          if (!node || !node.attr) {
+            return [];
+          }
+          var attrs = [];
+          _.each(node.attr, function(entry) {
+            // Unpack the "too large" attributes into separate attributes
+            // in the info card, with values "too large to show".
+            if (entry.key === tf.graph.LARGE_ATTRS_KEY) {
+              attrs = attrs.concat(entry.value.list.s.map(function(key) {
+                return {key: key, value: "Too large to show..."};
+              }));
+            } else {
+              attrs.push({
+                key: entry.key,
+                value: JSON.stringify(entry.value)
+              });
+            }
+          });
+          return attrs;
+        },
+        _getDevice: function(node) {
+          return node ? node.device : null;
+        },
+        _getSuccessors: function(node, hierarchy) {
+          this.async(this._resizeList.bind(this, "#inputsList"));
+          if (!node) {
+            return {regular: [], control: []}
+          }
+          return this._convertEdgeListToEdgeInfoList(
+            hierarchy.getSuccessors(node.name), false, node.isGroupNode);
+        },
+        _getPredecessors: function(node, hierarchy) {
+          this.async(this._resizeList.bind(this, "#outputsList"));
+          if (!node) {
+            return {regular: [], control: []}
+          }
+          return this._convertEdgeListToEdgeInfoList(
+            hierarchy.getPredecessors(node.name), true, node.isGroupNode);
+        },
+        _convertEdgeListToEdgeInfoList: function(list, isPredecessor, isGroupNode) {
+
+          /**
+           * Unpacks the metaedge into a list of base edge information
+           * that can be rendered.
+           */
+          var unpackMetaedge = function(metaedge) {
+            return _.map(metaedge.baseEdgeList, function(baseEdge) {
+              name = isPredecessor ? baseEdge.v : baseEdge.w;
+              return {
+                name: name,
+                node: this._getNode(name, this.graphHierarchy),
+                edgeLabel: tf.graph.scene.edge.getLabelForBaseEdge(baseEdge,
+                    this.renderHierarchy),
+                renderInfo: this._getRenderInfo(name, this.renderHierarchy)
+              };
+            }, this);
+          }.bind(this);
+
+          /**
+           * Converts a list of metaedges to a list of edge information
+           * that can be rendered.
+           */
+          var toEdgeInfoList = function(edges) {
+            var edgeInfoList = [];
+            _.each(edges, function(metaedge) {
+              var name = isPredecessor ? metaedge.v : metaedge.w;
+              // Enumerate all the base edges if the node is an OpNode, or the
+              // metaedge has only 1 edge in it.
+              if (!isGroupNode || metaedge.baseEdgeList.length == 1) {
+                edgeInfoList = edgeInfoList.concat(unpackMetaedge(metaedge));
+              } else {
+                edgeInfoList.push({
+                  name: name,
+                  node: this._getNode(name, this.graphHierarchy),
+                  edgeLabel: tf.graph.scene.edge.getLabelForEdge(metaedge,
+                      this.renderHierarchy),
+                  renderInfo: this._getRenderInfo(name, this.renderHierarchy)
+                });
+              }
+            }, this);
+            return edgeInfoList;
+          }.bind(this);
+
+          return {
+            regular: toEdgeInfoList(list.regular),
+            control: toEdgeInfoList(list.control)
+          };
+        },
+        _getSubnodes: function(node) {
+          return node && node.metagraph ? node.metagraph.nodes() : null;
+        },
+        _getTotalPred: function(predecessors) {
+          return predecessors.regular.length + predecessors.control.length;
+        },
+        _getTotalSucc: function(successors) {
+          return successors.regular.length + successors.control.length;
+        },
+        _toggleControlPred: function() {
+          this._openedControlPred = !this._openedControlPred;
+        },
+        _toggleControlSucc: function() {
+          this._openedControlSucc = !this._openedControlSucc;
+        },
+        _toggleExpanded: function() {
+          this._expanded = !this._expanded;
+        },
+        _getToggleIcon: function(expanded) {
+          return expanded ? "expand-less" : "expand-more";
+        },
+        _resetState: function() {
+          this._openedControlPred = false;
+          this._openedControlSucc = false;
+
+          this.set("_groupButtonText",
+            tf.graph.scene.node.getGroupSettingLabel(this._node));
+
+          if (this._node) {
+            Polymer.dom(this.$.nodetitle).innerHTML =
+              this._getPrintableHTMLNodeName(this._node.name);
+          }
+        },
+        _resizeList: function(selector) {
+          var list = document.querySelector(selector);
+          if (list) {
+            list.fire('iron-resize');
+          }
+        },
+        _toggleInclude: function() {
+          var graphElem = document.querySelector("#graph");
+          graphElem.fire("node-toggle-extract", { name: this.nodeName });
+          var graphBoardElem = document.querySelector("#graphboard");
+          graphBoardElem.fire("node-toggle-extract");
+        },
+        _nodeIncludeStateChanged: function(include, oldInclude) {
+          this.set("_auxButtonText",
+            tf.graph.getIncludeNodeButtonString(include));
+        },
+        _toggleGroup: function() {
+          var graphElem = document.querySelector("#graph");
+          var seriesName = tf.graph.scene.node.getSeriesName(this._node);
+          graphElem.fire("node-toggle-seriesgroup", { name: seriesName });
+        },
+        _isInSeries: function(node) {
+          return tf.graph.scene.node.canBeInSeries(node);
+        }
+      });
+    })();
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-list-item.html b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-list-item.html
new file mode 100644
index 0000000000..c15478d126
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-list-item.html
@@ -0,0 +1,138 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
+<link rel="import" href="tf-graph-icon.html">
+
+<dom-module id="tf-node-list-item">
+  <style>
+  #list-item {
+    width: 100%;
+    color: #565656;
+    font-size: 11pt;
+    font-weight: 400;
+    position: relative;
+    display: inline-block;
+  }
+
+  #list-item:hover {
+    background-color: var(--google-yellow-100);
+  }
+
+  .clickable {
+    cursor: pointer;
+  }
+
+  #list-item span {
+    margin-left: 40px;
+  }
+
+  #list-item.excluded span {
+    color: #999;
+  }
+
+  #list-item span.edge-label {
+    float: right;
+    font-size: 10px;
+    margin-left: 3px;
+    margin-right: 5px;
+  }
+
+  .node-icon {
+    position: absolute;
+    top: 1px;
+    left: 2px;
+  }
+
+  .faded span {
+    color: var(--tb-graph-faded);
+  }
+  </style>
+  <template>
+    <div id="list-item"
+         on-mouseover="_nodeListener"
+         on-mouseout="_nodeListener"
+         on-click="_nodeListener">
+      <div class$="{{_fadedClass(itemRenderInfo)}}">
+        <tf-graph-icon class="node-icon" height="12"
+            color-by="[[colorBy]]" color-by-params="[[colorByParams]]"
+            node="[[itemNode]]" render-info="[[itemRenderInfo]]"
+            template-index="[[templateIndex]]"></tf-graph-icon>
+        <span title$="[[name]]">[[name]]</span>
+        <span class="edge-label">[[edgeLabel]]</span>
+      </div>
+    </div>
+  </template>
+
+  <script>
+    (function() {
+      Polymer({
+        is: 'tf-node-list-item',
+
+        properties: {
+          /**
+           * The Node for the card itself, on which this item is being drawn.
+           * @type {tf.graph.Node}
+           */
+          cardNode: Object,
+          /**
+           * The Node for the item within the card, somehow related to cardNode.
+           * @type {tf.graph.Node}
+           */
+          itemNode: Object,
+          /** The edge label associated with this item. */
+          edgeLabel: String,
+          /**
+           * The render node information for the item node. Used by the graph
+           * icon in determining fill color.
+           */
+          itemRenderInfo: Object,
+          name: String,
+          itemType: {
+            type: String,
+            observer: '_itemTypeChanged'
+          },
+          colorBy: String,
+          colorByParams: Object,
+          templateIndex: Function
+        },
+
+        _itemTypeChanged: function() {
+          if (this.itemType !== 'subnode') {
+            this.$['list-item'].classList.add('clickable');
+          } else {
+            this.$['list-item'].classList.remove('clickable');
+          }
+        },
+
+        _nodeListener: function(event) {
+          // fire node.click/mouseover/mouseout
+          this.fire('node-list-item-' + event.type, {
+            cardNode: this.cardNode.name,
+            nodeName: this.name,
+            type: this.itemType
+          });
+        },
+
+        _fadedClass: function(itemRenderInfo) {
+          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded' : '';
+        }
+      });
+    })();
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD
new file mode 100644
index 0000000000..7e01811a57
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD
@@ -0,0 +1,25 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "tf_graph_loader_d3v4",
+    srcs = [
+        "tf-graph-loader.html",
+    ],
+    path = "/tf-graph-loader",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "@org_polymer",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD
new file mode 100644
index 0000000000..b2fc04b2eb
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD
@@ -0,0 +1,24 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_loader/demo
+web_library(
+    name = "demo",
+    srcs = ["index.html"] + glob(["data/**"]),
+    path = "/tf-graph-loader/demo",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_paper_styles",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/data/graph.pbtxt
new file mode 100644
index 0000000000..30b2064534
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/data/graph.pbtxt
@@ -0,0 +1,4606 @@
+node {
+  name: "GradientDescent/learning_rate"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_3"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0.1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 100
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000d\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_grad/Shape"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/BroadcastGradientArgs"
+  op: "BroadcastGradientArgs"
+  input: "gradients/add_1_grad/Shape"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+        }
+        shape {
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod_1"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape_1"
+  input: "gradients/Mean_grad/Const_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Maximum"
+  op: "Maximum"
+  input: "gradients/Mean_grad/Prod_1"
+  input: "gradients/Mean_grad/Maximum/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Prod"
+  op: "Prod"
+  input: "gradients/Mean_grad/Shape"
+  input: "gradients/Mean_grad/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/floordiv"
+  op: "FloorDiv"
+  input: "gradients/Mean_grad/Prod"
+  input: "gradients/Mean_grad/Maximum"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Cast"
+  op: "Cast"
+  input: "gradients/Mean_grad/floordiv"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "DstT"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "SrcT"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile/multiples"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Fill"
+  op: "Fill"
+  input: "gradients/Shape"
+  input: "gradients/Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Fill"
+  input: "gradients/Mean_grad/Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/Tile"
+  op: "Tile"
+  input: "gradients/Mean_grad/Reshape"
+  input: "gradients/Mean_grad/Tile/multiples"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tmultiples"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Mean_grad/truediv"
+  op: "RealDiv"
+  input: "gradients/Mean_grad/Tile"
+  input: "gradients/Mean_grad/Cast"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_3_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/Mean_grad/truediv"
+  input: "gradients/Reshape_3_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  op: "ExpandDims"
+  input: "gradients/Reshape_3_grad/Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tdim"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Const"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/begin"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat_1/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_2"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_1"
+  op: "Sub"
+  input: "Rank_2"
+  input: "Sub_1/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_1/begin"
+  op: "Pack"
+  input: "Sub_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_1"
+  op: "Slice"
+  input: "Shape_2"
+  input: "Slice_1/begin"
+  input: "Slice_1/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat_1"
+  op: "ConcatV2"
+  input: "concat_1/values_0"
+  input: "Slice_1"
+  input: "concat_1/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat/axis"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "concat/values_0"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: -1
+      }
+    }
+  }
+}
+node {
+  name: "Slice/size"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 1
+          }
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Sub/y"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "Shape_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank_1"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub"
+  op: "Sub"
+  input: "Rank_1"
+  input: "Sub/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice/begin"
+  op: "Pack"
+  input: "Sub"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice"
+  op: "Slice"
+  input: "Shape_1"
+  input: "Slice/begin"
+  input: "Slice/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "concat"
+  op: "ConcatV2"
+  input: "concat/values_0"
+  input: "Slice"
+  input: "concat/axis"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 2
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\n\000\000\000"
+      }
+    }
+  }
+}
+node {
+  name: "Rank"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 2
+      }
+    }
+  }
+}
+node {
+  name: "Sub_2"
+  op: "Sub"
+  input: "Rank"
+  input: "Sub_2/y"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Slice_2/size"
+  op: "Pack"
+  input: "Sub_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "N"
+    value {
+      i: 1
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: 0
+    }
+  }
+}
+node {
+  name: "Slice_2"
+  op: "Slice"
+  input: "Shape"
+  input: "Slice_2/begin"
+  input: "Slice_2/size"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "Index"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "T"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_biases/read"
+  op: "Identity"
+  input: "logits_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "logits_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+        dim {
+          size: 10
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "logits_weights/read"
+  op: "Identity"
+  input: "logits_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_biases"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_biases/read"
+  op: "Identity"
+  input: "hidden_biases"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "hidden_weights"
+  op: "VariableV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "shape"
+    value {
+      shape {
+        dim {
+          size: 784
+        }
+        dim {
+          size: 100
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "hidden_weights/read"
+  op: "Identity"
+  input: "hidden_weights"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape/shape"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 2
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+          dim {
+            size: 2
+          }
+        }
+        tensor_content: "\310\000\000\000\377\377\377\377"
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/depth"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 10
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/off_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 0
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot/on_value"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_FLOAT
+        tensor_shape {
+        }
+        float_val: 1
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  op: "Const"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "dtype"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "value"
+    value {
+      tensor {
+        dtype: DT_INT32
+        tensor_shape {
+        }
+        int_val: 200
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_1/random_shuffle_queue"
+  op: "RandomShuffleQueueV2"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "capacity"
+    value {
+      i: 20000
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "container"
+    value {
+      s: ""
+    }
+  }
+  attr {
+    key: "min_after_dequeue"
+    value {
+      i: 4000
+    }
+  }
+  attr {
+    key: "seed"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "seed2"
+    value {
+      i: 0
+    }
+  }
+  attr {
+    key: "shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 28
+          }
+          dim {
+            size: 28
+          }
+          dim {
+            size: 1
+          }
+        }
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "shared_name"
+    value {
+      s: ""
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  op: "QueueDequeueManyV2"
+  input: "mnist_dataset_train_1/random_shuffle_queue"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "component_types"
+    value {
+      list {
+        type: DT_FLOAT
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    key: "timeout_ms"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
+  input: "Reshape/shape"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: -1
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul"
+  op: "MatMul"
+  input: "Reshape"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add"
+  op: "Add"
+  input: "MatMul"
+  input: "hidden_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Relu"
+  op: "Relu"
+  input: "add"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "add_1"
+  op: "Add"
+  input: "MatMul_1"
+  input: "logits_biases/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_1"
+  op: "Reshape"
+  input: "add_1"
+  input: "concat"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "mnist_dataset_train_2/one_hot"
+  op: "OneHot"
+  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
+  input: "mnist_dataset_train_2/one_hot/depth"
+  input: "mnist_dataset_train_2/one_hot/on_value"
+  input: "mnist_dataset_train_2/one_hot/off_value"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "TI"
+    value {
+      type: DT_INT64
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          unknown_rank: true
+        }
+      }
+    }
+  }
+  attr {
+    key: "axis"
+    value {
+      i: -1
+    }
+  }
+}
+node {
+  name: "Reshape_2"
+  op: "Reshape"
+  input: "mnist_dataset_train_2/one_hot"
+  input: "concat_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "SoftmaxCrossEntropyWithLogits"
+  op: "SoftmaxCrossEntropyWithLogits"
+  input: "Reshape_1"
+  input: "Reshape_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  op: "PreventGradient"
+  input: "SoftmaxCrossEntropyWithLogits:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "message"
+    value {
+      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
+    }
+  }
+}
+node {
+  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  op: "Mul"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Reshape_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
+  input: "gradients/Reshape_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum_1"
+  input: "gradients/add_1_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Sum"
+  op: "Sum"
+  input: "gradients/Reshape_1_grad/Reshape"
+  input: "gradients/add_1_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_1_grad/Sum"
+  input: "gradients/add_1_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape_1"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_1_grad/Reshape"
+  input: "^gradients/add_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_1_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul_1"
+  op: "MatMul"
+  input: "Relu"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_1_grad/tuple/control_dependency"
+  input: "logits_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul_1"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "logits_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@logits_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+          dim {
+            size: 10
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_1_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/MatMul_1_grad/MatMul"
+  input: "^gradients/MatMul_1_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_1_grad/MatMul"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/Relu_grad/ReluGrad"
+  op: "ReluGrad"
+  input: "gradients/MatMul_1_grad/tuple/control_dependency"
+  input: "Relu"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum_1"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs:1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape_1"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum_1"
+  input: "gradients/add_grad/Shape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Sum"
+  op: "Sum"
+  input: "gradients/Relu_grad/ReluGrad"
+  input: "gradients/add_grad/BroadcastGradientArgs"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/Reshape"
+  op: "Reshape"
+  input: "gradients/add_grad/Sum"
+  input: "gradients/add_grad/Shape"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/Reshape_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape_1"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_biases"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/add_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_biases"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/add_grad/tuple/control_dependency"
+  op: "Identity"
+  input: "gradients/add_grad/Reshape"
+  input: "^gradients/add_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/add_grad/Reshape"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul_1"
+  op: "MatMul"
+  input: "Reshape"
+  input: "gradients/add_grad/tuple/control_dependency"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/MatMul"
+  op: "MatMul"
+  input: "gradients/add_grad/tuple/control_dependency"
+  input: "hidden_weights/read"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+          dim {
+            size: 784
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "transpose_a"
+    value {
+      b: false
+    }
+  }
+  attr {
+    key: "transpose_b"
+    value {
+      b: true
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/group_deps"
+  op: "NoOp"
+  input: "^gradients/MatMul_grad/MatMul"
+  input: "^gradients/MatMul_grad/MatMul_1"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "gradients/MatMul_grad/tuple/control_dependency_1"
+  op: "Identity"
+  input: "gradients/MatMul_grad/MatMul_1"
+  input: "^gradients/MatMul_grad/tuple/group_deps"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@gradients/MatMul_grad/MatMul_1"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: -1
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  op: "ApplyGradientDescent"
+  input: "hidden_weights"
+  input: "GradientDescent/learning_rate"
+  input: "gradients/MatMul_grad/tuple/control_dependency_1"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "_class"
+    value {
+      list {
+        s: "loc:@hidden_weights"
+      }
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 784
+          }
+          dim {
+            size: 100
+          }
+        }
+      }
+    }
+  }
+  attr {
+    key: "use_locking"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "GradientDescent"
+  op: "NoOp"
+  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
+  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_2"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+      }
+    }
+  }
+}
+node {
+  name: "Reshape_3"
+  op: "Reshape"
+  input: "SoftmaxCrossEntropyWithLogits"
+  input: "Slice_2"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tshape"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+          dim {
+            size: 200
+          }
+        }
+      }
+    }
+  }
+}
+node {
+  name: "Mean"
+  op: "Mean"
+  input: "Reshape_3"
+  input: "Const"
+  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "Tidx"
+    value {
+      type: DT_INT32
+    }
+  }
+  attr {
+    key: "_XlaCluster"
+    value {
+      s: "cluster_1"
+    }
+  }
+  attr {
+    key: "_output_shapes"
+    value {
+      list {
+        shape {
+        }
+      }
+    }
+  }
+  attr {
+    key: "keep_dims"
+    value {
+      b: false
+    }
+  }
+}
+node {
+  name: "_send_Mean_0"
+  op: "_Send"
+  input: "Mean"
+  device: "/job:localhost/replica:0/task:0/cpu:0"
+  attr {
+    key: "T"
+    value {
+      type: DT_FLOAT
+    }
+  }
+  attr {
+    key: "client_terminated"
+    value {
+      b: true
+    }
+  }
+  attr {
+    key: "recv_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device"
+    value {
+      s: "/job:localhost/replica:0/task:0/cpu:0"
+    }
+  }
+  attr {
+    key: "send_device_incarnation"
+    value {
+      i: -5924635994370253548
+    }
+  }
+  attr {
+    key: "tensor_name"
+    value {
+      s: "Mean:0"
+    }
+  }
+}
+library {
+}
+versions {
+  producer: 21
+}
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/index.html b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/index.html
new file mode 100644
index 0000000000..2ffb2a1a59
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/index.html
@@ -0,0 +1,75 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="../tf-graph-loader.html">
+<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+<title>TF Graph Loader Demo</title>
+<demo-snippet>
+  <template>
+    <dom-module id="tf-graph-loader-demo">
+      <template>
+        <tf-graph-loader
+            id="loader"
+            datasets="[[_datasets]]"
+            selected-dataset="[[_selectedDataset]]"
+            progress="{{_progress}}">
+        </tf-graph-loader>
+      </template>
+      <script>
+        "use strict";
+
+        Polymer({
+          is: "tf-graph-loader-demo",
+          properties: {
+            // We tell the graph loader to load a specific pbtxt file.
+            _datasets: {
+              type: Array,
+              value: [{
+                "name": "Graph with XLA Clusters Specified",
+                "path": "data/graph.pbtxt"
+              }],
+            },
+            _selectedDataset: {
+              type: Number,
+              value: 0,
+            },
+
+            // This property will be updated by the graph loader.
+            _progress: {
+              type: Object,
+            },
+          },
+          observers: [
+            '_progressUpdated(_progress)',
+          ],
+          _progressUpdated(progress) {
+            // console.log the progress.
+            console.log('Progress updated.', progress);
+
+            // The graph has loaded. console.log it.
+            if (progress.value == 100) {
+              console.log('graph', this.$.loader.outGraph);
+            }
+          },
+        });
+      </script>
+    </dom-module>
+    <!-- The graph loader lacks visual elements. -->
+    <tf-graph-loader-demo></tf-graph-loader-demo>
+  </template>
+</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/index.html b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/index.html
new file mode 100644
index 0000000000..c8e2027f42
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/index.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../tf-graph-loader.html">
+</head>
+<body>
+  <tf-graph-loader id="loader"></tf-graph-loader>
+  <script src="loader.js"></script>
+</body>
+</html>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/loader.ts b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/loader.ts
new file mode 100644
index 0000000000..fcd9f7b529
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/test/loader.ts
@@ -0,0 +1,25 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+suite('graph loader', () => {
+  let assert = chai.assert;
+
+  test('loader exists', () => {
+    assert.isTrue(document.getElementById('loader') != null);
+  });
+
+  // TODO(bp): write tests.
+
+});
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/tf-graph-loader.html b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/tf-graph-loader.html
new file mode 100644
index 0000000000..8d59cbd2aa
--- /dev/null
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/tf-graph-loader.html
@@ -0,0 +1,184 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../tf-graph-common/tf-graph-common.html">
+
+<!--
+An element which provides a filter parsing for pbtxt to graph output.
+-->
+<dom-module id="tf-graph-loader">
+</dom-module>
+
+<script>
+Polymer({
+
+  is: 'tf-graph-loader',
+
+  properties: {
+    /**
+     * @type {value: number, msg: string}
+     *
+     * A number between 0 and 100 denoting the % of progress
+     * for the progress bar and the displayed message.
+     */
+    progress: {
+      type: Object,
+      notify: true,
+    },
+    datasets: Array,
+    selectedDataset: Number,
+    selectedFile: {
+      type: Object,
+      observer: '_selectedFileChanged'
+    },
+    outGraphHierarchy: {
+      type: Object,
+      readOnly: true, //readonly so outsider can't change this via binding
+      notify: true
+    },
+    outGraph: {
+      type: Object,
+      readOnly: true, //readonly so outsider can't change this via binding
+      notify: true
+    },
+    outHierarchyParams: {
+      type: Object,
+      readOnly: true,
+      notify: true
+    },
+    outStats: {
+      type: Object,
+      readOnly: true, // This property produces data.
+      notify: true
+    }
+  },
+  observers: [
+    '_selectedDatasetChanged(selectedDataset, datasets)',
+    '_readAndParseMetadata(selectedMetadataTag)'
+  ],
+  _readAndParseMetadata: function(metadataIndex) {
+    if (metadataIndex == -1 || this.datasets[this.selectedDataset] == null ||
+        this.datasets[this.selectedDataset].runMetadata == null ||
+        this.datasets[this.selectedDataset].runMetadata[metadataIndex] == null) {
+      this._setOutStats(null);
+      return;
+    }
+    var path = this.datasets[this.selectedDataset].runMetadata[metadataIndex].path;
+    // Reset the progress bar to 0.
+    this.set('progress', {
+      value: 0,
+      msg: ''
+    });
+    var tracker = tf.graph.util.getTracker(this);
+    tf.graph.parser.fetchAndParseMetadata(path, tracker)
+    .then(function(stats) {
+      this._setOutStats(stats);
+    }.bind(this));
+  },
+  _parseAndConstructHierarchicalGraph: function(path, pbTxtFile) {
+    // Reset the progress bar to 0.
+    this.set('progress', {
+      value: 0,
+      msg: ''
+    });
+    var tracker = tf.graph.util.getTracker(this);
+    var hierarchyParams = {
+      verifyTemplate: true,
+      // If a set of numbered op nodes has at least this number of nodes
+      // then group them into a series node.
+      seriesNodeMinSize: 5,
+      // A map of series node names to series grouping settings, to indicate
+      // if a series is to be rendered as grouped or ungrouped.
+      // Starts out empty which allows the renderer to decide which series
+      // are initially rendered grouped and which aren't.
+      seriesMap: {},
+    };
+    this._setOutHierarchyParams(hierarchyParams);
+    var dataTracker = tf.graph.util.getSubtaskTracker(tracker, 30, 'Data');
+    tf.graph.parser.fetchAndParseGraphData(path, pbTxtFile, dataTracker)
+    .then(function(graph) {
+      if (!graph) {
+        throw 'The graph is empty. Make sure that the graph is passed to the ' +
+            'SummaryWriter after the graph is defined.';
+      }
+
+      // Build the flat graph (consists only of Op nodes).
+
+      // This is the whitelist of inputs on op types that are considered
+      // reference edges. "Assign 0" indicates that the first input to
+      // an OpNode with operation type "Assign" is a reference edge.
+      var refEdges = {};
+      refEdges["Assign 0"] = true;
+      refEdges["AssignAdd 0"] = true;
+      refEdges["AssignSub 0"] = true;
+      refEdges["assign 0"] = true;
+      refEdges["assign_add 0"] = true;
+      refEdges["assign_sub 0"] = true;
+      refEdges["count_up_to 0"] = true;
+      refEdges["ScatterAdd 0"] = true;
+      refEdges["ScatterSub 0"] = true;
+      refEdges["ScatterUpdate 0"] = true;
+      refEdges["scatter_add 0"] = true;
+      refEdges["scatter_sub 0"] = true;
+      refEdges["scatter_update 0"] = true;
+      var buildParams = {
+        enableEmbedding: true,
+        inEmbeddingTypes: ['Const'],
+        outEmbeddingTypes: ['^[a-zA-Z]+Summary$'],
+        refEdges: refEdges
+      };
+      var graphTracker = tf.graph.util.getSubtaskTracker(tracker, 20, 'Graph');
+      return tf.graph.build(graph, buildParams, graphTracker);
+    })
+    .then(function(graph) {
+      this._setOutGraph(graph);
+      var hierarchyTracker = tf.graph.util.getSubtaskTracker(tracker, 50,
+          'Namespace hierarchy');
+      return tf.graph.hierarchy.build(graph, hierarchyParams, hierarchyTracker);
+    }.bind(this))
+    .then(function(graphHierarchy) {
+      // Update the properties which notify the parent with the
+      // graph hierarchy and whether the data has live stats or not.
+      this._setOutGraphHierarchy(graphHierarchy);
+    }.bind(this))
+    .catch(function(e) {
+      // Generic error catch, for errors that happened outside
+      // asynchronous tasks.
+      tracker.reportError("Graph visualization failed: " + e, e);
+    });
+  },
+  _selectedDatasetChanged: function(datasetIndex, datasets) {
+    this._parseAndConstructHierarchicalGraph(datasets[datasetIndex].path);
+  },
+  _selectedFileChanged: function(e) {
+    if (!e) {
+      return;
+    }
+    var file = e.target.files[0];
+    if (!file) {
+      return;
+    }
+
+    // Clear out the value of the file chooser. This ensures that if the user
+    // selects the same file, we'll re-read it.
+    e.target.value = '';
+
+    this._parseAndConstructHierarchicalGraph(null, file);
+  }
+});
+</script>
-- 
GitLab


From 0a34a7db58276adda9de491a8b83f185fbc30820 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 16:29:14 -0700
Subject: [PATCH 1373/1563] - Enable tf.image.decode_image to decode 4 channel
 PNG images. - Remove lint errors from image_ops_impl.py and
 decode_image_op_test.py - Switch tf-slim tf-example decoder to use
 image_ops.decode_image to handle png & jpg dynamically.

PiperOrigin-RevId: 156120108
---
 .../python/slim/data/tfexample_decoder.py     | 48 +++++-----------
 .../slim/data/tfexample_decoder_test.py       |  4 +-
 .../kernel_tests/decode_image_op_test.py      | 29 +++++-----
 tensorflow/python/ops/image_ops_impl.py       | 57 ++++++++++++++-----
 4 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
index 9e8168dfce..f0e028cd77 100644
--- a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
+++ b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder.py
@@ -291,9 +291,8 @@ class Image(ItemHandler):
       channels: the number of channels in the image.
       dtype: images will be decoded at this bit depth. Different formats
         support different bit depths.
-          See tf.image.decode_png,
+          See tf.image.decode_image,
               tf.decode_raw,
-              tf.image.decode_jpeg: only supports tf.uint8
       repeated: if False, decodes a single image. If True, decodes a
         variable number of image strings from a 1D tensor of strings.
     """
@@ -326,48 +325,29 @@ class Image(ItemHandler):
 
     Args:
       image_buffer: The tensor representing the encoded image tensor.
-      image_format: The image format for the image in `image_buffer`.
+      image_format: The image format for the image in `image_buffer`. If image
+        format is `raw`, all images are expected to be in this format, otherwise
+        this op can decode a mix of `jpg` and `png` formats.
 
     Returns:
       A tensor that represents decoded image of self._shape, or
       (?, ?, self._channels) if self._shape is not specified.
     """
-
-    def decode_png():
-      return image_ops.decode_png(
-          image_buffer, self._channels, dtype=self._dtype)
+    def decode_image():
+      """Decodes a png or jpg based on the headers."""
+      return image_ops.decode_image(image_buffer, self._channels)
 
     def decode_raw():
+      """Decodes a raw image."""
       return parsing_ops.decode_raw(image_buffer, out_type=self._dtype)
 
-    def decode_jpg():
-      if self._dtype != dtypes.uint8:
-        raise ValueError(
-            'jpeg decoder can only be used to decode to tf.uint8 but %s was '
-            'requested for a jpeg image.' % self._dtype)
-      return image_ops.decode_jpeg(image_buffer, self._channels)
-
-    # For RGBA images JPEG is not a valid decoder option.
-    if self._channels > 3:
-      pred_fn_pairs = {
-          math_ops.logical_or(
-              math_ops.equal(image_format, 'raw'),
-              math_ops.equal(image_format, 'RAW')): decode_raw,
-      }
-      default_decoder = decode_png
-    else:
-      pred_fn_pairs = {
-          math_ops.logical_or(
-              math_ops.equal(image_format, 'png'),
-              math_ops.equal(image_format, 'PNG')): decode_png,
-          math_ops.logical_or(
-              math_ops.equal(image_format, 'raw'),
-              math_ops.equal(image_format, 'RAW')): decode_raw,
-      }
-      default_decoder = decode_jpg
-
+    pred_fn_pairs = {
+        math_ops.logical_or(
+            math_ops.equal(image_format, 'raw'),
+            math_ops.equal(image_format, 'RAW')): decode_raw,
+    }
     image = control_flow_ops.case(
-        pred_fn_pairs, default=default_decoder, exclusive=True)
+        pred_fn_pairs, default=decode_image, exclusive=True)
 
     image.set_shape([None, None, self._channels])
     if self._shape is not None:
diff --git a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py
index 6c83f46e11..506f4bd877 100644
--- a/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py
+++ b/tensorflow/contrib/slim/python/slim/data/tfexample_decoder_test.py
@@ -228,9 +228,7 @@ class TFExampleDecoderTest(test.TestCase):
     image_shape = (2, 3, 3)
     unused_image, serialized_example = self.GenerateImage(
         image_format='jpeg', image_shape=image_shape)
-    expected_regex = ('jpeg decoder can only be used to decode to tf.uint8 but '
-                      '.* was requested for a jpeg image.')
-    with self.assertRaisesRegexp(ValueError, expected_regex):
+    with self.assertRaises(TypeError):
       unused_decoded_image = self.RunDecodeExample(
           serialized_example,
           tfexample_decoder.Image(dtype=dtypes.uint16),
diff --git a/tensorflow/python/kernel_tests/decode_image_op_test.py b/tensorflow/python/kernel_tests/decode_image_op_test.py
index 52f48c3368..b457b5cc86 100644
--- a/tensorflow/python/kernel_tests/decode_image_op_test.py
+++ b/tensorflow/python/kernel_tests/decode_image_op_test.py
@@ -36,10 +36,10 @@ class DecodeImageOpTest(test.TestCase):
   def testGif(self):
     # Read some real GIFs
     path = os.path.join(prefix_path, "gif", "testdata", "scan.gif")
-    WIDTH = 20
-    HEIGHT = 40
-    STRIDE = 5
-    shape = (12, HEIGHT, WIDTH, 3)
+    width = 20
+    height = 40
+    stride = 5
+    shape = (12, height, width, 3)
 
     with self.test_session(use_gpu=True) as sess:
       gif0 = io_ops.read_file(path)
@@ -52,13 +52,13 @@ class DecodeImageOpTest(test.TestCase):
 
       for frame_idx, frame in enumerate(image0):
         gt = np.zeros(shape[1:], dtype=np.uint8)
-        start = frame_idx * STRIDE
-        end = (frame_idx + 1) * STRIDE
-        if end <= WIDTH:
+        start = frame_idx * stride
+        end = (frame_idx + 1) * stride
+        if end <= width:
           gt[:, start:end, :] = 255
         else:
-          start -= WIDTH
-          end -= WIDTH
+          start -= width
+          end -= width
           gt[start:end, :, :] = 255
 
         self.assertAllClose(frame, gt)
@@ -79,11 +79,15 @@ class DecodeImageOpTest(test.TestCase):
       self.assertEqual(image0.shape, (256, 128, 3))
       self.assertAllEqual(image0, image1)
 
+      bad_channels = image_ops.decode_image(jpeg0, channels=4)
+      with self.assertRaises(errors_impl.InvalidArgumentError):
+        bad_channels.eval()
+
   def testPng(self):
     # Read some real PNGs, converting to different channel numbers
     inputs = [(1, "lena_gray.png")]
     for channels_in, filename in inputs:
-      for channels in 0, 1, 3:
+      for channels in 0, 1, 3, 4:
         with self.test_session(use_gpu=True) as sess:
           path = os.path.join(prefix_path, "png", "testdata", filename)
           png0 = io_ops.read_file(path)
@@ -100,11 +104,6 @@ class DecodeImageOpTest(test.TestCase):
       with self.assertRaises(errors_impl.InvalidArgumentError):
         decode.eval()
 
-  def testInvalidChannels(self):
-    image_bytes = b"unused"
-    with self.assertRaises(ValueError):
-      decode = image_ops.decode_image(image_bytes, channels=4)
-
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/ops/image_ops_impl.py b/tensorflow/python/ops/image_ops_impl.py
index cf7be5759e..3e140ce047 100644
--- a/tensorflow/python/ops/image_ops_impl.py
+++ b/tensorflow/python/ops/image_ops_impl.py
@@ -32,9 +32,9 @@ from tensorflow.python.ops import clip_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import gen_image_ops
 from tensorflow.python.ops import gen_nn_ops
-from tensorflow.python.ops import string_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import string_ops
 from tensorflow.python.ops import variables
 
 
@@ -619,7 +619,7 @@ def resize_image_with_crop_or_pad(image, target_height, target_width):
   # Make sure our checks come first, so that error messages are clearer.
   if _is_tensor(target_height):
     target_height = control_flow_ops.with_dependencies(
-      assert_ops, target_height)
+        assert_ops, target_height)
   if _is_tensor(target_width):
     target_width = control_flow_ops.with_dependencies(assert_ops, target_width)
 
@@ -698,9 +698,12 @@ def resize_images(images,
 
   `method` can be one of:
 
-  *   <b>`ResizeMethod.BILINEAR`</b>: [Bilinear interpolation.](https://en.wikipedia.org/wiki/Bilinear_interpolation)
-  *   <b>`ResizeMethod.NEAREST_NEIGHBOR`</b>: [Nearest neighbor interpolation.](https://en.wikipedia.org/wiki/Nearest-neighbor_interpolation)
-  *   <b>`ResizeMethod.BICUBIC`</b>: [Bicubic interpolation.](https://en.wikipedia.org/wiki/Bicubic_interpolation)
+  *   <b>`ResizeMethod.BILINEAR`</b>: [Bilinear interpolation.](
+    https://en.wikipedia.org/wiki/Bilinear_interpolation)
+  *   <b>`ResizeMethod.NEAREST_NEIGHBOR`</b>: [Nearest neighbor interpolation.](
+    https://en.wikipedia.org/wiki/Nearest-neighbor_interpolation)
+  *   <b>`ResizeMethod.BICUBIC`</b>: [Bicubic interpolation.](
+    https://en.wikipedia.org/wiki/Bicubic_interpolation)
   *   <b>`ResizeMethod.AREA`</b>: Area interpolation.
 
   Args:
@@ -961,6 +964,7 @@ def adjust_contrast(images, contrast_factor):
 
 def adjust_gamma(image, gamma=1, gain=1):
   """Performs Gamma Correction on the input image.
+
     Also known as Power Law Transform. This function transforms the
     input image pixelwise according to the equation Out = In**gamma
     after scaling each pixel to the range 0 to 1.
@@ -973,6 +977,9 @@ def adjust_gamma(image, gamma=1, gain=1):
   Returns:
     A Tensor. Gamma corrected output image.
 
+  Raises:
+    ValueError: If gamma is negative.
+
   Notes:
     For gamma greater than 1, the histogram will shift towards left and
     the output image will be darker than the input image.
@@ -983,16 +990,17 @@ def adjust_gamma(image, gamma=1, gain=1):
     [1] http://en.wikipedia.org/wiki/Gamma_correction
   """
 
-  with ops.op_scope([image, gamma, gain], None, 'adjust_gamma') as name:
+  with ops.op_scope([image, gamma, gain], None, 'adjust_gamma'):
     # Convert pixel value to DT_FLOAT for computing adjusted image
     img = ops.convert_to_tensor(image, name='img', dtype=dtypes.float32)
     # Keep image dtype for computing the scale of corresponding dtype
     image = ops.convert_to_tensor(image, name='image')
 
     if gamma < 0:
-      raise ValueError("Gamma should be a non-negative real number")
+      raise ValueError('Gamma should be a non-negative real number')
     # scale = max(dtype) - min(dtype)
-    scale = constant_op.constant(image.dtype.limits[1] - image.dtype.limits[0], dtype=dtypes.float32)
+    scale = constant_op.constant(image.dtype.limits[1] - image.dtype.limits[0],
+                                 dtype=dtypes.float32)
     # According to the definition of gamma correction
     adjusted_img = (img / scale) ** gamma * scale * gain
 
@@ -1305,6 +1313,7 @@ def adjust_saturation(image, saturation_factor, name=None):
 
 def decode_image(contents, channels=None, name=None):
   """Convenience function for `decode_gif`, `decode_jpeg`, and `decode_png`.
+
   Detects whether an image is a GIF, JPEG, or PNG, and performs the appropriate
   operation to convert the input bytes `string` into a `Tensor` of type `uint8`.
 
@@ -1324,35 +1333,53 @@ def decode_image(contents, channels=None, name=None):
     `Tensor` with type `uint8` with shape `[height, width, num_channels]` for
       JPEG and PNG images and shape `[num_frames, height, width, 3]` for GIF
       images.
+
+  Raises:
+    ValueError: On incorrect number of channels.
   """
-  with ops.name_scope(name, 'decode_image') as scope:
-    if channels not in (None, 0, 1, 3):
-      raise ValueError('channels must be in (None, 0, 1, 3)')
+  with ops.name_scope(name, 'decode_image'):
+    if channels not in (None, 0, 1, 3, 4):
+      raise ValueError('channels must be in (None, 0, 1, 3, 4)')
     substr = string_ops.substr(contents, 0, 3)
 
     def _gif():
+      """Decodes a GIF image."""
       # Create assert op to check that bytes are GIF decodable
       is_gif = math_ops.equal(substr, b'\x47\x49\x46', name='is_gif')
       decode_msg = 'Unable to decode bytes as JPEG, PNG, or GIF'
       assert_decode = control_flow_ops.Assert(is_gif, [decode_msg])
       # Create assert to make sure that channels is not set to 1
       # Already checked above that channels is in (None, 0, 1, 3)
+
       gif_channels = 0 if channels is None else channels
-      good_channels = math_ops.not_equal(gif_channels, 1, name='check_channels')
+      good_channels = math_ops.logical_and(
+          math_ops.not_equal(gif_channels, 1, name='check_gif_channels'),
+          math_ops.not_equal(gif_channels, 4, name='check_gif_channels')
+      )
       channels_msg = 'Channels must be in (None, 0, 3) when decoding GIF images'
       assert_channels = control_flow_ops.Assert(good_channels, [channels_msg])
       with ops.control_dependencies([assert_decode, assert_channels]):
         return gen_image_ops.decode_gif(contents)
 
     def _png():
+      """Decodes a PNG image."""
       return gen_image_ops.decode_png(contents, channels)
 
     def check_png():
+      """Checks if an image is PNG."""
       is_png = math_ops.equal(substr, b'\211PN', name='is_png')
       return control_flow_ops.cond(is_png, _png, _gif, name='cond_png')
 
     def _jpeg():
-      return gen_image_ops.decode_jpeg(contents, channels)
+      """Decodes a jpeg image."""
+      jpeg_channels = 0 if channels is None else channels
+      good_channels = math_ops.not_equal(jpeg_channels, 4,
+                                         name='check_jpeg_channels')
+      channels_msg = ('Channels must be in (None, 0, 1, 3) when decoding JPEG '
+                      'images')
+      assert_channels = control_flow_ops.Assert(good_channels, [channels_msg])
+      with ops.control_dependencies([assert_channels]):
+        return gen_image_ops.decode_jpeg(contents, channels)
 
     # Decode normal JPEG images (start with \xff\xd8\xff\xe0)
     # as well as JPEG images with EXIF data (start with \xff\xd8\xff\xe1).
@@ -1424,7 +1451,7 @@ def total_variation(images, name=None):
 
     # Calculate the total variation by taking the absolute value of the
     # pixel-differences and summing over the appropriate axis.
-    tot_var = math_ops.reduce_sum(math_ops.abs(pixel_dif1), axis=sum_axis) + \
-              math_ops.reduce_sum(math_ops.abs(pixel_dif2), axis=sum_axis)
+    tot_var = (math_ops.reduce_sum(math_ops.abs(pixel_dif1), axis=sum_axis) +
+               math_ops.reduce_sum(math_ops.abs(pixel_dif2), axis=sum_axis))
 
   return tot_var
-- 
GitLab


From 7c1339e32d7c8c3b95fbb11799bcef4795a9b72a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 16:35:55 -0700
Subject: [PATCH 1374/1563] Fix some unused variable warnings when
 IS_MOBILE_PLATFORM is defined.

PiperOrigin-RevId: 156120864
---
 tensorflow/core/common_runtime/simple_graph_execution_state.cc | 3 ++-
 tensorflow/core/kernels/lrn_op.cc                              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/common_runtime/simple_graph_execution_state.cc b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
index 47cf29d403..3806f9f47f 100644
--- a/tensorflow/core/common_runtime/simple_graph_execution_state.cc
+++ b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
@@ -236,11 +236,12 @@ Status SimpleGraphExecutionState::InitBaseGraph(
     const BuildGraphOptions& options) {
   const GraphDef* graph_def = &original_graph_def_;
 
+#ifndef IS_MOBILE_PLATFORM
   GraphDef optimized_graph;
+
   const RewriterConfig& rewrite_options =
       session_options_->config.graph_options().rewrite_options();
 
-#ifndef IS_MOBILE_PLATFORM
   if (grappler::MetaOptimizerEnabled(rewrite_options)) {
     // Adding this functionalty in steps. The first step is to make sure
     // we don't break dependencies. The second step will be to turn the
diff --git a/tensorflow/core/kernels/lrn_op.cc b/tensorflow/core/kernels/lrn_op.cc
index 3435486c95..c905ebc84a 100644
--- a/tensorflow/core/kernels/lrn_op.cc
+++ b/tensorflow/core/kernels/lrn_op.cc
@@ -79,11 +79,11 @@ struct LaunchLRN<CPUDevice, T> {
     const int rows = static_cast<int>(in.dim_size(1));
     const int cols = static_cast<int>(in.dim_size(2));
     const int depth = static_cast<int>(in.dim_size(3));
-    const int nodes = cols * rows;
 
 #if defined(IS_MOBILE_PLATFORM)
     SingleThreadedLRN(in, batch, rows, cols, depth, output);
 #else
+    const int nodes = cols * rows;
     if (depth > kSingleThreadedLRNDepthCutoff &&
         (beta_ == T(0.5) || beta_ == T(1))) {
       SingleThreadedLRN(in, batch, rows, cols, depth, output);
-- 
GitLab


From a8b19784a7a3f2b21ea604571cb09b11c1d272e8 Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Mon, 15 May 2017 16:47:43 -0700
Subject: [PATCH 1375/1563] Fix graph rendering in d3v4.

Note, there are still some bugs with layout/rendering (e.g. try to open/close a node group and things get weird.)

PiperOrigin-RevId: 156122210
---
 .../tf_graph_common_d3v4/annotation.ts        | 18 ++++++---------
 .../components/tf_graph_common_d3v4/scene.ts  | 22 +++++++++----------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts
index 6db0cd5519..bde3829778 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/annotation.ts
@@ -75,9 +75,7 @@ module tf.graph.scene.annotation {
             addAnnotationLabel(
                 aGroup, a.node.name, a, Class.Annotation.ELLIPSIS);
           }
-        });
-
-    annotationGroups
+        }).merge(annotationGroups)
         .attr(
             'class',
             a => {
@@ -202,20 +200,18 @@ function update(aGroup, d: render.RenderNodeInfo, a: render.Annotation,
   }
 
   // label position
-  aGroup.select('text.' + Class.Annotation.LABEL).transition().attr({
-    x: cx + a.dx + (a.isIn ? -1 : 1) * (a.width / 2 + a.labelOffset),
-    y: d.y + a.dy
-  });
+  aGroup.select('text.' + Class.Annotation.LABEL).transition()
+    .attr('x', cx + a.dx + (a.isIn ? -1 : 1) * (a.width / 2 + a.labelOffset))
+    .attr('y', d.y + a.dy);
 
   // Some annotations (such as summary) are represented using a 12x12 image tag.
   // Purposely omitted units (e.g. pixels) since the images are vector graphics.
   // If there is an image, we adjust the location of the image to be vertically
   // centered with the node and horizontally centered between the arrow and the
   // text label.
-  aGroup.select('use.summary').transition().attr({
-    x: cx + a.dx - 3,
-    y: d.y + a.dy - 6
-  });
+  aGroup.select('use.summary').transition()
+    .attr('x', cx + a.dx - 3)
+    .attr('y', d.y + a.dy - 6);
 
   // Node position (only one of the shape selection will be non-empty.)
   positionEllipse(
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
index 06f03e910a..023bc161f5 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
@@ -453,12 +453,11 @@ export function translate(selection, x0: number, y0: number) {
  */
 export function positionRect(rect, cx: number, cy: number, width: number,
     height: number) {
-  rect.transition().attr({
-    x: cx - width / 2,
-    y: cy - height / 2,
-    width: width,
-    height: height
-  });
+  rect.transition()
+    .attr('x', cx - width / 2)
+    .attr('y', cy - height / 2)
+    .attr('width', width)
+    .attr('height', height);
 };
 
 /**
@@ -499,12 +498,11 @@ export function positionButton(button, renderNode: render.RenderNodeInfo) {
  */
 export function positionEllipse(ellipse, cx: number, cy: number,
     width: number, height: number) {
-  ellipse.transition().attr({
-    cx: cx,
-    cy: cy,
-    rx: width / 2,
-    ry: height / 2
-  });
+  ellipse.transition()
+    .attr('cx', cx)
+    .attr('cy', cy)
+    .attr('rx', width / 2)
+    .attr('ry', height / 2);
 };
 
 /**
-- 
GitLab


From 60ee61b084f764da0fa67ed74d8458ca2f2150f0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 16:56:56 -0700
Subject: [PATCH 1376/1563] Automated g4 rollback of changelist 156112836

PiperOrigin-RevId: 156123287
---
 tensorflow/BUILD                              |   1 -
 tensorflow/core/BUILD                         |   1 -
 tensorflow/core/kernels/neon/BUILD            |  43 --
 .../core/kernels/neon/depthwiseconv_float.h   | 725 ------------------
 .../kernels/neon/neon_depthwise_conv_op.cc    | 200 -----
 tensorflow/core/kernels/neon/types.h          |  71 --
 tensorflow/python/kernel_tests/BUILD          |  15 -
 .../neon_depthwise_conv_op_test.py            | 287 -------
 8 files changed, 1343 deletions(-)
 delete mode 100644 tensorflow/core/kernels/neon/BUILD
 delete mode 100644 tensorflow/core/kernels/neon/depthwiseconv_float.h
 delete mode 100644 tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
 delete mode 100644 tensorflow/core/kernels/neon/types.h
 delete mode 100644 tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index a3c0bd9a5b..503ad79a38 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -285,7 +285,6 @@ filegroup(
         "//tensorflow/core/grappler/utils:all_files",
         "//tensorflow/core/kernels:all_files",
         "//tensorflow/core/kernels/hexagon:all_files",
-        "//tensorflow/core/kernels/neon:all_files",
         "//tensorflow/core/ops/compat:all_files",
         "//tensorflow/core/platform/cloud:all_files",
         "//tensorflow/core/platform/default/build_config:all_files",
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 28ef29d563..a0d56df4aa 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -737,7 +737,6 @@ cc_library(
         "//tensorflow/core/kernels:array_not_windows",
         "//tensorflow/core/kernels:math_not_windows",
         "//tensorflow/core/kernels:quantized_ops",
-        "//tensorflow/core/kernels/neon:neon_depthwise_conv_op",
     ]) + if_mkl([
         "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
diff --git a/tensorflow/core/kernels/neon/BUILD b/tensorflow/core/kernels/neon/BUILD
deleted file mode 100644
index 7641516e3b..0000000000
--- a/tensorflow/core/kernels/neon/BUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Description:
-# Kernel implementations using Neon intrinsics.
-#
-package(
-    default_visibility = ["//visibility:public"],
-    features = ["-parse_headers"],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-load(
-    "//tensorflow:tensorflow.bzl",
-    "tf_kernel_library",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-tf_kernel_library(
-    name = "neon_depthwise_conv_op",
-    hdrs = [
-        "depthwiseconv_float.h",
-        "types.h",
-    ],
-    prefix = "neon_depthwise_conv_op",
-    deps = [
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:framework",
-        "//tensorflow/core:lib",
-        "//tensorflow/core:nn_ops_op_lib",
-        "//tensorflow/core/kernels:ops_util",
-        "@gemmlowp//:gemmlowp",
-    ],
-)
diff --git a/tensorflow/core/kernels/neon/depthwiseconv_float.h b/tensorflow/core/kernels/neon/depthwiseconv_float.h
deleted file mode 100644
index acd58a644f..0000000000
--- a/tensorflow/core/kernels/neon/depthwiseconv_float.h
+++ /dev/null
@@ -1,725 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
-#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
-
-#include "public/gemmlowp.h"
-#include "tensorflow/core/kernels/neon/types.h"
-
-#if defined(__ARM_NEON__) || defined(__ARM_NEON)
-#define USE_NEON
-#include <arm_neon.h>
-#endif
-
-namespace tensorflow {
-namespace neon {
-
-// Implementation of float DepthwiseConv
-
-template <bool kAllowStrided, int kFixedInputDepth, int kFixedDepthMultiplier>
-struct FloatDepthwiseConvKernel {};
-
-#ifdef USE_NEON
-
-template <>
-struct FloatDepthwiseConvKernel<false, 8, 1> {
-  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
-                  const float* input_ptr, int input_ptr_increment,
-                  const float* filter_ptr, float* acc_buffer_ptr) {
-    // Load the filters
-    float32x4_t filter[2];
-    for (int i = 0; i < 2; i++) {
-      filter[i] = vld1q_f32(filter_ptr + 4 * i);
-    }
-    int outp = 0;
-    // Handle 2 output pixels at a time.
-    for (; outp <= num_output_pixels - 2; outp += 2) {
-      // Load the inputs
-      float32x4_t input[4];
-      for (int i = 0; i < 4; i++) {
-        input[i] = vld1q_f32(input_ptr + 4 * i);
-      }
-      input_ptr += 16;
-      // Load the accumulators from acc_buffer
-      float32x4_t acc[4];
-      for (int i = 0; i < 4; i++) {
-        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-      }
-      // Multiply-accumulate
-      acc[0] = vmlaq_f32(acc[0], input[0], filter[0]);
-      acc[1] = vmlaq_f32(acc[1], input[1], filter[1]);
-      acc[2] = vmlaq_f32(acc[2], input[2], filter[0]);
-      acc[3] = vmlaq_f32(acc[3], input[3], filter[1]);
-      // Store the accumulators back to acc_buffer
-      for (int i = 0; i < 4; i++) {
-        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-      }
-      acc_buffer_ptr += 16;
-    }
-    // Handle one output pixel at a time.
-    for (; outp < num_output_pixels; outp++) {
-      // Load the inputs
-      float32x4_t input[2];
-      for (int i = 0; i < 2; i++) {
-        input[i] = vld1q_f32(input_ptr + 4 * i);
-      }
-      input_ptr += 8;
-      // Load the accumulators from acc_buffer
-      float32x4_t acc[2];
-      for (int i = 0; i < 2; i++) {
-        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-      }
-      // Multiply-accumulate
-      for (int i = 0; i < 2; i++) {
-        acc[i] = vmlaq_f32(acc[i], input[i], filter[i]);
-      }
-      // Store the accumulators back to acc_buffer
-      for (int i = 0; i < 2; i++) {
-        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-      }
-      acc_buffer_ptr += 8;
-    }
-  }
-};
-
-template <>
-struct FloatDepthwiseConvKernel<false, 2, 1> {
-  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
-                  const float* input_ptr, int input_ptr_increment,
-                  const float* filter_ptr, float* acc_buffer_ptr) {
-    const float32x2_t filters = vld1_f32(filter_ptr);
-    const float32x4_t filters_dup2 = vcombine_f32(filters, filters);
-    int outp = 0;
-    // Handle 8 output pixels at a time.
-    for (; outp <= num_output_pixels - 8; outp += 8) {
-      // Load the inputs
-      float32x4_t input[4];
-      for (int i = 0; i < 4; i++) {
-        input[i] = vld1q_f32(input_ptr + 4 * i);
-      }
-      input_ptr += 16;
-      // Load the accumulators from acc_buffer
-      float32x4_t acc[4];
-      for (int i = 0; i < 4; i++) {
-        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-      }
-      // Multiply-accumulate
-      for (int i = 0; i < 4; i++) {
-        acc[i] = vmlaq_f32(acc[i], input[i], filters_dup2);
-      }
-      // Store the accumulators back to acc_buffer
-      for (int i = 0; i < 4; i++) {
-        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-      }
-      acc_buffer_ptr += 16;
-    }
-    // Handle 4 output pixels at a time.
-    for (; outp <= num_output_pixels - 4; outp += 4) {
-      // Load the inputs
-      float32x4_t input[2];
-      for (int i = 0; i < 2; i++) {
-        input[i] = vld1q_f32(input_ptr + 4 * i);
-      }
-      input_ptr += 8;
-      // Load the accumulators from acc_buffer
-      float32x4_t acc[2];
-      for (int i = 0; i < 2; i++) {
-        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-      }
-      // Multiply-accumulate
-      for (int i = 0; i < 2; i++) {
-        acc[i] = vmlaq_f32(acc[i], input[i], filters_dup2);
-      }
-      // Store the accumulators back to acc_buffer
-      for (int i = 0; i < 2; i++) {
-        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-      }
-      acc_buffer_ptr += 8;
-    }
-    // Handle 2 output pixels at a time.
-    for (; outp <= num_output_pixels - 2; outp += 2) {
-      // Load the inputs
-      const float32x4_t input = vld1q_f32(input_ptr);
-      input_ptr += 4;
-      // Load the accumulators from acc_buffer
-      float32x4_t acc = vld1q_f32(acc_buffer_ptr);
-      // Multiply-accumulate
-      acc = vmlaq_f32(acc, input, filters_dup2);
-      // Store the accumulators back to acc_buffer
-      vst1q_f32(acc_buffer_ptr, acc);
-      acc_buffer_ptr += 4;
-    }
-    // Handle 1 output pixel at a time
-    for (; outp < num_output_pixels; outp++) {
-      // Load the inputs
-      const float32x2_t input = vld1_f32(input_ptr);
-      input_ptr += 2;
-      // Load the accumulators from acc_buffer
-      float32x2_t acc = vld1_f32(acc_buffer_ptr);
-      // Multiply-accumulate
-      acc = vmla_f32(acc, input, filters);
-      // Store the accumulators back to acc_buffer
-      vst1_f32(acc_buffer_ptr, acc);
-      acc_buffer_ptr += 2;
-    }
-  }
-};
-
-template <>
-struct FloatDepthwiseConvKernel<true, 0, 1> {
-  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
-                  const float* input_ptr, int input_ptr_increment,
-                  const float* filter_ptr, float* acc_buffer_ptr) {
-    // Handle one output pixel at a time.
-    for (int outp = 0; outp < num_output_pixels; outp++) {
-      const float* local_filter_ptr = filter_ptr;
-      const float* local_input_ptr = input_ptr;
-      int ic = 0;
-      // Handle 16 input channels at a time.
-      for (; ic <= input_depth - 16; ic += 16) {
-        // Load the filters
-        float32x4_t filter[4];
-        for (int i = 0; i < 4; i++) {
-          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
-        }
-        local_filter_ptr += 16;
-        // Load the inputs
-        float32x4_t input[4];
-        for (int i = 0; i < 4; i++) {
-          input[i] = vld1q_f32(local_input_ptr + 4 * i);
-        }
-        local_input_ptr += 16;
-        // Load the accumulators from acc_buffer
-        float32x4_t acc[4];
-        for (int i = 0; i < 4; i++) {
-          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-        }
-        // Multiply-accumulate
-        for (int i = 0; i < 4; i++) {
-          acc[i] = vmlaq_f32(acc[i], input[i], filter[i]);
-        }
-        // Store the accumulators back to acc_buffer
-        for (int i = 0; i < 4; i++) {
-          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-        }
-        acc_buffer_ptr += 16;
-      }
-      // Handle 4 input channels at a time.
-      for (; ic <= input_depth - 4; ic += 4) {
-        // Load the filters
-        float32x4_t filter;
-        filter = vld1q_f32(local_filter_ptr);
-        local_filter_ptr += 4;
-        // Load the inputs
-        float32x4_t input;
-        input = vld1q_f32(local_input_ptr);
-        local_input_ptr += 4;
-        // Load the accumulators from acc_buffer
-        float32x4_t acc;
-        acc = vld1q_f32(acc_buffer_ptr);
-        // Multiply-accumulate
-        acc = vmlaq_f32(acc, input, filter);
-        // Store the accumulators back to acc_buffer
-        vst1q_f32(acc_buffer_ptr, acc);
-        acc_buffer_ptr += 4;
-      }
-      // Handle one input channel at a time.
-      for (; ic < input_depth; ic++) {
-        const float input_val = *local_input_ptr++;
-        const float filter_val = *local_filter_ptr++;
-        *acc_buffer_ptr++ += filter_val * input_val;
-      }
-      input_ptr += input_ptr_increment;
-    }
-  }
-};
-
-template <>
-struct FloatDepthwiseConvKernel<true, 0, 8> {
-  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
-                  const float* input_ptr, int input_ptr_increment,
-                  const float* filter_ptr, float* acc_buffer_ptr) {
-    // Handle one output pixel at a time.
-    for (int outp = 0; outp < num_output_pixels; outp++) {
-      const float* local_filter_ptr = filter_ptr;
-      const float* local_input_ptr = input_ptr;
-      int ic = 0;
-      // Handle 2 input channels at a time.
-      for (; ic <= input_depth - 2; ic += 2) {
-        // Load the filters
-        float32x4_t filter[4];
-        for (int i = 0; i < 4; i++) {
-          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
-        }
-        local_filter_ptr += 16;
-        // Load the inputs
-        const float32x2_t input = vld1_f32(local_input_ptr);
-        local_input_ptr += 2;
-        // Load the accumulators from acc_buffer
-        float32x4_t acc[4];
-        for (int i = 0; i < 4; i++) {
-          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-        }
-        // Multiply-accumulate
-        acc[0] = vmlaq_lane_f32(acc[0], filter[0], input, 0);
-        acc[1] = vmlaq_lane_f32(acc[1], filter[1], input, 0);
-        acc[2] = vmlaq_lane_f32(acc[2], filter[2], input, 1);
-        acc[3] = vmlaq_lane_f32(acc[3], filter[3], input, 1);
-        // Store the accumulators back to acc_buffer
-        for (int i = 0; i < 4; i++) {
-          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-        }
-        acc_buffer_ptr += 16;
-      }
-      // Handle one input channel at a time.
-      for (; ic < input_depth; ic++) {
-        // Load the filters
-        float32x4_t filter[2];
-        for (int i = 0; i < 2; i++) {
-          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
-        }
-        local_filter_ptr += 8;
-        // Load the inputs
-        const float input_val = *local_input_ptr++;
-        // Load the accumulators from acc_buffer
-        float32x4_t acc[2];
-        for (int i = 0; i < 2; i++) {
-          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-        }
-        // Multiply-accumulate
-        for (int i = 0; i < 2; i++) {
-          acc[i] = vmlaq_n_f32(acc[i], filter[i], input_val);
-        }
-        // Store the accumulators back to acc_buffer
-        for (int i = 0; i < 2; i++) {
-          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-        }
-        acc_buffer_ptr += 8;
-      }
-      input_ptr += input_ptr_increment;
-    }
-  }
-};
-
-template <>
-struct FloatDepthwiseConvKernel<true, 0, 2> {
-  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
-                  const float* input_ptr, int input_ptr_increment,
-                  const float* filter_ptr, float* acc_buffer_ptr) {
-    // Handle one output pixel at a time.
-    for (int outp = 0; outp < num_output_pixels; outp++) {
-      const float* local_filter_ptr = filter_ptr;
-      const float* local_input_ptr = input_ptr;
-      int ic = 0;
-      // Handle 8 input channels at a time.
-      for (; ic <= input_depth - 8; ic += 8) {
-        // Load the filters
-        float32x4_t filter[4];
-        for (int i = 0; i < 4; i++) {
-          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
-        }
-        local_filter_ptr += 16;
-        // Load the inputs
-        float32x4x2_t input_dup2[2];
-        for (int i = 0; i < 2; i++) {
-          const float32x4_t input = vld1q_f32(local_input_ptr + 4 * i);
-          input_dup2[i] = vzipq_f32(input, input);
-        }
-        local_input_ptr += 8;
-        // Load the accumulators from acc_buffer
-        float32x4_t acc[4];
-        for (int i = 0; i < 4; i++) {
-          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
-        }
-        // Multiply-accumulate
-        acc[0] = vmlaq_f32(acc[0], filter[0], input_dup2[0].val[0]);
-        acc[1] = vmlaq_f32(acc[1], filter[1], input_dup2[0].val[1]);
-        acc[2] = vmlaq_f32(acc[2], filter[2], input_dup2[1].val[0]);
-        acc[3] = vmlaq_f32(acc[3], filter[3], input_dup2[1].val[1]);
-        // Store the accumulators back to acc_buffer
-        for (int i = 0; i < 4; i++) {
-          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
-        }
-        acc_buffer_ptr += 16;
-      }
-      // Handle 4 input channels at a time.
-      for (; ic <= input_depth - 4; ic += 4) {
-        // Load the filters
-        float32x2_t filter[4];
-        for (int i = 0; i < 4; i++) {
-          filter[i] = vld1_f32(local_filter_ptr + 2 * i);
-        }
-        local_filter_ptr += 8;
-        // Load the inputs
-        const float32x4_t input = vld1q_f32(local_input_ptr);
-        local_input_ptr += 4;
-        // Load the accumulators from acc_buffer
-        float32x2_t acc[4];
-        for (int i = 0; i < 4; i++) {
-          acc[i] = vld1_f32(acc_buffer_ptr + 2 * i);
-        }
-        // Multiply-accumulate
-        acc[0] = vmla_lane_f32(acc[0], filter[0], vget_low_f32(input), 0);
-        acc[1] = vmla_lane_f32(acc[1], filter[1], vget_low_f32(input), 1);
-        acc[2] = vmla_lane_f32(acc[2], filter[2], vget_high_f32(input), 0);
-        acc[3] = vmla_lane_f32(acc[3], filter[3], vget_high_f32(input), 1);
-        // Store the accumulators back to acc_buffer
-        for (int i = 0; i < 4; i++) {
-          vst1_f32(acc_buffer_ptr + 2 * i, acc[i]);
-        }
-        acc_buffer_ptr += 8;
-      }
-      // Handle 2 input channels at a time.
-      for (; ic <= input_depth - 2; ic += 2) {
-        // Load the filters
-        const float32x4_t filter = vld1q_f32(local_filter_ptr);
-        local_filter_ptr += 4;
-        // Load the inputs
-        const float32x2_t input = vld1_f32(local_input_ptr);
-        local_input_ptr += 2;
-        // Load the accumulators from acc_buffer
-        float32x2_t acc[2];
-        for (int i = 0; i < 2; i++) {
-          acc[i] = vld1_f32(acc_buffer_ptr + 2 * i);
-        }
-        // Multiply-accumulate
-        acc[0] = vmla_lane_f32(acc[0], vget_low_f32(filter), input, 0);
-        acc[1] = vmla_lane_f32(acc[1], vget_high_f32(filter), input, 1);
-        // Store the accumulators back to acc_buffer
-        for (int i = 0; i < 2; i++) {
-          vst1_f32(acc_buffer_ptr + 2 * i, acc[i]);
-        }
-        acc_buffer_ptr += 4;
-      }
-      // Handle one input channel at a time.
-      for (; ic < input_depth; ic++) {
-        // Load the inputs
-        const float input_val = *local_input_ptr++;
-        // Multiply-accumulate
-        for (int i = 0; i < 2; i++) {
-          acc_buffer_ptr[i] += local_filter_ptr[i] * input_val;
-        }
-        local_filter_ptr += 2;
-        acc_buffer_ptr += 2;
-      }
-      input_ptr += input_ptr_increment;
-    }
-  }
-};
-#endif
-
-// Accumulates the effect of one row of the filter, on a segment of one row
-// of the output, accessing the corresponding one row of the input.
-template <bool kAllowStrided, int kFixedInputDepth, int kFixedDepthMultiplier>
-void FloatDepthwiseConvAccumRow(int stride, int input_depth, int input_width,
-                                const float* input_data, int pad_width,
-                                int depth_multiplier, int filter_width,
-                                const float* filter_data,
-                                int out_x_buffer_start, int out_x_buffer_end,
-                                int output_depth, float* acc_buffer) {
-#ifdef GEMMLOWP_PROFILING
-  gemmlowp::ScopedProfilingLabel label(__PRETTY_FUNCTION__);
-#endif
-  // Sanity check parameters. This is important in particular to ensure
-  // that we keep the number of template instantiations minimal, so we don't
-  // increase binary size unnecessarily.
-  static_assert(kFixedDepthMultiplier || !kFixedInputDepth, "");
-  static_assert(kFixedInputDepth || kAllowStrided, "");
-  DCHECK(stride == 1 || kAllowStrided);
-  if (kFixedInputDepth) {
-    DCHECK_EQ(input_depth, kFixedInputDepth);
-  }
-  if (kFixedDepthMultiplier) {
-    DCHECK_EQ(depth_multiplier, kFixedDepthMultiplier);
-  }
-  DCHECK_EQ(output_depth, input_depth * depth_multiplier);
-  const int input_ptr_increment = stride * input_depth;
-  const float* filter_base_ptr = filter_data;
-  for (int filter_x = 0; filter_x < filter_width; ++filter_x) {
-    // For the current (filter_x, filter_y) point in the filter,
-    // compute the boundaries of the corresponding output row segment.
-    int out_x_loop_start_unclampled = 0;
-    int out_x_loop_end_unclampled = 0;
-    if (kAllowStrided) {
-      if (stride == 2) {
-        out_x_loop_start_unclampled = (pad_width - filter_x + 1) / 2;
-        out_x_loop_end_unclampled =
-            (pad_width + input_width - filter_x + 1) / 2;
-      } else if (stride == 4) {
-        out_x_loop_start_unclampled = (pad_width - filter_x + 3) / 4;
-        out_x_loop_end_unclampled =
-            (pad_width + input_width - filter_x + 3) / 4;
-      } else {
-        out_x_loop_start_unclampled =
-            (pad_width - filter_x + stride - 1) / stride;
-        out_x_loop_end_unclampled =
-            (pad_width + input_width - filter_x + stride - 1) / stride;
-      }
-    } else {
-      out_x_loop_start_unclampled = pad_width - filter_x;
-      out_x_loop_end_unclampled = pad_width + input_width - filter_x;
-    }
-    // The kernel will have to iterate on the segment of the
-    // output row that starts at out_x_loop_start and out_x_loop_end.
-    const int out_x_loop_start =
-        std::max(out_x_buffer_start, out_x_loop_start_unclampled);
-    const int out_x_loop_end =
-        std::min(out_x_buffer_end, out_x_loop_end_unclampled);
-
-    float* acc_buffer_ptr =
-        acc_buffer + (out_x_loop_start - out_x_buffer_start) * output_depth;
-    const int in_x_origin = (out_x_loop_start * stride) - pad_width + filter_x;
-    const float* input_ptr = input_data + in_x_origin * input_depth;
-    const int num_output_pixels = out_x_loop_end - out_x_loop_start;
-    FloatDepthwiseConvKernel<kAllowStrided, kFixedInputDepth,
-                             kFixedDepthMultiplier>::Run(num_output_pixels,
-                                                         input_depth,
-                                                         depth_multiplier,
-                                                         input_ptr,
-                                                         input_ptr_increment,
-                                                         filter_base_ptr,
-                                                         acc_buffer_ptr);
-    filter_base_ptr += output_depth;
-  }
-}
-
-// generic fallback of FloatDepthwiseConvAccumRow, portable, non-templatized.
-inline void FloatDepthwiseConvAccumRowGeneric(
-    int stride, int input_depth, int input_width, const float* input_data,
-    int pad_width, int depth_multiplier, int filter_width,
-    const float* filter_data, int out_x_buffer_start, int out_x_buffer_end,
-    int output_depth, float* acc_buffer) {
-  gemmlowp::ScopedProfilingLabel label("DepthwiseConvAccumRowGeneric (slow)");
-
-  VLOG(1) << "DepthwiseConv2d using slow path with "
-          << "stride = " << stride << ", "
-          << "input_depth = " << input_depth << ", "
-          << "depth_multiplier = " << depth_multiplier << ".";
-
-  const float* filter_base_ptr = filter_data;
-  for (int filter_x = 0; filter_x < filter_width; ++filter_x) {
-    const int out_x_loop_start = std::max(
-        out_x_buffer_start, (pad_width - filter_x + stride - 1) / stride);
-    const int out_x_loop_end =
-        std::min(out_x_buffer_end,
-                 (pad_width + input_width - filter_x + stride - 1) / stride);
-
-    float* acc_buffer_ptr =
-        acc_buffer + (out_x_loop_start - out_x_buffer_start) * output_depth;
-    const int in_x_origin = (out_x_loop_start * stride) - pad_width + filter_x;
-    const float* input_ptr = input_data + in_x_origin * input_depth;
-    const int input_ptr_increment = (stride - 1) * input_depth;
-    for (int out_x = out_x_loop_start; out_x < out_x_loop_end; out_x++) {
-      const float* filter_ptr = filter_base_ptr;
-      for (int ic = 0; ic < input_depth; ++ic) {
-        const float input_val = *input_ptr++;
-        for (int m = 0; m < depth_multiplier; m++) {
-          const float filter_val = *filter_ptr++;
-          *acc_buffer_ptr++ += filter_val * input_val;
-        }
-      }
-      input_ptr += input_ptr_increment;
-    }
-    filter_base_ptr += output_depth;
-  }
-}
-
-// Initializes the accumulator buffer with bias values.
-inline void DepthwiseConvInitAccBuffer(int num_output_pixels, int output_depth,
-                                       const float* bias_data,
-                                       float* acc_buffer) {
-  // TODO(benoitjacob): This might need optimized specializations
-  // for small output_depth values, if that ever becomes an important
-  // case (like it was for some quantized DepthwiseConv cases).
-  for (int i = 0; i < num_output_pixels; i++) {
-    memcpy(acc_buffer + i * output_depth, bias_data,
-           sizeof(acc_buffer[0]) * output_depth);
-  }
-}
-
-template <FusedActivationFunctionType Ac>
-void DepthwiseConv(const float* input_data, const Dims<4>& input_dims,
-                   const float* filter_data, const Dims<4>& filter_dims,
-                   const float* bias_data, const Dims<4>& bias_dims, int stride,
-                   int pad_width, int pad_height, int depth_multiplier,
-                   float* output_data, const Dims<4>& output_dims) {
-  gemmlowp::ScopedProfilingLabel label("DepthwiseConv");
-  static_assert(Ac == FusedActivationFunctionType::kNone ||
-                    Ac == FusedActivationFunctionType::kRelu ||
-                    Ac == FusedActivationFunctionType::kRelu6 ||
-                    Ac == FusedActivationFunctionType::kRelu1,
-                "");
-  const int batches = MatchingArraySize(input_dims, 3, output_dims, 3);
-  const int output_depth = MatchingArraySize(filter_dims, 0, output_dims, 0);
-  const int input_height = ArraySize(input_dims, 2);
-  const int input_width = ArraySize(input_dims, 1);
-  const int input_depth = ArraySize(input_dims, 0);
-  const int filter_height = ArraySize(filter_dims, 2);
-  const int filter_width = ArraySize(filter_dims, 1);
-  const int output_height = ArraySize(output_dims, 2);
-  const int output_width = ArraySize(output_dims, 1);
-  DCHECK(output_depth == input_depth * depth_multiplier);
-
-  static const int kAccBufferMaxSize = 1024;
-  float acc_buffer[kAccBufferMaxSize];
-  DCHECK_GE(kAccBufferMaxSize, output_depth)
-      << "Too small kAccBufferMaxSize for this model!";
-  const int kOutputPixelsInAccBuffer = kAccBufferMaxSize / output_depth;
-  const int kAccBufferActualSize = kOutputPixelsInAccBuffer * output_depth;
-  DCHECK_LE(kOutputPixelsInAccBuffer * output_depth, kAccBufferActualSize);
-  DCHECK_LE(kAccBufferActualSize, kAccBufferMaxSize);
-  DCHECK_GE(kOutputPixelsInAccBuffer, 1);
-
-  // row_accum_func will point to the core accumulation function to be used
-  // for this DepthwiseConv op.
-  auto* row_accum_func = FloatDepthwiseConvAccumRowGeneric;
-
-  const int kMaxFixedDepthMultiplier = 8;
-  int fixed_depth_multiplier = 0;
-  if (depth_multiplier <= kMaxFixedDepthMultiplier) {
-    fixed_depth_multiplier = depth_multiplier;
-  }
-  // kMaxUnrolling is the max number of output values that we aim to handle
-  // in one unrolled iteration of the inner loop. For practical performance
-  // reasons, it is limited by the number of available registers. We could
-  // fine-tune it depending on the architecture, but that's not worth doing
-  // since this whole code is not very optimized to begin with. The
-  // present value reflects what's realistic on ARM 32bit NEON with 16 128-bit
-  // vector registers.
-  const int kMaxUnrolling = 8;
-  int fixed_input_depth = 0;
-  if (fixed_depth_multiplier &&
-      input_depth * fixed_depth_multiplier <= kMaxUnrolling) {
-    fixed_input_depth = input_depth;
-  }
-#define TF_NEON_USE_DEPTHWISECONV_KERNEL(ALLOW_STRIDED, FIXED_INPUT_DEPTH, \
-                                         FIXED_DEPTH_MULTIPLIER)           \
-  if ((stride == 1 || ALLOW_STRIDED) &&                                    \
-      fixed_input_depth == FIXED_INPUT_DEPTH &&                            \
-      fixed_depth_multiplier == FIXED_DEPTH_MULTIPLIER) {                  \
-    row_accum_func =                                                       \
-        FloatDepthwiseConvAccumRow<ALLOW_STRIDED, FIXED_INPUT_DEPTH,       \
-                                   FIXED_DEPTH_MULTIPLIER>;                \
-  }
-
-#ifdef USE_NEON
-  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 1)
-  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 8)
-  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 2)
-  TF_NEON_USE_DEPTHWISECONV_KERNEL(false, 8, 1)
-  TF_NEON_USE_DEPTHWISECONV_KERNEL(false, 2, 1)
-#endif  // USE_NEON
-
-#undef TF_NEON_USE_DEPTHWISECONV_KERNEL
-
-  // Now that we have determined row_accum_func, we can start work.
-  float* output_ptr = output_data;
-  for (int b = 0; b < batches; ++b) {
-    for (int out_y = 0; out_y < output_height; ++out_y) {
-      const int in_y_origin = (out_y * stride) - pad_height;
-      const int filter_y_start = std::max(0, -in_y_origin);
-      const int filter_y_end =
-          std::min(filter_height, input_height - in_y_origin);
-      for (int out_x_buffer_start = 0; out_x_buffer_start < output_width;
-           out_x_buffer_start += kOutputPixelsInAccBuffer) {
-        const int out_x_buffer_end = std::min(
-            output_width, out_x_buffer_start + kOutputPixelsInAccBuffer);
-        // We call a 'pixel' a group of activation that share all but the
-        // 'depth'/'channel' coordinate. num_output_pixels is the number of
-        // output pixels that we will accumulate in this loop iteration.
-        const int num_output_pixels = out_x_buffer_end - out_x_buffer_start;
-        // Initialize our local accumulator with the bias values, so we don't
-        // have to add them later.
-        DepthwiseConvInitAccBuffer(num_output_pixels, output_depth, bias_data,
-                                   acc_buffer);
-        // Accumulation loop. Most of the time should be spent in here.
-        for (int filter_y = filter_y_start; filter_y < filter_y_end;
-             ++filter_y) {
-          const int in_y = in_y_origin + filter_y;
-          row_accum_func(stride, input_depth, input_width,
-                         input_data + in_y * input_dims.strides[2] +
-                             b * input_dims.strides[3],
-                         pad_width, depth_multiplier, filter_width,
-                         filter_data + filter_y * filter_dims.strides[2],
-                         out_x_buffer_start, out_x_buffer_end, output_depth,
-                         acc_buffer);
-        }
-        // Finished accumulating. Now store to destination.
-        const int num_output_values = output_depth * num_output_pixels;
-        int i = 0;
-// TODO(benoitjacob) optimized code goes here
-#ifdef USE_NEON
-        // Handle 16 values at a time
-        for (; i <= num_output_values - 16; i += 16) {
-          float32x4_t acc[4];
-          for (int k = 0; k < 4; k++) {
-            acc[k] = vld1q_f32(acc_buffer + i + 4 * k);
-          }
-          if (Ac == FusedActivationFunctionType::kRelu) {
-            for (int k = 0; k < 4; k++) {
-              acc[k] = vmaxq_f32(vdupq_n_f32(0.f), acc[k]);
-            }
-          } else if (Ac == FusedActivationFunctionType::kRelu6) {
-            for (int k = 0; k < 4; k++) {
-              acc[k] = vmaxq_f32(vdupq_n_f32(0.f),
-                                 vminq_f32(vdupq_n_f32(6.f), acc[k]));
-            }
-          } else if (Ac == FusedActivationFunctionType::kRelu1) {
-            for (int k = 0; k < 4; k++) {
-              acc[k] = vmaxq_f32(vdupq_n_f32(-1.f),
-                                 vminq_f32(vdupq_n_f32(1.f), acc[k]));
-            }
-          }
-          for (int k = 0; k < 4; k++) {
-            vst1q_f32(output_ptr + 4 * k, acc[k]);
-          }
-          output_ptr += 16;
-        }
-        // Handle 4 values at a time
-        for (; i <= num_output_values - 4; i += 4) {
-          float32x4_t acc = vld1q_f32(acc_buffer + i);
-          if (Ac == FusedActivationFunctionType::kRelu) {
-            acc = vmaxq_f32(vdupq_n_f32(0.f), acc);
-          } else if (Ac == FusedActivationFunctionType::kRelu6) {
-            acc = vmaxq_f32(vdupq_n_f32(0.f), vminq_f32(vdupq_n_f32(6.f), acc));
-          } else if (Ac == FusedActivationFunctionType::kRelu1) {
-            acc =
-                vmaxq_f32(vdupq_n_f32(-1.f), vminq_f32(vdupq_n_f32(1.f), acc));
-          }
-          vst1q_f32(output_ptr, acc);
-          output_ptr += 4;
-        }
-#endif
-        // Handle leftover values, one by one. This is very slow.
-        for (; i < num_output_values; i++) {
-          float acc = acc_buffer[i];
-          if (Ac == FusedActivationFunctionType::kRelu) {
-            acc = std::max(0.f, acc);
-          } else if (Ac == FusedActivationFunctionType::kRelu6) {
-            acc = std::max(0.f, std::min(6.f, acc));
-          } else if (Ac == FusedActivationFunctionType::kRelu1) {
-            acc = std::max(-1.f, std::min(1.f, acc));
-          }
-          *output_ptr++ = acc;
-        }
-      }
-    }
-  }
-}
-
-}  // end namespace neon
-}  // end namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
diff --git a/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc b/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
deleted file mode 100644
index 54b2a10dd8..0000000000
--- a/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include <algorithm>
-#include <cmath>
-#include <type_traits>
-
-#include "tensorflow/core/framework/numeric_op.h"
-#include "tensorflow/core/framework/op_kernel.h"
-#include "tensorflow/core/framework/register_types.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/framework/tensor_shape.h"
-#include "tensorflow/core/framework/tensor_types.h"
-#include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/kernels/neon/depthwiseconv_float.h"
-#include "tensorflow/core/kernels/ops_util.h"
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/mem.h"
-#include "tensorflow/core/platform/types.h"
-#include "tensorflow/core/util/padding.h"
-
-namespace tensorflow {
-
-// A version of tensorflow/core/kernels/depthwise_conv_op.cc that
-// uses the neon intrinsics.
-class NeonDepthwiseConv2dNativeOp : public BinaryOp<float> {
- public:
-  explicit NeonDepthwiseConv2dNativeOp(OpKernelConstruction* context)
-      : BinaryOp<float>(context) {
-    OP_REQUIRES_OK(context, context->GetAttr("strides", &strides_));
-    OP_REQUIRES(context, strides_.size() == 4,
-                errors::InvalidArgument("Sliding window strides field must "
-                                        "specify 4 dimensions"));
-    OP_REQUIRES(context, strides_[1] == strides_[2],
-                errors::InvalidArgument(
-                    "Current implementation only supports equal length "
-                    "strides in the row and column dimensions."));
-    OP_REQUIRES(
-        context, (strides_[0] == 1 && strides_[3] == 1),
-        errors::InvalidArgument("Current implementation does not yet support "
-                                "strides in the batch and depth dimensions."));
-    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
-  }
-
-  void Compute(OpKernelContext* context) override {
-    const Tensor& input = context->input(0);
-    const Tensor& filter = context->input(1);
-
-    // For 2D convolution, there should be 4 dimensions.
-    OP_REQUIRES(context, input.dims() == 4,
-                errors::InvalidArgument("input must be 4-dimensional",
-                                        input.shape().DebugString()));
-    OP_REQUIRES(context, filter.dims() == 4,
-                errors::InvalidArgument("filter must be 4-dimensional: ",
-                                        filter.shape().DebugString()));
-
-    const int32 in_depth = input.dim_size(3);
-    OP_REQUIRES(
-        context, in_depth == filter.dim_size(2),
-        errors::InvalidArgument("input and filter must have the same depth: ",
-                                in_depth, " vs ", filter.dim_size(2)));
-    const int32 batch = input.dim_size(0);
-    const int32 input_rows = input.dim_size(1);
-    const int32 input_cols = input.dim_size(2);
-
-    const int32 filter_rows = filter.dim_size(0);
-    const int32 filter_cols = filter.dim_size(1);
-    const int32 depth_multiplier = filter.dim_size(3);
-
-    const int32 out_depth = in_depth * depth_multiplier;
-
-    const int32 stride = strides_[1];
-
-    int64 out_rows = 0, out_cols = 0, pad_rows = 0, pad_cols = 0;
-    OP_REQUIRES_OK(context,
-                   GetWindowedOutputSize(input_rows, filter_rows, stride,
-                                         padding_, &out_rows, &pad_rows));
-    OP_REQUIRES_OK(context,
-                   GetWindowedOutputSize(input_cols, filter_cols, stride,
-                                         padding_, &out_cols, &pad_cols));
-    TensorShape out_shape({batch, out_rows, out_cols, out_depth});
-    OP_REQUIRES(
-        context, out_shape.num_elements() <= 2147483647,
-        errors::InvalidArgument("total number of outputs should be within the "
-                                "range of int which is used in the GPU kernel",
-                                in_depth, " vs ", filter.dim_size(2)));
-
-    // Output tensor is of the following dimensions:
-    // [ in_batch, out_rows, out_cols, out_depth ]
-    Tensor* output = nullptr;
-    OP_REQUIRES_OK(context, context->allocate_output(0, out_shape, &output));
-
-    VLOG(2) << "NeonDepthwiseConv2dNative: "
-            << " Input: [" << batch << ", " << input_rows << ", " << input_cols
-            << ", " << in_depth << "]; Filter: [" << filter_rows << ", "
-            << filter_cols << ", " << in_depth << ", " << depth_multiplier
-            << "]; stride = " << stride << ", pad_rows = " << pad_rows
-            << ", pad_cols = " << pad_cols << ", output: [" << batch << ", "
-            << out_rows << ", " << out_cols << ", " << out_depth << "]";
-
-    // If there is nothing to compute, return.
-    if (out_shape.num_elements() == 0) {
-      return;
-    }
-
-    const float* input_ptr = input.template flat<float>().data();
-    const float* filter_ptr = filter.template flat<float>().data();
-    float* output_ptr = output->template flat<float>().data();
-
-    auto input_neon_dims = ToNeonDims(input.shape());
-    auto filter_neon_dims = FilterToNeonDims(filter.shape());
-    auto bias_neon_dims = BiasNeonDims(filter.shape());
-
-    int64 bias_size = bias_neon_dims.sizes[3] * bias_neon_dims.strides[3];
-    float* bias_ptr = static_cast<float*>(port::AlignedMalloc(
-        bias_size * sizeof(float), Allocator::kAllocatorAlignment));
-    memset(bias_ptr, 0, bias_size * sizeof(float));
-
-    neon::DepthwiseConv<neon::FusedActivationFunctionType::kNone>(
-        input_ptr, input_neon_dims, filter_ptr, filter_neon_dims, bias_ptr,
-        bias_neon_dims, stride, pad_cols, pad_rows, depth_multiplier,
-        output_ptr, ToNeonDims(out_shape));
-
-    port::AlignedFree(bias_ptr);
-  }
-
- private:
-  void SetNeonDimStrides(neon::Dims<4>* d) {
-    int64 stride = 1;
-    for (int i = 0; i < 4; ++i) {
-      d->strides[i] = stride;
-      stride *= d->sizes[i];
-    }
-  }
-
-  neon::Dims<4> ToNeonDims(const TensorShape& input) {
-    // Dims in the neon kernels are channel, x, y, batch order.
-    neon::Dims<4> result;
-    result.sizes[0] = input.dim_size(3);
-    result.sizes[1] = input.dim_size(2);
-    result.sizes[2] = input.dim_size(1);
-    result.sizes[3] = input.dim_size(0);
-    SetNeonDimStrides(&result);
-    return result;
-  }
-
-  neon::Dims<4> FilterToNeonDims(const TensorShape& filter) {
-    // Dims in the neon kernels are channel, x, y, batch order.
-    neon::Dims<4> result;
-    result.sizes[0] = filter.dim_size(2) * filter.dim_size(3);
-    result.sizes[1] = filter.dim_size(1);
-    result.sizes[2] = filter.dim_size(0);
-    result.sizes[3] = 1;
-    SetNeonDimStrides(&result);
-
-    return result;
-  }
-
-  neon::Dims<4> BiasNeonDims(const TensorShape& filter) {
-    // Dims in the neon kernels are channel, x, y, batch order.
-    // Bias has only output channel set.
-    neon::Dims<4> result;
-    result.sizes[0] = filter.dim_size(3);  // output channels
-    result.sizes[1] = 1;
-    result.sizes[2] = 1;
-    result.sizes[3] = 1;
-    SetNeonDimStrides(&result);
-
-    return result;
-  }
-
-  std::vector<int32> strides_;
-  Padding padding_;
-
-  TF_DISALLOW_COPY_AND_ASSIGN(NeonDepthwiseConv2dNativeOp);
-};
-
-#define REGISTER_CPU_KERNEL(T)                            \
-  REGISTER_KERNEL_BUILDER(Name("DepthwiseConv2dNative")   \
-                              .Device(DEVICE_CPU)         \
-                              .TypeConstraint<float>("T") \
-                              .Label("neon"),             \
-                          NeonDepthwiseConv2dNativeOp);
-
-TF_CALL_float(REGISTER_CPU_KERNEL);
-
-}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/neon/types.h b/tensorflow/core/kernels/neon/types.h
deleted file mode 100644
index e258ee0dfb..0000000000
--- a/tensorflow/core/kernels/neon/types.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
-#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
-
-namespace tensorflow {
-namespace neon {
-
-enum class FusedActivationFunctionType { kNone, kRelu6, kRelu1, kRelu };
-
-template <int N>
-struct Dims {
-  int sizes[N];
-  int strides[N];
-};
-
-inline int Offset(const Dims<4>& dims, int i0, int i1, int i2, int i3) {
-  DCHECK(i0 >= 0 && i0 < dims.sizes[0]);
-  DCHECK(i1 >= 0 && i1 < dims.sizes[1]);
-  DCHECK(i2 >= 0 && i2 < dims.sizes[2]);
-  DCHECK(i3 >= 0 && i3 < dims.sizes[3]);
-  return i0 * dims.strides[0] + i1 * dims.strides[1] + i2 * dims.strides[2] +
-         i3 * dims.strides[3];
-}
-
-// Get array size, DCHECKing that the dim index is in range.
-template <int N>
-int ArraySize(const Dims<N>& array, int index) {
-  DCHECK(index >= 0 && index < N);
-  return array.sizes[index];
-}
-
-// Get common array size, DCHECKing that they all agree.
-template <typename ArrayType1, typename ArrayType2>
-int MatchingArraySize(const ArrayType1& array1, int index1,
-                      const ArrayType2& array2, int index2) {
-  DCHECK_EQ(ArraySize(array1, index1), ArraySize(array2, index2));
-  return ArraySize(array1, index1);
-}
-
-template <typename ArrayType1, typename ArrayType2, typename... Args>
-int MatchingArraySize(const ArrayType1& array1, int index1,
-                      const ArrayType2& array2, int index2, Args... args) {
-  DCHECK_EQ(ArraySize(array1, index1), ArraySize(array2, index2));
-  return MatchingArraySize(array1, index1, args...);
-}
-
-inline int RequiredBufferSizeForDims(const Dims<4>& dims) {
-  int max_offset = 0;
-  for (int i = 0; i < 4; i++) {
-    max_offset += (dims.sizes[i] - 1) * dims.strides[i];
-  }
-  return max_offset + 1;
-}
-
-}  // end namespace neon
-}  // end namespace tensorflow
-
-#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index fb886aaf7d..6689d6a6b4 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2087,21 +2087,6 @@ cuda_py_test(
     ],
 )
 
-tf_py_test(
-    name = "neon_depthwise_conv_op_test",
-    size = "medium",
-    srcs = ["neon_depthwise_conv_op_test.py"],
-    additional_deps = [
-        "//third_party/py/numpy",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:array_ops",
-        "//tensorflow/python:nn",
-        "//tensorflow/python:nn_grad",
-        "//tensorflow/python:nn_ops",
-    ],
-)
-
 cuda_py_test(
     name = "division_future_test",
     size = "medium",
diff --git a/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py b/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py
deleted file mode 100644
index 30795eed8a..0000000000
--- a/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Functional tests for neon kernel for depthwise convolutional operations."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-import numpy as np
-
-from tensorflow.python.framework import constant_op
-from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import nn_impl
-from tensorflow.python.ops import nn_ops
-import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
-from tensorflow.python.platform import test
-
-
-def ConfigsToTest():
-  """Iterator for different convolution shapes, strides and paddings.
-
-  Yields:
-    Tuple (input_size, filter_size, out_size, stride, padding), the depthwise
-    convolution parameters.
-  """
-  input_sizes = [[4, 5, 5, 48], [4, 8, 8, 84], [4, 17, 17, 48], [4, 35, 35, 2],
-                 [4, 147, 147, 2], [3, 299, 299, 3], [5, 183, 183, 1]]
-  filter_sizes = [[1, 1, 48, 2], [1, 3, 84, 1], [3, 1, 48, 4], [5, 5, 2, 1],
-                  [3, 3, 2, 8], [2, 2, 3, 8], [5, 5, 1, 2]]
-  out_sizes = [[4, 5, 5, 96], [4, 8, 8, 84], [4, 17, 17, 192], [4, 35, 35, 2],
-               [4, 49, 49, 16], [3, 150, 150, 24], [5, 92, 92, 2]]
-  strides = [1, 1, 1, 1, 3, 2, 2]
-  # pylint: disable=invalid-name
-  VALID = "VALID"
-  SAME = "SAME"
-  # pylint: enable=invalid-name
-  paddings = [SAME, SAME, SAME, SAME, VALID, SAME, SAME, SAME]
-  for i, f, o, s, p in zip(input_sizes, filter_sizes, out_sizes, strides,
-                           paddings):
-    yield i, f, o, s, p
-
-
-def CheckGradConfigsToTest():
-  """Iterator for different convolution shapes, strides and paddings.
-
-  compute_gradient_error() is very expensive. So the configs should be
-  relatively small.
-
-  Yields:
-    Tuple (input_size, filter_size, out_size, stride, padding), the depthwise
-    convolution parameters.
-  """
-  input_sizes = [[2, 5, 8, 1], [4, 5, 5, 1], [2, 4, 4, 2], [1, 15, 15, 2],
-                 [2, 15, 16, 1]]
-  filter_sizes = [[4, 4, 1, 2], [2, 2, 1, 2], [3, 1, 2, 2], [1, 3, 2, 1],
-                  [3, 3, 1, 2]]
-  out_sizes = [[2, 5, 8, 2], [4, 2, 2, 2], [2, 4, 4, 4], [1, 15, 15, 2],
-               [2, 5, 5, 2]]
-  strides = [1, 2, 1, 1, 3]
-  # pylint: disable=invalid-name
-  VALID = "VALID"
-  SAME = "SAME"
-  # pylint: enable=invalid-name
-  paddings = [SAME, VALID, SAME, SAME, VALID]
-  for i, f, o, s, p in zip(input_sizes, filter_sizes, out_sizes, strides,
-                           paddings):
-    yield i, f, o, s, p
-
-
-class DepthwiseConv2DTest(test.TestCase):
-
-  # This is testing that depthwise_conv2d and depthwise_conv2d_native
-  # produce the same results.  It also tests that NCHW and NWHC
-  # formats agree, by comparing the depthwise_conv2d_native with
-  # 'NCHW' format (with transposition) matches the 'NHWC' format using
-  # the higher level interface.
-  def _VerifyValues(self,
-                    tensor_in_sizes,
-                    filter_in_sizes,
-                    stride,
-                    padding,
-                    use_gpu,
-                    data_format="NHWC"):
-    """Verifies the output values of the convolution function.
-
-    Args:
-      tensor_in_sizes: Input tensor dimensions in
-        [batch, input_rows, input_cols, input_depth].
-      filter_in_sizes: Filter tensor dimensions in
-        [filter_rows, filter_cols, input_depth, depth_multiplier].
-      stride: Stride.
-      padding: Padding type.
-      use_gpu: Whether to use GPU.
-      data_format: The data_format of the input.  "NHWC" or "NCHW".
-    """
-    total_size_1 = 1
-    total_size_2 = 1
-    for s in tensor_in_sizes:
-      total_size_1 *= s
-    for s in filter_in_sizes:
-      total_size_2 *= s
-    # Initializes the input and filter tensor with numbers incrementing from 1.
-    x1 = [f * 1.0 for f in range(1, total_size_1 + 1)]
-    x2 = [f * 1.0 for f in range(1, total_size_2 + 1)]
-    with self.test_session(use_gpu=use_gpu) as sess:
-      with sess.graph._kernel_label_map({"DepthwiseConv2dNative": "neon"}):
-        t1 = constant_op.constant(x1, shape=tensor_in_sizes)
-        t1.set_shape(tensor_in_sizes)
-        t2 = constant_op.constant(x2, shape=filter_in_sizes)
-
-      native_t1 = t1
-      strides = [1, stride, stride, 1]
-      if data_format == "NCHW":
-        # Transpose from NWHC input to NCHW
-        # Ex. [4, 5, 5, 48] to [4, 48, 5, 5]
-        native_t1 = array_ops.transpose(t1, [0, 3, 1, 2])
-        strides = [1, 1, stride, stride]
-
-      conv_native = nn_ops.depthwise_conv2d_native(
-          native_t1,
-          t2,
-          strides=strides,
-          data_format=data_format,
-          padding=padding)
-
-      if data_format == "NCHW":
-        # Transpose back from NCHW to NHWC
-        conv_native = array_ops.transpose(conv_native, [0, 2, 3, 1])
-
-      conv_interface = nn_impl.depthwise_conv2d(
-          t1, t2, strides=[1, stride, stride, 1], padding=padding)
-
-      native_result = sess.run(conv_native)
-      interface_result = sess.run(conv_interface)
-
-    print("depthwise conv_2d: ", tensor_in_sizes, "*", filter_in_sizes,
-          ", stride:", stride, ", padding: ", padding, ", max diff: ",
-          np.amax(np.absolute(native_result - interface_result)))
-    self.assertArrayNear(
-        np.ravel(native_result), np.ravel(interface_result), 1e-5)
-    self.assertShapeEqual(native_result, conv_native)
-    self.assertShapeEqual(native_result, conv_interface)
-
-  def testDepthwiseConv2D(self):
-    for index, (input_size, filter_size, _, stride,
-                padding) in enumerate(ConfigsToTest()):
-      print("Processing ", index, "th config.")
-      if index == 2:
-        self._VerifyValues(
-            input_size, filter_size, stride, padding, use_gpu=True)
-      self._VerifyValues(
-          input_size, filter_size, stride, padding, use_gpu=False)
-
-  def testDepthwiseConv2DFormat(self):
-    if not test.is_gpu_available():
-      return
-
-    for index, (input_size, filter_size, _, stride,
-                padding) in enumerate(ConfigsToTest()):
-      print("Processing ", index, "th config.")
-      self._VerifyValues(
-          input_size,
-          filter_size,
-          stride,
-          padding,
-          use_gpu=True,
-          data_format="NCHW")
-
-# This is testing against hand calculated results.
-
-  def _VerifyHandValues(self, tensor_in_sizes, filter_in_sizes, stride, padding,
-                        expected, use_gpu):
-    """Verifies the output values of the depthwise convolution function.
-
-    Args:
-      tensor_in_sizes: Input tensor dimensions in
-        [batch, input_rows, input_cols, input_depth].
-      filter_in_sizes: Filter tensor dimensions in
-        [filter_rows, filter_cols, input_depth, depth_multiplier].
-      stride: Stride.
-      padding: Padding type.
-      expected: An array containing the expected operation outputs.
-      use_gpu: Whether to use GPU.
-    """
-    total_size_1 = 1
-    total_size_2 = 1
-    for s in tensor_in_sizes:
-      total_size_1 *= s
-    for s in filter_in_sizes:
-      total_size_2 *= s
-    # Initializes the input tensor with array containing incrementing
-    # numbers from 1.
-    x1 = [f * 1.0 for f in range(1, total_size_1 + 1)]
-    x2 = [f * 1.0 for f in range(1, total_size_2 + 1)]
-    with self.test_session(use_gpu=use_gpu) as sess:
-      with sess.graph._kernel_label_map({"DepthwiseConv2dNative": "neon"}):
-        t1 = constant_op.constant(x1, shape=tensor_in_sizes)
-        t1.set_shape(tensor_in_sizes)
-        t2 = constant_op.constant(x2, shape=filter_in_sizes)
-        conv = nn_ops.depthwise_conv2d_native(
-            t1, t2, strides=[1, stride, stride, 1], padding=padding)
-        value = sess.run(conv)
-    print("value = ", value)
-    self.assertArrayNear(expected, np.ravel(value), 1e-5)
-    self.assertShapeEqual(value, conv)
-
-  def testConv2D2x2Filter(self):
-    # The inputs look like this (it's a 3 x 2 matrix, each of depth 2):
-    #
-    # [ (1.0, 2.0), (3.0,  4.0), ( 5.0,  6.0) ]
-    # [ (7.0, 8.0), (9.0, 10.0), (11.0, 12.0) ]
-    #  We can view this as two inputs
-    #
-    #  input depth 0:
-    #
-    #  [ 1.0,  3.0,  5.0 ]
-    #  [ 7.0,  9.0, 11.0 ]
-    #
-    #  input depth 1:
-    #
-    #  [ 2.0,  4.0,  6.0 ]
-    #  [ 8.0, 10.0, 12.0 ]
-    #
-    # The filter looks like this (it has two 2 x 2 patches, each generating 2
-    # depths):
-    #
-    #  filter #0:
-    #
-    #  [ (1.0,  3.0), ( 5.0,  7.0)]
-    #  [ (9.0, 11.0), (13.0, 15.0)]
-    #
-    #  filter #1:
-    #
-    #  [ ( 2.0,  4.0), ( 6.0,  8.0)]
-    #  [ (10.0, 12.0), (14.0, 16.0)]
-    #
-    # So the outputs are:
-    #
-    # (position 0, 0: in_depth 0, output_depth 0 -- using filter #0)
-    #  1.0 * 1.0 + 7.0 * 9.0 + 3.0 * 5.0 + 9.0 * 13.0 = 196
-    # (position 0, 0: in_depth 0, output_depth 1 -- using filter #1)
-    #  1.0 * 2.0 + 7.0 * 10.0 + 3.0 * 6.0 + 9.0 * 14.0 = 216
-    # (position 0, 0: in_depth 1, output_depth 2 -- using filter #0)
-    #  2.0 * 3.0 + 8.0 * 11.0 + 4.0 * 7.0 + 10.0 * 15.0 = 272
-    # (position 0, 0: in_depth 1, output_depth 3 -- using filter #1)
-    #  2.0 * 4.0 + 8.0 * 12.0 + 4.0 * 8.0 + 10.0 * 16.0 = 296
-    #
-    # (position 1, 0: in_depth 0, output_depth 0 -- using filter #0)
-    #  3.0 * 1.0 + 9.0 * 9.0 + 5.0 * 5.0 + 11.0 * 13.0 = 252
-    # (position 1, 0: in_depth 0, output_depth 1 -- using filter #1)
-    #  3.0 * 2.0 + 9.0 * 10.0 + 5.0 * 6.0 + 11.0 * 14.0 = 280
-    # (position 1, 0: in_depth 1, output_depth 2 -- using filter #0)
-    #  4.0 * 3.0 + 10.0 * 11.0 + 6.0 * 7.0 + 12.0 * 15.0 = 344
-    # (position 1, 0: in_depth 1, output_depth 3 -- using filter #1)
-    #  4.0 * 4.0 + 10.0 * 12.0 + 6.0 * 8.0 + 12.0 * 16.0 = 376
-    expected_output = [196, 216, 272, 296, 252, 280, 344, 376]
-    self._VerifyHandValues(
-        tensor_in_sizes=[1, 2, 3, 2],
-        filter_in_sizes=[2, 2, 2, 2],
-        stride=1,
-        padding="VALID",
-        expected=expected_output,
-        use_gpu=False)
-
-    self._VerifyHandValues(
-        tensor_in_sizes=[1, 2, 3, 2],
-        filter_in_sizes=[2, 2, 2, 2],
-        stride=1,
-        padding="VALID",
-        expected=expected_output,
-        use_gpu=True)
-
-
-if __name__ == "__main__":
-  test.main()
-- 
GitLab


From c03d5cc66421b97770ee2b63595c806a90173ef4 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Tue, 16 May 2017 03:01:07 +0300
Subject: [PATCH 1377/1563] NADAM Optimizer (#9889)

* Initial commit for NADAM

* Add GPU and sparse implementations and add missing arguments

* Add tester

* Revert changes to files made for testing

* Add nadam optimizer in a class of its own

* Reverse changes to adam_test.py

* Reverse changes to adam.py

* Actually reverse adam_test.py

* Actually reverse adam.py

* Delete nadam_optimizer_test.py

* Create nadam_optimizer_test.py

* Fix BUILD

* Run buildifier on BUILD
---
 tensorflow/contrib/opt/BUILD                  |  18 ++
 tensorflow/contrib/opt/__init__.py            |   2 +
 .../opt/python/training/nadam_optimizer.py    |  90 ++++++++++
 .../python/training/nadam_optimizer_test.py   | 158 ++++++++++++++++++
 tensorflow/core/kernels/training_ops.cc       |  22 ++-
 tensorflow/core/kernels/training_ops.h        |   3 +-
 .../core/kernels/training_ops_gpu.cu.cc       |  28 +++-
 tensorflow/core/ops/training_ops.cc           |  12 +-
 8 files changed, 318 insertions(+), 15 deletions(-)
 create mode 100644 tensorflow/contrib/opt/python/training/nadam_optimizer.py
 create mode 100644 tensorflow/contrib/opt/python/training/nadam_optimizer_test.py

diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index 2a8714644c..a7e910975f 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -18,6 +18,7 @@ py_library(
         "python/training/external_optimizer.py",
         "python/training/lazy_adam_optimizer.py",
         "python/training/moving_average_optimizer.py",
+        "python/training/nadam_optimizer.py",
         "python/training/variable_clipping_optimizer.py",
     ],
     srcs_version = "PY2AND3",
@@ -106,6 +107,23 @@ py_test(
     ],
 )
 
+py_test(
+    name = "nadam_optimizer_test",
+    srcs = ["python/training/nadam_optimizer_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":opt_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:variables",
+        "//third_party/py/numpy",
+    ],
+)
+
 tf_py_test(
     name = "drop_stale_gradient_optimizer_test",
     srcs = ["python/training/drop_stale_gradient_optimizer_test.py"],
diff --git a/tensorflow/contrib/opt/__init__.py b/tensorflow/contrib/opt/__init__.py
index 6cd68f29a7..be12f934a4 100644
--- a/tensorflow/contrib/opt/__init__.py
+++ b/tensorflow/contrib/opt/__init__.py
@@ -22,6 +22,7 @@ from __future__ import print_function
 from tensorflow.contrib.opt.python.training.drop_stale_gradient_optimizer import *
 from tensorflow.contrib.opt.python.training.external_optimizer import *
 from tensorflow.contrib.opt.python.training.lazy_adam_optimizer import *
+from tensorflow.contrib.opt.python.training.nadam_optimizer import *
 from tensorflow.contrib.opt.python.training.moving_average_optimizer import *
 from tensorflow.contrib.opt.python.training.variable_clipping_optimizer import *
 # pylint: enable=wildcard-import
@@ -31,6 +32,7 @@ from tensorflow.python.util.all_util import remove_undocumented
 _allowed_symbols = ['DropStaleGradientOptimizer',
                     'ExternalOptimizerInterface',
                     'LazyAdamOptimizer',
+                    'NadamOptimizer',
                     'MovingAverageOptimizer',
                     'ScipyOptimizerInterface',
                     'VariableClippingOptimizer']
diff --git a/tensorflow/contrib/opt/python/training/nadam_optimizer.py b/tensorflow/contrib/opt/python/training/nadam_optimizer.py
new file mode 100644
index 0000000000..07521bd4ce
--- /dev/null
+++ b/tensorflow/contrib/opt/python/training/nadam_optimizer.py
@@ -0,0 +1,90 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""Nadam for TensorFlow."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import state_ops
+from tensorflow.python.training import training_ops
+from tensorflow.python.training import adam
+
+
+class NadamOptimizer(adam.AdamOptimizer):
+  """Optimizer that implements the Nadam algorithm.
+
+  See [Dozat, T., 2015](http://cs229.stanford.edu/proj2015/054_report.pdf).
+  """
+
+  def _apply_dense(self, grad, var):
+    m = self.get_slot(var, "m")
+    v = self.get_slot(var, "v")
+    return training_ops.apply_adam(
+        var, m, v,
+        math_ops.cast(self._beta1_power, var.dtype.base_dtype),
+        math_ops.cast(self._beta2_power, var.dtype.base_dtype),
+        math_ops.cast(self._lr_t, var.dtype.base_dtype),
+        math_ops.cast(self._beta1_t, var.dtype.base_dtype),
+        math_ops.cast(self._beta2_t, var.dtype.base_dtype),
+        math_ops.cast(self._epsilon_t, var.dtype.base_dtype),
+        grad, use_locking=self._use_locking,
+        use_nesterov=True).op
+
+  def _resource_apply_dense(self, grad, var):
+    m = self.get_slot(var, "m")
+    v = self.get_slot(var, "v")
+    return training_ops.resource_apply_adam(
+        var.handle, m.handle, v.handle,
+        math_ops.cast(self._beta1_power, grad.dtype.base_dtype),
+        math_ops.cast(self._beta2_power, grad.dtype.base_dtype),
+        math_ops.cast(self._lr_t, grad.dtype.base_dtype),
+        math_ops.cast(self._beta1_t, grad.dtype.base_dtype),
+        math_ops.cast(self._beta2_t, grad.dtype.base_dtype),
+        math_ops.cast(self._epsilon_t, grad.dtype.base_dtype),
+        grad, use_locking=self._use_locking,
+        use_nesterov=True)
+
+  def _apply_sparse_shared(self, grad, var, indices, scatter_add):
+    beta1_power = math_ops.cast(self._beta1_power, var.dtype.base_dtype)
+    beta2_power = math_ops.cast(self._beta2_power, var.dtype.base_dtype)
+    lr_t = math_ops.cast(self._lr_t, var.dtype.base_dtype)
+    beta1_t = math_ops.cast(self._beta1_t, var.dtype.base_dtype)
+    beta2_t = math_ops.cast(self._beta2_t, var.dtype.base_dtype)
+    epsilon_t = math_ops.cast(self._epsilon_t, var.dtype.base_dtype)
+    lr = (lr_t * math_ops.sqrt(1 - beta2_power) / (1 - beta1_power))
+    # m_t = beta1 * m + (1 - beta1) * g_t
+    m = self.get_slot(var, "m")
+    m_scaled_g_values = grad * (1 - beta1_t)
+    m_t = state_ops.assign(m, m * beta1_t,
+                           use_locking=self._use_locking)
+    with ops.control_dependencies([m_t]):
+      m_t = scatter_add(m, indices, m_scaled_g_values)
+      # m_bar = (1 - beta1) * g_t + beta1 * m_t
+      m_bar = m_scaled_g_values + beta1_t * m_t
+    # v_t = beta2 * v + (1 - beta2) * (g_t * g_t)
+    v = self.get_slot(var, "v")
+    v_scaled_g_values = (grad * grad) * (1 - beta2_t)
+    v_t = state_ops.assign(v, v * beta2_t, use_locking=self._use_locking)
+    with ops.control_dependencies([v_t]):
+      v_t = scatter_add(v, indices, v_scaled_g_values)
+    v_sqrt = math_ops.sqrt(v_t)
+    var_update = state_ops.assign_sub(var,
+                                      lr * m_bar / (v_sqrt + epsilon_t),
+                                      use_locking=self._use_locking)
+    return control_flow_ops.group(*[var_update, m_bar, v_t])
diff --git a/tensorflow/contrib/opt/python/training/nadam_optimizer_test.py b/tensorflow/contrib/opt/python/training/nadam_optimizer_test.py
new file mode 100644
index 0000000000..3d48684f53
--- /dev/null
+++ b/tensorflow/contrib/opt/python/training/nadam_optimizer_test.py
@@ -0,0 +1,158 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for Nadam."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.python.client import session
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+from tensorflow.contrib.opt.python.training import nadam_optimizer
+
+
+def nadam_update_numpy(param,
+                       g_t,
+                       t,
+                       m,
+                       v,
+                       alpha=0.001,
+                       beta1=0.9,
+                       beta2=0.999,
+                       epsilon=1e-8):
+  alpha_t = alpha * np.sqrt(1 - beta2**t) / (1 - beta1**t)
+
+  m_t = beta1 * m + (1 - beta1) * g_t
+  v_t = beta2 * v + (1 - beta2) * g_t * g_t
+
+  m_bar = (1 - beta1) * g_t + beta1 * m_t
+
+  param_t = param - alpha_t * m_bar / (np.sqrt(v_t) + epsilon)
+  return param_t, m_t, v_t
+
+
+class NadamOptimizerTest(test.TestCase):
+
+  def doTestSparse(self, use_resource=False):
+    for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+      with self.test_session():
+        # Initialize variables for numpy implementation.
+        m0, v0, m1, v1 = 0.0, 0.0, 0.0, 0.0
+        var0_np = np.array([1.0, 2.0], dtype=dtype.as_numpy_dtype)
+        grads0_np = np.array([0.1, 0.1], dtype=dtype.as_numpy_dtype)
+        var1_np = np.array([3.0, 4.0], dtype=dtype.as_numpy_dtype)
+        grads1_np = np.array([0.01, 0.01], dtype=dtype.as_numpy_dtype)
+
+        if use_resource:
+          var0 = resource_variable_ops.ResourceVariable(var0_np)
+          var1 = resource_variable_ops.ResourceVariable(var1_np)
+        else:
+          var0 = variables.Variable(var0_np)
+          var1 = variables.Variable(var1_np)
+        grads0_np_indices = np.array([0, 1], dtype=np.int32)
+        grads0 = ops.IndexedSlices(
+            constant_op.constant(grads0_np),
+            constant_op.constant(grads0_np_indices), constant_op.constant([2]))
+        grads1_np_indices = np.array([0, 1], dtype=np.int32)
+        grads1 = ops.IndexedSlices(
+            constant_op.constant(grads1_np),
+            constant_op.constant(grads1_np_indices), constant_op.constant([2]))
+        opt = nadam_optimizer.NadamOptimizer()
+        update = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        variables.global_variables_initializer().run()
+
+        # Fetch params to validate initial values
+        self.assertAllClose([1.0, 2.0], var0.eval())
+        self.assertAllClose([3.0, 4.0], var1.eval())
+
+        beta1_power, beta2_power = opt._get_beta_accumulators()
+
+        # Run 3 steps of Nadam
+        for t in range(1, 4):
+          self.assertAllCloseAccordingToType(0.9**t, beta1_power.eval())
+          self.assertAllCloseAccordingToType(0.999**t, beta2_power.eval())
+          update.run()
+
+          var0_np, m0, v0 = nadam_update_numpy(var0_np, grads0_np, t, m0, v0)
+          var1_np, m1, v1 = nadam_update_numpy(var1_np, grads1_np, t, m1, v1)
+
+          # Validate updated params
+          self.assertAllCloseAccordingToType(var0_np, var0.eval())
+          self.assertAllCloseAccordingToType(var1_np, var1.eval())
+
+  def testSparse(self):
+    self.doTestSparse(use_resource=False)
+
+  def testResourceSparse(self):
+    self.doTestSparse(use_resource=True)
+
+  def doTestBasic(self, use_resource=False):
+    for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+      with self.test_session():
+        # Initialize variables for numpy implementation.
+        m0, v0, m1, v1 = 0.0, 0.0, 0.0, 0.0
+        var0_np = np.array([1.0, 2.0], dtype=dtype.as_numpy_dtype)
+        grads0_np = np.array([0.1, 0.1], dtype=dtype.as_numpy_dtype)
+        var1_np = np.array([3.0, 4.0], dtype=dtype.as_numpy_dtype)
+        grads1_np = np.array([0.01, 0.01], dtype=dtype.as_numpy_dtype)
+
+        if use_resource:
+          var0 = resource_variable_ops.ResourceVariable(var0_np)
+          var1 = resource_variable_ops.ResourceVariable(var1_np)
+        else:
+          var0 = variables.Variable(var0_np)
+          var1 = variables.Variable(var1_np)
+        grads0 = constant_op.constant(grads0_np)
+        grads1 = constant_op.constant(grads1_np)
+        opt = nadam_optimizer.NadamOptimizer()
+        update = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        variables.global_variables_initializer().run()
+
+        # Fetch params to validate initial values
+        self.assertAllClose([1.0, 2.0], var0.eval())
+        self.assertAllClose([3.0, 4.0], var1.eval())
+
+        beta1_power, beta2_power = opt._get_beta_accumulators()
+
+        # Run 3 steps of Nadam
+        for t in range(1, 4):
+          self.assertAllCloseAccordingToType(0.9**t, beta1_power.eval())
+          self.assertAllCloseAccordingToType(0.999**t, beta2_power.eval())
+          update.run()
+
+          var0_np, m0, v0 = nadam_update_numpy(var0_np, grads0_np, t, m0, v0)
+          var1_np, m1, v1 = nadam_update_numpy(var1_np, grads1_np, t, m1, v1)
+
+          # Validate updated params
+          self.assertAllCloseAccordingToType(var0_np, var0.eval())
+          self.assertAllCloseAccordingToType(var1_np, var1.eval())
+
+  def testBasic(self):
+    self.doTestBasic(use_resource=False)
+
+  def testResourceBasic(self):
+    self.doTestBasic(use_resource=True)
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index 3b2fa29693..d05cb1ecb4 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -245,12 +245,22 @@ struct ApplyAdamNonCuda {
                   typename TTypes<T>::ConstScalar beta1,
                   typename TTypes<T>::ConstScalar beta2,
                   typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad) {
+                  typename TTypes<T>::ConstFlat grad,
+                  bool use_nesterov) {
     const T alpha = lr() * Eigen::numext::sqrt(T(1) - beta2_power()) /
                     (T(1) - beta1_power());
+    // beta1 == μ
+    // beta2 == ν
+    // v     == n
+    // var   == θ
+
     m.device(d) += (grad - m) * (T(1) - beta1());
     v.device(d) += (grad.square() - v) * (T(1) - beta2());
-    var.device(d) -= (m * alpha) / (v.sqrt() + epsilon());
+    if (use_nesterov) {
+      var.device(d) -= ((grad * (T(1) - beta1()) + beta1() * m) * alpha) / (v.sqrt() + epsilon());
+    } else {
+      var.device(d) -= (m * alpha) / (v.sqrt() + epsilon());
+    }
   }
 };
 
@@ -2248,6 +2258,7 @@ class ApplyAdamOp : public OpKernel {
  public:
   explicit ApplyAdamOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
     OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("use_nesterov", &use_nesterov_));
   }
 
   void Compute(OpKernelContext* ctx) override {
@@ -2322,13 +2333,15 @@ class ApplyAdamOp : public OpKernel {
                                     v.flat<T>(), beta1_power.scalar<T>(),
                                     beta2_power.scalar<T>(), lr.scalar<T>(),
                                     beta1.scalar<T>(), beta2.scalar<T>(),
-                                    epsilon.scalar<T>(), grad.flat<T>());
+                                    epsilon.scalar<T>(), grad.flat<T>(),
+                                    use_nesterov_);
 
     MaybeForwardRefInputToRefOutput(ctx, 0, 0);
   }
 
  private:
   bool use_exclusive_lock_;
+  bool use_nesterov_;
 };
 
 using CPUDevice = Eigen::ThreadPoolDevice;
@@ -2372,7 +2385,8 @@ namespace functor {
       typename TTypes<T>::ConstScalar beta1,                  \
       typename TTypes<T>::ConstScalar beta2,                  \
       typename TTypes<T>::ConstScalar epsilon,                \
-      typename TTypes<T>::ConstFlat grad);                    \
+      typename TTypes<T>::ConstFlat grad,                     \
+      bool use_nesterov);                                     \
   extern template struct ApplyAdam<GPUDevice, T>;
 DECLARE_GPU_SPEC(Eigen::half);
 DECLARE_GPU_SPEC(float);
diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index c96468b270..9c8a1e8d3d 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -123,7 +123,8 @@ struct ApplyAdam {
                   typename TTypes<T>::ConstScalar beta1,
                   typename TTypes<T>::ConstScalar beta2,
                   typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad);
+                  typename TTypes<T>::ConstFlat grad,
+                  bool use_nesterov);
 };
 
 template <typename Device, typename T>
diff --git a/tensorflow/core/kernels/training_ops_gpu.cu.cc b/tensorflow/core/kernels/training_ops_gpu.cu.cc
index f6acdf2422..c2563c3a49 100644
--- a/tensorflow/core/kernels/training_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/training_ops_gpu.cu.cc
@@ -109,7 +109,8 @@ struct ApplyAdam<GPUDevice, T> {
                   typename TTypes<T>::ConstScalar beta1,
                   typename TTypes<T>::ConstScalar beta2,
                   typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad) {
+                  typename TTypes<T>::ConstFlat grad,
+                  bool use_nesterov) {
     Eigen::array<typename TTypes<T>::Tensor::Index, 1> bcast;
     bcast[0] = grad.dimension(0);
     Eigen::Sizes<1> single;
@@ -122,11 +123,26 @@ struct ApplyAdam<GPUDevice, T> {
         v +
         (beta2.constant(one) - beta2).reshape(single).broadcast(bcast) *
             (grad.square() - v);
-    var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
-                      (beta1_power.constant(one) - beta1_power))
-                         .reshape(single)
-                         .broadcast(bcast) *
-                     m / (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
+
+    if (use_nesterov) {
+      var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
+                        (beta1_power.constant(one) - beta1_power))
+                           .reshape(single)
+                           .broadcast(bcast) *
+                       (m * beta1.reshape(single).broadcast(bcast) +
+                        (beta1.constant(one) - beta1)
+                           .reshape(single)
+                           .broadcast(bcast) *
+                        grad) / (epsilon
+                           .reshape(single)
+                           .broadcast(bcast) + v.sqrt());
+    } else {
+      var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
+                        (beta1_power.constant(one) - beta1_power))
+                           .reshape(single)
+                           .broadcast(bcast) *
+                       m / (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
+    }
   }
 };
 
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 2027bf4603..6f7a007f2c 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -1004,7 +1004,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1043,7 +1043,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1075,7 +1075,7 @@ momentum: Momentum. Must be a scalar.
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1112,7 +1112,7 @@ momentum: Momentum. Must be a scalar.
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1150,6 +1150,7 @@ REGISTER_OP("ApplyAdam")
     .Output("out: Ref(T)")
     .Attr("T: numbertype")
     .Attr("use_locking: bool = false")
+    .Attr("use_nesterov: bool = false")
     .SetShapeFn([](InferenceContext* c) {
       return ApplyAdamShapeFn(c, false /* sparse */);
     })
@@ -1175,6 +1176,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var, m, and v tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
+use_nesterov: If `True`, uses the nesterov update.
 )doc");
 
 REGISTER_OP("ResourceApplyAdam")
@@ -1190,6 +1192,7 @@ REGISTER_OP("ResourceApplyAdam")
     .Input("grad: T")
     .Attr("T: numbertype")
     .Attr("use_locking: bool = false")
+    .Attr("use_nesterov: bool = false")
     .SetShapeFn([](InferenceContext* c) {
       return ApplyAdamShapeFn(c, false /* sparse */);
     })
@@ -1214,6 +1217,7 @@ grad: The gradient.
 use_locking: If `True`, updating of the var, m, and v tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
+use_nesterov: If `True`, uses the nesterov update.
 )doc");
 
 static Status ApplyRMSPropShapeFn(InferenceContext* c, bool sparse) {
-- 
GitLab


From 6c6a518a95c04074d7f75fcecb9a03410386aa6b Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 17:23:24 -0700
Subject: [PATCH 1378/1563] [XLA] Add a test for a zero-element and scalar
 reshape operation.

PiperOrigin-RevId: 156126496
---
 tensorflow/compiler/xla/tests/reshape_test.cc | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tensorflow/compiler/xla/tests/reshape_test.cc b/tensorflow/compiler/xla/tests/reshape_test.cc
index 839ae42a19..c5f20b9ca1 100644
--- a/tensorflow/compiler/xla/tests/reshape_test.cc
+++ b/tensorflow/compiler/xla/tests/reshape_test.cc
@@ -67,6 +67,22 @@ XLA_TEST_F(ReshapeTest, SingleElementArrayToScalar) {
   ComputeAndCompareR0<float>(&builder, 1.0f, {}, zero_error_spec_);
 }
 
+XLA_TEST_F(ReshapeTest, ScalarToSingleElementArray) {
+  ComputationBuilder builder(client_, TestName());
+
+  std::unique_ptr<Literal> param0_literal = LiteralUtil::CreateR0<float>(1.0f);
+  std::unique_ptr<GlobalData> param0_data =
+      client_->TransferToServer(*param0_literal).ConsumeValueOrDie();
+
+  auto a = builder.Parameter(0, ShapeUtil::MakeShape(F32, {}), "param0");
+  a = builder.Neg(a);
+  auto reshape =
+      builder.Reshape(/*operand=*/a, /*dimensions=*/{}, /*new_sizes=*/{1});
+
+  ComputeAndCompareR1<float>(&builder, {-1.0f}, {param0_data.get()},
+                             zero_error_spec_);
+}
+
 XLA_TEST_F(ReshapeTest, Trivial0x3) {
   ComputationBuilder builder(client_, TestName());
   auto a = builder.ConstantR2FromArray2D<float>(Array2D<float>(0, 3));
@@ -75,6 +91,24 @@ XLA_TEST_F(ReshapeTest, Trivial0x3) {
   ComputeAndCompareR1<float>(&builder, {}, {}, zero_error_spec_);
 }
 
+// TODO(b/29185393): Make this work with the GPU backend. The GPU backend
+// does not handle zero-sized shapes correctly. Failed last on 2017-05-15
+// with an incorrect result rank.
+XLA_TEST_F(ReshapeTest, DISABLED_ON_GPU(Trivial0x3WithParameter)) {
+  ComputationBuilder builder(client_, TestName());
+
+  std::unique_ptr<Literal> param0_literal =
+      LiteralUtil::CreateR2FromArray2D<float>(Array2D<float>(0, 3));
+  std::unique_ptr<GlobalData> param0_data =
+      client_->TransferToServer(*param0_literal).ConsumeValueOrDie();
+
+  auto a = builder.Parameter(0, ShapeUtil::MakeShape(F32, {0, 3}), "param0");
+  auto result = builder.Collapse(/*operand=*/a, /*dimensions=*/{0, 1});
+
+  ComputeAndCompareR1<float>(&builder, {}, {param0_data.get()},
+                             zero_error_spec_);
+}
+
 XLA_TEST_F(ReshapeTest, Trivial3x0) {
   ComputationBuilder builder(client_, TestName());
   auto a = builder.ConstantR2FromArray2D<float>(Array2D<float>(3, 0));
-- 
GitLab


From c695f22cc5c974a66949b4c7f95d165aa34de6b3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 18:08:58 -0700
Subject: [PATCH 1379/1563] TensorFlow: Clean ups to python_op_gen.

PiperOrigin-RevId: 156130839
---
 tensorflow/python/framework/python_op_gen.cc | 172 +++++++++++--------
 1 file changed, 100 insertions(+), 72 deletions(-)

diff --git a/tensorflow/python/framework/python_op_gen.cc b/tensorflow/python/framework/python_op_gen.cc
index 220868168a..a3168a0088 100644
--- a/tensorflow/python/framework/python_op_gen.cc
+++ b/tensorflow/python/framework/python_op_gen.cc
@@ -21,8 +21,11 @@ limitations under the License.
 #include "tensorflow/core/framework/attr_value.pb.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/op_def.pb.h"
+#include "tensorflow/core/framework/op_def.pb_text.h"
 #include "tensorflow/core/framework/op_def_util.h"
 #include "tensorflow/core/framework/op_gen_lib.h"
+#include "tensorflow/core/framework/tensor.pb.h"
+#include "tensorflow/core/framework/tensor.pb_text.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/framework/types.pb.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
@@ -66,7 +69,8 @@ bool IsPythonReserved(const string& s) {
        "ZeroDivisionError", "__debug__", "__doc__", "__import__", "__name__",
        "__package__",
        // Imports and symbols used in the generated code:
-       "_op_def_lib", "text_format", "op_def_pb2", "op_def_library", "ops"});
+       "_text_format", "_op_def_pb2", "_common_shapes", "_op_def_registry",
+       "_ops", "_op_def_library"});
 
   return kPythonReserved->count(s) > 0;
 }
@@ -175,13 +179,12 @@ string ArgTypeName(const OpDef& op_def, const OpDef::ArgDef& arg,
         prefix = "A list of";
       }
     } else {
-      prefix = strings::StrCat(
-          "A list with the same number of `Tensor` objects as `",
-          AvoidPythonReserved(*original_arg), "` of");
+      prefix = strings::StrCat("A list with the same length as `",
+                               AvoidPythonReserved(*original_arg), "` of");
     }
 
     if (arg.type() != DT_INVALID) {
-      return strings::StrCat(prefix, " `Tensor` objects of type ",
+      return strings::StrCat(prefix, " `Tensor` objects with type ",
                              TypeString(arg.type(), arg.is_ref()), ".");
     } else {
       original_arg = gtl::FindOrNull(inferred_attrs, arg.type_attr());
@@ -189,20 +192,22 @@ string ArgTypeName(const OpDef& op_def, const OpDef::ArgDef& arg,
         strings::StrAppend(&prefix, " mutable");
       }
       if (original_arg == nullptr) {
-        return strings::StrCat(prefix, " `Tensor` objects of type ",
-                               arg.type_attr(), ".");
+        return strings::StrCat(prefix, " `Tensor` objects with type `",
+                               arg.type_attr(), "`.");
       } else if (*original_arg == arg.name()) {
         const OpDef::AttrDef* attr = FindAttr(arg.type_attr(), op_def);
         if (attr->has_allowed_values()) {
           return strings::StrCat(prefix,
-                                 " `Tensor` objects of the same type in: ",
+                                 " `Tensor` objects with the same type in: ",
                                  TypeListString(attr->allowed_values()), ".");
         } else {
-          return strings::StrCat(prefix, " `Tensor` objects of the same type.");
+          return strings::StrCat(prefix,
+                                 " `Tensor` objects with the same type.");
         }
       } else {
-        return strings::StrCat(prefix, " `Tensor` objects of the same type as ",
-                               AvoidPythonReserved(*original_arg), ".");
+        return strings::StrCat(prefix,
+                               " `Tensor` objects with the same type as `",
+                               AvoidPythonReserved(*original_arg), "`.");
       }
     }
   } else if (!arg.type_attr().empty() || !arg.type_list_attr().empty()) {
@@ -241,19 +246,19 @@ string ArgTypeName(const OpDef& op_def, const OpDef::ArgDef& arg,
   }
 }
 
-static string GetReturns(const OpDef& op_def,
-                         const std::vector<string>& output_type_string) {
+string GetReturns(const OpDef& op_def,
+                  const std::vector<string>& output_type_string) {
   string result;
   DCHECK_EQ(op_def.output_arg_size(), output_type_string.size());
   const int num_outs = op_def.output_arg_size();
-  strings::Appendf(&result, "\n  Returns:\n");
+  strings::StrAppend(&result, "\n  Returns:\n");
   if (num_outs == 0) {
-    strings::Appendf(&result, "    The created Operation.\n");
+    strings::StrAppend(&result, "    The created Operation.\n");
   } else {
     if (num_outs == 1) {
       StringPiece description = op_def.output_arg(0).description();
       if (ConsumeEquals(&description)) {  // Skip the generated type info.
-        strings::Appendf(&result, "%s", Indent(4, 4, description).c_str());
+        strings::StrAppend(&result, Indent(4, 4, description));
       } else {
         // Special case of one output, don't use the name of the output unless
         // there is no description.
@@ -272,7 +277,7 @@ static string GetReturns(const OpDef& op_def,
         } else if (!description.empty()) {
           AppendWithinWidth(&desc, description, kRightMargin - 4 /* indent */);
         }
-        strings::Appendf(&result, "%s", Indent(4, 4, desc).c_str());
+        strings::StrAppend(&result, Indent(4, 4, desc));
       }
     } else {
       std::vector<string> out_names(num_outs);
@@ -283,8 +288,8 @@ static string GetReturns(const OpDef& op_def,
           out_names[i] = strings::StrCat("output", i);
         }
       }
-      strings::Appendf(&result, "    A tuple of `Tensor` objects (%s).\n\n",
-                       str_util::Join(out_names, ", ").c_str());
+      strings::StrAppend(&result, "    A tuple of `Tensor` objects (",
+                         str_util::Join(out_names, ", "), ").\n\n");
       for (int i = 0; i < num_outs; ++i) {
         string desc = strings::StrCat(out_names[i], ": ");
         StringPiece description = op_def.output_arg(i).description();
@@ -307,7 +312,7 @@ static string GetReturns(const OpDef& op_def,
             strings::StrAppend(&desc, type);
           }
         }
-        strings::Appendf(&result, "%s", Indent(4, 6, desc).c_str());
+        strings::StrAppend(&result, Indent(4, 6, desc));
       }
     }
   }
@@ -337,6 +342,10 @@ string ShapeToPython(const TensorShapeProto& shape) {
   return python;
 }
 
+string TensorToPython(const TensorProto& proto) {
+  return ProtoShortDebugString(proto);
+}
+
 string AttrListToPython(const AttrValue& value) {
   string ret;
   if (value.list().s_size() > 0) {
@@ -369,6 +378,16 @@ string AttrListToPython(const AttrValue& value) {
       if (i > 0) strings::StrAppend(&ret, ", ");
       strings::StrAppend(&ret, ShapeToPython(value.list().shape(i)));
     }
+  } else if (value.list().tensor_size() > 0) {
+    for (int i = 0; i < value.list().tensor_size(); ++i) {
+      if (i > 0) strings::StrAppend(&ret, ", ");
+      strings::StrAppend(&ret, TensorToPython(value.list().tensor(i)));
+    }
+  } else if (value.list().func_size() > 0) {
+    for (int i = 0; i < value.list().func_size(); ++i) {
+      if (i > 0) strings::StrAppend(&ret, ", ");
+      strings::StrAppend(&ret, StringToPython(value.list().func(i).name()));
+    }
   }
   return ret;
 }
@@ -386,8 +405,14 @@ string AttrValueToPython(const string& type, const AttrValue& value) {
     return DataTypeToPython(value.type());
   } else if (type == "shape") {
     return ShapeToPython(value.shape());
-  } else {
+  } else if (type == "tensor") {
+    return TensorToPython(value.tensor());
+  } else if (type == "func") {
+    return StringToPython(value.func().name());
+  } else if (StringPiece(type).starts_with("list(")) {
     return strings::StrCat("[", AttrListToPython(value), "]");
+  } else {
+    return "?";
   }
 }
 
@@ -417,7 +442,7 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
   // defaults.
   std::vector<string> args_no_default;
   // The parameters with defaults (these have to be listed after those without).
-  // No input args are included, just attrs and the graph ("g") parameter.
+  // No input args are included, just attrs.
   std::vector<string> args_with_defaults;
   for (int i = 0; i < op_def.input_arg_size(); ++i) {
     const auto& arg(op_def.input_arg(i));
@@ -448,8 +473,7 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
   // those with defaults go at the end.
   std::vector<string> attrs;
   // Get the attrs in the order we want by taking the attrs without defaults
-  // from the end of args_no_default, and adding args_no_default (before
-  // "g" gets added to args_no_default, so it only has attrs).
+  // from the end of args_no_default, and adding args_no_default.
   attrs.reserve(args_no_default.size() - op_def.input_arg_size() +
                 args_with_defaults.size());
   attrs.insert(attrs.end(), args_no_default.begin() + op_def.input_arg_size(),
@@ -472,51 +496,51 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
     strings::StrAppend(&parameters, param, "=None");
     param_names.push_back(param);
   }
-  const bool has_args = args_no_default.size() + args_with_defaults.size() > 0;
 
   const string lower_op_name = strings::StrCat(is_hidden ? "_" : "", op_name);
 
-  // Prepare the list of output names
   const int num_outs = op_def.output_arg_size();
-  std::vector<string> out_names(num_outs);
-  for (int i = 0; i < num_outs; ++i) {
-    if (!op_def.output_arg(i).name().empty()) {
-      out_names[i] = op_def.output_arg(i).name();
-    } else {
-      out_names[i] = strings::StrCat("output", i);
-    }
-  }
-  string out_names_list =
-      strings::StrCat("[\"", str_util::Join(out_names, "\", \""), "\"]");
-
-  // Provide the output names as a Python list
-  string lower_op_name_outputs =
-      strings::StrCat("_", lower_op_name, "_outputs");
-  const string outputs_prefix = strings::StrCat(lower_op_name_outputs, " = ");
-  strings::Appendf(
-      &result, "%s\n",
-      WordWrap(outputs_prefix, out_names_list, kRightMargin).c_str());
-  strings::Appendf(&result, "\n\n");
-
   // Prepare a NamedTuple type to hold the outputs, if there are multiple
   if (num_outs > 1) {
-    const string tuple_type_prefix = strings::StrCat(
-        "_", op_def.name(), "Output = _collections.namedtuple(");
+    // Prepare the list of output names
+    std::vector<string> out_names(num_outs);
+    for (int i = 0; i < num_outs; ++i) {
+      if (!op_def.output_arg(i).name().empty()) {
+        out_names[i] = op_def.output_arg(i).name();
+      } else {
+        out_names[i] = strings::StrCat("output", i);
+      }
+    }
+    string out_names_list =
+        strings::StrCat("[\"", str_util::Join(out_names, "\", \""), "\"]");
+
+    // Provide the output names as a Python list
+    string lower_op_name_outputs =
+        strings::StrCat("_", lower_op_name, "_outputs");
+    const string outputs_prefix = strings::StrCat(lower_op_name_outputs, " = ");
+    strings::StrAppend(&result, "\n",
+                       WordWrap(outputs_prefix, out_names_list, kRightMargin),
+                       "\n");
+
+    strings::StrAppend(&result, "_", op_def.name(),
+                       "Output = _collections.namedtuple(\n");
+    const string tuple_type_prefix = "    ";
     const string tuple_type_suffix = strings::StrCat(
         "\"", op_def.name(), "\", ", lower_op_name_outputs, ")");
-    strings::Appendf(
-        &result, "%s\n",
-        WordWrap(tuple_type_prefix, tuple_type_suffix, kRightMargin).c_str());
-    strings::Appendf(&result, "\n\n");
+    strings::StrAppend(
+        &result, WordWrap(tuple_type_prefix, tuple_type_suffix, kRightMargin),
+        "\n\n");
   }
+  strings::StrAppend(&result, "\n");
 
   // Print: def Function(parameters):
   const string def_prefix = strings::StrCat("def ", lower_op_name, "(");
+  const bool has_args = args_no_default.size() + args_with_defaults.size() > 0;
   const string def_suffix =
       strings::StrCat(parameters, has_args ? ", " : "", "name=None):");
 
-  strings::Appendf(&result, "%s\n",
-                   WordWrap(def_prefix, def_suffix, kRightMargin).c_str());
+  strings::StrAppend(&result, WordWrap(def_prefix, def_suffix, kRightMargin),
+                     "\n");
 
   // Format the Op's descriptions so that it can be a Python docstring.
   string comment;
@@ -529,7 +553,7 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
     }
   }
 
-  strings::Appendf(&result, "  r\"\"\"%s\n  Args:\n", comment.c_str());
+  strings::StrAppend(&result, "  r\"\"\"", comment, "\n  Args:\n");
 
   // Inputs
   for (int i = 0; i < op_def.input_arg_size(); ++i) {
@@ -545,7 +569,7 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
     if (!description.empty()) {
       AppendWithinWidth(&desc, description, kRightMargin - 4 /* indent */);
     }
-    strings::Appendf(&result, "%s", Indent(4, 6, desc).c_str());
+    strings::StrAppend(&result, Indent(4, 6, desc));
   }
 
   // Attrs
@@ -567,6 +591,10 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
         {"shape", "`tf.TensorShape` or list of `ints`"},
         {"list(shape)",
          "list of shapes (each a `tf.TensorShape` or list of `ints`)"},
+        {"tensor", "`tf.TensorProto`"},
+        {"list(tensor)", "list of `tf.TensorProto` objects"},
+        {"func", "function decorated with @Defun"},
+        {"list(func)", "list of functions decorated with @Defun"},
     };
     for (size_t i = 0; i < TF_ARRAYSIZE(kAttrTypeName); ++i) {
       if (attr.type() == kAttrTypeName[i][0]) {
@@ -610,14 +638,15 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
       AppendWithinWidth(&desc, attr.description(),
                         kRightMargin - 4 /* indent */);
     }
-    strings::Appendf(&result, "%s", Indent(4, 6, desc).c_str());
+    strings::StrAppend(&result, Indent(4, 6, desc));
   }
 
-  strings::Appendf(&result, "    name: A name for the operation (optional).\n");
+  strings::StrAppend(&result,
+                     "    name: A name for the operation (optional).\n");
 
   std::vector<string> output_type_string;
-  output_type_string.reserve(op_def.output_arg_size());
-  for (int i = 0; i < op_def.output_arg_size(); ++i) {
+  output_type_string.reserve(num_outs);
+  for (int i = 0; i < num_outs; ++i) {
     output_type_string.push_back(
         ArgTypeName(op_def, op_def.output_arg(i), inferred_attrs, true));
   }
@@ -630,19 +659,18 @@ string GetPythonOp(const OpDef& op_def, bool is_hidden, const string& op_name) {
   }
   strings::StrAppend(&return_args, "name=name)");
 
-  strings::Appendf(&result, "  \"\"\"\n%s\n",
-                   // Wrap the arguments, and indent to the (.
-                   WordWrap(return_prefix, return_args, kRightMargin).c_str());
+  strings::StrAppend(&result, "  \"\"\"\n",
+                     // Wrap the arguments, and indent to the (.
+                     WordWrap(return_prefix, return_args, kRightMargin), "\n");
 
   if (num_outs <= 1) {
-    strings::Appendf(&result, "  return result\n");
+    strings::StrAppend(&result, "  return result\n");
   } else {
-    string return_tuple =
-        strings::StrCat("  return _", op_def.name(), "Output._make(result)\n");
-    strings::Appendf(&result, "%s", return_tuple.c_str());
+    strings::StrAppend(&result, "  return _", op_def.name(),
+                       "Output._make(result)\n");
   }
+  strings::StrAppend(&result, "\n\n");
 
-  strings::Appendf(&result, "\n\n");
   return result;
 }
 
@@ -651,7 +679,7 @@ string GetPythonOps(const OpList& ops, const std::vector<string>& hidden_ops,
   string result;
   // Header
   // TODO(josh11b): Mention the library for which wrappers are being generated.
-  strings::Appendf(&result, R"("""Python wrappers around Brain.
+  strings::StrAppend(&result, R"("""Python wrappers around TensorFlow ops.
 
 This file is MACHINE GENERATED! Do not edit.
 """
@@ -699,8 +727,8 @@ from tensorflow.python.framework import op_def_library as _op_def_library
                        GetPythonOp(op_def, is_hidden, lower_case_name));
 
     if (!require_shapes) {
-      strings::Appendf(&result, "_ops.RegisterShape(\"%s\")(None)\n",
-                       op_def.name().c_str());
+      strings::StrAppend(&result, "_ops.RegisterShape(\"", op_def.name(),
+                         "\")(None)\n");
     }
 
     auto added = out->Add();
@@ -722,7 +750,7 @@ _InitOpDefLibrary.op_list_ascii = """%s"""
 
 _op_def_lib = _InitOpDefLibrary()
 )",
-                   cleaned_ops.DebugString().c_str());
+                   ProtoDebugString(cleaned_ops).c_str());
   return result;
 }
 
-- 
GitLab


From e7a0308e61121338b5a86998b610abbaa2d8c372 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Mon, 15 May 2017 18:19:43 -0700
Subject: [PATCH 1380/1563] [TF RNN] Fix recently introduced bug if the state
 size is a scalar.

Turns out tf.concat((int32_tensor, []), 0)  thinks the empty list []
is floating point.  o_O.

PiperOrigin-RevId: 156131674
---
 tensorflow/python/ops/rnn_cell_impl.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/ops/rnn_cell_impl.py b/tensorflow/python/ops/rnn_cell_impl.py
index cc2d9d037c..10d23eb09f 100644
--- a/tensorflow/python/ops/rnn_cell_impl.py
+++ b/tensorflow/python/ops/rnn_cell_impl.py
@@ -24,6 +24,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
@@ -66,8 +68,9 @@ def _concat(prefix, suffix, static=False):
                        "but saw tensor: %s" % p)
   else:
     p = tensor_shape.as_shape(prefix)
-    p = p.as_list() if p.ndims is not None else None
-    p_static = p
+    p_static = p.as_list() if p.ndims is not None else None
+    p = (constant_op.constant(p.as_list(), dtype=dtypes.int32)
+         if p.is_fully_defined() else None)
   if isinstance(suffix, ops.Tensor):
     s = suffix
     s_static = tensor_util.constant_value(suffix)
@@ -78,8 +81,9 @@ def _concat(prefix, suffix, static=False):
                        "but saw tensor: %s" % s)
   else:
     s = tensor_shape.as_shape(suffix)
-    s = s.as_list() if s.ndims is not None else None
-    s_static = s
+    s_static = s.as_list() if s.ndims is not None else None
+    s = (constant_op.constant(s.as_list(), dtype=dtypes.int32)
+         if s.is_fully_defined() else None)
 
   if static:
     shape = tensor_shape.as_shape(p_static).concatenate(s_static)
-- 
GitLab


From 8962a1729a3662dd6d4a38935aaad61db79aa513 Mon Sep 17 00:00:00 2001
From: Andrew Harp <andrewharp@google.com>
Date: Mon, 15 May 2017 18:31:15 -0700
Subject: [PATCH 1381/1563] Android demo: remove unecessary loadlibrary call
 from TensorFlowImageClassifier

PiperOrigin-RevId: 156132465
---
 .../src/org/tensorflow/demo/TensorFlowImageClassifier.java    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowImageClassifier.java b/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowImageClassifier.java
index f660178ebe..5756bd6b64 100644
--- a/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowImageClassifier.java
+++ b/tensorflow/examples/android/src/org/tensorflow/demo/TensorFlowImageClassifier.java
@@ -32,10 +32,6 @@ import org.tensorflow.contrib.android.TensorFlowInferenceInterface;
 
 /** A classifier specialized to label images using TensorFlow. */
 public class TensorFlowImageClassifier implements Classifier {
-  static {
-    System.loadLibrary("tensorflow_demo");
-  }
-
   private static final String TAG = "TensorFlowImageClassifier";
 
   // Only return this many results with at least this confidence.
-- 
GitLab


From 31c53c836232ad6d3caaa5bc7d42604667b127af Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 19:13:11 -0700
Subject: [PATCH 1382/1563] Guarded whether the graph dashboard should request
 health pills on whether the feature is enabled, whether the user has toggled
 the feature on, and whether there is a dataset to request health pills for.

PiperOrigin-RevId: 156135067
---
 .../tf-graph-dashboard.html                   | 32 ++++++++-----------
 .../tf-graph-dashboard.html                   | 32 ++++++++-----------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
index bfc52a0a44..891905e7c4 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
@@ -155,7 +155,7 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     'node-toggle-expand': '_handleNodeToggleExpand',
   },
   observers: [
-    '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+    '_maybeFetchHealthPills(allStepsModeEnabled, specificHealthPillStep)',
     '_maybeInitializeDashboard(backend, _isAttached)',
   ],
   attached: function() {
@@ -165,19 +165,16 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     this.set('_isAttached', false);
   },
   reload: function() {
-    if (!this.debuggerDataEnabled ||
-        !this.healthPillsToggledOn ||
-        !this._renderHierarchy ||
-        this._datasetsEmpty(this._datasets)) {
-      // Do not load debugger data if the feature is disabled, if the user toggled off the feature,
-      // or if the graph itself has not loaded yet. We need the graph to load so that we know which
-      // nodes to request health pills for.
-      return;
-    }
-
-    // Request debugger data on graph reloads, but do not re-request the graph itself. The graph
-    // would not change across reloads.
-    this._requestHealthPills();
+    this._maybeFetchHealthPills();
+  },
+  _shouldRequestHealthPills: function() {
+    // Do not load debugger data if the feature is disabled, if the user toggled off the feature,
+    // or if the graph itself has not loaded yet. We need the graph to load so that we know which
+    // nodes to request health pills for.
+    return this.debuggerDataEnabled &&
+        this.healthPillsToggledOn &&
+        this._renderHierarchy &&
+        !this._datasetsEmpty(this._datasets);
   },
   _maybeInitializeDashboard: function(backend, isAttached) {
     if (this._initialized || !backend || !isAttached) {
@@ -279,7 +276,7 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   },
   _handleNodeToggleExpand: function() {
     // Nodes were toggled. We may need to request health pills for more nodes.
-    this._requestHealthPills();
+    this._maybeFetchHealthPills();
   },
   _healthPillsToggledOnChanged: function(healthPillsToggledOn) {
     if (healthPillsToggledOn) {
@@ -291,9 +288,8 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     }
   },
   // Fetch health pills for a specific step if applicable.
-  _maybeFetchHealthPillsAtSpecificStep: function(allStepsModeEnabled, specificHealthPillStep) {
-    if (!this._renderHierarchy) {
-      // The graph is not ready yet.
+  _maybeFetchHealthPills: function() {
+    if (!this._shouldRequestHealthPills()) {
       return;
     }
 
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html
index bfc52a0a44..891905e7c4 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/tf-graph-dashboard.html
@@ -155,7 +155,7 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     'node-toggle-expand': '_handleNodeToggleExpand',
   },
   observers: [
-    '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
+    '_maybeFetchHealthPills(allStepsModeEnabled, specificHealthPillStep)',
     '_maybeInitializeDashboard(backend, _isAttached)',
   ],
   attached: function() {
@@ -165,19 +165,16 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     this.set('_isAttached', false);
   },
   reload: function() {
-    if (!this.debuggerDataEnabled ||
-        !this.healthPillsToggledOn ||
-        !this._renderHierarchy ||
-        this._datasetsEmpty(this._datasets)) {
-      // Do not load debugger data if the feature is disabled, if the user toggled off the feature,
-      // or if the graph itself has not loaded yet. We need the graph to load so that we know which
-      // nodes to request health pills for.
-      return;
-    }
-
-    // Request debugger data on graph reloads, but do not re-request the graph itself. The graph
-    // would not change across reloads.
-    this._requestHealthPills();
+    this._maybeFetchHealthPills();
+  },
+  _shouldRequestHealthPills: function() {
+    // Do not load debugger data if the feature is disabled, if the user toggled off the feature,
+    // or if the graph itself has not loaded yet. We need the graph to load so that we know which
+    // nodes to request health pills for.
+    return this.debuggerDataEnabled &&
+        this.healthPillsToggledOn &&
+        this._renderHierarchy &&
+        !this._datasetsEmpty(this._datasets);
   },
   _maybeInitializeDashboard: function(backend, isAttached) {
     if (this._initialized || !backend || !isAttached) {
@@ -279,7 +276,7 @@ TF.Dashboard.TfGraphDashboard = Polymer({
   },
   _handleNodeToggleExpand: function() {
     // Nodes were toggled. We may need to request health pills for more nodes.
-    this._requestHealthPills();
+    this._maybeFetchHealthPills();
   },
   _healthPillsToggledOnChanged: function(healthPillsToggledOn) {
     if (healthPillsToggledOn) {
@@ -291,9 +288,8 @@ TF.Dashboard.TfGraphDashboard = Polymer({
     }
   },
   // Fetch health pills for a specific step if applicable.
-  _maybeFetchHealthPillsAtSpecificStep: function(allStepsModeEnabled, specificHealthPillStep) {
-    if (!this._renderHierarchy) {
-      // The graph is not ready yet.
+  _maybeFetchHealthPills: function() {
+    if (!this._shouldRequestHealthPills()) {
       return;
     }
 
-- 
GitLab


From a26609596b2796bb3223c74587ce4d0e0f919ea9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 15 May 2017 20:37:25 -0700
Subject: [PATCH 1383/1563] PiperOrigin-RevId: 156139276

---
 tensorflow/contrib/layers/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/layers/BUILD b/tensorflow/contrib/layers/BUILD
index fe661a5625..03af377149 100644
--- a/tensorflow/contrib/layers/BUILD
+++ b/tensorflow/contrib/layers/BUILD
@@ -304,6 +304,7 @@ py_test(
 py_test(
     name = "embedding_ops_test",
     size = "small",
+    timeout = "moderate",
     srcs = ["python/layers/embedding_ops_test.py"],
     srcs_version = "PY2AND3",
     deps = [
-- 
GitLab


From 014a4c78af79568a0480f40a42f9869fd13fa9ee Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 01:04:59 -0700
Subject: [PATCH 1384/1563] Add example to dynamic_partition and
 dynamic_stitch, that shows how they interact.

PiperOrigin-RevId: 156153465
---
 tensorflow/core/ops/data_flow_ops.cc | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index 8bdbc7e135..c80ff983cf 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -101,6 +101,8 @@ For example:
     outputs[1] = [30, 40]
 ```
 
+See `dynamic_stitch` for an example on how to merge partitions back.
+
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 <img style="width:100%" src="https://www.tensorflow.org/images/DynamicPartition.png" alt>
 </div>
@@ -189,6 +191,24 @@ For example:
               [51, 52], [61, 62]]
 ```
 
+This method can be used to merge partitions created by `dynamic_partition`
+as illustrated on the following example:
+
+```python
+    # Apply function (increments x_i) on elements for which a certain condition
+    # apply (x_i != -1 in this example).
+    x=tf.constant([0.1, -1., 5.2, 4.3, -1., 7.4])
+    condition_mask=tf.not_equal(x,tf.constant(-1.))
+    partitioned_data = tf.dynamic_partition(
+        x, tf.cast(condition_mask, tf.int32) , 2)
+    partitioned_data[1] = partitioned_data[1] + 1.0
+    condition_indices = tf.dynamic_partition(
+        tf.range(tf.shape(x)[0]), tf.cast(condition_mask, tf.int32) , 2)
+    x = tf.dynamic_stitch(condition_indices, partitioned_data)
+    # Here x=[1.1, -1., 6.2, 5.3, -1, 8.4], the -1. values remain
+    # unchanged.
+```
+
 <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 <img style="width:100%" src="https://www.tensorflow.org/images/DynamicStitch.png" alt>
 </div>
-- 
GitLab


From d72e92967f089f34599d98308cdb6a67d4c2db04 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 01:07:41 -0700
Subject: [PATCH 1385/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 156153612
---
 tensorflow/go/op/wrappers.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index bc915789da..9c67c6cd4a 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -4967,6 +4967,24 @@ func TensorArrayGatherV2(scope *Scope, handle tf.Output, indices tf.Output, flow
 //               [51, 52], [61, 62]]
 // ```
 //
+// This method can be used to merge partitions created by `dynamic_partition`
+// as illustrated on the following example:
+//
+// ```python
+//     # Apply function (increments x_i) on elements for which a certain condition
+//     # apply (x_i != -1 in this example).
+//     x=tf.constant([0.1, -1., 5.2, 4.3, -1., 7.4])
+//     condition_mask=tf.not_equal(x,tf.constant(-1.))
+//     partitioned_data = tf.dynamic_partition(
+//         x, tf.cast(condition_mask, tf.int32) , 2)
+//     partitioned_data[1] = partitioned_data[1] + 1.0
+//     condition_indices = tf.dynamic_partition(
+//         tf.range(tf.shape(x)[0]), tf.cast(condition_mask, tf.int32) , 2)
+//     x = tf.dynamic_stitch(condition_indices, partitioned_data)
+//     # Here x=[1.1, -1., 6.2, 5.3, -1, 8.4], the -1. values remain
+//     # unchanged.
+// ```
+//
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 // <img style="width:100%" src="https://www.tensorflow.org/images/DynamicStitch.png" alt>
 // </div>
@@ -21386,6 +21404,8 @@ func Sum(scope *Scope, input tf.Output, reduction_indices tf.Output, optional ..
 //     outputs[1] = [30, 40]
 // ```
 //
+// See `dynamic_stitch` for an example on how to merge partitions back.
+//
 // <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
 // <img style="width:100%" src="https://www.tensorflow.org/images/DynamicPartition.png" alt>
 // </div>
-- 
GitLab


From f1ce39d42b7f2429bfdedccad4dc5276fef03460 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 01:48:43 -0700
Subject: [PATCH 1386/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 156156322
---
 tensorflow/core/ops/ops.pbtxt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 8079555128..b0304f2486 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -6538,7 +6538,7 @@ op {
     type: "type"
   }
   summary: "Partitions `data` into `num_partitions` tensors using indices from `partitions`."
-  description: "For each index tuple `js` of size `partitions.ndim`, the slice `data[js, ...]`\nbecomes part of `outputs[partitions[js]]`.  The slices with `partitions[js] = i`\nare placed in `outputs[i]` in lexicographic order of `js`, and the first\ndimension of `outputs[i]` is the number of entries in `partitions` equal to `i`.\nIn detail,\n\n```python\n    outputs[i].shape = [sum(partitions == i)] + data.shape[partitions.ndim:]\n\n    outputs[i] = pack([data[js, ...] for js if partitions[js] == i])\n```\n\n`data.shape` must start with `partitions.shape`.\n\nFor example:\n\n```python\n    # Scalar partitions.\n    partitions = 1\n    num_partitions = 2\n    data = [10, 20]\n    outputs[0] = []  # Empty with shape [0, 2]\n    outputs[1] = [[10, 20]]\n\n    # Vector partitions.\n    partitions = [0, 0, 1, 1, 0]\n    num_partitions = 2\n    data = [10, 20, 30, 40, 50]\n    outputs[0] = [10, 20, 50]\n    outputs[1] = [30, 40]\n```\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/DynamicPartition.png\" alt>\n</div>"
+  description: "For each index tuple `js` of size `partitions.ndim`, the slice `data[js, ...]`\nbecomes part of `outputs[partitions[js]]`.  The slices with `partitions[js] = i`\nare placed in `outputs[i]` in lexicographic order of `js`, and the first\ndimension of `outputs[i]` is the number of entries in `partitions` equal to `i`.\nIn detail,\n\n```python\n    outputs[i].shape = [sum(partitions == i)] + data.shape[partitions.ndim:]\n\n    outputs[i] = pack([data[js, ...] for js if partitions[js] == i])\n```\n\n`data.shape` must start with `partitions.shape`.\n\nFor example:\n\n```python\n    # Scalar partitions.\n    partitions = 1\n    num_partitions = 2\n    data = [10, 20]\n    outputs[0] = []  # Empty with shape [0, 2]\n    outputs[1] = [[10, 20]]\n\n    # Vector partitions.\n    partitions = [0, 0, 1, 1, 0]\n    num_partitions = 2\n    data = [10, 20, 30, 40, 50]\n    outputs[0] = [10, 20, 50]\n    outputs[1] = [30, 40]\n```\n\nSee `dynamic_stitch` for an example on how to merge partitions back.\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/DynamicPartition.png\" alt>\n</div>"
 }
 op {
   name: "DynamicStitch"
@@ -6567,7 +6567,7 @@ op {
     type: "type"
   }
   summary: "Interleave the values from the `data` tensors into a single tensor."
-  description: "Builds a merged tensor such that\n\n```python\n    merged[indices[m][i, ..., j], ...] = data[m][i, ..., j, ...]\n```\n\nFor example, if each `indices[m]` is scalar or vector, we have\n\n```python\n    # Scalar indices:\n    merged[indices[m], ...] = data[m][...]\n\n    # Vector indices:\n    merged[indices[m][i], ...] = data[m][i, ...]\n```\n\nEach `data[i].shape` must start with the corresponding `indices[i].shape`,\nand the rest of `data[i].shape` must be constant w.r.t. `i`.  That is, we\nmust have `data[i].shape = indices[i].shape + constant`.  In terms of this\n`constant`, the output shape is\n\n    merged.shape = [max(indices)] + constant\n\nValues are merged in order, so if an index appears in both `indices[m][i]` and\n`indices[n][j]` for `(m,i) < (n,j)` the slice `data[n][j]` will appear in the\nmerged result.\n\nFor example:\n\n```python\n    indices[0] = 6\n    indices[1] = [4, 1]\n    indices[2] = [[5, 2], [0, 3]]\n    data[0] = [61, 62]\n    data[1] = [[41, 42], [11, 12]]\n    data[2] = [[[51, 52], [21, 22]], [[1, 2], [31, 32]]]\n    merged = [[1, 2], [11, 12], [21, 22], [31, 32], [41, 42],\n              [51, 52], [61, 62]]\n```\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/DynamicStitch.png\" alt>\n</div>"
+  description: "Builds a merged tensor such that\n\n```python\n    merged[indices[m][i, ..., j], ...] = data[m][i, ..., j, ...]\n```\n\nFor example, if each `indices[m]` is scalar or vector, we have\n\n```python\n    # Scalar indices:\n    merged[indices[m], ...] = data[m][...]\n\n    # Vector indices:\n    merged[indices[m][i], ...] = data[m][i, ...]\n```\n\nEach `data[i].shape` must start with the corresponding `indices[i].shape`,\nand the rest of `data[i].shape` must be constant w.r.t. `i`.  That is, we\nmust have `data[i].shape = indices[i].shape + constant`.  In terms of this\n`constant`, the output shape is\n\n    merged.shape = [max(indices)] + constant\n\nValues are merged in order, so if an index appears in both `indices[m][i]` and\n`indices[n][j]` for `(m,i) < (n,j)` the slice `data[n][j]` will appear in the\nmerged result.\n\nFor example:\n\n```python\n    indices[0] = 6\n    indices[1] = [4, 1]\n    indices[2] = [[5, 2], [0, 3]]\n    data[0] = [61, 62]\n    data[1] = [[41, 42], [11, 12]]\n    data[2] = [[[51, 52], [21, 22]], [[1, 2], [31, 32]]]\n    merged = [[1, 2], [11, 12], [21, 22], [31, 32], [41, 42],\n              [51, 52], [61, 62]]\n```\n\nThis method can be used to merge partitions created by `dynamic_partition`\nas illustrated on the following example:\n\n```python\n    # Apply function (increments x_i) on elements for which a certain condition\n    # apply (x_i != -1 in this example).\n    x=tf.constant([0.1, -1., 5.2, 4.3, -1., 7.4])\n    condition_mask=tf.not_equal(x,tf.constant(-1.))\n    partitioned_data = tf.dynamic_partition(\n        x, tf.cast(condition_mask, tf.int32) , 2)\n    partitioned_data[1] = partitioned_data[1] + 1.0\n    condition_indices = tf.dynamic_partition(\n        tf.range(tf.shape(x)[0]), tf.cast(condition_mask, tf.int32) , 2)\n    x = tf.dynamic_stitch(condition_indices, partitioned_data)\n    # Here x=[1.1, -1., 6.2, 5.3, -1, 8.4], the -1. values remain\n    # unchanged.\n```\n\n<div style=\"width:70%; margin:auto; margin-bottom:10px; margin-top:20px;\">\n<img style=\"width:100%\" src=\"https://www.tensorflow.org/images/DynamicStitch.png\" alt>\n</div>"
 }
 op {
   name: "EditDistance"
-- 
GitLab


From 7266ea5133be29660b4b7a360ee874c758fc1cd2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 03:19:28 -0700
Subject: [PATCH 1387/1563] Generalize layout assignment for bitcast reshapes.

Currently, only special cases are detected where we can assign a layout so
that the reshape is a bitcast. This CL generalizes this and if it is possible
at all, a layout will be assigned so that the reshape is a bitcast.

PiperOrigin-RevId: 156162657
---
 tensorflow/compiler/xla/BUILD                 |   2 +-
 .../compiler/xla/service/layout_assignment.cc | 113 +++++++-------
 .../xla/service/layout_assignment_test.cc     |  10 +-
 tensorflow/compiler/xla/shape_util.cc         | 139 ++++++++++++++++++
 tensorflow/compiler/xla/shape_util.h          |  10 ++
 tensorflow/compiler/xla/shape_util_test.cc    |  54 +++++++
 6 files changed, 259 insertions(+), 69 deletions(-)

diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index 65d4528421..de09d4b23f 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -216,7 +216,7 @@ cc_test(
         ":test_helpers",
         ":types",
         ":util",
-        "//tensorflow/core:test",
+        ":xla_data_proto",
         "//tensorflow/core:test_main",
     ],
 )
diff --git a/tensorflow/compiler/xla/service/layout_assignment.cc b/tensorflow/compiler/xla/service/layout_assignment.cc
index d413621cfe..bf279f1b2c 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment.cc
@@ -659,44 +659,6 @@ LayoutAssignment::LayoutAssignment(ComputationLayout* entry_computation_layout)
   }
 }
 
-namespace {
-
-// Given a pemutation of `{0, 1, ..., n}` `indices`, returns a permutation of
-// `{0, 1, ..., n - to_delete.size() + to_insert.size()}` by deleting the
-// indices `to_delete` wherever in `indices` they are, and inserting the indices
-// `to_insert` arbitrarily at the back.
-tensorflow::protobuf::RepeatedField<tensorflow::protobuf_int64>
-DeleteAndInsertIndices(
-    std::vector<int64> to_delete, std::vector<int64> to_insert,
-    tensorflow::protobuf::RepeatedField<tensorflow::protobuf_int64> indices) {
-  std::sort(to_delete.begin(), to_delete.end(), std::greater<int64>());
-  std::sort(to_insert.begin(), to_insert.end(), std::less<int64>());
-  for (auto index : to_delete) {
-    auto i = indices.begin();
-    while (i != indices.end()) {
-      if (*i == index) {
-        i = indices.erase(i);
-      } else {
-        if (*i > index) {
-          (*i)--;
-        }
-        ++i;
-      }
-    }
-  }
-  for (auto index : to_insert) {
-    for (auto i = indices.begin(); i != indices.end(); ++i) {
-      if (*i >= index) {
-        (*i)++;
-      }
-    }
-    indices.Add(index);
-  }
-  return indices;
-}
-
-}  // namespace
-
 std::unique_ptr<Layout> LayoutAssignment::ChooseOperandLayoutFromOutputLayout(
     const Layout& output_layout, const HloInstruction* instruction,
     int64 operand_no) {
@@ -720,21 +682,32 @@ std::unique_ptr<Layout> LayoutAssignment::ChooseOperandLayoutFromOutputLayout(
   }
 
   if (instruction->opcode() == HloOpcode::kReshape) {
-    // Pick the operand layout that makes the reshape a bitcast. If the reshape
-    // only inserts or deletes degenerate dimensions, we can easily compute the
-    // desired layout by accordingly inserting and deleting the elements in the
-    // minor-to-major list.
-    bool merely_inserts_or_deletes_1_sized_dims;
-    std::vector<int64> inserted_indices, deleted_indices;
-    std::tie(merely_inserts_or_deletes_1_sized_dims, deleted_indices,
-             inserted_indices) =
-        instruction->ReshapeMerelyInsertsOrDeletes1SizedDimensions();
-    if (merely_inserts_or_deletes_1_sized_dims) {
-      Layout operand_layout = LayoutUtil::MakeLayout(
-          AsInt64Slice(DeleteAndInsertIndices(inserted_indices, deleted_indices,
-                                              output_layout.minor_to_major())));
+    // Prefer the operand layout that makes the reshape an bitcast. If any
+    // dimension bound is 1 in the operand shape, there may be several such
+    // layouts. So if 'output_layout' is a MajorToMinor layout, try if the
+    // reshape is a bitcast when using the same layout. This may avoid copy
+    // operations.
+    const Shape& output_shape = instruction->shape();
+    Shape output_shape_with_layout = ShapeUtil::MakeShapeWithLayout(
+        output_shape.element_type(), AsInt64Slice(output_shape.dimensions()),
+        AsInt64Slice(output_layout.minor_to_major()));
+    const Shape& operand_shape = operand->shape();
+    if (LayoutUtil::IsMonotonicWithDim0Major(output_layout)) {
+      Shape operand_shape_with_layout =
+          ShapeUtil::MakeShapeWithMonotonicDim0MajorLayout(
+              operand_shape.element_type(),
+              AsInt64Slice(operand_shape.dimensions()));
+      if (ShapeUtil::ReshapeIsBitcast(operand_shape_with_layout,
+                                      output_shape_with_layout)) {
+        return MakeUnique<Layout>(operand_shape_with_layout.layout());
+      }
+    }
+    auto aligned_operand_shape =
+        ShapeUtil::AlignLayouts(output_shape_with_layout, operand_shape);
+    if (aligned_operand_shape) {
+      auto operand_layout = aligned_operand_shape.value().layout();
       TF_CHECK_OK(
-          LayoutUtil::ValidateLayoutForShape(operand_layout, operand->shape()));
+          LayoutUtil::ValidateLayoutForShape(operand_layout, operand_shape));
       return MakeUnique<Layout>(operand_layout);
     }
   }
@@ -769,18 +742,32 @@ std::unique_ptr<Layout> LayoutAssignment::ChooseOutputLayoutFromOperandLayout(
   }
 
   if (user->opcode() == HloOpcode::kReshape) {
-    // Pick the user layout that makes the reshape a bitcast.
-    bool merely_inserts_or_deletes_1_sized_dims;
-    std::vector<int64> inserted_indices, deleted_indices;
-    std::tie(merely_inserts_or_deletes_1_sized_dims, deleted_indices,
-             inserted_indices) =
-        user->ReshapeMerelyInsertsOrDeletes1SizedDimensions();
-    if (merely_inserts_or_deletes_1_sized_dims) {
-      Layout user_layout = LayoutUtil::MakeLayout(AsInt64Slice(
-          DeleteAndInsertIndices(deleted_indices, inserted_indices,
-                                 operand_layout.minor_to_major())));
+    // Prefer the user layout that makes the reshape an bitcast. If any
+    // dimension bound is 1 in the user shape, there may be several such
+    // layouts. So if 'operand_layout' is a MajorToMinor layout, try if the
+    // reshape is a bitcast when using the same layout. This may avoid copy
+    // operations.
+    Shape operand_shape_with_layout = ShapeUtil::MakeShapeWithLayout(
+        operand->shape().element_type(),
+        AsInt64Slice(operand->shape().dimensions()),
+        AsInt64Slice(operand_layout.minor_to_major()));
+    const Shape& output_shape = user->shape();
+    if (LayoutUtil::IsMonotonicWithDim0Major(operand_layout)) {
+      Shape output_shape_with_layout =
+          ShapeUtil::MakeShapeWithMonotonicDim0MajorLayout(
+              output_shape.element_type(),
+              AsInt64Slice(output_shape.dimensions()));
+      if (ShapeUtil::ReshapeIsBitcast(output_shape_with_layout,
+                                      operand_shape_with_layout)) {
+        return MakeUnique<Layout>(output_shape_with_layout.layout());
+      }
+    }
+    auto aligned_user_shape =
+        ShapeUtil::AlignLayouts(operand_shape_with_layout, output_shape);
+    if (aligned_user_shape) {
+      auto user_layout = aligned_user_shape.value().layout();
       TF_CHECK_OK(
-          LayoutUtil::ValidateLayoutForShape(user_layout, user->shape()));
+          LayoutUtil::ValidateLayoutForShape(user_layout, output_shape));
       return MakeUnique<Layout>(user_layout);
     }
   }
diff --git a/tensorflow/compiler/xla/service/layout_assignment_test.cc b/tensorflow/compiler/xla/service/layout_assignment_test.cc
index dd72566ac0..c6df9839c3 100644
--- a/tensorflow/compiler/xla/service/layout_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment_test.cc
@@ -319,7 +319,7 @@ TEST_F(LayoutAssignmentTest, ElementwiseAndReshape) {
   // param -> log -> reshape -> tanh
   auto builder = HloComputation::Builder(TestName());
   Shape ashape = ShapeUtil::MakeShape(F32, {1, 2, 3, 1});
-  Shape bshape = ShapeUtil::MakeShape(F32, {2, 1, 3});
+  Shape bshape = ShapeUtil::MakeShape(F32, {3, 1, 2});
   auto param = builder.AddInstruction(
       HloInstruction::CreateParameter(0, ashape, "param"));
   auto log = builder.AddInstruction(
@@ -334,8 +334,8 @@ TEST_F(LayoutAssignmentTest, ElementwiseAndReshape) {
 
   Shape ashape_with_layout(ashape);
   Shape bshape_with_layout(bshape);
-  *ashape_with_layout.mutable_layout() = LayoutUtil::MakeLayout({0, 1, 2, 3});
-  *bshape_with_layout.mutable_layout() = LayoutUtil::MakeLayout({0, 1, 2});
+  *ashape_with_layout.mutable_layout() = LayoutUtil::MakeLayout({0, 2, 1, 3});
+  *bshape_with_layout.mutable_layout() = LayoutUtil::MakeLayout({2, 1, 0});
 
   ComputationLayout computation_layout(computation->ComputeProgramShape());
   *computation_layout.mutable_parameter_layout(0) =
@@ -345,12 +345,12 @@ TEST_F(LayoutAssignmentTest, ElementwiseAndReshape) {
 
   auto log_minor_to_major =
       AsInt64Slice(log->shape().layout().minor_to_major());
-  EXPECT_LT(PositionInContainer(log_minor_to_major, 1),
+  EXPECT_GT(PositionInContainer(log_minor_to_major, 1),
             PositionInContainer(log_minor_to_major, 2));
 
   auto reshape_minor_to_major =
       AsInt64Slice(reshape->shape().layout().minor_to_major());
-  EXPECT_LT(PositionInContainer(reshape_minor_to_major, 0),
+  EXPECT_GT(PositionInContainer(reshape_minor_to_major, 0),
             PositionInContainer(reshape_minor_to_major, 2));
 }
 
diff --git a/tensorflow/compiler/xla/shape_util.cc b/tensorflow/compiler/xla/shape_util.cc
index d3949918c8..2b32b78f0b 100644
--- a/tensorflow/compiler/xla/shape_util.cc
+++ b/tensorflow/compiler/xla/shape_util.cc
@@ -29,6 +29,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/util.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/gtl/optional.h"
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/lib/strings/strcat.h"
@@ -1022,6 +1023,144 @@ ShapeUtil::DimensionsUnmodifiedByReshape(const Shape& input_shape,
          check_input_unit_indices(output_shape, input_shape);
 }
 
+/* static */ tensorflow::gtl::optional<Shape> ShapeUtil::AlignLayouts(
+    const Shape& input_shape, const Shape& output_shape) {
+  int64 input_rank = ShapeUtil::Rank(input_shape);
+  int64 output_rank = ShapeUtil::Rank(output_shape);
+
+  // First, calculate an alignment of the dimensions. A consecutive sequence of
+  // input dimensions and output dimensions belong to the same alignment part if
+  // the products of their dimension bounds are the same. In the easiest case,
+  // an alignment part consists of one input dimension and one output dimension
+  // which both have the same dimension bound. An alignment part specifies which
+  // dimensions need to be kept together in a physical layout if we want a
+  // reshape to be a bitcast. The order of the alignment parts is defined by the
+  // physical layout of the input shape, so when we construct the layout for the
+  // output shape we just process the alignment parts in this order, and then
+  // layout the dimensions belonging to each part in descending (major to minor)
+  // order.
+
+  // Stores the input and output dimension numbers where each alignment part
+  // starts.
+  std::vector<std::pair<int64, int64>> alignment;
+  alignment.push_back({0, 0});
+
+  // Stores a mapping from the input dimension to the alignment part it belongs
+  // to.
+  std::vector<int64> dimension_to_alignment_index(input_rank);
+  int64 input_dimension_product = 1, output_dimension_product = 1;
+  for (int64 i = 0, j = 0; i < input_rank || j < output_rank;) {
+    // Check if we have reached the end of an alignment part.
+    if (input_dimension_product == output_dimension_product &&
+        input_dimension_product > 1) {
+      alignment.push_back({i, j});
+      input_dimension_product = output_dimension_product = 1;
+    }
+    if (input_dimension_product < output_dimension_product ||
+        j == output_rank) {
+      if (i == input_rank) {
+        return tensorflow::gtl::nullopt;
+      }
+      dimension_to_alignment_index[i] = alignment.size() - 1;
+      input_dimension_product *= input_shape.dimensions(i);
+      ++i;
+    } else {
+      output_dimension_product *= output_shape.dimensions(j);
+      ++j;
+    }
+  }
+  if (input_dimension_product != output_dimension_product) {
+    return tensorflow::gtl::nullopt;
+  }
+  // We also need to store an end element so that we know where the last
+  // alignment part ends.
+  alignment.push_back({input_rank, output_rank});
+
+  // Now check if the physical layout can potentially be aligned to the output
+  // shape by changing the physical layout of the output shape. We need to check
+  // that all dimension numbers that belong to the same alignment part appear
+  // consecutively, and are in descending order. However we can ignore any
+  // trivial dimension bounds of 1, because they can be placed anywhere.
+  auto input_dimension_numbers = input_shape.layout().minor_to_major();
+  std::vector<int64> output_layout;
+  output_layout.reserve(output_rank);
+  for (int64 i = 0; i < input_rank;) {
+    int64 current_dimension_number = input_dimension_numbers[i];
+
+    // Skip trivial dimensions with a bound of 1.
+    if (input_shape.dimensions(current_dimension_number) == 1) {
+      ++i;
+      continue;
+    }
+
+    // Calculate the number of non-trivial dimension bounds in the input shape
+    // belonging to the current alignment part.
+    const int64 current_alignment_index =
+        dimension_to_alignment_index[current_dimension_number];
+    // Because of the special end element that we added, we can be sure that
+    // 'current_alignment_index' is < alignment.size() - 1.
+    CHECK_LT(current_alignment_index, alignment.size() - 1);
+    int64 num_non_trivial_dimensions_in_alignment_part = 0;
+    for (int64 j = alignment[current_alignment_index].first;
+         j < alignment[current_alignment_index + 1].first; ++j) {
+      if (input_shape.dimensions(j) != 1) {
+        ++num_non_trivial_dimensions_in_alignment_part;
+      }
+    }
+
+    // Check that the following 'num_non_trivial_dimensions_in_alignment_part'
+    // dimension numbers (ignoring dimension numbers with dimension bound 1) are
+    // in descending order and belong to the current alignment part.
+    for (int64 j = 0; j < num_non_trivial_dimensions_in_alignment_part;
+         ++i, ++j) {
+      if (i == input_rank) {
+        return tensorflow::gtl::nullopt;
+      }
+      // Skip trivial dimensions with a bound of 1.
+      if (input_shape.dimensions(input_dimension_numbers[i]) == 1) {
+        --j;
+        continue;
+      }
+      // If the current dimension number belongs to a different alignment part,
+      // or the dimension numbers are not in descending order, we can return
+      // early.
+      if (dimension_to_alignment_index[input_dimension_numbers[i]] !=
+              current_alignment_index ||
+          input_dimension_numbers[i] > current_dimension_number) {
+        return tensorflow::gtl::nullopt;
+      }
+      current_dimension_number = input_dimension_numbers[i];
+    }
+
+    // The output dimension numbers that belong to the current alignment part
+    // need to appear in the same descending order as in the input. Again, we
+    // can skip dimensions with a bound of 1.
+    for (int64 j = alignment[current_alignment_index + 1].second - 1;
+         j >= alignment[current_alignment_index].second; --j) {
+      if (output_shape.dimensions(j) != 1) {
+        output_layout.push_back(j);
+      }
+    }
+  }
+  // Now add all the dimensions with dimension bound 1 at the end of
+  // 'output_layout'.
+  for (int64 i = 0; i < output_rank; ++i) {
+    if (output_shape.dimensions(i) == 1) {
+      output_layout.push_back(i);
+    }
+  }
+  CHECK_EQ(output_layout.size(), output_rank);
+  std::vector<int64> dimension_sizes;
+  for (int64 i = 0; i < output_rank; ++i) {
+    dimension_sizes.push_back(output_shape.dimensions(i));
+  }
+  Shape output_shape_with_layout = MakeShapeWithLayout(
+      output_shape.element_type(), AsInt64Slice(output_shape.dimensions()),
+      output_layout);
+  CHECK(ReshapeIsBitcast(input_shape, output_shape_with_layout));
+  return output_shape_with_layout;
+}
+
 /* static */ Shape ShapeUtil::DeleteDimension(int64 dim_to_delete,
                                               Shape shape) {
   shape.mutable_dimensions()->erase(shape.dimensions().begin() + dim_to_delete);
diff --git a/tensorflow/compiler/xla/shape_util.h b/tensorflow/compiler/xla/shape_util.h
index 9b9dfccc57..aaf8e84cfe 100644
--- a/tensorflow/compiler/xla/shape_util.h
+++ b/tensorflow/compiler/xla/shape_util.h
@@ -26,6 +26,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/lib/gtl/optional.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
@@ -378,6 +379,15 @@ class ShapeUtil {
   static bool ReshapeIsBitcast(const Shape& input_shape,
                                const Shape& output_shape);
 
+  // Find a physical layout for 'output_shape' such that
+  // ShapeUtil::ReshapeIsBitcast(input_shape, output_shape_with_layout) returns
+  // true (where 'output_shape_with_layout' is 'output_shape' with the found
+  // layout). The layout of 'input_shape' is kept fixed. Returns
+  // 'output_shape_with_layout' if such a layout can be found, and an error
+  // otherwise.
+  static tensorflow::gtl::optional<Shape> AlignLayouts(
+      const Shape& input_shape, const Shape& output_shape);
+
   // Returns a shape with the given dimension deleted.
   // For example:
   // • `DeleteDimension(1, T[m, n, k]) = T[m, k]`
diff --git a/tensorflow/compiler/xla/shape_util_test.cc b/tensorflow/compiler/xla/shape_util_test.cc
index 1f1f71d97c..73538b8b88 100644
--- a/tensorflow/compiler/xla/shape_util_test.cc
+++ b/tensorflow/compiler/xla/shape_util_test.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/compiler/xla/test_helpers.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/compiler/xla/util.h"
+#include "tensorflow/compiler/xla/xla_data.pb.h"
 
 namespace xla {
 namespace {
@@ -522,5 +523,58 @@ TEST(AlgebraicSimplifierTest, ReshapeIsBitcast_3x2x2_6x2_Dim0IsMostMinor) {
       ShapeUtil::MakeShapeWithLayout(F32, {6, 2}, {0, 1})));
 }
 
+TEST(AlignmentTest, AlignLayoutsWithoutTrivialDimensions) {
+  Shape input = ShapeUtil::MakeShapeWithLayout(xla::F32, {3, 8, 5, 7, 11},
+                                               {3, 2, 1, 0, 4});
+  auto aligned_shape = ShapeUtil::AlignLayouts(
+      input, ShapeUtil::MakeShape(xla::F32, {4, 3, 2, 7, 5, 11}));
+  EXPECT_TRUE(aligned_shape);
+  EXPECT_THAT(aligned_shape.value().layout().minor_to_major(),
+              ElementsAre(4, 3, 2, 1, 0, 5));
+  EXPECT_TRUE(ShapeUtil::ReshapeIsBitcast(input, aligned_shape.value()));
+
+  aligned_shape = ShapeUtil::AlignLayouts(
+      input, ShapeUtil::MakeShape(xla::F32, {3, 2, 4, 35, 11}));
+  EXPECT_TRUE(aligned_shape);
+  EXPECT_THAT(aligned_shape.value().layout().minor_to_major(),
+              ElementsAre(3, 2, 1, 0, 4));
+  EXPECT_TRUE(ShapeUtil::ReshapeIsBitcast(input, aligned_shape.value()));
+}
+
+TEST(AlignmentTest, AlignLayoutsWithTrivialDimensions) {
+  Shape input =
+      ShapeUtil::MakeShapeWithLayout(xla::F32, {1, 3, 8, 1, 5, 7, 1, 11, 1, 1},
+                                     {5, 0, 4, 2, 1, 3, 6, 7, 9, 8});
+  auto aligned_shape = ShapeUtil::AlignLayouts(
+      input, ShapeUtil::MakeShape(xla::F32, {1, 4, 1, 3, 2, 7, 5, 11, 1}));
+  EXPECT_TRUE(aligned_shape);
+  EXPECT_THAT(aligned_shape.value().layout().minor_to_major(),
+              ElementsAre(6, 5, 4, 3, 1, 7, 0, 2, 8));
+  EXPECT_TRUE(ShapeUtil::ReshapeIsBitcast(input, aligned_shape.value()));
+}
+
+// A test case where the consecutive elements of the input shape belonging to
+// the same layout part are not in descending order.
+TEST(AlignmentTest, AlignLayoutsWithoutTrivialDimensionsWrongInputLayout) {
+  // Same physical layout as in AlignLayoutsWithoutTrivialDimensions, except
+  // that the first two dimension numbers are exchanged.
+  Shape input = ShapeUtil::MakeShapeWithLayout(xla::F32, {3, 8, 5, 7, 11},
+                                               {2, 3, 1, 0, 4});
+  auto aligned_shape = ShapeUtil::AlignLayouts(
+      input, ShapeUtil::MakeShape(xla::F32, {4, 3, 2, 7, 5, 11}));
+  EXPECT_FALSE(aligned_shape);
+}
+
+// A test case where the physical layout of the input shape does not place all
+// dimensions that belong to the same alignment part consecutively.
+TEST(AlignmentTest,
+     AlignLayoutsWithoutTrivialDimensionsNonConsecutiveAlignmentPart) {
+  Shape input = ShapeUtil::MakeShapeWithLayout(xla::F32, {3, 8, 5, 7, 11},
+                                               {3, 2, 1, 0, 4});
+  auto aligned_shape = ShapeUtil::AlignLayouts(
+      input, ShapeUtil::MakeShape(xla::F32, {4, 3, 2, 5, 77}));
+  EXPECT_FALSE(aligned_shape);
+}
+
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 5cc5107cec12b8ec3afd2cb5f8a28777774f9339 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Tue, 16 May 2017 05:33:19 -0700
Subject: [PATCH 1388/1563] Add build rule for doc generation

PiperOrigin-RevId: 156170472
---
 tensorflow/BUILD            |  2 +-
 tensorflow/tools/docs/BUILD | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 503ad79a38..0c2fdab9b8 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -458,7 +458,7 @@ filegroup(
 
 filegroup(
     name = "docs_src",
-    data = glob(["docs_src/**/*.md"]),
+    srcs = glob(["docs_src/**/*.md"]),
 )
 
 # -------------------------------------------
diff --git a/tensorflow/tools/docs/BUILD b/tensorflow/tools/docs/BUILD
index 8e27b133c2..0c0239352b 100644
--- a/tensorflow/tools/docs/BUILD
+++ b/tensorflow/tools/docs/BUILD
@@ -151,3 +151,18 @@ filegroup(
         ],
     ),
 )
+
+genrule(
+    name = "python_docs",
+    srcs = ["//tensorflow:docs_src"],
+    outs = ["python_docs.tgz"],
+    cmd = "STARTDIR=$$(pwd); " +
+          "TMP=$$(mktemp -d $${TMPDIR:-/tmp}/docs.XXXXXXXXXX); " +
+          "cd $$TMP; " +
+          "$$STARTDIR/$(location :generate) --src_dir=$$STARTDIR/third_party/tensorflow/docs_src --output_dir=docs_out; " +
+          "tar -czf $$STARTDIR/$@ docs_out; " +
+          "cd $$STARTDIR; " +
+          "rm -rf $$TMP; ",
+    tools = [":generate"],
+    visibility = ["//visibility:public"],
+)
-- 
GitLab


From f7040ddf1ad5ebf6c871e987b038bfd5f343546e Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Tue, 16 May 2017 08:11:43 -0700
Subject: [PATCH 1389/1563] Adds learn_runner to open source tf.contrib.learn
 symbols.

PiperOrigin-RevId: 156183214
---
 tensorflow/contrib/learn/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/learn/__init__.py b/tensorflow/contrib/learn/__init__.py
index 05c4024d0b..aec4911e29 100644
--- a/tensorflow/contrib/learn/__init__.py
+++ b/tensorflow/contrib/learn/__init__.py
@@ -88,9 +88,11 @@ from __future__ import print_function
 from tensorflow.contrib.learn.python.learn import *
 # pylint: enable=wildcard-import
 
+from tensorflow.contrib.learn.python.learn import learn_runner
+
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = ['datasets', 'head', 'io', 'models',
+_allowed_symbols = ['datasets', 'head', 'io', 'learn_runner', 'models',
                     'monitors', 'NotFittedError', 'ops', 'preprocessing',
                     'utils', 'graph_actions']
 
-- 
GitLab


From 3038bc913713bc31d0b67150e7cf7c056baba7e4 Mon Sep 17 00:00:00 2001
From: Adria Puigdomenech <adriap@google.com>
Date: Tue, 16 May 2017 09:29:45 -0700
Subject: [PATCH 1390/1563] Change rnn ops to check types via duck-typing,
 instead of a private attribute.

PiperOrigin-RevId: 156190878
---
 tensorflow/contrib/rnn/python/ops/core_rnn.py     |  8 ++++----
 .../contrib/rnn/python/ops/core_rnn_cell_impl.py  | 15 ++++++++++-----
 tensorflow/contrib/rnn/python/ops/rnn_cell.py     |  3 ++-
 .../seq2seq/python/ops/attention_wrapper.py       |  2 +-
 .../contrib/seq2seq/python/ops/basic_decoder.py   |  4 ++--
 .../seq2seq/python/ops/beam_search_decoder.py     |  4 ++--
 tensorflow/python/ops/rnn.py                      | 15 +++++----------
 tensorflow/python/ops/rnn_cell_impl.py            |  7 +++++++
 8 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn.py b/tensorflow/contrib/rnn/python/ops/core_rnn.py
index bbfa6b8850..3ce075ce9c 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn.py
@@ -19,7 +19,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.rnn.python.ops import core_rnn_cell
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
@@ -32,6 +31,7 @@ from tensorflow.python.util import nest
 
 # pylint: disable=protected-access
 _concat = rnn_cell_impl._concat
+_like_rnncell = rnn_cell_impl._like_rnncell
 _infer_state_dtype = rnn._infer_state_dtype
 _reverse_seq = rnn._reverse_seq
 _rnn_step = rnn._rnn_step
@@ -99,7 +99,7 @@ def static_rnn(cell, inputs, initial_state=None, dtype=None,
       (column size) cannot be inferred from inputs via shape inference.
   """
 
-  if not isinstance(cell, core_rnn_cell.RNNCell):
+  if not _like_rnncell(cell):
     raise TypeError("cell must be an instance of RNNCell")
   if not nest.is_sequence(inputs):
     raise TypeError("inputs must be a sequence")
@@ -319,9 +319,9 @@ def static_bidirectional_rnn(cell_fw, cell_bw, inputs,
     ValueError: If inputs is None or an empty list.
   """
 
-  if not isinstance(cell_fw, core_rnn_cell.RNNCell):
+  if not _like_rnncell(cell_fw):
     raise TypeError("cell_fw must be an instance of RNNCell")
-  if not isinstance(cell_bw, core_rnn_cell.RNNCell):
+  if not _like_rnncell(cell_bw):
     raise TypeError("cell_bw must be an instance of RNNCell")
   if not nest.is_sequence(inputs):
     raise TypeError("inputs must be a sequence")
diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index eba2c0d2ac..f3e57cd3ec 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -42,16 +42,21 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import partitioned_variables
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import rnn_cell_impl
 from tensorflow.python.ops import variable_scope as vs
 
 from tensorflow.python.ops.math_ops import sigmoid
 from tensorflow.python.ops.math_ops import tanh
-from tensorflow.python.ops.rnn_cell_impl import _RNNCell as RNNCell
 
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import nest
 
 
+# pylint: disable=protected-access
+RNNCell = rnn_cell_impl._RNNCell  # pylint: disable=invalid-name
+_like_rnncell = rnn_cell_impl._like_rnncell
+# pylint: enable=protected-access
+
 _BIAS_VARIABLE_NAME = "biases"
 _WEIGHTS_VARIABLE_NAME = "weights"
 
@@ -424,7 +429,7 @@ class OutputProjectionWrapper(RNNCell):
       ValueError: if output_size is not positive.
     """
     super(OutputProjectionWrapper, self).__init__(_reuse=reuse)
-    if not isinstance(cell, RNNCell):
+    if not _like_rnncell(cell):
       raise TypeError("The parameter cell is not RNNCell.")
     if output_size < 1:
       raise ValueError("Parameter output_size must be > 0: %d." % output_size)
@@ -480,7 +485,7 @@ class InputProjectionWrapper(RNNCell):
     super(InputProjectionWrapper, self).__init__(_reuse=reuse)
     if input_size is not None:
       logging.warn("%s: The input_size parameter is deprecated.", self)
-    if not isinstance(cell, RNNCell):
+    if not _like_rnncell(cell):
       raise TypeError("The parameter cell is not RNNCell.")
     self._cell = cell
     self._num_proj = num_proj
@@ -556,7 +561,7 @@ class DropoutWrapper(RNNCell):
       TypeError: if cell is not an RNNCell.
       ValueError: if any of the keep_probs are not between 0 and 1.
     """
-    if not isinstance(cell, RNNCell):
+    if not _like_rnncell(cell):
       raise TypeError("The parameter cell is not a RNNCell.")
     with ops.name_scope("DropoutWrapperInit"):
       def tensor_and_const_value(v):
@@ -791,7 +796,7 @@ class EmbeddingWrapper(RNNCell):
       ValueError: if embedding_classes is not positive.
     """
     super(EmbeddingWrapper, self).__init__(_reuse=reuse)
-    if not isinstance(cell, RNNCell):
+    if not _like_rnncell(cell):
       raise TypeError("The parameter cell is not RNNCell.")
     if embedding_classes <= 0 or embedding_size <= 0:
       raise ValueError("Both embedding_classes and embedding_size must be > 0: "
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index 7a0f894404..217c379c36 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -34,6 +34,7 @@ from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import rnn_cell_impl
 from tensorflow.python.ops import variable_scope as vs
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import nest
@@ -1057,7 +1058,7 @@ class AttentionCellWrapper(core_rnn_cell.RNNCell):
           `state_is_tuple` is `False` or if attn_length is zero or less.
     """
     super(AttentionCellWrapper, self).__init__(_reuse=reuse)
-    if not isinstance(cell, core_rnn_cell.RNNCell):
+    if not rnn_cell_impl._like_rnncell(cell):  # pylint: disable=protected-access
       raise TypeError("The parameter cell is not RNNCell.")
     if nest.is_sequence(cell.state_size) and not state_is_tuple:
       raise ValueError("Cell returns tuple of states, but the flag "
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index 686a85e4e7..fd76882d84 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -543,7 +543,7 @@ class AttentionWrapper(core_rnn_cell.RNNCell):
       name: Name to use when creating ops.
     """
     super(AttentionWrapper, self).__init__(name=name)
-    if not isinstance(cell, core_rnn_cell.RNNCell):
+    if not rnn_cell_impl._like_rnncell(cell):  # pylint: disable=protected-access
       raise TypeError(
           "cell must be an RNNCell, saw type: %s" % type(cell).__name__)
     if not isinstance(attention_mechanism, AttentionMechanism):
diff --git a/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py b/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
index 6231a1fdf9..8ae175b6b5 100644
--- a/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/basic_decoder.py
@@ -21,13 +21,13 @@ from __future__ import print_function
 
 import collections
 
-from tensorflow.contrib.rnn import core_rnn_cell
 from tensorflow.contrib.seq2seq.python.ops import decoder
 from tensorflow.contrib.seq2seq.python.ops import helper as helper_py
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.layers import base as layers_base
+from tensorflow.python.ops import rnn_cell_impl
 from tensorflow.python.util import nest
 
 
@@ -60,7 +60,7 @@ class BasicDecoder(decoder.Decoder):
     Raises:
       TypeError: if `cell`, `helper` or `output_layer` have an incorrect type.
     """
-    if not isinstance(cell, core_rnn_cell.RNNCell):
+    if not rnn_cell_impl._like_rnncell(cell):  # pylint: disable=protected-access
       raise TypeError("cell must be an RNNCell, received: %s" % type(cell))
     if not isinstance(helper, helper_py.Helper):
       raise TypeError("helper must be a Helper, received: %s" % type(helper))
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index 63ce9dafc0..eb494bda4b 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -20,7 +20,6 @@ from __future__ import print_function
 
 import collections
 
-from tensorflow.contrib.rnn import core_rnn_cell
 from tensorflow.contrib.seq2seq.python.ops import beam_search_ops
 from tensorflow.contrib.seq2seq.python.ops import decoder
 from tensorflow.python.framework import dtypes
@@ -33,6 +32,7 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import nn_ops
+from tensorflow.python.ops import rnn_cell_impl
 from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.util import nest
 
@@ -143,7 +143,7 @@ class BeamSearchDecoder(decoder.Decoder):
       ValueError: If `start_tokens` is not a vector or
         `end_token` is not a scalar.
     """
-    if not isinstance(cell, core_rnn_cell.RNNCell):
+    if not rnn_cell_impl._like_rnncell(cell):  # pylint: disable=protected-access
       raise TypeError("cell must be an RNNCell, received: %s" % type(cell))
     if (output_layer is not None
         and not isinstance(output_layer, layers_base.Layer)):
diff --git a/tensorflow/python/ops/rnn.py b/tensorflow/python/ops/rnn.py
index 475c49091e..2aa288e36a 100644
--- a/tensorflow/python/ops/rnn.py
+++ b/tensorflow/python/ops/rnn.py
@@ -34,6 +34,7 @@ from tensorflow.python.util import nest
 
 # pylint: disable=protected-access
 _concat = rnn_cell_impl._concat
+_like_rnncell = rnn_cell_impl._like_rnncell
 # pylint: enable=protected-access
 
 
@@ -361,12 +362,10 @@ def bidirectional_dynamic_rnn(cell_fw, cell_bw, inputs, sequence_length=None,
     TypeError: If `cell_fw` or `cell_bw` is not an instance of `RNNCell`.
   """
 
-  # pylint: disable=protected-access
-  if not isinstance(cell_fw, rnn_cell_impl._RNNCell):
+  if not _like_rnncell(cell_fw):
     raise TypeError("cell_fw must be an instance of RNNCell")
-  if not isinstance(cell_bw, rnn_cell_impl._RNNCell):
+  if not _like_rnncell(cell_bw):
     raise TypeError("cell_bw must be an instance of RNNCell")
-  # pylint: enable=protected-access
 
   with vs.variable_scope(scope or "bidirectional_rnn"):
     # Forward direction
@@ -507,10 +506,8 @@ def dynamic_rnn(cell, inputs, sequence_length=None, initial_state=None,
     ValueError: If inputs is None or an empty list.
   """
 
-  # pylint: disable=protected-access
-  if not isinstance(cell, rnn_cell_impl._RNNCell):
+  if not _like_rnncell(cell):
     raise TypeError("cell must be an instance of RNNCell")
-  # pylint: enable=protected-access
 
   # By default, time_major==False and inputs are batch-major: shaped
   #   [batch, time, depth]
@@ -921,10 +918,8 @@ def raw_rnn(cell, loop_fn,
       a `callable`.
   """
 
-  # pylint: disable=protected-access
-  if not isinstance(cell, rnn_cell_impl._RNNCell):
+  if not _like_rnncell(cell):
     raise TypeError("cell must be an instance of RNNCell")
-  # pylint: enable=protected-access
   if not callable(loop_fn):
     raise TypeError("loop_fn must be a callable")
 
diff --git a/tensorflow/python/ops/rnn_cell_impl.py b/tensorflow/python/ops/rnn_cell_impl.py
index 10d23eb09f..9c0fb1db23 100644
--- a/tensorflow/python/ops/rnn_cell_impl.py
+++ b/tensorflow/python/ops/rnn_cell_impl.py
@@ -36,6 +36,13 @@ from tensorflow.python.ops import variables as tf_variables
 from tensorflow.python.util import nest
 
 
+def _like_rnncell(cell):
+  """Checks that a given object is an RNNCell by using duck typing."""
+  conditions = [hasattr(cell, "output_size"), hasattr(cell, "state_size"),
+                hasattr(cell, "zero_state"), callable(cell)]
+  return all(conditions)
+
+
 def _concat(prefix, suffix, static=False):
   """Concat that enables int, Tensor, or TensorShape values.
 
-- 
GitLab


From c30ae04407940be85678cafb25747e2412e74db9 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 16 May 2017 09:33:17 -0700
Subject: [PATCH 1391/1563] Bugfix: tf.reverse supports string type.

PiperOrigin-RevId: 156191186
---
 tensorflow/core/kernels/reverse_op.cc            | 1 +
 tensorflow/core/ops/array_ops.cc                 | 4 ++--
 tensorflow/python/kernel_tests/array_ops_test.py | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/kernels/reverse_op.cc b/tensorflow/core/kernels/reverse_op.cc
index 24b3ba31b8..6f7a0a4df5 100644
--- a/tensorflow/core/kernels/reverse_op.cc
+++ b/tensorflow/core/kernels/reverse_op.cc
@@ -266,6 +266,7 @@ class ReverseV2Op : public OpKernel {
                               .HostMemory("axis"),           \
                           ReverseV2Op<CPUDevice, T>)
 TF_CALL_POD_TYPES(REGISTER_KERNELS);
+TF_CALL_string(REGISTER_KERNELS);
 #undef REGISTER_KERNELS
 
 #if GOOGLE_CUDA
diff --git a/tensorflow/core/ops/array_ops.cc b/tensorflow/core/ops/array_ops.cc
index 3d52a29de5..b9e56a1742 100644
--- a/tensorflow/core/ops/array_ops.cc
+++ b/tensorflow/core/ops/array_ops.cc
@@ -1004,7 +1004,7 @@ REGISTER_OP("Reverse")
     .Output("output: T")
     .Attr(
         "T: {uint8, int8, int32, int64, bool, half, float, double, complex64, "
-        "complex128}")
+        "complex128, string}")
     .SetShapeFn([](InferenceContext* c) {
       ShapeHandle input = c->input(0);
       ShapeHandle dims;
@@ -1081,7 +1081,7 @@ REGISTER_OP("ReverseV2")
     .Attr("Tidx: {int32, int64} = DT_INT32")
     .Attr(
         "T: {uint8, int8, int32, int64, bool, half, float, double, complex64, "
-        "complex128}")
+        "complex128, string}")
     .SetShapeFn([](InferenceContext* c) {
       ShapeHandle input = c->input(0);
       ShapeHandle axis;
diff --git a/tensorflow/python/kernel_tests/array_ops_test.py b/tensorflow/python/kernel_tests/array_ops_test.py
index 49695dd3ca..7b8cd25664 100644
--- a/tensorflow/python/kernel_tests/array_ops_test.py
+++ b/tensorflow/python/kernel_tests/array_ops_test.py
@@ -240,7 +240,7 @@ class ReverseV2Test(test_util.TensorFlowTestCase):
         self.assertAllEqual(x_tf, x_np)
 
   def _reverse1DimAuto(self, np_dtype):
-    x_np = np.array([1, 2, 3, 4, 5], dtype=np_dtype)
+    x_np = np.array([1, 200, 3, 40, 5], dtype=np_dtype)
 
     for use_gpu in [False, True]:
       with self.test_session(use_gpu=use_gpu):
@@ -248,7 +248,7 @@ class ReverseV2Test(test_util.TensorFlowTestCase):
         self.assertAllEqual(x_tf, np.asarray(x_np)[::-1])
 
   def _reverse2DimAuto(self, np_dtype):
-    x_np = np.array([[1, 2, 3], [4, 5, 6]], dtype=np_dtype)
+    x_np = np.array([[1, 200, 3], [4, 5, 60]], dtype=np_dtype)
 
     for reverse_f in [array_ops.reverse_v2, array_ops.reverse]:
       for use_gpu in [False, True]:
@@ -283,14 +283,14 @@ class ReverseV2Test(test_util.TensorFlowTestCase):
   def testReverse1DimAuto(self):
     for dtype in [
         np.uint8, np.int8, np.int32, np.int64, np.bool, np.float16, np.float32,
-        np.float64, np.complex64, np.complex128
+        np.float64, np.complex64, np.complex128, np.array(b"").dtype.type
     ]:
       self._reverse1DimAuto(dtype)
 
   def testReverse2DimAuto(self):
     for dtype in [
         np.uint8, np.int8, np.int32, np.int64, np.bool, np.float16, np.float32,
-        np.float64, np.complex64, np.complex128
+        np.float64, np.complex64, np.complex128, np.array(b"").dtype.type
     ]:
       self._reverse2DimAuto(dtype)
 
-- 
GitLab


From 5e3545c24eeb178ce8231067f1c8c42c7c42750f Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Tue, 16 May 2017 09:50:45 -0700
Subject: [PATCH 1392/1563] [TF:XLA] Fix compilation bug for computations with
 one non-constant output and one or more variable outputs.

PiperOrigin-RevId: 156193188
---
 tensorflow/compiler/tests/variable_ops_test.py | 16 ++++++++++++++++
 tensorflow/compiler/tf2xla/xla_compiler.cc     |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tensorflow/compiler/tests/variable_ops_test.py b/tensorflow/compiler/tests/variable_ops_test.py
index dcb9e2db2f..fef390fd67 100644
--- a/tensorflow/compiler/tests/variable_ops_test.py
+++ b/tensorflow/compiler/tests/variable_ops_test.py
@@ -26,6 +26,7 @@ from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
@@ -36,6 +37,21 @@ from tensorflow.python.training.gradient_descent import GradientDescentOptimizer
 class VariableOpsTest(XLATestCase):
   """Test cases for resource variable operators."""
 
+  def testOneWriteOneOutput(self):
+    # Regression test for a bug where computations with one non-constant
+    # output and one variable update were mishandled.
+    for dtype in self.numeric_types:
+      init = np.array([[1, 2], [3, 4]], dtype=dtype)
+      with self.test_session() as sess, self.test_scope():
+        v = resource_variable_ops.ResourceVariable(init)
+        sess.run(variables.variables_initializer([v]))
+        p = array_ops.placeholder(dtype)
+        x = v.assign_add(p)
+        with ops.control_dependencies([x]):
+          y = v.read_value()
+        self.assertAllClose(np.array([[2, 3], [4, 5]], dtype=dtype),
+                            sess.run(y, {p: 1}))
+
   def testReadWrite(self):
     """Tests initialization, reading, and writing a resource variable."""
     with self.test_session() as session:
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index d246e7f9ac..a8034a2ec6 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -491,10 +491,10 @@ Status XlaCompiler::CompileGraph(const XlaCompiler::CompileOptions& options,
        i < context->retvals().size(); ++i) {
     const XlaContext::HandleOrConstant& retval = context->retvals()[i];
     if (!retval.is_constant) {
-      CHECK_LT(computation_output, num_nonconst_outputs);
+      CHECK_LT(computation_output, num_computation_outputs);
       OutputDescription& output = result->outputs[i];
       output.is_constant = false;
-      if (num_nonconst_outputs > 1) {
+      if (num_computation_outputs > 1) {
         output.shape =
             XLAShapeToTensorShape(xla::ShapeUtil::GetTupleElementShape(
                 result->xla_output_shape, computation_output));
-- 
GitLab


From 8d758e1e1843202e273e88f35dcf3bc8f4803906 Mon Sep 17 00:00:00 2001
From: Leandro Gracia Gil <leandro.gracia.gil@gmail.com>
Date: Wed, 17 May 2017 01:56:08 +0900
Subject: [PATCH 1393/1563] Make possible to use static libraries generated by
 tfcompile in MSVC. (#9908)

Currently it is possible to generate MSVC-compatible static libraries from a
Linux build of tfcompile using the target triple "x86_64-pc-windows-msvc".

However, just linking such library does not work out-of-the-box because of a
trivial class -> struct issue that becomes a compiler error in MSVC and because
multiple other symbols are missing.

The files defining these symbols must be manually built into the MSVC project,
but many have minor incompatibilities that prevent them to be built.

This patch makes a few minor modifications to these files, making it possible
to link and run Tensorflow graphs generated with tfcompile in MSVC in Windows.

The files that might need to be built into the MSVC project are as follows:

1. For symbols required by the generated headers.
 - tensorflow/compiler/aot/runtime.cc
 - tensorflow/compiler/xla/executable_run_options.cc

2. For symbols that provide custom XLA operations.
 - tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc
 - tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc
 - tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc
 - tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc

3. For symbols required by SimpleResolver in xla/service/cpu/simple_orc_jit.cc.
 - tensorflow/compiler/xla/service/cpu/runtime_matmul.cc
 - tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc
 - tensorflow/compiler/xla/service/cpu/runtime_conv2d.cc
 - tensorflow/compiler/xla/service/cpu/runtime_single_threaded_conv2d.cc
 - tensorflow/compiler/xla/service/cpu/cpu_runtime.cc

Additionally, the following files might also required by SimpleResolver, but are
not included in this patch because there is no simple alternative to
__attribute__((vector_size(x))) and __attribute__((weak)) in MSVC.

 - tensorflow/compiler/xla/service/cpu/cpu_runtime_sse4_1.cc
 - tensorflow/compiler/xla/service/cpu/cpu_runtime_avx.cc

See https://github.com/tensorflow/tensorflow/issues/8310 for more information.
---
 tensorflow/compiler/aot/codegen.cc                     |  2 +-
 tensorflow/compiler/aot/codegen_test_h.golden          |  2 +-
 tensorflow/compiler/aot/runtime.cc                     | 10 +++++++++-
 .../tf2xla/kernels/gather_op_kernel_float_int32.cc     |  3 ++-
 .../tf2xla/kernels/gather_op_kernel_float_int64.cc     |  3 ++-
 .../tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc |  3 ++-
 .../tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc |  3 ++-
 tensorflow/compiler/tf2xla/xla_local_runtime_context.h |  2 +-
 tensorflow/compiler/xla/service/cpu/cpu_runtime.cc     |  1 -
 tensorflow/compiler/xla/service/cpu/runtime_matmul.cc  |  4 ++--
 .../xla/service/cpu/runtime_single_threaded_matmul.cc  |  4 ++--
 tensorflow/compiler/xla/tests/custom_call_test.cc      |  7 ++++---
 12 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/tensorflow/compiler/aot/codegen.cc b/tensorflow/compiler/aot/codegen.cc
index a53e82d34b..bbdb342a62 100644
--- a/tensorflow/compiler/aot/codegen.cc
+++ b/tensorflow/compiler/aot/codegen.cc
@@ -365,7 +365,7 @@ Status GenerateHeader(const HeaderOpts& opts, const Config& config,
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
-namespace Eigen { class ThreadPoolDevice; }
+namespace Eigen { struct ThreadPoolDevice; }
 
 // (Implementation detail) Entry point to the function in the object file.
 extern "C" void {{ENTRY}}(
diff --git a/tensorflow/compiler/aot/codegen_test_h.golden b/tensorflow/compiler/aot/codegen_test_h.golden
index 46d7c03006..01963c6df4 100644
--- a/tensorflow/compiler/aot/codegen_test_h.golden
+++ b/tensorflow/compiler/aot/codegen_test_h.golden
@@ -15,7 +15,7 @@
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
-namespace Eigen { class ThreadPoolDevice; }
+namespace Eigen { struct ThreadPoolDevice; }
 
 // (Implementation detail) Entry point to the function in the object file.
 extern "C" void entry_point(
diff --git a/tensorflow/compiler/aot/runtime.cc b/tensorflow/compiler/aot/runtime.cc
index 208de5498d..5772776666 100644
--- a/tensorflow/compiler/aot/runtime.cc
+++ b/tensorflow/compiler/aot/runtime.cc
@@ -31,6 +31,8 @@ namespace {
 inline void* aligned_malloc(size_t size, int minimum_alignment) {
 #if defined(__ANDROID__) || defined(OS_ANDROID) || defined(OS_CYGWIN)
   return memalign(minimum_alignment, size);
+#elif defined(COMPILER_MSVC)
+  return _aligned_malloc(size, minimum_alignment);
 #else  // !__ANDROID__ && !OS_ANDROID && !OS_CYGWIN
   void* ptr = nullptr;
   // posix_memalign requires that the requested alignment be at least
@@ -45,7 +47,13 @@ inline void* aligned_malloc(size_t size, int minimum_alignment) {
 #endif
 }
 
-inline void aligned_free(void* aligned_memory) { free(aligned_memory); }
+inline void aligned_free(void* aligned_memory) {
+#if defined(COMPILER_MSVC)
+  _aligned_free(aligned_memory);
+#else
+  free(aligned_memory);
+#endif
+}
 
 size_t align_to(size_t n, size_t align) {
   return (((n - 1) / align) + 1) * align;
diff --git a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc
index eff23bd77d..ef844cc6c5 100644
--- a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc
+++ b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/kernels/gather_functor.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 
 namespace tensorflow {
 
@@ -63,7 +64,7 @@ EIGEN_STRONG_INLINE void gather_float_int32_xla_impl(float* out, void** data) {
 
 // Implements gather on CPU. This is called by an XLA custom call, set up by
 // gather_op.cc.
-extern "C" void __attribute__((visibility("default")))
+extern "C" void TF_EXPORT
 gather_float_int32_xla_impl(float* out, void** data) {
   tensorflow::gather_float_int32_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc
index ae31f6f200..4c8693d197 100644
--- a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc
+++ b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/kernels/gather_functor.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 
 namespace tensorflow {
 
@@ -63,7 +64,7 @@ EIGEN_STRONG_INLINE void gather_float_int64_xla_impl(float* out, void** data) {
 
 // Implements gather on CPU. This is called by an XLA custom call, set up by
 // gather_op.cc.
-extern "C" void __attribute__((visibility("default")))
+extern "C" void TF_EXPORT
 gather_float_int64_xla_impl(float* out, void** data) {
   tensorflow::gather_float_int64_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc
index 0033a949a3..a71f2fcf0f 100644
--- a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc
+++ b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -43,7 +44,7 @@ EIGEN_STRONG_INLINE void argmax_float_1d_xla_impl(void* out, void** data) {
 
 // Implements argmax on CPU. This is called by an XLA custom call, set up by
 // index_ops.cc.
-extern "C" void __attribute__((visibility("default")))
+extern "C" void TF_EXPORT
 argmax_float_1d_xla_impl(void* out, void** data) {
   tensorflow::argmax_float_1d_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc
index be8ad2317c..f30eb6121f 100644
--- a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc
+++ b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -45,7 +46,7 @@ EIGEN_STRONG_INLINE void argmax_float_2d_xla_impl(void* out, void** data) {
 
 // Implements argmax on CPU. This is called by an XLA custom call, set up by
 // index_ops.cc.
-extern "C" void __attribute__((visibility("default")))
+extern "C" void TF_EXPORT
 argmax_float_2d_xla_impl(void* out, void** data) {
   tensorflow::argmax_float_2d_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/xla_local_runtime_context.h b/tensorflow/compiler/tf2xla/xla_local_runtime_context.h
index cd773d64ed..dca420d6ee 100644
--- a/tensorflow/compiler/tf2xla/xla_local_runtime_context.h
+++ b/tensorflow/compiler/tf2xla/xla_local_runtime_context.h
@@ -23,7 +23,7 @@ limitations under the License.
 // actually used.  E.g. some ahead-of-time compiled computations don't need a
 // thread pool.
 namespace Eigen {
-class ThreadPoolDevice;
+struct ThreadPoolDevice;
 }
 
 namespace tensorflow {
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc b/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc
index 8e06f0520e..253de20f25 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc
@@ -15,7 +15,6 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/cpu/cpu_runtime.h"
 
-#include <sched.h>
 #include <functional>
 
 #include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc b/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc
index 677080a862..332f4216dc 100644
--- a/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc
+++ b/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc
@@ -53,8 +53,8 @@ void MatMul(const void* run_options_ptr, T* out, T* lhs, T* rhs, int64 m,
   typedef typename Eigen::Tensor<T, 2>::DimensionPair DimPair;
   int lhs_contract_dim = transpose_lhs ? 0 : 1;
   int rhs_contract_dim = transpose_rhs ? 1 : 0;
-  const Eigen::array<DimPair, 1> dims(
-      DimPair(lhs_contract_dim, rhs_contract_dim));
+  const Eigen::array<DimPair, 1> dims({
+      DimPair(lhs_contract_dim, rhs_contract_dim) });
 
   // Matrix multiply is a special case of the "contract" operation where
   // the contraction is performed along dimension 1 of the lhs and dimension
diff --git a/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc b/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc
index 384a978873..e45329c4ef 100644
--- a/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc
+++ b/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc
@@ -47,8 +47,8 @@ void MatMul(const void* run_options_ptr, T* out, T* lhs, T* rhs, int64 m,
   typedef typename Eigen::Tensor<T, 2>::DimensionPair DimPair;
   int lhs_contract_dim = transpose_lhs ? 0 : 1;
   int rhs_contract_dim = transpose_rhs ? 1 : 0;
-  const Eigen::array<DimPair, 1> dims(
-      DimPair(lhs_contract_dim, rhs_contract_dim));
+  const Eigen::array<DimPair, 1> dims({
+      DimPair(lhs_contract_dim, rhs_contract_dim)});
 
   // Matrix multiply is a special case of the "contract" operation where
   // the contraction is performed along dimension 1 of the lhs and dimension
diff --git a/tensorflow/compiler/xla/tests/custom_call_test.cc b/tensorflow/compiler/xla/tests/custom_call_test.cc
index dc54c9defe..8b5b38b0b4 100644
--- a/tensorflow/compiler/xla/tests/custom_call_test.cc
+++ b/tensorflow/compiler/xla/tests/custom_call_test.cc
@@ -29,22 +29,23 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/test.h"
 
-extern "C" void __attribute__((visibility("default")))
+extern "C" void TF_EXPORT
 R0F32Add2(float* out, float** in) {
   TF_ANNOTATE_MEMORY_IS_INITIALIZED(in, sizeof(float*));
   *out = **in + 2.0f;
 }
 
-extern "C" void __attribute__((visibility("default")))
+extern "C" void TF_EXPORT
 R2F32ReduceSum(float* out, float** in) {
   TF_ANNOTATE_MEMORY_IS_INITIALIZED(in, sizeof(float) * 4);
   float* array = in[0];
   *out = array[0] + array[1] + array[2] + array[3];
 }
 
-extern "C" void __attribute__((visibility("default")))
+extern "C" void TF_EXPORT
 Add1ToValues(float* out, float** in) {
   TF_ANNOTATE_MEMORY_IS_INITIALIZED(in, sizeof(float) * 4);
   float* array = in[0];
-- 
GitLab


From 7b77d12d4dda833c9aab18e6848130f15d699bd0 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 10:03:48 -0700
Subject: [PATCH 1394/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 156194847
---
 .../core/ops/compat/ops_history.v1.pbtxt      | 81 +++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |  2 +
 2 files changed, 83 insertions(+)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 5dd18d4ba3..22d9c35116 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -18607,6 +18607,40 @@ op {
     }
   }
 }
+op {
+  name: "Reverse"
+  input_arg {
+    name: "tensor"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "dims"
+    type: DT_BOOL
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_UINT8
+        type: DT_INT8
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_BOOL
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_STRING
+      }
+    }
+  }
+}
 op {
   name: "ReverseSequence"
   input_arg {
@@ -18696,6 +18730,53 @@ op {
     }
   }
 }
+op {
+  name: "ReverseV2"
+  input_arg {
+    name: "tensor"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "axis"
+    type_attr: "Tidx"
+  }
+  output_arg {
+    name: "output"
+    type_attr: "T"
+  }
+  attr {
+    name: "Tidx"
+    type: "type"
+    default_value {
+      type: DT_INT32
+    }
+    allowed_values {
+      list {
+        type: DT_INT32
+        type: DT_INT64
+      }
+    }
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_UINT8
+        type: DT_INT8
+        type: DT_INT32
+        type: DT_INT64
+        type: DT_BOOL
+        type: DT_HALF
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_STRING
+      }
+    }
+  }
+}
 op {
   name: "Rint"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index b0304f2486..0ff321aed5 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -19082,6 +19082,7 @@ op {
         type: DT_DOUBLE
         type: DT_COMPLEX64
         type: DT_COMPLEX128
+        type: DT_STRING
       }
     }
   }
@@ -19183,6 +19184,7 @@ op {
         type: DT_DOUBLE
         type: DT_COMPLEX64
         type: DT_COMPLEX128
+        type: DT_STRING
       }
     }
   }
-- 
GitLab


From 36f44df832fb7cc8c893819813a11d96b953aa8f Mon Sep 17 00:00:00 2001
From: "freedom\" Koan-Sin Tan" <koansin.tan@gmail.com>
Date: Wed, 17 May 2017 01:12:29 +0800
Subject: [PATCH 1395/1563] gif decoder returns 4-D tensor, remove the first
 dim (#9877)

* gif decoder returns 4-D tensor, remove the first dim

* Mention that only single-frame GIFs are supported
---
 tensorflow/examples/label_image/main.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
index 3351109f45..d98a5c31ab 100644
--- a/tensorflow/examples/label_image/main.cc
+++ b/tensorflow/examples/label_image/main.cc
@@ -30,6 +30,9 @@ limitations under the License.
 // the top of the main() function.
 //
 // The googlenet_graph.pb file included by default is created from Inception.
+//
+// Note that, for GIF inputs, to reuse existing code, only single-frame ones
+// are supported.
 
 #include <fstream>
 #include <utility>
@@ -103,7 +106,10 @@ Status ReadTensorFromImageFile(const string& file_name, const int input_height,
     image_reader = DecodePng(root.WithOpName("png_reader"), file_reader,
                              DecodePng::Channels(wanted_channels));
   } else if (tensorflow::StringPiece(file_name).ends_with(".gif")) {
-    image_reader = DecodeGif(root.WithOpName("gif_reader"), file_reader);
+    // gif decoder returns 4-D tensor, remove the first dim
+    image_reader = Squeeze(root.WithOpName("squeeze_first_dim"),
+                           DecodeGif(root.WithOpName("gif_reader"),
+                                     file_reader));
   } else {
     // Assume if it's neither a PNG nor a GIF then it must be a JPEG.
     image_reader = DecodeJpeg(root.WithOpName("jpeg_reader"), file_reader,
-- 
GitLab


From deed76c536eb91f61ac6a31ce3c5175db60eb0a4 Mon Sep 17 00:00:00 2001
From: David Norman <DavidNorman@users.noreply.github.com>
Date: Tue, 16 May 2017 18:13:14 +0100
Subject: [PATCH 1396/1563] [XLA] Add F16 support to the Literal protobuf and
 LiteralUtils class. (#9913)

* Add F16 support to the Literal protobuf and LiteralUtils class.

No support has been added to any public backend, however the unit
tests demonstrate that the literals can store and retreive data
correctly.

* Changes after code review

* Use an alternative form of local initialization

* Change a few more C-style casts to C++ casts
---
 tensorflow/compiler/tf2xla/xla_helpers.cc    |   8 +-
 tensorflow/compiler/xla/literal_util.cc      |  65 +++++++-
 tensorflow/compiler/xla/literal_util.h       | 167 +++++++------------
 tensorflow/compiler/xla/literal_util_test.cc |  71 ++++++++
 tensorflow/compiler/xla/primitive_util.cc    |   5 +
 tensorflow/compiler/xla/primitive_util.h     |   6 +
 tensorflow/compiler/xla/types.h              |   4 +
 tensorflow/compiler/xla/xla_data.proto       |   1 +
 8 files changed, 216 insertions(+), 111 deletions(-)

diff --git a/tensorflow/compiler/tf2xla/xla_helpers.cc b/tensorflow/compiler/tf2xla/xla_helpers.cc
index 10d8b67bbd..f8589edafc 100644
--- a/tensorflow/compiler/tf2xla/xla_helpers.cc
+++ b/tensorflow/compiler/tf2xla/xla_helpers.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/compiler/tf2xla/type_util.h"
 #include "tensorflow/compiler/tf2xla/xla_context.h"
 #include "tensorflow/compiler/xla/client/computation_builder.h"
+#include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
 
@@ -89,7 +90,9 @@ xla::ComputationDataHandle XlaHelpers::IntegerLiteral(
     case xla::U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case xla::F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      literal = *xla::LiteralUtil::CreateR0<xla::half>(
+              static_cast<xla::half>(value));
+      break;
     case xla::TUPLE:
       LOG(FATAL) << "tuple element type is not integral";
     case xla::OPAQUE:
@@ -107,6 +110,9 @@ xla::ComputationDataHandle XlaHelpers::FloatLiteral(xla::ComputationBuilder* b,
   xla::PrimitiveType type;
   TF_CHECK_OK(DataTypeToPrimitiveType(data_type, &type));
   switch (type) {
+    case xla::F16:
+      return b->ConstantR0<xla::half>(static_cast<xla::half>(value));
+      break;
     case xla::F32:
       return b->ConstantR0<float>(static_cast<float>(value));
       break;
diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index e3bc856fc0..0f622f9153 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -148,6 +148,9 @@ template <typename T>
     case S64:
       return CopyRange<int64>(src_literal, src_base, dest_literal, dest_base,
                               copy_size);
+    case F16:
+      return CopyRange<half>(src_literal, src_base, dest_literal, dest_base,
+                             copy_size);
     case F32:
       return CopyRange<float>(src_literal, src_base, dest_literal, dest_base,
                               copy_size);
@@ -178,6 +181,8 @@ template <typename T>
       return *LiteralUtil::CreateR0<int32>(0);
     case S64:
       return *LiteralUtil::CreateR0<int64>(0);
+    case F16:
+      return *LiteralUtil::CreateR0<half>(static_cast<half>(0.0f));
     case F32:
       return *LiteralUtil::CreateR0<float>(0);
     case F64:
@@ -187,8 +192,6 @@ template <typename T>
     case S16:
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
-    case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
     case TUPLE:
       LOG(FATAL) << "tuple element type cannot take on value of 0";
     case OPAQUE:
@@ -222,7 +225,7 @@ template <typename T>
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      return *LiteralUtil::CreateR0<half>(static_cast<half>(1.0f));
     case TUPLE:
       LOG(FATAL) << "tuple element type cannot take on value of 1";
     case OPAQUE:
@@ -258,7 +261,8 @@ template <typename T>
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      return *LiteralUtil::CreateR0<half>(
+              static_cast<half>(-std::numeric_limits<float>::infinity()));
     case TUPLE:
       LOG(FATAL) << "tuple element type has no minimum value";
     case OPAQUE:
@@ -294,7 +298,8 @@ template <typename T>
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      return *LiteralUtil::CreateR0<half>(
+              static_cast<half>(std::numeric_limits<float>::infinity()));
     case TUPLE:
       LOG(FATAL) << "tuple element type has no maximum value";
     case OPAQUE:
@@ -498,6 +503,8 @@ template <typename T>
       return tensorflow::strings::StrCat(Get<float>(literal, multi_index));
     case F64:
       return tensorflow::strings::StrCat(Get<double>(literal, multi_index));
+    case F16:
+      return tensorflow::strings::StrCat(Get<half>(literal, multi_index));
     default:
       return tensorflow::strings::StrCat(
           "[", PrimitiveType_Name(literal.shape().element_type()), "]");
@@ -652,6 +659,8 @@ template <typename T>
       return reinterpret_cast<const void*>(literal.f32s().data());
     case F64:
       return reinterpret_cast<const void*>(literal.f64s().data());
+    case F16:
+      return reinterpret_cast<const void*>(literal.f16s().data());
     default:
       LOG(FATAL) << "primitive type not supported in literals: "
                  << PrimitiveType_Name(literal.shape().element_type());
@@ -691,6 +700,8 @@ template <typename T>
       break;
     case F64:
       Resize<double>(num_elements, 0, literal);
+    case F16:
+      Resize<half>(num_elements, static_cast<half>(0.0f), literal);
       break;
     default:
       LOG(FATAL) << "primitive type not supported in literals: "
@@ -728,6 +739,9 @@ template <typename T>
     case F64:
       actual = literal.f64s_size();
       break;
+    case F16:
+      actual = literal.f16s().size() / sizeof(half);
+      break;
     default:
       return tensorflow::errors::Unimplemented(
           "unhandled element type for literal validation: " +
@@ -818,6 +832,8 @@ bool EqualElements(const Literal& literal1, const Literal& literal2,
         return EqualElements<float>(literal1, literal2, 0, &multi_index);
       case F64:
         return EqualElements<double>(literal1, literal2, 0, &multi_index);
+      case F16:
+        return EqualElements<half>(literal1, literal2, 0, &multi_index);
       default:
         LOG(FATAL) << "Unimplemented: LiteralUtil::Equal for type "
                    << PrimitiveType_Name(literal1.shape().element_type());
@@ -916,6 +932,19 @@ LiteralUtil::GetMutableArraySlice(Literal* literal) {
                                                     values->size());
 }
 
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<half>
+LiteralUtil::GetMutableArraySlice<half>(Literal* literal) {
+  // C++11 standard, basic_string 21.4.1.5, values should be stored
+  // contiguously. From C++17 a mutable data() member will be provided.
+  // TODO - there is an endianess problem here. fix it, or wait for uint16
+  //        support in protobuf
+  auto values = literal->mutable_f16s();
+  return tensorflow::gtl::MutableArraySlice<half>(
+          reinterpret_cast<half*>(&(*values)[0]),
+          values->size() / sizeof(half));
+}
+
 template <>
 /* static */ tensorflow::gtl::ArraySlice<bool> LiteralUtil::GetArraySlice<bool>(
     const Literal& literal) {
@@ -976,6 +1005,15 @@ LiteralUtil::GetArraySlice<double>(const Literal& literal) {
   return literal.f64s();
 }
 
+template <>
+/* static */ tensorflow::gtl::ArraySlice<half>
+LiteralUtil::GetArraySlice<half>(const Literal& literal) {
+  CHECK_EQ(literal.shape().element_type(), F16);
+  return tensorflow::gtl::ArraySlice<half>(
+          reinterpret_cast<const half*>(literal.f16s().data()),
+          literal.f16s().size() / sizeof(half));
+}
+
 template <typename NativeT>
 static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
   for (int64 i = 0; i < ShapeUtil::ElementsIn(literal.shape()); ++i) {
@@ -1015,6 +1053,8 @@ static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
       return AllElementsEqualValue<float>(literal, value);
     case F64:
       return AllElementsEqualValue<double>(literal, value);
+    case F16:
+      return AllElementsEqualValue<half>(literal, static_cast<half>(value));
     case PRED:
       if (value == 0) {
         return AllElementsEqualValue<bool>(literal, false);
@@ -1034,6 +1074,8 @@ static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
       return AllElementsEqualValue<float>(literal, value);
     case F64:
       return AllElementsEqualValue<double>(literal, value);
+    case F16:
+      return AllElementsEqualValue<half>(literal, static_cast<half>(value));
     default:
       return false;
   }
@@ -1058,6 +1100,8 @@ static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
       return Get<float>(literal, indices) == 0.0f;
     case F64:
       return Get<double>(literal, indices) == 0.0;
+    case F16:
+      return Get<half>(literal, indices) == static_cast<half>(0.0f);
     case PRED:
       return Get<bool>(literal, indices) == false;
     default:
@@ -1128,4 +1172,15 @@ template <>
   literal->mutable_f64s()->Resize(num_elements, value);
 }
 
+template <>
+/* static */ void LiteralUtil::Resize<half>(int64 num_elements, half value,
+                                            Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_f16s()->resize(num_elements * sizeof(half));
+  auto data = GetMutableArraySlice<half>(literal);
+  for (int i = 0; i < num_elements; i++) {
+    data[i] = value;
+  }
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index 0ea7186040..2da010d56e 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -505,6 +505,10 @@ template <>
 /* static */ tensorflow::gtl::ArraySlice<double>
 LiteralUtil::GetArraySlice<double>(const Literal& literal);
 
+template <>
+/* static */ tensorflow::gtl::ArraySlice<half>
+LiteralUtil::GetArraySlice<half>(const Literal& literal);
+
 template <>
 /* static */ tensorflow::gtl::MutableArraySlice<bool>
 LiteralUtil::GetMutableArraySlice(Literal* literal);
@@ -541,6 +545,50 @@ template <>
 /* static */ tensorflow::gtl::MutableArraySlice<double>
 LiteralUtil::GetMutableArraySlice(Literal* literal);
 
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<half>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<bool>(int64 num_elements, bool value,
+                                            Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int8>(int64 num_elements, int8 value,
+                                            Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int32>(int64 num_elements, int32 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint32>(int64 num_elements, uint32 value,
+                                              Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int64>(int64 num_elements, int64 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint64>(int64 num_elements, uint64 value,
+                                              Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<float>(int64 num_elements, float value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<double>(int64 num_elements, double value,
+                                              Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<half>(int64 num_elements, half value,
+                                            Literal* literal);
+
 template <typename NativeT>
 /* static */ std::unique_ptr<Literal> LiteralUtil::CreateR0(NativeT value) {
   auto literal = MakeUnique<Literal>();
@@ -770,6 +818,14 @@ template <>
   return literal.u8s()[linear_index];
 }
 
+template <>
+/* static */ inline half LiteralUtil::Get<half>(
+    const Literal& literal, tensorflow::gtl::ArraySlice<int64> multi_index) {
+  CHECK(literal.shape().element_type() == F16);
+  int64 linear_index = LinearIndex(literal, multi_index);
+  return GetArraySlice<half>(literal)[linear_index];
+}
+
 template <typename NativeT>
 /* static */ void LiteralUtil::Set(
     Literal* literal, tensorflow::gtl::ArraySlice<int64> multi_index,
@@ -834,76 +890,13 @@ template <typename NativeT>
   } while (IndexUtil::BumpIndices(literal.shape(), &indices));
 }
 
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<bool>(bool value,
-                                                       Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<bool>(), {});
-  literal->mutable_preds()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<uint8>(uint8 value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<uint8>(), {});
-  literal->mutable_u8s()->push_back(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<int8>(int8 value,
-                                                       Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<int8>(), {});
-  literal->mutable_u8s()->push_back(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<uint32>(uint32 value,
-                                                         Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<uint32>(), {});
-  literal->mutable_u32s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<int32>(int32 value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<int32>(), {});
-  literal->mutable_s32s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<uint64>(uint64 value,
-                                                         Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<uint64>(), {});
-  literal->mutable_u64s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<int64>(int64 value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<int64>(), {});
-  literal->mutable_s64s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<float>(float value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<float>(), {});
-  literal->mutable_f32s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<double>(double value,
-                                                         Literal* literal) {
+template <typename NativeT>
+/* static */ inline void LiteralUtil::PopulateR0(NativeT value,
+                                                 Literal* literal) {
   *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<double>(), {});
-  literal->mutable_f64s()->Add(value);
+      ShapeUtil::MakeShape(
+              primitive_util::NativeToPrimitiveType<NativeT>(), {});
+  Resize<NativeT>(1, value, literal);
 }
 
 template <typename NativeT>
@@ -1116,42 +1109,6 @@ template <typename NativeSrcT, typename NativeDestT>
   return result_literal;
 }
 
-template <>
-/* static */ void LiteralUtil::Resize<bool>(int64 num_elements, bool value,
-                                            Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<int8>(int64 num_elements, int8 value,
-                                            Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<int32>(int64 num_elements, int32 value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<uint32>(int64 num_elements, uint32 value,
-                                              Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<int64>(int64 num_elements, int64 value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<uint64>(int64 num_elements, uint64 value,
-                                              Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<float>(int64 num_elements, float value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<double>(int64 num_elements, double value,
-                                              Literal* literal);
-
 template <typename NativeT>
 /* static */ std::unique_ptr<Literal>
 LiteralUtil::CreateFullWithMonotonicDim0MajorLayout(
diff --git a/tensorflow/compiler/xla/literal_util_test.cc b/tensorflow/compiler/xla/literal_util_test.cc
index 7acb9933da..9a09822174 100644
--- a/tensorflow/compiler/xla/literal_util_test.cc
+++ b/tensorflow/compiler/xla/literal_util_test.cc
@@ -105,6 +105,9 @@ TEST_F(LiteralUtilTest, LiteralScalarToString) {
 
   auto f32_lit = LiteralUtil::CreateR0<float>(3.14f);
   ASSERT_EQ("3.14", LiteralUtil::ToString(*f32_lit));
+
+  auto f16_lit = LiteralUtil::CreateR0<half>(static_cast<half>(0.5f));
+  ASSERT_EQ("0.5", LiteralUtil::ToString(*f16_lit));
 }
 
 TEST_F(LiteralUtilTest, LiteralVectorToString) {
@@ -373,6 +376,15 @@ TEST_F(LiteralUtilTest, IsAll) {
   EXPECT_FALSE(
       LiteralUtil::IsAll(*LiteralUtil::CreateR2<uint64>({{9, 8}, {8, 8}}), 8));
 
+  half h8(8.0f);
+  half h9(9.0f);
+  EXPECT_TRUE(
+      LiteralUtil::IsAll(*LiteralUtil::CreateR2<half>({{h8}, {h8}}), 8));
+  EXPECT_FALSE(
+      LiteralUtil::IsAll(*LiteralUtil::CreateR2<half>({{h8}, {h9}}), 8));
+  EXPECT_FALSE(
+      LiteralUtil::IsAll(*LiteralUtil::CreateR2<half>({{h9}, {h8}}), 8));
+
   auto uint64_max = std::numeric_limits<uint64>::max();
   EXPECT_FALSE(LiteralUtil::IsAll(
       *LiteralUtil::CreateR2<uint64>(
@@ -659,6 +671,30 @@ TEST_F(LiteralUtilTest, PopulateWithValueR2U64) {
   EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
 }
 
+TEST_F(LiteralUtilTest, PopulateWithValueR0F16) {
+  Literal output;
+  half h(0.25f);
+  LiteralUtil::PopulateWithValue<half>(h, {}, &output);
+  auto expected = LiteralUtil::CreateR0<half>(h);
+  EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
+}
+
+TEST_F(LiteralUtilTest, PopulateWithValueR1F16) {
+  Literal output;
+  half h(0.5f);
+  LiteralUtil::PopulateWithValue<half>(h, {3}, &output);
+  auto expected = LiteralUtil::CreateR1<half>({h, h, h});
+  EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
+}
+
+TEST_F(LiteralUtilTest, PopulateWithValueR2F16) {
+  Literal output;
+  half h(2.0f);
+  LiteralUtil::PopulateWithValue<half>(h, {2, 2}, &output);
+  auto expected = LiteralUtil::CreateR2<half>({{h, h}, {h, h}});
+  EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
+}
+
 TEST_F(LiteralUtilTest, ReplicateR2U32) {
   auto input = LiteralUtil::CreateR2<uint32>(
       {{1, 2, 3, 4}, {5, 6, 7, 8}, {9, 10, 11, 12}});
@@ -730,6 +766,41 @@ TEST_F(LiteralUtilTest, CopyScalars) {
   EXPECT_EQ(LiteralUtil::Get<uint32>(*vect, {4}), 17);
 }
 
+TEST_F(LiteralUtilTest, F16) {
+  // Verify that the internal data views are consistent and that they
+  // are in little endian format
+  // TODO - modify if we make the data format machine endianess dependent
+  auto m1 = LiteralUtil::CreateFromShape(ShapeUtil::MakeShape(F16, {2, 2}));
+  Literal* l1 = m1.get();
+  const char* d1 = (const char*)LiteralUtil::InternalData(*l1);
+  EXPECT_EQ(d1[0], 0);
+  EXPECT_EQ(d1[1], 0);
+  EXPECT_EQ(d1[2], 0);
+  EXPECT_EQ(d1[3], 0);
+  EXPECT_EQ(d1[4], 0);
+  EXPECT_EQ(d1[5], 0);
+  EXPECT_EQ(d1[6], 0);
+  EXPECT_EQ(d1[7], 0);
+  EXPECT_EQ(LiteralUtil::InternalData(*l1),
+            LiteralUtil::MutableInternalData(l1));
+
+  half h1(1.0f);
+  half h2(2.0f);
+  auto m2 = LiteralUtil::CreateR2<half>({{h1, h2}, {h2, h1}});
+  Literal* l2 = m2.get();
+  const char* d2 = (const char*)LiteralUtil::InternalData(*l2);
+  EXPECT_EQ(d2[0], 0);
+  EXPECT_EQ(d2[1], 0x3C);
+  EXPECT_EQ(d2[2], 0);
+  EXPECT_EQ(d2[3], 0x40);
+  EXPECT_EQ(d2[4], 0);
+  EXPECT_EQ(d2[5], 0x40);
+  EXPECT_EQ(d2[6], 0);
+  EXPECT_EQ(d2[7], 0x3C);
+  EXPECT_EQ(LiteralUtil::InternalData(*l2),
+            LiteralUtil::MutableInternalData(l2));
+}
+
 TEST_F(LiteralUtilTest, Populate) {
   struct PopulateData {
     std::vector<int64> dimensions;
diff --git a/tensorflow/compiler/xla/primitive_util.cc b/tensorflow/compiler/xla/primitive_util.cc
index e3909ae8e9..e4e37177a2 100644
--- a/tensorflow/compiler/xla/primitive_util.cc
+++ b/tensorflow/compiler/xla/primitive_util.cc
@@ -78,6 +78,11 @@ PrimitiveType NativeToPrimitiveType<double>() {
   return F64;
 }
 
+template <>
+PrimitiveType NativeToPrimitiveType<half>() {
+  return F16;
+}
+
 bool IsFloatingPointType(PrimitiveType type) {
   return type == F16 || type == F32 || type == F64;
 }
diff --git a/tensorflow/compiler/xla/primitive_util.h b/tensorflow/compiler/xla/primitive_util.h
index 78f0ee6f59..162a11c7d2 100644
--- a/tensorflow/compiler/xla/primitive_util.h
+++ b/tensorflow/compiler/xla/primitive_util.h
@@ -75,6 +75,8 @@ template <>
 PrimitiveType NativeToPrimitiveType<float>();
 template <>
 PrimitiveType NativeToPrimitiveType<double>();
+template <>
+PrimitiveType NativeToPrimitiveType<half>();
 
 bool IsFloatingPointType(PrimitiveType type);
 
@@ -150,6 +152,10 @@ template <>
 struct PrimitiveTypeToNative<F64> {
   using type = double;
 };
+template <>
+struct PrimitiveTypeToNative<F16> {
+  using type = half;
+};
 
 }  // namespace primitive_util
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/types.h b/tensorflow/compiler/xla/types.h
index 8258031a2c..8d8e66715a 100644
--- a/tensorflow/compiler/xla/types.h
+++ b/tensorflow/compiler/xla/types.h
@@ -18,6 +18,8 @@ limitations under the License.
 
 #include "tensorflow/core/platform/types.h"
 
+#include <Eigen/Core>
+
 namespace xla {
 
 using ::tensorflow::string;
@@ -32,6 +34,8 @@ using ::tensorflow::uint16;
 using ::tensorflow::uint32;
 using ::tensorflow::uint64;
 
+using ::Eigen::half;
+
 }  // namespace xla
 
 #endif  // TENSORFLOW_COMPILER_XLA_TYPES_H_
diff --git a/tensorflow/compiler/xla/xla_data.proto b/tensorflow/compiler/xla/xla_data.proto
index e5b94fcefe..52189fb5d7 100644
--- a/tensorflow/compiler/xla/xla_data.proto
+++ b/tensorflow/compiler/xla/xla_data.proto
@@ -286,6 +286,7 @@ message Literal {
   repeated float f32s = 8;
   repeated double f64s = 9;
   repeated Literal tuple_literals = 10;
+  bytes f16s = 11; // Note: the F16s are encoded in little endian byte order
 }
 
 message WindowDimension {
-- 
GitLab


From 970e81f2d192a7b47a5f10306574fd3d3f5cb2fb Mon Sep 17 00:00:00 2001
From: Ikaro Silva <ikarosilva@yahoo.com>
Date: Tue, 16 May 2017 13:16:17 -0400
Subject: [PATCH 1397/1563] [DOCS] Updating PredictionType args definition
 (#9919)

[DOCS] Updating PredictionType value for DynamicRNN
---
 .../learn/python/learn/estimators/dynamic_rnn_estimator.py    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
index fc092fccd7..1724d7599d 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
@@ -597,8 +597,8 @@ class DynamicRnnEstimator(estimator.Estimator):
         `ProblemType.CLASSIFICATION` or `ProblemType.LINEAR_REGRESSION`.
       prediction_type: whether the `Estimator` should return a value for each
         step in the sequence, or just a single value for the final time step.
-        Must be one of `ProblemType.SINGLE_VALUE` or
-        `ProblemType.MULTIPLE_VALUE`.
+        Must be one of `PredictionType.SINGLE_VALUE` or
+        `PredictionType.MULTIPLE_VALUE`.
       sequence_feature_columns: An iterable containing all the feature columns
         describing sequence features. All items in the iterable should be
         instances of classes derived from `FeatureColumn`.
-- 
GitLab


From e58236a0586462906fbae2bee6713eb24cad869e Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 10:31:58 -0700
Subject: [PATCH 1398/1563] Clarify error message. The checked condition is not
 whether model_fn has four arguments, but whether the fourth argument is
 called 'params'.

PiperOrigin-RevId: 156198632
---
 .../contrib/learn/python/learn/estimators/estimator.py       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index e8142b659b..1af31b933b 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -1085,8 +1085,9 @@ class Estimator(BaseEstimator):
       # Check number of arguments of the given function matches requirements.
       model_fn_args = _model_fn_args(model_fn)
       if params is not None and 'params' not in model_fn_args:
-        raise ValueError('Estimator\'s model_fn (%s) has less than 4 '
-                         'arguments, but not None params (%s) are passed.' %
+        raise ValueError('Estimator\'s model_fn (%s) does not have a params '
+                         'argument, but params (%s) were passed to the '
+                         'Estimator\'s constructor.' %
                          (model_fn, params))
       if params is None and 'params' in model_fn_args:
         logging.warning('Estimator\'s model_fn (%s) includes params '
-- 
GitLab


From 69433c1f1adef96fde2074b05d3362e88d8587de Mon Sep 17 00:00:00 2001
From: Mathew Wicks <thesuperzapper@users.noreply.github.com>
Date: Wed, 17 May 2017 06:12:27 +1200
Subject: [PATCH 1399/1563] TFLearn Estimator Summary Writer Fix (#7555)

* Fix evaluation summary writing. TFLearn

* Update estimator.py

Fixed White Space

* Fix similar issue.

Fix similar issue under, `tensorflow/python/estimators/estimator.py`

* Filter out "global_step"

This is seemingly the best way to ensure we don't write "global_step" to the summary, (which would be useless), while not modifying the dictionary.

(Pull request for the other `estimator.py` incoming.)

* Filter "global_step" [part 2]

Same as other `estimator.py`.
---
 .../contrib/learn/python/learn/estimators/estimator.py | 10 ++++++++--
 tensorflow/python/estimator/estimator.py               | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index e8142b659b..3f54e5ee2c 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -331,13 +331,19 @@ def _write_dict_to_summary(output_dir,
   for key in dictionary:
     if dictionary[key] is None:
       continue
+    if key  == "global_step":
+      continue
     value = summary_proto.value.add()
     value.tag = key
-    if (isinstance(dictionary[key], np.float32) or
+    if (isinstance(dictionary[key], np.float32) or 
         isinstance(dictionary[key], float)):
       value.simple_value = float(dictionary[key])
+    elif (isinstance(dictionary[key], np.int64) or
+          isinstance(dictionary[key], np.int32) or
+          isinstance(dictionary[key], int)):
+      value.simple_value = int(dictionary[key])
     else:
-      logging.warn('Skipping summary for %s, must be a float or np.float32.',
+      logging.warn('Skipping summary for %s, must be a float, np.float32, np.int64, np.int32 or int.',
                    key)
   summary_writer.add_summary(summary_proto, current_global_step)
   summary_writer.flush()
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 735bfca4f7..f32567b880 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -817,13 +817,19 @@ def _write_dict_to_summary(output_dir,
   for key in dictionary:
     if dictionary[key] is None:
       continue
+    if key  == "global_step":
+      continue
     value = summary_proto.value.add()
     value.tag = key
-    if (isinstance(dictionary[key], np.float32) or
+    if (isinstance(dictionary[key], np.float32) or 
         isinstance(dictionary[key], float)):
       value.simple_value = float(dictionary[key])
+    elif (isinstance(dictionary[key], np.int64) or
+          isinstance(dictionary[key], np.int32) or
+          isinstance(dictionary[key], int)):
+      value.simple_value = int(dictionary[key])
     else:
-      logging.warn('Skipping summary for %s, must be a float or np.float32.',
+      logging.warn('Skipping summary for %s, must be a float, np.float32, np.int64, np.int32 or int.',
                    key)
   summary_writer.add_summary(summary_proto, current_global_step)
   summary_writer.flush()
-- 
GitLab


From bc59b80fc8688b4249a8bbec424d1d1fb8d7dd7b Mon Sep 17 00:00:00 2001
From: Ian Langmore <langmore@google.com>
Date: Tue, 16 May 2017 11:24:01 -0700
Subject: [PATCH 1400/1563] LinearOperator.apply --> .matmul and .matvec
 LinearOperator.solve --> .solve and .solvevec

PiperOrigin-RevId: 156206294
---
 .../bijectors/affine_linear_operator_impl.py  |   2 +-
 .../python/ops/mvn_linear_operator.py         |  10 +-
 .../ops/vector_laplace_linear_operator.py     |  10 +-
 .../linear_operator_composition_test.py       |  12 +-
 .../kernel_tests/linear_operator_diag_test.py |  12 +-
 .../linear_operator_identity_test.py          |  64 ++++----
 .../kernel_tests/linear_operator_test.py      |  51 ++++--
 .../linalg/python/ops/linear_operator.py      | 153 +++++++++++++++---
 .../python/ops/linear_operator_addition.py    |   2 +-
 .../python/ops/linear_operator_composition.py |  24 +--
 .../linalg/python/ops/linear_operator_diag.py |  10 +-
 .../python/ops/linear_operator_full_matrix.py |   8 +-
 .../python/ops/linear_operator_identity.py    |  28 ++--
 .../python/ops/linear_operator_test_util.py   |  22 +--
 .../linalg/python/ops/linear_operator_tril.py |   8 +-
 .../python/ops/linear_operator_udvh_update.py |  22 +--
 .../linalg/python/ops/linear_operator_util.py |   4 +-
 17 files changed, 288 insertions(+), 154 deletions(-)

diff --git a/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py b/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py
index c1be9d5a77..ae380b5cb2 100644
--- a/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py
+++ b/tensorflow/contrib/distributions/python/ops/bijectors/affine_linear_operator_impl.py
@@ -193,7 +193,7 @@ class AffineLinearOperator(bijector.Bijector):
           y, expand_batch_dim=False)
       with ops.control_dependencies(self._maybe_collect_assertions() if
                                     self.validate_args else []):
-        y = self.scale.apply(y)
+        y = self.scale.matmul(y)
       y = self._shaper.undo_make_batch_of_event_sample_matrices(
           y, sample_shape, expand_batch_dim=False)
     if self.shift is not None:
diff --git a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
index 15e699906f..b25250d367 100644
--- a/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
+++ b/tensorflow/contrib/distributions/python/ops/mvn_linear_operator.py
@@ -238,7 +238,7 @@ class MultivariateNormalLinearOperator(
     if distribution_util.is_diagonal_scale(self.scale):
       return array_ops.matrix_diag(math_ops.square(self.scale.diag_part()))
     else:
-      return self.scale.apply(self.scale.to_dense(), adjoint_arg=True)
+      return self.scale.matmul(self.scale.to_dense(), adjoint_arg=True)
 
   def _variance(self):
     if distribution_util.is_diagonal_scale(self.scale):
@@ -246,10 +246,10 @@ class MultivariateNormalLinearOperator(
     elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
           and self.scale.is_self_adjoint):
       return array_ops.matrix_diag_part(
-          self.scale.apply(self.scale.to_dense()))
+          self.scale.matmul(self.scale.to_dense()))
     else:
       return array_ops.matrix_diag_part(
-          self.scale.apply(self.scale.to_dense(), adjoint_arg=True))
+          self.scale.matmul(self.scale.to_dense(), adjoint_arg=True))
 
   def _stddev(self):
     if distribution_util.is_diagonal_scale(self.scale):
@@ -257,10 +257,10 @@ class MultivariateNormalLinearOperator(
     elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
           and self.scale.is_self_adjoint):
       return math_ops.sqrt(array_ops.matrix_diag_part(
-          self.scale.apply(self.scale.to_dense())))
+          self.scale.matmul(self.scale.to_dense())))
     else:
       return math_ops.sqrt(array_ops.matrix_diag_part(
-          self.scale.apply(self.scale.to_dense(), adjoint_arg=True)))
+          self.scale.matmul(self.scale.to_dense(), adjoint_arg=True)))
 
   def _mode(self):
     return self._mean()
diff --git a/tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py b/tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py
index 346835dd59..fd2c46d94d 100644
--- a/tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py
+++ b/tensorflow/contrib/distributions/python/ops/vector_laplace_linear_operator.py
@@ -266,7 +266,7 @@ class VectorLaplaceLinearOperator(
     if distribution_util.is_diagonal_scale(self.scale):
       return 2. * array_ops.matrix_diag(math_ops.square(self.scale.diag_part()))
     else:
-      return 2. * self.scale.apply(self.scale.to_dense(), adjoint_arg=True)
+      return 2. * self.scale.matmul(self.scale.to_dense(), adjoint_arg=True)
 
   def _variance(self):
     if distribution_util.is_diagonal_scale(self.scale):
@@ -274,10 +274,10 @@ class VectorLaplaceLinearOperator(
     elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
           and self.scale.is_self_adjoint):
       return array_ops.matrix_diag_part(
-          2. * self.scale.apply(self.scale.to_dense()))
+          2. * self.scale.matmul(self.scale.to_dense()))
     else:
       return 2. * array_ops.matrix_diag_part(
-          self.scale.apply(self.scale.to_dense(), adjoint_arg=True))
+          self.scale.matmul(self.scale.to_dense(), adjoint_arg=True))
 
   def _stddev(self):
     if distribution_util.is_diagonal_scale(self.scale):
@@ -285,10 +285,10 @@ class VectorLaplaceLinearOperator(
     elif (isinstance(self.scale, linalg.LinearOperatorUDVHUpdate)
           and self.scale.is_self_adjoint):
       return np.sqrt(2) * math_ops.sqrt(array_ops.matrix_diag_part(
-          self.scale.apply(self.scale.to_dense())))
+          self.scale.matmul(self.scale.to_dense())))
     else:
       return np.sqrt(2) * math_ops.sqrt(array_ops.matrix_diag_part(
-          self.scale.apply(self.scale.to_dense(), adjoint_arg=True)))
+          self.scale.matmul(self.scale.to_dense(), adjoint_arg=True)))
 
   def _mode(self):
     return self._mean()
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py
index 0585a0ba5a..e2a7f5fbe1 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_composition_test.py
@@ -77,9 +77,9 @@ class SquareLinearOperatorCompositionTest(
 
     # Convert back to Tensor.  Needed if use_placeholder, since then we have
     # already evaluated each matrix to a numpy array.
-    apply_order_list = list(reversed(matrices))
-    mat = ops.convert_to_tensor(apply_order_list[0])
-    for other_mat in apply_order_list[1:]:
+    matmul_order_list = list(reversed(matrices))
+    mat = ops.convert_to_tensor(matmul_order_list[0])
+    for other_mat in matmul_order_list[1:]:
       mat = math_ops.matmul(other_mat, mat)
 
     return operator, mat, feed_dict
@@ -188,9 +188,9 @@ class NonSquareLinearOperatorCompositionTest(
 
     # Convert back to Tensor.  Needed if use_placeholder, since then we have
     # already evaluated each matrix to a numpy array.
-    apply_order_list = list(reversed(matrices))
-    mat = ops.convert_to_tensor(apply_order_list[0])
-    for other_mat in apply_order_list[1:]:
+    matmul_order_list = list(reversed(matrices))
+    mat = ops.convert_to_tensor(matmul_order_list[0])
+    for other_mat in matmul_order_list[1:]:
       mat = math_ops.matmul(other_mat, mat)
 
     return operator, mat, feed_dict
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_diag_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_diag_test.py
index 3bb81a4333..397bfa2215 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_diag_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_diag_test.py
@@ -122,7 +122,7 @@ class LinearOperatorDiagTest(
     with self.assertRaisesRegexp(ValueError, "must have at least 1 dimension"):
       linalg.LinearOperatorDiag(1.)
 
-  def test_broadcast_apply_and_solve(self):
+  def test_broadcast_matmul_and_solve(self):
     # These cannot be done in the automated (base test class) tests since they
     # test shapes that tf.matmul cannot handle.
     # In particular, tf.matmul does not broadcast.
@@ -130,7 +130,7 @@ class LinearOperatorDiagTest(
       x = random_ops.random_normal(shape=(2, 2, 3, 4))
 
       # This LinearOperatorDiag will be brodacast to (2, 2, 3, 3) during solve
-      # and apply with 'x' as the argument.
+      # and matmul with 'x' as the argument.
       diag = random_ops.random_uniform(shape=(2, 1, 3))
       operator = linalg.LinearOperatorDiag(diag, is_self_adjoint=True)
       self.assertAllEqual((2, 1, 3, 3), operator.shape)
@@ -140,10 +140,10 @@ class LinearOperatorDiagTest(
       mat = array_ops.matrix_diag(diag_broadcast)
       self.assertAllEqual((2, 2, 3, 3), mat.get_shape())  # being pedantic.
 
-      operator_apply = operator.apply(x)
-      mat_apply = math_ops.matmul(mat, x)
-      self.assertAllEqual(operator_apply.get_shape(), mat_apply.get_shape())
-      self.assertAllClose(*sess.run([operator_apply, mat_apply]))
+      operator_matmul = operator.matmul(x)
+      mat_matmul = math_ops.matmul(mat, x)
+      self.assertAllEqual(operator_matmul.get_shape(), mat_matmul.get_shape())
+      self.assertAllClose(*sess.run([operator_matmul, mat_matmul]))
 
       operator_solve = operator.solve(x)
       mat_solve = linalg_ops.matrix_solve(mat, x)
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_identity_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_identity_test.py
index 36a255f3d5..5faf2c432b 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_identity_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_identity_test.py
@@ -77,14 +77,14 @@ class LinearOperatorIdentityTest(
       operator = linalg_lib.LinearOperatorIdentity(num_rows=2)
       operator.assert_self_adjoint().run()  # Should not fail
 
-  def test_float16_apply(self):
+  def test_float16_matmul(self):
     # float16 cannot be tested by base test class because tf.matrix_solve does
     # not work with float16.
     with self.test_session():
       operator = linalg_lib.LinearOperatorIdentity(
           num_rows=2, dtype=dtypes.float16)
       x = rng.randn(2, 3).astype(np.float16)
-      y = operator.apply(x)
+      y = operator.matmul(x)
       self.assertAllClose(x, y.eval())
 
   def test_non_scalar_num_rows_raises_static(self):
@@ -147,7 +147,7 @@ class LinearOperatorIdentityTest(
     operator = linalg_lib.LinearOperatorIdentity(num_rows=2)
     x = rng.randn(3, 3).astype(np.float32)
     with self.assertRaisesRegexp(ValueError, "Dimensions.*not compatible"):
-      operator.apply(x)
+      operator.matmul(x)
 
   def test_wrong_matrix_dimensions_raises_dynamic(self):
     num_rows = array_ops.placeholder(dtypes.int32)
@@ -156,7 +156,7 @@ class LinearOperatorIdentityTest(
     with self.test_session():
       operator = linalg_lib.LinearOperatorIdentity(
           num_rows, assert_proper_shapes=True)
-      y = operator.apply(x)
+      y = operator.matmul(x)
       with self.assertRaisesOpError("Incompatible.*dimensions"):
         y.eval(feed_dict={num_rows: 2, x: rng.rand(3, 3)})
 
@@ -168,11 +168,11 @@ class LinearOperatorIdentityTest(
       x = random_ops.random_normal(shape=(1, 2, 3, 4))
       operator = linalg_lib.LinearOperatorIdentity(num_rows=3, dtype=x.dtype)
 
-      operator_apply = operator.apply(x)
+      operator_matmul = operator.matmul(x)
       expected = x
 
-      self.assertAllEqual(operator_apply.get_shape(), expected.get_shape())
-      self.assertAllClose(*sess.run([operator_apply, expected]))
+      self.assertAllEqual(operator_matmul.get_shape(), expected.get_shape())
+      self.assertAllClose(*sess.run([operator_matmul, expected]))
 
   def test_default_batch_shape_broadcasts_with_everything_dynamic(self):
     # These cannot be done in the automated (base test class) tests since they
@@ -182,15 +182,15 @@ class LinearOperatorIdentityTest(
       x = array_ops.placeholder(dtypes.float32)
       operator = linalg_lib.LinearOperatorIdentity(num_rows=3, dtype=x.dtype)
 
-      operator_apply = operator.apply(x)
+      operator_matmul = operator.matmul(x)
       expected = x
 
       feed_dict = {x: rng.randn(1, 2, 3, 4)}
 
       self.assertAllClose(
-          *sess.run([operator_apply, expected], feed_dict=feed_dict))
+          *sess.run([operator_matmul, expected], feed_dict=feed_dict))
 
-  def test_broadcast_apply_static_shapes(self):
+  def test_broadcast_matmul_static_shapes(self):
     # These cannot be done in the automated (base test class) tests since they
     # test shapes that tf.batch_matmul cannot handle.
     # In particular, tf.batch_matmul does not broadcast.
@@ -204,14 +204,14 @@ class LinearOperatorIdentityTest(
       # Batch matrix of zeros with the broadcast shape of x and operator.
       zeros = array_ops.zeros(shape=(2, 2, 3, 4), dtype=x.dtype)
 
-      # Expected result of apply and solve.
+      # Expected result of matmul and solve.
       expected = x + zeros
 
-      operator_apply = operator.apply(x)
-      self.assertAllEqual(operator_apply.get_shape(), expected.get_shape())
-      self.assertAllClose(*sess.run([operator_apply, expected]))
+      operator_matmul = operator.matmul(x)
+      self.assertAllEqual(operator_matmul.get_shape(), expected.get_shape())
+      self.assertAllClose(*sess.run([operator_matmul, expected]))
 
-  def test_broadcast_apply_dynamic_shapes(self):
+  def test_broadcast_matmul_dynamic_shapes(self):
     # These cannot be done in the automated (base test class) tests since they
     # test shapes that tf.batch_matmul cannot handle.
     # In particular, tf.batch_matmul does not broadcast.
@@ -229,12 +229,12 @@ class LinearOperatorIdentityTest(
       # Batch matrix of zeros with the broadcast shape of x and operator.
       zeros = array_ops.zeros(shape=(2, 2, 3, 4), dtype=x.dtype)
 
-      # Expected result of apply and solve.
+      # Expected result of matmul and solve.
       expected = x + zeros
 
-      operator_apply = operator.apply(x)
+      operator_matmul = operator.matmul(x)
       self.assertAllClose(
-          *sess.run([operator_apply, expected], feed_dict=feed_dict))
+          *sess.run([operator_matmul, expected], feed_dict=feed_dict))
 
   def test_is_x_flags(self):
     # The is_x flags are by default all True.
@@ -332,7 +332,7 @@ class LinearOperatorScaledIdentityTest(
       with self.assertRaisesOpError("not self-adjoint"):
         operator.assert_self_adjoint().run()
 
-  def test_float16_apply(self):
+  def test_float16_matmul(self):
     # float16 cannot be tested by base test class because tf.matrix_solve does
     # not work with float16.
     with self.test_session():
@@ -340,7 +340,7 @@ class LinearOperatorScaledIdentityTest(
       operator = linalg_lib.LinearOperatorScaledIdentity(
           num_rows=2, multiplier=multiplier)
       x = rng.randn(2, 3).astype(np.float16)
-      y = operator.apply(x)
+      y = operator.matmul(x)
       self.assertAllClose(multiplier[..., None, None] * x, y.eval())
 
   def test_non_scalar_num_rows_raises_static(self):
@@ -354,7 +354,7 @@ class LinearOperatorScaledIdentityTest(
         num_rows=2, multiplier=2.2)
     x = rng.randn(3, 3).astype(np.float32)
     with self.assertRaisesRegexp(ValueError, "Dimensions.*not compatible"):
-      operator.apply(x)
+      operator.matmul(x)
 
   def test_wrong_matrix_dimensions_raises_dynamic(self):
     num_rows = array_ops.placeholder(dtypes.int32)
@@ -363,11 +363,11 @@ class LinearOperatorScaledIdentityTest(
     with self.test_session():
       operator = linalg_lib.LinearOperatorScaledIdentity(
           num_rows, multiplier=[1., 2], assert_proper_shapes=True)
-      y = operator.apply(x)
+      y = operator.matmul(x)
       with self.assertRaisesOpError("Incompatible.*dimensions"):
         y.eval(feed_dict={num_rows: 2, x: rng.rand(3, 3)})
 
-  def test_broadcast_apply_and_solve(self):
+  def test_broadcast_matmul_and_solve(self):
     # These cannot be done in the automated (base test class) tests since they
     # test shapes that tf.batch_matmul cannot handle.
     # In particular, tf.batch_matmul does not broadcast.
@@ -383,11 +383,11 @@ class LinearOperatorScaledIdentityTest(
       # Batch matrix of zeros with the broadcast shape of x and operator.
       zeros = array_ops.zeros(shape=(2, 2, 3, 4), dtype=x.dtype)
 
-      # Test apply
+      # Test matmul
       expected = x * 2.2 + zeros
-      operator_apply = operator.apply(x)
-      self.assertAllEqual(operator_apply.get_shape(), expected.get_shape())
-      self.assertAllClose(*sess.run([operator_apply, expected]))
+      operator_matmul = operator.matmul(x)
+      self.assertAllEqual(operator_matmul.get_shape(), expected.get_shape())
+      self.assertAllClose(*sess.run([operator_matmul, expected]))
 
       # Test solve
       expected = x / 2.2 + zeros
@@ -395,7 +395,7 @@ class LinearOperatorScaledIdentityTest(
       self.assertAllEqual(operator_solve.get_shape(), expected.get_shape())
       self.assertAllClose(*sess.run([operator_solve, expected]))
 
-  def test_broadcast_apply_and_solve_scalar_scale_multiplier(self):
+  def test_broadcast_matmul_and_solve_scalar_scale_multiplier(self):
     # These cannot be done in the automated (base test class) tests since they
     # test shapes that tf.batch_matmul cannot handle.
     # In particular, tf.batch_matmul does not broadcast.
@@ -409,11 +409,11 @@ class LinearOperatorScaledIdentityTest(
       operator = linalg_lib.LinearOperatorScaledIdentity(
           num_rows=3, multiplier=2.2)
 
-      # Test apply
+      # Test matmul
       expected = x * 2.2
-      operator_apply = operator.apply(x)
-      self.assertAllEqual(operator_apply.get_shape(), expected.get_shape())
-      self.assertAllClose(*sess.run([operator_apply, expected]))
+      operator_matmul = operator.matmul(x)
+      self.assertAllEqual(operator_matmul.get_shape(), expected.get_shape())
+      self.assertAllClose(*sess.run([operator_matmul, expected]))
 
       # Test solve
       expected = x / 2.2
diff --git a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
index d24388fce3..78a4822c17 100644
--- a/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
+++ b/tensorflow/contrib/linalg/python/kernel_tests/linear_operator_test.py
@@ -23,6 +23,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import linalg_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 
@@ -54,12 +55,12 @@ class LinearOperatorShape(linalg.LinearOperator):
   def _shape_tensor(self):
     return constant_op.constant(self._stored_shape, dtype=dtypes.int32)
 
-  def _apply(self):
+  def _matmul(self):
     raise NotImplementedError("Not needed for this test.")
 
 
-class LinearOperatorApplyOnly(linalg.LinearOperator):
-  """LinearOperator that simply wraps a [batch] matrix and implements apply."""
+class LinearOperatorMatmulSolve(linalg.LinearOperator):
+  """LinearOperator that wraps a [batch] matrix and implements matmul/solve."""
 
   def __init__(self,
                matrix,
@@ -68,8 +69,8 @@ class LinearOperatorApplyOnly(linalg.LinearOperator):
                is_positive_definite=None,
                is_square=None):
     self._matrix = ops.convert_to_tensor(matrix, name="matrix")
-    super(LinearOperatorApplyOnly, self).__init__(
-        dtype=matrix.dtype,
+    super(LinearOperatorMatmulSolve, self).__init__(
+        dtype=self._matrix.dtype,
         is_non_singular=is_non_singular,
         is_self_adjoint=is_self_adjoint,
         is_positive_definite=is_positive_definite,
@@ -81,10 +82,16 @@ class LinearOperatorApplyOnly(linalg.LinearOperator):
   def _shape_tensor(self):
     return array_ops.shape(self._matrix)
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
+    x = ops.convert_to_tensor(x, name="x")
     return math_ops.matmul(
         self._matrix, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
+  def _solve(self, rhs, adjoint=False, adjoint_arg=False):
+    rhs = ops.convert_to_tensor(rhs, name="rhs")
+    assert not adjoint_arg, "Not implemented for this test class."
+    return linalg_ops.matrix_solve(self._matrix, rhs, adjoint=adjoint)
+
 
 class LinearOperatorTest(test.TestCase):
 
@@ -122,7 +129,7 @@ class LinearOperatorTest(test.TestCase):
 
   def test_generic_to_dense_method_non_square_matrix_static(self):
     matrix = rng.randn(2, 3, 4)
-    operator = LinearOperatorApplyOnly(matrix)
+    operator = LinearOperatorMatmulSolve(matrix)
     with self.test_session():
       operator_dense = operator.to_dense()
       self.assertAllEqual((2, 3, 4), operator_dense.get_shape())
@@ -131,12 +138,30 @@ class LinearOperatorTest(test.TestCase):
   def test_generic_to_dense_method_non_square_matrix_tensor(self):
     matrix = rng.randn(2, 3, 4)
     matrix_ph = array_ops.placeholder(dtypes.float64)
-    operator = LinearOperatorApplyOnly(matrix_ph)
+    operator = LinearOperatorMatmulSolve(matrix_ph)
     with self.test_session():
       operator_dense = operator.to_dense()
       self.assertAllClose(
           matrix, operator_dense.eval(feed_dict={matrix_ph: matrix}))
 
+  def test_matvec(self):
+    matrix = [[1., 0], [0., 2.]]
+    operator = LinearOperatorMatmulSolve(matrix)
+    x = [1., 1.]
+    with self.test_session():
+      y = operator.matvec(x)
+      self.assertAllEqual((2,), y.get_shape())
+      self.assertAllClose([1., 2.], y.eval())
+
+  def test_solvevec(self):
+    matrix = [[1., 0], [0., 2.]]
+    operator = LinearOperatorMatmulSolve(matrix)
+    y = [1., 1.]
+    with self.test_session():
+      x = operator.solvevec(y)
+      self.assertAllEqual((2,), x.get_shape())
+      self.assertAllClose([1., 1 / 2.], x.eval())
+
   def test_is_square_set_to_true_for_square_static_shapes(self):
     operator = LinearOperatorShape(shape=(2, 4, 4))
     self.assertTrue(operator.is_square)
@@ -152,11 +177,11 @@ class LinearOperatorTest(test.TestCase):
   def test_is_square_set_inconsistent_with_other_hints_raises(self):
     with self.assertRaisesRegexp(ValueError, "is always square"):
       matrix = array_ops.placeholder(dtypes.float32)
-      LinearOperatorApplyOnly(matrix, is_non_singular=True, is_square=False)
+      LinearOperatorMatmulSolve(matrix, is_non_singular=True, is_square=False)
 
     with self.assertRaisesRegexp(ValueError, "is always square"):
       matrix = array_ops.placeholder(dtypes.float32)
-      LinearOperatorApplyOnly(
+      LinearOperatorMatmulSolve(
           matrix, is_positive_definite=True, is_square=False)
 
   def test_non_square_operators_raise_on_determinant_and_solve(self):
@@ -170,16 +195,16 @@ class LinearOperatorTest(test.TestCase):
 
     with self.assertRaisesRegexp(ValueError, "is always square"):
       matrix = array_ops.placeholder(dtypes.float32)
-      LinearOperatorApplyOnly(
+      LinearOperatorMatmulSolve(
           matrix, is_positive_definite=True, is_square=False)
 
   def test_is_square_manual_set_works(self):
     matrix = array_ops.placeholder(dtypes.float32)
     # Default is None.
-    operator = LinearOperatorApplyOnly(matrix)
+    operator = LinearOperatorMatmulSolve(matrix)
     self.assertEqual(None, operator.is_square)
     # Set to True
-    operator = LinearOperatorApplyOnly(matrix, is_square=True)
+    operator = LinearOperatorMatmulSolve(matrix, is_square=True)
     self.assertTrue(operator.is_square)
 
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator.py b/tensorflow/contrib/linalg/python/ops/linear_operator.py
index 605ab1511d..6cdfa86189 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator.py
@@ -51,8 +51,8 @@ class LinearOperator(object):
   To enable a public method, subclasses should implement the leading-underscore
   version of the method.  The argument signature should be identical except for
   the omission of `name="..."`.  For example, to enable
-  `apply(x, adjoint=False, name="apply")` a subclass should implement
-  `_apply(x, adjoint=False)`.
+  `matmul(x, adjoint=False, name="matmul")` a subclass should implement
+  `_matmul(x, adjoint=False)`.
 
   #### Performance contract
 
@@ -72,7 +72,7 @@ class LinearOperator(object):
 
   An example is:
 
-  `x` is a batch matrix with compatible shape for `apply` if
+  `x` is a batch matrix with compatible shape for `matmul` if
 
   ```
   operator.shape = [B1,...,Bb] + [M, N],  b >= 0,
@@ -109,7 +109,7 @@ class LinearOperator(object):
 
   x = ... Shape [2, 4, 5] Tensor
 
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 4, 5] Tensor
   ```
 
@@ -151,7 +151,7 @@ class LinearOperator(object):
     **Subclasses should copy-paste this `__init__` documentation.**
 
     Args:
-      dtype: The type of the this `LinearOperator`.  Arguments to `apply` and
+      dtype: The type of the this `LinearOperator`.  Arguments to `matmul` and
         `solve` will have to be this type.
       graph_parents: Python list of graph prerequisites of this `LinearOperator`
         Typically tensors that are passed during initialization.
@@ -577,11 +577,25 @@ class LinearOperator(object):
           (self.dtype, arg.dtype, arg))
 
   @abc.abstractmethod
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
-    raise NotImplementedError("_apply is not implemented.")
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
+    raise NotImplementedError("_matmul is not implemented.")
 
-  def apply(self, x, adjoint=False, adjoint_arg=False, name="apply"):
-    """Transform `x` with left multiplication:  `x --> Ax`.
+  def matmul(self, x, adjoint=False, adjoint_arg=False, name="matmul"):
+    """Transform [batch] matrix `x` with left multiplication:  `x --> Ax`.
+
+    ```python
+    # Make an operator acting like batch matrix A.  Assume A.shape = [..., M, N]
+    operator = LinearOperator(...)
+    operator.shape = [..., M, N]
+
+    X = ... # shape [..., N, R], batch matrix, R > 0.
+
+    Y = operator.matmul(X)
+    Y.shape
+    ==> [..., M, R]
+
+    Y[..., :, r] = sum_j A[..., :, j] X[j, r]
+    ```
 
     Args:
       x: `Tensor` with compatible shape and same `dtype` as `self`.
@@ -602,7 +616,46 @@ class LinearOperator(object):
       arg_dim = -1 if adjoint_arg else -2
       self.shape[self_dim].assert_is_compatible_with(x.get_shape()[arg_dim])
 
-      return self._apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
+      return self._matmul(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
+
+  def _matvec(self, x, adjoint=False):
+    x_mat = array_ops.expand_dims(x, axis=-1)
+    y_mat = self.matmul(x_mat, adjoint=adjoint)
+    return array_ops.squeeze(y_mat, axis=-1)
+
+  def matvec(self, x, adjoint=False, name="matvec"):
+    """Transform [batch] vector `x` with left multiplication:  `x --> Ax`.
+
+    ```python
+    # Make an operator acting like batch matric A.  Assume A.shape = [..., M, N]
+    operator = LinearOperator(...)
+
+    X = ... # shape [..., N], batch vector
+
+    Y = operator.matvec(X)
+    Y.shape
+    ==> [..., M]
+
+    Y[..., :] = sum_j A[..., :, j] X[..., j]
+    ```
+
+    Args:
+      x: `Tensor` with compatible shape and same `dtype` as `self`.
+        `x` is treated as a [batch] vector meaning for every set of leading
+        dimensions, the last dimension defines a vector.
+        See class docstring for definition of compatibility.
+      adjoint: Python `bool`.  If `True`, left multiply by the adjoint: `A^H x`.
+      name:  A name for this `Op.
+
+    Returns:
+      A `Tensor` with shape `[..., M]` and same `dtype` as `self`.
+    """
+    with self._name_scope(name, values=[x]):
+      x = ops.convert_to_tensor(x, name="x")
+      self._check_input_dtype(x)
+      self_dim = -2 if adjoint else -1
+      self.shape[self_dim].assert_is_compatible_with(x.get_shape()[-1])
+      return self._matvec(x, adjoint=adjoint)
 
   def _determinant(self):
     logging.warn(
@@ -675,30 +728,33 @@ class LinearOperator(object):
         self._get_cached_dense_matrix(), rhs, adjoint=adjoint)
 
   def solve(self, rhs, adjoint=False, adjoint_arg=False, name="solve"):
-    """Solve `R` (batch) systems of equations with best effort: `A X = rhs`.
+    """Solve (exact or approx) `R` (batch) systems of equations: `A X = rhs`.
 
-    The solution may not be exact, and in this case it will be close in some
-    sense (see class docstring for details).
+    The returned `Tensor` will be close to an exact solution if `A` is well
+    conditioned. Otherwise closeness will vary. See class docstring for details.
 
     Examples:
 
     ```python
-    # Create an operator acting like a 10 x 2 x 2 matrix.
+    # Make an operator acting like batch matrix A.  Assume A.shape = [..., M, N]
     operator = LinearOperator(...)
-    operator.shape # = 10 x 2 x 2
+    operator.shape = [..., M, N]
 
-    # Solve one linear system (R = 1) for every member of the length 10 batch.
-    RHS = ... # shape 10 x 2 x 1
-    X = operator.solve(RHS)  # shape 10 x 2 x 1
+    # Solve R > 0 linear systems for every member of the batch.
+    RHS = ... # shape [..., M, R]
 
-    # Solve five linear systems (R = 5) for every member of the length 10 batch.
-    RHS = ... # shape 10 x 2 x 5
     X = operator.solve(RHS)
-    X[3, :, 2]  # Solution to the linear system A[3, :, :] X = RHS[3, :, 2]
+    # X[..., :, r] is the solution to the r'th linear system
+    # sum_j A[..., :, j] X[..., j, r] = RHS[..., :, r]
+
+    operator.matmul(X)
+    ==> RHS
     ```
 
     Args:
       rhs: `Tensor` with same `dtype` as this operator and compatible shape.
+        `rhs` is treated like a [batch] matrix meaning for every set of leading
+        dimensions, the last two dimensions defines a matrix.
         See class docstring for definition of compatibility.
       adjoint: Python `bool`.  If `True`, solve the system involving the adjoint
         of this `LinearOperator`:  `A^H X = rhs`.
@@ -730,6 +786,59 @@ class LinearOperator(object):
 
       return self._solve(rhs, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
+  def _solvevec(self, rhs, adjoint=False):
+    """Default implementation of _solvevec."""
+    rhs_mat = array_ops.expand_dims(rhs, axis=-1)
+    solution_mat = self.solve(rhs_mat, adjoint=adjoint)
+    return array_ops.squeeze(solution_mat, axis=-1)
+
+  def solvevec(self, rhs, adjoint=False, name="solve"):
+    """Solve single equation with best effort: `A X = rhs`.
+
+    The returned `Tensor` will be close to an exact solution if `A` is well
+    conditioned. Otherwise closeness will vary. See class docstring for details.
+
+    Examples:
+
+    ```python
+    # Make an operator acting like batch matrix A.  Assume A.shape = [..., M, N]
+    operator = LinearOperator(...)
+    operator.shape = [..., M, N]
+
+    # Solve one linear system for every member of the batch.
+    RHS = ... # shape [..., M]
+
+    X = operator.solvevec(RHS)
+    # X is the solution to the linear system
+    # sum_j A[..., :, j] X[..., j] = RHS[..., :]
+
+    operator.matvec(X)
+    ==> RHS
+    ```
+
+    Args:
+      rhs: `Tensor` with same `dtype` as this operator.
+        `rhs` is treated like a [batch] vector meaning for every set of leading
+        dimensions, the last dimension defines a vector.  See class docstring
+        for definition of compatibility regarding batch dimensions.
+      adjoint: Python `bool`.  If `True`, solve the system involving the adjoint
+        of this `LinearOperator`:  `A^H X = rhs`.
+      name:  A name scope to use for ops added by this method.
+
+    Returns:
+      `Tensor` with shape `[...,N]` and same `dtype` as `rhs`.
+
+    Raises:
+      NotImplementedError:  If `self.is_non_singular` or `is_square` is False.
+    """
+    with self._name_scope(name, values=[rhs]):
+      rhs = ops.convert_to_tensor(rhs, name="rhs")
+      self._check_input_dtype(rhs)
+      self_dim = -1 if adjoint else -2
+      self.shape[self_dim].assert_is_compatible_with(rhs.get_shape()[-1])
+
+      return self._solvevec(rhs, adjoint=adjoint)
+
   def _to_dense(self):
     """Generic and often inefficient implementation.  Override often."""
     logging.warn("Using (possibly slow) default implementation of to_dense."
@@ -745,7 +854,7 @@ class LinearOperator(object):
       n = self.domain_dimension_tensor()
 
     eye = linalg_ops.eye(num_rows=n, batch_shape=batch_shape, dtype=self.dtype)
-    return self.apply(eye)
+    return self.matmul(eye)
 
   def to_dense(self, name="to_dense"):
     """Return a dense (batch) matrix representing this operator."""
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_addition.py b/tensorflow/contrib/linalg/python/ops/linear_operator_addition.py
index 7617e1b591..16c4c6e6d6 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_addition.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_addition.py
@@ -43,7 +43,7 @@ def add_operators(operators,
   Given operators `[A1, A2,...]`, this `Op` returns a possibly shorter list of
   operators `[B1, B2,...]` such that
 
-  ```sum_k Ak.apply(x) = sum_k Bk.apply(x).```
+  ```sum_k Ak.matmul(x) = sum_k Bk.matmul(x).```
 
   The operators `Bk` result by adding some of the `Ak`, as allowed by
   `addition_tiers`.
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
index 550c630497..9dec621ab2 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_composition.py
@@ -67,7 +67,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 4] Tensor
 
   # Create a [2, 3] batch of 4 x 5 linear operators.
@@ -83,7 +83,7 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
 
   # Create a shape [2, 3, 6, 2] vector.
   x = tf.random_normal(shape=[2, 3, 6, 2])
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 3, 4, 2] Tensor
   ```
 
@@ -117,8 +117,8 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
     r"""Initialize a `LinearOperatorComposition`.
 
     `LinearOperatorComposition` is initialized with a list of operators
-    `[op_1,...,op_J]`.  For the `apply` method to be well defined, the
-    composition `op_i.apply(op_{i+1}(x))` must be defined.  Other methods have
+    `[op_1,...,op_J]`.  For the `matmul` method to be well defined, the
+    composition `op_i.matmul(op_{i+1}(x))` must be defined.  Other methods have
     similar constraints.
 
     Args:
@@ -228,19 +228,19 @@ class LinearOperatorComposition(linear_operator.LinearOperator):
 
     return array_ops.concat((batch_shape, matrix_shape), 0)
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
     # If self.operators = [A, B], and not adjoint, then
-    # apply_order_list = [B, A].
-    # As a result, we return A.apply(B.apply(x))
+    # matmul_order_list = [B, A].
+    # As a result, we return A.matmul(B.matmul(x))
     if adjoint:
-      apply_order_list = self.operators
+      matmul_order_list = self.operators
     else:
-      apply_order_list = list(reversed(self.operators))
+      matmul_order_list = list(reversed(self.operators))
 
-    result = apply_order_list[0].apply(
+    result = matmul_order_list[0].matmul(
         x, adjoint=adjoint, adjoint_arg=adjoint_arg)
-    for operator in apply_order_list[1:]:
-      result = operator.apply(result, adjoint=adjoint)
+    for operator in matmul_order_list[1:]:
+      result = operator.matmul(result, adjoint=adjoint)
     return result
 
   def _determinant(self):
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
index d81dea6514..56bc967706 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_diag.py
@@ -56,7 +56,7 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 4] Tensor
 
   # Create a [2, 3] batch of 4 x 4 linear operators.
@@ -68,13 +68,13 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
   # operator.batch_shape = [2, 3].
   y = tf.random_normal(shape=[2, 1, 4, 2])
   x = operator.solve(y)
-  ==> operator.apply(x) = y
+  ==> operator.matmul(x) = y
   ```
 
   #### Shape compatibility
 
   This operator acts on [batch] matrix with compatible shape.
-  `x` is a batch matrix with compatible shape for `apply` and `solve` if
+  `x` is a batch matrix with compatible shape for `matmul` and `solve` if
 
   ```
   operator.shape = [B1,...,Bb] + [N, N],  with b >= 0
@@ -87,7 +87,7 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
   Suppose `operator` is a `LinearOperatorDiag` of shape `[N, N]`,
   and `x.shape = [N, R]`.  Then
 
-  * `operator.apply(x)` involves `N * R` multiplications.
+  * `operator.matmul(x)` involves `N * R` multiplications.
   * `operator.solve(x)` involves `N` divisions and `N * R` multiplications.
   * `operator.determinant()` involves a size `N` `reduce_prod`.
 
@@ -213,7 +213,7 @@ class LinearOperatorDiag(linear_operator.LinearOperator):
             "This diagonal operator contained non-zero imaginary values.  "
             " Thus it was not self-adjoint."))
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
     diag_term = math_ops.conj(self._diag) if adjoint else self._diag
     x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     diag_mat = array_ops.expand_dims(diag_term, -1)
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
index 0f245e609b..67889511cb 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_full_matrix.py
@@ -51,7 +51,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 4] Tensor
 
   # Create a [2, 3] batch of 4 x 4 linear operators.
@@ -62,7 +62,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   #### Shape compatibility
 
   This operator acts on [batch] matrix with compatible shape.
-  `x` is a batch matrix with compatible shape for `apply` and `solve` if
+  `x` is a batch matrix with compatible shape for `matmul` and `solve` if
 
   ```
   operator.shape = [B1,...,Bb] + [M, N],  with b >= 0
@@ -81,7 +81,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   In all cases, suppose `operator` is a `LinearOperatorFullMatrix` of shape
   `[M, N]`, and `x.shape = [N, R]`.  Then
 
-  * `operator.apply(x)` is `O(M * N * R)`.
+  * `operator.matmul(x)` is `O(M * N * R)`.
   * If `M=N`, `operator.solve(x)` is `O(N^3 * R)`.
   * If `M=N`, `operator.determinant()` is `O(N^3)`.
 
@@ -167,7 +167,7 @@ class LinearOperatorFullMatrix(linear_operator.LinearOperator):
   def _shape_tensor(self):
     return array_ops.shape(self._matrix)
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
     return math_ops.matmul(
         self._matrix, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
index d595442c70..acba1c7035 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_identity.py
@@ -116,7 +116,7 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
   ==> 0.
 
   x = ... Shape [2, 4] Tensor
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 4] Tensor, same as x.
 
   y = tf.random_normal(shape=[3, 2, 4])
@@ -141,20 +141,20 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
   # to detect that no broadcast is necessary because both x and the operator
   # have statically defined shape.
   x = ... Shape [2, 2, 3]
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 2, 3] Tensor, same as x
 
   # Here the operator and x have different batch_shape, and are broadcast.
   # This requires a copy, since the output is different size than the input.
   x = ... Shape [1, 2, 3]
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 2, 3] Tensor, equal to [x, x]
   ```
 
   ### Shape compatibility
 
   This operator acts on [batch] matrix with compatible shape.
-  `x` is a batch matrix with compatible shape for `apply` and `solve` if
+  `x` is a batch matrix with compatible shape for `matmul` and `solve` if
 
   ```
   operator.shape = [B1,...,Bb] + [N, N],  with b >= 0
@@ -166,14 +166,14 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
 
   If `batch_shape` initialization arg is `None`:
 
-  * `operator.apply(x)` is `O(1)`
+  * `operator.matmul(x)` is `O(1)`
   * `operator.solve(x)` is `O(1)`
   * `operator.determinant()` is `O(1)`
 
   If `batch_shape` initialization arg is provided, and static checks cannot
   rule out the need to broadcast:
 
-  * `operator.apply(x)` is `O(D1*...*Dd*N*R)`
+  * `operator.matmul(x)` is `O(D1*...*Dd*N*R)`
   * `operator.solve(x)` is `O(D1*...*Dd*N*R)`
   * `operator.determinant()` is `O(B1*...*Bb)`
 
@@ -334,7 +334,7 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
     zeros = array_ops.zeros(shape=special_shape, dtype=self.dtype)
     return x + zeros
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
     # Note that adjoint has no effect since this matrix is self-adjoint.
     x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     if self._assert_proper_shapes:
@@ -350,7 +350,7 @@ class LinearOperatorIdentity(BaseLinearOperatorIdentity):
     return array_ops.zeros(shape=self.batch_shape_tensor(), dtype=self.dtype)
 
   def _solve(self, rhs, adjoint=False, adjoint_arg=False):
-    return self._apply(rhs, adjoint_arg=adjoint_arg)
+    return self._matmul(rhs, adjoint_arg=adjoint_arg)
 
   def _diag_part(self):
     return self._ones_diag()
@@ -468,7 +468,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
   ==> 2 * Log[3]
 
   x = ... Shape [2, 4] Tensor
-  operator.apply(x)
+  operator.matmul(x)
   ==> 3 * x
 
   y = tf.random_normal(shape=[3, 2, 4])
@@ -486,19 +486,19 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
         [0., 5.]]]
 
   x = ... Shape [2, 2, 3]
-  operator.apply(x)
+  operator.matmul(x)
   ==> 5 * x
 
   # Here the operator and x have different batch_shape, and are broadcast.
   x = ... Shape [1, 2, 3]
-  operator.apply(x)
+  operator.matmul(x)
   ==> 5 * x
   ```
 
   ### Shape compatibility
 
   This operator acts on [batch] matrix with compatible shape.
-  `x` is a batch matrix with compatible shape for `apply` and `solve` if
+  `x` is a batch matrix with compatible shape for `matmul` and `solve` if
 
   ```
   operator.shape = [B1,...,Bb] + [N, N],  with b >= 0
@@ -508,7 +508,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
 
   ### Performance
 
-  * `operator.apply(x)` is `O(D1*...*Dd*N*R)`
+  * `operator.matmul(x)` is `O(D1*...*Dd*N*R)`
   * `operator.solve(x)` is `O(D1*...*Dd*N*R)`
   * `operator.determinant()` is `O(D1*...*Dd)`
 
@@ -628,7 +628,7 @@ class LinearOperatorScaledIdentity(BaseLinearOperatorIdentity):
         imag_multiplier,
         message="LinearOperator was not self-adjoint")
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
     x = linear_operator_util.matrix_adjoint(x) if adjoint_arg else x
     if adjoint:
       matrix = self._multiplier_matrix_conj
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py b/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
index c8bc62eeef..b2d7b10157 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_test_util.py
@@ -116,7 +116,7 @@ class LinearOperatorDerivedClassTest(test.TestCase):
 
   @abc.abstractmethod
   def _make_x(self, operator, adjoint):
-    """Make an 'x' appropriate for calling operator.apply(x).
+    """Make an 'x' appropriate for calling operator.matmul(x).
 
     Args:
       operator:  A `LinearOperator`
@@ -208,8 +208,8 @@ class LinearOperatorDerivedClassTest(test.TestCase):
                 feed_dict=feed_dict)
             self.assertAC(op_log_abs_det_v, mat_log_abs_det_v)
 
-  def test_apply(self):
-    self._skip_if_tests_to_skip_contains("apply")
+  def test_matmul(self):
+    self._skip_if_tests_to_skip_contains("matmul")
     for use_placeholder in False, True:
       for shape in self._shapes_to_test:
         for dtype in self._dtypes_to_test:
@@ -222,18 +222,18 @@ class LinearOperatorDerivedClassTest(test.TestCase):
                 x = self._make_x(operator, adjoint=adjoint)
                 # If adjoint_arg, compute A X^H^H = A X.
                 if adjoint_arg:
-                  op_apply = operator.apply(
+                  op_matmul = operator.matmul(
                       linear_operator_util.matrix_adjoint(x),
                       adjoint=adjoint, adjoint_arg=adjoint_arg)
                 else:
-                  op_apply = operator.apply(x, adjoint=adjoint)
-                mat_apply = math_ops.matmul(mat, x, adjoint_a=adjoint)
+                  op_matmul = operator.matmul(x, adjoint=adjoint)
+                mat_matmul = math_ops.matmul(mat, x, adjoint_a=adjoint)
                 if not use_placeholder:
                   self.assertAllEqual(
-                      op_apply.get_shape(), mat_apply.get_shape())
-                op_apply_v, mat_apply_v = sess.run([op_apply, mat_apply],
-                                                   feed_dict=feed_dict)
-                self.assertAC(op_apply_v, mat_apply_v)
+                      op_matmul.get_shape(), mat_matmul.get_shape())
+                op_matmul_v, mat_matmul_v = sess.run(
+                    [op_matmul, mat_matmul], feed_dict=feed_dict)
+                self.assertAC(op_matmul_v, mat_matmul_v)
 
   def test_solve(self):
     self._skip_if_tests_to_skip_contains("solve")
@@ -376,7 +376,7 @@ class NonSquareLinearOperatorDerivedClassTest(LinearOperatorDerivedClassTest):
         "_make_rhs not implemented because we don't test solve")
 
   def _make_x(self, operator, adjoint):
-    # Return the number of systems for the argument 'x' for .apply(x)
+    # Return the number of systems for the argument 'x' for .matmul(x)
     r = self._get_num_systems(operator)
     # If operator.shape = [B1,...,Bb, M, N] this returns a random matrix of
     # shape [B1,...,Bb, N, R], R = 1 or 2.
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
index 6d4033c2a3..8a152a9b47 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_tril.py
@@ -57,7 +57,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
   ==> scalar Tensor
 
   x = ... Shape [2, 4] Tensor
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [2, 4] Tensor
 
   # Create a [2, 3] batch of 4 x 4 linear operators.
@@ -68,7 +68,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
   #### Shape compatibility
 
   This operator acts on [batch] matrix with compatible shape.
-  `x` is a batch matrix with compatible shape for `apply` and `solve` if
+  `x` is a batch matrix with compatible shape for `matmul` and `solve` if
 
   ```
   operator.shape = [B1,...,Bb] + [N, N],  with b >= 0
@@ -80,7 +80,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
   Suppose `operator` is a `LinearOperatorTriL` of shape `[N, N]`,
   and `x.shape = [N, R]`.  Then
 
-  * `operator.apply(x)` involves `N^2 * R` multiplications.
+  * `operator.matmul(x)` involves `N^2 * R` multiplications.
   * `operator.solve(x)` involves `N * R` size `N` back-substitutions.
   * `operator.determinant()` involves a size `N` `reduce_prod`.
 
@@ -182,7 +182,7 @@ class LinearOperatorTriL(linear_operator.LinearOperator):
         self._diag,
         message="Singular operator:  Diagonal contained zero values.")
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
     return math_ops.matmul(
         self._tril, x, adjoint_a=adjoint, adjoint_b=adjoint_arg)
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py b/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
index 4ca77ab147..546d899e74 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_udvh_update.py
@@ -74,18 +74,18 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
   operator.shape
   ==> [3, 3]
 
-  operator.log_determinant()
+  operator.log_abs_determinant()
   ==> scalar Tensor
 
   x = ... Shape [3, 4] Tensor
-  operator.apply(x)
+  operator.matmul(x)
   ==> Shape [3, 4] Tensor
   ```
 
   ### Shape compatibility
 
   This operator acts on [batch] matrix with compatible shape.
-  `x` is a batch matrix with compatible shape for `apply` and `solve` if
+  `x` is a batch matrix with compatible shape for `matmul` and `solve` if
 
   ```
   operator.shape = [B1,...,Bb] + [M, N],  with b >= 0
@@ -95,15 +95,15 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
   ### Performance
 
   Suppose `operator` is a `LinearOperatorUDVHUpdate` of shape `[M, N]`,
-  made from a rank `K` update of `base_operator` which performs `.apply(x)` on
-  `x` having `x.shape = [N, R]` with `O(L_apply*N*R)` complexity (and similarly
+  made from a rank `K` update of `base_operator` which performs `.matmul(x)` on
+  `x` having `x.shape = [N, R]` with `O(L_matmul*N*R)` complexity (and similarly
   for `solve`, `determinant`.  Then, if `x.shape = [N, R]`,
 
-  * `operator.apply(x)` is `O(L_apply*N*R + K*N*R)`
+  * `operator.matmul(x)` is `O(L_matmul*N*R + K*N*R)`
 
   and if `M = N`,
 
-  * `operator.solve(x)` is `O(L_apply*N*R + N*K*R + K^2*R + K^3)`
+  * `operator.solve(x)` is `O(L_matmul*N*R + N*K*R + K^2*R + K^3)`
   * `operator.determinant()` is `O(L_determinant + L_solve*N*K + K^2*N + K^3)`
 
   If instead `operator` and `x` have shape `[B1,...,Bb, M, N]` and
@@ -348,22 +348,22 @@ class LinearOperatorUDVHUpdate(linear_operator.LinearOperator):
     return array_ops.concat(
         [batch_shape, self.base_operator.shape_tensor()[-2:]], axis=0)
 
-  def _apply(self, x, adjoint=False, adjoint_arg=False):
+  def _matmul(self, x, adjoint=False, adjoint_arg=False):
     u = self.u
     v = self.v
     l = self.base_operator
     d = self.diag_operator
 
-    leading_term = l.apply(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
+    leading_term = l.matmul(x, adjoint=adjoint, adjoint_arg=adjoint_arg)
 
     if adjoint:
       uh_x = math_ops.matmul(u, x, adjoint_a=True, adjoint_b=adjoint_arg)
-      d_uh_x = d.apply(uh_x, adjoint=adjoint)
+      d_uh_x = d.matmul(uh_x, adjoint=adjoint)
       v_d_uh_x = math_ops.matmul(v, d_uh_x)
       return leading_term + v_d_uh_x
     else:
       vh_x = math_ops.matmul(v, x, adjoint_a=True, adjoint_b=adjoint_arg)
-      d_vh_x = d.apply(vh_x, adjoint=adjoint)
+      d_vh_x = d.matmul(vh_x, adjoint=adjoint)
       u_d_vh_x = math_ops.matmul(u, d_vh_x)
       return leading_term + u_d_vh_x
 
diff --git a/tensorflow/contrib/linalg/python/ops/linear_operator_util.py b/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
index 9f8cb23169..2659bd32e9 100644
--- a/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
+++ b/tensorflow/contrib/linalg/python/ops/linear_operator_util.py
@@ -69,10 +69,10 @@ def assert_zero_imag_part(x, message=None, name="assert_zero_imag_part"):
 
 
 def assert_compatible_matrix_dimensions(operator, x):
-  """Assert that an argument to solve/apply has proper domain dimension.
+  """Assert that an argument to solve/matmul has proper domain dimension.
 
   If `operator.shape[-2:] = [M, N]`, and `x.shape[-2:] = [Q, R]`, then
-  `operator.apply(x)` is defined only if `N = Q`.  This `Op` returns an
+  `operator.matmul(x)` is defined only if `N = Q`.  This `Op` returns an
   `Assert` that "fires" if this is not the case.  Static checks are already
   done by the base class `LinearOperator`.
 
-- 
GitLab


From 968ac01d7c12e192f7f311775b7b58f13075dc46 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 11:40:03 -0700
Subject: [PATCH 1401/1563] Adds a new rule in tensorflow/core/BUILD to enable
 no-rtti build for selective registration android library.

PiperOrigin-RevId: 156208734
---
 tensorflow/core/BUILD | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index a0d56df4aa..6056d50587 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1019,6 +1019,27 @@ cc_library(
     alwayslink = 1,
 )
 
+# Android library for use with the SELECTIVE_REGISTRATION feature with
+# no proto_rtti.
+cc_library(
+    name = "android_tensorflow_lib_selective_registration_nortti",
+    srcs = if_android(["//tensorflow/core:android_srcs"]),
+    copts = tf_copts() + tf_opts_nortti_if_android() + [
+        "-Os",
+        "-DSUPPORT_SELECTIVE_REGISTRATION",
+    ],
+    tags = [
+        "manual",
+        "notap",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":protos_cc",
+        "//third_party/eigen3",
+    ],
+    alwayslink = 1,
+)
+
 filegroup(
     name = "android_op_registrations_and_gradients",
     srcs = glob(
-- 
GitLab


From 194b1644cba446d36c6d192771b11245847db7cc Mon Sep 17 00:00:00 2001
From: Yao Zhang <yaozhang@google.com>
Date: Tue, 16 May 2017 11:55:45 -0700
Subject: [PATCH 1402/1563] Add topological sort to grappler util and to the
 autoparallel optimizer.

The graph importer requires graph to be topologically sorted for shape
inference. #9906

PiperOrigin-RevId: 156211060
---
 tensorflow/core/grappler/optimizers/BUILD     |  1 +
 .../grappler/optimizers/meta_optimizer.cc     |  2 +
 tensorflow/core/grappler/utils/BUILD          | 24 +++++
 .../core/grappler/utils/topological_sort.cc   | 64 +++++++++++++
 .../core/grappler/utils/topological_sort.h    | 30 ++++++
 .../grappler/utils/topological_sort_test.cc   | 94 +++++++++++++++++++
 6 files changed, 215 insertions(+)
 create mode 100644 tensorflow/core/grappler/utils/topological_sort.cc
 create mode 100644 tensorflow/core/grappler/utils/topological_sort.h
 create mode 100644 tensorflow/core/grappler/utils/topological_sort_test.cc

diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index 07c7ea1fc1..f88b995c89 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -264,5 +264,6 @@ cc_library(
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:grappler_item",
+        "//tensorflow/core/grappler/utils:topological_sort",
     ],
 )
diff --git a/tensorflow/core/grappler/optimizers/meta_optimizer.cc b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
index 23adaab8ed..8bb7800df4 100644
--- a/tensorflow/core/grappler/optimizers/meta_optimizer.cc
+++ b/tensorflow/core/grappler/optimizers/meta_optimizer.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/core/grappler/optimizers/layout_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/memory_optimizer.h"
 #include "tensorflow/core/grappler/optimizers/model_pruner.h"
+#include "tensorflow/core/grappler/utils/topological_sort.h"
 #include "tensorflow/core/lib/core/status.h"
 
 namespace tensorflow {
@@ -99,6 +100,7 @@ Status MetaOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item,
           optimizer->Optimize(cluster, optimized_item, optimized_graph));
     }
   }
+  TopologicalSort(optimized_graph);
   // Copy the graph version.
   *optimized_graph->mutable_versions() = item.graph.versions();
 
diff --git a/tensorflow/core/grappler/utils/BUILD b/tensorflow/core/grappler/utils/BUILD
index e1a3c574a6..e1db1a8cd2 100644
--- a/tensorflow/core/grappler/utils/BUILD
+++ b/tensorflow/core/grappler/utils/BUILD
@@ -38,3 +38,27 @@ cc_test(
         "//tensorflow/core/grappler/inputs:trivial_test_graph_input_yielder",
     ],
 )
+
+cc_library(
+    name = "topological_sort",
+    srcs = ["topological_sort.cc"],
+    hdrs = ["topological_sort.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core/grappler:utils",
+    ],
+)
+
+cc_test(
+    name = "topological_sort_test",
+    srcs = ["topological_sort_test.cc"],
+    deps = [
+        ":topological_sort",
+        "//tensorflow/core:lib_proto_parsing",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
diff --git a/tensorflow/core/grappler/utils/topological_sort.cc b/tensorflow/core/grappler/utils/topological_sort.cc
new file mode 100644
index 0000000000..131756fc5c
--- /dev/null
+++ b/tensorflow/core/grappler/utils/topological_sort.cc
@@ -0,0 +1,64 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/utils/topological_sort.h"
+#include <deque>
+#include <unordered_map>
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/grappler/utils.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Kahn's algorithm is implemented.
+// For details, see https://en.wikipedia.org/wiki/Topological_sorting
+void TopologicalSort(GraphDef* graph) {
+  NodeMap node_map(graph);
+  std::deque<const NodeDef*> ready_nodes;
+  std::unordered_map<const NodeDef*, int> ready_inputs;
+  for (const NodeDef& node : graph->node()) {
+    if (node.input_size() == 0) {
+      ready_nodes.push_back(&node);
+    }
+    if (node.op() == "Merge") {
+      ready_inputs[&node] = 0;
+      for (const auto& input : node.input()) {
+        if (node_map.GetNode(input)->op() == "NextIteration") {
+          ready_inputs[&node]++;
+        }
+      }
+    } else {
+      ready_inputs[&node] = 0;
+    }
+  }
+  GraphDef sorted_graph;
+  while (!ready_nodes.empty()) {
+    auto ready_node = ready_nodes.front();
+    *sorted_graph.add_node() = *ready_node;
+    for (const auto& fanout : node_map.GetOutputs(ready_node->name())) {
+      ready_inputs[fanout]++;
+      if (ready_inputs[fanout] == fanout->input_size()) {
+        ready_nodes.push_back(fanout);
+      }
+    }
+    ready_nodes.pop_front();
+  }
+  if (sorted_graph.node_size() == graph->node_size()) {
+    *graph = sorted_graph;
+  }
+}
+
+}  // namespace grappler
+}  // namespace tensorflow
diff --git a/tensorflow/core/grappler/utils/topological_sort.h b/tensorflow/core/grappler/utils/topological_sort.h
new file mode 100644
index 0000000000..d4d8034ef5
--- /dev/null
+++ b/tensorflow/core/grappler/utils/topological_sort.h
@@ -0,0 +1,30 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_UTILS_TOPOLOGICAL_SORT_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_UTILS_TOPOLOGICAL_SORT_H_
+
+#include "tensorflow/core/framework/graph.pb.h"
+
+namespace tensorflow {
+namespace grappler {
+
+// Sort a graph in topological order.
+void TopologicalSort(GraphDef* graph);
+
+}  // namespace grappler
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_GRAPPLER_UTILS_TOPOLOGICAL_SORT_H_
diff --git a/tensorflow/core/grappler/utils/topological_sort_test.cc b/tensorflow/core/grappler/utils/topological_sort_test.cc
new file mode 100644
index 0000000000..55f66b2734
--- /dev/null
+++ b/tensorflow/core/grappler/utils/topological_sort_test.cc
@@ -0,0 +1,94 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/grappler/utils/topological_sort.h"
+#include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/platform/protobuf.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace grappler {
+namespace {
+
+class TopologicalSortTest : public ::testing::Test {
+ protected:
+  static NodeDef CreateNode(const string& name,
+                            const std::vector<string>& inputs) {
+    return CreateNode(name, "", inputs);
+  }
+  static NodeDef CreateNode(const string& name, const string& op,
+                            const std::vector<string>& inputs) {
+    NodeDef node;
+    node.set_name(name);
+    if (!op.empty()) {
+      node.set_op(op);
+    }
+    for (const string& input : inputs) {
+      node.add_input(input);
+    }
+    return node;
+  }
+};
+
+TEST_F(TopologicalSortTest, NoLoop) {
+  GraphDef graph;
+  *graph.add_node() = CreateNode("2", {"5"});
+  *graph.add_node() = CreateNode("0", {"5", "4"});
+  *graph.add_node() = CreateNode("1", {"4", "3"});
+  *graph.add_node() = CreateNode("3", {"2"});
+  *graph.add_node() = CreateNode("5", {});
+  *graph.add_node() = CreateNode("4", {});
+
+  TopologicalSort(&graph);
+  std::vector<string> order = {"5", "4", "2", "0", "3", "1"};
+  for (int i = 0; i < order.size(); i++) {
+    EXPECT_EQ(graph.node(i).name(), order[i]);
+  }
+}
+
+TEST_F(TopologicalSortTest, WithLoop) {
+  GraphDef graph;
+  // Create a loop
+  *graph.add_node() = CreateNode("2", "Merge", {"1", "5"});
+  *graph.add_node() = CreateNode("3", "Switch", {"2"});
+  *graph.add_node() = CreateNode("4", "Identity", {"3"});
+  *graph.add_node() = CreateNode("5", "NextIteration", {"4"});
+  *graph.add_node() = CreateNode("1", {});
+
+  TopologicalSort(&graph);
+  std::vector<string> order = {"1", "2", "3", "4", "5"};
+  for (int i = 0; i < order.size(); i++) {
+    EXPECT_EQ(graph.node(i).name(), order[i]);
+  }
+}
+
+TEST_F(TopologicalSortTest, WithIllegalLoop) {
+  GraphDef graph;
+  // A loop without Merge and NextIteration is illegal and the original node
+  // order and graph will be preserved.
+  *graph.add_node() = CreateNode("2", {"1", "3"});
+  *graph.add_node() = CreateNode("3", {"2"});
+  *graph.add_node() = CreateNode("1", {});
+
+  TopologicalSort(&graph);
+  std::vector<string> order = {"2", "3", "1"};
+  for (int i = 0; i < order.size(); i++) {
+    EXPECT_EQ(graph.node(i).name(), order[i]);
+  }
+}
+
+}  // namespace
+}  // namespace grappler
+}  // namespace tensorflow
-- 
GitLab


From d0b47889fb3a776dd6cf0a3c8360be9f84e2cbbb Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 12:18:06 -0700
Subject: [PATCH 1403/1563] Remove the paper-item/all-imports.html import
 within tf_graph_info_d3v4/tf-node-info.html import files.

PiperOrigin-RevId: 156214018
---
 .../components/tf_graph_info_d3v4/tf-node-info.html            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html
index 0715777370..f1455acaee 100644
--- a/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/tf-node-info.html
@@ -19,7 +19,8 @@ limitations under the License.
 <link rel="import" href="../iron-list/iron-list.html">
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-item/all-imports.html">
+<link rel="import" href="../paper-item/paper-item.html">
+<link rel="import" href="../paper-item/paper-item-body.html">
 <link rel="import" href="../tf-graph-common/tf-graph-common.html">
 <link rel="import" href="tf-graph-icon.html">
 <link rel="import" href="tf-node-list-item.html">
-- 
GitLab


From 3c5e944a8fa14ade68505ca260a65c830c28e707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Arrufat?= <arrufat@users.noreply.github.com>
Date: Tue, 16 May 2017 21:25:24 +0200
Subject: [PATCH 1404/1563] add pkg-config generation script (#9784)

* add pkg-config generation script

* add suggestions from asimshankar to generate-pc.sh
---
 tensorflow/c/generate-pc.sh | 49 +++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100755 tensorflow/c/generate-pc.sh

diff --git a/tensorflow/c/generate-pc.sh b/tensorflow/c/generate-pc.sh
new file mode 100755
index 0000000000..ea2eed011c
--- /dev/null
+++ b/tensorflow/c/generate-pc.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+TF_PREFIX='/usr/local'
+
+usage() {
+    echo "Usage: $0 OPTIONS"
+    echo -e "-p, --prefix\tset installation prefix (default: /usr/local)"
+    echo -e "-v, --version\tset TensorFlow version"
+    echo -e "-h, --help\tdisplay this message"
+}
+
+# read the options
+ARGS=`getopt -o p:v:h --long prefix:,version:,help -n $0 -- "$@"`
+eval set -- "$ARGS"
+
+# extract options and their arguments into variables.
+while true ; do
+    case "$1" in
+        -h|--help) usage ; exit ;;
+        -p|--prefix)
+            case "$2" in
+                "") shift 2 ;;
+                *) TF_PREFIX=$2 ; shift 2 ;;
+            esac ;;
+        -v|--version)
+            case "$2" in
+                "") shift 2 ;;
+                *) TF_VERSION=$2 ; shift 2 ;;
+            esac ;;
+        --) shift ; echo "Try '$0 --help' for more information."; exit 1 ;;
+        *) echo "Internal error! Try '$0 --help' for more information." ; exit 1 ;;
+    esac
+done
+
+echo "Generating pkgconfig file for TensorFlow $TF_VERSION in $TF_PREFIX"
+
+cat << EOF > tensorflow.pc
+prefix=${TF_PREFIX}
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: TensorFlow
+Version: ${TF_VERSION}
+Description: Library for computation using data flow graphs for scalable machine learning
+Requires:
+Libs: -L\${libdir} -ltensorflow
+Cflags: -I\${includedir}
+EOF
-- 
GitLab


From 97cf8962f6e304f8dfb1f6737720066a43e93172 Mon Sep 17 00:00:00 2001
From: krivard <krivard@cs.cmu.edu>
Date: Tue, 16 May 2017 15:27:48 -0400
Subject: [PATCH 1405/1563] Replaced deprecated op_scope call with name_scope
 and correct argument order (#9941)

---
 tensorflow/python/ops/sparse_ops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 23afb13d4f..9286114277 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -1766,7 +1766,7 @@ def sparse_transpose(sp_input, perm=None, name=None):
   Raises:
     TypeError: If `sp_input` is not a `SparseTensor`.
   """
-  with ops.op_scope([sp_input], name, "SparseTranspose") as name:
+  with ops.name_scope(name, "SparseTranspose", [sp_input]) as name:
     if perm is None:
       rank = array_ops.rank(sp_input)
       perm = (rank - 1) - math_ops.range(0, rank, 1)
-- 
GitLab


From da0d883cba8c3b8103e17432bf8398a56a719c40 Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <sjhshy@gmail.com>
Date: Wed, 17 May 2017 04:35:46 +0900
Subject: [PATCH 1406/1563] Add initializer to GRUCell, MultiRNNCell #9600
 (#9700)

* Add initializer to GRUCell, MultiRNNCell #9600

* change initializer to kernel_initializer
add bias_initializer
remove initializer from MultiRNNCell
---
 .../rnn/python/ops/core_rnn_cell_impl.py      | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index eba2c0d2ac..f62fba2fed 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -83,12 +83,15 @@ class BasicRNNCell(RNNCell):
 class GRUCell(RNNCell):
   """Gated Recurrent Unit cell (cf. http://arxiv.org/abs/1406.1078)."""
 
-  def __init__(self, num_units, input_size=None, activation=tanh, reuse=None):
+  def __init__(self, num_units, input_size=None, activation=tanh, reuse=None,
+               kernel_initializer=None, bias_initializer=None):
     super(GRUCell, self).__init__(_reuse=reuse)
     if input_size is not None:
       logging.warn("%s: The input_size parameter is deprecated.", self)
     self._num_units = num_units
     self._activation = activation
+    self._kernel_initializer = kernel_initializer
+    self._bias_initializer = bias_initializer
 
   @property
   def state_size(self):
@@ -102,10 +105,16 @@ class GRUCell(RNNCell):
     """Gated recurrent unit (GRU) with nunits cells."""
     with vs.variable_scope("gates"):  # Reset gate and update gate.
       # We start with bias of 1.0 to not reset and not update.
-      value = sigmoid(_linear([inputs, state], 2 * self._num_units, True, 1.0))
+      bias_ones = self._bias_initializer
+      if self._bias_initializer is None:
+        dtype = [a.dtype for a in [inputs, state]][0]
+        bias_ones = init_ops.constant_initializer(1.0, dtype=dtype)
+      value = sigmoid(_linear([inputs, state], 2 * self._num_units, True,
+          bias_ones, self._kernel_initializer))
       r, u = array_ops.split(value=value, num_or_size_splits=2, axis=1)
     with vs.variable_scope("candidate"):
-      c = self._activation(_linear([inputs, r * state], self._num_units, True))
+      c = self._activation(_linear([inputs, r * state], self._num_units, True,
+          self._bias_initializer, self._kernel_initializer))
     new_h = u * state + (1 - u) * c
     return new_h, new_h
 
@@ -963,14 +972,16 @@ class _SlimRNNCell(RNNCell):
     return output, state
 
 
-def _linear(args, output_size, bias, bias_start=0.0):
+def _linear(args, output_size, bias, bias_initializer=None,
+            kernel_initializer=None):
   """Linear map: sum_i(args[i] * W[i]), where W[i] is a variable.
 
   Args:
     args: a 2D Tensor or a list of 2D, batch x n, Tensors.
     output_size: int, second dimension of W[i].
     bias: boolean, whether to add a bias term or not.
-    bias_start: starting value to initialize the bias; 0 by default.
+    bias_initializer: starting value to initialize the bias; None by default.
+    kernel_initializer: starting value to initialize the weight; None by default.
 
   Returns:
     A 2D Tensor with shape [batch x output_size] equal to
@@ -1002,7 +1013,8 @@ def _linear(args, output_size, bias, bias_start=0.0):
   scope = vs.get_variable_scope()
   with vs.variable_scope(scope) as outer_scope:
     weights = vs.get_variable(
-        _WEIGHTS_VARIABLE_NAME, [total_arg_size, output_size], dtype=dtype)
+        _WEIGHTS_VARIABLE_NAME, [total_arg_size, output_size], dtype=dtype,
+        initializer=kernel_initializer)
     if len(args) == 1:
       res = math_ops.matmul(args[0], weights)
     else:
@@ -1011,8 +1023,10 @@ def _linear(args, output_size, bias, bias_start=0.0):
       return res
     with vs.variable_scope(outer_scope) as inner_scope:
       inner_scope.set_partitioner(None)
+      if bias_initializer is None:
+        bias_initializer = init_ops.constant_initializer(0.0, dtype=dtype)
       biases = vs.get_variable(
           _BIAS_VARIABLE_NAME, [output_size],
           dtype=dtype,
-          initializer=init_ops.constant_initializer(bias_start, dtype=dtype))
+          initializer=bias_initializer)
     return nn_ops.bias_add(res, biases)
-- 
GitLab


From fe41d05e7c8343ed53fc788d6c312792b390f679 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Tue, 16 May 2017 13:08:04 -0700
Subject: [PATCH 1407/1563] Go: Keep errors in Go.

Helps with #9931

- graph.go: Return a nil Operation if the operation creation failed.
  This ensures that accidental usage of the nil operation results in
  a panic/stacktrace purely in Go (nil pointer dereference) instead
  of a SIGSEGV in the underlying C API.

- operation.go: Attempt to help in the developer find the root cause
  of the nil pointer dereference with a chattier panic message.

PiperOrigin-RevId: 156220056
---
 tensorflow/go/graph.go      |  8 ++++----
 tensorflow/go/op/op_test.go | 25 +++++++++++++++++++++++++
 tensorflow/go/operation.go  |  5 +++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/tensorflow/go/graph.go b/tensorflow/go/graph.go
index e65619e80b..46c600eab1 100644
--- a/tensorflow/go/graph.go
+++ b/tensorflow/go/graph.go
@@ -185,11 +185,11 @@ func (g *Graph) AddOperation(args OpSpec) (*Operation, error) {
 			return nil, fmt.Errorf("%v (memory will be leaked)", err)
 		}
 	}
-	op := &Operation{
-		c: C.TF_FinishOperation(cdesc, status.c),
-		g: g,
+	c := C.TF_FinishOperation(cdesc, status.c)
+	if err := status.Err(); err != nil {
+		return nil, err
 	}
-	return op, status.Err()
+	return &Operation{c, g}, nil
 }
 
 func setAttr(cdesc *C.TF_OperationDescription, status *status, name string, value interface{}) error {
diff --git a/tensorflow/go/op/op_test.go b/tensorflow/go/op/op_test.go
index 65877dca96..2451ba3606 100644
--- a/tensorflow/go/op/op_test.go
+++ b/tensorflow/go/op/op_test.go
@@ -19,6 +19,7 @@ limitations under the License.
 package op
 
 import (
+	"strings"
 	"testing"
 
 	tf "github.com/tensorflow/tensorflow/tensorflow/go"
@@ -33,3 +34,27 @@ func TestPlaceholder(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestAddOperationFailure(t *testing.T) {
+	// Inspired from https://github.com/tensorflow/tensorflow/issues/9931
+	s := NewScope()
+
+	resize := ResizeArea(s, Placeholder(s, tf.Float), Const(s, []int64{80, 80}))
+	if err := s.Err(); err == nil {
+		t.Fatal("ResizeArea expects an int32 Tensor for size, should fail when an int64 is provided")
+	}
+	// And any use of resize should panic with an error message more informative than SIGSEGV
+	defer func() {
+		r := recover()
+		if r == nil {
+			return
+		}
+		s, ok := r.(string)
+		if ok && strings.Contains(s, "see Scope.Err() for details") {
+			return
+		}
+		t.Errorf("Expected panic string to Scope.Err(), found %T: %q", r, r)
+	}()
+	_ = resize.Shape()
+	t.Errorf("resize.Shape() should have paniced since the underlying Operation was not created")
+}
diff --git a/tensorflow/go/operation.go b/tensorflow/go/operation.go
index e8f67c4f73..8fcad61f4c 100644
--- a/tensorflow/go/operation.go
+++ b/tensorflow/go/operation.go
@@ -113,6 +113,11 @@ func (p Output) Shape() Shape {
 }
 
 func (p Output) c() C.TF_Output {
+	if p.Op == nil {
+		// Attempt to provide a more useful panic message than "nil
+		// pointer dereference".
+		panic("nil-Operation. If the Output was created with a Scope object, see Scope.Err() for details.")
+	}
 	return C.TF_Output{oper: p.Op.c, index: C.int(p.Index)}
 }
 
-- 
GitLab


From 70744fb43b75743eeff0b09b862128281a7f3494 Mon Sep 17 00:00:00 2001
From: Asim Shankar <ashankar@google.com>
Date: Tue, 16 May 2017 13:21:25 -0700
Subject: [PATCH 1408/1563] Go: Some cleanup possible now that TensorFlow 1.1
 has been released.

PiperOrigin-RevId: 156221562
---
 tensorflow/go/lib.go      | 10 ----------
 tensorflow/go/session.cpp | 26 --------------------------
 tensorflow/go/session.go  |  2 +-
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 tensorflow/go/session.cpp

diff --git a/tensorflow/go/lib.go b/tensorflow/go/lib.go
index 551cfa0b01..2800eded60 100644
--- a/tensorflow/go/lib.go
+++ b/tensorflow/go/lib.go
@@ -18,14 +18,4 @@ package tensorflow
 
 // #cgo LDFLAGS: -ltensorflow
 // #cgo CFLAGS: -I${SRCDIR}/../../
-//
-// // TODO(ashankar): Remove this after TensorFlow 1.1 has been released.
-// // Till then, the TensorFlow C API binary releases do not contain
-// // the TF_DeletePRunHandle symbol. We work around that by
-// // implementing the equivalent in session.cpp
-// extern void tfDeletePRunHandle(const char*);
 import "C"
-
-func deletePRunHandle(h *C.char) {
-	C.tfDeletePRunHandle(h)
-}
diff --git a/tensorflow/go/session.cpp b/tensorflow/go/session.cpp
deleted file mode 100644
index efa225505b..0000000000
--- a/tensorflow/go/session.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// TODO(ashankar): Remove this file when TensorFlow 1.1 is released.
-// See lib.go for details.
-
-extern "C" {
-extern void tfDeletePRunHandle(const char* h);
-}
-
-void tfDeletePRunHandle(const char* h) {
-  delete[] h;
-}
diff --git a/tensorflow/go/session.go b/tensorflow/go/session.go
index 3add412dcd..afa73030b8 100644
--- a/tensorflow/go/session.go
+++ b/tensorflow/go/session.go
@@ -199,7 +199,7 @@ func (s *Session) NewPartialRun(feeds, fetches []Output, targets []*Operation) (
 		return nil, err
 	}
 	runtime.SetFinalizer(pr, func(pr *PartialRun) {
-		deletePRunHandle(pr.handle)
+		C.TF_DeletePRunHandle(pr.handle)
 	})
 	return pr, nil
 }
-- 
GitLab


From 28de1790f6a922471c44740fde08995d56a4ee5b Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Tue, 16 May 2017 13:24:52 -0700
Subject: [PATCH 1409/1563] Disable sdca_estimator_test in tsan.

PiperOrigin-RevId: 156222038
---
 tensorflow/contrib/linear_optimizer/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/linear_optimizer/BUILD b/tensorflow/contrib/linear_optimizer/BUILD
index 472633b5c7..1fde6e5c6c 100644
--- a/tensorflow/contrib/linear_optimizer/BUILD
+++ b/tensorflow/contrib/linear_optimizer/BUILD
@@ -127,6 +127,7 @@ py_test(
     name = "sdca_estimator_test",
     srcs = ["python/sdca_estimator_test.py"],
     srcs_version = "PY2AND3",
+    tags = ["notsan"],
     deps = [
         ":sdca_estimator_py",
         "//tensorflow/contrib/layers:layers_py",
-- 
GitLab


From eae242a4a9824655667c73637cf4498ebc0fe1c5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 13:47:10 -0700
Subject: [PATCH 1410/1563] Internal changes.

PiperOrigin-RevId: 156224948
---
 tensorflow/python/kernel_tests/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 6689d6a6b4..5d9534a206 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -1564,6 +1564,7 @@ cuda_py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
     ],
+    shard_count = 4,
 )
 
 cuda_py_test(
-- 
GitLab


From d0936ab91ccdc0e50dc31b0c0bb7711132fcd445 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 15:03:38 -0700
Subject: [PATCH 1411/1563] Fix the issue in which the user choppily moves into
 a different graph transform configuration after panning/zooming after fitting
 the graph.

The main problem had been that the fit function had been altering the root 'g' element's transform, while the zoom behavior had been instead altering the root 'svg' element's transform.

PiperOrigin-RevId: 156236623
---
 .../components/tf_graph_common_d3v4/scene.ts     |  2 +-
 .../components/tf_graph_d3v4/tf-graph-scene.html | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
index 023bc161f5..29f9b446b3 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
@@ -155,7 +155,7 @@ module tf.graph.scene {
         .scale(scale)
         .translate(params.padding.paddingLeft, params.padding.paddingTop);
 
-    d3.select(zoomG)
+    d3.select(svg)
         .transition()
         .duration(500)
         .call(d3zoom.transform, transform)
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
index 95d9d16f85..10a65f54d5 100644
--- a/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
@@ -649,12 +649,12 @@ Polymer({
     },
     /** Keeps track of the starting coordinates of a graph zoom/pan */
     _zoomStartCoords: {
-      type: Array,
+      type: Object,
       value: null
     },
     /** Keeps track of the current coordinates of a graph zoom/pan */
-    _zoomCoords: {
-      type: Array,
+    _zoomTransform: {
+      type: Object,
       value: null
     },
     /** Maximum distance of a zoom event for it to be interpreted as a click */
@@ -797,8 +797,8 @@ Polymer({
           // is ignored (as this mouse click was part of a zooming, and should
           // not be used to indicate an actual click on the graph).
           var dragDistance = Math.sqrt(
-            Math.pow(this._zoomStartCoords[0] - this._zoomCoords[0], 2) +
-            Math.pow(this._zoomStartCoords[1] - this._zoomCoords[1], 2));
+            Math.pow(this._zoomStartCoords.x - this._zoomTransform.x, 2) +
+            Math.pow(this._zoomStartCoords.y - this._zoomTransform.y, 2));
           if (dragDistance < this._maxZoomDistanceForClick) {
             this._fireEnableClick();
           } else {
@@ -808,8 +808,8 @@ Polymer({
         this._zoomStartCoords = null;
       }.bind(this))
       .on('zoom', function() {
-        // Store the coordinates of the zoom event
-        this._zoomCoords = [d3.event.transform.x, d3.event.transform.y];
+        // Store the coordinates of the zoom event.
+        this._zoomTransform = d3.event.transform;
 
         // If this is the first zoom event after a zoom-end, then
         // store the coordinates as the start coordinates as well,
@@ -818,7 +818,7 @@ Polymer({
         // event on mouse-down, even if there has been no dragging
         // done to translate the graph around.
         if (!this._zoomStartCoords) {
-          this._zoomStartCoords = this._zoomCoords;
+          this._zoomStartCoords = this._zoomTransform;
           this.fire('disable-click');
         }
         this._zoomed = true;
-- 
GitLab


From b45ded11d4d9a8f937004782115d2bbb29b97efd Mon Sep 17 00:00:00 2001
From: Alexey Surkov <surkov@google.com>
Date: Tue, 16 May 2017 15:19:46 -0700
Subject: [PATCH 1412/1563] Make the readahead buffer size configurable via an
 env variable.

PiperOrigin-RevId: 156238858
---
 tensorflow/core/platform/cloud/gcs_file_system.cc   | 13 ++++++++++++-
 tensorflow/core/platform/cloud/gcs_file_system.h    |  3 ++-
 .../core/platform/cloud/gcs_file_system_test.cc     |  9 +++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/platform/cloud/gcs_file_system.cc b/tensorflow/core/platform/cloud/gcs_file_system.cc
index 5ee3099673..97e4c207d8 100644
--- a/tensorflow/core/platform/cloud/gcs_file_system.cc
+++ b/tensorflow/core/platform/cloud/gcs_file_system.cc
@@ -52,6 +52,8 @@ constexpr int kGetChildrenDefaultPageSize = 1000;
 constexpr uint64 kUploadRetryDelayMicros = 1000000L;
 // The HTTP response code "308 Resume Incomplete".
 constexpr uint64 HTTP_CODE_RESUME_INCOMPLETE = 308;
+// The environment variable that overrides the size of the readahead buffer.
+constexpr char kReadaheadBufferSize[] = "GCS_READAHEAD_BUFFER_SIZE_BYTES";
 
 // The file statistics returned by Stat() for directories.
 const FileStatistics DIRECTORY_STAT(0, 0, true);
@@ -585,7 +587,16 @@ class GcsReadOnlyMemoryRegion : public ReadOnlyMemoryRegion {
 
 GcsFileSystem::GcsFileSystem()
     : auth_provider_(new GoogleAuthProvider()),
-      http_request_factory_(new HttpRequest::Factory()) {}
+      http_request_factory_(new HttpRequest::Factory()) {
+  // Apply the sys env override for the readahead buffer size if it's provided.
+  const char* readahead_buffer_size = std::getenv(kReadaheadBufferSize);
+  if (readahead_buffer_size) {
+    uint64 value;
+    if (strings::safe_strtou64(readahead_buffer_size, &value)) {
+      read_ahead_bytes_ = value;
+    }
+  }
+}
 
 GcsFileSystem::GcsFileSystem(
     std::unique_ptr<AuthProvider> auth_provider,
diff --git a/tensorflow/core/platform/cloud/gcs_file_system.h b/tensorflow/core/platform/cloud/gcs_file_system.h
index 6a6437f070..18d2de482b 100644
--- a/tensorflow/core/platform/cloud/gcs_file_system.h
+++ b/tensorflow/core/platform/cloud/gcs_file_system.h
@@ -74,6 +74,7 @@ class GcsFileSystem : public FileSystem {
 
   Status DeleteRecursively(const string& dirname, int64* undeleted_files,
                            int64* undeleted_dirs) override;
+  size_t get_readahead_buffer_size() const { return read_ahead_bytes_; }
 
  private:
   /// \brief Checks if the bucket exists. Returns OK if the check succeeded.
@@ -112,7 +113,7 @@ class GcsFileSystem : public FileSystem {
 
   // The number of bytes to read ahead for buffering purposes in the
   // RandomAccessFile implementation. Defaults to 256Mb.
-  const size_t read_ahead_bytes_ = 256 * 1024 * 1024;
+  size_t read_ahead_bytes_ = 256 * 1024 * 1024;
 
   // The initial delay for exponential backoffs when retrying failed calls.
   const int64 initial_retry_delay_usec_ = 1000000L;
diff --git a/tensorflow/core/platform/cloud/gcs_file_system_test.cc b/tensorflow/core/platform/cloud/gcs_file_system_test.cc
index fc79f3be11..c3a8678fbc 100644
--- a/tensorflow/core/platform/cloud/gcs_file_system_test.cc
+++ b/tensorflow/core/platform/cloud/gcs_file_system_test.cc
@@ -1617,5 +1617,14 @@ TEST(GcsFileSystemTest, DeleteRecursively_NotAFolder) {
   EXPECT_EQ(1, undeleted_dirs);
 }
 
+TEST(GcsFileSystemTest, OverrideReadaheadBufferSize) {
+  GcsFileSystem fs1;
+  EXPECT_EQ(256 * 1024 * 1024, fs1.get_readahead_buffer_size());
+
+  setenv("GCS_READAHEAD_BUFFER_SIZE_BYTES", "123456789", 1);
+  GcsFileSystem fs2;
+  EXPECT_EQ(123456789L, fs2.get_readahead_buffer_size());
+}
+
 }  // namespace
 }  // namespace tensorflow
-- 
GitLab


From 7ca252469e86101eb145cc1412b9ca3bc3181684 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 15:20:58 -0700
Subject: [PATCH 1413/1563] Handle R0 DynamicUpdateSlice in algebraic
 simplifier.

PiperOrigin-RevId: 156239012
---
 .../compiler/xla/service/algebraic_simplifier.cc  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index f240b1ebe9..3f888b4c2e 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -1,3 +1,4 @@
+
 /* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -167,6 +168,10 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
   Status HandleReverse(HloInstruction* reverse,
                        HloInstruction* operand) override;
   Status HandleSlice(HloInstruction* slice, HloInstruction* operand) override;
+  Status HandleDynamicUpdateSlice(HloInstruction* dynamic_update_slice,
+                                  HloInstruction* operand,
+                                  HloInstruction* update,
+                                  HloInstruction* start_indices) override;
 
   Status HandleTranspose(HloInstruction* transpose) override;
 
@@ -1020,6 +1025,16 @@ Status AlgebraicSimplifierVisitor::HandleSlice(HloInstruction* slice,
   return Status::OK();
 }
 
+Status AlgebraicSimplifierVisitor::HandleDynamicUpdateSlice(
+    HloInstruction* dynamic_update_slice, HloInstruction* operand,
+    HloInstruction* update, HloInstruction* start_indices) {
+  // DynamicUpdateSlice on a scalar just passes through the update argument.
+  if (ShapeUtil::IsScalar(dynamic_update_slice->shape())) {
+    return ReplaceInstruction(dynamic_update_slice, update);
+  }
+  return Status::OK();
+}
+
 Status AlgebraicSimplifierVisitor::HandleReduce(
     HloInstruction* reduce, HloInstruction* arg, HloInstruction* init_value,
     tensorflow::gtl::ArraySlice<int64> dimensions, HloComputation* function) {
-- 
GitLab


From 16a8a6d7d834e4645e007b2e3cfbe26511bf133a Mon Sep 17 00:00:00 2001
From: Kay Zhu <kayzhu@google.com>
Date: Tue, 16 May 2017 15:25:01 -0700
Subject: [PATCH 1414/1563] [TF] A couple fixes for Mod:

In TF:
    - fix incorrect doc string for TruncateMod.
    - remove outdated TODO.

PiperOrigin-RevId: 156239535
---
 tensorflow/core/ops/math_ops.cc   | 13 +++++++------
 tensorflow/python/ops/math_ops.py |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tensorflow/core/ops/math_ops.cc b/tensorflow/core/ops/math_ops.cc
index 79a8be0048..28c4ec643e 100644
--- a/tensorflow/core/ops/math_ops.cc
+++ b/tensorflow/core/ops/math_ops.cc
@@ -595,7 +595,9 @@ REGISTER_OP("Mod")
     .Attr("T: {int32, int64, float, double}")
     .SetShapeFn(shape_inference::BroadcastBinaryOpShapeFn)
     .Doc(R"doc(
-Returns element-wise remainder of division.
+Returns element-wise remainder of division. This emulates C semantics in that
+the result here is consistent with a truncating divide. E.g. `truncate(x / y) *
+y + truncate_mod(x, y) = x`.
 
 *NOTE*: `Mod` supports broadcasting. More about broadcasting
 [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
@@ -623,12 +625,11 @@ REGISTER_OP("TruncateMod")
     .Attr("T: {int32, int64, float, double}")
     .SetShapeFn(shape_inference::BroadcastBinaryOpShapeFn)
     .Doc(R"doc(
-Returns element-wise remainder of division. This emulates C semantics where
+Returns element-wise remainder of division. This emulates C semantics in that
+the result here is consistent with a truncating divide. E.g. `truncate(x / y) *
+y + truncate_mod(x, y) = x`.
 
-true, this follows C semantics in that the result here is consistent
-with a flooring divide. E.g. `floor(x / y) * y + mod(x, y) = x`.
-
-*NOTE*: `Mod` supports broadcasting. More about broadcasting
+*NOTE*: `TruncateMod` supports broadcasting. More about broadcasting
 [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
 )doc");
 
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 158016ff37..1555d19395 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -1082,8 +1082,6 @@ _OverrideBinaryOperatorHelper(_mul_dispatch, "mul")
 _OverrideBinaryOperatorHelper(_div_python2, "div")
 _OverrideBinaryOperatorHelper(_truediv_python3, "truediv")
 _OverrideBinaryOperatorHelper(floordiv, "floordiv")
-# TODO(aselle): Switch mod to floor_mod when ready
-# _OverrideBinaryOperatorHelper(gen_math_ops.floor_mod, "mod")
 _OverrideBinaryOperatorHelper(gen_math_ops._floor_mod, "mod")
 _OverrideBinaryOperatorHelper(pow, "pow")
 
-- 
GitLab


From 77583357ed95122ed85915556f639f0cbefa8251 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 15:37:49 -0700
Subject: [PATCH 1415/1563] Automated g4 rollback of changelist 156170472

PiperOrigin-RevId: 156240877
---
 tensorflow/BUILD            |  2 +-
 tensorflow/tools/docs/BUILD | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 0c2fdab9b8..503ad79a38 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -458,7 +458,7 @@ filegroup(
 
 filegroup(
     name = "docs_src",
-    srcs = glob(["docs_src/**/*.md"]),
+    data = glob(["docs_src/**/*.md"]),
 )
 
 # -------------------------------------------
diff --git a/tensorflow/tools/docs/BUILD b/tensorflow/tools/docs/BUILD
index 0c0239352b..8e27b133c2 100644
--- a/tensorflow/tools/docs/BUILD
+++ b/tensorflow/tools/docs/BUILD
@@ -151,18 +151,3 @@ filegroup(
         ],
     ),
 )
-
-genrule(
-    name = "python_docs",
-    srcs = ["//tensorflow:docs_src"],
-    outs = ["python_docs.tgz"],
-    cmd = "STARTDIR=$$(pwd); " +
-          "TMP=$$(mktemp -d $${TMPDIR:-/tmp}/docs.XXXXXXXXXX); " +
-          "cd $$TMP; " +
-          "$$STARTDIR/$(location :generate) --src_dir=$$STARTDIR/third_party/tensorflow/docs_src --output_dir=docs_out; " +
-          "tar -czf $$STARTDIR/$@ docs_out; " +
-          "cd $$STARTDIR; " +
-          "rm -rf $$TMP; ",
-    tools = [":generate"],
-    visibility = ["//visibility:public"],
-)
-- 
GitLab


From ed5d05d8b53425ef98aad129a60143a5011a4288 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 16:03:52 -0700
Subject: [PATCH 1416/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 156244273
---
 tensorflow/core/ops/ops.pbtxt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 0ff321aed5..cd43881a46 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -12001,8 +12001,8 @@ op {
       }
     }
   }
-  summary: "Returns element-wise remainder of division."
-  description: "*NOTE*: `Mod` supports broadcasting. More about broadcasting\n[here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)"
+  summary: "Returns element-wise remainder of division. This emulates C semantics in that"
+  description: "the result here is consistent with a truncating divide. E.g. `truncate(x / y) *\ny + truncate_mod(x, y) = x`.\n\n*NOTE*: `Mod` supports broadcasting. More about broadcasting\n[here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)"
 }
 op {
   name: "Mul"
@@ -26637,8 +26637,8 @@ op {
       }
     }
   }
-  summary: "Returns element-wise remainder of division. This emulates C semantics where"
-  description: "true, this follows C semantics in that the result here is consistent\nwith a flooring divide. E.g. `floor(x / y) * y + mod(x, y) = x`.\n\n*NOTE*: `Mod` supports broadcasting. More about broadcasting\n[here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)"
+  summary: "Returns element-wise remainder of division. This emulates C semantics in that"
+  description: "the result here is consistent with a truncating divide. E.g. `truncate(x / y) *\ny + truncate_mod(x, y) = x`.\n\n*NOTE*: `TruncateMod` supports broadcasting. More about broadcasting\n[here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)"
 }
 op {
   name: "TruncatedNormal"
-- 
GitLab


From 749e5cc18381f7a5ec174673f76e20aead8529c6 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Tue, 16 May 2017 16:08:20 -0700
Subject: [PATCH 1417/1563] Reduce direct references to NodeDef in favor of
 Node and AttrSlice

This is one step towards replacing in-memory use of NodeDef with a customized
NodeInfo class.  There are still quite a few Node::def() references, but far fewer than before.  Those remaining require more work, either because they are part of kernel registration (which is a bunch of functions), copy and modify the NodeDef, etc.  Follow-on CLs will remove more.

RELNOTES: n/a
PiperOrigin-RevId: 156244933
---
 tensorflow/c/c_api.cc                         |  63 +++++-----
 tensorflow/cc/framework/cc_op_gen.cc          |   9 +-
 tensorflow/cc/framework/cc_ops_test.cc        |  17 ++-
 tensorflow/cc/framework/scope.cc              |   4 +-
 tensorflow/cc/gradients/array_grad.cc         |  28 +++--
 tensorflow/cc/gradients/math_grad.cc          |   8 +-
 tensorflow/cc/ops/const_op_test.cc            |   8 +-
 tensorflow/compiler/aot/compile.cc            |  12 +-
 .../compiler/jit/build_xla_launch_ops_pass.cc |   9 +-
 .../jit/encapsulate_subgraphs_pass.cc         |  10 +-
 .../compiler/jit/graph_to_functiondef.cc      |  14 +--
 .../jit/kernels/xla_device_launch_op.cc       |   4 +-
 .../jit/kernels/xla_local_launch_op.cc        |   2 +-
 .../compiler/jit/mark_for_compilation_pass.cc |  42 ++++---
 .../jit/mark_for_compilation_pass_test.cc     |   2 +-
 .../compiler/jit/xla_compilation_cache.cc     |   2 +-
 tensorflow/compiler/tf2xla/const_analysis.cc  |   6 +-
 .../compiler/tf2xla/kernels/function_ops.cc   |   3 +-
 tensorflow/compiler/tf2xla/xla_compiler.cc    |   7 +-
 tensorflow/core/BUILD                         |   7 +-
 .../common_runtime/constant_folding_test.cc   |   8 +-
 tensorflow/core/common_runtime/executor.cc    |  56 +++++----
 tensorflow/core/common_runtime/function.cc    |  37 +++---
 .../core/common_runtime/function_test.cc      |  40 +++++--
 .../kernel_benchmark_testlib.cc               |   8 +-
 .../parallel_concat_optimizer.cc              |   4 +-
 .../resource_variable_read_optimizer.cc       |   2 +-
 .../core/common_runtime/simple_placer.cc      |  34 +++---
 tensorflow/core/debug/debug_graph_utils.cc    |  23 ++--
 .../distributed_runtime/master_session.cc     |  12 +-
 tensorflow/core/framework/function.cc         | 102 +++++++---------
 tensorflow/core/framework/function.h          |  49 ++++----
 tensorflow/core/framework/function_test.cc    | 110 +++++++++++-------
 tensorflow/core/framework/node_def_util.cc    |  92 +++++++++++----
 tensorflow/core/framework/node_def_util.h     |  39 ++++++-
 tensorflow/core/framework/op_kernel.cc        |  23 ++--
 tensorflow/core/framework/shape_inference.h   |   9 +-
 tensorflow/core/graph/control_flow.cc         |   2 +-
 tensorflow/core/graph/graph.cc                |   4 +-
 tensorflow/core/graph/graph.h                 |  14 +++
 tensorflow/core/graph/graph_constructor.cc    |   4 +-
 .../core/graph/graph_constructor_test.cc      |  66 +++++------
 tensorflow/core/graph/graph_partition.cc      |   8 +-
 tensorflow/core/graph/graph_test.cc           |  10 +-
 tensorflow/core/graph/optimizer_cse.cc        |  37 ++----
 tensorflow/core/graph/quantize_training.cc    |   6 +-
 .../core/graph/quantize_training_test.cc      |  12 +-
 tensorflow/core/graph/subgraph.cc             |   6 +-
 tensorflow/core/graph/subgraph_test.cc        |   4 +-
 .../core/grappler/costs/graph_properties.cc   |   4 +-
 tensorflow/core/kernels/function_ops.cc       |  16 +--
 .../core/kernels/hexagon/graph_transferer.cc  |  19 +--
 .../remote_fused_graph_execute_utils.cc       |   6 +-
 .../remote_fused_graph_execute_utils.h        |   2 +-
 54 files changed, 605 insertions(+), 520 deletions(-)

diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index bbc18569ad..f4775783f9 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -738,8 +738,7 @@ tensorflow::string OutputName(const TF_Output& output) {
 const tensorflow::AttrValue* GetAttrValue(TF_Operation* oper,
                                           const char* attr_name,
                                           TF_Status* status) {
-  const tensorflow::AttrValue* attr =
-      tensorflow::AttrSlice(oper->node.def()).Find(attr_name);
+  const tensorflow::AttrValue* attr = oper->node.attrs().Find(attr_name);
   if (attr == nullptr) {
     status->status =
         InvalidArgument("Operation has no attr named '", attr_name, "'.");
@@ -1135,7 +1134,7 @@ const char* TF_OperationOpType(TF_Operation* oper) {
 }
 
 const char* TF_OperationDevice(TF_Operation* oper) {
-  return oper->node.def().device().c_str();
+  return oper->node.requested_device().c_str();
 }
 
 int TF_OperationNumOutputs(TF_Operation* oper) {
@@ -1150,8 +1149,8 @@ TF_DataType TF_OperationOutputType(TF_Output oper_out) {
 int TF_OperationOutputListLength(TF_Operation* oper, const char* arg_name,
                                  TF_Status* status) {
   NameRangeMap name_ranges;
-  status->status = NameRangesForNode(oper->node.def(), oper->node.op_def(),
-                                     nullptr, &name_ranges);
+  status->status =
+      NameRangesForNode(oper->node, oper->node.op_def(), nullptr, &name_ranges);
   if (!status->status.ok()) return -1;
   auto iter = name_ranges.find(arg_name);
   if (iter == name_ranges.end()) {
@@ -1172,8 +1171,8 @@ TF_DataType TF_OperationInputType(TF_Input oper_in) {
 int TF_OperationInputListLength(TF_Operation* oper, const char* arg_name,
                                 TF_Status* status) {
   NameRangeMap name_ranges;
-  status->status = NameRangesForNode(oper->node.def(), oper->node.op_def(),
-                                     &name_ranges, nullptr);
+  status->status =
+      NameRangesForNode(oper->node, oper->node.op_def(), &name_ranges, nullptr);
   if (!status->status.ok()) return -1;
   auto iter = name_ranges.find(arg_name);
   if (iter == name_ranges.end()) {
@@ -1411,26 +1410,27 @@ void TF_OperationGetAttrStringList(TF_Operation* oper, const char* attr_name,
   }
 }
 
-#define DEFINE_GETATTR(func, c_type, cpp_type, list_field)                     \
-  void func(TF_Operation* oper, const char* attr_name, c_type* value,          \
-            TF_Status* status) {                                               \
-    cpp_type v;                                                                \
-    status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &v); \
-    *value = static_cast<c_type>(v);                                           \
-  }                                                                            \
-  void func##List(TF_Operation* oper, const char* attr_name, c_type* values,   \
-                  int max_values, TF_Status* status) {                         \
-    const auto* attr = GetAttrValue(oper, attr_name, status);                  \
-    if (!status->status.ok()) return;                                          \
-    if (attr->value_case() != tensorflow::AttrValue::kList) {                  \
-      status->status =                                                         \
-          InvalidArgument("Value for '", attr_name, "' is not a list.");       \
-      return;                                                                  \
-    }                                                                          \
-    const auto len = std::min(max_values, attr->list().list_field##_size());   \
-    for (int i = 0; i < len; ++i) {                                            \
-      values[i] = static_cast<c_type>(attr->list().list_field(i));             \
-    }                                                                          \
+#define DEFINE_GETATTR(func, c_type, cpp_type, list_field)                   \
+  void func(TF_Operation* oper, const char* attr_name, c_type* value,        \
+            TF_Status* status) {                                             \
+    cpp_type v;                                                              \
+    status->status =                                                         \
+        tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &v);          \
+    *value = static_cast<c_type>(v);                                         \
+  }                                                                          \
+  void func##List(TF_Operation* oper, const char* attr_name, c_type* values, \
+                  int max_values, TF_Status* status) {                       \
+    const auto* attr = GetAttrValue(oper, attr_name, status);                \
+    if (!status->status.ok()) return;                                        \
+    if (attr->value_case() != tensorflow::AttrValue::kList) {                \
+      status->status =                                                       \
+          InvalidArgument("Value for '", attr_name, "' is not a list.");     \
+      return;                                                                \
+    }                                                                        \
+    const auto len = std::min(max_values, attr->list().list_field##_size()); \
+    for (int i = 0; i < len; ++i) {                                          \
+      values[i] = static_cast<c_type>(attr->list().list_field(i));           \
+    }                                                                        \
   }
 DEFINE_GETATTR(TF_OperationGetAttrInt, int64_t, tensorflow::int64, i);
 DEFINE_GETATTR(TF_OperationGetAttrFloat, float, float, f);
@@ -1441,7 +1441,8 @@ DEFINE_GETATTR(TF_OperationGetAttrType, TF_DataType, DataType, type);
 void TF_OperationGetAttrShape(TF_Operation* oper, const char* attr_name,
                               int64_t* value, int num_dims, TF_Status* status) {
   PartialTensorShape shape;
-  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &shape);
+  status->status =
+      tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &shape);
   if (!status->status.ok()) return;
   auto len = std::min(shape.dims(), num_dims);
   for (int i = 0; i < len; ++i) {
@@ -1455,7 +1456,7 @@ void TF_OperationGetAttrShapeList(TF_Operation* oper, const char* attr_name,
                                   int storage_size, TF_Status* status) {
   std::vector<PartialTensorShape> shapes;
   status->status =
-      tensorflow::GetNodeAttr(oper->node.def(), attr_name, &shapes);
+      tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &shapes);
   if (!status->status.ok()) return;
   auto len = std::min(static_cast<int>(shapes.size()), max_values);
   int64_t* p = storage;
@@ -1522,7 +1523,7 @@ void TF_OperationGetAttrTensor(TF_Operation* oper, const char* attr_name,
                                TF_Tensor** value, TF_Status* status) {
   *value = nullptr;
   Tensor t;
-  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &t);
+  status->status = tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &t);
   if (!status->status.ok()) return;
   *value = new TF_Tensor{static_cast<TF_DataType>(t.dtype()), t.shape(),
                          tensorflow::TensorCApi::Buffer(t)};
@@ -1533,7 +1534,7 @@ void TF_OperationGetAttrTensorList(TF_Operation* oper, const char* attr_name,
                                    TF_Tensor** values, int max_values,
                                    TF_Status* status) {
   std::vector<Tensor> ts;
-  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &ts);
+  status->status = tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &ts);
   if (!status->status.ok()) return;
   const auto len = std::min(max_values, static_cast<int>(ts.size()));
   for (int i = 0; i < len; ++i) {
diff --git a/tensorflow/cc/framework/cc_op_gen.cc b/tensorflow/cc/framework/cc_op_gen.cc
index 799492a4eb..71aa986f91 100644
--- a/tensorflow/cc/framework/cc_op_gen.cc
+++ b/tensorflow/cc/framework/cc_op_gen.cc
@@ -740,11 +740,10 @@ void OpInfo::GetOutput(string* out) const {
     return;
   }
   strings::StrAppend(out, "  ::tensorflow::NameRangeMap _outputs_range;\n");
-  strings::StrAppend(
-      out,
-      "  ::tensorflow::Status _status_ = "
-      "::tensorflow::NameRangesForNode(ret->def(), ret->op_def(), "
-      "nullptr, &_outputs_range);\n");
+  strings::StrAppend(out,
+                     "  ::tensorflow::Status _status_ = "
+                     "::tensorflow::NameRangesForNode(*ret, ret->op_def(), "
+                     "nullptr, &_outputs_range);\n");
   strings::StrAppend(out, "  if (!_status_.ok()) {\n", "    ", scope_str,
                      ".UpdateStatus(_status_);\n", "    return;\n");
   strings::StrAppend(out, "  }\n\n");
diff --git a/tensorflow/cc/framework/cc_ops_test.cc b/tensorflow/cc/framework/cc_ops_test.cc
index 92c97d107d..5da23036ea 100644
--- a/tensorflow/cc/framework/cc_ops_test.cc
+++ b/tensorflow/cc/framework/cc_ops_test.cc
@@ -35,8 +35,8 @@ Output Linear(const Scope& scope, Input x, Input w, Input b) {
 void GetColocationConstraints(const Output& tensor,
                               std::vector<string>* constraints) {
   constraints->clear();
-  TF_EXPECT_OK(
-      GetNodeAttr(tensor.op().node()->def(), kColocationAttrName, constraints));
+  TF_EXPECT_OK(GetNodeAttr(tensor.op().node()->attrs(), kColocationAttrName,
+                           constraints));
 }
 
 }  // namespace
@@ -159,11 +159,11 @@ TEST(CCOpTest, KernelLabel) {
   Scope root = Scope::NewRootScope();
   auto add = Add(root.WithKernelLabel("AddWithKernelLabel"), 1.0f, 2.0f);
   TF_EXPECT_OK(root.status());
-  const auto& attrs = add.z.op().node()->def().attr();
-  ASSERT_TRUE(attrs.find("_kernel") != attrs.end());
-  auto kernel_attr = attrs.find("_kernel")->second;
-  TF_EXPECT_OK(AttrValueHasType(kernel_attr, "string"));
-  EXPECT_EQ(kernel_attr.s(), "AddWithKernelLabel");
+  AttrSlice attrs = add.z.op().node()->attrs();
+  const auto* kernel_attr = attrs.Find("_kernel");
+  ASSERT_TRUE(kernel_attr);
+  TF_EXPECT_OK(AttrValueHasType(*kernel_attr, "string"));
+  EXPECT_EQ(kernel_attr->s(), "AddWithKernelLabel");
 }
 
 TEST(CCOpTest, ColocateWith) {
@@ -190,8 +190,7 @@ TEST(CCOpTest, ColocateWith) {
 
   Scope with_colocate = root.ColocateWith(c3).ColocateWith(c4);
   auto c6 = Const(with_colocate.WithOpName("c6").ClearColocation(), 7);
-  const auto& attrs = c6.op().node()->def().attr();
-  EXPECT_TRUE(attrs.find("_class") == attrs.end());
+  EXPECT_FALSE(c6.op().node()->attrs().Find("_class"));
 }
 
 TEST(CCOpTest, TemplatedConst) {
diff --git a/tensorflow/cc/framework/scope.cc b/tensorflow/cc/framework/scope.cc
index 8b7fc1406f..32c0822de6 100644
--- a/tensorflow/cc/framework/scope.cc
+++ b/tensorflow/cc/framework/scope.cc
@@ -271,9 +271,9 @@ Scope::Impl::Impl(const Scope& other, Tags::Colocate,
 std::unordered_set<string> Scope::Impl::GetColocationConstraints(
     const Operation& colocate_with_op) const {
   std::unordered_set<string> current_constraints(colocation_constraints_);
-  const NodeDef& node_def = colocate_with_op.node()->def();
+  const AttrSlice attrs = colocate_with_op.node()->attrs();
   std::vector<string> node_constraints;
-  if (GetNodeAttr(node_def, kColocationAttrName, &node_constraints).ok()) {
+  if (GetNodeAttr(attrs, kColocationAttrName, &node_constraints).ok()) {
     for (const string& entry : node_constraints) {
       StringPiece s(entry);
       if (s.Consume(kColocationGroupPrefix)) {
diff --git a/tensorflow/cc/gradients/array_grad.cc b/tensorflow/cc/gradients/array_grad.cc
index 26abd2438e..37f07e71a0 100644
--- a/tensorflow/cc/gradients/array_grad.cc
+++ b/tensorflow/cc/gradients/array_grad.cc
@@ -43,9 +43,9 @@ Status PackGrad(const Scope& scope, const Operation& op,
                 const std::vector<Output>& grad_inputs,
                 std::vector<Output>* grad_outputs) {
   int N;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "N", &N));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "N", &N));
   int axis;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "axis", &axis));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "axis", &axis));
 
   grad_outputs->reserve(N);
   auto grad_op = Unstack(scope, grad_inputs[0], N, Unstack::Axis(axis));
@@ -60,7 +60,7 @@ Status UnpackGrad(const Scope& scope, const Operation& op,
                   const std::vector<Output>& grad_inputs,
                   std::vector<Output>* grad_outputs) {
   int axis;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "axis", &axis));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "axis", &axis));
   grad_outputs->push_back(Stack(scope, grad_inputs, Stack::Axis(axis)));
   return scope.status();
 }
@@ -162,7 +162,7 @@ Status CheckNumericsGrad(const Scope& scope, const Operation& op,
                          const std::vector<Output>& grad_inputs,
                          std::vector<Output>* grad_outputs) {
   string message;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "message", &message));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "message", &message));
   string err_msg = strings::StrCat(
       "Not a number (NaN) or infinity (Inf) values detected in gradient. ",
       message);
@@ -215,9 +215,9 @@ Status ReverseSequenceGrad(const Scope& scope, const Operation& op,
                            std::vector<Output>* grad_outputs) {
   auto seq_lengths = op.input(1);
   int batch_dim;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "batch_dim", &batch_dim));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "batch_dim", &batch_dim));
   int seq_dim;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "seq_dim", &seq_dim));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "seq_dim", &seq_dim));
   grad_outputs->push_back(
       ReverseSequence(scope, grad_inputs[0], seq_lengths, seq_dim,
                       ReverseSequence::BatchDim(batch_dim)));
@@ -267,7 +267,8 @@ Status SpaceToBatchGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(
       BatchToSpace(scope, grad_inputs[0], op.input(1), block_size));
   grad_outputs->push_back(NoGradient());
@@ -290,7 +291,8 @@ Status BatchToSpaceGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(
       SpaceToBatch(scope, grad_inputs[0], op.input(1), block_size));
   grad_outputs->push_back(NoGradient());
@@ -313,7 +315,8 @@ Status SpaceToDepthGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(DepthToSpace(scope, grad_inputs[0], block_size));
   return scope.status();
 }
@@ -323,7 +326,8 @@ Status DepthToSpaceGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(SpaceToDepth(scope, grad_inputs[0], block_size));
   return scope.status();
 }
@@ -333,7 +337,7 @@ Status MirrorPadGrad(const Scope& scope, const Operation& op,
                      const std::vector<Output>& grad_inputs,
                      std::vector<Output>* grad_outputs) {
   string mode;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "mode", &mode));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "mode", &mode));
   grad_outputs->push_back(tensorflow::ops::internal::MirrorPadGrad(
       scope, grad_inputs[0], op.input(1), mode));
   grad_outputs->push_back(NoGradient());
@@ -346,7 +350,7 @@ Status MirrorPadGradGrad(const Scope& scope, const Operation& op,
                          const std::vector<Output>& grad_inputs,
                          std::vector<Output>* grad_outputs) {
   string mode;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "mode", &mode));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "mode", &mode));
   grad_outputs->push_back(MirrorPad(scope, grad_inputs[0], op.input(1), mode));
   grad_outputs->push_back(NoGradient());
   return scope.status();
diff --git a/tensorflow/cc/gradients/math_grad.cc b/tensorflow/cc/gradients/math_grad.cc
index 5a2c6d11fb..8c1a01f518 100644
--- a/tensorflow/cc/gradients/math_grad.cc
+++ b/tensorflow/cc/gradients/math_grad.cc
@@ -350,7 +350,7 @@ Status MatMulGradCommon(const Scope& scope, const Operation& op,
                         const string& attr_adj_x, const string& attr_adj_y,
                         std::vector<Output>* grad_outputs) {
   DataType dtype;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), "T", &dtype));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->attrs(), "T", &dtype));
   if (dtype == DT_COMPLEX64 || dtype == DT_COMPLEX128) {
     return errors::Unimplemented(
         "MatMul gradient for complex data type is not supported yet.");
@@ -358,8 +358,10 @@ Status MatMulGradCommon(const Scope& scope, const Operation& op,
 
   bool ta;
   bool tb;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), attr_adj_x, &ta));
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), attr_adj_y, &tb));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.output(0).node()->attrs(), attr_adj_x, &ta));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.output(0).node()->attrs(), attr_adj_y, &tb));
 
   if (!ta && !tb) {
     return MatMulGradHelper(scope, is_batch, grad_inputs[0], false, op.input(1),
diff --git a/tensorflow/cc/ops/const_op_test.cc b/tensorflow/cc/ops/const_op_test.cc
index 5a4770f879..3184edeb33 100644
--- a/tensorflow/cc/ops/const_op_test.cc
+++ b/tensorflow/cc/ops/const_op_test.cc
@@ -28,9 +28,9 @@ void ExpectNodeEqual(const Node* n, gtl::ArraySlice<T> values,
                      TensorShape shape) {
   EXPECT_TRUE(n->IsConstant());
   Tensor tensor;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor));
   DataType dtype;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
   EXPECT_EQ(tensor.dtype(), dtype);
   test::ExpectTensorEqual<T>(tensor, test::AsTensor(values, shape));
 }
@@ -39,9 +39,9 @@ void ExpectTypeAndShape(const Node* n, DataType expected_dtype,
                         TensorShape expected_shape) {
   EXPECT_TRUE(n->IsConstant());
   Tensor tensor;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor));
   DataType dtype;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
   EXPECT_EQ(dtype, expected_dtype);
   EXPECT_EQ(expected_shape, TensorShape(tensor.shape()));
 }
diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index 162e719ade..0c7b97b01f 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -203,14 +203,14 @@ Status RewriteAndPruneGraph(Graph* graph, const Config& config,
   for (const Node* n : graph->nodes()) {
     if (n->type_string() == kArgOp) {
       string feed_id;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), kFeedIdAttr, &feed_id));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), kFeedIdAttr, &feed_id));
       if (missing_feeds.erase(feed_id) == 0) {
         return errors::Aborted(kArgOp,
                                " node found with unknown feed id: ", feed_id);
       }
     } else if (n->type_string() == kRetvalOp) {
       string fetch_id;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), kFetchIdAttr, &fetch_id));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), kFetchIdAttr, &fetch_id));
       if (missing_fetches.erase(fetch_id) == 0) {
         return errors::Aborted(kRetvalOp,
                                " node found with unknown fetch id: ", fetch_id);
@@ -234,7 +234,7 @@ Status CollectArgNodes(const Graph& graph, std::vector<Node*>* arg_nodes) {
   for (Node* n : graph.nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
       auto insert_result = indexed_arg_nodes.insert({index, n});
       if (!insert_result.second) {
         const Node* dup = insert_result.first->second;
@@ -264,9 +264,9 @@ Status CreateXlaArgs(const Graph& graph,
   for (const Node* node : arg_nodes) {
     XlaCompiler::Argument arg;
     arg.kind = XlaCompiler::Argument::kParameter;
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &arg.type));
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), kShapeAttr, &arg.shape));
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), kDebugNameAttr, &arg.name));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &arg.type));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), kShapeAttr, &arg.shape));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), kDebugNameAttr, &arg.name));
     xla_args->push_back(arg);
   }
   return Status::OK();
diff --git a/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc b/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
index abb68f73d7..48eed7fce0 100644
--- a/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
+++ b/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
@@ -66,9 +66,9 @@ static Status ReplaceNodeWithXlaLaunch(Graph* graph, Node* node) {
 
   int num_constant_args, num_resource_args;
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(node->def(), kXlaNumConstantArgsAttr, &num_constant_args));
+      GetNodeAttr(node->attrs(), kXlaNumConstantArgsAttr, &num_constant_args));
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(node->def(), kXlaNumResourceArgsAttr, &num_resource_args));
+      GetNodeAttr(node->attrs(), kXlaNumResourceArgsAttr, &num_resource_args));
 
   if (num_constant_args < 0 || num_resource_args < 0 ||
       num_constant_args + num_resource_args > node->num_inputs()) {
@@ -88,7 +88,7 @@ static Status ReplaceNodeWithXlaLaunch(Graph* graph, Node* node) {
   Node* launch_node;
   TF_RETURN_IF_ERROR(BuildLaunchNode(
       graph->NewName(node->name()), node->type_string(), node->def().attr(),
-      node->def().device(), const_dtypes, num_resource_args, arg_dtypes,
+      node->requested_device(), const_dtypes, num_resource_args, arg_dtypes,
       node->output_types(), graph, &launch_node));
   launch_node->set_assigned_device_name(node->assigned_device_name());
 
@@ -173,7 +173,8 @@ Status CreateXlaLaunchOp(FunctionLibraryRuntime* flr, const NodeDef& ndef,
   FunctionLibraryRuntime::Handle handle;
   // If ndef is not instantiable, e.g., the function does not exist,
   // simply bail out.
-  TF_RETURN_IF_ERROR(flr->Instantiate(ndef.op(), ndef.attr(), &handle));
+  TF_RETURN_IF_ERROR(
+      flr->Instantiate(ndef.op(), AttrSlice(&ndef.attr()), &handle));
   const FunctionBody* fbody = flr->GetFunctionBody(handle);
   CHECK(fbody);  // Can't be nullptr since we just instantiated it.
   std::vector<bool> const_args(fbody->arg_types.size());
diff --git a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
index decea97fc8..88ec45f8d8 100644
--- a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
+++ b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
@@ -165,7 +165,7 @@ static const char* const kRetValOp = "_Retval";
 // none.
 string Encapsulator::GetFunctionNameAttr(Node const* node) const {
   string attr;
-  if (!GetNodeAttr(node->def(), group_attribute_, &attr).ok()) {
+  if (!GetNodeAttr(node->attrs(), group_attribute_, &attr).ok()) {
     attr.clear();
   }
   return attr;
@@ -195,7 +195,7 @@ Status Encapsulator::SplitIntoSubgraphs() {
 
     // Check the device matches any existing device.
     string device = node->assigned_device_name().empty()
-                        ? node->def().device()
+                        ? node->requested_device()
                         : node->assigned_device_name();
 
     if (subgraph.device.empty()) {
@@ -593,7 +593,7 @@ static Status GetArgTypes(const Graph& graph, DataTypeVector* types) {
   for (Node* n : graph.nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
       if (index < 0 || index >= types->size()) {
         return errors::InvalidArgument("Invalid argument number");
       }
@@ -610,7 +610,7 @@ static Status RenumberArguments(Graph* graph,
   for (Node* n : graph->nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
       if (index < 0 || index >= permutation.size()) {
         return errors::InvalidArgument("Invalid argument number");
       }
@@ -713,7 +713,7 @@ Status EncapsulateSubgraphsPass::Run(
 bool IsXlaCompiledKernel(const Node& node) {
   bool is_compiled = false;
   bool has_compilation_attr =
-      GetNodeAttr(node.def(), kXlaCompiledKernelAttr, &is_compiled).ok() &&
+      GetNodeAttr(node.attrs(), kXlaCompiledKernelAttr, &is_compiled).ok() &&
       is_compiled;
   return has_compilation_attr ? is_compiled : false;
 }
diff --git a/tensorflow/compiler/jit/graph_to_functiondef.cc b/tensorflow/compiler/jit/graph_to_functiondef.cc
index 88e292a2c1..83c2338500 100644
--- a/tensorflow/compiler/jit/graph_to_functiondef.cc
+++ b/tensorflow/compiler/jit/graph_to_functiondef.cc
@@ -126,8 +126,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     if (node->type_string() == kArgOp) {
       int index;
       DataType type;
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &type));
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &type));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "index", &index));
       while (fdef->signature().input_arg_size() <= index) {
         fdef->mutable_signature()->add_input_arg();
       }
@@ -143,8 +143,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     if (node->type_string() == kRetValOp) {
       int index;
       DataType type;
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &type));
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &type));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "index", &index));
       while (fdef->signature().output_arg_size() <= index) {
         fdef->mutable_signature()->add_output_arg();
       }
@@ -161,7 +161,7 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     }
 
     NodeDef* node_def = fdef->add_node_def();
-    node_def->CopyFrom(node->def());
+    *node_def = node->def();
     node_def->set_name(node_names.Uniquify(node->name()));
 
     // Reset input names based on graph rather than the NodeDef.
@@ -203,8 +203,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
 
     // Populate tensor_renaming.
     NameRangeMap output_ranges;
-    TF_RETURN_IF_ERROR(NameRangesForNode(node->def(), node->op_def(), nullptr,
-                                         &output_ranges));
+    TF_RETURN_IF_ERROR(
+        NameRangesForNode(*node, node->op_def(), nullptr, &output_ranges));
     for (const auto& output : output_ranges) {
       for (int i = output.second.first; i < output.second.second; ++i) {
         const string tensor_name = strings::StrCat(
diff --git a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
index cb6c14901b..29c5ff7242 100644
--- a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
@@ -55,7 +55,7 @@ XlaDeviceLaunchOp::XlaDeviceLaunchOp(OpKernelConstruction* ctx)
   OP_REQUIRES_OK(ctx, ctx->GetAttr("function", &func));
   function_ = *func;
   VLOG(1) << "XlaDeviceLaunch created function="
-          << Canonicalize(function_.name(), function_.attr());
+          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
   DataTypeVector constant_types;
   OP_REQUIRES_OK(ctx, ctx->GetAttr("Tconstants", &constant_types));
   num_constant_args_ = constant_types.size();
@@ -81,7 +81,7 @@ std::vector<OptionalTensor> SnapshotResourceVariables(OpKernelContext* ctx,
 
 void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
   VLOG(1) << "XlaDeviceLaunch::Compute "
-          << Canonicalize(function_.name(), function_.attr());
+          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
   // We store information about the JIT-compiled XLA computation
   // in the ResourceMgr.
   ResourceMgr* rm = ctx->resource_manager();
diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
index a58abcbdff..40acc0d81d 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
@@ -186,7 +186,7 @@ Status XlaLocalLaunchOp::BuildCompilationCache(OpKernelContext* ctx,
 
 void XlaLocalLaunchOp::Compute(OpKernelContext* ctx) {
   VLOG(1) << "XlaLocalLaunchOp::Compute "
-          << Canonicalize(function_.name(), function_.attr());
+          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
   // We store information about the JIT-compiled XLA computation
   // in the ResourceMgr.
   ResourceMgr* rm = ctx->resource_manager();
diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass.cc b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
index 711b986d7f..73c4e80551 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
@@ -56,18 +56,18 @@ bool IsCompilableCall(const NodeDef& call_def,
                       const DeviceType& jit_device_type, int depth,
                       FunctionLibraryRuntime* lib_runtime);
 
-// Tests whether 'while_def' is a completely compilable loop.
+// Tests whether 'while_node' is a completely compilable loop.
 // Every operator in the condition and body functions must be compilable for a
 // while loop to be compilable.
-bool IsCompilableWhile(const NodeDef& while_def,
+bool IsCompilableWhile(const Node& while_node,
                        const DeviceType& jit_device_type, int depth,
                        FunctionLibraryRuntime* lib_runtime) {
-  VLOG(2) << "Loop marking: " << while_def.op();
+  VLOG(2) << "Loop marking: " << while_node.type_string();
 
   const NameAttrList* name_attr;
   NodeDef call;
   Status status;
-  status = GetNodeAttr(while_def, "cond", &name_attr);
+  status = GetNodeAttr(while_node.attrs(), "cond", &name_attr);
   if (!status.ok()) {
     VLOG(2) << "Missing 'cond' attribute on While node.";
     return false;
@@ -80,7 +80,7 @@ bool IsCompilableWhile(const NodeDef& while_def,
     VLOG(2) << "Can't compile loop condition: " << cond_func;
     return false;
   }
-  status = GetNodeAttr(while_def, "body", &name_attr);
+  status = GetNodeAttr(while_node.attrs(), "body", &name_attr);
   if (!status.ok()) {
     VLOG(2) << "Missing 'body' attribute on While node.";
     return false;
@@ -112,7 +112,7 @@ bool IsCompilableCall(const NodeDef& call_def,
 
   FunctionLibraryRuntime::Handle handle;
   Status status =
-      lib_runtime->Instantiate(call_def.op(), call_def.attr(), &handle);
+      lib_runtime->Instantiate(call_def.op(), AttrSlice(call_def), &handle);
   if (!status.ok()) {
     VLOG(2) << "Could not instantiate " << call_def.op() << ": " << status;
     return false;
@@ -134,11 +134,11 @@ bool IsCompilableCall(const NodeDef& call_def,
 
   for (Node* node : fbody->graph->nodes()) {
     if (node->IsSource() || node->IsSink()) continue;
-    if (node->def().op() == "_Arg" || node->def().op() == "_Retval") continue;
-    if (node->def().op() == "While") {
+    if (node->type_string() == "_Arg" || node->type_string() == "_Retval")
+      continue;
+    if (node->type_string() == "While") {
       // Handle functional While loop (not in open source build).
-      return IsCompilableWhile(node->def(), jit_device_type, depth + 1,
-                               lib_runtime);
+      return IsCompilableWhile(*node, jit_device_type, depth + 1, lib_runtime);
     }
     if (!HasXLAKernel(*node, jit_device_type) &&
         !IsCompilableCall(node->def(), jit_device_type, depth + 1,
@@ -192,17 +192,16 @@ Status FindCompilationCandidates(
     if (!HasXLAKernel(*node, jit_device_type) &&
         !IsCompilableCall(node->def(), jit_device_type, 0, lib_runtime.get())) {
       VLOG(2) << "Compilation rejected node: unsupported op " << node->name()
-              << ": " << node->def().op();
+              << ": " << node->type_string();
       continue;
     }
     if (!registration->compile_resource_ops && HasResourceArgument(*node)) {
       VLOG(2) << "Compilation rejected node: resource argument " << node->name()
-              << ": " << node->def().op();
+              << ": " << node->type_string();
       continue;
     }
-    if (node->def().op() == "While" &&
-        !IsCompilableWhile(node->def(), jit_device_type, 0,
-                           lib_runtime.get())) {
+    if (node->type_string() == "While" &&
+        !IsCompilableWhile(*node, jit_device_type, 0, lib_runtime.get())) {
       continue;
     }
     candidates->insert(node);
@@ -319,10 +318,10 @@ Status MarkForCompilationPass::Run(
 
     // If there is a _XlaCompile annotation, use its value.
     bool compile = false;
-    Status status = GetNodeAttr(node->def(), kXlaCompileAttr, &compile);
+    Status status = GetNodeAttr(node->attrs(), kXlaCompileAttr, &compile);
     if (status.ok()) return compile;
 
-    status = fld->GetAttr(node->def(), kXlaCompileAttr, &compile);
+    status = fld->GetAttr(*node, kXlaCompileAttr, &compile);
     if (status.ok()) return compile;
 
     // Otherwise use the value of global_jit_level.
@@ -485,8 +484,8 @@ Status MarkForCompilationPass::RunImpl(
       // all nodes marked with _XlaCompile=true to also have a
       // _XlaScope property set (and raise an error otherwise); but
       // for now we don't do this.
-      if (GetNodeAttr(node_from->def(), kXlaScopeAttr, &from_scope).ok() &&
-          GetNodeAttr(node_to->def(), kXlaScopeAttr, &to_scope).ok() &&
+      if (GetNodeAttr(node_from->attrs(), kXlaScopeAttr, &from_scope).ok() &&
+          GetNodeAttr(node_to->attrs(), kXlaScopeAttr, &to_scope).ok() &&
           from_scope != to_scope) {
         continue;
       }
@@ -541,10 +540,9 @@ Status MarkForCompilationPass::RunImpl(
     // Compile if the user marked this node _XlaCompile=true
     bool compile_attr = false;
     bool marked_for_compilation = false;
-    if (GetNodeAttr(n->def(), kXlaCompileAttr, &compile_attr).ok()) {
+    if (GetNodeAttr(n->attrs(), kXlaCompileAttr, &compile_attr).ok()) {
       marked_for_compilation = compile_attr;
-    } else if (options.flib_def
-                   ->GetAttr(n->def(), kXlaCompileAttr, &compile_attr)
+    } else if (options.flib_def->GetAttr(*n, kXlaCompileAttr, &compile_attr)
                    .ok()) {
       marked_for_compilation = compile_attr;
     }
diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc b/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
index 91e4a2b41c..9f30e12e0e 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
@@ -57,7 +57,7 @@ std::unordered_map<string, string> GetClusters(const Graph& graph) {
   std::unordered_map<string, string> ids;
   for (Node* node : graph.nodes()) {
     string cluster;
-    if (GetNodeAttr(node->def(), kXlaClusterAttr, &cluster).ok()) {
+    if (GetNodeAttr(node->attrs(), kXlaClusterAttr, &cluster).ok()) {
       CHECK(!cluster.empty());
       ids[node->name()] = cluster;
     }
diff --git a/tensorflow/compiler/jit/xla_compilation_cache.cc b/tensorflow/compiler/jit/xla_compilation_cache.cc
index 82af304169..63ca77f9a9 100644
--- a/tensorflow/compiler/jit/xla_compilation_cache.cc
+++ b/tensorflow/compiler/jit/xla_compilation_cache.cc
@@ -95,7 +95,7 @@ Status XlaCompilationCache::BuildSignature(
     const NameAttrList& function, int num_constant_args,
     const std::vector<OptionalTensor>& variable_args, OpKernelContext* ctx,
     Signature* signature) {
-  signature->name = Canonicalize(function.name(), function.attr());
+  signature->name = Canonicalize(function.name(), AttrSlice(&function.attr()));
   signature->arg_values.resize(num_constant_args);
 
   signature->arg_types.reserve(ctx->num_inputs() - num_constant_args);
diff --git a/tensorflow/compiler/tf2xla/const_analysis.cc b/tensorflow/compiler/tf2xla/const_analysis.cc
index 44ff13ca34..4adc17b838 100644
--- a/tensorflow/compiler/tf2xla/const_analysis.cc
+++ b/tensorflow/compiler/tf2xla/const_analysis.cc
@@ -108,7 +108,7 @@ Status BackwardsConstAnalysis(const Graph& g,
     if (must_be_const.find(node) != must_be_const.end()) {
       if (node->type_string() == "_Arg") {
         int index;
-        status = GetNodeAttr(node->def(), "index", &index);
+        status = GetNodeAttr(node->attrs(), "index", &index);
         if (!status.ok()) return;
         compile_time_const_args->at(index) = true;
         return;
@@ -124,8 +124,8 @@ Status BackwardsConstAnalysis(const Graph& g,
     if (range.first == range.second) return;
 
     NameRangeMap input_name_ranges;
-    status = NameRangesForNode(node->def(), node->op_def(), &input_name_ranges,
-                               nullptr);
+    status =
+        NameRangesForNode(*node, node->op_def(), &input_name_ranges, nullptr);
     if (!status.ok()) return;
 
     for (auto it = range.first; it != range.second; ++it) {
diff --git a/tensorflow/compiler/tf2xla/kernels/function_ops.cc b/tensorflow/compiler/tf2xla/kernels/function_ops.cc
index d718f98545..8dacb6627b 100644
--- a/tensorflow/compiler/tf2xla/kernels/function_ops.cc
+++ b/tensorflow/compiler/tf2xla/kernels/function_ops.cc
@@ -68,7 +68,8 @@ class SymbolicGradientOp : public AsyncOpKernel {
                       done);
 
     OP_REQUIRES_OK_ASYNC(
-        ctx, lib->Instantiate(kGradientOp, def().attr(), &handle_), done);
+        ctx, lib->Instantiate(kGradientOp, AttrSlice(&def().attr()), &handle_),
+        done);
 
     FunctionLibraryRuntime::Options opts;
     opts.step_id = ctx->step_id();
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index a8034a2ec6..d4a917671b 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -106,7 +106,8 @@ Status XlaCompiler::CompileFunction(
     const XlaCompiler::CompileOptions& options, const NameAttrList& function,
     const std::vector<XlaCompiler::Argument>& args,
     XlaCompiler::CompilationResult* result) {
-  const string function_id = Canonicalize(function.name(), function.attr());
+  const string function_id =
+      Canonicalize(function.name(), AttrSlice(&function.attr()));
   VLOG(1) << "XlaCompiler::CompileFunction " << function_id;
 
   auto it = cache_.find({function_id, args});
@@ -116,8 +117,8 @@ Status XlaCompiler::CompileFunction(
   }
 
   FunctionLibraryRuntime::Handle handle;
-  TF_RETURN_IF_ERROR(
-      flib_runtime_->Instantiate(function.name(), function.attr(), &handle));
+  TF_RETURN_IF_ERROR(flib_runtime_->Instantiate(
+      function.name(), AttrSlice(&function.attr()), &handle));
 
   const FunctionBody* fbody = flib_runtime_->GetFunctionBody(handle);
   CHECK(fbody);
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 6056d50587..0006aaa0b5 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1408,6 +1408,11 @@ tf_cuda_library(
             "framework/**/*.cc",
             "util/**/*.h",
             "util/**/*.cc",
+        ] + [
+            "graph/edgeset.h",
+            "graph/edgeset.cc",
+            "graph/graph.h",
+            "graph/graph.cc",
         ],
         exclude = [
             "**/*test*",
@@ -1548,8 +1553,6 @@ tf_cuda_library(
         "graph/colors.cc",
         "graph/control_flow.cc",
         "graph/costmodel.cc",
-        "graph/edgeset.cc",
-        "graph/graph.cc",
         "graph/graph_constructor.cc",
         "graph/graph_def_builder.cc",
         "graph/graph_partition.cc",
diff --git a/tensorflow/core/common_runtime/constant_folding_test.cc b/tensorflow/core/common_runtime/constant_folding_test.cc
index 9cc761a771..4a8560960e 100644
--- a/tensorflow/core/common_runtime/constant_folding_test.cc
+++ b/tensorflow/core/common_runtime/constant_folding_test.cc
@@ -48,9 +48,9 @@ class ConstantFoldingTest : public ::testing::Test {
                        TensorShape shape) {
     EXPECT_TRUE(n->IsConstant());
     const TensorProto* tensor_proto;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor_proto));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor_proto));
     DataType dtype;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
     Tensor t(dtype);
     EXPECT_TRUE(t.FromProto(*tensor_proto));
     test::ExpectClose(t, test::AsTensor(values, shape));
@@ -61,9 +61,9 @@ class ConstantFoldingTest : public ::testing::Test {
                        TensorShape shape) {
     EXPECT_TRUE(n->IsConstant());
     const TensorProto* tensor_proto;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor_proto));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor_proto));
     DataType dtype;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
     Tensor t(dtype);
     EXPECT_TRUE(t.FromProto(*tensor_proto));
     test::ExpectTensorEqual<T>(t, test::AsTensor(values, shape));
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc
index ec0c9405dd..9e18547af5 100644
--- a/tensorflow/core/common_runtime/executor.cc
+++ b/tensorflow/core/common_runtime/executor.cc
@@ -92,31 +92,28 @@ bool SetTimelineLabel(const Node* node, NodeExecStats* node_stats) {
       }
     }
   }
-  const NodeDef& def = node->def();
-  string text = "";
+  const AttrSlice attrs = node->attrs();
+  string text;
   if (IsSend(node)) {
     string tensor_name;
-    TF_CHECK_OK(GetNodeAttr(def, "tensor_name", &tensor_name));
+    TF_CHECK_OK(GetNodeAttr(attrs, "tensor_name", &tensor_name));
     string recv_device;
-    TF_CHECK_OK(GetNodeAttr(def, "recv_device", &recv_device));
-    text = strings::StrCat(memory, def.name(), " = ", def.op(), "(",
-                           tensor_name, " @", recv_device);
+    TF_CHECK_OK(GetNodeAttr(attrs, "recv_device", &recv_device));
+    text = strings::StrCat(memory, node->name(), " = ", node->type_string(),
+                           "(", tensor_name, " @", recv_device);
     is_transfer_node = true;
   } else if (IsRecv(node)) {
     string tensor_name;
-    TF_CHECK_OK(GetNodeAttr(def, "tensor_name", &tensor_name));
+    TF_CHECK_OK(GetNodeAttr(attrs, "tensor_name", &tensor_name));
     string send_device;
-    TF_CHECK_OK(GetNodeAttr(def, "send_device", &send_device));
-    text = strings::StrCat(memory, def.name(), " = ", def.op(), "(",
-                           tensor_name, " @", send_device);
+    TF_CHECK_OK(GetNodeAttr(attrs, "send_device", &send_device));
+    text = strings::StrCat(memory, node->name(), " = ", node->type_string(),
+                           "(", tensor_name, " @", send_device);
     is_transfer_node = true;
   } else {
-    text = strings::StrCat(
-        memory, def.name(), " = ", def.op(), "(",
-        str_util::Join(
-            std::vector<StringPiece>(def.input().begin(), def.input().end()),
-            ", "),
-        ")");
+    text =
+        strings::StrCat(memory, node->name(), " = ", node->type_string(), "(",
+                        str_util::Join(node->requested_inputs(), ", "), ")");
   }
   node_stats->set_timeline_label(text);
   return is_transfer_node;
@@ -522,7 +519,7 @@ char* GraphView::InitializeNode(char* ptr, const Node* n) {
   EdgeInfo* dst_edge = item->output_edge_base();
   for (auto e : n->out_edges()) {
     dst_edge->dst_id = e->dst()->id();
-    CHECK_LE(e->src_output(), ((int32)0x3FFFFFFF));  // Must fit in 31 bits
+    CHECK_LE(e->src_output(), 0x3FFFFFFF);  // Must fit in 31 bits
     dst_edge->output_slot = e->src_output();
     dst_edge->is_last = false;
     const int output_slot = dst_edge->output_slot;
@@ -640,7 +637,7 @@ Status ExecutorImpl::Initialize() {
     Status s = params_.create_kernel(n->def(), &item->kernel);
     if (!s.ok()) {
       item->kernel = nullptr;
-      s = AttachDef(s, n->def());
+      s = AttachDef(s, *n);
       LOG(ERROR) << "Executor failed to create kernel. " << s;
       return s;
     }
@@ -668,7 +665,7 @@ Status ExecutorImpl::Initialize() {
     frame_info->nodes->push_back(n);
     if (IsEnter(n)) {
       string enter_name;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "frame_name", &enter_name));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "frame_name", &enter_name));
       EnsureFrameInfo(enter_name)->input_count++;
     }
   }
@@ -723,7 +720,7 @@ Status InferAllocAttr(const Node* n, const Node* dst,
   // so these two cases are not mutually exclusive.
   if (IsRecv(n)) {
     string src_name;
-    s = GetNodeAttr(n->def(), "send_device", &src_name);
+    s = GetNodeAttr(n->attrs(), "send_device", &src_name);
     if (!s.ok()) return s;
     DeviceNameUtils::ParsedName parsed_src_name;
     if (!DeviceNameUtils::ParseFullName(src_name, &parsed_src_name)) {
@@ -748,7 +745,7 @@ Status InferAllocAttr(const Node* n, const Node* dst,
   }
   if (IsSend(dst)) {
     string dst_name;
-    s = GetNodeAttr(dst->def(), "recv_device", &dst_name);
+    s = GetNodeAttr(dst->attrs(), "recv_device", &dst_name);
     if (!s.ok()) return s;
     DeviceNameUtils::ParsedName parsed_dst_name;
     if (!DeviceNameUtils::ParseFullName(dst_name, &parsed_dst_name)) {
@@ -1361,7 +1358,7 @@ Status ExecutorImpl::BuildControlFlowInfo(const Graph* g,
     if (IsEnter(curr_node)) {
       // Enter a child frame.
       TF_RETURN_IF_ERROR(
-          GetNodeAttr(curr_node->def(), "frame_name", &frame_name));
+          GetNodeAttr(curr_node->attrs(), "frame_name", &frame_name));
       parent = curr_node;
     } else if (IsExit(curr_node)) {
       // Exit to the parent frame.
@@ -1555,8 +1552,7 @@ void ExecutorState::Process(TaggedNode tagged_node, int64 scheduled_usec) {
 
     if (vlog_) {
       VLOG(1) << "Process node: " << id << " step " << params.step_id << " "
-              << SummarizeNodeDef(node->def())
-              << " is dead: " << tagged_node.is_dead;
+              << SummarizeNode(*node) << " is dead: " << tagged_node.is_dead;
     }
 
     Entry* input_tensors = GetInputTensors(input_frame, input_iter);
@@ -1610,7 +1606,7 @@ void ExecutorState::Process(TaggedNode tagged_node, int64 scheduled_usec) {
 
           if (vlog_) {
             VLOG(2) << this << " Async kernel done: "
-                    << SummarizeNodeDef(state->item->node->def());
+                    << SummarizeNode(*state->item->node);
           }
           if (stats) nodestats::SetOpEnd(stats);
           EntryVector outputs;
@@ -1811,7 +1807,7 @@ Status ExecutorState::ProcessOutputs(const NodeItem& item, OpKernelContext* ctx,
       // tensor value at i-th output.
       if (!IsSwitch(node) && !IsRecv(node)) {
         s.Update(errors::Internal("Missing ", i, "-th output from ",
-                                  SummarizeNodeDef(node->def())));
+                                  SummarizeNode(*node)));
       }
     } else {
       Entry* out = &((*outputs)[i]);
@@ -1878,7 +1874,7 @@ Status ExecutorState::ProcessOutputs(const NodeItem& item, OpKernelContext* ctx,
                                   DataTypeString(dtype),
                                   " does not match declared output type ",
                                   DataTypeString(item.output_type(i)),
-                                  " for node ", SummarizeNodeDef(node->def())));
+                                  " for node ", SummarizeNode(*node)));
       }
     }
     if (!val.is_ref()) {
@@ -1915,7 +1911,7 @@ void ExecutorState::PropagateOutputs(const TaggedNode& tagged_node,
         &impl_->gview_, input_iter, ready);
   } else if (item->is_enter) {
     bool is_constant;
-    Status s = GetNodeAttr(node->def(), "is_constant", &is_constant);
+    Status s = GetNodeAttr(node->attrs(), "is_constant", &is_constant);
     DCHECK(s.ok()) << s;
     FindOrCreateChildFrame(input_frame, input_iter, node, &output_frame);
     output_iter = 0;
@@ -2241,7 +2237,7 @@ void ExecutorState::FindOrCreateChildFrame(FrameState* frame, int64 iter,
                                            FrameState** child) {
   // Get the child frame name.
   string enter_name;
-  Status s = GetNodeAttr(node->def(), "frame_name", &enter_name);
+  Status s = GetNodeAttr(node->attrs(), "frame_name", &enter_name);
   DCHECK(s.ok()) << s;
   const string child_name = MakeFrameName(frame, iter, enter_name);
 
@@ -2259,7 +2255,7 @@ void ExecutorState::FindOrCreateChildFrame(FrameState* frame, int64 iter,
   if (vlog_) VLOG(2) << "Create frame: " << child_name;
 
   int parallel_iters;
-  s = GetNodeAttr(node->def(), "parallel_iterations", &parallel_iters);
+  s = GetNodeAttr(node->attrs(), "parallel_iterations", &parallel_iters);
   DCHECK(s.ok()) << s;
   FrameState* temp = new FrameState(impl_, parallel_iters);
   temp->frame_name = child_name;
diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 4be22f8260..996a8a9b3d 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -150,8 +150,7 @@ class FunctionLibraryRuntimeImpl : public FunctionLibraryRuntime {
 
   ~FunctionLibraryRuntimeImpl() override;
 
-  Status Instantiate(const string& function_name,
-                     const InstantiateAttrValueMap& attrs,
+  Status Instantiate(const string& function_name, AttrSlice attrs,
                      Handle* handle) override;
 
   const FunctionBody* GetFunctionBody(Handle handle) override;
@@ -208,8 +207,7 @@ class FunctionLibraryRuntimeImpl : public FunctionLibraryRuntime {
   };
   std::vector<Item*> items_;
 
-  Status FunctionDefToBody(const FunctionDef& fdef,
-                           const InstantiateAttrValueMap& attrs,
+  Status FunctionDefToBody(const FunctionDef& fdef, AttrSlice attrs,
                            FunctionBody** fbody);
   Status CreateItem(Handle handle, Item** item);
   Status GetOrCreateItem(Handle handle, Item** item);
@@ -324,7 +322,7 @@ Status FunctionLibraryRuntimeImpl::CreateKernel(const NodeDef& ndef,
   // Try to instantiate this function for the func/attr. Maybe its
   // cached already.
   Handle handle;
-  TF_RETURN_IF_ERROR(Instantiate(ndef.op(), ndef.attr(), &handle));
+  TF_RETURN_IF_ERROR(Instantiate(ndef.op(), AttrSlice(&ndef.attr()), &handle));
 
   const FunctionBody* fbody = GetFunctionBody(handle);
   CHECK_NOTNULL(fbody);
@@ -355,9 +353,9 @@ Status FunctionLibraryRuntimeImpl::CreateKernel(const NodeDef& ndef,
   return s;
 }
 
-Status FunctionLibraryRuntimeImpl::FunctionDefToBody(
-    const FunctionDef& fdef, const InstantiateAttrValueMap& attrs,
-    FunctionBody** fbody) {
+Status FunctionLibraryRuntimeImpl::FunctionDefToBody(const FunctionDef& fdef,
+                                                     AttrSlice attrs,
+                                                     FunctionBody** fbody) {
   // Instantiates the function template into a graph def.
   InstantiationResult result;
   TF_RETURN_IF_ERROR(InstantiateFunction(fdef, attrs, get_func_sig_, &result));
@@ -390,11 +388,13 @@ Status FunctionLibraryRuntimeImpl::InstantiateSymbolicGradient(
     // TODO(josh11b): Should filter out the attrs from func that aren't used
     // by the gradient function.
     TF_RETURN_IF_ERROR(creator(AttrSlice(&func.attr()), &grad_fdef));
-    TF_RETURN_IF_ERROR(FunctionDefToBody(grad_fdef, func.attr(), g_body));
+    TF_RETURN_IF_ERROR(
+        FunctionDefToBody(grad_fdef, AttrSlice(&func.attr()), g_body));
   } else {
     // f is a user-defined function.
     Handle f_handle;
-    TF_RETURN_IF_ERROR(Instantiate(func.name(), func.attr(), &f_handle));
+    TF_RETURN_IF_ERROR(
+        Instantiate(func.name(), AttrSlice(&func.attr()), &f_handle));
     const FunctionBody* f_body = GetFunctionBody(f_handle);
     CHECK_NOTNULL(f_body);
     *g_body = SymbolicGradient(*f_body);
@@ -402,9 +402,9 @@ Status FunctionLibraryRuntimeImpl::InstantiateSymbolicGradient(
   return Status::OK();
 }
 
-Status FunctionLibraryRuntimeImpl::Instantiate(
-    const string& function_name, const InstantiateAttrValueMap& attrs,
-    Handle* handle) {
+Status FunctionLibraryRuntimeImpl::Instantiate(const string& function_name,
+                                               AttrSlice attrs,
+                                               Handle* handle) {
   const string key = Canonicalize(function_name, attrs);
   {
     mutex_lock l(mu_);
@@ -417,7 +417,7 @@ Status FunctionLibraryRuntimeImpl::Instantiate(
   Status s;
   FunctionBody* fbody = nullptr;
   if (function_name == kGradientOp) {
-    const AttrValue* f = gtl::FindOrNull(attrs, kFuncAttr);
+    const AttrValue* f = attrs.Find(kFuncAttr);
     if (f == nullptr) {
       return errors::InvalidArgument("SymbolicGradient is missing attr: f");
     }
@@ -427,7 +427,7 @@ Status FunctionLibraryRuntimeImpl::Instantiate(
     }
     const string grad = lib_def_->FindGradient(func.name());
     if (!grad.empty()) {
-      return Instantiate(grad, func.attr(), handle);
+      return Instantiate(grad, AttrSlice(&func.attr()), handle);
     }
     TF_RETURN_IF_ERROR(InstantiateSymbolicGradient(func, &fbody));
   } else {
@@ -989,13 +989,12 @@ bool ExpandInlineFunctions(FunctionLibraryRuntime* lib, Graph* graph) {
   for (Node* node : graph->nodes()) {
     VLOG(3) << "Expanding " << node->DebugString();
     bool noinline;
-    if (fld->GetAttr(node->def(), kNoInlineAttr, &noinline).ok() && noinline) {
+    if (fld->GetAttr(*node, kNoInlineAttr, &noinline).ok() && noinline) {
       VLOG(3) << "noinline: " << node->DebugString();
       continue;
     }
     FunctionLibraryRuntime::Handle handle;
-    Status s =
-        lib->Instantiate(node->type_string(), node->def().attr(), &handle);
+    Status s = lib->Instantiate(node->type_string(), node->attrs(), &handle);
     if (!s.ok()) {
       // Either "node" is a primitive op, or the instantiation failed.
       if (errors::IsNotFound(s)) {
@@ -1103,7 +1102,7 @@ FunctionBody::FunctionBody(const FunctionDef& f, DataTypeSlice arg_t,
       continue;
     }
     int index;
-    TF_CHECK_OK(GetNodeAttr(n->def(), "index", &index));
+    TF_CHECK_OK(GetNodeAttr(n->attrs(), "index", &index));
     CHECK_LE(0, index);
     CHECK_LT(index, node_vec->size());
     (*node_vec)[index] = n;
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index dfa1ed8a7e..e27fc3898d 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -40,6 +40,7 @@ limitations under the License.
 #include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
+namespace {
 
 typedef FunctionDefHelper FDH;
 
@@ -58,13 +59,29 @@ void HasError(const Status& s, const string& substr) {
       << s << ", expected substring " << substr;
 }
 
+// A helper class to make AttrSlice from initializer lists
+class Attrs {
+ public:
+  Attrs(const std::initializer_list<  // NOLINT(runtime/explicit)
+        std::pair<string, FunctionDefHelper::AttrValueWrapper>>& attrs) {
+    for (const auto& aval : attrs) {
+      map_.insert({aval.first, aval.second.proto});
+    }
+  }
+
+  operator AttrSlice() { return AttrSlice(&map_); }  // NOLINT(runtime/explicit)
+
+ private:
+  AttrValueMap map_;
+};
+
 class FunctionTest : public ::testing::Test {
  protected:
   FunctionTest()
       : device_(DeviceFactory::NewDevice("CPU", {},
                                          "/job:localhost/replica:0/task:0")) {}
 
-  void Create(const FunctionDef& fdef, InstantiateAttrValueSlice attrs) {
+  void Create(const FunctionDef& fdef, Attrs attrs) {
     exec_ = nullptr;
     InstantiationResult result;
     TF_CHECK_OK(InstantiateFunction(fdef, attrs, GetOpSig, &result));
@@ -151,8 +168,8 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     fdef_lib_ = lib_def_->ToProto();
   }
 
-  Status Run(const string& name, InstantiateAttrValueSlice attrs,
-             const std::vector<Tensor>& args, std::vector<Tensor*> rets) {
+  Status Run(const string& name, Attrs attrs, const std::vector<Tensor>& args,
+             std::vector<Tensor*> rets) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(name, attrs, &handle);
     if (!status.ok()) {
@@ -188,8 +205,7 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     return Status::OK();
   }
 
-  std::unique_ptr<Graph> GetFuncBody(const string& name,
-                                     InstantiateAttrValueSlice attrs) {
+  std::unique_ptr<Graph> GetFuncBody(const string& name, Attrs attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(name, attrs, &handle);
     if (!status.ok()) {
@@ -203,8 +219,7 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     return ret;
   }
 
-  std::unique_ptr<Graph> GetGradBody(const string& func,
-                                     InstantiateAttrValueSlice attrs) {
+  std::unique_ptr<Graph> GetGradBody(const string& func, Attrs attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(func, attrs, &handle);
     if (!status.ok()) {
@@ -615,13 +630,14 @@ TEST_F(FunctionLibraryRuntimeTest, Error_InstantiaionError) {
 
   // Instantiating "XTimesTwo" should fail.
   FunctionLibraryRuntime::Handle handle;
-  HasError(lib_->Instantiate("XTimesTwo", {{"T", DT_FLOAT}}, &handle),
+  HasError(lib_->Instantiate("XTimesTwo", Attrs({{"T", DT_FLOAT}}), &handle),
            "Not found: type attr not found");
 
   // But XTimesFour and XTimes16 instantiation should succeed. Only
   // when they run, they fail because XTimesTwo is bad.
-  TF_CHECK_OK(lib_->Instantiate("XTimesFour", {{"T", DT_FLOAT}}, &handle));
-  TF_CHECK_OK(lib_->Instantiate("XTimes16", {{"T", DT_FLOAT}}, &handle));
+  TF_CHECK_OK(
+      lib_->Instantiate("XTimesFour", Attrs({{"T", DT_FLOAT}}), &handle));
+  TF_CHECK_OK(lib_->Instantiate("XTimes16", Attrs({{"T", DT_FLOAT}}), &handle));
 
   auto x = test::AsTensor<float>({1, 2, 3, 4});
   Tensor y;
@@ -928,8 +944,7 @@ bool DoNothing(Graph* g) { return false; }
 GraphDef Optimize(const std::function<bool(Graph* g)>& pass,
                   const FunctionDef& fdef) {
   InstantiationResult result;
-  InstantiateAttrValueMap empty;
-  TF_CHECK_OK(InstantiateFunction(fdef, empty, GetOpSig, &result));
+  TF_CHECK_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   std::unique_ptr<Graph> g(new Graph(OpRegistry::Global()));
   GraphConstructorOptions opts;
   opts.allow_internal_ops = true;
@@ -1248,4 +1263,5 @@ TEST(OptimizationTest, RemoveListArrayConverter_WithContolDeps) {
   TF_EXPECT_GRAPH_EQ(expected, Optimize(remove_listarray_and_identity, func));
 }
 
+}  // end namespace
 }  // end namespace tensorflow
diff --git a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
index 72bc37d435..4e14e6fe1a 100644
--- a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
+++ b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
@@ -103,13 +103,13 @@ void Benchmark::Run(int iters) { RunWithArgs({}, {}, iters); }
 
 string GetRendezvousKey(const Node* node) {
   string send_device;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "send_device", &send_device));
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "send_device", &send_device));
   string recv_device;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "recv_device", &recv_device));
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "recv_device", &recv_device));
   string tensor_name;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "tensor_name", &tensor_name));
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "tensor_name", &tensor_name));
   uint64 send_device_incarnation;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "send_device_incarnation",
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "send_device_incarnation",
                           reinterpret_cast<int64*>(&send_device_incarnation)));
   return Rendezvous::CreateKey(send_device, send_device_incarnation,
                                recv_device, tensor_name, FrameAndIter(0, 0));
diff --git a/tensorflow/core/common_runtime/parallel_concat_optimizer.cc b/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
index ffbfbc74f1..bbd38a2e07 100644
--- a/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
+++ b/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
@@ -49,11 +49,11 @@ class ParallelConcatRemovePass : public GraphOptimizationPass {
       }
     }
     for (Node* n : matches) {
-      AttrSlice n_attrs(n->def());
+      AttrSlice n_attrs = n->attrs();
       auto base_make_node = [n, g, &n_attrs](const string& op,
                                              const string& name) {
         NodeBuilder node_builder(name, op);
-        node_builder.Device(n->def().device());
+        node_builder.Device(n->requested_device());
         string colo;
         if (GetNodeAttr(n_attrs, "_class", &colo).ok()) {
           node_builder.Attr("_class", colo);
diff --git a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
index c179e94c36..b40924ef3a 100644
--- a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
+++ b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
@@ -55,7 +55,7 @@ class ResourceVariableReadPass : public GraphOptimizationPass {
     }
     for (Node* read : matches) {
       DataType dtype;
-      TF_RETURN_IF_ERROR(GetNodeAttr(AttrSlice(read->def()), "dtype", &dtype));
+      TF_RETURN_IF_ERROR(GetNodeAttr(read->attrs(), "dtype", &dtype));
       std::vector<Node*> in_control_edges;
       std::vector<std::pair<Node*, int>> in_edges;
       for (const Edge* edge : read->in_edges()) {
diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc
index 8808d52d3e..ae225e8b35 100644
--- a/tensorflow/core/common_runtime/simple_placer.cc
+++ b/tensorflow/core/common_runtime/simple_placer.cc
@@ -76,7 +76,7 @@ void ColocationGroups(const Node& node,
   std::vector<string> class_specs;
   // TODO(vrv): We should consider adding a GetNodeAttr that returns a
   // StringPiece, to avoid a copy.
-  if (!GetNodeAttrSimple(node.def(), kColocationAttrNameStringPiece,
+  if (!GetNodeAttrSimple(node.attrs(), kColocationAttrNameStringPiece,
                          &class_specs)) {
     // No attribute value is equivalent to the empty colocation_group.
     *colocation_groups = {
@@ -329,7 +329,7 @@ class ColocationGraph {
         AddDebugInfo(node_root, &debug_info);
 
         DeviceNameUtils::ParsedName specified_device_name;
-        if (DeviceNameUtils::ParseFullName(node->def().device(),
+        if (DeviceNameUtils::ParseFullName(node->requested_device(),
                                            &specified_device_name) &&
             specified_device_name == members_[node_root].device_name) {
           // The specified device and merged set device match, and
@@ -348,27 +348,27 @@ class ColocationGraph {
             std::sort(device_names.begin(), device_names.end());
 
             return errors::InvalidArgument(
-                "Operation was explicitly assigned to ", node->def().device(),
-                " but available devices are [ ",
+                "Operation was explicitly assigned to ",
+                node->requested_device(), " but available devices are [ ",
                 str_util::Join(device_names, ", "), " ]. Make sure ",
                 "the device specification refers to a valid device.");
           } else if (specified_device_name.has_type) {
             return errors::InvalidArgument(
                 "Could not satisfy explicit device specification '",
-                node->def().device(), "' because no supported kernel for ",
+                node->requested_device(), "' because no supported kernel for ",
                 specified_device_name.type, " devices is available.",
                 debug_info);
           } else {
             return errors::InvalidArgument(
                 "Could not satisfy explicit device specification '",
-                node->def().device(), debug_info);
+                node->requested_device(), debug_info);
           }
         } else {
           // The specified device may be a valid device but the
           // merged set device is different, so print both.
           return errors::InvalidArgument(
               "Could not satisfy explicit device specification '",
-              node->def().device(),
+              node->requested_device(),
               "' because the node was colocated with a group of nodes that "
               "required incompatible device '",
               DeviceNameUtils::ParsedNameToString(
@@ -513,7 +513,7 @@ class ColocationGraph {
       return errors::Internal("Assigned device '", node.assigned_device_name(),
                               "' does not have registered OpKernel support "
                               "for ",
-                              node.def().op());
+                              node.type_string());
     } else {
       // This node has not yet been assigned to a device, so we
       // calculate any constraints due to the set of registered
@@ -527,25 +527,25 @@ class ColocationGraph {
           registered_device_types.insert(d->device_type());
         }
         return errors::InvalidArgument(
-            "No OpKernel was registered to support Op '", node.def().op(),
+            "No OpKernel was registered to support Op '", node.type_string(),
             "' with these attrs.  Registered devices: [",
             str_util::Join(registered_device_types, ","),
             "], Registered kernels:\n",
-            KernelsRegisteredForOp(node.def().op()));
+            KernelsRegisteredForOp(node.type_string()));
       }
 
       // If the NodeDef contains a device, then we interpret it as a
       // (partial) device specification.
-      if (!node.def().device().empty()) {
+      if (!node.requested_device().empty()) {
         // The user has specified a device in the NodeDef, try to find a
         // valid device matching their specification in the set of
         // devices.
         // NOTE: The full name may specify a device that is not in
         // n.supported_device_types(), but we check that in AssignDevice().
-        if (!DeviceNameUtils::ParseFullName(node.def().device(),
+        if (!DeviceNameUtils::ParseFullName(node.requested_device(),
                                             &member->device_name)) {
           return errors::InvalidArgument("Malformed device specification '",
-                                         node.def().device(), "'");
+                                         node.requested_device(), "'");
         }
       }
     }
@@ -644,7 +644,7 @@ Status SimplePlacer::Run() {
       continue;
     }
     status = colocation_graph.AddNode(*node);
-    if (!status.ok()) return AttachDef(status, node->def());
+    if (!status.ok()) return AttachDef(status, *node);
   }
 
   // 2. Enumerate the constraint edges, and use them to update the disjoint
@@ -707,7 +707,7 @@ Status SimplePlacer::Run() {
                                "be on the same device), but the two nodes "
                                "were assigned two different devices: ",
                                status.error_message()),
-                           node->def());
+                           *node);
         }
       }
     }
@@ -749,7 +749,7 @@ Status SimplePlacer::Run() {
       return AttachDef(
           errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
-          node->def());
+          *node);
     }
 
     // Returns the first device in sorted devices list so we will always
@@ -791,7 +791,7 @@ Status SimplePlacer::Run() {
       return AttachDef(
           errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
-          node->def());
+          *node);
     }
 
     string assigned_device = devices[0]->name();
diff --git a/tensorflow/core/debug/debug_graph_utils.cc b/tensorflow/core/debug/debug_graph_utils.cc
index a222dc75d7..f8f3d2ae50 100644
--- a/tensorflow/core/debug/debug_graph_utils.cc
+++ b/tensorflow/core/debug/debug_graph_utils.cc
@@ -223,19 +223,16 @@ Status DebugNodeInserter::InsertNodes(
 void DebugNodeInserter::DeparallelizeWhileLoops(Graph* graph, Device* device) {
   for (Node* node : graph->nodes()) {
     if (node->IsEnter()) {
-      for (const auto& attr : node->def().attr()) {
-        if (attr.first == "parallel_iterations") {
-          if (attr.second.i() > 1) {
-            LOG(INFO) << "For debugging, tfdbg is changing the "
-                      << "parallel_iterations attribute of the Enter/RefEnter "
-                      << "node \"" << node->name() << "\" on device \""
-                      << device->name() << "\" from " << attr.second.i()
-                      << " to 1. (This does not affect subsequent non-debug "
-                      << "runs.)";
-            node->AddAttr<int64>("parallel_iterations", 1);
-          }
-          break;
-        }
+      const AttrValue* parallel_iterations =
+          node->attrs().Find("parallel_iterations");
+      if (parallel_iterations && parallel_iterations->i() > 1) {
+        LOG(INFO) << "For debugging, tfdbg is changing the "
+                  << "parallel_iterations attribute of the Enter/RefEnter "
+                  << "node \"" << node->name() << "\" on device \""
+                  << device->name() << "\" from " << parallel_iterations->i()
+                  << " to 1. (This does not affect subsequent non-debug "
+                  << "runs.)";
+        node->AddAttr<int64>("parallel_iterations", 1);
       }
     }
   }
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 73758ade03..dddff4dce4 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -188,7 +188,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
                       const RunState* run_state,
                       SimpleGraphExecutionState* execution_state);
 
-  string DetailText(const NodeDef& def, const NodeExecStats& ns) {
+  string DetailText(const Node& node, const NodeExecStats& ns) {
     int64 tot = 0;
     for (auto& no : ns.output()) {
       tot += no.tensor_description().allocation_description().requested_bytes();
@@ -197,12 +197,8 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
     if (tot >= 0.1 * 1048576.0) {
       bytes = strings::Printf("[%.1fMB] ", tot / 1048576.0);
     }
-    return strings::StrCat(
-        bytes, def.name(), " = ", def.op(), "(",
-        str_util::Join(
-            std::vector<StringPiece>(def.input().begin(), def.input().end()),
-            ", "),
-        ")");
+    return strings::StrCat(bytes, node.name(), " = ", node.type_string(), "(",
+                           str_util::Join(node.requested_inputs(), ", "), ")");
   }
 
  private:
@@ -790,7 +786,7 @@ void MasterSession::ReffedClientGraph::ProcessDeviceStats(
       if (!ns.timeline_label().empty()) {
         details = ns.timeline_label();
       } else if (found_node_in_graph) {
-        details = DetailText(node->def(), ns);
+        details = DetailText(*node, ns);
       } else {
         // Leave details string empty
       }
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index f46bb6e2ed..186095201d 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/core/framework/function.pb_text.h"
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
@@ -44,12 +45,11 @@ namespace {
 // Otherwise (arg_def is a simple type T), *is_type_list is set to
 // false, and *dtypes is set to a single element vector, whose only
 // element is T.
-Status ArgNumType(const InstantiateAttrValueMap& attrs,
-                  const OpDef::ArgDef& arg_def, bool* is_type_list,
-                  DataTypeVector* dtypes) {
+Status ArgNumType(AttrSlice attrs, const OpDef::ArgDef& arg_def,
+                  bool* is_type_list, DataTypeVector* dtypes) {
   dtypes->clear();
   if (!arg_def.type_list_attr().empty()) {
-    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.type_list_attr());
+    const AttrValue* v = attrs.Find(arg_def.type_list_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ",
                               arg_def.type_list_attr());
@@ -64,7 +64,7 @@ Status ArgNumType(const InstantiateAttrValueMap& attrs,
   *is_type_list = false;
   int num = 1;
   if (!arg_def.number_attr().empty()) {
-    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.number_attr());
+    const AttrValue* v = attrs.Find(arg_def.number_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ", arg_def.type_attr());
     }
@@ -77,7 +77,7 @@ Status ArgNumType(const InstantiateAttrValueMap& attrs,
   } else if (arg_def.type_attr().empty()) {
     dtype = DT_INVALID;
   } else {
-    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.type_attr());
+    const AttrValue* v = attrs.Find(arg_def.type_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ", arg_def.type_attr());
     }
@@ -92,18 +92,17 @@ void AddAttr(const string& name, const T& val, NodeDef* ndef) {
   SetAttrValue(val, &((*ndef->mutable_attr())[name]));
 }
 
-Status ValidateSignatureWithAttrs(const OpDef& sig,
-                                  const InstantiateAttrValueMap& attr_values) {
+Status ValidateSignatureWithAttrs(const OpDef& sig, AttrSlice attr_values) {
   // attr_values should specify all attrs defined in fdef.
   for (const auto& a : sig.attr()) {
-    auto const iter = attr_values.find(a.name());
-    if (iter == attr_values.end()) {
+    const AttrValue* v = attr_values.Find(a.name());
+    if (!v) {
       return errors::NotFound("Attr ", a.name(), " is not found from ",
                               SummarizeOpDef(sig));
     }
-    Status status = AttrValueHasType(iter->second, a.type());
+    Status status = AttrValueHasType(*v, a.type());
     if (!status.ok()) {
-      errors::AppendToMessage(&status, "for attr '", iter->first, "'");
+      errors::AppendToMessage(&status, "for attr '", a.name(), "'");
       return status;
     }
   }
@@ -146,7 +145,7 @@ class FunctionInstantiationHelper {
 
   // Builds index for nodes that can be used as node's input arguments.
   Status BuildInputArgIndex(const OpDef::ArgDef& arg_def,
-                            const InstantiateAttrValueMap& attr_values) {
+                            AttrSlice attr_values) {
     bool is_type_list;
     DataTypeVector dtypes;
     TF_RETURN_IF_ERROR(
@@ -175,8 +174,7 @@ class FunctionInstantiationHelper {
     return Status::OK();
   }
 
-  Status BuildNodeOutputIndex(const NodeDef& node,
-                              const InstantiateAttrValueMap& attrs,
+  Status BuildNodeOutputIndex(const NodeDef& node, AttrSlice attrs,
                               const int arg_index) {
     const OpDef* node_sig = nullptr;
     TF_RETURN_IF_ERROR(get_function_(node.op(), &node_sig));
@@ -206,8 +204,7 @@ class FunctionInstantiationHelper {
     return Status::OK();
   }
 
-  Status InstantiateNode(const NodeDef& fnode,
-                         const InstantiateAttrValueMap& attrs) {
+  Status InstantiateNode(const NodeDef& fnode, AttrSlice attrs) {
     const OpDef* fnode_sig = nullptr;
     TF_CHECK_OK(get_function_(fnode.op(), &fnode_sig));
     NodeDef* gnode = AddNode(fnode.name());
@@ -295,7 +292,7 @@ class FunctionInstantiationHelper {
   }
 
   Status AddReturnNode(
-      const OpDef::ArgDef& ret_def, const InstantiateAttrValueMap& attrs,
+      const OpDef::ArgDef& ret_def, AttrSlice attrs,
       const ::tensorflow::protobuf::Map<string, string>& ret_map,
       int* ret_index) {
     auto ret_iter = ret_map.find(ret_def.name());
@@ -604,7 +601,7 @@ string Print(const GraphDef& gdef) {
 
 Status AddDefaultAttrs(const string& op,
                        const GetFunctionSignature& get_function,
-                       InstantiateAttrValueMap* attrs) {
+                       AttrValueMap* attrs) {
   const OpDef* op_def = nullptr;
   TF_RETURN_IF_ERROR(get_function(op, &op_def));
   AttrSlice attr_slice(attrs);
@@ -620,8 +617,7 @@ Status AddDefaultAttrs(const string& op,
 
 }  // end namespace
 
-Status InstantiateFunction(const FunctionDef& fdef,
-                           const InstantiateAttrValueMap& attr_values,
+Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
                            GetFunctionSignature get_function,
                            InstantiationResult* result) {
   VLOG(3) << "Instantiation Function: " << Print(fdef);
@@ -639,19 +635,17 @@ Status InstantiateFunction(const FunctionDef& fdef,
     }
   }
 
-  auto substitute = [&attr_values](const string& name, AttrValue* val) {
-    auto iter = attr_values.find(name);
-    if (iter == attr_values.end()) {
-      return false;
-    } else {
-      *val = iter->second;
+  auto substitute = [attr_values](StringPiece name, AttrValue* val) {
+    if (const AttrValue* v = attr_values.Find(name)) {
+      *val = *v;
       return true;
     }
+    return false;
   };
 
   // Makes a copy of all attrs in fdef and substitutes placeholders.
   // After this step, every attr is bound to a concrete value.
-  std::vector<InstantiateAttrValueMap> node_attrs;
+  std::vector<AttrValueMap> node_attrs;
   node_attrs.resize(fdef.node_def_size());
   for (int i = 0; i < fdef.node_def_size(); ++i) {
     for (auto attr : fdef.node_def(i).attr()) {
@@ -668,7 +662,7 @@ Status InstantiateFunction(const FunctionDef& fdef,
   }
 
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = helper.BuildNodeOutputIndex(fdef.node_def(i), node_attrs[i],
+    s = helper.BuildNodeOutputIndex(fdef.node_def(i), AttrSlice(&node_attrs[i]),
                                     result->gdef.node_size() + i);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
@@ -677,7 +671,7 @@ Status InstantiateFunction(const FunctionDef& fdef,
   }
   // Emits one gdef.node for each fdef.node_def.
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = helper.InstantiateNode(fdef.node_def(i), node_attrs[i]);
+    s = helper.InstantiateNode(fdef.node_def(i), AttrSlice(&node_attrs[i]));
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
       return s;
@@ -748,8 +742,7 @@ bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2) {
   return true;
 }
 
-string Canonicalize(const string& funcname,
-                    const InstantiateAttrValueMap& attrs) {
+string Canonicalize(const string& funcname, AttrSlice attrs) {
   std::vector<string> entries;
   entries.reserve(attrs.size());
   for (auto p : attrs) {
@@ -953,8 +946,7 @@ const FunctionDef* FunctionLibraryDefinition::GetAttrImpl(
   // If ndef is SymbolicGradient[f=Foo], we use Foo's gradient or
   // Foo's attributes.
   const NameAttrList* forward_func_attrs;
-  if (!GetNodeAttr(AttrSlice(&ndef.attr()), kFuncAttr, &forward_func_attrs)
-           .ok()) {
+  if (!GetNodeAttr(ndef, kFuncAttr, &forward_func_attrs).ok()) {
     return nullptr;
   }
   const string& func_name = forward_func_attrs->name();
@@ -981,34 +973,30 @@ FunctionDefLibrary FunctionLibraryDefinition::ToProto() const {
   return lib;
 }
 
-Status InstantiateFunction(const FunctionDef& fdef,
-                           InstantiateAttrValueSlice attr_values,
-                           GetFunctionSignature get_function,
-                           InstantiationResult* result) {
-  InstantiateAttrValueMap m;
-  for (const auto& aval : attr_values) {
-    m.insert({aval.first, aval.second.proto});
+template <typename T>
+Status FunctionLibraryDefinition::GetAttr(const NodeDef& ndef,
+                                          const string& attr, T* value) const {
+  const FunctionDef* fdef = GetAttrImpl(ndef);
+  if (fdef && GetNodeAttr(AttrSlice(&fdef->attr()), attr, value).ok()) {
+    return Status::OK();
   }
-  return InstantiateFunction(fdef, m, std::move(get_function), result);
+  return errors::InvalidArgument("Attr ", attr, " is not defined.");
 }
 
-string Canonicalize(const string& funcname, InstantiateAttrValueSlice attrs) {
-  InstantiateAttrValueMap m;
-  for (const auto& aval : attrs) {
-    m.insert({aval.first, aval.second.proto});
-  }
-  return Canonicalize(funcname, m);
+template <typename T>
+Status FunctionLibraryDefinition::GetAttr(const Node& node, const string& attr,
+                                          T* value) const {
+  return GetAttr(node.def(), attr, value);
 }
 
-Status FunctionLibraryRuntime::Instantiate(const string& function_name,
-                                           InstantiateAttrValueSlice attrs,
-                                           Handle* handle) {
-  InstantiateAttrValueMap m;
-  for (const auto& aval : attrs) {
-    m.insert({aval.first, aval.second.proto});
-  }
-  return Instantiate(function_name, m, handle);
-}
+#define GET_ATTR(T)                                                            \
+  template Status FunctionLibraryDefinition::GetAttr(const Node&,              \
+                                                     const string&, T*) const; \
+  template Status FunctionLibraryDefinition::GetAttr(const NodeDef&,           \
+                                                     const string&, T*) const;
+GET_ATTR(string)
+GET_ATTR(bool)
+#undef GET_ATTR
 
 void FunctionDefHelper::AttrValueWrapper::InitFromString(StringPiece val) {
   if (val.size() >= 2 && val[0] == '$') {
diff --git a/tensorflow/core/framework/function.h b/tensorflow/core/framework/function.h
index 210e5b949a..188c3855c6 100644
--- a/tensorflow/core/framework/function.h
+++ b/tensorflow/core/framework/function.h
@@ -36,6 +36,7 @@ class CancellationManager;
 class OpKernel;
 class ResourceMgr;
 class ScopedStepContainer;
+class Node;
 
 // FunctionDefHelper::Create is a convenient helper to construct a
 // FunctionDef proto.
@@ -190,11 +191,6 @@ inline FunctionDefHelper::AttrValueWrapper::AttrValueWrapper(StringPiece val) {
 // InstantiateFunction calls "get_function" to find signatures of other
 // functions and primitive ops.
 
-// Placeholders in "fdef" is substituted based on "attr_values" here.
-typedef ::tensorflow::protobuf::Map<string, AttrValue> InstantiateAttrValueMap;
-typedef gtl::ArraySlice<std::pair<string, FunctionDefHelper::AttrValueWrapper>>
-    InstantiateAttrValueSlice;
-
 // GetFunctionSignature(func name, opdef) returns OK if the func name is found
 // and opdef is filled with a pointer to the corresponding signature
 // (a OpDef proto). Otherwise, returns an error.
@@ -206,12 +202,7 @@ struct InstantiationResult {
   DataTypeVector ret_types;
   GraphDef gdef;
 };
-Status InstantiateFunction(const FunctionDef& fdef,
-                           const InstantiateAttrValueMap& attr_values,
-                           GetFunctionSignature get_function,
-                           InstantiationResult* result);
-Status InstantiateFunction(const FunctionDef& fdef,
-                           InstantiateAttrValueSlice attr_values,
+Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
                            GetFunctionSignature get_function,
                            InstantiationResult* result);
 
@@ -241,9 +232,7 @@ bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2);
 // space. But it may be change as the implementation
 // evolves. Therefore, it should not be persisted or compared across
 // address spaces.
-string Canonicalize(const string& funcname,
-                    const InstantiateAttrValueMap& attrs);
-string Canonicalize(const string& funcname, InstantiateAttrValueSlice attrs);
+string Canonicalize(const string& funcname, AttrSlice attrs);
 
 // Represents a function call frame. I.e., the data structure used to
 // pass arguments to a function and retrieve its results.
@@ -330,9 +319,16 @@ class FunctionLibraryDefinition : public OpRegistryInterface {
   // Given a node def 'ndef', inspects attributes of the callee
   // function to derive the attribute 'value' for 'attr'. Returns OK
   // iff the attribute is given by the function's definition.
+  // TODO(irving): Remove; keep only the const Node& version.
   template <typename T>
   Status GetAttr(const NodeDef& ndef, const string& attr, T* value) const;
 
+  // Given a node, inspects attributes of the callee function to derive the
+  // attribute 'value' for 'attr'. Returns OK iff the attribute is given by the
+  // function's definition.
+  template <typename T>
+  Status GetAttr(const Node& node, const string& attr, T* value) const;
+
   // Returns a proto representation of the state of this function library.
   FunctionDefLibrary ToProto() const;
 
@@ -375,11 +371,8 @@ class FunctionLibraryRuntime {
   // Returns OK and fills in "handle" if the instantiation succeeds.
   // Otherwise returns an error and "handle" is undefined.
   typedef uint64 Handle;
-  virtual Status Instantiate(const string& function_name,
-                             const InstantiateAttrValueMap& attrs,
+  virtual Status Instantiate(const string& function_name, AttrSlice attrs,
                              Handle* handle) = 0;
-  Status Instantiate(const string& function_name,
-                     InstantiateAttrValueSlice attrs, Handle* handle);
 
   // Returns the function body for the instantiated function given its
   // handle 'h'. Returns nullptr if "h" is not found.
@@ -506,17 +499,15 @@ bool RegisterOp(const string& op, Creator func);
 Status GetOpGradientCreator(const string& op, Creator* creator);
 };
 
-// Implementation details.
-
-template <typename T>
-Status FunctionLibraryDefinition::GetAttr(const NodeDef& ndef,
-                                          const string& attr, T* value) const {
-  const FunctionDef* fdef = GetAttrImpl(ndef);
-  if (fdef && GetNodeAttr(AttrSlice(&fdef->attr()), attr, value).ok()) {
-    return Status::OK();
-  }
-  return errors::InvalidArgument("Attr ", attr, " is not defined.");
-}
+// Declare explicit instantiations of GetAttr
+#define GET_ATTR(T)                                          \
+  extern template Status FunctionLibraryDefinition::GetAttr( \
+      const Node&, const string&, T*) const;                 \
+  extern template Status FunctionLibraryDefinition::GetAttr( \
+      const NodeDef&, const string&, T*) const;
+GET_ATTR(string)
+GET_ATTR(bool)
+#undef GET_ATTR
 
 }  // end namespace tensorflow
 
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index 07462a575e..c83ecf4e5e 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -29,6 +29,24 @@ limitations under the License.
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
+namespace {
+
+// A helper class to make AttrSlice from initializer lists
+class Attrs {
+ public:
+  Attrs(const std::initializer_list<  // NOLINT(runtime/explicit)
+        std::pair<string, FunctionDefHelper::AttrValueWrapper>>
+            attrs) {
+    for (const auto& aval : attrs) {
+      map_.insert({aval.first, aval.second.proto});
+    }
+  }
+
+  operator AttrSlice() { return AttrSlice(&map_); }  // NOLINT(runtime/explicit)
+
+ private:
+  AttrValueMap map_;
+};
 
 typedef FunctionDefHelper FDH;
 
@@ -46,8 +64,6 @@ y: A scalar in type T.
 
 )doc");
 
-static InstantiateAttrValueMap kNoAttrs;
-
 TEST(TFunc, SquarePlusOne) {
   auto fdef = FDH::Create(
       // Name
@@ -81,7 +97,8 @@ SquarePlusOne[T:{float, double, int32, int64}](x:T) -> (y:T) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
+  TF_ASSERT_OK(
+      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> (y:float) {
   a = Square[T=float](x)
@@ -126,7 +143,8 @@ ControlDep(x:int32) -> (y:int32) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
+  TF_ASSERT_OK(
+      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result));
   const char* e2 = R"P(
 (x:int32) -> (y:int32) {
   a = Identity[T=int32](x)
@@ -171,8 +189,7 @@ BackCompat() -> (y:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(
-      InstantiateFunction(fdef, InstantiateAttrValueMap{}, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   // Should get T=float from Op's default.
   const char* e2 = R"P(
 () -> (a:float) {
@@ -209,7 +226,7 @@ NTimesT(x:float, y:float) -> (z:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float, y:float) -> (a:float) {
   a = AddN[N=2, T=float](x, y)
@@ -272,8 +289,8 @@ AddSquared[N:int, T:{float, double, int32, int64}](x:N*T) -> (y:T) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, {{"N", 3}, {"T", DT_FLOAT}}, GetOpSig,
-                                   &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, Attrs({{"N", 3}, {"T", DT_FLOAT}}),
+                                   GetOpSig, &result));
   const char* e2 = R"P(
 (x_0:float, x_1:float, x_2:float) -> (y:float) {
   a = Map[N=3, T=float, U=float, func=Square[T=float]](x_0, x_1, x_2)
@@ -315,7 +332,7 @@ ControlDeps(x:float) -> () {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> () {
   a = One[T=float]() @ x
@@ -395,7 +412,7 @@ Test(i:float) -> (o:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (i:float) -> (o:float) {
   zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
@@ -467,7 +484,7 @@ MySelect(x:float) -> (z:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> (z:float) {
   y = Cond[Tin={float}, cond=MyCond, else_branch=MyElse, out_types={float}, then_branch=MyThen](x)
@@ -488,8 +505,9 @@ TEST(InstantiateErrors, Not_Sufficient_Attrs) {
   auto fdef =
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, {{"U", DT_FLOAT}}, GetOpSig, &result),
-           "Attr T is not found from ");
+  HasError(
+      InstantiateFunction(fdef, Attrs({{"U", DT_FLOAT}}), GetOpSig, &result),
+      "Attr T is not found from ");
 }
 
 #if 0  // TODO(josh11b): Enable this test once having an extra attr is an error.
@@ -497,7 +515,7 @@ TEST(InstantiateErrors, Too_Many_Attrs) {
   auto fdef =
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, {{"T", DT_INT32}, {"U", DT_FLOAT}},
+  HasError(InstantiateFunction(fdef, Attrs({{"T", DT_INT32}, {"U", DT_FLOAT}}),
                                GetOpSig, &result),
            "Attr U is not found in ");
 }
@@ -508,7 +526,7 @@ TEST(InstantiateErrors, AttrValue_Value_Placeholder) {
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
   HasError(
-      InstantiateFunction(fdef, {{"T", "$bad"}}, GetOpSig, &result),
+      InstantiateFunction(fdef, Attrs({{"T", "$bad"}}), GetOpSig, &result),
       "AttrValue had value with unexpected type 'placeholder'\n\tfor attr 'T'");
 }
 
@@ -518,14 +536,15 @@ TEST(InstantiateErrors, Unbounded_Attr) {
                               {{"a"}, "One", {}, {{"T", "$unknown"}}, {"x"}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result),
-           "Failed to bind all placeholders");
+  HasError(
+      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result),
+      "Failed to bind all placeholders");
 }
 
 TEST(InstantiateErrors, DupArgs) {
   auto fdef = FDH::Define("test", {"x:float", "x:float"}, {}, {}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Duplicated arg name");
 }
 
@@ -536,7 +555,7 @@ TEST(InstantiateErrors, Dup_Node_Names) {
                               {{"y"}, "One", {}, {{"T", DT_FLOAT}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Duplicated ret name");
 }
 
@@ -547,7 +566,7 @@ TEST(InstantiateErrors, Node_Arg_Notfound) {
                           },
                           {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input z is not found");
 }
 
@@ -557,7 +576,7 @@ TEST(InstantiateErrors, Node_Arg_TypeMismatch) {
                               {{"y"}, "Add", {"x", "x"}, {{"T", DT_INT32}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input x[0] expected type int32 != float, the type of x[0]");
 }
 
@@ -568,7 +587,7 @@ TEST(InstantiateErrors, Node_Arg_ControlMissing) {
                       {{"y"}, "Add", {"x", "x"}, {{"T", DT_FLOAT}}, {"z"}},
                   });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input[2] == '^z', is not found.");
 }
 
@@ -579,7 +598,7 @@ TEST(InstantiateErrors, FuncRet_Missing) {
                           },
                           {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Return y missing");
 }
 
@@ -590,7 +609,7 @@ TEST(InstantiateErrors, FuncRet_NotFound) {
                           },
                           {{"y", "z"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Return y -> z is not found");
 }
 
@@ -601,7 +620,7 @@ TEST(InstantiateErrors, FuncRet_NameMismatch) {
                           },
                           {{"z", "x:y:0"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Return y missing");
 }
 
@@ -613,7 +632,7 @@ TEST(InstantiateErrors, FuncRet_NameMismatch) {
 //                           },
 //                           {{"y", "x:y:0"}, {"z", "x:y:0"}});
 //   InstantiationResult result;
-//   HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+//   HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
 //            "ret is not found");
 // }
 
@@ -623,7 +642,7 @@ TEST(InstantiateErrors, FuncRet_TypeMismatch) {
                               {{"y"}, "One", {}, {{"T", DT_DOUBLE}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Invalid ret types y : float vs. double\n\tIn function output y");
 }
 
@@ -649,7 +668,7 @@ TEST(InstantiateErrors, TypeList_Missing_Retval_Attr) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "type attr not found: out_types");
 }
 
@@ -676,7 +695,7 @@ TEST(InstantiateErrors, TypeList_Num_Retval_Mismatch) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Invalid ret types");
 }
 
@@ -703,7 +722,7 @@ TEST(InstantiateErrors, TypeList_Missing_Arg) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input unknown is not found");
 }
 
@@ -724,7 +743,7 @@ TEST(InstantiateErrors, TooManyInputs) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Expected input[2] == 'x' to be a control input.");
 }
 
@@ -745,7 +764,7 @@ TEST(InstantiateErrors, TooFewInputs) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Attempt to access beyond input size: 2 >= 2");
 }
 
@@ -773,7 +792,7 @@ TEST(InstantiateErrors, TooManyInputsFromArray1) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Expected input[1] == 'y' to be a control input.");
 }
 
@@ -801,7 +820,7 @@ TEST(InstantiateErrors, TooManyInputsFromArray2) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Input a:output too long for inputs");
 }
 
@@ -822,7 +841,7 @@ TEST(InstantiateErrors, TypeMismatch) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input inputs[1] expected type float != int32, the type of y[0]");
 }
 
@@ -874,17 +893,17 @@ TEST(FunctionCallFrame, Float_Float_Float) {
 }
 
 TEST(Canonicalize, Basic) {
-  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_FLOAT},
-                                    {"transpose_a", false},
-                                    {"transpose_b", false}}),
+  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_FLOAT},
+                                          {"transpose_a", false},
+                                          {"transpose_b", false}})),
             "MatMul[T=float,transpose_a=false,transpose_b=false]");
-  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_FLOAT},
-                                    {"transpose_b", false},
-                                    {"transpose_a", false}}),
+  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_FLOAT},
+                                          {"transpose_b", false},
+                                          {"transpose_a", false}})),
             "MatMul[T=float,transpose_a=false,transpose_b=false]");
-  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_DOUBLE},
-                                    {"transpose_b", true},
-                                    {"transpose_a", false}}),
+  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_DOUBLE},
+                                          {"transpose_b", true},
+                                          {"transpose_a", false}})),
             "MatMul[T=double,transpose_a=false,transpose_b=true]");
 }
 
@@ -1148,4 +1167,5 @@ TEST(FunctionDefsEqualTest, TestFunctionDefsEqual) {
   EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
 }
 
+}  // end namespace
 }  // end namespace tensorflow
diff --git a/tensorflow/core/framework/node_def_util.cc b/tensorflow/core/framework/node_def_util.cc
index 36c0842924..9b737e1f72 100644
--- a/tensorflow/core/framework/node_def_util.cc
+++ b/tensorflow/core/framework/node_def_util.cc
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_def.pb_text.h"
 #include "tensorflow/core/framework/op_def_util.h"
 #include "tensorflow/core/framework/tensor.pb_text.h"
+#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/strings/scanner.h"
@@ -36,18 +37,23 @@ namespace tensorflow {
 const char* const kColocationAttrName = "_class";
 const char* const kColocationGroupPrefix = "loc:@";
 
+AttrSlice::AttrSlice() : ndef_(nullptr) {
+  static const AttrValueMap* const kEmptyAttrValueMap = new AttrValueMap;
+  attrs_ = kEmptyAttrValueMap;
+}
+
 AttrSlice::AttrSlice(const NodeDef& node_def)
     : ndef_(&node_def), attrs_(&ndef_->attr()) {}
 
 AttrSlice::AttrSlice(const AttrValueMap* a) : ndef_(nullptr), attrs_(a) {}
 
-string SummarizeNodeDef(const NodeDef& node_def) {
-  string ret = strings::StrCat(node_def.name(), " = ", node_def.op(), "[");
+static string SummarizeAttrsHelper(AttrSlice attrs, StringPiece device) {
+  string ret;
 
   // We sort the attrs so the output is deterministic.
   std::vector<string> attr_names;
-  attr_names.reserve(node_def.attr().size());
-  for (const auto& attr : node_def.attr()) {
+  attr_names.reserve(attrs.size());
+  for (const auto& attr : attrs) {
     attr_names.push_back(attr.first);
   }
   std::sort(attr_names.begin(), attr_names.end());
@@ -55,20 +61,34 @@ string SummarizeNodeDef(const NodeDef& node_def) {
   for (const string& attr_name : attr_names) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
-    auto iter = node_def.attr().find(attr_name);
-    strings::StrAppend(&ret, attr_name, "=", SummarizeAttrValue(iter->second));
+    strings::StrAppend(&ret, attr_name, "=",
+                       SummarizeAttrValue(*attrs.Find(attr_name)));
   }
 
   // Consider the device to be a final attr with name "_device".
-  if (!node_def.device().empty()) {
+  if (!device.empty()) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
-    strings::StrAppend(&ret, "_device=\"", node_def.device(), "\"");
+    strings::StrAppend(&ret, "_device=\"", device, "\"");
   }
+  return ret;
+}
+
+string AttrSlice::SummarizeNode() const {
+  return ndef_ ? SummarizeNodeDef(*ndef_)
+               : strings::StrCat(
+                     "[", SummarizeAttrsHelper(*this, StringPiece()), "]");
+}
+
+string SummarizeNode(const Node& node) { return SummarizeNodeDef(node.def()); }
+
+string SummarizeNodeDef(const NodeDef& node_def) {
+  string ret = strings::StrCat(node_def.name(), " = ", node_def.op(), "[");
+  strings::StrAppend(&ret, SummarizeAttrsHelper(node_def, node_def.device()));
   strings::StrAppend(&ret, "](");
 
   // Output inputs, including control inputs, verbatim.
-  first = true;
+  bool first = true;
   for (const string& input : node_def.input()) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
@@ -109,12 +129,28 @@ Status AttrSlice::Find(StringPiece attr_name,
   // Skip AttachDef for internal attrs since it is a little bit
   // expensive and it is common for them to correctly not be included
   // in a NodeDef.
-  if (!StringPiece(attr_name).starts_with("_") && ndef_) {
+  if (!attr_name.starts_with("_") && ndef_ != nullptr) {
     s = AttachDef(s, *ndef_);
   }
   return s;
 }
 
+bool AttrSlice::EqualAttrs(AttrSlice other, Scratch* scratch) const {
+  if (size() != other.size()) return false;
+
+  for (const auto& attr : *other.attrs_) {
+    auto iter = attrs_->find(attr.first);
+    if (iter == attrs_->end()) return false;
+    // TODO(irving): Comparing AttrValues by proto is slightly buggy, since
+    // TensorProto is a nonunique representation of Tensor.  This bug will go
+    // away once AttrSlice switches over to NodeInfo.
+    iter->second.SerializeToString(&scratch->a);
+    attr.second.SerializeToString(&scratch->b);
+    if (scratch->a != scratch->b) return false;
+  }
+  return true;
+}
+
 // The ... is to allow the caller to inject some value validation code.  Use
 // just ; if no additional validation code is needed.
 #define DEFINE_GET_ATTR(TYPE, FIELD, ATTR_TYPE, APPEND_OP, CAST, ...)         \
@@ -341,14 +377,14 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
     if (StringPiece(input).starts_with("^")) {
       seen_control = true;
       if (input.find(':') != string::npos) {
-        return errors::InvalidArgument("Control input '", input,
-                                       "' must not have ':' in NodeDef: ",
-                                       SummarizeNodeDef(node_def));
+        return errors::InvalidArgument(
+            "Control input '", input,
+            "' must not have ':' in NodeDef: ", SummarizeNodeDef(node_def));
       }
     } else if (seen_control) {
-      return errors::InvalidArgument("Non-control input '", input,
-                                     "' after control input in NodeDef: ",
-                                     SummarizeNodeDef(node_def));
+      return errors::InvalidArgument(
+          "Non-control input '", input,
+          "' after control input in NodeDef: ", SummarizeNodeDef(node_def));
     } else {
       ++num_inputs;
     }
@@ -358,8 +394,8 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
   for (const auto& attr : op_def.attr()) {
     if (!gtl::InsertIfNotPresent(&op_attrs, attr.name(), &attr)) {
       return errors::InvalidArgument("OpDef has duplicate attr name '",
-                                     attr.name(), "': ",
-                                     SummarizeOpDef(op_def));
+                                     attr.name(),
+                                     "': ", SummarizeOpDef(op_def));
     }
   }
   for (const auto& attr : node_def.attr()) {
@@ -383,8 +419,9 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
           "with your GraphDef-generating binary.).");
     }
     TF_RETURN_WITH_CONTEXT_IF_ERROR(
-        ValidateAttrValue(attr.second, *iter->second), "; NodeDef: ",
-        SummarizeNodeDef(node_def), "; ", SummarizeOpDef(op_def));
+        ValidateAttrValue(attr.second, *iter->second),
+        "; NodeDef: ", SummarizeNodeDef(node_def), "; ",
+        SummarizeOpDef(op_def));
     // Keep track of which attr names have (not) been found in the NodeDef.
     op_attrs.erase(iter);
   }
@@ -431,9 +468,9 @@ Status ComputeArgRange(const NodeDef& node_def, const OpDef::ArgDef& arg_def,
   } else if (!arg_def.type_attr().empty() || arg_def.type() != DT_INVALID) {
     *num = 1;
   } else {
-    return errors::InvalidArgument("Argument '", arg_def.name(),
-                                   "' incorrectly specified in op definition: ",
-                                   SummarizeOpDef(op_def));
+    return errors::InvalidArgument(
+        "Argument '", arg_def.name(),
+        "' incorrectly specified in op definition: ", SummarizeOpDef(op_def));
   }
   return Status::OK();
 }
@@ -465,6 +502,11 @@ Status NameRangesForNode(const NodeDef& node_def, const OpDef& op_def,
   return Status::OK();
 }
 
+Status NameRangesForNode(const Node& node, const OpDef& op_def,
+                         NameRangeMap* inputs, NameRangeMap* outputs) {
+  return NameRangesForNode(node.def(), op_def, inputs, outputs);
+}
+
 void AddDefaultsToNodeDef(const OpDef& op_def, NodeDef* node_def) {
   for (const auto& attr_def : op_def.attr()) {
     AttrSlice attrs(*node_def);
@@ -565,4 +607,8 @@ Status AttachDef(const Status& status, const NodeDef& node_def) {
   return ret;
 }
 
+Status AttachDef(const Status& status, const Node& node) {
+  return AttachDef(status, node.def());
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/framework/node_def_util.h b/tensorflow/core/framework/node_def_util.h
index 018e4d15f2..1438abdec6 100644
--- a/tensorflow/core/framework/node_def_util.h
+++ b/tensorflow/core/framework/node_def_util.h
@@ -29,6 +29,8 @@ limitations under the License.
 
 namespace tensorflow {
 
+class Node;
+
 // Name of the attribute used to encode node colocation constraints.
 //
 // Nodes can be co-located on the same device. Desire for explicit co-location
@@ -39,8 +41,9 @@ extern const char* const kColocationAttrName;
 // String prefix applied to the operation name for colocation constraints.
 extern const char* const kColocationGroupPrefix;
 
-// Produce a human-readable version of a NodeDef that is more concise
+// Produce a human-readable version of a Node or NodeDef that is more concise
 // than a text-format proto.
+string SummarizeNode(const Node& node);
 string SummarizeNodeDef(const NodeDef& node_def);
 
 typedef protobuf::Map<string, AttrValue> AttrValueMap;
@@ -78,8 +81,11 @@ class AttrSlice {
  public:
   AttrSlice(const NodeDef& node_def);  // NOLINT(runtime/explicit)
 
+  AttrSlice();  // Empty
   explicit AttrSlice(const AttrValueMap* a);
 
+  int size() const { return attrs_->size(); }
+
   // Returns the attr with attr_name if found.  Otherwise, returns
   // nullptr.
   const AttrValue* Find(StringPiece attr_name) const;
@@ -88,6 +94,33 @@ class AttrSlice {
   // NotFound status.
   Status Find(StringPiece attr_name, const AttrValue** attr_value) const;
 
+  // Helper class to avoid allocations in EqualAttrs.
+  // TODO(irving): Will go away once NodeInfo is used.
+  struct Scratch {
+    string a;
+    string b;
+  };
+
+  // Check if all attrs and attr values match.  Does not take defaults into
+  // account.
+  //
+  // TODO(irving): There is a bug in this routine inherited from its
+  // OptimizerCSE::EqualAttrs precedecessor.  The same tensor attr can be
+  // represented in more than one way as an AttrValue, since TensorProto is
+  // not 1-1.  This bug will go away once I replace everything with NodeInfo,
+  // which stores a Tensor object directly.  The Scratch object will also go
+  // away.
+  bool EqualAttrs(AttrSlice other, Scratch* scratch) const;
+
+  // If this AttrSlice has an attached NodeDef, summarize it.  This is for
+  // error messages only: we intentionally do not provide direct access to the
+  // NodeDef, since it is not always there.
+  string SummarizeNode() const;
+
+  // Iteration over all attrs
+  AttrValueMap::const_iterator begin() const { return attrs_->begin(); }
+  AttrValueMap::const_iterator end() const { return attrs_->end(); }
+
  private:
   const NodeDef* ndef_;
   const AttrValueMap* attrs_;
@@ -183,9 +216,12 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def);
 // corresponding input/output index range.  For example,
 // input "foo" corresponds to input indices
 //   [ (*inputs)["foo"].first, (*inputs)["foo"].second ).
+// TODO(irving): Remove the NodeDef version; keep only the Node version.
 typedef std::unordered_map<string, std::pair<int, int>> NameRangeMap;
 Status NameRangesForNode(const NodeDef& node_def, const OpDef& op_def,
                          NameRangeMap* inputs, NameRangeMap* outputs);
+Status NameRangesForNode(const Node& node, const OpDef& op_def,
+                         NameRangeMap* inputs, NameRangeMap* outputs);
 
 // Adds default values to *node_def for unspecified attrs from op_def.
 void AddDefaultsToNodeDef(const OpDef& op_def, NodeDef* node_def);
@@ -206,6 +242,7 @@ Status ValidateExternalNodeDefSyntax(const NodeDef& node_def);
 // Returns "status" with kernel's NodeDef attached as additional text
 // in the error message.
 Status AttachDef(const Status& status, const NodeDef& node_def);
+Status AttachDef(const Status& status, const Node& node);
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 422ee80720..6c3917c686 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -27,6 +27,7 @@ limitations under the License.
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op_def_util.h"
 #include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/notification.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
@@ -842,13 +843,10 @@ bool InTypeList(DataType dt, const AttrValue& type_list) {
   return false;
 }
 
-// Returns whether the attrs in the NodeDef satisfy the constraints in
-// the kernel_def.  Returns an error if attrs in kernel_def are not
-// found, or have a mismatching type.
-Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
-                  bool* match) {
+// Returns whether the attrs satisfy the constraints in the kernel_def.  Returns
+// an error if attrs in kernel_def are not found, or have a mismatching type.
+Status AttrsMatch(AttrSlice attrs, const KernelDef& kernel_def, bool* match) {
   *match = false;
-  AttrSlice attrs(node_def);
   for (const auto& constraint : kernel_def.constraint()) {
     if (constraint.allowed_values().list().type_size() == 0) {
       return errors::Unimplemented(
@@ -872,7 +870,7 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
               "' that has value '", SummarizeAttrValue(*found),
               "' that does not have type 'type' or 'list(type)' in NodeDef "
               "'",
-              SummarizeNodeDef(node_def), "'");
+              attrs.SummarizeNode(), "'");
         }
 
         for (int t : found->list().type()) {
@@ -885,7 +883,7 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
     } else {
       return errors::InvalidArgument(
           "OpKernel '", kernel_def.op(), "' has constraint on attr '",
-          constraint.name(), "' not in NodeDef '", SummarizeNodeDef(node_def),
+          constraint.name(), "' not in NodeDef '", attrs.SummarizeNode(),
           "', KernelDef: '", ProtoShortDebugString(kernel_def), "'");
     }
   }
@@ -895,6 +893,7 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
 
 static const StringPiece kKernelAttr("_kernel");
 
+// TODO(irving): Replace with const Node& version below.
 Status FindKernelRegistration(const DeviceType& device_type,
                               const NodeDef& node_def,
                               const KernelRegistration** reg,
@@ -927,8 +926,16 @@ Status FindKernelRegistration(const DeviceType& device_type,
   return Status::OK();
 }
 
+Status FindKernelRegistration(const DeviceType& device_type, const Node& node,
+                              const KernelRegistration** reg,
+                              bool* was_attr_mismatch) {
+  return FindKernelRegistration(device_type, node.def(), reg,
+                                was_attr_mismatch);
+}
+
 }  // namespace
 
+// TODO(irving): Change const NodeDef& to const Node&
 Status FindKernelDef(const DeviceType& device_type, const NodeDef& node_def,
                      const KernelDef** def, string* kernel_class_name) {
   const KernelRegistration* reg = nullptr;
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index cebadcc5b4..d064a8ec4d 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -184,8 +184,8 @@ class InferenceContext {
     }
 #ifndef NDEBUG
     for (int i = 0; i < num_outputs(); ++i) {
-      DCHECK(output(i).IsSet()) << i << " for " << node_def().name()
-                                << " of type " << node_def().op();
+      DCHECK(output(i).IsSet())
+          << i << " for " << node_def_.name() << " of type " << node_def_.op();
     }
 #endif  // NDEBUG
     return s;
@@ -394,11 +394,6 @@ class InferenceContext {
   // the value.
   Status MakeDimForScalarInput(int idx, DimensionHandle* out);
 
-  // Returns the NodeDef. The returned reference does not outlive the
-  // InferenceContext, and it should not be used after InferenceContext is
-  // destroyed.
-  const NodeDef& node_def() { return node_def_; }
-
   // Look up the attr for the NodeDef being evaluated with name attr_name and
   // set *value to its value.  If no attr with attr_name is found in def(), or
   // the attr does not have a matching type, a non-ok status will be returned.
diff --git a/tensorflow/core/graph/control_flow.cc b/tensorflow/core/graph/control_flow.cc
index 8409fb4cd0..db6683d1e7 100644
--- a/tensorflow/core/graph/control_flow.cc
+++ b/tensorflow/core/graph/control_flow.cc
@@ -88,7 +88,7 @@ Status BuildControlFlowInfo(Graph* g, std::vector<ControlFlowInfo>* info) {
           out_info->frame = out;
           out_info->parent_frame = frame;
           TF_RETURN_IF_ERROR(
-              GetNodeAttr(out->def(), "frame_name", &out_info->frame_name));
+              GetNodeAttr(out->attrs(), "frame_name", &out_info->frame_name));
           if (out_info->frame_name.empty()) {
             return errors::InvalidArgument("The Enter node ", out->name(),
                                            " must have a frame name.");
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index d765959ca0..9066de5668 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -78,7 +78,7 @@ string Node::DebugString() const {
   } else {
     strings::StrAppend(&ret, " op device:");
     strings::StrAppend(&ret, "{", assigned_device_name_, "}");
-    strings::StrAppend(&ret, " def:{", SummarizeNodeDef(def()), "}}");
+    strings::StrAppend(&ret, " def:{", SummarizeNode(*this), "}}");
   }
   return ret;
 }
@@ -474,7 +474,7 @@ void Graph::ToGraphDefSubRange(GraphDef* graph_def, int from_node_id) const {
     for (size_t i = 0; i < inputs.size(); ++i) {
       const Edge* edge = inputs[i];
       if (edge == nullptr) {
-        node_def->add_input(node->def().input(i));
+        node_def->add_input(node->requested_inputs()[i]);
       } else {
         const Node* src = edge->src();
         if (!src->IsOp()) continue;
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index ac22dfc324..8554cb2f4b 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -71,6 +71,7 @@ class Node {
   int cost_id() const { return cost_id_; }
   const string& name() const { return props_->node_def_.name(); }
   const string& type_string() const { return props_->node_def_.op(); }
+
   // def() provides the NodeDef the user supplied, but the specifics
   // of this Node may have changed due to placement, optimization, etc.
   // In particular:
@@ -80,6 +81,7 @@ class Node {
   // * def().device() is the "user's requested device" and may not match
   //   the actual assigned device, see assigned_device_name() below;
   // * def().attr() is authoritative.
+  // TODO(irving): Replace with NodeInfo.
   const NodeDef& def() const { return props_->node_def_; }
   const OpDef& op_def() const { return *props_->op_def_; }
 
@@ -92,6 +94,10 @@ class Node {
   DataType output_type(int32 o) const { return props_->output_types_[o]; }
   const DataTypeVector& output_types() const { return props_->output_types_; }
 
+  // The device requested by the user.  For the actual assigned device,
+  // use assigned_device_name() below.
+  const string& requested_device() const { return def().device(); }
+
   // This gives the device the runtime has assigned this node to.  If
   // you want the device the user requested, use def().device() instead.
   // TODO(josh11b): Validate that the assigned_device, if not empty:
@@ -103,6 +109,14 @@ class Node {
     assigned_device_name_ = device_name;
   }
 
+  // Read only access to attributes
+  AttrSlice attrs() const { return AttrSlice(def()); }
+
+  // Inputs requested by the NodeDef.  For the actual inputs, use in_edges.
+  const protobuf::RepeatedPtrField<string>& requested_inputs() const {
+    return def().input();
+  }
+
   // Get the neighboring nodes via edges either in or out of this node.
   gtl::iterator_range<NeighborIter> in_nodes() const;
   gtl::iterator_range<NeighborIter> out_nodes() const;
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
index 9d4a0a52f7..70087b8fe1 100644
--- a/tensorflow/core/graph/graph_constructor.cc
+++ b/tensorflow/core/graph/graph_constructor.cc
@@ -424,7 +424,7 @@ Status GraphConstructor::ValidateShape(Node* node) {
   // For nodes with the _output_shapes atttribute, override the shape.
   std::vector<TensorShapeProto> shape_attrs;
   const char* kAttrName = "_output_shapes";
-  if (!GetNodeAttr(node->def(), kAttrName, &shape_attrs).ok()) {
+  if (!GetNodeAttr(node->attrs(), kAttrName, &shape_attrs).ok()) {
     // No _output_shapes attribute, the AddNode call above was sufficient.
     return Status::OK();
   }
@@ -458,7 +458,7 @@ Status GraphConstructor::ValidateShape(Node* node) {
       // functions that are not critical to correct execution but
       // would cause graphs to fail if imported after correcting.
       //
-      const string& op = node->def().op();
+      const string& op = node->type_string();
       const std::vector<string> whitelist = {
           // To be removed after 2017/03/08.
           "RandomShuffleQueue", "PaddingFIFOQueue", "FIFOQueue",
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index e3b7f322cb..6013b2ff51 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -146,7 +146,7 @@ class GraphConstructorTest : public ::testing::Test {
       return "";
     }
     std::vector<string> value;
-    Status s = GetNodeAttr(n->def(), kColocationAttrName, &value);
+    Status s = GetNodeAttr(n->attrs(), kColocationAttrName, &value);
     if (!s.ok()) {
       return "";
     }
@@ -997,7 +997,7 @@ TEST_F(GraphConstructorTest, ImportGraphDef_DefaultAttrs) {
   }
   ASSERT_TRUE(a != nullptr);
   int value = 0;
-  s = GetNodeAttr(a->def(), "default_int", &value);
+  s = GetNodeAttr(a->attrs(), "default_int", &value);
   ASSERT_EQ(Status::OK(), s) << s << " -- " << a->def().DebugString();
   EXPECT_EQ(31415, value);
 }
@@ -1201,9 +1201,9 @@ TEST_F(GraphConstructorTest, ImportGraphDef_InputMap) {
 
   // Check that t1's NodeDef is consistent with graph
   Node* t1 = FindNode("t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  ASSERT_EQ(t1->def().input(0), "input:1");
-  ASSERT_EQ(t1->def().input(1), "input:0");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  ASSERT_EQ(t1->requested_inputs()[0], "input:1");
+  ASSERT_EQ(t1->requested_inputs()[1], "input:0");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithPrefix) {
@@ -1254,19 +1254,19 @@ TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithPrefix) {
 
   // Check that NodeDefs are consistent with graph
   Node* t1 = FindNode("import/t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  EXPECT_EQ(t1->def().input(0), "input:0");
-  EXPECT_EQ(t1->def().input(1), "input:0");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  EXPECT_EQ(t1->requested_inputs()[0], "input:0");
+  EXPECT_EQ(t1->requested_inputs()[1], "input:0");
 
   Node* t2 = FindNode("import/t2");
-  ASSERT_EQ(t2->def().input_size(), 2);
-  EXPECT_EQ(t2->def().input(0), "import/t1:0");
-  EXPECT_EQ(t2->def().input(1), "import/t1:0");
+  ASSERT_EQ(t2->requested_inputs().size(), 2);
+  EXPECT_EQ(t2->requested_inputs()[0], "import/t1:0");
+  EXPECT_EQ(t2->requested_inputs()[1], "import/t1:0");
 
   Node* t3 = FindNode("import/t3");
-  ASSERT_EQ(t3->def().input_size(), 2);
-  EXPECT_EQ(t3->def().input(0), "import/unmapped_input:0");
-  EXPECT_EQ(t3->def().input(1), "import/unmapped_input:1");
+  ASSERT_EQ(t3->requested_inputs().size(), 2);
+  EXPECT_EQ(t3->requested_inputs()[0], "import/unmapped_input:0");
+  EXPECT_EQ(t3->requested_inputs()[1], "import/unmapped_input:1");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithControlEdges) {
@@ -1795,24 +1795,24 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ControlDeps) {
 
   // Test that node defs are consistent with graph
   Node* w1 = FindNode("import/W1");
-  ASSERT_EQ(w1->def().input_size(), 2);
-  EXPECT_EQ(w1->def().input(0), "^W1");
-  EXPECT_EQ(w1->def().input(1), "^W2");
+  ASSERT_EQ(w1->requested_inputs().size(), 2);
+  EXPECT_EQ(w1->requested_inputs()[0], "^W1");
+  EXPECT_EQ(w1->requested_inputs()[1], "^W2");
 
   Node* input = FindNode("import/input");
-  ASSERT_EQ(input->def().input_size(), 2);
-  EXPECT_EQ(input->def().input(0), "^W1");
-  EXPECT_EQ(input->def().input(1), "^W2");
+  ASSERT_EQ(input->requested_inputs().size(), 2);
+  EXPECT_EQ(input->requested_inputs()[0], "^W1");
+  EXPECT_EQ(input->requested_inputs()[1], "^W2");
 
   Node* input2 = FindNode("import/input2");
-  ASSERT_EQ(input2->def().input_size(), 2);
-  EXPECT_EQ(input2->def().input(0), "^W1");
-  EXPECT_EQ(input2->def().input(1), "^W2");
+  ASSERT_EQ(input2->requested_inputs().size(), 2);
+  EXPECT_EQ(input2->requested_inputs()[0], "^W1");
+  EXPECT_EQ(input2->requested_inputs()[1], "^W2");
 
   Node* t1 = FindNode("import/t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  EXPECT_EQ(t1->def().input(0), "import/input:0");
-  EXPECT_EQ(t1->def().input(1), "import/input:1");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  EXPECT_EQ(t1->requested_inputs()[0], "import/input:0");
+  EXPECT_EQ(t1->requested_inputs()[1], "import/input:1");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsWithCycle) {
@@ -1856,15 +1856,15 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsWithCycle) {
 
   // Test that node defs are consistent with graph
   Node* merge = FindNode("merge");
-  ASSERT_EQ(merge->def().input_size(), 3);
-  EXPECT_EQ(merge->def().input(0), "input:0");
-  EXPECT_EQ(merge->def().input(1), "t1:0");
-  EXPECT_EQ(merge->def().input(2), "^W1");
+  ASSERT_EQ(merge->requested_inputs().size(), 3);
+  EXPECT_EQ(merge->requested_inputs()[0], "input:0");
+  EXPECT_EQ(merge->requested_inputs()[1], "t1:0");
+  EXPECT_EQ(merge->requested_inputs()[2], "^W1");
 
   Node* t1 = FindNode("t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  EXPECT_EQ(t1->def().input(0), "merge:0");
-  EXPECT_EQ(t1->def().input(1), "merge:0");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  EXPECT_EQ(t1->requested_inputs()[0], "merge:0");
+  EXPECT_EQ(t1->requested_inputs()[1], "merge:0");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsErrors) {
diff --git a/tensorflow/core/graph/graph_partition.cc b/tensorflow/core/graph/graph_partition.cc
index c7ad6a1e77..57a2f399e0 100644
--- a/tensorflow/core/graph/graph_partition.cc
+++ b/tensorflow/core/graph/graph_partition.cc
@@ -356,7 +356,7 @@ string ControlLoopName(const string& name) {
 }
 
 bool IsControlLoop(const Node* node) {
-  const string& name = node->def().name();
+  const string& name = node->name();
   return StringPiece(name).starts_with("_cloop");
 }
 
@@ -468,7 +468,7 @@ Status AddControlLoop(const PartitionOptions& opts, Graph* g, const Node* src,
   const string& device_name = edge->dst()->assigned_device_name();
   const string& frame_name = src_info.frame_name;
   int parallel_iterations;
-  status = GetNodeAttr(src_info.frame->def(), "parallel_iterations",
+  status = GetNodeAttr(src_info.frame->attrs(), "parallel_iterations",
                        &parallel_iterations);
   if (!status.ok()) return status;
 
@@ -903,11 +903,11 @@ Status Partition(const PartitionOptions& opts, Graph* g,
           send_start_time = opts.start_times[src->id()].value();
           recv_start_time = opts.start_times[dst->id()].value();
         } else {
-          status = GetNodeAttr(src->def(), "_start_time", &send_start_time);
+          status = GetNodeAttr(src->attrs(), "_start_time", &send_start_time);
           if (!status.ok()) {
             return status;
           }
-          status = GetNodeAttr(dst->def(), "_start_time", &recv_start_time);
+          status = GetNodeAttr(dst->attrs(), "_start_time", &recv_start_time);
           if (!status.ok()) {
             return status;
           }
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index 4afc878f76..89784c631f 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -318,21 +318,21 @@ TEST_F(GraphTest, AddAttr) {
   n1->AddAttr("_a", "new_attr");
 
   string attr;
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
 
   Node* n2 = graph_.CopyNode(n1);
 
   n1->AddAttr("_b", "new_attr_2");
 
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_b", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_b", &attr));
   EXPECT_EQ("new_attr_2", attr);
 
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n2->def(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n2->attrs(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
-  EXPECT_NE(Status::OK(), GetNodeAttr(n2->def(), "_b", &attr));
+  EXPECT_NE(Status::OK(), GetNodeAttr(n2->attrs(), "_b", &attr));
 }
 
 // Convert edge iteration results into a sorted string.
diff --git a/tensorflow/core/graph/optimizer_cse.cc b/tensorflow/core/graph/optimizer_cse.cc
index a679eac0e7..a22a9b3fa3 100644
--- a/tensorflow/core/graph/optimizer_cse.cc
+++ b/tensorflow/core/graph/optimizer_cse.cc
@@ -56,11 +56,9 @@ class OptimizerCSE {
   bool Optimize(const std::function<bool(const Node*)>& consider_fn);
 
  private:
-  struct Scratch;
-
   static size_t NodeHash(const Node* n);
-  static bool Equivalent(const Node* a, const Node* b, Scratch* s);
-  static bool EqualAttrs(const Node* a, const Node* b, Scratch* s);
+  static bool Equivalent(const Node* a, const Node* b,
+                         AttrSlice::Scratch* scratch);
 
   Graph* g_;
 };
@@ -110,7 +108,7 @@ size_t OptimizerCSE::NodeHash(const Node* n) {
   // Hash the attrs.  For example, this makes sure different constants
   // end up in different hash buckets.
   string tmp;
-  for (const auto& attr : n->def().attr()) {
+  for (const auto& attr : n->attrs()) {
     tmp = attr.first;
     attr.second.AppendToString(&tmp);
     // Add hashes of attrs, so the order of attrs doesn't matter.
@@ -122,28 +120,6 @@ size_t OptimizerCSE::NodeHash(const Node* n) {
   return h;
 }
 
-struct OptimizerCSE::Scratch {
-  // For EqualAttrs():
-  string a;
-  string b;
-};
-
-bool OptimizerCSE::EqualAttrs(const Node* a, const Node* b, Scratch* scratch) {
-  if (a->def().attr_size() != b->def().attr_size()) return false;
-
-  for (const auto& attr : b->def().attr()) {
-    auto iter = a->def().attr().find(attr.first);
-    if (iter == a->def().attr().end()) return false;
-    // Note: it should be safe to compare proto serializations of the attr
-    // values since at most one field should be set in each (indeed, it
-    // should be the same field).
-    iter->second.SerializeToString(&scratch->a);
-    attr.second.SerializeToString(&scratch->b);
-    if (scratch->a != scratch->b) return false;
-  }
-  return true;
-}
-
 static bool HasRefInput(const Node* n) {
   for (auto dt : n->input_types()) {
     if (IsRefType(dt)) return true;
@@ -151,7 +127,8 @@ static bool HasRefInput(const Node* n) {
   return false;
 }
 
-bool OptimizerCSE::Equivalent(const Node* a, const Node* b, Scratch* scratch) {
+bool OptimizerCSE::Equivalent(const Node* a, const Node* b,
+                              AttrSlice::Scratch* scratch) {
   // Different op names are different
   if (a->type_string() != b->type_string()) return false;
 
@@ -164,7 +141,7 @@ bool OptimizerCSE::Equivalent(const Node* a, const Node* b, Scratch* scratch) {
 
   // Compare attrs.  Note that equal attrs implies equal input and
   // output types.
-  if (!EqualAttrs(a, b, scratch)) return false;
+  if (!a->attrs().EqualAttrs(b->attrs(), scratch)) return false;
 
   // Compare input sources
   if (a->num_inputs() != b->num_inputs()) return false;
@@ -206,7 +183,7 @@ bool OptimizerCSE::Optimize(
   // Scratch space for Equivalent calls.  Allocated here and passed in to
   // Equivalent to avoid allocation inside the loop below.
   bool changed = false;
-  Scratch scratch;
+  AttrSlice::Scratch scratch;
   for (Node* n : order) {
     if (!n->IsOp()) continue;
 
diff --git a/tensorflow/core/graph/quantize_training.cc b/tensorflow/core/graph/quantize_training.cc
index e3ef5e2f0c..4a479d3258 100644
--- a/tensorflow/core/graph/quantize_training.cc
+++ b/tensorflow/core/graph/quantize_training.cc
@@ -192,9 +192,9 @@ Status ConnectVariablesToSaveOp(Graph* graph, Node* save_op,
   Tensor tensor_names;
   Tensor shape_and_slices;
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(AttrSlice(tensor_names_op->def()), "value", &tensor_names));
-  TF_RETURN_IF_ERROR(GetNodeAttr(AttrSlice(shape_and_slices_op->def()), "value",
-                                 &shape_and_slices));
+      GetNodeAttr(tensor_names_op->attrs(), "value", &tensor_names));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(shape_and_slices_op->attrs(), "value", &shape_and_slices));
 
   int tn_size = tensor_names.NumElements();
   int var_size = added_variables.size();
diff --git a/tensorflow/core/graph/quantize_training_test.cc b/tensorflow/core/graph/quantize_training_test.cc
index 9cbb928c11..d817d980de 100644
--- a/tensorflow/core/graph/quantize_training_test.cc
+++ b/tensorflow/core/graph/quantize_training_test.cc
@@ -112,17 +112,15 @@ TEST_F(QuantizeTrainingTest, SignedInput) {
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(identity->name(), "/QuantizeAndDequantizeV2"),
                &identity_q_node));
-  NodeDef identity_q = identity_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(identity_q.attr().find("signed_input")->second));
+            SummarizeAttrValue(*identity_q_node->attrs().Find("signed_input")));
   // Quantize_and_dequantize node for relu should have signed_input==false.
   Node* relu_q_node;
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu->name(), "/QuantizeAndDequantizeV2"),
                &relu_q_node));
-  NodeDef relu_q = relu_q_node->def();
   ASSERT_EQ("false",
-            SummarizeAttrValue(relu_q.attr().find("signed_input")->second));
+            SummarizeAttrValue(*relu_q_node->attrs().Find("signed_input")));
 }
 
 TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
@@ -165,17 +163,15 @@ TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu6->name(), "/QuantizeAndDequantizeV2"),
                &relu6_q_node));
-  NodeDef identity_q = relu6_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(identity_q.attr().find("range_given")->second));
+            SummarizeAttrValue(*relu6_q_node->attrs().Find("range_given")));
   // Quantize_and_dequantize node for relu should have range_given==true.
   Node* relu_q_node;
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu->name(), "/QuantizeAndDequantizeV2"),
                &relu_q_node));
-  NodeDef relu_q = relu_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(relu_q.attr().find("range_given")->second));
+            SummarizeAttrValue(*relu_q_node->attrs().Find("range_given")));
 }
 
 TEST_F(QuantizeTrainingTest, WithBackwardNodes_QuantizeAndDequantize) {
diff --git a/tensorflow/core/graph/subgraph.cc b/tensorflow/core/graph/subgraph.cc
index 9849d9a159..e10b692889 100644
--- a/tensorflow/core/graph/subgraph.cc
+++ b/tensorflow/core/graph/subgraph.cc
@@ -106,7 +106,7 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
     // Copy the _output_shapes from the original node to the feed node,
     // if any.
     std::vector<PartialTensorShape> output_shapes;
-    if (GetNodeAttr(n->def(), "_output_shapes", &output_shapes).ok()) {
+    if (GetNodeAttr(n->attrs(), "_output_shapes", &output_shapes).ok()) {
       if (n->num_outputs() != output_shapes.size()) {
         return errors::InvalidArgument(
             "FeedInputs: ", t,
@@ -129,8 +129,8 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
       if (e->src_output() == id.second) {
         to_remove.emplace_back(e);
       } else if (e->src_output() == Graph::kControlSlot &&
-                 (n->def().op() == "Placeholder" ||
-                  n->def().op() == "PlaceholderV2")) {
+                 (n->type_string() == "Placeholder" ||
+                  n->type_string() == "PlaceholderV2")) {
         // When feeding a Placeholder node, any outgoing control edges
         // will be replaced with a control edge from the replacement
         // recv_node.
diff --git a/tensorflow/core/graph/subgraph_test.cc b/tensorflow/core/graph/subgraph_test.cc
index 3dc11b7a16..93dcfd5e33 100644
--- a/tensorflow/core/graph/subgraph_test.cc
+++ b/tensorflow/core/graph/subgraph_test.cc
@@ -81,7 +81,7 @@ class SubgraphTest : public ::testing::Test {
     for (const string& s : expected_nodes) {
       Node* n = FindNode(s);
       EXPECT_TRUE(n != nullptr) << s;
-      if (n->def().op() == "_Send" || n->def().op() == "_Recv") {
+      if (n->type_string() == "_Send" || n->type_string() == "_Recv") {
         EXPECT_EQ(device_info_.name(), n->assigned_device_name()) << s;
       }
     }
@@ -367,7 +367,7 @@ TEST_F(SubgraphTest, FedOutputsPreservesOutputShapes) {
   for (Node* node : graph()->nodes()) {
     if (node->name() == "_recv_input_1") {
       std::vector<PartialTensorShape> shapes;
-      TF_ASSERT_OK(GetNodeAttr(node->def(), "_output_shapes", &shapes));
+      TF_ASSERT_OK(GetNodeAttr(node->attrs(), "_output_shapes", &shapes));
       ASSERT_EQ(1, shapes.size());
       EXPECT_TRUE(PartialTensorShape({23}).IsIdenticalTo(shapes[0]));
       break;
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 035483ec17..b0e69d44ed 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -151,8 +151,8 @@ Status GraphProperties::InferStatically() {
 
     if (!node->assigned_device_name().empty()) {
       device_names_[node->name()] = node->assigned_device_name();
-    } else if (!node->def().device().empty()) {
-      device_names_[node->name()] = node->def().device();
+    } else if (!node->requested_device().empty()) {
+      device_names_[node->name()] = node->requested_device();
     } else {
       device_names_[node->name()] = "not set";
     }
diff --git a/tensorflow/core/kernels/function_ops.cc b/tensorflow/core/kernels/function_ops.cc
index ba408f3657..8c3137ece9 100644
--- a/tensorflow/core/kernels/function_ops.cc
+++ b/tensorflow/core/kernels/function_ops.cc
@@ -186,12 +186,12 @@ REGISTER_KERNEL_BUILDER(Name("_ArrayToList")
                         PassOn);
 
 #ifdef TENSORFLOW_USE_SYCL
-#define REGISTER_SYCL_KERNELS(type)                                      \
-  REGISTER_KERNEL_BUILDER(                                               \
-      Name("_ListToArray").Device(DEVICE_SYCL).TypeConstraint<type>("T"),\
-      PassOn);                                                           \
-  REGISTER_KERNEL_BUILDER(                                               \
-      Name("_ArrayToList").Device(DEVICE_SYCL).TypeConstraint<type>("T"),\
+#define REGISTER_SYCL_KERNELS(type)                                       \
+  REGISTER_KERNEL_BUILDER(                                                \
+      Name("_ListToArray").Device(DEVICE_SYCL).TypeConstraint<type>("T"), \
+      PassOn);                                                            \
+  REGISTER_KERNEL_BUILDER(                                                \
+      Name("_ArrayToList").Device(DEVICE_SYCL).TypeConstraint<type>("T"), \
       PassOn);
 
 REGISTER_SYCL_KERNELS(float);
@@ -211,7 +211,7 @@ REGISTER_KERNEL_BUILDER(Name("_ArrayToList")
                             .HostMemory("output")
                             .TypeConstraint<int32>("T"),
                         PassOn);
-#endif // TENSORFLOW_USE_SYCL
+#endif  // TENSORFLOW_USE_SYCL
 
 class SymbolicGradientOp : public AsyncOpKernel {
  public:
@@ -227,7 +227,7 @@ class SymbolicGradientOp : public AsyncOpKernel {
 
     FunctionLibraryRuntime::Handle handle;
     OP_REQUIRES_OK_ASYNC(
-        ctx, lib->Instantiate(kGradientOp, def().attr(), &handle), done);
+        ctx, lib->Instantiate(kGradientOp, AttrSlice(def()), &handle), done);
 
     FunctionLibraryRuntime::Options opts;
     opts.step_id = ctx->step_id();
diff --git a/tensorflow/core/kernels/hexagon/graph_transferer.cc b/tensorflow/core/kernels/hexagon/graph_transferer.cc
index 6f1616eff3..d927ef3efa 100644
--- a/tensorflow/core/kernels/hexagon/graph_transferer.cc
+++ b/tensorflow/core/kernels/hexagon/graph_transferer.cc
@@ -140,7 +140,7 @@ Status GraphTransferer::LoadGraphFromProto(
     std::vector<DataType> data_types;
     std::vector<TensorShape> shapes;
     status = RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-        node->def(), &data_types, &shapes);
+        node->attrs(), &data_types, &shapes);
     if (status.ok()) {
       CHECK(data_types.size() > port);
       graph_output_node_info.set_dtype(data_types.at(port));
@@ -359,7 +359,7 @@ void GraphTransferer::RegisterConstantNode(const ShapeRefiner& shape_refiner,
   const_node_info.add_shape(shape_array[2]);
   const_node_info.add_shape(shape_array[3]);
   const TensorProto* proto = nullptr;
-  TF_CHECK_OK(GetNodeAttr(node.def(), "value", &proto));
+  TF_CHECK_OK(GetNodeAttr(node.attrs(), "value", &proto));
   Tensor const_tensor;
   // TODO(b/32704451): Don't just ignore this status!
   MakeTensorFromProto(*proto, &const_tensor).IgnoreError();
@@ -395,8 +395,9 @@ int GraphTransferer::RegisterConstantShape(const std::vector<int>& shape) {
 }
 
 bool GraphTransferer::HasPaddingAndStrides(const Node& node) {
-  return node.def().attr().count(PADDING_ATTR_NAME) > 0 &&
-         node.def().attr().count(STRIDES_ATTR_NAME) > 0;
+  auto attrs = node.attrs();
+  return attrs.Find(PADDING_ATTR_NAME) != nullptr &&
+         attrs.Find(STRIDES_ATTR_NAME) != nullptr;
 }
 
 bool GraphTransferer::IsNodeFlattenReshape(const Node& node,
@@ -423,7 +424,7 @@ bool GraphTransferer::IsNodeFlattenReshape(const Node& node,
   } else {
     std::vector<TensorShape> shapes;
     TF_CHECK_OK(RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-        node.def(), nullptr, &shapes));
+        node.attrs(), nullptr, &shapes));
 
     // Number of outputs should be 1 for reshape node.
     CHECK_EQ(1, shapes.size());
@@ -444,16 +445,16 @@ void GraphTransferer::RegisterNodeWithPaddingAndStrides(
   CHECK_EQ(node_name_to_id_cache_map_.count(node.name()), 1);
   const int id = node_name_to_id_cache_map_[node.name()];
   shape_inference::InferenceContext* context = shape_refiner.GetContext(&node);
-  CHECK_GT(node.def().attr().count(PADDING_ATTR_NAME), 0);
+  CHECK(node.attrs().Find(PADDING_ATTR_NAME));
   // TODO(satok): Use context->GetAttr(...) instead?
   Padding padding;
   TF_CHECK_OK(context->GetAttr(PADDING_ATTR_NAME, &padding));
-  CHECK_GT(node.def().attr().count(STRIDES_ATTR_NAME), 0);
+  CHECK(node.attrs().Find(STRIDES_ATTR_NAME));
   std::vector<int32> strides;
   TF_CHECK_OK(context->GetAttr(STRIDES_ATTR_NAME, &strides));
   const int stride_id = RegisterConstantShape(strides);
   std::vector<int> extra_inputs{stride_id};
-  if (node.def().attr().count(KSIZE_ATTR_NAME) > 0) {
+  if (node.attrs().Find(KSIZE_ATTR_NAME)) {
     std::vector<int32> kernel_sizes;
     TF_CHECK_OK(context->GetAttr(KSIZE_ATTR_NAME, &kernel_sizes));
     const int ksize_id = RegisterConstantShape(kernel_sizes);
@@ -597,7 +598,7 @@ void GraphTransferer::AppendNodeOutputParams(const ShapeRefiner& shape_refiner,
 
   std::vector<TensorShape> shapes;
   Status status = RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-      node.def(), nullptr, &shapes);
+      node.attrs(), nullptr, &shapes);
 
   for (int i = 0; i < node.num_outputs(); ++i) {
     int data_size = -1;
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
index 456611894d..2174098bde 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
@@ -333,17 +333,17 @@ RemoteFusedGraphExecuteUtils::AddOutputTensorShapeTypeByTensorShapeMap(
 }
 
 /* static */ Status RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-    const NodeDef& node_def, std::vector<DataType>* data_types,
+    AttrSlice attrs, std::vector<DataType>* data_types,
     std::vector<TensorShape>* shapes) {
   Status status;
   if (data_types != nullptr) {
-    status = GetNodeAttr(node_def, ATTR_OUTPUT_DATA_TYPES, data_types);
+    status = GetNodeAttr(attrs, ATTR_OUTPUT_DATA_TYPES, data_types);
   }
   if (!status.ok()) {
     return status;
   }
   if (shapes != nullptr) {
-    status = GetNodeAttr(node_def, ATTR_OUTPUT_SHAPES, shapes);
+    status = GetNodeAttr(attrs, ATTR_OUTPUT_SHAPES, shapes);
     if (status.ok() && data_types != nullptr) {
       CHECK_EQ(data_types->size(), shapes->size());
     }
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
index 9ec189c85f..97b0c2008a 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
@@ -103,7 +103,7 @@ class RemoteFusedGraphExecuteUtils {
   static Status AddOutputTensorShapeTypeByTensorShapeMap(
       const TensorShapeMap& tensor_shape_map, NodeDef* node_def);
 
-  static Status GetOutputTensorShapeType(const NodeDef& node_def,
+  static Status GetOutputTensorShapeType(AttrSlice attrs,
                                          std::vector<DataType>* data_types,
                                          std::vector<TensorShape>* shapes);
 
-- 
GitLab


From 2fe57463a40bec3d38429f4976c5c92c5a95facb Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 16 May 2017 16:11:49 -0700
Subject: [PATCH 1418/1563] Added a method to shut a cluster down.

PiperOrigin-RevId: 156245398
---
 tensorflow/core/grappler/clusters/cluster.h   |  9 ++++-
 .../core/grappler/clusters/single_machine.cc  | 39 ++++++++++++++++---
 .../core/grappler/clusters/single_machine.h   |  2 +
 tensorflow/core/grappler/utils.cc             |  5 +--
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/tensorflow/core/grappler/clusters/cluster.h b/tensorflow/core/grappler/clusters/cluster.h
index 403ded9a6e..017cbb13c8 100644
--- a/tensorflow/core/grappler/clusters/cluster.h
+++ b/tensorflow/core/grappler/clusters/cluster.h
@@ -48,6 +48,12 @@ class Cluster {
   // of the requested resources are available.
   virtual Status Provision() = 0;
 
+  // Attempts to shutdown the cluster.
+  // Returns OK iff there are no pending calls to the Run() method and all the
+  // resources used by the cluster could be released. Returns an error
+  // otherwise.
+  virtual Status Shutdown() { return Status::OK(); }
+
   // Whether soft placement is allowed. If allow_soft_placement is true,
   // an op will be placed on CPU if there's no GPU implementation for the OP
   // or if no GPU devices are known or registered or if we need to co-locate
@@ -58,7 +64,8 @@ class Cluster {
   // before Provision().
   void SetNumWarmupSteps(int num_steps);
 
-  // Disable the collection of detailed statistics.
+  // Disable the collection of detailed statistics. Must be called
+  // before Provision().
   void DisableDetailedStats(bool disable);
 
   // Return the list of TensorFlow devices that are available to execute a
diff --git a/tensorflow/core/grappler/clusters/single_machine.cc b/tensorflow/core/grappler/clusters/single_machine.cc
index 540819bc59..22ccf5208c 100644
--- a/tensorflow/core/grappler/clusters/single_machine.cc
+++ b/tensorflow/core/grappler/clusters/single_machine.cc
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/mutex.h"
+#include "tensorflow/core/platform/notification.h"
 #include "tensorflow/core/public/session.h"
 
 namespace tensorflow {
@@ -91,6 +92,31 @@ Status SingleMachine::Initialize(const GrapplerItem& item) {
   return Status::OK();
 }
 
+Status SingleMachine::Shutdown() {
+  TF_RETURN_IF_ERROR(CloseSession(true /*use_timeout*/));
+
+  // Delete the threadpool: this ensures that all the pending closures complete
+  // before we return. Note that if that if TF deadlocked on us, the closures
+  // will never complete, and the call to thread_pool_.reset() will never
+  // return: therefore we need to delete the threadpool with the background
+  // thread. That thread itself will also never complete, so the user should
+  // abort the process to avoid leaking too many resources.
+  auto n = std::make_shared<Notification>();
+  Env::Default()->SchedClosure([this, n]() {
+    thread_pool_.reset();
+    n->Notify();
+  });
+  int64 timeout_us = 1000000ll * timeout_s_;
+  const bool notified = WaitForNotificationWithTimeout(n.get(), timeout_us);
+  if (!notified) {
+    // Let the caller know that we can't shutdown the session properly since
+    // there are calls to Session::Run() still running.
+    return errors::Unavailable("The session is still running graphs after ",
+                               timeout_s_, " seconds");
+  }
+  return Status::OK();
+}
+
 Status SingleMachine::Run(const GraphDef& graph_def,
                           const std::vector<std::pair<string, Tensor>>& feed,
                           const std::vector<string>& fetch,
@@ -163,10 +189,11 @@ Status SingleMachine::RunWithTimeout(
     mutex_lock l(close_mu_);
     CHECK(!closing_);
   }
+
   auto status = std::make_shared<Status>();
   auto local_metadata = std::make_shared<RunMetadata>();
   const bool executed_in_time = ExecuteWithTimeout(
-      [this, status, local_metadata, &feed, &fetch]() {
+      [this, status, local_metadata, feed, fetch]() {
         *status = session_->Run(run_options_, feed, {}, fetch, nullptr,
                                 local_metadata.get());
       },
@@ -230,11 +257,7 @@ Status SingleMachine::ResetSession() {
     LOG(INFO) << "Cleaning up previous session";
 
     // Make sure the session is properly closed
-    TF_RETURN_IF_ERROR(CloseSession(true /*use_timeout*/));
-
-    // Flush all the pending closures (if any).
-    thread_pool_.reset(new thread::ThreadPool(
-        Env::Default(), SanitizeThreadSuffix("single_machine"), 2));
+    TF_RETURN_IF_ERROR(Shutdown());
 
     // We need to Reset the session to ensure that all the variables are
     // deleted. But first we need to delete the session since Reset()
@@ -245,6 +268,10 @@ Status SingleMachine::ResetSession() {
 
   LOG(INFO) << "Starting new session";
 
+  // Create a new threadpool
+  thread_pool_.reset(new thread::ThreadPool(
+      Env::Default(), SanitizeThreadSuffix("single_machine"), 2));
+
   session_.reset(NewSession(options_));
   CHECK(session_ != nullptr);
 
diff --git a/tensorflow/core/grappler/clusters/single_machine.h b/tensorflow/core/grappler/clusters/single_machine.h
index f2773376e4..d3efbe3c61 100644
--- a/tensorflow/core/grappler/clusters/single_machine.h
+++ b/tensorflow/core/grappler/clusters/single_machine.h
@@ -33,6 +33,8 @@ class SingleMachine : public Cluster {
   ~SingleMachine() override;
 
   Status Provision() override;
+  Status Shutdown() override;
+
   Status Initialize(const GrapplerItem& item) override;
   Status Run(const GraphDef& item,
              const std::vector<std::pair<string, Tensor>>& feed,
diff --git a/tensorflow/core/grappler/utils.cc b/tensorflow/core/grappler/utils.cc
index 924feeae54..06ef61a961 100644
--- a/tensorflow/core/grappler/utils.cc
+++ b/tensorflow/core/grappler/utils.cc
@@ -116,10 +116,7 @@ bool ExecuteWithTimeout(std::function<void()> fn, const int64 timeout_in_ms,
   });
   const bool notified =
       WaitForNotificationWithTimeout(done.get(), timeout_in_ms * 1000);
-  if (!notified) {
-    return false;
-  }
-  return true;
+  return notified;
 }
 
 }  // end namespace grappler
-- 
GitLab


From 5a4fd741b3d45bc11bd0d65f9047cc57637d2a54 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 16:14:04 -0700
Subject: [PATCH 1419/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 156245683
---
 tensorflow/go/op/wrappers.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 9c67c6cd4a..33bf686da8 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -6462,7 +6462,10 @@ func OnesLike(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
-// Returns element-wise remainder of division.
+// Returns element-wise remainder of division. This emulates C semantics in that
+//
+// the result here is consistent with a truncating divide. E.g. `truncate(x / y) *
+// y + truncate_mod(x, y) = x`.
 //
 // *NOTE*: `Mod` supports broadcasting. More about broadcasting
 // [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
@@ -12926,12 +12929,12 @@ func IRFFT2D(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Out
 	return op.Output(0)
 }
 
-// Returns element-wise remainder of division. This emulates C semantics where
+// Returns element-wise remainder of division. This emulates C semantics in that
 //
-// true, this follows C semantics in that the result here is consistent
-// with a flooring divide. E.g. `floor(x / y) * y + mod(x, y) = x`.
+// the result here is consistent with a truncating divide. E.g. `truncate(x / y) *
+// y + truncate_mod(x, y) = x`.
 //
-// *NOTE*: `Mod` supports broadcasting. More about broadcasting
+// *NOTE*: `TruncateMod` supports broadcasting. More about broadcasting
 // [here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)
 func TruncateMod(scope *Scope, x tf.Output, y tf.Output) (z tf.Output) {
 	if scope.Err() != nil {
-- 
GitLab


From 586d31cb072e22d4e70324b2fd73080ece425802 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Tue, 16 May 2017 16:27:01 -0700
Subject: [PATCH 1420/1563] Removed unecessary #include

PiperOrigin-RevId: 156247356
---
 tensorflow/core/grappler/costs/BUILD                        | 1 -
 tensorflow/core/grappler/costs/analytical_cost_estimator.cc | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index 43c727f381..e0a27d3025 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -226,7 +226,6 @@ cc_library(
         ":utils",
         ":virtual_placer",
         ":virtual_scheduler",
-        "//tensorflow/core:core_cpu",
         "//tensorflow/core:core_cpu_base",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
diff --git a/tensorflow/core/grappler/costs/analytical_cost_estimator.cc b/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
index 04ffc58cda..c6eba75ee6 100644
--- a/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/analytical_cost_estimator.cc
@@ -26,7 +26,6 @@ limitations under the License.
 #include "tensorflow/core/grappler/costs/virtual_placer.h"
 #include "tensorflow/core/grappler/costs/virtual_scheduler.h"
 #include "tensorflow/core/grappler/grappler_item.h"
-#include "tensorflow/core/public/session.h"
 
 namespace tensorflow {
 namespace grappler {
-- 
GitLab


From 726abf64ba54fb7bb324df764320054a24b81a68 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 16:29:42 -0700
Subject: [PATCH 1421/1563] Made the minimap translate "to" an (X, Y)
 coordinate instead of "by" an (X, Y) coordinate. Basically, during the d3v4
 migration, translate() got replaced with translateBy(). That caused the scene
 to continually translate in some direction (until it went off screen) when
 the user panned the minimap.

We now use a d3 transform that specifies a final location (translate to).

Furthermore, the minimap was transforming the wrong object. It should have been transforming this.svg instead of the root g element. This CL fixes that too.

PiperOrigin-RevId: 156247665
---
 .../tensorboard/components/tf_graph_common_d3v4/minimap.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts
index 9a07323a1d..8129df3a42 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/minimap.ts
@@ -129,8 +129,9 @@ export class Minimap {
     // new viewpoint.
     let mainX = - this.viewpointCoord.x * this.scaleMain / this.scaleMinimap;
     let mainY = - this.viewpointCoord.y * this.scaleMain / this.scaleMinimap;
-    this.mainZoom.translateBy(d3.select(this.zoomG), mainX, mainY);
-
+    d3.select(this.svg).call(
+        this.mainZoom.transform,
+        d3.zoomIdentity.translate(mainX, mainY).scale(this.scaleMain));
   }
 
   /**
-- 
GitLab


From ef97b7258b0e668a2944d3c5ed349640e6ae6a25 Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Tue, 16 May 2017 16:32:23 -0700
Subject: [PATCH 1422/1563] Fix bug in d3v4 version of graph visualizer.

It caused the graph to not relayout properly when node groups were
opened and closed.

Also fix a bug where the old d3zoom api was being used, and update appropriately.

PiperOrigin-RevId: 156247989
---
 .../tensorboard/components/tf_graph_common_d3v4/node.ts       | 2 +-
 .../tensorboard/components/tf_graph_common_d3v4/scene.ts      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
index e66818f4c8..6d66bb69d9 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
@@ -67,7 +67,7 @@ module tf.graph.scene.node {
     // (Note that all children of g.nodes are g.node)
     let nodeGroups =
         (container as any)
-            .selectAll('g')
+            .selectAll('g.node')
             .data(nodeData, (d) => {
               // make sure that we don't have to swap shape type
               return d.node.name + ':' + d.node.type;
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
index 29f9b446b3..858c2fccb8 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
@@ -186,7 +186,7 @@ export function panToNode(nodeName: String, svg, zoomG, d3zoom): boolean {
   if (!node) {
     return false;
   }
-  let translate = d3zoom.translate();
+  let transform = d3.zoomTransform(node);
   // Check if the selected node is off-screen in either
   // X or Y dimension in either direction.
   let nodeBox = node.getBBox();
@@ -214,7 +214,7 @@ export function panToNode(nodeName: String, svg, zoomG, d3zoom): boolean {
     let centerY = (pointTL.y + pointBR.y) / 2;
     let dx = ((svgRect.width / 2) - centerX);
     let dy = ((svgRect.height / 2) - centerY);
-    let zoomEvent = d3zoom.translate([translate[0] + dx, translate[1] + dy])
+    let zoomEvent = d3zoom.translate([transform.x + dx, transform.y + dy])
         .event;
     d3.select(zoomG).transition().duration(500).call(zoomEvent);
     return true;
-- 
GitLab


From 06010f39c8ad96151c840245a915ed838eff1ab7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 16:41:42 -0700
Subject: [PATCH 1423/1563] Capture temporary Tensors in async kernels for
 cholesky_op and matrix_inverse_op to prevent then from being deallocated
 before use.

PiperOrigin-RevId: 156249132
---
 tensorflow/core/kernels/cholesky_op.cc       |  2 +-
 tensorflow/core/kernels/cuda_solvers.h       |  4 +++-
 tensorflow/core/kernels/matrix_inverse_op.cc | 12 ++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tensorflow/core/kernels/cholesky_op.cc b/tensorflow/core/kernels/cholesky_op.cc
index 9a0ea2e303..10595faf4b 100644
--- a/tensorflow/core/kernels/cholesky_op.cc
+++ b/tensorflow/core/kernels/cholesky_op.cc
@@ -151,7 +151,7 @@ class CholeskyOpGpu : public AsyncOpKernel {
     }
 
     // Register callback to check info after kernels finish.
-    auto info_checker = [context, done](
+    auto info_checker = [context, dev_info, done](
                             const Status& status,
                             const std::vector<HostLapackInfo>& /* unused */) {
       Status full_status = status;
diff --git a/tensorflow/core/kernels/cuda_solvers.h b/tensorflow/core/kernels/cuda_solvers.h
index bed1962ad0..70ccbb90cc 100644
--- a/tensorflow/core/kernels/cuda_solvers.h
+++ b/tensorflow/core/kernels/cuda_solvers.h
@@ -91,7 +91,9 @@ class HostLapackInfo;
 //                          done);
 //
 //     // 4. Check the status after the computation finishes and call done.
-//     auto check_status = [context, done](const Status& status,
+//     // Capture dev_info so the underlying buffers don't get deallocated
+//     // before the kernels run.
+//     auto check_status = [context, done, dev_info](const Status& status,
 //       const std::vector<HostLapackInfo>& /* unused */) {
 //           // In this example we don't care about the exact cause of
 //           // death, so just check status.
diff --git a/tensorflow/core/kernels/matrix_inverse_op.cc b/tensorflow/core/kernels/matrix_inverse_op.cc
index 0fd3d12a5c..8343201d9a 100644
--- a/tensorflow/core/kernels/matrix_inverse_op.cc
+++ b/tensorflow/core/kernels/matrix_inverse_op.cc
@@ -179,10 +179,14 @@ class MatrixInverseOpGpu : public AsyncOpKernel {
                             output_ptrs_base, n, &dev_info.back(), batch_size),
         done);
 
-    // Register callback to check info after kernels finish.
-    auto info_checker = [context, done](
-                            const Status& status,
-                            const std::vector<HostLapackInfo>& host_infos) {
+    // Register callback to check info after kernels finish. Also capture the
+    // temporary Tensors/ScratchSpace so they don't get deallocated before the
+    // kernels run. TODO(rmlarsen): Use move capture once C++14 becomes
+    // available.
+    auto info_checker = [context, dev_info, input_copy, pivots, input_copy_ptrs,
+                         output_ptrs,
+                         done](const Status& status,
+                               const std::vector<HostLapackInfo>& host_infos) {
       if (!status.ok() && errors::IsInvalidArgument(status) &&
           !host_infos.empty()) {
         for (int i = 0; i < host_infos[0].size(); ++i) {
-- 
GitLab


From 7ab0c2eff12ea79648f6717dae8558d6669e5c27 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 16:54:17 -0700
Subject: [PATCH 1424/1563] Normalize arguments for HandleDynamicSlice. NFC.

PiperOrigin-RevId: 156250579
---
 tensorflow/compiler/xla/service/dfs_hlo_visitor.h         | 6 +++---
 .../compiler/xla/service/dfs_hlo_visitor_with_default.h   | 8 ++++----
 tensorflow/compiler/xla/service/hlo_cost_analysis.cc      | 6 +++---
 tensorflow/compiler/xla/service/hlo_cost_analysis.h       | 6 +++---
 tensorflow/compiler/xla/service/hlo_instruction.cc        | 2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tensorflow/compiler/xla/service/dfs_hlo_visitor.h b/tensorflow/compiler/xla/service/dfs_hlo_visitor.h
index a18c643eb7..49e9874cda 100644
--- a/tensorflow/compiler/xla/service/dfs_hlo_visitor.h
+++ b/tensorflow/compiler/xla/service/dfs_hlo_visitor.h
@@ -196,9 +196,9 @@ class DfsHloVisitor {
       tensorflow::StringPiece custom_call_target) = 0;
   virtual Status HandleSlice(HloInstruction* slice,
                              HloInstruction* operand) = 0;
-  virtual Status HandleDynamicSlice(
-      HloInstruction* slice,
-      tensorflow::gtl::ArraySlice<HloInstruction*> operands) = 0;
+  virtual Status HandleDynamicSlice(HloInstruction* dynamic_slice,
+                                    HloInstruction* operand,
+                                    HloInstruction* start_indices) = 0;
   virtual Status HandleDynamicUpdateSlice(HloInstruction* dynamic_update_slice,
                                           HloInstruction* operand,
                                           HloInstruction* update,
diff --git a/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h b/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h
index 684ccc5720..c27710fbdb 100644
--- a/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h
+++ b/tensorflow/compiler/xla/service/dfs_hlo_visitor_with_default.h
@@ -134,10 +134,10 @@ class DfsHloVisitorWithDefault : public DfsHloVisitor {
                      HloInstruction* /*operand*/) override {
     return DefaultAction(slice);
   }
-  Status HandleDynamicSlice(
-      HloInstruction* slice,
-      tensorflow::gtl::ArraySlice<HloInstruction*> /*operands*/) override {
-    return DefaultAction(slice);
+  Status HandleDynamicSlice(HloInstruction* dynamic_slice,
+                            HloInstruction* /*operand*/,
+                            HloInstruction* /*start_indices*/) override {
+    return DefaultAction(dynamic_slice);
   }
   Status HandleDynamicUpdateSlice(HloInstruction* dynamic_update_slice,
                                   HloInstruction* /*operand*/,
diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis.cc b/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
index aeb5b4df66..38cc74b0f1 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis.cc
@@ -136,9 +136,9 @@ Status HloCostAnalysis::HandleSlice(HloInstruction* slice,
   return Status::OK();
 }
 
-Status HloCostAnalysis::HandleDynamicSlice(
-    HloInstruction* slice,
-    tensorflow::gtl::ArraySlice<HloInstruction*> operands) {
+Status HloCostAnalysis::HandleDynamicSlice(HloInstruction* dynamic_slice,
+                                           HloInstruction* operand,
+                                           HloInstruction* start_indices) {
   return Status::OK();
 }
 
diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis.h b/tensorflow/compiler/xla/service/hlo_cost_analysis.h
index 05c2e4d10c..7d22548234 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis.h
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis.h
@@ -89,9 +89,9 @@ class HloCostAnalysis : public DfsHloVisitor {
                           tensorflow::gtl::ArraySlice<HloInstruction*> operands,
                           tensorflow::StringPiece custom_call_target) override;
   Status HandleSlice(HloInstruction* slice, HloInstruction* operand) override;
-  Status HandleDynamicSlice(
-      HloInstruction* slice,
-      tensorflow::gtl::ArraySlice<HloInstruction*> operands) override;
+  Status HandleDynamicSlice(HloInstruction* dynamic_slice,
+                            HloInstruction* operand,
+                            HloInstruction* start_indices) override;
   Status HandleDynamicUpdateSlice(HloInstruction* dynamic_update_slice,
                                   HloInstruction* operand,
                                   HloInstruction* update,
diff --git a/tensorflow/compiler/xla/service/hlo_instruction.cc b/tensorflow/compiler/xla/service/hlo_instruction.cc
index 10ab60cc84..bfb2129e13 100644
--- a/tensorflow/compiler/xla/service/hlo_instruction.cc
+++ b/tensorflow/compiler/xla/service/hlo_instruction.cc
@@ -1782,7 +1782,7 @@ Status HloInstruction::Visit(DfsHloVisitor* visitor) {
     case HloOpcode::kSlice:
       return visitor->HandleSlice(this, operands_[0]);
     case HloOpcode::kDynamicSlice:
-      return visitor->HandleDynamicSlice(this, operands_);
+      return visitor->HandleDynamicSlice(this, operands_[0], operands_[1]);
     case HloOpcode::kDynamicUpdateSlice:
       return visitor->HandleDynamicUpdateSlice(this, operands_[0], operands_[1],
                                                operands_[2]);
-- 
GitLab


From 43db5c623f748b6f9704e9e9be5a5a11fa2a4c1a Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Tue, 16 May 2017 17:01:31 -0700
Subject: [PATCH 1425/1563] Automated g4 rollback of changelist 156244933

PiperOrigin-RevId: 156251356
---
 tensorflow/c/c_api.cc                         |  63 +++++-----
 tensorflow/cc/framework/cc_op_gen.cc          |   9 +-
 tensorflow/cc/framework/cc_ops_test.cc        |  17 +--
 tensorflow/cc/framework/scope.cc              |   4 +-
 tensorflow/cc/gradients/array_grad.cc         |  28 ++---
 tensorflow/cc/gradients/math_grad.cc          |   8 +-
 tensorflow/cc/ops/const_op_test.cc            |   8 +-
 tensorflow/compiler/aot/compile.cc            |  12 +-
 .../compiler/jit/build_xla_launch_ops_pass.cc |   9 +-
 .../jit/encapsulate_subgraphs_pass.cc         |  10 +-
 .../compiler/jit/graph_to_functiondef.cc      |  14 +--
 .../jit/kernels/xla_device_launch_op.cc       |   4 +-
 .../jit/kernels/xla_local_launch_op.cc        |   2 +-
 .../compiler/jit/mark_for_compilation_pass.cc |  42 +++----
 .../jit/mark_for_compilation_pass_test.cc     |   2 +-
 .../compiler/jit/xla_compilation_cache.cc     |   2 +-
 tensorflow/compiler/tf2xla/const_analysis.cc  |   6 +-
 .../compiler/tf2xla/kernels/function_ops.cc   |   3 +-
 tensorflow/compiler/tf2xla/xla_compiler.cc    |   7 +-
 tensorflow/core/BUILD                         |   7 +-
 .../common_runtime/constant_folding_test.cc   |   8 +-
 tensorflow/core/common_runtime/executor.cc    |  56 ++++-----
 tensorflow/core/common_runtime/function.cc    |  37 +++---
 .../core/common_runtime/function_test.cc      |  40 ++-----
 .../kernel_benchmark_testlib.cc               |   8 +-
 .../parallel_concat_optimizer.cc              |   4 +-
 .../resource_variable_read_optimizer.cc       |   2 +-
 .../core/common_runtime/simple_placer.cc      |  34 +++---
 tensorflow/core/debug/debug_graph_utils.cc    |  23 ++--
 .../distributed_runtime/master_session.cc     |  12 +-
 tensorflow/core/framework/function.cc         | 102 +++++++++-------
 tensorflow/core/framework/function.h          |  49 ++++----
 tensorflow/core/framework/function_test.cc    | 110 +++++++-----------
 tensorflow/core/framework/node_def_util.cc    |  92 ++++-----------
 tensorflow/core/framework/node_def_util.h     |  39 +------
 tensorflow/core/framework/op_kernel.cc        |  23 ++--
 tensorflow/core/framework/shape_inference.h   |   9 +-
 tensorflow/core/graph/control_flow.cc         |   2 +-
 tensorflow/core/graph/graph.cc                |   4 +-
 tensorflow/core/graph/graph.h                 |  14 ---
 tensorflow/core/graph/graph_constructor.cc    |   4 +-
 .../core/graph/graph_constructor_test.cc      |  66 +++++------
 tensorflow/core/graph/graph_partition.cc      |   8 +-
 tensorflow/core/graph/graph_test.cc           |  10 +-
 tensorflow/core/graph/optimizer_cse.cc        |  37 ++++--
 tensorflow/core/graph/quantize_training.cc    |   6 +-
 .../core/graph/quantize_training_test.cc      |  12 +-
 tensorflow/core/graph/subgraph.cc             |   6 +-
 tensorflow/core/graph/subgraph_test.cc        |   4 +-
 .../core/grappler/costs/graph_properties.cc   |   4 +-
 tensorflow/core/kernels/function_ops.cc       |  16 +--
 .../core/kernels/hexagon/graph_transferer.cc  |  19 ++-
 .../remote_fused_graph_execute_utils.cc       |   6 +-
 .../remote_fused_graph_execute_utils.h        |   2 +-
 54 files changed, 520 insertions(+), 605 deletions(-)

diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index f4775783f9..bbc18569ad 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -738,7 +738,8 @@ tensorflow::string OutputName(const TF_Output& output) {
 const tensorflow::AttrValue* GetAttrValue(TF_Operation* oper,
                                           const char* attr_name,
                                           TF_Status* status) {
-  const tensorflow::AttrValue* attr = oper->node.attrs().Find(attr_name);
+  const tensorflow::AttrValue* attr =
+      tensorflow::AttrSlice(oper->node.def()).Find(attr_name);
   if (attr == nullptr) {
     status->status =
         InvalidArgument("Operation has no attr named '", attr_name, "'.");
@@ -1134,7 +1135,7 @@ const char* TF_OperationOpType(TF_Operation* oper) {
 }
 
 const char* TF_OperationDevice(TF_Operation* oper) {
-  return oper->node.requested_device().c_str();
+  return oper->node.def().device().c_str();
 }
 
 int TF_OperationNumOutputs(TF_Operation* oper) {
@@ -1149,8 +1150,8 @@ TF_DataType TF_OperationOutputType(TF_Output oper_out) {
 int TF_OperationOutputListLength(TF_Operation* oper, const char* arg_name,
                                  TF_Status* status) {
   NameRangeMap name_ranges;
-  status->status =
-      NameRangesForNode(oper->node, oper->node.op_def(), nullptr, &name_ranges);
+  status->status = NameRangesForNode(oper->node.def(), oper->node.op_def(),
+                                     nullptr, &name_ranges);
   if (!status->status.ok()) return -1;
   auto iter = name_ranges.find(arg_name);
   if (iter == name_ranges.end()) {
@@ -1171,8 +1172,8 @@ TF_DataType TF_OperationInputType(TF_Input oper_in) {
 int TF_OperationInputListLength(TF_Operation* oper, const char* arg_name,
                                 TF_Status* status) {
   NameRangeMap name_ranges;
-  status->status =
-      NameRangesForNode(oper->node, oper->node.op_def(), &name_ranges, nullptr);
+  status->status = NameRangesForNode(oper->node.def(), oper->node.op_def(),
+                                     &name_ranges, nullptr);
   if (!status->status.ok()) return -1;
   auto iter = name_ranges.find(arg_name);
   if (iter == name_ranges.end()) {
@@ -1410,27 +1411,26 @@ void TF_OperationGetAttrStringList(TF_Operation* oper, const char* attr_name,
   }
 }
 
-#define DEFINE_GETATTR(func, c_type, cpp_type, list_field)                   \
-  void func(TF_Operation* oper, const char* attr_name, c_type* value,        \
-            TF_Status* status) {                                             \
-    cpp_type v;                                                              \
-    status->status =                                                         \
-        tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &v);          \
-    *value = static_cast<c_type>(v);                                         \
-  }                                                                          \
-  void func##List(TF_Operation* oper, const char* attr_name, c_type* values, \
-                  int max_values, TF_Status* status) {                       \
-    const auto* attr = GetAttrValue(oper, attr_name, status);                \
-    if (!status->status.ok()) return;                                        \
-    if (attr->value_case() != tensorflow::AttrValue::kList) {                \
-      status->status =                                                       \
-          InvalidArgument("Value for '", attr_name, "' is not a list.");     \
-      return;                                                                \
-    }                                                                        \
-    const auto len = std::min(max_values, attr->list().list_field##_size()); \
-    for (int i = 0; i < len; ++i) {                                          \
-      values[i] = static_cast<c_type>(attr->list().list_field(i));           \
-    }                                                                        \
+#define DEFINE_GETATTR(func, c_type, cpp_type, list_field)                     \
+  void func(TF_Operation* oper, const char* attr_name, c_type* value,          \
+            TF_Status* status) {                                               \
+    cpp_type v;                                                                \
+    status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &v); \
+    *value = static_cast<c_type>(v);                                           \
+  }                                                                            \
+  void func##List(TF_Operation* oper, const char* attr_name, c_type* values,   \
+                  int max_values, TF_Status* status) {                         \
+    const auto* attr = GetAttrValue(oper, attr_name, status);                  \
+    if (!status->status.ok()) return;                                          \
+    if (attr->value_case() != tensorflow::AttrValue::kList) {                  \
+      status->status =                                                         \
+          InvalidArgument("Value for '", attr_name, "' is not a list.");       \
+      return;                                                                  \
+    }                                                                          \
+    const auto len = std::min(max_values, attr->list().list_field##_size());   \
+    for (int i = 0; i < len; ++i) {                                            \
+      values[i] = static_cast<c_type>(attr->list().list_field(i));             \
+    }                                                                          \
   }
 DEFINE_GETATTR(TF_OperationGetAttrInt, int64_t, tensorflow::int64, i);
 DEFINE_GETATTR(TF_OperationGetAttrFloat, float, float, f);
@@ -1441,8 +1441,7 @@ DEFINE_GETATTR(TF_OperationGetAttrType, TF_DataType, DataType, type);
 void TF_OperationGetAttrShape(TF_Operation* oper, const char* attr_name,
                               int64_t* value, int num_dims, TF_Status* status) {
   PartialTensorShape shape;
-  status->status =
-      tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &shape);
+  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &shape);
   if (!status->status.ok()) return;
   auto len = std::min(shape.dims(), num_dims);
   for (int i = 0; i < len; ++i) {
@@ -1456,7 +1455,7 @@ void TF_OperationGetAttrShapeList(TF_Operation* oper, const char* attr_name,
                                   int storage_size, TF_Status* status) {
   std::vector<PartialTensorShape> shapes;
   status->status =
-      tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &shapes);
+      tensorflow::GetNodeAttr(oper->node.def(), attr_name, &shapes);
   if (!status->status.ok()) return;
   auto len = std::min(static_cast<int>(shapes.size()), max_values);
   int64_t* p = storage;
@@ -1523,7 +1522,7 @@ void TF_OperationGetAttrTensor(TF_Operation* oper, const char* attr_name,
                                TF_Tensor** value, TF_Status* status) {
   *value = nullptr;
   Tensor t;
-  status->status = tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &t);
+  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &t);
   if (!status->status.ok()) return;
   *value = new TF_Tensor{static_cast<TF_DataType>(t.dtype()), t.shape(),
                          tensorflow::TensorCApi::Buffer(t)};
@@ -1534,7 +1533,7 @@ void TF_OperationGetAttrTensorList(TF_Operation* oper, const char* attr_name,
                                    TF_Tensor** values, int max_values,
                                    TF_Status* status) {
   std::vector<Tensor> ts;
-  status->status = tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &ts);
+  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &ts);
   if (!status->status.ok()) return;
   const auto len = std::min(max_values, static_cast<int>(ts.size()));
   for (int i = 0; i < len; ++i) {
diff --git a/tensorflow/cc/framework/cc_op_gen.cc b/tensorflow/cc/framework/cc_op_gen.cc
index 71aa986f91..799492a4eb 100644
--- a/tensorflow/cc/framework/cc_op_gen.cc
+++ b/tensorflow/cc/framework/cc_op_gen.cc
@@ -740,10 +740,11 @@ void OpInfo::GetOutput(string* out) const {
     return;
   }
   strings::StrAppend(out, "  ::tensorflow::NameRangeMap _outputs_range;\n");
-  strings::StrAppend(out,
-                     "  ::tensorflow::Status _status_ = "
-                     "::tensorflow::NameRangesForNode(*ret, ret->op_def(), "
-                     "nullptr, &_outputs_range);\n");
+  strings::StrAppend(
+      out,
+      "  ::tensorflow::Status _status_ = "
+      "::tensorflow::NameRangesForNode(ret->def(), ret->op_def(), "
+      "nullptr, &_outputs_range);\n");
   strings::StrAppend(out, "  if (!_status_.ok()) {\n", "    ", scope_str,
                      ".UpdateStatus(_status_);\n", "    return;\n");
   strings::StrAppend(out, "  }\n\n");
diff --git a/tensorflow/cc/framework/cc_ops_test.cc b/tensorflow/cc/framework/cc_ops_test.cc
index 5da23036ea..92c97d107d 100644
--- a/tensorflow/cc/framework/cc_ops_test.cc
+++ b/tensorflow/cc/framework/cc_ops_test.cc
@@ -35,8 +35,8 @@ Output Linear(const Scope& scope, Input x, Input w, Input b) {
 void GetColocationConstraints(const Output& tensor,
                               std::vector<string>* constraints) {
   constraints->clear();
-  TF_EXPECT_OK(GetNodeAttr(tensor.op().node()->attrs(), kColocationAttrName,
-                           constraints));
+  TF_EXPECT_OK(
+      GetNodeAttr(tensor.op().node()->def(), kColocationAttrName, constraints));
 }
 
 }  // namespace
@@ -159,11 +159,11 @@ TEST(CCOpTest, KernelLabel) {
   Scope root = Scope::NewRootScope();
   auto add = Add(root.WithKernelLabel("AddWithKernelLabel"), 1.0f, 2.0f);
   TF_EXPECT_OK(root.status());
-  AttrSlice attrs = add.z.op().node()->attrs();
-  const auto* kernel_attr = attrs.Find("_kernel");
-  ASSERT_TRUE(kernel_attr);
-  TF_EXPECT_OK(AttrValueHasType(*kernel_attr, "string"));
-  EXPECT_EQ(kernel_attr->s(), "AddWithKernelLabel");
+  const auto& attrs = add.z.op().node()->def().attr();
+  ASSERT_TRUE(attrs.find("_kernel") != attrs.end());
+  auto kernel_attr = attrs.find("_kernel")->second;
+  TF_EXPECT_OK(AttrValueHasType(kernel_attr, "string"));
+  EXPECT_EQ(kernel_attr.s(), "AddWithKernelLabel");
 }
 
 TEST(CCOpTest, ColocateWith) {
@@ -190,7 +190,8 @@ TEST(CCOpTest, ColocateWith) {
 
   Scope with_colocate = root.ColocateWith(c3).ColocateWith(c4);
   auto c6 = Const(with_colocate.WithOpName("c6").ClearColocation(), 7);
-  EXPECT_FALSE(c6.op().node()->attrs().Find("_class"));
+  const auto& attrs = c6.op().node()->def().attr();
+  EXPECT_TRUE(attrs.find("_class") == attrs.end());
 }
 
 TEST(CCOpTest, TemplatedConst) {
diff --git a/tensorflow/cc/framework/scope.cc b/tensorflow/cc/framework/scope.cc
index 32c0822de6..8b7fc1406f 100644
--- a/tensorflow/cc/framework/scope.cc
+++ b/tensorflow/cc/framework/scope.cc
@@ -271,9 +271,9 @@ Scope::Impl::Impl(const Scope& other, Tags::Colocate,
 std::unordered_set<string> Scope::Impl::GetColocationConstraints(
     const Operation& colocate_with_op) const {
   std::unordered_set<string> current_constraints(colocation_constraints_);
-  const AttrSlice attrs = colocate_with_op.node()->attrs();
+  const NodeDef& node_def = colocate_with_op.node()->def();
   std::vector<string> node_constraints;
-  if (GetNodeAttr(attrs, kColocationAttrName, &node_constraints).ok()) {
+  if (GetNodeAttr(node_def, kColocationAttrName, &node_constraints).ok()) {
     for (const string& entry : node_constraints) {
       StringPiece s(entry);
       if (s.Consume(kColocationGroupPrefix)) {
diff --git a/tensorflow/cc/gradients/array_grad.cc b/tensorflow/cc/gradients/array_grad.cc
index 37f07e71a0..26abd2438e 100644
--- a/tensorflow/cc/gradients/array_grad.cc
+++ b/tensorflow/cc/gradients/array_grad.cc
@@ -43,9 +43,9 @@ Status PackGrad(const Scope& scope, const Operation& op,
                 const std::vector<Output>& grad_inputs,
                 std::vector<Output>* grad_outputs) {
   int N;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "N", &N));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "N", &N));
   int axis;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "axis", &axis));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "axis", &axis));
 
   grad_outputs->reserve(N);
   auto grad_op = Unstack(scope, grad_inputs[0], N, Unstack::Axis(axis));
@@ -60,7 +60,7 @@ Status UnpackGrad(const Scope& scope, const Operation& op,
                   const std::vector<Output>& grad_inputs,
                   std::vector<Output>* grad_outputs) {
   int axis;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "axis", &axis));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "axis", &axis));
   grad_outputs->push_back(Stack(scope, grad_inputs, Stack::Axis(axis)));
   return scope.status();
 }
@@ -162,7 +162,7 @@ Status CheckNumericsGrad(const Scope& scope, const Operation& op,
                          const std::vector<Output>& grad_inputs,
                          std::vector<Output>* grad_outputs) {
   string message;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "message", &message));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "message", &message));
   string err_msg = strings::StrCat(
       "Not a number (NaN) or infinity (Inf) values detected in gradient. ",
       message);
@@ -215,9 +215,9 @@ Status ReverseSequenceGrad(const Scope& scope, const Operation& op,
                            std::vector<Output>* grad_outputs) {
   auto seq_lengths = op.input(1);
   int batch_dim;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "batch_dim", &batch_dim));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "batch_dim", &batch_dim));
   int seq_dim;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "seq_dim", &seq_dim));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "seq_dim", &seq_dim));
   grad_outputs->push_back(
       ReverseSequence(scope, grad_inputs[0], seq_lengths, seq_dim,
                       ReverseSequence::BatchDim(batch_dim)));
@@ -267,8 +267,7 @@ Status SpaceToBatchGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(
-      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
   grad_outputs->push_back(
       BatchToSpace(scope, grad_inputs[0], op.input(1), block_size));
   grad_outputs->push_back(NoGradient());
@@ -291,8 +290,7 @@ Status BatchToSpaceGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(
-      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
   grad_outputs->push_back(
       SpaceToBatch(scope, grad_inputs[0], op.input(1), block_size));
   grad_outputs->push_back(NoGradient());
@@ -315,8 +313,7 @@ Status SpaceToDepthGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(
-      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
   grad_outputs->push_back(DepthToSpace(scope, grad_inputs[0], block_size));
   return scope.status();
 }
@@ -326,8 +323,7 @@ Status DepthToSpaceGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(
-      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
   grad_outputs->push_back(SpaceToDepth(scope, grad_inputs[0], block_size));
   return scope.status();
 }
@@ -337,7 +333,7 @@ Status MirrorPadGrad(const Scope& scope, const Operation& op,
                      const std::vector<Output>& grad_inputs,
                      std::vector<Output>* grad_outputs) {
   string mode;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "mode", &mode));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "mode", &mode));
   grad_outputs->push_back(tensorflow::ops::internal::MirrorPadGrad(
       scope, grad_inputs[0], op.input(1), mode));
   grad_outputs->push_back(NoGradient());
@@ -350,7 +346,7 @@ Status MirrorPadGradGrad(const Scope& scope, const Operation& op,
                          const std::vector<Output>& grad_inputs,
                          std::vector<Output>* grad_outputs) {
   string mode;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "mode", &mode));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "mode", &mode));
   grad_outputs->push_back(MirrorPad(scope, grad_inputs[0], op.input(1), mode));
   grad_outputs->push_back(NoGradient());
   return scope.status();
diff --git a/tensorflow/cc/gradients/math_grad.cc b/tensorflow/cc/gradients/math_grad.cc
index 8c1a01f518..5a2c6d11fb 100644
--- a/tensorflow/cc/gradients/math_grad.cc
+++ b/tensorflow/cc/gradients/math_grad.cc
@@ -350,7 +350,7 @@ Status MatMulGradCommon(const Scope& scope, const Operation& op,
                         const string& attr_adj_x, const string& attr_adj_y,
                         std::vector<Output>* grad_outputs) {
   DataType dtype;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->attrs(), "T", &dtype));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), "T", &dtype));
   if (dtype == DT_COMPLEX64 || dtype == DT_COMPLEX128) {
     return errors::Unimplemented(
         "MatMul gradient for complex data type is not supported yet.");
@@ -358,10 +358,8 @@ Status MatMulGradCommon(const Scope& scope, const Operation& op,
 
   bool ta;
   bool tb;
-  TF_RETURN_IF_ERROR(
-      GetNodeAttr(op.output(0).node()->attrs(), attr_adj_x, &ta));
-  TF_RETURN_IF_ERROR(
-      GetNodeAttr(op.output(0).node()->attrs(), attr_adj_y, &tb));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), attr_adj_x, &ta));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), attr_adj_y, &tb));
 
   if (!ta && !tb) {
     return MatMulGradHelper(scope, is_batch, grad_inputs[0], false, op.input(1),
diff --git a/tensorflow/cc/ops/const_op_test.cc b/tensorflow/cc/ops/const_op_test.cc
index 3184edeb33..5a4770f879 100644
--- a/tensorflow/cc/ops/const_op_test.cc
+++ b/tensorflow/cc/ops/const_op_test.cc
@@ -28,9 +28,9 @@ void ExpectNodeEqual(const Node* n, gtl::ArraySlice<T> values,
                      TensorShape shape) {
   EXPECT_TRUE(n->IsConstant());
   Tensor tensor;
-  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor));
+  TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor));
   DataType dtype;
-  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
+  TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
   EXPECT_EQ(tensor.dtype(), dtype);
   test::ExpectTensorEqual<T>(tensor, test::AsTensor(values, shape));
 }
@@ -39,9 +39,9 @@ void ExpectTypeAndShape(const Node* n, DataType expected_dtype,
                         TensorShape expected_shape) {
   EXPECT_TRUE(n->IsConstant());
   Tensor tensor;
-  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor));
+  TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor));
   DataType dtype;
-  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
+  TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
   EXPECT_EQ(dtype, expected_dtype);
   EXPECT_EQ(expected_shape, TensorShape(tensor.shape()));
 }
diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index 0c7b97b01f..162e719ade 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -203,14 +203,14 @@ Status RewriteAndPruneGraph(Graph* graph, const Config& config,
   for (const Node* n : graph->nodes()) {
     if (n->type_string() == kArgOp) {
       string feed_id;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), kFeedIdAttr, &feed_id));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), kFeedIdAttr, &feed_id));
       if (missing_feeds.erase(feed_id) == 0) {
         return errors::Aborted(kArgOp,
                                " node found with unknown feed id: ", feed_id);
       }
     } else if (n->type_string() == kRetvalOp) {
       string fetch_id;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), kFetchIdAttr, &fetch_id));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), kFetchIdAttr, &fetch_id));
       if (missing_fetches.erase(fetch_id) == 0) {
         return errors::Aborted(kRetvalOp,
                                " node found with unknown fetch id: ", fetch_id);
@@ -234,7 +234,7 @@ Status CollectArgNodes(const Graph& graph, std::vector<Node*>* arg_nodes) {
   for (Node* n : graph.nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
       auto insert_result = indexed_arg_nodes.insert({index, n});
       if (!insert_result.second) {
         const Node* dup = insert_result.first->second;
@@ -264,9 +264,9 @@ Status CreateXlaArgs(const Graph& graph,
   for (const Node* node : arg_nodes) {
     XlaCompiler::Argument arg;
     arg.kind = XlaCompiler::Argument::kParameter;
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &arg.type));
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), kShapeAttr, &arg.shape));
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), kDebugNameAttr, &arg.name));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &arg.type));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), kShapeAttr, &arg.shape));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), kDebugNameAttr, &arg.name));
     xla_args->push_back(arg);
   }
   return Status::OK();
diff --git a/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc b/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
index 48eed7fce0..abb68f73d7 100644
--- a/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
+++ b/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
@@ -66,9 +66,9 @@ static Status ReplaceNodeWithXlaLaunch(Graph* graph, Node* node) {
 
   int num_constant_args, num_resource_args;
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(node->attrs(), kXlaNumConstantArgsAttr, &num_constant_args));
+      GetNodeAttr(node->def(), kXlaNumConstantArgsAttr, &num_constant_args));
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(node->attrs(), kXlaNumResourceArgsAttr, &num_resource_args));
+      GetNodeAttr(node->def(), kXlaNumResourceArgsAttr, &num_resource_args));
 
   if (num_constant_args < 0 || num_resource_args < 0 ||
       num_constant_args + num_resource_args > node->num_inputs()) {
@@ -88,7 +88,7 @@ static Status ReplaceNodeWithXlaLaunch(Graph* graph, Node* node) {
   Node* launch_node;
   TF_RETURN_IF_ERROR(BuildLaunchNode(
       graph->NewName(node->name()), node->type_string(), node->def().attr(),
-      node->requested_device(), const_dtypes, num_resource_args, arg_dtypes,
+      node->def().device(), const_dtypes, num_resource_args, arg_dtypes,
       node->output_types(), graph, &launch_node));
   launch_node->set_assigned_device_name(node->assigned_device_name());
 
@@ -173,8 +173,7 @@ Status CreateXlaLaunchOp(FunctionLibraryRuntime* flr, const NodeDef& ndef,
   FunctionLibraryRuntime::Handle handle;
   // If ndef is not instantiable, e.g., the function does not exist,
   // simply bail out.
-  TF_RETURN_IF_ERROR(
-      flr->Instantiate(ndef.op(), AttrSlice(&ndef.attr()), &handle));
+  TF_RETURN_IF_ERROR(flr->Instantiate(ndef.op(), ndef.attr(), &handle));
   const FunctionBody* fbody = flr->GetFunctionBody(handle);
   CHECK(fbody);  // Can't be nullptr since we just instantiated it.
   std::vector<bool> const_args(fbody->arg_types.size());
diff --git a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
index 88ec45f8d8..decea97fc8 100644
--- a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
+++ b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
@@ -165,7 +165,7 @@ static const char* const kRetValOp = "_Retval";
 // none.
 string Encapsulator::GetFunctionNameAttr(Node const* node) const {
   string attr;
-  if (!GetNodeAttr(node->attrs(), group_attribute_, &attr).ok()) {
+  if (!GetNodeAttr(node->def(), group_attribute_, &attr).ok()) {
     attr.clear();
   }
   return attr;
@@ -195,7 +195,7 @@ Status Encapsulator::SplitIntoSubgraphs() {
 
     // Check the device matches any existing device.
     string device = node->assigned_device_name().empty()
-                        ? node->requested_device()
+                        ? node->def().device()
                         : node->assigned_device_name();
 
     if (subgraph.device.empty()) {
@@ -593,7 +593,7 @@ static Status GetArgTypes(const Graph& graph, DataTypeVector* types) {
   for (Node* n : graph.nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
       if (index < 0 || index >= types->size()) {
         return errors::InvalidArgument("Invalid argument number");
       }
@@ -610,7 +610,7 @@ static Status RenumberArguments(Graph* graph,
   for (Node* n : graph->nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
       if (index < 0 || index >= permutation.size()) {
         return errors::InvalidArgument("Invalid argument number");
       }
@@ -713,7 +713,7 @@ Status EncapsulateSubgraphsPass::Run(
 bool IsXlaCompiledKernel(const Node& node) {
   bool is_compiled = false;
   bool has_compilation_attr =
-      GetNodeAttr(node.attrs(), kXlaCompiledKernelAttr, &is_compiled).ok() &&
+      GetNodeAttr(node.def(), kXlaCompiledKernelAttr, &is_compiled).ok() &&
       is_compiled;
   return has_compilation_attr ? is_compiled : false;
 }
diff --git a/tensorflow/compiler/jit/graph_to_functiondef.cc b/tensorflow/compiler/jit/graph_to_functiondef.cc
index 83c2338500..88e292a2c1 100644
--- a/tensorflow/compiler/jit/graph_to_functiondef.cc
+++ b/tensorflow/compiler/jit/graph_to_functiondef.cc
@@ -126,8 +126,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     if (node->type_string() == kArgOp) {
       int index;
       DataType type;
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &type));
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &type));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "index", &index));
       while (fdef->signature().input_arg_size() <= index) {
         fdef->mutable_signature()->add_input_arg();
       }
@@ -143,8 +143,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     if (node->type_string() == kRetValOp) {
       int index;
       DataType type;
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &type));
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &type));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "index", &index));
       while (fdef->signature().output_arg_size() <= index) {
         fdef->mutable_signature()->add_output_arg();
       }
@@ -161,7 +161,7 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     }
 
     NodeDef* node_def = fdef->add_node_def();
-    *node_def = node->def();
+    node_def->CopyFrom(node->def());
     node_def->set_name(node_names.Uniquify(node->name()));
 
     // Reset input names based on graph rather than the NodeDef.
@@ -203,8 +203,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
 
     // Populate tensor_renaming.
     NameRangeMap output_ranges;
-    TF_RETURN_IF_ERROR(
-        NameRangesForNode(*node, node->op_def(), nullptr, &output_ranges));
+    TF_RETURN_IF_ERROR(NameRangesForNode(node->def(), node->op_def(), nullptr,
+                                         &output_ranges));
     for (const auto& output : output_ranges) {
       for (int i = output.second.first; i < output.second.second; ++i) {
         const string tensor_name = strings::StrCat(
diff --git a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
index 29c5ff7242..cb6c14901b 100644
--- a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
@@ -55,7 +55,7 @@ XlaDeviceLaunchOp::XlaDeviceLaunchOp(OpKernelConstruction* ctx)
   OP_REQUIRES_OK(ctx, ctx->GetAttr("function", &func));
   function_ = *func;
   VLOG(1) << "XlaDeviceLaunch created function="
-          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
+          << Canonicalize(function_.name(), function_.attr());
   DataTypeVector constant_types;
   OP_REQUIRES_OK(ctx, ctx->GetAttr("Tconstants", &constant_types));
   num_constant_args_ = constant_types.size();
@@ -81,7 +81,7 @@ std::vector<OptionalTensor> SnapshotResourceVariables(OpKernelContext* ctx,
 
 void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
   VLOG(1) << "XlaDeviceLaunch::Compute "
-          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
+          << Canonicalize(function_.name(), function_.attr());
   // We store information about the JIT-compiled XLA computation
   // in the ResourceMgr.
   ResourceMgr* rm = ctx->resource_manager();
diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
index 40acc0d81d..a58abcbdff 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
@@ -186,7 +186,7 @@ Status XlaLocalLaunchOp::BuildCompilationCache(OpKernelContext* ctx,
 
 void XlaLocalLaunchOp::Compute(OpKernelContext* ctx) {
   VLOG(1) << "XlaLocalLaunchOp::Compute "
-          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
+          << Canonicalize(function_.name(), function_.attr());
   // We store information about the JIT-compiled XLA computation
   // in the ResourceMgr.
   ResourceMgr* rm = ctx->resource_manager();
diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass.cc b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
index 73c4e80551..711b986d7f 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
@@ -56,18 +56,18 @@ bool IsCompilableCall(const NodeDef& call_def,
                       const DeviceType& jit_device_type, int depth,
                       FunctionLibraryRuntime* lib_runtime);
 
-// Tests whether 'while_node' is a completely compilable loop.
+// Tests whether 'while_def' is a completely compilable loop.
 // Every operator in the condition and body functions must be compilable for a
 // while loop to be compilable.
-bool IsCompilableWhile(const Node& while_node,
+bool IsCompilableWhile(const NodeDef& while_def,
                        const DeviceType& jit_device_type, int depth,
                        FunctionLibraryRuntime* lib_runtime) {
-  VLOG(2) << "Loop marking: " << while_node.type_string();
+  VLOG(2) << "Loop marking: " << while_def.op();
 
   const NameAttrList* name_attr;
   NodeDef call;
   Status status;
-  status = GetNodeAttr(while_node.attrs(), "cond", &name_attr);
+  status = GetNodeAttr(while_def, "cond", &name_attr);
   if (!status.ok()) {
     VLOG(2) << "Missing 'cond' attribute on While node.";
     return false;
@@ -80,7 +80,7 @@ bool IsCompilableWhile(const Node& while_node,
     VLOG(2) << "Can't compile loop condition: " << cond_func;
     return false;
   }
-  status = GetNodeAttr(while_node.attrs(), "body", &name_attr);
+  status = GetNodeAttr(while_def, "body", &name_attr);
   if (!status.ok()) {
     VLOG(2) << "Missing 'body' attribute on While node.";
     return false;
@@ -112,7 +112,7 @@ bool IsCompilableCall(const NodeDef& call_def,
 
   FunctionLibraryRuntime::Handle handle;
   Status status =
-      lib_runtime->Instantiate(call_def.op(), AttrSlice(call_def), &handle);
+      lib_runtime->Instantiate(call_def.op(), call_def.attr(), &handle);
   if (!status.ok()) {
     VLOG(2) << "Could not instantiate " << call_def.op() << ": " << status;
     return false;
@@ -134,11 +134,11 @@ bool IsCompilableCall(const NodeDef& call_def,
 
   for (Node* node : fbody->graph->nodes()) {
     if (node->IsSource() || node->IsSink()) continue;
-    if (node->type_string() == "_Arg" || node->type_string() == "_Retval")
-      continue;
-    if (node->type_string() == "While") {
+    if (node->def().op() == "_Arg" || node->def().op() == "_Retval") continue;
+    if (node->def().op() == "While") {
       // Handle functional While loop (not in open source build).
-      return IsCompilableWhile(*node, jit_device_type, depth + 1, lib_runtime);
+      return IsCompilableWhile(node->def(), jit_device_type, depth + 1,
+                               lib_runtime);
     }
     if (!HasXLAKernel(*node, jit_device_type) &&
         !IsCompilableCall(node->def(), jit_device_type, depth + 1,
@@ -192,16 +192,17 @@ Status FindCompilationCandidates(
     if (!HasXLAKernel(*node, jit_device_type) &&
         !IsCompilableCall(node->def(), jit_device_type, 0, lib_runtime.get())) {
       VLOG(2) << "Compilation rejected node: unsupported op " << node->name()
-              << ": " << node->type_string();
+              << ": " << node->def().op();
       continue;
     }
     if (!registration->compile_resource_ops && HasResourceArgument(*node)) {
       VLOG(2) << "Compilation rejected node: resource argument " << node->name()
-              << ": " << node->type_string();
+              << ": " << node->def().op();
       continue;
     }
-    if (node->type_string() == "While" &&
-        !IsCompilableWhile(*node, jit_device_type, 0, lib_runtime.get())) {
+    if (node->def().op() == "While" &&
+        !IsCompilableWhile(node->def(), jit_device_type, 0,
+                           lib_runtime.get())) {
       continue;
     }
     candidates->insert(node);
@@ -318,10 +319,10 @@ Status MarkForCompilationPass::Run(
 
     // If there is a _XlaCompile annotation, use its value.
     bool compile = false;
-    Status status = GetNodeAttr(node->attrs(), kXlaCompileAttr, &compile);
+    Status status = GetNodeAttr(node->def(), kXlaCompileAttr, &compile);
     if (status.ok()) return compile;
 
-    status = fld->GetAttr(*node, kXlaCompileAttr, &compile);
+    status = fld->GetAttr(node->def(), kXlaCompileAttr, &compile);
     if (status.ok()) return compile;
 
     // Otherwise use the value of global_jit_level.
@@ -484,8 +485,8 @@ Status MarkForCompilationPass::RunImpl(
       // all nodes marked with _XlaCompile=true to also have a
       // _XlaScope property set (and raise an error otherwise); but
       // for now we don't do this.
-      if (GetNodeAttr(node_from->attrs(), kXlaScopeAttr, &from_scope).ok() &&
-          GetNodeAttr(node_to->attrs(), kXlaScopeAttr, &to_scope).ok() &&
+      if (GetNodeAttr(node_from->def(), kXlaScopeAttr, &from_scope).ok() &&
+          GetNodeAttr(node_to->def(), kXlaScopeAttr, &to_scope).ok() &&
           from_scope != to_scope) {
         continue;
       }
@@ -540,9 +541,10 @@ Status MarkForCompilationPass::RunImpl(
     // Compile if the user marked this node _XlaCompile=true
     bool compile_attr = false;
     bool marked_for_compilation = false;
-    if (GetNodeAttr(n->attrs(), kXlaCompileAttr, &compile_attr).ok()) {
+    if (GetNodeAttr(n->def(), kXlaCompileAttr, &compile_attr).ok()) {
       marked_for_compilation = compile_attr;
-    } else if (options.flib_def->GetAttr(*n, kXlaCompileAttr, &compile_attr)
+    } else if (options.flib_def
+                   ->GetAttr(n->def(), kXlaCompileAttr, &compile_attr)
                    .ok()) {
       marked_for_compilation = compile_attr;
     }
diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc b/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
index 9f30e12e0e..91e4a2b41c 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
@@ -57,7 +57,7 @@ std::unordered_map<string, string> GetClusters(const Graph& graph) {
   std::unordered_map<string, string> ids;
   for (Node* node : graph.nodes()) {
     string cluster;
-    if (GetNodeAttr(node->attrs(), kXlaClusterAttr, &cluster).ok()) {
+    if (GetNodeAttr(node->def(), kXlaClusterAttr, &cluster).ok()) {
       CHECK(!cluster.empty());
       ids[node->name()] = cluster;
     }
diff --git a/tensorflow/compiler/jit/xla_compilation_cache.cc b/tensorflow/compiler/jit/xla_compilation_cache.cc
index 63ca77f9a9..82af304169 100644
--- a/tensorflow/compiler/jit/xla_compilation_cache.cc
+++ b/tensorflow/compiler/jit/xla_compilation_cache.cc
@@ -95,7 +95,7 @@ Status XlaCompilationCache::BuildSignature(
     const NameAttrList& function, int num_constant_args,
     const std::vector<OptionalTensor>& variable_args, OpKernelContext* ctx,
     Signature* signature) {
-  signature->name = Canonicalize(function.name(), AttrSlice(&function.attr()));
+  signature->name = Canonicalize(function.name(), function.attr());
   signature->arg_values.resize(num_constant_args);
 
   signature->arg_types.reserve(ctx->num_inputs() - num_constant_args);
diff --git a/tensorflow/compiler/tf2xla/const_analysis.cc b/tensorflow/compiler/tf2xla/const_analysis.cc
index 4adc17b838..44ff13ca34 100644
--- a/tensorflow/compiler/tf2xla/const_analysis.cc
+++ b/tensorflow/compiler/tf2xla/const_analysis.cc
@@ -108,7 +108,7 @@ Status BackwardsConstAnalysis(const Graph& g,
     if (must_be_const.find(node) != must_be_const.end()) {
       if (node->type_string() == "_Arg") {
         int index;
-        status = GetNodeAttr(node->attrs(), "index", &index);
+        status = GetNodeAttr(node->def(), "index", &index);
         if (!status.ok()) return;
         compile_time_const_args->at(index) = true;
         return;
@@ -124,8 +124,8 @@ Status BackwardsConstAnalysis(const Graph& g,
     if (range.first == range.second) return;
 
     NameRangeMap input_name_ranges;
-    status =
-        NameRangesForNode(*node, node->op_def(), &input_name_ranges, nullptr);
+    status = NameRangesForNode(node->def(), node->op_def(), &input_name_ranges,
+                               nullptr);
     if (!status.ok()) return;
 
     for (auto it = range.first; it != range.second; ++it) {
diff --git a/tensorflow/compiler/tf2xla/kernels/function_ops.cc b/tensorflow/compiler/tf2xla/kernels/function_ops.cc
index 8dacb6627b..d718f98545 100644
--- a/tensorflow/compiler/tf2xla/kernels/function_ops.cc
+++ b/tensorflow/compiler/tf2xla/kernels/function_ops.cc
@@ -68,8 +68,7 @@ class SymbolicGradientOp : public AsyncOpKernel {
                       done);
 
     OP_REQUIRES_OK_ASYNC(
-        ctx, lib->Instantiate(kGradientOp, AttrSlice(&def().attr()), &handle_),
-        done);
+        ctx, lib->Instantiate(kGradientOp, def().attr(), &handle_), done);
 
     FunctionLibraryRuntime::Options opts;
     opts.step_id = ctx->step_id();
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index d4a917671b..a8034a2ec6 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -106,8 +106,7 @@ Status XlaCompiler::CompileFunction(
     const XlaCompiler::CompileOptions& options, const NameAttrList& function,
     const std::vector<XlaCompiler::Argument>& args,
     XlaCompiler::CompilationResult* result) {
-  const string function_id =
-      Canonicalize(function.name(), AttrSlice(&function.attr()));
+  const string function_id = Canonicalize(function.name(), function.attr());
   VLOG(1) << "XlaCompiler::CompileFunction " << function_id;
 
   auto it = cache_.find({function_id, args});
@@ -117,8 +116,8 @@ Status XlaCompiler::CompileFunction(
   }
 
   FunctionLibraryRuntime::Handle handle;
-  TF_RETURN_IF_ERROR(flib_runtime_->Instantiate(
-      function.name(), AttrSlice(&function.attr()), &handle));
+  TF_RETURN_IF_ERROR(
+      flib_runtime_->Instantiate(function.name(), function.attr(), &handle));
 
   const FunctionBody* fbody = flib_runtime_->GetFunctionBody(handle);
   CHECK(fbody);
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 0006aaa0b5..6056d50587 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1408,11 +1408,6 @@ tf_cuda_library(
             "framework/**/*.cc",
             "util/**/*.h",
             "util/**/*.cc",
-        ] + [
-            "graph/edgeset.h",
-            "graph/edgeset.cc",
-            "graph/graph.h",
-            "graph/graph.cc",
         ],
         exclude = [
             "**/*test*",
@@ -1553,6 +1548,8 @@ tf_cuda_library(
         "graph/colors.cc",
         "graph/control_flow.cc",
         "graph/costmodel.cc",
+        "graph/edgeset.cc",
+        "graph/graph.cc",
         "graph/graph_constructor.cc",
         "graph/graph_def_builder.cc",
         "graph/graph_partition.cc",
diff --git a/tensorflow/core/common_runtime/constant_folding_test.cc b/tensorflow/core/common_runtime/constant_folding_test.cc
index 4a8560960e..9cc761a771 100644
--- a/tensorflow/core/common_runtime/constant_folding_test.cc
+++ b/tensorflow/core/common_runtime/constant_folding_test.cc
@@ -48,9 +48,9 @@ class ConstantFoldingTest : public ::testing::Test {
                        TensorShape shape) {
     EXPECT_TRUE(n->IsConstant());
     const TensorProto* tensor_proto;
-    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor_proto));
+    TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor_proto));
     DataType dtype;
-    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
+    TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
     Tensor t(dtype);
     EXPECT_TRUE(t.FromProto(*tensor_proto));
     test::ExpectClose(t, test::AsTensor(values, shape));
@@ -61,9 +61,9 @@ class ConstantFoldingTest : public ::testing::Test {
                        TensorShape shape) {
     EXPECT_TRUE(n->IsConstant());
     const TensorProto* tensor_proto;
-    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor_proto));
+    TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor_proto));
     DataType dtype;
-    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
+    TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
     Tensor t(dtype);
     EXPECT_TRUE(t.FromProto(*tensor_proto));
     test::ExpectTensorEqual<T>(t, test::AsTensor(values, shape));
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc
index 9e18547af5..ec0c9405dd 100644
--- a/tensorflow/core/common_runtime/executor.cc
+++ b/tensorflow/core/common_runtime/executor.cc
@@ -92,28 +92,31 @@ bool SetTimelineLabel(const Node* node, NodeExecStats* node_stats) {
       }
     }
   }
-  const AttrSlice attrs = node->attrs();
-  string text;
+  const NodeDef& def = node->def();
+  string text = "";
   if (IsSend(node)) {
     string tensor_name;
-    TF_CHECK_OK(GetNodeAttr(attrs, "tensor_name", &tensor_name));
+    TF_CHECK_OK(GetNodeAttr(def, "tensor_name", &tensor_name));
     string recv_device;
-    TF_CHECK_OK(GetNodeAttr(attrs, "recv_device", &recv_device));
-    text = strings::StrCat(memory, node->name(), " = ", node->type_string(),
-                           "(", tensor_name, " @", recv_device);
+    TF_CHECK_OK(GetNodeAttr(def, "recv_device", &recv_device));
+    text = strings::StrCat(memory, def.name(), " = ", def.op(), "(",
+                           tensor_name, " @", recv_device);
     is_transfer_node = true;
   } else if (IsRecv(node)) {
     string tensor_name;
-    TF_CHECK_OK(GetNodeAttr(attrs, "tensor_name", &tensor_name));
+    TF_CHECK_OK(GetNodeAttr(def, "tensor_name", &tensor_name));
     string send_device;
-    TF_CHECK_OK(GetNodeAttr(attrs, "send_device", &send_device));
-    text = strings::StrCat(memory, node->name(), " = ", node->type_string(),
-                           "(", tensor_name, " @", send_device);
+    TF_CHECK_OK(GetNodeAttr(def, "send_device", &send_device));
+    text = strings::StrCat(memory, def.name(), " = ", def.op(), "(",
+                           tensor_name, " @", send_device);
     is_transfer_node = true;
   } else {
-    text =
-        strings::StrCat(memory, node->name(), " = ", node->type_string(), "(",
-                        str_util::Join(node->requested_inputs(), ", "), ")");
+    text = strings::StrCat(
+        memory, def.name(), " = ", def.op(), "(",
+        str_util::Join(
+            std::vector<StringPiece>(def.input().begin(), def.input().end()),
+            ", "),
+        ")");
   }
   node_stats->set_timeline_label(text);
   return is_transfer_node;
@@ -519,7 +522,7 @@ char* GraphView::InitializeNode(char* ptr, const Node* n) {
   EdgeInfo* dst_edge = item->output_edge_base();
   for (auto e : n->out_edges()) {
     dst_edge->dst_id = e->dst()->id();
-    CHECK_LE(e->src_output(), 0x3FFFFFFF);  // Must fit in 31 bits
+    CHECK_LE(e->src_output(), ((int32)0x3FFFFFFF));  // Must fit in 31 bits
     dst_edge->output_slot = e->src_output();
     dst_edge->is_last = false;
     const int output_slot = dst_edge->output_slot;
@@ -637,7 +640,7 @@ Status ExecutorImpl::Initialize() {
     Status s = params_.create_kernel(n->def(), &item->kernel);
     if (!s.ok()) {
       item->kernel = nullptr;
-      s = AttachDef(s, *n);
+      s = AttachDef(s, n->def());
       LOG(ERROR) << "Executor failed to create kernel. " << s;
       return s;
     }
@@ -665,7 +668,7 @@ Status ExecutorImpl::Initialize() {
     frame_info->nodes->push_back(n);
     if (IsEnter(n)) {
       string enter_name;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "frame_name", &enter_name));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "frame_name", &enter_name));
       EnsureFrameInfo(enter_name)->input_count++;
     }
   }
@@ -720,7 +723,7 @@ Status InferAllocAttr(const Node* n, const Node* dst,
   // so these two cases are not mutually exclusive.
   if (IsRecv(n)) {
     string src_name;
-    s = GetNodeAttr(n->attrs(), "send_device", &src_name);
+    s = GetNodeAttr(n->def(), "send_device", &src_name);
     if (!s.ok()) return s;
     DeviceNameUtils::ParsedName parsed_src_name;
     if (!DeviceNameUtils::ParseFullName(src_name, &parsed_src_name)) {
@@ -745,7 +748,7 @@ Status InferAllocAttr(const Node* n, const Node* dst,
   }
   if (IsSend(dst)) {
     string dst_name;
-    s = GetNodeAttr(dst->attrs(), "recv_device", &dst_name);
+    s = GetNodeAttr(dst->def(), "recv_device", &dst_name);
     if (!s.ok()) return s;
     DeviceNameUtils::ParsedName parsed_dst_name;
     if (!DeviceNameUtils::ParseFullName(dst_name, &parsed_dst_name)) {
@@ -1358,7 +1361,7 @@ Status ExecutorImpl::BuildControlFlowInfo(const Graph* g,
     if (IsEnter(curr_node)) {
       // Enter a child frame.
       TF_RETURN_IF_ERROR(
-          GetNodeAttr(curr_node->attrs(), "frame_name", &frame_name));
+          GetNodeAttr(curr_node->def(), "frame_name", &frame_name));
       parent = curr_node;
     } else if (IsExit(curr_node)) {
       // Exit to the parent frame.
@@ -1552,7 +1555,8 @@ void ExecutorState::Process(TaggedNode tagged_node, int64 scheduled_usec) {
 
     if (vlog_) {
       VLOG(1) << "Process node: " << id << " step " << params.step_id << " "
-              << SummarizeNode(*node) << " is dead: " << tagged_node.is_dead;
+              << SummarizeNodeDef(node->def())
+              << " is dead: " << tagged_node.is_dead;
     }
 
     Entry* input_tensors = GetInputTensors(input_frame, input_iter);
@@ -1606,7 +1610,7 @@ void ExecutorState::Process(TaggedNode tagged_node, int64 scheduled_usec) {
 
           if (vlog_) {
             VLOG(2) << this << " Async kernel done: "
-                    << SummarizeNode(*state->item->node);
+                    << SummarizeNodeDef(state->item->node->def());
           }
           if (stats) nodestats::SetOpEnd(stats);
           EntryVector outputs;
@@ -1807,7 +1811,7 @@ Status ExecutorState::ProcessOutputs(const NodeItem& item, OpKernelContext* ctx,
       // tensor value at i-th output.
       if (!IsSwitch(node) && !IsRecv(node)) {
         s.Update(errors::Internal("Missing ", i, "-th output from ",
-                                  SummarizeNode(*node)));
+                                  SummarizeNodeDef(node->def())));
       }
     } else {
       Entry* out = &((*outputs)[i]);
@@ -1874,7 +1878,7 @@ Status ExecutorState::ProcessOutputs(const NodeItem& item, OpKernelContext* ctx,
                                   DataTypeString(dtype),
                                   " does not match declared output type ",
                                   DataTypeString(item.output_type(i)),
-                                  " for node ", SummarizeNode(*node)));
+                                  " for node ", SummarizeNodeDef(node->def())));
       }
     }
     if (!val.is_ref()) {
@@ -1911,7 +1915,7 @@ void ExecutorState::PropagateOutputs(const TaggedNode& tagged_node,
         &impl_->gview_, input_iter, ready);
   } else if (item->is_enter) {
     bool is_constant;
-    Status s = GetNodeAttr(node->attrs(), "is_constant", &is_constant);
+    Status s = GetNodeAttr(node->def(), "is_constant", &is_constant);
     DCHECK(s.ok()) << s;
     FindOrCreateChildFrame(input_frame, input_iter, node, &output_frame);
     output_iter = 0;
@@ -2237,7 +2241,7 @@ void ExecutorState::FindOrCreateChildFrame(FrameState* frame, int64 iter,
                                            FrameState** child) {
   // Get the child frame name.
   string enter_name;
-  Status s = GetNodeAttr(node->attrs(), "frame_name", &enter_name);
+  Status s = GetNodeAttr(node->def(), "frame_name", &enter_name);
   DCHECK(s.ok()) << s;
   const string child_name = MakeFrameName(frame, iter, enter_name);
 
@@ -2255,7 +2259,7 @@ void ExecutorState::FindOrCreateChildFrame(FrameState* frame, int64 iter,
   if (vlog_) VLOG(2) << "Create frame: " << child_name;
 
   int parallel_iters;
-  s = GetNodeAttr(node->attrs(), "parallel_iterations", &parallel_iters);
+  s = GetNodeAttr(node->def(), "parallel_iterations", &parallel_iters);
   DCHECK(s.ok()) << s;
   FrameState* temp = new FrameState(impl_, parallel_iters);
   temp->frame_name = child_name;
diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 996a8a9b3d..4be22f8260 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -150,7 +150,8 @@ class FunctionLibraryRuntimeImpl : public FunctionLibraryRuntime {
 
   ~FunctionLibraryRuntimeImpl() override;
 
-  Status Instantiate(const string& function_name, AttrSlice attrs,
+  Status Instantiate(const string& function_name,
+                     const InstantiateAttrValueMap& attrs,
                      Handle* handle) override;
 
   const FunctionBody* GetFunctionBody(Handle handle) override;
@@ -207,7 +208,8 @@ class FunctionLibraryRuntimeImpl : public FunctionLibraryRuntime {
   };
   std::vector<Item*> items_;
 
-  Status FunctionDefToBody(const FunctionDef& fdef, AttrSlice attrs,
+  Status FunctionDefToBody(const FunctionDef& fdef,
+                           const InstantiateAttrValueMap& attrs,
                            FunctionBody** fbody);
   Status CreateItem(Handle handle, Item** item);
   Status GetOrCreateItem(Handle handle, Item** item);
@@ -322,7 +324,7 @@ Status FunctionLibraryRuntimeImpl::CreateKernel(const NodeDef& ndef,
   // Try to instantiate this function for the func/attr. Maybe its
   // cached already.
   Handle handle;
-  TF_RETURN_IF_ERROR(Instantiate(ndef.op(), AttrSlice(&ndef.attr()), &handle));
+  TF_RETURN_IF_ERROR(Instantiate(ndef.op(), ndef.attr(), &handle));
 
   const FunctionBody* fbody = GetFunctionBody(handle);
   CHECK_NOTNULL(fbody);
@@ -353,9 +355,9 @@ Status FunctionLibraryRuntimeImpl::CreateKernel(const NodeDef& ndef,
   return s;
 }
 
-Status FunctionLibraryRuntimeImpl::FunctionDefToBody(const FunctionDef& fdef,
-                                                     AttrSlice attrs,
-                                                     FunctionBody** fbody) {
+Status FunctionLibraryRuntimeImpl::FunctionDefToBody(
+    const FunctionDef& fdef, const InstantiateAttrValueMap& attrs,
+    FunctionBody** fbody) {
   // Instantiates the function template into a graph def.
   InstantiationResult result;
   TF_RETURN_IF_ERROR(InstantiateFunction(fdef, attrs, get_func_sig_, &result));
@@ -388,13 +390,11 @@ Status FunctionLibraryRuntimeImpl::InstantiateSymbolicGradient(
     // TODO(josh11b): Should filter out the attrs from func that aren't used
     // by the gradient function.
     TF_RETURN_IF_ERROR(creator(AttrSlice(&func.attr()), &grad_fdef));
-    TF_RETURN_IF_ERROR(
-        FunctionDefToBody(grad_fdef, AttrSlice(&func.attr()), g_body));
+    TF_RETURN_IF_ERROR(FunctionDefToBody(grad_fdef, func.attr(), g_body));
   } else {
     // f is a user-defined function.
     Handle f_handle;
-    TF_RETURN_IF_ERROR(
-        Instantiate(func.name(), AttrSlice(&func.attr()), &f_handle));
+    TF_RETURN_IF_ERROR(Instantiate(func.name(), func.attr(), &f_handle));
     const FunctionBody* f_body = GetFunctionBody(f_handle);
     CHECK_NOTNULL(f_body);
     *g_body = SymbolicGradient(*f_body);
@@ -402,9 +402,9 @@ Status FunctionLibraryRuntimeImpl::InstantiateSymbolicGradient(
   return Status::OK();
 }
 
-Status FunctionLibraryRuntimeImpl::Instantiate(const string& function_name,
-                                               AttrSlice attrs,
-                                               Handle* handle) {
+Status FunctionLibraryRuntimeImpl::Instantiate(
+    const string& function_name, const InstantiateAttrValueMap& attrs,
+    Handle* handle) {
   const string key = Canonicalize(function_name, attrs);
   {
     mutex_lock l(mu_);
@@ -417,7 +417,7 @@ Status FunctionLibraryRuntimeImpl::Instantiate(const string& function_name,
   Status s;
   FunctionBody* fbody = nullptr;
   if (function_name == kGradientOp) {
-    const AttrValue* f = attrs.Find(kFuncAttr);
+    const AttrValue* f = gtl::FindOrNull(attrs, kFuncAttr);
     if (f == nullptr) {
       return errors::InvalidArgument("SymbolicGradient is missing attr: f");
     }
@@ -427,7 +427,7 @@ Status FunctionLibraryRuntimeImpl::Instantiate(const string& function_name,
     }
     const string grad = lib_def_->FindGradient(func.name());
     if (!grad.empty()) {
-      return Instantiate(grad, AttrSlice(&func.attr()), handle);
+      return Instantiate(grad, func.attr(), handle);
     }
     TF_RETURN_IF_ERROR(InstantiateSymbolicGradient(func, &fbody));
   } else {
@@ -989,12 +989,13 @@ bool ExpandInlineFunctions(FunctionLibraryRuntime* lib, Graph* graph) {
   for (Node* node : graph->nodes()) {
     VLOG(3) << "Expanding " << node->DebugString();
     bool noinline;
-    if (fld->GetAttr(*node, kNoInlineAttr, &noinline).ok() && noinline) {
+    if (fld->GetAttr(node->def(), kNoInlineAttr, &noinline).ok() && noinline) {
       VLOG(3) << "noinline: " << node->DebugString();
       continue;
     }
     FunctionLibraryRuntime::Handle handle;
-    Status s = lib->Instantiate(node->type_string(), node->attrs(), &handle);
+    Status s =
+        lib->Instantiate(node->type_string(), node->def().attr(), &handle);
     if (!s.ok()) {
       // Either "node" is a primitive op, or the instantiation failed.
       if (errors::IsNotFound(s)) {
@@ -1102,7 +1103,7 @@ FunctionBody::FunctionBody(const FunctionDef& f, DataTypeSlice arg_t,
       continue;
     }
     int index;
-    TF_CHECK_OK(GetNodeAttr(n->attrs(), "index", &index));
+    TF_CHECK_OK(GetNodeAttr(n->def(), "index", &index));
     CHECK_LE(0, index);
     CHECK_LT(index, node_vec->size());
     (*node_vec)[index] = n;
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index e27fc3898d..dfa1ed8a7e 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -40,7 +40,6 @@ limitations under the License.
 #include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
-namespace {
 
 typedef FunctionDefHelper FDH;
 
@@ -59,29 +58,13 @@ void HasError(const Status& s, const string& substr) {
       << s << ", expected substring " << substr;
 }
 
-// A helper class to make AttrSlice from initializer lists
-class Attrs {
- public:
-  Attrs(const std::initializer_list<  // NOLINT(runtime/explicit)
-        std::pair<string, FunctionDefHelper::AttrValueWrapper>>& attrs) {
-    for (const auto& aval : attrs) {
-      map_.insert({aval.first, aval.second.proto});
-    }
-  }
-
-  operator AttrSlice() { return AttrSlice(&map_); }  // NOLINT(runtime/explicit)
-
- private:
-  AttrValueMap map_;
-};
-
 class FunctionTest : public ::testing::Test {
  protected:
   FunctionTest()
       : device_(DeviceFactory::NewDevice("CPU", {},
                                          "/job:localhost/replica:0/task:0")) {}
 
-  void Create(const FunctionDef& fdef, Attrs attrs) {
+  void Create(const FunctionDef& fdef, InstantiateAttrValueSlice attrs) {
     exec_ = nullptr;
     InstantiationResult result;
     TF_CHECK_OK(InstantiateFunction(fdef, attrs, GetOpSig, &result));
@@ -168,8 +151,8 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     fdef_lib_ = lib_def_->ToProto();
   }
 
-  Status Run(const string& name, Attrs attrs, const std::vector<Tensor>& args,
-             std::vector<Tensor*> rets) {
+  Status Run(const string& name, InstantiateAttrValueSlice attrs,
+             const std::vector<Tensor>& args, std::vector<Tensor*> rets) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(name, attrs, &handle);
     if (!status.ok()) {
@@ -205,7 +188,8 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     return Status::OK();
   }
 
-  std::unique_ptr<Graph> GetFuncBody(const string& name, Attrs attrs) {
+  std::unique_ptr<Graph> GetFuncBody(const string& name,
+                                     InstantiateAttrValueSlice attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(name, attrs, &handle);
     if (!status.ok()) {
@@ -219,7 +203,8 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     return ret;
   }
 
-  std::unique_ptr<Graph> GetGradBody(const string& func, Attrs attrs) {
+  std::unique_ptr<Graph> GetGradBody(const string& func,
+                                     InstantiateAttrValueSlice attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(func, attrs, &handle);
     if (!status.ok()) {
@@ -630,14 +615,13 @@ TEST_F(FunctionLibraryRuntimeTest, Error_InstantiaionError) {
 
   // Instantiating "XTimesTwo" should fail.
   FunctionLibraryRuntime::Handle handle;
-  HasError(lib_->Instantiate("XTimesTwo", Attrs({{"T", DT_FLOAT}}), &handle),
+  HasError(lib_->Instantiate("XTimesTwo", {{"T", DT_FLOAT}}, &handle),
            "Not found: type attr not found");
 
   // But XTimesFour and XTimes16 instantiation should succeed. Only
   // when they run, they fail because XTimesTwo is bad.
-  TF_CHECK_OK(
-      lib_->Instantiate("XTimesFour", Attrs({{"T", DT_FLOAT}}), &handle));
-  TF_CHECK_OK(lib_->Instantiate("XTimes16", Attrs({{"T", DT_FLOAT}}), &handle));
+  TF_CHECK_OK(lib_->Instantiate("XTimesFour", {{"T", DT_FLOAT}}, &handle));
+  TF_CHECK_OK(lib_->Instantiate("XTimes16", {{"T", DT_FLOAT}}, &handle));
 
   auto x = test::AsTensor<float>({1, 2, 3, 4});
   Tensor y;
@@ -944,7 +928,8 @@ bool DoNothing(Graph* g) { return false; }
 GraphDef Optimize(const std::function<bool(Graph* g)>& pass,
                   const FunctionDef& fdef) {
   InstantiationResult result;
-  TF_CHECK_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
+  InstantiateAttrValueMap empty;
+  TF_CHECK_OK(InstantiateFunction(fdef, empty, GetOpSig, &result));
   std::unique_ptr<Graph> g(new Graph(OpRegistry::Global()));
   GraphConstructorOptions opts;
   opts.allow_internal_ops = true;
@@ -1263,5 +1248,4 @@ TEST(OptimizationTest, RemoveListArrayConverter_WithContolDeps) {
   TF_EXPECT_GRAPH_EQ(expected, Optimize(remove_listarray_and_identity, func));
 }
 
-}  // end namespace
 }  // end namespace tensorflow
diff --git a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
index 4e14e6fe1a..72bc37d435 100644
--- a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
+++ b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
@@ -103,13 +103,13 @@ void Benchmark::Run(int iters) { RunWithArgs({}, {}, iters); }
 
 string GetRendezvousKey(const Node* node) {
   string send_device;
-  TF_CHECK_OK(GetNodeAttr(node->attrs(), "send_device", &send_device));
+  TF_CHECK_OK(GetNodeAttr(node->def(), "send_device", &send_device));
   string recv_device;
-  TF_CHECK_OK(GetNodeAttr(node->attrs(), "recv_device", &recv_device));
+  TF_CHECK_OK(GetNodeAttr(node->def(), "recv_device", &recv_device));
   string tensor_name;
-  TF_CHECK_OK(GetNodeAttr(node->attrs(), "tensor_name", &tensor_name));
+  TF_CHECK_OK(GetNodeAttr(node->def(), "tensor_name", &tensor_name));
   uint64 send_device_incarnation;
-  TF_CHECK_OK(GetNodeAttr(node->attrs(), "send_device_incarnation",
+  TF_CHECK_OK(GetNodeAttr(node->def(), "send_device_incarnation",
                           reinterpret_cast<int64*>(&send_device_incarnation)));
   return Rendezvous::CreateKey(send_device, send_device_incarnation,
                                recv_device, tensor_name, FrameAndIter(0, 0));
diff --git a/tensorflow/core/common_runtime/parallel_concat_optimizer.cc b/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
index bbd38a2e07..ffbfbc74f1 100644
--- a/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
+++ b/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
@@ -49,11 +49,11 @@ class ParallelConcatRemovePass : public GraphOptimizationPass {
       }
     }
     for (Node* n : matches) {
-      AttrSlice n_attrs = n->attrs();
+      AttrSlice n_attrs(n->def());
       auto base_make_node = [n, g, &n_attrs](const string& op,
                                              const string& name) {
         NodeBuilder node_builder(name, op);
-        node_builder.Device(n->requested_device());
+        node_builder.Device(n->def().device());
         string colo;
         if (GetNodeAttr(n_attrs, "_class", &colo).ok()) {
           node_builder.Attr("_class", colo);
diff --git a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
index b40924ef3a..c179e94c36 100644
--- a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
+++ b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
@@ -55,7 +55,7 @@ class ResourceVariableReadPass : public GraphOptimizationPass {
     }
     for (Node* read : matches) {
       DataType dtype;
-      TF_RETURN_IF_ERROR(GetNodeAttr(read->attrs(), "dtype", &dtype));
+      TF_RETURN_IF_ERROR(GetNodeAttr(AttrSlice(read->def()), "dtype", &dtype));
       std::vector<Node*> in_control_edges;
       std::vector<std::pair<Node*, int>> in_edges;
       for (const Edge* edge : read->in_edges()) {
diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc
index ae225e8b35..8808d52d3e 100644
--- a/tensorflow/core/common_runtime/simple_placer.cc
+++ b/tensorflow/core/common_runtime/simple_placer.cc
@@ -76,7 +76,7 @@ void ColocationGroups(const Node& node,
   std::vector<string> class_specs;
   // TODO(vrv): We should consider adding a GetNodeAttr that returns a
   // StringPiece, to avoid a copy.
-  if (!GetNodeAttrSimple(node.attrs(), kColocationAttrNameStringPiece,
+  if (!GetNodeAttrSimple(node.def(), kColocationAttrNameStringPiece,
                          &class_specs)) {
     // No attribute value is equivalent to the empty colocation_group.
     *colocation_groups = {
@@ -329,7 +329,7 @@ class ColocationGraph {
         AddDebugInfo(node_root, &debug_info);
 
         DeviceNameUtils::ParsedName specified_device_name;
-        if (DeviceNameUtils::ParseFullName(node->requested_device(),
+        if (DeviceNameUtils::ParseFullName(node->def().device(),
                                            &specified_device_name) &&
             specified_device_name == members_[node_root].device_name) {
           // The specified device and merged set device match, and
@@ -348,27 +348,27 @@ class ColocationGraph {
             std::sort(device_names.begin(), device_names.end());
 
             return errors::InvalidArgument(
-                "Operation was explicitly assigned to ",
-                node->requested_device(), " but available devices are [ ",
+                "Operation was explicitly assigned to ", node->def().device(),
+                " but available devices are [ ",
                 str_util::Join(device_names, ", "), " ]. Make sure ",
                 "the device specification refers to a valid device.");
           } else if (specified_device_name.has_type) {
             return errors::InvalidArgument(
                 "Could not satisfy explicit device specification '",
-                node->requested_device(), "' because no supported kernel for ",
+                node->def().device(), "' because no supported kernel for ",
                 specified_device_name.type, " devices is available.",
                 debug_info);
           } else {
             return errors::InvalidArgument(
                 "Could not satisfy explicit device specification '",
-                node->requested_device(), debug_info);
+                node->def().device(), debug_info);
           }
         } else {
           // The specified device may be a valid device but the
           // merged set device is different, so print both.
           return errors::InvalidArgument(
               "Could not satisfy explicit device specification '",
-              node->requested_device(),
+              node->def().device(),
               "' because the node was colocated with a group of nodes that "
               "required incompatible device '",
               DeviceNameUtils::ParsedNameToString(
@@ -513,7 +513,7 @@ class ColocationGraph {
       return errors::Internal("Assigned device '", node.assigned_device_name(),
                               "' does not have registered OpKernel support "
                               "for ",
-                              node.type_string());
+                              node.def().op());
     } else {
       // This node has not yet been assigned to a device, so we
       // calculate any constraints due to the set of registered
@@ -527,25 +527,25 @@ class ColocationGraph {
           registered_device_types.insert(d->device_type());
         }
         return errors::InvalidArgument(
-            "No OpKernel was registered to support Op '", node.type_string(),
+            "No OpKernel was registered to support Op '", node.def().op(),
             "' with these attrs.  Registered devices: [",
             str_util::Join(registered_device_types, ","),
             "], Registered kernels:\n",
-            KernelsRegisteredForOp(node.type_string()));
+            KernelsRegisteredForOp(node.def().op()));
       }
 
       // If the NodeDef contains a device, then we interpret it as a
       // (partial) device specification.
-      if (!node.requested_device().empty()) {
+      if (!node.def().device().empty()) {
         // The user has specified a device in the NodeDef, try to find a
         // valid device matching their specification in the set of
         // devices.
         // NOTE: The full name may specify a device that is not in
         // n.supported_device_types(), but we check that in AssignDevice().
-        if (!DeviceNameUtils::ParseFullName(node.requested_device(),
+        if (!DeviceNameUtils::ParseFullName(node.def().device(),
                                             &member->device_name)) {
           return errors::InvalidArgument("Malformed device specification '",
-                                         node.requested_device(), "'");
+                                         node.def().device(), "'");
         }
       }
     }
@@ -644,7 +644,7 @@ Status SimplePlacer::Run() {
       continue;
     }
     status = colocation_graph.AddNode(*node);
-    if (!status.ok()) return AttachDef(status, *node);
+    if (!status.ok()) return AttachDef(status, node->def());
   }
 
   // 2. Enumerate the constraint edges, and use them to update the disjoint
@@ -707,7 +707,7 @@ Status SimplePlacer::Run() {
                                "be on the same device), but the two nodes "
                                "were assigned two different devices: ",
                                status.error_message()),
-                           *node);
+                           node->def());
         }
       }
     }
@@ -749,7 +749,7 @@ Status SimplePlacer::Run() {
       return AttachDef(
           errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
-          *node);
+          node->def());
     }
 
     // Returns the first device in sorted devices list so we will always
@@ -791,7 +791,7 @@ Status SimplePlacer::Run() {
       return AttachDef(
           errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
-          *node);
+          node->def());
     }
 
     string assigned_device = devices[0]->name();
diff --git a/tensorflow/core/debug/debug_graph_utils.cc b/tensorflow/core/debug/debug_graph_utils.cc
index f8f3d2ae50..a222dc75d7 100644
--- a/tensorflow/core/debug/debug_graph_utils.cc
+++ b/tensorflow/core/debug/debug_graph_utils.cc
@@ -223,16 +223,19 @@ Status DebugNodeInserter::InsertNodes(
 void DebugNodeInserter::DeparallelizeWhileLoops(Graph* graph, Device* device) {
   for (Node* node : graph->nodes()) {
     if (node->IsEnter()) {
-      const AttrValue* parallel_iterations =
-          node->attrs().Find("parallel_iterations");
-      if (parallel_iterations && parallel_iterations->i() > 1) {
-        LOG(INFO) << "For debugging, tfdbg is changing the "
-                  << "parallel_iterations attribute of the Enter/RefEnter "
-                  << "node \"" << node->name() << "\" on device \""
-                  << device->name() << "\" from " << parallel_iterations->i()
-                  << " to 1. (This does not affect subsequent non-debug "
-                  << "runs.)";
-        node->AddAttr<int64>("parallel_iterations", 1);
+      for (const auto& attr : node->def().attr()) {
+        if (attr.first == "parallel_iterations") {
+          if (attr.second.i() > 1) {
+            LOG(INFO) << "For debugging, tfdbg is changing the "
+                      << "parallel_iterations attribute of the Enter/RefEnter "
+                      << "node \"" << node->name() << "\" on device \""
+                      << device->name() << "\" from " << attr.second.i()
+                      << " to 1. (This does not affect subsequent non-debug "
+                      << "runs.)";
+            node->AddAttr<int64>("parallel_iterations", 1);
+          }
+          break;
+        }
       }
     }
   }
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index dddff4dce4..73758ade03 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -188,7 +188,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
                       const RunState* run_state,
                       SimpleGraphExecutionState* execution_state);
 
-  string DetailText(const Node& node, const NodeExecStats& ns) {
+  string DetailText(const NodeDef& def, const NodeExecStats& ns) {
     int64 tot = 0;
     for (auto& no : ns.output()) {
       tot += no.tensor_description().allocation_description().requested_bytes();
@@ -197,8 +197,12 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
     if (tot >= 0.1 * 1048576.0) {
       bytes = strings::Printf("[%.1fMB] ", tot / 1048576.0);
     }
-    return strings::StrCat(bytes, node.name(), " = ", node.type_string(), "(",
-                           str_util::Join(node.requested_inputs(), ", "), ")");
+    return strings::StrCat(
+        bytes, def.name(), " = ", def.op(), "(",
+        str_util::Join(
+            std::vector<StringPiece>(def.input().begin(), def.input().end()),
+            ", "),
+        ")");
   }
 
  private:
@@ -786,7 +790,7 @@ void MasterSession::ReffedClientGraph::ProcessDeviceStats(
       if (!ns.timeline_label().empty()) {
         details = ns.timeline_label();
       } else if (found_node_in_graph) {
-        details = DetailText(*node, ns);
+        details = DetailText(node->def(), ns);
       } else {
         // Leave details string empty
       }
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index 186095201d..f46bb6e2ed 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -22,7 +22,6 @@ limitations under the License.
 #include "tensorflow/core/framework/function.pb_text.h"
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op.h"
-#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
@@ -45,11 +44,12 @@ namespace {
 // Otherwise (arg_def is a simple type T), *is_type_list is set to
 // false, and *dtypes is set to a single element vector, whose only
 // element is T.
-Status ArgNumType(AttrSlice attrs, const OpDef::ArgDef& arg_def,
-                  bool* is_type_list, DataTypeVector* dtypes) {
+Status ArgNumType(const InstantiateAttrValueMap& attrs,
+                  const OpDef::ArgDef& arg_def, bool* is_type_list,
+                  DataTypeVector* dtypes) {
   dtypes->clear();
   if (!arg_def.type_list_attr().empty()) {
-    const AttrValue* v = attrs.Find(arg_def.type_list_attr());
+    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.type_list_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ",
                               arg_def.type_list_attr());
@@ -64,7 +64,7 @@ Status ArgNumType(AttrSlice attrs, const OpDef::ArgDef& arg_def,
   *is_type_list = false;
   int num = 1;
   if (!arg_def.number_attr().empty()) {
-    const AttrValue* v = attrs.Find(arg_def.number_attr());
+    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.number_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ", arg_def.type_attr());
     }
@@ -77,7 +77,7 @@ Status ArgNumType(AttrSlice attrs, const OpDef::ArgDef& arg_def,
   } else if (arg_def.type_attr().empty()) {
     dtype = DT_INVALID;
   } else {
-    const AttrValue* v = attrs.Find(arg_def.type_attr());
+    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.type_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ", arg_def.type_attr());
     }
@@ -92,17 +92,18 @@ void AddAttr(const string& name, const T& val, NodeDef* ndef) {
   SetAttrValue(val, &((*ndef->mutable_attr())[name]));
 }
 
-Status ValidateSignatureWithAttrs(const OpDef& sig, AttrSlice attr_values) {
+Status ValidateSignatureWithAttrs(const OpDef& sig,
+                                  const InstantiateAttrValueMap& attr_values) {
   // attr_values should specify all attrs defined in fdef.
   for (const auto& a : sig.attr()) {
-    const AttrValue* v = attr_values.Find(a.name());
-    if (!v) {
+    auto const iter = attr_values.find(a.name());
+    if (iter == attr_values.end()) {
       return errors::NotFound("Attr ", a.name(), " is not found from ",
                               SummarizeOpDef(sig));
     }
-    Status status = AttrValueHasType(*v, a.type());
+    Status status = AttrValueHasType(iter->second, a.type());
     if (!status.ok()) {
-      errors::AppendToMessage(&status, "for attr '", a.name(), "'");
+      errors::AppendToMessage(&status, "for attr '", iter->first, "'");
       return status;
     }
   }
@@ -145,7 +146,7 @@ class FunctionInstantiationHelper {
 
   // Builds index for nodes that can be used as node's input arguments.
   Status BuildInputArgIndex(const OpDef::ArgDef& arg_def,
-                            AttrSlice attr_values) {
+                            const InstantiateAttrValueMap& attr_values) {
     bool is_type_list;
     DataTypeVector dtypes;
     TF_RETURN_IF_ERROR(
@@ -174,7 +175,8 @@ class FunctionInstantiationHelper {
     return Status::OK();
   }
 
-  Status BuildNodeOutputIndex(const NodeDef& node, AttrSlice attrs,
+  Status BuildNodeOutputIndex(const NodeDef& node,
+                              const InstantiateAttrValueMap& attrs,
                               const int arg_index) {
     const OpDef* node_sig = nullptr;
     TF_RETURN_IF_ERROR(get_function_(node.op(), &node_sig));
@@ -204,7 +206,8 @@ class FunctionInstantiationHelper {
     return Status::OK();
   }
 
-  Status InstantiateNode(const NodeDef& fnode, AttrSlice attrs) {
+  Status InstantiateNode(const NodeDef& fnode,
+                         const InstantiateAttrValueMap& attrs) {
     const OpDef* fnode_sig = nullptr;
     TF_CHECK_OK(get_function_(fnode.op(), &fnode_sig));
     NodeDef* gnode = AddNode(fnode.name());
@@ -292,7 +295,7 @@ class FunctionInstantiationHelper {
   }
 
   Status AddReturnNode(
-      const OpDef::ArgDef& ret_def, AttrSlice attrs,
+      const OpDef::ArgDef& ret_def, const InstantiateAttrValueMap& attrs,
       const ::tensorflow::protobuf::Map<string, string>& ret_map,
       int* ret_index) {
     auto ret_iter = ret_map.find(ret_def.name());
@@ -601,7 +604,7 @@ string Print(const GraphDef& gdef) {
 
 Status AddDefaultAttrs(const string& op,
                        const GetFunctionSignature& get_function,
-                       AttrValueMap* attrs) {
+                       InstantiateAttrValueMap* attrs) {
   const OpDef* op_def = nullptr;
   TF_RETURN_IF_ERROR(get_function(op, &op_def));
   AttrSlice attr_slice(attrs);
@@ -617,7 +620,8 @@ Status AddDefaultAttrs(const string& op,
 
 }  // end namespace
 
-Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
+Status InstantiateFunction(const FunctionDef& fdef,
+                           const InstantiateAttrValueMap& attr_values,
                            GetFunctionSignature get_function,
                            InstantiationResult* result) {
   VLOG(3) << "Instantiation Function: " << Print(fdef);
@@ -635,17 +639,19 @@ Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
     }
   }
 
-  auto substitute = [attr_values](StringPiece name, AttrValue* val) {
-    if (const AttrValue* v = attr_values.Find(name)) {
-      *val = *v;
+  auto substitute = [&attr_values](const string& name, AttrValue* val) {
+    auto iter = attr_values.find(name);
+    if (iter == attr_values.end()) {
+      return false;
+    } else {
+      *val = iter->second;
       return true;
     }
-    return false;
   };
 
   // Makes a copy of all attrs in fdef and substitutes placeholders.
   // After this step, every attr is bound to a concrete value.
-  std::vector<AttrValueMap> node_attrs;
+  std::vector<InstantiateAttrValueMap> node_attrs;
   node_attrs.resize(fdef.node_def_size());
   for (int i = 0; i < fdef.node_def_size(); ++i) {
     for (auto attr : fdef.node_def(i).attr()) {
@@ -662,7 +668,7 @@ Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
   }
 
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = helper.BuildNodeOutputIndex(fdef.node_def(i), AttrSlice(&node_attrs[i]),
+    s = helper.BuildNodeOutputIndex(fdef.node_def(i), node_attrs[i],
                                     result->gdef.node_size() + i);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
@@ -671,7 +677,7 @@ Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
   }
   // Emits one gdef.node for each fdef.node_def.
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = helper.InstantiateNode(fdef.node_def(i), AttrSlice(&node_attrs[i]));
+    s = helper.InstantiateNode(fdef.node_def(i), node_attrs[i]);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
       return s;
@@ -742,7 +748,8 @@ bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2) {
   return true;
 }
 
-string Canonicalize(const string& funcname, AttrSlice attrs) {
+string Canonicalize(const string& funcname,
+                    const InstantiateAttrValueMap& attrs) {
   std::vector<string> entries;
   entries.reserve(attrs.size());
   for (auto p : attrs) {
@@ -946,7 +953,8 @@ const FunctionDef* FunctionLibraryDefinition::GetAttrImpl(
   // If ndef is SymbolicGradient[f=Foo], we use Foo's gradient or
   // Foo's attributes.
   const NameAttrList* forward_func_attrs;
-  if (!GetNodeAttr(ndef, kFuncAttr, &forward_func_attrs).ok()) {
+  if (!GetNodeAttr(AttrSlice(&ndef.attr()), kFuncAttr, &forward_func_attrs)
+           .ok()) {
     return nullptr;
   }
   const string& func_name = forward_func_attrs->name();
@@ -973,30 +981,34 @@ FunctionDefLibrary FunctionLibraryDefinition::ToProto() const {
   return lib;
 }
 
-template <typename T>
-Status FunctionLibraryDefinition::GetAttr(const NodeDef& ndef,
-                                          const string& attr, T* value) const {
-  const FunctionDef* fdef = GetAttrImpl(ndef);
-  if (fdef && GetNodeAttr(AttrSlice(&fdef->attr()), attr, value).ok()) {
-    return Status::OK();
+Status InstantiateFunction(const FunctionDef& fdef,
+                           InstantiateAttrValueSlice attr_values,
+                           GetFunctionSignature get_function,
+                           InstantiationResult* result) {
+  InstantiateAttrValueMap m;
+  for (const auto& aval : attr_values) {
+    m.insert({aval.first, aval.second.proto});
   }
-  return errors::InvalidArgument("Attr ", attr, " is not defined.");
+  return InstantiateFunction(fdef, m, std::move(get_function), result);
 }
 
-template <typename T>
-Status FunctionLibraryDefinition::GetAttr(const Node& node, const string& attr,
-                                          T* value) const {
-  return GetAttr(node.def(), attr, value);
+string Canonicalize(const string& funcname, InstantiateAttrValueSlice attrs) {
+  InstantiateAttrValueMap m;
+  for (const auto& aval : attrs) {
+    m.insert({aval.first, aval.second.proto});
+  }
+  return Canonicalize(funcname, m);
 }
 
-#define GET_ATTR(T)                                                            \
-  template Status FunctionLibraryDefinition::GetAttr(const Node&,              \
-                                                     const string&, T*) const; \
-  template Status FunctionLibraryDefinition::GetAttr(const NodeDef&,           \
-                                                     const string&, T*) const;
-GET_ATTR(string)
-GET_ATTR(bool)
-#undef GET_ATTR
+Status FunctionLibraryRuntime::Instantiate(const string& function_name,
+                                           InstantiateAttrValueSlice attrs,
+                                           Handle* handle) {
+  InstantiateAttrValueMap m;
+  for (const auto& aval : attrs) {
+    m.insert({aval.first, aval.second.proto});
+  }
+  return Instantiate(function_name, m, handle);
+}
 
 void FunctionDefHelper::AttrValueWrapper::InitFromString(StringPiece val) {
   if (val.size() >= 2 && val[0] == '$') {
diff --git a/tensorflow/core/framework/function.h b/tensorflow/core/framework/function.h
index 188c3855c6..210e5b949a 100644
--- a/tensorflow/core/framework/function.h
+++ b/tensorflow/core/framework/function.h
@@ -36,7 +36,6 @@ class CancellationManager;
 class OpKernel;
 class ResourceMgr;
 class ScopedStepContainer;
-class Node;
 
 // FunctionDefHelper::Create is a convenient helper to construct a
 // FunctionDef proto.
@@ -191,6 +190,11 @@ inline FunctionDefHelper::AttrValueWrapper::AttrValueWrapper(StringPiece val) {
 // InstantiateFunction calls "get_function" to find signatures of other
 // functions and primitive ops.
 
+// Placeholders in "fdef" is substituted based on "attr_values" here.
+typedef ::tensorflow::protobuf::Map<string, AttrValue> InstantiateAttrValueMap;
+typedef gtl::ArraySlice<std::pair<string, FunctionDefHelper::AttrValueWrapper>>
+    InstantiateAttrValueSlice;
+
 // GetFunctionSignature(func name, opdef) returns OK if the func name is found
 // and opdef is filled with a pointer to the corresponding signature
 // (a OpDef proto). Otherwise, returns an error.
@@ -202,7 +206,12 @@ struct InstantiationResult {
   DataTypeVector ret_types;
   GraphDef gdef;
 };
-Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
+Status InstantiateFunction(const FunctionDef& fdef,
+                           const InstantiateAttrValueMap& attr_values,
+                           GetFunctionSignature get_function,
+                           InstantiationResult* result);
+Status InstantiateFunction(const FunctionDef& fdef,
+                           InstantiateAttrValueSlice attr_values,
                            GetFunctionSignature get_function,
                            InstantiationResult* result);
 
@@ -232,7 +241,9 @@ bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2);
 // space. But it may be change as the implementation
 // evolves. Therefore, it should not be persisted or compared across
 // address spaces.
-string Canonicalize(const string& funcname, AttrSlice attrs);
+string Canonicalize(const string& funcname,
+                    const InstantiateAttrValueMap& attrs);
+string Canonicalize(const string& funcname, InstantiateAttrValueSlice attrs);
 
 // Represents a function call frame. I.e., the data structure used to
 // pass arguments to a function and retrieve its results.
@@ -319,16 +330,9 @@ class FunctionLibraryDefinition : public OpRegistryInterface {
   // Given a node def 'ndef', inspects attributes of the callee
   // function to derive the attribute 'value' for 'attr'. Returns OK
   // iff the attribute is given by the function's definition.
-  // TODO(irving): Remove; keep only the const Node& version.
   template <typename T>
   Status GetAttr(const NodeDef& ndef, const string& attr, T* value) const;
 
-  // Given a node, inspects attributes of the callee function to derive the
-  // attribute 'value' for 'attr'. Returns OK iff the attribute is given by the
-  // function's definition.
-  template <typename T>
-  Status GetAttr(const Node& node, const string& attr, T* value) const;
-
   // Returns a proto representation of the state of this function library.
   FunctionDefLibrary ToProto() const;
 
@@ -371,8 +375,11 @@ class FunctionLibraryRuntime {
   // Returns OK and fills in "handle" if the instantiation succeeds.
   // Otherwise returns an error and "handle" is undefined.
   typedef uint64 Handle;
-  virtual Status Instantiate(const string& function_name, AttrSlice attrs,
+  virtual Status Instantiate(const string& function_name,
+                             const InstantiateAttrValueMap& attrs,
                              Handle* handle) = 0;
+  Status Instantiate(const string& function_name,
+                     InstantiateAttrValueSlice attrs, Handle* handle);
 
   // Returns the function body for the instantiated function given its
   // handle 'h'. Returns nullptr if "h" is not found.
@@ -499,15 +506,17 @@ bool RegisterOp(const string& op, Creator func);
 Status GetOpGradientCreator(const string& op, Creator* creator);
 };
 
-// Declare explicit instantiations of GetAttr
-#define GET_ATTR(T)                                          \
-  extern template Status FunctionLibraryDefinition::GetAttr( \
-      const Node&, const string&, T*) const;                 \
-  extern template Status FunctionLibraryDefinition::GetAttr( \
-      const NodeDef&, const string&, T*) const;
-GET_ATTR(string)
-GET_ATTR(bool)
-#undef GET_ATTR
+// Implementation details.
+
+template <typename T>
+Status FunctionLibraryDefinition::GetAttr(const NodeDef& ndef,
+                                          const string& attr, T* value) const {
+  const FunctionDef* fdef = GetAttrImpl(ndef);
+  if (fdef && GetNodeAttr(AttrSlice(&fdef->attr()), attr, value).ok()) {
+    return Status::OK();
+  }
+  return errors::InvalidArgument("Attr ", attr, " is not defined.");
+}
 
 }  // end namespace tensorflow
 
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index c83ecf4e5e..07462a575e 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -29,24 +29,6 @@ limitations under the License.
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
-namespace {
-
-// A helper class to make AttrSlice from initializer lists
-class Attrs {
- public:
-  Attrs(const std::initializer_list<  // NOLINT(runtime/explicit)
-        std::pair<string, FunctionDefHelper::AttrValueWrapper>>
-            attrs) {
-    for (const auto& aval : attrs) {
-      map_.insert({aval.first, aval.second.proto});
-    }
-  }
-
-  operator AttrSlice() { return AttrSlice(&map_); }  // NOLINT(runtime/explicit)
-
- private:
-  AttrValueMap map_;
-};
 
 typedef FunctionDefHelper FDH;
 
@@ -64,6 +46,8 @@ y: A scalar in type T.
 
 )doc");
 
+static InstantiateAttrValueMap kNoAttrs;
+
 TEST(TFunc, SquarePlusOne) {
   auto fdef = FDH::Create(
       // Name
@@ -97,8 +81,7 @@ SquarePlusOne[T:{float, double, int32, int64}](x:T) -> (y:T) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(
-      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> (y:float) {
   a = Square[T=float](x)
@@ -143,8 +126,7 @@ ControlDep(x:int32) -> (y:int32) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(
-      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
   const char* e2 = R"P(
 (x:int32) -> (y:int32) {
   a = Identity[T=int32](x)
@@ -189,7 +171,8 @@ BackCompat() -> (y:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
+  TF_ASSERT_OK(
+      InstantiateFunction(fdef, InstantiateAttrValueMap{}, GetOpSig, &result));
   // Should get T=float from Op's default.
   const char* e2 = R"P(
 () -> (a:float) {
@@ -226,7 +209,7 @@ NTimesT(x:float, y:float) -> (z:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
 (x:float, y:float) -> (a:float) {
   a = AddN[N=2, T=float](x, y)
@@ -289,8 +272,8 @@ AddSquared[N:int, T:{float, double, int32, int64}](x:N*T) -> (y:T) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, Attrs({{"N", 3}, {"T", DT_FLOAT}}),
-                                   GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, {{"N", 3}, {"T", DT_FLOAT}}, GetOpSig,
+                                   &result));
   const char* e2 = R"P(
 (x_0:float, x_1:float, x_2:float) -> (y:float) {
   a = Map[N=3, T=float, U=float, func=Square[T=float]](x_0, x_1, x_2)
@@ -332,7 +315,7 @@ ControlDeps(x:float) -> () {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> () {
   a = One[T=float]() @ x
@@ -412,7 +395,7 @@ Test(i:float) -> (o:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
 (i:float) -> (o:float) {
   zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
@@ -484,7 +467,7 @@ MySelect(x:float) -> (z:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> (z:float) {
   y = Cond[Tin={float}, cond=MyCond, else_branch=MyElse, out_types={float}, then_branch=MyThen](x)
@@ -505,9 +488,8 @@ TEST(InstantiateErrors, Not_Sufficient_Attrs) {
   auto fdef =
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
-  HasError(
-      InstantiateFunction(fdef, Attrs({{"U", DT_FLOAT}}), GetOpSig, &result),
-      "Attr T is not found from ");
+  HasError(InstantiateFunction(fdef, {{"U", DT_FLOAT}}, GetOpSig, &result),
+           "Attr T is not found from ");
 }
 
 #if 0  // TODO(josh11b): Enable this test once having an extra attr is an error.
@@ -515,7 +497,7 @@ TEST(InstantiateErrors, Too_Many_Attrs) {
   auto fdef =
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, Attrs({{"T", DT_INT32}, {"U", DT_FLOAT}}),
+  HasError(InstantiateFunction(fdef, {{"T", DT_INT32}, {"U", DT_FLOAT}},
                                GetOpSig, &result),
            "Attr U is not found in ");
 }
@@ -526,7 +508,7 @@ TEST(InstantiateErrors, AttrValue_Value_Placeholder) {
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
   HasError(
-      InstantiateFunction(fdef, Attrs({{"T", "$bad"}}), GetOpSig, &result),
+      InstantiateFunction(fdef, {{"T", "$bad"}}, GetOpSig, &result),
       "AttrValue had value with unexpected type 'placeholder'\n\tfor attr 'T'");
 }
 
@@ -536,15 +518,14 @@ TEST(InstantiateErrors, Unbounded_Attr) {
                               {{"a"}, "One", {}, {{"T", "$unknown"}}, {"x"}},
                           });
   InstantiationResult result;
-  HasError(
-      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result),
-      "Failed to bind all placeholders");
+  HasError(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result),
+           "Failed to bind all placeholders");
 }
 
 TEST(InstantiateErrors, DupArgs) {
   auto fdef = FDH::Define("test", {"x:float", "x:float"}, {}, {}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Duplicated arg name");
 }
 
@@ -555,7 +536,7 @@ TEST(InstantiateErrors, Dup_Node_Names) {
                               {{"y"}, "One", {}, {{"T", DT_FLOAT}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Duplicated ret name");
 }
 
@@ -566,7 +547,7 @@ TEST(InstantiateErrors, Node_Arg_Notfound) {
                           },
                           {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "input z is not found");
 }
 
@@ -576,7 +557,7 @@ TEST(InstantiateErrors, Node_Arg_TypeMismatch) {
                               {{"y"}, "Add", {"x", "x"}, {{"T", DT_INT32}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "input x[0] expected type int32 != float, the type of x[0]");
 }
 
@@ -587,7 +568,7 @@ TEST(InstantiateErrors, Node_Arg_ControlMissing) {
                       {{"y"}, "Add", {"x", "x"}, {{"T", DT_FLOAT}}, {"z"}},
                   });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "input[2] == '^z', is not found.");
 }
 
@@ -598,7 +579,7 @@ TEST(InstantiateErrors, FuncRet_Missing) {
                           },
                           {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Return y missing");
 }
 
@@ -609,7 +590,7 @@ TEST(InstantiateErrors, FuncRet_NotFound) {
                           },
                           {{"y", "z"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Return y -> z is not found");
 }
 
@@ -620,7 +601,7 @@ TEST(InstantiateErrors, FuncRet_NameMismatch) {
                           },
                           {{"z", "x:y:0"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Return y missing");
 }
 
@@ -632,7 +613,7 @@ TEST(InstantiateErrors, FuncRet_NameMismatch) {
 //                           },
 //                           {{"y", "x:y:0"}, {"z", "x:y:0"}});
 //   InstantiationResult result;
-//   HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+//   HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
 //            "ret is not found");
 // }
 
@@ -642,7 +623,7 @@ TEST(InstantiateErrors, FuncRet_TypeMismatch) {
                               {{"y"}, "One", {}, {{"T", DT_DOUBLE}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Invalid ret types y : float vs. double\n\tIn function output y");
 }
 
@@ -668,7 +649,7 @@ TEST(InstantiateErrors, TypeList_Missing_Retval_Attr) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "type attr not found: out_types");
 }
 
@@ -695,7 +676,7 @@ TEST(InstantiateErrors, TypeList_Num_Retval_Mismatch) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Invalid ret types");
 }
 
@@ -722,7 +703,7 @@ TEST(InstantiateErrors, TypeList_Missing_Arg) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "input unknown is not found");
 }
 
@@ -743,7 +724,7 @@ TEST(InstantiateErrors, TooManyInputs) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Expected input[2] == 'x' to be a control input.");
 }
 
@@ -764,7 +745,7 @@ TEST(InstantiateErrors, TooFewInputs) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Attempt to access beyond input size: 2 >= 2");
 }
 
@@ -792,7 +773,7 @@ TEST(InstantiateErrors, TooManyInputsFromArray1) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Expected input[1] == 'y' to be a control input.");
 }
 
@@ -820,7 +801,7 @@ TEST(InstantiateErrors, TooManyInputsFromArray2) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "Input a:output too long for inputs");
 }
 
@@ -841,7 +822,7 @@ TEST(InstantiateErrors, TypeMismatch) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
            "input inputs[1] expected type float != int32, the type of y[0]");
 }
 
@@ -893,17 +874,17 @@ TEST(FunctionCallFrame, Float_Float_Float) {
 }
 
 TEST(Canonicalize, Basic) {
-  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_FLOAT},
-                                          {"transpose_a", false},
-                                          {"transpose_b", false}})),
+  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_FLOAT},
+                                    {"transpose_a", false},
+                                    {"transpose_b", false}}),
             "MatMul[T=float,transpose_a=false,transpose_b=false]");
-  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_FLOAT},
-                                          {"transpose_b", false},
-                                          {"transpose_a", false}})),
+  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_FLOAT},
+                                    {"transpose_b", false},
+                                    {"transpose_a", false}}),
             "MatMul[T=float,transpose_a=false,transpose_b=false]");
-  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_DOUBLE},
-                                          {"transpose_b", true},
-                                          {"transpose_a", false}})),
+  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_DOUBLE},
+                                    {"transpose_b", true},
+                                    {"transpose_a", false}}),
             "MatMul[T=double,transpose_a=false,transpose_b=true]");
 }
 
@@ -1167,5 +1148,4 @@ TEST(FunctionDefsEqualTest, TestFunctionDefsEqual) {
   EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
 }
 
-}  // end namespace
 }  // end namespace tensorflow
diff --git a/tensorflow/core/framework/node_def_util.cc b/tensorflow/core/framework/node_def_util.cc
index 9b737e1f72..36c0842924 100644
--- a/tensorflow/core/framework/node_def_util.cc
+++ b/tensorflow/core/framework/node_def_util.cc
@@ -25,7 +25,6 @@ limitations under the License.
 #include "tensorflow/core/framework/op_def.pb_text.h"
 #include "tensorflow/core/framework/op_def_util.h"
 #include "tensorflow/core/framework/tensor.pb_text.h"
-#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/strings/scanner.h"
@@ -37,23 +36,18 @@ namespace tensorflow {
 const char* const kColocationAttrName = "_class";
 const char* const kColocationGroupPrefix = "loc:@";
 
-AttrSlice::AttrSlice() : ndef_(nullptr) {
-  static const AttrValueMap* const kEmptyAttrValueMap = new AttrValueMap;
-  attrs_ = kEmptyAttrValueMap;
-}
-
 AttrSlice::AttrSlice(const NodeDef& node_def)
     : ndef_(&node_def), attrs_(&ndef_->attr()) {}
 
 AttrSlice::AttrSlice(const AttrValueMap* a) : ndef_(nullptr), attrs_(a) {}
 
-static string SummarizeAttrsHelper(AttrSlice attrs, StringPiece device) {
-  string ret;
+string SummarizeNodeDef(const NodeDef& node_def) {
+  string ret = strings::StrCat(node_def.name(), " = ", node_def.op(), "[");
 
   // We sort the attrs so the output is deterministic.
   std::vector<string> attr_names;
-  attr_names.reserve(attrs.size());
-  for (const auto& attr : attrs) {
+  attr_names.reserve(node_def.attr().size());
+  for (const auto& attr : node_def.attr()) {
     attr_names.push_back(attr.first);
   }
   std::sort(attr_names.begin(), attr_names.end());
@@ -61,34 +55,20 @@ static string SummarizeAttrsHelper(AttrSlice attrs, StringPiece device) {
   for (const string& attr_name : attr_names) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
-    strings::StrAppend(&ret, attr_name, "=",
-                       SummarizeAttrValue(*attrs.Find(attr_name)));
+    auto iter = node_def.attr().find(attr_name);
+    strings::StrAppend(&ret, attr_name, "=", SummarizeAttrValue(iter->second));
   }
 
   // Consider the device to be a final attr with name "_device".
-  if (!device.empty()) {
+  if (!node_def.device().empty()) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
-    strings::StrAppend(&ret, "_device=\"", device, "\"");
+    strings::StrAppend(&ret, "_device=\"", node_def.device(), "\"");
   }
-  return ret;
-}
-
-string AttrSlice::SummarizeNode() const {
-  return ndef_ ? SummarizeNodeDef(*ndef_)
-               : strings::StrCat(
-                     "[", SummarizeAttrsHelper(*this, StringPiece()), "]");
-}
-
-string SummarizeNode(const Node& node) { return SummarizeNodeDef(node.def()); }
-
-string SummarizeNodeDef(const NodeDef& node_def) {
-  string ret = strings::StrCat(node_def.name(), " = ", node_def.op(), "[");
-  strings::StrAppend(&ret, SummarizeAttrsHelper(node_def, node_def.device()));
   strings::StrAppend(&ret, "](");
 
   // Output inputs, including control inputs, verbatim.
-  bool first = true;
+  first = true;
   for (const string& input : node_def.input()) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
@@ -129,28 +109,12 @@ Status AttrSlice::Find(StringPiece attr_name,
   // Skip AttachDef for internal attrs since it is a little bit
   // expensive and it is common for them to correctly not be included
   // in a NodeDef.
-  if (!attr_name.starts_with("_") && ndef_ != nullptr) {
+  if (!StringPiece(attr_name).starts_with("_") && ndef_) {
     s = AttachDef(s, *ndef_);
   }
   return s;
 }
 
-bool AttrSlice::EqualAttrs(AttrSlice other, Scratch* scratch) const {
-  if (size() != other.size()) return false;
-
-  for (const auto& attr : *other.attrs_) {
-    auto iter = attrs_->find(attr.first);
-    if (iter == attrs_->end()) return false;
-    // TODO(irving): Comparing AttrValues by proto is slightly buggy, since
-    // TensorProto is a nonunique representation of Tensor.  This bug will go
-    // away once AttrSlice switches over to NodeInfo.
-    iter->second.SerializeToString(&scratch->a);
-    attr.second.SerializeToString(&scratch->b);
-    if (scratch->a != scratch->b) return false;
-  }
-  return true;
-}
-
 // The ... is to allow the caller to inject some value validation code.  Use
 // just ; if no additional validation code is needed.
 #define DEFINE_GET_ATTR(TYPE, FIELD, ATTR_TYPE, APPEND_OP, CAST, ...)         \
@@ -377,14 +341,14 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
     if (StringPiece(input).starts_with("^")) {
       seen_control = true;
       if (input.find(':') != string::npos) {
-        return errors::InvalidArgument(
-            "Control input '", input,
-            "' must not have ':' in NodeDef: ", SummarizeNodeDef(node_def));
+        return errors::InvalidArgument("Control input '", input,
+                                       "' must not have ':' in NodeDef: ",
+                                       SummarizeNodeDef(node_def));
       }
     } else if (seen_control) {
-      return errors::InvalidArgument(
-          "Non-control input '", input,
-          "' after control input in NodeDef: ", SummarizeNodeDef(node_def));
+      return errors::InvalidArgument("Non-control input '", input,
+                                     "' after control input in NodeDef: ",
+                                     SummarizeNodeDef(node_def));
     } else {
       ++num_inputs;
     }
@@ -394,8 +358,8 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
   for (const auto& attr : op_def.attr()) {
     if (!gtl::InsertIfNotPresent(&op_attrs, attr.name(), &attr)) {
       return errors::InvalidArgument("OpDef has duplicate attr name '",
-                                     attr.name(),
-                                     "': ", SummarizeOpDef(op_def));
+                                     attr.name(), "': ",
+                                     SummarizeOpDef(op_def));
     }
   }
   for (const auto& attr : node_def.attr()) {
@@ -419,9 +383,8 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
           "with your GraphDef-generating binary.).");
     }
     TF_RETURN_WITH_CONTEXT_IF_ERROR(
-        ValidateAttrValue(attr.second, *iter->second),
-        "; NodeDef: ", SummarizeNodeDef(node_def), "; ",
-        SummarizeOpDef(op_def));
+        ValidateAttrValue(attr.second, *iter->second), "; NodeDef: ",
+        SummarizeNodeDef(node_def), "; ", SummarizeOpDef(op_def));
     // Keep track of which attr names have (not) been found in the NodeDef.
     op_attrs.erase(iter);
   }
@@ -468,9 +431,9 @@ Status ComputeArgRange(const NodeDef& node_def, const OpDef::ArgDef& arg_def,
   } else if (!arg_def.type_attr().empty() || arg_def.type() != DT_INVALID) {
     *num = 1;
   } else {
-    return errors::InvalidArgument(
-        "Argument '", arg_def.name(),
-        "' incorrectly specified in op definition: ", SummarizeOpDef(op_def));
+    return errors::InvalidArgument("Argument '", arg_def.name(),
+                                   "' incorrectly specified in op definition: ",
+                                   SummarizeOpDef(op_def));
   }
   return Status::OK();
 }
@@ -502,11 +465,6 @@ Status NameRangesForNode(const NodeDef& node_def, const OpDef& op_def,
   return Status::OK();
 }
 
-Status NameRangesForNode(const Node& node, const OpDef& op_def,
-                         NameRangeMap* inputs, NameRangeMap* outputs) {
-  return NameRangesForNode(node.def(), op_def, inputs, outputs);
-}
-
 void AddDefaultsToNodeDef(const OpDef& op_def, NodeDef* node_def) {
   for (const auto& attr_def : op_def.attr()) {
     AttrSlice attrs(*node_def);
@@ -607,8 +565,4 @@ Status AttachDef(const Status& status, const NodeDef& node_def) {
   return ret;
 }
 
-Status AttachDef(const Status& status, const Node& node) {
-  return AttachDef(status, node.def());
-}
-
 }  // namespace tensorflow
diff --git a/tensorflow/core/framework/node_def_util.h b/tensorflow/core/framework/node_def_util.h
index 1438abdec6..018e4d15f2 100644
--- a/tensorflow/core/framework/node_def_util.h
+++ b/tensorflow/core/framework/node_def_util.h
@@ -29,8 +29,6 @@ limitations under the License.
 
 namespace tensorflow {
 
-class Node;
-
 // Name of the attribute used to encode node colocation constraints.
 //
 // Nodes can be co-located on the same device. Desire for explicit co-location
@@ -41,9 +39,8 @@ extern const char* const kColocationAttrName;
 // String prefix applied to the operation name for colocation constraints.
 extern const char* const kColocationGroupPrefix;
 
-// Produce a human-readable version of a Node or NodeDef that is more concise
+// Produce a human-readable version of a NodeDef that is more concise
 // than a text-format proto.
-string SummarizeNode(const Node& node);
 string SummarizeNodeDef(const NodeDef& node_def);
 
 typedef protobuf::Map<string, AttrValue> AttrValueMap;
@@ -81,11 +78,8 @@ class AttrSlice {
  public:
   AttrSlice(const NodeDef& node_def);  // NOLINT(runtime/explicit)
 
-  AttrSlice();  // Empty
   explicit AttrSlice(const AttrValueMap* a);
 
-  int size() const { return attrs_->size(); }
-
   // Returns the attr with attr_name if found.  Otherwise, returns
   // nullptr.
   const AttrValue* Find(StringPiece attr_name) const;
@@ -94,33 +88,6 @@ class AttrSlice {
   // NotFound status.
   Status Find(StringPiece attr_name, const AttrValue** attr_value) const;
 
-  // Helper class to avoid allocations in EqualAttrs.
-  // TODO(irving): Will go away once NodeInfo is used.
-  struct Scratch {
-    string a;
-    string b;
-  };
-
-  // Check if all attrs and attr values match.  Does not take defaults into
-  // account.
-  //
-  // TODO(irving): There is a bug in this routine inherited from its
-  // OptimizerCSE::EqualAttrs precedecessor.  The same tensor attr can be
-  // represented in more than one way as an AttrValue, since TensorProto is
-  // not 1-1.  This bug will go away once I replace everything with NodeInfo,
-  // which stores a Tensor object directly.  The Scratch object will also go
-  // away.
-  bool EqualAttrs(AttrSlice other, Scratch* scratch) const;
-
-  // If this AttrSlice has an attached NodeDef, summarize it.  This is for
-  // error messages only: we intentionally do not provide direct access to the
-  // NodeDef, since it is not always there.
-  string SummarizeNode() const;
-
-  // Iteration over all attrs
-  AttrValueMap::const_iterator begin() const { return attrs_->begin(); }
-  AttrValueMap::const_iterator end() const { return attrs_->end(); }
-
  private:
   const NodeDef* ndef_;
   const AttrValueMap* attrs_;
@@ -216,12 +183,9 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def);
 // corresponding input/output index range.  For example,
 // input "foo" corresponds to input indices
 //   [ (*inputs)["foo"].first, (*inputs)["foo"].second ).
-// TODO(irving): Remove the NodeDef version; keep only the Node version.
 typedef std::unordered_map<string, std::pair<int, int>> NameRangeMap;
 Status NameRangesForNode(const NodeDef& node_def, const OpDef& op_def,
                          NameRangeMap* inputs, NameRangeMap* outputs);
-Status NameRangesForNode(const Node& node, const OpDef& op_def,
-                         NameRangeMap* inputs, NameRangeMap* outputs);
 
 // Adds default values to *node_def for unspecified attrs from op_def.
 void AddDefaultsToNodeDef(const OpDef& op_def, NodeDef* node_def);
@@ -242,7 +206,6 @@ Status ValidateExternalNodeDefSyntax(const NodeDef& node_def);
 // Returns "status" with kernel's NodeDef attached as additional text
 // in the error message.
 Status AttachDef(const Status& status, const NodeDef& node_def);
-Status AttachDef(const Status& status, const Node& node);
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 6c3917c686..422ee80720 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -27,7 +27,6 @@ limitations under the License.
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op_def_util.h"
 #include "tensorflow/core/framework/types.h"
-#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/notification.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
@@ -843,10 +842,13 @@ bool InTypeList(DataType dt, const AttrValue& type_list) {
   return false;
 }
 
-// Returns whether the attrs satisfy the constraints in the kernel_def.  Returns
-// an error if attrs in kernel_def are not found, or have a mismatching type.
-Status AttrsMatch(AttrSlice attrs, const KernelDef& kernel_def, bool* match) {
+// Returns whether the attrs in the NodeDef satisfy the constraints in
+// the kernel_def.  Returns an error if attrs in kernel_def are not
+// found, or have a mismatching type.
+Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
+                  bool* match) {
   *match = false;
+  AttrSlice attrs(node_def);
   for (const auto& constraint : kernel_def.constraint()) {
     if (constraint.allowed_values().list().type_size() == 0) {
       return errors::Unimplemented(
@@ -870,7 +872,7 @@ Status AttrsMatch(AttrSlice attrs, const KernelDef& kernel_def, bool* match) {
               "' that has value '", SummarizeAttrValue(*found),
               "' that does not have type 'type' or 'list(type)' in NodeDef "
               "'",
-              attrs.SummarizeNode(), "'");
+              SummarizeNodeDef(node_def), "'");
         }
 
         for (int t : found->list().type()) {
@@ -883,7 +885,7 @@ Status AttrsMatch(AttrSlice attrs, const KernelDef& kernel_def, bool* match) {
     } else {
       return errors::InvalidArgument(
           "OpKernel '", kernel_def.op(), "' has constraint on attr '",
-          constraint.name(), "' not in NodeDef '", attrs.SummarizeNode(),
+          constraint.name(), "' not in NodeDef '", SummarizeNodeDef(node_def),
           "', KernelDef: '", ProtoShortDebugString(kernel_def), "'");
     }
   }
@@ -893,7 +895,6 @@ Status AttrsMatch(AttrSlice attrs, const KernelDef& kernel_def, bool* match) {
 
 static const StringPiece kKernelAttr("_kernel");
 
-// TODO(irving): Replace with const Node& version below.
 Status FindKernelRegistration(const DeviceType& device_type,
                               const NodeDef& node_def,
                               const KernelRegistration** reg,
@@ -926,16 +927,8 @@ Status FindKernelRegistration(const DeviceType& device_type,
   return Status::OK();
 }
 
-Status FindKernelRegistration(const DeviceType& device_type, const Node& node,
-                              const KernelRegistration** reg,
-                              bool* was_attr_mismatch) {
-  return FindKernelRegistration(device_type, node.def(), reg,
-                                was_attr_mismatch);
-}
-
 }  // namespace
 
-// TODO(irving): Change const NodeDef& to const Node&
 Status FindKernelDef(const DeviceType& device_type, const NodeDef& node_def,
                      const KernelDef** def, string* kernel_class_name) {
   const KernelRegistration* reg = nullptr;
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index d064a8ec4d..cebadcc5b4 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -184,8 +184,8 @@ class InferenceContext {
     }
 #ifndef NDEBUG
     for (int i = 0; i < num_outputs(); ++i) {
-      DCHECK(output(i).IsSet())
-          << i << " for " << node_def_.name() << " of type " << node_def_.op();
+      DCHECK(output(i).IsSet()) << i << " for " << node_def().name()
+                                << " of type " << node_def().op();
     }
 #endif  // NDEBUG
     return s;
@@ -394,6 +394,11 @@ class InferenceContext {
   // the value.
   Status MakeDimForScalarInput(int idx, DimensionHandle* out);
 
+  // Returns the NodeDef. The returned reference does not outlive the
+  // InferenceContext, and it should not be used after InferenceContext is
+  // destroyed.
+  const NodeDef& node_def() { return node_def_; }
+
   // Look up the attr for the NodeDef being evaluated with name attr_name and
   // set *value to its value.  If no attr with attr_name is found in def(), or
   // the attr does not have a matching type, a non-ok status will be returned.
diff --git a/tensorflow/core/graph/control_flow.cc b/tensorflow/core/graph/control_flow.cc
index db6683d1e7..8409fb4cd0 100644
--- a/tensorflow/core/graph/control_flow.cc
+++ b/tensorflow/core/graph/control_flow.cc
@@ -88,7 +88,7 @@ Status BuildControlFlowInfo(Graph* g, std::vector<ControlFlowInfo>* info) {
           out_info->frame = out;
           out_info->parent_frame = frame;
           TF_RETURN_IF_ERROR(
-              GetNodeAttr(out->attrs(), "frame_name", &out_info->frame_name));
+              GetNodeAttr(out->def(), "frame_name", &out_info->frame_name));
           if (out_info->frame_name.empty()) {
             return errors::InvalidArgument("The Enter node ", out->name(),
                                            " must have a frame name.");
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index 9066de5668..d765959ca0 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -78,7 +78,7 @@ string Node::DebugString() const {
   } else {
     strings::StrAppend(&ret, " op device:");
     strings::StrAppend(&ret, "{", assigned_device_name_, "}");
-    strings::StrAppend(&ret, " def:{", SummarizeNode(*this), "}}");
+    strings::StrAppend(&ret, " def:{", SummarizeNodeDef(def()), "}}");
   }
   return ret;
 }
@@ -474,7 +474,7 @@ void Graph::ToGraphDefSubRange(GraphDef* graph_def, int from_node_id) const {
     for (size_t i = 0; i < inputs.size(); ++i) {
       const Edge* edge = inputs[i];
       if (edge == nullptr) {
-        node_def->add_input(node->requested_inputs()[i]);
+        node_def->add_input(node->def().input(i));
       } else {
         const Node* src = edge->src();
         if (!src->IsOp()) continue;
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index 8554cb2f4b..ac22dfc324 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -71,7 +71,6 @@ class Node {
   int cost_id() const { return cost_id_; }
   const string& name() const { return props_->node_def_.name(); }
   const string& type_string() const { return props_->node_def_.op(); }
-
   // def() provides the NodeDef the user supplied, but the specifics
   // of this Node may have changed due to placement, optimization, etc.
   // In particular:
@@ -81,7 +80,6 @@ class Node {
   // * def().device() is the "user's requested device" and may not match
   //   the actual assigned device, see assigned_device_name() below;
   // * def().attr() is authoritative.
-  // TODO(irving): Replace with NodeInfo.
   const NodeDef& def() const { return props_->node_def_; }
   const OpDef& op_def() const { return *props_->op_def_; }
 
@@ -94,10 +92,6 @@ class Node {
   DataType output_type(int32 o) const { return props_->output_types_[o]; }
   const DataTypeVector& output_types() const { return props_->output_types_; }
 
-  // The device requested by the user.  For the actual assigned device,
-  // use assigned_device_name() below.
-  const string& requested_device() const { return def().device(); }
-
   // This gives the device the runtime has assigned this node to.  If
   // you want the device the user requested, use def().device() instead.
   // TODO(josh11b): Validate that the assigned_device, if not empty:
@@ -109,14 +103,6 @@ class Node {
     assigned_device_name_ = device_name;
   }
 
-  // Read only access to attributes
-  AttrSlice attrs() const { return AttrSlice(def()); }
-
-  // Inputs requested by the NodeDef.  For the actual inputs, use in_edges.
-  const protobuf::RepeatedPtrField<string>& requested_inputs() const {
-    return def().input();
-  }
-
   // Get the neighboring nodes via edges either in or out of this node.
   gtl::iterator_range<NeighborIter> in_nodes() const;
   gtl::iterator_range<NeighborIter> out_nodes() const;
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
index 70087b8fe1..9d4a0a52f7 100644
--- a/tensorflow/core/graph/graph_constructor.cc
+++ b/tensorflow/core/graph/graph_constructor.cc
@@ -424,7 +424,7 @@ Status GraphConstructor::ValidateShape(Node* node) {
   // For nodes with the _output_shapes atttribute, override the shape.
   std::vector<TensorShapeProto> shape_attrs;
   const char* kAttrName = "_output_shapes";
-  if (!GetNodeAttr(node->attrs(), kAttrName, &shape_attrs).ok()) {
+  if (!GetNodeAttr(node->def(), kAttrName, &shape_attrs).ok()) {
     // No _output_shapes attribute, the AddNode call above was sufficient.
     return Status::OK();
   }
@@ -458,7 +458,7 @@ Status GraphConstructor::ValidateShape(Node* node) {
       // functions that are not critical to correct execution but
       // would cause graphs to fail if imported after correcting.
       //
-      const string& op = node->type_string();
+      const string& op = node->def().op();
       const std::vector<string> whitelist = {
           // To be removed after 2017/03/08.
           "RandomShuffleQueue", "PaddingFIFOQueue", "FIFOQueue",
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index 6013b2ff51..e3b7f322cb 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -146,7 +146,7 @@ class GraphConstructorTest : public ::testing::Test {
       return "";
     }
     std::vector<string> value;
-    Status s = GetNodeAttr(n->attrs(), kColocationAttrName, &value);
+    Status s = GetNodeAttr(n->def(), kColocationAttrName, &value);
     if (!s.ok()) {
       return "";
     }
@@ -997,7 +997,7 @@ TEST_F(GraphConstructorTest, ImportGraphDef_DefaultAttrs) {
   }
   ASSERT_TRUE(a != nullptr);
   int value = 0;
-  s = GetNodeAttr(a->attrs(), "default_int", &value);
+  s = GetNodeAttr(a->def(), "default_int", &value);
   ASSERT_EQ(Status::OK(), s) << s << " -- " << a->def().DebugString();
   EXPECT_EQ(31415, value);
 }
@@ -1201,9 +1201,9 @@ TEST_F(GraphConstructorTest, ImportGraphDef_InputMap) {
 
   // Check that t1's NodeDef is consistent with graph
   Node* t1 = FindNode("t1");
-  ASSERT_EQ(t1->requested_inputs().size(), 2);
-  ASSERT_EQ(t1->requested_inputs()[0], "input:1");
-  ASSERT_EQ(t1->requested_inputs()[1], "input:0");
+  ASSERT_EQ(t1->def().input_size(), 2);
+  ASSERT_EQ(t1->def().input(0), "input:1");
+  ASSERT_EQ(t1->def().input(1), "input:0");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithPrefix) {
@@ -1254,19 +1254,19 @@ TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithPrefix) {
 
   // Check that NodeDefs are consistent with graph
   Node* t1 = FindNode("import/t1");
-  ASSERT_EQ(t1->requested_inputs().size(), 2);
-  EXPECT_EQ(t1->requested_inputs()[0], "input:0");
-  EXPECT_EQ(t1->requested_inputs()[1], "input:0");
+  ASSERT_EQ(t1->def().input_size(), 2);
+  EXPECT_EQ(t1->def().input(0), "input:0");
+  EXPECT_EQ(t1->def().input(1), "input:0");
 
   Node* t2 = FindNode("import/t2");
-  ASSERT_EQ(t2->requested_inputs().size(), 2);
-  EXPECT_EQ(t2->requested_inputs()[0], "import/t1:0");
-  EXPECT_EQ(t2->requested_inputs()[1], "import/t1:0");
+  ASSERT_EQ(t2->def().input_size(), 2);
+  EXPECT_EQ(t2->def().input(0), "import/t1:0");
+  EXPECT_EQ(t2->def().input(1), "import/t1:0");
 
   Node* t3 = FindNode("import/t3");
-  ASSERT_EQ(t3->requested_inputs().size(), 2);
-  EXPECT_EQ(t3->requested_inputs()[0], "import/unmapped_input:0");
-  EXPECT_EQ(t3->requested_inputs()[1], "import/unmapped_input:1");
+  ASSERT_EQ(t3->def().input_size(), 2);
+  EXPECT_EQ(t3->def().input(0), "import/unmapped_input:0");
+  EXPECT_EQ(t3->def().input(1), "import/unmapped_input:1");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithControlEdges) {
@@ -1795,24 +1795,24 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ControlDeps) {
 
   // Test that node defs are consistent with graph
   Node* w1 = FindNode("import/W1");
-  ASSERT_EQ(w1->requested_inputs().size(), 2);
-  EXPECT_EQ(w1->requested_inputs()[0], "^W1");
-  EXPECT_EQ(w1->requested_inputs()[1], "^W2");
+  ASSERT_EQ(w1->def().input_size(), 2);
+  EXPECT_EQ(w1->def().input(0), "^W1");
+  EXPECT_EQ(w1->def().input(1), "^W2");
 
   Node* input = FindNode("import/input");
-  ASSERT_EQ(input->requested_inputs().size(), 2);
-  EXPECT_EQ(input->requested_inputs()[0], "^W1");
-  EXPECT_EQ(input->requested_inputs()[1], "^W2");
+  ASSERT_EQ(input->def().input_size(), 2);
+  EXPECT_EQ(input->def().input(0), "^W1");
+  EXPECT_EQ(input->def().input(1), "^W2");
 
   Node* input2 = FindNode("import/input2");
-  ASSERT_EQ(input2->requested_inputs().size(), 2);
-  EXPECT_EQ(input2->requested_inputs()[0], "^W1");
-  EXPECT_EQ(input2->requested_inputs()[1], "^W2");
+  ASSERT_EQ(input2->def().input_size(), 2);
+  EXPECT_EQ(input2->def().input(0), "^W1");
+  EXPECT_EQ(input2->def().input(1), "^W2");
 
   Node* t1 = FindNode("import/t1");
-  ASSERT_EQ(t1->requested_inputs().size(), 2);
-  EXPECT_EQ(t1->requested_inputs()[0], "import/input:0");
-  EXPECT_EQ(t1->requested_inputs()[1], "import/input:1");
+  ASSERT_EQ(t1->def().input_size(), 2);
+  EXPECT_EQ(t1->def().input(0), "import/input:0");
+  EXPECT_EQ(t1->def().input(1), "import/input:1");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsWithCycle) {
@@ -1856,15 +1856,15 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsWithCycle) {
 
   // Test that node defs are consistent with graph
   Node* merge = FindNode("merge");
-  ASSERT_EQ(merge->requested_inputs().size(), 3);
-  EXPECT_EQ(merge->requested_inputs()[0], "input:0");
-  EXPECT_EQ(merge->requested_inputs()[1], "t1:0");
-  EXPECT_EQ(merge->requested_inputs()[2], "^W1");
+  ASSERT_EQ(merge->def().input_size(), 3);
+  EXPECT_EQ(merge->def().input(0), "input:0");
+  EXPECT_EQ(merge->def().input(1), "t1:0");
+  EXPECT_EQ(merge->def().input(2), "^W1");
 
   Node* t1 = FindNode("t1");
-  ASSERT_EQ(t1->requested_inputs().size(), 2);
-  EXPECT_EQ(t1->requested_inputs()[0], "merge:0");
-  EXPECT_EQ(t1->requested_inputs()[1], "merge:0");
+  ASSERT_EQ(t1->def().input_size(), 2);
+  EXPECT_EQ(t1->def().input(0), "merge:0");
+  EXPECT_EQ(t1->def().input(1), "merge:0");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsErrors) {
diff --git a/tensorflow/core/graph/graph_partition.cc b/tensorflow/core/graph/graph_partition.cc
index 57a2f399e0..c7ad6a1e77 100644
--- a/tensorflow/core/graph/graph_partition.cc
+++ b/tensorflow/core/graph/graph_partition.cc
@@ -356,7 +356,7 @@ string ControlLoopName(const string& name) {
 }
 
 bool IsControlLoop(const Node* node) {
-  const string& name = node->name();
+  const string& name = node->def().name();
   return StringPiece(name).starts_with("_cloop");
 }
 
@@ -468,7 +468,7 @@ Status AddControlLoop(const PartitionOptions& opts, Graph* g, const Node* src,
   const string& device_name = edge->dst()->assigned_device_name();
   const string& frame_name = src_info.frame_name;
   int parallel_iterations;
-  status = GetNodeAttr(src_info.frame->attrs(), "parallel_iterations",
+  status = GetNodeAttr(src_info.frame->def(), "parallel_iterations",
                        &parallel_iterations);
   if (!status.ok()) return status;
 
@@ -903,11 +903,11 @@ Status Partition(const PartitionOptions& opts, Graph* g,
           send_start_time = opts.start_times[src->id()].value();
           recv_start_time = opts.start_times[dst->id()].value();
         } else {
-          status = GetNodeAttr(src->attrs(), "_start_time", &send_start_time);
+          status = GetNodeAttr(src->def(), "_start_time", &send_start_time);
           if (!status.ok()) {
             return status;
           }
-          status = GetNodeAttr(dst->attrs(), "_start_time", &recv_start_time);
+          status = GetNodeAttr(dst->def(), "_start_time", &recv_start_time);
           if (!status.ok()) {
             return status;
           }
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index 89784c631f..4afc878f76 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -318,21 +318,21 @@ TEST_F(GraphTest, AddAttr) {
   n1->AddAttr("_a", "new_attr");
 
   string attr;
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
 
   Node* n2 = graph_.CopyNode(n1);
 
   n1->AddAttr("_b", "new_attr_2");
 
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_b", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_b", &attr));
   EXPECT_EQ("new_attr_2", attr);
 
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n2->attrs(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n2->def(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
-  EXPECT_NE(Status::OK(), GetNodeAttr(n2->attrs(), "_b", &attr));
+  EXPECT_NE(Status::OK(), GetNodeAttr(n2->def(), "_b", &attr));
 }
 
 // Convert edge iteration results into a sorted string.
diff --git a/tensorflow/core/graph/optimizer_cse.cc b/tensorflow/core/graph/optimizer_cse.cc
index a22a9b3fa3..a679eac0e7 100644
--- a/tensorflow/core/graph/optimizer_cse.cc
+++ b/tensorflow/core/graph/optimizer_cse.cc
@@ -56,9 +56,11 @@ class OptimizerCSE {
   bool Optimize(const std::function<bool(const Node*)>& consider_fn);
 
  private:
+  struct Scratch;
+
   static size_t NodeHash(const Node* n);
-  static bool Equivalent(const Node* a, const Node* b,
-                         AttrSlice::Scratch* scratch);
+  static bool Equivalent(const Node* a, const Node* b, Scratch* s);
+  static bool EqualAttrs(const Node* a, const Node* b, Scratch* s);
 
   Graph* g_;
 };
@@ -108,7 +110,7 @@ size_t OptimizerCSE::NodeHash(const Node* n) {
   // Hash the attrs.  For example, this makes sure different constants
   // end up in different hash buckets.
   string tmp;
-  for (const auto& attr : n->attrs()) {
+  for (const auto& attr : n->def().attr()) {
     tmp = attr.first;
     attr.second.AppendToString(&tmp);
     // Add hashes of attrs, so the order of attrs doesn't matter.
@@ -120,6 +122,28 @@ size_t OptimizerCSE::NodeHash(const Node* n) {
   return h;
 }
 
+struct OptimizerCSE::Scratch {
+  // For EqualAttrs():
+  string a;
+  string b;
+};
+
+bool OptimizerCSE::EqualAttrs(const Node* a, const Node* b, Scratch* scratch) {
+  if (a->def().attr_size() != b->def().attr_size()) return false;
+
+  for (const auto& attr : b->def().attr()) {
+    auto iter = a->def().attr().find(attr.first);
+    if (iter == a->def().attr().end()) return false;
+    // Note: it should be safe to compare proto serializations of the attr
+    // values since at most one field should be set in each (indeed, it
+    // should be the same field).
+    iter->second.SerializeToString(&scratch->a);
+    attr.second.SerializeToString(&scratch->b);
+    if (scratch->a != scratch->b) return false;
+  }
+  return true;
+}
+
 static bool HasRefInput(const Node* n) {
   for (auto dt : n->input_types()) {
     if (IsRefType(dt)) return true;
@@ -127,8 +151,7 @@ static bool HasRefInput(const Node* n) {
   return false;
 }
 
-bool OptimizerCSE::Equivalent(const Node* a, const Node* b,
-                              AttrSlice::Scratch* scratch) {
+bool OptimizerCSE::Equivalent(const Node* a, const Node* b, Scratch* scratch) {
   // Different op names are different
   if (a->type_string() != b->type_string()) return false;
 
@@ -141,7 +164,7 @@ bool OptimizerCSE::Equivalent(const Node* a, const Node* b,
 
   // Compare attrs.  Note that equal attrs implies equal input and
   // output types.
-  if (!a->attrs().EqualAttrs(b->attrs(), scratch)) return false;
+  if (!EqualAttrs(a, b, scratch)) return false;
 
   // Compare input sources
   if (a->num_inputs() != b->num_inputs()) return false;
@@ -183,7 +206,7 @@ bool OptimizerCSE::Optimize(
   // Scratch space for Equivalent calls.  Allocated here and passed in to
   // Equivalent to avoid allocation inside the loop below.
   bool changed = false;
-  AttrSlice::Scratch scratch;
+  Scratch scratch;
   for (Node* n : order) {
     if (!n->IsOp()) continue;
 
diff --git a/tensorflow/core/graph/quantize_training.cc b/tensorflow/core/graph/quantize_training.cc
index 4a479d3258..e3ef5e2f0c 100644
--- a/tensorflow/core/graph/quantize_training.cc
+++ b/tensorflow/core/graph/quantize_training.cc
@@ -192,9 +192,9 @@ Status ConnectVariablesToSaveOp(Graph* graph, Node* save_op,
   Tensor tensor_names;
   Tensor shape_and_slices;
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(tensor_names_op->attrs(), "value", &tensor_names));
-  TF_RETURN_IF_ERROR(
-      GetNodeAttr(shape_and_slices_op->attrs(), "value", &shape_and_slices));
+      GetNodeAttr(AttrSlice(tensor_names_op->def()), "value", &tensor_names));
+  TF_RETURN_IF_ERROR(GetNodeAttr(AttrSlice(shape_and_slices_op->def()), "value",
+                                 &shape_and_slices));
 
   int tn_size = tensor_names.NumElements();
   int var_size = added_variables.size();
diff --git a/tensorflow/core/graph/quantize_training_test.cc b/tensorflow/core/graph/quantize_training_test.cc
index d817d980de..9cbb928c11 100644
--- a/tensorflow/core/graph/quantize_training_test.cc
+++ b/tensorflow/core/graph/quantize_training_test.cc
@@ -112,15 +112,17 @@ TEST_F(QuantizeTrainingTest, SignedInput) {
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(identity->name(), "/QuantizeAndDequantizeV2"),
                &identity_q_node));
+  NodeDef identity_q = identity_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(*identity_q_node->attrs().Find("signed_input")));
+            SummarizeAttrValue(identity_q.attr().find("signed_input")->second));
   // Quantize_and_dequantize node for relu should have signed_input==false.
   Node* relu_q_node;
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu->name(), "/QuantizeAndDequantizeV2"),
                &relu_q_node));
+  NodeDef relu_q = relu_q_node->def();
   ASSERT_EQ("false",
-            SummarizeAttrValue(*relu_q_node->attrs().Find("signed_input")));
+            SummarizeAttrValue(relu_q.attr().find("signed_input")->second));
 }
 
 TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
@@ -163,15 +165,17 @@ TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu6->name(), "/QuantizeAndDequantizeV2"),
                &relu6_q_node));
+  NodeDef identity_q = relu6_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(*relu6_q_node->attrs().Find("range_given")));
+            SummarizeAttrValue(identity_q.attr().find("range_given")->second));
   // Quantize_and_dequantize node for relu should have range_given==true.
   Node* relu_q_node;
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu->name(), "/QuantizeAndDequantizeV2"),
                &relu_q_node));
+  NodeDef relu_q = relu_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(*relu_q_node->attrs().Find("range_given")));
+            SummarizeAttrValue(relu_q.attr().find("range_given")->second));
 }
 
 TEST_F(QuantizeTrainingTest, WithBackwardNodes_QuantizeAndDequantize) {
diff --git a/tensorflow/core/graph/subgraph.cc b/tensorflow/core/graph/subgraph.cc
index e10b692889..9849d9a159 100644
--- a/tensorflow/core/graph/subgraph.cc
+++ b/tensorflow/core/graph/subgraph.cc
@@ -106,7 +106,7 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
     // Copy the _output_shapes from the original node to the feed node,
     // if any.
     std::vector<PartialTensorShape> output_shapes;
-    if (GetNodeAttr(n->attrs(), "_output_shapes", &output_shapes).ok()) {
+    if (GetNodeAttr(n->def(), "_output_shapes", &output_shapes).ok()) {
       if (n->num_outputs() != output_shapes.size()) {
         return errors::InvalidArgument(
             "FeedInputs: ", t,
@@ -129,8 +129,8 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
       if (e->src_output() == id.second) {
         to_remove.emplace_back(e);
       } else if (e->src_output() == Graph::kControlSlot &&
-                 (n->type_string() == "Placeholder" ||
-                  n->type_string() == "PlaceholderV2")) {
+                 (n->def().op() == "Placeholder" ||
+                  n->def().op() == "PlaceholderV2")) {
         // When feeding a Placeholder node, any outgoing control edges
         // will be replaced with a control edge from the replacement
         // recv_node.
diff --git a/tensorflow/core/graph/subgraph_test.cc b/tensorflow/core/graph/subgraph_test.cc
index 93dcfd5e33..3dc11b7a16 100644
--- a/tensorflow/core/graph/subgraph_test.cc
+++ b/tensorflow/core/graph/subgraph_test.cc
@@ -81,7 +81,7 @@ class SubgraphTest : public ::testing::Test {
     for (const string& s : expected_nodes) {
       Node* n = FindNode(s);
       EXPECT_TRUE(n != nullptr) << s;
-      if (n->type_string() == "_Send" || n->type_string() == "_Recv") {
+      if (n->def().op() == "_Send" || n->def().op() == "_Recv") {
         EXPECT_EQ(device_info_.name(), n->assigned_device_name()) << s;
       }
     }
@@ -367,7 +367,7 @@ TEST_F(SubgraphTest, FedOutputsPreservesOutputShapes) {
   for (Node* node : graph()->nodes()) {
     if (node->name() == "_recv_input_1") {
       std::vector<PartialTensorShape> shapes;
-      TF_ASSERT_OK(GetNodeAttr(node->attrs(), "_output_shapes", &shapes));
+      TF_ASSERT_OK(GetNodeAttr(node->def(), "_output_shapes", &shapes));
       ASSERT_EQ(1, shapes.size());
       EXPECT_TRUE(PartialTensorShape({23}).IsIdenticalTo(shapes[0]));
       break;
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index b0e69d44ed..035483ec17 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -151,8 +151,8 @@ Status GraphProperties::InferStatically() {
 
     if (!node->assigned_device_name().empty()) {
       device_names_[node->name()] = node->assigned_device_name();
-    } else if (!node->requested_device().empty()) {
-      device_names_[node->name()] = node->requested_device();
+    } else if (!node->def().device().empty()) {
+      device_names_[node->name()] = node->def().device();
     } else {
       device_names_[node->name()] = "not set";
     }
diff --git a/tensorflow/core/kernels/function_ops.cc b/tensorflow/core/kernels/function_ops.cc
index 8c3137ece9..ba408f3657 100644
--- a/tensorflow/core/kernels/function_ops.cc
+++ b/tensorflow/core/kernels/function_ops.cc
@@ -186,12 +186,12 @@ REGISTER_KERNEL_BUILDER(Name("_ArrayToList")
                         PassOn);
 
 #ifdef TENSORFLOW_USE_SYCL
-#define REGISTER_SYCL_KERNELS(type)                                       \
-  REGISTER_KERNEL_BUILDER(                                                \
-      Name("_ListToArray").Device(DEVICE_SYCL).TypeConstraint<type>("T"), \
-      PassOn);                                                            \
-  REGISTER_KERNEL_BUILDER(                                                \
-      Name("_ArrayToList").Device(DEVICE_SYCL).TypeConstraint<type>("T"), \
+#define REGISTER_SYCL_KERNELS(type)                                      \
+  REGISTER_KERNEL_BUILDER(                                               \
+      Name("_ListToArray").Device(DEVICE_SYCL).TypeConstraint<type>("T"),\
+      PassOn);                                                           \
+  REGISTER_KERNEL_BUILDER(                                               \
+      Name("_ArrayToList").Device(DEVICE_SYCL).TypeConstraint<type>("T"),\
       PassOn);
 
 REGISTER_SYCL_KERNELS(float);
@@ -211,7 +211,7 @@ REGISTER_KERNEL_BUILDER(Name("_ArrayToList")
                             .HostMemory("output")
                             .TypeConstraint<int32>("T"),
                         PassOn);
-#endif  // TENSORFLOW_USE_SYCL
+#endif // TENSORFLOW_USE_SYCL
 
 class SymbolicGradientOp : public AsyncOpKernel {
  public:
@@ -227,7 +227,7 @@ class SymbolicGradientOp : public AsyncOpKernel {
 
     FunctionLibraryRuntime::Handle handle;
     OP_REQUIRES_OK_ASYNC(
-        ctx, lib->Instantiate(kGradientOp, AttrSlice(def()), &handle), done);
+        ctx, lib->Instantiate(kGradientOp, def().attr(), &handle), done);
 
     FunctionLibraryRuntime::Options opts;
     opts.step_id = ctx->step_id();
diff --git a/tensorflow/core/kernels/hexagon/graph_transferer.cc b/tensorflow/core/kernels/hexagon/graph_transferer.cc
index d927ef3efa..6f1616eff3 100644
--- a/tensorflow/core/kernels/hexagon/graph_transferer.cc
+++ b/tensorflow/core/kernels/hexagon/graph_transferer.cc
@@ -140,7 +140,7 @@ Status GraphTransferer::LoadGraphFromProto(
     std::vector<DataType> data_types;
     std::vector<TensorShape> shapes;
     status = RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-        node->attrs(), &data_types, &shapes);
+        node->def(), &data_types, &shapes);
     if (status.ok()) {
       CHECK(data_types.size() > port);
       graph_output_node_info.set_dtype(data_types.at(port));
@@ -359,7 +359,7 @@ void GraphTransferer::RegisterConstantNode(const ShapeRefiner& shape_refiner,
   const_node_info.add_shape(shape_array[2]);
   const_node_info.add_shape(shape_array[3]);
   const TensorProto* proto = nullptr;
-  TF_CHECK_OK(GetNodeAttr(node.attrs(), "value", &proto));
+  TF_CHECK_OK(GetNodeAttr(node.def(), "value", &proto));
   Tensor const_tensor;
   // TODO(b/32704451): Don't just ignore this status!
   MakeTensorFromProto(*proto, &const_tensor).IgnoreError();
@@ -395,9 +395,8 @@ int GraphTransferer::RegisterConstantShape(const std::vector<int>& shape) {
 }
 
 bool GraphTransferer::HasPaddingAndStrides(const Node& node) {
-  auto attrs = node.attrs();
-  return attrs.Find(PADDING_ATTR_NAME) != nullptr &&
-         attrs.Find(STRIDES_ATTR_NAME) != nullptr;
+  return node.def().attr().count(PADDING_ATTR_NAME) > 0 &&
+         node.def().attr().count(STRIDES_ATTR_NAME) > 0;
 }
 
 bool GraphTransferer::IsNodeFlattenReshape(const Node& node,
@@ -424,7 +423,7 @@ bool GraphTransferer::IsNodeFlattenReshape(const Node& node,
   } else {
     std::vector<TensorShape> shapes;
     TF_CHECK_OK(RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-        node.attrs(), nullptr, &shapes));
+        node.def(), nullptr, &shapes));
 
     // Number of outputs should be 1 for reshape node.
     CHECK_EQ(1, shapes.size());
@@ -445,16 +444,16 @@ void GraphTransferer::RegisterNodeWithPaddingAndStrides(
   CHECK_EQ(node_name_to_id_cache_map_.count(node.name()), 1);
   const int id = node_name_to_id_cache_map_[node.name()];
   shape_inference::InferenceContext* context = shape_refiner.GetContext(&node);
-  CHECK(node.attrs().Find(PADDING_ATTR_NAME));
+  CHECK_GT(node.def().attr().count(PADDING_ATTR_NAME), 0);
   // TODO(satok): Use context->GetAttr(...) instead?
   Padding padding;
   TF_CHECK_OK(context->GetAttr(PADDING_ATTR_NAME, &padding));
-  CHECK(node.attrs().Find(STRIDES_ATTR_NAME));
+  CHECK_GT(node.def().attr().count(STRIDES_ATTR_NAME), 0);
   std::vector<int32> strides;
   TF_CHECK_OK(context->GetAttr(STRIDES_ATTR_NAME, &strides));
   const int stride_id = RegisterConstantShape(strides);
   std::vector<int> extra_inputs{stride_id};
-  if (node.attrs().Find(KSIZE_ATTR_NAME)) {
+  if (node.def().attr().count(KSIZE_ATTR_NAME) > 0) {
     std::vector<int32> kernel_sizes;
     TF_CHECK_OK(context->GetAttr(KSIZE_ATTR_NAME, &kernel_sizes));
     const int ksize_id = RegisterConstantShape(kernel_sizes);
@@ -598,7 +597,7 @@ void GraphTransferer::AppendNodeOutputParams(const ShapeRefiner& shape_refiner,
 
   std::vector<TensorShape> shapes;
   Status status = RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-      node.attrs(), nullptr, &shapes);
+      node.def(), nullptr, &shapes);
 
   for (int i = 0; i < node.num_outputs(); ++i) {
     int data_size = -1;
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
index 2174098bde..456611894d 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
@@ -333,17 +333,17 @@ RemoteFusedGraphExecuteUtils::AddOutputTensorShapeTypeByTensorShapeMap(
 }
 
 /* static */ Status RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-    AttrSlice attrs, std::vector<DataType>* data_types,
+    const NodeDef& node_def, std::vector<DataType>* data_types,
     std::vector<TensorShape>* shapes) {
   Status status;
   if (data_types != nullptr) {
-    status = GetNodeAttr(attrs, ATTR_OUTPUT_DATA_TYPES, data_types);
+    status = GetNodeAttr(node_def, ATTR_OUTPUT_DATA_TYPES, data_types);
   }
   if (!status.ok()) {
     return status;
   }
   if (shapes != nullptr) {
-    status = GetNodeAttr(attrs, ATTR_OUTPUT_SHAPES, shapes);
+    status = GetNodeAttr(node_def, ATTR_OUTPUT_SHAPES, shapes);
     if (status.ok() && data_types != nullptr) {
       CHECK_EQ(data_types->size(), shapes->size());
     }
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
index 97b0c2008a..9ec189c85f 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
@@ -103,7 +103,7 @@ class RemoteFusedGraphExecuteUtils {
   static Status AddOutputTensorShapeTypeByTensorShapeMap(
       const TensorShapeMap& tensor_shape_map, NodeDef* node_def);
 
-  static Status GetOutputTensorShapeType(AttrSlice attrs,
+  static Status GetOutputTensorShapeType(const NodeDef& node_def,
                                          std::vector<DataType>* data_types,
                                          std::vector<TensorShape>* shapes);
 
-- 
GitLab


From d726686d2dff34a11f85841dfc52bf45698ac49d Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Tue, 16 May 2017 17:25:05 -0700
Subject: [PATCH 1426/1563] Update android instructions to mention
 AndroidStudio + JCenter.

PiperOrigin-RevId: 156254004
---
 tensorflow/contrib/android/README.md  | 17 +++++++++++
 tensorflow/examples/android/README.md | 44 ++++++++++++++++++++++-----
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/tensorflow/contrib/android/README.md b/tensorflow/contrib/android/README.md
index 26885828ed..88960b48c9 100644
--- a/tensorflow/contrib/android/README.md
+++ b/tensorflow/contrib/android/README.md
@@ -14,6 +14,23 @@ For prebuilt libraries, see the
 [nightly Android build artifacts](https://ci.tensorflow.org/view/Nightly/job/nightly-android/)
 page for a recent build.
 
+The TensorFlow Inference Interface is also available as a
+[JCenter package](https://bintray.com/google/tensorflow/tensorflow-android) and
+can be included quite simply in your android project with a couple of lines in
+the project's `build.gradle` file:
+
+```
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+dependencies {
+    compile 'org.tensorflow:tensorflow-android:1.2.0-preview'
+}
+```
+
 To build the libraries yourself (if, for example, you want to support custom
 TensorFlow operators), pick your preferred approach below:
 
diff --git a/tensorflow/examples/android/README.md b/tensorflow/examples/android/README.md
index 0414566b98..60ba702c10 100644
--- a/tensorflow/examples/android/README.md
+++ b/tensorflow/examples/android/README.md
@@ -10,8 +10,8 @@ TensorFlow in mobile applications.
 
 Inference is done using the [TensorFlow Android Inference Interface](../../../tensorflow/contrib/android),
 which may be built separately if you want a standalone library to drop into your
-existing application. Object tracking and YUV -> RGB conversion is handled by
-libtensorflow_demo.so.
+existing application. Object tracking and efficient YUV -> RGB conversion are
+handled by `libtensorflow_demo.so`.
 
 A device running Android 5.0 (API 21) or higher is required to run the demo due
 to the use of the camera2 API, although the native libraries themselves can run
@@ -34,14 +34,16 @@ on API >= 14 devices.
 
 <img src="sample_images/classify1.jpg" width="30%"><img src="sample_images/stylize1.jpg" width="30%"><img src="sample_images/detect1.jpg" width="30%">
 
-## Prebuilt APK:
+## Prebuilt Components:
 
 If you just want the fastest path to trying the demo, you may download the
 nightly build
 [here](https://ci.tensorflow.org/view/Nightly/job/nightly-android/). Expand the
 "View" and then the "out" folders under "Last Successful Artifacts" to find
-tensorflow_demo.apk. Also available are precompiled native libraries that you
-may drop into your own applications. See
+tensorflow_demo.apk.
+
+Also available are precompiled native libraries, and a jcenter package that you
+may simply drop into your own applications. See
 [tensorflow/contrib/android/README.md](../../../tensorflow/contrib/android/README.md)
 for more details.
 
@@ -54,7 +56,35 @@ While running the activities, pressing the volume keys on your device will
 toggle debug visualizations on/off, rendering additional info to the screen
 that may be useful for development purposes.
 
-## Building the Demo from Source
+## Building in Android Studio using the TensorFlow AAR from JCenter
+
+The simplest way to compile the demo app yourself, and try out changes to the
+project code is to use AndroidStudio. Simply set this `android` directory as the project root.
+
+Then edit the `build.gradle` file and change the value of `nativeBuildSystem`
+to `'none'` so that the project is built in the simplest way possible:
+
+```None
+def nativeBuildSystem = 'none'
+```
+
+While this project includes full build integration for TensorFlow, this setting
+disables it, and uses the TensorFlow Inference Interface package from JCenter.
+
+Note: Currently, in this build mode, YUV -> RGB is done using a less efficient
+Java implementation, and object tracking is not available in the "TF Detect"
+activity. Setting the build system to `'cmake'` currently only builds
+`libtensorflow_demo.so`, which provides fast YUV -> RGB conversion and object
+tracking, while still acquiring TensorFlow support via the downloaded AAR, so
+it may be a lightweight way to enable these features.
+
+For any project that does not include custom low level TensorFlow code, this is
+likely sufficient.
+
+For details on how to include this JCenter package in your own project see
+[tensorflow/contrib/android/README.md](../../../tensorflow/contrib/android/README.md)
+
+## Building the Demo with TensorFlow from Source
 
 Pick your preferred approach below. At the moment, we have full support for
 Bazel, and partial support for gradle, cmake, make, and Android Studio.
@@ -156,7 +186,7 @@ root to install the APK:
 adb install -r bazel-bin/tensorflow/examples/android/tensorflow_demo.apk
 ```
 
-### Android Studio
+### Android Studio with Bazel
 
 Android Studio may be used to build the demo in conjunction with Bazel. First,
 make sure that you can build with Bazel following the above directions. Then,
-- 
GitLab


From b0c21b654064f11d876392e94f0420eaaff841b3 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Tue, 16 May 2017 17:27:36 -0700
Subject: [PATCH 1427/1563] TensorArray now uses colocation instead of lazy
 device setters.  Added test helper.

* Move a new test method making it easy to write local distributed unit tests
  into the tf.test namespace.
* Update the rnn helper functions to use colocation in a few places as well.
* Use it to test the new colocation behavior.

PiperOrigin-RevId: 156254308
---
 tensorflow/python/BUILD                       |   8 ++
 tensorflow/python/framework/test_util.py      |  56 ++++++++
 tensorflow/python/kernel_tests/BUILD          |   3 +
 .../kernel_tests/tensor_array_ops_test.py     | 117 +++++++--------
 tensorflow/python/ops/rnn.py                  |  19 +--
 tensorflow/python/ops/tensor_array_ops.py     | 136 +++++++++---------
 tensorflow/python/platform/test.py            |   5 +
 .../localhost_cluster_performance_test.py     |  32 +----
 .../tools/api/golden/tensorflow.test.pbtxt    |   4 +
 tensorflow/tools/pip_package/BUILD            |   1 +
 10 files changed, 214 insertions(+), 167 deletions(-)

diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 648745e931..2f183413dc 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -588,12 +588,19 @@ py_library(
         ":platform",
         ":platform_test",
         ":pywrap_tensorflow",
+        ":training",
         ":util",
         "//third_party/py/numpy",
         "@six_archive//:six",
     ],
 )
 
+py_library(
+    name = "distributed_framework_test_lib",
+    srcs_version = "PY2AND3",
+    deps = [":framework_test_lib"],
+)
+
 py_library(
     name = "client_testlib",
     srcs = ["platform/test.py"],
@@ -2829,6 +2836,7 @@ cuda_py_test(
     additional_deps = [
         ":client",
         ":client_testlib",
+        ":distributed_framework_test_lib",
         ":framework_for_generated_wrappers",
         ":partitioned_variables",
         ":training",
diff --git a/tensorflow/python/framework/test_util.py b/tensorflow/python/framework/test_util.py
index ac551a6e1a..194d608a88 100644
--- a/tensorflow/python/framework/test_util.py
+++ b/tensorflow/python/framework/test_util.py
@@ -27,6 +27,7 @@ import tempfile
 import threading
 
 import numpy as np
+import portpicker
 import six
 
 from google.protobuf import descriptor_pool
@@ -45,6 +46,7 @@ from tensorflow.python.framework import versions
 from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import googletest
 from tensorflow.python.platform import tf_logging as logging
+from tensorflow.python.training import server_lib
 from tensorflow.python.util import compat
 from tensorflow.python.util.protobuf import compare
 
@@ -776,3 +778,57 @@ class TensorFlowTestCase(googletest.TestCase):
     assertItemsEqual = googletest.TestCase.assertCountEqual
 
     # pylint: enable=invalid-name
+
+
+def create_local_cluster(num_workers, num_ps, protocol="grpc"):
+  """Create and start local servers and return the associated `Server` objects.
+
+  Example:
+  ```python
+  workers, _ = tf.test.create_local_cluster(num_workers=2, num_ps=2)
+
+  worker_sessions = [tf.Session(w.target) for w in workers]
+
+  with tf.device("/job:ps/task:0"):
+    ...
+  with tf.device("/job:ps/task:1"):
+    ...
+  with tf.device("/job:worker/task:0"):
+    ...
+  with tf.device("/job:worker/task:1"):
+    ...
+
+  worker_sessions[0].run(...)
+  ```
+
+  Args:
+    num_workers: Number of worker servers to start.
+    num_ps: Number of PS servers to start.
+    protocol: Communication protocol.  Allowed values are documented in
+      the documentation of `tf.train.Server`.
+
+  Returns:
+    A tuple `(worker_servers, ps_servers)`.  `worker_servers` is a list
+    of `num_workers` objects of type `tf.train.Server` (all running locally);
+    and `ps_servers` is a list of `num_ps` objects of similar type.
+  """
+  worker_ports = [portpicker.pick_unused_port() for _ in range(num_workers)]
+  ps_ports = [portpicker.pick_unused_port() for _ in range(num_ps)]
+  cluster_dict = {
+      "worker": ["localhost:%s" % port for port in worker_ports],
+      "ps": ["localhost:%s" % port for port in ps_ports]
+  }
+  cs = server_lib.ClusterSpec(cluster_dict)
+
+  workers = [
+      server_lib.Server(
+          cs, job_name="worker", protocol=protocol, task_index=ix, start=True)
+      for ix in range(num_workers)
+  ]
+  ps_servers = [
+      server_lib.Server(
+          cs, job_name="ps", protocol=protocol, task_index=ix, start=True)
+      for ix in range(num_ps)
+  ]
+
+  return workers, ps_servers
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 5d9534a206..ab69b33cb1 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -1114,6 +1114,7 @@ cuda_py_test(
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:data_flow_ops_gen",
+        "//tensorflow/python:distributed_framework_test_lib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -1894,10 +1895,12 @@ cuda_py_test(
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:data_flow_ops_gen",
+        "//tensorflow/python:distributed_framework_test_lib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:gradients",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn_grad",
+        "//tensorflow/python:training",
         "//tensorflow/python:tensor_array_grad",
         "//tensorflow/python:tensor_array_ops",
         "//tensorflow/python:variables",
diff --git a/tensorflow/python/kernel_tests/tensor_array_ops_test.py b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
index 41fe29e006..5b0f318efe 100644
--- a/tensorflow/python/kernel_tests/tensor_array_ops_test.py
+++ b/tensorflow/python/kernel_tests/tensor_array_ops_test.py
@@ -20,6 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
+from tensorflow.core.protobuf import config_pb2
+from tensorflow.python.client import session as session_lib
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
@@ -1194,82 +1196,83 @@ class TensorArrayTest(test.TestCase):
       self.assertAllEqual(expected_grad, grad_vals[0])
 
   def testTensorArrayGetsDeviceFromFirstWrite(self):
-    with ops.device("/gpu:1"):
+    with ops.device("/job:worker/task:0/cpu:0"):
+      # this initial device will be ignored.
       ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
-    # parent device was ignored when creating the TensorArray
-    self.assertEqual(ta.handle.device, "")
-    self.assertEqual(ta.flow.device, "")
-    with ops.device("/gpu:0"):
-      # the first write sets the op's device
+    with ops.device("/job:worker/task:1/cpu:0"):
+      # the first write sets the op's device.
       ta = ta.write(0, 1.0)
-    self.assertTrue("gpu:0" in ta.handle.device.lower())
-    self.assertTrue("gpu:0" in ta.flow.device.lower())
-    with ops.device("/gpu:1"):
-      # subsequent writes do not modify the op's device
+    with ops.device("/job:worker/task:2/cpu:0"):
+      # subsequent writes do not modify the op's device.
       ta = ta.write(1, 1.0)
-    self.assertTrue("gpu:0" in ta.handle.device.lower())
-    self.assertTrue("gpu:0" in ta.flow.device.lower())
 
+    # The gradient TA will sit on the same device as the forward TA.
     ta_grad = ta.grad("grad")
-    self.assertTrue("gpu:0" in ta_grad.handle.device.lower())
-    self.assertTrue("gpu:0" in ta_grad.flow.device.lower())
+    flows = [ta.flow, ta_grad.flow]
 
     # Similar tests for unpack and split
-    ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
-    self.assertEqual(ta.handle.device, "")
-    self.assertEqual(ta.flow.device, "")
-    with ops.device("/gpu:0"):
+    with ops.device("/job:worker/task:0/cpu:0"):
+      ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=3)
+    with ops.device("/job:worker/task:1/cpu:0"):
       ta = ta.unstack([1.0, 2.0])
-    self.assertTrue("gpu:0" in ta.handle.device.lower())
-    self.assertTrue("gpu:0" in ta.flow.device.lower())
-    with ops.device("/gpu:1"):
-      ta = ta.unstack([1.0, 2.0])
-    self.assertTrue("gpu:0" in ta.handle.device.lower())
-    self.assertTrue("gpu:0" in ta.flow.device.lower())
+    with ops.device("/job:worker/task:2/cpu:0"):
+      ta = ta.write(2, 3.0)
+    flows.append(ta.flow)
 
-    ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
-    self.assertEqual(ta.handle.device, "")
-    self.assertEqual(ta.flow.device, "")
-    with ops.device("/gpu:0"):
-      ta = ta.split([1.0, 2.0], [1, 1])
-    self.assertTrue("gpu:0" in ta.handle.device.lower())
-    self.assertTrue("gpu:0" in ta.flow.device.lower())
-    with ops.device("/gpu:1"):
+    with ops.device("/job:worker/task:0/cpu:0"):
+      ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
+    with ops.device("/job:worker/task:1/cpu:0"):
       ta = ta.split([1.0, 2.0], [1, 1])
-    self.assertTrue("gpu:0" in ta.handle.device.lower())
-    self.assertTrue("gpu:0" in ta.flow.device.lower())
+    flows.append(ta.flow)
+
+    workers, _ = test.create_local_cluster(num_workers=3, num_ps=0)
+    session = session_lib.Session(workers[0].target)
+
+    run_options = config_pb2.RunOptions(
+        trace_level=config_pb2.RunOptions.FULL_TRACE)
+    run_metadata = config_pb2.RunMetadata()
+
+    session.run(flows, options=run_options, run_metadata=run_metadata)
+    self.assertTrue(run_metadata.HasField("step_stats"))
+    dev_stats = {d.device: d.node_stats
+                 for d in run_metadata.step_stats.dev_stats}
+    for d in dev_stats:
+      if "/task:1/" in d:
+        self.assertTrue(
+            [s for s in dev_stats[d] if "/TensorArray" in s.node_name])
+      else:
+        self.assertFalse(
+            [s for s in dev_stats[d] if "/TensorArray" in s.node_name])
 
   def testTensorArrayGetsDeviceFromFirstWriteInWhileLoop(self):
-    ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
+    with ops.device("/job:worker/task:0/cpu:0"):
+      ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
 
     def _body(i, ta_i):
-      with ops.device("/gpu:0"):
+      with ops.device("/job:worker/task:1/cpu:0"):
         return i + 1, ta_i.write(i, 0.0)
 
-    self.assertEqual(ta.handle.device, "")
-    self.assertEqual(ta.flow.device, "")
-
     _, ta_out = control_flow_ops.while_loop(
         lambda i, ta: i < 2, _body, loop_vars=[0, ta])
 
-    self.assertTrue("gpu:0" in ta_out.handle.device.lower())
-    self.assertTrue("gpu:0" in ta.handle.device.lower())
-
-  def testTensorArrayLazyDeviceSettingDoesNotConfuseInitialAccess(self):
-    with self.test_session(use_gpu=True) as session:
-      ta = tensor_array_ops.TensorArray(dtype=dtypes.float32, size=2)
-      self.assertEqual(ta.handle.device, "")
-
-      with ops.device("/cpu:0"):
-        size = ta.size()
-      with ops.device("/gpu:0"):
-        ta = ta.write(0, 0.0)
-
-      self.assertTrue("gpu:0" in ta.handle.device.lower())
-
-      # This should use the TensorArray on /gpu:0
-      size_value, _ = session.run((size, ta.flow))
-      self.assertEqual(2, size_value)
+    workers, _ = test.create_local_cluster(num_workers=3, num_ps=0)
+    session = session_lib.Session(workers[0].target)
+
+    run_options = config_pb2.RunOptions(
+        trace_level=config_pb2.RunOptions.FULL_TRACE)
+    run_metadata = config_pb2.RunMetadata()
+
+    session.run(ta_out.flow, options=run_options, run_metadata=run_metadata)
+    self.assertTrue(run_metadata.HasField("step_stats"))
+    dev_stats = {d.device: d.node_stats
+                 for d in run_metadata.step_stats.dev_stats}
+    for d in dev_stats:
+      if "/task:1/" in d:
+        self.assertTrue(
+            [s for s in dev_stats[d] if "/TensorArray" in s.node_name])
+      else:
+        self.assertFalse(
+            [s for s in dev_stats[d] if "/TensorArray" in s.node_name])
 
   def testTensorArrayIdentity(self):
     with self.test_session(use_gpu=True) as session:
diff --git a/tensorflow/python/ops/rnn.py b/tensorflow/python/ops/rnn.py
index 2aa288e36a..a6fba046da 100644
--- a/tensorflow/python/ops/rnn.py
+++ b/tensorflow/python/ops/rnn.py
@@ -98,15 +98,6 @@ def _infer_state_dtype(explicit_dtype, state):
     return state.dtype
 
 
-def _on_device(fn, device):
-  """Build the subgraph defined by lambda `fn` on `device` if it's not None."""
-  if device:
-    with ops.device(device):
-      return fn()
-  else:
-    return fn()
-
-
 # pylint: disable=unused-argument
 def _rnn_step(
     time, sequence_length, min_sequence_length, max_sequence_length,
@@ -168,9 +159,8 @@ def _rnn_step(
 
   def _copy_one_through(output, new_output):
     copy_cond = (time >= sequence_length)
-    return _on_device(
-        lambda: array_ops.where(copy_cond, output, new_output),
-        device=new_output.op.device)
+    with ops.colocate_with(new_output):
+      return array_ops.where(copy_cond, output, new_output)
 
   def _copy_some_through(flat_new_output, flat_new_state):
     # Use broadcasting select to determine which values should get
@@ -1020,9 +1010,8 @@ def raw_rnn(cell, loop_fn,
       def _copy_some_through(current, candidate):
         """Copy some tensors through via array_ops.where."""
         def copy_fn(cur_i, cand_i):
-          return _on_device(
-              lambda: array_ops.where(elements_finished, cur_i, cand_i),
-              device=cand_i.op.device)
+          with ops.colocate_with(cand_i):
+            return array_ops.where(elements_finished, cur_i, cand_i)
         return nest.map_structure(copy_fn, current, candidate)
 
       emit_output = _copy_some_through(zero_emit, emit_output)
diff --git a/tensorflow/python/ops/tensor_array_ops.py b/tensorflow/python/ops/tensor_array_ops.py
index b1c7d74a0c..8b119f5842 100644
--- a/tensorflow/python/ops/tensor_array_ops.py
+++ b/tensorflow/python/ops/tensor_array_ops.py
@@ -22,6 +22,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import contextlib
+
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import tensor_util
@@ -31,24 +33,6 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.util import tf_should_use
 
 
-def _maybe_set_device(handle_op, value_t):
-  # NOTE(ebrevdo): Do not try this at home, kids
-  # _______________________________________________
-  # | I WILL NOT ACCESS PRIVATE METHODS ^^^^^^^^\ |
-  # | I WILL NOT ACCESS PRIVATE METHODS |       | |
-  # | I WILL NOT ACCESS PRIVATE METHODS |_ __   | |
-  # | I WILL NOT ACCESS PRIVATE METHODS (.(. )  | |
-  # | I WILL NOT ACCESS PRIVATE         (_      ) |
-  # |                           \\      /___/' /  |
-  # |                           _\\_      \    |  |
-  # |                          ((   )     /====|  |
-  # |                           \  <.__._-      \ |
-  # |___________________________ <//___.         ||
-  #
-  if not handle_op.device and value_t.device:
-    handle_op._set_device(value_t.device)  # pylint: disable=protected-access
-
-
 # TensorArray object accesses many of the hidden generated ops, but is
 # in fact built to wrap these methods.
 # pylint: disable=protected-access
@@ -132,6 +116,12 @@ class TensorArray(object):
     dynamic_size = dynamic_size or False
 
     self._dtype = dtype
+
+    # Used to keep track of what tensors the TensorArray should be
+    # colocated with.  We choose to colocate the TensorArray with the
+    # first tensor written to it.
+    self._colocate_with = []
+
     # Record the current static shape for the array elements. The element
     # shape is defined either by `element_shape` or the shape of the tensor
     # of the first write. If `infer_shape` is true, all writes checks for
@@ -197,6 +187,24 @@ class TensorArray(object):
     else:
       self._element_shape.append(shape)
 
+  @contextlib.contextmanager
+  def _maybe_colocate_with(self, value):
+    """Colocate operations with an internal colocation group or `value`.
+
+    Args:
+      value: `Tensor`, the tensor to try to colocate with.
+
+    Yields:
+      Does not yield anything, but the new context is a colocation context.
+
+    If no internal colocation group is set, colocate with `value` and set
+    the internal colocation group to be value.
+    """
+    if not self._colocate_with:
+      self._colocate_with.append(value)
+    with ops.colocate_with(self._colocate_with[0]):
+      yield
+
   def identity(self):
     """Returns a TensorArray with the same content and properties.
 
@@ -209,6 +217,7 @@ class TensorArray(object):
     ta = TensorArray(dtype=self._dtype, handle=self._handle, flow=flow,
                      infer_shape=self._infer_shape)
     ta._element_shape = self._element_shape
+    ta._colocate_with = self._colocate_with
     return ta
 
   def grad(self, source, flow=None, name=None):
@@ -242,16 +251,15 @@ class TensorArray(object):
     Returns:
       The tensor at index `index`.
     """
-    with ops.colocate_with(self._handle):
-      value = gen_data_flow_ops._tensor_array_read_v3(
-          handle=self._handle,
-          index=index,
-          flow_in=self._flow,
-          dtype=self._dtype,
-          name=name)
-      if self._element_shape:
-        value.set_shape(self._element_shape[0].dims)
-      return value
+    value = gen_data_flow_ops._tensor_array_read_v3(
+        handle=self._handle,
+        index=index,
+        flow_in=self._flow,
+        dtype=self._dtype,
+        name=name)
+    if self._element_shape:
+      value.set_shape(self._element_shape[0].dims)
+    return value
 
   @tf_should_use.should_use_result
   def write(self, index, value, name=None):
@@ -271,8 +279,7 @@ class TensorArray(object):
     """
     with ops.name_scope(name, "TensorArrayWrite", [self._handle, index, value]):
       value = ops.convert_to_tensor(value, name="value")
-      _maybe_set_device(self._handle.op, value)
-      with ops.colocate_with(self._handle):
+      with self._maybe_colocate_with(value):
         flow_out = gen_data_flow_ops._tensor_array_write_v3(
             handle=self._handle,
             index=index,
@@ -282,6 +289,7 @@ class TensorArray(object):
       ta = TensorArray(dtype=self._dtype, handle=self._handle, flow=flow_out)
       ta._infer_shape = self._infer_shape
       ta._element_shape = self._element_shape
+      ta._colocate_with = self._colocate_with
       if ta._infer_shape:
         ta._merge_element_shape(value.get_shape())
       return ta
@@ -316,21 +324,20 @@ class TensorArray(object):
     Returns:
       The in the `TensorArray` selected by `indices`, packed into one tensor.
     """
-    with ops.colocate_with(self._handle):
-      if self._element_shape:
-        element_shape = self._element_shape[0]
-      else:
-        element_shape = tensor_shape.TensorShape(None)
-      value = gen_data_flow_ops._tensor_array_gather_v3(
-          handle=self._handle,
-          indices=indices,
-          flow_in=self._flow,
-          dtype=self._dtype,
-          name=name,
-          element_shape=element_shape)
-      if self._element_shape and self._element_shape[0].dims is not None:
-        value.set_shape([None] + self._element_shape[0].dims)
-      return value
+    if self._element_shape:
+      element_shape = self._element_shape[0]
+    else:
+      element_shape = tensor_shape.TensorShape(None)
+    value = gen_data_flow_ops._tensor_array_gather_v3(
+        handle=self._handle,
+        indices=indices,
+        flow_in=self._flow,
+        dtype=self._dtype,
+        name=name,
+        element_shape=element_shape)
+    if self._element_shape and self._element_shape[0].dims is not None:
+      value.set_shape([None] + self._element_shape[0].dims)
+    return value
 
   def concat(self, name=None):
     """Return the values in the TensorArray as a concatenated `Tensor`.
@@ -349,16 +356,15 @@ class TensorArray(object):
           tensor_shape.TensorShape(self._element_shape[0].dims[1:]))
     else:
       element_shape_except0 = tensor_shape.TensorShape(None)
-    with ops.colocate_with(self._handle):
-      value, _ = gen_data_flow_ops._tensor_array_concat_v3(
-          handle=self._handle,
-          flow_in=self._flow,
-          dtype=self._dtype,
-          name=name,
-          element_shape_except0=element_shape_except0)
-      if self._element_shape and self._element_shape[0].dims is not None:
-        value.set_shape([None] + self._element_shape[0].dims[1:])
-      return value
+    value, _ = gen_data_flow_ops._tensor_array_concat_v3(
+        handle=self._handle,
+        flow_in=self._flow,
+        dtype=self._dtype,
+        name=name,
+        element_shape_except0=element_shape_except0)
+    if self._element_shape and self._element_shape[0].dims is not None:
+      value.set_shape([None] + self._element_shape[0].dims[1:])
+    return value
 
   @tf_should_use.should_use_result
   def unstack(self, value, name=None):
@@ -403,8 +409,7 @@ class TensorArray(object):
     with ops.name_scope(name, "TensorArrayScatter",
                         [self._handle, value, indices]):
       value = ops.convert_to_tensor(value, name="value")
-      _maybe_set_device(self._handle.op, value)
-      with ops.colocate_with(self._handle):
+      with self._maybe_colocate_with(value):
         flow_out = gen_data_flow_ops._tensor_array_scatter_v3(
             handle=self._handle,
             indices=indices,
@@ -414,6 +419,7 @@ class TensorArray(object):
       ta = TensorArray(dtype=self._dtype, handle=self._handle, flow=flow_out)
       ta._infer_shape = self._infer_shape
       ta._element_shape = self._element_shape
+      ta._colocate_with = self._colocate_with
       if ta._infer_shape:
         val_shape = flow_out.op.inputs[2].get_shape()
         element_shape = tensor_shape.unknown_shape()
@@ -442,9 +448,8 @@ class TensorArray(object):
     with ops.name_scope(name, "TensorArraySplit",
                         [self._handle, value, lengths]):
       value = ops.convert_to_tensor(value, name="value")
-      _maybe_set_device(self._handle.op, value)
-      lengths_64 = math_ops.to_int64(lengths)
-      with ops.colocate_with(self._handle):
+      with self._maybe_colocate_with(value):
+        lengths_64 = math_ops.to_int64(lengths)
         flow_out = gen_data_flow_ops._tensor_array_split_v3(
             handle=self._handle,
             value=value,
@@ -454,6 +459,7 @@ class TensorArray(object):
       ta = TensorArray(dtype=self._dtype, handle=self._handle, flow=flow_out)
       ta._infer_shape = self._infer_shape
       ta._element_shape = self._element_shape
+      ta._colocate_with = self._colocate_with
       if ta._infer_shape:
         val_shape = flow_out.op.inputs[1].get_shape()
         clengths = tensor_util.constant_value(flow_out.op.inputs[2])
@@ -467,15 +473,13 @@ class TensorArray(object):
 
   def size(self, name=None):
     """Return the size of the TensorArray."""
-    with ops.colocate_with(self._handle):
-      return gen_data_flow_ops._tensor_array_size_v3(
-          handle=self._handle, flow_in=self.flow, name=name)
+    return gen_data_flow_ops._tensor_array_size_v3(
+        handle=self._handle, flow_in=self.flow, name=name)
 
   @tf_should_use.should_use_result
   def close(self, name=None):
     """Close the current TensorArray."""
-    with ops.colocate_with(self._handle):
-      return gen_data_flow_ops._tensor_array_close_v3(
-          handle=self._handle, name=name)
+    return gen_data_flow_ops._tensor_array_close_v3(
+        handle=self._handle, name=name)
 
 # pylint: enable=protected-access
diff --git a/tensorflow/python/platform/test.py b/tensorflow/python/platform/test.py
index 452b8f5d3b..5cb2c152b0 100644
--- a/tensorflow/python/platform/test.py
+++ b/tensorflow/python/platform/test.py
@@ -27,12 +27,15 @@ See the @{$python/test} guide.
 @@gpu_device_name
 @@compute_gradient
 @@compute_gradient_error
+@@create_local_cluster
+
 """
 
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+
 # pylint: disable=g-bad-import-order
 from tensorflow.python.client import device_lib as _device_lib
 from tensorflow.python.framework import test_util as _test_util
@@ -41,6 +44,7 @@ from tensorflow.python.util.all_util import remove_undocumented
 
 # pylint: disable=unused-import
 from tensorflow.python.framework.test_util import assert_equal_graph_def
+from tensorflow.python.framework.test_util import create_local_cluster
 from tensorflow.python.framework.test_util import TensorFlowTestCase as TestCase
 from tensorflow.python.framework.test_util import gpu_device_name
 
@@ -108,6 +112,7 @@ def is_gpu_available(cuda_only=False):
     return any((x.device_type == 'GPU' or x.device_type == 'SYCL')
                for x in _device_lib.list_local_devices())
 
+
 _allowed_symbols = [
     # We piggy-back googletest documentation.
     'Benchmark',
diff --git a/tensorflow/python/training/localhost_cluster_performance_test.py b/tensorflow/python/training/localhost_cluster_performance_test.py
index 9de681837d..7c097b943d 100644
--- a/tensorflow/python/training/localhost_cluster_performance_test.py
+++ b/tensorflow/python/training/localhost_cluster_performance_test.py
@@ -21,7 +21,6 @@ from __future__ import print_function
 import time
 
 import numpy as np
-import portpicker
 
 from tensorflow.python.client import session as session_lib
 from tensorflow.python.framework import dtypes
@@ -31,37 +30,12 @@ from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 from tensorflow.python.training import device_setter
-from tensorflow.python.training import server_lib
-
-
-def create_local_cluster(num_workers, num_ps, protocol="grpc"):
-  """Create local GRPC servers and return their servers."""
-  worker_ports = [portpicker.pick_unused_port() for _ in range(num_workers)]
-  ps_ports = [portpicker.pick_unused_port() for _ in range(num_ps)]
-  cluster_dict = {
-      "worker": ["localhost:%s" % port for port in worker_ports],
-      "ps": ["localhost:%s" % port for port in ps_ports]
-  }
-  cs = server_lib.ClusterSpec(cluster_dict)
-
-  workers = [
-      server_lib.Server(
-          cs, job_name="worker", protocol=protocol, task_index=ix, start=True)
-      for ix in range(num_workers)
-  ]
-  ps_servers = [
-      server_lib.Server(
-          cs, job_name="ps", protocol=protocol, task_index=ix, start=True)
-      for ix in range(num_ps)
-  ]
-
-  return workers, ps_servers
 
 
 class CreateLocalClusterTest(test.TestCase):
 
   def testCreateLocalCluster(self):
-    workers, _ = create_local_cluster(num_workers=2, num_ps=2)
+    workers, _ = test.create_local_cluster(num_workers=2, num_ps=2)
     worker_sessions = [session_lib.Session(w.target) for w in workers]
     with ops.device("/job:ps/task:0"):
       var0 = variables.Variable(0.0)
@@ -88,7 +62,7 @@ class CreateLocalClusterBenchmark(test.Benchmark):
     iters = 5
     for _ in range(iters):
       start_time = time.time()
-      create_local_cluster(num_workers=1, num_ps=10)
+      test.create_local_cluster(num_workers=1, num_ps=10)
       end_time = time.time()
       deltas.append(end_time - start_time)
 
@@ -104,7 +78,7 @@ class CreateLocalClusterBenchmark(test.Benchmark):
 class PartitionedVariablesBenchmark(test.Benchmark):
 
   def benchmark_create_1000_partitions_with_100_parameter_servers(self):
-    workers, _ = create_local_cluster(num_workers=1, num_ps=100)
+    workers, _ = test.create_local_cluster(num_workers=1, num_ps=100)
     worker_sessions = [session_lib.Session(w.target) for w in workers]
     worker = worker_sessions[0]
     partition_sizes = (1, 512, 1024 * 32, 1024 * 128)
diff --git a/tensorflow/tools/api/golden/tensorflow.test.pbtxt b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
index c4768a68bf..1e717ad237 100644
--- a/tensorflow/tools/api/golden/tensorflow.test.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.test.pbtxt
@@ -24,6 +24,10 @@ tf_module {
     name: "compute_gradient_error"
     argspec: "args=[\'x\', \'x_shape\', \'y\', \'y_shape\', \'x_init_value\', \'delta\', \'init_targets\', \'extra_feed_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'0.001\', \'None\', \'None\'], "
   }
+  member_method {
+    name: "create_local_cluster"
+    argspec: "args=[\'num_workers\', \'num_ps\', \'protocol\'], varargs=None, keywords=None, defaults=[\'grpc\'], "
+  }
   member_method {
     name: "get_temp_dir"
     argspec: "args=[], varargs=None, keywords=None, defaults=None"
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 83be430e7d..377a687c34 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -150,6 +150,7 @@ sh_binary(
             "//tensorflow/contrib/tensor_forest:init_py",
             "//tensorflow/contrib/tensor_forest/hybrid:hybrid_pip",
             "//tensorflow/examples/tutorials/mnist:package",
+            "//tensorflow/python:distributed_framework_test_lib",
             "//tensorflow/python:util_example_parser_configuration",
             "//tensorflow/python/debug:debug_pip",
             "//tensorflow/python/saved_model:saved_model",
-- 
GitLab


From 35253fa89c5f8af25e3d84f76980729569091a6c Mon Sep 17 00:00:00 2001
From: Francois Chollet <fchollet@google.com>
Date: Tue, 16 May 2017 17:49:16 -0700
Subject: [PATCH 1428/1563] Refactor Keras layers to rely on core TF layers,
 specifically: - dropout - conv layers - pooling layers - batchnorm

Also add to core layers an automated layer input spec check system, allowing to easily specify constraints on inputs acceptable by layers, and raise helpful error messages in case of incompatibility.

PiperOrigin-RevId: 156256513
---
 .../keras/python/keras/engine/topology.py     |  97 ---
 .../python/keras/layers/convolutional.py      | 688 ++++++------------
 .../python/keras/layers/convolutional_test.py |  17 -
 .../contrib/keras/python/keras/layers/core.py |  61 +-
 .../python/keras/layers/normalization.py      | 172 ++---
 .../python/keras/layers/normalization_test.py |   8 +-
 .../keras/python/keras/layers/pooling.py      | 252 ++-----
 .../layers/python/layers/layers_test.py       |   2 -
 tensorflow/python/layers/base.py              | 145 +++-
 tensorflow/python/layers/base_test.py         | 148 ++++
 tensorflow/python/layers/convolutional.py     | 311 +++++---
 tensorflow/python/layers/core.py              |  21 +-
 tensorflow/python/layers/core_test.py         |   4 +-
 tensorflow/python/layers/normalization.py     |  11 +-
 tensorflow/python/layers/pooling.py           |  95 ++-
 tensorflow/python/layers/pooling_test.py      |  53 +-
 tensorflow/python/layers/utils.py             |  97 ++-
 tensorflow/python/layers/utils_test.py        |  55 +-
 18 files changed, 1102 insertions(+), 1135 deletions(-)

diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 3d9ed51a1c..8bc0c412b5 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -273,7 +273,6 @@ class Layer(tf_base_layers.Layer):
   # Internal methods:
       build(input_shape)
       _add_inbound_node(layer, index=0)
-      assert_input_compatibility()
   """
 
   def __init__(self, **kwargs):
@@ -381,97 +380,6 @@ class Layer(tf_base_layers.Layer):
       self.constraints[weight] = constraint
     return weight
 
-  def assert_input_compatibility(self, inputs):
-    """Checks compatibility between the layer and provided inputs.
-
-    This checks that the tensor(s) `input`
-    verify the input assumptions of the layer
-    (if any). If not, exceptions are raised.
-
-    Arguments:
-        inputs: input tensor or list of input tensors.
-
-    Raises:
-        ValueError: in case of mismatch between
-            the provided inputs and the expectations of the layer.
-    """
-    if not self.input_spec:
-      return
-    if not isinstance(self.input_spec, (list, tuple)):
-      input_spec = _to_list(self.input_spec)
-    else:
-      input_spec = self.input_spec
-    inputs = _to_list(inputs)
-    if len(inputs) != len(input_spec):
-      raise ValueError('Layer ' + self.name + ' expects ' +
-                       str(len(input_spec)) + ' inputs, '
-                       'but it received ' + str(len(inputs)) +
-                       ' input tensors. Input received: ' + str(inputs))
-    for input_index, (x, spec) in enumerate(zip(inputs, input_spec)):
-      if spec is None:
-        continue
-
-      # Check ndim.
-      if spec.ndim is not None:
-        if K.ndim(x) != spec.ndim:
-          raise ValueError('Input ' + str(input_index) +
-                           ' is incompatible with layer ' + self.name +
-                           ': expected ndim=' + str(spec.ndim) + ', found ndim='
-                           + str(K.ndim(x)))
-      if spec.max_ndim is not None:
-        ndim = K.ndim(x)
-        if ndim is not None and ndim > spec.max_ndim:
-          raise ValueError('Input ' + str(input_index) +
-                           ' is incompatible with layer ' + self.name +
-                           ': expected max_ndim=' + str(spec.max_ndim) +
-                           ', found ndim=' + str(K.ndim(x)))
-      if spec.min_ndim is not None:
-        ndim = K.ndim(x)
-        if ndim is not None and ndim < spec.min_ndim:
-          raise ValueError('Input ' + str(input_index) +
-                           ' is incompatible with layer ' + self.name +
-                           ': expected min_ndim=' + str(spec.min_ndim) +
-                           ', found ndim=' + str(K.ndim(x)))
-      # Check dtype.
-      if spec.dtype is not None:
-        if K.dtype(x) != spec.dtype:
-          raise ValueError('Input ' + str(input_index) +
-                           ' is incompatible with layer ' + self.name +
-                           ': expected dtype=' + str(spec.dtype) +
-                           ', found dtype=' + str(K.dtype(x)))
-      # Check specific shape axes.
-      if spec.axes:
-        try:
-          x_shape = K.int_shape(x)
-        except TypeError:
-          x_shape = None
-        if x_shape is not None:
-          for axis, value in spec.axes.items():
-            if hasattr(value, 'value'):
-              value = value.value
-            if value is not None and x_shape[int(axis)] not in {value, None}:
-              raise ValueError(
-                  'Input ' + str(input_index) + ' is incompatible with layer ' +
-                  self.name + ': expected axis ' + str(axis) +
-                  ' of input shape to have '
-                  'value ' + str(value) + ' but got shape ' + str(x_shape))
-      # Check shape.
-      if spec.shape is not None:
-        try:
-          x_shape = K.int_shape(x)
-        except TypeError:
-          x_shape = None
-        if x_shape is not None:
-          for spec_dim, dim in zip(spec.shape, x_shape):
-            if hasattr(spec_dim, 'value'):
-              spec_dim = spec_dim.value
-            if spec_dim is not None and dim is not None:
-              if spec_dim != dim:
-                raise ValueError('Input ' + str(input_index) +
-                                 ' is incompatible with layer ' + self.name +
-                                 ': expected shape=' + str(spec.shape) +
-                                 ', found shape=' + str(x_shape))
-
   def call(self, inputs, **kwargs):  # pylint: disable=unused-argument
     """This is where the layer's logic lives.
 
@@ -509,11 +417,6 @@ class Layer(tf_base_layers.Layer):
     if isinstance(inputs, list):
       inputs = inputs[:]
 
-    # Raise exceptions in case the input is not compatible
-    # with the input_spec set at build time.
-    # TODO(fchollet): call after the layer is built, too.
-    self.assert_input_compatibility(inputs)
-
     # Handle mask propagation.
     previous_mask = _collect_previous_mask(inputs)
     user_kwargs = copy.copy(kwargs)
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional.py b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
index 16f49c3390..9ee5aa2121 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional.py
@@ -37,233 +37,11 @@ from tensorflow.contrib.keras.python.keras.layers.pooling import MaxPooling3D
 # pylint: enable=unused-import
 from tensorflow.contrib.keras.python.keras.utils import conv_utils
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.layers import convolutional as tf_convolutional_layers
 
 
-class _Conv(Layer):
-  """Abstract nD convolution layer (private, used as implementation base).
-
-  This layer creates a convolution kernel that is convolved
-  with the layer input to produce a tensor of outputs.
-  If `use_bias` is True, a bias vector is created and added to the outputs.
-  Finally, if `activation` is not `None`,
-  it is applied to the outputs as well.
-
-  Arguments:
-      rank: An integer, the rank of the convolution,
-          e.g. "2" for 2D convolution.
-      filters: Integer, the dimensionality of the output space
-          (i.e. the number output of filters in the convolution).
-      kernel_size: An integer or tuple/list of n integers, specifying the
-          dimensions of the convolution window.
-      strides: An integer or tuple/list of n integers,
-          specifying the strides of the convolution.
-          Specifying any stride value != 1 is incompatible with specifying
-          any `dilation_rate` value != 1.
-      padding: One of `"valid"` or `"same"` (case-insensitive).
-      data_format: A string,
-          one of `channels_last` (default) or `channels_first`.
-          The ordering of the dimensions in the inputs.
-          `channels_last` corresponds to inputs with shape
-          `(batch, ..., channels)` while `channels_first` corresponds to
-          inputs with shape `(batch, channels, ...)`.
-          It defaults to the `image_data_format` value found in your
-          Keras config file at `~/.keras/keras.json`.
-          If you never set it, then it will be "channels_last".
-      dilation_rate: An integer or tuple/list of n integers, specifying
-          the dilation rate to use for dilated convolution.
-          Currently, specifying any `dilation_rate` value != 1 is
-          incompatible with specifying any `strides` value != 1.
-      activation: Activation function to use.
-          If you don't specify anything, no activation is applied
-          (ie. "linear" activation: `a(x) = x`).
-      use_bias: Boolean, whether the layer uses a bias vector.
-      kernel_initializer: Initializer for the `kernel` weights matrix.
-      bias_initializer: Initializer for the bias vector.
-      kernel_regularizer: Regularizer function applied to
-          the `kernel` weights matrix.
-      bias_regularizer: Regularizer function applied to the bias vector.
-      activity_regularizer: Regularizer function applied to
-          the output of the layer (its "activation")..
-      kernel_constraint: Constraint function applied to the kernel matrix.
-      bias_constraint: Constraint function applied to the bias vector.
-  """
-
-  def __init__(self,
-               rank,
-               filters,
-               kernel_size,
-               strides=1,
-               padding='valid',
-               data_format=None,
-               dilation_rate=1,
-               activation=None,
-               use_bias=True,
-               kernel_initializer='glorot_uniform',
-               bias_initializer='zeros',
-               kernel_regularizer=None,
-               bias_regularizer=None,
-               activity_regularizer=None,
-               kernel_constraint=None,
-               bias_constraint=None,
-               **kwargs):
-    super(_Conv, self).__init__(**kwargs)
-    self.rank = rank
-    self.filters = filters
-    self.kernel_size = conv_utils.normalize_tuple(kernel_size, rank,
-                                                  'kernel_size')
-    self.strides = conv_utils.normalize_tuple(strides, rank, 'strides')
-    self.padding = conv_utils.normalize_padding(padding)
-    self.data_format = conv_utils.normalize_data_format(data_format)
-    self.dilation_rate = conv_utils.normalize_tuple(dilation_rate, rank,
-                                                    'dilation_rate')
-    self.activation = activations.get(activation)
-    self.use_bias = use_bias
-    self.kernel_initializer = initializers.get(kernel_initializer)
-    self.bias_initializer = initializers.get(bias_initializer)
-    self.kernel_regularizer = regularizers.get(kernel_regularizer)
-    self.bias_regularizer = regularizers.get(bias_regularizer)
-    self.activity_regularizer = regularizers.get(activity_regularizer)
-    self.kernel_constraint = constraints.get(kernel_constraint)
-    self.bias_constraint = constraints.get(bias_constraint)
-    self.input_spec = InputSpec(ndim=self.rank + 2)
-
-  def build(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    if self.data_format == 'channels_first':
-      channel_axis = 1
-    else:
-      channel_axis = -1
-    if input_shape[channel_axis] is None:
-      raise ValueError('The channel dimension of the inputs '
-                       'should be defined. Found `None`.')
-    input_dim = input_shape[channel_axis]
-    kernel_shape = self.kernel_size + (input_dim, self.filters)
-
-    self.kernel = self.add_weight(
-        shape=kernel_shape,
-        initializer=self.kernel_initializer,
-        name='kernel',
-        regularizer=self.kernel_regularizer,
-        constraint=self.kernel_constraint)
-    if self.use_bias:
-      self.bias = self.add_weight(
-          shape=(self.filters,),
-          initializer=self.bias_initializer,
-          name='bias',
-          regularizer=self.bias_regularizer,
-          constraint=self.bias_constraint)
-    else:
-      self.bias = None
-    # Set input spec.
-    self.input_spec = InputSpec(
-        ndim=self.rank + 2, axes={channel_axis: input_dim})
-    self.built = True
-
-  def call(self, inputs):
-    if self.rank == 1:
-      outputs = K.conv1d(
-          inputs,
-          self.kernel,
-          strides=self.strides[0],
-          padding=self.padding,
-          data_format=self.data_format,
-          dilation_rate=self.dilation_rate[0])
-    if self.rank == 2:
-      outputs = K.conv2d(
-          inputs,
-          self.kernel,
-          strides=self.strides,
-          padding=self.padding,
-          data_format=self.data_format,
-          dilation_rate=self.dilation_rate)
-    if self.rank == 3:
-      outputs = K.conv3d(
-          inputs,
-          self.kernel,
-          strides=self.strides,
-          padding=self.padding,
-          data_format=self.data_format,
-          dilation_rate=self.dilation_rate)
-
-    if self.use_bias:
-      outputs = K.bias_add(outputs, self.bias, data_format=self.data_format)
-
-    if self.activation is not None:
-      return self.activation(outputs)
-    return outputs
-
-  def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    if self.data_format == 'channels_last':
-      space = input_shape[1:-1]
-      new_space = []
-      for i in range(len(space)):
-        new_dim = conv_utils.conv_output_length(
-            space[i],
-            self.kernel_size[i],
-            padding=self.padding,
-            stride=self.strides[i],
-            dilation=self.dilation_rate[i])
-        new_space.append(new_dim)
-      return tensor_shape.TensorShape([input_shape[0]] + new_space +
-                                      [self.filters])
-    else:
-      space = input_shape[2:]
-      new_space = []
-      for i in range(len(space)):
-        new_dim = conv_utils.conv_output_length(
-            space[i],
-            self.kernel_size[i],
-            padding=self.padding,
-            stride=self.strides[i],
-            dilation=self.dilation_rate[i])
-        new_space.append(new_dim)
-      return tensor_shape.TensorShape([input_shape[0], self.filters] +
-                                      new_space)
-
-  def get_config(self):
-    config = {
-        'rank':
-            self.rank,
-        'filters':
-            self.filters,
-        'kernel_size':
-            self.kernel_size,
-        'strides':
-            self.strides,
-        'padding':
-            self.padding,
-        'data_format':
-            self.data_format,
-        'dilation_rate':
-            self.dilation_rate,
-        'activation':
-            activations.serialize(self.activation),
-        'use_bias':
-            self.use_bias,
-        'kernel_initializer':
-            initializers.serialize(self.kernel_initializer),
-        'bias_initializer':
-            initializers.serialize(self.bias_initializer),
-        'kernel_regularizer':
-            regularizers.serialize(self.kernel_regularizer),
-        'bias_regularizer':
-            regularizers.serialize(self.bias_regularizer),
-        'activity_regularizer':
-            regularizers.serialize(self.activity_regularizer),
-        'kernel_constraint':
-            constraints.serialize(self.kernel_constraint),
-        'bias_constraint':
-            constraints.serialize(self.bias_constraint)
-    }
-    base_config = super(_Conv, self).get_config()
-    return dict(list(base_config.items()) + list(config.items()))
-
-
-class Conv1D(_Conv):
-  """1D convolution layer (e.g.
-
-  temporal convolution).
+class Conv1D(tf_convolutional_layers.Conv1D, Layer):
+  """1D convolution layer (e.g. temporal convolution).
 
   This layer creates a convolution kernel that is convolved
   with the layer input over a single spatial (or temporal) dimension
@@ -336,33 +114,55 @@ class Conv1D(_Conv):
                bias_constraint=None,
                **kwargs):
     super(Conv1D, self).__init__(
-        rank=1,
         filters=filters,
         kernel_size=kernel_size,
         strides=strides,
         padding=padding,
         data_format='channels_last',
         dilation_rate=dilation_rate,
-        activation=activation,
+        activation=activations.get(activation),
         use_bias=use_bias,
-        kernel_initializer=kernel_initializer,
-        bias_initializer=bias_initializer,
-        kernel_regularizer=kernel_regularizer,
-        bias_regularizer=bias_regularizer,
-        activity_regularizer=activity_regularizer,
-        kernel_constraint=kernel_constraint,
-        bias_constraint=bias_constraint,
+        kernel_initializer=initializers.get(kernel_initializer),
+        bias_initializer=initializers.get(bias_initializer),
+        kernel_regularizer=regularizers.get(kernel_regularizer),
+        bias_regularizer=regularizers.get(bias_regularizer),
+        activity_regularizer=regularizers.get(activity_regularizer),
         **kwargs)
-    self.input_spec = InputSpec(ndim=3)
+    # TODO(fchollet): move weight constraint support to core layers.
+    self.kernel_constraint = constraints.get(kernel_constraint)
+    self.bias_constraint = constraints.get(bias_constraint)
+
+  def build(self, input_shape):
+    super(Conv1D, self).build(input_shape)
+    # TODO(fchollet): move weight constraint support to core layers.
+    if self.kernel_constraint:
+      self.constraints[self.kernel] = self.kernel_constraint
+    if self.use_bias and self.bias_constraint:
+      self.constraints[self.bias] = self.bias_constraint
 
   def get_config(self):
-    config = super(Conv1D, self).get_config()
-    config.pop('rank')
-    config.pop('data_format')
-    return config
+    config = {
+        'filters': self.filters,
+        'kernel_size': self.kernel_size,
+        'strides': self.strides,
+        'padding': self.padding,
+        'dilation_rate': self.dilation_rate,
+        'activation': activations.serialize(self.activation),
+        'use_bias': self.use_bias,
+        'kernel_initializer': initializers.serialize(self.kernel_initializer),
+        'bias_initializer': initializers.serialize(self.bias_initializer),
+        'kernel_regularizer': regularizers.serialize(self.kernel_regularizer),
+        'bias_regularizer': regularizers.serialize(self.bias_regularizer),
+        'activity_regularizer':
+            regularizers.serialize(self.activity_regularizer),
+        'kernel_constraint': constraints.serialize(self.kernel_constraint),
+        'bias_constraint': constraints.serialize(self.bias_constraint)
+    }
+    base_config = super(Conv1D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
-class Conv2D(_Conv):
+class Conv2D(tf_convolutional_layers.Conv2D, Layer):
   """2D convolution layer (e.g. spatial convolution over images).
 
   This layer creates a convolution kernel that is convolved
@@ -452,36 +252,60 @@ class Conv2D(_Conv):
                kernel_constraint=None,
                bias_constraint=None,
                **kwargs):
+    if data_format is None:
+      data_format = K.image_data_format()
     super(Conv2D, self).__init__(
-        rank=2,
         filters=filters,
         kernel_size=kernel_size,
         strides=strides,
         padding=padding,
         data_format=data_format,
         dilation_rate=dilation_rate,
-        activation=activation,
+        activation=activations.get(activation),
         use_bias=use_bias,
-        kernel_initializer=kernel_initializer,
-        bias_initializer=bias_initializer,
-        kernel_regularizer=kernel_regularizer,
-        bias_regularizer=bias_regularizer,
-        activity_regularizer=activity_regularizer,
-        kernel_constraint=kernel_constraint,
-        bias_constraint=bias_constraint,
+        kernel_initializer=initializers.get(kernel_initializer),
+        bias_initializer=initializers.get(bias_initializer),
+        kernel_regularizer=regularizers.get(kernel_regularizer),
+        bias_regularizer=regularizers.get(bias_regularizer),
+        activity_regularizer=regularizers.get(activity_regularizer),
         **kwargs)
-    self.input_spec = InputSpec(ndim=4)
+    # TODO(fchollet): move weight constraint support to core layers.
+    self.kernel_constraint = constraints.get(kernel_constraint)
+    self.bias_constraint = constraints.get(bias_constraint)
 
-  def get_config(self):
-    config = super(Conv2D, self).get_config()
-    config.pop('rank')
-    return config
+  def build(self, input_shape):
+    super(Conv2D, self).build(input_shape)
+    # TODO(fchollet): move weight constraint support to core layers.
+    if self.kernel_constraint:
+      self.constraints[self.kernel] = self.kernel_constraint
+    if self.use_bias and self.bias_constraint:
+      self.constraints[self.bias] = self.bias_constraint
 
+  def get_config(self):
+    config = {
+        'filters': self.filters,
+        'kernel_size': self.kernel_size,
+        'strides': self.strides,
+        'padding': self.padding,
+        'data_format': self.data_format,
+        'dilation_rate': self.dilation_rate,
+        'activation': activations.serialize(self.activation),
+        'use_bias': self.use_bias,
+        'kernel_initializer': initializers.serialize(self.kernel_initializer),
+        'bias_initializer': initializers.serialize(self.bias_initializer),
+        'kernel_regularizer': regularizers.serialize(self.kernel_regularizer),
+        'bias_regularizer': regularizers.serialize(self.bias_regularizer),
+        'activity_regularizer':
+            regularizers.serialize(self.activity_regularizer),
+        'kernel_constraint': constraints.serialize(self.kernel_constraint),
+        'bias_constraint': constraints.serialize(self.bias_constraint)
+    }
+    base_config = super(Conv2D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
-class Conv3D(_Conv):
-  """3D convolution layer (e.g.
 
-  spatial convolution over volumes).
+class Conv3D(tf_convolutional_layers.Conv3D, Layer):
+  """3D convolution layer (e.g. spatial convolution over volumes).
 
   This layer creates a convolution kernel that is convolved
   with the layer input to produce a tensor of
@@ -577,33 +401,59 @@ class Conv3D(_Conv):
                kernel_constraint=None,
                bias_constraint=None,
                **kwargs):
+    if data_format is None:
+      data_format = K.image_data_format()
     super(Conv3D, self).__init__(
-        rank=3,
         filters=filters,
         kernel_size=kernel_size,
         strides=strides,
         padding=padding,
         data_format=data_format,
         dilation_rate=dilation_rate,
-        activation=activation,
+        activation=activations.get(activation),
         use_bias=use_bias,
-        kernel_initializer=kernel_initializer,
-        bias_initializer=bias_initializer,
-        kernel_regularizer=kernel_regularizer,
-        bias_regularizer=bias_regularizer,
-        activity_regularizer=activity_regularizer,
-        kernel_constraint=kernel_constraint,
-        bias_constraint=bias_constraint,
+        kernel_initializer=initializers.get(kernel_initializer),
+        bias_initializer=initializers.get(bias_initializer),
+        kernel_regularizer=regularizers.get(kernel_regularizer),
+        bias_regularizer=regularizers.get(bias_regularizer),
+        activity_regularizer=regularizers.get(activity_regularizer),
         **kwargs)
-    self.input_spec = InputSpec(ndim=5)
+    # TODO(fchollet): move weight constraint support to core layers.
+    self.kernel_constraint = constraints.get(kernel_constraint)
+    self.bias_constraint = constraints.get(bias_constraint)
+
+  def build(self, input_shape):
+    super(Conv3D, self).build(input_shape)
+    # TODO(fchollet): move weight constraint support to core layers.
+    if self.kernel_constraint:
+      self.constraints[self.kernel] = self.kernel_constraint
+    if self.use_bias and self.bias_constraint:
+      self.constraints[self.bias] = self.bias_constraint
 
   def get_config(self):
-    config = super(Conv3D, self).get_config()
-    config.pop('rank')
-    return config
+    config = {
+        'filters': self.filters,
+        'kernel_size': self.kernel_size,
+        'strides': self.strides,
+        'padding': self.padding,
+        'data_format': self.data_format,
+        'dilation_rate': self.dilation_rate,
+        'activation': activations.serialize(self.activation),
+        'use_bias': self.use_bias,
+        'kernel_initializer': initializers.serialize(self.kernel_initializer),
+        'bias_initializer': initializers.serialize(self.bias_initializer),
+        'kernel_regularizer': regularizers.serialize(self.kernel_regularizer),
+        'bias_regularizer': regularizers.serialize(self.bias_regularizer),
+        'activity_regularizer':
+            regularizers.serialize(self.activity_regularizer),
+        'kernel_constraint': constraints.serialize(self.kernel_constraint),
+        'bias_constraint': constraints.serialize(self.bias_constraint)
+    }
+    base_config = super(Conv3D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
-class Conv2DTranspose(Conv2D):
+class Conv2DTranspose(tf_convolutional_layers.Conv2DTranspose, Layer):
   """Transposed convolution layer (sometimes called Deconvolution).
 
   The need for transposed convolutions generally arises
@@ -699,121 +549,57 @@ class Conv2DTranspose(Conv2D):
                kernel_constraint=None,
                bias_constraint=None,
                **kwargs):
+    if data_format is None:
+      data_format = K.image_data_format()
     super(Conv2DTranspose, self).__init__(
-        filters,
-        kernel_size,
+        filters=filters,
+        kernel_size=kernel_size,
         strides=strides,
         padding=padding,
         data_format=data_format,
-        activation=activation,
+        activation=activations.get(activation),
         use_bias=use_bias,
-        kernel_initializer=kernel_initializer,
-        bias_initializer=bias_initializer,
-        kernel_regularizer=kernel_regularizer,
-        bias_regularizer=bias_regularizer,
-        activity_regularizer=activity_regularizer,
-        kernel_constraint=kernel_constraint,
-        bias_constraint=bias_constraint,
+        kernel_initializer=initializers.get(kernel_initializer),
+        bias_initializer=initializers.get(bias_initializer),
+        kernel_regularizer=regularizers.get(kernel_regularizer),
+        bias_regularizer=regularizers.get(bias_regularizer),
+        activity_regularizer=regularizers.get(activity_regularizer),
         **kwargs)
-    self.input_spec = InputSpec(ndim=4)
+    # TODO(fchollet): move weight constraint support to core layers.
+    self.kernel_constraint = constraints.get(kernel_constraint)
+    self.bias_constraint = constraints.get(bias_constraint)
 
   def build(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    if len(input_shape) != 4:
-      raise ValueError(
-          'Inputs should have rank ' + str(4) + '; Received input shape:',
-          str(input_shape))
-    if self.data_format == 'channels_first':
-      channel_axis = 1
-    else:
-      channel_axis = -1
-    if input_shape[channel_axis] is None:
-      raise ValueError('The channel dimension of the inputs '
-                       'should be defined. Found `None`.')
-    input_dim = input_shape[channel_axis]
-    kernel_shape = self.kernel_size + (self.filters, input_dim)
-
-    self.kernel = self.add_weight(
-        shape=kernel_shape,
-        initializer=self.kernel_initializer,
-        name='kernel',
-        regularizer=self.kernel_regularizer,
-        constraint=self.kernel_constraint)
-    if self.use_bias:
-      self.bias = self.add_weight(
-          shape=(self.filters,),
-          initializer=self.bias_initializer,
-          name='bias',
-          regularizer=self.bias_regularizer,
-          constraint=self.bias_constraint)
-    else:
-      self.bias = None
-    # Set input spec.
-    self.input_spec = InputSpec(ndim=4, axes={channel_axis: input_dim})
-    self.built = True
-
-  def call(self, inputs):
-    input_shape = K.shape(inputs)
-    batch_size = input_shape[0]
-    if self.data_format == 'channels_first':
-      h_axis, w_axis = 2, 3
-    else:
-      h_axis, w_axis = 1, 2
-
-    height, width = input_shape[h_axis], input_shape[w_axis]
-    kernel_h, kernel_w = self.kernel_size
-    stride_h, stride_w = self.strides
-
-    # Infer the dynamic output shape:
-    out_height = conv_utils.deconv_length(height, stride_h, kernel_h,
-                                          self.padding)
-    out_width = conv_utils.deconv_length(width, stride_w, kernel_w,
-                                         self.padding)
-    if self.data_format == 'channels_first':
-      output_shape = (batch_size, self.filters, out_height, out_width)
-    else:
-      output_shape = (batch_size, out_height, out_width, self.filters)
-
-    outputs = K.conv2d_transpose(
-        inputs,
-        self.kernel,
-        output_shape,
-        self.strides,
-        padding=self.padding,
-        data_format=self.data_format)
-
-    if self.bias:
-      outputs = K.bias_add(outputs, self.bias, data_format=self.data_format)
-
-    if self.activation is not None:
-      return self.activation(outputs)
-    return outputs
-
-  def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    output_shape = list(input_shape)
-    if self.data_format == 'channels_first':
-      c_axis, h_axis, w_axis = 1, 2, 3
-    else:
-      c_axis, h_axis, w_axis = 3, 1, 2
-
-    kernel_h, kernel_w = self.kernel_size
-    stride_h, stride_w = self.strides
-
-    output_shape[c_axis] = self.filters
-    output_shape[h_axis] = conv_utils.deconv_length(
-        output_shape[h_axis], stride_h, kernel_h, self.padding)
-    output_shape[w_axis] = conv_utils.deconv_length(
-        output_shape[w_axis], stride_w, kernel_w, self.padding)
-    return tensor_shape.TensorShape(output_shape)
+    super(Conv2DTranspose, self).build(input_shape)
+    # TODO(fchollet): move weight constraint support to core layers.
+    if self.kernel_constraint:
+      self.constraints[self.kernel] = self.kernel_constraint
+    if self.use_bias and self.bias_constraint:
+      self.constraints[self.bias] = self.bias_constraint
 
   def get_config(self):
-    config = super(Conv2DTranspose, self).get_config()
-    config.pop('dilation_rate')
-    return config
+    config = {
+        'filters': self.filters,
+        'kernel_size': self.kernel_size,
+        'strides': self.strides,
+        'padding': self.padding,
+        'data_format': self.data_format,
+        'activation': activations.serialize(self.activation),
+        'use_bias': self.use_bias,
+        'kernel_initializer': initializers.serialize(self.kernel_initializer),
+        'bias_initializer': initializers.serialize(self.bias_initializer),
+        'kernel_regularizer': regularizers.serialize(self.kernel_regularizer),
+        'bias_regularizer': regularizers.serialize(self.bias_regularizer),
+        'activity_regularizer':
+            regularizers.serialize(self.activity_regularizer),
+        'kernel_constraint': constraints.serialize(self.kernel_constraint),
+        'bias_constraint': constraints.serialize(self.bias_constraint)
+    }
+    base_config = super(Conv2DTranspose, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
-class SeparableConv2D(Conv2D):
+class SeparableConv2D(tf_convolutional_layers.SeparableConv2D, Layer):
   """Depthwise separable 2D convolution.
 
   Separable convolutions consist in first performing
@@ -909,126 +695,68 @@ class SeparableConv2D(Conv2D):
                pointwise_constraint=None,
                bias_constraint=None,
                **kwargs):
+    if data_format is None:
+      data_format = K.image_data_format()
     super(SeparableConv2D, self).__init__(
         filters=filters,
         kernel_size=kernel_size,
         strides=strides,
         padding=padding,
         data_format=data_format,
-        activation=activation,
+        activation=activations.get(activation),
         use_bias=use_bias,
-        bias_regularizer=bias_regularizer,
-        activity_regularizer=activity_regularizer,
-        bias_constraint=bias_constraint,
+        depthwise_initializer=initializers.get(depthwise_initializer),
+        pointwise_initializer=initializers.get(pointwise_initializer),
+        bias_initializer=initializers.get(bias_initializer),
+        depthwise_regularizer=regularizers.get(depthwise_regularizer),
+        pointwise_regularizer=regularizers.get(pointwise_regularizer),
+        bias_regularizer=regularizers.get(bias_regularizer),
+        activity_regularizer=regularizers.get(activity_regularizer),
         **kwargs)
-    self.depth_multiplier = depth_multiplier
-    self.depthwise_initializer = initializers.get(depthwise_initializer)
-    self.pointwise_initializer = initializers.get(pointwise_initializer)
-    self.depthwise_regularizer = regularizers.get(depthwise_regularizer)
-    self.pointwise_regularizer = regularizers.get(pointwise_regularizer)
+    # TODO(fchollet): move weight constraint support to core layers.
     self.depthwise_constraint = constraints.get(depthwise_constraint)
     self.pointwise_constraint = constraints.get(pointwise_constraint)
+    self.bias_constraint = constraints.get(bias_constraint)
 
   def build(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    if len(input_shape) < 4:
-      raise ValueError('Inputs to `SeparableConv2D` should have rank 4. '
-                       'Received input shape:', str(input_shape))
-    if self.data_format == 'channels_first':
-      channel_axis = 1
-    else:
-      channel_axis = 3
-    if input_shape[channel_axis] is None:
-      raise ValueError('The channel dimension of the inputs to '
-                       '`SeparableConv2D` '
-                       'should be defined. Found `None`.')
-    input_dim = int(input_shape[channel_axis])
-    depthwise_kernel_shape = (self.kernel_size[0], self.kernel_size[1],
-                              input_dim, self.depth_multiplier)
-    pointwise_kernel_shape = (1, 1, self.depth_multiplier * input_dim,
-                              self.filters)
-
-    self.depthwise_kernel = self.add_weight(
-        shape=depthwise_kernel_shape,
-        initializer=self.depthwise_initializer,
-        name='depthwise_kernel',
-        regularizer=self.depthwise_regularizer,
-        constraint=self.depthwise_constraint)
-    self.pointwise_kernel = self.add_weight(
-        shape=pointwise_kernel_shape,
-        initializer=self.pointwise_initializer,
-        name='pointwise_kernel',
-        regularizer=self.pointwise_regularizer,
-        constraint=self.pointwise_constraint)
-
-    if self.use_bias:
-      self.bias = self.add_weight(
-          shape=(self.filters,),
-          initializer=self.bias_initializer,
-          name='bias',
-          regularizer=self.bias_regularizer,
-          constraint=self.bias_constraint)
-    else:
-      self.bias = None
-    # Set input spec.
-    self.input_spec = InputSpec(ndim=4, axes={channel_axis: input_dim})
-    self.built = True
-
-  def call(self, inputs):
-    outputs = K.separable_conv2d(
-        inputs,
-        self.depthwise_kernel,
-        self.pointwise_kernel,
-        data_format=self.data_format,
-        strides=self.strides,
-        padding=self.padding)
-
-    if self.bias:
-      outputs = K.bias_add(outputs, self.bias, data_format=self.data_format)
-
-    if self.activation is not None:
-      return self.activation(outputs)
-    return outputs
-
-  def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    if self.data_format == 'channels_first':
-      rows = input_shape[2]
-      cols = input_shape[3]
-    else:
-      rows = input_shape[1]
-      cols = input_shape[2]
-
-    rows = conv_utils.conv_output_length(rows, self.kernel_size[0],
-                                         self.padding, self.strides[0])
-    cols = conv_utils.conv_output_length(cols, self.kernel_size[1],
-                                         self.padding, self.strides[1])
-    if self.data_format == 'channels_first':
-      return tensor_shape.TensorShape(
-          [input_shape[0], self.filters, rows, cols])
-    else:
-      return tensor_shape.TensorShape(
-          [input_shape[0], rows, cols, self.filters])
+    super(SeparableConv2D, self).build(input_shape)
+    # TODO(fchollet): move weight constraint support to core layers.
+    if self.depthwise_constraint:
+      self.constraints[self.depthwise_kernel] = self.depthwise_constraint
+    if self.pointwise_constraint:
+      self.constraints[self.pointwise_kernel] = self.pointwise_constraint
+    if self.use_bias and self.bias_constraint:
+      self.constraints[self.bias] = self.bias_constraint
 
   def get_config(self):
-    config = super(SeparableConv2D, self).get_config()
-    config.pop('kernel_initializer')
-    config.pop('kernel_regularizer')
-    config.pop('kernel_constraint')
-    config['depth_multiplier'] = self.depth_multiplier
-    config['depthwise_initializer'] = initializers.serialize(
-        self.depthwise_initializer)
-    config['pointwise_initializer'] = initializers.serialize(
-        self.pointwise_initializer)
-    config['depthwise_regularizer'] = regularizers.serialize(
-        self.depthwise_regularizer)
-    config['pointwise_regularizer'] = regularizers.serialize(
-        self.pointwise_regularizer)
-    config['depthwise_constraint'] = constraints.serialize(
-        self.depthwise_constraint)
-    config['pointwise_constraint'] = constraints.serialize(
-        self.pointwise_constraint)
-    return config
+    config = {
+        'filters': self.filters,
+        'kernel_size': self.kernel_size,
+        'strides': self.strides,
+        'padding': self.padding,
+        'data_format': self.data_format,
+        'activation': activations.serialize(self.activation),
+        'use_bias': self.use_bias,
+        'depthwise_initializer': initializers.serialize(
+            self.depthwise_initializer),
+        'pointwise_initializer': initializers.serialize(
+            self.pointwise_initializer),
+        'bias_initializer': initializers.serialize(self.bias_initializer),
+        'depthwise_regularizer': regularizers.serialize(
+            self.depthwise_regularizer),
+        'pointwise_regularizer': regularizers.serialize(
+            self.pointwise_regularizer),
+        'bias_regularizer': regularizers.serialize(self.bias_regularizer),
+        'activity_regularizer':
+            regularizers.serialize(self.activity_regularizer),
+        'depthwise_constraint': constraints.serialize(
+            self.depthwise_constraint),
+        'pointwise_constraint': constraints.serialize(
+            self.pointwise_constraint),
+        'bias_constraint': constraints.serialize(self.bias_constraint)
+    }
+    base_config = super(SeparableConv2D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
 class UpSampling1D(Layer):
diff --git a/tensorflow/contrib/keras/python/keras/layers/convolutional_test.py b/tensorflow/contrib/keras/python/keras/layers/convolutional_test.py
index 845e9eee12..3b7f31a3e9 100644
--- a/tensorflow/contrib/keras/python/keras/layers/convolutional_test.py
+++ b/tensorflow/contrib/keras/python/keras/layers/convolutional_test.py
@@ -27,24 +27,7 @@ from tensorflow.python.platform import test
 
 class Convolution1DTest(test.TestCase):
 
-  def test_causal_dilated_conv1d(self):
-    # Causal:
-    with self.test_session():
-      testing_utils.layer_test(
-          keras.layers.Conv1D,
-          input_data=np.reshape(np.arange(4, dtype='float32'), (1, 4, 1)),
-          kwargs={
-              'filters': 1,
-              'kernel_size': 2,
-              'dilation_rate': 1,
-              'padding': 'causal',
-              'kernel_initializer': 'ones',
-              'use_bias': False,
-          },
-          expected_output=[[[0], [1], [3], [5]]])
-
   def test_dilated_conv1d(self):
-    # Non-causal:
     with self.test_session():
       testing_utils.layer_test(
           keras.layers.Conv1D,
diff --git a/tensorflow/contrib/keras/python/keras/layers/core.py b/tensorflow/contrib/keras/python/keras/layers/core.py
index 0b6cdc65a4..d287fa56d9 100644
--- a/tensorflow/contrib/keras/python/keras/layers/core.py
+++ b/tensorflow/contrib/keras/python/keras/layers/core.py
@@ -85,7 +85,7 @@ class Masking(Layer):
     return dict(list(base_config.items()) + list(config.items()))
 
 
-class Dropout(Layer):
+class Dropout(tf_core_layers.Dropout, Layer):
   """Applies Dropout to the input.
 
   Dropout consists in randomly setting
@@ -104,24 +104,18 @@ class Dropout(Layer):
   """
 
   def __init__(self, rate, noise_shape=None, seed=None, **kwargs):
-    super(Dropout, self).__init__(**kwargs)
-    self.rate = min(1., max(0., rate))
-    self.noise_shape = noise_shape
-    self.seed = seed
     self.supports_masking = True
-
-  def _get_noise_shape(self, _):
-    return self.noise_shape
+    # Inheritance call order:
+    # 1) tf.layers.Dropout, 2) keras.layers.Layer, 3) tf.layers.Layer
+    super(Dropout, self).__init__(**kwargs)
 
   def call(self, inputs, training=None):
-    if 0. < self.rate < 1.:
-      noise_shape = self._get_noise_shape(inputs)
-
-      def dropped_inputs():
-        return K.dropout(inputs, self.rate, noise_shape, seed=self.seed)
-
-      return K.in_train_phase(dropped_inputs, inputs, training=training)
-    return inputs
+    if training is None:
+      training = K.learning_phase()
+    output = super(Dropout, self).call(inputs, training=training)
+    if training is K.learning_phase():
+      output._uses_learning_phase = True  # pylint: disable=protected-access
+    return output
 
   def get_config(self):
     config = {'rate': self.rate}
@@ -726,45 +720,32 @@ class Dense(tf_core_layers.Dense, Layer):
         bias_regularizer=regularizers.get(bias_regularizer),
         activity_regularizer=regularizers.get(activity_regularizer),
         **kwargs)
-
+    # TODO(fchollet): move weight constraint support to core layers.
     self.kernel_constraint = constraints.get(kernel_constraint)
     self.bias_constraint = constraints.get(bias_constraint)
-    self.input_spec = InputSpec(min_ndim=2)
     self.supports_masking = True
 
   def build(self, input_shape):
-    assert len(input_shape) >= 2
-    input_dim = input_shape[-1]
     super(Dense, self).build(input_shape)
-    self.input_spec = InputSpec(min_ndim=2, axes={-1: input_dim})
+    # TODO(fchollet): move weight constraint support to core layers.
     if self.kernel_constraint:
       self.constraints[self.kernel] = self.kernel_constraint
     if self.use_bias and self.bias_constraint:
       self.constraints[self.bias] = self.bias_constraint
-    self.built = True
 
   def get_config(self):
     config = {
-        'units':
-            self.units,
-        'activation':
-            activations.serialize(self.activation),
-        'use_bias':
-            self.use_bias,
-        'kernel_initializer':
-            initializers.serialize(self.kernel_initializer),
-        'bias_initializer':
-            initializers.serialize(self.bias_initializer),
-        'kernel_regularizer':
-            regularizers.serialize(self.kernel_regularizer),
-        'bias_regularizer':
-            regularizers.serialize(self.bias_regularizer),
+        'units': self.units,
+        'activation': activations.serialize(self.activation),
+        'use_bias': self.use_bias,
+        'kernel_initializer': initializers.serialize(self.kernel_initializer),
+        'bias_initializer': initializers.serialize(self.bias_initializer),
+        'kernel_regularizer': regularizers.serialize(self.kernel_regularizer),
+        'bias_regularizer': regularizers.serialize(self.bias_regularizer),
         'activity_regularizer':
             regularizers.serialize(self.activity_regularizer),
-        'kernel_constraint':
-            constraints.serialize(self.kernel_constraint),
-        'bias_constraint':
-            constraints.serialize(self.bias_constraint)
+        'kernel_constraint': constraints.serialize(self.kernel_constraint),
+        'bias_constraint': constraints.serialize(self.bias_constraint)
     }
     base_config = super(Dense, self).get_config()
     return dict(list(base_config.items()) + list(config.items()))
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization.py b/tensorflow/contrib/keras/python/keras/layers/normalization.py
index ea229fdce1..4537814b61 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization.py
@@ -22,12 +22,11 @@ from tensorflow.contrib.keras.python.keras import backend as K
 from tensorflow.contrib.keras.python.keras import constraints
 from tensorflow.contrib.keras.python.keras import initializers
 from tensorflow.contrib.keras.python.keras import regularizers
-from tensorflow.contrib.keras.python.keras.engine import InputSpec
 from tensorflow.contrib.keras.python.keras.engine import Layer
-from tensorflow.python.framework import tensor_shape
+from tensorflow.python.layers import normalization as tf_normalization_layers
 
 
-class BatchNormalization(Layer):
+class BatchNormalization(tf_normalization_layers.BatchNormalization, Layer):
   """Batch normalization layer (Ioffe and Szegedy, 2014).
 
   Normalize the activations of the previous layer at each batch,
@@ -86,148 +85,59 @@ class BatchNormalization(Layer):
                beta_constraint=None,
                gamma_constraint=None,
                **kwargs):
-    super(BatchNormalization, self).__init__(**kwargs)
     self.supports_masking = True
-    self.axis = axis
-    self.momentum = momentum
-    self.epsilon = epsilon
-    self.center = center
-    self.scale = scale
-    self.beta_initializer = initializers.get(beta_initializer)
-    self.gamma_initializer = initializers.get(gamma_initializer)
-    self.moving_mean_initializer = initializers.get(moving_mean_initializer)
-    self.moving_variance_initializer = initializers.get(
-        moving_variance_initializer)
-    self.beta_regularizer = regularizers.get(beta_regularizer)
-    self.gamma_regularizer = regularizers.get(gamma_regularizer)
+    super(BatchNormalization, self).__init__(
+        axis=axis,
+        momentum=momentum,
+        epsilon=epsilon,
+        center=center,
+        scale=scale,
+        beta_initializer=initializers.get(beta_initializer),
+        gamma_initializer=initializers.get(gamma_initializer),
+        moving_mean_initializer=initializers.get(moving_mean_initializer),
+        moving_variance_initializer=initializers.get(
+            moving_variance_initializer),
+        beta_regularizer=regularizers.get(beta_regularizer),
+        gamma_regularizer=regularizers.get(gamma_regularizer),
+        **kwargs
+    )
+    # TODO(fchollet): move weight constraint support to core layers.
     self.beta_constraint = constraints.get(beta_constraint)
     self.gamma_constraint = constraints.get(gamma_constraint)
 
   def build(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    dim = input_shape[self.axis]
-    if dim is None:
-      raise ValueError('Axis ' + str(self.axis) + ' of '
-                       'input tensor should have a defined dimension '
-                       'but the layer received an input with shape ' +
-                       str(input_shape) + '.')
-    self.input_spec = InputSpec(ndim=len(input_shape), axes={self.axis: dim})
-    shape = (dim,)
-
-    if self.scale:
-      self.gamma = self.add_weight(
-          shape=shape,
-          name='gamma',
-          initializer=self.gamma_initializer,
-          regularizer=self.gamma_regularizer,
-          constraint=self.gamma_constraint)
-    else:
-      self.gamma = None
-    if self.center:
-      self.beta = self.add_weight(
-          shape=shape,
-          name='beta',
-          initializer=self.beta_initializer,
-          regularizer=self.beta_regularizer,
-          constraint=self.beta_constraint)
-    else:
-      self.beta = None
-    self.moving_mean = self.add_weight(
-        shape=shape,
-        name='moving_mean',
-        initializer=self.moving_mean_initializer,
-        trainable=False)
-    self.moving_variance = self.add_weight(
-        shape=shape,
-        name='moving_variance',
-        initializer=self.moving_variance_initializer,
-        trainable=False)
-    self.built = True
+    super(BatchNormalization, self).build(input_shape)
+    # TODO(fchollet): move weight constraint support to core layers.
+    if self.center and self.beta_constraint:
+      self.constraints[self.beta] = self.beta_constraint
+    if self.scale and self.gamma_constraint:
+      self.constraints[self.gamma] = self.gamma_constraint
 
   def call(self, inputs, training=None):
-    input_shape = inputs.get_shape().as_list()
-    # Prepare broadcasting shape.
-    ndim = len(input_shape)
-    reduction_axes = list(range(len(input_shape)))
-    del reduction_axes[self.axis]
-    broadcast_shape = [1] * len(input_shape)
-    broadcast_shape[self.axis] = input_shape[self.axis]
-
-    # Determines whether broadcasting is needed.
-    needs_broadcasting = (sorted(reduction_axes) != list(range(ndim))[:-1])
-
-    normed, mean, variance = K.normalize_batch_in_training(
-        inputs, self.gamma, self.beta, reduction_axes, epsilon=self.epsilon)
-
-    if training in {0, False}:
-      return normed
-    else:
-      self.add_update([
-          K.moving_average_update(self.moving_mean, mean, self.momentum),
-          K.moving_average_update(self.moving_variance, variance, self.momentum)
-      ], inputs)
-
-      def normalize_inference():
-        if needs_broadcasting:
-          # In this case we must explicitly broadcast all parameters.
-          broadcast_moving_mean = K.reshape(self.moving_mean, broadcast_shape)
-          broadcast_moving_variance = K.reshape(self.moving_variance,
-                                                broadcast_shape)
-          if self.center:
-            broadcast_beta = K.reshape(self.beta, broadcast_shape)
-          else:
-            broadcast_beta = None
-          if self.scale:
-            broadcast_gamma = K.reshape(self.gamma, broadcast_shape)
-          else:
-            broadcast_gamma = None
-          return K.batch_normalization(
-              inputs,
-              broadcast_moving_mean,
-              broadcast_moving_variance,
-              broadcast_beta,
-              broadcast_gamma,
-              epsilon=self.epsilon)
-        else:
-          return K.batch_normalization(
-              inputs,
-              self.moving_mean,
-              self.moving_variance,
-              self.beta,
-              self.gamma,
-              epsilon=self.epsilon)
-
-    # Pick the normalized form corresponding to the training phase.
-    return K.in_train_phase(normed, normalize_inference, training=training)
+    if training is None:
+      training = K.learning_phase()
+    output = super(BatchNormalization, self).call(inputs, training=training)
+    if training is K.learning_phase():
+      output._uses_learning_phase = True  # pylint: disable=protected-access
+    return output
 
   def get_config(self):
     config = {
-        'axis':
-            self.axis,
-        'momentum':
-            self.momentum,
-        'epsilon':
-            self.epsilon,
-        'center':
-            self.center,
-        'scale':
-            self.scale,
-        'beta_initializer':
-            initializers.serialize(self.beta_initializer),
-        'gamma_initializer':
-            initializers.serialize(self.gamma_initializer),
+        'axis': self.axis,
+        'momentum': self.momentum,
+        'epsilon': self.epsilon,
+        'center': self.center,
+        'scale': self.scale,
+        'beta_initializer': initializers.serialize(self.beta_initializer),
+        'gamma_initializer': initializers.serialize(self.gamma_initializer),
         'moving_mean_initializer':
             initializers.serialize(self.moving_mean_initializer),
         'moving_variance_initializer':
             initializers.serialize(self.moving_variance_initializer),
-        'beta_regularizer':
-            regularizers.serialize(self.beta_regularizer),
-        'gamma_regularizer':
-            regularizers.serialize(self.gamma_regularizer),
-        'beta_constraint':
-            constraints.serialize(self.beta_constraint),
-        'gamma_constraint':
-            constraints.serialize(self.gamma_constraint)
+        'beta_regularizer': regularizers.serialize(self.beta_regularizer),
+        'gamma_regularizer': regularizers.serialize(self.gamma_regularizer),
+        'beta_constraint': constraints.serialize(self.beta_constraint),
+        'gamma_constraint': constraints.serialize(self.gamma_constraint)
     }
     base_config = super(BatchNormalization, self).get_config()
     return dict(list(base_config.items()) + list(config.items()))
diff --git a/tensorflow/contrib/keras/python/keras/layers/normalization_test.py b/tensorflow/contrib/keras/python/keras/layers/normalization_test.py
index 51e23b8494..dc410f84d8 100644
--- a/tensorflow/contrib/keras/python/keras/layers/normalization_test.py
+++ b/tensorflow/contrib/keras/python/keras/layers/normalization_test.py
@@ -116,19 +116,21 @@ class NoiseLayersTest(test.TestCase):
     """
     with self.test_session():
       # Test single layer reuse
-      bn = keras.layers.BatchNormalization(input_shape=(10,))
+      bn = keras.layers.BatchNormalization()
       x1 = keras.layers.Input(shape=(10,))
-      bn(x1)
+      _ = bn(x1)
 
       x2 = keras.layers.Input(shape=(10,))
       y2 = bn(x2)
 
       x = np.random.normal(loc=5.0, scale=10.0, size=(2, 10))
       model = keras.models.Model(x2, y2)
-      assert len(model.updates) == 2
+
       model.compile('sgd', 'mse')
       model.train_on_batch(x, x)
 
+      assert len(model.updates) == 2
+
       # Test model-level reuse
       x3 = keras.layers.Input(shape=(10,))
       y3 = model(x3)
diff --git a/tensorflow/contrib/keras/python/keras/layers/pooling.py b/tensorflow/contrib/keras/python/keras/layers/pooling.py
index 47c88bf4d0..704f05e494 100644
--- a/tensorflow/contrib/keras/python/keras/layers/pooling.py
+++ b/tensorflow/contrib/keras/python/keras/layers/pooling.py
@@ -23,51 +23,10 @@ from tensorflow.contrib.keras.python.keras.engine import InputSpec
 from tensorflow.contrib.keras.python.keras.engine import Layer
 from tensorflow.contrib.keras.python.keras.utils import conv_utils
 from tensorflow.python.framework import tensor_shape
+from tensorflow.python.layers import pooling as tf_pooling_layers
 
 
-class _Pooling1D(Layer):
-  """Abstract class for different pooling 1D layers.
-  """
-
-  def __init__(self, pool_size=2, strides=None, padding='valid', **kwargs):
-    super(_Pooling1D, self).__init__(**kwargs)
-    if strides is None:
-      strides = pool_size
-    self.pool_size = conv_utils.normalize_tuple(pool_size, 1, 'pool_size')
-    self.strides = conv_utils.normalize_tuple(strides, 1, 'strides')
-    self.padding = conv_utils.normalize_padding(padding)
-    self.input_spec = InputSpec(ndim=3)
-
-  def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    length = conv_utils.conv_output_length(input_shape[1], self.pool_size[0],
-                                           self.padding, self.strides[0])
-    return tensor_shape.TensorShape([input_shape[0], length, input_shape[2]])
-
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    raise NotImplementedError
-
-  def call(self, inputs):
-    inputs = K.expand_dims(inputs, 2)  # add dummy last dimension
-    output = self._pooling_function(
-        inputs=inputs,
-        pool_size=self.pool_size + (1,),
-        strides=self.strides + (1,),
-        padding=self.padding,
-        data_format='channels_last')
-    return K.squeeze(output, 2)  # remove dummy last dimension
-
-  def get_config(self):
-    config = {
-        'strides': self.strides,
-        'pool_size': self.pool_size,
-        'padding': self.padding
-    }
-    base_config = super(_Pooling1D, self).get_config()
-    return dict(list(base_config.items()) + list(config.items()))
-
-
-class MaxPooling1D(_Pooling1D):
+class MaxPooling1D(tf_pooling_layers.MaxPooling1D, Layer):
   """Max pooling operation for temporal data.
 
   Arguments:
@@ -85,15 +44,21 @@ class MaxPooling1D(_Pooling1D):
   """
 
   def __init__(self, pool_size=2, strides=None, padding='valid', **kwargs):
+    if strides is None:
+      strides = pool_size
     super(MaxPooling1D, self).__init__(pool_size, strides, padding, **kwargs)
 
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    output = K.pool2d(
-        inputs, pool_size, strides, padding, data_format, pool_mode='max')
-    return output
+  def get_config(self):
+    config = {
+        'strides': self.strides,
+        'pool_size': self.pool_size,
+        'padding': self.padding
+    }
+    base_config = super(MaxPooling1D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
-class AveragePooling1D(_Pooling1D):
+class AveragePooling1D(tf_pooling_layers.AveragePooling1D, Layer):
   """Average pooling for temporal data.
 
   Arguments:
@@ -111,78 +76,22 @@ class AveragePooling1D(_Pooling1D):
   """
 
   def __init__(self, pool_size=2, strides=None, padding='valid', **kwargs):
-    super(AveragePooling1D, self).__init__(pool_size, strides, padding,
-                                           **kwargs)
-
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    output = K.pool2d(
-        inputs, pool_size, strides, padding, data_format, pool_mode='avg')
-    return output
-
-
-class _Pooling2D(Layer):
-  """Abstract class for different pooling 2D layers.
-  """
-
-  def __init__(self,
-               pool_size=(2, 2),
-               strides=None,
-               padding='valid',
-               data_format=None,
-               **kwargs):
-    super(_Pooling2D, self).__init__(**kwargs)
-    data_format = conv_utils.normalize_data_format(data_format)
     if strides is None:
       strides = pool_size
-    self.pool_size = conv_utils.normalize_tuple(pool_size, 2, 'pool_size')
-    self.strides = conv_utils.normalize_tuple(strides, 2, 'strides')
-    self.padding = conv_utils.normalize_padding(padding)
-    self.data_format = conv_utils.normalize_data_format(data_format)
-    self.input_spec = InputSpec(ndim=4)
-
-  def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    if self.data_format == 'channels_first':
-      rows = input_shape[2]
-      cols = input_shape[3]
-    else:
-      rows = input_shape[1]
-      cols = input_shape[2]
-    rows = conv_utils.conv_output_length(rows, self.pool_size[0], self.padding,
-                                         self.strides[0])
-    cols = conv_utils.conv_output_length(cols, self.pool_size[1], self.padding,
-                                         self.strides[1])
-    if self.data_format == 'channels_first':
-      return tensor_shape.TensorShape(
-          [input_shape[0], input_shape[1], rows, cols])
-    else:
-      return tensor_shape.TensorShape(
-          [input_shape[0], rows, cols, input_shape[3]])
-
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    raise NotImplementedError
-
-  def call(self, inputs):
-    output = self._pooling_function(
-        inputs=inputs,
-        pool_size=self.pool_size,
-        strides=self.strides,
-        padding=self.padding,
-        data_format=self.data_format)
-    return output
+    super(AveragePooling1D, self).__init__(pool_size, strides, padding,
+                                           **kwargs)
 
   def get_config(self):
     config = {
-        'pool_size': self.pool_size,
-        'padding': self.padding,
         'strides': self.strides,
-        'data_format': self.data_format
+        'pool_size': self.pool_size,
+        'padding': self.padding
     }
-    base_config = super(_Pooling2D, self).get_config()
+    base_config = super(AveragePooling1D, self).get_config()
     return dict(list(base_config.items()) + list(config.items()))
 
 
-class MaxPooling2D(_Pooling2D):
+class MaxPooling2D(tf_pooling_layers.MaxPooling2D, Layer):
   """Max pooling operation for spatial data.
 
   Arguments:
@@ -229,16 +138,25 @@ class MaxPooling2D(_Pooling2D):
                padding='valid',
                data_format=None,
                **kwargs):
+    if data_format is None:
+      data_format = K.image_data_format()
+    if strides is None:
+      strides = pool_size
     super(MaxPooling2D, self).__init__(pool_size, strides, padding, data_format,
                                        **kwargs)
 
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    output = K.pool2d(
-        inputs, pool_size, strides, padding, data_format, pool_mode='max')
-    return output
+  def get_config(self):
+    config = {
+        'pool_size': self.pool_size,
+        'padding': self.padding,
+        'strides': self.strides,
+        'data_format': self.data_format
+    }
+    base_config = super(MaxPooling2D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
-class AveragePooling2D(_Pooling2D):
+class AveragePooling2D(tf_pooling_layers.AveragePooling2D, Layer):
   """Average pooling operation for spatial data.
 
   Arguments:
@@ -285,68 +203,12 @@ class AveragePooling2D(_Pooling2D):
                padding='valid',
                data_format=None,
                **kwargs):
-    super(AveragePooling2D, self).__init__(pool_size, strides, padding,
-                                           data_format, **kwargs)
-
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    output = K.pool2d(
-        inputs, pool_size, strides, padding, data_format, pool_mode='avg')
-    return output
-
-
-class _Pooling3D(Layer):
-  """Abstract class for different pooling 3D layers.
-  """
-
-  def __init__(self,
-               pool_size=(2, 2, 2),
-               strides=None,
-               padding='valid',
-               data_format=None,
-               **kwargs):
-    super(_Pooling3D, self).__init__(**kwargs)
+    if data_format is None:
+      data_format = K.image_data_format()
     if strides is None:
       strides = pool_size
-    self.pool_size = conv_utils.normalize_tuple(pool_size, 3, 'pool_size')
-    self.strides = conv_utils.normalize_tuple(strides, 3, 'strides')
-    self.padding = conv_utils.normalize_padding(padding)
-    self.data_format = conv_utils.normalize_data_format(data_format)
-    self.input_spec = InputSpec(ndim=5)
-
-  def _compute_output_shape(self, input_shape):
-    input_shape = tensor_shape.TensorShape(input_shape).as_list()
-    if self.data_format == 'channels_first':
-      len_dim1 = input_shape[2]
-      len_dim2 = input_shape[3]
-      len_dim3 = input_shape[4]
-    else:
-      len_dim1 = input_shape[1]
-      len_dim2 = input_shape[2]
-      len_dim3 = input_shape[3]
-    len_dim1 = conv_utils.conv_output_length(len_dim1, self.pool_size[0],
-                                             self.padding, self.strides[0])
-    len_dim2 = conv_utils.conv_output_length(len_dim2, self.pool_size[1],
-                                             self.padding, self.strides[1])
-    len_dim3 = conv_utils.conv_output_length(len_dim3, self.pool_size[2],
-                                             self.padding, self.strides[2])
-    if self.data_format == 'channels_first':
-      return tensor_shape.TensorShape(
-          [input_shape[0], input_shape[1], len_dim1, len_dim2, len_dim3])
-    else:
-      return tensor_shape.TensorShape(
-          [input_shape[0], len_dim1, len_dim2, len_dim3, input_shape[4]])
-
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    raise NotImplementedError
-
-  def call(self, inputs):
-    output = self._pooling_function(
-        inputs=inputs,
-        pool_size=self.pool_size,
-        strides=self.strides,
-        padding=self.padding,
-        data_format=self.data_format)
-    return output
+    super(AveragePooling2D, self).__init__(pool_size, strides, padding,
+                                           data_format, **kwargs)
 
   def get_config(self):
     config = {
@@ -355,11 +217,11 @@ class _Pooling3D(Layer):
         'strides': self.strides,
         'data_format': self.data_format
     }
-    base_config = super(_Pooling3D, self).get_config()
+    base_config = super(AveragePooling2D, self).get_config()
     return dict(list(base_config.items()) + list(config.items()))
 
 
-class MaxPooling3D(_Pooling3D):
+class MaxPooling3D(tf_pooling_layers.MaxPooling3D, Layer):
   """Max pooling operation for 3D data (spatial or spatio-temporal).
 
   Arguments:
@@ -402,16 +264,25 @@ class MaxPooling3D(_Pooling3D):
                padding='valid',
                data_format=None,
                **kwargs):
+    if data_format is None:
+      data_format = K.image_data_format()
+    if strides is None:
+      strides = pool_size
     super(MaxPooling3D, self).__init__(pool_size, strides, padding, data_format,
                                        **kwargs)
 
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    output = K.pool3d(
-        inputs, pool_size, strides, padding, data_format, pool_mode='max')
-    return output
+  def get_config(self):
+    config = {
+        'pool_size': self.pool_size,
+        'padding': self.padding,
+        'strides': self.strides,
+        'data_format': self.data_format
+    }
+    base_config = super(MaxPooling3D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
-class AveragePooling3D(_Pooling3D):
+class AveragePooling3D(tf_pooling_layers.AveragePooling3D, Layer):
   """Average pooling operation for 3D data (spatial or spatio-temporal).
 
   Arguments:
@@ -454,13 +325,22 @@ class AveragePooling3D(_Pooling3D):
                padding='valid',
                data_format=None,
                **kwargs):
+    if data_format is None:
+      data_format = K.image_data_format()
+    if strides is None:
+      strides = pool_size
     super(AveragePooling3D, self).__init__(pool_size, strides, padding,
                                            data_format, **kwargs)
 
-  def _pooling_function(self, inputs, pool_size, strides, padding, data_format):
-    output = K.pool3d(
-        inputs, pool_size, strides, padding, data_format, pool_mode='avg')
-    return output
+  def get_config(self):
+    config = {
+        'pool_size': self.pool_size,
+        'padding': self.padding,
+        'strides': self.strides,
+        'data_format': self.data_format
+    }
+    base_config = super(AveragePooling3D, self).get_config()
+    return dict(list(base_config.items()) + list(config.items()))
 
 
 class _GlobalPooling1D(Layer):
diff --git a/tensorflow/contrib/layers/python/layers/layers_test.py b/tensorflow/contrib/layers/python/layers/layers_test.py
index 60700c5a65..9acce027bc 100644
--- a/tensorflow/contrib/layers/python/layers/layers_test.py
+++ b/tensorflow/contrib/layers/python/layers/layers_test.py
@@ -71,7 +71,6 @@ class AvgPool2DTest(test.TestCase):
     height, width = 3, 6
     images = np.random.uniform(size=(5, 2, height, width))
     output = _layers.avg_pool2d(images, [3, 3], data_format='NCHW')
-    self.assertEquals(output.op.name, 'AvgPool2D/AvgPool')
     self.assertListEqual(output.get_shape().as_list(), [5, 2, 1, 2])
 
   def testCollectOutputs(self):
@@ -2692,7 +2691,6 @@ class MaxPool2DTest(test.TestCase):
     height, width = 3, 6
     images = np.random.uniform(size=(5, 3, height, width)).astype(np.float32)
     output = _layers.max_pool2d(images, [3, 3], data_format='NCHW')
-    self.assertEquals(output.op.name, 'MaxPool2D/MaxPool')
     self.assertListEqual(output.get_shape().as_list(), [5, 3, 1, 2])
 
   def testCollectOutputs(self):
diff --git a/tensorflow/python/layers/base.py b/tensorflow/python/layers/base.py
index cfcd844800..8410f12f3e 100644
--- a/tensorflow/python/layers/base.py
+++ b/tensorflow/python/layers/base.py
@@ -60,6 +60,8 @@ class Layer(object):
     variables: List of all variables of this layer, trainable and non-trainable.
     updates: List of update ops of this layer.
     losses: List of losses added by this layer.
+    input_spec: Object specifying the constraints on inputs that can be
+      accepted by the layer.
   """
 
   def __init__(self, trainable=True, name=None,
@@ -91,6 +93,7 @@ class Layer(object):
     self._per_input_losses = {}
     self._per_input_updates = {}
     self.dtype = dtypes.as_dtype(dtype).name
+    self.input_spec = None
 
     # Determine layer name (non-unique).
     if isinstance(name, vs.VariableScope):
@@ -307,6 +310,9 @@ class Layer(object):
     """Computes the output shape of the layer given the input shape.
 
     Assumes that the layer will be built to match that input shape.
+    If this method is not implemented by child classes, the default
+    assumption will be that the layer does not alter the shape of the tensors
+    passing through it.
 
     Args:
       input_shape: A (possibly nested tuple of) `TensorShape`.  It need not
@@ -321,7 +327,7 @@ class Layer(object):
       ValueError: if `input_shape` is incomplete or is incompatible with the
         the layer.
     """
-    raise NotImplementedError
+    return input_shape
 
   def _set_scope(self, scope=None):
     if self._scope is None:
@@ -416,6 +422,8 @@ class Layer(object):
                            reuse=self.built or self._reuse) as scope:
       with ops.name_scope(scope.original_name_scope):
         if not self.built:
+          # Check input assumptions set before layer building, e.g. input rank.
+          self._assert_input_compatibility(inputs)
           input_list = [
               ops.convert_to_tensor(x, name='input')
               for x in nest.flatten(inputs)]
@@ -426,6 +434,8 @@ class Layer(object):
             self.build(input_shapes)
         if 'scope' in tf_inspect.getargspec(self.call).args:
           kwargs['scope'] = scope
+        # Check input assumptions set after layer building, e.g. input shape.
+        self._assert_input_compatibility(inputs)
         outputs = self.call(inputs, *args, **kwargs)
 
         # Apply activity regularization.
@@ -479,6 +489,139 @@ class Layer(object):
     """
     return self.__call__(inputs, *args, **kwargs)
 
+  def _assert_input_compatibility(self, inputs):
+    """Checks compatibility between the layer and provided inputs.
+
+    This checks that the tensor(s) `inputs` verify the input assumptions
+    of the layer (if any). If not, a clear and actional exception gets raised.
+
+    Arguments:
+        inputs: input tensor or list of input tensors.
+
+    Raises:
+        ValueError: in case of mismatch between
+            the provided inputs and the expectations of the layer.
+    """
+    if not self.input_spec:
+      return
+    if not isinstance(self.input_spec, (list, tuple)):
+      input_spec = _to_list(self.input_spec)
+    else:
+      input_spec = self.input_spec
+    inputs = _to_list(inputs)
+    if len(inputs) != len(input_spec):
+      raise ValueError('Layer ' + self.name + ' expects ' +
+                       str(len(input_spec)) + ' inputs, '
+                       'but it received ' + str(len(inputs)) +
+                       ' input tensors. Inputs received: ' + str(inputs))
+    for input_index, (x, spec) in enumerate(zip(inputs, input_spec)):
+      if spec is None:
+        continue
+
+      if (spec.ndim is not None or
+          spec.min_ndim is not None or
+          spec.max_ndim is not None):
+        if x.get_shape().ndims is None:
+          raise ValueError('Input ' + str(input_index) + ' of layer ' +
+                           self.name + ' is incompatible with the layer: '
+                           'its rank is undefined, by the layer requires a '
+                           'defined rank.')
+
+      # Check ndim.
+      if spec.ndim is not None:
+        ndim = x.get_shape().ndims
+        if ndim != spec.ndim:
+          raise ValueError('Input ' + str(input_index) + ' of layer ' +
+                           self.name + ' is incompatible with the layer: '
+                           'expected ndim=' + str(spec.ndim) + ', found ndim='
+                           + str(ndim) + '. Full shape received: ' +
+                           str(x.get_shape().as_list()))
+      if spec.max_ndim is not None:
+        ndim = x.get_shape().ndims
+        if ndim is not None and ndim > spec.max_ndim:
+          raise ValueError('Input ' + str(input_index) + ' of layer ' +
+                           self.name + ' is incompatible with the layer: '
+                           'expected max_ndim=' + str(spec.max_ndim) +
+                           ', found ndim=' + str(ndim))
+      if spec.min_ndim is not None:
+        ndim = x.get_shape().ndims
+        if ndim is not None and ndim < spec.min_ndim:
+          raise ValueError('Input ' + str(input_index) + ' of layer ' +
+                           self.name + ' is incompatible with the layer: '
+                           ': expected min_ndim=' + str(spec.min_ndim) +
+                           ', found ndim=' + str(ndim) +
+                           '. Full shape received: ' +
+                           str(x.get_shape().as_list()))
+      # Check dtype.
+      if spec.dtype is not None:
+        if x.dtype != spec.dtype:
+          raise ValueError('Input ' + str(input_index) + ' of layer ' +
+                           self.name + ' is incompatible with the layer: '
+                           'expected dtype=' + str(spec.dtype) +
+                           ', found dtype=' + str(x.dtype))
+      # Check specific shape axes.
+      if spec.axes:
+        shape = x.get_shape().as_list()
+        if shape is not None:
+          for axis, value in spec.axes.items():
+            if hasattr(value, 'value'):
+              value = value.value
+            if value is not None and shape[int(axis)] not in {value, None}:
+              raise ValueError(
+                  'Input ' + str(input_index) + ' of layer ' + self.name + ' is'
+                  ' incompatible with the layer: expected axis ' + str(axis) +
+                  ' of input shape to have value ' + str(value) +
+                  ' but received input with shape ' + str(shape))
+      # Check shape.
+      if spec.shape is not None:
+        shape = x.get_shape().as_list()
+        if shape is not None:
+          for spec_dim, dim in zip(spec.shape, shape):
+            if spec_dim is not None and dim is not None:
+              if spec_dim != dim:
+                raise ValueError('Input ' + str(input_index) +
+                                 ' is incompatible with layer ' + self.name +
+                                 ': expected shape=' + str(spec.shape) +
+                                 ', found shape=' + str(shape))
+
+
+class InputSpec(object):
+  """Specifies the ndim, dtype and shape of every input to a layer.
+
+  Every layer should expose (if appropriate) an `input_spec` attribute:
+  a list of instances of InputSpec (one per input tensor).
+
+  A None entry in a shape is compatible with any dimension,
+  a None shape is compatible with any shape.
+
+  Arguments:
+      dtype: Expected DataType of the input.
+      shape: Shape tuple, expected shape of the input
+          (may include None for unchecked axes).
+      ndim: Integer, expected rank of the input.
+      max_ndim: Integer, maximum rank of the input.
+      min_ndim: Integer, minimum rank of the input.
+      axes: Dictionary mapping integer axes to
+          a specific dimension value.
+  """
+
+  def __init__(self,
+               dtype=None,
+               shape=None,
+               ndim=None,
+               max_ndim=None,
+               min_ndim=None,
+               axes=None):
+    self.dtype = dtype
+    self.shape = shape
+    if shape is not None:
+      self.ndim = len(shape)
+    else:
+      self.ndim = ndim
+    self.max_ndim = max_ndim
+    self.min_ndim = min_ndim
+    self.axes = axes or {}
+
 
 def _to_snake_case(name):
   intermediate = re.sub('(.)([A-Z][a-z0-9]+)', r'\1_\2', name)
diff --git a/tensorflow/python/layers/base_test.py b/tensorflow/python/layers/base_test.py
index 9e2457a489..81fbe5fbf7 100644
--- a/tensorflow/python/layers/base_test.py
+++ b/tensorflow/python/layers/base_test.py
@@ -22,6 +22,7 @@ import copy
 
 from tensorflow.python.framework import ops
 from tensorflow.python.layers import base as base_layers
+from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
@@ -248,6 +249,153 @@ class BaseLayerTest(test.TestCase):
       my_layer_scoped1.apply(inputs)
       self.assertEqual(my_layer_scoped1._scope.name, 'var_scope/my_layer_1')
 
+  def testInputSpecNdimCheck(self):
+
+    class CustomerLayer(base_layers.Layer):
+
+      def __init__(self):
+        super(CustomerLayer, self).__init__()
+        self.input_spec = base_layers.InputSpec(ndim=2)
+
+      def call(self, inputs):
+        return inputs
+
+    layer = CustomerLayer()
+    with self.assertRaisesRegexp(ValueError,
+                                 r'requires a defined rank'):
+      layer.apply(array_ops.placeholder('int32'))
+
+    with self.assertRaisesRegexp(ValueError,
+                                 r'expected ndim=2'):
+      layer.apply(array_ops.placeholder('int32', shape=(None,)))
+
+    # Works
+    layer.apply(array_ops.placeholder('int32', shape=(None, None)))
+
+  def testInputSpecMinNdimCheck(self):
+
+    class CustomerLayer(base_layers.Layer):
+
+      def __init__(self):
+        super(CustomerLayer, self).__init__()
+        self.input_spec = base_layers.InputSpec(min_ndim=2)
+
+      def call(self, inputs):
+        return inputs
+
+    layer = CustomerLayer()
+    with self.assertRaisesRegexp(ValueError,
+                                 r'requires a defined rank'):
+      layer.apply(array_ops.placeholder('int32'))
+
+    with self.assertRaisesRegexp(ValueError,
+                                 r'expected min_ndim=2'):
+      layer.apply(array_ops.placeholder('int32', shape=(None,)))
+
+    # Works
+    layer.apply(array_ops.placeholder('int32', shape=(None, None)))
+    layer.apply(array_ops.placeholder('int32', shape=(None, None, None)))
+
+  def testInputSpecMaxNdimCheck(self):
+
+    class CustomerLayer(base_layers.Layer):
+
+      def __init__(self):
+        super(CustomerLayer, self).__init__()
+        self.input_spec = base_layers.InputSpec(max_ndim=2)
+
+      def call(self, inputs):
+        return inputs
+
+    layer = CustomerLayer()
+    with self.assertRaisesRegexp(ValueError,
+                                 r'requires a defined rank'):
+      layer.apply(array_ops.placeholder('int32'))
+
+    with self.assertRaisesRegexp(ValueError,
+                                 r'expected max_ndim=2'):
+      layer.apply(array_ops.placeholder('int32', shape=(None, None, None)))
+
+    # Works
+    layer.apply(array_ops.placeholder('int32', shape=(None, None)))
+    layer.apply(array_ops.placeholder('int32', shape=(None,)))
+
+  def testInputSpecDtypeCheck(self):
+
+    class CustomerLayer(base_layers.Layer):
+
+      def __init__(self):
+        super(CustomerLayer, self).__init__()
+        self.input_spec = base_layers.InputSpec(dtype='float32')
+
+      def call(self, inputs):
+        return inputs
+
+    layer = CustomerLayer()
+    with self.assertRaisesRegexp(ValueError,
+                                 r'expected dtype=float32'):
+      layer.apply(array_ops.placeholder('int32'))
+
+    # Works
+    layer.apply(array_ops.placeholder('float32', shape=(None, None)))
+
+  def testInputSpecAxesCheck(self):
+
+    class CustomerLayer(base_layers.Layer):
+
+      def __init__(self):
+        super(CustomerLayer, self).__init__()
+        self.input_spec = base_layers.InputSpec(axes={-1: 2})
+
+      def call(self, inputs):
+        return inputs
+
+    layer = CustomerLayer()
+    with self.assertRaisesRegexp(ValueError,
+                                 r'expected axis'):
+      layer.apply(array_ops.placeholder('int32', shape=(None, 3)))
+
+    # Works
+    layer.apply(array_ops.placeholder('int32', shape=(None, None, 2)))
+    layer.apply(array_ops.placeholder('int32', shape=(None, 2)))
+
+  def testInputSpecShapeCheck(self):
+
+    class CustomerLayer(base_layers.Layer):
+
+      def __init__(self):
+        super(CustomerLayer, self).__init__()
+        self.input_spec = base_layers.InputSpec(shape=(None, 3))
+
+      def call(self, inputs):
+        return inputs
+
+    layer = CustomerLayer()
+    with self.assertRaisesRegexp(ValueError,
+                                 r'expected shape'):
+      layer.apply(array_ops.placeholder('int32', shape=(None, 2)))
+
+    # Works
+    layer.apply(array_ops.placeholder('int32', shape=(None, 3)))
+    layer.apply(array_ops.placeholder('int32', shape=(2, 3)))
+
+  def testNoInputSpec(self):
+
+    class CustomerLayer(base_layers.Layer):
+
+      def __init__(self):
+        super(CustomerLayer, self).__init__()
+        self.input_spec = None
+
+      def call(self, inputs):
+        return inputs
+
+    layer = CustomerLayer()
+
+    # Works
+    layer.apply(array_ops.placeholder('int32'))
+    layer.apply(array_ops.placeholder('int32', shape=(2, 3)))
+
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py
index 707d30b0e0..b61168695a 100644
--- a/tensorflow/python/layers/convolutional.py
+++ b/tensorflow/python/layers/convolutional.py
@@ -32,9 +32,10 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import standard_ops
 from tensorflow.python.ops import variable_scope as vs
-
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.layers import base
 from tensorflow.python.layers import utils
+from tensorflow.python import framework
 
 
 class _Conv(base.Layer):
@@ -42,9 +43,9 @@ class _Conv(base.Layer):
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True, a bias vector is created and added to the
-  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
-  as well.
+  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
+  a bias vector is created and added to the outputs. Finally, if
+  `activation` is not `None`, it is applied to the outputs as well.
 
   Arguments:
     rank: An integer, the rank of the convolution, e.g. "2" for 2D convolution.
@@ -70,8 +71,8 @@ class _Conv(base.Layer):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -114,12 +115,10 @@ class _Conv(base.Layer):
     self.kernel_regularizer = kernel_regularizer
     self.bias_regularizer = bias_regularizer
     self.activity_regularizer = activity_regularizer
+    self.input_spec = base.InputSpec(ndim=self.rank + 2)
 
   def build(self, input_shape):
-    if len(input_shape) != self.rank + 2:
-      raise ValueError('Inputs should have rank ' +
-                       str(self.rank + 2) +
-                       '. Received input shape: ' + str(input_shape))
+    input_shape = tensor_shape.TensorShape(input_shape)
     if self.data_format == 'channels_first':
       channel_axis = 1
     else:
@@ -145,23 +144,56 @@ class _Conv(base.Layer):
                                     dtype=self.dtype)
     else:
       self.bias = None
+    self.input_spec = base.InputSpec(ndim=self.rank + 2,
+                                     axes={channel_axis: input_dim})
     self.built = True
 
   def call(self, inputs):
+    if (self.data_format == 'channels_first' and
+        not framework.test_util.gpu_device_name()):
+      # `nn.convolution` is not implemented on CPU for `channels_first` format.
+      # In cases where we are most likely running on CPU using `channels_first`,
+      # we reshape the inputs to use `channels_last` (and reshape them back
+      # afterwards). This is a temporary fix; a better solution would be a fix
+      # at the op level.
+      # TODO(chollet): remove this when `nn.convolution` is feature-complete.
+      data_format = 'channels_last'
+      if self.rank == 1:
+        inputs = array_ops.transpose(inputs, (0, 2, 1))
+      elif self.rank == 2:
+        inputs = array_ops.transpose(inputs, (0, 2, 3, 1))
+      elif self.rank == 3:
+        inputs = array_ops.transpose(inputs, (0, 2, 3, 4, 1))
+    else:
+      data_format = self.data_format
     outputs = nn.convolution(
         input=inputs,
         filter=self.kernel,
         dilation_rate=self.dilation_rate,
         strides=self.strides,
         padding=self.padding.upper(),
-        data_format=utils.convert_data_format(self.data_format, self.rank + 2))
+        data_format=utils.convert_data_format(data_format,
+                                              self.rank + 2))
+    if (self.data_format == 'channels_first' and
+        not framework.test_util.gpu_device_name()):
+      if self.rank == 1:
+        outputs = array_ops.transpose(outputs, (0, 2, 1))
+      elif self.rank == 2:
+        outputs = array_ops.transpose(outputs, (0, 3, 1, 2))
+      elif self.rank == 3:
+        outputs = array_ops.transpose(outputs, (0, 4, 1, 2, 3))
+
     if self.bias is not None:
-      if self.rank != 2 and self.data_format == 'channels_first':
-        # bias_add does not support channels_first for non-4D inputs.
+      if self.data_format == 'channels_first':
+        # bias_add only supports NHWC.
+        # TODO(fchollet): remove this when `bias_add` is feature-complete.
         if self.rank == 1:
           bias = array_ops.reshape(self.bias, (1, self.filters, 1))
           outputs += bias
-        elif self.rank == 3:
+        if self.rank == 2:
+          bias = array_ops.reshape(self.bias, (1, self.filters, 1, 1))
+          outputs += bias
+        if self.rank == 3:
           # As of Mar 2017, direct addition is significantly slower than
           # bias_add when computing gradients. To use bias_add, we collapse Z
           # and Y into a single dimension to obtain a 4D input tensor.
@@ -187,15 +219,44 @@ class _Conv(base.Layer):
       return self.activation(outputs)
     return outputs
 
+  def _compute_output_shape(self, input_shape):
+    input_shape = tensor_shape.TensorShape(input_shape).as_list()
+    if self.data_format == 'channels_last':
+      space = input_shape[1:-1]
+      new_space = []
+      for i in range(len(space)):
+        new_dim = utils.conv_output_length(
+            space[i],
+            self.kernel_size[i],
+            padding=self.padding,
+            stride=self.strides[i],
+            dilation=self.dilation_rate[i])
+        new_space.append(new_dim)
+      return tensor_shape.TensorShape([input_shape[0]] + new_space +
+                                      [self.filters])
+    else:
+      space = input_shape[2:]
+      new_space = []
+      for i in range(len(space)):
+        new_dim = utils.conv_output_length(
+            space[i],
+            self.kernel_size[i],
+            padding=self.padding,
+            stride=self.strides[i],
+            dilation=self.dilation_rate[i])
+        new_space.append(new_dim)
+      return tensor_shape.TensorShape([input_shape[0], self.filters] +
+                                      new_space)
+
 
 class Conv1D(_Conv):
   """1D convolution layer (e.g. temporal convolution).
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True, a bias vector is created and added to the
-  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
-  as well.
+  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
+  a bias vector is created and added to the outputs. Finally, if
+  `activation` is not `None`, it is applied to the outputs as well.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -220,8 +281,8 @@ class Conv1D(_Conv):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -286,9 +347,9 @@ def conv1d(inputs,
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True, a bias vector is created and added to the
-  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
-  as well.
+  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
+  a bias vector is created and added to the outputs. Finally, if
+  `activation` is not `None`, it is applied to the outputs as well.
 
   Arguments:
     inputs: Tensor input.
@@ -314,8 +375,8 @@ def conv1d(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -354,9 +415,9 @@ class Conv2D(_Conv):
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True, a bias vector is created and added to the
-  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
-  as well.
+  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
+  a bias vector is created and added to the outputs. Finally, if
+  `activation` is not `None`, it is applied to the outputs as well.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -388,8 +449,8 @@ class Conv2D(_Conv):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -454,9 +515,9 @@ def conv2d(inputs,
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True, a bias vector is created and added to the
-  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
-  as well.
+  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
+  a bias vector is created and added to the outputs. Finally, if
+  `activation` is not `None`, it is applied to the outputs as well.
 
   Arguments:
     inputs: Tensor input.
@@ -489,8 +550,8 @@ def conv2d(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -529,9 +590,9 @@ class Conv3D(_Conv):
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True, a bias vector is created and added to the
-  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
-  as well.
+  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
+  a bias vector is created and added to the outputs. Finally, if
+  `activation` is not `None`, it is applied to the outputs as well.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -564,8 +625,8 @@ class Conv3D(_Conv):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -630,9 +691,9 @@ def conv3d(inputs,
 
   This layer creates a convolution kernel that is convolved
   (actually cross-correlated) with the layer input to produce a tensor of
-  outputs. If `use_bias` is True, a bias vector is created and added to the
-  outputs. Finally, if `activation` is not `None`, it is applied to the outputs
-  as well.
+  outputs. If `use_bias` is True (and a `bias_initializer` is provided),
+  a bias vector is created and added to the outputs. Finally, if
+  `activation` is not `None`, it is applied to the outputs as well.
 
   Arguments:
     inputs: Tensor input.
@@ -666,8 +727,8 @@ def conv3d(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -704,10 +765,11 @@ def conv3d(inputs,
 class SeparableConv2D(Conv2D):
   """Depthwise separable 2D convolution.
 
-  This layer performs a depthwise convolution that acts separately on channels,
-  followed by a pointwise convolution that mixes channels. If `use_bias` is
-  True, it adds a bias vector to the output. It then optionally applies an
-  activation function to produce the final output.
+  This layer performs a depthwise convolution that acts separately on
+  channels, followed by a pointwise convolution that mixes channels.
+  If `use_bias` is True and a bias initializer is provided,
+  it adds a bias vector to the output.
+  It then optionally applies an activation function to produce the final output.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -741,8 +803,8 @@ class SeparableConv2D(Conv2D):
     use_bias: Boolean, whether the layer uses a bias.
     depthwise_initializer: An initializer for the depthwise convolution kernel.
     pointwise_initializer: An initializer for the pointwise convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     depthwise_regularizer: Optional regularizer for the depthwise
       convolution kernel.
     pointwise_regularizer: Optional regularizer for the pointwise
@@ -806,6 +868,7 @@ class SeparableConv2D(Conv2D):
                        '`SeparableConv2D` '
                        'should be defined. Found `None`.')
     input_dim = int(input_shape[channel_axis])
+    self.input_spec = base.InputSpec(ndim=4, axes={channel_axis: input_dim})
     depthwise_kernel_shape = (self.kernel_size[0],
                               self.kernel_size[1],
                               input_dim,
@@ -867,6 +930,26 @@ class SeparableConv2D(Conv2D):
       return self.activation(outputs)
     return outputs
 
+  def _compute_output_shape(self, input_shape):
+    input_shape = tensor_shape.TensorShape(input_shape).as_list()
+    if self.data_format == 'channels_first':
+      rows = input_shape[2]
+      cols = input_shape[3]
+    else:
+      rows = input_shape[1]
+      cols = input_shape[2]
+
+    rows = utils.conv_output_length(rows, self.kernel_size[0],
+                                    self.padding, self.strides[0])
+    cols = utils.conv_output_length(cols, self.kernel_size[1],
+                                    self.padding, self.strides[1])
+    if self.data_format == 'channels_first':
+      return tensor_shape.TensorShape(
+          [input_shape[0], self.filters, rows, cols])
+    else:
+      return tensor_shape.TensorShape(
+          [input_shape[0], rows, cols, self.filters])
+
 
 def separable_conv2d(inputs,
                      filters,
@@ -890,10 +973,11 @@ def separable_conv2d(inputs,
                      reuse=None):
   """Functional interface for the depthwise separable 2D convolution layer.
 
-  This layer performs a depthwise convolution that acts separately on channels,
-  followed by a pointwise convolution that mixes channels. If `use_bias` is
-  True, it adds a bias vector to the output. It then optionally applies an
-  activation function to produce the final output.
+  This layer performs a depthwise convolution that acts separately on
+  channels, followed by a pointwise convolution that mixes channels.
+  If `use_bias` is True and a bias initializer is provided,
+  it adds a bias vector to the output.
+  It then optionally applies an activation function to produce the final output.
 
   Arguments:
     inputs: Input tensor.
@@ -928,8 +1012,8 @@ def separable_conv2d(inputs,
     use_bias: Boolean, whether the layer uses a bias.
     depthwise_initializer: An initializer for the depthwise convolution kernel.
     pointwise_initializer: An initializer for the pointwise convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     depthwise_regularizer: Optional regularizer for the depthwise
       convolution kernel.
     pointwise_regularizer: Optional regularizer for the pointwise
@@ -972,11 +1056,12 @@ def separable_conv2d(inputs,
 class Conv2DTranspose(Conv2D):
   """Transposed 2D convolution layer (sometimes called 2D Deconvolution).
 
-  The need for transposed convolutions generally arises from the desire to use a
-  transformation going in the opposite direction of a normal convolution, i.e.,
-  from something that has the shape of the output of some convolution to
-  something that has the shape of its input while maintaining a connectivity
-  pattern that is compatible with said convolution.
+  The need for transposed convolutions generally arises
+  from the desire to use a transformation going in the opposite direction
+  of a normal convolution, i.e., from something that has the shape of the
+  output of some convolution to something that has the shape of its input
+  while maintaining a connectivity pattern that is compatible with
+  said convolution.
 
   Arguments:
     filters: Integer, the dimensionality of the output space (i.e. the number
@@ -997,8 +1082,8 @@ class Conv2DTranspose(Conv2D):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -1038,6 +1123,7 @@ class Conv2DTranspose(Conv2D):
         trainable=trainable,
         name=name,
         **kwargs)
+    self.input_spec = base.InputSpec(ndim=4)
 
   def build(self, input_shape):
     if len(input_shape) != 4:
@@ -1052,6 +1138,7 @@ class Conv2DTranspose(Conv2D):
       raise ValueError('The channel dimension of the inputs '
                        'should be defined. Found `None`.')
     input_dim = input_shape[channel_axis]
+    self.input_spec = base.InputSpec(ndim=4, axes={channel_axis: input_dim})
     kernel_shape = self.kernel_size + (self.filters, input_dim)
 
     self.kernel = self.add_variable(name='kernel',
@@ -1084,9 +1171,14 @@ class Conv2DTranspose(Conv2D):
     stride_h, stride_w = self.strides
 
     # Infer the dynamic output shape:
-    out_height = utils.get_deconv_dim(height, stride_h, kernel_h, self.padding)
-    out_width = utils.get_deconv_dim(width, stride_w, kernel_w, self.padding)
-
+    out_height = utils.deconv_output_length(height,
+                                            kernel_h,
+                                            self.padding,
+                                            stride_h)
+    out_width = utils.deconv_output_length(width,
+                                           kernel_w,
+                                           self.padding,
+                                           stride_w)
     if self.data_format == 'channels_first':
       output_shape = (batch_size, self.filters, out_height, out_width)
       strides = (1, 1, stride_h, stride_w)
@@ -1106,10 +1198,14 @@ class Conv2DTranspose(Conv2D):
     # Infer the static output shape:
     out_shape = inputs.get_shape().as_list()
     out_shape[c_axis] = self.filters
-    out_shape[h_axis] = utils.get_deconv_dim(out_shape[h_axis], stride_h,
-                                             kernel_h, self.padding)
-    out_shape[w_axis] = utils.get_deconv_dim(out_shape[w_axis], stride_w,
-                                             kernel_w, self.padding)
+    out_shape[h_axis] = utils.deconv_output_length(out_shape[h_axis],
+                                                   kernel_h,
+                                                   self.padding,
+                                                   stride_h)
+    out_shape[w_axis] = utils.deconv_output_length(out_shape[w_axis],
+                                                   kernel_w,
+                                                   self.padding,
+                                                   stride_w)
     outputs.set_shape(out_shape)
 
     if self.bias:
@@ -1122,6 +1218,24 @@ class Conv2DTranspose(Conv2D):
       return self.activation(outputs)
     return outputs
 
+  def _compute_output_shape(self, input_shape):
+    input_shape = tensor_shape.TensorShape(input_shape).as_list()
+    output_shape = list(input_shape)
+    if self.data_format == 'channels_first':
+      c_axis, h_axis, w_axis = 1, 2, 3
+    else:
+      c_axis, h_axis, w_axis = 3, 1, 2
+
+    kernel_h, kernel_w = self.kernel_size
+    stride_h, stride_w = self.strides
+
+    output_shape[c_axis] = self.filters
+    output_shape[h_axis] = utils.deconv_output_length(
+        output_shape[h_axis], kernel_h, self.padding, stride_h)
+    output_shape[w_axis] = utils.deconv_output_length(
+        output_shape[w_axis], kernel_w, self.padding, stride_w)
+    return tensor_shape.TensorShape(output_shape)
+
 
 def conv2d_transpose(inputs,
                      filters,
@@ -1141,11 +1255,12 @@ def conv2d_transpose(inputs,
                      reuse=None):
   """Functional interface for transposed 2D convolution layer.
 
-  The need for transposed convolutions generally arises from the desire to use a
-  transformation going in the opposite direction of a normal convolution, i.e.,
-  from something that has the shape of the output of some convolution to
-  something that has the shape of its input while maintaining a connectivity
-  pattern that is compatible with said convolution.
+  The need for transposed convolutions generally arises
+  from the desire to use a transformation going in the opposite direction
+  of a normal convolution, i.e., from something that has the shape of the
+  output of some convolution to something that has the shape of its input
+  while maintaining a connectivity pattern that is compatible with
+  said convolution.
 
   Arguments:
     inputs: Input tensor.
@@ -1167,8 +1282,8 @@ def conv2d_transpose(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If `None`, then no
+      bias will be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -1226,8 +1341,8 @@ class Conv3DTranspose(Conv3D):
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If `None`, then no
+      bias will be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
@@ -1317,10 +1432,18 @@ class Conv3DTranspose(Conv3D):
     stride_d, stride_h, stride_w = self.strides
 
     # Infer the dynamic output shape:
-    out_depth = utils.get_deconv_dim(depth, stride_d, kernel_d, self.padding)
-    out_height = utils.get_deconv_dim(height, stride_h, kernel_h, self.padding)
-    out_width = utils.get_deconv_dim(width, stride_w, kernel_w, self.padding)
-
+    out_depth = utils.deconv_output_length(depth,
+                                           kernel_d,
+                                           self.padding,
+                                           stride_d)
+    out_height = utils.deconv_output_length(height,
+                                            kernel_h,
+                                            self.padding,
+                                            stride_h)
+    out_width = utils.deconv_output_length(width,
+                                           kernel_w,
+                                           self.padding,
+                                           stride_w)
     if self.data_format == 'channels_first':
       output_shape = (batch_size, self.filters, out_depth, out_height,
                       out_width)
@@ -1342,12 +1465,18 @@ class Conv3DTranspose(Conv3D):
     # Infer the static output shape:
     out_shape = inputs.get_shape().as_list()
     out_shape[c_axis] = self.filters
-    out_shape[d_axis] = utils.get_deconv_dim(out_shape[d_axis], stride_d,
-                                             kernel_d, self.padding)
-    out_shape[h_axis] = utils.get_deconv_dim(out_shape[h_axis], stride_h,
-                                             kernel_h, self.padding)
-    out_shape[w_axis] = utils.get_deconv_dim(out_shape[w_axis], stride_w,
-                                             kernel_w, self.padding)
+    out_shape[d_axis] = utils.deconv_output_length(out_shape[d_axis],
+                                                   kernel_d,
+                                                   self.padding,
+                                                   stride_d)
+    out_shape[h_axis] = utils.deconv_output_length(out_shape[h_axis],
+                                                   kernel_h,
+                                                   self.padding,
+                                                   stride_h)
+    out_shape[w_axis] = utils.deconv_output_length(out_shape[w_axis],
+                                                   kernel_w,
+                                                   self.padding,
+                                                   stride_w)
     outputs.set_shape(out_shape)
 
     if self.bias:
@@ -1411,8 +1540,8 @@ def conv3d_transpose(inputs,
       linear activation.
     use_bias: Boolean, whether the layer uses a bias.
     kernel_initializer: An initializer for the convolution kernel.
-    bias_initializer: An initializer for the bias vector. Will be ignored if
-      `use_bias` is `False`.
+    bias_initializer: An initializer for the bias vector. If None, no bias will
+      be applied.
     kernel_regularizer: Optional regularizer for the convolution kernel.
     bias_regularizer: Optional regularizer for the bias vector.
     activity_regularizer: Regularizer function for the output.
diff --git a/tensorflow/python/layers/core.py b/tensorflow/python/layers/core.py
index 1ec4e51e5e..c63f8e5792 100644
--- a/tensorflow/python/layers/core.py
+++ b/tensorflow/python/layers/core.py
@@ -101,20 +101,15 @@ class Dense(base.Layer):
     self.kernel_regularizer = kernel_regularizer
     self.bias_regularizer = bias_regularizer
     self.activity_regularizer = activity_regularizer
+    self.input_spec = base.InputSpec(min_ndim=2)
 
   def build(self, input_shape):
     input_shape = tensor_shape.TensorShape(input_shape)
-    if input_shape.ndims is None:
-      raise ValueError('Inputs to `Dense` should have known rank.')
-    if len(input_shape) < 2:
-      raise ValueError('Inputs to `Dense` should have rank >= 2.')
     if input_shape[-1].value is None:
       raise ValueError('The last dimension of the inputs to `Dense` '
                        'should be defined. Found `None`.')
-    # Note that we set `trainable=True` because this is a trainable
-    # weight of the layer. If the layer is not trainable
-    # (self.trainable = False), the variable will not be added to
-    # tf.trainable_variables(), and self.trainable_weights will be empty.
+    self.input_spec = base.InputSpec(min_ndim=2,
+                                     axes={-1: input_shape[-1].value})
     self.kernel = self.add_variable('kernel',
                                     shape=[input_shape[-1].value, self.units],
                                     initializer=self.kernel_initializer,
@@ -249,14 +244,20 @@ class Dropout(base.Layer):
                name=None,
                **kwargs):
     super(Dropout, self).__init__(name=name, **kwargs)
-    self.rate = rate
+    self.rate = min(1., max(0., rate))
     self.noise_shape = noise_shape
     self.seed = seed
 
+  def _get_noise_shape(self, _):
+    # Subclasses of `Dropout` may implement `_get_noise_shape(self, inputs)`,
+    # which will override `self.noise_shape`, and allows for custom noise
+    # shapes with dynamically sized inputs.
+    return self.noise_shape
+
   def call(self, inputs, training=False):
     def dropped_inputs():
       return nn.dropout(inputs, 1  - self.rate,
-                        noise_shape=self.noise_shape,
+                        noise_shape=self._get_noise_shape(inputs),
                         seed=self.seed)
     return utils.smart_cond(training,
                             dropped_inputs,
diff --git a/tensorflow/python/layers/core_test.py b/tensorflow/python/layers/core_test.py
index 3939969159..0ee477371a 100644
--- a/tensorflow/python/layers/core_test.py
+++ b/tensorflow/python/layers/core_test.py
@@ -47,10 +47,10 @@ class DenseTest(test.TestCase):
 
     # Test auto-naming
     dense = core_layers.Dense(2, activation=nn_ops.relu)
-    dense.apply(np.random.randn(0, 2))
+    dense.apply(random_ops.random_uniform((5, 2)))
     self.assertEqual(dense.name, 'dense_1')
     dense = core_layers.Dense(2, activation=nn_ops.relu)
-    dense.apply(np.random.randn(0, 2))
+    dense.apply(random_ops.random_uniform((5, 2)))
     self.assertEqual(dense.name, 'dense_2')
 
   def testCall(self):
diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py
index bbb11dbfe1..8733d65769 100644
--- a/tensorflow/python/layers/normalization.py
+++ b/tensorflow/python/layers/normalization.py
@@ -96,11 +96,11 @@ class BatchNormalization(base.Layer):
                moving_variance_initializer=init_ops.ones_initializer(),
                beta_regularizer=None,
                gamma_regularizer=None,
-               trainable=True,
-               name=None,
                renorm=False,
                renorm_clipping=None,
                renorm_momentum=0.99,
+               trainable=True,
+               name=None,
                **kwargs):
     super(BatchNormalization, self).__init__(
         name=name, trainable=trainable, **kwargs)
@@ -141,6 +141,8 @@ class BatchNormalization(base.Layer):
     if not param_dim.value:
       raise ValueError('Input has undefined `axis` dimension. Input shape: ',
                        input_shape)
+    self.input_spec = base.InputSpec(ndim=ndim,
+                                     axes={self.axis: param_dim.value})
 
     if self.center:
       self.beta = self.add_variable(name='beta',
@@ -313,9 +315,8 @@ class BatchNormalization(base.Layer):
       variance_update = moving_averages.assign_moving_average(
           self.moving_variance, new_variance, decay, zero_debias=False)
 
-      if not self.updates:
-        self.add_update(mean_update)
-        self.add_update(variance_update)
+      self.add_update(mean_update, inputs=inputs)
+      self.add_update(variance_update, inputs=inputs)
 
     else:
       mean, variance = self.moving_mean, self.moving_variance
diff --git a/tensorflow/python/layers/pooling.py b/tensorflow/python/layers/pooling.py
index a1dfab09de..6cd644b642 100644
--- a/tensorflow/python/layers/pooling.py
+++ b/tensorflow/python/layers/pooling.py
@@ -31,9 +31,10 @@ from tensorflow.python.ops import nn
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import standard_ops
 from tensorflow.python.ops import variable_scope as vs
-
+from tensorflow.python.framework import tensor_shape
 from tensorflow.python.layers import base
 from tensorflow.python.layers import utils
+from tensorflow.python import framework
 
 
 class _Pooling1D(base.Layer):
@@ -66,12 +67,7 @@ class _Pooling1D(base.Layer):
     self.strides = utils.normalize_tuple(strides, 1, 'strides')
     self.padding = utils.normalize_padding(padding)
     self.data_format = utils.normalize_data_format(data_format)
-
-  def build(self, input_shape):
-    if len(input_shape) != 3:
-      raise ValueError('Inputs should have rank 3. '
-                       'Received input shape:', str(input_shape))
-    self.built = True
+    self.input_spec = base.InputSpec(ndim=3)
 
   def call(self, inputs):
     # There is no TF op for 1D pooling, hence we make the inputs 4D.
@@ -98,6 +94,12 @@ class _Pooling1D(base.Layer):
     else:
       return array_ops.squeeze(outputs, 1)
 
+  def _compute_output_shape(self, input_shape):
+    input_shape = tensor_shape.TensorShape(input_shape).as_list()
+    length = utils.conv_output_length(input_shape[1], self.pool_size[0],
+                                      self.padding, self.strides[0])
+    return tensor_shape.TensorShape([input_shape[0], length, input_shape[2]])
+
 
 class AveragePooling1D(_Pooling1D):
   """Average Pooling layer for 1D inputs.
@@ -257,26 +259,54 @@ class _Pooling2D(base.Layer):
     self.strides = utils.normalize_tuple(strides, 2, 'strides')
     self.padding = utils.normalize_padding(padding)
     self.data_format = utils.normalize_data_format(data_format)
-
-  def build(self, input_shape):
-    if len(input_shape) != 4:
-      raise ValueError('Inputs should have rank 4. '
-                       'Received input shape:', str(input_shape))
-    self.built = True
+    self.input_spec = base.InputSpec(ndim=4)
 
   def call(self, inputs):
-    if self.data_format == 'channels_last':
+    if (self.data_format == 'channels_first' and
+        not framework.test_util.gpu_device_name()):
+      # `nn.convolution` is not implemented on CPU for `channels_first` format.
+      # TODO(chollet): remove this when `nn.convolution` is feature-complete.
+      data_format = 'channels_last'
+      inputs = array_ops.transpose(inputs, (0, 2, 3, 1))
+    else:
+      data_format = self.data_format
+
+    if data_format == 'channels_last':
       pool_shape = (1,) + self.pool_size + (1,)
       strides = (1,) + self.strides + (1,)
     else:
       pool_shape = (1, 1) + self.pool_size
       strides = (1, 1) + self.strides
-    return self.pool_function(
+    outputs = self.pool_function(
         inputs,
         ksize=pool_shape,
         strides=strides,
         padding=self.padding.upper(),
-        data_format=utils.convert_data_format(self.data_format, 4))
+        data_format=utils.convert_data_format(data_format, 4))
+
+    if (self.data_format == 'channels_first' and
+        not framework.test_util.gpu_device_name()):
+      outputs = array_ops.transpose(outputs, (0, 3, 1, 2))
+    return outputs
+
+  def _compute_output_shape(self, input_shape):
+    input_shape = tensor_shape.TensorShape(input_shape).as_list()
+    if self.data_format == 'channels_first':
+      rows = input_shape[2]
+      cols = input_shape[3]
+    else:
+      rows = input_shape[1]
+      cols = input_shape[2]
+    rows = utils.conv_output_length(rows, self.pool_size[0], self.padding,
+                                    self.strides[0])
+    cols = utils.conv_output_length(cols, self.pool_size[1], self.padding,
+                                    self.strides[1])
+    if self.data_format == 'channels_first':
+      return tensor_shape.TensorShape(
+          [input_shape[0], input_shape[1], rows, cols])
+    else:
+      return tensor_shape.TensorShape(
+          [input_shape[0], rows, cols, input_shape[3]])
 
 
 class AveragePooling2D(_Pooling2D):
@@ -445,20 +475,16 @@ class _Pooling3D(base.Layer):
     self.strides = utils.normalize_tuple(strides, 3, 'strides')
     self.padding = utils.normalize_padding(padding)
     self.data_format = utils.normalize_data_format(data_format)
-
-  def build(self, input_shape):
-    if len(input_shape) != 5:
-      raise ValueError('Inputs should have rank 5. '
-                       'Received input shape:', str(input_shape))
-    self.built = True
+    self.input_spec = base.InputSpec(ndim=5)
 
   def call(self, inputs):
     pool_shape = (1,) + self.pool_size + (1,)
     strides = (1,) + self.strides + (1,)
 
     if self.data_format == 'channels_first':
-      # TF does not support channels first with 3D pooling operations,
+      # TF does not support `channels_first` with 3D pooling operations,
       # so we must handle this case manually.
+      # TODO(fchollet): remove this when TF pooling is feature-complete.
       inputs = array_ops.transpose(inputs, (0, 2, 3, 4, 1))
 
     outputs = self.pool_function(
@@ -471,6 +497,29 @@ class _Pooling3D(base.Layer):
       outputs = array_ops.transpose(outputs, (0, 4, 1, 2, 3))
     return outputs
 
+  def _compute_output_shape(self, input_shape):
+    input_shape = tensor_shape.TensorShape(input_shape).as_list()
+    if self.data_format == 'channels_first':
+      len_dim1 = input_shape[2]
+      len_dim2 = input_shape[3]
+      len_dim3 = input_shape[4]
+    else:
+      len_dim1 = input_shape[1]
+      len_dim2 = input_shape[2]
+      len_dim3 = input_shape[3]
+    len_dim1 = utils.conv_output_length(len_dim1, self.pool_size[0],
+                                        self.padding, self.strides[0])
+    len_dim2 = utils.conv_output_length(len_dim2, self.pool_size[1],
+                                        self.padding, self.strides[1])
+    len_dim3 = utils.conv_output_length(len_dim3, self.pool_size[2],
+                                        self.padding, self.strides[2])
+    if self.data_format == 'channels_first':
+      return tensor_shape.TensorShape(
+          [input_shape[0], input_shape[1], len_dim1, len_dim2, len_dim3])
+    else:
+      return tensor_shape.TensorShape(
+          [input_shape[0], len_dim1, len_dim2, len_dim3, input_shape[4]])
+
 
 class AveragePooling3D(_Pooling3D):
   """Average pooling layer for 3D inputs (e.g. volumes).
diff --git a/tensorflow/python/layers/pooling_test.py b/tensorflow/python/layers/pooling_test.py
index f9929eaf20..589fee5f71 100644
--- a/tensorflow/python/layers/pooling_test.py
+++ b/tensorflow/python/layers/pooling_test.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.python.layers import pooling as pooling_layers
+from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.platform import test
 
@@ -63,6 +64,36 @@ class PoolingTest(test.TestCase):
     output = layer.apply(images)
     self.assertListEqual(output.get_shape().as_list(), [5, 3, 4, 4])
 
+  def testCreateMaxPooling2DChannelsFirst(self):
+    height, width = 7, 9
+    images = random_ops.random_uniform((5, 2, height, width))
+    layer = pooling_layers.MaxPooling2D([2, 2],
+                                        strides=1,
+                                        data_format='channels_first')
+    output = layer.apply(images)
+    self.assertListEqual(output.get_shape().as_list(), [5, 2, 6, 8])
+
+  def testCreateAveragePooling2DChannelsFirst(self):
+    height, width = 5, 6
+    images = random_ops.random_uniform((3, 4, height, width))
+    layer = pooling_layers.AveragePooling2D((2, 2),
+                                            strides=(1, 1),
+                                            padding='valid',
+                                            data_format='channels_first')
+    output = layer.apply(images)
+    self.assertListEqual(output.get_shape().as_list(), [3, 4, 4, 5])
+
+  def testCreateAveragePooling2DChannelsFirstWithNoneBatch(self):
+    height, width = 5, 6
+    images = array_ops.placeholder(dtype='float32',
+                                   shape=(None, 4, height, width))
+    layer = pooling_layers.AveragePooling2D((2, 2),
+                                            strides=(1, 1),
+                                            padding='valid',
+                                            data_format='channels_first')
+    output = layer.apply(images)
+    self.assertListEqual(output.get_shape().as_list(), [None, 4, 4, 5])
+
   def testCreateMaxPooling1D(self):
     width = 7
     images = random_ops.random_uniform((5, width, 4))
@@ -85,6 +116,14 @@ class PoolingTest(test.TestCase):
     output = layer.apply(images)
     self.assertListEqual(output.get_shape().as_list(), [5, 3, 4])
 
+  def testCreateAveragePooling1DChannelsFirst(self):
+    width = 7
+    images = random_ops.random_uniform((5, width, 4))
+    layer = pooling_layers.AveragePooling1D(
+        2, strides=2, data_format='channels_first')
+    output = layer.apply(images)
+    self.assertListEqual(output.get_shape().as_list(), [5, 3, 4])
+
   def testCreateMaxPooling3D(self):
     depth, height, width = 6, 7, 9
     images = random_ops.random_uniform((5, depth, height, width, 4))
@@ -99,13 +138,21 @@ class PoolingTest(test.TestCase):
     output = layer.apply(images)
     self.assertListEqual(output.get_shape().as_list(), [5, 3, 3, 4, 4])
 
-  def testmaxPooling3DChannelsFirst(self):
+  def testMaxPooling3DChannelsFirst(self):
+    depth, height, width = 6, 7, 9
+    images = random_ops.random_uniform((5, 2, depth, height, width))
+    layer = pooling_layers.MaxPooling3D(
+        [2, 2, 2], strides=2, data_format='channels_first')
+    output = layer.apply(images)
+    self.assertListEqual(output.get_shape().as_list(), [5, 2, 3, 3, 4])
+
+  def testAveragePooling3DChannelsFirst(self):
     depth, height, width = 6, 7, 9
-    images = random_ops.random_uniform((5, 4, depth, height, width))
+    images = random_ops.random_uniform((5, 2, depth, height, width))
     layer = pooling_layers.AveragePooling3D(
         [2, 2, 2], strides=2, data_format='channels_first')
     output = layer.apply(images)
-    self.assertListEqual(output.get_shape().as_list(), [5, 4, 3, 3, 4])
+    self.assertListEqual(output.get_shape().as_list(), [5, 2, 3, 3, 4])
 
   def testCreateMaxPooling2DIntegerPoolSize(self):
     height, width = 7, 9
diff --git a/tensorflow/python/layers/utils.py b/tensorflow/python/layers/utils.py
index 64b948c70f..5e206c3bf9 100644
--- a/tensorflow/python/layers/utils.py
+++ b/tensorflow/python/layers/utils.py
@@ -110,6 +110,78 @@ def normalize_padding(value):
   return padding
 
 
+def conv_output_length(input_length, filter_size, padding, stride, dilation=1):
+  """Determines output length of a convolution given input length.
+
+  Arguments:
+      input_length: integer.
+      filter_size: integer.
+      padding: one of "same", "valid", "full".
+      stride: integer.
+      dilation: dilation rate, integer.
+
+  Returns:
+      The output length (integer).
+  """
+  if input_length is None:
+    return None
+  assert padding in {'same', 'valid', 'full'}
+  dilated_filter_size = filter_size + (filter_size - 1) * (dilation - 1)
+  if padding == 'same':
+    output_length = input_length
+  elif padding == 'valid':
+    output_length = input_length - dilated_filter_size + 1
+  elif padding == 'full':
+    output_length = input_length + dilated_filter_size - 1
+  return (output_length + stride - 1) // stride
+
+
+def conv_input_length(output_length, filter_size, padding, stride):
+  """Determines input length of a convolution given output length.
+
+  Arguments:
+      output_length: integer.
+      filter_size: integer.
+      padding: one of "same", "valid", "full".
+      stride: integer.
+
+  Returns:
+      The input length (integer).
+  """
+  if output_length is None:
+    return None
+  assert padding in {'same', 'valid', 'full'}
+  if padding == 'same':
+    pad = filter_size // 2
+  elif padding == 'valid':
+    pad = 0
+  elif padding == 'full':
+    pad = filter_size - 1
+  return (output_length - 1) * stride - 2 * pad + filter_size
+
+
+def deconv_output_length(input_length, filter_size, padding, stride):
+  """Determines output length of a transposed convolution given input length.
+
+  Arguments:
+      input_length: integer.
+      filter_size: integer.
+      padding: one of "same", "valid", "full".
+      stride: integer.
+
+  Returns:
+      The output length (integer).
+  """
+  if input_length is None:
+    return None
+  input_length *= stride
+  if padding == 'valid':
+    input_length += max(filter_size - stride, 0)
+  elif padding == 'full':
+    input_length -= (stride + filter_size - 2)
+  return input_length
+
+
 def smart_cond(pred, fn1, fn2, name=None):
   """Return either `fn1()` or `fn2()` based on the boolean predicate `pred`.
 
@@ -165,28 +237,3 @@ def constant_value(pred):
   else:
     raise TypeError('`pred` must be a Tensor, a Variable, or a Python bool.')
   return pred_value
-
-
-def get_deconv_dim(dim_size, stride_size, kernel_size, padding):
-  """Return output dimension of a deconv layer, based on input dimension.
-
-  Arguments:
-    dim_size: An int representing size of dimension, can be height, width
-      or depth.
-    stride_size: An int representing the stride of deconvolution filters
-      along the same dimension.
-    kernel_size: An int representing size of deconv kernel (filter) along
-      the same dimension.
-    padding: one of `"valid"` or `"same"` (case-insensitive).
-
-  Returns:
-    An int representing the size of output dimension of the layer.
-  """
-  if isinstance(dim_size, ops.Tensor):
-    dim_size = math_ops.multiply(dim_size, stride_size)
-  elif dim_size is not None:
-    dim_size *= stride_size
-
-  if padding == 'valid' and dim_size is not None:
-    dim_size += max(kernel_size - stride_size, 0)
-  return dim_size
diff --git a/tensorflow/python/layers/utils_test.py b/tensorflow/python/layers/utils_test.py
index 7969e957d8..a560f6b6d2 100644
--- a/tensorflow/python/layers/utils_test.py
+++ b/tensorflow/python/layers/utils_test.py
@@ -25,20 +25,20 @@ from tensorflow.python.platform import test
 class ConvUtilsTest(test.TestCase):
 
   def testConvertDataFormat(self):
-    self.assertEqual(utils.convert_data_format('channels_first', 5), 'NCDHW')
-    self.assertEqual(utils.convert_data_format('channels_first', 4), 'NCHW')
-    self.assertEqual(utils.convert_data_format('channels_first', 3), 'NCW')
-    self.assertEqual(utils.convert_data_format('channels_last', 4), 'NHWC')
-    self.assertEqual(utils.convert_data_format('channels_last', 3), 'NWC')
-    self.assertEqual(utils.convert_data_format('channels_last', 5), 'NDHWC')
+    self.assertEqual('NCDHW', utils.convert_data_format('channels_first', 5))
+    self.assertEqual('NCHW', utils.convert_data_format('channels_first', 4))
+    self.assertEqual('NCW', utils.convert_data_format('channels_first', 3))
+    self.assertEqual('NHWC', utils.convert_data_format('channels_last', 4))
+    self.assertEqual('NWC', utils.convert_data_format('channels_last', 3))
+    self.assertEqual('NDHWC', utils.convert_data_format('channels_last', 5))
 
     with self.assertRaises(ValueError):
       utils.convert_data_format('invalid', 2)
 
   def testNormalizeTuple(self):
-    self.assertEqual(utils.normalize_tuple(2, n=3, name='strides'), (2, 2, 2))
+    self.assertEqual((2, 2, 2), utils.normalize_tuple(2, n=3, name='strides'))
     self.assertEqual(
-        utils.normalize_tuple((2, 1, 2), n=3, name='strides'), (2, 1, 2))
+        (2, 1, 2), utils.normalize_tuple((2, 1, 2), n=3, name='strides'))
 
     with self.assertRaises(ValueError):
       utils.normalize_tuple((2, 1), n=3, name='strides')
@@ -48,27 +48,44 @@ class ConvUtilsTest(test.TestCase):
 
   def testNormalizeDataFormat(self):
     self.assertEqual(
-        utils.normalize_data_format('Channels_Last'), 'channels_last')
+        'channels_last', utils.normalize_data_format('Channels_Last'))
     self.assertEqual(
-        utils.normalize_data_format('CHANNELS_FIRST'), 'channels_first')
+        'channels_first', utils.normalize_data_format('CHANNELS_FIRST'))
 
     with self.assertRaises(ValueError):
       utils.normalize_data_format('invalid')
 
   def testNormalizePadding(self):
-    self.assertEqual(utils.normalize_padding('SAME'), 'same')
-    self.assertEqual(utils.normalize_padding('VALID'), 'valid')
+    self.assertEqual('same', utils.normalize_padding('SAME'))
+    self.assertEqual('valid', utils.normalize_padding('VALID'))
 
     with self.assertRaises(ValueError):
       utils.normalize_padding('invalid')
 
-  def testGetDeconvDim(self):
-    self.assertEqual(utils.get_deconv_dim(30, 1, 3, 'valid'), 32)
-    self.assertEqual(utils.get_deconv_dim(28, 1, 5, 'valid'), 32)
-    self.assertEqual(utils.get_deconv_dim(28, 2, 5, 'valid'), 59)
-    self.assertEqual(utils.get_deconv_dim(32, 1, 3, 'same'), 32)
-    self.assertEqual(utils.get_deconv_dim(32, 1, 5, 'same'), 32)
-    self.assertEqual(utils.get_deconv_dim(32, 2, 5, 'same'), 64)
+  def testConvOutputLength(self):
+    self.assertEqual(4, utils.conv_output_length(4, 2, 'same', 1, 1))
+    self.assertEqual(2, utils.conv_output_length(4, 2, 'same', 2, 1))
+    self.assertEqual(3, utils.conv_output_length(4, 2, 'valid', 1, 1))
+    self.assertEqual(2, utils.conv_output_length(4, 2, 'valid', 2, 1))
+    self.assertEqual(5, utils.conv_output_length(4, 2, 'full', 1, 1))
+    self.assertEqual(3, utils.conv_output_length(4, 2, 'full', 2, 1))
+    self.assertEqual(2, utils.conv_output_length(5, 2, 'valid', 2, 2))
+
+  def testConvInputLength(self):
+    self.assertEqual(3, utils.conv_input_length(4, 2, 'same', 1))
+    self.assertEqual(2, utils.conv_input_length(2, 2, 'same', 2))
+    self.assertEqual(4, utils.conv_input_length(3, 2, 'valid', 1))
+    self.assertEqual(4, utils.conv_input_length(2, 2, 'valid', 2))
+    self.assertEqual(3, utils.conv_input_length(4, 2, 'full', 1))
+    self.assertEqual(4, utils.conv_input_length(3, 2, 'full', 2))
+
+  def testDeconvOutputLength(self):
+    self.assertEqual(4, utils.deconv_output_length(4, 2, 'same', 1))
+    self.assertEqual(8, utils.deconv_output_length(4, 2, 'same', 2))
+    self.assertEqual(5, utils.deconv_output_length(4, 2, 'valid', 1))
+    self.assertEqual(8, utils.deconv_output_length(4, 2, 'valid', 2))
+    self.assertEqual(3, utils.deconv_output_length(4, 2, 'full', 1))
+    self.assertEqual(6, utils.deconv_output_length(4, 2, 'full', 2))
 
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From c2bf66ad48c733ce678d43daaebbb7f9a42fc87c Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Tue, 16 May 2017 17:53:25 -0700
Subject: [PATCH 1429/1563] Checks the ndims of weights before indexing in the
 sparse_softmax_cross_entropy

PiperOrigin-RevId: 156256866
---
 tensorflow/python/kernel_tests/losses_test.py | 15 +++++++++++++++
 tensorflow/python/ops/losses/losses_impl.py   |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/kernel_tests/losses_test.py b/tensorflow/python/kernel_tests/losses_test.py
index 40fddd76ff..a23a8058b7 100644
--- a/tensorflow/python/kernel_tests/losses_test.py
+++ b/tensorflow/python/kernel_tests/losses_test.py
@@ -319,6 +319,21 @@ class SparseSoftmaxCrossEntropyLossTest(test.TestCase):
                           feed_dict={weights: ((1.2,), (3.4,), (5.6,))})
       self.assertAlmostEqual((1.2 + 3.4 + 5.6) * 10.0 / 3.0, loss_val, 3)
 
+  def testUnknownShapePlaceholderForLogitsLabelsButScalarWeights(self):
+    logits = array_ops.placeholder(dtypes.float32)
+    labels = array_ops.placeholder(dtypes.int32)
+    weights = 1.0
+    with self.test_session() as sess:
+      loss = losses.sparse_softmax_cross_entropy(labels, logits, weights)
+      loss_val = sess.run(loss,
+                          feed_dict={
+                              logits: [[10.0, 0.0, 0.0],
+                                       [0.0, 10.0, 0.0],
+                                       [0.0, 0.0, 10.0]],
+                              labels: [[2], [0], [1]],
+                          })
+      self.assertAlmostEqual((1.0 + 1.0 + 1.0) * 10.0 / 3.0, loss_val, 3)
+
   def testNonZeroLossWithPlaceholderForLogitsLabelsAndWeights(self):
     logits = array_ops.placeholder(dtypes.float32, shape=(None, 3))
     labels = array_ops.placeholder(dtypes.int32, shape=(None, 1))
diff --git a/tensorflow/python/ops/losses/losses_impl.py b/tensorflow/python/ops/losses/losses_impl.py
index fc54553b0c..97078d71d9 100644
--- a/tensorflow/python/ops/losses/losses_impl.py
+++ b/tensorflow/python/ops/losses/losses_impl.py
@@ -690,7 +690,7 @@ def _remove_squeezable_dimensions(
     # Use dynamic rank.
     rank_diff = array_ops.rank(weights) - array_ops.rank(labels)
     if (weights_rank is None) or (
-        weights_shape.dims[-1].is_compatible_with(1)):
+        weights_rank > 0 and weights_shape.dims[-1].is_compatible_with(1)):
       weights = control_flow_ops.cond(
           math_ops.equal(1, rank_diff),
           lambda: array_ops.squeeze(weights, [-1]),
-- 
GitLab


From d1e4c03494ca1dc90513d92640de3b1b2905c641 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 18:14:12 -0700
Subject: [PATCH 1430/1563] Handle R0 DynamicSlice in algebraic simplifier.

PiperOrigin-RevId: 156258647
---
 .../compiler/xla/service/algebraic_simplifier.cc     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 3f888b4c2e..38ac396c42 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -1,4 +1,3 @@
-
 /* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -168,6 +167,8 @@ class AlgebraicSimplifierVisitor : public DfsHloVisitorWithDefault {
   Status HandleReverse(HloInstruction* reverse,
                        HloInstruction* operand) override;
   Status HandleSlice(HloInstruction* slice, HloInstruction* operand) override;
+  Status HandleDynamicSlice(HloInstruction* slice, HloInstruction* operand,
+                            HloInstruction* start_indices) override;
   Status HandleDynamicUpdateSlice(HloInstruction* dynamic_update_slice,
                                   HloInstruction* operand,
                                   HloInstruction* update,
@@ -1025,6 +1026,15 @@ Status AlgebraicSimplifierVisitor::HandleSlice(HloInstruction* slice,
   return Status::OK();
 }
 
+Status AlgebraicSimplifierVisitor::HandleDynamicSlice(
+    HloInstruction* dynamic_slice, HloInstruction* operand,
+    HloInstruction* start_indices) {
+  if (ShapeUtil::IsScalar(dynamic_slice->shape())) {
+    return ReplaceInstruction(dynamic_slice, operand);
+  }
+  return Status::OK();
+}
+
 Status AlgebraicSimplifierVisitor::HandleDynamicUpdateSlice(
     HloInstruction* dynamic_update_slice, HloInstruction* operand,
     HloInstruction* update, HloInstruction* start_indices) {
-- 
GitLab


From 866bee3aeaa8f6dfd9a994c2a0c94c500ca1f664 Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Tue, 16 May 2017 20:10:24 -0700
Subject: [PATCH 1431/1563] Initial release of the new `Dataset` API for input
 pipelines.

For more details about how to use the new API, see the documentation in `tensorflow/contrib/data/README.md`.

Relevant to issue #7951.

PiperOrigin-RevId: 156265736
---
 tensorflow/BUILD                              |    4 +
 tensorflow/contrib/BUILD                      |    1 +
 tensorflow/contrib/cmake/tf_core_ops.cmake    |    1 +
 tensorflow/contrib/cmake/tf_python.cmake      |    6 +
 tensorflow/contrib/cmake/tf_tests.cmake       |    1 +
 tensorflow/contrib/data/BUILD                 |   27 +
 tensorflow/contrib/data/README.md             |  630 ++++++
 tensorflow/contrib/data/__init__.py           |   36 +
 .../contrib/data/python/framework/BUILD       |   41 +
 .../contrib/data/python/framework/function.py |  267 +++
 .../data/python/framework/function_test.py    |   59 +
 .../contrib/data/python/kernel_tests/BUILD    |  219 ++
 .../kernel_tests/batch_dataset_op_test.py     |  276 +++
 .../python/kernel_tests/bucketing_test.py     |  292 +++
 .../dataset_constructor_op_test.py            |  239 +++
 .../kernel_tests/filter_dataset_op_test.py    |   77 +
 .../kernel_tests/flat_map_dataset_op_test.py  |  108 +
 .../python/kernel_tests/iterator_ops_test.py  |  252 +++
 .../kernel_tests/map_dataset_op_test.py       |  330 +++
 .../kernel_tests/range_dataset_op_test.py     |  182 ++
 .../kernel_tests/reader_dataset_ops_test.py   |  500 +++++
 .../data/python/kernel_tests/resample_test.py |   79 +
 .../kernel_tests/sequence_dataset_op_test.py  |  211 ++
 .../kernel_tests/shuffle_dataset_op_test.py   |  152 ++
 .../kernel_tests/zip_dataset_op_test.py       |  114 +
 tensorflow/contrib/data/python/ops/BUILD      |   31 +
 .../contrib/data/python/ops/dataset_ops.py    | 1902 +++++++++++++++++
 tensorflow/core/BUILD                         |    3 +
 tensorflow/core/kernels/BUILD                 |  302 +++
 tensorflow/core/kernels/batch_dataset_op.cc   |  223 ++
 tensorflow/core/kernels/captured_function.cc  |  149 ++
 tensorflow/core/kernels/captured_function.h   |   87 +
 tensorflow/core/kernels/dataset.h             |  167 ++
 .../dense_to_sparse_batch_dataset_op.cc       |  274 +++
 tensorflow/core/kernels/filter_dataset_op.cc  |  158 ++
 .../core/kernels/flat_map_dataset_op.cc       |  215 ++
 .../kernels/group_by_window_dataset_op.cc     |  344 +++
 tensorflow/core/kernels/iterator_ops.cc       |  344 +++
 tensorflow/core/kernels/map_dataset_op.cc     |  151 ++
 .../core/kernels/padded_batch_dataset_op.cc   |  379 ++++
 .../core/kernels/parallel_map_dataset_op.cc   |  347 +++
 tensorflow/core/kernels/range_dataset_op.cc   |  128 ++
 tensorflow/core/kernels/reader_dataset_ops.cc |  420 ++++
 tensorflow/core/kernels/repeat_dataset_op.cc  |  174 ++
 tensorflow/core/kernels/shuffle_dataset_op.cc |  167 ++
 tensorflow/core/kernels/skip_dataset_op.cc    |  143 ++
 .../kernels/sparse_tensor_slice_dataset_op.cc |  223 ++
 tensorflow/core/kernels/take_dataset_op.cc    |  132 ++
 tensorflow/core/kernels/tensor_dataset_op.cc  |  110 +
 .../core/kernels/tensor_slice_dataset_op.cc   |  185 ++
 tensorflow/core/kernels/window_dataset.cc     |   80 +
 tensorflow/core/kernels/window_dataset.h      |   48 +
 tensorflow/core/kernels/zip_dataset_op.cc     |  148 ++
 tensorflow/core/ops/dataset_ops.cc            |  471 ++++
 tensorflow/python/BUILD                       |   10 +
 55 files changed, 11619 insertions(+)
 create mode 100644 tensorflow/contrib/data/BUILD
 create mode 100644 tensorflow/contrib/data/README.md
 create mode 100644 tensorflow/contrib/data/__init__.py
 create mode 100644 tensorflow/contrib/data/python/framework/BUILD
 create mode 100644 tensorflow/contrib/data/python/framework/function.py
 create mode 100644 tensorflow/contrib/data/python/framework/function_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/BUILD
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/batch_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/bucketing_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/filter_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/flat_map_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/iterator_ops_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/map_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/range_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/reader_dataset_ops_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/resample_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/sequence_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/shuffle_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/kernel_tests/zip_dataset_op_test.py
 create mode 100644 tensorflow/contrib/data/python/ops/BUILD
 create mode 100644 tensorflow/contrib/data/python/ops/dataset_ops.py
 create mode 100644 tensorflow/core/kernels/batch_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/captured_function.cc
 create mode 100644 tensorflow/core/kernels/captured_function.h
 create mode 100644 tensorflow/core/kernels/dataset.h
 create mode 100644 tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/filter_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/flat_map_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/group_by_window_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/iterator_ops.cc
 create mode 100644 tensorflow/core/kernels/map_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/padded_batch_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/parallel_map_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/range_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/reader_dataset_ops.cc
 create mode 100644 tensorflow/core/kernels/repeat_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/shuffle_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/skip_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/take_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/tensor_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/tensor_slice_dataset_op.cc
 create mode 100644 tensorflow/core/kernels/window_dataset.cc
 create mode 100644 tensorflow/core/kernels/window_dataset.h
 create mode 100644 tensorflow/core/kernels/zip_dataset_op.cc
 create mode 100644 tensorflow/core/ops/dataset_ops.cc

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 503ad79a38..d56ab735e1 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -218,6 +218,10 @@ filegroup(
         "//tensorflow/contrib/copy_graph:all_files",
         "//tensorflow/contrib/crf:all_files",
         "//tensorflow/contrib/cudnn_rnn:all_files",
+        "//tensorflow/contrib/data:all_files",
+        "//tensorflow/contrib/data/python/framework:all_files",
+        "//tensorflow/contrib/data/python/kernel_tests:all_files",
+        "//tensorflow/contrib/data/python/ops:all_files",
         "//tensorflow/contrib/distributions:all_files",
         "//tensorflow/contrib/factorization:all_files",
         "//tensorflow/contrib/factorization/kernels:all_files",
diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index 616ceb5ca1..1ac7e53654 100755
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -20,6 +20,7 @@ py_library(
         "//tensorflow/contrib/copy_graph:copy_graph_py",
         "//tensorflow/contrib/crf:crf_py",
         "//tensorflow/contrib/cudnn_rnn:cudnn_rnn_py",
+        "//tensorflow/contrib/data",
         "//tensorflow/contrib/deprecated:deprecated_py",
         "//tensorflow/contrib/distributions:distributions_py",
         "//tensorflow/contrib/factorization:factorization_py",
diff --git a/tensorflow/contrib/cmake/tf_core_ops.cmake b/tensorflow/contrib/cmake/tf_core_ops.cmake
index eae00ab875..7131f14d99 100644
--- a/tensorflow/contrib/cmake/tf_core_ops.cmake
+++ b/tensorflow/contrib/cmake/tf_core_ops.cmake
@@ -18,6 +18,7 @@ set(tf_op_lib_names
     "control_flow_ops"
     "ctc_ops"
     "data_flow_ops"
+    "dataset_ops"
     "functional_ops"
     "image_ops"
     "io_ops"
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index bfd6a18c78..b660508b8b 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -265,6 +265,11 @@ add_python_module("tensorflow/contrib/cudnn_rnn/ops")
 add_python_module("tensorflow/contrib/cudnn_rnn/python")
 add_python_module("tensorflow/contrib/cudnn_rnn/python/kernel_tests")
 add_python_module("tensorflow/contrib/cudnn_rnn/python/ops")
+add_python_module("tensorflow/contrib/data")
+add_python_module("tensorflow/contrib/data/python")
+add_python_module("tensorflow/contrib/data/python/framework")
+add_python_module("tensorflow/contrib/data/python/kernel_tests")
+add_python_module("tensorflow/contrib/data/python/ops")
 add_python_module("tensorflow/contrib/deprecated")
 add_python_module("tensorflow/contrib/distributions")
 add_python_module("tensorflow/contrib/distributions/python")
@@ -592,6 +597,7 @@ GENERATE_PYTHON_OP_LIB("control_flow_ops"
   ADDITIONAL_LIBRARIES $<TARGET_OBJECTS:tf_no_op>)
 GENERATE_PYTHON_OP_LIB("ctc_ops")
 GENERATE_PYTHON_OP_LIB("data_flow_ops")
+GENERATE_PYTHON_OP_LIB("dataset_ops")
 GENERATE_PYTHON_OP_LIB("image_ops")
 GENERATE_PYTHON_OP_LIB("io_ops")
 GENERATE_PYTHON_OP_LIB("linalg_ops")
diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index c41f72e141..2a51ab62d4 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -144,6 +144,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
     "${tensorflow_source_dir}/tensorflow/python/saved_model/*_test.py"
     "${tensorflow_source_dir}/tensorflow/python/training/*_test.py"
     "${tensorflow_source_dir}/tensorflow/tensorboard/*_test.py"
+    "${tensorflow_source_dir}/tensorflow/contrib/data/*_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/factorization/*_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/keras/python/keras/integration_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/stateless/python/kernel_tests/*_test.py"
diff --git a/tensorflow/contrib/data/BUILD b/tensorflow/contrib/data/BUILD
new file mode 100644
index 0000000000..7b916d82c1
--- /dev/null
+++ b/tensorflow/contrib/data/BUILD
@@ -0,0 +1,27 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+py_library(
+    name = "data",
+    srcs = ["__init__.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data/python/ops:dataset_ops",
+        "//tensorflow/python:util",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/data/README.md b/tensorflow/contrib/data/README.md
new file mode 100644
index 0000000000..9907a9fb37
--- /dev/null
+++ b/tensorflow/contrib/data/README.md
@@ -0,0 +1,630 @@
+# Using the `Dataset` API for TensorFlow Input Pipelines
+
+The `Dataset` API is designed to let you build complex input pipelines from
+simple, reusable pieces. For example, the pipeline for an image model might
+aggregate data from files in a distributed file system, apply random
+perturbations to each image, and merge randomly selected images into a batch
+for training. The pipeline for a text model might involve extracting symbols
+from raw text data, converting them to embedding identifiers with a lookup
+table, and batching together sequences of different lengths. The `Dataset` API
+makes it easy to deal with large amounts of data, different data formats, and
+complicated transformations.
+
+The `Dataset` API introduces two new abstractions to TensorFlow:
+
+* A `tf.contrib.data.Dataset` represents a sequence of elements, in which
+  each element contains one or more `Tensor` objects. For example, in an image
+  pipeline, an element might be a single training example, with a pair of
+  tensors representing the image data and a label. A `Dataset` can either be a
+  *source* (e.g. `Dataset.from_tensor_slices()` constructs a dataset from one
+  or more `tf.Tensor` objects), or a *transformation* (e.g. `Dataset.batch()`
+  constructs a dataset by stacking consecutive elements of another dataset into
+  a single element).
+
+* A `tf.contrib.data.Iterator` provides the main way to extract elements from a
+  dataset. The `Iterator.get_next()` operation yields the next element of a
+  `Dataset`, and typically acts as the interface between input pipeline code and
+  your model. The simplest iterator is a "one-shot iterator", which is
+  associated with a particular `Dataset` and iterates through it once. For more
+  sophisticated uses, the `Iterator.initializer` operation enables you to
+  reinitialize and parameterize an iterator with different datasets, so that
+  you can, for example, iterate over training and validation data multiple times
+  in the same program.
+
+## Tutorial
+
+This programmers' guide includes step-by-step instructions for a variety of
+input data use cases. Also see the `Dataset` and `Iterator` class references
+for more detailed information about the API.
+
+### Basic mechanics
+
+This section of the guide describes the fundamentals of creating different kinds
+of `Dataset` and `Iterator` objects, and how to extract data from them.
+
+#### Defining a source dataset
+
+You can build a `Dataset` using one of the following *source* dataset
+constructors:
+
+* From in-memory data:
+  * `tf.contrib.data.Dataset.from_tensors()`
+  * `tf.contrib.data.Dataset.from_tensor_slices()`
+
+* From on-disk data:
+  * `tf.contrib.data.FixedLengthRecordDataset()`
+  * `tf.contrib.data.TextLineDataset()`
+  * `tf.contrib.data.TFRecordDataset()`
+
+* From parameters:
+  * `tf.contrib.data.Dataset.range()`
+
+#### Transforming a dataset
+
+The `tf.contrib.data.Dataset` class has many methods that can be chained
+together to *transform* one dataset into another:
+
+* Per-element transformations:
+  * `Dataset.filter()`
+  * `Dataset.flat_map()`
+  * `Dataset.map()`
+  * `Dataset.zip()`
+
+* Multi-element transformations:
+  * `Dataset.batch()`
+  * `Dataset.dense_to_sparse_batch()`
+  * `Dataset.group_by_window()`
+  * `Dataset.padded_batch()`
+  * `Dataset.repeat()`
+  * `Dataset.shuffle()`
+  * `Dataset.skip()`
+  * `Dataset.take()`
+
+The following sections contain examples of how to use these transformations to
+solve common problems.
+
+#### Dataset structure
+
+A dataset comprises elements that each have the same structure. An element
+contains one or more `tf.Tensor` objects, called *components*. Each component
+has a `tf.DType` representing the type of elements in the tensor, and a
+`tf.TensorShape` representing the (possibly partially specified) static shape of
+each element. The `Dataset.output_types` and `Dataset.output_shapes` properties
+allow you to inspect the inferred types and shapes of each component of a
+dataset element. The *nested structure* of these properties map to the structure
+of an element, which may be a single tensor, a tuple of tensors, or a nested
+tuple of tensors. For example:
+
+```python
+dataset1 = tf.contrib.data.Dataset.from_tensor_slices(tf.random_uniform([4, 10]))
+print(dataset1.output_types)  # ==> "tf.float32"
+print(dataset1.output_shapes)  # ==> "(10,)"
+
+dataset2 = tf.contrib.data.Dataset.from_tensor_slices(
+   (tf.random_uniform([4]), tf.random_uniform([4, 100], dtype=tf.int32)))
+print(dataset2.output_types)  # ==> "(tf.float32, tf.int32)"
+print(dataset2.output_shapes)  # ==> "((), (100,))"
+
+dataset3 = tf.contrib.data.Dataset.zip((dataset1, dataset2))
+print(dataset3.output_types)  # ==> (tf.float32, (tf.float32, tf.int32))
+print(dataset3.output_shapes)  # ==> "((), (100,))"
+```
+
+The `Dataset` transformations support datasets of any structure. When using the
+`Dataset.map()`, `Dataset.flat_map()` and `Dataset.filter()` transformations,
+which apply a function to each element, the element structure determines the
+arguments of the function:
+
+```python
+dataset1 = dataset1.map(lambda x: ...)
+
+dataset2 = dataset2.flat_map(lambda x, y: ...)
+
+# *N.B.* Lambda argument destructuring is not available in Python 3.
+dataset3 = dataset3.filter(lambda x, (y, z): ...)
+```
+
+#### Creating an iterator
+
+One you have built a `Dataset` to represent your input data, the next step is to
+create an `Iterator` to access elements from that dataset.  The `Dataset` API
+currently supports three kinds of iterator, in increasing level of
+sophistication:
+
+A *one-shot* iterator is the simplest form of iterator, which only supports
+iterating once through a dataset, with no need for explicit initialization.
+One-shot iterators handle almost all of the cases that the existing queue-based
+input pipelines support, but they do not support parameterization. Using the
+example of `Dataset.range()`:
+
+```python
+dataset = tf.contrib.data.Dataset.range(100)
+iterator = dataset.make_one_shot_iterator()
+next_element = iterator.get_next()
+
+for i in range(100):
+  value = sess.run(next_element)
+  assert i == value
+```
+
+An *initializable* iterator requires you to run an explicit
+`iterator.initializer` operation before using it. In exchange for this
+inconvenience, it enables you to *parameterize* the definition of the dataset,
+using one or more `tf.placeholder()` tensors that can be fed when you
+initialize the iterator. Continuing the `Dataset.range()` example:
+
+```python
+max_value = tf.placeholder(tf.int64, shape=[])
+dataset = tf.contrib.data.Dataset.range(max_value)
+iterator = dataset.make_initializable_iterator()
+next_element = iterator.get_next()
+
+# Initialize an iterator over a dataset with 10 elements.
+sess.run(iterator.initializer, feed_dict={max_value: 10})
+for i in range(10):
+  value = sess.run(next_element)
+  assert i == value
+
+# Initialize the same iterator over a dataset with 100 elements.
+sess.run(iterator.initializer, feed_dict={max_value: 100})
+for i in range(100):
+  value = sess.run(next_element)
+  assert i == value
+```
+
+A *reinitializable* iterator can be initialized from multiple different
+`Dataset` objects. For example, you might have a training input pipeline that
+uses random perturbations to the input images to improve generalization, and
+a validation input pipeline that evaluates predictions on unmodified data. These
+pipelines will typically use different `Dataset` objects that have the same
+structure (i.e. the same types and compatible shapes for each component). 
+
+```python
+training_dataset = tf.contrib.data.Dataset.range(100).map(
+    lambda x: x + tf.random_uniform([], -10, 10, tf.int64))
+validation_dataset = tf.contrib.data.Dataset.range(50)
+
+# A reinitializable iterator is defined by its structure. We could use the
+# `output_types` and `output_shapes` properties of either `training_dataset`
+# or `validation_dataset` here, because they are compatible.
+iterator = Iterator.from_structure(training_dataset.output_types,
+                                   training_dataset.output_shapes)
+next_element = iterator.get_next()
+
+training_init_op = iterator.make_initializer(training_dataset)
+validation_init_op = iterator.make_initializer(validation_dataset)
+
+# Run 20 epochs in which the training dataset is traversed, followed by the
+# validation dataset.
+for _ in range(20):
+  # Initialize an iterator over the training dataset.
+  sess.run(training_init_op)
+  for _ in range(100):
+    sess.run(next_element)
+
+  # Initialize an iterator over the validation dataset.
+  sess.run(validation_init_op)
+  for _ in range(50):
+    sess.run(next_element)
+```
+
+#### Consuming values from an iterator
+
+The `Iterator.get_next()` method returns one or more `tf.Tensor` objects that
+correspond to the symbolic next element of an iterator. Each time these tensors
+are evaluated, they take the value of the next element in the underlying
+dataset. (Note that, like other stateful objects in TensorFlow, calling
+`Iterator.get_next()` does not immediately advance the iterator. Instead you
+must use the returned `tf.Tensor` objects in a TensorFlow expression, and pass
+the result of that expression to `tf.Session.run()` to get the next elements and
+advance the iterator.)
+
+If the iterator reaches the end of the dataset, executing
+the `Iterator.get_next()` operation will raise a `tf.errors.OutOfRangeError`.
+After this point the iterator will be in an unusable state, and you must
+initialize it again if you want to use it further.
+
+```python
+dataset = tf.contrib.data.Dataset.range(5)
+iterator = dataset.make_initializable_iterator()
+next_element = iterator.get_next()
+
+# Typically `result` will be the output of a model, or an optimizer's
+# training operation.
+result = tf.add(next_element, next_element)
+
+sess.run(iterator.initializer)
+print(sess.run(result))  # ==> "0"
+print(sess.run(result))  # ==> "2"
+print(sess.run(result))  # ==> "4"
+print(sess.run(result))  # ==> "6"
+print(sess.run(result))  # ==> "8"
+try:
+  sess.run(result)
+except tf.errors.OutOfRangeError:
+  print("End of dataset")  # ==> "End of dataset"
+```
+
+A common pattern is to wrap the "training loop" in a `try`-`except` block:
+
+```python
+sess.run(iterator.initializer)
+while True:
+  try:
+    sess.run(result)
+  except tf.errors.OutOfRangeError:
+    break
+```
+
+If each element of the dataset has a nested structure, the return value of
+`Iterator.get_next()` will be one or more `tf.Tensor` objects in the same
+nested structure:
+
+```python
+dataset1 = tf.contrib.data.Dataset.from_tensor_slices(tf.random_uniform([4, 10]))
+dataset2 = tf.contrib.data.Dataset.from_tensor_slices((tf.random_uniform([4]), tf.random_uniform([4, 100])))
+dataset3 = tf.contrib.data.Dataset.zip((dataset1, dataset2))
+
+iterator = dataset3.make_initializable_iterator()
+
+sess.run(iterator.initializer)
+next1, (next2, next3) = iterator.get_next()
+```
+
+Note that evaluating *any* of `next1`, `next2`, or `next3` will advance the
+iterator for all components. A typical consumer of an iterator will include all
+components in a single expression.
+
+### Reading input data
+
+#### Consuming NumPy arrays
+
+If all of your input data fit in memory, the simplest way to create a `Dataset`
+from them is to convert them to `tf.Tensor` objects and use
+`Dataset.from_tensor_slices()`.
+
+```python
+# Load the training data into two NumPy arrays, for example using `np.load()`.
+with np.load("/var/data/training_data.npy") as data:
+  features = data["features"]
+  labels = data["labels"]
+
+# Assume that each row of `features` corresponds to the same row as `labels`.
+assert features.shape[0] == labels.shape[0]
+
+dataset = tf.contrib.data.Dataset.from_tensor_slices((features, labels))
+```
+
+Note that the above code snippet will embed the `features` and `labels` arrays
+in your TensorFlow graph as constants. This works well for a small dataset, but
+wastes memory, and can run into the 2GB limit for the `tf.GraphDef` protocol
+buffer.
+
+As an alternative, you can define the `Dataset` in terms of `tf.placeholder()`
+tensors, and *feed* the NumPy arrays when you initialize an `Iterator` over the
+dataset.
+
+```python
+# Load the training data into two NumPy arrays, for example using `np.load()`.
+with np.load("/var/data/training_data.npy") as data:
+  features = data["features"]
+  labels = data["labels"]
+
+# Assume that each row of `features` corresponds to the same row as `labels`.
+assert features.shape[0] == labels.shape[0]
+
+features_placeholder = tf.placeholder(features.dtype, features.shape)
+labels_placeholder = tf.placeholder(labels.dtype, labels.shape)
+
+dataset = tf.contrib.data.Dataset.from_tensor_slices((features_placeholder, labels_placeholder))
+# [Other transformations on `dataset`...]
+dataset = ...
+iterator = dataset.make_initializable_iterator()
+
+sess.run(iterator.initializer, feed_dict={features_placeholder: features,
+                                          labels_placeholder: labels})
+```
+
+#### Consuming TFRecord data
+
+The `Dataset` API supports a variety of file formats so that you can process
+large datasets that do not fit in memory. The TFRecord file format is a
+simple record-oriented binary format that many TensorFlow applications use for
+training data. The `tf.contrib.data.TFRecordDataset` class enables you to
+stream over the contents of one or more TFRecord files as part of an input
+pipeline.
+
+```python
+# Creates a dataset that reads all of the examples from two files.
+filenames = ["/var/data/file1.tfrecord", "/var/data/file2.tfrecord"]
+dataset = tf.contrib.data.TFRecordDataset(filenames)
+```
+
+The `filenames` argument to the `TFRecordDataset` initializer can be a
+`tf.Tensor` of strings. Therefore if you have two sets of files for training
+and validation purposes, you can use a `tf.placeholder(tf.string)` to represent
+the filenames, and initialize an iterator from the appropriate filenames:
+
+```python
+filenames = tf.placeholder(tf.string, shape=[None])
+dataset = tf.contrib.data.TFRecordDataset(filenames)
+# [Other transformations on `dataset`...]
+dataset = ...
+iterator = dataset.make_initializable_iterator()
+
+# You can feed the initializer with the appropriate filenames for the current
+# phase of execution, e.g. training vs. validation.
+
+# Initialize `iterator` with training data.
+training_filenames = ["/var/data/file1.tfrecord", "/var/data/file2.tfrecord"]
+sess.run(iterator.initializer, feed_dict={filenames: training_filenames})
+
+# Initialize `iterator` with validation data.
+validation_filenames = ["/var/data/validation1.tfrecord", ...]
+sess.run(iterator.initializer, feed_dict={filenames: validation_filenames})
+```
+
+#### Consuming text data
+
+Many datasets are distributed as one or more text files. The
+`tf.contrib.data.TextLineDataset` provides an easy way to extract lines from
+one or more text files. Given one or more filenames, a `TextLineDataset` will
+produce one string-valued element per line of those files. Like a
+`TFRecordDataset`, `TextLineDataset` accepts `filenames` as a `tf.Tensor`, so
+you can parameterize it by passing a `tf.placeholder(tf.string)`.
+
+```python
+filenames = ["/var/data/file1.txt", "/var/data/file2.txt"]
+dataset = tf.contrib.data.TextLineDataset(filenames)
+```
+
+By default, a `TextLineDataset` yields *every* line of each file, which may
+not be desirable, for example if the file starts with a header line, or contains
+comments. These lines can be removed using the `Dataset.skip()` and
+`Dataset.filter()` transformations. To apply these transformations to each
+file separately, we use `Dataset.flat_map()` to create a nested `Dataset` for
+each file.
+
+```python
+filenames = ["/var/data/file1.txt", "/var/data/file2.txt"]
+
+dataset = tf.contrib.data.Dataset.from_tensor_slices(filenames)
+
+# Use `Dataset.flat_map()` to transform each file separately.
+# * Skip the first line (header row).
+# * Filter out lines beginning with "#" (comments).
+dataset = dataset.flat_map(
+    lambda filename: (
+        tf.contrib.data.Dataset.TextLineDataset(filename)
+        .skip(1)
+        .filter(lambda line: tf.not_equal(tf.substr(line, 0, 1), "#"))))
+```
+
+<!--
+TODO(mrry): Add these sections.
+
+#### Consuming from a Python generator
+#### Consuming from an index file and images
+-->
+
+### Preprocessing data with `Dataset.map()`
+
+The `Dataset.map(f)` transformation produces a new dataset by applying a given
+function `f` to each element of the input dataset. It is based on
+the
+[`map()` function](https://en.wikipedia.org/wiki/Map_(higher-order_function))
+that is commonly applied to lists (and other structures) in functional
+programming languages.  The function `f` takes the `tf.Tensor` objects that
+represent a single element in the input, and returns the `tf.Tensor` objects
+that will represent a single element in the new dataset. Its implementation uses
+standard TensorFlow operations to transform one element into another.
+
+This section covers common examples of how to use `Dataset.map()`.
+
+#### Parsing `tf.Example` protocol buffer messages
+
+Many input pipelines extract `tf.train.Example` protocol buffer messages from a
+TFRecord-format file (written, for example, using
+`tf.python_io.TFRecordWriter`). Each `tf.train.Example` record contains one or
+more "features", and the input pipeline typically converts these features into
+tensors.
+
+```python
+# Transforms a scalar string `example_proto` into a pair of a scalar string and
+# a scalar integer, representing an image and its label, respectively.
+def _parse_function(example_proto):
+  features = {"image": tf.FixedLenFeature((), tf.string, default_value=""),
+              "label": tf.FixedLenFeature((), tf.int32, default_value=0)}
+  parsed_features = tf.parse_single_example(example_proto, features)
+  return parsed_features["image"], parsed_features["label"]
+
+# Creates a dataset that reads all of the examples from two files, and extracts
+# the image and label features.
+filenames = ["/var/data/file1.tfrecord", "/var/data/file2.tfrecord"]
+dataset = tf.contrib.data.TFRecordDataset(filenames)
+dataset = dataset.map(_parse_function)
+```
+
+#### Decoding image data and resizing it
+
+When training a neural network on real-world image data, it is often necessary
+to convert images of different sizes to a common size, so that they may be
+batched into a fixed size.
+
+```python
+# Reads an image from a file, decodes it into a dense tensor, and resizes it
+# to a fixed shape.
+def _parse_function(filename, label):
+  image_string = tf.read_file(filename)
+  image_decoded = tf.image.decode_image(filename)
+  image_resized = tf.image.resize_images(image_decoded, [28, 28])
+  return image_resized, label
+
+filenames = ["/var/data/image1.jpg", "/var/data/image2.jpg", ...]
+labels = [0, 37, 29, 1, ...]
+
+dataset = tf.contrib.data.Dataset.from_tensor_slices((filenames, labels))
+dataset = dataset.map(_parse_function)
+```
+
+#### Applying arbitrary Python logic with `tf.py_func()`
+
+For performance reasons, we encourage you to use TensorFlow operations for
+preprocessing your data whenever possible. However, it is sometimes useful to
+be able to call upon external Python libraries when parsing your input data,
+and you can do this by invoking the `tf.py_func()` operation in a
+`Dataset.map()` transformation.
+
+```python
+import cv2
+
+# Use a custom OpenCV function to read the image, instead of the standard
+# TensorFlow `tf.read_file()` operation.
+def _read_py_function(filename, label):
+  image_decoded = cv2.imread(image_string, cv2.IMREAD_GRAYSCALE)
+  return image_decoded, label
+
+# Use standard TensorFlow operations to resize the image to a fixed shape.
+def _resize_function(image_decoded, label):
+  image_decoded.set_shape([None, None, None])
+  image_resized = tf.image.resize_images(image_decoded, [28, 28])
+  return image_resized, label
+
+filenames = ["/var/data/image1.jpg", "/var/data/image2.jpg", ...]
+labels = [0, 37, 29, 1, ...]
+
+dataset = tf.contrib.data.Dataset.from_tensor_slices((filenames, labels))
+dataset = dataset.map(
+    lambda filename, label: tf.py_func(
+        _read_py_function, [filename, label], [tf.uint8, label.dtype]))
+dataset = dataset.map(_resize_function)
+```
+
+<!--
+TODO(mrry): Add this section.
+
+#### Handling text data with unusual sizes
+-->
+
+### Batching dataset elements
+
+#### Simple batching
+
+The simplest form of batching stacks `n` consecutive elements of a dataset into
+a single element. The `Dataset.batch()` transformation does exactly this, with
+the same constraints as the `tf.stack()` operator, applied to each component
+of the elements: i.e. for each component *i*, all elements must have a tensor
+of the exact same shape.
+
+```python
+inc_dataset = tf.contrib.data.Dataset.range(100)
+dec_dataset = tf.contrib.data.Dataset.range(0, -100, -1)
+dataset = tf.contrib.data.Dataset.zip((inc_dataset, dec_dataset))
+batched_dataset = dataset.batch(4)
+
+iterator = batched_dataset.make_one_shot_iterator()
+next_element = iterator.get_next()
+
+print(sess.run(next_element))  # ==> ([0, 1, 2,   3],   [ 0, -1,  -2,  -3])
+print(sess.run(next_element))  # ==> ([4, 5, 6,   7],   [-4, -5,  -6,  -7])
+print(sess.run(next_element))  # ==> ([8, 9, 10, 11],   [-8, -9, -10, -11])
+```
+
+#### Batching tensors with padding
+
+The above recipe works for tensors that all have the same size. However, many
+models (e.g. sequence models) work with input data that can have varying size
+(e.g. sequences of different lengths). To handle this case, the
+`Dataset.padded_batch()` transformation enables you to batch tensors of
+different shape by specifying one or more dimensions in which they may be
+padded.
+
+```python
+dataset = tf.contrib.data.Dataset.range(100)
+dataset = dataset.map(lambda x: tf.fill([tf.cast(x, tf.int32)], x))
+dataset = dataset.padded_batch(4, padded_shapes=[None])
+
+iterator = batched_dataset.make_one_shot_iterator()
+next_element = iterator.get_next()
+
+print(sess.run(next_element))  # ==> [[0, 0, 0], [1, 0, 0], [2, 2, 0], [3, 3, 3]]
+print(sess.run(next_element))  # ==> [[4, 4, 4, 4, 0, 0, 0],
+                               #      [5, 5, 5, 5, 5, 0, 0],
+                               #      [6, 6, 6, 6, 6, 6, 0],
+                               #      [7, 7, 7, 7, 7, 7, 7]]
+```
+
+The `Dataset.padded_batch()` transformation allows you to set different padding
+for each dimension of each component, and it may be variable-length (signified
+by `None` in the example above) or constant-length. It is also possible to
+override the padding value, which defaults to 0.
+
+<!--
+TODO(mrry): Add this section.
+
+#### Dense ragged -> tf.SparseTensor
+-->
+
+### Training workflows
+
+#### Processing multiple epochs
+
+The `Dataset` API offers two main ways to process multiple epochs of the same
+data.
+
+The simplest way to iterate over a dataset in multiple epochs is to use the
+`Dataset.repeat()` transformation. For example, to create a dataset that repeats
+its input for 10 epochs:
+
+```python
+filenames = ["/var/data/file1.tfrecord", "/var/data/file2.tfrecord"]
+dataset = tf.contrib.data.TFRecordDataset(filenames)
+dataset = dataset.map(...)
+dataset = dataset.repeat(10)
+dataset = dataset.batch(32)
+```
+
+Applying the `Dataset.repeat()` transformation with no arguments will repeat
+the input indefinitely. The `Dataset.repeat()` transformation concatenates its
+arguments without signaling the end of one epoch and the beginning of the next
+epoch.
+
+If you want to receive a signal at the end of each epoch, you can write a
+training loop that catches the `tf.errors.OutOfRangeError` at the end of a
+dataset. At that point you might collection some statistics (e.g. the validation
+error) for the epoch.
+
+```python
+filenames = ["/var/data/file1.tfrecord", "/var/data/file2.tfrecord"]
+dataset = tf.contrib.data.TFRecordDataset(filenames)
+dataset = dataset.map(...)
+dataset = dataset.batch(32)
+iterator = dataset.make_initializable_iterator()
+next_element = iterator.get_next()
+
+# Compute for 100 epochs.
+for _ in range(100):
+  sess.run(iterator.initializer)
+  while True:
+    try:
+      sess.run(next_element)
+    except tf.errors.OutOfRangeError:
+      break
+
+  # [Perform end-of-epoch calculations here.]
+```
+
+#### Randomly shuffling input data
+
+The `Dataset.shuffle()` transformation randomly shuffles the input dataset
+using a similar algorithm to `tf.RandomShuffleQueue`: it maintains a fixed-size
+buffer and chooses the next element uniformly at random from that buffer.
+
+```python
+filenames = ["/var/data/file1.tfrecord", "/var/data/file2.tfrecord"]
+dataset = tf.contrib.data.TFRecordDataset(filenames)
+dataset = dataset.map(...)
+dataset = dataset.repeat()
+dataset = dataset.shuffle(buffer_size=10000)
+dataset = dataset.batch(32)
+```
diff --git a/tensorflow/contrib/data/__init__.py b/tensorflow/contrib/data/__init__.py
new file mode 100644
index 0000000000..85e090b8ce
--- /dev/null
+++ b/tensorflow/contrib/data/__init__.py
@@ -0,0 +1,36 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""`tf.contrib.data.Dataset` API for input pipelines.
+
+@@Dataset
+@@Iterator
+
+@@read_batch_features
+@@rejection_resample
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+# pylint: disable=unused-import
+from tensorflow.contrib.data.python.ops.dataset_ops import Dataset
+from tensorflow.contrib.data.python.ops.dataset_ops import Iterator
+from tensorflow.contrib.data.python.ops.dataset_ops import read_batch_features
+from tensorflow.contrib.data.python.ops.dataset_ops import rejection_resample
+# pylint: enable=unused-import
+
+from tensorflow.python.util.all_util import remove_undocumented
+remove_undocumented(__name__)
diff --git a/tensorflow/contrib/data/python/framework/BUILD b/tensorflow/contrib/data/python/framework/BUILD
new file mode 100644
index 0000000000..7b84825bb4
--- /dev/null
+++ b/tensorflow/contrib/data/python/framework/BUILD
@@ -0,0 +1,41 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+load("//tensorflow:tensorflow.bzl", "py_test")
+
+py_library(
+    name = "function",
+    srcs = ["function.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:framework",
+    ],
+)
+
+py_test(
+    name = "function_test",
+    size = "medium",
+    srcs = ["function_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":function",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/data/python/framework/function.py b/tensorflow/contrib/data/python/framework/function.py
new file mode 100644
index 0000000000..a446c935ab
--- /dev/null
+++ b/tensorflow/contrib/data/python/framework/function.py
@@ -0,0 +1,267 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""An experimental fork of the Python TensorFlow-function library.
+
+NOTE: functions are currently experimental and subject to change!
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import function
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import variable_scope as vs
+from tensorflow.python.util import tf_inspect
+
+# NOTE(mrry): This is an experimental extension of a core class that wasn't
+# designed to be extended, so we disable protected access checks for the
+# whole file.
+# pylint: disable=protected-access
+
+
+class _ExperimentalFuncGraph(function._FuncGraph):
+  """A helper for construction a function (supporting capture-by-value).
+
+  _ExperimentalFuncGraph overrides ops.Graph's create_op() so that we can keep
+  track of every inputs into every op created inside the function.  If
+  any input is from other graphs, we keep track of it in self.capture
+  and substitue the input with a place holder.
+
+  Each captured input's corresponding place holder is converted into a
+  function argument and the caller passes in the captured tensor.
+  """
+
+  def __init__(self, capture_by_value, *args, **kwargs):
+    super(_ExperimentalFuncGraph, self).__init__(*args, **kwargs)
+    self._capture_by_value = capture_by_value
+    self._building_function = True
+    self._outer_graph = ops.get_default_graph()
+    self._vscope = vs.get_variable_scope()
+    self._old_custom_getter = self._vscope.custom_getter
+    self._captured = {}
+    self.extra_inputs = []
+    self.extra_args = []
+    self.extra_vars = []
+
+  def create_op(self, op_type, inputs, data_types, **kwargs):
+    for i, x in enumerate(inputs):
+      if x.graph is not self:
+        # Referring to a tensor from other graph.
+        if x in self._captured:
+          # Captured already.
+          inputs[i] = self._captured[x]
+        elif self._capture_by_value:
+          inputs[i] = self._add_tensor_and_parents(x)
+        else:
+          # Substitute with a placeholder.
+          self.extra_inputs.append(x)
+          ph = array_ops.placeholder(x.dtype, shape=x.get_shape())
+          # pylint: disable=protected-access
+          ph._handle_shape = x._handle_shape
+          ph._handle_dtype = x._handle_dtype
+          # pylint: enable=protected-access
+          inputs[i] = ph
+          self._captured[x] = ph
+          self.extra_args.append(ph)
+    return super(_ExperimentalFuncGraph, self).create_op(op_type, inputs,
+                                                         data_types, **kwargs)
+
+  def _add_tensor_and_parents(self, tensor):
+    op = self._add_op_and_parents(tensor.op)
+    return op.outputs[tensor.value_index]
+
+  def _add_op_and_parents(self, op):
+    op_def = function._get_op_def(op)
+    if op_def.is_stateful:
+      raise ValueError("Cannot capture a stateful node by value.")
+    elif op.type in ("Placeholder", "PlaceholderV2"):
+      raise ValueError("Cannot capture a placeholder by value.")
+
+    captured_inputs = [self._add_tensor_and_parents(x) for x in op.inputs]
+
+    captured_op = self.create_op(op.type, captured_inputs,
+                                 [o.dtype for o in op.outputs],
+                                 name=op.name, attrs=op.node_def.attr,
+                                 op_def=op_def)
+
+    for t, captured_t in zip(op.outputs, captured_op.outputs):
+      self._captured[t] = captured_t
+
+    return captured_op
+
+
+class _ExperimentalDefinedFunction(function._DefinedFunction):
+  """Overrides _DefinedFunction with support for capture-by-value."""
+
+  def __init__(self,
+               func,
+               argnames,
+               input_types,
+               func_name=None,
+               grad_func=None,
+               python_grad_func=None,
+               out_names=None,
+               shape_func=None,
+               capture_by_value=False,
+               **kwargs):
+    """Creates an _ExperimentalDefinedFunction.
+
+    Args:
+      func:  A python callable which constructs a tf function body.
+      argnames: A list of strings for function argument names.
+      input_types: The function's argument types. Can be a tuple, list of
+        tf data types.
+      func_name: The function name. Defaults to None, in which derives from
+        'func'.
+      grad_func: This function's gradient function, if not None. Defaults
+        to None.
+      python_grad_func: A python callable implementing the gradient of
+        the function python-side.
+      out_names: An optional list of strings for the function return value
+        names.
+      shape_func: An optional function mapping an op to a list of static
+        output shapes.
+      capture_by_value: Boolean (defaults to False). If True, captured values
+        will be copied into the function body.
+      **kwargs: The keyword arguments. **kwargs is passed to every call
+        site of this function.
+
+    Raises:
+      ValueError: The function definition is invalid.
+    """
+    super(_ExperimentalDefinedFunction, self).__init__(
+        func, argnames, input_types, func_name, grad_func, python_grad_func,
+        out_names, shape_func, **kwargs)
+    self._capture_by_value = capture_by_value
+
+  def _create_definition_if_needed(self):
+    """Creates the function definition if it's not created yet."""
+
+    if self._definition is not None:
+      return
+
+    # Create the func_def object.
+    temp_graph = _ExperimentalFuncGraph(capture_by_value=self._capture_by_value)
+    with temp_graph.as_default():
+      # List of placeholders for the function_def.
+      inputs = []
+      for (argname, argtype) in self._args:
+        argholder = array_ops.placeholder(argtype, name=argname)
+        inputs.append(argholder)
+      # Call func and gather the output tensors.
+      with vs.variable_scope("", custom_getter=temp_graph.getvar):
+        outputs = self._func(*inputs)
+      # If func only returned one value, make it a tuple.
+      if not isinstance(outputs, (list, tuple)):
+        outputs = (outputs,)
+      if any([_ is None for _ in outputs]):
+        raise ValueError("Function can not return None.")
+      # Ensures each output is a Tensor.
+      outputs = [ops.convert_to_tensor(_) for _ in outputs]
+    self._extra_inputs = temp_graph.extra_inputs
+    inputs.extend(temp_graph.extra_args)
+    self._sub_functions = temp_graph._functions
+
+    # Build the FunctionDef
+    self._definition = function._graph_to_function_def(
+        temp_graph, temp_graph.get_operations(), inputs, outputs,
+        out_names=self._out_names)
+
+    # Extra kwargs are treated as attrs on the function def.
+    sig_pre_func_name = self._func_name or function._get_func_name(self._func)
+    kwargs_attr = function._parse_kwargs_as_attrs(
+        sig_pre_func_name, **self._extra_kwargs)
+    for k in kwargs_attr:
+      self._definition.attr[k].CopyFrom(kwargs_attr[k])
+
+    # Hash the definition and its dependencies.
+    self._hash_str = self._create_hash_str(
+        self._definition.signature.input_arg,
+        self._definition.signature.output_arg,
+        self._definition.node_def)
+
+    # Finally, we decide the function name to use.  If not specified,
+    # make up something which is almost certainly unique (but deterministic).
+    if not self._func_name:
+      self._func_name = "_".join([function._get_func_name(self._func),
+                                  self._hash_str])
+    self._definition.signature.name = self._func_name
+    if self._func.__doc__:
+      self._definition.signature.description = self._func.__doc__
+
+
+class Defun(function.Defun):
+  """Experimental version of Defun supporting capture-by-value."""
+
+  def __init__(self, *input_types, **kwargs):
+    """Create an experimental `Defun` decorator.
+
+    Args:
+      *input_types: A list of `tf.DType`
+      **kwargs: Optional keyword arguments (see `function.Defun`) plus:
+        capture_by_value - Boolean (defaults to False). If True, captured values
+        will be copied into the function body.
+    """
+    super(Defun, self).__init__(*input_types, **kwargs)
+
+  def __call__(self, func):
+    # Various sanity checks on the callable func.
+    if not callable(func):
+      raise ValueError("func %s must be callable" % func)
+
+    # Func should not use kwargs and defaults.
+    argspec = tf_inspect.getargspec(func)
+    if argspec.keywords or argspec.defaults:
+      raise ValueError("Functions with argument defaults or keyword "
+                       "arguments are not supported.")
+
+    # Computes how many arguments 'func' has.
+    min_args = len(argspec.args)
+    max_args = min_args
+    if argspec.varargs:
+      max_args = 1000000
+    argnames = argspec.args
+    if tf_inspect.ismethod(func):
+      # 1st argument is the "class" type.
+      min_args -= 1
+      argnames = argnames[1:]
+
+    if self._input_types:
+      # If Defun is given a list of types for the inputs, the number
+      # of input types should be compatible with 'func'.
+      num = len(self._input_types)
+      if num < min_args or num > max_args:
+        raise ValueError(
+            "The function has fewer arguments than the number of specified "
+            "input types.")
+      return _ExperimentalDefinedFunction(
+          func, argnames, self._input_types, self._func_name, self._grad_func,
+          self._python_grad_func, out_names=self._out_names,
+          **self._extra_kwargs)
+
+    # 'func' expects no arguments and input types is an empty list.
+    if min_args == 0 and max_args == 0:
+      return _ExperimentalDefinedFunction(
+          func, [], [], self._func_name, self._grad_func,
+          self._python_grad_func, out_names=self._out_names,
+          **self._extra_kwargs)
+
+    # Input types are unknown. It's an overloaded function and hence
+    # its definition needs to be deferred until it's called.
+    return function._OverloadedFunction(
+        func, argnames, self._func_name, self._grad_func,
+        self._python_grad_func, out_names=self._out_names, **self._extra_kwargs)
diff --git a/tensorflow/contrib/data/python/framework/function_test.py b/tensorflow/contrib/data/python/framework/function_test.py
new file mode 100644
index 0000000000..c493170d28
--- /dev/null
+++ b/tensorflow/contrib/data/python/framework/function_test.py
@@ -0,0 +1,59 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for experimental capture-by-value feature in TF functions."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.data.python.framework import function
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class FunctionTest(test.TestCase):
+
+  def testCaptureByValue(self):
+    g = ops.Graph()
+    with g.as_default():
+      w = constant_op.constant([[1.0]])
+      b = constant_op.constant([2.0])
+
+      # Foo() captures w and b.
+      @function.Defun(dtypes.float32, capture_by_value=True)
+      def Foo(x):
+
+        # Plus() captures b.
+        @function.Defun(dtypes.float32, capture_by_value=True)
+        def Plus(y):
+          return y + b
+
+        self.assertEqual(0, len(Plus.captured_inputs))
+
+        return Plus(math_ops.matmul(w, x))
+
+      y = Foo(constant_op.constant([[10.]]))
+
+    self.assertEqual(0, len(Foo.captured_inputs))
+
+    with self.test_session(graph=g):
+      self.assertAllEqual(y.eval(), [[12.0]])
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/BUILD b/tensorflow/contrib/data/python/kernel_tests/BUILD
new file mode 100644
index 0000000000..0d14fd514c
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/BUILD
@@ -0,0 +1,219 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+load("//tensorflow:tensorflow.bzl", "py_test")
+
+py_test(
+    name = "iterator_ops_test",
+    size = "small",
+    srcs = ["iterator_ops_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:training",
+    ],
+)
+
+py_test(
+    name = "batch_dataset_op_test",
+    size = "small",
+    srcs = ["batch_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+py_test(
+    name = "bucketing_test",
+    size = "small",
+    srcs = ["bucketing_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+py_test(
+    name = "dataset_constructor_op_test",
+    size = "small",
+    srcs = ["dataset_constructor_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+py_test(
+    name = "filter_dataset_op_test",
+    size = "small",
+    srcs = ["filter_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+py_test(
+    name = "flat_map_dataset_op_test",
+    size = "small",
+    srcs = ["flat_map_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:training",
+    ],
+)
+
+py_test(
+    name = "map_dataset_op_test",
+    size = "small",
+    srcs = ["map_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:data_flow_ops",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:lookup_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:string_ops",
+    ],
+)
+
+py_test(
+    name = "range_dataset_op_test",
+    size = "small",
+    srcs = ["range_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+py_test(
+    name = "reader_dataset_ops_test",
+    size = "small",
+    srcs = ["reader_dataset_ops_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+py_test(
+    name = "resample_test",
+    size = "medium",
+    srcs = ["resample_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python:variables",
+    ],
+)
+
+py_test(
+    name = "sequence_dataset_op_test",
+    size = "small",
+    srcs = ["sequence_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+py_test(
+    name = "shuffle_dataset_op_test",
+    size = "small",
+    srcs = ["shuffle_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+py_test(
+    name = "zip_dataset_op_test",
+    size = "small",
+    srcs = ["zip_dataset_op_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/data/python/kernel_tests/batch_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/batch_dataset_op_test.py
new file mode 100644
index 0000000000..c78e1b412c
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/batch_dataset_op_test.py
@@ -0,0 +1,276 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import math
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import string_ops
+from tensorflow.python.platform import test
+from tensorflow.python.util import compat
+
+
+class BatchDatasetTest(test.TestCase):
+
+  def testBatchDataset(self):
+    """Test an dataset that maps a TF function across its input elements."""
+    # The pipeline is TensorSliceDataset -> MapDataset(square_3) ->
+    # RepeatDataset(count) -> BatchDataset(batch_size).
+    components = [np.arange(7),
+                  np.array([[1, 2, 3]]) * np.arange(7)[:, np.newaxis],
+                  np.array(37.0) * np.arange(7)]
+
+    count = array_ops.placeholder(dtypes.int64, shape=[])
+    batch_size = array_ops.placeholder(dtypes.int64, shape=[])
+
+    def _map_fn(x, y, z):
+      return math_ops.square(x), math_ops.square(y), math_ops.square(z)
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components).map(_map_fn)
+                .repeat(count).batch(batch_size).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([[None] + list(c.shape[1:]) for c in components],
+                     [t.shape.as_list() for t in get_next])
+
+    with self.test_session() as sess:
+      # Batch of a finite input, where the batch_size divides the
+      # total number of elements.
+      sess.run(init_op, feed_dict={count: 28, batch_size: 14})
+      num_batches = (28 * 7) // 14
+      for i in range(num_batches):
+        result = sess.run(get_next)
+        for component, result_component in zip(components, result):
+          for j in range(14):
+            self.assertAllEqual(component[(i*14 + j) % 7]**2,
+                                result_component[j])
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Batch of a finite input, where the batch_size does not
+      # divide the total number of elements.
+      sess.run(init_op, feed_dict={count: 14, batch_size: 8})
+
+      # We expect (num_batches - 1) full-sized batches.
+      num_batches = int(math.ceil((14 * 7) / 8))
+      for i in range(num_batches - 1):
+        result = sess.run(get_next)
+        for component, result_component in zip(components, result):
+          for j in range(8):
+            self.assertAllEqual(component[(i*8 + j) % 7]**2,
+                                result_component[j])
+      result = sess.run(get_next)
+      for component, result_component in zip(components, result):
+        for j in range((14 * 7) % 8):
+          self.assertAllEqual(component[((num_batches - 1)*8 + j) % 7]**2,
+                              result_component[j])
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Batch of an empty input should fail straight away.
+      sess.run(init_op, feed_dict={count: 0, batch_size: 8})
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Empty batch should be an initialization time error.
+      with self.assertRaises(errors.InvalidArgumentError):
+        sess.run(init_op, feed_dict={count: 14, batch_size: 0})
+
+  def testPaddedBatchDataset(self):
+    seq_lens = array_ops.placeholder(dtypes.int32, shape=[None])
+    padded_shape = array_ops.placeholder(dtypes.int64, shape=[1])
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(seq_lens)
+                .map(lambda x: array_ops.fill([x], x)).padded_batch(
+                    4,
+                    padded_shapes=padded_shape).make_initializable_iterator())
+
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      # Test with random sequence lengths, and max padding.
+      random_seq_lens = np.random.randint(20, size=(32,)).astype(np.int32)
+      sess.run(init_op, feed_dict={padded_shape: [-1],
+                                   seq_lens: random_seq_lens})
+      for i in range(8):
+        result = sess.run(get_next)
+        padded_len = np.max(result)
+        self.assertEqual((4, padded_len), result.shape)
+        for j in range(4):
+          seq_len = random_seq_lens[(i*4)+j]
+          self.assertAllEqual(result[j, :seq_len], [seq_len] * seq_len)
+          self.assertAllEqual(result[j, seq_len:], [0] * (padded_len - seq_len))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test with random sequence lengths, and constant padding.
+      sess.run(init_op, feed_dict={padded_shape: [25],
+                                   seq_lens: random_seq_lens})
+      for i in range(8):
+        result = sess.run(get_next)
+        self.assertEqual((4, 25), result.shape)
+        for j in range(4):
+          seq_len = random_seq_lens[(i*4)+j]
+          self.assertAllEqual(result[j, :seq_len], [seq_len] * seq_len)
+          self.assertAllEqual(result[j, seq_len:], [0] * (25 - seq_len))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test correct handling of empty tensors.
+      sess.run(init_op, feed_dict={padded_shape: [-1],
+                                   seq_lens: [0, 0, 0, 0]})
+      result = sess.run(get_next)
+      self.assertAllEqual([[], [], [], []], result)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test error handling with constant sequence lengths, and
+      # too-short padding.
+      sess.run(init_op, feed_dict={padded_shape: [5],
+                                   seq_lens: [6, 5, 5, 5]})
+      with self.assertRaises(errors.DataLossError):
+        result = sess.run(get_next)
+
+  def testPaddedBatchDatasetNonDefaultPadding(self):
+    seq_lens = array_ops.placeholder(dtypes.int32, shape=[None])
+    padded_shape = array_ops.placeholder(dtypes.int64, shape=[1])
+
+    def fill_tuple(x):
+      filled = array_ops.fill([x], x)
+      return (filled, string_ops.as_string(filled))
+    iterator = (dataset_ops.Dataset.from_tensor_slices(seq_lens).map(fill_tuple)
+                .padded_batch(
+                    4,
+                    padded_shapes=(padded_shape, padded_shape),
+                    padding_values=(-1, "<end>")).make_initializable_iterator())
+
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      # Test with random sequence lengths, and max padding.
+      random_seq_lens = np.random.randint(20, size=(32,)).astype(np.int32)
+      sess.run(init_op, feed_dict={padded_shape: [-1],
+                                   seq_lens: random_seq_lens})
+      for i in range(8):
+        result = sess.run(get_next)
+        padded_len = np.max(result[0])
+        self.assertEqual((4, padded_len), result[0].shape)
+        self.assertEqual((4, padded_len), result[1].shape)
+        for j in range(4):
+          seq_len = random_seq_lens[(i*4)+j]
+          self.assertAllEqual(result[0][j, :seq_len], [seq_len] * seq_len)
+          self.assertAllEqual(result[0][j, seq_len:],
+                              [-1] * (padded_len - seq_len))
+          self.assertAllEqual(result[1][j, :seq_len],
+                              [compat.as_bytes(str(seq_len))] * seq_len)
+          self.assertAllEqual(result[1][j, seq_len:],
+                              [b"<end>"] * (padded_len - seq_len))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testPaddedBatchDatasetShapeSpecifications(self):
+    int_placeholder = array_ops.placeholder(dtypes.int32)
+    float_placeholder = array_ops.placeholder(dtypes.float32)
+    string_placeholder = array_ops.placeholder(dtypes.string)
+    input_dataset = dataset_ops.Dataset.from_tensors(
+        (int_placeholder, float_placeholder, string_placeholder))
+
+    # Test different ways of specifying the `padded_shapes` argument.
+    dynamic_padding_from_tensor_shapes = input_dataset.padded_batch(
+        32,
+        padded_shapes=(tensor_shape.TensorShape([None]),
+                       tensor_shape.TensorShape([None, None]),
+                       tensor_shape.TensorShape([37])))
+    dynamic_padding_from_lists = input_dataset.padded_batch(
+        32, padded_shapes=([None], [None, None], [37]))
+    dynamic_padding_from_lists_with_minus_one = input_dataset.padded_batch(
+        32, padded_shapes=([-1], [-1, -1], [37]))
+    dynamic_padding_from_tensors = input_dataset.padded_batch(
+        32,
+        padded_shapes=(constant_op.constant([-1], dtype=dtypes.int64),
+                       constant_op.constant([-1, -1], dtype=dtypes.int64),
+                       constant_op.constant([37], dtype=dtypes.int64)))
+
+    for dataset in [dynamic_padding_from_tensor_shapes,
+                    dynamic_padding_from_lists,
+                    dynamic_padding_from_lists_with_minus_one,
+                    dynamic_padding_from_tensors]:
+      self.assertEqual([None, None], dataset.output_shapes[0].as_list())
+      self.assertEqual([None, None, None], dataset.output_shapes[1].as_list())
+      self.assertEqual([None, 37], dataset.output_shapes[2].as_list())
+
+  def testDenseToSparseBatchDataset(self):
+    components = np.random.randint(12, size=(100,)).astype(np.int32)
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components)
+                .map(lambda x: array_ops.fill([x], x)).dense_to_sparse_batch(
+                    4, [12]).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = sparse_tensor.SparseTensor(*iterator.get_next())
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+
+      for start in range(0, len(components), 4):
+        results = sess.run(get_next)
+        self.assertAllEqual(
+            [[i, j] for i, c in enumerate(components[start:start+4])
+             for j in range(c)], results.indices)
+        self.assertAllEqual(
+            [c for c in components[start:start+4] for _ in range(c)],
+            results.values)
+        self.assertAllEqual(
+            [min(4, len(components) - start), 12], results.dense_shape)
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testDenseToSparseBatchDatasetShapeErrors(self):
+    input_tensor = array_ops.placeholder(dtypes.int32)
+    iterator = (dataset_ops.Dataset.from_tensors(input_tensor)
+                .dense_to_sparse_batch(4, [12]).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = sparse_tensor.SparseTensor(*iterator.get_next())
+
+    with self.test_session() as sess:
+      # Initialize with an input tensor of incompatible rank.
+      sess.run(init_op, feed_dict={input_tensor: [[1]]})
+      with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                   "incompatible with the row shape"):
+        sess.run(get_next)
+
+      # Initialize with an input tensor that is larger than `row_shape`.
+      sess.run(init_op, feed_dict={input_tensor: range(13)})
+      with self.assertRaisesRegexp(errors.DataLossError,
+                                   "larger than the row shape"):
+        sess.run(get_next)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/bucketing_test.py b/tensorflow/contrib/data/python/kernel_tests/bucketing_test.py
new file mode 100644
index 0000000000..20d66d7f23
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/bucketing_test.py
@@ -0,0 +1,292 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import string_ops
+from tensorflow.python.platform import test
+
+
+class BucketingTest(test.TestCase):
+
+  def testSimple(self):
+    components = np.random.randint(100, size=(200,)).astype(np.int64)
+    iterator = dataset_ops.Iterator.from_dataset(
+        dataset_ops.Dataset.from_tensor_slices(components).map(lambda x: x * x)
+        .group_by_window(lambda x: x % 2, lambda _, xs: xs.batch(4), 4))
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      counts = []
+      with self.assertRaises(errors.OutOfRangeError):
+        while True:
+          result = sess.run(get_next)
+          self.assertTrue(
+              all(x % 2 == 0 for x in result) or all(x % 2 == 1)
+              for x in result)
+          counts.append(result.shape[0])
+
+      self.assertEqual(len(components), sum(counts))
+      num_full_batches = len([c for c in counts if c == 4])
+      self.assertGreaterEqual(num_full_batches, 23)
+      self.assertTrue(all(c == 4 for c in counts[:num_full_batches]))
+
+  def testImmediateOutput(self):
+    components = np.array(
+        [0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 0, 0, 2, 2, 0, 0], dtype=np.int64)
+    iterator = dataset_ops.Iterator.from_dataset(
+        dataset_ops.Dataset.from_tensor_slices(components).repeat(-1)
+        .group_by_window(lambda x: x % 3, lambda _, xs: xs.batch(4), 4))
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      # The input is infinite, so this test demonstrates that:
+      # 1. We produce output without having to consume the entire input,
+      # 2. Different buckets can produce output at different rates, and
+      # 3. For deterministic input, the output is deterministic.
+      for _ in range(3):
+        self.assertAllEqual([0, 0, 0, 0], sess.run(get_next))
+        self.assertAllEqual([1, 1, 1, 1], sess.run(get_next))
+        self.assertAllEqual([2, 2, 2, 2], sess.run(get_next))
+        self.assertAllEqual([0, 0, 0, 0], sess.run(get_next))
+
+  def testSmallGroups(self):
+    components = np.array([0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0], dtype=np.int64)
+    iterator = dataset_ops.Iterator.from_dataset(
+        dataset_ops.Dataset.from_tensor_slices(components)
+        .group_by_window(lambda x: x % 2, lambda _, xs: xs.batch(4), 4))
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      self.assertAllEqual([0, 0, 0, 0], sess.run(get_next))
+      self.assertAllEqual([1, 1, 1, 1], sess.run(get_next))
+      # The small outputs at the end are deterministically produced in key
+      # order.
+      self.assertAllEqual([0, 0, 0], sess.run(get_next))
+      self.assertAllEqual([1], sess.run(get_next))
+
+  def testReduceFuncError(self):
+    components = np.random.randint(100, size=(200,)).astype(np.int64)
+
+    def reduce_func(_, xs):
+      # Introduce an incorrect padded shape that cannot (currently) be
+      # detected at graph construction time.
+      return xs.padded_batch(
+          4,
+          padded_shapes=(tensor_shape.TensorShape([]),
+                         constant_op.constant([5], dtype=dtypes.int64) * -1))
+
+    iterator = dataset_ops.Iterator.from_dataset(
+        dataset_ops.Dataset.from_tensor_slices(components)
+        .map(lambda x: (x, ops.convert_to_tensor([x * x])))
+        .group_by_window(lambda x, _: x % 2, reduce_func, 32))
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      with self.assertRaises(errors.InvalidArgumentError):
+        sess.run(get_next)
+
+  def testConsumeWindowDatasetMoreThanOnce(self):
+    components = np.random.randint(50, size=(200,)).astype(np.int64)
+
+    def reduce_func(key, window):
+      # Apply two different kinds of padding to the input: tight
+      # padding, and quantized (to a multiple of 10) padding.
+      return dataset_ops.Dataset.zip((window.padded_batch(
+          4,
+          padded_shapes=tensor_shape.TensorShape([None])), window.padded_batch(
+              4, padded_shapes=ops.convert_to_tensor([(key + 1) * 10])),))
+
+    iterator = dataset_ops.Iterator.from_dataset(
+        dataset_ops.Dataset.from_tensor_slices(components)
+        .map(lambda x: array_ops.fill([math_ops.cast(x, dtypes.int32)], x))
+        .group_by_window(
+            lambda x: math_ops.cast(array_ops.shape(x)[0] // 10, dtypes.int64),
+            reduce_func, 4))
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      counts = []
+      with self.assertRaises(errors.OutOfRangeError):
+        while True:
+          tight_result, multiple_of_10_result = sess.run(get_next)
+          self.assertEqual(0, multiple_of_10_result.shape[1] % 10)
+          self.assertAllEqual(tight_result,
+                              multiple_of_10_result[:, :tight_result.shape[1]])
+          counts.append(tight_result.shape[0])
+      self.assertEqual(len(components), sum(counts))
+
+
+# NOTE(mrry): These tests are based on the tests in
+# bucket_ops_test.py. Currently, different batch sizes for each key
+# are not supported, although this would be possible to add to
+# `Dataset.group_by_window()`.
+class BucketTest(test.TestCase):
+
+  def _dynamicPad(self, bucket, window, window_size):
+    # TODO(mrry): To match `tf.contrib.training.bucket()`, implement a
+    # generic form of padded_batch that pads every component
+    # dynamically and does not rely on static shape information about
+    # the arguments.
+    return dataset_ops.Dataset.zip(
+        (dataset_ops.Dataset.from_tensors(bucket), window.padded_batch(
+            32, (tensor_shape.TensorShape([]), tensor_shape.TensorShape([None]),
+                 tensor_shape.TensorShape([3])))))
+
+  def testSingleBucket(self):
+    def _map_fn(v):
+      return (v, array_ops.fill([v], v),
+              array_ops.fill([3], string_ops.as_string(v)))
+
+    input_dataset = (
+        dataset_ops.Dataset.from_tensor_slices(math_ops.range(32)).map(_map_fn))
+
+    bucketed_dataset = input_dataset.group_by_window(
+        lambda x, y, z: 0, lambda k, bucket: self._dynamicPad(k, bucket, 32),
+        32)
+
+    iterator = dataset_ops.Iterator.from_dataset(bucketed_dataset)
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+
+      which_bucket, bucketed_values = sess.run(get_next)
+
+      self.assertEqual(0, which_bucket)
+
+      expected_scalar_int = np.arange(32, dtype=np.int64)
+      expected_unk_int64 = np.zeros((32, 31)).astype(np.int64)
+      for i in range(32):
+        expected_unk_int64[i, :i] = i
+      expected_vec3_str = np.vstack(3 * [np.arange(32).astype(bytes)]).T
+
+      self.assertAllEqual(expected_scalar_int, bucketed_values[0])
+      self.assertAllEqual(expected_unk_int64, bucketed_values[1])
+      self.assertAllEqual(expected_vec3_str, bucketed_values[2])
+
+  def testEvenOddBuckets(self):
+    def _map_fn(v):
+      return (v, array_ops.fill([v], v),
+              array_ops.fill([3], string_ops.as_string(v)))
+
+    input_dataset = (
+        dataset_ops.Dataset.from_tensor_slices(math_ops.range(64)).map(_map_fn))
+
+    bucketed_dataset = input_dataset.group_by_window(
+        lambda x, y, z: math_ops.cast(x % 2, dtypes.int64),
+        lambda k, bucket: self._dynamicPad(k, bucket, 32), 32)
+
+    iterator = dataset_ops.Iterator.from_dataset(bucketed_dataset)
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+
+      # Get two minibatches (one containing even values, one containing odds)
+      which_bucket_even, bucketed_values_even = sess.run(get_next)
+      which_bucket_odd, bucketed_values_odd = sess.run(get_next)
+
+      # Count number of bucket_tensors.
+      self.assertEqual(3, len(bucketed_values_even))
+      self.assertEqual(3, len(bucketed_values_odd))
+
+      # Ensure bucket 0 was used for all minibatch entries.
+      self.assertAllEqual(0, which_bucket_even)
+      self.assertAllEqual(1, which_bucket_odd)
+
+      # Test the first bucket outputted, the events starting at 0
+      expected_scalar_int = np.arange(0, 32 * 2, 2, dtype=np.int64)
+      expected_unk_int64 = np.zeros((32, 31 * 2)).astype(np.int64)
+      for i in range(0, 32):
+        expected_unk_int64[i, :2 * i] = 2 * i
+        expected_vec3_str = np.vstack(
+            3 * [np.arange(0, 32 * 2, 2).astype(bytes)]).T
+
+      self.assertAllEqual(expected_scalar_int, bucketed_values_even[0])
+      self.assertAllEqual(expected_unk_int64, bucketed_values_even[1])
+      self.assertAllEqual(expected_vec3_str, bucketed_values_even[2])
+
+      # Test the second bucket outputted, the odds starting at 1
+      expected_scalar_int = np.arange(1, 32 * 2 + 1, 2, dtype=np.int64)
+      expected_unk_int64 = np.zeros((32, 31 * 2 + 1)).astype(np.int64)
+      for i in range(0, 32):
+        expected_unk_int64[i, :2 * i + 1] = 2 * i + 1
+        expected_vec3_str = np.vstack(
+            3 * [np.arange(1, 32 * 2 + 1, 2).astype(bytes)]).T
+
+      self.assertAllEqual(expected_scalar_int, bucketed_values_odd[0])
+      self.assertAllEqual(expected_unk_int64, bucketed_values_odd[1])
+      self.assertAllEqual(expected_vec3_str, bucketed_values_odd[2])
+
+  def testEvenOddBucketsFilterOutAllOdd(self):
+    def _map_fn(v):
+      return (v, array_ops.fill([v], v),
+              array_ops.fill([3], string_ops.as_string(v)))
+
+    input_dataset = (
+        dataset_ops.Dataset.from_tensor_slices(math_ops.range(128)).map(_map_fn)
+        .filter(lambda x, y, z: math_ops.equal(x % 2, 0)))
+
+    bucketed_dataset = input_dataset.group_by_window(
+        lambda x, y, z: math_ops.cast(x % 2, dtypes.int64),
+        lambda k, bucket: self._dynamicPad(k, bucket, 32), 32)
+
+    iterator = dataset_ops.Iterator.from_dataset(bucketed_dataset)
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+
+      # Get two minibatches ([0, 2, ...] and [64, 66, ...])
+      which_bucket0, bucketed_values_even0 = sess.run(get_next)
+      which_bucket1, bucketed_values_even1 = sess.run(get_next)
+
+      # Ensure that bucket 1 was completely filtered out
+      self.assertAllEqual(0, which_bucket0)
+      self.assertAllEqual(0, which_bucket1)
+      self.assertAllEqual(
+          np.arange(0, 64, 2, dtype=np.int64), bucketed_values_even0[0])
+      self.assertAllEqual(
+          np.arange(64, 128, 2, dtype=np.int64), bucketed_values_even1[0])
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py b/tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py
new file mode 100644
index 0000000000..acff83c239
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py
@@ -0,0 +1,239 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+from tensorflow.python.util import nest
+
+
+class DatasetConstructorTest(test.TestCase):
+
+  def testTensorDataset(self):
+    """Test an dataset that represents a single tuple of tensors."""
+    components = [np.array(1), np.array([1, 2, 3]), np.array(37.0)]
+
+    iterator = (dataset_ops.Dataset.from_tensors(components)
+                .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      results = sess.run(get_next)
+      for component, result_component in zip(components, results):
+        self.assertAllEqual(component, result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testTensorSliceDataset(self):
+    """Test an dataset that represents the slices from a tuple of tensors."""
+    components = [
+        np.tile(np.array([[1], [2], [3], [4]]), 20), np.tile(
+            np.array([[12], [13], [14], [15]]), 22),
+        np.array([37.0, 38.0, 39.0, 40.0])
+    ]
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components)
+                .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      for i in range(4):
+        results = sess.run(get_next)
+        for component, result_component in zip(components, results):
+          self.assertAllEqual(component[i], result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testSparseTensorSliceDataset(self):
+    """Test a dataset based on slices of a `tf.SparseTensor`."""
+    st = array_ops.sparse_placeholder(dtypes.float64)
+    iterator = (dataset_ops.Dataset.from_sparse_tensor_slices(st)
+                .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = sparse_tensor.SparseTensor(*iterator.get_next())
+
+    with self.test_session() as sess:
+      slices = [[1., 2., 3.], [1.], [1.], [1., 2.], [], [1., 2.], [], [], []]
+
+      # Test with sparse tensor in the appropriate order.
+      indices = np.array(
+          [[i, j] for i in range(len(slices)) for j in range(len(slices[i]))])
+      values = np.array([val for s in slices for val in s])
+      dense_shape = np.array([len(slices), max(len(s) for s in slices) + 1])
+      sparse_feed = sparse_tensor.SparseTensorValue(indices, values,
+                                                    dense_shape)
+      sess.run(init_op, feed_dict={st: sparse_feed})
+      for i, s in enumerate(slices):
+        results = sess.run(get_next)
+        self.assertAllEqual(s, results.values)
+        expected_indices = np.array(
+            [[j] for j in range(len(slices[i]))]).reshape([-1, 1])
+        self.assertAllEqual(expected_indices, results.indices)
+        self.assertAllEqual(dense_shape[1:], results.dense_shape)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test with sparse tensor in the reverse order, which is not
+      # currently supported.
+      reverse_order_indices = indices[::-1, :]
+      reverse_order_values = values[::-1]
+      sparse_feed = sparse_tensor.SparseTensorValue(
+          reverse_order_indices, reverse_order_values, dense_shape)
+      with self.assertRaises(errors.UnimplementedError):
+        sess.run(init_op, feed_dict={st: sparse_feed})
+
+      # Test with an empty sparse tensor.
+      empty_indices = np.empty((0, 4), dtype=np.int64)
+      empty_values = np.empty((0,), dtype=np.float64)
+      empty_dense_shape = [0, 4, 37, 9]
+      sparse_feed = sparse_tensor.SparseTensorValue(empty_indices, empty_values,
+                                                    empty_dense_shape)
+      sess.run(init_op, feed_dict={st: sparse_feed})
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  # pylint: disable=g-long-lambda,unnecessary-lambda
+  def testNestedStructure(self):
+    components = (np.array([1, 2, 3]), (np.array([4., 5.]), np.array([6., 7.])),
+                  np.array([8, 9, 10]))
+
+    dataset = dataset_ops.Dataset.from_tensors(components)
+    self.assertEquals((dtypes.int64, (dtypes.float64, dtypes.float64),
+                       dtypes.int64), dataset.output_types)
+    self.assertEquals(([3], ([2], [2]), [3]), dataset.output_shapes)
+
+    dataset = dataset.shuffle(10, 10)
+    self.assertEquals((dtypes.int64, (dtypes.float64, dtypes.float64),
+                       dtypes.int64), dataset.output_types)
+    self.assertEquals(([3], ([2], [2]), [3]), dataset.output_shapes)
+
+    dataset = dataset.repeat(-1)
+    self.assertEquals((dtypes.int64, (dtypes.float64, dtypes.float64),
+                       dtypes.int64), dataset.output_types)
+    self.assertEquals(([3], ([2], [2]), [3]), dataset.output_shapes)
+
+    dataset = dataset.filter(lambda x, y, z: True)
+    self.assertEquals((dtypes.int64, (dtypes.float64, dtypes.float64),
+                       dtypes.int64), dataset.output_types)
+    self.assertEquals(([3], ([2], [2]), [3]), dataset.output_shapes)
+
+    dataset = dataset.take(5)
+    self.assertEquals((dtypes.int64, (dtypes.float64, dtypes.float64),
+                       dtypes.int64), dataset.output_types)
+    self.assertEquals(([3], ([2], [2]), [3]), dataset.output_shapes)
+
+    dataset = dataset.map(lambda x, y, z: ((x, z), (y[0], y[1])))
+    self.assertEquals(((dtypes.int64, dtypes.int64),
+                       (dtypes.float64, dtypes.float64)), dataset.output_types)
+    self.assertEquals((([3], [3]), ([2], [2])), dataset.output_shapes)
+
+    dataset = dataset.flat_map(
+        lambda x, y: dataset_ops.Dataset.from_tensors(((x[0], x[1]),
+                                                       (y[0], y[1])))
+    )
+    self.assertEquals(((dtypes.int64, dtypes.int64),
+                       (dtypes.float64, dtypes.float64)), dataset.output_types)
+    self.assertEquals((([3], [3]), ([2], [2])), dataset.output_shapes)
+
+    dataset = dataset.batch(32)
+    self.assertEquals(((dtypes.int64, dtypes.int64),
+                       (dtypes.float64, dtypes.float64)), dataset.output_types)
+    self.assertEquals((([None, 3], [None, 3]), ([None, 2], [None, 2])),
+                      nest.pack_sequence_as(dataset.output_shapes, [
+                          s.as_list()
+                          for s in nest.flatten(dataset.output_shapes)
+                      ]))
+
+    iterator = dataset.make_one_shot_iterator()
+    (w, x), (y, z) = iterator.get_next()
+    self.assertEquals(dtypes.int64, w.dtype)
+    self.assertEquals(dtypes.int64, x.dtype)
+    self.assertEquals(dtypes.float64, y.dtype)
+    self.assertEquals(dtypes.float64, z.dtype)
+    self.assertEquals([None, 3], w.shape.as_list())
+    self.assertEquals([None, 3], x.shape.as_list())
+    self.assertEquals([None, 2], y.shape.as_list())
+    self.assertEquals([None, 2], z.shape.as_list())
+
+    iterator = dataset.make_initializable_iterator()
+    (w, x), (y, z) = iterator.get_next()
+    self.assertEquals(dtypes.int64, w.dtype)
+    self.assertEquals(dtypes.int64, x.dtype)
+    self.assertEquals(dtypes.float64, y.dtype)
+    self.assertEquals(dtypes.float64, z.dtype)
+    self.assertEquals([None, 3], w.shape.as_list())
+    self.assertEquals([None, 3], x.shape.as_list())
+    self.assertEquals([None, 2], y.shape.as_list())
+    self.assertEquals([None, 2], z.shape.as_list())
+
+    # Define a separate set of components with matching leading
+    # dimension for the from-slices constructor.
+    components_for_slices = (np.array([1, 2, 3]), (np.array(
+        [4., 5., 6.]), np.array([7., 8., 9.])), np.array([10, 11, 12]))
+
+    dataset = dataset_ops.Dataset.from_tensor_slices(components_for_slices)
+    self.assertEquals((dtypes.int64, (dtypes.float64, dtypes.float64),
+                       dtypes.int64), dataset.output_types)
+    self.assertEquals(([], ([], []), []), dataset.output_shapes)
+
+  def testNonSequenceNestedStructure(self):
+    components = np.array([1, 2, 3])
+
+    dataset = dataset_ops.Dataset.from_tensors(components)
+    self.assertEquals(dtypes.int64, dataset.output_types)
+    self.assertEquals([3], dataset.output_shapes)
+
+    dataset = dataset.filter(
+        lambda x: math_ops.reduce_all(math_ops.equal(x, components)))
+    self.assertEquals(dtypes.int64, dataset.output_types)
+    self.assertEquals([3], dataset.output_shapes)
+
+    dataset = dataset.map(lambda x: array_ops.stack([x, x]))
+    self.assertEquals(dtypes.int64, dataset.output_types)
+    self.assertEquals([2, 3], dataset.output_shapes)
+
+    dataset = dataset.flat_map(
+        lambda x: dataset_ops.Dataset.from_tensor_slices(x))
+    self.assertEquals(dtypes.int64, dataset.output_types)
+    self.assertEquals([3], dataset.output_shapes)
+
+    iterator = dataset.make_one_shot_iterator()
+    get_next = iterator.get_next()
+    self.assertEquals(dtypes.int64, get_next.dtype)
+    self.assertEquals([3], get_next.shape)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/filter_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/filter_dataset_op_test.py
new file mode 100644
index 0000000000..e4e994479f
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/filter_dataset_op_test.py
@@ -0,0 +1,77 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class FilterDatasetTest(test.TestCase):
+
+  def testFilterDataset(self):
+    components = [
+        np.arange(7, dtype=np.int64),
+        np.array([[1, 2, 3]], dtype=np.int64) * np.arange(
+            7, dtype=np.int64)[:, np.newaxis],
+        np.array(37.0, dtype=np.float64) * np.arange(7)
+    ]
+    count = array_ops.placeholder(dtypes.int64, shape=[])
+    modulus = array_ops.placeholder(dtypes.int64)
+
+    def _map_fn(x, y, z):
+      return math_ops.square(x), math_ops.square(y), math_ops.square(z)
+
+    iterator = (
+        dataset_ops.Dataset.from_tensor_slices(components).map(_map_fn)
+        .repeat(count)
+        .filter(lambda x, _y, _z: math_ops.equal(math_ops.mod(x, modulus), 0))
+        .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      # Test that we can dynamically feed a different modulus value for each
+      # iterator.
+      def do_test(count_val, modulus_val):
+        sess.run(init_op, feed_dict={count: count_val, modulus: modulus_val})
+        for _ in range(count_val):
+          for i in [x for x in range(7) if x**2 % modulus_val == 0]:
+            result = sess.run(get_next)
+            for component, result_component in zip(components, result):
+              self.assertAllEqual(component[i]**2, result_component)
+        with self.assertRaises(errors.OutOfRangeError):
+          sess.run(get_next)
+
+      do_test(14, 2)
+      do_test(4, 18)
+
+      # Test an empty dataset.
+      do_test(0, 1)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/flat_map_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/flat_map_dataset_op_test.py
new file mode 100644
index 0000000000..705cfef901
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/flat_map_dataset_op_test.py
@@ -0,0 +1,108 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import random
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.client import session
+from tensorflow.python.framework import errors
+from tensorflow.python.platform import test
+from tensorflow.python.training import server_lib
+
+
+class FlatMapDatasetTest(test.TestCase):
+
+  # pylint: disable=g-long-lambda
+  def testFlatMapDataset(self):
+    repeats = [1, 2, 3, 4, 5, 0, 1]
+    components = [np.array(repeats, dtype=np.int64)]
+    iterator = (
+        dataset_ops.Dataset.from_tensor_slices(components)
+        .flat_map(lambda x: dataset_ops.Dataset.from_tensors([x]).repeat(x))
+        .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next, = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      for i in repeats:
+        for _ in range(i):
+          self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testNestedFlatMapDataset(self):
+    repeats = [[1, 2], [3, 4], [5, 0], [1, 7]]
+    components = [np.array(repeats, dtype=np.int64)]
+    iterator = (
+        dataset_ops.Dataset.from_tensor_slices(components)
+        .flat_map(lambda x: dataset_ops.Dataset.from_tensor_slices([x])
+                  .flat_map(lambda y: dataset_ops.Dataset.from_tensors([y])
+                            .repeat(y))).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next, = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      for row in repeats:
+        for i in row:
+          for _ in range(i):
+            self.assertEqual(i, sess.run(get_next))
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testSharedResourceNestedFlatMapDataset(self):
+    repeats = [[1, 2], [3, 4], [5, 0], [1, 7]]
+    components = [np.array(repeats, dtype=np.int64)]
+    iterator = (
+        dataset_ops.Dataset.from_tensor_slices(components)
+        .flat_map(lambda x: dataset_ops.Dataset.from_tensor_slices([x])
+                  .flat_map(lambda y: dataset_ops.Dataset.from_tensors([y])
+                            .repeat(y))).make_initializable_iterator(
+                                shared_name="shared_flat_map_iterator"))
+    init_op = iterator.initializer
+    get_next, = iterator.get_next()
+
+    # Create two concurrent sessions that share the same iterator
+    # resource on the same server, and verify that a random
+    # interleaving of `Session.run(get_next)` calls on the two
+    # sessions yields the expected result.
+    server = server_lib.Server.create_local_server()
+    with session.Session(server.target) as sess1:
+      with session.Session(server.target) as sess2:
+        for _ in range(3):
+          sess = random.choice([sess1, sess2])
+          sess.run(init_op)
+          for row in repeats:
+            for i in row:
+              for _ in range(i):
+                sess = random.choice([sess1, sess2])
+                self.assertEqual(i, sess.run(get_next))
+
+        with self.assertRaises(errors.OutOfRangeError):
+          sess = random.choice([sess1, sess2])
+          sess.run(get_next)
+  # pylint: enable=g-long-lambda
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/iterator_ops_test.py b/tensorflow/contrib/data/python/kernel_tests/iterator_ops_test.py
new file mode 100644
index 0000000000..ace04919e7
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/iterator_ops_test.py
@@ -0,0 +1,252 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.client import session
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+from tensorflow.python.training import server_lib
+
+
+class IteratorTest(test.TestCase):
+
+  def testOneShotIterator(self):
+    components = [np.arange(7),
+                  np.array([[1, 2, 3]]) * np.arange(7)[:, np.newaxis],
+                  np.array(37.0) * np.arange(7)]
+
+    def _map_fn(x, y, z):
+      return math_ops.square(x), math_ops.square(y), math_ops.square(z)
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components).map(_map_fn)
+                .repeat(14).make_one_shot_iterator())
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      for _ in range(14):
+        for i in range(7):
+          result = sess.run(get_next)
+          for component, result_component in zip(components, result):
+            self.assertAllEqual(component[i]**2, result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testOneShotIteratorCaptureByValue(self):
+    components = [np.arange(7),
+                  np.array([[1, 2, 3]]) * np.arange(7)[:, np.newaxis],
+                  np.array(37.0) * np.arange(7)]
+    tensor_components = [ops.convert_to_tensor(c) for c in components]
+
+    def _map_fn(x, y, z):
+      return math_ops.square(x), math_ops.square(y), math_ops.square(z)
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(tensor_components)
+                .map(_map_fn).repeat(14).make_one_shot_iterator())
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      for _ in range(14):
+        for i in range(7):
+          result = sess.run(get_next)
+          for component, result_component in zip(components, result):
+            self.assertAllEqual(component[i]**2, result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testOneShotIteratorInsideContainer(self):
+    components = [np.arange(7),
+                  np.array([[1, 2, 3]]) * np.arange(7)[:, np.newaxis],
+                  np.array(37.0) * np.arange(7)]
+
+    def within_container():
+      def _map_fn(x, y, z):
+        return math_ops.square(x), math_ops.square(y), math_ops.square(z)
+      iterator = (dataset_ops.Dataset.from_tensor_slices(components)
+                  .map(_map_fn).repeat(14).make_one_shot_iterator())
+      return iterator.get_next()
+
+    server = server_lib.Server.create_local_server()
+
+    # Create two iterators within unique containers, and run them to
+    # make sure that the resources aren't shared.
+    #
+    # The test below would fail if cname were the same across both
+    # sessions.
+    for i in range(2):
+      with session.Session(server.target) as sess:
+        cname = "iteration%d" % i
+        with ops.container(cname):
+          get_next = within_container()
+
+        for _ in range(14):
+          for i in range(7):
+            result = sess.run(get_next)
+            for component, result_component in zip(components, result):
+              self.assertAllEqual(component[i]**2, result_component)
+        with self.assertRaises(errors.OutOfRangeError):
+          sess.run(get_next)
+
+  def testSimpleSharedResource(self):
+    components = [
+        np.array(1, dtype=np.int64),
+        np.array([1, 2, 3], dtype=np.int64),
+        np.array(37.0, dtype=np.float64)
+    ]
+
+    server = server_lib.Server.create_local_server()
+
+    # Create two non-overlapping sessions that share the same iterator
+    # resource on the same server, and verify that an action of the
+    # first session (initializing the iterator) is visible in the
+    # second session.
+    with ops.Graph().as_default():
+      iterator = (dataset_ops.Dataset.from_tensors(components)
+                  .map(lambda x, y, z: (x, y, z)).make_initializable_iterator(
+                      shared_name="shared_iterator"))
+      init_op = iterator.initializer
+      get_next = iterator.get_next()
+
+      with session.Session(server.target) as sess:
+        sess.run(init_op)
+        results = sess.run(get_next)
+        for component, result_component in zip(components, results):
+          self.assertAllEqual(component, result_component)
+        with self.assertRaises(errors.OutOfRangeError):
+          sess.run(get_next)
+
+        # Re-initialize the iterator in the first session.
+        sess.run(init_op)
+
+    with ops.Graph().as_default():
+      # Re-define the iterator manually, without defining any of the
+      # functions in this graph, to ensure that we are not
+      # accidentally redefining functions with the same names in the
+      # new graph.
+      iterator = dataset_ops.Iterator.from_structure(
+          shared_name="shared_iterator",
+          output_types=[dtypes.int64, dtypes.int64, dtypes.float64],
+          output_shapes=[[], [3], []])
+      get_next = iterator.get_next()
+
+      with session.Session(server.target) as sess:
+        # Use the iterator without re-initializing in the second session.
+        results = sess.run(get_next)
+        for component, result_component in zip(components, results):
+          self.assertAllEqual(component, result_component)
+        with self.assertRaises(errors.OutOfRangeError):
+          sess.run(get_next)
+
+  def testNotInitializedError(self):
+    components = [np.array(1), np.array([1, 2, 3]), np.array(37.0)]
+    iterator = (dataset_ops.Dataset.from_tensors(components)
+                .make_initializable_iterator())
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      with self.assertRaisesRegexp(errors.FailedPreconditionError,
+                                   "iterator has not been initialized"):
+        sess.run(get_next)
+
+  def testReinitializableIterator(self):
+    dataset_3 = dataset_ops.Dataset.from_tensors(
+        constant_op.constant([1, 2, 3]))
+    dataset_4 = dataset_ops.Dataset.from_tensors(
+        constant_op.constant([4, 5, 6, 7]))
+    iterator = dataset_ops.Iterator.from_structure(dataset_3.output_types,
+                                                   [None])
+
+    dataset_3_init_op = iterator.make_initializer(dataset_3)
+    dataset_4_init_op = iterator.make_initializer(dataset_4)
+    get_next = iterator.get_next()
+
+    self.assertEqual(dataset_3.output_types, iterator.output_types)
+    self.assertEqual(dataset_4.output_types, iterator.output_types)
+    self.assertEqual([None], iterator.output_shapes.as_list())
+
+    with self.test_session() as sess:
+      # The iterator is initially uninitialized.
+      with self.assertRaises(errors.FailedPreconditionError):
+        sess.run(get_next)
+
+      # Initialize with one dataset.
+      sess.run(dataset_3_init_op)
+      self.assertAllEqual([1, 2, 3], sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Initialize with a different dataset.
+      sess.run(dataset_4_init_op)
+      self.assertAllEqual([4, 5, 6, 7], sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Reinitialize with the first dataset.
+      sess.run(dataset_3_init_op)
+      self.assertAllEqual([1, 2, 3], sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testReinitializableIteratorStaticErrors(self):
+    # Non-matching structure for types and shapes.
+    with self.assertRaises(TypeError):
+      iterator = dataset_ops.Iterator.from_structure((dtypes.int64,
+                                                      dtypes.float64), [None])
+
+    # Test validation of dataset argument.
+    iterator = dataset_ops.Iterator.from_structure((dtypes.int64,
+                                                    dtypes.float64))
+
+    # Incompatible structure.
+    with self.assertRaises(ValueError):
+      iterator.make_initializer(
+          dataset_ops.Dataset.from_tensors(((constant_op.constant(
+              [1, 2, 3], dtype=dtypes.int64),), (constant_op.constant(
+                  [4., 5., 6., 7.], dtype=dtypes.float64),))))
+
+    # Incompatible types.
+    with self.assertRaises(TypeError):
+      iterator.make_initializer(
+          dataset_ops.Dataset.from_tensors((constant_op.constant(
+              [1, 2, 3], dtype=dtypes.int32), constant_op.constant(
+                  [4., 5., 6., 7.], dtype=dtypes.float32))))
+
+    # Incompatible shapes.
+    iterator = dataset_ops.Iterator.from_structure(
+        (dtypes.int64, dtypes.float64), ([None], []))
+    with self.assertRaises(TypeError):
+      iterator.make_initializer(
+          dataset_ops.Dataset.from_tensors((constant_op.constant(
+              [1, 2, 3], dtype=dtypes.int64), constant_op.constant(
+                  [4., 5., 6., 7.], dtype=dtypes.float64))))
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/map_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/map_dataset_op_test.py
new file mode 100644
index 0000000000..2f7f8ebbae
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/map_dataset_op_test.py
@@ -0,0 +1,330 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import lookup_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import string_ops
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.platform import test
+
+
+class MapDatasetTest(test.TestCase):
+
+  def _buildMapDataset(self, components, count):
+    def _map_fn(x, y, z):
+      return math_ops.square(x), math_ops.square(y), math_ops.square(z)
+    return (dataset_ops.Dataset.from_tensor_slices(components).map(_map_fn)
+            .repeat(count))
+
+  def testMapDataset(self):
+    """Test an dataset that maps a TF function across its input elements."""
+    # The pipeline is TensorSliceDataset -> MapDataset(square_3) ->
+    # RepeatDataset(count).
+    components = [np.arange(7),
+                  np.array([[1, 2, 3]]) * np.arange(7)[:, np.newaxis],
+                  np.array(37.0) * np.arange(7)]
+    count = array_ops.placeholder(dtypes.int64, shape=[])
+
+    dataset = self._buildMapDataset(components, count)
+    iterator = dataset.make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      # Test single-threaded access to the iterator.
+      sess.run(init_op, feed_dict={count: 14})
+      for _ in range(14):
+        for i in range(7):
+          result = sess.run(get_next)
+          for component, result_component in zip(components, result):
+            self.assertAllEqual(component[i]**2, result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test multi-threaded access to the same iterator.
+      sess.run(init_op, feed_dict={count: 18})
+      results = []
+      def iterator_thread():
+        while True:
+          try:
+            results.append(sess.run(get_next))
+          except errors.OutOfRangeError:
+            return
+      threads = [self.checkedThread(target=iterator_thread) for _ in range(8)]
+      for t in threads:
+        t.start()
+      for t in threads:
+        t.join()
+
+      # `results` will contain the same elements components**2
+      # repeated 18 times, but in a non-deterministic order. Sort the
+      # results, and assert that each element of components**2 is
+      # produced 18 times.
+      results.sort(key=lambda x: x[0])
+      for i in range(7):
+        for j in range(18):
+          for component, result_component in zip(components,
+                                                 results[i * 18 + j]):
+            self.assertAllEqual(component[i]**2, result_component)
+
+  def _buildParallelMapDataset(self, components, count, num_threads,
+                               output_buffer_size):
+    def _map_fn(x, y, z):
+      return math_ops.square(x), math_ops.square(y), math_ops.square(z)
+    return (dataset_ops.Dataset.from_tensor_slices(components).map(
+        _map_fn, num_threads=num_threads, output_buffer_size=output_buffer_size)
+            .repeat(count))
+
+  def testParallelMapDataset(self):
+    """Test an dataset that maps a TF function across its input elements."""
+    # The pipeline is TensorSliceDataset -> ParallelMapDataset(square_3) ->
+    # RepeatDataset(count).
+    components = [np.arange(7),
+                  np.array([[1, 2, 3]]) * np.arange(7)[:, np.newaxis],
+                  np.array(37.0) * np.arange(7)]
+    count = array_ops.placeholder(dtypes.int64, shape=[])
+    num_threads = array_ops.placeholder(dtypes.int32, shape=[])
+    output_buffer_size = array_ops.placeholder(dtypes.int64, shape=[])
+
+    dataset = self._buildParallelMapDataset(components, count, num_threads,
+                                            output_buffer_size)
+    iterator = dataset.make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      def do_test(num_threads_val, output_buffer_size_val):
+        # Test single-threaded access to the iterator.
+        sess.run(init_op, feed_dict={
+            count: 14,
+            num_threads: num_threads_val,
+            output_buffer_size: output_buffer_size_val})
+        for _ in range(14):
+          for i in range(7):
+            result = sess.run(get_next)
+            for component, result_component in zip(components, result):
+              self.assertAllEqual(component[i]**2, result_component)
+        with self.assertRaises(errors.OutOfRangeError):
+          sess.run(get_next)
+
+        # Test multi-threaded access to the same iterator.
+        sess.run(init_op, feed_dict={
+            count: 18,
+            num_threads: num_threads_val,
+            output_buffer_size: output_buffer_size_val})
+        results = []
+        def iterator_thread():
+          while True:
+            try:
+              results.append(sess.run(get_next))
+            except errors.OutOfRangeError:
+              return
+        threads = [self.checkedThread(target=iterator_thread) for _ in range(8)]
+        for t in threads:
+          t.start()
+        for t in threads:
+          t.join()
+
+        # `results` will contain the same elements components**2
+        # repeated 18 times, but in a non-deterministic order. Sort the
+        # results, and assert that each element of components**2 is
+        # produced 18 times.
+        results.sort(key=lambda x: x[0])
+        for i in range(7):
+          for j in range(18):
+            for component, result_component in zip(components,
+                                                   results[i * 18 + j]):
+              self.assertAllEqual(component[i]**2, result_component)
+
+      for num_threads_val, output_buffer_size_val in [
+          (1, 1), (1, 2), (2, 2), (2, 4), (8, 8), (8, 16)]:
+        do_test(num_threads_val, output_buffer_size_val)
+
+  def _testDisposeParallelMapDataset(self, explicit_dispose):
+    # The pipeline is TensorSliceDataset -> MapDataset(square_3) ->
+    # RepeatDataset(1000).
+    components = [np.arange(1000),
+                  np.array([[1, 2, 3]]) * np.arange(1000)[:, np.newaxis],
+                  np.array(37.0) * np.arange(1000)]
+
+    dataset = self._buildParallelMapDataset(components, 1000, 100, 100)
+    iterator = dataset.make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+    if explicit_dispose:
+      dispose_op = iterator.dispose_op()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      for _ in range(3):
+        sess.run(get_next)
+      if explicit_dispose:
+        sess.run(dispose_op)
+
+  def testExplicitDisposeParallelMapDataset(self):
+    self._testDisposeParallelMapDataset(True)
+
+  def testImplicitDisposeParallelMapDataset(self):
+    self._testDisposeParallelMapDataset(False)
+
+  def testParallelMapError(self):
+    components = [np.array([1., 2., 3., np.nan, 5.]).astype(np.float32)]
+
+    dataset = (dataset_ops.Dataset.from_tensor_slices(components)
+               .map(lambda x: array_ops.check_numerics(x, "message")))
+    iterator = dataset.make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      for _ in range(3):
+        sess.run(get_next)
+      # The 4th element is NaN, so `array_ops.check_numerics()` should fail.
+      with self.assertRaises(errors.InvalidArgumentError):
+        sess.run(get_next)
+      sess.run(get_next)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testCaptureHashTable(self):
+    # NOTE(mrry): We must use the V2 variants of `HashTable`
+    # etc. because these produce a `tf.resource`-typed output that is
+    # compatible with the in-graph function implementation.
+    default_val = -1
+    keys = constant_op.constant(["brain", "salad", "surgery"])
+    values = constant_op.constant([0, 1, 2], dtypes.int64)
+    table = lookup_ops.HashTable(
+        lookup_ops.KeyValueTensorInitializer(keys, values), default_val)
+
+    input_sentences = dataset_ops.Dataset.from_tensor_slices(
+        constant_op.constant([
+            "brain brain tank salad surgery",
+            "surgery brain",
+        ]))
+
+    iterator = (input_sentences
+                .map(lambda x: string_ops.string_split([x]).values)
+                .map(table.lookup)
+                .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(table.init)
+      sess.run(init_op)
+
+      print(sess.run(get_next))
+      print(sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testCaptureQueue(self):
+    elements = np.random.randint(100, size=[200])
+    queue = data_flow_ops.FIFOQueue(200, dtypes.int64, shapes=[])
+    enqueue_op = queue.enqueue_many(elements)
+    close_op = queue.close()
+    iterator = (dataset_ops.Dataset.from_tensors(0).repeat(-1)
+                .map(lambda _: queue.dequeue()).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(enqueue_op)
+      sess.run(close_op)
+      sess.run(init_op)
+      for element in elements:
+        self.assertEqual(element, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testCaptureVariable(self):
+    counter_var = variable_scope.get_variable(
+        "counter", (), dtypes.int32, use_resource=True)
+    iterator = (dataset_ops.Dataset.from_tensors(0).repeat(10)
+                .map(lambda _: counter_var.assign_add(1))
+                .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(counter_var.initializer)
+      sess.run(init_op)
+      for i in range(10):
+        self.assertEqual(i, sess.run(counter_var))
+        self.assertEqual(i + 1, sess.run(get_next))
+      self.assertEqual(10, sess.run(counter_var))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+      self.assertEqual(10, sess.run(counter_var))
+
+  def testCaptureUninitializedVariableError(self):
+    counter_var = variable_scope.get_variable(
+        "counter", (), dtypes.int32, use_resource=True)
+    iterator = (dataset_ops.Dataset.from_tensors(0).repeat(10)
+                .map(lambda _: counter_var.assign_add(1))
+                .make_initializable_iterator())
+    init_op = iterator.initializer
+
+    with self.test_session() as sess:
+      with self.assertRaisesRegexp(errors.FailedPreconditionError,
+                                   "Failed to capture resource"):
+        sess.run(init_op)
+
+  def testSeededStatefulOperatorIsProperlyStateful(self):
+    iterator = (dataset_ops.Dataset.from_tensors(0).repeat(10)
+                .map(lambda _: random_ops.random_uniform((), seed=11)).batch(2)
+                .make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      random_values = []
+      with self.assertRaises(errors.OutOfRangeError):
+        while True:
+          random_values.extend(sess.run(get_next))
+      self.assertEqual(10, len(random_values))
+      self.assertGreater(np.abs(np.diff(random_values)).max(), 1e-6)
+      sess.run(init_op)
+      random_values_2 = []
+      with self.assertRaises(errors.OutOfRangeError):
+        while True:
+          random_values_2.extend(sess.run(get_next))
+
+      # Randomness is repeatable given same seed
+      self.assertAllClose(random_values, random_values_2)
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/range_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/range_dataset_op_test.py
new file mode 100644
index 0000000000..8e10e22c35
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/range_dataset_op_test.py
@@ -0,0 +1,182 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Test RangeDataset."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import test
+
+
+class RangeDatasetTest(test.TestCase):
+
+  def testStop(self):
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(stop).make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={stop: 5})
+      for i in range(5):
+        self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testStartStop(self):
+    start = array_ops.placeholder(dtypes.int64, shape=[])
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(start,
+                                         stop).make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={start: 2, stop: 5})
+      for i in range(2, 5):
+        self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testStartStopStep(self):
+    start = array_ops.placeholder(dtypes.int64, shape=[])
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    step = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(start, stop,
+                                         step).make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={start: 2, stop: 10, step: 2})
+      for i in range(2, 10, 2):
+        self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testZeroStep(self):
+    start = array_ops.placeholder(dtypes.int64, shape=[])
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    step = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(start, stop,
+                                         step).make_initializable_iterator()
+    init_op = iterator.initializer
+
+    with self.test_session() as sess:
+      with self.assertRaises(errors.InvalidArgumentError):
+        sess.run(init_op, feed_dict={start: 2, stop: 10, step: 0})
+
+  def testNegativeStep(self):
+    start = array_ops.placeholder(dtypes.int64, shape=[])
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    step = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(start, stop,
+                                         step).make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={start: 2, stop: 10, step: -1})
+      # This for loop is a no-op but will ensure that the implementation is
+      # consistent with range if it ever changes.
+      for i in range(2, 10, -1):
+        self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testStopLessThanStart(self):
+    start = array_ops.placeholder(dtypes.int64, shape=[])
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(start,
+                                         stop).make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={start: 10, stop: 2})
+      # This for loop is a no-op but will ensure that the implementation is
+      # consistent with range if it ever changes.
+      for i in range(10, 2):
+        self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testStopLessThanStartWithPositiveStep(self):
+    start = array_ops.placeholder(dtypes.int64, shape=[])
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    step = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(start, stop,
+                                         step).make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={start: 10, stop: 2, step: 2})
+      # This for loop is a no-op but will ensure that the implementation is
+      # consistent with range if it ever changes.
+      for i in range(10, 2, 2):
+        self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testStopLessThanStartWithNegativeStep(self):
+    start = array_ops.placeholder(dtypes.int64, shape=[])
+    stop = array_ops.placeholder(dtypes.int64, shape=[])
+    step = array_ops.placeholder(dtypes.int64, shape=[])
+    iterator = dataset_ops.Dataset.range(start, stop,
+                                         step).make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={start: 10, stop: 2, step: -1})
+      for i in range(10, 2, -1):
+        self.assertEqual(i, sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testEnumerateDataset(self):
+    components = [np.array(["a", "b"]), np.array([1, 2]), np.array([37.0, 38])]
+    start = constant_op.constant(20, dtype=dtypes.int64)
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components).enumerate(
+        start=start).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual(dtypes.int64, get_next[0].dtype)
+    self.assertEqual((), get_next[0].shape)
+    self.assertEqual([tensor_shape.TensorShape([])] * 3,
+                     [t.shape for t in get_next[1]])
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      self.assertEqual((20, [b"a", 1, 37.0]), sess.run(get_next))
+      self.assertEqual((21, [b"b", 2, 38.0]), sess.run(get_next))
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/reader_dataset_ops_test.py b/tensorflow/contrib/data/python/kernel_tests/reader_dataset_ops_test.py
new file mode 100644
index 0000000000..3d5b34b77b
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/reader_dataset_ops_test.py
@@ -0,0 +1,500 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import gzip
+import os
+import zlib
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.core.example import example_pb2
+from tensorflow.core.example import feature_pb2
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.framework import ops
+from tensorflow.python.lib.io import python_io
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.platform import test
+from tensorflow.python.util import compat
+
+
+class TextLineDatasetTest(test.TestCase):
+
+  def _lineText(self, f, l):
+    return compat.as_bytes("%d: %d" % (f, l))
+
+  def _createFiles(self, num_files, num_lines, crlf=False):
+    filenames = []
+    for i in range(num_files):
+      fn = os.path.join(self.get_temp_dir(), "text_line.%d.txt" % i)
+      filenames.append(fn)
+      with open(fn, "wb") as f:
+        for j in range(num_lines):
+          f.write(self._lineText(i, j))
+          # Always include a newline after the record unless it is
+          # at the end of the file, in which case we include it sometimes.
+          if j + 1 != num_lines or i == 0:
+            f.write(b"\r\n" if crlf else b"\n")
+    return filenames
+
+  def testTextLineDataset(self):
+    test_filenames = self._createFiles(2, 5, crlf=True)
+    filenames = array_ops.placeholder(dtypes.string, shape=[None])
+    num_epochs = array_ops.placeholder(dtypes.int64, shape=[])
+    batch_size = array_ops.placeholder(dtypes.int64, shape=[])
+
+    repeat_dataset = dataset_ops.TextLineDataset(filenames).repeat(num_epochs)
+    batch_dataset = repeat_dataset.batch(batch_size)
+
+    iterator = dataset_ops.Iterator.from_structure(batch_dataset.output_types)
+    init_op = iterator.make_initializer(repeat_dataset)
+    init_batch_op = iterator.make_initializer(batch_dataset)
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      # Basic test: read from file 0.
+      sess.run(init_op, feed_dict={filenames: [test_filenames[0]],
+                                   num_epochs: 1})
+      for i in range(5):
+        self.assertEqual(self._lineText(0, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Basic test: read from file 1.
+      sess.run(init_op, feed_dict={filenames: [test_filenames[1]],
+                                   num_epochs: 1})
+      for i in range(5):
+        self.assertEqual(self._lineText(1, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Basic test: read from both files.
+      sess.run(init_op, feed_dict={filenames: test_filenames,
+                                   num_epochs: 1})
+      for j in range(2):
+        for i in range(5):
+          self.assertEqual(self._lineText(j, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test repeated iteration through both files.
+      sess.run(init_op, feed_dict={filenames: test_filenames,
+                                   num_epochs: 10})
+      for _ in range(10):
+        for j in range(2):
+          for i in range(5):
+            self.assertEqual(self._lineText(j, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test batched and repeated iteration through both files.
+      sess.run(init_batch_op, feed_dict={filenames: test_filenames,
+                                         num_epochs: 10,
+                                         batch_size: 5})
+      for _ in range(10):
+        self.assertAllEqual([self._lineText(0, i) for i in range(5)],
+                            sess.run(get_next))
+        self.assertAllEqual([self._lineText(1, i) for i in range(5)],
+                            sess.run(get_next))
+
+
+class FixedLengthRecordReaderTest(test.TestCase):
+
+  def setUp(self):
+    super(FixedLengthRecordReaderTest, self).setUp()
+    self._num_files = 2
+    self._num_records = 7
+    self._header_bytes = 5
+    self._record_bytes = 3
+    self._footer_bytes = 2
+
+  def _record(self, f, r):
+    return compat.as_bytes(str(f * 2 + r) * self._record_bytes)
+
+  def _createFiles(self):
+    filenames = []
+    for i in range(self._num_files):
+      fn = os.path.join(self.get_temp_dir(), "fixed_length_record.%d.txt" % i)
+      filenames.append(fn)
+      with open(fn, "wb") as f:
+        f.write(b"H" * self._header_bytes)
+        for j in range(self._num_records):
+          f.write(self._record(i, j))
+        f.write(b"F" * self._footer_bytes)
+    return filenames
+
+  def testFixedLengthRecordDataset(self):
+    test_filenames = self._createFiles()
+    filenames = array_ops.placeholder(dtypes.string, shape=[None])
+    num_epochs = array_ops.placeholder(dtypes.int64, shape=[])
+    batch_size = array_ops.placeholder(dtypes.int64, shape=[])
+
+    repeat_dataset = (dataset_ops.FixedLengthRecordDataset(
+        filenames, self._record_bytes, self._header_bytes, self._footer_bytes)
+                      .repeat(num_epochs))
+    batch_dataset = repeat_dataset.batch(batch_size)
+
+    iterator = dataset_ops.Iterator.from_structure(batch_dataset.output_types)
+    init_op = iterator.make_initializer(repeat_dataset)
+    init_batch_op = iterator.make_initializer(batch_dataset)
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      # Basic test: read from file 0.
+      sess.run(init_op, feed_dict={filenames: [test_filenames[0]],
+                                   num_epochs: 1})
+      for i in range(self._num_records):
+        self.assertEqual(self._record(0, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Basic test: read from file 1.
+      sess.run(init_op, feed_dict={filenames: [test_filenames[1]],
+                                   num_epochs: 1})
+      for i in range(self._num_records):
+        self.assertEqual(self._record(1, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Basic test: read from both files.
+      sess.run(init_op, feed_dict={filenames: test_filenames,
+                                   num_epochs: 1})
+      for j in range(self._num_files):
+        for i in range(self._num_records):
+          self.assertEqual(self._record(j, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test repeated iteration through both files.
+      sess.run(init_op, feed_dict={filenames: test_filenames,
+                                   num_epochs: 10})
+      for _ in range(10):
+        for j in range(self._num_files):
+          for i in range(self._num_records):
+            self.assertEqual(self._record(j, i), sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test batched and repeated iteration through both files.
+      sess.run(init_batch_op, feed_dict={filenames: test_filenames,
+                                         num_epochs: 10,
+                                         batch_size: self._num_records})
+      for _ in range(10):
+        for j in range(self._num_files):
+          self.assertAllEqual([self._record(j, i)
+                               for i in range(self._num_records)],
+                              sess.run(get_next))
+
+
+class TFRecordDatasetTest(test.TestCase):
+
+  def setUp(self):
+    super(TFRecordDatasetTest, self).setUp()
+    self._num_files = 2
+    self._num_records = 7
+
+    self.test_filenames = self._createFiles()
+
+    self.filenames = array_ops.placeholder(dtypes.string, shape=[None])
+    self.num_epochs = array_ops.placeholder_with_default(
+        constant_op.constant(1, dtypes.int64), shape=[])
+    self.compression_type = array_ops.placeholder_with_default("", shape=[])
+    self.batch_size = array_ops.placeholder(dtypes.int64, shape=[])
+
+    repeat_dataset = dataset_ops.TFRecordDataset(
+        self.filenames, self.compression_type).repeat(self.num_epochs)
+    batch_dataset = repeat_dataset.batch(self.batch_size)
+
+    iterator = dataset_ops.Iterator.from_structure(batch_dataset.output_types)
+    self.init_op = iterator.make_initializer(repeat_dataset)
+    self.init_batch_op = iterator.make_initializer(batch_dataset)
+    self.get_next = iterator.get_next()
+
+  def _record(self, f, r):
+    return compat.as_bytes("Record %d of file %d" % (r, f))
+
+  def _createFiles(self):
+    filenames = []
+    for i in range(self._num_files):
+      fn = os.path.join(self.get_temp_dir(), "tf_record.%d.txt" % i)
+      filenames.append(fn)
+      writer = python_io.TFRecordWriter(fn)
+      for j in range(self._num_records):
+        writer.write(self._record(i, j))
+      writer.close()
+    return filenames
+
+  def testReadOneEpoch(self):
+    with self.test_session() as sess:
+      # Basic test: read from file 0.
+      sess.run(self.init_op,
+               feed_dict={self.filenames: [self.test_filenames[0]],
+                          self.num_epochs: 1})
+      for i in range(self._num_records):
+        self.assertAllEqual(self._record(0, i), sess.run(self.get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(self.get_next)
+
+      # Basic test: read from file 1.
+      sess.run(self.init_op,
+               feed_dict={self.filenames: [self.test_filenames[1]],
+                          self.num_epochs: 1})
+      for i in range(self._num_records):
+        self.assertAllEqual(self._record(1, i), sess.run(self.get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(self.get_next)
+
+      # Basic test: read from both files.
+      sess.run(self.init_op,
+               feed_dict={self.filenames: self.test_filenames,
+                          self.num_epochs: 1})
+      for j in range(self._num_files):
+        for i in range(self._num_records):
+          self.assertAllEqual(self._record(j, i), sess.run(self.get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(self.get_next)
+
+  def testReadTenEpochs(self):
+    with self.test_session() as sess:
+      sess.run(self.init_op, feed_dict={self.filenames: self.test_filenames,
+                                        self.num_epochs: 10})
+      for _ in range(10):
+        for j in range(self._num_files):
+          for i in range(self._num_records):
+            self.assertAllEqual(self._record(j, i), sess.run(self.get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(self.get_next)
+
+  def testReadTenEpochsOfBatches(self):
+    with self.test_session() as sess:
+      sess.run(self.init_batch_op,
+               feed_dict={self.filenames: self.test_filenames,
+                          self.num_epochs: 10,
+                          self.batch_size: self._num_records})
+      for _ in range(10):
+        for j in range(self._num_files):
+          values = sess.run(self.get_next)
+          self.assertAllEqual([self._record(j, i)
+                               for i in range(self._num_records)], values)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(self.get_next)
+
+  def testReadZlibFiles(self):
+    zlib_files = []
+    for i, fn in enumerate(self.test_filenames):
+      with open(fn, "rb") as f:
+        cdata = zlib.compress(f.read())
+
+        zfn = os.path.join(self.get_temp_dir(), "tfrecord_%s.z" % i)
+        with open(zfn, "wb") as f:
+          f.write(cdata)
+        zlib_files.append(zfn)
+
+    with self.test_session() as sess:
+      sess.run(self.init_op,
+               feed_dict={self.filenames: zlib_files,
+                          self.compression_type: "ZLIB"})
+      for j in range(self._num_files):
+        for i in range(self._num_records):
+          self.assertAllEqual(self._record(j, i), sess.run(self.get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(self.get_next)
+
+  def testReadGzipFiles(self):
+    gzip_files = []
+    for i, fn in enumerate(self.test_filenames):
+      with open(fn, "rb") as f:
+        gzfn = os.path.join(self.get_temp_dir(), "tfrecord_%s.gz" % i)
+        with gzip.GzipFile(gzfn, "wb") as gzf:
+          gzf.write(f.read())
+        gzip_files.append(gzfn)
+
+    with self.test_session() as sess:
+      sess.run(self.init_op,
+               feed_dict={self.filenames: gzip_files,
+                          self.compression_type: "GZIP"})
+      for j in range(self._num_files):
+        for i in range(self._num_records):
+          self.assertAllEqual(self._record(j, i), sess.run(self.get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(self.get_next)
+
+
+class ReadBatchFeaturesTest(test.TestCase):
+
+  def setUp(self):
+    super(ReadBatchFeaturesTest, self).setUp()
+    self._num_files = 2
+    self._num_records = 7
+    self.test_filenames = self._createFiles()
+
+  def _read_batch_features(self, filenames, num_epochs, batch_size):
+    self.filenames = filenames
+    self.num_epochs = num_epochs
+    self.batch_size = batch_size
+
+    return dataset_ops.read_batch_features(
+        file_pattern=self.filenames,
+        batch_size=self.batch_size,
+        features={
+            "file": parsing_ops.FixedLenFeature([], dtypes.int64),
+            "record": parsing_ops.FixedLenFeature([], dtypes.int64),
+            "keywords": parsing_ops.VarLenFeature(dtypes.string)
+        },
+        reader=dataset_ops.TFRecordDataset,
+        randomize_input=False,
+        num_epochs=self.num_epochs)
+
+  def _record(self, f, r):
+    example = example_pb2.Example(features=feature_pb2.Features(
+        feature={
+            "file":
+                feature_pb2.Feature(int64_list=feature_pb2.Int64List(
+                    value=[f])),
+            "record":
+                feature_pb2.Feature(int64_list=feature_pb2.Int64List(
+                    value=[r])),
+            "keywords":
+                feature_pb2.Feature(bytes_list=feature_pb2.BytesList(
+                    value=self._get_keywords(f, r)))
+        }))
+    return example.SerializeToString()
+
+  def _get_keywords(self, f, r):
+    num_keywords = 1 + (f + r) % 2
+    keywords = []
+    for index in range(num_keywords):
+      keywords.append(compat.as_bytes("keyword%d" % index))
+    return keywords
+
+  def _createFiles(self):
+    filenames = []
+    for i in range(self._num_files):
+      fn = os.path.join(self.get_temp_dir(), "tf_record.%d.txt" % i)
+      filenames.append(fn)
+      writer = python_io.TFRecordWriter(fn)
+      for j in range(self._num_records):
+        writer.write(self._record(i, j))
+      writer.close()
+    return filenames
+
+  def _next_actual_batch(self, sess):
+    file_op = self.outputs["file"]
+    keywords_indices_op = self.outputs["keywords"].indices
+    keywords_values_op = self.outputs["keywords"].values
+    keywords_dense_shape_op = self.outputs["keywords"].dense_shape
+    record_op = self.outputs["record"]
+    return sess.run([
+        file_op, keywords_indices_op, keywords_values_op,
+        keywords_dense_shape_op, record_op
+    ])
+
+  def _next_expected_batch(self, file_indices, batch_size, num_epochs):
+
+    def _next_record(file_indices):
+      for j in file_indices:
+        for i in range(self._num_records):
+          yield j, i
+
+    file_batch = []
+    keywords_batch_indices = []
+    keywords_batch_values = []
+    keywords_batch_max_len = 0
+    record_batch = []
+    batch_index = 0
+    for _ in range(num_epochs):
+      for record in _next_record(file_indices):
+        f = record[0]
+        r = record[1]
+        file_batch.append(f)
+        record_batch.append(r)
+        keywords = self._get_keywords(f, r)
+        keywords_batch_values.extend(keywords)
+        keywords_batch_indices.extend([[batch_index, i]
+                                       for i in range(len(keywords))])
+        batch_index += 1
+        keywords_batch_max_len = max(keywords_batch_max_len, len(keywords))
+        if len(file_batch) == batch_size:
+          yield [
+              file_batch, keywords_batch_indices, keywords_batch_values,
+              [batch_size, keywords_batch_max_len], record_batch
+          ]
+          file_batch = []
+          keywords_batch_indices = []
+          keywords_batch_values = []
+          keywords_batch_max_len = 0
+          record_batch = []
+          batch_index = 0
+    if file_batch:
+      yield [
+          file_batch, keywords_batch_indices, keywords_batch_values,
+          [len(file_batch), keywords_batch_max_len], record_batch
+      ]
+
+  def _verify_records(self, sess, batch_size, file_index=None, num_epochs=1):
+    if file_index is not None:
+      file_indices = [file_index]
+    else:
+      file_indices = range(self._num_files)
+
+    for expected_batch in self._next_expected_batch(file_indices, batch_size,
+                                                    num_epochs):
+      actual_batch = self._next_actual_batch(sess)
+      for i in range(len(expected_batch)):
+        self.assertAllEqual(expected_batch[i], actual_batch[i])
+
+  def testRead(self):
+    for batch_size in [1, 2]:
+      for num_epochs in [1, 10]:
+        with ops.Graph().as_default():
+          with self.test_session(graph=ops.get_default_graph()) as sess:
+            # Basic test: read from file 0.
+            self.outputs = self._read_batch_features(
+                filenames=self.test_filenames[0],
+                num_epochs=num_epochs,
+                batch_size=batch_size)
+            self._verify_records(sess, batch_size, 0, num_epochs=num_epochs)
+            with self.assertRaises(errors.OutOfRangeError):
+              self._next_actual_batch(sess)
+
+        with ops.Graph().as_default():
+          with self.test_session(graph=ops.get_default_graph()) as sess:
+            # Basic test: read from file 1.
+            self.outputs = self._read_batch_features(
+                filenames=self.test_filenames[1],
+                num_epochs=num_epochs,
+                batch_size=batch_size)
+            self._verify_records(sess, batch_size, 1, num_epochs=num_epochs)
+            with self.assertRaises(errors.OutOfRangeError):
+              self._next_actual_batch(sess)
+
+        with ops.Graph().as_default():
+          with self.test_session(graph=ops.get_default_graph()) as sess:
+            # Basic test: read from both files.
+            self.outputs = self._read_batch_features(
+                filenames=self.test_filenames,
+                num_epochs=num_epochs,
+                batch_size=batch_size)
+            self._verify_records(sess, batch_size, num_epochs=num_epochs)
+            with self.assertRaises(errors.OutOfRangeError):
+              self._next_actual_batch(sess)
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/resample_test.py b/tensorflow/contrib/data/python/kernel_tests/resample_test.py
new file mode 100644
index 0000000000..f6ce77054b
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/resample_test.py
@@ -0,0 +1,79 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import string_ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+from tensorflow.python.util import compat
+
+
+class ResampleTest(test.TestCase):
+
+  def testInitialKnownDistribution(self):
+    self._testDistribution(initial_known=True)
+
+  def testInitialNotKnownDistribution(self):
+    self._testDistribution(initial_known=False)
+
+  def _testDistribution(self, initial_known):
+    classes = np.random.randint(5, size=(20000,))  # Uniformly sampled
+    target_dist = [0.9, 0.05, 0.05, 0.0, 0.0]
+    initial_dist = [0.2] * 5 if initial_known else None
+    iterator = dataset_ops.Iterator.from_dataset(
+        dataset_ops.rejection_resample(
+            (dataset_ops.Dataset.from_tensor_slices(classes)
+             .shuffle(200, seed=21)
+             .map(lambda c: (c, string_ops.as_string(c)))),
+            target_dist=target_dist,
+            initial_dist=initial_dist,
+            class_func=lambda c, _: c,
+            seed=27))
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+    variable_init_op = variables.global_variables_initializer()
+
+    with self.test_session() as sess:
+      sess.run(variable_init_op)
+      sess.run(init_op)
+      returned = []
+      with self.assertRaises(errors.OutOfRangeError):
+        while True:
+          returned.append(sess.run(get_next))
+
+    returned_classes, returned_classes_and_data = zip(*returned)
+    _, returned_data = zip(*returned_classes_and_data)
+    self.assertAllEqual([compat.as_bytes(str(c))
+                         for c in returned_classes], returned_data)
+    total_returned = len(returned_classes)
+    # Subsampling rejects a large precentage of the initial data in
+    # this case.
+    self.assertGreater(total_returned, 20000 * 0.2)
+    class_counts = np.array([
+        len([True for v in returned_classes if v == c])
+        for c in range(5)])
+    returned_dist = class_counts / total_returned
+    self.assertAllClose(target_dist, returned_dist, atol=1e-2)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/sequence_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/sequence_dataset_op_test.py
new file mode 100644
index 0000000000..6362b5e450
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/sequence_dataset_op_test.py
@@ -0,0 +1,211 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import test
+
+
+class SequenceDatasetTest(test.TestCase):
+
+  def testRepeatTensorDataset(self):
+    """Test a dataset that repeats its input multiple times."""
+    components = [np.array(1), np.array([1, 2, 3]), np.array(37.0)]
+    # This placeholder can be fed when dataset-definition subgraph
+    # runs (i.e. `init_op` below) to configure the number of
+    # repetitions used in a particular iterator.
+    count_placeholder = array_ops.placeholder(dtypes.int64, shape=[])
+
+    iterator = (dataset_ops.Dataset.from_tensors(components)
+                .repeat(count_placeholder).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      # Test a finite repetition.
+      sess.run(init_op, feed_dict={count_placeholder: 3})
+      for _ in range(3):
+        results = sess.run(get_next)
+        for component, result_component in zip(components, results):
+          self.assertAllEqual(component, result_component)
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test a different finite repetition.
+      sess.run(init_op, feed_dict={count_placeholder: 7})
+      for _ in range(7):
+        results = sess.run(get_next)
+        for component, result_component in zip(components, results):
+          self.assertAllEqual(component, result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test an empty repetition.
+      sess.run(init_op, feed_dict={count_placeholder: 0})
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Test an infinite repetition.
+      # NOTE(mrry): There's not a good way to test that the sequence
+      # actually is infinite.
+      sess.run(init_op, feed_dict={count_placeholder: -1})
+      for _ in range(17):
+        results = sess.run(get_next)
+        for component, result_component in zip(components, results):
+          self.assertAllEqual(component, result_component)
+
+  def testTakeTensorDataset(self):
+    components = [np.arange(10)]
+    count_placeholder = array_ops.placeholder(dtypes.int64, shape=[])
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components)
+                .take(count_placeholder).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      # Take fewer than input size
+      sess.run(init_op, feed_dict={count_placeholder: 4})
+      for i in range(4):
+        results = sess.run(get_next)
+        self.assertAllEqual(results, components[0][i:i+1])
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Take more than input size
+      sess.run(init_op, feed_dict={count_placeholder: 25})
+      for i in range(10):
+        results = sess.run(get_next)
+        self.assertAllEqual(results, components[0][i:i+1])
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Take all of input
+      sess.run(init_op, feed_dict={count_placeholder: -1})
+      for i in range(10):
+        results = sess.run(get_next)
+        self.assertAllEqual(results, components[0][i:i+1])
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Take nothing
+      sess.run(init_op, feed_dict={count_placeholder: 0})
+
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testSkipTensorDataset(self):
+    components = [np.arange(10)]
+    count_placeholder = array_ops.placeholder(dtypes.int64, shape=[])
+
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components)
+                .skip(count_placeholder).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      # Skip fewer than input size, we should skip
+      # the first 4 elements and then read the rest.
+      sess.run(init_op, feed_dict={count_placeholder: 4})
+      for i in range(4, 10):
+        results = sess.run(get_next)
+        self.assertAllEqual(results, components[0][i:i+1])
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Skip more than input size: get nothing.
+      sess.run(init_op, feed_dict={count_placeholder: 25})
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Skip exactly input size.
+      sess.run(init_op, feed_dict={count_placeholder: 10})
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Set -1 for 'count': skip the entire dataset.
+      sess.run(init_op, feed_dict={count_placeholder: -1})
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Skip nothing
+      sess.run(init_op, feed_dict={count_placeholder: 0})
+      for i in range(0, 10):
+        results = sess.run(get_next)
+        self.assertAllEqual(results, components[0][i:i+1])
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testRepeatRepeatTensorDataset(self):
+    """Test the composition of repeat datasets."""
+    components = [np.array(1), np.array([1, 2, 3]), np.array(37.0)]
+    inner_count = array_ops.placeholder(dtypes.int64, shape=[])
+    outer_count = array_ops.placeholder(dtypes.int64, shape=[])
+
+    iterator = (dataset_ops.Dataset.from_tensors(components).repeat(inner_count)
+                .repeat(outer_count).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([c.shape for c in components],
+                     [t.shape for t in get_next])
+
+    with self.test_session() as sess:
+      sess.run(init_op, feed_dict={inner_count: 7, outer_count: 14})
+      for _ in range(7 * 14):
+        results = sess.run(get_next)
+        for component, result_component in zip(components, results):
+          self.assertAllEqual(component, result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testRepeatEmptyDataset(self):
+    """Test that repeating an empty dataset does not hang."""
+    iterator = (dataset_ops.Dataset.from_tensors(0).repeat(10).skip(10)
+                .repeat(-1).make_initializable_iterator())
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      sess.run(init_op)
+      with self.assertRaisesRegexp(
+          errors.OutOfRangeError,
+          "Attempted to repeat an empty dataset infinitely."):
+        sess.run(get_next)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/shuffle_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/shuffle_dataset_op_test.py
new file mode 100644
index 0000000000..8048e4f87e
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/shuffle_dataset_op_test.py
@@ -0,0 +1,152 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import collections
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import test
+
+
+class ShuffleDatasetTest(test.TestCase):
+
+  def testShuffleDataset(self):
+    components = [
+        np.array([1, 2, 3, 4]), np.array([5, 6, 7, 8]),
+        np.array([9.0, 10.0, 11.0, 12.0])
+    ]
+    count_placeholder = array_ops.placeholder_with_default(
+        constant_op.constant(5, dtypes.int64), shape=[])
+    buffer_size_placeholder = array_ops.placeholder(dtypes.int64, shape=[])
+    seed_placeholder = array_ops.placeholder(dtypes.int64, shape=[])
+
+    repeat_dataset = (dataset_ops.Dataset.from_tensor_slices(components)
+                      .repeat(count_placeholder))
+
+    shuffle_dataset = repeat_dataset.shuffle(buffer_size_placeholder,
+                                             seed_placeholder)
+
+    self.assertEqual([c.shape[1:] for c in components],
+                     shuffle_dataset.output_shapes)
+
+    # Create initialization ops for iterators without and with
+    # shuffling, respectively.
+    iterator = dataset_ops.Iterator.from_structure(
+        shuffle_dataset.output_types, shuffle_dataset.output_shapes)
+    init_fifo_op = iterator.make_initializer(repeat_dataset)
+    init_shuffle_op = iterator.make_initializer(shuffle_dataset)
+
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      # First run without shuffling to collect the "ground truth".
+      sess.run(init_fifo_op)
+      unshuffled_elements = []
+      for _ in range(20):
+        unshuffled_elements.append(sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      # Assert that the shuffled dataset has the same elements as the
+      # "ground truth".
+      sess.run(
+          init_shuffle_op,
+          feed_dict={buffer_size_placeholder: 100,
+                     seed_placeholder: 37})
+      shuffled_elements = []
+      for _ in range(20):
+        shuffled_elements.append(sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+      self.assertAllEqual(
+          sorted(unshuffled_elements), sorted(shuffled_elements))
+
+      # Assert that shuffling twice with the same seeds gives the same sequence.
+      sess.run(
+          init_shuffle_op,
+          feed_dict={buffer_size_placeholder: 100,
+                     seed_placeholder: 37})
+      reshuffled_elements_same_seed = []
+      for _ in range(20):
+        reshuffled_elements_same_seed.append(sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+      self.assertEqual(shuffled_elements, reshuffled_elements_same_seed)
+
+      # Assert that shuffling twice with a different seed gives a different
+      # permutation of the same elements.
+      sess.run(
+          init_shuffle_op,
+          feed_dict={buffer_size_placeholder: 100,
+                     seed_placeholder: 1037})
+      reshuffled_elements_different_seed = []
+      for _ in range(20):
+        reshuffled_elements_different_seed.append(sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+      self.assertNotEqual(shuffled_elements, reshuffled_elements_different_seed)
+      self.assertAllEqual(
+          sorted(shuffled_elements), sorted(reshuffled_elements_different_seed))
+
+      # Assert that the shuffled dataset has the same elements as the
+      # "ground truth" when the buffer size is smaller than the input
+      # dataset.
+      sess.run(
+          init_shuffle_op,
+          feed_dict={buffer_size_placeholder: 2,
+                     seed_placeholder: 37})
+      reshuffled_elements_small_buffer = []
+      for _ in range(20):
+        reshuffled_elements_small_buffer.append(sess.run(get_next))
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+      self.assertAllEqual(
+          sorted(unshuffled_elements), sorted(reshuffled_elements_small_buffer))
+
+      # Test the case of shuffling an empty dataset.
+      sess.run(init_shuffle_op, feed_dict={buffer_size_placeholder: 2,
+                                           seed_placeholder: 37,
+                                           count_placeholder: 0})
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testDefaultArguments(self):
+    components = np.array([0, 1, 2, 3, 4])
+    iterator = (dataset_ops.Dataset.from_tensor_slices(components).shuffle(5)
+                .repeat().make_one_shot_iterator())
+
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      counts = collections.defaultdict(lambda: 0)
+      for _ in range(10):
+        for _ in range(5):
+          counts[sess.run(get_next)] += 1
+
+    for i in range(5):
+      self.assertEqual(10, counts[i])
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/kernel_tests/zip_dataset_op_test.py b/tensorflow/contrib/data/python/kernel_tests/zip_dataset_op_test.py
new file mode 100644
index 0000000000..c47f072361
--- /dev/null
+++ b/tensorflow/contrib/data/python/kernel_tests/zip_dataset_op_test.py
@@ -0,0 +1,114 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for the experimental input pipeline ops."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.data.python.ops import dataset_ops
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import test
+
+
+class ZipDatasetTest(test.TestCase):
+
+  def testZipDataset(self):
+    component_placeholders = [
+        array_ops.placeholder(dtypes.int64),
+        array_ops.placeholder(dtypes.int64),
+        array_ops.placeholder(dtypes.float64)
+    ]
+
+    datasets = [
+        dataset_ops.Dataset.from_tensor_slices(component_placeholder)
+        for component_placeholder in component_placeholders
+    ]
+    zipped = dataset_ops.Dataset.zip(datasets)
+
+    iterator = zipped.make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    with self.test_session() as sess:
+      equal_length_components = [
+          np.tile(np.array([[1], [2], [3], [4]]), 20),
+          np.tile(np.array([[12], [13], [14], [15]]), 22),
+          np.array([37.0, 38.0, 39.0, 40.0])
+      ]
+      sess.run(init_op, feed_dict={ph: value for ph, value in zip(
+          component_placeholders, equal_length_components)})
+      for i in range(4):
+        results = sess.run(get_next)
+        for component, result_component in zip(
+            equal_length_components, results):
+          self.assertAllEqual(component[i], result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+      variable_length_components = [[1, 2, 3, 4], [1, 2, 3, 4, 5], [1.0, 2.0]]
+      sess.run(init_op, feed_dict={ph: value for ph, value in zip(
+          component_placeholders, variable_length_components)})
+      for i in range(2):
+        results = sess.run(get_next)
+        for component, result_component in zip(
+            variable_length_components, results):
+          self.assertAllEqual(component[i], result_component)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+  def testNestedZipDataset(self):
+    component_placeholders = [
+        array_ops.placeholder(dtypes.int64, shape=[4, 20]),
+        array_ops.placeholder(dtypes.int64, shape=[4, 22]),
+        array_ops.placeholder(dtypes.float64, shape=[4])
+    ]
+
+    datasets = [
+        dataset_ops.Dataset.from_tensor_slices(component_placeholder)
+        for component_placeholder in component_placeholders
+    ]
+    zipped = dataset_ops.Dataset.zip((datasets[0], (datasets[1], datasets[2])))
+
+    iterator = zipped.make_initializable_iterator()
+    init_op = iterator.initializer
+    get_next = iterator.get_next()
+
+    self.assertEqual([20], get_next[0].shape)
+    self.assertEqual([22], get_next[1][0].shape)
+    self.assertEqual([], get_next[1][1].shape)
+
+    with self.test_session() as sess:
+      equal_length_components = [
+          np.tile(np.array([[1], [2], [3], [4]]), 20),
+          np.tile(np.array([[12], [13], [14], [15]]), 22),
+          np.array([37.0, 38.0, 39.0, 40.0])
+      ]
+      sess.run(init_op, feed_dict={ph: value for ph, value in zip(
+          component_placeholders, equal_length_components)})
+      for i in range(4):
+        result1, (result2, result3) = sess.run(get_next)
+        self.assertAllEqual(equal_length_components[0][i], result1)
+        self.assertAllEqual(equal_length_components[1][i], result2)
+        self.assertAllEqual(equal_length_components[2][i], result3)
+      with self.assertRaises(errors.OutOfRangeError):
+        sess.run(get_next)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/data/python/ops/BUILD b/tensorflow/contrib/data/python/ops/BUILD
new file mode 100644
index 0000000000..489ec879a3
--- /dev/null
+++ b/tensorflow/contrib/data/python/ops/BUILD
@@ -0,0 +1,31 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+licenses(["notice"])  # Apache 2.0
+
+exports_files(["LICENSE"])
+
+py_library(
+    name = "dataset_ops",
+    srcs = ["dataset_ops.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/contrib/data/python/framework:function",
+        "//tensorflow/contrib/util:util_py",
+        "//tensorflow/python:dataset_ops_gen",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:parsing_ops",
+        "//tensorflow/python:util",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/tensorflow/contrib/data/python/ops/dataset_ops.py b/tensorflow/contrib/data/python/ops/dataset_ops.py
new file mode 100644
index 0000000000..ae1a7dd568
--- /dev/null
+++ b/tensorflow/contrib/data/python/ops/dataset_ops.py
@@ -0,0 +1,1902 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Python wrappers for Datasets and Iterators."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import abc
+
+import numpy as np
+
+from tensorflow.contrib.data.python.framework import function
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import random_seed
+from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
+from tensorflow.python.framework import tensor_shape
+from tensorflow.python.framework import tensor_util
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import gen_dataset_ops
+from tensorflow.python.ops import logging_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import parsing_ops
+from tensorflow.python.ops import random_ops
+from tensorflow.python.ops import resource_variable_ops
+from tensorflow.python.platform import gfile
+from tensorflow.python.util import nest
+
+
+class Iterator(object):
+  """Represents the state of iterating through a `Dataset`."""
+
+  def __init__(self, iterator_resource, initializer, output_types,
+               output_shapes):
+    """Creates a new iterator from the given iterator resource.
+
+    NOTE(mrry): Most users will not call this initializer directly, and will
+    instead use `Iterator.from_dataset()` or `Dataset.make_one_shot_iterator()`.
+
+    Args:
+      iterator_resource: A `tf.resource` scalar `tf.Tensor` representing the
+        iterator.
+      initializer: A `tf.Operation` that should be run to initialize this
+        iterator.
+      output_types: A nested structure of `tf.DType` objects corresponding to
+        each component of an element of this iterator.
+      output_shapes: A nested structure of `tf.TensorShape` objects
+        corresponding to each component of an element of this dataset.
+    """
+    self._iterator_resource = iterator_resource
+    self._initializer = initializer
+    self._output_types = output_types
+    self._output_shapes = output_shapes
+
+  @staticmethod
+  def from_dataset(dataset, shared_name=None):
+    """Creates a new, uninitialized `Iterator` from the given `Dataset`.
+
+    To initialize this iterator, you must run its `initializer`:
+
+    ```python
+    dataset = ...
+    iterator = Iterator.from_dataset(dataset)
+    # ...
+    sess.run(iterator.initializer)
+    ```
+
+    Args:
+      dataset: A `Dataset` object.
+      shared_name: (Optional.) If non-empty, this iterator will be shared under
+        the given name across multiple sessions that share the same devices
+        (e.g. when using a remote server).
+
+    Returns:
+      An `Iterator`.
+    """
+    if shared_name is None:
+      shared_name = ""
+    iterator_resource = gen_dataset_ops.iterator(
+        container="",
+        shared_name=shared_name,
+        output_types=nest.flatten(dataset.output_types),
+        output_shapes=nest.flatten(dataset.output_shapes))
+    initializer = gen_dataset_ops.make_iterator(dataset.make_dataset_resource(),
+                                                iterator_resource)
+    return Iterator(iterator_resource, initializer, dataset.output_types,
+                    dataset.output_shapes)
+
+  @staticmethod
+  def from_structure(output_types, output_shapes=None, shared_name=None):
+    """Creates a new, uninitialized `Iterator` with the given structure.
+
+    This iterator-constructing method can be used to create an iterator that
+    is reusable with many different datasets.
+
+    The returned iterator is not bound to a particular dataset, and it has
+    no `initializer`. To initialize the iterator, run the operation returned by
+    `Iterator.make_initializer(dataset)`.
+
+    The following is an example
+
+    ```python
+    iterator = Iterator.from_structure(tf.int64, tf.TensorShape([]))
+
+    dataset_range = Dataset.range(10)
+    range_initializer = iterator.make_initializer(dataset_range)
+
+    dataset_evens = dataset_range.filter(lambda x: x % 2 == 0)
+    evens_initializer = iterator.make_initializer(dataset_evens)
+
+    # Define a model based on the iterator; in this example, the model_fn
+    # is expected to take scalar tf.int64 Tensors as input (see
+    # the definition of 'iterator' above).
+    prediction, loss = model_fn(iterator.get_next())
+
+    # Train for `num_epochs`, where for each epoch, we first iterate over
+    # dataset_range, and then iterate over dataset_evens.
+    for _ in range(num_epochs):
+      # Initialize the iterator to `dataset_range`
+      sess.run(range_initializer)
+      while True:
+        try:
+          pred, loss_val = sess.run([prediction, loss])
+        except tf.errors.OutOfRangeError:
+          break
+
+      # Initialize the iterator to `dataset_evens`
+      sess.run(evens_initializer)
+      while True:
+        try:
+          pred, loss_val = sess.run([prediction, loss])
+        except tf.errors.OutOfRangeError:
+          break
+    ```
+
+    Args:
+      output_types: A nested structure of `tf.DType` objects corresponding to
+        each component of an element of this iterator.
+      output_shapes: (Optional.) A nested structure of `tf.TensorShape` objects
+        corresponding to each component of an element of this dataset. If
+        omitted, each component will have an unconstrainted shape.
+      shared_name: (Optional.) If non-empty, this iterator will be shared under
+        the given name across multiple sessions that share the same devices
+        (e.g. when using a remote server).
+
+    Returns:
+      An `Iterator`.
+
+    Raises:
+      TypeError: If the structures of `output_shapes` and `output_types` are
+        not the same.
+    """
+    output_types = nest.map_structure(dtypes.as_dtype, output_types)
+    if output_shapes is None:
+      output_shapes = nest.map_structure(
+          lambda _: tensor_shape.TensorShape(None), output_types)
+    else:
+      output_shapes = nest.map_structure_up_to(
+          output_types, tensor_shape.as_shape, output_shapes)
+    nest.assert_same_structure(output_types, output_shapes)
+    if shared_name is None:
+      shared_name = ""
+    iterator_resource = gen_dataset_ops.iterator(
+        container="",
+        shared_name=shared_name,
+        output_types=nest.flatten(output_types),
+        output_shapes=nest.flatten(output_shapes))
+    return Iterator(iterator_resource, None, output_types, output_shapes)
+
+  @property
+  def initializer(self):
+    """A `tf.Operation` that should be run to initialize this iterator.
+
+    Returns:
+      A `tf.Operation` that should be run to initialize this iterator
+
+    Raises:
+      ValueError: If this iterator initializes itself automatically.
+    """
+    if self._initializer is not None:
+      return self._initializer
+    else:
+      # TODO(mrry): Consider whether one-shot iterators should have
+      # initializers that simply reset their state to the beginning.
+      raise ValueError("Iterator does not have an initializer.")
+
+  def make_initializer(self, dataset):
+    """Returns a `tf.Operation` that initializes this iterator on `dataset`.
+
+    Args:
+      dataset: A `Dataset` with compatible structure to this iterator.
+
+    Returns:
+      A `tf.Operation` that can be run to initialize this iterator on the given
+      `dataset`.
+
+    Raises:
+      TypeError: If `dataset` and this iterator do not have a compatible
+        element structure.
+    """
+    nest.assert_same_structure(self._output_types, dataset.output_types)
+    nest.assert_same_structure(self._output_shapes, dataset.output_shapes)
+    for iterator_dtype, dataset_dtype in zip(
+        nest.flatten(self._output_types), nest.flatten(dataset.output_types)):
+      if iterator_dtype != dataset_dtype:
+        raise TypeError(
+            "Expected output types %r but got dataset with output types %r." %
+            (self._output_types, dataset.output_types))
+    for iterator_shape, dataset_shape in zip(
+        nest.flatten(self._output_shapes), nest.flatten(dataset.output_shapes)):
+      if not iterator_shape.is_compatible_with(dataset_shape):
+        raise TypeError("Expected output shapes compatible with %r but got "
+                        "dataset with output shapes %r." %
+                        (self._output_shapes, dataset.output_shapes))
+    return gen_dataset_ops.make_iterator(dataset.make_dataset_resource(),
+                                         self._iterator_resource)
+
+  def get_next(self, name=None):
+    """Returns a nested structure of `tf.Tensor`s containing the next element.
+
+    Args:
+      name: (Optional.) A name for the created operation.
+
+    Returns:
+      A nested structure of `tf.Tensor` objects.
+    """
+    return nest.pack_sequence_as(
+        self._output_types,
+        gen_dataset_ops.iterator_get_next(
+            self._iterator_resource,
+            output_types=nest.flatten(self._output_types),
+            output_shapes=nest.flatten(self._output_shapes),
+            name=name))
+
+  def dispose_op(self, name=None):
+    """Returns a `tf.Operation` that destroys this iterator.
+
+    The returned operation may be used to release any resources consumed by
+    this iterator without closing the session.
+
+    Args:
+      name: (Optional.) A name for the created operation.
+
+    Returns:
+      A `tf.Operation`.
+    """
+    return gen_dataset_ops.iterator_dispose(self._iterator_resource, name=name)
+
+  @property
+  def output_shapes(self):
+    """Returns the shape of each component of an element of this iterator.
+
+    Returns:
+      A nested structure of `tf.TensorShape` objects corresponding to each
+      component of an element of this iterator.
+    """
+    return self._output_shapes
+
+  @property
+  def output_types(self):
+    """Returns the type of each component of an element of this iterator.
+
+    Returns:
+      A nested structure of `tf.DType` objects corresponding to each component
+      of an element of this iterator.
+    """
+    return self._output_types
+
+
+def _calculate_acceptance_probs(initial_probs, target_probs):
+  """Calculate the per-class acceptance rates.
+
+  Args:
+    initial_probs: The class probabilities of the data.
+    target_probs: The desired class proportion in minibatches.
+  Returns:
+    A list of the per-class acceptance probabilities.
+
+  This method is based on solving the following analysis:
+
+  Let F be the probability of a rejection (on any example).
+  Let p_i be the proportion of examples in the data in class i (init_probs)
+  Let a_i is the rate the rejection sampler should *accept* class i
+  Let t_i is the target proportion in the minibatches for class i (target_probs)
+
+  ```
+  F = sum_i(p_i * (1-a_i))
+    = 1 - sum_i(p_i * a_i)     using sum_i(p_i) = 1
+  ```
+
+  An example with class `i` will be accepted if `k` rejections occur, then an
+  example with class `i` is seen by the rejector, and it is accepted. This can
+  be written as follows:
+
+  ```
+  t_i = sum_k=0^inf(F^k * p_i * a_i)
+      = p_i * a_j / (1 - F)    using geometric series identity, since 0 <= F < 1
+      = p_i * a_i / sum_j(p_j * a_j)        using F from above
+  ```
+
+  Note that the following constraints hold:
+  ```
+  0 <= p_i <= 1, sum_i(p_i) = 1
+  0 <= a_i <= 1
+  0 <= t_i <= 1, sum_i(t_i) = 1
+  ```
+
+
+  A solution for a_i in terms of the other variabes is the following:
+    ```a_i = (t_i / p_i) / max_i[t_i / p_i]```
+  """
+  # Add tiny to initial_probs to avoid divide by zero.
+  denom = (initial_probs + np.finfo(initial_probs.dtype.as_numpy_dtype).tiny)
+  ratio_l = target_probs / denom
+
+  # Calculate list of acceptance probabilities.
+  max_ratio = math_ops.reduce_max(ratio_l)
+  return ratio_l / max_ratio
+
+
+def _estimate_data_distribution(c, num_examples_per_class_seen):
+  """Estimate data distribution as labels are seen.
+
+  Args:
+    c: The class labels.  Type `int32`, shape `[batch_size]`.
+    num_examples_per_class_seen: A `ResourceVariable` containing counts.
+      Type `int64`, shape `[num_classes]`.
+
+  Returns:
+    dist: The updated distribution.  Type `float32`, shape `[num_classes]`.
+  """
+  num_classes = num_examples_per_class_seen.get_shape()[0].value
+  # Update the class-count based on what labels are seen in
+  # batch.  But do this asynchronously to avoid performing a
+  # cross-device round-trip.  Just use the cached value.
+  num_examples_per_class_seen = num_examples_per_class_seen.assign_add(
+      math_ops.reduce_sum(
+          array_ops.one_hot(c, num_classes, dtype=dtypes.int64),
+          0))
+  init_prob_estimate = math_ops.truediv(
+      num_examples_per_class_seen,
+      math_ops.reduce_sum(num_examples_per_class_seen))
+  return math_ops.cast(init_prob_estimate, dtypes.float32)
+
+
+class Dataset(object):
+  """Represents a potentially large set of elements.
+
+  A `Dataset` can be used to represent an input pipeline as a
+  collection of elements (nested structures of tensors) and a "logical
+  plan" of transformations that act on those elements.
+  """
+  __metaclass__ = abc.ABCMeta
+
+  def __init__(self):
+    pass
+
+  @abc.abstractmethod
+  def make_dataset_resource(self):
+    """Creates a `tf.Tensor` of  `tf.resource` tensor representing this dataset.
+
+    Returns:
+      A scalar `tf.Tensor` of `tf.resource` type, which represents this dataset.
+    """
+    raise NotImplementedError("Dataset.make_dataset_resource")
+
+  def make_initializable_iterator(self, shared_name=None):
+    """Creates an `Iterator` for enumerating the elements of this dataset.
+
+    **N.B.** The returned iterator will be in an uninitialized state,
+    and you must run the `iterator.initializer` operation before using it.
+
+    Args:
+      shared_name: (Optional.) If non-empty, this iterator will be shared under
+        the given name across multiple sessions that share the same devices
+        (e.g. when using a remote server).
+
+
+    Returns:
+      An `Iterator` over the elements of this dataset.
+    """
+    return Iterator.from_dataset(self, shared_name)
+
+  def make_one_shot_iterator(self):
+    """Creates an `Iterator` for enumerating the elements of this dataset.
+
+    **N.B.** The returned iterator will be initialized automatically.
+    A "one-shot" iterator does not currently support re-initialization.
+
+    Returns:
+      An `Iterator` over the elements of this dataset.
+    """
+    # NOTE(mrry): We capture by value here to ensure that `_make_dataset()` is
+    # a 0-argument function.
+    @function.Defun(capture_by_value=True)
+    def _make_dataset():
+      return self.make_dataset_resource()
+
+    _make_dataset.add_to_graph(ops.get_default_graph())
+
+    return Iterator(
+        gen_dataset_ops.one_shot_iterator(
+            dataset_factory=_make_dataset,
+            output_types=nest.flatten(self.output_types),
+            output_shapes=nest.flatten(self.output_shapes)), None,
+        self.output_types, self.output_shapes)
+
+  @abc.abstractproperty
+  def output_shapes(self):
+    """Returns the shape of each component of an element of this dataset.
+
+    Returns:
+      A nested structure of `tf.TensorShape` objects corresponding to each
+      component of an element of this dataset.
+    """
+    raise NotImplementedError("Dataset.output_shapes")
+
+  @abc.abstractproperty
+  def output_types(self):
+    """Returns the type of each component of an element of this dataset.
+
+    Returns:
+      A nested structure of `tf.DType` objects corresponding to each component
+      of an element of this dataset.
+    """
+    raise NotImplementedError("Dataset.output_types")
+
+  def __repr__(self):
+    output_shapes = nest.map_structure(str, self.output_shapes)
+    output_shapes = str(output_shapes).replace("'", "")
+    output_types = nest.map_structure(repr, self.output_types)
+    output_types = str(output_types).replace("'", "")
+    return ("<%s shapes: %s, types: %s>"
+            % (type(self).__name__, output_shapes, output_types))
+
+  @staticmethod
+  def from_tensors(tensors):
+    """Creates a `Dataset` with a single element, comprising the given tensors.
+
+    Args:
+      tensors: A nested structure of tensors.
+
+    Returns:
+      A `Dataset`.
+    """
+    return TensorDataset(tensors)
+
+  @staticmethod
+  def from_tensor_slices(tensors):
+    """Creates a `Dataset` whose elements are slices of the given tensors.
+
+    Args:
+      tensors: A nested structure of tensors, each having the same size in the
+        0th dimension.
+
+    Returns:
+      A `Dataset`.
+    """
+    return TensorSliceDataset(tensors)
+
+  @staticmethod
+  def from_sparse_tensor_slices(sparse_tensor):
+    """Splits each rank-N `tf.SparseTensor` in this dataset row-wise.
+
+    Args:
+      sparse_tensor: A `tf.SparseTensor`.
+
+    Returns:
+      A `Dataset` of rank-(N-1) sparse tensors.
+    """
+    return SparseTensorSliceDataset(sparse_tensor)
+
+  @staticmethod
+  def range(*args):
+    """Creates a `Dataset` of a step-separated range of values.
+
+    For example:
+
+    ```python
+    Dataset.range(5) == [0, 1, 2, 3, 4]
+    Dataset.range(2, 5) == [2, 3, 4]
+    Dataset.range(1, 5, 2) == [1, 3]
+    Dataset.range(1, 5, -2) == []
+    Dataset.range(5, 1) == []
+    Dataset.range(5, 1, -2) == [5, 3]
+    ```
+
+    Args:
+      *args: follow same semantics as python's xrange.
+        len(args) == 1 -> start = 0, stop = args[0], step = 1
+        len(args) == 2 -> start = args[0], stop = args[1], step = 1
+        len(args) == 3 -> start = args[0], stop = args[1, stop = args[2]
+
+    Returns:
+      A `RangeDataset`.
+
+    Raises:
+      ValueError: if len(args) == 0.
+    """
+    return RangeDataset(*args)
+
+  @staticmethod
+  def zip(datasets):
+    """Creates a `Dataset` by zipping together the given datasets.
+
+    This method has similar semantics to the built-in `zip()` function
+    in Python, with the main difference being that the `datasets`
+    argument can be an arbitrary nested structure of `Dataset` objects.
+    For example:
+
+    ```python
+    # NOTE: The following examples use `{ ... }` to represent the
+    # contents of a dataset.
+    a = { 1, 2, 3 }
+    b = { 4, 5, 6 }
+    c = { (7, 8), (9, 10), (11, 12) }
+    d = { 13, 14 }
+
+    # The nested structure of the `datasets` argument determines the
+    # structure of elements in the resulting dataset.
+    Dataset.zip((a, b)) == { (1, 4), (2, 5), (3, 6) }
+    Dataset.zip((b, a)) == { (4, 1), (5, 2), (6, 3) }
+
+    # The `datasets` argument may contain an arbitrary number of
+    # datasets.
+    Dataset.zip((a, b, c) == { (1, 4, (7, 8)),
+                               (2, 5, (9, 10)),
+                               (3, 6, (11, 12)) }
+
+    # The number of elements in the resulting dataset is the same as
+    # the size of the smallest dataset in `datasets`.
+    Dataset.zip((a, d)) == { (1, 13), (2, 14) }
+    ```
+
+    Args:
+      datasets: A nested structure of datasets.
+
+    Returns:
+      A `Dataset`.
+    """
+    return ZipDataset(datasets)
+
+  @staticmethod
+  def read_batch_features(file_pattern,
+                          batch_size,
+                          features,
+                          reader,
+                          reader_args=None,
+                          randomize_input=True,
+                          num_epochs=None,
+                          capacity=10000):
+    """Reads batches of Examples.
+
+    Args:
+      file_pattern: A string pattern or a placeholder with list of filenames.
+      batch_size: A `tf.int64` scalar `tf.Tensor`, representing the number of
+        consecutive elements of this dataset to combine in a single batch.
+      features: A `dict` mapping feature keys to `FixedLenFeature` or
+        `VarLenFeature` values. See `tf.parse_example`.
+      reader: A function or class that can be called with a `filenames` tensor
+        and (optional) `reader_args` and returns a `Dataset` of serialized
+        Examples.
+      reader_args: Additional arguments to pass to the reader class.
+      randomize_input: Whether the input should be randomized.
+      num_epochs: Integer specifying the number of times to read through the
+        dataset. If None, cycles through the dataset forever.
+      capacity: Capacity of the ShuffleDataset.
+
+    Returns:
+      A `Dataset`.
+    """
+    if isinstance(file_pattern, str):
+      filenames = _get_file_names(file_pattern, randomize_input)
+    else:
+      filenames = file_pattern
+    if reader_args:
+      dataset = reader(filenames, *reader_args)
+    else:
+      dataset = reader(filenames)
+    dataset = dataset.repeat(num_epochs)
+    if randomize_input:
+      dataset = dataset.shuffle(capacity)
+    dataset = dataset.map(
+        lambda x: _parse_example(nest.flatten(x), features)
+    )
+    dataset = dataset.batch(batch_size)
+    return dataset
+
+  def repeat(self, count=None):
+    """Repeats this dataset `count` times.
+
+    Args:
+      count: (Optional.) A `tf.int64` scalar `tf.Tensor`, representing the
+        number of times the elements of this dataset should be repeated. The
+        default behavior (if `count` is `None` or `-1`) is for the elements to
+        be repeated indefinitely.
+
+    Returns:
+      A `Dataset`.
+    """
+    return RepeatDataset(self, count)
+
+  def enumerate(self, start=0):
+    """Enumerate the elements of this dataset.  Similar to python's `enumerate`.
+
+    For example:
+
+    ```python
+    # NOTE: The following examples use `{ ... }` to represent the
+    # contents of a dataset.
+    a = { 1, 2, 3 }
+    b = { (7, 8), (9, 10), (11, 12) }
+
+    # The nested structure of the `datasets` argument determines the
+    # structure of elements in the resulting dataset.
+    a.enumerate(start=5) == { (5, 1), (6, 2), (7, 3) }
+    b.enumerate() == { (0, (7, 8)), (1, (9, 10)), (2, (11, 12)) }
+
+    Args:
+      start: A `tf.int64` scalar `tf.Tensor`, representing the start
+        value for enumeration.
+
+    Returns:
+      A `Dataset`.
+    """
+    max_value = np.iinfo(dtypes.int64.as_numpy_dtype).max
+    return Dataset.zip((Dataset.range(start, max_value), self))
+
+  def shuffle(self, buffer_size, seed=None):
+    """Randomly shuffles the elements of this dataset.
+
+    Args:
+      buffer_size: A `tf.int64` scalar `tf.Tensor`, representing the
+        number of elements from this dataset from which the new
+        dataset will sample.
+      seed: (Optional.) A `tf.int64` scalar `tf.Tensor`, representing the
+        random seed that will be used to create the distribution. See
+        @{tf.set_random_seed} for behavior.
+
+    Returns:
+      A `Dataset`.
+    """
+    return ShuffleDataset(self, buffer_size, seed)
+
+  def take(self, count):
+    """Creates a `Dataset` with at most `count` elements from this dataset.
+
+    Args:
+      count: A `tf.int64` scalar `tf.Tensor`, representing the number of
+        elements of this dataset that should be taken to form the new dataset.
+        If `count` is -1, or if `count` is greater than the size of this
+        dataset, the new dataset will contain all elements of this dataset.
+
+    Returns:
+      A `Dataset`.
+    """
+    return TakeDataset(self, count)
+
+  def skip(self, count):
+    """Creates a `Dataset` that skips `count` elements from this dataset.
+
+    Args:
+      count: A `tf.int64` scalar `tf.Tensor`, representing the number
+        of elements of this dataset that should be skipped to form the
+        new dataset.  If `count` is greater than the size of this
+        dataset, the new dataset will contain no elements.  If `count`
+        is -1, skips the entire dataset.
+
+    Returns:
+      A `Dataset`.
+    """
+    return SkipDataset(self, count)
+
+  def batch(self, batch_size):
+    """Combines consecutive elements of this dataset into batches.
+
+    Args:
+      batch_size: A `tf.int64` scalar `tf.Tensor`, representing the number of
+        consecutive elements of this dataset to combine in a single batch.
+
+    Returns:
+      A `Dataset`.
+    """
+    return BatchDataset(self, batch_size)
+
+  def padded_batch(self, batch_size, padded_shapes, padding_values=None):
+    """Combines consecutive elements of this dataset into padded batches.
+
+    Like `Dataset.dense_to_sparse_batch()`, this method combines
+    multiple consecutive elements of this dataset, which might have
+    different shapes, into a single element. The tensors in the
+    resulting element have an additional outer dimension, and are
+    padded to the respective shape in `padded_shapes`.
+
+    Args:
+      batch_size: A `tf.int64` scalar `tf.Tensor`, representing the number of
+        consecutive elements of this dataset to combine in a single batch.
+      padded_shapes: A nested structure of `tf.TensorShape` or
+        `tf.int64` vector tensor-like objects representing the shape
+        to which the respective component of each input element should
+        be padded prior to batching. Any unknown dimensions
+        (e.g. `tf.Dimension(None)` in a `tf.TensorShape` or `-1` in a
+        tensor-like object) will be padded to the maximum size of that
+        dimension in each batch.
+      padding_values: (Optional.) A nested structure of scalar-shaped
+        `tf.Tensor`, representing the padding values to use for the
+        respective components.  Defaults are `0` for numeric types and
+        the empty string for string types.
+
+    Returns:
+      A `Dataset`.
+    """
+    return PaddedBatchDataset(self, batch_size, padded_shapes, padding_values)
+
+  def dense_to_sparse_batch(self, batch_size, row_shape):
+    """Batches ragged elements of this dataset into `tf.SparseTensor`s.
+
+    Like `Dataset.padded_batch()`, this method combines multiple
+    consecutive elements of this dataset, which might have different
+    shapes, into a single element. The resulting element has three
+    components (`indices`, `values`, and `dense_shape`), which
+    comprise a `tf.SparseTensor` that represents the same data. The
+    `row_shape` represents the dense shape of each row in the
+    resulting `tf.SparseTensor`, to which the effective batch size is
+    prepended. For example:
+
+    ```python
+    # NOTE: The following examples use `{ ... }` to represent the
+    # contents of a dataset.
+    a = { ['a', 'b', 'c'], ['a', 'b'], ['a', 'b', 'c', 'd'] }
+
+    a.dense_to_sparse_batch(batch_size=2, row_shape=[6]) == {
+        ([[0, 0], [0, 1], [0, 2], [1, 0], [1, 1]],  # indices
+         ['a', 'b', 'c', 'a', 'b'],                 # values
+         [2, 6]),                                   # dense_shape
+        ([[2, 0], [2, 1], [2, 2], [2, 3]],
+         ['a', 'b', 'c', 'd'],
+         [1, 6])
+    }
+    ```
+
+    Args:
+      batch_size: A `tf.int64` scalar `tf.Tensor`, representing the
+        number of consecutive elements of this dataset to combine in a
+        single batch.
+      row_shape: A `tf.TensorShape` or `tf.int64` vector tensor-like
+        object representing the equivalent dense shape of a row in the
+        resulting `tf.SparseTensor`. Each element of this dataset must
+        have the same rank as `row_shape`, and must have size less
+        than or equal to `row_shape` in each dimension.
+
+    Returns:
+      A `Dataset`.
+    """
+    return DenseToSparseBatchDataset(self, batch_size, row_shape)
+
+  def group_by_window(self, key_func, reduce_func, window_size):
+    """Performs a windowed "group-by" operation on this dataset.
+
+    This method maps each consecutive element in this dataset to a key
+    using `key_func` and groups the elements by key. It then applies
+    `reduce_func` to at most `window_size` elements matching the same
+    key. All execpt the final window for each key will contain
+    `window_size` elements; the final window may be smaller.
+
+    Args:
+      key_func: A function mapping a nested structure of tensors
+        (having shapes and types defined by `self.output_shapes` and
+        `self.output_types`) to a scalar `tf.int64` tensor.
+      reduce_func: A function mapping a key and a dataset of up to `batch_size`
+        consecutive elements matching that key to another dataset.
+      window_size: A `tf.int64` scalar `tf.Tensor`, representing the number of
+        consecutive elements matching the same key to combine in a single
+        batch, which will be passed to `reduce_func`.
+
+    Returns:
+      A `Dataset`.
+    """
+    return GroupByWindowDataset(self, key_func, reduce_func, window_size)
+
+  def map(self, map_func, num_threads=None, output_buffer_size=None):
+    """Maps `map_func` across this datset.
+
+    Args:
+      map_func: A function mapping a nested structure of tensors (having
+        shapes and types defined by `self.output_shapes` and
+       `self.output_types`) to another nested structure of tensors.
+      num_threads: (Optional.) A `tf.int32` scalar `tf.Tensor`, representing
+        the number of threads to use for processing elements in parallel. If
+        not specified, elements will be processed sequentially without
+        buffering.
+      output_buffer_size: (Optional.) A `tf.int64` scalar `tf.Tensor`,
+        representing the maximum number of processed elements that will be
+        buffered when processing in parallel.
+
+    Returns:
+      A `Dataset`.
+    """
+    return MapDataset(self, map_func, num_threads, output_buffer_size)
+
+  def flat_map(self, map_func):
+    """Maps `map_func` across this dataset and flattens the result.
+
+    Args:
+      map_func: A function mapping a nested structure of tensors (having shapes
+        and types defined by `self.output_shapes` and `self.output_types`) to a
+        `Dataset`.
+
+    Returns:
+      A `Dataset`.
+    """
+    return FlatMapDataset(self, map_func)
+
+  def unbatch(self):
+    """Splits elements of this dataset into sequences of consecutive elements.
+
+    For example, if elements of this dataset are shaped `[B, a0, a1, ...]`,
+    where `B` may vary from element to element, then for each element in
+    this dataset, the unbatched dataset will contain `B` consecutive elements
+    of shape `[a0, a1, ...]`.
+
+    Returns:
+      A `Dataset`.
+    """
+    return self.flat_map(map_func=Dataset.from_tensor_slices)
+
+  def filter(self, predicate):
+    """Filters this dataset according to `predicate`.
+
+    Args:
+      predicate: A function mapping a nested structure of tensors (having shapes
+        and types defined by `self.output_shapes` and `self.output_types`) to a
+        scalar `tf.bool` tensor.
+
+    Returns:
+      A `Dataset`.
+    """
+    return FilterDataset(self, predicate)
+
+
+class TensorDataset(Dataset):
+  """A `Dataset` with a single element, viz. a nested structure of tensors."""
+
+  def __init__(self, tensors):
+    """See `Dataset.from_tensors()` for details."""
+    super(TensorDataset, self).__init__()
+    with ops.name_scope("tensors"):
+      self._tensors = nest.pack_sequence_as(tensors, [
+          ops.convert_to_tensor(t, name="component_%d" % i)
+          for i, t in enumerate(nest.flatten(tensors))
+      ])
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.tensor_dataset(
+        nest.flatten(self._tensors),
+        output_shapes=nest.flatten(self.output_shapes))
+
+  @property
+  def output_shapes(self):
+    return nest.pack_sequence_as(self._tensors,
+                                 [t.shape for t in nest.flatten(self._tensors)])
+
+  @property
+  def output_types(self):
+    return nest.pack_sequence_as(self._tensors,
+                                 [t.dtype for t in nest.flatten(self._tensors)])
+
+
+class TensorSliceDataset(Dataset):
+  """A `Dataset` of slices from a nested structure of tensors."""
+
+  def __init__(self, tensors):
+    """See `Dataset.from_tensor_slices()` for details."""
+    super(TensorSliceDataset, self).__init__()
+    with ops.name_scope("tensors"):
+      flat_tensors = [
+          ops.convert_to_tensor(t, name="component_%d" % i)
+          for i, t in enumerate(nest.flatten(tensors))
+      ]
+
+    self._tensors = nest.pack_sequence_as(tensors, flat_tensors)
+    batch_dim = flat_tensors[0].get_shape()[0]
+    for t in flat_tensors[1:]:
+      batch_dim.assert_is_compatible_with(t.get_shape()[0])
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.tensor_slice_dataset(
+        nest.flatten(self._tensors),
+        output_shapes=nest.flatten(self.output_shapes))
+
+  @property
+  def output_shapes(self):
+    return nest.pack_sequence_as(self._tensors, [
+        tensor_shape.TensorShape(t.shape[1:])
+        for t in nest.flatten(self._tensors)
+    ])
+
+  @property
+  def output_types(self):
+    return nest.pack_sequence_as(self._tensors,
+                                 [t.dtype for t in nest.flatten(self._tensors)])
+
+
+class SparseTensorSliceDataset(Dataset):
+  """A `Dataset` that splits a rank-N `tf.SparseTensor` into its rows."""
+
+  def __init__(self, sparse_tensor):
+    """See `Dataset.from_sparse_tensor_slices()` for details."""
+    super(SparseTensorSliceDataset, self).__init__()
+    if not isinstance(sparse_tensor, sparse_tensor_lib.SparseTensor):
+      raise TypeError("`sparse_tensor` must be a `tf.SparseTensor` object.")
+    self._sparse_tensor = sparse_tensor
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.sparse_tensor_slice_dataset(
+        self._sparse_tensor.indices, self._sparse_tensor.values,
+        self._sparse_tensor.dense_shape)
+
+  @property
+  def output_shapes(self):
+    indices_shape = self._sparse_tensor.indices.get_shape()
+    shape_shape = self._sparse_tensor.dense_shape.get_shape()
+    rank = (indices_shape[1] - 1).merge_with(shape_shape[0] - 1)
+    num_values = tensor_shape.Dimension(None)
+    return (tensor_shape.TensorShape([num_values, rank]),
+            tensor_shape.TensorShape([num_values]), tensor_shape.TensorShape(
+                [rank]))
+
+  @property
+  def output_types(self):
+    return (dtypes.int64, self._sparse_tensor.dtype, dtypes.int64)
+
+
+class ZipDataset(Dataset):
+  """A `Dataset` that zips its inputs together."""
+
+  def __init__(self, datasets):
+    """See `Dataset.zip()` for details."""
+    super(ZipDataset, self).__init__()
+    self._datasets = datasets
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.zip_dataset(
+        [ds.make_dataset_resource() for ds in nest.flatten(self._datasets)],
+        output_shapes=[
+            s
+            for ds in nest.flatten(self._datasets)
+            for s in nest.flatten(ds.output_shapes)
+        ],
+        output_types=[
+            t
+            for ds in nest.flatten(self._datasets)
+            for t in nest.flatten(ds.output_types)
+        ])
+
+  @property
+  def output_shapes(self):
+    return nest.pack_sequence_as(self._datasets, [
+        ds.output_shapes for ds in nest.flatten(self._datasets)])
+
+  @property
+  def output_types(self):
+    return nest.pack_sequence_as(self._datasets, [
+        ds.output_types for ds in nest.flatten(self._datasets)])
+
+
+class RepeatDataset(Dataset):
+  """A `Dataset` that repeats its input several times."""
+
+  def __init__(self, input_dataset, count):
+    """See `Dataset.repeat()` for details."""
+    super(RepeatDataset, self).__init__()
+    self._input_dataset = input_dataset
+    if count is None:
+      self._count = constant_op.constant(-1, dtype=dtypes.int64, name="count")
+    else:
+      self._count = ops.convert_to_tensor(count, dtype=dtypes.int64,
+                                          name="count")
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.repeat_dataset(
+        self._input_dataset.make_dataset_resource(),
+        count=self._count,
+        output_shapes=nest.flatten(self.output_shapes),
+        output_types=nest.flatten(self.output_types))
+
+  @property
+  def output_shapes(self):
+    return self._input_dataset.output_shapes
+
+  @property
+  def output_types(self):
+    return self._input_dataset.output_types
+
+
+class RangeDataset(Dataset):
+  """A `Dataset` of a step separated range of values."""
+
+  def __init__(self, *args):
+    """See `Dataset.range()` for details."""
+    super(RangeDataset, self).__init__()
+    self._parse_args(*args)
+
+  def _parse_args(self, *args):
+    if len(args) == 1:
+      self._start = self._build_tensor(0, "start")
+      self._stop = args[0]
+      self._step = self._build_tensor(1, "step")
+    elif len(args) == 2:
+      self._start = args[0]
+      self._stop = args[1]
+      self._step = self._build_tensor(1, "step")
+    elif len(args) == 3:
+      self._start = args[0]
+      self._stop = args[1]
+      self._step = args[2]
+    else:
+      raise ValueError("Invalid arguments to RangeDataset: %s" % str(args))
+
+  def _build_tensor(self, int64_value, name):
+    return constant_op.constant(int64_value, dtype=dtypes.int64, name=name)
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.range_dataset(
+        start=self._start,
+        stop=self._stop,
+        step=self._step,
+        output_shapes=nest.flatten(self.output_shapes),
+        output_types=nest.flatten(self.output_types))
+
+  @property
+  def output_shapes(self):
+    return tensor_shape.scalar()
+
+  @property
+  def output_types(self):
+    return dtypes.int64
+
+
+class ShuffleDataset(Dataset):
+  """A `Dataset` that randomly shuffles the elements of its input."""
+
+  def __init__(self, input_dataset, buffer_size, seed=None):
+    """See `Dataset.shuffle()` for details."""
+    super(ShuffleDataset, self).__init__()
+    self._input_dataset = input_dataset
+    self._buffer_size = ops.convert_to_tensor(
+        buffer_size, dtype=dtypes.int64, name="buffer_size")
+    seed, seed2 = random_seed.get_seed(seed)
+    if seed is None:
+      self._seed = constant_op.constant(0, dtype=dtypes.int64, name="seed")
+    else:
+      self._seed = ops.convert_to_tensor(seed, dtype=dtypes.int64, name="seed")
+    if seed2 is None:
+      self._seed2 = constant_op.constant(0, dtype=dtypes.int64, name="seed2")
+    else:
+      self._seed2 = ops.convert_to_tensor(seed2, dtype=dtypes.int64,
+                                          name="seed2")
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.shuffle_dataset(
+        self._input_dataset.make_dataset_resource(),
+        buffer_size=self._buffer_size,
+        seed=self._seed,
+        seed2=self._seed2,
+        output_shapes=nest.flatten(self.output_shapes),
+        output_types=nest.flatten(self.output_types))
+
+  @property
+  def output_shapes(self):
+    return self._input_dataset.output_shapes
+
+  @property
+  def output_types(self):
+    return self._input_dataset.output_types
+
+
+class TakeDataset(Dataset):
+  """A `Dataset` containing the first `count` elements from its input."""
+
+  def __init__(self, input_dataset, count):
+    """See `Dataset.take()` for details."""
+    super(TakeDataset, self).__init__()
+    self._input_dataset = input_dataset
+    self._count = ops.convert_to_tensor(count, dtype=dtypes.int64, name="count")
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.take_dataset(
+        self._input_dataset.make_dataset_resource(),
+        count=self._count,
+        output_shapes=nest.flatten(self.output_shapes),
+        output_types=nest.flatten(self.output_types))
+
+  @property
+  def output_shapes(self):
+    return self._input_dataset.output_shapes
+
+  @property
+  def output_types(self):
+    return self._input_dataset.output_types
+
+
+class SkipDataset(Dataset):
+  """A `Dataset` skipping the first `count` elements from its input."""
+
+  def __init__(self, input_dataset, count):
+    """See `Dataset.skip()` for details."""
+    super(SkipDataset, self).__init__()
+    self._input_dataset = input_dataset
+    self._count = ops.convert_to_tensor(count, dtype=dtypes.int64, name="count")
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.skip_dataset(
+        self._input_dataset.make_dataset_resource(),
+        count=self._count,
+        output_shapes=nest.flatten(self.output_shapes),
+        output_types=nest.flatten(self.output_types))
+
+  @property
+  def output_shapes(self):
+    return self._input_dataset.output_shapes
+
+  @property
+  def output_types(self):
+    return self._input_dataset.output_types
+
+
+class BatchDataset(Dataset):
+  """A `Dataset` that batches contiguous elements from its input."""
+
+  def __init__(self, input_dataset, batch_size):
+    """See `Dataset.batch()` for details."""
+    super(BatchDataset, self).__init__()
+    self._input_dataset = input_dataset
+    self._batch_size = batch_size
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.batch_dataset(
+        self._input_dataset.make_dataset_resource(),
+        batch_size=self._batch_size,
+        output_shapes=nest.flatten(self.output_shapes),
+        output_types=nest.flatten(self.output_types))
+
+  @property
+  def output_shapes(self):
+    input_shapes = self._input_dataset.output_shapes
+    return nest.pack_sequence_as(input_shapes, [
+        tensor_shape.vector(None).concatenate(s)
+        for s in nest.flatten(self._input_dataset.output_shapes)
+    ])
+
+  @property
+  def output_types(self):
+    return self._input_dataset.output_types
+
+
+def _partial_shape_to_tensor(shape_like):
+  try:
+    # First attempt to convert the input to a shape, and return the
+    # "canonical" tensor representation, which uses `-1` in place of
+    # `None`.
+    shape_like = tensor_shape.as_shape(shape_like)
+    return ops.convert_to_tensor(
+        [dim if dim is not None else -1 for dim in shape_like.as_list()],
+        dtype=dtypes.int64)
+  except (TypeError, ValueError):
+    # The argument was not trivially convertible to a
+    # `tf.TensorShape`, so fall back on the conversion to tensor
+    # machinery.
+    return ops.convert_to_tensor(shape_like, dtype=dtypes.int64)
+
+
+def _padding_value_to_tensor(value, output_type):
+  """Converts the padding value to a tensor.
+
+  Args:
+    value: The padding value.
+    output_type: Its expected dtype.
+
+  Returns:
+    A scalar `Tensor`.
+
+  Raises:
+    ValueError: if the padding value is not a scalar.
+    TypeError: if the padding value's type does not match `output_type`.
+  """
+  value = ops.convert_to_tensor(value, name="padding_value")
+  if not value.shape.is_compatible_with(tensor_shape.scalar()):
+    raise ValueError(
+        "Padding value should be a scalar, but is not: %s" % value)
+  if value.dtype != output_type:
+    raise TypeError(
+        "Padding value tensor (%s) does not match output type: %s"
+        % (value, output_type))
+  return value
+
+
+class PaddedBatchDataset(Dataset):
+  """A `Dataset` that batches and pads contiguous elements from its input."""
+
+  def __init__(self, input_dataset, batch_size, padded_shapes, padding_values):
+    """See `Dataset.batch()` for details."""
+    super(PaddedBatchDataset, self).__init__()
+    self._input_dataset = input_dataset
+    self._batch_size = batch_size
+    padding_values = (padding_values if padding_values is not None else
+                      self._default_padding(input_dataset))
+    self._padded_shapes = nest.map_structure_up_to(input_dataset.output_shapes,
+                                                   _partial_shape_to_tensor,
+                                                   padded_shapes)
+    self._padding_values = nest.map_structure_up_to(input_dataset.output_shapes,
+                                                    _padding_value_to_tensor,
+                                                    padding_values,
+                                                    input_dataset.output_types)
+
+  def _default_padding(self, input_dataset):
+    def make_zero(t):
+      if t.base_dtype == dtypes.string:
+        return ""
+      else:
+        return np.zeros_like(t.as_numpy_dtype())
+    return nest.map_structure(make_zero, input_dataset.output_types)
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.padded_batch_dataset(
+        self._input_dataset.make_dataset_resource(),
+        batch_size=self._batch_size,
+        padded_shapes=[
+            ops.convert_to_tensor(s, dtype=dtypes.int64)
+            for s in nest.flatten(self._padded_shapes)
+        ],
+        padding_values=nest.flatten(self._padding_values),
+        output_shapes=nest.flatten(self.output_shapes))
+
+  @property
+  def output_shapes(self):
+    def _padded_shape_to_batch_shape(s):
+      return tensor_shape.vector(None).concatenate(
+          tensor_util.constant_value_as_shape(s))
+    return nest.map_structure(_padded_shape_to_batch_shape, self._padded_shapes)
+
+  @property
+  def output_types(self):
+    return self._input_dataset.output_types
+
+
+class DenseToSparseBatchDataset(Dataset):
+  """A `Dataset` that batches ragged dense elements into `tf.SparseTensor`s."""
+
+  def __init__(self, input_dataset, batch_size, row_shape):
+    """See `Dataset.dense_to_sparse_batch()` for more details."""
+    super(DenseToSparseBatchDataset, self).__init__()
+    if not isinstance(input_dataset.output_types, dtypes.DType):
+      raise TypeError("DenseToSparseDataset requires an input whose elements "
+                      "have a single component, whereas the input has %r."
+                      % input_dataset.output_types)
+    self._input_dataset = input_dataset
+    self._batch_size = batch_size
+    self._row_shape = _partial_shape_to_tensor(row_shape)
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.dense_to_sparse_batch_dataset(
+        self._input_dataset.make_dataset_resource(),
+        self._batch_size,
+        self._row_shape,
+        output_shapes=self.output_shapes,
+        output_types=self.output_types)
+
+  @property
+  def output_shapes(self):
+    num_elements = tensor_shape.Dimension(None)
+    return (tensor_shape.matrix(num_elements, self._row_shape.shape[0] + 1),
+            tensor_shape.vector(num_elements),
+            tensor_shape.vector(self._row_shape.shape[0] + 1))
+
+  @property
+  def output_types(self):
+    return (dtypes.int64, self._input_dataset.output_types, dtypes.int64)
+
+
+class _ResourceDataset(Dataset):
+  """A Dataset wrapper for a tf.resource-typed function argument."""
+
+  def __init__(self, dataset_resource, output_types, output_shapes):
+    super(_ResourceDataset, self).__init__()
+    self._dataset_resource = dataset_resource,
+    self._output_types = output_types
+    self._output_shapes = output_shapes
+
+  def make_dataset_resource(self):
+    return self._dataset_resource
+
+  @property
+  def output_shapes(self):
+    return self._output_shapes
+
+  @property
+  def output_types(self):
+    return self._output_types
+
+
+class GroupByWindowDataset(Dataset):
+  """A `Dataset` that groups its input and performs a windowed reduction."""
+
+  def __init__(self, input_dataset, key_func, reduce_func, window_size):
+    """See `Dataset.group_by_window()` for details."""
+    super(GroupByWindowDataset, self).__init__()
+    self._input_dataset = input_dataset
+    self._window_size = window_size
+
+    @function.Defun(*nest.flatten(input_dataset.output_types))
+    def tf_key_func(*args):
+      """A wrapper for Defun that facilitates shape inference."""
+      # Pass in shape information from the input_dataset.
+      for arg, shape in zip(args, nest.flatten(input_dataset.output_shapes)):
+        arg.set_shape(shape)
+      nested_args = nest.pack_sequence_as(input_dataset.output_types, args)
+      if nest.is_sequence(nested_args):
+        ret = key_func(*nested_args)
+      else:
+        ret = key_func(nested_args)
+      ret = ops.convert_to_tensor(ret, dtype=dtypes.int64)
+      if ret.dtype != dtypes.int64:
+        raise ValueError("`key_func` must return a single tf.int64 tensor.")
+      return ret
+
+    self._key_func = tf_key_func
+    self._key_func.add_to_graph(ops.get_default_graph())
+
+    @function.Defun(dtypes.int64, dtypes.resource)
+    def tf_reduce_func(key, window_dataset_resource):
+      """A wrapper for Defun that facilitates shape inference."""
+      key.set_shape([])
+      window_dataset = _ResourceDataset(window_dataset_resource,
+                                        input_dataset.output_types,
+                                        input_dataset.output_shapes)
+      output_dataset = reduce_func(key, window_dataset)
+      if not isinstance(output_dataset, Dataset):
+        raise TypeError("`reduce_func` must return a `Dataset` object.")
+      self._output_types = output_dataset.output_types
+      self._output_shapes = output_dataset.output_shapes
+      return output_dataset.make_dataset_resource()
+
+    self._reduce_func = tf_reduce_func
+    self._reduce_func.add_to_graph(ops.get_default_graph())
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.group_by_window_dataset(
+        self._input_dataset.make_dataset_resource(),
+        self._key_func.captured_inputs,
+        self._reduce_func.captured_inputs,
+        self._window_size,
+        key_func=self._key_func,
+        reduce_func=self._reduce_func,
+        output_types=nest.flatten(self.output_types),
+        output_shapes=nest.flatten(self.output_shapes))
+
+  @property
+  def output_shapes(self):
+    return self._output_shapes
+
+  @property
+  def output_types(self):
+    return self._output_types
+
+
+def _most_specific_compatible_shape(s1, s2):
+  """Returns the most specific shape compatible with `s1` and `s2`."""
+  if s1.dims is None:
+    return s1
+  if s2.dims is None:
+    return s2
+  s1.assert_same_rank(s2)
+  dims = []
+  for dim1, dim2 in zip(s1, s2):
+    if dim1.value is None or dim2.value is None or dim1.value != dim2.value:
+      dims.append(tensor_shape.Dimension(None))
+    else:
+      dims.append(dim1.value)
+  return tensor_shape.TensorShape(dims)
+
+
+class MapDataset(Dataset):
+  """A `Dataset` that maps a function over elements in its input."""
+
+  def __init__(self,
+               input_dataset,
+               map_func,
+               num_threads=None,
+               output_buffer_size=None):
+    """See `Dataset.map()` for details."""
+    super(MapDataset, self).__init__()
+    self._input_dataset = input_dataset
+
+    self._output_shapes = None
+    self._output_types = None
+
+    @function.Defun(*nest.flatten(input_dataset.output_types))
+    def tf_map_func(*args):
+      """A wrapper for Defun that facilitates shape inference."""
+      # Pass in shape information from the input_dataset.
+      for arg, shape in zip(args, nest.flatten(input_dataset.output_shapes)):
+        arg.set_shape(shape)
+
+      nested_args = nest.pack_sequence_as(input_dataset.output_types, args)
+
+      if nest.is_sequence(nested_args):
+        ret = map_func(*nested_args)
+      else:
+        ret = map_func(nested_args)
+
+      # Extract shape information from the returned values.
+      flattened_ret = [ops.convert_to_tensor(t) for t in nest.flatten(ret)]
+      self._output_shapes = nest.pack_sequence_as(
+          ret, [t.get_shape() for t in flattened_ret])
+      self._output_types = nest.pack_sequence_as(
+          ret, [t.dtype for t in flattened_ret])
+
+      return flattened_ret
+
+    self._map_func = tf_map_func
+    self._map_func.add_to_graph(ops.get_default_graph())
+    if num_threads is not None:
+      self._num_threads = ops.convert_to_tensor(
+          num_threads, dtype=dtypes.int32, name="num_threads")
+      if output_buffer_size is not None:
+        self._output_buffer_size = ops.convert_to_tensor(
+            output_buffer_size, dtype=dtypes.int64, name="output_buffer_size")
+      else:
+        self._output_buffer_size = self._num_threads
+    else:
+      self._num_threads = None
+      self._output_buffer_size = None
+
+  def make_dataset_resource(self):
+    input_resource = self._input_dataset.make_dataset_resource()
+    if self._num_threads is None:
+      return gen_dataset_ops.map_dataset(
+          input_resource,
+          self._map_func.captured_inputs,
+          f=self._map_func,
+          output_types=nest.flatten(self.output_types),
+          output_shapes=nest.flatten(self.output_shapes))
+    else:
+      return gen_dataset_ops.parallel_map_dataset(
+          input_resource,
+          self._map_func.captured_inputs,
+          f=self._map_func,
+          num_threads=self._num_threads,
+          output_buffer_size=self._output_buffer_size,
+          output_types=nest.flatten(self.output_types),
+          output_shapes=nest.flatten(self.output_shapes))
+
+  @property
+  def output_shapes(self):
+    return self._output_shapes
+
+  @property
+  def output_types(self):
+    return self._output_types
+
+
+class FlatMapDataset(Dataset):
+  """A `Dataset` that maps a function over its input and flattens the result."""
+
+  def __init__(self,
+               input_dataset,
+               map_func):
+    """See `Dataset.flat_map()` for details."""
+    super(FlatMapDataset, self).__init__()
+    self._input_dataset = input_dataset
+
+    @function.Defun(*nest.flatten(input_dataset.output_types))
+    def tf_map_func(*args):
+      """A wrapper for Defun that facilitates shape inference."""
+      # Pass in shape information from the input_dataset.
+      for arg, shape in zip(args, nest.flatten(input_dataset.output_shapes)):
+        arg.set_shape(shape)
+
+      nested_args = nest.pack_sequence_as(input_dataset.output_types, args)
+
+      if nest.is_sequence(nested_args):
+        dataset = map_func(*nested_args)
+      else:
+        dataset = map_func(nested_args)
+
+      if not isinstance(dataset, Dataset):
+        raise TypeError("`map_func` must return a `Dataset` object.")
+
+      self._output_types = dataset.output_types
+      self._output_shapes = dataset.output_shapes
+
+      return dataset.make_dataset_resource()
+
+    self._map_func = tf_map_func
+    self._map_func.add_to_graph(ops.get_default_graph())
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.flat_map_dataset(
+        self._input_dataset.make_dataset_resource(),
+        self._map_func.captured_inputs,
+        f=self._map_func,
+        output_types=nest.flatten(self.output_types),
+        output_shapes=nest.flatten(self.output_shapes))
+
+  @property
+  def output_shapes(self):
+    return self._output_shapes
+
+  @property
+  def output_types(self):
+    return self._output_types
+
+
+class FilterDataset(Dataset):
+  """A `Dataset` that filters its input according to a predicate function."""
+
+  def __init__(self, input_dataset, predicate):
+    """See `Dataset.filter()` for details."""
+    super(FilterDataset, self).__init__()
+    self._input_dataset = input_dataset
+
+    @function.Defun(*nest.flatten(input_dataset.output_types))
+    def tf_predicate(*args):
+      """A wrapper for Defun that facilitates shape inference."""
+      # Pass in shape information from the input_dataset.
+      for arg, shape in zip(args, nest.flatten(input_dataset.output_shapes)):
+        arg.set_shape(shape)
+
+      nested_args = nest.pack_sequence_as(input_dataset.output_types, args)
+
+      if nest.is_sequence(nested_args):
+        ret = predicate(*nested_args)
+      else:
+        ret = predicate(nested_args)
+
+      ret = ops.convert_to_tensor(ret, dtype=dtypes.bool)
+      if not (ret.dtype == dtypes.bool and
+              ret.shape.is_compatible_with(tensor_shape.scalar())):
+        raise ValueError("`predicate` must return a scalar boolean tensor.")
+
+      return ret
+
+    self._predicate = tf_predicate
+    self._predicate.add_to_graph(ops.get_default_graph())
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.filter_dataset(
+        self._input_dataset.make_dataset_resource(),
+        other_arguments=self._predicate.captured_inputs,
+        predicate=self._predicate,
+        output_types=nest.flatten(self.output_types),
+        output_shapes=nest.flatten(self.output_shapes))
+
+  @property
+  def output_shapes(self):
+    return self._input_dataset.output_shapes
+
+  @property
+  def output_types(self):
+    return self._input_dataset.output_types
+
+
+class TextLineDataset(Dataset):
+  """A `Dataset` comprising lines from one or more text files."""
+
+  def __init__(self, filenames):
+    """Creates a `TextLineDataset`.
+
+    Args:
+      filenames: A `tf.string` tensor containing one or more filenames.
+    """
+    super(TextLineDataset, self).__init__()
+    self._filenames = ops.convert_to_tensor(
+        filenames, dtype=dtypes.string, name="filenames")
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.text_line_dataset(self._filenames)
+
+  @property
+  def output_shapes(self):
+    return tensor_shape.scalar()
+
+  @property
+  def output_types(self):
+    return dtypes.string
+
+
+class TFRecordDataset(Dataset):
+  """A `Dataset` comprising records from one or more TFRecord files."""
+
+  def __init__(self, filenames, compression_type=None):
+    """Creates a `TFRecordDataset`.
+
+    Args:
+      filenames: A `tf.string` tensor containing one or more filenames.
+      compression_type: A `tf.string` scalar evaluating to one of `""` (no
+        compression), `"ZLIB"`, or `"GZIP"`.
+    """
+    super(TFRecordDataset, self).__init__()
+    self._filenames = ops.convert_to_tensor(filenames, name="filenames")
+    if compression_type is not None:
+      self._compression_type = ops.convert_to_tensor(
+          compression_type, dtype=dtypes.string, name="compression_type")
+    else:
+      self._compression_type = constant_op.constant("", name="compression_type")
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.tf_record_dataset(self._filenames,
+                                             self._compression_type)
+
+  @property
+  def output_shapes(self):
+    return tensor_shape.TensorShape([])
+
+  @property
+  def output_types(self):
+    return dtypes.string
+
+
+class FixedLengthRecordDataset(Dataset):
+  """A `Dataset` of fixed-length records from one or more binary files."""
+
+  def __init__(self,
+               filenames,
+               record_bytes,
+               header_bytes=None,
+               footer_bytes=None):
+    """Creates a `FixedLengthRecordDataset`.
+
+    Args:
+      filenames: A `tf.string` tensor containing one or more filenames.
+      record_bytes: A `tf.int64` scalar representing the number of bytes in
+        each record.
+      header_bytes: (Optional.) A `tf.int64` scalar representing the number of
+        bytes to skip at the start of a file.
+      footer_bytes: (Optional.) A `tf.int64` scalar representing the number of
+        bytes to ignore at the end of a file.
+    """
+    super(FixedLengthRecordDataset, self).__init__()
+    self._filenames = ops.convert_to_tensor(
+        filenames, dtype=dtypes.string, name="filenames")
+    self._record_bytes = ops.convert_to_tensor(
+        record_bytes, dtype=dtypes.int64, name="record_bytes")
+    if header_bytes is not None:
+      self._header_bytes = ops.convert_to_tensor(
+          header_bytes, dtype=dtypes.int64, name="header_bytes")
+    else:
+      self._header_bytes = constant_op.constant(
+          0, dtype=dtypes.int64, name="header_bytes")
+    if footer_bytes is not None:
+      self._footer_bytes = ops.convert_to_tensor(
+          footer_bytes, dtype=dtypes.int64, name="footer_bytes")
+    else:
+      self._footer_bytes = constant_op.constant(
+          0, dtype=dtypes.int64, name="footer_bytes")
+
+  def make_dataset_resource(self):
+    return gen_dataset_ops.fixed_length_record_dataset(
+        self._filenames, self._header_bytes, self._record_bytes,
+        self._footer_bytes)
+
+  @property
+  def output_shapes(self):
+    return tensor_shape.scalar()
+
+  @property
+  def output_types(self):
+    return dtypes.string
+
+
+def rejection_resample(dataset, class_func, target_dist,
+                       initial_dist=None, seed=None):
+  """Resamples this dataset to achieve a target class distribution.
+
+  **NOTE** Resampling is performed via rejection sampling; some fraction
+  of the input values will be dropped.
+
+  Args:
+    dataset: A `Dataset` object.
+    class_func: A function mapping a nested structure of tensors (having
+      shapes and types defined by `dataset.output_shapes` and
+      `dataset.output_types`) to a scalar `tf.int32` tensor.  Values should
+      be in `[0, num_classes)`.
+    target_dist: A floating point type tensor, shaped `[num_classes].
+    initial_dist: (Optional.)  A floating point type tensor, shaped
+      `[num_classes]`.  If not provided, the true class distribution is
+      estimated live in a streaming fashion.
+    seed: (Optional.) Python integer seed for the resampler.
+
+  Returns:
+    A `Dataset`.
+  """
+  dist_estimation_batch_size = 32
+  target_dist = ops.convert_to_tensor(target_dist, name="initial_dist")
+  class_values_ds = dataset.map(class_func)
+  if initial_dist is not None:
+    initial_dist = ops.convert_to_tensor(
+        initial_dist, name="initial_dist")
+    acceptance_dist = _calculate_acceptance_probs(initial_dist, target_dist)
+    initial_dist_ds = Dataset.from_tensors(initial_dist).repeat()
+    acceptance_dist_ds = Dataset.from_tensors(acceptance_dist).repeat()
+  else:
+    num_classes = (target_dist.shape[0].value
+                   or array_ops.shape(target_dist)[0])
+    smoothing_constant = 10
+    num_examples_per_class_seen = resource_variable_ops.ResourceVariable(
+        initial_value=array_ops.fill(
+            [num_classes], np.int64(smoothing_constant)),
+        trainable=False,
+        name="class_count",
+        dtype=dtypes.int64)
+    def update_estimate_and_tile(c):
+      return array_ops.tile(
+          array_ops.expand_dims(
+              _estimate_data_distribution(c, num_examples_per_class_seen), 0),
+          [dist_estimation_batch_size, 1])
+    initial_dist_ds = (class_values_ds
+                       .batch(dist_estimation_batch_size)
+                       .map(update_estimate_and_tile)
+                       .unbatch())
+    acceptance_dist_ds = initial_dist_ds.map(
+        lambda initial: _calculate_acceptance_probs(initial, target_dist))
+
+  def maybe_warn_on_large_rejection(accept_dist, initial_dist):
+    proportion_rejected = math_ops.reduce_sum(
+        (1 - accept_dist) * initial_dist)
+    return control_flow_ops.cond(
+        math_ops.less(proportion_rejected, .5),
+        lambda: accept_dist,
+        lambda: logging_ops.Print(  # pylint: disable=g-long-lambda
+            accept_dist, [proportion_rejected, initial_dist, accept_dist],
+            message="Proportion of examples rejected by sampler is high: ",
+            summarize=100,
+            first_n=10))
+
+  acceptance_dist_ds = (
+      Dataset.zip((acceptance_dist_ds, initial_dist_ds))
+      .map(maybe_warn_on_large_rejection))
+
+  current_probabilities_ds = (Dataset
+                              .zip((acceptance_dist_ds, class_values_ds))
+                              .map(array_ops.gather))
+  filtered_ds = (
+      Dataset.zip((class_values_ds, current_probabilities_ds, dataset))
+      .filter(lambda _1, p, _2: random_ops.random_uniform([], seed=seed) < p))
+  return filtered_ds.map(lambda class_value, _, data: (class_value, data))
+
+
+def read_batch_features(file_pattern,
+                        batch_size,
+                        features,
+                        reader,
+                        reader_args=None,
+                        randomize_input=True,
+                        num_epochs=None,
+                        capacity=10000):
+  """Reads batches of Examples.
+
+  Example:
+
+  ```
+  serialized_examples = [
+    features {
+      feature { key: "age" value { int64_list { value: [ 0 ] } } }
+      feature { key: "gender" value { bytes_list { value: [ "f" ] } } }
+      feature { key: "kws" value { bytes_list { value: [ "code", "art" ] } } }
+    },
+    features {
+      feature { key: "age" value { int64_list { value: [] } } }
+      feature { key: "gender" value { bytes_list { value: [ "f" ] } } }
+      feature { key: "kws" value { bytes_list { value: [ "sports" ] } } }
+    }
+  ]
+  ```
+
+  We can use arguments:
+
+  ```
+  features: {
+    "age": FixedLenFeature([], dtype=tf.int64, default_value=-1),
+    "gender": FixedLenFeature([], dtype=tf.string),
+    "kws": VarLenFeature(dtype=tf.string),
+  }
+  ```
+
+  And the expected output is:
+
+  ```python
+  {
+    "age": [[0], [-1]],
+    "gender": [["f"], ["f"]],
+    "kws": SparseTensor(
+      indices=[[0, 0], [0, 1], [1, 0]],
+      values=["code", "art", "sports"]
+      dense_shape=[2, 2]),
+  }
+  ```
+
+  Args:
+    file_pattern: List of files or patterns of file paths containing
+      `Example` records. See `tf.gfile.Glob` for pattern rules.
+    batch_size: An int representing the number of consecutive elements of this
+      dataset to combine in a single batch.
+    features: A `dict` mapping feature keys to `FixedLenFeature` or
+      `VarLenFeature` values. See `tf.parse_example`.
+    reader: A function or class that can be called with a `filenames` tensor
+      and (optional) `reader_args` and returns a `Dataset` of serialized
+      Examples.
+    reader_args: Additional arguments to pass to the reader class.
+    randomize_input: Whether the input should be randomized.
+    num_epochs: Integer specifying the number of times to read through the
+      dataset. If None, cycles through the dataset forever.
+    capacity: Capacity of the ShuffleDataset. A large capacity ensures better
+      shuffling but would increase memory usage and startup time.
+
+  Returns:
+    A dict from keys in features to Tensor or SparseTensor objects.
+  """
+  filenames = _get_file_names(file_pattern, randomize_input)
+  if reader_args:
+    dataset = reader(filenames, *reader_args)
+  else:
+    dataset = reader(filenames)
+  dataset = dataset.repeat(num_epochs)
+  if randomize_input:
+    dataset = dataset.shuffle(capacity)
+  dataset = dataset.batch(batch_size)
+  dataset = dataset.map(lambda x: _parse_example(x, features))
+  iterator = dataset.make_one_shot_iterator()
+  outputs = iterator.get_next()
+  index = 0
+  result = {}
+  for key in sorted(features.keys()):
+    feature = features[key]
+    if isinstance(feature, parsing_ops.FixedLenFeature):
+      result[key] = outputs[index]
+      index += 1
+    else:
+      result[key] = sparse_tensor_lib.SparseTensor(
+          indices=outputs[index],
+          values=outputs[index + 1],
+          dense_shape=outputs[index + 2])
+      index += 3
+  return result
+
+
+def _parse_example(serialized, features):
+  parsed = parsing_ops.parse_example(serialized, features)
+  result = []
+  for key in sorted(features.keys()):
+    val = parsed[key]
+    if isinstance(val, sparse_tensor_lib.SparseTensor):
+      result.extend([val.indices, val.values, val.dense_shape])
+    else:
+      result.append(val)
+  return result
+
+
+def _get_file_names(file_pattern, randomize_input):
+  """Parse list of file names from pattern, optionally shuffled.
+
+  Args:
+    file_pattern: File glob pattern, or list of glob patterns.
+    randomize_input: Whether to shuffle the order of file names.
+
+  Returns:
+    List of file names matching `file_pattern`.
+
+  Raises:
+    ValueError: If `file_pattern` is empty, or pattern matches no files.
+  """
+  if isinstance(file_pattern, list):
+    if not file_pattern:
+      raise ValueError("File pattern is empty.")
+    file_names = []
+    for entry in file_pattern:
+      file_names.extend(gfile.Glob(entry))
+  else:
+    file_names = list(gfile.Glob(file_pattern))
+
+  if not file_names:
+    raise ValueError("No files match %s." % file_pattern)
+
+  # Sort files so it will be deterministic for unit tests.
+  if not randomize_input:
+    file_names = sorted(file_names)
+  return file_names
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 6056d50587..343d6faf5a 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -503,6 +503,7 @@ tf_gen_op_libs(
         "control_flow_ops",
         "ctc_ops",
         "data_flow_ops",
+        "dataset_ops",
         "function_ops",
         "functional_ops",
         "image_ops",
@@ -580,6 +581,7 @@ cc_library(
         ":control_flow_ops_op_lib",
         ":ctc_ops_op_lib",
         ":data_flow_ops_op_lib",
+        ":dataset_ops_op_lib",
         ":function_ops_op_lib",
         ":functional_ops_op_lib",
         ":image_ops_op_lib",
@@ -707,6 +709,7 @@ cc_library(
         "//tensorflow/core/kernels:control_flow_ops",
         "//tensorflow/core/kernels:ctc_ops",
         "//tensorflow/core/kernels:data_flow",
+        "//tensorflow/core/kernels:dataset_ops",
         "//tensorflow/core/kernels:fake_quant_ops",
         "//tensorflow/core/kernels:function_ops",
         "//tensorflow/core/kernels:image",
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 7a980f8f68..b2eaaa3492 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4947,6 +4947,308 @@ tf_mkl_kernel_library(
     ],
 )
 
+cc_library(
+    name = "dataset",
+    hdrs = ["dataset.h"],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+cc_library(
+    name = "captured_function",
+    srcs = ["captured_function.cc"],
+    hdrs = ["captured_function.h"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+        "//tensorflow/core:proto_text",
+        "//tensorflow/core:protos_all_cc",
+        "//tensorflow/core:session_options",
+        "//tensorflow/core/kernels:variable_ops",
+    ],
+)
+
+cc_library(
+    name = "window_dataset",
+    srcs = ["window_dataset.cc"],
+    hdrs = ["window_dataset.h"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "batch_dataset_op",
+    srcs = ["batch_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "padded_batch_dataset_op",
+    srcs = ["padded_batch_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "dense_to_sparse_batch_dataset_op",
+    srcs = ["dense_to_sparse_batch_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "group_by_window_dataset_op",
+    srcs = ["group_by_window_dataset_op.cc"],
+    deps = [
+        ":captured_function",
+        ":dataset",
+        ":window_dataset",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "filter_dataset_op",
+    srcs = ["filter_dataset_op.cc"],
+    deps = [
+        ":captured_function",
+        ":dataset",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "map_dataset_op",
+    srcs = ["map_dataset_op.cc"],
+    deps = [
+        ":captured_function",
+        ":dataset",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "parallel_map_dataset_op",
+    srcs = ["parallel_map_dataset_op.cc"],
+    deps = [
+        ":captured_function",
+        ":dataset",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "flat_map_dataset_op",
+    srcs = ["flat_map_dataset_op.cc"],
+    deps = [
+        ":captured_function",
+        ":dataset",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "repeat_dataset_op",
+    srcs = ["repeat_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "take_dataset_op",
+    srcs = ["take_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "skip_dataset_op",
+    srcs = ["skip_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "range_dataset_op",
+    srcs = ["range_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "shuffle_dataset_op",
+    srcs = ["shuffle_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "sparse_tensor_slice_dataset_op",
+    srcs = ["sparse_tensor_slice_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "tensor_dataset_op",
+    srcs = ["tensor_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "tensor_slice_dataset_op",
+    srcs = ["tensor_slice_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "zip_dataset_op",
+    srcs = ["zip_dataset_op.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "reader_dataset_ops",
+    srcs = ["reader_dataset_ops.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "iterator_ops",
+    srcs = ["iterator_ops.cc"],
+    deps = [
+        ":dataset",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:dataset_ops_op_lib",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:lib_internal",
+    ],
+)
+
+tf_kernel_library(
+    name = "dataset_ops",
+    deps = [
+        ":batch_dataset_op",
+        ":dense_to_sparse_batch_dataset_op",
+        ":filter_dataset_op",
+        ":flat_map_dataset_op",
+        ":group_by_window_dataset_op",
+        ":iterator_ops",
+        ":map_dataset_op",
+        ":padded_batch_dataset_op",
+        ":parallel_map_dataset_op",
+        ":range_dataset_op",
+        ":reader_dataset_ops",
+        ":repeat_dataset_op",
+        ":shuffle_dataset_op",
+        ":skip_dataset_op",
+        ":sparse_tensor_slice_dataset_op",
+        ":take_dataset_op",
+        ":tensor_dataset_op",
+        ":tensor_slice_dataset_op",
+        ":zip_dataset_op",
+    ],
+)
+
 # -----------------------------------------------------------------------------
 # Google-internal targets.  These must be at the end for syncrepo.
 
diff --git a/tensorflow/core/kernels/batch_dataset_op.cc b/tensorflow/core/kernels/batch_dataset_op.cc
new file mode 100644
index 0000000000..443859a95c
--- /dev/null
+++ b/tensorflow/core/kernels/batch_dataset_op.cc
@@ -0,0 +1,223 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class BatchDatasetOp : public OpKernel {
+ public:
+  explicit BatchDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new BatchDatasetOp::Dataset, insert it in the step-local
+    // container, and return it as the output.
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    const Tensor* batch_size_t;
+    OP_REQUIRES_OK(ctx, ctx->input("batch_size", &batch_size_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(batch_size_t->shape()),
+                errors::InvalidArgument("batch_size must be a scalar"));
+    const int64 batch_size = batch_size_t->flat<int64>()(0);
+    OP_REQUIRES(
+        ctx, batch_size > 0,
+        errors::InvalidArgument("Batch size must be greater than zero."));
+
+    DatasetBase* dataset = new Dataset(batch_size, input);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(int64 batch_size, const DatasetBase* input)
+        : batch_size_(batch_size), input_(input) {
+      input_->Ref();
+
+      // NOTE(mrry): Currently we implement "batch up to" semantics. If
+      // we could tell statically that the input dataset is infinite,
+      // then we could always report `batch_size` as the 0th dimension.
+      const auto& input_shapes = input_->output_shapes();
+      output_shapes_.reserve(input_shapes.size());
+      for (const auto& input_shape : input_shapes) {
+        output_shapes_.emplace_back(
+            PartialTensorShape({-1}).Concatenate(input_shape));
+      }
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return input_->output_dtypes();
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override {
+      return strings::StrCat("BatchDatasetOp(", batch_size_, ")::Dataset");
+    }
+
+   private:
+    // Copies element into the index^th slice of parent (in the 0th dimension).
+    //
+    // TODO(mrry): Reconcile this method with the similar method in
+    // the queue implementation.
+    template <DataType DT>
+    static Status HandleElementToSlice(const Tensor& element, Tensor* parent,
+                                       int index) {
+      typedef typename EnumToDataType<DT>::Type T;
+      if (element.NumElements() !=
+          (parent->NumElements() / parent->dim_size(0))) {
+        TensorShape chip_shape = parent->shape();
+        chip_shape.RemoveDim(0);
+        return errors::Internal(
+            "HandleElementToSlice Cannot copy slice: number of elements does "
+            "not "
+            "match.  Shapes are: [element]: ",
+            element.shape().DebugString(),
+            ", [parent slice]: ", chip_shape.DebugString());
+      }
+      auto parent_as_matrix = parent->flat_outer_dims<T>();
+      parent_as_matrix.chip(index, 0) = element.flat<T>();
+      return Status::OK();
+    }
+
+    // Copies element into the index^th slice of parent (in the 0th dimension).
+    static Status CopyElementToSlice(const Tensor& element, Tensor* parent,
+                                     int64 index) {
+#define HANDLE_TYPE(DT)                                                   \
+  if (element.dtype() == DT) {                                            \
+    TF_RETURN_IF_ERROR(HandleElementToSlice<DT>(element, parent, index)); \
+    return Status::OK();                                                  \
+  }
+      HANDLE_TYPE(DT_FLOAT);
+      HANDLE_TYPE(DT_HALF);
+      HANDLE_TYPE(DT_DOUBLE);
+      HANDLE_TYPE(DT_INT32);
+      HANDLE_TYPE(DT_UINT8);
+      HANDLE_TYPE(DT_INT16);
+      HANDLE_TYPE(DT_INT8);
+      HANDLE_TYPE(DT_STRING);
+      HANDLE_TYPE(DT_COMPLEX64);
+      HANDLE_TYPE(DT_COMPLEX128);
+      HANDLE_TYPE(DT_INT64);
+      HANDLE_TYPE(DT_BOOL);
+      HANDLE_TYPE(DT_QINT8);
+      HANDLE_TYPE(DT_QUINT8);
+      HANDLE_TYPE(DT_QINT32);
+      HANDLE_TYPE(DT_QINT16);
+      HANDLE_TYPE(DT_QUINT16);
+#undef HANDLE_TYPE
+      return errors::Unimplemented("CopyElementToSlice Unhandled data type: ",
+                                   element.dtype());
+    }
+
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        // Each row of `batch_elements` is a tuple of tensors from the
+        // input iterator.
+        std::vector<std::vector<Tensor>> batch_elements;
+        batch_elements.reserve(dataset()->batch_size_);
+        {
+          mutex_lock l(mu_);
+          *end_of_sequence = false;
+          for (int i = 0; i < dataset()->batch_size_ && !*end_of_sequence;
+               ++i) {
+            std::vector<Tensor> batch_element_tuple;
+            TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, &batch_element_tuple,
+                                                    end_of_sequence));
+            if (!*end_of_sequence) {
+              batch_elements.emplace_back(std::move(batch_element_tuple));
+            }
+          }
+        }
+
+        if (batch_elements.empty()) {
+          DCHECK(*end_of_sequence);
+          return Status::OK();
+        }
+
+        // Copy the retrieved batch elements into one output tensor
+        // per tuple component.
+        // NOTE(mrry): If the input or output sizes are statically
+        // known, we could potentially read the input values in-place
+        // into their respective slice locations. This would require a
+        // different GetNext() overload that supports zero-copy, and might
+        // make sense in an optimization pass.
+        const size_t num_tuple_components = batch_elements[0].size();
+        const int64 num_batch_elements = batch_elements.size();
+        for (size_t component_index = 0; component_index < num_tuple_components;
+             ++component_index) {
+          const Tensor& first_element = batch_elements[0][component_index];
+          TensorShape batch_component_shape({num_batch_elements});
+          batch_component_shape.AppendShape(first_element.shape());
+          Tensor batch_component(cpu_allocator(), first_element.dtype(),
+                                 batch_component_shape);
+          // Build the output tuple component by copying one slice
+          // from each input element in the batch.
+          for (size_t i = 0; i < num_batch_elements; ++i) {
+            TF_RETURN_IF_ERROR(CopyElementToSlice(
+                batch_elements[i][component_index], &batch_component, i));
+          }
+          out_tensors->emplace_back(std::move(batch_component));
+        }
+        *end_of_sequence = false;
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int64 i_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+    };
+
+    const int64 batch_size_;
+    const DatasetBase* const input_;
+    std::vector<PartialTensorShape> output_shapes_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("BatchDataset").Device(DEVICE_CPU),
+                        BatchDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/captured_function.cc b/tensorflow/core/kernels/captured_function.cc
new file mode 100644
index 0000000000..1cb9e0c7be
--- /dev/null
+++ b/tensorflow/core/kernels/captured_function.cc
@@ -0,0 +1,149 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/captured_function.h"
+
+#include <utility>
+
+#include "tensorflow/core/common_runtime/threadpool_device.h"
+#include "tensorflow/core/framework/allocator.h"
+#include "tensorflow/core/framework/device_attributes.pb.h"
+#include "tensorflow/core/framework/lookup_interface.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/queue_interface.h"
+#include "tensorflow/core/framework/reader_interface.h"
+#include "tensorflow/core/framework/resource_handle.pb_text.h"
+#include "tensorflow/core/kernels/dataset.h"
+#include "tensorflow/core/kernels/variable_ops.h"
+#include "tensorflow/core/platform/notification.h"
+#include "tensorflow/core/public/session_options.h"
+
+
+namespace tensorflow {
+
+/* static */
+Status CapturedFunction::Create(
+    OpKernelContext* ctx, const NameAttrList* func, int graph_def_version,
+    std::vector<Tensor> captured_inputs,
+    std::unique_ptr<CapturedFunction>* out_function) {
+  // NOTE(mrry): We need to assign a name to the device, and we choose
+  // the same name as the calling context's device so that we do not
+  // need to rewrite resource handles that are found in `captured_inputs`.
+  std::unique_ptr<Device> device(new ThreadPoolDevice(
+      SessionOptions(), ctx->device()->attributes().name(), Bytes(256 << 20),
+      DeviceLocality(), cpu_allocator()));
+
+// TODO(mrry): Handle arbitrary resource types, which might require a
+// redesign (or opening up access to `ResourceMgr::DoLookup()` and
+// `ResourceMgr::DoCreate()` to this code).
+#define HANDLE_RESOURCE_TYPE(ResourceType)                                     \
+  if (input_handle.hash_code() == MakeTypeIndex<ResourceType>().hash_code()) { \
+    ResourceType* resource;                                                    \
+    Status s = LookupResource(ctx, input_handle, &resource);                   \
+    if (errors::IsNotFound(s)) {                                               \
+      return errors::FailedPrecondition(                                       \
+          "Failed to capture resource named \"", input_handle.name(),          \
+          "\" in a dataset function. You may need to initialize it "           \
+          "explicitly before initializing an iterator that uses it.");         \
+    } else if (!s.ok()) {                                                      \
+      return s;                                                                \
+    }                                                                          \
+    TF_RETURN_IF_ERROR(device->resource_manager()->Create(                     \
+        input_handle.container(), input_handle.name(), resource));             \
+    continue;                                                                  \
+  }
+
+  for (size_t i = 0; i < captured_inputs.size(); ++i) {
+    if (captured_inputs[i].dtype() == DT_RESOURCE) {
+      // Extract the resource from `ctx->resource_manager()` and
+      // insert it into `device->resource_manager()` so that it can be
+      // used when the function executes.
+      ResourceHandle input_handle =
+          captured_inputs[i].scalar<ResourceHandle>()();
+      HANDLE_RESOURCE_TYPE(lookup::LookupInterface);
+      HANDLE_RESOURCE_TYPE(QueueInterface);
+      HANDLE_RESOURCE_TYPE(Var);
+      return errors::Unimplemented(
+          "Cannot currently capture resource '",
+          ProtoDebugString(input_handle),
+          "' in a dataset function (type not supported).");
+    }
+  }
+#undef HANDLE_RESOURCE_TYPE
+
+  std::unique_ptr<FunctionLibraryDefinition> flib_def(
+      new FunctionLibraryDefinition(
+          *ctx->function_library()->GetFunctionLibraryDefinition()));
+  std::unique_ptr<FunctionLibraryRuntime> lib(NewFunctionLibraryRuntime(
+      nullptr /* device_mgr */, ctx->env(), device.get(), graph_def_version,
+      flib_def.get(), {} /* TODO(mrry): OptimizerOptions? */));
+
+  FunctionLibraryRuntime::Handle f_handle;
+  TF_RETURN_IF_ERROR(lib->Instantiate(func->name(),
+                                      func->attr(), &f_handle));
+
+  out_function->reset(new CapturedFunction(
+      std::move(device), std::move(flib_def), std::move(lib), f_handle,
+      std::move(captured_inputs)));
+  return Status::OK();
+}
+
+Status CapturedFunction::Run(FunctionLibraryRuntime::Options f_opts,
+                             gtl::ArraySlice<Tensor> args,
+                             std::vector<Tensor>* rets) {
+  Notification n;
+  Status s;
+  auto done_callback = [&n, &s](Status func_status) {
+    s.Update(func_status);
+    n.Notify();
+  };
+  // TODO(mrry): Add cancellation manager support to IteratorContext
+  // so that we can cancel running map functions. The local
+  // cancellation manager here is created so that we can run kernels
+  // (such as queue kernels) that depend on the non-nullness
+  // `OpKernelContext::cancellation_manager()`, but additional effort
+  // will be required to plumb it through the `IteratorContext`.
+  CancellationManager c_mgr;
+  f_opts.cancellation_manager = &c_mgr;
+  // TODO(mrry): Implement a synchronous version of
+  // FunctionLibraryRuntime::Run() that avoids a context switch for small
+  // functions.
+  if (captured_inputs_.empty()) {
+    lib_->Run(f_opts, f_handle_, args, rets, done_callback);
+  } else {
+    std::vector<Tensor> args_with_captured;
+    args_with_captured.reserve(args.size() + captured_inputs_.size());
+    args_with_captured.insert(args_with_captured.end(), args.begin(),
+                              args.end());
+    args_with_captured.insert(args_with_captured.end(),
+                              captured_inputs_.begin(), captured_inputs_.end());
+    lib_->Run(f_opts, f_handle_, args_with_captured, rets, done_callback);
+  }
+  n.WaitForNotification();
+  return s;
+}
+
+CapturedFunction::CapturedFunction(
+    std::unique_ptr<Device> device,
+    std::unique_ptr<FunctionLibraryDefinition> flib_def,
+    std::unique_ptr<FunctionLibraryRuntime> lib,
+    FunctionLibraryRuntime::Handle f_handle,
+    std::vector<Tensor> captured_inputs)
+    : device_(std::move(device)),
+      flib_def_(std::move(flib_def)),
+      lib_(std::move(lib)),
+      f_handle_(f_handle),
+      captured_inputs_(std::move(captured_inputs)) {}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/captured_function.h b/tensorflow/core/kernels/captured_function.h
new file mode 100644
index 0000000000..2a132cdc3a
--- /dev/null
+++ b/tensorflow/core/kernels/captured_function.h
@@ -0,0 +1,87 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_KERNELS_CAPTURED_FUNCTION_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_KERNELS_CAPTURED_FUNCTION_H_
+
+#include <memory>
+#include <vector>
+
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/gtl/array_slice.h"
+#include "tensorflow/core/platform/macros.h"
+
+namespace tensorflow {
+
+class Device;
+class OpKernelContext;
+class ResourceMgr;
+
+// A `CapturedFunction` encapsulates a TensorFlow function and all of
+// the runtime support required to execute it.
+//
+// The `Dataset`-related classes use `CapturedFunction` to execute
+// TensorFlow functions outside a the normal `OpKernel::Compute()`
+// context.
+//
+// NOTE(mrry): Here we are taking a conservative approach to dealing with
+// ownership of the various framework and runtime objects that are needed
+// to execute functions. We copy the function library *definition* (i.e.
+// a set of FunctionDefs) out of this kernel's context's function library
+// *runtime*, then we use that together with a specially-created
+// ThreadPoolDevice to build a new FunctionLibraryRuntime for the Dataset.
+//
+// We need to do this (or refactor the ownership of framework components
+// in each of the session implementations) to make it possible to close
+// down a ParallelMapDataset::Iterator when its session is closed.
+//
+// TODO(mrry): Clean this up. Investigate whether it would be possible to
+// reuse the session's FunctionLibraryRuntime(s) or Device(s).
+class CapturedFunction {
+ public:
+  // NOTE(mrry): The `captured_inputs` are passed by value. For
+  // efficiency, you are recommended to move this argument into the call.
+  static Status Create(OpKernelContext* ctx, const NameAttrList* func,
+                       int graph_def_version,
+                       std::vector<Tensor> captured_inputs,
+                       std::unique_ptr<CapturedFunction>* out_function);
+
+  Status Run(FunctionLibraryRuntime::Options f_opts,
+             gtl::ArraySlice<Tensor> args, std::vector<Tensor>* rets);
+
+  Device* device() const { return device_.get(); }
+
+  ResourceMgr* resource_manager() const { return device_->resource_manager(); }
+
+ private:
+  CapturedFunction(std::unique_ptr<Device> device,
+                   std::unique_ptr<FunctionLibraryDefinition> flib_def,
+                   std::unique_ptr<FunctionLibraryRuntime> lib,
+                   FunctionLibraryRuntime::Handle f_handle,
+                   std::vector<Tensor> captured_inputs);
+
+  const std::unique_ptr<Device> device_;
+  const std::unique_ptr<FunctionLibraryDefinition> flib_def_;
+  const std::unique_ptr<FunctionLibraryRuntime> lib_;
+  const FunctionLibraryRuntime::Handle f_handle_;
+  const std::vector<Tensor> captured_inputs_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(CapturedFunction);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_KERNELS_CAPTURED_FUNCTION_H_
diff --git a/tensorflow/core/kernels/dataset.h b/tensorflow/core/kernels/dataset.h
new file mode 100644
index 0000000000..83ffabe224
--- /dev/null
+++ b/tensorflow/core/kernels/dataset.h
@@ -0,0 +1,167 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_DATASET_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_DATASET_H_
+
+#include <memory>
+
+#include "tensorflow/core/framework/resource_mgr.h"
+
+namespace tensorflow {
+
+class ResourceMgr;
+
+// A cut-down version of OpKernelContext for running computations in
+// iterators. Note that we cannot simply use OpKernelContext here
+// because we might run computation in an iterator whose lifetime is
+// not nested within the lifetime of a single OpKernelContext
+// (e.g. asynchronous prefetching).
+//
+// TODO(mrry): We will probably need to support more of
+// OpKernelContext here. For example, should allocation be handled by
+// the IteratorContext?
+// TODO(mrry): We will need to fabricate step IDs for calls to ops
+// that are not nested within a particular step.
+// TODO(mrry): We're making some daring assumptions about the lifetime
+// of the FunctionLibraryRuntime and runner passed in here. Once
+// created, a FunctionLibraryRuntime should stay alive for the
+// remainder of a session, so we copy the pointer. A runner will be
+// deleted when the original step ends, but all existing runners only
+// close over session-lifetime (or longer-lived) state, so we can make
+// a copy of the function. There's nothing in the definition of either
+// class to guarantee that what we are doing is safe. We should
+// formalize the properties here.
+class IteratorContext {
+ public:
+  struct Params {
+    // Interface to operating system functionality.
+    Env* env;
+
+    // The step being executed.
+    int64 step_id = 0;
+
+    // Shared resources accessible by this iterator invocation.
+    ResourceMgr* resource_manager = nullptr;
+
+    // Function call support.
+    std::function<void(std::function<void()>)> runner = nullptr;
+  };
+
+  explicit IteratorContext(Params params) : params_(std::move(params)) {}
+
+  Env* env() const { return params_.env; }
+
+  int64 step_id() const { return params_.step_id; }
+
+  std::function<void(std::function<void()>)>* runner() {
+    return &params_.runner;
+  }
+
+  ResourceMgr* resource_manager() const { return params_.resource_manager; }
+
+ private:
+  Params params_;
+};
+
+// Represents the current position in a range of outputs, where the
+// range of outputs is typically represented by an `DatasetBase`,
+// defined below.
+class IteratorBase {
+ public:
+  virtual ~IteratorBase() {}
+
+  // Gets the next output from the range that this iterator is traversing.
+  //
+  // If at least one output remains in this iterator's range, that
+  // output will be stored in `*out_tensors` and `false` will be
+  // stored in `*end_of_sequence`.
+  //
+  // If no more outputs remain in this iterator's range, `true` will
+  // be stored in `*end_of_sequence`, and the content of
+  // `*out_tensors` will be undefined.
+  //
+  // This method is thread-safe.
+  //
+  // TODO(mrry): Define `GetNextAsync()` or `GetNextManyAsync()`, and
+  // potentially remove this method.
+  virtual Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                         bool* end_of_sequence) = 0;
+
+  // Returns a vector of DataType values, representing the respective
+  // element types of each tuple component in the outputs of this
+  // iterator.
+  virtual const DataTypeVector& output_dtypes() const = 0;
+
+  // Returns a vector of tensor shapes, representing the respective
+  // (and possibly partially defined) shapes of each tuple component
+  // in the outputs of this iterator.
+  virtual const std::vector<PartialTensorShape>& output_shapes() const = 0;
+};
+
+// Represents a (potentially infinite) range of outputs, where each
+// output is a tuple of tensors.
+class DatasetBase : public ResourceBase {
+ public:
+  // Returns a new iterator for iterating over the range of elements in
+  // this dataset.
+  //
+  // This method may be called multiple times on the same instance,
+  // and the resulting iterators will have distinct state. Each
+  // iterator will traverse all elements in this dataset from the
+  // start.
+  //
+  // Ownership of the created iterator will be transferred to the caller.
+  virtual std::unique_ptr<IteratorBase> MakeIterator() const = 0;
+
+  // Returns a vector of DataType values, representing the respective
+  // element types of each tuple component in the outputs of this
+  // dataset.
+  virtual const DataTypeVector& output_dtypes() const = 0;
+
+  // Returns a vector of tensor shapes, representing the respective
+  // (and possibly partially defined) shapes of each tuple component
+  // in the outputs of this dataset.
+  virtual const std::vector<PartialTensorShape>& output_shapes() const = 0;
+};
+
+// Represents an iterator that is associated with a particular parent dataset.
+template <class DatasetType>
+class DatasetIterator : public IteratorBase {
+ public:
+  explicit DatasetIterator(const DatasetType* dataset) : dataset_(dataset) {
+    dataset_->Ref();
+  }
+
+  ~DatasetIterator() override { dataset_->Unref(); }
+
+  // The dataset from which this iterator was created.
+  const DatasetType* dataset() const { return dataset_; }
+
+  const DataTypeVector& output_dtypes() const override {
+    return dataset_->output_dtypes();
+  }
+
+  const std::vector<PartialTensorShape>& output_shapes() const override {
+    return dataset_->output_shapes();
+  }
+
+ private:
+  const DatasetType* const dataset_;  // Owns one reference on the
+                                      // shared dataset resource.
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_DATASET_H_
diff --git a/tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc b/tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc
new file mode 100644
index 0000000000..b93a3b2970
--- /dev/null
+++ b/tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc
@@ -0,0 +1,274 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class DenseToSparseBatchDatasetOp : public OpKernel {
+ public:
+  explicit DenseToSparseBatchDatasetOp(OpKernelConstruction* ctx)
+      : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new DenseToSparseBatchDatasetOp::Dataset, insert it in the
+    // step-local container, and return it as the output.
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    OP_REQUIRES(
+        ctx, input->output_dtypes().size() == 1,
+        errors::InvalidArgument("DenseToSparseBatchDataset only supports "
+                                "inputs with a single component."));
+
+    const Tensor* batch_size_t;
+    OP_REQUIRES_OK(ctx, ctx->input("batch_size", &batch_size_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(batch_size_t->shape()),
+                errors::InvalidArgument("batch_size must be a scalar"));
+    const int64 batch_size = batch_size_t->flat<int64>()(0);
+    OP_REQUIRES(
+        ctx, batch_size > 0,
+        errors::InvalidArgument("Batch size must be greater than zero."));
+
+    const Tensor* row_shape_t;
+    OP_REQUIRES_OK(ctx, ctx->input("row_shape", &row_shape_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsVector(row_shape_t->shape()),
+                errors::InvalidArgument("row_shape must be a vector"));
+    TensorShape row_shape;
+    for (size_t i = 0; i < row_shape_t->dim_size(0); ++i) {
+      row_shape.AddDim(row_shape_t->vec<int64>()(i));
+    }
+
+    DatasetBase* dataset = nullptr;
+
+#define HANDLE_TYPE(DT)                                                      \
+  if (input->output_dtypes()[0] == DT) {                                     \
+    dataset =                                                                \
+        new Dataset<EnumToDataType<DT>::Type>(batch_size, row_shape, input); \
+  }
+    HANDLE_TYPE(DT_FLOAT);
+    HANDLE_TYPE(DT_HALF);
+    HANDLE_TYPE(DT_DOUBLE);
+    HANDLE_TYPE(DT_INT32);
+    HANDLE_TYPE(DT_UINT8);
+    HANDLE_TYPE(DT_INT16);
+    HANDLE_TYPE(DT_INT8);
+    HANDLE_TYPE(DT_STRING);
+    HANDLE_TYPE(DT_COMPLEX64);
+    HANDLE_TYPE(DT_COMPLEX128);
+    HANDLE_TYPE(DT_INT64);
+    HANDLE_TYPE(DT_BOOL);
+    HANDLE_TYPE(DT_QINT8);
+    HANDLE_TYPE(DT_QUINT8);
+    HANDLE_TYPE(DT_QINT32);
+    HANDLE_TYPE(DT_QINT16);
+    HANDLE_TYPE(DT_QUINT16);
+#undef HANDLE_TYPE
+    OP_REQUIRES(
+        ctx, dataset != nullptr,
+        errors::Unimplemented("DenseToSparseBatchDataset unhandled data type: ",
+                              input->output_dtypes()[0]));
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  // TODO(mrry): Push the templated code down to the raw copying routine.
+  template <class T>
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(int64 batch_size, const TensorShape& row_shape,
+            const DatasetBase* input)
+        : batch_size_(batch_size), row_shape_(row_shape), input_(input) {
+      input_->Ref();
+
+      output_shapes_.reserve(3);
+      // Outputs represent a SparseTensor as (indices, values, dense_shape).
+      output_shapes_.push_back({-1, row_shape_.dims() + 1});
+      output_shapes_.push_back({-1});
+      output_shapes_.push_back({row_shape_.dims() + 1});
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      static DataTypeVector* output_dtypes_ =
+          new DataTypeVector({DT_INT64, DataTypeToEnum<T>::value, DT_INT64});
+      return *output_dtypes_;
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override {
+      return strings::StrCat("DenseToSparseBatchDatasetOp(", batch_size_,
+                             ")::Dataset");
+    }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset<T>> {
+     public:
+      explicit Iterator(const Dataset<T>* dataset)
+          : DatasetIterator<Dataset<T>>(dataset),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        // Each row of the output SparseTensor is an individual tensor
+        // from the input iterator.
+        std::vector<Tensor> batch_elements;
+        int64 total_elements = 0;
+        batch_elements.reserve(
+            DatasetIterator<Dataset<T>>::dataset()->batch_size_);
+        const TensorShape& row_shape =
+            DatasetIterator<Dataset<T>>::dataset()->row_shape_;
+        const int row_ndims = row_shape.dims();
+        {
+          mutex_lock l(mu_);
+          *end_of_sequence = false;
+          for (int i = 0;
+               i < DatasetIterator<Dataset<T>>::dataset()->batch_size_ &&
+               !*end_of_sequence;
+               ++i) {
+            std::vector<Tensor> batch_element_tuple;
+            TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, &batch_element_tuple,
+                                                    end_of_sequence));
+            if (!*end_of_sequence) {
+              DCHECK_EQ(1, batch_element_tuple.size());
+              batch_elements.push_back(std::move(batch_element_tuple[0]));
+              total_elements += batch_element_tuple[0].NumElements();
+
+              // TODO(mrry): Investigate how to hoist this check when we
+              // have static information that renders it unnecessary.
+              if (batch_element_tuple[0].shape().dims() != row_ndims) {
+                return errors::InvalidArgument(
+                    "Input element had shape (",
+                    batch_element_tuple[0].shape().DebugString(),
+                    ") that is incompatible with the row shape (",
+                    row_shape.DebugString(), ").");
+              }
+              for (int i = 0; i < row_ndims; ++i) {
+                if (batch_element_tuple[0].shape().dim_size(i) >
+                    row_shape.dim_size(i)) {
+                  return errors::DataLoss(
+                      "Input element had shape (",
+                      batch_element_tuple[0].shape().DebugString(),
+                      ") that is larger than the row shape (",
+                      row_shape.DebugString(), ").");
+                }
+              }
+            }
+          }
+        }
+
+        if (batch_elements.empty()) {
+          DCHECK(*end_of_sequence);
+          return Status::OK();
+        }
+
+        // Determine the size of the output tensors:
+        // * indices will be [`total_elements`, `row_shape + 1`].
+        // * values will be [`total_elements`].
+        // * dense_shape will be [`row_shape + 1`].
+        Tensor indices(cpu_allocator(), DT_INT64,
+                       {total_elements, row_ndims + 1});
+        Tensor values(
+            cpu_allocator(),
+            DatasetIterator<Dataset<T>>::dataset()->output_dtypes()[1],
+            {total_elements});
+        Tensor dense_shape(cpu_allocator(), DT_INT64, {row_ndims + 1});
+        auto indices_matrix = indices.matrix<int64>();
+        auto values_flat = values.flat<T>();
+        auto dense_shape_vec = dense_shape.vec<int64>();
+
+        int64 current_position_in_values = 0;
+        for (int64 i = 0; i < batch_elements.size(); ++i) {
+          const Tensor& t = batch_elements[i];
+          const auto& t_flat = t.flat<T>();
+          // TODO(mrry): Replace with a memcpy or something more
+          // efficient. (Maybe an Eigen assign op?)
+          gtl::InlinedVector<int64, 4> strides(row_ndims);
+          if (!strides.empty()) {
+            strides[row_ndims - 1] = 1;
+            for (int64_t row_dim = strides.size() - 2; row_dim >= 0;
+                 --row_dim) {
+              strides[row_dim] =
+                  strides[row_dim + 1] * t.shape().dim_size(row_dim + 1);
+            }
+          }
+
+          for (int64 j = 0; j < t.NumElements(); ++j) {
+            values_flat(current_position_in_values) = t_flat(j);
+            indices_matrix(current_position_in_values, 0) = i;
+            int64 index = j;
+            for (size_t k = 0; k < strides.size(); ++k) {
+              indices_matrix(current_position_in_values, k + 1) =
+                  index / strides[k];
+              index %= strides[k];
+            }
+            ++current_position_in_values;
+          }
+        }
+
+        dense_shape_vec(0) = batch_elements.size();
+        for (size_t i = 0; i < row_ndims; ++i) {
+          dense_shape_vec(i + 1) = row_shape.dim_size(i);
+        }
+
+        out_tensors->push_back(std::move(indices));
+        out_tensors->push_back(std::move(values));
+        out_tensors->push_back(std::move(dense_shape));
+
+        *end_of_sequence = false;
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int64 i_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+    };
+
+    const int64 batch_size_;
+    const TensorShape row_shape_;
+    const DatasetBase* const input_;
+    std::vector<PartialTensorShape> output_shapes_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("DenseToSparseBatchDataset").Device(DEVICE_CPU),
+                        DenseToSparseBatchDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/filter_dataset_op.cc b/tensorflow/core/kernels/filter_dataset_op.cc
new file mode 100644
index 0000000000..7b2c0de97d
--- /dev/null
+++ b/tensorflow/core/kernels/filter_dataset_op.cc
@@ -0,0 +1,158 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/random.h"
+
+#include "tensorflow/core/kernels/captured_function.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class FilterDatasetOp : public OpKernel {
+ public:
+  explicit FilterDatasetOp(OpKernelConstruction* ctx)
+      : OpKernel(ctx), graph_def_version_(ctx->graph_def_version()) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("predicate", &func_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    OpInputList inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("other_arguments", &inputs));
+    std::vector<Tensor> other_arguments;
+    other_arguments.reserve(inputs.size());
+    for (const Tensor& t : inputs) {
+      other_arguments.push_back(t);
+    }
+
+    std::unique_ptr<CapturedFunction> captured_func;
+    OP_REQUIRES_OK(ctx, CapturedFunction::Create(ctx, func_, graph_def_version_,
+                                                 std::move(other_arguments),
+                                                 &captured_func));
+
+    DatasetBase* dataset = new Dataset(input, std::move(captured_func));
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  const int graph_def_version_;
+
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(const DatasetBase* input,
+            std::unique_ptr<CapturedFunction> captured_func)
+        : input_(input), captured_func_(std::move(captured_func)) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return input_->output_dtypes();
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return input_->output_shapes();
+    }
+
+    string DebugString() override { return "FilterDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        // NOTE(mrry): This method is thread-safe as long as
+        // `input_impl_` and `f` are thread-safe. However, if multiple
+        // threads enter this method, outputs may be observed in a
+        // non-deterministic order.
+        bool matched;
+        do {
+          TF_RETURN_IF_ERROR(
+              input_impl_->GetNext(ctx, out_tensors, end_of_sequence));
+          if (*end_of_sequence) {
+            return Status::OK();
+          }
+
+          FunctionLibraryRuntime::Options opts;
+          // Choose a step ID that is guaranteed not to clash with any
+          // Session-generated step ID. DirectSession only generates
+          // non-negative step IDs (contiguous, starting from 0), and
+          // MasterSession generates 56-bit random step IDs whose MSB
+          // is always 0, so a negative random step ID should suffice.
+          opts.step_id = -std::abs(static_cast<int64>(random::New64()));
+          opts.runner = ctx->runner();
+          // TODO(mrry): Avoid blocking a threadpool thread. We will need to
+          // stack-rip the iterators and use async kernels.
+          Notification n;
+          Status ret;
+          std::vector<Tensor> result;
+          ret = dataset()->captured_func_->Run(opts, *out_tensors, &result);
+
+          if (!ret.ok()) {
+            return ret;
+          } else if (result.size() != 1 || result[0].dtype() != DT_BOOL ||
+                     result[0].NumElements() != 1) {
+            return errors::InvalidArgument(
+                "Filter predicate `f` must return a scalar bool.");
+          }
+          matched = result[0].scalar<bool>()();
+        } while (!matched);
+        *end_of_sequence = false;
+        return Status::OK();
+      }
+
+     private:
+      const std::unique_ptr<IteratorBase> input_impl_;
+    };
+
+    const DatasetBase* const input_;
+    const std::unique_ptr<CapturedFunction> captured_func_;
+  };
+
+ private:
+  const NameAttrList* func_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("FilterDataset").Device(DEVICE_CPU),
+                        FilterDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/flat_map_dataset_op.cc b/tensorflow/core/kernels/flat_map_dataset_op.cc
new file mode 100644
index 0000000000..5b22a922b2
--- /dev/null
+++ b/tensorflow/core/kernels/flat_map_dataset_op.cc
@@ -0,0 +1,215 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/random.h"
+
+#include "tensorflow/core/kernels/captured_function.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class FlatMapDatasetOp : public OpKernel {
+ public:
+  explicit FlatMapDatasetOp(OpKernelConstruction* ctx)
+      : OpKernel(ctx), graph_def_version_(ctx->graph_def_version()) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("f", &func_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_types", &output_types_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_shapes", &output_shapes_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    OpInputList inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("other_arguments", &inputs));
+    std::vector<Tensor> other_arguments;
+    other_arguments.reserve(inputs.size());
+    for (const Tensor& t : inputs) {
+      other_arguments.push_back(t);
+    }
+
+    std::unique_ptr<CapturedFunction> captured_func;
+    OP_REQUIRES_OK(ctx, CapturedFunction::Create(ctx, func_, graph_def_version_,
+                                                 std::move(other_arguments),
+                                                 &captured_func));
+
+    DatasetBase* dataset = new Dataset(input, std::move(captured_func),
+                                       output_types_, output_shapes_);
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(const DatasetBase* input,
+            std::unique_ptr<CapturedFunction> captured_func,
+            const DataTypeVector& output_types,
+            const std::vector<PartialTensorShape>& output_shapes)
+        : input_(input),
+          captured_func_(std::move(captured_func)),
+          output_types_(output_types),
+          output_shapes_(output_shapes) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return output_types_;
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override { return "FlatMapDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        do {
+          if (current_element_iterator_) {
+            // We are currently precessing a mapped element, so try to get the
+            // next subelement.
+            bool end_of_element;
+            TF_RETURN_IF_ERROR(current_element_iterator_->GetNext(
+                ctx, out_tensors, &end_of_element));
+            if (!end_of_element) {
+              // Produce the subelement as output.
+              *end_of_sequence = false;
+              return Status::OK();
+            }
+
+            // We have reached the end of the current element, so maybe move on
+            // to the next element.
+            current_element_iterator_.reset();
+          }
+
+          // Get the next element from the input dataset.
+          std::vector<Tensor> args;
+          TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, &args, end_of_sequence));
+          if (*end_of_sequence) {
+            return Status::OK();
+          }
+
+          FunctionLibraryRuntime::Options opts;
+          opts.runner = ctx->runner();
+          // Choose a step ID that is guaranteed not to clash with any
+          // Session-generated step ID. DirectSession only generates
+          // non-negative step IDs (contiguous, starting from 0), and
+          // MasterSession generates 56-bit random step IDs whose MSB
+          // is always 0, so a negative random step ID should suffice.
+          opts.step_id = -std::abs(static_cast<int64>(random::New64()));
+          ScopedStepContainer step_container(
+              opts.step_id, [this, ctx](const string& name) {
+                dataset()
+                    ->captured_func_->resource_manager()
+                    ->Cleanup(name)
+                    .IgnoreError();
+              });
+          opts.step_container = &step_container;
+          std::vector<Tensor> return_values;
+          TF_RETURN_IF_ERROR(
+              dataset()->captured_func_->Run(opts, args, &return_values));
+
+          if (!(return_values.size() == 1 &&
+                return_values[0].dtype() == DT_RESOURCE &&
+                TensorShapeUtils::IsScalar(return_values[0].shape()))) {
+            return errors::InvalidArgument(
+                "`f` must return a single scalar of dtype DT_RESOURCE.");
+          }
+
+          // Retrieve the dataset that was created in `f`.
+          DatasetBase* returned_dataset;
+          const ResourceHandle& dataset_resource =
+              return_values[0].scalar<ResourceHandle>()();
+
+          // NOTE(mrry): We cannot use the core `LookupResource()` or
+          // `DeleteResource()` functions, because we have an
+          // `IteratorContext*` and not an `OpKernelContext*`, so we
+          // replicate the necessary functionality here.
+          auto type_index = MakeTypeIndex<DatasetBase>();
+          if (type_index.hash_code() != dataset_resource.hash_code()) {
+            return errors::InvalidArgument(
+                "`f` must return a Dataset resource.");
+          }
+          TF_RETURN_IF_ERROR(
+              dataset()->captured_func_->resource_manager()->Lookup(
+                  dataset_resource.container(), dataset_resource.name(),
+                  &returned_dataset));
+          core::ScopedUnref unref_dataset(returned_dataset);
+
+          // Create an iterator for the dataset that was returned by
+          // `f`. This transfers ownership of the dataset to the
+          // iterator, so we can delete it from the resource manager.
+          current_element_iterator_ = returned_dataset->MakeIterator();
+          TF_RETURN_IF_ERROR(
+              dataset()
+                  ->captured_func_->resource_manager()
+                  ->Delete<DatasetBase>(dataset_resource.container(),
+                                        dataset_resource.name()));
+        } while (true);
+      }
+
+     private:
+      mutex mu_;
+      const std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> current_element_iterator_ GUARDED_BY(mu_);
+    };
+
+    const DatasetBase* const input_;
+    const std::unique_ptr<CapturedFunction> captured_func_;
+    const DataTypeVector output_types_;
+    const std::vector<PartialTensorShape> output_shapes_;
+  };
+
+  const int graph_def_version_;
+  DataTypeVector output_types_;
+  std::vector<PartialTensorShape> output_shapes_;
+  const NameAttrList* func_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("FlatMapDataset").Device(DEVICE_CPU),
+                        FlatMapDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/group_by_window_dataset_op.cc b/tensorflow/core/kernels/group_by_window_dataset_op.cc
new file mode 100644
index 0000000000..cb8d566044
--- /dev/null
+++ b/tensorflow/core/kernels/group_by_window_dataset_op.cc
@@ -0,0 +1,344 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include <map>
+
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/random.h"
+
+#include "tensorflow/core/kernels/captured_function.h"
+#include "tensorflow/core/kernels/dataset.h"
+#include "tensorflow/core/kernels/window_dataset.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+class GroupByWindowDatasetOp : public OpKernel {
+ public:
+  explicit GroupByWindowDatasetOp(OpKernelConstruction* ctx)
+      : OpKernel(ctx), graph_def_version_(ctx->graph_def_version()) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("key_func", &key_func_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("reduce_func", &reduce_func_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_types", &output_types_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_shapes", &output_shapes_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    const Tensor* window_size_t;
+    OP_REQUIRES_OK(ctx, ctx->input("window_size", &window_size_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(window_size_t->shape()),
+                errors::InvalidArgument("window_size must be a scalar"));
+    const int64 window_size = window_size_t->flat<int64>()(0);
+    OP_REQUIRES(
+        ctx, window_size > 0,
+        errors::InvalidArgument("Window size must be greater than zero."));
+
+    // Get captured inputs for the key and reduce functions.
+    OpInputList key_func_other_argument_inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("key_func_other_arguments",
+                                        &key_func_other_argument_inputs));
+    std::vector<Tensor> key_func_other_arguments;
+    key_func_other_arguments.reserve(key_func_other_argument_inputs.size());
+    for (const Tensor& t : key_func_other_argument_inputs) {
+      key_func_other_arguments.push_back(t);
+    }
+    OpInputList reduce_func_other_argument_inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("reduce_func_other_arguments",
+                                        &reduce_func_other_argument_inputs));
+    std::vector<Tensor> reduce_func_other_arguments;
+    reduce_func_other_arguments.reserve(
+        reduce_func_other_argument_inputs.size());
+    for (const Tensor& t : reduce_func_other_argument_inputs) {
+      reduce_func_other_arguments.push_back(t);
+    }
+    // TODO(mrry): Refactor CapturedFunction to share the runtime
+    // state between multiple functions?
+    std::unique_ptr<CapturedFunction> captured_key_func;
+    OP_REQUIRES_OK(ctx,
+                   CapturedFunction::Create(ctx, key_func_, graph_def_version_,
+                                            std::move(key_func_other_arguments),
+                                            &captured_key_func));
+    std::unique_ptr<CapturedFunction> captured_reduce_func;
+    OP_REQUIRES_OK(
+        ctx, CapturedFunction::Create(ctx, reduce_func_, graph_def_version_,
+                                      std::move(reduce_func_other_arguments),
+                                      &captured_reduce_func));
+
+    DatasetBase* dataset = new Dataset(
+        input, window_size, std::move(captured_key_func),
+        std::move(captured_reduce_func), output_types_, output_shapes_);
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(const DatasetBase* input, int64 window_size,
+            std::unique_ptr<CapturedFunction> captured_key_func,
+            std::unique_ptr<CapturedFunction> captured_reduce_func,
+            const DataTypeVector& output_types,
+            const std::vector<PartialTensorShape>& output_shapes)
+        : input_(input),
+          window_size_(window_size),
+          captured_key_func_(std::move(captured_key_func)),
+          captured_reduce_func_(std::move(captured_reduce_func)),
+          output_types_(output_types),
+          output_shapes_(output_shapes) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return output_types_;
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override { return "GroupByWindowDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        do {
+          if (current_group_iterator_) {
+            // We are currently processing a group, so try to get the
+            // next element.
+            bool end_of_group;
+            TF_RETURN_IF_ERROR(current_group_iterator_->GetNext(
+                ctx, out_tensors, &end_of_group));
+            if (!end_of_group) {
+              // Produce the subelement as output.
+              *end_of_sequence = false;
+              return Status::OK();
+            }
+            // We have reached the end of the current group, so maybe move on
+            // to the next group.
+            current_group_iterator_.reset();
+          }
+
+          // Iterate through the input dataset until we get a full
+          // group, or reach the end.
+          while (!end_of_input_) {
+            std::vector<Tensor> next_input_element;
+            TF_RETURN_IF_ERROR(
+                input_impl_->GetNext(ctx, &next_input_element, &end_of_input_));
+
+            if (!end_of_input_) {
+              FunctionLibraryRuntime::Options opts;
+              // Choose a step ID that is guaranteed not to clash with any
+              // Session-generated step ID. DirectSession only generates
+              // non-negative step IDs (contiguous, starting from 0), and
+              // MasterSession generates 56-bit random step IDs whose MSB is
+              // always 0, so a negative random step ID should suffice.
+              opts.step_id = -std::abs(static_cast<int64>(random::New64()));
+              opts.runner = ctx->runner();
+              ScopedStepContainer step_container(
+                  opts.step_id, [this, ctx](const string& name) {
+                    dataset()
+                        ->captured_key_func_->resource_manager()
+                        ->Cleanup(name)
+                        .IgnoreError();
+                  });
+              opts.step_container = &step_container;
+
+              // Run the key function on the input element to identify its
+              // group.
+              std::vector<Tensor> key_func_output;
+              TF_RETURN_IF_ERROR(dataset()->captured_key_func_->Run(
+                  opts, next_input_element, &key_func_output));
+
+              if (key_func_output.size() != 1 ||
+                  key_func_output[0].dtype() != DT_INT64 ||
+                  key_func_output[0].NumElements() != 1) {
+                // TODO(mrry): Support non-int64 keys.
+                return errors::InvalidArgument(
+                    "`key_func` must return a scalar int64.");
+              }
+              const int64 key = key_func_output[0].scalar<int64>()();
+
+              std::vector<std::vector<Tensor>>& group = groups_[key];
+              group.push_back(std::move(next_input_element));
+
+              if (group.size() == dataset()->window_size_) {
+                TF_RETURN_IF_ERROR(StartFlushingGroup(ctx, key));
+                break;
+              }
+            }
+          }
+
+          if (end_of_input_) {
+            if (!groups_.empty()) {
+              // We have consumed all of the input, so flush an
+              // arbitrarily chosen group.
+              TF_RETURN_IF_ERROR(
+                  StartFlushingGroup(ctx, groups_.begin()->first));
+            }
+          }
+        } while (current_group_iterator_ || !end_of_input_);
+
+        *end_of_sequence = true;
+        return Status::OK();
+      }
+
+     private:
+      Status StartFlushingGroup(IteratorContext* ctx, int64 key)
+          EXCLUSIVE_LOCKS_REQUIRED(mu_) {
+        FunctionLibraryRuntime::Options opts;
+        // Choose a step ID that is guaranteed not to clash with any
+        // Session-generated step ID. DirectSession only generates
+        // non-negative step IDs (contiguous, starting from 0), and
+        // MasterSession generates 56-bit random step IDs whose MSB is
+        // always 0, so a negative random step ID should suffice.
+        opts.step_id = -std::abs(static_cast<int64>(random::New64()));
+        opts.runner = ctx->runner();
+        ScopedStepContainer step_container(
+            opts.step_id, [this, ctx](const string& name) {
+              dataset()
+                  ->captured_reduce_func_->resource_manager()
+                  ->Cleanup(name)
+                  .IgnoreError();
+            });
+        opts.step_container = &step_container;
+
+        DatasetBase* group_dataset;
+        TF_RETURN_IF_ERROR(NewWindowDataset(
+            std::move(groups_[key]), dataset()->input_->output_dtypes(),
+            dataset()->input_->output_shapes(), &group_dataset));
+        groups_.erase(key);
+
+        Tensor key_arg(DT_INT64, TensorShape({}));
+        key_arg.scalar<int64>()() = key;
+
+        Tensor group_dataset_arg(DT_RESOURCE, TensorShape({}));
+
+        // NOTE(mrry): We cannot use the core `MakeResourceHandle()`,
+        // `LookupResource()` or `DeleteResource()` functions, because
+        // we have an `IteratorContext*` and not an
+        // `OpKernelContext*`, so we replicate the necessary
+        // functionality here.
+        ResourceHandle group_dataset_handle;
+        group_dataset_handle.set_device(
+            dataset()->captured_reduce_func_->device()->attributes().name());
+        group_dataset_handle.set_container(step_container.name());
+        group_dataset_handle.set_name(kWindowResourceName);
+        auto type_index = MakeTypeIndex<DatasetBase>();
+        group_dataset_handle.set_hash_code(type_index.hash_code());
+        group_dataset_handle.set_maybe_type_name(type_index.name());
+        // NOTE(mrry): Ownership of `group_dataset` transfers to
+        // `step_container` here.
+        TF_RETURN_IF_ERROR(dataset()
+                               ->captured_reduce_func_->resource_manager()
+                               ->Create<DatasetBase>(
+                                   group_dataset_handle.container(),
+                                   group_dataset_handle.name(), group_dataset));
+
+        group_dataset_arg.scalar<ResourceHandle>()() = group_dataset_handle;
+
+        std::vector<Tensor> args(
+            {std::move(key_arg), std::move(group_dataset_arg)});
+        std::vector<Tensor> return_values;
+
+        TF_RETURN_IF_ERROR(
+            dataset()->captured_reduce_func_->Run(opts, args, &return_values));
+
+        if (!(return_values.size() == 1 &&
+              return_values[0].dtype() == DT_RESOURCE &&
+              TensorShapeUtils::IsScalar(return_values[0].shape()))) {
+          return errors::InvalidArgument(
+              "`reduce_func` must return a single scalar of dtype "
+              "DT_RESOURCE.");
+        }
+
+        // Retrieve the dataset that was created in `f`.
+        DatasetBase* returned_dataset;
+        const ResourceHandle& dataset_resource =
+            return_values[0].scalar<ResourceHandle>()();
+        if (type_index.hash_code() != dataset_resource.hash_code()) {
+          return errors::InvalidArgument(
+              "`reduce_func` must return a Dataset resource.");
+        }
+        TF_RETURN_IF_ERROR(
+            dataset()->captured_reduce_func_->resource_manager()->Lookup(
+                dataset_resource.container(), dataset_resource.name(),
+                &returned_dataset));
+        core::ScopedUnref unref_returned_dataset(returned_dataset);
+
+        // Create an iterator for the dataset that was returned by
+        // `f`. This transfers ownership of the dataset to the
+        // iterator.
+        current_group_iterator_ = returned_dataset->MakeIterator();
+        return Status::OK();
+      }
+
+      const std::unique_ptr<IteratorBase> input_impl_;
+      mutex mu_;
+      // TODO(mrry): Optimize for dense key space if appropriate.
+      bool end_of_input_ GUARDED_BY(mu_) = false;
+      std::map<int64, std::vector<std::vector<Tensor>>> groups_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> current_group_iterator_ GUARDED_BY(mu_);
+    };
+
+    // A resource name for the temporary window dataset that is
+    // created as the input to the reduce function.
+    static constexpr const char* kWindowResourceName = "__window_dataset";
+
+    const DatasetBase* const input_;
+    const int64 window_size_;
+    const std::unique_ptr<CapturedFunction> captured_key_func_;
+    const std::unique_ptr<CapturedFunction> captured_reduce_func_;
+    const DataTypeVector output_types_;
+    const std::vector<PartialTensorShape> output_shapes_;
+  };
+
+  const int graph_def_version_;
+  DataTypeVector output_types_;
+  std::vector<PartialTensorShape> output_shapes_;
+  const NameAttrList* key_func_;
+  const NameAttrList* reduce_func_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("GroupByWindowDataset").Device(DEVICE_CPU),
+                        GroupByWindowDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/iterator_ops.cc b/tensorflow/core/kernels/iterator_ops.cc
new file mode 100644
index 0000000000..7f1560e9f7
--- /dev/null
+++ b/tensorflow/core/kernels/iterator_ops.cc
@@ -0,0 +1,344 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/resource_op_kernel.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/random.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following ops.
+
+Status VerifyTypesMatch(const DataTypeVector& expected,
+                        const DataTypeVector& received) {
+  if (expected.size() != received.size()) {
+    return errors::InvalidArgument(
+        "Number of components does not match: expected ", expected.size(),
+        " types but got ", received.size(), ".");
+  }
+  for (size_t i = 0; i < expected.size(); ++i) {
+    if (expected[i] != received[i]) {
+      return errors::InvalidArgument("Data type mismatch at component ", i,
+                                     ": expected ", DataTypeString(expected[i]),
+                                     " but got ", DataTypeString(received[i]),
+                                     ".");
+    }
+  }
+  return Status::OK();
+}
+
+Status VerifyShapesCompatible(const std::vector<PartialTensorShape>& expected,
+                              const std::vector<PartialTensorShape>& received) {
+  if (expected.size() != received.size()) {
+    return errors::InvalidArgument(
+        "Number of components does not match: expected ", expected.size(),
+        " shapes but got ", received.size(), ".");
+  }
+  for (size_t i = 0; i < expected.size(); ++i) {
+    if (!expected[i].IsCompatibleWith(received[i])) {
+      return errors::InvalidArgument("Incompatible shapes at component ", i,
+                                     ": expected ", expected[i].DebugString(),
+                                     " but got ", received[i].DebugString(),
+                                     ".");
+    }
+  }
+
+  return Status::OK();
+}
+
+class IteratorResource : public ResourceBase {
+ public:
+  IteratorResource(const DataTypeVector& output_dtypes,
+                   const std::vector<PartialTensorShape>& output_shapes)
+      : iterator_(nullptr),
+        output_dtypes_(output_dtypes),
+        output_shapes_(output_shapes) {}
+
+  Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                 bool* end_of_sequence) {
+    std::shared_ptr<IteratorBase> captured_iterator(iterator_);
+    if (captured_iterator) {
+      return captured_iterator->GetNext(ctx, out_tensors, end_of_sequence);
+    } else {
+      return errors::FailedPrecondition(
+          "GetNext() failed because the iterator has not been initialized. "
+          "Ensure that you have run the initializer operation for this "
+          "iterator before getting the next element.");
+    }
+  }
+
+  // Transfers ownership of iterator to this. This method is thread-safe.
+  Status set_iterator(std::unique_ptr<IteratorBase> iterator) {
+    if (iterator) {
+      TF_RETURN_IF_ERROR(
+          VerifyTypesMatch(output_dtypes_, iterator->output_dtypes()));
+      TF_RETURN_IF_ERROR(
+          VerifyShapesCompatible(output_shapes_, iterator->output_shapes()));
+    }
+    iterator_.reset(iterator.release());
+    return Status::OK();
+  }
+
+  string DebugString() override { return "Iterator resource"; }
+
+  const DataTypeVector& output_dtypes() const { return output_dtypes_; }
+
+  const std::vector<PartialTensorShape>& output_shapes() const {
+    return output_shapes_;
+  }
+
+ private:
+  std::shared_ptr<IteratorBase> iterator_;
+  const DataTypeVector output_dtypes_;
+  const std::vector<PartialTensorShape> output_shapes_;
+};
+
+// TODO(mrry): Can we simply use the template kernel here?
+class IteratorHandleOp : public ResourceOpKernel<IteratorResource> {
+ public:
+  explicit IteratorHandleOp(OpKernelConstruction* ctx)
+      : ResourceOpKernel<IteratorResource>(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_types", &output_dtypes_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_shapes", &output_shapes_));
+  }
+
+ private:
+  Status CreateResource(IteratorResource** ret) override
+      EXCLUSIVE_LOCKS_REQUIRED(mu_) {
+    *ret = new IteratorResource(output_dtypes_, output_shapes_);
+    return Status::OK();
+  }
+
+  Status VerifyResource(IteratorResource* resource) override {
+    TF_RETURN_IF_ERROR(
+        VerifyTypesMatch(output_dtypes_, resource->output_dtypes()));
+    TF_RETURN_IF_ERROR(
+        VerifyShapesCompatible(output_shapes_, resource->output_shapes()));
+    return Status::OK();
+  }
+
+ private:
+  DataTypeVector output_dtypes_;
+  std::vector<PartialTensorShape> output_shapes_;
+};
+
+class MakeIteratorOp : public OpKernel {
+ public:
+  explicit MakeIteratorOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    DatasetBase* dataset;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &dataset));
+    core::ScopedUnref unref_dataset(dataset);
+    IteratorResource* iterator_resource;
+    OP_REQUIRES_OK(
+        ctx, LookupResource(ctx, HandleFromInput(ctx, 1), &iterator_resource));
+    OP_REQUIRES_OK(ctx,
+                   iterator_resource->set_iterator(dataset->MakeIterator()));
+    iterator_resource->Unref();
+  }
+};
+
+class OneShotIteratorOp : public OpKernel {
+ public:
+  explicit OneShotIteratorOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
+    string shared_name;
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("shared_name", &shared_name));
+    OP_REQUIRES(ctx, shared_name.empty(),
+                errors::InvalidArgument("OneShotIteratorOp does not currently "
+                                        "support the 'shared_name' attr."));
+    OP_REQUIRES_OK(ctx,
+                   ctx->GetAttr("dataset_factory", &dataset_factory_func_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_types", &output_dtypes_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_shapes", &output_shapes_));
+  }
+
+  ~OneShotIteratorOp() override {
+    if (iterator_resource_ != nullptr) {
+      iterator_resource_->Unref();
+      if (!cinfo_.resource_manager()
+               ->Delete<IteratorResource>(cinfo_.container(), cinfo_.name())
+               .ok()) {
+        // Do nothing; the resource can have been deleted by session resets.
+      }
+    }
+  }
+
+  // NOTE(mrry): This is based on `ResourceOpKernel<T>::Compute()`,
+  // but due to the fact that `ResourceOpKernel<T>::CreateResource()`
+  // does not provide access to the `OpKernelContext*` and we need this
+  // to invoke the factory function, it's not possible to implement
+  // this kernel by implementing `CreateResource()`.
+  void Compute(OpKernelContext* ctx) override {
+    mutex_lock l(mu_);
+    if (iterator_resource_ == nullptr) {
+      ResourceMgr* mgr = ctx->resource_manager();
+      OP_REQUIRES_OK(ctx, cinfo_.Init(mgr, def()));
+
+      // Create an IteratorResource that will hold the iterator for this op.
+      IteratorResource* resource;
+      OP_REQUIRES_OK(
+          ctx,
+          mgr->LookupOrCreate<IteratorResource>(
+              cinfo_.container(), cinfo_.name(), &resource,
+              [this](IteratorResource** ret) EXCLUSIVE_LOCKS_REQUIRED(mu_) {
+                *ret = new IteratorResource(output_dtypes_, output_shapes_);
+                return Status::OK();
+              }));
+      Status s = VerifyTypesMatch(output_dtypes_, resource->output_dtypes());
+      s.Update(
+          VerifyShapesCompatible(output_shapes_, resource->output_shapes()));
+      if (TF_PREDICT_FALSE(!s.ok())) {
+        resource->Unref();
+        ctx->SetStatus(s);
+        return;
+      }
+      iterator_resource_ = resource;
+
+      // Call the dataset_factory_func_ to create a new dataset,
+      // over which this op will iterate.
+      FunctionLibraryRuntime::Handle f_handle;
+      OP_REQUIRES_OK(ctx, ctx->function_library()->Instantiate(
+                              dataset_factory_func_->name(),
+                              dataset_factory_func_->attr(),
+                              &f_handle));
+      FunctionLibraryRuntime::Options opts;
+      opts.cancellation_manager = ctx->cancellation_manager();
+      // Choose a step ID that is guaranteed not to clash with any
+      // Session-generated step ID. DirectSession only generates
+      // non-negative step IDs (contiguous, starting from 0), and
+      // MasterSession generates 56-bit random step IDs whose MSB is
+      // always 0, so a negative random step ID should suffice.
+      opts.step_id = -std::abs(static_cast<int64>(random::New64()));
+      ScopedStepContainer step_container(
+          opts.step_id, [ctx](const string& name) {
+            ctx->resource_manager()->Cleanup(name).IgnoreError();
+          });
+      opts.step_container = &step_container;
+      opts.runner = ctx->runner();
+      Notification n;
+      Status factory_status;
+      std::vector<Tensor> return_values;
+      ctx->function_library()->Run(opts, f_handle, {}, &return_values,
+                                   [&n, &factory_status](Status s) {
+                                     factory_status.Update(s);
+                                     n.Notify();
+                                   });
+      n.WaitForNotification();
+      OP_REQUIRES_OK(ctx, std::move(factory_status));
+      OP_REQUIRES(
+          ctx,
+          return_values.size() == 1 &&
+              return_values[0].dtype() == DT_RESOURCE &&
+              TensorShapeUtils::IsScalar(return_values[0].shape()),
+          errors::InvalidArgument("The `dataset_factory` function must return "
+                                  "a single scalar of dtype DT_RESOURCE."));
+
+      // Retrieve the dataset that was created in the factory function.
+      DatasetBase* dataset;
+      const ResourceHandle& dataset_resource =
+          return_values[0].flat<ResourceHandle>()(0);
+      OP_REQUIRES_OK(ctx, LookupResource(ctx, dataset_resource, &dataset));
+      core::ScopedUnref unref_dataset(dataset);
+
+      // Create an iterator for the dataset that was created in the
+      // factory function. This transfers ownership of the dataset to
+      // the iterator, so we can delete it from the resource manager.
+      OP_REQUIRES_OK(ctx,
+                     iterator_resource_->set_iterator(dataset->MakeIterator()));
+      OP_REQUIRES_OK(ctx, DeleteResource<DatasetBase>(ctx, dataset_resource));
+    }
+    Tensor* handle;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &handle));
+    handle->scalar<ResourceHandle>()() = MakeResourceHandle<IteratorResource>(
+        ctx, cinfo_.container(), cinfo_.name());
+  }
+
+ private:
+  const NameAttrList* dataset_factory_func_;
+  DataTypeVector output_dtypes_;
+  std::vector<PartialTensorShape> output_shapes_;
+
+  mutex mu_;
+  ContainerInfo cinfo_ GUARDED_BY(mu_);
+  IteratorResource* iterator_resource_ = nullptr;
+};
+
+class IteratorGetNextOp : public OpKernel {
+ public:
+  explicit IteratorGetNextOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  // TODO(mrry): Convert this to an async op, because
+  // `iterator->GetNext()` could trigger long-running operations
+  // (e.g. a QueueDequeue or a remote read).
+  void Compute(OpKernelContext* ctx) override {
+    IteratorResource* iterator;
+    OP_REQUIRES_OK(ctx,
+                   LookupResource(ctx, HandleFromInput(ctx, 0), &iterator));
+    core::ScopedUnref unref_iterator(iterator);
+
+    std::vector<Tensor> components;
+    bool end_of_sequence;
+
+    IteratorContext::Params params;
+    params.env = ctx->env();
+    params.step_id = ctx->step_id();
+    params.resource_manager = ctx->resource_manager();
+    params.runner = *(ctx->runner());
+    IteratorContext iter_ctx(std::move(params));
+
+    OP_REQUIRES_OK(ctx,
+                   iterator->GetNext(&iter_ctx, &components, &end_of_sequence));
+    OP_REQUIRES(ctx, !end_of_sequence, errors::OutOfRange("End of sequence"));
+
+    for (int i = 0; i < components.size(); ++i) {
+      // TODO(mrry): Check that the shapes match the shape attrs.
+      ctx->set_output(i, components[i]);
+    }
+  }
+};
+
+class IteratorDisposeOp : public OpKernel {
+ public:
+  explicit IteratorDisposeOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    IteratorResource* iterator;
+    OP_REQUIRES_OK(ctx,
+                   LookupResource(ctx, HandleFromInput(ctx, 0), &iterator));
+    core::ScopedUnref unref_iterator(iterator);
+    OP_REQUIRES_OK(ctx, iterator->set_iterator(nullptr));
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("Iterator").Device(DEVICE_CPU), IteratorHandleOp);
+REGISTER_KERNEL_BUILDER(Name("MakeIterator").Device(DEVICE_CPU),
+                        MakeIteratorOp);
+REGISTER_KERNEL_BUILDER(Name("OneShotIterator").Device(DEVICE_CPU),
+                        OneShotIteratorOp);
+REGISTER_KERNEL_BUILDER(Name("IteratorGetNext").Device(DEVICE_CPU),
+                        IteratorGetNextOp);
+REGISTER_KERNEL_BUILDER(Name("IteratorDispose").Device(DEVICE_CPU),
+                        IteratorDisposeOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/map_dataset_op.cc b/tensorflow/core/kernels/map_dataset_op.cc
new file mode 100644
index 0000000000..a4d38bbc08
--- /dev/null
+++ b/tensorflow/core/kernels/map_dataset_op.cc
@@ -0,0 +1,151 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/random.h"
+
+#include "tensorflow/core/kernels/captured_function.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class MapDatasetOp : public OpKernel {
+ public:
+  explicit MapDatasetOp(OpKernelConstruction* ctx)
+      : OpKernel(ctx), graph_def_version_(ctx->graph_def_version()) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("f", &func_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_types", &output_types_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_shapes", &output_shapes_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    OpInputList inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("other_arguments", &inputs));
+    std::vector<Tensor> other_arguments;
+    other_arguments.reserve(inputs.size());
+    for (const Tensor& t : inputs) {
+      other_arguments.push_back(t);
+    }
+
+    std::unique_ptr<CapturedFunction> captured_func;
+    OP_REQUIRES_OK(ctx, CapturedFunction::Create(ctx, func_, graph_def_version_,
+                                                 std::move(other_arguments),
+                                                 &captured_func));
+
+    DatasetBase* dataset = new Dataset(input, std::move(captured_func),
+                                       output_types_, output_shapes_);
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(const DatasetBase* input,
+            std::unique_ptr<CapturedFunction> captured_func,
+            const DataTypeVector& output_types,
+            const std::vector<PartialTensorShape>& output_shapes)
+        : input_(input),
+          captured_func_(std::move(captured_func)),
+          output_types_(output_types),
+          output_shapes_(output_shapes) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return output_types_;
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override { return "MapDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        // NOTE(mrry): This method is thread-safe as long as
+        // `input_impl_` and `f` are thread-safe. However, if multiple
+        // threads enter this method, outputs may be observed in a
+        // non-deterministic order.
+
+        std::vector<Tensor> args;
+        TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, &args, end_of_sequence));
+        if (*end_of_sequence) {
+          return Status::OK();
+        }
+
+        FunctionLibraryRuntime::Options opts;
+        // Choose a step ID that is guaranteed not to clash with any
+        // Session-generated step ID. DirectSession only generates
+        // non-negative step IDs (contiguous, starting from 0), and
+        // MasterSession generates 56-bit random step IDs whose MSB is
+        // always 0, so a negative random step ID should suffice.
+        opts.step_id = -std::abs(static_cast<int64>(random::New64()));
+        opts.runner = ctx->runner();
+        // TODO(mrry): Avoid blocking a threadpool thread. We will need to
+        // stack-rip the iterators and use async kernels.
+        return dataset()->captured_func_->Run(opts, args, out_tensors);
+      }
+
+     private:
+      const std::unique_ptr<IteratorBase> input_impl_;
+    };
+
+    const DatasetBase* const input_;
+    const std::unique_ptr<CapturedFunction> captured_func_;
+    const DataTypeVector output_types_;
+    const std::vector<PartialTensorShape> output_shapes_;
+  };
+
+  const int graph_def_version_;
+  DataTypeVector output_types_;
+  std::vector<PartialTensorShape> output_shapes_;
+  const NameAttrList* func_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapDataset").Device(DEVICE_CPU), MapDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/padded_batch_dataset_op.cc b/tensorflow/core/kernels/padded_batch_dataset_op.cc
new file mode 100644
index 0000000000..af2cfc09f0
--- /dev/null
+++ b/tensorflow/core/kernels/padded_batch_dataset_op.cc
@@ -0,0 +1,379 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_util.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+// The following five functions are copied from padding_fifo_queue.cc.
+// TODO(mrry): Reconcile these functions with the similar methods in the
+// queue implementation.
+Status ValidateElementToLargerSlice(const Tensor& element, Tensor* parent) {
+  DCHECK_NE(parent->dim_size(0), 0);
+  if (element.NumElements() > (parent->NumElements() / parent->dim_size(0))) {
+    TensorShape chip_shape = parent->shape();
+    chip_shape.RemoveDim(0);
+    return errors::Internal(
+        "HandleElementToLargerSlice Cannot copy slice: number of entries in "
+        "element is greater than number of elements in parent slice.  ",
+        "Shapes are: [element]: ", element.shape().DebugString(),
+        ", [parent slice]: ", chip_shape.DebugString());
+  }
+  return Status::OK();
+}
+
+template <typename T, int NDIMS>
+Status HandleElementToLargerSlice(const Tensor& element, Tensor* parent,
+                                  int index) {
+  TF_RETURN_IF_ERROR(ValidateElementToLargerSlice(element, parent));
+  if (element.NumElements() == 0) {
+    return Status::OK();
+  }
+  auto element_t = element.tensor<T, NDIMS>();
+  auto parent_t = parent->tensor<T, NDIMS + 1>();
+  Eigen::DSizes<Eigen::DenseIndex, NDIMS + 1> slice_indices;
+  slice_indices[0] = index;
+  Eigen::DSizes<Eigen::DenseIndex, NDIMS + 1> slice_size;
+  slice_size[0] = 1;
+  for (size_t i = 1; i < slice_size.size(); ++i) {
+    slice_size[i] = element_t.dimension(i - 1);
+  }
+  parent_t.slice(slice_indices, slice_size) = element_t.reshape(slice_size);
+  return Status::OK();
+}
+
+template <int NDIMS>
+Status HandleElementToLargerSliceWithRank(const Tensor& element, Tensor* parent,
+                                          int index) {
+#define HANDLE_TYPE(T)                                                   \
+  case DataTypeToEnum<T>::value: {                                       \
+    return HandleElementToLargerSlice<T, NDIMS>(element, parent, index); \
+  }
+
+  switch (element.dtype()) {
+    TF_CALL_ALL_TYPES(HANDLE_TYPE);
+#undef HANDLE_TYPE
+    default:
+      return errors::Unimplemented(
+          "HandleElementToLargerSliceWithRank Unhandled data type: ",
+          element.dtype());
+  }
+}
+
+Status CopyElementToLargerSlice(const Tensor& element, Tensor* parent,
+                                int index) {
+  if (parent->dims() != element.dims() + 1) {
+    return errors::Internal(
+        "Mismatched ranks.  Element's rank is: ", element.dims(),
+        " but element is meant to be a slice in output Tensor having rank: ",
+        parent->dims(), " (should be: ", element.dims() + 1, ")");
+  }
+
+#define HANDLE_DIMS(NDIMS)                                                  \
+  case NDIMS: {                                                             \
+    TF_RETURN_IF_ERROR(                                                     \
+        HandleElementToLargerSliceWithRank<NDIMS>(element, parent, index)); \
+    return Status::OK();                                                    \
+  }
+
+  switch (element.dims()) {
+    HANDLE_DIMS(0);
+    HANDLE_DIMS(1);
+    HANDLE_DIMS(2);
+    HANDLE_DIMS(3);
+    HANDLE_DIMS(4);
+#undef HANDLE_DIMS
+    default:
+      return errors::Unimplemented("CopyElementToLargerSlice Unhandled rank: ",
+                                   element.dims());
+  }
+}
+
+Status SetElementZero(Tensor* element, const Tensor& padding) {
+#define HANDLE_TYPE(T)                                     \
+  if (element->dtype() == DataTypeToEnum<T>::value) {      \
+    element->flat<T>().setConstant(padding.scalar<T>()()); \
+    return Status::OK();                                   \
+  }
+  TF_CALL_ALL_TYPES(HANDLE_TYPE);
+#undef HANDLE_TYPE
+  return errors::Unimplemented("SetElementZero Unhandled data type: ",
+                               element->dtype());
+}
+
+class PaddedBatchDatasetOp : public OpKernel {
+ public:
+  explicit PaddedBatchDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new BatchDatasetOp::Dataset, insert it in the step-local
+    // container, and return it as the output.
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    const Tensor* batch_size_t;
+    OP_REQUIRES_OK(ctx, ctx->input("batch_size", &batch_size_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(batch_size_t->shape()),
+                errors::InvalidArgument("batch_size must be a scalar"));
+    const int64 batch_size = batch_size_t->flat<int64>()(0);
+    OP_REQUIRES(
+        ctx, batch_size > 0,
+        errors::InvalidArgument("Batch size must be greater than zero."));
+
+    OpInputList padded_shape_tensors;
+    OP_REQUIRES_OK(ctx,
+                   ctx->input_list("padded_shapes", &padded_shape_tensors));
+    std::vector<PartialTensorShape> padded_shapes;
+    padded_shapes.reserve(padded_shape_tensors.size());
+    OP_REQUIRES(ctx,
+                padded_shape_tensors.size() == input->output_shapes().size(),
+                errors::InvalidArgument("Number of padded shapes (",
+                                        padded_shape_tensors.size(),
+                                        ") must match the number of components "
+                                        "in the input dataset's elements (",
+                                        input->output_shapes().size(), ")"));
+    for (const Tensor& padded_shape_t : padded_shape_tensors) {
+      OP_REQUIRES(ctx, TensorShapeUtils::IsVector(padded_shape_t.shape()),
+                  errors::InvalidArgument("All padded shapes must be vectors"));
+      PartialTensorShape padded_shape;
+      OP_REQUIRES_OK(ctx, PartialTensorShape::MakePartialShape(
+                              padded_shape_t.vec<int64>().data(),
+                              padded_shape_t.NumElements(), &padded_shape));
+      padded_shapes.push_back(std::move(padded_shape));
+    }
+    OpInputList padding_values_list;
+    OP_REQUIRES_OK(ctx,
+                   ctx->input_list("padding_values", &padding_values_list));
+    std::vector<Tensor> padding_values;
+    OP_REQUIRES(ctx,
+                padding_values_list.size() == input->output_shapes().size(),
+                errors::InvalidArgument(
+                    "Number of padding values (", padding_values_list.size(),
+                    ") must match the number of components in the input "
+                    "dataset's elements (",
+                    input->output_shapes().size(), ")"));
+    for (int i = 0; i < padding_values_list.size(); ++i) {
+      const Tensor& padding_value_t = padding_values_list[i];
+      OP_REQUIRES(
+          ctx, TensorShapeUtils::IsScalar(padding_value_t.shape()),
+          errors::InvalidArgument("All padding values must be scalars"));
+      OP_REQUIRES(ctx, padding_value_t.dtype() == input->output_dtypes()[i],
+                  errors::InvalidArgument(
+                      "Mismatched type between padding value ", i,
+                      " and input dataset's component ", i, ": ",
+                      DataTypeString(padding_value_t.dtype()), " vs. ",
+                      DataTypeString(input->output_dtypes()[i])));
+      padding_values.push_back(tensor::DeepCopy(padding_value_t));
+    }
+
+    DatasetBase* dataset = new Dataset(batch_size, std::move(padded_shapes),
+                                       std::move(padding_values), input);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(int64 batch_size, std::vector<PartialTensorShape> padded_shapes,
+            std::vector<Tensor> padding_values, const DatasetBase* input)
+        : batch_size_(batch_size),
+          padded_shapes_(std::move(padded_shapes)),
+          padding_values_(std::move(padding_values)),
+          input_(input) {
+      input_->Ref();
+
+      // NOTE(mrry): Currently we implement "batch up to"
+      // semantics. If we could tell statically that the input dataset
+      // is infinite, then we could always report `batch_size` as the
+      // 0th dimension.
+      // TODO(mrry): Need to validate that the input shape and the
+      // padded shape are "compatible" (i.e. that padded shape is >=
+      // input shape, with both static and dynamic checks as appropriate).
+      const auto& input_shapes = input_->output_shapes();
+      output_shapes_.reserve(input_shapes.size());
+      for (size_t i = 0; i < input_shapes.size(); ++i) {
+        output_shapes_.push_back(
+            PartialTensorShape({-1}).Concatenate(padded_shapes_[i]));
+      }
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return input_->output_dtypes();
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override {
+      return strings::StrCat("PaddedBatchDatasetOp(", batch_size_,
+                             ")::Dataset");
+    }
+
+   private:
+    // Copies element into the index^th slice of parent (in the 0th dimension).
+    //
+
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        // Each row of `batch_elements` is a tuple of tensors from the
+        // input iterator.
+        std::vector<std::vector<Tensor>> batch_elements;
+        batch_elements.reserve(dataset()->batch_size_);
+        {
+          mutex_lock l(mu_);
+          *end_of_sequence = false;
+          for (int i = 0; i < dataset()->batch_size_ && !*end_of_sequence;
+               ++i) {
+            std::vector<Tensor> batch_element_tuple;
+            TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, &batch_element_tuple,
+                                                    end_of_sequence));
+            if (!*end_of_sequence) {
+              batch_elements.push_back(std::move(batch_element_tuple));
+            }
+          }
+        }
+
+        if (batch_elements.empty()) {
+          DCHECK(*end_of_sequence);
+          return Status::OK();
+        }
+
+        // Copy the retrieved batch elements into one output tensor
+        // per tuple component.
+        // NOTE(mrry): If the input or output sizes are statically
+        // known, we could potentially read the input values in-place
+        // into their respective slice locations. This would require a
+        // different GetNext() overload that supports zero-copy, and might
+        // make sense in an optimization pass.
+        const size_t num_tuple_components = batch_elements[0].size();
+        const int64 num_batch_elements = batch_elements.size();
+        for (size_t component_index = 0; component_index < num_tuple_components;
+             ++component_index) {
+          // 1. Determine the shape of the padded tensor.
+          TensorShape batch_component_shape({num_batch_elements});
+          const PartialTensorShape& padded_shape =
+              dataset()->padded_shapes_[component_index];
+
+          for (int dim = 0; dim < padded_shape.dims(); ++dim) {
+            if (padded_shape.dim_size(dim) == -1) {
+              batch_component_shape.AddDim(0);
+            } else {
+              batch_component_shape.AddDim(padded_shape.dim_size(dim));
+            }
+          }
+
+          for (int64 i = 0; i < num_batch_elements; ++i) {
+            const TensorShape& element_shape =
+                batch_elements[i][component_index].shape();
+            // TODO(mrry): Perform this check in the shape function if
+            // enough static information is avaiable to do so.
+            if (element_shape.dims() != padded_shape.dims()) {
+              return errors::InvalidArgument(
+                  "All elements in a batch must have the same rank as the "
+                  "padded shape for component",
+                  component_index, ": expected rank ", padded_shape.dims(),
+                  " but got element with rank ", element_shape.dims());
+            }
+            for (int dim = 0; dim < padded_shape.dims(); ++dim) {
+              if (padded_shape.dim_size(dim) == -1) {
+                // Take the max of all batch elements in this dimension.
+                if (batch_elements[i][component_index].shape().dim_size(dim) >
+                    batch_component_shape.dim_size(dim + 1)) {
+                  batch_component_shape.set_dim(
+                      dim + 1,
+                      batch_elements[i][component_index].shape().dim_size(dim));
+                }
+              } else {
+                if (batch_elements[i][component_index].shape().dim_size(dim) >
+                    batch_component_shape.dim_size(dim + 1)) {
+                  return errors::DataLoss(
+                      "Attempted to pad to a smaller size than the input "
+                      "element.");
+                }
+              }
+            }
+          }
+
+          // 2. Copy each batch element to the appropriate location in
+          // the output component tensor.
+          Tensor batch_component(cpu_allocator(),
+                                 output_dtypes()[component_index],
+                                 batch_component_shape);
+          TF_RETURN_IF_ERROR(SetElementZero(
+              &batch_component, dataset()->padding_values_[component_index]));
+
+          // Build the output tuple component by copying one slice
+          // from each input element in the batch.
+          for (int64 i = 0; i < num_batch_elements; ++i) {
+            TF_RETURN_IF_ERROR(ValidateElementToLargerSlice(
+                batch_elements[i][component_index], &batch_component));
+
+            TF_RETURN_IF_ERROR(CopyElementToLargerSlice(
+                batch_elements[i][component_index], &batch_component, i));
+          }
+          out_tensors->push_back(std::move(batch_component));
+        }
+        *end_of_sequence = false;
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int64 i_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+    };
+
+    const int64 batch_size_;
+    const std::vector<PartialTensorShape> padded_shapes_;
+    const std::vector<Tensor> padding_values_;
+    const DatasetBase* const input_;
+    std::vector<PartialTensorShape> output_shapes_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("PaddedBatchDataset").Device(DEVICE_CPU),
+                        PaddedBatchDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/parallel_map_dataset_op.cc b/tensorflow/core/kernels/parallel_map_dataset_op.cc
new file mode 100644
index 0000000000..6b1214e660
--- /dev/null
+++ b/tensorflow/core/kernels/parallel_map_dataset_op.cc
@@ -0,0 +1,347 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include <deque>
+
+#include "tensorflow/core/kernels/dataset.h"
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/random.h"
+
+#include "tensorflow/core/kernels/captured_function.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class ParallelMapDatasetOp : public OpKernel {
+ public:
+  explicit ParallelMapDatasetOp(OpKernelConstruction* ctx)
+      : OpKernel(ctx), graph_def_version_(ctx->graph_def_version()) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("f", &func_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_types", &output_types_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("output_shapes", &output_shapes_));
+  }
+
+  void Compute(OpKernelContext* ctx) override {
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    OpInputList inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("other_arguments", &inputs));
+    std::vector<Tensor> other_arguments;
+    other_arguments.reserve(inputs.size());
+    for (const Tensor& t : inputs) {
+      other_arguments.push_back(t);
+    }
+
+    const Tensor* num_threads_t;
+    OP_REQUIRES_OK(ctx, ctx->input("num_threads", &num_threads_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(num_threads_t->shape()),
+                errors::InvalidArgument("num_threads must be a scalar"));
+    const int32 num_threads = num_threads_t->flat<int32>()(0);
+    OP_REQUIRES(
+        ctx, num_threads > 0,
+        errors::InvalidArgument("num_threads must be greater than zero."));
+
+    const Tensor* output_buffer_size_t;
+    OP_REQUIRES_OK(ctx,
+                   ctx->input("output_buffer_size", &output_buffer_size_t));
+    OP_REQUIRES(
+        ctx, TensorShapeUtils::IsScalar(output_buffer_size_t->shape()),
+        errors::InvalidArgument("output_buffer_size must be a scalar."));
+    const int64 output_buffer_size = output_buffer_size_t->flat<int64>()(0);
+
+    // TODO(mrry): Relax this requirement? If the output buffer owns
+    // the (tuples of) tensors into which `f` writes its output, it
+    // seems like this constraint would make it easier to (i)
+    // constrain the memory usage of the iterator, and (ii) enforce a
+    // consistent ordering between input and output.
+    OP_REQUIRES(ctx, output_buffer_size >= num_threads,
+                errors::InvalidArgument(
+                    "output_buffer_size (", output_buffer_size,
+                    ") must be greater than or equal to num_threads (",
+                    num_threads, ")."));
+
+    std::unique_ptr<CapturedFunction> captured_func;
+    OP_REQUIRES_OK(ctx, CapturedFunction::Create(ctx, func_, graph_def_version_,
+                                                 std::move(other_arguments),
+                                                 &captured_func));
+
+    // TODO(mrry): It seems unnatural to capture the params from *this
+    // kernel's* OpKernelContext, although the captured values should
+    // be the same for any kernel in the same session. Consider adding
+    // an IteratorContext* argument to Dataset::MakeIterator(), and
+    // threading the context information through that
+    // way. Alternatively, provide a session-scoped context that will
+    // provide this information to all users in the same session (and
+    // that will have the appropriate lifetime).
+    IteratorContext::Params params;
+    params.env = ctx->env();
+    params.resource_manager = ctx->resource_manager();
+    params.runner = *(ctx->runner());
+
+    DatasetBase* dataset =
+        new Dataset(input, num_threads, output_buffer_size, std::move(params),
+                    output_types_, output_shapes_, std::move(captured_func));
+
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(const DatasetBase* input, int32 num_threads,
+            int64 output_buffer_size, IteratorContext::Params ctx_params,
+            const DataTypeVector& output_types,
+            const std::vector<PartialTensorShape>& output_shapes,
+            std::unique_ptr<CapturedFunction> captured_func)
+        : input_(input),
+          num_threads_(num_threads),
+          output_buffer_size_(output_buffer_size),
+          ctx_params_(std::move(ctx_params)),
+          output_types_(output_types),
+          output_shapes_(output_shapes),
+          captured_func_(std::move(captured_func)) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return output_types_;
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override { return "ParallelMapDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            iter_ctx_(dataset->ctx_params_),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      ~Iterator() override {
+        // Signal the mapper threads, if any, so that they terminate.
+        // We will then join those threads when we delete
+        // `this->mapper_threads_`.
+        //
+        // TODO(mrry): Replace this cancellation logic with a
+        // CancellationManager. The syntax would be more heavyweight,
+        // but it would be possible to thread a cancellation manager
+        // through the IteratorContext to upstream,
+        // potentially-blocking iterators, when we add these.
+        {
+          mutex_lock l(output_mu_);
+          cancelled_ = true;
+          cond_var_.notify_all();
+        }
+      }
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(output_mu_);
+        TF_RETURN_IF_ERROR(EnsureMapperThreadsStarted(ctx));
+
+        while (true) {
+          // 1. Wait until the next element in the output queue has
+          // been produced, or we are shutting down.
+          while (
+              !cancelled_ && active_threads_ > 0 &&
+              (output_buffer_.empty() || !output_buffer_.front().is_produced)) {
+            cond_var_.wait(l);
+          }
+
+          if (cancelled_) {
+            return errors::Cancelled(
+                "ParallelMapDatasetOp::Dataset::Iterator::GetNext");
+          }
+
+          if (!output_buffer_.empty() && output_buffer_.front().is_produced) {
+            // A new output element is available. Forward the status
+            // from computing it, and (if we sucessfully got an
+            // element) the output values.
+            Status s = output_buffer_.front().output_status;
+            if (s.ok()) {
+              *out_tensors = std::move(output_buffer_.front().output_value);
+            }
+            output_buffer_.pop_front();
+            *end_of_sequence = false;
+
+            // Wake one of the producing threads, in case they have been
+            // waiting for space in the queue.
+            cond_var_.notify_one();
+            return s;
+          } else if (active_threads_ == 0) {
+            *end_of_sequence = true;
+            return Status::OK();
+          }
+        }
+      }
+
+     private:
+      // An output queue element comprises a bool (which indicates
+      // whether the element has been produced yet) and a vector of
+      // tensors (which contains the tuple of tensors if the bool is
+      // true).
+      struct OutputQueueElement {
+        // The producer must set `is_produced` to `true` after
+        // `output_status` or `output_value` has been written.
+        bool is_produced = false;
+        // The producer sets `output_status` if either getting the
+        // input element or applying the mapper function to it fails.
+        Status output_status;
+        // The mapped data element.
+        std::vector<Tensor> output_value;
+      };
+
+      Status EnsureMapperThreadsStarted(IteratorContext* ctx)
+          EXCLUSIVE_LOCKS_REQUIRED(output_mu_) {
+        if (mapper_threads_.empty()) {
+          // Choose a step ID that is guaranteed not to clash with any
+          // Session-generated step ID. DirectSession only generates
+          // non-negative step IDs (contiguous, starting from 0), and
+          // MasterSession generates 56-bit random step IDs whose MSB
+          // is always 0, so a negative random step ID should suffice.
+          f_opts_.step_id = -std::abs(static_cast<int64>(random::New64()));
+          f_opts_.runner = iter_ctx_.runner();
+
+          active_threads_ = dataset()->num_threads_;
+          for (int i = 0; i < dataset()->num_threads_; ++i) {
+            mapper_threads_.emplace_back(
+                std::unique_ptr<Thread>(ctx->env()->StartThread(
+                    {}, "mapper_thread", [this]() { MapperThread(); })));
+          }
+        }
+        return Status::OK();
+      }
+
+      void MapperThread() {
+        while (true) {
+          OutputQueueElement* output_queue_element_;
+
+          std::vector<Tensor> input_args;
+          std::vector<Tensor> output_value;
+
+          Status s;
+
+          // 1. Acquire a slot in the output queue and a corresponding input
+          // element.
+          {
+            // First acquire the input lock. Only one MapperThread may
+            // call GetNext() on the input iterator at a time, to
+            // preserve the ordering of elements.
+            mutex_lock input_lock(input_mu_);
+            {
+              // This MapperThread is now responsible for producing
+              // the next element in the output queue. We acquire a
+              // slot in the output queue atomically, which may block,
+              // but we deliberately do not release input_mu_ to
+              // prevent another MapperThread from overtaking us.
+              mutex_lock output_lock(output_mu_);
+              while (!cancelled_ &&
+                     output_buffer_.size() == dataset()->output_buffer_size_) {
+                cond_var_.wait(output_lock);
+              }
+
+              if (cancelled_) {
+                --active_threads_;
+                return;
+              }
+
+              output_buffer_.push_back(OutputQueueElement());
+              output_queue_element_ = &output_buffer_.back();
+            }
+
+            bool end_of_sequence;
+            s = input_impl_->GetNext(&iter_ctx_, &input_args, &end_of_sequence);
+            if (s.ok() && end_of_sequence) {
+              mutex_lock output_lock(output_mu_);
+              --active_threads_;
+              if (active_threads_ == 0) {
+                cond_var_.notify_all();
+              }
+              return;
+            }
+          }
+
+          if (s.ok()) {
+            s = dataset()->captured_func_->Run(f_opts_, input_args,
+                                               &output_value);
+          }
+
+          // 3. Signal that the element has been produced.
+          {
+            mutex_lock output_lock(output_mu_);
+            output_queue_element_->output_status.Update(s);
+            output_queue_element_->is_produced = true;
+            std::swap(output_queue_element_->output_value, output_value);
+            cond_var_.notify_all();
+          }
+        }
+      }
+
+      IteratorContext iter_ctx_;
+      mutex input_mu_;
+      const std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(input_mu_);
+      FunctionLibraryRuntime::Options f_opts_;
+      mutex output_mu_;
+      condition_variable cond_var_;
+      std::deque<OutputQueueElement> output_buffer_ GUARDED_BY(output_mu_);
+      std::vector<std::unique_ptr<Thread>> mapper_threads_
+          GUARDED_BY(output_mu_);
+      bool cancelled_ GUARDED_BY(output_mu_) = false;
+      int32 active_threads_ GUARDED_BY(output_mu_);
+    };
+
+    const DatasetBase* const input_;
+    const NameAttrList func_;
+    const int32 num_threads_;
+    const int64 output_buffer_size_;
+    const IteratorContext::Params ctx_params_;
+    const DataTypeVector output_types_;
+    const std::vector<PartialTensorShape> output_shapes_;
+    const std::unique_ptr<CapturedFunction> captured_func_;
+  };
+
+  const int graph_def_version_;
+  DataTypeVector output_types_;
+  std::vector<PartialTensorShape> output_shapes_;
+  const NameAttrList* func_;
+};
+
+REGISTER_KERNEL_BUILDER(Name("ParallelMapDataset").Device(DEVICE_CPU),
+                        ParallelMapDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/range_dataset_op.cc b/tensorflow/core/kernels/range_dataset_op.cc
new file mode 100644
index 0000000000..8cfd3a0a8f
--- /dev/null
+++ b/tensorflow/core/kernels/range_dataset_op.cc
@@ -0,0 +1,128 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class RangeDatasetOp : public OpKernel {
+ public:
+  explicit RangeDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    const Tensor* start_t;
+    OP_REQUIRES_OK(ctx, ctx->input("start", &start_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(start_t->shape()),
+                errors::InvalidArgument("start must be a scalar"));
+    const int64 start = start_t->flat<int64>()(0);
+
+    const Tensor* stop_t;
+    OP_REQUIRES_OK(ctx, ctx->input("stop", &stop_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(stop_t->shape()),
+                errors::InvalidArgument("stop must be a scalar"));
+    const int64 stop = stop_t->flat<int64>()(0);
+
+    const Tensor* step_t;
+    OP_REQUIRES_OK(ctx, ctx->input("step", &step_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(step_t->shape()),
+                errors::InvalidArgument("step must be a scalar"));
+    const int64 step = step_t->flat<int64>()(0);
+    OP_REQUIRES(ctx, step != 0,
+                errors::InvalidArgument("step must be a non-zero integer."));
+
+    DatasetBase* dataset = new Dataset(start, stop, step);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(int64 start, int64 stop, int64 step)
+        : start_(start), stop_(stop), step_(step) {}
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      static DataTypeVector* dtypes = new DataTypeVector({DT_INT64});
+      return *dtypes;
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      static std::vector<PartialTensorShape>* shapes =
+          new std::vector<PartialTensorShape>({{}});
+      return *shapes;
+    }
+
+    string DebugString() override {
+      return strings::StrCat("RangeDatasetOp(", start_, ", ", stop_, ", ",
+                             step_, ")::Dataset");
+    }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {
+        next_ = dataset->start_;
+      }
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        if ((dataset()->step_ > 0 && next_ >= dataset()->stop_) ||
+            (dataset()->step_ < 0 && next_ <= dataset()->stop_)) {
+          *end_of_sequence = true;
+          return Status::OK();
+        }
+        Tensor value_tensor(cpu_allocator(), DT_INT64, {});
+        value_tensor.scalar<int64>()() = next_;
+        out_tensors->emplace_back(std::move(value_tensor));
+        *end_of_sequence = false;
+        next_ += dataset()->step_;
+
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int64 next_;
+    };
+
+    const int64 start_;
+    const int64 stop_;
+    const int64 step_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("RangeDataset").Device(DEVICE_CPU),
+                        RangeDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/reader_dataset_ops.cc b/tensorflow/core/kernels/reader_dataset_ops.cc
new file mode 100644
index 0000000000..e0e90d0cce
--- /dev/null
+++ b/tensorflow/core/kernels/reader_dataset_ops.cc
@@ -0,0 +1,420 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/io/inputbuffer.h"
+#include "tensorflow/core/lib/io/record_reader.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following ops.
+
+class TextLineDatasetOp : public OpKernel {
+ public:
+  using OpKernel::OpKernel;
+
+  void Compute(OpKernelContext* ctx) override {
+    const Tensor* filenames_tensor;
+    OP_REQUIRES_OK(ctx, ctx->input("filenames", &filenames_tensor));
+    OP_REQUIRES(
+        ctx, filenames_tensor->dims() <= 1,
+        errors::InvalidArgument("`filenames` must be a scalar or a vector."));
+
+    std::vector<string> filenames;
+    filenames.reserve(filenames_tensor->NumElements());
+    for (int i = 0; i < filenames_tensor->NumElements(); ++i) {
+      filenames.push_back(filenames_tensor->flat<string>()(i));
+    }
+
+    DatasetBase* dataset = new Dataset(std::move(filenames));
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->scalar<ResourceHandle>()() = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    explicit Dataset(std::vector<string> filenames)
+        : filenames_(std::move(filenames)) {}
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      static DataTypeVector* dtypes = new DataTypeVector({DT_STRING});
+      return *dtypes;
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      static std::vector<PartialTensorShape>* shapes =
+          new std::vector<PartialTensorShape>({{}});
+      return *shapes;
+    }
+
+    string DebugString() override { return "TextLineDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        do {
+          // We are currently processing a file, so try to read the next line.
+          if (input_buffer_) {
+            string line_contents;
+            Status s = input_buffer_->ReadLine(&line_contents);
+            if (s.ok()) {
+              // Produce the line as output.
+              Tensor line_tensor(cpu_allocator(), DT_STRING, {});
+              line_tensor.scalar<string>()() = line_contents;
+              out_tensors->emplace_back(std::move(line_tensor));
+              *end_of_sequence = false;
+              return Status::OK();
+            } else if (!errors::IsOutOfRange(s)) {
+              // Report non-EOF errors to the caller.
+              return s;
+            }
+
+            // We have reached the end of the current file, so maybe
+            // move on to next file.
+            input_buffer_.reset();
+            file_.reset();
+            ++current_file_index_;
+          }
+
+          // Iteration ends when there are no more files to process.
+          if (current_file_index_ == dataset()->filenames_.size()) {
+            *end_of_sequence = true;
+            return Status::OK();
+          }
+
+          // Actually move on to next file.
+          TF_RETURN_IF_ERROR(ctx->env()->NewRandomAccessFile(
+              dataset()->filenames_[current_file_index_], &file_));
+          input_buffer_.reset(new io::InputBuffer(file_.get(), kBufferSize));
+        } while (true);
+      }
+
+     private:
+      // TODO(mrry): Make this configurable via an attr on the dataset op?
+      // Or maybe via a data input?
+      enum { kBufferSize = 256 << 10 /* 256 kB */ };
+
+      mutex mu_;
+      size_t current_file_index_ GUARDED_BY(mu_) = 0;
+      std::unique_ptr<RandomAccessFile> file_
+          GUARDED_BY(mu_);  // must outlive input_buffer_
+      std::unique_ptr<io::InputBuffer> input_buffer_ GUARDED_BY(mu_);
+    };
+
+    const std::vector<string> filenames_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("TextLineDataset").Device(DEVICE_CPU),
+                        TextLineDatasetOp);
+
+class FixedLengthRecordDatasetOp : public OpKernel {
+ public:
+  using OpKernel::OpKernel;
+
+  void Compute(OpKernelContext* ctx) override {
+    const Tensor* filenames_tensor;
+    OP_REQUIRES_OK(ctx, ctx->input("filenames", &filenames_tensor));
+    OP_REQUIRES(
+        ctx, filenames_tensor->dims() <= 1,
+        errors::InvalidArgument("`filenames` must be a scalar or a vector."));
+
+    std::vector<string> filenames;
+    filenames.reserve(filenames_tensor->NumElements());
+    for (int i = 0; i < filenames_tensor->NumElements(); ++i) {
+      filenames.push_back(filenames_tensor->flat<string>()(i));
+    }
+
+    const Tensor* header_bytes_tensor;
+    OP_REQUIRES_OK(ctx, ctx->input("header_bytes", &header_bytes_tensor));
+    OP_REQUIRES(ctx, header_bytes_tensor->dims() == 0,
+                errors::InvalidArgument("`header_bytes` must be a scalar."));
+    const int64 header_bytes = header_bytes_tensor->scalar<int64>()();
+
+    const Tensor* record_bytes_tensor;
+    OP_REQUIRES_OK(ctx, ctx->input("record_bytes", &record_bytes_tensor));
+    OP_REQUIRES(ctx, record_bytes_tensor->dims() == 0,
+                errors::InvalidArgument("`record_bytes` must be a scalar."));
+    const int64 record_bytes = record_bytes_tensor->scalar<int64>()();
+
+    const Tensor* footer_bytes_tensor;
+    OP_REQUIRES_OK(ctx, ctx->input("footer_bytes", &footer_bytes_tensor));
+    OP_REQUIRES(ctx, footer_bytes_tensor->dims() == 0,
+                errors::InvalidArgument("`footer_bytes` must be a scalar."));
+    const int64 footer_bytes = footer_bytes_tensor->scalar<int64>()();
+
+    DatasetBase* dataset = new Dataset(std::move(filenames), header_bytes,
+                                       record_bytes, footer_bytes);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->scalar<ResourceHandle>()() = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    explicit Dataset(std::vector<string> filenames, int64 header_bytes,
+                     int64 record_bytes, int64 footer_bytes)
+        : filenames_(std::move(filenames)),
+          header_bytes_(header_bytes),
+          record_bytes_(record_bytes),
+          footer_bytes_(footer_bytes) {}
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      static DataTypeVector* dtypes = new DataTypeVector({DT_STRING});
+      return *dtypes;
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      static std::vector<PartialTensorShape>* shapes =
+          new std::vector<PartialTensorShape>({{}});
+      return *shapes;
+    }
+
+    string DebugString() override {
+      return "FixedLengthRecordDatasetOp::Dataset";
+    }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        do {
+          // We are currently processing a file, so try to read the next record.
+          if (input_buffer_) {
+            const int64 current_pos = input_buffer_->Tell();
+            DCHECK_GE(file_pos_limit_, 0);
+            if (current_pos < file_pos_limit_) {
+              string record;
+              TF_RETURN_IF_ERROR(
+                  input_buffer_->ReadNBytes(dataset()->record_bytes_, &record));
+              // Produce the record as output.
+              Tensor record_tensor(cpu_allocator(), DT_STRING, {});
+              record_tensor.scalar<string>()() = record;
+              out_tensors->emplace_back(std::move(record_tensor));
+              *end_of_sequence = false;
+              return Status::OK();
+            }
+
+            // We have reached the end of the current file, so maybe
+            // move on to next file.
+            input_buffer_.reset();
+            file_.reset();
+            ++current_file_index_;
+          }
+
+          // Iteration ends when there are no more files to process.
+          if (current_file_index_ == dataset()->filenames_.size()) {
+            *end_of_sequence = true;
+            return Status::OK();
+          }
+
+          // Actually move on to next file.
+          uint64 file_size;
+          TF_RETURN_IF_ERROR(ctx->env()->GetFileSize(
+              dataset()->filenames_[current_file_index_], &file_size));
+          file_pos_limit_ = file_size - dataset()->footer_bytes_;
+          TF_RETURN_IF_ERROR(ctx->env()->NewRandomAccessFile(
+              dataset()->filenames_[current_file_index_], &file_));
+          input_buffer_.reset(new io::InputBuffer(file_.get(), kBufferSize));
+          TF_RETURN_IF_ERROR(
+              input_buffer_->SkipNBytes(dataset()->header_bytes_));
+        } while (true);
+      }
+
+     private:
+      // TODO(mrry): Make this configurable via an attr on the dataset op?
+      // Or maybe via a data input?
+      enum { kBufferSize = 256 << 10 /* 256 kB */ };
+
+      mutex mu_;
+      size_t current_file_index_ GUARDED_BY(mu_) = 0;
+      std::unique_ptr<RandomAccessFile> file_
+          GUARDED_BY(mu_);  // must outlive input_buffer_
+      std::unique_ptr<io::InputBuffer> input_buffer_ GUARDED_BY(mu_);
+      int64 file_pos_limit_ GUARDED_BY(mu_) = -1;
+    };
+
+    const std::vector<string> filenames_;
+    const int64 header_bytes_;
+    const int64 record_bytes_;
+    const int64 footer_bytes_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("FixedLengthRecordDataset").Device(DEVICE_CPU),
+                        FixedLengthRecordDatasetOp);
+
+class TFRecordDatasetOp : public OpKernel {
+ public:
+  using OpKernel::OpKernel;
+
+  void Compute(OpKernelContext* ctx) override {
+    const Tensor* filenames_tensor;
+    OP_REQUIRES_OK(ctx, ctx->input("filenames", &filenames_tensor));
+    OP_REQUIRES(
+        ctx, filenames_tensor->dims() <= 1,
+        errors::InvalidArgument("`filenames` must be a scalar or a vector."));
+
+    std::vector<string> filenames;
+    filenames.reserve(filenames_tensor->NumElements());
+    for (int i = 0; i < filenames_tensor->NumElements(); ++i) {
+      filenames.push_back(filenames_tensor->flat<string>()(i));
+    }
+
+    const Tensor* compression_type_tensor;
+    OP_REQUIRES_OK(ctx,
+                   ctx->input("compression_type", &compression_type_tensor));
+    OP_REQUIRES(
+        ctx, compression_type_tensor->dims() == 0,
+        errors::InvalidArgument("`compression_type` must be a scalar."));
+    const string& compression_type =
+        compression_type_tensor->scalar<string>()();
+
+    DatasetBase* dataset = new Dataset(std::move(filenames), compression_type);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->scalar<ResourceHandle>()() = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    explicit Dataset(std::vector<string> filenames,
+                     const string& compression_type)
+        : filenames_(std::move(filenames)),
+          options_(io::RecordReaderOptions::CreateRecordReaderOptions(
+              compression_type)) {}
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      static DataTypeVector* dtypes = new DataTypeVector({DT_STRING});
+      return *dtypes;
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      static std::vector<PartialTensorShape>* shapes =
+          new std::vector<PartialTensorShape>({{}});
+      return *shapes;
+    }
+
+    string DebugString() override { return "TFRecordDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        do {
+          // We are currently processing a file, so try to read the next record.
+          if (reader_) {
+            Tensor result_tensor(cpu_allocator(), DT_STRING, {});
+            Status s = reader_->ReadRecord(&offset_,
+                                           &result_tensor.scalar<string>()());
+            if (s.ok()) {
+              out_tensors->emplace_back(std::move(result_tensor));
+              *end_of_sequence = false;
+              return Status::OK();
+            } else if (!errors::IsOutOfRange(s)) {
+              return s;
+            }
+
+            // We have reached the end of the current file, so maybe
+            // move on to next file.
+            reader_.reset();
+            file_.reset();
+            ++current_file_index_;
+          }
+
+          // Iteration ends when there are no more files to process.
+          if (current_file_index_ == dataset()->filenames_.size()) {
+            *end_of_sequence = true;
+            return Status::OK();
+          }
+
+          // Actually move on to next file.
+          const string& next_filename =
+              dataset()->filenames_[current_file_index_];
+          TF_RETURN_IF_ERROR(
+              ctx->env()->NewRandomAccessFile(next_filename, &file_));
+          reader_.reset(new io::RecordReader(file_.get(), dataset()->options_));
+          offset_ = 0;
+        } while (true);
+      }
+
+     private:
+      mutex mu_;
+      size_t current_file_index_ GUARDED_BY(mu_) = 0;
+      uint64 offset_ GUARDED_BY(mu_) = 0;
+
+      // `reader_` will borrow the object that `file_` points to, so
+      // we must destroy `reader_` before `file_`.
+      std::unique_ptr<RandomAccessFile> file_ GUARDED_BY(mu_);
+      std::unique_ptr<io::RecordReader> reader_ GUARDED_BY(mu_);
+    };
+
+    const std::vector<string> filenames_;
+    io::RecordReaderOptions options_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("TFRecordDataset").Device(DEVICE_CPU),
+                        TFRecordDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/repeat_dataset_op.cc b/tensorflow/core/kernels/repeat_dataset_op.cc
new file mode 100644
index 0000000000..9bf4039fb7
--- /dev/null
+++ b/tensorflow/core/kernels/repeat_dataset_op.cc
@@ -0,0 +1,174 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class RepeatDatasetOp : public OpKernel {
+ public:
+  explicit RepeatDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new RepeatDatasetOp::Dataset, insert it in the step-local
+    // container, and return it as the output.
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    const Tensor* count_t;
+    OP_REQUIRES_OK(ctx, ctx->input("count", &count_t));
+    const int64 count = count_t->flat<int64>()(0);
+
+    DatasetBase* dataset = new Dataset(count, input);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(int64 count, const DatasetBase* input)
+        : count_(count), input_(input) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      if (count_ < 0) {
+        return std::unique_ptr<IteratorBase>(new ForeverIterator(this));
+      } else if (count_ == 0) {
+        return std::unique_ptr<IteratorBase>(new EmptyIterator(this));
+      } else {
+        return std::unique_ptr<IteratorBase>(new FiniteIterator(this));
+      }
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return input_->output_dtypes();
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return input_->output_shapes();
+    }
+
+    string DebugString() override { return "RepeatDatasetOp::Dataset"; }
+
+   private:
+    class EmptyIterator : public DatasetIterator<Dataset> {
+     public:
+      explicit EmptyIterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {}
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        *end_of_sequence = true;
+        return Status::OK();
+      }
+    };
+
+    class FiniteIterator : public DatasetIterator<Dataset> {
+     public:
+      explicit FiniteIterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            i_(0),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);  // TODO(mrry): Make locking less conservative.
+        while (i_ < dataset()->count_) {
+          TF_RETURN_IF_ERROR(
+              input_impl_->GetNext(ctx, out_tensors, end_of_sequence));
+          if (!*end_of_sequence) {
+            return Status::OK();
+          }
+          ++i_;
+          input_impl_ = dataset()->input_->MakeIterator();
+        }
+        *end_of_sequence = true;
+        input_impl_.reset();
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int64 i_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+    };
+
+    class ForeverIterator : public DatasetIterator<Dataset> {
+     public:
+      explicit ForeverIterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset), input_impl_(nullptr) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);  // TODO(mrry): Make locking less conservative.
+        do {
+          if (!input_impl_) {
+            input_impl_ = dataset()->input_->MakeIterator();
+            TF_RETURN_IF_ERROR(
+                input_impl_->GetNext(ctx, out_tensors, end_of_sequence));
+            // If the first call to GetNext() fails because the end of
+            // sequence has been reached, we return an OutOfRange
+            // error to terminate the iteration. (Otherwise, this
+            // iterator would loop infinitely and never produce a
+            // value.)
+            if (!*end_of_sequence) {
+              return Status::OK();
+            } else {
+              input_impl_.reset();
+              return errors::OutOfRange(
+                  "Attempted to repeat an empty dataset infinitely.");
+            }
+          } else {
+            TF_RETURN_IF_ERROR(
+                input_impl_->GetNext(ctx, out_tensors, end_of_sequence));
+            if (!*end_of_sequence) {
+              return Status::OK();
+            } else {
+              input_impl_.reset();
+            }
+          }
+        } while (true);
+      }
+
+     private:
+      mutex mu_;
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+    };
+
+    const int64 count_;
+    const DatasetBase* const input_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("RepeatDataset").Device(DEVICE_CPU),
+                        RepeatDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/shuffle_dataset_op.cc b/tensorflow/core/kernels/shuffle_dataset_op.cc
new file mode 100644
index 0000000000..c7f5cee3af
--- /dev/null
+++ b/tensorflow/core/kernels/shuffle_dataset_op.cc
@@ -0,0 +1,167 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/random/philox_random.h"
+#include "tensorflow/core/lib/random/random.h"
+#include "tensorflow/core/lib/random/random_distributions.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class ShuffleDatasetOp : public OpKernel {
+ public:
+  explicit ShuffleDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new ShuffleDatasetOp::Dataset, insert it in the step-local
+    // container, and return it as the output.
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    const Tensor* buffer_size_t;
+    OP_REQUIRES_OK(ctx, ctx->input("buffer_size", &buffer_size_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(buffer_size_t->shape()),
+                errors::InvalidArgument("buffer_size must be a scalar"));
+    const int64 buffer_size = buffer_size_t->flat<int64>()(0);
+    OP_REQUIRES(
+        ctx, buffer_size > 0,
+        errors::InvalidArgument("buffer_size must be greater than zero."));
+
+    const Tensor* seed_t;
+    OP_REQUIRES_OK(ctx, ctx->input("seed", &seed_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(seed_t->shape()),
+                errors::InvalidArgument("seed must be a scalar"));
+    const int64 seed = seed_t->flat<int64>()(0);
+
+    const Tensor* seed2_t;
+    OP_REQUIRES_OK(ctx, ctx->input("seed2", &seed2_t));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsScalar(seed2_t->shape()),
+                errors::InvalidArgument("seed2 must be a scalar"));
+    const int64 seed2 = seed2_t->flat<int64>()(0);
+
+    DatasetBase* dataset = new Dataset(input, buffer_size, seed, seed2);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(const DatasetBase* input, int64 buffer_size, int64 seed,
+            int64 seed2)
+        : input_(input), buffer_size_(buffer_size), seed_(seed), seed2_(seed2) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return input_->output_dtypes();
+    }
+
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return input_->output_shapes();
+    }
+
+    string DebugString() override {
+      return strings::StrCat("ShuffleDatasetOp(", buffer_size_, ", ", seed_,
+                             ", ", seed2_, ")::Dataset");
+    }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            input_impl_(dataset->input_->MakeIterator()),
+            generator_(&parent_generator_) {
+        buffer_.reserve(dataset->buffer_size_);
+        int64 seed = dataset->seed_;
+        int64 seed2 = dataset->seed2_;
+        if (seed == 0 && seed2 == 0) {
+          // If both seeds are unspecified, use completely random seeds.
+          seed = random::New64();
+          seed2 = random::New64();
+        }
+        parent_generator_ = random::PhiloxRandom(seed, seed2);
+      }
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        while (!end_of_input_sequence_ &&
+               buffer_.size() < dataset()->buffer_size_) {
+          std::vector<Tensor> input_element;
+          TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, &input_element,
+                                                  &end_of_input_sequence_));
+          if (!end_of_input_sequence_) {
+            buffer_.emplace_back(std::move(input_element));
+          }
+        }
+
+        if (buffer_.size() > 0) {
+          *end_of_sequence = false;
+          // Choose an element to produce uniformly at random, and
+          // swap the last element into its place in the buffer.
+          int64 index = generator_() % buffer_.size();
+          *out_tensors = std::move(buffer_[index]);
+          std::swap(buffer_[index], buffer_.back());
+          buffer_.pop_back();
+        } else {
+          DCHECK(end_of_input_sequence_);
+          *end_of_sequence = true;
+        }
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      std::vector<std::vector<Tensor>> buffer_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+      bool end_of_input_sequence_ GUARDED_BY(mu_) = false;
+      random::PhiloxRandom parent_generator_ GUARDED_BY(mu_);
+      random::SingleSampleAdapter<random::PhiloxRandom> generator_
+          GUARDED_BY(mu_);
+    };
+
+    const DatasetBase* const input_;
+    const int64 buffer_size_;
+    const int64 seed_;
+    const int64 seed2_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("ShuffleDataset").Device(DEVICE_CPU),
+                        ShuffleDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/skip_dataset_op.cc b/tensorflow/core/kernels/skip_dataset_op.cc
new file mode 100644
index 0000000000..06c9d8c6ec
--- /dev/null
+++ b/tensorflow/core/kernels/skip_dataset_op.cc
@@ -0,0 +1,143 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class SkipDatasetOp : public OpKernel {
+ public:
+  explicit SkipDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new RepeatDatasetOp::Dataset, insert it in the step-local
+    // container, and return it as the output.
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    const Tensor* count_t;
+    OP_REQUIRES_OK(ctx, ctx->input("count", &count_t));
+    const int64 count = count_t->flat<int64>()(0);
+
+    DatasetBase* dataset = new Dataset(count, input);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(int64 count, const DatasetBase* input)
+        : count_(count), input_(input) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      if (count_ < 0) {
+        return std::unique_ptr<IteratorBase>(new EmptyIterator(this));
+      }  else if (count_ == 0) {
+        // Pass through.
+        return input_->MakeIterator();
+      } else {
+        return std::unique_ptr<IteratorBase>(new FiniteIterator(this));
+      }
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return input_->output_dtypes();
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return input_->output_shapes();
+    }
+
+    string DebugString() override { return "SkipDatasetOp::Dataset"; }
+
+   private:
+    class EmptyIterator : public DatasetIterator<Dataset> {
+     public:
+      explicit EmptyIterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {}
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        *end_of_sequence = true;
+        return Status::OK();
+      }
+    };
+
+    class FiniteIterator : public DatasetIterator<Dataset> {
+     public:
+      explicit FiniteIterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            i_(0),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);  // TODO(mrry): Make locking less conservative.
+
+        // Keep calling GetNext().  TODO(vrv): Figure out a way to
+        // skip records without reading, perhaps by adding an
+        // interface to iterator.
+        while (i_ < dataset()->count_) {
+          // Fetch and throw away Tensors.
+          std::vector<Tensor> dummy_out_tensors;
+          TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, &dummy_out_tensors,
+                                                  end_of_sequence));
+          if (*end_of_sequence) {
+            // We reached the end before the count was reached.
+            input_impl_.reset();
+            return Status::OK();
+          }
+
+          ++i_;
+        }
+
+        // Return GetNext() on the underlying iterator.
+        TF_RETURN_IF_ERROR(input_impl_->GetNext(ctx, out_tensors,
+                                                end_of_sequence));
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int64 i_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+    };
+
+    const int64 count_;
+    const DatasetBase* const input_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("SkipDataset").Device(DEVICE_CPU),
+                        SkipDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc b/tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc
new file mode 100644
index 0000000000..e456afa854
--- /dev/null
+++ b/tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc
@@ -0,0 +1,223 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include <numeric>
+
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/util/sparse/sparse_tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+template <typename T>
+class Dataset : public DatasetBase {
+ public:
+  explicit Dataset(const sparse::SparseTensor& sparse_tensor)
+      : sparse_tensor_(sparse_tensor),
+        dtypes_({DT_INT64, sparse_tensor.dtype(), DT_INT64}),
+        shapes_({{-1, sparse_tensor.dims() - 1},
+                 {-1},
+                 {sparse_tensor.dims() - 1}}) {}
+
+  std::unique_ptr<IteratorBase> MakeIterator() const override {
+    return std::unique_ptr<IteratorBase>(new Iterator(this));
+  }
+
+  const DataTypeVector& output_dtypes() const override { return dtypes_; }
+  const std::vector<PartialTensorShape>& output_shapes() const override {
+    return shapes_;
+  }
+
+  string DebugString() override {
+    return "SparseTensorSliceDatasetOp::Dataset";
+  }
+
+ private:
+  class Iterator : public DatasetIterator<Dataset<T>> {
+   public:
+    explicit Iterator(const Dataset<T>* dataset)
+        : DatasetIterator<Dataset<T>>(dataset),
+          dataset_(dataset),
+          num_elements_(dataset->sparse_tensor_.shape().dim_size(0)),
+          dense_shape_(DT_INT64, {dataset->sparse_tensor_.dims() - 1}),
+          group_iterable_(dataset->sparse_tensor_.group({0})),
+          iter_(group_iterable_.begin()) {
+      for (size_t i = 0; i < dense_shape_.NumElements(); ++i) {
+        dense_shape_.vec<int64>()(i) =
+            dataset_->sparse_tensor_.shape().dim_size(i + 1);
+      }
+    }
+
+    Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                   bool* end_of_sequence) override {
+      mutex_lock l(mu_);
+      if (i_ == num_elements_) {
+        *end_of_sequence = true;
+        return Status::OK();
+      }
+
+      out_tensors->clear();
+      out_tensors->reserve(3);
+      const int rank = dataset_->sparse_tensor_.dims();
+
+      if (i_ > next_non_empty_i_ && iter_ != group_iterable_.end()) {
+        // We still have elements to consume from `group_iterable_`
+        // and we have emitted all elements up to and including the
+        // current position.
+        sparse::Group group = *iter_;
+        const auto indices = group.indices();
+        const auto values = group.values<T>();
+        const int64 num_entries = values.size();
+        next_non_empty_i_ = indices(0, 0);
+
+        next_indices_ = Tensor(DT_INT64, {num_entries, rank - 1});
+        next_values_ = Tensor(DataTypeToEnum<T>::value, {num_entries});
+
+        auto next_indices_t = next_indices_.matrix<int64>();
+        auto next_values_t = next_values_.vec<T>();
+
+        for (int64 i = 0; i < num_entries; ++i) {
+          for (int d = 1; d < rank; ++d) {
+            next_indices_t(i, d - 1) = indices(i, d);
+          }
+          next_values_t(i) = values(i);
+        }
+
+        ++iter_;
+      }
+
+      if (i_ == next_non_empty_i_) {
+        // The current position is non-empty in the input
+        // `SparseTensor`, and we have already read the value from the
+        // `GroupIterable`.
+        out_tensors->push_back(std::move(next_indices_));
+        out_tensors->push_back(std::move(next_values_));
+        out_tensors->push_back(dense_shape_);
+        next_non_empty_i_ = kNextNonEmptyUnknown;
+      } else {
+        DCHECK(i_ < next_non_empty_i_ || iter_ == group_iterable_.end());
+        // The current position is empty in the input `SparseTensor`,
+        // so emit empty indices and values.
+        out_tensors->push_back(Tensor(DT_INT64, TensorShape({0, rank - 1})));
+        out_tensors->push_back(Tensor(DataTypeToEnum<T>::value, {0}));
+        out_tensors->push_back(dense_shape_);
+      }
+
+      ++i_;
+      *end_of_sequence = false;
+      return Status::OK();
+    }
+
+   private:
+    const Dataset<T>* const dataset_;
+    const int64 num_elements_;
+
+    Tensor dense_shape_;
+
+    mutex mu_;
+    sparse::GroupIterable group_iterable_ GUARDED_BY(mu_);
+    sparse::GroupIterable::IteratorStep iter_ GUARDED_BY(mu_);
+    int64 i_ GUARDED_BY(mu_) = 0;
+    const int64 kNextNonEmptyUnknown = -1;
+    int64 next_non_empty_i_ GUARDED_BY(mu_) = kNextNonEmptyUnknown;
+    Tensor next_indices_ GUARDED_BY(mu_);
+    Tensor next_values_ GUARDED_BY(mu_);
+  };
+
+  const sparse::SparseTensor sparse_tensor_;
+  const DataTypeVector dtypes_;
+  const std::vector<PartialTensorShape> shapes_;
+};
+
+template <typename T>
+class SparseTensorSliceDatasetOp : public OpKernel {
+ public:
+  explicit SparseTensorSliceDatasetOp(OpKernelConstruction* ctx)
+      : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new SparseTensorSliceDatasetOp::Dataset, insert it in
+    // the step container, and return it as the output.
+    const Tensor* indices;
+    OP_REQUIRES_OK(ctx, ctx->input("indices", &indices));
+    const Tensor* values;
+    OP_REQUIRES_OK(ctx, ctx->input("values", &values));
+    const Tensor* dense_shape;
+    OP_REQUIRES_OK(ctx, ctx->input("dense_shape", &dense_shape));
+
+    OP_REQUIRES(ctx, TensorShapeUtils::IsMatrix(indices->shape()),
+                errors::InvalidArgument(
+                    "Input indices should be a matrix but received shape ",
+                    indices->shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsVector(values->shape()),
+                errors::InvalidArgument(
+                    "Input values should be a vector but received shape ",
+                    indices->shape().DebugString()));
+    OP_REQUIRES(ctx, TensorShapeUtils::IsVector(dense_shape->shape()),
+                errors::InvalidArgument(
+                    "Input shape should be a vector but received shape ",
+                    dense_shape->shape().DebugString()));
+
+    // We currently ensure that `sparse_tensor` is ordered in the
+    // batch dimension.
+    // TODO(mrry): Investigate ways to avoid this unconditional check
+    // if we can be sure that the sparse tensor was produced in an
+    // appropriate order (e.g. by `tf.parse_example()` or a Dataset
+    // that batches elements into rows of a SparseTensor).
+    int64 previous_batch_index = -1;
+    for (int64 i = 0; i < indices->dim_size(0); ++i) {
+      int64 next_batch_index = indices->matrix<int64>()(i, 0);
+      OP_REQUIRES(
+          ctx, next_batch_index >= previous_batch_index,
+          errors::Unimplemented("The SparseTensor must be ordered in the batch "
+                                "dimension; handling arbitrarily ordered input "
+                                "is not currently supported."));
+      previous_batch_index = next_batch_index;
+    }
+    gtl::InlinedVector<int64, 8> std_order(dense_shape->NumElements(), 0);
+    sparse::SparseTensor sparse_tensor(
+        *indices, *values, TensorShape(dense_shape->vec<int64>()), std_order);
+
+    DatasetBase* dataset = new Dataset<T>(sparse_tensor);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+};
+
+#define REGISTER_DATASET_KERNEL(type)                           \
+  REGISTER_KERNEL_BUILDER(Name("SparseTensorSliceDataset")      \
+                              .Device(DEVICE_CPU)               \
+                              .TypeConstraint<type>("Tvalues"), \
+                          SparseTensorSliceDatasetOp<type>);
+
+TF_CALL_ALL_TYPES(REGISTER_DATASET_KERNEL);
+#undef REGISTER_DATASET_KERNEL
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/take_dataset_op.cc b/tensorflow/core/kernels/take_dataset_op.cc
new file mode 100644
index 0000000000..7e2eb6ae49
--- /dev/null
+++ b/tensorflow/core/kernels/take_dataset_op.cc
@@ -0,0 +1,132 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class TakeDatasetOp : public OpKernel {
+ public:
+  explicit TakeDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new RepeatDatasetOp::Dataset, insert it in the step-local
+    // container, and return it as the output.
+    DatasetBase* input;
+    OP_REQUIRES_OK(ctx, LookupResource(ctx, HandleFromInput(ctx, 0), &input));
+    core::ScopedUnref unref_input(input);
+
+    const Tensor* count_t;
+    OP_REQUIRES_OK(ctx, ctx->input("count", &count_t));
+    const int64 count = count_t->flat<int64>()(0);
+
+    DatasetBase* dataset = new Dataset(count, input);
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    Dataset(int64 count, const DatasetBase* input)
+        : count_(count), input_(input) {
+      input_->Ref();
+    }
+
+    ~Dataset() override { input_->Unref(); }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      if (count_ < 0) {
+        return input_->MakeIterator();
+      } else if (count_ == 0) {
+        return std::unique_ptr<IteratorBase>(new EmptyIterator(this));
+      } else {
+        return std::unique_ptr<IteratorBase>(new FiniteIterator(this));
+      }
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return input_->output_dtypes();
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return input_->output_shapes();
+    }
+
+    string DebugString() override { return "TakeDatasetOp::Dataset"; }
+
+   private:
+    class EmptyIterator : public DatasetIterator<Dataset> {
+     public:
+      explicit EmptyIterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {}
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        *end_of_sequence = true;
+        return Status::OK();
+      }
+    };
+
+    class FiniteIterator : public DatasetIterator<Dataset> {
+     public:
+      explicit FiniteIterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            i_(0),
+            input_impl_(dataset->input_->MakeIterator()) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);  // TODO(mrry): Make locking less conservative.
+        while (i_ < dataset()->count_) {
+          TF_RETURN_IF_ERROR(
+              input_impl_->GetNext(ctx, out_tensors, end_of_sequence));
+          if (!*end_of_sequence) {
+            ++i_;
+            return Status::OK();
+          }
+          break;
+        }
+        *end_of_sequence = true;
+        input_impl_.reset();
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int64 i_ GUARDED_BY(mu_);
+      std::unique_ptr<IteratorBase> input_impl_ GUARDED_BY(mu_);
+    };
+
+    const int64 count_;
+    const DatasetBase* const input_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("TakeDataset").Device(DEVICE_CPU),
+                        TakeDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/tensor_dataset_op.cc b/tensorflow/core/kernels/tensor_dataset_op.cc
new file mode 100644
index 0000000000..ee0e00ee59
--- /dev/null
+++ b/tensorflow/core/kernels/tensor_dataset_op.cc
@@ -0,0 +1,110 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class TensorDatasetOp : public OpKernel {
+ public:
+  explicit TensorDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new TensorDatasetOp::Dataset, insert it in the step
+    // container, and return it as the output.
+    OpInputList inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("components", &inputs));
+    // TODO(mrry): Validate that the shapes of the "components" tensors match
+    // the "shapes" attr.;
+    std::vector<Tensor> components;
+    components.reserve(inputs.size());
+    for (const Tensor& t : inputs) {
+      components.push_back(t);
+    }
+    DatasetBase* dataset = new Dataset(std::move(components));
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    explicit Dataset(std::vector<Tensor> tensors)
+        : tensors_(std::move(tensors)) {
+      for (const Tensor& t : tensors_) {
+        dtypes_.push_back(t.dtype());
+        shapes_.emplace_back(t.shape().dim_sizes());
+      }
+    }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override { return dtypes_; }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return shapes_;
+    }
+
+    string DebugString() override { return "TensorDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset), produced_(false) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        if (!produced_) {
+          *out_tensors = dataset()->tensors_;
+          produced_ = true;
+          *end_of_sequence = false;
+          return Status::OK();
+        } else {
+          *end_of_sequence = true;
+          return Status::OK();
+        }
+      }
+
+     private:
+      mutex mu_;
+      bool produced_ GUARDED_BY(mu_);
+    };
+
+    const std::vector<Tensor> tensors_;
+    DataTypeVector dtypes_;
+    std::vector<PartialTensorShape> shapes_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("TensorDataset").Device(DEVICE_CPU),
+                        TensorDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/tensor_slice_dataset_op.cc b/tensorflow/core/kernels/tensor_slice_dataset_op.cc
new file mode 100644
index 0000000000..982ea44659
--- /dev/null
+++ b/tensorflow/core/kernels/tensor_slice_dataset_op.cc
@@ -0,0 +1,185 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class TensorSliceDatasetOp : public OpKernel {
+ public:
+  explicit TensorSliceDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    // Create a new TensorDatasetOp::Dataset, insert it in the step
+    // container, and return it as the output.
+    OpInputList inputs;
+    OP_REQUIRES_OK(ctx, ctx->input_list("components", &inputs));
+    std::vector<Tensor> components;
+    components.reserve(inputs.size());
+    OP_REQUIRES(ctx, inputs[0].dims() > 0,
+                errors::InvalidArgument(
+                    "All components must be at least 1-dimensional"));
+    const int64 num_slices = inputs[0].dim_size(0);
+    for (const Tensor& t : inputs) {
+      components.push_back(t);
+      OP_REQUIRES(ctx, t.dims() > 0,
+                  errors::InvalidArgument(
+                      "All components must be at least 1-dimensional"));
+      OP_REQUIRES(
+          ctx, t.dim_size(0) == num_slices,
+          errors::InvalidArgument(
+              "All components must have the same size in the 0th dimension"));
+    }
+    DatasetBase* dataset = new Dataset(std::move(components));
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}), &output));
+    ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+        ctx, ctx->step_container()->name(), name());
+    OP_REQUIRES_OK(ctx, CreateResource(ctx, handle, dataset));
+    output->flat<ResourceHandle>()(0) = handle;
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    explicit Dataset(std::vector<Tensor> tensors)
+        : tensors_(std::move(tensors)) {
+      for (const Tensor& t : tensors_) {
+        dtypes_.push_back(t.dtype());
+        gtl::InlinedVector<int64, 4> partial_dim_sizes;
+        // Handle scalar here. Check that everyone matches here? Or fail
+        // at runtime?
+        for (int i = 1; i < t.dims(); ++i) {
+          partial_dim_sizes.push_back(t.dim_size(i));
+        }
+        shapes_.emplace_back(std::move(partial_dim_sizes));
+      }
+    }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override { return dtypes_; }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return shapes_;
+    }
+
+    string DebugString() override { return "TensorSliceDatasetOp::Dataset"; }
+
+   private:
+    template <DataType DT>
+    static Status HandleSliceToElement(const Tensor& parent, Tensor* element,
+                                       int64 index) {
+      typedef typename EnumToDataType<DT>::Type T;
+      DCHECK_NE(parent.dim_size(0), 0);
+      DCHECK_GE(index, 0);
+      if (element->NumElements() !=
+          (parent.NumElements() / parent.dim_size(0))) {
+        TensorShape chip_shape = parent.shape();
+        chip_shape.RemoveDim(0);
+        return errors::Internal(
+            "HandleSliceToElement Cannot copy slice: number of elements does "
+            "not match.  Shapes are: [element]: ",
+            element->shape().DebugString(), ", [parent slice]: ",
+            chip_shape.DebugString());
+      }
+      auto parent_as_matrix = parent.flat_outer_dims<T>();
+      element->flat<T>() = parent_as_matrix.chip(index, 0);
+      return Status::OK();
+    }
+
+    static Status CopySliceToElement(const Tensor& parent, Tensor* element,
+                                     int64 index) {
+#define HANDLE_TYPE(DT)                                                   \
+  if (parent.dtype() == DT) {                                             \
+    TF_RETURN_IF_ERROR(HandleSliceToElement<DT>(parent, element, index)); \
+    return Status::OK();                                                  \
+  }
+      HANDLE_TYPE(DT_FLOAT);
+      HANDLE_TYPE(DT_HALF);
+      HANDLE_TYPE(DT_DOUBLE);
+      HANDLE_TYPE(DT_INT32);
+      HANDLE_TYPE(DT_UINT8);
+      HANDLE_TYPE(DT_INT16);
+      HANDLE_TYPE(DT_INT8);
+      HANDLE_TYPE(DT_STRING);
+      HANDLE_TYPE(DT_COMPLEX64);
+      HANDLE_TYPE(DT_COMPLEX128);
+      HANDLE_TYPE(DT_INT64);
+      HANDLE_TYPE(DT_BOOL);
+      HANDLE_TYPE(DT_QINT8);
+      HANDLE_TYPE(DT_QUINT8);
+      HANDLE_TYPE(DT_QINT32);
+      HANDLE_TYPE(DT_QINT16);
+      HANDLE_TYPE(DT_QUINT16);
+#undef HANDLE_TYPE
+      return errors::Unimplemented("CopySliceToElement Unhandled data type: ",
+                                   element->dtype());
+    }
+
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset),
+            i_(0),
+            n_(dataset->tensors_[0].dim_size(0)) {}
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        if (i_ < n_) {
+          out_tensors->clear();
+          out_tensors->reserve(dataset()->tensors_.size());
+          for (int i = 0; i < dataset()->tensors_.size(); ++i) {
+            const Tensor& t = dataset()->tensors_[i];
+            Tensor t_slice(cpu_allocator(), t.dtype(),
+                           TensorShape(dataset()->shapes_[i].dim_sizes()));
+            TF_RETURN_IF_ERROR(CopySliceToElement(t, &t_slice, i_));
+            out_tensors->emplace_back(std::move(t_slice));
+          }
+          ++i_;
+          *end_of_sequence = false;
+        } else {
+          *end_of_sequence = true;
+        }
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      int i_ GUARDED_BY(mu_);
+      const int n_;
+    };
+
+    const std::vector<Tensor> tensors_;
+    DataTypeVector dtypes_;
+    std::vector<PartialTensorShape> shapes_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("TensorSliceDataset").Device(DEVICE_CPU),
+                        TensorSliceDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/window_dataset.cc b/tensorflow/core/kernels/window_dataset.cc
new file mode 100644
index 0000000000..8396d9b700
--- /dev/null
+++ b/tensorflow/core/kernels/window_dataset.cc
@@ -0,0 +1,80 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/window_dataset.h"
+
+namespace tensorflow {
+namespace {
+
+class WindowDataset : public DatasetBase {
+ public:
+  WindowDataset(std::vector<std::vector<Tensor>> elements,
+                DataTypeVector output_types,
+                std::vector<PartialTensorShape> output_shapes)
+      : elements_(std::move(elements)),
+        output_types_(std::move(output_types)),
+        output_shapes_(std::move(output_shapes)) {}
+
+  std::unique_ptr<IteratorBase> MakeIterator() const override {
+    return std::unique_ptr<IteratorBase>(new Iterator(this));
+  }
+
+  const DataTypeVector& output_dtypes() const override { return output_types_; }
+  const std::vector<PartialTensorShape>& output_shapes() const override {
+    return output_shapes_;
+  }
+
+  string DebugString() override { return "WindowDataset"; }
+
+ private:
+  class Iterator : public DatasetIterator<WindowDataset> {
+   public:
+    explicit Iterator(const WindowDataset* dataset)
+        : DatasetIterator<WindowDataset>(dataset) {}
+
+    Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                   bool* end_of_sequence) override {
+      mutex_lock l(mu_);
+      if (i_ == dataset()->elements_.size()) {
+        *end_of_sequence = true;
+      } else {
+        *end_of_sequence = false;
+        *out_tensors = dataset()->elements_[i_++];
+      }
+      return Status::OK();
+    }
+
+    mutex mu_;
+    size_t i_ GUARDED_BY(mu_) = 0;
+  };
+
+  const std::vector<std::vector<Tensor>> elements_;
+  const DataTypeVector output_types_;
+  const std::vector<PartialTensorShape> output_shapes_;
+};
+
+}  // namespace
+
+Status NewWindowDataset(std::vector<std::vector<Tensor>> elements,
+                        DataTypeVector output_types,
+                        std::vector<PartialTensorShape> output_shapes,
+                        DatasetBase** out_dataset) {
+  // TODO(mrry): If this becomes more public, we must validate that
+  // the elements match the output_types and output_shapes.
+  *out_dataset = new WindowDataset(std::move(elements), std::move(output_types),
+                                   std::move(output_shapes));
+  return Status::OK();
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/window_dataset.h b/tensorflow/core/kernels/window_dataset.h
new file mode 100644
index 0000000000..a4fccf17b4
--- /dev/null
+++ b/tensorflow/core/kernels/window_dataset.h
@@ -0,0 +1,48 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_WINDOW_DATASET_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_WINDOW_DATASET_H_
+
+#include <vector>
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/dataset.h"
+
+namespace tensorflow {
+
+// Creates a dataset representing an eagerly-collected window of elements.
+//
+// The `elements` argument defines the elements of the resulting
+// dataset, which is stored in `out_dataset`.
+//
+// This dataset is constructed internally for use in datasets that
+// build nested dataset expressions (e.g. the reducer function for
+// GroupByBatchDataset). It efficiently supports multiple iterators on
+// the same window without recomputation.
+//
+// REQUIRES: `output_types` must match the types of the respective
+// element components in `elements`.
+// REQUIRES: `output_shapes` must be compatible with the shapes of the
+// respective element components in `elements`.a
+Status NewWindowDataset(std::vector<std::vector<Tensor>> elements,
+                        DataTypeVector output_types,
+                        std::vector<PartialTensorShape> output_shapes,
+                        DatasetBase** out_dataset);
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_WINDOW_DATASET_H_
diff --git a/tensorflow/core/kernels/zip_dataset_op.cc b/tensorflow/core/kernels/zip_dataset_op.cc
new file mode 100644
index 0000000000..79f48cc820
--- /dev/null
+++ b/tensorflow/core/kernels/zip_dataset_op.cc
@@ -0,0 +1,148 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/kernels/dataset.h"
+
+#include "tensorflow/core/framework/partial_tensor_shape.h"
+#include "tensorflow/core/framework/tensor.h"
+
+namespace tensorflow {
+
+namespace {
+
+// See documentation in ../ops/iterator_ops.cc for a high-level
+// description of the following op.
+
+class ZipDatasetOp : public OpKernel {
+ public:
+  explicit ZipDatasetOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    std::vector<DatasetBase*> inputs;
+    Status s;
+    for (size_t i = 0; i < ctx->num_inputs(); ++i) {
+      // Create a new ZipDatasetOp::Dataset, insert it in the step-local
+      // container, and return it as the output.
+      DatasetBase* input;
+      s.Update(LookupResource(ctx, HandleFromInput(ctx, i), &input));
+      if (!s.ok()) {
+        break;
+      }
+      inputs.push_back(input);
+    }
+
+    if (s.ok()) {
+      DatasetBase* dataset = new Dataset(inputs);
+      Tensor* output = nullptr;
+      s = ctx->allocate_output(0, TensorShape({}), &output);
+      if (s.ok()) {
+        ResourceHandle handle = MakeResourceHandle<DatasetBase>(
+            ctx, ctx->step_container()->name(), name());
+        s = CreateResource(ctx, handle, dataset);
+        if (s.ok()) {
+          output->flat<ResourceHandle>()(0) = handle;
+        }
+      }
+    }
+
+    // TODO(mrry): Implement a container that acts as a
+    // `std::vector<core::ScopedUnref>`, to avoid having to unref the
+    // inputs manually, and re-enable the use of `OP_REQUIRES_OK()`.
+    for (DatasetBase* input : inputs) {
+      input->Unref();
+    }
+    ctx->SetStatus(s);
+  }
+
+ private:
+  class Dataset : public DatasetBase {
+   public:
+    explicit Dataset(const std::vector<DatasetBase*>& inputs)
+        : inputs_(inputs) {
+      for (const auto& input : inputs_) {
+        input->Ref();
+        for (DataType dt : input->output_dtypes()) {
+          output_dtypes_.push_back(dt);
+        }
+        output_shapes_.insert(output_shapes_.end(),
+                              input->output_shapes().begin(),
+                              input->output_shapes().end());
+      }
+    }
+
+    ~Dataset() override {
+      for (const auto& input : inputs_) {
+        input->Unref();
+      }
+    }
+
+    std::unique_ptr<IteratorBase> MakeIterator() const override {
+      return std::unique_ptr<IteratorBase>(new Iterator(this));
+    }
+
+    const DataTypeVector& output_dtypes() const override {
+      return output_dtypes_;
+    }
+    const std::vector<PartialTensorShape>& output_shapes() const override {
+      return output_shapes_;
+    }
+
+    string DebugString() override { return "ZipDatasetOp::Dataset"; }
+
+   private:
+    class Iterator : public DatasetIterator<Dataset> {
+     public:
+      explicit Iterator(const Dataset* dataset)
+          : DatasetIterator<Dataset>(dataset) {
+        input_impls_.reserve(dataset->inputs_.size());
+        for (const auto& input : dataset->inputs_) {
+          input_impls_.emplace_back(input->MakeIterator());
+        }
+      }
+
+      Status GetNext(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
+                     bool* end_of_sequence) override {
+        mutex_lock l(mu_);
+        out_tensors->clear();
+        out_tensors->reserve(dataset()->output_dtypes().size());
+        for (const auto& input_impl : input_impls_) {
+          std::vector<Tensor> input_tensors;
+          TF_RETURN_IF_ERROR(
+              input_impl->GetNext(ctx, &input_tensors, end_of_sequence));
+          if (*end_of_sequence) {
+            return Status::OK();
+          }
+          out_tensors->insert(out_tensors->end(), input_tensors.begin(),
+                              input_tensors.end());
+        }
+        *end_of_sequence = false;
+        return Status::OK();
+      }
+
+     private:
+      mutex mu_;
+      std::vector<std::unique_ptr<IteratorBase>> input_impls_ GUARDED_BY(mu_);
+    };
+
+    const std::vector<DatasetBase*> inputs_;
+    DataTypeVector output_dtypes_;
+    std::vector<PartialTensorShape> output_shapes_;
+  };
+};
+
+REGISTER_KERNEL_BUILDER(Name("ZipDataset").Device(DEVICE_CPU), ZipDatasetOp);
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/ops/dataset_ops.cc b/tensorflow/core/ops/dataset_ops.cc
new file mode 100644
index 0000000000..f9f762d25f
--- /dev/null
+++ b/tensorflow/core/ops/dataset_ops.cc
@@ -0,0 +1,471 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#include "tensorflow/core/framework/common_shape_fns.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_def_builder.h"
+#include "tensorflow/core/framework/shape_inference.h"
+
+namespace tensorflow {
+
+// --------------------------------------------------------------------------
+
+// The ops in this section can be composed to define an input
+// pipeline. Each op produces a (step-local) resource that represents
+// a DAG of "dataset" objects. An "dataset" object can be converted
+// to a stateful "iterator" by passing the "dataset" to the
+// "MakeIterator" op.
+
+REGISTER_OP("TensorDataset")
+    .Input("components: Toutput_types")
+    .Output("handle: resource")
+    .Attr("Toutput_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)  // TODO(mrry): Validate that
+                                               // `components` have shapes
+                                               // compatible with
+                                               // `output_shapes`.
+    .Doc(R"doc(
+Creates a dataset that emits `components` as a tuple of tensors once.
+)doc");
+
+REGISTER_OP("TensorSliceDataset")
+    .Input("components: Toutput_types")
+    .Output("handle: resource")
+    .Attr("Toutput_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)  // TODO(mrry): Validate that the
+                                               // dim-0 slices of `components`
+                                               // have shapes compatible with
+                                               // `output_shapes`.
+    .Doc(R"doc(
+Creates a dataset that emits each dim-0 slice of `components` once.
+)doc");
+
+REGISTER_OP("SparseTensorSliceDataset")
+    .Input("indices: int64")
+    .Input("values: Tvalues")
+    .Input("dense_shape: int64")
+    .Output("handle: resource")
+    .Attr("Tvalues: type")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that splits a SparseTensor into elements row-wise.
+)doc");
+
+REGISTER_OP("ZipDataset")
+    .Input("input_datasets: N * resource")
+    .Output("handle: resource")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .Attr("N: int >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that zips together `input_datasets`.
+)doc");
+
+REGISTER_OP("RepeatDataset")
+    .Input("input_dataset: resource")
+    .Input("count: int64")
+    .Output("handle: resource")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)  // TODO(mrry): Validate the shape
+                                               // of `count`.
+    .Doc(R"doc(
+Creates a dataset that emits the outputs of `input_dataset` `count` times.
+
+count: A scalar representing the number of times that `input_dataset` should
+  be repeated. A value of `-1` indicates that it should be repeated infinitely.
+)doc");
+
+REGISTER_OP("TakeDataset")
+    .Input("input_dataset: resource")
+    .Input("count: int64")
+    .Output("handle: resource")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that contains `count` elements from the `input_dataset`.
+
+count: A scalar representing the number of elements from the `input_dataset`
+  that should be taken. A value of `-1` indicates that all of `input_dataset`
+  is taken.
+)doc");
+
+REGISTER_OP("SkipDataset")
+    .Input("input_dataset: resource")
+    .Input("count: int64")
+    .Output("handle: resource")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that skips `count` elements from the `input_dataset`.
+
+count: A scalar representing the number of elements from the `input_dataset`
+  that should be skipped.  If count is -1, skips everything.
+)doc");
+
+REGISTER_OP("MapDataset")
+    .Input("input_dataset: resource")
+    .Input("other_arguments: Targuments")
+    .Output("handle: resource")
+    .Attr("f: func")
+    .Attr("Targuments: list(type) >= 0")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that applies `f` to the outputs of `input_dataset`.
+)doc");
+
+REGISTER_OP("ParallelMapDataset")
+    .Input("input_dataset: resource")
+    .Input("other_arguments: Targuments")
+    .Input("num_threads: int32")
+    .Input("output_buffer_size: int64")
+    .Output("handle: resource")
+    .Attr("f: func")
+    .Attr("Targuments: list(type) >= 0")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that applies `f` to the outputs of `input_dataset`.
+
+Unlike a "MapDataset", which applies `f` sequentially, this dataset uses
+up to `num_threads` threads to process elements from `input_dataset`
+in parallel.
+
+num_threads: The number of threads to use to process elements from
+  `input_dataset`.
+output_buffer_size: The maximum number of output elements to buffer in an
+  iterator over this dataset.
+)doc");
+
+REGISTER_OP("FlatMapDataset")
+    .Input("input_dataset: resource")
+    .Input("other_arguments: Targuments")
+    .Output("handle: resource")
+    .Attr("f: func")
+    .Attr("Targuments: list(type) >= 0")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that applies `f` to the outputs of `input_dataset`.
+
+Unlike MapDataset, the `f` in FlatMapDataset is expected to return a
+Dataset resource, and FlatMapDataset will flatten successive results
+into a single Dataset.
+
+f: A function mapping elements of `input_dataset`, concatenated with
+  `other_arguments`, to a Dataset resource that contains elements matching
+  `output_types` and `output_shapes`.
+)doc");
+
+REGISTER_OP("GroupByWindowDataset")
+    .Input("input_dataset: resource")
+    .Input("key_func_other_arguments: Tkey_func_other_arguments")
+    .Input("reduce_func_other_arguments: Treduce_func_other_arguments")
+    .Input("window_size: int64")
+    .Output("handle: resource")
+    .Attr("key_func: func")
+    .Attr("reduce_func: func")
+    .Attr("Tkey_func_other_arguments: list(type) >= 0")
+    .Attr("Treduce_func_other_arguments: list(type) >= 0")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that computes a windowed group-by on `input_dataset`.
+
+// TODO(mrry): Support non-int64 keys.
+
+key_func: A function mapping an element of `input_dataset`, concatenated
+  with `key_func_other_arguments` to a scalar value of type DT_INT64.
+)doc");
+
+REGISTER_OP("FilterDataset")
+    .Input("input_dataset: resource")
+    .Input("other_arguments: Targuments")
+    .Output("handle: resource")
+    .Attr("predicate: func")
+    .Attr("Targuments: list(type) >= 0")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset containing elements of `input_dataset` matching `predicate`.
+
+The `predicate` function must return a scalar boolean and accept the
+following arguments:
+
+* One tensor for each component of an element of `input_dataset`.
+* One tensor for each value in `other_arguments`.
+
+predicate: A function returning a scalar boolean.
+other_arguments: A list of tensors, typically values that were captured when
+  building a closure for `predicate`.
+)doc");
+
+REGISTER_OP("BatchDataset")
+    .Input("input_dataset: resource")
+    .Input("batch_size: int64")
+    .Output("handle: resource")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that batches `batch_size` elements from `input_dataset`.
+
+batch_size: A scalar representing the number of elements to accumulate in a
+  batch.
+)doc");
+
+REGISTER_OP("PaddedBatchDataset")
+    .Input("input_dataset: resource")
+    .Input("batch_size: int64")
+    .Input("padded_shapes: N * int64")
+    .Input("padding_values: Toutput_types")
+    .Output("handle: resource")
+    .Attr("Toutput_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .Attr("N: int >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)  // TODO(mrry): Validate that
+                                               // `padded_shapes` are all
+                                               // vectors, the lengths of
+                                               // `output_types` and
+                                               // `output_shapes` are `N`,
+                                               // the `output_shapes` are (as
+                                               // far as possible to tell
+                                               // statically) compatible with
+                                               // `padded_shapes`, and
+                                               // that `padding_values` are
+                                               // all scalars.
+    .Doc(R"doc(
+Creates a dataset that batches and pads `batch_size` elements from the input.
+
+batch_size: A scalar representing the number of elements to accumulate in a
+  batch.
+padded_shapes: A list of int64 tensors representing the desired padded shapes
+  of the corresponding output components. These shapes may be partially
+  specified, using `-1` to indicate that a particular dimension should be
+  padded to the maximum size of all batch elements.
+padding_values: A list of scalars containing the padding value to use for
+  each of the outputs.
+)doc");
+
+REGISTER_OP("DenseToSparseBatchDataset")
+    .Input("input_dataset: resource")
+    .Input("batch_size: int64")
+    .Input("row_shape: int64")
+    .Output("handle: resource")
+    // NOTE(mrry): the 0th and 2nd elements will be DT_INT64.
+    .Attr("output_types: list(type) >= 1")
+    // NOTE(mrry): the 1st and 2nd elements will be vectors.
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that yields a SparseTensor for each element of the input.
+
+input_dataset: A handle to an input dataset. Must have a single component.
+batch_size: A scalar representing the number of elements to accumulate in a
+  batch.
+row_shape: A vector representing the dense shape of each row in the produced
+  SparseTensor.
+)doc");
+
+REGISTER_OP("RangeDataset")
+    .Input("start: int64")
+    .Input("stop: int64")
+    .Input("step: int64")
+    .Output("handle: resource")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset with a range of values. Corresponds to python's xrange.
+
+start: corresponds to start in python's xrange().
+stop: corresponds to stop in python's xrange().
+step: corresponds to step in python's xrange().
+)doc");
+
+REGISTER_OP("ShuffleDataset")
+    .Input("input_dataset: resource")
+    .Input("buffer_size: int64")
+    .Input("seed: int64")
+    .Input("seed2: int64")
+    .Output("handle: resource")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that shuffles elements from `input_dataset` pseudorandomly.
+
+buffer_size: The number of output elements to buffer in an iterator over
+  this dataset. Compare with the `min_after_dequeue` attr when creating a
+  `RandomShuffleQueue`.
+seed: A scalar seed for the random number generator. If either seed or
+  seed2 is set to be non-zero, the random number generator is seeded
+  by the given seed.  Otherwise, a random seed is used.
+seed2: A second scalar seed to avoid seed collision.
+)doc");
+
+REGISTER_OP("TextLineDataset")
+    .Input("filenames: string")
+    .Output("handle: resource")
+    .SetShapeFn(shape_inference::ScalarShape)  // TODO(mrry): validate
+                                               // that `filenames` is
+                                               // a scalar or a
+                                               // vector.
+    .Doc(R"doc(
+Creates a dataset that emits the lines of one or more text files.
+
+filenames: A scalar or a vector containing the name(s) of the file(s) to be
+  read.
+)doc");
+
+REGISTER_OP("FixedLengthRecordDataset")
+    .Input("filenames: string")
+    .Input("header_bytes: int64")
+    .Input("record_bytes: int64")
+    .Input("footer_bytes: int64")
+    .Output("handle: resource")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that emits the records from one or more binary files.
+
+filenames: A scalar or a vector containing the name(s) of the file(s) to be
+  read.
+header_bytes: A scalar representing the number of bytes to skip at the
+  beginning of a file.
+record_bytes: A scalar representing the number of bytes in each record.
+footer_bytes: A scalar representing the number of bytes to skip at the end
+  of a file.
+)doc");
+
+REGISTER_OP("TFRecordDataset")
+    .Input("filenames: string")
+    .Input("compression_type: string")
+    .Output("handle: resource")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Creates a dataset that emits the records from one or more TFRecord files.
+
+filenames: A scalar or vector containing the name(s) of the file(s) to be
+  read.
+compression_type: A scalar containing either (i) the empty string (no
+  compression), (ii) "ZLIB", or (iii) "GZIP".
+)doc");
+
+REGISTER_OP("Iterator")
+    .Output("handle: resource")
+    .Attr("shared_name: string")
+    .Attr("container: string")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+A container for an iterator resource.
+
+handle: A handle to the iterator that can be passed to a "MakeIterator"
+  or "IteratorGetNext" op.
+)doc");
+
+REGISTER_OP("MakeIterator")
+    .Input("dataset: resource")
+    .Input("iterator: resource")
+    .SetShapeFn(shape_inference::NoOutputs)
+    .Doc(R"doc(
+Makes a new iterator from the given `dataset` and stores it in `iterator`.
+
+This operation may be executed multiple times. Each execution will reset the
+iterator in `iterator` to the first element of `dataset`.
+)doc");
+
+REGISTER_OP("OneShotIterator")
+    .Output("handle: resource")
+    .Attr("dataset_factory: func")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetIsStateful()
+    .SetShapeFn(shape_inference::ScalarShape)
+    .Doc(R"doc(
+Makes a "one-shot" iterator that can be iterated only once.
+
+A one-shot iterator bundles the logic for defining the dataset and
+the state of the iterator in a single op, which allows simple input
+pipelines to be defined without an additional initialization
+("MakeIterator") step.
+
+One-shot iterators have the following limitations:
+
+* They do not support parameterization: all logic for creating the underlying
+  dataset must be bundled in the `dataset_factory` function.
+* They are not resettable. Once a one-shot iterator reaches the end of its
+  underlying dataset, subsequent "IteratorGetNext" operations on that
+  iterator will always produce an `OutOfRange` error.
+
+For greater flexibility, use "Iterator" and "MakeIterator" to define
+an iterator using an arbitrary subgraph, which may capture tensors
+(including fed values) as parameters, and which may be reset multiple
+times by rerunning "MakeIterator".
+
+handle: A handle to the iterator that can be passed to an "IteratorGetNext"
+  op.
+dataset_factory: A function of type `() -> DT_RESOURCE`, where the returned
+  DT_RESOURCE is a handle to a dataset.
+)doc");
+
+REGISTER_OP("IteratorGetNext")
+    .Input("iterator: resource")
+    .Output("components: output_types")
+    .Attr("output_types: list(type) >= 1")
+    .Attr("output_shapes: list(shape) >= 1")
+    .SetShapeFn([](shape_inference::InferenceContext* c) {
+      shape_inference::ShapeHandle unused;
+      TF_RETURN_IF_ERROR(c->WithRank(c->input(0), 0, &unused));
+      std::vector<PartialTensorShape> output_shapes;
+      TF_RETURN_IF_ERROR(c->GetAttr("output_shapes", &output_shapes));
+      if (output_shapes.size() != c->num_outputs()) {
+        return errors::InvalidArgument(
+            "`output_shapes` must be the same length as `output_types` (",
+            output_shapes.size(), " vs. ", c->num_outputs());
+      }
+      for (size_t i = 0; i < output_shapes.size(); ++i) {
+        shape_inference::ShapeHandle output_shape_handle;
+        TF_RETURN_IF_ERROR(c->MakeShapeFromPartialTensorShape(
+            output_shapes[i], &output_shape_handle));
+        c->set_output(static_cast<int>(i), output_shape_handle);
+      }
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Gets the next output from the given iterator.
+)doc");
+
+REGISTER_OP("IteratorDispose")
+    .Input("iterator: resource")
+    .SetShapeFn(shape_inference::NoOutputs)
+    .Doc(R"doc(
+Releases any resources used by the given iterator.
+)doc");
+
+}  // namespace tensorflow
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 2f183413dc..a20b86a235 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -1032,6 +1032,16 @@ tf_gen_op_wrapper_private_py(
     ],
 )
 
+tf_gen_op_wrapper_private_py(
+    name = "dataset_ops_gen",
+    require_shape_functions = True,
+    visibility = [
+        "//learning/brain/python/ops:__pkg__",
+        "//tensorflow:__subpackages__",
+        "//tensorflow/python/kernel_tests:__pkg__",
+    ],
+)
+
 tf_gen_op_wrapper_private_py(
     name = "image_ops_gen",
     require_shape_functions = True,
-- 
GitLab


From 3c3dc1ef27ab27fbe581f2c4ec78c11fff360005 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 20:32:59 -0700
Subject: [PATCH 1432/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 156266811
---
 .../core/ops/compat/ops_history.v1.pbtxt      | 742 +++++++++++++++-
 tensorflow/core/ops/ops.pbtxt                 | 803 +++++++++++++++++-
 2 files changed, 1534 insertions(+), 11 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index 22d9c35116..c3857d2599 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -2597,6 +2597,34 @@ op {
     version: 13
   }
 }
+op {
+  name: "BatchDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "batch_size"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "BatchFFT"
   input_arg {
@@ -5834,6 +5862,38 @@ op {
     }
   }
 }
+op {
+  name: "DenseToSparseBatchDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "batch_size"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "row_shape"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "DenseToSparseSetOperation"
   input_arg {
@@ -7753,6 +7813,67 @@ op {
     type: "type"
   }
 }
+op {
+  name: "FilterDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    type_list_attr: "Targuments"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "predicate"
+    type: "func"
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
+op {
+  name: "FixedLengthRecordDataset"
+  input_arg {
+    name: "filenames"
+    type: DT_STRING
+  }
+  input_arg {
+    name: "header_bytes"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "record_bytes"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "footer_bytes"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  is_stateful: true
+}
 op {
   name: "FixedLengthRecordReader"
   output_arg {
@@ -8132,6 +8253,43 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "FlatMapDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    type_list_attr: "Targuments"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "f"
+    type: "func"
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "Floor"
   input_arg {
@@ -8916,6 +9074,60 @@ op {
     }
   }
 }
+op {
+  name: "GroupByWindowDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "key_func_other_arguments"
+    type_list_attr: "Tkey_func_other_arguments"
+  }
+  input_arg {
+    name: "reduce_func_other_arguments"
+    type_list_attr: "Treduce_func_other_arguments"
+  }
+  input_arg {
+    name: "window_size"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "key_func"
+    type: "func"
+  }
+  attr {
+    name: "reduce_func"
+    type: "func"
+  }
+  attr {
+    name: "Tkey_func_other_arguments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "Treduce_func_other_arguments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "HSVToRGB"
   input_arg {
@@ -9677,6 +9889,66 @@ op {
   }
   allows_uninitialized_input: true
 }
+op {
+  name: "Iterator"
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+  }
+  attr {
+    name: "container"
+    type: "string"
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
+op {
+  name: "IteratorDispose"
+  input_arg {
+    name: "iterator"
+    type: DT_RESOURCE
+  }
+  is_stateful: true
+}
+op {
+  name: "IteratorGetNext"
+  input_arg {
+    name: "iterator"
+    type: DT_RESOURCE
+  }
+  output_arg {
+    name: "components"
+    type_list_attr: "output_types"
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "L2Loss"
   input_arg {
@@ -10567,6 +10839,55 @@ op {
     type: DT_BOOL
   }
 }
+op {
+  name: "MakeIterator"
+  input_arg {
+    name: "dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "iterator"
+    type: DT_RESOURCE
+  }
+  is_stateful: true
+}
+op {
+  name: "MapDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    type_list_attr: "Targuments"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "f"
+    type: "func"
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "MatMul"
   input_arg {
@@ -12883,6 +13204,44 @@ op {
     }
   }
 }
+op {
+  name: "OneShotIterator"
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "dataset_factory"
+    type: "func"
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "OnesLike"
   input_arg {
@@ -12969,6 +13328,49 @@ op {
     }
   }
 }
+op {
+  name: "PaddedBatchDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "batch_size"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "padded_shapes"
+    type: DT_INT64
+    number_attr: "N"
+  }
+  input_arg {
+    name: "padding_values"
+    type_list_attr: "Toutput_types"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Toutput_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "N"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "PaddingFIFOQueue"
   output_arg {
@@ -13076,13 +13478,58 @@ op {
     minimum: 1
   }
   attr {
-    name: "T"
-    type: "type"
-  }
-  attr {
-    name: "shape"
-    type: "shape"
+    name: "T"
+    type: "type"
+  }
+  attr {
+    name: "shape"
+    type: "shape"
+  }
+}
+op {
+  name: "ParallelMapDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    type_list_attr: "Targuments"
+  }
+  input_arg {
+    name: "num_threads"
+    type: DT_INT32
+  }
+  input_arg {
+    name: "output_buffer_size"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "f"
+    type: "func"
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
   }
+  is_stateful: true
 }
 op {
   name: "ParameterizedTruncatedNormal"
@@ -16019,6 +16466,38 @@ op {
     }
   }
 }
+op {
+  name: "RangeDataset"
+  input_arg {
+    name: "start"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "stop"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "step"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "Rank"
   input_arg {
@@ -16738,6 +17217,34 @@ op {
     }
   }
 }
+op {
+  name: "RepeatDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "count"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "RequantizationRange"
   input_arg {
@@ -20217,6 +20724,42 @@ op {
     type: DT_STRING
   }
 }
+op {
+  name: "ShuffleDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "buffer_size"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "seed"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "seed2"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "Sigmoid"
   input_arg {
@@ -20347,6 +20890,34 @@ op {
     }
   }
 }
+op {
+  name: "SkipDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "count"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "Skipgram"
   output_arg {
@@ -22832,6 +23403,30 @@ op {
     }
   }
 }
+op {
+  name: "SparseTensorSliceDataset"
+  input_arg {
+    name: "indices"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "values"
+    type_attr: "Tvalues"
+  }
+  input_arg {
+    name: "dense_shape"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Tvalues"
+    type: "type"
+  }
+  is_stateful: true
+}
 op {
   name: "SparseToDense"
   input_arg {
@@ -23973,6 +24568,22 @@ op {
     type: "func"
   }
 }
+op {
+  name: "TFRecordDataset"
+  input_arg {
+    name: "filenames"
+    type: DT_STRING
+  }
+  input_arg {
+    name: "compression_type"
+    type: DT_STRING
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  is_stateful: true
+}
 op {
   name: "TFRecordReader"
   output_arg {
@@ -24032,6 +24643,34 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "TakeDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "count"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "TakeManySparseFromTensorsMap"
   input_arg {
@@ -25055,6 +25694,54 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "TensorDataset"
+  input_arg {
+    name: "components"
+    type_list_attr: "Toutput_types"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Toutput_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
+op {
+  name: "TensorSliceDataset"
+  input_arg {
+    name: "components"
+    type_list_attr: "Toutput_types"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Toutput_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
 op {
   name: "TensorSummary"
   input_arg {
@@ -25092,6 +25779,18 @@ op {
     }
   }
 }
+op {
+  name: "TextLineDataset"
+  input_arg {
+    name: "filenames"
+    type: DT_STRING
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  is_stateful: true
+}
 op {
   name: "TextLineReader"
   output_arg {
@@ -26047,3 +26746,34 @@ op {
     }
   }
 }
+op {
+  name: "ZipDataset"
+  input_arg {
+    name: "input_datasets"
+    type: DT_RESOURCE
+    number_attr: "N"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "N"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  is_stateful: true
+}
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index cd43881a46..1aa3c99430 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -2552,6 +2552,36 @@ op {
     explanation: "Use CholeskyGrad instead."
   }
 }
+op {
+  name: "BatchDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "batch_size"
+    description: "A scalar representing the number of elements to accumulate in a\nbatch."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that batches `batch_size` elements from `input_dataset`."
+  is_stateful: true
+}
 op {
   name: "BatchFFT"
   input_arg {
@@ -5791,6 +5821,42 @@ op {
   summary: "Applies set operation along last dimension of 2 `Tensor` inputs."
   description: "See SetOperationOp::SetOperationFromContext for values of `set_operation`.\n\nOutput `result` is a `SparseTensor` represented by `result_indices`,\n`result_values`, and `result_shape`. For `set1` and `set2` ranked `n`, this\nhas rank `n` and the same 1st `n-1` dimensions as `set1` and `set2`. The `nth`\ndimension contains the result of `set_operation` applied to the corresponding\n`[0...n-1]` dimension of `set`."
 }
+op {
+  name: "DenseToSparseBatchDataset"
+  input_arg {
+    name: "input_dataset"
+    description: "A handle to an input dataset. Must have a single component."
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "batch_size"
+    description: "A scalar representing the number of elements to accumulate in a\nbatch."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "row_shape"
+    description: "A vector representing the dense shape of each row in the produced\nSparseTensor."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that yields a SparseTensor for each element of the input."
+  is_stateful: true
+}
 op {
   name: "DenseToSparseSetOperation"
   input_arg {
@@ -7612,6 +7678,76 @@ op {
   summary: "Creates a tensor filled with a scalar value."
   description: "This operation creates a tensor of shape `dims` and fills it with `value`.\n\nFor example:\n\n```\n# Output tensor has shape [2, 3].\nfill([2, 3], 9) ==> [[9, 9, 9]\n                     [9, 9, 9]]\n```"
 }
+op {
+  name: "FilterDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    description: "A list of tensors, typically values that were captured when\nbuilding a closure for `predicate`."
+    type_list_attr: "Targuments"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "predicate"
+    type: "func"
+    description: "A function returning a scalar boolean."
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset containing elements of `input_dataset` matching `predicate`."
+  description: "The `predicate` function must return a scalar boolean and accept the\nfollowing arguments:\n\n* One tensor for each component of an element of `input_dataset`.\n* One tensor for each value in `other_arguments`."
+  is_stateful: true
+}
+op {
+  name: "FixedLengthRecordDataset"
+  input_arg {
+    name: "filenames"
+    description: "A scalar or a vector containing the name(s) of the file(s) to be\nread."
+    type: DT_STRING
+  }
+  input_arg {
+    name: "header_bytes"
+    description: "A scalar representing the number of bytes to skip at the\nbeginning of a file."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "record_bytes"
+    description: "A scalar representing the number of bytes in each record."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "footer_bytes"
+    description: "A scalar representing the number of bytes to skip at the end\nof a file."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  summary: "Creates a dataset that emits the records from one or more binary files."
+  is_stateful: true
+}
 op {
   name: "FixedLengthRecordReader"
   output_arg {
@@ -7843,6 +7979,46 @@ op {
   description: "A unigram sampler could use a fixed unigram distribution read from a\nfile or passed in as an in-memory array instead of building up the distribution\nfrom data on the fly. There is also an option to skew the distribution by\napplying a distortion power to the weights.\n\nThe vocabulary file should be in CSV-like format, with the last field\nbeing the weight associated with the word.\n\nFor each batch, this op picks a single set of sampled candidate labels.\n\nThe advantages of sampling candidates per-batch are simplicity and the\npossibility of efficient dense matrix multiplication. The disadvantage is that\nthe sampled candidates must be chosen independently of the context and of the\ntrue labels."
   is_stateful: true
 }
+op {
+  name: "FlatMapDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    type_list_attr: "Targuments"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "f"
+    type: "func"
+    description: "A function mapping elements of `input_dataset`, concatenated with\n`other_arguments`, to a Dataset resource that contains elements matching\n`output_types` and `output_shapes`."
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`."
+  description: "Unlike MapDataset, the `f` in FlatMapDataset is expected to return a\nDataset resource, and FlatMapDataset will flatten successive results\ninto a single Dataset."
+  is_stateful: true
+}
 op {
   name: "Floor"
   input_arg {
@@ -8708,6 +8884,63 @@ op {
   summary: "Returns the truth value of (x >= y) element-wise."
   description: "*NOTE*: `GreaterEqual` supports broadcasting. More about broadcasting\n[here](http://docs.scipy.org/doc/numpy/user/basics.broadcasting.html)"
 }
+op {
+  name: "GroupByWindowDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "key_func_other_arguments"
+    type_list_attr: "Tkey_func_other_arguments"
+  }
+  input_arg {
+    name: "reduce_func_other_arguments"
+    type_list_attr: "Treduce_func_other_arguments"
+  }
+  input_arg {
+    name: "window_size"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "key_func"
+    type: "func"
+    description: "A function mapping an element of `input_dataset`, concatenated\nwith `key_func_other_arguments` to a scalar value of type DT_INT64."
+  }
+  attr {
+    name: "reduce_func"
+    type: "func"
+  }
+  attr {
+    name: "Tkey_func_other_arguments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "Treduce_func_other_arguments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that computes a windowed group-by on `input_dataset`."
+  description: "// TODO(mrry): Support non-int64 keys."
+  is_stateful: true
+}
 op {
   name: "HSVToRGB"
   input_arg {
@@ -9600,6 +9833,70 @@ op {
   description: "Outputs boolean scalar indicating whether the tensor has been initialized."
   allows_uninitialized_input: true
 }
+op {
+  name: "Iterator"
+  output_arg {
+    name: "handle"
+    description: "A handle to the iterator that can be passed to a \"MakeIterator\"\nor \"IteratorGetNext\" op."
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+  }
+  attr {
+    name: "container"
+    type: "string"
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "A container for an iterator resource."
+  is_stateful: true
+}
+op {
+  name: "IteratorDispose"
+  input_arg {
+    name: "iterator"
+    type: DT_RESOURCE
+  }
+  summary: "Releases any resources used by the given iterator."
+  is_stateful: true
+}
+op {
+  name: "IteratorGetNext"
+  input_arg {
+    name: "iterator"
+    type: DT_RESOURCE
+  }
+  output_arg {
+    name: "components"
+    type_list_attr: "output_types"
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Gets the next output from the given iterator."
+  is_stateful: true
+}
 op {
   name: "L2Loss"
   input_arg {
@@ -10480,6 +10777,58 @@ op {
   summary: "Forwards the input to the output."
   description: "This operator represents the loop termination condition used by the\n\"pivot\" switches of a loop."
 }
+op {
+  name: "MakeIterator"
+  input_arg {
+    name: "dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "iterator"
+    type: DT_RESOURCE
+  }
+  summary: "Makes a new iterator from the given `dataset` and stores it in `iterator`."
+  description: "This operation may be executed multiple times. Each execution will reset the\niterator in `iterator` to the first element of `dataset`."
+  is_stateful: true
+}
+op {
+  name: "MapDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    type_list_attr: "Targuments"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "f"
+    type: "func"
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`."
+  is_stateful: true
+}
 op {
   name: "MatMul"
   input_arg {
@@ -12664,6 +13013,48 @@ op {
   summary: "Returns a one-hot tensor."
   description: "The locations represented by indices in `indices` take value `on_value`,\nwhile all other locations take value `off_value`.\n\nIf the input `indices` is rank `N`, the output will have rank `N+1`,\nThe new axis is created at dimension `axis` (default: the new axis is\nappended at the end).\n\nIf `indices` is a scalar the output shape will be a vector of length `depth`.\n\nIf `indices` is a vector of length `features`, the output shape will be:\n```\n  features x depth if axis == -1\n  depth x features if axis == 0\n```\n\nIf `indices` is a matrix (batch) with shape `[batch, features]`,\nthe output shape will be:\n```\n  batch x features x depth if axis == -1\n  batch x depth x features if axis == 1\n  depth x batch x features if axis == 0\n```\n\n\nExamples\n=========\n\nSuppose that\n\n```\n  indices = [0, 2, -1, 1]\n  depth = 3\n  on_value = 5.0\n  off_value = 0.0\n  axis = -1\n```\n\nThen output is `[4 x 3]`:\n\n    ```output =\n      [5.0 0.0 0.0]  // one_hot(0)\n      [0.0 0.0 5.0]  // one_hot(2)\n      [0.0 0.0 0.0]  // one_hot(-1)\n      [0.0 5.0 0.0]  // one_hot(1)\n    ```\n\nSuppose that\n\n```\n  indices = [0, 2, -1, 1]\n  depth = 3\n  on_value = 0.0\n  off_value = 3.0\n  axis = 0\n```\n\nThen output is `[3 x 4]`:\n\n    ```output =\n      [0.0 3.0 3.0 3.0]\n      [3.0 3.0 3.0 0.0]\n      [3.0 3.0 3.0 3.0]\n      [3.0 0.0 3.0 3.0]\n    //  ^                one_hot(0)\n    //      ^            one_hot(2)\n    //          ^        one_hot(-1)\n    //              ^    one_hot(1)\n    ```\nSuppose that\n\n```\n  indices = [[0, 2], [1, -1]]\n  depth = 3\n  on_value = 1.0\n  off_value = 0.0\n  axis = -1\n```\n\nThen output is `[2 x 2 x 3]`:\n\n    ```output =\n      [\n        [1.0, 0.0, 0.0]  // one_hot(0)\n        [0.0, 0.0, 1.0]  // one_hot(2)\n      ][\n        [0.0, 1.0, 0.0]  // one_hot(1)\n        [0.0, 0.0, 0.0]  // one_hot(-1)\n      ]```"
 }
+op {
+  name: "OneShotIterator"
+  output_arg {
+    name: "handle"
+    description: "A handle to the iterator that can be passed to an \"IteratorGetNext\"\nop."
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "dataset_factory"
+    type: "func"
+    description: "A function of type `() -> DT_RESOURCE`, where the returned\nDT_RESOURCE is a handle to a dataset."
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "container"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  attr {
+    name: "shared_name"
+    type: "string"
+    default_value {
+      s: ""
+    }
+  }
+  summary: "Makes a \"one-shot\" iterator that can be iterated only once."
+  description: "A one-shot iterator bundles the logic for defining the dataset and\nthe state of the iterator in a single op, which allows simple input\npipelines to be defined without an additional initialization\n(\"MakeIterator\") step.\n\nOne-shot iterators have the following limitations:\n\n* They do not support parameterization: all logic for creating the underlying\n  dataset must be bundled in the `dataset_factory` function.\n* They are not resettable. Once a one-shot iterator reaches the end of its\n  underlying dataset, subsequent \"IteratorGetNext\" operations on that\n  iterator will always produce an `OutOfRange` error.\n\nFor greater flexibility, use \"Iterator\" and \"MakeIterator\" to define\nan iterator using an arbitrary subgraph, which may capture tensors\n(including fed values) as parameters, and which may be reset multiple\ntimes by rerunning \"MakeIterator\"."
+  is_stateful: true
+}
 op {
   name: "OnesLike"
   input_arg {
@@ -12760,6 +13151,53 @@ op {
   summary: "Pads a tensor with zeros."
   description: "This operation pads a `input` with zeros according to the `paddings` you\nspecify. `paddings` is an integer tensor with shape `[Dn, 2]`, where n is the\nrank of `input`. For each dimension D of `input`, `paddings[D, 0]` indicates\nhow many zeros to add before the contents of `input` in that dimension, and\n`paddings[D, 1]` indicates how many zeros to add after the contents of `input`\nin that dimension.\n\nThe padded size of each dimension D of the output is:\n\n`paddings(D, 0) + input.dim_size(D) + paddings(D, 1)`\n\nFor example:\n\n```\n# \'t\' is [[1, 1], [2, 2]]\n# \'paddings\' is [[1, 1], [2, 2]]\n# rank of \'t\' is 2\npad(t, paddings) ==> [[0, 0, 0, 0, 0, 0]\n                      [0, 0, 1, 1, 0, 0]\n                      [0, 0, 2, 2, 0, 0]\n                      [0, 0, 0, 0, 0, 0]]\n```"
 }
+op {
+  name: "PaddedBatchDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "batch_size"
+    description: "A scalar representing the number of elements to accumulate in a\nbatch."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "padded_shapes"
+    description: "A list of int64 tensors representing the desired padded shapes\nof the corresponding output components. These shapes may be partially\nspecified, using `-1` to indicate that a particular dimension should be\npadded to the maximum size of all batch elements."
+    type: DT_INT64
+    number_attr: "N"
+  }
+  input_arg {
+    name: "padding_values"
+    description: "A list of scalars containing the padding value to use for\neach of the outputs."
+    type_list_attr: "Toutput_types"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Toutput_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "N"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that batches and pads `batch_size` elements from the input."
+  is_stateful: true
+}
 op {
   name: "PaddingFIFOQueue"
   output_arg {
@@ -12889,12 +13327,61 @@ op {
     type: "type"
   }
   attr {
-    name: "shape"
-    type: "shape"
-    description: "the final shape of the result; should be equal to the shapes of any input\nbut with the number of input values in the first dimension."
+    name: "shape"
+    type: "shape"
+    description: "the final shape of the result; should be equal to the shapes of any input\nbut with the number of input values in the first dimension."
+  }
+  summary: "Concatenates a list of `N` tensors along the first dimension."
+  description: "The input tensors are all required to have size 1 in the first dimension.\n\nFor example:\n\n```\n# \'x\' is [[1, 4]]\n# \'y\' is [[2, 5]]\n# \'z\' is [[3, 6]]\nparallel_concat([x, y, z]) => [[1, 4], [2, 5], [3, 6]]  # Pack along first dim.\n```\n\nThe difference between concat and parallel_concat is that concat requires all\nof the inputs be computed before the operation will begin but doesn\'t require\nthat the input shapes be known during graph construction.  Parallel concat\nwill copy pieces of the input into the output as they become available, in\nsome situations this can provide a performance benefit."
+}
+op {
+  name: "ParallelMapDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "other_arguments"
+    type_list_attr: "Targuments"
+  }
+  input_arg {
+    name: "num_threads"
+    description: "The number of threads to use to process elements from\n`input_dataset`."
+    type: DT_INT32
+  }
+  input_arg {
+    name: "output_buffer_size"
+    description: "The maximum number of output elements to buffer in an\niterator over this dataset."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "f"
+    type: "func"
+  }
+  attr {
+    name: "Targuments"
+    type: "list(type)"
+    has_minimum: true
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
   }
-  summary: "Concatenates a list of `N` tensors along the first dimension."
-  description: "The input tensors are all required to have size 1 in the first dimension.\n\nFor example:\n\n```\n# \'x\' is [[1, 4]]\n# \'y\' is [[2, 5]]\n# \'z\' is [[3, 6]]\nparallel_concat([x, y, z]) => [[1, 4], [2, 5], [3, 6]]  # Pack along first dim.\n```\n\nThe difference between concat and parallel_concat is that concat requires all\nof the inputs be computed before the operation will begin but doesn\'t require\nthat the input shapes be known during graph construction.  Parallel concat\nwill copy pieces of the input into the output as they become available, in\nsome situations this can provide a performance benefit."
+  summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`."
+  description: "Unlike a \"MapDataset\", which applies `f` sequentially, this dataset uses\nup to `num_threads` threads to process elements from `input_dataset`\nin parallel."
+  is_stateful: true
 }
 op {
   name: "ParameterizedTruncatedNormal"
@@ -16103,6 +16590,42 @@ op {
   summary: "Creates a sequence of numbers."
   description: "This operation creates a sequence of numbers that begins at `start` and\nextends by increments of `delta` up to but not including `limit`.\n\nFor example:\n\n```\n# \'start\' is 3\n# \'limit\' is 18\n# \'delta\' is 3\ntf.range(start, limit, delta) ==> [3, 6, 9, 12, 15]\n```"
 }
+op {
+  name: "RangeDataset"
+  input_arg {
+    name: "start"
+    description: "corresponds to start in python\'s xrange()."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "stop"
+    description: "corresponds to stop in python\'s xrange()."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "step"
+    description: "corresponds to step in python\'s xrange()."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset with a range of values. Corresponds to python\'s xrange."
+  is_stateful: true
+}
 op {
   name: "Rank"
   input_arg {
@@ -16942,6 +17465,36 @@ op {
   }
   summary: "Computes rectified linear gradients for a Relu operation."
 }
+op {
+  name: "RepeatDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "count"
+    description: "A scalar representing the number of times that `input_dataset` should\nbe repeated. A value of `-1` indicates that it should be repeated infinitely."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that emits the outputs of `input_dataset` `count` times."
+  is_stateful: true
+}
 op {
   name: "RequantizationRange"
   input_arg {
@@ -20795,6 +21348,46 @@ op {
   }
   summary: "Generate a glob pattern matching all sharded file names."
 }
+op {
+  name: "ShuffleDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "buffer_size"
+    description: "The number of output elements to buffer in an iterator over\nthis dataset. Compare with the `min_after_dequeue` attr when creating a\n`RandomShuffleQueue`."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "seed"
+    description: "A scalar seed for the random number generator. If either seed or\nseed2 is set to be non-zero, the random number generator is seeded\nby the given seed.  Otherwise, a random seed is used."
+    type: DT_INT64
+  }
+  input_arg {
+    name: "seed2"
+    description: "A second scalar seed to avoid seed collision."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that shuffles elements from `input_dataset` pseudorandomly."
+  is_stateful: true
+}
 op {
   name: "Sigmoid"
   input_arg {
@@ -20934,6 +21527,36 @@ op {
   summary: "Returns the size of a tensor."
   description: "This operation returns an integer representing the number of elements in\n`input`.\n\nFor example:\n\n```\n# \'t\' is [[[1, 1,, 1], [2, 2, 2]], [[3, 3, 3], [4, 4, 4]]]]\nsize(t) ==> 12\n```"
 }
+op {
+  name: "SkipDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "count"
+    description: "A scalar representing the number of elements from the `input_dataset`\nthat should be skipped.  If count is -1, skips everything."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that skips `count` elements from the `input_dataset`."
+  is_stateful: true
+}
 op {
   name: "Skipgram"
   output_arg {
@@ -23725,6 +24348,31 @@ op {
   summary: "Multiply SparseTensor (of rank 2) \"A\" by dense matrix \"B\"."
   description: "No validity checking is performed on the indices of A.  However, the following\ninput format is recommended for optimal behavior:\n\nif adjoint_a == false:\n  A should be sorted in lexicographically increasing order.  Use SparseReorder\n  if you\'re not sure.\nif adjoint_a == true:\n  A should be sorted in order of increasing dimension 1 (i.e., \"column major\"\n  order instead of \"row major\" order)."
 }
+op {
+  name: "SparseTensorSliceDataset"
+  input_arg {
+    name: "indices"
+    type: DT_INT64
+  }
+  input_arg {
+    name: "values"
+    type_attr: "Tvalues"
+  }
+  input_arg {
+    name: "dense_shape"
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Tvalues"
+    type: "type"
+  }
+  summary: "Creates a dataset that splits a SparseTensor into elements row-wise."
+  is_stateful: true
+}
 op {
   name: "SparseToDense"
   input_arg {
@@ -25002,6 +25650,25 @@ op {
   }
   summary: "Computes the gradient function for function f via backpropagation."
 }
+op {
+  name: "TFRecordDataset"
+  input_arg {
+    name: "filenames"
+    description: "A scalar or vector containing the name(s) of the file(s) to be\nread."
+    type: DT_STRING
+  }
+  input_arg {
+    name: "compression_type"
+    description: "A scalar containing either (i) the empty string (no\ncompression), (ii) \"ZLIB\", or (iii) \"GZIP\"."
+    type: DT_STRING
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  summary: "Creates a dataset that emits the records from one or more TFRecord files."
+  is_stateful: true
+}
 op {
   name: "TFRecordReader"
   output_arg {
@@ -25069,6 +25736,36 @@ op {
   summary: "A Reader that outputs the records from a TensorFlow Records file."
   is_stateful: true
 }
+op {
+  name: "TakeDataset"
+  input_arg {
+    name: "input_dataset"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "count"
+    description: "A scalar representing the number of elements from the `input_dataset`\nthat should be taken. A value of `-1` indicates that all of `input_dataset`\nis taken."
+    type: DT_INT64
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that contains `count` elements from the `input_dataset`."
+  is_stateful: true
+}
 op {
   name: "TakeManySparseFromTensorsMap"
   input_arg {
@@ -26196,6 +26893,56 @@ op {
   summary: "Push an element onto the tensor_array."
   is_stateful: true
 }
+op {
+  name: "TensorDataset"
+  input_arg {
+    name: "components"
+    type_list_attr: "Toutput_types"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Toutput_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that emits `components` as a tuple of tensors once."
+  is_stateful: true
+}
+op {
+  name: "TensorSliceDataset"
+  input_arg {
+    name: "components"
+    type_list_attr: "Toutput_types"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "Toutput_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that emits each dim-0 slice of `components` once."
+  is_stateful: true
+}
 op {
   name: "TensorSummary"
   input_arg {
@@ -26238,6 +26985,20 @@ op {
   }
   summary: "Outputs a `Summary` protocol buffer with a tensor."
 }
+op {
+  name: "TextLineDataset"
+  input_arg {
+    name: "filenames"
+    description: "A scalar or a vector containing the name(s) of the file(s) to be\nread."
+    type: DT_STRING
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  summary: "Creates a dataset that emits the lines of one or more text files."
+  is_stateful: true
+}
 op {
   name: "TextLineReader"
   output_arg {
@@ -27206,3 +27967,35 @@ op {
   summary: "Compute the Hurwitz zeta function \\\\(\\zeta(x, q)\\\\)."
   description: "The Hurwitz zeta function is defined as:\n\n\n\\\\(\\zeta(x, q) = \\sum_{n=0}^{\\infty} (q + n)^{-x}\\\\)"
 }
+op {
+  name: "ZipDataset"
+  input_arg {
+    name: "input_datasets"
+    type: DT_RESOURCE
+    number_attr: "N"
+  }
+  output_arg {
+    name: "handle"
+    type: DT_RESOURCE
+  }
+  attr {
+    name: "output_types"
+    type: "list(type)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "output_shapes"
+    type: "list(shape)"
+    has_minimum: true
+    minimum: 1
+  }
+  attr {
+    name: "N"
+    type: "int"
+    has_minimum: true
+    minimum: 1
+  }
+  summary: "Creates a dataset that zips together `input_datasets`."
+  is_stateful: true
+}
-- 
GitLab


From 03fb33a71d7cc432819aedfa9ad4d6353d813258 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 16 May 2017 20:37:08 -0700
Subject: [PATCH 1433/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 156267018
---
 tensorflow/go/op/wrappers.go | 808 ++++++++++++++++++++++++++---------
 1 file changed, 611 insertions(+), 197 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 33bf686da8..625ad269f9 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -365,33 +365,6 @@ func QuantizedInstanceNorm(scope *Scope, x tf.Output, x_min tf.Output, x_max tf.
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
-// Concatenates quantized tensors along one dimension.
-//
-// Arguments:
-//	concat_dim: 0-D.  The dimension along which to concatenate.  Must be in the
-// range [0, rank(values)).
-//	values: The `N` Tensors to concatenate. Their ranks and types must match,
-// and their sizes must match in all dimensions except `concat_dim`.
-//	input_mins: The minimum scalar values for each of the input tensors.
-//	input_maxes: The maximum scalar values for each of the input tensors.
-//
-// Returns A `Tensor` with the concatenation of values stacked along the
-// `concat_dim` dimension.  This tensor's shape matches that of `values` except
-// in `concat_dim` where it has the sum of the sizes.The float value that the minimum quantized output value represents.The float value that the maximum quantized output value represents.
-func QuantizedConcat(scope *Scope, concat_dim tf.Output, values []tf.Output, input_mins []tf.Output, input_maxes []tf.Output) (output tf.Output, output_min tf.Output, output_max tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "QuantizedConcat",
-		Input: []tf.Input{
-			concat_dim, tf.OutputList(values), tf.OutputList(input_mins), tf.OutputList(input_maxes),
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1), op.Output(2)
-}
-
 // QuantizeAndDequantizeAttr is an optional argument to QuantizeAndDequantize.
 type QuantizeAndDequantizeAttr func(optionalAttr)
 
@@ -3577,23 +3550,6 @@ func TensorArrayWriteV2(scope *Scope, handle tf.Output, index tf.Output, value t
 	return op.Output(0)
 }
 
-// Deprecated. Use TensorArrayGradV3
-func TensorArrayGradV2(scope *Scope, handle tf.Output, flow_in tf.Output, source string) (grad_handle tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"source": source}
-	opspec := tf.OpSpec{
-		Type: "TensorArrayGradV2",
-		Input: []tf.Input{
-			handle, flow_in,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // ResourceGatherAttr is an optional argument to ResourceGather.
 type ResourceGatherAttr func(optionalAttr)
 
@@ -3999,37 +3955,6 @@ func TensorArrayGradV3(scope *Scope, handle tf.Output, flow_in tf.Output, source
 	return op.Output(0), op.Output(1)
 }
 
-// TensorArrayConcatV2Attr is an optional argument to TensorArrayConcatV2.
-type TensorArrayConcatV2Attr func(optionalAttr)
-
-// TensorArrayConcatV2ElementShapeExcept0 sets the optional element_shape_except0 attribute to value.
-// If not specified, defaults to <unknown_rank:true >
-func TensorArrayConcatV2ElementShapeExcept0(value tf.Shape) TensorArrayConcatV2Attr {
-	return func(m optionalAttr) {
-		m["element_shape_except0"] = value
-	}
-}
-
-// Deprecated. Use TensorArrayConcatV3
-func TensorArrayConcatV2(scope *Scope, handle tf.Output, flow_in tf.Output, dtype tf.DataType, optional ...TensorArrayConcatV2Attr) (value tf.Output, lengths tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{"dtype": dtype}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "TensorArrayConcatV2",
-		Input: []tf.Input{
-			handle, flow_in,
-		},
-		Attrs: attrs,
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0), op.Output(1)
-}
-
 // Returns the batched diagonal part of a batched tensor.
 //
 // This operation returns a tensor with the `diagonal` part
@@ -4080,50 +4005,6 @@ func MatrixDiagPart(scope *Scope, input tf.Output) (diagonal tf.Output) {
 	return op.Output(0)
 }
 
-// QueueCloseV2Attr is an optional argument to QueueCloseV2.
-type QueueCloseV2Attr func(optionalAttr)
-
-// QueueCloseV2CancelPendingEnqueues sets the optional cancel_pending_enqueues attribute to value.
-//
-// value: If true, all pending enqueue requests that are
-// blocked on the given queue will be cancelled.
-// If not specified, defaults to false
-func QueueCloseV2CancelPendingEnqueues(value bool) QueueCloseV2Attr {
-	return func(m optionalAttr) {
-		m["cancel_pending_enqueues"] = value
-	}
-}
-
-// Closes the given queue.
-//
-// This operation signals that no more elements will be enqueued in the
-// given queue. Subsequent Enqueue(Many) operations will fail.
-// Subsequent Dequeue(Many) operations will continue to succeed if
-// sufficient elements remain in the queue. Subsequent Dequeue(Many)
-// operations that would block will fail immediately.
-//
-// Arguments:
-//	handle: The handle to a queue.
-//
-// Returns the created operation.
-func QueueCloseV2(scope *Scope, handle tf.Output, optional ...QueueCloseV2Attr) (o *tf.Operation) {
-	if scope.Err() != nil {
-		return
-	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
-	opspec := tf.OpSpec{
-		Type: "QueueCloseV2",
-		Input: []tf.Input{
-			handle,
-		},
-		Attrs: attrs,
-	}
-	return scope.AddOperation(opspec)
-}
-
 // Concatenates tensors along one dimension.
 //
 // Arguments:
@@ -4879,14 +4760,371 @@ func StridedSlice(scope *Scope, input tf.Output, begin tf.Output, end tf.Output,
 	if scope.Err() != nil {
 		return
 	}
-	attrs := map[string]interface{}{}
-	for _, a := range optional {
-		a(attrs)
-	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "StridedSlice",
+		Input: []tf.Input{
+			input, begin, end, strides,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// TensorArrayGatherV2Attr is an optional argument to TensorArrayGatherV2.
+type TensorArrayGatherV2Attr func(optionalAttr)
+
+// TensorArrayGatherV2ElementShape sets the optional element_shape attribute to value.
+// If not specified, defaults to <unknown_rank:true >
+func TensorArrayGatherV2ElementShape(value tf.Shape) TensorArrayGatherV2Attr {
+	return func(m optionalAttr) {
+		m["element_shape"] = value
+	}
+}
+
+// Deprecated. Use TensorArrayGatherV3
+func TensorArrayGatherV2(scope *Scope, handle tf.Output, indices tf.Output, flow_in tf.Output, dtype tf.DataType, optional ...TensorArrayGatherV2Attr) (value tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"dtype": dtype}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "TensorArrayGatherV2",
+		Input: []tf.Input{
+			handle, indices, flow_in,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Interleave the values from the `data` tensors into a single tensor.
+//
+// Builds a merged tensor such that
+//
+// ```python
+//     merged[indices[m][i, ..., j], ...] = data[m][i, ..., j, ...]
+// ```
+//
+// For example, if each `indices[m]` is scalar or vector, we have
+//
+// ```python
+//     # Scalar indices:
+//     merged[indices[m], ...] = data[m][...]
+//
+//     # Vector indices:
+//     merged[indices[m][i], ...] = data[m][i, ...]
+// ```
+//
+// Each `data[i].shape` must start with the corresponding `indices[i].shape`,
+// and the rest of `data[i].shape` must be constant w.r.t. `i`.  That is, we
+// must have `data[i].shape = indices[i].shape + constant`.  In terms of this
+// `constant`, the output shape is
+//
+//     merged.shape = [max(indices)] + constant
+//
+// Values are merged in order, so if an index appears in both `indices[m][i]` and
+// `indices[n][j]` for `(m,i) < (n,j)` the slice `data[n][j]` will appear in the
+// merged result.
+//
+// For example:
+//
+// ```python
+//     indices[0] = 6
+//     indices[1] = [4, 1]
+//     indices[2] = [[5, 2], [0, 3]]
+//     data[0] = [61, 62]
+//     data[1] = [[41, 42], [11, 12]]
+//     data[2] = [[[51, 52], [21, 22]], [[1, 2], [31, 32]]]
+//     merged = [[1, 2], [11, 12], [21, 22], [31, 32], [41, 42],
+//               [51, 52], [61, 62]]
+// ```
+//
+// This method can be used to merge partitions created by `dynamic_partition`
+// as illustrated on the following example:
+//
+// ```python
+//     # Apply function (increments x_i) on elements for which a certain condition
+//     # apply (x_i != -1 in this example).
+//     x=tf.constant([0.1, -1., 5.2, 4.3, -1., 7.4])
+//     condition_mask=tf.not_equal(x,tf.constant(-1.))
+//     partitioned_data = tf.dynamic_partition(
+//         x, tf.cast(condition_mask, tf.int32) , 2)
+//     partitioned_data[1] = partitioned_data[1] + 1.0
+//     condition_indices = tf.dynamic_partition(
+//         tf.range(tf.shape(x)[0]), tf.cast(condition_mask, tf.int32) , 2)
+//     x = tf.dynamic_stitch(condition_indices, partitioned_data)
+//     # Here x=[1.1, -1., 6.2, 5.3, -1, 8.4], the -1. values remain
+//     # unchanged.
+// ```
+//
+// <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
+// <img style="width:100%" src="https://www.tensorflow.org/images/DynamicStitch.png" alt>
+// </div>
+func DynamicStitch(scope *Scope, indices []tf.Output, data []tf.Output) (merged tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "DynamicStitch",
+		Input: []tf.Input{
+			tf.OutputList(indices), tf.OutputList(data),
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// QueueCloseV2Attr is an optional argument to QueueCloseV2.
+type QueueCloseV2Attr func(optionalAttr)
+
+// QueueCloseV2CancelPendingEnqueues sets the optional cancel_pending_enqueues attribute to value.
+//
+// value: If true, all pending enqueue requests that are
+// blocked on the given queue will be cancelled.
+// If not specified, defaults to false
+func QueueCloseV2CancelPendingEnqueues(value bool) QueueCloseV2Attr {
+	return func(m optionalAttr) {
+		m["cancel_pending_enqueues"] = value
+	}
+}
+
+// Closes the given queue.
+//
+// This operation signals that no more elements will be enqueued in the
+// given queue. Subsequent Enqueue(Many) operations will fail.
+// Subsequent Dequeue(Many) operations will continue to succeed if
+// sufficient elements remain in the queue. Subsequent Dequeue(Many)
+// operations that would block will fail immediately.
+//
+// Arguments:
+//	handle: The handle to a queue.
+//
+// Returns the created operation.
+func QueueCloseV2(scope *Scope, handle tf.Output, optional ...QueueCloseV2Attr) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "QueueCloseV2",
+		Input: []tf.Input{
+			handle,
+		},
+		Attrs: attrs,
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Releases any resources used by the given iterator.
+//
+// Returns the created operation.
+func IteratorDispose(scope *Scope, iterator tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "IteratorDispose",
+		Input: []tf.Input{
+			iterator,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Gets the next output from the given iterator.
+func IteratorGetNext(scope *Scope, iterator tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (components []tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "IteratorGetNext",
+		Input: []tf.Input{
+			iterator,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	if scope.Err() != nil {
+		return
+	}
+	var idx int
+	var err error
+	if components, idx, err = makeOutputList(op, idx, "components"); err != nil {
+		scope.UpdateErr("IteratorGetNext", err)
+		return
+	}
+	return components
+}
+
+// Makes a new iterator from the given `dataset` and stores it in `iterator`.
+//
+// This operation may be executed multiple times. Each execution will reset the
+// iterator in `iterator` to the first element of `dataset`.
+//
+// Returns the created operation.
+func MakeIterator(scope *Scope, dataset tf.Output, iterator tf.Output) (o *tf.Operation) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "MakeIterator",
+		Input: []tf.Input{
+			dataset, iterator,
+		},
+	}
+	return scope.AddOperation(opspec)
+}
+
+// Creates a dataset that emits the records from one or more TFRecord files.
+//
+// Arguments:
+//	filenames: A scalar or vector containing the name(s) of the file(s) to be
+// read.
+//	compression_type: A scalar containing either (i) the empty string (no
+// compression), (ii) "ZLIB", or (iii) "GZIP".
+func TFRecordDataset(scope *Scope, filenames tf.Output, compression_type tf.Output) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "TFRecordDataset",
+		Input: []tf.Input{
+			filenames, compression_type,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Concatenates quantized tensors along one dimension.
+//
+// Arguments:
+//	concat_dim: 0-D.  The dimension along which to concatenate.  Must be in the
+// range [0, rank(values)).
+//	values: The `N` Tensors to concatenate. Their ranks and types must match,
+// and their sizes must match in all dimensions except `concat_dim`.
+//	input_mins: The minimum scalar values for each of the input tensors.
+//	input_maxes: The maximum scalar values for each of the input tensors.
+//
+// Returns A `Tensor` with the concatenation of values stacked along the
+// `concat_dim` dimension.  This tensor's shape matches that of `values` except
+// in `concat_dim` where it has the sum of the sizes.The float value that the minimum quantized output value represents.The float value that the maximum quantized output value represents.
+func QuantizedConcat(scope *Scope, concat_dim tf.Output, values []tf.Output, input_mins []tf.Output, input_maxes []tf.Output) (output tf.Output, output_min tf.Output, output_max tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "QuantizedConcat",
+		Input: []tf.Input{
+			concat_dim, tf.OutputList(values), tf.OutputList(input_mins), tf.OutputList(input_maxes),
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0), op.Output(1), op.Output(2)
+}
+
+// Creates a dataset that emits the records from one or more binary files.
+//
+// Arguments:
+//	filenames: A scalar or a vector containing the name(s) of the file(s) to be
+// read.
+//	header_bytes: A scalar representing the number of bytes to skip at the
+// beginning of a file.
+//	record_bytes: A scalar representing the number of bytes in each record.
+//	footer_bytes: A scalar representing the number of bytes to skip at the end
+// of a file.
+func FixedLengthRecordDataset(scope *Scope, filenames tf.Output, header_bytes tf.Output, record_bytes tf.Output, footer_bytes tf.Output) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "FixedLengthRecordDataset",
+		Input: []tf.Input{
+			filenames, header_bytes, record_bytes, footer_bytes,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Deprecated. Use TensorArrayGradV3
+func TensorArrayGradV2(scope *Scope, handle tf.Output, flow_in tf.Output, source string) (grad_handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"source": source}
+	opspec := tf.OpSpec{
+		Type: "TensorArrayGradV2",
+		Input: []tf.Input{
+			handle, flow_in,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Creates a dataset that yields a SparseTensor for each element of the input.
+//
+// Arguments:
+//	input_dataset: A handle to an input dataset. Must have a single component.
+//	batch_size: A scalar representing the number of elements to accumulate in a
+// batch.
+//	row_shape: A vector representing the dense shape of each row in the produced
+// SparseTensor.
+//
+//
+func DenseToSparseBatchDataset(scope *Scope, input_dataset tf.Output, batch_size tf.Output, row_shape tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "DenseToSparseBatchDataset",
+		Input: []tf.Input{
+			input_dataset, batch_size, row_shape,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Creates a dataset that batches and pads `batch_size` elements from the input.
+//
+// Arguments:
+//
+//	batch_size: A scalar representing the number of elements to accumulate in a
+// batch.
+//	padded_shapes: A list of int64 tensors representing the desired padded shapes
+// of the corresponding output components. These shapes may be partially
+// specified, using `-1` to indicate that a particular dimension should be
+// padded to the maximum size of all batch elements.
+//	padding_values: A list of scalars containing the padding value to use for
+// each of the outputs.
+//
+func PaddedBatchDataset(scope *Scope, input_dataset tf.Output, batch_size tf.Output, padded_shapes []tf.Output, padding_values []tf.Output, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_shapes": output_shapes}
 	opspec := tf.OpSpec{
-		Type: "StridedSlice",
+		Type: "PaddedBatchDataset",
 		Input: []tf.Input{
-			input, begin, end, strides,
+			input_dataset, batch_size, tf.OutputList(padded_shapes), tf.OutputList(padding_values),
 		},
 		Attrs: attrs,
 	}
@@ -4894,19 +5132,19 @@ func StridedSlice(scope *Scope, input tf.Output, begin tf.Output, end tf.Output,
 	return op.Output(0)
 }
 
-// TensorArrayGatherV2Attr is an optional argument to TensorArrayGatherV2.
-type TensorArrayGatherV2Attr func(optionalAttr)
+// TensorArrayConcatV2Attr is an optional argument to TensorArrayConcatV2.
+type TensorArrayConcatV2Attr func(optionalAttr)
 
-// TensorArrayGatherV2ElementShape sets the optional element_shape attribute to value.
+// TensorArrayConcatV2ElementShapeExcept0 sets the optional element_shape_except0 attribute to value.
 // If not specified, defaults to <unknown_rank:true >
-func TensorArrayGatherV2ElementShape(value tf.Shape) TensorArrayGatherV2Attr {
+func TensorArrayConcatV2ElementShapeExcept0(value tf.Shape) TensorArrayConcatV2Attr {
 	return func(m optionalAttr) {
-		m["element_shape"] = value
+		m["element_shape_except0"] = value
 	}
 }
 
-// Deprecated. Use TensorArrayGatherV3
-func TensorArrayGatherV2(scope *Scope, handle tf.Output, indices tf.Output, flow_in tf.Output, dtype tf.DataType, optional ...TensorArrayGatherV2Attr) (value tf.Output) {
+// Deprecated. Use TensorArrayConcatV3
+func TensorArrayConcatV2(scope *Scope, handle tf.Output, flow_in tf.Output, dtype tf.DataType, optional ...TensorArrayConcatV2Attr) (value tf.Output, lengths tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
@@ -4915,87 +5153,49 @@ func TensorArrayGatherV2(scope *Scope, handle tf.Output, indices tf.Output, flow
 		a(attrs)
 	}
 	opspec := tf.OpSpec{
-		Type: "TensorArrayGatherV2",
+		Type: "TensorArrayConcatV2",
 		Input: []tf.Input{
-			handle, indices, flow_in,
+			handle, flow_in,
 		},
 		Attrs: attrs,
 	}
 	op := scope.AddOperation(opspec)
-	return op.Output(0)
+	return op.Output(0), op.Output(1)
 }
 
-// Interleave the values from the `data` tensors into a single tensor.
-//
-// Builds a merged tensor such that
-//
-// ```python
-//     merged[indices[m][i, ..., j], ...] = data[m][i, ..., j, ...]
-// ```
-//
-// For example, if each `indices[m]` is scalar or vector, we have
-//
-// ```python
-//     # Scalar indices:
-//     merged[indices[m], ...] = data[m][...]
-//
-//     # Vector indices:
-//     merged[indices[m][i], ...] = data[m][i, ...]
-// ```
-//
-// Each `data[i].shape` must start with the corresponding `indices[i].shape`,
-// and the rest of `data[i].shape` must be constant w.r.t. `i`.  That is, we
-// must have `data[i].shape = indices[i].shape + constant`.  In terms of this
-// `constant`, the output shape is
-//
-//     merged.shape = [max(indices)] + constant
-//
-// Values are merged in order, so if an index appears in both `indices[m][i]` and
-// `indices[n][j]` for `(m,i) < (n,j)` the slice `data[n][j]` will appear in the
-// merged result.
+// Creates a dataset that emits the outputs of `input_dataset` `count` times.
 //
-// For example:
-//
-// ```python
-//     indices[0] = 6
-//     indices[1] = [4, 1]
-//     indices[2] = [[5, 2], [0, 3]]
-//     data[0] = [61, 62]
-//     data[1] = [[41, 42], [11, 12]]
-//     data[2] = [[[51, 52], [21, 22]], [[1, 2], [31, 32]]]
-//     merged = [[1, 2], [11, 12], [21, 22], [31, 32], [41, 42],
-//               [51, 52], [61, 62]]
-// ```
+// Arguments:
 //
-// This method can be used to merge partitions created by `dynamic_partition`
-// as illustrated on the following example:
+//	count: A scalar representing the number of times that `input_dataset` should
+// be repeated. A value of `-1` indicates that it should be repeated infinitely.
 //
-// ```python
-//     # Apply function (increments x_i) on elements for which a certain condition
-//     # apply (x_i != -1 in this example).
-//     x=tf.constant([0.1, -1., 5.2, 4.3, -1., 7.4])
-//     condition_mask=tf.not_equal(x,tf.constant(-1.))
-//     partitioned_data = tf.dynamic_partition(
-//         x, tf.cast(condition_mask, tf.int32) , 2)
-//     partitioned_data[1] = partitioned_data[1] + 1.0
-//     condition_indices = tf.dynamic_partition(
-//         tf.range(tf.shape(x)[0]), tf.cast(condition_mask, tf.int32) , 2)
-//     x = tf.dynamic_stitch(condition_indices, partitioned_data)
-//     # Here x=[1.1, -1., 6.2, 5.3, -1, 8.4], the -1. values remain
-//     # unchanged.
-// ```
 //
-// <div style="width:70%; margin:auto; margin-bottom:10px; margin-top:20px;">
-// <img style="width:100%" src="https://www.tensorflow.org/images/DynamicStitch.png" alt>
-// </div>
-func DynamicStitch(scope *Scope, indices []tf.Output, data []tf.Output) (merged tf.Output) {
+func RepeatDataset(scope *Scope, input_dataset tf.Output, count tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
 	if scope.Err() != nil {
 		return
 	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
 	opspec := tf.OpSpec{
-		Type: "DynamicStitch",
+		Type: "RepeatDataset",
 		Input: []tf.Input{
-			tf.OutputList(indices), tf.OutputList(data),
+			input_dataset, count,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Creates a dataset that splits a SparseTensor into elements row-wise.
+func SparseTensorSliceDataset(scope *Scope, indices tf.Output, values tf.Output, dense_shape tf.Output) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "SparseTensorSliceDataset",
+		Input: []tf.Input{
+			indices, values, dense_shape,
 		},
 	}
 	op := scope.AddOperation(opspec)
@@ -5055,6 +5255,35 @@ func CropAndResizeGradBoxes(scope *Scope, grads tf.Output, image tf.Output, boxe
 	return op.Output(0)
 }
 
+// Creates a dataset that shuffles elements from `input_dataset` pseudorandomly.
+//
+// Arguments:
+//
+//	buffer_size: The number of output elements to buffer in an iterator over
+// this dataset. Compare with the `min_after_dequeue` attr when creating a
+// `RandomShuffleQueue`.
+//	seed: A scalar seed for the random number generator. If either seed or
+// seed2 is set to be non-zero, the random number generator is seeded
+// by the given seed.  Otherwise, a random seed is used.
+//	seed2: A second scalar seed to avoid seed collision.
+//
+//
+func ShuffleDataset(scope *Scope, input_dataset tf.Output, buffer_size tf.Output, seed tf.Output, seed2 tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "ShuffleDataset",
+		Input: []tf.Input{
+			input_dataset, buffer_size, seed, seed2,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // CropAndResizeGradImageAttr is an optional argument to CropAndResizeGradImage.
 type CropAndResizeGradImageAttr func(optionalAttr)
 
@@ -5110,6 +5339,24 @@ func CropAndResizeGradImage(scope *Scope, grads tf.Output, boxes tf.Output, box_
 	return op.Output(0)
 }
 
+// A container for an iterator resource.
+//
+// Returns A handle to the iterator that can be passed to a "MakeIterator"
+// or "IteratorGetNext" op.
+func Iterator(scope *Scope, shared_name string, container string, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"shared_name": shared_name, "container": container, "output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "Iterator",
+
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // ExtractGlimpseAttr is an optional argument to ExtractGlimpse.
 type ExtractGlimpseAttr func(optionalAttr)
 
@@ -11436,6 +11683,31 @@ func DepthwiseConv2dNativeBackpropInput(scope *Scope, input_sizes tf.Output, fil
 	return op.Output(0)
 }
 
+// Creates a dataset that contains `count` elements from the `input_dataset`.
+//
+// Arguments:
+//
+//	count: A scalar representing the number of elements from the `input_dataset`
+// that should be taken. A value of `-1` indicates that all of `input_dataset`
+// is taken.
+//
+//
+func TakeDataset(scope *Scope, input_dataset tf.Output, count tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "TakeDataset",
+		Input: []tf.Input{
+			input_dataset, count,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes gradients for the exponential linear (Elu) operation.
 //
 // Arguments:
@@ -12318,6 +12590,30 @@ func FixedLengthRecordReaderV2(scope *Scope, record_bytes int64, optional ...Fix
 	return op.Output(0)
 }
 
+// Creates a dataset that batches `batch_size` elements from `input_dataset`.
+//
+// Arguments:
+//
+//	batch_size: A scalar representing the number of elements to accumulate in a
+// batch.
+//
+//
+func BatchDataset(scope *Scope, input_dataset tf.Output, batch_size tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "BatchDataset",
+		Input: []tf.Input{
+			input_dataset, batch_size,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // ResourceSparseApplyCenteredRMSPropAttr is an optional argument to ResourceSparseApplyCenteredRMSProp.
 type ResourceSparseApplyCenteredRMSPropAttr func(optionalAttr)
 
@@ -13860,6 +14156,23 @@ func SparseDenseCwiseMul(scope *Scope, sp_indices tf.Output, sp_values tf.Output
 	return op.Output(0)
 }
 
+// Creates a dataset that emits `components` as a tuple of tensors once.
+func TensorDataset(scope *Scope, components []tf.Output, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "TensorDataset",
+		Input: []tf.Input{
+			tf.OutputList(components),
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // NonMaxSuppressionAttr is an optional argument to NonMaxSuppression.
 type NonMaxSuppressionAttr func(optionalAttr)
 
@@ -14202,6 +14515,23 @@ func ReaderReadV2(scope *Scope, reader_handle tf.Output, queue_handle tf.Output)
 	return op.Output(0), op.Output(1)
 }
 
+// Creates a dataset that zips together `input_datasets`.
+func ZipDataset(scope *Scope, input_datasets []tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "ZipDataset",
+		Input: []tf.Input{
+			tf.OutputList(input_datasets),
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // MutableDenseHashTableV2Attr is an optional argument to MutableDenseHashTableV2.
 type MutableDenseHashTableV2Attr func(optionalAttr)
 
@@ -16125,6 +16455,30 @@ func IRFFT(scope *Scope, input tf.Output, fft_length tf.Output) (output tf.Outpu
 	return op.Output(0)
 }
 
+// Creates a dataset with a range of values. Corresponds to python's xrange.
+//
+// Arguments:
+//	start: corresponds to start in python's xrange().
+//	stop: corresponds to stop in python's xrange().
+//	step: corresponds to step in python's xrange().
+//
+//
+func RangeDataset(scope *Scope, start tf.Output, stop tf.Output, step tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "RangeDataset",
+		Input: []tf.Input{
+			start, stop, step,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Saves tensors in V2 checkpoint format.
 //
 // By default, saves the named tensors in full.  If the caller wishes to save
@@ -16634,6 +16988,30 @@ func UniqueWithCounts(scope *Scope, x tf.Output, optional ...UniqueWithCountsAtt
 	return op.Output(0), op.Output(1), op.Output(2)
 }
 
+// Creates a dataset that skips `count` elements from the `input_dataset`.
+//
+// Arguments:
+//
+//	count: A scalar representing the number of elements from the `input_dataset`
+// that should be skipped.  If count is -1, skips everything.
+//
+//
+func SkipDataset(scope *Scope, input_dataset tf.Output, count tf.Output, output_types []tf.DataType, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_types": output_types, "output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "SkipDataset",
+		Input: []tf.Input{
+			input_dataset, count,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // ComplexAttr is an optional argument to Complex.
 type ComplexAttr func(optionalAttr)
 
@@ -16744,6 +17122,25 @@ func SdcaFprint(scope *Scope, input tf.Output) (output tf.Output) {
 	return op.Output(0)
 }
 
+// Creates a dataset that emits the lines of one or more text files.
+//
+// Arguments:
+//	filenames: A scalar or a vector containing the name(s) of the file(s) to be
+// read.
+func TextLineDataset(scope *Scope, filenames tf.Output) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "TextLineDataset",
+		Input: []tf.Input{
+			filenames,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Returns the number of records this Reader has produced.
 //
 // This is the same as the number of ReaderRead executions that have
@@ -18358,6 +18755,23 @@ func Cos(scope *Scope, x tf.Output) (y tf.Output) {
 	return op.Output(0)
 }
 
+// Creates a dataset that emits each dim-0 slice of `components` once.
+func TensorSliceDataset(scope *Scope, components []tf.Output, output_shapes []tf.Shape) (handle tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{"output_shapes": output_shapes}
+	opspec := tf.OpSpec{
+		Type: "TensorSliceDataset",
+		Input: []tf.Input{
+			tf.OutputList(components),
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes tan of x element-wise.
 func Tan(scope *Scope, x tf.Output) (y tf.Output) {
 	if scope.Err() != nil {
-- 
GitLab


From 13b552e332698ed6282aad3b702c52cc619a8c37 Mon Sep 17 00:00:00 2001
From: Yuefeng Zhou <yuefengz@google.com>
Date: Tue, 16 May 2017 21:26:55 -0700
Subject: [PATCH 1434/1563] Add filesize as a node attribute if filename exists
 as its input.

PiperOrigin-RevId: 156269550
---
 tensorflow/core/grappler/costs/BUILD    |   1 +
 tensorflow/core/grappler/costs/utils.cc | 135 ++++++++++++++++++------
 tensorflow/core/grappler/costs/utils.h  |  10 ++
 3 files changed, 115 insertions(+), 31 deletions(-)

diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD
index e0a27d3025..adaf6cab05 100644
--- a/tensorflow/core/grappler/costs/BUILD
+++ b/tensorflow/core/grappler/costs/BUILD
@@ -122,6 +122,7 @@ cc_library(
         "//tensorflow/core:core_cpu_base",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
+        "//tensorflow/core:lib_proto_parsing",
         "//tensorflow/core:protos_all_cc",
     ] + if_cuda([
         "//tensorflow/core:cuda",
diff --git a/tensorflow/core/grappler/costs/utils.cc b/tensorflow/core/grappler/costs/utils.cc
index bdfb17a456..209eccd40d 100644
--- a/tensorflow/core/grappler/costs/utils.cc
+++ b/tensorflow/core/grappler/costs/utils.cc
@@ -26,6 +26,9 @@ limitations under the License.
 #include "cuda/include/cudnn.h"
 #endif
 
+#include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_def.pb.h"
 #include "tensorflow/core/framework/tensor_shape.pb.h"
 #include "tensorflow/core/framework/types.pb.h"
 #include "tensorflow/core/graph/graph.h"
@@ -34,6 +37,8 @@ limitations under the License.
 #include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/cpu_info.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/protobuf.h"
 #include "tensorflow/core/util/device_name_utils.h"
 
 namespace tensorflow {
@@ -64,6 +69,77 @@ static std::vector<TensorProto> ExtractTensors(const AttrValue& attr_value) {
   return tensors;
 }
 
+static void ExtractExtraProperties(
+    const NodeDef& node,
+    const std::unordered_map<string, const NodeDef*>& name_to_node,
+    std::vector<OpInfo::TensorProperties>* extra_inputs,
+    protobuf::Map<string, AttrValue>* attr_map) {
+  OpRegistry* op_registry = OpRegistry::Global();
+  const OpDef* op_def;
+  auto s = op_registry->LookUpOpDef(node.op(), &op_def);
+  if (!s.ok()) {
+    op_def = nullptr;
+  }
+
+  for (int i = 0; i < node.input_size(); ++i) {
+    const string input_name = node.input(i);
+    CHECK(!input_name.empty());
+    TensorId input_tensor_id = ParseTensorName(input_name);
+    const string input_node_name = input_tensor_id.first.ToString();
+
+    auto iter = name_to_node.find(input_node_name);
+    if (iter == name_to_node.end()) continue;
+    const NodeDef* input_node = iter->second;
+
+    // The value attribute in Const input is useful for cost prediction.
+    if (input_node->op() == "Const") {
+      auto it = input_node->attr().find("value");
+      if (it == input_node->attr().end()) continue;
+
+      const AttrValue& attr_value = it->second;
+      std::vector<TensorProto> tensors = ExtractTensors(attr_value);
+      if (tensors.empty()) continue;
+
+      const TensorProto& t = tensors[0];
+      OpInfo::TensorProperties input;
+      input.set_dtype(t.dtype());
+      *(input.mutable_shape()) = t.tensor_shape();
+      *(input.mutable_value()) = t;
+      extra_inputs->push_back(input);
+
+      // For filename input, the file size can also be useful.
+      if (op_def &&
+          op_def->input_arg(i).name().find("filename") != std::string::npos) {
+        Tensor tensor;
+        CHECK(tensor.FromProto(t));
+        const string filename = tensor.scalar<string>()();
+
+        Env* env = Env::Default();
+        FileStatistics stat;
+        Status s = env->Stat(filename, &stat);
+        if (s.ok()) {
+          AttrValue attr;
+          attr.set_i(stat.length);
+          string attr_key = strings::StrCat("input_", i, "_filesize");
+          (*attr_map)[attr_key] = attr;
+        }
+      }
+    }
+
+    // When the input is a handle (e.g. look up table handle), the information
+    // in the op itself is not sufficient to predict the op memory.
+    if (op_def &&
+        op_def->input_arg(i).name().find("handle") != std::string::npos) {
+      string new_key = strings::StrCat("parent_", i, "_op");
+      AttrValue attr;
+      attr.set_s(input_node->op());
+      (*attr_map)[new_key] = attr;
+      // TODO(yuefengz): Only parent node's op name is copied. Copy inputs
+      // and attributes when necessary.
+    }
+  }
+}
+
 std::vector<OpInfo::TensorProperties> FindInputFeatures(
     const NodeDef& node,
     const std::unordered_map<string, const CostGraphDef::Node*>& name_to_cost,
@@ -80,35 +156,6 @@ std::vector<OpInfo::TensorProperties> FindInputFeatures(
       continue;
     }
 
-    auto iter = name_to_node.find(input_node_name);
-    if (iter != name_to_node.end()) {
-      const NodeDef* node = iter->second;
-      if (node->op() == "Const") {
-        auto it = node->attr().find("value");
-        if (it == node->attr().end()) {
-          inputs.push_back(UnknownInput());
-          continue;
-        }
-
-        const AttrValue& attr_value = it->second;
-        std::vector<TensorProto> tensors = ExtractTensors(attr_value);
-
-        if (tensors.empty()) {
-          inputs.push_back(UnknownInput());
-          continue;
-        }
-
-        for (const auto& t : tensors) {
-          OpInfo::TensorProperties input;
-          input.set_dtype(t.dtype());
-          *(input.mutable_shape()) = t.tensor_shape();
-          *(input.mutable_value()) = t;
-          inputs.push_back(input);
-        }
-        continue;
-      }
-    }
-
     auto it = name_to_cost.find(input_node_name);
     if (it == name_to_cost.end() || output_index < 0) {
       inputs.push_back(UnknownInput());
@@ -126,9 +173,9 @@ std::vector<OpInfo::TensorProperties> FindInputFeatures(
   return inputs;
 }
 
-DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node) {
+DeviceProperties GetDeviceInfo(const string& device_str) {
   DeviceNameUtils::ParsedName parsed;
-  if (DeviceNameUtils::ParseFullName(node.device(), &parsed)) {
+  if (DeviceNameUtils::ParseFullName(device_str, &parsed)) {
     if (parsed.type == "GPU") {
       return GetLocalGPUInfo(parsed.id);
     } else if (parsed.type == "CPU") {
@@ -140,5 +187,31 @@ DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node) {
   return device;
 }
 
+DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node) {
+  return GetDeviceInfo(node.device());
+}
+
+OpInfo BuildOpInfo(
+    const NodeDef& node, const string& device_str,
+    const std::unordered_map<string, const NodeDef*>& name_to_node,
+    const std::vector<OpInfo::TensorProperties>& inputs) {
+  OpInfo op_info;
+  op_info.set_op(node.op());
+  *op_info.mutable_attr() = node.attr();
+  *op_info.mutable_device() = GetDeviceInfo(device_str);
+  for (auto& input : inputs) {
+    *op_info.add_inputs() = input;
+  }
+
+  std::vector<OpInfo::TensorProperties> extra_inputs;
+  ExtractExtraProperties(node, name_to_node, &extra_inputs,
+                         op_info.mutable_attr());
+  for (auto& input : extra_inputs) {
+    *op_info.add_inputs() = input;
+  }
+
+  return op_info;
+}
+
 }  // end namespace grappler
 }  // end namespace tensorflow
diff --git a/tensorflow/core/grappler/costs/utils.h b/tensorflow/core/grappler/costs/utils.h
index 32e32a09e1..bdba4e4b15 100644
--- a/tensorflow/core/grappler/costs/utils.h
+++ b/tensorflow/core/grappler/costs/utils.h
@@ -22,6 +22,7 @@ limitations under the License.
 
 #include "tensorflow/core/framework/cost_graph.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/framework/op_def.pb.h"
 #include "tensorflow/core/graph/types.h"
 #include "tensorflow/core/grappler/costs/op_performance_data.pb.h"
 #include "tensorflow/core/platform/types.h"
@@ -42,6 +43,15 @@ std::vector<OpInfo::TensorProperties> FindInputFeatures(
 
 // Returns the DeviceProperties of the device on which 'node' runs.
 DeviceProperties GetDeviceInfo(const CostGraphDef::Node& node);
+DeviceProperties GetDeviceInfo(const string& device_str);
+
+// Builds the OpInfo proto for node, given all nodes in the graph, the node's
+// device and its input properties which are typically built by shape inference
+// or calling FindInputFeatures.
+OpInfo BuildOpInfo(
+    const NodeDef& node, const string& device_str,
+    const std::unordered_map<string, const NodeDef*>& name_to_node,
+    const std::vector<OpInfo::TensorProperties>& inputs);
 
 }  // end namespace grappler
 }  // end namespace tensorflow
-- 
GitLab


From 7161c8205794f744653ffe6739a0c4038e1d6cb8 Mon Sep 17 00:00:00 2001
From: Beomsu Kim <123bskim@naver.com>
Date: Wed, 17 May 2017 13:35:37 +0900
Subject: [PATCH 1435/1563] Fix contrib.seq2seq.BeamSearchDecoder #9855 (#9875)

* Shielded top_k input with min

Fixes #9855.

* Fix docstring note about BeamSearch _get_scores

* Change next_beam_size to tensor

* Calculate number of available beams before cond
---
 .../seq2seq/python/ops/beam_search_decoder.py      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index eb494bda4b..c9be517fad 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -497,13 +497,22 @@ def _beam_search_step(time, logits, beam_state, batch_size, beam_width,
 
   time = ops.convert_to_tensor(time, name="time")
   # During the first time step we only consider the initial beam
+  scores_shape = array_ops.shape(scores)
   scores_flat = control_flow_ops.cond(
       time > 0,
       lambda: array_ops.reshape(scores, [batch_size, -1]),
       lambda: scores[:, 0])
+  num_available_beam = control_flow_ops.cond(
+      time > 0,
+      lambda: math_ops.reduce_prod(scores_shape[1:]),
+      lambda: math_ops.reduce_prod(scores_shape[2:]))
 
   # Pick the next beams according to the specified successors function
-  next_beam_scores, word_indices = nn_ops.top_k(scores_flat, k=beam_width)
+  next_beam_size = math_ops.minimum(
+      ops.convert_to_tensor(
+          beam_width, dtype=dtypes.int32, name="beam_width"),
+      num_available_beam)
+  next_beam_scores, word_indices = nn_ops.top_k(scores_flat, k=next_beam_size)
   next_beam_scores.set_shape([static_batch_size, beam_width])
   word_indices.set_shape([static_batch_size, beam_width])
 
@@ -561,7 +570,8 @@ def _get_scores(log_probs, sequence_lengths, length_penalty_weight):
   """Calculates scores for beam search hypotheses.
 
   Args:
-    log_probs: The log probabilities with shape [batch_size, beam_width].
+    log_probs: The log probabilities with shape
+      `[batch_size, beam_width, vocab_size]`.
     sequence_lengths: The array of sequence lengths.
     length_penalty_weight: Float weight to penalize length. Disabled with 0.0.
 
-- 
GitLab


From 513b1e4bab3eee797877a1250fa18e3ae9c349ad Mon Sep 17 00:00:00 2001
From: Corey Wharton <corey@cwharton.com>
Date: Tue, 16 May 2017 21:36:05 -0700
Subject: [PATCH 1436/1563] Allow tensor as iou_threshold parameter to
 tf.image.non_max_suppression. (#9887)

* Implement NonMaxSuppressionV2 op that allows tensor as iou_threshold parameter.

* Move local functions into anonymous namespace.
---
 .../core/kernels/non_max_suppression_op.cc    | 142 +++++++++------
 .../kernels/non_max_suppression_op_test.cc    | 165 +++++++++++++++++-
 tensorflow/core/ops/image_ops.cc              |  47 ++++-
 tensorflow/python/ops/image_ops.py            |   1 +
 tensorflow/python/ops/image_ops_impl.py       |   1 +
 5 files changed, 299 insertions(+), 57 deletions(-)

diff --git a/tensorflow/core/kernels/non_max_suppression_op.cc b/tensorflow/core/kernels/non_max_suppression_op.cc
index 4d4851c70c..dc95f67ff0 100644
--- a/tensorflow/core/kernels/non_max_suppression_op.cc
+++ b/tensorflow/core/kernels/non_max_suppression_op.cc
@@ -33,6 +33,7 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.h"
 
 namespace tensorflow {
+namespace {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
@@ -89,6 +90,63 @@ static inline float ComputeIOU(typename TTypes<float, 2>::ConstTensor boxes,
   return intersection_area / (area_i + area_j - intersection_area);
 }
 
+void DoNonMaxSuppressionOp(OpKernelContext* context,
+                           const Tensor& boxes,
+                           const Tensor& scores,
+                           const Tensor& max_output_size,
+                           const float iou_threshold) {
+  OP_REQUIRES(context, iou_threshold >= 0 && iou_threshold <= 1,
+      errors::InvalidArgument("iou_threshold must be in [0, 1]"));
+  
+  int num_boxes = 0;
+  ParseAndCheckBoxSizes(context, boxes, scores, &num_boxes);
+  if (!context->status().ok()) {
+    return;
+  }
+
+  const int output_size =
+      std::min(max_output_size.scalar<int>()(), num_boxes);
+  typename TTypes<float, 2>::ConstTensor boxes_data =
+      boxes.tensor<float, 2>();
+
+  std::vector<float> scores_data(num_boxes);
+  std::copy_n(scores.flat<float>().data(), num_boxes, scores_data.begin());
+  std::vector<int> sorted_indices;
+  DecreasingArgSort(scores_data, &sorted_indices);
+
+  std::vector<bool> active(num_boxes, true);
+  std::vector<int> selected;
+  int num_active = active.size();
+  for (int i = 0; i < num_boxes; ++i) {
+    if (num_active == 0 || selected.size() >= output_size) break;
+    if (active[i]) {
+      selected.push_back(sorted_indices[i]);
+    } else {
+      continue;
+    }
+    for (int j = i + 1; j < num_boxes; ++j) {
+      if (active[j]) {
+        float iou =
+          ComputeIOU(boxes_data, sorted_indices[i], sorted_indices[j]);
+        if (iou > iou_threshold) {
+          active[j] = false;
+          num_active--;
+        }
+      }
+    }
+  }
+
+  // Allocate output tensor
+  Tensor* output = nullptr;
+  TensorShape output_shape({static_cast<int>(selected.size())});
+  OP_REQUIRES_OK(context, context->allocate_output(0, output_shape, &output));
+  typename TTypes<int, 1>::Tensor selected_indices_data =
+      output->tensor<int, 1>();
+  std::copy_n(selected.begin(), selected.size(), selected_indices_data.data());
+}
+
+} // namespace
+
 template <typename Device>
 class NonMaxSuppressionOp : public OpKernel {
  public:
@@ -98,9 +156,6 @@ class NonMaxSuppressionOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* context) override {
-    OP_REQUIRES(context, iou_threshold_ >= 0 && iou_threshold_ <= 1,
-                errors::InvalidArgument("iou_threshold must be in [0, 1]"));
-
     // boxes: [num_boxes, 4]
     const Tensor& boxes = context->input(0);
     // scores: [num_boxes]
@@ -112,59 +167,48 @@ class NonMaxSuppressionOp : public OpKernel {
         errors::InvalidArgument("max_output_size must be 0-D, got shape ",
                                 max_output_size.shape().DebugString()));
 
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, scores, &num_boxes);
-    if (!context->status().ok()) {
-      return;
-    }
-
-    const int output_size =
-        std::min(max_output_size.scalar<int>()(), num_boxes);
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-
-    std::vector<float> scores_data(num_boxes);
-    std::copy_n(scores.flat<float>().data(), num_boxes, scores_data.begin());
-    std::vector<int> sorted_indices;
-    DecreasingArgSort(scores_data, &sorted_indices);
-
-    std::vector<bool> active(num_boxes, true);
-    std::vector<int> selected;
-    int num_active = active.size();
-    for (int i = 0; i < num_boxes; ++i) {
-      if (num_active == 0 || selected.size() >= output_size) break;
-      if (active[i]) {
-        selected.push_back(sorted_indices[i]);
-      } else {
-        continue;
-      }
-      for (int j = i + 1; j < num_boxes; ++j) {
-        if (active[j]) {
-          float iou =
-              ComputeIOU(boxes_data, sorted_indices[i], sorted_indices[j]);
-          if (iou > iou_threshold_) {
-            active[j] = false;
-            num_active--;
-          }
-        }
-      }
-    }
-
-    // Allocate output tensor
-    Tensor* output = nullptr;
-    TensorShape output_shape({static_cast<int>(selected.size())});
-    OP_REQUIRES_OK(context, context->allocate_output(0, output_shape, &output));
-    typename TTypes<int, 1>::Tensor selected_indices_data =
-        output->tensor<int, 1>();
-    std::copy_n(selected.begin(), selected.size(),
-                selected_indices_data.data());
+    DoNonMaxSuppressionOp(context, boxes, scores, max_output_size, iou_threshold_);
   }
 
  private:
   float iou_threshold_;
 };
 
+template <typename Device>
+class NonMaxSuppressionV2Op : public OpKernel {
+ public:
+  explicit NonMaxSuppressionV2Op(OpKernelConstruction* context)
+      : OpKernel(context) {
+  }
+
+  void Compute(OpKernelContext* context) override {
+    // boxes: [num_boxes, 4]
+    const Tensor& boxes = context->input(0);
+    // scores: [num_boxes]
+    const Tensor& scores = context->input(1);
+    // max_output_size: scalar
+    const Tensor& max_output_size = context->input(2);
+    OP_REQUIRES(
+        context, TensorShapeUtils::IsScalar(max_output_size.shape()),
+        errors::InvalidArgument("max_output_size must be 0-D, got shape ",
+                                max_output_size.shape().DebugString()));
+    // iou_threshold: scalar
+    const Tensor& iou_threshold = context->input(3);
+    OP_REQUIRES(
+        context, TensorShapeUtils::IsScalar(iou_threshold.shape()),
+        errors::InvalidArgument("iou_threshold must be 0-D, got shape ",
+                                iou_threshold.shape().DebugString()));
+
+    const float iou_threshold_val = iou_threshold.scalar<float>()();
+
+    DoNonMaxSuppressionOp(context, boxes, scores, max_output_size, iou_threshold_val);
+  }
+};
+
 REGISTER_KERNEL_BUILDER(Name("NonMaxSuppression").Device(DEVICE_CPU),
                         NonMaxSuppressionOp<CPUDevice>);
 
+REGISTER_KERNEL_BUILDER(Name("NonMaxSuppressionV2").Device(DEVICE_CPU),
+                        NonMaxSuppressionV2Op<CPUDevice>);
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/non_max_suppression_op_test.cc b/tensorflow/core/kernels/non_max_suppression_op_test.cc
index 72e368db77..0a075b48b0 100644
--- a/tensorflow/core/kernels/non_max_suppression_op_test.cc
+++ b/tensorflow/core/kernels/non_max_suppression_op_test.cc
@@ -141,6 +141,161 @@ TEST_F(NonMaxSuppressionOpTest, TestInconsistentBoxAndScoreShapes) {
   AddInputFromArray<float>(TensorShape({5}), {.9f, .75f, .6f, .95f, .5f});
   AddInputFromArray<int>(TensorShape({}), {30});
   Status s = RunOpKernel();
+  
+  ASSERT_FALSE(s.ok());
+  EXPECT_TRUE(
+              StringPiece(s.ToString()).contains("scores has incompatible shape"))
+    << s;
+}
+
+TEST_F(NonMaxSuppressionOpTest, TestInvalidIOUThreshold) {
+  MakeOp(1.2);
+  AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
+  AddInputFromArray<float>(TensorShape({1}), {.9f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  Status s = RunOpKernel();
+
+  ASSERT_FALSE(s.ok());
+  EXPECT_TRUE(
+              StringPiece(s.ToString()).contains("iou_threshold must be in [0, 1]"))
+    << s;
+}
+
+TEST_F(NonMaxSuppressionOpTest, TestEmptyInput) {
+  MakeOp(.5);
+  AddInputFromArray<float>(TensorShape({0, 4}), {});
+  AddInputFromArray<float>(TensorShape({0}), {});
+  AddInputFromArray<int>(TensorShape({}), {30});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({0}));
+  test::FillValues<int>(&expected, {});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+    
+//
+// NonMaxSuppressionV2Op Tests
+//
+
+class NonMaxSuppressionV2OpTest : public OpsTestBase {
+ protected:
+  void MakeOp() {
+    TF_EXPECT_OK(NodeDefBuilder("non_max_suppression_op", "NonMaxSuppressionV2")
+                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(DT_INT32))
+                     .Input(FakeInput(DT_FLOAT))
+                     .Finalize(node_def()));
+    TF_EXPECT_OK(InitOp());
+  }
+};
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromThreeClusters) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({6, 4}),
+                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
+  test::FillValues<int>(&expected, {3, 0, 5});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromThreeClustersFlippedCoordinates) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({6, 4}),
+                           {1, 1,  0, 0,  0, 0.1f,  1, 1.1f,  0, .9f,  1, -0.1f,
+                            0, 10, 1, 11, 1, 10.1f, 0, 11.1f, 1, 101, 0, 100});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
+  test::FillValues<int>(&expected, {3, 0, 5});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectAtMostTwoBoxesFromThreeClusters) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({6, 4}),
+                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {2});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({2}));
+  test::FillValues<int>(&expected, {3, 0});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectAtMostThirtyBoxesFromThreeClusters) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({6, 4}),
+                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {30});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
+  test::FillValues<int>(&expected, {3, 0, 5});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectSingleBox) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
+  AddInputFromArray<float>(TensorShape({1}), {.9f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({1}));
+  test::FillValues<int>(&expected, {0});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromTenIdenticalBoxes) {
+  MakeOp();
+
+  int num_boxes = 10;
+  std::vector<float> corners(num_boxes * 4);
+  std::vector<float> scores(num_boxes);
+  for (int i = 0; i < num_boxes; ++i) {
+    corners[i * 4 + 0] = 0;
+    corners[i * 4 + 1] = 0;
+    corners[i * 4 + 2] = 1;
+    corners[i * 4 + 3] = 1;
+    scores[i] = .9;
+  }
+  AddInputFromArray<float>(TensorShape({num_boxes, 4}), corners);
+  AddInputFromArray<float>(TensorShape({num_boxes}), scores);
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({1}));
+  test::FillValues<int>(&expected, {0});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestInconsistentBoxAndScoreShapes) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({6, 4}),
+                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
+  AddInputFromArray<float>(TensorShape({5}), {.9f, .75f, .6f, .95f, .5f});
+  AddInputFromArray<int>(TensorShape({}), {30});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  Status s = RunOpKernel();
 
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(
@@ -148,11 +303,12 @@ TEST_F(NonMaxSuppressionOpTest, TestInconsistentBoxAndScoreShapes) {
       << s;
 }
 
-TEST_F(NonMaxSuppressionOpTest, TestInvalidIOUThreshold) {
-  MakeOp(1.2);
+TEST_F(NonMaxSuppressionV2OpTest, TestInvalidIOUThreshold) {
+  MakeOp();
   AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
   AddInputFromArray<float>(TensorShape({1}), {.9f});
   AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {1.2f});
   Status s = RunOpKernel();
 
   ASSERT_FALSE(s.ok());
@@ -161,11 +317,12 @@ TEST_F(NonMaxSuppressionOpTest, TestInvalidIOUThreshold) {
       << s;
 }
 
-TEST_F(NonMaxSuppressionOpTest, TestEmptyInput) {
-  MakeOp(.5);
+TEST_F(NonMaxSuppressionV2OpTest, TestEmptyInput) {
+  MakeOp();
   AddInputFromArray<float>(TensorShape({0, 4}), {});
   AddInputFromArray<float>(TensorShape({0}), {});
   AddInputFromArray<int>(TensorShape({}), {30});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
   TF_ASSERT_OK(RunOpKernel());
 
   Tensor expected(allocator(), DT_INT32, TensorShape({0}));
diff --git a/tensorflow/core/ops/image_ops.cc b/tensorflow/core/ops/image_ops.cc
index cfcf2d1ff9..bbfdb34758 100644
--- a/tensorflow/core/ops/image_ops.cc
+++ b/tensorflow/core/ops/image_ops.cc
@@ -972,11 +972,50 @@ method: A string specifying the interpolation method. Only 'bilinear' is
 // --------------------------------------------------------------------------
 
 REGISTER_OP("NonMaxSuppression")
+  .Input("boxes: float")
+  .Input("scores: float")
+  .Input("max_output_size: int32")
+  .Output("selected_indices: int32")
+  .Attr("iou_threshold: float = 0.5")
+  .SetShapeFn([](InferenceContext* c) {
+      c->set_output(0, c->Vector(c->UnknownDim()));
+      return Status::OK();
+    })
+  .Doc(R"doc(
+Greedily selects a subset of bounding boxes in descending order of score,
+pruning away boxes that have high intersection-over-union (IOU) overlap
+with previously selected boxes.  Bounding boxes are supplied as
+[y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any
+diagonal pair of box corners and the coordinates can be provided as normalized
+(i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm
+is agnostic to where the origin is in the coordinate system.  Note that this
+algorithm is invariant to orthogonal transformations and translations
+of the coordinate system; thus translating or reflections of the coordinate
+system result in the same boxes being selected by the algorithm.
+The output of this operation is a set of integers indexing into the input
+collection of bounding boxes representing the selected boxes.  The bounding
+box coordinates corresponding to the selected indices can then be obtained
+using the `tf.gather operation`.  For example:
+  selected_indices = tf.image.non_max_suppression(
+      boxes, scores, max_output_size, iou_threshold)
+  selected_boxes = tf.gather(boxes, selected_indices)
+boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
+scores: A 1-D float tensor of shape `[num_boxes]` representing a single
+  score corresponding to each box (each row of boxes).
+max_output_size: A scalar integer tensor representing the maximum number of
+  boxes to be selected by non max suppression.
+iou_threshold: A float representing the threshold for deciding whether boxes
+  overlap too much with respect to IOU.
+selected_indices: A 1-D integer tensor of shape `[M]` representing the selected
+  indices from the boxes tensor, where `M <= max_output_size`.
+)doc");
+
+REGISTER_OP("NonMaxSuppressionV2")
     .Input("boxes: float")
     .Input("scores: float")
     .Input("max_output_size: int32")
+    .Input("iou_threshold: float")
     .Output("selected_indices: int32")
-    .Attr("iou_threshold: float = 0.5")
     .SetShapeFn([](InferenceContext* c) {
       c->set_output(0, c->Vector(c->UnknownDim()));
       return Status::OK();
@@ -998,7 +1037,7 @@ collection of bounding boxes representing the selected boxes.  The bounding
 box coordinates corresponding to the selected indices can then be obtained
 using the `tf.gather operation`.  For example:
 
-  selected_indices = tf.image.non_max_suppression(
+  selected_indices = tf.image.non_max_suppression_v2(
       boxes, scores, max_output_size, iou_threshold)
   selected_boxes = tf.gather(boxes, selected_indices)
 
@@ -1007,8 +1046,8 @@ scores: A 1-D float tensor of shape `[num_boxes]` representing a single
   score corresponding to each box (each row of boxes).
 max_output_size: A scalar integer tensor representing the maximum number of
   boxes to be selected by non max suppression.
-iou_threshold: A float representing the threshold for deciding whether boxes
-  overlap too much with respect to IOU.
+iou_threshold: A 0-D float tensor representing the threshold for deciding whether
+  boxes overlap too much with respect to IOU.
 selected_indices: A 1-D integer tensor of shape `[M]` representing the selected
   indices from the boxes tensor, where `M <= max_output_size`.
 )doc");
diff --git a/tensorflow/python/ops/image_ops.py b/tensorflow/python/ops/image_ops.py
index c29ae26f04..2aad1e1519 100644
--- a/tensorflow/python/ops/image_ops.py
+++ b/tensorflow/python/ops/image_ops.py
@@ -59,6 +59,7 @@ See the @{$python/image} guide.
 @@per_image_standardization
 @@draw_bounding_boxes
 @@non_max_suppression
+@@non_max_suppression_v2
 @@sample_distorted_bounding_box
 @@total_variation
 """
diff --git a/tensorflow/python/ops/image_ops_impl.py b/tensorflow/python/ops/image_ops_impl.py
index 3e140ce047..ae7999a71e 100644
--- a/tensorflow/python/ops/image_ops_impl.py
+++ b/tensorflow/python/ops/image_ops_impl.py
@@ -52,6 +52,7 @@ ops.NotDifferentiable('SampleDistortedBoundingBox')
 # latent bugs here.
 ops.NotDifferentiable('ExtractGlimpse')
 ops.NotDifferentiable('NonMaxSuppression')
+ops.NotDifferentiable('NonMaxSuppressionV2')
 
 
 def _assert(cond, ex_type, msg):
-- 
GitLab


From 339856c0a6599d194895b0fdff35b61c53663bc2 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Tue, 16 May 2017 21:55:43 -0700
Subject: [PATCH 1437/1563] Fix small typo in Dataset readme.

PiperOrigin-RevId: 156270919
---
 tensorflow/contrib/data/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/data/README.md b/tensorflow/contrib/data/README.md
index 9907a9fb37..15c1c76e51 100644
--- a/tensorflow/contrib/data/README.md
+++ b/tensorflow/contrib/data/README.md
@@ -591,7 +591,7 @@ epoch.
 
 If you want to receive a signal at the end of each epoch, you can write a
 training loop that catches the `tf.errors.OutOfRangeError` at the end of a
-dataset. At that point you might collection some statistics (e.g. the validation
+dataset. At that point you might collect some statistics (e.g. the validation
 error) for the epoch.
 
 ```python
-- 
GitLab


From bbbff4301a8ede3c7cf8822f3313d203c7ef2aa3 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Tue, 16 May 2017 23:07:54 -0700
Subject: [PATCH 1438/1563] Add data module to contrib and call out the
 datasets that we want to export.

PiperOrigin-RevId: 156274525
---
 tensorflow/contrib/__init__.py      | 1 +
 tensorflow/contrib/data/__init__.py | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py
index 0f0d4a9926..3908c37fcd 100644
--- a/tensorflow/contrib/__init__.py
+++ b/tensorflow/contrib/__init__.py
@@ -25,6 +25,7 @@ from tensorflow.contrib import compiler
 from tensorflow.contrib import copy_graph
 from tensorflow.contrib import crf
 from tensorflow.contrib import cudnn_rnn
+from tensorflow.contrib import data
 from tensorflow.contrib import deprecated
 from tensorflow.contrib import distributions
 from tensorflow.contrib import factorization
diff --git a/tensorflow/contrib/data/__init__.py b/tensorflow/contrib/data/__init__.py
index 85e090b8ce..5308ab64ac 100644
--- a/tensorflow/contrib/data/__init__.py
+++ b/tensorflow/contrib/data/__init__.py
@@ -16,6 +16,9 @@
 
 @@Dataset
 @@Iterator
+@@TFRecordDataset
+@@FixedLengthRecordDataset
+@@TextLineDataset
 
 @@read_batch_features
 @@rejection_resample
@@ -27,9 +30,12 @@ from __future__ import print_function
 
 # pylint: disable=unused-import
 from tensorflow.contrib.data.python.ops.dataset_ops import Dataset
+from tensorflow.contrib.data.python.ops.dataset_ops import FixedLengthRecordDataset
 from tensorflow.contrib.data.python.ops.dataset_ops import Iterator
 from tensorflow.contrib.data.python.ops.dataset_ops import read_batch_features
 from tensorflow.contrib.data.python.ops.dataset_ops import rejection_resample
+from tensorflow.contrib.data.python.ops.dataset_ops import TextLineDataset
+from tensorflow.contrib.data.python.ops.dataset_ops import TFRecordDataset
 # pylint: enable=unused-import
 
 from tensorflow.python.util.all_util import remove_undocumented
-- 
GitLab


From 48af264186609a3547515a861e1c0e3cdd0464bc Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Wed, 17 May 2017 01:49:08 -0700
Subject: [PATCH 1439/1563] Move optimizer to appropriate folder and reverse
 changes to Optimizer class

---
 tensorflow/contrib/opt/BUILD                  |  18 ++
 tensorflow/contrib/opt/__init__.py            |   4 +-
 .../delay_compensated_gradient_descent.py     | 254 ++++++++++++++++++
 ...delay_compensated_gradient_descent_test.py |   4 +-
 .../delay_compensated_gradient_descent.py     |  85 ------
 tensorflow/python/training/training.py        |   6 -
 6 files changed, 276 insertions(+), 95 deletions(-)
 create mode 100644 tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
 rename tensorflow/{ => contrib/opt}/python/training/delay_compensated_gradient_descent_test.py (98%)
 delete mode 100644 tensorflow/python/training/delay_compensated_gradient_descent.py

diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index 2173e13b91..d50ee906fb 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -13,6 +13,7 @@ py_library(
     name = "opt_py",
     srcs = [
         "__init__.py",
+        "python/training/delay_compensated_gradient_descent.py",
         "python/training/external_optimizer.py",
         "python/training/lazy_adam_optimizer.py",
         "python/training/moving_average_optimizer.py",
@@ -34,6 +35,23 @@ py_library(
     ],
 )
 
+py_test(
+    name = "delay_compensated_gradient_descent_test",
+    srcs = ["python/training/delay_compensated_gradient_descent_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":opt_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:extra_py_tests_deps",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:random_ops",
+        "//tensorflow/python:variables",
+        "//third_party/py/numpy",
+    ],
+)
+
 py_test(
     name = "external_optimizer_test",
     srcs = ["python/training/external_optimizer_test.py"],
diff --git a/tensorflow/contrib/opt/__init__.py b/tensorflow/contrib/opt/__init__.py
index f88976a438..036e705799 100644
--- a/tensorflow/contrib/opt/__init__.py
+++ b/tensorflow/contrib/opt/__init__.py
@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 # pylint: disable=wildcard-import
+from tensorflow.contrib.opt.python.training.delay_compensated_gradient_descent import *
 from tensorflow.contrib.opt.python.training.external_optimizer import *
 from tensorflow.contrib.opt.python.training.lazy_adam_optimizer import *
 from tensorflow.contrib.opt.python.training.moving_average_optimizer import *
@@ -27,7 +28,8 @@ from tensorflow.contrib.opt.python.training.variable_clipping_optimizer import *
 
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = ['ExternalOptimizerInterface',
+_allowed_symbols = ['DelayCompensatedGradientDescentOptimizer',
+                    'ExternalOptimizerInterface',
                     'LazyAdamOptimizer',
                     'MovingAverageOptimizer',
                     'ScipyOptimizerInterface',
diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
new file mode 100644
index 0000000000..ada3f14473
--- /dev/null
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
@@ -0,0 +1,254 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""DelayCompensatedGradientDescentOptimizer for TensorFlow."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import state_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import variables
+from tensorflow.python.training import optimizer
+from tensorflow.python.training import training_ops
+
+
+class _RefVariableAsynchronousProcessor(optimizer._RefVariableProcessor):
+    """Processor for Variable."""
+    def update_op_asynchronous(self, optimizer, g, index):
+        if isinstance(g, ops.Tensor):
+            return optimizer._apply_dense(g, self._v, index)
+        else:
+            assert isinstance(g, ops.IndexedSlices), ("Gradient ", g, " is neither a "
+                                                      "tensor nor IndexedSlices.")
+            # pylint: disable=protected-access
+            return optimizer._apply_sparse_duplicate_indices(g, self._v, index)
+
+class _DenseResourceVariableAsynchronousProcessor(optimizer._DenseResourceVariableProcessor):
+    """Processor for dense ResourceVariables."""
+    def update_op_asynchronous(self, optimizer, g, index):
+        # pylint: disable=protected-access
+        if isinstance(g, ops.IndexedSlices):
+            return optimizer._resource_apply_sparse_duplicate_indices(
+                g.values, self._v, g.indices, index)
+        return optimizer._resource_apply_dense(g, self._v, index)
+
+def _get_processor(v):
+    """The processor of v."""
+    if isinstance(v, variables.Variable):
+        return _RefVariableAsynchronousProcessor(v)
+    if v.op.type == "VarHandleOp":
+        return _DenseResourceVariableAsynchronousProcessor(v)
+    raise NotImplementedError("Trying to optimize unsupported type ", v)
+
+class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
+    """Optimizer that implements the gradient descent algorithm with delay
+    compensation.
+
+    See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
+    ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
+    """
+
+    def __init__(self, learning_rate, variance_parameter, num_workers=1,
+                 use_locking=False, name="DelayCompensatedGradientDescent"):
+        """Construct a new gradient descent optimizer with delay compensation.
+
+        Args:
+          learning_rate: A Tensor or a floating point value.  The learning
+            rate to use.
+          variance_parameter: A Tensor or a floating point value. The lambda
+            value to use.
+          num_workers: A value to indicate number of workers computing gradients
+            asynchronously.
+          use_locking: If True use locks for update operations.
+          name: Optional name prefix for the operations created when applying
+            gradients. Defaults to "DelayCompensatedGradientDescent".
+        """
+        if num_workers <= 0:
+            raise ValueError("num_workers must be positive: %s" % num_workers)
+        super(DelayCompensatedGradientDescentOptimizer, self).__init__(
+            use_locking, name)
+        self._learning_rate = learning_rate
+        self._lambda = variance_parameter
+        self._num_workers = num_workers
+
+    def minimize(self, loss, global_step=None, var_list=None,
+                 gate_gradients=optimizer.Optimizer.GATE_OP, aggregation_method=None,
+                 colocate_gradients_with_ops=False, name=None,
+                 grad_loss=None, worker_index=None):
+        """Add operations to minimize `loss` by updating `var_list`.
+
+        This method simply combines calls `compute_gradients()` and
+        `apply_gradients()`. If you want to process the gradient before applying
+        them call `compute_gradients()` and `apply_gradients()` explicitly instead
+        of using this function.
+
+        Args:
+          loss: A `Tensor` containing the value to minimize.
+          global_step: Optional `Variable` to increment by one after the
+            variables have been updated.
+          var_list: Optional list or tuple of `Variable` objects to update to
+            minimize `loss`.  Defaults to the list of variables collected in
+            the graph under the key `GraphKeys.TRAINABLE_VARIABLES`.
+          gate_gradients: How to gate the computation of gradients.  Can be
+            `GATE_NONE`, `GATE_OP`, or  `GATE_GRAPH`.
+          aggregation_method: Specifies the method used to combine gradient terms.
+            Valid values are defined in the class `AggregationMethod`.
+          colocate_gradients_with_ops: If True, try colocating gradients with
+            the corresponding op.
+          name: Optional name for the returned operation.
+          grad_loss: Optional. A `Tensor` holding the gradient computed for `loss`.
+          worker_index: Optional. A value to indicate the instance of worker
+            minimizing if computing asynchronously.
+
+        Returns:
+          An Operation that updates the variables in `var_list`.  If `global_step`
+          was not `None`, that operation also increments `global_step`.
+
+        Raises:
+          ValueError: If some of the variables are not `Variable` objects.
+        """
+        if (worker_index < 0 and worker_index is not None) or worker_index >= self._num_workers:
+            raise ValueError("worker index must be in the range [0, num_workers): %s" %
+                             worker_index)
+        grads_and_vars = self.compute_gradients(
+            loss, var_list=var_list, gate_gradients=gate_gradients,
+            aggregation_method=aggregation_method,
+            colocate_gradients_with_ops=colocate_gradients_with_ops,
+            grad_loss=grad_loss)
+
+        vars_with_grad = [v for g, v in grads_and_vars if g is not None]
+        if not vars_with_grad:
+            raise ValueError(
+                "No gradients provided for any variable, check your graph for ops"
+                " that do not support gradients, between variables %s and loss %s." %
+                ([str(v) for _, v in grads_and_vars], loss))
+
+        return self.apply_gradients(grads_and_vars, global_step=global_step,
+                                    name=name, worker_index=worker_index)
+
+    def apply_gradients(self,
+                        grads_and_vars,
+                        global_step=None,
+                        name=None,
+                        worker_index=None):
+        """Apply gradients to variables.
+
+        This is the second part of `minimize()`. It returns an `Operation` that
+        applies gradients.
+
+        Args:
+          grads_and_vars: List of (gradient, variable) pairs as returned by
+            `compute_gradients()`.
+          global_step: Optional `Variable` to increment by one after the
+            variables have been updated.
+          name: Optional name for the returned operation.  Default to the
+            name passed to the `Optimizer` constructor.
+          worker_index: Optional value to indicate the instance of worker
+            minimizing if computing asynchronously.
+
+        Returns:
+          An `Operation` that applies the specified gradients. If `global_step`
+          was not None, that operation also increments `global_step`.
+
+        Raises:
+          TypeError: If `grads_and_vars` is malformed.
+          ValueError: If none of the variables have gradients.
+        """
+        # This is a default implementation of apply_gradients() that can be shared
+        # by most optimizers.  It relies on the subclass implementing the following
+        # methods: _create_slots(), _prepare(), _apply_dense(), and _apply_sparse().
+
+        grads_and_vars = tuple(grads_and_vars)  # Make sure repeat iteration works.
+        if not grads_and_vars:
+            raise ValueError("No variables provided.")
+        converted_grads_and_vars = []
+        for g, v in grads_and_vars:
+            if g is not None:
+                try:
+                    # Convert the grad to Tensor or IndexedSlices if necessary.
+                    g = ops.convert_to_tensor_or_indexed_slices(g)
+                except TypeError:
+                    raise TypeError(
+                        "Gradient must be convertible to a Tensor"
+                        " or IndexedSlices, or None: %s" % g)
+                if not isinstance(g, (ops.Tensor, ops.IndexedSlices)):
+                    raise TypeError(
+                        "Gradient must be a Tensor, IndexedSlices, or None: %s" % g)
+            p = _get_processor(v)
+            converted_grads_and_vars.append((g, v, p))
+
+        converted_grads_and_vars = tuple(converted_grads_and_vars)
+        var_list = [v for g, v, _ in converted_grads_and_vars if g is not None]
+        if not var_list:
+            raise ValueError("No gradients provided for any variable: %s." %
+                             ([str(v) for _, _, v in converted_grads_and_vars],))
+        with ops.control_dependencies(None):
+            self._create_slots([optimizer._get_variable_for(v) for v in var_list])
+        update_ops = []
+        with ops.name_scope(name, self._name) as name:
+            self._prepare()
+            for grad, var, processor in converted_grads_and_vars:
+                if grad is None:
+                    continue
+                # We colocate all ops created in _apply_dense or _apply_sparse
+                # on the same device as the variable.
+                with ops.name_scope("update_" + var.op.name), ops.colocate_with(var):
+                    if worker_index is None:
+                        update_ops.append(processor.update_op(self, grad))
+                    else:
+                        update_ops.append(processor.update_op_asynchronous(self, grad,
+                                                                           worker_index))
+            if global_step is None:
+                apply_updates = self._finish(update_ops, name)
+            else:
+                with ops.control_dependencies([self._finish(update_ops, "update")]):
+                    with ops.colocate_with(global_step):
+                        apply_updates = state_ops.assign_add(global_step, 1, name=name).op
+
+            train_op = ops.get_collection_ref(ops.GraphKeys.TRAIN_OP)
+            if apply_updates not in train_op:
+                train_op.append(apply_updates)
+
+            return apply_updates
+
+    def _create_slots(self, var_list):
+        """Initialize slots for all the vars of each worker to store
+            the previous values of it
+        """
+        for index in range(self._num_workers):
+            for v in var_list:
+                var2 = array_ops.identity(v.initialized_value())
+                self._get_or_make_slot(v, var2, "var_bak_{0}".format(index),
+                                       self._name)
+
+    def _apply_dense(self, grad, var, worker_index=0):
+        # Get previous value of the variable from the slot
+        var_bak = self.get_slot(var, "var_bak_{0}".format(worker_index))
+        return training_ops.apply_delay_compensated_gradient_descent(
+            var,
+            math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
+            grad,
+            math_ops.cast(self._lambda_tensor, var.dtype.base_dtype),
+            var_bak,
+            use_locking=self._use_locking).op
+
+    def _prepare(self):
+        self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
+                                                           name="learning_rate")
+        self._lambda_tensor = ops.convert_to_tensor(self._lambda,
+                                                    name="lambda")
diff --git a/tensorflow/python/training/delay_compensated_gradient_descent_test.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
similarity index 98%
rename from tensorflow/python/training/delay_compensated_gradient_descent_test.py
rename to tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
index 06142ae18a..03051d0efb 100644
--- a/tensorflow/python/training/delay_compensated_gradient_descent_test.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
@@ -20,11 +20,9 @@ from __future__ import print_function
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
-from tensorflow.python.ops import resources
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
-from tensorflow.python.training import delay_compensated_gradient_descent
-
+from tensorflow.contrib.opt.python.training import delay_compensated_gradient_descent
 
 class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
 
diff --git a/tensorflow/python/training/delay_compensated_gradient_descent.py b/tensorflow/python/training/delay_compensated_gradient_descent.py
deleted file mode 100644
index 26dfd0209e..0000000000
--- a/tensorflow/python/training/delay_compensated_gradient_descent.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-
-"""DelayCompensatedGradientDescentOptimizer for TensorFlow."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from tensorflow.python.framework import ops
-from tensorflow.python.ops import math_ops
-from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import variables
-from tensorflow.python.training import optimizer
-from tensorflow.python.training import training_ops
-
-class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
-
-    """Optimizer that implements the gradient descent algorithm with delay
-    compensation.
-
-    See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
-    ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
-    """
-
-    def __init__(self, learning_rate, variance_parameter, num_workers=1,
-                 use_locking=False, name="DelayCompensatedGradientDescent"):
-        """Construct a new gradient descent optimizer with delay compensation.
-
-        Args:
-          learning_rate: A Tensor or a floating point value.  The learning
-            rate to use.
-          variance_parameter: A Tensor or a floating point value. The lambda
-            value to use.
-          num_workers: A value to indicate number of workers computing gradients
-            asynchronously.
-          use_locking: If True use locks for update operations.
-          name: Optional name prefix for the operations created when applying
-            gradients. Defaults to "DelayCompensatedGradientDescent".
-        """
-        if num_workers <= 0:
-            raise ValueError("num_workers must be positive: %s" % num_workers)
-        super(DelayCompensatedGradientDescentOptimizer, self).__init__(
-            use_locking, name)
-        self._learning_rate = learning_rate
-        self._lambda = variance_parameter
-        self._num_workers = num_workers
-
-    def _create_slots(self, var_list):
-        """Initialize slots for all the vars of each worker to store
-            the previous values of it
-        """
-        for index in range(self._num_workers):
-            for v in var_list:
-                var2 = array_ops.identity(v.initialized_value())
-                self._get_or_make_slot(v, var2, "var_bak_{0}".format(index),
-                                       self._name)
-
-    def _apply_dense(self, grad, var, worker_index=0):
-        # Get previous value of the variable from the slot
-        var_bak = self.get_slot(var, "var_bak_{0}".format(worker_index))
-        return training_ops.apply_delay_compensated_gradient_descent(
-            var,
-            math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
-            grad,
-            math_ops.cast(self._lambda_tensor, var.dtype.base_dtype),
-            var_bak,
-            use_locking=self._use_locking).op
-
-    def _prepare(self):
-        self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
-                                                           name="learning_rate")
-        self._lambda_tensor = ops.convert_to_tensor(self._lambda,
-                                                    name="lambda")
diff --git a/tensorflow/python/training/training.py b/tensorflow/python/training/training.py
index 828acb18e5..bdf3d9c017 100644
--- a/tensorflow/python/training/training.py
+++ b/tensorflow/python/training/training.py
@@ -19,11 +19,6 @@ See the @{$python/train} guide.
 
 @@Optimizer
 @@GradientDescentOptimizer
-<<<<<<< HEAD
-@@DelayCompensatedGradientDescentOptimizer
-=======
-@@GradientDescentDCOptimizer
->>>>>>> ac348186c119dd397cd42d18fc4b4d48a70df6ce
 @@AdadeltaOptimizer
 @@AdagradOptimizer
 @@AdagradDAOptimizer
@@ -119,7 +114,6 @@ from tensorflow.python.training.moving_averages import ExponentialMovingAverage
 from tensorflow.python.training.optimizer import Optimizer
 from tensorflow.python.training.rmsprop import RMSPropOptimizer
 from tensorflow.python.training.gradient_descent import GradientDescentOptimizer
-from tensorflow.python.training.delay_compensated_gradient_descent import DelayCompensatedGradientDescentOptimizer
 from tensorflow.python.training.proximal_gradient_descent import ProximalGradientDescentOptimizer
 from tensorflow.python.training.sync_replicas_optimizer import SyncReplicasOptimizer
 
-- 
GitLab


From 886e0085534f05ec1035bf734f5dd779d6a32b12 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Wed, 17 May 2017 03:35:48 -0700
Subject: [PATCH 1440/1563] Change C++ implementation to work with API changes

---
 tensorflow/core/kernels/training_ops.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index 606d7fd57f..cc5529e7cd 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -411,9 +411,9 @@ class ApplyDelayCompensatedGradientDescentOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* ctx) override {
-    auto locks = MaybeLockMutexesInOrder(ctx, use_exclusive_lock_, {0});
+    auto locks = MaybeLockVariableInputMutexesInOrder(ctx, use_exclusive_lock_, {0, 4});
     Tensor var;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 0, use_exclusive_lock_, &var));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 0, use_exclusive_lock_, &var));
     OP_REQUIRES(
         ctx, var.IsInitialized(),
         errors::FailedPrecondition(
@@ -433,7 +433,7 @@ class ApplyDelayCompensatedGradientDescentOp : public OpKernel {
                 errors::InvalidArgument("lambda is not a scalar: ",
                                         lambda.shape().DebugString()));
     Tensor var_bak;
-    OP_REQUIRES_OK(ctx, GetInputTensor(ctx, 4, use_exclusive_lock_, &var_bak));
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 4, use_exclusive_lock_, &var_bak));
     OP_REQUIRES(
         ctx, var_bak.shape().IsSameSize(var.shape()),
         errors::InvalidArgument("var_bak and var do not have the same shape",
-- 
GitLab


From 16c202635e3cc18031078b82bca2089fc921213d Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 06:19:30 -0700
Subject: [PATCH 1441/1563] internal change

PiperOrigin-RevId: 156299828
---
 .../tensorboard/components/tf_distribution_dashboard/BUILD     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
index bff6ed6d7d..38c3eb6c11 100644
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
@@ -59,5 +59,6 @@ tensorboard_ts_library(
     srcs = [],
     deps_mgmt = "off",
     runtime = "nodejs",
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
+    # Don't list the common_deps here; a src-less ts_library re-exports them,
+    # and they are outside the package where the Fileset will be rooted.
 )
-- 
GitLab


From 7caba8e57df33d1a5741b5fd504f24ededc52c92 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Wed, 17 May 2017 07:13:24 -0700
Subject: [PATCH 1442/1563] Disabling broken test.

---
 tensorflow/contrib/cmake/tf_tests.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index 2a51ab62d4..64dfaf55dd 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -205,6 +205,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
       "${tensorflow_source_dir}/tensorflow/tensorboard/lib/python/http_util_test.py"
       # Broken tensorboard test due to cmake issues.
       "${tensorflow_source_dir}/tensorflow/tensorboard/plugins/debugger/plugin_test.py"
+      "${tensorflow_source_dir}/tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py"
       # tensor_forest tests (also note that we exclude the hybrid tests for now)
       "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/python/kernel_tests/count_extremely_random_stats_op_test.py"  # Results in wrong order.
       "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/python/kernel_tests/sample_inputs_op_test.py"  # Results in wrong order.
-- 
GitLab


From eb937e62c54ffaa607283cfa9db1359e9a0b62fa Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 07:45:25 -0700
Subject: [PATCH 1443/1563] Fixing issue with cuda configuration when cudnn.h
 located in /usr/include/cudnn.h

PiperOrigin-RevId: 156306372
---
 third_party/gpus/cuda_configure.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index 6994db0a04..c6deae05b8 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -787,7 +787,7 @@ def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name,
     if dest_files[i] != "":
       # If we have only one file to link we do not want to use the dest_dir, as
       # $(@D) will include the full path to the file.
-      dest = ' $(@D)/' + dest_dir + dest_files[i] if len(dest_files) != 1 else ' $(@D)' + dest_files[i]
+      dest = ' $(@D)/' + dest_dir + dest_files[i] if len(dest_files) != 1 else ' $(@D)/' + dest_files[i]
       command.append('ln -s ' + src_files[i] + dest)
       outs.append('      "' + dest_dir + dest_files[i] + '",')
   genrule = _genrule(src_dir, genrule_name, " && ".join(command),
@@ -875,8 +875,8 @@ def _create_cuda_repository(repository_ctx):
   included_files = _read_dir(repository_ctx, cuda_include_path).replace(
       cuda_include_path, '').splitlines()
   if '/cudnn.h' not in included_files:
-    genrules.append(_symlink_genrule_for_dir(repository_ctx, None, "",
-        "cudnn-include", [cudnn_header_dir + "/cudnn.h"], ["include/cudnn.h"]))
+    genrules.append(_symlink_genrule_for_dir(repository_ctx, None, "include/",
+        "cudnn-include", [cudnn_header_dir + "/cudnn.h"], ["cudnn.h"]))
   else:
     genrules.append(
             'filegroup(\n' +
-- 
GitLab


From 9a47c258c9c2286ae2c14a0da6458055f3b691d3 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@google.com>
Date: Wed, 17 May 2017 08:37:12 -0700
Subject: [PATCH 1444/1563] [TF cmake] Bugfix: lazy import of portpicker in
 test_util.

Also remove a test that relies on it from the cmake tests: tensor_array_ops_test.py

PiperOrigin-RevId: 156311187
---
 tensorflow/contrib/cmake/tf_tests.cmake  |  1 +
 tensorflow/python/framework/test_util.py | 12 +++++++++++-
 tensorflow/python/kernel_tests/BUILD     |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index 2a51ab62d4..7da0a0cbe9 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -181,6 +181,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/cast_op_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/string_to_number_op_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/clip_ops_test.py"
+      "${tensorflow_source_dir}/tensorflow/python/kernel_tests/tensor_array_ops_test.py"  # Needs portpicker.
       # misc
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/variable_scope_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/reshape_op_test.py"
diff --git a/tensorflow/python/framework/test_util.py b/tensorflow/python/framework/test_util.py
index 194d608a88..485bb3b109 100644
--- a/tensorflow/python/framework/test_util.py
+++ b/tensorflow/python/framework/test_util.py
@@ -27,9 +27,14 @@ import tempfile
 import threading
 
 import numpy as np
-import portpicker
 import six
 
+try:
+  import portpicker  # pylint: disable=g-import-not-at-top
+except ImportError as _portpicker_import_error:
+  portpicker = None
+
+# pylint: disable=g-import-not-at-top
 from google.protobuf import descriptor_pool
 from google.protobuf import text_format
 
@@ -811,7 +816,12 @@ def create_local_cluster(num_workers, num_ps, protocol="grpc"):
     A tuple `(worker_servers, ps_servers)`.  `worker_servers` is a list
     of `num_workers` objects of type `tf.train.Server` (all running locally);
     and `ps_servers` is a list of `num_ps` objects of similar type.
+
+  Raises:
+    ImportError: if portpicker module was not found at load time
   """
+  if not portpicker:
+    raise _portpicker_import_error
   worker_ports = [portpicker.pick_unused_port() for _ in range(num_workers)]
   ps_ports = [portpicker.pick_unused_port() for _ in range(num_ps)]
   cluster_dict = {
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index ab69b33cb1..56ebc796f9 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -1905,6 +1905,7 @@ cuda_py_test(
         "//tensorflow/python:tensor_array_ops",
         "//tensorflow/python:variables",
     ],
+    flaky = 1,  # create_local_cluster sometimes times out.
 )
 
 cuda_py_test(
-- 
GitLab


From cbe5eb47a729b86477cf75df0a21ce51db3e5afe Mon Sep 17 00:00:00 2001
From: Neal Wu <neal@nealwu.com>
Date: Wed, 17 May 2017 09:15:47 -0700
Subject: [PATCH 1445/1563] Return GitHub links for models to
 tensorflow.org/code links (#9948)

* Revert change of links to GitHub links since tensorflow.org/code/tensorflow_models is now redirecting properly

* Change links for word2vec.md as well

* Display models/ in the links rather than tensorflow_models/
---
 tensorflow/docs_src/tutorials/deep_cnn.md | 14 +++++++-------
 tensorflow/docs_src/tutorials/word2vec.md | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tensorflow/docs_src/tutorials/deep_cnn.md b/tensorflow/docs_src/tutorials/deep_cnn.md
index f60c8fd770..b0617326ff 100644
--- a/tensorflow/docs_src/tutorials/deep_cnn.md
+++ b/tensorflow/docs_src/tutorials/deep_cnn.md
@@ -83,21 +83,21 @@ for details.  It consists of 1,068,298 learnable parameters and requires about
 ## Code Organization
 
 The code for this tutorial resides in
-[`models/tutorials/image/cifar10/`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/).
+[`models/tutorials/image/cifar10/`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/).
 
 File | Purpose
 --- | ---
-[`cifar10_input.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_input.py) | Reads the native CIFAR-10 binary file format.
-[`cifar10.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10.py) | Builds the CIFAR-10 model.
-[`cifar10_train.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_train.py) | Trains a CIFAR-10 model on a CPU or GPU.
-[`cifar10_multi_gpu_train.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_multi_gpu_train.py) | Trains a CIFAR-10 model on multiple GPUs.
-[`cifar10_eval.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10_eval.py) | Evaluates the predictive performance of a CIFAR-10 model.
+[`cifar10_input.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_input.py) | Reads the native CIFAR-10 binary file format.
+[`cifar10.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10.py) | Builds the CIFAR-10 model.
+[`cifar10_train.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_train.py) | Trains a CIFAR-10 model on a CPU or GPU.
+[`cifar10_multi_gpu_train.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_multi_gpu_train.py) | Trains a CIFAR-10 model on multiple GPUs.
+[`cifar10_eval.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10_eval.py) | Evaluates the predictive performance of a CIFAR-10 model.
 
 
 ## CIFAR-10 Model
 
 The CIFAR-10 network is largely contained in
-[`cifar10.py`](https://github.com/tensorflow/models/tree/master/tutorials/image/cifar10/cifar10.py).
+[`cifar10.py`](https://www.tensorflow.org/code/tensorflow_models/tutorials/image/cifar10/cifar10.py).
 The complete training
 graph contains roughly 765 operations. We find that we can make the code most
 reusable by constructing the graph with the following modules:
diff --git a/tensorflow/docs_src/tutorials/word2vec.md b/tensorflow/docs_src/tutorials/word2vec.md
index 348e069ed6..d7a9089949 100644
--- a/tensorflow/docs_src/tutorials/word2vec.md
+++ b/tensorflow/docs_src/tutorials/word2vec.md
@@ -23,7 +23,7 @@ straight in, feel free to look at the minimalistic implementation in
 This basic example contains the code needed to download some data, train on it a
 bit and visualize the result. Once you get comfortable with reading and running
 the basic version, you can graduate to
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py)
+[models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py)
 which is a more serious implementation that showcases some more advanced
 TensorFlow principles about how to efficiently use threads to move data into a
 text model, how to checkpoint during training, etc.
@@ -108,7 +108,7 @@ $$
 
 where \\(\text{score}(w_t, h)\\) computes the compatibility of word \\(w_t\\)
 with the context \\(h\\) (a dot product is commonly used). We train this model
-by maximizing its [log-likelihood](https://en.wikipedia.org/wiki/Likelihood_function) 
+by maximizing its [log-likelihood](https://en.wikipedia.org/wiki/Likelihood_function)
 on the training set, i.e. by maximizing
 
 $$
@@ -130,7 +130,7 @@ context \\(h\\), *at every training step*.
 
 On the other hand, for feature learning in word2vec we do not need a full
 probabilistic model. The CBOW and skip-gram models are instead trained using a
-binary classification objective ([logistic regression](https://en.wikipedia.org/wiki/Logistic_regression)) 
+binary classification objective ([logistic regression](https://en.wikipedia.org/wiki/Logistic_regression))
 to discriminate the real target words \\(w_t\\) from \\(k\\) imaginary (noise) words \\(\tilde w\\), in the
 same context. We illustrate this below for a CBOW model. For skip-gram the
 direction is simply inverted.
@@ -341,7 +341,7 @@ t-SNE.
 Et voila! As expected, words that are similar end up clustering nearby each
 other. For a more heavyweight implementation of word2vec that showcases more of
 the advanced features of TensorFlow, see the implementation in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
+[models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py).
 
 ## Evaluating Embeddings: Analogical Reasoning
 
@@ -357,7 +357,7 @@ Download the dataset for this task from
 
 To see how we do this evaluation, have a look at the `build_eval_graph()` and
 `eval()` functions in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
+[models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py).
 
 The choice of hyperparameters can strongly influence the accuracy on this task.
 To achieve state-of-the-art performance on this task requires training over a
@@ -385,13 +385,13 @@ your model is seriously bottlenecked on input data, you may want to implement a
 custom data reader for your problem, as described in
 @{$new_data_formats$New Data Formats}.  For the case of Skip-Gram
 modeling, we've actually already done this for you as an example in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
+[models/tutorials/embedding/word2vec.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec.py).
 
 If your model is no longer I/O bound but you want still more performance, you
 can take things further by writing your own TensorFlow Ops, as described in
 @{$adding_an_op$Adding a New Op}.  Again we've provided an
 example of this for the Skip-Gram case
-[tensorflow_models/tutorials/embedding/word2vec_optimized.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec_optimized.py).
+[models/tutorials/embedding/word2vec_optimized.py](https://www.tensorflow.org/code/tensorflow_models/tutorials/embedding/word2vec_optimized.py).
 Feel free to benchmark these against each other to measure performance
 improvements at each stage.
 
-- 
GitLab


From 73882f257ffb1bc9e1a828571c085d080b1d9266 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Wed, 17 May 2017 09:23:54 -0700
Subject: [PATCH 1446/1563] Automated g4 rollback of changelist 156251356

PiperOrigin-RevId: 156315860
---
 tensorflow/c/c_api.cc                         |  63 +++++-----
 tensorflow/cc/framework/cc_op_gen.cc          |   9 +-
 tensorflow/cc/framework/cc_ops_test.cc        |  17 ++-
 tensorflow/cc/framework/scope.cc              |   4 +-
 tensorflow/cc/gradients/array_grad.cc         |  28 +++--
 tensorflow/cc/gradients/math_grad.cc          |   8 +-
 tensorflow/cc/ops/const_op_test.cc            |   8 +-
 tensorflow/compiler/aot/compile.cc            |  12 +-
 .../compiler/jit/build_xla_launch_ops_pass.cc |   9 +-
 .../jit/encapsulate_subgraphs_pass.cc         |  10 +-
 .../compiler/jit/graph_to_functiondef.cc      |  14 +--
 .../jit/kernels/xla_device_launch_op.cc       |   4 +-
 .../jit/kernels/xla_local_launch_op.cc        |   2 +-
 .../compiler/jit/mark_for_compilation_pass.cc |  42 ++++---
 .../jit/mark_for_compilation_pass_test.cc     |   2 +-
 .../compiler/jit/xla_compilation_cache.cc     |   2 +-
 tensorflow/compiler/tf2xla/const_analysis.cc  |   6 +-
 .../compiler/tf2xla/kernels/function_ops.cc   |   3 +-
 tensorflow/compiler/tf2xla/xla_compiler.cc    |   7 +-
 tensorflow/core/BUILD                         |   7 +-
 .../common_runtime/constant_folding_test.cc   |   8 +-
 tensorflow/core/common_runtime/executor.cc    |  56 +++++----
 tensorflow/core/common_runtime/function.cc    |  37 +++---
 .../core/common_runtime/function_test.cc      |  40 +++++--
 .../kernel_benchmark_testlib.cc               |   8 +-
 .../parallel_concat_optimizer.cc              |   4 +-
 .../resource_variable_read_optimizer.cc       |   2 +-
 .../core/common_runtime/simple_placer.cc      |  34 +++---
 tensorflow/core/debug/debug_graph_utils.cc    |  23 ++--
 .../distributed_runtime/master_session.cc     |  12 +-
 tensorflow/core/framework/function.cc         | 102 +++++++---------
 tensorflow/core/framework/function.h          |  49 ++++----
 tensorflow/core/framework/function_test.cc    | 110 +++++++++++-------
 tensorflow/core/framework/node_def_util.cc    |  92 +++++++++++----
 tensorflow/core/framework/node_def_util.h     |  39 ++++++-
 tensorflow/core/framework/op_kernel.cc        |  23 ++--
 tensorflow/core/framework/shape_inference.h   |  11 +-
 tensorflow/core/graph/control_flow.cc         |   2 +-
 tensorflow/core/graph/graph.cc                |   4 +-
 tensorflow/core/graph/graph.h                 |  14 +++
 tensorflow/core/graph/graph_constructor.cc    |   4 +-
 .../core/graph/graph_constructor_test.cc      |  66 +++++------
 tensorflow/core/graph/graph_partition.cc      |   8 +-
 tensorflow/core/graph/graph_test.cc           |  10 +-
 tensorflow/core/graph/optimizer_cse.cc        |  37 ++----
 tensorflow/core/graph/quantize_training.cc    |   6 +-
 .../core/graph/quantize_training_test.cc      |  12 +-
 tensorflow/core/graph/subgraph.cc             |   6 +-
 tensorflow/core/graph/subgraph_test.cc        |   4 +-
 .../core/grappler/costs/graph_properties.cc   |   4 +-
 tensorflow/core/kernels/captured_function.cc  |   4 +-
 tensorflow/core/kernels/function_ops.cc       |  16 +--
 .../core/kernels/hexagon/graph_transferer.cc  |  19 +--
 tensorflow/core/kernels/iterator_ops.cc       |   8 +-
 .../remote_fused_graph_execute_utils.cc       |   6 +-
 .../remote_fused_graph_execute_utils.h        |   2 +-
 56 files changed, 613 insertions(+), 526 deletions(-)

diff --git a/tensorflow/c/c_api.cc b/tensorflow/c/c_api.cc
index bbc18569ad..f4775783f9 100644
--- a/tensorflow/c/c_api.cc
+++ b/tensorflow/c/c_api.cc
@@ -738,8 +738,7 @@ tensorflow::string OutputName(const TF_Output& output) {
 const tensorflow::AttrValue* GetAttrValue(TF_Operation* oper,
                                           const char* attr_name,
                                           TF_Status* status) {
-  const tensorflow::AttrValue* attr =
-      tensorflow::AttrSlice(oper->node.def()).Find(attr_name);
+  const tensorflow::AttrValue* attr = oper->node.attrs().Find(attr_name);
   if (attr == nullptr) {
     status->status =
         InvalidArgument("Operation has no attr named '", attr_name, "'.");
@@ -1135,7 +1134,7 @@ const char* TF_OperationOpType(TF_Operation* oper) {
 }
 
 const char* TF_OperationDevice(TF_Operation* oper) {
-  return oper->node.def().device().c_str();
+  return oper->node.requested_device().c_str();
 }
 
 int TF_OperationNumOutputs(TF_Operation* oper) {
@@ -1150,8 +1149,8 @@ TF_DataType TF_OperationOutputType(TF_Output oper_out) {
 int TF_OperationOutputListLength(TF_Operation* oper, const char* arg_name,
                                  TF_Status* status) {
   NameRangeMap name_ranges;
-  status->status = NameRangesForNode(oper->node.def(), oper->node.op_def(),
-                                     nullptr, &name_ranges);
+  status->status =
+      NameRangesForNode(oper->node, oper->node.op_def(), nullptr, &name_ranges);
   if (!status->status.ok()) return -1;
   auto iter = name_ranges.find(arg_name);
   if (iter == name_ranges.end()) {
@@ -1172,8 +1171,8 @@ TF_DataType TF_OperationInputType(TF_Input oper_in) {
 int TF_OperationInputListLength(TF_Operation* oper, const char* arg_name,
                                 TF_Status* status) {
   NameRangeMap name_ranges;
-  status->status = NameRangesForNode(oper->node.def(), oper->node.op_def(),
-                                     &name_ranges, nullptr);
+  status->status =
+      NameRangesForNode(oper->node, oper->node.op_def(), &name_ranges, nullptr);
   if (!status->status.ok()) return -1;
   auto iter = name_ranges.find(arg_name);
   if (iter == name_ranges.end()) {
@@ -1411,26 +1410,27 @@ void TF_OperationGetAttrStringList(TF_Operation* oper, const char* attr_name,
   }
 }
 
-#define DEFINE_GETATTR(func, c_type, cpp_type, list_field)                     \
-  void func(TF_Operation* oper, const char* attr_name, c_type* value,          \
-            TF_Status* status) {                                               \
-    cpp_type v;                                                                \
-    status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &v); \
-    *value = static_cast<c_type>(v);                                           \
-  }                                                                            \
-  void func##List(TF_Operation* oper, const char* attr_name, c_type* values,   \
-                  int max_values, TF_Status* status) {                         \
-    const auto* attr = GetAttrValue(oper, attr_name, status);                  \
-    if (!status->status.ok()) return;                                          \
-    if (attr->value_case() != tensorflow::AttrValue::kList) {                  \
-      status->status =                                                         \
-          InvalidArgument("Value for '", attr_name, "' is not a list.");       \
-      return;                                                                  \
-    }                                                                          \
-    const auto len = std::min(max_values, attr->list().list_field##_size());   \
-    for (int i = 0; i < len; ++i) {                                            \
-      values[i] = static_cast<c_type>(attr->list().list_field(i));             \
-    }                                                                          \
+#define DEFINE_GETATTR(func, c_type, cpp_type, list_field)                   \
+  void func(TF_Operation* oper, const char* attr_name, c_type* value,        \
+            TF_Status* status) {                                             \
+    cpp_type v;                                                              \
+    status->status =                                                         \
+        tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &v);          \
+    *value = static_cast<c_type>(v);                                         \
+  }                                                                          \
+  void func##List(TF_Operation* oper, const char* attr_name, c_type* values, \
+                  int max_values, TF_Status* status) {                       \
+    const auto* attr = GetAttrValue(oper, attr_name, status);                \
+    if (!status->status.ok()) return;                                        \
+    if (attr->value_case() != tensorflow::AttrValue::kList) {                \
+      status->status =                                                       \
+          InvalidArgument("Value for '", attr_name, "' is not a list.");     \
+      return;                                                                \
+    }                                                                        \
+    const auto len = std::min(max_values, attr->list().list_field##_size()); \
+    for (int i = 0; i < len; ++i) {                                          \
+      values[i] = static_cast<c_type>(attr->list().list_field(i));           \
+    }                                                                        \
   }
 DEFINE_GETATTR(TF_OperationGetAttrInt, int64_t, tensorflow::int64, i);
 DEFINE_GETATTR(TF_OperationGetAttrFloat, float, float, f);
@@ -1441,7 +1441,8 @@ DEFINE_GETATTR(TF_OperationGetAttrType, TF_DataType, DataType, type);
 void TF_OperationGetAttrShape(TF_Operation* oper, const char* attr_name,
                               int64_t* value, int num_dims, TF_Status* status) {
   PartialTensorShape shape;
-  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &shape);
+  status->status =
+      tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &shape);
   if (!status->status.ok()) return;
   auto len = std::min(shape.dims(), num_dims);
   for (int i = 0; i < len; ++i) {
@@ -1455,7 +1456,7 @@ void TF_OperationGetAttrShapeList(TF_Operation* oper, const char* attr_name,
                                   int storage_size, TF_Status* status) {
   std::vector<PartialTensorShape> shapes;
   status->status =
-      tensorflow::GetNodeAttr(oper->node.def(), attr_name, &shapes);
+      tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &shapes);
   if (!status->status.ok()) return;
   auto len = std::min(static_cast<int>(shapes.size()), max_values);
   int64_t* p = storage;
@@ -1522,7 +1523,7 @@ void TF_OperationGetAttrTensor(TF_Operation* oper, const char* attr_name,
                                TF_Tensor** value, TF_Status* status) {
   *value = nullptr;
   Tensor t;
-  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &t);
+  status->status = tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &t);
   if (!status->status.ok()) return;
   *value = new TF_Tensor{static_cast<TF_DataType>(t.dtype()), t.shape(),
                          tensorflow::TensorCApi::Buffer(t)};
@@ -1533,7 +1534,7 @@ void TF_OperationGetAttrTensorList(TF_Operation* oper, const char* attr_name,
                                    TF_Tensor** values, int max_values,
                                    TF_Status* status) {
   std::vector<Tensor> ts;
-  status->status = tensorflow::GetNodeAttr(oper->node.def(), attr_name, &ts);
+  status->status = tensorflow::GetNodeAttr(oper->node.attrs(), attr_name, &ts);
   if (!status->status.ok()) return;
   const auto len = std::min(max_values, static_cast<int>(ts.size()));
   for (int i = 0; i < len; ++i) {
diff --git a/tensorflow/cc/framework/cc_op_gen.cc b/tensorflow/cc/framework/cc_op_gen.cc
index 799492a4eb..71aa986f91 100644
--- a/tensorflow/cc/framework/cc_op_gen.cc
+++ b/tensorflow/cc/framework/cc_op_gen.cc
@@ -740,11 +740,10 @@ void OpInfo::GetOutput(string* out) const {
     return;
   }
   strings::StrAppend(out, "  ::tensorflow::NameRangeMap _outputs_range;\n");
-  strings::StrAppend(
-      out,
-      "  ::tensorflow::Status _status_ = "
-      "::tensorflow::NameRangesForNode(ret->def(), ret->op_def(), "
-      "nullptr, &_outputs_range);\n");
+  strings::StrAppend(out,
+                     "  ::tensorflow::Status _status_ = "
+                     "::tensorflow::NameRangesForNode(*ret, ret->op_def(), "
+                     "nullptr, &_outputs_range);\n");
   strings::StrAppend(out, "  if (!_status_.ok()) {\n", "    ", scope_str,
                      ".UpdateStatus(_status_);\n", "    return;\n");
   strings::StrAppend(out, "  }\n\n");
diff --git a/tensorflow/cc/framework/cc_ops_test.cc b/tensorflow/cc/framework/cc_ops_test.cc
index 92c97d107d..5da23036ea 100644
--- a/tensorflow/cc/framework/cc_ops_test.cc
+++ b/tensorflow/cc/framework/cc_ops_test.cc
@@ -35,8 +35,8 @@ Output Linear(const Scope& scope, Input x, Input w, Input b) {
 void GetColocationConstraints(const Output& tensor,
                               std::vector<string>* constraints) {
   constraints->clear();
-  TF_EXPECT_OK(
-      GetNodeAttr(tensor.op().node()->def(), kColocationAttrName, constraints));
+  TF_EXPECT_OK(GetNodeAttr(tensor.op().node()->attrs(), kColocationAttrName,
+                           constraints));
 }
 
 }  // namespace
@@ -159,11 +159,11 @@ TEST(CCOpTest, KernelLabel) {
   Scope root = Scope::NewRootScope();
   auto add = Add(root.WithKernelLabel("AddWithKernelLabel"), 1.0f, 2.0f);
   TF_EXPECT_OK(root.status());
-  const auto& attrs = add.z.op().node()->def().attr();
-  ASSERT_TRUE(attrs.find("_kernel") != attrs.end());
-  auto kernel_attr = attrs.find("_kernel")->second;
-  TF_EXPECT_OK(AttrValueHasType(kernel_attr, "string"));
-  EXPECT_EQ(kernel_attr.s(), "AddWithKernelLabel");
+  AttrSlice attrs = add.z.op().node()->attrs();
+  const auto* kernel_attr = attrs.Find("_kernel");
+  ASSERT_TRUE(kernel_attr);
+  TF_EXPECT_OK(AttrValueHasType(*kernel_attr, "string"));
+  EXPECT_EQ(kernel_attr->s(), "AddWithKernelLabel");
 }
 
 TEST(CCOpTest, ColocateWith) {
@@ -190,8 +190,7 @@ TEST(CCOpTest, ColocateWith) {
 
   Scope with_colocate = root.ColocateWith(c3).ColocateWith(c4);
   auto c6 = Const(with_colocate.WithOpName("c6").ClearColocation(), 7);
-  const auto& attrs = c6.op().node()->def().attr();
-  EXPECT_TRUE(attrs.find("_class") == attrs.end());
+  EXPECT_FALSE(c6.op().node()->attrs().Find("_class"));
 }
 
 TEST(CCOpTest, TemplatedConst) {
diff --git a/tensorflow/cc/framework/scope.cc b/tensorflow/cc/framework/scope.cc
index 8b7fc1406f..32c0822de6 100644
--- a/tensorflow/cc/framework/scope.cc
+++ b/tensorflow/cc/framework/scope.cc
@@ -271,9 +271,9 @@ Scope::Impl::Impl(const Scope& other, Tags::Colocate,
 std::unordered_set<string> Scope::Impl::GetColocationConstraints(
     const Operation& colocate_with_op) const {
   std::unordered_set<string> current_constraints(colocation_constraints_);
-  const NodeDef& node_def = colocate_with_op.node()->def();
+  const AttrSlice attrs = colocate_with_op.node()->attrs();
   std::vector<string> node_constraints;
-  if (GetNodeAttr(node_def, kColocationAttrName, &node_constraints).ok()) {
+  if (GetNodeAttr(attrs, kColocationAttrName, &node_constraints).ok()) {
     for (const string& entry : node_constraints) {
       StringPiece s(entry);
       if (s.Consume(kColocationGroupPrefix)) {
diff --git a/tensorflow/cc/gradients/array_grad.cc b/tensorflow/cc/gradients/array_grad.cc
index 26abd2438e..37f07e71a0 100644
--- a/tensorflow/cc/gradients/array_grad.cc
+++ b/tensorflow/cc/gradients/array_grad.cc
@@ -43,9 +43,9 @@ Status PackGrad(const Scope& scope, const Operation& op,
                 const std::vector<Output>& grad_inputs,
                 std::vector<Output>* grad_outputs) {
   int N;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "N", &N));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "N", &N));
   int axis;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "axis", &axis));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "axis", &axis));
 
   grad_outputs->reserve(N);
   auto grad_op = Unstack(scope, grad_inputs[0], N, Unstack::Axis(axis));
@@ -60,7 +60,7 @@ Status UnpackGrad(const Scope& scope, const Operation& op,
                   const std::vector<Output>& grad_inputs,
                   std::vector<Output>* grad_outputs) {
   int axis;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "axis", &axis));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "axis", &axis));
   grad_outputs->push_back(Stack(scope, grad_inputs, Stack::Axis(axis)));
   return scope.status();
 }
@@ -162,7 +162,7 @@ Status CheckNumericsGrad(const Scope& scope, const Operation& op,
                          const std::vector<Output>& grad_inputs,
                          std::vector<Output>* grad_outputs) {
   string message;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "message", &message));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "message", &message));
   string err_msg = strings::StrCat(
       "Not a number (NaN) or infinity (Inf) values detected in gradient. ",
       message);
@@ -215,9 +215,9 @@ Status ReverseSequenceGrad(const Scope& scope, const Operation& op,
                            std::vector<Output>* grad_outputs) {
   auto seq_lengths = op.input(1);
   int batch_dim;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "batch_dim", &batch_dim));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "batch_dim", &batch_dim));
   int seq_dim;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "seq_dim", &seq_dim));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "seq_dim", &seq_dim));
   grad_outputs->push_back(
       ReverseSequence(scope, grad_inputs[0], seq_lengths, seq_dim,
                       ReverseSequence::BatchDim(batch_dim)));
@@ -267,7 +267,8 @@ Status SpaceToBatchGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(
       BatchToSpace(scope, grad_inputs[0], op.input(1), block_size));
   grad_outputs->push_back(NoGradient());
@@ -290,7 +291,8 @@ Status BatchToSpaceGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(
       SpaceToBatch(scope, grad_inputs[0], op.input(1), block_size));
   grad_outputs->push_back(NoGradient());
@@ -313,7 +315,8 @@ Status SpaceToDepthGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(DepthToSpace(scope, grad_inputs[0], block_size));
   return scope.status();
 }
@@ -323,7 +326,8 @@ Status DepthToSpaceGrad(const Scope& scope, const Operation& op,
                         const std::vector<Output>& grad_inputs,
                         std::vector<Output>* grad_outputs) {
   int block_size;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "block_size", &block_size));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.node()->attrs(), "block_size", &block_size));
   grad_outputs->push_back(SpaceToDepth(scope, grad_inputs[0], block_size));
   return scope.status();
 }
@@ -333,7 +337,7 @@ Status MirrorPadGrad(const Scope& scope, const Operation& op,
                      const std::vector<Output>& grad_inputs,
                      std::vector<Output>* grad_outputs) {
   string mode;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "mode", &mode));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "mode", &mode));
   grad_outputs->push_back(tensorflow::ops::internal::MirrorPadGrad(
       scope, grad_inputs[0], op.input(1), mode));
   grad_outputs->push_back(NoGradient());
@@ -346,7 +350,7 @@ Status MirrorPadGradGrad(const Scope& scope, const Operation& op,
                          const std::vector<Output>& grad_inputs,
                          std::vector<Output>* grad_outputs) {
   string mode;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->def(), "mode", &mode));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.node()->attrs(), "mode", &mode));
   grad_outputs->push_back(MirrorPad(scope, grad_inputs[0], op.input(1), mode));
   grad_outputs->push_back(NoGradient());
   return scope.status();
diff --git a/tensorflow/cc/gradients/math_grad.cc b/tensorflow/cc/gradients/math_grad.cc
index 5a2c6d11fb..8c1a01f518 100644
--- a/tensorflow/cc/gradients/math_grad.cc
+++ b/tensorflow/cc/gradients/math_grad.cc
@@ -350,7 +350,7 @@ Status MatMulGradCommon(const Scope& scope, const Operation& op,
                         const string& attr_adj_x, const string& attr_adj_y,
                         std::vector<Output>* grad_outputs) {
   DataType dtype;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), "T", &dtype));
+  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->attrs(), "T", &dtype));
   if (dtype == DT_COMPLEX64 || dtype == DT_COMPLEX128) {
     return errors::Unimplemented(
         "MatMul gradient for complex data type is not supported yet.");
@@ -358,8 +358,10 @@ Status MatMulGradCommon(const Scope& scope, const Operation& op,
 
   bool ta;
   bool tb;
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), attr_adj_x, &ta));
-  TF_RETURN_IF_ERROR(GetNodeAttr(op.output(0).node()->def(), attr_adj_y, &tb));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.output(0).node()->attrs(), attr_adj_x, &ta));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(op.output(0).node()->attrs(), attr_adj_y, &tb));
 
   if (!ta && !tb) {
     return MatMulGradHelper(scope, is_batch, grad_inputs[0], false, op.input(1),
diff --git a/tensorflow/cc/ops/const_op_test.cc b/tensorflow/cc/ops/const_op_test.cc
index 5a4770f879..3184edeb33 100644
--- a/tensorflow/cc/ops/const_op_test.cc
+++ b/tensorflow/cc/ops/const_op_test.cc
@@ -28,9 +28,9 @@ void ExpectNodeEqual(const Node* n, gtl::ArraySlice<T> values,
                      TensorShape shape) {
   EXPECT_TRUE(n->IsConstant());
   Tensor tensor;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor));
   DataType dtype;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
   EXPECT_EQ(tensor.dtype(), dtype);
   test::ExpectTensorEqual<T>(tensor, test::AsTensor(values, shape));
 }
@@ -39,9 +39,9 @@ void ExpectTypeAndShape(const Node* n, DataType expected_dtype,
                         TensorShape expected_shape) {
   EXPECT_TRUE(n->IsConstant());
   Tensor tensor;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor));
   DataType dtype;
-  TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+  TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
   EXPECT_EQ(dtype, expected_dtype);
   EXPECT_EQ(expected_shape, TensorShape(tensor.shape()));
 }
diff --git a/tensorflow/compiler/aot/compile.cc b/tensorflow/compiler/aot/compile.cc
index 162e719ade..0c7b97b01f 100644
--- a/tensorflow/compiler/aot/compile.cc
+++ b/tensorflow/compiler/aot/compile.cc
@@ -203,14 +203,14 @@ Status RewriteAndPruneGraph(Graph* graph, const Config& config,
   for (const Node* n : graph->nodes()) {
     if (n->type_string() == kArgOp) {
       string feed_id;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), kFeedIdAttr, &feed_id));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), kFeedIdAttr, &feed_id));
       if (missing_feeds.erase(feed_id) == 0) {
         return errors::Aborted(kArgOp,
                                " node found with unknown feed id: ", feed_id);
       }
     } else if (n->type_string() == kRetvalOp) {
       string fetch_id;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), kFetchIdAttr, &fetch_id));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), kFetchIdAttr, &fetch_id));
       if (missing_fetches.erase(fetch_id) == 0) {
         return errors::Aborted(kRetvalOp,
                                " node found with unknown fetch id: ", fetch_id);
@@ -234,7 +234,7 @@ Status CollectArgNodes(const Graph& graph, std::vector<Node*>* arg_nodes) {
   for (Node* n : graph.nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
       auto insert_result = indexed_arg_nodes.insert({index, n});
       if (!insert_result.second) {
         const Node* dup = insert_result.first->second;
@@ -264,9 +264,9 @@ Status CreateXlaArgs(const Graph& graph,
   for (const Node* node : arg_nodes) {
     XlaCompiler::Argument arg;
     arg.kind = XlaCompiler::Argument::kParameter;
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &arg.type));
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), kShapeAttr, &arg.shape));
-    TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), kDebugNameAttr, &arg.name));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &arg.type));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), kShapeAttr, &arg.shape));
+    TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), kDebugNameAttr, &arg.name));
     xla_args->push_back(arg);
   }
   return Status::OK();
diff --git a/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc b/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
index abb68f73d7..48eed7fce0 100644
--- a/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
+++ b/tensorflow/compiler/jit/build_xla_launch_ops_pass.cc
@@ -66,9 +66,9 @@ static Status ReplaceNodeWithXlaLaunch(Graph* graph, Node* node) {
 
   int num_constant_args, num_resource_args;
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(node->def(), kXlaNumConstantArgsAttr, &num_constant_args));
+      GetNodeAttr(node->attrs(), kXlaNumConstantArgsAttr, &num_constant_args));
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(node->def(), kXlaNumResourceArgsAttr, &num_resource_args));
+      GetNodeAttr(node->attrs(), kXlaNumResourceArgsAttr, &num_resource_args));
 
   if (num_constant_args < 0 || num_resource_args < 0 ||
       num_constant_args + num_resource_args > node->num_inputs()) {
@@ -88,7 +88,7 @@ static Status ReplaceNodeWithXlaLaunch(Graph* graph, Node* node) {
   Node* launch_node;
   TF_RETURN_IF_ERROR(BuildLaunchNode(
       graph->NewName(node->name()), node->type_string(), node->def().attr(),
-      node->def().device(), const_dtypes, num_resource_args, arg_dtypes,
+      node->requested_device(), const_dtypes, num_resource_args, arg_dtypes,
       node->output_types(), graph, &launch_node));
   launch_node->set_assigned_device_name(node->assigned_device_name());
 
@@ -173,7 +173,8 @@ Status CreateXlaLaunchOp(FunctionLibraryRuntime* flr, const NodeDef& ndef,
   FunctionLibraryRuntime::Handle handle;
   // If ndef is not instantiable, e.g., the function does not exist,
   // simply bail out.
-  TF_RETURN_IF_ERROR(flr->Instantiate(ndef.op(), ndef.attr(), &handle));
+  TF_RETURN_IF_ERROR(
+      flr->Instantiate(ndef.op(), AttrSlice(&ndef.attr()), &handle));
   const FunctionBody* fbody = flr->GetFunctionBody(handle);
   CHECK(fbody);  // Can't be nullptr since we just instantiated it.
   std::vector<bool> const_args(fbody->arg_types.size());
diff --git a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
index decea97fc8..88ec45f8d8 100644
--- a/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
+++ b/tensorflow/compiler/jit/encapsulate_subgraphs_pass.cc
@@ -165,7 +165,7 @@ static const char* const kRetValOp = "_Retval";
 // none.
 string Encapsulator::GetFunctionNameAttr(Node const* node) const {
   string attr;
-  if (!GetNodeAttr(node->def(), group_attribute_, &attr).ok()) {
+  if (!GetNodeAttr(node->attrs(), group_attribute_, &attr).ok()) {
     attr.clear();
   }
   return attr;
@@ -195,7 +195,7 @@ Status Encapsulator::SplitIntoSubgraphs() {
 
     // Check the device matches any existing device.
     string device = node->assigned_device_name().empty()
-                        ? node->def().device()
+                        ? node->requested_device()
                         : node->assigned_device_name();
 
     if (subgraph.device.empty()) {
@@ -593,7 +593,7 @@ static Status GetArgTypes(const Graph& graph, DataTypeVector* types) {
   for (Node* n : graph.nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
       if (index < 0 || index >= types->size()) {
         return errors::InvalidArgument("Invalid argument number");
       }
@@ -610,7 +610,7 @@ static Status RenumberArguments(Graph* graph,
   for (Node* n : graph->nodes()) {
     if (n->type_string() == kArgOp) {
       int index;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "index", &index));
       if (index < 0 || index >= permutation.size()) {
         return errors::InvalidArgument("Invalid argument number");
       }
@@ -713,7 +713,7 @@ Status EncapsulateSubgraphsPass::Run(
 bool IsXlaCompiledKernel(const Node& node) {
   bool is_compiled = false;
   bool has_compilation_attr =
-      GetNodeAttr(node.def(), kXlaCompiledKernelAttr, &is_compiled).ok() &&
+      GetNodeAttr(node.attrs(), kXlaCompiledKernelAttr, &is_compiled).ok() &&
       is_compiled;
   return has_compilation_attr ? is_compiled : false;
 }
diff --git a/tensorflow/compiler/jit/graph_to_functiondef.cc b/tensorflow/compiler/jit/graph_to_functiondef.cc
index 88e292a2c1..83c2338500 100644
--- a/tensorflow/compiler/jit/graph_to_functiondef.cc
+++ b/tensorflow/compiler/jit/graph_to_functiondef.cc
@@ -126,8 +126,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     if (node->type_string() == kArgOp) {
       int index;
       DataType type;
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &type));
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &type));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "index", &index));
       while (fdef->signature().input_arg_size() <= index) {
         fdef->mutable_signature()->add_input_arg();
       }
@@ -143,8 +143,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     if (node->type_string() == kRetValOp) {
       int index;
       DataType type;
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "T", &type));
-      TF_RETURN_IF_ERROR(GetNodeAttr(node->def(), "index", &index));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "T", &type));
+      TF_RETURN_IF_ERROR(GetNodeAttr(node->attrs(), "index", &index));
       while (fdef->signature().output_arg_size() <= index) {
         fdef->mutable_signature()->add_output_arg();
       }
@@ -161,7 +161,7 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
     }
 
     NodeDef* node_def = fdef->add_node_def();
-    node_def->CopyFrom(node->def());
+    *node_def = node->def();
     node_def->set_name(node_names.Uniquify(node->name()));
 
     // Reset input names based on graph rather than the NodeDef.
@@ -203,8 +203,8 @@ Status GraphToFunctionDef(const Graph& graph, const string& name,
 
     // Populate tensor_renaming.
     NameRangeMap output_ranges;
-    TF_RETURN_IF_ERROR(NameRangesForNode(node->def(), node->op_def(), nullptr,
-                                         &output_ranges));
+    TF_RETURN_IF_ERROR(
+        NameRangesForNode(*node, node->op_def(), nullptr, &output_ranges));
     for (const auto& output : output_ranges) {
       for (int i = output.second.first; i < output.second.second; ++i) {
         const string tensor_name = strings::StrCat(
diff --git a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
index cb6c14901b..29c5ff7242 100644
--- a/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_device_launch_op.cc
@@ -55,7 +55,7 @@ XlaDeviceLaunchOp::XlaDeviceLaunchOp(OpKernelConstruction* ctx)
   OP_REQUIRES_OK(ctx, ctx->GetAttr("function", &func));
   function_ = *func;
   VLOG(1) << "XlaDeviceLaunch created function="
-          << Canonicalize(function_.name(), function_.attr());
+          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
   DataTypeVector constant_types;
   OP_REQUIRES_OK(ctx, ctx->GetAttr("Tconstants", &constant_types));
   num_constant_args_ = constant_types.size();
@@ -81,7 +81,7 @@ std::vector<OptionalTensor> SnapshotResourceVariables(OpKernelContext* ctx,
 
 void XlaDeviceLaunchOp::Compute(OpKernelContext* ctx) {
   VLOG(1) << "XlaDeviceLaunch::Compute "
-          << Canonicalize(function_.name(), function_.attr());
+          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
   // We store information about the JIT-compiled XLA computation
   // in the ResourceMgr.
   ResourceMgr* rm = ctx->resource_manager();
diff --git a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
index a58abcbdff..40acc0d81d 100644
--- a/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
+++ b/tensorflow/compiler/jit/kernels/xla_local_launch_op.cc
@@ -186,7 +186,7 @@ Status XlaLocalLaunchOp::BuildCompilationCache(OpKernelContext* ctx,
 
 void XlaLocalLaunchOp::Compute(OpKernelContext* ctx) {
   VLOG(1) << "XlaLocalLaunchOp::Compute "
-          << Canonicalize(function_.name(), function_.attr());
+          << Canonicalize(function_.name(), AttrSlice(&function_.attr()));
   // We store information about the JIT-compiled XLA computation
   // in the ResourceMgr.
   ResourceMgr* rm = ctx->resource_manager();
diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass.cc b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
index 711b986d7f..73c4e80551 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass.cc
@@ -56,18 +56,18 @@ bool IsCompilableCall(const NodeDef& call_def,
                       const DeviceType& jit_device_type, int depth,
                       FunctionLibraryRuntime* lib_runtime);
 
-// Tests whether 'while_def' is a completely compilable loop.
+// Tests whether 'while_node' is a completely compilable loop.
 // Every operator in the condition and body functions must be compilable for a
 // while loop to be compilable.
-bool IsCompilableWhile(const NodeDef& while_def,
+bool IsCompilableWhile(const Node& while_node,
                        const DeviceType& jit_device_type, int depth,
                        FunctionLibraryRuntime* lib_runtime) {
-  VLOG(2) << "Loop marking: " << while_def.op();
+  VLOG(2) << "Loop marking: " << while_node.type_string();
 
   const NameAttrList* name_attr;
   NodeDef call;
   Status status;
-  status = GetNodeAttr(while_def, "cond", &name_attr);
+  status = GetNodeAttr(while_node.attrs(), "cond", &name_attr);
   if (!status.ok()) {
     VLOG(2) << "Missing 'cond' attribute on While node.";
     return false;
@@ -80,7 +80,7 @@ bool IsCompilableWhile(const NodeDef& while_def,
     VLOG(2) << "Can't compile loop condition: " << cond_func;
     return false;
   }
-  status = GetNodeAttr(while_def, "body", &name_attr);
+  status = GetNodeAttr(while_node.attrs(), "body", &name_attr);
   if (!status.ok()) {
     VLOG(2) << "Missing 'body' attribute on While node.";
     return false;
@@ -112,7 +112,7 @@ bool IsCompilableCall(const NodeDef& call_def,
 
   FunctionLibraryRuntime::Handle handle;
   Status status =
-      lib_runtime->Instantiate(call_def.op(), call_def.attr(), &handle);
+      lib_runtime->Instantiate(call_def.op(), AttrSlice(call_def), &handle);
   if (!status.ok()) {
     VLOG(2) << "Could not instantiate " << call_def.op() << ": " << status;
     return false;
@@ -134,11 +134,11 @@ bool IsCompilableCall(const NodeDef& call_def,
 
   for (Node* node : fbody->graph->nodes()) {
     if (node->IsSource() || node->IsSink()) continue;
-    if (node->def().op() == "_Arg" || node->def().op() == "_Retval") continue;
-    if (node->def().op() == "While") {
+    if (node->type_string() == "_Arg" || node->type_string() == "_Retval")
+      continue;
+    if (node->type_string() == "While") {
       // Handle functional While loop (not in open source build).
-      return IsCompilableWhile(node->def(), jit_device_type, depth + 1,
-                               lib_runtime);
+      return IsCompilableWhile(*node, jit_device_type, depth + 1, lib_runtime);
     }
     if (!HasXLAKernel(*node, jit_device_type) &&
         !IsCompilableCall(node->def(), jit_device_type, depth + 1,
@@ -192,17 +192,16 @@ Status FindCompilationCandidates(
     if (!HasXLAKernel(*node, jit_device_type) &&
         !IsCompilableCall(node->def(), jit_device_type, 0, lib_runtime.get())) {
       VLOG(2) << "Compilation rejected node: unsupported op " << node->name()
-              << ": " << node->def().op();
+              << ": " << node->type_string();
       continue;
     }
     if (!registration->compile_resource_ops && HasResourceArgument(*node)) {
       VLOG(2) << "Compilation rejected node: resource argument " << node->name()
-              << ": " << node->def().op();
+              << ": " << node->type_string();
       continue;
     }
-    if (node->def().op() == "While" &&
-        !IsCompilableWhile(node->def(), jit_device_type, 0,
-                           lib_runtime.get())) {
+    if (node->type_string() == "While" &&
+        !IsCompilableWhile(*node, jit_device_type, 0, lib_runtime.get())) {
       continue;
     }
     candidates->insert(node);
@@ -319,10 +318,10 @@ Status MarkForCompilationPass::Run(
 
     // If there is a _XlaCompile annotation, use its value.
     bool compile = false;
-    Status status = GetNodeAttr(node->def(), kXlaCompileAttr, &compile);
+    Status status = GetNodeAttr(node->attrs(), kXlaCompileAttr, &compile);
     if (status.ok()) return compile;
 
-    status = fld->GetAttr(node->def(), kXlaCompileAttr, &compile);
+    status = fld->GetAttr(*node, kXlaCompileAttr, &compile);
     if (status.ok()) return compile;
 
     // Otherwise use the value of global_jit_level.
@@ -485,8 +484,8 @@ Status MarkForCompilationPass::RunImpl(
       // all nodes marked with _XlaCompile=true to also have a
       // _XlaScope property set (and raise an error otherwise); but
       // for now we don't do this.
-      if (GetNodeAttr(node_from->def(), kXlaScopeAttr, &from_scope).ok() &&
-          GetNodeAttr(node_to->def(), kXlaScopeAttr, &to_scope).ok() &&
+      if (GetNodeAttr(node_from->attrs(), kXlaScopeAttr, &from_scope).ok() &&
+          GetNodeAttr(node_to->attrs(), kXlaScopeAttr, &to_scope).ok() &&
           from_scope != to_scope) {
         continue;
       }
@@ -541,10 +540,9 @@ Status MarkForCompilationPass::RunImpl(
     // Compile if the user marked this node _XlaCompile=true
     bool compile_attr = false;
     bool marked_for_compilation = false;
-    if (GetNodeAttr(n->def(), kXlaCompileAttr, &compile_attr).ok()) {
+    if (GetNodeAttr(n->attrs(), kXlaCompileAttr, &compile_attr).ok()) {
       marked_for_compilation = compile_attr;
-    } else if (options.flib_def
-                   ->GetAttr(n->def(), kXlaCompileAttr, &compile_attr)
+    } else if (options.flib_def->GetAttr(*n, kXlaCompileAttr, &compile_attr)
                    .ok()) {
       marked_for_compilation = compile_attr;
     }
diff --git a/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc b/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
index 91e4a2b41c..9f30e12e0e 100644
--- a/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
+++ b/tensorflow/compiler/jit/mark_for_compilation_pass_test.cc
@@ -57,7 +57,7 @@ std::unordered_map<string, string> GetClusters(const Graph& graph) {
   std::unordered_map<string, string> ids;
   for (Node* node : graph.nodes()) {
     string cluster;
-    if (GetNodeAttr(node->def(), kXlaClusterAttr, &cluster).ok()) {
+    if (GetNodeAttr(node->attrs(), kXlaClusterAttr, &cluster).ok()) {
       CHECK(!cluster.empty());
       ids[node->name()] = cluster;
     }
diff --git a/tensorflow/compiler/jit/xla_compilation_cache.cc b/tensorflow/compiler/jit/xla_compilation_cache.cc
index 82af304169..63ca77f9a9 100644
--- a/tensorflow/compiler/jit/xla_compilation_cache.cc
+++ b/tensorflow/compiler/jit/xla_compilation_cache.cc
@@ -95,7 +95,7 @@ Status XlaCompilationCache::BuildSignature(
     const NameAttrList& function, int num_constant_args,
     const std::vector<OptionalTensor>& variable_args, OpKernelContext* ctx,
     Signature* signature) {
-  signature->name = Canonicalize(function.name(), function.attr());
+  signature->name = Canonicalize(function.name(), AttrSlice(&function.attr()));
   signature->arg_values.resize(num_constant_args);
 
   signature->arg_types.reserve(ctx->num_inputs() - num_constant_args);
diff --git a/tensorflow/compiler/tf2xla/const_analysis.cc b/tensorflow/compiler/tf2xla/const_analysis.cc
index 44ff13ca34..4adc17b838 100644
--- a/tensorflow/compiler/tf2xla/const_analysis.cc
+++ b/tensorflow/compiler/tf2xla/const_analysis.cc
@@ -108,7 +108,7 @@ Status BackwardsConstAnalysis(const Graph& g,
     if (must_be_const.find(node) != must_be_const.end()) {
       if (node->type_string() == "_Arg") {
         int index;
-        status = GetNodeAttr(node->def(), "index", &index);
+        status = GetNodeAttr(node->attrs(), "index", &index);
         if (!status.ok()) return;
         compile_time_const_args->at(index) = true;
         return;
@@ -124,8 +124,8 @@ Status BackwardsConstAnalysis(const Graph& g,
     if (range.first == range.second) return;
 
     NameRangeMap input_name_ranges;
-    status = NameRangesForNode(node->def(), node->op_def(), &input_name_ranges,
-                               nullptr);
+    status =
+        NameRangesForNode(*node, node->op_def(), &input_name_ranges, nullptr);
     if (!status.ok()) return;
 
     for (auto it = range.first; it != range.second; ++it) {
diff --git a/tensorflow/compiler/tf2xla/kernels/function_ops.cc b/tensorflow/compiler/tf2xla/kernels/function_ops.cc
index d718f98545..8dacb6627b 100644
--- a/tensorflow/compiler/tf2xla/kernels/function_ops.cc
+++ b/tensorflow/compiler/tf2xla/kernels/function_ops.cc
@@ -68,7 +68,8 @@ class SymbolicGradientOp : public AsyncOpKernel {
                       done);
 
     OP_REQUIRES_OK_ASYNC(
-        ctx, lib->Instantiate(kGradientOp, def().attr(), &handle_), done);
+        ctx, lib->Instantiate(kGradientOp, AttrSlice(&def().attr()), &handle_),
+        done);
 
     FunctionLibraryRuntime::Options opts;
     opts.step_id = ctx->step_id();
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index a8034a2ec6..d4a917671b 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -106,7 +106,8 @@ Status XlaCompiler::CompileFunction(
     const XlaCompiler::CompileOptions& options, const NameAttrList& function,
     const std::vector<XlaCompiler::Argument>& args,
     XlaCompiler::CompilationResult* result) {
-  const string function_id = Canonicalize(function.name(), function.attr());
+  const string function_id =
+      Canonicalize(function.name(), AttrSlice(&function.attr()));
   VLOG(1) << "XlaCompiler::CompileFunction " << function_id;
 
   auto it = cache_.find({function_id, args});
@@ -116,8 +117,8 @@ Status XlaCompiler::CompileFunction(
   }
 
   FunctionLibraryRuntime::Handle handle;
-  TF_RETURN_IF_ERROR(
-      flib_runtime_->Instantiate(function.name(), function.attr(), &handle));
+  TF_RETURN_IF_ERROR(flib_runtime_->Instantiate(
+      function.name(), AttrSlice(&function.attr()), &handle));
 
   const FunctionBody* fbody = flib_runtime_->GetFunctionBody(handle);
   CHECK(fbody);
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 343d6faf5a..e520969fd1 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1411,6 +1411,11 @@ tf_cuda_library(
             "framework/**/*.cc",
             "util/**/*.h",
             "util/**/*.cc",
+        ] + [
+            "graph/edgeset.h",
+            "graph/edgeset.cc",
+            "graph/graph.h",
+            "graph/graph.cc",
         ],
         exclude = [
             "**/*test*",
@@ -1551,8 +1556,6 @@ tf_cuda_library(
         "graph/colors.cc",
         "graph/control_flow.cc",
         "graph/costmodel.cc",
-        "graph/edgeset.cc",
-        "graph/graph.cc",
         "graph/graph_constructor.cc",
         "graph/graph_def_builder.cc",
         "graph/graph_partition.cc",
diff --git a/tensorflow/core/common_runtime/constant_folding_test.cc b/tensorflow/core/common_runtime/constant_folding_test.cc
index 9cc761a771..4a8560960e 100644
--- a/tensorflow/core/common_runtime/constant_folding_test.cc
+++ b/tensorflow/core/common_runtime/constant_folding_test.cc
@@ -48,9 +48,9 @@ class ConstantFoldingTest : public ::testing::Test {
                        TensorShape shape) {
     EXPECT_TRUE(n->IsConstant());
     const TensorProto* tensor_proto;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor_proto));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor_proto));
     DataType dtype;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
     Tensor t(dtype);
     EXPECT_TRUE(t.FromProto(*tensor_proto));
     test::ExpectClose(t, test::AsTensor(values, shape));
@@ -61,9 +61,9 @@ class ConstantFoldingTest : public ::testing::Test {
                        TensorShape shape) {
     EXPECT_TRUE(n->IsConstant());
     const TensorProto* tensor_proto;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "value", &tensor_proto));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "value", &tensor_proto));
     DataType dtype;
-    TF_EXPECT_OK(GetNodeAttr(n->def(), "dtype", &dtype));
+    TF_EXPECT_OK(GetNodeAttr(n->attrs(), "dtype", &dtype));
     Tensor t(dtype);
     EXPECT_TRUE(t.FromProto(*tensor_proto));
     test::ExpectTensorEqual<T>(t, test::AsTensor(values, shape));
diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc
index ec0c9405dd..9e18547af5 100644
--- a/tensorflow/core/common_runtime/executor.cc
+++ b/tensorflow/core/common_runtime/executor.cc
@@ -92,31 +92,28 @@ bool SetTimelineLabel(const Node* node, NodeExecStats* node_stats) {
       }
     }
   }
-  const NodeDef& def = node->def();
-  string text = "";
+  const AttrSlice attrs = node->attrs();
+  string text;
   if (IsSend(node)) {
     string tensor_name;
-    TF_CHECK_OK(GetNodeAttr(def, "tensor_name", &tensor_name));
+    TF_CHECK_OK(GetNodeAttr(attrs, "tensor_name", &tensor_name));
     string recv_device;
-    TF_CHECK_OK(GetNodeAttr(def, "recv_device", &recv_device));
-    text = strings::StrCat(memory, def.name(), " = ", def.op(), "(",
-                           tensor_name, " @", recv_device);
+    TF_CHECK_OK(GetNodeAttr(attrs, "recv_device", &recv_device));
+    text = strings::StrCat(memory, node->name(), " = ", node->type_string(),
+                           "(", tensor_name, " @", recv_device);
     is_transfer_node = true;
   } else if (IsRecv(node)) {
     string tensor_name;
-    TF_CHECK_OK(GetNodeAttr(def, "tensor_name", &tensor_name));
+    TF_CHECK_OK(GetNodeAttr(attrs, "tensor_name", &tensor_name));
     string send_device;
-    TF_CHECK_OK(GetNodeAttr(def, "send_device", &send_device));
-    text = strings::StrCat(memory, def.name(), " = ", def.op(), "(",
-                           tensor_name, " @", send_device);
+    TF_CHECK_OK(GetNodeAttr(attrs, "send_device", &send_device));
+    text = strings::StrCat(memory, node->name(), " = ", node->type_string(),
+                           "(", tensor_name, " @", send_device);
     is_transfer_node = true;
   } else {
-    text = strings::StrCat(
-        memory, def.name(), " = ", def.op(), "(",
-        str_util::Join(
-            std::vector<StringPiece>(def.input().begin(), def.input().end()),
-            ", "),
-        ")");
+    text =
+        strings::StrCat(memory, node->name(), " = ", node->type_string(), "(",
+                        str_util::Join(node->requested_inputs(), ", "), ")");
   }
   node_stats->set_timeline_label(text);
   return is_transfer_node;
@@ -522,7 +519,7 @@ char* GraphView::InitializeNode(char* ptr, const Node* n) {
   EdgeInfo* dst_edge = item->output_edge_base();
   for (auto e : n->out_edges()) {
     dst_edge->dst_id = e->dst()->id();
-    CHECK_LE(e->src_output(), ((int32)0x3FFFFFFF));  // Must fit in 31 bits
+    CHECK_LE(e->src_output(), 0x3FFFFFFF);  // Must fit in 31 bits
     dst_edge->output_slot = e->src_output();
     dst_edge->is_last = false;
     const int output_slot = dst_edge->output_slot;
@@ -640,7 +637,7 @@ Status ExecutorImpl::Initialize() {
     Status s = params_.create_kernel(n->def(), &item->kernel);
     if (!s.ok()) {
       item->kernel = nullptr;
-      s = AttachDef(s, n->def());
+      s = AttachDef(s, *n);
       LOG(ERROR) << "Executor failed to create kernel. " << s;
       return s;
     }
@@ -668,7 +665,7 @@ Status ExecutorImpl::Initialize() {
     frame_info->nodes->push_back(n);
     if (IsEnter(n)) {
       string enter_name;
-      TF_RETURN_IF_ERROR(GetNodeAttr(n->def(), "frame_name", &enter_name));
+      TF_RETURN_IF_ERROR(GetNodeAttr(n->attrs(), "frame_name", &enter_name));
       EnsureFrameInfo(enter_name)->input_count++;
     }
   }
@@ -723,7 +720,7 @@ Status InferAllocAttr(const Node* n, const Node* dst,
   // so these two cases are not mutually exclusive.
   if (IsRecv(n)) {
     string src_name;
-    s = GetNodeAttr(n->def(), "send_device", &src_name);
+    s = GetNodeAttr(n->attrs(), "send_device", &src_name);
     if (!s.ok()) return s;
     DeviceNameUtils::ParsedName parsed_src_name;
     if (!DeviceNameUtils::ParseFullName(src_name, &parsed_src_name)) {
@@ -748,7 +745,7 @@ Status InferAllocAttr(const Node* n, const Node* dst,
   }
   if (IsSend(dst)) {
     string dst_name;
-    s = GetNodeAttr(dst->def(), "recv_device", &dst_name);
+    s = GetNodeAttr(dst->attrs(), "recv_device", &dst_name);
     if (!s.ok()) return s;
     DeviceNameUtils::ParsedName parsed_dst_name;
     if (!DeviceNameUtils::ParseFullName(dst_name, &parsed_dst_name)) {
@@ -1361,7 +1358,7 @@ Status ExecutorImpl::BuildControlFlowInfo(const Graph* g,
     if (IsEnter(curr_node)) {
       // Enter a child frame.
       TF_RETURN_IF_ERROR(
-          GetNodeAttr(curr_node->def(), "frame_name", &frame_name));
+          GetNodeAttr(curr_node->attrs(), "frame_name", &frame_name));
       parent = curr_node;
     } else if (IsExit(curr_node)) {
       // Exit to the parent frame.
@@ -1555,8 +1552,7 @@ void ExecutorState::Process(TaggedNode tagged_node, int64 scheduled_usec) {
 
     if (vlog_) {
       VLOG(1) << "Process node: " << id << " step " << params.step_id << " "
-              << SummarizeNodeDef(node->def())
-              << " is dead: " << tagged_node.is_dead;
+              << SummarizeNode(*node) << " is dead: " << tagged_node.is_dead;
     }
 
     Entry* input_tensors = GetInputTensors(input_frame, input_iter);
@@ -1610,7 +1606,7 @@ void ExecutorState::Process(TaggedNode tagged_node, int64 scheduled_usec) {
 
           if (vlog_) {
             VLOG(2) << this << " Async kernel done: "
-                    << SummarizeNodeDef(state->item->node->def());
+                    << SummarizeNode(*state->item->node);
           }
           if (stats) nodestats::SetOpEnd(stats);
           EntryVector outputs;
@@ -1811,7 +1807,7 @@ Status ExecutorState::ProcessOutputs(const NodeItem& item, OpKernelContext* ctx,
       // tensor value at i-th output.
       if (!IsSwitch(node) && !IsRecv(node)) {
         s.Update(errors::Internal("Missing ", i, "-th output from ",
-                                  SummarizeNodeDef(node->def())));
+                                  SummarizeNode(*node)));
       }
     } else {
       Entry* out = &((*outputs)[i]);
@@ -1878,7 +1874,7 @@ Status ExecutorState::ProcessOutputs(const NodeItem& item, OpKernelContext* ctx,
                                   DataTypeString(dtype),
                                   " does not match declared output type ",
                                   DataTypeString(item.output_type(i)),
-                                  " for node ", SummarizeNodeDef(node->def())));
+                                  " for node ", SummarizeNode(*node)));
       }
     }
     if (!val.is_ref()) {
@@ -1915,7 +1911,7 @@ void ExecutorState::PropagateOutputs(const TaggedNode& tagged_node,
         &impl_->gview_, input_iter, ready);
   } else if (item->is_enter) {
     bool is_constant;
-    Status s = GetNodeAttr(node->def(), "is_constant", &is_constant);
+    Status s = GetNodeAttr(node->attrs(), "is_constant", &is_constant);
     DCHECK(s.ok()) << s;
     FindOrCreateChildFrame(input_frame, input_iter, node, &output_frame);
     output_iter = 0;
@@ -2241,7 +2237,7 @@ void ExecutorState::FindOrCreateChildFrame(FrameState* frame, int64 iter,
                                            FrameState** child) {
   // Get the child frame name.
   string enter_name;
-  Status s = GetNodeAttr(node->def(), "frame_name", &enter_name);
+  Status s = GetNodeAttr(node->attrs(), "frame_name", &enter_name);
   DCHECK(s.ok()) << s;
   const string child_name = MakeFrameName(frame, iter, enter_name);
 
@@ -2259,7 +2255,7 @@ void ExecutorState::FindOrCreateChildFrame(FrameState* frame, int64 iter,
   if (vlog_) VLOG(2) << "Create frame: " << child_name;
 
   int parallel_iters;
-  s = GetNodeAttr(node->def(), "parallel_iterations", &parallel_iters);
+  s = GetNodeAttr(node->attrs(), "parallel_iterations", &parallel_iters);
   DCHECK(s.ok()) << s;
   FrameState* temp = new FrameState(impl_, parallel_iters);
   temp->frame_name = child_name;
diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 4be22f8260..996a8a9b3d 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -150,8 +150,7 @@ class FunctionLibraryRuntimeImpl : public FunctionLibraryRuntime {
 
   ~FunctionLibraryRuntimeImpl() override;
 
-  Status Instantiate(const string& function_name,
-                     const InstantiateAttrValueMap& attrs,
+  Status Instantiate(const string& function_name, AttrSlice attrs,
                      Handle* handle) override;
 
   const FunctionBody* GetFunctionBody(Handle handle) override;
@@ -208,8 +207,7 @@ class FunctionLibraryRuntimeImpl : public FunctionLibraryRuntime {
   };
   std::vector<Item*> items_;
 
-  Status FunctionDefToBody(const FunctionDef& fdef,
-                           const InstantiateAttrValueMap& attrs,
+  Status FunctionDefToBody(const FunctionDef& fdef, AttrSlice attrs,
                            FunctionBody** fbody);
   Status CreateItem(Handle handle, Item** item);
   Status GetOrCreateItem(Handle handle, Item** item);
@@ -324,7 +322,7 @@ Status FunctionLibraryRuntimeImpl::CreateKernel(const NodeDef& ndef,
   // Try to instantiate this function for the func/attr. Maybe its
   // cached already.
   Handle handle;
-  TF_RETURN_IF_ERROR(Instantiate(ndef.op(), ndef.attr(), &handle));
+  TF_RETURN_IF_ERROR(Instantiate(ndef.op(), AttrSlice(&ndef.attr()), &handle));
 
   const FunctionBody* fbody = GetFunctionBody(handle);
   CHECK_NOTNULL(fbody);
@@ -355,9 +353,9 @@ Status FunctionLibraryRuntimeImpl::CreateKernel(const NodeDef& ndef,
   return s;
 }
 
-Status FunctionLibraryRuntimeImpl::FunctionDefToBody(
-    const FunctionDef& fdef, const InstantiateAttrValueMap& attrs,
-    FunctionBody** fbody) {
+Status FunctionLibraryRuntimeImpl::FunctionDefToBody(const FunctionDef& fdef,
+                                                     AttrSlice attrs,
+                                                     FunctionBody** fbody) {
   // Instantiates the function template into a graph def.
   InstantiationResult result;
   TF_RETURN_IF_ERROR(InstantiateFunction(fdef, attrs, get_func_sig_, &result));
@@ -390,11 +388,13 @@ Status FunctionLibraryRuntimeImpl::InstantiateSymbolicGradient(
     // TODO(josh11b): Should filter out the attrs from func that aren't used
     // by the gradient function.
     TF_RETURN_IF_ERROR(creator(AttrSlice(&func.attr()), &grad_fdef));
-    TF_RETURN_IF_ERROR(FunctionDefToBody(grad_fdef, func.attr(), g_body));
+    TF_RETURN_IF_ERROR(
+        FunctionDefToBody(grad_fdef, AttrSlice(&func.attr()), g_body));
   } else {
     // f is a user-defined function.
     Handle f_handle;
-    TF_RETURN_IF_ERROR(Instantiate(func.name(), func.attr(), &f_handle));
+    TF_RETURN_IF_ERROR(
+        Instantiate(func.name(), AttrSlice(&func.attr()), &f_handle));
     const FunctionBody* f_body = GetFunctionBody(f_handle);
     CHECK_NOTNULL(f_body);
     *g_body = SymbolicGradient(*f_body);
@@ -402,9 +402,9 @@ Status FunctionLibraryRuntimeImpl::InstantiateSymbolicGradient(
   return Status::OK();
 }
 
-Status FunctionLibraryRuntimeImpl::Instantiate(
-    const string& function_name, const InstantiateAttrValueMap& attrs,
-    Handle* handle) {
+Status FunctionLibraryRuntimeImpl::Instantiate(const string& function_name,
+                                               AttrSlice attrs,
+                                               Handle* handle) {
   const string key = Canonicalize(function_name, attrs);
   {
     mutex_lock l(mu_);
@@ -417,7 +417,7 @@ Status FunctionLibraryRuntimeImpl::Instantiate(
   Status s;
   FunctionBody* fbody = nullptr;
   if (function_name == kGradientOp) {
-    const AttrValue* f = gtl::FindOrNull(attrs, kFuncAttr);
+    const AttrValue* f = attrs.Find(kFuncAttr);
     if (f == nullptr) {
       return errors::InvalidArgument("SymbolicGradient is missing attr: f");
     }
@@ -427,7 +427,7 @@ Status FunctionLibraryRuntimeImpl::Instantiate(
     }
     const string grad = lib_def_->FindGradient(func.name());
     if (!grad.empty()) {
-      return Instantiate(grad, func.attr(), handle);
+      return Instantiate(grad, AttrSlice(&func.attr()), handle);
     }
     TF_RETURN_IF_ERROR(InstantiateSymbolicGradient(func, &fbody));
   } else {
@@ -989,13 +989,12 @@ bool ExpandInlineFunctions(FunctionLibraryRuntime* lib, Graph* graph) {
   for (Node* node : graph->nodes()) {
     VLOG(3) << "Expanding " << node->DebugString();
     bool noinline;
-    if (fld->GetAttr(node->def(), kNoInlineAttr, &noinline).ok() && noinline) {
+    if (fld->GetAttr(*node, kNoInlineAttr, &noinline).ok() && noinline) {
       VLOG(3) << "noinline: " << node->DebugString();
       continue;
     }
     FunctionLibraryRuntime::Handle handle;
-    Status s =
-        lib->Instantiate(node->type_string(), node->def().attr(), &handle);
+    Status s = lib->Instantiate(node->type_string(), node->attrs(), &handle);
     if (!s.ok()) {
       // Either "node" is a primitive op, or the instantiation failed.
       if (errors::IsNotFound(s)) {
@@ -1103,7 +1102,7 @@ FunctionBody::FunctionBody(const FunctionDef& f, DataTypeSlice arg_t,
       continue;
     }
     int index;
-    TF_CHECK_OK(GetNodeAttr(n->def(), "index", &index));
+    TF_CHECK_OK(GetNodeAttr(n->attrs(), "index", &index));
     CHECK_LE(0, index);
     CHECK_LT(index, node_vec->size());
     (*node_vec)[index] = n;
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
index dfa1ed8a7e..e27fc3898d 100644
--- a/tensorflow/core/common_runtime/function_test.cc
+++ b/tensorflow/core/common_runtime/function_test.cc
@@ -40,6 +40,7 @@ limitations under the License.
 #include "tensorflow/core/util/equal_graph_def.h"
 
 namespace tensorflow {
+namespace {
 
 typedef FunctionDefHelper FDH;
 
@@ -58,13 +59,29 @@ void HasError(const Status& s, const string& substr) {
       << s << ", expected substring " << substr;
 }
 
+// A helper class to make AttrSlice from initializer lists
+class Attrs {
+ public:
+  Attrs(const std::initializer_list<  // NOLINT(runtime/explicit)
+        std::pair<string, FunctionDefHelper::AttrValueWrapper>>& attrs) {
+    for (const auto& aval : attrs) {
+      map_.insert({aval.first, aval.second.proto});
+    }
+  }
+
+  operator AttrSlice() { return AttrSlice(&map_); }  // NOLINT(runtime/explicit)
+
+ private:
+  AttrValueMap map_;
+};
+
 class FunctionTest : public ::testing::Test {
  protected:
   FunctionTest()
       : device_(DeviceFactory::NewDevice("CPU", {},
                                          "/job:localhost/replica:0/task:0")) {}
 
-  void Create(const FunctionDef& fdef, InstantiateAttrValueSlice attrs) {
+  void Create(const FunctionDef& fdef, Attrs attrs) {
     exec_ = nullptr;
     InstantiationResult result;
     TF_CHECK_OK(InstantiateFunction(fdef, attrs, GetOpSig, &result));
@@ -151,8 +168,8 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     fdef_lib_ = lib_def_->ToProto();
   }
 
-  Status Run(const string& name, InstantiateAttrValueSlice attrs,
-             const std::vector<Tensor>& args, std::vector<Tensor*> rets) {
+  Status Run(const string& name, Attrs attrs, const std::vector<Tensor>& args,
+             std::vector<Tensor*> rets) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(name, attrs, &handle);
     if (!status.ok()) {
@@ -188,8 +205,7 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     return Status::OK();
   }
 
-  std::unique_ptr<Graph> GetFuncBody(const string& name,
-                                     InstantiateAttrValueSlice attrs) {
+  std::unique_ptr<Graph> GetFuncBody(const string& name, Attrs attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(name, attrs, &handle);
     if (!status.ok()) {
@@ -203,8 +219,7 @@ class FunctionLibraryRuntimeTest : public ::testing::Test {
     return ret;
   }
 
-  std::unique_ptr<Graph> GetGradBody(const string& func,
-                                     InstantiateAttrValueSlice attrs) {
+  std::unique_ptr<Graph> GetGradBody(const string& func, Attrs attrs) {
     FunctionLibraryRuntime::Handle handle;
     Status status = lib_->Instantiate(func, attrs, &handle);
     if (!status.ok()) {
@@ -615,13 +630,14 @@ TEST_F(FunctionLibraryRuntimeTest, Error_InstantiaionError) {
 
   // Instantiating "XTimesTwo" should fail.
   FunctionLibraryRuntime::Handle handle;
-  HasError(lib_->Instantiate("XTimesTwo", {{"T", DT_FLOAT}}, &handle),
+  HasError(lib_->Instantiate("XTimesTwo", Attrs({{"T", DT_FLOAT}}), &handle),
            "Not found: type attr not found");
 
   // But XTimesFour and XTimes16 instantiation should succeed. Only
   // when they run, they fail because XTimesTwo is bad.
-  TF_CHECK_OK(lib_->Instantiate("XTimesFour", {{"T", DT_FLOAT}}, &handle));
-  TF_CHECK_OK(lib_->Instantiate("XTimes16", {{"T", DT_FLOAT}}, &handle));
+  TF_CHECK_OK(
+      lib_->Instantiate("XTimesFour", Attrs({{"T", DT_FLOAT}}), &handle));
+  TF_CHECK_OK(lib_->Instantiate("XTimes16", Attrs({{"T", DT_FLOAT}}), &handle));
 
   auto x = test::AsTensor<float>({1, 2, 3, 4});
   Tensor y;
@@ -928,8 +944,7 @@ bool DoNothing(Graph* g) { return false; }
 GraphDef Optimize(const std::function<bool(Graph* g)>& pass,
                   const FunctionDef& fdef) {
   InstantiationResult result;
-  InstantiateAttrValueMap empty;
-  TF_CHECK_OK(InstantiateFunction(fdef, empty, GetOpSig, &result));
+  TF_CHECK_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   std::unique_ptr<Graph> g(new Graph(OpRegistry::Global()));
   GraphConstructorOptions opts;
   opts.allow_internal_ops = true;
@@ -1248,4 +1263,5 @@ TEST(OptimizationTest, RemoveListArrayConverter_WithContolDeps) {
   TF_EXPECT_GRAPH_EQ(expected, Optimize(remove_listarray_and_identity, func));
 }
 
+}  // end namespace
 }  // end namespace tensorflow
diff --git a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
index 72bc37d435..4e14e6fe1a 100644
--- a/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
+++ b/tensorflow/core/common_runtime/kernel_benchmark_testlib.cc
@@ -103,13 +103,13 @@ void Benchmark::Run(int iters) { RunWithArgs({}, {}, iters); }
 
 string GetRendezvousKey(const Node* node) {
   string send_device;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "send_device", &send_device));
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "send_device", &send_device));
   string recv_device;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "recv_device", &recv_device));
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "recv_device", &recv_device));
   string tensor_name;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "tensor_name", &tensor_name));
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "tensor_name", &tensor_name));
   uint64 send_device_incarnation;
-  TF_CHECK_OK(GetNodeAttr(node->def(), "send_device_incarnation",
+  TF_CHECK_OK(GetNodeAttr(node->attrs(), "send_device_incarnation",
                           reinterpret_cast<int64*>(&send_device_incarnation)));
   return Rendezvous::CreateKey(send_device, send_device_incarnation,
                                recv_device, tensor_name, FrameAndIter(0, 0));
diff --git a/tensorflow/core/common_runtime/parallel_concat_optimizer.cc b/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
index ffbfbc74f1..bbd38a2e07 100644
--- a/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
+++ b/tensorflow/core/common_runtime/parallel_concat_optimizer.cc
@@ -49,11 +49,11 @@ class ParallelConcatRemovePass : public GraphOptimizationPass {
       }
     }
     for (Node* n : matches) {
-      AttrSlice n_attrs(n->def());
+      AttrSlice n_attrs = n->attrs();
       auto base_make_node = [n, g, &n_attrs](const string& op,
                                              const string& name) {
         NodeBuilder node_builder(name, op);
-        node_builder.Device(n->def().device());
+        node_builder.Device(n->requested_device());
         string colo;
         if (GetNodeAttr(n_attrs, "_class", &colo).ok()) {
           node_builder.Attr("_class", colo);
diff --git a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
index c179e94c36..b40924ef3a 100644
--- a/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
+++ b/tensorflow/core/common_runtime/resource_variable_read_optimizer.cc
@@ -55,7 +55,7 @@ class ResourceVariableReadPass : public GraphOptimizationPass {
     }
     for (Node* read : matches) {
       DataType dtype;
-      TF_RETURN_IF_ERROR(GetNodeAttr(AttrSlice(read->def()), "dtype", &dtype));
+      TF_RETURN_IF_ERROR(GetNodeAttr(read->attrs(), "dtype", &dtype));
       std::vector<Node*> in_control_edges;
       std::vector<std::pair<Node*, int>> in_edges;
       for (const Edge* edge : read->in_edges()) {
diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc
index 8808d52d3e..ae225e8b35 100644
--- a/tensorflow/core/common_runtime/simple_placer.cc
+++ b/tensorflow/core/common_runtime/simple_placer.cc
@@ -76,7 +76,7 @@ void ColocationGroups(const Node& node,
   std::vector<string> class_specs;
   // TODO(vrv): We should consider adding a GetNodeAttr that returns a
   // StringPiece, to avoid a copy.
-  if (!GetNodeAttrSimple(node.def(), kColocationAttrNameStringPiece,
+  if (!GetNodeAttrSimple(node.attrs(), kColocationAttrNameStringPiece,
                          &class_specs)) {
     // No attribute value is equivalent to the empty colocation_group.
     *colocation_groups = {
@@ -329,7 +329,7 @@ class ColocationGraph {
         AddDebugInfo(node_root, &debug_info);
 
         DeviceNameUtils::ParsedName specified_device_name;
-        if (DeviceNameUtils::ParseFullName(node->def().device(),
+        if (DeviceNameUtils::ParseFullName(node->requested_device(),
                                            &specified_device_name) &&
             specified_device_name == members_[node_root].device_name) {
           // The specified device and merged set device match, and
@@ -348,27 +348,27 @@ class ColocationGraph {
             std::sort(device_names.begin(), device_names.end());
 
             return errors::InvalidArgument(
-                "Operation was explicitly assigned to ", node->def().device(),
-                " but available devices are [ ",
+                "Operation was explicitly assigned to ",
+                node->requested_device(), " but available devices are [ ",
                 str_util::Join(device_names, ", "), " ]. Make sure ",
                 "the device specification refers to a valid device.");
           } else if (specified_device_name.has_type) {
             return errors::InvalidArgument(
                 "Could not satisfy explicit device specification '",
-                node->def().device(), "' because no supported kernel for ",
+                node->requested_device(), "' because no supported kernel for ",
                 specified_device_name.type, " devices is available.",
                 debug_info);
           } else {
             return errors::InvalidArgument(
                 "Could not satisfy explicit device specification '",
-                node->def().device(), debug_info);
+                node->requested_device(), debug_info);
           }
         } else {
           // The specified device may be a valid device but the
           // merged set device is different, so print both.
           return errors::InvalidArgument(
               "Could not satisfy explicit device specification '",
-              node->def().device(),
+              node->requested_device(),
               "' because the node was colocated with a group of nodes that "
               "required incompatible device '",
               DeviceNameUtils::ParsedNameToString(
@@ -513,7 +513,7 @@ class ColocationGraph {
       return errors::Internal("Assigned device '", node.assigned_device_name(),
                               "' does not have registered OpKernel support "
                               "for ",
-                              node.def().op());
+                              node.type_string());
     } else {
       // This node has not yet been assigned to a device, so we
       // calculate any constraints due to the set of registered
@@ -527,25 +527,25 @@ class ColocationGraph {
           registered_device_types.insert(d->device_type());
         }
         return errors::InvalidArgument(
-            "No OpKernel was registered to support Op '", node.def().op(),
+            "No OpKernel was registered to support Op '", node.type_string(),
             "' with these attrs.  Registered devices: [",
             str_util::Join(registered_device_types, ","),
             "], Registered kernels:\n",
-            KernelsRegisteredForOp(node.def().op()));
+            KernelsRegisteredForOp(node.type_string()));
       }
 
       // If the NodeDef contains a device, then we interpret it as a
       // (partial) device specification.
-      if (!node.def().device().empty()) {
+      if (!node.requested_device().empty()) {
         // The user has specified a device in the NodeDef, try to find a
         // valid device matching their specification in the set of
         // devices.
         // NOTE: The full name may specify a device that is not in
         // n.supported_device_types(), but we check that in AssignDevice().
-        if (!DeviceNameUtils::ParseFullName(node.def().device(),
+        if (!DeviceNameUtils::ParseFullName(node.requested_device(),
                                             &member->device_name)) {
           return errors::InvalidArgument("Malformed device specification '",
-                                         node.def().device(), "'");
+                                         node.requested_device(), "'");
         }
       }
     }
@@ -644,7 +644,7 @@ Status SimplePlacer::Run() {
       continue;
     }
     status = colocation_graph.AddNode(*node);
-    if (!status.ok()) return AttachDef(status, node->def());
+    if (!status.ok()) return AttachDef(status, *node);
   }
 
   // 2. Enumerate the constraint edges, and use them to update the disjoint
@@ -707,7 +707,7 @@ Status SimplePlacer::Run() {
                                "be on the same device), but the two nodes "
                                "were assigned two different devices: ",
                                status.error_message()),
-                           node->def());
+                           *node);
         }
       }
     }
@@ -749,7 +749,7 @@ Status SimplePlacer::Run() {
       return AttachDef(
           errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
-          node->def());
+          *node);
     }
 
     // Returns the first device in sorted devices list so we will always
@@ -791,7 +791,7 @@ Status SimplePlacer::Run() {
       return AttachDef(
           errors::InvalidArgument("Cannot assign a device for operation '",
                                   node->name(), "': ", status.error_message()),
-          node->def());
+          *node);
     }
 
     string assigned_device = devices[0]->name();
diff --git a/tensorflow/core/debug/debug_graph_utils.cc b/tensorflow/core/debug/debug_graph_utils.cc
index a222dc75d7..f8f3d2ae50 100644
--- a/tensorflow/core/debug/debug_graph_utils.cc
+++ b/tensorflow/core/debug/debug_graph_utils.cc
@@ -223,19 +223,16 @@ Status DebugNodeInserter::InsertNodes(
 void DebugNodeInserter::DeparallelizeWhileLoops(Graph* graph, Device* device) {
   for (Node* node : graph->nodes()) {
     if (node->IsEnter()) {
-      for (const auto& attr : node->def().attr()) {
-        if (attr.first == "parallel_iterations") {
-          if (attr.second.i() > 1) {
-            LOG(INFO) << "For debugging, tfdbg is changing the "
-                      << "parallel_iterations attribute of the Enter/RefEnter "
-                      << "node \"" << node->name() << "\" on device \""
-                      << device->name() << "\" from " << attr.second.i()
-                      << " to 1. (This does not affect subsequent non-debug "
-                      << "runs.)";
-            node->AddAttr<int64>("parallel_iterations", 1);
-          }
-          break;
-        }
+      const AttrValue* parallel_iterations =
+          node->attrs().Find("parallel_iterations");
+      if (parallel_iterations && parallel_iterations->i() > 1) {
+        LOG(INFO) << "For debugging, tfdbg is changing the "
+                  << "parallel_iterations attribute of the Enter/RefEnter "
+                  << "node \"" << node->name() << "\" on device \""
+                  << device->name() << "\" from " << parallel_iterations->i()
+                  << " to 1. (This does not affect subsequent non-debug "
+                  << "runs.)";
+        node->AddAttr<int64>("parallel_iterations", 1);
       }
     }
   }
diff --git a/tensorflow/core/distributed_runtime/master_session.cc b/tensorflow/core/distributed_runtime/master_session.cc
index 73758ade03..dddff4dce4 100644
--- a/tensorflow/core/distributed_runtime/master_session.cc
+++ b/tensorflow/core/distributed_runtime/master_session.cc
@@ -188,7 +188,7 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
                       const RunState* run_state,
                       SimpleGraphExecutionState* execution_state);
 
-  string DetailText(const NodeDef& def, const NodeExecStats& ns) {
+  string DetailText(const Node& node, const NodeExecStats& ns) {
     int64 tot = 0;
     for (auto& no : ns.output()) {
       tot += no.tensor_description().allocation_description().requested_bytes();
@@ -197,12 +197,8 @@ class MasterSession::ReffedClientGraph : public core::RefCounted {
     if (tot >= 0.1 * 1048576.0) {
       bytes = strings::Printf("[%.1fMB] ", tot / 1048576.0);
     }
-    return strings::StrCat(
-        bytes, def.name(), " = ", def.op(), "(",
-        str_util::Join(
-            std::vector<StringPiece>(def.input().begin(), def.input().end()),
-            ", "),
-        ")");
+    return strings::StrCat(bytes, node.name(), " = ", node.type_string(), "(",
+                           str_util::Join(node.requested_inputs(), ", "), ")");
   }
 
  private:
@@ -790,7 +786,7 @@ void MasterSession::ReffedClientGraph::ProcessDeviceStats(
       if (!ns.timeline_label().empty()) {
         details = ns.timeline_label();
       } else if (found_node_in_graph) {
-        details = DetailText(node->def(), ns);
+        details = DetailText(*node, ns);
       } else {
         // Leave details string empty
       }
diff --git a/tensorflow/core/framework/function.cc b/tensorflow/core/framework/function.cc
index f46bb6e2ed..186095201d 100644
--- a/tensorflow/core/framework/function.cc
+++ b/tensorflow/core/framework/function.cc
@@ -22,6 +22,7 @@ limitations under the License.
 #include "tensorflow/core/framework/function.pb_text.h"
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/inlined_vector.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
@@ -44,12 +45,11 @@ namespace {
 // Otherwise (arg_def is a simple type T), *is_type_list is set to
 // false, and *dtypes is set to a single element vector, whose only
 // element is T.
-Status ArgNumType(const InstantiateAttrValueMap& attrs,
-                  const OpDef::ArgDef& arg_def, bool* is_type_list,
-                  DataTypeVector* dtypes) {
+Status ArgNumType(AttrSlice attrs, const OpDef::ArgDef& arg_def,
+                  bool* is_type_list, DataTypeVector* dtypes) {
   dtypes->clear();
   if (!arg_def.type_list_attr().empty()) {
-    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.type_list_attr());
+    const AttrValue* v = attrs.Find(arg_def.type_list_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ",
                               arg_def.type_list_attr());
@@ -64,7 +64,7 @@ Status ArgNumType(const InstantiateAttrValueMap& attrs,
   *is_type_list = false;
   int num = 1;
   if (!arg_def.number_attr().empty()) {
-    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.number_attr());
+    const AttrValue* v = attrs.Find(arg_def.number_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ", arg_def.type_attr());
     }
@@ -77,7 +77,7 @@ Status ArgNumType(const InstantiateAttrValueMap& attrs,
   } else if (arg_def.type_attr().empty()) {
     dtype = DT_INVALID;
   } else {
-    const AttrValue* v = gtl::FindOrNull(attrs, arg_def.type_attr());
+    const AttrValue* v = attrs.Find(arg_def.type_attr());
     if (v == nullptr) {
       return errors::NotFound("type attr not found: ", arg_def.type_attr());
     }
@@ -92,18 +92,17 @@ void AddAttr(const string& name, const T& val, NodeDef* ndef) {
   SetAttrValue(val, &((*ndef->mutable_attr())[name]));
 }
 
-Status ValidateSignatureWithAttrs(const OpDef& sig,
-                                  const InstantiateAttrValueMap& attr_values) {
+Status ValidateSignatureWithAttrs(const OpDef& sig, AttrSlice attr_values) {
   // attr_values should specify all attrs defined in fdef.
   for (const auto& a : sig.attr()) {
-    auto const iter = attr_values.find(a.name());
-    if (iter == attr_values.end()) {
+    const AttrValue* v = attr_values.Find(a.name());
+    if (!v) {
       return errors::NotFound("Attr ", a.name(), " is not found from ",
                               SummarizeOpDef(sig));
     }
-    Status status = AttrValueHasType(iter->second, a.type());
+    Status status = AttrValueHasType(*v, a.type());
     if (!status.ok()) {
-      errors::AppendToMessage(&status, "for attr '", iter->first, "'");
+      errors::AppendToMessage(&status, "for attr '", a.name(), "'");
       return status;
     }
   }
@@ -146,7 +145,7 @@ class FunctionInstantiationHelper {
 
   // Builds index for nodes that can be used as node's input arguments.
   Status BuildInputArgIndex(const OpDef::ArgDef& arg_def,
-                            const InstantiateAttrValueMap& attr_values) {
+                            AttrSlice attr_values) {
     bool is_type_list;
     DataTypeVector dtypes;
     TF_RETURN_IF_ERROR(
@@ -175,8 +174,7 @@ class FunctionInstantiationHelper {
     return Status::OK();
   }
 
-  Status BuildNodeOutputIndex(const NodeDef& node,
-                              const InstantiateAttrValueMap& attrs,
+  Status BuildNodeOutputIndex(const NodeDef& node, AttrSlice attrs,
                               const int arg_index) {
     const OpDef* node_sig = nullptr;
     TF_RETURN_IF_ERROR(get_function_(node.op(), &node_sig));
@@ -206,8 +204,7 @@ class FunctionInstantiationHelper {
     return Status::OK();
   }
 
-  Status InstantiateNode(const NodeDef& fnode,
-                         const InstantiateAttrValueMap& attrs) {
+  Status InstantiateNode(const NodeDef& fnode, AttrSlice attrs) {
     const OpDef* fnode_sig = nullptr;
     TF_CHECK_OK(get_function_(fnode.op(), &fnode_sig));
     NodeDef* gnode = AddNode(fnode.name());
@@ -295,7 +292,7 @@ class FunctionInstantiationHelper {
   }
 
   Status AddReturnNode(
-      const OpDef::ArgDef& ret_def, const InstantiateAttrValueMap& attrs,
+      const OpDef::ArgDef& ret_def, AttrSlice attrs,
       const ::tensorflow::protobuf::Map<string, string>& ret_map,
       int* ret_index) {
     auto ret_iter = ret_map.find(ret_def.name());
@@ -604,7 +601,7 @@ string Print(const GraphDef& gdef) {
 
 Status AddDefaultAttrs(const string& op,
                        const GetFunctionSignature& get_function,
-                       InstantiateAttrValueMap* attrs) {
+                       AttrValueMap* attrs) {
   const OpDef* op_def = nullptr;
   TF_RETURN_IF_ERROR(get_function(op, &op_def));
   AttrSlice attr_slice(attrs);
@@ -620,8 +617,7 @@ Status AddDefaultAttrs(const string& op,
 
 }  // end namespace
 
-Status InstantiateFunction(const FunctionDef& fdef,
-                           const InstantiateAttrValueMap& attr_values,
+Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
                            GetFunctionSignature get_function,
                            InstantiationResult* result) {
   VLOG(3) << "Instantiation Function: " << Print(fdef);
@@ -639,19 +635,17 @@ Status InstantiateFunction(const FunctionDef& fdef,
     }
   }
 
-  auto substitute = [&attr_values](const string& name, AttrValue* val) {
-    auto iter = attr_values.find(name);
-    if (iter == attr_values.end()) {
-      return false;
-    } else {
-      *val = iter->second;
+  auto substitute = [attr_values](StringPiece name, AttrValue* val) {
+    if (const AttrValue* v = attr_values.Find(name)) {
+      *val = *v;
       return true;
     }
+    return false;
   };
 
   // Makes a copy of all attrs in fdef and substitutes placeholders.
   // After this step, every attr is bound to a concrete value.
-  std::vector<InstantiateAttrValueMap> node_attrs;
+  std::vector<AttrValueMap> node_attrs;
   node_attrs.resize(fdef.node_def_size());
   for (int i = 0; i < fdef.node_def_size(); ++i) {
     for (auto attr : fdef.node_def(i).attr()) {
@@ -668,7 +662,7 @@ Status InstantiateFunction(const FunctionDef& fdef,
   }
 
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = helper.BuildNodeOutputIndex(fdef.node_def(i), node_attrs[i],
+    s = helper.BuildNodeOutputIndex(fdef.node_def(i), AttrSlice(&node_attrs[i]),
                                     result->gdef.node_size() + i);
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
@@ -677,7 +671,7 @@ Status InstantiateFunction(const FunctionDef& fdef,
   }
   // Emits one gdef.node for each fdef.node_def.
   for (int i = 0; i < fdef.node_def_size(); ++i) {
-    s = helper.InstantiateNode(fdef.node_def(i), node_attrs[i]);
+    s = helper.InstantiateNode(fdef.node_def(i), AttrSlice(&node_attrs[i]));
     if (!s.ok()) {
       errors::AppendToMessage(&s, "In ", SummarizeNodeDef(fdef.node_def(i)));
       return s;
@@ -748,8 +742,7 @@ bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2) {
   return true;
 }
 
-string Canonicalize(const string& funcname,
-                    const InstantiateAttrValueMap& attrs) {
+string Canonicalize(const string& funcname, AttrSlice attrs) {
   std::vector<string> entries;
   entries.reserve(attrs.size());
   for (auto p : attrs) {
@@ -953,8 +946,7 @@ const FunctionDef* FunctionLibraryDefinition::GetAttrImpl(
   // If ndef is SymbolicGradient[f=Foo], we use Foo's gradient or
   // Foo's attributes.
   const NameAttrList* forward_func_attrs;
-  if (!GetNodeAttr(AttrSlice(&ndef.attr()), kFuncAttr, &forward_func_attrs)
-           .ok()) {
+  if (!GetNodeAttr(ndef, kFuncAttr, &forward_func_attrs).ok()) {
     return nullptr;
   }
   const string& func_name = forward_func_attrs->name();
@@ -981,34 +973,30 @@ FunctionDefLibrary FunctionLibraryDefinition::ToProto() const {
   return lib;
 }
 
-Status InstantiateFunction(const FunctionDef& fdef,
-                           InstantiateAttrValueSlice attr_values,
-                           GetFunctionSignature get_function,
-                           InstantiationResult* result) {
-  InstantiateAttrValueMap m;
-  for (const auto& aval : attr_values) {
-    m.insert({aval.first, aval.second.proto});
+template <typename T>
+Status FunctionLibraryDefinition::GetAttr(const NodeDef& ndef,
+                                          const string& attr, T* value) const {
+  const FunctionDef* fdef = GetAttrImpl(ndef);
+  if (fdef && GetNodeAttr(AttrSlice(&fdef->attr()), attr, value).ok()) {
+    return Status::OK();
   }
-  return InstantiateFunction(fdef, m, std::move(get_function), result);
+  return errors::InvalidArgument("Attr ", attr, " is not defined.");
 }
 
-string Canonicalize(const string& funcname, InstantiateAttrValueSlice attrs) {
-  InstantiateAttrValueMap m;
-  for (const auto& aval : attrs) {
-    m.insert({aval.first, aval.second.proto});
-  }
-  return Canonicalize(funcname, m);
+template <typename T>
+Status FunctionLibraryDefinition::GetAttr(const Node& node, const string& attr,
+                                          T* value) const {
+  return GetAttr(node.def(), attr, value);
 }
 
-Status FunctionLibraryRuntime::Instantiate(const string& function_name,
-                                           InstantiateAttrValueSlice attrs,
-                                           Handle* handle) {
-  InstantiateAttrValueMap m;
-  for (const auto& aval : attrs) {
-    m.insert({aval.first, aval.second.proto});
-  }
-  return Instantiate(function_name, m, handle);
-}
+#define GET_ATTR(T)                                                            \
+  template Status FunctionLibraryDefinition::GetAttr(const Node&,              \
+                                                     const string&, T*) const; \
+  template Status FunctionLibraryDefinition::GetAttr(const NodeDef&,           \
+                                                     const string&, T*) const;
+GET_ATTR(string)
+GET_ATTR(bool)
+#undef GET_ATTR
 
 void FunctionDefHelper::AttrValueWrapper::InitFromString(StringPiece val) {
   if (val.size() >= 2 && val[0] == '$') {
diff --git a/tensorflow/core/framework/function.h b/tensorflow/core/framework/function.h
index 210e5b949a..188c3855c6 100644
--- a/tensorflow/core/framework/function.h
+++ b/tensorflow/core/framework/function.h
@@ -36,6 +36,7 @@ class CancellationManager;
 class OpKernel;
 class ResourceMgr;
 class ScopedStepContainer;
+class Node;
 
 // FunctionDefHelper::Create is a convenient helper to construct a
 // FunctionDef proto.
@@ -190,11 +191,6 @@ inline FunctionDefHelper::AttrValueWrapper::AttrValueWrapper(StringPiece val) {
 // InstantiateFunction calls "get_function" to find signatures of other
 // functions and primitive ops.
 
-// Placeholders in "fdef" is substituted based on "attr_values" here.
-typedef ::tensorflow::protobuf::Map<string, AttrValue> InstantiateAttrValueMap;
-typedef gtl::ArraySlice<std::pair<string, FunctionDefHelper::AttrValueWrapper>>
-    InstantiateAttrValueSlice;
-
 // GetFunctionSignature(func name, opdef) returns OK if the func name is found
 // and opdef is filled with a pointer to the corresponding signature
 // (a OpDef proto). Otherwise, returns an error.
@@ -206,12 +202,7 @@ struct InstantiationResult {
   DataTypeVector ret_types;
   GraphDef gdef;
 };
-Status InstantiateFunction(const FunctionDef& fdef,
-                           const InstantiateAttrValueMap& attr_values,
-                           GetFunctionSignature get_function,
-                           InstantiationResult* result);
-Status InstantiateFunction(const FunctionDef& fdef,
-                           InstantiateAttrValueSlice attr_values,
+Status InstantiateFunction(const FunctionDef& fdef, AttrSlice attr_values,
                            GetFunctionSignature get_function,
                            InstantiationResult* result);
 
@@ -241,9 +232,7 @@ bool FunctionDefsEqual(const FunctionDef& f1, const FunctionDef& f2);
 // space. But it may be change as the implementation
 // evolves. Therefore, it should not be persisted or compared across
 // address spaces.
-string Canonicalize(const string& funcname,
-                    const InstantiateAttrValueMap& attrs);
-string Canonicalize(const string& funcname, InstantiateAttrValueSlice attrs);
+string Canonicalize(const string& funcname, AttrSlice attrs);
 
 // Represents a function call frame. I.e., the data structure used to
 // pass arguments to a function and retrieve its results.
@@ -330,9 +319,16 @@ class FunctionLibraryDefinition : public OpRegistryInterface {
   // Given a node def 'ndef', inspects attributes of the callee
   // function to derive the attribute 'value' for 'attr'. Returns OK
   // iff the attribute is given by the function's definition.
+  // TODO(irving): Remove; keep only the const Node& version.
   template <typename T>
   Status GetAttr(const NodeDef& ndef, const string& attr, T* value) const;
 
+  // Given a node, inspects attributes of the callee function to derive the
+  // attribute 'value' for 'attr'. Returns OK iff the attribute is given by the
+  // function's definition.
+  template <typename T>
+  Status GetAttr(const Node& node, const string& attr, T* value) const;
+
   // Returns a proto representation of the state of this function library.
   FunctionDefLibrary ToProto() const;
 
@@ -375,11 +371,8 @@ class FunctionLibraryRuntime {
   // Returns OK and fills in "handle" if the instantiation succeeds.
   // Otherwise returns an error and "handle" is undefined.
   typedef uint64 Handle;
-  virtual Status Instantiate(const string& function_name,
-                             const InstantiateAttrValueMap& attrs,
+  virtual Status Instantiate(const string& function_name, AttrSlice attrs,
                              Handle* handle) = 0;
-  Status Instantiate(const string& function_name,
-                     InstantiateAttrValueSlice attrs, Handle* handle);
 
   // Returns the function body for the instantiated function given its
   // handle 'h'. Returns nullptr if "h" is not found.
@@ -506,17 +499,15 @@ bool RegisterOp(const string& op, Creator func);
 Status GetOpGradientCreator(const string& op, Creator* creator);
 };
 
-// Implementation details.
-
-template <typename T>
-Status FunctionLibraryDefinition::GetAttr(const NodeDef& ndef,
-                                          const string& attr, T* value) const {
-  const FunctionDef* fdef = GetAttrImpl(ndef);
-  if (fdef && GetNodeAttr(AttrSlice(&fdef->attr()), attr, value).ok()) {
-    return Status::OK();
-  }
-  return errors::InvalidArgument("Attr ", attr, " is not defined.");
-}
+// Declare explicit instantiations of GetAttr
+#define GET_ATTR(T)                                          \
+  extern template Status FunctionLibraryDefinition::GetAttr( \
+      const Node&, const string&, T*) const;                 \
+  extern template Status FunctionLibraryDefinition::GetAttr( \
+      const NodeDef&, const string&, T*) const;
+GET_ATTR(string)
+GET_ATTR(bool)
+#undef GET_ATTR
 
 }  // end namespace tensorflow
 
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index 07462a575e..c83ecf4e5e 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -29,6 +29,24 @@ limitations under the License.
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
+namespace {
+
+// A helper class to make AttrSlice from initializer lists
+class Attrs {
+ public:
+  Attrs(const std::initializer_list<  // NOLINT(runtime/explicit)
+        std::pair<string, FunctionDefHelper::AttrValueWrapper>>
+            attrs) {
+    for (const auto& aval : attrs) {
+      map_.insert({aval.first, aval.second.proto});
+    }
+  }
+
+  operator AttrSlice() { return AttrSlice(&map_); }  // NOLINT(runtime/explicit)
+
+ private:
+  AttrValueMap map_;
+};
 
 typedef FunctionDefHelper FDH;
 
@@ -46,8 +64,6 @@ y: A scalar in type T.
 
 )doc");
 
-static InstantiateAttrValueMap kNoAttrs;
-
 TEST(TFunc, SquarePlusOne) {
   auto fdef = FDH::Create(
       // Name
@@ -81,7 +97,8 @@ SquarePlusOne[T:{float, double, int32, int64}](x:T) -> (y:T) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
+  TF_ASSERT_OK(
+      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> (y:float) {
   a = Square[T=float](x)
@@ -126,7 +143,8 @@ ControlDep(x:int32) -> (y:int32) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result));
+  TF_ASSERT_OK(
+      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result));
   const char* e2 = R"P(
 (x:int32) -> (y:int32) {
   a = Identity[T=int32](x)
@@ -171,8 +189,7 @@ BackCompat() -> (y:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(
-      InstantiateFunction(fdef, InstantiateAttrValueMap{}, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   // Should get T=float from Op's default.
   const char* e2 = R"P(
 () -> (a:float) {
@@ -209,7 +226,7 @@ NTimesT(x:float, y:float) -> (z:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float, y:float) -> (a:float) {
   a = AddN[N=2, T=float](x, y)
@@ -272,8 +289,8 @@ AddSquared[N:int, T:{float, double, int32, int64}](x:N*T) -> (y:T) {
 
   // Instantiate one with T=float
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, {{"N", 3}, {"T", DT_FLOAT}}, GetOpSig,
-                                   &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, Attrs({{"N", 3}, {"T", DT_FLOAT}}),
+                                   GetOpSig, &result));
   const char* e2 = R"P(
 (x_0:float, x_1:float, x_2:float) -> (y:float) {
   a = Map[N=3, T=float, U=float, func=Square[T=float]](x_0, x_1, x_2)
@@ -315,7 +332,7 @@ ControlDeps(x:float) -> () {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> () {
   a = One[T=float]() @ x
@@ -395,7 +412,7 @@ Test(i:float) -> (o:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (i:float) -> (o:float) {
   zero = Const[dtype=int32, value=Tensor<type: int32 shape: [] values: 0>]()
@@ -467,7 +484,7 @@ MySelect(x:float) -> (z:float) {
   EXPECT_EQ(DebugString(fdef), e);
 
   InstantiationResult result;
-  TF_ASSERT_OK(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result));
+  TF_ASSERT_OK(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result));
   const char* e2 = R"P(
 (x:float) -> (z:float) {
   y = Cond[Tin={float}, cond=MyCond, else_branch=MyElse, out_types={float}, then_branch=MyThen](x)
@@ -488,8 +505,9 @@ TEST(InstantiateErrors, Not_Sufficient_Attrs) {
   auto fdef =
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, {{"U", DT_FLOAT}}, GetOpSig, &result),
-           "Attr T is not found from ");
+  HasError(
+      InstantiateFunction(fdef, Attrs({{"U", DT_FLOAT}}), GetOpSig, &result),
+      "Attr T is not found from ");
 }
 
 #if 0  // TODO(josh11b): Enable this test once having an extra attr is an error.
@@ -497,7 +515,7 @@ TEST(InstantiateErrors, Too_Many_Attrs) {
   auto fdef =
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, {{"T", DT_INT32}, {"U", DT_FLOAT}},
+  HasError(InstantiateFunction(fdef, Attrs({{"T", DT_INT32}, {"U", DT_FLOAT}}),
                                GetOpSig, &result),
            "Attr U is not found in ");
 }
@@ -508,7 +526,7 @@ TEST(InstantiateErrors, AttrValue_Value_Placeholder) {
       FDH::Define("nop", {}, {}, {"T:{float, double, int32, int64}"}, {});
   InstantiationResult result;
   HasError(
-      InstantiateFunction(fdef, {{"T", "$bad"}}, GetOpSig, &result),
+      InstantiateFunction(fdef, Attrs({{"T", "$bad"}}), GetOpSig, &result),
       "AttrValue had value with unexpected type 'placeholder'\n\tfor attr 'T'");
 }
 
@@ -518,14 +536,15 @@ TEST(InstantiateErrors, Unbounded_Attr) {
                               {{"a"}, "One", {}, {{"T", "$unknown"}}, {"x"}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, {{"T", DT_FLOAT}}, GetOpSig, &result),
-           "Failed to bind all placeholders");
+  HasError(
+      InstantiateFunction(fdef, Attrs({{"T", DT_FLOAT}}), GetOpSig, &result),
+      "Failed to bind all placeholders");
 }
 
 TEST(InstantiateErrors, DupArgs) {
   auto fdef = FDH::Define("test", {"x:float", "x:float"}, {}, {}, {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Duplicated arg name");
 }
 
@@ -536,7 +555,7 @@ TEST(InstantiateErrors, Dup_Node_Names) {
                               {{"y"}, "One", {}, {{"T", DT_FLOAT}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Duplicated ret name");
 }
 
@@ -547,7 +566,7 @@ TEST(InstantiateErrors, Node_Arg_Notfound) {
                           },
                           {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input z is not found");
 }
 
@@ -557,7 +576,7 @@ TEST(InstantiateErrors, Node_Arg_TypeMismatch) {
                               {{"y"}, "Add", {"x", "x"}, {{"T", DT_INT32}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input x[0] expected type int32 != float, the type of x[0]");
 }
 
@@ -568,7 +587,7 @@ TEST(InstantiateErrors, Node_Arg_ControlMissing) {
                       {{"y"}, "Add", {"x", "x"}, {{"T", DT_FLOAT}}, {"z"}},
                   });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input[2] == '^z', is not found.");
 }
 
@@ -579,7 +598,7 @@ TEST(InstantiateErrors, FuncRet_Missing) {
                           },
                           {});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Return y missing");
 }
 
@@ -590,7 +609,7 @@ TEST(InstantiateErrors, FuncRet_NotFound) {
                           },
                           {{"y", "z"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Return y -> z is not found");
 }
 
@@ -601,7 +620,7 @@ TEST(InstantiateErrors, FuncRet_NameMismatch) {
                           },
                           {{"z", "x:y:0"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Return y missing");
 }
 
@@ -613,7 +632,7 @@ TEST(InstantiateErrors, FuncRet_NameMismatch) {
 //                           },
 //                           {{"y", "x:y:0"}, {"z", "x:y:0"}});
 //   InstantiationResult result;
-//   HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+//   HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
 //            "ret is not found");
 // }
 
@@ -623,7 +642,7 @@ TEST(InstantiateErrors, FuncRet_TypeMismatch) {
                               {{"y"}, "One", {}, {{"T", DT_DOUBLE}}},
                           });
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Invalid ret types y : float vs. double\n\tIn function output y");
 }
 
@@ -649,7 +668,7 @@ TEST(InstantiateErrors, TypeList_Missing_Retval_Attr) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "type attr not found: out_types");
 }
 
@@ -676,7 +695,7 @@ TEST(InstantiateErrors, TypeList_Num_Retval_Mismatch) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Invalid ret types");
 }
 
@@ -703,7 +722,7 @@ TEST(InstantiateErrors, TypeList_Missing_Arg) {
       },
       {{"y", "y:output"}});
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input unknown is not found");
 }
 
@@ -724,7 +743,7 @@ TEST(InstantiateErrors, TooManyInputs) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Expected input[2] == 'x' to be a control input.");
 }
 
@@ -745,7 +764,7 @@ TEST(InstantiateErrors, TooFewInputs) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Attempt to access beyond input size: 2 >= 2");
 }
 
@@ -773,7 +792,7 @@ TEST(InstantiateErrors, TooManyInputsFromArray1) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Expected input[1] == 'y' to be a control input.");
 }
 
@@ -801,7 +820,7 @@ TEST(InstantiateErrors, TooManyInputsFromArray2) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "Input a:output too long for inputs");
 }
 
@@ -822,7 +841,7 @@ TEST(InstantiateErrors, TypeMismatch) {
       {{"z", "a:sum:0"}});
 
   InstantiationResult result;
-  HasError(InstantiateFunction(fdef, kNoAttrs, GetOpSig, &result),
+  HasError(InstantiateFunction(fdef, AttrSlice(), GetOpSig, &result),
            "input inputs[1] expected type float != int32, the type of y[0]");
 }
 
@@ -874,17 +893,17 @@ TEST(FunctionCallFrame, Float_Float_Float) {
 }
 
 TEST(Canonicalize, Basic) {
-  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_FLOAT},
-                                    {"transpose_a", false},
-                                    {"transpose_b", false}}),
+  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_FLOAT},
+                                          {"transpose_a", false},
+                                          {"transpose_b", false}})),
             "MatMul[T=float,transpose_a=false,transpose_b=false]");
-  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_FLOAT},
-                                    {"transpose_b", false},
-                                    {"transpose_a", false}}),
+  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_FLOAT},
+                                          {"transpose_b", false},
+                                          {"transpose_a", false}})),
             "MatMul[T=float,transpose_a=false,transpose_b=false]");
-  EXPECT_EQ(Canonicalize("MatMul", {{"T", DT_DOUBLE},
-                                    {"transpose_b", true},
-                                    {"transpose_a", false}}),
+  EXPECT_EQ(Canonicalize("MatMul", Attrs({{"T", DT_DOUBLE},
+                                          {"transpose_b", true},
+                                          {"transpose_a", false}})),
             "MatMul[T=double,transpose_a=false,transpose_b=true]");
 }
 
@@ -1148,4 +1167,5 @@ TEST(FunctionDefsEqualTest, TestFunctionDefsEqual) {
   EXPECT_FALSE(FunctionDefsEqual(fdef1, fdef2));
 }
 
+}  // end namespace
 }  // end namespace tensorflow
diff --git a/tensorflow/core/framework/node_def_util.cc b/tensorflow/core/framework/node_def_util.cc
index 36c0842924..9b737e1f72 100644
--- a/tensorflow/core/framework/node_def_util.cc
+++ b/tensorflow/core/framework/node_def_util.cc
@@ -25,6 +25,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_def.pb_text.h"
 #include "tensorflow/core/framework/op_def_util.h"
 #include "tensorflow/core/framework/tensor.pb_text.h"
+#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
 #include "tensorflow/core/lib/strings/scanner.h"
@@ -36,18 +37,23 @@ namespace tensorflow {
 const char* const kColocationAttrName = "_class";
 const char* const kColocationGroupPrefix = "loc:@";
 
+AttrSlice::AttrSlice() : ndef_(nullptr) {
+  static const AttrValueMap* const kEmptyAttrValueMap = new AttrValueMap;
+  attrs_ = kEmptyAttrValueMap;
+}
+
 AttrSlice::AttrSlice(const NodeDef& node_def)
     : ndef_(&node_def), attrs_(&ndef_->attr()) {}
 
 AttrSlice::AttrSlice(const AttrValueMap* a) : ndef_(nullptr), attrs_(a) {}
 
-string SummarizeNodeDef(const NodeDef& node_def) {
-  string ret = strings::StrCat(node_def.name(), " = ", node_def.op(), "[");
+static string SummarizeAttrsHelper(AttrSlice attrs, StringPiece device) {
+  string ret;
 
   // We sort the attrs so the output is deterministic.
   std::vector<string> attr_names;
-  attr_names.reserve(node_def.attr().size());
-  for (const auto& attr : node_def.attr()) {
+  attr_names.reserve(attrs.size());
+  for (const auto& attr : attrs) {
     attr_names.push_back(attr.first);
   }
   std::sort(attr_names.begin(), attr_names.end());
@@ -55,20 +61,34 @@ string SummarizeNodeDef(const NodeDef& node_def) {
   for (const string& attr_name : attr_names) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
-    auto iter = node_def.attr().find(attr_name);
-    strings::StrAppend(&ret, attr_name, "=", SummarizeAttrValue(iter->second));
+    strings::StrAppend(&ret, attr_name, "=",
+                       SummarizeAttrValue(*attrs.Find(attr_name)));
   }
 
   // Consider the device to be a final attr with name "_device".
-  if (!node_def.device().empty()) {
+  if (!device.empty()) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
-    strings::StrAppend(&ret, "_device=\"", node_def.device(), "\"");
+    strings::StrAppend(&ret, "_device=\"", device, "\"");
   }
+  return ret;
+}
+
+string AttrSlice::SummarizeNode() const {
+  return ndef_ ? SummarizeNodeDef(*ndef_)
+               : strings::StrCat(
+                     "[", SummarizeAttrsHelper(*this, StringPiece()), "]");
+}
+
+string SummarizeNode(const Node& node) { return SummarizeNodeDef(node.def()); }
+
+string SummarizeNodeDef(const NodeDef& node_def) {
+  string ret = strings::StrCat(node_def.name(), " = ", node_def.op(), "[");
+  strings::StrAppend(&ret, SummarizeAttrsHelper(node_def, node_def.device()));
   strings::StrAppend(&ret, "](");
 
   // Output inputs, including control inputs, verbatim.
-  first = true;
+  bool first = true;
   for (const string& input : node_def.input()) {
     if (!first) strings::StrAppend(&ret, ", ");
     first = false;
@@ -109,12 +129,28 @@ Status AttrSlice::Find(StringPiece attr_name,
   // Skip AttachDef for internal attrs since it is a little bit
   // expensive and it is common for them to correctly not be included
   // in a NodeDef.
-  if (!StringPiece(attr_name).starts_with("_") && ndef_) {
+  if (!attr_name.starts_with("_") && ndef_ != nullptr) {
     s = AttachDef(s, *ndef_);
   }
   return s;
 }
 
+bool AttrSlice::EqualAttrs(AttrSlice other, Scratch* scratch) const {
+  if (size() != other.size()) return false;
+
+  for (const auto& attr : *other.attrs_) {
+    auto iter = attrs_->find(attr.first);
+    if (iter == attrs_->end()) return false;
+    // TODO(irving): Comparing AttrValues by proto is slightly buggy, since
+    // TensorProto is a nonunique representation of Tensor.  This bug will go
+    // away once AttrSlice switches over to NodeInfo.
+    iter->second.SerializeToString(&scratch->a);
+    attr.second.SerializeToString(&scratch->b);
+    if (scratch->a != scratch->b) return false;
+  }
+  return true;
+}
+
 // The ... is to allow the caller to inject some value validation code.  Use
 // just ; if no additional validation code is needed.
 #define DEFINE_GET_ATTR(TYPE, FIELD, ATTR_TYPE, APPEND_OP, CAST, ...)         \
@@ -341,14 +377,14 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
     if (StringPiece(input).starts_with("^")) {
       seen_control = true;
       if (input.find(':') != string::npos) {
-        return errors::InvalidArgument("Control input '", input,
-                                       "' must not have ':' in NodeDef: ",
-                                       SummarizeNodeDef(node_def));
+        return errors::InvalidArgument(
+            "Control input '", input,
+            "' must not have ':' in NodeDef: ", SummarizeNodeDef(node_def));
       }
     } else if (seen_control) {
-      return errors::InvalidArgument("Non-control input '", input,
-                                     "' after control input in NodeDef: ",
-                                     SummarizeNodeDef(node_def));
+      return errors::InvalidArgument(
+          "Non-control input '", input,
+          "' after control input in NodeDef: ", SummarizeNodeDef(node_def));
     } else {
       ++num_inputs;
     }
@@ -358,8 +394,8 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
   for (const auto& attr : op_def.attr()) {
     if (!gtl::InsertIfNotPresent(&op_attrs, attr.name(), &attr)) {
       return errors::InvalidArgument("OpDef has duplicate attr name '",
-                                     attr.name(), "': ",
-                                     SummarizeOpDef(op_def));
+                                     attr.name(),
+                                     "': ", SummarizeOpDef(op_def));
     }
   }
   for (const auto& attr : node_def.attr()) {
@@ -383,8 +419,9 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def) {
           "with your GraphDef-generating binary.).");
     }
     TF_RETURN_WITH_CONTEXT_IF_ERROR(
-        ValidateAttrValue(attr.second, *iter->second), "; NodeDef: ",
-        SummarizeNodeDef(node_def), "; ", SummarizeOpDef(op_def));
+        ValidateAttrValue(attr.second, *iter->second),
+        "; NodeDef: ", SummarizeNodeDef(node_def), "; ",
+        SummarizeOpDef(op_def));
     // Keep track of which attr names have (not) been found in the NodeDef.
     op_attrs.erase(iter);
   }
@@ -431,9 +468,9 @@ Status ComputeArgRange(const NodeDef& node_def, const OpDef::ArgDef& arg_def,
   } else if (!arg_def.type_attr().empty() || arg_def.type() != DT_INVALID) {
     *num = 1;
   } else {
-    return errors::InvalidArgument("Argument '", arg_def.name(),
-                                   "' incorrectly specified in op definition: ",
-                                   SummarizeOpDef(op_def));
+    return errors::InvalidArgument(
+        "Argument '", arg_def.name(),
+        "' incorrectly specified in op definition: ", SummarizeOpDef(op_def));
   }
   return Status::OK();
 }
@@ -465,6 +502,11 @@ Status NameRangesForNode(const NodeDef& node_def, const OpDef& op_def,
   return Status::OK();
 }
 
+Status NameRangesForNode(const Node& node, const OpDef& op_def,
+                         NameRangeMap* inputs, NameRangeMap* outputs) {
+  return NameRangesForNode(node.def(), op_def, inputs, outputs);
+}
+
 void AddDefaultsToNodeDef(const OpDef& op_def, NodeDef* node_def) {
   for (const auto& attr_def : op_def.attr()) {
     AttrSlice attrs(*node_def);
@@ -565,4 +607,8 @@ Status AttachDef(const Status& status, const NodeDef& node_def) {
   return ret;
 }
 
+Status AttachDef(const Status& status, const Node& node) {
+  return AttachDef(status, node.def());
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/framework/node_def_util.h b/tensorflow/core/framework/node_def_util.h
index 018e4d15f2..1438abdec6 100644
--- a/tensorflow/core/framework/node_def_util.h
+++ b/tensorflow/core/framework/node_def_util.h
@@ -29,6 +29,8 @@ limitations under the License.
 
 namespace tensorflow {
 
+class Node;
+
 // Name of the attribute used to encode node colocation constraints.
 //
 // Nodes can be co-located on the same device. Desire for explicit co-location
@@ -39,8 +41,9 @@ extern const char* const kColocationAttrName;
 // String prefix applied to the operation name for colocation constraints.
 extern const char* const kColocationGroupPrefix;
 
-// Produce a human-readable version of a NodeDef that is more concise
+// Produce a human-readable version of a Node or NodeDef that is more concise
 // than a text-format proto.
+string SummarizeNode(const Node& node);
 string SummarizeNodeDef(const NodeDef& node_def);
 
 typedef protobuf::Map<string, AttrValue> AttrValueMap;
@@ -78,8 +81,11 @@ class AttrSlice {
  public:
   AttrSlice(const NodeDef& node_def);  // NOLINT(runtime/explicit)
 
+  AttrSlice();  // Empty
   explicit AttrSlice(const AttrValueMap* a);
 
+  int size() const { return attrs_->size(); }
+
   // Returns the attr with attr_name if found.  Otherwise, returns
   // nullptr.
   const AttrValue* Find(StringPiece attr_name) const;
@@ -88,6 +94,33 @@ class AttrSlice {
   // NotFound status.
   Status Find(StringPiece attr_name, const AttrValue** attr_value) const;
 
+  // Helper class to avoid allocations in EqualAttrs.
+  // TODO(irving): Will go away once NodeInfo is used.
+  struct Scratch {
+    string a;
+    string b;
+  };
+
+  // Check if all attrs and attr values match.  Does not take defaults into
+  // account.
+  //
+  // TODO(irving): There is a bug in this routine inherited from its
+  // OptimizerCSE::EqualAttrs precedecessor.  The same tensor attr can be
+  // represented in more than one way as an AttrValue, since TensorProto is
+  // not 1-1.  This bug will go away once I replace everything with NodeInfo,
+  // which stores a Tensor object directly.  The Scratch object will also go
+  // away.
+  bool EqualAttrs(AttrSlice other, Scratch* scratch) const;
+
+  // If this AttrSlice has an attached NodeDef, summarize it.  This is for
+  // error messages only: we intentionally do not provide direct access to the
+  // NodeDef, since it is not always there.
+  string SummarizeNode() const;
+
+  // Iteration over all attrs
+  AttrValueMap::const_iterator begin() const { return attrs_->begin(); }
+  AttrValueMap::const_iterator end() const { return attrs_->end(); }
+
  private:
   const NodeDef* ndef_;
   const AttrValueMap* attrs_;
@@ -183,9 +216,12 @@ Status ValidateNodeDef(const NodeDef& node_def, const OpDef& op_def);
 // corresponding input/output index range.  For example,
 // input "foo" corresponds to input indices
 //   [ (*inputs)["foo"].first, (*inputs)["foo"].second ).
+// TODO(irving): Remove the NodeDef version; keep only the Node version.
 typedef std::unordered_map<string, std::pair<int, int>> NameRangeMap;
 Status NameRangesForNode(const NodeDef& node_def, const OpDef& op_def,
                          NameRangeMap* inputs, NameRangeMap* outputs);
+Status NameRangesForNode(const Node& node, const OpDef& op_def,
+                         NameRangeMap* inputs, NameRangeMap* outputs);
 
 // Adds default values to *node_def for unspecified attrs from op_def.
 void AddDefaultsToNodeDef(const OpDef& op_def, NodeDef* node_def);
@@ -206,6 +242,7 @@ Status ValidateExternalNodeDefSyntax(const NodeDef& node_def);
 // Returns "status" with kernel's NodeDef attached as additional text
 // in the error message.
 Status AttachDef(const Status& status, const NodeDef& node_def);
+Status AttachDef(const Status& status, const Node& node);
 
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
index 422ee80720..6c3917c686 100644
--- a/tensorflow/core/framework/op_kernel.cc
+++ b/tensorflow/core/framework/op_kernel.cc
@@ -27,6 +27,7 @@ limitations under the License.
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op_def_util.h"
 #include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/graph/graph.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/notification.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
@@ -842,13 +843,10 @@ bool InTypeList(DataType dt, const AttrValue& type_list) {
   return false;
 }
 
-// Returns whether the attrs in the NodeDef satisfy the constraints in
-// the kernel_def.  Returns an error if attrs in kernel_def are not
-// found, or have a mismatching type.
-Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
-                  bool* match) {
+// Returns whether the attrs satisfy the constraints in the kernel_def.  Returns
+// an error if attrs in kernel_def are not found, or have a mismatching type.
+Status AttrsMatch(AttrSlice attrs, const KernelDef& kernel_def, bool* match) {
   *match = false;
-  AttrSlice attrs(node_def);
   for (const auto& constraint : kernel_def.constraint()) {
     if (constraint.allowed_values().list().type_size() == 0) {
       return errors::Unimplemented(
@@ -872,7 +870,7 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
               "' that has value '", SummarizeAttrValue(*found),
               "' that does not have type 'type' or 'list(type)' in NodeDef "
               "'",
-              SummarizeNodeDef(node_def), "'");
+              attrs.SummarizeNode(), "'");
         }
 
         for (int t : found->list().type()) {
@@ -885,7 +883,7 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
     } else {
       return errors::InvalidArgument(
           "OpKernel '", kernel_def.op(), "' has constraint on attr '",
-          constraint.name(), "' not in NodeDef '", SummarizeNodeDef(node_def),
+          constraint.name(), "' not in NodeDef '", attrs.SummarizeNode(),
           "', KernelDef: '", ProtoShortDebugString(kernel_def), "'");
     }
   }
@@ -895,6 +893,7 @@ Status AttrsMatch(const NodeDef& node_def, const KernelDef& kernel_def,
 
 static const StringPiece kKernelAttr("_kernel");
 
+// TODO(irving): Replace with const Node& version below.
 Status FindKernelRegistration(const DeviceType& device_type,
                               const NodeDef& node_def,
                               const KernelRegistration** reg,
@@ -927,8 +926,16 @@ Status FindKernelRegistration(const DeviceType& device_type,
   return Status::OK();
 }
 
+Status FindKernelRegistration(const DeviceType& device_type, const Node& node,
+                              const KernelRegistration** reg,
+                              bool* was_attr_mismatch) {
+  return FindKernelRegistration(device_type, node.def(), reg,
+                                was_attr_mismatch);
+}
+
 }  // namespace
 
+// TODO(irving): Change const NodeDef& to const Node&
 Status FindKernelDef(const DeviceType& device_type, const NodeDef& node_def,
                      const KernelDef** def, string* kernel_class_name) {
   const KernelRegistration* reg = nullptr;
diff --git a/tensorflow/core/framework/shape_inference.h b/tensorflow/core/framework/shape_inference.h
index cebadcc5b4..7bb091622d 100644
--- a/tensorflow/core/framework/shape_inference.h
+++ b/tensorflow/core/framework/shape_inference.h
@@ -184,8 +184,8 @@ class InferenceContext {
     }
 #ifndef NDEBUG
     for (int i = 0; i < num_outputs(); ++i) {
-      DCHECK(output(i).IsSet()) << i << " for " << node_def().name()
-                                << " of type " << node_def().op();
+      DCHECK(output(i).IsSet())
+          << i << " for " << node_def_.name() << " of type " << node_def_.op();
     }
 #endif  // NDEBUG
     return s;
@@ -245,6 +245,8 @@ class InferenceContext {
   Status output(StringPiece output_name,
                 std::vector<ShapeHandle>* output) const;
 
+  AttrSlice attrs() const { return AttrSlice(node_def_); }
+
   // idx can be negative for an offset from end of dimensions.
   // idx must be in the range [-1 * s.rank, s.rank).
   DimensionHandle Dim(ShapeHandle s, int64 idx) {
@@ -394,11 +396,6 @@ class InferenceContext {
   // the value.
   Status MakeDimForScalarInput(int idx, DimensionHandle* out);
 
-  // Returns the NodeDef. The returned reference does not outlive the
-  // InferenceContext, and it should not be used after InferenceContext is
-  // destroyed.
-  const NodeDef& node_def() { return node_def_; }
-
   // Look up the attr for the NodeDef being evaluated with name attr_name and
   // set *value to its value.  If no attr with attr_name is found in def(), or
   // the attr does not have a matching type, a non-ok status will be returned.
diff --git a/tensorflow/core/graph/control_flow.cc b/tensorflow/core/graph/control_flow.cc
index 8409fb4cd0..db6683d1e7 100644
--- a/tensorflow/core/graph/control_flow.cc
+++ b/tensorflow/core/graph/control_flow.cc
@@ -88,7 +88,7 @@ Status BuildControlFlowInfo(Graph* g, std::vector<ControlFlowInfo>* info) {
           out_info->frame = out;
           out_info->parent_frame = frame;
           TF_RETURN_IF_ERROR(
-              GetNodeAttr(out->def(), "frame_name", &out_info->frame_name));
+              GetNodeAttr(out->attrs(), "frame_name", &out_info->frame_name));
           if (out_info->frame_name.empty()) {
             return errors::InvalidArgument("The Enter node ", out->name(),
                                            " must have a frame name.");
diff --git a/tensorflow/core/graph/graph.cc b/tensorflow/core/graph/graph.cc
index d765959ca0..9066de5668 100644
--- a/tensorflow/core/graph/graph.cc
+++ b/tensorflow/core/graph/graph.cc
@@ -78,7 +78,7 @@ string Node::DebugString() const {
   } else {
     strings::StrAppend(&ret, " op device:");
     strings::StrAppend(&ret, "{", assigned_device_name_, "}");
-    strings::StrAppend(&ret, " def:{", SummarizeNodeDef(def()), "}}");
+    strings::StrAppend(&ret, " def:{", SummarizeNode(*this), "}}");
   }
   return ret;
 }
@@ -474,7 +474,7 @@ void Graph::ToGraphDefSubRange(GraphDef* graph_def, int from_node_id) const {
     for (size_t i = 0; i < inputs.size(); ++i) {
       const Edge* edge = inputs[i];
       if (edge == nullptr) {
-        node_def->add_input(node->def().input(i));
+        node_def->add_input(node->requested_inputs()[i]);
       } else {
         const Node* src = edge->src();
         if (!src->IsOp()) continue;
diff --git a/tensorflow/core/graph/graph.h b/tensorflow/core/graph/graph.h
index ac22dfc324..8554cb2f4b 100644
--- a/tensorflow/core/graph/graph.h
+++ b/tensorflow/core/graph/graph.h
@@ -71,6 +71,7 @@ class Node {
   int cost_id() const { return cost_id_; }
   const string& name() const { return props_->node_def_.name(); }
   const string& type_string() const { return props_->node_def_.op(); }
+
   // def() provides the NodeDef the user supplied, but the specifics
   // of this Node may have changed due to placement, optimization, etc.
   // In particular:
@@ -80,6 +81,7 @@ class Node {
   // * def().device() is the "user's requested device" and may not match
   //   the actual assigned device, see assigned_device_name() below;
   // * def().attr() is authoritative.
+  // TODO(irving): Replace with NodeInfo.
   const NodeDef& def() const { return props_->node_def_; }
   const OpDef& op_def() const { return *props_->op_def_; }
 
@@ -92,6 +94,10 @@ class Node {
   DataType output_type(int32 o) const { return props_->output_types_[o]; }
   const DataTypeVector& output_types() const { return props_->output_types_; }
 
+  // The device requested by the user.  For the actual assigned device,
+  // use assigned_device_name() below.
+  const string& requested_device() const { return def().device(); }
+
   // This gives the device the runtime has assigned this node to.  If
   // you want the device the user requested, use def().device() instead.
   // TODO(josh11b): Validate that the assigned_device, if not empty:
@@ -103,6 +109,14 @@ class Node {
     assigned_device_name_ = device_name;
   }
 
+  // Read only access to attributes
+  AttrSlice attrs() const { return AttrSlice(def()); }
+
+  // Inputs requested by the NodeDef.  For the actual inputs, use in_edges.
+  const protobuf::RepeatedPtrField<string>& requested_inputs() const {
+    return def().input();
+  }
+
   // Get the neighboring nodes via edges either in or out of this node.
   gtl::iterator_range<NeighborIter> in_nodes() const;
   gtl::iterator_range<NeighborIter> out_nodes() const;
diff --git a/tensorflow/core/graph/graph_constructor.cc b/tensorflow/core/graph/graph_constructor.cc
index 9d4a0a52f7..70087b8fe1 100644
--- a/tensorflow/core/graph/graph_constructor.cc
+++ b/tensorflow/core/graph/graph_constructor.cc
@@ -424,7 +424,7 @@ Status GraphConstructor::ValidateShape(Node* node) {
   // For nodes with the _output_shapes atttribute, override the shape.
   std::vector<TensorShapeProto> shape_attrs;
   const char* kAttrName = "_output_shapes";
-  if (!GetNodeAttr(node->def(), kAttrName, &shape_attrs).ok()) {
+  if (!GetNodeAttr(node->attrs(), kAttrName, &shape_attrs).ok()) {
     // No _output_shapes attribute, the AddNode call above was sufficient.
     return Status::OK();
   }
@@ -458,7 +458,7 @@ Status GraphConstructor::ValidateShape(Node* node) {
       // functions that are not critical to correct execution but
       // would cause graphs to fail if imported after correcting.
       //
-      const string& op = node->def().op();
+      const string& op = node->type_string();
       const std::vector<string> whitelist = {
           // To be removed after 2017/03/08.
           "RandomShuffleQueue", "PaddingFIFOQueue", "FIFOQueue",
diff --git a/tensorflow/core/graph/graph_constructor_test.cc b/tensorflow/core/graph/graph_constructor_test.cc
index e3b7f322cb..6013b2ff51 100644
--- a/tensorflow/core/graph/graph_constructor_test.cc
+++ b/tensorflow/core/graph/graph_constructor_test.cc
@@ -146,7 +146,7 @@ class GraphConstructorTest : public ::testing::Test {
       return "";
     }
     std::vector<string> value;
-    Status s = GetNodeAttr(n->def(), kColocationAttrName, &value);
+    Status s = GetNodeAttr(n->attrs(), kColocationAttrName, &value);
     if (!s.ok()) {
       return "";
     }
@@ -997,7 +997,7 @@ TEST_F(GraphConstructorTest, ImportGraphDef_DefaultAttrs) {
   }
   ASSERT_TRUE(a != nullptr);
   int value = 0;
-  s = GetNodeAttr(a->def(), "default_int", &value);
+  s = GetNodeAttr(a->attrs(), "default_int", &value);
   ASSERT_EQ(Status::OK(), s) << s << " -- " << a->def().DebugString();
   EXPECT_EQ(31415, value);
 }
@@ -1201,9 +1201,9 @@ TEST_F(GraphConstructorTest, ImportGraphDef_InputMap) {
 
   // Check that t1's NodeDef is consistent with graph
   Node* t1 = FindNode("t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  ASSERT_EQ(t1->def().input(0), "input:1");
-  ASSERT_EQ(t1->def().input(1), "input:0");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  ASSERT_EQ(t1->requested_inputs()[0], "input:1");
+  ASSERT_EQ(t1->requested_inputs()[1], "input:0");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithPrefix) {
@@ -1254,19 +1254,19 @@ TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithPrefix) {
 
   // Check that NodeDefs are consistent with graph
   Node* t1 = FindNode("import/t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  EXPECT_EQ(t1->def().input(0), "input:0");
-  EXPECT_EQ(t1->def().input(1), "input:0");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  EXPECT_EQ(t1->requested_inputs()[0], "input:0");
+  EXPECT_EQ(t1->requested_inputs()[1], "input:0");
 
   Node* t2 = FindNode("import/t2");
-  ASSERT_EQ(t2->def().input_size(), 2);
-  EXPECT_EQ(t2->def().input(0), "import/t1:0");
-  EXPECT_EQ(t2->def().input(1), "import/t1:0");
+  ASSERT_EQ(t2->requested_inputs().size(), 2);
+  EXPECT_EQ(t2->requested_inputs()[0], "import/t1:0");
+  EXPECT_EQ(t2->requested_inputs()[1], "import/t1:0");
 
   Node* t3 = FindNode("import/t3");
-  ASSERT_EQ(t3->def().input_size(), 2);
-  EXPECT_EQ(t3->def().input(0), "import/unmapped_input:0");
-  EXPECT_EQ(t3->def().input(1), "import/unmapped_input:1");
+  ASSERT_EQ(t3->requested_inputs().size(), 2);
+  EXPECT_EQ(t3->requested_inputs()[0], "import/unmapped_input:0");
+  EXPECT_EQ(t3->requested_inputs()[1], "import/unmapped_input:1");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_InputMapWithControlEdges) {
@@ -1795,24 +1795,24 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ControlDeps) {
 
   // Test that node defs are consistent with graph
   Node* w1 = FindNode("import/W1");
-  ASSERT_EQ(w1->def().input_size(), 2);
-  EXPECT_EQ(w1->def().input(0), "^W1");
-  EXPECT_EQ(w1->def().input(1), "^W2");
+  ASSERT_EQ(w1->requested_inputs().size(), 2);
+  EXPECT_EQ(w1->requested_inputs()[0], "^W1");
+  EXPECT_EQ(w1->requested_inputs()[1], "^W2");
 
   Node* input = FindNode("import/input");
-  ASSERT_EQ(input->def().input_size(), 2);
-  EXPECT_EQ(input->def().input(0), "^W1");
-  EXPECT_EQ(input->def().input(1), "^W2");
+  ASSERT_EQ(input->requested_inputs().size(), 2);
+  EXPECT_EQ(input->requested_inputs()[0], "^W1");
+  EXPECT_EQ(input->requested_inputs()[1], "^W2");
 
   Node* input2 = FindNode("import/input2");
-  ASSERT_EQ(input2->def().input_size(), 2);
-  EXPECT_EQ(input2->def().input(0), "^W1");
-  EXPECT_EQ(input2->def().input(1), "^W2");
+  ASSERT_EQ(input2->requested_inputs().size(), 2);
+  EXPECT_EQ(input2->requested_inputs()[0], "^W1");
+  EXPECT_EQ(input2->requested_inputs()[1], "^W2");
 
   Node* t1 = FindNode("import/t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  EXPECT_EQ(t1->def().input(0), "import/input:0");
-  EXPECT_EQ(t1->def().input(1), "import/input:1");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  EXPECT_EQ(t1->requested_inputs()[0], "import/input:0");
+  EXPECT_EQ(t1->requested_inputs()[1], "import/input:1");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsWithCycle) {
@@ -1856,15 +1856,15 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsWithCycle) {
 
   // Test that node defs are consistent with graph
   Node* merge = FindNode("merge");
-  ASSERT_EQ(merge->def().input_size(), 3);
-  EXPECT_EQ(merge->def().input(0), "input:0");
-  EXPECT_EQ(merge->def().input(1), "t1:0");
-  EXPECT_EQ(merge->def().input(2), "^W1");
+  ASSERT_EQ(merge->requested_inputs().size(), 3);
+  EXPECT_EQ(merge->requested_inputs()[0], "input:0");
+  EXPECT_EQ(merge->requested_inputs()[1], "t1:0");
+  EXPECT_EQ(merge->requested_inputs()[2], "^W1");
 
   Node* t1 = FindNode("t1");
-  ASSERT_EQ(t1->def().input_size(), 2);
-  EXPECT_EQ(t1->def().input(0), "merge:0");
-  EXPECT_EQ(t1->def().input(1), "merge:0");
+  ASSERT_EQ(t1->requested_inputs().size(), 2);
+  EXPECT_EQ(t1->requested_inputs()[0], "merge:0");
+  EXPECT_EQ(t1->requested_inputs()[1], "merge:0");
 }
 
 TEST_F(GraphConstructorTest, ImportGraphDef_ControlDepsErrors) {
diff --git a/tensorflow/core/graph/graph_partition.cc b/tensorflow/core/graph/graph_partition.cc
index c7ad6a1e77..57a2f399e0 100644
--- a/tensorflow/core/graph/graph_partition.cc
+++ b/tensorflow/core/graph/graph_partition.cc
@@ -356,7 +356,7 @@ string ControlLoopName(const string& name) {
 }
 
 bool IsControlLoop(const Node* node) {
-  const string& name = node->def().name();
+  const string& name = node->name();
   return StringPiece(name).starts_with("_cloop");
 }
 
@@ -468,7 +468,7 @@ Status AddControlLoop(const PartitionOptions& opts, Graph* g, const Node* src,
   const string& device_name = edge->dst()->assigned_device_name();
   const string& frame_name = src_info.frame_name;
   int parallel_iterations;
-  status = GetNodeAttr(src_info.frame->def(), "parallel_iterations",
+  status = GetNodeAttr(src_info.frame->attrs(), "parallel_iterations",
                        &parallel_iterations);
   if (!status.ok()) return status;
 
@@ -903,11 +903,11 @@ Status Partition(const PartitionOptions& opts, Graph* g,
           send_start_time = opts.start_times[src->id()].value();
           recv_start_time = opts.start_times[dst->id()].value();
         } else {
-          status = GetNodeAttr(src->def(), "_start_time", &send_start_time);
+          status = GetNodeAttr(src->attrs(), "_start_time", &send_start_time);
           if (!status.ok()) {
             return status;
           }
-          status = GetNodeAttr(dst->def(), "_start_time", &recv_start_time);
+          status = GetNodeAttr(dst->attrs(), "_start_time", &recv_start_time);
           if (!status.ok()) {
             return status;
           }
diff --git a/tensorflow/core/graph/graph_test.cc b/tensorflow/core/graph/graph_test.cc
index 4afc878f76..89784c631f 100644
--- a/tensorflow/core/graph/graph_test.cc
+++ b/tensorflow/core/graph/graph_test.cc
@@ -318,21 +318,21 @@ TEST_F(GraphTest, AddAttr) {
   n1->AddAttr("_a", "new_attr");
 
   string attr;
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
 
   Node* n2 = graph_.CopyNode(n1);
 
   n1->AddAttr("_b", "new_attr_2");
 
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->def(), "_b", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n1->attrs(), "_b", &attr));
   EXPECT_EQ("new_attr_2", attr);
 
-  EXPECT_EQ(Status::OK(), GetNodeAttr(n2->def(), "_a", &attr));
+  EXPECT_EQ(Status::OK(), GetNodeAttr(n2->attrs(), "_a", &attr));
   EXPECT_EQ("new_attr", attr);
-  EXPECT_NE(Status::OK(), GetNodeAttr(n2->def(), "_b", &attr));
+  EXPECT_NE(Status::OK(), GetNodeAttr(n2->attrs(), "_b", &attr));
 }
 
 // Convert edge iteration results into a sorted string.
diff --git a/tensorflow/core/graph/optimizer_cse.cc b/tensorflow/core/graph/optimizer_cse.cc
index a679eac0e7..a22a9b3fa3 100644
--- a/tensorflow/core/graph/optimizer_cse.cc
+++ b/tensorflow/core/graph/optimizer_cse.cc
@@ -56,11 +56,9 @@ class OptimizerCSE {
   bool Optimize(const std::function<bool(const Node*)>& consider_fn);
 
  private:
-  struct Scratch;
-
   static size_t NodeHash(const Node* n);
-  static bool Equivalent(const Node* a, const Node* b, Scratch* s);
-  static bool EqualAttrs(const Node* a, const Node* b, Scratch* s);
+  static bool Equivalent(const Node* a, const Node* b,
+                         AttrSlice::Scratch* scratch);
 
   Graph* g_;
 };
@@ -110,7 +108,7 @@ size_t OptimizerCSE::NodeHash(const Node* n) {
   // Hash the attrs.  For example, this makes sure different constants
   // end up in different hash buckets.
   string tmp;
-  for (const auto& attr : n->def().attr()) {
+  for (const auto& attr : n->attrs()) {
     tmp = attr.first;
     attr.second.AppendToString(&tmp);
     // Add hashes of attrs, so the order of attrs doesn't matter.
@@ -122,28 +120,6 @@ size_t OptimizerCSE::NodeHash(const Node* n) {
   return h;
 }
 
-struct OptimizerCSE::Scratch {
-  // For EqualAttrs():
-  string a;
-  string b;
-};
-
-bool OptimizerCSE::EqualAttrs(const Node* a, const Node* b, Scratch* scratch) {
-  if (a->def().attr_size() != b->def().attr_size()) return false;
-
-  for (const auto& attr : b->def().attr()) {
-    auto iter = a->def().attr().find(attr.first);
-    if (iter == a->def().attr().end()) return false;
-    // Note: it should be safe to compare proto serializations of the attr
-    // values since at most one field should be set in each (indeed, it
-    // should be the same field).
-    iter->second.SerializeToString(&scratch->a);
-    attr.second.SerializeToString(&scratch->b);
-    if (scratch->a != scratch->b) return false;
-  }
-  return true;
-}
-
 static bool HasRefInput(const Node* n) {
   for (auto dt : n->input_types()) {
     if (IsRefType(dt)) return true;
@@ -151,7 +127,8 @@ static bool HasRefInput(const Node* n) {
   return false;
 }
 
-bool OptimizerCSE::Equivalent(const Node* a, const Node* b, Scratch* scratch) {
+bool OptimizerCSE::Equivalent(const Node* a, const Node* b,
+                              AttrSlice::Scratch* scratch) {
   // Different op names are different
   if (a->type_string() != b->type_string()) return false;
 
@@ -164,7 +141,7 @@ bool OptimizerCSE::Equivalent(const Node* a, const Node* b, Scratch* scratch) {
 
   // Compare attrs.  Note that equal attrs implies equal input and
   // output types.
-  if (!EqualAttrs(a, b, scratch)) return false;
+  if (!a->attrs().EqualAttrs(b->attrs(), scratch)) return false;
 
   // Compare input sources
   if (a->num_inputs() != b->num_inputs()) return false;
@@ -206,7 +183,7 @@ bool OptimizerCSE::Optimize(
   // Scratch space for Equivalent calls.  Allocated here and passed in to
   // Equivalent to avoid allocation inside the loop below.
   bool changed = false;
-  Scratch scratch;
+  AttrSlice::Scratch scratch;
   for (Node* n : order) {
     if (!n->IsOp()) continue;
 
diff --git a/tensorflow/core/graph/quantize_training.cc b/tensorflow/core/graph/quantize_training.cc
index e3ef5e2f0c..4a479d3258 100644
--- a/tensorflow/core/graph/quantize_training.cc
+++ b/tensorflow/core/graph/quantize_training.cc
@@ -192,9 +192,9 @@ Status ConnectVariablesToSaveOp(Graph* graph, Node* save_op,
   Tensor tensor_names;
   Tensor shape_and_slices;
   TF_RETURN_IF_ERROR(
-      GetNodeAttr(AttrSlice(tensor_names_op->def()), "value", &tensor_names));
-  TF_RETURN_IF_ERROR(GetNodeAttr(AttrSlice(shape_and_slices_op->def()), "value",
-                                 &shape_and_slices));
+      GetNodeAttr(tensor_names_op->attrs(), "value", &tensor_names));
+  TF_RETURN_IF_ERROR(
+      GetNodeAttr(shape_and_slices_op->attrs(), "value", &shape_and_slices));
 
   int tn_size = tensor_names.NumElements();
   int var_size = added_variables.size();
diff --git a/tensorflow/core/graph/quantize_training_test.cc b/tensorflow/core/graph/quantize_training_test.cc
index 9cbb928c11..d817d980de 100644
--- a/tensorflow/core/graph/quantize_training_test.cc
+++ b/tensorflow/core/graph/quantize_training_test.cc
@@ -112,17 +112,15 @@ TEST_F(QuantizeTrainingTest, SignedInput) {
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(identity->name(), "/QuantizeAndDequantizeV2"),
                &identity_q_node));
-  NodeDef identity_q = identity_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(identity_q.attr().find("signed_input")->second));
+            SummarizeAttrValue(*identity_q_node->attrs().Find("signed_input")));
   // Quantize_and_dequantize node for relu should have signed_input==false.
   Node* relu_q_node;
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu->name(), "/QuantizeAndDequantizeV2"),
                &relu_q_node));
-  NodeDef relu_q = relu_q_node->def();
   ASSERT_EQ("false",
-            SummarizeAttrValue(relu_q.attr().find("signed_input")->second));
+            SummarizeAttrValue(*relu_q_node->attrs().Find("signed_input")));
 }
 
 TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
@@ -165,17 +163,15 @@ TEST_F(QuantizeTrainingTest, RangeGivenTrue) {
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu6->name(), "/QuantizeAndDequantizeV2"),
                &relu6_q_node));
-  NodeDef identity_q = relu6_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(identity_q.attr().find("range_given")->second));
+            SummarizeAttrValue(*relu6_q_node->attrs().Find("range_given")));
   // Quantize_and_dequantize node for relu should have range_given==true.
   Node* relu_q_node;
   TF_ASSERT_OK(
       FindNode(g, strings::StrCat(relu->name(), "/QuantizeAndDequantizeV2"),
                &relu_q_node));
-  NodeDef relu_q = relu_q_node->def();
   ASSERT_EQ("true",
-            SummarizeAttrValue(relu_q.attr().find("range_given")->second));
+            SummarizeAttrValue(*relu_q_node->attrs().Find("range_given")));
 }
 
 TEST_F(QuantizeTrainingTest, WithBackwardNodes_QuantizeAndDequantize) {
diff --git a/tensorflow/core/graph/subgraph.cc b/tensorflow/core/graph/subgraph.cc
index 9849d9a159..e10b692889 100644
--- a/tensorflow/core/graph/subgraph.cc
+++ b/tensorflow/core/graph/subgraph.cc
@@ -106,7 +106,7 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
     // Copy the _output_shapes from the original node to the feed node,
     // if any.
     std::vector<PartialTensorShape> output_shapes;
-    if (GetNodeAttr(n->def(), "_output_shapes", &output_shapes).ok()) {
+    if (GetNodeAttr(n->attrs(), "_output_shapes", &output_shapes).ok()) {
       if (n->num_outputs() != output_shapes.size()) {
         return errors::InvalidArgument(
             "FeedInputs: ", t,
@@ -129,8 +129,8 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
       if (e->src_output() == id.second) {
         to_remove.emplace_back(e);
       } else if (e->src_output() == Graph::kControlSlot &&
-                 (n->def().op() == "Placeholder" ||
-                  n->def().op() == "PlaceholderV2")) {
+                 (n->type_string() == "Placeholder" ||
+                  n->type_string() == "PlaceholderV2")) {
         // When feeding a Placeholder node, any outgoing control edges
         // will be replaced with a control edge from the replacement
         // recv_node.
diff --git a/tensorflow/core/graph/subgraph_test.cc b/tensorflow/core/graph/subgraph_test.cc
index 3dc11b7a16..93dcfd5e33 100644
--- a/tensorflow/core/graph/subgraph_test.cc
+++ b/tensorflow/core/graph/subgraph_test.cc
@@ -81,7 +81,7 @@ class SubgraphTest : public ::testing::Test {
     for (const string& s : expected_nodes) {
       Node* n = FindNode(s);
       EXPECT_TRUE(n != nullptr) << s;
-      if (n->def().op() == "_Send" || n->def().op() == "_Recv") {
+      if (n->type_string() == "_Send" || n->type_string() == "_Recv") {
         EXPECT_EQ(device_info_.name(), n->assigned_device_name()) << s;
       }
     }
@@ -367,7 +367,7 @@ TEST_F(SubgraphTest, FedOutputsPreservesOutputShapes) {
   for (Node* node : graph()->nodes()) {
     if (node->name() == "_recv_input_1") {
       std::vector<PartialTensorShape> shapes;
-      TF_ASSERT_OK(GetNodeAttr(node->def(), "_output_shapes", &shapes));
+      TF_ASSERT_OK(GetNodeAttr(node->attrs(), "_output_shapes", &shapes));
       ASSERT_EQ(1, shapes.size());
       EXPECT_TRUE(PartialTensorShape({23}).IsIdenticalTo(shapes[0]));
       break;
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
index 035483ec17..b0e69d44ed 100644
--- a/tensorflow/core/grappler/costs/graph_properties.cc
+++ b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -151,8 +151,8 @@ Status GraphProperties::InferStatically() {
 
     if (!node->assigned_device_name().empty()) {
       device_names_[node->name()] = node->assigned_device_name();
-    } else if (!node->def().device().empty()) {
-      device_names_[node->name()] = node->def().device();
+    } else if (!node->requested_device().empty()) {
+      device_names_[node->name()] = node->requested_device();
     } else {
       device_names_[node->name()] = "not set";
     }
diff --git a/tensorflow/core/kernels/captured_function.cc b/tensorflow/core/kernels/captured_function.cc
index 1cb9e0c7be..4f231331bb 100644
--- a/tensorflow/core/kernels/captured_function.cc
+++ b/tensorflow/core/kernels/captured_function.cc
@@ -90,8 +90,8 @@ Status CapturedFunction::Create(
       flib_def.get(), {} /* TODO(mrry): OptimizerOptions? */));
 
   FunctionLibraryRuntime::Handle f_handle;
-  TF_RETURN_IF_ERROR(lib->Instantiate(func->name(),
-                                      func->attr(), &f_handle));
+  TF_RETURN_IF_ERROR(
+      lib->Instantiate(func->name(), AttrSlice(&func->attr()), &f_handle));
 
   out_function->reset(new CapturedFunction(
       std::move(device), std::move(flib_def), std::move(lib), f_handle,
diff --git a/tensorflow/core/kernels/function_ops.cc b/tensorflow/core/kernels/function_ops.cc
index ba408f3657..8c3137ece9 100644
--- a/tensorflow/core/kernels/function_ops.cc
+++ b/tensorflow/core/kernels/function_ops.cc
@@ -186,12 +186,12 @@ REGISTER_KERNEL_BUILDER(Name("_ArrayToList")
                         PassOn);
 
 #ifdef TENSORFLOW_USE_SYCL
-#define REGISTER_SYCL_KERNELS(type)                                      \
-  REGISTER_KERNEL_BUILDER(                                               \
-      Name("_ListToArray").Device(DEVICE_SYCL).TypeConstraint<type>("T"),\
-      PassOn);                                                           \
-  REGISTER_KERNEL_BUILDER(                                               \
-      Name("_ArrayToList").Device(DEVICE_SYCL).TypeConstraint<type>("T"),\
+#define REGISTER_SYCL_KERNELS(type)                                       \
+  REGISTER_KERNEL_BUILDER(                                                \
+      Name("_ListToArray").Device(DEVICE_SYCL).TypeConstraint<type>("T"), \
+      PassOn);                                                            \
+  REGISTER_KERNEL_BUILDER(                                                \
+      Name("_ArrayToList").Device(DEVICE_SYCL).TypeConstraint<type>("T"), \
       PassOn);
 
 REGISTER_SYCL_KERNELS(float);
@@ -211,7 +211,7 @@ REGISTER_KERNEL_BUILDER(Name("_ArrayToList")
                             .HostMemory("output")
                             .TypeConstraint<int32>("T"),
                         PassOn);
-#endif // TENSORFLOW_USE_SYCL
+#endif  // TENSORFLOW_USE_SYCL
 
 class SymbolicGradientOp : public AsyncOpKernel {
  public:
@@ -227,7 +227,7 @@ class SymbolicGradientOp : public AsyncOpKernel {
 
     FunctionLibraryRuntime::Handle handle;
     OP_REQUIRES_OK_ASYNC(
-        ctx, lib->Instantiate(kGradientOp, def().attr(), &handle), done);
+        ctx, lib->Instantiate(kGradientOp, AttrSlice(def()), &handle), done);
 
     FunctionLibraryRuntime::Options opts;
     opts.step_id = ctx->step_id();
diff --git a/tensorflow/core/kernels/hexagon/graph_transferer.cc b/tensorflow/core/kernels/hexagon/graph_transferer.cc
index 6f1616eff3..d927ef3efa 100644
--- a/tensorflow/core/kernels/hexagon/graph_transferer.cc
+++ b/tensorflow/core/kernels/hexagon/graph_transferer.cc
@@ -140,7 +140,7 @@ Status GraphTransferer::LoadGraphFromProto(
     std::vector<DataType> data_types;
     std::vector<TensorShape> shapes;
     status = RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-        node->def(), &data_types, &shapes);
+        node->attrs(), &data_types, &shapes);
     if (status.ok()) {
       CHECK(data_types.size() > port);
       graph_output_node_info.set_dtype(data_types.at(port));
@@ -359,7 +359,7 @@ void GraphTransferer::RegisterConstantNode(const ShapeRefiner& shape_refiner,
   const_node_info.add_shape(shape_array[2]);
   const_node_info.add_shape(shape_array[3]);
   const TensorProto* proto = nullptr;
-  TF_CHECK_OK(GetNodeAttr(node.def(), "value", &proto));
+  TF_CHECK_OK(GetNodeAttr(node.attrs(), "value", &proto));
   Tensor const_tensor;
   // TODO(b/32704451): Don't just ignore this status!
   MakeTensorFromProto(*proto, &const_tensor).IgnoreError();
@@ -395,8 +395,9 @@ int GraphTransferer::RegisterConstantShape(const std::vector<int>& shape) {
 }
 
 bool GraphTransferer::HasPaddingAndStrides(const Node& node) {
-  return node.def().attr().count(PADDING_ATTR_NAME) > 0 &&
-         node.def().attr().count(STRIDES_ATTR_NAME) > 0;
+  auto attrs = node.attrs();
+  return attrs.Find(PADDING_ATTR_NAME) != nullptr &&
+         attrs.Find(STRIDES_ATTR_NAME) != nullptr;
 }
 
 bool GraphTransferer::IsNodeFlattenReshape(const Node& node,
@@ -423,7 +424,7 @@ bool GraphTransferer::IsNodeFlattenReshape(const Node& node,
   } else {
     std::vector<TensorShape> shapes;
     TF_CHECK_OK(RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-        node.def(), nullptr, &shapes));
+        node.attrs(), nullptr, &shapes));
 
     // Number of outputs should be 1 for reshape node.
     CHECK_EQ(1, shapes.size());
@@ -444,16 +445,16 @@ void GraphTransferer::RegisterNodeWithPaddingAndStrides(
   CHECK_EQ(node_name_to_id_cache_map_.count(node.name()), 1);
   const int id = node_name_to_id_cache_map_[node.name()];
   shape_inference::InferenceContext* context = shape_refiner.GetContext(&node);
-  CHECK_GT(node.def().attr().count(PADDING_ATTR_NAME), 0);
+  CHECK(node.attrs().Find(PADDING_ATTR_NAME));
   // TODO(satok): Use context->GetAttr(...) instead?
   Padding padding;
   TF_CHECK_OK(context->GetAttr(PADDING_ATTR_NAME, &padding));
-  CHECK_GT(node.def().attr().count(STRIDES_ATTR_NAME), 0);
+  CHECK(node.attrs().Find(STRIDES_ATTR_NAME));
   std::vector<int32> strides;
   TF_CHECK_OK(context->GetAttr(STRIDES_ATTR_NAME, &strides));
   const int stride_id = RegisterConstantShape(strides);
   std::vector<int> extra_inputs{stride_id};
-  if (node.def().attr().count(KSIZE_ATTR_NAME) > 0) {
+  if (node.attrs().Find(KSIZE_ATTR_NAME)) {
     std::vector<int32> kernel_sizes;
     TF_CHECK_OK(context->GetAttr(KSIZE_ATTR_NAME, &kernel_sizes));
     const int ksize_id = RegisterConstantShape(kernel_sizes);
@@ -597,7 +598,7 @@ void GraphTransferer::AppendNodeOutputParams(const ShapeRefiner& shape_refiner,
 
   std::vector<TensorShape> shapes;
   Status status = RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-      node.def(), nullptr, &shapes);
+      node.attrs(), nullptr, &shapes);
 
   for (int i = 0; i < node.num_outputs(); ++i) {
     int data_size = -1;
diff --git a/tensorflow/core/kernels/iterator_ops.cc b/tensorflow/core/kernels/iterator_ops.cc
index 7f1560e9f7..68d1d29225 100644
--- a/tensorflow/core/kernels/iterator_ops.cc
+++ b/tensorflow/core/kernels/iterator_ops.cc
@@ -216,10 +216,10 @@ class OneShotIteratorOp : public OpKernel {
       // Call the dataset_factory_func_ to create a new dataset,
       // over which this op will iterate.
       FunctionLibraryRuntime::Handle f_handle;
-      OP_REQUIRES_OK(ctx, ctx->function_library()->Instantiate(
-                              dataset_factory_func_->name(),
-                              dataset_factory_func_->attr(),
-                              &f_handle));
+      OP_REQUIRES_OK(ctx,
+                     ctx->function_library()->Instantiate(
+                         dataset_factory_func_->name(),
+                         AttrSlice(&dataset_factory_func_->attr()), &f_handle));
       FunctionLibraryRuntime::Options opts;
       opts.cancellation_manager = ctx->cancellation_manager();
       // Choose a step ID that is guaranteed not to clash with any
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
index 456611894d..2174098bde 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
@@ -333,17 +333,17 @@ RemoteFusedGraphExecuteUtils::AddOutputTensorShapeTypeByTensorShapeMap(
 }
 
 /* static */ Status RemoteFusedGraphExecuteUtils::GetOutputTensorShapeType(
-    const NodeDef& node_def, std::vector<DataType>* data_types,
+    AttrSlice attrs, std::vector<DataType>* data_types,
     std::vector<TensorShape>* shapes) {
   Status status;
   if (data_types != nullptr) {
-    status = GetNodeAttr(node_def, ATTR_OUTPUT_DATA_TYPES, data_types);
+    status = GetNodeAttr(attrs, ATTR_OUTPUT_DATA_TYPES, data_types);
   }
   if (!status.ok()) {
     return status;
   }
   if (shapes != nullptr) {
-    status = GetNodeAttr(node_def, ATTR_OUTPUT_SHAPES, shapes);
+    status = GetNodeAttr(attrs, ATTR_OUTPUT_SHAPES, shapes);
     if (status.ok() && data_types != nullptr) {
       CHECK_EQ(data_types->size(), shapes->size());
     }
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
index 9ec189c85f..97b0c2008a 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
@@ -103,7 +103,7 @@ class RemoteFusedGraphExecuteUtils {
   static Status AddOutputTensorShapeTypeByTensorShapeMap(
       const TensorShapeMap& tensor_shape_map, NodeDef* node_def);
 
-  static Status GetOutputTensorShapeType(const NodeDef& node_def,
+  static Status GetOutputTensorShapeType(AttrSlice attrs,
                                          std::vector<DataType>* data_types,
                                          std::vector<TensorShape>* shapes);
 
-- 
GitLab


From 6192777e89d2d8d9b5dcb51abba5469eb9670bd2 Mon Sep 17 00:00:00 2001
From: Till Hoffmann <tillahoffmann@gmail.com>
Date: Wed, 17 May 2017 18:12:07 +0100
Subject: [PATCH 1447/1563] CPU kernels for FFT (#9029)

* Add C2C FFT kernels for CPU.

* Remove reinterpret_cast.

* Add RFFT (does not compile).

* Implement RFFT without IRFFT.

* Fix gpu build.
---
 tensorflow/core/kernels/fft_ops.cc            | 115 ++++++++++--
 .../python/kernel_tests/fft_ops_test.py       | 174 +++++++++---------
 2 files changed, 183 insertions(+), 106 deletions(-)

diff --git a/tensorflow/core/kernels/fft_ops.cc b/tensorflow/core/kernels/fft_ops.cc
index c4cfd514c3..7ed912325e 100644
--- a/tensorflow/core/kernels/fft_ops.cc
+++ b/tensorflow/core/kernels/fft_ops.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 #define EIGEN_USE_THREADS
 
-// See docs in ../ops/fft_ops.cc.
+// See docs in ../ops/spectral_ops.cc.
 
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op.h"
@@ -29,22 +29,13 @@ limitations under the License.
 
 #if GOOGLE_CUDA
 #include "tensorflow/core/platform/stream_executor.h"
+#endif
 
 namespace tensorflow {
 
-namespace {
-// TODO(vrv/zhifengc): Refactor AsDeviceMemory() into GPUUtil.
-template <typename T>
-perftools::gputools::DeviceMemory<T> AsDeviceMemory(const T* cuda_memory) {
-  perftools::gputools::DeviceMemoryBase wrapped(const_cast<T*>(cuda_memory));
-  perftools::gputools::DeviceMemory<T> typed(wrapped);
-  return typed;
-}
-}  // end namespace
-
-class FFTGPUBase : public OpKernel {
+class FFTBase : public OpKernel {
  public:
-  explicit FFTGPUBase(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+  explicit FFTBase(OpKernelConstruction* ctx) : OpKernel(ctx) {}
 
   void Compute(OpKernelContext* ctx) override {
     const Tensor& in = ctx->input(0);
@@ -97,9 +88,100 @@ class FFTGPUBase : public OpKernel {
   virtual bool IsForward() const = 0;
   virtual bool IsReal() const = 0;
 
- private:
+  // The function that actually computes the FFT.
+  virtual void DoFFT(OpKernelContext* ctx, const Tensor& in, uint64* fft_shape,
+                     Tensor* out) = 0;
+};
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+template <bool Forward, bool _Real, int FFTRank>
+class FFTCPU : public FFTBase {
+ public:
+  using FFTBase::FFTBase;
+ protected:
+  int Rank() const override { return FFTRank; }
+  bool IsForward() const override { return Forward; }
+  bool IsReal() const override { return _Real; }
+
+  void DoFFT(OpKernelContext* ctx, const Tensor& in, uint64* fft_shape,
+             Tensor* out) override {
+    // Create the axes (which are always trailing).
+    auto axes = Eigen::ArrayXi::LinSpaced(FFTRank, 1, FFTRank);
+    auto device = ctx->eigen_device<CPUDevice>();
+
+    if (!IsReal()) {
+      auto input = ((Tensor) in).flat_inner_dims<complex64, FFTRank + 1>();
+      // Compute the FFT using eigen.
+      auto output = out->flat_inner_dims<complex64, FFTRank + 1>();
+      output.device(device) = input.template fft<Eigen::BothParts,
+        Forward ? Eigen::FFT_FORWARD : Eigen::FFT_REVERSE>(axes);
+    }
+    else {
+      if (IsForward()) {
+        auto input = ((Tensor) in).flat_inner_dims<float, FFTRank + 1>();
+        auto output = out->flat_inner_dims<complex64, FFTRank + 1>();
+        Eigen::DSizes<Eigen::DenseIndex, FFTRank + 1> startIndices;
+
+        // Compute the full FFT using a temporary tensor.
+        Tensor temp;
+        OP_REQUIRES_OK(ctx,ctx->allocate_temp(
+          DataTypeToEnum<complex64>::v(), in.shape(), &temp
+        ));
+        auto full_fft = temp.flat_inner_dims<complex64, FFTRank + 1>();
+        full_fft.device(device) = input.template fft<Eigen::BothParts,
+          Eigen::FFT_FORWARD>(axes);
+
+        // Slice away the negative frequency components.
+        output.device(device) = full_fft.slice(startIndices, output.dimensions());
+      }
+      else {
+        // TODO: reconstruct the full fft and take the inverse.
+        ctx->CtxFailureWithWarning(errors::Unimplemented(
+          "IRFFT is not implemented as a CPU kernel"
+        ));
+      }
+    }
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("FFT").Device(DEVICE_CPU), FFTCPU<true, false, 1>);
+REGISTER_KERNEL_BUILDER(Name("IFFT").Device(DEVICE_CPU),
+                        FFTCPU<false, false, 1>);
+REGISTER_KERNEL_BUILDER(Name("FFT2D").Device(DEVICE_CPU),
+                        FFTCPU<true, false, 2>);
+REGISTER_KERNEL_BUILDER(Name("IFFT2D").Device(DEVICE_CPU),
+                        FFTCPU<false, false, 2>);
+REGISTER_KERNEL_BUILDER(Name("FFT3D").Device(DEVICE_CPU),
+                        FFTCPU<true, false, 3>);
+REGISTER_KERNEL_BUILDER(Name("IFFT3D").Device(DEVICE_CPU),
+                        FFTCPU<false, false, 3>);
+
+REGISTER_KERNEL_BUILDER(Name("RFFT").Device(DEVICE_CPU), FFTCPU<true, true, 1>);
+REGISTER_KERNEL_BUILDER(Name("RFFT2D").Device(DEVICE_CPU),
+                        FFTCPU<true, true, 2>);
+REGISTER_KERNEL_BUILDER(Name("RFFT3D").Device(DEVICE_CPU),
+                        FFTCPU<true, true, 3>);
+
+#if GOOGLE_CUDA
+
+namespace {
+// TODO(vrv/zhifengc): Refactor AsDeviceMemory() into GPUUtil.
+template <typename T>
+perftools::gputools::DeviceMemory<T> AsDeviceMemory(const T* cuda_memory) {
+  perftools::gputools::DeviceMemoryBase wrapped(const_cast<T*>(cuda_memory));
+  perftools::gputools::DeviceMemory<T> typed(wrapped);
+  return typed;
+}
+}  // end namespace
+
+class FFTGPUBase : public FFTBase {
+ public:
+  using FFTBase::FFTBase;
+
+ protected:
   void DoFFT(OpKernelContext* ctx, const Tensor& in, uint64* fft_shape,
-             Tensor* out) {
+             Tensor* out) override {
     auto* stream = ctx->op_device_context()->stream();
     OP_REQUIRES(ctx, stream, errors::Internal("No GPU stream available."));
 
@@ -238,7 +320,6 @@ REGISTER_KERNEL_BUILDER(Name("BatchFFT3D").Device(DEVICE_GPU),
                         FFTGPU<true, false, 3>);
 REGISTER_KERNEL_BUILDER(Name("BatchIFFT3D").Device(DEVICE_GPU),
                         FFTGPU<false, false, 3>);
+#endif  // GOOGLE_CUDA
 
 }  // end namespace tensorflow
-
-#endif  // GOOGLE_CUDA
diff --git a/tensorflow/python/kernel_tests/fft_ops_test.py b/tensorflow/python/kernel_tests/fft_ops_test.py
index f669964948..c87e0258cd 100644
--- a/tensorflow/python/kernel_tests/fft_ops_test.py
+++ b/tensorflow/python/kernel_tests/fft_ops_test.py
@@ -39,30 +39,26 @@ class BaseFFTOpsTest(test.TestCase):
     self._CompareBackward(x, rank, fft_length, use_placeholder)
 
   def _CompareForward(self, x, rank, fft_length=None, use_placeholder=False):
-    if test.is_gpu_available(cuda_only=True):
-      x_np = self._npFFT(x, rank, fft_length)
-      if use_placeholder:
-        x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
-        x_tf = self._tfFFT(x_ph, rank, fft_length, use_gpu=True,
-                           feed_dict={x_ph: x})
-      else:
-        x_tf = self._tfFFT(x, rank, fft_length, use_gpu=True)
+    x_np = self._npFFT(x, rank, fft_length)
+    if use_placeholder:
+      x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
+      x_tf = self._tfFFT(x_ph, rank, fft_length, use_gpu=True,
+                          feed_dict={x_ph: x})
+    else:
+      x_tf = self._tfFFT(x, rank, fft_length, use_gpu=True)
 
-      # GPU/Forward
-      self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
+    self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
 
   def _CompareBackward(self, x, rank, fft_length=None, use_placeholder=False):
-    if test.is_gpu_available(cuda_only=True):
-      x_np = self._npIFFT(x, rank, fft_length)
-      if use_placeholder:
-        x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
-        x_tf = self._tfIFFT(x_ph, rank, fft_length, use_gpu=True,
-                            feed_dict={x_ph: x})
-      else:
-        x_tf = self._tfIFFT(x, rank, fft_length, use_gpu=True)
+    x_np = self._npIFFT(x, rank, fft_length)
+    if use_placeholder:
+      x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
+      x_tf = self._tfIFFT(x_ph, rank, fft_length, use_gpu=True,
+                          feed_dict={x_ph: x})
+    else:
+      x_tf = self._tfIFFT(x, rank, fft_length, use_gpu=True)
 
-      # GPU/Backward
-      self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
+    self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
 
   def _checkGradComplex(self, func, x, y, result_is_complex=True,
                         use_gpu=False):
@@ -151,12 +147,11 @@ class FFTOpsTest(BaseFFTOpsTest):
       raise ValueError("invalid rank")
 
   def testEmpty(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 3):
-          x = np.zeros((0,) * dims).astype(np.complex64)
-          self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
-          self.assertEqual(x.shape, self._tfIFFT(x, rank).shape)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 3):
+        x = np.zeros((0,) * dims).astype(np.complex64)
+        self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
+        self.assertEqual(x.shape, self._tfIFFT(x, rank).shape)
 
   def testBasic(self):
     for rank in VALID_FFT_RANKS:
@@ -184,41 +179,43 @@ class FFTOpsTest(BaseFFTOpsTest):
         self._Compare(gen((4,) * dims), rank)
 
   def testError(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(0, rank):
-          x = np.zeros((1,) * dims).astype(np.complex64)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfFFT(x, rank)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfIFFT(x, rank)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(0, rank):
+        x = np.zeros((1,) * dims).astype(np.complex64)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfFFT(x, rank)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfIFFT(x, rank)
 
   def testGrad_Simple(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 2):
-          re = np.ones(shape=(4,) * dims, dtype=np.float32) / 10.0
-          im = np.zeros(shape=(4,) * dims, dtype=np.float32)
-          self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
-          self._checkGradComplex(
-              self._tfIFFTForRank(rank), re, im, use_gpu=True)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 2):
+        re = np.ones(shape=(4,) * dims, dtype=np.float32) / 10.0
+        im = np.zeros(shape=(4,) * dims, dtype=np.float32)
+        self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
+        self._checkGradComplex(
+            self._tfIFFTForRank(rank), re, im, use_gpu=True)
 
   def testGrad_Random(self):
-    if test.is_gpu_available(cuda_only=True):
-      np.random.seed(54321)
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 2):
-          re = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
-          im = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
-          self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
-          self._checkGradComplex(
-              self._tfIFFTForRank(rank), re, im, use_gpu=True)
+    np.random.seed(54321)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 2):
+        re = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
+        im = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
+        self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
+        self._checkGradComplex(
+            self._tfIFFTForRank(rank), re, im, use_gpu=True)
 
 
 class RFFTOpsTest(BaseFFTOpsTest):
 
+  def _CompareBackward(self, x, rank, fft_length=None, use_placeholder=False):
+    if test.is_gpu_available(cuda_only=True):
+      super(RFFTOpsTest, self)._CompareBackward(x, rank, fft_length,
+                                                use_placeholder)
+
   def _tfFFT(self, x, rank, fft_length=None, use_gpu=False, feed_dict=None):
     with self.test_session(use_gpu=use_gpu):
       return self._tfFFTForRank(rank)(x, fft_length).eval(feed_dict=feed_dict)
@@ -268,12 +265,12 @@ class RFFTOpsTest(BaseFFTOpsTest):
       raise ValueError("invalid rank")
 
   def testEmpty(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 3):
-          x = np.zeros((0,) * dims).astype(np.float32)
-          self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
-          x = np.zeros((0,) * dims).astype(np.complex64)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 3):
+        x = np.zeros((0,) * dims).astype(np.float32)
+        self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
+        x = np.zeros((0,) * dims).astype(np.complex64)
+        if test.is_gpu_available(cuda_only=True):
           self.assertEqual(x.shape, self._tfIFFT(x, rank).shape)
 
   def testBasic(self):
@@ -327,36 +324,35 @@ class RFFTOpsTest(BaseFFTOpsTest):
           self._CompareBackward(gen_complex(complex_dims), rank, (size,) * rank)
 
   def testError(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(0, rank):
-          x = np.zeros((1,) * dims).astype(np.complex64)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfFFT(x, rank)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfIFFT(x, rank)
-        for dims in xrange(rank, rank + 2):
-          x = np.zeros((1,) * rank)
-
-          # Test non-rank-1 fft_length produces an error.
-          fft_length = np.zeros((1, 1)).astype(np.int32)
-          with self.assertRaisesWithPredicateMatch(ValueError,
-                                                   "Shape must be .*rank 1"):
-            self._tfFFT(x, rank, fft_length)
-          with self.assertRaisesWithPredicateMatch(ValueError,
-                                                   "Shape must be .*rank 1"):
-            self._tfIFFT(x, rank, fft_length)
-
-          # Test wrong fft_length length.
-          fft_length = np.zeros((rank + 1,)).astype(np.int32)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
-            self._tfFFT(x, rank, fft_length)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
-            self._tfIFFT(x, rank, fft_length)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(0, rank):
+        x = np.zeros((1,) * dims).astype(np.complex64)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfFFT(x, rank)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfIFFT(x, rank)
+      for dims in xrange(rank, rank + 2):
+        x = np.zeros((1,) * rank)
+
+        # Test non-rank-1 fft_length produces an error.
+        fft_length = np.zeros((1, 1)).astype(np.int32)
+        with self.assertRaisesWithPredicateMatch(ValueError,
+                                                  "Shape must be .*rank 1"):
+          self._tfFFT(x, rank, fft_length)
+        with self.assertRaisesWithPredicateMatch(ValueError,
+                                                  "Shape must be .*rank 1"):
+          self._tfIFFT(x, rank, fft_length)
+
+        # Test wrong fft_length length.
+        fft_length = np.zeros((rank + 1,)).astype(np.int32)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
+          self._tfFFT(x, rank, fft_length)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
+          self._tfIFFT(x, rank, fft_length)
 
   def testGrad_Simple(self):
     if test.is_gpu_available(cuda_only=True):
-- 
GitLab


From 00b716e78759309e1478954554f22ee8709214d0 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Wed, 17 May 2017 10:34:56 -0700
Subject: [PATCH 1448/1563] Minor improvements to ops._ScopedTF_Graph

- try/except in destructor to remove spurious stderr messages
- create Graph property for accessing underlying TF_Graph

PiperOrigin-RevId: 156323973
---
 tensorflow/python/framework/ops.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/framework/ops.py b/tensorflow/python/framework/ops.py
index c481726429..db2b8d4d89 100644
--- a/tensorflow/python/framework/ops.py
+++ b/tensorflow/python/framework/ops.py
@@ -1313,8 +1313,7 @@ class Operation(object):
       A wrapped TF_Operation*.
     """
     # pylint: disable=protected-access
-    op_desc = c_api.TF_NewOperation(graph._c_graph.g,
-                                    compat.as_str(node_def.op),
+    op_desc = c_api.TF_NewOperation(graph._c_graph, compat.as_str(node_def.op),
                                     compat.as_str(node_def.name))
     # Add inputs
     for op_input in inputs:
@@ -2045,10 +2044,13 @@ def _name_from_scope_name(name):
 class _ScopedTF_Graph(object):
 
   def __init__(self):
-    self.g = c_api.TF_NewGraph()
+    self.graph = c_api.TF_NewGraph()
 
   def __del__(self):
-    c_api.TF_DeleteGraph(self.g)
+    # Note: when we're destructing the global context (i.e when the process is
+    # terminating) we can have already deleted other modules.
+    if c_api.TF_DeleteGraph is not None:
+      c_api.TF_DeleteGraph(self.graph)
 
 
 class Graph(object):
@@ -2167,9 +2169,9 @@ class Graph(object):
     # TODO(skyewm): fold as much of the above as possible into the C
     # implementation
     if _USE_C_API:
-      self._c_graph = _ScopedTF_Graph()
+      self._scoped_c_graph = _ScopedTF_Graph()
     else:
-      self._c_graph = None
+      self._scoped_c_graph = None
 
   def _check_not_finalized(self):
     """Check if the graph is finalized.
@@ -2206,6 +2208,12 @@ class Graph(object):
       self._version = max(self._version, op._id)
       # pylint: enable=protected-access
 
+  @property
+  def _c_graph(self):
+    if self._scoped_c_graph:
+      return self._scoped_c_graph.graph
+    return None
+
   @property
   def version(self):
     """Returns a version number that increases as ops are added to the graph.
-- 
GitLab


From 5bac9eda1e6a579703a09b02ac1bb0ccf0991ab4 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Wed, 17 May 2017 10:46:09 -0700
Subject: [PATCH 1449/1563] Remove a call to Node::AddAttr

Once NodeDef becomes NodeInfo in most places, it will be more expensive to change it after construction.  subgraph.cc's use is unnecessary (it was added for a purpose that moved elsewhere).

PiperOrigin-RevId: 156325442
---
 tensorflow/core/graph/subgraph.cc      | 14 ----------
 tensorflow/core/graph/subgraph_test.cc | 37 --------------------------
 2 files changed, 51 deletions(-)

diff --git a/tensorflow/core/graph/subgraph.cc b/tensorflow/core/graph/subgraph.cc
index e10b692889..2a08bf8ca0 100644
--- a/tensorflow/core/graph/subgraph.cc
+++ b/tensorflow/core/graph/subgraph.cc
@@ -103,20 +103,6 @@ static Status FeedInputs(Graph* g, const DeviceAttributes& device_info,
     }
     recv_node->set_assigned_device_name(device_info.name());
 
-    // Copy the _output_shapes from the original node to the feed node,
-    // if any.
-    std::vector<PartialTensorShape> output_shapes;
-    if (GetNodeAttr(n->attrs(), "_output_shapes", &output_shapes).ok()) {
-      if (n->num_outputs() != output_shapes.size()) {
-        return errors::InvalidArgument(
-            "FeedInputs: ", t,
-            ": size of _output_shapes attribute does not "
-            "match the number of node outputs");
-      }
-      std::vector<PartialTensorShape> feed_shapes = {output_shapes[id.second]};
-      recv_node->AddAttr("_output_shapes", feed_shapes);
-    }
-
     // Update name_index
     (*name_index)[recv_node->name()] = recv_node;
     g->AddControlEdge(g->source_node(), recv_node);
diff --git a/tensorflow/core/graph/subgraph_test.cc b/tensorflow/core/graph/subgraph_test.cc
index 93dcfd5e33..fde1ea1743 100644
--- a/tensorflow/core/graph/subgraph_test.cc
+++ b/tensorflow/core/graph/subgraph_test.cc
@@ -338,43 +338,6 @@ TEST_F(SubgraphTest, Errors) {
   EXPECT_TRUE(HasSubstr(Subgraph("", "", ""), "at least one target"));
 }
 
-TEST_F(SubgraphTest, FedOutputsPreservesOutputShapes) {
-  ExpectOK(
-      R"proto(
-        node { name: 'W1' op: 'TestParams' }
-        node { name: 'W2' op: 'TestParams' }
-        node {
-          name: 'input'
-          op: 'TestInput'
-          attr {
-            key: '_output_shapes'
-            value {
-              list {
-                shape { unknown_rank: true }
-                shape { dim { size: 23 } }
-              }
-            }
-          }
-        }
-        node { name: 't1' op: 'TestMul' input: [ 'W1', 'input:1' ] }
-        node { name: 't2' op: 'TestMul' input: [ 'W2', 't1' ] }
-        node { name: 't3_a' op: 'TestRelu' input: 't2' }
-        node { name: 't3_b' op: 'TestRelu' input: 't2' }
-      )proto");
-  EXPECT_EQ("OK", Subgraph("input:1", "", "t2"));
-  ExpectNodes("W1,W2,_recv_input_1,t1,t2");
-
-  for (Node* node : graph()->nodes()) {
-    if (node->name() == "_recv_input_1") {
-      std::vector<PartialTensorShape> shapes;
-      TF_ASSERT_OK(GetNodeAttr(node->attrs(), "_output_shapes", &shapes));
-      ASSERT_EQ(1, shapes.size());
-      EXPECT_TRUE(PartialTensorShape({23}).IsIdenticalTo(shapes[0]));
-      break;
-    }
-  }
-}
-
 REGISTER_OP("In").Output("o: float");
 REGISTER_OP("Op").Input("i: float").Output("o: float");
 
-- 
GitLab


From 450143aded166dffdf98b4977ab1760580af40eb Mon Sep 17 00:00:00 2001
From: Changming Sun <chasun@microsoft.com>
Date: Wed, 17 May 2017 12:57:36 -0500
Subject: [PATCH 1450/1563] Check the return value of fopen (#9964)

---
 tensorflow/tools/proto_text/gen_proto_text_functions.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/tools/proto_text/gen_proto_text_functions.cc b/tensorflow/tools/proto_text/gen_proto_text_functions.cc
index 17ab542a59..ecb29a65a0 100644
--- a/tensorflow/tools/proto_text/gen_proto_text_functions.cc
+++ b/tensorflow/tools/proto_text/gen_proto_text_functions.cc
@@ -130,6 +130,7 @@ int MainImpl(int argc, char** argv) {
 
       const string path = output_root + "/" + proto_path_no_suffix + suffix;
       FILE* f = fopen(path.c_str(), "w");
+      if (f == nullptr) return -1;
       if (fwrite(data.c_str(), 1, data.size(), f) != data.size()) {
         return -1;
       }
-- 
GitLab


From 931fd84bb72df0500f512d5d92ec0bef2ea461be Mon Sep 17 00:00:00 2001
From: Fei Sun <sunfei.china@outlook.com>
Date: Thu, 18 May 2017 02:00:48 +0800
Subject: [PATCH 1451/1563] fix numpy.prod and GatherGrad overflow for large
 tensors inside windows (#9780)

* fix numpy.prod overflow for windows

* fix GatherGrad large shape exception for windows

* add __long__ for Dimension; modify comment according to review
---
 tensorflow/python/framework/tensor_shape.py | 3 +++
 tensorflow/python/framework/tensor_util.py  | 8 +++++---
 tensorflow/python/ops/array_grad.py         | 8 +++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tensorflow/python/framework/tensor_shape.py b/tensorflow/python/framework/tensor_shape.py
index 73c810711f..3e8c7af692 100644
--- a/tensorflow/python/framework/tensor_shape.py
+++ b/tensorflow/python/framework/tensor_shape.py
@@ -65,6 +65,9 @@ class Dimension(object):
 
   def __int__(self):
     return self._value
+  
+  def __long__(self):
+    return self._value
 
   def __index__(self):
     # Allow use in Python 3 range
diff --git a/tensorflow/python/framework/tensor_util.py b/tensorflow/python/framework/tensor_util.py
index 1e445591b1..1081110001 100644
--- a/tensorflow/python/framework/tensor_util.py
+++ b/tensorflow/python/framework/tensor_util.py
@@ -368,7 +368,9 @@ def make_tensor_proto(values, dtype=None, shape=None, verify_shape=False):
       np_dt = dtype.as_numpy_dtype
     else:
       np_dt = None
-    if np.prod(shape) == 0:
+    # If shape is None, numpy.prod returns None when dtype is not set, but raises
+    # exception when dtype is set to np.int64
+    if shape is not None and np.prod(shape, dtype=np.int64) == 0:
       nparray = np.empty(shape, dtype=np_dt)
     else:
       _AssertCompatible(values, dtype)
@@ -414,7 +416,7 @@ def make_tensor_proto(values, dtype=None, shape=None, verify_shape=False):
     shape_size = nparray.size
   else:
     shape = [int(dim) for dim in shape]
-    shape_size = np.prod(shape)
+    shape_size = np.prod(shape, dtype=np.int64)
     is_same_size = shape_size == nparray.size
 
     if verify_shape:
@@ -491,7 +493,7 @@ def MakeNdarray(tensor):
 
   """
   shape = [d.size for d in tensor.tensor_shape.dim]
-  num_elements = np.prod(shape)
+  num_elements = np.prod(shape, dtype=np.int64)
   tensor_dtype = dtypes.as_dtype(tensor.dtype)
   dtype = tensor_dtype.as_numpy_dtype
 
diff --git a/tensorflow/python/ops/array_grad.py b/tensorflow/python/ops/array_grad.py
index 8594d811e8..5c6d309e6c 100644
--- a/tensorflow/python/ops/array_grad.py
+++ b/tensorflow/python/ops/array_grad.py
@@ -354,9 +354,15 @@ def _PreventGradientGrad(op, _):
 def _GatherGrad(op, grad):
   """Gradient for Gather op."""
   # params can be large, so colocate the shape calculation with it.
+  #
+  # params can be very large for sparse model, array_ops.shape raises
+  # exception on the Windows platform when any dimension is larger than
+  # int32. params_shape is not used in optimizer apply_sparse gradients,
+  # so it's fine to convert it back to int32 regardless of truncation.
   params = op.inputs[0]
   with ops.colocate_with(params):
-    params_shape = array_ops.shape(params)
+    params_shape = array_ops.shape(params, out_type=ops.dtypes.int64)
+    params_shape = math_ops.to_int32(params_shape)
 
   # Build appropriately shaped IndexedSlices
   indices = op.inputs[1]
-- 
GitLab


From f52ce54b2d68267088ddc8664986641409e4acb8 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 11:14:34 -0700
Subject: [PATCH 1452/1563] Add cdf method to Categorical.

PiperOrigin-RevId: 156329373
---
 .../distributions/categorical_test.py         | 57 +++++++++++++++++++
 .../python/ops/distributions/categorical.py   | 16 ++++++
 2 files changed, 73 insertions(+)

diff --git a/tensorflow/python/kernel_tests/distributions/categorical_test.py b/tensorflow/python/kernel_tests/distributions/categorical_test.py
index bfdb5fa9fe..396de45cad 100644
--- a/tensorflow/python/kernel_tests/distributions/categorical_test.py
+++ b/tensorflow/python/kernel_tests/distributions/categorical_test.py
@@ -126,6 +126,63 @@ class CategoricalTest(test.TestCase):
     with self.test_session():
       self.assertAllClose(dist.prob(0).eval(), 0.2)
 
+  def testCDFWithDynamicEventShape(self):
+    """Test that dynamically-sized events with unkown shape work."""
+    batch_size = 2
+    histograms = array_ops.placeholder(dtype=dtypes.float32,
+                                       shape=(batch_size, None))
+    event = array_ops.placeholder(dtype=dtypes.float32, shape=(batch_size,))
+    dist = categorical.Categorical(probs=histograms)
+    cdf_op = dist.cdf(event)
+
+    # Feed values into the placeholder with different shapes
+    # three classes.
+    event_feed_one = [0, 1]
+    histograms_feed_one = [[0.5, 0.3, 0.2], [1.0, 0.0, 0.0]]
+    expected_cdf_one = [0.0, 1.0]
+    feed_dict_one = {
+        histograms: histograms_feed_one,
+        event: event_feed_one
+    }
+
+    # six classes.
+    event_feed_two = [2, 5]
+    histograms_feed_two = [[0.9, 0.0, 0.0, 0.0, 0.0, 0.1],
+                           [0.15, 0.2, 0.05, 0.35, 0.13, 0.12]]
+    expected_cdf_two = [0.9, 0.88]
+    feed_dict_two = {
+        histograms: histograms_feed_two,
+        event: event_feed_two
+    }
+
+    with self.test_session() as sess:
+      actual_cdf_one = sess.run(cdf_op, feed_dict=feed_dict_one)
+      actual_cdf_two = sess.run(cdf_op, feed_dict=feed_dict_two)
+
+    self.assertAllClose(actual_cdf_one, expected_cdf_one)
+    self.assertAllClose(actual_cdf_two, expected_cdf_two)
+
+  def testCDFWithBatch(self):
+    histograms = [[0.1, 0.2, 0.3, 0.25, 0.15],
+                  [0.0, 0.75, 0.2, 0.05, 0.0]]
+    event = [0, 3]
+    expected_cdf = [0.0, 0.95]
+    dist = categorical.Categorical(probs=histograms)
+    cdf_op = dist.cdf(event)
+
+    with self.test_session():
+      self.assertAllClose(cdf_op.eval(), expected_cdf)
+
+  def testCDFNoBatch(self):
+    histogram = [0.1, 0.2, 0.3, 0.4]
+    event = 2
+    expected_cdf = 0.3
+    dist = categorical.Categorical(probs=histogram)
+    cdf_op = dist.cdf(event)
+
+    with self.test_session():
+      self.assertAlmostEqual(cdf_op.eval(), expected_cdf)
+
   def testLogPMF(self):
     logits = np.log([[0.2, 0.8], [0.6, 0.4]]) - 50.
     dist = categorical.Categorical(logits)
diff --git a/tensorflow/python/ops/distributions/categorical.py b/tensorflow/python/ops/distributions/categorical.py
index 1b74c2f0ca..bad7e6e42f 100644
--- a/tensorflow/python/ops/distributions/categorical.py
+++ b/tensorflow/python/ops/distributions/categorical.py
@@ -193,6 +193,22 @@ class Categorical(distribution.Distribution):
         array_ops.concat([[n], self.batch_shape_tensor()], 0))
     return ret
 
+  def _cdf(self, k):
+    k = ops.convert_to_tensor(k, name="k")
+
+    # If there are multiple batch dimension, flatten them into one.
+    batch_flattened_probs = array_ops.reshape(self._probs,
+                                              [-1, self._event_size])
+    batch_flattened_k = array_ops.reshape(k, (-1,))
+
+    # Form a tensor to sum over.
+    mask_tensor = array_ops.sequence_mask(batch_flattened_k, self._event_size)
+    to_sum_over = array_ops.where(mask_tensor,
+                                  batch_flattened_probs,
+                                  array_ops.zeros_like(batch_flattened_probs))
+    batch_flat_cdf = math_ops.reduce_sum(to_sum_over, axis=-1)
+    return array_ops.reshape(batch_flat_cdf, self._batch_shape())
+
   def _log_prob(self, k):
     k = ops.convert_to_tensor(k, name="k")
     if self.logits.get_shape()[:-1] == k.get_shape():
-- 
GitLab


From 91ed5939f8892b6522281d898709fc70c4d1d698 Mon Sep 17 00:00:00 2001
From: David Majnemer <majnemer@google.com>
Date: Wed, 17 May 2017 11:20:44 -0700
Subject: [PATCH 1453/1563] [XLA] Add tests for pow(x, y) with x < 0

PiperOrigin-RevId: 156330209
---
 .../compiler/xla/tests/array_elementwise_ops_test.cc   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
index 2c748b6a7e..8c433a364d 100644
--- a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
+++ b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
@@ -632,12 +632,14 @@ TEST_F(ArrayElementwiseOpTest, CompareLtU32s) {
 TEST_F(ArrayElementwiseOpTest, PowF32s) {
   SetFastMathDisabled(true);
   ComputationBuilder builder(client_, TestName());
-  auto lhs = builder.ConstantR1<float>({4.0f, 2.0f, 2.0f, NAN, 6.0f});
-  auto rhs = builder.ConstantR1<float>({2.0f, -2.0f, 3.0f, 10.0f, NAN});
+  auto lhs =
+      builder.ConstantR1<float>({4.0f, 2.0f, 2.0f, NAN, 6.0f, -2.0f, -2.0f});
+  auto rhs =
+      builder.ConstantR1<float>({2.0f, -2.0f, 3.0f, 10.0f, NAN, 3.0f, 4.0f});
   auto minimum = builder.Pow(lhs, rhs);
 
-  ComputeAndCompareR1<float>(&builder, {16.0f, 0.25f, 8.0f, NAN, NAN}, {},
-                             error_spec_);
+  ComputeAndCompareR1<float>(
+      &builder, {16.0f, 0.25f, 8.0f, NAN, NAN, -8.0f, 16.0f}, {}, error_spec_);
 }
 
 XLA_TEST_F(ArrayElementwiseOpTest, PowZeroElementF32s) {
-- 
GitLab


From c37b31d5cc716516a3bbb8946d62a7df401fbc0e Mon Sep 17 00:00:00 2001
From: Derek Murray <mrry@google.com>
Date: Wed, 17 May 2017 11:29:20 -0700
Subject: [PATCH 1454/1563] [Input pipeline] Disable failing test on Windows
 while we investigate the cause.

PiperOrigin-RevId: 156331434
---
 tensorflow/contrib/cmake/tf_tests.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index 7da0a0cbe9..2956d1ed65 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -215,7 +215,8 @@ if (tensorflow_BUILD_PYTHON_TESTS)
       # Newly running on Windows since TensorBoard backend move. Fail on Windows and need debug.
       "${tensorflow_source_dir}/tensorflow/tensorboard/backend/event_processing/directory_watcher_test.py"
       "${tensorflow_source_dir}/tensorflow/tensorboard/backend/event_processing/event_multiplexer_test.py"
-    )
+      "${tensorflow_source_dir}/tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py"  # Segfaults on Windows.
+  )
   endif()
   list(REMOVE_ITEM tf_test_src_py ${tf_test_src_py_exclude})
 
-- 
GitLab


From 368a1588586d50dd008359e4d4e571c03faa5b67 Mon Sep 17 00:00:00 2001
From: "freedom\" Koan-Sin Tan" <koansin.tan@gmail.com>
Date: Thu, 18 May 2017 02:45:16 +0800
Subject: [PATCH 1455/1563] Add a simple BMP decoder and enable it on Android
 (#9563)

* Add a simple bmp decoder

Add a bmp decoder and make sure that the decoder works with label_image.

tensorflow/python/kernel_tests/decode_bmp_op_test.py uses data from
Example 1 of Wikipedia BMP file format page [1].

tensorflow/core/lib/bmp/testdata/lena.bmp for
tensorflow/python/kernel_tests/decode_image_op_test.py is converted from
./tensorflow/core/lib/png/testdata/lena_rgba.png

[1] https://en.wikipedia.org/wiki/BMP_file_format#Example_1

* enable building label_image w/ bmp decoder for Android

(0) modifiy Andorid NDK entry in WORKSPACE
(1) build it
> bazel build -c opt \
  --cxxopt="-std=c++11" --cxxopt="-DTENSORFLOW_DISABLE_META"  \
  --crosstool_top=//external:android/crosstool \
  --cpu=arm64-v8a \
  --host_crosstool_top=@bazel_tools//tools/cpp:toolchain \
  tensorflow/examples/label_image/label_image

(2) push the binary to your Android device
> adb push bazel-bin/tensorflow/examples/label_image/label_image /data/local/tmp

(3) push model and other files to the device

(4) adb shell then 'cd /data/local/tmp/', then we can run 'label_image' like:

> ./label_image  --graph=inception_v3_2016_08_28_frozen.pb  --labels=imagenet_slim_labels.txt --image=grace_hopper.bmp

    And get results like:

native : main.cc:208 military uniform (653): 0.834119
native : main.cc:208 mortarboard (668): 0.0196274
native : main.cc:208 academic gown (401): 0.00946237
native : main.cc:208 pickelhaube (716): 0.00757228
native : main.cc:208 bulletproof vest (466): 0.0055856

* Small type fixes and style issues.

* Fixing syntax, check that channels is a valid number for now.

* Use internal::SubtleMustCopy on fields extracted from input tensor

* use channels_ extensively

use channels_ when calculating positions and support 4 channels

* PNG->BMP

* Change default channels of bmp decoder to 0

Change default channels of bmp decoder to 0 for consistency.
Fixed a typo in tensorflow/core/kernels/decode_bmp_op.cc

* Fixed BUILD files as suggested by buildifier

* Add test data for decode_image_op_test

Add test data dependency for tensorflow/python/kernel_tests:decode_image_op_test
and add tensorflow/python/kernel_tests:decode_bmp_op_test to test bmp.
---
 tensorflow/core/BUILD                         |   4 +-
 tensorflow/core/kernels/BUILD                 |  17 +++
 tensorflow/core/kernels/decode_bmp_op.cc      | 143 ++++++++++++++++++
 tensorflow/core/lib/bmp/testdata/lena.bmp     | Bin 0 -> 4194 bytes
 tensorflow/core/ops/image_ops.cc              |  22 +++
 tensorflow/examples/label_image/BUILD         |  32 +++-
 tensorflow/examples/label_image/main.cc       |   2 +
 tensorflow/python/kernel_tests/BUILD          |  13 ++
 .../python/kernel_tests/decode_bmp_op_test.py |  66 ++++++++
 .../kernel_tests/decode_image_op_test.py      |  11 ++
 tensorflow/python/ops/image_ops.py            |   1 +
 tensorflow/python/ops/image_ops_impl.py       |  48 ++++--
 .../tools/api/golden/tensorflow.image.pbtxt   |   4 +
 13 files changed, 340 insertions(+), 23 deletions(-)
 create mode 100644 tensorflow/core/kernels/decode_bmp_op.cc
 create mode 100644 tensorflow/core/lib/bmp/testdata/lena.bmp
 create mode 100644 tensorflow/python/kernel_tests/decode_bmp_op_test.py

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 343d6faf5a..5f555d419e 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -883,7 +883,6 @@ filegroup(
             "**/*main.cc",
             "debug/**/*",
             "framework/op_gen_*",
-            "framework/reader_base.*",
             "graph/dot.*",
             "lib/jpeg/**/*",
             "lib/png/**/*",
@@ -934,6 +933,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":protos_cc",
+        ":reader_base_proto_cc",
         "//third_party/eigen3",
     ],
     alwayslink = 1,
@@ -2874,6 +2874,8 @@ filegroup(
         "lib/gif/testdata/scan.gif",
         # GIF data with optimization
         "lib/gif/testdata/optimized.gif",
+        # BMP data
+        "lib/bmp/testdata/lena.bmp",
     ],
     visibility = ["//visibility:public"],
 )
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index b2eaaa3492..a3ffd2dda3 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -1625,6 +1625,7 @@ cc_library(
         ":attention_ops",
         ":colorspace_op",
         ":crop_and_resize_op",
+        ":decode_bmp_op",
         ":decode_image_op",
         ":draw_bounding_box_op",
         ":encode_jpeg_op",
@@ -1689,6 +1690,12 @@ tf_kernel_library(
     deps = IMAGE_DEPS,
 )
 
+tf_kernel_library(
+    name = "decode_bmp_op",
+    prefix = "decode_bmp_op",
+    deps = IMAGE_DEPS,
+)
+
 tf_kernel_library(
     name = "decode_image_op",
     prefix = "decode_image_op",
@@ -4166,6 +4173,7 @@ filegroup(
     srcs = [
         "batchtospace_op.cc",
         "ctc_decoder_ops.cc",
+        "decode_bmp_op.cc",
         "depthtospace_op.cc",
         "dynamic_stitch_op.cc",
         "in_topk_op.cc",
@@ -4227,6 +4235,7 @@ filegroup(
         "transpose_op.cc",
         "warn_about_ints.cc",
         "where_op.cc",
+        "whole_file_read_ops.cc",
         "xent_op.cc",
         ":android_extended_ops_headers",
     ],
@@ -4295,6 +4304,8 @@ filegroup(
             "decode_image_op.*",
             "encode_png_op.*",
             "encode_jpeg_op.*",
+            "decode_jpeg_op.*",
+            "decode_gif_op.*",
             "identity_reader_op.*",
             "remote_fused_graph_execute_op.*",
             "fixed_length_record_reader_op.*",
@@ -4321,6 +4332,12 @@ cc_library(
         "//conditions:default": [],
     }),
     copts = tf_copts(),
+    linkopts = select({
+        "//tensorflow:android": [
+            "-ldl",
+        ],
+        "//conditions:default": [],
+    }),
     tags = [
         "manual",
         "notap",
diff --git a/tensorflow/core/kernels/decode_bmp_op.cc b/tensorflow/core/kernels/decode_bmp_op.cc
new file mode 100644
index 0000000000..eceac67b20
--- /dev/null
+++ b/tensorflow/core/kernels/decode_bmp_op.cc
@@ -0,0 +1,143 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/image_ops.cc
+
+#include <memory>
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/framework/types.pb.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+
+// Decode the contents of a BMP file
+class DecodeBmpOp : public OpKernel {
+ public:
+  explicit DecodeBmpOp(OpKernelConstruction* context) : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("channels", &channels_));
+    OP_REQUIRES(
+        context, channels_ == 0 || channels_ == 3 || channels_ == 4,
+        errors::InvalidArgument("channels must be 0, 3 or 4, got ", channels_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& contents = context->input(0);
+    OP_REQUIRES(context, TensorShapeUtils::IsScalar(contents.shape()),
+                errors::InvalidArgument("contents must be scalar, got shape ",
+                                        contents.shape().DebugString()));
+
+    // Start decoding image to get shape details
+    const StringPiece input = contents.scalar<string>()();
+
+    const uint8* img_bytes = reinterpret_cast<const uint8*>(input.data());
+    const int32 header_size = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 10)));
+    const int32 width = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 18)));
+    const int32 height = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 22)));
+    const int32 bpp = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 28)));
+
+    if (channels_) {
+      OP_REQUIRES(
+          context, (channels_ == bpp / 8),
+          errors::InvalidArgument("channels attribute ", channels_,
+                                  " does not match bits per pixel from file ",
+                                  bpp / 8));
+    } else {
+      channels_ =  bpp / 8;
+    }
+
+    // Current implementation only supports 3 or 4 channel
+    // bitmaps.
+    OP_REQUIRES(
+        context, (channels_ == 3 || channels_ == 4),
+        errors::InvalidArgument("Number of channels must be 3 or 4, was ",
+                                channels_));
+
+    // if height is negative, data layout is top down
+    // otherwise, it's bottom up
+    bool top_down = (height < 0);
+
+    // Decode image, allocating tensor once the image size is known
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(context, context->allocate_output(
+        0, TensorShape({abs(height), width, channels_}), &output));
+
+    const uint8* bmp_pixels = &img_bytes[header_size];
+
+    Decode(bmp_pixels, output->flat<uint8>().data(), width, abs(height),
+           channels_, top_down);
+  }
+
+  uint8* Decode(const uint8* input, uint8* const output, const int width,
+                const int height, const int channles, bool top_down);
+
+ private:
+  int channels_;
+};
+REGISTER_KERNEL_BUILDER(Name("DecodeBmp").Device(DEVICE_CPU), DecodeBmpOp);
+
+uint8* DecodeBmpOp::Decode(const uint8* input, uint8* const output,
+                           const int width, const int height, const int channels, bool top_down) {
+  // there may be padding bytes when the width is not a multiple of 4 bytes
+  // 8 * channels == bits per pixel
+  int row_size = (8 * channels * width + 31) / 32 * 4;
+
+  for (int i = 0; i < height; i++) {
+    int src_pos;
+    int dst_pos;
+
+    for (int j = 0; j < width; j++) {
+      if (!top_down) {
+        src_pos = ((height - 1 - i) * row_size) + j * channels;
+      } else {
+        src_pos = i * row_size + j * channels;
+      }
+
+      dst_pos = (i * width + j) * channels;
+
+      switch (channels) {
+        case 3:
+          // BGR -> RGB
+          output[dst_pos] = input[src_pos + 2];
+          output[dst_pos + 1] = input[src_pos + 1];
+          output[dst_pos + 2] = input[src_pos];
+          break;
+        case 4:
+          // BGRA -> RGBA
+          output[dst_pos] = input[src_pos + 2];
+          output[dst_pos + 1] = input[src_pos + 1];
+          output[dst_pos + 2] = input[src_pos];
+          output[dst_pos + 3] = input[src_pos + 3];
+          break;
+        default:
+          LOG(FATAL) << "Unexpected number of channels: " << channels;
+          break;
+      }
+    }
+  }
+
+  return output;
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/lib/bmp/testdata/lena.bmp b/tensorflow/core/lib/bmp/testdata/lena.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..8c4882de4a78355fbfe9d5750627116645bc8503
GIT binary patch
literal 4194
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

literal 0
HcmV?d00001

diff --git a/tensorflow/core/ops/image_ops.cc b/tensorflow/core/ops/image_ops.cc
index bbfdb34758..7522e05177 100644
--- a/tensorflow/core/ops/image_ops.cc
+++ b/tensorflow/core/ops/image_ops.cc
@@ -563,6 +563,28 @@ compression: Compression level.
 contents: 0-D. PNG-encoded image.
 )doc");
 
+// --------------------------------------------------------------------------
+REGISTER_OP("DecodeBmp")
+    .Input("contents: string")
+    .Output("image: uint8")
+    .Attr("channels: int = 0")
+    .SetShapeFn(DecodeImageShapeFn)
+    .Doc(R"doc(
+Decode the first frame of a BMP-encoded image to a uint8 tensor.
+
+The attr `channels` indicates the desired number of color channels for the
+decoded image.
+
+Accepted values are:
+
+*   0: Use the number of channels in the BMP-encoded image.
+*   3: output an RGB image.
+*   4: output an RGBA image.
+
+contents: 0-D.  The BMP-encoded image.
+image: 3-D with shape `[height, width, channels]`. RGB order
+)doc");
+
 // --------------------------------------------------------------------------
 REGISTER_OP("DecodeGif")
     .Input("contents: string")
diff --git a/tensorflow/examples/label_image/BUILD b/tensorflow/examples/label_image/BUILD
index 021372fa7b..d677e58ac3 100644
--- a/tensorflow/examples/label_image/BUILD
+++ b/tensorflow/examples/label_image/BUILD
@@ -12,12 +12,32 @@ cc_binary(
     srcs = [
         "main.cc",
     ],
-    linkopts = ["-lm"],
-    deps = [
-        "//tensorflow/cc:cc_ops",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:tensorflow",
-    ],
+    linkopts = select({
+        "//tensorflow:android": [
+            "-pie",
+            "-landroid",
+            "-ljnigraphics",
+            "-llog",
+            "-lm",
+            "-z defs",
+            "-s",
+            "-Wl,--exclude-libs,ALL",
+        ],
+        "//conditions:default": ["-lm"],
+    }),
+    deps = select({
+        "//tensorflow:android": [
+            # cc:cc_ops is used to include image ops (for label_image)
+            # Jpg, gif, and png related code won't be included
+            "//tensorflow/cc:cc_ops",
+            "//tensorflow/core:android_tensorflow_lib",
+        ],
+        "//conditions:default": [
+            "//tensorflow/cc:cc_ops",
+            "//tensorflow/core:framework_internal",
+            "//tensorflow/core:tensorflow",
+        ],
+    }),
 )
 
 filegroup(
diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
index d98a5c31ab..3744d5a52b 100644
--- a/tensorflow/examples/label_image/main.cc
+++ b/tensorflow/examples/label_image/main.cc
@@ -110,6 +110,8 @@ Status ReadTensorFromImageFile(const string& file_name, const int input_height,
     image_reader = Squeeze(root.WithOpName("squeeze_first_dim"),
                            DecodeGif(root.WithOpName("gif_reader"),
                                      file_reader));
+  } else if (tensorflow::StringPiece(file_name).ends_with(".bmp")) {
+    image_reader = DecodeBmp(root.WithOpName("bmp_reader"), file_reader);
   } else {
     // Assume if it's neither a PNG nor a GIF then it must be a JPEG.
     image_reader = DecodeJpeg(root.WithOpName("jpeg_reader"), file_reader,
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 56ebc796f9..34151c0f20 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -214,6 +214,19 @@ tf_py_test(
     ],
 )
 
+tf_py_test(
+    name = "decode_bmp_op_test",
+    size = "small",
+    srcs = ["decode_bmp_op_test.py"],
+    additional_deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:image_ops",
+        "//tensorflow/python:nn_grad",
+    ],
+)
+
 tf_py_test(
     name = "decode_image_op_test",
     size = "small",
diff --git a/tensorflow/python/kernel_tests/decode_bmp_op_test.py b/tensorflow/python/kernel_tests/decode_bmp_op_test.py
new file mode 100644
index 0000000000..5aa91f2300
--- /dev/null
+++ b/tensorflow/python/kernel_tests/decode_bmp_op_test.py
@@ -0,0 +1,66 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for DecodeBmpOp."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import image_ops
+from tensorflow.python.platform import test
+
+class DecodeBmpOpTest(test.TestCase):
+
+  def testex1(self):
+    img_bytes = [[[0, 0, 255], [0, 255, 0]], [[255, 0, 0], [255, 255, 255]]]
+    # Encoded BMP bytes from Wikipedia
+    encoded_bytes = [
+        0x42, 0x40,
+        0x46, 0, 0, 0,
+        0, 0,
+        0, 0,
+        0x36, 0, 0, 0,
+        0x28, 0, 0, 0,
+        0x2, 0, 0, 0,
+        0x2, 0, 0, 0,
+        0x1, 0,
+        0x18, 0,
+        0, 0, 0, 0,
+        0x10, 0, 0, 0,
+        0x13, 0xb, 0, 0,
+        0x13, 0xb, 0, 0,
+        0, 0, 0, 0,
+        0, 0, 0, 0,
+        0, 0, 0xff,
+        0xff, 0xff, 0xff,
+        0, 0,
+        0xff, 0, 0,
+        0, 0xff, 0,
+        0, 0,
+    ]
+
+    byte_string = bytes(bytearray(encoded_bytes))
+    img_in = constant_op.constant(byte_string, dtype=dtypes.string)
+    decode = array_ops.squeeze(image_ops.decode_bmp(img_in))
+
+    with self.test_session():
+      decoded = decode.eval()
+      self.assertAllEqual(decoded, img_bytes)
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/python/kernel_tests/decode_image_op_test.py b/tensorflow/python/kernel_tests/decode_image_op_test.py
index b457b5cc86..58280432d6 100644
--- a/tensorflow/python/kernel_tests/decode_image_op_test.py
+++ b/tensorflow/python/kernel_tests/decode_image_op_test.py
@@ -33,6 +33,17 @@ prefix_path = "tensorflow/core/lib"
 
 class DecodeImageOpTest(test.TestCase):
 
+  def testBmp(self):
+    # Read a real bmp and verify shape
+    path = os.path.join(prefix_path, "bmp", "testdata", "lena.bmp")
+    with self.test_session(use_gpu=True) as sess:
+      bmp0 = io_ops.read_file(path)
+      image0 = image_ops.decode_image(bmp0)
+      image1 = image_ops.decode_bmp(bmp0)
+      bmp0, image0, image1 = sess.run([bmp0, image0, image1])
+      self.assertEqual(len(bmp0), 4194)
+      self.assertAllEqual(image0, image1)
+
   def testGif(self):
     # Read some real GIFs
     path = os.path.join(prefix_path, "gif", "testdata", "scan.gif")
diff --git a/tensorflow/python/ops/image_ops.py b/tensorflow/python/ops/image_ops.py
index 2aad1e1519..51d0276140 100644
--- a/tensorflow/python/ops/image_ops.py
+++ b/tensorflow/python/ops/image_ops.py
@@ -18,6 +18,7 @@
 
 See the @{$python/image} guide.
 
+@@decode_bmp
 @@decode_gif
 @@decode_jpeg
 @@encode_jpeg
diff --git a/tensorflow/python/ops/image_ops_impl.py b/tensorflow/python/ops/image_ops_impl.py
index ae7999a71e..35138c0416 100644
--- a/tensorflow/python/ops/image_ops_impl.py
+++ b/tensorflow/python/ops/image_ops_impl.py
@@ -1313,16 +1313,18 @@ def adjust_saturation(image, saturation_factor, name=None):
 
 
 def decode_image(contents, channels=None, name=None):
-  """Convenience function for `decode_gif`, `decode_jpeg`, and `decode_png`.
+  """Convenience function for `decode_bmp`, `decode_gif`, `decode_jpeg`,
+  and `decode_png`.
 
-  Detects whether an image is a GIF, JPEG, or PNG, and performs the appropriate
-  operation to convert the input bytes `string` into a `Tensor` of type `uint8`.
+  Detects whether an image is a BMP, GIF, JPEG, or PNG, and performs the 
+  appropriate operation to convert the input bytes `string` into a `Tensor` of 
+  type `uint8`.
 
   Note: `decode_gif` returns a 4-D array `[num_frames, height, width, 3]`, as
-  opposed to `decode_jpeg` and `decode_png`, which return 3-D arrays
-  `[height, width, num_channels]`. Make sure to take this into account when
-  constructing your graph if you are intermixing GIF files with JPEG and/or PNG
-  files.
+  opposed to `decode_bmp`, `decode_jpeg` and `decode_png`, which return 3-D
+  arrays `[height, width, num_channels]`. Make sure to take this into account
+  when constructing your graph if you are intermixing GIF files with BMP, JPEG,
+  and/or PNG files.
 
   Args:
     contents: 0-D `string`. The encoded image bytes.
@@ -1332,8 +1334,8 @@ def decode_image(contents, channels=None, name=None):
 
   Returns:
     `Tensor` with type `uint8` with shape `[height, width, num_channels]` for
-      JPEG and PNG images and shape `[num_frames, height, width, 3]` for GIF
-      images.
+      BMP, JPEG, and PNG images and shape `[num_frames, height, width, 3]` for
+      GIF images.
 
   Raises:
     ValueError: On incorrect number of channels.
@@ -1343,12 +1345,21 @@ def decode_image(contents, channels=None, name=None):
       raise ValueError('channels must be in (None, 0, 1, 3, 4)')
     substr = string_ops.substr(contents, 0, 3)
 
-    def _gif():
+    def _bmp():
       """Decodes a GIF image."""
-      # Create assert op to check that bytes are GIF decodable
-      is_gif = math_ops.equal(substr, b'\x47\x49\x46', name='is_gif')
-      decode_msg = 'Unable to decode bytes as JPEG, PNG, or GIF'
-      assert_decode = control_flow_ops.Assert(is_gif, [decode_msg])
+      signature = string_ops.substr(contents, 0, 2)
+      # Create assert op to check that bytes are BMP decodable
+      is_bmp = math_ops.equal(signature, 'BM', name='is_bmp')
+      decode_msg = 'Unable to decode bytes as JPEG, PNG, GIF, or BMP'
+      assert_decode = control_flow_ops.Assert(is_bmp, [decode_msg])
+      bmp_channels = 0 if channels is None else channels
+      good_channels = math_ops.not_equal(bmp_channels, 1, name='check_channels')
+      channels_msg = 'Channels must be in (None, 0, 3) when decoding BMP images'
+      assert_channels = control_flow_ops.Assert(good_channels, [channels_msg])
+      with ops.control_dependencies([assert_decode, assert_channels]):
+        return gen_image_ops.decode_bmp(contents)
+
+    def _gif():
       # Create assert to make sure that channels is not set to 1
       # Already checked above that channels is in (None, 0, 1, 3)
 
@@ -1359,9 +1370,14 @@ def decode_image(contents, channels=None, name=None):
       )
       channels_msg = 'Channels must be in (None, 0, 3) when decoding GIF images'
       assert_channels = control_flow_ops.Assert(good_channels, [channels_msg])
-      with ops.control_dependencies([assert_decode, assert_channels]):
+      with ops.control_dependencies([assert_channels]):
         return gen_image_ops.decode_gif(contents)
 
+    def check_gif():
+      # Create assert op to check that bytes are GIF decodable
+      is_gif = math_ops.equal(substr, b'\x47\x49\x46', name='is_gif')
+      return control_flow_ops.cond(is_gif, _gif, _bmp, name='cond_gif')
+
     def _png():
       """Decodes a PNG image."""
       return gen_image_ops.decode_png(contents, channels)
@@ -1369,7 +1385,7 @@ def decode_image(contents, channels=None, name=None):
     def check_png():
       """Checks if an image is PNG."""
       is_png = math_ops.equal(substr, b'\211PN', name='is_png')
-      return control_flow_ops.cond(is_png, _png, _gif, name='cond_png')
+      return control_flow_ops.cond(is_png, _png, check_gif, name='cond_png')
 
     def _jpeg():
       """Decodes a jpeg image."""
diff --git a/tensorflow/tools/api/golden/tensorflow.image.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
index 6002f36bac..579794dbf2 100644
--- a/tensorflow/tools/api/golden/tensorflow.image.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
@@ -40,6 +40,10 @@ tf_module {
     name: "crop_to_bounding_box"
     argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
   }
+  member_method {
+    name: "decode_bmp"
+    argspec: "args=[\'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "decode_gif"
     argspec: "args=[\'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-- 
GitLab


From 7f71b7fbe0bbfc459b3d57e81252cc1b72ac3e0c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 11:40:13 -0700
Subject: [PATCH 1456/1563] Automated g4 rollback of changelist 156123287

PiperOrigin-RevId: 156332937
---
 tensorflow/BUILD                              |   1 +
 tensorflow/core/BUILD                         |   1 +
 tensorflow/core/kernels/neon/BUILD            |  43 ++
 .../core/kernels/neon/depthwiseconv_float.h   | 725 ++++++++++++++++++
 .../kernels/neon/neon_depthwise_conv_op.cc    | 203 +++++
 tensorflow/core/kernels/neon/types.h          |  71 ++
 tensorflow/python/kernel_tests/BUILD          |  15 +
 .../neon_depthwise_conv_op_test.py            | 287 +++++++
 8 files changed, 1346 insertions(+)
 create mode 100644 tensorflow/core/kernels/neon/BUILD
 create mode 100644 tensorflow/core/kernels/neon/depthwiseconv_float.h
 create mode 100644 tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
 create mode 100644 tensorflow/core/kernels/neon/types.h
 create mode 100644 tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index d56ab735e1..8f67ae25df 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -289,6 +289,7 @@ filegroup(
         "//tensorflow/core/grappler/utils:all_files",
         "//tensorflow/core/kernels:all_files",
         "//tensorflow/core/kernels/hexagon:all_files",
+        "//tensorflow/core/kernels/neon:all_files",
         "//tensorflow/core/ops/compat:all_files",
         "//tensorflow/core/platform/cloud:all_files",
         "//tensorflow/core/platform/default/build_config:all_files",
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index e520969fd1..803b529181 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -740,6 +740,7 @@ cc_library(
         "//tensorflow/core/kernels:array_not_windows",
         "//tensorflow/core/kernels:math_not_windows",
         "//tensorflow/core/kernels:quantized_ops",
+        "//tensorflow/core/kernels/neon:neon_depthwise_conv_op",
     ]) + if_mkl([
         "//tensorflow/core/kernels:mkl_concat_op",
         "//tensorflow/core/kernels:mkl_conv_op",
diff --git a/tensorflow/core/kernels/neon/BUILD b/tensorflow/core/kernels/neon/BUILD
new file mode 100644
index 0000000000..7641516e3b
--- /dev/null
+++ b/tensorflow/core/kernels/neon/BUILD
@@ -0,0 +1,43 @@
+# Description:
+# Kernel implementations using Neon intrinsics.
+#
+package(
+    default_visibility = ["//visibility:public"],
+    features = ["-parse_headers"],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+load(
+    "//tensorflow:tensorflow.bzl",
+    "tf_kernel_library",
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
+
+tf_kernel_library(
+    name = "neon_depthwise_conv_op",
+    hdrs = [
+        "depthwiseconv_float.h",
+        "types.h",
+    ],
+    prefix = "neon_depthwise_conv_op",
+    deps = [
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:nn_ops_op_lib",
+        "//tensorflow/core/kernels:ops_util",
+        "@gemmlowp//:gemmlowp",
+    ],
+)
diff --git a/tensorflow/core/kernels/neon/depthwiseconv_float.h b/tensorflow/core/kernels/neon/depthwiseconv_float.h
new file mode 100644
index 0000000000..acd58a644f
--- /dev/null
+++ b/tensorflow/core/kernels/neon/depthwiseconv_float.h
@@ -0,0 +1,725 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
+
+#include "public/gemmlowp.h"
+#include "tensorflow/core/kernels/neon/types.h"
+
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
+#define USE_NEON
+#include <arm_neon.h>
+#endif
+
+namespace tensorflow {
+namespace neon {
+
+// Implementation of float DepthwiseConv
+
+template <bool kAllowStrided, int kFixedInputDepth, int kFixedDepthMultiplier>
+struct FloatDepthwiseConvKernel {};
+
+#ifdef USE_NEON
+
+template <>
+struct FloatDepthwiseConvKernel<false, 8, 1> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Load the filters
+    float32x4_t filter[2];
+    for (int i = 0; i < 2; i++) {
+      filter[i] = vld1q_f32(filter_ptr + 4 * i);
+    }
+    int outp = 0;
+    // Handle 2 output pixels at a time.
+    for (; outp <= num_output_pixels - 2; outp += 2) {
+      // Load the inputs
+      float32x4_t input[4];
+      for (int i = 0; i < 4; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 16;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[4];
+      for (int i = 0; i < 4; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      acc[0] = vmlaq_f32(acc[0], input[0], filter[0]);
+      acc[1] = vmlaq_f32(acc[1], input[1], filter[1]);
+      acc[2] = vmlaq_f32(acc[2], input[2], filter[0]);
+      acc[3] = vmlaq_f32(acc[3], input[3], filter[1]);
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 4; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 16;
+    }
+    // Handle one output pixel at a time.
+    for (; outp < num_output_pixels; outp++) {
+      // Load the inputs
+      float32x4_t input[2];
+      for (int i = 0; i < 2; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 8;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[2];
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vmlaq_f32(acc[i], input[i], filter[i]);
+      }
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 2; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 8;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<false, 2, 1> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    const float32x2_t filters = vld1_f32(filter_ptr);
+    const float32x4_t filters_dup2 = vcombine_f32(filters, filters);
+    int outp = 0;
+    // Handle 8 output pixels at a time.
+    for (; outp <= num_output_pixels - 8; outp += 8) {
+      // Load the inputs
+      float32x4_t input[4];
+      for (int i = 0; i < 4; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 16;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[4];
+      for (int i = 0; i < 4; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      for (int i = 0; i < 4; i++) {
+        acc[i] = vmlaq_f32(acc[i], input[i], filters_dup2);
+      }
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 4; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 16;
+    }
+    // Handle 4 output pixels at a time.
+    for (; outp <= num_output_pixels - 4; outp += 4) {
+      // Load the inputs
+      float32x4_t input[2];
+      for (int i = 0; i < 2; i++) {
+        input[i] = vld1q_f32(input_ptr + 4 * i);
+      }
+      input_ptr += 8;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc[2];
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+      }
+      // Multiply-accumulate
+      for (int i = 0; i < 2; i++) {
+        acc[i] = vmlaq_f32(acc[i], input[i], filters_dup2);
+      }
+      // Store the accumulators back to acc_buffer
+      for (int i = 0; i < 2; i++) {
+        vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+      }
+      acc_buffer_ptr += 8;
+    }
+    // Handle 2 output pixels at a time.
+    for (; outp <= num_output_pixels - 2; outp += 2) {
+      // Load the inputs
+      const float32x4_t input = vld1q_f32(input_ptr);
+      input_ptr += 4;
+      // Load the accumulators from acc_buffer
+      float32x4_t acc = vld1q_f32(acc_buffer_ptr);
+      // Multiply-accumulate
+      acc = vmlaq_f32(acc, input, filters_dup2);
+      // Store the accumulators back to acc_buffer
+      vst1q_f32(acc_buffer_ptr, acc);
+      acc_buffer_ptr += 4;
+    }
+    // Handle 1 output pixel at a time
+    for (; outp < num_output_pixels; outp++) {
+      // Load the inputs
+      const float32x2_t input = vld1_f32(input_ptr);
+      input_ptr += 2;
+      // Load the accumulators from acc_buffer
+      float32x2_t acc = vld1_f32(acc_buffer_ptr);
+      // Multiply-accumulate
+      acc = vmla_f32(acc, input, filters);
+      // Store the accumulators back to acc_buffer
+      vst1_f32(acc_buffer_ptr, acc);
+      acc_buffer_ptr += 2;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<true, 0, 1> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Handle one output pixel at a time.
+    for (int outp = 0; outp < num_output_pixels; outp++) {
+      const float* local_filter_ptr = filter_ptr;
+      const float* local_input_ptr = input_ptr;
+      int ic = 0;
+      // Handle 16 input channels at a time.
+      for (; ic <= input_depth - 16; ic += 16) {
+        // Load the filters
+        float32x4_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 16;
+        // Load the inputs
+        float32x4_t input[4];
+        for (int i = 0; i < 4; i++) {
+          input[i] = vld1q_f32(local_input_ptr + 4 * i);
+        }
+        local_input_ptr += 16;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vmlaq_f32(acc[i], input[i], filter[i]);
+        }
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 16;
+      }
+      // Handle 4 input channels at a time.
+      for (; ic <= input_depth - 4; ic += 4) {
+        // Load the filters
+        float32x4_t filter;
+        filter = vld1q_f32(local_filter_ptr);
+        local_filter_ptr += 4;
+        // Load the inputs
+        float32x4_t input;
+        input = vld1q_f32(local_input_ptr);
+        local_input_ptr += 4;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc;
+        acc = vld1q_f32(acc_buffer_ptr);
+        // Multiply-accumulate
+        acc = vmlaq_f32(acc, input, filter);
+        // Store the accumulators back to acc_buffer
+        vst1q_f32(acc_buffer_ptr, acc);
+        acc_buffer_ptr += 4;
+      }
+      // Handle one input channel at a time.
+      for (; ic < input_depth; ic++) {
+        const float input_val = *local_input_ptr++;
+        const float filter_val = *local_filter_ptr++;
+        *acc_buffer_ptr++ += filter_val * input_val;
+      }
+      input_ptr += input_ptr_increment;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<true, 0, 8> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Handle one output pixel at a time.
+    for (int outp = 0; outp < num_output_pixels; outp++) {
+      const float* local_filter_ptr = filter_ptr;
+      const float* local_input_ptr = input_ptr;
+      int ic = 0;
+      // Handle 2 input channels at a time.
+      for (; ic <= input_depth - 2; ic += 2) {
+        // Load the filters
+        float32x4_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 16;
+        // Load the inputs
+        const float32x2_t input = vld1_f32(local_input_ptr);
+        local_input_ptr += 2;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmlaq_lane_f32(acc[0], filter[0], input, 0);
+        acc[1] = vmlaq_lane_f32(acc[1], filter[1], input, 0);
+        acc[2] = vmlaq_lane_f32(acc[2], filter[2], input, 1);
+        acc[3] = vmlaq_lane_f32(acc[3], filter[3], input, 1);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 16;
+      }
+      // Handle one input channel at a time.
+      for (; ic < input_depth; ic++) {
+        // Load the filters
+        float32x4_t filter[2];
+        for (int i = 0; i < 2; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 8;
+        // Load the inputs
+        const float input_val = *local_input_ptr++;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[2];
+        for (int i = 0; i < 2; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        for (int i = 0; i < 2; i++) {
+          acc[i] = vmlaq_n_f32(acc[i], filter[i], input_val);
+        }
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 2; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 8;
+      }
+      input_ptr += input_ptr_increment;
+    }
+  }
+};
+
+template <>
+struct FloatDepthwiseConvKernel<true, 0, 2> {
+  static void Run(int num_output_pixels, int input_depth, int depth_multiplier,
+                  const float* input_ptr, int input_ptr_increment,
+                  const float* filter_ptr, float* acc_buffer_ptr) {
+    // Handle one output pixel at a time.
+    for (int outp = 0; outp < num_output_pixels; outp++) {
+      const float* local_filter_ptr = filter_ptr;
+      const float* local_input_ptr = input_ptr;
+      int ic = 0;
+      // Handle 8 input channels at a time.
+      for (; ic <= input_depth - 8; ic += 8) {
+        // Load the filters
+        float32x4_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1q_f32(local_filter_ptr + 4 * i);
+        }
+        local_filter_ptr += 16;
+        // Load the inputs
+        float32x4x2_t input_dup2[2];
+        for (int i = 0; i < 2; i++) {
+          const float32x4_t input = vld1q_f32(local_input_ptr + 4 * i);
+          input_dup2[i] = vzipq_f32(input, input);
+        }
+        local_input_ptr += 8;
+        // Load the accumulators from acc_buffer
+        float32x4_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1q_f32(acc_buffer_ptr + 4 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmlaq_f32(acc[0], filter[0], input_dup2[0].val[0]);
+        acc[1] = vmlaq_f32(acc[1], filter[1], input_dup2[0].val[1]);
+        acc[2] = vmlaq_f32(acc[2], filter[2], input_dup2[1].val[0]);
+        acc[3] = vmlaq_f32(acc[3], filter[3], input_dup2[1].val[1]);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1q_f32(acc_buffer_ptr + 4 * i, acc[i]);
+        }
+        acc_buffer_ptr += 16;
+      }
+      // Handle 4 input channels at a time.
+      for (; ic <= input_depth - 4; ic += 4) {
+        // Load the filters
+        float32x2_t filter[4];
+        for (int i = 0; i < 4; i++) {
+          filter[i] = vld1_f32(local_filter_ptr + 2 * i);
+        }
+        local_filter_ptr += 8;
+        // Load the inputs
+        const float32x4_t input = vld1q_f32(local_input_ptr);
+        local_input_ptr += 4;
+        // Load the accumulators from acc_buffer
+        float32x2_t acc[4];
+        for (int i = 0; i < 4; i++) {
+          acc[i] = vld1_f32(acc_buffer_ptr + 2 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmla_lane_f32(acc[0], filter[0], vget_low_f32(input), 0);
+        acc[1] = vmla_lane_f32(acc[1], filter[1], vget_low_f32(input), 1);
+        acc[2] = vmla_lane_f32(acc[2], filter[2], vget_high_f32(input), 0);
+        acc[3] = vmla_lane_f32(acc[3], filter[3], vget_high_f32(input), 1);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 4; i++) {
+          vst1_f32(acc_buffer_ptr + 2 * i, acc[i]);
+        }
+        acc_buffer_ptr += 8;
+      }
+      // Handle 2 input channels at a time.
+      for (; ic <= input_depth - 2; ic += 2) {
+        // Load the filters
+        const float32x4_t filter = vld1q_f32(local_filter_ptr);
+        local_filter_ptr += 4;
+        // Load the inputs
+        const float32x2_t input = vld1_f32(local_input_ptr);
+        local_input_ptr += 2;
+        // Load the accumulators from acc_buffer
+        float32x2_t acc[2];
+        for (int i = 0; i < 2; i++) {
+          acc[i] = vld1_f32(acc_buffer_ptr + 2 * i);
+        }
+        // Multiply-accumulate
+        acc[0] = vmla_lane_f32(acc[0], vget_low_f32(filter), input, 0);
+        acc[1] = vmla_lane_f32(acc[1], vget_high_f32(filter), input, 1);
+        // Store the accumulators back to acc_buffer
+        for (int i = 0; i < 2; i++) {
+          vst1_f32(acc_buffer_ptr + 2 * i, acc[i]);
+        }
+        acc_buffer_ptr += 4;
+      }
+      // Handle one input channel at a time.
+      for (; ic < input_depth; ic++) {
+        // Load the inputs
+        const float input_val = *local_input_ptr++;
+        // Multiply-accumulate
+        for (int i = 0; i < 2; i++) {
+          acc_buffer_ptr[i] += local_filter_ptr[i] * input_val;
+        }
+        local_filter_ptr += 2;
+        acc_buffer_ptr += 2;
+      }
+      input_ptr += input_ptr_increment;
+    }
+  }
+};
+#endif
+
+// Accumulates the effect of one row of the filter, on a segment of one row
+// of the output, accessing the corresponding one row of the input.
+template <bool kAllowStrided, int kFixedInputDepth, int kFixedDepthMultiplier>
+void FloatDepthwiseConvAccumRow(int stride, int input_depth, int input_width,
+                                const float* input_data, int pad_width,
+                                int depth_multiplier, int filter_width,
+                                const float* filter_data,
+                                int out_x_buffer_start, int out_x_buffer_end,
+                                int output_depth, float* acc_buffer) {
+#ifdef GEMMLOWP_PROFILING
+  gemmlowp::ScopedProfilingLabel label(__PRETTY_FUNCTION__);
+#endif
+  // Sanity check parameters. This is important in particular to ensure
+  // that we keep the number of template instantiations minimal, so we don't
+  // increase binary size unnecessarily.
+  static_assert(kFixedDepthMultiplier || !kFixedInputDepth, "");
+  static_assert(kFixedInputDepth || kAllowStrided, "");
+  DCHECK(stride == 1 || kAllowStrided);
+  if (kFixedInputDepth) {
+    DCHECK_EQ(input_depth, kFixedInputDepth);
+  }
+  if (kFixedDepthMultiplier) {
+    DCHECK_EQ(depth_multiplier, kFixedDepthMultiplier);
+  }
+  DCHECK_EQ(output_depth, input_depth * depth_multiplier);
+  const int input_ptr_increment = stride * input_depth;
+  const float* filter_base_ptr = filter_data;
+  for (int filter_x = 0; filter_x < filter_width; ++filter_x) {
+    // For the current (filter_x, filter_y) point in the filter,
+    // compute the boundaries of the corresponding output row segment.
+    int out_x_loop_start_unclampled = 0;
+    int out_x_loop_end_unclampled = 0;
+    if (kAllowStrided) {
+      if (stride == 2) {
+        out_x_loop_start_unclampled = (pad_width - filter_x + 1) / 2;
+        out_x_loop_end_unclampled =
+            (pad_width + input_width - filter_x + 1) / 2;
+      } else if (stride == 4) {
+        out_x_loop_start_unclampled = (pad_width - filter_x + 3) / 4;
+        out_x_loop_end_unclampled =
+            (pad_width + input_width - filter_x + 3) / 4;
+      } else {
+        out_x_loop_start_unclampled =
+            (pad_width - filter_x + stride - 1) / stride;
+        out_x_loop_end_unclampled =
+            (pad_width + input_width - filter_x + stride - 1) / stride;
+      }
+    } else {
+      out_x_loop_start_unclampled = pad_width - filter_x;
+      out_x_loop_end_unclampled = pad_width + input_width - filter_x;
+    }
+    // The kernel will have to iterate on the segment of the
+    // output row that starts at out_x_loop_start and out_x_loop_end.
+    const int out_x_loop_start =
+        std::max(out_x_buffer_start, out_x_loop_start_unclampled);
+    const int out_x_loop_end =
+        std::min(out_x_buffer_end, out_x_loop_end_unclampled);
+
+    float* acc_buffer_ptr =
+        acc_buffer + (out_x_loop_start - out_x_buffer_start) * output_depth;
+    const int in_x_origin = (out_x_loop_start * stride) - pad_width + filter_x;
+    const float* input_ptr = input_data + in_x_origin * input_depth;
+    const int num_output_pixels = out_x_loop_end - out_x_loop_start;
+    FloatDepthwiseConvKernel<kAllowStrided, kFixedInputDepth,
+                             kFixedDepthMultiplier>::Run(num_output_pixels,
+                                                         input_depth,
+                                                         depth_multiplier,
+                                                         input_ptr,
+                                                         input_ptr_increment,
+                                                         filter_base_ptr,
+                                                         acc_buffer_ptr);
+    filter_base_ptr += output_depth;
+  }
+}
+
+// generic fallback of FloatDepthwiseConvAccumRow, portable, non-templatized.
+inline void FloatDepthwiseConvAccumRowGeneric(
+    int stride, int input_depth, int input_width, const float* input_data,
+    int pad_width, int depth_multiplier, int filter_width,
+    const float* filter_data, int out_x_buffer_start, int out_x_buffer_end,
+    int output_depth, float* acc_buffer) {
+  gemmlowp::ScopedProfilingLabel label("DepthwiseConvAccumRowGeneric (slow)");
+
+  VLOG(1) << "DepthwiseConv2d using slow path with "
+          << "stride = " << stride << ", "
+          << "input_depth = " << input_depth << ", "
+          << "depth_multiplier = " << depth_multiplier << ".";
+
+  const float* filter_base_ptr = filter_data;
+  for (int filter_x = 0; filter_x < filter_width; ++filter_x) {
+    const int out_x_loop_start = std::max(
+        out_x_buffer_start, (pad_width - filter_x + stride - 1) / stride);
+    const int out_x_loop_end =
+        std::min(out_x_buffer_end,
+                 (pad_width + input_width - filter_x + stride - 1) / stride);
+
+    float* acc_buffer_ptr =
+        acc_buffer + (out_x_loop_start - out_x_buffer_start) * output_depth;
+    const int in_x_origin = (out_x_loop_start * stride) - pad_width + filter_x;
+    const float* input_ptr = input_data + in_x_origin * input_depth;
+    const int input_ptr_increment = (stride - 1) * input_depth;
+    for (int out_x = out_x_loop_start; out_x < out_x_loop_end; out_x++) {
+      const float* filter_ptr = filter_base_ptr;
+      for (int ic = 0; ic < input_depth; ++ic) {
+        const float input_val = *input_ptr++;
+        for (int m = 0; m < depth_multiplier; m++) {
+          const float filter_val = *filter_ptr++;
+          *acc_buffer_ptr++ += filter_val * input_val;
+        }
+      }
+      input_ptr += input_ptr_increment;
+    }
+    filter_base_ptr += output_depth;
+  }
+}
+
+// Initializes the accumulator buffer with bias values.
+inline void DepthwiseConvInitAccBuffer(int num_output_pixels, int output_depth,
+                                       const float* bias_data,
+                                       float* acc_buffer) {
+  // TODO(benoitjacob): This might need optimized specializations
+  // for small output_depth values, if that ever becomes an important
+  // case (like it was for some quantized DepthwiseConv cases).
+  for (int i = 0; i < num_output_pixels; i++) {
+    memcpy(acc_buffer + i * output_depth, bias_data,
+           sizeof(acc_buffer[0]) * output_depth);
+  }
+}
+
+template <FusedActivationFunctionType Ac>
+void DepthwiseConv(const float* input_data, const Dims<4>& input_dims,
+                   const float* filter_data, const Dims<4>& filter_dims,
+                   const float* bias_data, const Dims<4>& bias_dims, int stride,
+                   int pad_width, int pad_height, int depth_multiplier,
+                   float* output_data, const Dims<4>& output_dims) {
+  gemmlowp::ScopedProfilingLabel label("DepthwiseConv");
+  static_assert(Ac == FusedActivationFunctionType::kNone ||
+                    Ac == FusedActivationFunctionType::kRelu ||
+                    Ac == FusedActivationFunctionType::kRelu6 ||
+                    Ac == FusedActivationFunctionType::kRelu1,
+                "");
+  const int batches = MatchingArraySize(input_dims, 3, output_dims, 3);
+  const int output_depth = MatchingArraySize(filter_dims, 0, output_dims, 0);
+  const int input_height = ArraySize(input_dims, 2);
+  const int input_width = ArraySize(input_dims, 1);
+  const int input_depth = ArraySize(input_dims, 0);
+  const int filter_height = ArraySize(filter_dims, 2);
+  const int filter_width = ArraySize(filter_dims, 1);
+  const int output_height = ArraySize(output_dims, 2);
+  const int output_width = ArraySize(output_dims, 1);
+  DCHECK(output_depth == input_depth * depth_multiplier);
+
+  static const int kAccBufferMaxSize = 1024;
+  float acc_buffer[kAccBufferMaxSize];
+  DCHECK_GE(kAccBufferMaxSize, output_depth)
+      << "Too small kAccBufferMaxSize for this model!";
+  const int kOutputPixelsInAccBuffer = kAccBufferMaxSize / output_depth;
+  const int kAccBufferActualSize = kOutputPixelsInAccBuffer * output_depth;
+  DCHECK_LE(kOutputPixelsInAccBuffer * output_depth, kAccBufferActualSize);
+  DCHECK_LE(kAccBufferActualSize, kAccBufferMaxSize);
+  DCHECK_GE(kOutputPixelsInAccBuffer, 1);
+
+  // row_accum_func will point to the core accumulation function to be used
+  // for this DepthwiseConv op.
+  auto* row_accum_func = FloatDepthwiseConvAccumRowGeneric;
+
+  const int kMaxFixedDepthMultiplier = 8;
+  int fixed_depth_multiplier = 0;
+  if (depth_multiplier <= kMaxFixedDepthMultiplier) {
+    fixed_depth_multiplier = depth_multiplier;
+  }
+  // kMaxUnrolling is the max number of output values that we aim to handle
+  // in one unrolled iteration of the inner loop. For practical performance
+  // reasons, it is limited by the number of available registers. We could
+  // fine-tune it depending on the architecture, but that's not worth doing
+  // since this whole code is not very optimized to begin with. The
+  // present value reflects what's realistic on ARM 32bit NEON with 16 128-bit
+  // vector registers.
+  const int kMaxUnrolling = 8;
+  int fixed_input_depth = 0;
+  if (fixed_depth_multiplier &&
+      input_depth * fixed_depth_multiplier <= kMaxUnrolling) {
+    fixed_input_depth = input_depth;
+  }
+#define TF_NEON_USE_DEPTHWISECONV_KERNEL(ALLOW_STRIDED, FIXED_INPUT_DEPTH, \
+                                         FIXED_DEPTH_MULTIPLIER)           \
+  if ((stride == 1 || ALLOW_STRIDED) &&                                    \
+      fixed_input_depth == FIXED_INPUT_DEPTH &&                            \
+      fixed_depth_multiplier == FIXED_DEPTH_MULTIPLIER) {                  \
+    row_accum_func =                                                       \
+        FloatDepthwiseConvAccumRow<ALLOW_STRIDED, FIXED_INPUT_DEPTH,       \
+                                   FIXED_DEPTH_MULTIPLIER>;                \
+  }
+
+#ifdef USE_NEON
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 1)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 8)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(true, 0, 2)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(false, 8, 1)
+  TF_NEON_USE_DEPTHWISECONV_KERNEL(false, 2, 1)
+#endif  // USE_NEON
+
+#undef TF_NEON_USE_DEPTHWISECONV_KERNEL
+
+  // Now that we have determined row_accum_func, we can start work.
+  float* output_ptr = output_data;
+  for (int b = 0; b < batches; ++b) {
+    for (int out_y = 0; out_y < output_height; ++out_y) {
+      const int in_y_origin = (out_y * stride) - pad_height;
+      const int filter_y_start = std::max(0, -in_y_origin);
+      const int filter_y_end =
+          std::min(filter_height, input_height - in_y_origin);
+      for (int out_x_buffer_start = 0; out_x_buffer_start < output_width;
+           out_x_buffer_start += kOutputPixelsInAccBuffer) {
+        const int out_x_buffer_end = std::min(
+            output_width, out_x_buffer_start + kOutputPixelsInAccBuffer);
+        // We call a 'pixel' a group of activation that share all but the
+        // 'depth'/'channel' coordinate. num_output_pixels is the number of
+        // output pixels that we will accumulate in this loop iteration.
+        const int num_output_pixels = out_x_buffer_end - out_x_buffer_start;
+        // Initialize our local accumulator with the bias values, so we don't
+        // have to add them later.
+        DepthwiseConvInitAccBuffer(num_output_pixels, output_depth, bias_data,
+                                   acc_buffer);
+        // Accumulation loop. Most of the time should be spent in here.
+        for (int filter_y = filter_y_start; filter_y < filter_y_end;
+             ++filter_y) {
+          const int in_y = in_y_origin + filter_y;
+          row_accum_func(stride, input_depth, input_width,
+                         input_data + in_y * input_dims.strides[2] +
+                             b * input_dims.strides[3],
+                         pad_width, depth_multiplier, filter_width,
+                         filter_data + filter_y * filter_dims.strides[2],
+                         out_x_buffer_start, out_x_buffer_end, output_depth,
+                         acc_buffer);
+        }
+        // Finished accumulating. Now store to destination.
+        const int num_output_values = output_depth * num_output_pixels;
+        int i = 0;
+// TODO(benoitjacob) optimized code goes here
+#ifdef USE_NEON
+        // Handle 16 values at a time
+        for (; i <= num_output_values - 16; i += 16) {
+          float32x4_t acc[4];
+          for (int k = 0; k < 4; k++) {
+            acc[k] = vld1q_f32(acc_buffer + i + 4 * k);
+          }
+          if (Ac == FusedActivationFunctionType::kRelu) {
+            for (int k = 0; k < 4; k++) {
+              acc[k] = vmaxq_f32(vdupq_n_f32(0.f), acc[k]);
+            }
+          } else if (Ac == FusedActivationFunctionType::kRelu6) {
+            for (int k = 0; k < 4; k++) {
+              acc[k] = vmaxq_f32(vdupq_n_f32(0.f),
+                                 vminq_f32(vdupq_n_f32(6.f), acc[k]));
+            }
+          } else if (Ac == FusedActivationFunctionType::kRelu1) {
+            for (int k = 0; k < 4; k++) {
+              acc[k] = vmaxq_f32(vdupq_n_f32(-1.f),
+                                 vminq_f32(vdupq_n_f32(1.f), acc[k]));
+            }
+          }
+          for (int k = 0; k < 4; k++) {
+            vst1q_f32(output_ptr + 4 * k, acc[k]);
+          }
+          output_ptr += 16;
+        }
+        // Handle 4 values at a time
+        for (; i <= num_output_values - 4; i += 4) {
+          float32x4_t acc = vld1q_f32(acc_buffer + i);
+          if (Ac == FusedActivationFunctionType::kRelu) {
+            acc = vmaxq_f32(vdupq_n_f32(0.f), acc);
+          } else if (Ac == FusedActivationFunctionType::kRelu6) {
+            acc = vmaxq_f32(vdupq_n_f32(0.f), vminq_f32(vdupq_n_f32(6.f), acc));
+          } else if (Ac == FusedActivationFunctionType::kRelu1) {
+            acc =
+                vmaxq_f32(vdupq_n_f32(-1.f), vminq_f32(vdupq_n_f32(1.f), acc));
+          }
+          vst1q_f32(output_ptr, acc);
+          output_ptr += 4;
+        }
+#endif
+        // Handle leftover values, one by one. This is very slow.
+        for (; i < num_output_values; i++) {
+          float acc = acc_buffer[i];
+          if (Ac == FusedActivationFunctionType::kRelu) {
+            acc = std::max(0.f, acc);
+          } else if (Ac == FusedActivationFunctionType::kRelu6) {
+            acc = std::max(0.f, std::min(6.f, acc));
+          } else if (Ac == FusedActivationFunctionType::kRelu1) {
+            acc = std::max(-1.f, std::min(1.f, acc));
+          }
+          *output_ptr++ = acc;
+        }
+      }
+    }
+  }
+}
+
+}  // end namespace neon
+}  // end namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_DEPTHWISECONV_H_
diff --git a/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc b/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
new file mode 100644
index 0000000000..818b44aab3
--- /dev/null
+++ b/tensorflow/core/kernels/neon/neon_depthwise_conv_op.cc
@@ -0,0 +1,203 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include <algorithm>
+#include <cmath>
+#include <type_traits>
+
+#define GEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK
+#include "public/gemmlowp.h"
+#include "tensorflow/core/framework/numeric_op.h"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/kernels/neon/depthwiseconv_float.h"
+#include "tensorflow/core/kernels/ops_util.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/mem.h"
+#include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/util/padding.h"
+
+namespace tensorflow {
+
+// A version of tensorflow/core/kernels/depthwise_conv_op.cc that
+// uses the neon intrinsics.
+class NeonDepthwiseConv2dNativeOp : public BinaryOp<float> {
+ public:
+  explicit NeonDepthwiseConv2dNativeOp(OpKernelConstruction* context)
+      : BinaryOp<float>(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("strides", &strides_));
+    OP_REQUIRES(context, strides_.size() == 4,
+                errors::InvalidArgument("Sliding window strides field must "
+                                        "specify 4 dimensions"));
+    OP_REQUIRES(context, strides_[1] == strides_[2],
+                errors::InvalidArgument(
+                    "Current implementation only supports equal length "
+                    "strides in the row and column dimensions."));
+    OP_REQUIRES(
+        context, (strides_[0] == 1 && strides_[3] == 1),
+        errors::InvalidArgument("Current implementation does not yet support "
+                                "strides in the batch and depth dimensions."));
+    OP_REQUIRES_OK(context, context->GetAttr("padding", &padding_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& input = context->input(0);
+    const Tensor& filter = context->input(1);
+
+    // For 2D convolution, there should be 4 dimensions.
+    OP_REQUIRES(context, input.dims() == 4,
+                errors::InvalidArgument("input must be 4-dimensional",
+                                        input.shape().DebugString()));
+    OP_REQUIRES(context, filter.dims() == 4,
+                errors::InvalidArgument("filter must be 4-dimensional: ",
+                                        filter.shape().DebugString()));
+
+    const int32 in_depth = input.dim_size(3);
+    OP_REQUIRES(
+        context, in_depth == filter.dim_size(2),
+        errors::InvalidArgument("input and filter must have the same depth: ",
+                                in_depth, " vs ", filter.dim_size(2)));
+    const int32 batch = input.dim_size(0);
+    const int32 input_rows = input.dim_size(1);
+    const int32 input_cols = input.dim_size(2);
+
+    const int32 filter_rows = filter.dim_size(0);
+    const int32 filter_cols = filter.dim_size(1);
+    const int32 depth_multiplier = filter.dim_size(3);
+
+    const int32 out_depth = in_depth * depth_multiplier;
+
+    const int32 stride = strides_[1];
+
+    int64 out_rows = 0, out_cols = 0, pad_rows = 0, pad_cols = 0;
+    OP_REQUIRES_OK(context,
+                   GetWindowedOutputSize(input_rows, filter_rows, stride,
+                                         padding_, &out_rows, &pad_rows));
+    OP_REQUIRES_OK(context,
+                   GetWindowedOutputSize(input_cols, filter_cols, stride,
+                                         padding_, &out_cols, &pad_cols));
+    TensorShape out_shape({batch, out_rows, out_cols, out_depth});
+    OP_REQUIRES(
+        context, out_shape.num_elements() <= 2147483647,
+        errors::InvalidArgument("total number of outputs should be within the "
+                                "range of int which is used in the GPU kernel",
+                                in_depth, " vs ", filter.dim_size(2)));
+
+    // Output tensor is of the following dimensions:
+    // [ in_batch, out_rows, out_cols, out_depth ]
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(context, context->allocate_output(0, out_shape, &output));
+
+    VLOG(2) << "NeonDepthwiseConv2dNative: "
+            << " Input: [" << batch << ", " << input_rows << ", " << input_cols
+            << ", " << in_depth << "]; Filter: [" << filter_rows << ", "
+            << filter_cols << ", " << in_depth << ", " << depth_multiplier
+            << "]; stride = " << stride << ", pad_rows = " << pad_rows
+            << ", pad_cols = " << pad_cols << ", output: [" << batch << ", "
+            << out_rows << ", " << out_cols << ", " << out_depth << "]";
+
+    // If there is nothing to compute, return.
+    if (out_shape.num_elements() == 0) {
+      return;
+    }
+
+    const float* input_ptr = input.template flat<float>().data();
+    const float* filter_ptr = filter.template flat<float>().data();
+    float* output_ptr = output->template flat<float>().data();
+
+    auto input_neon_dims = ToNeonDims(input.shape());
+    auto filter_neon_dims = FilterToNeonDims(filter.shape());
+    auto bias_neon_dims = BiasNeonDims(filter.shape());
+
+    int64 bias_size = bias_neon_dims.sizes[0];
+    float* bias_ptr = static_cast<float*>(port::AlignedMalloc(
+        bias_size * sizeof(float), Allocator::kAllocatorAlignment));
+    memset(bias_ptr, 0, bias_size * sizeof(float));
+
+    neon::DepthwiseConv<neon::FusedActivationFunctionType::kNone>(
+        input_ptr, input_neon_dims, filter_ptr, filter_neon_dims, bias_ptr,
+        bias_neon_dims, stride, pad_cols, pad_rows, depth_multiplier,
+        output_ptr, ToNeonDims(out_shape));
+
+    port::AlignedFree(bias_ptr);
+  }
+
+ private:
+  void SetNeonDimStrides(neon::Dims<4>* d) {
+    int64 stride = 1;
+    for (int i = 0; i < 4; ++i) {
+      d->strides[i] = stride;
+      stride *= d->sizes[i];
+    }
+  }
+
+  neon::Dims<4> ToNeonDims(const TensorShape& input) {
+    // Dims in the neon kernels are channel, x, y, batch order.
+    neon::Dims<4> result;
+    result.sizes[0] = input.dim_size(3);
+    result.sizes[1] = input.dim_size(2);
+    result.sizes[2] = input.dim_size(1);
+    result.sizes[3] = input.dim_size(0);
+    SetNeonDimStrides(&result);
+    return result;
+  }
+
+  neon::Dims<4> FilterToNeonDims(const TensorShape& filter) {
+    // Dims in the neon kernels are channel, x, y, batch order.
+    neon::Dims<4> result;
+    result.sizes[0] = filter.dim_size(2) * filter.dim_size(3);
+    result.sizes[1] = filter.dim_size(1);
+    result.sizes[2] = filter.dim_size(0);
+    result.sizes[3] = 1;
+    SetNeonDimStrides(&result);
+
+    return result;
+  }
+
+  neon::Dims<4> BiasNeonDims(const TensorShape& filter) {
+    // Dims in the neon kernels are channel, x, y, batch order.
+    // Bias has only output channel set.
+    neon::Dims<4> result;
+    result.sizes[0] =
+        filter.dim_size(2) * filter.dim_size(3);  // output channels
+    result.sizes[1] = 1;
+    result.sizes[2] = 1;
+    result.sizes[3] = 1;
+    SetNeonDimStrides(&result);
+
+    return result;
+  }
+
+  std::vector<int32> strides_;
+  Padding padding_;
+
+  TF_DISALLOW_COPY_AND_ASSIGN(NeonDepthwiseConv2dNativeOp);
+};
+
+#define REGISTER_CPU_KERNEL(T)                            \
+  REGISTER_KERNEL_BUILDER(Name("DepthwiseConv2dNative")   \
+                              .Device(DEVICE_CPU)         \
+                              .TypeConstraint<float>("T") \
+                              .Label("neon"),             \
+                          NeonDepthwiseConv2dNativeOp);
+
+TF_CALL_float(REGISTER_CPU_KERNEL);
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/neon/types.h b/tensorflow/core/kernels/neon/types.h
new file mode 100644
index 0000000000..e258ee0dfb
--- /dev/null
+++ b/tensorflow/core/kernels/neon/types.h
@@ -0,0 +1,71 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
+
+namespace tensorflow {
+namespace neon {
+
+enum class FusedActivationFunctionType { kNone, kRelu6, kRelu1, kRelu };
+
+template <int N>
+struct Dims {
+  int sizes[N];
+  int strides[N];
+};
+
+inline int Offset(const Dims<4>& dims, int i0, int i1, int i2, int i3) {
+  DCHECK(i0 >= 0 && i0 < dims.sizes[0]);
+  DCHECK(i1 >= 0 && i1 < dims.sizes[1]);
+  DCHECK(i2 >= 0 && i2 < dims.sizes[2]);
+  DCHECK(i3 >= 0 && i3 < dims.sizes[3]);
+  return i0 * dims.strides[0] + i1 * dims.strides[1] + i2 * dims.strides[2] +
+         i3 * dims.strides[3];
+}
+
+// Get array size, DCHECKing that the dim index is in range.
+template <int N>
+int ArraySize(const Dims<N>& array, int index) {
+  DCHECK(index >= 0 && index < N);
+  return array.sizes[index];
+}
+
+// Get common array size, DCHECKing that they all agree.
+template <typename ArrayType1, typename ArrayType2>
+int MatchingArraySize(const ArrayType1& array1, int index1,
+                      const ArrayType2& array2, int index2) {
+  DCHECK_EQ(ArraySize(array1, index1), ArraySize(array2, index2));
+  return ArraySize(array1, index1);
+}
+
+template <typename ArrayType1, typename ArrayType2, typename... Args>
+int MatchingArraySize(const ArrayType1& array1, int index1,
+                      const ArrayType2& array2, int index2, Args... args) {
+  DCHECK_EQ(ArraySize(array1, index1), ArraySize(array2, index2));
+  return MatchingArraySize(array1, index1, args...);
+}
+
+inline int RequiredBufferSizeForDims(const Dims<4>& dims) {
+  int max_offset = 0;
+  for (int i = 0; i < 4; i++) {
+    max_offset += (dims.sizes[i] - 1) * dims.strides[i];
+  }
+  return max_offset + 1;
+}
+
+}  // end namespace neon
+}  // end namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_KERNELS_NEON_TYPES_H_
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 56ebc796f9..369cefe427 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2092,6 +2092,21 @@ cuda_py_test(
     ],
 )
 
+tf_py_test(
+    name = "neon_depthwise_conv_op_test",
+    size = "medium",
+    srcs = ["neon_depthwise_conv_op_test.py"],
+    additional_deps = [
+        "//third_party/py/numpy",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:nn",
+        "//tensorflow/python:nn_grad",
+        "//tensorflow/python:nn_ops",
+    ],
+)
+
 cuda_py_test(
     name = "division_future_test",
     size = "medium",
diff --git a/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py b/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py
new file mode 100644
index 0000000000..30795eed8a
--- /dev/null
+++ b/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py
@@ -0,0 +1,287 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Functional tests for neon kernel for depthwise convolutional operations."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import nn_impl
+from tensorflow.python.ops import nn_ops
+import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
+from tensorflow.python.platform import test
+
+
+def ConfigsToTest():
+  """Iterator for different convolution shapes, strides and paddings.
+
+  Yields:
+    Tuple (input_size, filter_size, out_size, stride, padding), the depthwise
+    convolution parameters.
+  """
+  input_sizes = [[4, 5, 5, 48], [4, 8, 8, 84], [4, 17, 17, 48], [4, 35, 35, 2],
+                 [4, 147, 147, 2], [3, 299, 299, 3], [5, 183, 183, 1]]
+  filter_sizes = [[1, 1, 48, 2], [1, 3, 84, 1], [3, 1, 48, 4], [5, 5, 2, 1],
+                  [3, 3, 2, 8], [2, 2, 3, 8], [5, 5, 1, 2]]
+  out_sizes = [[4, 5, 5, 96], [4, 8, 8, 84], [4, 17, 17, 192], [4, 35, 35, 2],
+               [4, 49, 49, 16], [3, 150, 150, 24], [5, 92, 92, 2]]
+  strides = [1, 1, 1, 1, 3, 2, 2]
+  # pylint: disable=invalid-name
+  VALID = "VALID"
+  SAME = "SAME"
+  # pylint: enable=invalid-name
+  paddings = [SAME, SAME, SAME, SAME, VALID, SAME, SAME, SAME]
+  for i, f, o, s, p in zip(input_sizes, filter_sizes, out_sizes, strides,
+                           paddings):
+    yield i, f, o, s, p
+
+
+def CheckGradConfigsToTest():
+  """Iterator for different convolution shapes, strides and paddings.
+
+  compute_gradient_error() is very expensive. So the configs should be
+  relatively small.
+
+  Yields:
+    Tuple (input_size, filter_size, out_size, stride, padding), the depthwise
+    convolution parameters.
+  """
+  input_sizes = [[2, 5, 8, 1], [4, 5, 5, 1], [2, 4, 4, 2], [1, 15, 15, 2],
+                 [2, 15, 16, 1]]
+  filter_sizes = [[4, 4, 1, 2], [2, 2, 1, 2], [3, 1, 2, 2], [1, 3, 2, 1],
+                  [3, 3, 1, 2]]
+  out_sizes = [[2, 5, 8, 2], [4, 2, 2, 2], [2, 4, 4, 4], [1, 15, 15, 2],
+               [2, 5, 5, 2]]
+  strides = [1, 2, 1, 1, 3]
+  # pylint: disable=invalid-name
+  VALID = "VALID"
+  SAME = "SAME"
+  # pylint: enable=invalid-name
+  paddings = [SAME, VALID, SAME, SAME, VALID]
+  for i, f, o, s, p in zip(input_sizes, filter_sizes, out_sizes, strides,
+                           paddings):
+    yield i, f, o, s, p
+
+
+class DepthwiseConv2DTest(test.TestCase):
+
+  # This is testing that depthwise_conv2d and depthwise_conv2d_native
+  # produce the same results.  It also tests that NCHW and NWHC
+  # formats agree, by comparing the depthwise_conv2d_native with
+  # 'NCHW' format (with transposition) matches the 'NHWC' format using
+  # the higher level interface.
+  def _VerifyValues(self,
+                    tensor_in_sizes,
+                    filter_in_sizes,
+                    stride,
+                    padding,
+                    use_gpu,
+                    data_format="NHWC"):
+    """Verifies the output values of the convolution function.
+
+    Args:
+      tensor_in_sizes: Input tensor dimensions in
+        [batch, input_rows, input_cols, input_depth].
+      filter_in_sizes: Filter tensor dimensions in
+        [filter_rows, filter_cols, input_depth, depth_multiplier].
+      stride: Stride.
+      padding: Padding type.
+      use_gpu: Whether to use GPU.
+      data_format: The data_format of the input.  "NHWC" or "NCHW".
+    """
+    total_size_1 = 1
+    total_size_2 = 1
+    for s in tensor_in_sizes:
+      total_size_1 *= s
+    for s in filter_in_sizes:
+      total_size_2 *= s
+    # Initializes the input and filter tensor with numbers incrementing from 1.
+    x1 = [f * 1.0 for f in range(1, total_size_1 + 1)]
+    x2 = [f * 1.0 for f in range(1, total_size_2 + 1)]
+    with self.test_session(use_gpu=use_gpu) as sess:
+      with sess.graph._kernel_label_map({"DepthwiseConv2dNative": "neon"}):
+        t1 = constant_op.constant(x1, shape=tensor_in_sizes)
+        t1.set_shape(tensor_in_sizes)
+        t2 = constant_op.constant(x2, shape=filter_in_sizes)
+
+      native_t1 = t1
+      strides = [1, stride, stride, 1]
+      if data_format == "NCHW":
+        # Transpose from NWHC input to NCHW
+        # Ex. [4, 5, 5, 48] to [4, 48, 5, 5]
+        native_t1 = array_ops.transpose(t1, [0, 3, 1, 2])
+        strides = [1, 1, stride, stride]
+
+      conv_native = nn_ops.depthwise_conv2d_native(
+          native_t1,
+          t2,
+          strides=strides,
+          data_format=data_format,
+          padding=padding)
+
+      if data_format == "NCHW":
+        # Transpose back from NCHW to NHWC
+        conv_native = array_ops.transpose(conv_native, [0, 2, 3, 1])
+
+      conv_interface = nn_impl.depthwise_conv2d(
+          t1, t2, strides=[1, stride, stride, 1], padding=padding)
+
+      native_result = sess.run(conv_native)
+      interface_result = sess.run(conv_interface)
+
+    print("depthwise conv_2d: ", tensor_in_sizes, "*", filter_in_sizes,
+          ", stride:", stride, ", padding: ", padding, ", max diff: ",
+          np.amax(np.absolute(native_result - interface_result)))
+    self.assertArrayNear(
+        np.ravel(native_result), np.ravel(interface_result), 1e-5)
+    self.assertShapeEqual(native_result, conv_native)
+    self.assertShapeEqual(native_result, conv_interface)
+
+  def testDepthwiseConv2D(self):
+    for index, (input_size, filter_size, _, stride,
+                padding) in enumerate(ConfigsToTest()):
+      print("Processing ", index, "th config.")
+      if index == 2:
+        self._VerifyValues(
+            input_size, filter_size, stride, padding, use_gpu=True)
+      self._VerifyValues(
+          input_size, filter_size, stride, padding, use_gpu=False)
+
+  def testDepthwiseConv2DFormat(self):
+    if not test.is_gpu_available():
+      return
+
+    for index, (input_size, filter_size, _, stride,
+                padding) in enumerate(ConfigsToTest()):
+      print("Processing ", index, "th config.")
+      self._VerifyValues(
+          input_size,
+          filter_size,
+          stride,
+          padding,
+          use_gpu=True,
+          data_format="NCHW")
+
+# This is testing against hand calculated results.
+
+  def _VerifyHandValues(self, tensor_in_sizes, filter_in_sizes, stride, padding,
+                        expected, use_gpu):
+    """Verifies the output values of the depthwise convolution function.
+
+    Args:
+      tensor_in_sizes: Input tensor dimensions in
+        [batch, input_rows, input_cols, input_depth].
+      filter_in_sizes: Filter tensor dimensions in
+        [filter_rows, filter_cols, input_depth, depth_multiplier].
+      stride: Stride.
+      padding: Padding type.
+      expected: An array containing the expected operation outputs.
+      use_gpu: Whether to use GPU.
+    """
+    total_size_1 = 1
+    total_size_2 = 1
+    for s in tensor_in_sizes:
+      total_size_1 *= s
+    for s in filter_in_sizes:
+      total_size_2 *= s
+    # Initializes the input tensor with array containing incrementing
+    # numbers from 1.
+    x1 = [f * 1.0 for f in range(1, total_size_1 + 1)]
+    x2 = [f * 1.0 for f in range(1, total_size_2 + 1)]
+    with self.test_session(use_gpu=use_gpu) as sess:
+      with sess.graph._kernel_label_map({"DepthwiseConv2dNative": "neon"}):
+        t1 = constant_op.constant(x1, shape=tensor_in_sizes)
+        t1.set_shape(tensor_in_sizes)
+        t2 = constant_op.constant(x2, shape=filter_in_sizes)
+        conv = nn_ops.depthwise_conv2d_native(
+            t1, t2, strides=[1, stride, stride, 1], padding=padding)
+        value = sess.run(conv)
+    print("value = ", value)
+    self.assertArrayNear(expected, np.ravel(value), 1e-5)
+    self.assertShapeEqual(value, conv)
+
+  def testConv2D2x2Filter(self):
+    # The inputs look like this (it's a 3 x 2 matrix, each of depth 2):
+    #
+    # [ (1.0, 2.0), (3.0,  4.0), ( 5.0,  6.0) ]
+    # [ (7.0, 8.0), (9.0, 10.0), (11.0, 12.0) ]
+    #  We can view this as two inputs
+    #
+    #  input depth 0:
+    #
+    #  [ 1.0,  3.0,  5.0 ]
+    #  [ 7.0,  9.0, 11.0 ]
+    #
+    #  input depth 1:
+    #
+    #  [ 2.0,  4.0,  6.0 ]
+    #  [ 8.0, 10.0, 12.0 ]
+    #
+    # The filter looks like this (it has two 2 x 2 patches, each generating 2
+    # depths):
+    #
+    #  filter #0:
+    #
+    #  [ (1.0,  3.0), ( 5.0,  7.0)]
+    #  [ (9.0, 11.0), (13.0, 15.0)]
+    #
+    #  filter #1:
+    #
+    #  [ ( 2.0,  4.0), ( 6.0,  8.0)]
+    #  [ (10.0, 12.0), (14.0, 16.0)]
+    #
+    # So the outputs are:
+    #
+    # (position 0, 0: in_depth 0, output_depth 0 -- using filter #0)
+    #  1.0 * 1.0 + 7.0 * 9.0 + 3.0 * 5.0 + 9.0 * 13.0 = 196
+    # (position 0, 0: in_depth 0, output_depth 1 -- using filter #1)
+    #  1.0 * 2.0 + 7.0 * 10.0 + 3.0 * 6.0 + 9.0 * 14.0 = 216
+    # (position 0, 0: in_depth 1, output_depth 2 -- using filter #0)
+    #  2.0 * 3.0 + 8.0 * 11.0 + 4.0 * 7.0 + 10.0 * 15.0 = 272
+    # (position 0, 0: in_depth 1, output_depth 3 -- using filter #1)
+    #  2.0 * 4.0 + 8.0 * 12.0 + 4.0 * 8.0 + 10.0 * 16.0 = 296
+    #
+    # (position 1, 0: in_depth 0, output_depth 0 -- using filter #0)
+    #  3.0 * 1.0 + 9.0 * 9.0 + 5.0 * 5.0 + 11.0 * 13.0 = 252
+    # (position 1, 0: in_depth 0, output_depth 1 -- using filter #1)
+    #  3.0 * 2.0 + 9.0 * 10.0 + 5.0 * 6.0 + 11.0 * 14.0 = 280
+    # (position 1, 0: in_depth 1, output_depth 2 -- using filter #0)
+    #  4.0 * 3.0 + 10.0 * 11.0 + 6.0 * 7.0 + 12.0 * 15.0 = 344
+    # (position 1, 0: in_depth 1, output_depth 3 -- using filter #1)
+    #  4.0 * 4.0 + 10.0 * 12.0 + 6.0 * 8.0 + 12.0 * 16.0 = 376
+    expected_output = [196, 216, 272, 296, 252, 280, 344, 376]
+    self._VerifyHandValues(
+        tensor_in_sizes=[1, 2, 3, 2],
+        filter_in_sizes=[2, 2, 2, 2],
+        stride=1,
+        padding="VALID",
+        expected=expected_output,
+        use_gpu=False)
+
+    self._VerifyHandValues(
+        tensor_in_sizes=[1, 2, 3, 2],
+        filter_in_sizes=[2, 2, 2, 2],
+        stride=1,
+        padding="VALID",
+        expected=expected_output,
+        use_gpu=True)
+
+
+if __name__ == "__main__":
+  test.main()
-- 
GitLab


From 40255434c66b19ccabf23c9a451dd727512a2dd6 Mon Sep 17 00:00:00 2001
From: Martin Wicke <wicke@google.com>
Date: Wed, 17 May 2017 11:47:42 -0700
Subject: [PATCH 1457/1563] Deprecate contrib/learn/dataframe. To be removed
 June 15.

PiperOrigin-RevId: 156333930
---
 .../learn/python/learn/dataframe/dataframe.py |  3 +++
 .../python/learn/dataframe/estimator_utils.py |  2 ++
 .../dataframe/queues/feeding_functions.py     | 11 ++++++---
 .../dataframe/queues/feeding_queue_runner.py  | 12 +++++++---
 .../learn/python/learn/dataframe/series.py    |  4 ++++
 .../learn/python/learn/dataframe/transform.py |  3 +++
 tensorflow/contrib/training/BUILD             |  2 ++
 tensorflow/contrib/training/__init__.py       |  7 +++---
 .../python/training/feeding_queue_runner.py   | 24 +++++++++++++++++++
 9 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 tensorflow/contrib/training/python/training/feeding_queue_runner.py

diff --git a/tensorflow/contrib/learn/python/learn/dataframe/dataframe.py b/tensorflow/contrib/learn/python/learn/dataframe/dataframe.py
index dd836c1dec..cc08a47c39 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/dataframe.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/dataframe.py
@@ -24,10 +24,13 @@ import collections
 from .series import Series
 from .transform import Transform
 
+from tensorflow.python.util.deprecation import deprecated
+
 
 class DataFrame(object):
   """A DataFrame is a container for ingesting and preprocessing data."""
 
+  @deprecated("2017-06-15", "contrib/learn/dataframe/** is deprecated.")
   def __init__(self):
     self._columns = {}
 
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/estimator_utils.py b/tensorflow/contrib/learn/python/learn/dataframe/estimator_utils.py
index 0ca8afe498..377299ed57 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/estimator_utils.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/estimator_utils.py
@@ -24,6 +24,7 @@ from tensorflow.contrib.learn.python.learn.dataframe import series as ss
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
 from tensorflow.python.ops import parsing_ops
+from tensorflow.python.util.deprecation import deprecated
 
 
 def _to_feature_spec(tensor, default_value=None):
@@ -89,6 +90,7 @@ def _build_alternate_universe(
   return new_feature_series_dict, feature_specs
 
 
+@deprecated("2017-06-15", "contrib/learn/dataframe/** is deprecated.")
 def to_feature_columns_and_input_fn(dataframe,
                                     base_input_keys_with_defaults,
                                     feature_keys,
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
index dfe08bb863..c3ac4ad84d 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_functions.py
@@ -18,12 +18,17 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-
 # pylint: disable=unused-import
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _ArrayFeedFn
-from tensorflow.python.estimator.inputs.queues.feeding_functions import _enqueue_data as enqueue_data
+from tensorflow.python.estimator.inputs.queues.feeding_functions import _enqueue_data
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _OrderedDictNumpyFeedFn
 from tensorflow.python.estimator.inputs.queues.feeding_functions import _PandasFeedFn
-from tensorflow.python.estimator.inputs.queues.feeding_functions import _GeneratorFeedFn
 # pylint: enable=unused-import
+
+from tensorflow.python.util.deprecation import deprecated
+
+
+@deprecated('2017-06-15', 'Moved to tf.contrib.training.enqueue_data.')
+def enqueue_data(*args, **kwargs):
+  return _enqueue_data(*args, **kwargs)
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_queue_runner.py b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_queue_runner.py
index d055555b01..4f6a4b82a6 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_queue_runner.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/queues/feeding_queue_runner.py
@@ -19,6 +19,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-# pylint: disable=unused-import
-from tensorflow.python.estimator.inputs.queues.feeding_queue_runner import _FeedingQueueRunner as FeedingQueueRunner
-# pylint: enable=unused-import
+from tensorflow.python.estimator.inputs.queues.feeding_queue_runner import _FeedingQueueRunner
+from tensorflow.python.util.deprecation import deprecated
+
+
+class FeedingQueueRunner(_FeedingQueueRunner):
+
+  @deprecated('2017-06-15', 'Moved to tf.contrib.training.FeedingQueueRunner.')
+  def __init__(self, *args, **kwargs):
+    super(FeedingQueueRunner, self).__init__(*args, **kwargs)
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/series.py b/tensorflow/contrib/learn/python/learn/dataframe/series.py
index 5893db3aad..39ffcd7469 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/series.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/series.py
@@ -20,6 +20,8 @@ from __future__ import print_function
 
 from abc import ABCMeta
 
+from tensorflow.python.util.deprecation import deprecated
+
 
 class Series(object):
   """A single output series.
@@ -106,6 +108,7 @@ class Series(object):
 class PredefinedSeries(Series):
   """A `Series` that requires the cache to already map a given name."""
 
+  @deprecated("2017-06-15", "contrib/learn/dataframe/** is deprecated.")
   def __init__(self, name, feature_spec):
     super(PredefinedSeries, self).__init__()
     self._name = name
@@ -144,6 +147,7 @@ class PredefinedSeries(Series):
 class TransformedSeries(Series):
   """A `Series` that results from applying a `Transform` to a list of inputs."""
 
+  @deprecated("2017-06-15", "contrib/learn/dataframe/** is deprecated.")
   def __init__(self, input_series, transform, output_name):
     super(TransformedSeries, self).__init__()
     self._input_series = input_series
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/transform.py b/tensorflow/contrib/learn/python/learn/dataframe/transform.py
index 33be68e46a..c04eea4a22 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/transform.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/transform.py
@@ -29,6 +29,7 @@ from .series import Series
 from .series import TransformedSeries
 
 from tensorflow.python.util import tf_inspect
+from tensorflow.python.util.deprecation import deprecated
 
 
 def _make_list_of_series(x):
@@ -87,6 +88,7 @@ def _make_tuple_of_string(x):
                   "got %s" % type(x).__name__)
 
 
+@deprecated("2017-06-15", "contrib/learn/dataframe/** is deprecated.")
 def parameter(func):
   """Tag functions annotated with `@parameter` for later retrieval.
 
@@ -110,6 +112,7 @@ class Transform(object):
 
   __metaclass__ = ABCMeta
 
+  @deprecated("2017-06-15", "contrib/learn/dataframe/** is deprecated.")
   def __init__(self):
     self._return_type = None
 
diff --git a/tensorflow/contrib/training/BUILD b/tensorflow/contrib/training/BUILD
index a8d8bda060..4f869584d0 100644
--- a/tensorflow/contrib/training/BUILD
+++ b/tensorflow/contrib/training/BUILD
@@ -23,6 +23,7 @@ py_library(
         "python/training/evaluation.py",
         "python/training/failure_tolerator.py",
         "python/training/feeder.py",
+        "python/training/feeding_queue_runner.py",
         "python/training/hparam.py",
         "python/training/python_input.py",
         "python/training/resample.py",
@@ -59,6 +60,7 @@ py_library(
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//tensorflow/python/estimator:estimator_py",
         "//third_party/py/numpy",
         "@six_archive//:six",
     ],
diff --git a/tensorflow/contrib/training/__init__.py b/tensorflow/contrib/training/__init__.py
index b8d4629ac4..36bff530f3 100644
--- a/tensorflow/contrib/training/__init__.py
+++ b/tensorflow/contrib/training/__init__.py
@@ -54,6 +54,7 @@ from tensorflow.contrib.training.python.training.evaluation import SummaryAtEndH
 from tensorflow.contrib.training.python.training.evaluation import wait_for_new_checkpoint
 from tensorflow.contrib.training.python.training.failure_tolerator import *
 from tensorflow.contrib.training.python.training.feeder import *
+from tensorflow.contrib.training.python.training.feeding_queue_runner import FeedingQueueRunner
 from tensorflow.contrib.training.python.training.hparam import *
 from tensorflow.contrib.training.python.training.python_input import python_input
 from tensorflow.contrib.training.python.training.resample import *
@@ -73,8 +74,8 @@ from tensorflow.python.util.all_util import remove_undocumented
 # whitelisted here or in the module docstring above.
 _allowed_symbols = [
     'checkpoints_iterator', 'evaluate_once', 'evaluate_repeatedly',
-    'get_or_create_eval_step', 'StopAfterNEvalsHook', 'SummaryAtEndHook',
-    'wait_for_new_checkpoint', 'add_gradients_summaries', 'clip_gradient_norms',
-    'create_train_op', 'multiply_gradients', 'train']
+    'FeedingQueueRunner', 'get_or_create_eval_step', 'StopAfterNEvalsHook',
+    'SummaryAtEndHook', 'wait_for_new_checkpoint', 'add_gradients_summaries',
+    'clip_gradient_norms', 'create_train_op', 'multiply_gradients', 'train']
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/training/python/training/feeding_queue_runner.py b/tensorflow/contrib/training/python/training/feeding_queue_runner.py
new file mode 100644
index 0000000000..d055555b01
--- /dev/null
+++ b/tensorflow/contrib/training/python/training/feeding_queue_runner.py
@@ -0,0 +1,24 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""A `QueueRunner` that takes a feed function as an argument."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+# pylint: disable=unused-import
+from tensorflow.python.estimator.inputs.queues.feeding_queue_runner import _FeedingQueueRunner as FeedingQueueRunner
+# pylint: enable=unused-import
-- 
GitLab


From 9ca8a151b1f6b0aaa9357b138c8ecd2b71a92ec7 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 12:03:34 -0700
Subject: [PATCH 1458/1563] Internal change.

PiperOrigin-RevId: 156335942
---
 third_party/eigen3/unsupported/Eigen/CXX11/eigen.threadpool | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 third_party/eigen3/unsupported/Eigen/CXX11/eigen.threadpool

diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/eigen.threadpool b/third_party/eigen3/unsupported/Eigen/CXX11/eigen.threadpool
deleted file mode 100644
index d2639af4d9..0000000000
--- a/third_party/eigen3/unsupported/Eigen/CXX11/eigen.threadpool
+++ /dev/null
@@ -1 +0,0 @@
-#include "unsupported/Eigen/CXX11/ThreadPool"
-- 
GitLab


From 1390dd68fe5f2f83138e19a86b6699254ad38734 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Wed, 17 May 2017 12:18:25 -0700
Subject: [PATCH 1459/1563] When Op Type is not registered, log the hostname of
 the machine that it is running on in the error message, since the message
 could be routed back during a failure on a remote binary, and it is hard to
 tell which machine it came from.

Ideally, we'd somehow log the name of the binary running instead, but
we don't have a function to get that right now.

PiperOrigin-RevId: 156337679
---
 tensorflow/core/framework/node_def_builder_test.cc    |  5 ++---
 tensorflow/core/framework/op.cc                       | 11 +++++++++--
 .../core/framework/shape_inference_testutil_test.cc   |  9 +++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/tensorflow/core/framework/node_def_builder_test.cc b/tensorflow/core/framework/node_def_builder_test.cc
index 196e5e46ed..e836873f66 100644
--- a/tensorflow/core/framework/node_def_builder_test.cc
+++ b/tensorflow/core/framework/node_def_builder_test.cc
@@ -208,9 +208,8 @@ TEST_F(NodeDefBuilderTest, OpDoesNotExist) {
       .ControlInput("y")
       .Attr("foo", 12)
       .Device("device");
-  ExpectFailure(
-      builder,
-      "Op type not registered 'Op Does Not Exist' while building NodeDef 'n'");
+  ExpectFailures(builder, {"Op type not registered 'Op Does Not Exist'",
+                           "while building NodeDef 'n'"});
 }
 
 TEST_F(NodeDefBuilderTest, Polymorphic) {
diff --git a/tensorflow/core/framework/op.cc b/tensorflow/core/framework/op.cc
index 6bff192b1e..5ddac6b198 100644
--- a/tensorflow/core/framework/op.cc
+++ b/tensorflow/core/framework/op.cc
@@ -21,6 +21,7 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
+#include "tensorflow/core/platform/host_info.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/protobuf.h"
@@ -83,7 +84,10 @@ Status OpRegistry::LookUp(const string& op_type_name,
       first_unregistered = false;
     }
     Status status =
-        errors::NotFound("Op type not registered '", op_type_name, "'");
+        errors::NotFound("Op type not registered '", op_type_name,
+                         "' in binary running on ", port::Hostname(), ". ",
+                         "Make sure the Op and Kernel are registered in the "
+                         "binary running in this process.");
     VLOG(1) << status.ToString();
     return status;
   }
@@ -225,7 +229,10 @@ Status OpListOpRegistry::LookUp(const string& op_type_name,
   auto iter = index_.find(op_type_name);
   if (iter == index_.end()) {
     *op_reg_data = nullptr;
-    return errors::NotFound("Op type not registered '", op_type_name, "'");
+    return errors::NotFound("Op type not registered '", op_type_name,
+                            "' in binary running on ", port::Hostname(), ". ",
+                            "Make sure the Op and Kernel are registered in the "
+                            "binary running in this process.");
   }
   *op_reg_data = iter->second;
   return Status::OK();
diff --git a/tensorflow/core/framework/shape_inference_testutil_test.cc b/tensorflow/core/framework/shape_inference_testutil_test.cc
index b0af0e5bd9..de14c071b4 100644
--- a/tensorflow/core/framework/shape_inference_testutil_test.cc
+++ b/tensorflow/core/framework/shape_inference_testutil_test.cc
@@ -93,10 +93,11 @@ TEST(ShapeInferenceTestutilTest, Failures) {
             RunInferShapes(op, "[1];[2];[1]", "e", fn_copy_input_0));
   EXPECT_CONTAINS(RunInferShapes(op, "[1];[2];[1]", "[1];[2]", fn_copy_input_0),
                   "wrong number of outputs");
-  EXPECT_EQ("Op type not registered 'NoSuchOp'",
-            ShapeInferenceTestutil::InferShapes(
-                ShapeInferenceTestOp("NoSuchOp"), "", "")
-                .error_message());
+  auto error_message = ShapeInferenceTestutil::InferShapes(
+                           ShapeInferenceTestOp("NoSuchOp"), "", "")
+                           .error_message();
+  EXPECT_TRUE(StringPiece(error_message)
+                  .starts_with("Op type not registered 'NoSuchOp'"));
 
   // Wrong shape error messages.
   EXPECT_CONTAINS(RunInferShapes(op, "[1];[2];[1]", "?", fn_copy_input_0),
-- 
GitLab


From 170f0b35076b9d3048f0615fe2cdd9cff8da494c Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 17 May 2017 12:47:47 -0700
Subject: [PATCH 1460/1563] [TF:XLA] Add XLA implementation of
 ResourceStridedSliceAssign.

PiperOrigin-RevId: 156341053
---
 .../compiler/tests/variable_ops_test.py       |  67 ++++++++++-
 tensorflow/compiler/tf2xla/const_analysis.cc  |   3 +
 .../tf2xla/kernels/strided_slice_op.cc        | 113 ++++++++++++++++++
 tensorflow/compiler/tf2xla/xla_compiler.cc    |   2 +
 tensorflow/compiler/tf2xla/xla_op_kernel.cc   |   1 +
 5 files changed, 185 insertions(+), 1 deletion(-)

diff --git a/tensorflow/compiler/tests/variable_ops_test.py b/tensorflow/compiler/tests/variable_ops_test.py
index fef390fd67..70dacd9de4 100644
--- a/tensorflow/compiler/tests/variable_ops_test.py
+++ b/tensorflow/compiler/tests/variable_ops_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for XLA JIT compiler."""
+"""Tests for reading and writing variables."""
 
 from __future__ import absolute_import
 from __future__ import division
@@ -21,7 +21,9 @@ from __future__ import print_function
 import numpy as np
 
 from tensorflow.compiler.tests.xla_test import XLATestCase
+from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
 from tensorflow.python.framework import ops
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import init_ops
@@ -114,5 +116,68 @@ class VariableOpsTest(XLATestCase):
       self.assertAllClose(np.array([1.9, 2.9], dtype=np.float32), vb, rtol=1e-4)
 
 
+class StridedSliceAssignChecker(object):
+  """Compares the results of a slice assignment using Tensorflow and numpy."""
+
+  def __init__(self, test, x, dtype):
+    self.dtype = dtype
+    self.test = test
+    self.x_np = np.array(x).astype(dtype)
+
+  def __setitem__(self, index, value):
+    value = np.array(value).astype(self.dtype)
+
+    with self.test.test_session() as sess, self.test.test_scope():
+      x = constant_op.constant(self.x_np, dtype=self.dtype)
+      var = resource_variable_ops.ResourceVariable(x)
+      sess.run(variables.variables_initializer([var]))
+      val = sess.run(var[index].assign(value))
+      # val_copy is used to check that tf.assign works equivalently to the
+      # assign method above.
+      val_copy = sess.run(state_ops.assign(var[index], value))
+      valnp = np.copy(self.x_np)
+      valnp[index] = np.array(value)
+      self.test.assertAllEqual(val, valnp)
+      self.test.assertAllEqual(val_copy, valnp)
+
+
+class SliceAssignTest(XLATestCase):
+
+  def testSliceAssign(self):
+    for dtype in self.numeric_types:
+      checker = StridedSliceAssignChecker(self, [[1, 2, 3], [4, 5, 6]],
+                                          dtype=dtype)
+      # No-op assignment
+      checker[:] = [[10, 20, 30], [40, 50, 60]]
+      # Checks trivial (1,1) shape tensor
+      checker[1:2, 1:2] = [[66]]
+      # shrink shape changes
+      checker[1:2, 1] = [66]
+      checker[1, 1:2] = [66]
+      checker[1, 1] = 66
+      # newaxis shape changes
+      checker[:, None, :] = [[[10, 20, 30]], [[40, 50, 50]]]
+      # shrink and newaxis
+      checker[None, None, 0, 0:1] = [[[99]]]
+      # Non unit strides
+      checker[::1, 1::-1] = [[3, 33], [4, 44]]
+      # degenerate interval
+      checker[8:10, 0] = []
+      checker[8:10, 8:10] = [[]]
+
+      # Assign vector to scalar (rank-0) using newaxis
+      checker2 = StridedSliceAssignChecker(self, 222, dtype=dtype)
+      checker2[()] = 6  # no indices
+      checker2[...] = 6  # ellipsis
+      checker2[None] = [6]  # new axis
+
+  def testUninitialized(self):
+    with self.assertRaisesRegexp(errors.InvalidArgumentError,
+                                 "uninitialized variable"):
+      with self.test_session() as sess, self.test_scope():
+        v = resource_variable_ops.ResourceVariable([1, 2])
+        sess.run(v[:].assign([1, 2]))
+
+
 if __name__ == "__main__":
   googletest.main()
diff --git a/tensorflow/compiler/tf2xla/const_analysis.cc b/tensorflow/compiler/tf2xla/const_analysis.cc
index 4adc17b838..c4cbaebb25 100644
--- a/tensorflow/compiler/tf2xla/const_analysis.cc
+++ b/tensorflow/compiler/tf2xla/const_analysis.cc
@@ -68,6 +68,9 @@ Status BackwardsConstAnalysis(const Graph& g,
       {"Range", "limit"},
       {"Range", "delta"},
       {"Reshape", "shape"},
+      {"ResourceStridedSliceAssign", "begin"},
+      {"ResourceStridedSliceAssign", "end"},
+      {"ResourceStridedSliceAssign", "strides"},
       {"Reverse", "dims"},
       {"ReverseV2", "axis"},
       {"Slice", "begin"},
diff --git a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
index 03e02299e3..211412d463 100644
--- a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
+++ b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
@@ -219,5 +219,118 @@ class StridedSliceGradOp : public XlaOpKernel {
 
 REGISTER_XLA_OP(Name("StridedSliceGrad"), StridedSliceGradOp);
 
+class StridedSliceAssignOp : public XlaOpKernel {
+ public:
+  explicit StridedSliceAssignOp(OpKernelConstruction* ctx) : XlaOpKernel(ctx) {
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("begin_mask", &begin_mask_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("end_mask", &end_mask_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("ellipsis_mask", &ellipsis_mask_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("new_axis_mask", &new_axis_mask_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("shrink_axis_mask", &shrink_axis_mask_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("Index", &index_type_));
+  }
+
+  void Compile(XlaOpKernelContext* ctx) override {
+    TensorShape final_shape;
+    gtl::InlinedVector<int64, 4> begin;
+    gtl::InlinedVector<int64, 4> end;
+    gtl::InlinedVector<int64, 4> strides;
+
+    xla::Literal begin_literal, end_literal, strides_literal;
+    OP_REQUIRES_OK(ctx, ctx->ConstantInput(1, &begin_literal));
+    OP_REQUIRES_OK(ctx, ctx->ConstantInput(2, &end_literal));
+    OP_REQUIRES_OK(ctx, ctx->ConstantInput(3, &strides_literal));
+
+    Tensor begin_tensor, end_tensor, strides_tensor;
+    OP_REQUIRES_OK(
+        ctx, LiteralToHostTensor(begin_literal, index_type_, &begin_tensor));
+    OP_REQUIRES_OK(ctx,
+                   LiteralToHostTensor(end_literal, index_type_, &end_tensor));
+    OP_REQUIRES_OK(ctx, LiteralToHostTensor(strides_literal, index_type_,
+                                            &strides_tensor));
+
+    DataType lhs_type;
+    TensorShape lhs_shape;
+    OP_REQUIRES_OK(ctx, ctx->GetVariableTypeAndShape(0, &lhs_type, &lhs_shape));
+
+    const TensorShape rhs_shape = ctx->InputShape(4);
+
+    TensorShape dummy_processing_shape;
+    ShapeReadWriteFromTensorShape wrapped_final_shape(&final_shape);
+    ShapeReadWriteFromTensorShape wrapped_dummy_processing_shape(
+        &dummy_processing_shape);
+    bool dummy = false;
+    OP_REQUIRES_OK(
+        ctx, ValidateStridedSliceOp(
+                 &begin_tensor, &end_tensor, strides_tensor,
+                 ShapeReadWriteFromTensorShape(&lhs_shape), begin_mask_,
+                 end_mask_, ellipsis_mask_, new_axis_mask_, shrink_axis_mask_,
+                 &wrapped_dummy_processing_shape, &wrapped_final_shape, &dummy,
+                 &dummy, &dummy, &begin, &end, &strides));
+
+    if (final_shape.num_elements() == 0 && rhs_shape.num_elements() == 0) {
+      // DynamicUpdateSlice does not allow 0-element updates. We should probably
+      // check that rhs_shape can be broadcast to final_shape, but that is
+      // probably better handled when implementing broadcasting more generally.
+      return;
+    }
+
+    // TODO(aselle): This check is too strong, we only should need
+    // input_shape to be broadcastable to final_shape
+    OP_REQUIRES(ctx, final_shape == rhs_shape,
+                errors::Unimplemented(
+                    "sliced l-value shape ", final_shape.DebugString(),
+                    " does not match r-value shape ", rhs_shape.DebugString(),
+                    ". Automatic broadcasting not yet implemented."));
+
+    xla::ComputationDataHandle lhs;
+    OP_REQUIRES_OK(ctx, ctx->ReadVariableInput(0, &lhs));
+
+    xla::ComputationDataHandle rhs = ctx->Input(4);
+
+    gtl::InlinedVector<int64, 4> dimensions_to_reverse;
+    gtl::InlinedVector<int64, 4> slice_begin, slice_dims;
+    for (int i = 0; i < begin.size(); ++i) {
+      // TODO(phawkins): implement strides != 1
+      OP_REQUIRES(
+          ctx, strides[i] == 1 || strides[i] == -1,
+          errors::Unimplemented("Strides != 1 or -1 are not yet implemented"));
+      if (strides[i] > 0) {
+        slice_begin.push_back(begin[i]);
+        slice_dims.push_back(end[i] - begin[i]);
+      } else {
+        // Negative stride: swap begin and end, add 1 because the interval
+        // is semi-open, and mark the dimension to be reversed.
+        slice_begin.push_back(end[i] + 1);
+        slice_dims.push_back(begin[i] - end[i]);
+        dimensions_to_reverse.push_back(i);
+      }
+    }
+
+    if (!dimensions_to_reverse.empty()) {
+      rhs = ctx->builder()->Rev(rhs, dimensions_to_reverse);
+    }
+    rhs = ctx->builder()->Reshape(rhs, slice_dims);
+
+    if (lhs_shape.dims() == 0) {
+      // TODO(b/38323843): DynamicUpdateSlice crashes on rank 0 inputs. Fix
+      // and remove this workaround.
+      lhs = rhs;
+    } else {
+      lhs = ctx->builder()->DynamicUpdateSlice(
+          lhs, rhs, ctx->builder()->ConstantR1<int64>(slice_begin));
+    }
+
+    OP_REQUIRES_OK(ctx, ctx->AssignVariable(0, lhs_type, lhs));
+  }
+
+ private:
+  int32 begin_mask_, end_mask_;
+  int32 ellipsis_mask_, new_axis_mask_, shrink_axis_mask_;
+  DataType index_type_;
+};
+
+REGISTER_XLA_OP(Name("ResourceStridedSliceAssign"), StridedSliceAssignOp);
+
 }  // namespace
 }  // namespace tensorflow
diff --git a/tensorflow/compiler/tf2xla/xla_compiler.cc b/tensorflow/compiler/tf2xla/xla_compiler.cc
index d4a917671b..f8a9c5e9bc 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler.cc
@@ -467,6 +467,8 @@ Status XlaCompiler::CompileGraph(const XlaCompiler::CompileOptions& options,
 
   result->xla_output_shape.Swap(
       computation_shape.ValueOrDie()->mutable_result());
+  VLOG(2) << "XLA output shape: "
+          << xla::ShapeUtil::HumanString(result->xla_output_shape);
 
   auto num_computation_outputs =
       (xla::ShapeUtil::IsTuple(result->xla_output_shape))
diff --git a/tensorflow/compiler/tf2xla/xla_op_kernel.cc b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
index 48831ce4c2..4de69ee43c 100644
--- a/tensorflow/compiler/tf2xla/xla_op_kernel.cc
+++ b/tensorflow/compiler/tf2xla/xla_op_kernel.cc
@@ -357,6 +357,7 @@ void XlaOpKernelContext::SetVariableOutput(int index, int variable_id) {
 
 Status XlaOpKernelContext::AssignVariable(
     int index, DataType type, const xla::ComputationDataHandle& handle) {
+  TF_RET_CHECK(handle.handle() != 0);
   SetOpHasSideEffects();
 
   const XlaExpression* expression =
-- 
GitLab


From c2b8927f2547c526ae58a9736d1bed1cedb87a17 Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Wed, 17 May 2017 13:03:15 -0700
Subject: [PATCH 1461/1563] Fix another d3v4 regression in the graph
 visualizer.

PiperOrigin-RevId: 156343038
---
 tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts | 2 +-
 tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
index f3768e169b..45755ee8f5 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
@@ -87,7 +87,7 @@ export function buildGroup(sceneGroup,
 
   // Select all children and join with data.
   // (Note that all children of g.edges are g.edge)
-  let edgeGroups = (container as any).selectAll('g.edge').data(edges, getEdgeKey);
+  let edgeGroups = (container as any).selectAll(function() {return this.childNodes;}).data(edges, getEdgeKey);
 
   // Make edges a group to support rendering multiple lines for metaedge
   edgeGroups.enter()
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
index 6d66bb69d9..0e0ceca1d1 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
@@ -66,8 +66,7 @@ module tf.graph.scene.node {
     // Select all children and join with data.
     // (Note that all children of g.nodes are g.node)
     let nodeGroups =
-        (container as any)
-            .selectAll('g.node')
+        (container as any).selectAll(function() {return this.childNodes;})
             .data(nodeData, (d) => {
               // make sure that we don't have to swap shape type
               return d.node.name + ':' + d.node.type;
-- 
GitLab


From 54b5ee3c9c37595b0419f82a43f8d604f4c391ed Mon Sep 17 00:00:00 2001
From: David Norman <DavidNorman@users.noreply.github.com>
Date: Wed, 17 May 2017 21:15:04 +0100
Subject: [PATCH 1462/1563] Add a mechanism for adding an XLA plugin to the
 build (#9760)

* Add a mechanism for adding an XLA plugin to the build

* Changes after review.

* Correct the alphabetical ordering of the dependencies
---
 tensorflow/compiler/jit/BUILD    | 16 +++++++++++++++
 tensorflow/compiler/plugin/BUILD | 34 ++++++++++++++++++++++++++++++++
 tensorflow/compiler/xla/BUILD    | 18 +++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 tensorflow/compiler/plugin/BUILD

diff --git a/tensorflow/compiler/jit/BUILD b/tensorflow/compiler/jit/BUILD
index 9b4e872ebe..04f15a6a0b 100644
--- a/tensorflow/compiler/jit/BUILD
+++ b/tensorflow/compiler/jit/BUILD
@@ -18,9 +18,24 @@ package(
     default_visibility = [":internal"],
 )
 
+load("//tensorflow:tensorflow.bzl", "cc_header_only_library")
 load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
 load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
 
+# This target can be used by XLA device plugins to prevent circular
+# dependencies, and provides access to all of the required headers
+# for building a device library.
+cc_header_only_library(
+    name = "xla_jit_headers_lib",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":xla_cpu_device",
+        ":xla_cpu_jit",
+        ":xla_gpu_device",
+        ":xla_gpu_jit",
+    ],
+)
+
 # Target that bundles up the XLA CPU and GPU JIT devices.
 cc_library(
     name = "jit",
@@ -30,6 +45,7 @@ cc_library(
         ":xla_cpu_jit",
         ":xla_gpu_device",
         ":xla_gpu_jit",
+        "//tensorflow/compiler/plugin",
     ],
     alwayslink = 1,
 )
diff --git a/tensorflow/compiler/plugin/BUILD b/tensorflow/compiler/plugin/BUILD
new file mode 100644
index 0000000000..056f2228ca
--- /dev/null
+++ b/tensorflow/compiler/plugin/BUILD
@@ -0,0 +1,34 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+"""Configuration file for an XLA plugin.
+- please don't check in changes to this file
+- to prevent changes appearing in git status, use:
+  git update-index --assume-unchanged tensorflow/compiler/plugin/BUILD
+
+To add additional devices to the XLA subsystem, add targets to the
+dependency list in the 'plugin' target. For instance:
+
+    deps = ["//tensorflow/compiler/plugin/example:plugin_lib"],
+"""
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "plugin",
+    deps = [],
+)
diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index de09d4b23f..eefe0a4dba 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -17,6 +17,7 @@ package_group(
     ],
 )
 
+load("//tensorflow:tensorflow.bzl", "cc_header_only_library")
 load("//tensorflow/compiler/xla:xla.bzl", "xla_proto_library")
 
 # Filegroup used to collect source files for dependency checking.
@@ -44,6 +45,23 @@ xla_proto_library(
     ],
 )
 
+# This is a headers target that extra XLA devices can use to prevent
+# circular dependencies.  Devices that are compiled as separate shared
+# objects can also use it to prevent linking of library code.
+cc_header_only_library(
+    name = "xla_headers_lib",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/compiler/xla:xla_data_proto",
+        "//tensorflow/compiler/xla:xla_proto",
+        "//tensorflow/compiler/xla/client:client_library",
+        "//tensorflow/compiler/xla/legacy_flags:layout_util_flags",
+        "//tensorflow/compiler/xla/service:hlo",
+        "//tensorflow/core:framework_headers_lib",
+        "//tensorflow/core:stream_executor_headers_lib",
+    ],
+)
+
 cc_library(
     name = "test",
     testonly = 1,
-- 
GitLab


From c24298c355e0bfa72c5c4262328afd2c6dd1e8e2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 13:24:50 -0700
Subject: [PATCH 1463/1563] [XLA] Internal change.

PiperOrigin-RevId: 156345822
---
 .../compiler/xla/service/buffer_assignment.cc | 28 +++++++++++++--
 .../compiler/xla/service/buffer_assignment.h  | 24 ++++++++-----
 .../compiler/xla/service/buffer_liveness.cc   | 27 ++++++++------
 .../xla/service/buffer_liveness_test.cc       | 35 +++++++++----------
 .../compiler/xla/service/heap_simulator.cc    |  1 +
 .../compiler/xla/service/liveness_util.cc     |  5 ---
 .../xla/service/liveness_util_test.cc         |  4 +--
 7 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/tensorflow/compiler/xla/service/buffer_assignment.cc b/tensorflow/compiler/xla/service/buffer_assignment.cc
index 47560fefea..ccb84b026e 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.cc
+++ b/tensorflow/compiler/xla/service/buffer_assignment.cc
@@ -488,8 +488,10 @@ Status GatherComputationsByAllocationType(
 /* static */
 StatusOr<std::unique_ptr<BufferAssignment>> BufferAssigner::Run(
     const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-    LogicalBuffer::SizeFunction buffer_size, int64 alignment) {
-  BufferAssigner assigner(std::move(buffer_size), alignment);
+    LogicalBuffer::SizeFunction buffer_size, int64 alignment,
+    bool allow_input_output_aliasing) {
+  BufferAssigner assigner(std::move(buffer_size), alignment,
+                          allow_input_output_aliasing);
   return assigner.CreateAssignment(module, std::move(hlo_ordering));
 }
 
@@ -524,6 +526,28 @@ bool BufferAssigner::MaybeAssignBuffer(BufferAllocation* allocation,
               << " may interfere with " << buffer;
       return false;
     }
+    // Copy instruction don't share a buffer with their input operand.
+    if (buffer.instruction()->IsUserOf(assigned_buffer.instruction()) &&
+        buffer.instruction()->opcode() == HloOpcode::kCopy) {
+      VLOG(4) << "Can't assign: assignee " << assigned_buffer
+              << " is used at copy instruction " << buffer;
+      return false;
+    }
+  }
+
+  if (allow_input_output_aliasing_ && allocation->maybe_live_out()) {
+    HloComputation* entry_computation =
+        assignment->module_->entry_computation();
+    for (auto param : entry_computation->parameter_instructions()) {
+      for (auto& param_buffer :
+           assignment->points_to_analysis().GetBuffersDefinedByInstruction(
+               param)) {
+        if (assignment->liveness().MayInterfere(*param_buffer, buffer)) {
+          VLOG(4) << "Can't assign: Parameter interference with result";
+          return false;
+        }
+      }
+    }
   }
 
   // If the buffer is live out of the computation then it should only be
diff --git a/tensorflow/compiler/xla/service/buffer_assignment.h b/tensorflow/compiler/xla/service/buffer_assignment.h
index 9774a3174a..4b8b2cb9c4 100644
--- a/tensorflow/compiler/xla/service/buffer_assignment.h
+++ b/tensorflow/compiler/xla/service/buffer_assignment.h
@@ -309,6 +309,9 @@ class BufferAssignment {
     return liveness_->points_to_analysis();
   }
 
+  // Returns the BufferLiveness object used to construct this assignment.
+  const BufferLiveness& liveness() const { return *liveness_; }
+
   string ToString() const;
 
   // Statistics for the assignment.  Values initialized to -1 are not always
@@ -358,9 +361,6 @@ class BufferAssignment {
   // Returns the HloModule used to construct this assignment.
   const HloModule& module() { return *module_; }
 
-  // Returns the BufferLiveness object used to construct this assignment.
-  const BufferLiveness& liveness() { return *liveness_; }
-
   // Convenience function which returns the PointsToSet for the given
   // instruction. Extracted from the liveness object.
   const PointsToSet& GetPointsToSet(const HloInstruction* instruction) const;
@@ -400,15 +400,19 @@ class BufferAssigner {
   // Build and return a BufferAssignment for the given module. The given
   // HloOrdering is used to determine buffer liveness. buffer_size is a function
   // which returns the size of a LogicalBuffer. Alignment is the the minimum
-  // alignment of any buffer.
+  // alignment of any buffer. allow_input_output_aliasing specifies whether
+  // input buffer are allowed to be reused as outbut buffers by the client code.
   static StatusOr<std::unique_ptr<BufferAssignment>> Run(
       const HloModule* module, std::unique_ptr<HloOrdering> hlo_ordering,
-      LogicalBuffer::SizeFunction buffer_size, int64 alignment);
+      LogicalBuffer::SizeFunction buffer_size, int64 alignment,
+      bool allow_input_output_aliasing = false);
 
  private:
-  explicit BufferAssigner(LogicalBuffer::SizeFunction buffer_size,
-                          int64 alignment)
-      : buffer_size_(std::move(buffer_size)), alignment_(alignment) {}
+  BufferAssigner(LogicalBuffer::SizeFunction buffer_size, int64 alignment,
+                 bool allow_input_output_aliasing)
+      : buffer_size_(std::move(buffer_size)),
+        alignment_(alignment),
+        allow_input_output_aliasing_(allow_input_output_aliasing) {}
   virtual ~BufferAssigner() = default;
 
   // Create a buffer assignment.
@@ -493,6 +497,10 @@ class BufferAssigner {
   // Minimum alignment of any buffer.
   int64 alignment_;
 
+  // If true, buffer assignments assumes that input parameter buffers and output
+  // buffers can be shared if their sizes match.
+  bool allow_input_output_aliasing_;
+
   TF_DISALLOW_COPY_AND_ASSIGN(BufferAssigner);
 };
 
diff --git a/tensorflow/compiler/xla/service/buffer_liveness.cc b/tensorflow/compiler/xla/service/buffer_liveness.cc
index 3be4810490..d69a84cd0e 100644
--- a/tensorflow/compiler/xla/service/buffer_liveness.cc
+++ b/tensorflow/compiler/xla/service/buffer_liveness.cc
@@ -127,25 +127,30 @@ bool BufferLiveness::live_range_strictly_before(const LogicalBuffer& a,
   return true;
 }
 
+namespace {
+bool IsEntryParameter(const HloInstruction* instruction) {
+  const HloComputation* computation = instruction->parent();
+  return instruction->opcode() == HloOpcode::kParameter &&
+         computation == computation->parent()->entry_computation();
+}
+}  // namespace
+
 bool BufferLiveness::MayInterfere(const LogicalBuffer& a,
                                   const LogicalBuffer& b) const {
-  // Entry parameters live for the entire execution, thus always interfere with
-  // all other instructions.
+  // Entry parameters live at the entry of the execution, thus always interfere
+  // with all other instructions executing before them in the ordering.
   const HloInstruction* a_instruction = a.instruction();
-  const HloComputation* a_computation = a_instruction->parent();
-  if (a_instruction->opcode() == HloOpcode::kParameter &&
-      a_computation == a_computation->parent()->entry_computation()) {
+  const HloInstruction* b_instruction = b.instruction();
+  if (IsEntryParameter(a_instruction) &&
+      hlo_ordering_->ExecutesBefore(b_instruction, a_instruction)) {
     return true;
   }
-  const HloInstruction* b_instruction = b.instruction();
-  const HloComputation* b_computation = b_instruction->parent();
-  if (b_instruction->opcode() == HloOpcode::kParameter &&
-      b_computation == b_computation->parent()->entry_computation()) {
+  if (IsEntryParameter(b_instruction) &&
+      hlo_ordering_->ExecutesBefore(a_instruction, b_instruction)) {
     return true;
   }
   // Buffers without disjoint liveness may interfere.
-  return (!live_range_strictly_before(a, b) &&
-          !live_range_strictly_before(b, a));
+  return !live_range_strictly_before(a, b) && !live_range_strictly_before(b, a);
 }
 
 bool BufferLiveness::MaybeLiveOut(const LogicalBuffer& buffer) const {
diff --git a/tensorflow/compiler/xla/service/buffer_liveness_test.cc b/tensorflow/compiler/xla/service/buffer_liveness_test.cc
index ac814b1d7c..c2184cc680 100644
--- a/tensorflow/compiler/xla/service/buffer_liveness_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_liveness_test.cc
@@ -124,10 +124,9 @@ TEST_F(BufferLivenessTest, ElementwiseChain) {
                           MakeUnique<DependencyHloOrdering>(module.get()))
           .ConsumeValueOrDie();
 
-  // Entry params always interfere.
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, log));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, log));
 
   // No buffers should interfere.
   EXPECT_FALSE(InstructionsMayInterfere(*liveness, negate, exp));
@@ -174,15 +173,16 @@ TEST_F(BufferLivenessTest, MultipleEntryParameters_Sequential) {
                       MakeUnique<SequentialHloOrdering>(module.get(), sequence))
                       .ConsumeValueOrDie();
 
-  // Entry params always interfere.
+  // Entry parameters interfere as if they are defined simultaneously at
+  // the very beginning.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, param1));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, negate));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, exp));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param0, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param0, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param0, exp));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param0, add));
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, param0));
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, negate));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, exp));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param1, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param1, exp));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param1, add));
 
   // Negate and exp still interfere.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, negate, exp));
@@ -220,10 +220,9 @@ TEST_F(BufferLivenessTest, NonElementwiseOperand) {
                           MakeUnique<DependencyHloOrdering>(module.get()))
           .ConsumeValueOrDie();
 
-  // Entry params always interfere.
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, reverse));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, negate));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, reverse));
 
   // Negate is elementwise, so doesn't interfere with its operand.
   // Reverse is non-elementwise, so does interfere with its operand.
@@ -255,10 +254,9 @@ TEST_F(BufferLivenessTest, OverlappedBuffers) {
                           MakeUnique<DependencyHloOrdering>(module.get()))
           .ConsumeValueOrDie();
 
-  // Entry params always interfere.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, add));
 
   // Negate and exp interfere with each other, but not with add.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, negate, exp));
@@ -301,10 +299,9 @@ TEST_F(BufferLivenessTest, OverlappedBuffersSequentialOrder) {
                                             module.get(), module_sequence))
           .ConsumeValueOrDie();
 
-  // Entry params always interfere.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, negate));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, exp));
-  EXPECT_TRUE(InstructionsMayInterfere(*liveness, param, add));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, exp));
+  EXPECT_FALSE(InstructionsMayInterfere(*liveness, param, add));
 
   // Negate and exp interfere with each other, but not with add.
   EXPECT_TRUE(InstructionsMayInterfere(*liveness, negate, exp));
diff --git a/tensorflow/compiler/xla/service/heap_simulator.cc b/tensorflow/compiler/xla/service/heap_simulator.cc
index d7aa5664df..645c68e043 100644
--- a/tensorflow/compiler/xla/service/heap_simulator.cc
+++ b/tensorflow/compiler/xla/service/heap_simulator.cc
@@ -187,6 +187,7 @@ Status HeapSimulator::RunComputation(
       bool shared = false;
       for (const LogicalBuffer* operand_buffer : operand_buffers_to_free) {
         if (buffer->instruction()->IsUserOf(operand_buffer->instruction()) &&
+            buffer->instruction()->opcode() != HloOpcode::kCopy &&
             CanShareOperandBufferWithUser(
                 operand_buffer->instruction(), operand_buffer->index(),
                 buffer->instruction(), buffer->index(), points_to_analysis)) {
diff --git a/tensorflow/compiler/xla/service/liveness_util.cc b/tensorflow/compiler/xla/service/liveness_util.cc
index 16e11ca6c6..e1004256ff 100644
--- a/tensorflow/compiler/xla/service/liveness_util.cc
+++ b/tensorflow/compiler/xla/service/liveness_util.cc
@@ -159,11 +159,6 @@ bool CanShareOperandBufferWithUser(
   if (!ShapeUtil::Equal(operand_subshape, user_subshape)) {
     return false;
   }
-  // Copy instructions are explicitly added by CopyInsertion to prevent liveness
-  // issues, so they should never re-use their operand buffer.
-  if (user->opcode() == HloOpcode::kCopy) {
-    return false;
-  }
   if (user->opcode() == HloOpcode::kFusion) {
     if (user->fusion_kind() == HloInstruction::FusionKind::kLoop &&
         user->fused_expression_root()->opcode() ==
diff --git a/tensorflow/compiler/xla/service/liveness_util_test.cc b/tensorflow/compiler/xla/service/liveness_util_test.cc
index 49c2c2d4a2..ac670069b4 100644
--- a/tensorflow/compiler/xla/service/liveness_util_test.cc
+++ b/tensorflow/compiler/xla/service/liveness_util_test.cc
@@ -148,7 +148,7 @@ TEST_F(CanShareOperandBufferWithUserTest, ElementWiseDifferentShape) {
                                              *points_to_analysis_));
 }
 
-TEST_F(CanShareOperandBufferWithUserTest, CopyNeverShares) {
+TEST_F(CanShareOperandBufferWithUserTest, CopyShares) {
   auto builder = HloComputation::Builder(TestName());
 
   Shape shape = ShapeUtil::MakeShape(F32, {8});
@@ -163,7 +163,7 @@ TEST_F(CanShareOperandBufferWithUserTest, CopyNeverShares) {
 
   EXPECT_TRUE(
       CanShareOperandBufferWithUser(param, {}, exp, {}, *points_to_analysis_));
-  EXPECT_FALSE(
+  EXPECT_TRUE(
       CanShareOperandBufferWithUser(exp, {}, copy, {}, *points_to_analysis_));
 }
 
-- 
GitLab


From 9dc38431dffbccca1ae817f460fe4b1bfcb3ceb0 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 17 May 2017 13:37:56 -0700
Subject: [PATCH 1464/1563] Open up visibility of tf_imports

This is so other people can build web apps with the new build rules for
TensorBoard, based on Closure Rules web_library.
---
 .../tensorboard/components/tf_imports_d3v4/BUILD       | 10 ++++++++++
 .../java/org/tensorflow/tensorboard/vulcanize/BUILD    |  1 +
 2 files changed, 11 insertions(+)

diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
index edf759052f..c66230c779 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -9,6 +9,7 @@ web_library(
     name = "lodash",
     srcs = ["lodash.html"],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
     deps = ["@com_lodash"],
 )
 
@@ -20,6 +21,7 @@ web_library(
         "@org_threejs//:three.js",
     ],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
 )
 
 web_library(
@@ -29,6 +31,7 @@ web_library(
         "@com_numericjs",
     ],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
 )
 
 web_library(
@@ -38,6 +41,7 @@ web_library(
         "@io_github_waylonflinn_weblas",
     ],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
 )
 
 web_library(
@@ -47,6 +51,7 @@ web_library(
         "@io_github_cpettitt_graphlib",
     ],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
     deps = [":lodash"],
 )
 
@@ -57,6 +62,7 @@ web_library(
         "@io_github_cpettitt_dagre",
     ],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
     deps = [
         ":graphlib",
         ":lodash",
@@ -70,12 +76,14 @@ web_library(
         "@org_d3js_v4",
     ],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
 )
 
 web_library(
     name = "plottable",
     srcs = ["plottable.html"],
     path = "/tf-imports",
+    visibility = ["//visibility:public"],
     deps = [
         ":d3",
         ":plottable_js_css",
@@ -132,6 +140,7 @@ tensorboard_typescript_bundle(
         "@org_definitelytyped_types_d3_timer//:index.d.ts",
         "@org_definitelytyped_types_d3_voronoi//:index.d.ts",
     ]},
+    visibility = ["//visibility:public"],
 )
 
 # It would be nice if Plottable released a .d.ts file for plottable.js like
@@ -413,6 +422,7 @@ tensorboard_typescript_bundle(
             "YAlignment": "Plottable.Components.YAlignment",
         },
     },
+    visibility = ["//visibility:public"],
 )
 
 # Removes the 'declare module' block inside this file, but keeps its content.
diff --git a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
index 07fc3a70a7..de57d7ce2e 100644
--- a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
+++ b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
@@ -5,6 +5,7 @@ licenses(["notice"])  # Apache 2.0
 java_binary(
     name = "Vulcanize",
     srcs = ["Vulcanize.java"],
+    visibility = ["//visibility:public"],
     deps = [
         "@com_google_guava",
         "@com_google_protobuf_java",
-- 
GitLab


From 4b39ea0d03787c15686f130afea9f4800f0bdd3f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 13:54:34 -0700
Subject: [PATCH 1465/1563] Internal change.

PiperOrigin-RevId: 156349584
---
 tensorflow/contrib/nccl/BUILD | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/nccl/BUILD b/tensorflow/contrib/nccl/BUILD
index b6314079e1..9d02db6fc8 100644
--- a/tensorflow/contrib/nccl/BUILD
+++ b/tensorflow/contrib/nccl/BUILD
@@ -10,11 +10,11 @@ exports_files(["LICENSE"])
 
 load(
     "//tensorflow:tensorflow.bzl",
-    "tf_cuda_cc_test",
     "tf_custom_op_library",
     "tf_gen_op_libs",
     "tf_gen_op_wrapper_py",
 )
+load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_test")
 load("//tensorflow:tensorflow.bzl", "cuda_py_test")
 load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
 load("//tensorflow:tensorflow.bzl", "tf_kernel_library")
@@ -45,11 +45,14 @@ tf_cuda_cc_test(
         ],
         [],
     ),
-    tags = ["manual"],  # Disabled until errors finding nvmlShutdown are found.
+    # Disabled on jenkins until errors finding nvmlShutdown are found.
+    tags = [
+        "manual",
+        "notap",
+    ],
     deps = if_cuda(
         [
             "@nccl_archive//:nccl",
-            "//tensorflow/core",
             "//tensorflow/core:cuda",
         ],
         [],
@@ -121,9 +124,10 @@ cuda_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],
+    # Disabled on jenkins until errors finding nvmlShutdown are found.
     tags = [
         "manual",
-        "requires_cudnn5",
+        "notap",
     ],
 )
 
-- 
GitLab


From 157370e5916b85c65958ed8383ae31d727228ed7 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 17 May 2017 14:08:57 -0700
Subject: [PATCH 1466/1563] Unify op names between RNNCells and Keras layers.

PiperOrigin-RevId: 156351616
---
 RELEASE.md                                                | 7 +++++++
 .../contrib/rnn/python/kernel_tests/core_rnn_cell_test.py | 6 +++---
 tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py   | 4 ++--
 tensorflow/contrib/rnn/python/ops/lstm_ops.py             | 8 ++++----
 tensorflow/contrib/rnn/python/ops/rnn_cell.py             | 8 ++++----
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index d4e3bac01c..02bdbd4297 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -22,6 +22,13 @@
 * In python, `Operation.get_attr` on type attributes returns the Python DType
   version of the type to match expected get_attr documentation rather than the
   protobuf enum.
+* tensorflow/contrib/rnn undergoes RNN cell variable renaming for
+  consistency with Keras layers. Specifically, the previous variable names
+  "weights" and "biases" are changed to "kernel" and "bias", respectively.
+  This may cause backward incompatibility with regard to your old
+  checkpoints containing such RNN cells, in which case you can use the
+  [checkpoint_convert script](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py)
+  to convert the variable names in your old checkpoints.
 
 # Release 1.1.0
 
diff --git a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
index 89ad0fcd75..0f207b088d 100644
--- a/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
+++ b/tensorflow/contrib/rnn/python/kernel_tests/core_rnn_cell_test.py
@@ -347,10 +347,10 @@ class RNNCellTest(test.TestCase):
             state_is_tuple=False)
         cell(x, m)  # Execute to create variables
       variables = variables_lib.global_variables()
-      self.assertEquals(variables[0].op.name, "root/lstm_cell/weights")
-      self.assertEquals(variables[1].op.name, "root/lstm_cell/biases")
+      self.assertEquals(variables[0].op.name, "root/lstm_cell/kernel")
+      self.assertEquals(variables[1].op.name, "root/lstm_cell/bias")
       self.assertEquals(variables[2].op.name,
-                        "root/lstm_cell/projection/weights")
+                        "root/lstm_cell/projection/kernel")
 
   def testOutputProjectionWrapper(self):
     with self.test_session() as sess:
diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index f3e57cd3ec..db1f939e33 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -57,8 +57,8 @@ RNNCell = rnn_cell_impl._RNNCell  # pylint: disable=invalid-name
 _like_rnncell = rnn_cell_impl._like_rnncell
 # pylint: enable=protected-access
 
-_BIAS_VARIABLE_NAME = "biases"
-_WEIGHTS_VARIABLE_NAME = "weights"
+_BIAS_VARIABLE_NAME = "bias"
+_WEIGHTS_VARIABLE_NAME = "kernel"
 
 
 class BasicRNNCell(RNNCell):
diff --git a/tensorflow/contrib/rnn/python/ops/lstm_ops.py b/tensorflow/contrib/rnn/python/ops/lstm_ops.py
index 1884629b0c..0e70939cce 100644
--- a/tensorflow/contrib/rnn/python/ops/lstm_ops.py
+++ b/tensorflow/contrib/rnn/python/ops/lstm_ops.py
@@ -353,8 +353,8 @@ class LSTMBlockCell(core_rnn_cell.RNNCell):
     self._forget_bias = forget_bias
     self._use_peephole = use_peephole
     self._names = {
-        "W": "weights",
-        "b": "biases",
+        "W": "kernel",
+        "b": "bias",
         "wci": "w_i_diag",
         "wco": "w_o_diag",
         "wcf": "w_f_diag",
@@ -625,10 +625,10 @@ class LSTMBlockFusedCell(LSTMBlockWrapper):
       time_len = array_ops.shape(inputs)[0]
     input_size = inputs_shape[2].value
     w = vs.get_variable(
-        "weights",
+        "kernel",
         [input_size + self._num_units, self._num_units * 4], dtype=dtype)
     b = vs.get_variable(
-        "biases", [w.get_shape().with_rank(2)[1]],
+        "bias", [w.get_shape().with_rank(2)[1]],
         initializer=init_ops.constant_initializer(0.0),
         dtype=dtype)
     if self._use_peephole:
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index 217c379c36..0898e78837 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -1320,10 +1320,10 @@ class LayerNormBasicLSTMCell(core_rnn_cell.RNNCell):
   def _linear(self, args):
     out_size = 4 * self._num_units
     proj_size = args.get_shape()[-1]
-    weights = vs.get_variable("weights", [proj_size, out_size])
+    weights = vs.get_variable("kernel", [proj_size, out_size])
     out = math_ops.matmul(args, weights)
     if not self._layer_norm:
-      bias = vs.get_variable("biases", [out_size])
+      bias = vs.get_variable("bias", [out_size])
       out = nn_ops.bias_add(out, bias)
     return out
 
@@ -1439,10 +1439,10 @@ class NASCell(core_rnn_cell.RNNCell):
     # Variables for the NAS cell. W_m is all matrices multiplying the
     # hiddenstate and W_inputs is all matrices multiplying the inputs.
     concat_w_m = vs.get_variable(
-        "recurrent_weights", [num_proj, 8 * self._num_units],
+        "recurrent_kernel", [num_proj, 8 * self._num_units],
         dtype)
     concat_w_inputs = vs.get_variable(
-        "weights", [input_size.value, 8 * self._num_units],
+        "kernel", [input_size.value, 8 * self._num_units],
         dtype)
 
     m_matrix = math_ops.matmul(m_prev, concat_w_m)
-- 
GitLab


From 1e631f82a490d4596cdbbf6f3b7a3ec3abcfb56f Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Wed, 17 May 2017 14:28:12 -0700
Subject: [PATCH 1467/1563] Print benchmark output if reporting is not
 requested.

PiperOrigin-RevId: 156354145
---
 tensorflow/python/platform/benchmark.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tensorflow/python/platform/benchmark.py b/tensorflow/python/platform/benchmark.py
index aa74a419d8..bd2ef36170 100644
--- a/tensorflow/python/platform/benchmark.py
+++ b/tensorflow/python/platform/benchmark.py
@@ -73,11 +73,6 @@ def _global_report_benchmark(
                  cpu_time is not None else -1, throughput if
                  throughput is not None else -1, str(extras) if extras else "")
 
-  test_env = os.environ.get(TEST_REPORTER_TEST_ENV, None)
-  if test_env is None:
-    # Reporting was not requested
-    return
-
   entries = test_log_pb2.BenchmarkEntries()
   entry = entries.entry.add()
   entry.name = name
@@ -96,6 +91,12 @@ def _global_report_benchmark(
       else:
         entry.extras[k].string_value = str(v)
 
+  test_env = os.environ.get(TEST_REPORTER_TEST_ENV, None)
+  if test_env is None:
+    # Reporting was not requested, just print the proto
+    print(str(entries))
+    return
+
   serialized_entry = entries.SerializeToString()
 
   mangled_name = name.replace("/", "__")
-- 
GitLab


From f0bee5885a4eb59717a01f77a8964acddb0aa297 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 14:55:18 -0700
Subject: [PATCH 1468/1563] [XLA] Avoid accumulating '%' in front of fusion
 parameter names.

PiperOrigin-RevId: 156357948
---
 tensorflow/compiler/xla/service/hlo_computation.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/compiler/xla/service/hlo_computation.cc b/tensorflow/compiler/xla/service/hlo_computation.cc
index a749814f0d..2584ad39ae 100644
--- a/tensorflow/compiler/xla/service/hlo_computation.cc
+++ b/tensorflow/compiler/xla/service/hlo_computation.cc
@@ -130,7 +130,7 @@ Status HloComputation::RemoveParameter(int64 param_no) {
 
   while (param_no < param_instructions_.size()) {
     param_instruction = param_instructions_[param_no];
-    string param_name = param_instruction->name();
+    string param_name = param_instruction->parameter_name();
     // Fusion parameters are named foo.param_1, bar.param_2, etc. We are
     // renumbering the parameters so replace the final number in the name with
     // the updated value.
-- 
GitLab


From ca451cfd6cbb4f58cf3be5072485ddc49e90321a Mon Sep 17 00:00:00 2001
From: Jonathan Alvarez-Gutierrez <jagthebeetle@users.noreply.github.com>
Date: Wed, 17 May 2017 18:03:38 -0400
Subject: [PATCH 1469/1563] Update layers.md: remove old reference (#9983)

Remove reference to nonexistent variable h_conv2.
---
 tensorflow/docs_src/tutorials/layers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/tutorials/layers.md b/tensorflow/docs_src/tutorials/layers.md
index aa8e2cc839..289a45e2ed 100644
--- a/tensorflow/docs_src/tutorials/layers.md
+++ b/tensorflow/docs_src/tutorials/layers.md
@@ -341,7 +341,7 @@ pool2 = tf.layers.max_pooling2d(inputs=conv2, pool_size=[2, 2], strides=2)
 ```
 
 Note that convolutional layer #2 takes the output tensor of our first pooling
-layer (`pool1`) as input, and produces the tensor `h_conv2` as output. `conv2`
+layer (`pool1`) as input, and produces the tensor `conv2` as output. `conv2`
 has a shape of <code>[<em>batch_size</em>, 14, 14, 64]</code>, the same width
 and height as `pool1` (due to `padding="same"`), and 64 channels for the 64
 filters applied.
-- 
GitLab


From ebcc089d41598d59fd93ae2a2aac1203571545c4 Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Wed, 17 May 2017 15:30:22 -0700
Subject: [PATCH 1470/1563] Do not build neon on windows.

PiperOrigin-RevId: 156363256
---
 tensorflow/contrib/cmake/tf_core_kernels.cmake | 1 +
 tensorflow/contrib/cmake/tf_tests.cmake        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index a71d9c5869..e93680fb4d 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -110,6 +110,7 @@ if(WIN32)
       "${tensorflow_source_dir}/tensorflow/core/kernels/meta_support.*"
       "${tensorflow_source_dir}/tensorflow/core/kernels/*quantiz*.h"
       "${tensorflow_source_dir}/tensorflow/core/kernels/*quantiz*.cc"
+      "${tensorflow_source_dir}/tensorflow/core/kernels/neon/*"
       # no in tensorflow.dll - comes from .so
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/blas_gemm.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/rnn/kernels/gru_ops.cc"
diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index 2956d1ed65..2568ca3bad 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -188,6 +188,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
       "${tensorflow_source_dir}/tensorflow/python/training/evaluation_test.py"
       "${tensorflow_source_dir}/tensorflow/tensorboard/backend/server_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/diag_op_test.py"  # Silently failing with GPU kernel disabled.
+      "${tensorflow_source_dir}/tensorflow/python/kernel_tests/neon_depthwise_conv_op_test.py"  # Depends on gemmlowp -> pthread.
       # int32/int64 mixup
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/functional_ops_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/py_func_test.py"
-- 
GitLab


From 9d9aa78c105a2414deed6ced31fb7699f08e55bb Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Wed, 17 May 2017 15:38:59 -0700
Subject: [PATCH 1471/1563] [XLA] Fix bool support for Array2D/Array3D/Array4D.

The Array?D<T> classes were previously backed by a std::vector<T>, which has an inconsistent bitset implementation for T == bool. This meant that the bool instantiations of Array?D caused compile-time errors. Change the Array classes to be backed by a std::unique_ptr<T[]> instead, since the dimensions of an Array are constant.

PiperOrigin-RevId: 156364397
---
 tensorflow/compiler/xla/array2d.h       | 50 ++++++++++++++-------
 tensorflow/compiler/xla/array2d_test.cc | 11 +++++
 tensorflow/compiler/xla/array3d.h       | 58 +++++++++++++++++--------
 tensorflow/compiler/xla/array4d.h       | 44 +++++++++++++------
 4 files changed, 115 insertions(+), 48 deletions(-)

diff --git a/tensorflow/compiler/xla/array2d.h b/tensorflow/compiler/xla/array2d.h
index f885821210..593084a0c1 100644
--- a/tensorflow/compiler/xla/array2d.h
+++ b/tensorflow/compiler/xla/array2d.h
@@ -45,11 +45,15 @@ class Array2D {
 
   // Creates an array of dimensions n1 x n2, uninitialized values.
   Array2D(const int64 n1, const int64 n2)
-      : n1_(n1), n2_(n2), values_(n1 * n2) {}
+      : n1_(n1), n2_(n2), values_(new T[n1 * n2]()) {
+    Fill(T());
+  }
 
   // Creates an array of dimensions n1 x n2, initialized to value.
   Array2D(const int64 n1, const int64 n2, const T value)
-      : n1_(n1), n2_(n2), values_(n1 * n2, value) {}
+      : n1_(n1), n2_(n2), values_(new T[n1 * n2]()) {
+    Fill(value);
+  }
 
   // Creates an array from the given nested initializer list. The outer
   // initializer list is the first dimension; the inner is the second dimension.
@@ -65,16 +69,30 @@ class Array2D {
     }
   }
 
-  T& operator()(const int64 n1, const int64 n2) {
-    CHECK_LT(n1, n1_);
-    CHECK_LT(n2, n2_);
-    return values_[n1 * n2_ + n2];
+  Array2D(const Array2D<T>& other) : Array2D(other.n1(), other.n2()) {
+    std::copy(&other.values_[0], &other.values_[0] + num_elements(),
+              &values_[0]);
+  }
+
+  Array2D<T>& operator=(const Array2D<T>& other) {
+    n1_ = other.n1();
+    n2_ = other.n2();
+    values_.reset(new T[num_elements()]);
+    std::copy(&other.values_[0], &other.values_[0] + num_elements(),
+              &values_[0]);
+    return *this;
+  }
+
+  T& operator()(const int64 i1, const int64 i2) {
+    CHECK_LT(i1, n1_);
+    CHECK_LT(i2, n2_);
+    return values_[i1 * n2_ + i2];
   }
 
-  const T& operator()(const int64 n1, const int64 n2) const {
-    CHECK_LT(n1, n1_);
-    CHECK_LT(n2, n2_);
-    return values_[n1 * n2_ + n2];
+  const T& operator()(const int64 i1, const int64 i2) const {
+    CHECK_LT(i1, n1_);
+    CHECK_LT(i2, n2_);
+    return values_[i1 * n2_ + i2];
   }
 
   // Access to the array's dimensions. height() and width() provide the
@@ -84,15 +102,15 @@ class Array2D {
   int64 n2() const { return n2_; }
   int64 height() const { return n1_; }
   int64 width() const { return n2_; }
-  int64 num_elements() const { return values_.size(); }
+  int64 num_elements() const { return n1_ * n2_; }
 
   // Low-level accessor for stuff like memcmp, handle with care. Returns pointer
   // to the underlying storage of the array (similarly to std::vector::data()).
-  T* data() const { return const_cast<Array2D*>(this)->values_.data(); }
+  T* data() const { return const_cast<Array2D*>(this)->values_.get(); }
 
   // Fills the array with the given value.
   void Fill(const T& value) {
-    std::fill(values_.begin(), values_.end(), value);
+    std::fill(&values_[0], &values_[0] + num_elements(), value);
   }
 
   // Applies f to all cells in this array, in row-major order.
@@ -124,8 +142,8 @@ class Array2D {
     std::mt19937 g(seed);
     std::normal_distribution<double> distribution(mean,
                                                   static_cast<double>(value));
-    for (auto& v : values_) {
-      v = static_cast<T>(distribution(g));
+    for (int64 i = 0; i < num_elements(); ++i) {
+      values_[i] = static_cast<T>(distribution(g));
     }
   }
 
@@ -150,7 +168,7 @@ class Array2D {
  private:
   int64 n1_;
   int64 n2_;
-  std::vector<T> values_;
+  std::unique_ptr<T[]> values_;
 };
 
 // Returns a linspace-populated Array2D in the range [from, to] (inclusive)
diff --git a/tensorflow/compiler/xla/array2d_test.cc b/tensorflow/compiler/xla/array2d_test.cc
index 0d502eaf3b..795d50ca5b 100644
--- a/tensorflow/compiler/xla/array2d_test.cc
+++ b/tensorflow/compiler/xla/array2d_test.cc
@@ -84,6 +84,17 @@ TEST(Array2dTest, IndexingReadWrite) {
   EXPECT_EQ(arr(1, 2), 61);
 }
 
+TEST(Array2dTest, IndexingReadWriteBool) {
+  Array2D<bool> arr = {{false, true, false}, {true, true, false}};
+
+  EXPECT_EQ(arr(1, 1), true);
+  EXPECT_EQ(arr(1, 2), false);
+  arr(1, 1) = false;
+  arr(1, 2) = true;
+  EXPECT_EQ(arr(1, 1), false);
+  EXPECT_EQ(arr(1, 2), true);
+}
+
 TEST(Array2dTest, Fill) {
   Array2D<int> fullof7(2, 3, 7);
   for (int64 n1 = 0; n1 < fullof7.n1(); ++n1) {
diff --git a/tensorflow/compiler/xla/array3d.h b/tensorflow/compiler/xla/array3d.h
index 654af8f030..124ccd1975 100644
--- a/tensorflow/compiler/xla/array3d.h
+++ b/tensorflow/compiler/xla/array3d.h
@@ -20,9 +20,9 @@ limitations under the License.
 #include <functional>
 #include <initializer_list>
 #include <iterator>
+#include <memory>
 #include <numeric>
 #include <random>
-#include <vector>
 
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/platform/logging.h"
@@ -39,11 +39,15 @@ class Array3D {
  public:
   // Creates an array of dimensions n1 x n2 x n3, uninitialized values.
   Array3D(const int64 n1, const int64 n2, const int64 n3)
-      : n1_(n1), n2_(n2), n3_(n3), values_(n1 * n2 * n3) {}
+      : n1_(n1), n2_(n2), n3_(n3), values_(new T[n1 * n2 * n3]) {
+    Fill(T());
+  }
 
   // Creates an array of dimensions n1 x n2 x n3, initialized to value.
   Array3D(const int64 n1, const int64 n2, const int64 n3, const T value)
-      : n1_(n1), n2_(n2), n3_(n3), values_(n1 * n2 * n3, value) {}
+      : n1_(n1), n2_(n2), n3_(n3), values_(new T[n1 * n2 * n3]) {
+    Fill(value);
+  }
 
   // Creates an array from the given nested initializer list. The outer
   // initializer list is the first dimension, and so on.
@@ -69,34 +73,50 @@ class Array3D {
     }
   }
 
-  T& operator()(const int64 n1, const int64 n2, const int64 n3) {
-    CHECK_LT(n1, n1_);
-    CHECK_LT(n2, n2_);
-    CHECK_LT(n3, n3_);
-    return values_[n1 * n2_ * n3_ + n2 * n3_ + n3];
+  Array3D(const Array3D<T>& other)
+      : Array3D(other.n1(), other.n2(), other.n3()) {
+    std::copy(&other.values_[0], &other.values_[0] + num_elements(),
+              &values_[0]);
+  }
+
+  Array3D<T>& operator=(const Array3D<T>& other) {
+    n1_ = other.n1();
+    n2_ = other.n2();
+    n3_ = other.n3();
+    values_.reset(new T[num_elements()]);
+    std::copy(&other.values_[0], &other.values_[0] + num_elements(),
+              &values_[0]);
+    return *this;
+  }
+
+  T& operator()(const int64 i1, const int64 i2, const int64 i3) {
+    CHECK_LT(i1, n1_);
+    CHECK_LT(i2, n2_);
+    CHECK_LT(i3, n3_);
+    return values_[i1 * n2_ * n3_ + i2 * n3_ + i3];
   }
 
-  const T& operator()(const int64 n1, const int64 n2, const int64 n3) const {
-    CHECK_LT(n1, n1_);
-    CHECK_LT(n2, n2_);
-    CHECK_LT(n3, n3_);
-    return values_[n1 * n2_ * n3_ + n2 * n3_ + n3];
+  const T& operator()(const int64 i1, const int64 i2, const int64 i3) const {
+    CHECK_LT(i1, n1_);
+    CHECK_LT(i2, n2_);
+    CHECK_LT(i3, n3_);
+    return values_[i1 * n2_ * n3_ + i2 * n3_ + i3];
   }
 
   // Access to the array's dimensions.
   int64 n1() const { return n1_; }
   int64 n2() const { return n2_; }
   int64 n3() const { return n3_; }
-  int64 num_elements() const { return values_.size(); }
+  int64 num_elements() const { return n1_ * n2_ * n3_; }
 
   // Fills the array with the given value.
   void Fill(const T& value) {
-    std::fill(values_.begin(), values_.end(), value);
+    std::fill(&values_[0], &values_[0] + num_elements(), value);
   }
 
   // Fills the array with sequentially increasing values.
   void FillIota(const T& value) {
-    std::iota(values_.begin(), values_.end(), value);
+    std::iota(&values_[0], &values_[0] + num_elements(), value);
   }
 
   // Fills the array with random normal values with a mean of 0 and standard
@@ -106,8 +126,8 @@ class Array3D {
     std::mt19937 g(seed);
     std::normal_distribution<double> distribution(mean,
                                                   static_cast<double>(value));
-    for (auto& v : values_) {
-      v = static_cast<T>(distribution(g));
+    for (int64 i = 0; i < num_elements(); ++i) {
+      values_[i] = static_cast<T>(distribution(g));
     }
   }
 
@@ -115,7 +135,7 @@ class Array3D {
   int64 n1_;
   int64 n2_;
   int64 n3_;
-  std::vector<T> values_;
+  std::unique_ptr<T[]> values_;
 };
 
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/array4d.h b/tensorflow/compiler/xla/array4d.h
index 199ad2baae..1c6ba1f519 100644
--- a/tensorflow/compiler/xla/array4d.h
+++ b/tensorflow/compiler/xla/array4d.h
@@ -20,6 +20,7 @@ limitations under the License.
 #include <functional>
 #include <initializer_list>
 #include <iterator>
+#include <memory>
 #include <numeric>
 #include <random>
 #include <string>
@@ -60,15 +61,15 @@ class Array4D {
         depth_(depth),
         height_(height),
         width_(width),
-        values_(planes * depth * height * width) {}
+        values_(new T[planes * depth * height * width]) {
+    Fill(T());
+  }
 
   // Creates a 4D array, initalized to value.
   Array4D(int64 planes, int64 depth, int64 height, int64 width, T value)
-      : planes_(planes),
-        depth_(depth),
-        height_(height),
-        width_(width),
-        values_(planes * depth * height * width, value) {}
+      : Array4D(planes, depth, height, width) {
+    Fill(value);
+  }
 
   // Creates a 4D array, filled with values.
   //
@@ -111,6 +112,23 @@ class Array4D {
     }
   }
 
+  Array4D(const Array4D<T>& other)
+      : Array4D(other.planes(), other.depth(), other.height(), other.width()) {
+    std::copy(&other.values_[0], &other.values_[0] + num_elements(),
+              &values_[0]);
+  }
+
+  Array4D<T>& operator=(const Array4D<T>& other) {
+    planes_ = other.planes();
+    depth_ = other.depth();
+    height_ = other.height();
+    width_ = other.width();
+    values_.reset(new T[num_elements()]);
+    std::copy(&other.values_[0], &other.values_[0] + num_elements(),
+              &values_[0]);
+    return *this;
+  }
+
   T& operator()(int64 plane, int64 depth, int64 height, int64 width) {
     CHECK_LT(plane, planes_);
     CHECK_LT(depth, depth_);
@@ -135,24 +153,24 @@ class Array4D {
   int64 n3() const { return height_; }
   int64 n2() const { return depth_; }
   int64 n1() const { return planes_; }
-  int64 num_elements() const { return values_.size(); }
+  int64 num_elements() const { return width_ * height_ * depth_ * planes_; }
 
   // Sets all the values in the array to values.
   template <typename Container = std::initializer_list<T>>
   void SetValues(const Container& container) {
     CHECK_EQ(std::distance(std::begin(container), std::end(container)),
              num_elements());
-    values_.assign(std::begin(container), std::end(container));
+    std::copy(std::begin(container), std::end(container), &values_[0]);
   }
 
   // Fills the array with the given value.
   void Fill(const T& value) {
-    std::fill(values_.begin(), values_.end(), value);
+    std::fill(&values_[0], &values_[0] + num_elements(), value);
   }
 
   // Fills the array with iota.
   void FillIota(const T& value) {
-    std::iota(values_.begin(), values_.end(), value);
+    std::iota(&values_[0], &values_[0] + num_elements(), value);
   }
 
   // Fills the array with random variable with a deviation of value and a mean
@@ -162,8 +180,8 @@ class Array4D {
     std::mt19937 g(seed);
     std::normal_distribution<double> distribution(mean,
                                                   static_cast<double>(value));
-    for (auto& v : values_) {
-      v = static_cast<T>(distribution(g));
+    for (int64 i = 0; i < num_elements(); ++i) {
+      values_[i] = static_cast<T>(distribution(g));
     }
   }
 
@@ -268,7 +286,7 @@ class Array4D {
   int64 depth_;
   int64 height_;
   int64 width_;
-  std::vector<T> values_;
+  std::unique_ptr<T[]> values_;
 };
 
 }  // namespace xla
-- 
GitLab


From 52b4d471ebde27b5065a4f6195049a679d12d97e Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 17 May 2017 16:13:33 -0700
Subject: [PATCH 1472/1563] Delete TensorBoard Gulp build

This CL uses web_library to build all components in the forked d3v4 packages. The tensorboard command now uses the newly vulcanized binary.

This leaves the CMake build for TensorBoard in a partially broken state. We will need to update it to obtain tensorboard/index.html from a web server.

PiperOrigin-RevId: 156369259
---
 WORKSPACE                                     |   500 +-
 bower.BUILD                                   |   645 -
 tensorflow/BUILD                              |     4 +-
 tensorflow/contrib/cmake/CMakeLists.txt       |     1 -
 .../contrib/cmake/external/tensorboard.cmake  |   148 -
 tensorflow/contrib/cmake/tf_python.cmake      |    25 +-
 tensorflow/tensorboard/.bowerrc               |     3 -
 tensorflow/tensorboard/.gitignore             |    27 -
 tensorflow/tensorboard/BUILD                  |    50 +-
 tensorflow/tensorboard/DEVELOPMENT.md         |   123 +-
 tensorflow/tensorboard/app/BUILD              |    19 -
 tensorflow/tensorboard/app/analytics.js       |    16 -
 tensorflow/tensorboard/backend/BUILD          |     2 +-
 tensorflow/tensorboard/backend/application.py |    64 +-
 .../tensorboard/backend/application_test.py   |     5 -
 tensorflow/tensorboard/bower.json             |   187 -
 tensorflow/tensorboard/bower/BUILD            |    76 -
 tensorflow/tensorboard/components/BUILD       |    39 +-
 .../graphlib.html => analytics.html}          |     2 +-
 tensorflow/tensorboard/components/index.html  |    39 -
 .../dist.html => tensorboard.html}            |    15 +-
 .../components/tf_audio_dashboard/BUILD       |     3 +-
 .../tensorboard/components/tf_backend/BUILD   |    12 +-
 .../components/tf_backend_d3v4/BUILD          |     1 +
 .../components/tf_color_scale/BUILD           |    14 +-
 .../components/tf_dashboard_common/BUILD      |    12 +-
 .../tf_distribution_dashboard/BUILD           |     4 +-
 .../components/tf_graph_common/BUILD          |    14 +-
 .../components/tf_histogram_dashboard/BUILD   |     2 +-
 .../tensorboard/components/tf_imports/BUILD   |     4 +-
 .../components/tf_imports_d3v4/BUILD          |    10 +-
 .../components/tf_imports_google/README.md    |     3 -
 .../components/tf_imports_google/d3.html      |    18 -
 .../components/tf_imports_google/dagre.html   |    18 -
 .../tf_imports_google/plottable.html          |    19 -
 .../components/tf_scalar_dashboard/BUILD      |     3 +-
 .../tensorboard/components/tf_storage/BUILD   |    12 +-
 .../components/tf_tensorboard_d3v4/BUILD      |    43 +-
 .../components/tf_tensorboard_d3v4/demo.html  |    15 +-
 .../style.html}                               |    12 +-
 .../tf_tensorboard_d3v4/tf-tensorboard.html   |     3 +-
 .../components/vz_distribution_chart/BUILD    |    12 +-
 .../tensorboard/components/vz_heatmap/BUILD   |    29 +
 .../components/vz_heatmap/demo/index.html     |     3 +-
 .../components/vz_heatmap/vz-heatmap.html     |     6 +-
 .../components/vz_heatmap_d3v4/BUILD          |    41 +
 .../vz_heatmap_d3v4/demo/index.html           |   161 +
 .../vz_heatmap_d3v4/index.html}               |    18 +-
 .../vz_heatmap_d3v4/vz-heatmap.html           |   360 +
 .../components/vz_histogram_timeseries/BUILD  |     2 +-
 .../components/vz_line_chart/BUILD            |    14 +-
 .../tensorboard/components/vz_sorting/BUILD   |     1 -
 .../components/vz_sorting/test/BUILD          |    10 +-
 tensorflow/tensorboard/dist/index.html        |    32 -
 .../tensorboard/dist/tf-tensorboard.html      | 27143 ----------------
 tensorflow/tensorboard/gulp_tasks/bower.js    |    23 -
 tensorflow/tensorboard/gulp_tasks/compile.js  |    95 -
 tensorflow/tensorboard/gulp_tasks/test.js     |    28 -
 tensorflow/tensorboard/gulp_tasks/util.js     |    39 -
 .../tensorboard/gulp_tasks/vulcanize.js       |    83 -
 tensorflow/tensorboard/gulpfile.js            |    91 -
 .../tensorflow/tensorboard/vulcanize/BUILD    |     1 +
 tensorflow/tensorboard/lib/BUILD              |    22 -
 tensorflow/tensorboard/lib/css/global.css     |    21 -
 tensorflow/tensorboard/package.json           |    39 -
 tensorflow/tensorboard/tsconfig.json          |    16 -
 tensorflow/tensorboard/wct.conf.json          |     7 -
 tensorflow/tools/pip_package/BUILD            |     8 +-
 tensorflow/tools/pip_package/setup.py         |     5 +-
 tensorflow/workspace.bzl                      |    24 +
 70 files changed, 858 insertions(+), 29688 deletions(-)
 delete mode 100644 bower.BUILD
 delete mode 100644 tensorflow/contrib/cmake/external/tensorboard.cmake
 delete mode 100644 tensorflow/tensorboard/.bowerrc
 delete mode 100644 tensorflow/tensorboard/.gitignore
 delete mode 100644 tensorflow/tensorboard/app/BUILD
 delete mode 100644 tensorflow/tensorboard/app/analytics.js
 delete mode 100644 tensorflow/tensorboard/bower.json
 delete mode 100644 tensorflow/tensorboard/bower/BUILD
 rename tensorflow/tensorboard/components/{tf_imports_google/graphlib.html => analytics.html} (89%)
 delete mode 100644 tensorflow/tensorboard/components/index.html
 rename tensorflow/tensorboard/components/{tf_tensorboard_d3v4/dist.html => tensorboard.html} (89%)
 delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/README.md
 delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/d3.html
 delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/dagre.html
 delete mode 100644 tensorflow/tensorboard/components/tf_imports_google/plottable.html
 rename tensorflow/tensorboard/components/{tf_imports_google/lodash.html => tf_tensorboard_d3v4/style.html} (75%)
 create mode 100644 tensorflow/tensorboard/components/vz_heatmap/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_heatmap_d3v4/BUILD
 create mode 100644 tensorflow/tensorboard/components/vz_heatmap_d3v4/demo/index.html
 rename tensorflow/tensorboard/{dist/bazel-html-imports.html => components/vz_heatmap_d3v4/index.html} (62%)
 create mode 100644 tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html
 delete mode 100644 tensorflow/tensorboard/dist/index.html
 delete mode 100644 tensorflow/tensorboard/dist/tf-tensorboard.html
 delete mode 100644 tensorflow/tensorboard/gulp_tasks/bower.js
 delete mode 100644 tensorflow/tensorboard/gulp_tasks/compile.js
 delete mode 100644 tensorflow/tensorboard/gulp_tasks/test.js
 delete mode 100644 tensorflow/tensorboard/gulp_tasks/util.js
 delete mode 100644 tensorflow/tensorboard/gulp_tasks/vulcanize.js
 delete mode 100644 tensorflow/tensorboard/gulpfile.js
 delete mode 100644 tensorflow/tensorboard/lib/BUILD
 delete mode 100644 tensorflow/tensorboard/lib/css/global.css
 delete mode 100644 tensorflow/tensorboard/package.json
 delete mode 100644 tensorflow/tensorboard/tsconfig.json
 delete mode 100644 tensorflow/tensorboard/wct.conf.json

diff --git a/WORKSPACE b/WORKSPACE
index b2d6fb542b..edf655f6a7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,7 +20,7 @@ load("//tensorflow:workspace.bzl", "tf_workspace")
 #android_sdk_repository(
 #    name = "androidsdk",
 #    api_level = 23,
-#    # Ensure that you have the build_tools_version below installed in the 
+#    # Ensure that you have the build_tools_version below installed in the
 #    # SDK manager as it updates periodically.
 #    build_tools_version = "25.0.2",
 #    # Replace with path to Android SDK on your system
@@ -31,7 +31,7 @@ load("//tensorflow:workspace.bzl", "tf_workspace")
 #android_ndk_repository(
 #    name="androidndk",
 #    path="<PATH_TO_NDK>",
-#    # This needs to be 14 or higher to compile TensorFlow. 
+#    # This needs to be 14 or higher to compile TensorFlow.
 #    # Note that the NDK version is not the API level.
 #    api_level=14)
 
@@ -39,485 +39,31 @@ load("//tensorflow:workspace.bzl", "tf_workspace")
 tf_workspace()
 
 new_http_archive(
-  name = "inception5h",
-  build_file = "models.BUILD",
-  url = "https://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip",
-  sha256 = "d13569f6a98159de37e92e9c8ec4dae8f674fbf475f69fe6199b514f756d4364"
-)
-
-new_http_archive(
-  name = "mobile_multibox",
-  build_file = "models.BUILD",
-  url = "https://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip",
-  sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96"
-)
-
-new_http_archive(
-  name = "stylize",
-  build_file = "models.BUILD",
-  url = "https://storage.googleapis.com/download.tensorflow.org/models/stylize_v1.zip",
-  sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa"
-)
-
-# TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT
-
-new_http_archive(
-  name = "d3",
-  build_file = "bower.BUILD",
-  url = "https://github.com/mbostock-bower/d3-bower/archive/v3.5.15.tar.gz",
-  strip_prefix = "d3-bower-3.5.15",
-)
-
-new_http_archive(
-  name = "dagre",
-  build_file = "bower.BUILD",
-  url = "https://github.com/cpettitt/dagre/archive/v0.7.4.tar.gz",
-  strip_prefix = "dagre-0.7.4",
-)
-
-new_http_archive(
-  name = "es6_promise",
-  build_file = "bower.BUILD",
-  url = "https://github.com/components/es6-promise/archive/v2.1.0.tar.gz",
-  strip_prefix = "es6-promise-2.1.0",
-)
-
-new_http_archive(
-  name = "font_roboto",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/font-roboto/archive/v1.0.1.tar.gz",
-  strip_prefix = "font-roboto-1.0.1",
-)
-
-new_http_archive(
-  name = "graphlib",
-  build_file = "bower.BUILD",
-  url = "https://github.com/cpettitt/graphlib/archive/v1.0.7.tar.gz",
-  strip_prefix = "graphlib-1.0.7",
-)
-
-new_http_archive(
-  name = "iron_a11y_announcer",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-a11y-announcer/archive/v1.0.5.tar.gz",
-  strip_prefix = "iron-a11y-announcer-1.0.5",
-)
-
-new_http_archive(
-  name = "iron_a11y_keys_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-a11y-keys-behavior/archive/v1.1.8.tar.gz",
-  strip_prefix = "iron-a11y-keys-behavior-1.1.8",
-)
-
-new_http_archive(
-  name = "iron_ajax",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-ajax/archive/v1.2.0.tar.gz",
-  strip_prefix = "iron-ajax-1.2.0",
-)
-
-new_http_archive(
-  name = "iron_autogrow_textarea",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-autogrow-textarea/archive/v1.0.12.tar.gz",
-  strip_prefix = "iron-autogrow-textarea-1.0.12",
-)
-
-new_http_archive(
-  name = "iron_behaviors",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-behaviors/archive/v1.0.17.tar.gz",
-  strip_prefix = "iron-behaviors-1.0.17",
-)
-
-new_http_archive(
-  name = "iron_checked_element_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-checked-element-behavior/archive/v1.0.4.tar.gz",
-  strip_prefix = "iron-checked-element-behavior-1.0.4",
-)
-
-new_http_archive(
-  name = "iron_collapse",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-collapse/archive/v1.0.8.tar.gz",
-  strip_prefix = "iron-collapse-1.0.8",
-)
-
-new_http_archive(
-  name = "iron_dropdown",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-dropdown/archive/v1.4.0.tar.gz",
-  strip_prefix = "iron-dropdown-1.4.0",
-)
-
-new_http_archive(
-  name = "iron_fit_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-fit-behavior/archive/v1.2.5.tar.gz",
-  strip_prefix = "iron-fit-behavior-1.2.5",
-)
-
-new_http_archive(
-  name = "iron_flex_layout",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-flex-layout/archive/v1.3.0.tar.gz",
-  strip_prefix = "iron-flex-layout-1.3.0",
-)
-
-new_http_archive(
-  name = "iron_form_element_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-form-element-behavior/archive/v1.0.6.tar.gz",
-  strip_prefix = "iron-form-element-behavior-1.0.6",
-)
-
-new_http_archive(
-  name = "iron_icon",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-icon/archive/v1.0.11.tar.gz",
-  strip_prefix = "iron-icon-1.0.11",
-)
-
-new_http_archive(
-  name = "iron_icons",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-icons/archive/v1.1.3.tar.gz",
-  strip_prefix = "iron-icons-1.1.3",
-)
-
-new_http_archive(
-  name = "iron_iconset_svg",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-iconset-svg/archive/v1.1.0.tar.gz",
-  strip_prefix = "iron-iconset-svg-1.1.0",
-)
-
-new_http_archive(
-  name = "iron_input",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-input/archive/1.0.10.tar.gz",
-  strip_prefix = "iron-input-1.0.10",
-)
-
-new_http_archive(
-  name = "iron_list",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-list/archive/v1.3.9.tar.gz",
-  strip_prefix = "iron-list-1.3.9",
-)
-
-new_http_archive(
-  name = "iron_menu_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-menu-behavior/archive/v1.1.10.tar.gz",
-  strip_prefix = "iron-menu-behavior-1.1.10",
-)
-
-new_http_archive(
-  name = "iron_meta",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-meta/archive/v1.1.1.tar.gz",
-  strip_prefix = "iron-meta-1.1.1",
-)
-
-new_http_archive(
-  name = "iron_overlay_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-overlay-behavior/archive/v1.10.1.tar.gz",
-  strip_prefix = "iron-overlay-behavior-1.10.1",
-)
-
-new_http_archive(
-  name = "iron_range_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-range-behavior/archive/v1.0.4.tar.gz",
-  strip_prefix = "iron-range-behavior-1.0.4",
-)
-
-new_http_archive(
-  name = "iron_resizable_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-resizable-behavior/archive/v1.0.3.tar.gz",
-  strip_prefix = "iron-resizable-behavior-1.0.3",
-)
-
-new_http_archive(
-  name = "iron_scroll_target_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-scroll-target-behavior/archive/v1.0.3.tar.gz",
-  strip_prefix = "iron-scroll-target-behavior-1.0.3",
-)
-
-new_http_archive(
-  name = "iron_selector",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-selector/archive/v1.5.2.tar.gz",
-  strip_prefix = "iron-selector-1.5.2",
-)
-
-new_http_archive(
-  name = "iron_validatable_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/iron-validatable-behavior/archive/v1.1.1.tar.gz",
-  strip_prefix = "iron-validatable-behavior-1.1.1",
-)
-
-new_http_archive(
-  name = "lodash",
-  build_file = "bower.BUILD",
-  url = "https://github.com/lodash/lodash/archive/3.8.0.tar.gz",
-  strip_prefix = "lodash-3.8.0",
-)
-
-new_http_archive(
-  name = "neon_animation",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/neon-animation/archive/v1.2.2.tar.gz",
-  strip_prefix = "neon-animation-1.2.2",
-)
-
-http_file(
-  name = "numericjs_numeric_min_js",
-  url = "https://cdnjs.cloudflare.com/ajax/libs/numeric/1.2.6/numeric.min.js",
-)
-
-new_http_archive(
-  name = "paper_behaviors",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-behaviors/archive/v1.0.12.tar.gz",
-  strip_prefix = "paper-behaviors-1.0.12",
-)
-
-new_http_archive(
-  name = "paper_button",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-button/archive/v1.0.11.tar.gz",
-  strip_prefix = "paper-button-1.0.11",
-)
-
-new_http_archive(
-  name = "paper_checkbox",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-checkbox/archive/v1.4.0.tar.gz",
-  strip_prefix = "paper-checkbox-1.4.0",
-)
-
-new_http_archive(
-  name = "paper_dialog",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-dialog/archive/v1.0.4.tar.gz",
-  strip_prefix = "paper-dialog-1.0.4",
-)
-
-new_http_archive(
-  name = "paper_dialog_behavior",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-dialog-behavior/archive/v1.2.5.tar.gz",
-  strip_prefix = "paper-dialog-behavior-1.2.5",
-)
-
-new_http_archive(
-  name = "paper_dialog_scrollable",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-dialog-scrollable/archive/1.1.5.tar.gz",
-  strip_prefix = "paper-dialog-scrollable-1.1.5",
-)
-
-new_http_archive(
-  name = "paper_dropdown_menu",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-dropdown-menu/archive/v1.4.0.tar.gz",
-  strip_prefix = "paper-dropdown-menu-1.4.0",
-)
-
-new_http_archive(
-  name = "paper_header_panel",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-header-panel/archive/v1.1.4.tar.gz",
-  strip_prefix = "paper-header-panel-1.1.4",
-)
-
-new_http_archive(
-  name = "paper_icon_button",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-icon-button/archive/v1.1.3.tar.gz",
-  strip_prefix = "paper-icon-button-1.1.3",
-)
-
-new_http_archive(
-  name = "paper_input",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-input/archive/v1.1.18.tar.gz",
-  strip_prefix = "paper-input-1.1.18",
-)
-
-new_http_archive(
-  name = "paper_item",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-item/archive/v1.1.4.tar.gz",
-  strip_prefix = "paper-item-1.1.4",
-)
-
-new_http_archive(
-  name = "paper_listbox",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-listbox/archive/v1.1.2.tar.gz",
-  strip_prefix = "paper-listbox-1.1.2",
-)
-
-new_http_archive(
-  name = "paper_material",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-material/archive/v1.0.6.tar.gz",
-  strip_prefix = "paper-material-1.0.6",
-)
-
-new_http_archive(
-  name = "paper_menu",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-menu/archive/v1.2.2.tar.gz",
-  strip_prefix = "paper-menu-1.2.2",
-)
-
-new_http_archive(
-  name = "paper_menu_button",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-menu-button/archive/v1.5.1.tar.gz",
-  strip_prefix = "paper-menu-button-1.5.1",
-)
-
-new_http_archive(
-  name = "paper_progress",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-progress/archive/v1.0.9.tar.gz",
-  strip_prefix = "paper-progress-1.0.9",
-)
-
-new_http_archive(
-  name = "paper_radio_button",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-radio-button/archive/v1.1.2.tar.gz",
-  strip_prefix = "paper-radio-button-1.1.2",
-)
-
-new_http_archive(
-  name = "paper_radio_group",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-radio-group/archive/v1.0.9.tar.gz",
-  strip_prefix = "paper-radio-group-1.0.9",
-)
-
-new_http_archive(
-  name = "paper_ripple",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-ripple/archive/v1.0.5.tar.gz",
-  strip_prefix = "paper-ripple-1.0.5",
-)
-
-new_http_archive(
-  name = "paper_slider",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-slider/archive/v1.0.10.tar.gz",
-  strip_prefix = "paper-slider-1.0.10",
-)
-
-new_http_archive(
-  name = "paper_spinner",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-spinner/archive/v1.1.1.tar.gz",
-  strip_prefix = "paper-spinner-1.1.1",
-)
-
-new_http_archive(
-  name = "paper_styles",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-styles/archive/v1.1.4.tar.gz",
-  strip_prefix = "paper-styles-1.1.4",
-)
-
-new_http_archive(
-  name = "paper_tabs",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-tabs/archive/v1.7.0.tar.gz",
-  strip_prefix = "paper-tabs-1.7.0",
-)
-
-new_http_archive(
-  name = "paper_toast",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-toast/archive/v1.3.0.tar.gz",
-  strip_prefix = "paper-toast-1.3.0",
-)
-
-new_http_archive(
-  name = "paper_toggle_button",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-toggle-button/archive/v1.2.0.tar.gz",
-  strip_prefix = "paper-toggle-button-1.2.0",
-)
-
-new_http_archive(
-  name = "paper_toolbar",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-toolbar/archive/v1.1.4.tar.gz",
-  strip_prefix = "paper-toolbar-1.1.4",
-)
-
-new_http_archive(
-  name = "paper_tooltip",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerelements/paper-tooltip/archive/v1.1.2.tar.gz",
-  strip_prefix = "paper-tooltip-1.1.2",
-)
-
-new_http_archive(
-  name = "plottable",
-  build_file = "bower.BUILD",
-  url = "https://github.com/palantir/plottable/archive/v1.16.1.tar.gz",
-  strip_prefix = "plottable-1.16.1",
-)
-
-new_http_archive(
-  name = "polymer",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymer/polymer/archive/v1.7.0.tar.gz",
-  strip_prefix = "polymer-1.7.0",
-)
-
-new_http_archive(
-  name = "promise_polyfill",
-  build_file = "bower.BUILD",
-  url = "https://github.com/polymerlabs/promise-polyfill/archive/v1.0.0.tar.gz",
-  strip_prefix = "promise-polyfill-1.0.0",
-)
-
-http_file(
-  name = "three_js_three_min_js",
-  url = "https://raw.githubusercontent.com/mrdoob/three.js/r77/build/three.min.js",
-)
-
-http_file(
-  name = "three_js_orbitcontrols_js",
-  url = "https://raw.githubusercontent.com/mrdoob/three.js/r77/examples/js/controls/OrbitControls.js",
+    name = "inception5h",
+    build_file = "models.BUILD",
+    sha256 = "d13569f6a98159de37e92e9c8ec4dae8f674fbf475f69fe6199b514f756d4364",
+    urls = [
+        "http://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip",
+        "http://download.tensorflow.org/models/inception5h.zip",
+    ],
 )
 
 new_http_archive(
-  name = "web_animations_js",
-  build_file = "bower.BUILD",
-  url = "https://github.com/web-animations/web-animations-js/archive/2.2.1.tar.gz",
-  strip_prefix = "web-animations-js-2.2.1",
+    name = "mobile_multibox",
+    build_file = "models.BUILD",
+    sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96",
+    urls = [
+        "http://storage.googleapis.com/download.tensorflow.org/models/mobile_multibox_v1a.zip",
+        "http://download.tensorflow.org/models/mobile_multibox_v1a.zip",
+    ],
 )
 
 new_http_archive(
-  name = "webcomponentsjs",
-  build_file = "bower.BUILD",
-  url = "https://github.com/webcomponents/webcomponentsjs/archive/v0.7.22.tar.gz",
-  strip_prefix = "webcomponentsjs-0.7.22",
-)
-
-http_file(
-  name = "weblas_weblas_js",
-  url = "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
+    name = "stylize",
+    build_file = "models.BUILD",
+    sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa",
+    urls = [
+        "http://storage.googleapis.com/download.tensorflow.org/models/stylize_v1.zip",
+        "http://download.tensorflow.org/models/stylize_v1.zip",
+    ],
 )
diff --git a/bower.BUILD b/bower.BUILD
deleted file mode 100644
index eabd1d6450..0000000000
--- a/bower.BUILD
+++ /dev/null
@@ -1,645 +0,0 @@
-# AUTOGENERATED FILE by tensorboard_bower_dependency_sync.py
-
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "d3",
-    srcs = [
-        "d3.js",
-        "d3.min.js",
-        "package.js",
-    ],
-)
-
-filegroup(
-    name = "dagre",
-    srcs = [
-        "dist/dagre.core.js",
-        "dist/dagre.core.min.js",
-    ],
-)
-
-filegroup(
-    name = "es6_promise",
-    srcs = [
-        "promise.js",
-        "promise.min.js",
-    ],
-)
-
-filegroup(
-    name = "font_roboto",
-    srcs = ["roboto.html"],
-)
-
-filegroup(
-    name = "graphlib",
-    srcs = [
-        "dist/graphlib.core.js",
-        "dist/graphlib.core.min.js",
-    ],
-)
-
-filegroup(
-    name = "iron_a11y_announcer",
-    srcs = [
-        "index.html",
-        "iron-a11y-announcer.html",
-    ],
-)
-
-filegroup(
-    name = "iron_a11y_keys_behavior",
-    srcs = [
-        "index.html",
-        "iron-a11y-keys-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_ajax",
-    srcs = [
-        "index.html",
-        "iron-ajax.html",
-        "iron-request.html",
-    ],
-)
-
-filegroup(
-    name = "iron_autogrow_textarea",
-    srcs = [
-        "index.html",
-        "iron-autogrow-textarea.html",
-    ],
-)
-
-filegroup(
-    name = "iron_behaviors",
-    srcs = [
-        "index.html",
-        "iron-button-state.html",
-        "iron-control-state.html",
-    ],
-)
-
-filegroup(
-    name = "iron_checked_element_behavior",
-    srcs = [
-        "index.html",
-        "iron-checked-element-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_collapse",
-    srcs = [
-        "index.html",
-        "iron-collapse.html",
-    ],
-)
-
-filegroup(
-    name = "iron_dropdown",
-    srcs = [
-        "index.html",
-        "iron-dropdown.html",
-        "iron-dropdown-scroll-manager.html",
-    ],
-)
-
-filegroup(
-    name = "iron_fit_behavior",
-    srcs = [
-        "index.html",
-        "iron-fit-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_flex_layout",
-    srcs = [
-        "classes/iron-flex-layout.html",
-        "classes/iron-shadow-flex-layout.html",
-        "index.html",
-        "iron-flex-layout.html",
-        "iron-flex-layout-classes.html",
-    ],
-)
-
-filegroup(
-    name = "iron_form_element_behavior",
-    srcs = [
-        "index.html",
-        "iron-form-element-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_icon",
-    srcs = [
-        "index.html",
-        "iron-icon.html",
-    ],
-)
-
-filegroup(
-    name = "iron_icons",
-    srcs = [
-        "av-icons.html",
-        "communication-icons.html",
-        "device-icons.html",
-        "editor-icons.html",
-        "hardware-icons.html",
-        "image-icons.html",
-        "index.html",
-        "iron-icons.html",
-        "maps-icons.html",
-        "notification-icons.html",
-        "places-icons.html",
-        "social-icons.html",
-    ],
-)
-
-filegroup(
-    name = "iron_iconset_svg",
-    srcs = [
-        "index.html",
-        "iron-iconset-svg.html",
-    ],
-)
-
-filegroup(
-    name = "iron_input",
-    srcs = [
-        "index.html",
-        "iron-input.html",
-    ],
-)
-
-filegroup(
-    name = "iron_list",
-    srcs = [
-        "index.html",
-        "iron-list.html",
-        "test/smoke/avg-worst-case.html",
-        "test/smoke/dummy-data.html",
-        "test/smoke/index.html",
-        "test/smoke/physical-count.html",
-    ],
-)
-
-filegroup(
-    name = "iron_menu_behavior",
-    srcs = [
-        "index.html",
-        "iron-menu-behavior.html",
-        "iron-menubar-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_meta",
-    srcs = [
-        "index.html",
-        "iron-meta.html",
-    ],
-)
-
-filegroup(
-    name = "iron_overlay_behavior",
-    srcs = [
-        "index.html",
-        "iron-focusables-helper.html",
-        "iron-overlay-backdrop.html",
-        "iron-overlay-behavior.html",
-        "iron-overlay-manager.html",
-    ],
-)
-
-filegroup(
-    name = "iron_range_behavior",
-    srcs = [
-        "index.html",
-        "iron-range-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_resizable_behavior",
-    srcs = [
-        "demo/src/x-app.html",
-        "index.html",
-        "iron-resizable-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_scroll_target_behavior",
-    srcs = [
-        "index.html",
-        "iron-scroll-target-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "iron_selector",
-    srcs = [
-        "index.html",
-        "iron-multi-selectable.html",
-        "iron-selectable.html",
-        "iron-selection.html",
-        "iron-selector.html",
-    ],
-)
-
-filegroup(
-    name = "iron_validatable_behavior",
-    srcs = [
-        "index.html",
-        "iron-validatable-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "lodash",
-    srcs = [
-        "lodash.js",
-        "lodash.min.js",
-    ],
-)
-
-filegroup(
-    name = "neon_animation",
-    srcs = [
-        "animations/cascaded-animation.html",
-        "animations/fade-in-animation.html",
-        "animations/fade-out-animation.html",
-        "animations/hero-animation.html",
-        "animations/opaque-animation.html",
-        "animations/reverse-ripple-animation.html",
-        "animations/ripple-animation.html",
-        "animations/scale-down-animation.html",
-        "animations/scale-up-animation.html",
-        "animations/slide-down-animation.html",
-        "animations/slide-from-bottom-animation.html",
-        "animations/slide-from-left-animation.html",
-        "animations/slide-from-right-animation.html",
-        "animations/slide-from-top-animation.html",
-        "animations/slide-left-animation.html",
-        "animations/slide-right-animation.html",
-        "animations/slide-up-animation.html",
-        "animations/transform-animation.html",
-        "demo/card/index.html",
-        "demo/card/x-card.html",
-        "demo/card/x-cards-list.html",
-        "demo/declarative/index.html",
-        "demo/doc/index.html",
-        "demo/doc/my-animatable.html",
-        "demo/doc/my-dialog.html",
-        "demo/dropdown/animated-dropdown.html",
-        "demo/dropdown/index.html",
-        "demo/grid/animated-grid.html",
-        "demo/grid/fullsize-page-with-card.html",
-        "demo/grid/index.html",
-        "demo/list/full-view.html",
-        "demo/list/index.html",
-        "demo/list/list-demo.html",
-        "demo/list/list-view.html",
-        "demo/load/animated-grid.html",
-        "demo/load/full-page.html",
-        "demo/load/index.html",
-        "demo/reprojection/animated-grid.html",
-        "demo/reprojection/fullsize-page-with-card.html",
-        "demo/reprojection/index.html",
-        "demo/reprojection/reprojected-pages.html",
-        "demo/tiles/circles-page.html",
-        "demo/tiles/index.html",
-        "demo/tiles/squares-page.html",
-        "index.html",
-        "neon-animatable.html",
-        "neon-animatable-behavior.html",
-        "neon-animated-pages.html",
-        "neon-animation.html",
-        "neon-animation-behavior.html",
-        "neon-animation-runner-behavior.html",
-        "neon-animations.html",
-        "neon-shared-element-animatable-behavior.html",
-        "neon-shared-element-animation-behavior.html",
-        "web-animations.html",
-    ],
-)
-
-filegroup(
-    name = "paper_behaviors",
-    srcs = [
-        "index.html",
-        "paper-button-behavior.html",
-        "paper-checked-element-behavior.html",
-        "paper-inky-focus-behavior.html",
-        "paper-ripple-behavior.html",
-    ],
-)
-
-filegroup(
-    name = "paper_button",
-    srcs = [
-        "index.html",
-        "paper-button.html",
-    ],
-)
-
-filegroup(
-    name = "paper_checkbox",
-    srcs = [
-        "index.html",
-        "paper-checkbox.html",
-    ],
-)
-
-filegroup(
-    name = "paper_dialog",
-    srcs = [
-        "index.html",
-        "paper-dialog.html",
-    ],
-)
-
-filegroup(
-    name = "paper_dialog_behavior",
-    srcs = [
-        "index.html",
-        "paper-dialog-behavior.html",
-        "paper-dialog-common.css",
-        "paper-dialog-shared-styles.html",
-    ],
-)
-
-filegroup(
-    name = "paper_dialog_scrollable",
-    srcs = [
-        "index.html",
-        "paper-dialog-scrollable.html",
-    ],
-)
-
-filegroup(
-    name = "paper_dropdown_menu",
-    srcs = [
-        "index.html",
-        "paper-dropdown-menu.html",
-        "paper-dropdown-menu-icons.html",
-        "paper-dropdown-menu-light.html",
-        "paper-dropdown-menu-shared-styles.html",
-    ],
-)
-
-filegroup(
-    name = "paper_header_panel",
-    srcs = [
-        "index.html",
-        "paper-header-panel.html",
-    ],
-)
-
-filegroup(
-    name = "paper_icon_button",
-    srcs = [
-        "index.html",
-        "paper-icon-button.html",
-        "paper-icon-button-light.html",
-    ],
-)
-
-filegroup(
-    name = "paper_input",
-    srcs = [
-        "all-imports.html",
-        "index.html",
-        "paper-input.html",
-        "paper-input-addon-behavior.html",
-        "paper-input-behavior.html",
-        "paper-input-char-counter.html",
-        "paper-input-container.html",
-        "paper-input-error.html",
-        "paper-textarea.html",
-    ],
-)
-
-filegroup(
-    name = "paper_item",
-    srcs = [
-        "all-imports.html",
-        "index.html",
-        "paper-icon-item.html",
-        "paper-item.html",
-        "paper-item-behavior.html",
-        "paper-item-body.html",
-        "paper-item-shared-styles.html",
-    ],
-)
-
-filegroup(
-    name = "paper_listbox",
-    srcs = [
-        "index.html",
-        "paper-listbox.html",
-    ],
-)
-
-filegroup(
-    name = "paper_material",
-    srcs = [
-        "index.html",
-        "paper-material.html",
-        "paper-material-shared-styles.html",
-    ],
-)
-
-filegroup(
-    name = "paper_menu",
-    srcs = [
-        "index.html",
-        "paper-menu.html",
-        "paper-menu-shared-styles.html",
-        "paper-submenu.html",
-    ],
-)
-
-filegroup(
-    name = "paper_menu_button",
-    srcs = [
-        "index.html",
-        "paper-menu-button.html",
-        "paper-menu-button-animations.html",
-    ],
-)
-
-filegroup(
-    name = "paper_progress",
-    srcs = [
-        "index.html",
-        "paper-progress.html",
-    ],
-)
-
-filegroup(
-    name = "paper_radio_button",
-    srcs = [
-        "index.html",
-        "paper-radio-button.html",
-    ],
-)
-
-filegroup(
-    name = "paper_radio_group",
-    srcs = [
-        "index.html",
-        "paper-radio-group.html",
-    ],
-)
-
-filegroup(
-    name = "paper_ripple",
-    srcs = [
-        "index.html",
-        "paper-ripple.html",
-    ],
-)
-
-filegroup(
-    name = "paper_slider",
-    srcs = [
-        "index.html",
-        "paper-slider.html",
-    ],
-)
-
-filegroup(
-    name = "paper_spinner",
-    srcs = [
-        "index.html",
-        "paper-spinner.html",
-        "paper-spinner-behavior.html",
-        "paper-spinner-lite.html",
-        "paper-spinner-styles.html",
-    ],
-)
-
-filegroup(
-    name = "paper_styles",
-    srcs = [
-        "classes/global.html",
-        "classes/shadow.html",
-        "classes/shadow-layout.html",
-        "classes/typography.html",
-        "color.html",
-        "default-theme.html",
-        "demo.css",
-        "demo-pages.html",
-        "index.html",
-        "paper-styles.html",
-        "paper-styles-classes.html",
-        "shadow.html",
-        "typography.html",
-    ],
-)
-
-filegroup(
-    name = "paper_tabs",
-    srcs = [
-        "index.html",
-        "paper-tab.html",
-        "paper-tabs.html",
-        "paper-tabs-icons.html",
-    ],
-)
-
-filegroup(
-    name = "paper_toast",
-    srcs = [
-        "index.html",
-        "paper-toast.html",
-    ],
-)
-
-filegroup(
-    name = "paper_toggle_button",
-    srcs = [
-        "index.html",
-        "paper-toggle-button.html",
-    ],
-)
-
-filegroup(
-    name = "paper_toolbar",
-    srcs = [
-        "index.html",
-        "paper-toolbar.html",
-    ],
-)
-
-filegroup(
-    name = "paper_tooltip",
-    srcs = [
-        "index.html",
-        "paper-tooltip.html",
-    ],
-)
-
-filegroup(
-    name = "plottable",
-    srcs = [
-        "plottable.css",
-        "plottable.js",
-        "plottable.min.js",
-    ],
-)
-
-filegroup(
-    name = "polymer",
-    srcs = [
-        "polymer.html",
-        "polymer-micro.html",
-        "polymer-mini.html",
-    ],
-)
-
-filegroup(
-    name = "promise_polyfill",
-    srcs = [
-        "Gruntfile.js",
-        "Promise.js",
-        "Promise.min.js",
-        "Promise-Statics.js",
-        "promise-polyfill.html",
-        "promise-polyfill-lite.html",
-    ],
-)
-
-filegroup(
-    name = "web_animations_js",
-    srcs = [
-        "web-animations.html",
-        "web-animations.min.js",
-        "web-animations-next.min.js",
-        "web-animations-next-lite.min.js",
-    ],
-)
-
-filegroup(
-    name = "webcomponentsjs",
-    srcs = [
-        "CustomElements.js",
-        "CustomElements.min.js",
-        "HTMLImports.js",
-        "HTMLImports.min.js",
-        "MutationObserver.js",
-        "MutationObserver.min.js",
-        "ShadowDOM.js",
-        "ShadowDOM.min.js",
-        "webcomponents.js",
-        "webcomponents.min.js",
-        "webcomponents-lite.js",
-        "webcomponents-lite.min.js",
-    ],
-)
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 8f67ae25df..acd5c108f9 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -321,7 +321,6 @@ filegroup(
         "//tensorflow/python/saved_model:all_files",
         "//tensorflow/python/tools:all_files",
         "//tensorflow/tensorboard:all_files",
-        "//tensorflow/tensorboard/app:all_files",
         "//tensorflow/tensorboard/backend:all_files",
         "//tensorflow/tensorboard/backend/event_processing:all_files",
         "//tensorflow/tensorboard/components:all_files",
@@ -404,6 +403,8 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_distribution_chart:all_files",
         "//tensorflow/tensorboard/components/vz_distribution_chart/demo:all_files",
         "//tensorflow/tensorboard/components/vz_distribution_chart_d3v4:all_files",
+        "//tensorflow/tensorboard/components/vz_heatmap:all_files",
+        "//tensorflow/tensorboard/components/vz_heatmap_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_histogram_timeseries:all_files",
         "//tensorflow/tensorboard/components/vz_histogram_timeseries/demo:all_files",
         "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4:all_files",
@@ -419,7 +420,6 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_sorting_d3v4/test:all_files",
         "//tensorflow/tensorboard/demo:all_files",
         "//tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize:all_files",
-        "//tensorflow/tensorboard/lib:all_files",
         "//tensorflow/tensorboard/plugins:all_files",
         "//tensorflow/tensorboard/plugins/projector:all_files",
         "//tensorflow/tensorboard/plugins/text:all_files",
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 83b405fd4e..62afa9481b 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -261,7 +261,6 @@ if(tensorflow_BUILD_CC_EXAMPLE)
 endif()
 include(tf_tools.cmake)
 if(tensorflow_BUILD_PYTHON_BINDINGS)
-  include(tensorboard)
   include(tf_python.cmake)
 endif()
 if(tensorflow_BUILD_SHARED_LIB)
diff --git a/tensorflow/contrib/cmake/external/tensorboard.cmake b/tensorflow/contrib/cmake/external/tensorboard.cmake
deleted file mode 100644
index 457868c72b..0000000000
--- a/tensorflow/contrib/cmake/external/tensorboard.cmake
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-include (ExternalProject)
-
-set(tensorboard_dependencies)
-add_custom_target(tensorboard_copy_dependencies)
-
-function(tb_new_http_archive)
-  cmake_parse_arguments(_TB "" "NAME;URL" "FILES" ${ARGN})
-  ExternalProject_Add(${_TB_NAME}
-    PREFIX ${_TB_NAME}
-    URL ${_TB_URL}
-    DOWNLOAD_DIR "${DOWNLOAD_LOCATION}/${_TB_NAME}"
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-  )
-
-  set(src_dir "${CMAKE_CURRENT_BINARY_DIR}/${_TB_NAME}/src/${_TB_NAME}")
-  set(dst_dir "${CMAKE_CURRENT_BINARY_DIR}/tensorboard_external/${_TB_NAME}")
-
-  foreach(src_file ${_TB_FILES})
-    add_custom_command(
-      TARGET tensorboard_copy_dependencies PRE_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src_dir}/${src_file} ${dst_dir}/${src_file}
-    )
-  endforeach()
-  
-  set(tensorboard_dependencies ${tensorboard_dependencies} ${_TB_NAME} PARENT_SCOPE)
-endfunction()
-
-function(tb_http_file)
-  cmake_parse_arguments(_TB "" "NAME;URL" "" ${ARGN})
-  get_filename_component(src_file ${_TB_URL} NAME)
-  file(DOWNLOAD ${_TB_URL} "${DOWNLOAD_LOCATION}/${_TB_NAME}/${src_file}")
-  
-  set(src_dir "${DOWNLOAD_LOCATION}/${_TB_NAME}")
-  set(dst_dir "${CMAKE_CURRENT_BINARY_DIR}/tensorboard_external/${_TB_NAME}/file")
-  
-  add_custom_command(
-    TARGET tensorboard_copy_dependencies PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src_dir}/${src_file} ${dst_dir}/${src_file}
-  )
-  
-  add_custom_target(${_TB_NAME} DEPENDS ${src_dir}/${src_file})
-  set(tensorboard_dependencies ${tensorboard_dependencies} ${_TB_NAME} PARENT_SCOPE)
-endfunction()
-
-# Parse TensorBoard dependency names and URLs from Bazel's WORKSPACE file.
-set(tb_dep_names)
-file(STRINGS ${PROJECT_SOURCE_DIR}/../../../WORKSPACE workspace_contents)
-foreach(line ${workspace_contents})
-  if(line MATCHES "# TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT")
-    set(tb_deps_started 1)
-  endif()
-
-  if(NOT tb_deps_started)
-    continue()
-  endif()
-
-  if(line MATCHES "new_http_archive\\(")
-    set(tb_dep_is_archive 1)
-    continue()
-  elseif(line MATCHES "http_file\\(")
-    set(tb_dep_is_archive 0)
-    continue()
-  endif()
-
-  string(REGEX MATCH "name.*=.*\"(.*)\"" has_name ${line})
-  if(has_name)
-    set(tb_dep_name ${CMAKE_MATCH_1})
-    continue()
-  endif()
-
-  string(REGEX MATCH "url.*=.*\"(.*)\"" has_url ${line})
-  if(has_url)
-    list(APPEND tb_dep_names ${tb_dep_name})
-    set(${tb_dep_name}_is_archive ${tb_dep_is_archive})
-    set(${tb_dep_name}_url ${CMAKE_MATCH_1})
-  endif()
-endforeach()
-
-# Parse the files needed for each TensorBoard dependency from Bazel's bower.BUILD file.
-# Due to CMAKE quirkiness, cannot use file(strings) with files that contain '[' and ']'.
-file(READ ${PROJECT_SOURCE_DIR}/../../../bower.BUILD bower_build_contents)
-string(REPLACE "\[" "OB" bower_build_contents "${bower_build_contents}")
-string(REPLACE "\]" "CB" bower_build_contents "${bower_build_contents}")
-string(REPLACE ";" "\\\\;" bower_build_contents "${bower_build_contents}")
-string(REPLACE "\n" "E;" bower_build_contents "${bower_build_contents}")
-foreach(line ${bower_build_contents})
-  string(REGEX MATCH "name.*=.*\"(.*)\"" has_name ${line})
-  if(has_name)
-    set(tb_dep_name ${CMAKE_MATCH_1})
-    set(${tb_dep_name}_files)
-    continue()
-  endif()
-
-  string(REGEX MATCH "srcs.*=.*\"(.*)\"CB" has_single_line_src ${line})
-  if(has_single_line_src)
-    list(APPEND ${tb_dep_name}_files ${CMAKE_MATCH_1})
-    continue()
-  endif()
-
-  if(line MATCHES "srcs.*=.*OB")
-    set(inside_files_def 1)
-    continue()
-  elseif(line MATCHES "CB,")
-    set(inside_files_def 0)
-    continue()
-  endif()
-
-  if(inside_files_def)
-   string(REGEX MATCH "\"(.*)\"," has_file ${line})
-   if(has_file)
-     list(APPEND ${tb_dep_name}_files ${CMAKE_MATCH_1})
-   endif()
-  endif()
-endforeach()
-
-# Generate a target for each dependency.
-foreach(tb_dep_name ${tb_dep_names})
-  if (${tb_dep_name}_is_archive)
-    tb_new_http_archive(
-      NAME ${tb_dep_name}
-      URL ${${tb_dep_name}_url}
-      FILES ${${tb_dep_name}_files}
-    )
-  else()
-    tb_http_file(
-      NAME ${tb_dep_name}
-      URL ${${tb_dep_name}_url}
-    )
-  endif()
-endforeach()
-
-add_dependencies(tensorboard_copy_dependencies ${tensorboard_dependencies})
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index b660508b8b..793f7b22f1 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -514,13 +514,6 @@ add_python_module("tensorflow/contrib/training/python/training")
 add_python_module("tensorflow/contrib/util")
 
 
-# Additional directories with no Python sources.
-add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist")
-add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/lib/css")
-
-
 ########################################################
 # tf_python_op_gen_main library
 ########################################################
@@ -859,7 +852,6 @@ endif(WIN32)
 add_custom_target(tf_python_build_pip_package)
 add_dependencies(tf_python_build_pip_package
     pywrap_tensorflow_internal
-    tensorboard_copy_dependencies
     tf_python_copy_scripts_to_destination
     tf_python_touchup_modules
     tf_python_ops
@@ -886,24 +878,9 @@ add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
                                    ${CMAKE_CURRENT_BINARY_DIR}/tf_python/)
 
 # Copy resources for TensorBoard.
-add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/dist/bazel-html-imports.html
-                                   ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist/)
-add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/dist/index.html
-                                   ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist/)
-add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/dist/tf-tensorboard.html
-                                   ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist/)
-add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/lib/css/global.css
-                                   ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/lib/css/)
 add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/TAG
-                                   ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/)
-add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/tensorboard_external
-                                             ${CMAKE_CURRENT_BINARY_DIR}/tf_python/external)
+  ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/)
 
 # Copy datasets for tf.contrib.learn.
 add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
diff --git a/tensorflow/tensorboard/.bowerrc b/tensorflow/tensorboard/.bowerrc
deleted file mode 100644
index 333544ec7a..0000000000
--- a/tensorflow/tensorboard/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory" : "components"
-}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/.gitignore b/tensorflow/tensorboard/.gitignore
deleted file mode 100644
index 98b9642545..0000000000
--- a/tensorflow/tensorboard/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-node_modules/*
-typings/*
-build/*
-dist/tf-tensorboard-demo.html
-
-# Since bower components are stored in the same directory as
-# tensorboard components, we ignore everything under components
-# except our own components which start with tf-.
-components/*
-# This rule should always be in sync with TF_COMPONENTS_TYPESCRIPT_GLOB
-# in gulpfile.js
-!components/tf-*
-!components/tf_*
-!components/vz-*
-!components/vz_*
-!components/index.html
-!components/BUILD
-# Ignore the sample graph files since they are too large to
-# be in the repo.
-components/tf-graph/demo/tf_model_zoo/*
-
-# All standalone code for TensorBoard components should be written in
-# typescript, and the compiled javascript code should be ignored.
-components/tf-*/**/*.js
-components/tf_*/**/*.js
-components/vz-*/**/*.js
-components/vz_*/**/*.js
diff --git a/tensorflow/tensorboard/BUILD b/tensorflow/tensorboard/BUILD
index 9772538524..11715319a0 100644
--- a/tensorflow/tensorboard/BUILD
+++ b/tensorflow/tensorboard/BUILD
@@ -1,39 +1,14 @@
 # Description:
 # TensorBoard, a dashboard for investigating TensorFlow
 
-package(
-    default_visibility = ["//tensorflow:internal"],
-    features = [
-        "-layering_check",
-        "-parse_headers",
-    ],
-)
+package(default_visibility = ["//tensorflow:internal"])
 
 licenses(["notice"])  # Apache 2.0
 
-exports_files(["LICENSE"])
-
-load("//tensorflow:tensorflow.bzl", "py_test")
-
-filegroup(
-    name = "frontend",
-    srcs = [
-        "TAG",
-        "dist/bazel-html-imports.html",
-        "dist/index.html",
-        "dist/tf-tensorboard.html",
-        "//tensorflow/tensorboard/bower",
-        "//tensorflow/tensorboard/lib:all_files",
-    ],
-)
-
 py_binary(
     name = "tensorboard",
-    srcs = [
-        "__main__.py",
-        "tensorboard.py",
-    ],
-    data = [":frontend"],
+    srcs = ["tensorboard.py"],
+    data = [":assets"],
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/python:platform",
@@ -45,16 +20,23 @@ py_binary(
     ],
 )
 
+filegroup(
+    name = "assets",
+    srcs = [
+        "TAG",
+        "//tensorflow/tensorboard/components:index.html",
+    ],
+)
+
 filegroup(
     name = "all_files",
     srcs = glob(
-        ["**/*"],
+        ["**"],
         exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-            "**/node_modules/**",
-            "**/typings/**",
+            "METADATA",
+            "OWNERS",
+            "tensorboard.google.bzl",
         ],
     ),
-    visibility = ["//tensorflow:__subpackages__"],
+    tags = ["notsan"],
 )
diff --git a/tensorflow/tensorboard/DEVELOPMENT.md b/tensorflow/tensorboard/DEVELOPMENT.md
index 3ff2c87dab..8e86bf04db 100644
--- a/tensorflow/tensorboard/DEVELOPMENT.md
+++ b/tensorflow/tensorboard/DEVELOPMENT.md
@@ -2,125 +2,24 @@
 
 ## Launching a Development Instance
 
-The first step is getting a TensorBoard development environment set up. You
-should start by making sure you have [nodejs](https://nodejs.org/en/) and
-[npm](https://www.npmjs.com/). On Ubuntu, `sudo apt-get install -y nodejs
-nodejs-legacy npm`. Ensure your npm version is >=3.0 by running
-'npm --version'. If the version is <3.0, run 'sudo npm install npm -g' to
-update to the latest version. You may need to open a new terminal window after
-updating in order to make use of the newly-installed version.
+Run the following to launch a demo of TensorBoard in raw sources mode:
 
-Next, you'll want to install [gulp](http://gulpjs.com/) and
-[bower](http://bower.io/), which are used for build tooling and dependency
-management respectively. Both must be installed globally: `sudo npm install -g
-gulp bower` will do that.
+```sh
+bazel run third_party/tensorflow/tensorboard/components/tf_tensorboard_d3v4:demo
+```
 
-Then, cd into the TensorBoard directory:
-
-`cd tensorflow/tensorboard`
-
-and install dependencies:
-
-`npm run prep`
-
-Then, run gulp: `gulp`
-
-(Don't worry if there are some linter errors.)
-
-Now you can navigate to
-[http://localhost:8000/demo/index.html](http://localhost:8000/demo/index.html)
-and play with the demo TensorBoard instance. If you make changes to the source
-code, `gulp` should detect it, recompile (if Typescript), and reload your
-browser.
+Now you can navigate to <http://localhost:6006/demo/index.html> and play with
+the demo TensorBoard instance. This will have live source reloading.
 
 This demo TensorBoard will have a small amount of demo data generated by
 [generate_testdata.py](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/scripts/generate_testdata.py).
 You can use [serialize_tensorboard.py](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/scripts/serialize_tensorboard.py)
 to create a realistic demo directory from your own data files.
 
-## Launching TensorBoard with modified source
-
-If you are developing in open source, and have made some changes to TensorBoard
-that you'd like to try out on real data, then you need to regenerate
-`dist/tf-tensorboard.html`.
-
-Run `gulp regenerate`. That will recompile all of the TensorBoard assets, and
-produce a new tf-tensorboard.html with your changes.
-
-Now, you can use `bazel` to launch TensorBoard:
-
-`bazel run //tensorflow/tensorboard:tensorboard -- --logdir=/path/to/logs`.
-
-## Updating the vulcanized HTML file (for linux)
-
-The vulcanized HTML file `dist/tf-tensorboard.html.OPENSOURCE` is the version of
-Tensorboard started up by users who install TensorFlow via pip. Today, updating
-that file involves using gulp. Future efforts will streamline this process.
-
-First, `cd` into the `tensorflow/tensorboard` directory within a git repository
-(a piper client will not work). Run `npm run prepare`.
-
-Next, we build some third party JS dependencies via webfiles targets. Run
-
-    bazel build \
-        tensorflow/tensorboard/components/tf_imports:d3 \
-        tensorflow/tensorboard/components/tf_imports:lodash \
-        tensorflow/tensorboard/components/tf_imports:graphlib \
-        tensorflow/tensorboard/components/tf_imports:dagre \
-        tensorflow/tensorboard/components/tf_imports:plottable
-
-Users internal to Google should use the internal build tool instead. Move the
-output JS binaries into the tf_imports directory.
-
-Run `gulp vulcanize`. If compilation errors arise (such as those related to
-TypeScript), fix them and re-run. This step should update the contents of
-`dist/tf-tensorboard.html.OPENSOURCE`.
-
-Next, we perform some manual find-and-replaces on script `src` paths within
-`dist/tf-tensorboard.html.OPENSOURCE`. Manually replace:
-
-* `<script src="../tf-imports/d3.js"></script>` with `<script src="../d3/d3.js"></script>`
-* `<script src="../tf-imports/dagre.js"></script>` with `<script src="../dagre/dist/dagre.core.js"></script>`
-* `<script src="../tf-imports/graphlib.js"></script>` with `<script src="../graphlib/dist/graphlib.core.js"></script>`
-* `<script src="../tf-imports/lodash.js"></script>` with `<script src="../lodash/lodash.min.js"></script>`
-* `<script src="../tf-imports/plottable.js"></script>` with `<script src="../plottable/plottable.js"></script>`
-
-Also, remove duplicate instances of script includes. Each of those scripts
-should only be included once (the first time) within the vulcanized output.
-
-### Try out the vulcanized Tensorboard HTML output
-
-To test the vulcanized output, prepare a pip package within a virtualized
-environment, and run `tensorboard` after activating the environment.
-
-To do that, we first create and activate a virtual environment called say
-`tf_foo` (Pick your own name.).
-
-    virtualenv --system-site-packages ~/tf_foo
-    source ~/tf_foo/bin/activate
-
-Make sure that you have installed `pip` and `virtualenv` beforehand. If not, run
-
-    sudo easy_install pip
-    sudo pip install --upgrade virtualenv
-
-Next, we run this command from the `tensorflow directory`.
-
-    tools/google/make_tree.sh --pip_dir=/tmp/pip_dir
-
-to create a pip package. If you are running within Google, also provide the
-`--pending_cl` flag. That script will generate a wheel file (.whl) within
-`/tmp/pip_dir`. Lets say that it is
-`tensorflow-1.0.0rc2-cp27-none-linux_x86_64.whl`.
-
-Run
-
-    pip install --upgrade /tmp/pip_dir/tensorflow-1.0.0rc2-cp27-none-linux_x86_64.whl
+## Launching TensorBoard Proper
 
-to update the pip installation of TensorFlow within the virtual environment.
-Verify that the `tensorboard` command defers to the tensorboard instance
-installed within your virtual environment (`tf_foo`) by running
-`which tensorboard`. To run tensorboard, start it up as usual within the virtual
-environment:
+Running TensorBoard automatically asks Bazel to create a vulcanized HTML binary:
 
-    tensorboard --logdir=/tmp/my/logdir
+```sh
+bazel run //tensorflow/tensorboard:tensorboard -- --logdir=/path/to/logs
+```
diff --git a/tensorflow/tensorboard/app/BUILD b/tensorflow/tensorboard/app/BUILD
deleted file mode 100644
index 9afcd23e9e..0000000000
--- a/tensorflow/tensorboard/app/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description:
-# Build rules for building the HTML/JS necessary for TensorBoard.
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/app/analytics.js b/tensorflow/tensorboard/app/analytics.js
deleted file mode 100644
index 497c02ced8..0000000000
--- a/tensorflow/tensorboard/app/analytics.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// Nothing to see here. vulcanize doesn't like empty files.
diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD
index d27a22a82b..adbdea5f45 100644
--- a/tensorflow/tensorboard/backend/BUILD
+++ b/tensorflow/tensorboard/backend/BUILD
@@ -57,7 +57,7 @@ py_test(
 py_library(
     name = "application",
     srcs = ["application.py"],
-    data = ["//tensorflow/tensorboard:frontend"],
+    data = ["//tensorflow/tensorboard:assets"],
     srcs_version = "PY2AND3",
     deps = [
         ":http_util",
diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index 3c8963e302..c38ad92be6 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -24,7 +24,6 @@ from __future__ import print_function
 
 import csv
 import imghdr
-import mimetypes
 import os
 import re
 import threading
@@ -159,8 +158,6 @@ class TensorBoardWSGIApp(object):
       reload_multiplexer(self._multiplexer, path_to_run)
 
     self.data_applications = {
-        '/app.js':
-            self._serve_js,
         DATA_PREFIX + AUDIO_ROUTE:
             self._serve_audio,
         DATA_PREFIX + COMPRESSED_HISTOGRAMS_ROUTE:
@@ -545,59 +542,9 @@ class TensorBoardWSGIApp(object):
   @wrappers.Request.application
   def _serve_index(self, request):
     """Serves the index page (i.e., the tensorboard app itself)."""
-    return self._serve_static_file(request, '/dist/index.html')
-
-  @wrappers.Request.application
-  def _serve_js(self, request):
-    """Serves the JavaScript for the index page."""
-    return self._serve_static_file(request, '/dist/app.js')
-
-  def _serve_static_file(self, request, path):
-    """Serves the static file located at the given path.
-
-    Args:
-      request: A werkzeug Request
-      path: The path of the static file, relative to the tensorboard/ directory.
-
-    Returns:
-      A werkzeug.Response application.
-    """
-    # Strip off the leading forward slash.
-    orig_path = path.lstrip('/')
-    if not self._path_is_safe(orig_path):
-      logging.warning('path not safe: %s', orig_path)
-      return http_util.Respond(request, 'Naughty naughty!', 'text/plain', 400)
-      # Resource loader wants a path relative to //WORKSPACE/tensorflow.
-    path = os.path.join('tensorboard', orig_path)
-    # Open the file and read it.
-    try:
-      contents = resource_loader.load_resource(path)
-    except IOError:
-      # For compatibility with latest version of Bazel, we renamed bower
-      # packages to use '_' rather than '-' in their package name.
-      # This means that the directory structure is changed too.
-      # So that all our recursive imports work, we need to modify incoming
-      # requests to map onto the new directory structure.
-      path = orig_path
-      components = path.split('/')
-      components[0] = components[0].replace('-', '_')
-      path = ('/').join(components)
-      # Bazel keeps all the external dependencies in //WORKSPACE/external.
-      # and resource loader wants a path relative to //WORKSPACE/tensorflow/.
-      path = os.path.join('../external', path)
-      try:
-        contents = resource_loader.load_resource(path)
-      except IOError:
-        logging.warning('path %s not found, sending 404', path)
-        return http_util.Respond(request, 'Not found', 'text/plain', code=404)
-    mimetype, content_encoding = mimetypes.guess_type(path)
-    mimetype = mimetype or 'application/octet-stream'
-    return http_util.Respond(
-        request,
-        contents,
-        mimetype,
-        expires=3600,
-        content_encoding=content_encoding)
+    contents = resource_loader.load_resource(
+        'tensorboard/components/index.html')
+    return http_util.Respond(request, contents, 'text/html', expires=3600)
 
   def __call__(self, environ, start_response):  # pylint: disable=invalid-name
     """Central entry point for the TensorBoard application.
@@ -628,8 +575,9 @@ class TensorBoardWSGIApp(object):
     elif clean_path in TAB_ROUTES:
       return self._serve_index(environ, start_response)
     else:
-      return self._serve_static_file(request, clean_path)(environ,
-                                                          start_response)
+      logging.warning('path %s not found, sending 404', clean_path)
+      return http_util.Respond(request, 'Not found', 'text/plain', code=404)(
+          environ, start_response)
     # pylint: enable=too-many-function-args
 
 
diff --git a/tensorflow/tensorboard/backend/application_test.py b/tensorflow/tensorboard/backend/application_test.py
index 4ea627def7..e8556c0c61 100644
--- a/tensorflow/tensorboard/backend/application_test.py
+++ b/tensorflow/tensorboard/backend/application_test.py
@@ -154,11 +154,6 @@ class TensorboardServerTest(test.TestCase):
     response = self._get('/asdf')
     self.assertEqual(response.status, 404)
 
-  def testDirectoryTraversal(self):
-    """Attempt a directory traversal attack."""
-    response = self._get('/..' * 30 + '/etc/passwd')
-    self.assertEqual(response.status, 400)
-
   def testLogdir(self):
     """Test the format of the data/logdir endpoint."""
     parsed_object = self._getJson('/data/logdir')
diff --git a/tensorflow/tensorboard/bower.json b/tensorflow/tensorboard/bower.json
deleted file mode 100644
index 0a0fac45fd..0000000000
--- a/tensorflow/tensorboard/bower.json
+++ /dev/null
@@ -1,187 +0,0 @@
-{
-  "__autoadded_transitive_dep__": [
-    "font-roboto",
-    "iron-a11y-announcer",
-    "iron-a11y-keys-behavior",
-    "iron-autogrow-textarea",
-    "iron-checked-element-behavior",
-    "iron-dropdown",
-    "iron-fit-behavior",
-    "iron-flex-layout",
-    "iron-form-element-behavior",
-    "iron-icon",
-    "iron-iconset-svg",
-    "iron-input",
-    "iron-menu-behavior",
-    "iron-meta",
-    "iron-overlay-behavior",
-    "iron-range-behavior",
-    "iron-resizable-behavior",
-    "iron-scroll-target-behavior",
-    "iron-validatable-behavior",
-    "neon-animation",
-    "paper-dialog-behavior",
-    "paper-material",
-    "paper-menu-button",
-    "paper-ripple",
-    "promise-polyfill",
-    "web-animations-js",
-    "webcomponentsjs"
-  ],
-  "authors": [
-    "Google"
-  ],
-  "dependencies": {
-    "d3": "3.5.15",
-    "dagre": "0.7.4",
-    "es6-promise": "2.1.0",
-    "font-roboto": "PolymerElements/font-roboto#1.0.1",
-    "graphlib": "1.0.7",
-    "iron-a11y-announcer": "PolymerElements/iron-a11y-announcer#1.0.5",
-    "iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#1.1.8",
-    "iron-ajax": "PolymerElements/iron-ajax#1.2.0",
-    "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#1.0.12",
-    "iron-behaviors": "PolymerElements/iron-behaviors#1.0.17",
-    "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#1.0.4",
-    "iron-collapse": "PolymerElements/iron-collapse#1.0.8",
-    "iron-dropdown": "PolymerElements/iron-dropdown#1.4.0",
-    "iron-fit-behavior": "PolymerElements/iron-fit-behavior#1.2.5",
-    "iron-flex-layout": "PolymerElements/iron-flex-layout#1.3.0",
-    "iron-form-element-behavior": "PolymerElements/iron-form-element-behavior#1.0.6",
-    "iron-icon": "PolymerElements/iron-icon#1.0.11",
-    "iron-icons": "PolymerElements/iron-icons#1.1.3",
-    "iron-iconset-svg": "PolymerElements/iron-iconset-svg#1.1.0",
-    "iron-input": "PolymerElements/iron-input#1.0.10",
-    "iron-list": "PolymerElements/iron-list#1.3.9",
-    "iron-menu-behavior": "PolymerElements/iron-menu-behavior#1.1.10",
-    "iron-meta": "PolymerElements/iron-meta#1.1.1",
-    "iron-overlay-behavior": "PolymerElements/iron-overlay-behavior#1.10.1",
-    "iron-range-behavior": "PolymerElements/iron-range-behavior#1.0.4",
-    "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#1.0.3",
-    "iron-scroll-target-behavior": "PolymerElements/iron-scroll-target-behavior#1.0.3",
-    "iron-selector": "PolymerElements/iron-selector#1.5.2",
-    "iron-validatable-behavior": "PolymerElements/iron-validatable-behavior#1.1.1",
-    "lodash": "3.8.0",
-    "neon-animation": "PolymerElements/neon-animation#1.2.2",
-    "numericjs": "1.2.6",
-    "paper-behaviors": "PolymerElements/paper-behaviors#1.0.12",
-    "paper-button": "PolymerElements/paper-button#1.0.11",
-    "paper-checkbox": "PolymerElements/paper-checkbox#1.4.0",
-    "paper-dialog": "PolymerElements/paper-dialog#1.0.4",
-    "paper-dialog-behavior": "PolymerElements/paper-dialog-behavior#1.2.5",
-    "paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#1.1.5",
-    "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#1.4.0",
-    "paper-header-panel": "PolymerElements/paper-header-panel#1.1.4",
-    "paper-icon-button": "PolymerElements/paper-icon-button#1.1.3",
-    "paper-input": "PolymerElements/paper-input#1.1.18",
-    "paper-item": "PolymerElements/paper-item#1.1.4",
-    "paper-listbox": "PolymerElements/paper-listbox#1.1.2",
-    "paper-material": "PolymerElements/paper-material#1.0.6",
-    "paper-menu": "PolymerElements/paper-menu#1.2.2",
-    "paper-menu-button": "PolymerElements/paper-menu-button#1.5.1",
-    "paper-progress": "PolymerElements/paper-progress#1.0.9",
-    "paper-radio-button": "PolymerElements/paper-radio-button#1.1.2",
-    "paper-radio-group": "PolymerElements/paper-radio-group#1.0.9",
-    "paper-ripple": "PolymerElements/paper-ripple#1.0.5",
-    "paper-slider": "PolymerElements/paper-slider#1.0.10",
-    "paper-spinner": "PolymerElements/paper-spinner#1.1.1",
-    "paper-styles": "PolymerElements/paper-styles#1.1.4",
-    "paper-tabs": "PolymerElements/paper-tabs#1.7.0",
-    "paper-toast": "PolymerElements/paper-toast#1.3.0",
-    "paper-toggle-button": "PolymerElements/paper-toggle-button#1.2.0",
-    "paper-toolbar": "PolymerElements/paper-toolbar#1.1.4",
-    "paper-tooltip": "PolymerElements/paper-tooltip#1.1.2",
-    "plottable": "1.16.1",
-    "polymer": "1.7.0",
-    "promise-polyfill": "polymerlabs/promise-polyfill#1.0.0",
-    "three.js": "threejs#r77",
-    "web-animations-js": "web-animations/web-animations-js#2.2.1",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#0.7.22",
-    "weblas": "0.9.0"
-  },
-  "description": "TensorBoard: Visualizations for TensorFlow",
-  "devDependencies": {
-    "iron-component-page": "PolymerElements/iron-component-page#^1.1.4",
-    "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.2.3",
-    "web-component-tester": "Polymer/web-component-tester"
-  },
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "license": "Apache-2.0",
-  "name": "tensorboard",
-  "private": true,
-  "resolutions": {
-    "d3": "3.5.15",
-    "dagre": "0.7.4",
-    "es6-promise": "2.1.0",
-    "font-roboto": "1.0.1",
-    "graphlib": "1.0.7",
-    "iron-a11y-announcer": "1.0.5",
-    "iron-a11y-keys-behavior": "1.1.8",
-    "iron-ajax": "1.2.0",
-    "iron-autogrow-textarea": "1.0.12",
-    "iron-behaviors": "1.0.17",
-    "iron-checked-element-behavior": "1.0.4",
-    "iron-collapse": "1.0.8",
-    "iron-dropdown": "1.4.0",
-    "iron-fit-behavior": "1.2.5",
-    "iron-flex-layout": "1.3.0",
-    "iron-form-element-behavior": "1.0.6",
-    "iron-icon": "1.0.11",
-    "iron-icons": "1.1.3",
-    "iron-iconset-svg": "1.1.0",
-    "iron-input": "1.0.10",
-    "iron-list": "1.3.9",
-    "iron-menu-behavior": "1.1.10",
-    "iron-meta": "1.1.1",
-    "iron-overlay-behavior": "1.10.1",
-    "iron-range-behavior": "1.0.4",
-    "iron-resizable-behavior": "1.0.3",
-    "iron-scroll-target-behavior": "1.0.3",
-    "iron-selector": "1.5.2",
-    "iron-validatable-behavior": "1.1.1",
-    "lodash": "3.8.0",
-    "neon-animation": "1.2.2",
-    "numericjs": "1.2.6",
-    "paper-behaviors": "1.0.12",
-    "paper-button": "1.0.11",
-    "paper-checkbox": "1.4.0",
-    "paper-dialog": "1.0.4",
-    "paper-dialog-behavior": "1.2.5",
-    "paper-dialog-scrollable": "1.1.5",
-    "paper-dropdown-menu": "1.4.0",
-    "paper-header-panel": "1.1.4",
-    "paper-icon-button": "1.1.3",
-    "paper-input": "1.1.18",
-    "paper-item": "1.1.4",
-    "paper-listbox": "1.1.2",
-    "paper-material": "1.0.6",
-    "paper-menu": "1.2.2",
-    "paper-menu-button": "1.5.1",
-    "paper-progress": "1.0.9",
-    "paper-radio-button": "1.1.2",
-    "paper-radio-group": "1.0.9",
-    "paper-ripple": "1.0.5",
-    "paper-slider": "1.0.10",
-    "paper-spinner": "1.1.1",
-    "paper-styles": "1.1.4",
-    "paper-tabs": "1.7.0",
-    "paper-toast": "1.3.0",
-    "paper-toggle-button": "1.2.0",
-    "paper-toolbar": "1.1.4",
-    "paper-tooltip": "1.1.2",
-    "plottable": "1.16.1",
-    "polymer": "1.7.0",
-    "promise-polyfill": "1.0.0",
-    "three.js": "threejs#r77",
-    "web-animations-js": "2.2.1",
-    "webcomponentsjs": "0.7.22",
-    "weblas": "0.9.0"
-  },
-  "version": "0.0.0"
-}
diff --git a/tensorflow/tensorboard/bower/BUILD b/tensorflow/tensorboard/bower/BUILD
deleted file mode 100644
index 2c2921d988..0000000000
--- a/tensorflow/tensorboard/bower/BUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# AUTOGENERATED FILE by tensorboard_bower_dependency_sync.py
-
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "bower",
-    srcs = [
-        "@d3//:d3",
-        "@dagre//:dagre",
-        "@es6_promise//:es6_promise",
-        "@font_roboto//:font_roboto",
-        "@graphlib//:graphlib",
-        "@iron_a11y_announcer//:iron_a11y_announcer",
-        "@iron_a11y_keys_behavior//:iron_a11y_keys_behavior",
-        "@iron_ajax//:iron_ajax",
-        "@iron_autogrow_textarea//:iron_autogrow_textarea",
-        "@iron_behaviors//:iron_behaviors",
-        "@iron_checked_element_behavior//:iron_checked_element_behavior",
-        "@iron_collapse//:iron_collapse",
-        "@iron_dropdown//:iron_dropdown",
-        "@iron_fit_behavior//:iron_fit_behavior",
-        "@iron_flex_layout//:iron_flex_layout",
-        "@iron_form_element_behavior//:iron_form_element_behavior",
-        "@iron_icon//:iron_icon",
-        "@iron_icons//:iron_icons",
-        "@iron_iconset_svg//:iron_iconset_svg",
-        "@iron_input//:iron_input",
-        "@iron_list//:iron_list",
-        "@iron_menu_behavior//:iron_menu_behavior",
-        "@iron_meta//:iron_meta",
-        "@iron_overlay_behavior//:iron_overlay_behavior",
-        "@iron_range_behavior//:iron_range_behavior",
-        "@iron_resizable_behavior//:iron_resizable_behavior",
-        "@iron_scroll_target_behavior//:iron_scroll_target_behavior",
-        "@iron_selector//:iron_selector",
-        "@iron_validatable_behavior//:iron_validatable_behavior",
-        "@lodash//:lodash",
-        "@neon_animation//:neon_animation",
-        "@numericjs_numeric_min_js//file",
-        "@paper_behaviors//:paper_behaviors",
-        "@paper_button//:paper_button",
-        "@paper_checkbox//:paper_checkbox",
-        "@paper_dialog//:paper_dialog",
-        "@paper_dialog_behavior//:paper_dialog_behavior",
-        "@paper_dialog_scrollable//:paper_dialog_scrollable",
-        "@paper_dropdown_menu//:paper_dropdown_menu",
-        "@paper_header_panel//:paper_header_panel",
-        "@paper_icon_button//:paper_icon_button",
-        "@paper_input//:paper_input",
-        "@paper_item//:paper_item",
-        "@paper_listbox//:paper_listbox",
-        "@paper_material//:paper_material",
-        "@paper_menu//:paper_menu",
-        "@paper_menu_button//:paper_menu_button",
-        "@paper_progress//:paper_progress",
-        "@paper_radio_button//:paper_radio_button",
-        "@paper_radio_group//:paper_radio_group",
-        "@paper_ripple//:paper_ripple",
-        "@paper_slider//:paper_slider",
-        "@paper_spinner//:paper_spinner",
-        "@paper_styles//:paper_styles",
-        "@paper_tabs//:paper_tabs",
-        "@paper_toast//:paper_toast",
-        "@paper_toggle_button//:paper_toggle_button",
-        "@paper_toolbar//:paper_toolbar",
-        "@paper_tooltip//:paper_tooltip",
-        "@plottable//:plottable",
-        "@polymer//:polymer",
-        "@promise_polyfill//:promise_polyfill",
-        "@three_js_orbitcontrols_js//file",
-        "@three_js_three_min_js//file",
-        "@web_animations_js//:web_animations_js",
-        "@webcomponentsjs//:webcomponentsjs",
-        "@weblas_weblas_js//file",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/BUILD b/tensorflow/tensorboard/components/BUILD
index 301425d96d..2d2c2d2d7b 100644
--- a/tensorflow/tensorboard/components/BUILD
+++ b/tensorflow/tensorboard/components/BUILD
@@ -1,23 +1,32 @@
 package(default_visibility = ["//tensorflow:internal"])
 
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+load("//tensorflow/tensorboard:vulcanize.bzl", "tensorboard_html_binary")
+
 licenses(["notice"])  # Apache 2.0
 
-exports_files(["LICENSE"])
+web_library(
+    name = "tensorboard",
+    srcs = [
+        "analytics.html",
+        "tensorboard.html",
+    ],
+    path = "/",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_tensorboard_d3v4",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+tensorboard_html_binary(
+    name = "index",
+    input_path = "/tensorboard.html",
+    output_path = "/index.html",
+    deps = [":tensorboard"],
+)
 
 filegroup(
     name = "all_files",
-    srcs = glob(
-        [
-            "tf_*/**/*",
-            "vz_*/**/*",
-        ],
-        exclude = [
-            "**/tf_model_zoo/*",
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ) + [
-        "BUILD",
-    ],
-    visibility = ["//tensorflow:__subpackages__"],
+    srcs = glob(["**"]),
+    tags = ["notsan"],
 )
diff --git a/tensorflow/tensorboard/components/tf_imports_google/graphlib.html b/tensorflow/tensorboard/components/analytics.html
similarity index 89%
rename from tensorflow/tensorboard/components/tf_imports_google/graphlib.html
rename to tensorflow/tensorboard/components/analytics.html
index 56b37ebe4b..d319f576fc 100644
--- a/tensorflow/tensorboard/components/tf_imports_google/graphlib.html
+++ b/tensorflow/tensorboard/components/analytics.html
@@ -15,4 +15,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="../graphlib-library/graphlib.html">
+<!-- TODO(jart): Give users the ability to opt-in to analytics. -->
diff --git a/tensorflow/tensorboard/components/index.html b/tensorflow/tensorboard/components/index.html
deleted file mode 100644
index c790a76f75..0000000000
--- a/tensorflow/tensorboard/components/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <script src="webcomponentsjs/webcomponents-lite.min.js"></script>
-    <style>
-      html, body {
-        margin: 0;
-        padding: 0;
-        height: 100%;
-        font-family: "RobotoDraft","Roboto",sans-serif;
-      }
-    </style>
-    <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMQAAADECAMAAAD3eH5ZAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAD/UExURfFlKfaELvFmKfNyK/67NvWALf68Nv69NvNxK/20NfyyNP22NfN0K/JrKvqhMv2zNf25Nf24Nf23NfeOL/yzNPyvNPJoKviWMPmeMfN1K/WBLfePL/FnKfeML/qlMvR7LPmcMfeLL/aJLvR5LPFoKfJuKvR3LP66NvywNPeNL/V/LfaILv21Nf26NfNzK/NvK/R6LPmaMfyxNPqfMvV+LfurM/iSMPmbMfJvKvmdMfumM/qiMvmZMfytNPJqKvysNPN2K/iYMPNwK/upM/JtKvJsKviVMPaHLvaGLvJpKvR8LPaKLvqkMvuqM/aFLvR4LPuoM/iTMPWDLfiRMPmYMXS0ngkAAALoSURBVHja7drnctpAFIbhFUISSKJ3MKYa0+y4xTW9937/15JkJhlTjhrSrHRmvuf/as6L0YLFCgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBJ6njenqspzgnPrsrGX9Zpi2tCrmnc6+dYNthVY5WpMmxQLWPdMsOuYVwzNj3ei2t3mQwaV43BJPDCS2NbJ5aEeuX/+9qcjQOtfFIkIkrvY2g4MVcmOBsFWbowKO/kNyj62gRpJcDaPBlxLr1B0zdG0C/8LzbJiJrshuvy1gzlA9+rD8mIkuyIJjFE3/dqnYwoSm7IUEPoD/wut8iIguSIDjlFxe/yfXL5vuSI21BTZLLhXoOILMO8Hxwa/L8bI0LfmUdhGowb2ZvT0e57pFNDgB06IlVyjmmIBl2T/nl9Rw6SD9GgSG/Q0uQkaW3XhmovKQ3eFQ4N2Uo9OQ1eFZsNerf7vP+rO4rhmY1Lg3vFVoP8+8BXg1sFnwbnCk4NThW8GuiKBDdkVVtTNFvNelVsNqTbyWnIOM2oeTRoyWvwmpJHg/ucXBrcJuXT4DwrpwZi2vy0VCx8YtXg/D2bU4OfiuQ3eFfE2KD4bfCqiLNB993gXsGlwa2CT4NzBacGIVQ6YsipQdh0xEdODUKjIxrSp88onZ8zbbFLg1DoiFO5BXvDGv2My9/JhUT8JUZTI0yDaNHLBzIbvqTDNYhUiVw/kdjQ1kM2CHFDPjKW+KzyRTF0g/ga9w9y+fANQpxvX8CU+Ny7FUWDeF3Y+g3lROIf4k0UDX9eCyvO531PyYhHga9zvPZJU5b73Y/eXj8Hv9D48n6HaF5LbcjRt8TZTtda5M1DfXnbkX1C0SHCFKzQB5Fe8op4GNGNHavvZESbVwT5r6W1xyuCPBY3Y9YgDqzknH/e3YfNzzuL30l0IebrZ5kKtuDIXt1n868ET6kf3/49tLvrCcZyF8Pu215dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcPIbNrBhOaBXucoAAAAASUVORK5CYII=">
-    <link rel="import" href="tf-tensorboard/tf-tensorboard.html">
-    <title>TensorBoard</title>
-  </head>
-  <body>
-    <tf-tensorboard use-hash></tf-tensorboard>
-    <script src="../app/analytics.js"></script>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html b/tensorflow/tensorboard/components/tensorboard.html
similarity index 89%
rename from tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html
rename to tensorflow/tensorboard/components/tensorboard.html
index 89bcfb733e..0652902cfa 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/dist.html
+++ b/tensorflow/tensorboard/components/tensorboard.html
@@ -16,17 +16,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
+<meta charset="utf-8">
 <title>TensorBoard</title>
-<style>
-  html, body {
-    margin: 0;
-    padding: 0;
-    height: 100%;
-    font-family: "RobotoDraft", "Roboto", sans-serif;
-  }
-</style>
-<script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
 <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMQAAADECAMAAAD3eH5ZAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAD/UExURfFlKfaELvFmKfNyK/67NvWALf68Nv69NvNxK/20NfyyNP22NfN0K/JrKvqhMv2zNf25Nf24Nf23NfeOL/yzNPyvNPJoKviWMPmeMfN1K/WBLfePL/FnKfeML/qlMvR7LPmcMfeLL/aJLvR5LPFoKfJuKvR3LP66NvywNPeNL/V/LfaILv21Nf26NfNzK/NvK/R6LPmaMfyxNPqfMvV+LfurM/iSMPmbMfJvKvmdMfumM/qiMvmZMfytNPJqKvysNPN2K/iYMPNwK/upM/JtKvJsKviVMPaHLvaGLvJpKvR8LPaKLvqkMvuqM/aFLvR4LPuoM/iTMPWDLfiRMPmYMXS0ngkAAALoSURBVHja7drnctpAFIbhFUISSKJ3MKYa0+y4xTW9937/15JkJhlTjhrSrHRmvuf/as6L0YLFCgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBJ6njenqspzgnPrsrGX9Zpi2tCrmnc6+dYNthVY5WpMmxQLWPdMsOuYVwzNj3ei2t3mQwaV43BJPDCS2NbJ5aEeuX/+9qcjQOtfFIkIkrvY2g4MVcmOBsFWbowKO/kNyj62gRpJcDaPBlxLr1B0zdG0C/8LzbJiJrshuvy1gzlA9+rD8mIkuyIJjFE3/dqnYwoSm7IUEPoD/wut8iIguSIDjlFxe/yfXL5vuSI21BTZLLhXoOILMO8Hxwa/L8bI0LfmUdhGowb2ZvT0e57pFNDgB06IlVyjmmIBl2T/nl9Rw6SD9GgSG/Q0uQkaW3XhmovKQ3eFQ4N2Uo9OQ1eFZsNerf7vP+rO4rhmY1Lg3vFVoP8+8BXg1sFnwbnCk4NThW8GuiKBDdkVVtTNFvNelVsNqTbyWnIOM2oeTRoyWvwmpJHg/ucXBrcJuXT4DwrpwZi2vy0VCx8YtXg/D2bU4OfiuQ3eFfE2KD4bfCqiLNB993gXsGlwa2CT4NzBacGIVQ6YsipQdh0xEdODUKjIxrSp88onZ8zbbFLg1DoiFO5BXvDGv2My9/JhUT8JUZTI0yDaNHLBzIbvqTDNYhUiVw/kdjQ1kM2CHFDPjKW+KzyRTF0g/ga9w9y+fANQpxvX8CU+Ny7FUWDeF3Y+g3lROIf4k0UDX9eCyvO531PyYhHga9zvPZJU5b73Y/eXj8Hv9D48n6HaF5LbcjRt8TZTtda5M1DfXnbkX1C0SHCFKzQB5Fe8op4GNGNHavvZESbVwT5r6W1xyuCPBY3Y9YgDqzknH/e3YfNzzuL30l0IebrZ5kKtuDIXt1n868ET6kf3/49tLvrCcZyF8Pu215dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcPIbNrBhOaBXucoAAAAASUVORK5CYII=">
-<link rel="import" href="tf-tensorboard.html">
+<script src="webcomponentsjs/webcomponents-lite.min.js"></script>
+<link rel="import" href="tf-tensorboard/style.html">
+<link rel="import" href="tf-tensorboard/tf-tensorboard.html">
+<link rel="import" href="analytics.html">
 <body>
 <tf-tensorboard use-hash></tf-tensorboard>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
index 9172ebb22a..010643b856 100644
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
@@ -44,9 +44,9 @@ tensorboard_webcomponent_library(
     ],
     destdir = "tf-audio-dashboard",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
         "//tensorflow/tensorboard/components/tf_backend:legacy",
         "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//third_party/javascript/polymer/v1/paper-icon-button:lib",
         "//third_party/javascript/polymer/v1/paper-styles:lib",
         "//third_party/javascript/polymer/v1/polymer:lib",
@@ -59,5 +59,4 @@ tensorboard_ts_library(
     srcs = [],
     deps_mgmt = "off",
     runtime = "nodejs",
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
 )
diff --git a/tensorflow/tensorboard/components/tf_backend/BUILD b/tensorflow/tensorboard/components/tf_backend/BUILD
index d9f3a035d8..14781f327c 100644
--- a/tensorflow/tensorboard/components/tf_backend/BUILD
+++ b/tensorflow/tensorboard/components/tf_backend/BUILD
@@ -58,7 +58,7 @@ tensorboard_webcomponent_library(
     visibility = ["//visibility:public"],
     destdir = "tf-backend",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//third_party/javascript/polymer/v1/polymer:lib",
     ],
 )
@@ -75,7 +75,15 @@ tensorboard_ts_library(
     deps_mgmt = "off",
     runtime = "nodejs",
     deps = [
-        "//tensorflow/tensorboard/components:common_deps",
         "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
     ],
 )
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
index 019283816f..179ca27cd2 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/BUILD
@@ -13,6 +13,7 @@ web_library(
         "tf-backend.html",
     ],
     path = "/tf-backend",
+    visibility = ["//visibility:public"],
     deps = [
         "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:lodash",
diff --git a/tensorflow/tensorboard/components/tf_color_scale/BUILD b/tensorflow/tensorboard/components/tf_color_scale/BUILD
index 3e64fccd2e..f6f1be099a 100644
--- a/tensorflow/tensorboard/components/tf_color_scale/BUILD
+++ b/tensorflow/tensorboard/components/tf_color_scale/BUILD
@@ -48,7 +48,7 @@ tensorboard_webcomponent_library(
     ],
     destdir = "tf-color-scale",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//third_party/javascript/polymer/v1/polymer:lib",
     ],
 )
@@ -61,5 +61,15 @@ tensorboard_ts_library(
     ],
     deps_mgmt = "off",
     runtime = "nodejs",
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
+    deps = [
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
 )
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
index 321e4a821e..5a9e941e46 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
@@ -65,7 +65,7 @@ tensorboard_webcomponent_library(
     srcs = glob(["*.html"]) + [":legacy_ts"],
     destdir = "tf-dashboard-common",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//tensorflow/tensorboard/components/tf_storage:legacy",
         "//tensorflow/tensorboard/components/vz_sorting:legacy",
         "//third_party/javascript/polymer/v1/iron-ajax:lib",
@@ -97,7 +97,15 @@ tensorboard_ts_library(
     deps_mgmt = "off",
     runtime = "nodejs",
     deps = [
-        "//tensorflow/tensorboard/components:common_deps",
         "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
     ],
 )
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
index 38c3eb6c11..65341e7647 100644
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
@@ -42,9 +42,9 @@ tensorboard_webcomponent_library(
     ],
     destdir = "tf-distribution-dashboard",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
         "//tensorflow/tensorboard/components/tf_backend:legacy",
         "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//tensorflow/tensorboard/components/vz_distribution_chart:legacy",
         "//third_party/javascript/polymer/v1/iron-collapse:lib",
         "//third_party/javascript/polymer/v1/paper-icon-button:lib",
@@ -59,6 +59,4 @@ tensorboard_ts_library(
     srcs = [],
     deps_mgmt = "off",
     runtime = "nodejs",
-    # Don't list the common_deps here; a src-less ts_library re-exports them,
-    # and they are outside the package where the Fileset will be rooted.
 )
diff --git a/tensorflow/tensorboard/components/tf_graph_common/BUILD b/tensorflow/tensorboard/components/tf_graph_common/BUILD
index 50f7a309ed..7c0a4a44a2 100644
--- a/tensorflow/tensorboard/components/tf_graph_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_common/BUILD
@@ -51,7 +51,7 @@ tensorboard_webcomponent_library(
     ],
     destdir = "tf-graph-common",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//third_party/javascript/polymer/v1/polymer:lib",
     ],
 )
@@ -61,5 +61,15 @@ tensorboard_ts_library(
     srcs = glob(["*.ts"]),
     deps_mgmt = "off",
     runtime = "nodejs",
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
+    deps = [
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
 )
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
index 3f17bda34c..d8e2f672f8 100644
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
@@ -42,9 +42,9 @@ tensorboard_webcomponent_library(
     ],
     destdir = "tf-histogram-dashboard",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
         "//tensorflow/tensorboard/components/tf_backend:legacy",
         "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//tensorflow/tensorboard/components/vz_histogram_timeseries:legacy",
         "//third_party/javascript/polymer/v1/iron-collapse:lib",
         "//third_party/javascript/polymer/v1/paper-icon-button:lib",
diff --git a/tensorflow/tensorboard/components/tf_imports/BUILD b/tensorflow/tensorboard/components/tf_imports/BUILD
index ac4c41d00f..81d1234d66 100644
--- a/tensorflow/tensorboard/components/tf_imports/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports/BUILD
@@ -24,7 +24,7 @@ web_library(
     name = "graphlib",
     srcs = [
         "graphlib.html",
-        "@io_github_cpettitt_graphlib",
+        "@io_github_cpettitt_graphlib//:graphlib.core.js",
     ],
     path = "/tf-imports",
     deps = [":lodash"],
@@ -34,7 +34,7 @@ web_library(
     name = "dagre",
     srcs = [
         "dagre.html",
-        "@io_github_cpettitt_dagre",
+        "@io_github_cpettitt_dagre//:dagre.core.js",
     ],
     path = "/tf-imports",
     deps = [
diff --git a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
index edf759052f..abebe34368 100644
--- a/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_imports_d3v4/BUILD
@@ -26,7 +26,7 @@ web_library(
     name = "numericjs",
     srcs = [
         "numericjs.html",
-        "@com_numericjs",
+        "@com_numericjs//:numeric.js",
     ],
     path = "/tf-imports",
 )
@@ -35,7 +35,7 @@ web_library(
     name = "weblas",
     srcs = [
         "weblas.html",
-        "@io_github_waylonflinn_weblas",
+        "@io_github_waylonflinn_weblas//:weblas.js",
     ],
     path = "/tf-imports",
 )
@@ -44,7 +44,7 @@ web_library(
     name = "graphlib",
     srcs = [
         "graphlib.html",
-        "@io_github_cpettitt_graphlib",
+        "@io_github_cpettitt_graphlib//:graphlib.core.js",
     ],
     path = "/tf-imports",
     deps = [":lodash"],
@@ -54,7 +54,7 @@ web_library(
     name = "dagre",
     srcs = [
         "dagre.html",
-        "@io_github_cpettitt_dagre",
+        "@io_github_cpettitt_dagre//:dagre.core.js",
     ],
     path = "/tf-imports",
     deps = [
@@ -67,7 +67,7 @@ web_library(
     name = "d3",
     srcs = [
         "d3.html",
-        "@org_d3js_v4",
+        "@org_d3js_v4//:d3.js",
     ],
     path = "/tf-imports",
 )
diff --git a/tensorflow/tensorboard/components/tf_imports_google/README.md b/tensorflow/tensorboard/components/tf_imports_google/README.md
deleted file mode 100644
index 60d9cce777..0000000000
--- a/tensorflow/tensorboard/components/tf_imports_google/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This file acts as import routers for third party javascript libraries,
-e.g. Plottable and D3 from `g3/third_party`; it exists to facilitate development
-inside google.
diff --git a/tensorflow/tensorboard/components/tf_imports_google/d3.html b/tensorflow/tensorboard/components/tf_imports_google/d3.html
deleted file mode 100644
index dbfd11aa87..0000000000
--- a/tensorflow/tensorboard/components/tf_imports_google/d3.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<script src="../d3-library/d3.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_imports_google/dagre.html b/tensorflow/tensorboard/components/tf_imports_google/dagre.html
deleted file mode 100644
index 5b8b981741..0000000000
--- a/tensorflow/tensorboard/components/tf_imports_google/dagre.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../dagre-library/dagre.html">
diff --git a/tensorflow/tensorboard/components/tf_imports_google/plottable.html b/tensorflow/tensorboard/components/tf_imports_google/plottable.html
deleted file mode 100644
index 6f9678f9cb..0000000000
--- a/tensorflow/tensorboard/components/tf_imports_google/plottable.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="d3.html">
-<link rel="import" href="../plottable-library/plottable.html">
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
index c1fbf80c4b..46c91c484f 100644
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
+++ b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
@@ -49,10 +49,10 @@ tensorboard_webcomponent_library(
     ],
     destdir = "tf-scalar-dashboard",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
         "//tensorflow/tensorboard/components/tf_backend:legacy",
         "//tensorflow/tensorboard/components/tf_color_scale:legacy",
         "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//tensorflow/tensorboard/components/vz_line_chart:legacy",
         "//third_party/javascript/polymer/v1/iron-collapse:lib",
         "//third_party/javascript/polymer/v1/paper-checkbox:lib",
@@ -73,5 +73,4 @@ tensorboard_ts_library(
     srcs = [],
     deps_mgmt = "off",
     runtime = "nodejs",
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
 )
diff --git a/tensorflow/tensorboard/components/tf_storage/BUILD b/tensorflow/tensorboard/components/tf_storage/BUILD
index 8b2e006367..940d09681d 100644
--- a/tensorflow/tensorboard/components/tf_storage/BUILD
+++ b/tensorflow/tensorboard/components/tf_storage/BUILD
@@ -52,8 +52,8 @@ tensorboard_webcomponent_library(
     visibility = ["//visibility:public"],
     destdir = "tf-storage",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
         "//tensorflow/tensorboard/components/tf_globals:legacy",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//third_party/javascript/polymer/v1/polymer:lib",
     ],
 )
@@ -64,7 +64,15 @@ tensorboard_ts_library(
     deps_mgmt = "off",
     runtime = "nodejs",
     deps = [
-        "//tensorflow/tensorboard/components:common_deps",
         "//tensorflow/tensorboard/components/tf_globals:legacy_ts",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
     ],
 )
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD
index 683302bb45..e17a083cb1 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/BUILD
@@ -1,7 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:vulcanize.bzl", "tensorboard_html_binary")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
 
 licenses(["notice"])  # Apache 2.0
@@ -9,32 +8,35 @@ licenses(["notice"])  # Apache 2.0
 web_library(
     name = "tf_tensorboard_d3v4",
     srcs = [
+        "style.html",
         "tf-tensorboard.html",
         ":ts",
     ],
     path = "/tf-tensorboard",
+    visibility = ["//visibility:public"],
     deps = [
-        "@org_polymer_iron_icons",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_checkbox",
-        "@org_polymer_paper_dialog",
-        "@org_polymer_paper_header_panel",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_tabs",
-        "@org_polymer_paper_toolbar",
-        "@org_polymer",
         "//tensorflow/tensorboard/components/tf_audio_dashboard_d3v4",
         "//tensorflow/tensorboard/components/tf_backend_d3v4",
         "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4",
         "//tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4",
         "//tensorflow/tensorboard/components/tf_globals_d3v4",
-        # "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4",
         "//tensorflow/tensorboard/components/tf_image_dashboard_d3v4",
         "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4",
         "//tensorflow/tensorboard/components/tf_storage_d3v4",
         "//tensorflow/tensorboard/components/tf_text_dashboard_d3v4",
         "//tensorflow/tensorboard/components/vz_projector_d3v4",
+        "@org_polymer",
+        "@org_polymer_font_roboto",
+        "@org_polymer_iron_icons",
+        "@org_polymer_paper_button",
+        "@org_polymer_paper_checkbox",
+        "@org_polymer_paper_dialog",
+        "@org_polymer_paper_header_panel",
+        "@org_polymer_paper_icon_button",
+        "@org_polymer_paper_tabs",
+        "@org_polymer_paper_toolbar",
     ],
 )
 
@@ -49,25 +51,6 @@ web_library(
     ],
 )
 
-web_library(
-    name = "dist",
-    srcs = ["dist.html"],
-    path = "/tf-tensorboard",
-    deps = [
-        ":tf_tensorboard_d3v4",
-        "//tensorflow/tensorboard/demo:demo_data",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-tensorboard_html_binary(
-    name = "index",
-    # input_path = "/tf-dashboard-common/tf-chart-scaffold.html",
-    input_path = "/tf-tensorboard/dist.html",
-    output_path = "/index.html",
-    deps = [":dist"],
-)
-
 tensorboard_typescript_genrule(
     name = "ts",
     srcs = ["autoReloadBehavior.ts"],
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html
index 95f5b718a5..c8a9238aef 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/demo.html
@@ -16,17 +16,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<title>TensorBoard</title>
-<style>
-  html, body {
-    margin: 0;
-    padding: 0;
-    height: 100%;
-    font-family: "RobotoDraft", "Roboto", sans-serif;
-  }
-</style>
+<meta charset="utf-8">
+<title>TensorBoard Demo</title>
 <script src="../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMQAAADECAMAAAD3eH5ZAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAD/UExURfFlKfaELvFmKfNyK/67NvWALf68Nv69NvNxK/20NfyyNP22NfN0K/JrKvqhMv2zNf25Nf24Nf23NfeOL/yzNPyvNPJoKviWMPmeMfN1K/WBLfePL/FnKfeML/qlMvR7LPmcMfeLL/aJLvR5LPFoKfJuKvR3LP66NvywNPeNL/V/LfaILv21Nf26NfNzK/NvK/R6LPmaMfyxNPqfMvV+LfurM/iSMPmbMfJvKvmdMfumM/qiMvmZMfytNPJqKvysNPN2K/iYMPNwK/upM/JtKvJsKviVMPaHLvaGLvJpKvR8LPaKLvqkMvuqM/aFLvR4LPuoM/iTMPWDLfiRMPmYMXS0ngkAAALoSURBVHja7drnctpAFIbhFUISSKJ3MKYa0+y4xTW9937/15JkJhlTjhrSrHRmvuf/as6L0YLFCgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBJ6njenqspzgnPrsrGX9Zpi2tCrmnc6+dYNthVY5WpMmxQLWPdMsOuYVwzNj3ei2t3mQwaV43BJPDCS2NbJ5aEeuX/+9qcjQOtfFIkIkrvY2g4MVcmOBsFWbowKO/kNyj62gRpJcDaPBlxLr1B0zdG0C/8LzbJiJrshuvy1gzlA9+rD8mIkuyIJjFE3/dqnYwoSm7IUEPoD/wut8iIguSIDjlFxe/yfXL5vuSI21BTZLLhXoOILMO8Hxwa/L8bI0LfmUdhGowb2ZvT0e57pFNDgB06IlVyjmmIBl2T/nl9Rw6SD9GgSG/Q0uQkaW3XhmovKQ3eFQ4N2Uo9OQ1eFZsNerf7vP+rO4rhmY1Lg3vFVoP8+8BXg1sFnwbnCk4NThW8GuiKBDdkVVtTNFvNelVsNqTbyWnIOM2oeTRoyWvwmpJHg/ucXBrcJuXT4DwrpwZi2vy0VCx8YtXg/D2bU4OfiuQ3eFfE2KD4bfCqiLNB993gXsGlwa2CT4NzBacGIVQ6YsipQdh0xEdODUKjIxrSp88onZ8zbbFLg1DoiFO5BXvDGv2My9/JhUT8JUZTI0yDaNHLBzIbvqTDNYhUiVw/kdjQ1kM2CHFDPjKW+KzyRTF0g/ga9w9y+fANQpxvX8CU+Ny7FUWDeF3Y+g3lROIf4k0UDX9eCyvO531PyYhHga9zvPZJU5b73Y/eXj8Hv9D48n6HaF5LbcjRt8TZTtda5M1DfXnbkX1C0SHCFKzQB5Fe8op4GNGNHavvZESbVwT5r6W1xyuCPBY3Y9YgDqzknH/e3YfNzzuL30l0IebrZ5kKtuDIXt1n868ET6kf3/49tLvrCcZyF8Pu215dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcPIbNrBhOaBXucoAAAAASUVORK5CYII=">
+<link rel="import" href="style.html">
 <link rel="import" href="tf-tensorboard.html">
-
+<body>
 <tf-tensorboard demo-dir="/data" use-hash></tf-tensorboard>
diff --git a/tensorflow/tensorboard/components/tf_imports_google/lodash.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/style.html
similarity index 75%
rename from tensorflow/tensorboard/components/tf_imports_google/lodash.html
rename to tensorflow/tensorboard/components/tf_tensorboard_d3v4/style.html
index eb8fef2883..575e89e398 100644
--- a/tensorflow/tensorboard/components/tf_imports_google/lodash.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/style.html
@@ -15,4 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<link rel="import" href="../lodash-library/lodash-library.html">
+<link rel="import" href="../font-roboto/roboto.html">
+
+<style>
+  html,
+  body {
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    font-family: "RobotoDraft", "Roboto", sans-serif;
+  }
+</style>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html
index f3f5d590f9..3a56535410 100644
--- a/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html
+++ b/tensorflow/tensorboard/components/tf_tensorboard_d3v4/tf-tensorboard.html
@@ -30,12 +30,13 @@ limitations under the License.
 <link rel="import" href="../tf-histogram-dashboard/tf-histogram-dashboard.html">
 <link rel="import" href="../tf-image-dashboard/tf-image-dashboard.html">
 <link rel="import" href="../tf-audio-dashboard/tf-audio-dashboard.html">
-<!-- <link rel="import" href="../tf-graph-dashboard/tf-graph-dashboard.html"> -->
+<link rel="import" href="../tf-graph-dashboard/tf-graph-dashboard.html">
 <link rel="import" href="../tf-text-dashboard/tf-text-dashboard.html">
 <link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
 <link rel="import" href="../tf-backend/tf-backend.html">
 <link rel="import" href="../tf-storage/tf-storage.html">
 <link rel="import" href="../vz-projector/vz-projector-dashboard.html">
+<link rel="import" href="../vz-projector/bundle.html">
 
 <!--
 tf-tensorboard is the frontend entry point for TensorBoard.
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
index 3346805fb0..3b46082bec 100644
--- a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
+++ b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
@@ -51,7 +51,7 @@ tensorboard_webcomponent_library(
     visibility = ["//visibility:public"],
     destdir = "vz-distribution-chart",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//tensorflow/tensorboard/components/vz_sorting:legacy",
         "//third_party/javascript/polymer/v1/polymer:lib",
     ],
@@ -63,7 +63,15 @@ tensorboard_ts_library(
     deps_mgmt = "off",
     runtime = "nodejs",
     deps = [
-        "//tensorflow/tensorboard/components:common_deps",
         "//tensorflow/tensorboard/components/vz_line_chart:legacy_ts",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
     ],
 )
diff --git a/tensorflow/tensorboard/components/vz_heatmap/BUILD b/tensorflow/tensorboard/components/vz_heatmap/BUILD
new file mode 100644
index 0000000000..eccc411f1b
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_heatmap/BUILD
@@ -0,0 +1,29 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+licenses(["notice"])  # Apache 2.0
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "demo/index.html",
+        "index.html",
+        "vz-heatmap.html",
+    ],
+    visibility = ["//visibility:public"],
+    destdir = "vz-heatmap",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
+        "//tensorflow/tensorboard/components/vz_sorting:legacy",
+        "//third_party/javascript/polymer/v1/iron-component-page:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+        "//third_party/javascript/polymer/v1/webcomponentsjs:lib",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_heatmap/demo/index.html b/tensorflow/tensorboard/components/vz_heatmap/demo/index.html
index 63dd04485f..0ef092fccc 100644
--- a/tensorflow/tensorboard/components/vz_heatmap/demo/index.html
+++ b/tensorflow/tensorboard/components/vz_heatmap/demo/index.html
@@ -22,6 +22,7 @@ limitations under the License.
   <title>Heatmap example</title>
   <link rel="import" href="../vz-heatmap.html">
   <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+  <link rel="import" href="../../tf-imports/d3.html">
 </head>
 <script>
   function generateRandomMatrix() {
@@ -108,7 +109,7 @@ limitations under the License.
     setTimeout(function () {
       var heatmapColor = document.getElementById('color_function');
       heatmapColor.colorFunction =
-          d3.scale.linear().range(['white', 'black']).domain([0, 5]);
+          d3.scaleLinear().range(['white', 'black']).domain([0, 5]);
     }, 1500);
   </script>
 </div>
diff --git a/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html b/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html
index 7acba47d5f..4a00542276 100644
--- a/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html
+++ b/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html
@@ -89,7 +89,7 @@ fits itself to the width of the container it is placed in.
         _generatedColorScale: {
           type: Object,
           value: (function () {
-            var retFunction = d3.scale.linear();
+            var retFunction = d3.scaleLinear();
             if (this.colors) {
               retFunction.range(this.colors)
             }
@@ -277,7 +277,7 @@ fits itself to the width of the container it is placed in.
        */
       _updateColorFunction: function () {
         if (Array.isArray(this.colors) && this.colors.length) {
-          this._generatedColorScale = d3.scale.linear().range(this.colors);
+          this._generatedColorScale = d3.scaleLinear().range(this.colors);
         }
 
         if (this.values) {
@@ -294,7 +294,7 @@ fits itself to the width of the container it is placed in.
         }
       },
       _getLinearInterpolation: function (domain, range) {
-        return d3.scale.linear().domain(domain).range(range);
+        return d3.scaleLinear().domain(domain).range(range);
       },
       /**
        * Find side length of each tile in heat map by dividing current width
diff --git a/tensorflow/tensorboard/components/vz_heatmap_d3v4/BUILD b/tensorflow/tensorboard/components/vz_heatmap_d3v4/BUILD
new file mode 100644
index 0000000000..b62629fc55
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_heatmap_d3v4/BUILD
@@ -0,0 +1,41 @@
+package(default_visibility = ["//tensorflow:internal"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
+
+licenses(["notice"])  # Apache 2.0
+
+web_library(
+    name = "vz_heatmap_d3v4",
+    srcs = ["vz-heatmap.html"],
+    path = "/vz-heatmap",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer",
+        "@org_polymer_iron_resizable_behavior",
+    ],
+)
+
+web_library(
+    name = "index",
+    srcs = [
+        "demo/index.html",
+        "index.html",
+    ],
+    path = "/vz-heatmap",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":vz_heatmap_d3v4",
+        "//tensorflow/tensorboard/components/tf_imports_d3v4:d3",
+        "@org_polymer",
+        "@org_polymer_iron_component_page",
+        "@org_polymer_iron_demo_helpers",
+        "@org_polymer_webcomponentsjs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
+)
diff --git a/tensorflow/tensorboard/components/vz_heatmap_d3v4/demo/index.html b/tensorflow/tensorboard/components/vz_heatmap_d3v4/demo/index.html
new file mode 100644
index 0000000000..0ef092fccc
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_heatmap_d3v4/demo/index.html
@@ -0,0 +1,161 @@
+<!doctype html>
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Heatmap example</title>
+  <link rel="import" href="../vz-heatmap.html">
+  <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
+  <link rel="import" href="../../tf-imports/d3.html">
+</head>
+<script>
+  function generateRandomMatrix() {
+    var rows = getRandomArbitrary(10, 20);
+    var columns = getRandomArbitrary(10, 20);
+    var data = [];
+    // Generate new data array.
+    for (var row = 0; row < rows; row++) {
+      var currentRow = [];
+      for (var col = 0; col < columns; col++) {
+        currentRow[col] = getRandomArbitrary(0, 20);
+      }
+      data[row] = currentRow;
+    }
+    return data;
+  }
+
+  // Returns a random number between min (inclusive) and max (exclusive)
+  function getRandomArbitrary(min, max) {
+    return Math.random() * (max - min) + min;
+  }
+
+  function getRandomColorRange() {
+    return [getRandomColor(), getRandomColor()];
+  }
+
+  function getRandomColor() {
+    var letters = '0123456789ABCDEF';
+    var color = '#';
+    for (var i = 0; i < 6; i++) {
+      color += letters[Math.floor(Math.random() * 16)];
+    }
+    return color;
+  }
+</script>
+<body>
+<h1>Initialized with data</h1>
+<div style="width: 30%">
+  <demo-snippet>
+    <template>
+      <vz-heatmap data="[[1,2],[3,4]]"></vz-heatmap>
+    </template>
+  </demo-snippet>
+</div>
+
+<h1>Initialized with data and custom data range</h1>
+<div style="width: 30%">
+  <demo-snippet>
+    <template>
+      <vz-heatmap data="[[1,2],[3,4]]" values="[0,10]"></vz-heatmap>
+    </template>
+  </demo-snippet>
+</div>
+
+<h1>Initialized with data and colors</h1>
+<div style="width: 30%">
+  <demo-snippet>
+    <template>
+      <vz-heatmap data="[[1,2],[3,4]]" colors='["yellow", "red"]'></vz-heatmap>
+    </template>
+  </demo-snippet>
+</div>
+
+<h1>Initialized with data and colors and threshold values</h1>
+<div style="width: 30%">
+  <demo-snippet>
+    <template>
+      <vz-heatmap data="[[1,2],[3,4]]"
+                  values="[0, 10]"
+                  colors='["yellow", "red"]'
+      ></vz-heatmap>
+    </template>
+  </demo-snippet>
+</div>
+<h1>Initialized with data and color function</h1>
+<div style="width: 30%">
+  <demo-snippet>
+    <template>
+      <vz-heatmap id="color_function" data="[[1,2],[3,4]]"
+      ></vz-heatmap>
+    </template>
+  </demo-snippet>
+  <script>
+    setTimeout(function () {
+      var heatmapColor = document.getElementById('color_function');
+      heatmapColor.colorFunction =
+          d3.scaleLinear().range(['white', 'black']).domain([0, 5]);
+    }, 1500);
+  </script>
+</div>
+
+<h1>Initialized with data and updated data</h1>
+<h3>Click on the heatmap to create new random data.</h3>
+<div style="width: 30%">
+  <demo-snippet>
+    <template>
+      <vz-heatmap data="[[1,2],[3,4]]"
+                  onclick="this.data = generateRandomMatrix()"
+      >
+      </vz-heatmap>
+    </template>
+  </demo-snippet>
+</div>
+
+<h1>Initialized with data and updated color update</h1>
+<h3>Click on the heatmap to update the color scheme.</h3>
+<div style="width: 30%">
+  <demo-snippet>
+    <template>
+      <vz-heatmap id="data_color_update" data="[[1,2],[3,4]]"
+                  onclick="this.colors = getRandomColorRange();
+                       this.data = generateRandomMatrix()"
+      >
+      </vz-heatmap>
+    </template>
+  </demo-snippet>
+</div>
+
+<h2>Let's try to actually break it... *Puts on fedora*</h2>
+<p>Code below is not meant to be seen, but to ensure that no errors are
+  thrown when invalid data is passed into the Polymer element.</p>
+<demo-snippet>
+  <template>
+    <vz-heatmap id="break_the_heatmap" data="undefined"></vz-heatmap>
+  </template>
+</demo-snippet>
+<script>
+  var bth = document.getElementById('break_the_heatmap');
+  bth.data = []; // Empty 1D array.
+  bth.data = [[]]; // Empty 2D array.
+  bth.colors = ['yellow', 'blue', '']; // More than 2 elements in colors array.
+  bth.values = [1, 2, 3]; // More than 2 elements in values array.
+</script>
+
+</body>
+</html>
diff --git a/tensorflow/tensorboard/dist/bazel-html-imports.html b/tensorflow/tensorboard/components/vz_heatmap_d3v4/index.html
similarity index 62%
rename from tensorflow/tensorboard/dist/bazel-html-imports.html
rename to tensorflow/tensorboard/components/vz_heatmap_d3v4/index.html
index 2268e6d7d4..656306499e 100644
--- a/tensorflow/tensorboard/dist/bazel-html-imports.html
+++ b/tensorflow/tensorboard/components/vz_heatmap_d3v4/index.html
@@ -16,8 +16,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<!-- TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT -->
-<script src="../numericjs_numeric_min_js/file/numeric.min.js"></script>
-<script src="../three_js_three_min_js/file/three.min.js"></script>
-<script src="../three_js_orbitcontrols_js/file/OrbitControls.js"></script>
-<script src="../weblas_weblas_js/file/weblas.js"></script>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="../webcomponentsjs/webcomponents-lite.js"></script>
+    <link rel="import" href="../iron-component-page/iron-component-page.html">
+  </head>
+  <body>
+
+    <iron-component-page src="vz-heatmap.html"></iron-component-page>
+
+  </body>
+</html>
diff --git a/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html b/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html
new file mode 100644
index 0000000000..8a3503468f
--- /dev/null
+++ b/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html
@@ -0,0 +1,360 @@
+<!--
+@license
+Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../iron-resizable-behavior/iron-resizable-behavior.html">
+<link rel="import" href="../tf-imports/d3.html">
+
+<!--
+`vz-heatmap` A simple heatmap to visualize 2D data using predefined or user
+defined colour scheme, with a dependency on d3.js. The heatmap automatically
+fits itself to the width of the container it is placed in.
+
+@element vz-heatmap
+@demo demo/index.html
+-->
+<dom-module id="vz-heatmap">
+  <template>
+    <div>
+      <canvas id="heatmap"
+              style="width: 100%; image-rendering:pixelated"></canvas>
+    </div>
+  </template>
+  <script>
+    Polymer({
+      is: 'vz-heatmap',
+      properties: {
+        /**
+         * An 2-element array which defines the lower and upper bound of the
+         * automatically created color scale for the heatmap.
+         */
+        colors: {
+          type: Array,
+          value: ['white', 'steelblue'],
+          observer: '_onColorsChange'
+        },
+        /**
+         * A function which returns a hex-formatted color string
+         * given a number type.
+         * i.e. (input: number) => string
+         *
+         * Passing a colorFunction deactivates the color
+         * function generated by the `colors` and `values` fields.
+         */
+        colorFunction: {
+          type: Object,
+          observer: '_onColorFunctionChange'
+        },
+        /**
+         * A 2D data array containing the data to be visualized.
+         */
+        data: {
+          type: Array,
+          value: [],
+          observer: '_onDataChange'
+        },
+        /**
+         * A 2-element array containing the domain of values which
+         * maps to the color range defined by the `colors` array.
+         */
+        values: {
+          type: Array,
+          observer: '_onValuesChange'
+        },
+        _currentDataValid: {
+          type: Boolean,
+          value: false
+        },
+        _dataExtent: {
+          type: Array,
+          value: [0, 1]
+        },
+        _debug: {
+          type: Boolean,
+          value: false
+        },
+        _generatedColorScale: {
+          type: Object,
+          value: (function () {
+            var retFunction = d3.scaleLinear();
+            if (this.colors) {
+              retFunction.range(this.colors)
+            }
+
+            return retFunction;
+          })()
+        },
+        _isReady: {
+          type: Boolean,
+          value: false
+        },
+        _height: {
+          type: Number,
+          value: 0
+        },
+        _width: {
+          type: Number,
+          value: 0
+        },
+        _useUserColorPickerFunction: {
+          type: Boolean,
+          value: false
+        }
+      },
+      behaviors: [
+        Polymer.IronResizableBehavior
+      ],
+      listeners: {
+        'iron-resize': '_onWidthChange'
+      },
+      _onWidthChange: function () {
+        // Re-render the chart if the data has already been set.
+        if (this._currentDataValid) {
+          this._renderData();
+        }
+      },
+      ready: function () {
+        this._isReady = true;
+        this._onWidthChange();
+      },
+      attached: function () {
+        this._onWidthChange();
+      },
+      /**
+       * Data change handler, if new data is valid, sets flag to indicate data
+       * now valid, updates the data extent and renders the new data.
+       */
+      _onDataChange: function () {
+        // Validate new data.
+        if (!this._isDataValid(this.data)) {
+          return;
+        }
+
+        // Set flag to indicate data is now valid.
+        this._currentDataValid = true;
+
+        // Calculate new data extent.
+        this._updateDataExtent();
+
+        if (this._isReady) {
+          this._renderData();
+        }
+      },
+      /**
+       * (Re-)Renders the heatmap. Called when data, color mapping, or width
+       * changes.
+       * @private
+       */
+      _renderData: function () {
+        // Ensure dimensions are up-to-date and valid before starting rendering.
+        this._updateDimensions();
+        if (!this._width || !this._height) return;
+
+        // Ensure the color function is up-to-date.
+        this._updateColorFunction();
+        var width = this._width;
+        var rows = this.data.length;
+        var columns = this.data[0].length;
+
+        // Calculate side length of each tile.
+        var sideLength = width / columns;
+
+        // Set domain and range of the axis.
+        var colorScale = (this._useUserColorPickerFunction) ?
+            this.colorFunction : this._generatedColorScale;
+
+        // Clear the canvas.
+        this.resetCanvas();
+
+        // Render heatmap.
+        var ctx = this.$.heatmap.getContext("2d");
+
+        for (var row = 0; row < rows; row++) {
+          for (var column = 0; column < columns; column++) {
+            var value = this.data[row][column];
+            // Set location and dimensions.
+            ctx.fillStyle = colorScale(value);
+            // Preferred way to set color of individual pixels.
+            ctx.fillRect(column, row, 1, 1);
+          }
+        }
+      },
+      /**
+       * Observer for this.colors.
+       * @private
+       */
+      _onColorsChange: function () {
+        if (Array.isArray(this.colors) && this.colors.length == 2) {
+          this._updateColorFunction();
+        }
+        this._useUserColorPickerFunction = false;
+        this._renderData();
+      },
+      /**
+       * Observer for this.values. Updates the
+       * internal color function. If data invalid, internal color scale uses
+       * the extent of the data as domain.
+       * @private
+       */
+      _onValuesChange: function () {
+        // Verify that validity of the new content of values.
+        // If data not valid, set this.values to undefined, as
+        // _updateColorFunction will then use the data's extent as the color
+        // scale's domain.
+        if (!(Array.isArray(this.values) && this.values.length == 2)) {
+          this.values = undefined;
+        }
+
+        this._updateColorFunction();
+        this._useUserColorPickerFunction = false;
+        this._renderData();
+      },
+      /**
+       * Observer for this.colorFunction. This field allows the user to
+       * provide a custom color scale. Updates to this value are ignored, if the new
+       * value is not a function object.
+       * @private
+       */
+      _onColorFunctionChange: function () {
+        if (typeof this.colorFunction === 'function') {
+          this._useUserColorPickerFunction = true;
+          this._renderData();
+        } else if (this._debug) {
+          console.log('The colorFunction provided is not of function type, and was not set as default.')
+        }
+      },
+      /**
+       * Calculates the extent of the data if it is required by the
+       * current color function. This function is called when
+       * properties change which would result in the color scale
+       * changing, or when the computed color scale is started to be used.
+       * @private
+       */
+      _updateDataExtent: function () {
+        if (this._currentDataValid) {
+          var rows = this.data.length;
+          var columns = this.data[0].length;
+
+          var min = this.data[0][0];
+          var max = this.data[0][0];
+
+          for (var row = 0; row < rows; row++) {
+            for (var col = 0; col < columns; col++) {
+              var currentElement = this.data[row][col];
+
+              if (currentElement < min) {
+                min = currentElement;
+              } else if (currentElement > max) {
+                max = currentElement;
+              }
+            }
+          }
+
+          this._dataExtent = [min, max];
+        } else if (!this._dataExtent) {
+          this._dataExtent = [0, 1];
+        }
+      },
+      /**
+       * Updates the internal color function only when the number of
+       * elements in this.colors is equal to the number of elements in
+       * this.values or if this.values is empty, in which case the
+       * extent of the data is used.
+       * @private
+       */
+      _updateColorFunction: function () {
+        if (Array.isArray(this.colors) && this.colors.length) {
+          this._generatedColorScale = d3.scaleLinear().range(this.colors);
+        }
+
+        if (this.values) {
+          // Check that the number of elements in this.values and
+          // this.colors have an identical number of elements.
+          if (this.colors.length === this.values.length) {
+            this._generatedColorScale.domain(this.values);
+          }
+
+          // If values reset, and data field contains valid data, set colour scale
+          // to use the data extent as domain.
+        } else if (this._currentDataValid) {
+          this._generatedColorScale.domain(this._dataExtent);
+        }
+      },
+      _getLinearInterpolation: function (domain, range) {
+        return d3.scaleLinear().domain(domain).range(range);
+      },
+      /**
+       * Find side length of each tile in heat map by dividing current width
+       * by number of columns
+       */
+      _findTileSideLength: function () {
+        if (this._currentDataValid) {
+          var numOfColumns = this.data[0].length;
+
+          // Make sure value is finite.
+          if (numOfColumns === 0) {
+            var returnValue = 0;
+          } else {
+            returnValue = this._width / numOfColumns;
+          }
+          return returnValue;
+
+        } else {
+          if (this._debug == true) {
+            console.log("WARNING: vz-heatmap is reverting to zero height as passed data is invalid.")
+          }
+          return 0; // Fall back to 0 height, if data is invalid.
+        }
+      },
+      /**
+       * Verifies whether input data is valid.
+       * @param newData Number[][]
+       * @private
+       */
+      _isDataValid: function (newData) {
+        return Array.isArray(newData) && newData.length &&
+            Array.isArray(newData[0]);
+      },
+      _updateDimensions: function () {
+        var canvasElement = this.$.heatmap;
+
+        var rows = 0;
+        var columns = 0;
+        if (this._currentDataValid) {
+          rows = this.data.length;
+          columns = this.data[0].length;
+        }
+
+        // Recalculate height and width, and ensure data can be rendered.
+        this._width = canvasElement.parentNode.clientWidth;
+        this._height = this._findTileSideLength() * rows;
+        // Update the attribute height and width.
+        canvasElement.setAttribute('height', rows);
+        canvasElement.setAttribute('width', columns);
+      },
+      /**
+       * Function which clears the canvas.
+       */
+      resetCanvas: function () {
+        // Reset the canvas.
+        var canvas = this.$.heatmap;
+        var ctx = canvas.getContext("2d");
+        ctx.clearRect(0, 0, canvas.width, canvas.height);
+      }
+    });
+  </script>
+</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
index d36cf2b331..3ca3936f32 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
@@ -37,7 +37,7 @@ tensorboard_webcomponent_library(
     visibility = ["//visibility:public"],
     destdir = "vz-histogram-timeseries",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//third_party/javascript/polymer/v1/polymer:lib",
     ],
 )
diff --git a/tensorflow/tensorboard/components/vz_line_chart/BUILD b/tensorflow/tensorboard/components/vz_line_chart/BUILD
index 130d58dec7..6b988e5279 100644
--- a/tensorflow/tensorboard/components/vz_line_chart/BUILD
+++ b/tensorflow/tensorboard/components/vz_line_chart/BUILD
@@ -54,7 +54,7 @@ tensorboard_webcomponent_library(
     visibility = ["//visibility:public"],
     destdir = "vz-line-chart",
     deps = [
-        "//tensorflow/tensorboard/components:tf_imports",
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
         "//tensorflow/tensorboard/components/vz_sorting:legacy",
         "//third_party/javascript/polymer/v1/polymer:lib",
     ],
@@ -69,5 +69,15 @@ tensorboard_ts_library(
     ],
     deps_mgmt = "off",
     runtime = "nodejs",
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
+    deps = [
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
 )
diff --git a/tensorflow/tensorboard/components/vz_sorting/BUILD b/tensorflow/tensorboard/components/vz_sorting/BUILD
index ab5d7c3989..795fc5cee4 100644
--- a/tensorflow/tensorboard/components/vz_sorting/BUILD
+++ b/tensorflow/tensorboard/components/vz_sorting/BUILD
@@ -46,5 +46,4 @@ tensorboard_ts_library(
     srcs = ["sorting.ts"],
     deps_mgmt = "off",
     runtime = "nodejs",
-    deps = ["//tensorflow/tensorboard/components:common_deps"],
 )
diff --git a/tensorflow/tensorboard/components/vz_sorting/test/BUILD b/tensorflow/tensorboard/components/vz_sorting/test/BUILD
index d1cf5a596a..649bfc5c6e 100644
--- a/tensorflow/tensorboard/components/vz_sorting/test/BUILD
+++ b/tensorflow/tensorboard/components/vz_sorting/test/BUILD
@@ -34,7 +34,15 @@ tensorboard_ts_library(
     deps_mgmt = "off",
     runtime = "nodejs",
     deps = [
-        "//tensorflow/tensorboard/components:common_deps",
         "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v1:typings",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
     ],
 )
diff --git a/tensorflow/tensorboard/dist/index.html b/tensorflow/tensorboard/dist/index.html
deleted file mode 100644
index 5f09faf31d..0000000000
--- a/tensorflow/tensorboard/dist/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <title>TensorBoard</title>
-    <script src="webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="lib/css/global.css">
-    <link rel="stylesheet" type="text/css" href="plottable/plottable.css">
-    <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMQAAADECAMAAAD3eH5ZAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAD/UExURfFlKfaELvFmKfNyK/67NvWALf68Nv69NvNxK/20NfyyNP22NfN0K/JrKvqhMv2zNf25Nf24Nf23NfeOL/yzNPyvNPJoKviWMPmeMfN1K/WBLfePL/FnKfeML/qlMvR7LPmcMfeLL/aJLvR5LPFoKfJuKvR3LP66NvywNPeNL/V/LfaILv21Nf26NfNzK/NvK/R6LPmaMfyxNPqfMvV+LfurM/iSMPmbMfJvKvmdMfumM/qiMvmZMfytNPJqKvysNPN2K/iYMPNwK/upM/JtKvJsKviVMPaHLvaGLvJpKvR8LPaKLvqkMvuqM/aFLvR4LPuoM/iTMPWDLfiRMPmYMXS0ngkAAALoSURBVHja7drnctpAFIbhFUISSKJ3MKYa0+y4xTW9937/15JkJhlTjhrSrHRmvuf/as6L0YLFCgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMBJ6njenqspzgnPrsrGX9Zpi2tCrmnc6+dYNthVY5WpMmxQLWPdMsOuYVwzNj3ei2t3mQwaV43BJPDCS2NbJ5aEeuX/+9qcjQOtfFIkIkrvY2g4MVcmOBsFWbowKO/kNyj62gRpJcDaPBlxLr1B0zdG0C/8LzbJiJrshuvy1gzlA9+rD8mIkuyIJjFE3/dqnYwoSm7IUEPoD/wut8iIguSIDjlFxe/yfXL5vuSI21BTZLLhXoOILMO8Hxwa/L8bI0LfmUdhGowb2ZvT0e57pFNDgB06IlVyjmmIBl2T/nl9Rw6SD9GgSG/Q0uQkaW3XhmovKQ3eFQ4N2Uo9OQ1eFZsNerf7vP+rO4rhmY1Lg3vFVoP8+8BXg1sFnwbnCk4NThW8GuiKBDdkVVtTNFvNelVsNqTbyWnIOM2oeTRoyWvwmpJHg/ucXBrcJuXT4DwrpwZi2vy0VCx8YtXg/D2bU4OfiuQ3eFfE2KD4bfCqiLNB993gXsGlwa2CT4NzBacGIVQ6YsipQdh0xEdODUKjIxrSp88onZ8zbbFLg1DoiFO5BXvDGv2My9/JhUT8JUZTI0yDaNHLBzIbvqTDNYhUiVw/kdjQ1kM2CHFDPjKW+KzyRTF0g/ga9w9y+fANQpxvX8CU+Ny7FUWDeF3Y+g3lROIf4k0UDX9eCyvO531PyYhHga9zvPZJU5b73Y/eXj8Hv9D48n6HaF5LbcjRt8TZTtda5M1DfXnbkX1C0SHCFKzQB5Fe8op4GNGNHavvZESbVwT5r6W1xyuCPBY3Y9YgDqzknH/e3YfNzzuL30l0IebrZ5kKtuDIXt1n868ET6kf3/49tLvrCcZyF8Pu215dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcPIbNrBhOaBXucoAAAAASUVORK5CYII=">
-    <link rel="import" href="dist/bazel-html-imports.html">
-    <link rel="import" href="dist/tf-tensorboard.html">
-  </head>
-  <body>
-    <tf-tensorboard use-hash></tf-tensorboard>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/dist/tf-tensorboard.html b/tensorflow/tensorboard/dist/tf-tensorboard.html
deleted file mode 100644
index 9f13cdfb47..0000000000
--- a/tensorflow/tensorboard/dist/tf-tensorboard.html
+++ /dev/null
@@ -1,27143 +0,0 @@
-<!-- Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============================================================================
-
-This file is generated by `gulp` & `vulcanize`. Do not directly change it.
-Instead, use `gulp regenerate` to create a new version with your changes.
--->
-
-<html><head><!--
-@license
-Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---><!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---><meta charset="UTF-8"><link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-icons/iron-icons.html">
-<link rel="import" href="../paper-tabs/paper-tabs.html">
-<link rel="import" href="../paper-dialog/paper-dialog.html">
-<link rel="import" href="../paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../paper-toolbar/paper-toolbar.html">
-<link rel="import" href="../paper-button/paper-button.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-header-panel/paper-header-panel.html">
-
-
-</head><body><div hidden="" by-vulcanize=""><dom-module id="tf-globals" assetpath="../tf-globals/">
-  <script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace */
-var TF;
-(function (TF) {
-    var Globals;
-    (function (Globals) {
-        // The names of TensorBoard tabs.
-        Globals.TABS = [
-            'scalars', 'images', 'audio', 'graphs', 'distributions', 'histograms',
-            'embeddings', 'text'
-        ];
-        // If true, TensorBoard stores its hash in the URI state.
-        // If false, tab switching in TensorBoard will not update location hash,
-        // because hash updates interfere with wct_tests.
-        Globals.USE_HASH = false;
-        // If USE_HASH is false, FAKE_HASH holds the hash contents.
-        Globals.FAKE_HASH = '';
-    })(Globals = TF.Globals || (TF.Globals = {}));
-})(TF || (TF = {}));
-</script>
-</dom-module>
-
-<script src="../lodash/lodash.min.js"></script>
-<link rel="import" href="../paper-slider/paper-slider.html">
-<link rel="import" href="../paper-input/paper-input.html">
-
-<dom-module id="tf-smoothing-input" assetpath="../tf-scalar-dashboard/">
-  <template>
-    <h3 class="title">Smoothing</h3>
-    <div class="smoothing-block">
-      <paper-slider id="slider" value="{{weight}}" immediate-value="{{_immediateWeightNumberForPaperSlider}}" type="number" step="[[step]]" min="[[min]]" max="[[max]]"></paper-slider>
-      <paper-input id="input" label="weight" no-label-float="" value="{{_inputWeightStringForPaperInput}}" type="number" step="[[step]]" min="[[min]]" max="[[max]]"></paper-input>
-    </div>
-    <style>
-      .title {
-        color: var(--paper-grey-800);
-        margin: 0;
-        font-weight: normal;
-        font-size: 14px;
-        margin-bottom: 5px;
-      }
-
-      .smoothing-block {
-        display: flex;
-      }
-
-      paper-slider {
-        margin-left: 12px;
-        --paper-slider-knob-color: var(--tb-orange-strong);
-        --paper-slider-active-color: var(--tb-orange-strong);
-        flex-grow: 2;
-      }
-
-      paper-input {
-        --paper-input-container-focus-color: var(--tb-orange-strong);
-        --paper-input-container-input: {
-          font-size: 14px;
-        };
-        --paper-input-container-label: {
-          font-size: 14px;
-        };
-        width: 60px;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-smoothing-input",
-
-      properties: {
-        step: Number,
-        max: Number,
-        min: Number,
-
-        weight: {
-          type: Number,
-          value: 0.6,
-          notify: true
-        },
-
-        _immediateWeightNumberForPaperSlider: {
-          type: Number,
-          notify: true,
-          observer: '_immediateWeightNumberForPaperSliderChanged'
-        },
-
-        // Paper input treats values as strings even if you specify them as
-        // numbers.
-        _inputWeightStringForPaperInput: {
-          type: String,
-          notify: true,
-          observer: '_inputWeightStringForPaperInputChanged'
-        }
-      },
-
-      _updateWeight: _.debounce(function(val) {
-        this.weight = val;
-      }, 250),
-
-      _immediateWeightNumberForPaperSliderChanged: function() {
-        this._inputWeightStringForPaperInput =
-            this._immediateWeightNumberForPaperSlider.toString();
-        this._updateWeight.call(this, this._immediateWeightNumberForPaperSlider);
-      },
-
-      _inputWeightStringForPaperInputChanged: function() {
-        if (+this._inputWeightStringForPaperInput < 0) {
-          this._inputWeightStringForPaperInput = '0';
-        }
-        else if (+this._inputWeightStringForPaperInput > 1) {
-          this._inputWeightStringForPaperInput = '1';
-        }
-
-        var d = +this._inputWeightStringForPaperInput;
-        if (!isNaN(d)) {
-          this._updateWeight.call(this, d);
-        }
-      }
-    });
-  </script>
-</dom-module>
-<script src="../d3/d3.js"></script>
-<script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var VZ;
-(function (VZ) {
-    var Sorting;
-    (function (Sorting) {
-        /**
-         * Compares tag names asciinumerically broken into components.
-         *
-         * <p>This is the comparison function used for sorting most string values in
-         * TensorBoard. Unlike the standard asciibetical comparator, this function
-         * knows that 'a10b' > 'a2b'. Fixed point and engineering notation are
-         * supported. This function also splits the input by slash and underscore to
-         * perform array comparison. Therefore it knows that 'a/a' < 'a+/a' even
-         * though '+' < '/' in the ASCII table.
-         */
-        function compareTagNames(a, b) {
-            var ai = 0;
-            var bi = 0;
-            while (true) {
-                if (ai === a.length) {
-                    return bi === b.length ? 0 : -1;
-                }
-                if (bi === b.length) {
-                    return 1;
-                }
-                if (isDigit(a[ai]) && isDigit(b[bi])) {
-                    var ais = ai;
-                    var bis = bi;
-                    ai = consumeNumber(a, ai + 1);
-                    bi = consumeNumber(b, bi + 1);
-                    var an = parseFloat(a.slice(ais, ai));
-                    var bn = parseFloat(b.slice(bis, bi));
-                    if (an < bn) {
-                        return -1;
-                    }
-                    if (an > bn) {
-                        return 1;
-                    }
-                    continue;
-                }
-                if (isBreak(a[ai])) {
-                    if (!isBreak(b[bi])) {
-                        return -1;
-                    }
-                }
-                else if (isBreak(b[bi])) {
-                    return 1;
-                }
-                else if (a[ai] < b[bi]) {
-                    return -1;
-                }
-                else if (a[ai] > b[bi]) {
-                    return 1;
-                }
-                ai++;
-                bi++;
-            }
-        }
-        Sorting.compareTagNames = compareTagNames;
-        function consumeNumber(s, i) {
-            var State;
-            (function (State) {
-                State[State["NATURAL"] = 0] = "NATURAL";
-                State[State["REAL"] = 1] = "REAL";
-                State[State["EXPONENT_SIGN"] = 2] = "EXPONENT_SIGN";
-                State[State["EXPONENT"] = 3] = "EXPONENT";
-            })(State || (State = {}));
-            var state = State.NATURAL;
-            for (; i < s.length; i++) {
-                if (state === State.NATURAL) {
-                    if (s[i] === '.') {
-                        state = State.REAL;
-                    }
-                    else if (s[i] === 'e' || s[i] === 'E') {
-                        state = State.EXPONENT_SIGN;
-                    }
-                    else if (!isDigit(s[i])) {
-                        break;
-                    }
-                }
-                else if (state === State.REAL) {
-                    if (s[i] === 'e' || s[i] === 'E') {
-                        state = State.EXPONENT_SIGN;
-                    }
-                    else if (!isDigit(s[i])) {
-                        break;
-                    }
-                }
-                else if (state === State.EXPONENT_SIGN) {
-                    if (isDigit(s[i]) || s[i] === '+' || s[i] === '-') {
-                        state = State.EXPONENT;
-                    }
-                    else {
-                        break;
-                    }
-                }
-                else if (state === State.EXPONENT) {
-                    if (!isDigit(s[i])) {
-                        break;
-                    }
-                }
-            }
-            return i;
-        }
-        function isDigit(c) { return '0' <= c && c <= '9'; }
-        function isBreak(c) {
-            // TODO(jart): Remove underscore when people stop using it like a slash.
-            return c === '/' || c === '_' || isDigit(c);
-        }
-    })(Sorting = VZ.Sorting || (VZ.Sorting = {}));
-})(VZ || (VZ = {}));
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var TF;
-(function (TF) {
-    var Backend;
-    (function (Backend) {
-        /**
-         * Manages many fetch requests. Launches up to nSimultaneousRequests
-         * simultaneously, and maintains a LIFO queue of requests to process when
-         * more urls are requested than can be handled at once. The queue can be
-         * cleared.
-         *
-         * When a request is made, a Promise is returned which resolves with the
-         * parsed JSON result from the request.
-         */
-        var RequestCancellationError = (function (_super) {
-            __extends(RequestCancellationError, _super);
-            function RequestCancellationError() {
-                var _this = _super !== null && _super.apply(this, arguments) || this;
-                _this.name = 'RequestCancellationError';
-                return _this;
-            }
-            return RequestCancellationError;
-        }(Error));
-        Backend.RequestCancellationError = RequestCancellationError;
-        var RequestNetworkError = (function (_super) {
-            __extends(RequestNetworkError, _super);
-            function RequestNetworkError(req, url) {
-                var _this = _super.call(this) || this;
-                _this.message = "RequestNetworkError: " + req.status + " at " + url;
-                _this.name = 'RequestNetworkError';
-                _this.req = req;
-                _this.url = url;
-                return _this;
-            }
-            return RequestNetworkError;
-        }(Error));
-        Backend.RequestNetworkError = RequestNetworkError;
-        var RequestManager = (function () {
-            function RequestManager(nSimultaneousRequests, maxRetries) {
-                if (nSimultaneousRequests === void 0) { nSimultaneousRequests = 10; }
-                if (maxRetries === void 0) { maxRetries = 3; }
-                this._queue = [];
-                this._nActiveRequests = 0;
-                this._nSimultaneousRequests = nSimultaneousRequests;
-                this._maxRetries = maxRetries;
-            }
-            /**
-             * Gives a promise that loads assets from given url (respects queuing). If
-             * postData is provided, this request will use POST, not GET. This is an
-             * object mapping POST keys to string values.
-             */
-            RequestManager.prototype.request = function (url, postData) {
-                var _this = this;
-                var promise = new Promise(function (resolve, reject) {
-                    var resolver = { resolve: resolve, reject: reject };
-                    _this._queue.push(resolver);
-                    _this.launchRequests();
-                })
-                    .then(function () {
-                    return _this.promiseWithRetries(url, _this._maxRetries, postData);
-                })
-                    .then(function (response) {
-                    // Success - Let's free space for another active
-                    // reqest, and launch it
-                    _this._nActiveRequests--;
-                    _this.launchRequests();
-                    return response;
-                }, function (rejection) {
-                    if (rejection.name === 'RequestNetworkError') {
-                        // If we failed due to network error, we should
-                        // decrement
-                        // _nActiveRequests because this request was
-                        // active
-                        _this._nActiveRequests--;
-                        _this.launchRequests();
-                    }
-                    return Promise.reject(rejection);
-                });
-                return promise;
-            };
-            RequestManager.prototype.clearQueue = function () {
-                while (this._queue.length > 0) {
-                    this._queue.pop().reject(new RequestCancellationError('Request cancelled by clearQueue'));
-                }
-            };
-            /* Return number of currently pending requests */
-            RequestManager.prototype.activeRequests = function () {
-                return this._nActiveRequests;
-            };
-            /* Return total number of outstanding requests (includes queue) */
-            RequestManager.prototype.outstandingRequests = function () {
-                return this._nActiveRequests + this._queue.length;
-            };
-            RequestManager.prototype.launchRequests = function () {
-                while (this._nActiveRequests < this._nSimultaneousRequests &&
-                    this._queue.length > 0) {
-                    this._nActiveRequests++;
-                    this._queue.pop().resolve();
-                }
-            };
-            /**
-             * Try to request a given URL using overwritable _promiseFromUrl method.
-             * If the request fails for any reason, we will retry up to maxRetries
-             * times. In practice, this will help us paper over transient network issues
-             * like '502 Bad Gateway'.
-             * By default, Chrome displays network errors in console, so
-             * the user will be able to tell when the requests are failing. I think this
-             * is a feature, if the request failures and retries are causing any
-             * pain to users, they can see it and file issues.
-             */
-            RequestManager.prototype.promiseWithRetries = function (url, maxRetries, postData) {
-                var _this = this;
-                var success = function (x) { return x; };
-                var failure = function (x) {
-                    if (maxRetries > 0) {
-                        return _this.promiseWithRetries(url, maxRetries - 1, postData);
-                    }
-                    else {
-                        return Promise.reject(x);
-                    }
-                };
-                return this._promiseFromUrl(url, postData).then(success, failure);
-            };
-            /* Actually get promise from url using XMLHttpRequest */
-            RequestManager.prototype._promiseFromUrl = function (url, postData) {
-                return new Promise(function (resolve, reject) {
-                    var req = new XMLHttpRequest();
-                    req.open(postData ? 'POST' : 'GET', url);
-                    var formData;
-                    if (postData) {
-                        // We are to make a POST request.
-                        formData = new FormData();
-                        for (var postKey in postData) {
-                            if (postKey) {
-                                // The linter requires 'for in' loops to be filtered by an if
-                                // condition.
-                                formData.append(postKey, postData[postKey]);
-                            }
-                        }
-                    }
-                    req.onload = function () {
-                        if (req.status === 200) {
-                            resolve(JSON.parse(req.responseText));
-                        }
-                        else {
-                            reject(new RequestNetworkError(req, url));
-                        }
-                    };
-                    req.onerror = function () {
-                        reject(new RequestNetworkError(req, url));
-                    };
-                    req.send(formData);
-                });
-            };
-            return RequestManager;
-        }());
-        Backend.RequestManager = RequestManager;
-    })(Backend = TF.Backend || (TF.Backend = {}));
-})(TF || (TF = {}));
-</script><script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    var Backend;
-    (function (Backend) {
-        Backend.BAD_CHARACTERS = '#%&{}\\/<>*? $!\'":@+`|=() ';
-        /** Cleanup a url so that it can be loaded from a filesystem. */
-        function demoify(s) {
-            // for consistency with python's urllib.urlencode
-            s = s.replace(new RegExp('%20', 'g'), '+');
-            for (var i = 0; i < Backend.BAD_CHARACTERS.length; i++) {
-                var c = Backend.BAD_CHARACTERS[i];
-                s = s.replace(new RegExp('\\' + c, 'g'), '_');
-            }
-            return s;
-        }
-        Backend.demoify = demoify;
-        function queryEncoder(params) {
-            // It's important that the keys be sorted, so we always grab the right file
-            // if we are talking to the backend generated by serialze_tensorboard.py
-            if (params == null) {
-                return '';
-            }
-            var components = _.keys(params)
-                .sort()
-                .filter(function (k) { return params[k] !== undefined; })
-                .map(function (k) { return k + '=' + encodeURIComponent(params[k]); });
-            var result = components.length ? '?' + components.join('&') : '';
-            // Replace parens for consistency with urllib.urlencode
-            return result.replace(/\(/g, '%28').replace(/\)/g, '%29');
-        }
-        Backend.queryEncoder = queryEncoder;
-    })(Backend = TF.Backend || (TF.Backend = {}));
-})(TF || (TF = {}));
-</script><script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    var Backend;
-    (function (Backend) {
-        ;
-        /**
-         * The standard router for communicating with the TensorBoard backend
-         * @param dataDir {string} The base prefix for finding data on server.
-         * @param demoMode {boolean} Whether to modify urls for filesystem demo usage.
-         */
-        function router(dataDir, demoMode) {
-            if (dataDir === void 0) { dataDir = 'data'; }
-            if (demoMode === void 0) { demoMode = false; }
-            var clean = demoMode ? Backend.demoify : function (x) { return x; };
-            if (dataDir[dataDir.length - 1] === '/') {
-                dataDir = dataDir.slice(0, dataDir.length - 1);
-            }
-            function standardRoute(route, demoExtension) {
-                if (demoExtension === void 0) { demoExtension = '.json'; }
-                return function (tag, run) {
-                    var url = dataDir + '/' + route + clean(Backend.queryEncoder({ tag: tag, run: run }));
-                    if (demoMode) {
-                        url += demoExtension;
-                    }
-                    return url;
-                };
-            }
-            function individualImageUrl(query, wallTime) {
-                var url = dataDir + '/' + clean('individualImage?' + query);
-                // Include wall_time just to disambiguate the URL and force the browser
-                // to reload the image when the URL changes. The backend doesn't care
-                // about the value.
-                url += demoMode ? '.png' : '&ts=' + wallTime;
-                return url;
-            }
-            function individualAudioUrl(query) {
-                var url = dataDir + '/' + clean('individualAudio?' + query);
-                if (demoMode) {
-                    url += '.wav';
-                }
-                return url;
-            }
-            function graphUrl(run, limit_attr_size, large_attrs_key) {
-                var query_params = [['run', clean(run)]];
-                if (limit_attr_size != null && !demoMode) {
-                    query_params.push(['limit_attr_size', String(limit_attr_size)]);
-                }
-                if (large_attrs_key != null && !demoMode) {
-                    query_params.push(['large_attrs_key', large_attrs_key]);
-                }
-                var query = query_params
-                    .map(function (param) {
-                    return param[0] + '=' + encodeURIComponent(param[1]);
-                })
-                    .join('&');
-                var url = dataDir + '/graph' + clean('?' + query);
-                if (demoMode) {
-                    url += '.pbtxt';
-                }
-                return url;
-            }
-            return {
-                logdir: function () { return dataDir + '/logdir'; },
-                runs: function () { return dataDir + '/runs' + (demoMode ? '.json' : ''); },
-                individualImage: individualImageUrl,
-                individualAudio: individualAudioUrl,
-                graph: graphUrl,
-                scalars: standardRoute('scalars'),
-                histograms: standardRoute('histograms'),
-                compressedHistograms: standardRoute('compressedHistograms'),
-                images: standardRoute('images'),
-                audio: standardRoute('audio'),
-                runMetadata: standardRoute('run_metadata', '.pbtxt'),
-                healthPills: function () { return dataDir + '/plugin/debugger/health_pills'; },
-                textRuns: function () { return dataDir + '/plugin/text/runs' + (demoMode ? '.json' : ''); },
-                text: standardRoute('plugin/text/text'),
-            };
-        }
-        Backend.router = router;
-        ;
-    })(Backend = TF.Backend || (TF.Backend = {}));
-})(TF || (TF = {}));
-</script><script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    var Backend;
-    (function (Backend_1) {
-        ;
-        ;
-        Backend_1.TYPES = [
-            'scalar', 'histogram', 'compressedHistogram', 'graph', 'image', 'audio',
-            'runMetadata', 'text'
-        ];
-        /**
-         * The Backend class provides a convenient and typed interface to the backend.
-         *
-         * It provides methods corresponding to the different data sources on the
-         * TensorBoard backend. These methods return a promise containing the data
-         * from the backend. This class does some post-processing on the data; for
-         * example, converting data elements tuples into js objects so that they can
-         * be accessed in a more convenient and clearly-documented fashion.
-         */
-        var Backend = (function () {
-            /**
-             * Construct a Backend instance.
-             * @param router the Router with info on what urls to get data from
-             * @param requestManager The RequestManager, overwritable so you may
-             * manually clear request queue, etc. Defaults to a new RequestManager.
-             */
-            function Backend(router, requestManager) {
-                this.router = router;
-                this.requestManager = requestManager || new Backend_1.RequestManager();
-            }
-            /**
-             * Returns a promise for requesting the logdir string.
-             */
-            Backend.prototype.logdir = function () {
-                return this.requestManager.request(this.router.logdir());
-            };
-            /**
-             * Returns a listing of all the available data in the TensorBoard backend.
-             */
-            Backend.prototype.runs = function () {
-                return this.requestManager.request(this.router.runs());
-            };
-            /**
-             * Return a promise showing the Run-to-Tag mapping for scalar data.
-             */
-            Backend.prototype.scalarRuns = function () {
-                return this.runs().then(function (x) { return _.mapValues(x, 'scalars'); });
-            };
-            /**
-             * Return a promise showing the Run-to-Tag mapping for histogram data.
-             */
-            Backend.prototype.histogramRuns = function () {
-                return this.runs().then(function (x) { return _.mapValues(x, 'histograms'); });
-            };
-            /**
-             * Return a promise showing the Run-to-Tag mapping for image data.
-             */
-            Backend.prototype.imageRuns = function () {
-                return this.runs().then(function (x) { return _.mapValues(x, 'images'); });
-            };
-            /**
-             * Return a promise showing the Run-to-Tag mapping for audio data.
-             */
-            Backend.prototype.audioRuns = function () {
-                return this.runs().then(function (x) { return _.mapValues(x, 'audio'); });
-            };
-            /**
-             * Return a promise showing the Run-to-Tag mapping for compressedHistogram
-             * data.
-             */
-            Backend.prototype.compressedHistogramRuns = function () {
-                return this.runs().then(function (x) { return _.mapValues(x, 'compressedHistograms'); });
-            };
-            /**
-             * Return a promise showing list of runs that contain graphs.
-             */
-            Backend.prototype.graphRuns = function () {
-                return this.runs().then(function (x) { return _.keys(x).filter(function (k) { return x[k].graph; }); });
-            };
-            /**
-             * Return a promise showing the Run-to-Tag mapping for run_metadata objects.
-             */
-            Backend.prototype.runMetadataRuns = function () {
-                return this.runs().then(function (x) { return _.mapValues(x, 'run_metadata'); });
-            };
-            /**
-             * Returns a promise showing the Run-to-Tag mapping for text data.
-             */
-            Backend.prototype.textRuns = function () {
-                return this.requestManager.request(this.router.textRuns());
-            };
-            /**
-             * Returns a promise containing TextDatums for given run and tag.
-             */
-            Backend.prototype.text = function (tag, run) {
-                var url = this.router.text(tag, run);
-                // tslint:disable-next-line:no-any it's convenient and harmless here
-                return this.requestManager.request(url).then(map(function (x) {
-                    x.wall_time = timeToDate(x.wall_time);
-                    return x;
-                }));
-            };
-            /**
-             * Return a promise of a graph string from the backend.
-             */
-            Backend.prototype.graph = function (tag, limit_attr_size, large_attrs_key) {
-                var url = this.router.graph(tag, limit_attr_size, large_attrs_key);
-                return this.requestManager.request(url);
-            };
-            /**
-             * Return a promise containing ScalarDatums for given run and tag.
-             */
-            Backend.prototype.scalar = function (tag, run) {
-                var p;
-                var url = this.router.scalars(tag, run);
-                p = this.requestManager.request(url);
-                return p.then(map(detupler(createScalar)));
-            };
-            /**
-             * Returns a promise for requesting the health pills for a list of nodes.
-             */
-            Backend.prototype.healthPills = function (nodeNames, step) {
-                var postData = { 'node_names': JSON.stringify(nodeNames) };
-                if (step !== undefined) {
-                    // The user requested health pills for a specific step. This request
-                    // might be slow since the backend reads events sequentially from disk.
-                    postData['step'] = step;
-                }
-                return this.requestManager.request(this.router.healthPills(), postData);
-            };
-            /**
-             * Return a promise containing HistogramDatums for given run and tag.
-             */
-            Backend.prototype.histogram = function (tag, run) {
-                var p;
-                var url = this.router.histograms(tag, run);
-                p = this.requestManager.request(url);
-                return p.then(map(detupler(createHistogram))).then(function (histos) {
-                    // Get the minimum and maximum values across all histograms so that the
-                    // visualization is aligned for all timesteps.
-                    var min = d3.min(histos, function (d) { return d.min; });
-                    var max = d3.max(histos, function (d) { return d.max; });
-                    return histos.map(function (histo, i) {
-                        return {
-                            wall_time: histo.wall_time,
-                            step: histo.step,
-                            bins: convertBins(histo, min, max)
-                        };
-                    });
-                });
-            };
-            /**
-             * Return a promise containing ImageDatums for given run and tag.
-             */
-            Backend.prototype.image = function (tag, run) {
-                var url = this.router.images(tag, run);
-                var p;
-                p = this.requestManager.request(url);
-                return p.then(map(this.createImage.bind(this)));
-            };
-            /**
-             * Return a promise containing AudioDatums for given run and tag.
-             */
-            Backend.prototype.audio = function (tag, run) {
-                var url = this.router.audio(tag, run);
-                var p;
-                p = this.requestManager.request(url);
-                return p.then(map(this.createAudio.bind(this)));
-            };
-            /**
-             * Returns a promise to load the string RunMetadata for given run/tag.
-             */
-            Backend.prototype.runMetadata = function (tag, run) {
-                var url = this.router.runMetadata(tag, run);
-                return this.requestManager.request(url);
-            };
-            /**
-             * Get compressedHistogram data.
-             * Unlike other methods, don't bother reprocessing this data into a nicer
-             * format. This is because we will deprecate this route.
-             */
-            Backend.prototype.compressedHistogram = function (tag, run) {
-                var url = this.router.compressedHistograms(tag, run);
-                var p;
-                p = this.requestManager.request(url);
-                return p.then(map(detupler(function (x) { return x; })));
-            };
-            Backend.prototype.createImage = function (x) {
-                return {
-                    width: x.width,
-                    height: x.height,
-                    wall_time: timeToDate(x.wall_time),
-                    step: x.step,
-                    url: this.router.individualImage(x.query, x.wall_time),
-                };
-            };
-            Backend.prototype.createAudio = function (x) {
-                return {
-                    content_type: x.content_type,
-                    wall_time: timeToDate(x.wall_time),
-                    step: x.step,
-                    url: this.router.individualAudio(x.query),
-                };
-            };
-            return Backend;
-        }());
-        Backend_1.Backend = Backend;
-        /** Given a RunToTag, return sorted array of all runs */
-        function getRuns(r) {
-            return _.keys(r).sort(VZ.Sorting.compareTagNames);
-        }
-        Backend_1.getRuns = getRuns;
-        /** Given a RunToTag, return array of all tags (sorted + dedup'd) */
-        function getTags(r) {
-            return _.union.apply(null, _.values(r)).sort(VZ.Sorting.compareTagNames);
-        }
-        Backend_1.getTags = getTags;
-        /**
-         * Given a RunToTag and an array of runs, return every tag that appears for
-         * at least one run.
-         * Sorted, deduplicated.
-         */
-        function filterTags(r, runs) {
-            var result = [];
-            runs.forEach(function (x) { return result = result.concat(r[x]); });
-            return _.uniq(result).sort(VZ.Sorting.compareTagNames);
-        }
-        Backend_1.filterTags = filterTags;
-        function timeToDate(x) { return new Date(x * 1000); }
-        ;
-        /**  Just a curryable map to make things cute and tidy. */
-        function map(f) {
-            return function (arr) { return arr.map(f); };
-        }
-        ;
-        /**
-         * This is a higher order function that takes a function that transforms a
-         * T into a G, and returns a function that takes TupleData<T>s and converts
-         * them into the intersection of a G and a Datum.
-         */
-        function detupler(xform) {
-            return function (x) {
-                // Create a G, assert it has type <G & Datum>
-                var obj = xform(x[2]);
-                // ... patch in the properties of datum
-                obj.wall_time = timeToDate(x[0]);
-                obj.step = x[1];
-                return obj;
-            };
-        }
-        ;
-        function createScalar(x) { return { scalar: x }; }
-        ;
-        function createHistogram(x) {
-            return {
-                min: x[0],
-                max: x[1],
-                nItems: x[2],
-                sum: x[3],
-                sumSquares: x[4],
-                bucketRightEdges: x[5],
-                bucketCounts: x[6],
-            };
-        }
-        ;
-        /**
-         * Takes histogram data as stored by tensorboard backend and converts it to
-         * the standard d3 histogram data format to make it more compatible and easier
-         * to visualize. When visualizing histograms, having the left edge and width
-         * makes things quite a bit easier. The bins are also converted to have an
-         * uniform width, what makes the visualization easier to understand.
-         *
-         * @param histogram A histogram from tensorboard backend.
-         * @param min The leftmost edge. The binning will start on it.
-         * @param max The rightmost edge. The binning will end on it.
-         * @param numBins The number of bins of the converted data. The default of 30
-         * is a sensible default, using more starts to get artifacts because the event
-         * data is stored in buckets, and you start being able to see the aliased
-         * borders between each bucket.
-         * @return A histogram bin. Each bin has an x (left edge), a dx (width),
-         *     and a y (count).
-         *
-         * If given rightedges are inclusive, then these left edges (x) are exclusive.
-         */
-        function convertBins(histogram, min, max, numBins) {
-            if (numBins === void 0) { numBins = 30; }
-            if (histogram.bucketRightEdges.length !== histogram.bucketCounts.length) {
-                throw (new Error('Edges and counts are of different lengths.'));
-            }
-            if (max === min) {
-                // Create bins even if all the data has a single value.
-                max = min * 1.1 + 1;
-                min = min / 1.1 - 1;
-            }
-            var binWidth = (max - min) / numBins;
-            var bucketLeft = min; // Use the min as the starting point for the bins.
-            var bucketPos = 0;
-            return d3.range(min, max, binWidth).map(function (binLeft) {
-                var binRight = binLeft + binWidth;
-                // Take the count of each existing bucket, multiply it by the proportion
-                // of overlap with the new bin, then sum and store as the count for the
-                // new bin. If no overlap, will add to zero, if 100% overlap, will include
-                // the full count into new bin.
-                var binY = 0;
-                while (bucketPos < histogram.bucketRightEdges.length) {
-                    // Clip the right edge because right-most edge can be infinite-sized.
-                    var bucketRight = Math.min(max, histogram.bucketRightEdges[bucketPos]);
-                    var intersect = Math.min(bucketRight, binRight) - Math.max(bucketLeft, binLeft);
-                    var count = (intersect / (bucketRight - bucketLeft)) *
-                        histogram.bucketCounts[bucketPos];
-                    binY += intersect > 0 ? count : 0;
-                    // If bucketRight is bigger than binRight, than this bin is finished and
-                    // there is data for the next bin, so don't increment bucketPos.
-                    if (bucketRight > binRight) {
-                        break;
-                    }
-                    bucketLeft = Math.max(min, bucketRight);
-                    bucketPos++;
-                }
-                ;
-                return { x: binLeft, dx: binWidth, y: binY };
-            });
-        }
-        Backend_1.convertBins = convertBins;
-    })(Backend = TF.Backend || (TF.Backend = {}));
-})(TF || (TF = {}));
-</script><script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    var Backend;
-    (function (Backend) {
-        Backend.Behavior = {
-            properties: {
-                /** *** Required properties *** */
-                /** Data type. One of TF.Backend.TYPES */
-                dataType: {
-                    type: String,
-                    observer: '_throwErrorOnUnrecognizedType',
-                },
-                /** TF.Backend.Backend for data loading. */
-                backend: {
-                    type: Object,
-                },
-                /** Should it automatically load when configured ready? Default true. */
-                autoLoad: {
-                    type: Boolean,
-                    value: true,
-                },
-                /** *** Component-provided properties *** */
-                /** Every tag available for data type (sorted, dedpulicated) */
-                tags: {
-                    type: Array,
-                    readOnly: true,
-                    notify: true,
-                },
-                /** Every run available for data type (sorted) */
-                runs: {
-                    type: Array,
-                    readOnly: true,
-                    notify: true,
-                },
-                /** Mapping from runs to tags for the data type */
-                run2tag: {
-                    type: Object,
-                    readOnly: true,
-                    notify: true,
-                },
-                /** Promise provider for the data. Useful for passing to subcomponents */
-                dataProvider: { type: Function, computed: '_getDataProvider(dataType, backend)' },
-                /** Has the dashboard loaded yet? */
-                loadState: {
-                    type: String,
-                    value: 'noload',
-                    readOnly: true,
-                },
-                /**
-                 * True if dashboard has loaded, and no tags were found.
-                 * Persists through subsequent reloads (ie. still true while
-                 * next load is pending) so warning won't flash away every reload
-                 * when there is no data.
-                 */
-                dataNotFound: {
-                    type: Boolean,
-                    value: false,
-                    readOnly: true,
-                }
-            },
-            observers: ['_do_autoLoad(dataType, backend, autoLoad)'],
-            /**
-             * Reloading works in two steps:
-             * Backend reload, which gets metadata on available runs, tags, etc from
-             *   the backend.
-             * Frontend reload, which loads new data for each chart or visual display.
-             * Backend reload logic is provided by this behaivor. The frontend reload
-             *   logic should be provided elsewhere, since it is component-specific.
-             * To keep things simple and consistent, we do the backend reload first,
-             *   and the frontend reload afterwards.
-             */
-            reload: function () {
-                var _this = this;
-                return this.backendReload().then(function (x) { return _this.frontendReload(); });
-            },
-            /**
-             * Load data from backend and then set run2tag, tags, runs, and loadState.
-             * Returns a promise that resolves/rejects when data is loaded.
-             */
-            backendReload: function () {
-                var _this = this;
-                if (this.dataType == null) {
-                    throw new Error('TF.Backend.Behavior: Need a dataType to reload.');
-                }
-                if (this.backend == null) {
-                    throw new Error('TF.Backend.Behavior: Need a backend to reload.');
-                }
-                var runsRoute = this.backend[this.dataType + 'Runs'].bind(this.backend);
-                this._setLoadState('pending');
-                return runsRoute().then(function (x) {
-                    _this._setLoadState('loaded');
-                    if (_.isEqual(x, _this.run2tag)) {
-                        // If x and run2tag are equal, let's avoid updating everything
-                        // since that can needlessly trigger run changes, reloads, etc
-                        return x;
-                    }
-                    _this._setRun2tag(x);
-                    var tags = TF.Backend.getTags(x);
-                    _this._setDataNotFound(tags.length === 0);
-                    _this._setTags(tags);
-                    _this._setRuns(TF.Backend.getRuns(x));
-                    return x;
-                }, function (fail) {
-                    _this._setLoadState('failure');
-                    return fail;
-                });
-            },
-            _do_autoLoad: function (type, backend, autoLoad) {
-                if (autoLoad) {
-                    this.reload();
-                }
-                ;
-            },
-            _getDataProvider: function (dataType, backend) {
-                return this.backend[this.dataType].bind(this.backend);
-            },
-            _throwErrorOnUnrecognizedType: function (dataType) {
-                if (TF.Backend.TYPES.indexOf(dataType) === -1) {
-                    throw new Error('TF.Backend.Behavior: Unknown dataType ' + dataType);
-                }
-            },
-        };
-    })(Backend = TF.Backend || (TF.Backend = {}));
-})(TF || (TF = {}));
-</script>
-
-
-
-
-
-<dom-module id="tf-color-scale" assetpath="../tf-color-scale/">
-  <script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    TF.palettes = {
-        googleStandard: [
-            '#db4437',
-            '#ff7043',
-            '#f4b400',
-            '#0f9d58',
-            '#00796b',
-            '#00acc1',
-            '#4285f4',
-            '#5c6bc0',
-            '#ab47bc' // purple 400
-        ],
-        googleCool: [
-            '#9e9d24',
-            '#0f9d58',
-            '#00796b',
-            '#00acc1',
-            '#4285f4',
-            '#5c6bc0',
-            '#607d8b' // blue gray 500
-        ],
-        googleWarm: [
-            '#795548',
-            '#ab47bc',
-            '#f06292',
-            '#c2185b',
-            '#db4437',
-            '#ff7043',
-            '#f4b400' // google yellow 700
-        ],
-        googleColorBlindAssist: [
-            '#ff7043',
-            '#00ACC1',
-            '#AB47BC',
-            '#2A56C6',
-            '#0b8043',
-            '#F7CB4D',
-            '#c0ca33',
-            '#5e35b1',
-            '#A52714',
-        ],
-        // These palettes try to be better for color differentiation.
-        // https://personal.sron.nl/~pault/
-        colorBlindAssist1: ['#4477aa', '#44aaaa', '#aaaa44', '#aa7744', '#aa4455', '#aa4488'],
-        colorBlindAssist2: [
-            '#88ccee', '#44aa99', '#117733', '#999933', '#ddcc77', '#cc6677',
-            '#882255', '#aa4499'
-        ],
-        colorBlindAssist3: [
-            '#332288', '#6699cc', '#88ccee', '#44aa99', '#117733', '#999933',
-            '#ddcc77', '#cc6677', '#aa4466', '#882255', '#661100', '#aa4499'
-        ],
-        // based on this palette: http://mkweb.bcgsc.ca/biovis2012/
-        colorBlindAssist4: [
-            '#FF6DB6', '#920000', '#924900', '#DBD100', '#24FF24', '#006DDB',
-            '#490092'
-        ],
-        mldash: [
-            '#E47EAD', '#F4640D', '#FAA300', '#F5E636', '#00A077', '#0077B8',
-            '#00B7ED'
-        ]
-    };
-})(TF || (TF = {}));
-</script>
-  <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-// Example usage:
-// runs = ["train", "test", "test1", "test2"]
-// ccs = new TF.ColorScale();
-// ccs.domain(runs);
-// ccs.getColor("train");
-// ccs.getColor("test1");
-var TF;
-(function (TF) {
-    var ColorScale = (function () {
-        /**
-         * Creates a color scale with optional custom palette.
-         *  @param {string[]} [palette=TF.palettes.googleColorBlind] - The color
-         *                 palette you want as an Array of hex strings.
-         */
-        function ColorScale(palette) {
-            if (palette === void 0) { palette = TF.palettes.googleColorBlindAssist; }
-            this.identifiers = d3.map();
-            this.palette = palette;
-        }
-        /**
-         * Set the domain of strings.
-         * @param {string[]} strings - An array of possible strings to use as the
-         *                             domain for your scale.
-         */
-        ColorScale.prototype.domain = function (strings) {
-            var _this = this;
-            this.identifiers = d3.map();
-            strings.forEach(function (s, i) {
-                _this.identifiers.set(s, _this.palette[i % _this.palette.length]);
-            });
-            return this;
-        };
-        /**
-         * Use the color scale to transform an element in the domain into a color.
-         * @param {string} The input string to map to a color.
-         * @return {string} The color corresponding to that input string.
-         * @throws Will error if input string is not in the scale's domain.
-         */
-        ColorScale.prototype.scale = function (s) {
-            if (!this.identifiers.has(s)) {
-                throw new Error('String was not in the domain.');
-            }
-            return this.identifiers.get(s);
-        };
-        return ColorScale;
-    }());
-    TF.ColorScale = ColorScale;
-})(TF || (TF = {}));
-</script>
-  <script>
-    (function() {
-      Polymer({
-        is: "tf-color-scale",
-        properties: {
-          runs: {
-            type: Array,
-          },
-          outColorScale: {
-            type: Object,
-            readOnly: true,
-            notify: true,
-            value: function() {
-              return new TF.ColorScale();
-            },
-          },
-        },
-        observers: ['updateColorScale(runs.*)'],
-        updateColorScale: function(runsChange) {
-          this.outColorScale.domain(this.runs);
-        },
-      });
-    })();
-  </script>
-</dom-module>
-<link rel="import" href="../paper-styles/paper-styles.html">
-
-<dom-module id="scrollbar-style" assetpath="../tf-dashboard-common/">
-  <template>
-    <style>
-      .scrollbar::-webkit-scrollbar-track
-      {
-        visibility: hidden;
-      }
-
-      .scrollbar::-webkit-scrollbar
-      {
-        width: 10px;
-      }
-
-      .scrollbar::-webkit-scrollbar-thumb
-      {
-        border-radius: 10px;
-        -webkit-box-shadow: inset 0 0 2px rgba(0,0,0,.3);
-        background-color: var(--paper-grey-500);
-        color: var(--paper-grey-900);
-      }
-      .scrollbar {
-        box-sizing: border-box;
-      }
-    </style>
-  </template>
-</dom-module>
-<style is="custom-style">
-
-  :root {
-    --tb-orange-weak: #ffa726;
-    --tb-orange-strong: #f57c00;
-    --tb-grey-darker: #e2e2e2;
-    --tb-grey-lighter: #f3f3f3;
-    --tb-ui-dark-accent: #757575;
-    --tb-ui-light-accent: #e0e0e0;
-    --tb-graph-faded: #e0d4b3;
-  }
-
-</style>
-
-<dom-module id="tf-dashboard-layout" assetpath="../tf-dashboard-common/">
-  <template>
-    <div id="sidebar">
-      <content select=".sidebar"></content>
-    </div>
-
-    <div id="center" class="scrollbar">
-      <content select=".center"></content>
-    </div>
-    <style include="scrollbar-style"></style>
-    <style>
-      #sidebar {
-        width: inherit;
-        height: 100%;
-        overflow: ellipsis;
-        flex-grow: 0;
-        flex-shrink: 0;
-      }
-
-      #center {
-        height: 100%;
-        overflow-y: auto;
-        flex-grow: 1;
-        flex-shrink: 1;
-      }
-
-      .tf-graph-dashboard #center {
-        background: white;
-      }
-
-      :host {
-        display: flex;
-        flex-direction: row;
-        height: 100%;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-dashboard-layout",
-    });
-  </script>
-</dom-module>
-<dom-module id="dashboard-style" assetpath="../tf-dashboard-common/">
-  <template>
-    <style>
-      .sidebar {
-        display: flex;
-        flex-direction: column;
-        height: 100%;
-        margin-right: 20px;
-      }
-
-      .sidebar-section {
-        border-top: solid 1px rgba(0, 0, 0, 0.12);
-        padding: 15px 0px 15px 30px;
-      }
-
-      .sidebar-section:first-child {
-        border: none;
-      }
-
-      .sidebar-section:last-child {
-        flex-grow: 1;
-        display: flex;
-      }
-
-      paper-checkbox {
-        --paper-checkbox-checked-color: var(--tb-ui-dark-accent);
-        --paper-checkbox-unchecked-color: var(--tb-ui-dark-accent);
-        font-size: 14px;
-        margin-top: 5px;
-      }
-    </style>
-  </template>
-</dom-module>
-<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../paper-menu/paper-menu.html">
-<link rel="import" href="../paper-item/paper-item.html">
-
-<dom-module id="tf-downloader" assetpath="../tf-dashboard-common/">
-  <template>
-    <paper-dropdown-menu no-label-float="true" label="run to download" selected-item-label="{{_run}}">
-      <paper-menu class="dropdown-content">
-        <template is="dom-repeat" items="[[runs]]">
-          <paper-item no-label-float="true">[[item]]</paper-item>
-        </template>
-      </paper-menu>
-    </paper-dropdown-menu>
-    <div class="center">
-      <span>
-        <a download="[[_csvName(_run)]]" href="[[_csvUrl(_run, urlFn)]]">CSV</a>
-        <a download="[[_jsonName(_run)]]" href="[[_jsonUrl(_run, urlFn)]]">JSON</a>
-      </span>
-    </div>
-    <style>
-      :host {
-        display: flex;
-        height: 32px;
-      }
-      .center {
-        display: flex;
-        align-self: center;
-      }
-      paper-dropdown-menu {
-        width: 100px;
-        --paper-input-container-label: {
-          font-size: 10px;
-        }
-        --paper-input-container-input: {
-          font-size: 10px;
-        }
-      }
-      a {
-        font-size: 10px;
-        border-radius: 3px;
-        border: 1px solid #EEE;
-      }
-      paper-input {
-        font-size: 22px;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-downloader",
-      properties: {
-        _run: String,
-        runs: Array,
-        tag: String,
-        urlFn: Function,
-      },
-      _csvUrl: function(_run, urlFn) {
-        return urlFn(this.tag, _run) + "&format=csv";
-      },
-      _jsonUrl: function(_run, urlFn) {
-        return urlFn(this.tag, _run);
-      },
-      _csvName: function(_run) {
-        return "run_" + _run + ",tag_" + this.tag + ".csv";
-      },
-      _jsonName: function(_run) {
-        return "run-" + _run + "-tag-" + this.tag + ".json";
-      },
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-no-data-warning" assetpath="../tf-dashboard-common/">
-  <template>
-    <template is="dom-if" if="[[showWarning]]">
-      <div class="warning">
-        <template is="dom-if" if="[[_isGraph(dataType)]]">
-          <h3>
-            No graph definition files were found.
-          </h3>
-          <p>
-            To store a graph, create a
-            <code>tf.summary.FileWriter</code>
-            and pass the graph either via the constructor, or by calling its
-            <code>add_graph()</code> method.
-            You may want to check out the
-            <a href="https://www.tensorflow.org/get_started/graph_viz">
-              graph visualizer tutorial
-            </a>.
-          </p>
-        </template>
-        <template is="dom-if" if="[[_isProjector(dataType)]]">
-          <h3>
-            No checkpoint was found.
-          </h3>
-          <p>
-            Probable causes:
-            </p><ul>
-              <li>
-                No checkpoint has been saved yet. Please refresh the page periodically.
-              </li>
-              <li>
-                You are not saving any checkpoint. To save your model,
-                create a
-                <a href="https://www.tensorflow.org/api_docs/python/tf/train/Saver">
-                  <code>tf.train.Saver</code>
-                </a>
-                and save your model periodically
-                by calling <code>saver.save(session, LOG_DIR/model.ckpt, step)</code>.
-              </li>
-            </ul>
-          <p></p>
-        </template>
-        <template is="dom-if" if="[[_isOther(dataType)]]">
-          <h3>
-            No <span>[[dataType]]</span> data was found.
-          </h3>
-          <p>
-            Probable causes:
-            </p><ul>
-              <li>
-                You haven't written any <span>[[dataType]]</span> data
-                to your event files.
-              </li>
-              <li>
-                TensorBoard can't find your event files.
-              </li>
-            </ul>
-          <p></p>
-        </template>
-        <p>
-          If you're new to using TensorBoard, and want to find out how to add
-          data and set up your event files, check out the
-          <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md">
-            README
-          </a>
-          and perhaps the
-          <a href="https://www.tensorflow.org/get_started/summaries_and_tensorboard">
-            TensorBoard tutorial
-          </a>.
-        </p>
-
-        <p>
-          If you think TensorBoard is configured properly, please see the
-          <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md#my-tensorboard-isnt-showing-any-data-whats-wrong">
-            section of the README devoted to missing data problems
-          </a>
-          and consider filing an issue on GitHub.
-        </p>
-
-      </div>
-    </template>
-    <style>
-      .warning {
-        max-width: 540px;
-        margin: 80px auto 0 auto;
-      }
-    </style>
-  </template>
-
-  <script>
-    Polymer({
-      is: "tf-no-data-warning",
-      properties: {
-        dataType: String,
-        showWarning: Boolean
-      },
-      _isGraph: function(dataType) {
-        return dataType === "graph";
-      },
-      _isProjector: function(dataType) {
-        return dataType === "projector";
-      },
-      _isOther: function(dataType) {
-        return !this._isGraph(dataType) && !this._isProjector(dataType);
-      }
-    });
-  </script>
-</dom-module>
-<script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    var Dashboard;
-    (function (Dashboard) {
-        /**
-         * A behavior that TensorBoard dashboards must implement. This behavior serves
-         * the purpose of an interface.
-         */
-        function DashboardBehavior(dashboardName) {
-            return {
-                properties: {
-                    name: {
-                        type: String,
-                        value: dashboardName,
-                        readOnly: true,
-                    },
-                },
-                // This method is called when the dashboard reloads, either when the
-                // dashboard is first visited, periodically reloaded, or manually reloaded
-                // via the user clicking the button. Note that dashboard custom elements
-                // that use TF.Dashboard.ReloadBehavior already implement a reload method.
-                reload: function () {
-                    throw Error('The ' + dashboardName + ' dashboard does not implement reload.');
-                },
-            };
-        }
-        Dashboard.DashboardBehavior = DashboardBehavior;
-    })(Dashboard = TF.Dashboard || (TF.Dashboard = {}));
-})(TF || (TF = {}));
-</script><script>/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    var Dashboard;
-    (function (Dashboard) {
-        /**
-         * ReloadBehavior: A simple behavior for dashboards where the
-         * frontendReload() function should find every child element with a
-         * given tag name (e.g. "tf-line-chart" or "tf-image-loader")
-         * and call a `reload` method on that child.
-         * May later extend it so it has more sophisticated logic, e.g. reloading
-         * only tags that are in view.
-         */
-        function ReloadBehavior(tagName) {
-            return {
-                properties: {
-                    reloadTag: {
-                        type: String,
-                        value: tagName,
-                    },
-                },
-                frontendReload: function () {
-                    var elements = this.getElementsByTagName(this.reloadTag);
-                    Array.prototype.forEach.call(elements, function (x) { x.reload(); });
-                },
-            };
-        }
-        Dashboard.ReloadBehavior = ReloadBehavior;
-    })(Dashboard = TF.Dashboard || (TF.Dashboard = {}));
-})(TF || (TF = {}));
-</script>
-
-
-<dom-module id="tf-option-selector" assetpath="../tf-dashboard-common/">
-  <template>
-    <div id="wrap">
-      <h3>[[name]]</h3>
-      <div class="content-wrapper"><content></content></div>
-    </div>
-    <style>
-      .content-wrapper ::content > * {
-        width: 30%;
-        font-size: 13px;
-        background: none;
-        margin-top: 10px;
-        color: var(--tb-ui-dark-accent);
-      }
-
-      .content-wrapper ::content :first-of-type {
-        margin-left: 0;
-      }
-
-      .content-wrapper ::content .selected {
-        background-color: var(--tb-ui-dark-accent);
-        color: white!important;
-      }
-
-      h3 {
-        color: var(--paper-grey-800);
-        margin: 0;
-        font-weight: normal;
-        font-size: 14px;
-        margin-bottom: 5px;
-        display: block;
-        pointer-events: none;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-option-selector",
-      properties: {
-        name: String,
-        selectedId: {
-          type: String,
-          notify: true,
-          observer: '_selectedIdChanged'
-        }
-      },
-      attached: function() {
-        this.async(function() {
-          this.getEffectiveChildren().forEach(function(node) {
-            this.listen(node, 'tap', '_selectTarget');
-          }.bind(this));
-        });
-      },
-      _selectTarget: function(e) {
-        this.selectedId = e.currentTarget.id;
-      },
-      _selectedIdChanged: function() {
-        var selected = this.queryEffectiveChildren('#' + this.selectedId);
-        if (!selected) {
-          return;
-        }
-
-        this.getEffectiveChildren().forEach(function(node) {
-          node.classList.remove("selected");
-        });
-        selected.classList.add("selected");
-      }
-    });
-  </script>
-</dom-module>
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-
-<dom-module id="tf-collapsable-pane" assetpath="../tf-dashboard-common/">
-  <template>
-    <button class="heading" on-tap="togglePane" open-button$="[[opened]]">
-    <span class="name">[[name]]</span>
-    <span class="count">
-      <span>[[count]]</span>
-    </span>
-  </button>
-    <iron-collapse opened="[[opened]]">
-      <div class="content">
-        <template is="dom-if" if="[[opened]]" restamp="[[restamp]]">
-          <content></content>
-        </template>
-      </div>
-    </iron-collapse>
-    <style>
-      :host {
-        display: block;
-        margin: 0 5px 1px 10px;
-      }
-
-      :host:first-of-type {
-        margin-top: 20px;
-      }
-      
-      :host:last-of-type {
-        margin-bottom: 20px;
-      }
-
-      .heading {
-        background-color: white;
-        border: none;
-        cursor: pointer;
-        width: 100%;
-        font-size: 15px;
-        line-height: 1;
-        box-shadow: 0 1px 5px rgba(0,0,0,0.2);
-        padding: 10px 15px;
-      }
-
-      .content {
-        padding: 15px;
-        border: 1px solid #dedede;
-        border-top: none;
-        border-bottom-left-radius: 2px;
-        border-bottom-right-radius: 2px;
-        background: white;
-      }
-
-      [open-button] {
-        border-bottom-left-radius: 0px !important;
-        border-bottom-right-radius: 0px !important;
-      }
-
-      .name {
-        float: left;
-      }
-
-      .count {
-        float: right;
-        margin-right: 5px;
-        font-size: 12px;
-        color: var(--paper-grey-500);
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-collapsable-pane",
-      properties: {
-        opened: {type: Boolean, value: false},
-        restamp: {type: Boolean, value: true},
-        name: {type: String, observer: "hide"},
-        count: {type: Number},
-      },
-      hide: function() {
-        this.opened = false;
-      },
-      togglePane: function() {
-        this.opened = !this.opened;
-      }
-    });
-  </script>
-
-</dom-module>
-<script src="../plottable/plottable.js"></script>
-<style>
-/**
- * @license
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2015 Palantir Technologies, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Plottable 1.16.1 (https://github.com/palantir/plottable)
- * Copyright 2014-2015 Palantir Technologies
- * Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
-*/
-.plottable-colors-0 {
-  background-color: #5279c7; /* INDIGO */
-}
-
-.plottable-colors-1 {
-  background-color: #fd373e; /* CORAL_RED */
-}
-
-.plottable-colors-2 {
-  background-color: #63c261; /* FERN */
-}
-
-.plottable-colors-3 {
-  background-color: #fad419; /* BRIGHT_SUN */
-}
-
-.plottable-colors-4 {
-  background-color: #2c2b6f; /* JACARTA */
-}
-
-.plottable-colors-5 {
-  background-color: #ff7939; /* BURNING_ORANGE */
-}
-
-.plottable-colors-6 {
-  background-color: #db2e65; /* CERISE_RED */
-}
-
-.plottable-colors-7 {
-  background-color: #99ce50; /* CONIFER */
-}
-
-.plottable-colors-8 {
-  background-color: #962565; /* ROYAL_HEATH */
-}
-
-.plottable-colors-9 {
-  background-color: #06cccc; /* ROBINS_EGG_BLUE */
-}
-
-svg.plottable {
-  display : block; /* SVGs must be block elements for width/height calculations to work in Firefox. */
-  pointer-events: visibleFill;
-}
-
-.plottable .background-fill {
-  fill: none;
-  pointer-events: none;
-}
-
-.plottable .bounding-box {
-  /* Invisible pink bounding-box to allow for collision testing */
-  fill: pink;
-  visibility: hidden;
-}
-
-.plottable .label text {
-  font-family: "Helvetica Neue", sans-serif;
-  fill: #32313F;
-}
-
-.plottable .bar-label-text-area text {
-  font-family: "Helvetica Neue", sans-serif;
-  font-size: 14px;
-}
-
-.plottable .label-area text {
-  fill: #32313F;
-  font-family: "Helvetica Neue", sans-serif;
-  font-size: 14px;
-}
-
-.plottable .light-label text {
-  fill: white;
-}
-
-.plottable .dark-label text {
-  fill: #32313F;
-}
-
-.plottable .off-bar-label text {
-  fill: #32313F;
-}
-
-.plottable .stacked-bar-plot .off-bar-label {
-  /* HACKHACK #2795: correct off-bar label logic to be implemented on StackedBar */
-  visibility: hidden !important;
-}
-
-.plottable .axis-label text {
-  font-size: 10px;
-  font-weight: bold;
-  letter-spacing: 1px;
-  line-height: normal;
-  text-transform: uppercase;
-}
-
-.plottable .title-label text {
-  font-size: 20px;
-  font-weight: bold;
-}
-
-.plottable .axis line.baseline {
-  stroke: #CCC;
-  stroke-width: 1px;
-}
-
-.plottable .axis line.tick-mark {
-  stroke: #CCC;
-  stroke-width: 1px;
-}
-
-.plottable .axis text {
-  fill: #32313F;
-  font-family: "Helvetica Neue", sans-serif;
-  font-size: 12px;
-  font-weight: 200;
-  line-height: normal;
-}
-
-.plottable .axis .annotation-circle {
-  fill: white;
-  stroke-width: 1px;
-  stroke: #CCC;
-}
-
-.plottable .axis .annotation-line {
-  stroke: #CCC;
-  stroke-width: 1px;
-}
-
-.plottable .axis .annotation-rect {
-  stroke: #CCC;
-  stroke-width: 1px;
-  fill: white;
-}
-
-.plottable .bar-plot .baseline {
-  stroke: #999;
-}
-
-.plottable .gridlines line {
-  stroke: #3C3C3C; /* hackhack: gridlines should be solid; see #820 */
-  opacity: 0.25;
-  stroke-width: 1px;
-}
-
-.plottable .selection-box-layer .selection-area {
-  fill: black;
-  fill-opacity: 0.03;
-  stroke: #CCC;
-}
-/* DragBoxLayer */
-.plottable .drag-box-layer.x-resizable .drag-edge-lr {
-  cursor: ew-resize;
-}
-.plottable .drag-box-layer.y-resizable .drag-edge-tb {
-  cursor: ns-resize;
-}
-
-.plottable .drag-box-layer.x-resizable.y-resizable .drag-corner-tl {
-  cursor: nwse-resize;
-}
-.plottable .drag-box-layer.x-resizable.y-resizable .drag-corner-tr {
-  cursor: nesw-resize;
-}
-.plottable .drag-box-layer.x-resizable.y-resizable .drag-corner-bl {
-  cursor: nesw-resize;
-}
-.plottable .drag-box-layer.x-resizable.y-resizable .drag-corner-br {
-  cursor: nwse-resize;
-}
-
-.plottable .drag-box-layer.movable .selection-area {
-  cursor: move; /* IE fallback */
-  cursor: -moz-grab;
-  cursor: -webkit-grab;
-  cursor: grab;
-}
-
-.plottable .drag-box-layer.movable .selection-area:active {
-  cursor: -moz-grabbing;
-  cursor: -webkit-grabbing;
-  cursor: grabbing;
-}
-/* /DragBoxLayer */
-
-.plottable .guide-line-layer line.guide-line {
-  stroke: #CCC;
-  stroke-width: 1px;
-}
-
-.plottable .drag-line-layer.enabled.vertical line.drag-edge {
-  cursor: ew-resize;
-}
-
-.plottable .drag-line-layer.enabled.horizontal line.drag-edge {
-  cursor: ns-resize;
-}
-
-.plottable .legend text {
-  fill: #32313F;
-  font-family: "Helvetica Neue", sans-serif;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: normal;
-}
-
-.plottable .interpolated-color-legend rect.swatch-bounding-box {
-  fill: none;
-  stroke: #CCC;
-  stroke-width: 1px;
-  pointer-events: none;
-}
-
-.plottable .waterfall-plot line.connector {
-  stroke: #CCC;
-  stroke-width: 1px;
-}
-
-.plottable .pie-plot .arc.outline {
-  stroke-linejoin: round;
-}
-
-</style>
-
-<dom-module id="tf-chart-scaffold" assetpath="../tf-dashboard-common/">
-  <template>
-    <content></content>
-    <style>
-      :host {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        display: flex;
-        flex-direction: column;
-        flex-grow: 1;
-        flex-shrink: 1;
-        position: relative;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-chart-scaffold",
-      properties: {
-        tag: String,
-        dataProvider: Function,
-        visibleSeries: Array,
-        _attached: {
-          type: Boolean,
-          value: false
-        },
-
-        // Storing the update ID of the previous request for data enables us to determine if a
-        // data response is outdated. We rely on an increasing ID instead of timestamp because
-        // successive updates often fire within the same millisecond.
-        _dataUpdateIdOfLastRequest: Number,
-        _nextAvailableDataUpdateId: {
-          type: Number,
-          value: 1,
-        },
-      },
-      observers: [
-        "reload(tag, dataProvider)",
-        "_changeSeries(visibleSeries.*)"
-      ],
-      ready: function() {
-        this.fire('ready');
-      },
-      attached: function() {
-        this._attached = true;
-        this._changeSeries();
-      },
-      detached: function() {
-        this._attached = false;
-      },
-      reload: function() {
-        if (!this._attached) {
-          return;
-        }
-        else if (!this.dataProvider) {
-          throw new Error('tf-chart-scaffold requires a dataProvider.');
-        }
-        else if (!this.tag) {
-          throw new Error('tf-chart-scaffold requires a tag.');
-        }
-
-        // TODO(chizeng): At this point, notify effective children that the previous data has been
-        // invalidated. For instance, the image dashboard may want to clear its images. Today, the
-        // chart scaffold only informs children when the new image URLs response finishes loading.
-
-        const dataUpdateId = this._nextAvailableDataUpdateId++;
-        this._dataUpdateIdOfLastRequest = dataUpdateId;
-
-        this.visibleSeries.forEach(function(name) {
-          this.dataProvider(this.tag, name).then(function(data) {
-            if (dataUpdateId != this._dataUpdateIdOfLastRequest) {
-              // This response is outdated. Ignore it.
-              // TODO(chizeng): Explore canceling an outdated request before we even receive its
-              // response. This involves creating hooks into the request manager and might introduce
-              // some complexity that may not be worth it; Tensorboard frankly does not seem
-              // bottlenecked by the network (It is often run in fast corp networks or locally.).
-              return;
-            }
-            this.chart().setSeriesData(name, data);
-          }.bind(this));
-        }.bind(this));
-      },
-      _changeSeries: function() {
-        if (!this._attached) {
-           return;
-        }
-        else if (!this.visibleSeries) {
-          throw new Error('tf-chart-scaffold requires a visibleSeries.');
-        }
-
-        this.chart().setVisibleSeries(this.visibleSeries);
-        this.reload();
-      },
-      chart: function() {
-        var children = this.getEffectiveChildren();
-        if (!children.length) {
-          throw new Error('tf-chart-scaffold has no children');
-        }
-
-        var child = children[0];
-        if (!child.setVisibleSeries || !child.setSeriesData) {
-          throw new Error("tf-chart-scaffold's content doesn't implement the " +
-              "required interface");
-        }
-        return child;
-      }
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-panes-helper" assetpath="../tf-dashboard-common/">
-  <template>
-    <content></content> 
-    <tf-no-data-warning data-type="[[dataType]]" show-warning="[[dataNotFound]]"></tf-no-data-warning>
-
-    <template is="dom-repeat" items="[[categories]]" as="category">
-      <tf-collapsable-pane name="[[category.name]]" count="[[_count(category.tags, selectedRuns.*)]]">
-        <div class="layout horizontal wrap">
-          <template is="dom-repeat" items="[[_categoryCards(category, selectedRuns.*, run2tag.*)]]">
-              <div class="card">
-                <div class="card-title-container" style="border-color: [[_titleBorderColor(item.run)]]">
-                  <div class="card-title" inner-h-t-m-l="[[_break(item.tag)]]"></div>
-                  <template is="dom-if" if="[[repeatForRuns]]">
-                    <div class="card-subtitle" title="[[item.run]]">[[item.run]]</div>
-                  </template>
-                </div>
-                <div class="card-content">
-                  <tf-chart-scaffold tag="[[item.tag]]" data-provider="[[dataProvider]]" visible-series="[[item.runs]]" on-ready="_instantiateTemplate">
-                    
-                  </tf-chart-scaffold>
-                </div>
-                <div class="card-bottom-row">
-                  <paper-icon-button class="expand-button" icon="fullscreen" on-tap="_toggleExpanded"></paper-icon-button>
-                  <template is="dom-if" if="[[showDownloadLinks]]">
-                    <tf-downloader runs="[[item.runs]]" tag="[[item.tag]]" url-fn="[[downloadLinkUrlFunction]]">
-                    </tf-downloader>
-                  </template>
-                </div>
-              </div>
-          </template>
-        </div>
-      </tf-collapsable-pane>
-    </template>
-
-    <style>
-      .card {
-        height: var(--card-height, 200px);
-        width: var(--card-width, 300px);
-        display: flex;
-        flex-direction: column;
-        margin: 5px;
-        padding: var(--card-padding, 0 30px 35px 0);
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        position: relative;
-      }
-
-      .card-expanded {
-        height: var(--card-expanded-height, 400px);
-        width: var(--card-expanded-width, 100%);
-      }
-
-      .card-title, .card-subtitle {
-        flex-grow: 0;
-        flex-shrink: 0;
-        font-size: 14px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-      }
-
-      .card-subtitle {
-        font-size: 12px;
-      }
-
-      .card-content {
-        flex-grow: 1;
-        flex-shrink: 1;
-        display: flex;
-        margin-top: 10px;
-      }
-
-      .card-bottom-row {
-        position: absolute;
-        left: 0px;
-        bottom: 0px;
-        width: 100%;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        pointer-events: none;
-      }
-
-      .card-title-container {
-        border-left: 4px solid;
-        padding-left: 5px;
-      }
-
-      .expand-button {
-        color: #2196F3;
-        width: 32px;
-        height: 32px;
-        padding: 4px;
-        border-radius: 100%;
-        pointer-events: auto;
-        display: var(--show-expand-button, block);
-      }
-
-      .card-expanded .expand-button {
-        background: var(--tb-ui-light-accent);
-      }
-
-      tf-downloader {
-        margin-right: 30px;
-        pointer-events: auto;
-      }
-
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-panes-helper",
-      properties: {
-        /**
-         * Categories that separate the template instances. Each category will
-         * be given its own collapsible pane. The category must be an array of
-         * objects, each with a 'name' property and a 'tags' array of strings.
-         */
-        categories: Array,
-
-        /**
-         * Input of the colors that are used for the user's runs.
-         */
-        colorScale: Object,
-
-        /**
-         * The name of the data type that is used by this dashboard. This will
-         * be used to display what is missing when there is no data available.
-         */
-        dataType: String,
-
-        /**
-         * The function that requests and returns a promise with the data of the
-         * required type for the templates from the backend.
-         */
-        dataProvider: Object,
-
-        /**
-         * If false, instantiates one template for each tag and calls
-         * setVisibleSeries on the first element of the template with all valid
-         * runs the tag has. If true, instantiates one template for each run of
-         * each tag, and calls setVisibleSeries of the first element of the
-         * instantiated template with just the one run.
-         */
-        repeatForRuns: {
-          type: Boolean,
-          value: false
-        },
-
-        /**
-         * Map from runs to the valid tags that have them.
-         */
-        run2tag: Object,
-
-        /**
-         * Array with the runs that are selected by the user (i.e. valid to be
-         * displayed).
-         */
-        selectedRuns: Array,
-
-        /**
-         * If true, shows a menu with download links for the template data.
-         * If this is set to true, urlFn must also be provided.
-         */
-        showDownloadLinks: Boolean,
-
-        /**
-         * Function that returns the route to get data to download. Must be
-         * provided if showDownloadLinks is enabled.
-         */
-        downloadLinkUrlFunction: Function,
-        _contentTemplate: {
-          type: Object,
-          value: null
-        },
-        _stampedTemplates: {
-          type: Array,
-          value: function() { return [] }
-        }
-      },
-      behaviors: [
-        Polymer.Templatizer,
-      ],
-
-      /**
-       * Initializes the Polymer.Templatizer behavior with the template supplied
-       * by the user. With this, all calls to this.stamp() will produce an
-       * instance of the user template.
-       */
-      _initTemplatizer: function() {
-        if (!this._contentTemplate) {
-          // First template is used as the content.
-          this._contentTemplate = Polymer.dom(this).querySelector('template');
-          this.templatize(this._contentTemplate);
-        }
-      },
-
-      /**
-       * Called every time a tf-chart-scaffold is ready, stamps the user
-       * template inside the scaffold element (before it is attached) and
-       * stores the stamped template in an array to use for data binding
-       * (forwardParentProp/Path).
-       */
-      _instantiateTemplate: function(e) {
-        var scaffold = e.target;
-        this._initTemplatizer();
-        var instance = this.stamp();
-        this._stampedTemplates.push(instance);
-        Polymer.dom(scaffold).appendChild(instance.root);
-      },
-      _toggleExpanded: function(e) {
-        var currentTarget = Polymer.dom(e.currentTarget);
-        var card = currentTarget.node.closest('.card');
-        var scaffold = card.querySelector('tf-chart-scaffold');
-        card.classList.toggle('card-expanded');
-        scaffold.chart().redraw();
-      },
-      _count: function(tags) {
-        if (!this.repeatForRuns) {
-          return tags.length;
-        }
-
-        var targetTags = d3.set(tags);
-        var count = 0;
-        this.selectedRuns.forEach(function(r) {
-          this.run2tag[r].forEach(function(t) {
-            if (targetTags.has(t)) {
-              count++;
-            }
-          });
-        }.bind(this));
-        return count;
-      },
-      _categoryCards: function(category) {
-        var cards = [];
-        category.tags.forEach(function(tag) {
-          var runs = this.selectedRuns.filter(function(r) {
-            return this.run2tag[r] && this.run2tag[r].indexOf(tag) !== -1;
-          }.bind(this));
-
-          if (this.repeatForRuns) {
-            runs.forEach(function(run) {
-              cards.push({tag: tag, run: run, runs: [run]});
-            });
-          } else {
-            cards.push({tag: tag, runs: runs});
-          }
-        }.bind(this));
-
-        return cards;
-      },
-      _titleBorderColor: function(run) {
-        return this.repeatForRuns ? this.colorScale.scale(run) : 'white';
-      },
-
-      /*
-       * Polymer data binding forwarding functions. Check the
-       * Polymer.Templatizer documentation for more information.
-       */
-
-      _forwardParentProp: function(property, value) {
-        this._stampedTemplates.forEach(function(instance) {
-          instance[property] = value;
-        });
-      },
-      _forwardParentPath: function(path, value) {
-        this._stampedTemplates.forEach(function(instance) {
-          instance.notifyPath(path, value, true);
-        });
-      },
-      // TODO(renatoutsch): implement the instance forwarding for two-way data
-      // binding.
-      // Add breaks to input so it will wrap nicely
-      _break: function(ipt) {
-        return ipt.replace(/([\/_-])/g, "$1<wbr>")
-      },
-    });
-  </script>
-</dom-module>
-<dom-module id="tf-storage" assetpath="../tf-storage/">
- <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-/**
- * The Storage Module provides storage for URL parameters, and an API for
- * getting and setting TensorBoard's stateful URI.
- *
- * It generates URI components like: events&runPrefix=train*
- * which TensorBoard uses after like localhost:8000/#events&runPrefix=train*
- * to store state in the URI.
- *
- * It also allows saving the values to localStorage for long-term persistance.
- */
-var TF;
-(function (TF) {
-    var URIStorage;
-    (function (URIStorage) {
-        /**
-         * A key that users cannot use, since TensorBoard uses this to store info
-         * about the active tab.
-         */
-        URIStorage.TAB = '__tab__';
-        /**
-         * The name of the property for users to set on a Polymer component
-         * in order for its stored properties to be stored in the URI unambiguously.
-         * (No need to set this if you want mutliple instances of the component to
-         * share URI state)
-         *
-         * Example:
-         * <my-component disambiguator="0"></my-component>
-         *
-         * The disambiguator should be set to any unique value so that multiple
-         * instances of the component can store properties in URI storage.
-         *
-         * Because it's hard to dereference this variable in HTML property bindings,
-         * it is NOT safe to change the disambiguator string without find+replace
-         * across the codebase.
-         */
-        URIStorage.DISAMBIGUATOR = 'disambiguator';
-        /**
-         * Return a string stored in URI or localStorage.
-         * Undefined if not found.
-         */
-        function getString(key, useLocalStorage) {
-            if (useLocalStorage) {
-                return window.localStorage.getItem(key);
-            }
-            else {
-                return _componentToDict(_readComponent())[key];
-            }
-        }
-        URIStorage.getString = getString;
-        /**
-         * Set a string in URI or localStorage.
-         */
-        function setString(key, value, useLocalStorage) {
-            if (useLocalStorage) {
-                window.localStorage.setItem(key, value);
-            }
-            else {
-                var items = _componentToDict(_readComponent());
-                items[key] = value;
-                _writeComponent(_dictToComponent(items));
-            }
-        }
-        URIStorage.setString = setString;
-        /**
-         * Return a boolean stored in stored in URI or localStorage.
-         * Undefined if not found.
-         */
-        function getBoolean(key, useLocalStorage) {
-            var item = getString(key, useLocalStorage);
-            return item === 'true' ? true : item === 'false' ? false : undefined;
-        }
-        URIStorage.getBoolean = getBoolean;
-        /**
-         * Store a boolean in URI or localStorage.
-         */
-        function setBoolean(key, value, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            setString(key, value.toString(), useLocalStorage);
-        }
-        URIStorage.setBoolean = setBoolean;
-        /**
-         * Return a number stored in stored in URI or localStorage.
-         * Undefined if not found.
-         */
-        function getNumber(key, useLocalStorage) {
-            var item = getString(key, useLocalStorage);
-            return item === undefined ? undefined : +item;
-        }
-        URIStorage.getNumber = getNumber;
-        /**
-         * Store a number in URI or localStorage.
-         */
-        function setNumber(key, value, useLocalStorage) {
-            setString(key, '' + value, useLocalStorage);
-        }
-        URIStorage.setNumber = setNumber;
-        /**
-         * Return an object stored in stored in URI or localStorage.
-         * Undefined if not found.
-         */
-        function getObject(key, useLocalStorage) {
-            var item = getString(key, useLocalStorage);
-            return item === undefined ? undefined : JSON.parse(atob(item));
-        }
-        URIStorage.getObject = getObject;
-        /**
-         * Store an object in URI or localStorage.
-         */
-        function setObject(key, value, useLocalStorage) {
-            setString(key, btoa(JSON.stringify(value)), useLocalStorage);
-        }
-        URIStorage.setObject = setObject;
-        /**
-         * Get a unique storage name for a (Polymer component, propertyName) tuple.
-         *
-         * DISAMBIGUATOR must be set on the component, if other components use the
-         * same propertyName.
-         */
-        function getURIStorageName(component, propertyName) {
-            var d = component[URIStorage.DISAMBIGUATOR];
-            var components = d == null ? [propertyName] : [d, propertyName];
-            return components.join('.');
-        }
-        URIStorage.getURIStorageName = getURIStorageName;
-        /**
-         * Return a function that:
-         * (1) Initializes a Polymer boolean property with a default value, if its
-         *     value is not already set
-         * (2) Sets up listener that updates Polymer property on hash change.
-         */
-        function getBooleanInitializer(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            return _getInitializer(getBoolean, propertyName, defaultVal, useLocalStorage);
-        }
-        URIStorage.getBooleanInitializer = getBooleanInitializer;
-        /**
-         * Return a function that:
-         * (1) Initializes a Polymer string property with a default value, if its
-         *     value is not already set
-         * (2) Sets up listener that updates Polymer property on hash change.
-         */
-        function getStringInitializer(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            return _getInitializer(getString, propertyName, defaultVal, useLocalStorage);
-        }
-        URIStorage.getStringInitializer = getStringInitializer;
-        /**
-         * Return a function that:
-         * (1) Initializes a Polymer number property with a default value, if its
-         *     value is not already set
-         * (2) Sets up listener that updates Polymer property on hash change.
-         */
-        function getNumberInitializer(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            return _getInitializer(getNumber, propertyName, defaultVal, useLocalStorage);
-        }
-        URIStorage.getNumberInitializer = getNumberInitializer;
-        /**
-         * Return a function that:
-         * (1) Initializes a Polymer Object property with a default value, if its
-         *     value is not already set
-         * (2) Sets up listener that updates Polymer property on hash change.
-         *
-         * Generates a deep clone of the defaultVal to avoid mutation issues.
-         */
-        function getObjectInitializer(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            return _getInitializer(getObject, propertyName, defaultVal, useLocalStorage);
-        }
-        URIStorage.getObjectInitializer = getObjectInitializer;
-        /**
-         * Return a function that updates URIStorage when a string property changes.
-         */
-        function getBooleanObserver(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            return _getObserver(getBoolean, setBoolean, propertyName, defaultVal, useLocalStorage);
-        }
-        URIStorage.getBooleanObserver = getBooleanObserver;
-        /**
-         * Return a function that updates URIStorage when a string property changes.
-         */
-        function getStringObserver(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            return _getObserver(getString, setString, propertyName, defaultVal, useLocalStorage);
-        }
-        URIStorage.getStringObserver = getStringObserver;
-        /**
-         * Return a function that updates URIStorage when a number property changes.
-         */
-        function getNumberObserver(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            return _getObserver(getNumber, setNumber, propertyName, defaultVal, useLocalStorage);
-        }
-        URIStorage.getNumberObserver = getNumberObserver;
-        /**
-         * Return a function that updates URIStorage when an object property changes.
-         * Generates a deep clone of the defaultVal to avoid mutation issues.
-         */
-        function getObjectObserver(propertyName, defaultVal, useLocalStorage) {
-            if (useLocalStorage === void 0) { useLocalStorage = false; }
-            var clone = _.cloneDeep(defaultVal);
-            return _getObserver(getObject, setObject, propertyName, clone, useLocalStorage);
-        }
-        URIStorage.getObjectObserver = getObjectObserver;
-        /**
-         * Read component from URI (e.g. returns "events&runPrefix=train*").
-         */
-        function _readComponent() {
-            return TF.Globals.USE_HASH ? window.location.hash.slice(1) :
-                TF.Globals.FAKE_HASH;
-        }
-        /**
-         * Write component to URI.
-         */
-        function _writeComponent(component) {
-            if (TF.Globals.USE_HASH) {
-                window.location.hash = component;
-            }
-            else {
-                TF.Globals.FAKE_HASH = component;
-            }
-        }
-        /**
-         * Convert dictionary of strings into a URI Component.
-         * All key value entries get added as key value pairs in the component,
-         * with the exception of a key with the TAB value, which if present
-         * gets prepended to the URI Component string for backwards comptability
-         * reasons.
-         */
-        function _dictToComponent(items) {
-            var component = '';
-            // Add the tab name e.g. 'events', 'images', 'histograms' as a prefix
-            // for backwards compatbility.
-            if (items[URIStorage.TAB] !== undefined) {
-                component += items[URIStorage.TAB];
-            }
-            // Join other strings with &key=value notation
-            var nonTab = _.pairs(items)
-                .filter(function (pair) { return pair[0] !== URIStorage.TAB; })
-                .map(function (pair) {
-                return encodeURIComponent(pair[0]) + '=' +
-                    encodeURIComponent(pair[1]);
-            })
-                .join('&');
-            return nonTab.length > 0 ? (component + '&' + nonTab) : component;
-        }
-        /**
-         * Convert a URI Component into a dictionary of strings.
-         * Component should consist of key-value pairs joined by a delimiter
-         * with the exception of the tabName.
-         * Returns dict consisting of all key-value pairs and
-         * dict[TAB] = tabName
-         */
-        function _componentToDict(component) {
-            var items = {};
-            var tokens = component.split('&');
-            tokens.forEach(function (token) {
-                var kv = token.split('=');
-                // Special backwards compatibility for URI components like #events
-                if (kv.length === 1 && _.contains(TF.Globals.TABS, kv[0])) {
-                    items[URIStorage.TAB] = kv[0];
-                }
-                else if (kv.length === 2) {
-                    items[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
-                }
-            });
-            return items;
-        }
-        /**
-         * Return a function that:
-         * (1) Initializes a Polymer property with a default value, if its
-         *     value is not already set
-         * (2) Sets up listener that updates Polymer property on hash change.
-         */
-        function _getInitializer(get, propertyName, defaultVal, useLocalStorage) {
-            return function () {
-                var _this = this;
-                var URIStorageName = getURIStorageName(this, propertyName);
-                // setComponentValue will be called every time the hash changes, and is
-                // responsible for ensuring that new state in the hash will be propagated
-                // to the component with that property.
-                // It is important that this function does not re-assign needlessly,
-                // to avoid Polymer observer churn.
-                var setComponentValue = function () {
-                    var uriValue = get(URIStorageName, false);
-                    var currentValue = _this[propertyName];
-                    // if uriValue is undefined, we will ensure that the property has the
-                    // default value
-                    if (uriValue === undefined) {
-                        var valueToSet = void 0;
-                        // if we are using localStorage, we will set the value to the value
-                        // from localStorage. Then, the corresponding observer will proxy
-                        // the localStorage value into URI storage.
-                        // in this way, localStorage takes precedence over the default val
-                        // but not over the URI value.
-                        if (useLocalStorage) {
-                            var useLocalStorageValue = get(URIStorageName, true);
-                            valueToSet = useLocalStorageValue === undefined ?
-                                defaultVal :
-                                useLocalStorageValue;
-                        }
-                        else {
-                            valueToSet = defaultVal;
-                        }
-                        if (!_.isEqual(currentValue, valueToSet)) {
-                            // If we don't have an explicit URI value, then we need to ensure
-                            // the property value is equal to the default value.
-                            // We will assign a clone rather than the canonical default, because
-                            // the component receiving this property may mutate it, and we need
-                            // to keep a pristine copy of the default.
-                            _this[propertyName] = _.clone(valueToSet);
-                        }
-                        // In this case, we have an explicit URI value, so we will ensure that
-                        // the component has an equivalent value.
-                    }
-                    else {
-                        if (!_.isEqual(uriValue, currentValue)) {
-                            _this[propertyName] = uriValue;
-                        }
-                    }
-                };
-                // Set the value on the property.
-                setComponentValue();
-                // Update it when the hashchanges.
-                window.addEventListener('hashchange', setComponentValue);
-            };
-        }
-        /**
-         * Return a function that updates URIStorage when a property changes.
-         */
-        function _getObserver(get, set, propertyName, defaultVal, useLocalStorage) {
-            return function () {
-                var URIStorageName = getURIStorageName(this, propertyName);
-                var newVal = this[propertyName];
-                // if this is a localStorage property, we always synchronize the value
-                // in localStorage to match the one currently in the URI.
-                if (useLocalStorage) {
-                    set(URIStorageName, newVal, true);
-                }
-                if (!_.isEqual(newVal, get(URIStorageName, false))) {
-                    if (_.isEqual(newVal, defaultVal)) {
-                        _unsetFromURI(URIStorageName);
-                    }
-                    else {
-                        set(URIStorageName, newVal, false);
-                    }
-                }
-            };
-        }
-        /**
-         * Delete a key from the URI.
-         */
-        function _unsetFromURI(key) {
-            var items = _componentToDict(_readComponent());
-            delete items[key];
-            _writeComponent(_dictToComponent(items));
-        }
-    })(URIStorage = TF.URIStorage || (TF.URIStorage = {}));
-})(TF || (TF = {}));
-</script>
-</dom-module>
-
-<dom-module id="tf-regex-group" assetpath="../tf-dashboard-common/">
-  <template>
-    <div class="regex-list">
-      <template is="dom-repeat" items="{{rawRegexes}}">
-        <div class="regex-line">
-          <paper-input id="text-input" class="regex-input" label="Write a regex to create a tag group" no-label-float="" value="{{item.regex}}" invalid="[[!item.valid]]" on-keyup="moveFocus"></paper-input>
-          <paper-icon-button icon="close" class="delete-button" aria-label="Delete Regex" tabindex="0" on-tap="deleteRegex"></paper-icon-button>
-        </div>
-        <style>
-          .regex-input {
-            width: 250px;
-            display: inline-block;
-            margin-left: -3px;
-          }
-
-          .delete-button {
-            color: var(--paper-grey-700);
-            width: 40px;
-            height: 40px;
-            margin-right: -10px;
-          }
-
-          .regex-list {
-            margin-bottom: 10px;
-          }
-
-          paper-input {
-            --paper-input-container-focus-color: var(--tb-orange-strong);
-            --paper-input-container-input: {
-              font-size: 14px;
-            };
-            --paper-input-container-label: {
-              font-size: 14px;
-            };
-          }
-        </style>
-      </template>
-    </div>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-regex-group",
-      properties: {
-        rawRegexes: {
-          type: Array,
-          value: TF.URIStorage.getObjectInitializer('rawRegexes', [{regex: "", valid: true}]),
-        },
-        regexes: {type: Array, computed: "usableRegexes(rawRegexes.*)", notify: true},
-      },
-      observers: [
-        "addNewRegexIfNeeded(rawRegexes.*)",
-        "checkValidity(rawRegexes.*)",
-        "_uriStoreRegexes(rawRegexes.*)",
-      ],
-      _uriStoreRegexes: TF.URIStorage.getObjectObserver('rawRegexes', [{regex: "", valid: true}]),
-      checkValidity: function(x) {
-        var match = x.path.match(/rawRegexes\.(\d+)\.regex/);
-        if (match) {
-          var idx = match[1];
-          this.set("rawRegexes." + idx + ".valid", this.isValid(x.value));
-        }
-      },
-      isValid: function(s) {
-        try {
-          new RegExp(s);
-          return true;
-        } catch (e) {
-          return false;
-        }
-      },
-      usableRegexes: function(regexes) {
-        var isValid = this.isValid;
-        return regexes.base.filter(function (r) {
-          // Checking validity here (rather than using the data property)
-          // is necessary because otherwise we might send invalid regexes due
-          // to the fact that this function can call before the observer does
-          return r.regex !== "" && isValid(r.regex);
-        }).map(function(r) {
-          return r.regex;
-        });
-      },
-      addNewRegexIfNeeded: function() {
-        var last = this.rawRegexes[this.rawRegexes.length - 1];
-        if (last.regex !== "") {
-          this.push("rawRegexes", {regex: "", valid: true});
-        }
-      },
-      deleteRegex: function(e) {
-        if (this.rawRegexes.length > 1) {
-          this.splice("rawRegexes", e.model.index, 1);
-        }
-      },
-      moveFocus: function(e) {
-        if (e.keyCode === 13) {
-          var idx = e.model.index;
-          var inputs = Polymer.dom(this.root).querySelectorAll(".regex-input");
-          if (idx < this.rawRegexes.length - 1) {
-            inputs[idx+1].$.input.focus();
-          } else {
-            document.activeElement.blur();
-          }
-        }
-      }
-    });
-  </script>
-</dom-module>
-<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
-
-<dom-module id="tf-categorizer" assetpath="../tf-dashboard-common/">
-  <template>
-    <div class="inputs">
-      <tf-regex-group id="regexGroup" regexes="{{regexes}}"></tf-regex-group>
-    </div>
-    <style>
-      :host {
-        display: block;
-        padding-bottom: 5px;
-      }
-      paper-checkbox {
-        --paper-checkbox-checked-color: var(--paper-grey-600);
-        --paper-checkbox-unchecked-color: var(--paper-grey-600);
-        font-size: 14px;
-      }
-    </style>
-  </template>
-  <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var Categorizer;
-(function (Categorizer) {
-    /**
-     * This module contains methods that allow sorting tags into 'categories'.
-     * A category contains a name and a list of tags.
-     * The sorting strategy is defined by a 'CustomCategorization', which contains
-     * 'categoryDefinitions' which are regex rules used to construct a category.
-     * E.g. the regex rule 'xent' will create a category called 'xent' that
-     * contains values whose tags match the regex.
-     *
-     * After custom categories are evaluated, the tags are sorted by a hardcoded
-     * fallback categorizer, which may, for example, group tags into categories
-     * based on their top namespace.
-     */
-    /* Canonical TensorFlow ops are namespaced using forward slashes.
-     * This fallback categorizer categorizes by the top-level namespace.
-     */
-    Categorizer.topLevelNamespaceCategorizer = splitCategorizer(/\//);
-    function fallbackCategorizer(s) {
-        switch (s) {
-            case 'TopLevelNamespaceCategorizer':
-                return Categorizer.topLevelNamespaceCategorizer;
-            default:
-                throw new Error('Unrecognized categorization strategy: ' + s);
-        }
-    }
-    Categorizer.fallbackCategorizer = fallbackCategorizer;
-    /* An 'extractor' is a function that takes a tag name, and 'extracts' a
-     * category name.
-     * This function takes an extractor, and produces a categorizer.
-     * Currently, it is just used for the fallbackCategorizer, but we may want to
-     * refactor the general categorization logic to use the concept of extractors.
-     */
-    function extractorToCategorizer(extractor) {
-        return function (tags) {
-            if (tags.length === 0) {
-                return [];
-            }
-            var sortedTags = tags.slice().sort(VZ.Sorting.compareTagNames);
-            var categories = [];
-            var currentCategory = {
-                name: extractor(sortedTags[0]),
-                tags: [],
-            };
-            sortedTags.forEach(function (t) {
-                var topLevel = extractor(t);
-                if (currentCategory.name !== topLevel) {
-                    categories.push(currentCategory);
-                    currentCategory = {
-                        name: topLevel,
-                        tags: [],
-                    };
-                }
-                currentCategory.tags.push(t);
-            });
-            categories.push(currentCategory);
-            return categories;
-        };
-    }
-    function splitCategorizer(r) {
-        var extractor = function (t) {
-            return t.split(r)[0];
-        };
-        return extractorToCategorizer(extractor);
-    }
-    function defineCategory(ruledef) {
-        var r = new RegExp(ruledef);
-        var f = function (tag) {
-            return r.test(tag);
-        };
-        return { name: ruledef, matches: f };
-    }
-    Categorizer.defineCategory = defineCategory;
-    function _categorizer(rules, fallback) {
-        return function (tags) {
-            var remaining = d3.set(tags);
-            var userSpecified = rules.map(function (def) {
-                var tags = [];
-                remaining.forEach(function (t) {
-                    if (def.matches(t)) {
-                        tags.push(t);
-                    }
-                });
-                var cat = { name: def.name, tags: tags.sort(VZ.Sorting.compareTagNames) };
-                return cat;
-            });
-            var defaultCategories = fallback(remaining.values());
-            return userSpecified.concat(defaultCategories);
-        };
-    }
-    Categorizer._categorizer = _categorizer;
-    function categorizer(s) {
-        var rules = s.categoryDefinitions.map(defineCategory);
-        var fallback = fallbackCategorizer(s.fallbackCategorizer);
-        return _categorizer(rules, fallback);
-    }
-    Categorizer.categorizer = categorizer;
-    ;
-})(Categorizer || (Categorizer = {}));
-</script>
-  <script>
-    Polymer({
-      is: "tf-categorizer",
-      properties: {
-        regexes: {type: Array},
-        tags: {type: Array},
-        categoriesAreExclusive: {type: Boolean, value: true},
-        fallbackCategorizer: {
-          type: String,
-          value: "TopLevelNamespaceCategorizer",
-        },
-        categorizer: {
-          type: Object,
-          computed: "computeCategorization(regexes.*, categoriesAreExclusive, fallbackCategorizer)",
-        },
-        categories: {type: Array, value: function() {return [];}, notify: true, readOnly: true},
-      },
-      observers: ['recategorize(tags.*, categorizer)'],
-      computeCategorization: function(regexes, categoriesAreExclusive, fallbackCategorizer) {
-        var categorizationStrategy = {
-          categoryDefinitions: regexes.base,
-          categoriesAreExclusive: categoriesAreExclusive,
-          fallbackCategorizer: fallbackCategorizer,
-        };
-        return Categorizer.categorizer(categorizationStrategy);
-      },
-      recategorize: function() {
-        this.debounce("tf-categorizer-recategorize", function (){
-          var categories = this.categorizer(this.tags);
-          this._setCategories(categories);
-        })
-      },
-    });
-  </script>
-</dom-module>
-<dom-module id="run-color-style" assetpath="../tf-dashboard-common/">
-  <template>
-    <style>
-    [color-class="light-blue"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-light-blue-500);
-      --paper-checkbox-checked-ink-color: var(--paper-light-blue-500);
-      --paper-checkbox-unchecked-color: var(--paper-light-blue-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-light-blue-900);
-    }
-    [color-class="red"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-red-500);
-      --paper-checkbox-checked-ink-color: var(--paper-red-500);
-      --paper-checkbox-unchecked-color: var(--paper-red-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-red-900);
-    }
-    [color-class="green"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-green-500);
-      --paper-checkbox-checked-ink-color: var(--paper-green-500);
-      --paper-checkbox-unchecked-color: var(--paper-green-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-green-900);
-    }
-    [color-class="purple"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-purple-500);
-      --paper-checkbox-checked-ink-color: var(--paper-purple-500);
-      --paper-checkbox-unchecked-color: var(--paper-purple-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-purple-900);
-    }
-    [color-class="teal"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-teal-500);
-      --paper-checkbox-checked-ink-color: var(--paper-teal-500);
-      --paper-checkbox-unchecked-color: var(--paper-teal-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-teal-900);
-    }
-    [color-class="pink"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-pink-500);
-      --paper-checkbox-checked-ink-color: var(--paper-pink-500);
-      --paper-checkbox-unchecked-color: var(--paper-pink-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-pink-900);
-    }
-    [color-class="orange"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-orange-500);
-      --paper-checkbox-checked-ink-color: var(--paper-orange-500);
-      --paper-checkbox-unchecked-color: var(--paper-orange-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-orange-900);
-    }
-    [color-class="brown"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-brown-500);
-      --paper-checkbox-checked-ink-color: var(--paper-brown-500);
-      --paper-checkbox-unchecked-color: var(--paper-brown-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-brown-900);
-    }
-    [color-class="indigo"] paper-checkbox {
-      --paper-checkbox-checked-color: var(--paper-indigo-500);
-      --paper-checkbox-checked-ink-color: var(--paper-indigo-500);
-      --paper-checkbox-unchecked-color: var(--paper-indigo-900);
-      --paper-checkbox-unchecked-ink-color: var(--paper-indigo-900);
-    }
-    </style>
-  </template>
-</dom-module>
-
-<dom-module id="tf-multi-checkbox" assetpath="../tf-dashboard-common/">
-  <style include="scrollbar-style"></style>
-  <style include="run-color-style"></style>
-
-  <template>
-      <paper-input id="runs-regex" no-label-float="" label="Write a regex to filter runs" value="[[regexInput]]" on-bind-value-changed="_debouncedRegexChange"></paper-input>
-    <div id="outer-container" class="scrollbar">
-      <template is="dom-repeat" items="[[namesMatchingRegex]]">
-        <div class="run-row">
-          <div class="icon-container checkbox-container vertical-align-container">
-            <paper-checkbox class="checkbox vertical-align-center" name="[[item]]" checked$="[[_isChecked(item, runSelectionState.*)]]" on-change="_checkboxChange"></paper-checkbox>
-
-          </div>
-          <div class="icon-container isolator-container vertical-align-container">
-            <paper-icon-button icon="radio-button-unchecked" class="isolator vertical-align-center" on-tap="_isolateRun" name="[[item]]"></paper-icon-button>
-          </div>
-          <div class="item-label-container">
-            <span>[[item]]</span>
-          </div>
-        </div>
-      </template>
-    </div>
-  <style>
-    paper-input {
-      --paper-input-container-focus-color: var(--tb-orange-strong);
-      --paper-input-container-input: {
-        font-size: 14px;
-      };
-      --paper-input-container-label: {
-        font-size: 14px;
-      };
-    }
-    :host {
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-    }
-    #outer-container {
-      overflow-y: auto;
-      overflow-x: hidden;
-      width: 100%;
-      height: 0; /* Quirk to make firefox add scrolling instead of expand div */
-      flex-grow: 1;
-      flex-shrink: 1;
-      word-wrap: break-word;
-    }
-    .run-row {
-      padding-top: 5px;
-      padding-bottom: 5px;
-      display: flex;
-      flex-direction: row;
-      font-size: 13px;
-    }
-    .icon-container {
-      flex-grow: 0;
-      flex-shrink: 0;
-      padding-left: 2px;
-    }
-    .checkbox {
-      padding-left: 2px;
-      width: 18px;
-      height: 18px;
-    }
-    .isolator {
-      width: 18px;
-      height: 18px;
-      padding: 0px;
-    }
-    .isolator-container {
-      padding-left: 6px;
-      padding-right: 3px;
-    }
-    .checkbox-container {
-      padding-left: 2px;
-    }
-    .item-label-container {
-      padding-left: 5px;
-      flex-grow: 1;
-      flex-shrink: 1;
-      width: 0px; /* hack to get the flex-grow to work properly */
-    }
-    .tooltip-value-container {
-      display: flex;
-      justify-content: center;
-      flex-grow: 0;
-      flex-shrink: 0;
-      text-align:right;
-      padding-left: 2px;
-    }
-    .vertical-align-container {
-      display: flex;
-      justify-content: center;
-    }
-    .vertical-align-container .vertical-align-center {
-      align-self: center;
-    }
-    .vertical-align-container .vertical-align-top {
-      align-self: start;
-    }
-  </style>
-  </template>
-
-  <script>
-  Polymer({
-    is: "tf-multi-checkbox",
-    properties: {
-      names: {
-        type: Array,
-        value: function() {return [];},
-      }, // All the runs in consideration
-      regexInput: {
-        type: String,
-        value: TF.URIStorage.getStringInitializer("regexInput", ""),
-        observer: "_regexInputObserver",
-      }, // Regex for filtering the runs
-      regex: {
-        type: Object,
-        computed: "_makeRegex(regexInput)"
-      },
-      namesMatchingRegex: {
-        type: Array,
-        computed: "computeNamesMatchingRegex(names.*, regex)"
-      }, // Runs that match the regex
-      runSelectionState: {
-      // if a run is explicitly enabled, True, if explicitly disabled, False.
-      // if undefined, default value (enable for first k runs, disable after).
-        type: Object,
-        value: TF.URIStorage.getObjectInitializer('runSelectionState', {}),
-        observer: "_storeRunToIsCheckedMapping",
-      },
-      // (Allows state to persist across regex filtering)
-      outSelected: {
-        type: Array,
-        notify: true,
-        computed: 'computeOutSelected(namesMatchingRegex.*, runSelectionState.*)'
-      },
-      colorScale: {
-        type: Object,
-        observer: "synchronizeColors",
-      }, // map from run name to css class
-      maxRunsToEnableByDefault: {
-        // When TB first loads, if it has k or fewer runs, they are all enabled
-        // by default. If there are more, then they are all disabled.
-        type: Number,
-        value: 40,
-      },
-      _debouncedRegexChange: {
-        type: Function,
-        // Updating the regex can be slow, because it involves updating styles
-        // on a large number of Polymer paper-checkboxes. We don't want to do
-        // this while the user is typing, as it may make a bad, laggy UI.
-        // So we debounce the updates that come from user typing.
-        value: function() {
-          _this = this;
-          var debounced = _.debounce(function(r) {
-            _this.regexInput = r;
-          }, 150, {leading: false});
-          return function() {
-            var r = this.$$("#runs-regex").value;
-            if (r == "") {
-              // If the user cleared the field, they may be done typing, so
-              // update more quickly.
-              this.async(function() {
-                _this.regexInput = r;
-              }, 30);
-            } else {
-              debounced(r);
-            };
-          };
-        },
-      },
-    },
-    listeners: {
-      'dom-change': 'synchronizeColors',
-    },
-    observers: [
-      "_setIsolatorIcon(runSelectionState, names)",
-    ],
-    _storeRunToIsCheckedMapping: TF.URIStorage.getObjectObserver('runSelectionState', {}),
-    _makeRegex: function(regex) {
-      try {
-        return new RegExp(regex)
-      } catch (e) {
-        return null;
-      }
-    },
-    _setIsolatorIcon: function() {
-      var runMap = this.runSelectionState;
-      var numChecked = _.filter(_.values(runMap)).length;
-      var buttons = Array.prototype.slice.call(this.querySelectorAll(".isolator"));
-
-      buttons.forEach(function(b) {
-        if (numChecked === 1 && runMap[b.name]) {
-          b.icon = "radio-button-checked";
-        } else {
-          b.icon = "radio-button-unchecked";
-        }
-      });
-    },
-    computeNamesMatchingRegex: function(__, ___) {
-      var regex = this.regex;
-      return this.names.filter(function(n) {
-        return regex == null || regex.test(n);
-      });
-    },
-    computeOutSelected: function(__, ___) {
-      var runSelectionState = this.runSelectionState;
-      var num = this.maxRunsToEnableByDefault;
-      var allEnabled = this.namesMatchingRegex.length <= num;
-      return this.namesMatchingRegex.filter(function(n, i) {
-        return runSelectionState[n] == null ? allEnabled : runSelectionState[n];
-      });
-    },
-    synchronizeColors: function(e) {
-      if (!this.colorScale) return;
-
-      this._setIsolatorIcon();
-
-      var checkboxes = Array.prototype.slice.call(this.querySelectorAll("paper-checkbox"));
-      var scale = this.colorScale;
-      checkboxes.forEach(function(p) {
-        var color = scale.scale(p.name);
-        p.customStyle['--paper-checkbox-checked-color'] = color;
-        p.customStyle['--paper-checkbox-checked-ink-color'] = color;
-        p.customStyle['--paper-checkbox-unchecked-color'] = color;
-        p.customStyle['--paper-checkbox-unchecked-ink-color'] = color;
-      });
-      var buttons = Array.prototype.slice.call(this.querySelectorAll(".isolator"));
-      buttons.forEach(function(p) {
-        var color = scale.scale(p.name);
-        p.style['color'] = color;
-      });
-      // The updateStyles call fails silently if the browser doesn't have focus,
-      // e.g. if TensorBoard was opened into a new tab that isn't visible.
-      // So we wait for requestAnimationFrame.
-      var _this = this;
-      window.requestAnimationFrame(function() {_this.updateStyles();});
-    },
-    _isolateRun: function(e) {
-      // If user clicks on the label for one run, enable it and disable all other runs.
-
-      var name = Polymer.dom(e).localTarget.name;
-      var selectionState = {};
-      this.names.forEach(function(n) {
-        selectionState[n] = n == name;
-      })
-      this.runSelectionState = selectionState;
-    },
-    _checkboxChange: function(e) {
-      var target = Polymer.dom(e).localTarget;
-      this.runSelectionState[target.name] = target.checked;
-      // n.b. notifyPath won't work because run names may have periods.
-      this.runSelectionState = _.clone(this.runSelectionState);
-    },
-    _isChecked: function(item, outSelectedChange) {
-      return this.outSelected.indexOf(item) != -1;
-    },
-    _regexInputObserver: TF.URIStorage.getStringObserver("regexInput", ""),
-    toggleAll: function() {
-      var _this = this;
-      var anyToggledOn = this.namesMatchingRegex
-                    .some(function(n) {return _this.runSelectionState[n]});
-
-
-      var runSelectionStateIsDefault = Object.keys(this.runSelectionState).length == 0;
-
-      var defaultOff = this.namesMatchingRegex.length > this.maxRunsToEnableByDefault;
-      // We have runs toggled either if some were explicitly toggled on, or if
-      // we are in the default state, and there are few enough that we default
-      // to toggling on.
-      anyToggledOn = anyToggledOn || runSelectionStateIsDefault && !defaultOff;
-
-      // If any are toggled on, we turn everything off. Or, if none are toggled
-      // on, we turn everything on.
-
-      var newRunsDisabled = {};
-      this.names.forEach(function(n) {
-        newRunsDisabled[n] = !anyToggledOn;
-      })
-      this.runSelectionState = newRunsDisabled;
-    },
-  });
-  </script>
-</dom-module>
-
-<dom-module id="tf-run-selector" assetpath="../tf-dashboard-common/">
-  <template>
-    <paper-dialog with-backdrop="" id="logdir-dialog">
-      <h2>logdir</h2>
-      <div inner-h-t-m-l="{{_breakString(logdir)}}"></div>
-    </paper-dialog>
-    <div id="top-text">
-      <h3 id="tooltip-help" class="tooltip-container">
-        Runs
-      </h3>
-    </div>
-    <tf-multi-checkbox id="multiCheckbox" names="[[runs]]" out-selected="{{outSelected}}" color-scale="[[colorScale]]"></tf-multi-checkbox>
-    <paper-button class="x-button" id="toggle-all" on-tap="_toggleAll">
-    Toggle All Runs
-    </paper-button>
-    <template is="dom-if" if="[[logdir]]">
-      <div id="logdir">
-        <span id="clipped-logdir" inner-h-t-m-l="[[_clippedLogdir]]"></span><template is="dom-if" if="[[_shouldShowExpandLogdirButton(logdir, _logdirClipLength)]]"><a href="" on-click="_openLogdirDialog">…</a>
-        </template>
-      </div>
-    </template>
-    <style>
-      :host {
-        display: flex;
-        flex-direction: column;
-        padding-bottom: 10px;
-        box-sizing: border-box;
-      }
-      #top-text {
-        width: 100%;
-        flex-grow: 0;
-        flex-shrink: 0;
-        padding-right: 16px;
-        box-sizing: border-box;
-        color: var(--paper-grey-800);
-      }
-      tf-multi-checkbox {
-        display: flex;
-        flex-grow: 1;
-        flex-shrink: 1;
-      }
-      .x-button {
-        font-size: 13px;
-        background-color: var(--tb-ui-light-accent);
-        color: var(--tb-ui-dark-accent);
-      }
-      #tooltip-help {
-        color: var(--paper-grey-800);
-        margin: 0;
-        font-weight: normal;
-        font-size: 14px;
-        margin-bottom: 5px;
-      }
-      paper-button {
-        margin-left: 0;
-      }
-      #logdir {
-        color: var(--tb-ui-dark-accent);
-        font-size: 13px;
-        margin: 5px 0 0 0;
-        max-width: 288px;
-      }
-    </style>
-  </template>
-  <script>
-  Polymer({
-    is: "tf-run-selector",
-    properties: {
-      backend: Object,
-      outSelected: {type: Array, notify: true},
-      // runs: an array of strings, representing the run names that may be chosen
-      runs: Array,
-      colorScale: Object, // TF.ColorScale
-      logdir: {
-        type: String,
-        notify: true,
-      },
-      // This is the potentially clipped portion of the logdir we show at the bottom of the sidebar.
-      _clippedLogdir: {
-        type: String,
-      },
-      _logdirClipLength: {
-        type: Number,
-        value: 250,
-        readOnly: true,
-      },
-    },
-    observers: [
-      "_onBackendUpdate(backend)",
-      "_logdirSet(logdir)",
-    ],
-    _toggleAll: function() {
-      this.$.multiCheckbox.toggleAll();
-    },
-    // Break the string at natural points, including commas, equals, and slashes
-    _breakString: function(originalString) {
-      return originalString.replace(/([\/=\-_,])/g, "$1<wbr>");
-    },
-    _onBackendUpdate: function(backend) {
-      if (backend === undefined) {
-        return;
-      }
-
-      // When the backend is set, the selector can request the logdir.
-      backend.logdir().then(logdirObject => {
-        this.set('logdir', logdirObject.logdir);
-      }).catch(e => {
-        // Fetching the logdir failed. Prevent the exception from logging to
-        // console. The console already logs a 404 network event.
-      });
-    },
-    _logdirSet: function(logdir) {
-      if (logdir === undefined) {
-        // The logdir has not been set yet.
-        return;
-      }
-
-      var lineBrokenText;
-      if (logdir.length > this._logdirClipLength) {
-        // Clip the logdir to avoid blocking the runs selector. Let the user view a more full
-        // version of the logdir.
-        lineBrokenText = this._breakString(logdir.substring(0, this._logdirClipLength));
-      } else {
-        lineBrokenText = this._breakString(logdir);
-      }
-      this.set('_clippedLogdir', lineBrokenText);
-    },
-    _openLogdirDialog: function(event) {
-      event.preventDefault();
-      this.$$('#logdir-dialog').open();
-    },
-    _shouldShowExpandLogdirButton(logdir, _logdirClipLength) {
-      return logdir && logdir.length > _logdirClipLength;
-    },
-  });
-  </script>
-</dom-module>
-
-<dom-module id="tf-sidebar-helper" assetpath="../tf-dashboard-common/">
-  <template>
-    <div class="sidebar-section">
-      <tf-categorizer id="categorizer" tags="[[tags]]" categories="{{categories}}"></tf-categorizer>
-      <content select=".extend-first-section"></content>
-    </div>
-    <content></content>
-    <div class="sidebar-section">
-      <tf-run-selector id="runSelector" backend="[[backend]]" runs="[[runs]]" color-scale="[[colorScale]]" out-selected="{{selectedRuns}}"></tf-run-selector>
-    </div>
-    <style include="dashboard-style"></style>
-    <style>
-      :host {
-        display: flex;
-        flex-direction: column;
-        height: 100%;
-      }
-
-      #categorizer {
-        flex-shrink: 0;
-      }
-
-      #runSelector {
-        flex-shrink: 1;
-        flex-grow: 1;
-      }
-
-      .sidebar-section {
-        border-top: solid 1px rgba(0, 0, 0, 0.12);
-        padding: 20px 0px 20px 30px;
-      }
-
-      .sidebar-section:first-child {
-        border: none;
-      }
-
-      .sidebar-section:last-child {
-        flex-grow: 1;
-        display: flex;
-      }
-
-      paper-checkbox {
-        --paper-checkbox-checked-color: var(--tb-ui-dark-accent);
-        --paper-checkbox-unchecked-color: var(--tb-ui-dark-accent);
-        font-size: 14px;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-sidebar-helper",
-      properties: {
-        /**
-         * The backend object used to issue requests.
-         */
-        backend: Object,
-
-        /**
-         * This is an output of the categories that the user selected to
-         * separate the different tags. Each category here should be given its
-         * own collapsible pane.
-         */
-        categories: {
-          type: Array,
-          notify: true,
-        },
-
-        /**
-         * Input of the colors that are used for the user's runs.
-         */
-        colorScale: Object,
-
-        /**
-         * Map from runs to the valid tags that have them.
-         */
-        run2tag: Object,
-
-        /**
-         * Input of all valid runs that can be selected by the user.
-         */
-        runs: Array,
-
-        /**
-         * Outputs an array with the runs that are selected by the user (i.e.
-         * valid to be displayed).
-         */
-        selectedRuns: {
-          type: Array,
-          notify: true,
-        },
-
-        tags: {
-          type: Array,
-          computed: "_getTags(run2tag.*)"
-        },
-      },
-      _getTags: function() {
-        return _.union.apply(null, _.values(this.run2tag));
-      },
-    })
-  </script>
-</dom-module>
-
-<dom-module id="vz-line-chart" assetpath="../vz-line-chart/">
-  <template>
-    <div id="tooltip">
-      <table>
-        <thead>
-          <tr>
-            <th></th>
-            <th>Name</th>
-            <template is="dom-if" if="{{smoothingEnabled}}">
-              <th>Smoothed</th>
-            </template>
-            <th>Value</th>
-            <th>Step</th>
-            <th>Time</th>
-            <th>Relative</th>
-          </tr>
-        </thead>
-        <tbody>
-        </tbody>
-      </table>
-    </div>
-    <svg id="chartsvg"></svg>
-    <style>
-      :host {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        display: flex;
-        flex-direction: column;
-        flex-grow: 1;
-        flex-shrink: 1;
-        position: relative;
-        outline: none;
-      }
-      svg {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        flex-grow: 1;
-        flex-shrink: 1;
-      }
-      td {
-        padding-left: 5px;
-        padding-right: 5px;
-        font-size: 13px;
-        opacity: 1;
-      }
-      #tooltip {
-        pointer-events: none;
-        position: absolute;
-        opacity: 0;
-        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-        font-size: 14px;
-        background: rgba(0, 0, 0, 0.8);
-        color: white;
-        border-radius: 4px;
-        line-height: 1.4em;
-        padding: 8px;
-        z-index: 5;
-        cursor: none;
-        margin-top: 10px;
-      }
-      .swatch {
-        border-radius: 50%;
-        width: 14px;
-        height: 14px;
-        display: block;
-        border: 2px solid rgba(0,0,0,0);
-      }
-      .closest .swatch {
-        border: 2px solid white;
-      }
-      th {
-        padding-left: 5px;
-        padding-right: 5px;
-        text-align: left;
-      }
-      .distant td {
-        opacity: 0.8;
-      }
-
-      .distant td.swatch {
-        opacity: 1;
-      }
-
-      .ghost {
-        opacity: 0.2;
-        stroke-width: 1px;
-      }
-
-      #chartsvg line.guide-line {
-        stroke: #999;
-        stroke-width: 1.5px;
-      }
-
-    </style>
-  </template>
-  <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var Plottable;
-(function (Plottable) {
-    var DragZoomLayer = (function (_super) {
-        __extends(DragZoomLayer, _super);
-        /**
-         * Constructs a SelectionBoxLayer with an attached DragInteraction and
-         * ClickInteraction. On drag, it triggers an animated zoom into the box
-         * that was dragged. On double click, it zooms back out to the original
-         * view, before any zooming.
-         * The zoom animation uses an easing function (default
-         * d3.ease('cubic-in-out')) and is customizable.
-         * Usage: Construct the selection box layer and attach x and y scales,
-         * and then add the layer over the plot you are zooming on using a
-         * Component Group.
-         * TODO(danmane) - merge this into Plottable
-         */
-        function DragZoomLayer(xScale, yScale, unzoomMethod) {
-            var _this = _super.call(this) || this;
-            _this.isZoomed = false;
-            _this.easeFn = d3.ease('cubic-in-out');
-            _this._animationTime = 750;
-            _this.xScale(xScale);
-            _this.yScale(yScale);
-            _this._dragInteraction = new Plottable.Interactions.Drag();
-            _this._dragInteraction.attachTo(_this);
-            _this._doubleClickInteraction = new Plottable.Interactions.DoubleClick();
-            _this._doubleClickInteraction.attachTo(_this);
-            _this.setupCallbacks();
-            _this.unzoomMethod = unzoomMethod;
-            return _this;
-        }
-        /**
-         * Register a method that calls when the DragZoom interaction starts.
-         */
-        DragZoomLayer.prototype.interactionStart = function (cb) { this.onStart = cb; };
-        /**
-         * Register a method that calls when the DragZoom interaction ends.
-         */
-        DragZoomLayer.prototype.interactionEnd = function (cb) { this.onEnd = cb; };
-        DragZoomLayer.prototype.setupCallbacks = function () {
-            var _this = this;
-            var dragging = false;
-            this._dragInteraction.onDragStart(function (startPoint) {
-                _this.bounds({
-                    topLeft: startPoint,
-                    bottomRight: startPoint,
-                });
-                _this.onStart();
-            });
-            this._dragInteraction.onDrag(function (startPoint, endPoint) {
-                _this.bounds({ topLeft: startPoint, bottomRight: endPoint });
-                _this.boxVisible(true);
-                dragging = true;
-            });
-            this._dragInteraction.onDragEnd(function (startPoint, endPoint) {
-                _this.boxVisible(false);
-                _this.bounds({ topLeft: startPoint, bottomRight: endPoint });
-                if (dragging) {
-                    _this.zoom();
-                }
-                else {
-                    _this.onEnd();
-                }
-                dragging = false;
-            });
-            this._doubleClickInteraction.onDoubleClick(this.unzoom.bind(this));
-        };
-        DragZoomLayer.prototype.animationTime = function (animationTime) {
-            if (animationTime == null) {
-                return this._animationTime;
-            }
-            if (animationTime < 0) {
-                throw new Error('animationTime cannot be negative');
-            }
-            this._animationTime = animationTime;
-            return this;
-        };
-        /**
-         * Set the easing function, which determines how the zoom interpolates
-         * over time.
-         */
-        DragZoomLayer.prototype.ease = function (fn) {
-            if (typeof (fn) !== 'function') {
-                throw new Error('ease function must be a function');
-            }
-            if (fn(0) !== 0 || fn(1) !== 1) {
-                Plottable.Utils.Window.warn('Easing function does not maintain invariant ' +
-                    'f(0)==0 && f(1)==1. Bad behavior may result.');
-            }
-            this.easeFn = fn;
-            return this;
-        };
-        // Zoom into extent of the selection box bounds
-        DragZoomLayer.prototype.zoom = function () {
-            var x0 = this.xExtent()[0].valueOf();
-            var x1 = this.xExtent()[1].valueOf();
-            var y0 = this.yExtent()[1].valueOf();
-            var y1 = this.yExtent()[0].valueOf();
-            if (x0 === x1 || y0 === y1) {
-                return;
-            }
-            if (!this.isZoomed) {
-                this.isZoomed = true;
-            }
-            this.interpolateZoom(x0, x1, y0, y1);
-        };
-        // Restore the scales to their state before any zoom
-        DragZoomLayer.prototype.unzoom = function () {
-            if (!this.isZoomed) {
-                return;
-            }
-            this.isZoomed = false;
-            var xScale = this.xScale();
-            xScale._domainMin = null;
-            xScale._domainMax = null;
-            var xDomain = xScale._getExtent();
-            this.xScale().domain(xDomain);
-            this.unzoomMethod();
-        };
-        // If we are zooming, disable interactions, to avoid contention
-        DragZoomLayer.prototype.isZooming = function (isZooming) {
-            this._dragInteraction.enabled(!isZooming);
-            this._doubleClickInteraction.enabled(!isZooming);
-        };
-        DragZoomLayer.prototype.interpolateZoom = function (x0f, x1f, y0f, y1f) {
-            var _this = this;
-            var x0s = this.xScale().domain()[0].valueOf();
-            var x1s = this.xScale().domain()[1].valueOf();
-            var y0s = this.yScale().domain()[0].valueOf();
-            var y1s = this.yScale().domain()[1].valueOf();
-            // Copy a ref to the ease fn, so that changing ease wont affect zooms in
-            // progress.
-            var ease = this.easeFn;
-            var interpolator = function (a, b, p) {
-                return d3.interpolateNumber(a, b)(ease(p));
-            };
-            this.isZooming(true);
-            var start = Date.now();
-            var draw = function () {
-                var now = Date.now();
-                var passed = now - start;
-                var p = _this._animationTime === 0 ?
-                    1 :
-                    Math.min(1, passed / _this._animationTime);
-                var x0 = interpolator(x0s, x0f, p);
-                var x1 = interpolator(x1s, x1f, p);
-                var y0 = interpolator(y0s, y0f, p);
-                var y1 = interpolator(y1s, y1f, p);
-                _this.xScale().domain([x0, x1]);
-                _this.yScale().domain([y0, y1]);
-                if (p < 1) {
-                    Plottable.Utils.DOM.requestAnimationFramePolyfill(draw);
-                }
-                else {
-                    _this.onEnd();
-                    _this.isZooming(false);
-                }
-            };
-            draw();
-        };
-        return DragZoomLayer;
-    }(Plottable.Components.SelectionBoxLayer));
-    Plottable.DragZoomLayer = DragZoomLayer;
-})(Plottable || (Plottable = {}));
-</script>
-  <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-var VZ;
-(function (VZ) {
-    var LineChart = (function () {
-        function LineChart(xType, yScaleType, colorScale, tooltip) {
-            this.seriesNames = [];
-            this.name2datasets = {};
-            this.colorScale = colorScale;
-            this.tooltip = tooltip;
-            this.datasets = [];
-            this._ignoreYOutliers = false;
-            // lastPointDataset is a dataset that contains just the last point of
-            // every dataset we're currently drawing.
-            this.lastPointsDataset = new Plottable.Dataset();
-            this.nanDataset = new Plottable.Dataset();
-            // need to do a single bind, so we can deregister the callback from
-            // old Plottable.Datasets. (Deregistration is done by identity checks.)
-            this.onDatasetChanged = this._onDatasetChanged.bind(this);
-            this.buildChart(xType, yScaleType);
-        }
-        LineChart.prototype.buildChart = function (xType, yScaleType) {
-            if (this.outer) {
-                this.outer.destroy();
-            }
-            var xComponents = VZ.ChartHelpers.getXComponents(xType);
-            this.xAccessor = xComponents.accessor;
-            this.xScale = xComponents.scale;
-            this.xAxis = xComponents.axis;
-            this.xAxis.margin(0).tickLabelPadding(3);
-            this.yScale = LineChart.getYScaleFromType(yScaleType);
-            this.yAxis = new Plottable.Axes.Numeric(this.yScale, 'left');
-            var yFormatter = VZ.ChartHelpers.multiscaleFormatter(VZ.ChartHelpers.Y_AXIS_FORMATTER_PRECISION);
-            this.yAxis.margin(0).tickLabelPadding(5).formatter(yFormatter);
-            this.yAxis.usesTextWidthApproximation(true);
-            this.dzl = new Plottable.DragZoomLayer(this.xScale, this.yScale, this.updateSpecialDatasets.bind(this));
-            var center = this.buildPlot(this.xAccessor, this.xScale, this.yScale);
-            this.gridlines =
-                new Plottable.Components.Gridlines(this.xScale, this.yScale);
-            var xZeroLine = new Plottable.Components.GuideLineLayer('horizontal');
-            xZeroLine.scale(this.yScale).value(0);
-            var yZeroLine = new Plottable.Components.GuideLineLayer('vertical');
-            yZeroLine.scale(this.xScale).value(0);
-            this.center = new Plottable.Components.Group([this.gridlines, xZeroLine, yZeroLine, center, this.dzl]);
-            this.outer = new Plottable.Components.Table([
-                [this.yAxis, this.center],
-                [null, this.xAxis]
-            ]);
-        };
-        LineChart.prototype.buildPlot = function (xAccessor, xScale, yScale) {
-            var _this = this;
-            this.scalarAccessor = function (d) { return d.scalar; };
-            this.smoothedAccessor = function (d) { return d.smoothed; };
-            var linePlot = new Plottable.Plots.Line();
-            linePlot.x(xAccessor, xScale);
-            linePlot.y(this.scalarAccessor, yScale);
-            linePlot.attr('stroke', function (d, i, dataset) {
-                return _this.colorScale.scale(dataset.metadata().name);
-            });
-            this.linePlot = linePlot;
-            var group = this.setupTooltips(linePlot);
-            var smoothLinePlot = new Plottable.Plots.Line();
-            smoothLinePlot.x(xAccessor, xScale);
-            smoothLinePlot.y(this.smoothedAccessor, yScale);
-            smoothLinePlot.attr('stroke', function (d, i, dataset) {
-                return _this.colorScale.scale(dataset.metadata().name);
-            });
-            this.smoothLinePlot = smoothLinePlot;
-            // The scatterPlot will display the last point for each dataset.
-            // This way, if there is only one datum for the series, it is still
-            // visible. We hide it when tooltips are active to keep things clean.
-            var scatterPlot = new Plottable.Plots.Scatter();
-            scatterPlot.x(xAccessor, xScale);
-            scatterPlot.y(this.scalarAccessor, yScale);
-            scatterPlot.attr('fill', function (d) { return _this.colorScale.scale(d.name); });
-            scatterPlot.attr('opacity', 1);
-            scatterPlot.size(VZ.ChartHelpers.TOOLTIP_CIRCLE_SIZE * 2);
-            scatterPlot.datasets([this.lastPointsDataset]);
-            this.scatterPlot = scatterPlot;
-            var nanDisplay = new Plottable.Plots.Scatter();
-            nanDisplay.x(xAccessor, xScale);
-            nanDisplay.y(function (x) { return x.displayY; }, yScale);
-            nanDisplay.attr('fill', function (d) { return _this.colorScale.scale(d.name); });
-            nanDisplay.attr('opacity', 1);
-            nanDisplay.size(VZ.ChartHelpers.NAN_SYMBOL_SIZE * 2);
-            nanDisplay.datasets([this.nanDataset]);
-            nanDisplay.symbol(Plottable.SymbolFactories.triangleUp);
-            this.nanDisplay = nanDisplay;
-            return new Plottable.Components.Group([nanDisplay, scatterPlot, smoothLinePlot, group]);
-        };
-        /** Updates the chart when a dataset changes. Called every time the data of
-         * a dataset changes to update the charts.
-         */
-        LineChart.prototype._onDatasetChanged = function (dataset) {
-            if (this.smoothingEnabled) {
-                this.resmoothDataset(dataset);
-            }
-            this.updateSpecialDatasets();
-        };
-        LineChart.prototype.ignoreYOutliers = function (ignoreYOutliers) {
-            if (ignoreYOutliers !== this._ignoreYOutliers) {
-                this._ignoreYOutliers = ignoreYOutliers;
-                this.updateSpecialDatasets();
-            }
-        };
-        LineChart.prototype.updateSpecialDatasets = function () {
-            if (this.smoothingEnabled) {
-                this.updateSpecialDatasetsWithAccessor(this.smoothedAccessor);
-            }
-            else {
-                this.updateSpecialDatasetsWithAccessor(this.scalarAccessor);
-            }
-        };
-        /** Constructs special datasets. Each special dataset contains exceptional
-         * values from all of the regular datasets, e.g. last points in series, or
-         * NaN values. Those points will have a `name` and `relative` property added
-         * (since usually those are context in the surrounding dataset).
-         * The accessor will point to the correct data to access.
-         */
-        LineChart.prototype.updateSpecialDatasetsWithAccessor = function (accessor) {
-            var lastPointsData = this.datasets
-                .map(function (d) {
-                var datum = null;
-                // filter out NaNs to ensure last point is a clean one
-                var nonNanData = d.data().filter(function (x) { return !isNaN(accessor(x, -1, d)); });
-                if (nonNanData.length > 0) {
-                    var idx = nonNanData.length - 1;
-                    datum = nonNanData[idx];
-                    datum.name = d.metadata().name;
-                    datum.relative =
-                        VZ.ChartHelpers.relativeAccessor(datum, -1, d);
-                }
-                return datum;
-            })
-                .filter(function (x) { return x != null; });
-            this.lastPointsDataset.data(lastPointsData);
-            // Take a dataset, return an array of NaN data points
-            // the NaN points will have a "displayY" property which is the
-            // y-value of a nearby point that was not NaN (0 if all points are NaN)
-            var datasetToNaNData = function (d) {
-                var displayY = null;
-                var data = d.data();
-                var i = 0;
-                while (i < data.length && displayY == null) {
-                    if (!isNaN(accessor(data[i], -1, d))) {
-                        displayY = accessor(data[i], -1, d);
-                    }
-                    i++;
-                }
-                if (displayY == null) {
-                    displayY = 0;
-                }
-                var nanData = [];
-                for (i = 0; i < data.length; i++) {
-                    if (!isNaN(accessor(data[i], -1, d))) {
-                        displayY = accessor(data[i], -1, d);
-                    }
-                    else {
-                        data[i].name = d.metadata().name;
-                        data[i].displayY = displayY;
-                        data[i].relative = VZ.ChartHelpers.relativeAccessor(data[i], -1, d);
-                        nanData.push(data[i]);
-                    }
-                }
-                return nanData;
-            };
-            var nanData = _.flatten(this.datasets.map(datasetToNaNData));
-            this.nanDataset.data(nanData);
-            var datasetToValues = function (d) {
-                return d.data().map(function (x) { return accessor(x, -1, d); });
-            };
-            var vals = _.flatten(this.datasets.map(datasetToValues));
-            vals = vals.filter(function (x) { return x === x && x !== Infinity && x !== -Infinity; });
-            var domain = VZ.ChartHelpers.computeDomain(vals, this._ignoreYOutliers);
-            this.yScale.domain(domain);
-        };
-        LineChart.prototype.setupTooltips = function (plot) {
-            var _this = this;
-            var pi = new Plottable.Interactions.Pointer();
-            pi.attachTo(plot);
-            // PointsComponent is a Plottable Component that will hold the little
-            // circles we draw over the closest data points
-            var pointsComponent = new Plottable.Component();
-            var group = new Plottable.Components.Group([plot, pointsComponent]);
-            var hideTooltips = function () {
-                _this.tooltip.style('opacity', 0);
-                _this.scatterPlot.attr('opacity', 1);
-                pointsComponent.content().selectAll('.point').remove();
-            };
-            var enabled = true;
-            var disableTooltips = function () {
-                enabled = false;
-                hideTooltips();
-            };
-            var enableTooltips = function () { enabled = true; };
-            this.dzl.interactionStart(disableTooltips);
-            this.dzl.interactionEnd(enableTooltips);
-            pi.onPointerMove(function (p) {
-                if (!enabled) {
-                    return;
-                }
-                var target = {
-                    x: p.x,
-                    y: p.y,
-                    datum: null,
-                    dataset: null,
-                };
-                var bbox = _this.gridlines.content().node().getBBox();
-                // pts is the closets point to the tooltip for each dataset
-                var pts = plot.datasets()
-                    .map(function (dataset) { return _this.findClosestPoint(target, dataset); })
-                    .filter(function (x) { return x != null; });
-                var intersectsBBox = Plottable.Utils.DOM.intersectsBBox;
-                // We draw tooltips for points that are NaN, or are currently visible
-                var ptsForTooltips = pts.filter(function (p) { return intersectsBBox(p.x, p.y, bbox) || isNaN(p.datum.scalar); });
-                // Only draw little indicator circles for the non-NaN points
-                var ptsToCircle = ptsForTooltips.filter(function (p) { return !isNaN(p.datum.scalar); });
-                var ptsSelection = pointsComponent.content().selectAll('.point').data(ptsToCircle, function (p) { return p.dataset.metadata().name; });
-                if (pts.length !== 0) {
-                    ptsSelection.enter().append('circle').classed('point', true);
-                    ptsSelection.attr('r', VZ.ChartHelpers.TOOLTIP_CIRCLE_SIZE)
-                        .attr('cx', function (p) { return p.x; })
-                        .attr('cy', function (p) { return p.y; })
-                        .style('stroke', 'none')
-                        .attr('fill', function (p) { return _this.colorScale.scale(p.dataset.metadata().name); });
-                    ptsSelection.exit().remove();
-                    _this.drawTooltips(ptsForTooltips, target);
-                }
-                else {
-                    hideTooltips();
-                }
-            });
-            pi.onPointerExit(hideTooltips);
-            return group;
-        };
-        LineChart.prototype.drawTooltips = function (points, target) {
-            var _this = this;
-            // Formatters for value, step, and wall_time
-            this.scatterPlot.attr('opacity', 0);
-            var valueFormatter = VZ.ChartHelpers.multiscaleFormatter(VZ.ChartHelpers.Y_TOOLTIP_FORMATTER_PRECISION);
-            var dist = function (p) {
-                return Math.pow(p.x - target.x, 2) + Math.pow(p.y - target.y, 2);
-            };
-            var closestDist = _.min(points.map(dist));
-            var valueSortMethod = this.scalarAccessor;
-            if (this.smoothingEnabled) {
-                valueSortMethod = this.smoothedAccessor;
-            }
-            if (this.tooltipSortingMethod === 'ascending') {
-                points =
-                    _.sortBy(points, function (d) { return valueSortMethod(d.datum, -1, d.dataset); });
-            }
-            else if (this.tooltipSortingMethod === 'descending') {
-                points =
-                    _.sortBy(points, function (d) { return valueSortMethod(d.datum, -1, d.dataset); })
-                        .reverse();
-            }
-            else if (this.tooltipSortingMethod === 'nearest') {
-                points = _.sortBy(points, dist);
-            }
-            else {
-                // The 'default' sorting method maintains the order of names passed to
-                // setVisibleSeries(). However we reverse that order when defining the
-                // datasets. So we must call reverse again to restore the order.
-                points = points.slice(0).reverse();
-            }
-            var rows = this.tooltip.select('tbody')
-                .html('')
-                .selectAll('tr')
-                .data(points)
-                .enter()
-                .append('tr');
-            // Grey out the point if any of the following are true:
-            // - The cursor is outside of the x-extent of the dataset
-            // - The point's y value is NaN
-            rows.classed('distant', function (d) {
-                var firstPoint = d.dataset.data()[0];
-                var lastPoint = _.last(d.dataset.data());
-                var firstX = _this.xScale.scale(_this.xAccessor(firstPoint, 0, d.dataset));
-                var lastX = _this.xScale.scale(_this.xAccessor(lastPoint, 0, d.dataset));
-                var s = _this.smoothingEnabled ? d.datum.smoothed : d.datum.scalar;
-                return target.x < firstX || target.x > lastX || isNaN(s);
-            });
-            rows.classed('closest', function (p) { return dist(p) === closestDist; });
-            // It is a bit hacky that we are manually applying the width to the swatch
-            // and the nowrap property to the text here. The reason is as follows:
-            // the style gets updated asynchronously by Polymer scopeSubtree observer.
-            // Which means we would get incorrect sizing information since the text
-            // would wrap by default. However, we need correct measurements so that
-            // we can stop the text from falling off the edge of the screen.
-            // therefore, we apply the size-critical styles directly.
-            rows.style('white-space', 'nowrap');
-            rows.append('td')
-                .append('span')
-                .classed('swatch', true)
-                .style('background-color', function (d) { return _this.colorScale.scale(d.dataset.metadata().name); });
-            rows.append('td').text(function (d) { return d.dataset.metadata().name; });
-            if (this.smoothingEnabled) {
-                rows.append('td').text(function (d) { return isNaN(d.datum.smoothed) ? 'NaN' :
-                    valueFormatter(d.datum.smoothed); });
-            }
-            rows.append('td').text(function (d) {
-                return isNaN(d.datum.scalar) ? 'NaN' : valueFormatter(d.datum.scalar);
-            });
-            rows.append('td').text(function (d) { return VZ.ChartHelpers.stepFormatter(d.datum.step); });
-            rows.append('td').text(function (d) { return VZ.ChartHelpers.timeFormatter(d.datum.wall_time); });
-            rows.append('td').text(function (d) { return VZ.ChartHelpers.relativeFormatter(VZ.ChartHelpers.relativeAccessor(d.datum, -1, d.dataset)); });
-            // compute left position
-            var documentWidth = document.body.clientWidth;
-            var node = this.tooltip.node();
-            var parentRect = node.parentElement.getBoundingClientRect();
-            var nodeRect = node.getBoundingClientRect();
-            // prevent it from falling off the right side of the screen
-            var left = documentWidth - parentRect.left - nodeRect.width - 60, top = 0;
-            if (this.tooltipPosition === 'right') {
-                left = Math.min(parentRect.width, left);
-            }
-            else {
-                left = Math.min(0, left);
-                top = parentRect.height + VZ.ChartHelpers.TOOLTIP_Y_PIXEL_OFFSET;
-            }
-            this.tooltip.style('transform', 'translate(' + left + 'px,' + top + 'px)');
-            this.tooltip.style('opacity', 1);
-        };
-        LineChart.prototype.findClosestPoint = function (target, dataset) {
-            var _this = this;
-            var points = dataset.data().map(function (d, i) {
-                var x = _this.xAccessor(d, i, dataset);
-                var y = _this.smoothingEnabled ? _this.smoothedAccessor(d, i, dataset) :
-                    _this.scalarAccessor(d, i, dataset);
-                return {
-                    x: _this.xScale.scale(x),
-                    y: _this.yScale.scale(y),
-                    datum: d,
-                    dataset: dataset,
-                };
-            });
-            var idx = _.sortedIndex(points, target, function (p) { return p.x; });
-            if (idx === points.length) {
-                return points[points.length - 1];
-            }
-            else if (idx === 0) {
-                return points[0];
-            }
-            else {
-                var prev = points[idx - 1];
-                var next = points[idx];
-                var prevDist = Math.abs(prev.x - target.x);
-                var nextDist = Math.abs(next.x - target.x);
-                return prevDist < nextDist ? prev : next;
-            }
-        };
-        LineChart.prototype.resmoothDataset = function (dataset) {
-            var data = dataset.data();
-            var smoothingWeight = this.smoothingWeight;
-            var last = data.length > 0 ? data[0].scalar : NaN;
-            data.forEach(function (d) {
-                if (!_.isFinite(last)) {
-                    d.smoothed = d.scalar;
-                }
-                else {
-                    // 1st-order IIR low-pass filter to attenuate the higher-
-                    // frequency components of the time-series.
-                    d.smoothed =
-                        last * smoothingWeight + (1 - smoothingWeight) * d.scalar;
-                }
-                last = d.smoothed;
-            });
-        };
-        LineChart.prototype.getDataset = function (name) {
-            if (this.name2datasets[name] === undefined) {
-                this.name2datasets[name] = new Plottable.Dataset([], { name: name });
-            }
-            return this.name2datasets[name];
-        };
-        LineChart.getYScaleFromType = function (yScaleType) {
-            if (yScaleType === 'log') {
-                return new Plottable.Scales.ModifiedLog();
-            }
-            else if (yScaleType === 'linear') {
-                return new Plottable.Scales.Linear();
-            }
-            else {
-                throw new Error('Unrecognized yScale type ' + yScaleType);
-            }
-        };
-        /**
-         * Update the selected series on the chart.
-         */
-        LineChart.prototype.setVisibleSeries = function (names) {
-            var _this = this;
-            names = names.sort();
-            this.seriesNames = names;
-            names.reverse(); // draw first series on top
-            this.datasets.forEach(function (d) { return d.offUpdate(_this.onDatasetChanged); });
-            this.datasets = names.map(function (r) { return _this.getDataset(r); });
-            this.datasets.forEach(function (d) { return d.onUpdate(_this.onDatasetChanged); });
-            this.linePlot.datasets(this.datasets);
-            if (this.smoothingEnabled) {
-                this.smoothLinePlot.datasets(this.datasets);
-            }
-            this.updateSpecialDatasets();
-        };
-        /**
-         * Set the data of a series on the chart.
-         */
-        LineChart.prototype.setSeriesData = function (name, data) {
-            this.getDataset(name).data(data);
-        };
-        LineChart.prototype.smoothingUpdate = function (weight) {
-            var _this = this;
-            this.smoothingWeight = weight;
-            this.datasets.forEach(function (d) { return _this.resmoothDataset(d); });
-            if (!this.smoothingEnabled) {
-                this.linePlot.addClass('ghost');
-                this.scatterPlot.y(this.smoothedAccessor, this.yScale);
-                this.smoothingEnabled = true;
-                this.smoothLinePlot.datasets(this.datasets);
-            }
-            this.updateSpecialDatasetsWithAccessor(this.smoothedAccessor);
-        };
-        LineChart.prototype.smoothingDisable = function () {
-            if (this.smoothingEnabled) {
-                this.linePlot.removeClass('ghost');
-                this.scatterPlot.y(this.scalarAccessor, this.yScale);
-                this.smoothLinePlot.datasets([]);
-                this.smoothingEnabled = false;
-                this.updateSpecialDatasetsWithAccessor(this.scalarAccessor);
-            }
-        };
-        LineChart.prototype.setTooltipSortingMethod = function (method) {
-            this.tooltipSortingMethod = method;
-        };
-        LineChart.prototype.setTooltipPosition = function (position) {
-            this.tooltipPosition = position;
-        };
-        LineChart.prototype.renderTo = function (targetSVG) {
-            this.targetSVG = targetSVG;
-            this.setViewBox();
-            this.outer.renderTo(targetSVG);
-        };
-        /** There's an issue in Chrome where the svg overflow is a bit
-         * "flickery". There is a border on the gridlines on the extreme edge of the
-         * chart, which behaves inconsistently and causes the screendiffing tests to
-         * flake. We can solve this by creating 1px effective margin for the svg by
-         * setting the viewBox on the containing svg.
-         */
-        LineChart.prototype.setViewBox = function () {
-            // There's an issue in Firefox where if we measure with the old viewbox
-            // set, we get horrible results.
-            this.targetSVG.attr('viewBox', null);
-            var parent = this.targetSVG.node().parentNode;
-            var w = parent.clientWidth;
-            var h = parent.clientHeight;
-            this.targetSVG.attr({
-                'height': h,
-                'viewBox': "0 0 " + (w + 1) + " " + (h + 1),
-            });
-        };
-        LineChart.prototype.redraw = function () {
-            this.outer.redraw();
-            this.setViewBox();
-        };
-        LineChart.prototype.destroy = function () { this.outer.destroy(); };
-        return LineChart;
-    }());
-    VZ.LineChart = LineChart;
-})(VZ || (VZ = {}));
-</script>
-  <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-var VZ;
-(function (VZ) {
-    var ChartHelpers;
-    (function (ChartHelpers) {
-        ChartHelpers.Y_TOOLTIP_FORMATTER_PRECISION = 4;
-        ChartHelpers.STEP_FORMATTER_PRECISION = 4;
-        ChartHelpers.Y_AXIS_FORMATTER_PRECISION = 3;
-        ChartHelpers.TOOLTIP_Y_PIXEL_OFFSET = 20;
-        ChartHelpers.TOOLTIP_CIRCLE_SIZE = 4;
-        ChartHelpers.NAN_SYMBOL_SIZE = 6;
-        /* Create a formatter function that will switch between exponential and
-         * regular display depending on the scale of the number being formatted,
-         * and show `digits` significant digits.
-         */
-        function multiscaleFormatter(digits) {
-            return function (v) {
-                var absv = Math.abs(v);
-                if (absv < 1E-15) {
-                    // Sometimes zero-like values get an annoying representation
-                    absv = 0;
-                }
-                var f;
-                if (absv >= 1E4) {
-                    f = d3.format('.' + digits + 'e');
-                }
-                else if (absv > 0 && absv < 0.01) {
-                    f = d3.format('.' + digits + 'e');
-                }
-                else {
-                    f = d3.format('.' + digits + 'g');
-                }
-                return f(v);
-            };
-        }
-        ChartHelpers.multiscaleFormatter = multiscaleFormatter;
-        /* Compute an appropriate domain given an array of all the values that are
-         * going to be displayed. If ignoreOutliers is true, it will ignore the
-         * lowest 10% and highest 10% of the data when computing a domain.
-         * It has n log n performance when ignoreOutliers is true, as it needs to
-         * sort the data.
-         */
-        function computeDomain(values, ignoreOutliers) {
-            if (values.length === 0) {
-                return [-0.1, 1.1];
-            }
-            var a;
-            var b;
-            if (ignoreOutliers) {
-                var sorted = _.sortBy(values);
-                a = d3.quantile(sorted, 0.05);
-                b = d3.quantile(sorted, 0.95);
-            }
-            else {
-                a = d3.min(values);
-                b = d3.max(values);
-            }
-            var padding;
-            var span = b - a;
-            if (span === 0) {
-                // If b===a, we would create an empty range. We instead select the range
-                // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
-                // extra padding on the top and bottom of the plot.
-                padding = Math.abs(a) * 1.1 + 1.1;
-            }
-            else {
-                padding = span * 0.2;
-            }
-            var lower;
-            if (a >= 0 && a < span) {
-                // We include the intercept (y = 0) if doing so less than doubles the span
-                // of the y-axis. (We actually select a lower bound that's slightly less
-                // than 0 so that 0.00 will clearly be written on the lower edge of the
-                // chart. The label on the lowest tick is often filtered out.)
-                lower = -0.1 * b;
-            }
-            else {
-                lower = a - padding;
-            }
-            var domain = [lower, b + padding];
-            domain = d3.scale.linear().domain(domain).nice().domain();
-            return domain;
-        }
-        ChartHelpers.computeDomain = computeDomain;
-        function accessorize(key) {
-            return function (d, index, dataset) { return d[key]; };
-        }
-        ChartHelpers.accessorize = accessorize;
-        ChartHelpers.stepFormatter = Plottable.Formatters.siSuffix(ChartHelpers.STEP_FORMATTER_PRECISION);
-        function stepX() {
-            var scale = new Plottable.Scales.Linear();
-            var axis = new Plottable.Axes.Numeric(scale, 'bottom');
-            axis.formatter(ChartHelpers.stepFormatter);
-            return {
-                scale: scale,
-                axis: axis,
-                accessor: function (d) { return d.step; },
-            };
-        }
-        ChartHelpers.stepX = stepX;
-        ChartHelpers.timeFormatter = Plottable.Formatters.time('%a %b %e, %H:%M:%S');
-        function wallX() {
-            var scale = new Plottable.Scales.Time();
-            return {
-                scale: scale,
-                axis: new Plottable.Axes.Time(scale, 'bottom'),
-                accessor: function (d) { return d.wall_time; },
-            };
-        }
-        ChartHelpers.wallX = wallX;
-        ChartHelpers.relativeAccessor = function (d, index, dataset) {
-            // We may be rendering the final-point datum for scatterplot.
-            // If so, we will have already provided the 'relative' property
-            if (d.relative != null) {
-                return d.relative;
-            }
-            var data = dataset.data();
-            // I can't imagine how this function would be called when the data is
-            // empty (after all, it iterates over the data), but lets guard just
-            // to be safe.
-            var first = data.length > 0 ? +data[0].wall_time : 0;
-            return (+d.wall_time - first) / (60 * 60 * 1000); // ms to hours
-        };
-        ChartHelpers.relativeFormatter = function (n) {
-            // we will always show 2 units of precision, e.g days and hours, or
-            // minutes and seconds, but not hours and minutes and seconds
-            var ret = '';
-            var days = Math.floor(n / 24);
-            n -= (days * 24);
-            if (days) {
-                ret += days + 'd ';
-            }
-            var hours = Math.floor(n);
-            n -= hours;
-            n *= 60;
-            if (hours || days) {
-                ret += hours + 'h ';
-            }
-            var minutes = Math.floor(n);
-            n -= minutes;
-            n *= 60;
-            if (minutes || hours || days) {
-                ret += minutes + 'm ';
-            }
-            var seconds = Math.floor(n);
-            return ret + seconds + 's';
-        };
-        function relativeX() {
-            var scale = new Plottable.Scales.Linear();
-            return {
-                scale: scale,
-                axis: new Plottable.Axes.Numeric(scale, 'bottom'),
-                accessor: ChartHelpers.relativeAccessor,
-            };
-        }
-        ChartHelpers.relativeX = relativeX;
-        // a very literal definition of NaN: true for NaN for a non-number type
-        // or null, etc. False for Infinity or -Infinity
-        ChartHelpers.isNaN = function (x) { return +x !== x; };
-        function getXComponents(xType) {
-            switch (xType) {
-                case 'step':
-                    return stepX();
-                case 'wall_time':
-                    return wallX();
-                case 'relative':
-                    return relativeX();
-                default:
-                    throw new Error('invalid xType: ' + xType);
-            }
-        }
-        ChartHelpers.getXComponents = getXComponents;
-    })(ChartHelpers = VZ.ChartHelpers || (VZ.ChartHelpers = {}));
-})(VZ || (VZ = {}));
-</script>
-  <script>
-    Polymer({
-      is: "vz-line-chart",
-      properties: {
-        /**
-         * Scale that maps series names to colors. The default colors are from
-         * d3.scale.category10() scale. Use this property to replace the default
-         * line colors with colors of your own choice.
-         * @type {Plottable.Scales.Color}
-         * @required
-         */
-        colorScale: {
-          type: Object,
-          value: function() {
-            return new Plottable.Scales.Color()
-                .range(d3.scale.category10().range());
-          }
-        },
-
-        /**
-         * Whether smoothing is enabled or not. If true, smoothed lines will be
-         * plotted in the chart while the unsmoothed lines will be ghosted in
-         * the background.
-         *
-         * The smoothing algorithm is a simple moving average, which, given a
-         * point p and a window w, replaces p with a simple average of the
-         * points in the [p - floor(w/2), p + floor(w/2)] range.  If there
-         * aren't enough points to cover the entire window to the left, the
-         * window is reduced to fit exactly the amount of elements available.
-         * This means that the smoothed line will be less in and gradually
-         * become more smooth until the desired window is reached. However when
-         * there aren't enough points on the right, the line stops being
-         * rendered at all.
-         */
-        smoothingEnabled: {
-          type: Boolean,
-          value: false
-        },
-
-        /**
-         * Weight (between 0.0 and 1.0) of the smoothing. This weight controls
-         * the window size, and a weight of 1.0 means using 50% of the entire
-         * dataset as the window, while a weight of 0.0 means using a window of
-         * 0 (and thus replacing each point with themselves).
-         *
-         * The growth between 0.0 and 1.0 is not linear though. Because
-         * changing the window from 0% to 30% of the dataset smooths the line a
-         * lot more than changing the window from 70% to 100%, an exponential
-         * function is used instead: http://i.imgur.com/bDrhEZU.png. This
-         * function increases the size of the window slowly at the beginning
-         * and gradually speeds up the growth, but 0.0 still means a window of
-         * 0 and 1.0 still means a window of the dataset's length.
-         */
-        smoothingWeight: {
-          type: Number,
-          value: 0.6
-        },
-
-        /**
-         * The way to display the X values. Allows:
-         * - "step" - Linear scale using the  "step" property of the datum.
-         * - "wall_time" - Temporal scale using the "wall_time" property of the
-         * datum.
-         * - "relative" - Temporal scale using the "relative" property of the
-         * datum if it is present or calculating from "wall_time" if it isn't.
-         */
-        xType: {
-          type: String,
-          value: 'step'
-        },
-
-        /**
-         * The scale for the y-axis. Allows:
-         * - "linear" - linear scale (Plottable.Scales.Linear)
-         * - "log" - modified-log scale (Plottable.Scales.ModifiedLog)
-         */
-        yScaleType: {
-          type: String,
-          value: 'linear'
-        },
-
-        /**
-         * Whether to ignore outlier data when computing the yScale domain.
-         */
-
-        ignoreYOutliers: {
-          type: Boolean,
-          value: false,
-        },
-
-        /**
-         * Change how the tooltip is sorted. Allows:
-         * - "default" - Sort the tooltip by input order.
-         * - "ascending" - Sort the tooltip by ascending value.
-         * - "descending" - Sort the tooltip by descending value.
-         * - "nearest" - Sort the tooltip by closest to cursor.
-         */
-        tooltipSortingMethod: {
-          type: String,
-          value: 'default'
-        },
-
-        /**
-         * Change how the tooltip is positioned. Allows:
-         * - "bottom" - Position the tooltip on the bottom of the chart.
-         * - "right" - Position the tooltip to the right of the chart.
-         */
-        tooltipPosition: {
-          type: String,
-          value: 'bottom'
-        },
-
-        _attached: Boolean,
-        _chart: Object,
-        _visibleSeriesCache: {
-          type: Array,
-          value: function() { return [] }
-        },
-        _seriesDataCache: {
-          type: Object,
-          value: function() { return {} }
-        },
-        _makeChartAsyncCallbackId: {
-          type: Number,
-          value: null
-        }
-      },
-      observers: [
-        "_makeChart(xType, yScaleType, colorScale, _attached)",
-        "_reloadFromCache(_chart)",
-        "_smoothingChanged(smoothingEnabled, smoothingWeight, _chart)",
-        "_tooltipSortingMethodChanged(tooltipSortingMethod, _chart)",
-        "_tooltipPositionChanged(tooltipPosition, _chart)",
-        "_outliersChanged(ignoreYOutliers, _chart)"
-      ],
-
-      /**
-       * Sets the series that the chart displays. Series with other names will
-       * not be displayed.
-       *
-       * @param {String[]} names Array with the names of the series to
-       * display.
-       */
-      setVisibleSeries: function(names) {
-        this._visibleSeriesCache = names;
-        if (this._chart) {
-          this._chart.setVisibleSeries(names);
-          this.redraw();
-        }
-      },
-
-      /**
-       * Sets the data of one of the series. Note that to display this series
-       * its name must be in the setVisibleSeries() array.
-       *
-       * @param {String} name Name of the series.
-       * @param {VZ.ChartHelpers.ScalarDatum[]} data Data of the series. This is
-       * an array of objects with at least the following properties:
-       * - step: (Number) - index of the datum.
-       * - wall_time: (Date) - Date object with the datum's time.
-       * - scalar: (Number) - Value of the datum.
-       */
-      setSeriesData: function(name, data) {
-        this._seriesDataCache[name] = data;
-        if (this._chart) {
-          this._chart.setSeriesData(name, data);
-        }
-      },
-
-      /**
-       * Re-renders the chart. Useful if e.g. the container size changed.
-       */
-      redraw: function() {
-        this._chart.redraw();
-      },
-      attached: function() {
-        this._attached = true;
-      },
-      detached: function() {
-        this._attached = false;
-      },
-      ready: function() {
-        this.scopeSubtree(this.$.tooltip, true);
-        this.scopeSubtree(this.$.chartsvg, true);
-      },
-      _makeChart: function(xType, yScaleType, colorScale, _attached) {
-        if (this._makeChartAsyncCallbackId !== null) {
-          this.cancelAsync(this._makeChartAsyncCallbackId);
-          this._makeChartAsyncCallbackId = null;
-        }
-
-        this._makeChartAsyncCallbackId = this.async(function() {
-          this._makeChartAsyncCallbackId = null;
-          if (!this._attached) return;
-          if (this._chart) this._chart.destroy();
-          var tooltip = d3.select(this.$.tooltip);
-          var chart = new VZ.LineChart(xType, yScaleType, colorScale, tooltip);
-          var svg = d3.select(this.$.chartsvg);
-          chart.renderTo(svg);
-          this._chart = chart;
-        }, 350);
-      },
-      _reloadFromCache: function() {
-        if(this._chart) {
-          this._chart.setVisibleSeries(this._visibleSeriesCache);
-          this._visibleSeriesCache.forEach(function(name) {
-            this._chart.setSeriesData(name, this._seriesDataCache[name] || []);
-          }.bind(this));
-        }
-      },
-      _smoothingChanged: function() {
-        if(!this._chart) {
-          return;
-        }
-        if(this.smoothingEnabled) {
-          this._chart.smoothingUpdate(this.smoothingWeight);
-        }
-        else {
-          this._chart.smoothingDisable();
-        }
-      },
-      _outliersChanged: function() {
-        if (!this._chart) {
-          return;
-        }
-        this._chart.ignoreYOutliers(this.ignoreYOutliers);
-      },
-      _tooltipSortingMethodChanged: function() {
-        if(this._chart) {
-          this._chart.setTooltipSortingMethod(this.tooltipSortingMethod);
-        }
-      },
-      _tooltipPositionChanged: function() {
-        if (this._chart) {
-          this._chart.setTooltipPosition(this.tooltipPosition);
-        }
-      }
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-scalar-dashboard" assetpath="../tf-scalar-dashboard/">
-  <template>
-    <div id="plumbing">
-      <tf-color-scale id="colorScale" runs="[[runs]]" out-color-scale="{{_colorScale}}"></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper backend="[[backend]]" categories="{{_categories}}" color-scale="[[_colorScale]]" run2tag="[[run2tag]]" runs="[[runs]]" selected-runs="{{_selectedRuns}}">
-          <div class="extend-first-section">
-            <div class="line-item">
-              <paper-checkbox id="download-option" checked="{{_showDownloadLinks}}">Show data download links</paper-checkbox>
-            </div>
-              <div class="line-item">
-                <paper-checkbox id="outliersCheckbox" checked="{{_ignoreYOutliers}}">Ignore outliers in chart scaling</paper-checkbox>
-              </div>
-            <div id="tooltip-sorting">
-              <div id="tooltip-sorting-label">Tooltip sorting method:</div>
-              <paper-dropdown-menu no-label-float="" selected-item-label="{{_tooltipSortingMethod}}">
-                <paper-menu class="dropdown-content" selected="0">
-                  <paper-item>default</paper-item>
-                  <paper-item>descending</paper-item>
-                  <paper-item>ascending</paper-item>
-                  <paper-item>nearest</paper-item>
-                </paper-menu>
-              </paper-dropdown-menu>
-            </div>
-          </div>
-          <div class="sidebar-section">
-            <tf-smoothing-input weight="{{_smoothingWeight}}" step="0.001" min="0" max="1"></tf-smoothing-input>
-          </div>
-          <div class="sidebar-section">
-            <tf-option-selector id="xTypeSelector" name="Horizontal Axis" selected-id="{{_xType}}">
-              <paper-button id="step">step</paper-button>
-              <paper-button id="relative">relative</paper-button>
-              <paper-button id="wall_time">wall</paper-button>
-            </tf-option-selector>
-          </div>
-        </tf-sidebar-helper>
-      </div>
-      <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" show-download-links="[[_showDownloadLinks]]" download-link-url-function="[[scalarUrl]]">
-          <template>
-            <vz-line-chart x-type="[[_xType]]" color-scale="[[_colorScale]]" smoothing-enabled="[[_smoothingEnabled]]" smoothing-weight="[[_smoothingWeight]]" tooltip-sorting-method="[[_tooltipSortingMethod]]" ignore-y-outliers="[[_ignoreYOutliers]]"></vz-line-chart>
-            <paper-icon-button class="log-button" icon="line-weight" on-tap="toggleLogScale" title="Toggle y-axis log scale"></paper-icon-button>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-
-    <style include="dashboard-style"></style>
-    <style>
-      .log-button {
-        position: absolute;
-        left: 35px;
-        bottom: -35px;
-        color: #2196F3;
-        background: #fff;
-        width: 32px;
-        height: 32px;
-        padding: 4px;
-        border-radius: 100%;
-      }
-
-      .log-button-selected {
-        background: var(--tb-ui-light-accent);
-      }
-
-      #tooltip-sorting {
-        display: flex;
-        font-size: 14px;
-        margin-top: 5px;
-      }
-
-      #tooltip-sorting-label {
-        margin-top: 13px;
-        margin-left: 28px;
-      }
-
-      #tooltip-sorting paper-dropdown-menu {
-        margin-left: 10px;
-        --paper-input-container-focus-color: var(--tb-orange-strong);
-        width: 105px;
-      }
-      .line-item {
-        display: block;
-        padding-top: 5px;
-      }
-    </style>
-
-  </template>
-
-  <script>
-    TF.Dashboard.TfScalarDashboard = Polymer({
-      is: "tf-scalar-dashboard",
-      factoryImpl: function(backend, router) {
-        this.backend = backend;
-        this.router = router;
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("scalars"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "scalar"
-        },
-        router: Object,
-        scalarUrl: {
-          type: Function,
-          computed: "_getScalarUrl(router)"
-        },
-        _showDownloadLinks: {
-          type: Boolean,
-          notify: true,
-          value: TF.URIStorage.getBooleanInitializer('_showDownloadLinks',
-              false, true),
-          observer: '_showDownloadLinksObserver'
-        },
-        _smoothingWeight: {
-          type: Number,
-          notify: true,
-          value: TF.URIStorage.getNumberInitializer('_smoothingWeight', 0.6),
-          observer: '_smoothingWeightObserver'
-        },
-        _smoothingEnabled: {
-          type: Boolean,
-          computed: '_computeSmoothingEnabled(_smoothingWeight)'
-        },
-        _ignoreYOutliers: {
-          type: Boolean,
-          value: TF.URIStorage.getBooleanInitializer('_ignoreYOutliers', true, true),
-          observer: '_ignoreYOutliersObserver',
-        },
-        _xType: {
-          type: String,
-          value: "step"
-        }
-      },
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _getScalarUrl: function() {
-        return this.router.scalars;
-      },
-      _showDownloadLinksObserver: TF.URIStorage.getBooleanObserver(
-          '_showDownloadLinks', /*default=*/ false, /*useLocalStorage=*/ true),
-      _smoothingWeightObserver: TF.URIStorage.getNumberObserver(
-          '_smoothingWeight', 0.6),
-      _ignoreYOutliersObserver: TF.URIStorage.getBooleanObserver(
-          '_ignoreYOutliers', /*default=*/ true, /*useLocalStorage=*/true),
-      _computeSmoothingEnabled: function(_smoothingWeight) {
-        return _smoothingWeight > 0;
-      },
-      toggleLogScale: function(e) {
-        var currentTarget = Polymer.dom(e.currentTarget);
-        var button = currentTarget.parentNode.querySelector('.log-button');
-        var chart = currentTarget.parentNode.querySelector('vz-line-chart');
-
-        button.classList.toggle("log-button-selected");
-        chart.yScaleType = chart.yScaleType === 'log' ? 'linear' : 'log';
-        chart.redraw();
-      },
-    });
-  </script>
-</dom-module>
-<dom-module id="vz-distribution-chart" assetpath="../vz-distribution-chart/">
-  <template>
-    <svg id="chartsvg"></svg>
-    <style>
-      :host {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        display: flex;
-        flex-direction: column;
-        flex-grow: 1;
-        flex-shrink: 1;
-        position: relative;
-      }
-      svg {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        flex-grow: 1;
-        flex-shrink: 1;
-      }
-
-    </style>
-  </template>
-  <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-var VZ;
-(function (VZ) {
-    var DistributionChart = (function () {
-        function DistributionChart(xType, colorScale) {
-            this.run2datasets = {};
-            this.colorScale = colorScale;
-            this.buildChart(xType);
-        }
-        DistributionChart.prototype.getDataset = function (run) {
-            if (this.run2datasets[run] === undefined) {
-                this.run2datasets[run] = new Plottable.Dataset([], { run: run });
-            }
-            return this.run2datasets[run];
-        };
-        DistributionChart.prototype.buildChart = function (xType) {
-            if (this.outer) {
-                this.outer.destroy();
-            }
-            var xComponents = VZ.ChartHelpers.getXComponents(xType);
-            this.xAccessor = xComponents.accessor;
-            this.xScale = xComponents.scale;
-            this.xAxis = xComponents.axis;
-            this.xAxis.margin(0).tickLabelPadding(3);
-            this.yScale = new Plottable.Scales.Linear();
-            this.yAxis = new Plottable.Axes.Numeric(this.yScale, 'left');
-            var yFormatter = VZ.ChartHelpers.multiscaleFormatter(VZ.ChartHelpers.Y_AXIS_FORMATTER_PRECISION);
-            this.yAxis.margin(0).tickLabelPadding(5).formatter(yFormatter);
-            this.yAxis.usesTextWidthApproximation(true);
-            var center = this.buildPlot(this.xAccessor, this.xScale, this.yScale);
-            this.gridlines =
-                new Plottable.Components.Gridlines(this.xScale, this.yScale);
-            this.center = new Plottable.Components.Group([this.gridlines, center]);
-            this.outer = new Plottable.Components.Table([[this.yAxis, this.center], [null, this.xAxis]]);
-        };
-        DistributionChart.prototype.buildPlot = function (xAccessor, xScale, yScale) {
-            var _this = this;
-            var percents = [0, 228, 1587, 3085, 5000, 6915, 8413, 9772, 10000];
-            var opacities = _.range(percents.length - 1)
-                .map(function (i) { return (percents[i + 1] - percents[i]) / 2500; });
-            var accessors = percents.map(function (p, i) { return function (datum) { return datum[i][1]; }; });
-            var median = 4;
-            var medianAccessor = accessors[median];
-            var plots = _.range(accessors.length - 1).map(function (i) {
-                var p = new Plottable.Plots.Area();
-                p.x(xAccessor, xScale);
-                var y0 = i > median ? accessors[i] : accessors[i + 1];
-                var y = i > median ? accessors[i + 1] : accessors[i];
-                p.y(y, yScale);
-                p.y0(y0);
-                p.attr('fill', function (d, i, dataset) {
-                    return _this.colorScale.scale(dataset.metadata().run);
-                });
-                p.attr('stroke', function (d, i, dataset) {
-                    return _this.colorScale.scale(dataset.metadata().run);
-                });
-                p.attr('stroke-weight', function (d, i, m) { return '0.5px'; });
-                p.attr('stroke-opacity', function () { return opacities[i]; });
-                p.attr('fill-opacity', function () { return opacities[i]; });
-                return p;
-            });
-            var medianPlot = new Plottable.Plots.Line();
-            medianPlot.x(xAccessor, xScale);
-            medianPlot.y(medianAccessor, yScale);
-            medianPlot.attr('stroke', function (d, i, m) { return _this.colorScale.scale(m.run); });
-            this.plots = plots;
-            return new Plottable.Components.Group(plots);
-        };
-        DistributionChart.prototype.setVisibleSeries = function (runs) {
-            var _this = this;
-            this.runs = runs;
-            var datasets = runs.map(function (r) { return _this.getDataset(r); });
-            this.plots.forEach(function (p) { return p.datasets(datasets); });
-        };
-        /**
-         * Set the data of a series on the chart.
-         */
-        DistributionChart.prototype.setSeriesData = function (name, data) {
-            this.getDataset(name).data(data);
-        };
-        DistributionChart.prototype.renderTo = function (targetSVG) {
-            this.targetSVG = targetSVG;
-            this.setViewBox();
-            this.outer.renderTo(targetSVG);
-        };
-        /** There's an issue in Chrome where the svg overflow is a bit
-         * "flickery". There is a border on the gridlines on the extreme edge of the
-         * chart, which behaves inconsistently and causes the screendiffing tests to
-         * flake. We can solve this by creating 1px effective margin for the svg by
-         * setting the viewBox on the containing svg.
-         */
-        DistributionChart.prototype.setViewBox = function () {
-            // There's an issue in Firefox where if we measure with the old viewbox
-            // set, we get horrible results.
-            this.targetSVG.attr('viewBox', null);
-            var parent = this.targetSVG.node().parentNode;
-            var w = parent.clientWidth;
-            var h = parent.clientHeight;
-            this.targetSVG.attr({
-                'height': h,
-                'viewBox': "0 0 " + (w + 1) + " " + (h + 1),
-            });
-        };
-        DistributionChart.prototype.redraw = function () {
-            this.outer.redraw();
-            this.setViewBox();
-        };
-        DistributionChart.prototype.destroy = function () { this.outer.destroy(); };
-        return DistributionChart;
-    }());
-    VZ.DistributionChart = DistributionChart;
-})(VZ || (VZ = {}));
-</script>
-  <script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-var VZ;
-(function (VZ) {
-    var ChartHelpers;
-    (function (ChartHelpers) {
-        ChartHelpers.Y_TOOLTIP_FORMATTER_PRECISION = 4;
-        ChartHelpers.STEP_FORMATTER_PRECISION = 4;
-        ChartHelpers.Y_AXIS_FORMATTER_PRECISION = 3;
-        ChartHelpers.TOOLTIP_Y_PIXEL_OFFSET = 20;
-        ChartHelpers.TOOLTIP_CIRCLE_SIZE = 4;
-        ChartHelpers.NAN_SYMBOL_SIZE = 6;
-        /* Create a formatter function that will switch between exponential and
-         * regular display depending on the scale of the number being formatted,
-         * and show `digits` significant digits.
-         */
-        function multiscaleFormatter(digits) {
-            return function (v) {
-                var absv = Math.abs(v);
-                if (absv < 1E-15) {
-                    // Sometimes zero-like values get an annoying representation
-                    absv = 0;
-                }
-                var f;
-                if (absv >= 1E4) {
-                    f = d3.format('.' + digits + 'e');
-                }
-                else if (absv > 0 && absv < 0.01) {
-                    f = d3.format('.' + digits + 'e');
-                }
-                else {
-                    f = d3.format('.' + digits + 'g');
-                }
-                return f(v);
-            };
-        }
-        ChartHelpers.multiscaleFormatter = multiscaleFormatter;
-        /* Compute an appropriate domain given an array of all the values that are
-         * going to be displayed. If ignoreOutliers is true, it will ignore the
-         * lowest 10% and highest 10% of the data when computing a domain.
-         * It has n log n performance when ignoreOutliers is true, as it needs to
-         * sort the data.
-         */
-        function computeDomain(values, ignoreOutliers) {
-            if (values.length === 0) {
-                return [-0.1, 1.1];
-            }
-            var a;
-            var b;
-            if (ignoreOutliers) {
-                var sorted = _.sortBy(values);
-                a = d3.quantile(sorted, 0.05);
-                b = d3.quantile(sorted, 0.95);
-            }
-            else {
-                a = d3.min(values);
-                b = d3.max(values);
-            }
-            var padding;
-            var span = b - a;
-            if (span === 0) {
-                // If b===a, we would create an empty range. We instead select the range
-                // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
-                // extra padding on the top and bottom of the plot.
-                padding = Math.abs(a) * 1.1 + 1.1;
-            }
-            else {
-                padding = span * 0.2;
-            }
-            var lower;
-            if (a >= 0 && a < span) {
-                // We include the intercept (y = 0) if doing so less than doubles the span
-                // of the y-axis. (We actually select a lower bound that's slightly less
-                // than 0 so that 0.00 will clearly be written on the lower edge of the
-                // chart. The label on the lowest tick is often filtered out.)
-                lower = -0.1 * b;
-            }
-            else {
-                lower = a - padding;
-            }
-            var domain = [lower, b + padding];
-            domain = d3.scale.linear().domain(domain).nice().domain();
-            return domain;
-        }
-        ChartHelpers.computeDomain = computeDomain;
-        function accessorize(key) {
-            return function (d, index, dataset) { return d[key]; };
-        }
-        ChartHelpers.accessorize = accessorize;
-        ChartHelpers.stepFormatter = Plottable.Formatters.siSuffix(ChartHelpers.STEP_FORMATTER_PRECISION);
-        function stepX() {
-            var scale = new Plottable.Scales.Linear();
-            var axis = new Plottable.Axes.Numeric(scale, 'bottom');
-            axis.formatter(ChartHelpers.stepFormatter);
-            return {
-                scale: scale,
-                axis: axis,
-                accessor: function (d) { return d.step; },
-            };
-        }
-        ChartHelpers.stepX = stepX;
-        ChartHelpers.timeFormatter = Plottable.Formatters.time('%a %b %e, %H:%M:%S');
-        function wallX() {
-            var scale = new Plottable.Scales.Time();
-            return {
-                scale: scale,
-                axis: new Plottable.Axes.Time(scale, 'bottom'),
-                accessor: function (d) { return d.wall_time; },
-            };
-        }
-        ChartHelpers.wallX = wallX;
-        ChartHelpers.relativeAccessor = function (d, index, dataset) {
-            // We may be rendering the final-point datum for scatterplot.
-            // If so, we will have already provided the 'relative' property
-            if (d.relative != null) {
-                return d.relative;
-            }
-            var data = dataset.data();
-            // I can't imagine how this function would be called when the data is
-            // empty (after all, it iterates over the data), but lets guard just
-            // to be safe.
-            var first = data.length > 0 ? +data[0].wall_time : 0;
-            return (+d.wall_time - first) / (60 * 60 * 1000); // ms to hours
-        };
-        ChartHelpers.relativeFormatter = function (n) {
-            // we will always show 2 units of precision, e.g days and hours, or
-            // minutes and seconds, but not hours and minutes and seconds
-            var ret = '';
-            var days = Math.floor(n / 24);
-            n -= (days * 24);
-            if (days) {
-                ret += days + 'd ';
-            }
-            var hours = Math.floor(n);
-            n -= hours;
-            n *= 60;
-            if (hours || days) {
-                ret += hours + 'h ';
-            }
-            var minutes = Math.floor(n);
-            n -= minutes;
-            n *= 60;
-            if (minutes || hours || days) {
-                ret += minutes + 'm ';
-            }
-            var seconds = Math.floor(n);
-            return ret + seconds + 's';
-        };
-        function relativeX() {
-            var scale = new Plottable.Scales.Linear();
-            return {
-                scale: scale,
-                axis: new Plottable.Axes.Numeric(scale, 'bottom'),
-                accessor: ChartHelpers.relativeAccessor,
-            };
-        }
-        ChartHelpers.relativeX = relativeX;
-        // a very literal definition of NaN: true for NaN for a non-number type
-        // or null, etc. False for Infinity or -Infinity
-        ChartHelpers.isNaN = function (x) { return +x !== x; };
-        function getXComponents(xType) {
-            switch (xType) {
-                case 'step':
-                    return stepX();
-                case 'wall_time':
-                    return wallX();
-                case 'relative':
-                    return relativeX();
-                default:
-                    throw new Error('invalid xType: ' + xType);
-            }
-        }
-        ChartHelpers.getXComponents = getXComponents;
-    })(ChartHelpers = VZ.ChartHelpers || (VZ.ChartHelpers = {}));
-})(VZ || (VZ = {}));
-</script>
-  <script>
-    Polymer({
-      is: "vz-distribution-chart",
-      properties: {
-        /**
-         * Scale that maps series names to colors. The default colors are from
-         * d3.scale.category10() scale. Use this property to replace the default
-         * line colors with colors of your own choice.
-         * @type {Plottable.Scales.Color}
-         * @required
-         */
-        colorScale: {
-          type: Object,
-          value: function() {
-            return new Plottable.Scales.Color()
-                .range(d3.scale.category10().range());
-          }
-        },
-        /**
-         * The way to display the X values. Allows:
-         * - "step" - Linear scale using the  "step" property of the datum.
-         * - "wall_time" - Temporal scale using the "wall_time" property of the
-         * datum.
-         * - "relative" - Temporal scale using the "relative" property of the
-         * datum if it is present or calculating from "wall_time" if it isn't.
-         */
-        xType: {
-          type: String,
-          value: 'step'
-        },
-        _attached: Boolean,
-        _chart: Object,
-        _visibleSeriesCache: {
-          type: Array,
-          value: function() { return [] }
-        },
-        _seriesDataCache: {
-          type: Object,
-          value: function() { return {} }
-        },
-        _makeChartAsyncCallbackId: { type: Number, value: null }
-      },
-      observers: [
-        "_makeChart(xType, colorScale, _attached)",
-        "_reloadFromCache(_chart)",
-      ],
-      setVisibleSeries: function(names) {
-        this._visibleSeriesCache = names;
-        if (this._chart) {
-          this._chart.setVisibleSeries(names);
-          this.redraw();
-        }
-      },
-      setSeriesData: function(name, data) {
-        this._seriesDataCache[name] = data;
-        if (this._chart) {
-          this._chart.setSeriesData(name, data);
-        }
-      },
-      redraw: function() {
-        this._chart.redraw();
-      },
-      ready: function() {
-        this.scopeSubtree(this.$.chartsvg, true);
-      },
-      _makeChart: function(xType, colorScale, _attached) {
-        if (this._makeChartAsyncCallbackId === null) {
-          this.cancelAsync(this._makeChartAsyncCallbackId);
-        }
-
-        this._makeChartAsyncCallbackId = this.async(function() {
-          this._makeChartAsyncCallbackId = null;
-          if (!_attached) return;
-          if (this._chart) this._chart.destroy();
-          var chart = new VZ.DistributionChart(xType, colorScale);
-          var svg = d3.select(this.$.chartsvg);
-          chart.renderTo(svg);
-          this._chart = chart;
-        }, 350);
-      },
-      _reloadFromCache: function() {
-        if(this._chart) {
-          this._chart.setVisibleSeries(this._visibleSeriesCache);
-          this._visibleSeriesCache.forEach(function(name) {
-            this._chart.setSeriesData(name, this._seriesDataCache[name] || []);
-          }.bind(this));
-        }
-      },
-      attached: function() {
-        this._attached = true;
-      },
-      detached: function() {
-        this._attached = false;
-      }
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-distribution-dashboard" assetpath="../tf-distribution-dashboard/">
-  <template>
-    <div id="plumbing">
-      <tf-color-scale id="colorScale" runs="[[runs]]" out-color-scale="{{_colorScale}}"></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper backend="[[backend]]" categories="{{_categories}}" color-scale="[[_colorScale]]" run2tag="[[run2tag]]" runs="[[runs]]" selected-runs="{{_selectedRuns}}">
-        <div class="sidebar-section">
-          <tf-option-selector id="xTypeSelector" name="Horizontal Axis" selected-id="{{_xType}}">
-            <paper-button id="step">step</paper-button>
-            <paper-button id="relative">relative</paper-button>
-            <paper-button id="wall_time">wall</paper-button>
-          </tf-option-selector>
-        </div>
-        </tf-sidebar-helper>
-      </div>
-
-      <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
-          <template>
-            <vz-distribution-chart x-type="[[_xType]]" color-scale="[[_colorScale]]"></vz-distribution-chart>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-
-    <style include="dashboard-style"></style>
-  </template>
-
-  <script>
-    TF.Dashboard.TfDistributionDashboard = Polymer({
-      is: "tf-distribution-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("distributions"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      properties: {
-        backend: Object,
-        _xType: {
-          type: String,
-          value: "step"
-        },
-        dataType: {value: "compressedHistogram"},
-      },
-    });
-  </script>
-</dom-module>
-
-<dom-module id="vz-histogram-timeseries" assetpath="../vz-histogram-timeseries/">
-    <template>
-      <div id="tooltip"><span></span></div>
-      <svg id="svg">
-        <g>
-          <g class="axis x"></g>
-          <g class="axis y"></g>
-          <g class="axis y slice"></g>
-          <g class="stage">
-            <rect class="background"></rect>
-          </g>
-          <g class="x-axis-hover"></g>
-          <g class="y-axis-hover"></g>
-          <g class="y-slice-axis-hover"></g>
-        </g>
-      </svg>
-
-      <style>
-        :host {
-          display: flex;
-          flex-direction: column;
-          flex-grow: 1;
-          flex-shrink: 1;
-          position: relative;
-        }
-
-        svg {
-          font-family: roboto, sans-serif;
-          overflow: visible;
-          display: block;
-          width: 100%;
-          flex-grow: 1;
-          flex-shrink: 1;
-        }
-
-        #tooltip {
-          position: absolute;
-          display: block;
-          opacity: 0;
-          font-weight: bold;
-          font-size: 11px;
-        }
-
-        .background {
-          fill-opacity: 0;
-          fill: red;
-        }
-
-        .histogram {
-          pointer-events: none;
-        }
-
-        .hover {
-          font-size: 9px;
-          dominant-baseline: middle;
-          opacity: 0;
-        }
-
-        .hover circle {
-          stroke: white;
-          stroke-opacity: 0.5;
-          stroke-width: 1px;
-        }
-
-        .hover text {
-          fill: black;
-          opacity: 0;
-        }
-
-        .hover.hover-closest circle {
-          fill: black!important;
-        }
-
-        .hover.hover-closest text {
-          opacity: 1;
-        }
-
-        .baseline {
-          stroke: black;
-          stroke-opacity: 0.1;
-        }
-
-        .outline {
-          fill: none;
-          stroke: white;
-          stroke-opacity: 0.5;
-        }
-
-        .outline.outline-hover {
-          stroke: black!important;
-          stroke-opacity: 1;
-        }
-
-        .x-axis-hover,
-        .y-axis-hover,
-        .y-slice-axis-hover {
-          pointer-events: none;
-        }
-
-        .x-axis-hover .label,
-        .y-axis-hover .label,
-        .y-slice-axis-hover .label {
-          opacity: 0;
-          font-weight: bold;
-          font-size: 11px;
-          text-anchor: end;
-        }
-
-        .x-axis-hover text {
-          text-anchor: middle;
-        }
-
-        .y-axis-hover text,
-        .y-slice-axis-hover text {
-          text-anchor: start;
-        }
-
-        .x-axis-hover line,
-        .y-axis-hover line,
-        .y-slice-axis-hover line {
-          stroke: black;
-        }
-
-        .x-axis-hover rect,
-        .y-axis-hover rect,
-        .y-slice-axis-hover rect {
-          fill: white;
-        }
-
-        .axis {
-          font-size: 10px;
-          fill: #aaa;
-        }
-
-        .axis path.domain {
-          fill: none;
-        }
-
-        .axis .tick line {
-          stroke: #ddd;
-        }
-
-        .axis.slice {
-          opacity: 0;
-        }
-
-        .axis.slice .tick line {
-          stroke-dasharray: 2;
-        }
-
-        .small .axis text { display: none; }
-        .small .axis .tick:first-of-type text { display: block; }
-        .small .axis .tick:last-of-type text { display: block; }
-        .medium .axis text { display: none; }
-        .medium .axis .tick:nth-child(2n + 1) text { display: block; }
-        .large .axis text { display: none; }
-        .large .axis .tick:nth-child(2n + 1) text { display: block; }
-
-      </style>
-    </template>
-
-    <script>
-    Polymer({
-      is: "vz-histogram-timeseries",
-      properties: {
-        /**
-         * Defines which view mode is being used by the chart. Supported values
-         * are:
-         * - "offset" - Offset view of the data showing all timesteps.
-         * - "overlay" - Overlays all timesteps into one 2D view, with the
-         * brighter lines representing the newer timesteps.
-         */
-        mode: {
-          type: String,
-          value: "offset"
-        },
-
-        /*
-         * The name of the datum's property that contains the time values.
-         * Allows:
-         * - "step" - Linear scale using the "step" property of the datum.
-         * - "wall_time" - Temporal scale using the "wall_time" property of the
-         * datum.
-         * - "relative" - Temporal scale starting at 0 created by using
-         * the "wall_time" property of the datum.
-         */
-        timeProperty: {
-          type: String,
-          value: "step"
-        },
-
-        /**
-         * The name of the data's property that contains the bins.
-         */
-        bins: {
-          type: String,
-          value: "bins"
-        },
-
-        /**
-         * The name of the datum's property that contains the x values.
-         */
-        x: {
-          type: String,
-          value: "x"
-        },
-
-        /**
-         * The name of the datum's property that contains the bin width values.
-         */
-        dx: {
-          type: String,
-          value: "dx"
-        },
-
-        /**
-         * The name of the datum's property that contains the bin height.
-         */
-        y: {
-          type: String,
-          value: "y"
-        },
-
-        /**
-         * Scale that maps series names to colors. The default colors are from
-         * d3.scale.category10() scale. Use this property to replace the default
-         * line colors with colors of your own choice.
-         */
-        colorScale: {
-          type: Object,
-          value: function() {
-            return d3.scale.category10();
-          }
-        },
-
-        /**
-         * Duration of the transition between histogram modes.
-         */
-        modeTransitionDuration: {
-          type: Number,
-          value: 500
-        },
-
-        _attached: Boolean,
-        _name: { type: String, value: null },
-        _data: { type: Array, value: null },
-      },
-      observers: [
-        'redraw(timeProperty, _attached)',
-        '_modeRedraw(mode)'
-      ],
-      ready: function() {
-        // Polymer's way of scoping styles on nodes that d3 created
-        this.scopeSubtree(this.$.svg, true);
-      },
-      attached: function() {
-        this._attached = true;
-      },
-      detached: function() {
-        this._attached = false;
-      },
-      setVisibleSeries: function(names) {
-        // Do nothing.
-      },
-      setSeriesData: function(name, data) {
-        this._name = name;
-        this._data = data;
-        this.redraw();
-      },
-
-      /**
-       * Redraws the chart. This is only called if the chart is attached to the
-       * screen and if the chart has data.
-       */
-      redraw: function() {
-        this._draw(0);
-      },
-
-      _modeRedraw: function() {
-        this._draw(this.modeTransitionDuration);
-      },
-
-      _draw: function(duration) {
-        if (!this._attached || !this._data) {
-          return;
-        }
-
-        //
-        // Data verification
-        //
-        if (duration === undefined) throw(new Error("vz-histogram-timeseries _draw needs duration"));
-        if (this._data.length <= 0) throw(new Error("Not enough steps in the data"));
-        if (!this._data[0].hasOwnProperty(this.bins)) throw(new Error("No bins property of '" + this.bins + "' in data"));
-        if (this._data[0][this.bins].length <= 0) throw(new Error("Must have at least one bin in bins in data"));
-        if (!this._data[0][this.bins][0].hasOwnProperty(this.x)) throw(new Error("No x property '" + this.x + "' on bins data"));
-        if (!this._data[0][this.bins][0].hasOwnProperty(this.dx)) throw(new Error("No dx property '" + this.dx + "' on bins data"));
-        if (!this._data[0][this.bins][0].hasOwnProperty(this.y)) throw(new Error("No y property '" + this.y + "' on bins data"));
-
-        //
-        // Initialization
-        //
-        var timeProp = this.timeProperty;
-        var xProp = this.x;
-        var binsProp = this.bins;
-        var dxProp = this.dx;
-        var yProp = this.y;
-
-        var data = this._data;
-        var name = this._name;
-        var mode = this.mode;
-        var color = d3.hcl(this.colorScale(name));
-        var tooltip = d3.select(this.$.tooltip);
-
-        var xAccessor = function(d) { return d[xProp] };
-        var yAccessor = function(d) { return d[yProp] };
-        var dxAccessor = function(d) { return d[dxProp] };
-        var xRightAccessor = function(d) { return d[xProp] + d[dxProp] };
-        var timeAccessor = function(d) { return d[timeProp] };
-
-        if (timeProp === "relative") {
-          timeAccessor = function(d) { return d.wall_time - data[0].wall_time };
-        }
-
-        var brect = this.$.svg.getBoundingClientRect();
-        var outerWidth = brect.width,
-            outerHeight = brect.height;
-
-        var sliceHeight,
-            margin = {top: 5, right: 60, bottom: 20, left: 24};
-
-        if (mode === "offset") {
-          sliceHeight = outerHeight / 2.5;
-          margin.top = sliceHeight + 5;
-        } else {
-          sliceHeight = outerHeight - margin.top - margin.bottom;
-        }
-
-        var width = outerWidth - margin.left - margin.right,
-            height = outerHeight - margin.top - margin.bottom;
-
-        var leftMin = d3.min(data, xAccessor),
-            rightMax = d3.max(data, xRightAccessor);
-
-        //
-        // Text formatters
-        //
-        var format = d3.format(".3n");
-        var yAxisFormat = d3.format(".0f");
-
-        if (timeProp === "wall_time") {
-          yAxisFormat = d3.time.format("%m/%d %X");
-        } else if (timeProp === "relative") {
-          yAxisFormat = function(d) {
-            return d3.format(".1r")(d / 3.6e6) + 'h'; // Convert to hours.
-          };
-        }
-
-        //
-        // Calculate the extents
-        //
-        var xExtents = data.map(function(d, i) {
-          return [
-            d3.min(d[binsProp], xAccessor),
-            d3.max(d[binsProp], xRightAccessor)
-          ];
-        });
-        var yExtents = data.map(function(d) {
-          return d3.extent(d[binsProp], yAccessor);
-        });
-
-        //
-        // Scales and axis
-        //
-        var outlineCanvasSize = 500;
-
-        var extent = d3.extent(data, timeAccessor);
-
-        var yScale = (timeProp === "wall_time" ? d3.time.scale() : d3.scale.linear())
-            .domain(extent)
-            .range([0, (mode === "offset" ? height : 0)]);
-
-        var ySliceScale = d3.scale.linear()
-            .domain([0, d3.max(data, function(d, i) { return yExtents[i][1]; })])
-            .range([sliceHeight, 0]);
-
-        var yLineScale = d3.scale.linear()
-            .domain(ySliceScale.domain())
-            .range([outlineCanvasSize, 0]);
-
-        var xScale = d3.scale.linear()
-            .domain([
-              d3.min(data, function(d, i) { return xExtents[i][0]; }),
-              d3.max(data, function(d, i) { return xExtents[i][1]; })
-            ])
-            .nice()
-            .range([0, width]);
-
-        var xLineScale = d3.scale.linear()
-            .domain(xScale.domain())
-            .range([0, outlineCanvasSize]);
-
-        var outlineColor = d3.scale.linear()
-            .domain(d3.extent(data, timeAccessor))
-            .range([color.darker(), color.brighter()])
-            .interpolate(d3.interpolateHcl);
-
-        var xAxis = d3.svg.axis()
-            .scale(xScale)
-            .ticks(Math.max(2, width / 20))
-            .orient("bottom");
-
-        var yAxis = d3.svg.axis()
-            .scale(yScale)
-            .ticks(Math.max(2, height / 15))
-            .tickFormat(yAxisFormat)
-            .orient("right");
-
-        var ySliceAxis = d3.svg.axis()
-            .scale(ySliceScale)
-            .ticks(Math.max(2, height / 15))
-            .tickSize(width + 5)
-            .tickFormat(format)
-            .orient("right");
-
-        var xBinCentroid = function(d) {
-          return d[xProp] + d[dxProp] / 2;
-        };
-
-        var linePath = d3.svg.line()
-            .interpolate("linear")
-            .x(function(d) { return xLineScale(xBinCentroid(d)); })
-            .y(function(d) { return yLineScale(d[yProp]); });
-
-        var path = function(d) {
-          // Draw a line from 0 to the first point and from the last point to 0.
-          return 'M' + xLineScale(xBinCentroid(d[0])) + ',' + yLineScale(0) +
-              'L' + linePath(d).slice(1) +
-              "L" + xLineScale(xBinCentroid(d[d.length - 1])) + "," + yLineScale(0);
-        };
-
-        //
-        // Render
-        //
-        var svgNode = this.$.svg;
-
-        var svg = d3.select(svgNode)
-
-        var svgTransition = svg.transition().duration(duration);
-
-        var g = svg.select("g")
-            .classed("small", function() { return (width > 0 && width <= 150); })
-            .classed("medium", function() { return (width > 150 && width <= 300); })
-            .classed("large", function() { return (width > 300); })
-
-        var gTransition = svgTransition.select("g")
-            .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-
-        var bisect = d3.bisector(xRightAccessor).left;
-        var stage = g.select(".stage")
-            .on("mouseover", function() {
-              hoverUpdate.style("opacity", 1);
-              xAxisHoverUpdate.style("opacity", 1);
-              yAxisHoverUpdate.style("opacity", 1);
-              ySliceAxisHoverUpdate.style("opacity", 1);
-              tooltip.style("opacity", 1);
-            })
-            .on("mouseout", function() {
-              hoverUpdate.style("opacity", 0);
-              xAxisHoverUpdate.style("opacity", 0);
-              yAxisHoverUpdate.style("opacity", 0);
-              ySliceAxisHoverUpdate.style("opacity", 0);
-              hoverUpdate.classed("hover-closest", false);
-              outlineUpdate.classed("outline-hover", false);
-              tooltip.style("opacity", 0);
-            })
-            .on("mousemove", onMouseMove);
-
-        var background = stage.select(".background")
-            .attr("transform", "translate(" + -margin.left + "," + -margin.top + ")")
-            .attr("width", outerWidth)
-            .attr("height", outerHeight);
-
-        var histogram = stage.selectAll(".histogram").data(data),
-            histogramExit = histogram.exit().remove(),
-            histogramEnter = histogram.enter().append("g").attr("class", "histogram"),
-            histogramUpdate = histogram
-                .sort(function(a, b) { return timeAccessor(a) - timeAccessor(b); }),
-            histogramTransition = gTransition.selectAll(".histogram")
-                .attr("transform", function(d) {
-                  return "translate(0, " +
-                    (mode === "offset" ? (yScale(timeAccessor(d)) - sliceHeight) : 0) + ")";
-                });
-
-        var baselineEnter = histogramEnter.append("line").attr("class", "baseline"),
-            baselineUpdate = histogramTransition.select(".baseline")
-                .style("stroke-opacity", function(d) { return (mode === "offset" ? 0.1 : 0); })
-                .attr("y1", sliceHeight)
-                .attr("y2", sliceHeight)
-                .attr("x2", width);
-
-        var outlineEnter = histogramEnter.append("path").attr("class", "outline"),
-            outlineUpdate = histogramUpdate.select(".outline")
-                .attr("vector-effect", "non-scaling-stroke")
-                .attr("d", function(d) { return path(d[binsProp]); })
-                .style("stroke-width", 1),
-            outlineTransition = histogramTransition.select(".outline")
-                .attr("transform", "scale(" + width / outlineCanvasSize + ", " +
-                      sliceHeight / outlineCanvasSize + ")")
-                .style("stroke", function(d) {
-                  return (mode === "offset" ? "white" : outlineColor(timeAccessor(d)));
-                })
-                .style("fill-opacity", function(d) { return (mode === "offset" ? 1 : 0); })
-                .style("fill", function(d) { return outlineColor(timeAccessor(d)); });
-
-        var hoverEnter = histogramEnter.append("g")
-                .attr("class", "hover")
-                .style("fill", function(d) { return outlineColor(timeAccessor(d)); }),
-            hoverUpdate = histogramUpdate.select(".hover");
-
-        hoverEnter.append("circle")
-            .attr("r", 2);
-
-        hoverEnter.append("text")
-            .style("display", "none")
-            .attr("dx", 4);
-
-        var xAxisHover = g.select(".x-axis-hover").selectAll(".label").data(["x"]),
-            xAxisHoverEnter = xAxisHover.enter().append("g").attr("class", "label"),
-            xAxisHoverUpdate = xAxisHover;
-
-        xAxisHoverEnter.append("rect")
-            .attr("x", -20)
-            .attr("y", 6)
-            .attr("width", 40)
-            .attr("height", 14)
-
-        xAxisHoverEnter.append("line")
-            .attr("x1", 0)
-            .attr("x2", 0)
-            .attr("y1", 0)
-            .attr("y2", 6);
-
-        xAxisHoverEnter.append("text")
-            .attr("dy", 18);
-
-        var yAxisHover = g.select(".y-axis-hover").selectAll(".label").data(["y"]),
-            yAxisHoverEnter = yAxisHover.enter().append("g").attr("class", "label"),
-            yAxisHoverUpdate = yAxisHover;
-
-        yAxisHoverEnter.append("rect")
-            .attr("x", 8)
-            .attr("y", -6)
-            .attr("width", 40)
-            .attr("height", 14)
-
-        yAxisHoverEnter.append("line")
-            .attr("x1", 0)
-            .attr("x2", 6)
-            .attr("y1", 0)
-            .attr("y2", 0);
-
-        yAxisHoverEnter.append("text")
-            .attr("dx", 8)
-            .attr("dy", 4);
-
-        var ySliceAxisHover = g.select(".y-slice-axis-hover").selectAll(".label").data(["y"]),
-            ySliceAxisHoverEnter = ySliceAxisHover.enter().append("g").attr("class", "label"),
-            ySliceAxisHoverUpdate = ySliceAxisHover;
-
-        ySliceAxisHoverEnter.append("rect")
-            .attr("x", 8)
-            .attr("y", -6)
-            .attr("width", 40)
-            .attr("height", 14)
-
-        ySliceAxisHoverEnter.append("line")
-            .attr("x1", 0)
-            .attr("x2", 6)
-            .attr("y1", 0)
-            .attr("y2", 0);
-
-        ySliceAxisHoverEnter.append("text")
-            .attr("dx", 8)
-            .attr("dy", 4);
-
-        gTransition.select(".y.axis.slice")
-            .style("opacity", mode === "offset" ? 0 : 1)
-            .attr("transform", "translate(0, " + (mode === "offset" ? -sliceHeight : 0) + ")")
-            .call(ySliceAxis);
-
-        gTransition.select(".x.axis")
-            .attr("transform", "translate(0, " + height + ")")
-            .call(xAxis);
-
-        gTransition.select(".y.axis")
-            .style("opacity", mode === "offset" ? 1 : 0)
-            .attr("transform", "translate(" + width + ", " + (mode === "offset" ? 0 : height) + ")")
-            .call(yAxis);
-
-        function onMouseMove() {
-          var m = d3.mouse(this),
-              v = xScale.invert(m[0]),
-              t = yScale.invert(m[1]);
-
-          function hoverXIndex(d) {
-            return Math.min(d[binsProp].length - 1, bisect(d[binsProp], v));
-          }
-          var closestSliceData;
-          var closestSliceDistance = Infinity;
-          var lastSliceData;
-          hoverUpdate
-            .attr("transform", function(d, i) {
-              var index = hoverXIndex(d);
-              lastSliceData = d;
-              var x = xScale(d[binsProp][index][xProp] + d[binsProp][index][dxProp] / 2);
-              var y = ySliceScale(d[binsProp][index][yProp]);
-              var globalY = (mode === "offset" ? yScale(timeAccessor(d)) - (sliceHeight - y) : y);
-              var dist = Math.abs(m[1] - globalY);
-              if (dist < closestSliceDistance) {
-                closestSliceDistance = dist;
-                closestSliceData = d;
-              }
-              return "translate(" + x + "," + y + ")";
-            });
-          hoverUpdate.select("text").text(function(d) {
-            var index = hoverXIndex(d);
-            return d[binsProp][index][yProp];
-          })
-          hoverUpdate.classed("hover-closest", function(d) { return d === closestSliceData; });
-          outlineUpdate.classed("outline-hover", function(d) { return d === closestSliceData; });
-
-          var index = hoverXIndex(lastSliceData);
-
-          xAxisHoverUpdate
-              .attr("transform", function(d) {
-                return "translate(" +
-                  xScale(lastSliceData[binsProp][index][xProp] +
-                         lastSliceData[binsProp][index][dxProp] / 2) + ", " +
-                  height + ")";
-              })
-            .select("text")
-              .text(function(d) { return format(lastSliceData[binsProp][index][xProp] +
-                                                lastSliceData[binsProp][index][dxProp] / 2); });
-
-          var fy = yAxis.tickFormat();
-          yAxisHoverUpdate
-              .attr("transform", function(d) {
-                return "translate(" + width + ", " +
-                  (mode === "offset" ? yScale(timeAccessor(closestSliceData)) : 0) + ")";
-              })
-              .style("display", mode === "offset" ? "" : "none")
-            .select("text")
-              .text(function(d) { return fy(timeAccessor(closestSliceData));});
-
-          var fsy = ySliceAxis.tickFormat();
-          ySliceAxisHoverUpdate
-              .attr("transform", function(d) {
-                return "translate(" + width + ", " +
-                  (mode === "offset" ? 0 : ySliceScale(closestSliceData[binsProp][index][yProp])) +
-                  ")";
-              })
-              .style("display", mode === "offset" ? "none" : "")
-            .select("text")
-              .text(function(d) { return fsy(closestSliceData[binsProp][index][yProp]); });
-
-          var svgMouse = d3.mouse(svgNode);
-          tooltip.style("transform", "translate(" + (svgMouse[0] + 15) + "px," +
-              (svgMouse[1] - 15) + "px)")
-            .select('span')
-            .text(mode === "offset" ?
-                fsy(closestSliceData[binsProp][index][yProp]) :
-                (timeProp === "step" ? "step " : "") +
-                fy(timeAccessor(closestSliceData)));
-        }
-      }
-    });
-    </script>
-
-  </dom-module>
-
-<dom-module id="tf-histogram-dashboard" assetpath="../tf-histogram-dashboard/">
-  <template>
-    <div id="plumbing">
-      <tf-color-scale id="colorScale" runs="[[runs]]" out-color-scale="{{_colorScale}}"></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper backend="[[backend]]" categories="{{_categories}}" color-scale="[[_colorScale]]" run2tag="[[run2tag]]" runs="[[runs]]" selected-runs="{{_selectedRuns}}" show-download-links="{{_showDownloadLinks}}">
-          <div class="sidebar-section">
-            <tf-option-selector id="histogramModeSelector" name="Histogram Mode" selected-id="{{_histogramMode}}">
-              <paper-button id="overlay">overlay</paper-button>
-              <paper-button id="offset">offset</paper-button>
-            </tf-option-selector>
-          </div>
-          <div class="sidebar-section">
-            <tf-option-selector id="timePropertySelector" name="Offset Time Axis" selected-id="{{_timeProperty}}">
-              <paper-button id="step">step</paper-button>
-              <paper-button id="relative">relative</paper-button>
-              <paper-button id="wall_time">wall</paper-button>
-            </tf-option-selector>
-          
-       </div>
-      </tf-sidebar-helper></div>
-
-      <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
-          <template>
-            <vz-histogram-timeseries time-property="[[_timeProperty]]" mode="[[_histogramMode]]" color-scale="[[_colorScaleFunction]]"></vz-histogram-timeseries>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-
-    <style include="dashboard-style"></style>
-    <style>
-      tf-panes-helper {
-        --card-expanded-height: 500px;
-        --card-expanded-width: 700px;
-      }
-    </style>
-  </template>
-
-  <script>
-    TF.Dashboard.TfHistogramDashboard = Polymer({
-      is: "tf-histogram-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("histograms"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "histogram"
-        },
-        _histogramMode: {
-          type: String,
-          value: "offset"
-        },
-        _timeProperty: {
-          type: String,
-          value: "step"
-        },
-        _colorScaleFunction: {
-          type: Function,
-          computed: "_getColorScaleFunction(_colorScale)"
-        },
-      },
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _getColorScaleFunction: function() {
-        return this._colorScale.scale.bind(this._colorScale);
-      },
-    });
-  </script>
-</dom-module>
-<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
-
-<dom-module id="tf-image-loader" assetpath="../tf-image-dashboard/">
-  <template>
-    <div id="image-annotation">
-      <template is="dom-if" if="[[_hasAtLeastOneStep]]">
-        step
-        <span class="step-value">
-          [[_stepValue]]
-        </span>
-        <template is="dom-if" if="[[_currentWallTime]]">
-          ([[_currentWallTime]])
-        </template>
-        <paper-spinner-lite active="" hidden$="[[!_isImageLoading]]"></paper-spinner-lite>
-      </template>
-      <template is="dom-if" if="[[_hasMultipleSteps]]">
-        <paper-slider id="steps" immediate-value="{{_stepIndex}}" max="[[_maxStepIndex]]" max-markers="[[_maxStepIndex]]" snaps="" step="1" value="{{_stepIndex}}"></paper-slider>
-      </template>
-    </div>
-
-    <div id="main-image-container"></div>
-
-    <style>
-      :host {
-        display: block;
-        width: 100%;
-        height: auto;
-        position: relative;
-        --step-slider-knob-color: #424242;
-      }
-
-      #image-annotation {
-        border-left: 4px solid;
-        padding-left: 5px;
-        font-size: 12px;
-        margin: -10px 0 10px 0;
-      }
-
-      #image-annotation .step-value {
-        font-weight: bold;
-      }
-
-      #image-annotation paper-spinner-lite {
-        width: 14px;
-        height: 14px;
-        vertical-align: text-bottom;
-        --paper-spinner-color: var(--tb-orange-strong)
-      }
-
-      #steps {
-        height: 15px;
-        margin: 0 0 0 -15px;
-        /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
-         * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
-         * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
-        width: calc(100% + 31px);
-        --paper-slider-active-color: var(--step-slider-knob-color);
-        --paper-slider-knob-color: var(--step-slider-knob-color);
-        --paper-slider-pin-color: var(--step-slider-knob-color);
-        --paper-slider-knob-start-color: var(--step-slider-knob-color);
-        --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
-        --paper-slider-pin-start-color: var(--step-slider-knob-color);
-      }
-
-      #main-image-container img {
-        border: 1px solid #f5f5f5;
-        image-rendering: -moz-crisp-edges;
-        image-rendering: pixelated;
-        display: block;
-        width: 100%;
-        height: auto;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-image-loader",
-      properties: {
-        colorScale: Object,
-        run: String,
-        // This is an array of Tensorboard Image&Datum objects (See backend.ts for details). The
-        // properties of objects in this array are
-        // {
-        //   width: number,
-        //   height: number,
-        //   wall_time: Date,
-        //   step: number,
-        //   url: string,
-        // }
-        _steps: {
-          type: Array,
-          value: [],
-          notify: true,
-        },
-        _stepIndex: {
-          type: Number,
-          notify: true,
-        },
-        _hasAtLeastOneStep: {
-          type: Boolean,
-          computed: "_computeHasAtLeastOneStep(_steps)",
-        },
-        _hasMultipleSteps: {
-          type: Boolean,
-          computed: "_computeHasMultipleSteps(_steps)",
-        },
-        _stepValue: {
-          type: Number,
-          computed: "_computeStepValue(_stepIndex)",
-        },
-        _currentWallTime: {
-          type: Number,
-          computed: "_computeCurrentWallTime(_stepIndex)",
-        },
-        _maxStepIndex: {
-          type: Number,
-          computed: "_computeMaxStepIndex(_steps)",
-        },
-        // We use a strictly increasing index to make sure that we don't settle on a stale image.
-        _currentImageLoadIndex: {
-          type: Number,
-          value: 1,
-        },
-        _isImageLoading: {
-          type: Boolean,
-          value: false,
-        },
-      },
-      observers: [
-        "_updateImageUrl(_steps, _stepIndex)",
-      ],
-      redraw: function() {
-        // Other dashboards logic requires a redraw method to be defined. redraw is called at
-        // various places such as when the image is expanded.
-        this.setSeriesData(this.run, this._steps);
-      },
-      setVisibleSeries: function(runs) {
-        // Do nothing.
-      },
-      setSeriesData: function(run, steps) {
-        this.set("run", run);
-        this.set("_steps", steps);
-        this.set("_stepIndex", steps.length - 1);
-
-        // Update the border color based on the run.
-        var color = this.colorScale.scale(run);
-        this.$$("#image-annotation").style.borderColor = color;
-      },
-      _updateImageUrl: function(steps, stepIndex) {
-        // We manually change the image URL (instead of binding to the image's src attribute)
-        // because we would like to manage what happens when the image starts to / finishes loading.
-        if (!steps.length) {
-          return;
-        }
-
-        let img = new Image();
-        img.id = "img"; // '#img' used to select the image in tf-image-dashboard.
-
-        const loadIndex = ++this._currentImageLoadIndex;
-        img.onload = img.onerror = (function() {
-          if (loadIndex != this._currentImageLoadIndex) {
-            // This load is no longer relevant.
-            return;
-          }
-
-          // The new image has finished loading. Remove the old image. Add the new one.
-          let mainImageContainer = this.$$("#main-image-container");
-          mainImageContainer.innerHTML = "";
-          Polymer.dom(mainImageContainer).appendChild(img);
-
-          // The image has finished loading (or has erred and failed to load).
-          this.set("_isImageLoading", false);
-        }).bind(this);
-
-        // Load the new image.
-        this.set("_isImageLoading", true);
-        img.src = steps[stepIndex].url;
-      },
-      _computeHasAtLeastOneStep: function(steps) {
-        return !!steps && steps.length > 0;
-      },
-      _computeHasMultipleSteps: function(steps) {
-        return !!steps && steps.length > 1;
-      },
-      _computeStepValue: function(stepIndex) {
-        return this._steps[stepIndex].step;
-      },
-      _computeCurrentWallTime: function(stepIndex) {
-        return this._steps[stepIndex].wall_time.toString();
-      },
-      _computeMaxStepIndex: function(steps) {
-        return steps.length - 1;
-      },
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-image-dashboard" assetpath="../tf-image-dashboard/">
-  <template>
-    <paper-dialog with-backdrop="" id="actual-image-size-dialog"></paper-dialog>
-    <div id="plumbing">
-      <tf-color-scale id="colorScale" runs="[[runs]]" out-color-scale="{{_colorScale}}"></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper backend="[[backend]]" categories="{{_categories}}" color-scale="[[_colorScale]]" run2tag="[[run2tag]]" runs="[[runs]]" selected-runs="{{_selectedRuns}}">
-        </tf-sidebar-helper>
-      </div>
-      <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
-          <template>
-            <tf-image-loader color-scale="[[_colorScale]]"></tf-image-loader>
-            <paper-icon-button class="actual-size-button" icon="aspect-ratio" on-tap="_showActualSize" title="Show the image at its true pixel size"></paper-icon-button>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-    <style include="dashboard-style"></style>
-    <style>
-      tf-panes-helper {
-        --card-width: 340px;
-        --card-height: auto;
-        --card-expanded-width: 700px;
-        --card-expanded-height: auto;
-      }
-
-      .actual-size-button {
-        background: #fff;
-        border-radius: 100%;
-        bottom: -35px;
-        color: #2196f3;
-        height: 32px;
-        left: 35px;
-        padding: 4px;
-        pointer-events: auto;
-        position: absolute;
-        width: 32px;
-      }
-
-      .actual-size-button-selected {
-        background: var(--tb-ui-light-accent);
-      }
-
-      #actual-image-size-dialog {
-        overflow: auto;
-      }
-    </style>
-  </template>
-  <script>
-    TF.Dashboard.TfImageDashboard = Polymer({
-      is: "tf-image-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "image"
-        },
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("images"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _showActualSize: function(e) {
-        var currentTarget = Polymer.dom(e.currentTarget);
-        var card = currentTarget.node.closest('.card');
-
-        // Create a full-size copy of the image.
-        var newImage = card.querySelector('#img').cloneNode();
-        newImage.style.height = 'auto';
-        newImage.style.width = 'auto';
-        newImage.style.margin = 0;
-        newImage.style.padding = 0;
-        newImage.classList.add("actual-size-image");
-
-        // When the user clicks on the image, empty and close the dialog.
-        var dialog = this.$$('#actual-image-size-dialog');
-        newImage.addEventListener('click', function() {
-          dialog.close();
-        });
-
-        // Update dialog content. Show the dialog.
-        dialog.innerHTML = '';
-        dialog.appendChild(newImage);
-        dialog.open();
-      }
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-audio-loader" assetpath="../tf-audio-dashboard/">
-  <style>
-    :host {
-      display: block;
-      --step-slider-knob-color: #424242;
-    }
-
-    img {
-      width: 100%;
-      height: 100%;
-      image-rendering: pixelated;
-    }
-
-    .step-description {
-      font-size: 12px;
-    }
-
-    .step-value {
-      font-weight: bold;
-    }
-
-    #audio-loading-spinner {
-      width: 14px;
-      height: 14px;
-      vertical-align: text-bottom;
-      --paper-spinner-color: var(--tb-orange-strong)
-    }
-
-    #steps {
-      height: 15px;
-      margin: 0 0 0 -15px;
-      /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
-       * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
-       * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
-      width: calc(100% + 31px);
-      --paper-slider-active-color: var(--step-slider-knob-color);
-      --paper-slider-knob-color: var(--step-slider-knob-color);
-      --paper-slider-pin-color: var(--step-slider-knob-color);
-      --paper-slider-knob-start-color: var(--step-slider-knob-color);
-      --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
-      --paper-slider-pin-start-color: var(--step-slider-knob-color);
-    }
-
-    #individual-audio-container audio {
-      margin: 5px 0 0 -10px;
-      width: calc(100% + 20px);
-    }
-  </style>
-  <template>
-    <template is="dom-if" if="[[_metadatas]]">
-      <template is="dom-if" if="[[_hasAtLeastOneStep(_metadatas)]]">
-        <div class="step-description">
-          step
-          <span class="step-value">
-            [[_stepValue]]
-          </span><br>
-          <template is="dom-if" if="[[_stepWallTime]]">
-            [[_stepWallTime]]
-          </template>
-          <paper-spinner-lite active="" id="audio-loading-spinner" hidden$="[[!_isAudioLoading]]"></paper-spinner-lite>
-        </div>
-      </template>
-      <template is="dom-if" if="[[_maxStepIndex]]">
-        <paper-slider id="steps" immediate-value="{{_stepIndex}}" max="[[_maxStepIndex]]" max-markers="[[_maxStepIndex]]" snaps="" step="1" value="{{_stepIndex}}"></paper-slider>
-      </template>
-      <div id="individual-audio-container"></div>
-    </template>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-audio-loader",
-      properties: {
-        run: String,
-        tag: String,
-        audioGenerator: Function,
-        // todo: document.
-        _metadatas: Array,
-        _stepIndex: Number,
-        _stepValue: {
-          type: Number,
-          computed: "_computeStepValue(_metadatas, _stepIndex)",
-          value: 0,
-        },
-        _stepWallTime: {
-          type: Number,
-          computed: "_computeStepWallTime(_metadatas, _stepIndex)",
-          value: 0,
-        },
-        _maxStepIndex: {
-          type: Number,
-          computed: "_computeMaxStepIndex(_metadatas)",
-          value: 0,
-        },
-        _isAudioLoading: Boolean,
-        // Used to identify stale requests for audio.
-        _audioRequestId: {
-          type: Number,
-          value: 1
-        },
-      },
-      observers: [
-        "_updateAudio(_metadatas, _stepIndex)",
-      ],
-      reload: function() {
-        this.audioGenerator(this.tag, this.run).then(function(metadatas) {
-          // Set the list of available metadata.
-          this.set("_metadatas", metadatas);
-
-          // Set the index to be the last one.
-          this.set("_stepIndex", this._maxStepIndex);
-        }.bind(this));
-      },
-      ready: function() {
-        // Need to test so that it will not error if it is constructed w/o
-        // all properties (so that it's possible to use stub to mock it out)
-        if (this.run != null && this.tag != null && this.audioGenerator != null) {
-          this.reload();
-        }
-      },
-      _updateAudio: function(metadatas, stepIndex) {
-        if (!metadatas || stepIndex >= metadatas.length) {
-          // No audio to show. The audio section should be hidden.
-          return;
-        }
-
-        // Load new audio.
-        const requestId = ++this._audioRequestId;
-        this.set("_isAudioLoading", true);
-
-        // Create a new audio element. Only replace the previous one once the new audio loads.
-        let audioElement = document.createElement("audio");
-        audioElement.setAttribute("controls", true);
-        audioElement.setAttribute("loop", "loop");
-        let canPlayHandler = function() {
-          if (requestId !== this._audioRequestId) {
-            // This request is no longer relevant.
-            return;
-          }
-
-          // Remove this event listener: "canplay" apparently fires in Chrome every time playing
-          // begins again on loop. So, if we create a new audio element every time that happens, we
-          // don't actually loop.
-          audioElement.removeEventListener("canplay", canPlayHandler);
-
-          let individualAudioContainer = this.$$("#individual-audio-container");
-          individualAudioContainer.innerHTML = "";
-          Polymer.dom(individualAudioContainer).appendChild(audioElement);
-          this.set("_isAudioLoading", false);
-        }.bind(this);
-        audioElement.addEventListener("canplay", canPlayHandler);
-        audioElement.addEventListener("error", function() {
-          if (requestId !== this._audioRequestId) {
-            // This request is no longer relevant.
-            return;
-          }
-
-          // The audio could not be loaded.
-          this.$$("#individual-audio-container").innerHTML = "";
-          this.set("_isAudioLoading", false);
-        }.bind(this));
-
-        // Initiate the request for new audio.
-        var sourceElement = document.createElement("source");
-        let metadata = metadatas[stepIndex];
-        sourceElement.setAttribute("src", metadata.url);
-        sourceElement.setAttribute("type", metadata.content_type);
-        audioElement.appendChild(sourceElement);
-      },
-      _computeStepValue: function(metadatas, stepIndex) {
-        if (!metadatas || stepIndex >= metadatas.length) {
-          // No audio to show. The audio section should be hidden.
-          return 0;
-        }
-        return metadatas[stepIndex].step;
-      },
-      _computeStepWallTime: function(metadatas, stepIndex) {
-        if (!metadatas || stepIndex >= metadatas.length) {
-          // No audio to show. The audio section should be hidden.
-          return 0;
-        }
-        return metadatas[stepIndex].wall_time.toString();
-      },
-      _computeMaxStepIndex: function(metadatas) {
-        if (!metadatas || metadatas.length === 0) {
-          // No audio to show. The audio section should be hidden.
-          return 0;
-        }
-        return metadatas.length - 1;
-      },
-      _hasAtLeastOneStep: function(metadatas) {
-        return metadatas && metadatas.length > 0;
-      },
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-audio-grid" assetpath="../tf-audio-dashboard/">
-  <template>
-    <style include="scrollbar-style"></style>
-    <div id="fullContainer" class="container scrollbar">
-      <div id="topRow" class="container">
-        <div class="noshrink" id="paddingCell"></div>
-        <template is="dom-if" if="[[_tagsExist(tags)]]">
-          <template is="dom-repeat" items="[[runs]]" as="run">
-            <div class="run-name-cell noshrink">
-              <span>[[run]]</span>
-            </div>
-          </template>
-        </template>
-      </div>
-      <div id="bottomContainer" class="container">
-        <template is="dom-repeat" items="[[tags]]" as="tag">
-          <div class="audio-row container noshrink">
-            <div class="tag-name-cell noshrink">
-              <span class="tag-name">[[tag]]</span>
-            </div>
-            <template is="dom-repeat" items="[[runs]]" as="run">
-              <div class="audio-cell noshrink">
-                <template is="dom-if" if="[[_exists(run, tag, runToAudio.*)]]">
-                  <tf-audio-loader id="loader" run="[[run]]" tag="[[tag]]" audio-generator="[[audioGenerator]]">
-                  </tf-audio-loader>
-                </template>
-              </div>
-            </template>
-          </div>
-        </template>
-      </div>
-    </div>
-    <style>
-      :host {
-        display: block;
-        height: 100%;
-        --audio-cell-min-height: 105px;
-      }
-      .container {
-        display: flex;
-        flex-wrap: nowrap;
-      }
-      #fullContainer {
-        width: 100%;
-        height: 100%;
-        flex-direction: column;
-        padding-top: 20px;
-        overflow: auto;
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
-      }
-      #topRow {
-        flex-direction: row;
-      }
-      #bottomContainer {
-        flex-direction: column;
-        height: 100%;
-        width: 100%;
-      }
-      .audio-row {
-        flex-direction: row;
-        padding-top: 5px;
-      }
-      .audio-cell {
-        background: #FAFAFA;
-        width: 300px;
-        min-height: var(--audio-cell-min-height);
-        border: 1px solid black;
-        margin-right: 3px;
-        padding: 10px;
-        box-sizing: border-box;
-      }
-      .tag-name-cell {
-        width: 300px;
-        height: var(--audio-cell-min-height);
-        display:flex;
-        flex-direction: column;
-        justify-content: center;
-      }
-      .tag-name {
-        word-wrap: break-word;
-        text-align: center;
-        white-space: nowrap;
-      }
-      .run-name-cell {
-        width: 300px;
-        text-align: center;
-        margin-right: 5px;
-      }
-      .noshrink {
-        flex-shrink: 0;
-      }
-      #paddingCell {
-        width: 300px;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-audio-grid",
-      properties: {
-        runToAudio: Object,
-        tags: Array,
-        runs: Array,
-        audioGenerator: Function,
-      },
-      _tagsExist: function(tags) {
-        return tags && tags.length > 0;
-      },
-      _exists: function (run, tag) {
-        return this.runToAudio[run].indexOf(tag) !== -1;
-      },
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-audio-dashboard" assetpath="../tf-audio-dashboard/">
-  <template>
-    <div class="center">
-      <tf-no-data-warning data-type="audio" show-warning="[[dataNotFound]]"></tf-no-data-warning>
-      <tf-audio-grid id="audioGrid" run-to-audio="[[run2tag]]" audio-generator="[[dataProvider]]" tags="[[tags]]" runs="[[runs]]"></tf-audio-grid>
-    </div>
-
-    <style>
-      .center {
-        height: 100%;
-        width: 100%;
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
-      }
-      :host {
-        height: 100%;
-        display: block;
-      }
-
-    </style>
-  </template>
-  <script>
-    TF.Dashboard.TfAudioDashboard = Polymer({
-      is: "tf-audio-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      properties: {
-        dataType: {value: "audio"},
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("audio"),
-        TF.Dashboard.ReloadBehavior("tf-audio-loader"),
-        TF.Backend.Behavior
-      ],
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _hasAudio: function(runToAudioChange) {
-        return _.values(runToAudioChange.base).some(function(arr) {
-          return arr.length > 0;
-        });
-      },
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-graph-loader" assetpath="../tf-graph-loader/">
-</dom-module>
-
-<script>
-Polymer({
-
-  is: 'tf-graph-loader',
-
-  properties: {
-    /**
-     * @type {value: number, msg: string}
-     *
-     * A number between 0 and 100 denoting the % of progress
-     * for the progress bar and the displayed message.
-     */
-    progress: {
-      type: Object,
-      notify: true,
-    },
-    datasets: Array,
-    selectedDataset: Number,
-    selectedFile: {
-      type: Object,
-      observer: '_selectedFileChanged'
-    },
-    outGraphHierarchy: {
-      type: Object,
-      readOnly: true, //readonly so outsider can't change this via binding
-      notify: true
-    },
-    outGraph: {
-      type: Object,
-      readOnly: true, //readonly so outsider can't change this via binding
-      notify: true
-    },
-    outHierarchyParams: {
-      type: Object,
-      readOnly: true,
-      notify: true
-    },
-    outStats: {
-      type: Object,
-      readOnly: true, // This property produces data.
-      notify: true
-    }
-  },
-  observers: [
-    '_selectedDatasetChanged(selectedDataset, datasets)',
-    '_readAndParseMetadata(selectedMetadataTag)'
-  ],
-  _readAndParseMetadata: function(metadataIndex) {
-    if (metadataIndex == -1 || this.datasets[this.selectedDataset] == null ||
-        this.datasets[this.selectedDataset].runMetadata == null ||
-        this.datasets[this.selectedDataset].runMetadata[metadataIndex] == null) {
-      this._setOutStats(null);
-      return;
-    }
-    var path = this.datasets[this.selectedDataset].runMetadata[metadataIndex].path;
-    // Reset the progress bar to 0.
-    this.set('progress', {
-      value: 0,
-      msg: ''
-    });
-    var tracker = tf.graph.util.getTracker(this);
-    tf.graph.parser.fetchAndParseMetadata(path, tracker)
-    .then(function(stats) {
-      this._setOutStats(stats);
-    }.bind(this));
-  },
-  _parseAndConstructHierarchicalGraph: function(path, pbTxtFile) {
-    // Reset the progress bar to 0.
-    this.set('progress', {
-      value: 0,
-      msg: ''
-    });
-    var tracker = tf.graph.util.getTracker(this);
-    var hierarchyParams = {
-      verifyTemplate: true,
-      // If a set of numbered op nodes has at least this number of nodes
-      // then group them into a series node.
-      seriesNodeMinSize: 5,
-      // A map of series node names to series grouping settings, to indicate
-      // if a series is to be rendered as grouped or ungrouped.
-      // Starts out empty which allows the renderer to decide which series
-      // are initially rendered grouped and which aren't.
-      seriesMap: {},
-    };
-    this._setOutHierarchyParams(hierarchyParams);
-    var dataTracker = tf.graph.util.getSubtaskTracker(tracker, 30, 'Data');
-    tf.graph.parser.fetchAndParseGraphData(path, pbTxtFile, dataTracker)
-    .then(function(graph) {
-      if (!graph) {
-        throw 'The graph is empty. Make sure that the graph is passed to the ' +
-            'SummaryWriter after the graph is defined.';
-      }
-
-      // Build the flat graph (consists only of Op nodes).
-
-      // This is the whitelist of inputs on op types that are considered
-      // reference edges. "Assign 0" indicates that the first input to
-      // an OpNode with operation type "Assign" is a reference edge.
-      var refEdges = {};
-      refEdges["Assign 0"] = true;
-      refEdges["AssignAdd 0"] = true;
-      refEdges["AssignSub 0"] = true;
-      refEdges["assign 0"] = true;
-      refEdges["assign_add 0"] = true;
-      refEdges["assign_sub 0"] = true;
-      refEdges["count_up_to 0"] = true;
-      refEdges["ScatterAdd 0"] = true;
-      refEdges["ScatterSub 0"] = true;
-      refEdges["ScatterUpdate 0"] = true;
-      refEdges["scatter_add 0"] = true;
-      refEdges["scatter_sub 0"] = true;
-      refEdges["scatter_update 0"] = true;
-      var buildParams = {
-        enableEmbedding: true,
-        inEmbeddingTypes: ['Const'],
-        outEmbeddingTypes: ['^[a-zA-Z]+Summary$'],
-        refEdges: refEdges
-      };
-      var graphTracker = tf.graph.util.getSubtaskTracker(tracker, 20, 'Graph');
-      return tf.graph.build(graph, buildParams, graphTracker);
-    })
-    .then(function(graph) {
-      this._setOutGraph(graph);
-      var hierarchyTracker = tf.graph.util.getSubtaskTracker(tracker, 50,
-          'Namespace hierarchy');
-      return tf.graph.hierarchy.build(graph, hierarchyParams, hierarchyTracker);
-    }.bind(this))
-    .then(function(graphHierarchy) {
-      // Update the properties which notify the parent with the
-      // graph hierarchy and whether the data has live stats or not.
-      this._setOutGraphHierarchy(graphHierarchy);
-    }.bind(this))
-    .catch(function(e) {
-      // Generic error catch, for errors that happened outside
-      // asynchronous tasks.
-      tracker.reportError("Graph visualization failed: " + e, e);
-    });
-  },
-  _selectedDatasetChanged: function(datasetIndex, datasets) {
-    this._parseAndConstructHierarchicalGraph(datasets[datasetIndex].path);
-  },
-  _selectedFileChanged: function(e) {
-    if (!e) {
-      return;
-    }
-    var file = e.target.files[0];
-    if (!file) {
-      return;
-    }
-
-    // Clear out the value of the file chooser. This ensures that if the user
-    // selects the same file, we'll re-read it.
-    e.target.value = '';
-
-    this._parseAndConstructHierarchicalGraph(null, file);
-  }
-});
-</script>
-<script src="../graphlib/dist/graphlib.core.js"></script>
-<script src="../dagre/dist/dagre.core.js"></script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    /**
-     * Mapping from color palette name to color palette, which contains
-     * exact colors for multiple states of a single color palette.
-     */
-    tf.COLORS = [
-        {
-            'name': 'Google Blue',
-            'color': '#4184f3',
-            'active': '#3a53c5',
-            'disabled': '#cad8fc'
-        },
-        {
-            'name': 'Google Red',
-            'color': '#db4437',
-            'active': '#8f2a0c',
-            'disabled': '#e8c6c1'
-        },
-        {
-            'name': 'Google Yellow',
-            'color': '#f4b400',
-            'active': '#db9200',
-            'disabled': '#f7e8b0'
-        },
-        {
-            'name': 'Google Green',
-            'color': '#0f9d58',
-            'active': '#488046',
-            'disabled': '#c2e1cc'
-        },
-        {
-            'name': 'Purple',
-            'color': '#aa46bb',
-            'active': '#5c1398',
-            'disabled': '#d7bce6'
-        },
-        {
-            'name': 'Teal',
-            'color': '#00abc0',
-            'active': '#47828e',
-            'disabled': '#c2eaf2'
-        },
-        {
-            'name': 'Deep Orange',
-            'color': '#ff6f42',
-            'active': '#ca4a06',
-            'disabled': '#f2cbba'
-        },
-        {
-            'name': 'Lime',
-            'color': '#9d9c23',
-            'active': '#7f771d',
-            'disabled': '#f1f4c2'
-        },
-        {
-            'name': 'Indigo',
-            'color': '#5b6abf',
-            'active': '#3e47a9',
-            'disabled': '#c5c8e8'
-        },
-        {
-            'name': 'Pink',
-            'color': '#ef6191',
-            'active': '#ca1c60',
-            'disabled': '#e9b9ce'
-        },
-        {
-            'name': 'Deep Teal',
-            'color': '#00786a',
-            'active': '#2b4f43',
-            'disabled': '#bededa'
-        },
-        {
-            'name': 'Deep Pink',
-            'color': '#c1175a',
-            'active': '#75084f',
-            'disabled': '#de8cae'
-        },
-        {
-            'name': 'Gray',
-            'color': '#9E9E9E',
-            'active': '#424242',
-            'disabled': 'F5F5F5' // 100
-        }
-    ].reduce(function (m, c) {
-        m[c.name] = c;
-        return m;
-    }, {});
-    /**
-     * Mapping from op category to color palette name
-     * e.g.,  OP_GROUP_COLORS['state_ops'] = 'Google Blue';
-     */
-    tf.OP_GROUP_COLORS = [
-        {
-            color: 'Google Red',
-            groups: [
-                'gen_legacy_ops', 'legacy_ops', 'legacy_flogs_input',
-                'legacy_image_input', 'legacy_input_example_input',
-                'legacy_sequence_input', 'legacy_seti_input_input'
-            ]
-        },
-        { color: 'Deep Orange', groups: ['constant_ops'] },
-        { color: 'Indigo', groups: ['state_ops'] },
-        { color: 'Purple', groups: ['nn_ops', 'nn'] },
-        { color: 'Google Green', groups: ['math_ops'] },
-        { color: 'Lime', groups: ['array_ops'] },
-        { color: 'Teal', groups: ['control_flow_ops', 'data_flow_ops'] },
-        { color: 'Pink', groups: ['summary_ops'] },
-        { color: 'Deep Pink', groups: ['io_ops'] }
-    ].reduce(function (m, c) {
-        c.groups.forEach(function (group) { m[group] = c.color; });
-        return m;
-    }, {});
-})(tf || (tf = {}));
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph_1) {
-        /** Delimiter used in node names to denote namespaces. */
-        graph_1.NAMESPACE_DELIM = '/';
-        graph_1.ROOT_NAME = '__root__';
-        /** Attribute key used for storing attributes that are too large. */
-        graph_1.LARGE_ATTRS_KEY = '_too_large_attrs';
-        /**
-         * Maximum allowed size in bytes, before the attribute is considered large
-         * and filtered out of the graph.
-         */
-        graph_1.LIMIT_ATTR_SIZE = 1024;
-        // Separator between the source and the destination name of the edge.
-        graph_1.EDGE_KEY_DELIM = '--';
-        var GraphType;
-        (function (GraphType) {
-            GraphType[GraphType["FULL"] = 0] = "FULL";
-            GraphType[GraphType["EMBEDDED"] = 1] = "EMBEDDED";
-            GraphType[GraphType["META"] = 2] = "META";
-            GraphType[GraphType["SERIES"] = 3] = "SERIES";
-            GraphType[GraphType["CORE"] = 4] = "CORE";
-            GraphType[GraphType["SHADOW"] = 5] = "SHADOW";
-            GraphType[GraphType["BRIDGE"] = 6] = "BRIDGE";
-            GraphType[GraphType["EDGE"] = 7] = "EDGE";
-        })(GraphType = graph_1.GraphType || (graph_1.GraphType = {}));
-        ;
-        var NodeType;
-        (function (NodeType) {
-            NodeType[NodeType["META"] = 0] = "META";
-            NodeType[NodeType["OP"] = 1] = "OP";
-            NodeType[NodeType["SERIES"] = 2] = "SERIES";
-            NodeType[NodeType["BRIDGE"] = 3] = "BRIDGE";
-            NodeType[NodeType["ELLIPSIS"] = 4] = "ELLIPSIS";
-        })(NodeType = graph_1.NodeType || (graph_1.NodeType = {}));
-        ;
-        /** Indicates if a node is to be included in the main graph when rendered. */
-        var InclusionType;
-        (function (InclusionType) {
-            InclusionType[InclusionType["INCLUDE"] = 0] = "INCLUDE";
-            InclusionType[InclusionType["EXCLUDE"] = 1] = "EXCLUDE";
-            InclusionType[InclusionType["UNSPECIFIED"] = 2] = "UNSPECIFIED";
-        })(InclusionType = graph_1.InclusionType || (graph_1.InclusionType = {}));
-        ;
-        /** Indicates if a series is to be grouped in the graph when rendered. */
-        var SeriesGroupingType;
-        (function (SeriesGroupingType) {
-            SeriesGroupingType[SeriesGroupingType["GROUP"] = 0] = "GROUP";
-            SeriesGroupingType[SeriesGroupingType["UNGROUP"] = 1] = "UNGROUP";
-        })(SeriesGroupingType = graph_1.SeriesGroupingType || (graph_1.SeriesGroupingType = {}));
-        ;
-        /** Attribute key reserved for the shapes of the output tensors. */
-        var OUTPUT_SHAPES_KEY = '_output_shapes';
-        /** Attribute key reserved for the XLA cluster that an op runs on. */
-        var _XLA_CLUSTER_KEY = '_XlaCluster';
-        /**
-         * A SlimGraph is inspired by graphlib.Graph, but having only the functionality
-         * that we need.
-         */
-        var SlimGraph = (function () {
-            function SlimGraph() {
-                this.nodes = {};
-                this.edges = [];
-            }
-            return SlimGraph;
-        }());
-        graph_1.SlimGraph = SlimGraph;
-        var EllipsisNodeImpl = (function () {
-            /**
-             * Constructs a new ellipsis annotation node.
-             *
-             * @param numNodes The number of additional annotations this node represents.
-             */
-            function EllipsisNodeImpl(numNodes) {
-                this.type = NodeType.ELLIPSIS;
-                this.isGroupNode = false;
-                this.cardinality = 1;
-                this.parentNode = null;
-                this.stats = null;
-                this.setNumMoreNodes(numNodes);
-                this.include = InclusionType.UNSPECIFIED;
-            }
-            EllipsisNodeImpl.prototype.setNumMoreNodes = function (numNodes) {
-                this.numMoreNodes = numNodes;
-                this.name = '... ' + numNodes + ' more';
-            };
-            return EllipsisNodeImpl;
-        }());
-        graph_1.EllipsisNodeImpl = EllipsisNodeImpl;
-        ;
-        /**
-         * A label object for nodes in the full graph and leaf nodes in the render
-         * graph.
-         */
-        var OpNodeImpl = (function () {
-            /**
-             * Constructs a new Op node.
-             *
-             * @param rawNode The raw node.
-             */
-            function OpNodeImpl(rawNode) {
-                this.op = rawNode.op;
-                this.name = rawNode.name;
-                this.device = rawNode.device;
-                this.attr = rawNode.attr;
-                // An array of normalized inputs that denote the incoming edges to
-                // the current node. Each input contains the normalized name of the
-                // source node, whether it has a number part and whether it is a
-                // control dependency.
-                this.inputs = normalizeInputs(rawNode.input);
-                this.outputShapes = extractOutputShapes(rawNode.attr);
-                this.xlaCluster = extractXlaCluster(rawNode.attr);
-                // additional properties
-                this.type = NodeType.OP;
-                this.isGroupNode = false;
-                this.cardinality = 1;
-                this.inEmbeddings = [];
-                this.outEmbeddings = [];
-                this.parentNode = null;
-                this.include = InclusionType.UNSPECIFIED;
-                this.owningSeries = null;
-            }
-            return OpNodeImpl;
-        }());
-        graph_1.OpNodeImpl = OpNodeImpl;
-        ;
-        function createMetanode(name, opt) {
-            if (opt === void 0) { opt = {}; }
-            return new MetanodeImpl(name, opt);
-        }
-        graph_1.createMetanode = createMetanode;
-        /**
-         * Joins the information from the stats file (memory, compute time) with the
-         * graph information.
-         */
-        function joinStatsInfoWithGraph(graph, stats, devicesForStats) {
-            // Reset stats for each node.
-            _.each(graph.nodes, function (node) { node.stats = null; });
-            _.each(stats.dev_stats, function (devStats) {
-                // Ignore devices that are not selected.
-                if (devicesForStats && !devicesForStats[devStats.device]) {
-                    return;
-                }
-                _.each(devStats.node_stats, function (nodeStats) {
-                    // Lookup the node in the graph by its original name, e.g. A. If not
-                    // found, lookup by the rewritten name A/(A) in case the name is both
-                    // a namespace and a node name.
-                    var nodeName = nodeStats.node_name in graph.nodes ? nodeStats.node_name :
-                        nodeStats.node_name +
-                            graph_1.NAMESPACE_DELIM + '(' + nodeStats.node_name + ')';
-                    // Couldn't find a matching node.
-                    if (!(nodeName in graph.nodes)) {
-                        return;
-                    }
-                    // Compute the total bytes used.
-                    var totalBytes = 0;
-                    if (nodeStats.memory) {
-                        _.each(nodeStats.memory, function (alloc) {
-                            if (alloc.total_bytes) {
-                                if (alloc.total_bytes > 0) {
-                                    totalBytes += Number(alloc.total_bytes);
-                                }
-                                else {
-                                    /* tslint:disable */
-                                    console.log('ignoring negative memory allocation for ' + nodeName);
-                                    /* tslint:enable */
-                                }
-                            }
-                        });
-                    }
-                    var outputSize = null;
-                    if (nodeStats.output) {
-                        outputSize = _.map(nodeStats.output, function (output) {
-                            return _.map(output.tensor_description.shape.dim, function (dim) { return Number(dim.size); });
-                        });
-                    }
-                    graph.nodes[nodeName].device = devStats.device;
-                    if (graph.nodes[nodeName].stats == null) {
-                        graph.nodes[nodeName].stats = new NodeStats(outputSize);
-                    }
-                    graph.nodes[nodeName].stats.addBytesAllocation(totalBytes);
-                    if (nodeStats.all_end_rel_micros) {
-                        if (nodeStats.all_end_rel_micros > 0) {
-                            graph.nodes[nodeName].stats.addExecutionTime(nodeStats.all_start_micros, nodeStats.all_start_micros + nodeStats.all_end_rel_micros);
-                        }
-                        else {
-                            /* tslint:disable */
-                            console.log('ignoring negative runtime for ' + nodeName);
-                            /* tslint:enable */
-                        }
-                    }
-                });
-            });
-        }
-        graph_1.joinStatsInfoWithGraph = joinStatsInfoWithGraph;
-        /**
-         * Execution stats for the node.
-         */
-        var NodeStats = (function () {
-            function NodeStats(outputSize) {
-                /**
-                 * Total number of bytes used for the node. Sum of all children
-                 * if it is a Group node.
-                 */
-                this.totalBytes = 0;
-                this.outputSize = outputSize;
-            }
-            /**
-             * Add the start and end time for a particular kernel execution of this op.
-             * Ops can have multiple kernel executions within the same session run.
-             */
-            NodeStats.prototype.addExecutionTime = function (startTime, endTime) {
-                if (this.startTime != null) {
-                    this.startTime = Math.min(this.startTime, startTime);
-                }
-                else {
-                    this.startTime = startTime;
-                }
-                if (this.endTime != null) {
-                    this.endTime = Math.max(this.endTime, endTime);
-                }
-                else {
-                    this.endTime = endTime;
-                }
-            };
-            /**
-             * Add the bytes allocated for a particular kernel execution of this op.
-             * Ops can have multiple kernel executions within the same session run.
-             */
-            NodeStats.prototype.addBytesAllocation = function (totalBytes) {
-                if (this.totalBytes != null) {
-                    this.totalBytes = Math.max(this.totalBytes, totalBytes);
-                }
-                else {
-                    this.totalBytes = totalBytes;
-                }
-            };
-            Object.defineProperty(NodeStats.prototype, "totalMicros", {
-                /**
-                 * Total number of compute time in microseconds used for the node.
-                 * Sum of all children if it is a Group node. Null if it is unknown.
-                 */
-                get: function () {
-                    if (this.startTime == null || this.endTime == null) {
-                        return null;
-                    }
-                    return this.endTime - this.startTime;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            /**
-             * Combines the specified stats with the current stats.
-             * Modifies the current object. This method is used to
-             * compute aggregate stats for group nodes.
-             */
-            NodeStats.prototype.combine = function (stats) {
-                if (stats.totalBytes != null) {
-                    this.totalBytes += stats.totalBytes;
-                }
-                if (stats.totalMicros != null) {
-                    this.addExecutionTime(stats.startTime, stats.endTime);
-                }
-            };
-            return NodeStats;
-        }());
-        graph_1.NodeStats = NodeStats;
-        var MetanodeImpl = (function () {
-            /** A label object for meta-nodes in the graph hierarchy */
-            function MetanodeImpl(name, opt) {
-                if (opt === void 0) { opt = {}; }
-                this.name = name;
-                this.type = NodeType.META;
-                /** number of levels under this group */
-                this.depth = 1;
-                this.isGroupNode = true;
-                /** # of leaf nodes (including embedded ones) */
-                this.cardinality = 0;
-                /** graph contains metanodes, nodes, edges
-                 * and metaedges for main items within this metanode
-                 */
-                this.metagraph =
-                    createGraph(name, GraphType.META, opt);
-                /** bridgegraph must be constructed lazily-see hierarchy.getBridgegraph() */
-                this.bridgegraph = null;
-                /**
-                 * A dictionary that count ops type of nodes in this metanode
-                 * (op type => count).
-                 */
-                this.opHistogram = {};
-                this.deviceHistogram = {};
-                /** unique id for a metanode of similar subgraph */
-                this.templateId = null;
-                /** Metanode which contains this node, if any */
-                this.parentNode = null;
-                this.hasNonControlEdges = false;
-                this.include = InclusionType.UNSPECIFIED;
-            }
-            MetanodeImpl.prototype.getFirstChild = function () {
-                return this.metagraph.node(this.metagraph.nodes()[0]);
-            };
-            /**
-             * Returns the op node associated with the metanode.
-             * For example, if the metanode is 'sgd', the associated
-             * op node is sgd/(sgd).
-             */
-            MetanodeImpl.prototype.getRootOp = function () {
-                var nameSplit = this.name.split('/');
-                var rootOpName = this.name + '/(' + nameSplit[nameSplit.length - 1] + ')';
-                return this.metagraph.node(rootOpName);
-            };
-            /**
-             * Return an array of the names of all the leaves (non-GroupNodes) inside
-             * this metanode. This performs a breadth-first search of the tree, so
-             * immediate child leaves will appear earlier in the output array than
-             * descendant leaves.
-             */
-            MetanodeImpl.prototype.leaves = function () {
-                var leaves = [];
-                var queue = [this];
-                var metagraph; // Defined here due to a limitation of ES6->5 compilation.
-                while (queue.length) {
-                    var node = queue.shift();
-                    if (node.isGroupNode) {
-                        metagraph = node.metagraph;
-                        _.each(metagraph.nodes(), function (name) { return queue.push(metagraph.node(name)); });
-                    }
-                    else {
-                        leaves.push(node.name);
-                    }
-                }
-                return leaves;
-            };
-            return MetanodeImpl;
-        }());
-        graph_1.MetanodeImpl = MetanodeImpl;
-        ;
-        function createMetaedge(v, w) {
-            return new MetaedgeImpl(v, w);
-        }
-        graph_1.createMetaedge = createMetaedge;
-        /**
-         * A label object for edges between metanodes of subgraphs in the render graph.
-         */
-        var MetaedgeImpl = (function () {
-            function MetaedgeImpl(v, w) {
-                this.v = v;
-                this.w = w;
-                this.baseEdgeList = [];
-                this.inbound = null;
-                this.numRegularEdges = 0;
-                this.numControlEdges = 0;
-                this.numRefEdges = 0;
-                this.totalSize = 0;
-            }
-            MetaedgeImpl.prototype.addBaseEdge = function (edge, h) {
-                this.baseEdgeList.push(edge);
-                if (edge.isControlDependency) {
-                    this.numControlEdges += 1;
-                }
-                else {
-                    this.numRegularEdges += 1;
-                }
-                if (edge.isReferenceEdge) {
-                    this.numRefEdges += 1;
-                }
-                // Compute the size of the tensor flowing through this
-                // base edge.
-                this.totalSize += MetaedgeImpl.computeSizeOfEdge(edge, h);
-                h.maxMetaEdgeSize = Math.max(h.maxMetaEdgeSize, this.totalSize);
-            };
-            MetaedgeImpl.computeSizeOfEdge = function (edge, h) {
-                var opNode = h.node(edge.v);
-                if (opNode.outputShapes == null) {
-                    // No shape information. Asssume a single number. This gives
-                    // a lower bound for the total size.
-                    return 1;
-                }
-                h.hasShapeInfo = true;
-                // Sum the sizes of all output tensors.
-                return _(opNode.outputShapes).map(function (shape) {
-                    // If the shape is unknown, treat it as 1 when computing
-                    // total size. This gives a lower bound for the total size.
-                    if (shape == null) {
-                        return 1;
-                    }
-                    // Multiply all shapes to get the total size of the tensor.
-                    // E.g. The total size of [4, 2, 1] is 4 * 2 * 1.
-                    return _(shape).reduce(function (accumulated, currSize) {
-                        // If this particular dimension is unknown, treat
-                        // it as 1 when computing total size. This gives a lower bound
-                        // for the total size.
-                        if (currSize === -1) {
-                            currSize = 1;
-                        }
-                        return accumulated * currSize;
-                    }, 1);
-                }).sum();
-            };
-            return MetaedgeImpl;
-        }());
-        graph_1.MetaedgeImpl = MetaedgeImpl;
-        function createSeriesNode(prefix, suffix, parent, clusterId, name) {
-            return new SeriesNodeImpl(prefix, suffix, parent, clusterId, name);
-        }
-        graph_1.createSeriesNode = createSeriesNode;
-        function getSeriesNodeName(prefix, suffix, parent, startId, endId) {
-            var numRepresentation = (typeof startId !== 'undefined' && typeof endId !== 'undefined') ?
-                '[' + startId + '-' + endId + ']' :
-                '#';
-            var pattern = prefix + numRepresentation + suffix;
-            return (parent ? parent + '/' : '') + pattern;
-        }
-        graph_1.getSeriesNodeName = getSeriesNodeName;
-        var SeriesNodeImpl = (function () {
-            function SeriesNodeImpl(prefix, suffix, parent, clusterId, name) {
-                this.name = name || getSeriesNodeName(prefix, suffix, parent);
-                this.type = NodeType.SERIES;
-                this.hasLoop = false;
-                this.prefix = prefix;
-                this.suffix = suffix;
-                this.clusterId = clusterId;
-                this.ids = [];
-                this.parent = parent;
-                this.isGroupNode = true;
-                this.cardinality = 0;
-                this.metagraph = createGraph(name, GraphType.SERIES);
-                // bridgegraph must be constructed lazily-see hierarchy.getBridgegraph()
-                this.bridgegraph = null;
-                this.parentNode = null;
-                this.deviceHistogram = {};
-                this.hasNonControlEdges = false;
-                this.include = InclusionType.UNSPECIFIED;
-            }
-            return SeriesNodeImpl;
-        }());
-        /**
-         * Extracts the shapes of the output tensors from the attr property in the
-         * node proto.
-         */
-        // tslint:disable-next-line:no-any
-        function extractOutputShapes(attr) {
-            var result = null;
-            // We don't know anything about the output tensors.
-            if (!attr) {
-                return null;
-            }
-            for (var i = 0; i < attr.length; i++) {
-                var _a = attr[i], key = _a.key, value = _a.value;
-                if (key === OUTPUT_SHAPES_KEY) {
-                    if (!value.list.shape) {
-                        // The OUTPUT_SHAPES_KEY lacks a value. We know nothing about the shape.
-                        return null;
-                    }
-                    // Map all output tensors into array of numbers denoting their shape.
-                    var result_1 = value.list.shape.map(function (shape) {
-                        if (shape.unknown_rank) {
-                            // This output tensor is of unknown rank. We don't know if it is a
-                            // scalar, or a tensor, or of what shape it is.
-                            return null;
-                        }
-                        if (shape.dim == null ||
-                            (shape.dim.length === 1 && shape.dim[0].size == null)) {
-                            // This output tensor is a scalar.
-                            return [];
-                        }
-                        // This output tensor has a known rank. Map each dimension size
-                        // into a number.
-                        return shape.dim.map(function (dim) {
-                            // Size can be -1 if this particular dimension is unknown.
-                            return dim.size;
-                        });
-                    });
-                    // Since we already processed it, remove the entry from the attribute
-                    // list (saves memory).
-                    attr.splice(i, 1);
-                    return result_1;
-                }
-            }
-            // We didn't find OUTPUT_SHAPES_KEY in attributes, so we don't know anything
-            // about the output tensors.
-            return null;
-        }
-        /**
-         * Extracts the XLA Cluster that an op runs on from the attrs of the OpNode.
-         * @param attr The attr property.
-         * @return A string that is the name of the cluster. Or null if it could not be
-         *     determined.
-         */
-        // tslint:disable-next-line:no-any
-        function extractXlaCluster(attr) {
-            if (!attr) {
-                return null;
-            }
-            // Find the attribute for XLA cluster if there is one.
-            for (var i = 0; i < attr.length; i++) {
-                if (attr[i].key === _XLA_CLUSTER_KEY) {
-                    return attr[i].value['s'] || null;
-                }
-            }
-            return null;
-        }
-        /**
-         * Normalizes the inputs and extracts associated metadata:
-         * 1) Inputs can contain a colon followed by a number at the end
-         *    (e.g. inputName:1) and we remove this from the input name, and take note
-         *    that the input was numbered.
-         * 2) Control dependency inputs contain caret at the beginning and we
-         *    remove this and annotate the edge as a control dependency.
-         * @param inputs Array of unnormalized names of input nodes.
-         */
-        function normalizeInputs(inputs) {
-            var normalizedInputs = [];
-            _.each(inputs, function (inputName) {
-                var start = inputName[0] === '^';
-                var colon = inputName.lastIndexOf(':');
-                var end = colon !== -1 &&
-                    inputName.length - colon > 1 &&
-                    !(/\D/).test(inputName.substring(colon + 1)) ?
-                    colon : inputName.length;
-                var name = inputName.substring(start ? 1 : 0, end);
-                if (normalizedInputs.length === 0 ||
-                    name !== normalizedInputs[normalizedInputs.length - 1].name) {
-                    normalizedInputs.push({
-                        name: name,
-                        outputTensorIndex: end === inputName.length ? 0 : Number(inputName.slice(colon + 1)),
-                        isControlDependency: start
-                    });
-                }
-            });
-            return normalizedInputs;
-        }
-        function addEdgeToGraph(graph, inputName, outputNode, input, params, index) {
-            // Don't allow loops in the graph.
-            if (inputName === outputNode.name) {
-                return;
-            }
-            // Check if this op type and input number corresponds to a
-            // reference edge using the refEdges dictionary in the params.
-            var isRefEdge = params.refEdges[outputNode.op + ' ' + index] === true;
-            graph.edges.push({
-                v: inputName,
-                w: outputNode.name,
-                outputTensorIndex: input.outputTensorIndex,
-                isControlDependency: input.isControlDependency,
-                isReferenceEdge: isRefEdge
-            });
-        }
-        function build(rawNodes, params, tracker) {
-            /**
-             * A dictionary that maps each in-embedding node name to the node
-             * object.
-             */
-            var inEmbedding = {};
-            /**
-             * A dictionary that maps each out-embedding node name to the node
-             * object.
-             */
-            var outEmbedding = {};
-            /**
-             * A dictionary that maps each node name to an array of the node's
-             * out-embedding node label objects.
-             */
-            var outEmbeddings = {};
-            var isInEmbeddedPred = getEmbedPredicate(params.inEmbeddingTypes);
-            var isOutEmbeddedPred = getEmbedPredicate(params.outEmbeddingTypes);
-            var embeddingNodeNames = [];
-            /**
-             * A list of all the non-embedding node names which appear in the processed
-             * list of raw nodes. Here we pre-allocate enough room for all the rawNodes,
-             * even though there will some number of embeddings. The excess array length
-             * is spliced off later.
-             *
-             * Experimentation shows that around 30% of the array will go unused, and
-             * even for very large networks that amounts to less than 10k spaces.
-             */
-            var nodeNames = new Array(rawNodes.length);
-            return tf.graph.util
-                .runAsyncTask('Normalizing names', 30, function () {
-                var opNodes = new Array(rawNodes.length);
-                var index = 0;
-                _.each(rawNodes, function (rawNode) {
-                    var opNode = new OpNodeImpl(rawNode);
-                    if (isInEmbeddedPred(opNode)) {
-                        embeddingNodeNames.push(opNode.name);
-                        inEmbedding[opNode.name] = opNode;
-                        return;
-                    }
-                    if (isOutEmbeddedPred(opNode)) {
-                        embeddingNodeNames.push(opNode.name);
-                        outEmbedding[opNode.name] = opNode;
-                        _.each(opNode.inputs, function (input) {
-                            var inputName = input.name;
-                            outEmbeddings[inputName] = outEmbeddings[inputName] || [];
-                            outEmbeddings[inputName].push(opNode);
-                        });
-                        return;
-                    }
-                    // The node is not an embedding, so add it to the names and nodes
-                    // lists.
-                    opNodes[index] = opNode;
-                    nodeNames[index] = opNode.name;
-                    index++;
-                });
-                opNodes.splice(index);
-                nodeNames.splice(index);
-                return opNodes;
-            }, tracker)
-                .then(function (opNodes) {
-                // Create the graph data structure from the graphlib library.
-                return tf.graph.util.runAsyncTask('Building the data structure', 70, function () {
-                    var normalizedNameDict = mapStrictHierarchy(nodeNames, embeddingNodeNames);
-                    var graph = new SlimGraph;
-                    // Add the nodes to the graph.
-                    _.each(opNodes, function (opNode) {
-                        var normalizedName = normalizedNameDict[opNode.name] || opNode.name;
-                        graph.nodes[normalizedName] = opNode;
-                        // Check if the node has out-embeddings. If yes, add them to the
-                        // node.
-                        if (opNode.name in outEmbeddings) {
-                            opNode.outEmbeddings = outEmbeddings[opNode.name];
-                            // Normalize the names of the out-embeddings.
-                            _.each(opNode.outEmbeddings, function (node) {
-                                node.name = normalizedNameDict[node.name] || node.name;
-                            });
-                        }
-                        // Update the name of the node.
-                        opNode.name = normalizedName;
-                    });
-                    // Visit each node's inputs to add the edges to the graph. If the
-                    // input
-                    // is an in-embedding, then add it to the node's in-embeddings
-                    // instead.
-                    _.each(opNodes, function (opNode) {
-                        _.each(opNode.inputs, function (input, i) {
-                            var inputName = input.name;
-                            if (inputName in inEmbedding) {
-                                var inEmbedNode = inEmbedding[inputName];
-                                opNode.inEmbeddings.push(inEmbedNode);
-                                // Move the inputs of the in-embedding node into incoming
-                                // edges of
-                                // the main node. E.g. the control dependency of a constant
-                                // node
-                                // should be moved to the op node where the constant is
-                                // embedded.
-                                for (var _i = 0, _a = inEmbedNode.inputs; _i < _a.length; _i++) {
-                                    var embedInput = _a[_i];
-                                    addEdgeToGraph(graph, normalizedNameDict[embedInput.name] ||
-                                        embedInput.name, opNode, embedInput, params, i);
-                                }
-                            }
-                            else if (inputName in outEmbedding) {
-                                // Move the inputs of the out-embedding node into inputs of
-                                // the main node where the out-embedding points to.
-                                var outEmbedNode = outEmbedding[inputName];
-                                for (var _b = 0, _c = outEmbedNode.inputs; _b < _c.length; _b++) {
-                                    var embedInput = _c[_b];
-                                    addEdgeToGraph(graph, normalizedNameDict[embedInput.name] ||
-                                        embedInput.name, opNode, input, params, i);
-                                }
-                            }
-                            else {
-                                addEdgeToGraph(graph, normalizedNameDict[inputName] || inputName, opNode, input, params, i);
-                            }
-                        });
-                    });
-                    // Normalize the names of in-embeddings.
-                    _.each(inEmbedding, function (node, name) {
-                        node.name = normalizedNameDict[node.name] || node.name;
-                    });
-                    return graph;
-                }, tracker);
-            });
-        }
-        graph_1.build = build;
-        ;
-        /**
-         * Create a new graphlib.Graph() instance with default parameters
-         */
-        function createGraph(name, type, opt) {
-            if (opt === void 0) { opt = {}; }
-            var graph = new graphlib.Graph(opt);
-            graph.setGraph({
-                name: name,
-                rankdir: 'BT',
-                type: type
-            });
-            return graph;
-        }
-        graph_1.createGraph = createGraph;
-        ;
-        /**
-         * Create a predicate for checking whether a node should be embedded based on
-         * the specified types.
-         */
-        function getEmbedPredicate(types) {
-            return function (node) {
-                // check types
-                for (var i = 0; i < types.length; i++) {
-                    var regExp = new RegExp(types[i]);
-                    if (node.op.match(regExp)) {
-                        return true;
-                    }
-                }
-                return false;
-            };
-        }
-        ;
-        /**
-         * Returns a strict node name (name => name/(name)) to avoid conflicts
-         * where the node name is also a namespace.
-         */
-        function getStrictName(name) {
-            var parts = name.split(graph_1.NAMESPACE_DELIM);
-            return name + graph_1.NAMESPACE_DELIM + '(' + parts[parts.length - 1] + ')';
-        }
-        graph_1.getStrictName = getStrictName;
-        /**
-         * For each op node (embedding or non-embedding), rename it if there is a
-         * non-embedding node under its namespace. For example, assume node name 'A'.
-         * If there is a non-embedding node under its namespace (e.g. 'A/B'), 'A' will
-         * be renamed to 'A/(A)'. Then the namespace 'A' will contain 2 nodes: '(A)'
-         * and 'B'. If all the nodes under 'A' are embedding nodes (e.g. constant and
-         * summary), keep 'A' as an Op node and don't create a namespace.
-         *
-         * @param nodeNames An array of regular (non-embedding) node names.
-         * @param embeddingNodeNames An array of embedding node names.
-         * @return Dictionary object mapping names that need to be renamed to
-         *     new names.
-         */
-        function mapStrictHierarchy(nodeNames, embeddingNodeNames) {
-            /** Dictionary that maps the old new to the new name */
-            var newNameDictionary = {};
-            /** Set used to store all namespaces. */
-            var namespaceSet = {};
-            // sort the nodes to make prefix check faster
-            nodeNames.sort();
-            // look for nodes with a prefix a,a/b -> a/(a),a/b
-            for (var i = 0; i < nodeNames.length - 1; ++i) {
-                var a = nodeNames[i];
-                // Get all the parent namespaces of the current node
-                // and add them in the namespace set.
-                _.each(getHierarchicalPath(a).slice(0, -1), function (ns) {
-                    namespaceSet[ns] = true;
-                });
-                for (var j = i + 1; j < nodeNames.length; ++j) {
-                    var b = nodeNames[j];
-                    if (_.startsWith(b, a)) {
-                        if (b.length > a.length && b.charAt(a.length) === graph_1.NAMESPACE_DELIM) {
-                            newNameDictionary[a] = getStrictName(a);
-                            break;
-                        }
-                    }
-                    else {
-                        break;
-                    }
-                }
-            }
-            // Go through all the embedding node names and rename them in case they
-            // collide with namespaces.
-            _.each(embeddingNodeNames, function (embeddingName) {
-                if (embeddingName in namespaceSet) {
-                    // Rename to follow strict hierarchy.
-                    newNameDictionary[embeddingName] = getStrictName(embeddingName);
-                }
-            });
-            return newNameDictionary;
-        }
-        ;
-        /**
-         * Returns a list of the degrees of each node in the graph.
-         */
-        function degreeSequence(graph) {
-            var degrees = graph.nodes().map(function (name) {
-                return graph.neighbors(name).length;
-            });
-            degrees.sort();
-            return degrees;
-        }
-        ;
-        /**
-         * Returns if the degree sequence of the two graphs is the same.
-         */
-        function hasSimilarDegreeSequence(graph1, graph2) {
-            var dg1 = degreeSequence(graph1);
-            var dg2 = degreeSequence(graph2);
-            for (var i = 0; i < dg1.length; i++) {
-                if (dg1[i] !== dg2[i]) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        graph_1.hasSimilarDegreeSequence = hasSimilarDegreeSequence;
-        ;
-        /**
-         * Returns the hierarchical path of the current node, based on the node's name.
-         * For example, if the name is 'a/b/c', the returned path is
-         * ['a', 'a/b', 'a/b/c'].
-         */
-        function getHierarchicalPath(name, seriesNames) {
-            var path = [];
-            var i = name.indexOf(graph_1.NAMESPACE_DELIM);
-            // Push all parent portions of the path.
-            while (i >= 0) {
-                path.push(name.substring(0, i));
-                i = name.indexOf(graph_1.NAMESPACE_DELIM, i + 1);
-            }
-            // If the node's path is under a series, then add the series node name to the
-            // hierarchical path as the parent of the leaf.
-            if (seriesNames) {
-                var seriesName = seriesNames[name];
-                if (seriesName) {
-                    path.push(seriesName);
-                }
-            }
-            // Push the leaf of the path.
-            path.push(name);
-            return path;
-        }
-        graph_1.getHierarchicalPath = getHierarchicalPath;
-        ;
-        /**
-         * Returns the string for the node inclusion toggle button, dependant
-         * on the provided current InclusionType.
-         */
-        function getIncludeNodeButtonString(include) {
-            if (include === tf.graph.InclusionType.EXCLUDE) {
-                return 'Add to main graph';
-            }
-            else {
-                return 'Remove from main graph';
-            }
-        }
-        graph_1.getIncludeNodeButtonString = getIncludeNodeButtonString;
-        ;
-        /**
-         * Returns the string for the series node grouping toggle button, dependant
-         * on the provided current SeriesGroupingType.
-         */
-        function getGroupSeriesNodeButtonString(group) {
-            if (group === tf.graph.SeriesGroupingType.GROUP) {
-                return 'Ungroup this series of nodes';
-            }
-            else {
-                return 'Group this series of nodes';
-            }
-        }
-        graph_1.getGroupSeriesNodeButtonString = getGroupSeriesNodeButtonString;
-        ;
-        /**
-         * Toggle the node series grouping option in the provided map, setting it
-         * to ungroup if the series is not already in the map.
-         */
-        function toggleNodeSeriesGroup(map, name) {
-            if (!(name in map) || map[name] === tf.graph.SeriesGroupingType.GROUP) {
-                map[name] = tf.graph.SeriesGroupingType.UNGROUP;
-            }
-            else {
-                map[name] = tf.graph.SeriesGroupingType.GROUP;
-            }
-        }
-        graph_1.toggleNodeSeriesGroup = toggleNodeSeriesGroup;
-        ;
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module tf.graph
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/**
- * Package for the Graph Hierarchy for TensorFlow graph.
- */
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph_1) {
-        var hierarchy;
-        (function (hierarchy_1) {
-            /**
-             * Class for the Graph Hierarchy for TensorFlow graph.
-             */
-            var HierarchyImpl = (function () {
-                function HierarchyImpl() {
-                    this.hasShapeInfo = false;
-                    this.maxMetaEdgeSize = 1;
-                    this.root = graph_1.createMetanode(graph_1.ROOT_NAME, { compound: true });
-                    this.templates = null;
-                    this.devices = null;
-                    /**
-                     * @type {Object} Dictionary object that maps node name to the node
-                     * (could be op-node, metanode, or series-node)
-                     */
-                    this.index = {};
-                    this.index[graph_1.ROOT_NAME] = this.root;
-                    this.orderings = {};
-                }
-                HierarchyImpl.prototype.getNodeMap = function () {
-                    return this.index;
-                };
-                HierarchyImpl.prototype.node = function (name) {
-                    return this.index[name];
-                };
-                HierarchyImpl.prototype.setNode = function (name, node) {
-                    this.index[name] = node;
-                };
-                /**
-                 * Given the name of a node in this hierarchy, get its bridgegraph, creating
-                 * it on the fly if necessary. If the node is not a GroupNode, then this
-                 * method returns null. If the provided name does not map to a node in the
-                 * hierarchy, an error will be thrown.
-                 */
-                HierarchyImpl.prototype.getBridgegraph = function (nodeName) {
-                    var _this = this;
-                    var node = this.index[nodeName];
-                    if (!node) {
-                        throw Error('Could not find node in hierarchy: ' + nodeName);
-                    }
-                    if (!('metagraph' in node)) {
-                        return null;
-                    }
-                    var groupNode = node;
-                    if (groupNode.bridgegraph) {
-                        return groupNode.bridgegraph;
-                    }
-                    var bridgegraph = groupNode.bridgegraph =
-                        graph_1.createGraph('BRIDGEGRAPH', graph_1.GraphType.BRIDGE);
-                    if (!node.parentNode || !('metagraph' in node.parentNode)) {
-                        return bridgegraph;
-                    }
-                    var parentNode = node.parentNode;
-                    var parentMetagraph = parentNode.metagraph;
-                    var parentBridgegraph = this.getBridgegraph(parentNode.name);
-                    // For each of the parent node's two Metaedge containing graphs, process
-                    // each Metaedge involving this node.
-                    _.each([parentMetagraph, parentBridgegraph], function (parentGraph) {
-                        _(parentGraph.edges())
-                            .filter(function (e) { return e.v === nodeName || e.w === nodeName; })
-                            .each(function (parentEdgeObj) {
-                            var inbound = parentEdgeObj.w === nodeName;
-                            var parentMetaedge = parentGraph.edge(parentEdgeObj);
-                            // The parent's Metaedge represents some number of underlying
-                            // BaseEdges from the original full graph. For each of those, we need
-                            // to determine which immediate child is involved and make sure
-                            // there's a Metaedge in the bridgegraph that covers it.
-                            _.each(parentMetaedge.baseEdgeList, function (baseEdge) {
-                                // Based on the direction, figure out which is the descendant node
-                                // and which is the 'other' node (sibling of parent or ancestor).
-                                var _a = inbound ?
-                                    [baseEdge.w, parentEdgeObj.v] :
-                                    [baseEdge.v, parentEdgeObj.w], descendantName = _a[0], otherName = _a[1];
-                                // Determine the immediate child containing this descendant node.
-                                var childName = _this.getChildName(nodeName, descendantName);
-                                // Look for an existing Metaedge in the bridgegraph (or create a
-                                // new one) that covers the relationship between child and other.
-                                var bridgeEdgeObj = {
-                                    v: inbound ? otherName : childName,
-                                    w: inbound ? childName : otherName,
-                                };
-                                var bridgeMetaedge = bridgegraph.edge(bridgeEdgeObj);
-                                if (!bridgeMetaedge) {
-                                    bridgeMetaedge = graph_1.createMetaedge(bridgeEdgeObj.v, bridgeEdgeObj.w);
-                                    bridgeMetaedge.inbound = inbound;
-                                    bridgegraph.setEdge(bridgeEdgeObj.v, bridgeEdgeObj.w, bridgeMetaedge);
-                                }
-                                // Copy the BaseEdge from the parent's Metaedge into this
-                                // bridgegraph Metaedge.
-                                bridgeMetaedge.addBaseEdge(baseEdge, _this);
-                            });
-                        })
-                            .value(); // force lodash chain execution.
-                    });
-                    return bridgegraph;
-                };
-                /**
-                 * Utility function for determining the name of the immediate child under a
-                 * node for a given descendant path. If the descendant corresponds to no
-                 * immediate child, an error is thrown.
-                 */
-                HierarchyImpl.prototype.getChildName = function (nodeName, descendantName) {
-                    // Walk up the hierarchy from the descendant to find the child.
-                    var currentNode = this.index[descendantName];
-                    while (currentNode) {
-                        if (currentNode.parentNode && currentNode.parentNode.name === nodeName) {
-                            return currentNode.name;
-                        }
-                        currentNode = currentNode.parentNode;
-                    }
-                    throw Error('Could not find immediate child for descendant: ' + descendantName);
-                };
-                ;
-                /** Given the name of a node, return its incoming metaedges. */
-                HierarchyImpl.prototype.getPredecessors = function (nodeName) {
-                    var _this = this;
-                    var node = this.index[nodeName];
-                    if (!node) {
-                        throw Error('Could not find node with name: ' + nodeName);
-                    }
-                    var predecessors = this.getOneWayEdges(node, true);
-                    // Add embedded predecessors, such as constants.
-                    if (!node.isGroupNode) {
-                        _.each(node.inEmbeddings, function (embeddedNode) {
-                            _.each(node.inputs, function (input) {
-                                if (input.name === embeddedNode.name) {
-                                    // Make a new metaedge holding the edge between the
-                                    // node and the in-embedding.
-                                    var metaedge = new graph_1.MetaedgeImpl(embeddedNode.name, nodeName);
-                                    metaedge.addBaseEdge({
-                                        isControlDependency: input.isControlDependency,
-                                        outputTensorIndex: input.outputTensorIndex,
-                                        isReferenceEdge: false,
-                                        v: embeddedNode.name,
-                                        w: nodeName
-                                    }, _this);
-                                    predecessors.regular.push(metaedge);
-                                }
-                            });
-                        });
-                    }
-                    return predecessors;
-                };
-                /**
-                 * Given the name of a node, return its outgoing metaedges.
-                 *
-                 * This is the inverse of getPredecessors(). See that method's documentation
-                 * for an in-depth example.
-                 */
-                HierarchyImpl.prototype.getSuccessors = function (nodeName) {
-                    var _this = this;
-                    var node = this.index[nodeName];
-                    if (!node) {
-                        throw Error('Could not find node with name: ' + nodeName);
-                    }
-                    var successors = this.getOneWayEdges(node, false);
-                    // Add embedded successors, such as summaries.
-                    if (!node.isGroupNode) {
-                        _.each(node.outEmbeddings, function (embeddedNode) {
-                            _.each(embeddedNode.inputs, function (input) {
-                                if (input.name === nodeName) {
-                                    // Make a new metaedge holding the edge between the
-                                    // node and the out-embedding.
-                                    var metaedge = new graph_1.MetaedgeImpl(nodeName, embeddedNode.name);
-                                    metaedge.addBaseEdge({
-                                        isControlDependency: input.isControlDependency,
-                                        outputTensorIndex: input.outputTensorIndex,
-                                        isReferenceEdge: false,
-                                        v: nodeName,
-                                        w: embeddedNode.name
-                                    }, _this);
-                                    successors.regular.push(metaedge);
-                                }
-                            });
-                        });
-                    }
-                    return successors;
-                };
-                /** Helper method for getPredecessors and getSuccessors */
-                HierarchyImpl.prototype.getOneWayEdges = function (node, inEdges) {
-                    var edges = { control: [], regular: [] };
-                    // A node with no parent cannot have any edges.
-                    if (!node.parentNode || !node.parentNode.isGroupNode) {
-                        return edges;
-                    }
-                    var parentNode = node.parentNode;
-                    var metagraph = parentNode.metagraph;
-                    var bridgegraph = this.getBridgegraph(parentNode.name);
-                    findEdgeTargetsInGraph(metagraph, node, inEdges, edges);
-                    findEdgeTargetsInGraph(bridgegraph, node, inEdges, edges);
-                    return edges;
-                };
-                /**
-                 * For a given GroupNode, get or calculate an object which describes a
-                 * topological ordering of child nodes within that GroupNode's metagraph.
-                 *
-                 * This ordering is used when rendering bridge control edges which are
-                 * sometimes backwards relative to the dataflow.
-                 *
-                 * For example, say we have a graph with two edges A->B and A->C, and we're
-                 * interested in the ordering under ROOT. In this case, any of the following
-                 * would be legitimate return values:
-                 *
-                 *  - { 'A': 0, 'B': 1, 'C': 2 } -- most likely
-                 *  - { 'A': 0, 'B': 2, 'C': 1 } -- less likely
-                 *  - { 'A': 12, 'B': 100, 'C': 99 } -- unlikely, but still OK
-                 *
-                 * The algorithm does not guarantee that all numbers from 0-N (where N is
-                 * the number of nodes) appear exactly once. Rather it guarantees that if
-                 * there is a path between two nodes, the earlier one will have a lower
-                 * number in the ordering hash.
-                 *
-                 * When generating the ordering, we ignore control Metaedges (those which
-                 * represent only BaseEdges that have isControlDependency set to true).
-                 *
-                 * If there is no node with the specified name, an error is thrown. If the
-                 * node with the specified name is not a group node, null is returned.
-                 */
-                HierarchyImpl.prototype.getTopologicalOrdering = function (nodeName) {
-                    var node = this.index[nodeName];
-                    if (!node) {
-                        throw Error('Could not find node with name: ' + nodeName);
-                    }
-                    if (!node.isGroupNode) {
-                        return null;
-                    }
-                    if (nodeName in this.orderings) {
-                        return this.orderings[nodeName];
-                    }
-                    // Mapping of a child node names to lists of their successors.
-                    var successors = {};
-                    // Set of node names which have appeared as a destination.
-                    var destinations = {};
-                    var metagraph = node.metagraph;
-                    _.each(metagraph.edges(), function (e) {
-                        if (!metagraph.edge(e).numRegularEdges) {
-                            return; // Skip control edges.
-                        }
-                        // Keep track of successors and destinations.
-                        if (!(e.v in successors)) {
-                            successors[e.v] = [];
-                        }
-                        successors[e.v].push(e.w);
-                        destinations[e.w] = true;
-                    });
-                    // Seed the queue with true sources (those that are not destinations).
-                    var queue = _.difference(_.keys(successors), _.keys(destinations));
-                    // Produce an ordering by traversing the graph breadth first.
-                    var ordering = this.orderings[nodeName] = {};
-                    var index = 0;
-                    while (queue.length) {
-                        var childName = queue.shift();
-                        ordering[childName] = index++;
-                        _.each(successors[childName], function (succName) { return queue.push(succName); });
-                        delete successors[childName]; // Prevent cycles from infinite looping.
-                    }
-                    return ordering;
-                };
-                /**
-                 * Returns a d3 Ordinal function that can be used to look up the index of
-                 * a node based on its template id.
-                 */
-                HierarchyImpl.prototype.getTemplateIndex = function () {
-                    var templateNames = d3.keys(this.templates);
-                    var templateIndex = d3.scale.ordinal()
-                        .domain(templateNames)
-                        .range(d3.range(0, templateNames.length));
-                    return function (templateId) { return templateIndex(templateId); };
-                };
-                return HierarchyImpl;
-            }());
-            /**
-             * Internal utility function - given a graph (should be either a metagraph or a
-             * bridgegraph) and a node which is known to be in that graph, determine
-             * the other ends of edges that involve that node in the direction specified
-             * by whether it's inbound.
-             *
-             * For example if you wanted to find the predecessors of a node, you'd call
-             * this method for the parent's metagraph and bridgegraph, specifying inbound
-             * as true (look at the source of inbound edges to the specified node).
-             *
-             * Discovered target names are appended to the targets array.
-             */
-            function findEdgeTargetsInGraph(graph, node, inbound, targets) {
-                var edges = inbound ? graph.inEdges(node.name) : graph.outEdges(node.name);
-                _.each(edges, function (e) {
-                    var metaedge = graph.edge(e);
-                    var targetList = metaedge.numRegularEdges ? targets.regular : targets.control;
-                    targetList.push(metaedge);
-                });
-            }
-            /**
-             * @param graph The raw graph.
-             * @param params Parameters used when building a hierarchy.
-             */
-            function build(graph, params, tracker) {
-                var h = new HierarchyImpl();
-                var seriesNames = {};
-                return tf.graph.util
-                    .runAsyncTask('Adding nodes', 20, function () {
-                    // Get all the possible device and XLA cluster names.
-                    var deviceNames = {};
-                    var xlaClusterNames = {};
-                    _.each(graph.nodes, function (node, nodeName) {
-                        if (node.device) {
-                            deviceNames[node.device] = true;
-                        }
-                        if (node.xlaCluster) {
-                            xlaClusterNames[node.xlaCluster] = true;
-                        }
-                    });
-                    h.devices = _.keys(deviceNames);
-                    h.xlaClusters = _.keys(xlaClusterNames);
-                    addNodes(h, graph);
-                }, tracker)
-                    .then(function () {
-                    return tf.graph.util.runAsyncTask('Detect series', 20, function () {
-                        if (params.seriesNodeMinSize > 0) {
-                            groupSeries(h.root, h, seriesNames, params.seriesNodeMinSize, params.seriesMap);
-                        }
-                    }, tracker);
-                })
-                    .then(function () {
-                    return tf.graph.util.runAsyncTask('Adding edges', 30, function () {
-                        addEdges(h, graph, seriesNames);
-                    }, tracker);
-                })
-                    .then(function () {
-                    return tf.graph.util.runAsyncTask('Finding similar subgraphs', 30, function () {
-                        h.templates = graph_1.template.detect(h, params.verifyTemplate);
-                    }, tracker);
-                })
-                    .then(function () {
-                    return h;
-                });
-            }
-            hierarchy_1.build = build;
-            ;
-            function joinAndAggregateStats(h, stats) {
-                // Get all the possible device names.
-                var deviceNames = {};
-                _.each(h.root.leaves(), function (nodeName) {
-                    var leaf = h.node(nodeName);
-                    if (leaf.device != null) {
-                        deviceNames[leaf.device] = true;
-                    }
-                });
-                h.devices = _.keys(deviceNames);
-                // Reset stats for each group node.
-                _.each(h.getNodeMap(), function (node, nodeName) {
-                    if (node.isGroupNode) {
-                        node.stats = new graph_1.NodeStats(null);
-                        node.deviceHistogram = {};
-                    }
-                });
-                // Bubble-up the stats and device distribution from leaves to parents.
-                _.each(h.root.leaves(), function (nodeName) {
-                    var leaf = h.node(nodeName);
-                    var node = leaf;
-                    while (node.parentNode != null) {
-                        if (leaf.device != null) {
-                            var deviceHistogram = node.parentNode.deviceHistogram;
-                            deviceHistogram[leaf.device] = (deviceHistogram[leaf.device] || 0) + 1;
-                        }
-                        if (leaf.stats != null) {
-                            node.parentNode.stats.combine(leaf.stats);
-                        }
-                        node = node.parentNode;
-                    }
-                });
-            }
-            hierarchy_1.joinAndAggregateStats = joinAndAggregateStats;
-            /**
-             * Creates the metanodes in the hierarchical graph and assigns parent-child
-             * relationship between them.
-             */
-            function addNodes(h, graph) {
-                _.each(graph.nodes, function (node, nodeName) {
-                    var path = graph_1.getHierarchicalPath(node.name);
-                    var parent = h.root;
-                    parent.depth = Math.max(path.length, parent.depth);
-                    // Create parent metanodes for each depth. For example if the node name
-                    // is 'a/b/c', then create metanodes 'a' and 'a/b', where 'a/b' is a child
-                    // of a.
-                    for (var i = 0; i < path.length; i++) {
-                        parent.depth = Math.max(parent.depth, path.length - i);
-                        parent.cardinality += node.cardinality;
-                        parent.opHistogram[node.op] = (parent.opHistogram[node.op] || 0) + 1;
-                        if (node.device != null) {
-                            parent.deviceHistogram[node.device] =
-                                (parent.deviceHistogram[node.device] || 0) + 1;
-                        }
-                        if (i === path.length - 1) {
-                            break;
-                        }
-                        var name_1 = path[i];
-                        var child = h.node(name_1);
-                        if (!child) {
-                            child = graph_1.createMetanode(name_1);
-                            child.parentNode = parent;
-                            h.setNode(name_1, child);
-                            parent.metagraph.setNode(name_1, child);
-                        }
-                        parent = child;
-                    }
-                    // Assuming node name is 'a/b/c', assign the OpNode as a child of the
-                    // metanode 'a/b'.
-                    h.setNode(node.name, node);
-                    node.parentNode = parent;
-                    parent.metagraph.setNode(node.name, node);
-                    // Add each of the in-embeddings and out-embeddings in the hierarchy.
-                    _.each(node.inEmbeddings, function (embedding) {
-                        h.setNode(embedding.name, embedding);
-                        embedding.parentNode = node;
-                    });
-                    _.each(node.outEmbeddings, function (embedding) {
-                        h.setNode(embedding.name, embedding);
-                        embedding.parentNode = node;
-                    });
-                });
-            }
-            ;
-            /**
-             * For each metanode in the hierarchical graph, this method adds:
-             * the edges in the metagraph. These are edges between nodes
-             * that share the same parent.
-             */
-            function addEdges(h, graph, seriesNames) {
-                var nodeIndex = h.getNodeMap();
-                // Ancestor paths for the source and destination nodes of an edge. These are
-                // reused for each edge rather than allocating new ones. It's about 10% faster
-                // than allocating new ones on each pass through the loop.
-                var sourcePath = [];
-                var destPath = [];
-                // Insert the ancestor path for a node into the provided array, including the
-                // node itself. Return the index of the last node inserted (always ROOT).
-                var getPath = function (node, path) {
-                    var i = 0;
-                    while (node) {
-                        path[i++] = node.name;
-                        node = node.parentNode;
-                    }
-                    return i - 1;
-                };
-                _.each(graph.edges, function (baseEdge) {
-                    // Get the hierarchical paths for the source and destination of the edge.
-                    var sourceAncestorIndex = getPath(graph.nodes[baseEdge.v], sourcePath);
-                    var destAncestorIndex = getPath(graph.nodes[baseEdge.w], destPath);
-                    // If the hierarchical path cannot be found for either endpoint, then we
-                    // cannot create the edge. This happens for example when a node has a
-                    // control dependency on a summary node, which are embedded.
-                    if (sourceAncestorIndex === -1 || destAncestorIndex === -1) {
-                        return;
-                    }
-                    // Find the lowest shared ancestor between source and dest by looking for
-                    // the highest nodes that differ between their ancestor paths.
-                    while (sourcePath[sourceAncestorIndex] === destPath[destAncestorIndex]) {
-                        sourceAncestorIndex--;
-                        destAncestorIndex--;
-                        if (sourceAncestorIndex < 0 || destAncestorIndex < 0) {
-                            // This would only occur if the two nodes were the same (a cycle in the
-                            // graph), or if one endpoint was a strict ancestor of the other. The
-                            // latter shouldn't happen because we rename nodes which are both
-                            // metanodes and op nodes. E.g. 'A/B' becomes 'A/B/(B)'.
-                            throw Error('No difference found between ancestor paths.');
-                        }
-                    }
-                    var sharedAncestorNode = nodeIndex[sourcePath[sourceAncestorIndex + 1]];
-                    var sourceAncestorName = sourcePath[sourceAncestorIndex];
-                    var destAncestorName = destPath[destAncestorIndex];
-                    // Find or create the Metaedge which should contain this BaseEdge inside
-                    // the shared ancestor.
-                    var metaedge = sharedAncestorNode.metagraph.edge(sourceAncestorName, destAncestorName);
-                    if (!metaedge) {
-                        metaedge = graph_1.createMetaedge(sourceAncestorName, destAncestorName);
-                        sharedAncestorNode.metagraph
-                            .setEdge(sourceAncestorName, destAncestorName, metaedge);
-                    }
-                    if (!sharedAncestorNode.hasNonControlEdges &&
-                        !baseEdge.isControlDependency) {
-                        sharedAncestorNode.hasNonControlEdges = true;
-                    }
-                    metaedge.addBaseEdge(baseEdge, h);
-                });
-            }
-            ;
-            /**
-             * Using the hierarchy template information, detect series in the provided
-             * metanode.  For each detected series, create a new SeriesNode
-             * and remove series members from the metanode's metagraph and move them to
-             * the new series node's metagraph.
-             *
-             * @param metanode
-             * @param hierarchy
-             * @param seriesNames Map of node names to their series they are contained in.
-             *     This should be provided empty and is populated by this method.
-             * @param threshold If the series has this many nodes or more, then group them
-             *     into a series.
-             * @param map Map of series names to their series grouping type, if one has
-             *     been set.
-             * @return A dictionary from node name to series node name that contains the
-             *     node.
-             */
-            function groupSeries(metanode, hierarchy, seriesNames, threshold, map) {
-                var metagraph = metanode.metagraph;
-                _.each(metagraph.nodes(), function (n) {
-                    var child = metagraph.node(n);
-                    if (child.type === tf.graph.NodeType.META) {
-                        groupSeries(child, hierarchy, seriesNames, threshold, map);
-                    }
-                });
-                var clusters = clusterNodes(metagraph);
-                var seriesDict = detectSeries(clusters, metagraph);
-                // Add each series node to the graph and add its grouped children to its own
-                // metagraph.
-                _.each(seriesDict, function (seriesNode, seriesName) {
-                    var nodeMemberNames = seriesNode.metagraph.nodes();
-                    _.each(nodeMemberNames, function (n) {
-                        var child = metagraph.node(n);
-                        if (!child.owningSeries) {
-                            child.owningSeries = seriesName;
-                        }
-                    });
-                    // If the series contains less than the threshold number of nodes and
-                    // this series has not been adding to the series map, then set this
-                    // series to be shown ungrouped in the map.
-                    if (nodeMemberNames.length < threshold && !(seriesNode.name in map)) {
-                        map[seriesNode.name] = tf.graph.SeriesGroupingType.UNGROUP;
-                    }
-                    // If the series is in the map as ungrouped then do not group the series.
-                    if (seriesNode.name in map
-                        && map[seriesNode.name] === tf.graph.SeriesGroupingType.UNGROUP) {
-                        return;
-                    }
-                    hierarchy.setNode(seriesName, seriesNode); // add to the index
-                    metagraph.setNode(seriesName, seriesNode);
-                    _.each(nodeMemberNames, function (n) {
-                        var child = metagraph.node(n);
-                        seriesNode.metagraph.setNode(n, child);
-                        seriesNode.parentNode = child.parentNode;
-                        seriesNode.cardinality++;
-                        if (child.device != null) {
-                            seriesNode.deviceHistogram[child.device] =
-                                (seriesNode.deviceHistogram[child.device] || 0) + 1;
-                        }
-                        child.parentNode = seriesNode;
-                        seriesNames[n] = seriesName;
-                        // Remove now-grouped node from its original parent's metagraph.
-                        metagraph.removeNode(n);
-                    });
-                });
-            }
-            ;
-            /** cluster op-nodes with similar op */
-            function clusterNodes(metagraph) {
-                var result = {};
-                return _.reduce(metagraph.nodes(), function (clusters, n) {
-                    var child = metagraph.node(n);
-                    if (child.type === graph_1.NodeType.META) {
-                        // skip metanodes
-                        return clusters;
-                    }
-                    var template = child.op;
-                    if (template) {
-                        clusters[template] = clusters[template] || [];
-                        clusters[template].push(child.name);
-                    }
-                    return clusters;
-                }, result);
-            }
-            /**
-             * For each cluster of op-nodes based op type, try to detect groupings.
-             * Infer series name using by trying to find pattern '<number>' in the node
-             * name.
-             *
-             * @param clusters Dictionary output from clusterNodes().
-             * @param metagraph
-             * @return A dictionary from series name => seriesNode
-             */
-            function detectSeries(clusters, metagraph) {
-                var seriesDict = {};
-                _.each(clusters, function (members, clusterId) {
-                    if (members.length <= 1) {
-                        return;
-                    } // isolated clusters can't make series
-                    /** @type {Object}  A dictionary mapping seriesName to seriesInfoArray,
-                     * which is an array that contains objects with name, id, prefix, suffix,
-                     * and parent properties.
-                     */
-                    var candidatesDict = {};
-                    // Group all nodes that have the same name, with the exception of a
-                    // number at the end of the name after an underscore, which is allowed to
-                    // vary.
-                    _.each(members, function (name) {
-                        var isGroup = name.charAt(name.length - 1) === '*';
-                        var namepath = name.split('/');
-                        var leaf = namepath[namepath.length - 1];
-                        var parent = namepath.slice(0, namepath.length - 1).join('/');
-                        var matches = leaf.match(/^(\D*)_(\d+)$/);
-                        var prefix;
-                        var id;
-                        var suffix = '';
-                        if (matches) {
-                            prefix = matches[1]; // the front non-numeric characters
-                            id = matches[2]; // the digits
-                        }
-                        else {
-                            prefix = isGroup ? leaf.substr(0, leaf.length - 1) : leaf;
-                            id = 0;
-                            suffix = isGroup ? '*' : '';
-                        }
-                        var seriesName = graph_1.getSeriesNodeName(prefix, suffix, parent);
-                        candidatesDict[seriesName] = candidatesDict[seriesName] || [];
-                        var seriesNode = graph_1.createSeriesNode(prefix, suffix, parent, +id, name);
-                        candidatesDict[seriesName].push(seriesNode);
-                    });
-                    // In each group of nodes, group nodes in bunches that have monotonically
-                    // increasing numbers in their names.  Each of these bunches is a series.
-                    _.each(candidatesDict, function (seriesInfoArray, seriesName) {
-                        if (seriesInfoArray.length < 2) {
-                            return;
-                        }
-                        seriesInfoArray.sort(function (a, b) {
-                            return (+a.clusterId) - (+b.clusterId);
-                        });
-                        // Loop through the nodes sorted by its detected series number, grouping
-                        // all nodes with monotonically-increasing series numbers.
-                        var seriesNodes = [seriesInfoArray[0]];
-                        for (var index = 1; index < seriesInfoArray.length; index++) {
-                            var nextNode = seriesInfoArray[index];
-                            if (nextNode.clusterId === seriesNodes[seriesNodes.length - 1].clusterId
-                                + 1) {
-                                seriesNodes.push(nextNode);
-                                continue;
-                            }
-                            addSeriesToDict(seriesNodes, seriesDict, +clusterId, metagraph);
-                            seriesNodes = [nextNode];
-                        }
-                        addSeriesToDict(seriesNodes, seriesDict, +clusterId, metagraph);
-                    });
-                });
-                return seriesDict;
-            }
-            /**
-             * Add a series to the provided dictionary mapping series names to series.
-             *
-             * @param seriesNodes the nodes in the series. Contains
-             *     name, id, prefix, suffix and parent properties of the node.
-             * @param seriesDict the dictionary of series
-             * @param clusterId ID of the template of the nodes of the series
-             * @param metagraph
-             */
-            function addSeriesToDict(seriesNodes, seriesDict, clusterId, metagraph) {
-                if (seriesNodes.length > 1) {
-                    var curSeriesName = graph_1.getSeriesNodeName(seriesNodes[0].prefix, seriesNodes[0].suffix, seriesNodes[0].parent, seriesNodes[0].clusterId, seriesNodes[seriesNodes.length - 1].clusterId);
-                    var curSeriesNode_1 = graph_1.createSeriesNode(seriesNodes[0].prefix, seriesNodes[0].suffix, seriesNodes[0].parent, clusterId, curSeriesName);
-                    _.each(seriesNodes, function (node) {
-                        curSeriesNode_1.ids.push(node.clusterId);
-                        curSeriesNode_1.metagraph.setNode(node.name, metagraph.node(node.name));
-                    });
-                    seriesDict[curSeriesName] = curSeriesNode_1;
-                }
-            }
-        })(hierarchy = graph_1.hierarchy || (graph_1.hierarchy = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module tf.graph.hierarchy
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph_1) {
-        var layout;
-        (function (layout) {
-            /** Set of parameters that define the look and feel of the graph. */
-            layout.PARAMS = {
-                animation: {
-                    /** Default duration for graph animations in ms. */
-                    duration: 250
-                },
-                graph: {
-                    /** Graph parameter for metanode. */
-                    meta: {
-                        /**
-                         * Dagre's nodesep param - number of pixels that
-                         * separate nodes horizontally in the layout.
-                         *
-                         * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-                         */
-                        nodeSep: 5,
-                        /**
-                         * Dagre's ranksep param - number of pixels
-                         * between each rank in the layout.
-                         *
-                         * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-                         */
-                        rankSep: 25,
-                        /**
-                         * Dagre's edgesep param - number of pixels that separate
-                         * edges horizontally in the layout.
-                         */
-                        edgeSep: 5,
-                    },
-                    /** Graph parameter for metanode. */
-                    series: {
-                        /**
-                         * Dagre's nodesep param - number of pixels that
-                         * separate nodes horizontally in the layout.
-                         *
-                         * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-                         */
-                        nodeSep: 5,
-                        /**
-                         * Dagre's ranksep param - number of pixels
-                         * between each rank in the layout.
-                         *
-                         * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-                         */
-                        rankSep: 25,
-                        /**
-                         * Dagre's edgesep param - number of pixels that separate
-                         * edges horizontally in the layout.
-                         */
-                        edgeSep: 5
-                    },
-                    /**
-                     * Padding is used to correctly position the graph SVG inside of its parent
-                     * element. The padding amounts are applied using an SVG transform of X and
-                     * Y coordinates.
-                     */
-                    padding: { paddingTop: 40, paddingLeft: 20 }
-                },
-                subscene: {
-                    meta: {
-                        paddingTop: 10,
-                        paddingBottom: 10,
-                        paddingLeft: 10,
-                        paddingRight: 10,
-                        /**
-                         * Used to leave room for the label on top of the highest node in
-                         * the core graph.
-                         */
-                        labelHeight: 20,
-                        /** X-space between each extracted node and the core graph. */
-                        extractXOffset: 15,
-                        /** Y-space between each extracted node. */
-                        extractYOffset: 20
-                    },
-                    series: {
-                        paddingTop: 10,
-                        paddingBottom: 10,
-                        paddingLeft: 10,
-                        paddingRight: 10,
-                        labelHeight: 10
-                    }
-                },
-                nodeSize: {
-                    /** Size of meta nodes. */
-                    meta: {
-                        radius: 5,
-                        width: 60,
-                        maxLabelWidth: 52,
-                        /** A scale for the node's height based on number of nodes inside */
-                        height: d3.scale.linear().domain([1, 200]).range([15, 60]).clamp(true),
-                        /** The radius of the circle denoting the expand button. */
-                        expandButtonRadius: 3
-                    },
-                    /** Size of op nodes. */
-                    op: {
-                        width: 15,
-                        height: 6,
-                        radius: 3,
-                        labelOffset: -8,
-                        maxLabelWidth: 30
-                    },
-                    /** Size of series nodes. */
-                    series: {
-                        expanded: {
-                            // For expanded series nodes, width and height will be
-                            // computed to account for the subscene.
-                            radius: 10,
-                            labelOffset: 0,
-                        },
-                        vertical: {
-                            // When unexpanded, series whose underlying metagraphs contain
-                            // one or more non-control edges will show as a vertical stack
-                            // of ellipses.
-                            width: 16,
-                            height: 13,
-                            labelOffset: -13,
-                        },
-                        horizontal: {
-                            // When unexpanded, series whose underlying metagraphs contain
-                            // no non-control edges will show as a horizontal stack of
-                            // ellipses.
-                            width: 24,
-                            height: 8,
-                            radius: 10,
-                            labelOffset: -10,
-                        },
-                    },
-                    /** Size of bridge nodes. */
-                    bridge: {
-                        // NOTE: bridge nodes will normally be invisible, but they must
-                        // take up some space so that the layout step leaves room for
-                        // their edges.
-                        width: 20,
-                        height: 20,
-                        radius: 2,
-                        labelOffset: 0
-                    }
-                },
-                shortcutSize: {
-                    /** Size of shortcuts for op nodes */
-                    op: { width: 10, height: 4 },
-                    /** Size of shortcuts for meta nodes */
-                    meta: { width: 12, height: 4, radius: 1 },
-                    /** Size of shortcuts for series nodes */
-                    series: {
-                        width: 14,
-                        height: 4,
-                    }
-                },
-                annotations: {
-                    /** Maximum possible width of the bounding box for in annotations */
-                    inboxWidth: 50,
-                    /** Maximum possible width of the bounding box for out annotations */
-                    outboxWidth: 50,
-                    /** X-space between the shape and each annotation-node. */
-                    xOffset: 10,
-                    /** Y-space between each annotation-node. */
-                    yOffset: 3,
-                    /** X-space between each annotation-node and its label. */
-                    labelOffset: 2,
-                    /** Defines the max width for annotation label */
-                    maxLabelWidth: 120
-                },
-                constant: { size: { width: 4, height: 4 } },
-                series: {
-                    /** Maximum number of repeated item for unexpanded series node. */
-                    maxStackCount: 3,
-                    /**
-                     * Positioning offset ratio for collapsed stack
-                     * of parallel series (series without edges between its members).
-                     */
-                    parallelStackOffsetRatio: 0.2,
-                    /**
-                     * Positioning offset ratio for collapsed stack
-                     * of tower series (series with edges between its members).
-                     */
-                    towerStackOffsetRatio: 0.5
-                },
-                minimap: {
-                    /** The maximum width/height the minimap can have. */
-                    size: 150
-                }
-            };
-            /** Calculate layout for a scene of a group node. */
-            function layoutScene(renderNodeInfo) {
-                // Update layout, size, and annotations of its children nodes and edges.
-                if (renderNodeInfo.node.isGroupNode) {
-                    layoutChildren(renderNodeInfo);
-                }
-                // Update position of its children nodes and edges
-                if (renderNodeInfo.node.type === graph_1.NodeType.META) {
-                    layoutMetanode(renderNodeInfo);
-                }
-                else if (renderNodeInfo.node.type === graph_1.NodeType.SERIES) {
-                    layoutSeriesNode(renderNodeInfo);
-                }
-            }
-            layout.layoutScene = layoutScene;
-            ;
-            /**
-             * Updates the total width of an unexpanded node which includes the size of its
-             * in and out annotations.
-             */
-            function updateTotalWidthOfNode(renderInfo) {
-                renderInfo.inboxWidth = renderInfo.inAnnotations.list.length > 0 ?
-                    layout.PARAMS.annotations.inboxWidth : 0;
-                renderInfo.outboxWidth = renderInfo.outAnnotations.list.length > 0 ?
-                    layout.PARAMS.annotations.outboxWidth : 0;
-                // Assign the width of the core box (the main shape of the node).
-                renderInfo.coreBox.width = renderInfo.width;
-                renderInfo.coreBox.height = renderInfo.height;
-                // TODO(jimbo): Account for font width rather than using a magic number.
-                var labelLength = renderInfo.node.name.length -
-                    renderInfo.node.name.lastIndexOf(graph_1.NAMESPACE_DELIM) - 1;
-                var charWidth = 3; // 3 pixels per character.
-                // Compute the total width of the node.
-                renderInfo.width = Math.max(renderInfo.coreBox.width +
-                    renderInfo.inboxWidth + renderInfo.outboxWidth, labelLength * charWidth);
-            }
-            /**
-             * Update layout, size, and annotations of its children nodes and edges.
-             */
-            function layoutChildren(renderNodeInfo) {
-                var children = renderNodeInfo.coreGraph.nodes().map(function (n) {
-                    return renderNodeInfo.coreGraph.node(n);
-                }).concat(renderNodeInfo.isolatedInExtract, renderNodeInfo.isolatedOutExtract);
-                _.each(children, function (childNodeInfo) {
-                    // Set size of each child
-                    switch (childNodeInfo.node.type) {
-                        case graph_1.NodeType.OP:
-                            _.extend(childNodeInfo, layout.PARAMS.nodeSize.op);
-                            break;
-                        case graph_1.NodeType.BRIDGE:
-                            _.extend(childNodeInfo, layout.PARAMS.nodeSize.bridge);
-                            break;
-                        case graph_1.NodeType.META:
-                            if (!childNodeInfo.expanded) {
-                                // Set fixed width and scalable height based on cardinality
-                                _.extend(childNodeInfo, layout.PARAMS.nodeSize.meta);
-                                childNodeInfo.height =
-                                    layout.PARAMS.nodeSize.meta.height(childNodeInfo.node.cardinality);
-                            }
-                            else {
-                                var childGroupNodeInfo = childNodeInfo;
-                                layoutScene(childGroupNodeInfo); // Recursively layout its subscene.
-                            }
-                            break;
-                        case graph_1.NodeType.SERIES:
-                            if (childNodeInfo.expanded) {
-                                _.extend(childNodeInfo, layout.PARAMS.nodeSize.series.expanded);
-                                var childGroupNodeInfo = childNodeInfo;
-                                layoutScene(childGroupNodeInfo); // Recursively layout its subscene.
-                            }
-                            else {
-                                var childGroupNodeInfo = childNodeInfo;
-                                var seriesParams = childGroupNodeInfo.node.hasNonControlEdges ?
-                                    layout.PARAMS.nodeSize.series.vertical :
-                                    layout.PARAMS.nodeSize.series.horizontal;
-                                _.extend(childNodeInfo, seriesParams);
-                            }
-                            break;
-                        default:
-                            throw Error('Unrecognized node type: ' + childNodeInfo.node.type);
-                    }
-                    // Compute total width of un-expanded nodes. Width of expanded nodes
-                    // has already been computed.
-                    if (!childNodeInfo.expanded) {
-                        updateTotalWidthOfNode(childNodeInfo);
-                    }
-                    // Layout each child's annotations
-                    layoutAnnotation(childNodeInfo);
-                });
-            }
-            /**
-             * Calculate layout for a graph using dagre
-             * @param graph the graph to be laid out
-             * @param params layout parameters
-             * @return width and height of the core graph
-             */
-            function dagreLayout(graph, params) {
-                _.extend(graph.graph(), {
-                    nodesep: params.nodeSep,
-                    ranksep: params.rankSep,
-                    edgesep: params.edgeSep
-                });
-                var bridgeNodeNames = [];
-                var nonBridgeNodeNames = [];
-                // Split out nodes into bridge and non-bridge nodes, and calculate the total
-                // width we should use for bridge nodes.
-                _.each(graph.nodes(), function (nodeName) {
-                    var nodeInfo = graph.node(nodeName);
-                    if (nodeInfo.node.type === graph_1.NodeType.BRIDGE) {
-                        bridgeNodeNames.push(nodeName);
-                    }
-                    else {
-                        nonBridgeNodeNames.push(nodeName);
-                    }
-                });
-                // If there are no non-bridge nodes, then the graph has zero size.
-                if (!nonBridgeNodeNames.length) {
-                    return {
-                        width: 0,
-                        height: 0,
-                    };
-                }
-                dagre.layout(graph);
-                // Calculate the true bounding box of the graph by iterating over nodes and
-                // edges rather than accepting dagre's word for it. In particular, we should
-                // ignore the extra-wide bridge nodes and bridge edges, and allow for
-                // annotation boxes and labels.
-                var minX = Infinity;
-                var minY = Infinity;
-                var maxX = -Infinity;
-                var maxY = -Infinity;
-                _.each(nonBridgeNodeNames, function (nodeName) {
-                    var nodeInfo = graph.node(nodeName);
-                    var w = 0.5 * nodeInfo.width;
-                    var x1 = nodeInfo.x - w;
-                    var x2 = nodeInfo.x + w;
-                    minX = x1 < minX ? x1 : minX;
-                    maxX = x2 > maxX ? x2 : maxX;
-                    // TODO(jimbo): Account for the height of labels above op nodes here.
-                    var h = 0.5 * nodeInfo.height;
-                    var y1 = nodeInfo.y - h;
-                    var y2 = nodeInfo.y + h;
-                    minY = y1 < minY ? y1 : minY;
-                    maxY = y2 > maxY ? y2 : maxY;
-                });
-                _.each(graph.edges(), function (edgeObj) {
-                    var edgeInfo = graph.edge(edgeObj);
-                    if (edgeInfo.structural) {
-                        return; // Skip structural edges from min/max calculations.
-                    }
-                    // Since the node size passed to dagre includes the in and out
-                    // annotations, the endpoints of the edge produced by dagre may not
-                    // point to the actual node shape (rectangle, ellipse). We correct the
-                    // end-points by finding the intersection of a line between the
-                    // next-to-last (next-to-first) point and the destination (source)
-                    // rectangle.
-                    var sourceNode = graph.node(edgeInfo.metaedge.v);
-                    var destNode = graph.node(edgeInfo.metaedge.w);
-                    // Straight 3-points edges are special case, since they are curved after
-                    // our default correction. To keep them straight, we remove the mid point
-                    // and correct the first and the last point to be the center of the
-                    // source and destination node respectively.
-                    if (edgeInfo.points.length === 3 && isStraightLine(edgeInfo.points)) {
-                        if (sourceNode != null) {
-                            var cxSource = sourceNode.expanded ?
-                                sourceNode.x : computeCXPositionOfNodeShape(sourceNode);
-                            edgeInfo.points[0].x = cxSource;
-                        }
-                        if (destNode != null) {
-                            var cxDest = destNode.expanded ?
-                                destNode.x : computeCXPositionOfNodeShape(destNode);
-                            edgeInfo.points[2].x = cxDest;
-                        }
-                        // Remove the middle point so the edge doesn't curve.
-                        edgeInfo.points = [edgeInfo.points[0], edgeInfo.points[1]];
-                    }
-                    // Correct the destination endpoint of the edge.
-                    var nextToLastPoint = edgeInfo.points[edgeInfo.points.length - 2];
-                    // The destination node might be null if this is a bridge edge.
-                    if (destNode != null) {
-                        edgeInfo.points[edgeInfo.points.length - 1] =
-                            intersectPointAndNode(nextToLastPoint, destNode);
-                    }
-                    // Correct the source endpoint of the edge.
-                    var secondPoint = edgeInfo.points[1];
-                    // The source might be null if this is a bridge edge.
-                    if (sourceNode != null) {
-                        edgeInfo.points[0] = intersectPointAndNode(secondPoint, sourceNode);
-                    }
-                    _.each(edgeInfo.points, function (point) {
-                        minX = point.x < minX ? point.x : minX;
-                        maxX = point.x > maxX ? point.x : maxX;
-                        minY = point.y < minY ? point.y : minY;
-                        maxY = point.y > maxY ? point.y : maxY;
-                    });
-                });
-                // Shift all nodes and edge points to account for the left-padding amount,
-                // and the invisible bridge nodes.
-                _.each(graph.nodes(), function (nodeName) {
-                    var nodeInfo = graph.node(nodeName);
-                    nodeInfo.x -= minX;
-                    nodeInfo.y -= minY;
-                });
-                _.each(graph.edges(), function (edgeObj) {
-                    _.each(graph.edge(edgeObj).points, function (point) {
-                        point.x -= minX;
-                        point.y -= minY;
-                    });
-                });
-                return {
-                    width: maxX - minX,
-                    height: maxY - minY
-                };
-            }
-            /** Layout a metanode. Only called for an expanded node. */
-            function layoutMetanode(renderNodeInfo) {
-                // First, copy params specific to meta nodes onto this render info object.
-                var params = layout.PARAMS.subscene.meta;
-                _.extend(renderNodeInfo, params);
-                // Invoke dagre.layout() on the core graph and record the bounding box
-                // dimensions.
-                _.extend(renderNodeInfo.coreBox, dagreLayout(renderNodeInfo.coreGraph, layout.PARAMS.graph.meta));
-                // Calculate the position of nodes in isolatedInExtract relative to the
-                // top-left corner of inExtractBox (the bounding box for all inExtract nodes)
-                // and calculate the size of the inExtractBox.
-                var maxInExtractWidth = _.max(renderNodeInfo.isolatedInExtract, function (renderNode) { return renderNode.width; }).width;
-                renderNodeInfo.inExtractBox.width = maxInExtractWidth != null ?
-                    maxInExtractWidth : 0;
-                renderNodeInfo.inExtractBox.height =
-                    _.reduce(renderNodeInfo.isolatedInExtract, function (height, child, i) {
-                        var yOffset = i > 0 ? params.extractYOffset : 0;
-                        // use width/height here to avoid overlaps between extracts
-                        child.x = 0;
-                        child.y = height + yOffset + child.height / 2;
-                        return height + yOffset + child.height;
-                    }, 0);
-                // Calculate the position of nodes in isolatedOutExtract relative to the
-                // top-left corner of outExtractBox (the bounding box for all outExtract
-                // nodes) and calculate the size of the outExtractBox.
-                var maxOutExtractWidth = _.max(renderNodeInfo.isolatedOutExtract, function (renderNode) { return renderNode.width; }).width;
-                renderNodeInfo.outExtractBox.width = maxOutExtractWidth != null ?
-                    maxOutExtractWidth : 0;
-                renderNodeInfo.outExtractBox.height =
-                    _.reduce(renderNodeInfo.isolatedOutExtract, function (height, child, i) {
-                        var yOffset = i > 0 ? params.extractYOffset : 0;
-                        // use width/height here to avoid overlaps between extracts
-                        child.x = 0;
-                        child.y = height + yOffset + child.height / 2;
-                        return height + yOffset + child.height;
-                    }, 0);
-                // Compute the total padding between the core graph, in-extract and
-                // out-extract boxes.
-                var numParts = 0;
-                if (renderNodeInfo.isolatedInExtract.length > 0) {
-                    numParts++;
-                }
-                if (renderNodeInfo.isolatedOutExtract.length > 0) {
-                    numParts++;
-                }
-                if (renderNodeInfo.coreGraph.nodeCount() > 0) {
-                    numParts++;
-                }
-                var offset = layout.PARAMS.subscene.meta.extractXOffset;
-                var padding = numParts <= 1 ? 0 : (numParts <= 2 ? offset : 2 * offset);
-                // Add the in-extract and out-extract width to the core box width.
-                renderNodeInfo.coreBox.width += renderNodeInfo.inExtractBox.width +
-                    renderNodeInfo.outExtractBox.width + padding;
-                renderNodeInfo.coreBox.height =
-                    params.labelHeight +
-                        Math.max(renderNodeInfo.inExtractBox.height, renderNodeInfo.coreBox.height, renderNodeInfo.outExtractBox.height);
-                // Determine the whole metanode's width (from left to right).
-                renderNodeInfo.width = renderNodeInfo.coreBox.width +
-                    params.paddingLeft + params.paddingRight;
-                // Determine the whole metanode's height (from top to bottom).
-                renderNodeInfo.height =
-                    renderNodeInfo.paddingTop +
-                        renderNodeInfo.coreBox.height +
-                        renderNodeInfo.paddingBottom;
-            }
-            /**
-             * Calculate layout for series node's core graph. Only called for an expanded
-             * series.
-             */
-            function layoutSeriesNode(node) {
-                var graph = node.coreGraph;
-                var params = layout.PARAMS.subscene.series;
-                _.extend(node, params);
-                // Layout the core.
-                _.extend(node.coreBox, dagreLayout(node.coreGraph, layout.PARAMS.graph.series));
-                _.each(graph.nodes(), function (nodeName) {
-                    graph.node(nodeName).excluded = false;
-                });
-                // Series do not have in/outExtractBox so no need to include them here.
-                node.width = node.coreBox.width + params.paddingLeft + params.paddingRight;
-                node.height = node.coreBox.height + params.paddingTop + params.paddingBottom;
-            }
-            /**
-             * Calculate layout for annotations of a given node.
-             * This will modify positions of the given node and its annotations.
-             *
-             * @see tf.graph.render.Node and tf.graph.render.Annotation
-             * for description of each property of each render node.
-             *
-             */
-            function layoutAnnotation(renderNodeInfo) {
-                // If the render node is an expanded metanode, then its annotations will not
-                // be visible and we should skip the annotation calculations.
-                if (renderNodeInfo.expanded) {
-                    return;
-                }
-                var inAnnotations = renderNodeInfo.inAnnotations.list;
-                var outAnnotations = renderNodeInfo.outAnnotations.list;
-                // Calculate size for in-annotations
-                _.each(inAnnotations, function (a) { return sizeAnnotation(a); });
-                // Calculate size for out-annotations
-                _.each(outAnnotations, function (a) { return sizeAnnotation(a); });
-                var params = layout.PARAMS.annotations;
-                // Calculate annotation node position (a.dx, a.dy)
-                // and total height for in-annotations
-                // After this chunk of code:
-                // inboxHeight = sum of annotation heights+ (annotation.length - 1 * yOffset)
-                var inboxHeight = _.reduce(inAnnotations, function (height, a, i) {
-                    var yOffset = i > 0 ? params.yOffset : 0;
-                    a.dx = -(renderNodeInfo.coreBox.width + a.width) / 2 - params.xOffset;
-                    a.dy = height + yOffset + a.height / 2;
-                    return height + yOffset + a.height;
-                }, 0);
-                _.each(inAnnotations, function (a) {
-                    a.dy -= inboxHeight / 2;
-                    a.labelOffset = params.labelOffset;
-                });
-                // Calculate annotation node position (a.dx, a.dy)
-                // and total height for out-annotations
-                // After this chunk of code:
-                // outboxHeight = sum of annotation heights +
-                //                (annotation.length - 1 * yOffset)
-                var outboxHeight = _.reduce(outAnnotations, function (height, a, i) {
-                    var yOffset = i > 0 ? params.yOffset : 0;
-                    a.dx = (renderNodeInfo.coreBox.width + a.width) / 2 + params.xOffset;
-                    a.dy = height + yOffset + a.height / 2;
-                    return height + yOffset + a.height;
-                }, 0);
-                _.each(outAnnotations, function (a) {
-                    // adjust by (half of ) the total height
-                    // so dy is relative to the host node's center.
-                    a.dy -= outboxHeight / 2;
-                    a.labelOffset = params.labelOffset;
-                });
-                // Creating scales for touch point between the in-annotation edges
-                // and their hosts.
-                var inTouchHeight = Math.min(renderNodeInfo.height / 2 - renderNodeInfo.radius, inboxHeight / 2);
-                inTouchHeight = inTouchHeight < 0 ? 0 : inTouchHeight;
-                var inY = d3.scale.linear()
-                    .domain([0, inAnnotations.length - 1])
-                    .range([-inTouchHeight, inTouchHeight]);
-                // Calculate annotation edge position
-                _.each(inAnnotations, function (a, i) {
-                    a.points = [
-                        // The annotation node end
-                        {
-                            dx: a.dx + a.width / 2,
-                            dy: a.dy
-                        },
-                        // The host node end
-                        {
-                            dx: -renderNodeInfo.coreBox.width / 2,
-                            // only use scale if there are more than one,
-                            // otherwise center it vertically
-                            dy: inAnnotations.length > 1 ? inY(i) : 0
-                        }
-                    ];
-                });
-                // Creating scales for touch point between the out-annotation edges
-                // and their hosts.
-                var outTouchHeight = Math.min(renderNodeInfo.height / 2 - renderNodeInfo.radius, outboxHeight / 2);
-                outTouchHeight = outTouchHeight < 0 ? 0 : outTouchHeight;
-                var outY = d3.scale.linear()
-                    .domain([0, outAnnotations.length - 1])
-                    .range([-outTouchHeight, outTouchHeight]);
-                _.each(outAnnotations, function (a, i) {
-                    // Add point from the border of the annotation node
-                    a.points = [
-                        // The host node end
-                        {
-                            dx: renderNodeInfo.coreBox.width / 2,
-                            // only use scale if there are more than one,
-                            // otherwise center it vertically
-                            dy: outAnnotations.length > 1 ? outY(i) : 0
-                        },
-                        // The annotation node end
-                        {
-                            dx: a.dx - a.width / 2,
-                            dy: a.dy
-                        }
-                    ];
-                });
-                renderNodeInfo.height =
-                    Math.max(renderNodeInfo.height, inboxHeight, outboxHeight);
-            }
-            /**
-             * Set size of an annotation node.
-             */
-            function sizeAnnotation(a) {
-                switch (a.annotationType) {
-                    case graph_1.render.AnnotationType.CONSTANT:
-                        _.extend(a, layout.PARAMS.constant.size);
-                        break;
-                    case graph_1.render.AnnotationType.SHORTCUT:
-                        if (a.node.type === graph_1.NodeType.OP) {
-                            _.extend(a, layout.PARAMS.shortcutSize.op);
-                        }
-                        else if (a.node.type === graph_1.NodeType.META) {
-                            _.extend(a, layout.PARAMS.shortcutSize.meta);
-                        }
-                        else if (a.node.type === graph_1.NodeType.SERIES) {
-                            _.extend(a, layout.PARAMS.shortcutSize.series);
-                        }
-                        else {
-                            throw Error('Invalid node type: ' + a.node.type);
-                        }
-                        break;
-                    case graph_1.render.AnnotationType.SUMMARY:
-                        _.extend(a, layout.PARAMS.constant.size);
-                        break;
-                }
-            }
-            /**
-             * Determines the center position of the node's shape. The position depends
-             * on if the node has in and out-annotations.
-             */
-            function computeCXPositionOfNodeShape(renderInfo) {
-                if (renderInfo.expanded) {
-                    return renderInfo.x;
-                }
-                var dx = renderInfo.inAnnotations.list.length ? renderInfo.inboxWidth : 0;
-                return renderInfo.x - renderInfo.width / 2 + dx +
-                    renderInfo.coreBox.width / 2;
-            }
-            layout.computeCXPositionOfNodeShape = computeCXPositionOfNodeShape;
-            /** Returns the angle (in degrees) between two points. */
-            function angleBetweenTwoPoints(a, b) {
-                var dx = b.x - a.x;
-                var dy = b.y - a.y;
-                return 180 * Math.atan(dy / dx) / Math.PI;
-            }
-            /**
-             * Returns if a line going through the specified points is a straight line.
-             */
-            function isStraightLine(points) {
-                var angle = angleBetweenTwoPoints(points[0], points[1]);
-                for (var i = 1; i < points.length - 1; i++) {
-                    var newAngle = angleBetweenTwoPoints(points[i], points[i + 1]);
-                    // Have a tolerance of 1 degree.
-                    if (Math.abs(newAngle - angle) > 1) {
-                        return false;
-                    }
-                    angle = newAngle;
-                }
-                return true;
-            }
-            /**
-             * Returns the intersection of a line between the provided point
-             * and the provided rectangle.
-             */
-            function intersectPointAndNode(point, node) {
-                // cx and cy are the center of the rectangle.
-                var cx = node.expanded ?
-                    node.x : computeCXPositionOfNodeShape(node);
-                var cy = node.y;
-                // Calculate the slope
-                var dx = point.x - cx;
-                var dy = point.y - cy;
-                var w = node.expanded ? node.width : node.coreBox.width;
-                var h = node.expanded ? node.height : node.coreBox.height;
-                var deltaX, deltaY;
-                if (Math.abs(dy) * w / 2 > Math.abs(dx) * h / 2) {
-                    // The intersection is above or below the rectangle.
-                    if (dy < 0) {
-                        h = -h;
-                    }
-                    deltaX = dy === 0 ? 0 : h / 2 * dx / dy;
-                    deltaY = h / 2;
-                }
-                else {
-                    // The intersection is left or right of the rectangle.
-                    if (dx < 0) {
-                        w = -w;
-                    }
-                    deltaX = w / 2;
-                    deltaY = dx === 0 ? 0 : w / 2 * dy / dx;
-                }
-                return { x: cx + deltaX, y: cy + deltaY };
-            }
-        })(layout = graph_1.layout || (graph_1.layout = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph) {
-        var parser;
-        (function (parser) {
-            /**
-             * Parses a native js value, which can be either a string, boolean or number.
-             *
-             * @param value The value to be parsed.
-             */
-            function parseValue(value) {
-                if (value === 'true') {
-                    return true;
-                }
-                if (value === 'false') {
-                    return false;
-                }
-                var firstChar = value[0];
-                if (firstChar === '"') {
-                    return value.substring(1, value.length - 1);
-                }
-                var num = parseFloat(value);
-                return isNaN(num) ? value : num;
-            }
-            /**
-             * Fetches a text file and returns a promise of the result.
-             */
-            function fetchPbTxt(filepath) {
-                return new Promise(function (resolve, reject) {
-                    var request = new XMLHttpRequest();
-                    request.open('GET', filepath);
-                    request.responseType = 'arraybuffer';
-                    request.onerror = function () { return reject(request.status); };
-                    request.onload = function () { return resolve(request.response); };
-                    request.send(null);
-                });
-            }
-            parser.fetchPbTxt = fetchPbTxt;
-            /**
-             * Fetches the metadata file, parses it and returns a promise of the result.
-             */
-            function fetchAndParseMetadata(path, tracker) {
-                return tf.graph.util
-                    .runTask('Reading metadata pbtxt', 40, function () {
-                    if (path == null) {
-                        return Promise.resolve(null);
-                    }
-                    return fetchPbTxt(path);
-                }, tracker)
-                    .then(function (arrayBuffer) {
-                    return tf.graph.util.runAsyncPromiseTask('Parsing metadata.pbtxt', 60, function () {
-                        return arrayBuffer != null ? parseStatsPbTxt(arrayBuffer) :
-                            Promise.resolve(null);
-                    }, tracker);
-                });
-            }
-            parser.fetchAndParseMetadata = fetchAndParseMetadata;
-            /**
-             * Fetches the graph file, parses it and returns a promise of the result. The
-             * result will be undefined if the graph is empty.
-             */
-            function fetchAndParseGraphData(path, pbTxtFile, tracker) {
-                return tf.graph.util
-                    .runTask('Reading graph pbtxt', 40, function () {
-                    if (pbTxtFile) {
-                        return new Promise(function (resolve, reject) {
-                            var fileReader = new FileReader();
-                            fileReader.onload = function () { return resolve(fileReader.result); };
-                            fileReader.onerror = function () { return reject(fileReader.error); };
-                            fileReader.readAsArrayBuffer(pbTxtFile);
-                        });
-                    }
-                    else {
-                        return fetchPbTxt(path);
-                    }
-                }, tracker)
-                    .then(function (arrayBuffer) {
-                    return tf.graph.util.runTask('Parsing graph.pbtxt', 60, function () {
-                        return parseGraphPbTxt(arrayBuffer);
-                    }, tracker);
-                });
-            }
-            parser.fetchAndParseGraphData = fetchAndParseGraphData;
-            /**
-             * Parse a file object in a streaming fashion line by line (or custom delim).
-             * Can handle very large files.
-             * @param input The file object as an array buffer.
-             * @param callback The callback called on each line
-             * @param chunkSize The size of each read chunk. (optional)
-             * @param delim The delimiter used to split a line. (optional)
-             * @returns A promise for when it is finished.
-             */
-            function streamParse(arrayBuffer, callback, chunkSize, delim) {
-                if (chunkSize === void 0) { chunkSize = 1000000; }
-                if (delim === void 0) { delim = '\n'; }
-                return new Promise(function (resolve, reject) {
-                    var offset = 0;
-                    var bufferSize = arrayBuffer.byteLength - 1;
-                    var data = '';
-                    function readHandler(str) {
-                        offset += chunkSize;
-                        var parts = str.split(delim);
-                        var first = data + parts[0];
-                        if (parts.length === 1) {
-                            data = first;
-                            readChunk(offset, chunkSize);
-                            return;
-                        }
-                        data = parts[parts.length - 1];
-                        callback(first);
-                        for (var i = 1; i < parts.length - 1; i++) {
-                            callback(parts[i]);
-                        }
-                        if (offset >= bufferSize) {
-                            if (data) {
-                                callback(data);
-                            }
-                            resolve(true);
-                            return;
-                        }
-                        readChunk(offset, chunkSize);
-                    }
-                    function readChunk(offset, size) {
-                        var arrayBufferChunk = arrayBuffer.slice(offset, offset + size);
-                        var blob = new Blob([arrayBufferChunk]);
-                        var file = new FileReader();
-                        file.onload = function (e) { return readHandler(e.target.result); };
-                        file.readAsText(blob);
-                    }
-                    readChunk(offset, chunkSize);
-                });
-            }
-            parser.streamParse = streamParse;
-            /**
-             * Since proto-txt doesn't explicitly say whether an attribute is repeated
-             * (an array) or not, we keep a hard-coded list of attributes that are known
-             * to be repeated. This list is used in parsing time to convert repeated
-             * attributes into arrays even when the attribute only shows up once in the
-             * object.
-             */
-            var GRAPH_REPEATED_FIELDS = {
-                'node': true,
-                'node.input': true,
-                'node.attr': true,
-                'node.attr.value.list.type': true,
-                'node.attr.value.shape.dim': true,
-                'node.attr.value.tensor.string_val': true,
-                'node.attr.value.tensor.tensor_shape.dim': true,
-                'node.attr.value.list.shape': true,
-                'node.attr.value.list.shape.dim': true,
-                'node.attr.value.list.s': true
-            };
-            var METADATA_REPEATED_FIELDS = {
-                'step_stats.dev_stats': true,
-                'step_stats.dev_stats.node_stats': true,
-                'step_stats.dev_stats.node_stats.output': true,
-                'step_stats.dev_stats.node_stats.memory': true,
-                'step_stats.dev_stats.node_stats.output.tensor_description.shape.dim': true
-            };
-            /**
-             * Parses an ArrayBuffer of a proto txt file into a raw Graph object.
-             */
-            function parseGraphPbTxt(input) {
-                return parsePbtxtFile(input, GRAPH_REPEATED_FIELDS).then(function (obj) { return obj['node']; });
-            }
-            parser.parseGraphPbTxt = parseGraphPbTxt;
-            /**
-             * Parses an ArrayBuffer of a proto txt file into a StepStats object.
-             */
-            function parseStatsPbTxt(input) {
-                return parsePbtxtFile(input, METADATA_REPEATED_FIELDS)
-                    .then(function (obj) { return obj['step_stats']; });
-            }
-            parser.parseStatsPbTxt = parseStatsPbTxt;
-            /**
-             * Parses a ArrayBuffer of a proto txt file into javascript object.
-             *
-             * @param input The ArrayBuffer or file object implementing slice.
-             * @param repeatedFields Map (Set) of all the repeated fields, since you can't
-             *   tell directly from the pbtxt if a field is repeated or not.
-             * @returns The parsed object.
-             */
-            function parsePbtxtFile(input, repeatedFields) {
-                var output = {};
-                var stack = [];
-                var path = [];
-                var current = output;
-                function splitNameAndValueInAttribute(line) {
-                    var colonIndex = line.indexOf(':');
-                    var name = line.substring(0, colonIndex).trim();
-                    var value = parseValue(line.substring(colonIndex + 2).trim());
-                    return {
-                        name: name,
-                        value: value
-                    };
-                }
-                /**
-                 * Adds a value, given the attribute name and the host object. If the
-                 * attribute already exists, but is not an array, it will convert it to an
-                 * array of values.
-                 *
-                 * @param obj The host object that holds the attribute.
-                 * @param name The attribute name (key).
-                 * @param value The attribute value.
-                 * @param path A path that identifies the attribute. Used to check if
-                 *     an attribute is an array or not.
-                 */
-                function addAttribute(obj, name, value, path) {
-                    // We treat 'node' specially since it is done so often.
-                    var existingValue = obj[name];
-                    if (existingValue == null) {
-                        obj[name] = path.join('.') in repeatedFields ? [value] : value;
-                    }
-                    else if (Array.isArray(existingValue)) {
-                        existingValue.push(value);
-                    }
-                    else {
-                        obj[name] = [existingValue, value];
-                    }
-                }
-                // Run through the file a line at a time.
-                return streamParse(input, function (line) {
-                    if (!line) {
-                        return;
-                    }
-                    line = line.trim();
-                    switch (line[line.length - 1]) {
-                        case '{':
-                            var name_1 = line.substring(0, line.length - 2).trim();
-                            var newValue = {};
-                            stack.push(current);
-                            path.push(name_1);
-                            addAttribute(current, name_1, newValue, path);
-                            current = newValue;
-                            break;
-                        case '}':
-                            current = stack.pop();
-                            path.pop();
-                            break;
-                        default:
-                            var x = splitNameAndValueInAttribute(line);
-                            addAttribute(current, x.name, x.value, path.concat(x.name));
-                            break;
-                    }
-                }).then(function () {
-                    return output;
-                });
-            }
-        })(parser = graph.parser || (graph.parser = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // Close module tf.graph.parser.
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-</script>
-<script>var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/**
- * Package for the Render Hierarchy for TensorFlow graph.
- */
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph_1) {
-        var render;
-        (function (render) {
-            /**
-             * Color parameters for op nodes.
-             */
-            render.OpNodeColors = { DEFAULT_FILL: 'white', DEFAULT_STROKE: '#b2b2b2' };
-            /**
-             * Color parameters for node encoding.
-             * @type {Object}
-             */
-            render.MetanodeColors = {
-                /**
-                 * Default fill and stroke to use when no other information is available.
-                 */
-                DEFAULT_FILL: '#d9d9d9',
-                DEFAULT_STROKE: '#a6a6a6',
-                SATURATION: 0.6,
-                LIGHTNESS: 0.85,
-                /**
-                 * Neutral color to use when the node is expanded (used when coloring by
-                 * compute time, memory and device).
-                 */
-                EXPANDED_COLOR: '#f0f0f0',
-                /**
-                 * Standard hue values for node color palette.
-                 */
-                HUES: [220, 100, 180, 40, 20, 340, 260, 300, 140, 60],
-                STRUCTURE_PALETTE: function (id, lightened) {
-                    // The code below is a flexible way to computationally create a set
-                    // of colors that go well together.
-                    var hues = render.MetanodeColors.HUES;
-                    var n = hues.length;
-                    var hue = hues[id % n];
-                    var m = Math.sin(hue * Math.PI / 360);
-                    var sat = lightened ? 30 : 90 - 60 * m;
-                    var light = lightened ? 95 : 80;
-                    return d3.hsl(hue, .01 * sat, .01 * light).toString();
-                },
-                DEVICE_PALETTE: function (index) {
-                    return render.MetanodeColors.STRUCTURE_PALETTE(index);
-                },
-                XLA_CLUSTER_PALETTE: function (index) {
-                    return render.MetanodeColors.STRUCTURE_PALETTE(index);
-                },
-                UNKNOWN: '#eee',
-                GRADIENT_OUTLINE: '#888'
-            };
-            /**
-             * Color parameters for op nodes.
-             */
-            render.SeriesNodeColors = {
-                DEFAULT_FILL: 'white',
-                DEFAULT_STROKE: '#b2b2b2'
-            };
-            /**
-             * Parameters that affect how the graph is rendered on the screen.
-             */
-            var PARAMS = {
-                /**
-                 * Whether to extract high degree nodes from the core part of the graph.
-                 */
-                enableExtraction: true,
-                /**
-                 * The minimum number of nodes for a graph to have in order for high in and
-                 * out degree nodes to be extracted in auxiliary. The aim here is to prevent
-                 * nodes from being extracted from small graphs.
-                 */
-                minNodeCountForExtraction: 15,
-                /**
-                 * The minimum in or out degree a node must have in order to be possibly
-                 * extracted.
-                 */
-                minDegreeForExtraction: 5,
-                /**
-                 * Maximum number of control edges a node can have before they aren't
-                 * displayed.
-                 */
-                maxControlDegree: 4,
-                /**
-                 * Maximum in (for outbound bridge paths) or out (for inbound bridge paths)
-                 * degree of a node allowed for a bridge path to be rendered to it from a
-                 * subhierarchy of nodes. Having a max prevents having too many nodes emanate
-                 * from a subhierarchy and crowding up.
-                 */
-                maxBridgePathDegree: 4,
-                /**
-                 * Types patterns for predefined out-extract nodes, which are
-                 * sink-like nodes that will be extracted from the main graph.
-                 */
-                outExtractTypes: [
-                    'NoOp' // NoOps are sink-like used for managing control dependencies.
-                ],
-                /**
-                 * Types patterns for predefined in-extract nodes, which are
-                 * source-like nodes that will be extracted from the main graph.
-                 */
-                inExtractTypes: [],
-                /**
-                 * When removing edges from a high degree node, remove all of its edges if
-                 * detachAllEdgesForHighDegree is true.  Otherwise remove all in-edges if
-                 * the node has high in-degree, or all out-edges if the node has high
-                 * out-degree.
-                 */
-                detachAllEdgesForHighDegree: true,
-                /**
-                 * After extracting high in/out degree nodes and predefined
-                 * source-like/sink-like, extract isolated nodes to the side
-                 * if this extractIsolatedNodesWithAnnotationsOnOneSide is true.
-                 */
-                extractIsolatedNodesWithAnnotationsOnOneSide: true,
-                /**
-                 * Whether to add bridge nodes and edges to the core when building the
-                 * subhierarchy of an expanded metanode. See buildSubhierarchy().
-                 */
-                enableBridgegraph: true,
-                /**
-                 * 2 colors, for the minimum and maximum value respectively, whenever we
-                 * have a gradient scale.
-                 */
-                minMaxColors: ['#fff5f0', '#fb6a4a'],
-                /**
-                 * Maximum number of annotations to be displayed on a node before an
-                 * ellipsis is used.
-                 */
-                maxAnnotations: 5
-            };
-            /**
-             * Stores the rendering information, such as x and y coordinates,
-             * for each node in the graph.
-             */
-            var RenderGraphInfo = (function () {
-                function RenderGraphInfo(hierarchy, displayingStats) {
-                    this.hierarchy = hierarchy;
-                    this.displayingStats = displayingStats;
-                    this.index = {};
-                    this.renderedOpNames = [];
-                    this.computeScales();
-                    // Maps node name to whether the rendering hierarchy was already
-                    // constructed.
-                    this.hasSubhierarchy = {};
-                    this.root = new RenderGroupNodeInfo(hierarchy.root);
-                    this.index[hierarchy.root.name] = this.root;
-                    this.renderedOpNames.push(hierarchy.root.name);
-                    this.buildSubhierarchy(hierarchy.root.name);
-                    this.root.expanded = true;
-                    this.traceInputs = false;
-                }
-                RenderGraphInfo.prototype.computeScales = function () {
-                    this.deviceColorMap = d3.scale.ordinal()
-                        .domain(this.hierarchy.devices)
-                        .range(_.map(d3.range(this.hierarchy.devices.length), render.MetanodeColors.DEVICE_PALETTE));
-                    this.xlaClusterColorMap =
-                        d3.scale.ordinal()
-                            .domain(this.hierarchy.xlaClusters)
-                            .range(_.map(d3.range(this.hierarchy.xlaClusters.length), render.MetanodeColors.XLA_CLUSTER_PALETTE));
-                    var topLevelGraph = this.hierarchy.root.metagraph;
-                    // Find the maximum and minimum memory usage.
-                    var memoryExtent = d3.extent(topLevelGraph.nodes(), function (nodeName, index) {
-                        var node = topLevelGraph.node(nodeName);
-                        // Some ops don't have stats at all.
-                        if (node.stats != null) {
-                            return node.stats.totalBytes;
-                        }
-                    });
-                    this.memoryUsageScale = d3.scale.linear()
-                        .domain(memoryExtent)
-                        .range(PARAMS.minMaxColors);
-                    // Find also the minimum and maximum compute time.
-                    var computeTimeExtent = d3.extent(topLevelGraph.nodes(), function (nodeName, index) {
-                        var node = topLevelGraph.node(nodeName);
-                        // Some ops don't have stats at all.
-                        if (node.stats != null) {
-                            return node.stats.totalMicros;
-                        }
-                    });
-                    this.computeTimeScale = d3.scale.linear()
-                        .domain(computeTimeExtent)
-                        .range(PARAMS.minMaxColors);
-                    this.edgeWidthScale = this.hierarchy.hasShapeInfo ?
-                        graph_1.scene.edge.EDGE_WIDTH_SCALE :
-                        d3.scale.linear()
-                            .domain([1, this.hierarchy.maxMetaEdgeSize])
-                            .range([graph_1.scene.edge.MIN_EDGE_WIDTH, graph_1.scene.edge.MAX_EDGE_WIDTH]);
-                };
-                /**
-                 * Get a previously created RenderNodeInfo by its node name.
-                 */
-                RenderGraphInfo.prototype.getRenderNodeByName = function (nodeName) {
-                    return this.index[nodeName];
-                };
-                /**
-                 * Get the underlying node in the hierarchical graph by its name.
-                 */
-                RenderGraphInfo.prototype.getNodeByName = function (nodeName) {
-                    return this.hierarchy.node(nodeName);
-                };
-                /**
-                 * Get a previously created RenderNodeInfo for the specified node name,
-                 * or create one if it hasn't been created yet.
-                 */
-                RenderGraphInfo.prototype.getOrCreateRenderNodeByName = function (nodeName) {
-                    var _this = this;
-                    // Polymer may invoke this with null.
-                    if (!nodeName) {
-                        return null;
-                    }
-                    if (nodeName in this.index) {
-                        return this.index[nodeName];
-                    }
-                    var node = this.hierarchy.node(nodeName);
-                    // Exit early if the node does not exist in the hierarchy. This can happen
-                    // when a graph is reloaded while the infocard points to a node not visible
-                    // at the top-level.
-                    if (!node) {
-                        return null;
-                    }
-                    var renderInfo = node.isGroupNode ?
-                        new RenderGroupNodeInfo(node) :
-                        new RenderNodeInfo(node);
-                    this.index[nodeName] = renderInfo;
-                    this.renderedOpNames.push(nodeName);
-                    if (node.stats) {
-                        renderInfo.memoryColor = this.memoryUsageScale(node.stats.totalBytes);
-                        renderInfo.computeTimeColor =
-                            this.computeTimeScale(node.stats.totalMicros);
-                    }
-                    if (!node.isGroupNode) {
-                        var clusterName = node.xlaCluster;
-                        if (clusterName) {
-                            renderInfo.xlaClusterColor = this.xlaClusterColorMap(clusterName);
-                        }
-                    }
-                    // We only fade nodes when we're displaying stats.
-                    renderInfo.isFadedOut = this.displayingStats &&
-                        !tf.graph.util.hasDisplayableNodeStats(node.stats);
-                    if (node.isGroupNode) {
-                        // Make a list of tuples (device, proportion), where proportion
-                        // is the fraction of op nodes that have that device.
-                        var pairs = _.pairs(node.deviceHistogram);
-                        if (pairs.length > 0) {
-                            // Compute the total # of devices.
-                            var numDevices_1 = _.sum(pairs, _.last);
-                            renderInfo.deviceColors = _.map(pairs, function (pair) { return ({
-                                color: _this.deviceColorMap(pair[0]),
-                                // Normalize to a proportion of total # of devices.
-                                proportion: pair[1] / numDevices_1
-                            }); });
-                        }
-                    }
-                    else {
-                        var device = renderInfo.node.device;
-                        if (device) {
-                            renderInfo.deviceColors = [{
-                                    color: this.deviceColorMap(device),
-                                    proportion: 1.0
-                                }];
-                        }
-                    }
-                    return this.index[nodeName];
-                };
-                /**
-                 * Return the nearest ancestor node, including itself, that is visible
-                 * in the visualization. This method is used so that we can select
-                 * (highlight) a node that isn't drawn yet, by selecting (highlighting)
-                 * its nearest ancestor that has been drawn.
-                 */
-                RenderGraphInfo.prototype.getNearestVisibleAncestor = function (name) {
-                    var path = graph_1.getHierarchicalPath(name);
-                    for (var i = 0; i < path.length; i++) {
-                        var nodeName = path[i];
-                        // Op nodes have expanded set to false by default.
-                        if (!this.getRenderNodeByName(nodeName).expanded) {
-                            return nodeName;
-                        }
-                    }
-                    // Fallthrough. If everything was expanded return the node.
-                    return name;
-                };
-                // TODO(jimbo): Delete this an any code it touches (all deprecated).
-                RenderGraphInfo.prototype.setDepth = function (depth) {
-                    setGroupNodeDepth(this.root, +depth);
-                };
-                /**
-                 * Returns true if the renderNode is an isolated node within its parent node.
-                 */
-                RenderGraphInfo.prototype.isNodeAuxiliary = function (renderNode) {
-                    var parentNode = this.getRenderNodeByName(renderNode.node.parentNode.name);
-                    var found = _.find(parentNode.isolatedInExtract, function (node) {
-                        return node.node.name === renderNode.node.name;
-                    });
-                    if (found) {
-                        return true;
-                    }
-                    found = _.find(parentNode.isolatedOutExtract, function (node) {
-                        return node.node.name === renderNode.node.name;
-                    });
-                    return !!found;
-                };
-                /**
-                 * Returns a list of ops that have been rendered so far for this graph. More
-                 * ops may later be rendered if the user expands nodes for instance. The list
-                 * returned here can only stay the same size or grow on successive calls.
-                 */
-                RenderGraphInfo.prototype.getNamesOfRenderedOps = function () {
-                    return this.renderedOpNames;
-                };
-                RenderGraphInfo.prototype.buildSubhierarchy = function (nodeName) {
-                    var _this = this;
-                    // Terminate if the rendering hierarchy was already constructed
-                    // for this node.
-                    if (nodeName in this.hasSubhierarchy) {
-                        return;
-                    }
-                    var renderNodeInfo = this.index[nodeName];
-                    // If it is not a meta node or a series node, don't do anything.
-                    if (renderNodeInfo.node.type !== graph_1.NodeType.META &&
-                        renderNodeInfo.node.type !== graph_1.NodeType.SERIES) {
-                        return;
-                    }
-                    // At this point we know the rendering information is about a group node.
-                    var renderGroupNodeInfo = renderNodeInfo;
-                    var metagraph = renderGroupNodeInfo.node.metagraph;
-                    var coreGraph = renderGroupNodeInfo.coreGraph;
-                    // Create render nodes to represent each child from the metagraph. Although
-                    // these will initially be added to the coreGraph, they may later be
-                    // extracted. Also, due to extraction, the coreGraph may contain disjoint
-                    // groups between which there is no visible path (other than annotations).
-                    _.each(metagraph.nodes(), function (childName) {
-                        var childRenderInfo = _this.getOrCreateRenderNodeByName(childName);
-                        var childNode = childRenderInfo.node;
-                        coreGraph.setNode(childName, childRenderInfo);
-                        if (!childNode.isGroupNode) {
-                            _.each(childNode.inEmbeddings, function (embedding) {
-                                var renderMetaedgeInfo = new RenderMetaedgeInfo(null);
-                                addInAnnotation(childRenderInfo, embedding, null, renderMetaedgeInfo, AnnotationType.CONSTANT);
-                                _this.index[embedding.name] = new RenderNodeInfo(embedding);
-                            });
-                            _.each(childNode.outEmbeddings, function (embedding) {
-                                var renderMetaedgeInfo = new RenderMetaedgeInfo(null);
-                                addOutAnnotation(childRenderInfo, embedding, null, renderMetaedgeInfo, AnnotationType.SUMMARY);
-                                _this.index[embedding.name] = new RenderNodeInfo(embedding);
-                            });
-                        }
-                    });
-                    // Add render metaedge info for edges in the metagraph.
-                    _.each(metagraph.edges(), function (edgeObj) {
-                        var metaedge = metagraph.edge(edgeObj);
-                        var renderMetaedgeInfo = new RenderMetaedgeInfo(metaedge);
-                        renderMetaedgeInfo.isFadedOut =
-                            _this.index[edgeObj.v].isFadedOut || _this.index[edgeObj.w].isFadedOut;
-                        coreGraph.setEdge(edgeObj.v, edgeObj.w, renderMetaedgeInfo);
-                    });
-                    if (PARAMS.enableExtraction &&
-                        renderGroupNodeInfo.node.type === graph_1.NodeType.META) {
-                        extractHighDegrees(renderGroupNodeInfo);
-                    }
-                    // Record that we constructed the rendering hierarchy for this node, so we
-                    // don't construct it another time.
-                    this.hasSubhierarchy[nodeName] = true;
-                    // Look up the parent node's render information and short circuit if none.
-                    var parentNode = renderGroupNodeInfo.node.parentNode;
-                    if (!parentNode) {
-                        return;
-                    }
-                    var parentNodeInfo = this.index[parentNode.name];
-                    // Utility function for computing the name of a bridge node.
-                    var getBridgeNodeName = function (inbound) {
-                        var rest = [];
-                        for (var _i = 1; _i < arguments.length; _i++) {
-                            rest[_i - 1] = arguments[_i];
-                        }
-                        return rest.concat([inbound ? 'IN' : 'OUT']).join('~~');
-                    };
-                    // Build out the bridgegraph.
-                    var bridgegraph = this.hierarchy.getBridgegraph(nodeName);
-                    // Look for popular nodes so we can make annotations instead of paths.
-                    var otherCounts = {
-                        // Counts of edges coming INTO other nodes by name (outgoing from self).
-                        in: {},
-                        // Counts of edges going OUT from other nodes by name (coming into self).
-                        out: {},
-                        // Counts of all control edges involving other nodes by name.
-                        control: {},
-                    };
-                    _.each(bridgegraph.edges(), function (e) {
-                        // An edge is inbound if its destination node is in the metagraph.
-                        var inbound = !!metagraph.node(e.w);
-                        var otherName = inbound ? e.v : e.w;
-                        var metaedge = bridgegraph.edge(e);
-                        if (!metaedge.numRegularEdges) {
-                            otherCounts.control[otherName] =
-                                (otherCounts.control[otherName] || 0) + 1;
-                        }
-                        else if (inbound) {
-                            otherCounts.out[otherName] = (otherCounts.out[otherName] || 0) + 1;
-                        }
-                        else {
-                            otherCounts.in[otherName] = (otherCounts.in[otherName] || 0) + 1;
-                        }
-                    });
-                    // Add annotations and edges for bridgegraph relationships.
-                    var hierarchyNodeMap = this.hierarchy.getNodeMap();
-                    _.each(bridgegraph.edges(), function (bridgeEdgeObj) {
-                        var bridgeMetaedge = bridgegraph.edge(bridgeEdgeObj);
-                        // Determine whether this bridge edge is incoming by checking the
-                        // metagraph for a node that matches the destination end.
-                        var inbound = !!metagraph.node(bridgeEdgeObj.w);
-                        // Based on the direction of the edge, one endpoint will be an immediate
-                        // child of this renderNodeInfo, and the other endpoint will be a sibling
-                        // of the parent (or an ancestor further up).
-                        var _a = inbound ?
-                            [bridgeEdgeObj.w, bridgeEdgeObj.v] :
-                            [bridgeEdgeObj.v, bridgeEdgeObj.w], childName = _a[0], otherName = _a[1];
-                        var childRenderInfo = _this.index[childName];
-                        var otherRenderInfo = _this.index[otherName];
-                        var otherNode = otherRenderInfo ?
-                            otherRenderInfo.node :
-                            hierarchyNodeMap[otherName];
-                        // Determine whether this edge is a control edge between nodes where
-                        // either node is high-degree with respect to control edges. This will
-                        // be a signal to show it as an annotation instead of a bridge edge.
-                        var isHighDegreeControlEdge = !bridgeMetaedge.numRegularEdges &&
-                            otherCounts.control[otherName] > PARAMS.maxControlDegree;
-                        var _b = inbound ?
-                            [renderNodeInfo.inAnnotations, childRenderInfo.inAnnotations] :
-                            [renderNodeInfo.outAnnotations, childRenderInfo.outAnnotations], childAnnotations = _b[1];
-                        // Don't render a bridge path if the other node has in or out degree above
-                        // a threshold, lest bridge paths emanating out of a metagraph crowd up,
-                        // as was the case for the Fatcat LSTM lstm_1 > lstm_1 metagraph.
-                        var otherDegreeCount = (inbound ? otherCounts.out : otherCounts.in)[otherName];
-                        var isOtherHighDegree = otherDegreeCount > PARAMS.maxBridgePathDegree;
-                        // The adjoining render metaedge info from the parent's coreGraph, if any.
-                        // It will either be a Metaedge involving this node directly, if it
-                        // previously came from a metagraph, or it'll be a Metaedge involving
-                        // a previously created bridge node standing in for the other node.
-                        var adjoiningMetaedge = null;
-                        // We can only hope to render a bridge path if:
-                        //  - bridgegraph paths are enabled,
-                        //  - the other node is not too high-degree,
-                        //  - the child is in the core (not extracted for being high-degree), and
-                        //  - there's a path (in the traversal sense) between child and other.
-                        var canDrawBridgePath = false;
-                        if (PARAMS.enableBridgegraph &&
-                            !isOtherHighDegree &&
-                            !isHighDegreeControlEdge &&
-                            childRenderInfo.isInCore()) {
-                            // Utility function for finding an adjoining metaedge.
-                            var findAdjoiningMetaedge = function (targetName) {
-                                var adjoiningEdgeObj = inbound ?
-                                    { v: targetName, w: nodeName } :
-                                    { v: nodeName, w: targetName };
-                                return parentNodeInfo.coreGraph.edge(adjoiningEdgeObj);
-                            };
-                            adjoiningMetaedge = findAdjoiningMetaedge(otherName);
-                            if (!adjoiningMetaedge) {
-                                adjoiningMetaedge = findAdjoiningMetaedge(getBridgeNodeName(inbound, otherName, parentNode.name));
-                            }
-                            canDrawBridgePath = !!adjoiningMetaedge;
-                        }
-                        // Although dataflow edges are acyclic, control dependency edges may
-                        // actually point 'backwards' in the graph. If this bridgeMetaedge is
-                        // a control dependency, we need to determine whether it's backwards
-                        // pointing so that we render it appropriately.
-                        //
-                        // For instance, say we're rendering a graph with nodes named A/B and Z/Y,
-                        // and we're currently rendering the bridgegraph for A. Further, let's say
-                        // that there was an original BaseEdge from A/B->Z/Y and a CONTROL EDGE
-                        // from Z/Y=>A/B.
-                        //
-                        //     +----------------+
-                        //     | A              |
-                        //     |  +-----+       |         +------+
-                        //     |  | B   |>-----\x3e|>-------\x3e| Z    |
-                        //     |  |     |       |         |      |
-                        //     |  |     |   *   |         |      |
-                        //     |  |     |<=====<|<=======<|      |
-                        //     |  +-----+       |         +------+
-                        //     +----------------+
-                        //
-                        // When we render the subhierarchy for Metanode A, we'll come across a
-                        // control-only Metaedge in the bridgegraph from Z=>A/B (*). The question
-                        // is whether this edge is backwards.
-                        //
-                        // To answer that question, we follow the chain of adjoining metaedges
-                        // until we reach the topmost one. In this case, that's the control-only
-                        // Metaedge Z=>A in the ROOT's metagraph. We determine that this edge
-                        // is backwards by looking at the topological ordering of ROOT's metagraph
-                        // (which ignores control edges) and seeing that Z comes AFTER A.
-                        //
-                        // The property of being backwards is independent of whether the edge
-                        // is inbound or outbound. In the preceding example, if we were building
-                        // the subhierarchy for Z, we'd find bridge edge Z/Y=>A, walk to its
-                        // topmost adjoining metaedge Z=>A and discover that it's backwards.
-                        var backwards = false;
-                        if (adjoiningMetaedge && !bridgeMetaedge.numRegularEdges) {
-                            // Find the top-most adjoining render metaedge information, and the
-                            // GroupNode whose metagraph must contain the associated metaedge.
-                            var topAdjoiningMetaedge = adjoiningMetaedge;
-                            var topGroupNode = parentNodeInfo.node;
-                            while (topAdjoiningMetaedge.adjoiningMetaedge) {
-                                topAdjoiningMetaedge = topAdjoiningMetaedge.adjoiningMetaedge;
-                                topGroupNode = topGroupNode.parentNode;
-                            }
-                            // Check against the topological ordering for the top node. The current
-                            // bridge metaedge we're evaluating is backwards if its source comes
-                            // after its destination.
-                            var ordering = _this.hierarchy.getTopologicalOrdering(topGroupNode.name);
-                            var e = topAdjoiningMetaedge.metaedge;
-                            backwards = ordering[e.v] > ordering[e.w];
-                        }
-                        // Render backwards control edges as annotations.
-                        canDrawBridgePath = canDrawBridgePath && !backwards;
-                        // If we can't make a bridge path for any reason, then we add an
-                        // annotation instead.
-                        if (!canDrawBridgePath) {
-                            childAnnotations.push(new Annotation(otherNode, otherRenderInfo, new RenderMetaedgeInfo(bridgeMetaedge), AnnotationType.SHORTCUT, inbound));
-                            return;
-                        }
-                        // At this point, all conditions have been met for drawing a bridge path.
-                        // Find or create the IN/OUT node representing otherNode.
-                        var bridgeContainerName = getBridgeNodeName(inbound, nodeName);
-                        var bridgeNodeName = getBridgeNodeName(inbound, otherName, nodeName);
-                        var bridgeNodeRenderInfo = coreGraph.node(bridgeNodeName);
-                        if (!bridgeNodeRenderInfo) {
-                            // Find or create the directional container for the bridge node.
-                            var bridgeContainerInfo = coreGraph.node(bridgeContainerName);
-                            if (!bridgeContainerInfo) {
-                                var bridgeContainerNode = {
-                                    // Important node properties.
-                                    name: bridgeContainerName,
-                                    type: graph_1.NodeType.BRIDGE,
-                                    // Unused node properties.
-                                    isGroupNode: false,
-                                    cardinality: 0,
-                                    parentNode: null,
-                                    stats: null,
-                                    include: graph_1.InclusionType.UNSPECIFIED,
-                                    // BridgeNode properties.
-                                    inbound: inbound,
-                                    nodeAttributes: {},
-                                };
-                                bridgeContainerInfo =
-                                    new RenderNodeInfo(bridgeContainerNode);
-                                _this.index[bridgeContainerName] = bridgeContainerInfo;
-                                coreGraph.setNode(bridgeContainerName, bridgeContainerInfo);
-                            }
-                            var bridgeNode = {
-                                // Important node properties.
-                                name: bridgeNodeName,
-                                type: graph_1.NodeType.BRIDGE,
-                                // Unimportant node properties.
-                                isGroupNode: false,
-                                cardinality: 1,
-                                parentNode: null,
-                                stats: null,
-                                include: graph_1.InclusionType.UNSPECIFIED,
-                                // BridgeNode properties.
-                                inbound: inbound,
-                                nodeAttributes: {},
-                            };
-                            bridgeNodeRenderInfo = new RenderNodeInfo(bridgeNode);
-                            _this.index[bridgeNodeName] = bridgeNodeRenderInfo;
-                            coreGraph.setNode(bridgeNodeName, bridgeNodeRenderInfo);
-                            // Set bridgeNode to be a graphlib child of the container node.
-                            coreGraph.setParent(bridgeNodeName, bridgeContainerName);
-                            bridgeContainerInfo.node.cardinality++;
-                        }
-                        // Create and add a bridge render metaedge.
-                        var bridgeRenderMetaedge = new RenderMetaedgeInfo(bridgeMetaedge);
-                        bridgeRenderMetaedge.adjoiningMetaedge = adjoiningMetaedge;
-                        inbound ?
-                            coreGraph.setEdge(bridgeNodeName, childName, bridgeRenderMetaedge) :
-                            coreGraph.setEdge(childName, bridgeNodeName, bridgeRenderMetaedge);
-                    }); // End _.each(bridgegraph.edges).
-                    // For each bridge container (IN and/or OUT), add structural edges between
-                    // terminal nodes and that container. A terminal node is one which has no
-                    // non-bridge edges in the direction of the container.
-                    //
-                    // For example, consider a Metanode A which contains two child nodes A/B
-                    // and A/C. Let's say it has one edge in the metagraph from A/B->A/C, and
-                    // one edge in the bridgegraph from Z->A/C.
-                    //
-                    // At this point, we've added a container bridge node IN to house all
-                    // incoming bridge nodes. We've also added a bridge node Z' (with parent IN)
-                    // to A, and a bridge edge from Z'->C.
-                    //
-                    //     +----------------------+
-                    //     | A          +---+     |
-                    //     |    +------\x3e| C |     |
-                    //     |    |       +---+     |
-                    //     |    |         ^       |
-                    //     |    |         |       |
-                    //     |    |    +----|----+  |
-                    //     |    |    | IN |    |  |
-                    //     |  +---+  |  +---+  |  |
-                    //     |  | B |  |  | Z'|  |  |
-                    //     |  +---+  |  +---+  |  |
-                    //     |         +---------+  |
-                    //     +----------------------+
-                    //
-                    // With no other help, dagre would lay out B and Z' on the same level,
-                    // because both of them have no incoming edges. In other words, B is a
-                    // terminal node in the INCOMING direction.
-                    //
-                    // But we want to force dagre to lay out Z' (and everything in IN) lower
-                    // than all non-bridge nodes, so that there's enough room for the bridge
-                    // edges after they've been adjusted to meet up with paths coming in from
-                    // outside.
-                    //
-                    // To force Z' (and all other bridge nodes) to be lowest in the graph, we
-                    // identify terminal nodes like B and give them structural edges to
-                    // a new structural bridge node S which we add to IN.
-                    //
-                    //     +----------------------+
-                    //     | A          +---+     |
-                    //     |       +---\x3e| C |     |
-                    //     |       |    +---+     |
-                    //     |     +---+    ^       |
-                    //     |     | B |    |       |
-                    //     |     +---+    |       |
-                    //     |       ^      |       |
-                    //     |       |      |       |
-                    //     |  +----|------|----+  |
-                    //     |  |IN  |      |    |  |
-                    //     |  |  +---+  +---+  |  |
-                    //     |  |  | S |  | Z'|  |  |
-                    //     |  |  +---+  +---+  |  |
-                    //     |  +----------------+  |
-                    //     +----------------------+
-                    //
-                    // This ensures that dagre will lay out the bridge containers strictly at
-                    // the ends of the graph. The structural edges will never be seen in the
-                    // visualization except as a debugging aid.
-                    _.each([true, false], function (inbound) {
-                        var bridgeContainerName = getBridgeNodeName(inbound, nodeName);
-                        var bridgeContainerInfo = coreGraph.node(bridgeContainerName);
-                        if (!bridgeContainerInfo) {
-                            return;
-                        }
-                        _.each(coreGraph.nodes(), function (childName) {
-                            // Short-circuit if this child is a bridge node or it's not a terminal
-                            // node in the direction we're interested in.
-                            var childNodeInfo = coreGraph.node(childName);
-                            if (childNodeInfo.node.type === graph_1.NodeType.BRIDGE) {
-                                return;
-                            }
-                            var isTerminal = inbound ?
-                                !coreGraph.predecessors(childName).length :
-                                !coreGraph.successors(childName).length;
-                            if (!isTerminal) {
-                                return;
-                            }
-                            // Find or create a bridge node in the container for all structural
-                            // metaedges. It would have been nice to skip this step and simply
-                            // set a metaedge between the terminal node and the container node, but
-                            // in that case, something about the graph upsets dagre.layout()'s
-                            // longestPath algorithm (was getting errors due to an undefined).
-                            var structuralNodeName = getBridgeNodeName(inbound, nodeName, 'STRUCTURAL_TARGET');
-                            var structuralRenderInfo = coreGraph.node(structuralNodeName);
-                            if (!structuralRenderInfo) {
-                                var bridgeNode = {
-                                    // Important Node properties.
-                                    name: structuralNodeName,
-                                    type: graph_1.NodeType.BRIDGE,
-                                    // Unimportant Node properties.
-                                    isGroupNode: false,
-                                    cardinality: 1,
-                                    parentNode: null,
-                                    stats: null,
-                                    include: graph_1.InclusionType.UNSPECIFIED,
-                                    // BridgeNode properties.
-                                    inbound: inbound,
-                                    nodeAttributes: {},
-                                };
-                                structuralRenderInfo = new RenderNodeInfo(bridgeNode);
-                                structuralRenderInfo.structural = true;
-                                _this.index[structuralNodeName] = structuralRenderInfo;
-                                coreGraph.setNode(structuralNodeName, structuralRenderInfo);
-                                bridgeContainerInfo.node.cardinality++;
-                                coreGraph.setParent(structuralNodeName, bridgeContainerName);
-                            }
-                            // Create the structural Metaedge and insert it.
-                            var structuralMetaedgeInfo = new RenderMetaedgeInfo(null);
-                            structuralMetaedgeInfo.structural = true;
-                            structuralMetaedgeInfo.weight--; // Reduce weight for dagre layout.
-                            inbound ?
-                                coreGraph.setEdge(structuralNodeName, childName, structuralMetaedgeInfo) :
-                                coreGraph.setEdge(childName, structuralNodeName, structuralMetaedgeInfo);
-                        });
-                    });
-                };
-                return RenderGraphInfo;
-            }());
-            render.RenderGraphInfo = RenderGraphInfo;
-            /**
-             * A class for rendering annotation object which contains label
-             * about the node embedded as annotation, type of annotation and the location
-             * of both the annotation's node and edge.
-             *
-             * Annotation objects include embedded constants, embedded summary, and
-             * edge shortcuts.
-             */
-            var Annotation = (function () {
-                /**
-                 * Creates a new Annotation.
-                 *
-                 * @param node The underlying node this annotation points to.
-                 * @param renderNodeInfo The render information for the underlying node
-                 *     this annotation points to. This can be null if the annotation
-                 *     denotes an embedding (constant, summary), in which case we
-                 *     use the node property.
-                 * @param renderMetaedgeInfo The render information for the edge associated
-                 *     with the annotation.
-                 * @param type The type of the annotation.
-                 * @param isIn True if it is an in-annotation. False if it is an
-                 *     out-annotation.
-                 */
-                function Annotation(node, renderNodeInfo, renderMetaedgeInfo, type, isIn) {
-                    this.node = node;
-                    this.renderNodeInfo = renderNodeInfo;
-                    this.renderMetaedgeInfo = renderMetaedgeInfo;
-                    this.annotationType = type;
-                    // Properties specified by layout
-                    this.dx = 0;
-                    this.dy = 0;
-                    this.width = 0;
-                    this.height = 0;
-                    // Properties needed for generating an ID for the edge's path element if
-                    // this annotation is associated with a metaedge.
-                    if (renderMetaedgeInfo && renderMetaedgeInfo.metaedge) {
-                        this.v = renderMetaedgeInfo.metaedge.v;
-                        this.w = renderMetaedgeInfo.metaedge.w;
-                    }
-                    this.isIn = isIn;
-                    this.points = [];
-                }
-                return Annotation;
-            }());
-            render.Annotation = Annotation;
-            ;
-            var AnnotationType;
-            (function (AnnotationType) {
-                AnnotationType[AnnotationType["SHORTCUT"] = 0] = "SHORTCUT";
-                AnnotationType[AnnotationType["CONSTANT"] = 1] = "CONSTANT";
-                AnnotationType[AnnotationType["SUMMARY"] = 2] = "SUMMARY";
-                AnnotationType[AnnotationType["ELLIPSIS"] = 3] = "ELLIPSIS";
-            })(AnnotationType = render.AnnotationType || (render.AnnotationType = {}));
-            ;
-            /**
-             * Manages a list of annotations. Two will be used for each
-             * RenderNodeInfo, one for in annotations and one for out annotations.
-             */
-            var AnnotationList = (function () {
-                function AnnotationList() {
-                    this.list = [];
-                    this.nodeNames = {};
-                }
-                /**
-                 * Append an annotation to the list, or a stand-in ellipsis annotation instead
-                 * if this would make it too many.
-                 */
-                AnnotationList.prototype.push = function (annotation) {
-                    if (annotation.node.name in this.nodeNames) {
-                        return; // Skip duplicate annotation.
-                    }
-                    this.nodeNames[annotation.node.name] = true;
-                    if (this.list.length < PARAMS.maxAnnotations) {
-                        this.list.push(annotation);
-                        return;
-                    }
-                    var lastAnnotation = this.list[this.list.length - 1];
-                    if (lastAnnotation.annotationType === AnnotationType.ELLIPSIS) {
-                        var ellipsisNode_1 = lastAnnotation.node;
-                        ellipsisNode_1.setNumMoreNodes(++ellipsisNode_1.numMoreNodes);
-                        return;
-                    }
-                    var ellipsisNode = new tf.graph.EllipsisNodeImpl(1);
-                    this.list.push(new Annotation(ellipsisNode, new RenderNodeInfo(ellipsisNode), null, AnnotationType.ELLIPSIS, annotation.isIn));
-                };
-                return AnnotationList;
-            }());
-            render.AnnotationList = AnnotationList;
-            /**
-             * Contains rendering information about a node in the hierarchical graph.
-             */
-            var RenderNodeInfo = (function () {
-                function RenderNodeInfo(node) {
-                    this.node = node;
-                    this.expanded = false;
-                    this.inAnnotations = new AnnotationList();
-                    this.outAnnotations = new AnnotationList();
-                    // Params specified by layout
-                    this.x = 0;
-                    this.y = 0;
-                    this.width = 0;
-                    this.height = 0;
-                    this.inboxWidth = 0;
-                    this.outboxWidth = 0;
-                    this.excluded = false;
-                    // Params for bridge paths.
-                    this.structural = false;
-                    // Params for node box.
-                    this.labelOffset = 0;
-                    this.radius = 0;
-                    // Params for expanded node
-                    this.labelHeight = 0;
-                    this.paddingTop = 0;
-                    this.paddingLeft = 0;
-                    this.paddingRight = 0;
-                    this.paddingBottom = 0;
-                    this.isInExtract = false;
-                    this.isOutExtract = false;
-                    this.coreBox = { width: 0, height: 0 };
-                    // By default, we don't fade nodes out. Default to false for safety.
-                    this.isFadedOut = false;
-                }
-                RenderNodeInfo.prototype.isInCore = function () {
-                    return !this.isInExtract && !this.isOutExtract;
-                };
-                return RenderNodeInfo;
-            }());
-            render.RenderNodeInfo = RenderNodeInfo;
-            /**
-             * Contains rendering information about a Metaedge from the underlying
-             * hierarchical graph. It may be from either a metagraph or a bridgegraph.
-             */
-            var RenderMetaedgeInfo = (function () {
-                function RenderMetaedgeInfo(metaedge) {
-                    this.metaedge = metaedge;
-                    this.adjoiningMetaedge = null;
-                    this.structural = false;
-                    this.weight = 1;
-                    this.isFadedOut = false;
-                }
-                return RenderMetaedgeInfo;
-            }());
-            render.RenderMetaedgeInfo = RenderMetaedgeInfo;
-            function addInAnnotation(node, predecessor, predecessorRenderInfo, edge, type) {
-                var annotation = new Annotation(predecessor, predecessorRenderInfo, edge, type, true);
-                node.inAnnotations.push(annotation);
-            }
-            function addOutAnnotation(node, successor, successorRenderInfo, edge, type) {
-                var annotation = new Annotation(successor, successorRenderInfo, edge, type, false);
-                node.outAnnotations.push(annotation);
-            }
-            function setGraphDepth(graph, depth) {
-                _.each(graph.nodes(), function (nodeName) {
-                    var child = graph.node(nodeName);
-                    child.expanded = depth > 1; // set all child of depth 1 to collapsed
-                    if (depth > 0) {
-                        switch (child.node.type) {
-                            case graph_1.NodeType.META:
-                            case graph_1.NodeType.SERIES:
-                                setGroupNodeDepth(child, depth - 1);
-                                break;
-                        }
-                    }
-                });
-            }
-            ;
-            var RenderGroupNodeInfo = (function (_super) {
-                __extends(RenderGroupNodeInfo, _super);
-                function RenderGroupNodeInfo(groupNode) {
-                    var _this = _super.call(this, groupNode) || this;
-                    var metagraph = groupNode.metagraph;
-                    var gl = metagraph.graph();
-                    _this.coreGraph =
-                        graph_1.createGraph(gl.name, graph_1.GraphType.CORE, { compound: true });
-                    _this.inExtractBox = { width: 0, height: 0 };
-                    _this.outExtractBox = { width: 0, height: 0 };
-                    _this.isolatedInExtract = [];
-                    _this.isolatedOutExtract = [];
-                    return _this;
-                }
-                return RenderGroupNodeInfo;
-            }(RenderNodeInfo));
-            render.RenderGroupNodeInfo = RenderGroupNodeInfo;
-            function setGroupNodeDepth(renderInfo, depth) {
-                if (renderInfo.coreGraph) {
-                    setGraphDepth(renderInfo.coreGraph, depth);
-                }
-            }
-            /**
-             * Remove an edge from the graph and add annotations to both ends of the edge.
-             *
-             * @param The core graph.
-             * @param v Source name.
-             * @param w Sink name.
-             */
-            function createShortcut(graph, v, w) {
-                var src = graph.node(v);
-                var sink = graph.node(w);
-                var edge = graph.edge(v, w);
-                // If either of the nodes is explicitly included in the main graph and
-                // both nodes are in the main graph then do not create the shortcut
-                // and instead keep the real edge.
-                if ((src.node.include === graph_1.InclusionType.INCLUDE ||
-                    sink.node.include === graph_1.InclusionType.INCLUDE) &&
-                    src.node.include !== graph_1.InclusionType.EXCLUDE &&
-                    sink.node.include !== graph_1.InclusionType.EXCLUDE) {
-                    return;
-                }
-                // Add each annotation.
-                addOutAnnotation(src, sink.node, sink, edge, AnnotationType.SHORTCUT);
-                addInAnnotation(sink, src.node, src, edge, AnnotationType.SHORTCUT);
-                // Remove the edge from the core graph.
-                graph.removeEdge(v, w);
-            }
-            /**
-             * Remove edges from a node, and set its isOutExtract property to true,
-             * and remove the node and move it to isolatedOutExtract.
-             *
-             * If detachAllEdgesForHighDegree or forceDetach is true, extract all of its
-             * edges. Otherwise, only extract all in-edges.
-             */
-            function makeOutExtract(renderNode, n, forceDetach) {
-                var graph = renderNode.coreGraph;
-                var child = graph.node(n);
-                child.isOutExtract = true;
-                _.each(graph.predecessors(n), function (p, index) {
-                    createShortcut(graph, p, n);
-                });
-                if (PARAMS.detachAllEdgesForHighDegree || forceDetach) {
-                    _.each(graph.successors(n), function (s, index) {
-                        createShortcut(graph, n, s);
-                    });
-                }
-                // Remove the node from the core graph if it no longer has neighbors.
-                if (graph.neighbors(n).length === 0) {
-                    child.node.include = graph_1.InclusionType.EXCLUDE;
-                    renderNode.isolatedOutExtract.push(child);
-                    graph.removeNode(n);
-                }
-            }
-            /**
-             * Remove edges from a node, set its isInExtract property to true,
-             * and remove the node and move it to isolatedInExtract.
-             *
-             * If detachAllEdgesForHighDegree or forceDetach is true, extract all of its
-             * edges. Otherwise, only remove all out-edges.
-             */
-            function makeInExtract(renderNode, n, forceDetach) {
-                var graph = renderNode.coreGraph;
-                var child = graph.node(n);
-                child.isInExtract = true;
-                _.each(graph.successors(n), function (s, index) {
-                    createShortcut(graph, n, s);
-                });
-                if (PARAMS.detachAllEdgesForHighDegree || forceDetach) {
-                    _.each(graph.predecessors(n), function (p, index) {
-                        createShortcut(graph, p, n);
-                    });
-                }
-                // Remove the node from the core graph if it no longer has neighbors.
-                if (graph.neighbors(n).length === 0) {
-                    child.node.include = graph_1.InclusionType.EXCLUDE;
-                    renderNode.isolatedInExtract.push(child);
-                    graph.removeNode(n);
-                }
-            }
-            render.makeInExtract = makeInExtract;
-            /**
-             * Check whether the node's type is a member of the given list of types.
-             *
-             * @param node Node.
-             * @param types List of type to match.
-             */
-            function hasTypeIn(node, types) {
-                if (node.type === graph_1.NodeType.OP) {
-                    for (var i = 0; i < types.length; i++) {
-                        if (node.op === types[i]) {
-                            return true;
-                        }
-                    }
-                }
-                else if (node.type === graph_1.NodeType.META) {
-                    var rootOpNode = node.getRootOp();
-                    if (rootOpNode) {
-                        for (var i = 0; i < types.length; i++) {
-                            if (rootOpNode.op === types[i]) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-                return false;
-            }
-            /** Move nodes that are specified to be excluded out of the core graph. */
-            function extractSpecifiedNodes(renderNode) {
-                var graph = renderNode.coreGraph;
-                _.each(graph.nodes(), function (n) {
-                    var renderInfo = graph.node(n);
-                    if (renderInfo.node.include === graph_1.InclusionType.EXCLUDE) {
-                        if (renderNode.coreGraph.outEdges(n).length >
-                            renderNode.coreGraph.inEdges(n).length) {
-                            makeOutExtract(renderNode, n, true);
-                        }
-                        else {
-                            makeInExtract(renderNode, n, true);
-                        }
-                    }
-                });
-            }
-            /** Remove edges from pre-defined out-extract patterns */
-            function extractPredefinedSink(renderNode) {
-                var graph = renderNode.coreGraph;
-                _.each(graph.nodes(), function (n) {
-                    var renderInfo = graph.node(n);
-                    if (renderInfo.node.include !== graph_1.InclusionType.UNSPECIFIED) {
-                        return;
-                    }
-                    if (hasTypeIn(renderInfo.node, PARAMS.outExtractTypes)) {
-                        makeOutExtract(renderNode, n);
-                    }
-                });
-            }
-            /** Remove edges from pre-defined in-extract patterns */
-            function extractPredefinedSource(renderNode) {
-                var graph = renderNode.coreGraph;
-                _.each(graph.nodes(), function (n) {
-                    var renderInfo = graph.node(n);
-                    if (renderInfo.node.include !== graph_1.InclusionType.UNSPECIFIED) {
-                        return;
-                    }
-                    if (hasTypeIn(renderInfo.node, PARAMS.inExtractTypes)) {
-                        makeInExtract(renderNode, n);
-                    }
-                });
-            }
-            /** Extract nodes deemed to have either high in-degree or high out-degree. */
-            function extractHighInOrOutDegree(renderNode) {
-                var graph = renderNode.coreGraph;
-                // Create mappings from node to in and out degrees. Count the number of valid
-                // nodes along the way.
-                var nodeToInDegree = {};
-                var nodeToOutDegree = {};
-                var validNodeCount = 0;
-                _.each(graph.nodes(), function (currentNode) {
-                    if (graph.node(currentNode).node.include !== graph_1.InclusionType.UNSPECIFIED) {
-                        // This node is not included in the first place.
-                        return;
-                    }
-                    // Count the in and out degrees based on only regular edges, unless there
-                    // are no regular edges, in which case use the number of control edges.
-                    // This is done so that control edges don't affect if nodes are extracted
-                    // from the core graph, unless the node is only used for control.
-                    var inDegree = _.reduce(graph.predecessors(currentNode), function (inDegree, pred) {
-                        var metaedge = graph.edge(pred, currentNode).metaedge;
-                        return inDegree + (metaedge.numRegularEdges ? 1 : 0);
-                    }, 0);
-                    if (inDegree === 0 && graph.predecessors(currentNode).length > 0) {
-                        inDegree = graph.predecessors(currentNode).length;
-                    }
-                    var outDegree = _.reduce(graph.successors(currentNode), function (outDegree, succ) {
-                        var metaedge = graph.edge(currentNode, succ).metaedge;
-                        return outDegree + (metaedge.numRegularEdges ? 1 : 0);
-                    }, 0);
-                    if (outDegree === 0 && graph.successors(currentNode).length > 0) {
-                        outDegree = graph.successors(currentNode).length;
-                    }
-                    // Store the in and out degrees of this node to avoid recomputing.
-                    nodeToInDegree[currentNode] = inDegree;
-                    nodeToOutDegree[currentNode] = outDegree;
-                    validNodeCount++;
-                });
-                if (validNodeCount < PARAMS.minNodeCountForExtraction) {
-                    // This graph has few nodes. Do not extract any nodes.
-                    return;
-                }
-                // We only extract if the node has a min in or out degree greater than this.
-                var minUpperBound = PARAMS.minDegreeForExtraction - 1;
-                // Mark for extraction nodes with in-degree > Q3 + (Q3 - Q1).
-                var q3Index = Math.round(validNodeCount * 0.75);
-                var q1Index = Math.round(validNodeCount * 0.25);
-                var sortedByInDegree = Object.keys(nodeToInDegree).sort(function (node0, node1) {
-                    return nodeToInDegree[node0] - nodeToInDegree[node1];
-                });
-                var inDegreeQ3 = nodeToInDegree[sortedByInDegree[q3Index]];
-                var inDegreeQ1 = nodeToInDegree[sortedByInDegree[q1Index]];
-                var inDegreeUpperBound = inDegreeQ3 + inDegreeQ3 - inDegreeQ1;
-                // Only extract if the upper bound is high enough.
-                inDegreeUpperBound = Math.max(inDegreeUpperBound, minUpperBound);
-                for (var i = validNodeCount - 1; nodeToInDegree[sortedByInDegree[i]] > inDegreeUpperBound; i--) {
-                    // Extract a high in-degree node.
-                    makeInExtract(renderNode, sortedByInDegree[i]);
-                }
-                // Mark for extraction nodes with out-degree > Q3 + (Q3 - Q1) * 4.
-                var sortedByOutDegree = Object.keys(nodeToOutDegree).sort(function (node0, node1) {
-                    return nodeToOutDegree[node0] - nodeToOutDegree[node1];
-                });
-                var outDegreeQ3 = nodeToOutDegree[sortedByOutDegree[q3Index]];
-                var outDegreeQ1 = nodeToOutDegree[sortedByOutDegree[q1Index]];
-                // The upper bound for extracting out-degree nodes is higher than that for
-                // extracting in-degree ones (Note the "* 4") because, in practice, some
-                // graphs look worse with a smaller out-degree bound. For instance, a smaller
-                // out-degree bound removes the convolution nodes from cifar 10 train's graph.
-                var outDegreeUpperBound = outDegreeQ3 + (outDegreeQ3 - outDegreeQ1) * 4;
-                // Only extract if the upper bound is high enough.
-                outDegreeUpperBound = Math.max(outDegreeUpperBound, minUpperBound);
-                for (var i = validNodeCount - 1; nodeToOutDegree[sortedByOutDegree[i]] > outDegreeUpperBound; i--) {
-                    var node = graph.node(sortedByOutDegree[i]);
-                    if (!node || node.isInExtract) {
-                        // This node has already been extracted due to high in-degree. It might
-                        // have been removed from the graph in general (during in-degree
-                        // extraction) due to a lack of neighbors. Do not extract this node twice.
-                        continue;
-                    }
-                    // Extract a high out-degree node that has not already been extracted.
-                    makeOutExtract(renderNode, sortedByOutDegree[i]);
-                }
-            }
-            /** Remove control edges from nodes that have too many control edges */
-            function removeControlEdges(renderNode) {
-                var graph = renderNode.coreGraph;
-                // Collect control edges into a map by node name.
-                var map = {};
-                _.each(graph.edges(), function (e) {
-                    if (!graph.edge(e).metaedge.numRegularEdges) {
-                        (map[e.v] = map[e.v] || []).push(e);
-                        (map[e.w] = map[e.w] || []).push(e);
-                    }
-                });
-                // For each node with too many control edges, turn them into annotations.
-                _.each(map, function (edges, nodeName) {
-                    if (edges.length > PARAMS.maxControlDegree) {
-                        _.each(edges, function (e) { return createShortcut(graph, e.v, e.w); });
-                    }
-                });
-            }
-            /**
-             * Given an integer, picks a hue that is far apart from other colors.
-             * The formula for picking color that avoid collision is:
-             *     hue = (color range * golden ratio * index) % color range
-             */
-            function mapIndexToHue(id) {
-                var GOLDEN_RATIO = 1.61803398875;
-                // Hue of 0 is reserved for the gray nodes.
-                var MIN_HUE = 1;
-                var MAX_HUE = 359;
-                var COLOR_RANGE = MAX_HUE - MIN_HUE;
-                return MIN_HUE + ((COLOR_RANGE * GOLDEN_RATIO * id) % COLOR_RANGE);
-            }
-            render.mapIndexToHue = mapIndexToHue;
-            ;
-            /**
-             * Remove edges and add to annotation instead.
-             *
-             * For root node, consider predefined types for source and sink.
-             * We do not extract predefined type from non-root so that Variables and the
-             * sgd node (op type = 'NoOp') do not get extract from inside own group.
-             *
-             * The order of extraction is important here as swapping the order can totally
-             * screw up the graph layout.
-             *
-             * @param {Render.Node} renderNode Node to manipulate.
-             */
-            function extractHighDegrees(renderNode) {
-                extractSpecifiedNodes(renderNode);
-                if (PARAMS.outExtractTypes) {
-                    extractPredefinedSink(renderNode);
-                }
-                // This has to come before extract high in-degree to protect the core part
-                // that takes many variables.
-                if (PARAMS.inExtractTypes) {
-                    extractPredefinedSource(renderNode);
-                }
-                extractHighInOrOutDegree(renderNode);
-                if (PARAMS.maxControlDegree) {
-                    removeControlEdges(renderNode);
-                }
-                // Extract isolated nodes, which can be
-                // (1) source-like and sink-like nodes that are not originally isolated but
-                //     become isolated after further removal.
-                // (2) isolated nodes with annotations on one-side.  These might be either
-                //     - nodes that originally have high out-degree but because we remove
-                //       high in-degree nodes first, they no longer have high in-degree when
-                //       we check.  (Detecting all high-degree before removing also leads to
-                //       another problem.)
-                //     - nodes that do not have high degree, but their neighbors are all
-                //       extracted, so it might make sense to extract them too.
-                var graph = renderNode.coreGraph;
-                _.each(graph.nodes(), function (n) {
-                    var child = graph.node(n);
-                    var degree = graph.neighbors(n).length;
-                    if (child.node.include !== graph_1.InclusionType.UNSPECIFIED) {
-                        return;
-                    }
-                    if (degree === 0) {
-                        var hasOutAnnotations = child.outAnnotations.list.length > 0;
-                        var hasInAnnotations = child.inAnnotations.list.length > 0;
-                        if (child.isInExtract) {
-                            // This case only happens if detachAllEdgesForHighDegree is false.
-                            // (Otherwise all source-like nodes are all isolated already.)
-                            renderNode.isolatedInExtract.push(child);
-                            child.node.include = graph_1.InclusionType.EXCLUDE;
-                            graph.removeNode(n);
-                        }
-                        else if (child.isOutExtract) {
-                            // This case only happens if detachAllEdgesForHighDegree is false.
-                            // // (Otherwise all sink-like nodes are all isolated already.)
-                            renderNode.isolatedOutExtract.push(child);
-                            child.node.include = graph_1.InclusionType.EXCLUDE;
-                            graph.removeNode(n);
-                        }
-                        else if (PARAMS.extractIsolatedNodesWithAnnotationsOnOneSide) {
-                            if (hasOutAnnotations && !hasInAnnotations) {
-                                child.isInExtract = true; // for ones with high out-annotations
-                                renderNode.isolatedInExtract.push(child);
-                                child.node.include = graph_1.InclusionType.EXCLUDE;
-                                graph.removeNode(n);
-                            }
-                            else if (hasInAnnotations && !hasOutAnnotations) {
-                                child.isOutExtract = true; // for ones with high in-annotations
-                                renderNode.isolatedOutExtract.push(child);
-                                child.node.include = graph_1.InclusionType.EXCLUDE;
-                                graph.removeNode(n);
-                            }
-                            else {
-                                // if a low degree node has both in- & out- annotations, do nothing
-                                // because it is unclear which side it should go to.
-                            }
-                        }
-                    }
-                });
-            }
-        })(render = graph_1.render || (graph_1.render = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module tf.graph.render
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph) {
-        var scene;
-        (function (scene) {
-            var annotation;
-            (function (annotation_1) {
-                /**
-                 * Populate a given annotation container group
-                 *
-                 *     <g class='{in|out}-annotations'></g>
-                 *
-                 * with annotation group of the following structure:
-                 *
-                 * <g class='annotation'>
-                 *   <g class='annotation-node'>
-                 *   \x3c!--
-                 *   Content here determined by Scene.node.buildGroup.
-                 *   --\x3e
-                 *   </g>
-                 * </g>
-                 *
-                 * @param container selection of the container.
-                 * @param annotationData node.{in|out}Annotations
-                 * @param d node to build group for.
-                 * @param sceneElement <tf-graph-scene> polymer element.
-                 * @return selection of appended objects
-                 */
-                function buildGroup(container, annotationData, d, sceneElement) {
-                    // Select all children and join with data.
-                    var annotationGroups = container
-                        .selectAll(function () {
-                        // using d3's selector function
-                        // See https://github.com/mbostock/d3/releases/tag/v2.0.0
-                        // (It's not listed in the d3 wiki.)
-                        return this.childNodes;
-                    })
-                        .data(annotationData.list, function (d) { return d.node.name; });
-                    annotationGroups.enter()
-                        .append('g')
-                        .attr('data-name', function (a) { return a.node.name; })
-                        .each(function (a) {
-                        var aGroup = d3.select(this);
-                        // Add annotation to the index in the scene
-                        sceneElement.addAnnotationGroup(a, d, aGroup);
-                        // Append annotation edge
-                        var edgeType = scene.Class.Annotation.EDGE;
-                        var metaedge = a.renderMetaedgeInfo && a.renderMetaedgeInfo.metaedge;
-                        if (metaedge && !metaedge.numRegularEdges) {
-                            edgeType += ' ' + scene.Class.Annotation.CONTROL_EDGE;
-                        }
-                        // If any edges are reference edges, add the reference edge class.
-                        if (metaedge && metaedge.numRefEdges) {
-                            edgeType += ' ' + scene.Class.Edge.REF_LINE;
-                        }
-                        scene.edge.appendEdge(aGroup, a, sceneElement, edgeType);
-                        if (a.annotationType !== graph.render.AnnotationType.ELLIPSIS) {
-                            addAnnotationLabelFromNode(aGroup, a);
-                            buildShape(aGroup, a);
-                        }
-                        else {
-                            addAnnotationLabel(aGroup, a.node.name, a, scene.Class.Annotation.ELLIPSIS);
-                        }
-                    });
-                    annotationGroups
-                        .attr('class', function (a) {
-                        return scene.Class.Annotation.GROUP + ' ' +
-                            annotationToClassName(a.annotationType) + ' ' +
-                            scene.node.nodeClass(a);
-                    })
-                        .each(function (a) {
-                        var aGroup = d3.select(this);
-                        update(aGroup, d, a, sceneElement);
-                        if (a.annotationType !== graph.render.AnnotationType.ELLIPSIS) {
-                            addInteraction(aGroup, d, a, sceneElement);
-                        }
-                    });
-                    annotationGroups.exit()
-                        .each(function (a) {
-                        var aGroup = d3.select(this);
-                        // Remove annotation from the index in the scene
-                        sceneElement.removeAnnotationGroup(a, d, aGroup);
-                    })
-                        .remove();
-                    return annotationGroups;
-                }
-                annotation_1.buildGroup = buildGroup;
-                ;
-                /**
-                 * Maps an annotation enum to a class name used in css rules.
-                 */
-                function annotationToClassName(annotationType) {
-                    return (graph.render.AnnotationType[annotationType] || '').toLowerCase() || null;
-                }
-                function buildShape(aGroup, a) {
-                    if (a.annotationType === graph.render.AnnotationType.SUMMARY) {
-                        var summary = scene.selectOrCreateChild(aGroup, 'use');
-                        summary.attr({
-                            'class': 'summary',
-                            'xlink:href': '#summary-icon',
-                            'cursor': 'pointer'
-                        });
-                    }
-                    else {
-                        var shape = scene.node.buildShape(aGroup, a, scene.Class.Annotation.NODE);
-                        // add title tag to get native tooltips
-                        scene.selectOrCreateChild(shape, 'title').text(a.node.name);
-                    }
-                }
-                function addAnnotationLabelFromNode(aGroup, a) {
-                    var namePath = a.node.name.split('/');
-                    var text = namePath[namePath.length - 1];
-                    return addAnnotationLabel(aGroup, text, a, null);
-                }
-                function addAnnotationLabel(aGroup, label, a, additionalClassNames) {
-                    var classNames = scene.Class.Annotation.LABEL;
-                    if (additionalClassNames) {
-                        classNames += ' ' + additionalClassNames;
-                    }
-                    var txtElement = aGroup.append('text')
-                        .attr('class', classNames)
-                        .attr('dy', '.35em')
-                        .attr('text-anchor', a.isIn ? 'end' : 'start')
-                        .text(label);
-                    return tf.graph.scene.node.enforceLabelWidth(txtElement, -1);
-                }
-                function addInteraction(selection, d, annotation, sceneElement) {
-                    selection
-                        .on('mouseover', function (a) {
-                        sceneElement.fire('annotation-highlight', { name: a.node.name, hostName: d.node.name });
-                    })
-                        .on('mouseout', function (a) {
-                        sceneElement.fire('annotation-unhighlight', { name: a.node.name, hostName: d.node.name });
-                    })
-                        .on('click', function (a) {
-                        // Stop this event's propagation so that it isn't also considered a
-                        // graph-select.
-                        d3.event.stopPropagation();
-                        sceneElement.fire('annotation-select', { name: a.node.name, hostName: d.node.name });
-                    });
-                    if (annotation.annotationType !== graph.render.AnnotationType.SUMMARY &&
-                        annotation.annotationType !== graph.render.AnnotationType.CONSTANT) {
-                        selection.on('contextmenu', scene.contextmenu.getMenu(scene.node.getContextMenu(annotation.node, sceneElement)));
-                    }
-                }
-                ;
-                /**
-                 * Adjust annotation's position.
-                 *
-                 * @param aGroup selection of a 'g.annotation' element.
-                 * @param d Host node data.
-                 * @param a annotation node data.
-                 * @param sceneElement <tf-graph-scene> polymer element.
-                 */
-                function update(aGroup, d, a, sceneElement) {
-                    var cx = graph.layout.computeCXPositionOfNodeShape(d);
-                    // Annotations that point to embedded nodes (constants,summary)
-                    // don't have a render information attached so we don't stylize these.
-                    // Also we don't stylize ellipsis annotations (the string '... and X more').
-                    if (a.renderNodeInfo &&
-                        a.annotationType !== graph.render.AnnotationType.ELLIPSIS) {
-                        scene.node.stylize(aGroup, a.renderNodeInfo, sceneElement, scene.Class.Annotation.NODE);
-                    }
-                    if (a.annotationType === graph.render.AnnotationType.SUMMARY) {
-                        // Update the width of the annotation to give space for the image.
-                        a.width += 10;
-                    }
-                    // label position
-                    aGroup.select('text.' + scene.Class.Annotation.LABEL).transition().attr({
-                        x: cx + a.dx + (a.isIn ? -1 : 1) * (a.width / 2 + a.labelOffset),
-                        y: d.y + a.dy
-                    });
-                    // Some annotations (such as summary) are represented using a 12x12 image tag.
-                    // Purposely omitted units (e.g. pixels) since the images are vector graphics.
-                    // If there is an image, we adjust the location of the image to be vertically
-                    // centered with the node and horizontally centered between the arrow and the
-                    // text label.
-                    aGroup.select('use.summary').transition().attr({
-                        x: cx + a.dx - 3,
-                        y: d.y + a.dy - 6
-                    });
-                    // Node position (only one of the shape selection will be non-empty.)
-                    scene.positionEllipse(aGroup.select('.' + scene.Class.Annotation.NODE + ' ellipse'), cx + a.dx, d.y + a.dy, a.width, a.height);
-                    scene.positionRect(aGroup.select('.' + scene.Class.Annotation.NODE + ' rect'), cx + a.dx, d.y + a.dy, a.width, a.height);
-                    scene.positionRect(aGroup.select('.' + scene.Class.Annotation.NODE + ' use'), cx + a.dx, d.y + a.dy, a.width, a.height);
-                    // Edge position
-                    aGroup.select('path.' + scene.Class.Annotation.EDGE).transition().attr('d', function (a) {
-                        // map relative position to absolute position
-                        var points = a.points.map(function (p) { return { x: p.dx + cx, y: p.dy + d.y }; });
-                        return scene.edge.interpolate(points);
-                    });
-                }
-                ;
-            })(annotation = scene.annotation || (scene.annotation = {}));
-        })(scene = graph.scene || (graph.scene = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph) {
-        var scene;
-        (function (scene) {
-            var contextmenu;
-            (function (contextmenu) {
-                /**
-                 * Returns the event listener, which can be used as an argument for the d3
-                 * selection.on function. Renders the context menu that is to be displayed
-                 * in response to the event.
-                 */
-                function getMenu(menu) {
-                    var menuSelection = d3.select('.context-menu');
-                    // Close the menu when anything else is clicked.
-                    d3.select('body').on('click.context', function () { menuSelection.style('display', 'none'); });
-                    // Function called to populate the context menu.
-                    return function (data, index) {
-                        var _this = this;
-                        // Position and display the menu.
-                        var event = d3.event;
-                        menuSelection.style({
-                            'display': 'block',
-                            'left': (event.layerX + 1) + 'px',
-                            'top': (event.layerY + 1) + 'px'
-                        });
-                        // Stop the event from propagating further.
-                        event.preventDefault();
-                        event.stopPropagation();
-                        // Add provided items to the context menu.
-                        menuSelection.html('');
-                        var list = menuSelection.append('ul');
-                        list.selectAll('li')
-                            .data(menu)
-                            .enter()
-                            .append('li')
-                            .html(function (d) { return d.title(data); })
-                            .on('click', function (d, i) {
-                            d.action(_this, data, index);
-                            menuSelection.style('display', 'none');
-                        });
-                    };
-                }
-                contextmenu.getMenu = getMenu;
-                ;
-            })(contextmenu = scene.contextmenu || (scene.contextmenu = {}));
-        })(scene = graph.scene || (graph.scene = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph_1) {
-        var scene;
-        (function (scene) {
-            var edge;
-            (function (edge) {
-                /** Delimiter between dimensions when showing sizes of tensors. */
-                var TENSOR_SHAPE_DELIM = '×';
-                /** The minimum stroke width of an edge. */
-                edge.MIN_EDGE_WIDTH = 0.75;
-                /** The maximum stroke width of an edge. */
-                edge.MAX_EDGE_WIDTH = 12;
-                /** The exponent used in the power scale for edge thickness. */
-                var EDGE_WIDTH_SCALE_EXPONENT = 0.3;
-                /** The domain (min and max value) for the edge width. */
-                var DOMAIN_EDGE_WIDTH_SCALE = [1, 5E6];
-                edge.EDGE_WIDTH_SCALE = d3.scale.pow()
-                    .exponent(EDGE_WIDTH_SCALE_EXPONENT)
-                    .domain(DOMAIN_EDGE_WIDTH_SCALE)
-                    .range([edge.MIN_EDGE_WIDTH, edge.MAX_EDGE_WIDTH])
-                    .clamp(true);
-                var arrowheadMap = d3.scale.quantize().domain([edge.MIN_EDGE_WIDTH, edge.MAX_EDGE_WIDTH]).range([
-                    'small', 'medium', 'large', 'xlarge'
-                ]);
-                /** Minimum stroke width to put edge labels in the middle of edges */
-                var CENTER_EDGE_LABEL_MIN_STROKE_WIDTH = 2.5;
-                function getEdgeKey(edgeObj) {
-                    return edgeObj.v + graph_1.EDGE_KEY_DELIM + edgeObj.w;
-                }
-                edge.getEdgeKey = getEdgeKey;
-                /**
-                 * Select or Create a 'g.edges' group to a given sceneGroup
-                 * and builds a number of 'g.edge' groups inside the group.
-                 *
-                 * Structure Pattern:
-                 *
-                 * <g class='edges'>
-                 *   <g class='edge'>
-                 *     <path class='edgeline'/>
-                 *   </g>
-                 *   ...
-                 * </g>
-                 *
-                 *
-                 * @param sceneGroup container
-                 * @param graph
-                 * @param sceneElement <tf-graph-scene> polymer element.
-                 * @return selection of the created nodeGroups
-                 */
-                function buildGroup(sceneGroup, graph, sceneElement) {
-                    var edges = [];
-                    edges = _.reduce(graph.edges(), function (edges, edgeObj) {
-                        var edgeLabel = graph.edge(edgeObj);
-                        edges.push({
-                            v: edgeObj.v,
-                            w: edgeObj.w,
-                            label: edgeLabel
-                        });
-                        return edges;
-                    }, edges);
-                    var container = scene.selectOrCreateChild(sceneGroup, 'g', scene.Class.Edge.CONTAINER);
-                    // Select all children and join with data.
-                    // (Note that all children of g.edges are g.edge)
-                    var edgeGroups = container.selectAll(function () {
-                        // using d3's selector function
-                        // See https://github.com/mbostock/d3/releases/tag/v2.0.0
-                        // (It's not listed in the d3 wiki.)
-                        return this.childNodes;
-                    }).data(edges, getEdgeKey);
-                    // Make edges a group to support rendering multiple lines for metaedge
-                    edgeGroups.enter()
-                        .append('g')
-                        .attr('class', scene.Class.Edge.GROUP)
-                        .attr('data-edge', getEdgeKey)
-                        .each(function (d) {
-                        var edgeGroup = d3.select(this);
-                        d.label.edgeGroup = edgeGroup;
-                        // index node group for quick highlighting
-                        sceneElement._edgeGroupIndex[getEdgeKey(d)] = edgeGroup;
-                        // Add line during enter because we're assuming that type of line
-                        // normally does not change.
-                        appendEdge(edgeGroup, d, sceneElement);
-                    });
-                    edgeGroups.each(position);
-                    edgeGroups.each(function (d) {
-                        stylize(d3.select(this), d, sceneElement);
-                    });
-                    edgeGroups.exit()
-                        .each(function (d) {
-                        delete sceneElement._edgeGroupIndex[getEdgeKey(d)];
-                    })
-                        .remove();
-                    return edgeGroups;
-                }
-                edge.buildGroup = buildGroup;
-                ;
-                /**
-                 * Returns the label for the given base edge.
-                 * The label is the shape of the underlying tensor.
-                 */
-                function getLabelForBaseEdge(baseEdge, renderInfo) {
-                    var node = renderInfo.getNodeByName(baseEdge.v);
-                    if (node.outputShapes == null || node.outputShapes.length === 0) {
-                        return null;
-                    }
-                    var shape = node.outputShapes[baseEdge.outputTensorIndex];
-                    if (shape == null) {
-                        return null;
-                    }
-                    if (shape.length === 0) {
-                        return 'scalar';
-                    }
-                    return shape.map(function (size) { return size === -1 ? '?' : size; })
-                        .join(TENSOR_SHAPE_DELIM);
-                }
-                edge.getLabelForBaseEdge = getLabelForBaseEdge;
-                /**
-                 * Creates the label for the given metaedge. If the metaedge consists
-                 * of only 1 tensor, and it's shape is known, the label will contain that
-                 * shape. Otherwise, the label will say the number of tensors in the metaedge.
-                 */
-                function getLabelForEdge(metaedge, renderInfo) {
-                    var isMultiEdge = metaedge.baseEdgeList.length > 1;
-                    return isMultiEdge ?
-                        metaedge.baseEdgeList.length + ' tensors' :
-                        getLabelForBaseEdge(metaedge.baseEdgeList[0], renderInfo);
-                }
-                edge.getLabelForEdge = getLabelForEdge;
-                /**
-                 * Shortens the path enought such that the tip of the start/end marker will
-                 * point to the start/end of the path. The marker can be of arbitrary size.
-                 *
-                 * @param points Array of path control points.
-                 * @param marker D3 selection of the <marker> svg element.
-                 * @param isStart Is the marker a `start-marker`. If false, the marker is
-                 *     an `end-marker`.
-                 * @return The new array of control points.
-                 */
-                function adjustPathPointsForMarker(points, marker, isStart) {
-                    var lineFunc = d3.svg.line()
-                        .x(function (d) { return d.x; })
-                        .y(function (d) { return d.y; });
-                    var path = d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'path'))
-                        .attr('d', lineFunc(points));
-                    var markerWidth = +marker.attr('markerWidth');
-                    var viewBox = marker.attr('viewBox').split(' ').map(Number);
-                    var viewBoxWidth = viewBox[2] - viewBox[0];
-                    var refX = +marker.attr('refX');
-                    var pathNode = path.node();
-                    if (isStart) {
-                        var fractionStickingOut = refX / viewBoxWidth;
-                        var length_1 = markerWidth * fractionStickingOut;
-                        var point = pathNode.getPointAtLength(length_1);
-                        // Figure out how many segments of the path we need to remove in order
-                        // to shorten the path.
-                        var segIndex = pathNode.getPathSegAtLength(length_1);
-                        // Update the very first segment.
-                        points[segIndex - 1] = { x: point.x, y: point.y };
-                        // Ignore every point before segIndex - 1.
-                        return points.slice(segIndex - 1);
-                    }
-                    else {
-                        var fractionStickingOut = 1 - refX / viewBoxWidth;
-                        var length_2 = pathNode.getTotalLength() - markerWidth * fractionStickingOut;
-                        var point = pathNode.getPointAtLength(length_2);
-                        // Figure out how many segments of the path we need to remove in order
-                        // to shorten the path.
-                        var segIndex = pathNode.getPathSegAtLength(length_2);
-                        // Update the very last segment.
-                        points[segIndex] = { x: point.x, y: point.y };
-                        // Ignore every point after segIndex.
-                        return points.slice(0, segIndex + 1);
-                    }
-                }
-                /**
-                 * For a given d3 selection and data object, create a path to represent the
-                 * edge described in d.label.
-                 *
-                 * If d.label is defined, it will be a RenderMetaedgeInfo instance. It
-                 * will sometimes be undefined, for example for some Annotation edges for which
-                 * there is no underlying Metaedge in the hierarchical graph.
-                 */
-                function appendEdge(edgeGroup, d, sceneElement, edgeClass) {
-                    var size = 1;
-                    if (d.label != null && d.label.metaedge != null) {
-                        // There is an underlying Metaedge.
-                        size = d.label.metaedge.totalSize;
-                    }
-                    edgeClass = edgeClass || scene.Class.Edge.LINE; // set default type
-                    if (d.label && d.label.structural) {
-                        edgeClass += ' ' + scene.Class.Edge.STRUCTURAL;
-                    }
-                    // Give the path a unique id, which will be used to link
-                    // the textPath (edge label) to this path.
-                    var pathId = 'path_' + getEdgeKey(d);
-                    var strokeWidth = sceneElement.renderHierarchy.edgeWidthScale(size);
-                    var path = edgeGroup.append('path')
-                        .attr({
-                        'id': pathId,
-                        'class': edgeClass,
-                    })
-                        .style({ 'stroke-width': strokeWidth + 'px' });
-                    // Check if there is a reference edge and add an arrowhead of the right size.
-                    if (d.label && d.label.metaedge && d.label.metaedge.numRefEdges) {
-                        var markerId = "ref-arrowhead-" + arrowheadMap(strokeWidth);
-                        path.style('marker-start', "url(#" + markerId + ")");
-                        d.label.startMarkerId = markerId;
-                    }
-                    if (d.label == null || d.label.metaedge == null) {
-                        // There is no associated metaedge, thus no text.
-                        // This happens for annotation edges.
-                        return;
-                    }
-                    var labelForEdge = getLabelForEdge(d.label.metaedge, sceneElement.renderHierarchy);
-                    if (labelForEdge == null) {
-                        // We have no information to show on this edge.
-                        return;
-                    }
-                    // Put edge label in the middle of edge only if the edge is thick enough.
-                    var baseline = strokeWidth > CENTER_EDGE_LABEL_MIN_STROKE_WIDTH ?
-                        'central' :
-                        'text-after-edge';
-                    edgeGroup.append('text')
-                        .append('textPath')
-                        .attr({
-                        'xlink:href': '#' + pathId,
-                        'startOffset': '50%',
-                        'text-anchor': 'middle',
-                        'dominant-baseline': 'central'
-                    })
-                        .text(labelForEdge);
-                }
-                edge.appendEdge = appendEdge;
-                ;
-                edge.interpolate = d3.svg.line()
-                    .interpolate('basis')
-                    .x(function (d) { return d.x; })
-                    .y(function (d) { return d.y; });
-                /**
-                 * Returns a tween interpolator for the endpoint of an edge path.
-                 */
-                function getEdgePathInterpolator(d, i, a) {
-                    var renderMetaedgeInfo = d.label;
-                    var adjoiningMetaedge = renderMetaedgeInfo.adjoiningMetaedge;
-                    var points = renderMetaedgeInfo.points;
-                    // Adjust the path so that start/end markers point to the end
-                    // of the path.
-                    if (d.label.startMarkerId) {
-                        points = adjustPathPointsForMarker(points, d3.select('#' + d.label.startMarkerId), true);
-                    }
-                    if (d.label.endMarkerId) {
-                        points = adjustPathPointsForMarker(points, d3.select('#' + d.label.endMarkerId), false);
-                    }
-                    if (!adjoiningMetaedge) {
-                        return d3.interpolate(a, edge.interpolate(points));
-                    }
-                    var renderPath = this;
-                    // Get the adjoining path that matches the adjoining metaedge.
-                    var adjoiningPath = (adjoiningMetaedge.edgeGroup.node()
-                        .firstChild);
-                    // Find the desired SVGPoint along the adjoining path, then convert those
-                    // coordinates into the space of the renderPath using its Current
-                    // Transformation Matrix (CTM).
-                    var inbound = renderMetaedgeInfo.metaedge.inbound;
-                    return function (t) {
-                        var adjoiningPoint = adjoiningPath
-                            .getPointAtLength(inbound ? adjoiningPath.getTotalLength() : 0)
-                            .matrixTransform(adjoiningPath.getCTM())
-                            .matrixTransform(renderPath.getCTM().inverse());
-                        // Update the relevant point in the renderMetaedgeInfo's points list, then
-                        // re-interpolate the path.
-                        var index = inbound ? 0 : points.length - 1;
-                        points[index].x = adjoiningPoint.x;
-                        points[index].y = adjoiningPoint.y;
-                        var dPath = edge.interpolate(points);
-                        return dPath;
-                    };
-                }
-                function position(d) {
-                    d3.select(this)
-                        .select('path.' + scene.Class.Edge.LINE)
-                        .transition()
-                        .attrTween('d', getEdgePathInterpolator);
-                }
-                ;
-                /**
-                 * For a given d3 selection and data object, mark the edge as a control
-                 * dependency if it contains only control edges.
-                 *
-                 * d's label property will be a RenderMetaedgeInfo object.
-                 */
-                function stylize(edgeGroup, d, stylize) {
-                    edgeGroup.classed('faded', d.label.isFadedOut);
-                    var metaedge = d.label.metaedge;
-                    edgeGroup.select('path.' + scene.Class.Edge.LINE)
-                        .classed('control-dep', metaedge && !metaedge.numRegularEdges);
-                }
-                ;
-            })(edge = scene.edge || (scene.edge = {}));
-        })(scene = graph_1.scene || (graph_1.scene = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph) {
-        var scene;
-        (function (scene) {
-            var node;
-            (function (node_1) {
-                /**
-                 * Select or Create a 'g.nodes' group to a given sceneGroup
-                 * and builds a number of 'g.node' groups inside the group.
-                 *
-                 * Structure Pattern:
-                 *
-                 * <g class='nodes'>
-                 *   <g class='node'>
-                 *     <g class='in-annotations'>
-                 *       ...
-                 *     </g>
-                 *     <g class='out-annotations'>
-                 *       ...
-                 *     </g>
-                 *     <g class='nodeshape'>
-                 *      \x3c!--
-                 *      Content of the node shape should be for the node itself. For example a
-                 *      Metanode would have a <rect> with rounded edges, an op would have an
-                 *      <ellipse>. More complex nodes like series may contain multiple
-                 *      elements which are conditionally visible based on whether the node is
-                 *      expanded.
-                 *      --\x3e
-                 *     </g>
-                 *     <text class='label'>node name</text>
-                 *     <g class='subscene'>
-                 *       \x3c!--
-                 *       Content of  the subscene (only for metanode and series node).
-                 *
-                 *       Subscene is a svg group that contains content of the
-                 *       metanode's metagraph that is recursively generated by Scene.build().
-                 *
-                 *       When the graph is expanded multiple times, a subscene can contain
-                 *       nested subscenes inside.
-                 *       --\x3e
-                 *     </g>
-                 *   </g>
-                 *   ...
-                 * </g>
-                 *
-                 *
-                 * @param sceneGroup selection of the container
-                 * @param nodeData array of render node information to map
-                 * @param sceneElement <tf-graph-scene> polymer element
-                 * @return selection of the created nodeGroups
-                 */
-                function buildGroup(sceneGroup, nodeData, sceneElement) {
-                    var container = scene.selectOrCreateChild(sceneGroup, 'g', scene.Class.Node.CONTAINER);
-                    // Select all children and join with data.
-                    // (Note that all children of g.nodes are g.node)
-                    var nodeGroups = container
-                        .selectAll(function () {
-                        // using d3's selector function
-                        // See https://github.com/mbostock/d3/releases/tag/v2.0.0
-                        // (It's not listed in the d3 wiki.)
-                        return this.childNodes; // this here refers to container.node()
-                    })
-                        .data(nodeData, function (d) {
-                        // make sure that we don't have to swap shape type
-                        return d.node.name + ':' + d.node.type;
-                    });
-                    // ENTER
-                    nodeGroups.enter()
-                        .append('g')
-                        .attr('data-name', function (d) { return d.node.name; })
-                        .each(function (d) {
-                        var nodeGroup = d3.select(this);
-                        // index node group for quick stylizing
-                        sceneElement.addNodeGroup(d.node.name, nodeGroup);
-                    });
-                    // UPDATE
-                    nodeGroups
-                        .attr('class', function (d) { return scene.Class.Node.GROUP + ' ' + nodeClass(d); })
-                        .each(function (d) {
-                        var nodeGroup = d3.select(this);
-                        // Add g.in-annotations (always add -- to keep layer order
-                        // consistent.)
-                        var inAnnotationBox = scene.selectOrCreateChild(nodeGroup, 'g', scene.Class.Annotation.INBOX);
-                        scene.annotation.buildGroup(inAnnotationBox, d.inAnnotations, d, sceneElement);
-                        // Add g.out-annotations  (always add -- to keep layer order
-                        // consistent.)
-                        var outAnnotationBox = scene.selectOrCreateChild(nodeGroup, 'g', scene.Class.Annotation.OUTBOX);
-                        scene.annotation.buildGroup(outAnnotationBox, d.outAnnotations, d, sceneElement);
-                        // Build .shape first (background of the node).
-                        var shape = buildShape(nodeGroup, d, scene.Class.Node.SHAPE);
-                        if (d.node.isGroupNode) {
-                            addButton(shape, d, sceneElement);
-                        }
-                        addInteraction(shape, d, sceneElement);
-                        // Build subscene on the top.
-                        subsceneBuild(nodeGroup, d, sceneElement);
-                        // Build label last. Should be on top of everything else.
-                        var label = labelBuild(nodeGroup, d, sceneElement);
-                        // Do not add interaction to metanode labels as they live inside the
-                        // metanode shape which already has the same interactions.
-                        addInteraction(label, d, sceneElement, d.node.type === graph.NodeType.META);
-                        stylize(nodeGroup, d, sceneElement);
-                        position(nodeGroup, d);
-                    });
-                    // EXIT
-                    nodeGroups.exit()
-                        .each(function (d) {
-                        // remove all indices on remove
-                        sceneElement.removeNodeGroup(d.node.name);
-                        var nodeGroup = d3.select(this);
-                        if (d.inAnnotations.list.length > 0) {
-                            nodeGroup.select('.' + scene.Class.Annotation.INBOX)
-                                .selectAll('.' + scene.Class.Annotation.GROUP)
-                                .each(function (a) { sceneElement.removeAnnotationGroup(a, d); });
-                        }
-                        if (d.outAnnotations.list.length > 0) {
-                            nodeGroup.select('.' + scene.Class.Annotation.OUTBOX)
-                                .selectAll('.' + scene.Class.Annotation.GROUP)
-                                .each(function (a) { sceneElement.removeAnnotationGroup(a, d); });
-                        }
-                    })
-                        .remove();
-                    return nodeGroups;
-                }
-                node_1.buildGroup = buildGroup;
-                ;
-                /**
-                 * Update or remove the subscene of a render group node depending on whether it
-                 * is a expanded. If the node is not a group node, this method has no effect.
-                 *
-                 * @param nodeGroup selection of the container
-                 * @param renderNodeInfo the render information for the node.
-                 * @param sceneElement <tf-graph-scene> polymer element.
-                 * @return Selection of the subscene group, or null if node group does not have
-                 *        a subscene. Op nodes, bridge nodes and unexpanded group nodes will
-                 *        not have a subscene.
-                 */
-                function subsceneBuild(nodeGroup, renderNodeInfo, sceneElement) {
-                    if (renderNodeInfo.node.isGroupNode) {
-                        if (renderNodeInfo.expanded) {
-                            // Recursively build the subscene.
-                            return scene.buildGroup(nodeGroup, renderNodeInfo, sceneElement, scene.Class.Subscene.GROUP);
-                        }
-                        // Clean out existing subscene if the node is not expanded.
-                        scene.selectChild(nodeGroup, 'g', scene.Class.Subscene.GROUP).remove();
-                    }
-                    return null;
-                }
-                ;
-                /**
-                 * Translate the subscene of the given node group
-                 */
-                function subscenePosition(nodeGroup, d) {
-                    var x0 = d.x - d.width / 2.0 + d.paddingLeft;
-                    var y0 = d.y - d.height / 2.0 + d.paddingTop;
-                    var subscene = scene.selectChild(nodeGroup, 'g', scene.Class.Subscene.GROUP);
-                    scene.translate(subscene, x0, y0);
-                }
-                ;
-                /**
-                 * Add an expand/collapse button to a group node
-                 *
-                 * @param selection The group node selection.
-                 * @param d Info about the node being rendered.
-                 * @param sceneElement <tf-graph-scene> polymer element.
-                 */
-                function addButton(selection, d, sceneElement) {
-                    var group = scene.selectOrCreateChild(selection, 'g', scene.Class.Node.BUTTON_CONTAINER);
-                    scene.selectOrCreateChild(group, 'circle', scene.Class.Node.BUTTON_CIRCLE);
-                    scene.selectOrCreateChild(group, 'path', scene.Class.Node.EXPAND_BUTTON)
-                        .attr('d', 'M0,-2.2 V2.2 M-2.2,0 H2.2');
-                    scene.selectOrCreateChild(group, 'path', scene.Class.Node.COLLAPSE_BUTTON)
-                        .attr('d', 'M-2.2,0 H2.2');
-                    group.on('click', function (d) {
-                        // Stop this event's propagation so that it isn't also considered a
-                        // node-select.
-                        d3.event.stopPropagation();
-                        sceneElement.fire('node-toggle-expand', { name: d.node.name });
-                    });
-                    scene.positionButton(group, d);
-                }
-                ;
-                /**
-                 * Fire node-* events when the selection is interacted.
-                 *
-                 * @param disableInteraction When true, have the provided selection
-                 * ignore all pointer events. Used for text labels inside of metanodes, which
-                 * don't need interaction as their surrounding shape has interaction, and if
-                 * given interaction would cause conflicts with the expand/collapse button.
-                 */
-                function addInteraction(selection, d, sceneElement, disableInteraction) {
-                    if (disableInteraction) {
-                        selection.attr('pointer-events', 'none');
-                        return;
-                    }
-                    var contextMenuFunction = scene.contextmenu.getMenu(getContextMenu(d.node, sceneElement));
-                    selection
-                        .on('dblclick', function (d) {
-                        sceneElement.fire('node-toggle-expand', { name: d.node.name });
-                    })
-                        .on('mouseover', function (d) {
-                        // don't send mouseover over expanded group,
-                        // otherwise it is causing too much glitches
-                        if (sceneElement.isNodeExpanded(d)) {
-                            return;
-                        }
-                        sceneElement.fire('node-highlight', { name: d.node.name });
-                    })
-                        .on('mouseout', function (d) {
-                        // don't send mouseover over expanded group,
-                        // otherwise it is causing too much glitches
-                        if (sceneElement.isNodeExpanded(d)) {
-                            return;
-                        }
-                        sceneElement.fire('node-unhighlight', { name: d.node.name });
-                    })
-                        .on('click', function (d) {
-                        // Stop this event's propagation so that it isn't also considered
-                        // a graph-select.
-                        d3.event.stopPropagation();
-                        sceneElement.fire('node-select', { name: d.node.name });
-                    })
-                        .on('contextmenu', function (d, i) {
-                        sceneElement.fire('node-select', { name: d.node.name });
-                        contextMenuFunction.call(d, i);
-                    });
-                }
-                ;
-                /**
-                 * Returns the d3 context menu specification for the provided node.
-                 */
-                function getContextMenu(node, sceneElement) {
-                    var menu = [{
-                            title: function (d) {
-                                return graph.getIncludeNodeButtonString(node.include);
-                            },
-                            action: function (elm, d, i) {
-                                sceneElement.fire('node-toggle-extract', { name: node.name });
-                            }
-                        }];
-                    if (canBeInSeries(node)) {
-                        menu.push({
-                            title: function (d) { return getGroupSettingLabel(node); },
-                            action: function (elm, d, i) {
-                                sceneElement.fire('node-toggle-seriesgroup', { name: getSeriesName(node) });
-                            }
-                        });
-                    }
-                    return menu;
-                }
-                node_1.getContextMenu = getContextMenu;
-                /** Returns if a node can be part of a grouped series */
-                function canBeInSeries(node) {
-                    return getSeriesName(node) !== null;
-                }
-                node_1.canBeInSeries = canBeInSeries;
-                /**
-                 * Returns the name of the possible grouped series containing this node.
-                 * Returns null if the node cannot be part of a grouped series of nodes.
-                 */
-                function getSeriesName(node) {
-                    if (!node) {
-                        return null;
-                    }
-                    if (node.type === graph.NodeType.SERIES) {
-                        return node.name;
-                    }
-                    if (node.type === graph.NodeType.OP) {
-                        var op = node;
-                        return op.owningSeries;
-                    }
-                    return null;
-                }
-                node_1.getSeriesName = getSeriesName;
-                /**
-                 * Returns the SeriesNode that represents the series that the provided node
-                 * is contained in (or itself if the provided node is itself a SeriesNode).
-                 * Returns null if the node is not rendered as part of a series.
-                 */
-                function getContainingSeries(node) {
-                    var s = null;
-                    if (!node) {
-                        return null;
-                    }
-                    else if (node.type === graph.NodeType.SERIES) {
-                        s = node;
-                    }
-                    else if (node.parentNode && node.parentNode.type === graph.NodeType.SERIES) {
-                        s = node.parentNode;
-                    }
-                    return s;
-                }
-                /**
-                 * Returns the label for a button to toggle the group setting of the provided
-                 * node.
-                 */
-                function getGroupSettingLabel(node) {
-                    return tf.graph.getGroupSeriesNodeButtonString(getContainingSeries(node) !== null ? tf.graph.SeriesGroupingType.GROUP :
-                        tf.graph.SeriesGroupingType.UNGROUP);
-                }
-                node_1.getGroupSettingLabel = getGroupSettingLabel;
-                /**
-                 * Append svg text for label and assign data.
-                 * @param nodeGroup
-                 * @param renderNodeInfo The render node information for the label.
-                 * @param sceneElement <tf-graph-scene> polymer element.
-                 */
-                function labelBuild(nodeGroup, renderNodeInfo, sceneElement) {
-                    var namePath = renderNodeInfo.node.name.split('/');
-                    var text = namePath[namePath.length - 1];
-                    // Truncate long labels for unexpanded Metanodes.
-                    var useFontScale = renderNodeInfo.node.type === graph.NodeType.META &&
-                        !renderNodeInfo.expanded;
-                    var label = scene.selectOrCreateChild(nodeGroup, 'text', scene.Class.Node.LABEL);
-                    // Make sure the label is visually on top among its siblings.
-                    var labelNode = label.node();
-                    labelNode.parentNode.appendChild(labelNode);
-                    label.attr('dy', '.35em').attr('text-anchor', 'middle');
-                    if (useFontScale) {
-                        if (text.length > sceneElement.maxMetanodeLabelLength) {
-                            text = text.substr(0, sceneElement.maxMetanodeLabelLength - 2) + '...';
-                        }
-                        var scale = getLabelFontScale(sceneElement);
-                        label.attr('font-size', scale(text.length) + 'px');
-                    }
-                    var txtElement = label.text(text);
-                    enforceLabelWidth(txtElement, renderNodeInfo.node.type, renderNodeInfo);
-                    return label;
-                }
-                /**
-                 * This function shortens text which would exceed the maximum pixel width of
-                 * a label.
-                 *
-                 * @param txtElementSelection The text element containing the label's text as d3
-                 * selection.
-                 * @param nodeType The type of the node the label belongs to. If the node is
-                 * an annotation, the value is -1. Label widths are defined in
-                 * layout.PARAMS.nodeSize.{meta|op|...}.maxLabelWidth for nodes and
-                 * layout.PARAMS.annotations.labelWidth for annotations.
-                 * @param renderNodeInfo The render information about the node, required to
-                 * determine whether META nodes are collapsed or expanded.
-                 */
-                function enforceLabelWidth(txtElementSelection, nodeType, renderNodeInfo) {
-                    // Get text element itself and its on-screen width.
-                    var txtNode = txtElementSelection.node();
-                    var computedTxtLength = txtNode.getComputedTextLength();
-                    var labelContent = txtNode.textContent;
-                    // Get maximum length from settings.
-                    var maxLength = null;
-                    switch (nodeType) {
-                        case graph.NodeType.META:
-                            if (renderNodeInfo && !renderNodeInfo.expanded) {
-                                // node expanded.
-                                maxLength = graph.layout.PARAMS.nodeSize.meta.maxLabelWidth;
-                            }
-                            break;
-                        case graph.NodeType.OP:
-                            maxLength = graph.layout.PARAMS.nodeSize.op.maxLabelWidth;
-                            break;
-                        case -1:
-                            maxLength = graph.layout.PARAMS.annotations.maxLabelWidth;
-                            break;
-                        default:
-                            break;
-                    }
-                    // Return if no max length provided for node type, or current label length is
-                    // less than or equal to the provided length limit.
-                    if (maxLength === null || computedTxtLength <= maxLength) {
-                        return;
-                    }
-                    // Find the index of the character which exceeds the width.
-                    // getSubStringLength performs far better than getComputedTextLength, and
-                    // results in a 3x speed-up on average.
-                    var index = 1;
-                    while (txtNode.getSubStringLength(0, index) < maxLength) {
-                        index++;
-                    }
-                    // Shorten the label starting at the string length known to be one
-                    // character above max pixel length.
-                    // When shortened the original label's substring is concatenated with
-                    // '...', baseText contains the substring not including the '...'.
-                    var baseText = txtNode.textContent.substr(0, index);
-                    do {
-                        baseText = baseText.substr(0, baseText.length - 1);
-                        // Recompute text length.
-                        txtNode.textContent = baseText + '...';
-                        computedTxtLength = txtNode.getComputedTextLength();
-                    } while (computedTxtLength > maxLength && baseText.length > 0);
-                    // Add tooltip with full name and return.
-                    return txtElementSelection.append('title').text(labelContent);
-                }
-                node_1.enforceLabelWidth = enforceLabelWidth;
-                /**
-                 * d3 scale used for sizing font of labels, used by labelBuild,
-                 * initialized once by getLabelFontScale.
-                 */
-                var fontScale = null;
-                function getLabelFontScale(sceneElement) {
-                    if (!fontScale) {
-                        fontScale = d3.scale.linear()
-                            .domain([sceneElement.maxMetanodeLabelLengthLargeFont,
-                            sceneElement.maxMetanodeLabelLength])
-                            .range([sceneElement.maxMetanodeLabelLengthFontSize,
-                            sceneElement.minMetanodeLabelLengthFontSize]).clamp(true);
-                    }
-                    return fontScale;
-                }
-                /**
-                 * Set label position of a given node group
-                 */
-                function labelPosition(nodeGroup, cx, cy, yOffset) {
-                    scene.selectChild(nodeGroup, 'text', scene.Class.Node.LABEL)
-                        .transition()
-                        .attr('x', cx)
-                        .attr('y', cy + yOffset);
-                }
-                ;
-                /**
-                 * Select or append/insert shape for a node and assign renderNode
-                 * as the shape's data.
-                 *
-                 * @param nodeGroup
-                 * @param d Render node information.
-                 * @param nodeClass class for the element.
-                 * @return Selection of the shape.
-                 */
-                function buildShape(nodeGroup, d, nodeClass) {
-                    // Create a group to house the underlying visual elements.
-                    var shapeGroup = scene.selectOrCreateChild(nodeGroup, 'g', nodeClass);
-                    // TODO(jimbo): DOM structure should be templated in HTML somewhere, not JS.
-                    switch (d.node.type) {
-                        case graph.NodeType.OP:
-                            scene.selectOrCreateChild(shapeGroup, 'ellipse', scene.Class.Node.COLOR_TARGET);
-                            break;
-                        case graph.NodeType.SERIES:
-                            // Choose the correct stamp to use to represent this series.
-                            var stampType = 'annotation';
-                            var groupNodeInfo = d;
-                            if (groupNodeInfo.coreGraph) {
-                                stampType =
-                                    groupNodeInfo.node.hasNonControlEdges ? 'vertical' : 'horizontal';
-                            }
-                            var classList = [scene.Class.Node.COLOR_TARGET];
-                            if (groupNodeInfo.isFadedOut) {
-                                classList.push('faded-ellipse');
-                            }
-                            scene.selectOrCreateChild(shapeGroup, 'use', classList)
-                                .attr('xlink:href', '#op-series-' + stampType + '-stamp');
-                            scene.selectOrCreateChild(shapeGroup, 'rect', scene.Class.Node.COLOR_TARGET)
-                                .attr({ rx: d.radius, ry: d.radius });
-                            break;
-                        case graph.NodeType.BRIDGE:
-                            scene.selectOrCreateChild(shapeGroup, 'rect', scene.Class.Node.COLOR_TARGET)
-                                .attr({ rx: d.radius, ry: d.radius });
-                            break;
-                        case graph.NodeType.META:
-                            scene.selectOrCreateChild(shapeGroup, 'rect', scene.Class.Node.COLOR_TARGET)
-                                .attr({ rx: d.radius, ry: d.radius });
-                            break;
-                        default:
-                            throw Error('Unrecognized node type: ' + d.node.type);
-                    }
-                    return shapeGroup;
-                }
-                node_1.buildShape = buildShape;
-                ;
-                function nodeClass(d) {
-                    switch (d.node.type) {
-                        case graph.NodeType.OP:
-                            return scene.Class.OPNODE;
-                        case graph.NodeType.META:
-                            return scene.Class.METANODE;
-                        case graph.NodeType.SERIES:
-                            return scene.Class.SERIESNODE;
-                        case graph.NodeType.BRIDGE:
-                            return scene.Class.BRIDGENODE;
-                        case graph.NodeType.ELLIPSIS:
-                            return scene.Class.ELLIPSISNODE;
-                    }
-                    ;
-                    throw Error('Unrecognized node type: ' + d.node.type);
-                }
-                node_1.nodeClass = nodeClass;
-                ;
-                /** Modify node and its subscene and its label's positional attributes */
-                function position(nodeGroup, d) {
-                    var shapeGroup = scene.selectChild(nodeGroup, 'g', scene.Class.Node.SHAPE);
-                    var cx = graph.layout.computeCXPositionOfNodeShape(d);
-                    switch (d.node.type) {
-                        case graph.NodeType.OP: {
-                            // position shape
-                            var shape = scene.selectChild(shapeGroup, 'ellipse');
-                            scene.positionEllipse(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
-                            labelPosition(nodeGroup, cx, d.y, d.labelOffset);
-                            break;
-                        }
-                        case graph.NodeType.META: {
-                            // position shape
-                            var shape = scene.selectChild(shapeGroup, 'rect');
-                            if (d.expanded) {
-                                scene.positionRect(shape, d.x, d.y, d.width, d.height);
-                                subscenePosition(nodeGroup, d);
-                                // put label on top
-                                labelPosition(nodeGroup, cx, d.y, -d.height / 2 + d.labelHeight / 2);
-                            }
-                            else {
-                                scene.positionRect(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
-                                labelPosition(nodeGroup, cx, d.y, 0);
-                            }
-                            break;
-                        }
-                        case graph.NodeType.SERIES: {
-                            var shape = scene.selectChild(shapeGroup, 'use');
-                            if (d.expanded) {
-                                scene.positionRect(shape, d.x, d.y, d.width, d.height);
-                                subscenePosition(nodeGroup, d);
-                                // put label on top
-                                labelPosition(nodeGroup, cx, d.y, -d.height / 2 + d.labelHeight / 2);
-                            }
-                            else {
-                                scene.positionRect(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
-                                labelPosition(nodeGroup, cx, d.y, d.labelOffset);
-                            }
-                            break;
-                        }
-                        case graph.NodeType.BRIDGE: {
-                            // position shape
-                            // NOTE: In reality, these will not be visible, but it helps to put them
-                            // in the correct position for debugging purposes.
-                            var shape = scene.selectChild(shapeGroup, 'rect');
-                            scene.positionRect(shape, d.x, d.y, d.width, d.height);
-                            break;
-                        }
-                        default: {
-                            throw Error('Unrecognized node type: ' + d.node.type);
-                        }
-                    }
-                }
-                ;
-                /** Enum specifying the options to color nodes by */
-                var ColorBy;
-                (function (ColorBy) {
-                    ColorBy[ColorBy["STRUCTURE"] = 0] = "STRUCTURE";
-                    ColorBy[ColorBy["DEVICE"] = 1] = "DEVICE";
-                    ColorBy[ColorBy["XLA_CLUSTER"] = 2] = "XLA_CLUSTER";
-                    ColorBy[ColorBy["COMPUTE_TIME"] = 3] = "COMPUTE_TIME";
-                    ColorBy[ColorBy["MEMORY"] = 4] = "MEMORY";
-                })(ColorBy = node_1.ColorBy || (node_1.ColorBy = {}));
-                ;
-                /**
-                 * Returns the fill color for the node given its state and the 'color by'
-                 * option.
-                 */
-                function getFillForNode(templateIndex, colorBy, renderInfo, isExpanded) {
-                    var colorParams = graph.render.MetanodeColors;
-                    switch (colorBy) {
-                        case ColorBy.STRUCTURE:
-                            if (renderInfo.node.type === graph.NodeType.META) {
-                                var tid = renderInfo.node.templateId;
-                                return tid === null ?
-                                    colorParams.UNKNOWN :
-                                    colorParams.STRUCTURE_PALETTE(templateIndex(tid), isExpanded);
-                            }
-                            else if (renderInfo.node.type === graph.NodeType.SERIES) {
-                                // If expanded, we're showing the background rect, which we want to
-                                // appear gray. Otherwise we're showing a stack of ellipses which we
-                                // want to show white.
-                                return isExpanded ? colorParams.EXPANDED_COLOR : 'white';
-                            }
-                            else if (renderInfo.node.type === graph.NodeType.BRIDGE) {
-                                return renderInfo.structural ?
-                                    '#f0e' :
-                                    renderInfo.node.inbound ? '#0ef' : '#fe0';
-                            }
-                            else {
-                                // Op nodes are white.
-                                return 'white';
-                            }
-                        case ColorBy.DEVICE:
-                            if (renderInfo.deviceColors == null) {
-                                // Return the hue for unknown device.
-                                return colorParams.UNKNOWN;
-                            }
-                            var id = renderInfo.node.name;
-                            var escapedId = tf.graph.util.escapeQuerySelector(id);
-                            var gradientDefs = d3.select('svg#svg defs #linearGradients');
-                            var linearGradient_1 = gradientDefs.select('linearGradient#' + escapedId);
-                            // If the linear gradient is not there yet, create it.
-                            if (linearGradient_1.size() === 0) {
-                                linearGradient_1 = gradientDefs.append('linearGradient').attr('id', id);
-                                // Re-create the stops of the linear gradient.
-                                linearGradient_1.selectAll('*').remove();
-                                var cumulativeProportion_1 = 0;
-                                // For each device, create a stop using the proportion of that device.
-                                _.each(renderInfo.deviceColors, function (d) {
-                                    var color = d.color;
-                                    linearGradient_1.append('stop')
-                                        .attr('offset', cumulativeProportion_1)
-                                        .attr('stop-color', color);
-                                    linearGradient_1.append('stop')
-                                        .attr('offset', cumulativeProportion_1 + d.proportion)
-                                        .attr('stop-color', color);
-                                    cumulativeProportion_1 += d.proportion;
-                                });
-                            }
-                            return isExpanded ? colorParams.EXPANDED_COLOR : "url(#" + escapedId + ")";
-                        case ColorBy.XLA_CLUSTER:
-                            return isExpanded ? colorParams.EXPANDED_COLOR :
-                                renderInfo.xlaClusterColor || colorParams.UNKNOWN;
-                        case ColorBy.COMPUTE_TIME:
-                            return isExpanded ?
-                                colorParams.EXPANDED_COLOR : renderInfo.computeTimeColor ||
-                                colorParams.UNKNOWN;
-                        case ColorBy.MEMORY:
-                            return isExpanded ?
-                                colorParams.EXPANDED_COLOR : renderInfo.memoryColor ||
-                                colorParams.UNKNOWN;
-                        default:
-                            throw new Error('Unknown case to color nodes by');
-                    }
-                }
-                node_1.getFillForNode = getFillForNode;
-                /**
-                 * Modify node style by toggling class and assign attributes (only for things
-                 * that can't be done in css).
-                 */
-                function stylize(nodeGroup, renderInfo, sceneElement, nodeClass) {
-                    nodeClass = nodeClass || scene.Class.Node.SHAPE;
-                    var isHighlighted = sceneElement.isNodeHighlighted(renderInfo.node.name);
-                    var isSelected = sceneElement.isNodeSelected(renderInfo.node.name);
-                    var isExtract = renderInfo.isInExtract || renderInfo.isOutExtract;
-                    var isExpanded = renderInfo.expanded;
-                    var isFadedOut = renderInfo.isFadedOut;
-                    nodeGroup.classed('highlighted', isHighlighted);
-                    nodeGroup.classed('selected', isSelected);
-                    nodeGroup.classed('extract', isExtract);
-                    nodeGroup.classed('expanded', isExpanded);
-                    nodeGroup.classed('faded', isFadedOut);
-                    // Main node always exists here and it will be reached before subscene,
-                    // so d3 selection is fine here.
-                    var node = nodeGroup.select('.' + nodeClass + ' .' + scene.Class.Node.COLOR_TARGET);
-                    var fillColor = getFillForNode(sceneElement.templateIndex, ColorBy[sceneElement.colorBy.toUpperCase()], renderInfo, isExpanded);
-                    node.style('fill', fillColor);
-                    // Choose outline to be darker version of node color if the node is a single
-                    // color and is not selected.
-                    node.style('stroke', isSelected ? null : getStrokeForFill(fillColor));
-                }
-                node_1.stylize = stylize;
-                ;
-                /**
-                 * Given a node's fill color/gradient, determine the stroke for the node.
-                 */
-                function getStrokeForFill(fill) {
-                    // If node is colored by a gradient, then use a dark gray outline.
-                    return fill.substring(0, 3) === 'url' ?
-                        graph.render.MetanodeColors.GRADIENT_OUTLINE :
-                        d3.rgb(fill).darker().toString();
-                }
-                node_1.getStrokeForFill = getStrokeForFill;
-                /**
-                 * Finds selected node and highlights all nodes which are providing direct
-                 * or indirect input to the node and all edges connecting these nodes
-                 * together and to the selected node.
-                 *
-                 * @param renderGraphInfo Information on the rendered state of the graph.
-                 */
-                function traceInputs(renderGraphInfo) {
-                    // Reset all styling.
-                    d3.selectAll('.input-highlight').classed('input-highlight', false);
-                    d3.selectAll('.non-input').classed('non-input', false);
-                    d3.selectAll('.input-parent').classed('input-parent', false);
-                    d3.selectAll('.input-child').classed('input-child', false);
-                    d3.selectAll('.input-edge-highlight').classed('input-edge-highlight', false);
-                    d3.selectAll('.non-input-edge-highlight')
-                        .classed('non-input-edge-highlight', false);
-                    d3.selectAll('.input-highlight-selected')
-                        .classed('input-highlight-selected', false);
-                    // Extract currently selected node. Return if input tracing disabled or no
-                    // node is selected.
-                    var selectedNodeSelectorString = 'g.node.selected,g.op.selected';
-                    var node = d3.select(selectedNodeSelectorString);
-                    var currentNode = undefined;
-                    if (renderGraphInfo && renderGraphInfo.traceInputs && node && node[0] &&
-                        node[0][0]) {
-                        currentNode = node[0][0];
-                    }
-                    else {
-                        return;
-                    }
-                    var nodeName = currentNode.getAttribute('data-name');
-                    var opNodes = _getAllContainedOpNodes(nodeName, renderGraphInfo);
-                    var allTracedNodes = {};
-                    _.each(opNodes, function (nodeInstance) {
-                        allTracedNodes =
-                            traceAllInputsOfOpNode(renderGraphInfo, nodeInstance, allTracedNodes);
-                    });
-                    d3.selectAll(selectedNodeSelectorString).classed({
-                        // Remove the input-highlight from the selected node.
-                        'input-highlight': false,
-                        // Add input-highlight-selected class to selected node, which allows
-                        // treating the selected not as a special case of an input node.
-                        'input-highlight-selected': true
-                    });
-                    // Highlight all parent nodes of each OpNode as input parent to allow
-                    // specific highlighting.
-                    var highlightedNodes = Object.keys(allTracedNodes);
-                    var visibleNodes = _findVisibleParentsFromOpNodes(renderGraphInfo, highlightedNodes);
-                    _markParentsOfNodes(visibleNodes);
-                    // Attach class to all non-input nodes and edges for styling.
-                    d3.selectAll('g.node:not(.selected):not(.input-highlight)' +
-                        ':not(.input-parent):not(.input-children)')
-                        .classed('non-input', true)
-                        .each(function (d) {
-                        // Mark all nodes with the specified name as non-inputs. This
-                        // results in Annotation nodes which are attached to inputs to be
-                        // tagged as well.
-                        var nodeName = d.node.name;
-                        d3.selectAll("[data-name=\"" + nodeName + "\"]").classed('non-input', true);
-                    });
-                    d3.selectAll('g.edge:not(.input-edge-highlight)')
-                        .classed('non-input-edge-highlight', true);
-                }
-                node_1.traceInputs = traceInputs;
-                /**
-                 * Recursively find all op nodes contained by the node identified by the
-                 * provided name.
-                 * @param nodeName The meta or op node of which the OpNode instances are
-                 * required.
-                 * @param renderGraphInfo The rendered graph information object.
-                 * @returns {Array} An array of OpNodeImpl instances.
-                 */
-                function _getAllContainedOpNodes(nodeName, renderGraphInfo) {
-                    var opNodes = [];
-                    // Get current node.
-                    var node = renderGraphInfo.getNodeByName(nodeName);
-                    // If node is already OpNode then return the node plus its input embeddings.
-                    if (node instanceof tf.graph.OpNodeImpl) {
-                        return [node].concat(node.inEmbeddings);
-                    }
-                    // Otherwise, make recursive call for each node contained by the GroupNode.
-                    var childNodeNames = node.metagraph.nodes();
-                    _.each(childNodeNames, function (childNodeName) {
-                        opNodes =
-                            opNodes.concat(_getAllContainedOpNodes(childNodeName, renderGraphInfo));
-                    });
-                    return opNodes;
-                }
-                node_1._getAllContainedOpNodes = _getAllContainedOpNodes;
-                function traceAllInputsOfOpNode(renderGraphInfo, startNode, allTracedNodes) {
-                    // To prevent infinite loops due to cyclical relationships and improving
-                    // performance by tracing OpNode which is input to 2+ nodes only once.
-                    if (allTracedNodes[startNode.name]) {
-                        return allTracedNodes;
-                    }
-                    else {
-                        allTracedNodes[startNode.name] = true;
-                    }
-                    // Extract the inputs.
-                    var inputs = startNode.inputs;
-                    // Get visible parent.
-                    var currentVisibleParent = getVisibleParent(renderGraphInfo, startNode);
-                    // Mark as input node.
-                    d3.select(".node[data-name=\"" + currentVisibleParent.name + "\"]")
-                        .classed('input-highlight', true);
-                    // Find the visible parent of each input.
-                    var visibleInputs = {};
-                    _.each(inputs, function (nodeInstance) {
-                        var resolvedNode = renderGraphInfo.getNodeByName(nodeInstance.name);
-                        if (resolvedNode === undefined) {
-                            // Node could not be found in rendered Hierarchy, which happens when
-                            // tracing inputs of a SummaryNode.
-                            return;
-                        }
-                        // Ensure node is resolved to OpNode if name collision with Metanode exists.
-                        if (resolvedNode instanceof graph.MetanodeImpl) {
-                            var resolvedNodeName = tf.graph.getStrictName(resolvedNode.name);
-                            resolvedNode = renderGraphInfo.getNodeByName(resolvedNodeName);
-                        }
-                        var visibleParent = getVisibleParent(renderGraphInfo, resolvedNode);
-                        // Append OpNode to visible parent entry.
-                        var visibleInputsEntry = visibleInputs[visibleParent.name];
-                        if (visibleInputsEntry) {
-                            visibleInputsEntry.opNodes.push(resolvedNode);
-                        }
-                        else {
-                            visibleInputs[visibleParent.name] = {
-                                visibleParent: visibleParent,
-                                opNodes: [resolvedNode]
-                            };
-                        }
-                    });
-                    // Find all parents of the start node.
-                    var startNodeParents = {};
-                    var indexedStartNodeParents = [currentVisibleParent];
-                    startNodeParents[currentVisibleParent.name] = {
-                        traced: false,
-                        index: 0,
-                        connectionEndpoints: []
-                    };
-                    var currentNode = currentVisibleParent;
-                    for (var index = 1; currentNode.name !== tf.graph.ROOT_NAME; index++) {
-                        currentNode = currentNode.parentNode;
-                        startNodeParents[currentNode.name] = {
-                            traced: false,
-                            index: index,
-                            connectionEndpoints: []
-                        };
-                        indexedStartNodeParents[index] = currentNode;
-                    }
-                    // Find first mutual parent of each input node and highlight connection.
-                    _.forOwn(visibleInputs, function (visibleParentInfo, key) {
-                        var nodeInstance = visibleParentInfo.visibleParent;
-                        // Make recursive call for each input-OpNode contained by the visible
-                        // parent.
-                        _.each(visibleParentInfo.opNodes, function (opNode) {
-                            allTracedNodes =
-                                traceAllInputsOfOpNode(renderGraphInfo, opNode, allTracedNodes);
-                        });
-                        if (nodeInstance.name !== currentVisibleParent.name) {
-                            _createVisibleTrace(nodeInstance, startNodeParents, indexedStartNodeParents);
-                        }
-                    });
-                    return allTracedNodes;
-                }
-                node_1.traceAllInputsOfOpNode = traceAllInputsOfOpNode;
-                /**
-                 * Colors the edges to connect the passed node to the start node. This is
-                 * done by:
-                 *
-                 * a) Finding the first (visible) common parent in the rendered
-                 * hierarchy.
-                 * NB: There are 2 types of connections:
-                 * 1) Direct connections between node A
-                 * and B, marked below as II,
-                 * 2) Connections from any node A to its parent, A'. Marked below as I and III.
-                 * For type 2 connection you need to know the inner-nested node, the
-                 * direct parent, and the ultimate destination of the connection.
-                 *
-                 *  A_parent      B_parent
-                 * +--------+    +---------+
-                 * |        |    |         |
-                 * |  +--+ I| II |III+--+  |
-                 * |  |A +----------\x3e+B |  |
-                 * |  +--+  |    |   +--+  |
-                 * |        |    |         |
-                 * +--------+    +---------+
-                 *
-                 *
-                 * b) Highlighting the direct connection between the parents of A and B,
-                 * called A_parent and B_parent, s.t. A_parent and B_parent are children of the
-                 * mutual parent of A and B found in a), marked above as II.
-                 *
-                 * c) Highlighting the connection from A to A_parent and B to B_parent
-                 * (through all layers of parents between A and A_parent and B and B_parent,
-                 * respectively). Marked above as I and III.
-                 *
-                 * @param nodeInstance The instance of the node to use as destination node, B.
-                 * @param startNodeParents Map of startNodeParent names to information objects
-                 * about the parent.
-                 * @param indexedStartNodeParents An array of all parents of the start node.
-                 * This is required to find the child of the mutual parent which is a parent
-                 * of the start node.
-                 * @private
-                 */
-                function _createVisibleTrace(nodeInstance, startNodeParents, indexedStartNodeParents) {
-                    var currentNode = nodeInstance;
-                    var previousNode = nodeInstance;
-                    // Ascend through parents until a mutual parent is found with the start
-                    // node.
-                    var destinationParentPairs = [];
-                    while (!startNodeParents[currentNode.name]) {
-                        if (previousNode.name !== currentNode.name) {
-                            destinationParentPairs.push([previousNode, currentNode]);
-                        }
-                        previousNode = currentNode;
-                        currentNode = currentNode.parentNode;
-                    }
-                    // Connection between nodes is drawn between the parents of each
-                    // respective node, both of which share the mutual parent.
-                    var startNodeIndex = startNodeParents[currentNode.name].index;
-                    var startNodeName = indexedStartNodeParents[Math.max(startNodeIndex - 1, 0)].name;
-                    var startNodeTopParentName = startNodeName;
-                    var targetNodeTopParentName = previousNode.name;
-                    var endNodeName = previousNode.name;
-                    d3.selectAll("[data-edge=\"" + endNodeName + "--" + startNodeName + "\"]")
-                        .classed('input-edge-highlight', true);
-                    // Trace up the parents of the input.
-                    _.each(destinationParentPairs, function (value) {
-                        var inner = value[0];
-                        var outer = value[1];
-                        var edgeSelector = "[data-edge=\"" + inner.name + "--" + startNodeTopParentName +
-                            ("~~" + outer.name + "~~OUT\"]");
-                        d3.selectAll(edgeSelector).classed('input-edge-highlight', true);
-                    });
-                    // Trace up the parents of the start node.
-                    for (var index = 1; index < startNodeIndex; index++) {
-                        var inner = indexedStartNodeParents[index - 1];
-                        var outer = indexedStartNodeParents[index];
-                        var edgeSelector = "[data-edge=\"" + targetNodeTopParentName + "~~" + outer.name +
-                            ("~~IN--" + inner.name + "\"]");
-                        d3.selectAll(edgeSelector).classed('input-edge-highlight', true);
-                    }
-                }
-                /**
-                 * Creates map { [name: string] -> Node } of all visible / rendered parents
-                 * of the nodes identified by the node names passed in.
-                 *
-                 * @param renderGraphInfo The information on the rendered graph.
-                 * @param nodeNames String array of node names.
-                 * @returns {[nodeName: string]: Node}
-                 * @private
-                 */
-                function _findVisibleParentsFromOpNodes(renderGraphInfo, nodeNames) {
-                    var visibleParents = {};
-                    _.each(nodeNames, function (nodeName) {
-                        var currentNode = renderGraphInfo.getNodeByName(nodeName);
-                        var visibleParent = getVisibleParent(renderGraphInfo, currentNode);
-                        visibleParents[visibleParent.name] = visibleParent;
-                    });
-                    return visibleParents;
-                }
-                /**
-                 * Traverse through the parents of all nodes in the list and mark each
-                 * encountered node as input-parent.
-                 * @param visibleNodes Map of input nodes, have to be visible/rendered when
-                 * called.
-                 * @private
-                 */
-                function _markParentsOfNodes(visibleNodes) {
-                    _.forOwn(visibleNodes, function (nodeInstance) {
-                        // Mark all parents of the node as input-parents.
-                        var currentNode = nodeInstance;
-                        while (currentNode.name !== tf.graph.ROOT_NAME) {
-                            var renderedElement = d3.select(".node[data-name=\"" + currentNode.name + "\"]");
-                            // Only mark the element as a parent node to an input if it is not
-                            // marked as input node itself.
-                            if (renderedElement[0][0] &&
-                                !renderedElement.classed('input-highlight') &&
-                                !renderedElement.classed('selected') &&
-                                // OpNode only parent if start node is embedded node, in which case
-                                // the OpNode should be faded as well.
-                                !renderedElement.classed('op')) {
-                                renderedElement.classed('input-parent', true);
-                            }
-                            currentNode = currentNode.parentNode;
-                        }
-                    });
-                }
-                /**
-                 * Find the parent of the passed in op node which is expanded. This is done
-                 * by going through all parents until the parent's parent is expanded, thus
-                 * finding the first unexpanded parent which is rendered on the screen.
-                 * @param renderGraphInfo The graph info object used to gain access to the
-                 * render info of the parents.
-                 * @param currentNode The node whose parent is to be found.
-                 * @returns Node
-                 */
-                function getVisibleParent(renderGraphInfo, currentNode) {
-                    var found = false;
-                    var currentParent = currentNode;
-                    while (!found) {
-                        // Get parent element, to extract name.
-                        currentNode = currentParent;
-                        currentParent = currentNode.parentNode;
-                        if (currentParent === undefined) {
-                            found = true;
-                        }
-                        else {
-                            var renderNode = renderGraphInfo.getRenderNodeByName(currentParent.name);
-                            // Found if node is rendered on the screen (renderNode truthy), and
-                            // the parent is either expanded (i.e. it is a metanode or seriesnode)
-                            // or the parent is an OpNode in which case currentNode is an embedded
-                            // node which has another OpNode as parent.
-                            if (renderNode &&
-                                (renderNode.expanded || currentParent instanceof graph.OpNodeImpl)) {
-                                found = true;
-                            }
-                        }
-                    } // Close while loop.
-                    return currentNode;
-                }
-                node_1.getVisibleParent = getVisibleParent;
-            })(node = scene.node || (scene.node = {}));
-        })(scene = graph.scene || (graph.scene = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // Close module.
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph) {
-        var scene;
-        (function (scene) {
-            var svgNamespace = 'http://www.w3.org/2000/svg';
-            /** Enums element class of objects in the scene */
-            scene.Class = {
-                Node: {
-                    // <g> element that contains nodes.
-                    CONTAINER: 'nodes',
-                    // <g> element that contains detail about a node.
-                    GROUP: 'node',
-                    // <g> element that contains visual elements (like rect, ellipse).
-                    SHAPE: 'nodeshape',
-                    // <*> element(s) under SHAPE that should receive color updates.
-                    COLOR_TARGET: 'nodecolortarget',
-                    // <text> element showing the node's label.
-                    LABEL: 'nodelabel',
-                    // <g> element that contains all visuals for the expand/collapse
-                    // button for expandable group nodes.
-                    BUTTON_CONTAINER: 'buttoncontainer',
-                    // <circle> element that surrounds expand/collapse buttons.
-                    BUTTON_CIRCLE: 'buttoncircle',
-                    // <path> element of the expand button.
-                    EXPAND_BUTTON: 'expandbutton',
-                    // <path> element of the collapse button.
-                    COLLAPSE_BUTTON: 'collapsebutton'
-                },
-                Edge: {
-                    CONTAINER: 'edges',
-                    GROUP: 'edge',
-                    LINE: 'edgeline',
-                    REF_LINE: 'refline',
-                    STRUCTURAL: 'structural'
-                },
-                Annotation: {
-                    OUTBOX: 'out-annotations',
-                    INBOX: 'in-annotations',
-                    GROUP: 'annotation',
-                    NODE: 'annotation-node',
-                    EDGE: 'annotation-edge',
-                    CONTROL_EDGE: 'annotation-control-edge',
-                    LABEL: 'annotation-label',
-                    ELLIPSIS: 'annotation-ellipsis'
-                },
-                Scene: {
-                    GROUP: 'scene',
-                    CORE: 'core',
-                    INEXTRACT: 'in-extract',
-                    OUTEXTRACT: 'out-extract'
-                },
-                Subscene: { GROUP: 'subscene' },
-                OPNODE: 'op',
-                METANODE: 'meta',
-                SERIESNODE: 'series',
-                BRIDGENODE: 'bridge',
-                ELLIPSISNODE: 'ellipsis'
-            };
-            ;
-            ;
-            scene.healthPillEntries = [
-                {
-                    background_color: '#CC2F2C',
-                    label: 'NaN',
-                },
-                {
-                    background_color: '#FF8D00',
-                    label: '- ∞',
-                },
-                {
-                    background_color: '#EAEAEA',
-                    label: '-',
-                },
-                {
-                    background_color: '#A5A5A5',
-                    label: '0',
-                },
-                {
-                    background_color: '#262626',
-                    label: '+',
-                },
-                {
-                    background_color: '#003ED4',
-                    label: '+ ∞',
-                },
-            ];
-            /**
-             * Helper method for fitting the graph in the svg view.
-             *
-             * @param svg The main svg.
-             * @param zoomG The svg group used for panning and zooming.
-             * @param d3zoom The zoom behavior.
-             * @param callback Called when the fitting is done.
-             */
-            function fit(svg, zoomG, d3zoom, callback) {
-                var svgRect = svg.getBoundingClientRect();
-                var sceneSize = null;
-                try {
-                    sceneSize = zoomG.getBBox();
-                    if (sceneSize.width === 0) {
-                        // There is no scene anymore. We have been detached from the dom.
-                        return;
-                    }
-                }
-                catch (e) {
-                    // Firefox produced NS_ERROR_FAILURE if we have been
-                    // detached from the dom.
-                    return;
-                }
-                var scale = 0.9 *
-                    Math.min(svgRect.width / sceneSize.width, svgRect.height / sceneSize.height, 2);
-                var params = graph.layout.PARAMS.graph;
-                var zoomEvent = d3zoom.scale(scale)
-                    .on('zoomend.fitted', function () {
-                    // Remove the listener for the zoomend event,
-                    // so we don't get called at the end of regular zoom events,
-                    // just those that fit the graph to screen.
-                    d3zoom.on('zoomend.fitted', null);
-                    callback();
-                })
-                    .translate([params.padding.paddingLeft, params.padding.paddingTop])
-                    .event;
-                d3.select(zoomG).transition().duration(500).call(zoomEvent);
-            }
-            scene.fit = fit;
-            ;
-            /**
-             * Helper method for panning the graph to center on the provided node,
-             * if the node is currently off-screen.
-             *
-             * @param nodeName The node to center the graph on
-             * @param svg The root SVG element for the graph
-             * @param zoomG The svg group used for panning and zooming.
-             * @param d3zoom The zoom behavior.
-             * @return True if the graph had to be panned to display the
-             *            provided node.
-             */
-            function panToNode(nodeName, svg, zoomG, d3zoom) {
-                var node = d3
-                    .select('[data-name="' + nodeName + '"].' + scene.Class.Node.GROUP)
-                    .node();
-                if (!node) {
-                    return false;
-                }
-                var translate = d3zoom.translate();
-                // Check if the selected node is off-screen in either
-                // X or Y dimension in either direction.
-                var nodeBox = node.getBBox();
-                var nodeCtm = node.getScreenCTM();
-                var pointTL = svg.createSVGPoint();
-                var pointBR = svg.createSVGPoint();
-                pointTL.x = nodeBox.x;
-                pointTL.y = nodeBox.y;
-                pointBR.x = nodeBox.x + nodeBox.width;
-                pointBR.y = nodeBox.y + nodeBox.height;
-                pointTL = pointTL.matrixTransform(nodeCtm);
-                pointBR = pointBR.matrixTransform(nodeCtm);
-                var isOutsideOfBounds = function (start, end, bound) {
-                    return end < 0 || start > bound;
-                };
-                var svgRect = svg.getBoundingClientRect();
-                if (isOutsideOfBounds(pointTL.x, pointBR.x, svgRect.width) ||
-                    isOutsideOfBounds(pointTL.y, pointBR.y, svgRect.height)) {
-                    // Determine the amount to transform the graph in both X and Y
-                    // dimensions in order to center the selected node. This takes into
-                    // acount the position of the node, the size of the svg scene, the
-                    // amount the scene has been scaled by through zooming, and any previous
-                    // transform already performed by this logic.
-                    var centerX = (pointTL.x + pointBR.x) / 2;
-                    var centerY = (pointTL.y + pointBR.y) / 2;
-                    var dx = ((svgRect.width / 2) - centerX);
-                    var dy = ((svgRect.height / 2) - centerY);
-                    var zoomEvent = d3zoom.translate([translate[0] + dx, translate[1] + dy])
-                        .event;
-                    d3.select(zoomG).transition().duration(500).call(zoomEvent);
-                    return true;
-                }
-                return false;
-            }
-            scene.panToNode = panToNode;
-            ;
-            /**
-             * Given a container d3 selection, select a child svg element of a given tag
-             * and class if exists or append / insert one otherwise.  If multiple children
-             * matches the tag and class name, returns only the first one.
-             *
-             * @param container
-             * @param tagName tag name.
-             * @param className (optional) Class name or a list of class names.
-             * @param before (optional) reference DOM node for insertion.
-             * @return selection of the element
-             */
-            function selectOrCreateChild(container, tagName, className, before) {
-                var child = selectChild(container, tagName, className);
-                if (!child.empty()) {
-                    return child;
-                }
-                var newElement = document.createElementNS('http://www.w3.org/2000/svg', tagName);
-                if (className instanceof Array) {
-                    for (var i = 0; i < className.length; i++) {
-                        newElement.classList.add(className[i]);
-                    }
-                }
-                else {
-                    newElement.classList.add(className);
-                }
-                if (before) {
-                    container.node().insertBefore(newElement, before);
-                }
-                else {
-                    container.node().appendChild(newElement);
-                }
-                return d3.select(newElement)
-                    .datum(container.datum());
-            }
-            scene.selectOrCreateChild = selectOrCreateChild;
-            ;
-            /**
-             * Given a container d3 selection, select a child element of a given tag and
-             * class. If multiple children matches the tag and class name, returns only
-             * the first one.
-             *
-             * @param container
-             * @param tagName tag name.
-             * @param className (optional) Class name or list of class names.
-             * @return selection of the element, or an empty selection
-             */
-            function selectChild(container, tagName, className) {
-                var children = container.node().childNodes;
-                for (var i = 0; i < children.length; i++) {
-                    var child = children[i];
-                    if (child.tagName === tagName) {
-                        if (className instanceof Array) {
-                            var hasAllClasses = true;
-                            for (var j = 0; j < className.length; j++) {
-                                hasAllClasses =
-                                    hasAllClasses && child.classList.contains(className[j]);
-                            }
-                            if (hasAllClasses) {
-                                return d3.select(child);
-                            }
-                        }
-                        else if ((!className || child.classList.contains(className))) {
-                            return d3.select(child);
-                        }
-                    }
-                }
-                return d3.select(null);
-            }
-            scene.selectChild = selectChild;
-            ;
-            /**
-             * Select or create a sceneGroup and build/update its nodes and edges.
-             *
-             * Structure Pattern:
-             *
-             * <g class='scene'>
-             *   <g class='core'>
-             *     <g class='edges'>
-             *       ... stuff from tf.graph.scene.edges.build ...
-             *     </g>
-             *     <g class='nodes'>
-             *       ... stuff from tf.graph.scene.nodes.build ...
-             *     </g>
-             *   </g>
-             *   <g class='in-extract'>
-             *     <g class='nodes'>
-             *       ... stuff from tf.graph.scene.nodes.build ...
-             *     </g>
-             *   </g>
-             *   <g class='out-extract'>
-             *     <g class='nodes'>
-             *       ... stuff from tf.graph.scene.nodes.build ...
-             *     </g>
-             *   </g>
-             * </g>
-             *
-             * @param container D3 selection of the parent.
-             * @param renderNode render node of a metanode or series node.
-             * @param sceneElement <tf-graph-scene> polymer element.
-             * @param sceneClass class attribute of the scene (default='scene').
-             */
-            function buildGroup(container, renderNode, sceneElement, sceneClass) {
-                sceneClass = sceneClass || scene.Class.Scene.GROUP;
-                var isNewSceneGroup = selectChild(container, 'g', sceneClass).empty();
-                var sceneGroup = selectOrCreateChild(container, 'g', sceneClass);
-                // core
-                var coreGroup = selectOrCreateChild(sceneGroup, 'g', scene.Class.Scene.CORE);
-                var coreNodes = _.reduce(renderNode.coreGraph.nodes(), function (nodes, name) {
-                    var node = renderNode.coreGraph.node(name);
-                    if (!node.excluded) {
-                        nodes.push(node);
-                    }
-                    return nodes;
-                }, []);
-                if (renderNode.node.type === graph.NodeType.SERIES) {
-                    // For series, we want the first item on top, so reverse the array so
-                    // the first item in the series becomes last item in the top, and thus
-                    // is rendered on the top.
-                    coreNodes.reverse();
-                }
-                // Create the layer of edges for this scene (paths).
-                scene.edge.buildGroup(coreGroup, renderNode.coreGraph, sceneElement);
-                // Create the layer of nodes for this scene (ellipses, rects etc).
-                scene.node.buildGroup(coreGroup, coreNodes, sceneElement);
-                // In-extract
-                if (renderNode.isolatedInExtract.length > 0) {
-                    var inExtractGroup = selectOrCreateChild(sceneGroup, 'g', scene.Class.Scene.INEXTRACT);
-                    scene.node.buildGroup(inExtractGroup, renderNode.isolatedInExtract, sceneElement);
-                }
-                else {
-                    selectChild(sceneGroup, 'g', scene.Class.Scene.INEXTRACT).remove();
-                }
-                // Out-extract
-                if (renderNode.isolatedOutExtract.length > 0) {
-                    var outExtractGroup = selectOrCreateChild(sceneGroup, 'g', scene.Class.Scene.OUTEXTRACT);
-                    scene.node.buildGroup(outExtractGroup, renderNode.isolatedOutExtract, sceneElement);
-                }
-                else {
-                    selectChild(sceneGroup, 'g', scene.Class.Scene.OUTEXTRACT).remove();
-                }
-                position(sceneGroup, renderNode);
-                // Fade in the scene group if it didn't already exist.
-                if (isNewSceneGroup) {
-                    sceneGroup.attr('opacity', 0).transition().attr('opacity', 1);
-                }
-                return sceneGroup;
-            }
-            scene.buildGroup = buildGroup;
-            ;
-            /**
-             * Given a scene's svg group, set  g.in-extract, g.coreGraph, g.out-extract svg
-             * groups' position relative to the scene.
-             *
-             * @param sceneGroup
-             * @param renderNode render node of a metanode or series node.
-             */
-            function position(sceneGroup, renderNode) {
-                // Translate scenes down by the label height so that when showing graphs in
-                // expanded metanodes, the graphs are below the labels.  Do not shift them
-                // down for series nodes as series nodes don't have labels inside of their
-                // bounding boxes.
-                var yTranslate = renderNode.node.type === graph.NodeType.SERIES ?
-                    0 : graph.layout.PARAMS.subscene.meta.labelHeight;
-                // core
-                translate(selectChild(sceneGroup, 'g', scene.Class.Scene.CORE), 0, yTranslate);
-                // in-extract
-                var hasInExtract = renderNode.isolatedInExtract.length > 0;
-                var hasOutExtract = renderNode.isolatedOutExtract.length > 0;
-                if (hasInExtract) {
-                    var offset = graph.layout.PARAMS.subscene.meta.extractXOffset;
-                    var inExtractX = renderNode.coreBox.width -
-                        renderNode.inExtractBox.width / 2 - renderNode.outExtractBox.width -
-                        (hasOutExtract ? offset : 0);
-                    translate(selectChild(sceneGroup, 'g', scene.Class.Scene.INEXTRACT), inExtractX, yTranslate);
-                }
-                // out-extract
-                if (hasOutExtract) {
-                    var outExtractX = renderNode.coreBox.width -
-                        renderNode.outExtractBox.width / 2;
-                    translate(selectChild(sceneGroup, 'g', scene.Class.Scene.OUTEXTRACT), outExtractX, yTranslate);
-                }
-            }
-            ;
-            /** Adds a click listener to a group that fires a graph-select event */
-            function addGraphClickListener(graphGroup, sceneElement) {
-                d3.select(graphGroup).on('click', function () {
-                    sceneElement.fire('graph-select');
-                });
-            }
-            scene.addGraphClickListener = addGraphClickListener;
-            ;
-            /** Helper for adding transform: translate(x0, y0) */
-            function translate(selection, x0, y0) {
-                // If it is already placed on the screen, make it a transition.
-                if (selection.attr('transform') != null) {
-                    selection = selection.transition('position');
-                }
-                selection.attr('transform', 'translate(' + x0 + ',' + y0 + ')');
-            }
-            scene.translate = translate;
-            ;
-            /**
-             * Helper for setting position of a svg rect
-             * @param rect rect to set position of.
-             * @param cx Center x.
-             * @param cy Center x.
-             * @param width Width to set.
-             * @param height Height to set.
-             */
-            function positionRect(rect, cx, cy, width, height) {
-                rect.transition().attr({
-                    x: cx - width / 2,
-                    y: cy - height / 2,
-                    width: width,
-                    height: height
-                });
-            }
-            scene.positionRect = positionRect;
-            ;
-            /**
-             * Helper for setting position of a svg expand/collapse button
-             * @param button container group
-             * @param renderNode the render node of the group node to position
-             *        the button on.
-             */
-            function positionButton(button, renderNode) {
-                var cx = graph.layout.computeCXPositionOfNodeShape(renderNode);
-                // Position the button in the top-right corner of the group node,
-                // with space given the draw the button inside of the corner.
-                var width = renderNode.expanded ?
-                    renderNode.width : renderNode.coreBox.width;
-                var height = renderNode.expanded ?
-                    renderNode.height : renderNode.coreBox.height;
-                var x = cx + width / 2 - 6;
-                var y = renderNode.y - height / 2 + 6;
-                // For unexpanded series nodes, the button has special placement due
-                // to the unique visuals of this group node.
-                if (renderNode.node.type === graph.NodeType.SERIES && !renderNode.expanded) {
-                    x += 10;
-                    y -= 2;
-                }
-                var translateStr = 'translate(' + x + ',' + y + ')';
-                button.selectAll('path').transition().attr('transform', translateStr);
-                button.select('circle').transition().attr({ cx: x, cy: y, r: graph.layout.PARAMS.nodeSize.meta.expandButtonRadius });
-            }
-            scene.positionButton = positionButton;
-            ;
-            /**
-             * Helper for setting position of a svg ellipse
-             * @param ellipse ellipse to set position of.
-             * @param cx Center x.
-             * @param cy Center x.
-             * @param width Width to set.
-             * @param height Height to set.
-             */
-            function positionEllipse(ellipse, cx, cy, width, height) {
-                ellipse.transition().attr({
-                    cx: cx,
-                    cy: cy,
-                    rx: width / 2,
-                    ry: height / 2
-                });
-            }
-            scene.positionEllipse = positionEllipse;
-            ;
-            /**
-             * @param {number} stat A stat for a health pill (such as mean or variance).
-             * @param {boolean} shouldRoundOnesDigit Whether to round this number to the
-             *     ones digit. Useful for say int, uint, and bool output types.
-             * @return {string} A human-friendly string representation of that stat.
-             */
-            function humanizeHealthPillStat(stat, shouldRoundOnesDigit) {
-                if (shouldRoundOnesDigit) {
-                    return stat.toFixed(0);
-                }
-                if (Math.abs(stat) >= 1) {
-                    return stat.toFixed(1);
-                }
-                return stat.toExponential(1);
-            }
-            scene.humanizeHealthPillStat = humanizeHealthPillStat;
-            /**
-             * Renders a health pill for an op atop a node.
-             */
-            function _addHealthPill(nodeGroupElement, healthPill, nodeInfo) {
-                // Check if text already exists at location.
-                d3.select(nodeGroupElement.parentNode).selectAll('.health-pill').remove();
-                if (!nodeInfo || !healthPill) {
-                    return;
-                }
-                var lastHealthPillData = healthPill.value;
-                // For now, we only visualize the 6 values that summarize counts of tensor
-                // elements of various categories: -Inf, negative, 0, positive, Inf, and NaN.
-                var lastHealthPillOverview = lastHealthPillData.slice(2, 8);
-                var totalCount = lastHealthPillData[1];
-                var healthPillWidth = 60;
-                var healthPillHeight = 10;
-                if (nodeInfo.node.type === tf.graph.NodeType.OP) {
-                    // Use a smaller health pill for op nodes (rendered as smaller ellipses).
-                    healthPillWidth /= 2;
-                    healthPillHeight /= 2;
-                }
-                var healthPillGroup = document.createElementNS(svgNamespace, 'g');
-                healthPillGroup.classList.add('health-pill');
-                // Define the gradient for the health pill.
-                var healthPillDefs = document.createElementNS(svgNamespace, 'defs');
-                healthPillGroup.appendChild(healthPillDefs);
-                var healthPillGradient = document.createElementNS(svgNamespace, 'linearGradient');
-                var healthPillGradientId = 'health-pill-gradient';
-                healthPillGradient.setAttribute('id', healthPillGradientId);
-                var titleOnHoverTextEntries = [];
-                var cumulativeCount = 0;
-                var previousOffset = '0%';
-                for (var i = 0; i < lastHealthPillOverview.length; i++) {
-                    if (!lastHealthPillOverview[i]) {
-                        // Exclude empty categories.
-                        continue;
-                    }
-                    cumulativeCount += lastHealthPillOverview[i];
-                    // Create a color interval using 2 stop elements.
-                    var stopElement0 = document.createElementNS(svgNamespace, 'stop');
-                    stopElement0.setAttribute('offset', previousOffset);
-                    stopElement0.setAttribute('stop-color', scene.healthPillEntries[i].background_color);
-                    healthPillGradient.appendChild(stopElement0);
-                    var stopElement1 = document.createElementNS(svgNamespace, 'stop');
-                    var percent = (cumulativeCount * 100 / totalCount) + '%';
-                    stopElement1.setAttribute('offset', percent);
-                    stopElement1.setAttribute('stop-color', scene.healthPillEntries[i].background_color);
-                    healthPillGradient.appendChild(stopElement1);
-                    previousOffset = percent;
-                    // Include this number in the title that appears on hover.
-                    titleOnHoverTextEntries.push(scene.healthPillEntries[i].label + ': ' + lastHealthPillOverview[i]);
-                }
-                healthPillDefs.appendChild(healthPillGradient);
-                // Create the rectangle for the health pill.
-                var rect = document.createElementNS(svgNamespace, 'rect');
-                rect.setAttribute('fill', 'url(#' + healthPillGradientId + ')');
-                rect.setAttribute('width', String(healthPillWidth));
-                rect.setAttribute('height', String(healthPillHeight));
-                healthPillGroup.appendChild(rect);
-                // Show a title with specific counts on hover.
-                var titleSvg = document.createElementNS(svgNamespace, 'title');
-                titleSvg.textContent = titleOnHoverTextEntries.join(', ');
-                healthPillGroup.appendChild(titleSvg);
-                // Center this health pill just right above the node for the op.
-                var healthPillX = nodeInfo.x - healthPillWidth / 2;
-                var healthPillY = nodeInfo.y - healthPillHeight - nodeInfo.height / 2 - 2;
-                if (nodeInfo.labelOffset < 0) {
-                    // The label is positioned above the node. Do not occlude the label.
-                    healthPillY += nodeInfo.labelOffset;
-                }
-                if (lastHealthPillOverview[2] || lastHealthPillOverview[3] ||
-                    lastHealthPillOverview[4]) {
-                    // At least 1 "non-Inf and non-NaN" value exists (a -, 0, or + value). Show
-                    // stats on tensor values.
-                    // Determine if we should display the output range as integers.
-                    var shouldRoundOnesDigit = false;
-                    var node_1 = nodeInfo.node;
-                    var attributes = node_1.attr;
-                    if (attributes && attributes.length) {
-                        // Find the attribute for output type if there is one.
-                        for (var i = 0; i < attributes.length; i++) {
-                            if (attributes[i].key === 'T') {
-                                // Note whether the output type is an integer.
-                                var outputType = attributes[i].value['type'];
-                                shouldRoundOnesDigit =
-                                    outputType && /^DT_(BOOL|INT|UINT)/.test(outputType);
-                                break;
-                            }
-                        }
-                    }
-                    var statsSvg = document.createElementNS(svgNamespace, 'text');
-                    var minString = humanizeHealthPillStat(lastHealthPillData[8], shouldRoundOnesDigit);
-                    var maxString = humanizeHealthPillStat(lastHealthPillData[9], shouldRoundOnesDigit);
-                    statsSvg.textContent = minString + ' ~ ' + maxString;
-                    statsSvg.classList.add('health-pill-stats');
-                    statsSvg.setAttribute('x', String(healthPillWidth / 2));
-                    statsSvg.setAttribute('y', '-2');
-                    healthPillGroup.appendChild(statsSvg);
-                }
-                healthPillGroup.setAttribute('transform', 'translate(' + healthPillX + ', ' + healthPillY + ')');
-                Polymer.dom(nodeGroupElement.parentNode).appendChild(healthPillGroup);
-            }
-            /**
-             * Adds health pills (which visualize tensor summaries) to a graph group.
-             * @param svgRoot The root SVG element of the graph to add heath pills to.
-             * @param nodeNamesToHealthPills An object mapping node name to health pill.
-             * @param colors A list of colors to use.
-             */
-            function addHealthPills(svgRoot, nodeNamesToHealthPills, healthPillStepIndex) {
-                if (!nodeNamesToHealthPills) {
-                    // No health pill information available.
-                    return;
-                }
-                var svgRootSelection = d3.select(svgRoot);
-                svgRootSelection.selectAll('g.nodeshape')
-                    .each(function (nodeInfo) {
-                    // Only show health pill data for this node if it is available.
-                    var healthPills = nodeNamesToHealthPills[nodeInfo.node.name];
-                    var healthPill = healthPills ? healthPills[healthPillStepIndex] : null;
-                    _addHealthPill(this, healthPill, nodeInfo);
-                });
-            }
-            scene.addHealthPills = addHealthPills;
-            ;
-        })(scene = graph.scene || (graph.scene = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {})); // close module
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph_1) {
-        var template;
-        (function (template) {
-            /**
-             * Detect repeating patterns of subgraphs.
-             * Assign templateId to each subgraph if it belongs to a template.
-             * Returns clusters of similar subgraphs .
-             *
-             * @param graph
-             * @param verifyTemplate whether to run the template verification algorithm
-             * @return a dict (template id => Array of node names)
-             */
-            function detect(h, verifyTemplate) {
-                // In any particular subgraph, there are either
-                // - leaf nodes (which do not have subgraph)
-                // - metanode nodes - some of them have only one member (singular metanode)
-                //                    and some have multiple members (non-singular metanode)
-                // First, generate a nearest neighbor hash of metanode nodes.
-                var nnGroups = clusterSimilarSubgraphs(h);
-                // For each metanode, compare its subgraph (starting from shallower groups)
-                // and assign template id.
-                var templates = groupTemplateAndAssignId(nnGroups, verifyTemplate);
-                // Sort the templates by minimum level in the graph at which they appear,
-                // as this leads to optimal setting of the colors of each template for
-                // maximum differentiation.
-                return _(templates)
-                    .pairs()
-                    .sortBy(function (pair) {
-                    return pair[1].level;
-                })
-                    .map(function (pair) {
-                    return [pair[0], pair[1].nodes];
-                })
-                    .object()
-                    .value();
-            }
-            template.detect = detect;
-            ;
-            /**
-             * @return Unique string for a metanode based on depth, |V|, |E| and
-             * op type histogram.
-             */
-            function getSignature(metanode) {
-                // depth=<number> |V|=<number> |E|=<number>
-                var props = _.map({
-                    'depth': metanode.depth,
-                    '|V|': metanode.metagraph.nodes().length,
-                    '|E|': metanode.metagraph.edges().length
-                }, function (v, k) { return k + '=' + v; })
-                    .join(' ');
-                // optype1=count1,optype2=count2
-                var ops = _.map(metanode.opHistogram, function (count, op) {
-                    return op + '=' + count;
-                }).join(',');
-                return props + ' [ops] ' + ops;
-            }
-            /**
-             * Generate a nearest neighbor hash of metanodes
-             * based on depth, |V|, |E|, and opHistogram of their subgraph
-             * (excluding leaf nodes and singular metanodes).
-             * @param graph The graph
-             * @return Array of pairs of [signature,
-             *   Object with min level of the template and an Array of tf.graph.Group]
-             *   sort by ascending order of minimum depth at which metanode appears.
-             */
-            function clusterSimilarSubgraphs(h) {
-                /** a dict from metanode.signature() => Array of tf.graph.Groups */
-                var hashDict = _(h.getNodeMap()).reduce(function (hash, node, name) {
-                    if (node.type !== graph_1.NodeType.META) {
-                        return hash;
-                    }
-                    var levelOfMetaNode = name.split('/').length - 1;
-                    var signature = getSignature(node);
-                    var templateInfo = hash[signature] ||
-                        { nodes: [], level: levelOfMetaNode };
-                    hash[signature] = templateInfo;
-                    templateInfo.nodes.push(node);
-                    if (templateInfo.level > levelOfMetaNode) {
-                        templateInfo.level = levelOfMetaNode;
-                    }
-                    return hash;
-                }, {});
-                return _(hashDict)
-                    .pairs()
-                    .filter(function (pair) {
-                    return pair[1].nodes.length > 1;
-                })
-                    .sortBy(function (pair) {
-                    // sort by depth
-                    // (all members in the same nnGroup has equal depth)
-                    return pair[1].nodes[0].depth;
-                })
-                    .value();
-            }
-            function groupTemplateAndAssignId(nnGroups, verifyTemplate) {
-                // For each metanode, compare its subgraph (starting from shallower groups)
-                // and assign template id.
-                var result = {};
-                return _.reduce(nnGroups, function (templates, nnGroupPair) {
-                    var signature = nnGroupPair[0], nnGroup = nnGroupPair[1].nodes, clusters = [];
-                    nnGroup.forEach(function (metanode) {
-                        // check with each existing cluster
-                        for (var i = 0; i < clusters.length; i++) {
-                            var similar = !verifyTemplate ||
-                                isSimilarSubgraph(clusters[i].metanode.metagraph, metanode.metagraph);
-                            // if similar, just add this metanode to the cluster
-                            if (similar) {
-                                // get template from the first one
-                                metanode.templateId = clusters[i].metanode.templateId;
-                                clusters[i].members.push(metanode.name);
-                                return;
-                            }
-                        }
-                        // otherwise create a new cluster with id 'signature [count] '
-                        metanode.templateId = signature + '[' + clusters.length + ']';
-                        clusters.push({
-                            metanode: metanode,
-                            members: [metanode.name]
-                        });
-                    });
-                    clusters.forEach(function (c) {
-                        templates[c.metanode.templateId] = {
-                            level: nnGroupPair[1].level,
-                            nodes: c.members
-                        };
-                    });
-                    return templates;
-                }, result);
-            }
-            function sortNodes(names, graph, prefix) {
-                return _.sortByAll(names, function (name) {
-                    var node = graph.node(name);
-                    return node.op;
-                }, function (name) {
-                    var node = graph.node(name);
-                    return node.templateId;
-                }, function (name) {
-                    return graph.neighbors(name).length;
-                }, function (name) {
-                    return graph.predecessors(name).length;
-                }, function (name) {
-                    return graph.successors(name).length;
-                }, function (name) {
-                    return name.substr(prefix.length);
-                });
-            }
-            function isSimilarSubgraph(g1, g2) {
-                if (!tf.graph.hasSimilarDegreeSequence(g1, g2)) {
-                    return false;
-                }
-                // if we want to skip, just return true here.
-                // return true;
-                // Verify sequence by running DFS
-                var g1prefix = g1.graph().name;
-                var g2prefix = g2.graph().name;
-                var visited1 = {};
-                var visited2 = {};
-                var stack = [];
-                /**
-                 * push sources or successors into the stack
-                 * if the visiting pattern has been similar.
-                 */
-                function stackPushIfNotDifferent(n1, n2) {
-                    var sub1 = n1.substr(g1prefix.length), sub2 = n2.substr(g2prefix.length);
-                    /* tslint:disable */
-                    if (visited1[sub1] ^ visited2[sub1]) {
-                        console.warn('different visit pattern', '[' + g1prefix + ']', sub1, '[' + g2prefix + ']', sub2);
-                        return true;
-                    }
-                    /* tslint:enable */
-                    if (!visited1[sub1]) {
-                        visited1[sub1] = visited2[sub2] = true;
-                        stack.push({ n1: n1, n2: n2 });
-                    }
-                    return false;
-                }
-                // check if have same # of sources then sort and push
-                var sources1 = g1.sources();
-                var sources2 = g2.sources();
-                if (sources1.length !== sources2.length) {
-                    /* tslint:disable */
-                    console.log('different source length');
-                    /* tslint:enable */
-                    return false;
-                }
-                sources1 = sortNodes(sources1, g1, g1prefix);
-                sources2 = sortNodes(sources2, g2, g2prefix);
-                for (var i = 0; i < sources1.length; i++) {
-                    var different = stackPushIfNotDifferent(sources1[i], sources2[i]);
-                    if (different) {
-                        return false;
-                    }
-                }
-                while (stack.length > 0) {
-                    var cur = stack.pop();
-                    // check node
-                    var similar = isSimilarNode(g1.node(cur.n1), g2.node(cur.n2));
-                    if (!similar) {
-                        return false;
-                    }
-                    // check if have same # of successors then sort and push
-                    var succ1 = g1.successors(cur.n1), succ2 = g2.successors(cur.n2);
-                    if (succ1.length !== succ2.length) {
-                        /* tslint:disable */
-                        console.log('# of successors mismatch', succ1, succ2);
-                        /* tslint:enable */
-                        return false;
-                    }
-                    succ1 = sortNodes(succ1, g1, g1prefix);
-                    succ2 = sortNodes(succ2, g2, g2prefix);
-                    for (var j = 0; j < succ1.length; j++) {
-                        var different = stackPushIfNotDifferent(succ1[j], succ2[j]);
-                        if (different) {
-                            return false;
-                        }
-                    }
-                }
-                return true;
-            }
-            /**
-             * Returns if two nodes have identical structure.
-             */
-            function isSimilarNode(n1, n2) {
-                if (n1.type === graph_1.NodeType.META) {
-                    // compare metanode
-                    var metanode1 = n1;
-                    var metanode2 = n2;
-                    return metanode1.templateId && metanode2.templateId &&
-                        metanode1.templateId === metanode2.templateId;
-                }
-                else if (n1.type === graph_1.NodeType.OP && n2.type === graph_1.NodeType.OP) {
-                    // compare leaf node
-                    return n1.op === n2.op;
-                }
-                else if (n1.type === graph_1.NodeType.SERIES && n2.type === graph_1.NodeType.SERIES) {
-                    // compare series node sizes and operations
-                    // (only need to check one op as all op nodes are identical in series)
-                    var sn1 = n1;
-                    var sn2 = n2;
-                    var seriesnode1Count = sn1.metagraph.nodeCount();
-                    return (seriesnode1Count === sn2.metagraph.nodeCount() &&
-                        (seriesnode1Count === 0 ||
-                            (sn1.metagraph.node(sn1.metagraph.nodes()[0]).op ===
-                                sn2.metagraph.node(sn2.metagraph.nodes()[0]).op)));
-                }
-                return false;
-            }
-        })(template = graph_1.template || (graph_1.template = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {}));
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/**
- * @fileoverview Utility functions for the tensorflow graph visualizer.
- */
-var tf;
-(function (tf) {
-    var graph;
-    (function (graph) {
-        var util;
-        (function (util) {
-            /**
-             * Recommended delay (ms) when running an expensive task asynchronously
-             * that gives enough time for the progress bar to update its UI.
-             */
-            var ASYNC_TASK_DELAY = 20;
-            function time(msg, task) {
-                var start = Date.now();
-                var result = task();
-                /* tslint:disable */
-                console.log(msg, ':', Date.now() - start, 'ms');
-                /* tslint:enable */
-                return result;
-            }
-            util.time = time;
-            /**
-             * Creates a tracker that sets the progress property of the
-             * provided polymer component. The provided component must have
-             * a property called 'progress' that is not read-only. The progress
-             * property is an object with a numerical 'value' property and a
-             * string 'msg' property.
-             */
-            function getTracker(polymerComponent) {
-                return {
-                    setMessage: function (msg) {
-                        polymerComponent.set('progress', { value: polymerComponent.progress.value, msg: msg });
-                    },
-                    updateProgress: function (value) {
-                        polymerComponent.set('progress', {
-                            value: polymerComponent.progress.value + value,
-                            msg: polymerComponent.progress.msg
-                        });
-                    },
-                    reportError: function (msg, err) {
-                        // Log the stack trace in the console.
-                        console.error(err.stack);
-                        // And send a user-friendly message to the UI.
-                        polymerComponent.set('progress', { value: polymerComponent.progress.value, msg: msg, error: true });
-                    },
-                };
-            }
-            util.getTracker = getTracker;
-            /**
-             * Creates a tracker for a subtask given the parent tracker, the total
-             * progress
-             * of the subtask and the subtask message. The parent task should pass a
-             * subtracker to its subtasks. The subtask reports its own progress which
-             * becames relative to the main task.
-             */
-            function getSubtaskTracker(parentTracker, impactOnTotalProgress, subtaskMsg) {
-                return {
-                    setMessage: function (progressMsg) {
-                        // The parent should show a concatenation of its message along with
-                        // its subtask tracker message.
-                        parentTracker.setMessage(subtaskMsg + ': ' + progressMsg);
-                    },
-                    updateProgress: function (incrementValue) {
-                        // Update the parent progress relative to the child progress.
-                        // For example, if the sub-task progresses by 30%, and the impact on the
-                        // total progress is 50%, then the task progresses by 30% * 50% = 15%.
-                        parentTracker.updateProgress(incrementValue * impactOnTotalProgress / 100);
-                    },
-                    reportError: function (msg, err) {
-                        // The parent should show a concatenation of its message along with
-                        // its subtask error message.
-                        parentTracker.reportError(subtaskMsg + ': ' + msg, err);
-                    }
-                };
-            }
-            util.getSubtaskTracker = getSubtaskTracker;
-            /**
-             * Runs an expensive task and return the result.
-             */
-            function runTask(msg, incProgressValue, task, tracker) {
-                // Update the progress message to say the current running task.
-                tracker.setMessage(msg);
-                // Run the expensive task with a delay that gives enough time for the
-                // UI to update.
-                try {
-                    var result = tf.graph.util.time(msg, task);
-                    // Update the progress value.
-                    tracker.updateProgress(incProgressValue);
-                    // Return the result to be used by other tasks.
-                    return result;
-                }
-                catch (e) {
-                    // Errors that happen inside asynchronous tasks are
-                    // reported to the tracker using a user-friendly message.
-                    tracker.reportError('Failed ' + msg, e);
-                }
-            }
-            util.runTask = runTask;
-            /**
-             * Runs an expensive task asynchronously and returns a promise of the result.
-             */
-            function runAsyncTask(msg, incProgressValue, task, tracker) {
-                return new Promise(function (resolve, reject) {
-                    // Update the progress message to say the current running task.
-                    tracker.setMessage(msg);
-                    // Run the expensive task with a delay that gives enough time for the
-                    // UI to update.
-                    setTimeout(function () {
-                        try {
-                            var result = tf.graph.util.time(msg, task);
-                            // Update the progress value.
-                            tracker.updateProgress(incProgressValue);
-                            // Return the result to be used by other tasks.
-                            resolve(result);
-                        }
-                        catch (e) {
-                            // Errors that happen inside asynchronous tasks are
-                            // reported to the tracker using a user-friendly message.
-                            tracker.reportError('Failed ' + msg, e);
-                        }
-                    }, ASYNC_TASK_DELAY);
-                });
-            }
-            util.runAsyncTask = runAsyncTask;
-            /**
-             * Asynchronously runs an expensive task that returns a promise. Updates the
-             * tracker's progress after the promise resolves. Returns a new promise that
-             * resolves after the progress is updated.
-             */
-            function runAsyncPromiseTask(msg, incProgressValue, task, tracker) {
-                return new Promise(function (resolve, reject) {
-                    var handleError = function (e) {
-                        // Errors that happen inside asynchronous tasks are
-                        // reported to the tracker using a user-friendly message.
-                        tracker.reportError('Failed ' + msg, e);
-                        reject(e);
-                    };
-                    // Update the progress message to say the current running task.
-                    tracker.setMessage(msg);
-                    // Run the expensive task with a delay that gives enough time for the
-                    // UI to update.
-                    setTimeout(function () {
-                        try {
-                            var start_1 = Date.now();
-                            task()
-                                .then(function (value) {
-                                /* tslint:disable */
-                                console.log(msg, ':', Date.now() - start_1, 'ms');
-                                // Update the progress value.
-                                tracker.updateProgress(incProgressValue);
-                                // Return the result to be used by other tasks.
-                                resolve(value);
-                            })
-                                .catch(handleError);
-                        }
-                        catch (e) {
-                            handleError(e);
-                        }
-                    }, ASYNC_TASK_DELAY);
-                });
-            }
-            util.runAsyncPromiseTask = runAsyncPromiseTask;
-            /**
-             * Returns a query selector with escaped special characters that are not
-             * allowed in a query selector.
-             */
-            function escapeQuerySelector(querySelector) {
-                return querySelector.replace(/([:.\[\],/\\\(\)])/g, '\\$1');
-            }
-            util.escapeQuerySelector = escapeQuerySelector;
-            // For unit conversion.
-            util.MEMORY_UNITS = [
-                // Atomic unit.
-                { symbol: 'B' },
-                // numUnits specifies how many previous units this unit contains.
-                { symbol: 'KB', numUnits: 1024 }, { symbol: 'MB', numUnits: 1024 },
-                { symbol: 'GB', numUnits: 1024 }, { symbol: 'TB', numUnits: 1024 },
-                { symbol: 'PB', numUnits: 1024 }
-            ];
-            util.TIME_UNITS = [
-                // Atomic unit. Finest granularity in TensorFlow stat collection.
-                { symbol: 'µs' },
-                // numUnits specifies how many previous units this unit contains.
-                { symbol: 'ms', numUnits: 1000 }, { symbol: 's', numUnits: 1000 },
-                { symbol: 'min', numUnits: 60 }, { symbol: 'hr', numUnits: 60 },
-                { symbol: 'days', numUnits: 24 }
-            ];
-            /**
-             * Returns the human readable version of the unit.
-             * (e.g. 1.35 GB, 23 MB, 34 ms, 6.53 min etc).
-             */
-            function convertUnitsToHumanReadable(value, units, unitIndex) {
-                unitIndex = unitIndex == null ? 0 : unitIndex;
-                if (unitIndex + 1 < units.length &&
-                    value >= units[unitIndex + 1].numUnits) {
-                    return tf.graph.util.convertUnitsToHumanReadable(value / units[unitIndex + 1].numUnits, units, unitIndex + 1);
-                }
-                // toPrecision() has the tendency to return a number in scientific
-                // notation and (number - 0) brings it back to normal notation.
-                return (value.toPrecision(3) - 0) + ' ' + units[unitIndex].symbol;
-            }
-            util.convertUnitsToHumanReadable = convertUnitsToHumanReadable;
-            function hasDisplayableNodeStats(stats) {
-                if (stats &&
-                    (stats.totalBytes > 0 || stats.totalMicros > 0 || stats.outputSize)) {
-                    return true;
-                }
-                return false;
-            }
-            util.hasDisplayableNodeStats = hasDisplayableNodeStats;
-            /**
-             * Given a list of strings, it returns a new list of strings with the longest
-             * common prefix removed. If the common prefix is one of the strings in the
-             * list, it returns the original strings.
-             */
-            function removeCommonPrefix(strings) {
-                if (strings.length < 2) {
-                    return strings;
-                }
-                var index = 0;
-                var largestIndex = 0;
-                // Find the shortest name across all strings.
-                var minLength = _.min(_.map(strings, function (str) { return str.length; }));
-                var _loop_1 = function () {
-                    index++;
-                    var prefixes = _.map(strings, function (str) { return str.substring(0, index); });
-                    var allTheSame = prefixes.every(function (prefix, i) {
-                        return (i === 0 ? true : prefix === prefixes[i - 1]);
-                    });
-                    if (allTheSame) {
-                        if (index >= minLength) {
-                            return { value: strings };
-                        }
-                        largestIndex = index;
-                    }
-                    else {
-                        return "break";
-                    }
-                };
-                while (true) {
-                    var state_1 = _loop_1();
-                    if (typeof state_1 === "object")
-                        return state_1.value;
-                    if (state_1 === "break")
-                        break;
-                }
-                return _.map(strings, function (str) { return str.substring(largestIndex); });
-            }
-            util.removeCommonPrefix = removeCommonPrefix;
-            /**
-             * Given a queryString, aka ?foo=1&bar=2, return the object representation.
-             */
-            function getQueryParams(queryString) {
-                if (queryString.charAt(0) === '?') {
-                    queryString = queryString.slice(1);
-                }
-                var queryParams = _.chain(queryString.split('&'))
-                    .map(function (item) {
-                    if (item) {
-                        return item.split('=');
-                    }
-                })
-                    .compact()
-                    .value();
-                return _.object(queryParams);
-            }
-            util.getQueryParams = getQueryParams;
-        })(util = graph.util || (graph.util = {}));
-    })(graph = tf.graph || (tf.graph = {}));
-})(tf || (tf = {}));
-</script>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var tf;
-(function (tf) {
-    var scene;
-    (function (scene) {
-        /** Show minimap when the viewpoint area is less than X% of the whole area. */
-        var FRAC_VIEWPOINT_AREA = 0.8;
-        var Minimap = (function () {
-            /**
-             * Constructs a new minimap.
-             *
-             * @param svg The main svg element.
-             * @param zoomG The svg group used for panning and zooming the main svg.
-             * @param mainZoom The main zoom behavior.
-             * @param minimap The minimap container.
-             * @param maxWandH The maximum width/height for the minimap.
-             * @param labelPadding Padding in pixels due to the main graph labels.
-             */
-            function Minimap(svg, zoomG, mainZoom, minimap, maxWandH, labelPadding) {
-                var _this = this;
-                this.svg = svg;
-                this.labelPadding = labelPadding;
-                this.zoomG = zoomG;
-                this.mainZoom = mainZoom;
-                this.maxWandH = maxWandH;
-                var $minimap = d3.select(minimap);
-                // The minimap will have 2 main components: the canvas showing the content
-                // and an svg showing a rectangle of the currently zoomed/panned viewpoint.
-                var $minimapSvg = $minimap.select('svg');
-                // Make the viewpoint rectangle draggable.
-                var $viewpoint = $minimapSvg.select('rect');
-                var dragmove = function (d) {
-                    _this.viewpointCoord.x = d3.event.x;
-                    _this.viewpointCoord.y = d3.event.y;
-                    _this.updateViewpoint();
-                };
-                this.viewpointCoord = { x: 0, y: 0 };
-                var drag = d3.behavior.drag().origin(Object).on('drag', dragmove);
-                $viewpoint.datum(this.viewpointCoord).call(drag);
-                // Make the minimap clickable.
-                $minimapSvg.on('click', function () {
-                    if (d3.event.defaultPrevented) {
-                        // This click was part of a drag event, so suppress it.
-                        return;
-                    }
-                    // Update the coordinates of the viewpoint.
-                    var width = Number($viewpoint.attr('width'));
-                    var height = Number($viewpoint.attr('height'));
-                    var clickCoords = d3.mouse($minimapSvg.node());
-                    _this.viewpointCoord.x = clickCoords[0] - width / 2;
-                    _this.viewpointCoord.y = clickCoords[1] - height / 2;
-                    _this.updateViewpoint();
-                });
-                this.viewpoint = $viewpoint.node();
-                this.minimapSvg = $minimapSvg.node();
-                this.minimap = minimap;
-                this.canvas = $minimap.select('canvas.first').node();
-                this.canvasBuffer =
-                    $minimap.select('canvas.second').node();
-                this.downloadCanvas =
-                    $minimap.select('canvas.download').node();
-                d3.select(this.downloadCanvas).style('display', 'none');
-                this.update();
-            }
-            /**
-             * Updates the position and the size of the viewpoint rectangle.
-             * It also notifies the main svg about the new panned position.
-             */
-            Minimap.prototype.updateViewpoint = function () {
-                // Update the coordinates of the viewpoint rectangle.
-                d3.select(this.viewpoint)
-                    .attr('x', this.viewpointCoord.x)
-                    .attr('y', this.viewpointCoord.y);
-                // Update the translation vector of the main svg to reflect the
-                // new viewpoint.
-                var mainX = -this.viewpointCoord.x * this.scaleMain / this.scaleMinimap;
-                var mainY = -this.viewpointCoord.y * this.scaleMain / this.scaleMinimap;
-                var zoomEvent = this.mainZoom.translate([mainX, mainY]).event;
-                d3.select(this.zoomG).call(zoomEvent);
-            };
-            /**
-             * Redraws the minimap. Should be called whenever the main svg
-             * was updated (e.g. when a node was expanded).
-             */
-            Minimap.prototype.update = function () {
-                var _this = this;
-                var sceneSize = null;
-                try {
-                    // Get the size of the entire scene.
-                    sceneSize = this.zoomG.getBBox();
-                    if (sceneSize.width === 0) {
-                        // There is no scene anymore. We have been detached from the dom.
-                        return;
-                    }
-                }
-                catch (e) {
-                    // Firefox produced NS_ERROR_FAILURE if we have been
-                    // detached from the dom.
-                    return;
-                }
-                var $download = d3.select('#graphdownload');
-                this.download = $download.node();
-                $download.on('click', function (d) {
-                    _this.download.href = _this.downloadCanvas.toDataURL('image/png');
-                });
-                var $svg = d3.select(this.svg);
-                // Read all the style rules in the document and embed them into the svg.
-                // The svg needs to be self contained, i.e. all the style rules need to be
-                // embedded so the canvas output matches the origin.
-                var stylesText = '';
-                for (var k = 0; k < document.styleSheets.length; k++) {
-                    try {
-                        var cssRules = document.styleSheets[k].cssRules ||
-                            document.styleSheets[k].rules;
-                        if (cssRules == null) {
-                            continue;
-                        }
-                        for (var i = 0; i < cssRules.length; i++) {
-                            // Remove tf-* selectors from the styles.
-                            stylesText +=
-                                cssRules[i].cssText.replace(/ ?tf-[\w-]+ ?/g, '') + '\n';
-                        }
-                    }
-                    catch (e) {
-                        if (e.name !== 'SecurityError') {
-                            throw e;
-                        }
-                    }
-                }
-                // Temporarily add the css rules to the main svg.
-                var svgStyle = $svg.append('style');
-                svgStyle.text(stylesText);
-                // Temporarily remove the zoom/pan transform from the main svg since we
-                // want the minimap to show a zoomed-out and centered view.
-                var $zoomG = d3.select(this.zoomG);
-                var zoomTransform = $zoomG.attr('transform');
-                $zoomG.attr('transform', null);
-                // Since we add padding, account for that here.
-                sceneSize.height += this.labelPadding * 2;
-                sceneSize.width += this.labelPadding * 2;
-                // Temporarily assign an explicit width/height to the main svg, since
-                // it doesn't have one (uses flex-box), but we need it for the canvas
-                // to work.
-                $svg.attr({
-                    width: sceneSize.width,
-                    height: sceneSize.height,
-                });
-                // Since the content inside the svg changed (e.g. a node was expanded),
-                // the aspect ratio have also changed. Thus, we need to update the scale
-                // factor of the minimap. The scale factor is determined such that both
-                // the width and height of the minimap are <= maximum specified w/h.
-                this.scaleMinimap =
-                    this.maxWandH / Math.max(sceneSize.width, sceneSize.height);
-                this.minimapSize = {
-                    width: sceneSize.width * this.scaleMinimap,
-                    height: sceneSize.height * this.scaleMinimap
-                };
-                // Update the size of the minimap's svg, the buffer canvas and the
-                // viewpoint rect.
-                d3.select(this.minimapSvg).attr(this.minimapSize);
-                d3.select(this.canvasBuffer).attr(this.minimapSize);
-                // Download canvas width and height are multiples of the style width and
-                // height in order to increase pixel density of the PNG for clarity.
-                d3.select(this.downloadCanvas).style({ width: sceneSize.width, height: sceneSize.height });
-                d3.select(this.downloadCanvas).attr({ width: sceneSize.width * 3, height: sceneSize.height * 3 });
-                if (this.translate != null && this.zoom != null) {
-                    // Update the viewpoint rectangle shape since the aspect ratio of the
-                    // map has changed.
-                    requestAnimationFrame(function () { return _this.zoom(); });
-                }
-                // Serialize the main svg to a string which will be used as the rendering
-                // content for the canvas.
-                var svgXml = (new XMLSerializer()).serializeToString(this.svg);
-                // Now that the svg is serialized for rendering, remove the temporarily
-                // assigned styles, explicit width and height and bring back the pan/zoom
-                // transform.
-                svgStyle.remove();
-                $svg.attr({
-                    width: null,
-                    height: null
-                });
-                $zoomG.attr('transform', zoomTransform);
-                var image = new Image();
-                image.onload = function () {
-                    // Draw the svg content onto the buffer canvas.
-                    var context = _this.canvasBuffer.getContext('2d');
-                    context.clearRect(0, 0, _this.canvasBuffer.width, _this.canvasBuffer.height);
-                    context.drawImage(image, 0, 0, _this.minimapSize.width, _this.minimapSize.height);
-                    requestAnimationFrame(function () {
-                        // Hide the old canvas and show the new buffer canvas.
-                        d3.select(_this.canvasBuffer).style('display', null);
-                        d3.select(_this.canvas).style('display', 'none');
-                        // Swap the two canvases.
-                        _a = [_this.canvasBuffer, _this.canvas], _this.canvas = _a[0], _this.canvasBuffer = _a[1];
-                        var _a;
-                    });
-                    var downloadContext = _this.downloadCanvas.getContext('2d');
-                    downloadContext.clearRect(0, 0, _this.downloadCanvas.width, _this.downloadCanvas.height);
-                    downloadContext.drawImage(image, 0, 0, _this.downloadCanvas.width, _this.downloadCanvas.height);
-                };
-                image.onerror = function () {
-                    var blob = new Blob([svgXml], { type: 'image/svg+xml;charset=utf-8' });
-                    image.src = URL.createObjectURL(blob);
-                };
-                image.src =
-                    'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svgXml);
-            };
-            /**
-             * Handles changes in zooming/panning. Should be called from the main svg
-             * to notify that a zoom/pan was performed and this minimap will update it's
-             * viewpoint rectangle.
-             *
-             * @param translate The translate vector, or none to use the last used one.
-             * @param scale The scaling factor, or none to use the last used one.
-             */
-            Minimap.prototype.zoom = function (translate, scale) {
-                if (this.scaleMinimap == null) {
-                    // Scene is not ready yet.
-                    return;
-                }
-                // Update the new translate and scale params, only if specified.
-                this.translate = translate || this.translate;
-                this.scaleMain = scale || this.scaleMain;
-                // Update the location of the viewpoint rectangle.
-                var svgRect = this.svg.getBoundingClientRect();
-                var $viewpoint = d3.select(this.viewpoint);
-                this.viewpointCoord.x = -this.translate[0] * this.scaleMinimap /
-                    this.scaleMain;
-                this.viewpointCoord.y = -this.translate[1] * this.scaleMinimap /
-                    this.scaleMain;
-                var viewpointWidth = svgRect.width * this.scaleMinimap / this.scaleMain;
-                var viewpointHeight = svgRect.height * this.scaleMinimap / this.scaleMain;
-                $viewpoint.attr({
-                    x: this.viewpointCoord.x,
-                    y: this.viewpointCoord.y,
-                    width: viewpointWidth,
-                    height: viewpointHeight
-                });
-                // Show/hide the minimap depending on the viewpoint area as fraction of the
-                // whole minimap.
-                var mapWidth = this.minimapSize.width;
-                var mapHeight = this.minimapSize.height;
-                var x = this.viewpointCoord.x;
-                var y = this.viewpointCoord.y;
-                var w = Math.min(Math.max(0, x + viewpointWidth), mapWidth) -
-                    Math.min(Math.max(0, x), mapWidth);
-                var h = Math.min(Math.max(0, y + viewpointHeight), mapHeight) -
-                    Math.min(Math.max(0, y), mapHeight);
-                var fracIntersect = (w * h) / (mapWidth * mapHeight);
-                if (fracIntersect < FRAC_VIEWPOINT_AREA) {
-                    this.minimap.classList.remove('hidden');
-                }
-                else {
-                    this.minimap.classList.add('hidden');
-                }
-            };
-            return Minimap;
-        }());
-        scene.Minimap = Minimap;
-    })(scene = tf.scene || (tf.scene = {}));
-})(tf || (tf = {})); // close module tf.scene
-</script>
-
-<dom-module id="tf-graph-minimap" assetpath="../tf-graph/">
-<template>
-<style>
-:host {
-  background-color:white;
-  transition: opacity .3s linear;
-  pointer-events: auto;
-}
-
-:host.hidden {
-  opacity: 0;
-  pointer-events: none;
-}
-
-canvas {
-  border: 1px solid #999;
-}
-
-rect {
-  fill: white;
-  stroke: #111111;
-  stroke-width: 1px;
-  fill-opacity: 0;
-  filter: url("#minimapDropShadow");
-  cursor: move;
-}
-
-svg {
-  position: absolute;
-}
-</style>
-<svg>
-  <defs>
-    <filter id="minimapDropShadow" x="-20%" y="-20%" width="150%" height="150%">
-      <feOffset result="offOut" in="SourceGraphic" dx="1" dy="1"></feOffset>
-      <feColorMatrix result="matrixOut" in="offOut" type="matrix" values="0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.5 0"></feColorMatrix>
-      <feGaussianBlur result="blurOut" in="matrixOut" stdDeviation="2"></feGaussianBlur>
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal"></feBlend>
-    </filter>
-  </defs>
-  <rect></rect>
-</svg>
-<canvas class="first"></canvas>
-
-<canvas class="second"></canvas>
-<canvas class="download"></canvas>
-</template>
-<script>
-Polymer({
-  is: 'tf-graph-minimap',
-
-  /**
-   * Initializes the minimap and returns a minimap object to notify when
-   * things update.
-   *
-   * @param svg The main svg element.
-   * @param zoomG The svg group used for panning and zooming the main svg.
-   * @param mainZoom The main zoom behavior.
-   * @param maxWandH The maximum width/height for the minimap.
-   * @param labelPadding Padding in pixels due to the main graph labels.
-   */
-  init: function(svg, zoomG, mainZoom, maxWAndH, labelPadding) {
-    return new tf.scene.Minimap(svg, zoomG, mainZoom, this, maxWAndH,
-        labelPadding);
-  }
-});
-</script>
-</dom-module>
-
-<dom-module id="tf-graph-scene" assetpath="../tf-graph/">
-<template>
-<style>
-:host {
-  display: flex;
-  width: 100%;
-  font-size: 20px;
-}
-
-::content #svg {
-  overflow: hidden;
-  flex: 1;
-  height: 100%;
-  width: 100%;
-}
-
-::content #hidden {
-  position: fixed;
-  top: 0px;
-  visibility: hidden;
-}
-
-/* --- Node and annotation-node for Metanode --- */
-
-::content .meta > .nodeshape > rect,
-::content .meta > .annotation-node > rect {
-  cursor: pointer;
-  fill: hsl(0, 0%, 70%);
-}
-
-::content .node.meta.highlighted > .nodeshape > rect,
-::content .node.meta.highlighted > .annotation-node > rect {
-  stroke-width: 2;
-}
-
-::content .annotation.meta.highlighted > .nodeshape > rect,
-::content .annotation.meta.highlighted > .annotation-node > rect {
-  stroke-width: 1;
-}
-
-::content .meta.selected > .nodeshape > rect,
-::content .meta.selected > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .node.meta.selected.expanded > .nodeshape > rect,
-::content .node.meta.selected.expanded > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 3;
-}
-
-::content .annotation.meta.selected > .nodeshape > rect,
-::content .annotation.meta.selected > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .node.meta.selected.expanded.highlighted > .nodeshape > rect,
-::content .node.meta.selected.expanded.highlighted > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 4;
-}
-
-::content .faded,
-::content .faded rect,
-::content .faded ellipse,
-::content .faded path,
-::content .faded use,
-::content #rectHatch line,
-::content #ellipseHatch line {
-  color: #e0d4b3 !important;
-  fill: white;
-  stroke: #e0d4b3 !important;
-}
-
-
-::content .faded path {
-  stroke-width: 1px !important;
-}
-
-::content .faded rect {
-  fill: url("#rectHatch") !important;
-}
-
-::content .faded ellipse,
-::content .faded use {
-  fill: url("#ellipseHatch") !important;
-}
-
-::content .faded text {
-  opacity: 0;
-}
-
-/* Rules used for input-tracing. */
-::content .input-highlight > * > rect,
-::content .input-highlight > * > ellipse,
-::content .input-highlight > * > use
-{
-  fill: white;
-  stroke: #ff9800 !important;
-}
-
-/*  - Faded non-input styling */
-::content .non-input > * > rect,
-::content .non-input > * > ellipse,
-::content .non-input > * > use,
-/* For Const nodes. */
-::content .non-input > * > .constant:not([class*="input-highlight"]) >
-  .annotation-node > ellipse,
-/* For styling of annotation nodes of non-input nodes. */
-::content .non-input > g > .annotation > .annotation-node > rect {
-  stroke: #e0d4b3 !important;
-  stroke-width: inherit;
-  stroke-dasharray: inherit;
-}
-
-
-::content .non-input path {
-  visibility: hidden;
-}
-
-::content .non-input > .nodeshape > rect,
-::content .non-input > .annotation-node > rect,
-/* For styling of annotation nodes of non-input nodes. */
-::content .non-input > g > .annotation > .annotation-node > rect
-{
-  fill: url("#rectHatch") !important;
-}
-
-::content .non-input ellipse,
-::content .non-input use {
-  fill: url("#ellipseHatch") !important;
-}
-
-::content .non-input > text {
-  opacity: 0;
-}
-
-::content .non-input .annotation > .annotation-edge {
-  marker-end: url("#annotation-arrowhead-faded");
-}
-
-::content .non-input .annotation > .annotation-edge.refline {
-  marker-start: url("#ref-annotation-arrowhead-faded");
-}
-
-/* Input edges. */
-::content .input-edge-highlight > text {
-  fill: black !important;
-}
-::content .input-edge-highlight > path,
-::content .input-highlight > .in-annotations > .annotation > .annotation-edge,
-::content .input-highlight-selected > .in-annotations > .annotation >
-.annotation-edge {
-  stroke: #999 !important;
-}
-
-/* Non-input edges. */
-::content .non-input-edge-highlight,
-::content .non-input > g > .annotation > path,
-/* Annotation styles (label and edges respectively). */
-::content .non-input > g >
-.annotation:not(.input-highlight):not(.input-highlight-selected) >
-.annotation-label
-/*.annotation-edge*/
-{
-  visibility: hidden;
-}
-
-/* --- Op Node --- */
-
-::content .op > .nodeshape > ellipse,
-::content .op > .annotation-node > ellipse {
-  cursor: pointer;
-  fill: #fff;
-  stroke: #ccc;
-}
-
-::content .op.selected > .nodeshape > ellipse,
-::content .op.selected > .annotation-node > ellipse {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .op.highlighted > .nodeshape > ellipse,
-::content .op.highlighted > .annotation-node > ellipse {
-  stroke-width: 2;
-}
-
-/* --- Series Node --- */
-
-/* By default, don't show the series background <rect>. */
-::content .series > .nodeshape > rect {
-  fill: hsl(0, 0%, 70%);
-  fill-opacity: 0;
-  stroke-dasharray: 5, 5;
-  stroke-opacity: 0;
-  cursor: pointer;
-}
-
-/* Once expanded, show the series background <rect> and hide the <use>. */
-::content .series.expanded > .nodeshape > rect {
-  fill-opacity: 0.15;
-  stroke: hsl(0, 0%, 70%);
-  stroke-opacity: 1;
-}
-::content .series.expanded > .nodeshape > use {
-  visibility: hidden;
-}
-
-/**
- * TODO(jimbo): Simplify this by applying a stable class name to all <g>
- * elements that currently have either the nodeshape or annotation-node classes.
- */
-::content .series > .nodeshape > use ,
-::content .series > .annotation-node > use {
-  stroke: #ccc;
-}
-::content .series.highlighted > .nodeshape > use ,
-::content .series.highlighted > .annotation-node > use {
-  stroke-width: 2;
-}
-::content .series.selected > .nodeshape > use ,
-::content .series.selected > .annotation-node > use {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .series.selected > .nodeshape > rect {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .annotation.series.selected > .annotation-node > use {
-  stroke: red;
-  stroke-width: 2;
-}
-
-/* --- Bridge Node --- */
-::content .bridge > .nodeshape > rect {
-  stroke: #f0f;
-  opacity: 0.2;
-  display: none;
-}
-
-/* --- Structural Elements --- */
-::content .edge > path.edgeline.structural {
-  stroke: #f0f;
-  opacity: 0.2;
-  display: none;
-}
-
-/* --- Series Nodes --- */
-
-/* Hide the rect for a series' annotation. */
-::content .series > .annotation-node > rect {
-  display: none;
-}
-
-/* --- Node label --- */
-
-
-::content .node > text.nodelabel {
-  cursor: pointer;
-  fill: #444;
-}
-
-::content .meta.expanded > text.nodelabel {
-  font-size: 9px;
-}
-
-::content .series > text.nodelabel {
-  font-size: 8px;
-}
-
-::content .op > text.nodelabel {
-  font-size: 6px;
-}
-
-::content .bridge > text.nodelabel {
-  display: none;
-}
-
-::content .node.meta.expanded > text.nodelabel{
-  cursor: normal;
-}
-
-::content .annotation.meta.highlighted > text.annotation-label {
-  fill: #50A3F7;
-}
-
-::content .annotation.meta.selected > text.annotation-label {
-  fill: #4285F4;
-}
-
-/* --- Annotation --- */
-
-/* only applied for annotations that are not summary or constant.
-(.summary, .constant gets overriden below) */
-::content .annotation > .annotation-node > * {
-  stroke-width: 0.5;
-  stroke-dasharray: 1, 1;
-}
-
-::content .annotation.summary > .annotation-node > *,
-::content .annotation.constant > .annotation-node > * {
-  stroke-width: 1;
-  stroke-dasharray: none;
-}
-
-::content .annotation > .annotation-edge {
-  fill: none;
-  stroke: #aaa;
-  stroke-width: 0.5;
-  marker-end: url("#annotation-arrowhead");
-}
-
-::content .faded .annotation > .annotation-edge {
-  marker-end: url("#annotation-arrowhead-faded");
-}
-
-::content .annotation > .annotation-edge.refline {
-  marker-start: url("#ref-annotation-arrowhead");
-}
-
-::content .faded .annotation > .annotation-edge.refline {
-  marker-start: url("#ref-annotation-arrowhead-faded");
-}
-
-::content .annotation > .annotation-control-edge {
-  stroke-dasharray: 1, 1;
-}
-
-::content #annotation-arrowhead {
-  fill: #aaa;
-}
-
-::content #annotation-arrowhead-faded {
-  fill: #e0d4b3;
-}
-
-::content #ref-annotation-arrowhead {
-  fill: #aaa;
-}
-
-::content #ref-annotation-arrowhead-faded {
-  fill: #e0d4b3;
-}
-
-::content .annotation > .annotation-label {
-  font-size: 5px;
-  cursor: pointer;
-}
-::content .annotation > .annotation-label.annotation-ellipsis {
-  cursor: default;
-}
-
-/* Hide annotations on expanded meta nodes since they're redundant. */
-::content .expanded > .in-annotations,
-::content .expanded > .out-annotations {
-  display: none;
-}
-
-/* --- Annotation: Constant --- */
-
-::content .constant > .annotation-node > ellipse {
-  cursor: pointer;
-  fill: white;
-  stroke: #848484;
-}
-
-::content .constant.selected > .annotation-node > ellipse {
-  fill: white;
-  stroke: red;
-}
-
-::content .constant.highlighted > .annotation-node > ellipse {
-  stroke-width: 1.5;
-}
-
-/* --- Annotation: Summary --- */
-
-::content .summary > .annotation-node > ellipse {
-  cursor: pointer;
-  fill: #DB4437;
-  stroke: #DB4437;
-}
-
-::content .summary.selected > .annotation-node > ellipse {
-  fill: #A52714;
-  stroke: #A52714;
-}
-
-::content .summary.highlighted > .annotation-node > ellipse {
-  stroke-width: 1.5;
-}
-
-/* --- Edge --- */
-
-::content .edge > path.edgeline {
-  fill: none;
-  stroke: #bbb;
-  stroke-linecap: round;
-  stroke-width: 0.75;
-}
-
-/* Labels showing tensor shapes on edges */
-::content .edge > text {
-  font-size: 3.5px;
-  fill: #666;
-}
-
-::content .ref-arrowhead {
-  fill: #bbb;
-}
-
-::content .edge .control-dep {
-  stroke-dasharray: 2, 2;
-}
-
-/* --- Group node expand/collapse button --- */
-
-/* Hides expand/collapse buttons when a node isn't expanded or highlighted. Using
-   incredibly small opacity so that the bounding box of the <g> parent still takes
-   this container into account even when it isn't visible */
-::content .node:not(.highlighted):not(.expanded) > .nodeshape > .buttoncontainer {
-  opacity: 0.01;
-}
-::content .node.highlighted > .nodeshape > .buttoncontainer {
-  cursor: pointer;
-}
-::content .buttoncircle {
-  fill: #E7811D;
-}
-::content .buttoncircle:hover {
-  fill: #B96717;
-}
-::content .expandbutton,
-::content .collapsebutton {
-  stroke: white;
-}
-/* Do not let the path elements in the button take pointer focus */
-::content .node > .nodeshape > .buttoncontainer > .expandbutton,
-::content .node > .nodeshape > .buttoncontainer > .collapsebutton {
-  pointer-events: none;
-}
-/* Only show the expand button when a node is collapsed and only show the
-   collapse button when a node is expanded. */
-::content .node.expanded > .nodeshape > .buttoncontainer > .expandbutton {
-  display: none;
-}
-::content .node:not(.expanded) > .nodeshape > .buttoncontainer > .collapsebutton {
-  display: none;
-}
-
-::content .health-pill-stats {
-  font-size: 4px;
-  text-anchor: middle;
-}
-
-::content .health-pill rect {
-  filter: url("#health-pill-shadow");
-  rx: 3;
-  ry: 3;
-}
-
-.titleContainer {
-  position: relative;
-  top: 20px;
-}
-
-.title {
-  position: absolute;
-}
-
-.auxTitle {
-  position: absolute;
-}
-
-#minimap {
-  position: absolute;
-  right: 20px;
-  bottom: 20px;
-}
-</style>
-<div class="titleContainer">
-  <div id="title" class="title">Main Graph</div>
-  <div id="auxTitle" class="auxTitle">Auxiliary Nodes</div>
-</div>
-<svg id="svg">
-  <defs>
-
-    
-    <path id="ref-arrowhead-path" d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"></path>
-    <marker class="ref-arrowhead" id="ref-arrowhead-small" viewBox="0 0 10 10" markerWidth="10" markerHeight="10" refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path"></use>
-    </marker>
-    <marker class="ref-arrowhead" id="ref-arrowhead-medium" viewBox="0 0 10 10" markerWidth="13" markerHeight="13" refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path"></use>
-    </marker>
-    <marker class="ref-arrowhead" id="ref-arrowhead-large" viewBox="0 0 10 10" markerWidth="16" markerHeight="16" refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path"></use>
-    </marker>
-    <marker class="ref-arrowhead" id="ref-arrowhead-xlarge" viewBox="0 0 10 10" markerWidth="20" markerHeight="20" refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path"></use>
-    </marker>
-
-    
-    <marker id="annotation-arrowhead" markerWidth="5" markerHeight="5" refX="5" refY="2.5" orient="auto">
-      <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"></path>
-    </marker>
-    <marker id="annotation-arrowhead-faded" markerWidth="5" markerHeight="5" refX="5" refY="2.5" orient="auto">
-      <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"></path>
-    </marker>
-    <marker id="ref-annotation-arrowhead" markerWidth="5" markerHeight="5" refX="0" refY="2.5" orient="auto">
-      <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"></path>
-    </marker>
-    <marker id="ref-annotation-arrowhead-faded" markerWidth="5" markerHeight="5" refX="0" refY="2.5" orient="auto">
-      <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"></path>
-    </marker>
-    
-    <ellipse id="op-node-stamp" rx="7.5" ry="3" stroke="inherit" fill="inherit"></ellipse>
-    
-    <ellipse id="op-node-annotation-stamp" rx="5" ry="2" stroke="inherit" fill="inherit"></ellipse>
-    
-    <g id="op-series-vertical-stamp">
-      <use xlink:href="#op-node-stamp" x="8" y="9"></use>
-      <use xlink:href="#op-node-stamp" x="8" y="6"></use>
-      <use xlink:href="#op-node-stamp" x="8" y="3"></use>
-    </g>
-    
-    <g id="op-series-horizontal-stamp">
-      <use xlink:href="#op-node-stamp" x="16" y="4"></use>
-      <use xlink:href="#op-node-stamp" x="12" y="4"></use>
-      <use xlink:href="#op-node-stamp" x="8" y="4"></use>
-    </g>
-    
-    <g id="op-series-annotation-stamp">
-      <use xlink:href="#op-node-annotation-stamp" x="9" y="2"></use>
-      <use xlink:href="#op-node-annotation-stamp" x="7" y="2"></use>
-      <use xlink:href="#op-node-annotation-stamp" x="5" y="2"></use>
-    </g>
-    <svg id="summary-icon" fill="#848484" height="12" viewBox="0 0 24 24" width="12">
-      <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"></path>
-    </svg>
-    
-    <g id="linearGradients"></g>
-
-    
-    <pattern id="rectHatch" patternTransform="rotate(45 0 0)" width="5" height="5" patternUnits="userSpaceOnUse">
-      <line x1="0" y1="0" x2="0" y2="5" style="stroke-width: 1"></line>
-    </pattern>
-    <pattern id="ellipseHatch" patternTransform="rotate(45 0 0)" width="2" height="2" patternUnits="userSpaceOnUse">
-      <line x1="0" y1="0" x2="0" y2="2" style="stroke-width: 1"></line>
-    </pattern>
-
-    
-    <filter id="health-pill-shadow" x="-40%" y="-40%" width="180%" height="180%">
-      <feGaussianBlur in="SourceAlpha" stdDeviation="0.8"></feGaussianBlur>
-      <feOffset dx="0" dy="0" result="offsetblur"></feOffset>
-      <feFlood flood-color="#000000"></feFlood>
-      <feComposite in2="offsetblur" operator="in"></feComposite>
-      <feMerge>
-        <feMergeNode></feMergeNode>
-        <feMergeNode in="SourceGraphic"></feMergeNode>
-      </feMerge>
-    </filter>
-  </defs>
-  
-  <rect fill="white" width="10000" height="10000"></rect>
-  <g id="root"></g>
-</svg>
-<tf-graph-minimap id="minimap"></tf-graph-minimap>
-</template>
-<script>
-Polymer({
-  is: 'tf-graph-scene',
-  properties: {
-    renderHierarchy: Object,
-    name: String,
-    colorBy: String,
-
-    // For each render hierarchy, we only fit it to the viewport once (when the scene is attached to
-    // the DOM). We do not fit the hierarchy again (unless the user clicks the reset button). For
-    // instance, if the user enters a certain view in the graph, switches to another dashboard, and
-    // returns to the graph dashboard, the user expects the previous view. These properties enable
-    // that behavior.
-
-    /** Whether the scene has fit the current render hierarchy (to the viewport) at least once. */
-    _hasRenderHierarchyBeenFitOnce: Boolean,
-    /** Whether this scene element is currently attached to a parent element. */
-    _isAttached: Boolean,
-
-    /** @type {d3_zoom} d3 zoom object */
-    _zoom: Object,
-    highlightedNode: {
-      type: String,
-      observer: '_highlightedNodeChanged'
-    },
-    selectedNode: {
-      type: String,
-      observer: '_selectedNodeChanged'
-    },
-    /** Keeps track of if the graph has been zoomed/panned since loading */
-    _zoomed: {
-      type: Boolean,
-      observer: '_onZoomChanged',
-      value: false
-    },
-    /** Keeps track of the starting coordinates of a graph zoom/pan */
-    _zoomStartCoords: {
-      type: Array,
-      value: null
-    },
-    /** Keeps track of the current coordinates of a graph zoom/pan */
-    _zoomCoords: {
-      type: Array,
-      value: null
-    },
-    /** Maximum distance of a zoom event for it to be interpreted as a click */
-    _maxZoomDistanceForClick: {
-      type: Number,
-      value: 20
-    },
-    /**
-     * @type {d3.scale.ordinal}
-     * Scale mapping from template name to a number between 0 and N-1
-     * where N is the number of different template names. Used by
-     * tf.graph.scene.node when computing node color by structure.
-     */
-    templateIndex: Function,
-    /**
-     * @type {tf.scene.Minimap}
-     * A minimap object to notify for zoom events.
-     */
-    minimap: Object,
-    /*
-     * Dictionary for easily stylizing nodes when state changes.
-     * _nodeGroupIndex[nodeName] = d3_selection of the nodeGroup
-     */
-    _nodeGroupIndex: {
-      type: Object,
-      value: function() { return {}; }
-    },
-    /*
-     * Dictionary for easily stylizing annotation nodes when state changes.
-     * _annotationGroupIndex[nodeName][hostNodeName] =
-     *   d3_selection of the annotationGroup
-     */
-    _annotationGroupIndex: {
-      type: Object,
-      value: function() { return {}; }
-    },
-    /*
-     * Dictionary for easily stylizing edges when state changes.
-     * _edgeGroupIndex[edgeName] = d3_selection of the edgeGroup
-     */
-    _edgeGroupIndex: {
-      type: Object,
-      value: function() { return {}; }
-    },
-    /**
-     * Max font size for metanode label strings.
-     */
-    maxMetanodeLabelLengthFontSize: {
-      type: Number,
-      value: 9
-    },
-    /**
-     * Min font size for metanode label strings.
-     */
-    minMetanodeLabelLengthFontSize: {
-      type: Number,
-      value: 6
-    },
-    /**
-     * Metanode label strings longer than this are given smaller fonts.
-     */
-    maxMetanodeLabelLengthLargeFont: {
-      type: Number,
-      value: 11
-    },
-    /**
-     * Metanode label strings longer than this are truncated with ellipses.
-     */
-    maxMetanodeLabelLength: {
-      type: Number,
-      value: 18
-    },
-    progress: Object,
-    // A mapping between node name to the tf.graph.scene.HealthPill to render.
-    nodeNamesToHealthPills: Object,
-    // The step of health pills to show throughout the graph.
-    healthPillStepIndex: Number,
-  },
-  observers: [
-    '_colorByChanged(colorBy)',
-    '_renderHierarchyChanged(renderHierarchy)',
-    // Animation and fitting must come after the observer for the hierarchy changing because we must
-    // first build the render hierarchy.
-    '_animateAndFit(_isAttached, renderHierarchy)',
-    '_updateHealthPills(nodeNamesToHealthPills, healthPillStepIndex)',
-  ],
-  getNode: function(nodeName) {
-    return this.renderHierarchy.getRenderNodeByName(nodeName);
-  },
-  isNodeExpanded: function(node) {
-    return node.expanded;
-  },
-  setNodeExpanded: function(renderNode) {
-    this._build(this.renderHierarchy);
-    this._updateLabels(!this._zoomed);
-  },
-  /**
-   * Resets the state of the component. Called whenever the whole graph
-   * (dataset) changes.
-   */
-  _resetState: function() {
-    // Reset the state of the component.
-    this._nodeGroupIndex = {};
-    this._annotationGroupIndex = {};
-    this._edgeGroupIndex = {};
-    this._updateLabels(false);
-    // Remove all svg elements under the 'root' svg group.
-    d3.select(this.$.svg).select('#root').selectAll('*').remove();
-    // And the defs.
-    d3.select(this.$.svg).select('defs #linearGradients')
-        .selectAll('*').remove();
-  },
-  /** Main method for building the scene */
-  _build: function(renderHierarchy) {
-    this.templateIndex = renderHierarchy.hierarchy.getTemplateIndex();
-    tf.graph.util.time('tf-graph-scene (layout):', function() {
-      // layout the scene for this meta / series node
-      tf.graph.layout.layoutScene(renderHierarchy.root, this);
-    }.bind(this));
-
-    tf.graph.util.time('tf-graph-scene (build scene):', function() {
-      tf.graph.scene.buildGroup(d3.select(this.$.root), renderHierarchy.root, this);
-      tf.graph.scene.addGraphClickListener(this.$.svg, this);
-      tf.graph.scene.node.traceInputs(renderHierarchy);
-    }.bind(this));
-    // Update the minimap again when the graph is done animating.
-    setTimeout(function() {
-      this._updateHealthPills(this.nodeNamesToHealthPills, this.healthPillStepIndex);
-      this.minimap.update();
-    }.bind(this), tf.graph.layout.PARAMS.animation.duration);
-  },
-  ready: function() {
-    this._zoom = d3.behavior.zoom()
-      .on('zoomend', function() {
-        if (this._zoomStartCoords) {
-          // Calculate the total distance dragged during the zoom event.
-          // If it is sufficiently small, then fire an event indicating
-          // that zooming has ended. Otherwise wait to fire the zoom end
-          // event, so that a mouse click registered as part of this zooming
-          // is ignored (as this mouse click was part of a zooming, and should
-          // not be used to indicate an actual click on the graph).
-          var dragDistance = Math.sqrt(
-            Math.pow(this._zoomStartCoords[0] - this._zoomCoords[0], 2) +
-            Math.pow(this._zoomStartCoords[1] - this._zoomCoords[1], 2));
-          if (dragDistance < this._maxZoomDistanceForClick) {
-            this._fireEnableClick();
-          } else {
-            setTimeout(this._fireEnableClick.bind(this), 50);
-          }
-        }
-        this._zoomStartCoords = null;
-      }.bind(this))
-      .on('zoom', function() {
-        // Store the coordinates of the zoom event
-        this._zoomCoords = d3.event.translate;
-
-        // If this is the first zoom event after a zoom-end, then
-        // store the coordinates as the start coordinates as well,
-        // and fire an event to indicate that zooming has started.
-        // This doesn't use the zoomstart event, as d3 sends this
-        // event on mouse-down, even if there has been no dragging
-        // done to translate the graph around.
-        if (!this._zoomStartCoords) {
-          this._zoomStartCoords = this._zoomCoords.slice();
-          this.fire('disable-click');
-        }
-        this._zoomed = true;
-        d3.select(this.$.root).attr('transform',
-                    'translate(' + d3.event.translate + ')' +
-                    'scale(' + d3.event.scale + ')');
-        // Notify the minimap.
-        this.minimap.zoom(d3.event.translate, d3.event.scale);
-      }.bind(this));
-    d3.select(this.$.svg).call(this._zoom)
-      .on('dblclick.zoom', null);
-    d3.select(window).on('resize', function() {
-      // Notify the minimap that the user's window was resized.
-      // The minimap will figure out the new dimensions of the main svg
-      // and will use the existing translate and scale params.
-      this.minimap.zoom();
-    }.bind(this));
-    // Initialize the minimap.
-    this.minimap = this.$.minimap.init(this.$.svg, this.$.root, this._zoom,
-        tf.graph.layout.PARAMS.minimap.size,
-        tf.graph.layout.PARAMS.subscene.meta.labelHeight);
-  },
-  attached: function() {
-    this.set('_isAttached', true);
-  },
-  detached: function() {
-    this.set('_isAttached', false);
-  },
-  _renderHierarchyChanged: function(renderHierarchy) {
-    this._hasRenderHierarchyBeenFitOnce = false;
-    this._resetState();
-    this._build(renderHierarchy);
-  },
-  _animateAndFit: function(isAttached, renderHierarchy) {
-    if (this._hasRenderHierarchyBeenFitOnce || !isAttached) {
-      // Do not animate and fit if the scene has already fitted this render hierarchy once. Or if
-      // the graph dashboard is not attached (in which case the scene lacks DOM info for fitting).
-      return;
-    }
-
-    // Fit to screen after the graph is done animating.
-    setTimeout(this.fit.bind(this), tf.graph.layout.PARAMS.animation.duration);
-  },
-  _updateLabels: function(showLabels) {
-    var mainGraphTitleElement = this.getElementsByClassName('title')[0];
-    var titleStyle = mainGraphTitleElement.style;
-    var auxTitleStyle = this.getElementsByClassName('auxTitle')[0].style;
-    var core = d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
-      tf.graph.scene.Class.Scene.CORE)[0][0];
-    // Only show labels if the graph is fully loaded.
-    if (showLabels && core && this.progress && this.progress.value === 100) {
-      var aux =
-        d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
-          tf.graph.scene.Class.Scene.INEXTRACT)[0][0] ||
-        d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
-          tf.graph.scene.Class.Scene.OUTEXTRACT)[0][0];
-      var coreX = core.getCTM().e;
-      var auxX = aux ? aux.getCTM().e : null;
-      titleStyle.display = 'inline';
-      titleStyle.left = coreX + 'px';
-      if (auxX !== null && auxX !== coreX) {
-        auxTitleStyle.display = 'inline';
-
-        // Make sure that the aux title is positioned rightwards enough so as to
-        // prevent overlap with the main graph title.
-        auxX = Math.max(
-            coreX + mainGraphTitleElement.getBoundingClientRect().width, auxX);
-
-        auxTitleStyle.left = auxX + 'px';
-      } else {
-        auxTitleStyle.display = 'none';
-      }
-    } else {
-      titleStyle.display='none';
-      auxTitleStyle.display = 'none';
-    }
-  },
-  /**
-    * Called whenever the user changed the 'color by' option in the
-    * UI controls.
-    */
-  _colorByChanged: function() {
-    if (this.renderHierarchy != null) {
-      // We iterate through each svg node and update its state.
-      _.each(this._nodeGroupIndex, function(nodeGroup, nodeName) {
-        this._updateNodeState(nodeName);
-      }, this);
-      // Notify also the minimap.
-      this.minimap.update();
-    }
-  },
-  fit: function() {
-    this._hasRenderHierarchyBeenFitOnce = true;
-    tf.graph.scene.fit(this.$.svg, this.$.root, this._zoom, function() {
-      this._zoomed = false;
-    }.bind(this));
-  },
-  isNodeSelected: function(n) {
-    return n === this.selectedNode;
-  },
-  isNodeHighlighted: function(n) {
-    return n === this.highlightedNode;
-  },
-  addAnnotationGroup: function(a, d, selection) {
-    var an = a.node.name;
-    this._annotationGroupIndex[an] = this._annotationGroupIndex[an] || {};
-    this._annotationGroupIndex[an][d.node.name] = selection;
-  },
-  getAnnotationGroupsIndex: function(a) {
-    return this._annotationGroupIndex[a];
-  },
-  removeAnnotationGroup: function(a, d) {
-    delete this._annotationGroupIndex[a.node.name][d.node.name];
-  },
-  addNodeGroup: function(n, selection) {
-    this._nodeGroupIndex[n] = selection;
-  },
-  getNodeGroup: function(n) {
-    return this._nodeGroupIndex[n];
-  },
-  removeNodeGroup: function(n) {
-    delete this._nodeGroupIndex[n];
-  },
-  addEdgeGroup: function(n, selection) {
-    this._edgeGroupIndex[e] = selection;
-  },
-  getEdgeGroup: function(e) {
-    return this._edgeGroupIndex[e];
-  },
-  _updateHealthPills: function(nodeNamesToHealthPills, healthPillStepIndex) {
-    tf.graph.scene.addHealthPills(
-        this.$.svg, nodeNamesToHealthPills, healthPillStepIndex);
-  },
-  /**
-   * Update node and annotation node of the given name.
-   * @param  {String} n node name
-   */
-  _updateNodeState: function(n) {
-    var node = this.getNode(n);
-    var nodeGroup = this.getNodeGroup(n);
-
-    if (nodeGroup) {
-      tf.graph.scene.node.stylize(nodeGroup, node, this);
-    }
-
-    var annotationGroupIndex = this.getAnnotationGroupsIndex(n);
-    _.each(annotationGroupIndex, function(aGroup, hostName) {
-      tf.graph.scene.node.stylize(aGroup, node, this,
-          tf.graph.scene.Class.Annotation.NODE);
-    }, this);
-  },
-
-  /**
-   * Handles new node selection. 1) Updates the selected-state of each node,
-   * 2) triggers input tracing.
-   * @param selectedNode {string} The name of the newly selected node.
-   * @param oldSelectedNode {string} The name of the previously selected node.
-   * @private
-   */
-  _selectedNodeChanged: function(selectedNode, oldSelectedNode) {
-    if (selectedNode === oldSelectedNode) {
-      return;
-    }
-
-    if (selectedNode) {
-      this._updateNodeState(selectedNode);
-    }
-    if (oldSelectedNode) {
-      this._updateNodeState(oldSelectedNode);
-    }
-
-    tf.graph.scene.node.traceInputs(this.renderHierarchy);
-
-    if (!selectedNode) {
-      return;
-    }
-
-
-    // Update the minimap to reflect the highlighted (selected) node.
-    this.minimap.update();
-    var node = this.renderHierarchy.hierarchy.node(selectedNode);
-    var nodeParents = [];
-    // Create list of all metanode parents of the selected node.
-    while (node.parentNode != null
-        && node.parentNode.name != tf.graph.ROOT_NAME) {
-      node = node.parentNode;
-      nodeParents.push(node.name);
-    }
-    // Ensure each parent metanode is built and expanded.
-    var topParentNodeToBeExpanded;
-    _.forEachRight(nodeParents, function(parentName) {
-      this.renderHierarchy.buildSubhierarchy(parentName);
-      var renderNode = this.renderHierarchy.getRenderNodeByName(parentName);
-      if (renderNode.node.isGroupNode && !renderNode.expanded) {
-        renderNode.expanded = true;
-        if (!topParentNodeToBeExpanded) {
-          topParentNodeToBeExpanded = renderNode;
-        }
-      }
-    }, this);
-    // If any expansion was needed to display this selected node, then
-    // inform the scene of the top-most expansion.
-    if (topParentNodeToBeExpanded) {
-      this.setNodeExpanded(topParentNodeToBeExpanded);
-      this._zoomed = true;
-    }
-
-    if (tf.graph.scene.panToNode(selectedNode, this.$.svg, this.$.root,
-        this._zoom)) {
-      this._zoomed = true;
-    }
-  },
-  _highlightedNodeChanged: function(highlightedNode, oldHighlightedNode) {
-    if (highlightedNode === oldHighlightedNode) {
-      return;
-    }
-
-    if (highlightedNode) {
-      this._updateNodeState(highlightedNode);
-    }
-    if (oldHighlightedNode) {
-      this._updateNodeState(oldHighlightedNode);
-    }
-  },
-  _onZoomChanged: function() {
-    this._updateLabels(!this._zoomed);
-  },
-  _fireEnableClick: function() {
-    this.fire('enable-click');
-  },
-});
-</script>
-</dom-module>
-<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
-<dom-module id="tf-graph" assetpath="../tf-graph/">
-<template>
-<style>
-.container {
-  width: 100%;
-  height: 100%;
-  background: white;
-  box-shadow: 0 1px 5px rgba(0,0,0,0.2);
-}
-
-.vertical {
-  width:100%;
-  height:100%;
-  @apply(--layout-vertical);
-}
-
-.auto {
-  @apply(--layout-flex-auto);
-  @apply(--layout-vertical);
-}
-
-h2 {
-  text-align: center;
-}
-
-paper-button {
-  text-transform: none;
-}
-</style>
-<div class="container">
-  <div class="vertical">
-    <template is="dom-if" if="[[title]]">
-      <h2>[[title]]</h2>
-    </template>
-    <tf-graph-scene id="scene" class="auto" render-hierarchy="[[renderHierarchy]]" highlighted-node="[[_getVisible(highlightedNode)]]" selected-node="{{selectedNode}}" color-by="[[colorBy]]" progress="[[progress]]" node-names-to-health-pills="[[nodeNamesToHealthPills]]" health-pill-step-index="{{healthPillStepIndex}}"></tf-graph-scene>
-  </div>
-</div>
-</template>
-</dom-module>
-
-<script>
-Polymer({
-
-  is: 'tf-graph',
-
-  properties: {
-    graphHierarchy: {
-      type: Object,
-      notify: true,
-      observer: '_graphChanged'
-    },
-    basicGraph: Object,
-    stats: Object,
-    devicesForStats: Object,
-    hierarchyParams: Object,
-    progress: {
-      type: Object,
-      notify: true,
-    },
-    title: String,
-    selectedNode: {
-      type: String,
-      notify: true,
-    },
-    highlightedNode: {
-      type: String,
-      notify: true
-    },
-    /** What to color the nodes by (compute time, memory, device etc.) */
-    colorBy: String,
-    colorByParams: {
-      type: Object,
-      notify: true,
-      readOnly: true, // Produces and doesn't consume.
-    },
-    renderHierarchy: {
-      type: Object,
-      readOnly: true,
-      notify: true,
-    },
-    _renderDepth: {
-      type: Number,
-      value: 1
-    },
-    _allowGraphSelect: {
-      type: Boolean,
-      value: true
-    },
-    // A mapping between node name to the tf.graph.scene.HealthPill to render.
-    nodeNamesToHealthPills: Object,
-    // The step of health pills to show throughout the graph.
-    healthPillStepIndex: Number,
-  },
-  observers: [
-    '_statsChanged(stats, devicesForStats)',
-    '_buildRenderHierarchy(graphHierarchy)'
-  ],
-  _statsChanged: function(stats, devicesForStats) {
-    if (this.graphHierarchy) {
-      if (stats && devicesForStats) {
-        tf.graph.joinStatsInfoWithGraph(this.basicGraph, stats, devicesForStats);
-        tf.graph.hierarchy.joinAndAggregateStats(this.graphHierarchy, stats);
-      }
-      // Recompute the rendering information.
-      this._buildRenderHierarchy(this.graphHierarchy);
-    }
-  },
-  _buildRenderHierarchy: function(graphHierarchy) {
-    tf.graph.util.time('new tf.graph.render.Hierarchy', function() {
-      if (graphHierarchy.root.type !== tf.graph.NodeType.META) {
-        // root must be metanode but sometimes Polymer's dom-if has not
-        // remove tf-graph element yet in <tf-node-info>
-        // and thus mistakenly pass non-metanode to this module.
-        return;
-      }
-      var renderGraph = new tf.graph.render.RenderGraphInfo(
-          graphHierarchy, !!this.stats /** displayingStats */);
-      // Producing the 'color by' parameters to be consumed
-      // by the tf-graph-controls panel. It contains information about the
-      // min and max values and their respective colors, as well as list
-      // of devices with their respective colors.
-
-      function getColorParamsFromScale(scale) {
-        return {
-          minValue: scale.domain()[0],
-          maxValue: scale.domain()[1],
-          startColor: scale.range()[0],
-          endColor: scale.range()[1]
-        };
-      }
-
-      this._setColorByParams({
-        compute_time: getColorParamsFromScale(renderGraph.computeTimeScale),
-        memory: getColorParamsFromScale(renderGraph.memoryUsageScale),
-        device: _.map(renderGraph.deviceColorMap.domain(),
-            function(deviceName) {
-          return {
-            device: deviceName,
-            color: renderGraph.deviceColorMap(deviceName)
-          };
-        }),
-        xla_cluster: _.map(renderGraph.xlaClusterColorMap.domain(),
-            function(xlaClusterName) {
-          return {
-            xla_cluster: xlaClusterName,
-            color: renderGraph.xlaClusterColorMap(xlaClusterName)
-          };
-        }),
-      });
-      this._setRenderHierarchy(renderGraph);
-      this.async(function() {
-        this.fire("rendered");
-      });
-    }.bind(this));
-  },
-  _getVisible: function(name) {
-    if (!name) {
-      return name;
-    }
-    return this.renderHierarchy.getNearestVisibleAncestor(name);
-  },
-  listeners: {
-    'graph-select': '_graphSelected',
-    'disable-click': '_disableClick',
-    'enable-click': '_enableClick',
-    // Nodes
-    'node-toggle-expand': '_nodeToggleExpand',
-    'node-select': '_nodeSelected',
-    'node-highlight': '_nodeHighlighted',
-    'node-unhighlight': '_nodeUnhighlighted',
-    'node-toggle-extract': '_nodeToggleExtract',
-    'node-toggle-seriesgroup': '_nodeToggleSeriesGroup',
-
-    // Annotations
-
-    /* Note: currently highlighting/selecting annotation node has the same
-      * behavior as highlighting/selecting actual node so we point to the same
-      * set of event listeners.  However, we might redesign this to be a bit
-      * different.
-      */
-    'annotation-select': '_nodeSelected',
-    'annotation-highlight': '_nodeHighlighted',
-    'annotation-unhighlight': '_nodeUnhighlighted',
-  },
-  _graphChanged: function() {
-    // When a new graph is loaded, fire this event so that there is no
-    // info-card being displayed for the previously-loaded graph.
-    this.fire('graph-select');
-  },
-  _graphSelected: function(event) {
-    // Graph selection is not allowed during an active zoom event, as the
-    // click seen during a zoom/pan is part of the zooming and does not
-    // indicate a user desire to click on a specific section of the graph.
-    if (this._allowGraphSelect) {
-      this.set('selectedNode', null);
-    }
-    // Reset this variable as a bug in d3 zoom behavior can cause zoomend
-    // callback not to be called if a right-click happens during a zoom event.
-    this._allowGraphSelect = true;
-  },
-  _disableClick: function(event) {
-    this._allowGraphSelect = false;
-  },
-  _enableClick: function(event) {
-    this._allowGraphSelect = true;
-  },
-  _nodeSelected: function(event) {
-    if (this._allowGraphSelect) {
-      this.set('selectedNode', event.detail.name);
-    }
-    // Reset this variable as a bug in d3 zoom behavior can cause zoomend
-    // callback not to be called if a right-click happens during a zoom event.
-    this._allowGraphSelect = true;
-  },
-  _nodeHighlighted: function(event) {
-    this.set('highlightedNode', event.detail.name);
-  },
-  _nodeUnhighlighted: function(event) {
-    this.set('highlightedNode', null);
-  },
-  _nodeToggleExpand: function(event) {
-    // Immediately select the node that is about to be expanded.
-    this._nodeSelected(event);
-
-    // Compute the sub-hierarchy scene.
-    var nodeName = event.detail.name;
-    var renderNode = this.renderHierarchy.getRenderNodeByName(nodeName);
-    // Op nodes are not expandable.
-    if (renderNode.node.type === tf.graph.NodeType.OP) {
-      return;
-    }
-    this.renderHierarchy.buildSubhierarchy(nodeName);
-    renderNode.expanded = !renderNode.expanded;
-
-    // Expand the node with some delay so that the user can immediately see
-    // the visual effect of selecting that node, before the expansion is
-    // done.
-    this.async(function() {
-      this.querySelector('#scene').setNodeExpanded(renderNode);
-    }, 75);
-  },
-  _nodeToggleExtract: function(event) {
-    // Toggle the include setting of the specified node appropriately.
-    var nodeName = event.detail.name;
-    var renderNode = this.renderHierarchy.getRenderNodeByName(nodeName);
-    if (renderNode.node.include == tf.graph.InclusionType.INCLUDE) {
-      renderNode.node.include = tf.graph.InclusionType.EXCLUDE;
-    } else if (renderNode.node.include == tf.graph.InclusionType.EXCLUDE) {
-      renderNode.node.include = tf.graph.InclusionType.INCLUDE;
-    } else {
-      renderNode.node.include =
-       this.renderHierarchy.isNodeAuxiliary(renderNode)
-          ? tf.graph.InclusionType.INCLUDE : tf.graph.InclusionType.EXCLUDE;
-    }
-
-    // Rebuild the render hierarchy.
-    this._buildRenderHierarchy(this.graphHierarchy);
-  },
-  _nodeToggleSeriesGroup: function(event) {
-    // Toggle the group setting of the specified node appropriately.
-    var nodeName = event.detail.name;
-    tf.graph.toggleNodeSeriesGroup(this.hierarchyParams.seriesMap, nodeName);
-
-    // Rebuild the render hierarchy with the updated series grouping map.
-    this.set('progress', {
-      value: 0,
-      msg: ''
-    });
-    var tracker = tf.graph.util.getTracker(this);
-    var hierarchyTracker = tf.graph.util.getSubtaskTracker(tracker, 100,
-          'Namespace hierarchy');
-    tf.graph.hierarchy.build(this.basicGraph, this.hierarchyParams, hierarchyTracker)
-    .then(function(graphHierarchy) {
-      this.set('graphHierarchy', graphHierarchy);
-      this._buildRenderHierarchy(this.graphHierarchy);
-    }.bind(this));
-  },
-  not: function(x) {
-    return !x;
-  }
-});
-</script>
-<dom-module id="tf-graph-icon" assetpath="../tf-graph/">
-  <style>
-    .faded-rect {
-      fill: url("#rectHatch");
-    }
-
-    .faded-ellipse {
-      fill: url("#ellipseHatch");
-    }
-
-    .faded-rect, .faded-ellipse, .faded-series {
-      stroke:   var(--tb-graph-faded) !important;
-    }
-  </style>
-  <template>
-    <template is="dom-if" if="[[_isType(node, type, 'OP')]]">
-      <template is="dom-if" if="[[_isConst(node, const)]]">
-        <svg height$="[[height]]" preserveAspectRatio="xMinYMid meet" viewBox="0 0 10 10">
-          <circle cx="5" cy="5" r="3" fill$="[[_getFill(_computedFill, 'OP')]]" stroke$="[[_getStroke(_computedFill, 'OP')]]"></circle>
-        </svg>
-      </template>
-      <template is="dom-if" if="[[_isSummary(node, summary)]]">
-        <svg width$="[[height]]" height$="[[height]]" viewBox="0 0 12 12">
-          <use x="0" y="0" xlink:href="#summary-icon"></use>
-        </svg>
-      </template>
-      <template is="dom-if" if="[[_isRegularOp(node, const, summary)]]">
-        <svg height$="[[height]]" preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 8">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#op-node-stamp" fill$="[[_getFill(_computedFill, 'OP')]]" stroke$="[[_getStroke(_computedFill, 'OP')]]" class$="{{_fadedClass(renderInfo, 'ellipse')}}" x="8" y="4"></use>
-        </svg>
-      </template>
-    </template>
-    <template is="dom-if" if="[[_isType(node, type, 'META')]]">
-      <svg height$="[[height]]" preserveAspectRatio="xMinYMid meet" viewBox="0 0 37 16">
-        <rect x="1" y="1" fill$="[[_getFill(_computedFill, 'META')]]" stroke$="[[_getStroke(_computedFill, 'META')]]" class$="{{_fadedClass(renderInfo, 'rect')}}" stroke-width="2px" height="14" width="35" rx="5" ry="5"></rect>
-      </svg>
-    </template>
-    <template is="dom-if" if="[[_isType(node, type, 'SERIES')]]">
-      <template is="dom-if" if="[[_isVertical(node, vertical)]]">
-        <svg height$="[[height]]" preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 15">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#op-series-vertical-stamp" fill$="[[_getFill(_computedFill, 'SERIES')]]" stroke$="[[_getStroke(_computedFill, 'SERIES')]]" class$="{{_fadedClass(renderInfo, 'series')}}" x="0" y="2"></use>
-        </svg>
-      </template>
-      <template is="dom-if" if="[[!_isVertical(node, vertical)]]">
-        <svg height$="[[height]]" preserveAspectRatio="xMinYMid meet" viewBox="0 0 24 10">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#op-series-horizontal-stamp" fill$="[[_getFill(_computedFill, 'SERIES')]]" stroke$="[[_getStroke(_computedFill, 'SERIES')]]" class$="{{_fadedClass(renderInfo, 'series')}}" x="0" y="1"></use>
-        </svg>
-      </template>
-    </template>
-  </template>
-
-  <script>
-    (function() {
-      Polymer({
-        is: 'tf-graph-icon',
-
-        properties: {
-          /**
-           * Node to represent with an icon. Optional, but if specified, its
-           * properties override those defined in the type, vertical, const and
-           * summary properties.
-           * @type {tf.graph.Node}
-           */
-          node: {
-            type: Object,
-            value: null
-          },
-
-          /**
-           * Render node information associated with this node. Optional. If
-           * specified, this is only used when computing the fill of the icon
-           * element.
-           * @type {tf.graph.render.RenderNodeInfo}
-           */
-          renderInfo: {
-            type: Object,
-            value: null
-          },
-
-          /**
-           * String indicating the type of coloring to use for this node, used
-           * only for determining the fill.
-           */
-          colorBy: {
-            type: Object,
-            value: "structural"
-          },
-
-          /**
-           * Function used by structural coloring algorithm to determine which
-           * color to use based on the template ID of the node. Optional.
-           */
-          templateIndex: {
-            type: Function,
-            value: null
-          },
-
-          /** Type of node to draw (ignored if node is set). */
-          type: {
-            type: String,
-            value: null
-          },
-
-          /** Direction for series (ignored for other types). */
-          vertical: {
-            type: Boolean,
-            value: false
-          },
-
-          /** Whether the op is Const (ignored for non-ops). */
-          const: {
-            type: Boolean,
-            value: false
-          },
-
-          /** Whether the op is a Summary (ignored for non-ops). */
-          summary: {
-            type: Boolean,
-            value: false
-          },
-
-          /**
-           * Fill for the icon, optional. If fill is specified and node is not
-           * specified, then this value will override the default for the
-           * element. However, if node is specified, this value will be ignored.
-           */
-          fill: {
-            type: String,
-            value: null
-          },
-
-          /** Height of the SVG element in pixels, used for scaling. */
-          height: {
-            type: Number,
-            value: 20
-          },
-
-          /** The computed fill for the node. **/
-          _computedFill: {
-            type: String,
-            computed:
-              "_getComputedFill(node, renderInfo, colorBy, templateIndex, fill)"
-          }
-
-        },
-
-        /**
-         * Get the computed fill value for the element.
-         */
-        _getComputedFill: function(inputNode, inputRenderInfo, inputColorBy,
-            inputTemplateIndex, inputFill) {
-          if (inputNode && inputRenderInfo &&
-              inputColorBy && inputTemplateIndex) {
-            var ns = tf.graph.scene.node;
-            var colorBy = ns.ColorBy[inputColorBy.toUpperCase()];
-            return ns.getFillForNode(inputTemplateIndex, colorBy,
-                inputRenderInfo, false);
-          }
-          return inputFill;
-        },
-
-        /**
-         * Get the fill value for the element, or if that's not possible, return
-         * the default fill value for the node type.
-         */
-        _getFill: function(inputComputedFill, inputNodeType) {
-          return inputComputedFill || ({
-            OP: tf.graph.render.OpNodeColors.DEFAULT_FILL,
-            META: tf.graph.render.MetanodeColors.DEFAULT_FILL,
-            SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_FILL
-          })[inputNodeType];
-        },
-
-        /**
-         * Get the stroke value for the element, or if that's not possible,
-         * return the default stroke value for the node type.
-         */
-        _getStroke: function(inputComputedFill, inputNodeType) {
-          return inputComputedFill ?
-            tf.graph.scene.node.getStrokeForFill(inputComputedFill) :
-            ({
-              OP: tf.graph.render.OpNodeColors.DEFAULT_STROKE,
-              META: tf.graph.render.MetanodeColors.DEFAULT_STROKE,
-              SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_STROKE
-            })[inputNodeType];
-        },
-
-        /**
-         * Test whether the specified node's type, or the literal type string,
-         * match a particular other type.
-         */
-        _isType: function(inputNode, inputType, targetType) {
-          if (inputNode) {
-            return tf.graph.NodeType[inputNode.type] === targetType;
-          }
-          return inputType === targetType;
-        },
-
-        /**
-         * Test whether the specified node should be represented as a vertical
-         * series. Defaults to the value of the vertical property if node is
-         * not specified.
-         */
-        _isVertical: function(inputNode, inputVertical) {
-          if (inputNode) {
-            return inputNode.hasNonControlEdges;
-          }
-          return !!inputVertical;
-        },
-
-        /**
-         * Test whether the specified node is a constant. Defaults to the value
-         * of the const property if node is not specified.
-         */
-        _isConst: function(inputNode, inputConst) {
-          if (inputNode) {
-            return inputNode.op === 'Const';
-          }
-          return !!inputConst;
-        },
-
-        /**
-         * Test whether the specified node is a summary. Defaults to the value
-         * of the summary property if node is not specified.
-         */
-        _isSummary: function(inputNode, inputSummary) {
-          if (inputNode) {
-            return this._isType(inputNode, null, 'OP') &&
-                inputNode.op.substr(-7) === 'Summary';
-          }
-          return !!inputSummary;
-        },
-
-        /**
-         * Test whether the op node is a regular non-summary non-const node.
-         */
-        _isRegularOp: function(inputNode, inputConst, inputSummary) {
-          return !this._isConst(inputNode, inputConst) &&
-              !this._isSummary(inputNode, inputSummary);
-        },
-
-        _fadedClass: function(itemRenderInfo, shape) {
-          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded-' + shape : '';
-        }
-      });
-    })();
-  </script>
-</dom-module>
-<dom-module id="tf-node-list-item" assetpath="../tf-graph-info/">
-  <style>
-  #list-item {
-    width: 100%;
-    color: #565656;
-    font-size: 11pt;
-    font-weight: 400;
-    position: relative;
-    display: inline-block;
-  }
-
-  #list-item:hover {
-    background-color: var(--google-yellow-100);
-  }
-
-  .clickable {
-    cursor: pointer;
-  }
-
-  #list-item span {
-    margin-left: 40px;
-  }
-
-  #list-item.excluded span {
-    color: #999;
-  }
-
-  #list-item span.edge-label {
-    float: right;
-    font-size: 10px;
-    margin-left: 3px;
-    margin-right: 5px;
-  }
-
-  .node-icon {
-    position: absolute;
-    top: 1px;
-    left: 2px;
-  }
-
-  .faded span {
-    color: var(--tb-graph-faded);
-  }
-  </style>
-  <template>
-    <div id="list-item" on-mouseover="_nodeListener" on-mouseout="_nodeListener" on-click="_nodeListener">
-      <div class$="{{_fadedClass(itemRenderInfo)}}">
-        <tf-graph-icon class="node-icon" height="12" color-by="[[colorBy]]" color-by-params="[[colorByParams]]" node="[[itemNode]]" render-info="[[itemRenderInfo]]" template-index="[[templateIndex]]"></tf-graph-icon>
-        <span title$="[[name]]">[[name]]</span>
-        <span class="edge-label">[[edgeLabel]]</span>
-      </div>
-    </div>
-  </template>
-
-  <script>
-    (function() {
-      Polymer({
-        is: 'tf-node-list-item',
-
-        properties: {
-          /**
-           * The Node for the card itself, on which this item is being drawn.
-           * @type {tf.graph.Node}
-           */
-          cardNode: Object,
-          /**
-           * The Node for the item within the card, somehow related to cardNode.
-           * @type {tf.graph.Node}
-           */
-          itemNode: Object,
-          /** The edge label associated with this item. */
-          edgeLabel: String,
-          /**
-           * The render node information for the item node. Used by the graph
-           * icon in determining fill color.
-           */
-          itemRenderInfo: Object,
-          name: String,
-          itemType: {
-            type: String,
-            observer: '_itemTypeChanged'
-          },
-          colorBy: String,
-          colorByParams: Object,
-          templateIndex: Function
-        },
-
-        _itemTypeChanged: function() {
-          if (this.itemType !== 'subnode') {
-            this.$['list-item'].classList.add('clickable');
-          } else {
-            this.$['list-item'].classList.remove('clickable');
-          }
-        },
-
-        _nodeListener: function(event) {
-          // fire node.click/mouseover/mouseout
-          this.fire('node-list-item-' + event.type, {
-            cardNode: this.cardNode.name,
-            nodeName: this.name,
-            type: this.itemType
-          });
-        },
-
-        _fadedClass: function(itemRenderInfo) {
-          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded' : '';
-        }
-      });
-    })();
-  </script>
-</dom-module>
-<link rel="import" href="../iron-list/iron-list.html">
-<link rel="import" href="../paper-item/all-imports.html">
-<dom-module id="tf-node-info" assetpath="../tf-graph-info/">
-  <style>
-  .sub-list-group {
-    font-weight: 500;
-    font-size: 12pt;
-    padding-bottom: 8px;
-    width: 100%;
-  }
-
-  .sub-list {
-    max-height: 300px;
-    overflow-y: scroll;
-  }
-
-  .attr-left {
-    float: left;
-    width: 30%;
-    word-wrap: break-word;
-    color: #565656;
-    font-size: 11pt;
-    font-weight: 400;
-  }
-
-  .attr-right {
-    margin-left: 30%;
-    word-wrap: break-word;
-    color: #565656;
-    font-weight: 400;
-  }
-
-  .sub-list-table {
-    display: table;
-    width: 100%;
-  }
-
-  .sub-list-table-row {
-    display: table-row;
-  }
-
-  .sub-list-table-row .sub-list-table-cell:last-child {
-    text-align: right;
-  }
-
-  .sub-list-table-cell {
-    color: #565656;
-    display: table-cell;
-    font-size: 11pt;
-    font-weight: 400;
-    max-width: 200px;
-    padding: 0 4px;
-  }
-
-  paper-item {
-    padding: 0;
-    background: #e9e9e9;
-  }
-
-  paper-item-body[two-line] {
-    min-height: 0;
-    padding: 8px 12px 4px;
-  }
-
-  .expandedInfo {
-    padding: 8px 12px;
-  }
-
-  .controlDeps {
-    padding: 0 0 0 8px;
-  }
-
-  .node-name {
-    white-space: normal;
-    word-wrap: break-word;
-    font-size: 14pt;
-    font-weight: 500;
-  }
-
-  .node-icon {
-    float: right;
-  }
-
-  .subtitle {
-    font-size: 12pt;
-    color: #5e5e5e;
-  }
-
-  .controlLine {
-    font-size: 11pt;
-    font-weight: 400;
-  }
-
-  .toggle-button {
-    float: right;
-    max-height: 20px;
-    max-width: 20px;
-    padding: 0;
-  }
-
-  .control-toggle-button {
-    float: left;
-    max-height: 20px;
-    max-width: 20px;
-    padding: 0;
-  }
-
-  .toggle-include-group {
-    padding-top: 4px;
-  }
-
-  .toggle-include {
-    margin: 5px 6px;
-    text-transform: none;
-    padding: 4px 6px;
-    font-size: 10pt;
-    background-color: #fafafa;
-    color: #666;
-  }
-
-  .toggle-include:hover {
-    background-color: var(--google-yellow-100);
-  }
-
-  .non-control-list-item {
-    padding-left: 10px;
-  }
-  </style>
-  <template>
-    <paper-item>
-      <paper-item-body two-line="">
-        <div>
-          <paper-icon-button icon="{{_getToggleIcon(_expanded)}}" on-click="_toggleExpanded" class="toggle-button">
-          </paper-icon-button>
-          <div class="node-name" id="nodetitle"></div>
-        </div>
-        <div secondary="">
-          <tf-graph-icon class="node-icon" node="[[_node]]" render-info="[[_getRenderInfo(nodeName, renderHierarchy)]]" color-by="[[colorBy]]" template-index="[[_templateIndex]]"></tf-graph-icon>
-          <template is="dom-if" if="{{_node.op}}">
-            <div class="subtitle">
-              Operation:
-              <span>[[_node.op]]</span>
-            </div>
-          </template>
-          <template is="dom-if" if="{{_node.metagraph}}">
-            <div class="subtitle">
-              Subgraph:
-              <span>[[_node.cardinality]]</span> nodes
-            </div>
-          </template>
-        </div>
-      </paper-item-body>
-    </paper-item>
-    <iron-collapse opened="{{_expanded}}">
-    <template is="dom-if" if="{{_expanded}}" restamp="true">
-      <div class="expandedInfo">
-        <div class="sub-list-group attributes">
-          Attributes
-          (<span>[[_attributes.length]]</span>)
-          <iron-list class="sub-list" id="attributesList" items="[[_attributes]]">
-            <template>
-              <div>
-                <div class="attr-left">[[item.key]]</div>
-                <div class="attr-right">[[item.value]]</div>
-              </div>
-            </template>
-          </iron-list>
-        </div>
-
-        <template is="dom-if" if="{{_device}}">
-          <div class="sub-list-group device">
-            <div class="attr-left">Device</div>
-            <div class="attr-right">[[_device]]</div>
-          </div>
-        </template>
-
-        <div class="sub-list-group predecessors">
-          Inputs
-          (<span>[[_totalPredecessors]]</span>)
-          <iron-list class="sub-list" id="inputsList" items="[[_predecessors.regular]]">
-            <template>
-              <tf-node-list-item class="non-control-list-item" card-node="[[_node]]" item-node="[[item.node]]" edge-label="[[item.edgeLabel]]" item-render-info="[[item.renderInfo]]" name="[[item.name]]" item-type="predecessors" color-by="[[colorBy]]" template-index="[[_templateIndex]]">
-              </tf-node-list-item>
-            </template>
-          </iron-list>
-          <template is="dom-if" if="[[_predecessors.control.length]]">
-            <div class="controlDeps">
-              <div class="controlLine">
-                <paper-icon-button icon="{{_getToggleIcon(_openedControlPred)}}" on-click="_toggleControlPred" class="control-toggle-button">
-                </paper-icon-button>
-                Control dependencies
-              </div>
-              <iron-collapse opened="{{_openedControlPred}}" no-animation="">
-                <template is="dom-if" if="{{_openedControlPred}}" restamp="true">
-                  <iron-list class="sub-list" items="[[_predecessors.control]]">
-                    <template>
-                      <tf-node-list-item card-node="[[_node]]" item-node="[[item.node]]" item-render-info="[[item.renderInfo]]" name="[[item.name]]" item-type="predecessors" color-by="[[colorBy]]" template-index="[[_templateIndex]]">
-                      </tf-node-list-item>
-                    </template>
-                  </iron-list>
-                </template>
-              </iron-collapse>
-            </div>
-          </template>
-        </div>
-
-        <div class="sub-list-group successors">
-          Outputs
-          (<span>[[_totalSuccessors]]</span>)
-          <iron-list class="sub-list" id="outputsList" items="[[_successors.regular]]">
-            <template>
-              <tf-node-list-item class="non-control-list-item" card-node="[[_node]]" item-node="[[item.node]]" edge-label="[[item.edgeLabel]]" item-render-info="[[item.renderInfo]]" name="[[item.name]]" item-type="successor" color-by="[[colorBy]]" template-index="[[_templateIndex]]">
-              </tf-node-list-item>
-            </template>
-          </iron-list>
-          <template is="dom-if" if="[[_successors.control.length]]">
-            <div class="controlDeps">
-              <div class="controlLine">
-                <paper-icon-button icon="{{_getToggleIcon(_openedControlSucc)}}" on-click="_toggleControlSucc" class="control-toggle-button">
-                </paper-icon-button>
-                Control dependencies
-              </div>
-              <iron-collapse opened="{{_openedControlSucc}}" no-animation="">
-                <template is="dom-if" if="{{_openedControlSucc}}" restamp="true">
-                  <iron-list class="sub-list" items="[[_successors.control]]">
-                    <template>
-                      <tf-node-list-item card-node="[[_node]]" item-node="[[item.node]]" item-render-info="[[item.renderInfo]]" name="[[item.name]]" item-type="successors" color-by="[[colorBy]]" template-index="[[_templateIndex]]">
-                      </tf-node-list-item>
-                    </template>
-                  </iron-list>
-                </template>
-              </iron-collapse>
-            </div>
-          </template>
-        </div>
-        <template is="dom-if" if="{{_hasDisplayableNodeStats}}">
-          <div class="sub-list-group node-stats">
-            Node Stats
-            <div class="sub-list-table">
-              <template is="dom-if" if="{{_nodeStats.totalBytes}}">
-                <div class="sub-list-table-row">
-                  <div class="sub-list-table-cell">Memory</div>
-                  <div class="sub-list-table-cell">[[_nodeStatsFormattedBytes]]</div>
-                </div>
-              </template>
-              <template is="dom-if" if="{{_nodeStats.totalMicros}}">
-                <div class="sub-list-table-row">
-                  <div class="sub-list-table-cell">Compute Time</div>
-                  <div class="sub-list-table-cell">[[_nodeStatsFormattedComputeTime]]</div>
-                </div>
-              </template>
-              <template is="dom-if" if="{{_nodeStats.outputSize}}">
-                <div class="sub-list-table-row">
-                  <div class="sub-list-table-cell">Tensor Output Sizes</div>
-                  <div class="sub-list-table-cell">
-                    <template is="dom-repeat" items="{{_nodeStatsFormattedOutputSizes}}">
-                      [[item]] <br>
-                    </template>
-                  </div>
-                </div>
-              </template>
-            </div>
-          </div>
-        </template>
-        <div class="toggle-include-group">
-          <paper-button raised="" class="toggle-include" on-click="_toggleInclude">
-            <span>[[_auxButtonText]]</span>
-          </paper-button>
-        </div>
-        <template is="dom-if" if="{{_isInSeries(_node)}}">
-          <div class="toggle-include-group">
-            <paper-button raised="" class="toggle-include" on-click="_toggleGroup">
-              <span>[[_groupButtonText]]</span>
-            </paper-button>
-          </div>
-        </template>
-      </div>
-    </template>
-    </iron-collapse>
-  </template>
-
-  <script>
-    (function() {
-      Polymer({
-        is: 'tf-node-info',
-
-        properties: {
-          nodeName: String,
-          graphHierarchy: Object,
-          renderHierarchy: Object,
-          /** What to color the nodes by (compute time, memory, device etc.) */
-          colorBy: String,
-          _templateIndex: {
-            type: Function,
-            computed: '_getTemplateIndex(graphHierarchy)'
-          },
-          _node: {
-            type: Object,
-            computed: '_getNode(nodeName, graphHierarchy)',
-            observer: '_resetState'
-          },
-          _nodeStats: {
-            type: Object,
-            computed: '_getNodeStats(nodeName, graphHierarchy)',
-            observer: '_resetState'
-          },
-          _hasDisplayableNodeStats: {
-            type: Object,
-            computed: '_getHasDisplayableNodeStats(_nodeStats)',
-          },
-          _nodeStatsFormattedBytes: {
-            type: String,
-            computed: '_getNodeStatsFormattedBytes(_nodeStats)',
-          },
-          _nodeStatsFormattedComputeTime: {
-            type: String,
-            computed: '_getNodeStatsFormattedComputeTime(_nodeStats)',
-          },
-          _nodeStatsFormattedOutputSizes: {
-            type: Array,
-            computed: '_getNodeStatsFormattedOutputSizes(_nodeStats)',
-          },
-          // The enum value of the include property of the selected node.
-          nodeInclude: {
-            type: Number,
-            observer: '_nodeIncludeStateChanged'
-          },
-          _attributes: {
-            type: Array,
-            computed: '_getAttributes(_node)'
-          },
-          _device: {
-            type: String,
-            computed: '_getDevice(_node)'
-          },
-          _successors: {
-            type: Object,
-            computed: '_getSuccessors(_node, graphHierarchy)'
-          },
-          _predecessors: {
-            type: Object,
-            computed: '_getPredecessors(_node, graphHierarchy)'
-          },
-          _subnodes: {
-            type: Array,
-            computed: '_getSubnodes(_node)'
-          },
-          _expanded: {
-            type: Boolean,
-            value: true
-          },
-          _totalPredecessors: {
-            type: Number,
-            computed: '_getTotalPred(_predecessors)'
-          },
-          _totalSuccessors: {
-            type: Number,
-            computed: '_getTotalSucc(_successors)'
-          },
-          _openedControlPred: {
-            type: Boolean,
-            value: false
-          },
-          _openedControlSucc: {
-            type: Boolean,
-            value: false
-          },
-          _auxButtonText: String,
-          _groupButtonText: String
-        },
-        expandNode: function() {
-          this.fire('_node.expand', this.node);
-        },
-        _getTemplateIndex: function(graphHierarchy) {
-          return graphHierarchy.getTemplateIndex();
-        },
-        _getNode: function(nodeName, graphHierarchy) {
-          return graphHierarchy.node(nodeName);
-        },
-        _getNodeStats: function(nodeName, graphHierarchy) {
-          var node = this._getNode(nodeName, graphHierarchy);
-          if (node) {
-            return node.stats;
-          }
-          return null;
-        },
-        _getHasDisplayableNodeStats: function(stats) {
-          return tf.graph.util.hasDisplayableNodeStats(stats);
-        },
-        _getNodeStatsFormattedBytes: function(stats) {
-          if (!stats || !stats.totalBytes) {
-            return;
-          }
-
-          return tf.graph.util.convertUnitsToHumanReadable(
-              stats.totalBytes, tf.graph.util.MEMORY_UNITS);
-        },
-        _getNodeStatsFormattedComputeTime: function(stats) {
-          if (!stats || !stats.totalMicros) {
-            return;
-          }
-
-          return tf.graph.util.convertUnitsToHumanReadable(
-              stats.totalMicros, tf.graph.util.TIME_UNITS);
-        },
-        _getNodeStatsFormattedOutputSizes: function(stats) {
-          if (!stats || !stats.outputSize || !stats.outputSize.length) {
-            return;
-          }
-
-          return _.map(stats.outputSize, function(shape) {
-            if (shape.length === 0) {
-              return "scalar";
-            }
-            return "[" + shape.join(", ") + "]";
-          });
-        },
-        _getPrintableHTMLNodeName: function(nodeName) {
-          // Insert an optional line break before each slash so that
-          // long node names wrap cleanly at path boundaries.
-          return (nodeName || '').replace(/\//g, '<wbr>/');
-        },
-        _getRenderInfo: function(nodeName, renderHierarchy) {
-          return this.renderHierarchy.getOrCreateRenderNodeByName(nodeName);
-        },
-        _getAttributes: function(node) {
-          this.async(this._resizeList.bind(this, "#attributesList"));
-          if (!node || !node.attr) {
-            return [];
-          }
-          var attrs = [];
-          _.each(node.attr, function(entry) {
-            // Unpack the "too large" attributes into separate attributes
-            // in the info card, with values "too large to show".
-            if (entry.key === tf.graph.LARGE_ATTRS_KEY) {
-              attrs = attrs.concat(entry.value.list.s.map(function(key) {
-                return {key: key, value: "Too large to show..."};
-              }));
-            } else {
-              attrs.push({
-                key: entry.key,
-                value: JSON.stringify(entry.value)
-              });
-            }
-          });
-          return attrs;
-        },
-        _getDevice: function(node) {
-          return node ? node.device : null;
-        },
-        _getSuccessors: function(node, hierarchy) {
-          this.async(this._resizeList.bind(this, "#inputsList"));
-          if (!node) {
-            return {regular: [], control: []}
-          }
-          return this._convertEdgeListToEdgeInfoList(
-            hierarchy.getSuccessors(node.name), false, node.isGroupNode);
-        },
-        _getPredecessors: function(node, hierarchy) {
-          this.async(this._resizeList.bind(this, "#outputsList"));
-          if (!node) {
-            return {regular: [], control: []}
-          }
-          return this._convertEdgeListToEdgeInfoList(
-            hierarchy.getPredecessors(node.name), true, node.isGroupNode);
-        },
-        _convertEdgeListToEdgeInfoList: function(list, isPredecessor, isGroupNode) {
-
-          /**
-           * Unpacks the metaedge into a list of base edge information
-           * that can be rendered.
-           */
-          var unpackMetaedge = function(metaedge) {
-            return _.map(metaedge.baseEdgeList, function(baseEdge) {
-              name = isPredecessor ? baseEdge.v : baseEdge.w;
-              return {
-                name: name,
-                node: this._getNode(name, this.graphHierarchy),
-                edgeLabel: tf.graph.scene.edge.getLabelForBaseEdge(baseEdge,
-                    this.renderHierarchy),
-                renderInfo: this._getRenderInfo(name, this.renderHierarchy)
-              };
-            }, this);
-          }.bind(this);
-
-          /**
-           * Converts a list of metaedges to a list of edge information
-           * that can be rendered.
-           */
-          var toEdgeInfoList = function(edges) {
-            var edgeInfoList = [];
-            _.each(edges, function(metaedge) {
-              var name = isPredecessor ? metaedge.v : metaedge.w;
-              // Enumerate all the base edges if the node is an OpNode, or the
-              // metaedge has only 1 edge in it.
-              if (!isGroupNode || metaedge.baseEdgeList.length == 1) {
-                edgeInfoList = edgeInfoList.concat(unpackMetaedge(metaedge));
-              } else {
-                edgeInfoList.push({
-                  name: name,
-                  node: this._getNode(name, this.graphHierarchy),
-                  edgeLabel: tf.graph.scene.edge.getLabelForEdge(metaedge,
-                      this.renderHierarchy),
-                  renderInfo: this._getRenderInfo(name, this.renderHierarchy)
-                });
-              }
-            }, this);
-            return edgeInfoList;
-          }.bind(this);
-
-          return {
-            regular: toEdgeInfoList(list.regular),
-            control: toEdgeInfoList(list.control)
-          };
-        },
-        _getSubnodes: function(node) {
-          return node && node.metagraph ? node.metagraph.nodes() : null;
-        },
-        _getTotalPred: function(predecessors) {
-          return predecessors.regular.length + predecessors.control.length;
-        },
-        _getTotalSucc: function(successors) {
-          return successors.regular.length + successors.control.length;
-        },
-        _toggleControlPred: function() {
-          this._openedControlPred = !this._openedControlPred;
-        },
-        _toggleControlSucc: function() {
-          this._openedControlSucc = !this._openedControlSucc;
-        },
-        _toggleExpanded: function() {
-          this._expanded = !this._expanded;
-        },
-        _getToggleIcon: function(expanded) {
-          return expanded ? "expand-less" : "expand-more";
-        },
-        _resetState: function() {
-          this._openedControlPred = false;
-          this._openedControlSucc = false;
-
-          this.set("_groupButtonText",
-            tf.graph.scene.node.getGroupSettingLabel(this._node));
-
-          if (this._node) {
-            Polymer.dom(this.$.nodetitle).innerHTML =
-              this._getPrintableHTMLNodeName(this._node.name);
-          }
-        },
-        _resizeList: function(selector) {
-          var list = document.querySelector(selector);
-          if (list) {
-            list.fire('iron-resize');
-          }
-        },
-        _toggleInclude: function() {
-          var graphElem = document.querySelector("#graph");
-          graphElem.fire("node-toggle-extract", { name: this.nodeName });
-          var graphBoardElem = document.querySelector("#graphboard");
-          graphBoardElem.fire("node-toggle-extract");
-        },
-        _nodeIncludeStateChanged: function(include, oldInclude) {
-          this.set("_auxButtonText",
-            tf.graph.getIncludeNodeButtonString(include));
-        },
-        _toggleGroup: function() {
-          var graphElem = document.querySelector("#graph");
-          var seriesName = tf.graph.scene.node.getSeriesName(this._node);
-          graphElem.fire("node-toggle-seriesgroup", { name: seriesName });
-        },
-        _isInSeries: function(node) {
-          return tf.graph.scene.node.canBeInSeries(node);
-        }
-      });
-    })();
-  </script>
-</dom-module>
-<dom-module id="tf-graph-info" assetpath="../tf-graph-info/">
-<template>
-<style>
-:host {
-  font-size: 12px;
-  margin: 0;
-  padding: 0;
-  display: block;
-}
-
-h2 {
-  padding: 0;
-  text-align: center;
-  margin: 0;
-}
-
-.health-pill-legend {
-  padding: 15px;
-}
-
-.health-pill-legend h2 {
-  text-align: left;
-}
-
-.health-pill-entry {
-  margin: 10px 10px 10px 0;
-}
-
-.health-pill-entry .color-preview {
-  width: 26px;
-  height: 26px;
-  border-radius: 3px;
-  display: inline-block;
-  margin: 0 10px 0 0;
-}
-
-.health-pill-entry .color-label, .health-pill-entry .tensor-count {
-  color: #777;
-  display: inline-block;
-  height: 26px;
-  font-size: 22px;
-  line-height: 26px;
-  vertical-align: top;
-}
-
-.health-pill-entry .tensor-count {
-  float: right;
-}
-
-#health-pill-step-slider {
-  width: 100%;
-  margin: 0 0 0 -15px;
-  /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
-   * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
-   * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2.
-   * Apparently, the paper-slider lacks a mixin for those padding values. */
-  width: calc(100% + 31px);
-}
-
-#health-pills-loading-spinner {
-  width: 20px;
-  height: 20px;
-  vertical-align: top;
-}
-
-#health-pill-step-number-input {
-  text-align: center;
-  vertical-align: top;
-}
-</style>
-<template is="dom-if" if="{{selectedNode}}">
-  <paper-material elevation="1" class="card">
-    <tf-node-info graph-hierarchy="[[graphHierarchy]]" render-hierarchy="[[renderHierarchy]]" flat-graph="[[graph]]" node-name="[[selectedNode]]" node-include="[[selectedNodeInclude]]" highlighted-node="{{highlightedNode}}" color-by="[[colorBy]]">
-    </tf-node-info>
-  </paper-material>
-</template>
-<template is="dom-if" if="[[_healthPillsAvailable(debuggerDataEnabled, nodeNamesToHealthPills)]]">
-  <paper-material elevation="1" class="card health-pill-legend">
-    <div class="title">
-      Enable all (not just sampled) steps. Requires slow disk read.
-    </div>
-    <paper-toggle-button id="enableAllStepsModeToggle" checked="{{allStepsModeEnabled}}">
-    </paper-toggle-button>
-    <h2>
-      Step of Health Pills:
-      <template is="dom-if" if="[[allStepsModeEnabled]]">
-        <input type="number" id="health-pill-step-number-input" min="0" max="[[_biggestStepEverSeen]]" value="{{specificHealthPillStep::input}}">
-      </template>
-      <template is="dom-if" if="[[!allStepsModeEnabled]]">
-        [[_currentStepDisplayValue]]
-      </template>
-
-      <paper-spinner-lite active="" hidden$="[[!areHealthPillsLoading]]" id="health-pills-loading-spinner"></paper-spinner-lite>
-    </h2>
-    <template is="dom-if" if="[[allStepsModeEnabled]]">
-      <paper-slider id="health-pill-step-slider" immediate-value="{{specificHealthPillStep}}" max="[[_biggestStepEverSeen]]" snaps="" step="1" value="{{specificHealthPillStep}}"></paper-slider>
-    </template>
-    <template is="dom-if" if="[[!allStepsModeEnabled]]">
-      <template is="dom-if" if="[[_maxStepIndex]]">
-        <paper-slider id="health-pill-step-slider" immediate-value="{{healthPillStepIndex}}" max="[[_maxStepIndex]]" snaps="" step="1" value="{{healthPillStepIndex}}"></paper-slider>
-      </template>
-    </template>
-    <h2>
-      Health Pill
-      <template is="dom-if" if="[[healthPillValuesForSelectedNode]]">
-        Counts for Selected Node
-      </template>
-      <template is="dom-if" if="[[!healthPillValuesForSelectedNode]]">
-        Legend
-      </template>
-    </h2>
-    <template is="dom-repeat" items="[[healthPillEntries]]">
-      <div class="health-pill-entry">
-        <div class="color-preview" style="background:[[item.background_color]]"></div>
-        <div class="color-label">[[item.label]]</div>
-        <div class="tensor-count">
-          [[_computeTensorCountString(healthPillValuesForSelectedNode, index)]]
-        </div>
-      </div>
-    </template>
-  </paper-material>
-</template>
-</template>
-<script>
-(function() {
-  Polymer({
-    is: 'tf-graph-info',
-
-    properties: {
-      title: String,
-      graphHierarchy: Object,
-      graph: Object,
-      renderHierarchy: Object,
-      nodeNamesToHealthPills: Object,
-      healthPillStepIndex: {
-        type: Number,
-        notify: true,
-      },
-      // Only relevant if we are in all steps mode, in which case the user may want to view health
-      // pills for a specific step.
-      specificHealthPillStep: {
-        type: Number,
-        value: 0,
-        notify: true,
-      },
-      colorBy: String,
-      // Two-ways
-      selectedNode: {
-        type: String,
-        notify: true
-      },
-      highlightedNode: {
-        type: String,
-        notify: true
-      },
-      // The enum value of the include property of the selected node.
-      selectedNodeInclude: {
-        type: Number,
-        notify: true
-      },
-      // Whether debugger data is enabled for this instance of Tensorboard.
-      debuggerDataEnabled: Boolean,
-      // Whether health pills are currently being loaded, in which case we show a spinner (and the
-      // current health pills shown might be out of date).
-      areHealthPillsLoading: Boolean,
-      healthPillEntries: {
-        type: Array,
-        value: tf.graph.scene.healthPillEntries,
-        readOnly: true,
-      },
-      healthPillValuesForSelectedNode: {
-        type: Array,
-        computed: '_computeHealthPillForNode(nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading)',
-      },
-      // When all-steps mode is enabled, the user can request health pills for any step. In this
-      // mode, Tensorboard makes a request every time the user drags the slider to a different step.
-      allStepsModeEnabled: {
-        type: Boolean,
-        notify: true,
-      },
-      // The biggest step value ever seen. Used to determine what steps of health pills to let the
-      // user fetch in all steps mode.
-      _biggestStepEverSeen: {
-        type: Number,
-        computed: '_computeBiggestStepEverSeen(nodeNamesToHealthPills)',
-      },
-      _maxStepIndex: {
-        type: Number,
-        computed: '_computeMaxStepIndex(nodeNamesToHealthPills)',
-      },
-      _currentStepDisplayValue: {
-        type: String,
-        computed: '_computeCurrentStepDisplayValue(nodeNamesToHealthPills, healthPillStepIndex, allStepsModeEnabled, specificHealthPillStep, areHealthPillsLoading)',
-      },
-    },
-    listeners: {
-      'node-list-item-click': '_nodeListItemClicked',
-      'node-list-item-mouseover': '_nodeListItemMouseover',
-      'node-list-item-mouseout': '_nodeListItemMouseout'
-    },
-    _nodeListItemClicked: function(event) {
-      this.selectedNode = event.detail.nodeName;
-    },
-    _nodeListItemMouseover: function(event) {
-      this.highlightedNode = event.detail.nodeName;
-    },
-    _nodeListItemMouseout: function() {
-      this.highlightedNode = null;
-    },
-    _healthPillsAvailable: function(debuggerDataEnabled, nodeNamesToHealthPills) {
-      // So long as there is a mapping (even if empty) from node name to health pills, show the
-      // legend and slider. We do that because, even if no health pills exist at the current step,
-      // the user may desire to change steps, and the slider must show for the user to do that.
-      return debuggerDataEnabled && nodeNamesToHealthPills;
-    },
-    _computeTensorCountString: function(healthPillValuesForSelectedNode, valueIndex) {
-      if (!healthPillValuesForSelectedNode) {
-        // No health pill data is available.
-        return '';
-      }
-
-      return healthPillValuesForSelectedNode[valueIndex].toFixed(0);
-    },
-    _computeHealthPillForNode: function(
-        nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading) {
-      if (areHealthPillsLoading) {
-        // Health pills are loading. Do not render data that is out of date.
-        return null;
-      }
-
-      if (!selectedNode) {
-        // No node is selected.
-        return null;
-      }
-
-      const healthPills = nodeNamesToHealthPills[selectedNode];
-      if (!healthPills) {
-        // This node lacks a health pill.
-        return null;
-      }
-
-      // If all steps mode is enabled, we use the first health pill in the list because the JSON
-      // response from the server is a mapping between node name and a list of 1 health pill.
-      const healthPill = healthPills[allStepsModeEnabled ? 0 : healthPillStepIndex];
-      if (!healthPill) {
-        // This node lacks a health pill at the current step.
-        return null;
-      }
-
-      // The health pill count values start at 2. Each health pill contains 6 values.
-      return healthPill.value.slice(2, 8);
-    },
-    _computeCurrentStepDisplayValue: function(
-        nodeNamesToHealthPills,
-        healthPillStepIndex,
-        allStepsModeEnabled,
-        specificHealthPillStep,
-        areHealthPillsLoading) {
-      if (allStepsModeEnabled) {
-        // The user seeks health pills for specific step from the server.
-        return specificHealthPillStep.toFixed(0);
-      }
-
-      if (areHealthPillsLoading) {
-        // The current step is undefined.
-        return 0;
-      }
-
-      for (let nodeName in nodeNamesToHealthPills) {
-        // All nodes have the same number of steps stored, so only examine 1 node. We cannot
-        // directly index into the nodeNamesToHealthPills object because we do not have a key.
-        // If all steps mode is enabled, we only have 1 step to show.
-        return nodeNamesToHealthPills[nodeName][healthPillStepIndex].step.toFixed(0);
-      }
-
-      // The current step could not be computed.
-      return 0;
-    },
-    _computeBiggestStepEverSeen: function(nodeNamesToHealthPills) {
-      for (let nodeName in nodeNamesToHealthPills) {
-        // All nodes have the same number of steps stored, so only examine 1 node.
-        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
-        // of the array will be greater than 1.
-        var healthPills = nodeNamesToHealthPills[nodeName];
-        return Math.max(this._biggestStepEverSeen, healthPills[healthPills.length - 1].step);
-      }
-
-      // No steps seen so far. Default to 0.
-      return this._biggestStepEverSeen || 0;
-    },
-    _computeMaxStepIndex: function(nodeNamesToHealthPills) {
-      for (let nodeName in nodeNamesToHealthPills) {
-        // All nodes have the same number of steps stored, so only examine 1 node.
-        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
-        // of the array will be greater than 1.
-        return nodeNamesToHealthPills[nodeName].length - 1;
-      }
-
-      // Return a falsy value. The slider should be hidden.
-      return 0;
-    },
-  });
-})();
-</script>
-</dom-module>
-<link rel="import" href="../paper-progress/paper-progress.html">
-
-
-<dom-module id="tf-graph-board" assetpath="../tf-graph-board/">
-<template>
-<style>
-::host {
-  display: block;
-}
-
-/deep/ .close {
-  position: absolute;
-  cursor: pointer;
-  left: 15px;
-  bottom: 15px;
-}
-
-.container {
-  width: 100%;
-  height: 100%;
-  opacity: 1;
-}
-
-.container.loading {
-  cursor: progress;
-  opacity: 0.1;
-}
-
-.container.loading.error {
-  cursor: auto;
-}
-
-#info {
-  position: absolute;
-  right: 5px;
-  top: 5px;
-  padding: 0px;
-  max-width: 380px;
-  min-width: 320px;
-  background-color: rgba(255,255,255,0.9);
-  @apply(--shadow-elevation-2dp);
-}
-
-#main {
-  width: 100%;
-  height: 100%;
-}
-
-#progress-bar {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  position: absolute;
-  top: 40px;
-  left: 0;
-  font-size: 13px;
-}
-
-#progress-msg {
-  width: 400px;
-  margin-bottom: 5px;
-}
-
-paper-progress {
-  width: 400px;
-  --paper-progress-height: 6px;
-  --paper-progress-active-color: #f3913e;
-}
-
-.context-menu {
-  position: absolute;
-  display: none;
-  background-color: #e2e2e2;
-  border-radius: 2px;
-  font-size: 14px;
-  min-width: 150px;
-  border: 1px solid #d4d4d4;
-}
-
-/deep/ .context-menu ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  cursor: default;
-}
-
-/deep/ .context-menu ul li {
-  padding: 4px 16px;
-}
-
-/deep/ .context-menu ul li:hover {
-  background-color: #f3913e;
-  color: white;
-}
-</style>
-<template is="dom-if" if="[[_isNotComplete(progress)]]">
-  <div id="progress-bar">
-    <div id="progress-msg">[[progress.msg]]</div>
-    <paper-progress value="[[progress.value]]"></paper-progress>
-  </div>
-</template>
-<div class$="[[_getContainerClass(progress)]]">
-  <div id="main">
-    <tf-graph id="graph" graph-hierarchy="{{graphHierarchy}}" basic-graph="[[graph]]" hierarchy-params="[[hierarchyParams]]" render-hierarchy="{{renderHierarchy}}" devices-for-stats="[[devicesForStats]]" stats="[[stats]]" selected-node="{{_selectedNode}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="{{colorByParams}}" progress="{{progress}}" node-names-to-health-pills="[[nodeNamesToHealthPills]]" health-pill-step-index="[[healthPillStepIndex]]"></tf-graph>
-  </div>
-  <div id="info">
-    <tf-graph-info id="graph-info" title="selected" graph-hierarchy="[[graphHierarchy]]" render-hierarchy="[[renderHierarchy]]" graph="[[graph]]" selected-node="{{_selectedNode}}" selected-node-include="{{_selectedNodeInclude}}" highlighted-node="{{_highlightedNode}}" color-by="[[colorBy]]" color-by-params="[[colorByParams]]" debugger-data-enabled="[[debuggerDataEnabled]]" are-health-pills-loading="[[areHealthPillsLoading]]" node-names-to-health-pills="[[nodeNamesToHealthPills]]" all-steps-mode-enabled="{{allStepsModeEnabled}}" specific-health-pill-step="{{specificHealthPillStep}}" health-pill-step-index="{{healthPillStepIndex}}"></tf-graph-info>
-  </div>
-  <div class="context-menu"></div>
-</div>
-</template>
-</dom-module>
-
-<script>
-Polymer({
-  is: 'tf-graph-board',
-  properties: {
-    // Public API.
-    graphHierarchy: Object,
-    graph: Object,
-    stats: Object,
-    /**
-     * @type {value: number, msg: string}
-     *
-     * A number between 0 and 100 denoting the % of progress
-     * for the progress bar and the displayed message.
-     */
-    progress: Object,
-    colorBy: String,
-    colorByParams: {
-      type: Object,
-      notify: true
-    },
-    renderHierarchy: {
-      type: Object,
-      notify: true
-    },
-    // Whether debugger data is enabled for this instance of Tensorboard.
-    debuggerDataEnabled: Boolean,
-    // Whether health pills are currently being loaded.
-    areHealthPillsLoading: Boolean,
-    // A mapping between node name to the tf.graph.scene.HealthPill to render.
-    nodeNamesToHealthPills: Object,
-    // Whether the user can request health pills for individual steps from the server. This can be
-    // slow compared the default of showing sampled health pills.
-    allStepsModeEnabled: {
-      type: Boolean,
-      notify: true,
-      value: false,
-    },
-    // Relevant if allStepsModeEnabled. The specific step for which to fetch health pills from the
-    // server for.
-    specificHealthPillStep: {
-      type: Number,
-      notify: true,
-      value: 0,
-    },
-    // The step of health pills to show throughout the graph.
-    healthPillStepIndex: Number,
-    // Private API: Data routing between child components.
-    _selectedNode: String,
-    // The enum value of the include property of the selected node.
-    _selectedNodeInclude: Number,
-    _highlightedNode: String
-  },
-  listeners: {
-    'node-toggle-extract': '_nodeToggleExtract'
-  },
-  observers: [
-    '_updateNodeInclude(_selectedNode)'
-  ],
-  /** True if the progress is not complete yet (< 100 %). */
-  _isNotComplete: function(progress) {
-    return progress.value < 100;
-  },
-  _getContainerClass: function(progress) {
-    var result = 'container';
-    if (progress.error) {
-      result += ' error';
-    }
-    if (this._isNotComplete(progress)) {
-      result += ' loading';
-    }
-    return result;
-  },
-  _updateNodeInclude: function(nodeName) {
-    var node = this.graphHierarchy.node(nodeName);
-    this.set("_selectedNodeInclude",
-      node ? node.include : tf.graph.InclusionType.UNSPECIFIED);
-  },
-  _nodeToggleExtract: function() {
-    this._updateNodeInclude(this._selectedNode);
-  }
-});
-</script>
-<link rel="import" href="../paper-radio-group/paper-radio-group.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<dom-module id="tf-graph-controls" assetpath="../tf-graph/">
-<template>
-<style>
-:host {
-  font-size: 12px;
-  color: gray;
-  --paper-font-subhead: {
-    font-size: 14px;
-    color: gray;
-  };
-  --paper-dropdown-menu-icon: {
-    width: 15px;
-    height: 15px;
-  };
-  --paper-dropdown-menu-button: {
-    padding: 0;
-  };
-  --paper-dropdown-menu-input: {
-    padding: 0;
-  };
-  --paper-item-min-height: 30px;
-}
-
-paper-button[raised].keyboard-focus {
-  font-weight: normal;
-}
-
-.run-dropdown {
-  --paper-input-container: {
-    padding: 9px 0 0 25px;
-  };
-}
-
-.color-dropdown {
-  --paper-input-container: {
-    padding: 9px 0 0 13px;
-  };
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-table td {
-  padding: 0;
-  margin: 0;
-}
-
-.allcontrols {
-  width: 188px;
-  padding: 0 30px;
-}
-
-.legend-holder {
-  position: absolute;
-  bottom: 0;
-  padding-bottom: 10px;
-}
-
-paper-radio-button {
-  display: block;
-  padding: 5px;
-}
-svg.icon {
-  width: 60px;
-  height: 18px;
-}
-.icon ellipse {
-  rx: 10px;
-  ry: 5px;
-  stroke: #CCC;
-  stroke-width: 1px;
-  fill: #FFFFFF;
-  cy: 10px;
-}
-.icon rect {
-  height: 14px;
-  width: 35px;
-  rx: 5px;
-  ry: 5px;
-  stroke: #CCC;
-  stroke-width: 2px;
-  fill: #D9D9D9;
-}
-.domainValues {
-  margin-bottom: 10px;
-  width: 165px;
-}
-.domainStart {
-  float: left;
-}
-.domainEnd {
-  float: right;
-}
-.colorBox {
-  width: 20px;
-}
-
-.image-icon {
-  width: 24px;
-  height: 24px;
-}
-
-.help-icon {
-  height: 15px;
-  margin: 0;
-  padding: 0;
-}
-
-.gray {
-  color: #666;
-}
-
-.title {
-  font-size: 16px;
-  margin: 8px 5px 8px 0;
-  color: black;
-}
-.title small {
-  font-weight: normal;
-}
-.deviceList, .xlaClusterList {
-  max-height: 200px;
-  overflow-y: auto;
-}
-
-#file {
-  padding: 8px 0;
-}
-
-.color-legend-row {
-  clear: both;
-  height: 20px;
-  margin-top: 5px;
-  position: relative;
-}
-
-.color-legend-row svg {
-  position: absolute;
-  top: -1px;
-  width: 40px;
-}
-
-.color-legend-row span.color-legend-value {
-  margin-left: 60px;
-}
-
-#grey-rect {
-  fill: #eee;
-  stroke: #a6a6a6;
-}
-
-#faded-rect {
-  fill: url("#rectHatch");
-  stroke: var(--tb-graph-faded);
-}
-
-.button-text {
-  text-transform: none;
-  padding: 8px 18px 0 18px;
-  font-size: 14px
-}
-
-.upload-button {
-  width: 165px;
-  height: 25px;
-  text-transform: none;
-  margin-top: 4px;
-}
-
-.iconbutton {
-  padding: 2px;
-  width: 30px;
-  height: 30px;
-  color: var(--paper-orange-500);
-}
-
-.hidden-input {
-  height: 0px;
-  width: 0px;
-  overflow:hidden;
-}
-
-.allcontrols .control-holder {
-  display: flex;
-  clear: both;
-}
-
-.allcontrols .control-holder paper-radio-group {
-  margin-top: 5px;
-}
-
-span.counter {
-  font-size: 13px;
-  color: gray;
-}
-
-.runs paper-item {
-  --paper-item: {
-    white-space: nowrap;
-  }
-}
-
-table.control-holder {
-  border: 0;
-  border-collapse: collapse;
-}
-
-table.tf-graph-controls td.input-element-table-data {
-  padding: 0 0 0 20px;
-}
-
-/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
-/*  tooltips do not appear. */
-#color-by-radio-group paper-radio-button {
-  pointer-events: auto !important;
-}
-</style>
-<svg width="0" height="0">
-  <defs>
-    <g id="legend-rect">
-      <rect x="1" y="1" stroke-width="2px" height="14" width="35" rx="5" ry="5"></rect>
-    </g>
-    <g id="grey-rect">
-       <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#legend-rect"></use>
-     </g>
-     <g id="faded-rect">
-       <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#legend-rect"></use>
-     </g>
-  </defs>
-</svg>
-<div class="allcontrols">
-  <div class="control-holder">
-    <paper-icon-button icon="aspect-ratio" class="iconbutton" on-click="fit" alt="Fit to screen">
-    </paper-icon-button>
-    <paper-button class="button-text" on-click="fit">Fit to screen
-    </paper-button>
-  </div>
-  <div class="control-holder">
-    <paper-icon-button icon="file-download" class="iconbutton" on-click="download" alt="Download PNG">
-    </paper-icon-button>
-    <paper-button class="button-text" on-click="download">Download PNG
-    </paper-button>
-    <a href="#" id="graphdownload" class="title" download="graph.png">
-    </a>
-  </div>
-  <div class="control-holder runs">
-    <div class="title">Run <span class="counter">([[datasets.length]])</span></div>
-    <paper-dropdown-menu no-label-float="" no-animations="" noink="" class="run-dropdown">
-      <paper-menu id="select" class="dropdown-content" selected="{{selectedDataset}}">
-        <template is="dom-repeat" items="[[datasets]]">
-          <paper-item>[[item.name]]</paper-item>
-        </template>
-      </paper-menu>
-    </paper-dropdown-menu>
-  </div>
-  <template is="dom-if" if="[[showSessionRunsDropdown]]">
-    <div class="control-holder">
-      <div class="title">Session runs <span class="counter">([[_numSessionRuns(metadataTags)]])</span></div>
-      <paper-dropdown-menu no-label-float="" no-animations="" noink="" class="run-dropdown">
-        <paper-menu id="select" class="dropdown-content" selected="{{selectedMetadataTag}}">
-          <template is="dom-repeat" items="[[metadataTags]]">
-            <paper-item>[[item.tag]]</paper-item>
-          </template>
-          <paper-item>None</paper-item>
-        </paper-menu>
-      </paper-dropdown-menu>
-    </div>
-  </template>
-  <template is="dom-if" if="[[showUploadButton]]">
-    <div class="control-holder">
-      <div class="title">Upload</div>
-      <paper-button raised="" class="text-button upload-button" on-click="_getFile">Choose File</paper-button>
-      <div class="hidden-input">
-        <input type="file" id="file" name="file" on-change="_updateFileInput">
-      </div>
-    </div>
-  </template>
-  <table class="control-holder">
-    <tbody><tr>
-      <td class="title">Trace inputs</td>
-      <td class="input-element-table-data">
-        <paper-toggle-button id="trace-inputs"></paper-toggle-button>
-      </td>
-    </tr>
-    <template is="dom-if" if="[[healthPillsFeatureEnabled]]">
-      <tr>
-        <td class="title">Show health pills</td>
-        <td class="input-element-table-data">
-          <paper-toggle-button checked="{{healthPillsToggledOn}}"></paper-toggle-button>
-        </td>
-      </tr>
-    </template>
-  </tbody></table>
-  <div class="control-holder">
-    <div class="title">Color</div>
-    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
-      <paper-radio-button name="structure">Structure</paper-radio-button>
-
-      <paper-radio-button name="device">Device</paper-radio-button>
-
-      <paper-radio-button id="xla-cluster-radio-button" name="xla_cluster" disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
-        XLA Cluster
-      </paper-radio-button>
-      <paper-tooltip for="xla-cluster-radio-button" position="right">
-        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
-      </paper-tooltip>
-
-      <paper-radio-button id="compute-time-radio-button" name="compute_time" disabled="[[!stats]]">
-        Compute time
-      </paper-radio-button>
-      <paper-tooltip for="compute-time-radio-button" position="right">
-        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
-        FileWriter when a specific session is run.
-      </paper-tooltip>
-
-      <paper-radio-button id="memory-radio-button" name="memory" disabled="[[!stats]]">
-        Memory
-      </paper-radio-button>
-      <paper-tooltip for="memory-radio-button" position="right">
-        Coloring by memory is only enabled if the RunMetadata proto is passed to the
-        FileWriter when a specific session is run.
-      </paper-tooltip>
-    </paper-radio-group>
-  </div>
-  <div>
-    <template is="dom-if" if="[[_isGradientColoring(stats, colorBy)]]">
-      <svg width="140" height="20" style="margin: 0 5px" class="color-text">
-        <defs>
-          <linearGradient id="linearGradient" x1="0%" y1="0%" x2="100%" y2="0%">
-            <stop class="start" offset="0%" stop-color$="[[_currentGradientParams.startColor]]"></stop>
-            <stop class="end" offset="100%" stop-color$="[[_currentGradientParams.endColor]]"></stop>
-          </linearGradient>
-        </defs>
-        <rect x="0" y="0" width="135" height="20" fill="url(#linearGradient)" stroke="black"></rect>
-      </svg>
-      <div class="domainValues color-text">
-        <div class="domainStart">[[_currentGradientParams.minValue]]</div>
-        <div class="domainEnd">[[_currentGradientParams.maxValue]]</div>
-      </div>
-      <br style="clear: both">
-      <div>Devices included in stats:</div>
-      <div class="deviceList">
-        <table>
-        <template is="dom-repeat" items="[[_getDevices(devicesForStats)]]">
-          <tr>
-            <td>
-              <input type="checkbox" value$="[[item.device]]" checked$="[[item.used]]" on-click="_deviceCheckboxClicked">
-            </td>
-            <td>
-              <div>
-                <span>[[item.suffix]]</span>
-                <template is="dom-if" if="[[item.ignoredMsg]]">
-                  <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-                  <paper-tooltip position="right" animation-delay="0">[[item.ignoredMsg]]</paper-tooltip>
-                </template>
-              </div>
-            </td>
-          </tr>
-        </template>
-        </table>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'structure')]]">
-      <div class="color-text">
-        <div class="color-legend-row">
-          <div style="position: absolute;">
-            colors
-          </div>
-          <span class="color-legend-value">same substructure</span>
-        </div>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#grey-rect" x="0" y="0"></use>
-          </svg>
-          <span class="color-legend-value">unique substructure</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'device')]]">
-      <div class="color-text">
-        <div class="deviceList">
-          <table>
-          <template is="dom-repeat" items="[[colorByParams.device]]">
-            <tr>
-              <td style$="[[_getBackgroundColor(item.color)]]">
-                <div class="colorBox"></div>
-              </td>
-              <td>
-                <div>[[item.device]]</div>
-              </td>
-            </tr>
-          </template>
-          </table>
-        </div>
-        <br>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#grey-rect" x="0" y="0"></use>
-          </svg>
-          <span class="color-legend-value">unknown device</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
-      <div class="color-text">
-        <div class="xlaClusterList">
-          <table>
-          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
-            <tr>
-              <td style$="[[_getBackgroundColor(item.color)]]">
-                <div class="colorBox"></div>
-              </td>
-              <td>
-                <div>[[item.xla_cluster]]</div>
-              </td>
-            </tr>
-          </template>
-          </table>
-        </div>
-        <br>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#grey-rect" x="0" y="0"></use>
-          </svg>
-          <span class="color-legend-value">unknown XLA cluster</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_statsNotNull(stats)]]">
-      <div class="color-legend-row">
-        <svg>
-          <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#faded-rect" x="0" y="0"></use>
-        </svg>
-        <span class="color-legend-value">unused substructure</span>
-      </div>
-    </template>
-  </div>
-  
-  <template is="dom-if" if="[[!_isGradientColoring(stats, colorBy)]]">
-    <div class="legend-holder">
-      <table>
-        <tbody><tr>
-          <td><div class="title">Graph</div></td>
-          <td>(* = expandable)</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon">
-              <rect transform="translate(3, 1)" height="14" width="35" rx="5" ry="5"></rect>
-            </svg>
-          </td>
-          <td>Namespace<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" preserveAspectRatio="xMinYMid meet" viewBox="0 0 10 10">
-              <use xlink:href="#op-node-stamp" fill="white" stroke="#ccc" x="9.5" y="6"></use>
-            </svg>
-          </td>
-          <td>OpNode</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet" viewBox="0 0 12 12">
-              <use xlink:href="#op-series-horizontal-stamp" fill="white" stroke="#ccc" x="2" y="2"></use>
-            </svg>
-          </td>
-          <td>Unconnected series<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <use xlink:href="#op-series-vertical-stamp" fill="white" stroke="#ccc" x="2" y="2"></use>
-            </svg>
-          </td>
-          <td>Connected series<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon">
-              <circle fill="white" stroke="#848484" cx="10" cy="10" r="5"></circle>
-            </svg>
-          </td>
-          <td>Constant</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="image-icon" viewBox="0 0 12 12" width="24" height="24">
-              <use x="0" y="0" class="image-icon" xlink:href="#summary-icon"></use>
-            </svg>
-          </td>
-          <td>Summary</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <defs>
-                <marker id="ref-arrowhead-legend" fill="#bbb" markerWidth="10" markerHeight="10" refX="1" refY="5" orient="auto">
-                  <path d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"></path>
-                </marker>
-              </defs>
-              <path stroke="#bbb" d="M2 9 l 23 0" stroke-linecap="round"></path>
-            </svg>
-          </td>
-          <td>Dataflow edge</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <path stroke="#bbb" d="M2 9 l 23 0" stroke-linecap="round" stroke-dasharray="2, 2"></path>
-            </svg>
-          </td>
-          <td>Control dependency edge</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <path marker-start="url(#ref-arrowhead-legend)" stroke="#bbb" d="M2 9 l 23 0" stroke-linecap="round"></path>
-            </svg>
-          </td>
-          <td>Reference edge</td>
-        </tr>
-      </tbody></table>
-    </div>
-  </template>
-  </div>
-</template>
-<script>
-(function() { // Private scope.
-/**
- * Stats from device names that match these regexes will be excluded by default.
- * The user can still turn on a device by selecting the checkbox in the device list.
- * See b/29089982 for context.
- */
-var DEVICE_NAMES_EXCLUDE = [
-  {
-    regex: /gpu:[0-9]+$/,
-    msg: 'Excluded by default since this is a CPU thread setting up GPU kernels.'
-  }
-];
-
-Polymer({
-  is: 'tf-graph-controls',
-  properties: {
-    // Public API.
-    stats: {
-      value: null,
-      type: Object,
-      observer: '_statsChanged'
-    },
-    devicesForStats: {
-      value: null,
-      type: Object,
-      notify: true,
-      readonly: true,
-    },
-    colorBy: {
-      type: String,
-      value: 'structure',
-      notify: true,
-      readonly: true
-    },
-    colorByParams: Object,
-    datasets: {
-      type: Array,
-      observer: '_datasetsChanged'
-    },
-    renderHierarchy: {
-      type: Object,
-      notify: true,
-    },
-    metadataTags: {
-      type: Array,
-      computed: '_getMetadataTags(selectedDataset, datasets)'
-    },
-    selectedDataset: {
-      type: Number,
-      notify: true,
-      value: 0,
-      observer: '_selectedDatasetChanged'
-    },
-    selectedFile: {
-      type: Object,
-      notify: true
-    },
-    selectedMetadataTag: {
-      type: Number,
-      notify: true,
-      value: -1
-    },
-    _currentGradientParams: {
-      type: Object,
-      computed: '_getCurrentGradientParams(colorByParams, colorBy)'
-    },
-    showSessionRunsDropdown: {
-      type: Boolean,
-      value: true
-    },
-    showUploadButton: {
-      type: Boolean,
-      value: true
-    },
-    // This stores whether the feature for showing health pills is enabled in the first place.
-    healthPillsFeatureEnabled: Boolean,
-    // This stores whether to show health pills. Only relevant if healthPillsFeatureEnabled. The
-    // user can toggle this value.
-    healthPillsToggledOn: {
-      type: Boolean,
-      notify: true,
-    },
-  },
-  listeners: {
-    'trace-inputs.change': '_traceInputToggleChanged'
-  },
-  _traceInputToggleChanged: function(event) {
-    // Flip the state of the trace inputs flag.
-    this.renderHierarchy.traceInputs = event.target.active;
-    tf.graph.scene.node.traceInputs(this.renderHierarchy);
-  },
-  _xlaClustersProvided: function(renderHierarchy) {
-    return renderHierarchy &&
-        renderHierarchy.hierarchy &&
-        renderHierarchy.hierarchy.xlaClusters.length > 0;
-  },
-  _statsChanged: function(stats) {
-    if (stats == null) {
-      return;
-    }
-    var devicesForStats = {};
-    var devices = _.each(stats.dev_stats, function(d) {
-      // Avoid device names that are ignored by default.
-      var exclude = _.some(DEVICE_NAMES_EXCLUDE, function(rule) {
-        return rule.regex.test(d.device);
-      });
-      if (!exclude) {
-        devicesForStats[d.device] = true;
-      }
-    });
-    this.set('devicesForStats', devicesForStats);
-  },
-  _getDevices: function(devicesForStats) {
-    var devices = _.map(this.stats.dev_stats, function(d) {
-      return d.device;
-    });
-    // Devices names can be long so we remove the longest common prefix
-    // before showing the devices in a list.
-    var suffixes = tf.graph.util.removeCommonPrefix(devices);
-    return _.map(devices, function(device, i) {
-      var ignoredMsg = null;
-      _.each(DEVICE_NAMES_EXCLUDE, function(rule) {
-        if (rule.regex.test(device)) {
-          ignoredMsg = rule.msg;
-        }
-      });
-      return {
-        device: device,
-        suffix: suffixes[i],
-        used: devicesForStats[device],
-        ignoredMsg: ignoredMsg
-      };
-    });
-  },
-  _deviceCheckboxClicked: function(checkbox) {
-    // Update the device map.
-    var devicesForStats = _.extend({}, this.devicesForStats);
-    var device = checkbox.target.value;
-    if (checkbox.target.checked) {
-      devicesForStats[device] = true;
-    } else {
-      delete devicesForStats[device];
-    }
-    this.set('devicesForStats', devicesForStats);
-  },
-  _numSessionRuns: function(metadataTags) {
-    return metadataTags != null ? metadataTags.length : 0;
-  },
-  _getBackgroundColor: function(color) {
-    return 'background-color:' + color;
-  },
-  fit: function() {
-    document.querySelector('#scene').fit();
-  },
-  _isGradientColoring: function(stats, colorBy) {
-    return ["compute_time", "memory"].indexOf(colorBy) !== -1
-        && stats != null;
-  },
-  _equals: function(a, b) {
-    return a === b;
-  },
-  _getCurrentGradientParams: function(colorByParams, colorBy) {
-    if (!this._isGradientColoring(this.stats, colorBy)) {
-      return;
-    }
-    var params = colorByParams[colorBy];
-    var minValue = params.minValue;
-    var maxValue = params.maxValue;
-    if (colorBy === 'memory') {
-      minValue = tf.graph.util.convertUnitsToHumanReadable(
-          minValue, tf.graph.util.MEMORY_UNITS);
-      maxValue = tf.graph.util.convertUnitsToHumanReadable(
-          maxValue, tf.graph.util.MEMORY_UNITS);
-    } else if (colorBy === 'compute_time') {
-      minValue = tf.graph.util.convertUnitsToHumanReadable(
-          minValue, tf.graph.util.TIME_UNITS);
-      maxValue = tf.graph.util.convertUnitsToHumanReadable(
-          maxValue, tf.graph.util.TIME_UNITS);
-    }
-    return {
-      minValue: minValue,
-      maxValue: maxValue,
-      startColor: params.startColor,
-      endColor: params.endColor
-    };
-  },
-  download: function() {
-    this.$.graphdownload.click();
-  },
-  _updateFileInput: function(e) {
-    var file = e.target.files[0];
-    if (!file) {
-      return;
-    }
-    this._setDownloadFilename(file.name);
-    this.set('selectedFile', e);
-  },
-  _datasetsChanged: function(newDatasets, oldDatasets) {
-    if (oldDatasets != null || this.selected == null) {
-      // Select the first dataset by default.
-      this.set('selectedDataset', 0);
-      this._setDownloadFilename(this.datasets[this.selectedDataset].path);
-    }
-  },
-  _getMetadataTags: function(selectedDataset, datasets) {
-    return this.datasets[selectedDataset].runMetadata;
-  },
-  _selectedDatasetChanged: function(newDataset, oldDataset) {
-    if (this.datasets) {
-      this.set('selectedMetadataTag', -1);
-      this.set('colorBy', 'structure');
-      this.$['trace-inputs'].active = false; // Set trace input to off-state.
-      this._setDownloadFilename(this.datasets[newDataset].path);
-    }
-  },
-  _getFile: function() {
-    this.$$("#file").click();
-  },
-  _setDownloadFilename: function(graphPath) {
-    // Strip off everything before the last "/" and strip off the file
-    // extension in order to get the name of the PNG for the graph.
-    var dotIndex = graphPath.lastIndexOf('.');
-    if (dotIndex) {
-      graphPath = graphPath.substring(0, dotIndex);
-    }
-    var slashIndex = graphPath.lastIndexOf('/');
-    if (slashIndex) {
-      graphPath = graphPath.substring(slashIndex + 1);
-    }
-    this.$.graphdownload.setAttribute('download', graphPath + '.png');
-  }
-});
-})(); // Closing private scope.
-</script>
-</dom-module>
-
-<dom-module id="tf-graph-dashboard" assetpath="../tf-graph-dashboard/">
-<template>
-<tf-no-data-warning data-type="graph" show-warning="[[_datasetsEmpty(_datasets)]]"></tf-no-data-warning>
-<template is="dom-if" if="[[!_datasetsEmpty(_datasets)]]">
-<tf-dashboard-layout>
-<div class="sidebar">
-  <tf-graph-controls id="controls" devices-for-stats="{{_devicesForStats}}" color-by-params="[[_colorByParams]]" stats="[[_stats]]" color-by="{{_colorBy}}" datasets="[[_datasets]]" render-hierarchy="[[_renderHierarchy]]" selected-dataset="{{_selectedDataset}}" selected-file="{{_selectedFile}}" selected-metadata-tag="{{_selectedMetadataTag}}" health-pills-feature-enabled="[[debuggerDataEnabled]]" health-pills-toggled-on="{{healthPillsToggledOn}}"></tf-graph-controls>
-  <tf-graph-loader id="loader" datasets="[[_datasets]]" selected-dataset="[[_selectedDataset]]" selected-metadata-tag="[[_selectedMetadataTag]]" selected-file="[[_selectedFile]]" out-graph-hierarchy="{{_graphHierarchy}}" out-graph="{{_graph}}" out-stats="{{_stats}}" progress="{{_progress}}" out-hierarchy-params="{{_hierarchyParams}}"></tf-graph-loader>
-</div>
-<div class="center">
-    <tf-graph-board id="graphboard" devices-for-stats="[[_devicesForStats]]" color-by="[[_colorBy]]" color-by-params="{{_colorByParams}}" graph-hierarchy="[[_graphHierarchy]]" graph="[[_graph]]" hierarchy-params="[[_hierarchyParams]]" progress="[[_progress]]" debugger-data-enabled="[[debuggerDataEnabled]]" are-health-pills-loading="[[_areHealthPillsLoading]]" node-names-to-health-pills="[[_nodeNamesToHealthPills]]" all-steps-mode-enabled="{{allStepsModeEnabled}}" specific-health-pill-step="{{specificHealthPillStep}}" health-pill-step-index="[[_healthPillStepIndex]]" render-hierarchy="{{_renderHierarchy}}" stats="[[_stats]]"></tf-graph-board>
-</div>
-</tf-dashboard-layout>
-</template>
-<style>
-
-:host /deep/ {
-  font-family: 'Roboto', sans-serif;
-}
-
-.center {
-  position: relative;
-  height: 100%;
-}
-
-</style>
-</template>
-</dom-module>
-
-<script>
-(function() {
-TF.Dashboard.TfGraphDashboard = Polymer({
-  is: 'tf-graph-dashboard',
-  factoryImpl: function(backend, debuggerDataEnabled) {
-    this.backend = backend;
-    this.debuggerDataEnabled = debuggerDataEnabled;
-  },
-  behaviors: [
-    TF.Dashboard.DashboardBehavior("graphs"),
-    TF.Dashboard.ReloadBehavior("tf-graph-dashboard"),
-    TF.Backend.Behavior,
-  ],
-  properties: {
-    _datasets: Object,
-    _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
-    backend: Object,
-    debuggerDataEnabled: Boolean,
-    allStepsModeEnabled: Boolean,
-    specificHealthPillStep: {type: Number, value: 0},
-    healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
-    _isAttached: Boolean,
-    // Whether this dashboard is initialized. This dashboard should only be initialized once.
-    _initialized: Boolean,
-    // Whether health pills are currently being loaded, in which case we may want to say show a
-    // spinner.
-    _areHealthPillsLoading: Boolean,
-    // Maps the names of nodes to an array of health pills (HealthPillDatums).
-    _nodeNamesToHealthPills: {
-      type: Object,
-      value: {},
-    },
-    _healthPillStepIndex: Number,
-    // A strictly increasing ID. Each request for health pills has a unique ID. This helps us
-    // identify stale requests.
-    _healthPillRequestId: {type: Number, value: 1},
-    // The setTimeout ID for the pending request for health pills at a specific step.
-    _healthPillStepRequestTimerId: Number,
-    // The request for health pills at a specific step (as opposed to all sampled health pills) may
-    // involve slow disk reads. Hence, we throttle to 1 of those requests every this many ms.
-    _healthPillStepRequestTimerDelay: {
-      type: Number,
-      value: 500,
-      readOnly: true,
-    },
-    runs: Array,
-  },
-  listeners: {
-    'node-toggle-expand': '_handleNodeToggleExpand',
-  },
-  observers: [
-    '_maybeFetchHealthPillsAtSpecificStep(allStepsModeEnabled, specificHealthPillStep)',
-    '_maybeInitializeDashboard(backend, _isAttached)',
-  ],
-  attached: function() {
-    this.set('_isAttached', true);
-  },
-  detached: function() {
-    this.set('_isAttached', false);
-  },
-  reload: function() {
-    if (!this.debuggerDataEnabled ||
-        !this.healthPillsToggledOn ||
-        !this._renderHierarchy ||
-        this._datasetsEmpty(this._datasets)) {
-      // Do not load debugger data if the feature is disabled, if the user toggled off the feature,
-      // or if the graph itself has not loaded yet. We need the graph to load so that we know which
-      // nodes to request health pills for.
-      return;
-    }
-
-    // Request debugger data on graph reloads, but do not re-request the graph itself. The graph
-    // would not change across reloads.
-    this._requestHealthPills();
-  },
-  _maybeInitializeDashboard: function(backend, isAttached) {
-    if (this._initialized || !backend || !isAttached) {
-      // Either this dashboard is already initialized ... or we are not yet ready to initialize.
-      return;
-    }
-
-    // Set this to true so we only initialize once.
-    this._initialized = true;
-    Promise.all([backend.graphRuns(), backend.runMetadataRuns()])
-      .then(function(result) {
-        var runsWithGraph = result[0].sort(VZ.Sorting.compareTagNames);
-        var runToMetadata = result[1];
-        var datasets = _.map(runsWithGraph, function(runName) {
-          return {
-            name: runName,
-            path: backend.router.graph(
-                runName, tf.graph.LIMIT_ATTR_SIZE, tf.graph.LARGE_ATTRS_KEY),
-            runMetadata: runToMetadata[runName] ? _.map(
-              runToMetadata[runName].sort(VZ.Sorting.compareTagNames), function(tag) {
-                return {
-                  tag: tag,
-                  path: backend.router.runMetadata(tag, runName)
-                };
-              }, this) : []
-          };
-        }, this);
-        this.set('_datasets', datasets);
-      }.bind(this));
-  },
-  _requestHealthPills: function() {
-    this.set('_areHealthPillsLoading', true);
-    const requestId = ++this._healthPillRequestId;
-
-    if (this._healthPillStepRequestTimerId !== null) {
-      // A request for health pills is already scheduled to be initiated. Clear it, and schedule a
-      // new request.
-      window.clearTimeout(this._healthPillStepRequestTimerId);
-      this._healthPillStepRequestTimerId = null;
-    }
-
-    if (this.allStepsModeEnabled) {
-      // This path may be slow. Schedule network requests to start some time later. If another
-      // request is scheduled in the mean time, drop this current request.
-      this._healthPillStepRequestTimerId = setTimeout(function() {
-        this._healthPillStepRequestTimerId = null;
-        this._initiateNetworkRequestForHealthPills(requestId);
-      }.bind(this), this._healthPillStepRequestTimerDelay);
-    } else {
-      // The user is fetching sampled steps. This path is fast, so no need to throttle. Directly
-      // fetch the health pills across the network.
-      this._initiateNetworkRequestForHealthPills(requestId);
-    }
-  },
-  // Initiates the network request for health pills. Do not directly call this method - network
-  // requests may be throttled. Instead, call _requestHealthPills, which uses this method.
-  _initiateNetworkRequestForHealthPills: function(requestId) {
-    if (this._healthPillRequestId !== requestId) {
-      // This possibly scheduled request was outdated before it was even sent across the network. Do
-      // not bother initiating it.
-      return;
-    }
-
-    const specificStep = this.allStepsModeEnabled ? this.specificHealthPillStep : undefined;
-    this.backend.healthPills(this._renderHierarchy.getNamesOfRenderedOps(), specificStep).then(
-        function(result) {
-      if (!this.healthPillsToggledOn) {
-        // The user has opted to hide health pills via the toggle button.
-        return;
-      }
-
-      if (requestId !== this._healthPillRequestId) {
-        // This response is no longer relevant.
-        return;
-      }
-
-      // Set the index for which step to show for the health pills. By default, show the last step.
-      // A precondition we assume (that Tensorboard's reservoir sampling guarantees) is that all
-      // node names should be mapped to the same number of steps.
-      for (let nodeName in result) {
-        this.set('_healthPillStepIndex', result[nodeName].length - 1);
-        break;
-      }
-
-      this.set('_nodeNamesToHealthPills', result);
-      this.set('_areHealthPillsLoading', false);
-      this.set('_healthPillStepRequestTimerId', null);
-    }.bind(this));
-  },
-  _datasetsEmpty: function(datasets) {
-    return !datasets || !datasets.length;
-  },
-  _renderHierarchyChanged: function(renderHierarchy) {
-    // Reload any data on the graph when the render hierarchy (which determines which nodes are
-    // rendered) changes.
-    this.reload();
-  },
-  _handleNodeToggleExpand: function() {
-    // Nodes were toggled. We may need to request health pills for more nodes.
-    this._requestHealthPills();
-  },
-  _healthPillsToggledOnChanged: function(healthPillsToggledOn) {
-    if (healthPillsToggledOn) {
-      // Load health pills.
-      this.reload();
-    } else {
-      // Remove all health pills by setting an empty mapping.
-      this.set('_nodeNamesToHealthPills', {});
-    }
-  },
-  // Fetch health pills for a specific step if applicable.
-  _maybeFetchHealthPillsAtSpecificStep: function(allStepsModeEnabled, specificHealthPillStep) {
-    if (!this._renderHierarchy) {
-      // The graph is not ready yet.
-      return;
-    }
-
-    this._requestHealthPills();
-  },
-});
-})();
-</script>
-<link rel="import" href="../paper-material/paper-material.html">
-
-
-<style>
-  tf-text-loader p {
-    margin: 0.3em 0;
-  }
-
-  tf-text-loader table {
-    border-collapse: collapse;
-  }
-
-  tf-text-loader table th {
-    font-weight: 600;
-  }
-
-  tf-text-loader table th,
-  tf-text-loader table td {
-    padding: 6px 13px;
-    border: 1px solid #dfe2e5;
-  }
-
-  tf-text-loader table tr {
-    background-color: #fff;
-    border-top: 1px solid #c6cbd1;
-  }
-
-</style>
-<dom-module id="tf-text-loader" assetpath="../tf-text-dashboard/">
-
-  
-  <template>
-    <style include="scrollbar-style"></style>
-    <paper-material elevation="1" id="outer" class="container scrollbar">
-      <template id="repeater" is="dom-repeat" items="[[_texts]]">
-      <paper-material elevation="1" class="step-container">
-        step <span class="step-value">[[_numfmt(item.step)]]</span>
-      </paper-material>
-      <paper-material elevation="1" inner-h-t-m-l="[[item.text]]" class="text">
-        </paper-material>
-      </template>
-    </paper-material>
-
-
-    <style>
-      #outer {
-        display: block;
-        overflow: auto;
-        max-height: 500px;
-        position: relative;
-        border-radius: 3px;
-        border: 2px solid black;
-      }
-      .text {
-        margin: 0 10px 10px 10px;
-        border-radius: 0 3px 3px 3px;
-        background-color: white;
-        padding: 5px;
-        word-break: break-word;
-      }
-      .step-container {
-        border-left: 1px solid #ccc;
-        border-right: 1px solid #ccc;
-        border-top: 1px solid #ccc;
-        border-radius: 3px 3px 0 0;
-        font-style: italic;
-        margin-top: 10px;
-        background-color: var(--tb-ui-light-accent);
-        display: inline-block;
-        margin-left: 9px;
-        padding: 3px;
-        font-size: 12px;
-      }
-
-    </style>
-
-  </template>
-  <script>
-    Polymer({
-      is: "tf-text-loader",
-      properties: {
-        colorScale: Object,
-        run: String,
-        // This is an array of Tensorboard Text&Datum objects (See backend.ts for details). The
-        // properties of objects in this array are
-        // {
-        //   wall_time: Date,
-        //   step: number,
-        //   text: string,
-        // }
-        // they are ordered from most recent to oldest
-        _texts: {
-          type: Array,
-          value: [],
-        },
-
-      },
-      redraw: function() {
-        // Other dashboards logic requires a redraw method to be defined.
-      },
-      setVisibleSeries: function(runs) {
-        // Do nothing.
-      },
-      setSeriesData: function(run, texts) {
-        this.set("run", run);
-        this.set("_texts", texts.reverse());
-
-        // Update the border color based on the run.
-        var color = this.colorScale.scale(run);
-        this.$$("#outer").style.borderColor = color;
-      },
-      _numfmt: function(n) {
-        return d3.format(",")(n);
-      }
-    });
-  </script>
-</dom-module>
-
-<dom-module id="tf-text-dashboard" assetpath="../tf-text-dashboard/">
-  <template>
-    <paper-dialog with-backdrop="" id="actual-text-size-dialog"></paper-dialog>
-    <div id="plumbing">
-      <tf-color-scale id="colorScale" runs="[[runs]]" out-color-scale="{{_colorScale}}"></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper backend="[[backend]]" categories="{{_categories}}" color-scale="[[_colorScale]]" run2tag="[[run2tag]]" runs="[[runs]]" selected-runs="{{_selectedRuns}}">
-        </tf-sidebar-helper>
-      </div>
-      <div class="center">
-        <tf-panes-helper categories="[[_categories]]" color-scale="[[_colorScale]]" data-type="[[dataType]]" data-provider="[[dataProvider]]" data-not-found="[[dataNotFound]]" run2tag="[[run2tag]]" selected-runs="[[_selectedRuns]]" repeat-for-runs="">
-          <template>
-            <tf-text-loader color-scale="[[_colorScale]]"></tf-text-loader>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-    <style include="dashboard-style"></style>
-    <style>
-      tf-panes-helper {
-        --card-width: 100%;
-        --card-height: auto;
-        --card-expanded-width: 100%;
-        --card-expanded-height: 1000px;
-        --card-padding: 0 5px 5px 5px;
-        --show-expand-button: none;
-      }
-
-    </style>
-  </template>
-  <script>
-    TF.Dashboard.TfTextDashboard = Polymer({
-      is: "tf-text-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "text"
-        },
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("text"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-    });
-  </script>
-</dom-module>
-<dom-module id="vz-projector-styles" assetpath="../vz-projector/">
-<template>
-<style>
-:host {
-  --paper-input-container-label: {
-    font-size: 14px;
-  };
-  --paper-input-container-input: {
-    font-size: 14px;
-  };
-  /* TODO: Figure out why this doesn't work */
-  --paper-dropdown-menu-input: {
-    font-size: 14px;
-  };
-}
-
-paper-button {
-  background: #e3e3e3;
-  margin-left: 0;
-  text-transform: none;
-}
-
-paper-dropdown-menu paper-item {
-  font-size: 13px;
-}
-
-paper-tooltip {
-  max-width: 200px;
-  --paper-tooltip: {
-    font-size: 12px;
-  };
-}
-
-paper-checkbox {
-  --paper-checkbox-checked-color: #880E4F;
-}
-
-paper-toggle-button {
-  --paper-toggle-button-checked-bar-color:  #880E4F;
-  --paper-toggle-button-checked-button-color:  #880E4F;
-  --paper-toggle-button-checked-ink-color: #880E4F;
-}
-
-paper-icon-button {
-  border-radius: 50%;
-}
-
-paper-icon-button[active] {
-  color: white;
-  background-color: #880E4F;
-}
-
-.slider {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-  justify-content: space-between;
-}
-
-.slider span {
-  width: 35px;
-  text-align: right;
-}
-
-.slider label {
-  align-items: center;
-  display: flex;
-}
-
-.help-icon {
-  height: 15px;
-  left: 2px;
-  min-width: 15px;
-  min-height: 15px;
-  margin: 0;
-  padding: 0;
-  top: -2px;
-  width: 15px;
-}
-
-.ink-panel {
-  display: flex;
-  flex-direction: column;
-  font-size: 14px;
-}
-
-.ink-panel h4 {
-  border-bottom: 1px solid #ddd;
-  font-size: 14px;
-  font-weight: 500;
-  margin: 0;
-  margin-bottom: 10px;
-  padding-bottom: 5px;
-}
-
-.ink-panel-header {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-  height: 50px;
-}
-
-.ink-panel-content {
-  display: none;
-  height: 100%;
-}
-
-.ink-panel-content.active {
-  display: block;
-}
-
-.ink-panel-content h3 {
-  font-weight: 500;
-  font-size: 14px;
-  margin-top: 20px;
-  margin-bottom: 5px;
-  text-transform: uppercase;
-}
-
-.ink-panel-header h3 {
-  font-weight: 500;
-  font-size: 14px;
-  margin: 0;
-  padding: 0 24px;
-  text-transform: uppercase;
-}
-
-
-/* - Tabs */
-.ink-tab-group {
-  align-items: center;
-  box-sizing: border-box;
-  display: flex;
-  height: 100%;
-  justify-content: space-around;
-}
-
-.ink-tab-group .projection-tab {
-  color: rgba(0, 0, 0, 0.5);
-  cursor: pointer;
-  font-weight: 300;
-  line-height: 49px;
-  padding: 0 12px;
-  text-align: center;
-  text-transform: uppercase;
-}
-
-.ink-tab-group .projection-tab:hover {
-  color: black;
-}
-
-.ink-tab-group .projection-tab.active {
-  border-bottom: 2px solid black;
-  color: black;
-  font-weight: 500;
-}
-
-h4 {
-  margin: 30px 0 10px 0;
-}
-
-.dismiss-dialog-note {
-  margin-top: 25px;
-  font-size: 11px;
-  text-align: right;
-}
-</style>
-</template>
-</dom-module>
-<link rel="import" href="../paper-input/paper-textarea.html">
-<dom-module id="vz-projector-bookmark-panel" assetpath="../vz-projector/">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-#title {
-  background-color: #fafafa;
-  color: black;
-  font-weight: 500;
-  left: 0;
-  line-height: 60px;
-  padding-left: 24px;
-  position: absolute;
-  width: 276px;
-}
-#bookmark-container {
-  background-color: #fafafa;
-}
-#icon-container {
-  line-height: 60px;
-  position: absolute;
-  right: 0;
-}
-#header {
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-  position: relative;
-}
-#panel {
-  background-color: #fafafa;
-  position: relative;
-  overflow-y: scroll;
-  top: 60px;
-  max-height: 50vh;
-}
-
-#save-container {
-  text-align: center;
-}
-
-.state-radio {
-  display: table-cell;
-  vertical-align: middle;
-  padding-top: 16px;
-}
-
-.state-label {
-  display: table-cell;
-  vertical-align: middle;
-  top: 14px;
-}
-
-.state-label-input {
-  width: 194px;
-}
-
-.state-clear {
-  display: table-cell;
-  vertical-align: middle;
-  padding-top: 20px;
-}
-#state-file {
-  display: none;
-}
-#no-bookmarks {
-  padding: 0 24px;
-}
-#action-buttons-container .add-icon-button {
-  background-color: #03a9f4;
-  color: white;
-  margin: 0 4px 4px auto;
-  right: 7px;
-  top: -4px;
-}
-.upload-download-icon-button {
-  padding: 0;
-}
-#action-buttons-container {
-  display: flex;
-  margin-left: 34px;
-  margin-top: 6px;
-}
-.ink-fab {
-  border-radius: 50%;
-  background: white;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-}
-paper-textarea {
-  --paper-input-container-input: {
-    font-size: 12px;
-  }
-  --paper-font-caption: {
-    display: none
-  }
-}
-</style>
-
-
-<div id="bookmark-container">
-  <div id="header">
-    <div id="title">
-      BOOKMARKS ([[savedStates.length]])
-      <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-      <paper-tooltip animation-delay="0" position="top" offset="0">
-        Open this drawer to save a set of views of the projection, including
-        selected points. A file containing the bookmarks can then be saved and
-        later loaded to view them.
-      </paper-tooltip>
-    </div>
-    <div id="icon-container">
-      
-      <paper-icon-button id="expand-more" icon="expand-less" on-tap="_expandMore"></paper-icon-button>
-      <paper-icon-button id="expand-less" style="display: none" icon="expand-more" on-tap="_expandLess"></paper-icon-button>
-    </div>
-  </div>
-  <iron-collapse id="panel">
-    
-    <div id="state-section">
-      <template is="dom-if" if="[[!savedStates.length]]">
-        <p id="no-bookmarks">
-            No bookmarks yet, upload a bookmarks file or add a new bookmark by clicking the "+" below.
-        </p>
-      </template>
-
-      <template is="dom-repeat" items="{{savedStates}}">
-        <div class="state-row">
-          <div class="state-radio">
-            <template is="dom-if" if="{{item.isSelected}}">
-              <paper-icon-button icon="radio-button-checked"></paper-icon-button>
-            </template>
-            <template is="dom-if" if="{{!item.isSelected}}">
-              <paper-icon-button icon="radio-button-unchecked" data-index$="{{index}}" on-tap="_radioButtonHandler"></paper-icon-button>
-            </template>
-          </div>
-          <div class="state-label">
-            <paper-textarea value="[[item.label]]" class="state-label-input" on-keyup="_labelChange" data-index$="[[index]]" autoresizing="">
-          </paper-textarea></div>
-          <div class="state-clear">
-            <paper-icon-button icon="clear" data-index$="{{index}}" on-tap="_clearButtonHandler"></paper-icon-button>
-          </div>
-        </div>
-      </template>
-
-      <div id="action-buttons-container">
-        <paper-icon-button class="upload-download-icon-button" icon="save" title="Save bookmarks" disabled="[[!hasStates]]" on-tap="_downloadFile"></paper-icon-button>
-        <paper-icon-button class="upload-download-icon-button" icon="file-upload" title="Load bookmarks" on-tap="_uploadFile"></paper-icon-button>
-        <paper-icon-button class="add-icon-button ink-fab" icon="add" title="Add bookmark" on-tap="_addBookmark"></paper-icon-button>
-        <input type="file" id="state-file" name="state-file">
-      </div>
-    </div>
-  </iron-collapse>
-</div>
-
-</template>
-</dom-module>
-<dom-module id="vz-projector-legend" assetpath="../vz-projector/">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-.item {
-  display: flex;
-  align-items: flex-start;
-  margin-bottom: 10px;
-}
-
-.shape {
-  width: 10px;
-  height: 10px;
-  margin-right: 10px;
-  margin-top: 5px;
-  border-radius: 50%;
-}
-
-.label {
-  flex-grow: 1;
-}
-
-.gradient {
-  width: 100%;
-  height: 10px;
-}
-
-.gradient-boundaries {
-  display: flex;
-  justify-content: space-between;
-}
-</style>
-
-<template is="dom-repeat" items="[[renderInfo.items]]">
-  <div class="item">
-    <div class="shape" style="background-color: [[item.color]];"></div>
-    <div class="label">[[item.label]]</div>
-    <div class="info" style="color: [[item.color]];">[[item.count]]</div>
-  </div>
-</template>
-
-<template is="dom-if" if="[[renderInfo.thresholds]]">
-  <svg class="gradient">
-    <defs>
-      <linearGradient id="gradient" x1="0%" y1="100%" x2="100%" y2="100%"></linearGradient>
-    </defs>
-    <rect height="10" style="fill: url(&quot;#gradient&quot;);"></rect>
-  </svg>
-  <div class="gradient-boundaries">
-    <div>[[renderInfo.thresholds.0.value]]</div>
-    <div>[[_getLastThreshold(renderInfo.thresholds)]]</div>
-  </div>
-</template>
-
-</template>
-</dom-module><dom-module id="vz-projector-data-panel" assetpath="../vz-projector/">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-.container {
-  padding: 10px 20px 20px 20px;
-}
-
-input[type=file] {
-  display: none;
-}
-
-.file-name {
-  margin-right: 10px;
-}
-
-.dirs {
-  color: rgba(0, 0, 0, 0.7);
-  font-size: 12px;
-}
-
-.dirs table tr {
-  vertical-align: top;
-}
-
-.dirs table tr td {
-  padding-bottom: 10px;
-}
-
-paper-item {
-  --paper-item-disabled: {
-    border-bottom: 1px solid black;
-    justify-content: center;
-    font-size: 12px;
-    line-height: normal;
-    min-height: 0px;
-  };
-}
-
-.item-details {
-  margin-left: 5px;
-  color: gray;
-  font-size: 12px;
-}
-
-paper-dropdown-menu {
-  width: 100%;
-}
-
-paper-dropdown-menu paper-item {
-  justify-content: space-between;
-}
-
-.title {
-  align-items: center;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  color: black;
-  display: flex;
-  font-weight: 500;
-  height: 59px;
-  padding-left: 20px;
-}
-
-#normalize-data-checkbox {
-  margin: 10px 0;
-}
-
-#projector-config-template {
-  --paper-input-container-input: {
-    line-height: 13px;
-    font-family: monospace;
-    font-size: 12px;
-  };
-}
-
-#generate-share-url {
-  padding: 16px;
-  margin-left: 24px;
-}
-
-#projector-share-button-container {
-  margin: 10px 0;
-}
-
-.config-checkbox {
-  display: inline-block;
-  font-size: 11px;
-  margin-left: 10px;
-}
-
-.projector-config-options {
-  margin-top: 12px;
-}
-
-.projector-config-dialog-container {
-  padding: 24px;
-}
-
-.code {
-  background-color: #f7f7f7;
-  display: table;
-  font-family: monospace;
-  margin-top: 7px;
-  padding: 15px;
-}
-
-.delimiter {
-  color: #B71C1C;
-}
-
-.upload-step {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 6px;
-}
-
-.upload-step paper-button {
-  margin-left: 30px;
-}
-
-.step-label {
-  color: rgb(38, 180, 226);
-}
-
-.scrollable-container {
-  margin-top: 0;
-  min-width: 400px;
-}
-
-#projectorConfigDialog p {
-  margin: 8px 0 8px;
-}
-
-.data-step {
-  margin-top: 40px;
-}
-
-.data-step-contents {
-  display: table;
-  width: 100%;
-}
-
-.data-step-contents-contents {
-  display: table-cell;
-  margin-top: 6px;
-}
-
-.data-step-contents-upload {
-  display: table-cell;
-  text-align: right;
-  vertical-align: bottom;
-}
-
-#demo-data-buttons-container {
-  display: none;
-}
-
-.colorby-container {
-  margin-bottom: 10px;
-}
-</style>
-<div class="title">DATA</div>
-<div class="container">
-  
-  <template is="dom-if" if="[[_hasChoices(runNames)]]">
-    <paper-dropdown-menu no-animations="" label="[[_getNumRunsLabel(runNames)]] found">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedRun}}">
-        <template is="dom-repeat" items="[[runNames]]">
-          <paper-item value="[[item]]" label="[[item]]">
-            [[item]]
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </template>
-
-  <template is="dom-if" if="[[tensorNames]]">
-    
-    <paper-dropdown-menu no-animations="" label="[[_getNumTensorsLabel(tensorNames)]] found">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedTensor}}">
-        <template is="dom-repeat" items="[[tensorNames]]">
-          <paper-item value="[[item.name]]" label="[[item.name]]">
-            [[item.name]]
-            <span class="item-details">
-              [[item.shape.0]]x[[item.shape.1]]
-            </span>
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </template>
-  
-  <template is="dom-if" if="[[_hasChoices(labelOptions)]]">
-    <paper-dropdown-menu no-animations="" label="Label by">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedLabelOption}}">
-        <template is="dom-repeat" items="[[labelOptions]]">
-          <paper-item value="[[item]]" label="[[item]]">
-            [[item]]
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </template>
-
-  
-  <div hidden$="[[!_hasChoices(colorOptions)]]" class="colorby-container">
-    <paper-dropdown-menu id="colorby" no-animations="" label="Color by">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedColorOptionName}}">
-        <template is="dom-repeat" items="[[colorOptions]]">
-          <paper-item class$="[[getSeparatorClass(item.isSeparator)]]" value="[[item.name]]" label="[[item.name]]" disabled="[[item.isSeparator]]">
-            [[item.name]]
-            <span class="item-details">[[item.desc]]</span>
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-    <div hidden$="[[!showForceCategoricalColorsCheckbox]]">
-      <paper-checkbox id="force-categorical-checkbox"></paper-checkbox>
-      Use categorical coloring
-      <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds="">
-        For metadata fields that have many unique values we use a gradient color map
-        by default. This checkbox allows you to force categorical coloring by a given
-        metadata field.
-      </paper-tooltip>
-    </div>
-    <template dom-if="[[colorLegendRenderInfo]]">
-      <vz-projector-legend render-info="[[colorLegendRenderInfo]]"></vz-projector-legend>
-    </template>
-  </div>
-  <paper-checkbox id="normalize-data-checkbox" checked="{{normalizeData}}">
-    Sphereize data
-    <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-    <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds="">
-      The data is normalized by shifting each point by the centroid and making
-      it unit norm.
-    </paper-tooltip>
-  </paper-checkbox>
-  <p id="demo-data-buttons-container">
-    <span>
-      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds="">
-        Load data from your computer
-      </paper-tooltip>
-      <paper-button id="upload" class="ink-button" onclick="dataDialog.open()">Load data</paper-button>
-    </span>
-    <span id="publish-container">
-      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds="">
-        Publish your embedding visualization and data
-      </paper-tooltip>
-      <paper-button id="host-embedding" class="ink-button" onclick="projectorConfigDialog.open()">Publish</paper-button>
-    </span>
-  </p>
-  <div>
-    <paper-dialog id="dataDialog" with-backdrop="">
-      <h2>Load data from your computer</h2>
-      <paper-dialog-scrollable class="scrollable-container">
-        <div class="data-step" id="upload-tensors-step-container">
-          <div class="upload-step">
-            <div>
-                <b><span class="step-label">Step 1:</span> Load a TSV file of vectors.</b>
-            </div>
-          </div>
-          <div class="data-step-contents">
-            <div class="data-step-contents-contents">
-              Example of 3 vectors with dimension 4:
-              <div class="code">
-                0.1<span class="delimiter">\t</span>0.2<span class="delimiter">\t</span>0.5<span class="delimiter">\t</span>0.9<br>
-                0.2<span class="delimiter">\t</span>0.1<span class="delimiter">\t</span>5.0<span class="delimiter">\t</span>0.2<br>
-                0.4<span class="delimiter">\t</span>0.1<span class="delimiter">\t</span>7.0<span class="delimiter">\t</span>0.8
-              </div>
-            </div>
-            <div class="data-step-contents-upload">
-              <paper-button id="upload-tensors" title="Choose a TSV tensor file">Choose file</paper-button>
-              <input type="file" id="file" name="file">
-            </div>
-          </div>
-        </div>
-        <div class="data-step">
-          <div class="upload-step">
-            <div>
-                <span class="step-label" id="upload-metadata-label"><b>Step 2</b> (optional):</span> <b>Load a TSV file of metadata.</b>
-            </div>
-          </div>
-          <div class="data-step-contents">
-            <div class="data-step-contents-contents">
-              Example of 3 data points and 2 columns.<br>
-              <i>Note: If there is more than one column, the first row will be parsed as column labels.</i>
-              <div class="code">
-                <b>Pokémon<span class="delimiter">\t</span>Species</b><br>
-                Wartortle<span class="delimiter">\t</span>Turtle<br>
-                Venusaur<span class="delimiter">\t</span>Seed<br>
-                Charmeleon<span class="delimiter">\t</span>Flame
-              </div>
-            </div>
-            <div class="data-step-contents-upload">
-              <paper-button id="upload-metadata" title="Choose a TSV metadata file" class="ink-button">Choose file</paper-button>
-              <input type="file" id="file-metadata" name="file-metadata">
-            </div>
-          </div>
-        </div>
-      </paper-dialog-scrollable>
-      <div class="dismiss-dialog-note">Click outside to dismiss.</div>
-    </paper-dialog>
-    <paper-dialog id="projectorConfigDialog" with-backdrop="">
-      <h2>Publish your embedding visualization and data</h2>
-      <paper-dialog-scrollable class="scrollable-container">
-        <div>
-          <p>
-            If you'd like to share your visualization with the world, follow these simple steps.
-            See <a target="_blank" href="https://www.tensorflow.org/get_started/embedding_viz">this tutorial</a> for more.
-          </p>
-          <h4><span class="step-label">Step 1:</span> Make data public</h4>
-          <p>
-            Host tensors, metadata, sprite image, and bookmarks TSV files <i>publicly</i> on the web.
-          </p>
-          <p>
-            One option is using a <a target="_blank" href="https://gist.github.com/">github gist</a>.
-            If you choose this approach, make sure to link directly to the raw file.
-          </p>
-        </div>
-        <div>
-          <h4><span class="step-label">Step 2:</span> Projector config</h4>
-          <div class="projector-config-options">
-            <i>Optional:</i>
-            <div class="config-checkbox">
-              <paper-checkbox id="config-metadata-checkbox" checked="">Metadata</paper-checkbox>
-            </div>
-            <div class="config-checkbox">
-              <paper-checkbox id="config-sprite-checkbox">Sprite</paper-checkbox>
-            </div>
-            <div class="config-checkbox">
-              <paper-checkbox id="config-bookmarks-checkbox">Bookmarks</paper-checkbox>
-            </div>
-          </div>
-        </div>
-        <paper-textarea id="projector-config-template" label="template_projector_config.json"></paper-textarea>
-        <div>
-          <h4><span class="step-label">Step 3:</span> Host projector config</h4>
-          After you have hosted the projector config JSON file you built above, paste the URL to the config below.
-        </div>
-        <paper-input id="projector-config-url" label="Path to projector config"></paper-input>
-        <paper-input id="projector-share-url" label="Your shareable URL" readonly=""></paper-input>
-        <div id="projector-share-button-container">
-          <a target="_blank" id="projector-share-url-link">
-            <paper-button title="Test your shareable URL" class="ink-button">Test your shareable URL</paper-button>
-          </a>
-        </div>
-      </paper-dialog-scrollable>
-      <div class="dismiss-dialog-note">Click outside to dismiss.</div>
-    </paper-dialog>
-  </div>
-  <div class="dirs">
-    <table>
-      <tbody><tr>
-        <td>Checkpoint:</td>
-        <td><span id="checkpoint-file"></span></td>
-      </tr>
-      <tr>
-        <td>Metadata:</td>
-        <td><span id="metadata-file"></span></td>
-      </tr>
-    </tbody></table>
-  </div>
-</div>
-
-</template>
-</dom-module>
-<dom-module id="vz-projector-input" assetpath="../vz-projector/">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-.info {
-  color: rgba(0, 0, 0, 0.5);
-  display: block;
-  font-size: 11px;
-}
-
-.toggle {
-  font-size: 12px;
-  height: 21px;
-  margin: 0px;
-  min-width: 0px;
-  min-height: 0px;
-  padding: 0;
-  width: 17px;
-}
-
-.toggle[active] {
-  background-color: #880E4F;
-  color: white;
-}
-</style>
-
-<paper-input label="[[label]]">
-  <div class="slash" prefix="">/</div>
-  <div class="slash" suffix="">/</div>
-  <div suffix="">
-    <paper-button id="regex" toggles="" class="toggle">.*</paper-button>
-  </div>
-</paper-input>
-<paper-tooltip for="regex" position="bottom" animation-delay="0" fit-to-visible-bounds="">
-  Enable/disable regex mode.
-</paper-tooltip>
-<span class="info">[[message]]</span>
-
-
-</template>
-</dom-module><dom-module id="vz-projector-inspector-panel" assetpath="../vz-projector/">
-<style include="vz-projector-styles"></style>
-<style>
-:host {
-   display: flex;
-   flex-direction: column;
-   /* Account for the bookmark pane at the bottom */
-   height: calc(100% - 55px);
-}
-
-.container {
-  display: block;
-  padding: 10px 20px 0 20px;
-}
-
-.buttons {
-  display: flex;
-  height: 60px;
-}
-
-.button {
-  margin-right: 10px;
-  border: none;
-  border-radius: 7px;
-  font-size: 13px;
-  padding: 10px;
-  background: #e3e3e3;
-}
-
-.button:last-child {
-  margin-right: 0;
-}
-
-.nn {
-  display: flex;
-  flex-direction: column;
-}
-
-.nn > * {
-  padding: 0 20px;
-}
-
-.nn-list {
-  overflow-y: auto;
-}
-
-.nn-list .neighbor {
-  font-size: 12px;
-  margin-bottom: 8px;
-}
-
-.nn-list .label-and-value {
-  display: flex;
-  justify-content: space-between;
-}
-
-.label {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.nn-list .value {
-  color: #666;
-  float: right;
-  font-weight: 300;
-  margin-left: 8px;
-}
-
-.nn-list .bar {
-  position: relative;
-  border-top: 1px solid rgba(0, 0, 0, 0.15);
-  margin: 2px 0;
-}
-
-.nn-list .bar .fill {
-  position: absolute;
-  top: -1px;
-  border-top: 1px solid white;
-}
-
-.nn-list .tick {
-  position: absolute;
-  top: 0px;
-  height: 3px;
-  border-left: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-.nn-list .neighbor-link:hover {
-  cursor: pointer;
-}
-
-.search-by {
-  display: flex;
-}
-
-.search-by vz-projector-input {
-  width: 100%;
-}
-
-.search-by paper-dropdown-menu {
-  margin-left: 10px;
-  width: 100px;
-}
-
-.distance .options {
-  float: right;
-}
-
-.options a {
-  color: #727272;
-  font-size: 13px;
-  margin-left: 12px;
-  text-decoration: none;
-}
-
-.options a.selected {
-  color: #009EFE;
-}
-
-.neighbors {
-  margin-bottom: 30px;
-}
-
-.neighbors-options {
-  margin-top: 6px;
-}
-
-.neighbors-options .option-label, .distance .option-label {
-  color: #727272;
-  margin-right: 2px;
-  width: auto;
-}
-
-.num-neighbors-container {
-  display: inline-block;
-}
-
-#nn-slider {
-  margin: 0 -12px 0 10px;
-}
-
-.euclidian {
-  margin-right: 10px;
-}
-
-.matches-list {
-  padding: 0 20px;
-}
-
-.matches-list .row {
-  border-bottom: 1px solid #ddd;
-  cursor: pointer;
-  display: flex;
-  font-size: 12px;
-  margin: 5px 0;
-  padding: 4px 0;
-}
-
-.results {
-  display: flex;
-  flex-direction: column;
-}
-</style>
-<template>
-<div class="container">
-  <div class="buttons">
-    <button class="button reset-filter">Show All Data</button>
-    <button class="button set-filter">Isolate selection</button>
-    <button class="button clear-selection">Clear selection</button>
-  </div>
-  <div class="search-by">
-    <vz-projector-input id="search-box" label="Search"></vz-projector-input>
-    <paper-dropdown-menu no-animations="" label="by">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedMetadataField}}">
-        <template is="dom-repeat" items="[[metadataFields]]">
-          <paper-item value="[[item]]" label="[[item]]">
-            [[item]]
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </div>
-</div>
-<div class="results">
-  <div class="nn" style="display: none">
-    <div class="neighbors">
-      <div class="neighbors-options">
-        <div class="slider num-nn">
-          <span class="option-label">neighbors</span>
-          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-          <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds="">
-            The number of neighbors (in the original space) to show when clicking on a point.
-          </paper-tooltip>
-          <paper-slider id="nn-slider" pin="" min="5" max="1000" value="100"></paper-slider>
-          <span class="nn-count"></span>
-        </div>
-      </div>
-      <div class="distance">
-        <span class="option-label">distance</span>
-        <div class="options">
-          <a class="selected cosine" href="javascript:void(0);">COSINE</a>
-          <a class="euclidean" href="javascript:void(0);">EUCLIDIAN</a>
-        </div>
-      </div>
-    </div>
-    <p>Nearest points in the original space:
-    </p><div class="nn-list"></div>
-  </div>
-  <div class="matches-list" style="display: none">
-    <div class="list"></div>
-    <div class="limit-msg">Showing only the first 100 results...</div>
-  </div>
-</div>
-
-</template>
-</dom-module>
-<dom-module id="vz-projector-metadata-card" assetpath="../vz-projector/">
-<template>
-<style>
-#metadata-card {
-  background-color: rgba(255,255,255,0.9);
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14),
-      0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
-  width: 280px;
-}
-
-#header {
-  background: #e9e9e9;
-}
-
-#icon-container {
-  position: absolute;
-  right: 0;
-  top: 4px;
-}
-
-#metadata-label {
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 24px;
-  padding: 12px 12px 8px;
-  width: 230px;
-}
-
-#metadata-table {
-  display: table;
-  padding: 8px 12px 4px;
-}
-
-.metadata-row {
-  display: table-row;
-}
-
-.metadata-key {
-  font-weight: bold;
-}
-
-.metadata-key, .metadata-value {
-  display: table-cell;
-  font-size: 12px;
-  padding: 3px 3px;
-}
-</style>
-
-<template is="dom-if" if="[[hasMetadata]]">
-  <div id="metadata-card">
-    <div id="icon-container">
-      <paper-icon-button id="expand-more" style="display: none" icon="expand-more" on-tap="_expandMore"></paper-icon-button>
-      <paper-icon-button id="expand-less" on-tap="_expandLess" icon="expand-less"></paper-icon-button>
-    </div>
-    <div id="header">
-      <div id="metadata-label">[[label]]</div>
-    </div>
-    <iron-collapse id="metadata-container" opened="">
-      <div id="metadata-table">
-        <template is="dom-repeat" items="[[metadata]]">
-          <div class="metadata-row">
-            <div class="metadata-key">[[item.key]]</div>
-            <div class="metadata-value">[[item.value]]</div>
-          </div>
-        </template>
-      </div>
-    </iron-collapse>
-  </div>
-</template>
-</template>
-</dom-module>
-<dom-module id="vz-projector-projections-panel" assetpath="../vz-projector/">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-:host {
-  transition: height 0.2s;
-}
-
-.ink-button, ::shadow .ink-button {
-  border: none;
-  border-radius: 2px;
-  font-size: 13px;
-  padding: 10px;
-  min-width: 100px;
-  flex-shrink: 0;
-  background: #e3e3e3;
-}
-
-.ink-panel-buttons {
-  margin-bottom: 10px;
-}
-
-.two-way-toggle {
-  display: flex;
-  flex-direction: row;
-}
-
-.two-way-toggle span {
-  padding-right: 7px;
-}
-
-.has-border {
-  border: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-.toggle {
-  min-width: 0px;
-  font-size: 12px;
-  width: 17px;
-  min-height: 0px;
-  height: 21px;
-  padding: 0;
-  margin: 0px;
-}
-
-.toggle[active] {
-  background-color: #880E4F;
-  color: white;
-}
-
-.two-columns {
-  display:flex;
-  justify-content: space-between;
-}
-
-.two-columns > :first-child {
-  margin-right: 15px;
-}
-
-.two-columns > div {
-  width: 50%;
-}
-
-.dropdown-item {
-  justify-content: space-between;
-  min-height: 35px;
-}
-
-#z-container {
-  display: flex;
-  align-items: center;
-  width: 50%;
-}
-
-#z-checkbox {
-  margin: 27px 0 0 5px;
-  width: 18px;
-}
-
-#z-dropdown {
-  flex-grow: 1;
-}
-
-.notice {
-  color: #880E4F;
-}
-
-.container {
-  padding: 20px;
-}
-
-.book-icon {
-  height: 20px;
-  color: rgba(0, 0, 0, 0.7);
-}
-
-.item-details {
-  color: gray;
-  font-size: 12px;
-  margin-left: 5px;
-}
-
-.pca-dropdown {
-  width: 100%;
-}
-
-.pca-dropdown paper-listbox {
-  width: 135px;
-}
-
-.dropdown-item.header {
-  border-bottom: 1px solid #aaa;
-  color: #333;
-  font-weight: bold;
-}
-
-#total-variance {
-  color: rgba(0, 0, 0, 0.7);
-}
-</style>
-<div id="main">
-  <div class="ink-panel-header">
-    <div class="ink-tab-group">
-
-      <div data-tab="tsne" id="tsne-tab" class="ink-tab projection-tab">t-SNE</div>
-      <paper-tooltip for="tsne-tab" position="bottom" animation-delay="0" fit-to-visible-bounds="">
-        t-distributed stochastic neighbor embedding
-      </paper-tooltip>
-
-      <div data-tab="pca" id="pca-tab" class="ink-tab projection-tab">PCA</div>
-      <paper-tooltip for="pca-tab" position="bottom" animation-delay="0" fit-to-visible-bounds="">
-        Principal component analysis
-      </paper-tooltip>
-
-      <div data-tab="custom" id="custom-tab" class="ink-tab projection-tab" title="Linear projection of two custom vectors">Custom</div>
-      <paper-tooltip for="custom-tab" position="bottom" animation-delay="0" fit-to-visible-bounds="">
-        Search for two vectors upon which to project all points.
-      </paper-tooltip>
-
-    </div>
-  </div>
-  <div class="container">
-    
-    <div data-panel="tsne" class="ink-panel-content">
-      <div class="slider">
-        <label>Dimension</label>
-        <div class="two-way-toggle">
-          <span>2D</span>
-          <paper-toggle-button id="tsne-toggle" checked="{{tSNEis3d}}">3D</paper-toggle-button>
-        </div>
-      </div>
-      <div class="slider tsne-perplexity">
-        <label>
-          Perplexity
-          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-          <paper-tooltip position="right" animation-delay="0" fit-to-visible-bounds="">
-            The most appropriate perplexity value depends on the density of the
-            data. Loosely speaking, a larger / denser dataset
-            requires a larger perplexity. Typical values for perplexity range
-            between 5 and 50.
-          </paper-tooltip>
-        </label>
-        <paper-slider id="perplexity-slider" pin="" min="2" max="100" value="30"></paper-slider>
-        <span></span>
-      </div>
-      <div class="slider tsne-learning-rate">
-        <label>
-          Learning rate
-          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-          <paper-tooltip position="right" animation-delay="0" fit-to-visible-bounds="">
-            The ideal learning rate often depends on the size of the data,
-            with smaller datasets requiring smaller learning rates.
-          </paper-tooltip>
-        </label>
-        <paper-slider id="learning-rate-slider" snaps="" min="-3" max="2" step="1" value="1" max-markers="6">
-        </paper-slider>
-        <span></span>
-      </div>
-      <p>
-        <button class="run-tsne ink-button" title="Re-run t-SNE">Re-run</button>
-        <button class="stop-tsne ink-button" title="Stop t-SNE">Stop</button>
-      </p>
-      <p>Iteration: <span class="run-tsne-iter">0</span></p>
-      <p id="tsne-sampling" class="notice">
-        For fast results, the data will be sampled down to [[getTsneSampleSizeText()]] points.
-      </p>
-      <p>
-        <iron-icon icon="book" class="book-icon"></iron-icon>
-        <a target="_blank" href="http://distill.pub/2016/misread-tsne/">
-          How to use t-SNE effectively.
-        </a>
-      </p>
-    </div>
-    
-    <div data-panel="pca" class="ink-panel-content">
-      <div class="two-columns">
-        <div> 
-          <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations="" label="X">
-            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaX}}">
-              <paper-item disabled="" class="dropdown-item header">
-                  <div>#</div>
-                  <div>Variance (%)</div>
-              </paper-item>
-              <template is="dom-repeat" items="[[pcaComponents]]">
-                <paper-item class="dropdown-item" value="[[item.id]]" label="Component #[[item.componentNumber]]">
-                  <div>[[item.componentNumber]]</div>
-                  <div class="item-details">[[item.percVariance]]</div>
-                </paper-item>
-              </template>
-            </paper-listbox>
-          </paper-dropdown-menu>
-          <paper-dropdown-menu class="pca-dropdown" no-animations="" vertical-align="bottom" label="Z" disabled="[[!hasPcaZ]]" id="z-dropdown">
-            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaZ}}">
-              <paper-item disabled="" class="dropdown-item header">
-                  <div>#</div>
-                  <div>Variance (%)</div>
-              </paper-item>
-              <template is="dom-repeat" items="[[pcaComponents]]">
-                <paper-item class="dropdown-item" value="[[item.id]]" label="Component #[[item.componentNumber]]">
-                  <div>[[item.componentNumber]]</div>
-                  <div class="item-details">[[item.percVariance]]</div>
-                </paper-item>
-              </template>
-            </paper-listbox>
-          </paper-dropdown-menu>
-        </div>
-        <div> 
-          <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations="" label="Y">
-            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaY}}">
-              <paper-item disabled="" class="dropdown-item header">
-                  <div>#</div>
-                  <div>Variance (%)</div>
-              </paper-item>
-              <template is="dom-repeat" items="[[pcaComponents]]">
-                <paper-item class="dropdown-item" value="[[item.id]]" label="Component #[[item.componentNumber]]">
-                  <div>[[item.componentNumber]]</div>
-                  <div class="item-details">[[item.percVariance]]</div>
-                </paper-item>
-              </template>
-            </paper-listbox>
-          </paper-dropdown-menu>
-          <paper-checkbox id="z-checkbox" checked="{{pcaIs3d}}"></paper-checkbox>
-        </div>
-      </div>
-      <p id="pca-sampling" class="notice">
-        PCA is approximate.
-        <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-      </p>
-      <div id="total-variance">Total variance</div>
-      <paper-tooltip for="pca-sampling" position="top" animation-delay="0" fit-to-visible-bounds="">
-        For fast results, the data was sampled to [[getPcaSampleSizeText()]] points and randomly projected down to [[getPcaSampledDimText()]] dimensions.
-      </paper-tooltip>
-    </div>
-    
-    <div data-panel="custom" class="ink-panel-content">
-      <paper-dropdown-menu style="width: 100%" no-animations="" label="Search by">
-        <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{customSelectedSearchByMetadataOption}}">
-          <template is="dom-repeat" items="[[searchByMetadataOptions]]">
-            <paper-item class="dropdown-item" value="[[item]]" label="[[item]]">
-              [[item]]
-            </paper-item>
-          </template>
-        </paper-listbox>
-      </paper-dropdown-menu>
-      <div class="two-columns">
-        <vz-projector-input id="xLeft" label="Left"></vz-projector-input>
-        <vz-projector-input id="xRight" label="Right"></vz-projector-input>
-      </div>
-      <div class="two-columns">
-        <vz-projector-input id="yUp" label="Up"></vz-projector-input>
-        <vz-projector-input id="yDown" label="Down"></vz-projector-input>
-      </div>
-    </div>
-  </div>
-</div>
-</template>
-</dom-module>
-<link rel="import" href="../paper-listbox/paper-listbox.html">
-<link rel="import" href="../iron-icons/image-icons.html">
-<link rel="import" href="../paper-toast/paper-toast.html">
-<link rel="import" href="../paper-styles/typography.html">
-<link rel="import" href="../paper-dialog-scrollable/paper-dialog-scrollable.html">
-
-<dom-module id="vz-projector" assetpath="../vz-projector/">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-:host {
-  display: flex;
-  width: 100%;
-  height: 100%;
-}
-
-#container {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-
-.hidden {
-  display: none !important;
-}
-
-/* Main */
-
-#main {
-  position: relative;
-  flex-grow: 2;
-}
-
-#main .stage {
-  position: relative;
-  flex-grow: 2;
-}
-
-#scatter {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-#selector {
-  display: none;
-  height: 100%;
-  position: absolute;
-  width: 100%;
-}
-
-#left-pane {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  min-width: 312px;
-  width: 312px;
-  border-right: 1px solid rgba(0, 0, 0, 0.1);
-  background: #fafafa;
-}
-
-#right-pane {
-  border-left: 1px solid rgba(0, 0, 0, 0.1);
-  background: #fafafa;
-  display: flex;
-  height: 100%;
-  min-width: 300px;
-  width: 300px;
-}
-
-.file-name {
-  margin-right: 5px;
-}
-
-.control input[type=text]:focus {
-  outline: none;
-  border-bottom: 1px solid rgba(0, 0, 0, 1);
-}
-
-.control {
-  display: inline-block;
-  width: 45%;
-  vertical-align: top;
-  margin-right: 10px;
-  overflow-x: hidden;
-}
-
-.control.last {
-  margin-right: 0;
-}
-
-#notification-dialog {
-  width: 400px;
-  padding-bottom: 20px;
-}
-
-#notification-dialog paper-button {
-  background: none;
-  text-transform: uppercase;
-}
-
-#notification-dialog .progress {
-  --paper-spinner-color: #880E4F;
-  --paper-spinner-stroke-width: 2px;
-}
-
-#notify-msgs {
-  text-align: center;
-  display: block;
-}
-
-.notify-msg {
-  font-weight: 500;
-  margin: 0;
-  padding: 0;
-}
-
-.notify-msg.error {
-  text-align: left;
-}
-
-.brush .extent {
-  stroke: #fff;
-  fill-opacity: .125;
-  shape-rendering: crispEdges;
-}
-
-.origin text {
-  font-size: 12px;
-  font-weight: 500;
-}
-
-.origin line {
-  stroke: black;
-  stroke-opacity: 0.2;
-}
-
-/* Ink Framework */
-
-/* - Buttons */
-.ink-button, ::shadow .ink-button {
-  border: none;
-  border-radius: 2px;
-  font-size: 13px;
-  padding: 10px;
-  min-width: 100px;
-  flex-shrink: 0;
-  background: #e3e3e3;
-}
-
-.status-bar-panel {
-  display: flex;
-  align-items: center;
-}
-
-.status-bar-entry {
-  border-left: 1px solid rgba(0, 0, 0, 0.5);
-  margin-left: 5px;
-  padding-left: 5px;
-}
-
-/* - Menubar */
-
-.ink-panel-menubar {
-  align-items: center;
-  position: relative;
-  height: 60px;
-  border-bottom: solid 1px #eee;
-  padding: 0 24px;
-  display: flex;
-}
-
-.ink-panel-menubar .ink-fabs {
-  position: absolute;
-  right: 12px;
-  top: 40px;
-  z-index: 1;
-}
-
-#bookmark-panel {
-  bottom: 0;
-  position: absolute;
-  width: 300px;
-}
-#bookmark-panel-container {
-  bottom: 60px;
-  position: absolute;
-}
-
-.ink-fab {
-  margin-left: 8px;
-  border: 1px solid rgba(0, 0, 0, 0.02);
-  background: white;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-}
-
-#metadata-card {
-  position: absolute;
-  right: 5px;
-  top: 25px;
-}
-
-#help-3d-icon {
-  position: absolute;
-  top: 20px;
-  left: 20px;
-}
-
-#help3dDialog .main {
-  margin: 0;
-  padding: 20px;
-}
-
-#help3dDialog h3 {
-  margin-top: 20px;
-  margin-bottom: 5px;
-}
-
-#help3dDialog h3:first-child {
-  margin-top: 0;
-}
-
-#data-panel {
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-  overflow-y: auto;
-}
-
-#toast {
-  display: flex;
-  align-items: center;
-  --paper-toast-color: #eeff41;
-}
-</style>
-<paper-dialog id="notification-dialog" modal="">
-  <h2 id="notification-title"></h2>
-  <paper-dialog-scrollable>
-    <div id="notify-msgs"></div>
-  </paper-dialog-scrollable>
-  <div style="text-align: center;"><paper-spinner-lite active="" class="progress"></paper-spinner-lite></div>
-  <div class="buttons">
-    <paper-button class="close-button" dialog-confirm="" autofocus="">Close</paper-button>
-  </div>
-</paper-dialog>
-<div id="container">
-  <div id="left-pane" class="ink-panel">
-    <vz-projector-data-panel id="data-panel"></vz-projector-data-panel>
-    <vz-projector-projections-panel id="projections-panel"></vz-projector-projections-panel>
-  </div>
-  <div id="main" class="ink-panel">
-    <div class="ink-panel-menubar">
-      <paper-icon-button id="selectMode" alt="Bounding box selection" toggles="" icon="image:photo-size-select-small"></paper-icon-button>
-      <paper-tooltip for="selectMode" position="bottom" animation-delay="0" fit-to-visible-bounds="">Bounding box selection</paper-tooltip>
-
-      <paper-icon-button id="nightDayMode" alt="Enable/disable night mode" toggles="" icon="image:brightness-2"></paper-icon-button>
-      <paper-tooltip for="nightDayMode" position="bottom" animation-delay="0" fit-to-visible-bounds="">Enable/disable night mode</paper-tooltip>
-
-      <paper-icon-button id="labels3DMode" alt="Enable/disable 3D labels mode" toggles="" icon="font-download"></paper-icon-button>
-      <paper-tooltip for="labels3DMode" position="bottom" animation-delay="0" fit-to-visible-bounds="">Enable/disable 3D labels mode</paper-tooltip>
-      <div class="status-bar-panel">
-        <div class="status-bar-entry">Points: <span class="numDataPoints">Loading...</span></div>
-        <div class="status-bar-entry">Dimension: <span class="dim">Loading...</span></div>
-        <div id="status-bar" class="status-bar-entry" style="display: none;"></div>
-      </div>
-      <div class="ink-fabs">
-        <paper-icon-button id="reset-zoom" class="ink-fab" alt="Reset zoom to fit all points" icon="home"></paper-icon-button>
-        <paper-tooltip for="reset-zoom" position="left" animation-delay="0">Reset zoom to fit all points</paper-tooltip>
-      </div>
-    </div>
-    <div class="stage">
-      <div id="scatter">
-        <svg id="selector"></svg>
-      </div>
-      <vz-projector-metadata-card id="metadata-card"></vz-projector-metadata-card>
-      <paper-icon-button raised="" onclick="help3dDialog.open()" icon="help-outline" id="help-3d-icon"></paper-icon-button>
-      <paper-tooltip animation-delay="0" for="help-3d-icon">Help with interaction controls.</paper-tooltip>
-      <paper-dialog id="help3dDialog" with-backdrop="">
-        <div class="main" dialog-confirm="" autofocus="">
-          <h3>3D controls</h3>
-            <b>Rotate</b> Mouse left click.<br>
-            <b>Pan</b> Mouse right click.<br>
-            <b>Zoom</b> Mouse wheel.<br>
-            Holding <b>ctrl</b> reverses the mouse clicks.
-          <h3>2D controls</h3>
-            <b>Pan</b> Mouse left click.<br>
-            <b>Zoom</b> Mouse wheel.
-          <div class="dismiss-dialog-note"> Click anywhere to dismiss.</div>
-        </div>
-      </paper-dialog>
-    </div>
-  </div>
-  <div id="right-pane" class="ink-panel">
-    <div class="ink-panel-content active">
-      <vz-projector-inspector-panel id="inspector-panel"></vz-projector-inspector-panel>
-    </div>
-    <div id="bookmark-panel-container">
-      <vz-projector-bookmark-panel id="bookmark-panel"></vz-projector-bookmark-panel>
-    </div>
-  </div>
-</div>
-<paper-toast id="toast" always-on-top=""></paper-toast>
-
-</template> 
-</dom-module>
-<dom-module id="vz-projector-dashboard" assetpath="../vz-projector/">
-<template>
-  <tf-no-data-warning data-type="projector" show-warning="[[dataNotFound]]"></tf-no-data-warning>
-  <template is="dom-if" if="[[!dataNotFound]]">
-    <vz-projector id="projector" route-prefix="[[routePrefix]]" serving-mode="server" page-view-logging="" event-logging=""></vz-projector>
-  </template>
-</template>
-<script>
-(function() {
-TF.Dashboard.VzProjectorDashboard = Polymer({
-  is: 'vz-projector-dashboard',
-  factoryImpl: function(routePrefix) {
-    this.routePrefix = routePrefix;
-  },
-  properties: {
-    dataNotFound: Boolean,
-    routePrefix: String,
-    // Whether this dashboard is initialized. This dashboard should only be initialized once.
-    _initialized: Boolean,
-  },
-  behaviors: [
-    TF.Dashboard.DashboardBehavior("embeddings"),
-  ],
-  reload: function() {
-    // Do not reload the embedding projector. Reloading could take a long time.
-  },
-  attached: function() {
-    if (this._initialized) {
-      return;
-    }
-
-    // Set this to true so we only initialize once.
-    this._initialized = true;
-
-    d3.json(this.routePrefix + '/runs', (err, runs) => {
-      this.set('dataNotFound', runs.length === 0);
-    });
-  },
-});
-})();
-</script>
-</dom-module>
-<script>/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-var TF;
-(function (TF) {
-    var TensorBoard;
-    (function (TensorBoard) {
-        TensorBoard.AUTORELOAD_LOCALSTORAGE_KEY = 'TF.TensorBoard.autoReloadEnabled';
-        var getAutoReloadFromLocalStorage = function () {
-            var val = window.localStorage.getItem(TensorBoard.AUTORELOAD_LOCALSTORAGE_KEY);
-            return val === 'true' || val == null; // defaults to true
-        };
-        TensorBoard.AutoReloadBehavior = {
-            properties: {
-                autoReloadEnabled: {
-                    type: Boolean,
-                    observer: '_autoReloadObserver',
-                    value: getAutoReloadFromLocalStorage,
-                },
-                _autoReloadId: {
-                    type: Number,
-                },
-                autoReloadIntervalSecs: {
-                    type: Number,
-                    value: 30,
-                },
-            },
-            detached: function () {
-                window.clearTimeout(this._autoReloadId);
-            },
-            _autoReloadObserver: function (autoReload) {
-                window.localStorage.setItem(TensorBoard.AUTORELOAD_LOCALSTORAGE_KEY, autoReload);
-                if (autoReload) {
-                    var _this = this;
-                    this._autoReloadId = window.setTimeout(this._doAutoReload.bind(this), this.autoReloadIntervalSecs * 1000);
-                }
-                else {
-                    window.clearTimeout(this._autoReloadId);
-                }
-            },
-            _doAutoReload: function () {
-                if (this.reload == null) {
-                    throw new Error('AutoReloadBehavior requires a reload method');
-                }
-                this.reload();
-                this._autoReloadId = window.setTimeout(this._doAutoReload.bind(this), this.autoReloadIntervalSecs * 1000);
-            }
-        };
-    })(TensorBoard = TF.TensorBoard || (TF.TensorBoard = {}));
-})(TF || (TF = {}));
-</script></div><dom-module id="tf-tensorboard">
-  <template>
-    <paper-dialog with-backdrop="" id="settings">
-      <h2>Settings</h2>
-      <paper-checkbox id="auto-reload-checkbox" checked="{{autoReloadEnabled}}">
-        Reload data every <span>[[autoReloadIntervalSecs]]</span>s.
-      </paper-checkbox>
-    </paper-dialog>
-    <paper-header-panel>
-      <paper-toolbar id="toolbar">
-        <div id="toolbar-content">
-          <div class="toolbar-title">TensorBoard</div>
-          <paper-tabs selected="{{modeIndex}}" noink="" class="tabs" id="tabs">
-            <template is="dom-repeat" items="[[_dashboards]]">
-              <template is="dom-if" if="[[_isTabEnabled(item.name)]]">
-                <paper-tab data-mode="[[item.name]]">[[item.name]]</paper-tab>
-              </template>
-            </template>
-          </paper-tabs>
-          <div class="global-actions">
-            <paper-icon-button icon="refresh" on-tap="reload" disabled$="[[_isReloadDisabled(mode)]]" id="reload-button"></paper-icon-button>
-            <paper-icon-button icon="settings" on-tap="openSettings" id="settings-button"></paper-icon-button>
-            <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md" tabindex="-1">
-              <paper-icon-button icon="help-outline"></paper-icon-button>
-            </a>
-          </div>
-        </div>
-      </paper-toolbar>
-
-      <div id="content" class="fit"></div>
-    </paper-header-panel>
-
-    <style>
-      :host {
-        height: 100%;
-        display: block;
-        background-color: var(--paper-grey-100);
-      }
-
-      #toolbar {
-        background-color: var(--tb-toolbar-background-color, --tb-orange-strong);
-        -webkit-font-smoothing: antialiased;
-      }
-
-      .toolbar-title {
-        font-size: 20px;
-        margin-left: 10px;
-        text-rendering: optimizeLegibility;
-        letter-spacing: -0.025em;
-        font-weight: 500;
-        flex-grow: 2;
-        display: var(--tb-toolbar-title-display, block);
-      }
-
-      .tabs {
-        flex-grow: 1;
-        text-transform: uppercase;
-        height: 100%;
-      }
-
-      paper-tabs {
-        --paper-tabs-selection-bar-color: white;
-      }
-
-      .global-actions {
-        flex-grow: 2;
-        display: inline-flex; /* Ensure that icons stay aligned */
-        justify-content: flex-end;
-        text-align: right;
-        color: white;
-      }
-
-      .global-actions a {
-        color: white;
-      }
-
-      #toolbar-content {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        align-items: center;
-      }
-
-      #content {
-        height: 100%;
-      }
-
-      [disabled] {
-        opacity: 0.2;
-        color: white;
-      }
-
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-tensorboard",
-      behaviors: [TF.TensorBoard.AutoReloadBehavior],
-      properties: {
-        router: {
-          type: Object,
-          value: function() {
-            return TF.Backend.router();
-          },
-        },
-        _backend: {
-          type: Object,
-          computed: "_makeBackend(router, demoDir)",
-        },
-        _debuggerDataEnabled: {
-          type: Boolean,
-          value: function() {
-            // For now, Tensorboard only shows debugger data if the debugger_data GET param is set
-            // to enabled.
-            let match = window.location.href.match(/[&\?]debugger_data=enabled/);
-            return match && match.length == 1;
-          },
-        },
-        _dashboards: {
-          type: Array,
-          computed: "_makeDashboardList(_backend, router, _debuggerDataEnabled)",
-        },
-        // Maps dashboard name to dashboard object.
-        _dashboardMapping: {
-          type: Object,
-          computed: "_makeDashboardMapping(_dashboards)",
-        },
-        // Which tab is selected (scalars, graph, images etc).
-        mode: {
-          type: String,
-          computed: '_getModeFromIndex(modeIndex)',
-          notify: true,
-          observer: '_modeChanged',
-        },
-        // If this is set to a string, TensorBoard will switch to "demo mode"
-        // and attempt to load serialized json data from that directory. You can
-        // generate conformant json using
-        // tensorboard/scripts/serialize_tensorboard.py
-        demoDir: {
-          type: String,
-          value: null,
-        },
-        // Set this to true to store state in URI hash. Should be true for all non-test purposes.
-        useHash: {
-          type: Boolean,
-          value: false,
-        },
-        disabledTabs: String,
-      },
-      _isTabEnabled: function(tab) {
-        if (this.disabledTabs != null &&
-            this.disabledTabs.split(',').indexOf(tab) >= 0) {
-          return false;
-        }
-        return true;
-      },
-      _getModeFromIndex: function(modeIndex) {
-        var mode = this._dashboards[modeIndex].name;
-        TF.URIStorage.setString(TF.URIStorage.TAB, mode);
-        return mode;
-      },
-      _makeBackend: function(router, demoDir) {
-        // use the demoDir if it is set, otherwise use the provided router
-        if (demoDir != null) {
-          router = TF.Backend.router(demoDir, true);
-        }
-        return new TF.Backend.Backend(router);
-      },
-      _isReloadDisabled: function(mode) {
-        return !this._debuggerDataEnabled && mode == 'graphs';
-      },
-      selectedDashboard: function() {
-        var dashboard = this._dashboardMapping[this.mode];
-        if (dashboard == null) {
-          throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
-        }
-        return dashboard;
-      },
-      ready: function() {
-        TF.Globals.USE_HASH = this.useHash;
-
-        this._getModeFromHash();
-        window.addEventListener('hashchange', function() {
-          this._getModeFromHash();
-        }.bind(this));
-      },
-      _makeDashboardList: function(backend, router, debuggerDataEnabled) {
-        if (!backend || !router) {
-          // The dashboards require these entities. We are not ready to construct dashboards.
-          return null;
-        }
-
-        return [
-          new TF.Dashboard.TfScalarDashboard(backend, router),
-          new TF.Dashboard.TfImageDashboard(backend),
-          new TF.Dashboard.TfAudioDashboard(backend),
-          new TF.Dashboard.TfGraphDashboard(backend, debuggerDataEnabled),
-          new TF.Dashboard.TfDistributionDashboard(backend),
-          new TF.Dashboard.TfHistogramDashboard(backend),
-          new TF.Dashboard.VzProjectorDashboard('data/plugin/projector'),
-          new TF.Dashboard.TfTextDashboard(backend),
-        ];
-      },
-      _makeDashboardMapping: function(dashboards) {
-        if (!dashboards) {
-          return null;
-        }
-
-        let mapping = {};
-        dashboards.forEach(function(dashboard) {
-          mapping[dashboard.name] = dashboard;
-        });
-        return mapping;
-      },
-      _getModeFromHash: function() {
-        var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
-        var modeIndex;
-        for (var i = 0; i < this._dashboards.length; i++) {
-          if (this._dashboards[i].name == tabName) {
-            modeIndex = i;
-            break;
-          }
-        }
-
-        if (modeIndex === undefined && this.modeIndex == null) {
-          // Select the first tab as default.
-          this.set('modeIndex', 0);
-        }
-        if (modeIndex !== undefined && modeIndex != this.modeIndex) {
-          this.set('modeIndex', modeIndex);
-        }
-      },
-      _modeChanged: function(mode) {
-        let currentDashboard = this.$.content.firstChild;
-        if (currentDashboard) {
-          this.$.content.removeChild(currentDashboard);
-        }
-
-        if (!mode || !this._dashboardMapping) {
-          return;
-        }
-
-        // Append the new dashboard.
-        const newDashboard = this.selectedDashboard();
-        this.$.content.appendChild(newDashboard);
-      },
-      reload: function() {
-        this.selectedDashboard().reload();
-      },
-      openSettings: function() {
-        this.$.settings.open();
-      },
-    });
-  </script>
-  
-  <script>(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-"use strict";
-var AnalyticsLogger = (function () {
-    /**
-     * Constructs an event logger using Google Analytics. It assumes there is a
-     * Google Analytics script added to the page elsewhere. If there is no such
-     * script, the logger acts as a no-op.
-     *
-     * @param pageViewLogging Whether to log page views.
-     * @param eventLogging Whether to log user interaction.
-     */
-    function AnalyticsLogger(pageViewLogging, eventLogging) {
-        if (typeof ga === 'undefined' || ga == null) {
-            this.eventLogging = false;
-            this.pageViewLogging = false;
-            return;
-        }
-        this.eventLogging = eventLogging;
-        this.pageViewLogging = pageViewLogging;
-    }
-    AnalyticsLogger.prototype.logPageView = function (pageTitle) {
-        if (this.pageViewLogging) {
-            // Always send a page view.
-            ga('send', { hitType: 'pageview', page: "/v/" + pageTitle });
-        }
-    };
-    AnalyticsLogger.prototype.logProjectionChanged = function (projection) {
-        if (this.eventLogging) {
-            ga('send', {
-                hitType: 'event',
-                eventCategory: 'Projection',
-                eventAction: 'click',
-                eventLabel: projection
-            });
-        }
-    };
-    AnalyticsLogger.prototype.logWebGLDisabled = function () {
-        if (this.eventLogging) {
-            ga('send', {
-                hitType: 'event',
-                eventCategory: 'Error',
-                eventAction: 'PageLoad',
-                eventLabel: 'WebGL_disabled'
-            });
-        }
-    };
-    return AnalyticsLogger;
-}());
-exports.AnalyticsLogger = AnalyticsLogger;
-
-},{}],2:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-/**
- * This is a fork of the Karpathy's TSNE.js (original license below).
- * This fork implements Barnes-Hut approximation and runs in O(NlogN)
- * time, as opposed to the Karpathy's O(N^2) version.
- *
- * @author smilkov@google.com (Daniel Smilkov)
- */
-/**
- * The MIT License (MIT)
- * Copyright (c) 2015 Andrej Karpathy
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-var sptree_1 = require('./sptree');
-/**
- * Barnes-hut approximation level. Higher means more approximation and faster
- * results. Recommended value mentioned in the paper is 0.8.
- */
-var THETA = 0.8;
-var MIN_POSSIBLE_PROB = 1E-9;
-// Variables used for memorizing the second random number since running
-// gaussRandom() generates two random numbers at the cost of 1 atomic
-// computation. This optimization results in 2X speed-up of the generator.
-var return_v = false;
-var v_val = 0.0;
-/** Returns the square euclidean distance between two vectors. */
-function dist2(a, b) {
-    if (a.length !== b.length) {
-        throw new Error('Vectors a and b must be of same length');
-    }
-    var result = 0;
-    for (var i = 0; i < a.length; ++i) {
-        var diff = a[i] - b[i];
-        result += diff * diff;
-    }
-    return result;
-}
-exports.dist2 = dist2;
-/** Returns the square euclidean distance between two 2D points. */
-function dist2_2D(a, b) {
-    var dX = a[0] - b[0];
-    var dY = a[1] - b[1];
-    return dX * dX + dY * dY;
-}
-exports.dist2_2D = dist2_2D;
-/** Returns the square euclidean distance between two 3D points. */
-function dist2_3D(a, b) {
-    var dX = a[0] - b[0];
-    var dY = a[1] - b[1];
-    var dZ = a[2] - b[2];
-    return dX * dX + dY * dY + dZ * dZ;
-}
-exports.dist2_3D = dist2_3D;
-function gaussRandom(rng) {
-    if (return_v) {
-        return_v = false;
-        return v_val;
-    }
-    var u = 2 * rng() - 1;
-    var v = 2 * rng() - 1;
-    var r = u * u + v * v;
-    if (r === 0 || r > 1) {
-        return gaussRandom(rng);
-    }
-    var c = Math.sqrt(-2 * Math.log(r) / r);
-    v_val = v * c; // cache this for next function call for efficiency
-    return_v = true;
-    return u * c;
-}
-;
-// return random normal number
-function randn(rng, mu, std) {
-    return mu + gaussRandom(rng) * std;
-}
-;
-// utilitity that creates contiguous vector of zeros of size n
-function zeros(n) {
-    return new Float64Array(n);
-}
-;
-// utility that returns a matrix filled with random numbers
-// generated by the provided generator.
-function randnMatrix(n, d, rng) {
-    var nd = n * d;
-    var x = zeros(nd);
-    for (var i = 0; i < nd; ++i) {
-        x[i] = randn(rng, 0.0, 1E-4);
-    }
-    return x;
-}
-;
-// utility that returns a matrix filled with the provided value.
-function arrayofs(n, d, val) {
-    var x = [];
-    for (var i = 0; i < n; ++i) {
-        x.push(d === 3 ? [val, val, val] : [val, val]);
-    }
-    return x;
-}
-;
-// compute (p_{i|j} + p_{j|i})/(2n)
-function nearest2P(nearest, perplexity, tol) {
-    var N = nearest.length;
-    var Htarget = Math.log(perplexity); // target entropy of distribution
-    var P = zeros(N * N); // temporary probability matrix
-    var K = nearest[0].length;
-    var pRow = new Array(K); // pij[].
-    for (var i = 0; i < N; ++i) {
-        var neighbors = nearest[i];
-        var betaMin = -Infinity;
-        var betaMax = Infinity;
-        var beta = 1; // initial value of precision
-        var maxTries = 50;
-        // perform binary search to find a suitable precision beta
-        // so that the entropy of the distribution is appropriate
-        var numTries = 0;
-        while (true) {
-            // compute entropy and kernel row with beta precision
-            var psum = 0.0;
-            for (var k = 0; k < neighbors.length; ++k) {
-                var neighbor = neighbors[k];
-                var pij = (i === neighbor.index) ? 0 : Math.exp(-neighbor.dist * beta);
-                pij = Math.max(pij, MIN_POSSIBLE_PROB);
-                pRow[k] = pij;
-                psum += pij;
-            }
-            // normalize p and compute entropy
-            var Hhere = 0.0;
-            for (var k = 0; k < pRow.length; ++k) {
-                pRow[k] /= psum;
-                var pij = pRow[k];
-                if (pij > 1E-7) {
-                    Hhere -= pij * Math.log(pij);
-                }
-                ;
-            }
-            // adjust beta based on result
-            if (Hhere > Htarget) {
-                // entropy was too high (distribution too diffuse)
-                // so we need to increase the precision for more peaky distribution
-                betaMin = beta; // move up the bounds
-                if (betaMax === Infinity) {
-                    beta = beta * 2;
-                }
-                else {
-                    beta = (beta + betaMax) / 2;
-                }
-            }
-            else {
-                // converse case. make distrubtion less peaky
-                betaMax = beta;
-                if (betaMin === -Infinity) {
-                    beta = beta / 2;
-                }
-                else {
-                    beta = (beta + betaMin) / 2;
-                }
-            }
-            numTries++;
-            // stopping conditions: too many tries or got a good precision
-            if (numTries >= maxTries || Math.abs(Hhere - Htarget) < tol) {
-                break;
-            }
-        }
-        // copy over the final prow to P at row i
-        for (var k = 0; k < pRow.length; ++k) {
-            var pij = pRow[k];
-            var j = neighbors[k].index;
-            P[i * N + j] = pij;
-        }
-    } // end loop over examples i
-    // symmetrize P and normalize it to sum to 1 over all ij
-    var N2 = N * 2;
-    for (var i = 0; i < N; ++i) {
-        for (var j = i + 1; j < N; ++j) {
-            var i_j = i * N + j;
-            var j_i = j * N + i;
-            var value = (P[i_j] + P[j_i]) / N2;
-            P[i_j] = value;
-            P[j_i] = value;
-        }
-    }
-    return P;
-}
-;
-// helper function
-function sign(x) {
-    return x > 0 ? 1 : x < 0 ? -1 : 0;
-}
-function computeForce_2d(force, mult, pointA, pointB) {
-    force[0] += mult * (pointA[0] - pointB[0]);
-    force[1] += mult * (pointA[1] - pointB[1]);
-}
-function computeForce_3d(force, mult, pointA, pointB) {
-    force[0] += mult * (pointA[0] - pointB[0]);
-    force[1] += mult * (pointA[1] - pointB[1]);
-    force[2] += mult * (pointA[2] - pointB[2]);
-}
-var TSNE = (function () {
-    function TSNE(opt) {
-        this.iter = 0;
-        opt = opt || { dim: 2 };
-        this.perplexity = opt.perplexity || 30;
-        this.epsilon = opt.epsilon || 10;
-        this.rng = opt.rng || Math.random;
-        this.dim = opt.dim;
-        if (opt.dim === 2) {
-            this.dist2 = dist2_2D;
-            this.computeForce = computeForce_2d;
-        }
-        else if (opt.dim === 3) {
-            this.dist2 = dist2_3D;
-            this.computeForce = computeForce_3d;
-        }
-        else {
-            throw new Error('Only 2D and 3D is supported');
-        }
-    }
-    // this function takes a fattened distance matrix and creates
-    // matrix P from them.
-    // D is assumed to be provided as an array of size N^2.
-    TSNE.prototype.initDataDist = function (nearest) {
-        var N = nearest.length;
-        this.nearest = nearest;
-        this.P = nearest2P(nearest, this.perplexity, 1E-4);
-        this.N = N;
-        this.initSolution(); // refresh this
-    };
-    // (re)initializes the solution to random
-    TSNE.prototype.initSolution = function () {
-        // generate random solution to t-SNE
-        this.Y = randnMatrix(this.N, this.dim, this.rng); // the solution
-        this.gains = arrayofs(this.N, this.dim, 1.0); // step gains
-        // to accelerate progress in unchanging directions
-        this.ystep = arrayofs(this.N, this.dim, 0.0); // momentum accumulator
-        this.iter = 0;
-    };
-    // return pointer to current solution
-    TSNE.prototype.getSolution = function () { return this.Y; };
-    // perform a single step of optimization to improve the embedding
-    TSNE.prototype.step = function () {
-        this.iter += 1;
-        var N = this.N;
-        var grad = this.costGrad(this.Y); // evaluate gradient
-        // perform gradient step
-        var ymean = this.dim === 3 ? [0, 0, 0] : [0, 0];
-        for (var i = 0; i < N; ++i) {
-            for (var d = 0; d < this.dim; ++d) {
-                var gid = grad[i][d];
-                var sid = this.ystep[i][d];
-                var gainid = this.gains[i][d];
-                // compute gain update
-                var newgain = sign(gid) === sign(sid) ? gainid * 0.8 : gainid + 0.2;
-                if (newgain < 0.01) {
-                    newgain = 0.01; // clamp
-                }
-                this.gains[i][d] = newgain; // store for next turn
-                // compute momentum step direction
-                var momval = this.iter < 250 ? 0.5 : 0.8;
-                var newsid = momval * sid - this.epsilon * newgain * grad[i][d];
-                this.ystep[i][d] = newsid; // remember the step we took
-                // step!
-                var i_d = i * this.dim + d;
-                this.Y[i_d] += newsid;
-                ymean[d] += this.Y[i_d]; // accumulate mean so that we
-            }
-        }
-        // reproject Y to be zero mean
-        for (var i = 0; i < N; ++i) {
-            for (var d = 0; d < this.dim; ++d) {
-                this.Y[i * this.dim + d] -= ymean[d] / N;
-            }
-        }
-    };
-    // return cost and gradient, given an arrangement
-    TSNE.prototype.costGrad = function (Y) {
-        var _this = this;
-        var N = this.N;
-        var P = this.P;
-        // Trick that helps with local optima.
-        var alpha = this.iter < 100 ? 4 : 1;
-        // Make data for the SP tree.
-        var points = new Array(N); // (x, y)[]
-        for (var i = 0; i < N; ++i) {
-            var iTimesD = i * this.dim;
-            var row = new Array(this.dim);
-            for (var d = 0; d < this.dim; ++d) {
-                row[d] = Y[iTimesD + d];
-            }
-            points[i] = row;
-        }
-        // Make a tree.
-        var tree = new sptree_1.SPTree(points);
-        var root = tree.root;
-        // Annotate the tree.
-        var annotateTree = function (node) {
-            var numCells = 1;
-            if (node.children == null) {
-                // Update the current node and tell the parent.
-                node.numCells = numCells;
-                node.yCell = node.point;
-                return { numCells: numCells, yCell: node.yCell };
-            }
-            // node.point is a 2 or 3-dim number[], so slice() makes a copy.
-            var yCell = node.point.slice();
-            for (var i = 0; i < node.children.length; ++i) {
-                var child = node.children[i];
-                if (child == null) {
-                    continue;
-                }
-                var result = annotateTree(child);
-                numCells += result.numCells;
-                for (var d = 0; d < _this.dim; ++d) {
-                    yCell[d] += result.yCell[d];
-                }
-            }
-            // Update the node and tell the parent.
-            node.numCells = numCells;
-            node.yCell = yCell.map(function (v) { return v / numCells; });
-            return { numCells: numCells, yCell: yCell };
-        };
-        // Augment the tree with more info.
-        annotateTree(root);
-        tree.visit(function (node, low, high) {
-            node.rCell = high[0] - low[0];
-            return false;
-        });
-        // compute current Q distribution, unnormalized first
-        var grad = [];
-        var Z = 0;
-        var forces = new Array(N);
-        var _loop_1 = function(i) {
-            var pointI = points[i];
-            // Compute the positive forces for the i-th node.
-            var Fpos = this_1.dim === 3 ? [0, 0, 0] : [0, 0];
-            var neighbors = this_1.nearest[i];
-            for (var k = 0; k < neighbors.length; ++k) {
-                var j = neighbors[k].index;
-                var pij = P[i * N + j];
-                var pointJ = points[j];
-                var squaredDistItoJ = this_1.dist2(pointI, pointJ);
-                var premult = pij / (1 + squaredDistItoJ);
-                this_1.computeForce(Fpos, premult, pointI, pointJ);
-            }
-            // Compute the negative forces for the i-th node.
-            var FnegZ = this_1.dim === 3 ? [0, 0, 0] : [0, 0];
-            tree.visit(function (node) {
-                var squaredDistToCell = _this.dist2(pointI, node.yCell);
-                // Squared distance from point i to cell.
-                if (node.children == null ||
-                    (squaredDistToCell > 0 &&
-                        node.rCell / Math.sqrt(squaredDistToCell) < THETA)) {
-                    var qijZ_1 = 1 / (1 + squaredDistToCell);
-                    var dZ = node.numCells * qijZ_1;
-                    Z += dZ;
-                    dZ *= qijZ_1;
-                    _this.computeForce(FnegZ, dZ, pointI, node.yCell);
-                    return true;
-                }
-                // Cell is too close to approximate.
-                var squaredDistToPoint = _this.dist2(pointI, node.point);
-                var qijZ = 1 / (1 + squaredDistToPoint);
-                Z += qijZ;
-                qijZ *= qijZ;
-                _this.computeForce(FnegZ, qijZ, pointI, node.point);
-                return false;
-            }, true);
-            forces[i] = [Fpos, FnegZ];
-        };
-        var this_1 = this;
-        for (var i = 0; i < N; ++i) {
-            _loop_1(i);
-        }
-        // Normalize the negative forces and compute the gradient.
-        var A = 4 * alpha;
-        var B = 4 / Z;
-        for (var i = 0; i < N; ++i) {
-            var _a = forces[i], FPos = _a[0], FNegZ = _a[1];
-            var gsum = new Array(this.dim);
-            for (var d = 0; d < this.dim; ++d) {
-                gsum[d] = A * FPos[d] - B * FNegZ[d];
-            }
-            grad.push(gsum);
-        }
-        return grad;
-    };
-    return TSNE;
-}());
-exports.TSNE = TSNE;
-
-},{"./sptree":23}],3:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var data_1 = require('./data');
-var data_provider_1 = require('./data-provider');
-var dataProvider = require('./data-provider');
-var logging = require('./logging');
-var BYTES_EXTENSION = '.bytes';
-/** Data provider that loads data from a demo folder. */
-var DemoDataProvider = (function () {
-    function DemoDataProvider(projectorConfigPath) {
-        this.projectorConfigPath = projectorConfigPath;
-    }
-    DemoDataProvider.prototype.getEmbeddingInfo = function (tensorName) {
-        var embeddings = this.projectorConfig.embeddings;
-        for (var i = 0; i < embeddings.length; i++) {
-            var embedding = embeddings[i];
-            if (embedding.tensorName === tensorName) {
-                return embedding;
-            }
-        }
-        return null;
-    };
-    DemoDataProvider.prototype.retrieveRuns = function (callback) {
-        callback(['Demo']);
-    };
-    DemoDataProvider.prototype.retrieveProjectorConfig = function (run, callback) {
-        var _this = this;
-        var msgId = logging.setModalMessage('Fetching projector config...');
-        d3.json(this.projectorConfigPath, function (err, projectorConfig) {
-            if (err) {
-                var errorMessage = err;
-                // If the error is a valid XMLHttpResponse, it's possible this is a
-                // cross-origin error.
-                if (err.responseText != null) {
-                    errorMessage = 'Cannot fetch projector config, possibly a ' +
-                        'Cross-Origin request error.';
-                }
-                logging.setErrorMessage(errorMessage, 'fetching projector config');
-                return;
-            }
-            logging.setModalMessage(null, msgId);
-            _this.projectorConfig = projectorConfig;
-            callback(projectorConfig);
-        });
-    };
-    DemoDataProvider.prototype.retrieveTensor = function (run, tensorName, callback) {
-        var embedding = this.getEmbeddingInfo(tensorName);
-        var url = "" + embedding.tensorPath;
-        if (embedding.tensorPath.substr(-1 * BYTES_EXTENSION.length) ===
-            BYTES_EXTENSION) {
-            dataProvider.retrieveTensorAsBytes(this, this.getEmbeddingInfo(tensorName), run, tensorName, url, callback);
-        }
-        else {
-            logging.setModalMessage('Fetching tensors...', data_provider_1.TENSORS_MSG_ID);
-            var request_1 = new XMLHttpRequest();
-            request_1.open('GET', url);
-            request_1.responseType = 'arraybuffer';
-            request_1.onerror = function () {
-                logging.setErrorMessage(request_1.responseText, 'fetching tensors');
-            };
-            request_1.onload = function () {
-                dataProvider.parseTensors(request_1.response).then(function (points) {
-                    callback(new data_1.DataSet(points));
-                });
-            };
-            request_1.send();
-        }
-    };
-    DemoDataProvider.prototype.retrieveSpriteAndMetadata = function (run, tensorName, callback) {
-        var embedding = this.getEmbeddingInfo(tensorName);
-        var spriteImagePath = null;
-        if (embedding.sprite && embedding.sprite.imagePath) {
-            spriteImagePath = embedding.sprite.imagePath;
-        }
-        dataProvider.retrieveSpriteAndMetadataInfo(embedding.metadataPath, spriteImagePath, embedding.sprite, callback);
-    };
-    DemoDataProvider.prototype.getBookmarks = function (run, tensorName, callback) {
-        var embedding = this.getEmbeddingInfo(tensorName);
-        var msgId = logging.setModalMessage('Fetching bookmarks...');
-        d3.json(embedding.bookmarksPath, function (err, bookmarks) {
-            if (err) {
-                logging.setErrorMessage(err.responseText);
-                return;
-            }
-            logging.setModalMessage(null, msgId);
-            callback(bookmarks);
-        });
-    };
-    return DemoDataProvider;
-}());
-exports.DemoDataProvider = DemoDataProvider;
-
-},{"./data":7,"./data-provider":6,"./logging":12}],4:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var data_1 = require('./data');
-var data_provider_1 = require('./data-provider');
-var ProtoDataProvider = (function () {
-    function ProtoDataProvider(dataProto) {
-        this.dataProto = dataProto;
-    }
-    ProtoDataProvider.prototype.retrieveRuns = function (callback) {
-        callback(['proto']);
-    };
-    ProtoDataProvider.prototype.retrieveProjectorConfig = function (run, callback) {
-        callback({
-            modelCheckpointPath: 'proto',
-            embeddings: [{
-                    tensorName: 'proto',
-                    tensorShape: this.dataProto.shape,
-                    metadataPath: 'proto'
-                }]
-        });
-    };
-    ProtoDataProvider.prototype.retrieveTensor = function (run, tensorName, callback) {
-        callback(this.flatArrayToDataset(this.dataProto.tensor));
-    };
-    ProtoDataProvider.prototype.retrieveSpriteAndMetadata = function (run, tensorName, callback) {
-        var columnNames = this.dataProto.metadata.columns.map(function (c) { return c.name; });
-        var n = this.dataProto.shape[0];
-        var pointsMetadata = new Array(n);
-        this.dataProto.metadata.columns.forEach(function (c) {
-            var values = c.numericValues || c.stringValues;
-            for (var i = 0; i < n; i++) {
-                pointsMetadata[i] = pointsMetadata[i] || {};
-                pointsMetadata[i][c.name] = values[i];
-            }
-        });
-        callback({
-            stats: data_provider_1.analyzeMetadata(columnNames, pointsMetadata),
-            pointsInfo: pointsMetadata
-        });
-    };
-    ProtoDataProvider.prototype.getBookmarks = function (run, tensorName, callback) {
-        return callback([]);
-    };
-    ProtoDataProvider.prototype.flatArrayToDataset = function (tensor) {
-        var points = [];
-        var n = this.dataProto.shape[0];
-        var d = this.dataProto.shape[1];
-        if (n * d !== tensor.length) {
-            throw 'The shape doesn\'t match the length of the flattened array';
-        }
-        for (var i = 0; i < n; i++) {
-            var offset = i * d;
-            points.push({
-                vector: new Float32Array(tensor.slice(offset, offset + d)),
-                metadata: {},
-                projections: null,
-                index: i
-            });
-        }
-        return new data_1.DataSet(points);
-    };
-    return ProtoDataProvider;
-}());
-exports.ProtoDataProvider = ProtoDataProvider;
-
-},{"./data":7,"./data-provider":6}],5:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var dataProvider = require('./data-provider');
-var logging = require('./logging');
-// Limit for the number of data points we receive from the server.
-exports.LIMIT_NUM_POINTS = 100000;
-/**
- * Data provider that loads data provided by a python server (usually backed
- * by a checkpoint file).
- */
-var ServerDataProvider = (function () {
-    function ServerDataProvider(routePrefix) {
-        this.runProjectorConfigCache = {};
-        this.routePrefix = routePrefix;
-    }
-    ServerDataProvider.prototype.getEmbeddingInfo = function (run, tensorName, callback) {
-        this.retrieveProjectorConfig(run, function (config) {
-            var embeddings = config.embeddings;
-            for (var i = 0; i < embeddings.length; i++) {
-                var embedding = embeddings[i];
-                if (embedding.tensorName === tensorName) {
-                    callback(embedding);
-                    return;
-                }
-            }
-            callback(null);
-        });
-    };
-    ServerDataProvider.prototype.retrieveRuns = function (callback) {
-        var msgId = logging.setModalMessage('Fetching runs...');
-        d3.json(this.routePrefix + "/runs", function (err, runs) {
-            if (err) {
-                logging.setErrorMessage(err.responseText, 'fetching runs');
-                return;
-            }
-            logging.setModalMessage(null, msgId);
-            callback(runs);
-        });
-    };
-    ServerDataProvider.prototype.retrieveProjectorConfig = function (run, callback) {
-        var _this = this;
-        if (run in this.runProjectorConfigCache) {
-            callback(this.runProjectorConfigCache[run]);
-            return;
-        }
-        var msgId = logging.setModalMessage('Fetching projector config...');
-        d3.json(this.routePrefix + "/info?run=" + run, function (err, config) {
-            if (err) {
-                logging.setErrorMessage(err.responseText, 'fetching projector config');
-                return;
-            }
-            logging.setModalMessage(null, msgId);
-            _this.runProjectorConfigCache[run] = config;
-            callback(config);
-        });
-    };
-    ServerDataProvider.prototype.retrieveTensor = function (run, tensorName, callback) {
-        var _this = this;
-        this.getEmbeddingInfo(run, tensorName, function (embedding) {
-            dataProvider.retrieveTensorAsBytes(_this, embedding, run, tensorName, (_this.routePrefix + "/tensor?run=" + run + "&name=" + tensorName) +
-                ("&num_rows=" + exports.LIMIT_NUM_POINTS), callback);
-        });
-    };
-    ServerDataProvider.prototype.retrieveSpriteAndMetadata = function (run, tensorName, callback) {
-        var _this = this;
-        this.getEmbeddingInfo(run, tensorName, function (embedding) {
-            var metadataPath = null;
-            if (embedding.metadataPath) {
-                metadataPath =
-                    (_this.routePrefix + "/metadata?") +
-                        ("run=" + run + "&name=" + tensorName + "&num_rows=" + exports.LIMIT_NUM_POINTS);
-            }
-            var spriteImagePath = null;
-            if (embedding.sprite && embedding.sprite.imagePath) {
-                spriteImagePath =
-                    _this.routePrefix + "/sprite_image?run=" + run + "&name=" + tensorName;
-            }
-            dataProvider.retrieveSpriteAndMetadataInfo(metadataPath, spriteImagePath, embedding.sprite, callback);
-        });
-    };
-    ServerDataProvider.prototype.getBookmarks = function (run, tensorName, callback) {
-        var msgId = logging.setModalMessage('Fetching bookmarks...');
-        d3.json(this.routePrefix + "/bookmarks?run=" + run + "&name=" + tensorName, function (err, bookmarks) {
-            logging.setModalMessage(null, msgId);
-            if (!err) {
-                callback(bookmarks);
-            }
-        });
-    };
-    return ServerDataProvider;
-}());
-exports.ServerDataProvider = ServerDataProvider;
-
-},{"./data-provider":6,"./logging":12}],6:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var data_1 = require('./data');
-var logging = require('./logging');
-var util_1 = require('./util');
-/** Maximum number of colors supported in the color map. */
-var NUM_COLORS_COLOR_MAP = 50;
-var MAX_SPRITE_IMAGE_SIZE_PX = 8192;
-exports.METADATA_MSG_ID = 'metadata';
-exports.TENSORS_MSG_ID = 'tensors';
-function retrieveTensorAsBytes(dp, embedding, run, tensorName, tensorsPath, callback) {
-    // Get the tensor.
-    logging.setModalMessage('Fetching tensor values...', exports.TENSORS_MSG_ID);
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', tensorsPath);
-    xhr.responseType = 'arraybuffer';
-    xhr.onprogress = function (ev) {
-        if (ev.lengthComputable) {
-            var percent = (ev.loaded * 100 / ev.total).toFixed(1);
-            logging.setModalMessage('Fetching tensor values: ' + percent + '%', exports.TENSORS_MSG_ID);
-        }
-    };
-    xhr.onload = function () {
-        if (xhr.status !== 200) {
-            var msg = String.fromCharCode.apply(null, new Uint8Array(xhr.response));
-            logging.setErrorMessage(msg, 'fetching tensors');
-            return;
-        }
-        var data;
-        try {
-            data = new Float32Array(xhr.response);
-        }
-        catch (e) {
-            logging.setErrorMessage(e, 'parsing tensor bytes');
-            return;
-        }
-        var dim = embedding.tensorShape[1];
-        var N = data.length / dim;
-        if (embedding.tensorShape[0] > N) {
-            logging.setWarningMessage(("Showing the first " + N.toLocaleString()) +
-                (" of " + embedding.tensorShape[0].toLocaleString() + " data points"));
-        }
-        parseTensorsFromFloat32Array(data, dim).then(function (dataPoints) {
-            callback(new data_1.DataSet(dataPoints));
-        });
-    };
-    xhr.send();
-}
-exports.retrieveTensorAsBytes = retrieveTensorAsBytes;
-function parseRawTensors(content, callback) {
-    parseTensors(content).then(function (data) {
-        callback(new data_1.DataSet(data));
-    });
-}
-exports.parseRawTensors = parseRawTensors;
-function parseRawMetadata(contents, callback) {
-    parseMetadata(contents).then(function (result) { return callback(result); });
-}
-exports.parseRawMetadata = parseRawMetadata;
-/**
- * Parse an ArrayBuffer in a streaming fashion line by line (or custom delim).
- * Can handle very large files.
- *
- * @param content The array buffer.
- * @param callback The callback called on each line.
- * @param chunkSize The size of each read chunk, defaults to ~1MB. (optional)
- * @param delim The delimiter used to split a line, defaults to '\n'. (optional)
- * @returns A promise for when it is finished.
- */
-function streamParse(content, callback, chunkSize, delim) {
-    if (chunkSize === void 0) { chunkSize = 1000000; }
-    if (delim === void 0) { delim = '\n'; }
-    return new Promise(function (resolve, reject) {
-        var offset = 0;
-        var bufferSize = content.byteLength - 1;
-        var data = '';
-        function readHandler(str) {
-            offset += chunkSize;
-            var parts = str.split(delim);
-            var first = data + parts[0];
-            if (parts.length === 1) {
-                data = first;
-                readChunk(offset, chunkSize);
-                return;
-            }
-            data = parts[parts.length - 1];
-            callback(first);
-            for (var i = 1; i < parts.length - 1; i++) {
-                callback(parts[i]);
-            }
-            if (offset >= bufferSize) {
-                if (data) {
-                    callback(data);
-                }
-                resolve();
-                return;
-            }
-            readChunk(offset, chunkSize);
-        }
-        function readChunk(offset, size) {
-            var contentChunk = content.slice(offset, offset + size);
-            var blob = new Blob([contentChunk]);
-            var file = new FileReader();
-            file.onload = function (e) { return readHandler(e.target.result); };
-            file.readAsText(blob);
-        }
-        readChunk(offset, chunkSize);
-    });
-}
-/** Parses a tsv text file. */
-function parseTensors(content, valueDelim) {
-    if (valueDelim === void 0) { valueDelim = '\t'; }
-    logging.setModalMessage('Parsing tensors...', exports.TENSORS_MSG_ID);
-    return new Promise(function (resolve, reject) {
-        var data = [];
-        var numDim;
-        streamParse(content, function (line) {
-            line = line.trim();
-            if (line === '') {
-                return;
-            }
-            var row = line.split(valueDelim);
-            var dataPoint = {
-                metadata: {},
-                vector: null,
-                index: data.length,
-                projections: null,
-            };
-            // If the first label is not a number, take it as the label.
-            if (isNaN(row[0]) || numDim === row.length - 1) {
-                dataPoint.metadata['label'] = row[0];
-                dataPoint.vector = new Float32Array(row.slice(1).map(Number));
-            }
-            else {
-                dataPoint.vector = new Float32Array(row.map(Number));
-            }
-            data.push(dataPoint);
-            if (numDim == null) {
-                numDim = dataPoint.vector.length;
-            }
-            if (numDim !== dataPoint.vector.length) {
-                logging.setModalMessage('Parsing failed. Vector dimensions do not match');
-                throw Error('Parsing failed');
-            }
-            if (numDim <= 1) {
-                logging.setModalMessage('Parsing failed. Found a vector with only one dimension?');
-                throw Error('Parsing failed');
-            }
-        }).then(function () {
-            logging.setModalMessage(null, exports.TENSORS_MSG_ID);
-            resolve(data);
-        });
-    });
-}
-exports.parseTensors = parseTensors;
-/** Parses a tsv text file. */
-function parseTensorsFromFloat32Array(data, dim) {
-    return util_1.runAsyncTask('Parsing tensors...', function () {
-        var N = data.length / dim;
-        var dataPoints = [];
-        var offset = 0;
-        for (var i = 0; i < N; ++i) {
-            dataPoints.push({
-                metadata: {},
-                vector: data.subarray(offset, offset + dim),
-                index: i,
-                projections: null,
-            });
-            offset += dim;
-        }
-        return dataPoints;
-    }, exports.TENSORS_MSG_ID).then(function (dataPoints) {
-        logging.setModalMessage(null, exports.TENSORS_MSG_ID);
-        return dataPoints;
-    });
-}
-exports.parseTensorsFromFloat32Array = parseTensorsFromFloat32Array;
-function analyzeMetadata(columnNames, pointsMetadata) {
-    var columnStats = columnNames.map(function (name) {
-        return {
-            name: name,
-            isNumeric: true,
-            tooManyUniqueValues: false,
-            min: Number.POSITIVE_INFINITY,
-            max: Number.NEGATIVE_INFINITY
-        };
-    });
-    var mapOfValues = columnNames.map(function () { return d3.map(); });
-    pointsMetadata.forEach(function (metadata) {
-        columnNames.forEach(function (name, colIndex) {
-            var stats = columnStats[colIndex];
-            var map = mapOfValues[colIndex];
-            var value = metadata[name];
-            // Skip missing values.
-            if (value == null) {
-                return;
-            }
-            if (!stats.tooManyUniqueValues) {
-                if (map.has(value)) {
-                    map.set(value, map.get(value) + 1);
-                }
-                else {
-                    map.set(value, 1);
-                }
-                if (map.size() > NUM_COLORS_COLOR_MAP) {
-                    stats.tooManyUniqueValues = true;
-                }
-            }
-            if (isNaN(value)) {
-                stats.isNumeric = false;
-            }
-            else {
-                metadata[name] = +value;
-                stats.min = Math.min(stats.min, +value);
-                stats.max = Math.max(stats.max, +value);
-            }
-        });
-    });
-    columnStats.forEach(function (stats, colIndex) {
-        stats.uniqueEntries = mapOfValues[colIndex].entries().map(function (e) {
-            return { label: e.key, count: e.value };
-        });
-    });
-    return columnStats;
-}
-exports.analyzeMetadata = analyzeMetadata;
-function parseMetadata(content) {
-    logging.setModalMessage('Parsing metadata...', exports.METADATA_MSG_ID);
-    return new Promise(function (resolve, reject) {
-        var pointsMetadata = [];
-        var hasHeader = false;
-        var lineNumber = 0;
-        var columnNames = ['label'];
-        streamParse(content, function (line) {
-            if (line.trim().length === 0) {
-                return;
-            }
-            if (lineNumber === 0) {
-                hasHeader = line.indexOf('\t') >= 0;
-                // If the first row doesn't contain metadata keys, we assume that the
-                // values are labels.
-                if (hasHeader) {
-                    columnNames = line.split('\t');
-                    lineNumber++;
-                    return;
-                }
-            }
-            lineNumber++;
-            var rowValues = line.split('\t');
-            var metadata = {};
-            pointsMetadata.push(metadata);
-            columnNames.forEach(function (name, colIndex) {
-                var value = rowValues[colIndex];
-                // Normalize missing values.
-                value = (value === '' ? null : value);
-                metadata[name] = value;
-            });
-        }).then(function () {
-            logging.setModalMessage(null, exports.METADATA_MSG_ID);
-            resolve({
-                stats: analyzeMetadata(columnNames, pointsMetadata),
-                pointsInfo: pointsMetadata
-            });
-        });
-    });
-}
-exports.parseMetadata = parseMetadata;
-function fetchImage(url) {
-    return new Promise(function (resolve, reject) {
-        var image = new Image();
-        image.onload = function () { return resolve(image); };
-        image.onerror = function (err) { return reject(err); };
-        image.crossOrigin = '';
-        image.src = url;
-    });
-}
-exports.fetchImage = fetchImage;
-function retrieveSpriteAndMetadataInfo(metadataPath, spriteImagePath, spriteMetadata, callback) {
-    var metadataPromise = Promise.resolve({});
-    if (metadataPath) {
-        metadataPromise = new Promise(function (resolve, reject) {
-            logging.setModalMessage('Fetching metadata...', exports.METADATA_MSG_ID);
-            var request = new XMLHttpRequest();
-            request.open('GET', metadataPath);
-            request.responseType = 'arraybuffer';
-            request.onerror = function () {
-                logging.setErrorMessage(request.responseText, 'fetching metadata');
-                reject();
-            };
-            request.onload = function () {
-                resolve(parseMetadata(request.response));
-            };
-            request.send(null);
-        });
-    }
-    var spriteMsgId = null;
-    var spritesPromise = null;
-    if (spriteImagePath) {
-        spriteMsgId = logging.setModalMessage('Fetching sprite image...');
-        spritesPromise = fetchImage(spriteImagePath);
-    }
-    // Fetch the metadata and the image in parallel.
-    Promise.all([metadataPromise, spritesPromise]).then(function (values) {
-        if (spriteMsgId) {
-            logging.setModalMessage(null, spriteMsgId);
-        }
-        var metadata = values[0], spriteImage = values[1];
-        if (spriteImage && (spriteImage.height > MAX_SPRITE_IMAGE_SIZE_PX ||
-            spriteImage.width > MAX_SPRITE_IMAGE_SIZE_PX)) {
-            logging.setModalMessage(("Error: Sprite image of dimensions " + spriteImage.width + "px x ") +
-                (spriteImage.height + "px exceeds maximum dimensions ") +
-                (MAX_SPRITE_IMAGE_SIZE_PX + "px x " + MAX_SPRITE_IMAGE_SIZE_PX + "px"));
-        }
-        else {
-            metadata.spriteImage = spriteImage;
-            metadata.spriteMetadata = spriteMetadata;
-            callback(metadata);
-        }
-    });
-}
-exports.retrieveSpriteAndMetadataInfo = retrieveSpriteAndMetadataInfo;
-
-},{"./data":7,"./logging":12,"./util":24}],7:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var bh_tsne_1 = require('./bh_tsne');
-var knn = require('./knn');
-var logging = require('./logging');
-var util = require('./util');
-var vector = require('./vector');
-var IS_FIREFOX = navigator.userAgent.toLowerCase().indexOf('firefox') >= 0;
-/** Controls whether nearest neighbors computation is done on the GPU or CPU. */
-var KNN_GPU_ENABLED = util.hasWebGLSupport() && !IS_FIREFOX;
-exports.TSNE_SAMPLE_SIZE = 10000;
-exports.PCA_SAMPLE_SIZE = 50000;
-/** Number of dimensions to sample when doing approximate PCA. */
-exports.PCA_SAMPLE_DIM = 200;
-/** Number of pca components to compute. */
-var NUM_PCA_COMPONENTS = 10;
-/**
- * Reserved metadata attributes used for sequence information
- * NOTE: Use "__seq_next__" as "__next__" is deprecated.
- */
-var SEQUENCE_METADATA_ATTRS = ['__next__', '__seq_next__'];
-function getSequenceNextPointIndex(pointMetadata) {
-    var sequenceAttr = null;
-    for (var _i = 0, SEQUENCE_METADATA_ATTRS_1 = SEQUENCE_METADATA_ATTRS; _i < SEQUENCE_METADATA_ATTRS_1.length; _i++) {
-        var metadataAttr = SEQUENCE_METADATA_ATTRS_1[_i];
-        if (metadataAttr in pointMetadata && pointMetadata[metadataAttr] !== '') {
-            sequenceAttr = pointMetadata[metadataAttr];
-            break;
-        }
-    }
-    if (sequenceAttr == null) {
-        return null;
-    }
-    return +sequenceAttr;
-}
-/**
- * Dataset contains a DataPoints array that should be treated as immutable. This
- * acts as a working subset of the original data, with cached properties
- * from computationally expensive operations. Because creating a subset
- * requires normalizing and shifting the vector space, we make a copy of the
- * data so we can still always create new subsets based on the original data.
- */
-var DataSet = (function () {
-    /** Creates a new Dataset */
-    function DataSet(points, spriteAndMetadataInfo) {
-        this.shuffledDataIndices = [];
-        /**
-         * This keeps a list of all current projections so you can easily test to see
-         * if it's been calculated already.
-         */
-        this.projections = d3.set();
-        this.tSNEIteration = 0;
-        this.tSNEShouldStop = true;
-        this.dim = [0, 0];
-        this.hasTSNERun = false;
-        this.points = points;
-        this.shuffledDataIndices = util.shuffle(d3.range(this.points.length));
-        this.sequences = this.computeSequences(points);
-        this.dim = [this.points.length, this.points[0].vector.length];
-        this.spriteAndMetadataInfo = spriteAndMetadataInfo;
-    }
-    DataSet.prototype.computeSequences = function (points) {
-        // Keep a list of indices seen so we don't compute sequences for a given
-        // point twice.
-        var indicesSeen = new Int8Array(points.length);
-        // Compute sequences.
-        var indexToSequence = {};
-        var sequences = [];
-        for (var i = 0; i < points.length; i++) {
-            if (indicesSeen[i]) {
-                continue;
-            }
-            indicesSeen[i] = 1;
-            // Ignore points without a sequence attribute.
-            var next = getSequenceNextPointIndex(points[i].metadata);
-            if (next == null) {
-                continue;
-            }
-            if (next in indexToSequence) {
-                var existingSequence = indexToSequence[next];
-                // Pushing at the beginning of the array.
-                existingSequence.pointIndices.unshift(i);
-                indexToSequence[i] = existingSequence;
-                continue;
-            }
-            // The current point is pointing to a new/unseen sequence.
-            var newSequence = { pointIndices: [] };
-            indexToSequence[i] = newSequence;
-            sequences.push(newSequence);
-            var currentIndex = i;
-            while (points[currentIndex]) {
-                newSequence.pointIndices.push(currentIndex);
-                var next_1 = getSequenceNextPointIndex(points[currentIndex].metadata);
-                if (next_1 != null) {
-                    indicesSeen[next_1] = 1;
-                    currentIndex = next_1;
-                }
-                else {
-                    currentIndex = -1;
-                }
-            }
-        }
-        return sequences;
-    };
-    DataSet.prototype.projectionCanBeRendered = function (projection) {
-        if (projection !== 'tsne') {
-            return true;
-        }
-        return this.tSNEIteration > 0;
-    };
-    /**
-     * Returns a new subset dataset by copying out data. We make a copy because
-     * we have to modify the vectors by normalizing them.
-     *
-     * @param subset Array of indices of points that we want in the subset.
-     *
-     * @return A subset of the original dataset.
-     */
-    DataSet.prototype.getSubset = function (subset) {
-        var _this = this;
-        var pointsSubset = ((subset != null) && (subset.length > 0)) ?
-            subset.map(function (i) { return _this.points[i]; }) :
-            this.points;
-        var points = pointsSubset.map(function (dp) {
-            return {
-                metadata: dp.metadata,
-                index: dp.index,
-                vector: dp.vector.slice(),
-                projections: {}
-            };
-        });
-        return new DataSet(points, this.spriteAndMetadataInfo);
-    };
-    /**
-     * Computes the centroid, shifts all points to that centroid,
-     * then makes them all unit norm.
-     */
-    DataSet.prototype.normalize = function () {
-        // Compute the centroid of all data points.
-        var centroid = vector.centroid(this.points, function (a) { return a.vector; });
-        if (centroid == null) {
-            throw Error('centroid should not be null');
-        }
-        // Shift all points by the centroid and make them unit norm.
-        for (var id = 0; id < this.points.length; ++id) {
-            var dataPoint = this.points[id];
-            dataPoint.vector = vector.sub(dataPoint.vector, centroid);
-            vector.unit(dataPoint.vector);
-        }
-    };
-    /** Projects the dataset onto a given vector and caches the result. */
-    DataSet.prototype.projectLinear = function (dir, label) {
-        this.projections.add(label);
-        this.points.forEach(function (dataPoint) {
-            dataPoint.projections[label] = vector.dot(dataPoint.vector, dir);
-        });
-    };
-    /** Projects the dataset along the top 10 principal components. */
-    DataSet.prototype.projectPCA = function () {
-        var _this = this;
-        if (this.projections.has('pca-0')) {
-            return Promise.resolve(null);
-        }
-        return util.runAsyncTask('Computing PCA...', function () {
-            // Approximate pca vectors by sampling the dimensions.
-            var dim = _this.points[0].vector.length;
-            var vectors = _this.shuffledDataIndices.map(function (i) { return _this.points[i].vector; });
-            if (dim > exports.PCA_SAMPLE_DIM) {
-                vectors = vector.projectRandom(vectors, exports.PCA_SAMPLE_DIM);
-            }
-            var sampledVectors = vectors.slice(0, exports.PCA_SAMPLE_SIZE);
-            var sigma = numeric.div(numeric.dot(numeric.transpose(sampledVectors), sampledVectors), sampledVectors.length);
-            var svd = numeric.svd(sigma);
-            var variances = svd.S;
-            var totalVariance = 0;
-            for (var i = 0; i < variances.length; ++i) {
-                totalVariance += variances[i];
-            }
-            for (var i = 0; i < variances.length; ++i) {
-                variances[i] /= totalVariance;
-            }
-            _this.fracVariancesExplained = variances;
-            var U = svd.U;
-            var pcaVectors = vectors.map(function (vector) {
-                var newV = new Float32Array(NUM_PCA_COMPONENTS);
-                for (var newDim = 0; newDim < NUM_PCA_COMPONENTS; newDim++) {
-                    var dot = 0;
-                    for (var oldDim = 0; oldDim < vector.length; oldDim++) {
-                        dot += vector[oldDim] * U[oldDim][newDim];
-                    }
-                    newV[newDim] = dot;
-                }
-                return newV;
-            });
-            for (var d = 0; d < NUM_PCA_COMPONENTS; d++) {
-                var label = 'pca-' + d;
-                _this.projections.add(label);
-                for (var i = 0; i < pcaVectors.length; i++) {
-                    var pointIndex = _this.shuffledDataIndices[i];
-                    _this.points[pointIndex].projections[label] = pcaVectors[i][d];
-                }
-            }
-        });
-    };
-    /** Runs tsne on the data. */
-    DataSet.prototype.projectTSNE = function (perplexity, learningRate, tsneDim, stepCallback) {
-        var _this = this;
-        this.hasTSNERun = true;
-        var k = Math.floor(3 * perplexity);
-        var opt = { epsilon: learningRate, perplexity: perplexity, dim: tsneDim };
-        this.tsne = new bh_tsne_1.TSNE(opt);
-        this.tSNEShouldStop = false;
-        this.tSNEIteration = 0;
-        var sampledIndices = this.shuffledDataIndices.slice(0, exports.TSNE_SAMPLE_SIZE);
-        var step = function () {
-            if (_this.tSNEShouldStop) {
-                stepCallback(null);
-                _this.tsne = null;
-                return;
-            }
-            _this.tsne.step();
-            var result = _this.tsne.getSolution();
-            sampledIndices.forEach(function (index, i) {
-                var dataPoint = _this.points[index];
-                dataPoint.projections['tsne-0'] = result[i * tsneDim + 0];
-                dataPoint.projections['tsne-1'] = result[i * tsneDim + 1];
-                if (tsneDim === 3) {
-                    dataPoint.projections['tsne-2'] = result[i * tsneDim + 2];
-                }
-            });
-            _this.tSNEIteration++;
-            stepCallback(_this.tSNEIteration);
-            requestAnimationFrame(step);
-        };
-        // Nearest neighbors calculations.
-        var knnComputation;
-        if (this.nearest != null && k === this.nearestK) {
-            // We found the nearest neighbors before and will reuse them.
-            knnComputation = Promise.resolve(this.nearest);
-        }
-        else {
-            var sampledData = sampledIndices.map(function (i) { return _this.points[i]; });
-            this.nearestK = k;
-            knnComputation = KNN_GPU_ENABLED ?
-                knn.findKNNGPUCosine(sampledData, k, (function (d) { return d.vector; })) :
-                knn.findKNN(sampledData, k, (function (d) { return d.vector; }), function (a, b, limit) { return vector.cosDistNorm(a, b); });
-        }
-        knnComputation.then(function (nearest) {
-            _this.nearest = nearest;
-            util.runAsyncTask('Initializing T-SNE...', function () {
-                _this.tsne.initDataDist(_this.nearest);
-            }).then(step);
-        });
-    };
-    /**
-     * Merges metadata to the dataset and returns whether it succeeded.
-     */
-    DataSet.prototype.mergeMetadata = function (metadata) {
-        var _this = this;
-        if (metadata.pointsInfo.length !== this.points.length) {
-            var errorMessage = ("Number of tensors (" + this.points.length + ") do not") +
-                " match the number of lines in metadata" +
-                (" (" + metadata.pointsInfo.length + ").");
-            if (metadata.stats.length === 1 &&
-                this.points.length + 1 === metadata.pointsInfo.length) {
-                // If there is only one column of metadata and the number of points is
-                // exactly one less than the number of metadata lines, this is due to an
-                // unnecessary header line in the metadata and we can show a meaningful
-                // error.
-                logging.setErrorMessage(errorMessage + ' Single column metadata should not have a header ' +
-                    'row.', 'merging metadata');
-                return false;
-            }
-            else if (metadata.stats.length > 1 &&
-                this.points.length - 1 === metadata.pointsInfo.length) {
-                // If there are multiple columns of metadata and the number of points is
-                // exactly one greater than the number of lines in the metadata, this
-                // means there is a missing metadata header.
-                logging.setErrorMessage(errorMessage + ' Multi-column metadata should have a header ' +
-                    'row with column labels.', 'merging metadata');
-                return false;
-            }
-            logging.setWarningMessage(errorMessage);
-        }
-        this.spriteAndMetadataInfo = metadata;
-        metadata.pointsInfo.slice(0, this.points.length)
-            .forEach(function (m, i) { return _this.points[i].metadata = m; });
-        return true;
-    };
-    DataSet.prototype.stopTSNE = function () {
-        this.tSNEShouldStop = true;
-    };
-    /**
-     * Finds the nearest neighbors of the query point using a
-     * user-specified distance metric.
-     */
-    DataSet.prototype.findNeighbors = function (pointIndex, distFunc, numNN) {
-        // Find the nearest neighbors of a particular point.
-        var neighbors = knn.findKNNofPoint(this.points, pointIndex, numNN, (function (d) { return d.vector; }), distFunc);
-        // TODO(smilkov): Figure out why we slice.
-        var result = neighbors.slice(0, numNN);
-        return result;
-    };
-    /**
-     * Search the dataset based on a metadata field.
-     */
-    DataSet.prototype.query = function (query, inRegexMode, fieldName) {
-        var predicate = util.getSearchPredicate(query, inRegexMode, fieldName);
-        var matches = [];
-        this.points.forEach(function (point, id) {
-            if (predicate(point)) {
-                matches.push(id);
-            }
-        });
-        return matches;
-    };
-    return DataSet;
-}());
-exports.DataSet = DataSet;
-var Projection = (function () {
-    function Projection(projectionType, projectionComponents, dimensionality, dataSet) {
-        this.projectionType = projectionType;
-        this.projectionComponents = projectionComponents;
-        this.dimensionality = dimensionality;
-        this.dataSet = dataSet;
-    }
-    return Projection;
-}());
-exports.Projection = Projection;
-/**
- * An interface that holds all the data for serializing the current state of
- * the world.
- */
-var State = (function () {
-    function State() {
-        /** A label identifying this state. */
-        this.label = '';
-        /** Whether this State is selected in the bookmarks pane. */
-        this.isSelected = false;
-        /** t-SNE parameters */
-        this.tSNEIteration = 0;
-        this.tSNEPerplexity = 0;
-        this.tSNELearningRate = 0;
-        this.tSNEis3d = true;
-        /** PCA projection component dimensions */
-        this.pcaComponentDimensions = [];
-        /** The computed projections of the tensors. */
-        this.projections = [];
-        /** The indices of selected points. */
-        this.selectedPoints = [];
-    }
-    return State;
-}());
-exports.State = State;
-function getProjectionComponents(projection, components) {
-    if (components.length > 3) {
-        throw new RangeError('components length must be <= 3');
-    }
-    var projectionComponents = [null, null, null];
-    var prefix = (projection === 'custom') ? 'linear' : projection;
-    for (var i = 0; i < components.length; ++i) {
-        if (components[i] == null) {
-            continue;
-        }
-        projectionComponents[i] = prefix + '-' + components[i];
-    }
-    return projectionComponents;
-}
-exports.getProjectionComponents = getProjectionComponents;
-function stateGetAccessorDimensions(state) {
-    var dimensions;
-    switch (state.selectedProjection) {
-        case 'pca':
-            dimensions = state.pcaComponentDimensions.slice();
-            break;
-        case 'tsne':
-            dimensions = [0, 1];
-            if (state.tSNEis3d) {
-                dimensions.push(2);
-            }
-            break;
-        case 'custom':
-            dimensions = ['x', 'y'];
-            break;
-        default:
-            throw new Error('Unexpected fallthrough');
-    }
-    return dimensions;
-}
-exports.stateGetAccessorDimensions = stateGetAccessorDimensions;
-
-},{"./bh_tsne":2,"./knn":10,"./logging":12,"./util":24,"./vector":25}],8:[function(require,module,exports){
-
-},{}],9:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-/**
- * Min-heap data structure. Provides O(1) for peek, returning the smallest key.
- */
-// TODO(jart): Rename to Heap and use Comparator.
-var MinHeap = (function () {
-    function MinHeap() {
-        this.arr = [];
-    }
-    /** Push an element with the provided key. */
-    MinHeap.prototype.push = function (key, value) {
-        this.arr.push({ key: key, value: value });
-        this.bubbleUp(this.arr.length - 1);
-    };
-    /** Pop the element with the smallest key. */
-    MinHeap.prototype.pop = function () {
-        if (this.arr.length === 0) {
-            throw new Error('pop() called on empty binary heap');
-        }
-        var item = this.arr[0];
-        var last = this.arr.length - 1;
-        this.arr[0] = this.arr[last];
-        this.arr.pop();
-        if (last > 0) {
-            this.bubbleDown(0);
-        }
-        return item;
-    };
-    ;
-    /** Returns, but doesn't remove the element with the smallest key */
-    MinHeap.prototype.peek = function () { return this.arr[0]; };
-    /**
-     * Pops the element with the smallest key and at the same time
-     * adds the newly provided element. This is faster than calling
-     * pop() and push() separately.
-     */
-    MinHeap.prototype.popPush = function (key, value) {
-        if (this.arr.length === 0) {
-            throw new Error('pop() called on empty binary heap');
-        }
-        var item = this.arr[0];
-        this.arr[0] = { key: key, value: value };
-        if (this.arr.length > 0) {
-            this.bubbleDown(0);
-        }
-        return item;
-    };
-    /** Returns the number of elements in the heap. */
-    MinHeap.prototype.size = function () { return this.arr.length; };
-    /** Returns all the items in the heap. */
-    MinHeap.prototype.items = function () { return this.arr; };
-    MinHeap.prototype.swap = function (a, b) {
-        var temp = this.arr[a];
-        this.arr[a] = this.arr[b];
-        this.arr[b] = temp;
-    };
-    MinHeap.prototype.bubbleDown = function (pos) {
-        var left = (pos << 1) + 1;
-        var right = left + 1;
-        var largest = pos;
-        if (left < this.arr.length && this.arr[left].key < this.arr[largest].key) {
-            largest = left;
-        }
-        if (right < this.arr.length &&
-            this.arr[right].key < this.arr[largest].key) {
-            largest = right;
-        }
-        if (largest !== pos) {
-            this.swap(largest, pos);
-            this.bubbleDown(largest);
-        }
-    };
-    MinHeap.prototype.bubbleUp = function (pos) {
-        if (pos <= 0) {
-            return;
-        }
-        var parent = ((pos - 1) >> 1);
-        if (this.arr[pos].key < this.arr[parent].key) {
-            this.swap(pos, parent);
-            this.bubbleUp(parent);
-        }
-    };
-    return MinHeap;
-}());
-exports.MinHeap = MinHeap;
-/** List that keeps the K elements with the smallest keys. */
-var KMin = (function () {
-    /** Constructs a new k-min data structure with the provided k. */
-    function KMin(k) {
-        this.maxHeap = new MinHeap();
-        this.k = k;
-    }
-    /** Adds an element to the list. */
-    KMin.prototype.add = function (key, value) {
-        if (this.maxHeap.size() < this.k) {
-            this.maxHeap.push(-key, value);
-            return;
-        }
-        var largest = this.maxHeap.peek();
-        // If the new element is smaller, replace the largest with the new element.
-        if (key < -largest.key) {
-            this.maxHeap.popPush(-key, value);
-        }
-    };
-    /** Returns the k items with the smallest keys. */
-    KMin.prototype.getMinKItems = function () {
-        var items = this.maxHeap.items();
-        items.sort(function (a, b) { return b.key - a.key; });
-        return items.map(function (a) { return a.value; });
-    };
-    /** Returns the size of the list. */
-    KMin.prototype.getSize = function () { return this.maxHeap.size(); };
-    /** Returns the largest key in the list. */
-    KMin.prototype.getLargestKey = function () {
-        return this.maxHeap.size() === 0 ? null : -this.maxHeap.peek().key;
-    };
-    return KMin;
-}());
-exports.KMin = KMin;
-
-},{}],10:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var util_1 = require('./util');
-var logging = require('./logging');
-var heap_1 = require('./heap');
-var vector = require('./vector');
-/**
- * Optimal size for the height of the matrix when doing computation on the GPU
- * using WebGL. This was found experimentally.
- *
- * This also guarantees that for computing pair-wise distance for up to 10K
- * vectors, no more than 40MB will be allocated in the GPU. Without the
- * allocation limit, we can freeze the graphics of the whole OS.
- */
-var OPTIMAL_GPU_BLOCK_SIZE = 256;
-/** Id of message box used for knn gpu progress bar. */
-var KNN_GPU_MSG_ID = 'knn-gpu';
-/**
- * Returns the K nearest neighbors for each vector where the distance
- * computation is done on the GPU (WebGL) using cosine distance.
- *
- * @param dataPoints List of data points, where each data point holds an
- *   n-dimensional vector.
- * @param k Number of nearest neighbors to find.
- * @param accessor A method that returns the vector, given the data point.
- */
-function findKNNGPUCosine(dataPoints, k, accessor) {
-    var N = dataPoints.length;
-    var dim = accessor(dataPoints[0]).length;
-    // The goal is to compute a large matrix multiplication A*A.T where A is of
-    // size NxD and A.T is its transpose. This results in a NxN matrix which
-    // could be too big to store on the GPU memory. To avoid memory overflow, we
-    // compute multiple A*partial_A.T where partial_A is of size BxD (B is much
-    // smaller than N). This results in storing only NxB size matrices on the GPU
-    // at a given time.
-    // A*A.T will give us NxN matrix holding the cosine distance between every
-    // pair of points, which we sort using KMin data structure to obtain the
-    // K nearest neighbors for each point.
-    var typedArray = vector.toTypedArray(dataPoints, accessor);
-    var bigMatrix = new weblas.pipeline.Tensor([N, dim], typedArray);
-    var nearest = new Array(N);
-    var numPieces = Math.ceil(N / OPTIMAL_GPU_BLOCK_SIZE);
-    var M = Math.floor(N / numPieces);
-    var modulo = N % numPieces;
-    var offset = 0;
-    var progress = 0;
-    var progressDiff = 1 / (2 * numPieces);
-    var piece = 0;
-    function step(resolve) {
-        var progressMsg = 'Finding nearest neighbors: ' + (progress * 100).toFixed() + '%';
-        util_1.runAsyncTask(progressMsg, function () {
-            var B = piece < modulo ? M + 1 : M;
-            var typedB = new Float32Array(B * dim);
-            for (var i = 0; i < B; ++i) {
-                var vector_1 = accessor(dataPoints[offset + i]);
-                for (var d = 0; d < dim; ++d) {
-                    typedB[i * dim + d] = vector_1[d];
-                }
-            }
-            var partialMatrix = new weblas.pipeline.Tensor([B, dim], typedB);
-            // Result is N x B matrix.
-            var result = weblas.pipeline.sgemm(1, bigMatrix, partialMatrix, null, null);
-            var partial = result.transfer();
-            partialMatrix.delete();
-            result.delete();
-            progress += progressDiff;
-            for (var i = 0; i < B; i++) {
-                var kMin = new heap_1.KMin(k);
-                var iReal = offset + i;
-                for (var j = 0; j < N; j++) {
-                    if (j === iReal) {
-                        continue;
-                    }
-                    var cosDist = 1 - partial[j * B + i]; // [j, i];
-                    kMin.add(cosDist, { index: j, dist: cosDist });
-                }
-                nearest[iReal] = kMin.getMinKItems();
-            }
-            progress += progressDiff;
-            offset += B;
-            piece++;
-        }, KNN_GPU_MSG_ID).then(function () {
-            if (piece < numPieces) {
-                step(resolve);
-            }
-            else {
-                logging.setModalMessage(null, KNN_GPU_MSG_ID);
-                bigMatrix.delete();
-                resolve(nearest);
-            }
-        }, function (error) {
-            // GPU failed. Reverting back to CPU.
-            logging.setModalMessage(null, KNN_GPU_MSG_ID);
-            var distFunc = function (a, b, limit) { return vector.cosDistNorm(a, b); };
-            findKNN(dataPoints, k, accessor, distFunc).then(function (nearest) {
-                resolve(nearest);
-            });
-        });
-    }
-    return new Promise(function (resolve) { return step(resolve); });
-}
-exports.findKNNGPUCosine = findKNNGPUCosine;
-/**
- * Returns the K nearest neighbors for each vector where the distance
- * computation is done on the CPU using a user-specified distance method.
- *
- * @param dataPoints List of data points, where each data point holds an
- *   n-dimensional vector.
- * @param k Number of nearest neighbors to find.
- * @param accessor A method that returns the vector, given the data point.
- * @param dist Method that takes two vectors and a limit, and computes the
- *   distance between two vectors, with the ability to stop early if the
- *   distance is above the limit.
- */
-function findKNN(dataPoints, k, accessor, dist) {
-    return util_1.runAsyncTask('Finding nearest neighbors...', function () {
-        var N = dataPoints.length;
-        var nearest = new Array(N);
-        // Find the distances from node i.
-        var kMin = new Array(N);
-        for (var i = 0; i < N; i++) {
-            kMin[i] = new heap_1.KMin(k);
-        }
-        for (var i = 0; i < N; i++) {
-            var a = accessor(dataPoints[i]);
-            var kMinA = kMin[i];
-            for (var j = i + 1; j < N; j++) {
-                var kMinB = kMin[j];
-                var limitI = kMinA.getSize() === k ?
-                    kMinA.getLargestKey() || Number.MAX_VALUE :
-                    Number.MAX_VALUE;
-                var limitJ = kMinB.getSize() === k ?
-                    kMinB.getLargestKey() || Number.MAX_VALUE :
-                    Number.MAX_VALUE;
-                var limit = Math.max(limitI, limitJ);
-                var dist2ItoJ = dist(a, accessor(dataPoints[j]), limit);
-                if (dist2ItoJ >= 0) {
-                    kMinA.add(dist2ItoJ, { index: j, dist: dist2ItoJ });
-                    kMinB.add(dist2ItoJ, { index: i, dist: dist2ItoJ });
-                }
-            }
-        }
-        for (var i = 0; i < N; i++) {
-            nearest[i] = kMin[i].getMinKItems();
-        }
-        return nearest;
-    });
-}
-exports.findKNN = findKNN;
-/** Calculates the minimum distance between a search point and a rectangle. */
-function minDist(point, x1, y1, x2, y2) {
-    var x = point[0];
-    var y = point[1];
-    var dx1 = x - x1;
-    var dx2 = x - x2;
-    var dy1 = y - y1;
-    var dy2 = y - y2;
-    if (dx1 * dx2 <= 0) {
-        if (dy1 * dy2 <= 0) {
-            return 0; // return 0 as point is in rect
-        }
-        return Math.min(Math.abs(dy1), Math.abs(dy2));
-    }
-    if (dy1 * dy2 <= 0) {
-        // We know it is already inside the rectangle
-        return Math.min(Math.abs(dx1), Math.abs(dx2));
-    }
-    var corner;
-    if (x > x2) {
-        // Upper-right vs lower-right.
-        corner = y > y2 ? [x2, y2] : [x2, y1];
-    }
-    else {
-        // Upper-left vs lower-left.
-        corner = y > y2 ? [x1, y2] : [x1, y1];
-    }
-    return Math.sqrt(vector.dist22D([x, y], corner));
-}
-/**
- * Returns the nearest neighbors of a particular point.
- *
- * @param dataPoints List of data points.
- * @param pointIndex The index of the point we need the nearest neighbors of.
- * @param k Number of nearest neighbors to search for.
- * @param accessor Method that maps a data point => vector (array of numbers).
- * @param distance Method that takes two vectors and returns their distance.
- */
-function findKNNofPoint(dataPoints, pointIndex, k, accessor, distance) {
-    var kMin = new heap_1.KMin(k);
-    var a = accessor(dataPoints[pointIndex]);
-    for (var i = 0; i < dataPoints.length; ++i) {
-        if (i === pointIndex) {
-            continue;
-        }
-        var b = accessor(dataPoints[i]);
-        var dist = distance(a, b);
-        kMin.add(dist, { index: i, dist: dist });
-    }
-    return kMin.getMinKItems();
-}
-exports.findKNNofPoint = findKNNofPoint;
-
-},{"./heap":9,"./logging":12,"./util":24,"./vector":25}],11:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-/**
- * Accelerates label placement by dividing the view into a uniform grid.
- * Labels only need to be tested for collision with other labels that overlap
- * the same grid cells. This is a fork of {@code amoeba.CollisionGrid}.
- */
-var CollisionGrid = (function () {
-    /**
-     * Constructs a new Collision grid.
-     *
-     * @param bound The bound of the grid. Labels out of bounds will be rejected.
-     * @param cellWidth Width of a cell in the grid.
-     * @param cellHeight Height of a cell in the grid.
-     */
-    function CollisionGrid(bound, cellWidth, cellHeight) {
-        /** The bound of the grid. Labels out of bounds will be rejected. */
-        this.bound = bound;
-        /** Width of a cell in the grid. */
-        this.cellWidth = cellWidth;
-        /** Height of a cell in the grid. */
-        this.cellHeight = cellHeight;
-        /** Number of grid cells along the x axis. */
-        this.numHorizCells = Math.ceil(this.boundWidth(bound) / cellWidth);
-        /** Number of grid cells along the y axis. */
-        this.numVertCells = Math.ceil(this.boundHeight(bound) / cellHeight);
-        /**
-         * The 2d grid (stored as a 1d array.) Each cell consists of an array of
-         * BoundingBoxes for objects that are in the cell.
-         */
-        this.grid = new Array(this.numHorizCells * this.numVertCells);
-    }
-    CollisionGrid.prototype.boundWidth = function (bound) { return bound.hiX - bound.loX; };
-    CollisionGrid.prototype.boundHeight = function (bound) { return bound.hiY - bound.loY; };
-    CollisionGrid.prototype.boundsIntersect = function (a, b) {
-        return !(a.loX > b.hiX || a.loY > b.hiY || a.hiX < b.loX || a.hiY < b.loY);
-    };
-    /**
-     * Checks if a given bounding box has any conflicts in the grid and inserts it
-     * if none are found.
-     *
-     * @param bound The bound to insert.
-     * @param justTest If true, just test if it conflicts, without inserting.
-     * @return True if the bound was successfully inserted; false if it
-     *         could not be inserted due to a conflict.
-     */
-    CollisionGrid.prototype.insert = function (bound, justTest) {
-        if (justTest === void 0) { justTest = false; }
-        // Reject if the label is out of bounds.
-        if ((bound.hiX < this.bound.loX) || (bound.loX > this.bound.hiX) ||
-            (bound.hiY < this.bound.loY) || (bound.loY > this.bound.hiY)) {
-            return false;
-        }
-        var minCellX = this.getCellX(bound.loX);
-        var maxCellX = this.getCellX(bound.hiX);
-        var minCellY = this.getCellY(bound.loY);
-        var maxCellY = this.getCellY(bound.hiY);
-        // Check all overlapped cells to verify that we can insert.
-        var baseIdx = minCellY * this.numHorizCells + minCellX;
-        var idx = baseIdx;
-        for (var j = minCellY; j <= maxCellY; j++) {
-            for (var i = minCellX; i <= maxCellX; i++) {
-                var cell = this.grid[idx++];
-                if (cell) {
-                    for (var k = 0; k < cell.length; k++) {
-                        if (this.boundsIntersect(bound, cell[k])) {
-                            return false;
-                        }
-                    }
-                }
-            }
-            idx += this.numHorizCells - (maxCellX - minCellX + 1);
-        }
-        if (justTest) {
-            return true;
-        }
-        // Insert into the overlapped cells.
-        idx = baseIdx;
-        for (var j = minCellY; j <= maxCellY; j++) {
-            for (var i = minCellX; i <= maxCellX; i++) {
-                if (!this.grid[idx]) {
-                    this.grid[idx] = [bound];
-                }
-                else {
-                    this.grid[idx].push(bound);
-                }
-                idx++;
-            }
-            idx += this.numHorizCells - (maxCellX - minCellX + 1);
-        }
-        return true;
-    };
-    /**
-     * Returns the x index of the grid cell where the given x coordinate falls.
-     *
-     * @param x the coordinate, in world space.
-     * @return the x index of the cell.
-     */
-    CollisionGrid.prototype.getCellX = function (x) {
-        return Math.floor((x - this.bound.loX) / this.cellWidth);
-    };
-    ;
-    /**
-     * Returns the y index of the grid cell where the given y coordinate falls.
-     *
-     * @param y the coordinate, in world space.
-     * @return the y index of the cell.
-     */
-    CollisionGrid.prototype.getCellY = function (y) {
-        return Math.floor((y - this.bound.loY) / this.cellHeight);
-    };
-    ;
-    return CollisionGrid;
-}());
-exports.CollisionGrid = CollisionGrid;
-
-},{}],12:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-/** Duration in ms for showing warning messages to the user */
-var WARNING_DURATION_MS = 10000;
-var dom = null;
-var msgId = 0;
-var numActiveMessages = 0;
-function setDomContainer(domElement) {
-    dom = domElement;
-}
-exports.setDomContainer = setDomContainer;
-/**
- * Updates the user message with the provided id.
- *
- * @param msg The message shown to the user. If null, the message is removed.
- * @param id The id of an existing message. If no id is provided, a unique id
- *     is assigned.
- * @param title The title of the notification.
- * @param isErrorMsg If true, the message is error and the dialog will have a
- *                   close button.
- * @return The id of the message.
- */
-function setModalMessage(msg, id, title, isErrorMsg) {
-    if (id === void 0) { id = null; }
-    if (title === void 0) { title = null; }
-    if (isErrorMsg === void 0) { isErrorMsg = false; }
-    if (dom == null) {
-        console.warn('Can\'t show modal message before the dom is initialized');
-        return;
-    }
-    if (id == null) {
-        id = (msgId++).toString();
-    }
-    var dialog = dom.querySelector('#notification-dialog');
-    dialog.querySelector('.close-button').style.display =
-        isErrorMsg ? null : 'none';
-    var spinner = dialog.querySelector('.progress');
-    spinner.style.display = isErrorMsg ? 'none' : null;
-    spinner.active = isErrorMsg ? null : true;
-    dialog.querySelector('#notification-title').innerHTML = title;
-    var msgsContainer = dialog.querySelector('#notify-msgs');
-    if (isErrorMsg) {
-        d3.select(msgsContainer).html('');
-    }
-    else {
-        d3.select(msgsContainer).selectAll('.error').remove();
-    }
-    var divId = "notify-msg-" + id;
-    var msgDiv = d3.select(dialog.querySelector('#' + divId));
-    var exists = msgDiv.size() > 0;
-    if (!exists) {
-        msgDiv = d3.select(msgsContainer)
-            .insert('div', ':first-child')
-            .attr('class', 'notify-msg')
-            .classed('error', isErrorMsg)
-            .attr('id', divId);
-        if (!isErrorMsg) {
-            numActiveMessages++;
-        }
-        else {
-            numActiveMessages = 0;
-        }
-    }
-    if (msg == null) {
-        numActiveMessages--;
-        if (numActiveMessages === 0) {
-            dialog.close();
-        }
-        msgDiv.remove();
-    }
-    else {
-        msgDiv.text(msg);
-        dialog.open();
-    }
-    return id;
-}
-exports.setModalMessage = setModalMessage;
-function setErrorMessage(errMsg, task) {
-    setModalMessage(errMsg, null, 'Error ' + (task != null ? task : ''), true);
-}
-exports.setErrorMessage = setErrorMessage;
-/**
- * Shows a warning message to the user for a certain amount of time.
- */
-function setWarningMessage(msg) {
-    var toast = dom.querySelector('#toast');
-    toast.text = msg;
-    toast.duration = WARNING_DURATION_MS;
-    toast.open();
-}
-exports.setWarningMessage = setWarningMessage;
-
-},{}],13:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-
-},{}],14:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var renderContext_1 = require('./renderContext');
-var scatterPlot_1 = require('./scatterPlot');
-var scatterPlotVisualizer3DLabels_1 = require('./scatterPlotVisualizer3DLabels');
-var scatterPlotVisualizerCanvasLabels_1 = require('./scatterPlotVisualizerCanvasLabels');
-var scatterPlotVisualizerPolylines_1 = require('./scatterPlotVisualizerPolylines');
-var scatterPlotVisualizerSprites_1 = require('./scatterPlotVisualizerSprites');
-var vector = require('./vector');
-var LABEL_FONT_SIZE = 10;
-var LABEL_SCALE_DEFAULT = 1.0;
-var LABEL_SCALE_LARGE = 2;
-var LABEL_FILL_COLOR_SELECTED = 0x000000;
-var LABEL_FILL_COLOR_HOVER = 0x000000;
-var LABEL_FILL_COLOR_NEIGHBOR = 0x000000;
-var LABEL_STROKE_COLOR_SELECTED = 0xFFFFFF;
-var LABEL_STROKE_COLOR_HOVER = 0xFFFFFF;
-var LABEL_STROKE_COLOR_NEIGHBOR = 0xFFFFFF;
-var POINT_COLOR_UNSELECTED = 0xE3E3E3;
-var POINT_COLOR_NO_SELECTION = 0x7575D9;
-var POINT_COLOR_SELECTED = 0xFA6666;
-var POINT_COLOR_HOVER = 0x760B4F;
-var POINT_SCALE_DEFAULT = 1.0;
-var POINT_SCALE_SELECTED = 1.2;
-var POINT_SCALE_NEIGHBOR = 1.2;
-var POINT_SCALE_HOVER = 1.2;
-var LABELS_3D_COLOR_UNSELECTED = 0xFFFFFF;
-var LABELS_3D_COLOR_NO_SELECTION = 0xFFFFFF;
-var SPRITE_IMAGE_COLOR_UNSELECTED = 0xFFFFFF;
-var SPRITE_IMAGE_COLOR_NO_SELECTION = 0xFFFFFF;
-var POLYLINE_START_HUE = 60;
-var POLYLINE_END_HUE = 360;
-var POLYLINE_SATURATION = 1;
-var POLYLINE_LIGHTNESS = .3;
-var POLYLINE_DEFAULT_OPACITY = .2;
-var POLYLINE_DEFAULT_LINEWIDTH = 2;
-var POLYLINE_SELECTED_OPACITY = .9;
-var POLYLINE_SELECTED_LINEWIDTH = 3;
-var POLYLINE_DESELECTED_OPACITY = .05;
-var SCATTER_PLOT_CUBE_LENGTH = 2;
-/** Color scale for nearest neighbors. */
-var NN_COLOR_SCALE = d3.scale.linear()
-    .domain([1, 0.7, 0.4])
-    .range(['hsl(285, 80%, 40%)', 'hsl(0, 80%, 65%)', 'hsl(40, 70%, 60%)'])
-    .clamp(true);
-/**
- * Interprets projector events and assembes the arrays and commands necessary
- * to use the ScatterPlot to render the current projected data set.
- */
-var ProjectorScatterPlotAdapter = (function () {
-    function ProjectorScatterPlotAdapter(scatterPlotContainer, projectorEventContext) {
-        var _this = this;
-        this.renderLabelsIn3D = false;
-        this.scatterPlot =
-            new scatterPlot_1.ScatterPlot(scatterPlotContainer, projectorEventContext);
-        this.scatterPlotContainer = scatterPlotContainer;
-        projectorEventContext.registerProjectionChangedListener(function (projection) {
-            _this.projection = projection;
-            _this.updateScatterPlotWithNewProjection(projection);
-        });
-        projectorEventContext.registerSelectionChangedListener(function (selectedPointIndices, neighbors) {
-            _this.selectedPointIndices = selectedPointIndices;
-            _this.neighborsOfFirstSelectedPoint = neighbors;
-            _this.updateScatterPlotPositions();
-            _this.updateScatterPlotAttributes();
-            _this.scatterPlot.render();
-        });
-        projectorEventContext.registerHoverListener(function (hoverPointIndex) {
-            _this.hoverPointIndex = hoverPointIndex;
-            _this.updateScatterPlotAttributes();
-            _this.scatterPlot.render();
-        });
-        projectorEventContext.registerDistanceMetricChangedListener(function (distanceMetric) {
-            _this.distanceMetric = distanceMetric;
-            _this.updateScatterPlotAttributes();
-            _this.scatterPlot.render();
-        });
-        this.createVisualizers(false);
-    }
-    ProjectorScatterPlotAdapter.prototype.notifyProjectionPositionsUpdated = function () {
-        this.updateScatterPlotPositions();
-        this.scatterPlot.render();
-    };
-    ProjectorScatterPlotAdapter.prototype.setDataSet = function (dataSet) {
-        if (this.projection != null) {
-            // TODO(nicholsonc): setDataSet needs to go away, the projection is the
-            // atomic unit of update.
-            this.projection.dataSet = dataSet;
-        }
-        if (this.polylineVisualizer != null) {
-            this.polylineVisualizer.setDataSet(dataSet);
-        }
-        if (this.labels3DVisualizer != null) {
-            this.labels3DVisualizer.setLabelStrings(this.generate3DLabelsArray(dataSet, this.labelPointAccessor));
-        }
-        if (this.spriteVisualizer == null) {
-            return;
-        }
-        this.spriteVisualizer.clearSpriteAtlas();
-        if ((dataSet == null) || (dataSet.spriteAndMetadataInfo == null)) {
-            return;
-        }
-        var metadata = dataSet.spriteAndMetadataInfo;
-        if ((metadata.spriteImage == null) || (metadata.spriteMetadata == null)) {
-            return;
-        }
-        var n = dataSet.points.length;
-        var spriteIndices = new Float32Array(n);
-        for (var i = 0; i < n; ++i) {
-            spriteIndices[i] = dataSet.points[i].index;
-        }
-        this.spriteVisualizer.setSpriteAtlas(metadata.spriteImage, metadata.spriteMetadata.singleImageDim, spriteIndices);
-    };
-    ProjectorScatterPlotAdapter.prototype.set3DLabelMode = function (renderLabelsIn3D) {
-        this.renderLabelsIn3D = renderLabelsIn3D;
-        this.createVisualizers(renderLabelsIn3D);
-        this.updateScatterPlotAttributes();
-        this.scatterPlot.render();
-    };
-    ProjectorScatterPlotAdapter.prototype.setLegendPointColorer = function (legendPointColorer) {
-        this.legendPointColorer = legendPointColorer;
-    };
-    ProjectorScatterPlotAdapter.prototype.setLabelPointAccessor = function (labelPointAccessor) {
-        this.labelPointAccessor = labelPointAccessor;
-        if (this.labels3DVisualizer != null) {
-            var ds = (this.projection == null) ? null : this.projection.dataSet;
-            this.labels3DVisualizer.setLabelStrings(this.generate3DLabelsArray(ds, labelPointAccessor));
-        }
-    };
-    ProjectorScatterPlotAdapter.prototype.resize = function () {
-        this.scatterPlot.resize();
-    };
-    ProjectorScatterPlotAdapter.prototype.populateBookmarkFromUI = function (state) {
-        state.cameraDef = this.scatterPlot.getCameraDef();
-    };
-    ProjectorScatterPlotAdapter.prototype.restoreUIFromBookmark = function (state) {
-        this.scatterPlot.setCameraParametersForNextCameraCreation(state.cameraDef, false);
-    };
-    ProjectorScatterPlotAdapter.prototype.updateScatterPlotPositions = function () {
-        var ds = (this.projection == null) ? null : this.projection.dataSet;
-        var projectionComponents = (this.projection == null) ? null : this.projection.projectionComponents;
-        var newPositions = this.generatePointPositionArray(ds, projectionComponents);
-        this.scatterPlot.setPointPositions(newPositions);
-    };
-    ProjectorScatterPlotAdapter.prototype.updateScatterPlotAttributes = function () {
-        if (this.projection == null) {
-            return;
-        }
-        var dataSet = this.projection.dataSet;
-        var selectedSet = this.selectedPointIndices;
-        var hoverIndex = this.hoverPointIndex;
-        var neighbors = this.neighborsOfFirstSelectedPoint;
-        var pointColorer = this.legendPointColorer;
-        var pointColors = this.generatePointColorArray(dataSet, pointColorer, this.distanceMetric, selectedSet, neighbors, hoverIndex, this.renderLabelsIn3D, this.getSpriteImageMode());
-        var pointScaleFactors = this.generatePointScaleFactorArray(dataSet, selectedSet, neighbors, hoverIndex);
-        var labels = this.generateVisibleLabelRenderParams(dataSet, selectedSet, neighbors, hoverIndex);
-        var polylineColors = this.generateLineSegmentColorMap(dataSet, pointColorer);
-        var polylineOpacities = this.generateLineSegmentOpacityArray(dataSet, selectedSet);
-        var polylineWidths = this.generateLineSegmentWidthArray(dataSet, selectedSet);
-        this.scatterPlot.setPointColors(pointColors);
-        this.scatterPlot.setPointScaleFactors(pointScaleFactors);
-        this.scatterPlot.setLabels(labels);
-        this.scatterPlot.setPolylineColors(polylineColors);
-        this.scatterPlot.setPolylineOpacities(polylineOpacities);
-        this.scatterPlot.setPolylineWidths(polylineWidths);
-    };
-    ProjectorScatterPlotAdapter.prototype.render = function () {
-        this.scatterPlot.render();
-    };
-    ProjectorScatterPlotAdapter.prototype.generatePointPositionArray = function (ds, projectionComponents) {
-        if (ds == null) {
-            return null;
-        }
-        var xScaler = d3.scale.linear();
-        var yScaler = d3.scale.linear();
-        var zScaler = null;
-        {
-            // Determine max and min of each axis of our data.
-            var xExtent = d3.extent(ds.points, function (p, i) { return ds.points[i].projections[projectionComponents[0]]; });
-            var yExtent = d3.extent(ds.points, function (p, i) { return ds.points[i].projections[projectionComponents[1]]; });
-            var range = [-SCATTER_PLOT_CUBE_LENGTH / 2, SCATTER_PLOT_CUBE_LENGTH / 2];
-            xScaler.domain(xExtent).range(range);
-            yScaler.domain(yExtent).range(range);
-            if (projectionComponents[2] != null) {
-                var zExtent = d3.extent(ds.points, function (p, i) { return ds.points[i].projections[projectionComponents[2]]; });
-                zScaler = d3.scale.linear();
-                zScaler.domain(zExtent).range(range);
-            }
-        }
-        var positions = new Float32Array(ds.points.length * 3);
-        var dst = 0;
-        ds.points.forEach(function (d, i) {
-            positions[dst++] =
-                xScaler(ds.points[i].projections[projectionComponents[0]]);
-            positions[dst++] =
-                yScaler(ds.points[i].projections[projectionComponents[1]]);
-            positions[dst++] = 0.0;
-        });
-        if (zScaler) {
-            dst = 2;
-            ds.points.forEach(function (d, i) {
-                positions[dst] =
-                    zScaler(ds.points[i].projections[projectionComponents[2]]);
-                dst += 3;
-            });
-        }
-        return positions;
-    };
-    ProjectorScatterPlotAdapter.prototype.generateVisibleLabelRenderParams = function (ds, selectedPointIndices, neighborsOfFirstPoint, hoverPointIndex) {
-        if (ds == null) {
-            return null;
-        }
-        var selectedPointCount = (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
-        var neighborCount = (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
-        var n = selectedPointCount + neighborCount +
-            ((hoverPointIndex != null) ? 1 : 0);
-        var visibleLabels = new Uint32Array(n);
-        var scale = new Float32Array(n);
-        var opacityFlags = new Int8Array(n);
-        var fillColors = new Uint8Array(n * 3);
-        var strokeColors = new Uint8Array(n * 3);
-        var labelStrings = [];
-        scale.fill(LABEL_SCALE_DEFAULT);
-        opacityFlags.fill(1);
-        var dst = 0;
-        if (hoverPointIndex != null) {
-            labelStrings.push(this.getLabelText(ds, hoverPointIndex, this.labelPointAccessor));
-            visibleLabels[dst] = hoverPointIndex;
-            scale[dst] = LABEL_SCALE_LARGE;
-            opacityFlags[dst] = 0;
-            var fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_HOVER);
-            packRgbIntoUint8Array(fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
-            var strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_HOVER);
-            packRgbIntoUint8Array(strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[1]);
-            ++dst;
-        }
-        // Selected points
-        {
-            var n_1 = selectedPointCount;
-            var fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_SELECTED);
-            var strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_SELECTED);
-            for (var i = 0; i < n_1; ++i) {
-                var labelIndex = selectedPointIndices[i];
-                labelStrings.push(this.getLabelText(ds, labelIndex, this.labelPointAccessor));
-                visibleLabels[dst] = labelIndex;
-                scale[dst] = LABEL_SCALE_LARGE;
-                opacityFlags[dst] = (n_1 === 1) ? 0 : 1;
-                packRgbIntoUint8Array(fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
-                packRgbIntoUint8Array(strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[2]);
-                ++dst;
-            }
-        }
-        // Neighbors
-        {
-            var n_2 = neighborCount;
-            var fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_NEIGHBOR);
-            var strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_NEIGHBOR);
-            for (var i = 0; i < n_2; ++i) {
-                var labelIndex = neighborsOfFirstPoint[i].index;
-                labelStrings.push(this.getLabelText(ds, labelIndex, this.labelPointAccessor));
-                visibleLabels[dst] = labelIndex;
-                packRgbIntoUint8Array(fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
-                packRgbIntoUint8Array(strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[2]);
-                ++dst;
-            }
-        }
-        return new renderContext_1.LabelRenderParams(visibleLabels, labelStrings, scale, opacityFlags, LABEL_FONT_SIZE, fillColors, strokeColors);
-    };
-    ProjectorScatterPlotAdapter.prototype.generatePointScaleFactorArray = function (ds, selectedPointIndices, neighborsOfFirstPoint, hoverPointIndex) {
-        if (ds == null) {
-            return new Float32Array(0);
-        }
-        var scale = new Float32Array(ds.points.length);
-        scale.fill(POINT_SCALE_DEFAULT);
-        var selectedPointCount = (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
-        var neighborCount = (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
-        // Scale up all selected points.
-        {
-            var n = selectedPointCount;
-            for (var i = 0; i < n; ++i) {
-                var p = selectedPointIndices[i];
-                scale[p] = POINT_SCALE_SELECTED;
-            }
-        }
-        // Scale up the neighbor points.
-        {
-            var n = neighborCount;
-            for (var i = 0; i < n; ++i) {
-                var p = neighborsOfFirstPoint[i].index;
-                scale[p] = POINT_SCALE_NEIGHBOR;
-            }
-        }
-        // Scale up the hover point.
-        if (hoverPointIndex != null) {
-            scale[hoverPointIndex] = POINT_SCALE_HOVER;
-        }
-        return scale;
-    };
-    ProjectorScatterPlotAdapter.prototype.generateLineSegmentColorMap = function (ds, legendPointColorer) {
-        var polylineColorArrayMap = {};
-        if (ds == null) {
-            return polylineColorArrayMap;
-        }
-        for (var i = 0; i < ds.sequences.length; i++) {
-            var sequence = ds.sequences[i];
-            var colors = new Float32Array(2 * (sequence.pointIndices.length - 1) * 3);
-            var colorIndex = 0;
-            if (legendPointColorer) {
-                for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
-                    var c1 = new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j]));
-                    var c2 = new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j + 1]));
-                    colors[colorIndex++] = c1.r;
-                    colors[colorIndex++] = c1.g;
-                    colors[colorIndex++] = c1.b;
-                    colors[colorIndex++] = c2.r;
-                    colors[colorIndex++] = c2.g;
-                    colors[colorIndex++] = c2.b;
-                }
-            }
-            else {
-                for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
-                    var c1 = getDefaultPointInPolylineColor(j, sequence.pointIndices.length);
-                    var c2 = getDefaultPointInPolylineColor(j + 1, sequence.pointIndices.length);
-                    colors[colorIndex++] = c1.r;
-                    colors[colorIndex++] = c1.g;
-                    colors[colorIndex++] = c1.b;
-                    colors[colorIndex++] = c2.r;
-                    colors[colorIndex++] = c2.g;
-                    colors[colorIndex++] = c2.b;
-                }
-            }
-            polylineColorArrayMap[i] = colors;
-        }
-        return polylineColorArrayMap;
-    };
-    ProjectorScatterPlotAdapter.prototype.generateLineSegmentOpacityArray = function (ds, selectedPoints) {
-        if (ds == null) {
-            return new Float32Array(0);
-        }
-        var opacities = new Float32Array(ds.sequences.length);
-        var selectedPointCount = (selectedPoints == null) ? 0 : selectedPoints.length;
-        if (selectedPointCount > 0) {
-            opacities.fill(POLYLINE_DESELECTED_OPACITY);
-            var i = ds.points[selectedPoints[0]].sequenceIndex;
-            opacities[i] = POLYLINE_SELECTED_OPACITY;
-        }
-        else {
-            opacities.fill(POLYLINE_DEFAULT_OPACITY);
-        }
-        return opacities;
-    };
-    ProjectorScatterPlotAdapter.prototype.generateLineSegmentWidthArray = function (ds, selectedPoints) {
-        if (ds == null) {
-            return new Float32Array(0);
-        }
-        var widths = new Float32Array(ds.sequences.length);
-        widths.fill(POLYLINE_DEFAULT_LINEWIDTH);
-        var selectedPointCount = (selectedPoints == null) ? 0 : selectedPoints.length;
-        if (selectedPointCount > 0) {
-            var i = ds.points[selectedPoints[0]].sequenceIndex;
-            widths[i] = POLYLINE_SELECTED_LINEWIDTH;
-        }
-        return widths;
-    };
-    ProjectorScatterPlotAdapter.prototype.generatePointColorArray = function (ds, legendPointColorer, distFunc, selectedPointIndices, neighborsOfFirstPoint, hoverPointIndex, label3dMode, spriteImageMode) {
-        if (ds == null) {
-            return new Float32Array(0);
-        }
-        var selectedPointCount = (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
-        var neighborCount = (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
-        var colors = new Float32Array(ds.points.length * 3);
-        var unselectedColor = POINT_COLOR_UNSELECTED;
-        var noSelectionColor = POINT_COLOR_NO_SELECTION;
-        if (label3dMode) {
-            unselectedColor = LABELS_3D_COLOR_UNSELECTED;
-            noSelectionColor = LABELS_3D_COLOR_NO_SELECTION;
-        }
-        if (spriteImageMode) {
-            unselectedColor = SPRITE_IMAGE_COLOR_UNSELECTED;
-            noSelectionColor = SPRITE_IMAGE_COLOR_NO_SELECTION;
-        }
-        // Give all points the unselected color.
-        {
-            var n = ds.points.length;
-            var dst = 0;
-            if (selectedPointCount > 0) {
-                var c = new THREE.Color(unselectedColor);
-                for (var i = 0; i < n; ++i) {
-                    colors[dst++] = c.r;
-                    colors[dst++] = c.g;
-                    colors[dst++] = c.b;
-                }
-            }
-            else {
-                if (legendPointColorer != null) {
-                    for (var i = 0; i < n; ++i) {
-                        var c = new THREE.Color(legendPointColorer(ds, i));
-                        colors[dst++] = c.r;
-                        colors[dst++] = c.g;
-                        colors[dst++] = c.b;
-                    }
-                }
-                else {
-                    var c = new THREE.Color(noSelectionColor);
-                    for (var i = 0; i < n; ++i) {
-                        colors[dst++] = c.r;
-                        colors[dst++] = c.g;
-                        colors[dst++] = c.b;
-                    }
-                }
-            }
-        }
-        // Color the selected points.
-        {
-            var n = selectedPointCount;
-            var c = new THREE.Color(POINT_COLOR_SELECTED);
-            for (var i = 0; i < n; ++i) {
-                var dst = selectedPointIndices[i] * 3;
-                colors[dst++] = c.r;
-                colors[dst++] = c.g;
-                colors[dst++] = c.b;
-            }
-        }
-        // Color the neighbors.
-        {
-            var n = neighborCount;
-            var minDist = n > 0 ? neighborsOfFirstPoint[0].dist : 0;
-            for (var i = 0; i < n; ++i) {
-                var c = new THREE.Color(dist2color(distFunc, neighborsOfFirstPoint[i].dist, minDist));
-                var dst = neighborsOfFirstPoint[i].index * 3;
-                colors[dst++] = c.r;
-                colors[dst++] = c.g;
-                colors[dst++] = c.b;
-            }
-        }
-        // Color the hover point.
-        if (hoverPointIndex != null) {
-            var c = new THREE.Color(POINT_COLOR_HOVER);
-            var dst = hoverPointIndex * 3;
-            colors[dst++] = c.r;
-            colors[dst++] = c.g;
-            colors[dst++] = c.b;
-        }
-        return colors;
-    };
-    ProjectorScatterPlotAdapter.prototype.generate3DLabelsArray = function (ds, accessor) {
-        if ((ds == null) || (accessor == null)) {
-            return null;
-        }
-        var labels = [];
-        var n = ds.points.length;
-        for (var i = 0; i < n; ++i) {
-            labels.push(this.getLabelText(ds, i, accessor));
-        }
-        return labels;
-    };
-    ProjectorScatterPlotAdapter.prototype.getLabelText = function (ds, i, accessor) {
-        return ds.points[i].metadata[accessor].toString();
-    };
-    ProjectorScatterPlotAdapter.prototype.updateScatterPlotWithNewProjection = function (projection) {
-        if (projection == null) {
-            this.createVisualizers(this.renderLabelsIn3D);
-            this.scatterPlot.render();
-            return;
-        }
-        this.setDataSet(projection.dataSet);
-        this.scatterPlot.setDimensions(projection.dimensionality);
-        if (projection.dataSet.projectionCanBeRendered(projection.projectionType)) {
-            this.updateScatterPlotAttributes();
-            this.notifyProjectionPositionsUpdated();
-        }
-        this.scatterPlot.setCameraParametersForNextCameraCreation(null, false);
-    };
-    ProjectorScatterPlotAdapter.prototype.createVisualizers = function (inLabels3DMode) {
-        var ds = (this.projection == null) ? null : this.projection.dataSet;
-        var scatterPlot = this.scatterPlot;
-        scatterPlot.removeAllVisualizers();
-        this.labels3DVisualizer = null;
-        this.canvasLabelsVisualizer = null;
-        this.spriteVisualizer = null;
-        this.polylineVisualizer = null;
-        if (inLabels3DMode) {
-            this.labels3DVisualizer = new scatterPlotVisualizer3DLabels_1.ScatterPlotVisualizer3DLabels();
-            this.labels3DVisualizer.setLabelStrings(this.generate3DLabelsArray(ds, this.labelPointAccessor));
-        }
-        else {
-            this.spriteVisualizer = new scatterPlotVisualizerSprites_1.ScatterPlotVisualizerSprites();
-            scatterPlot.addVisualizer(this.spriteVisualizer);
-            this.canvasLabelsVisualizer =
-                new scatterPlotVisualizerCanvasLabels_1.ScatterPlotVisualizerCanvasLabels(this.scatterPlotContainer);
-        }
-        this.polylineVisualizer = new scatterPlotVisualizerPolylines_1.ScatterPlotVisualizerPolylines();
-        this.setDataSet(ds);
-        if (this.spriteVisualizer) {
-            scatterPlot.addVisualizer(this.spriteVisualizer);
-        }
-        if (this.labels3DVisualizer) {
-            scatterPlot.addVisualizer(this.labels3DVisualizer);
-        }
-        if (this.canvasLabelsVisualizer) {
-            scatterPlot.addVisualizer(this.canvasLabelsVisualizer);
-        }
-        scatterPlot.addVisualizer(this.polylineVisualizer);
-    };
-    ProjectorScatterPlotAdapter.prototype.getSpriteImageMode = function () {
-        if (this.projection == null) {
-            return false;
-        }
-        var ds = this.projection.dataSet;
-        if ((ds == null) || (ds.spriteAndMetadataInfo == null)) {
-            return false;
-        }
-        return ds.spriteAndMetadataInfo.spriteImage != null;
-    };
-    return ProjectorScatterPlotAdapter;
-}());
-exports.ProjectorScatterPlotAdapter = ProjectorScatterPlotAdapter;
-function packRgbIntoUint8Array(rgbArray, labelIndex, r, g, b) {
-    rgbArray[labelIndex * 3] = r;
-    rgbArray[labelIndex * 3 + 1] = g;
-    rgbArray[labelIndex * 3 + 2] = b;
-}
-function styleRgbFromHexColor(hex) {
-    var c = new THREE.Color(hex);
-    return [(c.r * 255) | 0, (c.g * 255) | 0, (c.b * 255) | 0];
-}
-function getDefaultPointInPolylineColor(index, totalPoints) {
-    var hue = POLYLINE_START_HUE +
-        (POLYLINE_END_HUE - POLYLINE_START_HUE) * index / totalPoints;
-    var rgb = d3.hsl(hue, POLYLINE_SATURATION, POLYLINE_LIGHTNESS).rgb();
-    return new THREE.Color(rgb.r / 255, rgb.g / 255, rgb.b / 255);
-}
-/**
- * Normalizes the distance so it can be visually encoded with color.
- * The normalization depends on the distance metric (cosine vs euclidean).
- */
-function normalizeDist(distFunc, d, minDist) {
-    return (distFunc === vector.dist) ? (minDist / d) : (1 - d);
-}
-exports.normalizeDist = normalizeDist;
-/** Normalizes and encodes the provided distance with color. */
-function dist2color(distFunc, d, minDist) {
-    return NN_COLOR_SCALE(normalizeDist(distFunc, d, minDist));
-}
-exports.dist2color = dist2color;
-
-},{"./renderContext":15,"./scatterPlot":16,"./scatterPlotVisualizer3DLabels":19,"./scatterPlotVisualizerCanvasLabels":20,"./scatterPlotVisualizerPolylines":21,"./scatterPlotVisualizerSprites":22,"./vector":25}],15:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-/**
- * LabelRenderParams describes the set of points that should have labels
- * rendered next to them.
- */
-var LabelRenderParams = (function () {
-    function LabelRenderParams(pointIndices, labelStrings, scaleFactors, useSceneOpacityFlags, defaultFontSize, fillColors, strokeColors) {
-        this.pointIndices = pointIndices;
-        this.labelStrings = labelStrings;
-        this.scaleFactors = scaleFactors;
-        this.useSceneOpacityFlags = useSceneOpacityFlags;
-        this.defaultFontSize = defaultFontSize;
-        this.fillColors = fillColors;
-        this.strokeColors = strokeColors;
-    }
-    return LabelRenderParams;
-}());
-exports.LabelRenderParams = LabelRenderParams;
-/** Details about the camera projection being used to render the scene. */
-(function (CameraType) {
-    CameraType[CameraType["Perspective"] = 0] = "Perspective";
-    CameraType[CameraType["Orthographic"] = 1] = "Orthographic";
-})(exports.CameraType || (exports.CameraType = {}));
-var CameraType = exports.CameraType;
-/**
- * RenderContext contains all of the state required to color and render the data
- * set. ScatterPlot passes this to every attached visualizer as part of the
- * render callback.
- * TODO(nicholsonc): This should only contain the data that's changed between
- * each frame. Data like colors / scale factors / labels should be reapplied
- * only when they change.
- */
-var RenderContext = (function () {
-    function RenderContext(camera, cameraType, cameraTarget, screenWidth, screenHeight, nearestCameraSpacePointZ, farthestCameraSpacePointZ, backgroundColor, pointColors, pointScaleFactors, labels, polylineColors, polylineOpacities, polylineWidths) {
-        this.camera = camera;
-        this.cameraType = cameraType;
-        this.cameraTarget = cameraTarget;
-        this.screenWidth = screenWidth;
-        this.screenHeight = screenHeight;
-        this.nearestCameraSpacePointZ = nearestCameraSpacePointZ;
-        this.farthestCameraSpacePointZ = farthestCameraSpacePointZ;
-        this.backgroundColor = backgroundColor;
-        this.pointColors = pointColors;
-        this.pointScaleFactors = pointScaleFactors;
-        this.labels = labels;
-        this.polylineColors = polylineColors;
-        this.polylineOpacities = polylineOpacities;
-        this.polylineWidths = polylineWidths;
-    }
-    return RenderContext;
-}());
-exports.RenderContext = RenderContext;
-
-},{}],16:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var renderContext_1 = require('./renderContext');
-var scatterPlotRectangleSelector_1 = require('./scatterPlotRectangleSelector');
-var util = require('./util');
-var BACKGROUND_COLOR = 0xffffff;
-/**
- * The length of the cube (diameter of the circumscribing sphere) where all the
- * points live.
- */
-var CUBE_LENGTH = 2;
-var MAX_ZOOM = 5 * CUBE_LENGTH;
-var MIN_ZOOM = 0.025 * CUBE_LENGTH;
-// Constants relating to the camera parameters.
-var PERSP_CAMERA_FOV_VERTICAL = 70;
-var PERSP_CAMERA_NEAR_CLIP_PLANE = 0.01;
-var PERSP_CAMERA_FAR_CLIP_PLANE = 100;
-var ORTHO_CAMERA_FRUSTUM_HALF_EXTENT = 1.2;
-// Key presses.
-var SHIFT_KEY = 16;
-var CTRL_KEY = 17;
-var START_CAMERA_POS_3D = new THREE.Vector3(0.45, 0.9, 1.6);
-var START_CAMERA_TARGET_3D = new THREE.Vector3(0, 0, 0);
-var START_CAMERA_POS_2D = new THREE.Vector3(0, 0, 4);
-var START_CAMERA_TARGET_2D = new THREE.Vector3(0, 0, 0);
-var ORBIT_MOUSE_ROTATION_SPEED = 1;
-var ORBIT_ANIMATION_ROTATION_CYCLE_IN_SECONDS = 7;
-/** Supported modes of interaction. */
-(function (MouseMode) {
-    MouseMode[MouseMode["AREA_SELECT"] = 0] = "AREA_SELECT";
-    MouseMode[MouseMode["CAMERA_AND_CLICK_SELECT"] = 1] = "CAMERA_AND_CLICK_SELECT";
-})(exports.MouseMode || (exports.MouseMode = {}));
-var MouseMode = exports.MouseMode;
-/** Defines a camera, suitable for serialization. */
-var CameraDef = (function () {
-    function CameraDef() {
-        this.orthographic = false;
-    }
-    return CameraDef;
-}());
-exports.CameraDef = CameraDef;
-/**
- * Maintains a three.js instantiation and context,
- * animation state, and all other logic that's
- * independent of how a 3D scatter plot is actually rendered. Also holds an
- * array of visualizers and dispatches application events to them.
- */
-var ScatterPlot = (function () {
-    function ScatterPlot(container, projectorEventContext) {
-        var _this = this;
-        this.visualizers = [];
-        this.onCameraMoveListeners = [];
-        this.backgroundColor = BACKGROUND_COLOR;
-        this.dimensionality = 3;
-        this.cameraDef = null;
-        this.orbitAnimationOnNextCameraCreation = false;
-        this.selecting = false;
-        this.mouseIsDown = false;
-        this.isDragSequence = false;
-        this.containerNode = container.node();
-        this.projectorEventContext = projectorEventContext;
-        this.getLayoutValues();
-        this.scene = new THREE.Scene();
-        this.renderer = new THREE.WebGLRenderer({ alpha: true, premultipliedAlpha: false, antialias: false });
-        this.renderer.setClearColor(BACKGROUND_COLOR, 1);
-        this.containerNode.appendChild(this.renderer.domElement);
-        this.light = new THREE.PointLight(0xFFECBF, 1, 0);
-        this.scene.add(this.light);
-        this.setDimensions(3);
-        this.recreateCamera(this.makeDefaultCameraDef(this.dimensionality));
-        this.renderer.render(this.scene, this.camera);
-        this.rectangleSelector = new scatterPlotRectangleSelector_1.ScatterPlotRectangleSelector(this.containerNode, function (boundingBox) { return _this.selectBoundingBox(boundingBox); });
-        this.addInteractionListeners();
-    }
-    ScatterPlot.prototype.addInteractionListeners = function () {
-        this.containerNode.addEventListener('mousemove', this.onMouseMove.bind(this));
-        this.containerNode.addEventListener('mousedown', this.onMouseDown.bind(this));
-        this.containerNode.addEventListener('mouseup', this.onMouseUp.bind(this));
-        this.containerNode.addEventListener('click', this.onClick.bind(this));
-        window.addEventListener('keydown', this.onKeyDown.bind(this), false);
-        window.addEventListener('keyup', this.onKeyUp.bind(this), false);
-    };
-    ScatterPlot.prototype.addCameraControlsEventListeners = function (cameraControls) {
-        var _this = this;
-        // Start is called when the user stars interacting with
-        // controls.
-        cameraControls.addEventListener('start', function () {
-            _this.stopOrbitAnimation();
-            _this.onCameraMoveListeners.forEach(function (l) { return l(_this.camera.position, cameraControls.target); });
-        });
-        // Change is called everytime the user interacts with the controls.
-        cameraControls.addEventListener('change', function () {
-            _this.render();
-        });
-        // End is called when the user stops interacting with the
-        // controls (e.g. on mouse up, after dragging).
-        cameraControls.addEventListener('end', function () { });
-    };
-    ScatterPlot.prototype.makeOrbitControls = function (camera, cameraDef, cameraIs3D) {
-        if (this.orbitCameraControls != null) {
-            this.orbitCameraControls.dispose();
-        }
-        var occ = new THREE.OrbitControls(camera, this.renderer.domElement);
-        occ.target0 = new THREE.Vector3(cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
-        occ.position0 = new THREE.Vector3().copy(camera.position);
-        occ.zoom0 = cameraDef.zoom;
-        occ.enableRotate = cameraIs3D;
-        occ.autoRotate = false;
-        occ.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
-        if (cameraIs3D) {
-            occ.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
-            occ.mouseButtons.PAN = THREE.MOUSE.RIGHT;
-        }
-        else {
-            occ.mouseButtons.ORBIT = null;
-            occ.mouseButtons.PAN = THREE.MOUSE.LEFT;
-        }
-        occ.reset();
-        this.camera = camera;
-        this.orbitCameraControls = occ;
-        this.addCameraControlsEventListeners(this.orbitCameraControls);
-    };
-    ScatterPlot.prototype.makeCamera3D = function (cameraDef, w, h) {
-        var camera;
-        {
-            var aspectRatio = w / h;
-            camera = new THREE.PerspectiveCamera(PERSP_CAMERA_FOV_VERTICAL, aspectRatio, PERSP_CAMERA_NEAR_CLIP_PLANE, PERSP_CAMERA_FAR_CLIP_PLANE);
-            camera.position.set(cameraDef.position[0], cameraDef.position[1], cameraDef.position[2]);
-            var at = new THREE.Vector3(cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
-            camera.lookAt(at);
-            camera.zoom = cameraDef.zoom;
-            camera.updateProjectionMatrix();
-        }
-        this.camera = camera;
-        this.makeOrbitControls(camera, cameraDef, true);
-    };
-    ScatterPlot.prototype.makeCamera2D = function (cameraDef, w, h) {
-        var camera;
-        var target = new THREE.Vector3(cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
-        {
-            var aspectRatio = w / h;
-            var left = -ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-            var right = ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-            var bottom = -ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-            var top_1 = ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-            // Scale up the larger of (w, h) to match the aspect ratio.
-            if (aspectRatio > 1) {
-                left *= aspectRatio;
-                right *= aspectRatio;
-            }
-            else {
-                top_1 /= aspectRatio;
-                bottom /= aspectRatio;
-            }
-            camera =
-                new THREE.OrthographicCamera(left, right, top_1, bottom, -1000, 1000);
-            camera.position.set(cameraDef.position[0], cameraDef.position[1], cameraDef.position[2]);
-            camera.up = new THREE.Vector3(0, 1, 0);
-            camera.lookAt(target);
-            camera.zoom = cameraDef.zoom;
-            camera.updateProjectionMatrix();
-        }
-        this.camera = camera;
-        this.makeOrbitControls(camera, cameraDef, false);
-    };
-    ScatterPlot.prototype.makeDefaultCameraDef = function (dimensionality) {
-        var def = new CameraDef();
-        def.orthographic = (dimensionality === 2);
-        def.zoom = 1.0;
-        if (def.orthographic) {
-            def.position =
-                [START_CAMERA_POS_2D.x, START_CAMERA_POS_2D.y, START_CAMERA_POS_2D.z];
-            def.target = [
-                START_CAMERA_TARGET_2D.x, START_CAMERA_TARGET_2D.y,
-                START_CAMERA_TARGET_2D.z
-            ];
-        }
-        else {
-            def.position =
-                [START_CAMERA_POS_3D.x, START_CAMERA_POS_3D.y, START_CAMERA_POS_3D.z];
-            def.target = [
-                START_CAMERA_TARGET_3D.x, START_CAMERA_TARGET_3D.y,
-                START_CAMERA_TARGET_3D.z
-            ];
-        }
-        return def;
-    };
-    /** Recreate the scatter plot camera from a definition structure. */
-    ScatterPlot.prototype.recreateCamera = function (cameraDef) {
-        if (cameraDef.orthographic) {
-            this.makeCamera2D(cameraDef, this.width, this.height);
-        }
-        else {
-            this.makeCamera3D(cameraDef, this.width, this.height);
-        }
-        this.orbitCameraControls.minDistance = MIN_ZOOM;
-        this.orbitCameraControls.maxDistance = MAX_ZOOM;
-        this.orbitCameraControls.update();
-        if (this.orbitAnimationOnNextCameraCreation) {
-            this.startOrbitAnimation();
-        }
-    };
-    ScatterPlot.prototype.onClick = function (e, notify) {
-        if (notify === void 0) { notify = true; }
-        if (e && this.selecting) {
-            return;
-        }
-        // Only call event handlers if the click originated from the scatter plot.
-        if (!this.isDragSequence && notify) {
-            var selection = (this.nearestPoint != null) ? [this.nearestPoint] : [];
-            this.projectorEventContext.notifySelectionChanged(selection);
-        }
-        this.isDragSequence = false;
-        this.render();
-    };
-    ScatterPlot.prototype.onMouseDown = function (e) {
-        this.isDragSequence = false;
-        this.mouseIsDown = true;
-        if (this.selecting) {
-            this.orbitCameraControls.enabled = false;
-            this.rectangleSelector.onMouseDown(e.offsetX, e.offsetY);
-            this.setNearestPointToMouse(e);
-        }
-        else if (!e.ctrlKey && this.sceneIs3D() &&
-            this.orbitCameraControls.mouseButtons.ORBIT === THREE.MOUSE.RIGHT) {
-            // The user happened to press the ctrl key when the tab was active,
-            // unpressed the ctrl when the tab was inactive, and now he/she
-            // is back to the projector tab.
-            this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
-            this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.RIGHT;
-        }
-        else if (e.ctrlKey && this.sceneIs3D() &&
-            this.orbitCameraControls.mouseButtons.ORBIT === THREE.MOUSE.LEFT) {
-            // Similarly to the situation above.
-            this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.RIGHT;
-            this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.LEFT;
-        }
-    };
-    /** When we stop dragging/zooming, return to normal behavior. */
-    ScatterPlot.prototype.onMouseUp = function (e) {
-        if (this.selecting) {
-            this.orbitCameraControls.enabled = true;
-            this.rectangleSelector.onMouseUp();
-            this.render();
-        }
-        this.mouseIsDown = false;
-    };
-    /**
-     * When the mouse moves, find the nearest point (if any) and send it to the
-     * hoverlisteners (usually called from embedding.ts)
-     */
-    ScatterPlot.prototype.onMouseMove = function (e) {
-        this.isDragSequence = this.mouseIsDown;
-        // Depending if we're selecting or just navigating, handle accordingly.
-        if (this.selecting && this.mouseIsDown) {
-            this.rectangleSelector.onMouseMove(e.offsetX, e.offsetY);
-            this.render();
-        }
-        else if (!this.mouseIsDown) {
-            this.setNearestPointToMouse(e);
-            this.projectorEventContext.notifyHoverOverPoint(this.nearestPoint);
-        }
-    };
-    /** For using ctrl + left click as right click, and for circle select */
-    ScatterPlot.prototype.onKeyDown = function (e) {
-        // If ctrl is pressed, use left click to orbit
-        if (e.keyCode === CTRL_KEY && this.sceneIs3D()) {
-            this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.RIGHT;
-            this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.LEFT;
-        }
-        // If shift is pressed, start selecting
-        if (e.keyCode === SHIFT_KEY) {
-            this.selecting = true;
-            this.containerNode.style.cursor = 'crosshair';
-        }
-    };
-    /** For using ctrl + left click as right click, and for circle select */
-    ScatterPlot.prototype.onKeyUp = function (e) {
-        if (e.keyCode === CTRL_KEY && this.sceneIs3D()) {
-            this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
-            this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.RIGHT;
-        }
-        // If shift is released, stop selecting
-        if (e.keyCode === SHIFT_KEY) {
-            this.selecting = (this.getMouseMode() === MouseMode.AREA_SELECT);
-            if (!this.selecting) {
-                this.containerNode.style.cursor = 'default';
-            }
-            this.render();
-        }
-    };
-    /**
-     * Returns a list of indices of points in a bounding box from the picking
-     * texture.
-     * @param boundingBox The bounding box to select from.
-     */
-    ScatterPlot.prototype.getPointIndicesFromPickingTexture = function (boundingBox) {
-        if (this.worldSpacePointPositions == null) {
-            return null;
-        }
-        var pointCount = this.worldSpacePointPositions.length / 3;
-        var dpr = window.devicePixelRatio || 1;
-        var x = Math.floor(boundingBox.x * dpr);
-        var y = Math.floor(boundingBox.y * dpr);
-        var width = Math.floor(boundingBox.width * dpr);
-        var height = Math.floor(boundingBox.height * dpr);
-        // Create buffer for reading all of the pixels from the texture.
-        var pixelBuffer = new Uint8Array(width * height * 4);
-        // Read the pixels from the bounding box.
-        this.renderer.readRenderTargetPixels(this.pickingTexture, x, this.pickingTexture.height - y, width, height, pixelBuffer);
-        // Keep a flat list of each point and whether they are selected or not. This
-        // approach is more efficient than using an object keyed by the index.
-        var pointIndicesSelection = new Uint8Array(this.worldSpacePointPositions.length);
-        for (var i = 0; i < width * height; i++) {
-            var id = (pixelBuffer[i * 4] << 16) | (pixelBuffer[i * 4 + 1] << 8) |
-                pixelBuffer[i * 4 + 2];
-            if (id !== 0xffffff && (id < pointCount)) {
-                pointIndicesSelection[id] = 1;
-            }
-        }
-        var pointIndices = [];
-        for (var i = 0; i < pointIndicesSelection.length; i++) {
-            if (pointIndicesSelection[i] === 1) {
-                pointIndices.push(i);
-            }
-        }
-        return pointIndices;
-    };
-    ScatterPlot.prototype.selectBoundingBox = function (boundingBox) {
-        var pointIndices = this.getPointIndicesFromPickingTexture(boundingBox);
-        this.projectorEventContext.notifySelectionChanged(pointIndices);
-    };
-    ScatterPlot.prototype.setNearestPointToMouse = function (e) {
-        if (this.pickingTexture == null) {
-            this.nearestPoint = null;
-            return;
-        }
-        var boundingBox = { x: e.offsetX, y: e.offsetY, width: 1, height: 1 };
-        var pointIndices = this.getPointIndicesFromPickingTexture(boundingBox);
-        this.nearestPoint = (pointIndices != null) ? pointIndices[0] : null;
-    };
-    ScatterPlot.prototype.getLayoutValues = function () {
-        this.width = this.containerNode.offsetWidth;
-        this.height = Math.max(1, this.containerNode.offsetHeight);
-        return [this.width, this.height];
-    };
-    ScatterPlot.prototype.sceneIs3D = function () {
-        return this.dimensionality === 3;
-    };
-    ScatterPlot.prototype.remove3dAxisFromScene = function () {
-        var axes = this.scene.getObjectByName('axes');
-        if (axes != null) {
-            this.scene.remove(axes);
-        }
-        return axes;
-    };
-    ScatterPlot.prototype.add3dAxis = function () {
-        var axes = new THREE.AxisHelper();
-        axes.name = 'axes';
-        this.scene.add(axes);
-    };
-    /** Set 2d vs 3d mode. */
-    ScatterPlot.prototype.setDimensions = function (dimensionality) {
-        if ((dimensionality !== 2) && (dimensionality !== 3)) {
-            throw new RangeError('dimensionality must be 2 or 3');
-        }
-        this.dimensionality = dimensionality;
-        var def = this.cameraDef || this.makeDefaultCameraDef(dimensionality);
-        this.recreateCamera(def);
-        this.remove3dAxisFromScene();
-        if (dimensionality === 3) {
-            this.add3dAxis();
-        }
-    };
-    /** Gets the current camera information, suitable for serialization. */
-    ScatterPlot.prototype.getCameraDef = function () {
-        var def = new CameraDef();
-        var pos = this.camera.position;
-        var tgt = this.orbitCameraControls.target;
-        def.orthographic = !this.sceneIs3D();
-        def.position = [pos.x, pos.y, pos.z];
-        def.target = [tgt.x, tgt.y, tgt.z];
-        def.zoom = this.camera.zoom;
-        return def;
-    };
-    /** Sets parameters for the next camera recreation. */
-    ScatterPlot.prototype.setCameraParametersForNextCameraCreation = function (def, orbitAnimation) {
-        this.cameraDef = def;
-        this.orbitAnimationOnNextCameraCreation = orbitAnimation;
-    };
-    /** Gets the current camera position. */
-    ScatterPlot.prototype.getCameraPosition = function () {
-        var currPos = this.camera.position;
-        return [currPos.x, currPos.y, currPos.z];
-    };
-    /** Gets the current camera target. */
-    ScatterPlot.prototype.getCameraTarget = function () {
-        var currTarget = this.orbitCameraControls.target;
-        return [currTarget.x, currTarget.y, currTarget.z];
-    };
-    /** Sets up the camera from given position and target coordinates. */
-    ScatterPlot.prototype.setCameraPositionAndTarget = function (position, target) {
-        this.stopOrbitAnimation();
-        this.camera.position.set(position[0], position[1], position[2]);
-        this.orbitCameraControls.target.set(target[0], target[1], target[2]);
-        this.orbitCameraControls.update();
-        this.render();
-    };
-    /** Starts orbiting the camera around its current lookat target. */
-    ScatterPlot.prototype.startOrbitAnimation = function () {
-        if (!this.sceneIs3D()) {
-            return;
-        }
-        if (this.orbitAnimationId != null) {
-            this.stopOrbitAnimation();
-        }
-        this.orbitCameraControls.autoRotate = true;
-        this.orbitCameraControls.rotateSpeed =
-            ORBIT_ANIMATION_ROTATION_CYCLE_IN_SECONDS;
-        this.updateOrbitAnimation();
-    };
-    ScatterPlot.prototype.updateOrbitAnimation = function () {
-        var _this = this;
-        this.orbitCameraControls.update();
-        this.orbitAnimationId =
-            requestAnimationFrame(function () { return _this.updateOrbitAnimation(); });
-    };
-    /** Stops the orbiting animation on the camera. */
-    ScatterPlot.prototype.stopOrbitAnimation = function () {
-        this.orbitCameraControls.autoRotate = false;
-        this.orbitCameraControls.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
-        if (this.orbitAnimationId != null) {
-            cancelAnimationFrame(this.orbitAnimationId);
-            this.orbitAnimationId = null;
-        }
-    };
-    /** Adds a visualizer to the set, will start dispatching events to it */
-    ScatterPlot.prototype.addVisualizer = function (visualizer) {
-        if (this.scene) {
-            visualizer.setScene(this.scene);
-        }
-        visualizer.onResize(this.width, this.height);
-        visualizer.onPointPositionsChanged(this.worldSpacePointPositions);
-        this.visualizers.push(visualizer);
-    };
-    /** Removes all visualizers attached to this scatter plot. */
-    ScatterPlot.prototype.removeAllVisualizers = function () {
-        this.visualizers.forEach(function (v) { return v.dispose(); });
-        this.visualizers = [];
-    };
-    /** Update scatter plot with a new array of packed xyz point positions. */
-    ScatterPlot.prototype.setPointPositions = function (worldSpacePointPositions) {
-        this.worldSpacePointPositions = worldSpacePointPositions;
-        this.visualizers.forEach(function (v) { return v.onPointPositionsChanged(worldSpacePointPositions); });
-    };
-    ScatterPlot.prototype.render = function () {
-        {
-            var lightPos = this.camera.position.clone();
-            lightPos.x += 1;
-            lightPos.y += 1;
-            this.light.position.set(lightPos.x, lightPos.y, lightPos.z);
-        }
-        var cameraType = (this.camera instanceof THREE.PerspectiveCamera) ?
-            renderContext_1.CameraType.Perspective :
-            renderContext_1.CameraType.Orthographic;
-        var cameraSpacePointExtents = [0, 0];
-        if (this.worldSpacePointPositions != null) {
-            cameraSpacePointExtents = util.getNearFarPoints(this.worldSpacePointPositions, this.camera.position, this.orbitCameraControls.target);
-        }
-        var rc = new renderContext_1.RenderContext(this.camera, cameraType, this.orbitCameraControls.target, this.width, this.height, cameraSpacePointExtents[0], cameraSpacePointExtents[1], this.backgroundColor, this.pointColors, this.pointScaleFactors, this.labels, this.polylineColors, this.polylineOpacities, this.polylineWidths);
-        // Render first pass to picking target. This render fills pickingTexture
-        // with colors that are actually point ids, so that sampling the texture at
-        // the mouse's current x,y coordinates will reveal the data point that the
-        // mouse is over.
-        this.visualizers.forEach(function (v) { return v.onPickingRender(rc); });
-        {
-            var axes = this.remove3dAxisFromScene();
-            this.renderer.render(this.scene, this.camera, this.pickingTexture);
-            if (axes != null) {
-                this.scene.add(axes);
-            }
-        }
-        // Render second pass to color buffer, to be displayed on the canvas.
-        this.visualizers.forEach(function (v) { return v.onRender(rc); });
-        this.renderer.render(this.scene, this.camera);
-    };
-    ScatterPlot.prototype.setMouseMode = function (mouseMode) {
-        this.mouseMode = mouseMode;
-        if (mouseMode === MouseMode.AREA_SELECT) {
-            this.selecting = true;
-            this.containerNode.style.cursor = 'crosshair';
-        }
-        else {
-            this.selecting = false;
-            this.containerNode.style.cursor = 'default';
-        }
-    };
-    /** Set the colors for every data point. (RGB triplets) */
-    ScatterPlot.prototype.setPointColors = function (colors) {
-        this.pointColors = colors;
-    };
-    /** Set the scale factors for every data point. (scalars) */
-    ScatterPlot.prototype.setPointScaleFactors = function (scaleFactors) {
-        this.pointScaleFactors = scaleFactors;
-    };
-    /** Set the labels to rendered */
-    ScatterPlot.prototype.setLabels = function (labels) {
-        this.labels = labels;
-    };
-    /** Set the colors for every data polyline. (RGB triplets) */
-    ScatterPlot.prototype.setPolylineColors = function (colors) {
-        this.polylineColors = colors;
-    };
-    ScatterPlot.prototype.setPolylineOpacities = function (opacities) {
-        this.polylineOpacities = opacities;
-    };
-    ScatterPlot.prototype.setPolylineWidths = function (widths) {
-        this.polylineWidths = widths;
-    };
-    ScatterPlot.prototype.getMouseMode = function () {
-        return this.mouseMode;
-    };
-    ScatterPlot.prototype.resetZoom = function () {
-        this.recreateCamera(this.makeDefaultCameraDef(this.dimensionality));
-        this.render();
-    };
-    ScatterPlot.prototype.setDayNightMode = function (isNight) {
-        d3.select(this.containerNode)
-            .selectAll('canvas')
-            .style('filter', isNight ? 'invert(100%)' : null);
-    };
-    ScatterPlot.prototype.resize = function (render) {
-        if (render === void 0) { render = true; }
-        var _a = [this.width, this.height], oldW = _a[0], oldH = _a[1];
-        var _b = this.getLayoutValues(), newW = _b[0], newH = _b[1];
-        if (this.dimensionality === 3) {
-            var camera = this.camera;
-            camera.aspect = newW / newH;
-            camera.updateProjectionMatrix();
-        }
-        else {
-            var camera = this.camera;
-            // Scale the ortho frustum by however much the window changed.
-            var scaleW = newW / oldW;
-            var scaleH = newH / oldH;
-            var newCamHalfWidth = ((camera.right - camera.left) * scaleW) / 2;
-            var newCamHalfHeight = ((camera.top - camera.bottom) * scaleH) / 2;
-            camera.top = newCamHalfHeight;
-            camera.bottom = -newCamHalfHeight;
-            camera.left = -newCamHalfWidth;
-            camera.right = newCamHalfWidth;
-            camera.updateProjectionMatrix();
-        }
-        // Accouting for retina displays.
-        var dpr = window.devicePixelRatio || 1;
-        this.renderer.setPixelRatio(dpr);
-        this.renderer.setSize(newW, newH);
-        // the picking texture needs to be exactly the same as the render texture.
-        {
-            var renderCanvasSize = this.renderer.getSize();
-            var pixelRatio = this.renderer.getPixelRatio();
-            this.pickingTexture = new THREE.WebGLRenderTarget(renderCanvasSize.width * pixelRatio, renderCanvasSize.height * pixelRatio);
-            this.pickingTexture.texture.minFilter = THREE.LinearFilter;
-        }
-        this.visualizers.forEach(function (v) { return v.onResize(newW, newH); });
-        if (render) {
-            this.render();
-        }
-        ;
-    };
-    ScatterPlot.prototype.onCameraMove = function (listener) {
-        this.onCameraMoveListeners.push(listener);
-    };
-    ScatterPlot.prototype.clickOnPoint = function (pointIndex) {
-        this.nearestPoint = pointIndex;
-        this.onClick(null, false);
-    };
-    return ScatterPlot;
-}());
-exports.ScatterPlot = ScatterPlot;
-
-},{"./renderContext":15,"./scatterPlotRectangleSelector":17,"./util":24}],17:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var FILL = '#dddddd';
-var FILL_OPACITY = .2;
-var STROKE = '#aaaaaa';
-var STROKE_WIDTH = 2;
-var STROKE_DASHARRAY = '10 5';
-/**
- * A class that manages and renders a data selection rectangle.
- */
-var ScatterPlotRectangleSelector = (function () {
-    /**
-     * @param container The container HTML element that the selection SVG rect
-     *     will be a child of.
-     * @param selectionCallback The callback that accepts a bounding box to be
-     *     called when selection changes. Currently, we only call the callback on
-     *     mouseUp.
-     */
-    function ScatterPlotRectangleSelector(container, selectionCallback) {
-        this.svgElement = d3.select(container).select('#selector');
-        this.rectElement = this.svgElement.append('rect')
-            .style('stroke', STROKE)
-            .style('stroke-dasharray', STROKE_DASHARRAY)
-            .style('stroke-width', STROKE_WIDTH)
-            .style('fill', FILL)
-            .style('fill-opacity', FILL_OPACITY);
-        this.selectionCallback = selectionCallback;
-        this.isMouseDown = false;
-    }
-    ScatterPlotRectangleSelector.prototype.onMouseDown = function (offsetX, offsetY) {
-        this.isMouseDown = true;
-        this.svgElement.style('display', 'block');
-        this.startCoordinates = [offsetX, offsetY];
-        this.lastBoundingBox = {
-            x: this.startCoordinates[0],
-            y: this.startCoordinates[1],
-            width: 1,
-            height: 1
-        };
-    };
-    ScatterPlotRectangleSelector.prototype.onMouseMove = function (offsetX, offsetY) {
-        if (!this.isMouseDown) {
-            return;
-        }
-        this.lastBoundingBox.x = Math.min(offsetX, this.startCoordinates[0]);
-        this.lastBoundingBox.y = Math.max(offsetY, this.startCoordinates[1]);
-        this.lastBoundingBox.width =
-            Math.max(offsetX, this.startCoordinates[0]) - this.lastBoundingBox.x;
-        this.lastBoundingBox.height =
-            this.lastBoundingBox.y - Math.min(offsetY, this.startCoordinates[1]);
-        this.rectElement.attr({
-            x: this.lastBoundingBox.x,
-            y: this.lastBoundingBox.y - this.lastBoundingBox.height,
-            width: this.lastBoundingBox.width,
-            height: this.lastBoundingBox.height
-        });
-    };
-    ScatterPlotRectangleSelector.prototype.onMouseUp = function () {
-        this.isMouseDown = false;
-        this.svgElement.style('display', 'none');
-        this.rectElement.attr('width', 0);
-        this.rectElement.attr('height', 0);
-        this.selectionCallback(this.lastBoundingBox);
-    };
-    return ScatterPlotRectangleSelector;
-}());
-exports.ScatterPlotRectangleSelector = ScatterPlotRectangleSelector;
-
-},{}],18:[function(require,module,exports){
-arguments[4][13][0].apply(exports,arguments)
-},{"dup":13}],19:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var util = require('./util');
-var FONT_SIZE = 80;
-var ONE_OVER_FONT_SIZE = 1 / FONT_SIZE;
-var LABEL_SCALE = 2.2; // at 1:1 texel/pixel ratio
-var LABEL_COLOR = 'black';
-var LABEL_BACKGROUND = 'white';
-var MAX_CANVAS_DIMENSION = 8192;
-var NUM_GLYPHS = 256;
-var RGB_ELEMENTS_PER_ENTRY = 3;
-var XYZ_ELEMENTS_PER_ENTRY = 3;
-var UV_ELEMENTS_PER_ENTRY = 2;
-var VERTICES_PER_GLYPH = 2 * 3; // 2 triangles, 3 verts per triangle
-/**
- * Each label is made up of triangles (two per letter.) Each vertex, then, is
- * the corner of one of these triangles (and thus the corner of a letter
- * rectangle.)
- * Each has the following attributes:
- *    posObj: The (x, y) position of the vertex within the label, where the
- *            bottom center of the word is positioned at (0, 0);
- *    position: The position of the label in worldspace.
- *    vUv: The (u, v) coordinates that index into the glyphs sheet (range 0, 1.)
- *    color: The color of the label (matches the cooresponding point's color.)
- *    wordShown: Boolean. Whether or not the label is visible.
- */
-var VERTEX_SHADER = "\n    attribute vec2 posObj;\n    attribute vec3 color;\n    varying vec2 vUv;\n    varying vec3 vColor;\n\n    void main() {\n      vUv = uv;\n      vColor = color;\n\n      // Rotate label to face camera.\n\n      vec4 vRight = vec4(\n        modelViewMatrix[0][0], modelViewMatrix[1][0], modelViewMatrix[2][0], 0);\n\n      vec4 vUp = vec4(\n        modelViewMatrix[0][1], modelViewMatrix[1][1], modelViewMatrix[2][1], 0);\n\n      vec4 vAt = -vec4(\n        modelViewMatrix[0][2], modelViewMatrix[1][2], modelViewMatrix[2][2], 0);\n\n      mat4 pointToCamera = mat4(vRight, vUp, vAt, vec4(0, 0, 0, 1));\n\n      vec2 scaledPos = posObj * " + ONE_OVER_FONT_SIZE + " * " + LABEL_SCALE + ";\n\n      vec4 posRotated = pointToCamera * vec4(scaledPos, 0, 1);\n      vec4 mvPosition = modelViewMatrix * (vec4(position, 0) + posRotated);\n      gl_Position = projectionMatrix * mvPosition;\n    }";
-var FRAGMENT_SHADER = "\n    uniform sampler2D texture;\n    uniform bool picking;\n    varying vec2 vUv;\n    varying vec3 vColor;\n\n    void main() {\n      if (picking) {\n        gl_FragColor = vec4(vColor, 1.0);\n      } else {\n        vec4 fromTexture = texture2D(texture, vUv);\n        gl_FragColor = vec4(vColor, 1.0) * fromTexture;\n      }\n    }";
-/**
- * Renders the text labels as 3d geometry in the world.
- */
-var ScatterPlotVisualizer3DLabels = (function () {
-    function ScatterPlotVisualizer3DLabels() {
-    }
-    ScatterPlotVisualizer3DLabels.prototype.createGlyphTexture = function () {
-        var canvas = document.createElement('canvas');
-        canvas.width = MAX_CANVAS_DIMENSION;
-        canvas.height = FONT_SIZE;
-        var ctx = canvas.getContext('2d');
-        ctx.font = 'bold ' + FONT_SIZE * 0.75 + 'px roboto';
-        ctx.textBaseline = 'top';
-        ctx.fillStyle = LABEL_BACKGROUND;
-        ctx.rect(0, 0, canvas.width, canvas.height);
-        ctx.fill();
-        ctx.fillStyle = LABEL_COLOR;
-        var spaceOffset = ctx.measureText(' ').width;
-        // For each letter, store length, position at the encoded index.
-        var glyphLengths = new Float32Array(NUM_GLYPHS);
-        var glyphOffset = new Float32Array(NUM_GLYPHS);
-        var leftCoord = 0;
-        for (var i = 0; i < NUM_GLYPHS; i++) {
-            var text = ' ' + String.fromCharCode(i);
-            var textLength = ctx.measureText(text).width;
-            glyphLengths[i] = textLength - spaceOffset;
-            glyphOffset[i] = leftCoord;
-            ctx.fillText(text, leftCoord - spaceOffset, 0);
-            leftCoord += textLength;
-        }
-        var tex = util.createTexture(canvas);
-        return { texture: tex, lengths: glyphLengths, offsets: glyphOffset };
-    };
-    ScatterPlotVisualizer3DLabels.prototype.processLabelVerts = function (pointCount) {
-        var numTotalLetters = 0;
-        this.labelVertexMap = [];
-        for (var i = 0; i < pointCount; i++) {
-            var label = this.labelStrings[i];
-            var vertsArray = [];
-            for (var j = 0; j < label.length; j++) {
-                for (var k = 0; k < VERTICES_PER_GLYPH; k++) {
-                    vertsArray.push(numTotalLetters * VERTICES_PER_GLYPH + k);
-                }
-                numTotalLetters++;
-            }
-            this.labelVertexMap.push(vertsArray);
-        }
-        this.totalVertexCount = numTotalLetters * VERTICES_PER_GLYPH;
-    };
-    ScatterPlotVisualizer3DLabels.prototype.createColorBuffers = function (pointCount) {
-        var _this = this;
-        this.pickingColors =
-            new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
-        this.renderColors =
-            new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
-        var _loop_1 = function(i) {
-            var color = new THREE.Color(i);
-            this_1.labelVertexMap[i].forEach(function (j) {
-                _this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j] = color.r;
-                _this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j + 1] = color.g;
-                _this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j + 2] = color.b;
-                _this.renderColors[RGB_ELEMENTS_PER_ENTRY * j] = 1.0;
-                _this.renderColors[RGB_ELEMENTS_PER_ENTRY * j + 1] = 1.0;
-                _this.renderColors[RGB_ELEMENTS_PER_ENTRY * j + 2] = 1.0;
-            });
-        };
-        var this_1 = this;
-        for (var i = 0; i < pointCount; i++) {
-            _loop_1(i);
-        }
-    };
-    ScatterPlotVisualizer3DLabels.prototype.createLabels = function () {
-        var _this = this;
-        if ((this.labelStrings == null) ||
-            (this.worldSpacePointPositions == null)) {
-            return;
-        }
-        var pointCount = this.worldSpacePointPositions.length / XYZ_ELEMENTS_PER_ENTRY;
-        if (pointCount !== this.labelStrings.length) {
-            return;
-        }
-        this.glyphTexture = this.createGlyphTexture();
-        this.uniforms = {
-            texture: { type: 't' },
-            picking: { type: 'bool' },
-        };
-        this.material = new THREE.ShaderMaterial({
-            uniforms: this.uniforms,
-            transparent: true,
-            vertexShader: VERTEX_SHADER,
-            fragmentShader: FRAGMENT_SHADER,
-        });
-        this.processLabelVerts(pointCount);
-        this.createColorBuffers(pointCount);
-        var positionArray = new Float32Array(this.totalVertexCount * XYZ_ELEMENTS_PER_ENTRY);
-        this.positions =
-            new THREE.BufferAttribute(positionArray, XYZ_ELEMENTS_PER_ENTRY);
-        var posArray = new Float32Array(this.totalVertexCount * XYZ_ELEMENTS_PER_ENTRY);
-        var uvArray = new Float32Array(this.totalVertexCount * UV_ELEMENTS_PER_ENTRY);
-        var colorsArray = new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
-        var positionObject = new THREE.BufferAttribute(posArray, 2);
-        var uv = new THREE.BufferAttribute(uvArray, UV_ELEMENTS_PER_ENTRY);
-        var colors = new THREE.BufferAttribute(colorsArray, RGB_ELEMENTS_PER_ENTRY);
-        this.geometry = new THREE.BufferGeometry();
-        this.geometry.addAttribute('posObj', positionObject);
-        this.geometry.addAttribute('position', this.positions);
-        this.geometry.addAttribute('uv', uv);
-        this.geometry.addAttribute('color', colors);
-        var lettersSoFar = 0;
-        for (var i = 0; i < pointCount; i++) {
-            var label = this.labelStrings[i];
-            var leftOffset = 0;
-            // Determine length of word in pixels.
-            for (var j = 0; j < label.length; j++) {
-                var letterCode = label.charCodeAt(j);
-                leftOffset += this.glyphTexture.lengths[letterCode];
-            }
-            leftOffset /= -2; // centers text horizontally around the origin
-            for (var j = 0; j < label.length; j++) {
-                var letterCode = label.charCodeAt(j);
-                var letterWidth = this.glyphTexture.lengths[letterCode];
-                var scale = FONT_SIZE;
-                var right = (leftOffset + letterWidth) / scale;
-                var left = (leftOffset) / scale;
-                var top_1 = FONT_SIZE / scale;
-                // First triangle
-                positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 0, left, 0);
-                positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 1, right, 0);
-                positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 2, left, top_1);
-                // Second triangle
-                positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 3, left, top_1);
-                positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 4, right, 0);
-                positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 5, right, top_1);
-                // Set UVs based on letter.
-                var uLeft = (this.glyphTexture.offsets[letterCode]);
-                var uRight = (this.glyphTexture.offsets[letterCode] + letterWidth);
-                // Scale so that uvs lie between 0 and 1 on the texture.
-                uLeft /= MAX_CANVAS_DIMENSION;
-                uRight /= MAX_CANVAS_DIMENSION;
-                var vTop = 1;
-                var vBottom = 0;
-                uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 0, uLeft, vTop);
-                uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 1, uRight, vTop);
-                uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 2, uLeft, vBottom);
-                uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 3, uLeft, vBottom);
-                uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 4, uRight, vTop);
-                uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 5, uRight, vBottom);
-                lettersSoFar++;
-                leftOffset += letterWidth;
-            }
-        }
-        var _loop_2 = function(i) {
-            var p = util.vector3FromPackedArray(this_2.worldSpacePointPositions, i);
-            this_2.labelVertexMap[i].forEach(function (j) {
-                _this.positions.setXYZ(j, p.x, p.y, p.z);
-            });
-        };
-        var this_2 = this;
-        for (var i = 0; i < pointCount; i++) {
-            _loop_2(i);
-        }
-        ;
-        this.labelsMesh = new THREE.Mesh(this.geometry, this.material);
-        this.labelsMesh.frustumCulled = false;
-        this.scene.add(this.labelsMesh);
-    };
-    ScatterPlotVisualizer3DLabels.prototype.colorLabels = function (pointColors) {
-        if (this.labelStrings == null || this.geometry == null ||
-            pointColors == null) {
-            return;
-        }
-        var colors = this.geometry.getAttribute('color');
-        colors.array = this.renderColors;
-        var n = pointColors.length / XYZ_ELEMENTS_PER_ENTRY;
-        var src = 0;
-        for (var i = 0; i < n; ++i) {
-            var c = new THREE.Color(pointColors[src], pointColors[src + 1], pointColors[src + 2]);
-            var m = this.labelVertexMap[i].length;
-            for (var j = 0; j < m; ++j) {
-                colors.setXYZ(this.labelVertexMap[i][j], c.r, c.g, c.b);
-            }
-            src += RGB_ELEMENTS_PER_ENTRY;
-        }
-        colors.needsUpdate = true;
-    };
-    ScatterPlotVisualizer3DLabels.prototype.setScene = function (scene) {
-        this.scene = scene;
-    };
-    ScatterPlotVisualizer3DLabels.prototype.dispose = function () {
-        if (this.labelsMesh) {
-            if (this.scene) {
-                this.scene.remove(this.labelsMesh);
-            }
-            this.labelsMesh = null;
-        }
-        if (this.geometry) {
-            this.geometry.dispose();
-            this.geometry = null;
-        }
-        if ((this.glyphTexture != null) && (this.glyphTexture.texture != null)) {
-            this.glyphTexture.texture.dispose();
-            this.glyphTexture.texture = null;
-        }
-    };
-    ScatterPlotVisualizer3DLabels.prototype.onPickingRender = function (rc) {
-        if (this.geometry == null) {
-            this.createLabels();
-        }
-        if (this.geometry == null) {
-            return;
-        }
-        this.material.uniforms.texture.value = this.glyphTexture.texture;
-        this.material.uniforms.picking.value = true;
-        var colors = this.geometry.getAttribute('color');
-        colors.array = this.pickingColors;
-        colors.needsUpdate = true;
-    };
-    ScatterPlotVisualizer3DLabels.prototype.onRender = function (rc) {
-        if (this.geometry == null) {
-            this.createLabels();
-        }
-        if (this.geometry == null) {
-            return;
-        }
-        this.colorLabels(rc.pointColors);
-        this.material.uniforms.texture.value = this.glyphTexture.texture;
-        this.material.uniforms.picking.value = false;
-        var colors = this.geometry.getAttribute('color');
-        colors.array = this.renderColors;
-        colors.needsUpdate = true;
-    };
-    ScatterPlotVisualizer3DLabels.prototype.onPointPositionsChanged = function (newPositions) {
-        this.worldSpacePointPositions = newPositions;
-        this.dispose();
-    };
-    ScatterPlotVisualizer3DLabels.prototype.setLabelStrings = function (labelStrings) {
-        this.labelStrings = labelStrings;
-        this.dispose();
-    };
-    ScatterPlotVisualizer3DLabels.prototype.onResize = function (newWidth, newHeight) { };
-    return ScatterPlotVisualizer3DLabels;
-}());
-exports.ScatterPlotVisualizer3DLabels = ScatterPlotVisualizer3DLabels;
-
-},{"./util":24}],20:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var label_1 = require('./label');
-var renderContext_1 = require('./renderContext');
-var util = require('./util');
-var MAX_LABELS_ON_SCREEN = 10000;
-var LABEL_STROKE_WIDTH = 3;
-var LABEL_FILL_WIDTH = 6;
-/**
- * Creates and maintains a 2d canvas on top of the GL canvas. All labels, when
- * active, are rendered to the 2d canvas as part of the visible render pass.
- */
-var ScatterPlotVisualizerCanvasLabels = (function () {
-    function ScatterPlotVisualizerCanvasLabels(container) {
-        this.labelsActive = true;
-        this.canvas = container.append('canvas').node();
-        this.gc = this.canvas.getContext('2d');
-        d3.select(this.canvas).style({ position: 'absolute', left: 0, top: 0 });
-        this.canvas.style.pointerEvents = 'none';
-    }
-    ScatterPlotVisualizerCanvasLabels.prototype.removeAllLabels = function () {
-        var pixelWidth = this.canvas.width * window.devicePixelRatio;
-        var pixelHeight = this.canvas.height * window.devicePixelRatio;
-        this.gc.clearRect(0, 0, pixelWidth, pixelHeight);
-    };
-    /** Render all of the non-overlapping visible labels to the canvas. */
-    ScatterPlotVisualizerCanvasLabels.prototype.makeLabels = function (rc) {
-        if ((rc.labels == null) || (rc.labels.pointIndices.length === 0)) {
-            return;
-        }
-        if (this.worldSpacePointPositions == null) {
-            return;
-        }
-        var lrc = rc.labels;
-        var sceneIs3D = (rc.cameraType === renderContext_1.CameraType.Perspective);
-        var labelHeight = parseInt(this.gc.font, 10);
-        var dpr = window.devicePixelRatio;
-        var grid;
-        {
-            var pixw = this.canvas.width * dpr;
-            var pixh = this.canvas.height * dpr;
-            var bb = { loX: 0, hiX: pixw, loY: 0, hiY: pixh };
-            grid = new label_1.CollisionGrid(bb, pixw / 25, pixh / 50);
-        }
-        var opacityMap = d3.scale.pow()
-            .exponent(Math.E)
-            .domain([rc.farthestCameraSpacePointZ, rc.nearestCameraSpacePointZ])
-            .range([0.1, 1]);
-        var camPos = rc.camera.position;
-        var camToTarget = camPos.clone().sub(rc.cameraTarget);
-        var camToPoint = new THREE.Vector3();
-        this.gc.textBaseline = 'middle';
-        this.gc.miterLimit = 2;
-        // Have extra space between neighboring labels. Don't pack too tightly.
-        var labelMargin = 2;
-        // Shift the label to the right of the point circle.
-        var xShift = 4;
-        var n = Math.min(MAX_LABELS_ON_SCREEN, lrc.pointIndices.length);
-        for (var i = 0; i < n; ++i) {
-            var point = void 0;
-            {
-                var pi = lrc.pointIndices[i];
-                point = util.vector3FromPackedArray(this.worldSpacePointPositions, pi);
-            }
-            // discard points that are behind the camera
-            camToPoint.copy(camPos).sub(point);
-            if (camToTarget.dot(camToPoint) < 0) {
-                continue;
-            }
-            var _a = util.vector3DToScreenCoords(rc.camera, rc.screenWidth, rc.screenHeight, point), x = _a[0], y = _a[1];
-            x += xShift;
-            // Computing the width of the font is expensive,
-            // so we assume width of 1 at first. Then, if the label doesn't
-            // conflict with other labels, we measure the actual width.
-            var textBoundingBox = {
-                loX: x - labelMargin,
-                hiX: x + 1 + labelMargin,
-                loY: y - labelHeight / 2 - labelMargin,
-                hiY: y + labelHeight / 2 + labelMargin
-            };
-            if (grid.insert(textBoundingBox, true)) {
-                var text = lrc.labelStrings[i];
-                var fontSize = lrc.defaultFontSize * lrc.scaleFactors[i] * dpr;
-                this.gc.font = fontSize + 'px roboto';
-                // Now, check with properly computed width.
-                textBoundingBox.hiX += this.gc.measureText(text).width - 1;
-                if (grid.insert(textBoundingBox)) {
-                    var opacity = 1;
-                    if (sceneIs3D && (lrc.useSceneOpacityFlags[i] === 1)) {
-                        opacity = opacityMap(camToPoint.length());
-                    }
-                    this.gc.fillStyle =
-                        this.styleStringFromPackedRgba(lrc.fillColors, i, opacity);
-                    this.gc.strokeStyle =
-                        this.styleStringFromPackedRgba(lrc.strokeColors, i, opacity);
-                    this.gc.lineWidth = LABEL_STROKE_WIDTH;
-                    this.gc.strokeText(text, x, y);
-                    this.gc.lineWidth = LABEL_FILL_WIDTH;
-                    this.gc.fillText(text, x, y);
-                }
-            }
-        }
-    };
-    ScatterPlotVisualizerCanvasLabels.prototype.styleStringFromPackedRgba = function (packedRgbaArray, colorIndex, opacity) {
-        var offset = colorIndex * 3;
-        var r = packedRgbaArray[offset];
-        var g = packedRgbaArray[offset + 1];
-        var b = packedRgbaArray[offset + 2];
-        return 'rgba(' + r + ',' + g + ',' + b + ',' + opacity + ')';
-    };
-    ScatterPlotVisualizerCanvasLabels.prototype.onResize = function (newWidth, newHeight) {
-        var dpr = window.devicePixelRatio;
-        d3.select(this.canvas)
-            .attr('width', newWidth * dpr)
-            .attr('height', newHeight * dpr)
-            .style({ width: newWidth + 'px', height: newHeight + 'px' });
-    };
-    ScatterPlotVisualizerCanvasLabels.prototype.dispose = function () {
-        this.removeAllLabels();
-        this.canvas = null;
-        this.gc = null;
-    };
-    ScatterPlotVisualizerCanvasLabels.prototype.onPointPositionsChanged = function (newPositions) {
-        this.worldSpacePointPositions = newPositions;
-        this.removeAllLabels();
-    };
-    ScatterPlotVisualizerCanvasLabels.prototype.onRender = function (rc) {
-        if (!this.labelsActive) {
-            return;
-        }
-        this.removeAllLabels();
-        this.makeLabels(rc);
-    };
-    ScatterPlotVisualizerCanvasLabels.prototype.setScene = function (scene) { };
-    ScatterPlotVisualizerCanvasLabels.prototype.onPickingRender = function (renderContext) { };
-    return ScatterPlotVisualizerCanvasLabels;
-}());
-exports.ScatterPlotVisualizerCanvasLabels = ScatterPlotVisualizerCanvasLabels;
-
-},{"./label":11,"./renderContext":15,"./util":24}],21:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var util = require('./util');
-var RGB_NUM_ELEMENTS = 3;
-var XYZ_NUM_ELEMENTS = 3;
-/**
- * Renders polylines that connect multiple points in the dataset.
- */
-var ScatterPlotVisualizerPolylines = (function () {
-    function ScatterPlotVisualizerPolylines() {
-        this.polylinePositionBuffer = {};
-        this.polylineColorBuffer = {};
-    }
-    ScatterPlotVisualizerPolylines.prototype.updateSequenceIndicesInDataSet = function (ds) {
-        for (var i = 0; i < ds.sequences.length; i++) {
-            var sequence = ds.sequences[i];
-            for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
-                ds.points[sequence.pointIndices[j]].sequenceIndex = i;
-                ds.points[sequence.pointIndices[j + 1]].sequenceIndex = i;
-            }
-        }
-    };
-    ScatterPlotVisualizerPolylines.prototype.createPolylines = function (scene) {
-        if (!this.dataSet || !this.dataSet.sequences) {
-            return;
-        }
-        this.updateSequenceIndicesInDataSet(this.dataSet);
-        this.polylines = [];
-        for (var i = 0; i < this.dataSet.sequences.length; i++) {
-            var geometry = new THREE.BufferGeometry();
-            geometry.addAttribute('position', this.polylinePositionBuffer[i]);
-            geometry.addAttribute('color', this.polylineColorBuffer[i]);
-            var material = new THREE.LineBasicMaterial({
-                linewidth: 1,
-                opacity: 1.0,
-                transparent: true,
-                vertexColors: THREE.VertexColors
-            });
-            var polyline = new THREE.LineSegments(geometry, material);
-            polyline.frustumCulled = false;
-            this.polylines.push(polyline);
-            scene.add(polyline);
-        }
-    };
-    ScatterPlotVisualizerPolylines.prototype.dispose = function () {
-        if (this.polylines == null) {
-            return;
-        }
-        for (var i = 0; i < this.polylines.length; i++) {
-            this.scene.remove(this.polylines[i]);
-            this.polylines[i].geometry.dispose();
-        }
-        this.polylines = null;
-        this.polylinePositionBuffer = {};
-        this.polylineColorBuffer = {};
-    };
-    ScatterPlotVisualizerPolylines.prototype.setScene = function (scene) {
-        this.scene = scene;
-    };
-    ScatterPlotVisualizerPolylines.prototype.setDataSet = function (dataSet) {
-        this.dataSet = dataSet;
-    };
-    ScatterPlotVisualizerPolylines.prototype.onPointPositionsChanged = function (newPositions) {
-        if ((newPositions == null) || (this.polylines != null)) {
-            this.dispose();
-        }
-        if ((newPositions == null) || (this.dataSet == null)) {
-            return;
-        }
-        // Set up the position buffer arrays for each polyline.
-        for (var i = 0; i < this.dataSet.sequences.length; i++) {
-            var sequence = this.dataSet.sequences[i];
-            var vertexCount = 2 * (sequence.pointIndices.length - 1);
-            var polylines = new Float32Array(vertexCount * XYZ_NUM_ELEMENTS);
-            this.polylinePositionBuffer[i] =
-                new THREE.BufferAttribute(polylines, XYZ_NUM_ELEMENTS);
-            var colors = new Float32Array(vertexCount * RGB_NUM_ELEMENTS);
-            this.polylineColorBuffer[i] =
-                new THREE.BufferAttribute(colors, RGB_NUM_ELEMENTS);
-        }
-        for (var i = 0; i < this.dataSet.sequences.length; i++) {
-            var sequence = this.dataSet.sequences[i];
-            var src = 0;
-            for (var j = 0; j < sequence.pointIndices.length - 1; j++) {
-                var p1Index = sequence.pointIndices[j];
-                var p2Index = sequence.pointIndices[j + 1];
-                var p1 = util.vector3FromPackedArray(newPositions, p1Index);
-                var p2 = util.vector3FromPackedArray(newPositions, p2Index);
-                this.polylinePositionBuffer[i].setXYZ(src, p1.x, p1.y, p1.z);
-                this.polylinePositionBuffer[i].setXYZ(src + 1, p2.x, p2.y, p2.z);
-                src += 2;
-            }
-            this.polylinePositionBuffer[i].needsUpdate = true;
-        }
-        if (this.polylines == null) {
-            this.createPolylines(this.scene);
-        }
-    };
-    ScatterPlotVisualizerPolylines.prototype.onRender = function (renderContext) {
-        if (this.polylines == null) {
-            return;
-        }
-        for (var i = 0; i < this.polylines.length; i++) {
-            this.polylines[i].material.opacity = renderContext.polylineOpacities[i];
-            this.polylines[i].material.linewidth =
-                renderContext.polylineWidths[i];
-            this.polylineColorBuffer[i].array = renderContext.polylineColors[i];
-            this.polylineColorBuffer[i].needsUpdate = true;
-        }
-    };
-    ScatterPlotVisualizerPolylines.prototype.onPickingRender = function (renderContext) { };
-    ScatterPlotVisualizerPolylines.prototype.onResize = function (newWidth, newHeight) { };
-    return ScatterPlotVisualizerPolylines;
-}());
-exports.ScatterPlotVisualizerPolylines = ScatterPlotVisualizerPolylines;
-
-},{"./util":24}],22:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var renderContext_1 = require('./renderContext');
-var util = require('./util');
-var NUM_POINTS_FOG_THRESHOLD = 5000;
-var MIN_POINT_SIZE = 5.0;
-var IMAGE_SIZE = 30;
-// Constants relating to the indices of buffer arrays.
-var RGB_NUM_ELEMENTS = 3;
-var INDEX_NUM_ELEMENTS = 1;
-var XYZ_NUM_ELEMENTS = 3;
-var VERTEX_SHADER = "\n  // Index of the specific vertex (passed in as bufferAttribute), and the\n  // variable that will be used to pass it to the fragment shader.\n  attribute float spriteIndex;\n  attribute vec3 color;\n  attribute float scaleFactor;\n\n  varying vec2 xyIndex;\n  varying vec3 vColor;\n\n  uniform bool sizeAttenuation;\n  uniform float pointSize;\n  uniform float spritesPerRow;\n  uniform float spritesPerColumn;\n\n  void main() {\n    // Pass index and color values to fragment shader.\n    vColor = color;\n    xyIndex = vec2(mod(spriteIndex, spritesPerRow),\n              floor(spriteIndex / spritesPerColumn));\n\n    // Transform current vertex by modelViewMatrix (model world position and\n    // camera world position matrix).\n    vec4 cameraSpacePos = modelViewMatrix * vec4(position, 1.0);\n\n    // Project vertex in camera-space to screen coordinates using the camera's\n    // projection matrix.\n    gl_Position = projectionMatrix * cameraSpacePos;\n\n    // Create size attenuation (if we're in 3D mode) by making the size of\n    // each point inversly proportional to its distance to the camera.\n    float outputPointSize = pointSize;\n    if (sizeAttenuation) {\n      outputPointSize = -pointSize / cameraSpacePos.z;\n    }\n\n    gl_PointSize =\n      max(outputPointSize * scaleFactor, " + MIN_POINT_SIZE.toFixed(1) + ");\n  }";
-var FRAGMENT_SHADER_POINT_TEST_CHUNK = "\n  bool point_in_unit_circle(vec2 spriteCoord) {\n    vec2 centerToP = spriteCoord - vec2(0.5, 0.5);\n    return dot(centerToP, centerToP) < (0.5 * 0.5);\n  }\n\n  bool point_in_unit_equilateral_triangle(vec2 spriteCoord) {\n    vec3 v0 = vec3(0, 1, 0);\n    vec3 v1 = vec3(0.5, 0, 0);\n    vec3 v2 = vec3(1, 1, 0);\n    vec3 p = vec3(spriteCoord, 0);\n    float p_in_v0_v1 = cross(v1 - v0, p - v0).z;\n    float p_in_v1_v2 = cross(v2 - v1, p - v1).z;\n    return (p_in_v0_v1 > 0.0) && (p_in_v1_v2 > 0.0);\n  }\n\n  bool point_in_unit_square(vec2 spriteCoord) {\n    return true;\n  }\n";
-var FRAGMENT_SHADER = "\n  varying vec2 xyIndex;\n  varying vec3 vColor;\n\n  uniform sampler2D texture;\n  uniform float spritesPerRow;\n  uniform float spritesPerColumn;\n  uniform bool isImage;\n\n  " + THREE.ShaderChunk['common'] + "\n  " + THREE.ShaderChunk['fog_pars_fragment'] + "\n  " + FRAGMENT_SHADER_POINT_TEST_CHUNK + "\n\n  void main() {\n    if (isImage) {\n      // Coordinates of the vertex within the entire sprite image.\n      vec2 coords =\n        (gl_PointCoord + xyIndex) / vec2(spritesPerRow, spritesPerColumn);\n      gl_FragColor = vec4(vColor, 1.0) * texture2D(texture, coords);\n    } else {\n      bool inside = point_in_unit_circle(gl_PointCoord);\n      if (!inside) {\n        discard;\n      }\n      gl_FragColor = vec4(vColor, 1);\n    }\n    " + THREE.ShaderChunk['fog_fragment'] + "\n  }";
-var FRAGMENT_SHADER_PICKING = "\n  varying vec2 xyIndex;\n  varying vec3 vColor;\n  uniform bool isImage;\n\n  " + FRAGMENT_SHADER_POINT_TEST_CHUNK + "\n\n  void main() {\n    xyIndex; // Silence 'unused variable' warning.\n    if (isImage) {\n      gl_FragColor = vec4(vColor, 1);\n    } else {\n      bool inside = point_in_unit_circle(gl_PointCoord);\n      if (!inside) {\n        discard;\n      }\n      gl_FragColor = vec4(vColor, 1);\n    }\n  }";
-/**
- * Uses GL point sprites to render the dataset.
- */
-var ScatterPlotVisualizerSprites = (function () {
-    function ScatterPlotVisualizerSprites() {
-        this.texture = null;
-        this.standinTextureForPoints =
-            util.createTexture(document.createElement('canvas'));
-        this.renderMaterial = this.createRenderMaterial(false);
-        this.pickingMaterial = this.createPickingMaterial(false);
-    }
-    ScatterPlotVisualizerSprites.prototype.createTextureFromSpriteAtlas = function (spriteAtlas, spriteDimensions, spriteIndices) {
-        this.texture = util.createTexture(spriteAtlas);
-        this.spritesPerRow = spriteAtlas.width / spriteDimensions[0];
-        this.spritesPerColumn = spriteAtlas.height / spriteDimensions[1];
-        this.spriteDimensions = spriteDimensions;
-        this.spriteIndexBufferAttribute =
-            new THREE.BufferAttribute(spriteIndices, INDEX_NUM_ELEMENTS);
-        if (this.points != null) {
-            this.points.geometry
-                .addAttribute('spriteIndex', this.spriteIndexBufferAttribute);
-        }
-    };
-    ScatterPlotVisualizerSprites.prototype.createUniforms = function () {
-        return {
-            texture: { type: 't' },
-            spritesPerRow: { type: 'f' },
-            spritesPerColumn: { type: 'f' },
-            fogColor: { type: 'c' },
-            fogNear: { type: 'f' },
-            fogFar: { type: 'f' },
-            isImage: { type: 'bool' },
-            sizeAttenuation: { type: 'bool' },
-            pointSize: { type: 'f' }
-        };
-    };
-    ScatterPlotVisualizerSprites.prototype.createRenderMaterial = function (haveImage) {
-        var uniforms = this.createUniforms();
-        return new THREE.ShaderMaterial({
-            uniforms: uniforms,
-            vertexShader: VERTEX_SHADER,
-            fragmentShader: FRAGMENT_SHADER,
-            transparent: !haveImage,
-            depthTest: haveImage,
-            depthWrite: haveImage,
-            fog: true,
-            blending: THREE.MultiplyBlending,
-        });
-    };
-    ScatterPlotVisualizerSprites.prototype.createPickingMaterial = function (haveImage) {
-        var uniforms = this.createUniforms();
-        return new THREE.ShaderMaterial({
-            uniforms: uniforms,
-            vertexShader: VERTEX_SHADER,
-            fragmentShader: FRAGMENT_SHADER_PICKING,
-            transparent: true,
-            depthTest: true,
-            depthWrite: true,
-            fog: false,
-            blending: THREE.NormalBlending,
-        });
-    };
-    /**
-     * Create points, set their locations and actually instantiate the
-     * geometry.
-     */
-    ScatterPlotVisualizerSprites.prototype.createPointSprites = function (scene, positions) {
-        var pointCount = (positions != null) ? (positions.length / XYZ_NUM_ELEMENTS) : 0;
-        var geometry = this.createGeometry(pointCount);
-        this.fog = new THREE.Fog(0xFFFFFF); // unused value, gets overwritten.
-        this.points = new THREE.Points(geometry, this.renderMaterial);
-        this.points.frustumCulled = false;
-        if (this.spriteIndexBufferAttribute != null) {
-            this.points.geometry
-                .addAttribute('spriteIndex', this.spriteIndexBufferAttribute);
-        }
-        scene.add(this.points);
-    };
-    ScatterPlotVisualizerSprites.prototype.calculatePointSize = function (sceneIs3D) {
-        if (this.texture != null) {
-            return sceneIs3D ? IMAGE_SIZE : this.spriteDimensions[0];
-        }
-        var n = (this.worldSpacePointPositions != null) ?
-            (this.worldSpacePointPositions.length / XYZ_NUM_ELEMENTS) :
-            1;
-        var SCALE = 200;
-        var LOG_BASE = 8;
-        var DIVISOR = 1.5;
-        // Scale point size inverse-logarithmically to the number of points.
-        var pointSize = SCALE / Math.log(n) / Math.log(LOG_BASE);
-        return sceneIs3D ? pointSize : (pointSize / DIVISOR);
-    };
-    /**
-     * Set up buffer attributes to be used for the points/images.
-     */
-    ScatterPlotVisualizerSprites.prototype.createGeometry = function (pointCount) {
-        var n = pointCount;
-        // Fill pickingColors with each point's unique id as its color.
-        this.pickingColors = new Float32Array(n * RGB_NUM_ELEMENTS);
-        {
-            var dst = 0;
-            for (var i = 0; i < n; i++) {
-                var c = new THREE.Color(i);
-                this.pickingColors[dst++] = c.r;
-                this.pickingColors[dst++] = c.g;
-                this.pickingColors[dst++] = c.b;
-            }
-        }
-        var geometry = new THREE.BufferGeometry();
-        geometry.addAttribute('position', new THREE.BufferAttribute(null, XYZ_NUM_ELEMENTS));
-        geometry.addAttribute('color', new THREE.BufferAttribute(null, RGB_NUM_ELEMENTS));
-        geometry.addAttribute('scaleFactor', new THREE.BufferAttribute(null, INDEX_NUM_ELEMENTS));
-        return geometry;
-    };
-    ScatterPlotVisualizerSprites.prototype.setFogDistances = function (sceneIs3D, nearestPointZ, farthestPointZ) {
-        if (sceneIs3D) {
-            var n = this.worldSpacePointPositions.length / XYZ_NUM_ELEMENTS;
-            this.fog.near = nearestPointZ;
-            // If there are fewer points we want less fog. We do this
-            // by making the "far" value (that is, the distance from the camera to the
-            // far edge of the fog) proportional to the number of points.
-            var multiplier = 2 - Math.min(n, NUM_POINTS_FOG_THRESHOLD) / NUM_POINTS_FOG_THRESHOLD;
-            this.fog.far = farthestPointZ * multiplier;
-        }
-        else {
-            this.fog.near = Infinity;
-            this.fog.far = Infinity;
-        }
-    };
-    ScatterPlotVisualizerSprites.prototype.dispose = function () {
-        this.disposeGeometry();
-        this.disposeTextureAtlas();
-    };
-    ScatterPlotVisualizerSprites.prototype.disposeGeometry = function () {
-        if (this.points != null) {
-            this.scene.remove(this.points);
-            this.points.geometry.dispose();
-            this.points = null;
-            this.worldSpacePointPositions = null;
-        }
-    };
-    ScatterPlotVisualizerSprites.prototype.disposeTextureAtlas = function () {
-        if (this.texture != null) {
-            this.texture.dispose();
-        }
-        this.texture = null;
-        this.renderMaterial = null;
-        this.pickingMaterial = null;
-    };
-    ScatterPlotVisualizerSprites.prototype.setScene = function (scene) {
-        this.scene = scene;
-    };
-    ScatterPlotVisualizerSprites.prototype.setSpriteAtlas = function (spriteImage, spriteDimensions, spriteIndices) {
-        this.disposeTextureAtlas();
-        this.createTextureFromSpriteAtlas(spriteImage, spriteDimensions, spriteIndices);
-        this.renderMaterial = this.createRenderMaterial(true);
-        this.pickingMaterial = this.createPickingMaterial(true);
-    };
-    ScatterPlotVisualizerSprites.prototype.clearSpriteAtlas = function () {
-        this.disposeTextureAtlas();
-        this.renderMaterial = this.createRenderMaterial(false);
-        this.pickingMaterial = this.createPickingMaterial(false);
-    };
-    ScatterPlotVisualizerSprites.prototype.onPointPositionsChanged = function (newPositions) {
-        if ((newPositions == null) || (newPositions.length === 0)) {
-            this.dispose();
-            return;
-        }
-        if (this.points != null) {
-            if (this.worldSpacePointPositions.length !== newPositions.length) {
-                this.disposeGeometry();
-            }
-        }
-        this.worldSpacePointPositions = newPositions;
-        if (this.points == null) {
-            this.createPointSprites(this.scene, newPositions);
-        }
-        var positions = this.points.geometry
-            .getAttribute('position');
-        positions.array = newPositions;
-        positions.needsUpdate = true;
-    };
-    ScatterPlotVisualizerSprites.prototype.onPickingRender = function (rc) {
-        if (this.points == null) {
-            return;
-        }
-        var sceneIs3D = (rc.cameraType === renderContext_1.CameraType.Perspective);
-        this.pickingMaterial.uniforms.spritesPerRow.value = this.spritesPerRow;
-        this.pickingMaterial.uniforms.spritesPerRow.value = this.spritesPerColumn;
-        this.pickingMaterial.uniforms.sizeAttenuation.value = sceneIs3D;
-        this.pickingMaterial.uniforms.pointSize.value =
-            this.calculatePointSize(sceneIs3D);
-        this.points.material = this.pickingMaterial;
-        var colors = this.points.geometry
-            .getAttribute('color');
-        colors.array = this.pickingColors;
-        colors.needsUpdate = true;
-        var scaleFactors = this.points.geometry
-            .getAttribute('scaleFactor');
-        scaleFactors.array = rc.pointScaleFactors;
-        scaleFactors.needsUpdate = true;
-    };
-    ScatterPlotVisualizerSprites.prototype.onRender = function (rc) {
-        if (!this.points) {
-            return;
-        }
-        var sceneIs3D = (rc.camera instanceof THREE.PerspectiveCamera);
-        this.setFogDistances(sceneIs3D, rc.nearestCameraSpacePointZ, rc.farthestCameraSpacePointZ);
-        this.scene.fog = this.fog;
-        this.scene.fog.color = new THREE.Color(rc.backgroundColor);
-        this.renderMaterial.uniforms.fogColor.value = this.scene.fog.color;
-        this.renderMaterial.uniforms.fogNear.value = this.fog.near;
-        this.renderMaterial.uniforms.fogFar.value = this.fog.far;
-        this.renderMaterial.uniforms.spritesPerRow.value = this.spritesPerRow;
-        this.renderMaterial.uniforms.spritesPerColumn.value = this.spritesPerColumn;
-        this.renderMaterial.uniforms.isImage.value = (this.texture != null);
-        this.renderMaterial.uniforms.texture.value =
-            (this.texture != null) ? this.texture : this.standinTextureForPoints;
-        this.renderMaterial.uniforms.sizeAttenuation.value = sceneIs3D;
-        this.renderMaterial.uniforms.pointSize.value =
-            this.calculatePointSize(sceneIs3D);
-        this.points.material = this.renderMaterial;
-        var colors = this.points.geometry
-            .getAttribute('color');
-        this.renderColors = rc.pointColors;
-        colors.array = this.renderColors;
-        colors.needsUpdate = true;
-        var scaleFactors = this.points.geometry
-            .getAttribute('scaleFactor');
-        scaleFactors.array = rc.pointScaleFactors;
-        scaleFactors.needsUpdate = true;
-    };
-    ScatterPlotVisualizerSprites.prototype.onResize = function (newWidth, newHeight) { };
-    return ScatterPlotVisualizerSprites;
-}());
-exports.ScatterPlotVisualizerSprites = ScatterPlotVisualizerSprites;
-
-},{"./renderContext":15,"./util":24}],23:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-/**
- * A Space-partitioning tree (https://en.wikipedia.org/wiki/Space_partitioning)
- * that recursively divides the space into regions of equal sizes. This data
- * structure can act both as a Quad tree and an Octree when the data is 2 or
- * 3 dimensional respectively. One usage is in t-SNE in order to do Barnes-Hut
- * approximation.
- */
-var SPTree = (function () {
-    /**
-     * Constructs a new tree with the provided data.
-     *
-     * @param data List of n-dimensional data points.
-     * @param capacity Number of data points to store in a single node.
-     */
-    function SPTree(data) {
-        if (data.length < 1) {
-            throw new Error('There should be at least 1 data point');
-        }
-        // Make a bounding box based on the extent of the data.
-        this.dim = data[0].length;
-        // Each node has 2^d children, where d is the dimension of the space.
-        // Binary masks (e.g. 000, 001, ... 111 in 3D) are used to determine in
-        // which child (e.g. quadron in 2D) the new point is going to be assigned.
-        // For more details, see the insert() method and its comments.
-        this.masks = new Array(Math.pow(2, this.dim));
-        for (var d = 0; d < this.masks.length; ++d) {
-            this.masks[d] = (1 << d);
-        }
-        var min = new Array(this.dim);
-        fillArray(min, Number.POSITIVE_INFINITY);
-        var max = new Array(this.dim);
-        fillArray(max, Number.NEGATIVE_INFINITY);
-        for (var i = 0; i < data.length; ++i) {
-            // For each dim get the min and max.
-            // E.g. For 2-D, get the x_min, x_max, y_min, y_max.
-            for (var d = 0; d < this.dim; ++d) {
-                min[d] = Math.min(min[d], data[i][d]);
-                max[d] = Math.max(max[d], data[i][d]);
-            }
-        }
-        // Create a bounding box with the center of the largest span.
-        var center = new Array(this.dim);
-        var halfDim = 0;
-        for (var d = 0; d < this.dim; ++d) {
-            var span = max[d] - min[d];
-            center[d] = min[d] + span / 2;
-            halfDim = Math.max(halfDim, span / 2);
-        }
-        this.root = { box: { center: center, halfDim: halfDim }, point: data[0] };
-        for (var i = 1; i < data.length; ++i) {
-            this.insert(this.root, data[i]);
-        }
-    }
-    /**
-     * Visits every node in the tree. Each node can store 1 or more points,
-     * depending on the node capacity provided in the constructor.
-     *
-     * @param accessor Method that takes the currently visited node, and the
-     * low and high point of the region that this node occupies. E.g. in 2D,
-     * the low and high points will be the lower-left corner and the upper-right
-     * corner.
-     */
-    SPTree.prototype.visit = function (accessor, noBox) {
-        if (noBox === void 0) { noBox = false; }
-        this.visitNode(this.root, accessor, noBox);
-    };
-    SPTree.prototype.visitNode = function (node, accessor, noBox) {
-        var skipChildren;
-        if (noBox) {
-            skipChildren = accessor(node);
-        }
-        else {
-            var lowPoint = new Array(this.dim);
-            var highPoint = new Array(this.dim);
-            for (var d = 0; d < this.dim; ++d) {
-                lowPoint[d] = node.box.center[d] - node.box.halfDim;
-                highPoint[d] = node.box.center[d] + node.box.halfDim;
-            }
-            skipChildren = accessor(node, lowPoint, highPoint);
-        }
-        if (!node.children || skipChildren) {
-            return;
-        }
-        for (var i = 0; i < node.children.length; ++i) {
-            var child = node.children[i];
-            if (child) {
-                this.visitNode(child, accessor, noBox);
-            }
-        }
-    };
-    SPTree.prototype.insert = function (node, p) {
-        // Subdivide and then add the point to whichever node will accept it.
-        if (node.children == null) {
-            node.children = new Array(this.masks.length);
-        }
-        // Decide which child will get the new point by constructing a D-bits binary
-        // signature (D=3 for 3D) where the k-th bit is 1 if the point's k-th
-        // coordinate is greater than the node's k-th coordinate, 0 otherwise.
-        // Then the binary signature in decimal system gives us the index of the
-        // child where the new point should be.
-        var index = 0;
-        for (var d = 0; d < this.dim; ++d) {
-            if (p[d] > node.box.center[d]) {
-                index |= this.masks[d];
-            }
-        }
-        if (node.children[index] == null) {
-            this.makeChild(node, index, p);
-        }
-        else {
-            this.insert(node.children[index], p);
-        }
-    };
-    SPTree.prototype.makeChild = function (node, index, p) {
-        var oldC = node.box.center;
-        var h = node.box.halfDim / 2;
-        var newC = new Array(this.dim);
-        for (var d = 0; d < this.dim; ++d) {
-            newC[d] = (index & (1 << d)) ? oldC[d] + h : oldC[d] - h;
-        }
-        node.children[index] = { box: { center: newC, halfDim: h }, point: p };
-    };
-    return SPTree;
-}());
-exports.SPTree = SPTree;
-function fillArray(arr, value) {
-    for (var i = 0; i < arr.length; ++i) {
-        arr[i] = value;
-    }
-}
-
-},{}],24:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var logging = require('./logging');
-/**
- * Delay for running expensive tasks, in milliseconds.
- * The duration was empirically found so that it leaves enough time for the
- * browser to update its UI state before starting an expensive UI-blocking task.
- */
-var TASK_DELAY_MS = 200;
-/** Shuffles the array in-place in O(n) time using Fisher-Yates algorithm. */
-function shuffle(array) {
-    var m = array.length;
-    var t;
-    var i;
-    // While there remain elements to shuffle.
-    while (m) {
-        // Pick a remaining element
-        i = Math.floor(Math.random() * m--);
-        // And swap it with the current element.
-        t = array[m];
-        array[m] = array[i];
-        array[i] = t;
-    }
-    return array;
-}
-exports.shuffle = shuffle;
-/** Projects a 3d point into screen space */
-function vector3DToScreenCoords(cam, w, h, v) {
-    var dpr = window.devicePixelRatio;
-    var pv = new THREE.Vector3().copy(v).project(cam);
-    // The screen-space origin is at the middle of the screen, with +y up.
-    var coords = [((pv.x + 1) / 2 * w) * dpr, -((pv.y - 1) / 2 * h) * dpr];
-    return coords;
-}
-exports.vector3DToScreenCoords = vector3DToScreenCoords;
-/** Loads 3 contiguous elements from a packed xyz array into a Vector3. */
-function vector3FromPackedArray(a, pointIndex) {
-    var offset = pointIndex * 3;
-    return new THREE.Vector3(a[offset], a[offset + 1], a[offset + 2]);
-}
-exports.vector3FromPackedArray = vector3FromPackedArray;
-/**
- * Gets the camera-space z coordinates of the nearest and farthest points.
- * Ignores points that are behind the camera.
- */
-function getNearFarPoints(worldSpacePoints, cameraPos, cameraTarget) {
-    var shortestDist = Infinity;
-    var furthestDist = 0;
-    var camToTarget = new THREE.Vector3().copy(cameraTarget).sub(cameraPos);
-    var camPlaneNormal = new THREE.Vector3().copy(camToTarget).normalize();
-    var n = worldSpacePoints.length / 3;
-    var src = 0;
-    var p = new THREE.Vector3();
-    var camToPoint = new THREE.Vector3();
-    for (var i = 0; i < n; i++) {
-        p.x = worldSpacePoints[src];
-        p.y = worldSpacePoints[src + 1];
-        p.z = worldSpacePoints[src + 2];
-        src += 3;
-        camToPoint.copy(p).sub(cameraPos);
-        var dist = camPlaneNormal.dot(camToPoint);
-        if (dist < 0) {
-            continue;
-        }
-        furthestDist = (dist > furthestDist) ? dist : furthestDist;
-        shortestDist = (dist < shortestDist) ? dist : shortestDist;
-    }
-    return [shortestDist, furthestDist];
-}
-exports.getNearFarPoints = getNearFarPoints;
-/**
- * Generate a texture for the points/images and sets some initial params
- */
-function createTexture(image) {
-    var tex = new THREE.Texture(image);
-    tex.needsUpdate = true;
-    // Used if the texture isn't a power of 2.
-    tex.minFilter = THREE.LinearFilter;
-    tex.generateMipmaps = false;
-    tex.flipY = false;
-    return tex;
-}
-exports.createTexture = createTexture;
-/**
- * Assert that the condition is satisfied; if not, log user-specified message
- * to the console.
- */
-function assert(condition, message) {
-    if (!condition) {
-        message = message || 'Assertion failed';
-        throw new Error(message);
-    }
-}
-exports.assert = assert;
-function getSearchPredicate(query, inRegexMode, fieldName) {
-    var predicate;
-    if (inRegexMode) {
-        var regExp_1 = new RegExp(query, 'i');
-        predicate = function (p) { return regExp_1.test(p.metadata[fieldName].toString()); };
-    }
-    else {
-        // Doing a case insensitive substring match.
-        query = query.toLowerCase();
-        predicate = function (p) {
-            var label = p.metadata[fieldName].toString().toLowerCase();
-            return label.indexOf(query) >= 0;
-        };
-    }
-    return predicate;
-}
-exports.getSearchPredicate = getSearchPredicate;
-/**
- * Runs an expensive task asynchronously with some delay
- * so that it doesn't block the UI thread immediately.
- *
- * @param message The message to display to the user.
- * @param task The expensive task to run.
- * @param msgId Optional. ID of an existing message. If provided, will overwrite
- *     an existing message and won't automatically clear the message when the
- *     task is done.
- * @return The value returned by the task.
- */
-function runAsyncTask(message, task, msgId) {
-    if (msgId === void 0) { msgId = null; }
-    var autoClear = (msgId == null);
-    msgId = logging.setModalMessage(message, msgId);
-    return new Promise(function (resolve, reject) {
-        d3.timer(function () {
-            try {
-                var result = task();
-                // Clearing the old message.
-                if (autoClear) {
-                    logging.setModalMessage(null, msgId);
-                }
-                resolve(result);
-            }
-            catch (ex) {
-                reject(ex);
-            }
-            return true;
-        }, TASK_DELAY_MS);
-    });
-}
-exports.runAsyncTask = runAsyncTask;
-/**
- * Parses the URL for query parameters, e.g. ?foo=1&bar=2 will return
- *   {'foo': '1', 'bar': '2'}.
- * @param url The URL to parse.
- * @return A map of queryParam key to its value.
- */
-function getURLParams(url) {
-    if (!url) {
-        return {};
-    }
-    var queryString = url.indexOf('?') !== -1 ? url.split('?')[1] : url;
-    if (queryString.indexOf('#')) {
-        queryString = queryString.split('#')[0];
-    }
-    var queryEntries = queryString.split('&');
-    var queryParams = {};
-    for (var i = 0; i < queryEntries.length; i++) {
-        var queryEntryComponents = queryEntries[i].split('=');
-        queryParams[queryEntryComponents[0].toLowerCase()] =
-            decodeURIComponent(queryEntryComponents[1]);
-    }
-    return queryParams;
-}
-exports.getURLParams = getURLParams;
-/** List of substrings that auto generated tensors have in their name. */
-var SUBSTR_GEN_TENSORS = ['/Adagrad'];
-/** Returns true if the tensor was automatically generated by TF API calls. */
-function tensorIsGenerated(tensorName) {
-    for (var i = 0; i < SUBSTR_GEN_TENSORS.length; i++) {
-        if (tensorName.indexOf(SUBSTR_GEN_TENSORS[i]) >= 0) {
-            return true;
-        }
-    }
-    return false;
-}
-exports.tensorIsGenerated = tensorIsGenerated;
-function xor(cond1, cond2) {
-    return (cond1 || cond2) && !(cond1 && cond2);
-}
-exports.xor = xor;
-/** Checks to see if the browser supports webgl. */
-function hasWebGLSupport() {
-    try {
-        var c = document.createElement('canvas');
-        var gl = c.getContext('webgl') || c.getContext('experimental-webgl');
-        return gl != null && typeof weblas !== 'undefined';
-    }
-    catch (e) {
-        return false;
-    }
-}
-exports.hasWebGLSupport = hasWebGLSupport;
-
-},{"./logging":12}],25:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var util_1 = require('./util');
-/** Returns the dot product of two vectors. */
-function dot(a, b) {
-    util_1.assert(a.length === b.length, 'Vectors a and b must be of same length');
-    var result = 0;
-    for (var i = 0; i < a.length; ++i) {
-        result += a[i] * b[i];
-    }
-    return result;
-}
-exports.dot = dot;
-/** Sums all the elements in the vector */
-function sum(a) {
-    var result = 0;
-    for (var i = 0; i < a.length; ++i) {
-        result += a[i];
-    }
-    return result;
-}
-exports.sum = sum;
-/** Returns the sum of two vectors, i.e. a + b */
-function add(a, b) {
-    util_1.assert(a.length === b.length, 'Vectors a and b must be of same length');
-    var result = new Float32Array(a.length);
-    for (var i = 0; i < a.length; ++i) {
-        result[i] = a[i] + b[i];
-    }
-    return result;
-}
-exports.add = add;
-/** Subtracts vector b from vector a, i.e. returns a - b */
-function sub(a, b) {
-    util_1.assert(a.length === b.length, 'Vectors a and b must be of same length');
-    var result = new Float32Array(a.length);
-    for (var i = 0; i < a.length; ++i) {
-        result[i] = a[i] - b[i];
-    }
-    return result;
-}
-exports.sub = sub;
-/** Returns the square norm of the vector */
-function norm2(a) {
-    var result = 0;
-    for (var i = 0; i < a.length; ++i) {
-        result += a[i] * a[i];
-    }
-    return result;
-}
-exports.norm2 = norm2;
-/** Returns the euclidean distance between two vectors. */
-function dist(a, b) {
-    return Math.sqrt(dist2(a, b));
-}
-exports.dist = dist;
-/** Returns the square euclidean distance between two vectors. */
-function dist2(a, b) {
-    util_1.assert(a.length === b.length, 'Vectors a and b must be of same length');
-    var result = 0;
-    for (var i = 0; i < a.length; ++i) {
-        var diff = a[i] - b[i];
-        result += diff * diff;
-    }
-    return result;
-}
-exports.dist2 = dist2;
-/** Returns the square euclidean distance between two 2D points. */
-function dist2_2D(a, b) {
-    var dX = a[0] - b[0];
-    var dY = a[1] - b[1];
-    return dX * dX + dY * dY;
-}
-exports.dist2_2D = dist2_2D;
-/** Returns the square euclidean distance between two 3D points. */
-function dist2_3D(a, b) {
-    var dX = a[0] - b[0];
-    var dY = a[1] - b[1];
-    var dZ = a[2] - b[2];
-    return dX * dX + dY * dY + dZ * dZ;
-}
-exports.dist2_3D = dist2_3D;
-/** Returns the euclidean distance between 2 3D points. */
-function dist_3D(a, b) {
-    return Math.sqrt(dist2_3D(a, b));
-}
-exports.dist_3D = dist_3D;
-/**
- * Returns the square euclidean distance between two vectors, with an early
- * exit (returns -1) if the distance is >= to the provided limit.
- */
-function dist2WithLimit(a, b, limit) {
-    util_1.assert(a.length === b.length, 'Vectors a and b must be of same length');
-    var result = 0;
-    for (var i = 0; i < a.length; ++i) {
-        var diff = a[i] - b[i];
-        result += diff * diff;
-        if (result >= limit) {
-            return -1;
-        }
-    }
-    return result;
-}
-exports.dist2WithLimit = dist2WithLimit;
-/** Returns the square euclidean distance between two 2D points. */
-function dist22D(a, b) {
-    var dX = a[0] - b[0];
-    var dY = a[1] - b[1];
-    return dX * dX + dY * dY;
-}
-exports.dist22D = dist22D;
-/** Modifies the vector in-place to have unit norm. */
-function unit(a) {
-    var norm = Math.sqrt(norm2(a));
-    util_1.assert(norm >= 0, 'Norm of the vector must be > 0');
-    for (var i = 0; i < a.length; ++i) {
-        a[i] /= norm;
-    }
-}
-exports.unit = unit;
-/**
- *  Projects the vectors to a lower dimension
- *
- * @param vectors Array of vectors to be projected.
- * @param newDim The resulting dimension of the vectors.
- */
-function projectRandom(vectors, newDim) {
-    var dim = vectors[0].length;
-    var N = vectors.length;
-    var newVectors = new Array(N);
-    for (var i = 0; i < N; ++i) {
-        newVectors[i] = new Float32Array(newDim);
-    }
-    // Make nDim projections.
-    for (var k = 0; k < newDim; ++k) {
-        var randomVector = rn(dim);
-        for (var i = 0; i < N; ++i) {
-            newVectors[i][k] = dot(vectors[i], randomVector);
-        }
-    }
-    return newVectors;
-}
-exports.projectRandom = projectRandom;
-/**
- * Projects a vector onto a 2D plane specified by the two direction vectors.
- */
-function project2d(a, dir1, dir2) {
-    return [dot(a, dir1), dot(a, dir2)];
-}
-exports.project2d = project2d;
-/**
- * Computes the centroid of the data points. If the provided data points are not
- * vectors, an accessor function needs to be provided.
- */
-function centroid(dataPoints, accessor) {
-    if (dataPoints.length === 0) {
-        return null;
-    }
-    if (accessor == null) {
-        accessor = function (a) { return a; };
-    }
-    util_1.assert(dataPoints.length >= 0, '`vectors` must be of length >= 1');
-    var centroid = new Float32Array(accessor(dataPoints[0]).length);
-    for (var i = 0; i < dataPoints.length; ++i) {
-        var dataPoint = dataPoints[i];
-        var vector = accessor(dataPoint);
-        for (var j = 0; j < centroid.length; ++j) {
-            centroid[j] += vector[j];
-        }
-    }
-    for (var j = 0; j < centroid.length; ++j) {
-        centroid[j] /= dataPoints.length;
-    }
-    return centroid;
-}
-exports.centroid = centroid;
-/**
- * Generates a vector of the specified size where each component is drawn from
- * a random (0, 1) gaussian distribution.
- */
-function rn(size) {
-    var normal = d3.random.normal();
-    var result = new Float32Array(size);
-    for (var i = 0; i < size; ++i) {
-        result[i] = normal();
-    }
-    return result;
-}
-exports.rn = rn;
-/**
- * Returns the cosine distance ([0, 2]) between two vectors
- * that have been normalized to unit norm.
- */
-function cosDistNorm(a, b) {
-    return 1 - dot(a, b);
-}
-exports.cosDistNorm = cosDistNorm;
-/**
- * Returns the cosine distance ([0, 2]) between two vectors.
- */
-function cosDist(a, b) {
-    return 1 - cosSim(a, b);
-}
-exports.cosDist = cosDist;
-/** Returns the cosine similarity ([-1, 1]) between two vectors. */
-function cosSim(a, b) {
-    return dot(a, b) / Math.sqrt(norm2(a) * norm2(b));
-}
-exports.cosSim = cosSim;
-/**
- * Converts list of vectors (matrix) into a 1-dimensional
- * typed array with row-first order.
- */
-function toTypedArray(dataPoints, accessor) {
-    var N = dataPoints.length;
-    var dim = accessor(dataPoints[0]).length;
-    var result = new Float32Array(N * dim);
-    for (var i = 0; i < N; ++i) {
-        var vector = accessor(dataPoints[i]);
-        for (var d = 0; d < dim; ++d) {
-            result[i * dim + d] = vector[d];
-        }
-    }
-    return result;
-}
-exports.toTypedArray = toTypedArray;
-/**
- * Transposes an RxC matrix represented as a flat typed array
- * into a CxR matrix, again represented as a flat typed array.
- */
-function transposeTypedArray(r, c, typedArray) {
-    var result = new Float32Array(r * c);
-    for (var i = 0; i < r; ++i) {
-        for (var j = 0; j < c; ++j) {
-            result[j * r + i] = typedArray[i * c + j];
-        }
-    }
-    return result;
-}
-exports.transposeTypedArray = transposeTypedArray;
-
-},{"./util":24}],26:[function(require,module,exports){
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var logging = require('./logging');
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-// tslint:disable-next-line
-exports.BookmarkPanelPolymer = vz_projector_util_1.PolymerElement({
-    is: 'vz-projector-bookmark-panel',
-    properties: {
-        savedStates: Object,
-        // Keep a separate polymer property because the savedStates doesn't change
-        // when adding and removing states.
-        hasStates: { type: Boolean, value: false },
-        selectedState: Number
-    }
-});
-var BookmarkPanel = (function (_super) {
-    __extends(BookmarkPanel, _super);
-    function BookmarkPanel() {
-        _super.apply(this, arguments);
-        this.hasStates = false;
-    }
-    BookmarkPanel.prototype.ready = function () {
-        this.dom = d3.select(this);
-        this.savedStates = [];
-        this.setupUploadButton();
-        this.ignoreNextProjectionEvent = false;
-    };
-    BookmarkPanel.prototype.initialize = function (projector, projectorEventContext) {
-        var _this = this;
-        this.projector = projector;
-        projectorEventContext.registerProjectionChangedListener(function () {
-            if (_this.ignoreNextProjectionEvent) {
-                _this.ignoreNextProjectionEvent = false;
-            }
-            else {
-                _this.clearStateSelection();
-            }
-        });
-    };
-    BookmarkPanel.prototype.setSelectedTensor = function (run, tensorInfo, dataProvider) {
-        var _this = this;
-        // Clear any existing bookmarks.
-        this.addStates(null);
-        if (tensorInfo && tensorInfo.bookmarksPath) {
-            // Get any bookmarks that may come when the projector starts up.
-            dataProvider.getBookmarks(run, tensorInfo.tensorName, function (bookmarks) {
-                _this.addStates(bookmarks);
-                _this._expandMore();
-            });
-        }
-        else {
-            this._expandLess();
-        }
-    };
-    /** Handles a click on show bookmarks tray button. */
-    BookmarkPanel.prototype._expandMore = function () {
-        this.$.panel.show();
-        this.dom.select('#expand-more').style('display', 'none');
-        this.dom.select('#expand-less').style('display', '');
-    };
-    /** Handles a click on hide bookmarks tray button. */
-    BookmarkPanel.prototype._expandLess = function () {
-        this.$.panel.hide();
-        this.dom.select('#expand-more').style('display', '');
-        this.dom.select('#expand-less').style('display', 'none');
-    };
-    /** Handles a click on the add bookmark button. */
-    BookmarkPanel.prototype._addBookmark = function () {
-        var currentState = this.projector.getCurrentState();
-        currentState.label = 'State ' + this.savedStates.length;
-        currentState.isSelected = true;
-        this.selectedState = this.savedStates.length;
-        for (var i = 0; i < this.savedStates.length; i++) {
-            this.savedStates[i].isSelected = false;
-            // We have to call notifyPath so that polymer knows this element was
-            // updated.
-            this.notifyPath('savedStates.' + i + '.isSelected', false, false);
-        }
-        this.push('savedStates', currentState);
-        this.updateHasStates();
-    };
-    /** Handles a click on the download bookmarks button. */
-    BookmarkPanel.prototype._downloadFile = function () {
-        var serializedState = this.serializeAllSavedStates();
-        var blob = new Blob([serializedState], { type: 'text/plain' });
-        var textFile = window.URL.createObjectURL(blob);
-        // Force a download.
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style.display = 'none';
-        a.href = textFile;
-        a.download = 'state';
-        a.click();
-        document.body.removeChild(a);
-        window.URL.revokeObjectURL(textFile);
-    };
-    /** Handles a click on the upload bookmarks button. */
-    BookmarkPanel.prototype._uploadFile = function () {
-        var fileInput = this.dom.select('#state-file');
-        fileInput.node().click();
-    };
-    BookmarkPanel.prototype.setupUploadButton = function () {
-        var _this = this;
-        // Show and setup the load view button.
-        var fileInput = this.dom.select('#state-file');
-        fileInput.on('change', function () {
-            var file = d3.event.target.files[0];
-            // Clear out the value of the file chooser. This ensures that if the user
-            // selects the same file, we'll re-read it.
-            d3.event.target.value = '';
-            var fileReader = new FileReader();
-            fileReader.onload = function (evt) {
-                var str = evt.target.result;
-                var savedStates = JSON.parse(str);
-                // Verify the bookmarks match.
-                if (_this.savedStatesValid(savedStates)) {
-                    _this.addStates(savedStates);
-                    _this.loadSavedState(0);
-                }
-                else {
-                    logging.setWarningMessage("Unable to load bookmarks: wrong dataset, expected dataset " +
-                        ("with shape (" + savedStates[0].dataSetDimensions + ")."));
-                }
-            };
-            fileReader.readAsText(file);
-        });
-    };
-    BookmarkPanel.prototype.addStates = function (savedStates) {
-        if (savedStates == null) {
-            this.savedStates = [];
-        }
-        else {
-            for (var i = 0; i < savedStates.length; i++) {
-                savedStates[i].isSelected = false;
-                this.push('savedStates', savedStates[i]);
-            }
-        }
-        this.updateHasStates();
-    };
-    /** Deselects any selected state selection. */
-    BookmarkPanel.prototype.clearStateSelection = function () {
-        for (var i = 0; i < this.savedStates.length; i++) {
-            this.setSelectionState(i, false);
-        }
-    };
-    /** Handles a radio button click on a saved state. */
-    BookmarkPanel.prototype._radioButtonHandler = function (evt) {
-        var index = this.getParentDataIndex(evt);
-        this.loadSavedState(index);
-        this.setSelectionState(index, true);
-    };
-    BookmarkPanel.prototype.loadSavedState = function (index) {
-        for (var i = 0; i < this.savedStates.length; i++) {
-            if (this.savedStates[i].isSelected) {
-                this.setSelectionState(i, false);
-            }
-            else if (index === i) {
-                this.setSelectionState(i, true);
-                this.ignoreNextProjectionEvent = true;
-                this.projector.loadState(this.savedStates[i]);
-            }
-        }
-    };
-    BookmarkPanel.prototype.setSelectionState = function (stateIndex, selected) {
-        this.savedStates[stateIndex].isSelected = selected;
-        var path = 'savedStates.' + stateIndex + '.isSelected';
-        this.notifyPath(path, selected, false);
-    };
-    /**
-     * Crawls up the DOM to find an ancestor with a data-index attribute. This is
-     * used to match events to their bookmark index.
-     */
-    BookmarkPanel.prototype.getParentDataIndex = function (evt) {
-        for (var i = 0; i < evt.path.length; i++) {
-            var dataIndex = evt.path[i].getAttribute('data-index');
-            if (dataIndex != null) {
-                return +dataIndex;
-            }
-        }
-        return -1;
-    };
-    /** Handles a clear button click on a bookmark. */
-    BookmarkPanel.prototype._clearButtonHandler = function (evt) {
-        var index = this.getParentDataIndex(evt);
-        this.splice('savedStates', index, 1);
-        this.updateHasStates();
-    };
-    /** Handles a label change event on a bookmark. */
-    BookmarkPanel.prototype._labelChange = function (evt) {
-        var index = this.getParentDataIndex(evt);
-        this.savedStates[index].label = evt.target.value;
-    };
-    /**
-     * Used to determine whether to select the radio button for a given bookmark.
-     */
-    BookmarkPanel.prototype._isSelectedState = function (index) {
-        return index === this.selectedState;
-    };
-    BookmarkPanel.prototype._isNotSelectedState = function (index) {
-        return index !== this.selectedState;
-    };
-    /**
-     * Gets all of the saved states as a serialized string.
-     */
-    BookmarkPanel.prototype.serializeAllSavedStates = function () {
-        return JSON.stringify(this.savedStates);
-    };
-    /**
-     * Loads all of the serialized states and shows them in the list of
-     * viewable states.
-     */
-    BookmarkPanel.prototype.loadSavedStates = function (serializedStates) {
-        this.savedStates = JSON.parse(serializedStates);
-        this.updateHasStates();
-    };
-    /**
-     * Updates the hasState polymer property.
-     */
-    BookmarkPanel.prototype.updateHasStates = function () {
-        this.hasStates = (this.savedStates.length !== 0);
-    };
-    /** Sanity checks a State array to ensure it matches the current dataset. */
-    BookmarkPanel.prototype.savedStatesValid = function (states) {
-        for (var i = 0; i < states.length; i++) {
-            if (states[i].dataSetDimensions[0] !== this.projector.dataSet.dim[0] ||
-                states[i].dataSetDimensions[1] !== this.projector.dataSet.dim[1]) {
-                return false;
-            }
-        }
-        return true;
-    };
-    return BookmarkPanel;
-}(exports.BookmarkPanelPolymer));
-exports.BookmarkPanel = BookmarkPanel;
-document.registerElement(BookmarkPanel.prototype.is, BookmarkPanel);
-
-},{"./logging":12,"./vz-projector-util":33}],27:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var data_provider_1 = require('./data-provider');
-var util = require('./util');
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-exports.DataPanelPolymer = vz_projector_util_1.PolymerElement({
-    is: 'vz-projector-data-panel',
-    properties: {
-        selectedTensor: { type: String, observer: '_selectedTensorChanged' },
-        selectedRun: { type: String, observer: '_selectedRunChanged' },
-        selectedColorOptionName: {
-            type: String,
-            notify: true,
-            observer: '_selectedColorOptionNameChanged'
-        },
-        selectedLabelOption: { type: String, notify: true, observer: '_selectedLabelOptionChanged' },
-        normalizeData: Boolean,
-        showForceCategoricalColorsCheckbox: Boolean
-    }
-});
-var DataPanel = (function (_super) {
-    __extends(DataPanel, _super);
-    function DataPanel() {
-        _super.apply(this, arguments);
-        this.forceCategoricalColoring = false;
-    }
-    DataPanel.prototype.ready = function () {
-        this.dom = d3.select(this);
-        this.normalizeData = true;
-    };
-    DataPanel.prototype.initialize = function (projector, dp) {
-        var _this = this;
-        this.projector = projector;
-        this.dataProvider = dp;
-        this.setupUploadButtons();
-        // Tell the projector whenever the data normalization changes.
-        // Unknown why, but the polymer checkbox button stops working as soon as
-        // you do d3.select() on it.
-        this.querySelector('#normalize-data-checkbox')
-            .addEventListener('change', function () {
-            _this.projector.setNormalizeData(_this.normalizeData);
-        });
-        var forceCategoricalColoringCheckbox = this.querySelector('#force-categorical-checkbox');
-        forceCategoricalColoringCheckbox.addEventListener('change', function () {
-            _this.setForceCategoricalColoring(forceCategoricalColoringCheckbox.checked);
-        });
-        // Get all the runs.
-        this.dataProvider.retrieveRuns(function (runs) {
-            _this.runNames = runs;
-            // Choose the first run by default.
-            if (_this.runNames.length > 0) {
-                _this.selectedRun = runs[0];
-            }
-        });
-    };
-    DataPanel.prototype.setForceCategoricalColoring = function (forceCategoricalColoring) {
-        this.forceCategoricalColoring = forceCategoricalColoring;
-        this.querySelector('#force-categorical-checkbox')
-            .checked = this.forceCategoricalColoring;
-        this.updateMetadataUI(this.spriteAndMetadata.stats, this.metadataFile);
-        // The selected color option name doesn't change when we switch to using
-        // categorical coloring for stats with too many unique values, so we
-        // manually call this polymer observer so that we update the UI.
-        this._selectedColorOptionNameChanged();
-    };
-    DataPanel.prototype.getSeparatorClass = function (isSeparator) {
-        return isSeparator ? 'separator' : null;
-    };
-    DataPanel.prototype.metadataChanged = function (spriteAndMetadata, metadataFile) {
-        this.spriteAndMetadata = spriteAndMetadata;
-        this.metadataFile = metadataFile;
-        this.updateMetadataUI(this.spriteAndMetadata.stats, this.metadataFile);
-        this.selectedColorOptionName = this.colorOptions[0].name;
-    };
-    DataPanel.prototype.addWordBreaks = function (longString) {
-        if (longString == null) {
-            return '';
-        }
-        return longString.replace(/([\/=-_,])/g, '$1<wbr>');
-    };
-    DataPanel.prototype.updateMetadataUI = function (columnStats, metadataFile) {
-        var _this = this;
-        this.dom.select('#metadata-file')
-            .html(this.addWordBreaks(metadataFile))
-            .attr('title', metadataFile);
-        // Label by options.
-        var labelIndex = -1;
-        this.labelOptions = columnStats.map(function (stats, i) {
-            // Make the default label by the first non-numeric column.
-            if (!stats.isNumeric && labelIndex === -1) {
-                labelIndex = i;
-            }
-            return stats.name;
-        });
-        this.selectedLabelOption = this.labelOptions[Math.max(0, labelIndex)];
-        // Color by options.
-        var standardColorOption = [
-            { name: 'No color map' },
-        ];
-        var metadataColorOption = columnStats
-            .filter(function (stats) {
-            return !stats.tooManyUniqueValues || stats.isNumeric;
-        })
-            .map(function (stats) {
-            var map;
-            var items;
-            var thresholds;
-            var isCategorical = _this.forceCategoricalColoring || !stats.tooManyUniqueValues;
-            if (isCategorical) {
-                var scale = d3.scale.category20();
-                var range_1 = scale.range();
-                // Re-order the range.
-                var newRange = range_1.map(function (color, i) {
-                    var index = (i * 3) % range_1.length;
-                    return range_1[index];
-                });
-                items = stats.uniqueEntries;
-                scale.range(newRange).domain(items.map(function (x) { return x.label; }));
-                map = scale;
-            }
-            else {
-                thresholds = [
-                    { color: '#ffffdd', value: stats.min },
-                    { color: '#1f2d86', value: stats.max }
-                ];
-                map = d3.scale.linear()
-                    .domain(thresholds.map(function (t) { return t.value; }))
-                    .range(thresholds.map(function (t) { return t.color; }));
-            }
-            var desc = !isCategorical ? 'gradient' :
-                stats.uniqueEntries.length +
-                    ((stats.uniqueEntries.length > 20) ? ' non-unique' : '') +
-                    ' colors';
-            return {
-                name: stats.name,
-                desc: desc,
-                map: map,
-                items: items,
-                thresholds: thresholds,
-                tooManyUniqueValues: stats.tooManyUniqueValues
-            };
-        });
-        if (metadataColorOption.length > 0) {
-            // Add a separator line between built-in color maps
-            // and those based on metadata columns.
-            standardColorOption.push({ name: 'Metadata', isSeparator: true });
-        }
-        this.colorOptions = standardColorOption.concat(metadataColorOption);
-    };
-    DataPanel.prototype.setNormalizeData = function (normalizeData) {
-        this.normalizeData = normalizeData;
-    };
-    DataPanel.prototype._selectedTensorChanged = function () {
-        var _this = this;
-        this.projector.updateDataSet(null, null, null);
-        if (this.selectedTensor == null) {
-            return;
-        }
-        this.dataProvider.retrieveTensor(this.selectedRun, this.selectedTensor, function (ds) {
-            var metadataFile = _this.getEmbeddingInfoByName(_this.selectedTensor).metadataPath;
-            _this.dataProvider.retrieveSpriteAndMetadata(_this.selectedRun, _this.selectedTensor, function (metadata) {
-                _this.projector.updateDataSet(ds, metadata, metadataFile);
-            });
-        });
-        this.projector.setSelectedTensor(this.selectedRun, this.getEmbeddingInfoByName(this.selectedTensor));
-    };
-    DataPanel.prototype._selectedRunChanged = function () {
-        var _this = this;
-        this.dataProvider.retrieveProjectorConfig(this.selectedRun, function (info) {
-            _this.projectorConfig = info;
-            var names = _this.projectorConfig.embeddings.map(function (e) { return e.tensorName; })
-                .filter(function (name) {
-                var shape = _this.getEmbeddingInfoByName(name).tensorShape;
-                return shape.length === 2 && shape[0] > 1 && shape[1] > 1;
-            })
-                .sort(function (a, b) {
-                var embA = _this.getEmbeddingInfoByName(a);
-                var embB = _this.getEmbeddingInfoByName(b);
-                // Prefer tensors with metadata.
-                if (util.xor(!!embA.metadataPath, !!embB.metadataPath)) {
-                    return embA.metadataPath ? -1 : 1;
-                }
-                // Prefer non-generated tensors.
-                var isGenA = util.tensorIsGenerated(a);
-                var isGenB = util.tensorIsGenerated(b);
-                if (util.xor(isGenA, isGenB)) {
-                    return isGenB ? -1 : 1;
-                }
-                // Prefer bigger tensors.
-                var sizeA = embA.tensorShape[0];
-                var sizeB = embB.tensorShape[0];
-                if (sizeA !== sizeB) {
-                    return sizeB - sizeA;
-                }
-                // Sort alphabetically by tensor name.
-                return a <= b ? -1 : 1;
-            });
-            _this.tensorNames = names.map(function (name) {
-                return { name: name, shape: _this.getEmbeddingInfoByName(name).tensorShape };
-            });
-            var wordBreakablePath = _this.addWordBreaks(_this.projectorConfig.modelCheckpointPath);
-            _this.dom.select('#checkpoint-file')
-                .html(wordBreakablePath)
-                .attr('title', _this.projectorConfig.modelCheckpointPath);
-            // If in demo mode, let the order decide which tensor to load by default.
-            var defaultTensor = _this.projector.servingMode === 'demo' ?
-                _this.projectorConfig.embeddings[0].tensorName :
-                names[0];
-            if (_this.selectedTensor === defaultTensor) {
-                // Explicitly call the observer. Polymer won't call it if the previous
-                // string matches the current string.
-                _this._selectedTensorChanged();
-            }
-            else {
-                _this.selectedTensor = defaultTensor;
-            }
-        });
-    };
-    DataPanel.prototype._selectedLabelOptionChanged = function () {
-        this.projector.setSelectedLabelOption(this.selectedLabelOption);
-    };
-    DataPanel.prototype._selectedColorOptionNameChanged = function () {
-        var colorOption;
-        for (var i = 0; i < this.colorOptions.length; i++) {
-            if (this.colorOptions[i].name === this.selectedColorOptionName) {
-                colorOption = this.colorOptions[i];
-                break;
-            }
-        }
-        if (!colorOption) {
-            return;
-        }
-        this.showForceCategoricalColorsCheckbox = !!colorOption.tooManyUniqueValues;
-        if (colorOption.map == null) {
-            this.colorLegendRenderInfo = null;
-        }
-        else if (colorOption.items) {
-            var items = colorOption.items.map(function (item) {
-                return {
-                    color: colorOption.map(item.label),
-                    label: item.label,
-                    count: item.count
-                };
-            });
-            this.colorLegendRenderInfo = { items: items, thresholds: null };
-        }
-        else {
-            this.colorLegendRenderInfo = {
-                items: null,
-                thresholds: colorOption.thresholds
-            };
-        }
-        this.projector.setSelectedColorOption(colorOption);
-    };
-    DataPanel.prototype.tensorWasReadFromFile = function (rawContents, fileName) {
-        var _this = this;
-        data_provider_1.parseRawTensors(rawContents, function (ds) {
-            _this.dom.select('#checkpoint-file')
-                .text(fileName)
-                .attr('title', fileName);
-            _this.projector.updateDataSet(ds);
-        });
-    };
-    DataPanel.prototype.metadataWasReadFromFile = function (rawContents, fileName) {
-        var _this = this;
-        data_provider_1.parseRawMetadata(rawContents, function (metadata) {
-            _this.projector.updateDataSet(_this.projector.dataSet, metadata, fileName);
-        });
-    };
-    DataPanel.prototype.getEmbeddingInfoByName = function (tensorName) {
-        for (var i = 0; i < this.projectorConfig.embeddings.length; i++) {
-            var e = this.projectorConfig.embeddings[i];
-            if (e.tensorName === tensorName) {
-                return e;
-            }
-        }
-    };
-    DataPanel.prototype.setupUploadButtons = function () {
-        var _this = this;
-        // Show and setup the upload button.
-        var fileInput = this.dom.select('#file');
-        fileInput.on('change', function () {
-            var file = d3.event.target.files[0];
-            // Clear out the value of the file chooser. This ensures that if the user
-            // selects the same file, we'll re-read it.
-            d3.event.target.value = '';
-            var fileReader = new FileReader();
-            fileReader.onload = function (evt) {
-                var content = evt.target.result;
-                _this.tensorWasReadFromFile(content, file.name);
-            };
-            fileReader.readAsArrayBuffer(file);
-        });
-        var uploadButton = this.dom.select('#upload-tensors');
-        uploadButton.on('click', function () {
-            fileInput.node().click();
-        });
-        // Show and setup the upload metadata button.
-        var fileMetadataInput = this.dom.select('#file-metadata');
-        fileMetadataInput.on('change', function () {
-            var file = d3.event.target.files[0];
-            // Clear out the value of the file chooser. This ensures that if the user
-            // selects the same file, we'll re-read it.
-            d3.event.target.value = '';
-            var fileReader = new FileReader();
-            fileReader.onload = function (evt) {
-                var contents = evt.target.result;
-                _this.metadataWasReadFromFile(contents, file.name);
-            };
-            fileReader.readAsArrayBuffer(file);
-        });
-        var uploadMetadataButton = this.dom.select('#upload-metadata');
-        uploadMetadataButton.on('click', function () {
-            fileMetadataInput.node().click();
-        });
-        if (this.projector.servingMode !== 'demo') {
-            this.$$('#publish-container').style.display = 'none';
-            this.$$('#upload-tensors-step-container').style.display =
-                'none';
-            this.$$('#upload-metadata-label').style.display = 'none';
-        }
-        this.$$('#demo-data-buttons-container').style.display =
-            'block';
-        // Fill out the projector config.
-        var projectorConfigTemplate = this.$$('#projector-config-template');
-        var projectorConfigTemplateJson = {
-            embeddings: [{
-                    tensorName: 'My tensor',
-                    tensorShape: [1000, 50],
-                    tensorPath: 'https://raw.githubusercontent.com/.../tensors.tsv',
-                    metadataPath: 'https://raw.githubusercontent.com/.../optional.metadata.tsv',
-                }],
-        };
-        this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
-        // Set up optional field checkboxes.
-        var spriteFieldCheckbox = this.$$('#config-sprite-checkbox');
-        spriteFieldCheckbox.addEventListener('change', function () {
-            if (spriteFieldCheckbox.checked) {
-                projectorConfigTemplateJson.embeddings[0].sprite = {
-                    imagePath: 'https://github.com/.../optional.sprite.png',
-                    singleImageDim: [32, 32]
-                };
-            }
-            else {
-                delete projectorConfigTemplateJson.embeddings[0].sprite;
-            }
-            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
-        });
-        var bookmarksFieldCheckbox = this.$$('#config-bookmarks-checkbox');
-        bookmarksFieldCheckbox.addEventListener('change', function () {
-            if (bookmarksFieldCheckbox.checked) {
-                projectorConfigTemplateJson.embeddings[0].bookmarksPath =
-                    'https://raw.githubusercontent.com/.../bookmarks.txt';
-            }
-            else {
-                delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
-            }
-            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
-        });
-        var metadataFieldCheckbox = this.$$('#config-metadata-checkbox');
-        metadataFieldCheckbox.addEventListener('change', function () {
-            if (metadataFieldCheckbox.checked) {
-                projectorConfigTemplateJson.embeddings[0].metadataPath =
-                    'https://raw.githubusercontent.com/.../optional.metadata.tsv';
-            }
-            else {
-                delete projectorConfigTemplateJson.embeddings[0].metadataPath;
-            }
-            _this.setProjectorConfigTemplateJson(projectorConfigTemplate, projectorConfigTemplateJson);
-        });
-        // Update the link and the readonly shareable URL.
-        var projectorConfigUrlInput = this.$$('#projector-config-url');
-        var projectorConfigDemoUrlInput = this.$$('#projector-share-url');
-        var projectorConfigDemoUrlLink = this.$$('#projector-share-url-link');
-        projectorConfigUrlInput.addEventListener('input', function () {
-            var projectorDemoUrl = location.protocol + '//' + location.host +
-                location.pathname +
-                '?config=' + projectorConfigUrlInput.value;
-            projectorConfigDemoUrlInput.value =
-                projectorDemoUrl;
-            projectorConfigDemoUrlLink.href = projectorDemoUrl;
-        });
-    };
-    DataPanel.prototype.setProjectorConfigTemplateJson = function (projectorConfigTemplate, config) {
-        projectorConfigTemplate.value =
-            JSON.stringify(config, null, /** replacer */ 2 /** white space */);
-    };
-    DataPanel.prototype._getNumTensorsLabel = function () {
-        return this.tensorNames.length === 1 ? '1 tensor' :
-            this.tensorNames.length + ' tensors';
-    };
-    DataPanel.prototype._getNumRunsLabel = function () {
-        return this.runNames.length === 1 ? '1 run' :
-            this.runNames.length + ' runs';
-    };
-    DataPanel.prototype._hasChoices = function (choices) {
-        return choices.length > 1;
-    };
-    return DataPanel;
-}(exports.DataPanelPolymer));
-exports.DataPanel = DataPanel;
-document.registerElement(DataPanel.prototype.is, DataPanel);
-
-},{"./data-provider":6,"./util":24,"./vz-projector-util":33}],28:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-// tslint:disable-next-line
-exports.PolymerClass = vz_projector_util_1.PolymerElement({ is: 'vz-projector-input', properties: { label: String, message: String } });
-/** Input control with custom capabilities (e.g. regex). */
-var ProjectorInput = (function (_super) {
-    __extends(ProjectorInput, _super);
-    function ProjectorInput() {
-        _super.apply(this, arguments);
-    }
-    /** Subscribe to be called everytime the input changes. */
-    ProjectorInput.prototype.registerInputChangedListener = function (listener) {
-        this.textChangedListeners.push(listener);
-    };
-    ProjectorInput.prototype.ready = function () {
-        var _this = this;
-        this.inRegexMode = false;
-        this.textChangedListeners = [];
-        this.dom = d3.select(this);
-        this.paperInput = this.querySelector('paper-input');
-        this.inRegexModeButton =
-            this.querySelector('paper-button');
-        this.paperInput.setAttribute('error-message', 'Invalid regex');
-        this.paperInput.addEventListener('input', function () {
-            _this.onTextChanged();
-        });
-        this.paperInput.addEventListener('keydown', function (event) {
-            event.stopPropagation();
-        });
-        this.inRegexModeButton.addEventListener('click', function () { return _this.onClickRegexModeButton(); });
-        this.updateRegexModeDisplaySlashes();
-        this.onTextChanged();
-    };
-    ProjectorInput.prototype.onClickRegexModeButton = function () {
-        this.inRegexMode = this.inRegexModeButton.active;
-        this.updateRegexModeDisplaySlashes();
-        this.onTextChanged();
-    };
-    ProjectorInput.prototype.notifyInputChanged = function (value, inRegexMode) {
-        this.textChangedListeners.forEach(function (l) { return l(value, inRegexMode); });
-    };
-    ProjectorInput.prototype.onTextChanged = function () {
-        try {
-            if (this.inRegexMode) {
-                new RegExp(this.paperInput.value);
-            }
-        }
-        catch (invalidRegexException) {
-            this.paperInput.setAttribute('invalid', 'true');
-            this.message = '';
-            this.notifyInputChanged(null, true);
-            return;
-        }
-        this.paperInput.removeAttribute('invalid');
-        this.notifyInputChanged(this.paperInput.value, this.inRegexMode);
-    };
-    ProjectorInput.prototype.updateRegexModeDisplaySlashes = function () {
-        d3.select(this.paperInput)
-            .selectAll('.slash')
-            .style('display', this.inRegexMode ? null : 'none');
-    };
-    ProjectorInput.prototype.getValue = function () {
-        return this.paperInput.value;
-    };
-    ProjectorInput.prototype.getInRegexMode = function () {
-        return this.inRegexMode;
-    };
-    ProjectorInput.prototype.set = function (value, inRegexMode) {
-        this.inRegexModeButton.active = inRegexMode;
-        this.paperInput.value = value;
-        this.onClickRegexModeButton();
-    };
-    return ProjectorInput;
-}(exports.PolymerClass));
-exports.ProjectorInput = ProjectorInput;
-document.registerElement(ProjectorInput.prototype.is, ProjectorInput);
-
-},{"./vz-projector-util":33}],29:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var adapter = require('./projectorScatterPlotAdapter');
-var vector = require('./vector');
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-/** Limit the number of search results we show to the user. */
-var LIMIT_RESULTS = 100;
-// tslint:disable-next-line
-exports.PolymerClass = vz_projector_util_1.PolymerElement({
-    is: 'vz-projector-inspector-panel',
-    properties: { selectedMetadataField: String, metadataFields: Array }
-});
-var InspectorPanel = (function (_super) {
-    __extends(InspectorPanel, _super);
-    function InspectorPanel() {
-        _super.apply(this, arguments);
-    }
-    InspectorPanel.prototype.ready = function () {
-        this.dom = d3.select(this);
-        this.resetFilterButton = this.dom.select('.reset-filter');
-        this.setFilterButton = this.dom.select('.set-filter');
-        this.clearSelectionButton = this.dom.select('.clear-selection');
-        this.limitMessage = this.dom.select('.limit-msg');
-        this.searchBox = this.querySelector('#search-box');
-        // https://www.polymer-project.org/1.0/docs/devguide/styling#scope-subtree
-        this.scopeSubtree(this, true);
-    };
-    InspectorPanel.prototype.initialize = function (projector, projectorEventContext) {
-        var _this = this;
-        this.projector = projector;
-        this.projectorEventContext = projectorEventContext;
-        this.setupUI(projector);
-        projectorEventContext.registerSelectionChangedListener(function (selection, neighbors) {
-            return _this.updateInspectorPane(selection, neighbors);
-        });
-    };
-    /** Updates the nearest neighbors list in the inspector. */
-    InspectorPanel.prototype.updateInspectorPane = function (indices, neighbors) {
-        this.neighborsOfFirstPoint = neighbors;
-        this.selectedPointIndices = indices;
-        this.updateFilterButtons(indices.length + neighbors.length);
-        this.updateNeighborsList(neighbors);
-        if (neighbors.length === 0) {
-            this.updateSearchResults(indices);
-        }
-        else {
-            this.updateSearchResults([]);
-        }
-    };
-    InspectorPanel.prototype.enableResetFilterButton = function (enabled) {
-        this.resetFilterButton.attr('disabled', enabled ? null : true);
-    };
-    InspectorPanel.prototype.restoreUIFromBookmark = function (bookmark) {
-        this.enableResetFilterButton(bookmark.filteredPoints != null);
-    };
-    InspectorPanel.prototype.metadataChanged = function (spriteAndMetadata) {
-        var labelIndex = -1;
-        this.metadataFields = spriteAndMetadata.stats.map(function (stats, i) {
-            if (!stats.isNumeric && labelIndex === -1) {
-                labelIndex = i;
-            }
-            return stats.name;
-        });
-        labelIndex = Math.max(0, labelIndex);
-        // Make the default label the first non-numeric column.
-        this.selectedMetadataField = spriteAndMetadata.stats[labelIndex].name;
-    };
-    InspectorPanel.prototype.datasetChanged = function () {
-        this.enableResetFilterButton(false);
-    };
-    InspectorPanel.prototype.updateSearchResults = function (indices) {
-        var _this = this;
-        var container = this.dom.select('.matches-list');
-        container.style('display', indices.length ? null : 'none');
-        var list = container.select('.list');
-        list.html('');
-        if (indices.length === 0) {
-            return;
-        }
-        this.limitMessage.style('display', indices.length <= LIMIT_RESULTS ? 'none' : null);
-        indices = indices.slice(0, LIMIT_RESULTS);
-        var rows = list.selectAll('.row').data(indices).enter().append('div').attr('class', 'row');
-        rows.append('a')
-            .attr('class', 'label')
-            .attr('title', function (index) { return _this.getLabelFromIndex(index); })
-            .text(function (index) { return _this.getLabelFromIndex(index); });
-        rows.on('mouseenter', function (index) {
-            _this.projectorEventContext.notifyHoverOverPoint(index);
-        });
-        rows.on('mouseleave', function () {
-            _this.projectorEventContext.notifyHoverOverPoint(null);
-        });
-        rows.on('click', function (index) {
-            _this.projectorEventContext.notifySelectionChanged([index]);
-        });
-    };
-    InspectorPanel.prototype.getLabelFromIndex = function (pointIndex) {
-        var point = this.projector.dataSet.points[pointIndex];
-        return point.metadata[this.selectedMetadataField].toString();
-    };
-    InspectorPanel.prototype.updateNeighborsList = function (neighbors) {
-        var _this = this;
-        var nnlist = this.dom.select('.nn-list');
-        nnlist.html('');
-        this.dom.select('.nn').style('display', neighbors.length ? null : 'none');
-        if (neighbors.length === 0) {
-            return;
-        }
-        this.searchBox.message = '';
-        var minDist = neighbors.length > 0 ? neighbors[0].dist : 0;
-        var n = nnlist.selectAll('.neighbor')
-            .data(neighbors)
-            .enter()
-            .append('div')
-            .attr('class', 'neighbor')
-            .append('a')
-            .attr('class', 'neighbor-link')
-            .attr('title', function (d) { return _this.getLabelFromIndex(d.index); });
-        var labelValue = n.append('div').attr('class', 'label-and-value');
-        labelValue.append('div')
-            .attr('class', 'label')
-            .style('color', function (d) { return adapter.dist2color(_this.distFunc, d.dist, minDist); })
-            .text(function (d) { return _this.getLabelFromIndex(d.index); });
-        labelValue.append('div')
-            .attr('class', 'value')
-            .text(function (d) { return d.dist.toFixed(3); });
-        var bar = n.append('div').attr('class', 'bar');
-        bar.append('div')
-            .attr('class', 'fill')
-            .style('border-top-color', function (d) {
-            return adapter.dist2color(_this.distFunc, d.dist, minDist);
-        })
-            .style('width', function (d) { return adapter.normalizeDist(_this.distFunc, d.dist, minDist) * 100 +
-            '%'; });
-        bar.selectAll('.tick')
-            .data(d3.range(1, 4))
-            .enter()
-            .append('div')
-            .attr('class', 'tick')
-            .style('left', function (d) { return d * 100 / 4 + '%'; });
-        n.on('mouseenter', function (d) {
-            _this.projectorEventContext.notifyHoverOverPoint(d.index);
-        });
-        n.on('mouseleave', function () {
-            _this.projectorEventContext.notifyHoverOverPoint(null);
-        });
-        n.on('click', function (d) {
-            _this.projectorEventContext.notifySelectionChanged([d.index]);
-        });
-    };
-    InspectorPanel.prototype.updateFilterButtons = function (numPoints) {
-        if (numPoints > 1) {
-            this.setFilterButton.text("Isolate " + numPoints + " points")
-                .attr('disabled', null);
-            this.clearSelectionButton.attr('disabled', null);
-        }
-        else {
-            this.setFilterButton.attr('disabled', true);
-            this.clearSelectionButton.attr('disabled', true);
-        }
-    };
-    InspectorPanel.prototype.setupUI = function (projector) {
-        var _this = this;
-        this.distFunc = vector.cosDist;
-        var eucDist = this.dom.select('.distance a.euclidean');
-        eucDist.on('click', function () {
-            _this.dom.selectAll('.distance a').classed('selected', false);
-            eucDist.classed('selected', true);
-            _this.distFunc = vector.dist;
-            _this.projectorEventContext.notifyDistanceMetricChanged(_this.distFunc);
-            var neighbors = projector.dataSet.findNeighbors(_this.selectedPointIndices[0], _this.distFunc, _this.numNN);
-            _this.updateNeighborsList(neighbors);
-        });
-        var cosDist = this.dom.select('.distance a.cosine');
-        cosDist.on('click', function () {
-            _this.dom.selectAll('.distance a').classed('selected', false);
-            cosDist.classed('selected', true);
-            _this.distFunc = vector.cosDist;
-            _this.projectorEventContext.notifyDistanceMetricChanged(_this.distFunc);
-            var neighbors = projector.dataSet.findNeighbors(_this.selectedPointIndices[0], _this.distFunc, _this.numNN);
-            _this.updateNeighborsList(neighbors);
-        });
-        // Called whenever the search text input changes.
-        var updateInput = function (value, inRegexMode) {
-            if (value == null || value.trim() === '') {
-                _this.searchBox.message = '';
-                _this.projectorEventContext.notifySelectionChanged([]);
-                return;
-            }
-            var indices = projector.dataSet.query(value, inRegexMode, _this.selectedMetadataField);
-            if (indices.length === 0) {
-                _this.searchBox.message = '0 matches.';
-            }
-            else {
-                _this.searchBox.message = indices.length + " matches.";
-            }
-            _this.projectorEventContext.notifySelectionChanged(indices);
-        };
-        this.searchBox.registerInputChangedListener(function (value, inRegexMode) {
-            updateInput(value, inRegexMode);
-        });
-        // Nearest neighbors controls.
-        var numNNInput = this.$$('#nn-slider');
-        var updateNumNN = function () {
-            _this.numNN = +numNNInput.value;
-            _this.dom.select('.num-nn .nn-count').text(_this.numNN);
-            if (_this.selectedPointIndices != null) {
-                _this.projectorEventContext.notifySelectionChanged([_this.selectedPointIndices[0]]);
-            }
-        };
-        numNNInput.addEventListener('change', updateNumNN);
-        updateNumNN();
-        // Filtering dataset.
-        this.setFilterButton.on('click', function () {
-            var indices = _this.selectedPointIndices.concat(_this.neighborsOfFirstPoint.map(function (n) { return n.index; }));
-            projector.filterDataset(indices);
-            _this.enableResetFilterButton(true);
-            _this.updateFilterButtons(0);
-        });
-        this.resetFilterButton.on('click', function () {
-            projector.resetFilterDataset();
-            _this.enableResetFilterButton(false);
-        });
-        this.clearSelectionButton.on('click', function () {
-            projector.adjustSelectionAndHover([]);
-        });
-        this.enableResetFilterButton(false);
-    };
-    return InspectorPanel;
-}(exports.PolymerClass));
-exports.InspectorPanel = InspectorPanel;
-document.registerElement(InspectorPanel.prototype.is, InspectorPanel);
-
-},{"./projectorScatterPlotAdapter":14,"./vector":25,"./vz-projector-util":33}],30:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-// tslint:disable-next-line
-exports.LegendPolymer = vz_projector_util_1.PolymerElement({
-    is: 'vz-projector-legend',
-    properties: { renderInfo: { type: Object, observer: '_renderInfoChanged' } }
-});
-var Legend = (function (_super) {
-    __extends(Legend, _super);
-    function Legend() {
-        _super.apply(this, arguments);
-    }
-    Legend.prototype.ready = function () {
-        this.dom = d3.select(this);
-    };
-    Legend.prototype._renderInfoChanged = function () {
-        var _this = this;
-        if (this.renderInfo == null) {
-            return;
-        }
-        if (this.renderInfo.thresholds) {
-            // <linearGradient> is under dom-if so we should wait for it to be
-            // inserted in the dom tree using async().
-            this.async(function () { return _this.setupLinearGradient(); });
-        }
-    };
-    Legend.prototype._getLastThreshold = function () {
-        if (this.renderInfo == null || this.renderInfo.thresholds == null) {
-            return;
-        }
-        return this.renderInfo.thresholds[this.renderInfo.thresholds.length - 1]
-            .value;
-    };
-    Legend.prototype.getOffset = function (value) {
-        var min = this.renderInfo.thresholds[0].value;
-        var max = this.renderInfo.thresholds[this.renderInfo.thresholds.length - 1].value;
-        return (100 * (value - min) / (max - min)).toFixed(2) + '%';
-    };
-    Legend.prototype.setupLinearGradient = function () {
-        var _this = this;
-        var linearGradient = this.dom.select('#gradient');
-        var width = this.dom.select('svg.gradient').node().clientWidth;
-        // Set the svg <rect> to be the width of its <svg> parent.
-        this.dom.select('svg.gradient rect').attr('width', width);
-        // Remove all <stop> children from before.
-        linearGradient.selectAll('*').remove();
-        // Add a <stop> child in <linearGradient> for each gradient threshold.
-        this.renderInfo.thresholds.forEach(function (t) {
-            linearGradient.append('stop')
-                .attr('offset', _this.getOffset(t.value))
-                .attr('stop-color', t.color);
-        });
-    };
-    return Legend;
-}(exports.LegendPolymer));
-exports.Legend = Legend;
-document.registerElement(Legend.prototype.is, Legend);
-
-},{"./vz-projector-util":33}],31:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-// tslint:disable-next-line
-exports.MetadataCardPolymer = vz_projector_util_1.PolymerElement({
-    is: 'vz-projector-metadata-card',
-    properties: {
-        hasMetadata: { type: Boolean, value: false },
-        metadata: { type: Array },
-        label: String
-    }
-});
-var MetadataCard = (function (_super) {
-    __extends(MetadataCard, _super);
-    function MetadataCard() {
-        _super.apply(this, arguments);
-    }
-    MetadataCard.prototype.ready = function () {
-        this.dom = d3.select(this);
-    };
-    /** Handles a click on the expand more icon. */
-    MetadataCard.prototype._expandMore = function () {
-        this.$$('#metadata-container').toggle();
-        this.dom.select('#expand-more').style('display', 'none');
-        this.dom.select('#expand-less').style('display', '');
-    };
-    /** Handles a click on the expand less icon. */
-    MetadataCard.prototype._expandLess = function () {
-        this.$$('#metadata-container').toggle();
-        this.dom.select('#expand-more').style('display', '');
-        this.dom.select('#expand-less').style('display', 'none');
-    };
-    MetadataCard.prototype.updateMetadata = function (pointMetadata) {
-        this.pointMetadata = pointMetadata;
-        this.hasMetadata = (pointMetadata != null);
-        if (pointMetadata) {
-            var metadata = [];
-            for (var metadataKey in pointMetadata) {
-                if (!pointMetadata.hasOwnProperty(metadataKey)) {
-                    continue;
-                }
-                metadata.push({ key: metadataKey, value: pointMetadata[metadataKey] });
-            }
-            this.metadata = metadata;
-            this.label = '' + this.pointMetadata[this.labelOption];
-        }
-    };
-    MetadataCard.prototype.setLabelOption = function (labelOption) {
-        this.labelOption = labelOption;
-        if (this.pointMetadata) {
-            this.label = '' + this.pointMetadata[this.labelOption];
-        }
-    };
-    return MetadataCard;
-}(exports.MetadataCardPolymer));
-exports.MetadataCard = MetadataCard;
-document.registerElement(MetadataCard.prototype.is, MetadataCard);
-
-},{"./vz-projector-util":33}],32:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var data = require('./data');
-var data_1 = require('./data');
-var vector = require('./vector');
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-var NUM_PCA_COMPONENTS = 10;
-// tslint:disable-next-line
-exports.ProjectionsPanelPolymer = vz_projector_util_1.PolymerElement({
-    is: 'vz-projector-projections-panel',
-    properties: {
-        pcaIs3d: { type: Boolean, value: true, observer: '_pcaDimensionToggleObserver' },
-        tSNEis3d: { type: Boolean, value: true, observer: '_tsneDimensionToggleObserver' },
-        // PCA projection.
-        pcaComponents: Array,
-        pcaX: { type: Number, value: 0, observer: 'showPCAIfEnabled' },
-        pcaY: { type: Number, value: 1, observer: 'showPCAIfEnabled' },
-        pcaZ: { type: Number, value: 2, observer: 'showPCAIfEnabled' },
-        // Custom projection.
-        customSelectedSearchByMetadataOption: {
-            type: String,
-            observer: '_customSelectedSearchByMetadataOptionChanged'
-        },
-    }
-});
-/**
- * A polymer component which handles the projection tabs in the projector.
- */
-var ProjectionsPanel = (function (_super) {
-    __extends(ProjectionsPanel, _super);
-    function ProjectionsPanel() {
-        _super.apply(this, arguments);
-    }
-    ProjectionsPanel.prototype.initialize = function (projector) {
-        this.polymerChangesTriggerReprojection = true;
-        this.projector = projector;
-        // Set up TSNE projections.
-        this.perplexity = 30;
-        this.learningRate = 10;
-        // Setup Custom projections.
-        this.centroidValues = { xLeft: null, xRight: null, yUp: null, yDown: null };
-        this.clearCentroids();
-        this.setupUIControls();
-    };
-    ProjectionsPanel.prototype.ready = function () {
-        this.dom = d3.select(this);
-        this.zDropdown = this.dom.select('#z-dropdown');
-        this.runTsneButton = this.dom.select('.run-tsne');
-        this.stopTsneButton = this.dom.select('.stop-tsne');
-        this.perplexitySlider = this.$$('#perplexity-slider');
-        this.learningRateInput =
-            this.$$('#learning-rate-slider');
-        this.iterationLabel = this.dom.select('.run-tsne-iter');
-    };
-    ProjectionsPanel.prototype.disablePolymerChangesTriggerReprojection = function () {
-        this.polymerChangesTriggerReprojection = false;
-    };
-    ProjectionsPanel.prototype.enablePolymerChangesTriggerReprojection = function () {
-        this.polymerChangesTriggerReprojection = true;
-    };
-    ProjectionsPanel.prototype.updateTSNEPerplexityFromSliderChange = function () {
-        if (this.perplexitySlider) {
-            this.perplexity = +this.perplexitySlider.value;
-        }
-        this.dom.select('.tsne-perplexity span').text(this.perplexity);
-    };
-    ProjectionsPanel.prototype.updateTSNELearningRateFromUIChange = function () {
-        if (this.learningRateInput) {
-            this.learningRate = Math.pow(10, +this.learningRateInput.value);
-        }
-        this.dom.select('.tsne-learning-rate span').text(this.learningRate);
-    };
-    ProjectionsPanel.prototype.setupUIControls = function () {
-        var _this = this;
-        {
-            var self_1 = this;
-            this.dom.selectAll('.ink-tab').on('click', function () {
-                var id = this.getAttribute('data-tab');
-                self_1.showTab(id);
-            });
-        }
-        this.runTsneButton.on('click', function () { return _this.runTSNE(); });
-        this.stopTsneButton.on('click', function () { return _this.dataSet.stopTSNE(); });
-        this.perplexitySlider.value = this.perplexity.toString();
-        this.perplexitySlider.addEventListener('change', function () { return _this.updateTSNEPerplexityFromSliderChange(); });
-        this.updateTSNEPerplexityFromSliderChange();
-        this.learningRateInput.addEventListener('change', function () { return _this.updateTSNELearningRateFromUIChange(); });
-        this.updateTSNELearningRateFromUIChange();
-        this.setupCustomProjectionInputFields();
-        // TODO: figure out why `--paper-input-container-input` css mixin didn't
-        // work.
-        this.dom.selectAll('paper-dropdown-menu paper-input input')
-            .style('font-size', '14px');
-    };
-    ProjectionsPanel.prototype.restoreUIFromBookmark = function (bookmark) {
-        this.disablePolymerChangesTriggerReprojection();
-        // PCA
-        this.pcaX = bookmark.pcaComponentDimensions[0];
-        this.pcaY = bookmark.pcaComponentDimensions[1];
-        if (bookmark.pcaComponentDimensions.length === 3) {
-            this.pcaZ = bookmark.pcaComponentDimensions[2];
-        }
-        this.pcaIs3d = (bookmark.pcaComponentDimensions.length === 3);
-        // t-SNE
-        if (this.perplexitySlider) {
-            this.perplexitySlider.value = bookmark.tSNEPerplexity.toString();
-        }
-        if (this.learningRateInput) {
-            this.learningRateInput.value = bookmark.tSNELearningRate.toString();
-        }
-        this.tSNEis3d = bookmark.tSNEis3d;
-        // custom
-        this.customSelectedSearchByMetadataOption =
-            bookmark.customSelectedSearchByMetadataOption;
-        if (this.customProjectionXLeftInput) {
-            this.customProjectionXLeftInput.set(bookmark.customXLeftText, bookmark.customXLeftRegex);
-        }
-        if (this.customProjectionXRightInput) {
-            this.customProjectionXRightInput.set(bookmark.customXRightText, bookmark.customXRightRegex);
-        }
-        if (this.customProjectionYUpInput) {
-            this.customProjectionYUpInput.set(bookmark.customYUpText, bookmark.customYUpRegex);
-        }
-        if (this.customProjectionYDownInput) {
-            this.customProjectionYDownInput.set(bookmark.customYDownText, bookmark.customYDownRegex);
-        }
-        this.computeAllCentroids();
-        this.setZDropdownEnabled(this.pcaIs3d);
-        this.updateTSNEPerplexityFromSliderChange();
-        this.updateTSNELearningRateFromUIChange();
-        if (this.iterationLabel) {
-            this.iterationLabel.text(bookmark.tSNEIteration.toString());
-        }
-        this.showTab(bookmark.selectedProjection);
-        this.enablePolymerChangesTriggerReprojection();
-    };
-    ProjectionsPanel.prototype.populateBookmarkFromUI = function (bookmark) {
-        this.disablePolymerChangesTriggerReprojection();
-        // PCA
-        bookmark.pcaComponentDimensions = [this.pcaX, this.pcaY];
-        if (this.pcaIs3d) {
-            bookmark.pcaComponentDimensions.push(this.pcaZ);
-        }
-        // t-SNE
-        if (this.perplexitySlider != null) {
-            bookmark.tSNEPerplexity = +this.perplexitySlider.value;
-        }
-        if (this.learningRateInput != null) {
-            bookmark.tSNELearningRate = +this.learningRateInput.value;
-        }
-        bookmark.tSNEis3d = this.tSNEis3d;
-        // custom
-        bookmark.customSelectedSearchByMetadataOption =
-            this.customSelectedSearchByMetadataOption;
-        if (this.customProjectionXLeftInput != null) {
-            bookmark.customXLeftText = this.customProjectionXLeftInput.getValue();
-            bookmark.customXLeftRegex =
-                this.customProjectionXLeftInput.getInRegexMode();
-        }
-        if (this.customProjectionXRightInput != null) {
-            bookmark.customXRightText = this.customProjectionXRightInput.getValue();
-            bookmark.customXRightRegex =
-                this.customProjectionXRightInput.getInRegexMode();
-        }
-        if (this.customProjectionYUpInput != null) {
-            bookmark.customYUpText = this.customProjectionYUpInput.getValue();
-            bookmark.customYUpRegex = this.customProjectionYUpInput.getInRegexMode();
-        }
-        if (this.customProjectionYDownInput != null) {
-            bookmark.customYDownText = this.customProjectionYDownInput.getValue();
-            bookmark.customYDownRegex =
-                this.customProjectionYDownInput.getInRegexMode();
-        }
-        this.enablePolymerChangesTriggerReprojection();
-    };
-    // This method is marked as public as it is used as the view method that
-    // abstracts DOM manipulation so we can stub it in a test.
-    // TODO(nsthorat): Move this to its own class as the glue between this class
-    // and the DOM.
-    ProjectionsPanel.prototype.setZDropdownEnabled = function (enabled) {
-        if (this.zDropdown) {
-            this.zDropdown.attr('disabled', enabled ? null : true);
-        }
-    };
-    ProjectionsPanel.prototype.dataSetUpdated = function (dataSet, originalDataSet, dim) {
-        this.dataSet = dataSet;
-        this.originalDataSet = originalDataSet;
-        this.dim = dim;
-        var pointCount = (dataSet == null) ? 0 : dataSet.points.length;
-        var perplexity = Math.max(5, Math.ceil(Math.sqrt(pointCount) / 4));
-        this.perplexitySlider.value = perplexity.toString();
-        this.updateTSNEPerplexityFromSliderChange();
-        this.clearCentroids();
-        this.dom.select('#tsne-sampling')
-            .style('display', pointCount > data.TSNE_SAMPLE_SIZE ? null : 'none');
-        var wasSampled = (dataSet == null) ? false : (dataSet.dim[0] > data.PCA_SAMPLE_DIM ||
-            dataSet.dim[1] > data.PCA_SAMPLE_DIM);
-        this.dom.select('#pca-sampling')
-            .style('display', wasSampled ? null : 'none');
-        this.showTab('pca');
-    };
-    ProjectionsPanel.prototype._pcaDimensionToggleObserver = function () {
-        this.setZDropdownEnabled(this.pcaIs3d);
-        this.beginProjection(this.currentProjection);
-    };
-    ProjectionsPanel.prototype._tsneDimensionToggleObserver = function () {
-        this.beginProjection(this.currentProjection);
-    };
-    ProjectionsPanel.prototype.metadataChanged = function (spriteAndMetadata) {
-        // Project by options for custom projections.
-        var searchByMetadataIndex = -1;
-        this.searchByMetadataOptions = spriteAndMetadata.stats.map(function (stats, i) {
-            // Make the default label by the first non-numeric column.
-            if (!stats.isNumeric && searchByMetadataIndex === -1) {
-                searchByMetadataIndex = i;
-            }
-            return stats.name;
-        });
-        this.customSelectedSearchByMetadataOption =
-            this.searchByMetadataOptions[Math.max(0, searchByMetadataIndex)];
-    };
-    ProjectionsPanel.prototype.showTab = function (id) {
-        var _this = this;
-        this.currentProjection = id;
-        var tab = this.dom.select('.ink-tab[data-tab="' + id + '"]');
-        this.dom.selectAll('.ink-tab').classed('active', false);
-        tab.classed('active', true);
-        this.dom.selectAll('.ink-panel-content').classed('active', false);
-        this.dom.select('.ink-panel-content[data-panel="' + id + '"]')
-            .classed('active', true);
-        // guard for unit tests, where polymer isn't attached and $ doesn't exist.
-        if (this.$ != null) {
-            var main_1 = this.$['main'];
-            // In order for the projections panel to animate its height, we need to
-            // set it explicitly.
-            requestAnimationFrame(function () {
-                _this.style.height = main_1.clientHeight + 'px';
-            });
-        }
-        this.beginProjection(id);
-    };
-    ProjectionsPanel.prototype.beginProjection = function (projection) {
-        if (this.polymerChangesTriggerReprojection === false) {
-            return;
-        }
-        if (projection === 'pca') {
-            if (this.dataSet != null) {
-                this.dataSet.stopTSNE();
-            }
-            this.showPCA();
-        }
-        else if (projection === 'tsne') {
-            this.showTSNE();
-        }
-        else if (projection === 'custom') {
-            if (this.dataSet != null) {
-                this.dataSet.stopTSNE();
-            }
-            this.computeAllCentroids();
-            this.reprojectCustom();
-        }
-    };
-    ProjectionsPanel.prototype.showTSNE = function () {
-        var dataSet = this.dataSet;
-        if (dataSet == null) {
-            return;
-        }
-        var accessors = data.getProjectionComponents('tsne', [0, 1, this.tSNEis3d ? 2 : null]);
-        var dimensionality = this.tSNEis3d ? 3 : 2;
-        var projection = new data_1.Projection('tsne', accessors, dimensionality, dataSet);
-        this.projector.setProjection(projection);
-        if (!this.dataSet.hasTSNERun) {
-            this.runTSNE();
-        }
-        else {
-            this.projector.notifyProjectionPositionsUpdated();
-        }
-    };
-    ProjectionsPanel.prototype.runTSNE = function () {
-        var _this = this;
-        this.runTsneButton.attr('disabled', true);
-        this.stopTsneButton.attr('disabled', null);
-        this.dataSet.projectTSNE(this.perplexity, this.learningRate, this.tSNEis3d ? 3 : 2, function (iteration) {
-            if (iteration != null) {
-                _this.iterationLabel.text(iteration);
-                _this.projector.notifyProjectionPositionsUpdated();
-            }
-            else {
-                _this.runTsneButton.attr('disabled', null);
-                _this.stopTsneButton.attr('disabled', true);
-            }
-        });
-    };
-    // tslint:disable-next-line:no-unused-variable
-    ProjectionsPanel.prototype.showPCAIfEnabled = function () {
-        if (this.polymerChangesTriggerReprojection) {
-            this.showPCA();
-        }
-    };
-    ProjectionsPanel.prototype.updateTotalVarianceMessage = function () {
-        var variances = this.dataSet.fracVariancesExplained;
-        var totalVariance = variances[this.pcaX] + variances[this.pcaY];
-        var msg = 'Total variance described: ';
-        if (this.pcaIs3d) {
-            totalVariance += variances[this.pcaZ];
-        }
-        msg += (totalVariance * 100).toFixed(1) + '%.';
-        this.dom.select('#total-variance').html(msg);
-    };
-    ProjectionsPanel.prototype.showPCA = function () {
-        var _this = this;
-        if (this.dataSet == null) {
-            return;
-        }
-        this.dataSet.projectPCA().then(function () {
-            // Polymer properties are 1-based.
-            var accessors = data.getProjectionComponents('pca', [_this.pcaX, _this.pcaY, _this.pcaZ]);
-            var dimensionality = _this.pcaIs3d ? 3 : 2;
-            var projection = new data_1.Projection('pca', accessors, dimensionality, _this.dataSet);
-            _this.projector.setProjection(projection);
-            var numComponents = Math.min(NUM_PCA_COMPONENTS, _this.dataSet.dim[1]);
-            _this.updateTotalVarianceMessage();
-            _this.pcaComponents = d3.range(0, numComponents).map(function (i) {
-                var fracVariance = _this.dataSet.fracVariancesExplained[i];
-                return {
-                    id: i,
-                    componentNumber: i + 1,
-                    percVariance: (fracVariance * 100).toFixed(1)
-                };
-            });
-        });
-    };
-    ProjectionsPanel.prototype.reprojectCustom = function () {
-        if (this.centroids == null || this.centroids.xLeft == null ||
-            this.centroids.xRight == null || this.centroids.yUp == null ||
-            this.centroids.yDown == null) {
-            return;
-        }
-        var xDir = vector.sub(this.centroids.xRight, this.centroids.xLeft);
-        this.dataSet.projectLinear(xDir, 'linear-x');
-        var yDir = vector.sub(this.centroids.yUp, this.centroids.yDown);
-        this.dataSet.projectLinear(yDir, 'linear-y');
-        var accessors = data.getProjectionComponents('custom', ['x', 'y']);
-        var projection = new data_1.Projection('custom', accessors, 2, this.dataSet);
-        this.projector.setProjection(projection);
-    };
-    ProjectionsPanel.prototype.clearCentroids = function () {
-        this.centroids = { xLeft: null, xRight: null, yUp: null, yDown: null };
-        this.allCentroid = null;
-    };
-    ProjectionsPanel.prototype._customSelectedSearchByMetadataOptionChanged = function (newVal, oldVal) {
-        if (this.polymerChangesTriggerReprojection === false) {
-            return;
-        }
-        if (this.currentProjection === 'custom') {
-            this.computeAllCentroids();
-            this.reprojectCustom();
-        }
-    };
-    ProjectionsPanel.prototype.setupCustomProjectionInputFields = function () {
-        this.customProjectionXLeftInput =
-            this.setupCustomProjectionInputField('xLeft');
-        this.customProjectionXRightInput =
-            this.setupCustomProjectionInputField('xRight');
-        this.customProjectionYUpInput = this.setupCustomProjectionInputField('yUp');
-        this.customProjectionYDownInput =
-            this.setupCustomProjectionInputField('yDown');
-    };
-    ProjectionsPanel.prototype.computeAllCentroids = function () {
-        this.computeCentroid('xLeft');
-        this.computeCentroid('xRight');
-        this.computeCentroid('yUp');
-        this.computeCentroid('yDown');
-    };
-    ProjectionsPanel.prototype.computeCentroid = function (name) {
-        var input = this.querySelector('#' + name);
-        if (input == null) {
-            return;
-        }
-        var value = input.getValue();
-        if (value == null) {
-            return;
-        }
-        var inRegexMode = input.getInRegexMode();
-        var result = this.getCentroid(value, inRegexMode);
-        if (result.numMatches === 0) {
-            input.message = '0 matches. Using a random vector.';
-            result.centroid = vector.rn(this.dim);
-        }
-        else {
-            input.message = result.numMatches + " matches.";
-        }
-        this.centroids[name] = result.centroid;
-        this.centroidValues[name] = value;
-    };
-    ProjectionsPanel.prototype.setupCustomProjectionInputField = function (name) {
-        var _this = this;
-        var input = this.querySelector('#' + name);
-        input.registerInputChangedListener(function (input, inRegexMode) {
-            if (_this.polymerChangesTriggerReprojection) {
-                _this.computeCentroid(name);
-                _this.reprojectCustom();
-            }
-        });
-        return input;
-    };
-    ProjectionsPanel.prototype.getCentroid = function (pattern, inRegexMode) {
-        var _this = this;
-        if (pattern == null || pattern === '') {
-            return { numMatches: 0 };
-        }
-        // Search by the original dataset since we often want to filter and project
-        // only the nearest neighbors of A onto B-C where B and C are not nearest
-        // neighbors of A.
-        var accessor = function (i) { return _this.originalDataSet.points[i].vector; };
-        var r = this.originalDataSet.query(pattern, inRegexMode, this.customSelectedSearchByMetadataOption);
-        return { centroid: vector.centroid(r, accessor), numMatches: r.length };
-    };
-    ProjectionsPanel.prototype.getPcaSampledDimText = function () {
-        return data.PCA_SAMPLE_DIM.toLocaleString();
-    };
-    ProjectionsPanel.prototype.getPcaSampleSizeText = function () {
-        return data.PCA_SAMPLE_SIZE.toLocaleString();
-    };
-    ProjectionsPanel.prototype.getTsneSampleSizeText = function () {
-        return data.TSNE_SAMPLE_SIZE.toLocaleString();
-    };
-    return ProjectionsPanel;
-}(exports.ProjectionsPanelPolymer));
-exports.ProjectionsPanel = ProjectionsPanel;
-document.registerElement(ProjectionsPanel.prototype.is, ProjectionsPanel);
-
-},{"./data":7,"./vector":25,"./vz-projector-util":33}],33:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-function PolymerElement(spec) {
-    return Polymer.Class(spec);
-}
-exports.PolymerElement = PolymerElement;
-
-},{}],34:[function(require,module,exports){
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var analyticsLogger_1 = require('./analyticsLogger');
-var data = require('./data');
-var data_1 = require('./data');
-var data_provider_demo_1 = require('./data-provider-demo');
-var data_provider_proto_1 = require('./data-provider-proto');
-var data_provider_server_1 = require('./data-provider-server');
-var logging = require('./logging');
-var projectorScatterPlotAdapter_1 = require('./projectorScatterPlotAdapter');
-var scatterPlot_1 = require('./scatterPlot');
-var util = require('./util');
-// tslint:disable-next-line:no-unused-variable
-var vz_projector_util_1 = require('./vz-projector-util');
-/**
- * The minimum number of dimensions the data should have to automatically
- * decide to normalize the data.
- */
-var THRESHOLD_DIM_NORMALIZE = 50;
-var POINT_COLOR_MISSING = 'black';
-exports.ProjectorPolymer = vz_projector_util_1.PolymerElement({
-    is: 'vz-projector',
-    properties: {
-        routePrefix: String,
-        dataProto: { type: String, observer: '_dataProtoChanged' },
-        servingMode: String,
-        projectorConfigJsonPath: String,
-        pageViewLogging: Boolean,
-        eventLogging: Boolean
-    }
-});
-var INDEX_METADATA_FIELD = '__index__';
-var Projector = (function (_super) {
-    __extends(Projector, _super);
-    function Projector() {
-        _super.apply(this, arguments);
-    }
-    Projector.prototype.ready = function () {
-        this.dom = d3.select(this);
-        logging.setDomContainer(this);
-        this.analyticsLogger =
-            new analyticsLogger_1.AnalyticsLogger(this.pageViewLogging, this.eventLogging);
-        this.analyticsLogger.logPageView('embeddings');
-        if (!util.hasWebGLSupport()) {
-            this.analyticsLogger.logWebGLDisabled();
-            logging.setErrorMessage('Your browser or device does not have WebGL enabled. Please enable ' +
-                'hardware acceleration, or use a browser that supports WebGL.');
-            return;
-        }
-        this.selectionChangedListeners = [];
-        this.hoverListeners = [];
-        this.projectionChangedListeners = [];
-        this.distanceMetricChangedListeners = [];
-        this.selectedPointIndices = [];
-        this.neighborsOfFirstPoint = [];
-        this.dataPanel = this.$['data-panel'];
-        this.inspectorPanel = this.$['inspector-panel'];
-        this.inspectorPanel.initialize(this, this);
-        this.projectionsPanel = this.$['projections-panel'];
-        this.projectionsPanel.initialize(this);
-        this.bookmarkPanel = this.$['bookmark-panel'];
-        this.bookmarkPanel.initialize(this, this);
-        this.metadataCard = this.$['metadata-card'];
-        this.statusBar = this.dom.select('#status-bar');
-        this.scopeSubtree(this.$$('#notification-dialog'), true);
-        this.setupUIControls();
-        this.initializeDataProvider();
-    };
-    Projector.prototype.setSelectedLabelOption = function (labelOption) {
-        this.selectedLabelOption = labelOption;
-        this.metadataCard.setLabelOption(this.selectedLabelOption);
-        this.projectorScatterPlotAdapter.setLabelPointAccessor(labelOption);
-        this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-        this.projectorScatterPlotAdapter.render();
-    };
-    Projector.prototype.setSelectedColorOption = function (colorOption) {
-        this.selectedColorOption = colorOption;
-        this.projectorScatterPlotAdapter.setLegendPointColorer(this.getLegendPointColorer(colorOption));
-        this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-        this.projectorScatterPlotAdapter.render();
-    };
-    Projector.prototype.setNormalizeData = function (normalizeData) {
-        this.normalizeData = normalizeData;
-        this.setCurrentDataSet(this.originalDataSet.getSubset());
-    };
-    Projector.prototype.updateDataSet = function (ds, spriteAndMetadata, metadataFile) {
-        this.dataSetFilterIndices = null;
-        this.originalDataSet = ds;
-        if (ds != null) {
-            this.normalizeData =
-                this.originalDataSet.dim[1] >= THRESHOLD_DIM_NORMALIZE;
-            spriteAndMetadata = spriteAndMetadata || {};
-            if (spriteAndMetadata.pointsInfo == null) {
-                var _a = this.makeDefaultPointsInfoAndStats(ds.points), pointsInfo = _a[0], stats = _a[1];
-                spriteAndMetadata.pointsInfo = pointsInfo;
-                spriteAndMetadata.stats = stats;
-            }
-            var metadataMergeSucceeded = ds.mergeMetadata(spriteAndMetadata);
-            if (!metadataMergeSucceeded) {
-                return;
-            }
-        }
-        if (this.projectorScatterPlotAdapter != null) {
-            if (ds == null) {
-                this.projectorScatterPlotAdapter.setLabelPointAccessor(null);
-                this.setProjection(null);
-            }
-            else {
-                this.projectorScatterPlotAdapter.updateScatterPlotPositions();
-                this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-                this.projectorScatterPlotAdapter.resize();
-                this.projectorScatterPlotAdapter.render();
-            }
-        }
-        if (ds != null) {
-            this.dataPanel.setNormalizeData(this.normalizeData);
-            this.setCurrentDataSet(ds.getSubset());
-            this.projectorScatterPlotAdapter.setLabelPointAccessor(this.selectedLabelOption);
-            this.inspectorPanel.datasetChanged();
-            this.inspectorPanel.metadataChanged(spriteAndMetadata);
-            this.projectionsPanel.metadataChanged(spriteAndMetadata);
-            this.dataPanel.metadataChanged(spriteAndMetadata, metadataFile);
-            // Set the container to a fixed height, otherwise in Colab the
-            // height can grow indefinitely.
-            var container = this.dom.select('#container');
-            container.style('height', container.property('clientHeight') + 'px');
-        }
-        else {
-            this.setCurrentDataSet(null);
-        }
-    };
-    Projector.prototype.setSelectedTensor = function (run, tensorInfo) {
-        this.bookmarkPanel.setSelectedTensor(run, tensorInfo, this.dataProvider);
-    };
-    /**
-     * Registers a listener to be called any time the selected point set changes.
-     */
-    Projector.prototype.registerSelectionChangedListener = function (listener) {
-        this.selectionChangedListeners.push(listener);
-    };
-    Projector.prototype.filterDataset = function (pointIndices) {
-        var selectionSize = this.selectedPointIndices.length;
-        if (this.dataSetBeforeFilter == null) {
-            this.dataSetBeforeFilter = this.dataSet;
-        }
-        this.setCurrentDataSet(this.dataSet.getSubset(pointIndices));
-        this.dataSetFilterIndices = pointIndices;
-        this.projectorScatterPlotAdapter.updateScatterPlotPositions();
-        this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-        this.adjustSelectionAndHover(d3.range(selectionSize));
-    };
-    Projector.prototype.resetFilterDataset = function () {
-        var _this = this;
-        var originalPointIndices = this.selectedPointIndices.map(function (filteredIndex) { return _this.dataSet.points[filteredIndex].index; });
-        this.setCurrentDataSet(this.dataSetBeforeFilter);
-        if (this.projection != null) {
-            this.projection.dataSet = this.dataSetBeforeFilter;
-        }
-        this.dataSetBeforeFilter = null;
-        this.projectorScatterPlotAdapter.updateScatterPlotPositions();
-        this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-        this.dataSetFilterIndices = [];
-        this.adjustSelectionAndHover(originalPointIndices);
-    };
-    /**
-     * Used by clients to indicate that a selection has occurred.
-     */
-    Projector.prototype.notifySelectionChanged = function (newSelectedPointIndices) {
-        var _this = this;
-        this.selectedPointIndices = newSelectedPointIndices;
-        var neighbors = [];
-        if (newSelectedPointIndices.length === 1) {
-            neighbors = this.dataSet.findNeighbors(newSelectedPointIndices[0], this.inspectorPanel.distFunc, this.inspectorPanel.numNN);
-            this.metadataCard.updateMetadata(this.dataSet.points[newSelectedPointIndices[0]].metadata);
-        }
-        else {
-            this.metadataCard.updateMetadata(null);
-        }
-        this.selectionChangedListeners.forEach(function (l) { return l(_this.selectedPointIndices, neighbors); });
-    };
-    /**
-     * Registers a listener to be called any time the mouse hovers over a point.
-     */
-    Projector.prototype.registerHoverListener = function (listener) {
-        this.hoverListeners.push(listener);
-    };
-    /**
-     * Used by clients to indicate that a hover is occurring.
-     */
-    Projector.prototype.notifyHoverOverPoint = function (pointIndex) {
-        this.hoverListeners.forEach(function (l) { return l(pointIndex); });
-    };
-    Projector.prototype.registerProjectionChangedListener = function (listener) {
-        this.projectionChangedListeners.push(listener);
-    };
-    Projector.prototype.notifyProjectionChanged = function (projection) {
-        this.projectionChangedListeners.forEach(function (l) { return l(projection); });
-    };
-    Projector.prototype.registerDistanceMetricChangedListener = function (l) {
-        this.distanceMetricChangedListeners.push(l);
-    };
-    Projector.prototype.notifyDistanceMetricChanged = function (distMetric) {
-        this.distanceMetricChangedListeners.forEach(function (l) { return l(distMetric); });
-    };
-    Projector.prototype._dataProtoChanged = function (dataProtoString) {
-        var dataProto = dataProtoString ? JSON.parse(dataProtoString) : null;
-        this.initializeDataProvider(dataProto);
-    };
-    Projector.prototype.makeDefaultPointsInfoAndStats = function (points) {
-        var pointsInfo = [];
-        points.forEach(function (p) {
-            var pointInfo = {};
-            pointInfo[INDEX_METADATA_FIELD] = p.index;
-            pointsInfo.push(pointInfo);
-        });
-        var stats = [{
-                name: INDEX_METADATA_FIELD,
-                isNumeric: false,
-                tooManyUniqueValues: true,
-                min: 0,
-                max: pointsInfo.length - 1
-            }];
-        return [pointsInfo, stats];
-    };
-    Projector.prototype.initializeDataProvider = function (dataProto) {
-        if (this.servingMode === 'demo') {
-            var projectorConfigUrl = void 0;
-            // Only in demo mode do we allow the config being passed via URL.
-            var urlParams = util.getURLParams(window.location.search);
-            if ('config' in urlParams) {
-                projectorConfigUrl = urlParams['config'];
-            }
-            else {
-                projectorConfigUrl = this.projectorConfigJsonPath;
-            }
-            this.dataProvider = new data_provider_demo_1.DemoDataProvider(projectorConfigUrl);
-        }
-        else if (this.servingMode === 'server') {
-            if (!this.routePrefix) {
-                throw 'route-prefix is a required parameter';
-            }
-            this.dataProvider = new data_provider_server_1.ServerDataProvider(this.routePrefix);
-        }
-        else if (this.servingMode === 'proto' && dataProto != null) {
-            this.dataProvider = new data_provider_proto_1.ProtoDataProvider(dataProto);
-        }
-        this.dataPanel.initialize(this, this.dataProvider);
-    };
-    Projector.prototype.getLegendPointColorer = function (colorOption) {
-        var _this = this;
-        if ((colorOption == null) || (colorOption.map == null)) {
-            return null;
-        }
-        var colorer = function (ds, i) {
-            var value = ds.points[i].metadata[_this.selectedColorOption.name];
-            if (value == null) {
-                return POINT_COLOR_MISSING;
-            }
-            return colorOption.map(value);
-        };
-        return colorer;
-    };
-    Projector.prototype.get3DLabelModeButton = function () {
-        return this.querySelector('#labels3DMode');
-    };
-    Projector.prototype.get3DLabelMode = function () {
-        var label3DModeButton = this.get3DLabelModeButton();
-        return label3DModeButton.active;
-    };
-    Projector.prototype.adjustSelectionAndHover = function (selectedPointIndices, hoverIndex) {
-        this.notifySelectionChanged(selectedPointIndices);
-        this.notifyHoverOverPoint(hoverIndex);
-        this.setMouseMode(scatterPlot_1.MouseMode.CAMERA_AND_CLICK_SELECT);
-    };
-    Projector.prototype.setMouseMode = function (mouseMode) {
-        var selectModeButton = this.querySelector('#selectMode');
-        selectModeButton.active = (mouseMode === scatterPlot_1.MouseMode.AREA_SELECT);
-        this.projectorScatterPlotAdapter.scatterPlot.setMouseMode(mouseMode);
-    };
-    Projector.prototype.setCurrentDataSet = function (ds) {
-        this.adjustSelectionAndHover([]);
-        if (this.dataSet != null) {
-            this.dataSet.stopTSNE();
-        }
-        if ((ds != null) && this.normalizeData) {
-            ds.normalize();
-        }
-        this.dim = (ds == null) ? 0 : ds.dim[1];
-        this.dom.select('span.numDataPoints').text((ds == null) ? '0' : ds.dim[0]);
-        this.dom.select('span.dim').text((ds == null) ? '0' : ds.dim[1]);
-        this.dataSet = ds;
-        this.projectionsPanel.dataSetUpdated(this.dataSet, this.originalDataSet, this.dim);
-        this.projectorScatterPlotAdapter.setDataSet(this.dataSet);
-        this.projectorScatterPlotAdapter.scatterPlot
-            .setCameraParametersForNextCameraCreation(null, true);
-    };
-    Projector.prototype.setupUIControls = function () {
-        var _this = this;
-        // View controls
-        this.querySelector('#reset-zoom').addEventListener('click', function () {
-            _this.projectorScatterPlotAdapter.scatterPlot.resetZoom();
-            _this.projectorScatterPlotAdapter.scatterPlot.startOrbitAnimation();
-        });
-        var selectModeButton = this.querySelector('#selectMode');
-        selectModeButton.addEventListener('click', function (event) {
-            _this.setMouseMode(selectModeButton.active ? scatterPlot_1.MouseMode.AREA_SELECT :
-                scatterPlot_1.MouseMode.CAMERA_AND_CLICK_SELECT);
-        });
-        var nightModeButton = this.querySelector('#nightDayMode');
-        nightModeButton.addEventListener('click', function () {
-            _this.projectorScatterPlotAdapter.scatterPlot.setDayNightMode(nightModeButton.active);
-        });
-        var labels3DModeButton = this.get3DLabelModeButton();
-        labels3DModeButton.addEventListener('click', function () {
-            _this.projectorScatterPlotAdapter.set3DLabelMode(_this.get3DLabelMode());
-        });
-        window.addEventListener('resize', function () {
-            var container = _this.dom.select('#container');
-            var parentHeight = container.node().parentNode.clientHeight;
-            container.style('height', parentHeight + 'px');
-            _this.projectorScatterPlotAdapter.resize();
-        });
-        {
-            this.projectorScatterPlotAdapter = new projectorScatterPlotAdapter_1.ProjectorScatterPlotAdapter(this.getScatterContainer(), this);
-            this.projectorScatterPlotAdapter.setLabelPointAccessor(this.selectedLabelOption);
-        }
-        this.projectorScatterPlotAdapter.scatterPlot.onCameraMove(function (cameraPosition, cameraTarget) {
-            return _this.bookmarkPanel.clearStateSelection();
-        });
-        this.registerHoverListener(function (hoverIndex) { return _this.onHover(hoverIndex); });
-        this.registerSelectionChangedListener(function (selectedPointIndices, neighborsOfFirstPoint) {
-            return _this.onSelectionChanged(selectedPointIndices, neighborsOfFirstPoint);
-        });
-    };
-    Projector.prototype.onHover = function (hoverIndex) {
-        this.hoverPointIndex = hoverIndex;
-        var hoverText = null;
-        if (hoverIndex != null) {
-            var point = this.dataSet.points[hoverIndex];
-            if (point.metadata[this.selectedLabelOption]) {
-                hoverText = point.metadata[this.selectedLabelOption].toString();
-            }
-        }
-        if (this.selectedPointIndices.length === 0) {
-            this.statusBar.style('display', hoverText ? null : 'none');
-            this.statusBar.text(hoverText);
-        }
-    };
-    Projector.prototype.getScatterContainer = function () {
-        return this.dom.select('#scatter');
-    };
-    Projector.prototype.onSelectionChanged = function (selectedPointIndices, neighborsOfFirstPoint) {
-        this.selectedPointIndices = selectedPointIndices;
-        this.neighborsOfFirstPoint = neighborsOfFirstPoint;
-        var totalNumPoints = this.selectedPointIndices.length + neighborsOfFirstPoint.length;
-        this.statusBar.text("Selected " + totalNumPoints + " points")
-            .style('display', totalNumPoints > 0 ? null : 'none');
-    };
-    Projector.prototype.setProjection = function (projection) {
-        this.projection = projection;
-        if (projection != null) {
-            this.analyticsLogger.logProjectionChanged(projection.projectionType);
-        }
-        this.notifyProjectionChanged(projection);
-    };
-    Projector.prototype.notifyProjectionPositionsUpdated = function () {
-        this.projectorScatterPlotAdapter.notifyProjectionPositionsUpdated();
-    };
-    /**
-     * Gets the current view of the embedding and saves it as a State object.
-     */
-    Projector.prototype.getCurrentState = function () {
-        var state = new data_1.State();
-        // Save the individual datapoint projections.
-        state.projections = [];
-        for (var i = 0; i < this.dataSet.points.length; i++) {
-            var point = this.dataSet.points[i];
-            var projections = {};
-            var keys = Object.keys(point.projections);
-            for (var j = 0; j < keys.length; ++j) {
-                projections[keys[j]] = point.projections[keys[j]];
-            }
-            state.projections.push(projections);
-        }
-        state.selectedProjection = this.projection.projectionType;
-        state.dataSetDimensions = this.dataSet.dim;
-        state.tSNEIteration = this.dataSet.tSNEIteration;
-        state.selectedPoints = this.selectedPointIndices;
-        state.filteredPoints = this.dataSetFilterIndices;
-        this.projectorScatterPlotAdapter.populateBookmarkFromUI(state);
-        state.selectedColorOptionName = this.dataPanel.selectedColorOptionName;
-        state.forceCategoricalColoring = this.dataPanel.forceCategoricalColoring;
-        state.selectedLabelOption = this.selectedLabelOption;
-        this.projectionsPanel.populateBookmarkFromUI(state);
-        return state;
-    };
-    /** Loads a State object into the world. */
-    Projector.prototype.loadState = function (state) {
-        this.setProjection(null);
-        {
-            this.projectionsPanel.disablePolymerChangesTriggerReprojection();
-            if (this.dataSetBeforeFilter != null) {
-                this.resetFilterDataset();
-            }
-            if (state.filteredPoints != null) {
-                this.filterDataset(state.filteredPoints);
-            }
-            this.projectionsPanel.enablePolymerChangesTriggerReprojection();
-        }
-        for (var i = 0; i < state.projections.length; i++) {
-            var point = this.dataSet.points[i];
-            var projection = state.projections[i];
-            var keys = Object.keys(projection);
-            for (var j = 0; j < keys.length; ++j) {
-                point.projections[keys[j]] = projection[keys[j]];
-            }
-        }
-        this.dataSet.hasTSNERun = (state.selectedProjection === 'tsne');
-        this.dataSet.tSNEIteration = state.tSNEIteration;
-        this.projectionsPanel.restoreUIFromBookmark(state);
-        this.inspectorPanel.restoreUIFromBookmark(state);
-        this.dataPanel.selectedColorOptionName = state.selectedColorOptionName;
-        this.dataPanel.setForceCategoricalColoring(!!state.forceCategoricalColoring);
-        this.selectedLabelOption = state.selectedLabelOption;
-        this.projectorScatterPlotAdapter.restoreUIFromBookmark(state);
-        {
-            var dimensions = data_1.stateGetAccessorDimensions(state);
-            var components = data.getProjectionComponents(state.selectedProjection, dimensions);
-            var projection = new data_1.Projection(state.selectedProjection, components, dimensions.length, this.dataSet);
-            this.setProjection(projection);
-        }
-        this.notifySelectionChanged(state.selectedPoints);
-    };
-    return Projector;
-}(exports.ProjectorPolymer));
-exports.Projector = Projector;
-document.registerElement(Projector.prototype.is, Projector);
-
-},{"./analyticsLogger":1,"./data":7,"./data-provider-demo":3,"./data-provider-proto":4,"./data-provider-server":5,"./logging":12,"./projectorScatterPlotAdapter":14,"./scatterPlot":16,"./util":24,"./vz-projector-util":33}],35:[function(require,module,exports){
-arguments[4][8][0].apply(exports,arguments)
-},{"dup":8}]},{},[35,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34]);
-</script>
-</dom-module>
-</body></html>
diff --git a/tensorflow/tensorboard/gulp_tasks/bower.js b/tensorflow/tensorboard/gulp_tasks/bower.js
deleted file mode 100644
index 8f4666a8c1..0000000000
--- a/tensorflow/tensorboard/gulp_tasks/bower.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-const gulp = require('gulp');
-const bower = require('gulp-bower');
-
-module.exports = function() {
-  return function() {
-    return bower();
-  }
-}
diff --git a/tensorflow/tensorboard/gulp_tasks/compile.js b/tensorflow/tensorboard/gulp_tasks/compile.js
deleted file mode 100644
index 01af60eba7..0000000000
--- a/tensorflow/tensorboard/gulp_tasks/compile.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-const gulp = require('gulp');
-const ts = require('gulp-typescript');
-const typescript = require('typescript');
-const gutil = require('gulp-util');
-const filter = require('gulp-filter');
-const merge = require('merge2');
-const browserify = require('browserify');
-const tsify = require('tsify');
-const source = require('vinyl-source-stream');
-const glob = require('glob').sync;
-const concat = require('gulp-concat');
-
-const tsProject = ts.createProject('./tsconfig.json', {
-  typescript: typescript,
-  noExternalResolve: true,  // opt-in for faster compilation!
-});
-
-/** List of components (and their external deps) that are using es6 modules. */
-const ES6_COMPONENTS = [{
-  name: 'vz_projector',
-  deps: [
-    'd3/d3.min.js', 'weblas/dist/weblas.js', 'three.js/build/three.min.js',
-    'three.js/examples/js/controls/OrbitControls.js',
-    'numericjs/lib/numeric-1.2.6.js'
-  ]
-}];
-
-module.exports = function(includeDeps) {
-  return function() {
-    // Compile all components that are using ES6 modules into a bundle.js
-    // using browserify.
-    const entries = ['typings/index.d.ts'];
-    const deps = {};
-    ES6_COMPONENTS.forEach(function(component) {
-      // Collect all the typescript files across the components.
-      entries = entries.concat(glob(
-          'components/' + component.name + '/**/*.ts',
-          // Do not include tests or IDE-purposed files.
-          {ignore: ['**/*_test.ts', '**/deps.d.ts']}));
-      // Collect the unique external deps across all components using es6
-      // modules.
-      component.deps.forEach(function(dep) {
-        deps['components/' + dep] = true;
-      });
-    });
-    deps = Object.keys(deps);
-
-    // Compile, bundle all the typescript files and prepend their deps.
-    browserify(entries)
-        .plugin(tsify)
-        .bundle()
-        .on('error', function(error) { console.error(error.toString()); })
-        .pipe(source('bundle.js'))
-        .pipe(gulp.dest('components'))
-        .on('end', function() {
-          // Typescript was compiled and bundled. Now we need to prepend
-          // the external dependencies.
-          if (includeDeps) {
-            gulp.src(deps.concat(['components/bundle.js']))
-                .pipe(concat('bundle.js'))
-                .pipe(gulp.dest('components'));
-          }
-        });
-
-    // Compile components that are using global namespaces producing 1 js file
-    // for each ts file.
-    const isComponent = filter([
-      'components/tf_*/**/*.ts', 'components/vz_*/**/*.ts', 'typings/**/*.ts',
-      'components/plottable/plottable.d.ts'
-      // Ignore components that use es6 modules.
-    ].concat(ES6_COMPONENTS.map(function(component) {
-      return '!components/' + component.name + '/**/*.ts';
-    })));
-
-    return tsProject.src()
-        .pipe(isComponent)
-        .pipe(ts(tsProject))
-        .js.pipe(gulp.dest('.'));
-  };
-};
diff --git a/tensorflow/tensorboard/gulp_tasks/test.js b/tensorflow/tensorboard/gulp_tasks/test.js
deleted file mode 100644
index 0c8b14a4cd..0000000000
--- a/tensorflow/tensorboard/gulp_tasks/test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-const gulp = require('gulp');
-const tester = require('web-component-tester').test;
-
-module.exports = function(done) {
-  tester({}, function(error) {
-    if (error) {
-      // Pretty error for gulp.
-      error = new Error(error.message || error);
-      error.showStack = false;
-    }
-    done(error);
-  });
-}
diff --git a/tensorflow/tensorboard/gulp_tasks/util.js b/tensorflow/tensorboard/gulp_tasks/util.js
deleted file mode 100644
index 0d73f69c73..0000000000
--- a/tensorflow/tensorboard/gulp_tasks/util.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-const fs = require('fs');
-const path = require('path');
-
-/**
- * Returns a list of web components inside the components directory for which
- * the name predicate is true.
- */
-exports.getComponents = function(namePredicate) {
-  return fs.readdirSync('components')
-      .filter(function(file) {
-        return fs.statSync(path.join('components', file)).isDirectory() &&
-            namePredicate(file);
-      })
-      .map(function(dir) { return '/' + dir + '/'; });
-};
-
-/**
- * Returns a list of tensorboard web components that are inside the components
- * directory.
- */
-exports.tbComponents = exports.getComponents(function(name) {
-  const prefix = name.slice(0, 3);
-  return prefix == 'tf_' || prefix == 'vz_';
-});
diff --git a/tensorflow/tensorboard/gulp_tasks/vulcanize.js b/tensorflow/tensorboard/gulp_tasks/vulcanize.js
deleted file mode 100644
index d2286f1d6c..0000000000
--- a/tensorflow/tensorboard/gulp_tasks/vulcanize.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-const gulp = require('gulp');
-const path = require('path');
-const util = require('./util');
-const vulcanize = require('gulp-vulcanize');
-const replace = require('gulp-replace');
-const rename = require('gulp-rename');
-const header = require('gulp-header');
-
-const HEADER_STR =
-    '<!-- Copyright 2015 The TensorFlow Authors. All Rights Reserved.\n\
-\n\
-Licensed under the Apache License, Version 2.0 (the "License");\n\
-you may not use this file except in compliance with the License.\n\
-You may obtain a copy of the License at\n\
-\n\
-   http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-Unless required by applicable law or agreed to in writing, software\n\
-distributed under the License is distributed on an "AS IS" BASIS,\n\
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-See the License for the specific language governing permissions and\n\
-limitations under the License.\n\
-============================================================================\n\
-\n\
-This file is generated by `gulp` & `vulcanize`. Do not directly change it.\n\
-Instead, use `gulp regenerate` to create a new version with your changes.\n\
--->\n\n'
-
-const base = path.join(__dirname, '../components');
-// List of redirects of the form path1|path2 for every tensorboard component
-// in order to replace dashes with underscores.
-// E.g. .../tf-tensorboard|.../tf_tensorboard
-const redirects = util.tbComponents.map(function(dir) {
-  return path.join(base, dir.replace(/_/g, '-')) + '|' + path.join(base, dir);
-});
-
-const nonTBComponents = util.getComponents(function(name) {
-  const prefix = name.slice(0, 3);
-  return prefix !== 'tf_'  && prefix !== 'vz_';
-});
-
-// These manual additions are necessary. The task should not inline these
-// third-party javascript files. However, vulcanization still needs the HTML
-// files found within those directories. Upon adding new third-party javascript,
-// consider updating this list.
-nonTBComponents.push('/tf-imports/d3.js');
-nonTBComponents.push('/tf-imports/dagre.js');
-nonTBComponents.push('/tf-imports/graphlib.js');
-nonTBComponents.push('/tf-imports/lodash.js');
-nonTBComponents.push('/tf-imports/plottable.js');
-
-module.exports = function(overwrite) {
-  return function() {
-    const suffix = overwrite ? '' : '.OPENSOURCE';
-    // Vulcanize TensorBoard without external libraries.
-    gulp.src('components/tf_tensorboard/tf-tensorboard.html')
-        .pipe(vulcanize({
-          inlineScripts: true,
-          inlineCss: true,
-          stripComments: true,
-          excludes: nonTBComponents,
-          redirects: redirects
-        }))
-        .pipe(header(HEADER_STR))
-        .pipe(rename('tf-tensorboard.html' + suffix))
-        .pipe(gulp.dest('./dist'));
-  }
-}
diff --git a/tensorflow/tensorboard/gulpfile.js b/tensorflow/tensorboard/gulpfile.js
deleted file mode 100644
index c03c4faebc..0000000000
--- a/tensorflow/tensorboard/gulpfile.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-const gulp = require('gulp');
-const server = require('gulp-server-livereload');
-const minimist = require('minimist');
-const util = require('./gulp_tasks/util');
-
-const options = minimist(process.argv.slice(2), {
-  default: {
-    p: 8000,       // port for gulp server
-    h: '0.0.0.0',  // host to serve on
-  }
-});
-
-function getTask(task) {
-    return require('./gulp_tasks/' + task);
-}
-
-
-gulp.task('compile', getTask('compile')(true));
-gulp.task('first-compile', getTask('compile')(true));
-gulp.task('compile-without-deps', getTask('compile')(false));
-gulp.task('test.onlytest', getTask('test'));
-gulp.task('test', ['compile'], getTask('test'));
-
-gulp.task('watch', [], function() {
-  // Avoid watching generated .d.ts in the build (aka output) directory.
-  return gulp.watch(
-      ['components/tf_*/**/*.ts', 'components/vz_*/**/*.ts'],
-      {ignoreInitial: true}, ['compile']);
-});
-
-const httpPrefix = 'http://' + options.h + ':' + options.p + '/components';
-const proxies = util.tbComponents.map(function(component) {
-  return {
-    source: '/components' + component.replace(/_/g, '-'),
-    target: httpPrefix + component
-  };
-});
-
-// Do first-compile before turning on server, to avoid spamming
-// livereload info
-// TODO(danmane): Disconnect this once we can get livereload to
-// no longer spam.
-gulp.task('server', ['first-compile'], function() {
-  gulp.src('.').pipe(server({
-    host: options.h,
-    port: options.p,
-    livereload: {
-      enable: true,
-      // Don't livereload on .ts changes, since they aren't loaded by browser.
-      filter: function(filePath, cb) { cb(!(/\.ts$/.test(filePath))); },
-      port: 27729 + options.p
-    },
-    proxies: proxies,
-    directoryListing: true,
-  }));
-});
-
-// TODO(danmane): When testing is nicer, integrate into vulcanize task
-// gulp vulcanize: Regenerate the tf-tensorboard.html.OPENSOURCE file for pre-release
-gulp.task(
-    'vulcanize', ['compile-without-deps'],
-    getTask('vulcanize')(false));
-// gulp regenerate: Regenerate the tf-tensorboard.html for interactive bazel development
-gulp.task(
-    'regenerate', ['compile-without-deps'],
-    getTask('vulcanize')(true));
-
-// TODO(danmane): consider making bower install part of default task
-gulp.task('default', ['watch', 'server']);
-
-// Clean all compiled JS files.
-const cleanCompiledTypeScript = require('gulp-clean-compiled-typescript');
-gulp.task('clean', function () {
-  return gulp.src(['./components/**/*.ts', '!./components/**/deps.d.ts'])
-      .pipe(cleanCompiledTypeScript());
-});
diff --git a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
index 07fc3a70a7..de57d7ce2e 100644
--- a/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
+++ b/tensorflow/tensorboard/java/org/tensorflow/tensorboard/vulcanize/BUILD
@@ -5,6 +5,7 @@ licenses(["notice"])  # Apache 2.0
 java_binary(
     name = "Vulcanize",
     srcs = ["Vulcanize.java"],
+    visibility = ["//visibility:public"],
     deps = [
         "@com_google_guava",
         "@com_google_protobuf_java",
diff --git a/tensorflow/tensorboard/lib/BUILD b/tensorflow/tensorboard/lib/BUILD
deleted file mode 100644
index 9c497396c6..0000000000
--- a/tensorflow/tensorboard/lib/BUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Description:
-# BUILD rules for the static resources in TensorBoard.
-
-package(default_visibility = [
-    "//tensorflow:internal",
-])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files([
-    "LICENSE",
-])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        [
-            "**/*",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/lib/css/global.css b/tensorflow/tensorboard/lib/css/global.css
deleted file mode 100644
index cb6e966fdd..0000000000
--- a/tensorflow/tensorboard/lib/css/global.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-html, body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
-  font-family: "RobotoDraft","Roboto",sans-serif;
-}
diff --git a/tensorflow/tensorboard/package.json b/tensorflow/tensorboard/package.json
deleted file mode 100644
index d424f103dd..0000000000
--- a/tensorflow/tensorboard/package.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "name": "tensorflow-vis",
-  "version": "0.0.0",
-  "description": "Visualizers for TensorFlow",
-  "scripts": {
-    "test": "gulp test",
-    "prep": "npm install && bower install && typings install",
-    "compile": "gulp compile"
-  },
-  "keywords": [
-    "tensorflow"
-  ],
-  "author": "Google",
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "browserify": "^13.1.0",
-    "gulp": "~3.9.0",
-    "gulp-bower": "0.0.13",
-    "gulp-clean-compiled-typescript": "~1.0.1",
-    "gulp-cli": "^1.1.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-filter": "~3.0.1",
-    "gulp-header": "~1.7.1",
-    "gulp-rename": "~1.2.2",
-    "gulp-replace": "~0.5.4",
-    "gulp-server-livereload": "1.9.2",
-    "gulp-typescript": "~2.10.0",
-    "gulp-util": "~3.0.7",
-    "gulp-vulcanize": "~6.1.0",
-    "merge2": "~0.3.6",
-    "minimist": "~1.2.0",
-    "tsify": "^0.14.8",
-    "typescript": "2.3.1",
-    "typings": "1.4.0",
-    "vinyl-source-stream": "^1.1.0",
-    "vulcanize": "^1.14.0",
-    "web-component-tester": "4.2.2"
-  }
-}
diff --git a/tensorflow/tensorboard/tsconfig.json b/tensorflow/tensorboard/tsconfig.json
deleted file mode 100644
index ac69c30533..0000000000
--- a/tensorflow/tensorboard/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "noImplicitAny": false,
-    "noEmitOnError": true,
-    "target": "ES5",
-    "module": "commonjs"
-  },
-  "compileOnSave": false,
-  "exclude": [
-    "node_modules",
-    "typings/main.d.ts",
-    "typings/main",
-    "lib",
-    "components/**/deps.d.ts"
-  ]
-}
diff --git a/tensorflow/tensorboard/wct.conf.json b/tensorflow/tensorboard/wct.conf.json
deleted file mode 100644
index 519218ce41..0000000000
--- a/tensorflow/tensorboard/wct.conf.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "suites": [
-    "components/tf_*/test",
-    "components/vz_*/test"
-  ],
-  "plugins": ["local"]
-}
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 377a687c34..c44b966451 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -96,6 +96,7 @@ filegroup(
         "//third_party/hadoop:LICENSE.txt",
         "@boringssl//:LICENSE",
         "@com_googlesource_code_re2//:LICENSE",
+        "@com_microsoft_typescript//:LICENSE.txt",
         "@curl//:COPYING",
         "@eigen_archive//:COPYING.MPL2",
         "@farmhash_archive//:COPYING",
@@ -109,13 +110,14 @@ filegroup(
         "@libxsmm_archive//:LICENSE",
         "@local_config_sycl//sycl:LICENSE.text",
         "@nanopb_git//:LICENSE.txt",
-        "@png_archive//:LICENSE",
-        "@protobuf//:LICENSE",
-        "@six_archive//:LICENSE",
         "@org_html5lib//:LICENSE",
         "@org_mozilla_bleach//:LICENSE",
+        "@org_nodejs//:LICENSE",
         "@org_pocoo_werkzeug//:LICENSE",
         "@org_pythonhosted_markdown//:LICENSE.md",
+        "@png_archive//:LICENSE",
+        "@protobuf//:LICENSE",
+        "@six_archive//:LICENSE",
         "@snappy//:COPYING",
         "@zlib_archive//:zlib.h",
     ] + if_not_windows([
diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index f8982073c3..ae6516db89 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -190,10 +190,7 @@ setup(
     package_data={
         'tensorflow': [
             EXTENSION_NAME,
-            'tensorboard/dist/bazel-html-imports.html',
-            'tensorboard/dist/index.html',
-            'tensorboard/dist/tf-tensorboard.html',
-            'tensorboard/lib/css/global.css',
+            'tensorboard/components/index.html',
             'tensorboard/TAG',
         ] + matches,
     },
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 2a206b0acd..f41dffefec 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -669,6 +669,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
           ],
       },
       sha256_urls_windows = {
+          "3d4cfca9dcec556a077a2324bf5bd165ea3e6e64a2bfd7fc6e7a1f0dc4eb552b": [
+              "http://mirror.bazel.build/raw.githubusercontent.com/nodejs/node/v4.3.2/LICENSE",
+              "https://raw.githubusercontent.com/nodejs/node/v4.3.2/LICENSE",
+          ],
           "606c44c42d17866c017c50c0afadad411d9492ac4281d2431b937f881911614e": [
               "http://mirror.bazel.build/nodejs.org/dist/v4.3.2/win-x64/node.exe",
               "http://nodejs.org/dist/v4.3.2/win-x64/node.exe",
@@ -698,6 +702,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "com_microsoft_typescript",
       licenses = ["notice"],  # Apache 2.0
       sha256_urls = {
+          "a7d00bfd54525bc694b6e32f64c7ebcf5e6b7ae3657be5cc12767bce74654a47": [
+              "http://mirror.bazel.build/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/LICENSE.txt",
+              "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/LICENSE.txt",
+          ],
           "8465342c318f9c4cf0a29b109fa63ee3742dd4dc7080d05d9fd8f604814d04cf": [
               "http://mirror.bazel.build/raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js",
               "https://raw.githubusercontent.com/Microsoft/TypeScript/v2.3.1/lib/tsc.js",
@@ -754,6 +762,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       # no @license header
       licenses = ["notice"],  # MIT
       sha256_urls = {
+          "0e94aada97f12dee6118064add9170484c55022f5d53206ee4407143cd36ddcd": [
+              "http://mirror.bazel.build/raw.githubusercontent.com/sloisel/numeric/v1.2.6/license.txt",
+              "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/license.txt",
+          ],
           "dfaca3b8485bee735788cc6eebca82ea25719adc1fb8911c7799c6bd5a95df3b": [
               "http://mirror.bazel.build/raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
               "https://raw.githubusercontent.com/sloisel/numeric/v1.2.6/src/numeric.js",
@@ -802,6 +814,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       # no @license header
       licenses = ["notice"],  # MIT
       sha256_urls = {
+          "6a349742a6cb219d5a2fc8d0844f6d89a6efc62e20c664450d884fc7ff2d6015": [
+              "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/LICENSE",
+              "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/LICENSE",
+          ],
           "7323829ddd77924a69e2b1235ded3eac30acd990da0f037e0fbd3c8e9035b50d": [
               "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
               "https://raw.githubusercontent.com/cpettitt/dagre/v0.7.4/dist/dagre.core.js",
@@ -813,6 +829,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       name = "io_github_cpettitt_graphlib",
       licenses = ["notice"],  # MIT
       sha256_urls = {
+          "6a349742a6cb219d5a2fc8d0844f6d89a6efc62e20c664450d884fc7ff2d6015": [
+              "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/LICENSE",
+              "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/LICENSE",
+          ],
           "772045d412b1513b549be991c2e1846c38019429d43974efcae943fbe83489bf": [
               "http://mirror.bazel.build/raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
               "https://raw.githubusercontent.com/cpettitt/graphlib/v1.0.7/dist/graphlib.core.js",
@@ -825,6 +845,10 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
       # no @license header
       licenses = ["notice"],  # MIT
       sha256_urls = {
+          "633f2861a9a862b9cd7967e841e14dd3527912f209d6563595774fa31e3d84cb": [
+              "http://mirror.bazel.build/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/LICENSES",
+              "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/LICENSE",
+          ],
           "f138fce57f673ca8a633f4aee5ae5b6fcb6ad0de59069a42a74e996fd04d8fcc": [
               "http://mirror.bazel.build/raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
               "https://raw.githubusercontent.com/waylonflinn/weblas/v0.9.0/dist/weblas.js",
-- 
GitLab


From 6507a55534b76bf908cce48125dc619da63df7b5 Mon Sep 17 00:00:00 2001
From: Johannes Mayer <haniballsadresse@gmx.at>
Date: Thu, 18 May 2017 02:02:04 +0200
Subject: [PATCH 1473/1563] download if not exists, extract never overwrite
 (#9768)

Removed the comment for wget and added arguments so that download and extract happens just once
---
 tensorflow/examples/tutorials/deepdream/deepdream.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/examples/tutorials/deepdream/deepdream.ipynb b/tensorflow/examples/tutorials/deepdream/deepdream.ipynb
index 4ff8e368c4..186c14b4fd 100644
--- a/tensorflow/examples/tutorials/deepdream/deepdream.ipynb
+++ b/tensorflow/examples/tutorials/deepdream/deepdream.ipynb
@@ -120,7 +120,7 @@
    },
    "outputs": [],
    "source": [
-    "#!wget https://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip && unzip inception5h.zip"
+    "!wget -nc https://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip && unzip -n inception5h.zip"
    ]
   },
   {
-- 
GitLab


From 5c1949e4bc4b50a77a3a53f4d3d1591d84736366 Mon Sep 17 00:00:00 2001
From: Mustafa Ispir <ispir@google.com>
Date: Wed, 17 May 2017 17:04:12 -0700
Subject: [PATCH 1474/1563] Make indicator_column works well with
 pandas_input_fn (supports 1D sparse input)

PiperOrigin-RevId: 156375227
---
 tensorflow/python/feature_column/feature_column.py | 11 ++++++++++-
 .../python/feature_column/feature_column_test.py   | 14 +++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 61c02a2fc6..0e5f256492 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -2338,6 +2338,9 @@ class _IndicatorColumn(_DenseColumn,
 
     Returns:
       Transformed feature `Tensor`.
+
+    Raises:
+      ValueError: if input rank is not known at graph building time.
     """
     id_weight_pair = self.categorical_column._get_sparse_tensors(inputs)  # pylint: disable=protected-access
     id_tensor = id_weight_pair.id_tensor
@@ -2362,8 +2365,14 @@ class _IndicatorColumn(_DenseColumn,
         on_value=1.0,
         off_value=0.0)
 
+    output_rank = one_hot_id_tensor.get_shape().ndims
+    if output_rank is None:
+      raise ValueError('Input rank should be known at graph building time.')
+    if output_rank <= 2:
+      return one_hot_id_tensor
+
     # Reduce to get a multi-hot per example.
-    return math_ops.reduce_sum(one_hot_id_tensor, axis=[1])
+    return math_ops.reduce_sum(one_hot_id_tensor, axis=[-2])
 
   @property
   def _parse_example_spec(self):
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 83250b5d1d..4cd3ea62c4 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -2754,13 +2754,13 @@ class IndicatorColumnTest(test.TestCase):
     self.assertEqual(indicator_b.categorical_column.name, 'b')
     self.assertEqual(indicator_b._variable_shape, [1, 100])
 
-  def test_1D_shape_fails(self):
-    with self.assertRaisesRegexp(ValueError, 'must have rank 2'):
-      _LazyBuilder({
-          'animal':
-              sparse_tensor.SparseTensor(
-                  indices=[0], values=['fox'], dense_shape=[1])
-      })
+  def test_1D_shape_succeeds(self):
+    animal = fc.indicator_column(
+        fc.categorical_column_with_hash_bucket('animal', 4))
+    builder = _LazyBuilder({'animal': ['fox', 'fox']})
+    output = builder.get(animal)
+    with self.test_session():
+      self.assertAllEqual([[0., 0., 1., 0.], [0., 0., 1., 0.]], output.eval())
 
   def test_2D_shape_succeeds(self):
     # TODO(ispir/cassandrax): Swith to categorical_column_with_keys when ready.
-- 
GitLab


From d87007ac1c765874fefceafe672ee6024e12c2d9 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 17:09:01 -0700
Subject: [PATCH 1475/1563] Fix a bug in Scaffold's copy_from_scaffold argument
 because tf.Tensor cannot be converted to python bool

PiperOrigin-RevId: 156375789
---
 .../python/training/monitored_session.py      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/training/monitored_session.py b/tensorflow/python/training/monitored_session.py
index 7f737399ab..b184aae159 100644
--- a/tensorflow/python/training/monitored_session.py
+++ b/tensorflow/python/training/monitored_session.py
@@ -129,19 +129,23 @@ class Scaffold(object):
       copy_from_scaffold: Optional scaffold object to copy fields from. Its
         fields will be overwritten by the provided fields in this function.
     """
-    if copy_from_scaffold:
+    if copy_from_scaffold is not None:
       if not isinstance(copy_from_scaffold, Scaffold):
         raise TypeError('copy_from_scaffold is not a Scaffold instance.')
-      init_op = init_op or copy_from_scaffold.init_op
-      init_feed_dict = init_feed_dict or copy_from_scaffold.init_feed_dict
+      # We need _coalesce since Tensor is not converted to bool automatically,
+      # so the common idiom of (a or b) does not work.
+      coalesce = lambda a, b: a if a is not None else b
+      init_op = coalesce(init_op, copy_from_scaffold.init_op)
+      init_feed_dict = coalesce(init_feed_dict,
+                                copy_from_scaffold.init_feed_dict)
       # Use the original init_fn provided by the user to init the new Scaffold.
-      init_fn = init_fn or copy_from_scaffold._user_init_fn  # pylint: disable=protected-access
-      ready_op = ready_op or copy_from_scaffold.ready_op
-      ready_for_local_init_op = ready_for_local_init_op or (
-          copy_from_scaffold.ready_for_local_init_op)
-      local_init_op = local_init_op or copy_from_scaffold.local_init_op
-      summary_op = summary_op or copy_from_scaffold.summary_op
-      saver = saver or copy_from_scaffold.saver
+      init_fn = coalesce(init_fn, copy_from_scaffold._user_init_fn)  # pylint: disable=protected-access
+      ready_op = coalesce(ready_op, copy_from_scaffold.ready_op)
+      ready_for_local_init_op = coalesce(
+          ready_for_local_init_op, copy_from_scaffold.ready_for_local_init_op)
+      local_init_op = coalesce(local_init_op, copy_from_scaffold.local_init_op)
+      summary_op = coalesce(summary_op, copy_from_scaffold.summary_op)
+      saver = coalesce(saver, copy_from_scaffold.saver)
 
     # NOTE(touts): modifying the init function to be passed the scaffold is a
     # hack to make it easy to find the saver.  Is there a better way?
@@ -152,12 +156,12 @@ class Scaffold(object):
       self._init_fn = None
 
     self._init_op = init_op
+    self._init_feed_dict = init_feed_dict
     self._ready_op = ready_op
     self._ready_for_local_init_op = ready_for_local_init_op
     self._local_init_op = local_init_op
     self._summary_op = summary_op
     self._saver = saver
-    self._init_feed_dict = init_feed_dict
 
   def finalize(self):
     """Creates operations if needed and finalizes the graph."""
-- 
GitLab


From abae4305a6208bde6072d257a6ce734a8d369089 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Wed, 17 May 2017 17:13:59 -0700
Subject: [PATCH 1476/1563] Propagate any I/O errors during close() when using
 TFRecordWriter.

PiperOrigin-RevId: 156376328
---
 tensorflow/core/lib/io/record_writer.cc      | 19 ++++++++++++----
 tensorflow/core/lib/io/record_writer.h       | 10 ++++++++
 tensorflow/python/lib/io/py_record_writer.cc | 24 ++++++++++++--------
 tensorflow/python/lib/io/py_record_writer.h  |  8 ++++---
 tensorflow/python/lib/io/tf_record.py        |  3 ++-
 5 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/tensorflow/core/lib/io/record_writer.cc b/tensorflow/core/lib/io/record_writer.cc
index d77a1016da..3657243c5d 100644
--- a/tensorflow/core/lib/io/record_writer.cc
+++ b/tensorflow/core/lib/io/record_writer.cc
@@ -80,15 +80,12 @@ RecordWriter::RecordWriter(WritableFile* dest,
 }
 
 RecordWriter::~RecordWriter() {
-#if !defined(IS_SLIM_BUILD)
-  if (IsZlibCompressed(options_)) {
-    Status s = dest_->Close();
+  if (dest_ != nullptr) {
+    Status s = Close();
     if (!s.ok()) {
       LOG(ERROR) << "Could not finish writing file: " << s;
     }
-    delete dest_;
   }
-#endif  // IS_SLIM_BUILD
 }
 
 static uint32 MaskedCrc(const char* data, size_t n) {
@@ -113,6 +110,18 @@ Status RecordWriter::WriteRecord(StringPiece data) {
   return dest_->Append(StringPiece(footer, sizeof(footer)));
 }
 
+Status RecordWriter::Close() {
+#if !defined(IS_SLIM_BUILD)
+  if (IsZlibCompressed(options_)) {
+    Status s = dest_->Close();
+    delete dest_;
+    dest_ = nullptr;
+    return s;
+  }
+#endif  // IS_SLIM_BUILD
+  return Status::OK();
+}
+
 Status RecordWriter::Flush() {
   if (IsZlibCompressed(options_)) {
     return dest_->Flush();
diff --git a/tensorflow/core/lib/io/record_writer.h b/tensorflow/core/lib/io/record_writer.h
index 63f0a7c5d0..daed809af3 100644
--- a/tensorflow/core/lib/io/record_writer.h
+++ b/tensorflow/core/lib/io/record_writer.h
@@ -53,6 +53,10 @@ class RecordWriter {
   RecordWriter(WritableFile* dest,
                const RecordWriterOptions& options = RecordWriterOptions());
 
+  // Calls Close() and logs if an error occurs.
+  //
+  // TODO(jhseu): Require that callers explicitly call Close() and remove the
+  // implicit Close() call in the destructor.
   ~RecordWriter();
 
   Status WriteRecord(StringPiece slice);
@@ -62,6 +66,12 @@ class RecordWriter {
   // WritableFile.
   Status Flush();
 
+  // Writes all output to the file. Does *not* close the WritableFile.
+  //
+  // After calling Close(), any further calls to `WriteRecord()` or `Flush()`
+  // are invalid.
+  Status Close();
+
  private:
   WritableFile* dest_;
   RecordWriterOptions options_;
diff --git a/tensorflow/python/lib/io/py_record_writer.cc b/tensorflow/python/lib/io/py_record_writer.cc
index 039e59756e..df35c43c3d 100644
--- a/tensorflow/python/lib/io/py_record_writer.cc
+++ b/tensorflow/python/lib/io/py_record_writer.cc
@@ -37,18 +37,16 @@ PyRecordWriter* PyRecordWriter::New(const string& filename,
     return nullptr;
   }
   PyRecordWriter* writer = new PyRecordWriter;
-  writer->file_ = file.release();
+  writer->file_ = std::move(file);
 
   RecordWriterOptions options =
       RecordWriterOptions::CreateRecordWriterOptions(compression_type_string);
 
-  writer->writer_ = new RecordWriter(writer->file_, options);
+  writer->writer_.reset(new RecordWriter(writer->file_.get(), options));
   return writer;
 }
 
 PyRecordWriter::~PyRecordWriter() {
-  delete writer_;
-  delete file_;
 }
 
 bool PyRecordWriter::WriteRecord(tensorflow::StringPiece record) {
@@ -57,11 +55,19 @@ bool PyRecordWriter::WriteRecord(tensorflow::StringPiece record) {
   return s.ok();
 }
 
-void PyRecordWriter::Close() {
-  delete writer_;
-  delete file_;
-  writer_ = nullptr;
-  file_ = nullptr;
+void PyRecordWriter::Close(TF_Status* out_status) {
+  Status s = writer_->Close();
+  if (!s.ok()) {
+    Set_TF_Status_from_Status(out_status, s);
+    return;
+  }
+  writer_.reset(nullptr);
+  s = file_->Close();
+  if (!s.ok()) {
+    Set_TF_Status_from_Status(out_status, s);
+    return;
+  }
+  file_.reset(nullptr);
 }
 
 }  // namespace io
diff --git a/tensorflow/python/lib/io/py_record_writer.h b/tensorflow/python/lib/io/py_record_writer.h
index 483b7b9df0..8c53420ce6 100644
--- a/tensorflow/python/lib/io/py_record_writer.h
+++ b/tensorflow/python/lib/io/py_record_writer.h
@@ -16,6 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_PYTHON_LIB_IO_PY_RECORD_WRITER_H_
 #define TENSORFLOW_PYTHON_LIB_IO_PY_RECORD_WRITER_H_
 
+#include <memory>
+
 #include "tensorflow/c/c_api.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
 #include "tensorflow/core/platform/macros.h"
@@ -42,13 +44,13 @@ class PyRecordWriter {
   ~PyRecordWriter();
 
   bool WriteRecord(tensorflow::StringPiece record);
-  void Close();
+  void Close(TF_Status* out_status);
 
  private:
   PyRecordWriter();
 
-  WritableFile* file_;        // Owned
-  io::RecordWriter* writer_;  // Owned
+  std::unique_ptr<io::RecordWriter> writer_;
+  std::unique_ptr<WritableFile> file_;
   TF_DISALLOW_COPY_AND_ASSIGN(PyRecordWriter);
 };
 
diff --git a/tensorflow/python/lib/io/tf_record.py b/tensorflow/python/lib/io/tf_record.py
index 450b89e4c1..3d0cdc2153 100644
--- a/tensorflow/python/lib/io/tf_record.py
+++ b/tensorflow/python/lib/io/tf_record.py
@@ -123,4 +123,5 @@ class TFRecordWriter(object):
 
   def close(self):
     """Close the file."""
-    self._writer.Close()
+    with errors.raise_exception_on_not_ok_status() as status:
+      self._writer.Close(status)
-- 
GitLab


From e5824d60f717e4aea40e11944873c1eb56cb994b Mon Sep 17 00:00:00 2001
From: Niranjan Hasabnis <niranjan.hasabnis@intel.com>
Date: Wed, 17 May 2017 17:37:43 -0700
Subject: [PATCH 1477/1563] Fix: config MKL build error - mkl_layout_pass.cc
 has missing header dependencies (#9986)

---
 tensorflow/core/BUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 5f555d419e..2409f782e2 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1556,8 +1556,6 @@ tf_cuda_library(
         "graph/graph_constructor.cc",
         "graph/graph_def_builder.cc",
         "graph/graph_partition.cc",
-        "graph/mkl_layout_pass.cc",
-        "graph/mkl_tfconversion_pass.cc",
         "graph/node_builder.cc",
         "graph/optimizer_cse.cc",
         "graph/subgraph.cc",
@@ -1619,6 +1617,8 @@ tf_cuda_library(
         "common_runtime/threadpool_device.cc",
         "common_runtime/threadpool_device_factory.cc",
         "graph/gradients.cc",
+        "graph/mkl_layout_pass.cc",
+        "graph/mkl_tfconversion_pass.cc",
         "graph/quantize_training.cc",
         "public/session.h",
         "public/session_options.h",
-- 
GitLab


From 9510de083b219cb9ea6b6c6455fef76c18f09be0 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 17 May 2017 17:45:19 -0700
Subject: [PATCH 1478/1563] Change install docs to upgrade pip

Why have lots of documentation on how to work with multiple versions of pip within a virtualenv, when we can just ask the user to upgrade pip?

PiperOrigin-RevId: 156379483
---
 tensorflow/docs_src/install/install_linux.md | 26 +++-----------
 tensorflow/docs_src/install/install_mac.md   | 38 +++++---------------
 2 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/tensorflow/docs_src/install/install_linux.md b/tensorflow/docs_src/install/install_linux.md
index e2f7ae6bf9..47c8fc77ee 100644
--- a/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@ -137,7 +137,11 @@ Take the following steps to install TensorFlow with Virtualenv:
 
      <pre> (tensorflow)$ </pre>
 
-  4. Issue one of the following commands to install TensorFlow in the active
+  4. Ensure pip ≥8.1 is installed:
+
+     <pre> (tensorflow)$ <b>easy_install -U pip</b></pre>
+
+  5. Issue one of the following commands to install TensorFlow in the active
      virtualenv environment:
 
      <pre> (tensorflow)$ <b>pip install --upgrade tensorflow</b>      # for Python 2.7
@@ -148,26 +152,6 @@ Take the following steps to install TensorFlow with Virtualenv:
      If the preceding command succeeds, skip Step 5. If the preceding
      command fails, perform Step 5.
 
-  5. (Optional) If Step 4 failed (typically because you invoked a pip version
-     lower than 8.1), install TensorFlow in the active virtualenv environment
-     by issuing a command of the following format:
-
-     <pre> (tensorflow)$ <b>pip install --upgrade</b> <i>tfBinaryURL</i>   # Python 2.7
-     (tensorflow)$ <b>pip3 install --upgrade</b> <i>tfBinaryURL</i>  # Python 3.n </pre>
-
-     where <code><em>tfBinaryURL</em></code> identifies the URL of the
-     TensorFlow Python package. The appropriate value of
-     <code><em>tfBinaryURL</em></code>depends on the operating system,
-     Python version, and GPU support. Find the appropriate value for
-     <code><em>tfBinaryURL</em></code> for your system
-     [here](#the_url_of_the_tensorflow_python_package).  For example, if you
-     are installing TensorFlow for Linux, Python 2.7, and CPU-only support,
-     issue the following command to install TensorFlow in the active
-     virtualenv environment:
-
-     <pre>(tensorflow)$ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.1.0-cp34-cp34m-linux_x86_64.whl</b></pre>
-
 If you encounter installation problems, see
 [Common Installation Problems](#common_installation_problems).
 
diff --git a/tensorflow/docs_src/install/install_mac.md b/tensorflow/docs_src/install/install_mac.md
index 73e143b145..43ffc961aa 100644
--- a/tensorflow/docs_src/install/install_mac.md
+++ b/tensorflow/docs_src/install/install_mac.md
@@ -81,35 +81,15 @@ Take the following steps to install TensorFlow with Virtualenv:
 
      <pre> (tensorflow)$ </pre>
 
-  5. If pip version 8.1 or later is installed on your system, issue one of
-     the following commands to install TensorFlow and all the packages that
-     TensorFlow requires into the active Virtualenv environment:
-
-     <pre> $ <b>pip install --upgrade tensorflow</b>      # for Python 2.7
-     $ <b>pip3 install --upgrade tensorflow</b>     # for Python 3.n
-
-     If the preceding command succeed, skip Step 6. If it failed,
-     perform Step 6.
-
-  6. Optional. If Step 5 failed (typically because you invoked a pip version
-     lower than 8.1), install TensorFlow in the active
-     virtualenv environment by issuing a command of the following format:
-
-     <pre> $ <b>pip install --upgrade</b> <i>tfBinaryURL</i>   # Python 2.7
-     $ <b>pip3 install --upgrade</b> <i>tfBinaryURL</i>  # Python 3.n </pre>
-
-     where <i>tfBinaryURL</i> identifies the URL
-     of the TensorFlow Python package. The appropriate value of
-     <i>tfBinaryURL</i> depends on the operating system and
-     Python version. Find the appropriate value for
-     <i>tfBinaryURL</i> for your system
-     [here](#the_url_of_the_tensorflow_python_package).
-     For example, if you are installing TensorFlow for Mac OS X,
-     Python 2.7, the command to install
-     TensorFlow in the active Virtualenv is as follows:
-
-     <pre> $ <b>pip3 install --upgrade \
-     https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.1.0rc2-py2-none-any.whl</b></pre>
+  5. Ensure pip ≥8.1 is installed:
+
+     <pre> (tensorflow)$ <b>easy_install -U pip</b></pre>
+
+  6. Issue one of the following commands to install TensorFlow and all the
+     packages that TensorFlow requires into the active Virtualenv environment:
+
+     <pre> (tensorflow)$ <b>pip install --upgrade tensorflow</b>      # for Python 2.7
+     (tensorflow)$ <b>pip3 install --upgrade tensorflow</b>     # for Python 3.n
 
 If you encounter installation problems, see
 [Common Installation Problems](#common-installation-problems).
-- 
GitLab


From 64d283057b91f21ea98ac13af74435c9d9edb6ee Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Wed, 17 May 2017 18:06:54 -0700
Subject: [PATCH 1479/1563] Make .bazelrc import ~/.bazelrc (#9987)

When running ./configure for the first time, an import ~/.bazelrc statement
will be added to the generated .bazelrc if the user has one.

Fixes #9963
See also bazelbuild/bazel#3022
---
 configure | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 308369efd3..d751563b58 100755
--- a/configure
+++ b/configure
@@ -166,7 +166,13 @@ function setup_python {
 # This file contains customized config settings.
 rm -f .tf_configure.bazelrc
 touch .tf_configure.bazelrc
-touch .bazelrc
+if [[ ! -e .bazelrc ]]; then
+  if [[ -e "${HOME}/.bazelrc" ]]; then
+    echo "import ${HOME}/.bazelrc" >.bazelrc
+  else
+    touch .bazelrc
+  fi
+fi
 sed_in_place "/tf_configure/d" .bazelrc
 echo "import %workspace%/.tf_configure.bazelrc" >> .bazelrc
 
-- 
GitLab


From 3fb4b5d30ce0600338ee039cb52ac193ffb60a01 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Wed, 17 May 2017 19:13:07 -0700
Subject: [PATCH 1480/1563] Fixes to checkpoint_convert doc string

PiperOrigin-RevId: 156386066
---
 .../rnn/python/tools/checkpoint_convert.py     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py b/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py
index 1e29114b0c..d9bb3bcccd 100644
--- a/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py
+++ b/tensorflow/contrib/rnn/python/tools/checkpoint_convert.py
@@ -16,8 +16,24 @@ r"""Convert checkpoints using RNNCells to new name convention.
 
 Usage:
 
-  python checkpoint_convert [--write_v1_checkpoint] \
+  python checkpoint_convert.py [--write_v1_checkpoint] \
       '/path/to/checkpoint' '/path/to/new_checkpoint'
+
+For example, if there is a V2 checkpoint to be converted and the files include:
+  /tmp/my_checkpoint/model.ckpt.data-00000-of-00001
+  /tmp/my_checkpoint/model.ckpt.index
+  /tmp/my_checkpoint/model.ckpt.meta
+
+use the following command:
+  mkdir /tmp/my_converted_checkpoint &&
+  python checkpoint_convert.py \
+      /tmp/my_checkpoint/model.ckpt /tmp/my_converted_checkpoint/model.ckpt
+
+This will generate three converted checkpoint files corresponding to the three
+old ones in the new directory:
+  /tmp/my_converted_checkpoint/model.ckpt.data-00000-of-00001
+  /tmp/my_converted_checkpoint/model.ckpt.index
+  /tmp/my_converted_checkpoint/model.ckpt.meta
 """
 from __future__ import absolute_import
 from __future__ import division
-- 
GitLab


From 45f7833b9e2c634f15b471d0f6c2445d5a58f2c0 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Wed, 17 May 2017 21:03:46 -0700
Subject: [PATCH 1481/1563] Improve the warning msg when user provides non-FC
 type.

PiperOrigin-RevId: 156391938
---
 tensorflow/python/feature_column/feature_column.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index 0e5f256492..fd051dda6b 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -1533,7 +1533,7 @@ def _check_feature_columns(feature_columns):
   for column in feature_columns:
     if not isinstance(column, _FeatureColumn):
       raise ValueError('Items of feature_columns must be a _FeatureColumn.'
-                       'Given: {}.'.format(column))
+                       'Given (type {}): {}.'.format(type(column), column))
   if not feature_columns:
     raise ValueError('feature_columns must not be empty.')
   name_to_column = dict()
-- 
GitLab


From 98deea9ab3ddefb6a378047cd1667f0bc0887108 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Wed, 17 May 2017 22:10:35 -0700
Subject: [PATCH 1482/1563] validate the amount of input bytes left in GIF's
 input_callback()

PiperOrigin-RevId: 156395455
---
 tensorflow/core/lib/gif/gif_io.cc | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tensorflow/core/lib/gif/gif_io.cc b/tensorflow/core/lib/gif/gif_io.cc
index db230b1e56..b5c0d9f621 100644
--- a/tensorflow/core/lib/gif/gif_io.cc
+++ b/tensorflow/core/lib/gif/gif_io.cc
@@ -25,9 +25,19 @@ limitations under the License.
 namespace tensorflow {
 namespace gif {
 
+struct InputBufferInfo {
+  const uint8_t* buf;
+  int bytes_left;
+};
+
 int input_callback(GifFileType* gif_file, GifByteType* buf, int size) {
-  if (gif_file->UserData && memcpy(buf, gif_file->UserData, size)) {
-    gif_file->UserData = reinterpret_cast<uint8_t*>(gif_file->UserData) + size;
+  InputBufferInfo* const info =
+      reinterpret_cast<InputBufferInfo*>(gif_file->UserData);
+  if (info != nullptr) {
+    if (size > info->bytes_left) size = info->bytes_left;
+    memcpy(buf, info->buf, size);
+    info->buf += size;
+    info->bytes_left -= size;
     return size;
   }
   return 0;
@@ -36,8 +46,9 @@ int input_callback(GifFileType* gif_file, GifByteType* buf, int size) {
 uint8* Decode(const void* srcdata, int datasize,
               std::function<uint8*(int, int, int, int)> allocate_output) {
   int error_code = D_GIF_SUCCEEDED;
+  InputBufferInfo info = {reinterpret_cast<const uint8*>(srcdata), datasize};
   GifFileType* gif_file =
-      DGifOpen(const_cast<void*>(srcdata), &input_callback, &error_code);
+      DGifOpen(static_cast<void*>(&info), &input_callback, &error_code);
   const auto cleanup = gtl::MakeCleanup([gif_file]() {
     int error_code = D_GIF_SUCCEEDED;
     if (gif_file && DGifCloseFile(gif_file, &error_code) != GIF_OK) {
-- 
GitLab


From 165fc29ecda0cb17a14e5f128700b3ea5030e64a Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Wed, 17 May 2017 22:35:28 -0700
Subject: [PATCH 1483/1563] Python partial run binding should make call when
 feeds but no fetches are provided.

Although no fetches and some feeds being specified on a run call should be a no-op, it is perfectly valid for no fetches and some feeds to be provided in a partial_run call. This is because a subsequent partial_run call with fetches may need that earlier feed. (see test for example). This change fixes the python binding to allow for that.

PiperOrigin-RevId: 156396669
---
 tensorflow/python/client/session.py      |  4 +++-
 tensorflow/python/client/session_test.py | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tensorflow/python/client/session.py b/tensorflow/python/client/session.py
index 700e95c0b9..05ba1a0d43 100644
--- a/tensorflow/python/client/session.py
+++ b/tensorflow/python/client/session.py
@@ -992,7 +992,9 @@ class BaseSession(SessionInterface):
     movers = self._update_with_movers(feed_dict_string, feed_map)
     final_fetches = fetch_handler.fetches()
     final_targets = fetch_handler.targets()
-    if final_fetches or final_targets:
+    # We only want to really perform the run if fetches or targets are provided,
+    # or if the call is a partial run that specifies feeds.
+    if final_fetches or final_targets or (handle and feed_dict_string):
       results = self._do_run(handle, final_targets, final_fetches,
                              feed_dict_string, options, run_metadata)
     else:
diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 5a42c50fff..6c964377a2 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -1483,6 +1483,15 @@ class SessionTest(test_util.TensorFlowTestCase):
                                  'has already been fetched.$'):
       sess.partial_run(h, r1, feed_dict={c: 3})
 
+  def runTestPartialRunEmptyFetches(self, sess):
+    a = array_ops.placeholder(dtypes.float32)
+    b = a * 2.0
+
+    h = sess.partial_run_setup(fetches=[b], feeds=[a])
+    sess.partial_run(h, [], {a: 3.0})
+    r = sess.partial_run(h, [b], {})
+    self.assertEqual([6.0], r)
+
   def testInvalidPartialRunSetup(self):
     sess = session.Session()
     x = array_ops.placeholder(dtypes.float32, shape=[])
@@ -1521,6 +1530,9 @@ class SessionTest(test_util.TensorFlowTestCase):
   def testPartialRunAlreadyFetchedDirect(self):
     self.runTestPartialRunAlreadyFetched(session.Session())
 
+  def testPartialRunEmptyFetchesDirect(self):
+    self.runTestPartialRunEmptyFetches(session.Session())
+
   def testPartialRunDist(self):
     server = server_lib.Server.create_local_server()
     self.runTestPartialRun(session.Session(server.target))
@@ -1562,6 +1574,10 @@ class SessionTest(test_util.TensorFlowTestCase):
     server = server_lib.Server.create_local_server()
     self.runTestPartialRunAlreadyFetched(session.Session(server.target))
 
+  def testPartialRunEmptyFetchesDist(self):
+    server = server_lib.Server.create_local_server()
+    self.runTestPartialRunEmptyFetches(session.Session(server.target))
+
   def testFeedDictKeyException(self):
     with session.Session() as sess:
       a = constant_op.constant(1.0, dtypes.float32, name='a')
-- 
GitLab


From 6d993a6178f51b405940ac35dedfb4f89720d8d5 Mon Sep 17 00:00:00 2001
From: Kay Zhu <kayzhu@google.com>
Date: Wed, 17 May 2017 23:08:11 -0700
Subject: [PATCH 1484/1563] [XLA] In AlgebraicSimplifier, output empty constant
 directly if Reshape's shape has zero element dimension.

PiperOrigin-RevId: 156398485
---
 tensorflow/compiler/xla/service/algebraic_simplifier.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tensorflow/compiler/xla/service/algebraic_simplifier.cc b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
index 38ac396c42..6e6da38f9e 100644
--- a/tensorflow/compiler/xla/service/algebraic_simplifier.cc
+++ b/tensorflow/compiler/xla/service/algebraic_simplifier.cc
@@ -959,6 +959,15 @@ StatusOr<bool> AlgebraicSimplifierVisitor::
 Status AlgebraicSimplifierVisitor::HandleReshape(HloInstruction* reshape) {
   auto operand = reshape->mutable_operand(0);
 
+  // Reshape directly to empty constant if the shape contains zero-element
+  // dimension.
+  if (ShapeUtil::HasZeroElements(reshape->shape())) {
+    auto empty_constant = HloInstruction::CreateConstant(
+        LiteralUtil::CreateFromShape(reshape->shape()));
+
+    return ReplaceWithNewInstruction(reshape, std::move(empty_constant));
+  }
+
   // Delete no-op reshapes, i.e. where shape = operand shape.
   if (SameShape(reshape, operand)) {
     VLOG(10) << "deleting no-op reshape";
-- 
GitLab


From fb7a4f4fbb4fb52e9f91e6809c26b49cd37f785c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 01:09:43 -0700
Subject: [PATCH 1485/1563] Adds option to use PaddingFIFOQueue in
 pretch_queue, which allows dynamic padding of partially specified shapes.

PiperOrigin-RevId: 156404760
---
 .../slim/python/slim/data/prefetch_queue.py   |  9 ++-
 .../python/slim/data/prefetch_queue_test.py   | 59 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/slim/python/slim/data/prefetch_queue.py b/tensorflow/contrib/slim/python/slim/data/prefetch_queue.py
index ea25fe8fd3..37e9c4754c 100644
--- a/tensorflow/contrib/slim/python/slim/data/prefetch_queue.py
+++ b/tensorflow/contrib/slim/python/slim/data/prefetch_queue.py
@@ -25,9 +25,15 @@ from tensorflow.python.summary import summary
 from tensorflow.python.training import queue_runner
 
 
+def _which_queue(dynamic_pad):
+  return (data_flow_ops.PaddingFIFOQueue if dynamic_pad
+          else data_flow_ops.FIFOQueue)
+
+
 def prefetch_queue(tensors,
                    capacity=8,
                    num_threads=1,
+                   dynamic_pad=False,
                    shared_name=None,
                    name=None):
   """Creates a queue to prefetech tensors from `tensors`.
@@ -50,6 +56,7 @@ def prefetch_queue(tensors,
     tensors: A list or dictionary of `Tensors` to enqueue in the buffer.
     capacity: An integer. The maximum number of elements in the queue.
     num_threads: An integer.  Number of threads running the enqueue op.
+    dynamic_pad: Boolean.  Whether to allow variable dimensions in input shapes.
     shared_name: (optional). If set, this queue will be shared under the given
       name across multiple sessions.
     name: (Optional) A name for the operations.
@@ -70,7 +77,7 @@ def prefetch_queue(tensors,
   with ops.name_scope(name, "prefetch_queue", tensor_list) as name:
     dtypes = [t.dtype for t in tensor_list]
     shapes = [t.get_shape() for t in tensor_list]
-    queue = data_flow_ops.FIFOQueue(
+    queue = _which_queue(dynamic_pad)(
         capacity=capacity,
         dtypes=dtypes,
         shapes=shapes,
diff --git a/tensorflow/contrib/slim/python/slim/data/prefetch_queue_test.py b/tensorflow/contrib/slim/python/slim/data/prefetch_queue_test.py
index 0a3a9e700b..6c3e57c47d 100644
--- a/tensorflow/contrib/slim/python/slim/data/prefetch_queue_test.py
+++ b/tensorflow/contrib/slim/python/slim/data/prefetch_queue_test.py
@@ -25,6 +25,8 @@ from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors_impl
 from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
@@ -153,6 +155,63 @@ class PrefetchQueueTest(test.TestCase):
       for thread in threads:
         thread.join()
 
+  def testDynamicPad_failure(self):
+    with ops.Graph().as_default():
+      variable_tensor = array_ops.placeholder(dtypes.int32, shape=[None, 3])
+      with self.assertRaisesRegexp(ValueError, 'shapes must be fully defined'):
+        prefetch_queue.prefetch_queue([variable_tensor])
+
+  def testDynamicPad(self):
+    with self.test_session() as sess:
+      # Create 3 tensors of variable but compatible shapes.
+      var_shape = [None, 2]
+      p1 = constant_op.constant([[1, 2], [3, 4]])
+      p1.set_shape(var_shape)
+      p2 = constant_op.constant([[5, 6], [7, 8], [9, 10]])
+      p2.set_shape(var_shape)
+      p3 = constant_op.constant([[11, 12]])
+      p3.set_shape(var_shape)
+      batch = [p1, p2, p3]
+      batch_size = len(batch)
+
+      zero64 = constant_op.constant(0, dtype=dtypes.int64)
+      examples = variables.Variable(zero64)
+      counter = examples.count_up_to(batch_size)
+
+      # Create a PaddingFIFOQueue to enqueue these tensors.
+      q = data_flow_ops.PaddingFIFOQueue(
+          capacity=10, dtypes=[dtypes.int32], shapes=[var_shape])
+      for tensor in [p1, p2, p3]:
+        q.enqueue([tensor]).run()
+
+      # Dequeue from the queue and batch them using batch().
+      batches = input_lib.batch([q.dequeue(), counter], batch_size=batch_size,
+                                num_threads=1, dynamic_pad=True)
+      self.assertEqual([batch_size, None, 2], batches[0].shape.as_list())
+
+      # Finally, assemble them into prefetch_queue with dynamic_pad.
+      batcher = prefetch_queue.prefetch_queue(batches, dynamic_pad=True)
+      batches = batcher.dequeue()
+      self.assertEqual([batch_size, None, 2], batches[0].shape.as_list())
+
+      variables.global_variables_initializer().run()
+      threads = queue_runner_impl.start_queue_runners()
+
+      values, _ = sess.run(batches)
+      # We enqueued 3 tensors of [None, 2] shapes, so using dynamic_pad
+      # they should be padded to the fixed size [3, 3, 2], where 3
+      # is the maximum length of the batch.
+      self.assertTrue(np.array_equal(
+          np.array([[[1, 2], [3, 4], [0, 0]],
+                    [[5, 6], [7, 8], [9, 10]],
+                    [[11, 12], [0, 0], [0, 0]]]),
+          values))
+
+      with self.assertRaises(errors_impl.OutOfRangeError):
+        sess.run(batches)
+      for thread in threads:
+        thread.join()
+
   def testDictConstruction(self):
     with ops.Graph().as_default():
       batches = {
-- 
GitLab


From d354a9e071fd3af5c03ef056e9bccb7f943dabb1 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <kramerb@google.com>
Date: Thu, 18 May 2017 03:22:08 -0700
Subject: [PATCH 1486/1563] [XLA] Add a way to classify constraints as
 mandatory or non-mandatory.

The idea is that the backend might want to override operand constraints
after propagation has already assigned them. The example in the test
case uses custom constraints to enforce that all operands of an
instruction are the same. We can't assign that early because we don't
know the layout a priori. During propagation an instruction gets
assigned different layouts on output and operands, but when the
output constraint is propagated into the operands we can override
them now, making the constraint possible.

PiperOrigin-RevId: 156413491
---
 .../compiler/xla/service/layout_assignment.cc | 130 +++++++++++++-----
 .../compiler/xla/service/layout_assignment.h  |  54 +++++---
 .../xla/service/layout_assignment_test.cc     |  70 +++++++++-
 3 files changed, 197 insertions(+), 57 deletions(-)

diff --git a/tensorflow/compiler/xla/service/layout_assignment.cc b/tensorflow/compiler/xla/service/layout_assignment.cc
index bf279f1b2c..810eed72f9 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment.cc
@@ -60,8 +60,9 @@ std::ostream& operator<<(std::ostream& out,
 }
 
 BufferLayoutConstraint::BufferLayoutConstraint(const Layout& layout,
-                                               const LogicalBuffer& buffer)
-    : layout_(layout), buffer_(&buffer) {
+                                               const LogicalBuffer& buffer,
+                                               bool mandatory)
+    : LayoutConstraint(mandatory), layout_(layout), buffer_(&buffer) {
   CHECK(LayoutUtil::ValidateLayoutForShape(layout, buffer.shape()).ok());
 }
 
@@ -73,8 +74,9 @@ string BufferLayoutConstraint::ToString() const {
 
 OperandLayoutConstraint::OperandLayoutConstraint(
     const ShapeLayout& shape_layout, const HloInstruction* instruction,
-    int64 operand_no)
-    : shape_layout_(shape_layout),
+    int64 operand_no, bool mandatory)
+    : LayoutConstraint(mandatory),
+      shape_layout_(shape_layout),
       instruction_(instruction),
       operand_no_(operand_no) {
   CHECK(shape_layout_.LayoutIsSet());
@@ -124,7 +126,8 @@ bool LayoutConstraints::OperandBufferForwarded(
 }
 
 Status LayoutConstraints::SetBufferLayout(const Layout& layout,
-                                          const LogicalBuffer& buffer) {
+                                          const LogicalBuffer& buffer,
+                                          bool mandatory) {
   VLOG(3) << "SetBufferLayout : " << buffer << " : "
           << LayoutUtil::HumanString(layout);
 
@@ -139,26 +142,38 @@ Status LayoutConstraints::SetBufferLayout(const Layout& layout,
   TF_RETURN_IF_ERROR(
       LayoutUtil::ValidateLayoutForShape(layout, buffer.shape()));
 
-  const Layout* curr_layout = BufferLayout(buffer);
-  if (curr_layout != nullptr) {
-    if (!LayoutUtil::Equal(*curr_layout, layout)) {
+  const BufferLayoutConstraint* curr_constraint =
+      GetBufferLayoutConstraint(buffer);
+  if (curr_constraint != nullptr) {
+    if (LayoutUtil::Equal(curr_constraint->layout(), layout)) {
+      // New constraint matches existing constraint. Nothing to do.
+      return Status::OK();
+    }
+    if (curr_constraint->mandatory()) {
       return FailedPrecondition(
           "Buffer %s already has the layout constraint %s, cannot add "
           "incompatible constraint %s",
           buffer.ToString().c_str(),
-          LayoutUtil::HumanString(*curr_layout).c_str(),
+          LayoutUtil::HumanString(curr_constraint->layout()).c_str(),
           LayoutUtil::HumanString(layout).c_str());
     }
-    // New constraint matches existing constraint. Nothing to do.
-    return Status::OK();
   }
 
-  auto new_constraint_it = buffer_constraints_.insert(
-      {&buffer, BufferLayoutConstraint(layout, buffer)});
-  added_constraints_.push_back(&new_constraint_it.first->second);
+  auto iter = buffer_constraints_.find(&buffer);
+  bool overwrite = iter != buffer_constraints_.end();
+  if (!overwrite) {
+    iter = buffer_constraints_
+               .insert(std::make_pair(
+                   &buffer, BufferLayoutConstraint(layout, buffer, mandatory)))
+               .first;
+  } else {
+    iter->second = BufferLayoutConstraint(layout, buffer, /*mandatory=*/true);
+  }
+  added_constraints_.push_back(&iter->second);
 
   // Remove buffer from the set of unconstrained buffers.
-  TF_RET_CHECK(unconstrained_buffer_ids_.count(buffer.id()) == 1);
+  TF_RET_CHECK(unconstrained_buffer_ids_.count(buffer.id()) ==
+               static_cast<int>(!overwrite));
   unconstrained_buffer_ids_.erase(buffer.id());
 
   return Status::OK();
@@ -166,23 +181,27 @@ Status LayoutConstraints::SetBufferLayout(const Layout& layout,
 
 Status LayoutConstraints::SetOperandLayout(const Shape& shape_with_layout,
                                            const HloInstruction* instruction,
-                                           int64 operand_no) {
+                                           int64 operand_no, bool mandatory) {
   VLOG(3) << "SetOperandLayout : " << instruction->name() << ", operand "
           << operand_no << " : "
           << ShapeUtil::HumanStringWithLayout(shape_with_layout);
 
-  const ShapeLayout* curr_shape_layout = OperandLayout(instruction, operand_no);
+  const OperandLayoutConstraint* curr_shape_layout =
+      GetOperandLayoutConstraint(instruction, operand_no);
   if (curr_shape_layout != nullptr) {
-    if (!curr_shape_layout->MatchesLayoutInShape(shape_with_layout)) {
+    if (curr_shape_layout->shape_layout().MatchesLayoutInShape(
+            shape_with_layout)) {
+      // New constraint matches existing constraint. Nothing to do.
+      return Status::OK();
+    }
+    if (curr_shape_layout->mandatory()) {
       return FailedPrecondition(
           "Operand %lld of instruction %s already has a layout constraint "
           "%s, cannot add incompatible constraint %s",
           operand_no, instruction->name().c_str(),
-          curr_shape_layout->ToString().c_str(),
+          curr_shape_layout->shape_layout().ToString().c_str(),
           ShapeUtil::HumanStringWithLayout(shape_with_layout).c_str());
     }
-    // New constraint matches existing constraint. Nothing to do.
-    return Status::OK();
   }
 
   // If any buffers in the operand occur in the output of the instruction, then
@@ -196,22 +215,31 @@ Status LayoutConstraints::SetOperandLayout(const Shape& shape_with_layout,
   }
 
   auto key = std::make_pair(instruction, operand_no);
-  auto new_constraint_it = operand_constraints_.insert(
-      {key, OperandLayoutConstraint(ShapeLayout(shape_with_layout), instruction,
-                                    operand_no)});
-  added_constraints_.push_back(&new_constraint_it.first->second);
+  auto iter = operand_constraints_.find(key);
+  if (iter == operand_constraints_.end()) {
+    auto pair = std::make_pair(
+        key, OperandLayoutConstraint(ShapeLayout(shape_with_layout),
+                                     instruction, operand_no, mandatory));
+    iter = operand_constraints_.insert(pair).first;
+  } else {
+    iter->second =
+        OperandLayoutConstraint(ShapeLayout(shape_with_layout), instruction,
+                                operand_no, /*mandatory=*/true);
+  }
+  added_constraints_.push_back(&iter->second);
 
   return Status::OK();
 }
 
 Status LayoutConstraints::SetArrayOperandLayout(
-    const Layout& layout, const HloInstruction* instruction, int64 operand_no) {
+    const Layout& layout, const HloInstruction* instruction, int64 operand_no,
+    bool mandatory) {
   const HloInstruction* operand = instruction->operand(operand_no);
   TF_RET_CHECK(ShapeUtil::IsArray(operand->shape()));
   Shape shape(operand->shape());
   *shape.mutable_layout() = layout;
   TF_RETURN_IF_ERROR(LayoutUtil::ValidateLayoutInShape(shape));
-  return SetOperandLayout(shape, instruction, operand_no);
+  return SetOperandLayout(shape, instruction, operand_no, mandatory);
 }
 
 Status LayoutConstraints::SetResultLayout(const Shape& shape_with_layout) {
@@ -274,15 +302,29 @@ Status LayoutConstraints::SetInstructionLayout(
 
 const Layout* LayoutConstraints::BufferLayout(
     const LogicalBuffer& buffer) const {
+  if (const auto* constraint = GetBufferLayoutConstraint(buffer)) {
+    return &constraint->layout();
+  }
+  return nullptr;
+}
+const BufferLayoutConstraint* LayoutConstraints::GetBufferLayoutConstraint(
+    const LogicalBuffer& buffer) const {
   auto it = buffer_constraints_.find(&buffer);
-  return it == buffer_constraints_.end() ? nullptr : &it->second.layout();
+  return it == buffer_constraints_.end() ? nullptr : &it->second;
 }
 
 const ShapeLayout* LayoutConstraints::OperandLayout(
     const HloInstruction* instruction, int64 operand_no) const {
+  if (const auto* constraint =
+          GetOperandLayoutConstraint(instruction, operand_no)) {
+    return &constraint->shape_layout();
+  }
+  return nullptr;
+}
+const OperandLayoutConstraint* LayoutConstraints::GetOperandLayoutConstraint(
+    const HloInstruction* instruction, int64 operand_no) const {
   auto it = operand_constraints_.find(std::make_pair(instruction, operand_no));
-  return it == operand_constraints_.end() ? nullptr
-                                          : &it->second.shape_layout();
+  return it == operand_constraints_.end() ? nullptr : &it->second;
 }
 
 const ShapeLayout* LayoutConstraints::ResultLayout() const {
@@ -343,7 +385,8 @@ Status LayoutAssignment::AddMandatoryConstraints(
       // Constrain the input to the Outfeed instruction to be the expected
       // layout of the Outfeed.
       TF_RETURN_IF_ERROR(constraints->SetOperandLayout(
-          instruction->outfeed_shape(), instruction.get(), 0));
+          instruction->outfeed_shape(), instruction.get(), 0,
+          /*mandatory=*/true));
     } else if (instruction->opcode() == HloOpcode::kParameter) {
       // Parameter layouts must match the respective layout in
       // ComputationLayout.
@@ -375,7 +418,7 @@ Status LayoutAssignment::AddMandatoryConstraints(
       for (int64 i = 0; i < instruction->operand_count(); ++i) {
         TF_RETURN_IF_ERROR(constraints->SetOperandLayout(
             called_computation_layout.parameter_layout(i).shape(),
-            instruction.get(), i));
+            instruction.get(), i, /*mandatory=*/true));
       }
     } else if (instruction->opcode() == HloOpcode::kWhile) {
       // Layout of input and output of kWhile instruction must be equal and must
@@ -426,7 +469,8 @@ Status LayoutAssignment::AddMandatoryConstraints(
       TF_RETURN_IF_ERROR(constraints->SetInstructionLayout(
           body_layout.result_shape(), instruction.get()));
       TF_RETURN_IF_ERROR(constraints->SetOperandLayout(
-          body_layout.result_shape(), instruction.get(), 0));
+          body_layout.result_shape(), instruction.get(), 0,
+          /*mandatory=*/true));
     } else if (instruction->opcode() == HloOpcode::kCustomCall) {
       // Add constraints for kCustomCall instruction operands and instructions.
       // For now we only support row major layouts for all inputs and outputs.
@@ -450,7 +494,7 @@ Status LayoutAssignment::AddMandatoryConstraints(
 
         Shape row_major_operand_shape(row_major_shape(operand_shape));
         TF_RETURN_IF_ERROR(constraints->SetOperandLayout(
-            row_major_operand_shape, instruction.get(), i));
+            row_major_operand_shape, instruction.get(), i, /*mandatory=*/true));
       }
     }
   }
@@ -924,7 +968,8 @@ Status LayoutAssignment::PropagateOperandConstraint(
         operand_constraint.shape_layout().layout(), user,
         operand_constraint.operand_no());
     if (layout != nullptr) {
-      TF_RETURN_IF_ERROR(constraints->SetBufferLayout(*layout, *buffer));
+      TF_RETURN_IF_ERROR(
+          constraints->SetBufferLayout(*layout, *buffer, /*mandatory=*/false));
     }
   }
   return Status::OK();
@@ -954,11 +999,19 @@ Status LayoutAssignment::PropagateBufferConstraint(
                                                 instruction, operand_no);
         if (operand_layout != nullptr) {
           TF_RETURN_IF_ERROR(constraints->SetArrayOperandLayout(
-              *operand_layout, instruction, operand_no));
+              *operand_layout, instruction, operand_no, /*mandatory=*/true));
         }
       }
     }
   }
+  return PropagateBufferConstraintToUses(buffer_constraint, constraints);
+}
+
+Status LayoutAssignment::PropagateBufferConstraintToUses(
+    const BufferLayoutConstraint& buffer_constraint,
+    LayoutConstraints* constraints) {
+  const LogicalBuffer& buffer = buffer_constraint.buffer();
+  TF_RET_CHECK(buffer.IsArray());
 
   // Propagate the layout to all array uses of the logical buffer. This skips
   // uses of the buffer where the buffer is the element of a tuple.
@@ -971,7 +1024,7 @@ Status LayoutAssignment::PropagateBufferConstraint(
     if (constraints->OperandLayout(user, operand_no) == nullptr &&
         !constraints->OperandBufferForwarded(user, operand_no)) {
       TF_RETURN_IF_ERROR(constraints->SetArrayOperandLayout(
-          buffer_constraint.layout(), user, operand_no));
+          buffer_constraint.layout(), user, operand_no, /*mandatory=*/false));
     }
   }
 
@@ -1266,7 +1319,8 @@ Status LayoutAssignment::RunOnComputation(
     const LogicalBuffer& buffer = points_to_analysis->GetBuffer(
         *constraints.unconstrained_buffer_ids().begin());
     TF_RETURN_IF_ERROR(constraints.SetBufferLayout(
-        LayoutUtil::GetDefaultLayoutForShape(buffer.shape()), buffer));
+        LayoutUtil::GetDefaultLayoutForShape(buffer.shape()), buffer,
+        /*mandatory=*/false));
 
     TF_RETURN_IF_ERROR(PropagateConstraints(&constraints));
 
diff --git a/tensorflow/compiler/xla/service/layout_assignment.h b/tensorflow/compiler/xla/service/layout_assignment.h
index 4f586c334d..ae53702a28 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.h
+++ b/tensorflow/compiler/xla/service/layout_assignment.h
@@ -46,10 +46,16 @@ namespace xla {
 // gathered together in LayoutConstraints object.
 class LayoutConstraint {
  public:
-  LayoutConstraint() = default;
+  LayoutConstraint(bool mandatory) : mandatory_(mandatory) {}
   virtual ~LayoutConstraint() = default;
 
   virtual string ToString() const = 0;
+
+  // True if this constraint cannot be overwritten by a different constraint.
+  bool mandatory() const { return mandatory_; }
+
+ private:
+  bool mandatory_;
 };
 
 std::ostream& operator<<(std::ostream& out, const LayoutConstraint& constraint);
@@ -58,7 +64,8 @@ std::ostream& operator<<(std::ostream& out, const LayoutConstraint& constraint);
 // array produced by a particular instruction.
 class BufferLayoutConstraint : public LayoutConstraint {
  public:
-  BufferLayoutConstraint(const Layout& layout, const LogicalBuffer& buffer);
+  BufferLayoutConstraint(const Layout& layout, const LogicalBuffer& buffer,
+                         bool mandatory);
 
   const LogicalBuffer& buffer() const { return *buffer_; }
   const Layout& layout() const { return layout_; }
@@ -66,7 +73,7 @@ class BufferLayoutConstraint : public LayoutConstraint {
   string ToString() const override;
 
  private:
-  const Layout layout_;
+  Layout layout_;
   const LogicalBuffer* buffer_;
 };
 
@@ -78,7 +85,8 @@ class BufferLayoutConstraint : public LayoutConstraint {
 class OperandLayoutConstraint : public LayoutConstraint {
  public:
   OperandLayoutConstraint(const ShapeLayout& shape_layout,
-                          const HloInstruction* instruction, int64 operand_no);
+                          const HloInstruction* instruction, int64 operand_no,
+                          bool mandatory);
 
   const ShapeLayout& shape_layout() const { return shape_layout_; }
   const HloInstruction* instruction() const { return instruction_; }
@@ -90,7 +98,7 @@ class OperandLayoutConstraint : public LayoutConstraint {
   string ToString() const override;
 
  private:
-  const ShapeLayout shape_layout_;
+  ShapeLayout shape_layout_;
   const HloInstruction* instruction_;
   int64 operand_no_;
 };
@@ -99,7 +107,7 @@ class OperandLayoutConstraint : public LayoutConstraint {
 class ResultLayoutConstraint : public LayoutConstraint {
  public:
   explicit ResultLayoutConstraint(const ShapeLayout& shape_layout)
-      : shape_layout_(shape_layout) {}
+      : LayoutConstraint(/*mandatory=*/true), shape_layout_(shape_layout) {}
 
   const ShapeLayout& shape_layout() const { return shape_layout_; }
   string ToString() const override;
@@ -124,8 +132,7 @@ class LayoutConstraints {
   // Return a vector containing the constraints which have been added to the
   // LayoutConstraints object since the construction of the object or since the
   // last time ConsumeAddedConstraints() has been called. This is used to
-  // identify
-  // newly added constraints when propagating layouts.
+  // identify newly added constraints when propagating layouts.
   std::vector<const LayoutConstraint*> ConsumeAddedConstraints() {
     std::vector<const LayoutConstraint*> ret_vec(std::move(added_constraints_));
     added_constraints_.clear();
@@ -137,23 +144,29 @@ class LayoutConstraints {
   // instruction, or the layout of the result of the computation, respectively,
   // if it has been constrained. Otherwise return nullptr.
   const Layout* BufferLayout(const LogicalBuffer& buffer) const;
+  const BufferLayoutConstraint* GetBufferLayoutConstraint(
+      const LogicalBuffer& buffer) const;
   const ShapeLayout* OperandLayout(const HloInstruction* instruction,
                                    int64 operand_no) const;
+  const OperandLayoutConstraint* GetOperandLayoutConstraint(
+      const HloInstruction* instruction, int64 operand_no) const;
   const ShapeLayout* ResultLayout() const;
 
   // Add a constraint on the layout of a LogicalBuffer, the layout of the
   // operand of the instruction, or the layout of the result of the computation,
   // respectively.
-  Status SetBufferLayout(const Layout& layout, const LogicalBuffer& buffer);
+  Status SetBufferLayout(const Layout& layout, const LogicalBuffer& buffer,
+                         bool mandatory = true);
   Status SetOperandLayout(const Shape& shape_with_layout,
-                          const HloInstruction* instruction, int64 operand_no);
+                          const HloInstruction* instruction, int64 operand_no,
+                          bool mandatory = true);
   Status SetResultLayout(const Shape& shape_with_layout);
 
   // Convenience wrapper around SetOperandLayout for setting the layout of a
   // operand using a Layout object. The operand must be array-shaped.
   Status SetArrayOperandLayout(const Layout& layout,
                                const HloInstruction* instruction,
-                               int64 operand_no);
+                               int64 operand_no, bool mandatory = true);
 
   // Convenience wrapper around SetBufferLayout. Sets the layouts of all buffers
   // created by the instruction to the layouts in the given shape. The
@@ -233,6 +246,18 @@ class LayoutAssignment : public HloPassInterface {
       const ResultLayoutConstraint& layout_constraint,
       LayoutConstraints* constraints);
 
+  // Propagates a buffer layout constraint into the operands that use it.
+  Status PropagateBufferConstraintToUses(
+      const BufferLayoutConstraint& layout_constraint,
+      LayoutConstraints* constraints);
+
+  // Propagates a layout constraint on the use of the result of the given
+  // instruction to the definitions of the LogicalBuffers which make up the
+  // result.
+  Status PropagateUseConstraintToDefs(const ShapeLayout& shape_layout,
+                                      const HloInstruction* instruction,
+                                      LayoutConstraints* constraints);
+
  private:
   // Adds constraints which must be satisfied for correctness on all
   // backends. Called once prior to propagating constraints.
@@ -276,13 +301,6 @@ class LayoutAssignment : public HloPassInterface {
   // required for correctness.
   Status PropagateConstraints(LayoutConstraints* constraints);
 
-  // Propagates a layout constraint on the use of the result of the given
-  // instruction to the definitions of the LogicalBuffers which make up the
-  // result.
-  Status PropagateUseConstraintToDefs(const ShapeLayout& shape_layout,
-                                      const HloInstruction* instruction,
-                                      LayoutConstraints* constraints);
-
   // Chooses a layout of operand `operand_no` of `instruction` that minimizes
   // the cost of `instruction`. `output_layout` is the layout of `instruction`.
   // Returns null if it can't decide the best layout.
diff --git a/tensorflow/compiler/xla/service/layout_assignment_test.cc b/tensorflow/compiler/xla/service/layout_assignment_test.cc
index c6df9839c3..bfb9e4ac2e 100644
--- a/tensorflow/compiler/xla/service/layout_assignment_test.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment_test.cc
@@ -481,7 +481,75 @@ TEST_F(LayoutAssignmentTest, ReshapeOperandHasMultipleUsers) {
   EXPECT_THAT(tanh->shape().layout().minor_to_major(), ElementsAre(0, 1));
 }
 
-// Add test which fails due to copy tuple.
+class OperandsMustBeTheSameLayoutAssignment : public LayoutAssignment {
+ public:
+  explicit OperandsMustBeTheSameLayoutAssignment(
+      ComputationLayout* entry_computation_layout)
+      : LayoutAssignment(entry_computation_layout) {}
+
+ protected:
+  Status PropagateBufferConstraint(
+      const BufferLayoutConstraint& buffer_constraint,
+      LayoutConstraints* constraints) override {
+    const LogicalBuffer& buffer = buffer_constraint.buffer();
+    const HloInstruction* instruction = buffer.instruction();
+
+    // Force the operands' layout to the output layout.
+    for (int64 operand_no = 0; operand_no < instruction->operand_count();
+         ++operand_no) {
+      const HloInstruction* operand = instruction->operand(operand_no);
+      if (ShapeUtil::Rank(instruction->shape()) !=
+          ShapeUtil::Rank(operand->shape())) {
+        continue;
+      }
+      TF_RETURN_IF_ERROR(constraints->SetArrayOperandLayout(
+          buffer_constraint.layout(), instruction, operand_no,
+          /*mandatory=*/true));
+    }
+    return PropagateBufferConstraintToUses(buffer_constraint, constraints);
+  }
+};
+
+TEST_F(LayoutAssignmentTest, MakeOperandsTheSame) {
+  // param0 -> concatenate -> reshape
+  // param1   -^
+  auto builder = HloComputation::Builder(TestName());
+  Shape ashape = ShapeUtil::MakeShape(F32, {50, 1});
+  Shape bshape = ShapeUtil::MakeShape(F32, {50, 2});
+  Shape cshape = ShapeUtil::MakeShape(F32, {100});
+  auto param0 = builder.AddInstruction(
+      HloInstruction::CreateParameter(0, ashape, "param"));
+  auto param1 = builder.AddInstruction(
+      HloInstruction::CreateParameter(1, ashape, "param"));
+  auto concatenate = builder.AddInstruction(
+      HloInstruction::CreateConcatenate(bshape, {param0, param1}, 1));
+  auto reshape = builder.AddInstruction(
+      HloInstruction::CreateReshape(cshape, concatenate));
+  HloModule module(TestName());
+  HloComputation* computation =
+      module.AddEntryComputation(builder.Build(reshape));
+
+  Shape param0_shape_with_layout(ashape);
+  Shape param1_shape_with_layout(ashape);
+  *param0_shape_with_layout.mutable_layout() = LayoutUtil::MakeLayout({0, 1});
+  *param1_shape_with_layout.mutable_layout() = LayoutUtil::MakeLayout({1, 0});
+
+  ComputationLayout computation_layout(computation->ComputeProgramShape());
+  *computation_layout.mutable_parameter_layout(0) =
+      ShapeLayout(param0_shape_with_layout);
+  *computation_layout.mutable_parameter_layout(1) =
+      ShapeLayout(param1_shape_with_layout);
+  OperandsMustBeTheSameLayoutAssignment layout_assignment(&computation_layout);
+  EXPECT_IS_OK(layout_assignment.Run(&module).status());
+
+  EXPECT_EQ(HloOpcode::kCopy, concatenate->operand(0)->opcode());
+  EXPECT_THAT(concatenate->operand(0)->shape().layout().minor_to_major(),
+              ElementsAre(1, 0));
+  EXPECT_THAT(concatenate->operand(1)->shape().layout().minor_to_major(),
+              ElementsAre(1, 0));
+  EXPECT_THAT(concatenate->shape().layout().minor_to_major(),
+              ElementsAre(1, 0));
+}
 
 }  // namespace
 }  // namespace xla
-- 
GitLab


From 3a6676477c7ccb47cf7213bf7f63a80af90b2b49 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 03:53:14 -0700
Subject: [PATCH 1487/1563] Minor docstring formatting fix.

PiperOrigin-RevId: 156415121
---
 tensorflow/contrib/lookup/lookup_ops.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tensorflow/contrib/lookup/lookup_ops.py b/tensorflow/contrib/lookup/lookup_ops.py
index b415235b99..65474f03fa 100644
--- a/tensorflow/contrib/lookup/lookup_ops.py
+++ b/tensorflow/contrib/lookup/lookup_ops.py
@@ -643,19 +643,21 @@ class IdTableWithHashBuckets(LookupInterface):
 
   For example, if an instance of `IdTableWithHashBuckets` is initialized with a
   string-to-id table that maps:
+
   - emerson -> 0
   - lake -> 1
   - palmer -> 2
 
   The `IdTableWithHashBuckets` object will performs the following mapping:
+
   - emerson -> 0
   - lake -> 1
   - palmer -> 2
   - <other term> -> bucket id between 3 and 3 + num_oov_buckets, calculated by:
     hash(<term>) % num_oov_buckets + vocab_size
 
-  If input_tensor is ["emerson", "lake", "palmer", "king", "crimson"],
-  the lookup result is [0, 1, 2, 4, 7]
+  If input_tensor is `["emerson", "lake", "palmer", "king", "crimson"]`,
+  the lookup result is `[0, 1, 2, 4, 7]`
 
   If `table` is None, only out-of-vocabulary buckets are used.
 
-- 
GitLab


From 8c835bec973b2df859fd3feafff8b2ba04940c32 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 04:31:23 -0700
Subject: [PATCH 1488/1563] Explicitly place local_step variable on worker's
 local device (was defaulting to PS).

The local step is used by the ConditionalAccumulators to check gradients for staleness and optionally discard them.

This fixes the issue if that the local step is increased by one worker and a backup worker pushes a stale gradient to a ConditionalAccumulator, then the gradient will be accepted (and hence, training won't be synchronous anymore.)

PiperOrigin-RevId: 156417310
---
 .../python/training/sync_replicas_optimizer.py  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tensorflow/python/training/sync_replicas_optimizer.py b/tensorflow/python/training/sync_replicas_optimizer.py
index 16903c77cf..f1830bd3fc 100644
--- a/tensorflow/python/training/sync_replicas_optimizer.py
+++ b/tensorflow/python/training/sync_replicas_optimizer.py
@@ -240,12 +240,17 @@ class SyncReplicasOptimizer(optimizer.Optimizer):
     aggregated_grad = []
     var_list = []
 
-    self._local_step = variable_scope.variable(
-        initial_value=0,
-        trainable=False,
-        collections=[ops.GraphKeys.LOCAL_VARIABLES],
-        dtype=global_step.dtype.base_dtype,
-        name="sync_rep_local_step")
+    # local_anchor op will be placed on this worker task by default.
+    local_anchor = control_flow_ops.no_op()
+    # Colocating local_step variable prevents it being placed on the PS.
+    with ops.colocate_with(local_anchor):
+      self._local_step = variable_scope.variable(
+          initial_value=0,
+          trainable=False,
+          collections=[ops.GraphKeys.LOCAL_VARIABLES],
+          dtype=global_step.dtype.base_dtype,
+          name="sync_rep_local_step")
+
     self.local_step_init_op = state_ops.assign(self._local_step, global_step)
     chief_init_ops = [self.local_step_init_op]
     self.ready_for_local_init_op = variables.report_uninitialized_variables(
-- 
GitLab


From f2a837c6583eae020567c747ddfae083dc061043 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 18 May 2017 07:32:30 -0700
Subject: [PATCH 1489/1563] tfdbg: Let DebugDumpDir class raise a more specific
 subtype of ValueError

when a watch key is not found in the debugger dump.

PiperOrigin-RevId: 156429258
---
 tensorflow/python/debug/lib/debug_data.py | 32 ++++++++++++++---------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
index de1e1ce017..1f5b8af0db 100644
--- a/tensorflow/python/debug/lib/debug_data.py
+++ b/tensorflow/python/debug/lib/debug_data.py
@@ -521,6 +521,10 @@ class DebugTensorDatum(object):
     return self._dump_size_bytes
 
 
+class WatchKeyDoesNotExistInDebugDumpDirError(ValueError):
+  pass
+
+
 class DebugDumpDir(object):
   """Data set from a debug-dump directory on filesystem.
 
@@ -1408,13 +1412,14 @@ class DebugDumpDir(object):
         may be dumped multiple times.
 
     Raises:
-      ValueError: If the tensor does not exist in the debug-dump data.
+      WatchKeyDoesNotExistInDebugDumpDirError: If the tensor does not exist in
+        the debug-dump data.
     """
 
     watch_key = _get_tensor_watch_key(node_name, output_slot, debug_op)
     if watch_key not in self._watch_key_to_datum:
-      raise ValueError("Watch key \"%s\" does not exist in the debug dump" %
-                       watch_key)
+      raise WatchKeyDoesNotExistInDebugDumpDirError(
+          "Watch key \"%s\" does not exist in the debug dump" % watch_key)
 
     return [datum.file_path for datum in self._watch_key_to_datum[watch_key]]
 
@@ -1433,13 +1438,14 @@ class DebugDumpDir(object):
       List of tensors (`numpy.ndarray`) loaded from the debug-dump file(s).
 
     Raises:
-      ValueError: If the tensor does not exist in the debug-dump data.
+      WatchKeyDoesNotExistInDebugDumpDirError: If the tensor does not exist in
+        the debug-dump data.
     """
 
     watch_key = _get_tensor_watch_key(node_name, output_slot, debug_op)
     if watch_key not in self._watch_key_to_datum:
-      raise ValueError("Watch key \"%s\" does not exist in the debug dump" %
-                       watch_key)
+      raise WatchKeyDoesNotExistInDebugDumpDirError(
+          "Watch key \"%s\" does not exist in the debug dump" % watch_key)
 
     return [datum.get_tensor() for datum in self._watch_key_to_datum[watch_key]]
 
@@ -1460,13 +1466,14 @@ class DebugDumpDir(object):
       (`list` of `int`) list of relative timestamps.
 
     Raises:
-      ValueError: If the tensor watch key does not exist in the debug dump data.
+      WatchKeyDoesNotExistInDebugDumpDirError: If the tensor watch key does not
+        exist in the debug dump data.
     """
 
     watch_key = _get_tensor_watch_key(node_name, output_slot, debug_op)
     if watch_key not in self._watch_key_to_datum:
-      raise ValueError("Watch key \"%s\" does not exist in the debug dump" %
-                       watch_key)
+      raise WatchKeyDoesNotExistInDebugDumpDirError(
+          "Watch key \"%s\" does not exist in the debug dump" % watch_key)
 
     return self._watch_key_to_rel_time[watch_key]
 
@@ -1484,13 +1491,14 @@ class DebugDumpDir(object):
       (`list` of `int`): list of dump file sizes in bytes.
 
     Raises:
-      ValueError: If the tensor watch key does not exist in the debug dump data.
+      WatchKeyDoesNotExistInDebugDumpDirError: If the tensor watch key does not
+        exist in the debug dump data.
     """
 
     watch_key = _get_tensor_watch_key(node_name, output_slot, debug_op)
     if watch_key not in self._watch_key_to_datum:
-      raise ValueError("Watch key \"%s\" does not exist in the debug dump" %
-                       watch_key)
+      raise WatchKeyDoesNotExistInDebugDumpDirError(
+          "Watch key \"%s\" does not exist in the debug dump" % watch_key)
 
     return self._watch_key_to_dump_size_bytes[watch_key]
 
-- 
GitLab


From faf55ee67c1efc25507402820cb7af6b2b57c446 Mon Sep 17 00:00:00 2001
From: Yuan Yu <yuanbyu@google.com>
Date: Thu, 18 May 2017 07:39:09 -0700
Subject: [PATCH 1490/1563] There is a bug in tf.gradients() when it comes to
 handling backprop of non-trainable data types. The invariant for calling a
 gradient function is that the input gradients must be all tensors. However in
 the case of non-trainable data types, this invariant can be violated. For
 this CL I have only fixed it for my particular instance to unblock people.

PiperOrigin-RevId: 156429814
---
 .../python/kernel_tests/control_flow_ops_py_test.py      | 9 +++++++++
 tensorflow/python/ops/control_flow_grad.py               | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
index 405c003cab..d4ab4ca7aa 100644
--- a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
+++ b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
@@ -325,6 +325,15 @@ class ControlFlowTest(test.TestCase):
     with self.assertRaisesRegexp(TypeError, "must not be a Python bool"):
       _ = control_flow_ops.cond(False, fn1, fn2)
 
+  def testCondInt(self):
+    p = array_ops.placeholder(dtypes.bool, shape=[])
+    v = constant_op.constant(10)
+    fn1 = lambda: math_ops.add(v, 1)
+    fn2 = lambda: math_ops.subtract(v, 1)
+    y = control_flow_ops.cond(p, fn1, fn2)
+    grad = gradients_impl.gradients(y, [v])
+    self.assertAllEqual([None], grad)
+
   def testFetchables(self):
     with self.test_session() as sess:
       x = array_ops.placeholder(dtypes.float32)
diff --git a/tensorflow/python/ops/control_flow_grad.py b/tensorflow/python/ops/control_flow_grad.py
index 17c0aae4e2..496c5addad 100644
--- a/tensorflow/python/ops/control_flow_grad.py
+++ b/tensorflow/python/ops/control_flow_grad.py
@@ -72,6 +72,9 @@ def _SwitchGrad(op, *grad):
     good_grad = grad[op_ctxt.branch]
     zero_grad = grad[1 - op_ctxt.branch]
     # At this point, we have created zero_grad guarded by the right switch.
+    # Unfortunately, we may still get None here for not trainable data types.
+    if zero_grad is None:
+      return None, None
     return merge([good_grad, zero_grad], name="cond_grad")[0], None
   else:
     false_grad = switch(grad[0], op.inputs[1])[0]
-- 
GitLab


From 12ac2f34fadc8802121382c64588d9f9c2f58390 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 18 May 2017 08:22:15 -0700
Subject: [PATCH 1491/1563] tfdbg: send encoded GraphDef Event protos in chunks
 to work around the grpc 4MB size limit

PiperOrigin-RevId: 156433576
---
 .../common_runtime/debugger_state_interface.h |  3 +-
 .../core/common_runtime/direct_session.cc     |  2 +-
 tensorflow/core/debug/debug_io_utils.cc       | 40 +++++++++++++++++--
 tensorflow/core/debug/debug_io_utils.h        |  2 +-
 tensorflow/core/debug/debugger_state_impl.cc  |  5 ++-
 tensorflow/core/debug/debugger_state_impl.h   |  2 +-
 .../core/distributed_runtime/graph_mgr.cc     |  2 +-
 7 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/tensorflow/core/common_runtime/debugger_state_interface.h b/tensorflow/core/common_runtime/debugger_state_interface.h
index 6f197f372f..5841107be0 100644
--- a/tensorflow/core/common_runtime/debugger_state_interface.h
+++ b/tensorflow/core/common_runtime/debugger_state_interface.h
@@ -65,7 +65,8 @@ class DebugGraphDecoratorInterface {
   virtual Status DecorateGraph(Graph* graph, Device* device) = 0;
 
   // Publish Graph to debug URLs.
-  virtual Status PublishGraph(const Graph& graph) = 0;
+  virtual Status PublishGraph(const Graph& graph,
+                              const string& device_name) = 0;
 };
 
 typedef std::function<std::unique_ptr<DebuggerStateInterface>(
diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc
index f1c17d7788..6a948b4ca7 100644
--- a/tensorflow/core/common_runtime/direct_session.cc
+++ b/tensorflow/core/common_runtime/direct_session.cc
@@ -391,7 +391,7 @@ Status DirectSession::DecorateAndPublishGraphForDebug(
       DebugGraphDecoratorRegistry::CreateDecorator(debug_options, &decorator));
 
   TF_RETURN_IF_ERROR(decorator->DecorateGraph(graph, device));
-  TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph));
+  TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph, device->name()));
   return Status::OK();
 }
 
diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc
index c8282b83d6..43bb3039b5 100644
--- a/tensorflow/core/debug/debug_io_utils.cc
+++ b/tensorflow/core/debug/debug_io_utils.cc
@@ -27,6 +27,7 @@ limitations under the License.
 #endif
 
 #include "tensorflow/core/framework/summary.pb.h"
+#include "tensorflow/core/lib/hash/hash.h"
 #include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
@@ -86,6 +87,37 @@ string AppendTimestampToFilePath(const string& in, const uint64 timestamp) {
   return out;
 }
 
+#if defined(PLATFORM_GOOGLE)
+Status PublishEncodedGraphDefInChunks(const string& encoded_graph_def,
+                                      const string& device_name,
+                                      const int64 wall_time,
+                                      const string& debug_url) {
+  static const size_t kChunkSizeLimitBytes = 4000 * 1024;
+  const uint64 hash = ::tensorflow::Hash64(encoded_graph_def);
+  const size_t total_length = encoded_graph_def.size();
+  const size_t num_chunks = static_cast<size_t>(
+      std::ceil(static_cast<float>(total_length) / kChunkSizeLimitBytes));
+  for (size_t i = 0; i < num_chunks; ++i) {
+    const size_t pos = i * kChunkSizeLimitBytes;
+    const size_t len =
+        (i == num_chunks - 1) ? (total_length - pos) : kChunkSizeLimitBytes;
+    Event event;
+    event.set_wall_time(static_cast<double>(wall_time));
+    // Prefix the chunk with
+    //   <hash64>,<device_name>,<wall_time>|<index>|<num_chunks>|.
+    event.set_graph_def(strings::StrCat(hash, ",", device_name, ",", wall_time,
+                                        "|", i, "|", num_chunks, "|",
+                                        encoded_graph_def.substr(pos, len)));
+    if (!DebugGrpcIO::SendEventProtoThroughGrpcStream(event, debug_url).ok()) {
+      return errors::FailedPrecondition(
+          "Failed to send chunk ", i, " of ", num_chunks,
+          " of encoded GraphDef of size ", encoded_graph_def.size(), " bytes");
+    }
+  }
+  return Status::OK();
+}
+#endif
+
 }  // namespace
 
 Status ReadEventFromFile(const string& dump_file_path, Event* event) {
@@ -290,7 +322,7 @@ Status DebugIO::PublishDebugTensor(const string& tensor_name,
 }
 
 // static
-Status DebugIO::PublishGraph(const Graph& graph,
+Status DebugIO::PublishGraph(const Graph& graph, const string& device_name,
                              const std::unordered_set<string>& debug_urls) {
   GraphDef graph_def;
   graph.ToGraphDef(&graph_def);
@@ -307,14 +339,16 @@ Status DebugIO::PublishGraph(const Graph& graph,
   for (const string& debug_url : debug_urls) {
     if (debug_url.find(kFileURLScheme) == 0) {
       const string dump_root_dir = debug_url.substr(strlen(kFileURLScheme));
+      // TODO(cais): (b/38325442) Serialize the GraphDef to a directory that
+      // reflects the device name.
       const string file_name = strings::StrCat("_tfdbg_graph_", now_micros);
 
       status.Update(
           DebugFileIO::DumpEventProtoToFile(event, dump_root_dir, file_name));
     } else if (debug_url.find(kGrpcURLScheme) == 0) {
 #if defined(PLATFORM_GOOGLE)
-      status.Update(
-          DebugGrpcIO::SendEventProtoThroughGrpcStream(event, debug_url));
+      status.Update(PublishEncodedGraphDefInChunks(buf, device_name, now_micros,
+                                                   debug_url));
 #else
       GRPC_OSS_UNIMPLEMENTED_ERROR;
 #endif
diff --git a/tensorflow/core/debug/debug_io_utils.h b/tensorflow/core/debug/debug_io_utils.h
index 2785f5bcc1..e6118cb15d 100644
--- a/tensorflow/core/debug/debug_io_utils.h
+++ b/tensorflow/core/debug/debug_io_utils.h
@@ -79,7 +79,7 @@ class DebugIO {
   // Args:
   //   graph: The graph to be published.
   //   debug_urls: The set of debug URLs to publish the graph to.
-  static Status PublishGraph(const Graph& graph,
+  static Status PublishGraph(const Graph& graph, const string& device_name,
                              const std::unordered_set<string>& debug_urls);
 
   // Determine whether a copy node needs to perform deep-copy of input tensor.
diff --git a/tensorflow/core/debug/debugger_state_impl.cc b/tensorflow/core/debug/debugger_state_impl.cc
index d5752c0002..88e3c882e6 100644
--- a/tensorflow/core/debug/debugger_state_impl.cc
+++ b/tensorflow/core/debug/debugger_state_impl.cc
@@ -51,7 +51,8 @@ Status DebugGraphDecorator::DecorateGraph(Graph* graph, Device* device) {
       debug_options_.debug_tensor_watch_opts(), graph, device);
 }
 
-Status DebugGraphDecorator::PublishGraph(const Graph& graph) {
+Status DebugGraphDecorator::PublishGraph(const Graph& graph,
+                                         const string& device_name) {
   std::unordered_set<string> debug_urls;
   for (const DebugTensorWatch& watch :
        debug_options_.debug_tensor_watch_opts()) {
@@ -60,7 +61,7 @@ Status DebugGraphDecorator::PublishGraph(const Graph& graph) {
     }
   }
 
-  return DebugIO::PublishGraph(graph, debug_urls);
+  return DebugIO::PublishGraph(graph, device_name, debug_urls);
 }
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/debug/debugger_state_impl.h b/tensorflow/core/debug/debugger_state_impl.h
index d91aa03426..52e2663d08 100644
--- a/tensorflow/core/debug/debugger_state_impl.h
+++ b/tensorflow/core/debug/debugger_state_impl.h
@@ -50,7 +50,7 @@ class DebugGraphDecorator : public DebugGraphDecoratorInterface {
   virtual ~DebugGraphDecorator() {}
 
   Status DecorateGraph(Graph* graph, Device* device) override;
-  Status PublishGraph(const Graph& graph) override;
+  Status PublishGraph(const Graph& graph, const string& device_name) override;
 
  private:
   DebugOptions debug_options_;
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.cc b/tensorflow/core/distributed_runtime/graph_mgr.cc
index 5bde771e8d..f4bf9dcd3b 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.cc
+++ b/tensorflow/core/distributed_runtime/graph_mgr.cc
@@ -99,7 +99,7 @@ Status GraphMgr::DecorateAndPublishGraphForDebug(
   TF_RETURN_IF_ERROR(
       DebugGraphDecoratorRegistry::CreateDecorator(debug_options, &decorator));
   TF_RETURN_IF_ERROR(decorator->DecorateGraph(graph, device));
-  TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph));
+  TF_RETURN_IF_ERROR(decorator->PublishGraph(*graph, device->name()));
   return Status::OK();
 }
 
-- 
GitLab


From eac1a7bade980426925cb79ccc14c7f738bd5528 Mon Sep 17 00:00:00 2001
From: Chris Hoyean Song <sjhshy@gmail.com>
Date: Fri, 19 May 2017 00:49:18 +0900
Subject: [PATCH 1492/1563] Fix misspells. (#10000)

---
 tensorflow/contrib/data/python/kernel_tests/resample_test.py    | 2 +-
 .../distributions/python/kernel_tests/distribution_util_test.py | 2 +-
 tensorflow/core/kernels/parallel_map_dataset_op.cc              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/data/python/kernel_tests/resample_test.py b/tensorflow/contrib/data/python/kernel_tests/resample_test.py
index f6ce77054b..fb66acdcac 100644
--- a/tensorflow/contrib/data/python/kernel_tests/resample_test.py
+++ b/tensorflow/contrib/data/python/kernel_tests/resample_test.py
@@ -65,7 +65,7 @@ class ResampleTest(test.TestCase):
     self.assertAllEqual([compat.as_bytes(str(c))
                          for c in returned_classes], returned_data)
     total_returned = len(returned_classes)
-    # Subsampling rejects a large precentage of the initial data in
+    # Subsampling rejects a large percentage of the initial data in
     # this case.
     self.assertGreater(total_returned, 20000 * 0.2)
     class_counts = np.array([
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
index 58368d92c4..1c67a1b8f6 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/distribution_util_test.py
@@ -166,7 +166,7 @@ class ShapesFromLocAndScaleTest(test.TestCase):
       batch_shape, event_shape = distribution_util.shapes_from_loc_and_scale(
           loc, scale)
       # batch_shape depends on both args, and so is dynamic.  Since loc did not
-      # have static shape, we infered event shape entirely from scale, and this
+      # have static shape, we inferred event shape entirely from scale, and this
       # is available statically.
       self.assertAllEqual(
           [5, 2], batch_shape.eval(feed_dict={loc: np.zeros((2, 3))}))
diff --git a/tensorflow/core/kernels/parallel_map_dataset_op.cc b/tensorflow/core/kernels/parallel_map_dataset_op.cc
index 6b1214e660..0be7835ba5 100644
--- a/tensorflow/core/kernels/parallel_map_dataset_op.cc
+++ b/tensorflow/core/kernels/parallel_map_dataset_op.cc
@@ -188,7 +188,7 @@ class ParallelMapDatasetOp : public OpKernel {
 
           if (!output_buffer_.empty() && output_buffer_.front().is_produced) {
             // A new output element is available. Forward the status
-            // from computing it, and (if we sucessfully got an
+            // from computing it, and (if we successfully got an
             // element) the output values.
             Status s = output_buffer_.front().output_status;
             if (s.ok()) {
-- 
GitLab


From 9b6c62151a60a7148b138ccb78f30093f8682323 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Thu, 18 May 2017 09:24:29 -0700
Subject: [PATCH 1493/1563] Make division tests take 2 seconds each

These were timing out.  Make them do only one session run to avoid quadratic time.

RELNOTES: n/a
PiperOrigin-RevId: 156439896
---
 .../kernel_tests/division_future_test.py      | 21 ++++++++++++-------
 .../python/kernel_tests/division_past_test.py | 21 ++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/tensorflow/python/kernel_tests/division_future_test.py b/tensorflow/python/kernel_tests/division_future_test.py
index 4d943decf2..e681b32856 100644
--- a/tensorflow/python/kernel_tests/division_future_test.py
+++ b/tensorflow/python/kernel_tests/division_future_test.py
@@ -38,15 +38,19 @@ class DivisionTestCase(test.TestCase):
     # TODO(irving): Test int8, int16 once we support casts for those.
     dtypes = np.int32, np.int64, np.float32, np.float64
 
+    tensors = []
+    checks = []
+
     def check(x, y):
-      if isinstance(x, ops.Tensor):
-        x = x.eval()
-      if isinstance(y, ops.Tensor):
-        y = y.eval()
-      self.assertEqual(x.dtype, y.dtype)
-      self.assertEqual(x, y)
+      x = ops.convert_to_tensor(x)
+      y = ops.convert_to_tensor(y)
+      tensors.append((x, y))
+      def f(x, y):
+        self.assertEqual(x.dtype, y.dtype)
+        self.assertEqual(x, y)
+      checks.append(f)
 
-    with self.test_session():
+    with self.test_session() as sess:
       for dtype in dtypes:
         for x in map(dtype, values):
           for y in map(dtype, values):
@@ -60,6 +64,9 @@ class DivisionTestCase(test.TestCase):
                 floordiv = x // y
                 tf_floordiv = tf_x // tf_y
                 check(floordiv, tf_floordiv)
+      # Do only one sess.run for speed
+      for f, (x, y) in zip(checks, sess.run(tensors)):
+        f(x, y)
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/python/kernel_tests/division_past_test.py b/tensorflow/python/kernel_tests/division_past_test.py
index 8f446d01bb..2ff2f89407 100644
--- a/tensorflow/python/kernel_tests/division_past_test.py
+++ b/tensorflow/python/kernel_tests/division_past_test.py
@@ -38,15 +38,19 @@ class DivisionTestCase(test.TestCase):
     # TODO(irving): Test int8, int16 once we support casts for those.
     dtypes = np.int32, np.int64, np.float32, np.float64
 
+    tensors = []
+    checks = []
+
     def check(x, y):
-      if isinstance(x, ops.Tensor):
-        x = x.eval()
-      if isinstance(y, ops.Tensor):
-        y = y.eval()
-      self.assertEqual(x.dtype, y.dtype)
-      self.assertEqual(x, y)
+      x = ops.convert_to_tensor(x)
+      y = ops.convert_to_tensor(y)
+      tensors.append((x, y))
+      def f(x, y):
+        self.assertEqual(x.dtype, y.dtype)
+        self.assertEqual(x, y)
+      checks.append(f)
 
-    with self.test_session():
+    with self.test_session() as sess:
       for dtype in dtypes:
         for x in map(dtype, values):
           for y in map(dtype, values):
@@ -60,6 +64,9 @@ class DivisionTestCase(test.TestCase):
                 floordiv = x // y
                 tf_floordiv = tf_x // tf_y
                 check(floordiv, tf_floordiv)
+      # Do only one sess.run for speed
+      for f, (x, y) in zip(checks, sess.run(tensors)):
+        f(x, y)
 
 
 if __name__ == "__main__":
-- 
GitLab


From e6a780b896a4f7a5706cf8c6d5d51e21ab4f62a4 Mon Sep 17 00:00:00 2001
From: Geoffrey Irving <geoffreyi@google.com>
Date: Thu, 18 May 2017 09:26:15 -0700
Subject: [PATCH 1494/1563] Fix bugs in SetAttrValue and remove unnecessary
 calls to Node::ClearAttr

SetAttrValue appended to list attrs, which is unlikely to be what the user expected given the name.  With that fixed, several calls to ClearAttr immediately followed by AddAttr can be removed.

PiperOrigin-RevId: 156440096
---
 tensorflow/core/framework/attr_value_util.cc | 30 ++++++++++----------
 tensorflow/core/graph/quantize_training.cc   |  4 +--
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/tensorflow/core/framework/attr_value_util.cc b/tensorflow/core/framework/attr_value_util.cc
index 3573cc6ec2..b18ce3decc 100644
--- a/tensorflow/core/framework/attr_value_util.cc
+++ b/tensorflow/core/framework/attr_value_util.cc
@@ -36,8 +36,8 @@ string SummarizeString(const string& str) {
 string SummarizeTensor(const TensorProto& tensor_proto) {
   Tensor t;
   if (!t.FromProto(tensor_proto)) {
-    return strings::StrCat("<Invalid TensorProto: ",
-                           ProtoShortDebugString(tensor_proto), ">");
+    return strings::StrCat(
+        "<Invalid TensorProto: ", ProtoShortDebugString(tensor_proto), ">");
   }
   return t.DebugString();
 }
@@ -290,12 +290,12 @@ bool ParseAttrValue(StringPiece type, StringPiece text, AttrValue* out) {
 #define DEFINE_SET_ATTR_VALUE_ONE(ARG_TYPE, FIELD) \
   void SetAttrValue(ARG_TYPE value, AttrValue* out) { out->set_##FIELD(value); }
 
-#define DEFINE_SET_ATTR_VALUE_LIST(ARG_TYPE, FIELD)              \
-  void SetAttrValue(ARG_TYPE value, AttrValue* out) {            \
-    out->mutable_list(); /* create list() even if value empty */ \
-    for (const auto& v : value) {                                \
-      out->mutable_list()->add_##FIELD(v);                       \
-    }                                                            \
+#define DEFINE_SET_ATTR_VALUE_LIST(ARG_TYPE, FIELD)                       \
+  void SetAttrValue(ARG_TYPE value, AttrValue* out) {                     \
+    out->mutable_list()->Clear(); /* create list() even if value empty */ \
+    for (const auto& v : value) {                                         \
+      out->mutable_list()->add_##FIELD(v);                                \
+    }                                                                     \
   }
 
 #define DEFINE_SET_ATTR_VALUE_BOTH(ARG_TYPE, FIELD) \
@@ -319,7 +319,7 @@ void SetAttrValue(StringPiece value, AttrValue* out) {
 }
 
 void SetAttrValue(const gtl::ArraySlice<StringPiece> value, AttrValue* out) {
-  out->mutable_list();  // Create list() even if value empty.
+  out->mutable_list()->Clear();  // Create list() even if value empty.
   for (const auto& v : value) {
     out->mutable_list()->add_s(v.data(), v.size());
   }
@@ -338,14 +338,14 @@ void SetAttrValue(const PartialTensorShape& value, AttrValue* out) {
 }
 
 void SetAttrValue(const gtl::ArraySlice<TensorShape> value, AttrValue* out) {
-  out->mutable_list();  // Create list() even if value empty.
+  out->mutable_list()->Clear();  // Create list() even if value empty.
   for (const auto& v : value) {
     v.AsProto(out->mutable_list()->add_shape());
   }
 }
 
 void SetAttrValue(gtl::ArraySlice<TensorShapeProto> value, AttrValue* out) {
-  out->mutable_list();  // Create list() even if value empty.
+  out->mutable_list()->Clear();  // Create list() even if value empty.
   for (const auto& v : value) {
     *out->mutable_list()->add_shape() = v;
   }
@@ -353,7 +353,7 @@ void SetAttrValue(gtl::ArraySlice<TensorShapeProto> value, AttrValue* out) {
 
 void SetAttrValue(const gtl::ArraySlice<PartialTensorShape> value,
                   AttrValue* out) {
-  out->mutable_list();  // Create list() even if value empty.
+  out->mutable_list()->Clear();  // Create list() even if value empty.
   for (const auto& v : value) {
     v.AsProto(out->mutable_list()->add_shape());
   }
@@ -368,7 +368,7 @@ void SetAttrValue(const Tensor& value, AttrValue* out) {
 }
 
 void SetAttrValue(const gtl::ArraySlice<Tensor> value, AttrValue* out) {
-  out->mutable_list();  // Create list() even if value empty.
+  out->mutable_list()->Clear();  // Create list() even if value empty.
   for (const auto& v : value) {
     if (v.NumElements() > 1) {
       v.AsProtoTensorContent(out->mutable_list()->add_tensor());
@@ -383,7 +383,7 @@ void SetAttrValue(const TensorProto& value, AttrValue* out) {
 }
 
 void SetAttrValue(const gtl::ArraySlice<TensorProto> value, AttrValue* out) {
-  out->mutable_list();  // Create list() even if value empty.
+  out->mutable_list()->Clear();  // Create list() even if value empty.
   for (const auto& v : value) {
     *out->mutable_list()->add_tensor() = v;
   }
@@ -394,7 +394,7 @@ void SetAttrValue(const NameAttrList& value, AttrValue* out) {
 }
 
 void SetAttrValue(gtl::ArraySlice<NameAttrList> value, AttrValue* out) {
-  out->mutable_list();  // Create list() even if value empty.
+  out->mutable_list()->Clear();  // Create list() even if value empty.
   for (const auto& v : value) {
     *out->mutable_list()->add_func() = v;
   }
diff --git a/tensorflow/core/graph/quantize_training.cc b/tensorflow/core/graph/quantize_training.cc
index 4a479d3258..a0c3fbe2aa 100644
--- a/tensorflow/core/graph/quantize_training.cc
+++ b/tensorflow/core/graph/quantize_training.cc
@@ -226,9 +226,7 @@ Status ConnectVariablesToSaveOp(Graph* graph, Node* save_op,
   }
   save_op_builder = save_op_builder.Input(var_nodeouts);
 
-  // Clear the old attr for the two constants and add the new ones.
-  tensor_names_op->ClearAttr("value");
-  shape_and_slices_op->ClearAttr("value");
+  // Update the attrs.
   tensor_names_op->AddAttr("value", new_tensor_names);
   shape_and_slices_op->AddAttr("value", new_shape_and_slices);
 
-- 
GitLab


From 1bb0704a01d47b7addb54b3b8cc273a589fb87da Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Thu, 18 May 2017 09:44:04 -0700
Subject: [PATCH 1495/1563] Fix broken instructions link md in
 performance_models

PiperOrigin-RevId: 156442062
---
 tensorflow/docs_src/performance/performance_models.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index 9ca1e77ff5..d48e008a3a 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -345,7 +345,7 @@ executing the main script
 *   **`num_gpus`**: Number of GPUs to use.
 *   **`data_dir`**: Path to data to process. If not set, synthetic data is used.
     To use Imagenet data use these
-    [instructions(https://github.com/tensorflow/models/tree/master/inception#getting-started)
+    [instructions](https://github.com/tensorflow/models/tree/master/inception#getting-started)
     as a starting point.
 *   **`batch_size`**: Batch size for each GPU.
 *   **`variable_update`**: The method for managing variables: `parameter_server`
-- 
GitLab


From f7d266cf19da089c660c9dd0cdd1444c0c90ba72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Arrufat?= <arrufat@users.noreply.github.com>
Date: Thu, 18 May 2017 19:36:12 +0200
Subject: [PATCH 1496/1563] fix a bug in generate-pc.sh (#10008)

* add pkg-config generation script

* add suggestions from asimshankar to generate-pc.sh

* generate-pc: fix bug and robustify

The script was unable to genereate the pkgconfig file even with the
correct options.
Also, now it forces user to pass a version in order to continue.
---
 tensorflow/c/generate-pc.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tensorflow/c/generate-pc.sh b/tensorflow/c/generate-pc.sh
index ea2eed011c..0aac0673b7 100755
--- a/tensorflow/c/generate-pc.sh
+++ b/tensorflow/c/generate-pc.sh
@@ -9,6 +9,8 @@ usage() {
     echo -e "-h, --help\tdisplay this message"
 }
 
+[ $# == 0 ] && usage && exit 0
+
 # read the options
 ARGS=`getopt -o p:v:h --long prefix:,version:,help -n $0 -- "$@"`
 eval set -- "$ARGS"
@@ -27,11 +29,13 @@ while true ; do
                 "") shift 2 ;;
                 *) TF_VERSION=$2 ; shift 2 ;;
             esac ;;
-        --) shift ; echo "Try '$0 --help' for more information."; exit 1 ;;
+        --) shift ; break ;;
         *) echo "Internal error! Try '$0 --help' for more information." ; exit 1 ;;
     esac
 done
 
+[ -z $TF_VERSION ] && echo "Specify a version using -v or --version" && exit 1
+
 echo "Generating pkgconfig file for TensorFlow $TF_VERSION in $TF_PREFIX"
 
 cat << EOF > tensorflow.pc
-- 
GitLab


From 7916e22e954fc893e673f74b4088b9e9c3a9be97 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 10:35:11 -0700
Subject: [PATCH 1497/1563] Minor docstring formatting fix.

PiperOrigin-RevId: 156448484
---
 tensorflow/python/ops/array_ops.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index d06eb77987..f0dba04e44 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -196,6 +196,7 @@ def broadcast_dynamic_shape(shape_x, shape_y):
   Args:
     shape_x: A rank 1 integer `Tensor`, representing the shape of x.
     shape_y: A rank 1 integer `Tensor`, representing the shape of y.
+
   Returns:
     A rank 1 integer `Tensor` representing the broadcasted shape.
   """
-- 
GitLab


From 9ad851e54d014532dd3b3c8308396769f9a7aeee Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 10:38:29 -0700
Subject: [PATCH 1498/1563] Add graph transform rewriter for remote fused graph

PiperOrigin-RevId: 156448934
---
 .../contrib/cmake/tf_core_kernels.cmake       |   1 +
 tensorflow/contrib/cmake/tf_tests.cmake       |   1 +
 .../contrib/hvx/hvx_ops_support_checker/BUILD |   1 +
 .../hvx_ops_support_checker_main.cc           |  55 +++++
 tensorflow/core/kernels/BUILD                 |  37 ++++
 .../hexagon/hexagon_graph_execution_test.cc   |   9 +-
 .../kernels/remote_fused_graph_execute_op.cc  |   7 +-
 .../remote_fused_graph_execute_op_test.cc     |   8 +-
 ...emote_fused_graph_execute_op_test_utils.cc |  53 ++++-
 ...remote_fused_graph_execute_op_test_utils.h |  28 ++-
 .../remote_fused_graph_execute_utils.cc       |  32 +++
 .../remote_fused_graph_execute_utils.h        |  19 ++
 .../remote_fused_graph_execute_utils_test.cc  | 131 ++++-------
 .../remote_fused_graph_rewriter_transform.cc  | 163 ++++++++++++++
 ...ote_fused_graph_rewriter_transform_test.cc | 206 ++++++++++++++++++
 tensorflow/tools/graph_transforms/BUILD       |   1 +
 16 files changed, 641 insertions(+), 111 deletions(-)
 create mode 100644 tensorflow/core/kernels/remote_fused_graph_rewriter_transform.cc
 create mode 100644 tensorflow/core/kernels/remote_fused_graph_rewriter_transform_test.cc

diff --git a/tensorflow/contrib/cmake/tf_core_kernels.cmake b/tensorflow/contrib/cmake/tf_core_kernels.cmake
index e93680fb4d..c95cd068cd 100644
--- a/tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ b/tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -101,6 +101,7 @@ file(GLOB_RECURSE tf_core_kernels_exclude_srcs
    "${tensorflow_source_dir}/tensorflow/core/kernels/*.cu.cc"
    "${tensorflow_source_dir}/tensorflow/core/kernels/hexagon/*"
    "${tensorflow_source_dir}/tensorflow/core/kernels/remote_fused_graph_execute*.cc"
+   "${tensorflow_source_dir}/tensorflow/core/kernels/remote_fused_graph_rewriter_transform*.cc"
 )
 list(REMOVE_ITEM tf_core_kernels_srcs ${tf_core_kernels_exclude_srcs})
 
diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index 2568ca3bad..6392a5e044 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -282,6 +282,7 @@ if (tensorflow_BUILD_CC_TESTS)
     "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/call_options_test.cc"
     "${tensorflow_source_dir}/tensorflow/core/distributed_runtime/tensor_coding_test.cc"
     "${tensorflow_source_dir}/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc"
+    "${tensorflow_source_dir}/tensorflow/core/kernels/remote_fused_graph_rewriter_transform_test.cc"
     "${tensorflow_source_dir}/tensorflow/core/kernels/hexagon/graph_transferer_test.cc"
     "${tensorflow_source_dir}/tensorflow/core/kernels/hexagon/quantized_matmul_op_for_hexagon_test.cc"
   )
diff --git a/tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD b/tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD
index 922996a686..fa75943d78 100644
--- a/tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD
+++ b/tensorflow/contrib/hvx/hvx_ops_support_checker/BUILD
@@ -29,6 +29,7 @@ cc_binary(
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core:tensorflow",
+        "//tensorflow/core/kernels:remote_fused_graph_execute_utils",
         "//tensorflow/core/kernels/hexagon:graph_transferer",
         "//tensorflow/tools/graph_transforms:transform_utils",
     ],
diff --git a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
index 3a219bb3e6..6ae7c4a742 100644
--- a/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
+++ b/tensorflow/contrib/hvx/hvx_ops_support_checker/hvx_ops_support_checker_main.cc
@@ -22,7 +22,9 @@ limitations under the License.
 
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/framework/remote_fused_graph_execute_info.pb.h"
 #include "tensorflow/core/kernels/hexagon/hexagon_ops_definitions.h"
+#include "tensorflow/core/kernels/remote_fused_graph_execute_utils.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/init_main.h"
@@ -46,6 +48,47 @@ static int ParseFlags(int argc, char* argv[], string* in_graph) {
   return 0;
 }
 
+static void SummarizeNode(const NodeDef& node_def) {
+  LOG(INFO) << "Node(" << node_def.name() << ")";
+  LOG(INFO) << "  op: " << node_def.op();
+  for (const string& input : node_def.input()) {
+    LOG(INFO) << " Input: " << input;
+  }
+}
+
+static void DumpRemoteFusedGraph(const NodeDef& node_def) {
+  LOG(INFO) << "Remote fused graph found.";
+  RemoteFusedGraphExecuteInfo info;
+  string serialized_proto;
+  GetNodeAttr(node_def,
+              RemoteFusedGraphExecuteUtils::
+                  ATTR_SERIALIZED_REMOTE_FUSED_GRAPH_EXECUTE_INFO,
+              &serialized_proto)
+      .IgnoreError();
+  info.ParseFromString(serialized_proto);
+  LOG(INFO) << "Node name: " << node_def.name();
+  LOG(INFO) << "Executor name: " << info.executor_name();
+  for (const string& input : info.graph_input_node_name()) {
+    LOG(INFO) << "Input: " << input;
+  }
+  for (const RemoteFusedGraphExecuteInfo::TensorShapeTypeProto& shape_type :
+       info.default_graph_input_tensor_shape()) {
+    LOG(INFO) << "Input shape type: " << shape_type.DebugString();
+  }
+  for (const string& output : info.graph_output_node_name()) {
+    LOG(INFO) << "Output: " << output;
+  }
+  for (const RemoteFusedGraphExecuteInfo::TensorShapeTypeProto& shape_type :
+       info.default_graph_output_tensor_shape()) {
+    LOG(INFO) << "Output shape type: " << shape_type.DebugString();
+  }
+  const int subgraph_node_size = info.remote_graph().node_size();
+  LOG(INFO) << "Nodes in the graph: " << subgraph_node_size;
+  for (int i = 0; i < subgraph_node_size; ++i) {
+    LOG(INFO) << "node(" << i << "): " << info.remote_graph().node(i).name();
+  }
+}
+
 static void CheckOpsSupport(const GraphDef& graph_def) {
   const IGraphTransferOpsDefinitions& ops_definition =
       HexagonOpsDefinitions::getInstance();
@@ -53,7 +96,13 @@ static void CheckOpsSupport(const GraphDef& graph_def) {
 
   std::unordered_set<string> unsupported_ops;
   bool all_supported = true;
+  bool contains_remote_graph = false;
   for (const NodeDef& node : graph_def.node()) {
+    if (node.op() == "RemoteFusedGraphExecute") {
+      contains_remote_graph = true;
+      DumpRemoteFusedGraph(node);
+      continue;
+    }
     // TODO(satok): Set correct data type if it's given.
     const int op_id = ops_definition.GetOpIdFor(node.op(), {});
     if (op_id == IGraphTransferOpsDefinitions::INVALID_OP_ID) {
@@ -75,6 +124,12 @@ static void CheckOpsSupport(const GraphDef& graph_def) {
   } else {
     LOG(INFO) << count << " ops are not supported.";
   }
+
+  if (contains_remote_graph) {
+    for (const NodeDef& node : graph_def.node()) {
+      SummarizeNode(node);
+    }
+  }
 }
 
 }  // namespace
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index b2eaaa3492..590d334edc 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4297,6 +4297,7 @@ filegroup(
             "encode_jpeg_op.*",
             "identity_reader_op.*",
             "remote_fused_graph_execute_op.*",
+            "remote_fused_graph_rewriter_transform.*",
             "fixed_length_record_reader_op.*",
             "whole_file_read_ops.*",
             "sample_distorted_bounding_box_op.*",
@@ -4777,6 +4778,7 @@ cc_library(
 
 cc_library(
     name = "remote_fused_graph_execute_op_test_utils",
+    testonly = 1,
     srcs = ["remote_fused_graph_execute_op_test_utils.cc"],
     hdrs = ["remote_fused_graph_execute_op_test_utils.h"],
     deps = [
@@ -4785,6 +4787,7 @@ cc_library(
         "//tensorflow/cc:scope",
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
+        "//tensorflow/core:testlib",
         "//tensorflow/core/kernels:cwise_op",
     ],
 )
@@ -4842,6 +4845,40 @@ tf_cc_test(
     ],
 )
 
+cc_library(
+    name = "remote_fused_graph_rewriter_transform",
+    srcs = [
+        "remote_fused_graph_rewriter_transform.cc",
+    ],
+    deps = [
+        ":remote_fused_graph_execute_utils",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/cc:remote_fused_graph_ops",
+        "//tensorflow/core",
+        "//tensorflow/tools/graph_transforms:transform_utils",
+    ],
+    alwayslink = 1,
+)
+
+tf_cc_test(
+    name = "remote_fused_graph_rewriter_transform_test",
+    size = "small",
+    srcs = ["remote_fused_graph_rewriter_transform_test.cc"],
+    deps = [
+        ":remote_fused_graph_execute_op_test_utils",
+        ":remote_fused_graph_execute_utils",
+        ":remote_fused_graph_rewriter_transform",
+        "//tensorflow/cc:cc_ops",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+        "//tensorflow/core:testlib",
+        "//tensorflow/tools/graph_transforms:transform_utils",
+    ],
+)
+
 tf_mkl_kernel_library(
     name = "mkl_conv_op",
     prefix = "mkl_conv",
diff --git a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
index a383cc8199..54ba101501 100644
--- a/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
+++ b/tensorflow/core/kernels/hexagon/hexagon_graph_execution_test.cc
@@ -35,6 +35,7 @@ adb push /tmp/imagenet_comp_graph_label_strings.txt /data/local/tmp
 #include "tensorflow/core/kernels/i_remote_fused_graph_executor.h"
 #include "tensorflow/core/lib/core/casts.h"
 #include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
 #include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/env.h"
@@ -268,8 +269,7 @@ static void RunFusedGraph(const GraphDef& fused_graph_def) {
   session_options.env = Env::Default();
   std::unique_ptr<Session> session =
       std::unique_ptr<Session>(NewSession(session_options));
-  Status status = session->Create(fused_graph_def);
-  ASSERT_TRUE(status.ok());
+  TF_ASSERT_OK(session->Create(fused_graph_def));
 
   // Setup session arguments
   RunOptions run_options;
@@ -283,9 +283,8 @@ static void RunFusedGraph(const GraphDef& fused_graph_def) {
 
   LOG(INFO) << "Run graph";
   // Run inference with all node as output
-  status = session->Run(run_options, input_tensors, output_node_names, {},
-                        &output_tensors, &run_metadata);
-  ASSERT_TRUE(status.ok());
+  TF_ASSERT_OK(session->Run(run_options, input_tensors, output_node_names, {},
+                            &output_tensors, &run_metadata));
   ASSERT_EQ(1, output_tensors.size());
   const Tensor& output_tensor = output_tensors.at(0);
   LOG(INFO) << "Output byte size = " << output_tensor.TotalBytes();
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_op.cc b/tensorflow/core/kernels/remote_fused_graph_execute_op.cc
index 101d0e694b..aa3835ecc5 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_op.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_op.cc
@@ -29,9 +29,10 @@ class RemoteFusedGraphExecuteOp : public OpKernel {
   explicit RemoteFusedGraphExecuteOp(OpKernelConstruction* const ctx)
       : OpKernel(ctx), execute_info_() {
     string serialized_proto;
-    OP_REQUIRES_OK(ctx,
-                   ctx->GetAttr("serialized_remote_fused_graph_execute_info",
-                                &serialized_proto));
+    OP_REQUIRES_OK(
+        ctx, ctx->GetAttr(RemoteFusedGraphExecuteUtils::
+                              ATTR_SERIALIZED_REMOTE_FUSED_GRAPH_EXECUTE_INFO,
+                          &serialized_proto));
     OP_REQUIRES_OK(ctx, ctx->GetAttr("Tinputs", &input_types_));
     OP_REQUIRES_OK(ctx, ctx->GetAttr("Toutputs", &output_types_));
     execute_info_.ParseFromString(serialized_proto);
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc b/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
index 925af1f79e..112168b195 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
@@ -269,13 +269,13 @@ static Status RewriteGraphToFusedGraph(const GraphDef& original_graph,
 // 5. Fuse the original graph and run the inference the new fused graph
 TEST(RemoteFusedExecuteGraphOp, EndToEndTest) {
   // 5.1 Load original graph
-  const GraphDef original_graph =
-      RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-          NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef original_graph;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &original_graph));
 
   // 5.2 Fuse graph
   GraphDef fused_graph;
-  TF_CHECK_OK(RewriteGraphToFusedGraph(original_graph, &fused_graph));
+  TF_ASSERT_OK(RewriteGraphToFusedGraph(original_graph, &fused_graph));
 
   // 5.3 Setup session
   std::vector<Tensor> output_tensors;
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.cc
index 6e7d4b73d2..31c48082dd 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.cc
@@ -15,7 +15,10 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h"
 
+#include "tensorflow/cc/ops/array_ops.h"
 #include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/math_ops.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/platform/logging.h"
 
@@ -36,17 +39,57 @@ namespace tensorflow {
   return Output(ret, 0);
 }
 
-/* static */ GraphDef RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+/* static */ Status RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
     const string& name0, const float val0, const string& name1,
-    const float val1, const string& name_out) {
+    const float val1, const string& name_out, GraphDef* graph_def) {
   Scope root = Scope::NewRootScope();
   Output node0 = ops::Const(root.WithOpName(name0), val0);
   Output node1 = ops::Const(root.WithOpName(name1), val1);
   RemoteFusedGraphExecuteOpTestUtils::BuildAddOp(root.WithOpName(name_out),
                                                  node0, node1);
-  GraphDef def;
-  TF_CHECK_OK(root.ToGraphDef(&def));
-  return def;
+  TF_RETURN_IF_ERROR(root.ToGraphDef(graph_def));
+  return Status::OK();
+}
+
+/* static */ Status RemoteFusedGraphExecuteOpTestUtils::BuildMultipleAddGraph(
+    GraphDef* graph_def) {
+  Scope root = tensorflow::Scope::NewRootScope();
+
+  Tensor a_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&a_data, 1.0f);
+  Output a_const = ops::Const(root.WithOpName("A"), Input::Initializer(a_data));
+
+  Tensor b_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&b_data, 1.0f);
+  Output b_const = ops::Const(root.WithOpName("B"), Input::Initializer(b_data));
+
+  Tensor c_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&c_data, 1.0f);
+  Output c_const = ops::Const(root.WithOpName("C"), Input::Initializer(c_data));
+
+  Tensor d_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&d_data, 1.0f);
+  Output d_const = ops::Const(root.WithOpName("D"), Input::Initializer(d_data));
+
+  Tensor e_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
+  test::FillIota<float>(&e_data, 1.0f);
+  Output e_const = ops::Const(root.WithOpName("E"), Input::Initializer(e_data));
+
+  Output f_add = ops::Add(root.WithOpName("F"), a_const, b_const);
+
+  Output g_add = ops::Add(root.WithOpName("G"), d_const, e_const);
+
+  Output h_add = ops::Add(root.WithOpName("H"), f_add, c_const);
+
+  Output i_add = ops::Add(root.WithOpName("I"), c_const, g_add);
+
+  Output j_add = ops::Add(root.WithOpName("J"), h_add, i_add);
+
+  Output k_add = ops::Add(root.WithOpName("K"), j_add, g_add);
+
+  TF_RETURN_IF_ERROR(root.ToGraphDef(graph_def));
+
+  return Status::OK();
 }
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h b/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h
index 70d758ea6a..a0df50162b 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h
@@ -28,9 +28,31 @@ namespace tensorflow {
 class RemoteFusedGraphExecuteOpTestUtils {
  public:
   static Output BuildAddOp(const Scope& scope, const Input& x, const Input& y);
-  static GraphDef BuildAddGraph(const string& name0, const float val0,
-                                const string& name1, const float val1,
-                                const string& name_out);
+  static Status BuildAddGraph(const string& name0, const float val0,
+                              const string& name1, const float val1,
+                              const string& name_out, GraphDef* graph_def);
+
+  // BuildMultipleAddGraph builds the following graph
+  //
+  //  A         B         C         D         E
+  //  |         |         |         |         |
+  //  +----+----+         |         +----+----+
+  //       |              |              |
+  //       F             / \             G
+  //       |            |   |           / \
+  //       +-----+------+   +-----+----+   +
+  //             |                |        |
+  //             H                I        |
+  //             |                |        |
+  //             +-------+--------+        |
+  //                     |                 |
+  //                     J                 |
+  //                     |                 |
+  //                     +--------+--------+
+  //                              |
+  //                              K
+  //
+  static Status BuildMultipleAddGraph(GraphDef* graph_def);
 
  private:
   RemoteFusedGraphExecuteOpTestUtils() = delete;
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
index 2174098bde..d0ffcb1064 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.cc
@@ -104,6 +104,22 @@ string DumpCluster(const RemoteFusedGraphExecuteUtils::ClusterInfo& cluster) {
     RemoteFusedGraphExecuteUtils::ATTR_OUTPUT_DATA_TYPES;
 /* static */ constexpr const char* const
     RemoteFusedGraphExecuteUtils::ATTR_OUTPUT_SHAPES;
+/* static */ constexpr const char* const RemoteFusedGraphExecuteUtils::
+    ATTR_SERIALIZED_REMOTE_FUSED_GRAPH_EXECUTE_INFO;
+/* static */ constexpr const char* const RemoteFusedGraphExecuteUtils::
+    TRANSFORM_ARG_REMOTE_FUSED_GRAPH_EXECUTOR_NAME;
+/* static */ constexpr const char* const
+    RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_REMOTE_FUSED_GRAPH_NODE_NAME;
+/* static */ constexpr const char* const
+    RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_FUSED_NODES;
+/* static */ constexpr const char* const
+    RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_BORDER_INPUTS;
+/* static */ constexpr const char* const
+    RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_BORDER_OUTPUTS;
+/* static */ constexpr const char* const
+    RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_INPUT_TYPES;
+/* static */ constexpr const char* const
+    RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_INPUT_SHAPES;
 
 RemoteFusedGraphExecuteUtils::ExecutorBuildRegistrar::ExecutorBuildRegistrar(
     const string& name, ExecutorBuildFunc executor_build_func) {
@@ -797,6 +813,22 @@ RemoteFusedGraphExecuteUtils::BuildRemoteFusedGraphExecuteOpNode(
     TF_RETURN_IF_ERROR(ReplaceInputNodeByPlaceHolder(subgraph_input_name, dt,
                                                      shape, subgraph_def));
   }
+
+  // sort subgraph_def to align order in graph_def
+  std::unordered_map<string, int> name_to_id_map;
+  for (int i = 0; i < graph_def.node_size(); ++i) {
+    name_to_id_map.emplace(graph_def.node(i).name(), i);
+  }
+  std::sort(subgraph_def->mutable_node()->begin(),
+            subgraph_def->mutable_node()->end(),
+            [&name_to_id_map](const NodeDef& node0, const NodeDef& node1) {
+              CHECK(name_to_id_map.count(node0.name()) > 0);
+              CHECK(name_to_id_map.count(node1.name()) > 0);
+              const int id0 = name_to_id_map.at(node0.name());
+              const int id1 = name_to_id_map.at(node1.name());
+              return id0 < id1;
+            });
+
   VLOG(1) << DumpGraphDef(*subgraph_def);
   return Status::OK();
 }
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
index 97b0c2008a..3a792824c5 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils.h
@@ -39,6 +39,25 @@ class RemoteFusedGraphExecuteUtils {
   // TODO(satok): Use "_output_shapes" to share a spec with other ops
   static constexpr const char* const ATTR_OUTPUT_SHAPES =
       "_default_remote_output_shapes";
+  static constexpr const char* const
+      ATTR_SERIALIZED_REMOTE_FUSED_GRAPH_EXECUTE_INFO =
+          "serialized_remote_fused_graph_execute_info";
+
+  // Argument key strings to fuse a subgraph into RemoteFusedGraphExecuteOp.
+  static constexpr const char* const
+      TRANSFORM_ARG_REMOTE_FUSED_GRAPH_EXECUTOR_NAME =
+          "remote_fused_graph_executor_name";
+  static constexpr const char* const
+      TRANSFORM_ARG_REMOTE_FUSED_GRAPH_NODE_NAME =
+          "remote_fused_graph_node_name";
+  static constexpr const char* const TRANSFORM_ARG_FUSED_NODES = "fused_nodes";
+  static constexpr const char* const TRANSFORM_ARG_BORDER_INPUTS =
+      "border_inputs";
+  static constexpr const char* const TRANSFORM_ARG_BORDER_OUTPUTS =
+      "border_outputs";
+  static constexpr const char* const TRANSFORM_ARG_INPUT_TYPES = "input_types";
+  static constexpr const char* const TRANSFORM_ARG_INPUT_SHAPES =
+      "input_shapes";
 
   using ExecutorBuildFunc = std::function<Status(
       std::unique_ptr<IRemoteFusedGraphExecutor>* executor)>;
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc b/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
index 8bd63d996a..581b61a625 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_utils_test.cc
@@ -15,11 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/kernels/remote_fused_graph_execute_utils.h"
 #include "tensorflow/cc/framework/scope.h"
-#include "tensorflow/cc/ops/array_ops.h"
-#include "tensorflow/cc/ops/const_op.h"
-#include "tensorflow/cc/ops/math_ops.h"
 #include "tensorflow/core/common_runtime/shape_refiner.h"
-#include "tensorflow/core/framework/tensor_testutil.h"
 #include "tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/status_test_util.h"
@@ -47,69 +43,12 @@ static NodeDef* GetNodeDef(const string& name, GraphDef* def) {
   return nullptr;
 }
 
-// This function builds the following graph
-//
-//  A         B         C         D         E
-//  |         |         |         |         |
-//  +----+----+         |         +----+----+
-//       |              |              |
-//       F             / \             G
-//       |            |   |           / \
-//       +-----+------+   +-----+----+   +
-//             |                |        |
-//             H                I        |
-//             |                |        |
-//             +-------+--------+        |
-//                     |                 |
-//                     J                 |
-//                     |                 |
-//                     +--------+--------+
-//                              |
-//                              K
-//
-Status BuildMultipleAddGraph(GraphDef* graph_def) {
-  Scope root = tensorflow::Scope::NewRootScope();
-
-  Tensor a_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
-  test::FillIota<float>(&a_data, 1.0f);
-  Output a_const = ops::Const(root.WithOpName("A"), Input::Initializer(a_data));
-
-  Tensor b_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
-  test::FillIota<float>(&b_data, 1.0f);
-  Output b_const = ops::Const(root.WithOpName("B"), Input::Initializer(b_data));
-
-  Tensor c_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
-  test::FillIota<float>(&c_data, 1.0f);
-  Output c_const = ops::Const(root.WithOpName("C"), Input::Initializer(c_data));
-
-  Tensor d_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
-  test::FillIota<float>(&d_data, 1.0f);
-  Output d_const = ops::Const(root.WithOpName("D"), Input::Initializer(d_data));
-
-  Tensor e_data(DT_FLOAT, TensorShape({1, 1, 1, 1}));
-  test::FillIota<float>(&e_data, 1.0f);
-  Output e_const = ops::Const(root.WithOpName("E"), Input::Initializer(e_data));
-
-  Output f_add = ops::Add(root.WithOpName("F"), a_const, b_const);
-
-  Output g_add = ops::Add(root.WithOpName("G"), d_const, e_const);
-
-  Output h_add = ops::Add(root.WithOpName("H"), f_add, c_const);
-
-  Output i_add = ops::Add(root.WithOpName("I"), c_const, g_add);
-
-  Output j_add = ops::Add(root.WithOpName("J"), h_add, i_add);
-
-  Output k_add = ops::Add(root.WithOpName("K"), j_add, g_add);
-
-  TF_RETURN_IF_ERROR(root.ToGraphDef(graph_def));
-
-  return Status::OK();
-}
-
 class FuseRemoteGraphMultipleAddOpsTest : public ::testing::Test {
  protected:
-  void SetUp() final { TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def_)); }
+  void SetUp() final {
+    TF_ASSERT_OK(
+        RemoteFusedGraphExecuteOpTestUtils::BuildMultipleAddGraph(&graph_def_));
+  }
 
   void TearDown() final {}
 
@@ -196,8 +135,9 @@ static void ClearCluster(ClusterInfo* cluster) {
 }
 
 TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphA) {
-  GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &def));
   std::pair<string, Tensor> input_node_info;
   input_node_info.first = NAME_A;
   input_node_info.second = Tensor(DT_FLOAT, {});
@@ -216,8 +156,9 @@ TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphA) {
 }
 
 TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphAUninitialized) {
-  GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &def));
   std::pair<string, Tensor> input_node_info;
   input_node_info.first = NAME_A;
   input_node_info.second = Tensor(DT_FLOAT, {});
@@ -235,8 +176,9 @@ TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphAUninitialized) {
 }
 
 TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphAB) {
-  GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &def));
   std::pair<string, Tensor> input_node_info_a;
   input_node_info_a.first = NAME_A;
   input_node_info_a.second = Tensor(DT_FLOAT, {});
@@ -268,8 +210,9 @@ TEST(RemoteFusedGraphExecuteUtils, DryRunAddGraphForAllNodes) {
   const std::vector<std::pair<string, Tensor>> inputs{input_node_info_a};
   RemoteFusedGraphExecuteUtils::TensorShapeMap tensor_shape_map;
 
-  GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &def));
 
   // dryrun
   const Status status = RemoteFusedGraphExecuteUtils::DryRunInferenceForAllNode(
@@ -310,8 +253,9 @@ TEST(RemoteFusedGraphExecuteUtils, PropagateAndBuildTensorShapeMap) {
                                                       input_node_info_b};
 
   RemoteFusedGraphExecuteUtils::TensorShapeMap tensor_shape_map;
-  GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &def));
   ImportGraphDefOptions opts;
   Graph graph(OpRegistry::Global());
   ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
@@ -398,8 +342,9 @@ TEST(RemoteFusedGraphExecuteUtils,
   // Build outputs
   const std::vector<string> outputs = {NAME_A_PLUS_B};
 
-  GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &def));
   TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildAndAddTensorShapes(
       input_tensors, /*dry_run_inference*/ true, &def));
 
@@ -427,8 +372,9 @@ TEST(RemoteFusedGraphExecuteUtils, BuildRemoteFusedGraphExecuteOpNode) {
   // Build outputs
   const std::vector<string> outputs = {NAME_A_PLUS_B};
 
-  const GraphDef def = RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
-      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B);
+  GraphDef def;
+  TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildAddGraph(
+      NAME_A, NODE_A_VAL, NAME_B, NODE_B_VAL, NAME_A_PLUS_B, &def));
 
   Graph graph(OpRegistry::Global());
   ShapeRefiner shape_refiner(graph.versions().producer(), graph.op_registry());
@@ -442,7 +388,8 @@ TEST(RemoteFusedGraphExecuteUtils, BuildRemoteFusedGraphExecuteOpNode) {
 
 TEST(RemoteFusedGraphExecuteUtils, ExtractSubgraphNodes) {
   GraphDef graph_def;
-  TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def));
+  TF_ASSERT_OK(
+      RemoteFusedGraphExecuteOpTestUtils::BuildMultipleAddGraph(&graph_def));
   ClusterInfo cluster;
   const std::unordered_set<string>& node_names = std::get<0>(cluster);
   TF_ASSERT_OK(RemoteFusedGraphExecuteUtils::BuildClusterByBorder(
@@ -472,7 +419,8 @@ TEST(RemoteFusedGraphExecuteUtils, ExtractSubgraphNodes) {
 
 TEST(RemoteFusedGraphExecuteUtils, ClusterizeNodes) {
   GraphDef graph_def;
-  TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def));
+  TF_ASSERT_OK(
+      RemoteFusedGraphExecuteOpTestUtils::BuildMultipleAddGraph(&graph_def));
 
   std::vector<ClusterInfo> ci_vec;
   TF_ASSERT_OK(
@@ -508,7 +456,8 @@ TEST(RemoteFusedGraphExecuteUtils, ClusterizeNodes) {
 
 TEST(RemoteFusedGraphExecuteUtils, BuildSubgraphDefByInOut) {
   GraphDef graph_def;
-  TF_ASSERT_OK(BuildMultipleAddGraph(&graph_def));
+  TF_ASSERT_OK(
+      RemoteFusedGraphExecuteOpTestUtils::BuildMultipleAddGraph(&graph_def));
 
   ClusterInfo cluster;
   GraphDef subgraph_def;
@@ -556,7 +505,7 @@ TEST(RemoteFusedGraphExecuteUtils, BuildSubgraphDefByInOut) {
   EXPECT_EQ(3, subgraph_def.node_size());
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_hi_j) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_HI_J) {
   SetSubgraphArguments(std::vector<string>{"H", "I"}, std::vector<string>{"J"},
                        this);
 
@@ -569,7 +518,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_hi_j) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_fcg_j) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_FCG_J) {
   SetSubgraphArguments(std::vector<string>{"F", "C", "G"},
                        std::vector<string>{"J"}, this);
 
@@ -582,7 +531,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_fcg_j) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_abcde_j) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_ABCDE_J) {
   SetSubgraphArguments(std::vector<string>{"A", "B", "C", "D", "E"},
                        std::vector<string>{"J"}, this);
 
@@ -595,7 +544,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_abcde_j) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_abcde_k) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_ABCDE_K) {
   SetSubgraphArguments(std::vector<string>{"A", "B", "C", "D", "E"},
                        std::vector<string>{"K"}, this);
 
@@ -608,7 +557,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByInOut_abcde_k) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_h) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_H) {
   subgraph_node_names_ = {"H"};
 
   TF_ASSERT_OK(FuseByNodes());
@@ -620,7 +569,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_h) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_hij) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_HIJ) {
   subgraph_node_names_ = {"H", "I", "J"};
 
   TF_ASSERT_OK(FuseByNodes());
@@ -632,7 +581,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_hij) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_cfghij) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_CFGHIJ) {
   subgraph_node_names_ = {"C", "F", "G", "H", "I", "J"};
 
   TF_ASSERT_OK(FuseByNodes());
@@ -644,7 +593,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_cfghij) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_abcdefghij) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_ABCDEFGHIJ) {
   subgraph_node_names_ = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"};
 
   TF_ASSERT_OK(FuseByNodes());
@@ -656,7 +605,7 @@ TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_abcdefghij) {
       << SummarizeGraphDef(result_graph_def_);
 }
 
-TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_abcdefghijk) {
+TEST_F(FuseRemoteGraphMultipleAddOpsTest, FuseSubgraphByNodes_ABCDEFGHIJK) {
   subgraph_node_names_ = {"A", "B", "C", "D", "E", "F",
                           "G", "H", "I", "J", "K"};
 
diff --git a/tensorflow/core/kernels/remote_fused_graph_rewriter_transform.cc b/tensorflow/core/kernels/remote_fused_graph_rewriter_transform.cc
new file mode 100644
index 0000000000..8742214e17
--- /dev/null
+++ b/tensorflow/core/kernels/remote_fused_graph_rewriter_transform.cc
@@ -0,0 +1,163 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// Wraps the hexagon rewriter in a transform so it can be used as part of the
+// graph transform tool.
+// A usage example, based on inception v3 model:
+/*
+bazel build tensorflow/tools/graph_transforms:transform_graph
+
+
+// Specify remote graph by node names
+bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
+--in_graph=/tmp/tensorflow_inception_v3_stripped_optimized_quantized.pb \
+--out_graph=\
+/tmp/tensorflow_inception_v3_stripped_optimized_quantized_fused_hexagon.pb \
+--inputs='Mul' \
+--outputs='softmax' \
+--transforms='\
+fuse_remote_graph(
+input_types="float" \
+input_shapes="1,299,299,3" \
+fused_nodes="NodeA,NodeB,NodeC",
+remote_fused_graph_executor_name="executor" \
+remote_fused_graph_node_name="node_name" \
+)'
+
+// Specify remote graph by border inputs and outputs
+bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
+--in_graph=/tmp/tensorflow_inception_v3_stripped_optimized_quantized.pb \
+--out_graph=\
+/tmp/tensorflow_inception_v3_stripped_optimized_quantized_fused_hexagon.pb \
+--inputs='Mul' \
+--outputs='softmax' \
+--transforms='\
+fuse_remote_graph(
+input_types="float" \
+input_shapes="1,299,299,3" \
+border_inputs="NodeA:0,NodeB:0" \
+border_outputs="NodeC" \
+remote_fused_graph_executor_name="executor" \
+remote_fused_graph_node_name="node_name" \
+)'
+*/
+
+#include <unordered_set>
+
+#include "tensorflow/core/kernels/remote_fused_graph_execute_utils.h"
+#include "tensorflow/tools/graph_transforms/transform_utils.h"
+
+namespace tensorflow {
+namespace graph_transforms {
+Status FuseRemoteGraph(const GraphDef& input_graph_def,
+                       const TransformFuncContext& context,
+                       GraphDef* output_graph_def) {
+  GraphDef mutable_input_graph_def = input_graph_def;
+
+  const std::vector<string>& inputs = context.input_names;
+  const std::vector<string>& outputs = context.output_names;
+
+  string input_types_str;
+  string input_shapes_str;
+  TF_RETURN_IF_ERROR(context.GetOneStringParameter(
+      RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_INPUT_TYPES, "",
+      &input_types_str));
+  TF_RETURN_IF_ERROR(context.GetOneStringParameter(
+      RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_INPUT_SHAPES, "",
+      &input_shapes_str));
+
+  if (!input_types_str.empty()) {
+    const std::vector<string> input_types_strs =
+        str_util::Split(input_types_str, ",");
+    const std::vector<string> input_shapes_strs =
+        str_util::Split(input_shapes_str, ":");
+    CHECK_EQ(inputs.size(), input_types_strs.size());
+    CHECK_EQ(inputs.size(), input_shapes_strs.size());
+    std::vector<std::pair<string, Tensor>> input_tensors;
+    for (int i = 0; i < inputs.size(); ++i) {
+      const string& name = inputs.at(i);
+      std::vector<int64> dims;
+      CHECK(str_util::SplitAndParseAsInts(input_shapes_strs.at(i), ',', &dims));
+      DataType data_type;
+      CHECK(DataTypeFromString(input_types_strs.at(i), &data_type))
+          << "\"" << input_types_strs.at(i) << "\" was an invalid type";
+      input_tensors.emplace_back(
+          std::make_pair(name, Tensor(data_type, TensorShape(dims))));
+    }
+    TF_RETURN_IF_ERROR(RemoteFusedGraphExecuteUtils::BuildAndAddTensorShapes(
+        input_tensors, /*dry_run_inference=*/true, &mutable_input_graph_def));
+  }
+
+  string fused_nodes_str;
+  string border_inputs_str;
+  string border_outputs_str;
+  string remote_graph_executor_name;
+  string remote_fused_graph_node_name;
+
+  TF_RETURN_IF_ERROR(context.GetOneStringParameter(
+      RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_FUSED_NODES, "",
+      &fused_nodes_str));
+  TF_RETURN_IF_ERROR(context.GetOneStringParameter(
+      RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_BORDER_INPUTS, "",
+      &border_inputs_str));
+  TF_RETURN_IF_ERROR(context.GetOneStringParameter(
+      RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_BORDER_OUTPUTS, "",
+      &border_outputs_str));
+  TF_RETURN_IF_ERROR(context.GetOneStringParameter(
+      RemoteFusedGraphExecuteUtils::
+          TRANSFORM_ARG_REMOTE_FUSED_GRAPH_EXECUTOR_NAME,
+      "", &remote_graph_executor_name));
+  TF_RETURN_IF_ERROR(context.GetOneStringParameter(
+      RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_REMOTE_FUSED_GRAPH_NODE_NAME,
+      "", &remote_fused_graph_node_name));
+
+  CHECK(!remote_graph_executor_name.empty());
+
+  const bool require_shape_type = !input_types_str.empty();
+  if (!fused_nodes_str.empty()) {
+    const std::vector<string>& fused_node_name_vector =
+        str_util::Split(fused_nodes_str, ",");
+    const std::unordered_set<string> fused_node_names(
+        fused_node_name_vector.begin(), fused_node_name_vector.end());
+    TF_RETURN_IF_ERROR(RemoteFusedGraphExecuteUtils::FuseRemoteGraphByNodeNames(
+        mutable_input_graph_def, inputs, outputs, remote_fused_graph_node_name,
+        fused_node_names, remote_graph_executor_name, require_shape_type,
+        output_graph_def));
+  } else if (!border_inputs_str.empty() && !border_outputs_str.empty()) {
+    const std::vector<string> border_inputs =
+        str_util::Split(border_inputs_str, ",");
+    const std::vector<string> border_outputs =
+        str_util::Split(border_outputs_str, ",");
+    for (int i = 0; i < border_inputs.size(); ++i) {
+      VLOG(2) << "Border Input(" << i << "): " << border_inputs.at(i);
+    }
+    for (int i = 0; i < border_outputs.size(); ++i) {
+      VLOG(2) << "Border Output(" << i << "): " << border_outputs.at(i);
+    }
+    TF_RETURN_IF_ERROR(RemoteFusedGraphExecuteUtils::FuseRemoteGraphByBorder(
+        mutable_input_graph_def, inputs, outputs, remote_fused_graph_node_name,
+        border_inputs, border_outputs, remote_graph_executor_name,
+        require_shape_type, output_graph_def));
+  } else {
+    CHECK(false) << "Fuse targets are not specified.";
+  }
+
+  return Status::OK();
+}
+
+REGISTER_GRAPH_TRANSFORM("fuse_remote_graph", FuseRemoteGraph);
+
+}  // namespace graph_transforms
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/remote_fused_graph_rewriter_transform_test.cc b/tensorflow/core/kernels/remote_fused_graph_rewriter_transform_test.cc
new file mode 100644
index 0000000000..9e061437a9
--- /dev/null
+++ b/tensorflow/core/kernels/remote_fused_graph_rewriter_transform_test.cc
@@ -0,0 +1,206 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/cc/ops/const_op.h"
+#include "tensorflow/cc/ops/image_ops.h"
+#include "tensorflow/cc/ops/nn_ops.h"
+#include "tensorflow/cc/ops/standard_ops.h"
+#include "tensorflow/core/common_runtime/function.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/tensor_testutil.h"
+#include "tensorflow/core/graph/default_device.h"
+#include "tensorflow/core/graph/node_builder.h"
+#include "tensorflow/core/graph/testlib.h"
+#include "tensorflow/core/kernels/remote_fused_graph_execute_op_test_utils.h"
+#include "tensorflow/core/kernels/remote_fused_graph_execute_utils.h"
+#include "tensorflow/core/lib/core/status_test_util.h"
+#include "tensorflow/core/platform/test.h"
+#include "tensorflow/core/public/session.h"
+#include "tensorflow/tools/graph_transforms/transform_utils.h"
+
+namespace tensorflow {
+namespace graph_transforms {
+
+// Declared here so we don't have to put it in a public header.
+Status FuseRemoteGraph(const GraphDef& input_graph_def,
+                       const TransformFuncContext& context,
+                       GraphDef* output_graph_def);
+
+namespace {
+
+constexpr const char* const REMOTE_FUSED_GRAPH_EXECUTOR_NAME =
+    "remote_fused_graph_executor_name";
+constexpr const char* const REMOTE_FUSED_GRAPH_NODE_NAME =
+    "remote_fused_graph_node_name";
+
+class FuseRemoteGraphMultipleAddOpsRewriterTest : public ::testing::Test {
+ protected:
+  void SetUp() final {
+    TF_ASSERT_OK(RemoteFusedGraphExecuteOpTestUtils::BuildMultipleAddGraph(
+        &input_graph_def_));
+  }
+
+  void TearDown() final {}
+
+  Status Fuse() {
+    TransformFuncContext context;
+    context.input_names = inputs_;
+    context.output_names = outputs_;
+
+    if (!input_types_.empty()) {
+      context.params.insert(std::pair<string, std::vector<string>>(
+          {RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_INPUT_TYPES,
+           {input_types_}}));
+    }
+    if (!input_shapes_.empty()) {
+      context.params.insert(std::pair<string, std::vector<string>>(
+          {RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_INPUT_SHAPES,
+           {input_shapes_}}));
+    }
+    if (!fused_node_names_str_.empty()) {
+      context.params.insert(std::pair<string, std::vector<string>>(
+          {RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_FUSED_NODES,
+           {fused_node_names_str_}}));
+    }
+
+    if (!border_inputs_str_.empty()) {
+      context.params.insert(std::pair<string, std::vector<string>>(
+          {RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_BORDER_INPUTS,
+           {border_inputs_str_}}));
+    }
+    if (!border_outputs_str_.empty()) {
+      context.params.insert(std::pair<string, std::vector<string>>(
+          {RemoteFusedGraphExecuteUtils::TRANSFORM_ARG_BORDER_OUTPUTS,
+           {border_outputs_str_}}));
+    }
+
+    context.params.insert(std::pair<string, std::vector<string>>(
+        {RemoteFusedGraphExecuteUtils::
+             TRANSFORM_ARG_REMOTE_FUSED_GRAPH_EXECUTOR_NAME,
+         {REMOTE_FUSED_GRAPH_EXECUTOR_NAME}}));
+    context.params.insert(std::pair<string, std::vector<string>>(
+        {RemoteFusedGraphExecuteUtils::
+             TRANSFORM_ARG_REMOTE_FUSED_GRAPH_NODE_NAME,
+         {REMOTE_FUSED_GRAPH_NODE_NAME}}));
+
+    return FuseRemoteGraph(input_graph_def_, context, &output_graph_def_);
+  }
+
+  void SetInputShapeType() {
+    input_types_ = "float";
+    input_shapes_ = "1,1,1,1";
+  }
+
+  void CheckGraph(int expected_node_count, int expected_cluster_count) {
+    EXPECT_EQ(expected_node_count, output_graph_def_.node_size());
+
+    int cluster_count = 0;
+    for (const NodeDef& node_def : output_graph_def_.node()) {
+      const string& name = node_def.name();
+      if (StringPiece(name).starts_with(REMOTE_FUSED_GRAPH_NODE_NAME)) {
+        ++cluster_count;
+        RemoteFusedGraphExecuteInfo info;
+        string serialized_proto;
+        TF_ASSERT_OK(
+            GetNodeAttr(node_def,
+                        RemoteFusedGraphExecuteUtils::
+                            ATTR_SERIALIZED_REMOTE_FUSED_GRAPH_EXECUTE_INFO,
+                        &serialized_proto));
+        info.ParseFromString(serialized_proto);
+        CHECK_EQ(REMOTE_FUSED_GRAPH_EXECUTOR_NAME, info.executor_name());
+      }
+    }
+    EXPECT_EQ(expected_cluster_count, cluster_count);
+  }
+
+ public:
+  const std::vector<string> inputs_{"A"};
+  const std::vector<string> outputs_{"K"};
+  GraphDef input_graph_def_;
+  string input_types_;
+  string input_shapes_;
+  GraphDef output_graph_def_;
+  string fused_node_names_str_;
+  string border_inputs_str_;
+  string border_outputs_str_;
+};
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByNodesWithShapeType_HIJ) {
+  SetInputShapeType();
+  fused_node_names_str_ = "H,I,J";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(9, 1);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByNodesWithoutShapeType_HIJ) {
+  fused_node_names_str_ = "H,I,J";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(9, 1);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByNodesWithShapeType_ABCDEFGHIJK) {
+  SetInputShapeType();
+  fused_node_names_str_ = "A,B,C,D,E,F,G,H,I,J,K";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(3, 1);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByNodesWithoutShapeType_ABCDEFGHIJK) {
+  fused_node_names_str_ = "A,B,C,D,E,F,G,H,I,J,K";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(3, 1);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByBorderWithShapeType_FCG_J) {
+  SetInputShapeType();
+  border_inputs_str_ = "F:0,C:0,G";
+  border_outputs_str_ = "J:0";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(9, 1);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByBorderWithoutShapeType_FCG_J) {
+  border_inputs_str_ = "F:0,C:0,G";
+  border_outputs_str_ = "J:0";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(9, 1);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByBorderWithShapeType_ABCDE_K) {
+  SetInputShapeType();
+  border_inputs_str_ = "A,B,C,D,E";
+  border_outputs_str_ = "K";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(7, 1);
+}
+
+TEST_F(FuseRemoteGraphMultipleAddOpsRewriterTest,
+       FuseRemoteGraphByBorderWithoutShapeType_ABCDE_K) {
+  border_inputs_str_ = "A,B,C,D,E";
+  border_outputs_str_ = "K";
+  TF_ASSERT_OK(Fuse());
+  CheckGraph(7, 1);
+}
+
+}  // namespace
+}  // namespace graph_transforms
+}  // namespace tensorflow
diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD
index 89068c6d01..20f958f640 100644
--- a/tensorflow/tools/graph_transforms/BUILD
+++ b/tensorflow/tools/graph_transforms/BUILD
@@ -97,6 +97,7 @@ cc_library(
         "//tensorflow/core:tensorflow",
     ] + if_not_windows([
         "//tensorflow/core/kernels:quantized_ops",
+        "//tensorflow/core/kernels:remote_fused_graph_rewriter_transform",
         "//tensorflow/core/kernels/hexagon:hexagon_rewriter_transform",
     ]),
     alwayslink = 1,
-- 
GitLab


From b67991767187668682f9f18ff6e9e236b5fa0e03 Mon Sep 17 00:00:00 2001
From: Olivia Nordquist <nolivia@google.com>
Date: Thu, 18 May 2017 11:02:31 -0700
Subject: [PATCH 1499/1563] minor clarification on docs

PiperOrigin-RevId: 156452467
---
 tensorflow/python/ops/nn_ops.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index 61fda3a798..c06c07ccd8 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -1533,8 +1533,9 @@ def softmax_cross_entropy_with_logits(_sentinel=None,  # pylint: disable=invalid
   on `logits` internally for efficiency.  Do not call this op with the
   output of `softmax`, as it will produce incorrect results.
 
-  `logits` and `labels` must have the same shape `[batch_size, num_classes]`
-  and the same dtype (either `float16`, `float32`, or `float64`).
+  `logits` and `labels` must have the same shape, e.g.
+  `[batch_size, num_classes]` and the same dtype (either `float16`, `float32`,
+  or `float64`).
 
   **Note that to avoid confusion, it is required to pass only named arguments to
   this function.**
-- 
GitLab


From febbec41771c96b30309807e6396890cc54e3f76 Mon Sep 17 00:00:00 2001
From: Jonathan Hseu <jhseu@google.com>
Date: Thu, 18 May 2017 11:02:51 -0700
Subject: [PATCH 1500/1563] Fix WholeFileReader for named pipes (or any file
 with incorrect or non-fixed sizes).

PiperOrigin-RevId: 156452522
---
 .../core/kernels/whole_file_read_ops.cc       | 17 +++------
 .../core/lib/io/buffered_inputstream.cc       | 18 ++++++++++
 tensorflow/core/lib/io/buffered_inputstream.h |  6 ++++
 .../core/lib/io/buffered_inputstream_test.cc  | 36 +++++++++++++++++++
 .../python/framework/test_file_system.cc      | 10 ++++--
 5 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/tensorflow/core/kernels/whole_file_read_ops.cc b/tensorflow/core/kernels/whole_file_read_ops.cc
index 148ede24c3..8f42bb2832 100644
--- a/tensorflow/core/kernels/whole_file_read_ops.cc
+++ b/tensorflow/core/kernels/whole_file_read_ops.cc
@@ -21,6 +21,8 @@ limitations under the License.
 #include "tensorflow/core/framework/reader_op_kernel.h"
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/io/buffered_inputstream.h"
+#include "tensorflow/core/lib/io/random_inputstream.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 #include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/protobuf.h"
@@ -29,20 +31,11 @@ namespace tensorflow {
 
 static Status ReadEntireFile(Env* env, const string& filename,
                              string* contents) {
-  uint64 file_size = 0;
-  TF_RETURN_IF_ERROR(env->GetFileSize(filename, &file_size));
-  contents->resize(file_size);
   std::unique_ptr<RandomAccessFile> file;
   TF_RETURN_IF_ERROR(env->NewRandomAccessFile(filename, &file));
-  StringPiece data;
-  TF_RETURN_IF_ERROR(file->Read(0, file_size, &data, &(*contents)[0]));
-  if (data.size() != file_size) {
-    return errors::DataLoss("Truncated read of '", filename, "' expected ",
-                            file_size, " got ", data.size());
-  }
-  if (data.data() != &(*contents)[0]) {
-    memmove(&(*contents)[0], data.data(), data.size());
-  }
+  io::RandomAccessInputStream input_stream(file.get());
+  io::BufferedInputStream in(&input_stream, 1 << 20);
+  TF_RETURN_IF_ERROR(in.ReadAll(contents));
   return Status::OK();
 }
 
diff --git a/tensorflow/core/lib/io/buffered_inputstream.cc b/tensorflow/core/lib/io/buffered_inputstream.cc
index 7bdbc1ff8c..6f72da4713 100644
--- a/tensorflow/core/lib/io/buffered_inputstream.cc
+++ b/tensorflow/core/lib/io/buffered_inputstream.cc
@@ -150,6 +150,24 @@ Status BufferedInputStream::Seek(int64 position) {
   return SkipNBytes(position - bufpos);
 }
 
+Status BufferedInputStream::ReadAll(string* result) {
+  result->clear();
+  Status status;
+  while (status.ok()) {
+    status = FillBuffer();
+    if (limit_ == 0) {
+      break;
+    }
+    result->append(buf_);
+    pos_ = limit_;
+  }
+
+  if (errors::IsOutOfRange(status)) {
+    return Status::OK();
+  }
+  return status;
+}
+
 Status BufferedInputStream::Reset() {
   TF_RETURN_IF_ERROR(input_stream_->Reset());
   pos_ = 0;
diff --git a/tensorflow/core/lib/io/buffered_inputstream.h b/tensorflow/core/lib/io/buffered_inputstream.h
index d55dd5cdaf..b37766005a 100644
--- a/tensorflow/core/lib/io/buffered_inputstream.h
+++ b/tensorflow/core/lib/io/buffered_inputstream.h
@@ -75,6 +75,12 @@ class BufferedInputStream : public InputStreamInterface {
   // no special treatment.
   string ReadLineAsString();
 
+  // Reads the entire contents of the file into *result.
+  //
+  // Note: the amount of memory used by this function call is unbounded, so only
+  // use in ops that expect that behavior.
+  Status ReadAll(string* result);
+
   Status Reset() override;
 
  private:
diff --git a/tensorflow/core/lib/io/buffered_inputstream_test.cc b/tensorflow/core/lib/io/buffered_inputstream_test.cc
index 4def2de373..7265101e1b 100644
--- a/tensorflow/core/lib/io/buffered_inputstream_test.cc
+++ b/tensorflow/core/lib/io/buffered_inputstream_test.cc
@@ -326,6 +326,42 @@ TEST(BufferedInputStream, Seek) {
   }
 }
 
+TEST(BufferedInputStream, ReadAll_Empty) {
+  Env* env = Env::Default();
+  string fname = testing::TmpDir() + "/buffered_inputstream_test";
+  const string expected = "";
+  TF_ASSERT_OK(WriteStringToFile(env, fname, expected));
+  std::unique_ptr<RandomAccessFile> file;
+  TF_ASSERT_OK(env->NewRandomAccessFile(fname, &file));
+
+  for (auto buf_size : BufferSizes()) {
+    RandomAccessInputStream input_stream(file.get());
+    string read;
+    BufferedInputStream in(&input_stream, buf_size);
+    string contents;
+    TF_ASSERT_OK(in.ReadAll(&contents));
+    EXPECT_EQ(expected, contents);
+  }
+}
+
+TEST(BufferedInputStream, ReadAll_Text) {
+  Env* env = Env::Default();
+  string fname = testing::TmpDir() + "/buffered_inputstream_test";
+  const string expected = "line one\nline two\nline three";
+  TF_ASSERT_OK(WriteStringToFile(env, fname, expected));
+  std::unique_ptr<RandomAccessFile> file;
+  TF_ASSERT_OK(env->NewRandomAccessFile(fname, &file));
+
+  for (auto buf_size : BufferSizes()) {
+    RandomAccessInputStream input_stream(file.get());
+    string read;
+    BufferedInputStream in(&input_stream, buf_size);
+    string contents;
+    TF_ASSERT_OK(in.ReadAll(&contents));
+    EXPECT_EQ(expected, contents);
+  }
+}
+
 }  // anonymous namespace
 }  // namespace io
 }  // namespace tensorflow
diff --git a/tensorflow/python/framework/test_file_system.cc b/tensorflow/python/framework/test_file_system.cc
index 32b9b82e56..094ea6f658 100644
--- a/tensorflow/python/framework/test_file_system.cc
+++ b/tensorflow/python/framework/test_file_system.cc
@@ -18,14 +18,20 @@ limitations under the License.
 namespace tensorflow {
 
 class TestRandomAccessFile : public RandomAccessFile {
-  // The filecontents is all A's
+  // The file contents is 10 bytes of all A's
   Status Read(uint64 offset, size_t n, StringPiece* result,
               char* scratch) const override {
+    Status s;
     for (int i = 0; i < n; ++i) {
+      if (offset + i >= 10) {
+        n = i;
+        s = errors::OutOfRange("EOF");
+        break;
+      }
       scratch[i] = 'A';
     }
     *result = StringPiece(scratch, n);
-    return Status::OK();
+    return s;
   }
 };
 
-- 
GitLab


From 5b9dcd8f9b30ca60ba4ee59c7dfd660203b08c17 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Tue, 7 Feb 2017 11:08:28 -0800
Subject: [PATCH 1501/1563] [TF:XLA] Add more test cases for integer division.

PiperOrigin-RevId: 156453370
---
 .../xla/tests/array_elementwise_ops_test.cc   | 144 ++++++++++++++++++
 .../xla/tests/scalar_computations_test.cc     | 114 ++++++++++++++
 2 files changed, 258 insertions(+)

diff --git a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
index 8c433a364d..319cd2c6fd 100644
--- a/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
+++ b/tensorflow/compiler/xla/tests/array_elementwise_ops_test.cc
@@ -242,6 +242,150 @@ XLA_TEST_F(ArrayElementwiseOpTest, DivTwoConstantZeroElementF32s) {
   ComputeAndCompareR1<float>(&builder, {}, {}, error_spec_);
 }
 
+TEST_F(ArrayElementwiseOpTest, DivS32s) {
+  // clang-format off
+  // Some interesting values to test.
+  std::vector<int32> vals = {
+    INT32_MIN, INT32_MIN + 1, INT32_MIN + 2, -0x40000000, -0x3fffffff,
+    -271181, -1309, -17, -10, -5, -3, -2, -1, 0, 1, 2, 3, 5, 10, 17, 26, 101,
+    7919, 0x40000000, INT32_MAX - 2, INT32_MAX - 1, INT32_MAX};
+  // clang-format on
+
+  std::vector<int32> dividends, divisors, quotients, remainders;
+  for (int32 divisor : vals) {
+    if (divisor != 0) {
+      for (int32 dividend : vals) {
+        // Avoid integer overflow.
+        if (dividend != INT32_MIN || divisor != -1) {
+          dividends.push_back(dividend);
+          divisors.push_back(divisor);
+          quotients.push_back(dividend / divisor);
+          remainders.push_back(dividend % divisor);
+        }
+      }
+    }
+  }
+
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    ComputationDataHandle divisor;
+    auto dividend_data =
+        CreateR1Parameter<int32>(dividends, 0, "dividend", &builder, &dividend);
+    auto divisor_data =
+        CreateR1Parameter<int32>(divisors, 1, "divisor", &builder, &divisor);
+    builder.Div(dividend, divisor);
+
+    ComputeAndCompareR1<int32>(&builder, quotients,
+                               {dividend_data.get(), divisor_data.get()});
+  }
+
+  // Test with a compile-time constant divisor.
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    auto dividend_data =
+        CreateR1Parameter<int32>(dividends, 0, "dividend", &builder, &dividend);
+    builder.Div(dividend, builder.ConstantR1<int32>(divisors));
+
+    ComputeAndCompareR1<int32>(&builder, quotients, {dividend_data.get()});
+  }
+
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    ComputationDataHandle divisor;
+    auto dividend_data =
+        CreateR1Parameter<int32>(dividends, 0, "dividend", &builder, &dividend);
+    auto divisor_data =
+        CreateR1Parameter<int32>(divisors, 1, "divisor", &builder, &divisor);
+    builder.Rem(dividend, divisor);
+
+    ComputeAndCompareR1<int32>(&builder, remainders,
+                               {dividend_data.get(), divisor_data.get()});
+  }
+
+  // Test with a compile-time constant divisor.
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    auto dividend_data =
+        CreateR1Parameter<int32>(dividends, 0, "dividend", &builder, &dividend);
+    builder.Rem(dividend, builder.ConstantR1<int32>(divisors));
+
+    ComputeAndCompareR1<int32>(&builder, remainders, {dividend_data.get()});
+  }
+}
+
+TEST_F(ArrayElementwiseOpTest, DivU32s) {
+  // clang-format off
+  // Some interesting values to test.
+  std::vector<uint32> vals = {
+    0, 1, 2, 17, 101, 3333, 0x7FFFFFFF, 0xABCDEF12, 0xCAFEBEEF, 0x80000000,
+    0x80000001, UINT32_MAX - 2, UINT32_MAX - 1, UINT32_MAX};
+  // clang-format on
+
+  std::vector<uint32> dividends, divisors, quotients, remainders;
+  for (uint32 divisor : vals) {
+    if (divisor != 0) {
+      for (uint32 dividend : vals) {
+        dividends.push_back(dividend);
+        divisors.push_back(divisor);
+        quotients.push_back(dividend / divisor);
+        remainders.push_back(dividend % divisor);
+      }
+    }
+  }
+
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    ComputationDataHandle divisor;
+    auto dividend_data = CreateR1Parameter<uint32>(dividends, 0, "dividend",
+                                                   &builder, &dividend);
+    auto divisor_data =
+        CreateR1Parameter<uint32>(divisors, 1, "divisor", &builder, &divisor);
+    builder.Div(dividend, divisor);
+
+    ComputeAndCompareR1<uint32>(&builder, quotients,
+                                {dividend_data.get(), divisor_data.get()});
+  }
+
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    auto dividend_data = CreateR1Parameter<uint32>(dividends, 0, "dividend",
+                                                   &builder, &dividend);
+    builder.Div(dividend, builder.ConstantR1<uint32>(divisors));
+
+    ComputeAndCompareR1<uint32>(&builder, quotients, {dividend_data.get()});
+  }
+
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    ComputationDataHandle divisor;
+    auto dividend_data = CreateR1Parameter<uint32>(dividends, 0, "dividend",
+                                                   &builder, &dividend);
+    auto divisor_data =
+        CreateR1Parameter<uint32>(divisors, 1, "divisor", &builder, &divisor);
+    builder.Rem(dividend, divisor);
+
+    ComputeAndCompareR1<uint32>(&builder, remainders,
+                                {dividend_data.get(), divisor_data.get()});
+  }
+
+  {
+    ComputationBuilder builder(client_, TestName());
+    ComputationDataHandle dividend;
+    auto dividend_data = CreateR1Parameter<uint32>(dividends, 0, "dividend",
+                                                   &builder, &dividend);
+    builder.Rem(dividend, builder.ConstantR1<uint32>(divisors));
+
+    ComputeAndCompareR1<uint32>(&builder, remainders, {dividend_data.get()});
+  }
+}
+
 XLA_TEST_F(ArrayElementwiseOpTest, RemF32s) {
   ComputationBuilder builder(client_, TestName());
   auto a = builder.ConstantR1<float>(
diff --git a/tensorflow/compiler/xla/tests/scalar_computations_test.cc b/tensorflow/compiler/xla/tests/scalar_computations_test.cc
index 0005c0c9e2..ceee24c307 100644
--- a/tensorflow/compiler/xla/tests/scalar_computations_test.cc
+++ b/tensorflow/compiler/xla/tests/scalar_computations_test.cc
@@ -279,6 +279,36 @@ XLA_TEST_P(DivS32Test, RemainderTwoScalarsS32) {
   ComputeAndCompareR0<int32>(&builder, p.remainder, {});
 }
 
+XLA_TEST_P(DivS32Test, DivideTwoScalarsNonConstS32) {
+  DivS32Params p = GetParam();
+  ComputationBuilder builder(client_, TestName());
+  ComputationDataHandle dividend;
+  ComputationDataHandle divisor;
+  auto dividendd =
+      CreateR0Parameter<int32>(p.dividend, 0, "dividend", &builder, &dividend);
+  auto divisord =
+      CreateR0Parameter<int32>(p.divisor, 1, "divisor", &builder, &divisor);
+  builder.Div(dividend, divisor);
+
+  ComputeAndCompareR0<int32>(&builder, p.quotient,
+                             {dividendd.get(), divisord.get()});
+}
+
+XLA_TEST_P(DivS32Test, RemainderTwoScalarsNonConstDivisorS32) {
+  DivS32Params p = GetParam();
+  ComputationBuilder builder(client_, TestName());
+  ComputationDataHandle dividend;
+  ComputationDataHandle divisor;
+  auto dividendd =
+      CreateR0Parameter<int32>(p.dividend, 0, "dividend", &builder, &dividend);
+  auto divisord =
+      CreateR0Parameter<int32>(p.divisor, 1, "divisor", &builder, &divisor);
+  builder.Rem(dividend, divisor);
+
+  ComputeAndCompareR0<int32>(&builder, p.remainder,
+                             {dividendd.get(), divisord.get()});
+}
+
 INSTANTIATE_TEST_CASE_P(
     DivS32Test_Instantiation, DivS32Test,
     ::testing::Values(
@@ -308,6 +338,90 @@ INSTANTIATE_TEST_CASE_P(
         DivS32Params{INT32_MIN, -0x40000000, 2, 0},                //
         DivS32Params{INT32_MIN + 1, -0x40000000, 1, -0x3fffffff}));
 
+TEST_F(ScalarComputationsTest, DivU32s) {
+  // clang-format off
+  // Some interesting values to test.
+  std::vector<uint32> vals = {
+    0, 1, 2, 17, 101, 3333, 0x7FFFFFFF, 0x80000000, UINT32_MAX - 1, UINT32_MAX};
+  // clang-format on
+
+  Computation div_computation;
+  {
+    ComputationBuilder builder(client_, TestName());
+
+    ComputationDataHandle dividend =
+        builder.Parameter(0, ShapeUtil::MakeShape(U32, {}), "dividend");
+    ComputationDataHandle divisor =
+        builder.Parameter(1, ShapeUtil::MakeShape(U32, {}), "divisor");
+    builder.Div(dividend, divisor);
+    TF_ASSIGN_OR_ASSERT_OK(div_computation, builder.Build());
+  }
+
+  for (uint32 divisor : vals) {
+    if (divisor != 0) {
+      for (uint32 dividend : vals) {
+        auto dividend_literal = LiteralUtil::CreateR0<uint32>(dividend);
+        auto divisor_literal = LiteralUtil::CreateR0<uint32>(divisor);
+        TF_ASSIGN_OR_ASSERT_OK(auto dividend_data,
+                               client_->TransferToServer(*dividend_literal));
+        TF_ASSIGN_OR_ASSERT_OK(auto divisor_data,
+                               client_->TransferToServer(*divisor_literal));
+        auto actual_literal =
+            client_
+                ->ExecuteAndTransfer(div_computation,
+                                     {dividend_data.get(), divisor_data.get()},
+                                     &execution_options_)
+                .ConsumeValueOrDie();
+        auto expected_literal =
+            LiteralUtil::CreateR0<uint32>(dividend / divisor);
+        LiteralTestUtil::ExpectEqual(*expected_literal, *actual_literal);
+      }
+    }
+  }
+}
+
+TEST_F(ScalarComputationsTest, RemU32s) {
+  // clang-format off
+  // Some interesting values to test.
+  std::vector<uint32> vals = {
+    0, 1, 2, 17, 101, 3333, 0x7FFFFFFF, 0x80000000, UINT32_MAX - 1, UINT32_MAX};
+  // clang-format on
+
+  Computation rem_computation;
+  {
+    ComputationBuilder builder(client_, TestName());
+
+    ComputationDataHandle dividend =
+        builder.Parameter(0, ShapeUtil::MakeShape(U32, {}), "dividend");
+    ComputationDataHandle divisor =
+        builder.Parameter(1, ShapeUtil::MakeShape(U32, {}), "divisor");
+    builder.Rem(dividend, divisor);
+    TF_ASSIGN_OR_ASSERT_OK(rem_computation, builder.Build());
+  }
+
+  for (uint32 divisor : vals) {
+    if (divisor != 0) {
+      for (uint32 dividend : vals) {
+        auto dividend_literal = LiteralUtil::CreateR0<uint32>(dividend);
+        auto divisor_literal = LiteralUtil::CreateR0<uint32>(divisor);
+        TF_ASSIGN_OR_ASSERT_OK(auto dividend_data,
+                               client_->TransferToServer(*dividend_literal));
+        TF_ASSIGN_OR_ASSERT_OK(auto divisor_data,
+                               client_->TransferToServer(*divisor_literal));
+        auto actual_literal =
+            client_
+                ->ExecuteAndTransfer(rem_computation,
+                                     {dividend_data.get(), divisor_data.get()},
+                                     &execution_options_)
+                .ConsumeValueOrDie();
+        auto expected_literal =
+            LiteralUtil::CreateR0<uint32>(dividend % divisor);
+        LiteralTestUtil::ExpectEqual(*expected_literal, *actual_literal);
+      }
+    }
+  }
+}
+
 TEST_F(ScalarComputationsTest, RemainderTwoScalarsNonConstDividendS32) {
   ComputationBuilder builder(client_, TestName());
   auto x = builder.Parameter(0, ShapeUtil::MakeShape(S32, {}), "x");
-- 
GitLab


From 2701f31bb58df695809788fd82f1299c0b7f67fd Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 11:38:18 -0700
Subject: [PATCH 1502/1563] Add function inlining support to Grappler.

PiperOrigin-RevId: 156457746
---
 tensorflow/core/common_runtime/function.cc    |  43 ++++---
 tensorflow/core/common_runtime/function.h     |  13 +++
 tensorflow/core/grappler/BUILD                |   3 +
 .../core/grappler/grappler_item_builder.cc    | 108 ++++++++++++++++++
 .../core/grappler/grappler_item_builder.h     |   5 +-
 5 files changed, 153 insertions(+), 19 deletions(-)

diff --git a/tensorflow/core/common_runtime/function.cc b/tensorflow/core/common_runtime/function.cc
index 996a8a9b3d..407c20bbf2 100644
--- a/tensorflow/core/common_runtime/function.cc
+++ b/tensorflow/core/common_runtime/function.cc
@@ -356,21 +356,7 @@ Status FunctionLibraryRuntimeImpl::CreateKernel(const NodeDef& ndef,
 Status FunctionLibraryRuntimeImpl::FunctionDefToBody(const FunctionDef& fdef,
                                                      AttrSlice attrs,
                                                      FunctionBody** fbody) {
-  // Instantiates the function template into a graph def.
-  InstantiationResult result;
-  TF_RETURN_IF_ERROR(InstantiateFunction(fdef, attrs, get_func_sig_, &result));
-
-  Graph* graph = new Graph(lib_def_);
-  GraphConstructorOptions opts;
-  opts.allow_internal_ops = true;
-  opts.expect_device_spec = false;
-  Status s = ConvertGraphDefToGraph(opts, result.gdef, graph);
-  if (!s.ok()) {
-    delete graph;
-  } else {
-    *fbody = new FunctionBody(fdef, result.arg_types, result.ret_types, graph);
-  }
-  return s;
+  return FunctionDefToBodyHelper(fdef, attrs, lib_def_, get_func_sig_, fbody);
 }
 
 Status FunctionLibraryRuntimeImpl::InstantiateSymbolicGradient(
@@ -829,9 +815,8 @@ static bool ValidateInlining(const Node* node, const FunctionBody* fbody) {
 // Given a "caller" in "graph", which is a function call of a function
 // to "fbody". Replaces the "caller" with fbody->graph and connects
 // edges properly.
-static void InlineFunctionBody(const FunctionLibraryDefinition& flib_def,
-                               Graph* g, Node* caller,
-                               const FunctionBody* fbody) {
+void InlineFunctionBody(const FunctionLibraryDefinition& flib_def, Graph* g,
+                        Node* caller, const FunctionBody* fbody) {
   if (!ValidateInlining(caller, fbody)) {
     LOG(WARNING) << "Inlining mismatch: " << caller->DebugString() << " vs. "
                  << DebugString(fbody->graph);
@@ -1238,4 +1223,26 @@ FunctionBody* SymbolicGradient(const FunctionBody& f) {
   return SymbolicGradientHelper(f).Compute();
 }
 
+Status FunctionDefToBodyHelper(
+    const FunctionDef& fdef, const AttrSlice& attrs,
+    const FunctionLibraryDefinition* const lib_def,
+    const std::function<Status(const string&, const OpDef**)>& get_func_sig,
+    FunctionBody** fbody) {
+  // Instantiates the function template into a graph def.
+  InstantiationResult result;
+  TF_RETURN_IF_ERROR(InstantiateFunction(fdef, attrs, get_func_sig, &result));
+
+  Graph* graph = new Graph(lib_def);
+  GraphConstructorOptions opts;
+  opts.allow_internal_ops = true;
+  opts.expect_device_spec = false;
+  Status s = ConvertGraphDefToGraph(opts, result.gdef, graph);
+  if (!s.ok()) {
+    delete graph;
+  } else {
+    *fbody = new FunctionBody(fdef, result.arg_types, result.ret_types, graph);
+  }
+  return s;
+}
+
 }  // end namespace tensorflow
diff --git a/tensorflow/core/common_runtime/function.h b/tensorflow/core/common_runtime/function.h
index 7cfe694673..f2244f8376 100644
--- a/tensorflow/core/common_runtime/function.h
+++ b/tensorflow/core/common_runtime/function.h
@@ -147,6 +147,19 @@ void ToGraphDef(const Graph* g, GraphDef* gdef, bool pretty = false);
 // TODO(zhifengc): Asks math expert to say the comment again.
 FunctionBody* SymbolicGradient(const FunctionBody& f);
 
+// Given a "caller" in graph "g", which is a function call of a function
+// to "fbody". Replaces the "caller" with fbody->graph and connects
+// edges properly.
+void InlineFunctionBody(const FunctionLibraryDefinition& flib_def, Graph* g,
+                        Node* caller, const FunctionBody* fbody);
+
+// Instantiates FunctionDef into a graph. Set *fbody to point to the
+// FunctionBody that holds the instantiated FunctionDef.
+Status FunctionDefToBodyHelper(
+    const FunctionDef& fdef, const AttrSlice& attrs,
+    const FunctionLibraryDefinition* const lib_def,
+    const std::function<Status(const string&, const OpDef**)>& get_func_sig,
+    FunctionBody** fbody);
 }  // end namespace tensorflow
 
 #endif  // TENSORFLOW_COMMON_RUNTIME_FUNCTION_H_
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index 57b7550ef0..73016f5fb5 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -86,6 +86,9 @@ cc_library(
         ":grappler_item",
         ":op_types",
         ":utils",
+        "//tensorflow/core:core_cpu",
+        "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:framework",
         "//tensorflow/core:framework_internal",
         "//tensorflow/core:lib_internal",
         "//tensorflow/core:protos_all_cc",
diff --git a/tensorflow/core/grappler/grappler_item_builder.cc b/tensorflow/core/grappler/grappler_item_builder.cc
index 88799ba881..02eecb0ac5 100644
--- a/tensorflow/core/grappler/grappler_item_builder.cc
+++ b/tensorflow/core/grappler/grappler_item_builder.cc
@@ -19,10 +19,16 @@ limitations under the License.
 #include <unordered_set>
 #include <vector>
 
+#include "tensorflow/core/common_runtime/function.h"
 #include "tensorflow/core/framework/attr_value.pb.h"
+#include "tensorflow/core/framework/function.h"
+#include "tensorflow/core/framework/function.pb.h"
 #include "tensorflow/core/framework/node_def.pb.h"
+#include "tensorflow/core/framework/op.h"
+#include "tensorflow/core/framework/op_def.pb.h"
 #include "tensorflow/core/framework/types.pb.h"
 #include "tensorflow/core/framework/variable.pb.h"
+#include "tensorflow/core/graph/graph_constructor.h"
 #include "tensorflow/core/grappler/inputs/utils.h"
 #include "tensorflow/core/grappler/op_types.h"
 #include "tensorflow/core/grappler/utils.h"
@@ -51,6 +57,99 @@ void InitializeTensor(DataType type, Tensor* tensor) {
            tensor->tensor_data().size());
   }
 }
+
+// Helper function that returns a bool indicating if there are function
+// call nodes in graph.
+bool HasFunctionInGraph(const Graph& graph) {
+  for (const Node* n : graph.nodes()) {
+    if (graph.flib_def().Find(n->type_string()) != nullptr) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// Wrapper around FunctionDefToBodyHelper that creates a FunctionBody
+// for function_def.
+Status CreateFunctionBody(const FunctionLibraryDefinition& function_library,
+                          const FunctionDef& function_def,
+                          const NodeDef& node_def,
+                          FunctionBody** function_body) {
+  std::function<Status(const string&, const OpDef**)> get_function_signature =
+      [&function_library](const string& name, const OpDef** signature) {
+        return function_library.LookUpOpDef(name, signature);
+      };
+  TF_RETURN_IF_ERROR(FunctionDefToBodyHelper(
+      function_def, AttrSlice(node_def), &function_library,
+      get_function_signature, function_body));
+  return Status::OK();
+}
+
+// Inlines all functions in a Graph.  Does not recursively inline, so if graph
+// contains Function A that calls Function B, calling InlineFunctions once will
+// produce a graph with A inlined but not B.  Calling InlineFunctions a second
+// time will produce a graph with both A and B inlined.
+Status InlineFunctions(Graph* graph) {
+  const FunctionLibraryDefinition& function_library = graph->flib_def();
+  std::vector<std::pair<Node*, FunctionBody*>> nodes_and_funcs_to_inline;
+  std::unordered_map<string, std::unique_ptr<FunctionBody>>
+      function_name_to_body;
+  std::function<Status(const string&, const OpDef**)> get_function_signature =
+      [&function_library](const string& name, const OpDef** signature) {
+        return function_library.LookUpOpDef(name, signature);
+      };
+
+  for (Node* node : graph->nodes()) {
+    const FunctionDef* function_def =
+        function_library.Find(node->type_string());
+    if (!function_def) {
+      // Not a function node.
+      continue;
+    }
+    FunctionBody* function_body = nullptr;
+    const string key = Canonicalize(node->def().op(), AttrSlice(node->def()));
+    if (function_name_to_body.find(key) == function_name_to_body.end()) {
+      TF_RETURN_IF_ERROR(CreateFunctionBody(function_library, *function_def,
+                                            node->def(), &function_body));
+      function_name_to_body.emplace(
+          key, std::unique_ptr<FunctionBody>(function_body));
+    }
+    function_body = function_name_to_body[key].get();
+    if (function_body) {
+      nodes_and_funcs_to_inline.emplace_back(node, function_body);
+    }
+  }
+
+  for (const auto& iter : nodes_and_funcs_to_inline) {
+    InlineFunctionBody(function_library, graph, iter.first, iter.second);
+  }
+  return Status::OK();
+}
+
+// Sets *inlined_graph to be graph with all function NodeDefs in graph inlined.
+// Recursively inlines, so if graph contains Function A that calls Function B,
+// calling InlineAllFunctions once will produce a graph with both A and B
+// inlined.
+Status InlineAllFunctions(const GraphDef& graph_def,
+                          GraphDef* inlined_graph_def) {
+  *inlined_graph_def = GraphDef::default_instance();
+  // Create a Graph from graph_def. Inlining needs to happen
+  // on a single Graph object in order to guarantee unique
+  // names of nodes created during the inlining process.
+  GraphConstructorOptions graph_ctor_opts;
+  graph_ctor_opts.allow_internal_ops = true;
+  graph_ctor_opts.expect_device_spec = false;
+  FunctionLibraryDefinition function_library(OpRegistry::Global(),
+                                             graph_def.library());
+  Graph inlined_graph(function_library);
+  TF_RETURN_IF_ERROR(
+      ConvertGraphDefToGraph(graph_ctor_opts, graph_def, &inlined_graph));
+  while (HasFunctionInGraph(inlined_graph)) {
+    TF_RETURN_IF_ERROR(InlineFunctions(&inlined_graph));
+  }
+  inlined_graph.ToGraphDef(inlined_graph_def);
+  return Status::OK();
+}
 }  // namespace
 
 // static
@@ -64,6 +163,15 @@ std::unique_ptr<GrapplerItem> GrapplerItemFromMetaGraphDef(
   new_item->id = id;
   new_item->graph = meta_graph.graph_def();
 
+  if (cfg.inline_functions) {
+    Status s = InlineAllFunctions(meta_graph.graph_def(), &new_item->graph);
+    if (!s.ok()) {
+      LOG(ERROR) << "Unable to inline functions: " << s.error_message()
+                 << ", skipping this input.";
+      return nullptr;
+    }
+  }
+
   // Attempt to detect the fetch node(s).
   if (meta_graph.collection_def().count("train_op") > 0) {
     const CollectionDef& nodes = meta_graph.collection_def().at("train_op");
diff --git a/tensorflow/core/grappler/grappler_item_builder.h b/tensorflow/core/grappler/grappler_item_builder.h
index ed75749009..b51c826cc4 100644
--- a/tensorflow/core/grappler/grappler_item_builder.h
+++ b/tensorflow/core/grappler/grappler_item_builder.h
@@ -30,7 +30,8 @@ struct ItemConfig {
   ItemConfig()
       : ignore_user_placement(true),
         ignore_colocation(true),
-        placeholder_unknown_output_shape_dim(-1) {}
+        placeholder_unknown_output_shape_dim(-1),
+        inline_functions(true) {}
 
   // If true, ignore all user specified node placement.
   bool ignore_user_placement;
@@ -39,6 +40,8 @@ struct ItemConfig {
   // Dimension to use if a placeholder node has an _output_shapes attribute with
   // a dimension of -1.
   int placeholder_unknown_output_shape_dim;
+  // If true, inline all functions in the graph.
+  bool inline_functions;
 };
 
 // Factory method for creating a GrapplerItem from a MetaGraphDef.
-- 
GitLab


From 074b92397b77f50cc80f2a04aa28811f1b4f5c97 Mon Sep 17 00:00:00 2001
From: Peter Hawkins <phawkins@google.com>
Date: Thu, 18 May 2017 11:42:34 -0700
Subject: [PATCH 1503/1563] [TF:XLA] Add a unit test for implicit PRED
 broadcasting.

PiperOrigin-RevId: 156458301
---
 .../xla/tests/broadcast_simple_test.cc        | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
index 0ad1cf3e8c..901bed5f14 100644
--- a/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
+++ b/tensorflow/compiler/xla/tests/broadcast_simple_test.cc
@@ -89,6 +89,33 @@ XLA_TEST_F(BroadcastSimpleTest, 1DTo2D) {
   ComputeAndCompareR2<float>(&b, expected, {}, ErrorSpec(0.0001));
 }
 
+// Tests implicit broadcasting of PREDs.
+XLA_TEST_F(BroadcastSimpleTest, LogicalAnd2DTo3D_Pred) {
+  ComputationBuilder b(client_, TestName());
+
+  Array2D<bool> x_vals(2, 1);
+  x_vals(0, 0) = true;
+  x_vals(1, 0) = false;
+  Array3D<bool> y_vals(2, 2, 1);
+  y_vals(0, 0, 0) = false;
+  y_vals(0, 1, 0) = false;
+  y_vals(1, 0, 0) = true;
+  y_vals(1, 1, 0) = true;
+
+  ComputationDataHandle x, y;
+  auto x_data = CreateR2Parameter<bool>(x_vals, 0, "x", &b, &x);
+  auto y_data = CreateR3Parameter<bool>(y_vals, 1, "y", &b, &y);
+  b.LogicalAnd(x, y, /*broadcast_dimensions=*/{1, 2});
+
+  Array3D<bool> expected(2, 2, 1);
+  expected(0, 0, 0) = false;
+  expected(0, 1, 0) = false;
+  expected(1, 0, 0) = true;
+  expected(1, 1, 0) = false;
+
+  ComputeAndCompareR3<bool>(&b, expected, {x_data.get(), y_data.get()});
+}
+
 XLA_TEST_F(BroadcastSimpleTest, ZeroElement_1DTo2D) {
   ComputationBuilder b(client_, TestName());
   b.Broadcast(b.ConstantR1<float>({}), {2});
-- 
GitLab


From 6a16db94b66d28f8a03a7003470e3ee24212d88c Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 11:43:19 -0700
Subject: [PATCH 1504/1563] Minor docstring formatting fix.

PiperOrigin-RevId: 156458396
---
 tensorflow/python/ops/sparse_ops.py | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 23afb13d4f..7543c3c111 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -1397,15 +1397,13 @@ def sparse_tensor_dense_matmul(sp_a,
   # pylint: disable=line-too-long
   """Multiply SparseTensor (of rank 2) "A" by dense matrix "B".
 
-  No validity checking is performed on the indices of A.  However, the following
-  input format is recommended for optimal behavior:
+  No validity checking is performed on the indices of `A`.  However, the
+  following input format is recommended for optimal behavior:
 
-  if adjoint_a == false:
-    A should be sorted in lexicographically increasing order.  Use
-    sparse_reorder if you're not sure.
-  if adjoint_a == true:
-    A should be sorted in order of increasing dimension 1 (i.e., "column major"
-    order instead of "row major" order).
+  * If `adjoint_a == false`: `A` should be sorted in lexicographically
+    increasing order.  Use `sparse_reorder` if you're not sure.
+  * If `adjoint_a == true`: `A` should be sorted in order of increasing
+    dimension 1 (i.e., "column major" order instead of "row major" order).
 
   Using `tf.nn.embedding_lookup_sparse` for sparse multiplication:
 
@@ -1449,16 +1447,16 @@ def sparse_tensor_dense_matmul(sp_a,
 
   There are a number of questions to ask in the decision process, including:
 
-  * Will the SparseTensor A fit in memory if densified?
+  * Will the SparseTensor `A` fit in memory if densified?
   * Is the column count of the product large (>> 1)?
-  * Is the density of A larger than approximately 15%?
+  * Is the density of `A` larger than approximately 15%?
 
   If the answer to several of these questions is yes, consider
   converting the `SparseTensor` to a dense one and using `tf.matmul` with
   `a_is_sparse=True`.
 
-  This operation tends to perform well when A is more sparse, if the column size
-  of the product is small (e.g. matrix-vector multiplication), if
+  This operation tends to perform well when `A` is more sparse, if the column
+  size of the product is small (e.g. matrix-vector multiplication), if
   `sp_a.dense_shape` takes on large values.
 
   Below is a rough speed comparison between `sparse_tensor_dense_matmul`,
@@ -1589,9 +1587,9 @@ def sparse_tensor_dense_matmul(sp_a,
 
   Returns:
     A dense matrix (pseudo-code in dense np.matrix notation):
-      A = A.H if adjoint_a else A
-      B = B.H if adjoint_b else B
-      return A*B
+      `A = A.H if adjoint_a else A`
+      `B = B.H if adjoint_b else B`
+      `return A*B`
   """
   # pylint: enable=line-too-long
   sp_a = _convert_to_sparse_tensor(sp_a)
-- 
GitLab


From 36aa16d28ce4e1cb5901f72fa6a67c13317d0e2e Mon Sep 17 00:00:00 2001
From: Sergio Guadarrama <sguada@google.com>
Date: Thu, 18 May 2017 12:30:20 -0700
Subject: [PATCH 1505/1563] Handle should_stop in learning better.

When should_stop becomes true during training, this should trigger Supervisor request_stop first, and then stop the threads and close the summary_writer.

PiperOrigin-RevId: 156464226
---
 tensorflow/contrib/slim/python/slim/learning.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/slim/python/slim/learning.py b/tensorflow/contrib/slim/python/slim/learning.py
index 43a1193d13..f7dddc46c3 100644
--- a/tensorflow/contrib/slim/python/slim/learning.py
+++ b/tensorflow/contrib/slim/python/slim/learning.py
@@ -738,7 +738,7 @@ def train(train_op,
           _wait_for_step(sess, global_step,
                          min(startup_delay_steps, number_of_steps or
                              sys.maxint))
-        sv.start_queue_runners(sess)
+        threads = sv.start_queue_runners(sess)
         logging.info('Starting Queues.')
         if is_chief and sync_optimizer is not None:
           sv.start_queue_runners(sess, [chief_queue_runner])
@@ -749,6 +749,7 @@ def train(train_op,
                 sess, train_op, global_step, train_step_kwargs)
             if should_stop:
               logging.info('Stopping Training.')
+              sv.request_stop()
               break
         except errors.OutOfRangeError:
           # OutOfRangeError is thrown when epoch limit per
@@ -757,6 +758,7 @@ def train(train_op,
         if logdir and sv.is_chief:
           logging.info('Finished training! Saving model to disk.')
           sv.saver.save(sess, sv.save_path, global_step=sv.global_step)
+          sv.stop(threads, close_summary_writer=True)
 
     except errors.AbortedError:
       # Always re-run on AbortedError as it indicates a restart of one of the
-- 
GitLab


From e8d98119c13d035aa8827ce1f38cad4fdd8cf6c9 Mon Sep 17 00:00:00 2001
From: Gunhan Gulsoy <gunan@google.com>
Date: Thu, 18 May 2017 12:31:58 -0700
Subject: [PATCH 1506/1563] Tag tensor_array_ops_test "nomsan"

PiperOrigin-RevId: 156464407
---
 tensorflow/python/kernel_tests/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 369cefe427..349787d135 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -1906,6 +1906,7 @@ cuda_py_test(
         "//tensorflow/python:variables",
     ],
     flaky = 1,  # create_local_cluster sometimes times out.
+    tags = ["nomsan"],  # b/38390993
 )
 
 cuda_py_test(
-- 
GitLab


From f41a9113bcac0e144d214cb101a991ca8fbff963 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 13:00:58 -0700
Subject: [PATCH 1507/1563] Remove unused sync_device declaration.

PiperOrigin-RevId: 156467989
---
 tensorflow/core/common_runtime/gpu/gpu_tracer.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tensorflow/core/common_runtime/gpu/gpu_tracer.cc b/tensorflow/core/common_runtime/gpu/gpu_tracer.cc
index e3bd7d7c98..86252a6dc3 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_tracer.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_tracer.cc
@@ -568,7 +568,6 @@ Status GPUTracerImpl::Collect(StepStatsCollector *collector) {
   const int id = 0;
   const string stream_device = strings::StrCat(prefix, "/gpu:", id, "/stream:");
   const string memcpy_device = strings::StrCat(prefix, "/gpu:", id, "/memcpy");
-  const string sync_device = strings::StrCat(prefix, "/gpu:", id, "/sync");
 
   mutex_lock l2(trace_mu_);
   for (const auto &rec : kernel_records_) {
-- 
GitLab


From 315f195f728d59647f23f10ecc664b8ce9466a06 Mon Sep 17 00:00:00 2001
From: Mark Daoust <markdaoust@google.com>
Date: Thu, 18 May 2017 13:05:48 -0700
Subject: [PATCH 1508/1563] Add label_image.py that works with retrain.py.

PiperOrigin-RevId: 156468713
---
 .../docs_src/tutorials/image_retraining.md    |  18 ++-
 tensorflow/examples/image_retraining/BUILD    |  17 ++
 .../examples/image_retraining/data/labels.txt |   3 +
 .../examples/image_retraining/label_image.py  | 147 ++++++++++++++++++
 .../examples/image_retraining/retrain_test.py |  32 ++++
 5 files changed, 212 insertions(+), 5 deletions(-)
 create mode 100644 tensorflow/examples/image_retraining/data/labels.txt
 create mode 100644 tensorflow/examples/image_retraining/label_image.py

diff --git a/tensorflow/docs_src/tutorials/image_retraining.md b/tensorflow/docs_src/tutorials/image_retraining.md
index a65b5845cf..85e6ec76dc 100644
--- a/tensorflow/docs_src/tutorials/image_retraining.md
+++ b/tensorflow/docs_src/tutorials/image_retraining.md
@@ -14,11 +14,16 @@ laptop, without requiring a GPU. This tutorial will show you how to run the
 example script on your own images, and will explain some of the options you have
 to help control the training process.
 
+Note: This version of the tutorial mainly uses bazel. A bazel free version is
+also available
+[as a codelab](https://codelabs.developers.google.com/codelabs/tensorflow-for-poets/#0).
+
 [TOC]
 
 ## Training on Flowers
 
 ![Daisies by Kelly Sikkema](https://www.tensorflow.org/images/daisies.jpg)
+
 [Image by Kelly Sikkema](https://www.flickr.com/photos/95072945@N05/9922116524/)
 
 Before you start any training, you'll need a set of images to teach the network
@@ -148,10 +153,10 @@ Here's an example of how to build and run the label_image example with your
 retrained graphs:
 
 ```sh
-bazel build tensorflow/examples/label_image:label_image && \
-bazel-bin/tensorflow/examples/label_image/label_image \
+bazel build tensorflow/examples/image_retraining:label_image && \
+bazel-bin/tensorflow/examples/image_retraining/label_image \
 --graph=/tmp/output_graph.pb --labels=/tmp/output_labels.txt \
---output_layer=final_result \
+--output_layer=final_result:0 \
 --image=$HOME/flower_photos/daisy/21652746_cc379e0eea_m.jpg
 ```
 
@@ -160,7 +165,10 @@ You should see a list of flower labels, in most cases with daisy on top
 `--image` parameter with your own images to try those out, and use the C++ code
 as a template to integrate with your own applications.
 
-If you'd like to use the retrained model in a Python program [this example from @eldor4do shows what you'll need to do](https://github.com/eldor4do/TensorFlow-Examples/blob/master/retraining-example.py).
+If you'd like to use the retrained model in your own Python program, then the
+above
+[`label_image` script](https://www.tensorflow.org/code/tensorflow/examples/image_retraining/label_image.py)
+is a reasonable starting point.
 
 ## Training on Your Own Categories
 
@@ -260,7 +268,7 @@ them destroys their meaning.
 
 There are several other parameters you can try adjusting to see if they help
 your results. The `--learning_rate` controls the magnitude of the updates to the
-final layer during training. Intuitively if this is smaller then the learning
+final layer during training. Intuitively if this is smaller than the learning
 will take longer, but it can end up helping the overall precision. That's not
 always the case though, so you need to experiment carefully to see what works
 for your case. The `--train_batch_size` controls how many images are examined
diff --git a/tensorflow/examples/image_retraining/BUILD b/tensorflow/examples/image_retraining/BUILD
index 5a885e33c2..394c413b33 100644
--- a/tensorflow/examples/image_retraining/BUILD
+++ b/tensorflow/examples/image_retraining/BUILD
@@ -24,13 +24,30 @@ py_binary(
     ],
 )
 
+py_binary(
+    name = "label_image",
+    srcs = [
+        "label_image.py",
+    ],
+    srcs_version = "PY2AND3",
+    visibility = ["//tensorflow:__subpackages__"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+    ],
+)
+
 py_test(
     name = "retrain_test",
     size = "small",
     srcs = [
+        "label_image.py",
         "retrain.py",
         "retrain_test.py",
     ],
+    data = [
+        ":data/labels.txt",
+        "//tensorflow/examples/label_image:data/grace_hopper.jpg",
+    ],
     srcs_version = "PY2AND3",
     deps = [
         ":retrain",
diff --git a/tensorflow/examples/image_retraining/data/labels.txt b/tensorflow/examples/image_retraining/data/labels.txt
new file mode 100644
index 0000000000..bc1131ac45
--- /dev/null
+++ b/tensorflow/examples/image_retraining/data/labels.txt
@@ -0,0 +1,3 @@
+Runner-up
+Winner
+Loser
diff --git a/tensorflow/examples/image_retraining/label_image.py b/tensorflow/examples/image_retraining/label_image.py
new file mode 100644
index 0000000000..ecfa672462
--- /dev/null
+++ b/tensorflow/examples/image_retraining/label_image.py
@@ -0,0 +1,147 @@
+# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Simple image classification with Inception.
+
+Run image classification with your model.
+
+This script is usually used with retrain.py found in this same
+directory.
+
+This program creates a graph from a saved GraphDef protocol buffer,
+and runs inference on an input JPEG image. You are required
+to pass in the graph file and the txt file.
+
+It outputs human readable strings of the top 5 predictions along with
+their probabilities.
+
+Change the --image_file argument to any jpg image to compute a
+classification of that image.
+
+Example usage:
+python label_image.py --graph=retrained_graph.pb
+  --labels=retrained_labels.txt
+  --image=flower_photos/daisy/54377391_15648e8d18.jpg
+
+NOTE: To learn to use this file and retrain.py, please see:
+
+https://codelabs.developers.google.com/codelabs/tensorflow-for-poets
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import argparse
+import sys
+
+import tensorflow as tf
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    '--image', required=True, type=str, help='Absolute path to image file.')
+parser.add_argument(
+    '--num_top_predictions',
+    type=int,
+    default=5,
+    help='Display this many predictions.')
+parser.add_argument(
+    '--graph',
+    required=True,
+    type=str,
+    help='Absolute path to graph file (.pb)')
+parser.add_argument(
+    '--labels',
+    required=True,
+    type=str,
+    help='Absolute path to labels file (.txt)')
+parser.add_argument(
+    '--output_layer',
+    type=str,
+    default='final_result:0',
+    help='Name of the result operation')
+parser.add_argument(
+    '--input_layer',
+    type=str,
+    default='DecodeJpeg/contents:0',
+    help='Name of the input operation')
+
+
+def load_image(filename):
+  """Read in the image_data to be classified."""
+  return tf.gfile.FastGFile(filename, 'rb').read()
+
+
+def load_labels(filename):
+  """Read in labels, one label per line."""
+  return [line.rstrip() for line in tf.gfile.GFile(filename)]
+
+
+def load_graph(filename):
+  """Unpersists graph from file as default graph."""
+  with tf.gfile.FastGFile(filename, 'rb') as f:
+    graph_def = tf.GraphDef()
+    graph_def.ParseFromString(f.read())
+    tf.import_graph_def(graph_def, name='')
+
+
+def run_graph(image_data, labels, input_layer_name, output_layer_name,
+              num_top_predictions):
+  with tf.Session() as sess:
+    # Feed the image_data as input to the graph.
+    #   predictions  will contain a two-dimensional array, where one
+    #   dimension represents the input image count, and the other has
+    #   predictions per class
+    softmax_tensor = sess.graph.get_tensor_by_name(output_layer_name)
+    predictions, = sess.run(softmax_tensor, {input_layer_name: image_data})
+
+    # Sort to show labels in order of confidence
+    top_k = predictions.argsort()[-num_top_predictions:][::-1]
+    for node_id in top_k:
+      human_string = labels[node_id]
+      score = predictions[node_id]
+      print('%s (score = %.5f)' % (human_string, score))
+
+    return 0
+
+
+def main(argv):
+  """Runs inference on an image."""
+  if argv[1:]:
+    raise ValueError('Unused Command Line Args: %s' % argv[1:])
+
+  if not tf.gfile.Exists(FLAGS.image):
+    tf.logging.fatal('image file does not exist %s', FLAGS.image)
+
+  if not tf.gfile.Exists(FLAGS.labels):
+    tf.logging.fatal('labels file does not exist %s', FLAGS.labels)
+
+  if not tf.gfile.Exists(FLAGS.graph):
+    tf.logging.fatal('graph file does not exist %s', FLAGS.graph)
+
+  # load image
+  image_data = load_image(FLAGS.image)
+
+  # load labels
+  labels = load_labels(FLAGS.labels)
+
+  # load graph, which is stored in the default session
+  load_graph(FLAGS.graph)
+
+  run_graph(image_data, labels, FLAGS.input_layer, FLAGS.output_layer,
+            FLAGS.num_top_predictions)
+
+
+if __name__ == '__main__':
+  FLAGS, unparsed = parser.parse_known_args()
+  tf.app.run(main=main, argv=sys.argv[:1]+unparsed)
diff --git a/tensorflow/examples/image_retraining/retrain_test.py b/tensorflow/examples/image_retraining/retrain_test.py
index 00ccea174f..8af5cc7114 100644
--- a/tensorflow/examples/image_retraining/retrain_test.py
+++ b/tensorflow/examples/image_retraining/retrain_test.py
@@ -19,7 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+import os
 
+from tensorflow.examples.image_retraining import label_image
 from tensorflow.examples.image_retraining import retrain
 from tensorflow.python.framework import test_util
 
@@ -81,5 +83,35 @@ class ImageRetrainingTest(test_util.TensorFlowTestCase):
       gt = tf.placeholder(tf.float32, [1], name='gt')
       self.assertIsNotNone(retrain.add_evaluation_step(final, gt))
 
+  def testLabelImage(self):
+
+    image_filename = ('../label_image/data/grace_hopper.jpg')
+
+    # Load some default data
+    label_path = os.path.join(tf.resource_loader.get_data_files_path(),
+                              'data/labels.txt')
+    labels = label_image.load_labels(label_path)
+    self.assertEqual(len(labels), 3)
+
+    image_path = os.path.join(tf.resource_loader.get_data_files_path(),
+                              image_filename)
+
+    image = label_image.load_image(image_path)
+    self.assertEqual(len(image), 61306)
+
+    # Create trivial graph; note that the two nodes don't meet
+    with tf.Graph().as_default():
+      jpeg = tf.constant(image)
+      # Input node that doesn't lead anywhere.
+      tf.image.decode_jpeg(jpeg, name='DecodeJpeg')
+
+      # Output node, that always outputs a constant.
+      tf.constant([[10, 30, 5]], name='final')
+
+      # As label_image outputs via print, we assume that
+      # if it returns, everything is OK.
+      result = label_image.run_graph(image, labels, jpeg, 'final:0', 3)
+      self.assertEqual(result, 0)
+
 if __name__ == '__main__':
   tf.test.main()
-- 
GitLab


From e84588a3e9e67d91d6ae32e64469f890d217c5dd Mon Sep 17 00:00:00 2001
From: Eli Bendersky <eliben@google.com>
Date: Thu, 18 May 2017 13:13:38 -0700
Subject: [PATCH 1509/1563] [XLA] Attach an HloModuleConfig to HloModule,
 obviating the need to pass them around as a pair.

This cuts through a bunch of critical XLA APIs, but it's time... The background for this change is to make flags/options more easily pipe-able from the TF/XLA boundary deep into the XLA compiler and other components.

The situation after this CL is still not perfect; there are a number of places with chicken-egg scenarios when a module has to be constructed before a config (to register the result shape), but the situation is strictly better than before. Future CLs will clean things up even more.

PiperOrigin-RevId: 156469639
---
 tensorflow/compiler/xla/service/BUILD         |   2 +
 .../xla/service/compile_only_service.cc       |  21 ++--
 tensorflow/compiler/xla/service/compiler.h    |  14 +--
 .../xla/service/computation_tracker.cc        |   8 +-
 .../xla/service/computation_tracker.h         |   6 +-
 .../compiler/xla/service/cpu/cpu_compiler.cc  | 102 ++++++++----------
 .../compiler/xla/service/cpu/cpu_compiler.h   |  18 ++--
 .../xla/service/cpu/cpu_executable.cc         |   7 +-
 .../compiler/xla/service/cpu/cpu_executable.h |   2 -
 .../compiler/xla/service/cpu/ir_emitter.cc    |   8 +-
 .../compiler/xla/service/cpu/ir_emitter.h     |   4 +-
 .../service/cpu/parallel_cpu_executable.cc    |   4 +-
 .../xla/service/cpu/parallel_cpu_executable.h |   2 -
 tensorflow/compiler/xla/service/executable.h  |  21 ++--
 .../compiler/xla/service/gpu/gpu_compiler.cc  |  38 +++----
 .../compiler/xla/service/gpu/gpu_compiler.h   |   8 +-
 .../xla/service/gpu/gpu_executable.cc         |   3 +-
 .../compiler/xla/service/gpu/gpu_executable.h |   2 -
 .../xla/service/hlo_cost_analysis_test.cc     |   6 +-
 tensorflow/compiler/xla/service/hlo_module.cc |  17 +++
 tensorflow/compiler/xla/service/hlo_module.h  |  14 +++
 tensorflow/compiler/xla/service/service.cc    |  23 ++--
 .../compiler/xla/tests/codegen_test_base.cc   |  10 +-
 .../compiler/xla/tests/hlo_test_base.cc       |   4 +-
 .../xla/tools/dumped_computation_to_text.cc   |   5 +-
 .../xla_tf_graph/xla_tf_graph_util_test.cc    |   3 +-
 26 files changed, 178 insertions(+), 174 deletions(-)

diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD
index 7bdc2afe5e..86ae530206 100644
--- a/tensorflow/compiler/xla/service/BUILD
+++ b/tensorflow/compiler/xla/service/BUILD
@@ -125,6 +125,7 @@ cc_library(
         "hlo_opcode.h",
     ],
     deps = [
+        ":hlo_module_config",
         ":name_uniquer",
         ":versioned_computation_handle",
         "//tensorflow/compiler/xla:literal_util",
@@ -569,6 +570,7 @@ cc_library(
     hdrs = ["computation_tracker.h"],
     deps = [
         ":hlo",
+        ":hlo_module_config",
         ":session_proto",
         ":user_computation",
         ":versioned_computation_handle",
diff --git a/tensorflow/compiler/xla/service/compile_only_service.cc b/tensorflow/compiler/xla/service/compile_only_service.cc
index ac1906c88c..86f7d64782 100644
--- a/tensorflow/compiler/xla/service/compile_only_service.cc
+++ b/tensorflow/compiler/xla/service/compile_only_service.cc
@@ -70,7 +70,6 @@ CompileOnlyService::CompileAheadOfTime(
     const tensorflow::gtl::ArraySlice<AotComputationInstance> computations,
     const AotCompilationOptions& options) {
   std::vector<std::unique_ptr<HloModule>> hlo_modules;
-  std::vector<std::unique_ptr<HloModuleConfig>> module_configs;
   for (const AotComputationInstance& instance : computations) {
     TF_ASSIGN_OR_RETURN(UserComputation * user_computation,
                         computation_tracker_.Resolve(instance.computation));
@@ -92,22 +91,15 @@ CompileOnlyService::CompileAheadOfTime(
                                                      *session_module));
     }
 
-    TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModule> hlo_module,
-                        computation_tracker_.BuildHloModule(
-                            versioned_handle,
-                            /*include_unreachable_instructions=*/true));
-    hlo_modules.push_back(std::move(hlo_module));
-
     TF_ASSIGN_OR_RETURN(
         std::shared_ptr<const ProgramShape> program_shape,
         user_computation->ComputeProgramShape(versioned_handle.version));
 
-    module_configs.push_back(MakeUnique<HloModuleConfig>(*program_shape));
-    HloModuleConfig* module_config = module_configs.back().get();
+    HloModuleConfig hlo_module_config(*program_shape);
     auto* computation_layout =
-        module_config->mutable_entry_computation_layout();
+        hlo_module_config.mutable_entry_computation_layout();
     if (flags->xla_hlo_profile) {
-      module_config->enable_hlo_profiling(true);
+      hlo_module_config.enable_hlo_profiling(true);
     }
     for (int i = 0; i < instance.argument_layouts.size(); ++i) {
       const Shape& argument_layout = *instance.argument_layouts[i];
@@ -121,10 +113,15 @@ CompileOnlyService::CompileAheadOfTime(
     TF_RETURN_IF_ERROR(
         computation_layout->mutable_result_layout()->CopyLayoutFromShape(
             *instance.result_layout));
+
+    TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModule> hlo_module,
+                        computation_tracker_.BuildHloModule(
+                            versioned_handle, &hlo_module_config,
+                            /*include_unreachable_instructions=*/true));
+    hlo_modules.push_back(std::move(hlo_module));
   }
 
   return compiler_->CompileAheadOfTime(std::move(hlo_modules),
-                                       std::move(module_configs),
                                        MakeHloDumper(), options);
 }
 
diff --git a/tensorflow/compiler/xla/service/compiler.h b/tensorflow/compiler/xla/service/compiler.h
index 6f43c9b804..1876417c03 100644
--- a/tensorflow/compiler/xla/service/compiler.h
+++ b/tensorflow/compiler/xla/service/compiler.h
@@ -112,26 +112,22 @@ class Compiler {
   //
   // Use the overload below to compile computations that run in parallel.
   virtual StatusOr<std::unique_ptr<Executable>> Compile(
-      std::unique_ptr<HloModule> module,
-      std::unique_ptr<HloModuleConfig> module_config, HloDumper dump_hlo,
+      std::unique_ptr<HloModule> module, HloDumper dump_hlo,
       perftools::gputools::StreamExecutor* executor) = 0;
 
   // Compiles a set of HLO modules that can run in parallel, potentially
   // communicating data between the modules, and returns a corresponding
   // sequence of executable objects.
   virtual StatusOr<std::vector<std::unique_ptr<Executable>>> Compile(
-      std::vector<std::unique_ptr<HloModule>> hlo_module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
-      HloDumper dump_hlo,
+      std::vector<std::unique_ptr<HloModule>> modules, HloDumper dump_hlo,
       std::vector<perftools::gputools::StreamExecutor*> stream_exec) = 0;
 
   // Compiles the HLO module for ahead-of-time execution.  This is intended for
   // use in static compilation.
   virtual StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
-  CompileAheadOfTime(
-      std::vector<std::unique_ptr<HloModule>> module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
-      HloDumper dump_hlo, const AotCompilationOptions& options) = 0;
+  CompileAheadOfTime(std::vector<std::unique_ptr<HloModule>> modules,
+                     HloDumper dump_hlo,
+                     const AotCompilationOptions& options) = 0;
 
   /////
   // The Compiler class also serves as a point to register compiler objects
diff --git a/tensorflow/compiler/xla/service/computation_tracker.cc b/tensorflow/compiler/xla/service/computation_tracker.cc
index f78806bce8..7e59f03773 100644
--- a/tensorflow/compiler/xla/service/computation_tracker.cc
+++ b/tensorflow/compiler/xla/service/computation_tracker.cc
@@ -169,6 +169,7 @@ void ComputationTracker::ComputeComputationPostOrder(
 
 StatusOr<std::unique_ptr<HloModule>> ComputationTracker::BuildHloModule(
     const VersionedComputationHandle& entry_handle,
+    const HloModuleConfig* config,
     bool include_unreachable_instructions) const {
   tensorflow::mutex_lock lock(computation_mutex_);
 
@@ -208,7 +209,12 @@ StatusOr<std::unique_ptr<HloModule>> ComputationTracker::BuildHloModule(
 
   string module_name =
       tensorflow::strings::StrCat(entry_computation->name(), "_module");
-  auto module = MakeUnique<HloModule>(module_name, entry_handle);
+  std::unique_ptr<HloModule> module;
+  if (config == nullptr) {
+    module = MakeUnique<HloModule>(module_name, entry_handle);
+  } else {
+    module = MakeUnique<HloModule>(module_name, entry_handle, *config);
+  }
   for (auto versioned_handle : post_order) {
     UserComputation* computation =
         ResolveInternal(versioned_handle.handle).ValueOrDie();
diff --git a/tensorflow/compiler/xla/service/computation_tracker.h b/tensorflow/compiler/xla/service/computation_tracker.h
index 1922908747..c7ca357398 100644
--- a/tensorflow/compiler/xla/service/computation_tracker.h
+++ b/tensorflow/compiler/xla/service/computation_tracker.h
@@ -23,6 +23,7 @@ limitations under the License.
 #include <string>
 
 #include "tensorflow/compiler/xla/service/hlo_module.h"
+#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/session.pb.h"
 #include "tensorflow/compiler/xla/service/user_computation.h"
 #include "tensorflow/compiler/xla/service/versioned_computation_handle.h"
@@ -72,12 +73,15 @@ class ComputationTracker {
   // Builds an HLO module using the specified computation as the entry. The
   // module will include the entry computation as well as all computations which
   // are called directly or indirectly from the entry computation via operations
-  // like "map". If include_unreachable_instructions is true, then instructions
+  // like "map". config is the HLO module configuration to use for the
+  // constructed module; pass nullptr for "no configuration".
+  // If include_unreachable_instructions is true, then instructions
   // which are not reachable from the root are lowered into HloInstructions
   // including unreachable parameters. This ensures the entry HloComputation has
   // the same program shape (ProgramShape) as the entry UserComputation.
   StatusOr<std::unique_ptr<HloModule>> BuildHloModule(
       const VersionedComputationHandle& entry_handle,
+      const HloModuleConfig* config,
       bool include_unreachable_instructions = true) const;
 
   string ToString() const;
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
index 1ba45e5983..97458f0fcc 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.cc
@@ -210,9 +210,7 @@ class CollectProfileCandidates : public DfsHloVisitorWithDefault {
 };
 }  // namespace
 
-Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
-                                 HloModuleConfig* module_config,
-                                 HloDumper dump_hlo) {
+Status CpuCompiler::RunHloPasses(HloModule* module, HloDumper dump_hlo) {
   // Optimization pipeline.
   HloPassPipeline pipeline("CPU", dump_hlo);
   pipeline.AddInvariantChecker<HloVerifier>();
@@ -243,7 +241,7 @@ Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
   pipeline.AddPass<HloCSE>(/*is_layout_sensitive=*/false);
   pipeline.AddPass<CpuInstructionFusion>();
   pipeline.AddPass<CpuLayoutAssignment>(
-      module_config->mutable_entry_computation_layout());
+      module->mutable_config()->mutable_entry_computation_layout());
   // The LayoutAssignment pass may leave behind kCopy instructions which are
   // duplicate or NOPs, so remove them with algebraic simplification and CSE.
   pipeline.AddPass<HloPassFix<AlgebraicSimplifier>>(
@@ -271,7 +269,7 @@ Status CpuCompiler::RunHloPasses(HloModule* hlo_module,
   }
   pipeline.AddPass<HloDCE>();
   pipeline.AddPass<FlattenCallGraph>();
-  return pipeline.Run(hlo_module).status();
+  return pipeline.Run(module).status();
 }
 
 namespace {
@@ -305,8 +303,7 @@ llvm::CodeGenOpt::Level CodeGenOptLevel() {
 }  // namespace
 
 StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
-    std::unique_ptr<HloModule> hlo_module,
-    std::unique_ptr<HloModuleConfig> module_config, HloDumper dump_hlo,
+    std::unique_ptr<HloModule> module, HloDumper dump_hlo,
     se::StreamExecutor* stream_exec) {
   TF_RET_CHECK(stream_exec != nullptr);
 
@@ -314,17 +311,16 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
   auto llvm_context = MakeUnique<llvm::LLVMContext>();
   auto llvm_module =
       MakeUnique<llvm::Module>("__compute_module", *llvm_context);
-  auto jit = MakeUnique<SimpleOrcJIT>(CompilerTargetOptions(*module_config),
+  auto jit = MakeUnique<SimpleOrcJIT>(CompilerTargetOptions(module->config()),
                                       CodeGenOptLevel());
   llvm_module->setDataLayout(jit->data_layout());
   llvm_module->setTargetTriple(jit->target_triple().getTriple());
 
-  TF_RETURN_IF_ERROR(
-      RunHloPasses(hlo_module.get(), module_config.get(), dump_hlo));
+  TF_RETURN_IF_ERROR(RunHloPasses(module.get(), dump_hlo));
 
-  HloComputation* computation = hlo_module->entry_computation();
+  HloComputation* computation = module->entry_computation();
   std::unordered_map<const HloInstruction*, size_t> hlo_to_profile_idx;
-  if (module_config->hlo_profiling_enabled()) {
+  if (module->config().hlo_profiling_enabled()) {
     TF_ASSIGN_OR_RETURN(
         hlo_to_profile_idx,
         CollectProfileCandidates::GetCandidatesForComputation(computation));
@@ -341,8 +337,8 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
     // uses data dependencies for determining order.
     TF_ASSIGN_OR_RETURN(
         std::unique_ptr<BufferAssignment> assignment,
-        BufferAssigner::Run(hlo_module.get(),
-                            MakeUnique<DependencyHloOrdering>(hlo_module.get()),
+        BufferAssigner::Run(module.get(),
+                            MakeUnique<DependencyHloOrdering>(module.get()),
                             [this](const LogicalBuffer& buffer) {
                               return ShapeSizeBytes(buffer.shape());
                             },
@@ -373,13 +369,13 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
       // The parallel preparation should have ensured that the top-level
       // computation consists solely of Call instructions.
       TF_RET_CHECK(instruction->opcode() == HloOpcode::kCall)
-          << hlo_module->ToString();
+          << module->ToString();
       HloComputation* to_apply = instruction->to_apply();
       parallel_computations.emplace(to_apply, instruction);
     }
 
-    IrEmitter ir_emitter(*hlo_module, *module_config, *assignment,
-                         llvm_module.get(), &hlo_to_profile_idx);
+    IrEmitter ir_emitter(*module, *assignment, llvm_module.get(),
+                         &hlo_to_profile_idx);
     std::unique_ptr<std::map<HloInstruction*, string>> function_names(
         new std::map<HloInstruction*, string>());
     for (auto embedded_computation :
@@ -413,9 +409,9 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
     // JIT compile the LLVM IR module to in-memory machine code.
     jit->AddModule(std::move(llvm_module));
     cpu_executable.reset(new ParallelCpuExecutable(
-        std::move(jit), std::move(assignment), std::move(hlo_module),
-        std::move(module_config), std::move(function_names),
-        std::move(hlo_to_profile_idx), std::move(aligned_constants)));
+        std::move(jit), std::move(assignment), std::move(module),
+        std::move(function_names), std::move(hlo_to_profile_idx),
+        std::move(aligned_constants)));
 
     if (flags->xla_cpu_embed_ir) {
       static_cast<CpuExecutable&>(*cpu_executable)
@@ -427,7 +423,7 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
     // and reduced memory usage (as compared to using DependencyHloOrdering).
     TF_ASSIGN_OR_RETURN(
         SequentialHloOrdering::HloModuleSequence module_sequence,
-        CreateMemoryMinimizingSequence(*hlo_module,
+        CreateMemoryMinimizingSequence(*module,
                                        [this](const LogicalBuffer& buffer) {
                                          return ShapeSizeBytes(buffer.shape());
                                        }));
@@ -436,20 +432,20 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
     // temporary buffers are required to run the computation.
     TF_ASSIGN_OR_RETURN(
         std::unique_ptr<BufferAssignment> assignment,
-        BufferAssigner::Run(hlo_module.get(),
-                            MakeUnique<SequentialHloOrdering>(hlo_module.get(),
-                                                              module_sequence),
-                            [this](const LogicalBuffer& buffer) {
-                              return ShapeSizeBytes(buffer.shape());
-                            },
-                            kMemoryAlignment));
+        BufferAssigner::Run(
+            module.get(),
+            MakeUnique<SequentialHloOrdering>(module.get(), module_sequence),
+            [this](const LogicalBuffer& buffer) {
+              return ShapeSizeBytes(buffer.shape());
+            },
+            kMemoryAlignment));
 
     // Each computation is a single function.  Emit all embedded computations
     // before the entry computation. The order of computations returned from
     // GetEmbeddedComputations guarantees that a called computation occurs
     // before a caller computation.
-    IrEmitter ir_emitter(*hlo_module, *module_config, *assignment,
-                         llvm_module.get(), &hlo_to_profile_idx);
+    IrEmitter ir_emitter(*module, *assignment, llvm_module.get(),
+                         &hlo_to_profile_idx);
     for (auto embedded_computation :
          computation->MakeEmbeddedComputationsList()) {
       TF_RETURN_IF_ERROR(
@@ -476,10 +472,9 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
 
     // JIT compile the LLVM IR module to in-memory machine code.
     jit->AddModule(std::move(llvm_module));
-    cpu_executable.reset(
-        new CpuExecutable(std::move(jit), std::move(assignment),
-                          std::move(hlo_module), std::move(module_config),
-                          function_name, std::move(hlo_to_profile_idx)));
+    cpu_executable.reset(new CpuExecutable(
+        std::move(jit), std::move(assignment), std::move(module), function_name,
+        std::move(hlo_to_profile_idx)));
 
     if (flags->xla_cpu_embed_ir) {
       static_cast<CpuExecutable&>(*cpu_executable)
@@ -491,27 +486,24 @@ StatusOr<std::unique_ptr<Executable>> CpuCompiler::Compile(
 }
 
 StatusOr<std::vector<std::unique_ptr<Executable>>> CpuCompiler::Compile(
-    std::vector<std::unique_ptr<HloModule>> hlo_modules,
-    std::vector<std::unique_ptr<HloModuleConfig>> module_configs,
-    HloDumper dump_hlos, std::vector<se::StreamExecutor*> stream_execs) {
+    std::vector<std::unique_ptr<HloModule>> modules, HloDumper dump_hlos,
+    std::vector<se::StreamExecutor*> stream_execs) {
   return Unimplemented(
       "Compilation of multiple HLO modules is not yet supported on CPU.");
 }
 
 StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
-CpuCompiler::CompileAheadOfTime(
-    std::vector<std::unique_ptr<HloModule>> hlo_modules,
-    std::vector<std::unique_ptr<HloModuleConfig>> module_configs,
-    HloDumper dump_hlo, const AotCompilationOptions& aot_options) {
-  TF_RET_CHECK(hlo_modules.size() == module_configs.size());
-  TF_RET_CHECK(!hlo_modules.empty());
+CpuCompiler::CompileAheadOfTime(std::vector<std::unique_ptr<HloModule>> modules,
+                                HloDumper dump_hlo,
+                                const AotCompilationOptions& aot_options) {
+  TF_RET_CHECK(!modules.empty());
 
   // We can pass just one llvm::TargetOptions when we compile the LLVM module,
   // so we bail if the configs have conflicting flags. At the moment, the only
   // flag that needs to be consistent is fast-math.
-  bool fast_math_disabled = module_configs[0]->fast_math_disabled();
-  for (const auto& module_config : module_configs) {
-    if (module_config->fast_math_disabled() != fast_math_disabled) {
+  bool fast_math_disabled = modules[0]->config().fast_math_disabled();
+  for (const auto& module : modules) {
+    if (module->config().fast_math_disabled() != fast_math_disabled) {
       return InvalidArgument(
           "All HLO module configs must have the same value for "
           "fast_math_disabled.");
@@ -569,7 +561,7 @@ CpuCompiler::CompileAheadOfTime(
   std::unique_ptr<llvm::TargetMachine> target_machine =
       WrapUnique(target->createTargetMachine(
           triple.getTriple(), cpu_name, features,
-          CompilerTargetOptions(*module_configs[0]), reloc_model,
+          CompilerTargetOptions(modules[0]->config()), reloc_model,
           llvm::CodeModel::Default, opt_level));
 
   // Compile must be thread-safe so create a new LLVM context for the module.
@@ -585,15 +577,14 @@ CpuCompiler::CompileAheadOfTime(
   }
 
   std::vector<std::unique_ptr<AotCompilationResult>> results;
-  for (size_t i = 0; i < hlo_modules.size(); ++i) {
-    HloModule* hlo_module = hlo_modules[i].get();
-    HloModuleConfig* module_config = module_configs[i].get();
+  for (size_t i = 0; i < modules.size(); ++i) {
+    HloModule* module = modules[i].get();
 
-    TF_RETURN_IF_ERROR(RunHloPasses(hlo_module, module_config, dump_hlo));
+    TF_RETURN_IF_ERROR(RunHloPasses(module, dump_hlo));
 
     TF_ASSIGN_OR_RETURN(
         SequentialHloOrdering::HloModuleSequence module_sequence,
-        CreateMemoryMinimizingSequence(*hlo_module,
+        CreateMemoryMinimizingSequence(*module,
                                        [this](const LogicalBuffer& buffer) {
                                          return ShapeSizeBytes(buffer.shape());
                                        }));
@@ -603,16 +594,15 @@ CpuCompiler::CompileAheadOfTime(
     TF_ASSIGN_OR_RETURN(
         std::unique_ptr<BufferAssignment> assignment,
         BufferAssigner::Run(
-            hlo_module,
-            MakeUnique<SequentialHloOrdering>(hlo_module, module_sequence),
+            module, MakeUnique<SequentialHloOrdering>(module, module_sequence),
             [this](const LogicalBuffer& buffer) {
               return ShapeSizeBytes(buffer.shape());
             },
             kMemoryAlignment));
 
-    IrEmitter ir_emitter(*hlo_module, *module_config, *assignment, &llvm_module,
+    IrEmitter ir_emitter(*module, *assignment, &llvm_module,
                          /*hlo_to_profile_idx=*/nullptr);
-    HloComputation* computation = hlo_module->entry_computation();
+    HloComputation* computation = module->entry_computation();
     for (auto embedded_computation :
          computation->MakeEmbeddedComputationsList()) {
       TF_RETURN_IF_ERROR(
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_compiler.h b/tensorflow/compiler/xla/service/cpu/cpu_compiler.h
index a32aa84ea5..cadafa8332 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_compiler.h
+++ b/tensorflow/compiler/xla/service/cpu/cpu_compiler.h
@@ -21,7 +21,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/compiler.h"
 #include "tensorflow/compiler/xla/service/executable.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
 #include "tensorflow/core/platform/macros.h"
@@ -113,21 +112,17 @@ class CpuCompiler : public Compiler {
   ~CpuCompiler() override {}
 
   StatusOr<std::unique_ptr<Executable>> Compile(
-      std::unique_ptr<HloModule> hlo_module,
-      std::unique_ptr<HloModuleConfig> module_config, HloDumper dump_hlo,
+      std::unique_ptr<HloModule> module, HloDumper dump_hlo,
       perftools::gputools::StreamExecutor* stream_exec) override;
 
   StatusOr<std::vector<std::unique_ptr<Executable>>> Compile(
-      std::vector<std::unique_ptr<HloModule>> hlo_module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
-      HloDumper dump_hlo,
+      std::vector<std::unique_ptr<HloModule>> modules, HloDumper dump_hlo,
       std::vector<perftools::gputools::StreamExecutor*> stream_exec) override;
 
   StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
-  CompileAheadOfTime(
-      std::vector<std::unique_ptr<HloModule>> module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
-      HloDumper dump_hlo, const AotCompilationOptions& options) override;
+  CompileAheadOfTime(std::vector<std::unique_ptr<HloModule>> modules,
+                     HloDumper dump_hlo,
+                     const AotCompilationOptions& options) override;
 
   perftools::gputools::Platform::Id PlatformId() const override;
 
@@ -139,8 +134,7 @@ class CpuCompiler : public Compiler {
 
   // Runs the HLO passes which are necessary for both optimizations and
   // correctness.
-  Status RunHloPasses(HloModule* hlo_module, HloModuleConfig* module_config,
-                      HloDumper dump_hlo);
+  Status RunHloPasses(HloModule* hlo_module, HloDumper dump_hlo);
 
   TF_DISALLOW_COPY_AND_ASSIGN(CpuCompiler);
 };
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_executable.cc b/tensorflow/compiler/xla/service/cpu/cpu_executable.cc
index 88283e6010..a4fcea7aec 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_executable.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_executable.cc
@@ -27,7 +27,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/computation_layout.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/logical_buffer.h"
 #include "tensorflow/compiler/xla/service/shaped_buffer.h"
 #include "tensorflow/compiler/xla/shape_tree.h"
@@ -53,11 +52,9 @@ namespace cpu {
 CpuExecutable::CpuExecutable(
     std::unique_ptr<SimpleOrcJIT> jit,
     std::unique_ptr<BufferAssignment> assignment,
-    std::unique_ptr<HloModule> hlo_module,
-    std::unique_ptr<HloModuleConfig> module_config,
-    const string& entry_function_name,
+    std::unique_ptr<HloModule> hlo_module, const string& entry_function_name,
     std::unordered_map<const HloInstruction*, size_t> hlo_to_profile_idx)
-    : Executable(std::move(hlo_module), std::move(module_config)),
+    : Executable(std::move(hlo_module)),
       jit_(std::move(jit)),
       assignment_(std::move(assignment)),
       hlo_to_profile_idx_(std::move(hlo_to_profile_idx)) {
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_executable.h b/tensorflow/compiler/xla/service/cpu/cpu_executable.h
index b04b4e8dd1..0cc0965ae1 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_executable.h
+++ b/tensorflow/compiler/xla/service/cpu/cpu_executable.h
@@ -29,7 +29,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_execution_profile.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/shaped_buffer.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 #include "tensorflow/compiler/xla/statusor.h"
@@ -52,7 +51,6 @@ class CpuExecutable : public Executable {
       std::unique_ptr<SimpleOrcJIT> jit,
       std::unique_ptr<BufferAssignment> assignment,
       std::unique_ptr<HloModule> hlo_module,
-      std::unique_ptr<HloModuleConfig> module_config,
       const string& entry_function_name,
       std::unordered_map<const HloInstruction*, size_t> hlo_to_profile_idx);
   ~CpuExecutable() override {}
diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
index 1e34de9e4b..5deb0236bf 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
@@ -63,8 +63,8 @@ using llvm_ir::SetToFirstInsertPoint;
 namespace cpu {
 
 IrEmitter::IrEmitter(
-    const HloModule& hlo_module, const HloModuleConfig& hlo_module_config,
-    const BufferAssignment& assignment, llvm::Module* llvm_module,
+    const HloModule& hlo_module, const BufferAssignment& assignment,
+    llvm::Module* llvm_module,
     const std::unordered_map<const HloInstruction*, size_t>* hlo_to_profile_idx)
     : assignment_(assignment),
       module_(llvm_module),
@@ -72,8 +72,8 @@ IrEmitter::IrEmitter(
       ir_builder_(llvm_module->getContext()),
       hlo_to_profile_idx_(hlo_to_profile_idx),
       alias_analysis_(hlo_module, assignment, &llvm_module->getContext()),
-      hlo_module_config_(hlo_module_config) {
-  ir_builder_.setFastMathFlags(llvm_ir::GetFastMathFlags(hlo_module_config));
+      hlo_module_config_(hlo_module.config()) {
+  ir_builder_.setFastMathFlags(llvm_ir::GetFastMathFlags(hlo_module_config_));
 }
 
 StatusOr<llvm::Function*> IrEmitter::EmitComputation(
diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.h b/tensorflow/compiler/xla/service/cpu/ir_emitter.h
index 6bcd9aa287..0540344aa3 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.h
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.h
@@ -60,8 +60,8 @@ class IrEmitter : public DfsHloVisitorWithDefault {
   // llvm_module: the LLVM module to emit IR into.
   // hlo_to_profile_idx: the mapping from HLO to its index in the profiling
   //                     array.
-  IrEmitter(const HloModule& hlo_module, const HloModuleConfig& module_config,
-            const BufferAssignment& assignment, llvm::Module* llvm_module,
+  IrEmitter(const HloModule& hlo_module, const BufferAssignment& assignment,
+            llvm::Module* llvm_module,
             const std::unordered_map<const HloInstruction*, size_t>*
                 hlo_to_profile_idx);
   ~IrEmitter() override;
diff --git a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc
index cadad10910..5f7b2c663f 100644
--- a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc
+++ b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.cc
@@ -30,7 +30,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/cpu/cpu_runtime.h"
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/hlo_opcode.h"
 #include "tensorflow/compiler/xla/service/logical_buffer.h"
 #include "tensorflow/compiler/xla/service/shaped_buffer.h"
@@ -58,12 +57,11 @@ ParallelCpuExecutable::ParallelCpuExecutable(
     std::unique_ptr<SimpleOrcJIT> jit,
     std::unique_ptr<BufferAssignment> assignment,
     std::unique_ptr<HloModule> hlo_module,
-    std::unique_ptr<HloModuleConfig> module_config,
     std::unique_ptr<std::map<HloInstruction*, string>> function_names,
     std::unordered_map<const HloInstruction*, size_t> hlo_to_profile_idx,
     std::unordered_map<const HloInstruction*, std::unique_ptr<unsigned char[]>>
         aligned_constants)
-    : Executable(std::move(hlo_module), std::move(module_config)),
+    : Executable(std::move(hlo_module)),
       jit_(std::move(jit)),
       assignment_(std::move(assignment)),
       functions_names_(std::move(function_names)),
diff --git a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h
index 6e1239d590..a3278c9510 100644
--- a/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h
+++ b/tensorflow/compiler/xla/service/cpu/parallel_cpu_executable.h
@@ -29,7 +29,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/hlo_execution_profile.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/shaped_buffer.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/compiler/xla/types.h"
@@ -52,7 +51,6 @@ class ParallelCpuExecutable : public Executable {
       std::unique_ptr<SimpleOrcJIT> jit,
       std::unique_ptr<BufferAssignment> assignment,
       std::unique_ptr<HloModule> hlo_module,
-      std::unique_ptr<HloModuleConfig> module_config,
       std::unique_ptr<std::map<HloInstruction*, string>> instruction_functions,
       std::unordered_map<const HloInstruction*, size_t> hlo_to_profile_idx,
       std::unordered_map<const HloInstruction*,
diff --git a/tensorflow/compiler/xla/service/executable.h b/tensorflow/compiler/xla/service/executable.h
index eb36aba33a..5a65f829fc 100644
--- a/tensorflow/compiler/xla/service/executable.h
+++ b/tensorflow/compiler/xla/service/executable.h
@@ -23,7 +23,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/device_memory_allocator.h"
 #include "tensorflow/compiler/xla/service/hlo_execution_profile.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/service_executable_run_options.h"
 #include "tensorflow/compiler/xla/service/session.pb.h"
 #include "tensorflow/compiler/xla/service/shaped_buffer.h"
@@ -41,10 +40,8 @@ namespace xla {
 // interface that is used for launching compiled programs across platforms.
 class Executable {
  public:
-  explicit Executable(std::unique_ptr<HloModule> hlo_module,
-                      std::unique_ptr<HloModuleConfig> module_config)
-      : hlo_module_(std::move(hlo_module)),
-        module_config_(std::move(module_config)) {}
+  explicit Executable(std::unique_ptr<HloModule> hlo_module)
+      : hlo_module_(std::move(hlo_module)) {}
   virtual ~Executable() {}
 
   // Enqueues the compilation result on the provided stream, passing the given
@@ -98,15 +95,17 @@ class Executable {
   // enabled. If not, the caller should not expect an hlo_execution_profile
   // passed to ExecuteOnStream above to be populated during execution.
   bool hlo_profiling_enabled() const {
-    return module_config_->hlo_profiling_enabled();
+    return hlo_module_->config().hlo_profiling_enabled();
   }
 
   const HloModule& module() const { return *hlo_module_; }
 
-  const HloModuleConfig& module_config() const { return *module_config_; }
+  const HloModuleConfig& module_config() const { return hlo_module_->config(); }
 
   // Returns whether this executable has an associated HloModuleConfig.
-  bool has_module_config() const { return module_config_ != nullptr; }
+  bool has_module_config() const {
+    return hlo_module_ != nullptr && hlo_module_->has_config();
+  }
 
   // Returns the versioned computation handle of the computation computed by
   // this executable.
@@ -117,7 +116,7 @@ class Executable {
   // The shape (including layout) that results from this execution. This is the
   // shape of the DeviceMemoryBase result value in ExecuteOnStream above.
   const Shape& result_shape() const {
-    return module_config_->entry_computation_layout().result_shape();
+    return hlo_module_->config().entry_computation_layout().result_shape();
   }
 
   // Dumping helpers.
@@ -143,10 +142,6 @@ class Executable {
   // around.
   std::unique_ptr<HloModule> hlo_module_;
 
-  // The configuration used to build this executable (parameter layouts, result
-  // layout, profiling enabled, etc).
-  std::unique_ptr<HloModuleConfig> module_config_;
-
   // SessionModule this was compiled from. Null if not dumping executions.
   std::unique_ptr<SessionModule> session_module_;
 
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
index dc3a289a71..b616d958b9 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.cc
@@ -232,15 +232,14 @@ GpuCompiler::GpuCompiler()
       pointer_size_(llvm::DataLayout(kDataLayout).getPointerSize()) {}
 
 StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
-    std::unique_ptr<HloModule> hlo_module,
-    std::unique_ptr<HloModuleConfig> module_config, HloDumper dump_hlo,
+    std::unique_ptr<HloModule> module, HloDumper dump_hlo,
     se::StreamExecutor* stream_exec) {
   TF_RET_CHECK(stream_exec != nullptr);
 
-  TF_RETURN_IF_ERROR(OptimizeHloModule(hlo_module.get(), dump_hlo,
+  TF_RETURN_IF_ERROR(OptimizeHloModule(module.get(), dump_hlo,
                                        stream_exec->GetDeviceDescription()));
-  TF_RETURN_IF_ERROR(PrepareHloModuleForIrEmitting(dump_hlo, hlo_module.get(),
-                                                   module_config.get()));
+  TF_RETURN_IF_ERROR(PrepareHloModuleForIrEmitting(dump_hlo, module.get(),
+                                                   module->mutable_config()));
 
   llvm::LLVMContext llvm_context;
   std::string buffer;
@@ -253,7 +252,7 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
   };
   llvm_context.setDiagnosticHandler(DiagnosticHandler, &printer);
 
-  llvm::Module llvm_module(hlo_module->name().c_str(), llvm_context);
+  llvm::Module llvm_module(module->name().c_str(), llvm_context);
   // Set the target triple and the data layout.
   llvm_module.setTargetTriple(kTargetTriple);
   llvm_module.setDataLayout(kDataLayout);
@@ -261,29 +260,28 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
   // Determine the HLO schedule, which is an ordering of HLO instructions.  This
   // is used by buffer assignment to enable buffer reuse, and the same ordering
   // must also be used to determine the thunk launch schedule.
-  std::unique_ptr<StreamAssignment> stream_assignment =
-      AssignStreams(*hlo_module);
+  std::unique_ptr<StreamAssignment> stream_assignment = AssignStreams(*module);
   TF_ASSIGN_OR_RETURN(
       std::unique_ptr<HloSchedule> hlo_schedule,
-      HloSchedule::Build(*hlo_module, *stream_assignment, pointer_size_));
+      HloSchedule::Build(*module, *stream_assignment, pointer_size_));
 
   // Run buffer analysis on the HLO graph. This analysis figures out which
   // temporary buffers are required to run the computation.
   TF_ASSIGN_OR_RETURN(
       std::unique_ptr<BufferAssignment> buffer_assignment,
-      BufferAssigner::Run(hlo_module.get(), hlo_schedule->ConsumeHloOrdering(),
+      BufferAssigner::Run(module.get(), hlo_schedule->ConsumeHloOrdering(),
                           [this](const LogicalBuffer& buffer) {
                             return ShapeSizeBytes(buffer.shape());
                           },
                           kMemoryAlignment));
 
-  IrEmitterContext ir_emitter_context(hlo_module.get(), buffer_assignment.get(),
+  IrEmitterContext ir_emitter_context(module.get(), buffer_assignment.get(),
                                       &stream_exec->GetDeviceDescription(),
                                       &llvm_module);
 
-  HloComputation* entry_computation = hlo_module->entry_computation();
-  IrEmitterUnnested ir_emitter(*module_config, entry_computation,
-                               module_config->has_hybrid_result(),
+  HloComputation* entry_computation = module->entry_computation();
+  IrEmitterUnnested ir_emitter(module->config(), entry_computation,
+                               module->config().has_hybrid_result(),
                                &ir_emitter_context);
   TF_RETURN_IF_ERROR(
       entry_computation->root_instruction()->Accept(&ir_emitter));
@@ -312,7 +310,7 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
     cc_minor = 0;
   }
   TF_ASSIGN_OR_RETURN(*ptx, CompileToPtx(&llvm_module, {cc_major, cc_minor},
-                                         *module_config, libdevice_dir_));
+                                         module->config(), libdevice_dir_));
 
   VLOG(2) << "LLVM module after optimizations:";
   XLA_VLOG_LINES(2, llvm_ir::DumpModuleToString(llvm_module));
@@ -329,8 +327,8 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
   XLA_VLOG_LINES(2, thunk_schedule->ToString());
 
   auto* gpu_executable =
-      new GpuExecutable(*ptx, std::move(thunk_schedule), std::move(hlo_module),
-                        std::move(module_config), std::move(buffer_assignment));
+      new GpuExecutable(*ptx, std::move(thunk_schedule), std::move(module),
+                        std::move(buffer_assignment));
   if (flags->xla_gpu_embed_ir) {
     DCHECK_NE("", ir_module_string_before_opt);
     gpu_executable->set_ir_module_string(ir_module_string_before_opt);
@@ -339,9 +337,8 @@ StatusOr<std::unique_ptr<Executable>> GpuCompiler::Compile(
 }
 
 StatusOr<std::vector<std::unique_ptr<Executable>>> GpuCompiler::Compile(
-    std::vector<std::unique_ptr<HloModule>> hlo_modules,
-    std::vector<std::unique_ptr<HloModuleConfig>> module_configs,
-    HloDumper dump_hlos, std::vector<se::StreamExecutor*> stream_execs) {
+    std::vector<std::unique_ptr<HloModule>> modules, HloDumper dump_hlos,
+    std::vector<se::StreamExecutor*> stream_execs) {
   return Unimplemented(
       "Compilation of multiple HLO modules is not yet supported on GPU.");
 }
@@ -349,7 +346,6 @@ StatusOr<std::vector<std::unique_ptr<Executable>>> GpuCompiler::Compile(
 StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
 GpuCompiler::CompileAheadOfTime(
     std::vector<std::unique_ptr<HloModule>> module,
-    std::vector<std::unique_ptr<HloModuleConfig>> module_config,
     HloDumper dump_hlo, const AotCompilationOptions& options) {
   return Unimplemented("not yet implemented: GpuCompiler::CompileAheadOfTime");
 }
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_compiler.h b/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
index 22f492b422..921d683f03 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
+++ b/tensorflow/compiler/xla/service/gpu/gpu_compiler.h
@@ -42,20 +42,16 @@ class GpuCompiler : public Compiler {
   ~GpuCompiler() override {}
 
   StatusOr<std::unique_ptr<Executable>> Compile(
-      std::unique_ptr<HloModule> hlo_module,
-      std::unique_ptr<HloModuleConfig> module_config, HloDumper dump_hlo,
+      std::unique_ptr<HloModule> module, HloDumper dump_hlo,
       perftools::gputools::StreamExecutor* stream_exec) override;
 
   StatusOr<std::vector<std::unique_ptr<Executable>>> Compile(
-      std::vector<std::unique_ptr<HloModule>> hlo_module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
-      HloDumper dump_hlo,
+      std::vector<std::unique_ptr<HloModule>> modules, HloDumper dump_hlo,
       std::vector<perftools::gputools::StreamExecutor*> stream_exec) override;
 
   StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
   CompileAheadOfTime(
       std::vector<std::unique_ptr<HloModule>> module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
       HloDumper dump_hlo, AotCompilationOptions const& options) override;
 
   perftools::gputools::Platform::Id PlatformId() const override;
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_executable.cc b/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
index 32f0368b4b..69bcd53e05 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
+++ b/tensorflow/compiler/xla/service/gpu/gpu_executable.cc
@@ -110,9 +110,8 @@ class HloExecutionProfiler {
 GpuExecutable::GpuExecutable(tensorflow::StringPiece ptx,
                              std::unique_ptr<ThunkSchedule> thunk_schedule,
                              std::unique_ptr<HloModule> hlo_module,
-                             std::unique_ptr<HloModuleConfig> module_config,
                              std::unique_ptr<BufferAssignment> assignment)
-    : Executable(std::move(hlo_module), std::move(module_config)),
+    : Executable(std::move(hlo_module)),
       ptx_(ptx),
       thunk_schedule_(std::move(thunk_schedule)),
       assignment_(std::move(assignment)) {}
diff --git a/tensorflow/compiler/xla/service/gpu/gpu_executable.h b/tensorflow/compiler/xla/service/gpu/gpu_executable.h
index e308de79ba..ad178b7249 100644
--- a/tensorflow/compiler/xla/service/gpu/gpu_executable.h
+++ b/tensorflow/compiler/xla/service/gpu/gpu_executable.h
@@ -28,7 +28,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/service/gpu/thunk_schedule.h"
 #include "tensorflow/compiler/xla/service/hlo_execution_profile.h"
 #include "tensorflow/compiler/xla/service/hlo_module.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/shaped_buffer.h"
 #include "tensorflow/compiler/xla/service/tuple_points_to_analysis.h"
 #include "tensorflow/compiler/xla/statusor.h"
@@ -51,7 +50,6 @@ class GpuExecutable : public Executable {
   GpuExecutable(tensorflow::StringPiece ptx,
                 std::unique_ptr<ThunkSchedule> thunk_schedule,
                 std::unique_ptr<HloModule> hlo_module,
-                std::unique_ptr<HloModuleConfig> module_config,
                 std::unique_ptr<BufferAssignment> assignment);
 
   // This should be called after set_ir_module_string.
diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc b/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc
index 22e782da27..f71ffeb887 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis_test.cc
@@ -126,8 +126,10 @@ class HloCostAnalysisTest : public ::testing::Test {
     auto user_computation = user_computation_status.ConsumeValueOrDie();
     VersionedComputationHandle versioned_handle =
         user_computation->GetVersionedHandle();
-    return std::move(
-        computation_tracker_.BuildHloModule(versioned_handle).ValueOrDie());
+    return std::move(computation_tracker_
+                         .BuildHloModule(versioned_handle,
+                                         /*config=*/nullptr)
+                         .ValueOrDie());
   }
 
   Client* client_;
diff --git a/tensorflow/compiler/xla/service/hlo_module.cc b/tensorflow/compiler/xla/service/hlo_module.cc
index f5e13b4367..cff9a6658d 100644
--- a/tensorflow/compiler/xla/service/hlo_module.cc
+++ b/tensorflow/compiler/xla/service/hlo_module.cc
@@ -23,6 +23,7 @@ limitations under the License.
 #include <utility>
 
 #include "tensorflow/compiler/xla/map_util.h"
+#include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/shape_util.h"
 #include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/lib/gtl/map_util.h"
@@ -34,6 +35,17 @@ namespace xla {
 HloModule::HloModule(const string& name,
                      const VersionedComputationHandle& entry_computation_handle)
     : name_(name),
+      config_(nullptr),
+      entry_computation_(nullptr),
+      has_entry_computation_handle_(true),
+      entry_computation_handle_(entry_computation_handle),
+      computation_name_uniquer_(/*separator=*/".") {}
+
+HloModule::HloModule(const string& name,
+                     const VersionedComputationHandle& entry_computation_handle,
+                     const HloModuleConfig& config)
+    : name_(name),
+      config_(MakeUnique<HloModuleConfig>(config)),
       entry_computation_(nullptr),
       has_entry_computation_handle_(true),
       entry_computation_handle_(entry_computation_handle),
@@ -41,9 +53,14 @@ HloModule::HloModule(const string& name,
 
 HloModule::HloModule(const string& name)
     : name_(name),
+      config_(nullptr),
       entry_computation_(nullptr),
       computation_name_uniquer_(/*separator=*/".") {}
 
+void HloModule::set_config(const HloModuleConfig& config) {
+  config_ = MakeUnique<HloModuleConfig>(config);
+}
+
 HloComputation* HloModule::AddComputationInternal(
     std::unique_ptr<HloComputation> computation) {
   computation->UniquifyName(&computation_name_uniquer_);
diff --git a/tensorflow/compiler/xla/service/hlo_module.h b/tensorflow/compiler/xla/service/hlo_module.h
index d76f08d3bc..3efb9c72bb 100644
--- a/tensorflow/compiler/xla/service/hlo_module.h
+++ b/tensorflow/compiler/xla/service/hlo_module.h
@@ -25,6 +25,7 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/hlo_computation.h"
 #include "tensorflow/compiler/xla/service/hlo_instruction.h"
+#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/service/name_uniquer.h"
 #include "tensorflow/compiler/xla/service/versioned_computation_handle.h"
 #include "tensorflow/compiler/xla/types.h"
@@ -45,6 +46,10 @@ class HloModule {
   HloModule(const string& name,
             const VersionedComputationHandle& entry_computation_handle);
 
+  HloModule(const string& name,
+            const VersionedComputationHandle& entry_computation_handle,
+            const HloModuleConfig& config);
+
   // Constructor without a versioned computation handle. This constructor should
   // only be used for HloModules used outside of the XLA service (eg
   // tests). The versioned handle is used by the service in the compilation
@@ -91,6 +96,14 @@ class HloModule {
   // computation B, then A will appear after B in the sort.
   std::list<HloComputation*> MakeComputationPostOrder() const;
 
+  bool has_config() const { return config_ != nullptr; }
+
+  void set_config(const HloModuleConfig& config);
+
+  const HloModuleConfig& config() const { return *config_; }
+
+  HloModuleConfig* mutable_config() { return config_.get(); }
+
   string ToString() const;
 
   // Outlines the given expression from the given computation.
@@ -116,6 +129,7 @@ class HloModule {
       std::unique_ptr<HloComputation> computation);
 
   const string name_;
+  std::unique_ptr<HloModuleConfig> config_;
   HloComputation* entry_computation_;
   std::vector<std::unique_ptr<HloComputation>> computations_;
 
diff --git a/tensorflow/compiler/xla/service/service.cc b/tensorflow/compiler/xla/service/service.cc
index 42450dfcae..8b373ab096 100644
--- a/tensorflow/compiler/xla/service/service.cc
+++ b/tensorflow/compiler/xla/service/service.cc
@@ -385,20 +385,23 @@ StatusOr<std::vector<std::unique_ptr<Executable>>> Service::BuildExecutables(
     VLOG(1) << versioned_handle;
   }
 
+  CHECK_EQ(versioned_handles.size(), module_configs.size());
   std::vector<std::unique_ptr<HloModule>> modules;
-  for (const VersionedComputationHandle& versioned_handle : versioned_handles) {
+  for (int64 i = 0; i < versioned_handles.size(); ++i) {
+    const VersionedComputationHandle& versioned_handle = versioned_handles[i];
+    const HloModuleConfig& config = *module_configs[i];
     TF_ASSIGN_OR_RETURN(auto module,
                         computation_tracker_.BuildHloModule(
-                            versioned_handle,
+                            versioned_handle, &config,
                             /*include_unreachable_instructions=*/true));
     modules.push_back(std::move(module));
   }
 
   Compiler::HloDumper hlo_dumper = MakeHloDumper();
-  TF_ASSIGN_OR_RETURN(std::vector<std::unique_ptr<Executable>> executables,
-                      backend->compiler()->Compile(
-                          std::move(modules), std::move(module_configs),
-                          hlo_dumper, std::move(executors)));
+  TF_ASSIGN_OR_RETURN(
+      std::vector<std::unique_ptr<Executable>> executables,
+      backend->compiler()->Compile(std::move(modules), hlo_dumper,
+                                   std::move(executors)));
 
   if (!other_directory_path.empty()) {
     for (size_t i = 0; i < versioned_handles.size(); ++i) {
@@ -441,7 +444,7 @@ StatusOr<std::unique_ptr<Executable>> Service::BuildExecutable(
 
   TF_ASSIGN_OR_RETURN(
       std::unique_ptr<HloModule> module,
-      computation_tracker_.BuildHloModule(versioned_handle,
+      computation_tracker_.BuildHloModule(versioned_handle, module_config.get(),
                                           /*include_unreachable_instructions=*/
                                           !executable_for_compute_constant));
 
@@ -453,8 +456,7 @@ StatusOr<std::unique_ptr<Executable>> Service::BuildExecutable(
 
   TF_ASSIGN_OR_RETURN(
       std::unique_ptr<Executable> executable,
-      backend->compiler()->Compile(std::move(module), std::move(module_config),
-                                   hlo_dumper, executor));
+      backend->compiler()->Compile(std::move(module), hlo_dumper, executor));
 
   if (!other_directory_path.empty()) {
     executable->set_session_module(std::move(session_module));
@@ -1224,7 +1226,8 @@ tensorflow::Status Service::GetComputationStats(
       user_computation->GetVersionedHandle();
 
   TF_ASSIGN_OR_RETURN(std::unique_ptr<HloModule> module,
-                      computation_tracker_.BuildHloModule(versioned_handle));
+                      computation_tracker_.BuildHloModule(versioned_handle,
+                                                          /*config=*/nullptr));
 
   MakeHloDumper()(*module, "computation statistics subject");
 
diff --git a/tensorflow/compiler/xla/tests/codegen_test_base.cc b/tensorflow/compiler/xla/tests/codegen_test_base.cc
index e6f3225bb7..d5acea32ef 100644
--- a/tensorflow/compiler/xla/tests/codegen_test_base.cc
+++ b/tensorflow/compiler/xla/tests/codegen_test_base.cc
@@ -21,7 +21,6 @@ limitations under the License.
 #include "tensorflow/compiler/xla/ptr_util.h"
 #include "tensorflow/compiler/xla/service/backend.h"
 #include "tensorflow/compiler/xla/service/compiler.h"
-#include "tensorflow/compiler/xla/service/hlo_module_config.h"
 #include "tensorflow/compiler/xla/statusor.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/io/path.h"
@@ -43,12 +42,13 @@ void CodegenTestBase::CompileAndVerifyIr(std::unique_ptr<HloModule> hlo_module,
 
 std::unique_ptr<Executable> CodegenTestBase::CompileToExecutable(
     std::unique_ptr<HloModule> hlo_module) {
-  auto module_config = MakeUnique<HloModuleConfig>(
+  HloModuleConfig module_config(
       hlo_module->entry_computation()->ComputeProgramShape());
-  module_config->set_fast_math_disabled(fast_math_disabled_);
+  module_config.set_fast_math_disabled(fast_math_disabled_);
+  hlo_module->set_config(module_config);
   return backend_->compiler()
-      ->Compile(std::move(hlo_module), std::move(module_config),
-                test_hlo_dumper_, backend_->default_stream_executor())
+      ->Compile(std::move(hlo_module), test_hlo_dumper_,
+                backend_->default_stream_executor())
       .ConsumeValueOrDie();
 }
 
diff --git a/tensorflow/compiler/xla/tests/hlo_test_base.cc b/tensorflow/compiler/xla/tests/hlo_test_base.cc
index f741ff38b5..ca15f7395d 100644
--- a/tensorflow/compiler/xla/tests/hlo_test_base.cc
+++ b/tensorflow/compiler/xla/tests/hlo_test_base.cc
@@ -94,10 +94,10 @@ StatusOr<se::DeviceMemoryBase> HloTestBase::Execute(
           << LayoutUtil::HumanString(module_config->entry_computation_layout()
                                          .result_layout()
                                          .layout());
+  hlo_module->set_config(*module_config);
   TF_ASSIGN_OR_RETURN(
       std::unique_ptr<Executable> executable,
-      backend_->compiler()->Compile(std::move(hlo_module),
-                                    std::move(module_config), test_hlo_dumper_,
+      backend_->compiler()->Compile(std::move(hlo_module), test_hlo_dumper_,
                                     backend_->default_stream_executor()));
 
   se::Stream stream(backend_->default_stream_executor());
diff --git a/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc b/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc
index 1f0ca31d6d..dc5a86f34e 100644
--- a/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc
+++ b/tensorflow/compiler/xla/tools/dumped_computation_to_text.cc
@@ -76,7 +76,10 @@ void RealMain(tensorflow::gtl::ArraySlice<char*> args, bool compile) {
       VersionedComputationHandle versioned_handle =
           user_computation->GetVersionedHandle();
       std::unique_ptr<HloModule> module =
-          tracker.BuildHloModule(versioned_handle).ConsumeValueOrDie();
+          tracker
+              .BuildHloModule(versioned_handle,
+                              /*config=*/nullptr)
+              .ConsumeValueOrDie();
 
       fprintf(stdout, "%s\n", module->ToString().c_str());
     }
diff --git a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
index beb4c8009b..91aa9c7f43 100644
--- a/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
+++ b/tensorflow/contrib/xla_tf_graph/xla_tf_graph_util_test.cc
@@ -94,7 +94,8 @@ static void DumpHloGraphForDebug(const std::vector<XlaCompiler::Argument>& args,
   xla::VersionedComputationHandle versioned_handle =
       user_computation->GetVersionedHandle();
   std::unique_ptr<xla::HloModule> hlo_module = std::move(
-      computation_tracker.BuildHloModule(versioned_handle).ValueOrDie());
+      computation_tracker.BuildHloModule(versioned_handle, /*config=*/nullptr)
+          .ValueOrDie());
   VLOG(1) << "--- DUMP HLO ---";
   VLOG(1) << hlo_module->ToString();
 }
-- 
GitLab


From aec49466895be3aa273925fea266990e0ce36972 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Thu, 18 May 2017 14:17:48 -0700
Subject: [PATCH 1510/1563] Provide possible debugging options when triggering
 graph mismatches in Estimator model_fn.

Example error messsage shows:

ValueError: train_op with name "model.0/group_deps" must be from the default graph. Possible causes of this error include: 1) train_op was created outside the context of the default graph.

2) The object passed through to EstimatorSpec did not come from the most recent call to "model_fn".

Or for eval_metrics_ops

ValueError: eval_metric_ops with "accuracy: model.0/group_deps" must be from the default graph. Possible causes of this error include:  ...
PiperOrigin-RevId: 156477970
---
 tensorflow/python/estimator/model_fn.py | 49 ++++++++++++++++---------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/tensorflow/python/estimator/model_fn.py b/tensorflow/python/estimator/model_fn.py
index 8d4bcca619..1aa2623962 100644
--- a/tensorflow/python/estimator/model_fn.py
+++ b/tensorflow/python/estimator/model_fn.py
@@ -239,17 +239,39 @@ class EstimatorSpec(
 
     # Validate that all tensors and ops are from the default graph.
     default_graph = ops.get_default_graph()
-    for value in _prediction_values(predictions):
-      if value.graph is not default_graph:
-        raise ValueError('prediction values must be from the default graph.')
+
+    # We enumerate possible error causes here to aid in debugging.
+    error_message_template = (
+        '{0} with "{1}" must be from the default graph. '
+        'Possible causes of this error include: \n\n'
+        '1) {0} was created outside the context of the default graph.'
+        '\n\n'
+        '2) The object passed through to EstimatorSpec was not created '
+        'in the most recent call to "model_fn".')
+
+    if isinstance(predictions, dict):
+      for key, value in six.iteritems(predictions):
+        if value.graph is not default_graph:
+          raise ValueError(error_message_template.format(
+              'prediction values',
+              '{0}: {1}'.format(key, value.name)))
+    elif predictions is not None:
+      # 'predictions' must be a single Tensor.
+      if predictions.graph is not default_graph:
+        raise ValueError(error_message_template.format(
+            'prediction values', predictions.name))
+
     if loss is not None and loss.graph is not default_graph:
-      raise ValueError('loss must be from the default graph.')
+      raise ValueError(error_message_template.format('loss', loss.name))
     if train_op is not None and train_op.graph is not default_graph:
-      raise ValueError('train_op must be from the default graph.')
-    for value in nest.flatten(list(eval_metric_ops.values())):
-      if value.graph is not default_graph:
-        raise ValueError(
-            'eval_metric_ops values must be from the default graph.')
+      raise ValueError(error_message_template.format('train_op', train_op.name))
+    for key, value in list(six.iteritems(eval_metric_ops)):
+      values = nest.flatten(value)
+      for value in values:
+        if value.graph is not default_graph:
+          raise ValueError(error_message_template.format(
+              'eval_metric_ops',
+              '{0}: {1}'.format(key, value.name)))
 
     # Validate hooks.
     training_chief_hooks = tuple(training_chief_hooks or [])
@@ -288,12 +310,3 @@ def _check_is_tensor(x, tensor_name):
   if not isinstance(x, ops.Tensor):
     raise TypeError('{} must be Tensor, given: {}'.format(tensor_name, x))
   return x
-
-
-def _prediction_values(predictions):
-  """Returns the values of the given predictions dict or `Tensor`."""
-  if predictions is None:
-    return []
-  if isinstance(predictions, dict):
-    return list(six.itervalues(predictions))
-  return [predictions]
-- 
GitLab


From 34e264a785cbd4cc1fcbf5d9cfc18c131fd5b206 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 14:28:06 -0700
Subject: [PATCH 1511/1563] Start to graduate canned estimators to core.

Also removes gradient_clip_norm from linear estimators, and expands the train tests to verify loss value.

PiperOrigin-RevId: 156479412
---
 tensorflow/python/estimator/BUILD             |  183 ++
 .../python/estimator/canned/__init__.py       |    0
 tensorflow/python/estimator/canned/dnn.py     |  253 +++
 .../python/estimator/canned/dnn_test.py       | 1122 ++++++++++++
 tensorflow/python/estimator/canned/head.py    |  669 +++++++
 .../python/estimator/canned/head_test.py      | 1570 +++++++++++++++++
 tensorflow/python/estimator/canned/linear.py  |  293 +++
 .../python/estimator/canned/linear_test.py    |  662 +++++++
 .../python/estimator/canned/metric_keys.py    |   41 +
 .../python/estimator/canned/optimizers.py     |   78 +
 .../estimator/canned/optimizers_test.py       |   85 +
 .../estimator/canned/prediction_keys.py       |   33 +
 12 files changed, 4989 insertions(+)
 create mode 100644 tensorflow/python/estimator/canned/__init__.py
 create mode 100644 tensorflow/python/estimator/canned/dnn.py
 create mode 100644 tensorflow/python/estimator/canned/dnn_test.py
 create mode 100644 tensorflow/python/estimator/canned/head.py
 create mode 100644 tensorflow/python/estimator/canned/head_test.py
 create mode 100644 tensorflow/python/estimator/canned/linear.py
 create mode 100644 tensorflow/python/estimator/canned/linear_test.py
 create mode 100644 tensorflow/python/estimator/canned/metric_keys.py
 create mode 100644 tensorflow/python/estimator/canned/optimizers.py
 create mode 100644 tensorflow/python/estimator/canned/optimizers_test.py
 create mode 100644 tensorflow/python/estimator/canned/prediction_keys.py

diff --git a/tensorflow/python/estimator/BUILD b/tensorflow/python/estimator/BUILD
index cf76f8598b..b7f83afdb1 100644
--- a/tensorflow/python/estimator/BUILD
+++ b/tensorflow/python/estimator/BUILD
@@ -17,9 +17,11 @@ py_library(
     srcs = ["estimator_lib.py"],
     srcs_version = "PY2AND3",
     deps = [
+        ":dnn",
         ":estimator",
         ":export",
         ":inputs",
+        ":linear",
         ":model_fn",
         ":run_config",
         "//tensorflow/python:util",
@@ -84,6 +86,54 @@ py_test(
     ],
 )
 
+py_library(
+    name = "dnn",
+    srcs = ["canned/dnn.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":estimator",
+        ":head",
+        ":model_fn",
+        ":optimizers",
+        "//tensorflow/python:init_ops",
+        "//tensorflow/python:layers",
+        "//tensorflow/python:nn",
+        "//tensorflow/python:partitioned_variables",
+        "//tensorflow/python:summary",
+        "//tensorflow/python:training",
+        "//tensorflow/python:variable_scope",
+        "//tensorflow/python/feature_column",
+    ],
+)
+
+py_test(
+    name = "dnn_test",
+    size = "medium",
+    srcs = ["canned/dnn_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":dnn",
+        ":export_export",
+        ":metric_keys",
+        ":numpy_io",
+        ":prediction_keys",
+        "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:check_ops",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:state_ops",
+        "//tensorflow/python:summary",
+        "//tensorflow/python:training",
+        "//tensorflow/python:variables",
+        "//tensorflow/python/feature_column",
+    ],
+)
+
 py_library(
     name = "estimator",
     srcs = [
@@ -203,6 +253,59 @@ py_test(
     ],
 )
 
+py_library(
+    name = "head",
+    srcs = ["canned/head.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":export_output",
+        ":metric_keys",
+        ":model_fn",
+        ":prediction_keys",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:check_ops",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:logging_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:metrics",
+        "//tensorflow/python:nn",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python:variable_scope",
+        "//tensorflow/python:weights_broadcast_ops",
+        "//tensorflow/python/ops/losses",
+    ],
+)
+
+py_test(
+    name = "head_test",
+    size = "small",
+    srcs = ["canned/head_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":head",
+        ":metric_keys",
+        ":model_fn",
+        ":numpy_io",
+        ":prediction_keys",
+        "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:check_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:errors",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:string_ops",
+        "//tensorflow/python:training",
+        "//tensorflow/python/saved_model:signature_constants",
+    ],
+)
+
 py_library(
     name = "inputs",
     srcs = ["inputs/inputs.py"],
@@ -214,6 +317,58 @@ py_library(
     ],
 )
 
+py_library(
+    name = "linear",
+    srcs = ["canned/linear.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":estimator",
+        ":head",
+        ":optimizers",
+        "//tensorflow/python:partitioned_variables",
+        "//tensorflow/python:training",
+        "//tensorflow/python:variable_scope",
+        "//tensorflow/python/feature_column",
+    ],
+)
+
+py_test(
+    name = "linear_test",
+    size = "medium",
+    srcs = ["canned/linear_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":estimator",
+        ":export_export",
+        ":linear",
+        ":metric_keys",
+        ":numpy_io",
+        ":run_config",
+        "//tensorflow/python:check_ops",
+        "//tensorflow/python:client",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:state_ops",
+        "//tensorflow/python:training",
+        "//tensorflow/python:variable_scope",
+        "//tensorflow/python:variables",
+        "//tensorflow/python/feature_column",
+    ],
+)
+
+py_library(
+    name = "metric_keys",
+    srcs = ["canned/metric_keys.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":model_fn",
+    ],
+)
+
 py_library(
     name = "numpy_io",
     srcs = ["inputs/numpy_io.py"],
@@ -236,6 +391,27 @@ py_test(
     ],
 )
 
+py_library(
+    name = "optimizers",
+    srcs = ["canned/optimizers.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        "//tensorflow/python:training",
+    ],
+)
+
+py_test(
+    name = "optimizers_test",
+    size = "small",
+    srcs = ["canned/optimizers_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":optimizers",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:training",
+    ],
+)
+
 py_library(
     name = "pandas_io",
     srcs = ["inputs/pandas_io.py"],
@@ -257,6 +433,13 @@ py_test(
     ],
 )
 
+py_library(
+    name = "prediction_keys",
+    srcs = ["canned/prediction_keys.py"],
+    srcs_version = "PY2AND3",
+    deps = [],
+)
+
 py_library(
     name = "inputs_queues",
     srcs = [
diff --git a/tensorflow/python/estimator/canned/__init__.py b/tensorflow/python/estimator/canned/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tensorflow/python/estimator/canned/dnn.py b/tensorflow/python/estimator/canned/dnn.py
new file mode 100644
index 0000000000..ecc4fd3594
--- /dev/null
+++ b/tensorflow/python/estimator/canned/dnn.py
@@ -0,0 +1,253 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Deep Neural Network estimators."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import six
+
+from tensorflow.python.estimator import estimator
+from tensorflow.python.estimator import model_fn
+from tensorflow.python.estimator.canned import head as head_lib
+from tensorflow.python.estimator.canned import optimizers
+from tensorflow.python.feature_column import feature_column as feature_column_lib
+from tensorflow.python.layers import core as core_layers
+from tensorflow.python.ops import init_ops
+from tensorflow.python.ops import nn
+from tensorflow.python.ops import partitioned_variables
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.summary import summary
+from tensorflow.python.training import training_util
+
+# The default learning rate of 0.05 is a historical artifact of the initial
+# implementation, but seems a reasonable choice.
+_LEARNING_RATE = 0.05
+
+
+def _add_hidden_layer_summary(value, tag):
+  summary.scalar('%s_fraction_of_zero_values' % tag, nn.zero_fraction(value))
+  summary.histogram('%s_activation' % tag, value)
+
+
+def _dnn_model_fn(
+    features, labels, mode, head, hidden_units, feature_columns,
+    optimizer='Adagrad', activation_fn=nn.relu, dropout=None,
+    input_layer_partitioner=None, config=None):
+  """Deep Neural Net model_fn.
+
+  Args:
+    features: Dict of `Tensor` (depends on data passed to `train`).
+    labels: `Tensor` of shape [batch_size, 1] or [batch_size] labels of
+      dtype `int32` or `int64` in the range `[0, n_classes)`.
+    mode: Defines whether this is training, evaluation or prediction.
+      See `ModeKeys`.
+    head: A `head_lib._Head` instance.
+    hidden_units: Iterable of integer number of hidden units per layer.
+    feature_columns: Iterable of `feature_column._FeatureColumn` model inputs.
+    optimizer: String, `tf.Optimizer` object, or callable that creates the
+      optimizer to use for training. If not specified, will use the Adagrad
+      optimizer with a default learning rate of 0.05.
+    activation_fn: Activation function applied to each layer.
+    dropout: When not `None`, the probability we will drop out a given
+      coordinate.
+    input_layer_partitioner: Partitioner for input layer. Defaults
+      to `min_max_variable_partitioner` with `min_slice_size` 64 << 20.
+    config: `RunConfig` object to configure the runtime settings.
+
+  Returns:
+    predictions: A dict of `Tensor` objects.
+    loss: A scalar containing the loss of the step.
+    train_op: The op for training.
+  """
+  optimizer = optimizers.get_optimizer_instance(
+      optimizer, learning_rate=_LEARNING_RATE)
+  num_ps_replicas = config.num_ps_replicas if config else 0
+
+  partitioner = partitioned_variables.min_max_variable_partitioner(
+      max_partitions=num_ps_replicas)
+  with variable_scope.variable_scope(
+      'dnn',
+      values=tuple(six.itervalues(features)),
+      partitioner=partitioner):
+    input_layer_partitioner = input_layer_partitioner or (
+        partitioned_variables.min_max_variable_partitioner(
+            max_partitions=num_ps_replicas,
+            min_slice_size=64 << 20))
+    with variable_scope.variable_scope(
+        'input_from_feature_columns',
+        values=tuple(six.itervalues(features)),
+        partitioner=input_layer_partitioner):
+      net = feature_column_lib.input_layer(
+          features=features,
+          feature_columns=feature_columns)
+
+    for layer_id, num_hidden_units in enumerate(hidden_units):
+      with variable_scope.variable_scope(
+          'hiddenlayer_%d' % layer_id,
+          values=(net,)) as hidden_layer_scope:
+        net = core_layers.dense(
+            net,
+            units=num_hidden_units,
+            activation=activation_fn,
+            kernel_initializer=init_ops.glorot_uniform_initializer(),
+            name=hidden_layer_scope)
+        if dropout is not None and mode == model_fn.ModeKeys.TRAIN:
+          net = core_layers.dropout(net, rate=dropout, training=True)
+      _add_hidden_layer_summary(net, hidden_layer_scope.name)
+
+    with variable_scope.variable_scope(
+        'logits',
+        values=(net,)) as logits_scope:
+      logits = core_layers.dense(
+          net,
+          units=head.logits_dimension,
+          activation=None,
+          kernel_initializer=init_ops.glorot_uniform_initializer(),
+          name=logits_scope)
+    _add_hidden_layer_summary(logits, logits_scope.name)
+
+    def _train_op_fn(loss):
+      """Returns the op to optimize the loss."""
+      return optimizer.minimize(
+          loss,
+          global_step=training_util.get_global_step())
+
+    return head.create_estimator_spec(
+        features=features,
+        mode=mode,
+        labels=labels,
+        train_op_fn=_train_op_fn,
+        logits=logits)
+
+
+class DNNRegressor(estimator.Estimator):
+  """A regressor for TensorFlow DNN models.
+
+  Example:
+
+  ```python
+  sparse_feature_a = sparse_column_with_hash_bucket(...)
+  sparse_feature_b = sparse_column_with_hash_bucket(...)
+
+  sparse_feature_a_emb = embedding_column(sparse_id_column=sparse_feature_a,
+                                          ...)
+  sparse_feature_b_emb = embedding_column(sparse_id_column=sparse_feature_b,
+                                          ...)
+
+  estimator = DNNRegressor(
+      feature_columns=[sparse_feature_a, sparse_feature_b],
+      hidden_units=[1024, 512, 256])
+
+  # Or estimator using the ProximalAdagradOptimizer optimizer with
+  # regularization.
+  estimator = DNNRegressor(
+      feature_columns=[sparse_feature_a, sparse_feature_b],
+      hidden_units=[1024, 512, 256],
+      optimizer=tf.train.ProximalAdagradOptimizer(
+        learning_rate=0.1,
+        l1_regularization_strength=0.001
+      ))
+
+  # Input builders
+  def input_fn_train: # returns x, y
+    pass
+  estimator.train(input_fn=input_fn_train)
+
+  def input_fn_eval: # returns x, y
+    pass
+  estimator.evaluate(input_fn=input_fn_eval)
+  def input_fn_predict: # returns x, None
+    pass
+  estimator.predict_scores(input_fn=input_fn_predict)
+  ```
+
+  Input of `train` and `evaluate` should have following features,
+    otherwise there will be a `KeyError`:
+
+  * if `weight_feature_key` is not `None`, a feature with
+    `key=weight_feature_key` whose value is a `Tensor`.
+  * for each `column` in `feature_columns`:
+    - if `column` is a `SparseColumn`, a feature with `key=column.name`
+      whose `value` is a `SparseTensor`.
+    - if `column` is a `WeightedSparseColumn`, two features: the first with
+      `key` the id column name, the second with `key` the weight column name.
+      Both features' `value` must be a `SparseTensor`.
+    - if `column` is a `RealValuedColumn`, a feature with `key=column.name`
+      whose `value` is a `Tensor`.
+  """
+
+  def __init__(self,
+               hidden_units,
+               feature_columns,
+               model_dir=None,
+               label_dimension=1,
+               weight_feature_key=None,
+               optimizer='Adagrad',
+               activation_fn=nn.relu,
+               dropout=None,
+               input_layer_partitioner=None,
+               config=None):
+    """Initializes a `DNNRegressor` instance.
+
+    Args:
+      hidden_units: Iterable of number hidden units per layer. All layers are
+        fully connected. Ex. `[64, 32]` means first layer has 64 nodes and
+        second one has 32.
+      feature_columns: An iterable containing all the feature columns used by
+        the model. All items in the set should be instances of classes derived
+        from `FeatureColumn`.
+      model_dir: Directory to save model parameters, graph and etc. This can
+        also be used to load checkpoints from the directory into a estimator to
+        continue training a previously saved model.
+      label_dimension: Number of regression targets per example. This is the
+        size of the last dimension of the labels and logits `Tensor` objects
+        (typically, these have shape `[batch_size, label_dimension]`).
+      weight_feature_key: A string defining feature column name representing
+        weights. It is used to down weight or boost examples during training. It
+        will be multiplied by the loss of the example.
+      optimizer: An instance of `tf.Optimizer` used to train the model. If
+        `None`, will use an Adagrad optimizer.
+      activation_fn: Activation function applied to each layer. If `None`, will
+        use `tf.nn.relu`.
+      dropout: When not `None`, the probability we will drop out a given
+        coordinate.
+      input_layer_partitioner: Optional. Partitioner for input layer. Defaults
+        to `min_max_variable_partitioner` with `min_slice_size` 64 << 20.
+      config: `RunConfig` object to configure the runtime settings.
+
+    Returns:
+      A `DNNRegressor` estimator.
+    """
+    def _model_fn(features, labels, mode, config):
+      return _dnn_model_fn(
+          features=features,
+          labels=labels,
+          mode=mode,
+          # pylint: disable=protected-access
+          head=head_lib._regression_head_with_mean_squared_error_loss(
+              label_dimension=label_dimension,
+              weight_feature_key=weight_feature_key),
+          # pylint: enable=protected-access
+          hidden_units=hidden_units,
+          feature_columns=tuple(feature_columns or []),
+          optimizer=optimizer,
+          activation_fn=activation_fn,
+          dropout=dropout,
+          input_layer_partitioner=input_layer_partitioner,
+          config=config)
+    super(DNNRegressor, self).__init__(
+        model_fn=_model_fn, model_dir=model_dir, config=config)
diff --git a/tensorflow/python/estimator/canned/dnn_test.py b/tensorflow/python/estimator/canned/dnn_test.py
new file mode 100644
index 0000000000..4654e97d6e
--- /dev/null
+++ b/tensorflow/python/estimator/canned/dnn_test.py
@@ -0,0 +1,1122 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for dnn.py."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+import shutil
+import tempfile
+
+import numpy as np
+import six
+
+from tensorflow.core.framework import summary_pb2
+from tensorflow.python.client import session as tf_session
+from tensorflow.python.estimator.canned import dnn
+from tensorflow.python.estimator.canned import metric_keys
+from tensorflow.python.estimator.canned import prediction_keys
+from tensorflow.python.estimator.export import export
+from tensorflow.python.estimator.inputs import numpy_io
+from tensorflow.python.feature_column import feature_column
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import nn
+from tensorflow.python.ops import state_ops
+from tensorflow.python.ops import variables as variables_lib
+from tensorflow.python.platform import gfile
+from tensorflow.python.platform import test
+from tensorflow.python.summary import summary as summary_lib
+from tensorflow.python.training import checkpoint_utils
+from tensorflow.python.training import optimizer
+from tensorflow.python.training import saver
+from tensorflow.python.training import session_run_hook
+from tensorflow.python.training import training_util
+
+# Names of variables created by model.
+_LEARNING_RATE_NAME = 'dnn/regression_head/dnn/learning_rate'
+_HIDDEN_WEIGHTS_NAME_PATTERN = 'dnn/hiddenlayer_%d/kernel'
+_HIDDEN_BIASES_NAME_PATTERN = 'dnn/hiddenlayer_%d/bias'
+_LOGITS_WEIGHTS_NAME = 'dnn/logits/kernel'
+_LOGITS_BIASES_NAME = 'dnn/logits/bias'
+
+
+def _create_checkpoint(weights_and_biases, global_step, model_dir):
+  """Create checkpoint file with provided model weights.
+
+  Args:
+    weights_and_biases: Iterable of tuples of weight and bias values.
+    global_step: Initial global step to save in checkpoint.
+    model_dir: Directory into which checkpoint is saved.
+  """
+  weights, biases = zip(*weights_and_biases)
+  model_weights = {}
+
+  # Hidden layer weights.
+  for i in range(0, len(weights) - 1):
+    model_weights[_HIDDEN_WEIGHTS_NAME_PATTERN % i] = weights[i]
+    model_weights[_HIDDEN_BIASES_NAME_PATTERN % i] = biases[i]
+
+  # Output layer weights.
+  model_weights[_LOGITS_WEIGHTS_NAME] = weights[-1]
+  model_weights[_LOGITS_BIASES_NAME] = biases[-1]
+
+  with ops.Graph().as_default():
+    # Create model variables.
+    for k, v in six.iteritems(model_weights):
+      variables_lib.Variable(v, name=k, dtype=dtypes.float32)
+
+    # Create non-model variables.
+    global_step_var = training_util.create_global_step()
+    # TODO(ptucker): We shouldn't have this in the checkpoint for constant LRs.
+    # Learning rate.
+    variables_lib.Variable(.5, name=_LEARNING_RATE_NAME, dtype=dtypes.float32)
+
+    # Initialize vars and save checkpoint.
+    with tf_session.Session() as sess:
+      variables_lib.global_variables_initializer().run()
+      global_step_var.assign(global_step).eval()
+      saver.Saver().save(sess, os.path.join(model_dir, 'model.ckpt'))
+
+
+class DNNRegressorEvaluateTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def test_simple(self):
+    # Create checkpoint: num_inputs=1, hidden_units=(2, 2), num_outputs=1.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.),), (3., 4.)),
+        (((5., 6.), (7., 8.),), (9., 10.)),
+        (((11.,), (12.,),), (13.,))
+    ), global_step, self._model_dir)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('age'),),
+        model_dir=self._model_dir)
+    def _input_fn():
+      return {'age': ((1,),)}, ((10.,),)
+    # TODO(ptucker): Point to tool for calculating a neural net output?
+    # prediction = 1778
+    # loss = (10-1778)^2 = 3125824
+    expected_loss = 3125824
+    self.assertAllClose({
+        metric_keys.MetricKeys.LOSS: expected_loss,
+        metric_keys.MetricKeys.LOSS_MEAN: expected_loss,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=_input_fn, steps=1))
+
+  def test_weighted(self):
+    # Create checkpoint: num_inputs=1, hidden_units=(2, 2), num_outputs=1.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.),), (3., 4.)),
+        (((5., 6.), (7., 8.),), (9., 10.)),
+        (((11.,), (12.,),), (13.,))
+    ), global_step, self._model_dir)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('age'),),
+        model_dir=self._model_dir,
+        weight_feature_key='label_weight')
+    def _input_fn():
+      return {'age': ((1,),), 'label_weight': ((1.5,),)}, ((10.,),)
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # prediction = 1778
+        # loss = 1.5*((10-1778)^2) = 4688736
+        metric_keys.MetricKeys.LOSS: 4688736,
+        # average_loss = loss / 1.5 = 3125824
+        metric_keys.MetricKeys.LOSS_MEAN: 3125824,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=_input_fn, steps=1))
+
+  def test_multi_example(self):
+    # Create initial checkpoint, 1 input, 2x2 hidden dims, 1 outputs.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.),), (3., 4.)),
+        (((5., 6.), (7., 8.),), (9., 10.)),
+        (((11.,), (12.,),), (13.,))
+    ), global_step, self._model_dir)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('age'),),
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        x={'age': np.array(((1,), (2,), (3,)))},
+        y=np.array(((10,), (9,), (8,))),
+        batch_size=3,
+        shuffle=False)
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # predictions = 1778, 2251, 2724
+        # loss = ((10-1778)^2 + (9-2251)^2 + (8-2724)^2) = 15529044
+        metric_keys.MetricKeys.LOSS: 15529044.,
+        # average_loss = loss / 3 = 5176348
+        metric_keys.MetricKeys.LOSS_MEAN: 5176348.,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=input_fn, steps=1))
+
+  def test_multi_batch(self):
+    # Create checkpoint: num_inputs=1, hidden_units=(2, 2), num_outputs=1.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.),), (3., 4.)),
+        (((5., 6.), (7., 8.),), (9., 10.)),
+        (((11.,), (12.,),), (13.,))
+    ), global_step, self._model_dir)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('age'),),
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        x={'age': np.array(((1,), (2,), (3,)))},
+        y=np.array(((10,), (9,), (8,))),
+        batch_size=1,
+        shuffle=False)
+    # TODO(ptucker): Point to tool for calculating a neural net output?
+    # predictions = 1778, 2251, 2724
+    # loss = ((10-1778)^2 + (9-2251)^2 + (8-2724)^2) / 3 = 5176348
+    expected_loss = 5176348.
+    self.assertAllClose({
+        metric_keys.MetricKeys.LOSS: expected_loss,
+        metric_keys.MetricKeys.LOSS_MEAN: expected_loss,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=input_fn, steps=3))
+
+  def test_weighted_multi_example(self):
+    # Create checkpoint: num_inputs=4, hidden_units=(2, 2), num_outputs=3.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.), (3., 4.), (5., 6.), (7., 8.),), (9., 8.)),
+        (((7., 6.), (5., 4.),), (3., 2.)),
+        (((1., 2., 3.), (4., 5., 6.),), (7., 8., 9.)),
+    ), global_step, self._model_dir)
+
+    # Create batched input.
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            # Dimensions are (batch_size, feature_column.dimension).
+            'x': np.array((
+                (15., 0., 1.5, 135.2),
+                (45., 45000., 1.8, 158.8),
+                (21., 33000., 1.7, 207.1),
+                (60., 10000., 1.6, 90.2)
+            )),
+            # TODO(ptucker): Add test for different weight shapes when we fix
+            # head._compute_weighted_loss (currently it requires weights to be
+            # same shape as labels & logits).
+            'label_weight': np.array((
+                (1., 1., 0.),
+                (.5, 1., .1),
+                (.5, 0., .9),
+                (0., 0., 0.),
+            ))
+        },
+        # Label shapes is (batch_size, num_outputs).
+        y=np.array((
+            (5., 2., 2.),
+            (-2., 1., -4.),
+            (-1., -1., -1.),
+            (-4., 3., 9.),
+        )),
+        batch_size=4,
+        shuffle=False)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(
+            # Dimension is number of inputs.
+            feature_column.numeric_column(
+                'x', dtype=dtypes.int32, shape=(4,)),
+        ),
+        model_dir=self._model_dir,
+        label_dimension=3,
+        weight_feature_key='label_weight')
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # predictions = [
+        #   [  54033.5    76909.6    99785.7]
+        #   [8030393.8 11433082.4 14835771.0]
+        #   [5923209.2  8433014.8 10942820.4]
+        #   [1810021.6  2576969.6  3343917.6]
+        # ]
+        # loss = sum(label_weights*(labels-predictions)^2) = 3.10290850204e+14
+        metric_keys.MetricKeys.LOSS: 3.10290850204e+14,
+        # average_loss = loss / sum(label_weights) = 3.10290850204e+14 / 5.
+        #              = 6.205817e+13
+        metric_keys.MetricKeys.LOSS_MEAN: 6.205817e+13,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=input_fn, steps=1))
+
+  def test_weighted_multi_example_multi_column(self):
+    # Create checkpoint: num_inputs=4, hidden_units=(2, 2), num_outputs=3.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.), (3., 4.), (5., 6.), (7., 8.),), (9., 8.)),
+        (((7., 6.), (5., 4.),), (3., 2.)),
+        (((1., 2., 3.), (4., 5., 6.),), (7., 8., 9.)),
+    ), global_step, self._model_dir)
+
+    # Create batched input.
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            # Dimensions are (batch_size, feature_column.dimension).
+            'x': np.array((
+                (15., 0.),
+                (45., 45000.),
+                (21., 33000.),
+                (60., 10000.)
+            )),
+            'y': np.array((
+                (1.5, 135.2),
+                (1.8, 158.8),
+                (1.7, 207.1),
+                (1.6, 90.2)
+            )),
+            # TODO(ptucker): Add test for different weight shapes when we fix
+            # head._compute_weighted_loss (currently it requires weights to be
+            # same shape as labels & logits).
+            'label_weight': np.array((
+                (1., 1., 0.),
+                (.5, 1., .1),
+                (.5, 0., .9),
+                (0., 0., 0.),
+            ))
+        },
+        # Label shapes is (batch_size, num_outputs).
+        y=np.array((
+            (5., 2., 2.),
+            (-2., 1., -4.),
+            (-1., -1., -1.),
+            (-4., 3., 9.),
+        )),
+        batch_size=4,
+        shuffle=False)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(
+            # Dimensions add up to 4 (number of inputs).
+            feature_column.numeric_column(
+                'x', dtype=dtypes.int32, shape=(2,)),
+            feature_column.numeric_column(
+                'y', dtype=dtypes.float32, shape=(2,)),
+        ),
+        model_dir=self._model_dir,
+        label_dimension=3,
+        weight_feature_key='label_weight')
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # predictions = [
+        #   [  54033.5    76909.6    99785.7]
+        #   [8030393.8 11433082.4 14835771.0]
+        #   [5923209.2  8433014.8 10942820.4]
+        #   [1810021.6  2576969.6  3343917.6]
+        # ]
+        # loss = sum(label_weights*(labels-predictions)^2) = 3.10290850204e+14
+        metric_keys.MetricKeys.LOSS: 3.10290850204e+14,
+        # average_loss = loss / sum(label_weights) = 3.10290850204e+14 / 5.
+        #              = 6.205817e+13
+        metric_keys.MetricKeys.LOSS_MEAN: 6.205817e+13,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=input_fn, steps=1))
+
+  def test_weighted_multi_batch(self):
+    # Create checkpoint: num_inputs=4, hidden_units=(2, 2), num_outputs=3.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.), (3., 4.), (5., 6.), (7., 8.),), (9., 8.)),
+        (((7., 6.), (5., 4.),), (3., 2.)),
+        (((1., 2., 3.), (4., 5., 6.),), (7., 8., 9.)),
+    ), global_step, self._model_dir)
+
+    # Create batched input.
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            # Dimensions are (batch_size, feature_column.dimension).
+            'x': np.array((
+                (15., 0., 1.5, 135.2),
+                (45., 45000., 1.8, 158.8),
+                (21., 33000., 1.7, 207.1),
+                (60., 10000., 1.6, 90.2)
+            )),
+            # TODO(ptucker): Add test for different weight shapes when we fix
+            # head._compute_weighted_loss (currently it requires weights to be
+            # same shape as labels & logits).
+            'label_weights': np.array((
+                (1., 1., 0.),
+                (.5, 1., .1),
+                (.5, 0., .9),
+                (0., 0., 0.),
+            ))
+        },
+        # Label shapes is (batch_size, num_outputs).
+        y=np.array((
+            (5., 2., 2.),
+            (-2., 1., -4.),
+            (-1., -1., -1.),
+            (-4., 3., 9.),
+        )),
+        batch_size=1,
+        shuffle=False)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(
+            # Dimension is number of inputs.
+            feature_column.numeric_column(
+                'x', dtype=dtypes.int32, shape=(4,)),
+        ),
+        model_dir=self._model_dir,
+        label_dimension=3,
+        weight_feature_key='label_weights')
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # predictions = [
+        #   [  54033.5    76909.6    99785.7]
+        #   [8030393.8 11433082.4 14835771.0]
+        #   [5923209.2  8433014.8 10942820.4]
+        #   [1810021.6  2576969.6  3343917.6]
+        # ]
+        # losses = label_weights*(labels-predictions)^2 = [
+        #  [  2.91907881e+09   5.91477894e+09                0]
+        #  [  3.22436284e+13   1.30715350e+14   2.20100220e+13]
+        #  [  1.75422095e+13                0   1.07770806e+14]
+        #  [               0                0                0]
+        # ]
+        # total_loss = sum(losses) = 3.10290850204e+14
+        # loss = total_loss / 4 = 7.7572712551e+13
+        metric_keys.MetricKeys.LOSS: 7.7572712551e+13,
+        # average_loss = total_loss / sum(label_weights) = 6.20581700408e+13
+        metric_keys.MetricKeys.LOSS_MEAN: 6.20581700408e+13,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=input_fn, steps=4))
+
+  def test_multi_dim(self):
+    # Create checkpoint: num_inputs=3, hidden_units=(2, 2), num_outputs=2.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.), (3., 4.), (5., 6.),), (7., 8.)),
+        (((9., 8.), (7., 6.),), (5., 4.)),
+        (((3., 2.), (1., 2.),), (3., 4.)),
+    ), global_step, self._model_dir)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('x', shape=(3,)),),
+        label_dimension=2,
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        x={'x': np.array(((2., 4., 5.),))},
+        y=np.array(((46., 58.),)),
+        batch_size=1,
+        shuffle=False)
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # predictions = 3198, 3094
+        # loss = ((46-3198)^2 + (58-3094)^2) = 19152400
+        metric_keys.MetricKeys.LOSS: 19152400,
+        # average_loss = loss / 2 = 9576200
+        metric_keys.MetricKeys.LOSS_MEAN: 9576200,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=input_fn, steps=1))
+
+  def test_multi_feature_column(self):
+    # Create checkpoint: num_inputs=2, hidden_units=(2, 2), num_outputs=1.
+    global_step = 100
+    _create_checkpoint((
+        (((1., 2.), (3., 4.),), (5., 6.)),
+        (((7., 8.), (9., 8.),), (7., 6.)),
+        (((5.,), (4.,),), (3.,))
+    ), global_step, self._model_dir)
+
+    # Create DNNRegressor and evaluate.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('age'),
+                         feature_column.numeric_column('height')),
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        x={'age': np.array(((20,), (40,))), 'height': np.array(((4,), (8,)))},
+        y=np.array(((213.,), (421.,))),
+        batch_size=2,
+        shuffle=False)
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # predictions = 7315, 13771
+        # loss = ((213-7315)^2 + (421-13771)^2) / 2 = 228660896
+        metric_keys.MetricKeys.LOSS: 228660896.,
+        # average_loss = loss / 2 = 114330452
+        metric_keys.MetricKeys.LOSS_MEAN: 114330452.,
+        ops.GraphKeys.GLOBAL_STEP: global_step
+    }, dnn_regressor.evaluate(input_fn=input_fn, steps=1))
+
+
+class DNNRegressorPredictTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def test_1d(self):
+    """Tests predict when all variables are one-dimensional."""
+    # Create checkpoint: num_inputs=1, hidden_units=(2, 2), num_outputs=1.
+    _create_checkpoint((
+        (((1., 2.),), (3., 4.)),
+        (((5., 6.), (7., 8.),), (9., 10.)),
+        (((11.,), (12.,),), (13.,))
+    ), global_step=0, model_dir=self._model_dir)
+
+    # Create DNNRegressor and predict.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('x'),),
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        x={'x': np.array(((1.,),))}, batch_size=1, shuffle=False)
+    # TODO(ptucker): Point to tool for calculating a neural net output?
+    # prediction = 1778
+    self.assertAllClose({
+        prediction_keys.PredictionKeys.PREDICTIONS: (1778.,)
+    }, next(dnn_regressor.predict(input_fn=input_fn)))
+
+  def test_multi_dim(self):
+    """Tests predict when all variables are multi-dimenstional."""
+    # Create checkpoint: num_inputs=4, hidden_units=(2, 2), num_outputs=3.
+    _create_checkpoint((
+        (((1., 2.), (3., 4.), (5., 6.), (7., 8.),), (9., 8.)),
+        (((7., 6.), (5., 4.),), (3., 2.)),
+        (((1., 2., 3.), (4., 5., 6.),), (7., 8., 9.)),
+    ), 100, self._model_dir)
+
+    # Create DNNRegressor and predict.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('x', shape=(4,)),),
+        label_dimension=3,
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        # Inputs shape is (batch_size, num_inputs).
+        x={'x': np.array(((1., 2., 3., 4.), (5., 6., 7., 8.)))},
+        batch_size=2,
+        shuffle=False)
+    # Output shape=(batch_size, num_outputs).
+    self.assertAllClose((
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        (3275., 4660., 6045.),
+        (6939., 9876., 12813.)
+    ), tuple([
+        x[prediction_keys.PredictionKeys.PREDICTIONS]
+        for x in dnn_regressor.predict(input_fn=input_fn)
+    ]), rtol=1e-04)
+
+  def test_two_feature_columns(self):
+    """Tests predict with two feature columns."""
+    # Create checkpoint: num_inputs=2, hidden_units=(2, 2), num_outputs=1.
+    _create_checkpoint((
+        (((1., 2.), (3., 4.),), (5., 6.)),
+        (((7., 8.), (9., 8.),), (7., 6.)),
+        (((5.,), (4.,),), (3.,))
+    ), 100, self._model_dir)
+
+    # Create DNNRegressor and predict.
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=(feature_column.numeric_column('x'),
+                         feature_column.numeric_column('y')),
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        x={'x': np.array((20.,)), 'y': np.array((4.,))},
+        batch_size=1,
+        shuffle=False)
+    self.assertAllClose({
+        # TODO(ptucker): Point to tool for calculating a neural net output?
+        # predictions = 7315
+        prediction_keys.PredictionKeys.PREDICTIONS: (7315,)
+    }, next(dnn_regressor.predict(input_fn=input_fn)))
+
+
+class DNNRegressorIntegrationTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def test_complete_flow(self):
+    label_dimension = 2
+    batch_size = 10
+    feature_columns = [feature_column.numeric_column('x', shape=(2,))]
+    est = dnn.DNNRegressor(
+        hidden_units=(2, 2),
+        feature_columns=feature_columns,
+        label_dimension=label_dimension,
+        model_dir=self._model_dir)
+    data = np.linspace(0., 2., batch_size * label_dimension, dtype=np.float32)
+    data = data.reshape(batch_size, label_dimension)
+
+    # TRAIN
+    # learn y = x
+    train_input_fn = numpy_io.numpy_input_fn(
+        x={'x': data},
+        y=data,
+        batch_size=batch_size,
+        num_epochs=None,
+        shuffle=True)
+    num_steps = 200
+    est.train(train_input_fn, steps=num_steps)
+
+    # EVALUTE
+    eval_input_fn = numpy_io.numpy_input_fn(
+        x={'x': data},
+        y=data,
+        batch_size=batch_size,
+        shuffle=False)
+    scores = est.evaluate(eval_input_fn)
+    self.assertEqual(num_steps, scores[ops.GraphKeys.GLOBAL_STEP])
+    self.assertIn('loss', six.iterkeys(scores))
+
+    # PREDICT
+    predict_input_fn = numpy_io.numpy_input_fn(
+        x={'x': data},
+        batch_size=batch_size,
+        shuffle=False)
+    predictions = np.array([
+        x[prediction_keys.PredictionKeys.PREDICTIONS]
+        for x in est.predict(predict_input_fn)
+    ])
+    self.assertAllEqual((batch_size, label_dimension), predictions.shape)
+    # TODO(ptucker): Deterministic test for predicted values?
+
+    # EXPORT
+    feature_spec = feature_column.make_parse_example_spec(feature_columns)
+    serving_input_receiver_fn = export.build_parsing_serving_input_receiver_fn(
+        feature_spec)
+    export_dir = est.export_savedmodel(tempfile.mkdtemp(),
+                                       serving_input_receiver_fn)
+    self.assertTrue(gfile.Exists(export_dir))
+
+
+def _full_var_name(var_name):
+  return '%s/part_0:0' % var_name
+
+
+def _assert_close(expected, actual, rtol=1e-04, name='assert_close'):
+  with ops.name_scope(name, 'assert_close', (expected, actual, rtol)) as scope:
+    expected = ops.convert_to_tensor(expected, name='expected')
+    actual = ops.convert_to_tensor(actual, name='actual')
+    rdiff = math_ops.abs(expected - actual, 'diff') / expected
+    rtol = ops.convert_to_tensor(rtol, name='rtol')
+    return check_ops.assert_less(
+        rdiff,
+        rtol,
+        data=(
+            'Condition expected =~ actual did not hold element-wise:'
+            'expected = ', expected,
+            'actual = ', actual,
+            'rdiff = ', rdiff,
+            'rtol = ', rtol,
+        ),
+        name=scope)
+
+
+class _SummaryHook(session_run_hook.SessionRunHook):
+  """Saves summaries every N steps."""
+
+  def __init__(self):
+    self._summaries = []
+
+  def begin(self):
+    self._summary_op = summary_lib.merge_all()
+
+  def before_run(self, run_context):
+    return session_run_hook.SessionRunArgs({'summary': self._summary_op})
+
+  def after_run(self, run_context, run_values):
+    s = summary_pb2.Summary()
+    s.ParseFromString(run_values.results['summary'])
+    self._summaries.append(s)
+
+  def summaries(self):
+    return tuple(self._summaries)
+
+
+class DNNRegressorTrainTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def _assert_checkpoint(
+      self, global_step, input_units, hidden_units, output_units):
+    """Asserts checkpoint contains expected variables with proper shapes.
+
+    Args:
+      global_step: Expected global step value.
+      input_units: The dimension of input layer.
+      hidden_units: Iterable of integer sizes for the hidden layers.
+      output_units: The dimension of output layer (logits).
+    """
+    shapes = {
+        name: shape
+        for (name, shape) in checkpoint_utils.list_variables(self._model_dir)
+    }
+
+    # Global step.
+    self.assertEqual([], shapes[ops.GraphKeys.GLOBAL_STEP])
+    self.assertEqual(
+        global_step,
+        checkpoint_utils.load_variable(
+            self._model_dir, ops.GraphKeys.GLOBAL_STEP))
+
+    # Hidden layer weights.
+    prev_layer_units = input_units
+    for i in range(len(hidden_units)):
+      layer_units = hidden_units[i]
+      self.assertAllEqual((prev_layer_units, layer_units),
+                          shapes[_HIDDEN_WEIGHTS_NAME_PATTERN % i])
+      self.assertAllEqual((layer_units,),
+                          shapes[_HIDDEN_BIASES_NAME_PATTERN % i])
+      prev_layer_units = layer_units
+
+    # Output layer weights.
+    self.assertAllEqual((prev_layer_units, output_units),
+                        shapes[_LOGITS_WEIGHTS_NAME])
+    self.assertAllEqual((output_units,), shapes[_LOGITS_BIASES_NAME])
+
+  def _mockOptimizer(self, hidden_units, expected_loss=None):
+    hidden_weights_names = [
+        (_HIDDEN_WEIGHTS_NAME_PATTERN + '/part_0:0') % i
+        for i in range(len(hidden_units))]
+    hidden_biases_names = [
+        (_HIDDEN_BIASES_NAME_PATTERN + '/part_0:0') % i
+        for i in range(len(hidden_units))]
+    expected_var_names = (
+        hidden_weights_names + hidden_biases_names +
+        [_LOGITS_WEIGHTS_NAME + '/part_0:0', _LOGITS_BIASES_NAME + '/part_0:0'])
+
+    def _minimize(loss, global_step):
+      trainable_vars = ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
+      self.assertItemsEqual(
+          expected_var_names,
+          [var.name for var in trainable_vars])
+
+      # Verify loss. We can't check the value directly, so we add an assert op.
+      self.assertEquals(0, loss.shape.ndims)
+      if expected_loss is None:
+        return state_ops.assign_add(global_step, 1).op
+      assert_loss = _assert_close(
+          math_ops.to_float(expected_loss, name='expected'), loss,
+          name='assert_loss')
+      with ops.control_dependencies((assert_loss,)):
+        return state_ops.assign_add(global_step, 1).op
+
+    mock_optimizer = test.mock.NonCallableMagicMock(
+        spec=optimizer.Optimizer,
+        wraps=optimizer.Optimizer(use_locking=False, name='my_optimizer'))
+    mock_optimizer.minimize = test.mock.MagicMock(wraps=_minimize)
+
+    return mock_optimizer
+
+  def _assert_simple_summary(self, expected_values, actual_summary):
+    """Assert summary the specified simple values.
+
+    Args:
+      expected_values: Dict of expected tags and simple values.
+      actual_summary: `summary_pb2.Summary`.
+    """
+    self.assertAllClose(expected_values, {
+        v.tag: v.simple_value
+        for v in actual_summary.value if (v.tag in expected_values)
+    })
+
+  def test_from_scratch_with_default_optimizer(self):
+    hidden_units = (2, 2)
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=hidden_units,
+        feature_columns=(feature_column.numeric_column('age'),),
+        model_dir=self._model_dir)
+
+    # Train for a few steps, then validate final checkpoint.
+    num_steps = 5
+    dnn_regressor.train(
+        input_fn=lambda: ({'age': ((1,),)}, ((10,),)), steps=num_steps)
+    self._assert_checkpoint(
+        num_steps, input_units=1, hidden_units=hidden_units, output_units=1)
+
+  def test_from_scratch(self):
+    hidden_units = (2, 2)
+    mock_optimizer = self._mockOptimizer(hidden_units=hidden_units)
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=hidden_units,
+        feature_columns=(feature_column.numeric_column('age'),),
+        optimizer=mock_optimizer,
+        model_dir=self._model_dir)
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Train for a few steps, then validate optimizer, summaries, and
+    # checkpoint.
+    num_steps = 5
+    summary_hook = _SummaryHook()
+    dnn_regressor.train(
+        input_fn=lambda: ({'age': ((1,),)}, ((5.,),)), steps=num_steps,
+        hooks=(summary_hook,))
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    self._assert_checkpoint(
+        num_steps, input_units=1, hidden_units=hidden_units, output_units=1)
+    summaries = summary_hook.summaries()
+    self.assertEqual(num_steps, len(summaries))
+    for summary in summaries:
+      summary_keys = [v.tag for v in summary.value]
+      self.assertIn(metric_keys.MetricKeys.LOSS, summary_keys)
+      self.assertIn(metric_keys.MetricKeys.LOSS_MEAN, summary_keys)
+
+  def test_simple(self):
+    base_global_step = 100
+    hidden_units = (2, 2)
+    _create_checkpoint((
+        (((1., 2.),), (3., 4.)),
+        (((5., 6.), (7., 8.),), (9., 10.)),
+        (((11.,), (12.,),), (13.,))
+    ), base_global_step, self._model_dir)
+
+    # Create DNNRegressor with mock optimizer.
+    # TODO(ptucker): Point to tool for calculating a neural net output?
+    # prediction = 1778
+    # loss = (10-1778)^2 = 3125824
+    expected_loss = 3125824.
+    mock_optimizer = self._mockOptimizer(
+        hidden_units=hidden_units, expected_loss=expected_loss)
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=hidden_units,
+        feature_columns=(feature_column.numeric_column('age'),),
+        optimizer=mock_optimizer,
+        model_dir=self._model_dir)
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Train for a few steps, then validate optimizer, summaries, and
+    # checkpoint.
+    num_steps = 5
+    summary_hook = _SummaryHook()
+    dnn_regressor.train(
+        input_fn=lambda: ({'age': ((1,),)}, ((10.,),)), steps=num_steps,
+        hooks=(summary_hook,))
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    summaries = summary_hook.summaries()
+    self.assertEqual(num_steps, len(summaries))
+    for summary in summaries:
+      self._assert_simple_summary({
+          metric_keys.MetricKeys.LOSS_MEAN: expected_loss,
+          'dnn/dnn/hiddenlayer_0_activation': 0.,
+          'dnn/dnn/hiddenlayer_0_fraction_of_zero_values': 0.,
+          'dnn/dnn/hiddenlayer_1_activation': 0.,
+          'dnn/dnn/hiddenlayer_1_fraction_of_zero_values': 0.,
+          'dnn/dnn/logits_activation': 0.,
+          'dnn/dnn/logits_fraction_of_zero_values': 0.,
+          metric_keys.MetricKeys.LOSS: expected_loss,
+      }, summary)
+    self._assert_checkpoint(
+        base_global_step + num_steps, input_units=1, hidden_units=hidden_units,
+        output_units=1)
+
+  def test_activation_fn(self):
+    base_global_step = 100
+    hidden_units = (2, 2)
+    _create_checkpoint((
+        (((1., 2.),), (3., 4.)),
+        (((5., 6.), (7., 8.),), (9., 10.)),
+        (((11.,), (12.,),), (13.,))
+    ), base_global_step, self._model_dir)
+
+    # Create DNNRegressor with mock optimizer.
+    # TODO(ptucker): Point to tool for calculating a neural net output?
+    # prediction = 36
+    # loss = (10-36)^2 = 676
+    expected_loss = 676.
+    mock_optimizer = self._mockOptimizer(
+        hidden_units=hidden_units, expected_loss=expected_loss)
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=hidden_units,
+        feature_columns=(feature_column.numeric_column('age'),),
+        optimizer=mock_optimizer,
+        model_dir=self._model_dir,
+        activation_fn=nn.tanh)
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Train for a few steps, then validate optimizer, summaries, and
+    # checkpoint.
+    num_steps = 5
+    summary_hook = _SummaryHook()
+    dnn_regressor.train(
+        input_fn=lambda: ({'age': ((1,),)}, ((10.,),)), steps=num_steps,
+        hooks=(summary_hook,))
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    summaries = summary_hook.summaries()
+    self.assertEqual(num_steps, len(summaries))
+    for summary in summaries:
+      self._assert_simple_summary({
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          metric_keys.MetricKeys.LOSS_MEAN: expected_loss,
+          'dnn/dnn/hiddenlayer_0_activation': 0.,
+          'dnn/dnn/hiddenlayer_0_fraction_of_zero_values': 0.,
+          'dnn/dnn/hiddenlayer_1_activation': 0.,
+          'dnn/dnn/hiddenlayer_1_fraction_of_zero_values': 0.,
+          'dnn/dnn/logits_activation': 0.,
+          'dnn/dnn/logits_fraction_of_zero_values': 0.,
+      }, summary)
+    self._assert_checkpoint(
+        base_global_step + num_steps, input_units=1, hidden_units=hidden_units,
+        output_units=1)
+
+  def test_weighted_multi_example_multi_column(self):
+    hidden_units = (2, 2)
+    base_global_step = 100
+    _create_checkpoint((
+        (((1., 2.), (3., 4.), (5., 6.), (7., 8.),), (9., 8.)),
+        (((7., 6.), (5., 4.),), (3., 2.)),
+        (((1., 2., 3.), (4., 5., 6.),), (7., 8., 9.)),
+    ), base_global_step, self._model_dir)
+
+    # Create DNNRegressor with mock optimizer.
+    # TODO(ptucker): Point to tool for calculating a neural net output?
+    # predictions = [
+    #   [  54033.5    76909.6    99785.7]
+    #   [8030393.8 11433082.4 14835771.0]
+    #   [5923209.2  8433014.8 10942820.4]
+    #   [1810021.6  2576969.6  3343917.6]
+    # ]
+    # loss = sum(label_weights*(labels-predictions)^2) = 3.10290850204e+14
+    expected_loss = 3.10290850204e+14
+    mock_optimizer = self._mockOptimizer(
+        hidden_units=hidden_units, expected_loss=expected_loss)
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=hidden_units,
+        feature_columns=(
+            # Dimensions add up to 4 (number of inputs).
+            feature_column.numeric_column(
+                'x', dtype=dtypes.int32, shape=(2,)),
+            feature_column.numeric_column(
+                'y', dtype=dtypes.float32, shape=(2,)),
+        ),
+        optimizer=mock_optimizer,
+        model_dir=self._model_dir,
+        label_dimension=3,
+        weight_feature_key='label_weights')
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Create batched inputs.
+    input_fn = numpy_io.numpy_input_fn(
+        # NOTE: feature columns are concatenated in alphabetic order of keys.
+        x={
+            # Inputs shapes are (batch_size, feature_column.dimension).
+            'x': np.array((
+                (15., 0.),
+                (45., 45000.),
+                (21., 33000.),
+                (60., 10000.)
+            )),
+            'y': np.array((
+                (1.5, 135.2),
+                (1.8, 158.8),
+                (1.7, 207.1),
+                (1.6, 90.2)
+            )),
+            # TODO(ptucker): Add test for different weight shapes when we fix
+            # head._compute_weighted_loss (currently it requires weights to be
+            # same shape as labels & logits).
+            'label_weights': np.array((
+                (1., 1., 0.),
+                (.5, 1., .1),
+                (.5, 0., .9),
+                (0., 0., 0.),
+            ))
+        },
+        # Labels shapes is (batch_size, num_outputs).
+        y=np.array((
+            (5., 2., 2.),
+            (-2., 1., -4.),
+            (-1., -1., -1.),
+            (-4., 3., 9.),
+        )),
+        batch_size=4,
+        num_epochs=None,
+        shuffle=False)
+
+    # Train for 1 step, then validate optimizer, summaries, and checkpoint.
+    summary_hook = _SummaryHook()
+    dnn_regressor.train(input_fn=input_fn, steps=1, hooks=(summary_hook,))
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    summaries = summary_hook.summaries()
+    self.assertEqual(1, len(summaries))
+    self._assert_simple_summary({
+        metric_keys.MetricKeys.LOSS: expected_loss,
+        # average_loss = loss / sum(label_weights) = 3.10290850204e+14 / 5.
+        #              = 6.205817e+13
+        metric_keys.MetricKeys.LOSS_MEAN: 6.205817e+13,
+        'dnn/dnn/hiddenlayer_0_activation': 0.,
+        'dnn/dnn/hiddenlayer_0_fraction_of_zero_values': 0.,
+        'dnn/dnn/hiddenlayer_1_activation': 0.,
+        'dnn/dnn/hiddenlayer_1_fraction_of_zero_values': 0.,
+        'dnn/dnn/logits_activation': 0.,
+        'dnn/dnn/logits_fraction_of_zero_values': 0.,
+    }, summaries[0])
+    self._assert_checkpoint(
+        base_global_step + 1,
+        input_units=4,  # Sum of feature column dimensions.
+        hidden_units=hidden_units,
+        output_units=3)  # = label_dimension
+
+    # Train for 3 steps - we should still get the same loss since we're not
+    # updating weights.
+    dnn_regressor.train(input_fn=input_fn, steps=3)
+    self.assertEqual(2, mock_optimizer.minimize.call_count)
+    self._assert_checkpoint(
+        base_global_step + 4,
+        input_units=4,  # Sum of feature column dimensions.
+        hidden_units=hidden_units,
+        output_units=3)  # = label_dimension
+
+  def test_weighted_multi_batch(self):
+    hidden_units = (2, 2)
+    base_global_step = 100
+    _create_checkpoint((
+        (((1., 2.), (3., 4.), (5., 6.), (7., 8.),), (9., 8.)),
+        (((7., 6.), (5., 4.),), (3., 2.)),
+        (((1., 2., 3.), (4., 5., 6.),), (7., 8., 9.)),
+    ), base_global_step, self._model_dir)
+
+    mock_optimizer = self._mockOptimizer(hidden_units=hidden_units)
+    dnn_regressor = dnn.DNNRegressor(
+        hidden_units=hidden_units,
+        feature_columns=(
+            # Dimension is number of inputs.
+            feature_column.numeric_column(
+                'x', dtype=dtypes.int32, shape=(4,)),
+        ),
+        optimizer=mock_optimizer,
+        model_dir=self._model_dir,
+        label_dimension=3,
+        weight_feature_key='label_weights')
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Create batched input.
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            # Inputs shape is (batch_size, feature_column.dimension).
+            'x': np.array((
+                (15., 0., 1.5, 135.2),
+                (45., 45000., 1.8, 158.8),
+                (21., 33000., 1.7, 207.1),
+                (60., 10000., 1.6, 90.2)
+            )),
+            # TODO(ptucker): Add test for different weight shapes when we fix
+            # head._compute_weighted_loss (currently it requires weights to be
+            # same shape as labels & logits).
+            'label_weights': np.array((
+                (1., 1., 0.),
+                (.5, 1., .1),
+                (.5, 0., .9),
+                (0., 0., 0.),
+            ))
+        },
+        # Labels shapes is (batch_size, num_outputs).
+        y=np.array((
+            (5., 2., 2.),
+            (-2., 1., -4.),
+            (-1., -1., -1.),
+            (-4., 3., 9.),
+        )),
+        batch_size=1,
+        shuffle=False)
+
+    # Train for 1 step, then validate optimizer, summaries, and checkpoint.
+    num_steps = 4
+    summary_hook = _SummaryHook()
+    dnn_regressor.train(
+        input_fn=input_fn, steps=num_steps, hooks=(summary_hook,))
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    summaries = summary_hook.summaries()
+    self.assertEqual(num_steps, len(summaries))
+    # TODO(ptucker): Point to tool for calculating a neural net output?
+    # predictions = [
+    #   [  54033.5    76909.6    99785.7]
+    #   [8030393.8 11433082.4 14835771.0]
+    #   [5923209.2  8433014.8 10942820.4]
+    #   [1810021.6  2576969.6  3343917.6]
+    # ]
+    # losses = label_weights*(labels-predictions)^2 = [
+    #   [2.91907881e+09 5.91477894e+09              0]
+    #   [3.22436284e+13 1.30715350e+14 2.20100220e+13]
+    #   [1.75422095e+13              0 1.07770806e+14]
+    #   [             0              0              0]
+    # ]
+    # step_losses = [sum(losses[i]) for i in 0...3]
+    #             = [8833857750, 1.84969e+14, 1.2531302e+14, 0]
+    expected_step_losses = (8833857750, 1.84969e+14, 1.2531302e+14, 0)
+    # step_average_losses = [
+    #     step_losses[i] / sum(label_weights[i]) for i in 0...3
+    # ] = [4416928875, 1.1560563e+14, 8.95093e+13, 0]
+    expected_step_average_losses = (4416928875, 1.1560563e+14, 8.95093e+13, 0)
+    for i in range(len(summaries)):
+      self._assert_simple_summary({
+          metric_keys.MetricKeys.LOSS: expected_step_losses[i],
+          metric_keys.MetricKeys.LOSS_MEAN: expected_step_average_losses[i],
+          'dnn/dnn/hiddenlayer_0_activation': 0.,
+          'dnn/dnn/hiddenlayer_0_fraction_of_zero_values': 0.,
+          'dnn/dnn/hiddenlayer_1_activation': 0.,
+          'dnn/dnn/hiddenlayer_1_fraction_of_zero_values': 0.,
+          'dnn/dnn/logits_activation': 0.,
+          'dnn/dnn/logits_fraction_of_zero_values': 0.,
+      }, summaries[i])
+    self._assert_checkpoint(
+        base_global_step + num_steps,
+        input_units=4,  # Sum of feature column dimensions.
+        hidden_units=hidden_units,
+        output_units=3)  # = label_dimension
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/estimator/canned/head.py b/tensorflow/python/estimator/canned/head.py
new file mode 100644
index 0000000000..65142def8f
--- /dev/null
+++ b/tensorflow/python/estimator/canned/head.py
@@ -0,0 +1,669 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Abstractions for the head(s) of a model."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import abc
+
+import six
+
+from tensorflow.python.estimator import model_fn
+from tensorflow.python.estimator.canned import metric_keys
+from tensorflow.python.estimator.canned import prediction_keys
+from tensorflow.python.estimator.export import export_output
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import logging_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import metrics as metrics_lib
+from tensorflow.python.ops import nn
+from tensorflow.python.ops import string_ops
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import weights_broadcast_ops
+from tensorflow.python.ops.losses import losses
+from tensorflow.python.platform import tf_logging as logging
+
+
+class _Head(object):
+  """Interface for the head/top of a model.
+
+  Given logits (or output of a hidden layer), a Head knows how to compute
+  predictions, loss, train_op, metrics and export outputs. It is meant to:
+
+  1. Simplify writing model_fn and to make model_fn more configurable
+  2. Support wide range of machine learning models. Since most heads can work
+     with logits, they can support DNN, RNN, Wide, Wide&Deep,
+     Global objectives, Gradient boosted trees and many other types
+     of machine learning models.
+
+  Common usage:
+  Here is simplified model_fn to build a DNN regression model.
+    ```python
+    def _my_dnn_model_fn(features, labels, mode, params, config=None):
+      # Optionally your callers can pass head to model_fn as a param.
+      head = tf.contrib.learn.regression_head(...)
+      input = tf.contrib.layers.input_from_feature_columns(features, ...)
+      last_hidden_layer_out = tf.contrib.layers.stack(
+          input, tf.contrib.layers.fully_connected, [1000, 500])
+      logits = tf.contrib.layers.fully_connected(
+          last_hidden_layer_out, head.logits_dimension, activation_fn=None)
+
+      def _train_op_fn(loss):
+        return optimizer.minimize(loss)
+
+      return head.create_estimator_spec(
+          features=features,
+          labels=labels,
+          mode=mode,
+          logits=logits,
+          train_op_fn=_train_op_fn)
+    ```
+
+  There are cases where computing and applying gradients can not be meaningfully
+  captured with train_op_fn we support (for example, with sync optimizer). In
+  such case, you can take the responsibility on your own. Here is a common
+  use case,
+    ```python
+    estimator_spec = head.create_estimator_spec(
+        features=features,
+        labels=labels,
+        mode=mode,
+        logits=logits,
+        train_op_fn=tf.contrib.learn.no_op_train_fn)
+    if mode == model_fn.ModeKeys.TRAIN:
+      optimizer = ...
+      sync = tf.train.SyncReplicasOptimizer(opt=optimizer, ...)
+      update_op = tf.contrib.layers.optimize_loss(optimizer=sync,
+                                                  loss=estimator_spec.loss, ...)
+      hooks = [sync.make_session_run_hook(is_chief)]
+      ... upate train_op and hooks in EstimatorSpec and return
+    ```
+  """
+  __metaclass__ = abc.ABCMeta
+
+  @abc.abstractproperty
+  def logits_dimension(self):
+    """Size of the last dimension of the logits `Tensor`.
+
+    Typically, logits is of shape `[batch_size, logits_dimension]`.
+
+    Returns:
+      The expected size of the `logits` tensor.
+    """
+    raise NotImplementedError('Calling an abstract method.')
+
+  @abc.abstractmethod
+  def create_estimator_spec(
+      self, features, mode, logits, labels=None, train_op_fn=None):
+    """Returns `EstimatorSpec` that a model_fn can return.
+
+    Please note that,
+    + Exactly one of `logits` and `logits_input` must be provided.
+    + All args must be passed via name.
+
+    Args:
+      features: Input `dict` of `Tensor` objects.
+      mode: Estimator's `ModeKeys`.
+      logits: logits `Tensor` to be used by the head.
+      labels: Labels `Tensor`, or `dict` of same.
+      train_op_fn: Function that takes a scalar loss `Tensor` and returns an op
+          to optimize the model with the loss. This is used in TRAIN mode and
+          must not be None. None is allowed in other modes. If you want to
+          optimize loss yourself you can pass `no_op_train_fn` and then use
+          EstimatorSpec.loss to compute and apply gradients.
+
+    Returns:
+      `EstimatorSpec`.
+    """
+    raise NotImplementedError('Calling an abstract method.')
+
+
+def _check_labels(labels, expected_labels_dimension):
+  """Check labels type and shape."""
+  with ops.name_scope(None, 'labels', (labels,)) as scope:
+    labels = sparse_tensor.convert_to_tensor_or_sparse_tensor(labels)
+    if isinstance(labels, sparse_tensor.SparseTensor):
+      raise ValueError('SparseTensor labels are not supported.')
+    labels_shape = array_ops.shape(labels)
+    err_msg = 'labels shape must be [batch_size, {}]'.format(
+        expected_labels_dimension)
+    assert_rank = check_ops.assert_rank(labels, 2, message=err_msg)
+    with ops.control_dependencies([assert_rank]):
+      static_shape = labels.shape
+      if static_shape is not None:
+        dim1 = static_shape[1]
+        if (dim1 is not None) and (dim1 != expected_labels_dimension):
+          raise ValueError(
+              'labels shape must be [batch_size, labels_dimension], got %s.' %
+              (static_shape,))
+      assert_dimension = check_ops.assert_equal(
+          expected_labels_dimension, labels_shape[1], message=err_msg)
+      with ops.control_dependencies([assert_dimension]):
+        return array_ops.identity(labels, name=scope)
+
+
+def _check_logits(logits, expected_logits_dimension):
+  """Check logits type and shape."""
+  with ops.name_scope(None, 'logits', (logits,)) as scope:
+    logits = math_ops.to_float(logits)
+    logits_shape = array_ops.shape(logits)
+    assert_rank = check_ops.assert_rank(
+        logits, 2, data=[logits_shape],
+        message='logits shape must be [batch_size, logits_dimension]')
+    with ops.control_dependencies([assert_rank]):
+      static_shape = logits.shape
+      if static_shape is not None:
+        dim1 = static_shape[1]
+        if (dim1 is not None) and (dim1 != expected_logits_dimension):
+          raise ValueError(
+              'logits shape must be [batch_size, logits_dimension], got %s.' %
+              (static_shape,))
+      assert_dimension = check_ops.assert_equal(
+          expected_logits_dimension, logits_shape[1], data=[logits_shape],
+          message='logits shape must be [batch_size, logits_dimension]')
+      with ops.control_dependencies([assert_dimension]):
+        return array_ops.identity(logits, name=scope)
+
+
+def _indicator_labels_mean(labels, weights=None, name=None):
+  with ops.name_scope(name, 'labels_mean', (labels, weights)) as scope:
+    labels = math_ops.to_float(labels, name='labels')
+    if weights is not None:
+      weights = weights_broadcast_ops.broadcast_weights(weights, labels)
+    return metrics_lib.mean(labels, weights=weights, name=scope)
+
+
+def _accuracy_baseline(labels_mean):
+  """Return accuracy baseline based on labels mean.
+
+  This is the best the model could do by always predicting one class.
+
+  Args:
+    labels_mean: Tuple of value and update op.
+
+  Returns:
+    Tuple of value and update op.
+  """
+  with ops.name_scope(None, 'accuracy_baseline', labels_mean):
+    value, update_op = labels_mean
+    return (
+        math_ops.maximum(value, 1. - value, name='value'),
+        math_ops.maximum(update_op, 1 - update_op, name='update_op'))
+
+
+def _predictions_mean(predictions, weights=None, name=None):
+  with ops.name_scope(
+      name, 'predictions_mean', (predictions, weights)) as scope:
+    predictions = math_ops.to_float(predictions, name='predictions')
+    if weights is not None:
+      weights = weights_broadcast_ops.broadcast_weights(weights, predictions)
+    return metrics_lib.mean(predictions, weights=weights, name=scope)
+
+
+def _auc(labels, predictions, weights=None, curve='ROC', name=None):
+  with ops.name_scope(name, 'auc', (predictions, labels, weights)) as scope:
+    predictions = math_ops.to_float(predictions, name='predictions')
+    if labels.dtype.base_dtype != dtypes.bool:
+      logging.warning('Casting %s labels to bool.', labels.dtype)
+      labels = math_ops.cast(labels, dtypes.bool)
+    if weights is not None:
+      weights = weights_broadcast_ops.broadcast_weights(weights, predictions)
+    return metrics_lib.auc(
+        labels=labels, predictions=predictions, weights=weights, curve=curve,
+        name=scope)
+
+
+def _accuracy_at_threshold(labels, predictions, weights, threshold, name=None):
+  with ops.name_scope(
+      name, 'accuracy_at_%s' % threshold,
+      (predictions, labels, weights, threshold)) as scope:
+    threshold_predictions = math_ops.to_float(
+        math_ops.greater_equal(predictions, threshold))
+    return metrics_lib.accuracy(
+        labels=labels, predictions=threshold_predictions, weights=weights,
+        name=scope)
+
+
+def _precision_at_threshold(labels, predictions, weights, threshold, name=None):
+  with ops.name_scope(
+      name, 'precision_at_%s' % threshold,
+      (predictions, labels, weights, threshold)) as scope:
+    precision_tensor, update_op = metrics_lib.precision_at_thresholds(
+        labels=labels, predictions=predictions, thresholds=(threshold,),
+        weights=weights, name=scope)
+    return array_ops.squeeze(precision_tensor), array_ops.squeeze(update_op)
+
+
+def _recall_at_threshold(labels, predictions, weights, threshold, name=None):
+  with ops.name_scope(
+      name, 'recall_at_%s' % threshold,
+      (predictions, labels, weights, threshold)) as scope:
+    precision_tensor, update_op = metrics_lib.recall_at_thresholds(
+        labels=labels, predictions=predictions, thresholds=(threshold,),
+        weights=weights, name=scope)
+    return array_ops.squeeze(precision_tensor), array_ops.squeeze(update_op)
+
+
+# TODO(xiejw): Add class ids for eval metrics?
+def _multi_class_head_with_softmax_cross_entropy_loss(
+    n_classes, weight_column_name=None):
+  """Creates a '_Head' for multi class classification.
+
+  This head expects to be fed integer labels specifying the class index.
+
+  Args:
+    n_classes: Number of classes, must be greater than 2 (for 2 classes, use
+      `_BinaryLogisticHeadWithSigmoidCrossEntropyLoss`).
+    weight_column_name: A string defining feature column name representing
+      weights. It is used to down weight or boost examples during training. It
+      will be multiplied by the loss of the example.
+
+  Returns:
+    An instance of `_Head` for  multi class classification.
+
+  Raises:
+    ValueError: if `n_classes`, `metric_class_ids` or `label_keys` is invalid.
+  """
+  return _MultiClassHeadWithSoftmaxCrossEntropyLoss(
+      n_classes, weight_column_name)
+
+
+class _MultiClassHeadWithSoftmaxCrossEntropyLoss(_Head):
+  """See `_multi_class_head_with_softmax_cross_entropy_loss`."""
+
+  def __init__(self, n_classes, weight_column_name=None):
+    if (n_classes is None) or (n_classes <= 2):
+      raise ValueError('n_classes must be > 2: %s.' % n_classes)
+    self._n_classes = n_classes
+    self._weight_column_name = weight_column_name
+
+  @property
+  def logits_dimension(self):
+    return self._n_classes
+
+  def _eval_metric_ops(self, labels, probabilities, logits,
+                       class_ids, weights, unweighted_loss):
+    """Returns the Eval metric ops."""
+    with ops.name_scope(
+        None, 'metrics',
+        (labels, probabilities, logits, class_ids, weights, unweighted_loss)):
+      keys = metric_keys.MetricKeys
+      metric_ops = {
+          # Estimator already adds a metric for loss.
+          # TODO(xiejw): Any other metrics?
+          keys.LOSS_MEAN: metrics_lib.mean(
+              unweighted_loss, weights=weights, name=keys.LOSS_MEAN),
+          keys.ACCURACY: metrics_lib.accuracy(
+              labels=labels, predictions=class_ids, weights=weights,
+              name=keys.ACCURACY),
+      }
+    return metric_ops
+
+  def create_estimator_spec(
+      self, features, mode, logits, labels=None, train_op_fn=None):
+    """See `Head`."""
+    with variable_scope.variable_scope(
+        None,
+        default_name='multi_class_head',
+        values=(tuple(six.itervalues(features)) + (labels, logits))):
+      logits = _check_logits(logits, self.logits_dimension)
+
+      # Predict.
+      pred_keys = prediction_keys.PredictionKeys
+      with ops.name_scope(None, 'predictions', (logits,)):
+        # class_ids's shape is [batch_size]
+        class_ids = math_ops.argmax(logits, 1, name=pred_keys.CLASSES)
+        probabilities = nn.softmax(logits, name=pred_keys.PROBABILITIES)
+        predictions = {
+            pred_keys.LOGITS: logits,
+            pred_keys.PROBABILITIES: probabilities,
+            # Expand to [batch_size, 1]
+            pred_keys.CLASSES: array_ops.expand_dims(class_ids, axis=(1,))
+        }
+      if mode == model_fn.ModeKeys.PREDICT:
+        batch_size = array_ops.shape(probabilities)[0]
+        output_classes = array_ops.tile(
+            input=array_ops.expand_dims(input=math_ops.range(self._n_classes),
+                                        axis=0),
+            multiples=[batch_size, 1])
+        return model_fn.EstimatorSpec(
+            mode=model_fn.ModeKeys.PREDICT,
+            predictions=predictions,
+            export_outputs={'': export_output.ClassificationOutput(
+                scores=probabilities,
+                # `ClassificationOutput` requires string classes.
+                # TODO(xiejw): Support label_keys or label_column
+                classes=string_ops.as_string(output_classes,
+                                             name='str_classes'))})
+
+      # Eval.
+      labels = _check_labels(labels, 1)
+      # Check that we got integer for classification.
+      if not labels.dtype.is_integer:
+        raise ValueError('Labels dtype should be integer '
+                         'Instead got %s.' % labels.dtype)
+      assert_less = check_ops.assert_less(
+          labels, ops.convert_to_tensor(self._n_classes, dtype=labels.dtype),
+          message='Label IDs must < n_classes')
+      assert_greater = check_ops.assert_non_negative(
+          labels, message='Label Ids must >= 0')
+      with ops.control_dependencies((assert_less, assert_greater)):
+        labels = array_ops.identity(labels)
+
+      unweighted_loss = losses.sparse_softmax_cross_entropy(
+          labels=labels, logits=logits, reduction=losses.Reduction.NONE)
+      # Restore the squeezed dim, so unweighted_loss matches the weights shape.
+      unweighted_loss = array_ops.expand_dims(unweighted_loss, axis=(1,))
+      weights = (
+          1. if (self._weight_column_name is None) else
+          features[self._weight_column_name])
+      weights = math_ops.to_float(weights, name='weights')
+      training_loss = losses.compute_weighted_loss(
+          unweighted_loss, weights=weights, reduction=losses.Reduction.SUM)
+      if mode == model_fn.ModeKeys.EVAL:
+        return model_fn.EstimatorSpec(
+            mode=model_fn.ModeKeys.EVAL,
+            predictions=predictions,
+            loss=training_loss,
+            eval_metric_ops=self._eval_metric_ops(
+                labels=labels,
+                probabilities=probabilities,
+                logits=logits,
+                class_ids=class_ids,
+                unweighted_loss=unweighted_loss,
+                weights=weights))
+
+      # Train.
+      if train_op_fn is None:
+        raise ValueError('train_op_fn can not be None.')
+      logging_ops.scalar_summary(metric_keys.MetricKeys.LOSS, training_loss)
+      logging_ops.scalar_summary(
+          metric_keys.MetricKeys.LOSS_MEAN,
+          losses.compute_weighted_loss(
+              unweighted_loss, weights=weights,
+              reduction=losses.Reduction.MEAN))
+      return model_fn.EstimatorSpec(
+          mode=model_fn.ModeKeys.TRAIN,
+          predictions=predictions,
+          loss=training_loss,
+          train_op=train_op_fn(training_loss))
+
+
+def _binary_logistic_head_with_sigmoid_cross_entropy_loss(
+    weight_feature_key=None, thresholds=(0.5,)):
+  """Creates a `Head` for single label binary classification.
+
+  This head uses `sigmoid_cross_entropy_with_logits` loss.
+
+  This head expects to be fed float labels of shape `(batch_size, 1)`.
+
+  Args:
+    weight_feature_key: A string defining feature column name representing
+      weights. It is used to down weight or boost examples during training. It
+      will be multiplied by the loss of the example.
+    thresholds: Iterable of floats in the range `(0, 1)`. For binary
+      classification metrics such as precision and recall, an eval metric is
+      generated for each threshold value. This threshold is applied to the
+      logistic values to determine the binary classification (i.e., above the
+      threshold is `true`, below is `false`.
+
+  Returns:
+    An instance of `Head` for binary classification.
+
+  Raises:
+    ValueError: if `thresholds` contains a value outside of `(0, 1)`.
+  """
+  for threshold in thresholds:
+    if (threshold <= 0.0) or (threshold >= 1.0):
+      raise ValueError('thresholds not in (0, 1): %s.' % (thresholds,))
+  return _BinaryLogisticHeadWithSigmoidCrossEntropyLoss(
+      weight_feature_key=weight_feature_key, thresholds=thresholds)
+
+
+class _BinaryLogisticHeadWithSigmoidCrossEntropyLoss(_Head):
+  """See `_binary_logistic_head_with_sigmoid_cross_entropy_loss`."""
+
+  def __init__(self, weight_feature_key=None, thresholds=None):
+    self._weight_feature_key = weight_feature_key
+    self._thresholds = tuple(thresholds)
+
+  @property
+  def logits_dimension(self):
+    return 1
+
+  def _eval_metric_ops(
+      self, labels, logits, logistic, scores, classes, unweighted_loss,
+      weights=None):
+    with ops.name_scope(
+        None, 'metrics',
+        (labels, logits, logistic, scores, classes, unweighted_loss, weights)):
+      keys = metric_keys.MetricKeys
+      labels_mean = _indicator_labels_mean(
+          labels=labels, weights=weights, name=keys.LABEL_MEAN)
+      metric_ops = {
+          # Estimator already adds a metric for loss.
+          keys.LOSS_MEAN: metrics_lib.mean(
+              unweighted_loss, weights=weights, name=keys.LOSS_MEAN),
+          keys.ACCURACY: metrics_lib.accuracy(
+              labels=labels, predictions=classes, weights=weights,
+              name=keys.ACCURACY),
+          keys.PREDICTION_MEAN: _predictions_mean(
+              predictions=logistic, weights=weights, name=keys.PREDICTION_MEAN),
+          keys.LABEL_MEAN: labels_mean,
+          keys.ACCURACY_BASELINE: _accuracy_baseline(labels_mean),
+          keys.AUC: _auc(
+              labels=labels, predictions=logistic, weights=weights,
+              name=keys.AUC),
+          keys.AUC_PR: _auc(
+              labels=labels, predictions=logistic, weights=weights, curve='PR',
+              name=keys.AUC_PR)
+      }
+      for threshold in self._thresholds:
+        accuracy_key = keys.ACCURACY_AT_THRESHOLD % threshold
+        metric_ops[accuracy_key] = _accuracy_at_threshold(
+            labels=labels, predictions=logistic, weights=weights,
+            threshold=threshold, name=accuracy_key)
+        # Precision for positive examples.
+        precision_key = keys.PRECISION_AT_THRESHOLD % threshold
+        metric_ops[precision_key] = _precision_at_threshold(
+            labels=labels, predictions=logistic, weights=weights,
+            threshold=threshold, name=precision_key)
+        # Recall for positive examples.
+        recall_key = keys.RECALL_AT_THRESHOLD % threshold
+        metric_ops[recall_key] = _recall_at_threshold(
+            labels=labels, predictions=logistic, weights=weights,
+            threshold=threshold, name=recall_key)
+      return metric_ops
+
+  def create_estimator_spec(
+      self, features, mode, logits, labels=None, train_op_fn=None):
+    """See `Head`."""
+    with variable_scope.variable_scope(
+        None, default_name='binary_logistic_head',
+        values=(tuple(six.itervalues(features)) + (labels, logits))):
+
+      # Predict.
+      pred_keys = prediction_keys.PredictionKeys
+      logits = _check_logits(logits, self.logits_dimension)
+      logistic = math_ops.sigmoid(logits, name=pred_keys.LOGISTIC)
+      two_class_logits = array_ops.concat(
+          (array_ops.zeros_like(logits), logits), 1, name='two_class_logits')
+      scores = nn.softmax(two_class_logits, name=pred_keys.PROBABILITIES)
+      classes = array_ops.reshape(
+          math_ops.argmax(two_class_logits, axis=1), (-1, 1), name='classes')
+      predictions = {
+          pred_keys.LOGITS: logits,
+          pred_keys.LOGISTIC: logistic,
+          pred_keys.PROBABILITIES: scores,
+          pred_keys.CLASSES: classes
+      }
+      if mode == model_fn.ModeKeys.PREDICT:
+        return model_fn.EstimatorSpec(
+            mode=model_fn.ModeKeys.PREDICT,
+            predictions=predictions,
+            export_outputs={'': export_output.ClassificationOutput(
+                scores=scores,
+                # `ClassificationOutput` requires string classes.
+                # TODO(ptucker): Support label_keys.
+                classes=string_ops.as_string(classes, name='str_classes'))})
+
+      # Eval.
+      labels = _check_labels(math_ops.to_float(labels), self.logits_dimension)
+      unweighted_loss = nn.sigmoid_cross_entropy_with_logits(
+          labels=labels, logits=logits, name='loss')
+      weights = (
+          1. if (self._weight_feature_key is None) else
+          features[self._weight_feature_key])
+      weights = math_ops.to_float(weights, name='weights')
+      training_loss = losses.compute_weighted_loss(
+          unweighted_loss, weights=weights, reduction=losses.Reduction.SUM)
+      if mode == model_fn.ModeKeys.EVAL:
+        return model_fn.EstimatorSpec(
+            mode=model_fn.ModeKeys.EVAL,
+            predictions=predictions,
+            loss=training_loss,
+            eval_metric_ops=self._eval_metric_ops(
+                labels=labels,
+                logits=logits,
+                logistic=logistic,
+                scores=scores,
+                classes=classes,
+                unweighted_loss=unweighted_loss,
+                weights=weights))
+
+      # Train.
+      if train_op_fn is None:
+        raise ValueError('train_op_fn can not be None.')
+      logging_ops.scalar_summary(metric_keys.MetricKeys.LOSS, training_loss)
+      logging_ops.scalar_summary(
+          metric_keys.MetricKeys.LOSS_MEAN,
+          losses.compute_weighted_loss(
+              unweighted_loss, weights=weights,
+              reduction=losses.Reduction.MEAN))
+      return model_fn.EstimatorSpec(
+          mode=model_fn.ModeKeys.TRAIN,
+          predictions=predictions,
+          loss=training_loss,
+          train_op=train_op_fn(training_loss))
+
+
+def _regression_head_with_mean_squared_error_loss(
+    weight_feature_key=None,
+    label_dimension=1):
+  """Creates a `_Head` for regression using the mean squared loss.
+
+  Args:
+    weight_feature_key: A string defining feature column name representing
+      weights. It is used to down weight or boost examples during training. It
+      will be multiplied by the loss of the example.
+    label_dimension: Number of regression labels per example. This is the size
+      of the last dimension of the labels `Tensor` (typically, this has shape
+      `[batch_size, label_dimension]`).
+
+  Returns:
+    An instance of `_Head` for linear regression.
+  """
+  return _RegressionHeadWithMeanSquaredErrorLoss(
+      weight_feature_key=weight_feature_key,
+      label_dimension=label_dimension)
+
+
+class _RegressionHeadWithMeanSquaredErrorLoss(_Head):
+  """`Head` for regression using the mean squared loss."""
+
+  def __init__(self,
+               label_dimension,
+               weight_feature_key=None):
+    """`Head` for regression.
+
+    Args:
+      label_dimension: Number of regression labels per example. This is the
+        size of the last dimension of the labels `Tensor` (typically, this has
+        shape `[batch_size, label_dimension]`).
+      weight_feature_key: A string defining feature column name representing
+        weights. It is used to down weight or boost examples during training. It
+        will be multiplied by the loss of the example.
+
+    Raises:
+      ValueError: if `label_dimension` < 1.
+    """
+    if label_dimension < 1:
+      raise ValueError('Invalid label_dimension %s.' % label_dimension)
+    self._logits_dimension = label_dimension
+    self._weight_feature_key = weight_feature_key
+
+  @property
+  def logits_dimension(self):
+    return self._logits_dimension
+
+  def create_estimator_spec(
+      self, features, mode, logits, labels=None, train_op_fn=None):
+    """See `Head`."""
+    with variable_scope.variable_scope(
+        None,
+        default_name='regression_head',
+        values=(tuple(six.itervalues(features)) + (labels, logits))):
+
+      # Predict.
+      logits = _check_logits(logits, self._logits_dimension)
+      predictions = {prediction_keys.PredictionKeys.PREDICTIONS: logits}
+      if mode == model_fn.ModeKeys.PREDICT:
+        return model_fn.EstimatorSpec(
+            mode=model_fn.ModeKeys.PREDICT,
+            predictions=predictions,
+            export_outputs={'': export_output.RegressionOutput(value=logits)})
+
+      # Eval.
+      labels = _check_labels(math_ops.to_float(labels), self._logits_dimension)
+      unweighted_loss = losses.mean_squared_error(
+          labels=labels, predictions=logits, reduction=losses.Reduction.NONE)
+      weights = (
+          1. if (self._weight_feature_key is None) else
+          features[self._weight_feature_key])
+      weights = math_ops.to_float(weights, name='weights')
+      training_loss = losses.compute_weighted_loss(
+          unweighted_loss, weights=weights, reduction=losses.Reduction.SUM)
+      if mode == model_fn.ModeKeys.EVAL:
+        # Estimator already adds a metric for loss.
+        eval_metric_ops = {
+            metric_keys.MetricKeys.LOSS_MEAN: metrics_lib.mean(
+                unweighted_loss, weights=weights)
+        }
+        return model_fn.EstimatorSpec(
+            mode=model_fn.ModeKeys.EVAL,
+            predictions=predictions,
+            loss=training_loss,
+            eval_metric_ops=eval_metric_ops)
+
+      # Train.
+      if train_op_fn is None:
+        raise ValueError('train_op_fn can not be None.')
+      logging_ops.scalar_summary(metric_keys.MetricKeys.LOSS, training_loss)
+      logging_ops.scalar_summary(
+          metric_keys.MetricKeys.LOSS_MEAN,
+          losses.compute_weighted_loss(
+              unweighted_loss, weights=weights,
+              reduction=losses.Reduction.MEAN))
+      return model_fn.EstimatorSpec(
+          mode=model_fn.ModeKeys.TRAIN,
+          predictions=predictions,
+          loss=training_loss,
+          train_op=train_op_fn(training_loss))
diff --git a/tensorflow/python/estimator/canned/head_test.py b/tensorflow/python/estimator/canned/head_test.py
new file mode 100644
index 0000000000..516e89d366
--- /dev/null
+++ b/tensorflow/python/estimator/canned/head_test.py
@@ -0,0 +1,1570 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for head.py."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+import six
+
+from tensorflow.core.framework import summary_pb2
+from tensorflow.python.estimator import model_fn
+from tensorflow.python.estimator.canned import head as head_lib
+from tensorflow.python.estimator.canned import metric_keys
+from tensorflow.python.estimator.canned import prediction_keys
+from tensorflow.python.estimator.inputs import numpy_io
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import errors
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import string_ops
+from tensorflow.python.platform import test
+from tensorflow.python.saved_model import signature_constants
+from tensorflow.python.training import queue_runner_impl
+
+
+_DEFAULT_SERVING_KEY = signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY
+
+
+def _initialize_variables(test_case, scaffold):
+  scaffold.finalize()
+  test_case.assertIsNone(scaffold.init_feed_dict)
+  test_case.assertIsNone(scaffold.init_fn)
+  scaffold.init_op.run()
+  scaffold.ready_for_local_init_op.eval()
+  scaffold.local_init_op.run()
+  scaffold.ready_op.eval()
+  test_case.assertIsNotNone(scaffold.saver)
+
+
+def _assert_simple_summaries(test_case, expected_summaries, summary_str,
+                             tol=1e-6):
+  """Assert summary the specified simple values.
+
+  Args:
+    test_case: test case.
+    expected_summaries: Dict of expected tags and simple values.
+    summary_str: Serialized `summary_pb2.Summary`.
+    tol: Tolerance for relative and absolute.
+  """
+  summary = summary_pb2.Summary()
+  summary.ParseFromString(summary_str)
+  test_case.assertAllClose(expected_summaries, {
+      v.tag: v.simple_value for v in summary.value
+  }, rtol=tol, atol=tol)
+
+
+def _assert_no_hooks(test_case, spec):
+  test_case.assertAllEqual([], spec.training_chief_hooks)
+  test_case.assertAllEqual([], spec.training_hooks)
+
+
+def _sigmoid(logits):
+  return 1 / (1 + np.exp(-logits))
+
+
+class MultiClassHeadWithSoftmaxCrossEntropyLoss(test.TestCase):
+
+  def test_n_classes_is_none(self):
+    with self.assertRaisesRegexp(ValueError, 'n_classes must be > 2'):
+      head_lib._multi_class_head_with_softmax_cross_entropy_loss(
+          n_classes=None)
+
+  def test_n_classes_is_2(self):
+    with self.assertRaisesRegexp(ValueError, 'n_classes must be > 2'):
+      head_lib._multi_class_head_with_softmax_cross_entropy_loss(
+          n_classes=2)
+
+  def test_invalid_logits_shape(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    # Logits should be shape (batch_size, 3).
+    logits_2x2 = np.array(((45., 44.), (41., 42.),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'logits shape'):
+      head.create_estimator_spec(
+          features={'x': np.array(((30.,), (42.,),))},
+          mode=model_fn.ModeKeys.PREDICT,
+          logits=logits_2x2)
+
+    # Dynamic shape.
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((30.,), (42.,),))},
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'logits shape'):
+        spec.predictions[prediction_keys.PredictionKeys.PROBABILITIES].eval({
+            logits_placeholder: logits_2x2
+        })
+
+  def test_invalid_labels_shape(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    # Logits should be shape (batch_size, 3).
+    # Labels should be shape (batch_size, 1).
+    labels_2x2 = np.array(((45, 44), (41, 42),), dtype=np.int)
+    logits_2x3 = np.array(((1., 2., 3.), (1., 2., 3.),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'labels shape'):
+      head.create_estimator_spec(
+          features={'x': np.array(((42.,),))},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=logits_2x3,
+          labels=labels_2x2)
+
+    # Dynamic shape.
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.int64)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42.,),))},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits_placeholder,
+        labels=labels_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'labels shape'):
+        spec.loss.eval({
+            logits_placeholder: logits_2x3,
+            labels_placeholder: labels_2x2
+        })
+
+  def test_invalid_labels_type(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    # Logits should be shape (batch_size, 3).
+    # Labels should be shape (batch_size, 1).
+    labels_2x1 = np.array(((1.,), (1.,),))
+    logits_2x3 = np.array(((1., 2., 3.), (1., 2., 3.),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'Labels dtype'):
+      head.create_estimator_spec(
+          features={'x': np.array(((42.,),))},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=logits_2x3,
+          labels=labels_2x1)
+
+    # Dynamic shape.
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    with self.assertRaisesRegexp(ValueError, 'Labels dtype'):
+      head.create_estimator_spec(
+          features={'x': np.array(((42.,),))},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=logits_placeholder,
+          labels=labels_placeholder)
+
+  def test_invalid_labels_values(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    labels_2x1_with_large_id = np.array(((45,), (1,),), dtype=np.int)
+    labels_2x1_with_negative_id = np.array(((-5,), (1,),), dtype=np.int)
+    logits_2x3 = np.array(((1., 2., 4.), (1., 2., 3.),))
+
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.int64)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42.,),))},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits_placeholder,
+        labels=labels_placeholder)
+    with self.test_session():
+      with self.assertRaisesOpError('Label IDs must < n_classes'):
+        spec.loss.eval({
+            labels_placeholder: labels_2x1_with_large_id,
+            logits_placeholder: logits_2x3
+        })
+
+    with self.test_session():
+      with self.assertRaisesOpError('Label Ids must >= 0'):
+        spec.loss.eval({
+            labels_placeholder: labels_2x1_with_negative_id,
+            logits_placeholder: logits_2x3
+        })
+
+  def test_invalid_labels_sparse_tensor(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    labels_2x1 = sparse_tensor.SparseTensor(
+        values=['english', 'italian'],
+        indices=[[0, 0], [1, 0]],
+        dense_shape=[2, 1])
+    logits_2x3 = np.array(((1., 2., 4.), (1., 2., 3.),))
+
+    with self.assertRaisesRegexp(
+        ValueError, 'SparseTensor labels are not supported.'):
+      head.create_estimator_spec(
+          features={'x': np.array(((42.,),))},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=logits_2x3,
+          labels=labels_2x1)
+
+  def test_incompatible_labels_shape(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    # Logits should be shape (batch_size, 3).
+    # Labels should be shape (batch_size, 1).
+    # Here batch sizes are different.
+    values_3x1 = np.array(((1,), (1,), (1,),))
+    values_2x3 = np.array(((1., 2., 3.), (1., 2., 3.),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'Dimensions must be equal'):
+      head.create_estimator_spec(
+          features={'x': values_2x3},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=values_2x3,
+          labels=values_3x1)
+
+    # Dynamic shape.
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.int64)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': values_2x3},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits_placeholder,
+        labels=labels_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(
+          errors.OpError,
+          'logits and labels must have the same first dimension'):
+        spec.loss.eval({
+            labels_placeholder: values_3x1,
+            logits_placeholder: values_2x3
+        })
+
+  def test_predict(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((1., 0., 0.), (0., 0., 1.),), dtype=np.int32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42,),), dtype=np.int32)},
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+        np.array([[0.576117, 0.2119416, 0.2119416],
+                  [0.2119416, 0.2119416, 0.576117]], dtype=np.float32),
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((0,), (2,)), dtype=np.int64),
+    }
+
+    expected_output_classes = [[b'0', b'1', b'2'], [b'0', b'1', b'2']]
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNone(spec.loss)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNone(spec.train_op)
+    self.assertItemsEqual(
+        ('', _DEFAULT_SERVING_KEY), spec.export_outputs.keys())
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions and export_outputs.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      self.assertAllClose(expected_predictions, sess.run(spec.predictions))
+      self.assertAllClose(
+          expected_predictions[prediction_keys.PredictionKeys.PROBABILITIES],
+          sess.run(spec.export_outputs[_DEFAULT_SERVING_KEY].scores))
+      self.assertAllEqual(
+          expected_output_classes,
+          sess.run(spec.export_outputs[_DEFAULT_SERVING_KEY].classes))
+
+  def test_weighted_multi_example_predict(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(
+        n_classes, weight_column_name='label_weights')
+    self.assertEqual(n_classes, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((1., 0., 0.), (0., 0., 1.),), dtype=np.int32)
+    weights_2x1 = np.array(((1.,), (2.,),), dtype=np.float64)
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42,),), dtype=np.int32),
+            'label_weights': weights_2x1,
+        },
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+        np.array([[0.576117, 0.2119416, 0.2119416],
+                  [0.2119416, 0.2119416, 0.576117]], dtype=np.float32),
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((0,), (2,)), dtype=np.int64),
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+
+    # Assert predictions.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      self.assertAllClose(expected_predictions, sess.run(spec.predictions))
+
+  def test_eval(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+
+    # Create estimator spec.
+    logits = np.array(((10, 0, 0), (0, 10, 0),), dtype=np.float32)
+    labels = np.array(((1,), (1,)), dtype=np.int64)
+    # loss = sum(cross_entropy(labels, logits)) = sum(10, 0) = 10.
+    expected_loss = 10.
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42,),), dtype=np.int32)},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits,
+        labels=labels)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((1., 0., 0.), (0., 1., 0.),), dtype=np.float32),
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((0,), (1,)), dtype=np.int64),
+    }
+
+    keys = metric_keys.MetricKeys
+    expected_metrics = {
+        keys.LOSS_MEAN: expected_loss / 2,
+        keys.ACCURACY: 0.5,  # 1 of 2 labels is correct.
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNotNone(spec.loss)
+    self.assertItemsEqual(expected_metrics.keys(), spec.eval_metric_ops.keys())
+    self.assertIsNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, and metrics.
+    tol = 1e-2
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      value_ops = {k: spec.eval_metric_ops[k][0] for k in spec.eval_metric_ops}
+      update_ops = {k: spec.eval_metric_ops[k][1] for k in spec.eval_metric_ops}
+      predictions, loss, metrics = sess.run((
+          spec.predictions, spec.loss, update_ops))
+      self.assertAllClose(expected_predictions, predictions, rtol=tol, atol=tol)
+      self.assertAllClose(expected_loss, loss, rtol=tol, atol=tol)
+      # Check results of both update (in `metrics`) and value ops.
+      self.assertAllClose(expected_metrics, metrics, rtol=tol, atol=tol)
+      self.assertAllClose(
+          expected_metrics, {k: value_ops[k].eval() for k in value_ops},
+          rtol=tol, atol=tol)
+
+  def test_weighted_multi_example_eval(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(
+        n_classes, weight_column_name='label_weights')
+
+    # Create estimator spec.
+    logits = np.array(((10, 0, 0), (0, 10, 0), (0, 0, 10),), dtype=np.float32)
+    labels = np.array(((1,), (2,), (2,)), dtype=np.int64)
+    weights_3x1 = np.array(((1.,), (2.,), (3.,)), dtype=np.float64)
+    # loss = sum(cross_entropy(labels, logits) * [1, 2, 3])
+    #      = sum([10, 10, 0] * [1, 2, 3]) = 30
+    expected_loss = 30.
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42,),), dtype=np.int32),
+            'label_weights': weights_3x1,
+        },
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits,
+        labels=labels)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((1., 0., 0.), (0., 1., 0.), (0., 0., 1.)),
+                     dtype=np.float32),
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((0,), (1,), (2,)), dtype=np.int64),
+    }
+
+    keys = metric_keys.MetricKeys
+    expected_metrics = {
+        keys.LOSS_MEAN: expected_loss / np.sum(weights_3x1),
+        # Weighted accuracy is 1 * 3.0 / sum weights = 0.5
+        keys.ACCURACY: 0.5,
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNotNone(spec.loss)
+    self.assertItemsEqual(expected_metrics.keys(), spec.eval_metric_ops.keys())
+    self.assertIsNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, and metrics.
+    tol = 1e-2
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      value_ops = {k: spec.eval_metric_ops[k][0] for k in spec.eval_metric_ops}
+      update_ops = {k: spec.eval_metric_ops[k][1] for k in spec.eval_metric_ops}
+      predictions, loss, metrics = sess.run((
+          spec.predictions, spec.loss, update_ops))
+      self.assertAllClose(expected_predictions, predictions, rtol=tol, atol=tol)
+      self.assertAllClose(expected_loss, loss, rtol=tol, atol=tol)
+      # Check results of both update (in `metrics`) and value ops.
+      self.assertAllClose(expected_metrics, metrics, rtol=tol, atol=tol)
+      self.assertAllClose(
+          expected_metrics, {k: value_ops[k].eval() for k in value_ops},
+          rtol=tol, atol=tol)
+
+  def test_train(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(n_classes)
+
+    # Create estimator spec.
+    logits = np.array(((10, 0, 0), (0, 10, 0),), dtype=np.float32)
+    labels = np.array(((1,), (1,)), dtype=np.int64)
+    expected_train_result = 'my_train_op'
+    # loss = sum(cross_entropy(labels, logits)) = sum(10, 0) = 10.
+    expected_loss = 10.
+
+    def _train_op_fn(loss):
+      return string_ops.string_join(
+          [constant_op.constant(expected_train_result),
+           string_ops.as_string(loss, precision=2)])
+
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42,),), dtype=np.float32)},
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits,
+        labels=labels,
+        train_op_fn=_train_op_fn)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((1., 0., 0.), (0., 1., 0.),), dtype=np.float32),
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((0,), (1,)), dtype=np.int64),
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNotNone(spec.loss)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNotNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, train_op, and summaries.
+    tol = 1e-2
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      predictions, loss, train_result, summary_str = sess.run((
+          spec.predictions, spec.loss, spec.train_op, spec.scaffold.summary_op))
+      self.assertAllClose(
+          expected_predictions, predictions, rtol=tol, atol=tol)
+      self.assertAllClose(expected_loss, loss, rtol=tol, atol=tol)
+      self.assertEqual(
+          six.b('{0:s}{1:.2f}'.format(expected_train_result, expected_loss)),
+          train_result)
+      _assert_simple_summaries(self, {
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          metric_keys.MetricKeys.LOSS_MEAN: expected_loss / 2,
+      }, summary_str, tol)
+
+  def test_weighted_multi_example_train(self):
+    n_classes = 3
+    head = head_lib._multi_class_head_with_softmax_cross_entropy_loss(
+        n_classes, weight_column_name='label_weights')
+
+    # Create estimator spec.
+    logits = np.array(((10, 0, 0), (0, 10, 0), (0, 0, 10),), dtype=np.float32)
+    labels = np.array(((1,), (2,), (2,)), dtype=np.int64)
+    weights_3x1 = np.array(((1.,), (2.,), (3.,)), dtype=np.float64)
+    expected_train_result = 'my_train_op'
+    # loss = sum(cross_entropy(labels, logits) * [1, 2, 3])
+    #      = sum([10, 10, 0] * [1, 2, 3]) = 30
+    expected_loss = 30.
+
+    def _train_op_fn(loss):
+      return string_ops.string_join(
+          [constant_op.constant(expected_train_result),
+           string_ops.as_string(loss, precision=2)])
+
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42,),), dtype=np.float32),
+            'label_weights': weights_3x1,
+        },
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits,
+        labels=labels,
+        train_op_fn=_train_op_fn)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((1., 0., 0.), (0., 1., 0.), (0., 0., 1.),),
+                     dtype=np.float32),
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((0,), (1,), (2,)), dtype=np.int64),
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNotNone(spec.loss)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNotNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, train_op, and summaries.
+    tol = 1e-2
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      predictions, loss, train_result, summary_str = sess.run((
+          spec.predictions, spec.loss, spec.train_op, spec.scaffold.summary_op))
+      self.assertAllClose(
+          expected_predictions, predictions, rtol=tol, atol=tol)
+      self.assertAllClose(expected_loss, loss, rtol=tol, atol=tol)
+      self.assertEqual(
+          six.b('{0:s}{1:.2f}'.format(expected_train_result, expected_loss)),
+          train_result)
+      _assert_simple_summaries(self, {
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          # loss mean = sum(cross_entropy(labels, logits) * [1,2,3]) / (1+2+3)
+          #      = sum([10, 10, 0] * [1, 2, 3]) / 6 = 30 / 6
+          metric_keys.MetricKeys.LOSS_MEAN:
+              expected_loss / np.sum(weights_3x1),
+      }, summary_str, tol)
+
+
+# TODO(ptucker): Add thresholds tests.
+class BinaryLogisticHeadWithSigmoidCrossEntropyLossTest(test.TestCase):
+
+  def test_threshold_too_small(self):
+    with self.assertRaisesRegexp(ValueError, r'thresholds not in \(0, 1\)'):
+      head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss(
+          thresholds=(0., 0.5))
+
+  def test_threshold_too_large(self):
+    with self.assertRaisesRegexp(ValueError, r'thresholds not in \(0, 1\)'):
+      head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss(
+          thresholds=(0.5, 1.))
+
+  def test_invalid_logits_shape(self):
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss()
+    self.assertEqual(1, head.logits_dimension)
+
+    # Logits should be shape (batch_size, 1).
+    logits_2x2 = np.array(((45., 44.), (41., 42.),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'logits shape'):
+      head.create_estimator_spec(
+          features={'x': np.array(((42.,),))},
+          mode=model_fn.ModeKeys.PREDICT,
+          logits=logits_2x2)
+
+    # Dynamic shape.
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42.,),))},
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'logits shape'):
+        spec.predictions[prediction_keys.PredictionKeys.PROBABILITIES].eval({
+            logits_placeholder: logits_2x2
+        })
+
+  def test_invalid_labels_shape(self):
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss()
+    self.assertEqual(1, head.logits_dimension)
+
+    # Labels and logits should be shape (batch_size, 1).
+    labels_2x2 = np.array(((45., 44.), (41., 42.),))
+    logits_2x1 = np.array(((45.,), (41.,),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'labels shape'):
+      head.create_estimator_spec(
+          features={'x': np.array(((42.,),))},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=logits_2x1,
+          labels=labels_2x2)
+
+    # Dynamic shape.
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42.,),))},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits_placeholder,
+        labels=labels_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'labels shape'):
+        spec.loss.eval({
+            logits_placeholder: logits_2x1,
+            labels_placeholder: labels_2x2
+        })
+
+  def test_incompatible_labels_shape(self):
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss()
+    self.assertEqual(1, head.logits_dimension)
+
+    # Both logits and labels should be shape (batch_size, 1).
+    values_2x1 = np.array(((43.,), (44.,),))
+    values_3x1 = np.array(((45.,), (46.,), (47.,),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(
+        ValueError, 'logits and labels must have the same shape'):
+      head.create_estimator_spec(
+          features={'x': values_2x1},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=values_2x1,
+          labels=values_3x1)
+    with self.assertRaisesRegexp(
+        ValueError, 'logits and labels must have the same shape'):
+      head.create_estimator_spec(
+          features={'x': values_2x1},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=values_3x1,
+          labels=values_2x1)
+
+    # Dynamic shape.
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': values_2x1},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits_placeholder,
+        labels=labels_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'Incompatible shapes'):
+        spec.loss.eval({
+            labels_placeholder: values_2x1,
+            logits_placeholder: values_3x1
+        })
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'Incompatible shapes'):
+        spec.loss.eval({
+            labels_placeholder: values_3x1,
+            logits_placeholder: values_2x1
+        })
+
+  def test_predict(self):
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss()
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45,), (-41,),), dtype=np.int32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42,),), dtype=np.int32)},
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.LOGISTIC:
+            _sigmoid(logits).astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((0., 1.), (1., 0.),), dtype=np.float32),
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((1,), (0,)), dtype=np.int64),
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNone(spec.loss)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNone(spec.train_op)
+    self.assertItemsEqual(
+        ('', _DEFAULT_SERVING_KEY), spec.export_outputs.keys())
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      self.assertAllClose(expected_predictions, sess.run(spec.predictions))
+
+  def test_eval(self):
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss()
+
+    # Create estimator spec.
+    logits = np.array(((45,), (-41,),), dtype=np.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42,),), dtype=np.float32)},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits,
+        labels=np.array(((1,), (1,),), dtype=np.int32))
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.LOGISTIC:
+            _sigmoid(logits).astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((0., 1.), (1., 0.),), dtype=np.float32),
+        # TODO(ptucker): Should this be (batch_size, 1) instead of (batch_size)?
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((1,), (0,)), dtype=np.int64),
+    }
+    default_threshold = .5
+    keys = metric_keys.MetricKeys
+    expected_metrics = {
+        # loss = sum(cross_entropy(labels, logits)) = sum(0, 41) = 41
+        # loss_mean = loss/2 = 41./2 = 20.5
+        keys.LOSS_MEAN: 20.5,
+        keys.ACCURACY: 1./2,
+        keys.PREDICTION_MEAN: 1./2,
+        keys.LABEL_MEAN: 2./2,
+        keys.ACCURACY_BASELINE: 2./2,
+        keys.AUC: 0.,
+        keys.AUC_PR: 1.,
+        keys.ACCURACY_AT_THRESHOLD % default_threshold: 1./2,
+        keys.PRECISION_AT_THRESHOLD % default_threshold: 2./2,
+        keys.RECALL_AT_THRESHOLD % default_threshold: 1./2,
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNotNone(spec.loss)
+    self.assertItemsEqual(expected_metrics.keys(), spec.eval_metric_ops.keys())
+    self.assertIsNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, and metrics.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      value_ops = {k: spec.eval_metric_ops[k][0] for k in spec.eval_metric_ops}
+      update_ops = {k: spec.eval_metric_ops[k][1] for k in spec.eval_metric_ops}
+      predictions, loss, metrics = sess.run((
+          spec.predictions, spec.loss, update_ops))
+      self.assertAllClose(expected_predictions, predictions)
+      self.assertAllClose(41., loss)
+      # Check results of both update (in `metrics`) and value ops.
+      self.assertAllClose(expected_metrics, metrics)
+      self.assertAllClose(
+          expected_metrics, {k: value_ops[k].eval() for k in value_ops})
+
+  def test_train(self):
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss()
+
+    # Create estimator spec.
+    logits = np.array(((45,), (-41,),), dtype=np.float32)
+    expected_train_result = b'my_train_op'
+        # loss = sum(cross_entropy(labels, logits)) = sum(0, 41) = 41
+    expected_loss = 41.
+    def _train_op_fn(loss):
+      with ops.control_dependencies((check_ops.assert_equal(
+          math_ops.to_float(expected_loss), math_ops.to_float(loss),
+          name='assert_loss'),)):
+        return constant_op.constant(expected_train_result)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42,),), dtype=np.float32)},
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits,
+        labels=np.array(((1,), (1,),), dtype=np.float64),
+        train_op_fn=_train_op_fn)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.LOGISTIC:
+            _sigmoid(logits).astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((0., 1.), (1., 0.),), dtype=np.float32),
+        # TODO(ptucker): Should this be (batch_size, 1) instead of (batch_size)?
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((1,), (0,)), dtype=np.int64),
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+    self.assertIsNotNone(spec.loss)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNotNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, train_op, and summaries.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      predictions, loss, train_result, summary_str = sess.run((
+          spec.predictions, spec.loss, spec.train_op, spec.scaffold.summary_op))
+      self.assertAllClose(expected_predictions, predictions)
+      self.assertAllClose(expected_loss, loss)
+      self.assertEqual(expected_train_result, train_result)
+      _assert_simple_summaries(self, {
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          # loss_mean = loss/2 = 41/2 = 20.5
+          metric_keys.MetricKeys.LOSS_MEAN: 20.5,
+      }, summary_str)
+
+  def test_weighted_multi_example_predict(self):
+    """3 examples, 1 batch."""
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss(
+        weight_feature_key='label_weights')
+
+    # Create estimator spec.
+    logits = np.array(((45,), (-41,), (44,)), dtype=np.int32)
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42,), (43,), (44,)), dtype=np.int32),
+            'label_weights': np.array(((1.,), (.1,), (1.5,)), dtype=np.float32),
+        },
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits)
+
+    expected_predictions = {
+        prediction_keys.PredictionKeys.LOGITS: logits.astype(np.float32),
+        prediction_keys.PredictionKeys.LOGISTIC:
+            _sigmoid(logits).astype(np.float32),
+        prediction_keys.PredictionKeys.PROBABILITIES:
+            np.array(((0., 1.), (1., 0.), (0., 1.)), dtype=np.float32),
+        # TODO(ptucker): Should this be (batch_size, 1) instead of (batch_size)?
+        prediction_keys.PredictionKeys.CLASSES:
+            np.array(((1,), (0,), (1,)), dtype=np.int64),
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertItemsEqual(expected_predictions.keys(), spec.predictions.keys())
+    self.assertEqual(
+        {k: v.dtype for k, v in six.iteritems(expected_predictions)},
+        {k: v.dtype.as_numpy_dtype for k, v in six.iteritems(spec.predictions)})
+
+    # Assert predictions, loss, and metrics.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertAllClose(expected_predictions, sess.run(spec.predictions))
+
+  def test_weighted_multi_example_eval(self):
+    """3 examples, 1 batch."""
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss(
+        weight_feature_key='label_weights')
+
+    # Create estimator spec.
+    logits = np.array(((45,), (-41,), (44,)), dtype=np.int32)
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42,), (43,), (44,)), dtype=np.int32),
+            'label_weights': np.array(((1.,), (.1,), (1.5,)), dtype=np.float32),
+        },
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits,
+        labels=np.array(((1,), (1,), (0,)), dtype=np.int32))
+
+    default_threshold = .5
+    # label_mean = (1*1 + .1*1 + 1.5*0)/(1 + .1 + 1.5) = 1.1/2.6
+    #            = .42307692307
+    expected_label_mean = .42307692307
+    keys = metric_keys.MetricKeys
+    expected_metrics = {
+        # losses = label_weights*cross_entropy(labels, logits)
+        #        = (1*0 + .1*41 + 1.5*44) = (1, 4.1, 66)
+        # loss = sum(losses) = 1 + 4.1 + 66 = 70.1
+        # loss_mean = loss/sum(label_weights) = 70.1/(1 + .1 + 1.5)
+        #           = 70.1/2.6 = 26.9615384615
+        keys.LOSS_MEAN: 26.9615384615,
+        # accuracy = (1*1 + .1*0 + 1.5*0)/(1 + .1 + 1.5) = 1/2.6 = .38461538461
+        keys.ACCURACY: .38461538461,
+        # prediction_mean = (1*1 + .1*0 + 1.5*1)/(1 + .1 + 1.5) = 2.5/2.6
+        #                 = .96153846153
+        keys.PREDICTION_MEAN: .96153846153,
+        keys.LABEL_MEAN: expected_label_mean,
+        keys.ACCURACY_BASELINE: 1 - expected_label_mean,
+        keys.AUC: .45454565,
+        keys.AUC_PR: .6737757325172424,
+        keys.ACCURACY_AT_THRESHOLD % default_threshold: .38461538461,
+        # precision = (1*1 + 1.5*0)/(1 + 1.5) = 1/2.5 = .4
+        keys.PRECISION_AT_THRESHOLD % default_threshold: .4,
+        # recall = (1*1 + .1*0)/(1 + .1) = 1/1.1 = .90909090909
+        keys.RECALL_AT_THRESHOLD % default_threshold: .90909090909,
+    }
+
+    # Assert spec contains expected tensors.
+    self.assertIsNotNone(spec.loss)
+    self.assertItemsEqual(expected_metrics.keys(), spec.eval_metric_ops.keys())
+
+    # Assert predictions, loss, and metrics.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      value_ops = {k: spec.eval_metric_ops[k][0] for k in spec.eval_metric_ops}
+      update_ops = {k: spec.eval_metric_ops[k][1] for k in spec.eval_metric_ops}
+      loss, metrics = sess.run((spec.loss, update_ops))
+      self.assertAllClose(70.1, loss)
+      # Check results of both update (in `metrics`) and value ops.
+      self.assertAllClose(expected_metrics, metrics)
+      self.assertAllClose(
+          expected_metrics, {k: value_ops[k].eval() for k in value_ops})
+
+  def test_weighted_multi_example_train(self):
+    """3 examples, 1 batch."""
+    head = head_lib._binary_logistic_head_with_sigmoid_cross_entropy_loss(
+        weight_feature_key='label_weights')
+
+    # Create estimator spec.
+    logits = np.array(((45,), (-41,), (44,)), dtype=np.float32)
+    expected_train_result = b'my_train_op'
+    # losses = label_weights*cross_entropy(labels, logits)
+    #        = (1*0 + .1*41 + 1.5*44) = (1, 4.1, 66)
+    # loss = sum(losses) = 1 + 4.1 + 66 = 70.1
+    expected_loss = 70.1
+    def _train_op_fn(loss):
+      with ops.control_dependencies((check_ops.assert_equal(
+          math_ops.to_float(expected_loss), math_ops.to_float(loss),
+          name='assert_loss'),)):
+        return constant_op.constant(expected_train_result)
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42.,), (43.,), (44.,)), dtype=np.float32),
+            'label_weights': np.array(((1.,), (.1,), (1.5,)), dtype=np.float64),
+        },
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits,
+        labels=np.array(((1.,), (1.,), (0.,))),
+        train_op_fn=_train_op_fn)
+
+    # Assert spec contains expected tensors.
+    self.assertIsNotNone(spec.loss)
+    self.assertIsNotNone(spec.train_op)
+
+    # Assert predictions, loss, and metrics.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      loss, train_result, summary_str = sess.run((
+          spec.loss, spec.train_op, spec.scaffold.summary_op))
+      self.assertAllClose(expected_loss, loss)
+      self.assertEqual(expected_train_result, train_result)
+      _assert_simple_summaries(self, {
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          # loss_mean = loss/sum(label_weights) = 70.1/(1 + .1 + 1.5)
+          #           = 70.1/2.6 = 26.9615384615
+          metric_keys.MetricKeys.LOSS_MEAN: 26.9615384615,
+      }, summary_str)
+
+
+class RegressionHeadWithMeanSquaredErrorLossTest(test.TestCase):
+
+  def test_invalid_label_dimension(self):
+    with self.assertRaisesRegexp(ValueError, r'Invalid label_dimension'):
+      head_lib._regression_head_with_mean_squared_error_loss(label_dimension=-1)
+    with self.assertRaisesRegexp(ValueError, r'Invalid label_dimension'):
+      head_lib._regression_head_with_mean_squared_error_loss(label_dimension=0)
+
+  def test_invalid_logits(self):
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        label_dimension=3)
+    self.assertEqual(3, head.logits_dimension)
+    logits_1d = np.array(((45.,), (41.,),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'logits shape'):
+      head.create_estimator_spec(
+          features={'x': np.array(((42.,),))},
+          mode=model_fn.ModeKeys.PREDICT,
+          logits=logits_1d)
+
+    # Dynamic shape.
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42.,),))},
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'logits shape'):
+        spec.predictions[prediction_keys.PredictionKeys.PREDICTIONS].eval({
+            logits_placeholder: logits_1d
+        })
+
+  def test_incompatible_labels_eval(self):
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        label_dimension=3)
+    self.assertEqual(3, head.logits_dimension)
+    values_3d = np.array(((45., 46., 47.), (41., 42., 43.),))
+    values_1d = np.array(((43.,), (44.,),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'labels shape'):
+      head.create_estimator_spec(
+          features={'x': values_1d},
+          mode=model_fn.ModeKeys.EVAL,
+          logits=values_3d,
+          labels=values_1d)
+    with self.assertRaisesRegexp(ValueError, 'logits shape'):
+      head.create_estimator_spec(
+          features={'x': values_3d}, labels=values_3d,
+          mode=model_fn.ModeKeys.EVAL, logits=values_1d, train_op_fn=None)
+
+    # Dynamic shape.
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': values_1d},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits_placeholder,
+        labels=labels_placeholder)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'logits shape'):
+        spec.loss.eval({
+            labels_placeholder: values_3d,
+            logits_placeholder: values_1d
+        })
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'labels shape'):
+        spec.loss.eval({
+            labels_placeholder: values_1d,
+            logits_placeholder: values_3d
+        })
+
+  def test_incompatible_labels_train(self):
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        label_dimension=3)
+    self.assertEqual(3, head.logits_dimension)
+    values_3d = np.array(((45., 46., 47.), (41., 42., 43.),))
+    values_1d = np.array(((43.,), (44.,),))
+
+    # Static shape.
+    with self.assertRaisesRegexp(ValueError, 'labels shape'):
+      head.create_estimator_spec(
+          features={'x': values_1d},
+          mode=model_fn.ModeKeys.TRAIN,
+          logits=values_3d,
+          labels=values_1d,
+          train_op_fn=lambda x: x)
+    with self.assertRaisesRegexp(ValueError, 'logits shape'):
+      head.create_estimator_spec(
+          features={'x': values_3d},
+          mode=model_fn.ModeKeys.TRAIN,
+          logits=values_1d,
+          labels=values_3d,
+          train_op_fn=lambda x: x)
+
+    # Dynamic shape.
+    labels_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    logits_placeholder = array_ops.placeholder(dtype=dtypes.float32)
+    spec = head.create_estimator_spec(
+        features={'x': values_1d},
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits_placeholder,
+        labels=labels_placeholder,
+        train_op_fn=lambda x: x)
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'logits shape'):
+        spec.loss.eval({
+            labels_placeholder: values_3d,
+            logits_placeholder: values_1d
+        })
+    with self.test_session():
+      with self.assertRaisesRegexp(errors.OpError, 'labels shape'):
+        spec.loss.eval({
+            labels_placeholder: values_1d,
+            logits_placeholder: values_3d
+        })
+
+  def test_predict(self):
+    head = head_lib._regression_head_with_mean_squared_error_loss()
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45,), (41,),), dtype=np.int32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42.,),), dtype=np.int32)},
+        mode=model_fn.ModeKeys.PREDICT,
+        logits=logits)
+
+    # Assert spec contains expected tensors.
+    prediction_key = prediction_keys.PredictionKeys.PREDICTIONS
+    self.assertItemsEqual((prediction_key,), spec.predictions.keys())
+    self.assertEqual(dtypes.float32, spec.predictions[prediction_key].dtype)
+    self.assertIsNone(spec.loss)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNone(spec.train_op)
+    self.assertItemsEqual(
+        ('', signature_constants.DEFAULT_SERVING_SIGNATURE_DEF_KEY),
+        spec.export_outputs.keys())
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions.
+    with self.test_session():
+      _initialize_variables(self, spec.scaffold)
+      self.assertAllClose(logits, spec.predictions[prediction_key].eval())
+
+  def test_eval(self):
+    head = head_lib._regression_head_with_mean_squared_error_loss()
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45,), (41,),), dtype=np.float32)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42,),), dtype=np.float32)},
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits,
+        labels=np.array(((43,), (44,),), dtype=np.int32))
+
+    # Assert spec contains expected tensors.
+    prediction_key = prediction_keys.PredictionKeys.PREDICTIONS
+    self.assertItemsEqual((prediction_key,), spec.predictions.keys())
+    self.assertEqual(dtypes.float32, spec.predictions[prediction_key].dtype)
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertItemsEqual(
+        (metric_keys.MetricKeys.LOSS_MEAN,), spec.eval_metric_ops.keys())
+    self.assertIsNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, and metrics.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      loss_mean_value_op, loss_mean_update_op = spec.eval_metric_ops[
+          metric_keys.MetricKeys.LOSS_MEAN]
+      predictions, loss, loss_mean = sess.run((
+          spec.predictions[prediction_key], spec.loss, loss_mean_update_op))
+      self.assertAllClose(logits, predictions)
+      # loss = (43-45)^2 + (44-41)^2 = 4+9 = 13
+      self.assertAllClose(13., loss)
+      # loss_mean = loss/2 = 13/2 = 6.5
+      expected_loss_mean = 6.5
+      # Check results of both update (in `loss_mean`) and value ops.
+      self.assertAllClose(expected_loss_mean, loss_mean)
+      self.assertAllClose(expected_loss_mean, loss_mean_value_op.eval())
+
+  def test_train(self):
+    head = head_lib._regression_head_with_mean_squared_error_loss()
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45,), (41,),), dtype=np.float32)
+    expected_train_result = b'my_train_op'
+    # loss = (43-45)^2 + (44-41)^2 = 4 + 9 = 13
+    expected_loss = 13
+    def _train_op_fn(loss):
+      with ops.control_dependencies((check_ops.assert_equal(
+          math_ops.to_float(expected_loss), math_ops.to_float(loss),
+          name='assert_loss'),)):
+        return constant_op.constant(expected_train_result)
+    spec = head.create_estimator_spec(
+        features={'x': np.array(((42.,),), dtype=np.float32)},
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits,
+        labels=np.array(((43.,), (44.,),), dtype=np.float64),
+        train_op_fn=_train_op_fn)
+
+    # Assert spec contains expected tensors.
+    prediction_key = prediction_keys.PredictionKeys.PREDICTIONS
+    self.assertItemsEqual((prediction_key,), spec.predictions.keys())
+    self.assertEqual(dtypes.float32, spec.predictions[prediction_key].dtype)
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNotNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, train_op, and summaries.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      predictions, loss, train_result, summary_str = sess.run((
+          spec.predictions[prediction_key], spec.loss, spec.train_op,
+          spec.scaffold.summary_op))
+      self.assertAllClose(logits, predictions)
+      self.assertAllClose(expected_loss, loss)
+      self.assertEqual(expected_train_result, train_result)
+      _assert_simple_summaries(self, {
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          # loss_mean = loss/2 = 13/2 = 6.5
+          metric_keys.MetricKeys.LOSS_MEAN: 6.5,
+      }, summary_str)
+
+  def test_weighted_multi_example_eval(self):
+    """1d label, 3 examples, 1 batch."""
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        weight_feature_key='label_weights')
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45,), (41,), (44,)), dtype=np.int32)
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42,), (43,), (44,)), dtype=np.int32),
+            'label_weights': np.array(((1.,), (.1,), (1.5,)), dtype=np.float32),
+        },
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits,
+        labels=np.array(((35,), (42,), (45,)), dtype=np.int32))
+
+    # Assert spec contains expected tensors.
+    prediction_key = prediction_keys.PredictionKeys.PREDICTIONS
+    self.assertItemsEqual((prediction_key,), spec.predictions.keys())
+    self.assertEqual(dtypes.float32, spec.predictions[prediction_key].dtype)
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertItemsEqual(
+        (metric_keys.MetricKeys.LOSS_MEAN,), spec.eval_metric_ops.keys())
+    self.assertIsNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, and metrics.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      loss_mean_value_op, loss_mean_update_op = spec.eval_metric_ops[
+          metric_keys.MetricKeys.LOSS_MEAN]
+      predictions, loss, loss_mean = sess.run((
+          spec.predictions[prediction_key], spec.loss, loss_mean_update_op))
+      self.assertAllClose(logits, predictions)
+      # loss = 1*(35-45)^2 + .1*(42-41)^2 + 1.5*(45-44)^2 = 100+.1+1.5 = 101.6
+      self.assertAllClose(101.6, loss)
+      # loss_mean = loss/(1+.1+1.5) = 101.6/2.6 = 39.0769231
+      expected_loss_mean = 39.0769231
+      # Check results of both update (in `loss_mean`) and value ops.
+      self.assertAllClose(expected_loss_mean, loss_mean)
+      self.assertAllClose(expected_loss_mean, loss_mean_value_op.eval())
+
+  def test_weighted_multi_example_train(self):
+    """1d label, 3 examples, 1 batch."""
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        weight_feature_key='label_weights')
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45,), (41,), (44,)), dtype=np.float32)
+    expected_train_result = b'my_train_op'
+    # loss = 1*(35-45)^2 + .1*(42-41)^2 + 1.5*(45-44)^2 = 100+.1+1.5 = 101.6
+    expected_loss = 101.6
+    def _train_op_fn(loss):
+      with ops.control_dependencies((check_ops.assert_equal(
+          math_ops.to_float(expected_loss), math_ops.to_float(loss),
+          name='assert_loss'),)):
+        return constant_op.constant(expected_train_result)
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42,), (43,), (44,)), dtype=np.float32),
+            'label_weights': np.array(((1.,), (.1,), (1.5,)), dtype=np.float64),
+        },
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits,
+        labels=np.array(((35.,), (42.,), (45.,)), dtype=np.float32),
+        train_op_fn=_train_op_fn)
+
+    # Assert spec contains expected tensors.
+    prediction_key = prediction_keys.PredictionKeys.PREDICTIONS
+    self.assertItemsEqual((prediction_key,), spec.predictions.keys())
+    self.assertEqual(dtypes.float32, spec.predictions[prediction_key].dtype)
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNotNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, train_op, and summaries.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      predictions, loss, train_result, summary_str = sess.run((
+          spec.predictions[prediction_key], spec.loss, spec.train_op,
+          spec.scaffold.summary_op))
+      self.assertAllClose(logits, predictions)
+      self.assertAllClose(expected_loss, loss)
+      self.assertEqual(expected_train_result, train_result)
+      _assert_simple_summaries(self, {
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          # loss_mean = loss/(1+.1+1.5) = 101.6/2.6 = 39.0769231
+          metric_keys.MetricKeys.LOSS_MEAN: 39.0769231,
+      }, summary_str)
+
+  def test_weighted_multi_value_eval(self):
+    """3d label, 1 example, 1 batch."""
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        weight_feature_key='label_weights', label_dimension=3)
+    self.assertEqual(3, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45., 41., 44.),))
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42., 43., 44.),)),
+            'label_weights': np.array(((1., .1, 1.5),)),
+        },
+        mode=model_fn.ModeKeys.EVAL,
+        logits=logits,
+        labels=np.array(((35., 42., 45.),)))
+
+    # Assert spec contains expected tensors.
+    prediction_key = prediction_keys.PredictionKeys.PREDICTIONS
+    self.assertItemsEqual((prediction_key,), spec.predictions.keys())
+    self.assertEqual(dtypes.float32, spec.predictions[prediction_key].dtype)
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertItemsEqual(
+        (metric_keys.MetricKeys.LOSS_MEAN,), spec.eval_metric_ops.keys())
+    self.assertIsNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Assert predictions, loss, and metrics.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNone(spec.scaffold.summary_op)
+      loss_mean_value_op, loss_mean_update_op = spec.eval_metric_ops[
+          metric_keys.MetricKeys.LOSS_MEAN]
+      predictions, loss, loss_mean = sess.run((
+          spec.predictions[prediction_key], spec.loss, loss_mean_update_op))
+      self.assertAllClose(logits, predictions)
+      # loss = 1*(35-45)^2 + .1*(42-41)^2 + 1.5*(45-44)^2 = 100+.1+1.5 = 101.6
+      self.assertAllClose(101.6, loss)
+      # loss_mean = loss/(1+.1+1.5) = 101.6/2.6 = 39.076923
+      expected_loss_mean = 39.076923
+      # Check results of both update (in `loss_mean`) and value ops.
+      self.assertAllClose(expected_loss_mean, loss_mean)
+      self.assertAllClose(expected_loss_mean, loss_mean_value_op.eval())
+
+  def test_weighted_multi_value_train(self):
+    """3d label, 1 example, 1 batch."""
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        weight_feature_key='label_weights', label_dimension=3)
+    self.assertEqual(3, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45., 41., 44.),))
+    expected_train_result = b'my_train_op'
+    # loss = 1*(35-45)^2 + .1*(42-41)^2 + 1.5*(45-44)^2 = 100+.1+1.5 = 101.6
+    expected_loss = 101.6
+    def _train_op_fn(loss):
+      with ops.control_dependencies((check_ops.assert_equal(
+          math_ops.to_float(expected_loss), math_ops.to_float(loss),
+          name='assert_loss'),)):
+        return constant_op.constant(expected_train_result)
+    spec = head.create_estimator_spec(
+        features={
+            'x': np.array(((42., 43., 44.),)),
+            'label_weights': np.array(((1., .1, 1.5),)),
+        },
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=logits,
+        labels=np.array(((35., 42., 45.),)),
+        train_op_fn=_train_op_fn)
+
+    # Assert spec contains expected tensors.
+    prediction_key = prediction_keys.PredictionKeys.PREDICTIONS
+    self.assertItemsEqual((prediction_key,), spec.predictions.keys())
+    self.assertEqual(dtypes.float32, spec.predictions[prediction_key].dtype)
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertEqual({}, spec.eval_metric_ops)
+    self.assertIsNotNone(spec.train_op)
+    self.assertIsNone(spec.export_outputs)
+    _assert_no_hooks(self, spec)
+
+    # Evaluate predictions, loss, train_op, and summaries.
+    with self.test_session() as sess:
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      predictions, loss, train_result, summary_str = sess.run((
+          spec.predictions[prediction_key], spec.loss, spec.train_op,
+          spec.scaffold.summary_op))
+      self.assertAllClose(logits, predictions)
+      self.assertAllClose(expected_loss, loss)
+      self.assertEqual(expected_train_result, train_result)
+      _assert_simple_summaries(self, {
+          metric_keys.MetricKeys.LOSS: expected_loss,
+          # loss_mean = loss/(1+.1+1.5) = 101.6/2.6 = 39.076923
+          metric_keys.MetricKeys.LOSS_MEAN: 39.076923,
+      }, summary_str)
+
+  def test_weighted_multi_batch_eval(self):
+    """1d label, 1 example, 3 batches."""
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        weight_feature_key='label_weights')
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45.,), (41.,), (44.,)))
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            'x': np.array(((42.,), (43.,), (44.,))),
+            'label_weights': np.array(((1.,), (.1,), (1.5,))),
+            # 'logits' is not a feature, but we use `numpy_input_fn` to make a
+            # batched version of it, and pop it off before passing to
+            # `create_estimator_spec`.
+            'logits': logits,
+        },
+        y=np.array(((35.,), (42.,), (45.,))),
+        batch_size=1,
+        num_epochs=1,
+        shuffle=False)
+    batched_features, batched_labels = input_fn()
+    batched_logits = batched_features.pop('logits')
+    spec = head.create_estimator_spec(
+        features=batched_features,
+        mode=model_fn.ModeKeys.EVAL,
+        logits=batched_logits,
+        labels=batched_labels,
+        train_op_fn=None)
+
+    # losses = [1*(35-45)^2, .1*(42-41)^2, 1.5*(45-44)^2] = [100, .1, 1.5]
+    # loss = sum(losses) = 100+.1+1.5 = 101.6
+    # loss_mean = loss/(1+.1+1.5) = 101.6/2.6 = 39.076923
+    expected_metrics = {metric_keys.MetricKeys.LOSS_MEAN: 39.076923}
+
+    # Assert spec contains expected tensors.
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertItemsEqual(expected_metrics.keys(), spec.eval_metric_ops.keys())
+    self.assertIsNone(spec.train_op)
+    _assert_no_hooks(self, spec)
+
+    with self.test_session() as sess:
+      # Finalize graph and initialize variables.
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      queue_runner_impl.start_queue_runners()
+
+      # Run tensors for `steps` steps.
+      steps = len(logits)
+      results = tuple([
+          sess.run((
+              spec.loss,
+              # The `[1]` gives us the metric update op.
+              {k: spec.eval_metric_ops[k][1] for k in spec.eval_metric_ops}
+          )) for _ in range(steps)
+      ])
+
+      # Assert losses and metrics.
+      self.assertAllClose((100, .1, 1.5), [r[0] for r in results])
+      # For metrics, check results of both update (in `results`) and value ops.
+      # Note: we only check the result of the last step for streaming metrics.
+      self.assertAllClose(expected_metrics, results[steps - 1][1])
+      self.assertAllClose(expected_metrics, {
+          k: spec.eval_metric_ops[k][0].eval() for k in spec.eval_metric_ops
+      })
+
+  def test_weighted_multi_batch_train(self):
+    """1d label, 1 example, 3 batches."""
+    head = head_lib._regression_head_with_mean_squared_error_loss(
+        weight_feature_key='label_weights')
+    self.assertEqual(1, head.logits_dimension)
+
+    # Create estimator spec.
+    logits = np.array(((45.,), (41.,), (44.,)))
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            'x': np.array(((42.,), (43.,), (44.,))),
+            'label_weights': np.array(((1.,), (.1,), (1.5,))),
+            # 'logits' is not a feature, but we use `numpy_input_fn` to make a
+            # batched version of it, and pop it off before passing to
+            # `create_estimator_spec`.
+            'logits': logits,
+        },
+        y=np.array(((35.,), (42.,), (45.,))),
+        batch_size=1,
+        num_epochs=1,
+        shuffle=False)
+    batched_features, batched_labels = input_fn()
+    batched_logits = batched_features.pop('logits')
+    spec = head.create_estimator_spec(
+        features=batched_features,
+        mode=model_fn.ModeKeys.TRAIN,
+        logits=batched_logits,
+        labels=batched_labels,
+        train_op_fn=lambda loss: loss * -7.)
+
+    # Assert spec contains expected tensors.
+    self.assertEqual(dtypes.float32, spec.loss.dtype)
+    self.assertIsNotNone(spec.train_op)
+
+    with self.test_session() as sess:
+      # Finalize graph and initialize variables.
+      _initialize_variables(self, spec.scaffold)
+      self.assertIsNotNone(spec.scaffold.summary_op)
+      queue_runner_impl.start_queue_runners()
+
+      results = tuple([
+          sess.run((spec.loss, spec.train_op)) for _ in range(len(logits))
+      ])
+
+      # losses = [1*(35-45)^2, .1*(42-41)^2, 1.5*(45-44)^2] = [100, .1, 1.5]
+      expected_losses = np.array((100, .1, 1.5))
+      self.assertAllClose(expected_losses, [r[0] for r in results])
+      self.assertAllClose(expected_losses * -7., [r[1] for r in results])
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/estimator/canned/linear.py b/tensorflow/python/estimator/canned/linear.py
new file mode 100644
index 0000000000..3e471f5c91
--- /dev/null
+++ b/tensorflow/python/estimator/canned/linear.py
@@ -0,0 +1,293 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Linear Estimators."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import math
+
+import six
+
+from tensorflow.python.estimator import estimator
+from tensorflow.python.estimator.canned import head as head_lib
+from tensorflow.python.estimator.canned import optimizers
+from tensorflow.python.feature_column import feature_column as feature_column_lib
+from tensorflow.python.ops import partitioned_variables
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.training import ftrl
+from tensorflow.python.training import training_util
+
+
+# The default learning rate of 0.2 is a historical artifact of the initial
+# implementation, but seems a reasonable choice.
+_LEARNING_RATE = 0.2
+
+
+def _get_default_optimizer(feature_columns):
+  learning_rate = min(_LEARNING_RATE, 1.0 / math.sqrt(len(feature_columns)))
+  return ftrl.FtrlOptimizer(learning_rate=learning_rate)
+
+
+# TODO(b/36813849): Revisit passing params vs named arguments.
+def _linear_model_fn(features, labels, mode, params, config):
+  """A model_fn for linear models that use a gradient-based optimizer.
+
+  Args:
+    features: Dict of `Tensor`.
+    labels: `Tensor` of shape `[batch_size, logits_dimension]`.
+    mode: Defines whether this is training, evaluation or prediction.
+      See `ModeKeys`.
+    params: A dict of hyperparameters.
+      The following hyperparameters are expected:
+      * head: A `Head` instance.
+      * feature_columns: An iterable containing all the feature columns used by
+          the model.
+      * optimizer: string, `Optimizer` object, or callable that defines the
+          optimizer to use for training. If `None`, will use a FTRL optimizer.
+    config: `RunConfig` object to configure the runtime settings.
+
+  Returns:
+    An `EstimatorSpec` instance.
+
+  Raises:
+    ValueError: If mode or params are invalid.
+  """
+  head = params['head']
+  feature_columns = tuple(params['feature_columns'])
+  optimizer = optimizers.get_optimizer_instance(
+      params.get('optimizer') or _get_default_optimizer(feature_columns),
+      learning_rate=_LEARNING_RATE)
+  num_ps_replicas = config.num_ps_replicas if config else 0
+
+  partitioner = params.get('partitioner') or (
+      partitioned_variables.min_max_variable_partitioner(
+          max_partitions=num_ps_replicas,
+          min_slice_size=64 << 20))
+
+  with variable_scope.variable_scope(
+      'linear',
+      values=tuple(six.itervalues(features)),
+      partitioner=partitioner):
+
+    logits = feature_column_lib.linear_model(
+        features=features,
+        feature_columns=feature_columns,
+        units=head.logits_dimension)
+
+    def _train_op_fn(loss):
+      """Returns the op to optimize the loss."""
+      return optimizer.minimize(
+          loss,
+          global_step=training_util.get_global_step())
+
+    return head.create_estimator_spec(
+        features=features,
+        mode=mode,
+        labels=labels,
+        train_op_fn=_train_op_fn,
+        logits=logits)
+
+
+class LinearClassifier(estimator.Estimator):
+  """Linear classifier model.
+
+  Train a linear model to classify instances into one of multiple possible
+  classes. When number of possible classes is 2, this is binary classification.
+
+  Example:
+
+  ```python
+  sparse_column_a = sparse_column_with_hash_bucket(...)
+  sparse_column_b = sparse_column_with_hash_bucket(...)
+
+  sparse_feature_a_x_sparse_feature_b = crossed_column(...)
+
+  # Estimator using the default optimizer.
+  estimator = LinearClassifier(
+      feature_columns=[sparse_column_a, sparse_feature_a_x_sparse_feature_b])
+
+  # Or estimator using the FTRL optimizer with regularization.
+  estimator = LinearClassifier(
+      feature_columns=[sparse_column_a, sparse_feature_a_x_sparse_feature_b],
+      optimizer=tf.train.FtrlOptimizer(
+        learning_rate=0.1,
+        l1_regularization_strength=0.001
+      ))
+
+  # Input builders
+  def input_fn_train: # returns x, y (where y represents label's class index).
+    ...
+  def input_fn_eval: # returns x, y (where y represents label's class index).
+    ...
+  estimator.train(input_fn=input_fn_train)
+  estimator.evaluate(input_fn=input_fn_eval)
+  estimator.predict(input_fn=input_fn_predict)
+  ```
+
+  Input of `train` and `evaluate` should have following features,
+    otherwise there will be a `KeyError`:
+
+  * if `weight_feature_key` is not `None`, a feature with
+    `key=weight_feature_key` whose value is a `Tensor`.
+  * for each `column` in `feature_columns`:
+    - if `column` is a `SparseColumn`, a feature with `key=column.name`
+      whose `value` is a `SparseTensor`.
+    - if `column` is a `WeightedSparseColumn`, two features: the first with
+      `key` the id column name, the second with `key` the weight column name.
+      Both features' `value` must be a `SparseTensor`.
+    - if `column` is a `RealValuedColumn`, a feature with `key=column.name`
+      whose `value` is a `Tensor`.
+  """
+
+  def __init__(self,
+               feature_columns,
+               model_dir=None,
+               n_classes=2,
+               weight_feature_key=None,
+               optimizer=None,
+               config=None,
+               partitioner=None):
+    """Construct a `LinearClassifier` estimator object.
+
+    Args:
+      feature_columns: An iterable containing all the feature columns used by
+        the model. All items in the set should be instances of classes derived
+        from `FeatureColumn`.
+      model_dir: Directory to save model parameters, graph and etc. This can
+        also be used to load checkpoints from the directory into a estimator
+        to continue training a previously saved model.
+      n_classes: number of label classes. Default is binary classification.
+        Note that class labels are integers representing the class index (i.e.
+        values from 0 to n_classes-1). For arbitrary label values (e.g. string
+        labels), convert to class indices first.
+      weight_feature_key: A string defining feature column name representing
+        weights. It is used to down weight or boost examples during training. It
+        will be multiplied by the loss of the example.
+      optimizer: The optimizer used to train the model. If specified, it should
+        be either an instance of `tf.Optimizer` or the SDCAOptimizer. If `None`,
+        the Ftrl optimizer will be used.
+      config: `RunConfig` object to configure the runtime settings.
+      partitioner: Optional. Partitioner for input layer.
+
+    Returns:
+      A `LinearClassifier` estimator.
+
+    Raises:
+      ValueError: if n_classes < 2.
+    """
+    super(LinearClassifier, self).__init__(
+        model_fn=_linear_model_fn,
+        model_dir=model_dir,
+        config=config,
+        params={
+            # pylint: disable=protected-access
+            # TODO(xiejw): Switch to the classifier head.
+            'head': head_lib._regression_head_with_mean_squared_error_loss(
+                label_dimension=n_classes,
+                weight_feature_key=weight_feature_key),
+            # pylint: enable=protected-access
+            'feature_columns': feature_columns,
+            'optimizer': optimizer,
+            'partitioner': partitioner,
+        })
+
+
+class LinearRegressor(estimator.Estimator):
+  """An estimator for TensorFlow Linear regression problems.
+
+  Train a linear regression model to predict label value given observation of
+  feature values.
+
+  Example:
+
+  ```python
+  sparse_column_a = sparse_column_with_hash_bucket(...)
+  sparse_column_b = sparse_column_with_hash_bucket(...)
+
+  sparse_feature_a_x_sparse_feature_b = crossed_column(...)
+
+  estimator = LinearRegressor(
+      feature_columns=[sparse_column_a, sparse_feature_a_x_sparse_feature_b])
+
+  # Input builders
+  def input_fn_train: # returns x, y
+    ...
+  def input_fn_eval: # returns x, y
+    ...
+  estimator.train(input_fn=input_fn_train)
+  estimator.evaluate(input_fn=input_fn_eval)
+  estimator.predict(input_fn=input_fn_predict)
+  ```
+
+  Input of `train` and `evaluate` should have following features,
+    otherwise there will be a KeyError:
+
+  * if `weight_feature_key` is not `None`:
+    key=weight_feature_key, value=a `Tensor`
+  * for column in `feature_columns`:
+    - if isinstance(column, `SparseColumn`):
+        key=column.name, value=a `SparseTensor`
+    - if isinstance(column, `WeightedSparseColumn`):
+        {key=id column name, value=a `SparseTensor`,
+         key=weight column name, value=a `SparseTensor`}
+    - if isinstance(column, `RealValuedColumn`):
+        key=column.name, value=a `Tensor`
+  """
+
+  def __init__(self,
+               feature_columns,
+               model_dir=None,
+               label_dimension=1,
+               weight_feature_key=None,
+               optimizer=None,
+               config=None,
+               partitioner=None):
+    """Initializes a `LinearRegressor` instance.
+
+    Args:
+      feature_columns: An iterable containing all the feature columns used by
+        the model. All items in the set should be instances of classes derived
+        from `FeatureColumn`.
+      model_dir: Directory to save model parameters, graph and etc. This can
+        also be used to load checkpoints from the directory into a estimator
+        to continue training a previously saved model.
+      label_dimension: Number of regression targets per example. This is the
+        size of the last dimension of the labels and logits `Tensor` objects
+        (typically, these have shape `[batch_size, label_dimension]`).
+      weight_feature_key: A string defining feature column name representing
+        weights. It is used to down weight or boost examples during training. It
+        will be multiplied by the loss of the example.
+      optimizer: string, `tf.Optimizer` object, or callable that returns
+        `tf.Optimizer`. Defines the optimizer to use for training. If `None`,
+        will use the FTRL optimizer.
+      config: `RunConfig` object to configure the runtime settings.
+      partitioner: Optional. Partitioner for input layer.
+    """
+    super(LinearRegressor, self).__init__(
+        model_fn=_linear_model_fn,
+        model_dir=model_dir,
+        config=config,
+        params={
+            # pylint: disable=protected-access
+            'head': head_lib._regression_head_with_mean_squared_error_loss(
+                label_dimension=label_dimension,
+                weight_feature_key=weight_feature_key),
+            # pylint: enable=protected-access
+            'feature_columns': feature_columns,
+            'optimizer': optimizer,
+            'partitioner': partitioner,
+        })
diff --git a/tensorflow/python/estimator/canned/linear_test.py b/tensorflow/python/estimator/canned/linear_test.py
new file mode 100644
index 0000000000..ca3af89473
--- /dev/null
+++ b/tensorflow/python/estimator/canned/linear_test.py
@@ -0,0 +1,662 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for linear.py."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+import shutil
+import tempfile
+
+import numpy as np
+import six
+
+from tensorflow.python.client import session as tf_session
+from tensorflow.python.estimator import estimator
+from tensorflow.python.estimator import run_config
+from tensorflow.python.estimator.canned import linear
+from tensorflow.python.estimator.canned import metric_keys
+from tensorflow.python.estimator.export import export
+from tensorflow.python.estimator.inputs import numpy_io
+from tensorflow.python.feature_column import feature_column as feature_column_lib
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.framework import sparse_tensor
+from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import state_ops
+from tensorflow.python.ops import variable_scope
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import gfile
+from tensorflow.python.platform import test
+from tensorflow.python.training import checkpoint_utils
+from tensorflow.python.training import optimizer
+from tensorflow.python.training import saver
+from tensorflow.python.training import session_run_hook
+
+
+# Names of variables created by model.
+_AGE_WEIGHT_NAME = 'linear/linear_model/age/weights'
+_HEIGHT_WEIGHT_NAME = 'linear/linear_model/height/weights'
+_BIAS_NAME = 'linear/linear_model/bias_weights'
+_LANGUAGE_WEIGHT_NAME = 'linear/linear_model/language/weights'
+
+
+def _save_variables_to_ckpt(model_dir):
+  init_all_op = [variables.global_variables_initializer()]
+  with tf_session.Session() as sess:
+    sess.run(init_all_op)
+    saver.Saver().save(sess, os.path.join(model_dir, 'model.ckpt'))
+
+
+class _CheckPartitionerVarHook(session_run_hook.SessionRunHook):
+  """A `SessionRunHook` to check a paritioned variable."""
+
+  def __init__(self, test_case, var_name, var_dim, partitions):
+    self._test_case = test_case
+    self._var_name = var_name
+    self._var_dim = var_dim
+    self._partitions = partitions
+
+  def begin(self):
+    with variable_scope.variable_scope(
+        variable_scope.get_variable_scope()) as scope:
+      scope.reuse_variables()
+      partitioned_weight = variable_scope.get_variable(
+          self._var_name, shape=(self._var_dim, 1))
+      self._test_case.assertTrue(
+          isinstance(partitioned_weight, variables.PartitionedVariable))
+      for part in partitioned_weight:
+        self._test_case.assertEqual(self._var_dim // self._partitions,
+                                    part.get_shape()[0])
+
+
+class LinearRegressorPartitionerTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def testPartitioner(self):
+    x_dim = 64
+    partitions = 4
+
+    def _partitioner(shape, dtype):
+      del dtype  # unused; required by Fn signature.
+      # Only partition the embedding tensor.
+      return [partitions, 1] if shape[0] == x_dim else [1]
+
+    regressor = linear.LinearRegressor(
+        feature_columns=(
+            feature_column_lib.categorical_column_with_hash_bucket(
+                'language', hash_bucket_size=x_dim),),
+        partitioner=_partitioner,
+        model_dir=self._model_dir)
+
+    def _input_fn():
+      return {
+          'language': sparse_tensor.SparseTensor(
+              values=['english', 'spanish'],
+              indices=[[0, 0], [0, 1]],
+              dense_shape=[1, 2])
+      }, [[10.]]
+
+    hook = _CheckPartitionerVarHook(
+        self, _LANGUAGE_WEIGHT_NAME, x_dim, partitions)
+    regressor.train(
+        input_fn=_input_fn, steps=1, hooks=[hook])
+
+  def testDefaultPartitionerWithMultiplePsReplicas(self):
+    partitions = 2
+    x_dim = 4 * 64 << 20
+
+    class FakeRunConfig(run_config.RunConfig):
+
+      @property
+      def num_ps_replicas(self):
+        return partitions
+
+    # Mock the device setter as ps is not available on test machines.
+    with test.mock.patch.object(estimator,
+                                '_get_replica_device_setter',
+                                return_value=lambda _: '/cpu:0'):
+      linear_regressor = linear.LinearRegressor(
+          feature_columns=(
+              feature_column_lib.categorical_column_with_hash_bucket(
+                  'language', hash_bucket_size=x_dim),),
+          config=FakeRunConfig(),
+          model_dir=self._model_dir)
+
+      def _input_fn():
+        return {
+            'language': sparse_tensor.SparseTensor(
+                values=['english', 'spanish'],
+                indices=[[0, 0], [0, 1]],
+                dense_shape=[1, 2])
+        }, [[10.]]
+
+      hook = _CheckPartitionerVarHook(
+          self, _LANGUAGE_WEIGHT_NAME, x_dim, partitions)
+      linear_regressor.train(
+          input_fn=_input_fn, steps=1, hooks=[hook])
+
+
+# TODO(b/36813849): Add tests with dynamic shape inputs using placeholders.
+class LinearRegressorEvaluationTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def test_evaluation_for_simple_data(self):
+    with ops.Graph().as_default():
+      variables.Variable([[11.0]], name=_AGE_WEIGHT_NAME)
+      variables.Variable([2.0], name=_BIAS_NAME)
+      variables.Variable(
+          100, name=ops.GraphKeys.GLOBAL_STEP, dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('age'),),
+        model_dir=self._model_dir)
+    eval_metrics = linear_regressor.evaluate(
+        input_fn=lambda: ({'age': ((1,),)}, ((10.,),)), steps=1)
+
+    # Logit is (1. * 11.0 + 2.0) = 13, while label is 10. Loss is 3**2 = 9.
+    self.assertDictEqual({
+        metric_keys.MetricKeys.LOSS: 9.,
+        metric_keys.MetricKeys.LOSS_MEAN: 9.,
+        ops.GraphKeys.GLOBAL_STEP: 100
+    }, eval_metrics)
+
+  def test_evaluation_batch(self):
+    """Tests evaluation for batch_size==2."""
+    with ops.Graph().as_default():
+      variables.Variable([[11.0]], name=_AGE_WEIGHT_NAME)
+      variables.Variable([2.0], name=_BIAS_NAME)
+      variables.Variable(
+          100, name=ops.GraphKeys.GLOBAL_STEP, dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('age'),),
+        model_dir=self._model_dir)
+    eval_metrics = linear_regressor.evaluate(
+        input_fn=lambda: ({'age': ((1,), (1,))}, ((10.,), (10.,))), steps=1)
+
+    # Logit is (1. * 11.0 + 2.0) = 13, while label is 10.
+    # Loss per example is 3**2 = 9.
+    # Training loss is the sum over batch = 9 + 9 = 18
+    # Average loss is the average over batch = 9
+    self.assertDictEqual({
+        metric_keys.MetricKeys.LOSS: 18.,
+        metric_keys.MetricKeys.LOSS_MEAN: 9.,
+        ops.GraphKeys.GLOBAL_STEP: 100
+    }, eval_metrics)
+
+  def test_evaluation_weights(self):
+    """Tests evaluation with weights."""
+    with ops.Graph().as_default():
+      variables.Variable([[11.0]], name=_AGE_WEIGHT_NAME)
+      variables.Variable([2.0], name=_BIAS_NAME)
+      variables.Variable(
+          100, name=ops.GraphKeys.GLOBAL_STEP, dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    def _input_fn():
+      features = {
+          'age': ((1,), (1,)),
+          'weights': ((1.,), (2.,))
+      }
+      labels = ((10.,), (10.,))
+      return features, labels
+
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('age'),),
+        weight_feature_key='weights',
+        model_dir=self._model_dir)
+    eval_metrics = linear_regressor.evaluate(input_fn=_input_fn, steps=1)
+
+    # Logit is (1. * 11.0 + 2.0) = 13, while label is 10.
+    # Loss per example is 3**2 = 9.
+    # Training loss is the weighted sum over batch = 9 + 2*9 = 27
+    # average loss is the weighted average = 9 + 2*9 / (1 + 2) = 9
+    self.assertDictEqual({
+        metric_keys.MetricKeys.LOSS: 27.,
+        metric_keys.MetricKeys.LOSS_MEAN: 9.,
+        ops.GraphKeys.GLOBAL_STEP: 100
+    }, eval_metrics)
+
+  def test_evaluation_for_multi_dimensions(self):
+    x_dim = 3
+    label_dim = 2
+    with ops.Graph().as_default():
+      variables.Variable(
+          [[1.0, 2.0],
+           [3.0, 4.0],
+           [5.0, 6.0]],
+          name=_AGE_WEIGHT_NAME)
+      variables.Variable([7.0, 8.0], name=_BIAS_NAME)
+      variables.Variable(100, name='global_step', dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(
+            feature_column_lib.numeric_column('age', shape=(x_dim,)),),
+        label_dimension=label_dim,
+        model_dir=self._model_dir)
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            'age': np.array([[2., 4., 5.]]),
+        },
+        y=np.array([[46., 58.]]),
+        batch_size=1,
+        num_epochs=None,
+        shuffle=False)
+    eval_metrics = linear_regressor.evaluate(
+        input_fn=input_fn, steps=1)
+
+    self.assertItemsEqual((
+        metric_keys.MetricKeys.LOSS,
+        metric_keys.MetricKeys.LOSS_MEAN,
+        ops.GraphKeys.GLOBAL_STEP
+    ), eval_metrics.keys())
+
+    # Logit is
+    #   [2., 4., 5.] * [1.0, 2.0] + [7.0, 8.0] = [39, 50] + [7.0, 8.0]
+    #                  [3.0, 4.0]
+    #                  [5.0, 6.0]
+    # which is [46, 58]
+    self.assertAlmostEqual(0, eval_metrics[metric_keys.MetricKeys.LOSS])
+
+  def test_evaluation_for_multiple_feature_columns(self):
+    with ops.Graph().as_default():
+      variables.Variable([[10.0]], name=_AGE_WEIGHT_NAME)
+      variables.Variable([[2.0]], name=_HEIGHT_WEIGHT_NAME)
+      variables.Variable([5.0], name=_BIAS_NAME)
+      variables.Variable(
+          100, name=ops.GraphKeys.GLOBAL_STEP, dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    batch_size = 2
+    feature_columns = [
+        feature_column_lib.numeric_column('age'),
+        feature_column_lib.numeric_column('height')
+    ]
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            'age': np.array([20, 40]),
+            'height': np.array([4, 8])
+        },
+        y=np.array([[213.], [421.]]),
+        batch_size=batch_size,
+        num_epochs=None,
+        shuffle=False)
+
+    est = linear.LinearRegressor(
+        feature_columns=feature_columns,
+        model_dir=self._model_dir)
+
+    eval_metrics = est.evaluate(input_fn=input_fn, steps=1)
+    self.assertItemsEqual((
+        metric_keys.MetricKeys.LOSS,
+        metric_keys.MetricKeys.LOSS_MEAN,
+        ops.GraphKeys.GLOBAL_STEP
+    ), eval_metrics.keys())
+
+    # Logit is [(20. * 10.0 + 4 * 2.0 + 5.0), (40. * 10.0 + 8 * 2.0 + 5.0)] =
+    # [213.0, 421.0], while label is [213., 421.]. Loss = 0.
+    self.assertAlmostEqual(0, eval_metrics[metric_keys.MetricKeys.LOSS])
+
+
+class LinearRegressorPredictTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def test_1d(self):
+    """Tests predict when all variables are one-dimensional."""
+    with ops.Graph().as_default():
+      variables.Variable([[10.]], name='linear/linear_model/x/weights')
+      variables.Variable([.2], name=_BIAS_NAME)
+      variables.Variable(100, name='global_step', dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('x'),),
+        model_dir=self._model_dir)
+
+    predict_input_fn = numpy_io.numpy_input_fn(
+        x={'x': np.array([[2.]])}, y=None, batch_size=1, num_epochs=1,
+        shuffle=False)
+    predictions = linear_regressor.predict(input_fn=predict_input_fn)
+    predicted_scores = list([x['predictions'] for x in predictions])
+    # x * weight + bias = 2. * 10. + .2 = 20.2
+    self.assertAllClose([[20.2]], predicted_scores)
+
+  def testMultiDim(self):
+    """Tests predict when all variables are multi-dimenstional."""
+    batch_size = 2
+    label_dimension = 3
+    x_dim = 4
+    feature_columns = (
+        feature_column_lib.numeric_column('x', shape=(x_dim,)),)
+    with ops.Graph().as_default():
+      variables.Variable(  # shape=[x_dim, label_dimension]
+          [[1., 2., 3.],
+           [2., 3., 4.],
+           [3., 4., 5.],
+           [4., 5., 6.]],
+          name='linear/linear_model/x/weights')
+      variables.Variable(  # shape=[label_dimension]
+          [.2, .4, .6], name=_BIAS_NAME)
+      variables.Variable(100, name='global_step', dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=feature_columns,
+        label_dimension=label_dimension,
+        model_dir=self._model_dir)
+
+    predict_input_fn = numpy_io.numpy_input_fn(
+        # x shape=[batch_size, x_dim]
+        x={'x': np.array([[1., 2., 3., 4.],
+                          [5., 6., 7., 8.]])},
+        y=None, batch_size=batch_size, num_epochs=1, shuffle=False)
+    predictions = linear_regressor.predict(input_fn=predict_input_fn)
+    predicted_scores = list([x['predictions'] for x in predictions])
+    # score = x * weight + bias, shape=[batch_size, label_dimension]
+    self.assertAllClose(
+        [[30.2, 40.4, 50.6], [70.2, 96.4, 122.6]], predicted_scores)
+
+  def testTwoFeatureColumns(self):
+    """Tests predict with two feature columns."""
+    with ops.Graph().as_default():
+      variables.Variable([[10.]], name='linear/linear_model/x0/weights')
+      variables.Variable([[20.]], name='linear/linear_model/x1/weights')
+      variables.Variable([.2], name=_BIAS_NAME)
+      variables.Variable(100, name='global_step', dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(
+            feature_column_lib.numeric_column('x0'),
+            feature_column_lib.numeric_column('x1')),
+        model_dir=self._model_dir)
+
+    predict_input_fn = numpy_io.numpy_input_fn(
+        x={'x0': np.array([[2.]]),
+           'x1': np.array([[3.]])},
+        y=None, batch_size=1, num_epochs=1,
+        shuffle=False)
+    predictions = linear_regressor.predict(input_fn=predict_input_fn)
+    predicted_scores = list([x['predictions'] for x in predictions])
+    # x0 * weight0 + x1 * weight1 + bias = 2. * 10. + 3. * 20 + .2 = 80.2
+    self.assertAllClose([[80.2]], predicted_scores)
+
+
+class LinearRegressorIntegrationTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def test_complete_flow(self):
+    label_dimension = 2
+    batch_size = 10
+    feature_columns = [
+        feature_column_lib.numeric_column('x', shape=(2,))
+    ]
+    est = linear.LinearRegressor(
+        feature_columns=feature_columns, label_dimension=label_dimension,
+        model_dir=self._model_dir)
+    data = np.linspace(0., 2., batch_size * label_dimension, dtype=np.float32)
+    data = data.reshape(batch_size, label_dimension)
+
+    # TRAIN
+    # learn y = x
+    train_input_fn = numpy_io.numpy_input_fn(
+        x={'x': data}, y=data, batch_size=batch_size, num_epochs=None,
+        shuffle=True)
+    est.train(train_input_fn, steps=200)
+
+    # EVALUTE
+    eval_input_fn = numpy_io.numpy_input_fn(
+        x={'x': data}, y=data, batch_size=batch_size, num_epochs=1,
+        shuffle=False)
+    scores = est.evaluate(eval_input_fn)
+    self.assertEqual(200, scores[ops.GraphKeys.GLOBAL_STEP])
+    self.assertIn(metric_keys.MetricKeys.LOSS, six.iterkeys(scores))
+
+    # PREDICT
+    predict_input_fn = numpy_io.numpy_input_fn(
+        x={'x': data}, y=None, batch_size=batch_size, num_epochs=1,
+        shuffle=False)
+    predictions = list(
+        [x['predictions'] for x in est.predict(predict_input_fn)])
+    self.assertAllClose(data, predictions, atol=0.01)
+
+    # EXPORT
+    feature_spec = feature_column_lib.make_parse_example_spec(
+        feature_columns)
+    serving_input_receiver_fn = export.build_parsing_serving_input_receiver_fn(
+        feature_spec)
+    export_dir = est.export_savedmodel(tempfile.mkdtemp(),
+                                       serving_input_receiver_fn)
+    self.assertTrue(gfile.Exists(export_dir))
+
+
+def _assert_close(expected, actual, rtol=1e-04, name='assert_close'):
+  with ops.name_scope(name, 'assert_close', (expected, actual, rtol)) as scope:
+    expected = ops.convert_to_tensor(expected, name='expected')
+    actual = ops.convert_to_tensor(actual, name='actual')
+    rdiff = math_ops.abs(expected - actual, 'diff') / expected
+    rtol = ops.convert_to_tensor(rtol, name='rtol')
+    return check_ops.assert_less(
+        rdiff,
+        rtol,
+        data=(
+            'Condition expected =~ actual did not hold element-wise:'
+            'expected = ', expected,
+            'actual = ', actual,
+            'rdiff = ', rdiff,
+            'rtol = ', rtol,
+        ),
+        name=scope)
+
+
+class LinearRegressorTrainingTest(test.TestCase):
+
+  def setUp(self):
+    self._model_dir = tempfile.mkdtemp()
+
+  def tearDown(self):
+    if self._model_dir:
+      shutil.rmtree(self._model_dir)
+
+  def _mockOptimizer(self, expected_loss=None):
+    expected_var_names = [
+        '%s/part_0:0' % _AGE_WEIGHT_NAME,
+        '%s/part_0:0' % _BIAS_NAME
+    ]
+
+    def _minimize(loss, global_step):
+      trainable_vars = ops.get_collection(ops.GraphKeys.TRAINABLE_VARIABLES)
+      self.assertItemsEqual(
+          expected_var_names,
+          [var.name for var in trainable_vars])
+
+      # Verify loss. We can't check the value directly, so we add an assert op.
+      self.assertEquals(0, loss.shape.ndims)
+      if expected_loss is None:
+        return state_ops.assign_add(global_step, 1).op
+      assert_loss = _assert_close(
+          math_ops.to_float(expected_loss, name='expected'), loss,
+          name='assert_loss')
+      with ops.control_dependencies((assert_loss,)):
+        return state_ops.assign_add(global_step, 1).op
+
+    mock_optimizer = test.mock.NonCallableMock(
+        spec=optimizer.Optimizer,
+        wraps=optimizer.Optimizer(use_locking=False, name='my_optimizer'))
+    mock_optimizer.minimize = test.mock.MagicMock(wraps=_minimize)
+
+    # NOTE: Estimator.params performs a deepcopy, which wreaks havoc with mocks.
+    # So, return mock_optimizer itself for deepcopy.
+    mock_optimizer.__deepcopy__ = lambda _: mock_optimizer
+    return mock_optimizer
+
+  def _assertCheckpoint(
+      self, expected_global_step, expected_age_weight=None, expected_bias=None):
+    shapes = {
+        name: shape for (name, shape) in
+        checkpoint_utils.list_variables(self._model_dir)
+    }
+
+    self.assertEqual([], shapes[ops.GraphKeys.GLOBAL_STEP])
+    self.assertEqual(
+        expected_global_step,
+        checkpoint_utils.load_variable(
+            self._model_dir, ops.GraphKeys.GLOBAL_STEP))
+
+    self.assertEqual([1, 1], shapes[_AGE_WEIGHT_NAME])
+    if expected_age_weight is not None:
+      self.assertEqual(
+          expected_age_weight,
+          checkpoint_utils.load_variable(self._model_dir, _AGE_WEIGHT_NAME))
+
+    self.assertEqual([1], shapes[_BIAS_NAME])
+    if expected_bias is not None:
+      self.assertEqual(
+          expected_bias,
+          checkpoint_utils.load_variable(self._model_dir, _BIAS_NAME))
+
+  def testFromScratchWithDefaultOptimizer(self):
+    # Create LinearRegressor.
+    label = 5.
+    age = 17
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('age'),),
+        model_dir=self._model_dir)
+
+    # Train for a few steps, and validate final checkpoint.
+    num_steps = 10
+    linear_regressor.train(
+        input_fn=lambda: ({'age': ((age,),)}, ((label,),)), steps=num_steps)
+    self._assertCheckpoint(num_steps)
+
+  def testFromScratch(self):
+    # Create LinearRegressor.
+    label = 5.
+    age = 17
+    # loss = (logits - label)^2 = (0 - 5.)^2 = 25.
+    mock_optimizer = self._mockOptimizer(expected_loss=25.)
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('age'),),
+        model_dir=self._model_dir, optimizer=mock_optimizer)
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Train for a few steps, and validate optimizer and final checkpoint.
+    num_steps = 10
+    linear_regressor.train(
+        input_fn=lambda: ({'age': ((age,),)}, ((label,),)), steps=num_steps)
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    self._assertCheckpoint(
+        expected_global_step=num_steps,
+        expected_age_weight=0.,
+        expected_bias=0.)
+
+  def testFromCheckpoint(self):
+    # Create initial checkpoint.
+    age_weight = 10.0
+    bias = 5.0
+    initial_global_step = 100
+    with ops.Graph().as_default():
+      variables.Variable([[age_weight]], name=_AGE_WEIGHT_NAME)
+      variables.Variable([bias], name=_BIAS_NAME)
+      variables.Variable(
+          initial_global_step, name=ops.GraphKeys.GLOBAL_STEP,
+          dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    # logits = age * age_weight + bias = 17 * 10. + 5. = 175
+    # loss = (logits - label)^2 = (175 - 5)^2 = 28900
+    mock_optimizer = self._mockOptimizer(expected_loss=28900.)
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('age'),),
+        model_dir=self._model_dir, optimizer=mock_optimizer)
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Train for a few steps, and validate optimizer and final checkpoint.
+    num_steps = 10
+    linear_regressor.train(
+        input_fn=lambda: ({'age': ((17,),)}, ((5.,),)), steps=num_steps)
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    self._assertCheckpoint(
+        expected_global_step=initial_global_step + num_steps,
+        expected_age_weight=age_weight,
+        expected_bias=bias)
+
+  def testFromCheckpointMultiBatch(self):
+    # Create initial checkpoint.
+    age_weight = 10.0
+    bias = 5.0
+    initial_global_step = 100
+    with ops.Graph().as_default():
+      variables.Variable([[age_weight]], name=_AGE_WEIGHT_NAME)
+      variables.Variable([bias], name=_BIAS_NAME)
+      variables.Variable(
+          initial_global_step, name=ops.GraphKeys.GLOBAL_STEP,
+          dtype=dtypes.int64)
+      _save_variables_to_ckpt(self._model_dir)
+
+    # logits = age * age_weight + bias
+    # logits[0] = 17 * 10. + 5. = 175
+    # logits[1] = 15 * 10. + 5. = 155
+    # loss = sum(logits - label)^2 = (175 - 5)^2 + (155 - 3)^2 = 52004
+    mock_optimizer = self._mockOptimizer(expected_loss=52004.)
+    linear_regressor = linear.LinearRegressor(
+        feature_columns=(feature_column_lib.numeric_column('age'),),
+        model_dir=self._model_dir, optimizer=mock_optimizer)
+    self.assertEqual(0, mock_optimizer.minimize.call_count)
+
+    # Train for a few steps, and validate optimizer and final checkpoint.
+    num_steps = 10
+    linear_regressor.train(
+        input_fn=lambda: ({'age': ((17,), (15,))}, ((5.,), (3.,))),
+        steps=num_steps)
+    self.assertEqual(1, mock_optimizer.minimize.call_count)
+    self._assertCheckpoint(
+        expected_global_step=initial_global_step + num_steps,
+        expected_age_weight=age_weight,
+        expected_bias=bias)
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/estimator/canned/metric_keys.py b/tensorflow/python/estimator/canned/metric_keys.py
new file mode 100644
index 0000000000..1261d1dcfb
--- /dev/null
+++ b/tensorflow/python/estimator/canned/metric_keys.py
@@ -0,0 +1,41 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Enum for model prediction keys."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.estimator import model_fn
+
+
+# TODO(pucker): Merge with model_fn.MetricKeys once we've worked out out naming
+# conventions.
+class MetricKeys(object):
+  """Metric key strings."""
+  LOSS = model_fn.MetricKeys.LOSS
+  LOSS_MEAN = model_fn.MetricKeys.AVERAGE_LOSS
+
+  ACCURACY = 'accuracy'
+  ACCURACY_BASELINE = 'accuracy_baseline'
+  AUC = 'auc'
+  AUC_PR = 'auc_precision_recall'
+  LABEL_MEAN = 'label/mean'
+  PREDICTION_MEAN = 'prediction/mean'
+
+  # The following require a threshold applied, should be float in range (0, 1).
+  ACCURACY_AT_THRESHOLD = 'accuracy/positive_threshold_%g'
+  PRECISION_AT_THRESHOLD = 'precision/positive_threshold_%g'
+  RECALL_AT_THRESHOLD = 'recall/positive_threshold_%g'
diff --git a/tensorflow/python/estimator/canned/optimizers.py b/tensorflow/python/estimator/canned/optimizers.py
new file mode 100644
index 0000000000..f72c5ca5cb
--- /dev/null
+++ b/tensorflow/python/estimator/canned/optimizers.py
@@ -0,0 +1,78 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Methods related to optimizers used in canned_estimators."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import six
+
+
+from tensorflow.python.training import adagrad
+from tensorflow.python.training import adam
+from tensorflow.python.training import ftrl
+from tensorflow.python.training import gradient_descent
+from tensorflow.python.training import optimizer as optimizer_lib
+from tensorflow.python.training import rmsprop
+
+
+_OPTIMIZER_CLS_NAMES = {
+    'Adagrad': adagrad.AdagradOptimizer,
+    'Adam': adam.AdamOptimizer,
+    'Ftrl': ftrl.FtrlOptimizer,
+    'RMSProp': rmsprop.RMSPropOptimizer,
+    'SGD': gradient_descent.GradientDescentOptimizer,
+}
+
+
+def get_optimizer_instance(opt, learning_rate=None):
+  """Returns an optimizer instance.
+
+  Supports the following types for the given `opt`:
+  * An `Optimizer` instance: Returns the given `opt`.
+  * A string: Creates an `Optimizer` subclass with the given `learning_rate`.
+    Supported strings:
+    * 'Adagrad': Returns an `AdagradOptimizer`.
+    * 'Adam': Returns an `AdamOptimizer`.
+    * 'Ftrl': Returns an `FtrlOptimizer`.
+    * 'RMSProp': Returns an `RMSPropOptimizer`.
+    * 'SGD': Returns a `GradientDescentOptimizer`.
+
+  Args:
+    opt: An `Optimizer` instance, or string, as discussed above.
+    learning_rate: A float. Only used if `opt` is a string.
+
+  Returns:
+    An `Optimizer` instance.
+
+  Raises:
+    ValueError: If `opt` is an unsupported string.
+    ValueError: If `opt` is a supported string but `learning_rate` was not
+      specified.
+    ValueError: If `opt` is none of the above types.
+  """
+  if isinstance(opt, six.string_types):
+    if opt in six.iterkeys(_OPTIMIZER_CLS_NAMES):
+      if not learning_rate:
+        raise ValueError('learning_rate must be specified when opt is string.')
+      return _OPTIMIZER_CLS_NAMES[opt](learning_rate=learning_rate)
+    raise ValueError(
+        'Unsupported optimizer name: {}. Supported names are: {}'.format(
+            opt, tuple(sorted(six.iterkeys(_OPTIMIZER_CLS_NAMES)))))
+  if not isinstance(opt, optimizer_lib.Optimizer):
+    raise ValueError(
+        'The given object is not an Optimizer instance. Given: {}'.format(opt))
+  return opt
diff --git a/tensorflow/python/estimator/canned/optimizers_test.py b/tensorflow/python/estimator/canned/optimizers_test.py
new file mode 100644
index 0000000000..ee28756155
--- /dev/null
+++ b/tensorflow/python/estimator/canned/optimizers_test.py
@@ -0,0 +1,85 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for optimizers.py."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.estimator.canned import optimizers
+from tensorflow.python.platform import test
+from tensorflow.python.training import adagrad
+from tensorflow.python.training import adam
+from tensorflow.python.training import ftrl
+from tensorflow.python.training import gradient_descent
+from tensorflow.python.training import optimizer as optimizer_lib
+from tensorflow.python.training import rmsprop
+
+
+class GetOptimizerInstance(test.TestCase):
+
+  def test_unsupported_name(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'Unsupported optimizer name: unsupported_name'):
+      optimizers.get_optimizer_instance('unsupported_name', learning_rate=0.1)
+
+  def test_supported_name_but_learning_rate_none(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'learning_rate must be specified when opt is string'):
+      optimizers.get_optimizer_instance('Adagrad', learning_rate=None)
+
+  def test_adagrad(self):
+    opt = optimizers.get_optimizer_instance('Adagrad', learning_rate=0.1)
+    self.assertIsInstance(opt, adagrad.AdagradOptimizer)
+    self.assertAlmostEqual(0.1, opt._learning_rate)
+
+  def test_adam(self):
+    opt = optimizers.get_optimizer_instance('Adam', learning_rate=0.1)
+    self.assertIsInstance(opt, adam.AdamOptimizer)
+    self.assertAlmostEqual(0.1, opt._lr)
+
+  def test_ftrl(self):
+    opt = optimizers.get_optimizer_instance('Ftrl', learning_rate=0.1)
+    self.assertIsInstance(opt, ftrl.FtrlOptimizer)
+    self.assertAlmostEqual(0.1, opt._learning_rate)
+
+  def test_rmsprop(self):
+    opt = optimizers.get_optimizer_instance('RMSProp', learning_rate=0.1)
+    self.assertIsInstance(opt, rmsprop.RMSPropOptimizer)
+    self.assertAlmostEqual(0.1, opt._learning_rate)
+
+  def test_sgd(self):
+    opt = optimizers.get_optimizer_instance('SGD', learning_rate=0.1)
+    self.assertIsInstance(opt, gradient_descent.GradientDescentOptimizer)
+    self.assertAlmostEqual(0.1, opt._learning_rate)
+
+  def test_object(self):
+    class _TestOptimizer(optimizer_lib.Optimizer):
+
+      def __init__(self):
+        super(_TestOptimizer, self).__init__(
+            use_locking=False, name='TestOptimizer')
+
+    opt = optimizers.get_optimizer_instance(_TestOptimizer())
+    self.assertIsInstance(opt, _TestOptimizer)
+
+  def test_object_invalid(self):
+    with self.assertRaisesRegexp(
+        ValueError, 'The given object is not an Optimizer instance'):
+      optimizers.get_optimizer_instance((1, 2, 3))
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/estimator/canned/prediction_keys.py b/tensorflow/python/estimator/canned/prediction_keys.py
new file mode 100644
index 0000000000..3dfb9e184f
--- /dev/null
+++ b/tensorflow/python/estimator/canned/prediction_keys.py
@@ -0,0 +1,33 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Enum for model prediction keys."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+
+class PredictionKeys(object):
+  """Enum for canonical model prediction keys.
+
+  The following values are defined:
+  PREDICTIONS: Used by models that predict values, such as regressor models.
+  """
+
+  CLASSES = 'classes'
+  LOGISTIC = 'logistic'
+  LOGITS = 'logits'
+  PREDICTIONS = 'predictions'
+  PROBABILITIES = 'probabilities'
-- 
GitLab


From 52c1afbb5490e13f2a674a79b81b947ade8ea437 Mon Sep 17 00:00:00 2001
From: Skye Wanderman-Milne <skyewm@google.com>
Date: Thu, 18 May 2017 14:38:35 -0700
Subject: [PATCH 1512/1563] Light refactoring of tf_session_helper.h/cc

A few changes to make these helper functions easier to understand and in preparation for adding TF_SessionRun() functionality:
- move all typedefs to .h
- get rid of simple std::vector<...> typedefs
- rename TF_Tensor_to_PyObject() to TFTensorToPyArray()
- pull out TF_Run_wrapper_helper() functionality into new PyArrayToTFTensor() function

PiperOrigin-RevId: 156480714
---
 tensorflow/python/client/tf_session.i         |   5 +-
 tensorflow/python/client/tf_session_helper.cc | 172 +++++++++---------
 tensorflow/python/client/tf_session_helper.h  |  16 +-
 tensorflow/python/lib/core/strings.i          |   3 +-
 4 files changed, 100 insertions(+), 96 deletions(-)

diff --git a/tensorflow/python/client/tf_session.i b/tensorflow/python/client/tf_session.i
index 902f02a256..4083611cf7 100644
--- a/tensorflow/python/client/tf_session.i
+++ b/tensorflow/python/client/tf_session.i
@@ -69,7 +69,8 @@ tensorflow::ImportNumpy();
 // represented as a list of strings.
 %typemap(in) const tensorflow::NameVector& (
     tensorflow::NameVector temp,
-    tensorflow::Safe_PyObjectPtr temp_string_list(tensorflow::make_safe(nullptr))) {
+    tensorflow::Safe_PyObjectPtr temp_string_list(
+        tensorflow::make_safe(static_cast<PyObject*>(nullptr)))) {
   if (!PyList_Check($input)) {
     SWIG_fail;
   }
@@ -116,7 +117,7 @@ tensorflow::ImportNumpy();
 
 // Build a Python list of outputs and return it.
 %typemap(argout) tensorflow::PyObjectVector* out_values {
-  tensorflow::Safe_PyObjectVector out_values_safe;
+  std::vector<tensorflow::Safe_PyObjectPtr> out_values_safe;
   for (size_t i = 0; i < $1->size(); ++i) {
     out_values_safe.emplace_back(tensorflow::make_safe($1->at(i)));
   }
diff --git a/tensorflow/python/client/tf_session_helper.cc b/tensorflow/python/client/tf_session_helper.cc
index 36aa49c7e5..a046c7ebb1 100644
--- a/tensorflow/python/client/tf_session_helper.cc
+++ b/tensorflow/python/client/tf_session_helper.cc
@@ -31,20 +31,8 @@ namespace tensorflow {
 
 namespace {
 
-// Container types for the various temporary values used internally in
-// the wrapper.
-
-// A TF_TensorVector is a vector of borrowed pointers to TF_Tensors.
-typedef gtl::InlinedVector<TF_Tensor*, 8> TF_TensorVector;
-
-// Safe containers for (an) owned TF_Tensor(s). On destruction, the
-// tensor will be deleted by TF_DeleteTensor.
-typedef std::unique_ptr<TF_Tensor, decltype(&TF_DeleteTensor)>
-    Safe_TF_TensorPtr;
-typedef std::vector<Safe_TF_TensorPtr> Safe_TF_TensorVector;
-Safe_TF_TensorPtr make_safe(TF_Tensor* tensor) {
-  return Safe_TF_TensorPtr(tensor, TF_DeleteTensor);
-}
+static const char* kFeedDictErrorMsg =
+    "feed_dict must be a dictionary mapping strings to NumPy arrays.";
 
 Status PyArrayDescr_to_TF_DataType(PyArray_Descr* descr,
                                    TF_DataType* out_tf_datatype) {
@@ -320,14 +308,14 @@ Status GetPyArrayDescrForTensor(const TF_Tensor* tensor,
   return Status::OK();
 }
 
-// Converts the given TF_Tensor to a Numpy array.
+// Converts the given TF_Tensor to a numpy ndarray.
 // If the returned status is OK, the caller becomes the owner of *out_array.
-Status TF_Tensor_to_PyObject(Safe_TF_TensorPtr tensor, PyObject** out_array) {
+Status TFTensorToPyArray(Safe_TF_TensorPtr tensor, PyObject** out_ndarray) {
   // A fetched operation will correspond to a null tensor, and a None
   // in Python.
   if (tensor == nullptr) {
     Py_INCREF(Py_None);
-    *out_array = Py_None;
+    *out_ndarray = Py_None;
     return Status::OK();
   }
 
@@ -345,7 +333,7 @@ Status TF_Tensor_to_PyObject(Safe_TF_TensorPtr tensor, PyObject** out_array) {
   if (moved != nullptr) {
     if (ArrayFromMemory(dims.size(), dims.data(), TF_TensorData(moved),
                         static_cast<DataType>(TF_TensorType(moved)),
-                        [moved] { TF_DeleteTensor(moved); }, out_array)
+                        [moved] { TF_DeleteTensor(moved); }, out_ndarray)
             .ok()) {
       return Status::OK();
     }
@@ -390,26 +378,90 @@ Status TF_Tensor_to_PyObject(Safe_TF_TensorPtr tensor, PyObject** out_array) {
   }
 
   // PyArray_Return turns rank 0 arrays into numpy scalars
-  *out_array = PyArray_Return(
+  *out_ndarray = PyArray_Return(
       reinterpret_cast<PyArrayObject*>(safe_out_array.release()));
   return Status::OK();
 }
 
+// Converts the given numpy ndarray to a (safe) TF_Tensor. If `ndarray` contains
+// a resource handle, `*resource_handle` will be set to the deserialized
+// handle. Otherwise it is set to nullptr. `resource_handle` and `out_tensor`
+// must be non-null. Caller retains ownership of `ndarray` and becomes owner of
+// `*resource_handle` if it's set.
+Status PyArrayToTFTensor(PyObject* ndarray, Safe_TF_TensorPtr* out_tensor,
+                         ResourceHandle** resource_handle) {
+  DCHECK(out_tensor != nullptr);
+  DCHECK(resource_handle != nullptr);
+  *resource_handle = nullptr;
+
+  // Make sure we dereference this array object in case of error, etc.
+  Safe_PyObjectPtr array_safe(make_safe(
+      PyArray_FromAny(ndarray, nullptr, 0, 0, NPY_ARRAY_CARRAY, nullptr)));
+  if (!array_safe) return errors::InvalidArgument(kFeedDictErrorMsg);
+  PyArrayObject* array = reinterpret_cast<PyArrayObject*>(array_safe.get());
+
+  // Convert numpy dtype to TensorFlow dtype.
+  TF_DataType dtype = TF_FLOAT;
+  TF_RETURN_IF_ERROR(PyArray_TYPE_to_TF_DataType(array, &dtype));
+
+  tensorflow::int64 nelems = 1;
+  gtl::InlinedVector<int64_t, 4> dims;
+  for (int i = 0; i < PyArray_NDIM(array); ++i) {
+    dims.push_back(PyArray_SHAPE(array)[i]);
+    nelems *= dims[i];
+  }
+
+  // Create a TF_Tensor based on the fed data. In the case of non-string data
+  // type, this steals a reference to array, which will be relinquished when
+  // the underlying buffer is deallocated. For string, a new temporary buffer
+  // is allocated into which the strings are encoded.
+  if (dtype == TF_RESOURCE) {
+    const string serialized(reinterpret_cast<char*>(PyArray_DATA(array)),
+                            PyArray_NBYTES(array));
+    *resource_handle = new ResourceHandle();
+    (*resource_handle)->ParseFromString(serialized);
+    TF_Tensor* tf_tensor =
+        TF_AllocateTensor(dtype, {}, 0, sizeof(ResourceHandle));
+    std::memcpy(TF_TensorData(tf_tensor),
+                reinterpret_cast<void*>(*resource_handle),
+                sizeof(ResourceHandle));
+    *out_tensor = make_safe(tf_tensor);
+  } else if (dtype != TF_STRING) {
+    size_t size = PyArray_NBYTES(array);
+    array_safe.release();
+    *out_tensor = make_safe(TF_NewTensor(dtype, dims.data(), dims.size(),
+                                         PyArray_DATA(array), size,
+                                         &DelayedNumpyDecref, array));
+  } else {
+    size_t size = 0;
+    void* encoded = nullptr;
+    TF_RETURN_IF_ERROR(EncodePyBytesArray(array, nelems, &size, &encoded));
+    *out_tensor =
+        make_safe(TF_NewTensor(dtype, dims.data(), dims.size(), encoded, size,
+                               [](void* data, size_t len, void* arg) {
+                                 delete[] reinterpret_cast<char*>(data);
+                               },
+                               array));
+  }
+  return Status::OK();
+}
+
 }  // namespace
 
 Safe_PyObjectPtr make_safe(PyObject* o) {
   return Safe_PyObjectPtr(o, Py_DECREF_wrapper);
 }
 
+Safe_TF_TensorPtr make_safe(TF_Tensor* tensor) {
+  return Safe_TF_TensorPtr(tensor, TF_DeleteTensor);
+}
+
 void TF_Run_wrapper_helper(TF_DeprecatedSession* session, const char* handle,
                            const TF_Buffer* run_options, PyObject* feed_dict,
                            const NameVector& output_names,
                            const NameVector& target_nodes,
                            TF_Status* out_status, PyObjectVector* out_values,
                            TF_Buffer* run_outputs) {
-  static const char* kFeedDictErrorMsg =
-      "feed_dict must be a dictionary mapping strings to NumPy arrays.";
-
   // 1. Convert the feed inputs to the appropriate form for TF_Run.
   if (!PyDict_Check(feed_dict)) {
     Set_TF_Status_from_Status(out_status,
@@ -418,7 +470,7 @@ void TF_Run_wrapper_helper(TF_DeprecatedSession* session, const char* handle,
   }
 
   NameVector input_names;
-  Safe_TF_TensorVector inputs_safe;  // Used to delete tensors.
+  std::vector<Safe_TF_TensorPtr> inputs_safe;  // Used to delete tensors.
   TF_TensorVector inputs_unsafe;     // Used to contain the arg to TF_Run.
 
   PyObject* key;
@@ -437,71 +489,13 @@ void TF_Run_wrapper_helper(TF_DeprecatedSession* session, const char* handle,
     }
     input_names.push_back(key_string);
 
-    // The array object will be dereferenced at the end of this iteration
-    // (or if we return early due to an error).
-    Safe_PyObjectPtr array_safe(make_safe(
-        PyArray_FromAny(value, nullptr, 0, 0, NPY_ARRAY_CARRAY, nullptr)));
-    if (!array_safe) {
-      Set_TF_Status_from_Status(out_status,
-                                errors::InvalidArgument(kFeedDictErrorMsg));
-      return;
-    }
-    PyArrayObject* array = reinterpret_cast<PyArrayObject*>(array_safe.get());
-
-    // Convert numpy dtype to TensorFlow dtype.
-    TF_DataType dtype = TF_FLOAT;
-    s = PyArray_TYPE_to_TF_DataType(array, &dtype);
-    if (!s.ok()) {
-      Set_TF_Status_from_Status(out_status, s);
-      return;
-    }
-
-    tensorflow::int64 nelems = 1;
-    gtl::InlinedVector<int64_t, 4> dims;
-    for (int i = 0; i < PyArray_NDIM(array); ++i) {
-      dims.push_back(PyArray_SHAPE(array)[i]);
-      nelems *= dims[i];
-    }
-
-    // Create a TF_Tensor based on the fed data. In the case of non-string data
-    // type, this steals a reference to array, which will be relinquished when
-    // the underlying buffer is deallocated. For string, a new temporary buffer
-    // is allocated into which the strings are encoded.
-    if (dtype == TF_RESOURCE) {
-      const string serialized(reinterpret_cast<char*>(PyArray_DATA(array)),
-                              PyArray_NBYTES(array));
-      std::shared_ptr<ResourceHandle> resource_handle(new ResourceHandle());
-      resource_handle->ParseFromString(serialized);
+    inputs_safe.emplace_back(make_safe(static_cast<TF_Tensor*>(nullptr)));
+    ResourceHandle* resource_handle;
+    s = PyArrayToTFTensor(value, &inputs_safe.back(), &resource_handle);
+    inputs_unsafe.push_back(inputs_safe.back().get());
+    if (resource_handle != nullptr) {
       resource_handles.emplace_back(resource_handle);
-      TF_Tensor* tensor =
-          TF_AllocateTensor(dtype, {}, 0, sizeof(ResourceHandle));
-      std::memcpy(TF_TensorData(tensor),
-                  reinterpret_cast<void*>(resource_handle.get()),
-                  sizeof(ResourceHandle));
-      inputs_safe.emplace_back(make_safe(tensor));
-    } else if (dtype != TF_STRING) {
-      size_t size = PyArray_NBYTES(array);
-      array_safe.release();
-      TF_Tensor* tensor =
-          TF_NewTensor(dtype, dims.data(), dims.size(), PyArray_DATA(array),
-                       size, &DelayedNumpyDecref, array);
-      inputs_safe.emplace_back(make_safe(tensor));
-    } else {
-      size_t size = 0;
-      void* encoded = nullptr;
-      Status s = EncodePyBytesArray(array, nelems, &size, &encoded);
-      if (!s.ok()) {
-        Set_TF_Status_from_Status(out_status, s);
-        return;
-      }
-      inputs_safe.emplace_back(
-          make_safe(TF_NewTensor(dtype, dims.data(), dims.size(), encoded, size,
-                                 [](void* data, size_t len, void* arg) {
-                                   delete[] reinterpret_cast<char*>(data);
-                                 },
-                                 array)));
     }
-    inputs_unsafe.push_back(inputs_safe.back().get());
     ++index;
   }
 
@@ -539,17 +533,17 @@ void TF_Run_wrapper_helper(TF_DeprecatedSession* session, const char* handle,
 
   // 4. We now own the fetched tensors, so set up a safe container to
   // delete them when we exit this scope.
-  Safe_TF_TensorVector tf_outputs_safe;
+  std::vector<Safe_TF_TensorPtr> tf_outputs_safe;
   for (const auto& output : outputs) {
     tf_outputs_safe.emplace_back(make_safe(output));
   }
 
   // 5. Convert the fetched tensors into numpy ndarrays. Store them in a safe
   // container so that we do not leak
-  Safe_PyObjectVector py_outputs_safe;
+  std::vector<Safe_PyObjectPtr> py_outputs_safe;
   for (size_t i = 0; i < output_names.size(); ++i) {
     PyObject* py_array;
-    s = TF_Tensor_to_PyObject(std::move(tf_outputs_safe[i]), &py_array);
+    s = TFTensorToPyArray(std::move(tf_outputs_safe[i]), &py_array);
     if (!s.ok()) {
       Set_TF_Status_from_Status(out_status, s);
       return;
diff --git a/tensorflow/python/client/tf_session_helper.h b/tensorflow/python/client/tf_session_helper.h
index b36faf1f95..8cbacdd1dc 100644
--- a/tensorflow/python/client/tf_session_helper.h
+++ b/tensorflow/python/client/tf_session_helper.h
@@ -37,14 +37,24 @@ typedef tensorflow::gtl::InlinedVector<const char*, 8> NameVector;
 // A PyObjectVector is a vector of borrowed pointers to PyObjects.
 typedef tensorflow::gtl::InlinedVector<PyObject*, 8> PyObjectVector;
 
-// Safe containers for (an) owned PyObject(s). On destruction, the
-// reference count of the contained object will be decremented.
+// A TF_TensorVector is a vector of borrowed pointers to TF_Tensors.
+typedef gtl::InlinedVector<TF_Tensor*, 8> TF_TensorVector;
+
+// Safe container for an owned PyObject. On destruction, the reference count of
+// the contained object will be decremented.
 inline void Py_DECREF_wrapper(PyObject* o) { Py_DECREF(o); }
+// Note: can't use decltype(&Py_DECREF_wrapper) due to SWIG
 typedef void (*Py_DECREF_wrapper_type)(PyObject*);
 typedef std::unique_ptr<PyObject, Py_DECREF_wrapper_type> Safe_PyObjectPtr;
-typedef std::vector<Safe_PyObjectPtr> Safe_PyObjectVector;
 Safe_PyObjectPtr make_safe(PyObject* o);
 
+// Safe containers for an owned TF_Tensor. On destruction, the tensor will be
+// deleted by TF_DeleteTensor.
+// Note: can't use decltype(&TF_DeleteTensor) due to SWIG
+typedef void (*TF_DeleteTensor_type)(TF_Tensor*);
+typedef std::unique_ptr<TF_Tensor, TF_DeleteTensor_type> Safe_TF_TensorPtr;
+Safe_TF_TensorPtr make_safe(TF_Tensor* tensor);
+
 // Run the graph associated with the session starting with the
 // supplied inputs[].  Regardless of success or failure, inputs[] are
 // stolen by the implementation (i.e. the implementation will
diff --git a/tensorflow/python/lib/core/strings.i b/tensorflow/python/lib/core/strings.i
index d2b0558882..b74eb91cd5 100644
--- a/tensorflow/python/lib/core/strings.i
+++ b/tensorflow/python/lib/core/strings.i
@@ -87,7 +87,7 @@ bool _BytesToStringPiece(PyObject* obj, tensorflow::StringPiece* result) {
   if (!temp_string_list) {
     SWIG_fail;
   }
-  tensorflow::Safe_PyObjectVector converted;
+  std::vector<tensorflow::Safe_PyObjectPtr> converted;
   converted.reserve(size);
   for (const string& op : $1) {
     // Always treat strings as bytes, consistent with the typemap
@@ -103,4 +103,3 @@ bool _BytesToStringPiece(PyObject* obj, tensorflow::StringPiece* result) {
   }
   $result = temp_string_list.release();
 }
-
-- 
GitLab


From 25e78794ed7779edd94c72e7ba0e2ddd21e3c138 Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Thu, 18 May 2017 14:40:13 -0700
Subject: [PATCH 1513/1563] Start removing the d3v3 versions of TensorBoard
 components.

We couldn't get rid of tf_graph_app or vz_projector (or dependencies) because of standalone tools that depend on the d3v3 versions.

PiperOrigin-RevId: 156480925
---
 tensorflow/BUILD                              |   51 -
 .../components/tf_audio_dashboard/BUILD       |   62 -
 .../components/tf_audio_dashboard/demo/BUILD  |   26 -
 .../tf_audio_dashboard/demo/data/BUILD        |   17 -
 .../audio_run_run1_tag_au1_2Faudio_2F0.json   |    1 -
 .../audio_run_run2_tag_au2_2Faudio_2F0.json   |   20 -
 ...o_index_0_tag_au1_2Faudio_2F0_run_run1.wav |  Bin 8044 -> 0 bytes
 ...o_index_0_tag_au2_2Faudio_2F0_run_run2.wav |  Bin 8044 -> 0 bytes
 ...o_index_1_tag_au2_2Faudio_2F0_run_run2.wav |  Bin 490640 -> 0 bytes
 ...o_index_2_tag_au2_2Faudio_2F0_run_run2.wav |  Bin 205420 -> 0 bytes
 .../tf_audio_dashboard/demo/data/runs.json    |   10 -
 .../tf_audio_dashboard/demo/index.html        |   61 -
 .../test/audioDashboardTests.ts               |   45 -
 .../tf_audio_dashboard/test/data/runs.json    |    1 -
 .../tf_audio_dashboard/test/index.html        |   35 -
 .../tf-audio-dashboard.html                   |   87 -
 .../tf_audio_dashboard/tf-audio-grid.html     |  183 -
 .../tf_audio_dashboard/tf-audio-loader.html   |  237 -
 .../tensorboard/components/tf_backend/BUILD   |   89 -
 .../components/tf_backend/backend.ts          |  476 --
 .../components/tf_backend/behavior.ts         |  145 -
 .../components/tf_backend/requestManager.ts   |  178 -
 .../components/tf_backend/router.ts           |  109 -
 .../tf_backend/test/backendTests.ts           |  302 --
 .../tf_backend/test/behaviorTests.ts          |  163 -
 .../test/data/audio_run_run1_tag_audio1.json  |    1 -
 ...pressedHistograms_run_run1_tag_histo1.json |    1 -
 .../tf_backend/test/data/example.json         |    4 -
 .../data/histograms_run_run1_tag_histo1.json  |    1 -
 .../test/data/images_run_run1_tag_im1.json    |    1 -
 ...dividualImage_index_0_tag_im1_run_run1.png |  Bin 42 -> 0 bytes
 .../run_metadata_run_step99_tag_train.pbtxt   |   17 -
 .../components/tf_backend/test/data/runs.json |   32 -
 .../tf_backend/test/data/scalars.json         |    1 -
 ...rs_run_run1_tag_cross_entropy__281_29.json |    1 -
 .../components/tf_backend/test/index.html     |   46 -
 .../tf_backend/test/requestManagerTest.ts     |  291 --
 .../components/tf_backend/tf-backend.html     |   27 -
 .../components/tf_backend/urlPathHelpers.ts   |   42 -
 .../components/tf_color_scale/BUILD           |   75 -
 .../components/tf_color_scale/colorScale.ts   |   63 -
 .../components/tf_color_scale/demo/BUILD      |   26 -
 .../components/tf_color_scale/demo/index.html |   94 -
 .../components/tf_color_scale/palettes.ts     |   80 -
 .../tf_color_scale/test/colorScaleTests.ts    |   46 -
 .../components/tf_color_scale/test/index.html |   31 -
 .../tf_color_scale/tf-color-scale.html        |   55 -
 .../components/tf_dashboard_common/demo/BUILD |   31 -
 .../demo/tf-categorizer-demo.html             |  110 -
 .../demo/tf-collapsable-pane-demo.html        |   34 -
 .../demo/tf-multi-checkbox-demo.html          |  178 -
 .../demo/tf-regex-group-demo.html             |   49 -
 .../tf_distribution_dashboard/BUILD           |   62 -
 .../tf_distribution_dashboard/demo/BUILD      |   26 -
 .../tf_distribution_dashboard/demo/data/BUILD |   17 -
 ...pressedHistograms_run_run1_tag_histo1.json |  212 -
 ...pressedHistograms_run_run2_tag_histo1.json |  212 -
 ...pressedHistograms_run_run2_tag_histo2.json |  212 -
 .../demo/data/logdir                          |    1 -
 .../demo/data/runs.json                       |    4 -
 .../tf_distribution_dashboard/demo/index.html |   62 -
 .../tf-distribution-dashboard.html            |  124 -
 .../components/tf_graph_app_d3v4/BUILD        |   29 -
 .../components/tf_graph_app_d3v4/demo/BUILD   |    2 +-
 .../components/tf_graph_board_d3v4/demo/BUILD |    6 +-
 .../tf_graph_controls_d3v4/demo/BUILD         |    2 +-
 .../components/tf_graph_d3v4/demo/BUILD       |    6 +-
 .../components/tf_graph_dashboard/BUILD       |   57 -
 .../components/tf_graph_dashboard/demo/BUILD  |   24 -
 .../demo/data/graph_run_run1.pbtxt            | 4606 -----------------
 .../tf_graph_dashboard/demo/data/runs.json    |    6 -
 .../tf_graph_dashboard/demo/index.html        |   56 -
 .../tf-graph-dashboard.html                   |  300 --
 .../components/tf_graph_info_d3v4/demo/BUILD  |    6 +-
 .../tf_graph_loader_d3v4/demo/BUILD           |    2 +-
 .../components/tf_histogram_dashboard/BUILD   |   62 -
 .../tf_histogram_dashboard/demo/BUILD         |   26 -
 .../tf_histogram_dashboard/demo/data/BUILD    |   17 -
 .../data/histograms_run_run1_tag_histo1.json  |    1 -
 .../data/histograms_run_run2_tag_histo1.json  |    1 -
 .../data/histograms_run_run2_tag_histo2.json  |    1 -
 .../tf_histogram_dashboard/demo/data/logdir   |    1 -
 .../demo/data/runs.json                       |    4 -
 .../tf_histogram_dashboard/demo/index.html    |   61 -
 .../tf-histogram-dashboard.html               |  163 -
 .../components/tf_image_dashboard/BUILD       |   59 -
 .../components/tf_image_dashboard/demo/BUILD  |   25 -
 .../tf_image_dashboard/demo/data/BUILD        |   17 -
 .../images_run_run1_tag_im1_2Fimage_2F0.json  |    9 -
 .../images_run_run1_tag_im2_2Fimage_2F0.json  |    9 -
 .../images_run_run2_tag_im1_2Fimage_2F0.json  |    9 -
 ...e_tag_im1_2Fimage_2F0_index_0_run_run1.png |  Bin 118 -> 0 bytes
 ...e_tag_im1_2Fimage_2F0_index_0_run_run2.png |  Bin 120 -> 0 bytes
 ...e_tag_im2_2Fimage_2F0_index_0_run_run1.png |  Bin 120 -> 0 bytes
 .../tf_image_dashboard/demo/data/logdir       |    1 -
 .../tf_image_dashboard/demo/data/runs.json    |   13 -
 .../tf_image_dashboard/demo/index.html        |   66 -
 .../tf-image-dashboard.html                   |  156 -
 .../tf_image_dashboard/tf-image-loader.html   |  233 -
 .../tf-option-selector.html                   |   94 -
 .../components/tf_scalar_dashboard/BUILD      |   76 -
 .../components/tf_scalar_dashboard/demo/BUILD |   26 -
 .../tf_scalar_dashboard/demo/data/BUILD       |   17 -
 .../tf_scalar_dashboard/demo/data/logdir      |    1 -
 .../tf_scalar_dashboard/demo/data/runs.json   |    4 -
 .../demo/data/scalars.json                    |    1 -
 .../scalars_run_run1_tag_bar_2Fsquare.json    |    1 -
 .../data/scalars_run_run1_tag_foo_2Fcos.json  |    1 -
 .../data/scalars_run_run1_tag_foo_2Fsin.json  |    1 -
 .../scalars_run_run1_tag_foo_2Fsquare.json    |    1 -
 .../scalars_run_run2_tag_bar_2Fsquare.json    |    1 -
 .../data/scalars_run_run2_tag_foo_2Fcos.json  |    1 -
 .../scalars_run_run2_tag_foo_2Fsquare.json    |    1 -
 .../tf_scalar_dashboard/demo/index.html       |   62 -
 .../tf-scalar-dashboard.html                  |  270 -
 .../tf-smoothing-input.html                   |  138 -
 .../tf_tensorboard/autoReloadBehavior.ts      |   60 -
 .../tf_tensorboard/test/autoReloadTests.ts    |   85 -
 .../tf_tensorboard/test/e2eTests.html         |   31 -
 .../tf_tensorboard/test/e2eTests.ts           |   42 -
 .../tf_tensorboard/test/fastTabSwitch.html    |   31 -
 .../tf_tensorboard/test/fastTabSwitch.ts      |   44 -
 .../components/tf_tensorboard/test/index.html |   35 -
 .../tf_tensorboard/test/tensorboardTests.html |   44 -
 .../tf_tensorboard/test/tensorboardTests.ts   |  136 -
 .../tf_tensorboard/tf-tensorboard.html        |  352 --
 .../components/tf_text_dashboard/BUILD        |   60 -
 .../components/tf_text_dashboard/demo/BUILD   |   25 -
 .../tf_text_dashboard/demo/data/BUILD         |   17 -
 .../tf_text_dashboard/demo/data/logdir        |    1 -
 .../tf_text_dashboard/demo/data/runs.json     |    1 -
 .../demo/data/text_run_fry_tag_markdown.json  |   32 -
 .../demo/data/text_run_fry_tag_message.json   |   22 -
 .../demo/data/text_run_leela_tag_message.json |   22 -
 .../tf_text_dashboard/demo/index.html         |   68 -
 .../tf_text_dashboard/tf-text-dashboard.html  |  109 -
 .../tf_text_dashboard/tf-text-loader.html     |  143 -
 .../components/vz_distribution_chart/BUILD    |   77 -
 .../vz_distribution_chart/demo/BUILD          |   24 -
 .../vz_distribution_chart/demo/index.html     |   61 -
 .../vz-distribution-chart.html                |  142 -
 .../vz-distribution-chart.ts                  |  161 -
 .../components/vz_histogram_timeseries/BUILD  |   50 -
 .../vz_histogram_timeseries/demo/BUILD        |   25 -
 .../vz_histogram_timeseries/demo/index.html   |   84 -
 .../vz_histogram_timeseries/index.html        |   30 -
 .../vz-histogram-timeseries.html              |  709 ---
 .../vz_histogram_timeseries_d3v4/BUILD        |   27 +
 .../components/vz_line_chart/BUILD            |   83 -
 .../components/vz_line_chart/demo/BUILD       |   24 -
 .../components/vz_line_chart/demo/index.html  |   73 -
 .../vz_line_chart/dragZoomInteraction.ts      |  198 -
 .../components/vz_line_chart/index.html       |   30 -
 .../vz_line_chart/vz-chart-helpers.ts         |  217 -
 .../vz_line_chart/vz-line-chart.html          |  369 --
 .../components/vz_line_chart/vz-line-chart.ts |  581 ---
 .../components/vz_line_chart_d3v4/BUILD       |   44 +
 .../tensorboard/components/vz_sorting/BUILD   |    1 -
 .../components/vz_sorting_d3v4/BUILD          |   22 +
 159 files changed, 105 insertions(+), 15586 deletions(-)
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run1_tag_au1_2Faudio_2F0.json
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run2_tag_au2_2Faudio_2F0.json
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_0_tag_au1_2Faudio_2F0_run_run1.wav
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_0_tag_au2_2Faudio_2F0_run_run2.wav
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_1_tag_au2_2Faudio_2F0_run_run2.wav
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_2_tag_au2_2Faudio_2F0_run_run2.wav
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/test/audioDashboardTests.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/test/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/test/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-grid.html
 delete mode 100644 tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/backend.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/behavior.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/requestManager.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/router.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/backendTests.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/behaviorTests.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/audio_run_run1_tag_audio1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/compressedHistograms_run_run1_tag_histo1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/example.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/histograms_run_run1_tag_histo1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/images_run_run1_tag_im1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/individualImage_index_0_tag_im1_run_run1.png
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/run_metadata_run_step99_tag_train.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/scalars.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/test/requestManagerTest.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/tf-backend.html
 delete mode 100644 tensorflow/tensorboard/components/tf_backend/urlPathHelpers.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/colorScale.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/palettes.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/test/colorScaleTests.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/test/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_color_scale/tf-color-scale.html
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-categorizer-demo.html
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-collapsable-pane-demo.html
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-multi-checkbox-demo.html
 delete mode 100644 tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-regex-group-demo.html
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run1_tag_histo1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo2.json
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/logdir
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run1_tag_histo1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo1.json
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo2.json
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/logdir
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/logdir
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html
 delete mode 100644 tensorflow/tensorboard/components/tf_option_selector/tf-option-selector.html
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/logdir
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_scalar_dashboard/tf-smoothing-input.html
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/autoReloadBehavior.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/autoReloadTests.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.html
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.html
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.html
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/logdir
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/runs.json
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_markdown.json
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_message.json
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_leela_tag_message.json
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/tf_text_dashboard/tf-text-loader.html
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.html
 delete mode 100644 tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/index.html
 delete mode 100644 tensorflow/tensorboard/components/vz_histogram_timeseries/vz-histogram-timeseries.html
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/dragZoomInteraction.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/index.html
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.html
 delete mode 100644 tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index acd5c108f9..a2edc9f37c 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -324,98 +324,47 @@ filegroup(
         "//tensorflow/tensorboard/backend:all_files",
         "//tensorflow/tensorboard/backend/event_processing:all_files",
         "//tensorflow/tensorboard/components:all_files",
-        "//tensorflow/tensorboard/components/tf_audio_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo/data:all_files",
         "//tensorflow/tensorboard/components/tf_audio_dashboard_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_backend:all_files",
         "//tensorflow/tensorboard/components/tf_backend_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_backend_d3v4/test:all_files",
-        "//tensorflow/tensorboard/components/tf_color_scale:all_files",
-        "//tensorflow/tensorboard/components/tf_color_scale/demo:all_files",
         "//tensorflow/tensorboard/components/tf_color_scale_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_color_scale_d3v4/test:all_files",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:all_files",
-        "//tensorflow/tensorboard/components/tf_dashboard_common/demo:all_files",
         "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4/test:all_files",
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data:all_files",
         "//tensorflow/tensorboard/components/tf_distribution_dashboard_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_globals:all_files",
         "//tensorflow/tensorboard/components/tf_globals_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_graph:all_files",
-        "//tensorflow/tensorboard/components/tf_graph/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_app:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_app/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_app_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_app_d3v4/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_board:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_board/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_board_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_board_d3v4/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_common:all_files",
         "//tensorflow/tensorboard/components/tf_graph_common_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_controls:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_controls/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_d3v4/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_dashboard/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_info:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_info/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_info_d3v4/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_loader:all_files",
-        "//tensorflow/tensorboard/components/tf_graph_loader/demo:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data:all_files",
         "//tensorflow/tensorboard/components/tf_histogram_dashboard_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_image_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_image_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_image_dashboard/demo/data:all_files",
         "//tensorflow/tensorboard/components/tf_image_dashboard_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_imports:all_files",
         "//tensorflow/tensorboard/components/tf_imports_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_option_selector_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data:all_files",
         "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_scalar_dashboard_d3v4/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_storage:all_files",
         "//tensorflow/tensorboard/components/tf_storage_d3v4:all_files",
         "//tensorflow/tensorboard/components/tf_storage_d3v4/test:all_files",
         "//tensorflow/tensorboard/components/tf_tensorboard_d3v4:all_files",
-        "//tensorflow/tensorboard/components/tf_text_dashboard:all_files",
-        "//tensorflow/tensorboard/components/tf_text_dashboard/demo:all_files",
-        "//tensorflow/tensorboard/components/tf_text_dashboard/demo/data:all_files",
         "//tensorflow/tensorboard/components/tf_text_dashboard_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_data_summary:all_files",
-        "//tensorflow/tensorboard/components/vz_distribution_chart:all_files",
-        "//tensorflow/tensorboard/components/vz_distribution_chart/demo:all_files",
         "//tensorflow/tensorboard/components/vz_distribution_chart_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_heatmap:all_files",
         "//tensorflow/tensorboard/components/vz_heatmap_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries:all_files",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries/demo:all_files",
         "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_line_chart:all_files",
-        "//tensorflow/tensorboard/components/vz_line_chart/demo:all_files",
         "//tensorflow/tensorboard/components/vz_line_chart_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_projector:all_files",
         "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_projector_d3v4/test:all_files",
-        "//tensorflow/tensorboard/components/vz_sorting:all_files",
-        "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/components/vz_sorting_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_sorting_d3v4/test:all_files",
         "//tensorflow/tensorboard/demo:all_files",
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
deleted file mode 100644
index 010643b856..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/BUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_audio_dashboard",
-    srcs = [
-        "tf-audio-dashboard.html",
-        "tf-audio-grid.html",
-        "tf-audio-loader.html",
-    ],
-    path = "/tf-audio-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-audio-dashboard.html",
-        "tf-audio-grid.html",
-        "tf-audio-loader.html",
-    ],
-    destdir = "tf-audio-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
deleted file mode 100644
index 394d7a8fa5..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_audio_dashboard/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-audio-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_audio_dashboard",
-        "//tensorflow/tensorboard/components/tf_audio_dashboard/demo/data",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
deleted file mode 100644
index 4c2c2ee9e5..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-audio-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run1_tag_au1_2Faudio_2F0.json b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run1_tag_au1_2Faudio_2F0.json
deleted file mode 100644
index 7dfe32c711..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run1_tag_au1_2Faudio_2F0.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"query": "index=0&tag=au1%2Faudio%2F0&run=run1", "step": 0, "wall_time": 1461795049.203407, "content_type": "audio/wav"}]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run2_tag_au2_2Faudio_2F0.json b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run2_tag_au2_2Faudio_2F0.json
deleted file mode 100644
index d29f7931a9..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/audio_run_run2_tag_au2_2Faudio_2F0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "query":"index=0&tag=au2%2Faudio%2F0&run=run2",
-    "step":0,
-    "wall_time":1461795049.212815,
-    "content_type":"audio/wav"
-  },
-  {
-    "query":"index=1&tag=au2%2Faudio%2F0&run=run2",
-    "step":42,
-    "wall_time":1461895689.243345,
-    "content_type":"audio/wav"
-  },
-  {
-    "query":"index=2&tag=au2%2Faudio%2F0&run=run2",
-    "step":4242,
-    "wall_time":1461954231.123456,
-    "content_type":"audio/wav"
-  }
-]
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_0_tag_au1_2Faudio_2F0_run_run1.wav b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_0_tag_au1_2Faudio_2F0_run_run1.wav
deleted file mode 100644
index f1d24adc0cef5a734e07e8899b9abf8ae26fa228..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8044
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
Td2!JEIB1?6G+%x+S*R2M8*8KV

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_0_tag_au2_2Faudio_2F0_run_run2.wav b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_0_tag_au2_2Faudio_2F0_run_run2.wav
deleted file mode 100644
index 006c84338f7313a225830f121bcd95f457de1708..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8044
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

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_1_tag_au2_2Faudio_2F0_run_run2.wav b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_1_tag_au2_2Faudio_2F0_run_run2.wav
deleted file mode 100644
index f27904691f793eb5348b82c4a557991e44c9ab90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 490640
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%0Diawd
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

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_2_tag_au2_2Faudio_2F0_run_run2.wav b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/individualAudio_index_2_tag_au2_2Faudio_2F0_run_run2.wav
deleted file mode 100644
index bbd3ff8bcbb60f786f522b4fbdcf92bff4955106..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 205420
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

diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/runs.json
deleted file mode 100644
index 811a873684..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/data/runs.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "run1":
-    {
-     "audio": ["au1/audio/0"]
-    },
-  "run2":
-    {
-      "audio": ["au2/audio/0"]
-    }
-}
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_audio_dashboard/demo/index.html
deleted file mode 100644
index f0a79b573c..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/demo/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<link rel="import" href="../tf-audio-dashboard.html">
-    <link rel="import" href="../../paper-styles/typography.html">
-
-<title>Audio Dashboard Demo</title>
-<style>
-  #container {
-    height: 300px;
-    width: 100%;
-  }
-
-  html, body {
-    margin: 0;
-    padding: 0;
-    font-family: "RobotoDraft","Roboto",sans-serif;
-  }
-
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="audio-dash-demo">
-      <template>
-        <tf-audio-dashboard id="demo" backend="[[backend]]"></tf-audio-dashboard>
-      </template>
-      <script>
-        Polymer({
-          is: "audio-dash-demo",
-          properties: {
-            backend: {
-              type: Object,
-              value: function() {
-                var router = new TF.Backend.router("data", true);
-                return new TF.Backend.Backend(router);
-              },
-            },
-          },
-        });
-      </script>
-    </dom-module>
-    <audio-dash-demo id="container"></audio-dash-demo>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/test/audioDashboardTests.ts b/tensorflow/tensorboard/components/tf_audio_dashboard/test/audioDashboardTests.ts
deleted file mode 100644
index a8daed7dd4..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/test/audioDashboardTests.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-declare function stub(el: string, obj: any): void;
-declare function fixture(id: string): void;
-
-describe(
-    'audio dashboard tests', function() {
-      var audioDash;
-      var reloadCount = 0;
-      beforeEach(function() {
-        audioDash = fixture('testElementFixture');
-        var router = TF.Backend.router('data', true);
-        var backend = new TF.Backend.Backend(router);
-        audioDash.backend = backend;
-        stub('tf-audio-loader', {
-          reload: function() { reloadCount++; },
-        });
-      });
-
-      it('calling reload on dashboard reloads the audio-loaders',
-         function(done) {
-           audioDash.backendReload().then(() => {
-             reloadCount = 0;
-             var loaders = [].slice.call(
-                 audioDash.getElementsByTagName('tf-audio-loader'));
-             audioDash.frontendReload();
-             setTimeout(function() {
-               chai.assert.isAbove(reloadCount, 3);
-               done();
-             });
-           });
-         });
-    });
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/test/data/runs.json b/tensorflow/tensorboard/components/tf_audio_dashboard/test/data/runs.json
deleted file mode 100644
index 478f5ed833..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/test/data/runs.json
+++ /dev/null
@@ -1 +0,0 @@
-{"run1": {"audio": ["foo", "bar"]}, "run2": {"audio": ["bar", "zod"]}}
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/test/index.html b/tensorflow/tensorboard/components/tf_audio_dashboard/test/index.html
deleted file mode 100644
index 421a6658b0..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/test/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <script src="../../web-component-tester/browser.js"></script>
-    <link rel="import" href="../../tf-imports/d3.html">
-    <link rel="import" href="../tf-audio-dashboard.html">
-    <link rel="stylesheet" type="text/css" href="../../../lib/css/global.css">
-</head>
-<body>
-  <test-fixture id="testElementFixture">
-    <template>
-      <tf-audio-dashboard></tf-audio-dashboard>
-    </template>
-  </test-fixture>
-  <script src="audioDashboardTests.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
deleted file mode 100644
index 2088cde278..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-dashboard.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="tf-audio-grid.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-
-<!--
-tf-audio-dashboard displays a dashboard that loads audio from a TensorFlow run.
-
-@element tf-audio-dashboard
-@demo demo/index.html
--->
-<dom-module id="tf-audio-dashboard">
-  <template>
-    <div class="center">
-      <tf-no-data-warning
-        data-type="audio"
-        show-warning="[[dataNotFound]]"
-      ></tf-no-data-warning>
-      <tf-audio-grid
-        id="audioGrid"
-        run-to-audio="[[run2tag]]"
-        audio-generator="[[dataProvider]]"
-        tags="[[tags]]"
-        runs="[[runs]]"
-      ></tf-audio-grid>
-    </div>
-
-    <style>
-      .center {
-        height: 100%;
-        width: 100%;
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
-      }
-      :host {
-        height: 100%;
-        display: block;
-      }
-
-    </style>
-  </template>
-  <script>
-    TF.Dashboard.TfAudioDashboard = Polymer({
-      is: "tf-audio-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      properties: {
-        dataType: {value: "audio"},
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("audio"),
-        TF.Dashboard.ReloadBehavior("tf-audio-loader"),
-        TF.Backend.Behavior
-      ],
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _hasAudio: function(runToAudioChange) {
-        return _.values(runToAudioChange.base).some(function(arr) {
-          return arr.length > 0;
-        });
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-grid.html b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-grid.html
deleted file mode 100644
index c71d8bdd4b..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-grid.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-styles/paper-styles.html">
-<link rel="import" href="tf-audio-loader.html">
-<link rel="import" href="../tf-imports/lodash.html">
-<link rel="import" href="../tf-dashboard-common/scrollbar-style.html">
-
-<!--
-tf-audio-grid creates a grid for examining audio data. The columns correspond
-to runs and the rows correspond to tags. Each cell is an audio clip.
-
-Structurally, it makes extensive use of flexbox for layout: it has a top-level
-columnar flexbox that contains the topRow (run names) and then a
-bottomContainer. The bottomContainer is another columnar flexbox which contains
-repeated audio-rows. Each audio-row is a row flexbox which contains a tag name
-cell, and then audio cells.
-
-In the future, we should improve on the layout by making the tag names and run names have fixed positions
-within the audio-grid, so that when you scroll you always have context (e.g. row and column names in a spreadsheet).
-For now, it just scrolls.
-
-The audio grid provides internal scroll bars (with styling) so that it can be dropped into
-a dashboard in a predictable fashion, even though the internal audio grid may be enormous.
-
-Room for future improvement:
-
-- Make it obvious when an audio didn't load due to the audio not existing.
-- Find some way to collapse sparse audio grids into denser ones (when sparsity
-is high)
-- Fix column/row names
-- Include hook for loading past audio (by step/timestamp? or index?)
-
-@element tf-audio-grid
--->
-<dom-module id="tf-audio-grid">
-  <template>
-    <style include="scrollbar-style"></style>
-    <div id="fullContainer" class="container scrollbar">
-      <div id="topRow" class="container">
-        <div class="noshrink" id="paddingCell"></div>
-        <template is="dom-if" if="[[_tagsExist(tags)]]">
-          <template
-            is="dom-repeat"
-            items="[[runs]]"
-            as="run"
-          >
-            <div class="run-name-cell noshrink">
-              <span>[[run]]</span>
-            </div>
-          </template>
-        </template>
-      </div>
-      <div id="bottomContainer" class="container">
-        <template
-          is="dom-repeat"
-          items="[[tags]]"
-          as="tag"
-        >
-          <div class="audio-row container noshrink">
-            <div class="tag-name-cell noshrink">
-              <span class="tag-name">[[tag]]</span>
-            </div>
-            <template
-              is="dom-repeat"
-              items="[[runs]]"
-              as="run"
-            >
-              <div class="audio-cell noshrink">
-                <template is="dom-if" if="[[_exists(run, tag, runToAudio.*)]]">
-                  <tf-audio-loader
-                    id="loader"
-                    run="[[run]]"
-                    tag="[[tag]]"
-                    audio-generator="[[audioGenerator]]"
-                  >
-                  </tf-audio-loader>
-                </template>
-              </div>
-            </template>
-          </div>
-        </template>
-      </div>
-    </div>
-    <style>
-      :host {
-        display: block;
-        height: 100%;
-        --audio-cell-min-height: 105px;
-      }
-      .container {
-        display: flex;
-        flex-wrap: nowrap;
-      }
-      #fullContainer {
-        width: 100%;
-        height: 100%;
-        flex-direction: column;
-        padding-top: 20px;
-        overflow: auto;
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
-      }
-      #topRow {
-        flex-direction: row;
-      }
-      #bottomContainer {
-        flex-direction: column;
-        height: 100%;
-        width: 100%;
-      }
-      .audio-row {
-        flex-direction: row;
-        padding-top: 5px;
-      }
-      .audio-cell {
-        background: #FAFAFA;
-        width: 300px;
-        min-height: var(--audio-cell-min-height);
-        border: 1px solid black;
-        margin-right: 3px;
-        padding: 10px;
-        box-sizing: border-box;
-      }
-      .tag-name-cell {
-        width: 300px;
-        height: var(--audio-cell-min-height);
-        display:flex;
-        flex-direction: column;
-        justify-content: center;
-      }
-      .tag-name {
-        word-wrap: break-word;
-        text-align: center;
-        white-space: nowrap;
-      }
-      .run-name-cell {
-        width: 300px;
-        text-align: center;
-        margin-right: 5px;
-      }
-      .noshrink {
-        flex-shrink: 0;
-      }
-      #paddingCell {
-        width: 300px;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-audio-grid",
-      properties: {
-        runToAudio: Object,
-        tags: Array,
-        runs: Array,
-        audioGenerator: Function,
-      },
-      _tagsExist: function(tags) {
-        return tags && tags.length > 0;
-      },
-      _exists: function (run, tag) {
-        return this.runToAudio[run].indexOf(tag) !== -1;
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html b/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html
deleted file mode 100644
index 71539537d0..0000000000
--- a/tensorflow/tensorboard/components/tf_audio_dashboard/tf-audio-loader.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-slider/paper-slider.html">
-<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-<link rel="import" href="../tf-imports/lodash.html">
-
-<!--
-tf-audio-loader loads an individual audio clip from the TensorBoard backend.
-
-Right now it always loads the most recent audio clip. We should add support in the
-future for loading older clips.
-
-@element tf-audio-loader
--->
-<dom-module id="tf-audio-loader">
-  <style>
-    :host {
-      display: block;
-      --step-slider-knob-color: #424242;
-    }
-
-    img {
-      width: 100%;
-      height: 100%;
-      image-rendering: pixelated;
-    }
-
-    .step-description {
-      font-size: 12px;
-    }
-
-    .step-value {
-      font-weight: bold;
-    }
-
-    #audio-loading-spinner {
-      width: 14px;
-      height: 14px;
-      vertical-align: text-bottom;
-      --paper-spinner-color: var(--tb-orange-strong)
-    }
-
-    #steps {
-      height: 15px;
-      margin: 0 0 0 -15px;
-      /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
-       * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
-       * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
-      width: calc(100% + 31px);
-      --paper-slider-active-color: var(--step-slider-knob-color);
-      --paper-slider-knob-color: var(--step-slider-knob-color);
-      --paper-slider-pin-color: var(--step-slider-knob-color);
-      --paper-slider-knob-start-color: var(--step-slider-knob-color);
-      --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
-      --paper-slider-pin-start-color: var(--step-slider-knob-color);
-    }
-
-    #individual-audio-container audio {
-      margin: 5px 0 0 -10px;
-      width: calc(100% + 20px);
-    }
-  </style>
-  <template>
-    <template is="dom-if" if="[[_metadatas]]">
-      <template is="dom-if" if="[[_hasAtLeastOneStep(_metadatas)]]">
-        <div class="step-description">
-          step
-          <span class="step-value">
-            [[_stepValue]]
-          </span><br>
-          <template is="dom-if" if="[[_stepWallTime]]">
-            [[_stepWallTime]]
-          </template>
-          <paper-spinner-lite active
-                              id="audio-loading-spinner"
-                              hidden$=[[!_isAudioLoading]]></paper-spinner-lite>
-        </div>
-      </template>
-      <template is="dom-if" if="[[_maxStepIndex]]">
-        <paper-slider
-            id="steps"
-            immediate-value="{{_stepIndex}}"
-            max="[[_maxStepIndex]]"
-            max-markers="[[_maxStepIndex]]"
-            snaps
-            step="1"
-            value="{{_stepIndex}}"></paper-slider>
-      </template>
-      <div id="individual-audio-container"></div>
-    </template>
-  </template>
-  <script>
-    "use strict";
-
-    Polymer({
-      is: "tf-audio-loader",
-      properties: {
-        run: String,
-        tag: String,
-        audioGenerator: Function,
-        // todo: document.
-        _metadatas: Array,
-        _stepIndex: Number,
-        _stepValue: {
-          type: Number,
-          computed: "_computeStepValue(_metadatas, _stepIndex)",
-          value: 0,
-        },
-        _stepWallTime: {
-          type: Number,
-          computed: "_computeStepWallTime(_metadatas, _stepIndex)",
-          value: 0,
-        },
-        _maxStepIndex: {
-          type: Number,
-          computed: "_computeMaxStepIndex(_metadatas)",
-          value: 0,
-        },
-        _isAudioLoading: Boolean,
-        // Used to identify stale requests for audio.
-        _audioRequestId: {
-          type: Number,
-          value: 1
-        },
-      },
-      observers: [
-        "_updateAudio(_metadatas, _stepIndex)",
-      ],
-      reload: function() {
-        this.audioGenerator(this.tag, this.run).then(function(metadatas) {
-          // Set the list of available metadata.
-          this.set("_metadatas", metadatas);
-
-          // Set the index to be the last one.
-          this.set("_stepIndex", this._maxStepIndex);
-        }.bind(this));
-      },
-      ready: function() {
-        // Need to test so that it will not error if it is constructed w/o
-        // all properties (so that it's possible to use stub to mock it out)
-        if (this.run != null && this.tag != null && this.audioGenerator != null) {
-          this.reload();
-        }
-      },
-      _updateAudio: function(metadatas, stepIndex) {
-        if (!metadatas || stepIndex >= metadatas.length) {
-          // No audio to show. The audio section should be hidden.
-          return;
-        }
-
-        // Load new audio.
-        const requestId = ++this._audioRequestId;
-        this.set("_isAudioLoading", true);
-
-        // Create a new audio element. Only replace the previous one once the new audio loads.
-        let audioElement = document.createElement("audio");
-        audioElement.setAttribute("controls", true);
-        audioElement.setAttribute("loop", "loop");
-        let canPlayHandler = function() {
-          if (requestId !== this._audioRequestId) {
-            // This request is no longer relevant.
-            return;
-          }
-
-          // Remove this event listener: "canplay" apparently fires in Chrome every time playing
-          // begins again on loop. So, if we create a new audio element every time that happens, we
-          // don't actually loop.
-          audioElement.removeEventListener("canplay", canPlayHandler);
-
-          let individualAudioContainer = this.$$("#individual-audio-container");
-          individualAudioContainer.innerHTML = "";
-          Polymer.dom(individualAudioContainer).appendChild(audioElement);
-          this.set("_isAudioLoading", false);
-        }.bind(this);
-        audioElement.addEventListener("canplay", canPlayHandler);
-        audioElement.addEventListener("error", function() {
-          if (requestId !== this._audioRequestId) {
-            // This request is no longer relevant.
-            return;
-          }
-
-          // The audio could not be loaded.
-          this.$$("#individual-audio-container").innerHTML = "";
-          this.set("_isAudioLoading", false);
-        }.bind(this));
-
-        // Initiate the request for new audio.
-        var sourceElement = document.createElement("source");
-        let metadata = metadatas[stepIndex];
-        sourceElement.setAttribute("src", metadata.url);
-        sourceElement.setAttribute("type", metadata.content_type);
-        audioElement.appendChild(sourceElement);
-      },
-      _computeStepValue: function(metadatas, stepIndex) {
-        if (!metadatas || stepIndex >= metadatas.length) {
-          // No audio to show. The audio section should be hidden.
-          return 0;
-        }
-        return metadatas[stepIndex].step;
-      },
-      _computeStepWallTime: function(metadatas, stepIndex) {
-        if (!metadatas || stepIndex >= metadatas.length) {
-          // No audio to show. The audio section should be hidden.
-          return 0;
-        }
-        return metadatas[stepIndex].wall_time.toString();
-      },
-      _computeMaxStepIndex: function(metadatas) {
-        if (!metadatas || metadatas.length === 0) {
-          // No audio to show. The audio section should be hidden.
-          return 0;
-        }
-        return metadatas.length - 1;
-      },
-      _hasAtLeastOneStep: function(metadatas) {
-        return metadatas && metadatas.length > 0;
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_backend/BUILD b/tensorflow/tensorboard/components/tf_backend/BUILD
deleted file mode 100644
index 14781f327c..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/BUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# TODO(dandelion): Add webfiles support for the test code.
-
-web_library(
-    name = "tf_backend",
-    srcs = [
-        "tf-backend.html",
-        ":ts",
-    ],
-    path = "/tf-backend",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_sorting",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "backend.ts",
-        "behavior.ts",
-        "requestManager.ts",
-        "router.ts",
-        "urlPathHelpers.ts",
-    ],
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-        "//tensorflow/tensorboard/components/vz_sorting:ts_typings",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-backend.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "tf-backend",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "backend.ts",
-        "behavior.ts",
-        "requestManager.ts",
-        "router.ts",
-        "urlPathHelpers.ts",
-    ],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/plottable/v1:typings",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/d3",
-        "//third_party/javascript/typings/lodash",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/sinon",
-        "//third_party/javascript/typings/webcomponents_js",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_backend/backend.ts b/tensorflow/tensorboard/components/tf_backend/backend.ts
deleted file mode 100644
index befa6991dd..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/backend.ts
+++ /dev/null
@@ -1,476 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module TF.Backend {
-  export interface RunEnumeration {
-    histograms: string[];
-    compressedHistogramTuples: string[];
-    scalars: string[];
-    images: string[];
-    audio: string[];
-    graph: boolean;
-    run_metadata: string[];
-  }
-
-  export interface LogdirResponse { logdir: string; }
-
-  export interface RunsResponse { [runName: string]: RunEnumeration; }
-
-  export type RunToTag = {[run: string]: string[];};
-
-  export interface Datum {
-    wall_time: Date;
-    step: number;
-  }
-
-  export type ScalarDatum = Datum & Scalar;
-  export interface Scalar { scalar: number; }
-
-  export interface Text { text: string; }
-  export type TextDatum = Datum & Text;
-
-  export type HistogramDatum = Datum & Histogram;
-  export interface Histogram {
-    min: number;
-    max: number;
-    nItems?: number;
-    sum?: number;
-    sumSquares?: number;
-    bucketRightEdges: number[];
-    bucketCounts: number[];
-  }
-
-  export interface HistogramBin {
-    x: number;
-    dx: number;
-    y: number;
-  }
-  export type HistogramSeriesDatum = HistogramSeries & Datum;
-  export interface HistogramSeries { bins: HistogramBin[]; }
-
-  export type ImageDatum = Datum & Image;
-  export interface Image {
-    width: number;
-    height: number;
-    url: string;
-  }
-
-  export type AudioDatum = Datum & Audio;
-  export interface Audio {
-    content_type: string;
-    url: string;
-  }
-
-  // A health pill encapsulates an overview of tensor element values. The value
-  // field is a list of 12 numbers that shed light on the status of the tensor.
-  export interface HealthPill {
-    node_name: string;
-    output_slot: number;
-    value: number[];
-  };
-  // When updating this type, keep it consistent with the HealthPill interface
-  // in tf_graph_common/lib/scene/scene.ts.
-  export type HealthPillDatum = Datum & HealthPill;
-  // A health pill response is a mapping from node name to a list of health pill
-  // data entries.
-  export interface HealthPillsResponse { [key: string]: HealthPillDatum[]; };
-
-  export var TYPES = [
-    'scalar', 'histogram', 'compressedHistogram', 'graph', 'image', 'audio',
-    'runMetadata', 'text'
-  ];
-  /**
-   * The Backend class provides a convenient and typed interface to the backend.
-   *
-   * It provides methods corresponding to the different data sources on the
-   * TensorBoard backend. These methods return a promise containing the data
-   * from the backend. This class does some post-processing on the data; for
-   * example, converting data elements tuples into js objects so that they can
-   * be accessed in a more convenient and clearly-documented fashion.
-   */
-  export class Backend {
-    public router: Router;
-    public requestManager: RequestManager;
-
-    /**
-     * Construct a Backend instance.
-     * @param router the Router with info on what urls to get data from
-     * @param requestManager The RequestManager, overwritable so you may
-     * manually clear request queue, etc. Defaults to a new RequestManager.
-     */
-    constructor(router: Router, requestManager?: RequestManager) {
-      this.router = router;
-      this.requestManager = requestManager || new RequestManager();
-    }
-
-    /**
-     * Returns a promise for requesting the logdir string.
-     */
-    public logdir(): Promise<LogdirResponse> {
-      return this.requestManager.request(this.router.logdir());
-    }
-
-    /**
-     * Returns a listing of all the available data in the TensorBoard backend.
-     */
-    public runs(): Promise<RunsResponse> {
-      return this.requestManager.request(this.router.runs());
-    }
-
-    /**
-     * Return a promise showing the Run-to-Tag mapping for scalar data.
-     */
-    public scalarRuns(): Promise<RunToTag> {
-      return this.runs().then((x) => _.mapValues(x, 'scalars'));
-    }
-
-    /**
-     * Return a promise showing the Run-to-Tag mapping for histogram data.
-     */
-    public histogramRuns(): Promise<RunToTag> {
-      return this.runs().then((x) => _.mapValues(x, 'histograms'));
-    }
-
-    /**
-     * Return a promise showing the Run-to-Tag mapping for image data.
-     */
-    public imageRuns(): Promise<RunToTag> {
-      return this.runs().then((x) => _.mapValues(x, 'images'));
-    }
-
-    /**
-     * Return a promise showing the Run-to-Tag mapping for audio data.
-     */
-    public audioRuns(): Promise<RunToTag> {
-      return this.runs().then((x) => _.mapValues(x, 'audio'));
-    }
-
-    /**
-     * Return a promise showing the Run-to-Tag mapping for compressedHistogram
-     * data.
-     */
-    public compressedHistogramRuns(): Promise<RunToTag> {
-      return this.runs().then((x) => _.mapValues(x, 'compressedHistograms'));
-    }
-
-    /**
-     * Return a promise showing list of runs that contain graphs.
-     */
-    public graphRuns(): Promise<string[]> {
-      return this.runs().then(
-          (x) => { return _.keys(x).filter((k) => x[k].graph); });
-    }
-
-    /**
-     * Return a promise showing the Run-to-Tag mapping for run_metadata objects.
-     */
-    public runMetadataRuns(): Promise<RunToTag> {
-      return this.runs().then((x) => _.mapValues(x, 'run_metadata'));
-    }
-
-
-    /**
-     * Returns a promise showing the Run-to-Tag mapping for text data.
-     */
-    public textRuns(): Promise<RunToTag> {
-      return this.requestManager.request(this.router.textRuns());
-    }
-
-
-    /**
-     * Returns a promise containing TextDatums for given run and tag.
-     */
-    public text(tag: string, run: string): Promise<TextDatum[]> {
-      let url = this.router.text(tag, run);
-      // tslint:disable-next-line:no-any it's convenient and harmless here
-      return this.requestManager.request(url).then(map(function(x: any) {
-        x.wall_time = timeToDate(x.wall_time);
-        return x;
-      }));
-    }
-
-    /**
-     * Return a promise of a graph string from the backend.
-     */
-    public graph(
-        tag: string, limit_attr_size?: number,
-        large_attrs_key?: string): Promise<string> {
-      let url = this.router.graph(tag, limit_attr_size, large_attrs_key);
-      return this.requestManager.request(url);
-    }
-
-    /**
-     * Return a promise containing ScalarDatums for given run and tag.
-     */
-    public scalar(tag: string, run: string): Promise<Array<ScalarDatum>> {
-      let p: Promise<TupleData<number>[]>;
-      let url = this.router.scalars(tag, run);
-      p = this.requestManager.request(url);
-      return p.then(map(detupler(createScalar)));
-    }
-
-    /**
-     * Returns a promise for requesting the health pills for a list of nodes.
-     */
-    public healthPills(nodeNames: string[], step?: number):
-        Promise<HealthPillsResponse> {
-      const postData = {
-        'node_names': JSON.stringify(nodeNames),
-
-        // Events files with debugger data fall under this special run.
-        'run': '__debugger_data__',
-      };
-      if (step !== undefined) {
-        // The user requested health pills for a specific step. This request
-        // might be slow since the backend reads events sequentially from disk.
-        postData['step'] = step;
-      }
-      return this.requestManager.request(this.router.healthPills(), postData);
-    }
-
-    /**
-     * Return a promise containing HistogramDatums for given run and tag.
-     */
-    public histogram(tag: string, run: string):
-        Promise<Array<HistogramSeriesDatum>> {
-      let p: Promise<TupleData<HistogramTuple>[]>;
-      let url = this.router.histograms(tag, run);
-      p = this.requestManager.request(url);
-      return p.then(map(detupler(createHistogram))).then(function(histos) {
-        // Get the minimum and maximum values across all histograms so that the
-        // visualization is aligned for all timesteps.
-        let min = d3.min(histos, d => d.min);
-        let max = d3.max(histos, d => d.max);
-
-        return histos.map(function(histo, i) {
-          return {
-            wall_time: histo.wall_time,
-            step: histo.step,
-            bins: convertBins(histo, min, max)
-          };
-        });
-      });
-    }
-
-    /**
-     * Return a promise containing ImageDatums for given run and tag.
-     */
-    public image(tag: string, run: string): Promise<Array<ImageDatum>> {
-      let url = this.router.images(tag, run);
-      let p: Promise<ImageMetadata[]>;
-      p = this.requestManager.request(url);
-      return p.then(map(this.createImage.bind(this)));
-    }
-
-    /**
-     * Return a promise containing AudioDatums for given run and tag.
-     */
-    public audio(tag: string, run: string): Promise<Array<AudioDatum>> {
-      let url = this.router.audio(tag, run);
-      let p: Promise<AudioMetadata[]>;
-      p = this.requestManager.request(url);
-      return p.then(map(this.createAudio.bind(this)));
-    }
-
-    /**
-     * Returns a promise to load the string RunMetadata for given run/tag.
-     */
-    public runMetadata(tag: string, run: string): Promise<string> {
-      let url = this.router.runMetadata(tag, run);
-      return this.requestManager.request(url);
-    }
-
-    /**
-     * Get compressedHistogram data.
-     * Unlike other methods, don't bother reprocessing this data into a nicer
-     * format. This is because we will deprecate this route.
-     */
-    private compressedHistogram(tag: string, run: string):
-        Promise<Array<Datum&CompressedHistogramTuple>> {
-      let url = this.router.compressedHistograms(tag, run);
-      let p: Promise<TupleData<CompressedHistogramTuple>[]>;
-      p = this.requestManager.request(url);
-      return p.then(map(detupler((x) => x)));
-    }
-
-    private createImage(x: ImageMetadata): Image&Datum {
-      return {
-        width: x.width,
-        height: x.height,
-        wall_time: timeToDate(x.wall_time),
-        step: x.step,
-        url: this.router.individualImage(x.query, x.wall_time),
-      };
-    }
-
-    private createAudio(x: AudioMetadata): Audio&Datum {
-      return {
-        content_type: x.content_type,
-        wall_time: timeToDate(x.wall_time),
-        step: x.step,
-        url: this.router.individualAudio(x.query),
-      };
-    }
-  }
-
-  /** Given a RunToTag, return sorted array of all runs */
-  export function getRuns(r: RunToTag): string[] {
-    return _.keys(r).sort(VZ.Sorting.compareTagNames);
-  }
-
-  /** Given a RunToTag, return array of all tags (sorted + dedup'd) */
-  export function getTags(r: RunToTag): string[] {
-    return _.union.apply(null, _.values(r)).sort(VZ.Sorting.compareTagNames);
-  }
-
-  /**
-   * Given a RunToTag and an array of runs, return every tag that appears for
-   * at least one run.
-   * Sorted, deduplicated.
-   */
-  export function filterTags(r: RunToTag, runs: string[]): string[] {
-    var result = [];
-    runs.forEach((x) => result = result.concat(r[x]));
-    return _.uniq(result).sort(VZ.Sorting.compareTagNames);
-  }
-
-  function timeToDate(x: number): Date { return new Date(x * 1000); };
-
-  /**  Just a curryable map to make things cute and tidy. */
-  function map<T, U>(f: (x: T) => U): (arr: T[]) => U[] {
-    return function(arr: T[]): U[] { return arr.map(f); };
-  };
-
-  /**
-   * This is a higher order function that takes a function that transforms a
-   * T into a G, and returns a function that takes TupleData<T>s and converts
-   * them into the intersection of a G and a Datum.
-   */
-  function detupler<T, G>(xform: (x: T) => G): (t: TupleData<T>) => Datum & G {
-    return function(x: TupleData<T>): Datum & G {
-      // Create a G, assert it has type <G & Datum>
-      let obj = <G&Datum>xform(x[2]);
-      // ... patch in the properties of datum
-      obj.wall_time = timeToDate(x[0]);
-      obj.step = x[1];
-      return obj;
-    };
-  };
-
-  function createScalar(x: number): Scalar { return {scalar: x}; };
-
-  function createHistogram(x: HistogramTuple): Histogram {
-    return {
-      min: x[0],
-      max: x[1],
-      nItems: x[2],
-      sum: x[3],
-      sumSquares: x[4],
-      bucketRightEdges: x[5],
-      bucketCounts: x[6],
-    };
-  };
-
-  /**
-   * Takes histogram data as stored by tensorboard backend and converts it to
-   * the standard d3 histogram data format to make it more compatible and easier
-   * to visualize. When visualizing histograms, having the left edge and width
-   * makes things quite a bit easier. The bins are also converted to have an
-   * uniform width, what makes the visualization easier to understand.
-   *
-   * @param histogram A histogram from tensorboard backend.
-   * @param min The leftmost edge. The binning will start on it.
-   * @param max The rightmost edge. The binning will end on it.
-   * @param numBins The number of bins of the converted data. The default of 30
-   * is a sensible default, using more starts to get artifacts because the event
-   * data is stored in buckets, and you start being able to see the aliased
-   * borders between each bucket.
-   * @return A histogram bin. Each bin has an x (left edge), a dx (width),
-   *     and a y (count).
-   *
-   * If given rightedges are inclusive, then these left edges (x) are exclusive.
-   */
-  export function convertBins(
-      histogram: Histogram, min: number, max: number, numBins = 30) {
-    if (histogram.bucketRightEdges.length !== histogram.bucketCounts.length) {
-      throw(new Error('Edges and counts are of different lengths.'));
-    }
-
-    if (max === min) {
-      // Create bins even if all the data has a single value.
-      max = min * 1.1 + 1;
-      min = min / 1.1 - 1;
-    }
-    let binWidth = (max - min) / numBins;
-    let bucketLeft = min;  // Use the min as the starting point for the bins.
-    let bucketPos = 0;
-    return d3.range(min, max, binWidth).map(function(binLeft) {
-      let binRight = binLeft + binWidth;
-
-      // Take the count of each existing bucket, multiply it by the proportion
-      // of overlap with the new bin, then sum and store as the count for the
-      // new bin. If no overlap, will add to zero, if 100% overlap, will include
-      // the full count into new bin.
-      let binY = 0;
-      while (bucketPos < histogram.bucketRightEdges.length) {
-        // Clip the right edge because right-most edge can be infinite-sized.
-        let bucketRight = Math.min(max, histogram.bucketRightEdges[bucketPos]);
-
-        let intersect =
-            Math.min(bucketRight, binRight) - Math.max(bucketLeft, binLeft);
-        let count = (intersect / (bucketRight - bucketLeft)) *
-            histogram.bucketCounts[bucketPos];
-
-        binY += intersect > 0 ? count : 0;
-
-        // If bucketRight is bigger than binRight, than this bin is finished and
-        // there is data for the next bin, so don't increment bucketPos.
-        if (bucketRight > binRight) {
-          break;
-        }
-        bucketLeft = Math.max(min, bucketRight);
-        bucketPos++;
-      };
-
-      return {x: binLeft, dx: binWidth, y: binY};
-    });
-  }
-
-  /**
-   * The following interfaces (TupleData, HistogramTuple,
-   * CompressedHistogramTuple, ImageMetadata, and AudioMetadata) describe how
-   * the data is sent over from the backend.
-   */
-  type TupleData<T> = [number, number, T];  // wall_time, step
-
-  // Min, Max, nItems, Sum, Sum_Squares, right edges of buckets, nItems in
-  // buckets
-  type HistogramTuple =
-      [number, number, number, number, number, number[], number[]];
-  type CompressedHistogramTuple = [number, number][];  // percentile, value
-  interface ImageMetadata {
-    width: number;
-    height: number;
-    wall_time: number;
-    step: number;
-    query: string;
-  }
-  interface AudioMetadata {
-    content_type: string;
-    wall_time: number;
-    step: number;
-    query: string;
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/behavior.ts b/tensorflow/tensorboard/components/tf_backend/behavior.ts
deleted file mode 100644
index de6590456f..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/behavior.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module TF.Backend {
-  export var Behavior = {
-    properties: {
-      /** *** Required properties *** */
-      /** Data type. One of TF.Backend.TYPES */
-      dataType: {
-        type: String,
-        observer: '_throwErrorOnUnrecognizedType',
-      },
-
-      /** TF.Backend.Backend for data loading. */
-      backend: {
-        type: Object,
-      },
-
-      /** Should it automatically load when configured ready? Default true. */
-      autoLoad: {
-        type: Boolean,
-        value: true,
-      },
-
-      /** *** Component-provided properties *** */
-      /** Every tag available for data type (sorted, dedpulicated) */
-      tags: {
-        type: Array,
-        readOnly: true,
-        notify: true,
-      },
-
-      /** Every run available for data type (sorted) */
-      runs: {
-        type: Array,
-        readOnly: true,
-        notify: true,
-      },
-
-      /** Mapping from runs to tags for the data type */
-      run2tag: {
-        type: Object,
-        readOnly: true,
-        notify: true,
-      },
-
-      /** Promise provider for the data. Useful for passing to subcomponents */
-      dataProvider:
-          {type: Function, computed: '_getDataProvider(dataType, backend)'},
-
-      /** Has the dashboard loaded yet? */
-      loadState: {
-        type: String,
-        value: 'noload',  // [noload, pending, loaded, failure]
-        readOnly: true,
-      },
-
-      /**
-       * True if dashboard has loaded, and no tags were found.
-       * Persists through subsequent reloads (ie. still true while
-       * next load is pending) so warning won't flash away every reload
-       * when there is no data.
-       */
-      dataNotFound: {
-        type: Boolean,
-        value: false,
-        readOnly: true,
-      }
-
-    },
-    observers: ['_do_autoLoad(dataType, backend, autoLoad)'],
-    /**
-     * Reloading works in two steps:
-     * Backend reload, which gets metadata on available runs, tags, etc from
-     *   the backend.
-     * Frontend reload, which loads new data for each chart or visual display.
-     * Backend reload logic is provided by this behaivor. The frontend reload
-     *   logic should be provided elsewhere, since it is component-specific.
-     * To keep things simple and consistent, we do the backend reload first,
-     *   and the frontend reload afterwards.
-     */
-    reload: function() {
-      return this.backendReload().then(
-          (x) => { return this.frontendReload(); });
-    },
-    /**
-     * Load data from backend and then set run2tag, tags, runs, and loadState.
-     * Returns a promise that resolves/rejects when data is loaded.
-     */
-    backendReload: function() {
-      if (this.dataType == null) {
-        throw new Error('TF.Backend.Behavior: Need a dataType to reload.');
-      }
-      if (this.backend == null) {
-        throw new Error('TF.Backend.Behavior: Need a backend to reload.');
-      }
-      var runsRoute = this.backend[this.dataType + 'Runs'].bind(this.backend);
-      this._setLoadState('pending');
-      return runsRoute().then(
-          (x) => {
-            this._setLoadState('loaded');
-            if (_.isEqual(x, this.run2tag)) {
-              // If x and run2tag are equal, let's avoid updating everything
-              // since that can needlessly trigger run changes, reloads, etc
-              return x;
-            }
-            this._setRun2tag(x);
-            var tags = TF.Backend.getTags(x);
-            this._setDataNotFound(tags.length === 0);
-            this._setTags(tags);
-            this._setRuns(TF.Backend.getRuns(x));
-            return x;
-          },
-          (fail) => {
-            this._setLoadState('failure');
-            return fail;
-          });
-    },
-    _do_autoLoad: function(type, backend, autoLoad) {
-      if (autoLoad) {
-        this.reload();
-      };
-    },
-    _getDataProvider: function(dataType, backend) {
-      return this.backend[this.dataType].bind(this.backend);
-    },
-    _throwErrorOnUnrecognizedType: function(dataType) {
-      if (TF.Backend.TYPES.indexOf(dataType) === -1) {
-        throw new Error('TF.Backend.Behavior: Unknown dataType ' + dataType);
-      }
-    },
-  };
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/requestManager.ts b/tensorflow/tensorboard/components/tf_backend/requestManager.ts
deleted file mode 100644
index 1dfc3348b5..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/requestManager.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module TF.Backend {
-  interface ResolveReject { resolve: Function; reject: Function; }
-  /**
-   * Manages many fetch requests. Launches up to nSimultaneousRequests
-   * simultaneously, and maintains a LIFO queue of requests to process when
-   * more urls are requested than can be handled at once. The queue can be
-   * cleared.
-   *
-   * When a request is made, a Promise is returned which resolves with the
-   * parsed JSON result from the request.
-   */
-  export class RequestCancellationError extends Error {
-    public name = 'RequestCancellationError';
-  }
-
-  export class RequestNetworkError extends Error {
-    public name: string;
-    public req: XMLHttpRequest;
-    public url: string;
-
-    constructor(req: XMLHttpRequest, url) {
-      super();
-      this.message = `RequestNetworkError: ${req.status} at ${url}`;
-      this.name = 'RequestNetworkError';
-      this.req = req;
-      this.url = url;
-    }
-  }
-
-  export class RequestManager {
-    private _queue: ResolveReject[];
-    private _maxRetries: number;
-    private _nActiveRequests: number;
-    private _nSimultaneousRequests: number;
-
-    constructor(nSimultaneousRequests = 10, maxRetries = 3) {
-      this._queue = [];
-      this._nActiveRequests = 0;
-      this._nSimultaneousRequests = nSimultaneousRequests;
-      this._maxRetries = maxRetries;
-    }
-
-    /**
-     * Gives a promise that loads assets from given url (respects queuing). If
-     * postData is provided, this request will use POST, not GET. This is an
-     * object mapping POST keys to string values.
-     */
-    public request(
-        url: string, postData?: {[key: string]: string}): Promise<any> {
-      var promise = new Promise((resolve, reject) => {
-                      var resolver = {resolve: resolve, reject: reject};
-                      this._queue.push(resolver);
-                      this.launchRequests();
-                    })
-                        .then(() => {
-                          return this.promiseWithRetries(
-                              url, this._maxRetries, postData);
-                        })
-                        .then(
-                            (response) => {
-                              // Success - Let's free space for another active
-                              // reqest, and launch it
-                              this._nActiveRequests--;
-                              this.launchRequests();
-                              return response;
-                            },
-                            (rejection) => {
-                              if (rejection.name === 'RequestNetworkError') {
-                                // If we failed due to network error, we should
-                                // decrement
-                                // _nActiveRequests because this request was
-                                // active
-                                this._nActiveRequests--;
-                                this.launchRequests();
-                              }
-                              return Promise.reject(rejection);
-                            });
-      return promise;
-    }
-
-    public clearQueue() {
-      while (this._queue.length > 0) {
-        this._queue.pop().reject(
-            new RequestCancellationError('Request cancelled by clearQueue'));
-      }
-    }
-
-    /* Return number of currently pending requests */
-    public activeRequests(): number {
-      return this._nActiveRequests;
-    }
-
-    /* Return total number of outstanding requests (includes queue) */
-    public outstandingRequests(): number {
-      return this._nActiveRequests + this._queue.length;
-    }
-
-    private launchRequests() {
-      while (this._nActiveRequests < this._nSimultaneousRequests &&
-             this._queue.length > 0) {
-        this._nActiveRequests++;
-        this._queue.pop().resolve();
-      }
-    }
-
-    /**
-     * Try to request a given URL using overwritable _promiseFromUrl method.
-     * If the request fails for any reason, we will retry up to maxRetries
-     * times. In practice, this will help us paper over transient network issues
-     * like '502 Bad Gateway'.
-     * By default, Chrome displays network errors in console, so
-     * the user will be able to tell when the requests are failing. I think this
-     * is a feature, if the request failures and retries are causing any
-     * pain to users, they can see it and file issues.
-     */
-    private promiseWithRetries(
-        url: string,
-        maxRetries: number,
-        postData?: {[key: string]: string}) {
-      var success = (x) =>  x;
-      var failure = (x) => {
-        if (maxRetries > 0) {
-          return this.promiseWithRetries(url, maxRetries - 1, postData);
-        } else {
-          return Promise.reject(x);
-        }
-      };
-      return this._promiseFromUrl(url, postData).then(success, failure);
-    }
-
-    /* Actually get promise from url using XMLHttpRequest */
-    protected _promiseFromUrl(url:string, postData?: {[key: string]: string}) {
-      return new Promise((resolve, reject) => {
-        let req = new XMLHttpRequest();
-        req.open(postData ? 'POST' : 'GET', url);
-
-        let formData;
-        if (postData) {
-          // We are to make a POST request.
-          formData = new FormData();
-          for (let postKey in postData) {
-            if (postKey) {
-              // The linter requires 'for in' loops to be filtered by an if
-              // condition.
-              formData.append(postKey, postData[postKey]);
-            }
-          }
-        }
-        req.onload = function() {
-          if (req.status === 200) {
-            resolve(JSON.parse(req.responseText));
-          } else {
-            reject(new RequestNetworkError(req, url));
-          }
-        };
-        req.onerror = function() {
-          reject(new RequestNetworkError(req, url));
-        };
-        req.send(formData);
-      });
-    }
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/router.ts b/tensorflow/tensorboard/components/tf_backend/router.ts
deleted file mode 100644
index d14216dcfc..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/router.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module TF.Backend {
-  export type RunTagUrlFn = (tag: string, run: string) => string;
-
-  export interface Router {
-    logdir: () => string;
-    runs: () => string;
-    scalars: RunTagUrlFn;
-    histograms: RunTagUrlFn;
-    compressedHistograms: RunTagUrlFn;
-    images: RunTagUrlFn;
-    individualImage: (query: string, wallTime: number) => string;
-    audio: RunTagUrlFn;
-    individualAudio: (query: string) => string;
-    graph: (run: string, limit_attr_size?: number, large_attrs_key?: string)
-        => string;
-    runMetadata: RunTagUrlFn;
-    textRuns: () => string;
-    text: RunTagUrlFn;
-    healthPills: () => string;
-  };
-
-  /**
-   * The standard router for communicating with the TensorBoard backend
-   * @param dataDir {string} The base prefix for finding data on server.
-   * @param demoMode {boolean} Whether to modify urls for filesystem demo usage.
-   */
-  export function router(dataDir = 'data', demoMode = false): Router {
-    var clean = demoMode ? demoify : (x) => x;
-    if (dataDir[dataDir.length - 1] === '/') {
-      dataDir = dataDir.slice(0, dataDir.length - 1);
-    }
-    function standardRoute(route: string, demoExtension = '.json'):
-        ((tag: string, run: string) => string) {
-      return function(tag: string, run: string): string {
-        var url =
-            dataDir + '/' + route + clean(queryEncoder({tag: tag, run: run}));
-        if (demoMode) {
-          url += demoExtension;
-        }
-        return url;
-      };
-    }
-    function individualImageUrl(query: string, wallTime: number) {
-      var url = dataDir + '/' + clean('individualImage?' + query);
-      // Include wall_time just to disambiguate the URL and force the browser
-      // to reload the image when the URL changes. The backend doesn't care
-      // about the value.
-      url += demoMode ? '.png' : '&ts=' + wallTime;
-      return url;
-    }
-    function individualAudioUrl(query: string) {
-      var url = dataDir + '/' + clean('individualAudio?' + query);
-      if (demoMode) {
-        url += '.wav';
-      }
-      return url;
-    }
-    function graphUrl(run: string, limit_attr_size?: number,
-        large_attrs_key?: string) {
-      let query_params = [['run', clean(run)]];
-      if (limit_attr_size != null && !demoMode) {
-        query_params.push(['limit_attr_size', String(limit_attr_size)]);
-      }
-      if (large_attrs_key != null && !demoMode) {
-        query_params.push(['large_attrs_key', large_attrs_key]);
-      }
-      let query = query_params
-                      .map(param => {
-                        return param[0] + '=' + encodeURIComponent(param[1]);
-                      })
-                      .join('&');
-      var url = dataDir + '/graph' + clean('?' + query);
-      if (demoMode) {
-        url += '.pbtxt';
-      }
-      return url;
-    }
-    return {
-      logdir: () => dataDir + '/logdir',
-      runs: () => dataDir + '/runs' + (demoMode ? '.json' : ''),
-      individualImage: individualImageUrl,
-      individualAudio: individualAudioUrl,
-      graph: graphUrl,
-      scalars: standardRoute('scalars'),
-      histograms: standardRoute('histograms'),
-      compressedHistograms: standardRoute('compressedHistograms'),
-      images: standardRoute('images'),
-      audio: standardRoute('audio'),
-      runMetadata: standardRoute('run_metadata', '.pbtxt'),
-      healthPills: () => dataDir + '/plugin/debugger/health_pills',
-      textRuns: () => dataDir + '/plugin/text/runs' + (demoMode ? '.json' : ''),
-      text: standardRoute('plugin/text/text'),
-    };
-  };
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/test/backendTests.ts b/tensorflow/tensorboard/components/tf_backend/test/backendTests.ts
deleted file mode 100644
index 67ee70ce83..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/backendTests.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module TF.Backend {
-  describe('urlPathHelpers', function() {
-    let demoify = TF.Backend.demoify;
-    let encode = TF.Backend.queryEncoder;
-    it('demoify works as expected', function() {
-      let demoified = demoify(BAD_CHARACTERS);
-      let all_clean = '';
-      for (let i = 0; i < BAD_CHARACTERS.length; i++) {
-        all_clean += '_';
-      }
-      chai.assert.equal(
-          demoified, all_clean, 'cleaning the BAD_CHARACTERS works');
-      chai.assert.equal(
-          demoify('foozod'), 'foozod', 'doesnt change safe string');
-      chai.assert.equal(demoify('foo zod (2)'), 'foo_zod__2_', 'simple case');
-    });
-
-    it('queryEncoder works with demoify on spaces and parens', function() {
-      let params = {foo: 'something with spaces and (parens)'};
-      let actual = demoify(encode(params));
-      let expected = '_foo_something_with_spaces_and__28parens_29';
-      chai.assert.equal(actual, expected);
-    });
-  });
-
-  function assertIsDatum(x) {
-    chai.assert.isNumber(x.step);
-    chai.assert.instanceOf(x.wall_time, Date);
-  }
-
-  describe('backend tests', function() {
-    let backend: Backend;
-    let rm: RequestManager;
-    let base = 'data';
-    let demoRouter = TF.Backend.router(base, true);
-    beforeEach(function() {
-      // Construct a demo Backend (third param is true)
-      backend = new Backend(demoRouter);
-      rm = new RequestManager();
-    });
-
-    it('runs are loaded properly', function(done) {
-      let runsResponse = backend.runs();
-      let actualRuns = rm.request(demoRouter.runs());
-      Promise.all([runsResponse, actualRuns]).then((values) => {
-        chai.assert.deepEqual(values[0], values[1]);
-        done();
-      });
-    });
-
-    it('scalars are loaded properly', function(done) {
-      backend.scalar('cross_entropy (1)', 'run1').then((s) => {
-        // just check the data got reformatted properly
-        let aScalar = s[s.length - 1];
-        assertIsDatum(aScalar);
-        chai.assert.isNumber(aScalar.scalar);
-        // verify date conversion works
-        chai.assert.equal(aScalar.wall_time.valueOf(), 40000);
-        done();
-      });
-    });
-
-    it('histograms are loaded properly', function(done) {
-      backend.histogram('histo1', 'run1').then((histos) => {
-        let histo = histos[0];
-        assertIsDatum(histo);
-        chai.assert.instanceOf(histo.bins, Array);
-        done();
-      });
-    });
-
-    it('all registered types have handlers', function() {
-      TYPES.forEach((t: string) => {
-        chai.assert.isDefined(backend[t], t);
-        chai.assert.isDefined(backend[t + 'Runs'], t + 'Runs');
-      });
-    });
-
-    it('images are loaded properly', function(done) {
-      backend.image('im1', 'run1').then((images) => {
-        let image = images[0];
-        assertIsDatum(image);
-        chai.assert.isNumber(image.width);
-        chai.assert.isNumber(image.height);
-        let nonDemoQuery = 'index=0&tag=im1&run=run1';
-        let expectedUrl = demoRouter.individualImage(nonDemoQuery, 10.0);
-        chai.assert.equal(image.url, expectedUrl);
-        done();
-      });
-    });
-
-    it('audio is loaded properly', function(done) {
-      backend.audio('audio1', 'run1').then((audio_clips) => {
-        let audio = audio_clips[0];
-        assertIsDatum(audio);
-        chai.assert.equal(audio.content_type, 'audio/wav');
-        let nonDemoQuery = 'index=0&tag=audio1&run=run1';
-        let expectedUrl = demoRouter.individualAudio(nonDemoQuery);
-        chai.assert.equal(audio.url, expectedUrl);
-        done();
-      });
-    });
-
-    it('trailing slash removed from base route', function() {
-      let r = TF.Backend.router('foo/');
-      chai.assert.equal(r.runs(), 'foo/runs');
-    });
-
-    it('run helper methods work', function(done) {
-      let scalar = {run1: ['cross_entropy (1)'], fake_run_no_data: ['scalar2']};
-      let image = {run1: ['im1'], fake_run_no_data: ['im1', 'im2']};
-      let audio = {run1: ['audio1'], fake_run_no_data: ['audio1', 'audio2']};
-      let runMetadata = {run1: ['step99'], fake_run_no_data: ['step99']};
-      let graph = ['fake_run_no_data'];
-      let count = 0;
-      function next() {
-        count++;
-        if (count === 4) {
-          done();
-        }
-      }
-      backend.scalarRuns().then((x) => {
-        chai.assert.deepEqual(x, scalar);
-        next();
-      });
-      backend.imageRuns().then((x) => {
-        chai.assert.deepEqual(x, image);
-        next();
-      });
-      backend.audioRuns().then((x) => {
-        chai.assert.deepEqual(x, audio);
-        next();
-      });
-      backend.runMetadataRuns().then((x) => {
-        chai.assert.deepEqual(x, runMetadata);
-        next();
-      });
-      backend.graphRuns().then((x) => {
-        chai.assert.deepEqual(x, graph);
-        next();
-      });
-    });
-
-    it('runToTag helpers work', function() {
-      let r2t: RunToTag = {
-        run1: ['foo', 'bar', 'zod'],
-        run2: ['zod', 'zoink'],
-        a: ['foo', 'zod']
-      };
-      let empty1: RunToTag = {};
-      let empty2: RunToTag = {run1: [], run2: []};
-      chai.assert.deepEqual(getRuns(r2t), ['a', 'run1', 'run2']);
-      chai.assert.deepEqual(getTags(r2t), ['bar', 'foo', 'zod', 'zoink']);
-      chai.assert.deepEqual(filterTags(r2t, ['run1', 'run2']), getTags(r2t));
-      chai.assert.deepEqual(filterTags(r2t, ['run1']), ['bar', 'foo', 'zod']);
-      chai.assert.deepEqual(
-          filterTags(r2t, ['run2', 'a']), ['foo', 'zod', 'zoink']);
-
-      chai.assert.deepEqual(getRuns(empty1), []);
-      chai.assert.deepEqual(getTags(empty1), []);
-
-      chai.assert.deepEqual(getRuns(empty2), ['run1', 'run2']);
-      chai.assert.deepEqual(getTags(empty2), []);
-    });
-  });
-
-  describe('Verify that the histogram format conversion works.', function() {
-
-    function assertHistogramEquality(h1, h2) {
-      h1.forEach(function(b1, i) {
-        let b2 = h2[i];
-        chai.assert.closeTo(b1.x, b2.x, 1e-10);
-        chai.assert.closeTo(b1.dx, b2.dx, 1e-10);
-        chai.assert.closeTo(b1.y, b2.y, 1e-10);
-      });
-    }
-
-    it('Throws and error if the inputs are of different lengths', function() {
-      chai.assert.throws(function() {
-        convertBins(
-            {bucketRightEdges: [0], bucketCounts: [1, 2], min: 1, max: 2}, 1, 2,
-            2);
-      }, 'Edges and counts are of different lengths.');
-    });
-
-    it('Handles data with no bins', function() {
-      chai.assert.deepEqual(
-          convertBins(
-              {bucketRightEdges: [], bucketCounts: [], min: 0, max: 0}, 0, 0,
-              0),
-          []);
-    });
-
-    it('Handles data with one bin', function() {
-      let counts = [1];
-      let rightEdges = [1.21e-12];
-      let histogram = [{x: 1.1e-12, dx: 1.21e-12 - 1.1e-12, y: 1}];
-      let newHistogram = convertBins(
-          {
-            bucketRightEdges: rightEdges,
-            bucketCounts: counts,
-            min: 1.1e-12,
-            max: 1.21e-12
-          },
-          1.1e-12, 1.21e-12, 1);
-      assertHistogramEquality(newHistogram, histogram);
-    });
-
-    it('Handles data with two bins.', function() {
-      let counts = [1, 2];
-      let rightEdges = [1.1e-12, 1.21e-12];
-      let histogram = [
-        {x: 1.0e-12, dx: 1.05e-13, y: 1.09090909090909},
-        {x: 1.105e-12, dx: 1.05e-13, y: 1.9090909090909}
-      ];
-      let newHistogram = convertBins(
-          {
-            bucketRightEdges: rightEdges,
-            bucketCounts: counts,
-            min: 1.0e-12,
-            max: 1.21e-12
-          },
-          1.0e-12, 1.21e-12, 2);
-      assertHistogramEquality(newHistogram, histogram);
-    });
-
-    it('Handles a domain that crosses zero, but doesn\'t include zero as ' +
-           'an edge.',
-       function() {
-         let counts = [1, 2];
-         let rightEdges = [-1.0e-12, 1.0e-12];
-         let histogram = [
-           {x: -1.1e-12, dx: 1.05e-12, y: 1.95},
-           {x: -0.5e-13, dx: 1.05e-12, y: 1.05}
-         ];
-         let newHistogram = convertBins(
-             {
-               bucketRightEdges: rightEdges,
-               bucketCounts: counts,
-               min: -1.1e-12,
-               max: 1.0e-12
-             },
-             -1.1e-12, 1.0e-12, 2);
-         assertHistogramEquality(newHistogram, histogram);
-       });
-
-    it('Handles a histogram of all zeros', function() {
-      let h = {
-        min: 0,
-        max: 0,
-        nItems: 51200,
-        sum: 0,
-        sumSquares: 0,
-        bucketRightEdges: [0, 1e-12, 1.7976931348623157e+308],
-        bucketCounts: [0, 51200, 0],
-        wall_time: '2017-01-25T02:30:11.257Z',
-        step: 0
-      };
-      let newHistogram = convertBins(h, 0, 0, 5);
-      let expectedHistogram = [
-        {x: -1, dx: 0.4, y: 0}, {x: -0.6, dx: 0.4, y: 0},
-        {x: -0.2, dx: 0.4, y: 51200}, {x: 0.2, dx: 0.4, y: 0},
-        {x: 0.6, dx: 0.4, y: 0}
-      ];
-      assertHistogramEquality(newHistogram, expectedHistogram);
-    });
-
-    it('Handles a right-most right edge that extends to very large number.',
-       function() {
-         let counts = [1, 2, 3];
-         let rightEdges = [0, 1.0e-12, 1.0e14];
-         let histogram = [
-           {x: -1.0e-12, dx: 0.7e-12, y: 0.7},
-           {x: -0.3e-12, dx: 0.7e-12, y: 1.1},
-           {x: 0.4e-12, dx: 0.7e-12, y: 4.2}
-         ];
-         let newHistogram = convertBins(
-             {
-               bucketRightEdges: rightEdges,
-               bucketCounts: counts,
-               min: -1.0e-12,
-               max: 1.1e-12
-             },
-             -1.0e-12, 1.1e-12, 3);
-         assertHistogramEquality(newHistogram, histogram);
-       });
-  });
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/test/behaviorTests.ts b/tensorflow/tensorboard/components/tf_backend/test/behaviorTests.ts
deleted file mode 100644
index 99bf2504ca..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/behaviorTests.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-declare function fixture(id: string): void;
-
-    module TF.Backend {
-      window.addEventListener('WebComponentsReady', function() {
-        Polymer({
-          is: 'test-element',
-          behaviors: [TF.Backend.Behavior],
-          frontendReload: function() {
-            // no-op
-          },
-        });
-      });
-
-      describe('data-behavior', function() {
-        var testElement;
-        var resolve;
-        var reject;
-        var fakeBackend = {
-          scalarRuns: function() {
-            return new Promise(function(_resolve, _reject) {
-              resolve = (x) => _resolve(x);
-              reject = (x) => _reject(x);
-            });
-          },
-          scalar: function(x) { return this; },
-        };
-        beforeEach(function() {
-          testElement = fixture('testElementFixture');
-          testElement.autoLoad = false;
-          testElement.backend = fakeBackend;
-          testElement.dataType = 'scalar';
-        });
-
-        it('load states work as expected', function(done) {
-          chai.assert.equal(testElement.loadState, 'noload');
-          var reloaded = testElement.reload();
-          chai.assert.equal(testElement.loadState, 'pending');
-          resolve();
-          reloaded
-              .then(function() {
-                chai.assert.equal(testElement.loadState, 'loaded');
-                var reloaded2 = testElement.reload();
-                chai.assert.equal(testElement.loadState, 'pending');
-                reject();
-                return reloaded2;
-              })
-              .then(function() {
-                chai.assert.equal(testElement.loadState, 'failure');
-                done();
-              });
-        });
-
-        it('data provider set appropriately', function() {
-          chai.assert.deepEqual(
-              testElement.dataProvider(), testElement.backend);
-        });
-
-        it('loads data as expected', function(done) {
-          var r2t: RunToTag = {
-            run1: ['foo', 'bar', 'zod'],
-            run2: ['zoink', 'zow'],
-            run3: ['.'],
-          };
-          var tags = TF.Backend.getTags(r2t);
-          var runs = TF.Backend.getRuns(r2t);
-          testElement.backend = fakeBackend;
-          testElement.dataType = 'scalar';
-          testElement.reload().then(function(x) {
-            chai.assert.deepEqual(testElement.run2tag, r2t);
-            chai.assert.deepEqual(testElement.runs, runs);
-            chai.assert.deepEqual(testElement.tags, tags);
-            done();
-          });
-          resolve(r2t);
-        });
-
-        it('errors thrown on bad data types', function() {
-          testElement.backend = undefined;
-          chai.assert.throws(function() {
-            testElement.dataType = 'foo';
-          });
-          testElement.dataType = 'scalar';
-          testElement.dataType = 'graph';
-          testElement.dataType = 'histogram';
-        });
-
-        it('dataNotFound flag works', function(done) {
-          chai.assert.isFalse(testElement.dataNotFound, 'initially false');
-          var next = testElement.reload();
-          chai.assert.isFalse(
-              testElement.dataNotFound, 'still false while pending');
-          resolve({foo: [], bar: []});
-          next.then(() => {
-            chai.assert.isTrue(testElement.dataNotFound, 'true on empty data');
-            var last = testElement.reload();
-            chai.assert.isTrue(
-                testElement.dataNotFound, 'still true while pending');
-            resolve({foo: ['bar'], bar: ['zod']});
-            last.then(() => {
-              chai.assert.isFalse(
-                  testElement.dataNotFound, 'false now that we have data');
-              done();
-            });
-          });
-        });
-
-        it('reloads as soon as setup, if autoReload is true', function(done) {
-          var r2t = {foo: [], bar: []};
-          var fakeBackend = {
-            scalarRuns: () => Promise.resolve(r2t),
-            scalar: () => null,
-          };
-          testElement = fixture('testElementFixture');
-          testElement.dataType = 'scalar';
-          testElement.backend = fakeBackend;
-          setTimeout(() => {
-            chai.assert.equal(testElement.run2tag, r2t);
-            done();
-          });
-        });
-
-        it('doesn\'t mutate props if backend returns same data', function(
-                                                                     done) {
-          var r2t_1 = {foo: ['1', '2'], bar: ['3', '4']};
-          var r2t_2 = {foo: ['1', '2'], bar: ['3', '4']};
-          var fakeBackend = {
-            scalarRuns: () => Promise.resolve(r2t_1),
-            scalar: () => null,
-          };
-          testElement.backend = fakeBackend;
-          testElement.reload().then(() => {
-            fakeBackend.scalarRuns = () => Promise.resolve(r2t_2);
-            var tags = testElement.tags;
-            testElement.reload().then(() => {
-              // shallow equality ensures it wasn't recomputed
-              chai.assert.equal(
-                  tags, testElement.tags, 'tags was not recomputed');
-              done();
-            });
-          });
-
-          it('reload calls frontendReload', function(done) {
-            testElement.frontendReload = function() { done(); };
-            testElement.reload();
-          });
-
-        });
-      });
-    }
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/audio_run_run1_tag_audio1.json b/tensorflow/tensorboard/components/tf_backend/test/data/audio_run_run1_tag_audio1.json
deleted file mode 100644
index 21a00f198d..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/audio_run_run1_tag_audio1.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"wall_time": 0, "step": 0, "query": "index=0&tag=audio1&run=run1", "content_type": "audio/wav"}]
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/compressedHistograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_backend/test/data/compressedHistograms_run_run1_tag_histo1.json
deleted file mode 100644
index 8b4c088392..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/compressedHistograms_run_run1_tag_histo1.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0, 0, [[0, -2.3150592308536755], [668, -2.0967547155036605], [1587, -1.4326244423655616], [3085, -0.8871306575801902], [5000, -0.09312398815580714], [6915, 0.2584093405812282], [8413, 0.8895470642005087], [9332, 1.3198979614453679], [10000, 1.6793308878855118]]], [100.0, 10, [[0, -1.3417572789138936], [668, -1.183563374619141], [1587, -0.48920418783271574], [3085, 0.29326906896076954], [5000, 0.56953784145381], [6915, 0.8684655583499333], [8413, 1.4133127368907181], [9332, 1.906140650457873], [10000, 2.135771998171255]]], [200.0, 20, [[0, -1.5066917525035333], [668, -1.3910909571770793], [1587, -0.902737218885874], [3085, -0.3807791904765027], [5000, 0.38900200905253046], [6915, 0.8209734209339482], [8413, 1.302385856695965], [9332, 1.9324626053521639], [10000, 2.957505317875451]]], [300.0, 30, [[0, -0.5430457051469562], [668, -0.4626161834245273], [1587, 0.21573949543027715], [3085, 0.37353741100174215], [5000, 0.6891407881591103], [6915, 1.0927156232630852], [8413, 1.2745337159550916], [9332, 1.4321116832891605], [10000, 2.1913774993059034]]], [400.0, 40, [[0, -0.3584790755077172], [668, -0.33301611509753215], [1587, -0.1089466072951948], [3085, 0.5792199847585249], [5000, 1.220854943811942], [6915, 1.759829438421432], [8413, 2.3072559906741614], [9332, 2.753036118353921], [10000, 3.0267252195784047]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/example.json b/tensorflow/tensorboard/components/tf_backend/test/data/example.json
deleted file mode 100644
index 8adc6fb896..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/example.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "foo": 3,
-  "bar": "zoidberg"
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/histograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_backend/test/data/histograms_run_run1_tag_histo1.json
deleted file mode 100644
index a5600a356e..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/histograms_run_run1_tag_histo1.json
+++ /dev/null
@@ -1 +0,0 @@
-[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/images_run_run1_tag_im1.json b/tensorflow/tensorboard/components/tf_backend/test/data/images_run_run1_tag_im1.json
deleted file mode 100644
index fd2a96b62f..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/images_run_run1_tag_im1.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"wall_time": 0, "step": 0, "query": "index=0&tag=im1&run=run1", "width": 1, "height": 1}]
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/individualImage_index_0_tag_im1_run_run1.png b/tensorflow/tensorboard/components/tf_backend/test/data/individualImage_index_0_tag_im1_run_run1.png
deleted file mode 100644
index f191b280ce91e6cb8c387735c10ef9bc5da6c83b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42
ocmZ?wbhEHbWMp7uXkY+=|Ns9h{$ybUF?B!$NQQxl(S^Yp0J!f4_W%F@

diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/run_metadata_run_step99_tag_train.pbtxt b/tensorflow/tensorboard/components/tf_backend/test/data/run_metadata_run_step99_tag_train.pbtxt
deleted file mode 100644
index 07ce4fad53..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/run_metadata_run_step99_tag_train.pbtxt
+++ /dev/null
@@ -1,17 +0,0 @@
-step_stats {
-  dev_stats {
-    device: "/job:localhost/replica:0/task:0/cpu:0"
-    node_stats {
-      node_name: "_SOURCE"
-      all_start_micros: 1459365298611334
-      op_start_rel_micros: 29
-      op_end_rel_micros: 30
-      all_end_rel_micros: 52
-      memory {
-        allocator_name: "cpu"
-      }
-      timeline_label: "_SOURCE = NoOp()"
-      scheduled_micros: 1459365298611291
-    }
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/runs.json b/tensorflow/tensorboard/components/tf_backend/test/data/runs.json
deleted file mode 100644
index 413ddb9ab3..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/runs.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "run1": {
-    "images": [
-      "im1"
-    ],
-    "audio": [
-      "audio1"
-    ],
-    "scalars": [
-      "cross_entropy (1)"
-    ],
-    "histograms": [
-      "histo1"
-    ],
-    "compressedHistograms": [
-      "histo1"
-    ],
-    "run_metadata": [
-      "step99"
-    ],
-    "graph": false
-  },
-  "fake_run_no_data": {
-    "images": ["im1", "im2"],
-    "audio": ["audio1", "audio2"],
-    "scalars": ["scalar2"],
-    "histograms": ["histo1"],
-    "compressedHistograms": ["histo1"],
-    "run_metadata": ["step99"],
-    "graph": true
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/scalars.json b/tensorflow/tensorboard/components/tf_backend/test/data/scalars.json
deleted file mode 100644
index bc9d3353d5..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/scalars.json
+++ /dev/null
@@ -1 +0,0 @@
-{"run1": {"cross_entropy (1)": [[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]}}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json b/tensorflow/tensorboard/components/tf_backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json
deleted file mode 100644
index 97b0062f0f..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/data/scalars_run_run1_tag_cross_entropy__281_29.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_backend/test/index.html b/tensorflow/tensorboard/components/tf_backend/test/index.html
deleted file mode 100644
index 7f51861d25..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/index.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../polymer/polymer.html">
-  <link rel="import" href="../../tf-imports/d3.html">
-  <link rel="import" href="../../vz-sorting/vz-sorting.html">
-</head>
-<body>
-  <test-fixture id="testElementFixture">
-    <template>
-      <test-element
-        id="test"
-      ></test-element>
-    </template>
-  </test-fixture>
-    <script src="../requestManager.js"></script>
-    <script src="../urlPathHelpers.js"></script>
-    <script src="../router.js"></script>
-    <script src="../backend.js"></script>
-    <script src="../behavior.js"></script>
-
-    <script src="requestManagerTest.js"></script>
-    <script src="backendTests.js"></script>
-    <script src="behaviorTests.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_backend/test/requestManagerTest.ts b/tensorflow/tensorboard/components/tf_backend/test/requestManagerTest.ts
deleted file mode 100644
index 9d5bd4d819..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/test/requestManagerTest.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module TF.Backend {
-  interface MockRequest {
-    resolve: Function;
-    reject: Function;
-    id: number;
-    url: string;
-  }
-
-  class MockedRequestManager extends TF.Backend.RequestManager {
-    private resolvers: Function[];
-    private rejectors: Function[];
-    public requestsDispatched: number;
-
-    constructor(maxRequests = 10, maxRetries = 3) {
-      super(maxRequests, maxRetries);
-      this.resolvers = [];
-      this.rejectors = [];
-      this.requestsDispatched = 0;
-    }
-
-    protected _promiseFromUrl(url) {
-      return new Promise((resolve, reject) => {
-        var mockJSON = {
-          ok: true,
-          json: function() { return url; },
-          url: url,
-          status: 200,
-        };
-        var mockFailedRequest: any = {
-          ok: false,
-          url: url,
-          status: 502,
-        };
-        var mockFailure = new RequestNetworkError(mockFailedRequest, url);
-        this.resolvers.push(function() { resolve(mockJSON); });
-        this.rejectors.push(function() { reject(mockFailure); });
-        this.requestsDispatched++;
-      });
-    }
-
-    public resolveFakeRequest() {
-      this.resolvers.pop()();
-    }
-
-    public rejectFakeRequest() {
-      this.rejectors.pop()();
-    }
-
-    public dispatchAndResolve() {
-      // Wait for at least one request to be dispatched, then resolve it.
-      this.waitForDispatch(1).then(() => this.resolveFakeRequest());
-    }
-
-    public waitForDispatch(num) {
-      return waitForCondition(() => {return this.requestsDispatched >= num; });
-    }
-  }
-
-  /* Create a promise that returns when *check* returns true. */
-  // May cause a test timeout if check never becomes true.
-  function waitForCondition(check: () => boolean): Promise<any> {
-    return new Promise((resolve, reject) => {
-      var go = function() {
-        if (check()) {
-          resolve();
-        }
-        setTimeout(go, 2);
-      };
-      go();
-    });
-  }
-
-  describe('backend', () => {
-    describe('request manager', () => {
-      it('request loads JSON properly', (done) => {
-        var rm = new TF.Backend.RequestManager();
-        var promise = rm.request('data/example.json');
-        promise.then(
-            (response) => {
-              chai.assert.deepEqual(response, {foo: 3, bar: 'zoidberg'});
-              done();
-            },
-            (reject) => {
-              throw new Error(reject);
-            });
-      });
-
-      it('rejects on bad url', (done) => {
-        var rm = new TF.Backend.RequestManager(5, 0);
-        var bad_url = '_bad_url_which_doesnt_exist.json';
-        var promise = rm.request(bad_url);
-        promise.then(
-            (success) => {
-              done(new Error('the promise should have rejected'));
-            },
-            (reject: TF.Backend.RequestNetworkError) => {
-              chai.assert.instanceOf(reject, TF.Backend.RequestNetworkError);
-              chai.assert.include(reject.message, '404');
-              chai.assert.include(reject.message, bad_url);
-              chai.assert.equal(reject.req.status, 404);
-              done();
-            });
-      });
-
-      it('can retry if requests fail', (done) => {
-        var rm = new MockedRequestManager(3, 5);
-        var r = rm.request('foo');
-        rm.waitForDispatch(1).then(() => {
-          rm.rejectFakeRequest();
-          return rm.waitForDispatch(2);
-        }).then(() => rm.resolveFakeRequest());
-        r.then((success) => done());
-      });
-
-      it('retries at most maxRetries times', (done) => {
-        var MAX_RETRIES = 2;
-        var rm = new MockedRequestManager(3, MAX_RETRIES);
-        var r = rm.request('foo');
-        rm.waitForDispatch(1).then(() => {
-          rm.rejectFakeRequest();
-          return rm.waitForDispatch(2);
-        }).then(() => {
-          rm.rejectFakeRequest();
-          return rm.waitForDispatch(3);
-        }).then(() => {
-          rm.rejectFakeRequest();
-        });
-
-        r.then(
-            (success) => done(new Error('The reqest should have failed')),
-            (failure) => done());
-      });
-
-      it('requestManager only sends maxRequests requests at a time', (done) => {
-        var rm = new MockedRequestManager(3);
-        var requestsConcluded = 0;
-        var r0 = rm.request('1');
-        var r1 = rm.request('2');
-        var r2 = rm.request('3');
-        var r3 = rm.request('4');
-        chai.assert.equal(rm.activeRequests(), 3, 'three requests are active');
-        chai.assert.equal(
-            rm.outstandingRequests(), 4, 'four requests are pending');
-        rm.waitForDispatch(3)
-            .then(() => {
-              chai.assert.equal(
-                  rm.activeRequests(), 3,
-                  'three requests are still active (1)');
-              chai.assert.equal(
-                  rm.requestsDispatched, 3, 'three requests were dispatched');
-              rm.resolveFakeRequest();
-              return rm.waitForDispatch(4);
-            })
-            .then(() => {
-              chai.assert.equal(
-                  rm.activeRequests(), 3,
-                  'three requests are still active (2)');
-              chai.assert.equal(
-                  rm.requestsDispatched, 4, 'four requests were dispatched');
-              chai.assert.equal(
-                  rm.outstandingRequests(), 3, 'three requests are pending');
-              rm.resolveFakeRequest();
-              rm.resolveFakeRequest();
-              rm.resolveFakeRequest();
-              return r3;
-            })
-            .then(() => {
-              chai.assert.equal(
-                  rm.activeRequests(), 0, 'all requests finished');
-              chai.assert.equal(
-                  rm.outstandingRequests(), 0, 'no requests pending');
-              done();
-            });
-      });
-
-      it('queue continues after failures', (done) => {
-        var rm = new MockedRequestManager(1, 0);
-        var r0 = rm.request('1');
-        var r1 = rm.request('2');
-        rm.waitForDispatch(1).then(() => {
-          rm.rejectFakeRequest();
-        });
-
-        r0.then(
-              (success) => done(new Error('r0 should have failed')),
-              (failure) => 'unused_argument')
-            .then(() => rm.resolveFakeRequest());
-
-        // When the first request rejects, it should decrement nActiveRequests
-        // and then launch remaining requests in queue (i.e. this one)
-        r1.then((success) => done(),
-                (failure) => done(new Error(failure)));
-      });
-
-      it('queue is LIFO', (done) => {
-        /* This test is a bit tricky.
-        * We want to verify that the RequestManager queue has LIFO semantics.
-        * So we construct three requests off the bat: A, B, C.
-        * So LIFO semantics ensure these will resolve in order A, C, B.
-        * (Because the A request launches immediately when we create it, it's
-        * not in queue)
-        * Then after resolving A, C moves out of queue, and we create X.
-        * So expected final order is A, C, X, B.
-        * We verify this with an external var that counts how many requests were
-        * resolved.
-        */
-        var rm = new MockedRequestManager(1);
-        var nResolved = 0;
-        function assertResolutionOrder(expectedSpotInSequence) {
-          return function() {
-            nResolved++;
-            chai.assert.equal(expectedSpotInSequence, nResolved);
-          };
-        }
-
-        function launchThirdRequest() {
-          rm.request('started late but goes third')
-              .then(assertResolutionOrder(3))
-              .then(() => rm.dispatchAndResolve());
-        }
-
-        rm.request('first')
-            .then(assertResolutionOrder(
-                1))  // Assert that this one resolved first
-            .then(launchThirdRequest)
-            .then(() => rm.dispatchAndResolve());  // then trigger the next one
-
-        rm.request('this one goes fourth')  // created second, will go last
-            .then(assertResolutionOrder(
-                4))       // assert it was the fourth to get resolved
-            .then(done);  // finish the test
-
-        rm.request('second')
-            .then(assertResolutionOrder(2))
-            .then(() => rm.dispatchAndResolve());
-
-        rm.dispatchAndResolve();
-      });
-
-      it('requestManager can clear queue', (done) => {
-        var rm = new MockedRequestManager(1);
-        var requestsResolved = 0;
-        var requestsRejected = 0;
-        var success = () => requestsResolved++;
-        var failure = (err) => {
-          chai.assert.equal(err.name, 'RequestCancellationError');
-          requestsRejected++;
-        };
-        var finishTheTest = () => {
-          chai.assert.equal(rm.activeRequests(), 0, 'no requests still active');
-          chai.assert.equal(
-              rm.requestsDispatched, 1, 'only one req was ever dispatched');
-          chai.assert.equal(rm.outstandingRequests(), 0, 'no pending requests');
-          chai.assert.equal(requestsResolved, 1, 'one request got resolved');
-          chai.assert.equal(
-              requestsRejected, 4, 'four were cancelled and threw errors');
-          done();
-        };
-        rm.request('0').then(success, failure).then(finishTheTest);
-        rm.request('1').then(success, failure);
-        rm.request('2').then(success, failure);
-        rm.request('3').then(success, failure);
-        rm.request('4').then(success, failure);
-        chai.assert.equal(rm.activeRequests(), 1, 'one req is active');
-        rm.waitForDispatch(1).then(() => {
-          chai.assert.equal(rm.activeRequests(), 1, 'one req is active');
-          chai.assert.equal(rm.requestsDispatched, 1, 'one req was dispatched');
-          chai.assert.equal(
-              rm.outstandingRequests(), 5, 'five reqs outstanding');
-          rm.clearQueue();
-          rm.resolveFakeRequest();
-          // resolving the first request triggers finishTheTest
-        });
-      });
-    });
-  });
-}
diff --git a/tensorflow/tensorboard/components/tf_backend/tf-backend.html b/tensorflow/tensorboard/components/tf_backend/tf-backend.html
deleted file mode 100644
index 0e07c7fdb1..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/tf-backend.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-imports/lodash.html">
-<link rel="import" href="../tf-imports/d3.html">
-<link rel="import" href="../vz-sorting/vz-sorting.html">
-
-<script src="requestManager.js"></script>
-<script src="urlPathHelpers.js"></script>
-<script src="router.js"></script>
-<script src="backend.js"></script>
-<script src="behavior.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_backend/urlPathHelpers.ts b/tensorflow/tensorboard/components/tf_backend/urlPathHelpers.ts
deleted file mode 100644
index 7c59eafb44..0000000000
--- a/tensorflow/tensorboard/components/tf_backend/urlPathHelpers.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module TF.Backend {
-  export var BAD_CHARACTERS = '#%&{}\\/<>*? $!\'":@+`|=() ';
-  /** Cleanup a url so that it can be loaded from a filesystem. */
-  export function demoify(s) {
-    // for consistency with python's urllib.urlencode
-    s = s.replace(new RegExp('%20', 'g'), '+');
-    for (var i = 0; i < BAD_CHARACTERS.length; i++) {
-      var c = BAD_CHARACTERS[i];
-      s = s.replace(new RegExp('\\' + c, 'g'), '_');
-    }
-    return s;
-  }
-
-  export function queryEncoder(params?: any): string {
-    // It's important that the keys be sorted, so we always grab the right file
-    // if we are talking to the backend generated by serialze_tensorboard.py
-    if (params == null) {
-      return '';
-    }
-    var components = _.keys(params)
-                         .sort()
-                         .filter((k) => params[k] !== undefined)
-                         .map((k) => k + '=' + encodeURIComponent(params[k]));
-    var result = components.length ? '?' + components.join('&') : '';
-    // Replace parens for consistency with urllib.urlencode
-    return result.replace(/\(/g, '%28').replace(/\)/g, '%29');
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_color_scale/BUILD b/tensorflow/tensorboard/components/tf_color_scale/BUILD
deleted file mode 100644
index f6f1be099a..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/BUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# TODO(dandelion): Add webfiles support for the test code.
-
-web_library(
-    name = "tf_color_scale",
-    srcs = [
-        "tf-color-scale.html",
-        ":ts",
-    ],
-    path = "/tf-color-scale",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "colorScale.ts",
-        "palettes.ts",
-    ],
-    typings = ["@org_definitelytyped//:d3.d.ts"],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-color-scale.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-color-scale",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "colorScale.ts",
-        "palettes.ts",
-    ],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-    deps = [
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/plottable/v1:typings",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/d3",
-        "//third_party/javascript/typings/lodash",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/sinon",
-        "//third_party/javascript/typings/webcomponents_js",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_color_scale/colorScale.ts b/tensorflow/tensorboard/components/tf_color_scale/colorScale.ts
deleted file mode 100644
index c05d976533..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/colorScale.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// Example usage:
-// runs = ["train", "test", "test1", "test2"]
-// ccs = new TF.ColorScale();
-// ccs.domain(runs);
-// ccs.getColor("train");
-// ccs.getColor("test1");
-
-module TF {
-  export class ColorScale {
-    private palette: string[];
-    private identifiers = d3.map();
-
-    /**
-     * Creates a color scale with optional custom palette.
-     *  @param {string[]} [palette=TF.palettes.googleColorBlind] - The color
-     *                 palette you want as an Array of hex strings.
-     */
-    constructor(palette: string[] = TF.palettes.googleColorBlindAssist) {
-      this.palette = palette;
-    }
-
-    /**
-     * Set the domain of strings.
-     * @param {string[]} strings - An array of possible strings to use as the
-     *                             domain for your scale.
-     */
-    public domain(strings: string[]): this {
-      this.identifiers = d3.map();
-      strings.forEach((s, i) => {
-        this.identifiers.set(s, this.palette[i % this.palette.length]);
-      });
-      return this;
-    }
-
-    /**
-     * Use the color scale to transform an element in the domain into a color.
-     * @param {string} The input string to map to a color.
-     * @return {string} The color corresponding to that input string.
-     * @throws Will error if input string is not in the scale's domain.
-     */
-    public scale(s: string): string {
-      if (!this.identifiers.has(s)) {
-        throw new Error('String was not in the domain.');
-      }
-      return this.identifiers.get(s) as string;
-    }
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD b/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
deleted file mode 100644
index f0a7fa2235..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_color_scale/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-color-scale/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_color_scale/demo/index.html b/tensorflow/tensorboard/components/tf_color_scale/demo/index.html
deleted file mode 100644
index ad9edbda98..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/demo/index.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>tf-color-scale demo</title>
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../tf-color-scale.html">
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<link rel="import" href="../../paper-styles/typography.html">
-<link rel="import" href="../../paper-button/paper-button.html">
-<link rel="import" href="../../tf-imports/d3.html">
-
-<style> body {font-family: "Roboto";}</style>
-<demo-snippet>
-  <template>
-    <dom-module id="color-scale-demo">
-      <template>
-        <paper-button raised id="button" on-tap="change">Change Runs</paper-button>
-        <tf-color-scale runs="[[runs]]" out-color-scale="{{scale}}"></tf-color-scale>
-        <div class="container">
-          <template is="dom-repeat" items="[[runs]]">
-            <div class="row">
-              <div class="circle" style$=[[_makeStyle(item)]]></div>
-              <span>[[item]]</span>
-            </div>
-          </template>
-        </div>
-        <style>
-          .circle {
-            width: 20px;
-            height: 20px;
-            border-radius: 10px;
-            display: inline-block;
-          }
-          .row {
-            height: 35px;
-            width: 200px;
-            display: inline-block;
-          }
-          .container {
-            height: 200px;
-          }
-          #button {
-            margin: 20px;
-          }
-        </style>
-      </template>
-      <script>
-        let fellowship = ["aragorn", "legolas", "gimli", "frodo", 
-                          "gandalf", "boromir", "merry", "pippin", "sam"];
-        let gems = ["garnet", "amethyst", "pearl", "and steven!"];
-        let numbers = d3.range(30).map(function(x) {return x.toString();});
-        let examples = [numbers, fellowship, gems];
-        Polymer({
-          is: "color-scale-demo",
-          properties: {
-            runs: {
-              type: Array,
-              value: examples[0],
-            },
-            i: {
-              type: Number,
-              value: 0,
-            },
-          },
-          _makeStyle: function(item) {
-            return "background-color: " + this.scale.scale(item);
-          },
-          change: function() {
-            this.i = (this.i + 1) % 3;
-            this.runs = examples[this.i];
-          },
-        });
-      </script>
-    </dom-module>
-    <color-scale-demo id="demo"></color-scale-demo>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_color_scale/palettes.ts b/tensorflow/tensorboard/components/tf_color_scale/palettes.ts
deleted file mode 100644
index c53ed599ae..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/palettes.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module TF {
-  export const palettes = {
-    googleStandard: [
-      '#db4437',  // google red 500
-      '#ff7043',  // deep orange 400
-      '#f4b400',  // google yellow 500
-      '#0f9d58',  // google green 500
-      '#00796b',  // teal 700
-      '#00acc1',  // cyan 600
-      '#4285f4',  // google blue 500
-      '#5c6bc0',  // indigo 400
-      '#ab47bc'   // purple 400
-    ],
-    googleCool: [
-      '#9e9d24',  // lime 800
-      '#0f9d58',  // google green 500
-      '#00796b',  // teal 700
-      '#00acc1',  // cyan 600
-      '#4285f4',  // google blue 500
-      '#5c6bc0',  // indigo 400
-      '#607d8b'   // blue gray 500
-    ],
-    googleWarm: [
-      '#795548',  // brown 500
-      '#ab47bc',  // purple 400
-      '#f06292',  // pink 300
-      '#c2185b',  // pink 700
-      '#db4437',  // google red 500
-      '#ff7043',  // deep orange 400
-      '#f4b400'   // google yellow 700
-    ],
-    googleColorBlindAssist: [
-      '#ff7043',  // orange
-      '#00ACC1',  // dark cyan
-      '#AB47BC',  // bright purple
-      '#2A56C6',  // dark blue
-      '#0b8043',  // green
-      '#F7CB4D',  // yellow
-      '#c0ca33',  // lime
-      '#5e35b1',  // purple
-      '#A52714',  // red
-    ],
-    // These palettes try to be better for color differentiation.
-    // https://personal.sron.nl/~pault/
-    colorBlindAssist1:
-        ['#4477aa', '#44aaaa', '#aaaa44', '#aa7744', '#aa4455', '#aa4488'],
-    colorBlindAssist2: [
-      '#88ccee', '#44aa99', '#117733', '#999933', '#ddcc77', '#cc6677',
-      '#882255', '#aa4499'
-    ],
-    colorBlindAssist3: [
-      '#332288', '#6699cc', '#88ccee', '#44aa99', '#117733', '#999933',
-      '#ddcc77', '#cc6677', '#aa4466', '#882255', '#661100', '#aa4499'
-    ],
-    // based on this palette: http://mkweb.bcgsc.ca/biovis2012/
-    colorBlindAssist4: [
-      '#FF6DB6', '#920000', '#924900', '#DBD100', '#24FF24', '#006DDB',
-      '#490092'
-    ],
-    mldash: [
-      '#E47EAD', '#F4640D', '#FAA300', '#F5E636', '#00A077', '#0077B8',
-      '#00B7ED'
-    ]
-  };
-}
diff --git a/tensorflow/tensorboard/components/tf_color_scale/test/colorScaleTests.ts b/tensorflow/tensorboard/components/tf_color_scale/test/colorScaleTests.ts
deleted file mode 100644
index 700a01848b..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/test/colorScaleTests.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module TF {
-  let assert = chai.assert;
-
-  describe('ColorScale', function() {
-    let ccs: ColorScale;
-
-    beforeEach(function() { ccs = new ColorScale(); });
-
-    it('Returns consistent colors', function() {
-      ccs.domain(['train', 'eval', 'test']);
-      let trainColor = ccs.scale('train');
-      let trainColor2 = ccs.scale('train');
-      assert.equal(trainColor, trainColor2);
-    });
-
-    it('Returns consistent colors after new domain', function() {
-      ccs.domain(['train', 'eval']);
-      let trainColor = ccs.scale('train');
-      ccs.domain(['train', 'eval', 'test']);
-      let trainColor2 = ccs.scale('train');
-      assert.equal(trainColor, trainColor2);
-    });
-
-    it('Throws an error if string is not in the domain', function() {
-      ccs.domain(['red', 'yellow', 'green']);
-      assert.throws(function() {
-        ccs.scale('not in domain');
-      }, 'String was not in the domain.');
-    });
-  });
-}
diff --git a/tensorflow/tensorboard/components/tf_color_scale/test/index.html b/tensorflow/tensorboard/components/tf_color_scale/test/index.html
deleted file mode 100644
index 9a2a174349..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/test/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../web-component-tester/browser.js"></script>
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <link rel="import" href="../../tf-imports/d3.html">
-</head>
-<body>
-    <script src="../colorScale.js"></script>
-    <script src="../palettes.js"></script>
-    <script src="colorScaleTests.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_color_scale/tf-color-scale.html b/tensorflow/tensorboard/components/tf_color_scale/tf-color-scale.html
deleted file mode 100644
index 79bee6d957..0000000000
--- a/tensorflow/tensorboard/components/tf_color_scale/tf-color-scale.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-imports/d3.html">
-
-<!--
-tf-color-scale is a plumbing component that takes in an array of runs, and produces
-an upward-bindable outColorScale, which is a color scale mapping from those runs to
-a set of colors.
-
-@element tf-color-scale
--->
-<dom-module id="tf-color-scale">
-  <script src="palettes.js"></script>
-  <script src="colorScale.js"></script>
-  <script>
-    (function() {
-      Polymer({
-        is: "tf-color-scale",
-        properties: {
-          runs: {
-            type: Array,
-          },
-          outColorScale: {
-            type: Object,
-            readOnly: true,
-            notify: true,
-            value: function() {
-              return new TF.ColorScale();
-            },
-          },
-        },
-        observers: ['updateColorScale(runs.*)'],
-        updateColorScale: function(runsChange) {
-          this.outColorScale.domain(this.runs);
-        },
-      });
-    })();
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
deleted file mode 100644
index f89b31b002..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common/demo/BUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_dashboard_common/demo
-web_library(
-    name = "demo",
-    srcs = [
-        "tf-categorizer-demo.html",
-        "tf-collapsable-pane-demo.html",
-        "tf-multi-checkbox-demo.html",
-        "tf-regex-group-demo.html",
-    ],
-    path = "/tf-dashboard-common/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_flex_layout",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-categorizer-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-categorizer-demo.html
deleted file mode 100644
index 285d36fa77..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-categorizer-demo.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
- <head>
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <link rel="import" href="../../tf-imports/d3.html">
-  <link rel="import" href="../tf-categorizer.html">
-  <link rel="import" href="../../iron-flex-layout/classes/iron-flex-layout.html">
-
- </head>
- <body>
-  <style>
-  </style>
-  <dom-module id="x-demo">
-    <style>
-      .container {
-        width: 255px;
-        padding: 10px;
-        border: 1px solid var(--paper-indigo-900);
-        border-radius: 5px;
-        position: fixed;
-      }
-      :host {
-        margin: 0px;
-      }
-
-      .categories {
-        font-family: "RobotoDraft",Helvetica;
-        margin-left: 300px;
-        width: 500px;
-        border: 1px solid var(--paper-indigo-500);
-        border-radius: 5px;
-      }
-
-      .category {
-        background-color: var(--paper-indigo-50);
-        margin: 20px;
-        padding: 20px;
-        border-radius: 5px;
-      }
-
-      .cat-name {
-        font-size: 20px;
-      }
-
-      .tag {
-        border-radius: 5px;
-        padding: 5px;
-        margin: 5px;
-        background-color: var(--paper-indigo-900);
-        color: white;
-      }
-    </style>
-    <template>
-      <div class="container">
-        <tf-categorizer categories="{{categories}}" tags="[[tags]]" id="demo"></tf-categorizer>
-      </div>
-      <div class="categories">
-        <template is="dom-repeat" items="[[categories]]">
-          <div class="category">
-            <p class="cat-name">Category: <span>[[item.name]]</span></p>
-            <div class="tags-container layout horizontal wrap">
-              <template is="dom-repeat" items="[[item.tags]]">
-                <span class="tag layout vertical center-center">[[item]]</span>
-              </template>
-            </div>
-          </div>
-        </template>
-      </div>
-    </template>
-    <script>
-
-    function tagsGenerator() {
-      var tags = ["special1", "special2", "special3", "special4", "special5"];
-      ["l1", "l2", "l3", "l4", "l5"].forEach(function(l) {
-        ["foo", "bar", "baz", "boink", "zod", "specialx"].forEach(function(x) {
-          tags.push(l + "/" + x);
-        });
-      });
-      return tags;
-    }
-
-    Polymer({
-      is: "x-demo",
-      properties: {
-        tags: { type: Array, value: tagsGenerator },
-      },
-    });
-    </script>
-  </dom-module>
-
-  <x-demo id="demo"></x-demo>
- </body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-collapsable-pane-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-collapsable-pane-demo.html
deleted file mode 100644
index 15253a8331..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-collapsable-pane-demo.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
- <head>
-   <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-   <link rel="import" href="../tf-collapsable-pane.html">
- </head>
- <body>
-  <style>
-  </style>
-  <tf-collapsable-pane name="foo">
-    <h1>This is content inside the pane.</h1>
-  </tf-collapsable-pane>
- </body>
- <script>
-
- </script>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-multi-checkbox-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-multi-checkbox-demo.html
deleted file mode 100644
index 4c2fe55eba..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-multi-checkbox-demo.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../../tf-imports/d3.html">
-<link rel="import" href="../tf-multi-checkbox.html">
-<link rel="import" href="../../tf-color-scale/tf-color-scale.html">
-
-</head>
-<body>
-<script>
-var seed = 1;
-function random() {
-  var x = Math.sin(seed++) * 10000;
-  return x - Math.floor(x);
-}
-</script>
-<style>
-</style>
-
-<dom-module id="mc-demo">
-  <template>
-    <tf-multi-checkbox
-      id="multiCheckbox"
-      names="[[names]]"
-      tooltips="[[_tooltips]]"
-      class-scale="[[classScale]]"
-      highlights="[[highlights]]"
-    ></tf-multi-checkbox>
-    <tf-color-scale
-      id="colorScale"
-      runs="[[names]]"
-      out-class-scale="{{classScale}}"
-    ></tf-color-scale>
-  <style>
-  </style>
-  </template>
-  <script>
-
-  function randomTooltip() {
-    var s = "";
-    while (random() < 0.8) {
-      s += String(10*random())[0];
-    }
-    return s;
-  }
-  Polymer({
-    is: "mc-demo",
-    properties: {
-      names: Array,
-      tooltips: Object,
-      autoGenerateTooltips: {value: true},
-      _tooltips: Object,
-      classScale: Function,
-      highlights: Array,
-    },
-    observers: [
-      'autogenerate(names, autoGenerateTooltips)',
-      'randomHighlights(names)'
-    ],
-    autogenerate: function(names, autoGenerateTooltips) {
-      if (autoGenerateTooltips) {
-        var tooltips = {};
-        names.forEach(function(n) {
-        if (random() > 0.5) {
-          tooltips[n] = randomTooltip();
-        }
-      });
-      this._tooltips = tooltips;
-      }
-    },
-    randomHighlights: function(names) {
-      var h = [];
-      names.forEach(function(n) {
-        if (random() > 0.6) {
-          h.push(n);
-        }
-      });
-      this.highlights = h;
-    }
-  });
-  </script>
-</dom-module>
-
-<dom-module id="x-demo">
-<style>
-.small {
-  width: 200px;
-  height: 500px;
-}
-.large {
-  width: 500px;
-  height: 900px;
-}
-html,body {
-  height: 100%;
-}
-mc-demo {
-  padding: 5px;
-  border: 1px solid var(--paper-red-500);
-  display: inline-block;
-}
-</style>
-<template>
-  <div class="demo-block">
-    <mc-demo id="demo1" class="small" names="[[long_names]]"></mc-demo>
-    <mc-demo class="small" names="[[many_names]]"></mc-demo>
-    <mc-demo class="small" names="[[many_long_names]]"></mc-demo>
-  </div>
-
-  <div class="demo-block">
-    <mc-demo class="large" names="[[long_names]]"></mc-demo>
-    <mc-demo class="large" names="[[many_names]]"></mc-demo>
-    <mc-demo class="large" names="[[many_long_names]]"></mc-demo>
-  </div>
-
-</template>
-<script>
-
-function long_names() {
-  return [
-    "foo_bar very long name with spaces",
-    "the quick brown fox jumped over the lazy dog",
-    "supercalifragilisticexpialodcious/bar/foo/zod/longer/longer",
-  ];
-}
-
-function many_names() {
-  var out = [];
-  for (var i=0; i<20; i++) {
-    out.push("foo_bar-" + i);
-    out.push("bar_zod_bing-" + i);
-    out.push("lol-" + i);
-  }
-  return out;
-}
-
-function many_long_names() {
-  var out = [];
-  for (var i=0; i<20; i++) {
-    out.push("foo_bar very very very long some spaces though-" + i);
-    out.push("bar_zod_bing_bas_womp_wub_wub_dub_wub_wub-" + i);
-    out.push("rightly_to_be_great_is_not_to_stir_without_great_argument_but_greatly_to_find_quarrel_in_a_straw_when_honors_at_the_stake-" + i);
-  }
-  return out;
-}
-
-Polymer({
-  is: "x-demo",
-  properties: {
-  long_names: {type: Array, value: long_names},
-  many_names: {type: Array, value: many_names},
-  many_long_names: {type: Array, value: many_long_names},
-},
-});
-</script>
-</dom-module>
-
-<x-demo id="demo"></x-demo>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-regex-group-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-regex-group-demo.html
deleted file mode 100644
index eaf10999bf..0000000000
--- a/tensorflow/tensorboard/components/tf_dashboard_common/demo/tf-regex-group-demo.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
- <head>
-   <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-   <link rel="import" href="../tf-regex-group.html">
- </head>
- <body>
-  <style>
-  .container {
-    width: 255px;
-    padding: 10px;
-    border: 1px solid #3f51b5;
-    border-radius: 5px;
-  }
-  :host {
-    margin: 0px;
-  }
-  </style>
-  <template id="page-template" is="dom-bind">
-    <div class="container">
-      <tf-regex-group regexes="{{regexes}}" id="demo"></tf-regex-group>
-    </div>
-    <p> Regexes:</p>
-    <template is="dom-repeat" items="[[regexes]]">
-      <p>"<span>[[item]]</span>"</p>
-    </template>
-  </template>
- </body>
- <script>
-
- </script>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
deleted file mode 100644
index 65341e7647..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/BUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_distribution_dashboard",
-    srcs = [
-        "tf-distribution-dashboard.html",
-    ],
-    path = "/tf-distribution-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_distribution_chart",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-distribution-dashboard.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-distribution-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//tensorflow/tensorboard/components/vz_distribution_chart:legacy",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
deleted file mode 100644
index e512d1a5e2..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_distribution_dashboard/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-distribution-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard",
-        "//tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
deleted file mode 100644
index a4055f34e3..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-distribution-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run1_tag_histo1.json
deleted file mode 100644
index a6765285b1..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run1_tag_histo1.json
+++ /dev/null
@@ -1,212 +0,0 @@
-[
-    [
-        0.0,
-        0,
-        [
-            [
-                0,
-                -2.3150592308536755
-            ],
-            [
-                668,
-                -2.0967547155036605
-            ],
-            [
-                1587,
-                -1.4326244423655616
-            ],
-            [
-                3085,
-                -0.8871306575801902
-            ],
-            [
-                5000,
-                -0.09312398815580714
-            ],
-            [
-                6915,
-                0.2584093405812282
-            ],
-            [
-                8413,
-                0.8895470642005087
-            ],
-            [
-                9332,
-                1.3198979614453679
-            ],
-            [
-                10000,
-                1.6793308878855118
-            ]
-        ]
-    ],
-    [
-        100.0,
-        10,
-        [
-            [
-                0,
-                -1.3417572789138936
-            ],
-            [
-                668,
-                -1.183563374619141
-            ],
-            [
-                1587,
-                -0.48920418783271574
-            ],
-            [
-                3085,
-                0.29326906896076954
-            ],
-            [
-                5000,
-                0.56953784145381
-            ],
-            [
-                6915,
-                0.8684655583499333
-            ],
-            [
-                8413,
-                1.4133127368907181
-            ],
-            [
-                9332,
-                1.906140650457873
-            ],
-            [
-                10000,
-                2.135771998171255
-            ]
-        ]
-    ],
-    [
-        200.0,
-        20,
-        [
-            [
-                0,
-                -1.5066917525035333
-            ],
-            [
-                668,
-                -1.3910909571770793
-            ],
-            [
-                1587,
-                -0.902737218885874
-            ],
-            [
-                3085,
-                -0.3807791904765027
-            ],
-            [
-                5000,
-                0.38900200905253046
-            ],
-            [
-                6915,
-                0.8209734209339482
-            ],
-            [
-                8413,
-                1.302385856695965
-            ],
-            [
-                9332,
-                1.9324626053521639
-            ],
-            [
-                10000,
-                2.957505317875451
-            ]
-        ]
-    ],
-    [
-        300.0,
-        30,
-        [
-            [
-                0,
-                -0.5430457051469562
-            ],
-            [
-                668,
-                -0.4626161834245273
-            ],
-            [
-                1587,
-                0.21573949543027715
-            ],
-            [
-                3085,
-                0.37353741100174215
-            ],
-            [
-                5000,
-                0.6891407881591103
-            ],
-            [
-                6915,
-                1.0927156232630852
-            ],
-            [
-                8413,
-                1.2745337159550916
-            ],
-            [
-                9332,
-                1.4321116832891605
-            ],
-            [
-                10000,
-                2.1913774993059034
-            ]
-        ]
-    ],
-    [
-        400.0,
-        40,
-        [
-            [
-                0,
-                -0.3584790755077172
-            ],
-            [
-                668,
-                -0.33301611509753215
-            ],
-            [
-                1587,
-                -0.1089466072951948
-            ],
-            [
-                3085,
-                0.5792199847585249
-            ],
-            [
-                5000,
-                1.220854943811942
-            ],
-            [
-                6915,
-                1.759829438421432
-            ],
-            [
-                8413,
-                2.3072559906741614
-            ],
-            [
-                9332,
-                2.753036118353921
-            ],
-            [
-                10000,
-                3.0267252195784047
-            ]
-        ]
-    ]
-]
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo1.json b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo1.json
deleted file mode 100644
index 9e8a55b3f2..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo1.json
+++ /dev/null
@@ -1,212 +0,0 @@
-[
-    [
-        0.0,
-        0,
-        [
-            [
-                0,
-                -3.6801669545044846
-            ],
-            [
-                668,
-                -3.192188140974744
-            ],
-            [
-                1587,
-                -2.3414678549368806
-            ],
-            [
-                3085,
-                -0.9632173471995873
-            ],
-            [
-                5000,
-                -0.3214892636797772
-            ],
-            [
-                6915,
-                0.11870794142185205
-            ],
-            [
-                8413,
-                0.8895470642005087
-            ],
-            [
-                9332,
-                1.183563374619141
-            ],
-            [
-                10000,
-                2.665663810418372
-            ]
-        ]
-    ],
-    [
-        100.0,
-        10,
-        [
-            [
-                0,
-                -3.564793583751807
-            ],
-            [
-                668,
-                -3.376844436865802
-            ],
-            [
-                1587,
-                -1.0366615731293798
-            ],
-            [
-                3085,
-                -0.27318696312672563
-            ],
-            [
-                5000,
-                0.9718642422053263
-            ],
-            [
-                6915,
-                2.5765662807928194
-            ],
-            [
-                8413,
-                3.1415385101545126
-            ],
-            [
-                9332,
-                4.085981768607621
-            ],
-            [
-                10000,
-                4.623079406808927
-            ]
-        ]
-    ],
-    [
-        200.0,
-        20,
-        [
-            [
-                0,
-                -2.235172510433281
-            ],
-            [
-                668,
-                -2.004569042815611
-            ],
-            [
-                1587,
-                -1.2015432383370985
-            ],
-            [
-                3085,
-                0.11835464933202625
-            ],
-            [
-                5000,
-                0.56953784145381
-            ],
-            [
-                6915,
-                1.202844810963146
-            ],
-            [
-                8413,
-                2.689066032283515
-            ],
-            [
-                9332,
-                2.8494015726499944
-            ],
-            [
-                10000,
-                3.481377676013788
-            ]
-        ]
-    ],
-    [
-        300.0,
-        30,
-        [
-            [
-                0,
-                -3.360113978269659
-            ],
-            [
-                668,
-                -2.8293185004961043
-            ],
-            [
-                1587,
-                -1.5992540502266783
-            ],
-            [
-                3085,
-                0.14393860259807117
-            ],
-            [
-                5000,
-                1.47723448201245
-            ],
-            [
-                6915,
-                1.9510057389110733
-            ],
-            [
-                8413,
-                2.833176104473626
-            ],
-            [
-                9332,
-                4.142405216576347
-            ],
-            [
-                10000,
-                4.706937777668589
-            ]
-        ]
-    ],
-    [
-        400.0,
-        40,
-        [
-            [
-                0,
-                -2.599286228987632
-            ],
-            [
-                668,
-                -2.240365897443259
-            ],
-            [
-                1587,
-                -1.5992540502266783
-            ],
-            [
-                3085,
-                -0.9101893288861387
-            ],
-            [
-                5000,
-                0.7580548669750213
-            ],
-            [
-                6915,
-                1.6009864433919474
-            ],
-            [
-                8413,
-                2.3504002974280036
-            ],
-            [
-                9332,
-                2.7907805263353733
-            ],
-            [
-                10000,
-                3.5098048900144323
-            ]
-        ]
-    ]
-]
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo2.json b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo2.json
deleted file mode 100644
index 7c8836f624..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/compressedHistograms_run_run2_tag_histo2.json
+++ /dev/null
@@ -1,212 +0,0 @@
-[
-    [
-        0.0,
-        0,
-        [
-            [
-                0,
-                -1.9291158122759586
-            ],
-            [
-                668,
-                -1.5970765333488954
-            ],
-            [
-                1587,
-                -1.0923120348519078
-            ],
-            [
-                3085,
-                -0.6688082872192093
-            ],
-            [
-                5000,
-                0.09312398815580714
-            ],
-            [
-                6915,
-                0.44532789251701854
-            ],
-            [
-                8413,
-                0.8238009655877649
-            ],
-            [
-                9332,
-                1.0357232383581656
-            ],
-            [
-                10000,
-                1.2741043689144438
-            ]
-        ]
-    ],
-    [
-        100.0,
-        10,
-        [
-            [
-                0,
-                -0.7780725642449806
-            ],
-            [
-                668,
-                -0.7138496178727424
-            ],
-            [
-                1587,
-                -0.5448932415735014
-            ],
-            [
-                3085,
-                -0.24370397454796228
-            ],
-            [
-                5000,
-                0.42790220995778355
-            ],
-            [
-                6915,
-                0.6191730643365096
-            ],
-            [
-                8413,
-                0.752059342118037
-            ],
-            [
-                9332,
-                1.0451472255274825
-            ],
-            [
-                10000,
-                2.5559479569222825
-            ]
-        ]
-    ],
-    [
-        200.0,
-        20,
-        [
-            [
-                0,
-                -1.3876904425996377
-            ],
-            [
-                668,
-                -1.1464188862638496
-            ],
-            [
-                1587,
-                -0.4049955219067526
-            ],
-            [
-                3085,
-                0.04721394862139682
-            ],
-            [
-                5000,
-                0.56953784145381
-            ],
-            [
-                6915,
-                1.3221859041483333
-            ],
-            [
-                8413,
-                1.6188495656305735
-            ],
-            [
-                9332,
-                1.7613953069723651
-            ],
-            [
-                10000,
-                2.3257482385477384
-            ]
-        ]
-    ],
-    [
-        300.0,
-        30,
-        [
-            [
-                0,
-                -1.600772629982185
-            ],
-            [
-                668,
-                -1.1548516185367033
-            ],
-            [
-                1587,
-                -0.260387173785447
-            ],
-            [
-                3085,
-                0.17416570914366614
-            ],
-            [
-                5000,
-                0.47069243095356195
-            ],
-            [
-                6915,
-                1.1559276581637614
-            ],
-            [
-                8413,
-                2.0474031182051404
-            ],
-            [
-                9332,
-                2.18821711651116
-            ],
-            [
-                10000,
-                2.2393193406467518
-            ]
-        ]
-    ],
-    [
-        400.0,
-        40,
-        [
-            [
-                0,
-                -0.8286852465281818
-            ],
-            [
-                668,
-                -0.7815041529866706
-            ],
-            [
-                1587,
-                -0.3334896444053469
-            ],
-            [
-                3085,
-                0.21085213041026643
-            ],
-            [
-                5000,
-                0.5177616740489182
-            ],
-            [
-                6915,
-                1.077122434649409
-            ],
-            [
-                8413,
-                1.5898009703967424
-            ],
-            [
-                9332,
-                1.8859097291499742
-            ],
-            [
-                10000,
-                2.0954239138728523
-            ]
-        ]
-    ]
-]
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/logdir b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/logdir
deleted file mode 100644
index b6362b45d7..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/logdir
+++ /dev/null
@@ -1 +0,0 @@
-{"logdir": "/foo/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/runs.json
deleted file mode 100644
index 739262a9fb..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/data/runs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "run1": {"compressedHistograms": ["histo1"]},
-  "run2": {"compressedHistograms": ["histo2", "histo1"]}
-}
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/index.html
deleted file mode 100644
index 16c9b124e4..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/demo/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<link rel="import" href="../tf-distribution-dashboard.html">
-<link rel="import" href="../../paper-styles/typography.html">
-
-<title>Distribution Dashboard Demo</title>
-<style>
-  #container {
-    height: 800px;
-    width: 100%;
-    display: block;
-  }
-
-  html, body {
-    margin: 0;
-    padding: 0;
-    font-family: "RobotoDraft","Roboto",sans-serif;
-  }
-
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="distribution-dash-demo">
-      <template>
-        <tf-distribution-dashboard id="demo" backend="[[backend]]"></tf-distribution-dashboard>
-      </template>
-      <script>
-        Polymer({
-          is: "distribution-dash-demo",
-          properties: {
-            backend: {
-              type: Object,
-              value: function() {
-                var router = new TF.Backend.router("data", true);
-                return new TF.Backend.Backend(router);
-              },
-            },
-          },
-        });
-      </script>
-    </dom-module>
-    <distribution-dash-demo id="container"></distribution-dash-demo>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html b/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
deleted file mode 100644
index 58ae396cb4..0000000000
--- a/tensorflow/tensorboard/components/tf_distribution_dashboard/tf-distribution-dashboard.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-<link rel="import" href="../tf-color-scale/tf-color-scale.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-dashboard-common/tf-option-selector.html">
-<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
-<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
-<link rel="import" href="../tf-imports/lodash.html">
-<link rel="import" href="../vz-distribution-chart/vz-distribution-chart.html">
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-
-<!--
-tf-distribution-dashboard is a complete frontend that loads runs from a backend,
-and creates chart panes that display data for those runs.
-
-It provides a x type selector and the normal tf-sidebar-helper options, by
-which the user can customize how data is organized and displayed.
-
-Each chart has a button that can toggle whether it is "expanded"; expanded
-charts are larger.
-
-Organizationally, the #plumbing div contains components that have no concrete
-manifestation and just effect data bindings or data loading. The .sidebar div
-contains shared controls provided by tf-sidebar-helper. The .center div
-contains vz-distribution-charts embedded inside tf-panes-helper's.
--->
-<dom-module id="tf-distribution-dashboard">
-  <template>
-    <div id="plumbing">
-      <tf-color-scale
-        id="colorScale"
-        runs="[[runs]]"
-        out-color-scale="{{_colorScale}}"
-      ></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper
-          backend="[[backend]]"
-          categories="{{_categories}}"
-          color-scale="[[_colorScale]]"
-          run2tag="[[run2tag]]"
-          runs="[[runs]]"
-          selected-runs="{{_selectedRuns}}"
-          >
-        <div class="sidebar-section">
-          <tf-option-selector
-            id="xTypeSelector"
-            name="Horizontal Axis"
-            selected-id="{{_xType}}"
-            >
-            <paper-button id="step">step</paper-button>
-            <paper-button id="relative">relative</paper-button>
-            <paper-button id="wall_time">wall</paper-button>
-          </tf-option-selector>
-        </div>
-        </tf-sidebar-helper>
-      </div>
-
-      <div class="center">
-        <tf-panes-helper
-          categories="[[_categories]]"
-          color-scale="[[_colorScale]]"
-          data-type="[[dataType]]"
-          data-provider="[[dataProvider]]"
-          data-not-found="[[dataNotFound]]"
-          run2tag="[[run2tag]]"
-          selected-runs="[[_selectedRuns]]"
-          repeat-for-runs
-          >
-          <template>
-            <vz-distribution-chart
-              x-type="[[_xType]]"
-              color-scale="[[_colorScale]]"
-              ></vz-distribution-chart>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-
-    <style include="dashboard-style"></style>
-  </template>
-
-  <script>
-    TF.Dashboard.TfDistributionDashboard = Polymer({
-      is: "tf-distribution-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("distributions"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      properties: {
-        backend: Object,
-        _xType: {
-          type: String,
-          value: "step"
-        },
-        dataType: {value: "compressedHistogram"},
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
index 6da6243893..cdddd2e032 100644
--- a/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
@@ -28,32 +28,3 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "index.html",
-        "tf-graph-app.html",
-    ],
-    destdir = "tf-graph-app",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_board:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_controls:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_loader:legacy",
-        "//third_party/javascript/polymer/v1/iron-list:lib",
-        "//third_party/javascript/polymer/v1/paper-radio-group:lib",
-        "//third_party/javascript/polymer/v1/paper-tooltip:lib",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD
index 147cb0947c..5c7455ec12 100644
--- a/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/demo/BUILD
@@ -10,7 +10,7 @@ web_library(
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-app/demo",
     deps = [
-        "//tensorflow/tensorboard/components/tf_graph_app",
+        "//tensorflow/tensorboard/components/tf_graph_app_d3v4",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_styles",
     ],
diff --git a/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD
index 2d668769e6..c1ea1f115d 100644
--- a/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_board_d3v4/demo/BUILD
@@ -10,9 +10,9 @@ web_library(
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-board/demo",
     deps = [
-        "//tensorflow/tensorboard/components/tf_graph_board",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "//tensorflow/tensorboard/components/tf_graph_board_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_styles",
         "@org_polymer_webcomponentsjs",
diff --git a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD
index c47cb90a03..f9ea3c1828 100644
--- a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/demo/BUILD
@@ -10,7 +10,7 @@ web_library(
     srcs = ["index.html"],
     path = "/tf-graph-controls/demo",
     deps = [
-        "//tensorflow/tensorboard/components/tf_graph_controls",
+        "//tensorflow/tensorboard/components/tf_graph_controls_d3v4",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_styles",
         "@org_polymer_webcomponentsjs",
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD
index 524d0ff767..4b4004bec8 100644
--- a/tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/demo/BUILD
@@ -10,9 +10,9 @@ web_library(
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph/demo",
     deps = [
-        "//tensorflow/tensorboard/components/tf_graph",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_styles",
         "@org_polymer_webcomponentsjs",
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
deleted file mode 100644
index de8f744d05..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/BUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_dashboard",
-    srcs = [
-        "tf-graph-dashboard.html",
-    ],
-    path = "/tf-graph-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_graph",
-        "//tensorflow/tensorboard/components/tf_graph_board",
-        "//tensorflow/tensorboard/components/tf_graph_controls",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
-        "@org_polymer",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-dashboard.html",
-    ],
-    destdir = "tf-graph-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_graph:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_board:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_controls:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_loader:legacy",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
deleted file mode 100644
index 3658f45b15..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_dashboard/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"] + glob(["data/**"]),
-    path = "/tf-graph-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_dashboard",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt
deleted file mode 100644
index 30b2064534..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/graph_run_run1.pbtxt
+++ /dev/null
@@ -1,4606 +0,0 @@
-node {
-  name: "GradientDescent/learning_rate"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_3"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0.1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 100
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000d\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_grad/Shape"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_1_grad/Shape"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod_1"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape_1"
-  input: "gradients/Mean_grad/Const_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum"
-  op: "Maximum"
-  input: "gradients/Mean_grad/Prod_1"
-  input: "gradients/Mean_grad/Maximum/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape"
-  input: "gradients/Mean_grad/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/floordiv"
-  op: "FloorDiv"
-  input: "gradients/Mean_grad/Prod"
-  input: "gradients/Mean_grad/Maximum"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Cast"
-  op: "Cast"
-  input: "gradients/Mean_grad/floordiv"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "DstT"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "SrcT"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile/multiples"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Fill"
-  op: "Fill"
-  input: "gradients/Shape"
-  input: "gradients/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Fill"
-  input: "gradients/Mean_grad/Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile"
-  op: "Tile"
-  input: "gradients/Mean_grad/Reshape"
-  input: "gradients/Mean_grad/Tile/multiples"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tmultiples"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/truediv"
-  op: "RealDiv"
-  input: "gradients/Mean_grad/Tile"
-  input: "gradients/Mean_grad/Cast"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Mean_grad/truediv"
-  input: "gradients/Reshape_3_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  op: "ExpandDims"
-  input: "gradients/Reshape_3_grad/Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tdim"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/begin"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1"
-  op: "Sub"
-  input: "Rank_2"
-  input: "Sub_1/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/begin"
-  op: "Pack"
-  input: "Sub_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_1"
-  op: "Slice"
-  input: "Shape_2"
-  input: "Slice_1/begin"
-  input: "Slice_1/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat_1"
-  op: "ConcatV2"
-  input: "concat_1/values_0"
-  input: "Slice_1"
-  input: "concat_1/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub"
-  op: "Sub"
-  input: "Rank_1"
-  input: "Sub/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice/begin"
-  op: "Pack"
-  input: "Sub"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice"
-  op: "Slice"
-  input: "Shape_1"
-  input: "Slice/begin"
-  input: "Slice/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat"
-  op: "ConcatV2"
-  input: "concat/values_0"
-  input: "Slice"
-  input: "concat/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2"
-  op: "Sub"
-  input: "Rank"
-  input: "Sub_2/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/size"
-  op: "Pack"
-  input: "Sub_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_2"
-  op: "Slice"
-  input: "Shape"
-  input: "Slice_2/begin"
-  input: "Slice_2/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_biases/read"
-  op: "Identity"
-  input: "logits_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_weights/read"
-  op: "Identity"
-  input: "logits_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_biases/read"
-  op: "Identity"
-  input: "hidden_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 784
-        }
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_weights/read"
-  op: "Identity"
-  input: "hidden_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\377\377\377\377"
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/depth"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/off_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/on_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_1/random_shuffle_queue"
-  op: "RandomShuffleQueueV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "capacity"
-    value {
-      i: 20000
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "min_after_dequeue"
-    value {
-      i: 4000
-    }
-  }
-  attr {
-    key: "seed"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "seed2"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 28
-          }
-          dim {
-            size: 28
-          }
-          dim {
-            size: 1
-          }
-        }
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  op: "QueueDequeueManyV2"
-  input: "mnist_dataset_train_1/random_shuffle_queue"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "timeout_ms"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  input: "Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul"
-  op: "MatMul"
-  input: "Reshape"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add"
-  op: "Add"
-  input: "MatMul"
-  input: "hidden_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Relu"
-  op: "Relu"
-  input: "add"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add_1"
-  op: "Add"
-  input: "MatMul_1"
-  input: "logits_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_1"
-  op: "Reshape"
-  input: "add_1"
-  input: "concat"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot"
-  op: "OneHot"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
-  input: "mnist_dataset_train_2/one_hot/depth"
-  input: "mnist_dataset_train_2/one_hot/on_value"
-  input: "mnist_dataset_train_2/one_hot/off_value"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "TI"
-    value {
-      type: DT_INT64
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape_2"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/one_hot"
-  input: "concat_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "SoftmaxCrossEntropyWithLogits"
-  op: "SoftmaxCrossEntropyWithLogits"
-  input: "Reshape_1"
-  input: "Reshape_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  op: "PreventGradient"
-  input: "SoftmaxCrossEntropyWithLogits:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "message"
-    value {
-      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  op: "Mul"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  input: "gradients/Reshape_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum_1"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum"
-  input: "gradients/add_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape_1"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul_1"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Relu_grad/ReluGrad"
-  op: "ReluGrad"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency"
-  input: "Relu"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum_1"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum"
-  input: "gradients/add_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape_1"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul_1"
-  op: "MatMul"
-  input: "Reshape"
-  input: "gradients/add_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_grad/tuple/control_dependency"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 784
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_grad/MatMul"
-  input: "^gradients/MatMul_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_grad/MatMul_1"
-  input: "^gradients/MatMul_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "GradientDescent"
-  op: "NoOp"
-  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_2"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_3"
-  op: "Reshape"
-  input: "SoftmaxCrossEntropyWithLogits"
-  input: "Slice_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Mean"
-  op: "Mean"
-  input: "Reshape_3"
-  input: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "_send_Mean_0"
-  op: "_Send"
-  input: "Mean"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "client_terminated"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "recv_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device_incarnation"
-    value {
-      i: -5924635994370253548
-    }
-  }
-  attr {
-    key: "tensor_name"
-    value {
-      s: "Mean:0"
-    }
-  }
-}
-library {
-}
-versions {
-  producer: 21
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json
deleted file mode 100644
index 0429aa71f8..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/data/runs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "run1": {
-    "graph": true,
-    "scalars": ["foo/sin"]
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html
deleted file mode 100644
index 67756cc129..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/demo/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<link rel="import" href="../tf-graph-dashboard.html">
-<link rel="import" href="../../paper-styles/typography.html">
-
-<title>Graph Dashboard Demo</title>
-<style>
-  #demo-container {
-    display: block;
-    height: 900px;
-    position: relative;
-    width: 100%;
-  }
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="graph-dashboard-demo">
-      <template>
-        <tf-graph-dashboard backend="[[backend]]"></tf-graph-dashboard>
-      </template>
-      <script>
-        Polymer({
-          is: "graph-dashboard-demo",
-          properties: {
-            backend: {
-              type: Object,
-              value: function() {
-                var router = new TF.Backend.router("data", true);
-                return new TF.Backend.Backend(router);
-              },
-            },
-          },
-        });
-      </script>
-    </dom-module>
-    <graph-dashboard-demo id="demo-container"></graph-dashboard-demo>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html b/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
deleted file mode 100644
index 891905e7c4..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_dashboard/tf-graph-dashboard.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-graph-loader/tf-graph-loader.html">
-<link rel="import" href="../tf-graph-board/tf-graph-board.html">
-<link rel="import" href="../tf-graph-controls/tf-graph-controls.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-
-<!--
-tf-graph-dashboard displays a graph from a TensorFlow run.
-
-It has simple behavior: Creates a url-generator and run-generator
-to talk to the backend, and then passes the runsWithGraph (list of runs with
-associated graphs) along with the url generator into tf-graph-board for display.
-
-If there are multiple runs with graphs, the first run's graph is shown
-by default. The user can select a different run from a dropdown menu.
--->
-<dom-module id="tf-graph-dashboard">
-<template>
-<tf-no-data-warning
-  data-type="graph"
-  show-warning="[[_datasetsEmpty(_datasets)]]"
-></tf-no-data-warning>
-<template is="dom-if" if="[[!_datasetsEmpty(_datasets)]]">
-<tf-dashboard-layout>
-<div class="sidebar">
-  <tf-graph-controls id="controls"
-        devices-for-stats="{{_devicesForStats}}"
-        color-by-params="[[_colorByParams]]"
-        stats="[[_stats]]"
-        color-by="{{_colorBy}}"
-        datasets="[[_datasets]]"
-        render-hierarchy="[[_renderHierarchy]]"
-        selected-dataset="{{_selectedDataset}}"
-        selected-file="{{_selectedFile}}"
-        selected-metadata-tag="{{_selectedMetadataTag}}"
-        health-pills-feature-enabled="[[debuggerDataEnabled]]"
-        health-pills-toggled-on="{{healthPillsToggledOn}}"
-  ></tf-graph-controls>
-  <tf-graph-loader id="loader"
-        datasets="[[_datasets]]"
-        selected-dataset="[[_selectedDataset]]"
-        selected-metadata-tag="[[_selectedMetadataTag]]"
-        selected-file="[[_selectedFile]]"
-        out-graph-hierarchy="{{_graphHierarchy}}"
-        out-graph="{{_graph}}"
-        out-stats="{{_stats}}"
-        progress="{{_progress}}"
-out-hierarchy-params="{{_hierarchyParams}}"
-  ></tf-graph-loader>
-</div>
-<div class="center">
-    <tf-graph-board id="graphboard"
-        devices-for-stats="[[_devicesForStats]]"
-        color-by="[[_colorBy]]"
-        color-by-params="{{_colorByParams}}"
-        graph-hierarchy="[[_graphHierarchy]]"
-        graph="[[_graph]]"
-        hierarchy-params="[[_hierarchyParams]]"
-        progress="[[_progress]]"
-        debugger-data-enabled="[[debuggerDataEnabled]]"
-        are-health-pills-loading="[[_areHealthPillsLoading]]"
-        node-names-to-health-pills="[[_nodeNamesToHealthPills]]"
-        all-steps-mode-enabled="{{allStepsModeEnabled}}"
-        specific-health-pill-step="{{specificHealthPillStep}}"
-        health-pill-step-index="[[_healthPillStepIndex]]"
-        render-hierarchy="{{_renderHierarchy}}"
-        stats="[[_stats]]"
-    ></tf-graph-board>
-</div>
-</tf-dashboard-layout>
-</template>
-<style>
-
-:host /deep/ {
-  font-family: 'Roboto', sans-serif;
-}
-
-.center {
-  position: relative;
-  height: 100%;
-}
-
-</style>
-</template>
-</dom-module>
-
-<script>
-"use strict";
-
-(function() {
-TF.Dashboard.TfGraphDashboard = Polymer({
-  is: 'tf-graph-dashboard',
-  factoryImpl: function(backend, debuggerDataEnabled) {
-    this.backend = backend;
-    this.debuggerDataEnabled = debuggerDataEnabled;
-  },
-  behaviors: [
-    TF.Dashboard.DashboardBehavior("graphs"),
-    TF.Dashboard.ReloadBehavior("tf-graph-dashboard"),
-    TF.Backend.Behavior,
-  ],
-  properties: {
-    _datasets: Object,
-    _renderHierarchy: {type: Object, observer: '_renderHierarchyChanged'},
-    backend: Object,
-    debuggerDataEnabled: Boolean,
-    allStepsModeEnabled: Boolean,
-    specificHealthPillStep: {type: Number, value: 0},
-    healthPillsToggledOn: {type: Boolean, value: true, observer: '_healthPillsToggledOnChanged'},
-    _isAttached: Boolean,
-    // Whether this dashboard is initialized. This dashboard should only be initialized once.
-    _initialized: Boolean,
-    // Whether health pills are currently being loaded, in which case we may want to say show a
-    // spinner.
-    _areHealthPillsLoading: Boolean,
-    // Maps the names of nodes to an array of health pills (HealthPillDatums).
-    _nodeNamesToHealthPills: {
-      type: Object,
-      value: {},
-    },
-    _healthPillStepIndex: Number,
-    // A strictly increasing ID. Each request for health pills has a unique ID. This helps us
-    // identify stale requests.
-    _healthPillRequestId: {type: Number, value: 1},
-    // The setTimeout ID for the pending request for health pills at a specific step.
-    _healthPillStepRequestTimerId: Number,
-    // The request for health pills at a specific step (as opposed to all sampled health pills) may
-    // involve slow disk reads. Hence, we throttle to 1 of those requests every this many ms.
-    _healthPillStepRequestTimerDelay: {
-      type: Number,
-      value: 500,
-      readOnly: true,
-    },
-    runs: Array,
-  },
-  listeners: {
-    'node-toggle-expand': '_handleNodeToggleExpand',
-  },
-  observers: [
-    '_maybeFetchHealthPills(allStepsModeEnabled, specificHealthPillStep)',
-    '_maybeInitializeDashboard(backend, _isAttached)',
-  ],
-  attached: function() {
-    this.set('_isAttached', true);
-  },
-  detached: function() {
-    this.set('_isAttached', false);
-  },
-  reload: function() {
-    this._maybeFetchHealthPills();
-  },
-  _shouldRequestHealthPills: function() {
-    // Do not load debugger data if the feature is disabled, if the user toggled off the feature,
-    // or if the graph itself has not loaded yet. We need the graph to load so that we know which
-    // nodes to request health pills for.
-    return this.debuggerDataEnabled &&
-        this.healthPillsToggledOn &&
-        this._renderHierarchy &&
-        !this._datasetsEmpty(this._datasets);
-  },
-  _maybeInitializeDashboard: function(backend, isAttached) {
-    if (this._initialized || !backend || !isAttached) {
-      // Either this dashboard is already initialized ... or we are not yet ready to initialize.
-      return;
-    }
-    if (typeof ga !== 'undefined' && ga != null) {
-      ga('send', {hitType: 'pageview', page: '/v/graph'});
-    }
-    // Set this to true so we only initialize once.
-    this._initialized = true;
-    Promise.all([backend.graphRuns(), backend.runMetadataRuns()])
-      .then(function(result) {
-        var runsWithGraph = result[0].sort(VZ.Sorting.compareTagNames);
-        var runToMetadata = result[1];
-        var datasets = _.map(runsWithGraph, function(runName) {
-          return {
-            name: runName,
-            path: backend.router.graph(
-                runName, tf.graph.LIMIT_ATTR_SIZE, tf.graph.LARGE_ATTRS_KEY),
-            runMetadata: runToMetadata[runName] ? _.map(
-              runToMetadata[runName].sort(VZ.Sorting.compareTagNames), function(tag) {
-                return {
-                  tag: tag,
-                  path: backend.router.runMetadata(tag, runName)
-                };
-              }, this) : []
-          };
-        }, this);
-        this.set('_datasets', datasets);
-      }.bind(this));
-  },
-  _requestHealthPills: function() {
-    this.set('_areHealthPillsLoading', true);
-    const requestId = ++this._healthPillRequestId;
-
-    if (this._healthPillStepRequestTimerId !== null) {
-      // A request for health pills is already scheduled to be initiated. Clear it, and schedule a
-      // new request.
-      window.clearTimeout(this._healthPillStepRequestTimerId);
-      this._healthPillStepRequestTimerId = null;
-    }
-
-    if (this.allStepsModeEnabled) {
-      // This path may be slow. Schedule network requests to start some time later. If another
-      // request is scheduled in the mean time, drop this current request.
-      this._healthPillStepRequestTimerId = setTimeout(function() {
-        this._healthPillStepRequestTimerId = null;
-        this._initiateNetworkRequestForHealthPills(requestId);
-      }.bind(this), this._healthPillStepRequestTimerDelay);
-    } else {
-      // The user is fetching sampled steps. This path is fast, so no need to throttle. Directly
-      // fetch the health pills across the network.
-      this._initiateNetworkRequestForHealthPills(requestId);
-    }
-  },
-  // Initiates the network request for health pills. Do not directly call this method - network
-  // requests may be throttled. Instead, call _requestHealthPills, which uses this method.
-  _initiateNetworkRequestForHealthPills: function(requestId) {
-    if (this._healthPillRequestId !== requestId) {
-      // This possibly scheduled request was outdated before it was even sent across the network. Do
-      // not bother initiating it.
-      return;
-    }
-
-    const specificStep = this.allStepsModeEnabled ? this.specificHealthPillStep : undefined;
-    this.backend.healthPills(this._renderHierarchy.getNamesOfRenderedOps(), specificStep).then(
-        function(result) {
-      if (!this.healthPillsToggledOn) {
-        // The user has opted to hide health pills via the toggle button.
-        return;
-      }
-
-      if (requestId !== this._healthPillRequestId) {
-        // This response is no longer relevant.
-        return;
-      }
-
-      // Set the index for which step to show for the health pills. By default, show the last step.
-      // A precondition we assume (that Tensorboard's reservoir sampling guarantees) is that all
-      // node names should be mapped to the same number of steps.
-      for (let nodeName in result) {
-        this.set('_healthPillStepIndex', result[nodeName].length - 1);
-        break;
-      }
-
-      this.set('_nodeNamesToHealthPills', result);
-      this.set('_areHealthPillsLoading', false);
-      this.set('_healthPillStepRequestTimerId', null);
-    }.bind(this));
-  },
-  _datasetsEmpty: function(datasets) {
-    return !datasets || !datasets.length;
-  },
-  _renderHierarchyChanged: function(renderHierarchy) {
-    // Reload any data on the graph when the render hierarchy (which determines which nodes are
-    // rendered) changes.
-    this.reload();
-  },
-  _handleNodeToggleExpand: function() {
-    // Nodes were toggled. We may need to request health pills for more nodes.
-    this._maybeFetchHealthPills();
-  },
-  _healthPillsToggledOnChanged: function(healthPillsToggledOn) {
-    if (healthPillsToggledOn) {
-      // Load health pills.
-      this.reload();
-    } else {
-      // Remove all health pills by setting an empty mapping.
-      this.set('_nodeNamesToHealthPills', {});
-    }
-  },
-  // Fetch health pills for a specific step if applicable.
-  _maybeFetchHealthPills: function() {
-    if (!this._shouldRequestHealthPills()) {
-      return;
-    }
-
-    this._requestHealthPills();
-  },
-});
-})();
-</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD
index a7d59418fd..9c8d78ee06 100644
--- a/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/demo/BUILD
@@ -10,9 +10,9 @@ web_library(
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-info/demo",
     deps = [
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "//tensorflow/tensorboard/components/tf_graph_info",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_info_d3v4",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_styles",
         "@org_polymer_webcomponentsjs",
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD
index b2fc04b2eb..b16ca41894 100644
--- a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/demo/BUILD
@@ -10,7 +10,7 @@ web_library(
     srcs = ["index.html"] + glob(["data/**"]),
     path = "/tf-graph-loader/demo",
     deps = [
-        "//tensorflow/tensorboard/components/tf_graph_loader",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4",
         "@org_polymer_iron_demo_helpers",
         "@org_polymer_paper_styles",
         "@org_polymer_webcomponentsjs",
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
deleted file mode 100644
index d8e2f672f8..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/BUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_histogram_dashboard",
-    srcs = [
-        "tf-histogram-dashboard.html",
-    ],
-    path = "/tf-histogram-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-histogram-dashboard.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-histogram-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries:legacy",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
deleted file mode 100644
index 6522d3ad99..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_histogram_dashboard/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-histogram-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard",
-        "//tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
deleted file mode 100644
index 7e661b84f5..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-histogram-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run1_tag_histo1.json b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run1_tag_histo1.json
deleted file mode 100644
index a5600a356e..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run1_tag_histo1.json
+++ /dev/null
@@ -1 +0,0 @@
-[[400.0, 40, [-0.3584790755077172, 3.0267252195784047, 20.0, 24.012225532303315, 48.29045006426564, [-0.35363819004775493, -0.29226296698161564, -0.19961953895336082, 0.3214892636797772, 0.5177616740489182, 0.56953784145381, 0.6264916255991911, 0.7580548669750213, 0.8338603536725235, 1.220854943811942, 1.3429404381931362, 1.47723448201245, 1.624957930213695, 1.7874537232350647, 1.9661990955585713, 2.379100905625872, 2.6170109961884593, 3.1665833053880363], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo1.json b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo1.json
deleted file mode 100644
index 407c375d2f..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo1.json
+++ /dev/null
@@ -1 +0,0 @@
-[[400.0, 40, [-2.599286228987632, 3.5098048900144323, 20.0, 10.792285491200078, 66.66796979177158, [-2.379100905625872, -1.9661990955585713, -1.624957930213695, -1.47723448201245, -1.109868130738129, -1.0089710279437536, -0.42790220995778355, -0.2195814928486969, 0.47069243095356195, 0.7580548669750213, 0.917246389039776, 1.3429404381931362, 1.624957930213695, 1.7874537232350647, 2.1628190051144287, 2.6170109961884593, 2.8787120958073054, 3.8315657995195243], [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 1.0, 1.0, 2.0, 1.0, 1.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo2.json b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo2.json
deleted file mode 100644
index 752b621ab0..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/histograms_run_run2_tag_histo2.json
+++ /dev/null
@@ -1 +0,0 @@
-[[400.0, 40, [-0.8286852465281818, 2.0954239138728523, 20.0, 13.546880465642861, 24.14836803774091, [-0.7580548669750213, -0.38900200905253046, -0.06996543062044111, 0.07696197368248522, 0.19961953895336082, 0.2656936063469233, 0.29226296698161564, 0.5177616740489182, 0.7580548669750213, 0.917246389039776, 1.109868130738129, 1.220854943811942, 1.624957930213695, 2.1628190051144287], [2.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 2.0, 2.0, 1.0, 1.0, 1.0, 2.0, 3.0]]]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/logdir b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/logdir
deleted file mode 100644
index b6362b45d7..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/logdir
+++ /dev/null
@@ -1 +0,0 @@
-{"logdir": "/foo/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/runs.json
deleted file mode 100644
index cbe657af6b..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/data/runs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"run1": {"histograms": ["histo1"]}, 
-	"run2": {"histograms": ["histo2", "histo1"]}
-}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/index.html
deleted file mode 100644
index de0fbf4be7..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/demo/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<link rel="import" href="../tf-histogram-dashboard.html">
-<link rel="import" href="../../paper-styles/typography.html">
-
-<title>Distribution Dashboard Demo</title>
-<style>
-  #container {
-    height: 800px;
-    display: block;
-  }
-
-  html, body {
-    margin: 0;
-    padding: 0;
-    font-family: "RobotoDraft","Roboto",sans-serif;
-  }
-
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="histogram-dash-demo">
-      <template>
-        <tf-histogram-dashboard id="demo" backend="[[backend]]"></tf-histogram-dashboard>
-      </template>
-      <script>
-        Polymer({
-          is: "histogram-dash-demo",
-          properties: {
-            backend: {
-              type: Object,
-              value: function() {
-                var router = new TF.Backend.router("data", true);
-                return new TF.Backend.Backend(router);
-              },
-            },
-          },
-        });
-      </script>
-    </dom-module>
-    <histogram-dash-demo id="container"></histogram-dash-demo>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html b/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
deleted file mode 100644
index dd433982d1..0000000000
--- a/tensorflow/tensorboard/components/tf_histogram_dashboard/tf-histogram-dashboard.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-<link rel="import" href="../tf-color-scale/tf-color-scale.html">
-<link rel="import" href="../tf-dashboard-common/tf-categorizer.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
-<link rel="import" href="../tf-dashboard-common/tf-option-selector.html">
-<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
-<link rel="import" href="../tf-imports/lodash.html">
-<link rel="import" href="../vz-histogram-timeseries/vz-histogram-timeseries.html">
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-
-<!--
-tf-histogram-dashboard is a complete frontend that loads runs from a backend,
-and creates chart panes that display data for those runs.
-
-It provides a mode and time property selector, together with the selectors
-provided by tf-sidebar-helper, by which the user can customize how data is
-organized and displayed.
-
-Each chart has a button that can toggle whether it is "selected"; selectedRuns
-charts are larger.
-
-Organizationally, the #plumbing div contains components that have no concrete
-manifestation and just effect data bindings or data loading. The .sidebar div
-contains shared controls provided by tf-sidebar-helper. The .center div
-contains vz-histogram-timeseries embedded inside tf-panes-helper's.
--->
-<dom-module id="tf-histogram-dashboard">
-  <template>
-    <div id="plumbing">
-      <tf-color-scale
-        id="colorScale"
-        runs="[[runs]]"
-        out-color-scale="{{_colorScale}}"
-      ></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper
-          backend="[[backend]]"
-          categories="{{_categories}}"
-          color-scale="[[_colorScale]]"
-          run2tag="[[run2tag]]"
-          runs="[[runs]]"
-          selected-runs="{{_selectedRuns}}"
-          show-download-links="{{_showDownloadLinks}}"
-          >
-          <div class="sidebar-section">
-            <tf-option-selector
-              id="histogramModeSelector"
-              name="Histogram Mode"
-              selected-id="{{_histogramMode}}"
-              >
-              <paper-button id="overlay">overlay</paper-button>
-              <paper-button id="offset">offset</paper-button>
-            </tf-option-selector>
-          </div>
-          <div class="sidebar-section">
-            <tf-option-selector
-              id="timePropertySelector"
-              name="Offset Time Axis"
-              selected-id="{{_timeProperty}}"
-              >
-              <paper-button id="step">step</paper-button>
-              <paper-button id="relative">relative</paper-button>
-              <paper-button id="wall_time">wall</paper-button>
-            </tf-option-selector>
-          </tf-sidebar-helper>
-       </div>
-      </div>
-
-      <div class="center">
-        <tf-panes-helper
-          categories="[[_categories]]"
-          color-scale="[[_colorScale]]"
-          data-type="[[dataType]]"
-          data-provider="[[dataProvider]]"
-          data-not-found="[[dataNotFound]]"
-          run2tag="[[run2tag]]"
-          selected-runs="[[_selectedRuns]]"
-          repeat-for-runs
-          >
-          <template>
-            <vz-histogram-timeseries
-              time-property="[[_timeProperty]]"
-              mode="[[_histogramMode]]"
-              color-scale="[[_colorScaleFunction]]"
-              ></vz-histogram-timeseries>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-
-    <style include="dashboard-style"></style>
-    <style>
-      tf-panes-helper {
-        --card-expanded-height: 500px;
-        --card-expanded-width: 700px;
-      }
-    </style>
-  </template>
-
-  <script>
-    TF.Dashboard.TfHistogramDashboard = Polymer({
-      is: "tf-histogram-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("histograms"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "histogram"
-        },
-        _histogramMode: {
-          type: String,
-          value: "offset"
-        },
-        _timeProperty: {
-          type: String,
-          value: "step"
-        },
-        _colorScaleFunction: {
-          type: Function,
-          computed: "_getColorScaleFunction(_colorScale)"
-        },
-      },
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _getColorScaleFunction: function() {
-        return this._colorScale.scale.bind(this._colorScale);
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
deleted file mode 100644
index a82decd16e..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/BUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_image_dashboard",
-    srcs = [
-        "tf-image-dashboard.html",
-        "tf-image-loader.html",
-    ],
-    path = "/tf-image-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-        "@org_polymer_paper_dialog",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-image-dashboard.html",
-        "tf-image-loader.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-image-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
deleted file mode 100644
index 730685ee2c..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_image_dashboard/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-image-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_image_dashboard",
-        "//tensorflow/tensorboard/components/tf_image_dashboard/demo/data",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
deleted file mode 100644
index 0e4c304068..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-image-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json
deleted file mode 100644
index 3dec432213..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im1_2Fimage_2F0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "wall_time":1459200389.088045,
-    "width":4,
-    "height":4,
-    "step":0,
-    "query":"tag=im1%2Fimage%2F0&index=0&run=run1"
-  }
-]
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json
deleted file mode 100644
index 16152b8626..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run1_tag_im2_2Fimage_2F0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "wall_time":1459200389.093653,
-    "width":4,
-    "height":4,
-    "step":0,
-    "query":"tag=im2%2Fimage%2F0&index=0&run=run1"
-  }
-]
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json
deleted file mode 100644
index a717b79c5d..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/images_run_run2_tag_im1_2Fimage_2F0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "wall_time":1459200389.117463,
-    "width":4,
-    "height":4,
-    "step":0,
-    "query":"tag=im1%2Fimage%2F0&index=0&run=run2"
-  }
-]
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run1.png
deleted file mode 100644
index 346fd0076be28b9338152c4d49a32fc5ed685e44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 118
zcmeAS@N?(olHy`uVBq!ia0y~yU|<1Z4kiW$2DQnYnhXpKww^AIAsjQ4=VWAW{@wpZ
z@m<IBR3@F`R$ZALr;bR^%sF!?(!@pe>fz?dchx6~Q;hfBoVfp2kjQy9?!vRJ3<sJ8
WHS6x#YB4Y{FnGH9xvX<aXaWGmYbV_R

diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im1_2Fimage_2F0_index_0_run_run2.png
deleted file mode 100644
index 26d2d10acaf8511efeb03169853092d09252215b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmeAS@N?(olHy`uVBq!ia0y~yU|<1Z4kiW$2DQnYnhXpK_MR?|AsjOqO&Cu9XV@>Y
zoq=hK(6yA=_RpE`s=vE;`NN_6TLL$Vv)niJ-K!AlrTxXOg^6*d%G0O%S2r_VS;!>a
Y_*eYp(Uuw^1_lNOPgg&ebxsLQ0Es*&3jhEB

diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/individualImage_tag_im2_2Fimage_2F0_index_0_run_run1.png
deleted file mode 100644
index 6c4190629429e0929962c4f20bd1a1602620e4bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmeAS@N?(olHy`uVBq!ia0y~yU|<1Z4kiW$2DQnYnhXpK_MR?|AsjOqO&Cu9XV5>o
zf5zd(4s6;hLLM<+VR-wEU#juaeU<mCn7=5C%zEE0sr<hrWC7#<D@(-exTN=Je%XDr
Yvqj>ciqM=K1_lNOPgg&ebxsLQ0F@UfEC2ui

diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/logdir b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/logdir
deleted file mode 100644
index c7d82022cc..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/logdir
+++ /dev/null
@@ -1 +0,0 @@
-{"logdir": "/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/runs.json
deleted file mode 100644
index b75de5b661..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/data/runs.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-   "run1":{
-      "images":[
-         "im1/image/0",
-         "im2/image/0"
-      ]
-   },
-   "run2":{
-      "images":[
-         "im1/image/0"
-      ]
-   }
-}
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_image_dashboard/demo/index.html
deleted file mode 100644
index 0165b24f47..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/demo/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="import" href="../tf-image-dashboard.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <title>Image Dashboard Demo</title>
-    <style>
-      #container{
-        width: 1000px;
-        height: 800px;
-        border: 2px solid grey;
-      }
-      html,body {
-        height: 100%;
-      }
-    </style>
-  </head>
-  <body>
-    <demo-snippet>
-      <template>
-        <dom-module id="image-dash-demo">
-          <template>
-            <tf-image-dashboard id="demo" backend="[[backend]]">
-            </tf-image-dashboard>
-          </template>
-          <script>
-            Polymer({
-              is: "image-dash-demo",
-              properties: {
-                backend: {
-                  type: Object,
-                  value: function() {
-                    var path = "data";
-                    var router = new TF.Backend.router(path, true);
-                    return new TF.Backend.Backend(router);
-                  },
-                },
-              },
-            });
-          </script>
-        </dom-module>
-        <div id="container">
-          <image-dash-demo></image-dash-demo>
-        </div>
-      </template>
-    </demo-snippet>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
deleted file mode 100644
index 0200b65030..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-dashboard.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-dialog/paper-dialog.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-<link rel="import" href="../tf-color-scale/tf-color-scale.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
-<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
-<link rel="import" href="tf-image-loader.html">
-
-<!--
-tf-image-dashboard displays a dashboard that loads images from a TensorFlow run.
--->
-<dom-module id="tf-image-dashboard">
-  <template>
-    <paper-dialog with-backdrop id="actual-image-size-dialog"></paper-dialog>
-    <div id="plumbing">
-      <tf-color-scale
-        id="colorScale"
-        runs="[[runs]]"
-        out-color-scale="{{_colorScale}}"
-        ></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper
-          backend="[[backend]]"
-          categories="{{_categories}}"
-          color-scale="[[_colorScale]]"
-          run2tag="[[run2tag]]"
-          runs="[[runs]]"
-          selected-runs="{{_selectedRuns}}"
-          >
-        </tf-sidebar-helper>
-      </div>
-      <div class="center">
-        <tf-panes-helper
-          categories="[[_categories]]"
-          color-scale="[[_colorScale]]"
-          data-type="[[dataType]]"
-          data-provider="[[dataProvider]]"
-          data-not-found="[[dataNotFound]]"
-          run2tag="[[run2tag]]"
-          selected-runs="[[_selectedRuns]]"
-          repeat-for-runs
-          >
-          <template>
-            <tf-image-loader color-scale="[[_colorScale]]"></tf-image-loader>
-            <paper-icon-button
-              class="actual-size-button"
-              icon="aspect-ratio"
-              on-tap="_showActualSize"
-              title="Show the image at its true pixel size"
-              ></paper-icon-button>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-    <style include="dashboard-style"></style>
-    <style>
-      tf-panes-helper {
-        --card-width: 340px;
-        --card-height: auto;
-        --card-expanded-width: 700px;
-        --card-expanded-height: auto;
-      }
-
-      .actual-size-button {
-        background: #fff;
-        border-radius: 100%;
-        bottom: -35px;
-        color: #2196f3;
-        height: 32px;
-        left: 35px;
-        padding: 4px;
-        pointer-events: auto;
-        position: absolute;
-        width: 32px;
-      }
-
-      .actual-size-button-selected {
-        background: var(--tb-ui-light-accent);
-      }
-
-      #actual-image-size-dialog {
-        overflow: auto;
-      }
-    </style>
-  </template>
-  <script>
-    TF.Dashboard.TfImageDashboard = Polymer({
-      is: "tf-image-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "image"
-        },
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("images"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _showActualSize: function(e) {
-        var currentTarget = Polymer.dom(e.currentTarget);
-        var card = currentTarget.node.closest('.card');
-
-        // Create a full-size copy of the image.
-        var newImage = card.querySelector('#img').cloneNode();
-        newImage.style.height = 'auto';
-        newImage.style.width = 'auto';
-        newImage.style.margin = 0;
-        newImage.style.padding = 0;
-        newImage.classList.add("actual-size-image");
-
-        // When the user clicks on the image, empty and close the dialog.
-        var dialog = this.$$('#actual-image-size-dialog');
-        newImage.addEventListener('click', function() {
-          dialog.close();
-        });
-
-        // Update dialog content. Show the dialog.
-        dialog.innerHTML = '';
-        dialog.appendChild(newImage);
-        dialog.open();
-      }
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html b/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html
deleted file mode 100644
index d9ba013dce..0000000000
--- a/tensorflow/tensorboard/components/tf_image_dashboard/tf-image-loader.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-slider/paper-slider.html">
-<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-<link rel="import" href="../tf-imports/lodash.html">
-<link rel="import" href="../tf-imports/d3.html">
-
-<!--
-tf-image-loader loads an individual image from the TensorBoard backend.
-
-Right now it always loads the most recent image. We should add support in the
-future for loading older images.
--->
-<dom-module id="tf-image-loader">
-  <template>
-    <div id="image-annotation">
-      <template is="dom-if" if="[[_hasAtLeastOneStep]]">
-        step
-        <span class="step-value">
-          [[_stepValue]]
-        </span>
-        <template is="dom-if" if="[[_currentWallTime]]">
-          ([[_currentWallTime]])
-        </template>
-        <paper-spinner-lite active hidden$=[[!_isImageLoading]]></paper-spinner-lite>
-      </template>
-      <template is="dom-if" if="[[_hasMultipleSteps]]">
-        <paper-slider
-          id="steps"
-          immediate-value="{{_stepIndex}}"
-          max="[[_maxStepIndex]]"
-          max-markers="[[_maxStepIndex]]"
-          snaps
-          step="1"
-          value="{{_stepIndex}}"></paper-slider>
-      </template>
-    </div>
-
-    <div id="main-image-container"></div>
-
-    <style>
-      :host {
-        display: block;
-        width: 100%;
-        height: auto;
-        position: relative;
-        --step-slider-knob-color: #424242;
-      }
-
-      #image-annotation {
-        border-left: 4px solid;
-        padding-left: 5px;
-        font-size: 12px;
-        margin: -10px 0 10px 0;
-      }
-
-      #image-annotation .step-value {
-        font-weight: bold;
-      }
-
-      #image-annotation paper-spinner-lite {
-        width: 14px;
-        height: 14px;
-        vertical-align: text-bottom;
-        --paper-spinner-color: var(--tb-orange-strong)
-      }
-
-      #steps {
-        height: 15px;
-        margin: 0 0 0 -15px;
-        /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
-         * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
-         * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2. */
-        width: calc(100% + 31px);
-        --paper-slider-active-color: var(--step-slider-knob-color);
-        --paper-slider-knob-color: var(--step-slider-knob-color);
-        --paper-slider-pin-color: var(--step-slider-knob-color);
-        --paper-slider-knob-start-color: var(--step-slider-knob-color);
-        --paper-slider-knob-start-border-color: var(--step-slider-knob-color);
-        --paper-slider-pin-start-color: var(--step-slider-knob-color);
-      }
-
-      #main-image-container img {
-        border: 1px solid #f5f5f5;
-        image-rendering: -moz-crisp-edges;
-        image-rendering: pixelated;
-        display: block;
-        width: 100%;
-        height: auto;
-      }
-    </style>
-  </template>
-  <script>
-    "use strict";
-
-    Polymer({
-      is: "tf-image-loader",
-      properties: {
-        colorScale: Object,
-        run: String,
-        // This is an array of Tensorboard Image&Datum objects (See backend.ts for details). The
-        // properties of objects in this array are
-        // {
-        //   width: number,
-        //   height: number,
-        //   wall_time: Date,
-        //   step: number,
-        //   url: string,
-        // }
-        _steps: {
-          type: Array,
-          value: [],
-          notify: true,
-        },
-        _stepIndex: {
-          type: Number,
-          notify: true,
-        },
-        _hasAtLeastOneStep: {
-          type: Boolean,
-          computed: "_computeHasAtLeastOneStep(_steps)",
-        },
-        _hasMultipleSteps: {
-          type: Boolean,
-          computed: "_computeHasMultipleSteps(_steps)",
-        },
-        _stepValue: {
-          type: Number,
-          computed: "_computeStepValue(_stepIndex)",
-        },
-        _currentWallTime: {
-          type: Number,
-          computed: "_computeCurrentWallTime(_stepIndex)",
-        },
-        _maxStepIndex: {
-          type: Number,
-          computed: "_computeMaxStepIndex(_steps)",
-        },
-        // We use a strictly increasing index to make sure that we don't settle on a stale image.
-        _currentImageLoadIndex: {
-          type: Number,
-          value: 1,
-        },
-        _isImageLoading: {
-          type: Boolean,
-          value: false,
-        },
-      },
-      observers: [
-        "_updateImageUrl(_steps, _stepIndex)",
-      ],
-      redraw: function() {
-        // Other dashboards logic requires a redraw method to be defined. redraw is called at
-        // various places such as when the image is expanded.
-        this.setSeriesData(this.run, this._steps);
-      },
-      setVisibleSeries: function(runs) {
-        // Do nothing.
-      },
-      setSeriesData: function(run, steps) {
-        this.set("run", run);
-        this.set("_steps", steps);
-        this.set("_stepIndex", steps.length - 1);
-
-        // Update the border color based on the run.
-        var color = this.colorScale.scale(run);
-        this.$$("#image-annotation").style.borderColor = color;
-      },
-      _updateImageUrl: function(steps, stepIndex) {
-        // We manually change the image URL (instead of binding to the image's src attribute)
-        // because we would like to manage what happens when the image starts to / finishes loading.
-        if (!steps.length) {
-          return;
-        }
-
-        let img = new Image();
-        img.id = "img"; // '#img' used to select the image in tf-image-dashboard.
-
-        const loadIndex = ++this._currentImageLoadIndex;
-        img.onload = img.onerror = (function() {
-          if (loadIndex != this._currentImageLoadIndex) {
-            // This load is no longer relevant.
-            return;
-          }
-
-          // The new image has finished loading. Remove the old image. Add the new one.
-          let mainImageContainer = this.$$("#main-image-container");
-          mainImageContainer.innerHTML = "";
-          Polymer.dom(mainImageContainer).appendChild(img);
-
-          // The image has finished loading (or has erred and failed to load).
-          this.set("_isImageLoading", false);
-        }).bind(this);
-
-        // Load the new image.
-        this.set("_isImageLoading", true);
-        img.src = steps[stepIndex].url;
-      },
-      _computeHasAtLeastOneStep: function(steps) {
-        return !!steps && steps.length > 0;
-      },
-      _computeHasMultipleSteps: function(steps) {
-        return !!steps && steps.length > 1;
-      },
-      _computeStepValue: function(stepIndex) {
-        return this._steps[stepIndex].step;
-      },
-      _computeCurrentWallTime: function(stepIndex) {
-        return this._steps[stepIndex].wall_time.toString();
-      },
-      _computeMaxStepIndex: function(steps) {
-        return steps.length - 1;
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_option_selector/tf-option-selector.html b/tensorflow/tensorboard/components/tf_option_selector/tf-option-selector.html
deleted file mode 100644
index d6fc9d6861..0000000000
--- a/tensorflow/tensorboard/components/tf_option_selector/tf-option-selector.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-
-<!--
-tf-option-selector is a simple component that has buttons as content and
-provides a "selectedId" property that is one of the IDs of the buttons inside it.
--->
-<dom-module id="tf-option-selector">
-  <template>
-    <div id="wrap">
-      <h3>[[name]]</h3>
-      <div class="content-wrapper"><content></content></div>
-    </div>
-    <style>
-      .content-wrapper ::content > * {
-        width: 30%;
-        font-size: 13px;
-        background: none;
-        margin-top: 10px;
-        color: var(--tb-ui-dark-accent);
-      }
-
-      .content-wrapper ::content :first-of-type {
-        margin-left: 0;
-      }
-
-      .content-wrapper ::content .selected {
-        background-color: var(--tb-ui-dark-accent);
-        color: white!important;
-      }
-
-      h3 {
-        color: var(--paper-grey-800);
-        margin: 0;
-        font-weight: normal;
-        font-size: 14px;
-        margin-bottom: 5px;
-        display: block;
-        pointer-events: none;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-option-selector",
-      properties: {
-        name: String,
-        selectedId: {
-          type: String,
-          notify: true,
-          observer: '_selectedIdChanged'
-        }
-      },
-      attached: function() {
-        this.async(function() {
-          this.getEffectiveChildren().forEach(function(node) {
-            this.listen(node, 'tap', '_selectTarget');
-          }.bind(this));
-        });
-      },
-      _selectTarget: function(e) {
-        this.selectedId = e.currentTarget.id;
-      },
-      _selectedIdChanged: function() {
-        var selected = this.queryEffectiveChildren('#' + this.selectedId);
-        if (!selected) {
-          return;
-        }
-
-        this.getEffectiveChildren().forEach(function(node) {
-          node.classList.remove("selected");
-        });
-        selected.classList.add("selected");
-      }
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
deleted file mode 100644
index 46c91c484f..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/BUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_scalar_dashboard",
-    srcs = [
-        "tf-scalar-dashboard.html",
-        "tf-smoothing-input.html",
-    ],
-    path = "/tf-scalar-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/vz_line_chart",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_paper_checkbox",
-        "@org_polymer_paper_dropdown_menu",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_input",
-        "@org_polymer_paper_item",
-        "@org_polymer_paper_menu",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-scalar-dashboard.html",
-        "tf-smoothing-input.html",
-    ],
-    destdir = "tf-scalar-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_color_scale:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//tensorflow/tensorboard/components/vz_line_chart:legacy",
-        "//third_party/javascript/polymer/v1/iron-collapse:lib",
-        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
-        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-        "//third_party/javascript/polymer/v1/paper-input:lib",
-        "//third_party/javascript/polymer/v1/paper-item:lib",
-        "//third_party/javascript/polymer/v1/paper-menu:lib",
-        "//third_party/javascript/polymer/v1/paper-slider:lib",
-        "//third_party/javascript/polymer/v1/paper-styles:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
deleted file mode 100644
index 6e85abf2d7..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_scalar_dashboard/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-scalar-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard",
-        "//tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
deleted file mode 100644
index c8219c0754..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-scalar-dashboard/demo/data",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/logdir b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/logdir
deleted file mode 100644
index b6362b45d7..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/logdir
+++ /dev/null
@@ -1 +0,0 @@
-{"logdir": "/foo/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/runs.json
deleted file mode 100644
index d45f530763..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/runs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "run1": {"scalars": ["foo/sin", "foo/cos", "foo/square", "bar/square"]},
-  "run2": {"scalars": ["foo/cos", "foo/square", "bar/square"]}
-}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars.json
deleted file mode 100644
index bc269395b6..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars.json
+++ /dev/null
@@ -1 +0,0 @@
-{"run2": {"foo/cos": [[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/square": [[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]]}, "run1": {"foo/sin": [[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]], "foo/cos": [[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]], "bar/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]], "foo/square": [[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]}}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json
deleted file mode 100644
index 6d584fb4a9..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_bar_2Fsquare.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json
deleted file mode 100644
index 025eaa16e9..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fcos.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0.0, 0, 1.0], [10.0, 1, 0.5403022766113281], [20.0, 2, -0.416146844625473], [30.0, 3, -0.9899924993515015], [40.0, 4, -0.6536436080932617]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json
deleted file mode 100644
index eae69dd78f..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsin.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0.0, 0, 0.0], [10.0, 1, 0.8414709568023682], [20.0, 2, 0.9092974066734314], [30.0, 3, 0.14112000167369843], [40.0, 4, -0.756802499294281]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json
deleted file mode 100644
index 6d584fb4a9..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run1_tag_foo_2Fsquare.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json
deleted file mode 100644
index 6d584fb4a9..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_bar_2Fsquare.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0.0, 0, 0.0], [10.0, 1, 1.0], [20.0, 2, 4.0], [30.0, 3, 9.0], [40.0, 4, 16.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json
deleted file mode 100644
index dd3593f9d1..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fcos.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0.0, 0, 2.0], [10.0, 1, 1.0806045532226562], [20.0, 2, -0.832293689250946], [30.0, 3, -1.979984998703003], [40.0, 4, -1.3072872161865234]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json
deleted file mode 100644
index 0ff9ef0551..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/data/scalars_run_run2_tag_foo_2Fsquare.json
+++ /dev/null
@@ -1 +0,0 @@
-[[0.0, 0, 0.0], [10.0, 1, 2.0], [20.0, 2, 8.0], [30.0, 3, 18.0], [40.0, 4, 32.0]]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/index.html
deleted file mode 100644
index 586ee2a47d..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/demo/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<link rel="import" href="../tf-scalar-dashboard.html">
-<link rel="import" href="../../paper-styles/typography.html">
-
-<title>Scalar Dashboard Demo</title>
-<style>
-  #container {
-    height: 900px;
-    width: 100%;
-    display: block;
-  }
-
-  html, body {
-    margin: 0;
-    padding: 0;
-    font-family: "RobotoDraft","Roboto",sans-serif;
-  }
-
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="scalar-dash-demo">
-      <template>
-        <tf-scalar-dashboard id="demo" backend="[[backend]]"></tf-scalar-dashboard>
-      </template>
-      <script>
-        Polymer({
-          is: "scalar-dash-demo",
-          properties: {
-            backend: {
-              type: Object,
-              value: function() {
-                var router = new TF.Backend.router("data", true);
-                return new TF.Backend.Backend(router);
-              },
-            },
-          },
-        });
-      </script>
-    </dom-module>
-    <scalar-dash-demo id="container"></scalar-dash-demo>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html b/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
deleted file mode 100644
index 723a01d0e6..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-scalar-dashboard.html
+++ /dev/null
@@ -1,270 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="tf-smoothing-input.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-<link rel="import" href="../tf-color-scale/tf-color-scale.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-dashboard-common/tf-option-selector.html">
-<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
-<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
-<link rel="import" href="../tf-imports/lodash.html">
-<link rel="import" href="../vz-line-chart/vz-line-chart.html">
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-menu/paper-menu.html">
-<link rel="import" href="../paper-item/paper-item.html">
-
-<!--
-tf-scalar-dashboard is a complete frontend that loads runs from a backend,
-and creates chart panes that display data for those runs.
-
-It provides a categorizer, run selector, and x type selector, by which the user
-can customize how data is organized and displayed.
-
-Each chart has a button that can toggle whether it is "expanded"; expanded
-charts are larger.
-
-Organizationally, the #plumbing div contains components that have no concrete
-manifestation and just effect data bindings or data loading. The .sidebar div
-contains shared controls provided by tf-sidebar-helper. The .center div
-contains vz-line-charts embedded inside tf-panes-helper's.
--->
-<dom-module id="tf-scalar-dashboard">
-  <template>
-    <div id="plumbing">
-      <tf-color-scale
-        id="colorScale"
-        runs="[[runs]]"
-        out-color-scale="{{_colorScale}}"
-      ></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper
-          backend="[[backend]]"
-          categories="{{_categories}}"
-          color-scale="[[_colorScale]]"
-          run2tag="[[run2tag]]"
-          runs="[[runs]]"
-          selected-runs="{{_selectedRuns}}"
-          >
-          <div class="extend-first-section">
-            <div class="line-item">
-              <paper-checkbox
-              id="download-option"
-              checked="{{_showDownloadLinks}}"
-              >Show data download links</paper-checkbox>
-            </div>
-              <div class="line-item">
-                <paper-checkbox
-                id="outliersCheckbox"
-                checked="{{_ignoreYOutliers}}"
-                >Ignore outliers in chart scaling</paper-checkbox>
-              </div>
-            <div id="tooltip-sorting">
-              <div id="tooltip-sorting-label">Tooltip sorting method:</div>
-              <paper-dropdown-menu
-                no-label-float
-                selected-item-label="{{_tooltipSortingMethod}}"
-                >
-                <paper-menu class="dropdown-content" selected="0">
-                  <paper-item>default</paper-item>
-                  <paper-item>descending</paper-item>
-                  <paper-item>ascending</paper-item>
-                  <paper-item>nearest</paper-item>
-                </paper-menu>
-              </paper-dropdown-menu>
-            </div>
-          </div>
-          <div class="sidebar-section">
-            <tf-smoothing-input
-              weight="{{_smoothingWeight}}"
-              step="0.001"
-              min="0"
-              max="1"
-              ></tf-smoothing-input>
-          </div>
-          <div class="sidebar-section">
-            <tf-option-selector
-              id="xTypeSelector"
-              name="Horizontal Axis"
-              selected-id="{{_xType}}"
-              >
-              <paper-button id="step">step</paper-button>
-              <paper-button id="relative">relative</paper-button>
-              <paper-button id="wall_time">wall</paper-button>
-            </tf-option-selector>
-          </div>
-        </tf-sidebar-helper>
-      </div>
-      <div class="center">
-        <tf-panes-helper
-          categories="[[_categories]]"
-          color-scale="[[_colorScale]]"
-          data-type="[[dataType]]"
-          data-provider="[[dataProvider]]"
-          data-not-found="[[dataNotFound]]"
-          run2tag="[[run2tag]]"
-          selected-runs="[[_selectedRuns]]"
-          show-download-links="[[_showDownloadLinks]]"
-          download-link-url-function="[[scalarUrl]]"
-          >
-          <template>
-            <vz-line-chart
-              x-type="[[_xType]]"
-              color-scale="[[_colorScale]]"
-              smoothing-enabled="[[_smoothingEnabled]]"
-              smoothing-weight="[[_smoothingWeight]]"
-              tooltip-sorting-method="[[_tooltipSortingMethod]]"
-              ignore-y-outliers="[[_ignoreYOutliers]]"
-              ></vz-line-chart>
-            <paper-icon-button
-              class="log-button"
-              icon="line-weight"
-              on-tap="toggleLogScale"
-              title="Toggle y-axis log scale"
-              ></paper-icon-button>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-
-    <style include="dashboard-style"></style>
-    <style>
-      .log-button {
-        position: absolute;
-        left: 35px;
-        bottom: -35px;
-        color: #2196F3;
-        background: #fff;
-        width: 32px;
-        height: 32px;
-        padding: 4px;
-        border-radius: 100%;
-      }
-
-      .log-button-selected {
-        background: var(--tb-ui-light-accent);
-      }
-
-      #tooltip-sorting {
-        display: flex;
-        font-size: 14px;
-        margin-top: 5px;
-      }
-
-      #tooltip-sorting-label {
-        margin-top: 13px;
-        margin-left: 28px;
-      }
-
-      #tooltip-sorting paper-dropdown-menu {
-        margin-left: 10px;
-        --paper-input-container-focus-color: var(--tb-orange-strong);
-        width: 105px;
-      }
-      .line-item {
-        display: block;
-        padding-top: 5px;
-      }
-    </style>
-
-  </template>
-
-  <script>
-    TF.Dashboard.TfScalarDashboard = Polymer({
-      is: "tf-scalar-dashboard",
-      factoryImpl: function(backend, router) {
-        this.backend = backend;
-        this.router = router;
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("scalars"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "scalar"
-        },
-        router: Object,
-        scalarUrl: {
-          type: Function,
-          computed: "_getScalarUrl(router)"
-        },
-        _showDownloadLinks: {
-          type: Boolean,
-          notify: true,
-          value: TF.URIStorage.getBooleanInitializer('_showDownloadLinks',
-              false, true),
-          observer: '_showDownloadLinksObserver'
-        },
-        _smoothingWeight: {
-          type: Number,
-          notify: true,
-          value: TF.URIStorage.getNumberInitializer('_smoothingWeight', 0.6),
-          observer: '_smoothingWeightObserver'
-        },
-        _smoothingEnabled: {
-          type: Boolean,
-          computed: '_computeSmoothingEnabled(_smoothingWeight)'
-        },
-        _ignoreYOutliers: {
-          type: Boolean,
-          value: TF.URIStorage.getBooleanInitializer('_ignoreYOutliers', true, true),
-          observer: '_ignoreYOutliersObserver',
-        },
-        _xType: {
-          type: String,
-          value: "step"
-        }
-      },
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-      _getScalarUrl: function() {
-        return this.router.scalars;
-      },
-      _showDownloadLinksObserver: TF.URIStorage.getBooleanObserver(
-          '_showDownloadLinks', /*default=*/ false, /*useLocalStorage=*/ true),
-      _smoothingWeightObserver: TF.URIStorage.getNumberObserver(
-          '_smoothingWeight', 0.6),
-      _ignoreYOutliersObserver: TF.URIStorage.getBooleanObserver(
-          '_ignoreYOutliers', /*default=*/ true, /*useLocalStorage=*/true),
-      _computeSmoothingEnabled: function(_smoothingWeight) {
-        return _smoothingWeight > 0;
-      },
-      toggleLogScale: function(e) {
-        var currentTarget = Polymer.dom(e.currentTarget);
-        var button = currentTarget.parentNode.querySelector('.log-button');
-        var chart = currentTarget.parentNode.querySelector('vz-line-chart');
-
-        button.classList.toggle("log-button-selected");
-        chart.yScaleType = chart.yScaleType === 'log' ? 'linear' : 'log';
-        chart.redraw();
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-smoothing-input.html b/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-smoothing-input.html
deleted file mode 100644
index a076033000..0000000000
--- a/tensorflow/tensorboard/components/tf_scalar_dashboard/tf-smoothing-input.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-slider/paper-slider.html">
-<link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../tf-imports/lodash.html">
-
-<!--
-tf-smoothing-input creates an input component for exponential smoothing.
--->
-<dom-module id="tf-smoothing-input">
-  <template>
-    <h3 class="title">Smoothing</h3>
-    <div class="smoothing-block">
-      <paper-slider
-        id="slider"
-        value="{{weight}}"
-        immediate-value="{{_immediateWeightNumberForPaperSlider}}"
-        type="number"
-        step="[[step]]"
-        min="[[min]]"
-        max="[[max]]"
-        ></paper-slider>
-      <paper-input
-        id="input"
-        label="weight"
-        no-label-float
-        value="{{_inputWeightStringForPaperInput}}"
-        type="number"
-        step="[[step]]"
-        min="[[min]]"
-        max="[[max]]"
-        ></paper-input>
-    </div>
-    <style>
-      .title {
-        color: var(--paper-grey-800);
-        margin: 0;
-        font-weight: normal;
-        font-size: 14px;
-        margin-bottom: 5px;
-      }
-
-      .smoothing-block {
-        display: flex;
-      }
-
-      paper-slider {
-        margin-left: 12px;
-        --paper-slider-knob-color: var(--tb-orange-strong);
-        --paper-slider-active-color: var(--tb-orange-strong);
-        flex-grow: 2;
-      }
-
-      paper-input {
-        --paper-input-container-focus-color: var(--tb-orange-strong);
-        --paper-input-container-input: {
-          font-size: 14px;
-        };
-        --paper-input-container-label: {
-          font-size: 14px;
-        };
-        width: 60px;
-      }
-    </style>
-  </template>
-  <script>
-    Polymer({
-      is: "tf-smoothing-input",
-
-      properties: {
-        step: Number,
-        max: Number,
-        min: Number,
-
-        weight: {
-          type: Number,
-          value: 0.6,
-          notify: true
-        },
-
-        _immediateWeightNumberForPaperSlider: {
-          type: Number,
-          notify: true,
-          observer: '_immediateWeightNumberForPaperSliderChanged'
-        },
-
-        // Paper input treats values as strings even if you specify them as
-        // numbers.
-        _inputWeightStringForPaperInput: {
-          type: String,
-          notify: true,
-          observer: '_inputWeightStringForPaperInputChanged'
-        }
-      },
-
-      _updateWeight: _.debounce(function(val) {
-        this.weight = val;
-      }, 250),
-
-      _immediateWeightNumberForPaperSliderChanged: function() {
-        this._inputWeightStringForPaperInput =
-            this._immediateWeightNumberForPaperSlider.toString();
-        this._updateWeight.call(this, this._immediateWeightNumberForPaperSlider);
-      },
-
-      _inputWeightStringForPaperInputChanged: function() {
-        if (+this._inputWeightStringForPaperInput < 0) {
-          this._inputWeightStringForPaperInput = '0';
-        }
-        else if (+this._inputWeightStringForPaperInput > 1) {
-          this._inputWeightStringForPaperInput = '1';
-        }
-
-        var d = +this._inputWeightStringForPaperInput;
-        if (!isNaN(d)) {
-          this._updateWeight.call(this, d);
-        }
-      }
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/autoReloadBehavior.ts b/tensorflow/tensorboard/components/tf_tensorboard/autoReloadBehavior.ts
deleted file mode 100644
index 1f6b4cf641..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/autoReloadBehavior.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module TF.TensorBoard {
-  export var AUTORELOAD_LOCALSTORAGE_KEY = 'TF.TensorBoard.autoReloadEnabled';
-
-  var getAutoReloadFromLocalStorage: () => boolean = () => {
-    var val = window.localStorage.getItem(AUTORELOAD_LOCALSTORAGE_KEY);
-    return val === 'true' || val == null;  // defaults to true
-  };
-
-  export var AutoReloadBehavior = {
-    properties: {
-      autoReloadEnabled: {
-        type: Boolean,
-        observer: '_autoReloadObserver',
-        value: getAutoReloadFromLocalStorage,
-      },
-      _autoReloadId: {
-        type: Number,
-      },
-      autoReloadIntervalSecs: {
-        type: Number,
-        value: 30,
-      },
-    },
-    detached: function() {
-      window.clearTimeout(this._autoReloadId);
-    },
-    _autoReloadObserver: function(autoReload) {
-      window.localStorage.setItem(AUTORELOAD_LOCALSTORAGE_KEY, autoReload);
-      if (autoReload) {
-        var _this = this;
-        this._autoReloadId = window.setTimeout(
-            this._doAutoReload.bind(this), this.autoReloadIntervalSecs * 1000);
-      } else {
-        window.clearTimeout(this._autoReloadId);
-      }
-    },
-    _doAutoReload: function() {
-      if (this.reload == null) {
-        throw new Error('AutoReloadBehavior requires a reload method');
-      }
-      this.reload();
-      this._autoReloadId = window.setTimeout(
-          this._doAutoReload.bind(this), this.autoReloadIntervalSecs * 1000);
-    }
-  };
-}
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/autoReloadTests.ts b/tensorflow/tensorboard/components/tf_tensorboard/test/autoReloadTests.ts
deleted file mode 100644
index 0f049d40ab..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/autoReloadTests.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-declare function fixture(id: string): void;
-window.HTMLImports.whenReady(() => {
-  Polymer({
-    is: 'autoreload-test-element',
-    behaviors: [TF.TensorBoard.AutoReloadBehavior],
-  });
-
-  describe('autoReload-behavior', function() {
-    var testElement;
-    var ls = window.localStorage;
-    var key = TF.TensorBoard.AUTORELOAD_LOCALSTORAGE_KEY;
-    var clock;
-    var callCount: number;
-
-    beforeEach(function() {
-      ls.setItem(key, 'false');  // start it turned off so we can mutate fns
-      testElement = fixture('autoReloadFixture');
-      callCount = 0;
-      testElement.reload = function() { callCount++; };
-    });
-
-    before(function() { clock = sinon.useFakeTimers(); });
-
-    after(function() { clock.restore(); });
-
-    it('reads and writes autoReload state from localStorage', function() {
-      ls.removeItem(key);
-      testElement = fixture('autoReloadFixture');
-      chai.assert.isTrue(
-          testElement.autoReloadEnabled, 'autoReload defaults to true');
-      chai.assert.equal(ls.getItem(key), 'true', 'autoReload setting saved');
-      testElement = fixture('autoReloadFixture');
-      chai.assert.isTrue(
-          testElement.autoReloadEnabled, 'read true from localStorage');
-      testElement.autoReloadEnabled = false;
-      chai.assert.equal(ls.getItem(key), 'false', 'autoReload setting saved');
-      testElement = fixture('autoReloadFixture');
-      chai.assert.isFalse(
-          testElement.autoReloadEnabled, 'read false setting properly');
-      testElement.autoReloadEnabled = true;
-      chai.assert.equal(ls.getItem(key), 'true', 'saved true setting');
-    });
-
-    it('reloads every interval secs when autoReloading', function() {
-      testElement.autoReloadIntervalSecs = 1;
-      testElement.autoReloadEnabled = true;
-      clock.tick(1000);
-      chai.assert.equal(callCount, 1, 'ticking clock triggered call');
-      clock.tick(20 * 1000);
-      chai.assert.equal(callCount, 21, 'ticking clock 20s triggered 20 calls');
-    });
-
-    it('can cancel pending autoReload', function() {
-      testElement.autoReloadIntervalSecs = 10;
-      testElement.autoReloadEnabled = true;
-      clock.tick(5 * 1000);
-      testElement.autoReloadEnabled = false;
-      clock.tick(20 * 1000);
-      chai.assert.equal(callCount, 0, 'callCount is 0');
-    });
-
-    it('throws an error in absence of reload method', function() {
-      testElement.reload = undefined;
-      testElement.autoReloadIntervalSecs = 1;
-      testElement.autoReloadEnabled = true;
-      chai.assert.throws(function() {
-        clock.tick(5000);
-      });
-    });
-  });
-});
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.html b/tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.html
deleted file mode 100644
index 5efc02ef98..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../tf-imports/d3.html">
-  <link rel="import" href="../tf-tensorboard.html">
-  <link rel="stylesheet" type="text/css" href="../../../lib/css/global.css">
-</head>
-<body>
-  <tf-tensorboard demo-dir="data/"></tf-tensorboard>
-  <script src="e2eTests.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.ts b/tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.ts
deleted file mode 100644
index 2308298ced..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/e2eTests.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-describe('end-to-end test', () => {
-  window.HTMLImports.whenReady(() => {
-    let tb = d3.select('tf-tensorboard');
-    var tabs = (<any>tb.node()).$.tabs;
-
-    function testTab(tabIndex: number) {
-      it(`selecting ${TF.Globals.TABS[tabIndex]} tab`, done => {
-        // Every dashboard emits a rendered event when it is done rendering.
-        tb.on('rendered', () => done());
-        tabs.set('selected', tabIndex);
-      });
-    }
-    // Listen for when the default tab has rendered and test other tabs after.
-    tb.on('rendered', () => {
-      // The default tab already rendered. Test everything else.
-      // If a bug happened while rendering the default tab, the test would
-      // have failed. Re-selecting the default tab and listening for
-      // "rendered" event won't work since the content is not re-stamped.
-      let selected = +tabs.get('selected');
-      for (let i = 0; i < TF.Globals.TABS.length; i++) {
-        if (i !== selected) {
-          testTab(i);
-        }
-      }
-    });
-  });
-});
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.html b/tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.html
deleted file mode 100644
index 88bb6edc48..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../tf-imports/d3.html">
-  <link rel="import" href="../tf-tensorboard.html">
-  <link rel="stylesheet" type="text/css" href="../../../lib/css/global.css">
-</head>
-<body>
-  <tf-tensorboard demo-dir="data/"></tf-tensorboard>
-  <script src="fastTabSwitch.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.ts b/tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.ts
deleted file mode 100644
index 4dd62a0c38..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/fastTabSwitch.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-describe('fast tab switch', () => {
-  window.HTMLImports.whenReady(() => {
-    let tb = d3.select('tf-tensorboard');
-    var tabs = (<any>tb.node()).$.tabs;
-
-    // This test will select the events tab. Once the events tab
-    // renders, will select the graph tab, and immediately select
-    // the images tab wihout waiting for the graph tab to finish
-    // rendering. Finally, it finishes when the images tab
-    // has rendered and no errors were thrown.
-    let eventsTabIndex = TF.Globals.TABS.indexOf('events');
-    let imagesTabIndex = TF.Globals.TABS.indexOf('images');
-    let graphTabIndex = TF.Globals.TABS.indexOf('graphs');
-
-    // Listen for when the events tab rendered.
-    tb.on('rendered', () => {
-      it('switching to graph tab and immediately to images', done => {
-        // Select the graph tab.
-        tabs.set('selected', graphTabIndex);
-        // Interrupt graph rendering by immediately selecting the images tab
-        // and finish when the images tab has rendered.
-        tb.on('rendered', () => done());
-        tabs.set('selected', imagesTabIndex);
-      });
-    });
-    // Select the events tab.
-    tabs.set('selected', eventsTabIndex);
-  });
-});
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/index.html b/tensorflow/tensorboard/components/tf_tensorboard/test/index.html
deleted file mode 100644
index 8806f36fad..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../web-component-tester/browser.js"></script>
-</head>
-<body>
-<script>
-// Run the tests for each main component in tensorboard.
-WCT.loadSuites([
-  'tensorboardTests.html',
-  // TODO: re-enable or remove. b/30163860
-  // 'e2eTests.html',
-  'fastTabSwitch.html'
-]);
-</script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.html b/tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.html
deleted file mode 100644
index 2122cb79b1..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <link rel="import" href="../../polymer/polymer.html">
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../tf-tensorboard.html">
-  <link rel="stylesheet" type="text/css" href="../../../lib/css/global.css">
-</head>
-<body>
-  <test-fixture id="tensorboardFixture">
-    <template>
-      <tf-tensorboard>
-        <span id="inject-me">Injected content should be rendered by the element.</span>
-      </tf-tensorboard>
-    </template>
-  </test-fixture>
-
-  <test-fixture id="autoReloadFixture">
-    <template>
-      <autoreload-test-element></autoreload-test-element>
-    </template>
-  </test-fixture>
-  <script src="tensorboardTests.js"></script>
-  <script src="autoReloadTests.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.ts b/tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.ts
deleted file mode 100644
index 3c7fe2c9e7..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/test/tensorboardTests.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-describe('tf-tensorboard tests', () => {
-  window.HTMLImports.whenReady(() => {
-    let tensorboard: any;
-    beforeEach(function() {
-      tensorboard = fixture('tensorboardFixture');
-      tensorboard.demoDir = 'data';
-      tensorboard.autoReloadEnabled = false;
-    });
-
-    it('specified tabs are correct', function(done) {
-      setTimeout(function() {
-        let tabs = tensorboard.$.tabs.getElementsByTagName('paper-tab');
-        let tabMode = Array.prototype.map.call(tabs, (x) => x.dataMode);
-        chai.assert.deepEqual(tabMode, TF.Globals.TABS, 'mode is correct');
-        let tabText =
-            Array.prototype.map.call(tabs, (x) => x.innerText.toLowerCase());
-        chai.assert.deepEqual(tabText, TF.Globals.TABS, 'text is correct');
-        done();
-      });
-    });
-
-    it('respects router manually provided', function() {
-      let router = TF.Backend.router('data', true);
-      tensorboard.router = router;
-      tensorboard.demoDir = null;
-      chai.assert.equal(tensorboard._backend.router, router);
-    });
-
-    it('renders injected content', function() {
-      let injected = tensorboard.querySelector('#inject-me');
-      chai.assert.isNotNull(injected);
-    });
-
-    describe('reloading the selected dashboard', function() {
-      TF.Globals.TABS.forEach((name, tabIndex) => {
-        // These tabs do not support reload mode.
-        if (name === 'graphs' || name === 'projections') {
-          return;
-        }
-        it(`${name}: calling reload reloads dashboard`, function(done) {
-          tensorboard.$.tabs.set('selected', tabIndex);
-          setTimeout(function() {
-            let called = false;
-            tensorboard.selectedDashboard().reload = function() {
-              called = true;
-            };
-            tensorboard.reload();
-            chai.assert.isFalse(
-                tensorboard.$$('#reload-button').disabled,
-                'reload button not disabled');
-            chai.assert.isTrue(called, `reload was called`);
-            done();
-          });
-        });
-      });
-    });
-
-    it('reload is disabled for graph dashboard', function(done) {
-      let idx = TF.Globals.TABS.indexOf('graphs');
-      chai.assert.notEqual(idx, -1, 'graphs was found');
-      tensorboard.$.tabs.set('selected', idx);
-      setTimeout(
-          function() {  // async so that the queued tab change will happen
-            let called = false;
-            tensorboard.selectedDashboard().reload = function() {
-              called = true;
-            };
-            tensorboard.reload();
-            chai.assert.isTrue(
-                tensorboard.$$('#reload-button').disabled,
-                'reload button disabled');
-            chai.assert.isFalse(called, `reload was not called`);
-            done();
-          });
-    });
-
-    describe('top right global icons', function() {
-      it('Clicking the reload button will call reload', function() {
-        let called = false;
-        tensorboard.reload = function() { called = true; };
-        tensorboard.$$('#reload-button').click();
-        chai.assert.isTrue(called);
-      });
-
-      it('settings pane is hidden', function() {
-        chai.assert.equal(tensorboard.$.settings.style['display'], 'none');
-      });
-
-      it('settings icon button opens the settings pane', function(done) {
-        tensorboard.$$('#settings-button').click();
-        // This test is a little hacky since we depend on polymer's
-        // async behavior, which is difficult to predict.
-
-        // keep checking until the panel is visible. error with a timeout if it
-        // is broken.
-        function verify() {
-          if (tensorboard.$.settings.style['display'] !== 'none') {
-            done();
-          } else {
-            setTimeout(verify, 3);  // wait and see if it becomes true
-          }
-        }
-        verify();
-      });
-
-      it('Autoreload checkbox toggle works', function() {
-        let checkbox = tensorboard.$$('#auto-reload-checkbox');
-        chai.assert.equal(checkbox.checked, tensorboard.autoReloadEnabled);
-        let oldValue = checkbox.checked;
-        checkbox.click();
-        chai.assert.notEqual(oldValue, checkbox.checked);
-        chai.assert.equal(checkbox.checked, tensorboard.autoReloadEnabled);
-      });
-
-      it('Autoreload checkbox contains correct interval info', function() {
-        let checkbox = tensorboard.$$('#auto-reload-checkbox');
-        let timeInSeconds = tensorboard.autoReloadIntervalSecs + 's';
-        chai.assert.include(checkbox.innerText, timeInSeconds);
-      });
-    });
-  });
-});
diff --git a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html b/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
deleted file mode 100644
index 7440263f88..0000000000
--- a/tensorflow/tensorboard/components/tf_tensorboard/tf-tensorboard.html
+++ /dev/null
@@ -1,352 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-icons/iron-icons.html">
-<link rel="import" href="../paper-tabs/paper-tabs.html">
-<link rel="import" href="../paper-dialog/paper-dialog.html">
-<link rel="import" href="../paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../paper-toolbar/paper-toolbar.html">
-<link rel="import" href="../paper-button/paper-button.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-header-panel/paper-header-panel.html">
-<link rel="import" href="../tf-globals/tf-globals.html">
-<link rel="import" href="../tf-scalar-dashboard/tf-scalar-dashboard.html">
-<link rel="import" href="../tf-distribution-dashboard/tf-distribution-dashboard.html">
-<link rel="import" href="../tf-histogram-dashboard/tf-histogram-dashboard.html">
-<link rel="import" href="../tf-image-dashboard/tf-image-dashboard.html">
-<link rel="import" href="../tf-audio-dashboard/tf-audio-dashboard.html">
-<link rel="import" href="../tf-graph-dashboard/tf-graph-dashboard.html">
-<link rel="import" href="../tf-text-dashboard/tf-text-dashboard.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-<link rel="import" href="../tf-storage/tf-storage.html">
-<link rel="import" href="../vz-projector/vz-projector-dashboard.html">
-
-<!--
-tf-tensorboard is the frontend entry point for TensorBoard.
-
-It implements a toolbar (via paper-header-panel and paper-toolbar) that
-allows the user to toggle between various dashboards.
--->
-<script src="autoReloadBehavior.js"></script>
-<dom-module id="tf-tensorboard">
-  <template>
-    <paper-dialog with-backdrop id="settings">
-      <h2>Settings</h2>
-      <paper-checkbox id="auto-reload-checkbox" checked="{{autoReloadEnabled}}">
-        Reload data every <span>[[autoReloadIntervalSecs]]</span>s.
-      </paper-checkbox>
-    </paper-dialog>
-    <paper-header-panel>
-      <paper-toolbar id="toolbar">
-        <div id="toolbar-content">
-          <div class="toolbar-title">TensorBoard</div>
-          <paper-tabs selected="{{modeIndex}}" noink class="tabs" id="tabs">
-            <template is="dom-repeat" items="[[tabs]]">
-              <template is="dom-if" if="[[_isTabEnabled(item)]]">
-                <paper-tab data-mode="[[item]]">[[item]]</paper-tab>
-              </template>
-            </template>
-          </paper-tabs>
-          <div class="global-actions">
-            <paper-icon-button
-              icon="refresh"
-              on-tap="reload"
-              disabled$="[[_isReloadDisabled(mode)]]"
-              id="reload-button"
-            ></paper-icon-button>
-            <paper-icon-button
-              icon="settings"
-              on-tap="openSettings"
-              id="settings-button"
-            ></paper-icon-button>
-            <a href="https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/README.md" tabindex="-1">
-              <paper-icon-button icon="help-outline"></paper-icon-button>
-            </a>
-          </div>
-        </div>
-      </paper-toolbar>
-
-      <div id="content" class="fit">
-        <content id="injected-overview"></content>
-
-        <template is="dom-if" if="[[_modeIsScalars(mode)]]">
-          <tf-scalar-dashboard
-            id="scalars"
-            backend="[[_backend]]"
-            router="[[router]]"
-          ></tf-scalar-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsImages(mode)]]">
-          <tf-image-dashboard
-            id="images"
-            backend="[[_backend]]"
-          ></tf-image-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsAudio(mode)]]">
-          <tf-audio-dashboard
-            id="audio"
-            backend="[[_backend]]"
-          ></tf-audio-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsGraphs(mode)]]">
-          <tf-graph-dashboard
-            id="graphs"
-            backend="[[_backend]]"
-            debugger-data-enabled="[[_debuggerDataEnabled]]"
-          ></tf-graph-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsDistributions(mode)]]">
-          <tf-distribution-dashboard
-            id="distributions"
-            backend="[[_backend]]"
-          ></tf-distribution-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsHistograms(mode)]]">
-          <tf-histogram-dashboard
-            id="histograms"
-            backend="[[_backend]]"
-          ></tf-histogram-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsEmbeddings(mode)]]">
-          <vz-projector-dashboard
-            id="projector"
-            route-prefix="/data/plugin/projector">
-          </vz-projector-dashboard>
-        </template>
-
-        <template is="dom-if" if="[[_modeIsText(mode)]]">
-          <tf-text-dashboard
-            id="text"
-            backend="[[_backend]]">
-          </tf-text-dashboard>
-        </template>
-      </div>
-    </paper-header-panel>
-
-    <style>
-      :host {
-        height: 100%;
-        display: block;
-        background-color: var(--paper-grey-100);
-      }
-
-      #toolbar {
-        background-color: var(--tb-toolbar-background-color, --tb-orange-strong);
-        -webkit-font-smoothing: antialiased;
-      }
-
-      .toolbar-title {
-        font-size: 20px;
-        margin-left: 10px;
-        text-rendering: optimizeLegibility;
-        letter-spacing: -0.025em;
-        font-weight: 500;
-        flex-grow: 2;
-        display: var(--tb-toolbar-title-display, block);
-      }
-
-      .tabs {
-        flex-grow: 1;
-        text-transform: uppercase;
-        height: 100%;
-      }
-
-      paper-tabs {
-        --paper-tabs-selection-bar-color: white;
-      }
-
-      .global-actions {
-        flex-grow: 2;
-        display: inline-flex; /* Ensure that icons stay aligned */
-        justify-content: flex-end;
-        text-align: right;
-        color: white;
-      }
-
-      .global-actions a {
-        color: white;
-      }
-
-      #toolbar-content {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        align-items: center;
-      }
-
-      #content {
-        height: 100%;
-      }
-
-      [disabled] {
-        opacity: 0.2;
-        color: white;
-      }
-
-    </style>
-  </template>
-  <script>
-    "use strict";
-
-    Polymer({
-      is: "tf-tensorboard",
-      behaviors: [TF.TensorBoard.AutoReloadBehavior],
-      properties: {
-        router: {
-          type: Object,
-          value: function() {
-            return TF.Backend.router();
-          },
-        },
-        _backend: {
-          type: Object,
-          computed: "_makeBackend(router, demoDir)",
-        },
-        _debuggerDataEnabled: {
-          type: Boolean,
-          value: function() {
-            // For now, Tensorboard only shows debugger data if the debugger_data GET param is set
-            // to enabled.
-            let match = window.location.href.match(/[&\?]debugger_data=enabled/);
-            return match && match.length == 1;
-          },
-        },
-        // Which tab is selected (scalars, graph, images etc).
-        mode: {
-          type: String,
-          computed: '_getModeFromIndex(modeIndex)',
-          notify: true,
-        },
-        tabs: {
-          type: Array,
-          readOnly: true,
-          value: TF.Globals.TABS,
-        },
-        // If this is set to a string, TensorBoard will switch to "demo mode"
-        // and attempt to load serialized json data from that directory. You can
-        // generate conformant json using
-        // tensorboard/scripts/serialize_tensorboard.py
-        demoDir: {
-          type: String,
-          value: null,
-        },
-        // Set this to true to store state in URI hash. Should be true for all non-test purposes.
-        useHash: {
-          type: Boolean,
-          value: false,
-        },
-        disabledTabs: String,
-      },
-      _isTabEnabled: function(tab) {
-        if (this.disabledTabs != null &&
-            this.disabledTabs.split(',').indexOf(tab) >= 0) {
-          return false;
-        }
-        return true;
-      },
-      _getModeFromIndex: function(modeIndex) {
-        var mode = this.tabs[modeIndex];
-        TF.URIStorage.setString(TF.URIStorage.TAB, mode);
-        return mode;
-      },
-      _makeBackend: function(router, demoDir) {
-        // use the demoDir if it is set, otherwise use the provided router
-        if (demoDir != null) {
-          router = TF.Backend.router(demoDir, true);
-        }
-        return new TF.Backend.Backend(router);
-      },
-      _isReloadDisabled: function(mode) {
-        return !this._debuggerDataEnabled && this._modeIsGraphs(mode);
-      },
-      _modeIsScalars: function(mode) {
-        return mode === "scalars";
-      },
-      _modeIsImages: function(mode) {
-        return mode === "images";
-      },
-      _modeIsAudio: function(mode) {
-        return mode === "audio";
-      },
-      _modeIsGraphs: function(mode) {
-        return mode === "graphs";
-      },
-      _modeIsEmbeddings: function(mode) {
-        return mode === "embeddings";
-      },
-      _modeIsDistributions: function(mode) {
-        return mode === "distributions";
-      },
-      _modeIsHistograms: function(mode) {
-        return mode === "histograms";
-      },
-      _modeIsText: function(mode) {
-        return mode === "text";
-      },
-      selectedDashboard: function() {
-        var dashboard = this.$$("#" + this.mode);
-        if (dashboard == null) {
-          throw new Error(`Unable to find dashboard for mode: ${this.mode}`);
-        }
-        return dashboard;
-      },
-      ready: function() {
-        TF.Globals.USE_HASH = this.useHash;
-
-        this._getModeFromHash();
-        window.addEventListener('hashchange', function() {
-          this._getModeFromHash();
-        }.bind(this));
-      },
-      _getModeFromHash: function() {
-        var tabName = TF.URIStorage.getString(TF.URIStorage.TAB);
-        var modeIndex = this.tabs.indexOf(tabName);
-        if (modeIndex == -1 && this.modeIndex == null) {
-          // Select the first tab as default.
-          this.set('modeIndex', 0);
-        }
-        if (modeIndex != -1 && modeIndex != this.modeIndex) {
-          this.set('modeIndex', modeIndex);
-        }
-      },
-      reload: function() {
-        if (this._modeIsEmbeddings(this.mode)) {
-          return;
-        }
-        if (!this._debuggerDataEnabled && this._modeIsGraphs(this.mode)) {
-          return;
-        }
-        this.selectedDashboard().reload();
-      },
-      openSettings: function() {
-        this.$.settings.open();
-      },
-    });
-  </script>
-  <!-- Compiled bundle of all components using ES6 modules. -->
-  <script src="../bundle.js"></script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
deleted file mode 100644
index 7f4c27c6aa..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_text_dashboard",
-    srcs = [
-        "tf-text-dashboard.html",
-        "tf-text-loader.html",
-    ],
-    path = "/tf-text-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend",
-        "//tensorflow/tensorboard/components/tf_color_scale",
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-        "@org_polymer_paper_dialog",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_material",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-text-dashboard.html",
-        "tf-text-loader.html",
-    ],
-    destdir = "tf-text-dashboard",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_backend:legacy",
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//third_party/javascript/polymer/v1/paper-material:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
deleted file mode 100644
index af13d276cd..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_text_dashboard/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-text-dashboard/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_text_dashboard",
-        "//tensorflow/tensorboard/components/tf_text_dashboard/demo/data",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
deleted file mode 100644
index 6da08e5c30..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "data",
-    srcs = glob(["*"]),
-    path = "/tf-text-dashboard/demo/data/plugin/text",
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/logdir b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/logdir
deleted file mode 100644
index c7d82022cc..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/logdir
+++ /dev/null
@@ -1 +0,0 @@
-{"logdir": "/some/fake/logdir"}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/runs.json b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/runs.json
deleted file mode 100644
index aea7de5f91..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/runs.json
+++ /dev/null
@@ -1 +0,0 @@
-{"fry": ["message", "markdown"], "leela": ["message"]}
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_markdown.json b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_markdown.json
deleted file mode 100644
index 94183ae13d..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_markdown.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "wall_time": 1489715207.593146,
-    "step": 0,
-    "text": "<p><em>Italics1</em> <em>Italics2</em> <strong>bold1</strong> <strong>bold2</strong></p>"
-  },
-  {
-    "wall_time": 1489715207.593801,
-    "step": 1,
-    "text": "<ol>\n<li>List item one.</li>\n<li>List item two.</li>\n<li>Sublist</li>\n<li>Sublist2</li>\n<li>List continues.</li>\n</ol>"
-  },
-  {
-    "wall_time": 1489715207.594842,
-    "step": 2,
-    "text": "<table>\n<thead>\n<tr>\n<th>An</th>\n<th>Example</th>\n<th>Table</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>A</td>\n<td>B</td>\n<td>C</td>\n</tr>\n<tr>\n<td>1</td>\n<td>2</td>\n<td>3</td>\n</tr>\n</tbody>\n</table>"
-  },
-  {
-    "wall_time": 1489715207.595761,
-    "step": 3,
-    "text": "<p>hello <a><em>you</em></a></p>"
-  },
-  {
-    "wall_time": 1489715207.595761,
-    "step": 4,
-    "text": "<p><a href=\"http://tensorflow.org\">TensorFlow</a></p>"
-  },
-  {
-    "wall_time": 1489715207.595761,
-    "step": 530234352,
-    "text": "&lt;script&gt;alert('xss')&lt;/script&gt;"
-  }
-]
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_message.json b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_message.json
deleted file mode 100644
index e8cc006c0d..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_fry_tag_message.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "wall_time": 1489715207.593146,
-    "step": 0,
-    "text": "fry loves garnet"
-  },
-  {
-    "wall_time": 1489715207.593801,
-    "step": 1,
-    "text": "fry loves amethyst"
-  },
-  {
-    "wall_time": 1489715207.594842,
-    "step": 2,
-    "text": "fry loves pearl"
-  },
-  {
-    "wall_time": 1489715207.595761,
-    "step": 3,
-    "text": "fry loves steven"
-  }
-]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_leela_tag_message.json b/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_leela_tag_message.json
deleted file mode 100644
index 5a6d259893..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/data/text_run_leela_tag_message.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "step": 0,
-    "wall_time": 1489715207.607792,
-    "text": "leela loves garnet and feels strongly about various issues of the day including the two-cent titanium tax and whether nixon's head contributes to greenhouse gas emissions"
-  },
-  {
-    "step": 1,
-    "wall_time": 1489715207.609011,
-    "text": "leela loves amethyst"
-  },
-  {
-    "step": 2,
-    "wall_time": 1489715207.610028,
-    "text": "leela loves pearl"
-  },
-  {
-    "step": 3,
-    "wall_time": 1489715207.611142,
-    "text": "leela loves someverylongwordwithoutanybreaksorspacessowecanseehowthatishandledbythefrontend"
-  }
-]
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/demo/index.html b/tensorflow/tensorboard/components/tf_text_dashboard/demo/index.html
deleted file mode 100644
index 3ab6e85738..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/demo/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="import" href="../tf-text-dashboard.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <title>text Dashboard Demo</title>
-    <style>
-      #container{
-        height: 800px;
-        border: 2px solid grey;
-      }
-      html, body {
-        margin: 0;
-        padding: 0;
-        height: 100%;
-        font-family: "RobotoDraft","Roboto",sans-serif;
-      }
-    </style>
-  </head>
-  <body>
-    <demo-snippet>
-      <template>
-        <dom-module id="text-dash-demo">
-          <template>
-            <tf-text-dashboard id="demo" backend="[[backend]]">
-            </tf-text-dashboard>
-          </template>
-          <script>
-            Polymer({
-              is: "text-dash-demo",
-              properties: {
-                backend: {
-                  type: Object,
-                  value: function() {
-                    var path = "data";
-                    var router = new TF.Backend.router(path, true);
-                    return new TF.Backend.Backend(router);
-                  },
-                },
-              },
-            });
-          </script>
-        </dom-module>
-        <div id="container">
-          <text-dash-demo></text-dash-demo>
-        </div>
-      </template>
-    </demo-snippet>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html b/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
deleted file mode 100644
index d771c9821c..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-dashboard.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
-@license
-Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-dialog/paper-dialog.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../tf-backend/tf-backend.html">
-<link rel="import" href="../tf-color-scale/tf-color-scale.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-dashboard-common/tf-panes-helper.html">
-<link rel="import" href="../tf-dashboard-common/tf-sidebar-helper.html">
-<link rel="import" href="tf-text-loader.html">
-
-<!--
-tf-text-dashboard displays a dashboard that loads texts from a TensorFlow run.
--->
-<dom-module id="tf-text-dashboard">
-  <template>
-    <paper-dialog with-backdrop id="actual-text-size-dialog"></paper-dialog>
-    <div id="plumbing">
-      <tf-color-scale
-        id="colorScale"
-        runs="[[runs]]"
-        out-color-scale="{{_colorScale}}"
-        ></tf-color-scale>
-    </div>
-
-    <tf-dashboard-layout>
-      <div class="sidebar">
-        <tf-sidebar-helper
-          backend="[[backend]]"
-          categories="{{_categories}}"
-          color-scale="[[_colorScale]]"
-          run2tag="[[run2tag]]"
-          runs="[[runs]]"
-          selected-runs="{{_selectedRuns}}"
-          >
-        </tf-sidebar-helper>
-      </div>
-      <div class="center">
-        <tf-panes-helper
-          categories="[[_categories]]"
-          color-scale="[[_colorScale]]"
-          data-type="[[dataType]]"
-          data-provider="[[dataProvider]]"
-          data-not-found="[[dataNotFound]]"
-          run2tag="[[run2tag]]"
-          selected-runs="[[_selectedRuns]]"
-          repeat-for-runs
-          >
-          <template>
-            <tf-text-loader color-scale="[[_colorScale]]"></tf-text-loader>
-          </template>
-        </tf-panes-helper>
-      </div>
-    </tf-dashboard-layout>
-    <style include="dashboard-style"></style>
-    <style>
-      tf-panes-helper {
-        --card-width: 100%;
-        --card-height: auto;
-        --card-expanded-width: 100%;
-        --card-expanded-height: 1000px;
-        --card-padding: 0 5px 5px 5px;
-        --show-expand-button: none;
-      }
-
-    </style>
-  </template>
-  <script>
-    TF.Dashboard.TfTextDashboard = Polymer({
-      is: "tf-text-dashboard",
-      factoryImpl: function(backend) {
-        this.backend = backend;
-      },
-      properties: {
-        backend: Object,
-        dataType: {
-          type: String,
-          value: "text"
-        },
-      },
-      behaviors: [
-        TF.Dashboard.DashboardBehavior("text"),
-        TF.Dashboard.ReloadBehavior("tf-chart-scaffold"),
-        TF.Backend.Behavior,
-      ],
-      attached: function() {
-        this.async(function() {
-          this.fire("rendered");
-        });
-      },
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-loader.html b/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-loader.html
deleted file mode 100644
index 374e0478dd..0000000000
--- a/tensorflow/tensorboard/components/tf_text_dashboard/tf-text-loader.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!--
-@license
-Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-material/paper-material.html">
-<link rel="import" href="../tf-dashboard-common/scrollbar-style.html">
-<link rel="import" href="../tf-imports/d3.html">
-
-<!--
-tf-text-loader displays markdown text data from the Text plugin.
--->
-
-<style>
-  tf-text-loader p {
-    margin: 0.3em 0;
-  }
-
-  tf-text-loader table {
-    border-collapse: collapse;
-  }
-
-  tf-text-loader table th {
-    font-weight: 600;
-  }
-
-  tf-text-loader table th,
-  tf-text-loader table td {
-    padding: 6px 13px;
-    border: 1px solid #dfe2e5;
-  }
-
-  tf-text-loader table tr {
-    background-color: #fff;
-    border-top: 1px solid #c6cbd1;
-  }
-
-</style>
-<dom-module id="tf-text-loader">
-
-  <!-- Set the innerHTML with the textual content, so we can render the
-   html generated by our markdown parser. Note this content is always
-   sanitized by the backend, so xss attacks are not possible.
-  -->
-  <template>
-    <style include="scrollbar-style"></style>
-    <paper-material elevation="1" id="outer" class="container scrollbar">
-      <template id="repeater" is="dom-repeat" items="[[_texts]]">
-      <paper-material elevation="1" class="step-container">
-        step <span class="step-value">[[_numfmt(item.step)]]</span>
-      </paper-material>
-      <paper-material elevation="1" inner-h-t-m-l="[[item.text]]" class="text">
-        </paper-material>
-      </template>
-    </paper-material>
-
-
-    <style>
-      #outer {
-        display: block;
-        overflow: auto;
-        max-height: 500px;
-        position: relative;
-        border-radius: 3px;
-        border: 2px solid black;
-      }
-      .text {
-        margin: 0 10px 10px 10px;
-        border-radius: 0 3px 3px 3px;
-        background-color: white;
-        padding: 5px;
-        word-break: break-word;
-      }
-      .step-container {
-        border-left: 1px solid #ccc;
-        border-right: 1px solid #ccc;
-        border-top: 1px solid #ccc;
-        border-radius: 3px 3px 0 0;
-        font-style: italic;
-        margin-top: 10px;
-        background-color: var(--tb-ui-light-accent);
-        display: inline-block;
-        margin-left: 9px;
-        padding: 3px;
-        font-size: 12px;
-      }
-
-    </style>
-
-  </template>
-  <script>
-    Polymer({
-      is: "tf-text-loader",
-      properties: {
-        colorScale: Object,
-        run: String,
-        // This is an array of Tensorboard Text&Datum objects (See backend.ts for details). The
-        // properties of objects in this array are
-        // {
-        //   wall_time: Date,
-        //   step: number,
-        //   text: string,
-        // }
-        // they are ordered from most recent to oldest
-        _texts: {
-          type: Array,
-          value: [],
-        },
-
-      },
-      redraw: function() {
-        // Other dashboards logic requires a redraw method to be defined.
-      },
-      setVisibleSeries: function(runs) {
-        // Do nothing.
-      },
-      setSeriesData: function(run, texts) {
-        this.set("run", run);
-        this.set("_texts", texts.reverse());
-
-        // Update the border color based on the run.
-        var color = this.colorScale.scale(run);
-        this.$$("#outer").style.borderColor = color;
-      },
-      _numfmt: function(n) {
-        return d3.format(",")(n);
-      }
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
deleted file mode 100644
index 3b46082bec..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart/BUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "vz_distribution_chart",
-    srcs = [
-        "vz-distribution-chart.html",
-        ":ts",
-    ],
-    path = "/vz-distribution-chart",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/tf_imports:plottable",
-        "//tensorflow/tensorboard/components/vz_line_chart",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = ["vz-distribution-chart.ts"],
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@com_palantir_plottable//:plottable.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-        "//tensorflow/tensorboard/components/vz_line_chart:ts_typings",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "vz-distribution-chart.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-distribution-chart",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = ["vz-distribution-chart.ts"],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_line_chart:legacy_ts",
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/plottable/v1:typings",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/d3",
-        "//third_party/javascript/typings/lodash",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/sinon",
-        "//third_party/javascript/typings/webcomponents_js",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
deleted file mode 100644
index 2c9af4b3dc..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart/demo/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_distribution_chart/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/vz-distribution-chart/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_distribution_chart",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/demo/index.html b/tensorflow/tensorboard/components/vz_distribution_chart/demo/index.html
deleted file mode 100644
index 5dca73aac4..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart/demo/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>vz-distribution chart demo</title>
-    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="import" href="../vz-distribution-chart.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="../../paper-styles/typography.html">
-    <style type="text/css">
-      body {
-        font-family: "Roboto";
-      }
-
-      vz-line-chart {
-        height: 400px;
-      }
-    </style>
-  </head>
-  <body>
-    <h3>Simple distribution chart</h3>
-    <script>
-      var data = [[1716.20,0,[[0,0.10],[668,0.10],[1587,0.10],[3085,0.10],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1720.60,10,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1724.90,20,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1729.18,30,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1733.55,40,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1737.84,50,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1742.35,60,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1746.75,70,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1751.15,80,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1755.44,90,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.10]]],[1759.99,100,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1764.40,110,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1768.70,120,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1773.00,130,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1777.57,140,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.10],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1781.96,150,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.10],[10000,0.11]]],[1786.34,160,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1790.67,170,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1794.96,180,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1799.29,190,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1803.68,200,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1808.88,210,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1813.33,220,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1817.66,230,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1821.95,240,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1826.97,250,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1831.64,260,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.10],[9332,0.11],[10000,0.11]]],[1836.01,270,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1840.31,280,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]],[1844.63,290,[[0,0.09],[668,0.09],[1587,0.09],[3085,0.09],[5000,0.09],[6915,0.10],[8413,0.11],[9332,0.11],[10000,0.11]]]];
-    </script>
-    <demo-snippet>
-      <template>
-        <vz-distribution-chart id="demo"></vz-distribution-chart>
-        <script>
-          var elem = document.querySelector('#demo');
-          elem.setVisibleSeries(['demo']);
-          // The data format is strange. We don't expect you to use this chart.
-          var xform = data.map(function(x) {
-            var out = x[2];
-            out.wall_time = x[0];
-            out.step = x[1];
-            return out;
-          });
-          elem.setSeriesData('demo', xform);
-        </script>
-      </template>
-    </demo-snippet>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.html b/tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.html
deleted file mode 100644
index 726e221607..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-imports/plottable.html">
-<link rel="import" href="../tf-imports/lodash.html">
-
-<dom-module id="vz-distribution-chart">
-  <template>
-    <svg id="chartsvg"></svg>
-    <style>
-      :host {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        display: flex;
-        flex-direction: column;
-        flex-grow: 1;
-        flex-shrink: 1;
-        position: relative;
-      }
-      svg {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        flex-grow: 1;
-        flex-shrink: 1;
-      }
-
-    </style>
-  </template>
-  <script src="vz-distribution-chart.js"></script>
-  <script src="../vz-line-chart/vz-chart-helpers.js"></script>
-  <script>
-    Polymer({
-      is: "vz-distribution-chart",
-      properties: {
-        /**
-         * Scale that maps series names to colors. The default colors are from
-         * d3.scale.category10() scale. Use this property to replace the default
-         * line colors with colors of your own choice.
-         * @type {Plottable.Scales.Color}
-         * @required
-         */
-        colorScale: {
-          type: Object,
-          value: function() {
-            return new Plottable.Scales.Color()
-                .range(d3.scale.category10().range());
-          }
-        },
-        /**
-         * The way to display the X values. Allows:
-         * - "step" - Linear scale using the  "step" property of the datum.
-         * - "wall_time" - Temporal scale using the "wall_time" property of the
-         * datum.
-         * - "relative" - Temporal scale using the "relative" property of the
-         * datum if it is present or calculating from "wall_time" if it isn't.
-         */
-        xType: {
-          type: String,
-          value: 'step'
-        },
-        _attached: Boolean,
-        _chart: Object,
-        _visibleSeriesCache: {
-          type: Array,
-          value: function() { return [] }
-        },
-        _seriesDataCache: {
-          type: Object,
-          value: function() { return {} }
-        },
-        _makeChartAsyncCallbackId: { type: Number, value: null }
-      },
-      observers: [
-        "_makeChart(xType, colorScale, _attached)",
-        "_reloadFromCache(_chart)",
-      ],
-      setVisibleSeries: function(names) {
-        this._visibleSeriesCache = names;
-        if (this._chart) {
-          this._chart.setVisibleSeries(names);
-          this.redraw();
-        }
-      },
-      setSeriesData: function(name, data) {
-        this._seriesDataCache[name] = data;
-        if (this._chart) {
-          this._chart.setSeriesData(name, data);
-        }
-      },
-      redraw: function() {
-        this._chart.redraw();
-      },
-      ready: function() {
-        this.scopeSubtree(this.$.chartsvg, true);
-      },
-      _makeChart: function(xType, colorScale, _attached) {
-        if (this._makeChartAsyncCallbackId === null) {
-          this.cancelAsync(this._makeChartAsyncCallbackId);
-        }
-
-        this._makeChartAsyncCallbackId = this.async(function() {
-          this._makeChartAsyncCallbackId = null;
-          if (!_attached) return;
-          if (this._chart) this._chart.destroy();
-          var chart = new VZ.DistributionChart(xType, colorScale);
-          var svg = d3.select(this.$.chartsvg);
-          chart.renderTo(svg);
-          this._chart = chart;
-        }, 350);
-      },
-      _reloadFromCache: function() {
-        if(this._chart) {
-          this._chart.setVisibleSeries(this._visibleSeriesCache);
-          this._visibleSeriesCache.forEach(function(name) {
-            this._chart.setSeriesData(name, this._seriesDataCache[name] || []);
-          }.bind(this));
-        }
-      },
-      attached: function() {
-        this._attached = true;
-      },
-      detached: function() {
-        this._attached = false;
-      }
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.ts b/tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.ts
deleted file mode 100644
index 1c64eb4cd4..0000000000
--- a/tensorflow/tensorboard/components/vz_distribution_chart/vz-distribution-chart.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-
-module VZ {
-  export class DistributionChart {
-    private run2datasets: {[run: string]: Plottable.Dataset};
-    protected runs: string[];
-
-    protected xAccessor: Plottable.Accessor<number|Date>;
-    protected xScale: Plottable.QuantitativeScale<number|Date>;
-    protected yScale: Plottable.QuantitativeScale<number>;
-    protected gridlines: Plottable.Components.Gridlines;
-    protected center: Plottable.Components.Group;
-    protected xAxis: Plottable.Axes.Numeric|Plottable.Axes.Time;
-    protected yAxis: Plottable.Axes.Numeric;
-    protected xLabel: Plottable.Components.AxisLabel;
-    protected yLabel: Plottable.Components.AxisLabel;
-    protected outer: Plottable.Components.Table;
-    protected colorScale: Plottable.Scales.Color;
-    private plots: Plottable.XYPlot<number|Date, number>[];
-
-    private targetSVG: d3.Selection<any>;
-
-    constructor(xType: string, colorScale: Plottable.Scales.Color) {
-      this.run2datasets = {};
-      this.colorScale = colorScale;
-      this.buildChart(xType);
-    }
-
-    protected getDataset(run: string) {
-      if (this.run2datasets[run] === undefined) {
-        this.run2datasets[run] = new Plottable.Dataset([], {run: run});
-      }
-      return this.run2datasets[run];
-    }
-
-    protected buildChart(xType: string) {
-      if (this.outer) {
-        this.outer.destroy();
-      }
-      let xComponents = VZ.ChartHelpers.getXComponents(xType);
-      this.xAccessor = xComponents.accessor;
-      this.xScale = xComponents.scale;
-      this.xAxis = xComponents.axis;
-      this.xAxis.margin(0).tickLabelPadding(3);
-      this.yScale = new Plottable.Scales.Linear();
-      this.yAxis = new Plottable.Axes.Numeric(this.yScale, 'left');
-      let yFormatter = VZ.ChartHelpers.multiscaleFormatter(
-          VZ.ChartHelpers.Y_AXIS_FORMATTER_PRECISION);
-      this.yAxis.margin(0).tickLabelPadding(5).formatter(yFormatter);
-      this.yAxis.usesTextWidthApproximation(true);
-
-      let center = this.buildPlot(this.xAccessor, this.xScale, this.yScale);
-
-      this.gridlines =
-          new Plottable.Components.Gridlines(this.xScale, this.yScale);
-
-      this.center = new Plottable.Components.Group([this.gridlines, center]);
-      this.outer = new Plottable.Components.Table(
-          [[this.yAxis, this.center], [null, this.xAxis]]);
-    }
-
-    protected buildPlot(xAccessor, xScale, yScale): Plottable.Component {
-      let percents = [0, 228, 1587, 3085, 5000, 6915, 8413, 9772, 10000];
-      let opacities = _.range(percents.length - 1)
-                          .map((i) => (percents[i + 1] - percents[i]) / 2500);
-      let accessors = percents.map((p, i) => (datum) => datum[i][1]);
-      let median = 4;
-      let medianAccessor = accessors[median];
-
-      let plots = _.range(accessors.length - 1).map((i) => {
-        let p = new Plottable.Plots.Area<number|Date>();
-        p.x(xAccessor, xScale);
-
-        let y0 = i > median ? accessors[i] : accessors[i + 1];
-        let y = i > median ? accessors[i + 1] : accessors[i];
-        p.y(y, yScale);
-        p.y0(y0);
-        p.attr(
-            'fill', (d: any, i: number, dataset: Plottable.Dataset) =>
-                        this.colorScale.scale(dataset.metadata().run));
-        p.attr(
-            'stroke', (d: any, i: number, dataset: Plottable.Dataset) =>
-                          this.colorScale.scale(dataset.metadata().run));
-        p.attr('stroke-weight', (d: any, i: number, m: any) => '0.5px');
-        p.attr('stroke-opacity', () => opacities[i]);
-        p.attr('fill-opacity', () => opacities[i]);
-        return p;
-      });
-
-      let medianPlot = new Plottable.Plots.Line<number|Date>();
-      medianPlot.x(xAccessor, xScale);
-      medianPlot.y(medianAccessor, yScale);
-      medianPlot.attr(
-          'stroke',
-          (d: any, i: number, m: any) => this.colorScale.scale(m.run));
-
-      this.plots = plots;
-      return new Plottable.Components.Group(plots);
-    }
-
-    public setVisibleSeries(runs: string[]) {
-      this.runs = runs;
-      let datasets = runs.map((r) => this.getDataset(r));
-      this.plots.forEach((p) => p.datasets(datasets));
-    }
-
-    /**
-     * Set the data of a series on the chart.
-     */
-    public setSeriesData(name: string, data: any) {
-      this.getDataset(name).data(data);
-    }
-
-    public renderTo(targetSVG: d3.Selection<any>) {
-      this.targetSVG = targetSVG;
-      this.setViewBox();
-      this.outer.renderTo(targetSVG);
-    }
-
-    /** There's an issue in Chrome where the svg overflow is a bit
-     * "flickery". There is a border on the gridlines on the extreme edge of the
-     * chart, which behaves inconsistently and causes the screendiffing tests to
-     * flake. We can solve this by creating 1px effective margin for the svg by
-     * setting the viewBox on the containing svg.
-     */
-    private setViewBox() {
-      // There's an issue in Firefox where if we measure with the old viewbox
-      // set, we get horrible results.
-      this.targetSVG.attr('viewBox', null);
-
-      let parent = this.targetSVG.node().parentNode as HTMLElement;
-      let w = parent.clientWidth;
-      let h = parent.clientHeight;
-      this.targetSVG.attr({
-        'height': h,
-        'viewBox': `0 0 ${w + 1} ${h + 1}`,
-      });
-    }
-
-    public redraw() {
-      this.outer.redraw();
-      this.setViewBox();
-    }
-
-    protected destroy() { this.outer.destroy(); }
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
deleted file mode 100644
index 3ca3936f32..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/BUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "vz_histogram_timeseries",
-    srcs = [
-        "vz-histogram-timeseries.html",
-    ],
-    path = "/vz-histogram-timeseries",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "@org_polymer",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "index.html",
-        "vz-histogram-timeseries.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-histogram-timeseries",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-# This is needed: components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
deleted file mode 100644
index 8feb1c9926..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_histogram_timeseries/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/vz-histogram-timeseries/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_histogram_timeseries",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/index.html b/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/index.html
deleted file mode 100644
index 56543fb66b..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/demo/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>vz-histogram-timeseries demo</title>
-    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="import" href="../vz-histogram-timeseries.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="../../paper-styles/typography.html">
-    <link rel="import" href="../../paper-button/paper-button.html">
-    <style type="text/css">
-      body {
-        font-family: "Roboto";
-      }
-
-      vz-histogram-timeseries {
-        height: 300px;
-        width: 500px;
-      }
-    </style>
-  </head>
-  <body>
-    <h3>vz-histogram-timeseries mode</h3>
-    <demo-snippet>
-      <template>
-        <paper-button id="offsetButton">Offset</paper-button>
-        <paper-button id="overlayButton">Overlay</paper-button>
-        <vz-histogram-timeseries id="histo1"></vz-histogram-timeseries>
-        <script>
-          var histo1 = document.querySelector('#histo1'),
-            offsetButton = document.querySelector('#offsetButton'),
-            overlayButton = document.querySelector('#overlayButton');
-
-          histo1.setSeriesData('data', data);
-          offsetButton.addEventListener('click', function() { histo1.mode = 'offset' });
-          overlayButton.addEventListener('click', function() { histo1.mode = 'overlay' });
-        </script>
-      </template>
-    </demo-snippet>
-
-    <h3>vz-histogram-timeseries axis</h3>
-    <demo-snippet>
-      <template>
-        <paper-button id="stepButton">Step</paper-button>
-        <paper-button id="relativeButton">Relative</paper-button>
-        <paper-button id="wallTimeButton">Wall Time</paper-button>
-        <vz-histogram-timeseries id="histo2"></vz-histogram-timeseries>
-        <script>
-          var histo2 = document.querySelector('#histo2'),
-            stepButton = document.querySelector('#stepButton'),
-            relativeButton = document.querySelector('#relativeButton'),
-            wallTimeButton = document.querySelector('#wallTimeButton');
-
-          histo2.setSeriesData('data', data);
-          stepButton.addEventListener('click', function() { histo2.timeProperty = 'step' });
-          relativeButton.addEventListener('click', function() { histo2.timeProperty = 'relative' });
-          wallTimeButton.addEventListener('click', function() { histo2.timeProperty = 'wall_time' });
-        </script>
-      </template>
-    </demo-snippet>
-
-    <script>
-      var data = [{"wall_time":new Date("2016-06-24T04:13:11.455Z"),"step":28,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":0},{"x":0.0752,"dx":0.0054,"y":3.2512},{"x":0.0805,"dx":0.0054,"y":19.1043},{"x":0.0859,"dx":0.0054,"y":66.4758},{"x":0.0913,"dx":0.0054,"y":89.9105},{"x":0.0966,"dx":0.0054,"y":102.4476},{"x":0.102,"dx":0.0054,"y":83.8924},{"x":0.1073,"dx":0.0054,"y":81.9883},{"x":0.1127,"dx":0.0054,"y":25.21},{"x":0.1181,"dx":0.0054,"y":25.21},{"x":0.1234,"dx":0.0054,"y":2.51},{"x":0.1288,"dx":0.0054,"y":0},{"x":0.1341,"dx":0.0054,"y":0},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:13:32.817Z"),"step":74,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":0.7448},{"x":0.0752,"dx":0.0054,"y":14.6532},{"x":0.0805,"dx":0.0054,"y":30.3488},{"x":0.0859,"dx":0.0054,"y":59.5117},{"x":0.0913,"dx":0.0054,"y":75.1098},{"x":0.0966,"dx":0.0054,"y":83.4545},{"x":0.102,"dx":0.0054,"y":74.1291},{"x":0.1073,"dx":0.0054,"y":73.1618},{"x":0.1127,"dx":0.0054,"y":40.9067},{"x":0.1181,"dx":0.0054,"y":40.9067},{"x":0.1234,"dx":0.0054,"y":5.241},{"x":0.1288,"dx":0.0054,"y":1.2973},{"x":0.1341,"dx":0.0054,"y":0.5347},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:04.265Z"),"step":148,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":1.4897},{"x":0.0752,"dx":0.0054,"y":19.5529},{"x":0.0805,"dx":0.0054,"y":36.5817},{"x":0.0859,"dx":0.0054,"y":63.3103},{"x":0.0913,"dx":0.0054,"y":68.1847},{"x":0.0966,"dx":0.0054,"y":70.7925},{"x":0.102,"dx":0.0054,"y":68.2578},{"x":0.1073,"dx":0.0054,"y":67.9546},{"x":0.1127,"dx":0.0054,"y":44.712},{"x":0.1181,"dx":0.0054,"y":44.712},{"x":0.1234,"dx":0.0054,"y":8.3454},{"x":0.1288,"dx":0.0054,"y":4.3242},{"x":0.1341,"dx":0.0054,"y":1.7822},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:17.166Z"),"step":172,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":2.2345},{"x":0.0752,"dx":0.0054,"y":22.1303},{"x":0.0805,"dx":0.0054,"y":37.9432},{"x":0.0859,"dx":0.0054,"y":57.6124},{"x":0.0913,"dx":0.0054,"y":63.9491},{"x":0.0966,"dx":0.0054,"y":67.3392},{"x":0.102,"dx":0.0054,"y":70.352},{"x":0.1073,"dx":0.0054,"y":70.5635},{"x":0.1127,"dx":0.0054,"y":44.712},{"x":0.1181,"dx":0.0054,"y":44.712},{"x":0.1234,"dx":0.0054,"y":9.5135},{"x":0.1288,"dx":0.0054,"y":5.6214},{"x":0.1341,"dx":0.0054,"y":2.5479},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:30.696Z"),"step":202,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":5.2139},{"x":0.0752,"dx":0.0054,"y":22.6865},{"x":0.0805,"dx":0.0054,"y":37.4077},{"x":0.0859,"dx":0.0054,"y":57.6124},{"x":0.0913,"dx":0.0054,"y":62.0743},{"x":0.0966,"dx":0.0054,"y":64.4614},{"x":0.102,"dx":0.0054,"y":69.1481},{"x":0.1073,"dx":0.0054,"y":69.5186},{"x":0.1127,"dx":0.0054,"y":44.2364},{"x":0.1181,"dx":0.0054,"y":44.2364},{"x":0.1234,"dx":0.0054,"y":11.4129},{"x":0.1288,"dx":0.0054,"y":7.7835},{"x":0.1341,"dx":0.0054,"y":3.439},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:14:39.713Z"),"step":224,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0},{"x":0.0645,"dx":0.0054,"y":0},{"x":0.0698,"dx":0.0054,"y":5.9588},{"x":0.0752,"dx":0.0054,"y":21.5483},{"x":0.0805,"dx":0.0054,"y":37.556},{"x":0.0859,"dx":0.0054,"y":65.2096},{"x":0.0913,"dx":0.0054,"y":61.7226},{"x":0.0966,"dx":0.0054,"y":59.857},{"x":0.102,"dx":0.0054,"y":65.4045},{"x":0.1073,"dx":0.0054,"y":65.8728},{"x":0.1127,"dx":0.0054,"y":46.6147},{"x":0.1181,"dx":0.0054,"y":46.6147},{"x":0.1234,"dx":0.0054,"y":12.0391},{"x":0.1288,"dx":0.0054,"y":8.2159},{"x":0.1341,"dx":0.0054,"y":3.3861},{"x":0.1395,"dx":0.0054,"y":0},{"x":0.1449,"dx":0.0054,"y":0},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:15:16.226Z"),"step":309,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0.134},{"x":0.0645,"dx":0.0054,"y":0.8427},{"x":0.0698,"dx":0.0054,"y":13.4305},{"x":0.0752,"dx":0.0054,"y":25.0288},{"x":0.0805,"dx":0.0054,"y":37.6034},{"x":0.0859,"dx":0.0054,"y":60.7779},{"x":0.0913,"dx":0.0054,"y":61.3028},{"x":0.0966,"dx":0.0054,"y":61.5837},{"x":0.102,"dx":0.0054,"y":57.9013},{"x":0.1073,"dx":0.0054,"y":57.5244},{"x":0.1127,"dx":0.0054,"y":46.6147},{"x":0.1181,"dx":0.0054,"y":46.6147},{"x":0.1234,"dx":0.0054,"y":13.9859},{"x":0.1288,"dx":0.0054,"y":10.378},{"x":0.1341,"dx":0.0054,"y":4.7394},{"x":0.1395,"dx":0.0054,"y":0.7862},{"x":0.1449,"dx":0.0054,"y":0.7516},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:15:47.102Z"),"step":377,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0.67},{"x":0.0645,"dx":0.0054,"y":4.2133},{"x":0.0698,"dx":0.0054,"y":17.9929},{"x":0.0752,"dx":0.0054,"y":30.2753},{"x":0.0805,"dx":0.0054,"y":39.6941},{"x":0.0859,"dx":0.0054,"y":51.2814},{"x":0.0913,"dx":0.0054,"y":57.993},{"x":0.0966,"dx":0.0054,"y":61.5837},{"x":0.102,"dx":0.0054,"y":56.9449},{"x":0.1073,"dx":0.0054,"y":56.4756},{"x":0.1127,"dx":0.0054,"y":44.712},{"x":0.1181,"dx":0.0054,"y":44.712},{"x":0.1234,"dx":0.0054,"y":15.3539},{"x":0.1288,"dx":0.0054,"y":12.1077},{"x":0.1341,"dx":0.0054,"y":5.2212},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:16:13.835Z"),"step":433,"bins":[{"x":0.0537,"dx":0.0054,"y":0},{"x":0.0591,"dx":0.0054,"y":0.9381},{"x":0.0645,"dx":0.0054,"y":5.8986},{"x":0.0698,"dx":0.0054,"y":14.3154},{"x":0.0752,"dx":0.0054,"y":32.7152},{"x":0.0805,"dx":0.0054,"y":43.8322},{"x":0.0859,"dx":0.0054,"y":50.6483},{"x":0.0913,"dx":0.0054,"y":56.6475},{"x":0.0966,"dx":0.0054,"y":59.857},{"x":0.102,"dx":0.0054,"y":59.1875},{"x":0.1073,"dx":0.0054,"y":59.0805},{"x":0.1127,"dx":0.0054,"y":43.285},{"x":0.1181,"dx":0.0054,"y":43.285},{"x":0.1234,"dx":0.0054,"y":14.0438},{"x":0.1288,"dx":0.0054,"y":10.8105},{"x":0.1341,"dx":0.0054,"y":4.6865},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3758},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:16:18.632Z"),"step":445,"bins":[{"x":0.0537,"dx":0.0054,"y":0.2205},{"x":0.0591,"dx":0.0054,"y":1.5836},{"x":0.0645,"dx":0.0054,"y":5.056},{"x":0.0698,"dx":0.0054,"y":18.0162},{"x":0.0752,"dx":0.0054,"y":32.1331},{"x":0.0805,"dx":0.0054,"y":41.2513},{"x":0.0859,"dx":0.0054,"y":48.7489},{"x":0.0913,"dx":0.0054,"y":57.1104},{"x":0.0966,"dx":0.0054,"y":61.5837},{"x":0.102,"dx":0.0054,"y":57.9013},{"x":0.1073,"dx":0.0054,"y":57.5178},{"x":0.1127,"dx":0.0054,"y":44.2364},{"x":0.1181,"dx":0.0054,"y":44.2364},{"x":0.1234,"dx":0.0054,"y":13.7491},{"x":0.1288,"dx":0.0054,"y":10.378},{"x":0.1341,"dx":0.0054,"y":4.5083},{"x":0.1395,"dx":0.0054,"y":0.3931},{"x":0.1449,"dx":0.0054,"y":0.3973},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:36.297Z"),"step":484,"bins":[{"x":0.0537,"dx":0.0054,"y":0.441},{"x":0.0591,"dx":0.0054,"y":3.3011},{"x":0.0645,"dx":0.0054,"y":10.9546},{"x":0.0698,"dx":0.0054,"y":13.7105},{"x":0.0752,"dx":0.0054,"y":32.9245},{"x":0.0805,"dx":0.0054,"y":43.1978},{"x":0.0859,"dx":0.0054,"y":45.5834},{"x":0.0913,"dx":0.0054,"y":55.2572},{"x":0.0966,"dx":0.0054,"y":60.4326},{"x":0.102,"dx":0.0054,"y":53.4983},{"x":0.1073,"dx":0.0054,"y":52.8206},{"x":0.1127,"dx":0.0054,"y":43.7607},{"x":0.1181,"dx":0.0054,"y":43.7607},{"x":0.1234,"dx":0.0054,"y":15.6486},{"x":0.1288,"dx":0.0054,"y":12.5401},{"x":0.1341,"dx":0.0054,"y":6.5549},{"x":0.1395,"dx":0.0054,"y":2.3586},{"x":0.1449,"dx":0.0054,"y":2.2763},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:41.053Z"),"step":496,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.5922},{"x":0.0645,"dx":0.0054,"y":9.2693},{"x":0.0698,"dx":0.0054,"y":14.4087},{"x":0.0752,"dx":0.0054,"y":31.3218},{"x":0.0805,"dx":0.0054,"y":41.9331},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":53.5815},{"x":0.0966,"dx":0.0054,"y":55.8282},{"x":0.102,"dx":0.0054,"y":55.0152},{"x":0.1073,"dx":0.0054,"y":54.901},{"x":0.1127,"dx":0.0054,"y":41.3824},{"x":0.1181,"dx":0.0054,"y":41.3824},{"x":0.1234,"dx":0.0054,"y":18.1373},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":7.5713},{"x":0.1395,"dx":0.0054,"y":1.9655},{"x":0.1449,"dx":0.0054,"y":1.9005},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:41.186Z"),"step":497,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.4581},{"x":0.0645,"dx":0.0054,"y":8.4266},{"x":0.0698,"dx":0.0054,"y":15.1302},{"x":0.0752,"dx":0.0054,"y":31.577},{"x":0.0805,"dx":0.0054,"y":42.2256},{"x":0.0859,"dx":0.0054,"y":50.6483},{"x":0.0913,"dx":0.0054,"y":53.2729},{"x":0.0966,"dx":0.0054,"y":54.6771},{"x":0.102,"dx":0.0054,"y":53.4815},{"x":0.1073,"dx":0.0054,"y":53.3397},{"x":0.1127,"dx":0.0054,"y":42.8094},{"x":0.1181,"dx":0.0054,"y":42.8094},{"x":0.1234,"dx":0.0054,"y":18.6688},{"x":0.1288,"dx":0.0054,"y":15.9995},{"x":0.1341,"dx":0.0054,"y":7.5184},{"x":0.1395,"dx":0.0054,"y":1.5724},{"x":0.1449,"dx":0.0054,"y":1.5247},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:16:49.690Z"),"step":513,"bins":[{"x":0.0537,"dx":0.0054,"y":1.4385},{"x":0.0591,"dx":0.0054,"y":3.8126},{"x":0.0645,"dx":0.0054,"y":9.2693},{"x":0.0698,"dx":0.0054,"y":15.8984},{"x":0.0752,"dx":0.0054,"y":33.6899},{"x":0.0805,"dx":0.0054,"y":44.0753},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":51.3318},{"x":0.0966,"dx":0.0054,"y":52.3749},{"x":0.102,"dx":0.0054,"y":57.1094},{"x":0.1073,"dx":0.0054,"y":57.5073},{"x":0.1127,"dx":0.0054,"y":40.4311},{"x":0.1181,"dx":0.0054,"y":40.4311},{"x":0.1234,"dx":0.0054,"y":18.0426},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":6.878},{"x":0.1395,"dx":0.0054,"y":0.7862},{"x":0.1449,"dx":0.0054,"y":0.7731},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:07.617Z"),"step":551,"bins":[{"x":0.0537,"dx":0.0054,"y":0.441},{"x":0.0591,"dx":0.0054,"y":3.4351},{"x":0.0645,"dx":0.0054,"y":11.7972},{"x":0.0698,"dx":0.0054,"y":21.1823},{"x":0.0752,"dx":0.0054,"y":30.8315},{"x":0.0805,"dx":0.0054,"y":38.4273},{"x":0.0859,"dx":0.0054,"y":48.1158},{"x":0.0913,"dx":0.0054,"y":49.7656},{"x":0.0966,"dx":0.0054,"y":50.6483},{"x":0.102,"dx":0.0054,"y":56.0044},{"x":0.1073,"dx":0.0054,"y":56.4716},{"x":0.1127,"dx":0.0054,"y":43.285},{"x":0.1181,"dx":0.0054,"y":43.285},{"x":0.1234,"dx":0.0054,"y":19.1055},{"x":0.1288,"dx":0.0054,"y":16.4319},{"x":0.1341,"dx":0.0054,"y":7.4655},{"x":0.1395,"dx":0.0054,"y":1.1793},{"x":0.1449,"dx":0.0054,"y":1.1489},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:17.407Z"),"step":577,"bins":[{"x":0.0537,"dx":0.0054,"y":0.6614},{"x":0.0591,"dx":0.0054,"y":4.3487},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":15.2469},{"x":0.0752,"dx":0.0054,"y":32.5059},{"x":0.0805,"dx":0.0054,"y":42.1267},{"x":0.0859,"dx":0.0054,"y":45.5834},{"x":0.0913,"dx":0.0054,"y":48.883},{"x":0.0966,"dx":0.0054,"y":50.6483},{"x":0.102,"dx":0.0054,"y":58.3955},{"x":0.1073,"dx":0.0054,"y":59.0752},{"x":0.1127,"dx":0.0054,"y":41.3824},{"x":0.1181,"dx":0.0054,"y":41.3824},{"x":0.1234,"dx":0.0054,"y":19.3054},{"x":0.1288,"dx":0.0054,"y":16.8643},{"x":0.1341,"dx":0.0054,"y":7.8748},{"x":0.1395,"dx":0.0054,"y":1.5724},{"x":0.1449,"dx":0.0054,"y":1.5032},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:17:21.105Z"),"step":581,"bins":[{"x":0.0537,"dx":0.0054,"y":0.6614},{"x":0.0591,"dx":0.0054,"y":4.4827},{"x":0.0645,"dx":0.0054,"y":13.4826},{"x":0.0698,"dx":0.0054,"y":15.2702},{"x":0.0752,"dx":0.0054,"y":30.6481},{"x":0.0805,"dx":0.0054,"y":40.862},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":48.3322},{"x":0.0966,"dx":0.0054,"y":47.7705},{"x":0.102,"dx":0.0054,"y":58.6263},{"x":0.1073,"dx":0.0054,"y":59.6023},{"x":0.1127,"dx":0.0054,"y":43.285},{"x":0.1181,"dx":0.0054,"y":43.285},{"x":0.1234,"dx":0.0054,"y":18.3268},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":7.3402},{"x":0.1395,"dx":0.0054,"y":1.5724},{"x":0.1449,"dx":0.0054,"y":1.5032},{"x":0.1502,"dx":0.0054,"y":0},{"x":0.1556,"dx":0.0054,"y":0}]},{"wall_time":new Date("2016-06-24T04:17:30.677Z"),"step":602,"bins":[{"x":0.0537,"dx":0.0054,"y":0.441},{"x":0.0591,"dx":0.0054,"y":3.5692},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":16.7365},{"x":0.0752,"dx":0.0054,"y":31.1584},{"x":0.0805,"dx":0.0054,"y":40.4233},{"x":0.0859,"dx":0.0054,"y":47.4827},{"x":0.0913,"dx":0.0054,"y":46.9203},{"x":0.0966,"dx":0.0054,"y":46.6194},{"x":0.102,"dx":0.0054,"y":57.0926},{"x":0.1073,"dx":0.0054,"y":58.0436},{"x":0.1127,"dx":0.0054,"y":45.6633},{"x":0.1181,"dx":0.0054,"y":45.6633},{"x":0.1234,"dx":0.0054,"y":18.5636},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":7.8024},{"x":0.1395,"dx":0.0054,"y":2.3586},{"x":0.1449,"dx":0.0054,"y":2.2763},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:30.960Z"),"step":604,"bins":[{"x":0.0537,"dx":0.0054,"y":0.6614},{"x":0.0591,"dx":0.0054,"y":4.0807},{"x":0.0645,"dx":0.0054,"y":10.9546},{"x":0.0698,"dx":0.0054,"y":17.4347},{"x":0.0752,"dx":0.0054,"y":31.878},{"x":0.0805,"dx":0.0054,"y":40.8126},{"x":0.0859,"dx":0.0054,"y":46.8496},{"x":0.0913,"dx":0.0054,"y":46.6997},{"x":0.0966,"dx":0.0054,"y":46.6194},{"x":0.102,"dx":0.0054,"y":57.0926},{"x":0.1073,"dx":0.0054,"y":58.0423},{"x":0.1127,"dx":0.0054,"y":45.1877},{"x":0.1181,"dx":0.0054,"y":45.1877},{"x":0.1234,"dx":0.0054,"y":18.5162},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":8.0335},{"x":0.1395,"dx":0.0054,"y":2.7518},{"x":0.1449,"dx":0.0054,"y":2.6521},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:17:45.074Z"),"step":637,"bins":[{"x":0.0537,"dx":0.0054,"y":1.1024},{"x":0.0591,"dx":0.0054,"y":4.8356},{"x":0.0645,"dx":0.0054,"y":5.8986},{"x":0.0698,"dx":0.0054,"y":20.2741},{"x":0.0752,"dx":0.0054,"y":34.292},{"x":0.0805,"dx":0.0054,"y":41.5418},{"x":0.0859,"dx":0.0054,"y":43.051},{"x":0.0913,"dx":0.0054,"y":48.0004},{"x":0.0966,"dx":0.0054,"y":50.6483},{"x":0.102,"dx":0.0054,"y":56.0044},{"x":0.1073,"dx":0.0054,"y":56.4862},{"x":0.1127,"dx":0.0054,"y":48.5173},{"x":0.1181,"dx":0.0054,"y":48.5173},{"x":0.1234,"dx":0.0054,"y":15.7328},{"x":0.1288,"dx":0.0054,"y":12.1077},{"x":0.1341,"dx":0.0054,"y":6.6077},{"x":0.1395,"dx":0.0054,"y":2.7518},{"x":0.1449,"dx":0.0054,"y":2.6521},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:18:17.117Z"),"step":702,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.3241},{"x":0.0645,"dx":0.0054,"y":7.5839},{"x":0.0698,"dx":0.0054,"y":20.3208},{"x":0.0752,"dx":0.0054,"y":36.1498},{"x":0.0805,"dx":0.0054,"y":44.7076},{"x":0.0859,"dx":0.0054,"y":47.4827},{"x":0.0913,"dx":0.0054,"y":46.1704},{"x":0.0966,"dx":0.0054,"y":45.4683},{"x":0.102,"dx":0.0054,"y":50.2984},{"x":0.1073,"dx":0.0054,"y":50.748},{"x":0.1127,"dx":0.0054,"y":48.993},{"x":0.1181,"dx":0.0054,"y":48.993},{"x":0.1234,"dx":0.0054,"y":17.727},{"x":0.1288,"dx":0.0054,"y":14.2698},{"x":0.1341,"dx":0.0054,"y":7.961},{"x":0.1395,"dx":0.0054,"y":3.538},{"x":0.1449,"dx":0.0054,"y":3.4037},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:18:21.750Z"),"step":714,"bins":[{"x":0.0537,"dx":0.0054,"y":0.8819},{"x":0.0591,"dx":0.0054,"y":4.7262},{"x":0.0645,"dx":0.0054,"y":10.1119},{"x":0.0698,"dx":0.0054,"y":19.6459},{"x":0.0752,"dx":0.0054,"y":35.4302},{"x":0.0805,"dx":0.0054,"y":44.3183},{"x":0.0859,"dx":0.0054,"y":48.1158},{"x":0.0913,"dx":0.0054,"y":46.3911},{"x":0.0966,"dx":0.0054,"y":45.4683},{"x":0.102,"dx":0.0054,"y":50.2984},{"x":0.1073,"dx":0.0054,"y":50.7374},{"x":0.1127,"dx":0.0054,"y":45.1877},{"x":0.1181,"dx":0.0054,"y":45.1877},{"x":0.1234,"dx":0.0054,"y":19.6843},{"x":0.1288,"dx":0.0054,"y":16.8643},{"x":0.1341,"dx":0.0054,"y":9.0303},{"x":0.1395,"dx":0.0054,"y":3.538},{"x":0.1449,"dx":0.0054,"y":3.4037},{"x":0.1502,"dx":0.0054,"y":0.4892},{"x":0.1556,"dx":0.0054,"y":0.4892}]},{"wall_time":new Date("2016-06-24T04:18:40.691Z"),"step":758,"bins":[{"x":0.0537,"dx":0.0054,"y":1.2181},{"x":0.0591,"dx":0.0054,"y":3.4351},{"x":0.0645,"dx":0.0054,"y":11.7972},{"x":0.0698,"dx":0.0054,"y":19.6926},{"x":0.0752,"dx":0.0054,"y":34.0368},{"x":0.0805,"dx":0.0054,"y":43.0042},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":44.9576},{"x":0.0966,"dx":0.0054,"y":42.5906},{"x":0.102,"dx":0.0054,"y":52.9203},{"x":0.1073,"dx":0.0054,"y":53.8615},{"x":0.1127,"dx":0.0054,"y":42.8094},{"x":0.1181,"dx":0.0054,"y":42.8094},{"x":0.1234,"dx":0.0054,"y":21.005},{"x":0.1288,"dx":0.0054,"y":18.594},{"x":0.1341,"dx":0.0054,"y":9.5121},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0495},{"x":0.1502,"dx":0.0054,"y":0.9785},{"x":0.1556,"dx":0.0054,"y":0.9785}]},{"wall_time":new Date("2016-06-24T04:18:44.566Z"),"step":762,"bins":[{"x":0.0537,"dx":0.0054,"y":1.2181},{"x":0.0591,"dx":0.0054,"y":3.5692},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":18.9711},{"x":0.0752,"dx":0.0054,"y":34.7106},{"x":0.0805,"dx":0.0054,"y":43.929},{"x":0.0859,"dx":0.0054,"y":48.7489},{"x":0.0913,"dx":0.0054,"y":43.6121},{"x":0.0966,"dx":0.0054,"y":40.8639},{"x":0.102,"dx":0.0054,"y":53.25},{"x":0.1073,"dx":0.0054,"y":54.3819},{"x":0.1127,"dx":0.0054,"y":42.3337},{"x":0.1181,"dx":0.0054,"y":42.3337},{"x":0.1234,"dx":0.0054,"y":21.7363},{"x":0.1288,"dx":0.0054,"y":19.4588},{"x":0.1341,"dx":0.0054,"y":9.8685},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0495},{"x":0.1502,"dx":0.0054,"y":0.9785},{"x":0.1556,"dx":0.0054,"y":0.9785}]},{"wall_time":new Date("2016-06-24T04:18:48.972Z"),"step":771,"bins":[{"x":0.0537,"dx":0.0054,"y":1.4385},{"x":0.0591,"dx":0.0054,"y":4.4827},{"x":0.0645,"dx":0.0054,"y":13.4826},{"x":0.0698,"dx":0.0054,"y":17.5047},{"x":0.0752,"dx":0.0054,"y":34.2003},{"x":0.0805,"dx":0.0054,"y":43.3441},{"x":0.0859,"dx":0.0054,"y":46.2165},{"x":0.0913,"dx":0.0054,"y":43.1044},{"x":0.0966,"dx":0.0054,"y":41.4395},{"x":0.102,"dx":0.0054,"y":52.8213},{"x":0.1073,"dx":0.0054,"y":53.8641},{"x":0.1127,"dx":0.0054,"y":43.7607},{"x":0.1181,"dx":0.0054,"y":43.7607},{"x":0.1234,"dx":0.0054,"y":22.2678},{"x":0.1288,"dx":0.0054,"y":19.8912},{"x":0.1341,"dx":0.0054,"y":10.0467},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0495},{"x":0.1502,"dx":0.0054,"y":0.9785},{"x":0.1556,"dx":0.0054,"y":0.9785}]},{"wall_time":new Date("2016-06-24T04:19:18.102Z"),"step":836,"bins":[{"x":0.0537,"dx":0.0054,"y":1.8795},{"x":0.0591,"dx":0.0054,"y":6.4437},{"x":0.0645,"dx":0.0054,"y":16.0105},{"x":0.0698,"dx":0.0054,"y":18.3196},{"x":0.0752,"dx":0.0054,"y":30.2753},{"x":0.0805,"dx":0.0054,"y":39.2554},{"x":0.0859,"dx":0.0054,"y":49.3821},{"x":0.0913,"dx":0.0054,"y":44.5826},{"x":0.0966,"dx":0.0054,"y":42.015},{"x":0.102,"dx":0.0054,"y":53.349},{"x":0.1073,"dx":0.0054,"y":54.3793},{"x":0.1127,"dx":0.0054,"y":41.3824},{"x":0.1181,"dx":0.0054,"y":41.3824},{"x":0.1234,"dx":0.0054,"y":22.031},{"x":0.1288,"dx":0.0054,"y":19.8912},{"x":0.1341,"dx":0.0054,"y":10.0467},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.071},{"x":0.1502,"dx":0.0054,"y":1.4677},{"x":0.1556,"dx":0.0054,"y":1.4677}]},{"wall_time":new Date("2016-06-24T04:19:26.881Z"),"step":854,"bins":[{"x":0.0537,"dx":0.0054,"y":1.8795},{"x":0.0591,"dx":0.0054,"y":6.3097},{"x":0.0645,"dx":0.0054,"y":15.1679},{"x":0.0698,"dx":0.0054,"y":19.0411},{"x":0.0752,"dx":0.0054,"y":29.1371},{"x":0.0805,"dx":0.0054,"y":37.795},{"x":0.0859,"dx":0.0054,"y":50.0152},{"x":0.0913,"dx":0.0054,"y":45.1782},{"x":0.0966,"dx":0.0054,"y":42.5906},{"x":0.102,"dx":0.0054,"y":51.0074},{"x":0.1073,"dx":0.0054,"y":51.781},{"x":0.1127,"dx":0.0054,"y":45.1877},{"x":0.1181,"dx":0.0054,"y":45.1877},{"x":0.1234,"dx":0.0054,"y":20.8524},{"x":0.1288,"dx":0.0054,"y":18.1616},{"x":0.1341,"dx":0.0054,"y":9.796},{"x":0.1395,"dx":0.0054,"y":3.9311},{"x":0.1449,"dx":0.0054,"y":3.8226},{"x":0.1502,"dx":0.0054,"y":1.4677},{"x":0.1556,"dx":0.0054,"y":1.4677}]},{"wall_time":new Date("2016-06-24T04:20:06.833Z"),"step":947,"bins":[{"x":0.0537,"dx":0.0054,"y":3.6542},{"x":0.0591,"dx":0.0054,"y":6.8212},{"x":0.0645,"dx":0.0054,"y":13.4826},{"x":0.0698,"dx":0.0054,"y":15.2702},{"x":0.0752,"dx":0.0054,"y":32.0414},{"x":0.0805,"dx":0.0054,"y":41.1524},{"x":0.0859,"dx":0.0054,"y":43.6841},{"x":0.0913,"dx":0.0054,"y":43.7216},{"x":0.0966,"dx":0.0054,"y":43.7417},{"x":0.102,"dx":0.0054,"y":46.8023},{"x":0.1073,"dx":0.0054,"y":47.089},{"x":0.1127,"dx":0.0054,"y":46.6147},{"x":0.1181,"dx":0.0054,"y":46.6147},{"x":0.1234,"dx":0.0054,"y":24.8881},{"x":0.1288,"dx":0.0054,"y":22.4857},{"x":0.1341,"dx":0.0054,"y":11.116},{"x":0.1395,"dx":0.0054,"y":3.1449},{"x":0.1449,"dx":0.0054,"y":3.0926},{"x":0.1502,"dx":0.0054,"y":1.9569},{"x":0.1556,"dx":0.0054,"y":1.9569}]},{"wall_time":new Date("2016-06-24T04:20:20.058Z"),"step":974,"bins":[{"x":0.0537,"dx":0.0054,"y":3.5385},{"x":0.0591,"dx":0.0054,"y":9.0258},{"x":0.0645,"dx":0.0054,"y":12.6399},{"x":0.0698,"dx":0.0054,"y":17.4814},{"x":0.0752,"dx":0.0054,"y":30.9491},{"x":0.0805,"dx":0.0054,"y":39.7415},{"x":0.0859,"dx":0.0054,"y":46.8496},{"x":0.0913,"dx":0.0054,"y":42.9501},{"x":0.0966,"dx":0.0054,"y":40.8639},{"x":0.102,"dx":0.0054,"y":51.8154},{"x":0.1073,"dx":0.0054,"y":52.8153},{"x":0.1127,"dx":0.0054,"y":41.8581},{"x":0.1181,"dx":0.0054,"y":41.8581},{"x":0.1234,"dx":0.0054,"y":22.8571},{"x":0.1288,"dx":0.0054,"y":20.7561},{"x":0.1341,"dx":0.0054,"y":11.0964},{"x":0.1395,"dx":0.0054,"y":4.3242},{"x":0.1449,"dx":0.0054,"y":4.22},{"x":0.1502,"dx":0.0054,"y":1.9569},{"x":0.1556,"dx":0.0054,"y":1.9569}]},{"wall_time":new Date("2016-06-24T04:20:29.637Z"),"step":999,"bins":[{"x":0.0537,"dx":0.0054,"y":5.2083},{"x":0.0591,"dx":0.0054,"y":6.5532},{"x":0.0645,"dx":0.0054,"y":11.7972},{"x":0.0698,"dx":0.0054,"y":18.9477},{"x":0.0752,"dx":0.0054,"y":30.5305},{"x":0.0805,"dx":0.0054,"y":39.1091},{"x":0.0859,"dx":0.0054,"y":48.7489},{"x":0.0913,"dx":0.0054,"y":39.4876},{"x":0.0966,"dx":0.0054,"y":34.5329},{"x":0.102,"dx":0.0054,"y":55.0967},{"x":0.1073,"dx":0.0054,"y":57},{"x":0.1127,"dx":0.0054,"y":45.6633},{"x":0.1181,"dx":0.0054,"y":45.6633},{"x":0.1234,"dx":0.0054,"y":18.5636},{"x":0.1288,"dx":0.0054,"y":15.567},{"x":0.1341,"dx":0.0054,"y":10.3444},{"x":0.1395,"dx":0.0054,"y":6.6828},{"x":0.1449,"dx":0.0054,"y":6.4532},{"x":0.1502,"dx":0.0054,"y":1.4677},{"x":0.1556,"dx":0.0054,"y":1.4677}]}];
-    </script>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/index.html b/tensorflow/tensorboard/components/vz_histogram_timeseries/index.html
deleted file mode 100644
index 20a157ea0e..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <title>vz-histogram-timeseries</title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="../webcomponentsjs/webcomponents-lite.js"></script>
-    <link rel="import" href="../iron-component-page/iron-component-page.html">
-  </head>
-  <body>
-    <iron-component-page src="vz-histogram-timeseries.html"></iron-component-page>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries/vz-histogram-timeseries.html b/tensorflow/tensorboard/components/vz_histogram_timeseries/vz-histogram-timeseries.html
deleted file mode 100644
index 545a762cd7..0000000000
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries/vz-histogram-timeseries.html
+++ /dev/null
@@ -1,709 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-imports/d3.html">
-
-<!--
-vz-histogram-timeseries creates an element that draws beautiful histograms for
-displaying how data is distributed over time.
-
-This histogram supports changing the time axis type and different modes of
-visualization.
-
-@element vz-histogram-timeseries
-@demo demo/index.html
--->
-<dom-module id="vz-histogram-timeseries">
-    <template>
-      <div id="tooltip"><span></span></div>
-      <svg id="svg">
-        <g>
-          <g class="axis x"></g>
-          <g class="axis y"></g>
-          <g class="axis y slice"></g>
-          <g class="stage">
-            <rect class="background"></rect>
-          </g>
-          <g class="x-axis-hover"></g>
-          <g class="y-axis-hover"></g>
-          <g class="y-slice-axis-hover"></g>
-        </g>
-      </svg>
-
-      <style>
-        :host {
-          display: flex;
-          flex-direction: column;
-          flex-grow: 1;
-          flex-shrink: 1;
-          position: relative;
-        }
-
-        svg {
-          font-family: roboto, sans-serif;
-          overflow: visible;
-          display: block;
-          width: 100%;
-          flex-grow: 1;
-          flex-shrink: 1;
-        }
-
-        #tooltip {
-          position: absolute;
-          display: block;
-          opacity: 0;
-          font-weight: bold;
-          font-size: 11px;
-        }
-
-        .background {
-          fill-opacity: 0;
-          fill: red;
-        }
-
-        .histogram {
-          pointer-events: none;
-        }
-
-        .hover {
-          font-size: 9px;
-          dominant-baseline: middle;
-          opacity: 0;
-        }
-
-        .hover circle {
-          stroke: white;
-          stroke-opacity: 0.5;
-          stroke-width: 1px;
-        }
-
-        .hover text {
-          fill: black;
-          opacity: 0;
-        }
-
-        .hover.hover-closest circle {
-          fill: black!important;
-        }
-
-        .hover.hover-closest text {
-          opacity: 1;
-        }
-
-        .baseline {
-          stroke: black;
-          stroke-opacity: 0.1;
-        }
-
-        .outline {
-          fill: none;
-          stroke: white;
-          stroke-opacity: 0.5;
-        }
-
-        .outline.outline-hover {
-          stroke: black!important;
-          stroke-opacity: 1;
-        }
-
-        .x-axis-hover,
-        .y-axis-hover,
-        .y-slice-axis-hover {
-          pointer-events: none;
-        }
-
-        .x-axis-hover .label,
-        .y-axis-hover .label,
-        .y-slice-axis-hover .label {
-          opacity: 0;
-          font-weight: bold;
-          font-size: 11px;
-          text-anchor: end;
-        }
-
-        .x-axis-hover text {
-          text-anchor: middle;
-        }
-
-        .y-axis-hover text,
-        .y-slice-axis-hover text {
-          text-anchor: start;
-        }
-
-        .x-axis-hover line,
-        .y-axis-hover line,
-        .y-slice-axis-hover line {
-          stroke: black;
-        }
-
-        .x-axis-hover rect,
-        .y-axis-hover rect,
-        .y-slice-axis-hover rect {
-          fill: white;
-        }
-
-        .axis {
-          font-size: 10px;
-          fill: #aaa;
-        }
-
-        .axis path.domain {
-          fill: none;
-        }
-
-        .axis .tick line {
-          stroke: #ddd;
-        }
-
-        .axis.slice {
-          opacity: 0;
-        }
-
-        .axis.slice .tick line {
-          stroke-dasharray: 2;
-        }
-
-        .small .axis text { display: none; }
-        .small .axis .tick:first-of-type text { display: block; }
-        .small .axis .tick:last-of-type text { display: block; }
-        .medium .axis text { display: none; }
-        .medium .axis .tick:nth-child(2n + 1) text { display: block; }
-        .large .axis text { display: none; }
-        .large .axis .tick:nth-child(2n + 1) text { display: block; }
-
-      </style>
-    </template>
-
-    <script>
-    Polymer({
-      is: "vz-histogram-timeseries",
-      properties: {
-        /**
-         * Defines which view mode is being used by the chart. Supported values
-         * are:
-         * - "offset" - Offset view of the data showing all timesteps.
-         * - "overlay" - Overlays all timesteps into one 2D view, with the
-         * brighter lines representing the newer timesteps.
-         */
-        mode: {
-          type: String,
-          value: "offset"
-        },
-
-        /*
-         * The name of the datum's property that contains the time values.
-         * Allows:
-         * - "step" - Linear scale using the "step" property of the datum.
-         * - "wall_time" - Temporal scale using the "wall_time" property of the
-         * datum.
-         * - "relative" - Temporal scale starting at 0 created by using
-         * the "wall_time" property of the datum.
-         */
-        timeProperty: {
-          type: String,
-          value: "step"
-        },
-
-        /**
-         * The name of the data's property that contains the bins.
-         */
-        bins: {
-          type: String,
-          value: "bins"
-        },
-
-        /**
-         * The name of the datum's property that contains the x values.
-         */
-        x: {
-          type: String,
-          value: "x"
-        },
-
-        /**
-         * The name of the datum's property that contains the bin width values.
-         */
-        dx: {
-          type: String,
-          value: "dx"
-        },
-
-        /**
-         * The name of the datum's property that contains the bin height.
-         */
-        y: {
-          type: String,
-          value: "y"
-        },
-
-        /**
-         * Scale that maps series names to colors. The default colors are from
-         * d3.scale.category10() scale. Use this property to replace the default
-         * line colors with colors of your own choice.
-         */
-        colorScale: {
-          type: Object,
-          value: function() {
-            return d3.scale.category10();
-          }
-        },
-
-        /**
-         * Duration of the transition between histogram modes.
-         */
-        modeTransitionDuration: {
-          type: Number,
-          value: 500
-        },
-
-        _attached: Boolean,
-        _name: { type: String, value: null },
-        _data: { type: Array, value: null },
-      },
-      observers: [
-        'redraw(timeProperty, _attached)',
-        '_modeRedraw(mode)'
-      ],
-      ready: function() {
-        // Polymer's way of scoping styles on nodes that d3 created
-        this.scopeSubtree(this.$.svg, true);
-      },
-      attached: function() {
-        this._attached = true;
-      },
-      detached: function() {
-        this._attached = false;
-      },
-      setVisibleSeries: function(names) {
-        // Do nothing.
-      },
-      setSeriesData: function(name, data) {
-        this._name = name;
-        this._data = data;
-        this.redraw();
-      },
-
-      /**
-       * Redraws the chart. This is only called if the chart is attached to the
-       * screen and if the chart has data.
-       */
-      redraw: function() {
-        this._draw(0);
-      },
-
-      _modeRedraw: function() {
-        this._draw(this.modeTransitionDuration);
-      },
-
-      _draw: function(duration) {
-        if (!this._attached || !this._data) {
-          return;
-        }
-
-        //
-        // Data verification
-        //
-        if (duration === undefined) throw(new Error("vz-histogram-timeseries _draw needs duration"));
-        if (this._data.length <= 0) throw(new Error("Not enough steps in the data"));
-        if (!this._data[0].hasOwnProperty(this.bins)) throw(new Error("No bins property of '" + this.bins + "' in data"));
-        if (this._data[0][this.bins].length <= 0) throw(new Error("Must have at least one bin in bins in data"));
-        if (!this._data[0][this.bins][0].hasOwnProperty(this.x)) throw(new Error("No x property '" + this.x + "' on bins data"));
-        if (!this._data[0][this.bins][0].hasOwnProperty(this.dx)) throw(new Error("No dx property '" + this.dx + "' on bins data"));
-        if (!this._data[0][this.bins][0].hasOwnProperty(this.y)) throw(new Error("No y property '" + this.y + "' on bins data"));
-
-        //
-        // Initialization
-        //
-        var timeProp = this.timeProperty;
-        var xProp = this.x;
-        var binsProp = this.bins;
-        var dxProp = this.dx;
-        var yProp = this.y;
-
-        var data = this._data;
-        var name = this._name;
-        var mode = this.mode;
-        var color = d3.hcl(this.colorScale(name));
-        var tooltip = d3.select(this.$.tooltip);
-
-        var xAccessor = function(d) { return d[xProp] };
-        var yAccessor = function(d) { return d[yProp] };
-        var dxAccessor = function(d) { return d[dxProp] };
-        var xRightAccessor = function(d) { return d[xProp] + d[dxProp] };
-        var timeAccessor = function(d) { return d[timeProp] };
-
-        if (timeProp === "relative") {
-          timeAccessor = function(d) { return d.wall_time - data[0].wall_time };
-        }
-
-        var brect = this.$.svg.getBoundingClientRect();
-        var outerWidth = brect.width,
-            outerHeight = brect.height;
-
-        var sliceHeight,
-            margin = {top: 5, right: 60, bottom: 20, left: 24};
-
-        if (mode === "offset") {
-          sliceHeight = outerHeight / 2.5;
-          margin.top = sliceHeight + 5;
-        } else {
-          sliceHeight = outerHeight - margin.top - margin.bottom;
-        }
-
-        var width = outerWidth - margin.left - margin.right,
-            height = outerHeight - margin.top - margin.bottom;
-
-        var leftMin = d3.min(data, xAccessor),
-            rightMax = d3.max(data, xRightAccessor);
-
-        //
-        // Text formatters
-        //
-        var format = d3.format(".3n");
-        var yAxisFormat = d3.format(".0f");
-
-        if (timeProp === "wall_time") {
-          yAxisFormat = d3.time.format("%m/%d %X");
-        } else if (timeProp === "relative") {
-          yAxisFormat = function(d) {
-            return d3.format(".1r")(d / 3.6e6) + 'h'; // Convert to hours.
-          };
-        }
-
-        //
-        // Calculate the extents
-        //
-        var xExtents = data.map(function(d, i) {
-          return [
-            d3.min(d[binsProp], xAccessor),
-            d3.max(d[binsProp], xRightAccessor)
-          ];
-        });
-        var yExtents = data.map(function(d) {
-          return d3.extent(d[binsProp], yAccessor);
-        });
-
-        //
-        // Scales and axis
-        //
-        var outlineCanvasSize = 500;
-
-        var extent = d3.extent(data, timeAccessor);
-
-        var yScale = (timeProp === "wall_time" ? d3.time.scale() : d3.scale.linear())
-            .domain(extent)
-            .range([0, (mode === "offset" ? height : 0)]);
-
-        var ySliceScale = d3.scale.linear()
-            .domain([0, d3.max(data, function(d, i) { return yExtents[i][1]; })])
-            .range([sliceHeight, 0]);
-
-        var yLineScale = d3.scale.linear()
-            .domain(ySliceScale.domain())
-            .range([outlineCanvasSize, 0]);
-
-        var xScale = d3.scale.linear()
-            .domain([
-              d3.min(data, function(d, i) { return xExtents[i][0]; }),
-              d3.max(data, function(d, i) { return xExtents[i][1]; })
-            ])
-            .nice()
-            .range([0, width]);
-
-        var xLineScale = d3.scale.linear()
-            .domain(xScale.domain())
-            .range([0, outlineCanvasSize]);
-
-        var outlineColor = d3.scale.linear()
-            .domain(d3.extent(data, timeAccessor))
-            .range([color.darker(), color.brighter()])
-            .interpolate(d3.interpolateHcl);
-
-        var xAxis = d3.svg.axis()
-            .scale(xScale)
-            .ticks(Math.max(2, width / 20))
-            .orient("bottom");
-
-        var yAxis = d3.svg.axis()
-            .scale(yScale)
-            .ticks(Math.max(2, height / 15))
-            .tickFormat(yAxisFormat)
-            .orient("right");
-
-        var ySliceAxis = d3.svg.axis()
-            .scale(ySliceScale)
-            .ticks(Math.max(2, height / 15))
-            .tickSize(width + 5)
-            .tickFormat(format)
-            .orient("right");
-
-        var xBinCentroid = function(d) {
-          return d[xProp] + d[dxProp] / 2;
-        };
-
-        var linePath = d3.svg.line()
-            .interpolate("linear")
-            .x(function(d) { return xLineScale(xBinCentroid(d)); })
-            .y(function(d) { return yLineScale(d[yProp]); });
-
-        var path = function(d) {
-          // Draw a line from 0 to the first point and from the last point to 0.
-          return 'M' + xLineScale(xBinCentroid(d[0])) + ',' + yLineScale(0) +
-              'L' + linePath(d).slice(1) +
-              "L" + xLineScale(xBinCentroid(d[d.length - 1])) + "," + yLineScale(0);
-        };
-
-        //
-        // Render
-        //
-        var svgNode = this.$.svg;
-
-        var svg = d3.select(svgNode)
-
-        var svgTransition = svg.transition().duration(duration);
-
-        var g = svg.select("g")
-            .classed("small", function() { return (width > 0 && width <= 150); })
-            .classed("medium", function() { return (width > 150 && width <= 300); })
-            .classed("large", function() { return (width > 300); })
-
-        var gTransition = svgTransition.select("g")
-            .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-
-        var bisect = d3.bisector(xRightAccessor).left;
-        var stage = g.select(".stage")
-            .on("mouseover", function() {
-              hoverUpdate.style("opacity", 1);
-              xAxisHoverUpdate.style("opacity", 1);
-              yAxisHoverUpdate.style("opacity", 1);
-              ySliceAxisHoverUpdate.style("opacity", 1);
-              tooltip.style("opacity", 1);
-            })
-            .on("mouseout", function() {
-              hoverUpdate.style("opacity", 0);
-              xAxisHoverUpdate.style("opacity", 0);
-              yAxisHoverUpdate.style("opacity", 0);
-              ySliceAxisHoverUpdate.style("opacity", 0);
-              hoverUpdate.classed("hover-closest", false);
-              outlineUpdate.classed("outline-hover", false);
-              tooltip.style("opacity", 0);
-            })
-            .on("mousemove", onMouseMove);
-
-        var background = stage.select(".background")
-            .attr("transform", "translate(" + -margin.left + "," + -margin.top + ")")
-            .attr("width", outerWidth)
-            .attr("height", outerHeight);
-
-        var histogram = stage.selectAll(".histogram").data(data),
-            histogramExit = histogram.exit().remove(),
-            histogramEnter = histogram.enter().append("g").attr("class", "histogram"),
-            histogramUpdate = histogram
-                .sort(function(a, b) { return timeAccessor(a) - timeAccessor(b); }),
-            histogramTransition = gTransition.selectAll(".histogram")
-                .attr("transform", function(d) {
-                  return "translate(0, " +
-                    (mode === "offset" ? (yScale(timeAccessor(d)) - sliceHeight) : 0) + ")";
-                });
-
-        var baselineEnter = histogramEnter.append("line").attr("class", "baseline"),
-            baselineUpdate = histogramTransition.select(".baseline")
-                .style("stroke-opacity", function(d) { return (mode === "offset" ? 0.1 : 0); })
-                .attr("y1", sliceHeight)
-                .attr("y2", sliceHeight)
-                .attr("x2", width);
-
-        var outlineEnter = histogramEnter.append("path").attr("class", "outline"),
-            outlineUpdate = histogramUpdate.select(".outline")
-                .attr("vector-effect", "non-scaling-stroke")
-                .attr("d", function(d) { return path(d[binsProp]); })
-                .style("stroke-width", 1),
-            outlineTransition = histogramTransition.select(".outline")
-                .attr("transform", "scale(" + width / outlineCanvasSize + ", " +
-                      sliceHeight / outlineCanvasSize + ")")
-                .style("stroke", function(d) {
-                  return (mode === "offset" ? "white" : outlineColor(timeAccessor(d)));
-                })
-                .style("fill-opacity", function(d) { return (mode === "offset" ? 1 : 0); })
-                .style("fill", function(d) { return outlineColor(timeAccessor(d)); });
-
-        var hoverEnter = histogramEnter.append("g")
-                .attr("class", "hover")
-                .style("fill", function(d) { return outlineColor(timeAccessor(d)); }),
-            hoverUpdate = histogramUpdate.select(".hover");
-
-        hoverEnter.append("circle")
-            .attr("r", 2);
-
-        hoverEnter.append("text")
-            .style("display", "none")
-            .attr("dx", 4);
-
-        var xAxisHover = g.select(".x-axis-hover").selectAll(".label").data(["x"]),
-            xAxisHoverEnter = xAxisHover.enter().append("g").attr("class", "label"),
-            xAxisHoverUpdate = xAxisHover;
-
-        xAxisHoverEnter.append("rect")
-            .attr("x", -20)
-            .attr("y", 6)
-            .attr("width", 40)
-            .attr("height", 14)
-
-        xAxisHoverEnter.append("line")
-            .attr("x1", 0)
-            .attr("x2", 0)
-            .attr("y1", 0)
-            .attr("y2", 6);
-
-        xAxisHoverEnter.append("text")
-            .attr("dy", 18);
-
-        var yAxisHover = g.select(".y-axis-hover").selectAll(".label").data(["y"]),
-            yAxisHoverEnter = yAxisHover.enter().append("g").attr("class", "label"),
-            yAxisHoverUpdate = yAxisHover;
-
-        yAxisHoverEnter.append("rect")
-            .attr("x", 8)
-            .attr("y", -6)
-            .attr("width", 40)
-            .attr("height", 14)
-
-        yAxisHoverEnter.append("line")
-            .attr("x1", 0)
-            .attr("x2", 6)
-            .attr("y1", 0)
-            .attr("y2", 0);
-
-        yAxisHoverEnter.append("text")
-            .attr("dx", 8)
-            .attr("dy", 4);
-
-        var ySliceAxisHover = g.select(".y-slice-axis-hover").selectAll(".label").data(["y"]),
-            ySliceAxisHoverEnter = ySliceAxisHover.enter().append("g").attr("class", "label"),
-            ySliceAxisHoverUpdate = ySliceAxisHover;
-
-        ySliceAxisHoverEnter.append("rect")
-            .attr("x", 8)
-            .attr("y", -6)
-            .attr("width", 40)
-            .attr("height", 14)
-
-        ySliceAxisHoverEnter.append("line")
-            .attr("x1", 0)
-            .attr("x2", 6)
-            .attr("y1", 0)
-            .attr("y2", 0);
-
-        ySliceAxisHoverEnter.append("text")
-            .attr("dx", 8)
-            .attr("dy", 4);
-
-        gTransition.select(".y.axis.slice")
-            .style("opacity", mode === "offset" ? 0 : 1)
-            .attr("transform", "translate(0, " + (mode === "offset" ? -sliceHeight : 0) + ")")
-            .call(ySliceAxis);
-
-        gTransition.select(".x.axis")
-            .attr("transform", "translate(0, " + height + ")")
-            .call(xAxis);
-
-        gTransition.select(".y.axis")
-            .style("opacity", mode === "offset" ? 1 : 0)
-            .attr("transform", "translate(" + width + ", " + (mode === "offset" ? 0 : height) + ")")
-            .call(yAxis);
-
-        function onMouseMove() {
-          var m = d3.mouse(this),
-              v = xScale.invert(m[0]),
-              t = yScale.invert(m[1]);
-
-          function hoverXIndex(d) {
-            return Math.min(d[binsProp].length - 1, bisect(d[binsProp], v));
-          }
-          var closestSliceData;
-          var closestSliceDistance = Infinity;
-          var lastSliceData;
-          hoverUpdate
-            .attr("transform", function(d, i) {
-              var index = hoverXIndex(d);
-              lastSliceData = d;
-              var x = xScale(d[binsProp][index][xProp] + d[binsProp][index][dxProp] / 2);
-              var y = ySliceScale(d[binsProp][index][yProp]);
-              var globalY = (mode === "offset" ? yScale(timeAccessor(d)) - (sliceHeight - y) : y);
-              var dist = Math.abs(m[1] - globalY);
-              if (dist < closestSliceDistance) {
-                closestSliceDistance = dist;
-                closestSliceData = d;
-              }
-              return "translate(" + x + "," + y + ")";
-            });
-          hoverUpdate.select("text").text(function(d) {
-            var index = hoverXIndex(d);
-            return d[binsProp][index][yProp];
-          })
-          hoverUpdate.classed("hover-closest", function(d) { return d === closestSliceData; });
-          outlineUpdate.classed("outline-hover", function(d) { return d === closestSliceData; });
-
-          var index = hoverXIndex(lastSliceData);
-
-          xAxisHoverUpdate
-              .attr("transform", function(d) {
-                return "translate(" +
-                  xScale(lastSliceData[binsProp][index][xProp] +
-                         lastSliceData[binsProp][index][dxProp] / 2) + ", " +
-                  height + ")";
-              })
-            .select("text")
-              .text(function(d) { return format(lastSliceData[binsProp][index][xProp] +
-                                                lastSliceData[binsProp][index][dxProp] / 2); });
-
-          var fy = yAxis.tickFormat();
-          yAxisHoverUpdate
-              .attr("transform", function(d) {
-                return "translate(" + width + ", " +
-                  (mode === "offset" ? yScale(timeAccessor(closestSliceData)) : 0) + ")";
-              })
-              .style("display", mode === "offset" ? "" : "none")
-            .select("text")
-              .text(function(d) { return fy(timeAccessor(closestSliceData));});
-
-          var fsy = ySliceAxis.tickFormat();
-          ySliceAxisHoverUpdate
-              .attr("transform", function(d) {
-                return "translate(" + width + ", " +
-                  (mode === "offset" ? 0 : ySliceScale(closestSliceData[binsProp][index][yProp])) +
-                  ")";
-              })
-              .style("display", mode === "offset" ? "none" : "")
-            .select("text")
-              .text(function(d) { return fsy(closestSliceData[binsProp][index][yProp]); });
-
-          var svgMouse = d3.mouse(svgNode);
-          tooltip.style("transform", "translate(" + (svgMouse[0] + 15) + "px," +
-              (svgMouse[1] - 15) + "px)")
-            .select('span')
-            .text(mode === "offset" ?
-                fsy(closestSliceData[binsProp][index][yProp]) :
-                (timeProp === "step" ? "step " : "") +
-                fy(timeAccessor(closestSliceData)));
-        }
-      }
-    });
-    </script>
-
-  </dom-module>
diff --git a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
index 30adc0ad3a..a6efbfba2b 100644
--- a/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4/BUILD
@@ -32,3 +32,30 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# LEGACY - MARKED FOR DELETION
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "index.html",
+        "vz-histogram-timeseries.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//learning/vis/vz_elements/catalog:__pkg__"],
+    destdir = "vz-histogram-timeseries",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+# This is needed: components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/vz_line_chart/BUILD b/tensorflow/tensorboard/components/vz_line_chart/BUILD
deleted file mode 100644
index 6b988e5279..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/BUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "vz_line_chart",
-    srcs = [
-        "vz-line-chart.html",
-        ":ts",
-    ],
-    path = "/vz-line-chart",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "//tensorflow/tensorboard/components/tf_imports:plottable",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = [
-        "dragZoomInteraction.ts",
-        "vz-chart-helpers.ts",
-        "vz-line-chart.ts",
-    ],
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@com_palantir_plottable//:plottable.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "index.html",
-        "vz-line-chart.html",
-        ":legacy_ts",
-    ],
-    visibility = ["//visibility:public"],
-    destdir = "vz-line-chart",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//tensorflow/tensorboard/components/vz_sorting:legacy",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "dragZoomInteraction.ts",
-        "vz-chart-helpers.ts",
-        "vz-line-chart.ts",
-    ],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-    deps = [
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/plottable/v1:typings",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/d3",
-        "//third_party/javascript/typings/lodash",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/sinon",
-        "//third_party/javascript/typings/webcomponents_js",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD b/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
deleted file mode 100644
index 29e12160ea..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/demo/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/vz_line_chart/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/vz-line-chart/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_line_chart",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/vz_line_chart/demo/index.html b/tensorflow/tensorboard/components/vz_line_chart/demo/index.html
deleted file mode 100644
index fec8e8bed8..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/demo/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>vz-line-chart demo</title>
-    <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-    <link rel="import" href="../vz-line-chart.html">
-    <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-    <link rel="import" href="../../paper-styles/typography.html">
-    <style type="text/css">
-      body {
-        font-family: "Roboto";
-      }
-
-      vz-line-chart {
-        height: 400px;
-      }
-    </style>
-  </head>
-  <body>
-    <h3>Simple line chart</h3>
-    <demo-snippet>
-      <template>
-        <vz-line-chart id="simpleline"></vz-line-chart>
-        <script>
-          var elem = document.querySelector('#simpleline');
-          elem.setVisibleSeries(['test', 'train']);
-          elem.setSeriesData('test', data.test);
-          elem.setSeriesData('train', data.train);
-        </script>
-      </template>
-    </demo-snippet>
-
-    <h3>Exponential Smoothing enabled</h3>
-    <demo-snippet>
-      <template>
-        <vz-line-chart id="smoothedline"></vz-line-chart>
-        <script>
-          var elem = document.querySelector('#smoothedline');
-          elem.smoothingEnabled = true;
-          elem.setVisibleSeries(['test', 'train']);
-          elem.setSeriesData('test', data.test);
-          elem.setSeriesData('train', data.train);
-        </script>
-      </template>
-    </demo-snippet>
-
-    <script>
-      var data = {
-        "test": [{"scalar":0.07039999961853027,"wall_time":new Date("2016-06-24T04:13:01.295Z"),"step":0},{"scalar":0.6891000270843506,"wall_time":new Date("2016-06-24T04:13:05.909Z"),"step":10},{"scalar":0.8208000063896179,"wall_time":new Date("2016-06-24T04:13:10.318Z"),"step":20},{"scalar":0.8554999828338623,"wall_time":new Date("2016-06-24T04:13:14.794Z"),"step":30},{"scalar":0.8776000142097473,"wall_time":new Date("2016-06-24T04:13:19.166Z"),"step":40},{"scalar":0.8848999738693237,"wall_time":new Date("2016-06-24T04:13:23.603Z"),"step":50},{"scalar":0.8906000256538391,"wall_time":new Date("2016-06-24T04:13:27.931Z"),"step":60},{"scalar":0.8853999972343445,"wall_time":new Date("2016-06-24T04:13:32.281Z"),"step":70},{"scalar":0.8848999738693237,"wall_time":new Date("2016-06-24T04:13:36.636Z"),"step":80},{"scalar":0.8985999822616577,"wall_time":new Date("2016-06-24T04:13:41.070Z"),"step":90},{"scalar":0.9057000279426575,"wall_time":new Date("2016-06-24T04:13:45.475Z"),"step":100},{"scalar":0.9136000275611877,"wall_time":new Date("2016-06-24T04:13:49.947Z"),"step":110},{"scalar":0.919700026512146,"wall_time":new Date("2016-06-24T04:13:54.384Z"),"step":120},{"scalar":0.9182000160217285,"wall_time":new Date("2016-06-24T04:13:58.790Z"),"step":130},{"scalar":0.9282000064849854,"wall_time":new Date("2016-06-24T04:14:03.180Z"),"step":140},{"scalar":0.9218999743461609,"wall_time":new Date("2016-06-24T04:14:08.060Z"),"step":150},{"scalar":0.9294000267982483,"wall_time":new Date("2016-06-24T04:14:12.520Z"),"step":160},{"scalar":0.9261000156402588,"wall_time":new Date("2016-06-24T04:14:16.893Z"),"step":170},{"scalar":0.9236999750137329,"wall_time":new Date("2016-06-24T04:14:21.653Z"),"step":180},{"scalar":0.925000011920929,"wall_time":new Date("2016-06-24T04:14:26.065Z"),"step":190},{"scalar":0.9319000244140625,"wall_time":new Date("2016-06-24T04:14:30.430Z"),"step":200},{"scalar":0.933899998664856,"wall_time":new Date("2016-06-24T04:14:34.815Z"),"step":210},{"scalar":0.9347000122070312,"wall_time":new Date("2016-06-24T04:14:39.179Z"),"step":220},{"scalar":0.9341999888420105,"wall_time":new Date("2016-06-24T04:14:43.562Z"),"step":230},{"scalar":0.933899998664856,"wall_time":new Date("2016-06-24T04:14:47.953Z"),"step":240},{"scalar":0.9254000186920166,"wall_time":new Date("2016-06-24T04:14:52.322Z"),"step":250},{"scalar":0.9383000135421753,"wall_time":new Date("2016-06-24T04:14:56.703Z"),"step":260},{"scalar":0.9391999840736389,"wall_time":new Date("2016-06-24T04:15:01.046Z"),"step":270},{"scalar":0.9336000084877014,"wall_time":new Date("2016-06-24T04:15:05.458Z"),"step":280},{"scalar":0.9404000043869019,"wall_time":new Date("2016-06-24T04:15:10.438Z"),"step":290},{"scalar":0.944100022315979,"wall_time":new Date("2016-06-24T04:15:15.026Z"),"step":300},{"scalar":0.9401000142097473,"wall_time":new Date("2016-06-24T04:15:19.417Z"),"step":310},{"scalar":0.9394999742507935,"wall_time":new Date("2016-06-24T04:15:23.985Z"),"step":320},{"scalar":0.9438999891281128,"wall_time":new Date("2016-06-24T04:15:28.418Z"),"step":330},{"scalar":0.9478999972343445,"wall_time":new Date("2016-06-24T04:15:32.844Z"),"step":340},{"scalar":0.9470999836921692,"wall_time":new Date("2016-06-24T04:15:37.359Z"),"step":350},{"scalar":0.9423999786376953,"wall_time":new Date("2016-06-24T04:15:41.803Z"),"step":360},{"scalar":0.9472000002861023,"wall_time":new Date("2016-06-24T04:15:46.167Z"),"step":370},{"scalar":0.9491999745368958,"wall_time":new Date("2016-06-24T04:15:50.558Z"),"step":380},{"scalar":0.9458000063896179,"wall_time":new Date("2016-06-24T04:15:54.942Z"),"step":390},{"scalar":0.9442999958992004,"wall_time":new Date("2016-06-24T04:15:59.343Z"),"step":400},{"scalar":0.946399986743927,"wall_time":new Date("2016-06-24T04:16:03.703Z"),"step":410},{"scalar":0.947700023651123,"wall_time":new Date("2016-06-24T04:16:08.102Z"),"step":420},{"scalar":0.9451000094413757,"wall_time":new Date("2016-06-24T04:16:13.379Z"),"step":430},{"scalar":0.9532999992370605,"wall_time":new Date("2016-06-24T04:16:17.962Z"),"step":440},{"scalar":0.9496999979019165,"wall_time":new Date("2016-06-24T04:16:22.320Z"),"step":450},{"scalar":0.9513000249862671,"wall_time":new Date("2016-06-24T04:16:26.712Z"),"step":460},{"scalar":0.9488999843597412,"wall_time":new Date("2016-06-24T04:16:31.099Z"),"step":470},{"scalar":0.9520000219345093,"wall_time":new Date("2016-06-24T04:16:35.760Z"),"step":480},{"scalar":0.9516000151634216,"wall_time":new Date("2016-06-24T04:16:40.239Z"),"step":490},{"scalar":0.9537000060081482,"wall_time":new Date("2016-06-24T04:16:44.620Z"),"step":500},{"scalar":0.9528999924659729,"wall_time":new Date("2016-06-24T04:16:49.273Z"),"step":510},{"scalar":0.9502999782562256,"wall_time":new Date("2016-06-24T04:16:53.640Z"),"step":520},{"scalar":0.9573000073432922,"wall_time":new Date("2016-06-24T04:16:58.612Z"),"step":530},{"scalar":0.9550999999046326,"wall_time":new Date("2016-06-24T04:17:03.089Z"),"step":540},{"scalar":0.9563000202178955,"wall_time":new Date("2016-06-24T04:17:07.481Z"),"step":550},{"scalar":0.9563000202178955,"wall_time":new Date("2016-06-24T04:17:11.866Z"),"step":560},{"scalar":0.9599000215530396,"wall_time":new Date("2016-06-24T04:17:16.456Z"),"step":570},{"scalar":0.9588000178337097,"wall_time":new Date("2016-06-24T04:17:20.983Z"),"step":580},{"scalar":0.9569000005722046,"wall_time":new Date("2016-06-24T04:17:25.996Z"),"step":590},{"scalar":0.9585999846458435,"wall_time":new Date("2016-06-24T04:17:30.417Z"),"step":600},{"scalar":0.9555000066757202,"wall_time":new Date("2016-06-24T04:17:35.164Z"),"step":610},{"scalar":0.9567999839782715,"wall_time":new Date("2016-06-24T04:17:39.714Z"),"step":620},{"scalar":0.9616000056266785,"wall_time":new Date("2016-06-24T04:17:44.105Z"),"step":630},{"scalar":0.9603999853134155,"wall_time":new Date("2016-06-24T04:17:48.826Z"),"step":640},{"scalar":0.9605000019073486,"wall_time":new Date("2016-06-24T04:17:53.419Z"),"step":650},{"scalar":0.9627000093460083,"wall_time":new Date("2016-06-24T04:17:58.026Z"),"step":660},{"scalar":0.9639999866485596,"wall_time":new Date("2016-06-24T04:18:02.698Z"),"step":670},{"scalar":0.9613999724388123,"wall_time":new Date("2016-06-24T04:18:07.960Z"),"step":680},{"scalar":0.9599000215530396,"wall_time":new Date("2016-06-24T04:18:12.458Z"),"step":690},{"scalar":0.9617999792098999,"wall_time":new Date("2016-06-24T04:18:16.835Z"),"step":700},{"scalar":0.9635000228881836,"wall_time":new Date("2016-06-24T04:18:21.232Z"),"step":710},{"scalar":0.9641000032424927,"wall_time":new Date("2016-06-24T04:18:25.888Z"),"step":720},{"scalar":0.9628000259399414,"wall_time":new Date("2016-06-24T04:18:30.372Z"),"step":730},{"scalar":0.9656000137329102,"wall_time":new Date("2016-06-24T04:18:34.751Z"),"step":740},{"scalar":0.9642000198364258,"wall_time":new Date("2016-06-24T04:18:39.368Z"),"step":750},{"scalar":0.9646000266075134,"wall_time":new Date("2016-06-24T04:18:44.267Z"),"step":760},{"scalar":0.9617000222206116,"wall_time":new Date("2016-06-24T04:18:48.829Z"),"step":770},{"scalar":0.9657999873161316,"wall_time":new Date("2016-06-24T04:18:53.466Z"),"step":780},{"scalar":0.9667999744415283,"wall_time":new Date("2016-06-24T04:18:57.893Z"),"step":790},{"scalar":0.967199981212616,"wall_time":new Date("2016-06-24T04:19:02.601Z"),"step":800},{"scalar":0.9646999835968018,"wall_time":new Date("2016-06-24T04:19:07.657Z"),"step":810},{"scalar":0.9670000076293945,"wall_time":new Date("2016-06-24T04:19:12.331Z"),"step":820},{"scalar":0.96670001745224,"wall_time":new Date("2016-06-24T04:19:17.223Z"),"step":830},{"scalar":0.9668999910354614,"wall_time":new Date("2016-06-24T04:19:21.980Z"),"step":840},{"scalar":0.965399980545044,"wall_time":new Date("2016-06-24T04:19:26.352Z"),"step":850},{"scalar":0.9671000242233276,"wall_time":new Date("2016-06-24T04:19:30.764Z"),"step":860},{"scalar":0.9671000242233276,"wall_time":new Date("2016-06-24T04:19:35.244Z"),"step":870},{"scalar":0.9642000198364258,"wall_time":new Date("2016-06-24T04:19:39.620Z"),"step":880},{"scalar":0.9666000008583069,"wall_time":new Date("2016-06-24T04:19:43.979Z"),"step":890},{"scalar":0.9664999842643738,"wall_time":new Date("2016-06-24T04:19:48.337Z"),"step":900},{"scalar":0.9678000211715698,"wall_time":new Date("2016-06-24T04:19:52.688Z"),"step":910},{"scalar":0.9678999781608582,"wall_time":new Date("2016-06-24T04:19:57.058Z"),"step":920},{"scalar":0.9674999713897705,"wall_time":new Date("2016-06-24T04:20:01.415Z"),"step":930},{"scalar":0.9684000015258789,"wall_time":new Date("2016-06-24T04:20:05.887Z"),"step":940},{"scalar":0.9672999978065491,"wall_time":new Date("2016-06-24T04:20:10.261Z"),"step":950},{"scalar":0.9696000218391418,"wall_time":new Date("2016-06-24T04:20:14.610Z"),"step":960},{"scalar":0.9706000089645386,"wall_time":new Date("2016-06-24T04:20:19.526Z"),"step":970},{"scalar":0.9688000082969666,"wall_time":new Date("2016-06-24T04:20:23.881Z"),"step":980},{"scalar":0.9699000120162964,"wall_time":new Date("2016-06-24T04:20:28.415Z"),"step":990,"name":"test","relative":0.1242}],
-        "train": [{"scalar":0.05999999865889549,"wall_time":new Date("2016-06-24T04:13:01.556Z"),"step":1},{"scalar":0.18000000715255737,"wall_time":new Date("2016-06-24T04:13:01.693Z"),"step":2},{"scalar":0.25,"wall_time":new Date("2016-06-24T04:13:01.833Z"),"step":3},{"scalar":0.28999999165534973,"wall_time":new Date("2016-06-24T04:13:01.964Z"),"step":4},{"scalar":0.3400000035762787,"wall_time":new Date("2016-06-24T04:13:02.109Z"),"step":5},{"scalar":0.5099999904632568,"wall_time":new Date("2016-06-24T04:13:02.249Z"),"step":6},{"scalar":0.550000011920929,"wall_time":new Date("2016-06-24T04:13:02.387Z"),"step":7},{"scalar":0.5600000023841858,"wall_time":new Date("2016-06-24T04:13:02.515Z"),"step":8},{"scalar":0.6700000166893005,"wall_time":new Date("2016-06-24T04:13:02.650Z"),"step":9},{"scalar":0.7599999904632568,"wall_time":new Date("2016-06-24T04:13:06.061Z"),"step":11},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:06.202Z"),"step":12},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:06.343Z"),"step":13},{"scalar":0.7599999904632568,"wall_time":new Date("2016-06-24T04:13:06.480Z"),"step":14},{"scalar":0.75,"wall_time":new Date("2016-06-24T04:13:06.618Z"),"step":15},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:06.763Z"),"step":16},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:06.897Z"),"step":17},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:07.027Z"),"step":18},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:07.167Z"),"step":19},{"scalar":0.7599999904632568,"wall_time":new Date("2016-06-24T04:13:10.461Z"),"step":21},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:10.602Z"),"step":22},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:10.748Z"),"step":23},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:10.894Z"),"step":24},{"scalar":0.6899999976158142,"wall_time":new Date("2016-06-24T04:13:11.034Z"),"step":25},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:11.173Z"),"step":26},{"scalar":0.8100000023841858,"wall_time":new Date("2016-06-24T04:13:11.315Z"),"step":27},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:11.455Z"),"step":28},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:11.590Z"),"step":29},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:14.931Z"),"step":31},{"scalar":0.8199999928474426,"wall_time":new Date("2016-06-24T04:13:15.069Z"),"step":32},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:15.199Z"),"step":33},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:13:15.329Z"),"step":34},{"scalar":0.8199999928474426,"wall_time":new Date("2016-06-24T04:13:15.466Z"),"step":35},{"scalar":0.7699999809265137,"wall_time":new Date("2016-06-24T04:13:15.610Z"),"step":36},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:15.746Z"),"step":37},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:15.876Z"),"step":38},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:16.010Z"),"step":39},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:19.296Z"),"step":41},{"scalar":0.800000011920929,"wall_time":new Date("2016-06-24T04:13:19.435Z"),"step":42},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:19.567Z"),"step":43},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:19.696Z"),"step":44},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:19.833Z"),"step":45},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:19.972Z"),"step":46},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:20.111Z"),"step":47},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:20.239Z"),"step":48},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:20.370Z"),"step":49},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:23.731Z"),"step":51},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:23.869Z"),"step":52},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:24.000Z"),"step":53},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:24.129Z"),"step":54},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:24.256Z"),"step":55},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:24.391Z"),"step":56},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:24.529Z"),"step":57},{"scalar":0.7900000214576721,"wall_time":new Date("2016-06-24T04:13:24.663Z"),"step":58},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:24.792Z"),"step":59},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:13:28.072Z"),"step":61},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:13:28.212Z"),"step":62},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:28.340Z"),"step":63},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:28.477Z"),"step":64},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:13:28.610Z"),"step":65},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:28.751Z"),"step":66},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:13:28.875Z"),"step":67},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:29.003Z"),"step":68},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:29.137Z"),"step":69},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:32.418Z"),"step":71},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:32.552Z"),"step":72},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:32.685Z"),"step":73},{"scalar":0.8100000023841858,"wall_time":new Date("2016-06-24T04:13:32.817Z"),"step":74},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:32.942Z"),"step":75},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:33.077Z"),"step":76},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:33.213Z"),"step":77},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:33.347Z"),"step":78},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:33.489Z"),"step":79},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:36.766Z"),"step":81},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:36.902Z"),"step":82},{"scalar":0.8199999928474426,"wall_time":new Date("2016-06-24T04:13:37.042Z"),"step":83},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:37.187Z"),"step":84},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:37.319Z"),"step":85},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:37.460Z"),"step":86},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:37.595Z"),"step":87},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:37.730Z"),"step":88},{"scalar":0.7400000095367432,"wall_time":new Date("2016-06-24T04:13:37.866Z"),"step":89},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:41.201Z"),"step":91},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:41.334Z"),"step":92},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:41.480Z"),"step":93},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:41.618Z"),"step":94},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:41.755Z"),"step":95},{"scalar":0.8399999737739563,"wall_time":new Date("2016-06-24T04:13:41.885Z"),"step":96},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:42.022Z"),"step":97},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:13:42.145Z"),"step":98},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:42.271Z"),"step":99},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:45.616Z"),"step":101},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:45.751Z"),"step":102},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:45.882Z"),"step":103},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:46.031Z"),"step":104},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:46.169Z"),"step":105},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:46.302Z"),"step":106},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:46.443Z"),"step":107},{"scalar":0.7799999713897705,"wall_time":new Date("2016-06-24T04:13:46.578Z"),"step":108},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:46.720Z"),"step":109},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:50.080Z"),"step":111},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:50.219Z"),"step":112},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:50.351Z"),"step":113},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:50.495Z"),"step":114},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:50.622Z"),"step":115},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:50.761Z"),"step":116},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:13:50.894Z"),"step":117},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:13:51.027Z"),"step":118},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:13:51.167Z"),"step":119},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:13:54.523Z"),"step":121},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:54.649Z"),"step":122},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:54.813Z"),"step":123},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:54.958Z"),"step":124},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:13:55.097Z"),"step":125},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:13:55.232Z"),"step":126},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:13:55.363Z"),"step":127},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:13:55.491Z"),"step":128},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:13:55.619Z"),"step":129},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:58.923Z"),"step":131},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:59.051Z"),"step":132},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:59.183Z"),"step":133},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:13:59.316Z"),"step":134},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:13:59.443Z"),"step":135},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:13:59.583Z"),"step":136},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:13:59.712Z"),"step":137},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:13:59.840Z"),"step":138},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:13:59.978Z"),"step":139},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:03.306Z"),"step":141},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:03.443Z"),"step":142},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:14:03.572Z"),"step":143},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:03.700Z"),"step":144},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:03.834Z"),"step":145},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:03.964Z"),"step":146},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:04.104Z"),"step":147},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:04.265Z"),"step":148},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:04.470Z"),"step":149},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:08.189Z"),"step":151},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:08.328Z"),"step":152},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:08.462Z"),"step":153},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:08.594Z"),"step":154},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:08.725Z"),"step":155},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:08.859Z"),"step":156},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:08.998Z"),"step":157},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:09.132Z"),"step":158},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:09.268Z"),"step":159},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:12.667Z"),"step":161},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:12.803Z"),"step":162},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:12.935Z"),"step":163},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:13.068Z"),"step":164},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:13.199Z"),"step":165},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:13.333Z"),"step":166},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:13.462Z"),"step":167},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:13.591Z"),"step":168},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:13.719Z"),"step":169},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:17.038Z"),"step":171},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:17.166Z"),"step":172},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:17.302Z"),"step":173},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:17.430Z"),"step":174},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:17.565Z"),"step":175},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:14:17.700Z"),"step":176},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:14:17.844Z"),"step":177},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:18.013Z"),"step":178},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:18.164Z"),"step":179},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:21.786Z"),"step":181},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:21.915Z"),"step":182},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:22.054Z"),"step":183},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:22.187Z"),"step":184},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:22.317Z"),"step":185},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:22.442Z"),"step":186},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:22.583Z"),"step":187},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:22.718Z"),"step":188},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:22.849Z"),"step":189},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:14:26.199Z"),"step":191},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:26.327Z"),"step":192},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:26.462Z"),"step":193},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:26.591Z"),"step":194},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:14:26.721Z"),"step":195},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:26.857Z"),"step":196},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:26.989Z"),"step":197},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:27.118Z"),"step":198},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:27.251Z"),"step":199},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:30.566Z"),"step":201},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:30.696Z"),"step":202},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:30.831Z"),"step":203},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:30.965Z"),"step":204},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:31.105Z"),"step":205},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:31.234Z"),"step":206},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:31.369Z"),"step":207},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:31.498Z"),"step":208},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:31.646Z"),"step":209},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:34.956Z"),"step":211},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:35.097Z"),"step":212},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:35.225Z"),"step":213},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:35.361Z"),"step":214},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:35.486Z"),"step":215},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:14:35.618Z"),"step":216},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:35.747Z"),"step":217},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:14:35.879Z"),"step":218},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:14:36.019Z"),"step":219},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:39.310Z"),"step":221},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:39.439Z"),"step":222},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:39.580Z"),"step":223},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:39.713Z"),"step":224},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:39.854Z"),"step":225},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:39.988Z"),"step":226},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:40.117Z"),"step":227},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:40.244Z"),"step":228},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:40.376Z"),"step":229},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:43.701Z"),"step":231},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:43.852Z"),"step":232},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:43.988Z"),"step":233},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:44.127Z"),"step":234},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:14:44.261Z"),"step":235},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:44.394Z"),"step":236},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:44.535Z"),"step":237},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:44.663Z"),"step":238},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:44.803Z"),"step":239},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:48.092Z"),"step":241},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:14:48.234Z"),"step":242},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:48.374Z"),"step":243},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:48.503Z"),"step":244},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:14:48.635Z"),"step":245},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:14:48.768Z"),"step":246},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:48.895Z"),"step":247},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:49.037Z"),"step":248},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:49.169Z"),"step":249},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:52.450Z"),"step":251},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:52.582Z"),"step":252},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:52.712Z"),"step":253},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:52.850Z"),"step":254},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:52.982Z"),"step":255},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:53.112Z"),"step":256},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:14:53.244Z"),"step":257},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:53.377Z"),"step":258},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:53.501Z"),"step":259},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:14:56.842Z"),"step":261},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:14:56.973Z"),"step":262},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:14:57.101Z"),"step":263},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:14:57.229Z"),"step":264},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:14:57.360Z"),"step":265},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:57.491Z"),"step":266},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:57.629Z"),"step":267},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:14:57.770Z"),"step":268},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:14:57.898Z"),"step":269},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:01.199Z"),"step":271},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:01.330Z"),"step":272},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:01.455Z"),"step":273},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:01.579Z"),"step":274},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:01.716Z"),"step":275},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:01.838Z"),"step":276},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:01.966Z"),"step":277},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:02.103Z"),"step":278},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:02.233Z"),"step":279},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:05.608Z"),"step":281},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:05.733Z"),"step":282},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:05.870Z"),"step":283},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:05.999Z"),"step":284},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:06.136Z"),"step":285},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:06.266Z"),"step":286},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:06.397Z"),"step":287},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:06.525Z"),"step":288},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:06.656Z"),"step":289},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:10.573Z"),"step":291},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:10.702Z"),"step":292},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:15:10.837Z"),"step":293},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:10.968Z"),"step":294},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:11.109Z"),"step":295},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:11.242Z"),"step":296},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:11.376Z"),"step":297},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:11.505Z"),"step":298},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:11.645Z"),"step":299},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:15.160Z"),"step":301},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:15.308Z"),"step":302},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:15.440Z"),"step":303},{"scalar":0.8500000238418579,"wall_time":new Date("2016-06-24T04:15:15.565Z"),"step":304},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:15:15.696Z"),"step":305},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:15.826Z"),"step":306},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:15.961Z"),"step":307},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:16.097Z"),"step":308},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:16.226Z"),"step":309},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:19.556Z"),"step":311},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:19.686Z"),"step":312},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:19.826Z"),"step":313},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:19.954Z"),"step":314},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:15:20.093Z"),"step":315},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:20.230Z"),"step":316},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:20.358Z"),"step":317},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:15:20.490Z"),"step":318},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:20.621Z"),"step":319},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:15:24.128Z"),"step":321},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:24.259Z"),"step":322},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:24.399Z"),"step":323},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:24.536Z"),"step":324},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:24.663Z"),"step":325},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:24.792Z"),"step":326},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:24.924Z"),"step":327},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:25.055Z"),"step":328},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:25.192Z"),"step":329},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:28.553Z"),"step":331},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:28.709Z"),"step":332},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:28.848Z"),"step":333},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:28.980Z"),"step":334},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:29.109Z"),"step":335},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:29.243Z"),"step":336},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:29.375Z"),"step":337},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:29.515Z"),"step":338},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:29.655Z"),"step":339},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:32.974Z"),"step":341},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:33.098Z"),"step":342},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:33.234Z"),"step":343},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:33.383Z"),"step":344},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:33.544Z"),"step":345},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:33.710Z"),"step":346},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:33.860Z"),"step":347},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:34.008Z"),"step":348},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:34.150Z"),"step":349},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:37.499Z"),"step":351},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:37.638Z"),"step":352},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:37.775Z"),"step":353},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:37.908Z"),"step":354},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:38.042Z"),"step":355},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:38.174Z"),"step":356},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:15:38.313Z"),"step":357},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:38.444Z"),"step":358},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:15:38.581Z"),"step":359},{"scalar":0.8600000143051147,"wall_time":new Date("2016-06-24T04:15:41.935Z"),"step":361},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:42.074Z"),"step":362},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:42.194Z"),"step":363},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:42.325Z"),"step":364},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:42.463Z"),"step":365},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:42.605Z"),"step":366},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:42.730Z"),"step":367},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:42.858Z"),"step":368},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:42.998Z"),"step":369},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:15:46.303Z"),"step":371},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:15:46.436Z"),"step":372},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:46.568Z"),"step":373},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:15:46.708Z"),"step":374},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:46.839Z"),"step":375},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:46.971Z"),"step":376},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:47.102Z"),"step":377},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:15:47.236Z"),"step":378},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:47.379Z"),"step":379},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:50.684Z"),"step":381},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:15:50.815Z"),"step":382},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:50.956Z"),"step":383},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:51.090Z"),"step":384},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:51.232Z"),"step":385},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:51.365Z"),"step":386},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:51.503Z"),"step":387},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:51.643Z"),"step":388},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:51.777Z"),"step":389},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:55.084Z"),"step":391},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:55.220Z"),"step":392},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:55.354Z"),"step":393},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:15:55.486Z"),"step":394},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:55.625Z"),"step":395},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:15:55.763Z"),"step":396},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:55.899Z"),"step":397},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:15:56.036Z"),"step":398},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:56.180Z"),"step":399},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:15:59.479Z"),"step":401},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:15:59.604Z"),"step":402},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:59.745Z"),"step":403},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:15:59.875Z"),"step":404},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:00.005Z"),"step":405},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:00.138Z"),"step":406},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:00.277Z"),"step":407},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:00.402Z"),"step":408},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:00.538Z"),"step":409},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:03.851Z"),"step":411},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:03.985Z"),"step":412},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:04.118Z"),"step":413},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:04.248Z"),"step":414},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:04.376Z"),"step":415},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:04.515Z"),"step":416},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:04.641Z"),"step":417},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:04.770Z"),"step":418},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:04.905Z"),"step":419},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:08.228Z"),"step":421},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:16:08.358Z"),"step":422},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:08.500Z"),"step":423},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:08.639Z"),"step":424},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:08.766Z"),"step":425},{"scalar":1,"wall_time":new Date("2016-06-24T04:16:08.903Z"),"step":426},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:09.042Z"),"step":427},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:09.172Z"),"step":428},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:09.310Z"),"step":429},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:13.517Z"),"step":431},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:13.682Z"),"step":432},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:13.835Z"),"step":433},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:13.975Z"),"step":434},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:14.131Z"),"step":435},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:14.280Z"),"step":436},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:14.434Z"),"step":437},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:14.584Z"),"step":438},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:14.730Z"),"step":439},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:18.093Z"),"step":441},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:18.230Z"),"step":442},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:18.359Z"),"step":443},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:18.501Z"),"step":444},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:18.632Z"),"step":445},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:18.765Z"),"step":446},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:18.894Z"),"step":447},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:19.032Z"),"step":448},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:19.160Z"),"step":449},{"scalar":0.8799999952316284,"wall_time":new Date("2016-06-24T04:16:22.445Z"),"step":451},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:22.584Z"),"step":452},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:22.711Z"),"step":453},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:22.858Z"),"step":454},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:23.006Z"),"step":455},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:23.138Z"),"step":456},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:23.274Z"),"step":457},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:23.417Z"),"step":458},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:23.543Z"),"step":459},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:26.832Z"),"step":461},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:26.962Z"),"step":462},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:27.093Z"),"step":463},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:27.230Z"),"step":464},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:27.371Z"),"step":465},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:27.495Z"),"step":466},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:27.620Z"),"step":467},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:27.759Z"),"step":468},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:27.885Z"),"step":469},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:31.227Z"),"step":471},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:16:31.354Z"),"step":472},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:31.484Z"),"step":473},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:31.629Z"),"step":474},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:31.764Z"),"step":475},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:31.898Z"),"step":476},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:32.032Z"),"step":477},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:32.157Z"),"step":478},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:32.288Z"),"step":479},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:35.896Z"),"step":481},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:36.024Z"),"step":482},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:36.163Z"),"step":483},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:36.297Z"),"step":484},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:36.428Z"),"step":485},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:36.561Z"),"step":486},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:36.695Z"),"step":487},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:36.828Z"),"step":488},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:16:36.959Z"),"step":489},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:40.381Z"),"step":491},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:40.508Z"),"step":492},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:40.647Z"),"step":493},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:40.782Z"),"step":494},{"scalar":0.8299999833106995,"wall_time":new Date("2016-06-24T04:16:40.920Z"),"step":495},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:41.053Z"),"step":496},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:41.186Z"),"step":497},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:41.311Z"),"step":498},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:41.458Z"),"step":499},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:44.767Z"),"step":501},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:44.902Z"),"step":502},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:45.039Z"),"step":503},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:45.170Z"),"step":504},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:45.306Z"),"step":505},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:45.440Z"),"step":506},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:45.584Z"),"step":507},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:45.718Z"),"step":508},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:45.853Z"),"step":509},{"scalar":1,"wall_time":new Date("2016-06-24T04:16:49.414Z"),"step":511},{"scalar":1,"wall_time":new Date("2016-06-24T04:16:49.556Z"),"step":512},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:49.690Z"),"step":513},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:16:49.821Z"),"step":514},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:49.950Z"),"step":515},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:50.080Z"),"step":516},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:50.209Z"),"step":517},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:50.344Z"),"step":518},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:50.476Z"),"step":519},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:53.771Z"),"step":521},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:53.903Z"),"step":522},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:54.039Z"),"step":523},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:16:54.178Z"),"step":524},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:16:54.303Z"),"step":525},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:54.430Z"),"step":526},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:16:54.553Z"),"step":527},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:54.687Z"),"step":528},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:54.811Z"),"step":529},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:58.763Z"),"step":531},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:58.904Z"),"step":532},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:59.050Z"),"step":533},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:16:59.178Z"),"step":534},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:16:59.314Z"),"step":535},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:16:59.446Z"),"step":536},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:16:59.585Z"),"step":537},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:16:59.712Z"),"step":538},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:16:59.844Z"),"step":539},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:03.217Z"),"step":541},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:03.350Z"),"step":542},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:03.480Z"),"step":543},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:17:03.612Z"),"step":544},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:03.742Z"),"step":545},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:03.889Z"),"step":546},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:04.032Z"),"step":547},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:04.171Z"),"step":548},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:04.306Z"),"step":549},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:07.617Z"),"step":551},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:07.751Z"),"step":552},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:07.887Z"),"step":553},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:08.024Z"),"step":554},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:08.164Z"),"step":555},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:08.296Z"),"step":556},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:08.433Z"),"step":557},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:08.568Z"),"step":558},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:08.692Z"),"step":559},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:12.001Z"),"step":561},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:12.156Z"),"step":562},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:12.290Z"),"step":563},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:12.464Z"),"step":564},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:12.604Z"),"step":565},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:12.741Z"),"step":566},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:12.882Z"),"step":567},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:13.029Z"),"step":568},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:17:13.164Z"),"step":569},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:16.594Z"),"step":571},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:16.730Z"),"step":572},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:16.871Z"),"step":573},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:17.004Z"),"step":574},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:17.140Z"),"step":575},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:17.276Z"),"step":576},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:17.407Z"),"step":577},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:17.543Z"),"step":578},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:17.671Z"),"step":579},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:21.105Z"),"step":581},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:21.234Z"),"step":582},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:21.367Z"),"step":583},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:21.506Z"),"step":584},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:21.631Z"),"step":585},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:21.761Z"),"step":586},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:21.899Z"),"step":587},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:22.036Z"),"step":588},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:22.175Z"),"step":589},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:26.130Z"),"step":591},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:26.271Z"),"step":592},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:26.402Z"),"step":593},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:26.537Z"),"step":594},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:26.669Z"),"step":595},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:26.807Z"),"step":596},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:26.935Z"),"step":597},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:27.072Z"),"step":598},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:27.216Z"),"step":599},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:30.550Z"),"step":601},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:30.677Z"),"step":602},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:30.816Z"),"step":603},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:30.960Z"),"step":604},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:31.094Z"),"step":605},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:31.243Z"),"step":606},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:31.383Z"),"step":607},{"scalar":0.8899999856948853,"wall_time":new Date("2016-06-24T04:17:31.525Z"),"step":608},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:31.650Z"),"step":609},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:35.299Z"),"step":611},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:35.636Z"),"step":612},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:35.773Z"),"step":613},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:35.907Z"),"step":614},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:36.037Z"),"step":615},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:36.169Z"),"step":616},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:36.302Z"),"step":617},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:36.427Z"),"step":618},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:17:36.567Z"),"step":619},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:39.851Z"),"step":621},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:39.982Z"),"step":622},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.120Z"),"step":623},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.256Z"),"step":624},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.394Z"),"step":625},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.529Z"),"step":626},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:40.667Z"),"step":627},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:40.807Z"),"step":628},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:40.938Z"),"step":629},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:44.244Z"),"step":631},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:44.385Z"),"step":632},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:44.525Z"),"step":633},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:44.657Z"),"step":634},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:44.800Z"),"step":635},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:44.935Z"),"step":636},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:17:45.074Z"),"step":637},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:45.208Z"),"step":638},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:45.351Z"),"step":639},{"scalar":1,"wall_time":new Date("2016-06-24T04:17:48.960Z"),"step":641},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:49.090Z"),"step":642},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:49.219Z"),"step":643},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:49.361Z"),"step":644},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:49.502Z"),"step":645},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:49.634Z"),"step":646},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:49.770Z"),"step":647},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:49.908Z"),"step":648},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:50.033Z"),"step":649},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:53.566Z"),"step":651},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:17:53.699Z"),"step":652},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:53.829Z"),"step":653},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:53.958Z"),"step":654},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:54.102Z"),"step":655},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:54.244Z"),"step":656},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:54.377Z"),"step":657},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:54.518Z"),"step":658},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:54.649Z"),"step":659},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:58.186Z"),"step":661},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:17:58.343Z"),"step":662},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:58.479Z"),"step":663},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:17:58.620Z"),"step":664},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:58.749Z"),"step":665},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:17:58.876Z"),"step":666},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:59.023Z"),"step":667},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:17:59.157Z"),"step":668},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:17:59.297Z"),"step":669},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:02.835Z"),"step":671},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:02.987Z"),"step":672},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:03.126Z"),"step":673},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:03.266Z"),"step":674},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:03.399Z"),"step":675},{"scalar":0.8999999761581421,"wall_time":new Date("2016-06-24T04:18:03.545Z"),"step":676},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:03.696Z"),"step":677},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:03.841Z"),"step":678},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:03.974Z"),"step":679},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:08.117Z"),"step":681},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:08.271Z"),"step":682},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:08.410Z"),"step":683},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:08.557Z"),"step":684},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:08.696Z"),"step":685},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:08.848Z"),"step":686},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:08.987Z"),"step":687},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:09.119Z"),"step":688},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:09.261Z"),"step":689},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:12.588Z"),"step":691},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:12.719Z"),"step":692},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:12.854Z"),"step":693},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:12.986Z"),"step":694},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:13.118Z"),"step":695},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:13.253Z"),"step":696},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:13.392Z"),"step":697},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:13.524Z"),"step":698},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:13.659Z"),"step":699},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:16.970Z"),"step":701},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.117Z"),"step":702},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.250Z"),"step":703},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.382Z"),"step":704},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:17.517Z"),"step":705},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:17.653Z"),"step":706},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:17.782Z"),"step":707},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:17.915Z"),"step":708},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:18.056Z"),"step":709},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:21.361Z"),"step":711},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:21.478Z"),"step":712},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:21.610Z"),"step":713},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:21.750Z"),"step":714},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:21.880Z"),"step":715},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:22.018Z"),"step":716},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:22.147Z"),"step":717},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:22.283Z"),"step":718},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:22.410Z"),"step":719},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:26.058Z"),"step":721},{"scalar":1,"wall_time":new Date("2016-06-24T04:18:26.204Z"),"step":722},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:26.350Z"),"step":723},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:26.498Z"),"step":724},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:18:26.636Z"),"step":725},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:26.787Z"),"step":726},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:26.919Z"),"step":727},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:27.051Z"),"step":728},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:27.183Z"),"step":729},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:30.500Z"),"step":731},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:30.634Z"),"step":732},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:30.769Z"),"step":733},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:30.904Z"),"step":734},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:31.043Z"),"step":735},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:31.176Z"),"step":736},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:31.311Z"),"step":737},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:31.438Z"),"step":738},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:31.577Z"),"step":739},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:34.889Z"),"step":741},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:35.026Z"),"step":742},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:35.160Z"),"step":743},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:35.299Z"),"step":744},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:35.436Z"),"step":745},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:35.573Z"),"step":746},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:35.713Z"),"step":747},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:35.845Z"),"step":748},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:35.978Z"),"step":749},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:39.520Z"),"step":751},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:39.679Z"),"step":752},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:39.844Z"),"step":753},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:40.006Z"),"step":754},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:40.142Z"),"step":755},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:40.337Z"),"step":756},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:40.487Z"),"step":757},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:40.691Z"),"step":758},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:40.855Z"),"step":759},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:44.438Z"),"step":761},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:44.566Z"),"step":762},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:44.698Z"),"step":763},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:44.832Z"),"step":764},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:44.974Z"),"step":765},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:45.115Z"),"step":766},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:45.258Z"),"step":767},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:45.392Z"),"step":768},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:45.525Z"),"step":769},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:18:48.972Z"),"step":771},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:49.116Z"),"step":772},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:49.257Z"),"step":773},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:49.387Z"),"step":774},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:49.512Z"),"step":775},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:49.653Z"),"step":776},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:49.787Z"),"step":777},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:49.922Z"),"step":778},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:50.062Z"),"step":779},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:18:53.610Z"),"step":781},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:53.745Z"),"step":782},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:53.887Z"),"step":783},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:54.025Z"),"step":784},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:54.156Z"),"step":785},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:54.281Z"),"step":786},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:54.417Z"),"step":787},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:18:54.560Z"),"step":788},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:54.691Z"),"step":789},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:58.048Z"),"step":791},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:18:58.192Z"),"step":792},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:58.324Z"),"step":793},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:18:58.449Z"),"step":794},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:18:58.584Z"),"step":795},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:18:58.720Z"),"step":796},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:18:58.846Z"),"step":797},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:58.991Z"),"step":798},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:18:59.124Z"),"step":799},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:02.737Z"),"step":801},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:02.880Z"),"step":802},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:03.021Z"),"step":803},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:03.166Z"),"step":804},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:03.308Z"),"step":805},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:03.436Z"),"step":806},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:03.574Z"),"step":807},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:03.702Z"),"step":808},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:03.842Z"),"step":809},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:07.794Z"),"step":811},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:07.946Z"),"step":812},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:08.081Z"),"step":813},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:08.215Z"),"step":814},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:08.347Z"),"step":815},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:08.490Z"),"step":816},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:08.625Z"),"step":817},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:08.750Z"),"step":818},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:19:08.877Z"),"step":819},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:12.481Z"),"step":821},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:12.643Z"),"step":822},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:12.810Z"),"step":823},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:12.982Z"),"step":824},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:13.116Z"),"step":825},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:13.254Z"),"step":826},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:13.425Z"),"step":827},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:13.570Z"),"step":828},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:13.707Z"),"step":829},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:17.381Z"),"step":831},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:17.518Z"),"step":832},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:17.657Z"),"step":833},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:17.815Z"),"step":834},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:17.959Z"),"step":835},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:18.102Z"),"step":836},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:18.249Z"),"step":837},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:18.389Z"),"step":838},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:18.519Z"),"step":839},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:22.125Z"),"step":841},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:22.257Z"),"step":842},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.393Z"),"step":843},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.524Z"),"step":844},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.657Z"),"step":845},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:22.791Z"),"step":846},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:22.926Z"),"step":847},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:23.060Z"),"step":848},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:23.192Z"),"step":849},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:26.487Z"),"step":851},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:26.617Z"),"step":852},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:26.744Z"),"step":853},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:26.881Z"),"step":854},{"scalar":0.8700000047683716,"wall_time":new Date("2016-06-24T04:19:27.016Z"),"step":855},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:27.157Z"),"step":856},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:27.288Z"),"step":857},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:27.412Z"),"step":858},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:27.549Z"),"step":859},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:30.933Z"),"step":861},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:31.071Z"),"step":862},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:31.211Z"),"step":863},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:31.350Z"),"step":864},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:31.508Z"),"step":865},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:31.653Z"),"step":866},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:31.795Z"),"step":867},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:31.941Z"),"step":868},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:32.077Z"),"step":869},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:35.373Z"),"step":871},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:35.499Z"),"step":872},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:35.634Z"),"step":873},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:35.780Z"),"step":874},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:35.906Z"),"step":875},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:36.045Z"),"step":876},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:36.176Z"),"step":877},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:36.319Z"),"step":878},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:36.449Z"),"step":879},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:39.764Z"),"step":881},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:39.896Z"),"step":882},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:40.028Z"),"step":883},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:40.158Z"),"step":884},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:40.296Z"),"step":885},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:40.422Z"),"step":886},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:40.561Z"),"step":887},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:40.688Z"),"step":888},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:40.822Z"),"step":889},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:44.112Z"),"step":891},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.247Z"),"step":892},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:44.384Z"),"step":893},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.516Z"),"step":894},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:44.643Z"),"step":895},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.778Z"),"step":896},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:44.914Z"),"step":897},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:45.051Z"),"step":898},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:45.179Z"),"step":899},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:48.465Z"),"step":901},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:48.593Z"),"step":902},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:48.728Z"),"step":903},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:48.866Z"),"step":904},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:48.998Z"),"step":905},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:49.130Z"),"step":906},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:49.256Z"),"step":907},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:49.393Z"),"step":908},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:19:49.521Z"),"step":909},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:52.825Z"),"step":911},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:52.956Z"),"step":912},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:53.101Z"),"step":913},{"scalar":1,"wall_time":new Date("2016-06-24T04:19:53.235Z"),"step":914},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:53.368Z"),"step":915},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:53.500Z"),"step":916},{"scalar":0.9100000262260437,"wall_time":new Date("2016-06-24T04:19:53.623Z"),"step":917},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:53.768Z"),"step":918},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:19:53.899Z"),"step":919},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:57.197Z"),"step":921},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:57.333Z"),"step":922},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:57.467Z"),"step":923},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:19:57.594Z"),"step":924},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:57.731Z"),"step":925},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:19:57.866Z"),"step":926},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:19:57.991Z"),"step":927},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:19:58.128Z"),"step":928},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:19:58.260Z"),"step":929},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:01.545Z"),"step":931},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:01.681Z"),"step":932},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:01.814Z"),"step":933},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:01.950Z"),"step":934},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:02.111Z"),"step":935},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:02.255Z"),"step":936},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:02.399Z"),"step":937},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:02.542Z"),"step":938},{"scalar":1,"wall_time":new Date("2016-06-24T04:20:02.672Z"),"step":939},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:06.030Z"),"step":941},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:06.172Z"),"step":942},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:06.314Z"),"step":943},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:06.436Z"),"step":944},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:06.572Z"),"step":945},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:06.704Z"),"step":946},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:06.833Z"),"step":947},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:06.966Z"),"step":948},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:07.105Z"),"step":949},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:10.389Z"),"step":951},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:10.522Z"),"step":952},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:10.660Z"),"step":953},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:10.806Z"),"step":954},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:10.939Z"),"step":955},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:11.073Z"),"step":956},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:11.204Z"),"step":957},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:11.339Z"),"step":958},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:11.465Z"),"step":959},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:14.750Z"),"step":961},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:14.879Z"),"step":962},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:15.017Z"),"step":963},{"scalar":0.9200000166893005,"wall_time":new Date("2016-06-24T04:20:15.152Z"),"step":964},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:15.288Z"),"step":965},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:15.415Z"),"step":966},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:15.550Z"),"step":967},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:15.679Z"),"step":968},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:15.815Z"),"step":969},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:19.650Z"),"step":971},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:20:19.786Z"),"step":972},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:19.922Z"),"step":973},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:20.058Z"),"step":974},{"scalar":0.949999988079071,"wall_time":new Date("2016-06-24T04:20:20.198Z"),"step":975},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:20.326Z"),"step":976},{"scalar":0.9300000071525574,"wall_time":new Date("2016-06-24T04:20:20.461Z"),"step":977},{"scalar":1,"wall_time":new Date("2016-06-24T04:20:20.588Z"),"step":978},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:20.718Z"),"step":979},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:24.015Z"),"step":981},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:24.151Z"),"step":982},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:24.300Z"),"step":983},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:24.447Z"),"step":984},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:24.576Z"),"step":985},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:24.701Z"),"step":986},{"scalar":0.9399999976158142,"wall_time":new Date("2016-06-24T04:20:24.830Z"),"step":987},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:24.977Z"),"step":988},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:25.134Z"),"step":989},{"scalar":0.9599999785423279,"wall_time":new Date("2016-06-24T04:20:28.551Z"),"step":991},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:28.681Z"),"step":992},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:28.812Z"),"step":993},{"scalar":0.9900000095367432,"wall_time":new Date("2016-06-24T04:20:28.949Z"),"step":994},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:29.086Z"),"step":995},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:29.219Z"),"step":996},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:29.351Z"),"step":997},{"scalar":0.9700000286102295,"wall_time":new Date("2016-06-24T04:20:29.497Z"),"step":998},{"scalar":0.9800000190734863,"wall_time":new Date("2016-06-24T04:20:29.637Z"),"step":999,"name":"train","relative":0.12446694444444445}]
-      };
-    </script>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/vz_line_chart/dragZoomInteraction.ts b/tensorflow/tensorboard/components/vz_line_chart/dragZoomInteraction.ts
deleted file mode 100644
index 0e5a7c1d5b..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/dragZoomInteraction.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module Plottable {
-export class DragZoomLayer extends Components.SelectionBoxLayer {
-  private _dragInteraction: Interactions.Drag;
-  private _doubleClickInteraction: Interactions.DoubleClick;
-  private isZoomed = false;
-  private easeFn: (t: number) => number = d3.ease('cubic-in-out');
-  private _animationTime = 750;
-  private onStart: Function;
-  private onEnd: Function;
-  private unzoomMethod: Function;
-
-  /**
-   * Constructs a SelectionBoxLayer with an attached DragInteraction and
-   * ClickInteraction. On drag, it triggers an animated zoom into the box
-   * that was dragged. On double click, it zooms back out to the original
-   * view, before any zooming.
-   * The zoom animation uses an easing function (default
-   * d3.ease('cubic-in-out')) and is customizable.
-   * Usage: Construct the selection box layer and attach x and y scales,
-   * and then add the layer over the plot you are zooming on using a
-   * Component Group.
-   * TODO(danmane) - merge this into Plottable
-   */
-  constructor(
-      xScale: QuantitativeScale<number|{valueOf(): number}>,
-      yScale: QuantitativeScale<number|{valueOf(): number}>,
-      unzoomMethod: Function) {
-    super();
-    this.xScale(xScale);
-    this.yScale(yScale);
-    this._dragInteraction = new Interactions.Drag();
-    this._dragInteraction.attachTo(this);
-    this._doubleClickInteraction = new Interactions.DoubleClick();
-    this._doubleClickInteraction.attachTo(this);
-    this.setupCallbacks();
-    this.unzoomMethod = unzoomMethod;
-  }
-
-  /**
-   * Register a method that calls when the DragZoom interaction starts.
-   */
-  public interactionStart(cb: Function) { this.onStart = cb; }
-
-  /**
-   * Register a method that calls when the DragZoom interaction ends.
-   */
-  public interactionEnd(cb: Function) { this.onEnd = cb; }
-
-  private setupCallbacks() {
-    let dragging = false;
-    this._dragInteraction.onDragStart((startPoint: Point) => {
-      this.bounds({
-        topLeft: startPoint,
-        bottomRight: startPoint,
-      });
-      this.onStart();
-    });
-    this._dragInteraction.onDrag((startPoint, endPoint) => {
-      this.bounds({topLeft: startPoint, bottomRight: endPoint});
-      this.boxVisible(true);
-      dragging = true;
-    });
-    this._dragInteraction.onDragEnd((startPoint, endPoint) => {
-      this.boxVisible(false);
-      this.bounds({topLeft: startPoint, bottomRight: endPoint});
-      if (dragging) {
-        this.zoom();
-      } else {
-        this.onEnd();
-      }
-      dragging = false;
-    });
-
-    this._doubleClickInteraction.onDoubleClick(this.unzoom.bind(this));
-  }
-
-  /* Set the time (in ms) over which the zoom will interpolate.
-   * 0 implies no interpolation. (ie zoom is instant)
-   */
-  public animationTime(): number;
-  public animationTime(animationTime: number): DragZoomLayer;
-  public animationTime(animationTime?: number): any {
-    if (animationTime == null) {
-      return this._animationTime;
-    }
-    if (animationTime < 0) {
-      throw new Error('animationTime cannot be negative');
-    }
-    this._animationTime = animationTime;
-    return this;
-  }
-
-  /**
-   * Set the easing function, which determines how the zoom interpolates
-   * over time.
-   */
-  public ease(fn: (t: number) => number): DragZoomLayer {
-    if (typeof(fn) !== 'function') {
-      throw new Error('ease function must be a function');
-    }
-    if (fn(0) !== 0 || fn(1) !== 1) {
-      Utils.Window.warn(
-          'Easing function does not maintain invariant ' +
-          'f(0)==0 && f(1)==1. Bad behavior may result.');
-    }
-    this.easeFn = fn;
-    return this;
-  }
-
-  // Zoom into extent of the selection box bounds
-  private zoom() {
-    let x0: number = this.xExtent()[0].valueOf();
-    let x1: number = this.xExtent()[1].valueOf();
-    let y0: number = this.yExtent()[1].valueOf();
-    let y1: number = this.yExtent()[0].valueOf();
-
-    if (x0 === x1 || y0 === y1) {
-      return;
-    }
-
-    if (!this.isZoomed) {
-      this.isZoomed = true;
-    }
-    this.interpolateZoom(x0, x1, y0, y1);
-  }
-
-  // Restore the scales to their state before any zoom
-  private unzoom() {
-    if (!this.isZoomed) {
-      return;
-    }
-    this.isZoomed = false;
-    let xScale = this.xScale() as any;
-    xScale._domainMin = null;
-    xScale._domainMax = null;
-    let xDomain = xScale._getExtent();
-    this.xScale().domain(xDomain);
-    this.unzoomMethod();
-  }
-
-  // If we are zooming, disable interactions, to avoid contention
-  private isZooming(isZooming: boolean) {
-    this._dragInteraction.enabled(!isZooming);
-    this._doubleClickInteraction.enabled(!isZooming);
-  }
-
-  private interpolateZoom(x0f: number, x1f: number, y0f: number, y1f: number) {
-    let x0s: number = this.xScale().domain()[0].valueOf();
-    let x1s: number = this.xScale().domain()[1].valueOf();
-    let y0s: number = this.yScale().domain()[0].valueOf();
-    let y1s: number = this.yScale().domain()[1].valueOf();
-
-    // Copy a ref to the ease fn, so that changing ease wont affect zooms in
-    // progress.
-    let ease = this.easeFn;
-    let interpolator = (a: number, b: number, p: number) =>
-        d3.interpolateNumber(a, b)(ease(p));
-
-    this.isZooming(true);
-    let start = Date.now();
-    let draw = () => {
-      let now = Date.now();
-      let passed = now - start;
-      let p = this._animationTime === 0 ?
-          1 :
-          Math.min(1, passed / this._animationTime);
-      let x0 = interpolator(x0s, x0f, p);
-      let x1 = interpolator(x1s, x1f, p);
-      let y0 = interpolator(y0s, y0f, p);
-      let y1 = interpolator(y1s, y1f, p);
-      this.xScale().domain([x0, x1]);
-      this.yScale().domain([y0, y1]);
-      if (p < 1) {
-        Utils.DOM.requestAnimationFramePolyfill(draw);
-      } else {
-        this.onEnd();
-        this.isZooming(false);
-      }
-    };
-    draw();
-  }
-}
-}
diff --git a/tensorflow/tensorboard/components/vz_line_chart/index.html b/tensorflow/tensorboard/components/vz_line_chart/index.html
deleted file mode 100644
index b7b399d3fc..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <title>vz-line-chart</title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="../webcomponentsjs/webcomponents-lite.js"></script>
-    <link rel="import" href="../iron-component-page/iron-component-page.html">
-  </head>
-  <body>
-    <iron-component-page src="vz-line-chart.html"></iron-component-page>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts b/tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts
deleted file mode 100644
index 688a00714b..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/vz-chart-helpers.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-module VZ.ChartHelpers {
-  export interface Datum {
-    wall_time: Date;
-    step: number;
-  }
-
-  export interface Scalar {
-    scalar: number;
-    smoothed: number;
-  }
-
-  export type ScalarDatum = Datum & Scalar;
-
-  export type DataFn = (run: string, tag: string) =>
-      Promise<Array<Datum>>;
-
-  export let Y_TOOLTIP_FORMATTER_PRECISION = 4;
-  export let STEP_FORMATTER_PRECISION = 4;
-  export let Y_AXIS_FORMATTER_PRECISION = 3;
-  export let TOOLTIP_Y_PIXEL_OFFSET = 20;
-  export let TOOLTIP_CIRCLE_SIZE = 4;
-  export let NAN_SYMBOL_SIZE = 6;
-
-  export interface Point {
-    x: number;  // pixel space
-    y: number;  // pixel space
-    datum: ScalarDatum;
-    dataset: Plottable.Dataset;
-  }
-
-  /* Create a formatter function that will switch between exponential and
-   * regular display depending on the scale of the number being formatted,
-   * and show `digits` significant digits.
-   */
-  export function multiscaleFormatter(digits: number): ((v: number) => string) {
-    return (v: number) => {
-      let absv = Math.abs(v);
-      if (absv < 1E-15) {
-        // Sometimes zero-like values get an annoying representation
-        absv = 0;
-      }
-      let f: (x: number) => string;
-      if (absv >= 1E4) {
-        f = d3.format('.' + digits + 'e');
-      } else if (absv > 0 && absv < 0.01) {
-        f = d3.format('.' + digits + 'e');
-      } else {
-        f = d3.format('.' + digits + 'g');
-      }
-      return f(v);
-    };
-  }
-
-  /* Compute an appropriate domain given an array of all the values that are
-   * going to be displayed. If ignoreOutliers is true, it will ignore the
-   * lowest 10% and highest 10% of the data when computing a domain.
-   * It has n log n performance when ignoreOutliers is true, as it needs to
-   * sort the data.
-   */
-  export function computeDomain(values: number[], ignoreOutliers: boolean) {
-    if (values.length === 0) {
-      return [-0.1, 1.1];
-    }
-    let a: number;
-    let b: number;
-    if (ignoreOutliers) {
-      let sorted = _.sortBy(values);
-      a = d3.quantile(sorted, 0.05);
-      b = d3.quantile(sorted, 0.95);
-    } else {
-      a = d3.min(values);
-      b = d3.max(values);
-    }
-
-    let padding: number;
-    let span = b - a;
-    if (span === 0) {
-      // If b===a, we would create an empty range. We instead select the range
-      // [0, 2*a] if a > 0, or [-2*a, 0] if a < 0, plus a little bit of
-      // extra padding on the top and bottom of the plot.
-      padding = Math.abs(a) * 1.1 + 1.1;
-    } else {
-      padding = span * 0.2;
-    }
-
-    let lower: number;
-    if (a >= 0 && a < span) {
-      // We include the intercept (y = 0) if doing so less than doubles the span
-      // of the y-axis. (We actually select a lower bound that's slightly less
-      // than 0 so that 0.00 will clearly be written on the lower edge of the
-      // chart. The label on the lowest tick is often filtered out.)
-      lower = -0.1 * b;
-    } else {
-      lower = a - padding;
-    }
-
-
-    let domain = [lower, b + padding];
-    domain = d3.scale.linear().domain(domain).nice().domain();
-    return domain;
-  }
-
-  export function accessorize(key: string): Plottable.Accessor<number> {
-    return (d: any, index: number, dataset: Plottable.Dataset) => d[key];
-  }
-
-  export interface XComponents {
-    /* tslint:disable */
-    scale: Plottable.Scales.Linear|Plottable.Scales.Time,
-        axis: Plottable.Axes.Numeric|Plottable.Axes.Time,
-        accessor: Plottable.Accessor<number|Date>,
-    /* tslint:enable */
-  }
-
-  export let stepFormatter =
-      Plottable.Formatters.siSuffix(STEP_FORMATTER_PRECISION);
-  export function stepX(): XComponents {
-    let scale = new Plottable.Scales.Linear();
-    let axis = new Plottable.Axes.Numeric(scale, 'bottom');
-    axis.formatter(stepFormatter);
-    return {
-      scale: scale,
-      axis: axis,
-      accessor: (d: Datum) => d.step,
-    };
-  }
-
-  export let timeFormatter = Plottable.Formatters.time('%a %b %e, %H:%M:%S');
-
-  export function wallX(): XComponents {
-    let scale = new Plottable.Scales.Time();
-    return {
-      scale: scale,
-      axis: new Plottable.Axes.Time(scale, 'bottom'),
-      accessor: (d: Datum) => d.wall_time,
-    };
-  }
-  export let relativeAccessor =
-      (d: any, index: number, dataset: Plottable.Dataset) => {
-        // We may be rendering the final-point datum for scatterplot.
-        // If so, we will have already provided the 'relative' property
-        if (d.relative != null) {
-          return d.relative;
-        }
-        let data = dataset.data();
-        // I can't imagine how this function would be called when the data is
-        // empty (after all, it iterates over the data), but lets guard just
-        // to be safe.
-        let first = data.length > 0 ? +data[0].wall_time : 0;
-        return (+d.wall_time - first) / (60 * 60 * 1000);  // ms to hours
-      };
-
-  export let relativeFormatter = (n: number) => {
-    // we will always show 2 units of precision, e.g days and hours, or
-    // minutes and seconds, but not hours and minutes and seconds
-    let ret = '';
-    let days = Math.floor(n / 24);
-    n -= (days * 24);
-    if (days) {
-      ret += days + 'd ';
-    }
-    let hours = Math.floor(n);
-    n -= hours;
-    n *= 60;
-    if (hours || days) {
-      ret += hours + 'h ';
-    }
-    let minutes = Math.floor(n);
-    n -= minutes;
-    n *= 60;
-    if (minutes || hours || days) {
-      ret += minutes + 'm ';
-    }
-    let seconds = Math.floor(n);
-    return ret + seconds + 's';
-  };
-  export function relativeX(): XComponents {
-    let scale = new Plottable.Scales.Linear();
-    return {
-      scale: scale,
-      axis: new Plottable.Axes.Numeric(scale, 'bottom'),
-      accessor: relativeAccessor,
-    };
-  }
-
-  // a very literal definition of NaN: true for NaN for a non-number type
-  // or null, etc. False for Infinity or -Infinity
-  export let isNaN = (x) => +x !== x;
-
-  export function getXComponents(xType: string): XComponents {
-    switch (xType) {
-      case 'step':
-        return stepX();
-      case 'wall_time':
-        return wallX();
-      case 'relative':
-        return relativeX();
-      default:
-        throw new Error('invalid xType: ' + xType);
-    }
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.html b/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.html
deleted file mode 100644
index ccd74d6e3d..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.html
+++ /dev/null
@@ -1,369 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-imports/plottable.html">
-<link rel="import" href="../tf-imports/lodash.html">
-
-<!--
-vz-line-chart creates an element that draws a line chart for
-displaying event values.
-
-This line chart supports drawing multiple lines at the same time, with features
-such as different X scales (linear and temporal), tooltips and smoothing.
-
-@element vz-line-chart
-@demo demo/index.html
--->
-<dom-module id="vz-line-chart">
-  <template>
-    <div id="tooltip">
-      <table>
-        <thead>
-          <tr>
-            <th></th>
-            <th>Name</th>
-            <template is="dom-if" if="{{smoothingEnabled}}">
-              <th>Smoothed</th>
-            </template>
-            <th>Value</th>
-            <th>Step</th>
-            <th>Time</th>
-            <th>Relative</th>
-          </tr>
-        </thead>
-        <tbody>
-        </tbody>
-      </table>
-    </div>
-    <svg id="chartsvg"></svg>
-    <style>
-      :host {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        display: flex;
-        flex-direction: column;
-        flex-grow: 1;
-        flex-shrink: 1;
-        position: relative;
-        outline: none;
-      }
-      svg {
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        flex-grow: 1;
-        flex-shrink: 1;
-      }
-      td {
-        padding-left: 5px;
-        padding-right: 5px;
-        font-size: 13px;
-        opacity: 1;
-      }
-      #tooltip {
-        pointer-events: none;
-        position: absolute;
-        opacity: 0;
-        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-        font-size: 14px;
-        background: rgba(0, 0, 0, 0.8);
-        color: white;
-        border-radius: 4px;
-        line-height: 1.4em;
-        padding: 8px;
-        z-index: 5;
-        cursor: none;
-        margin-top: 10px;
-      }
-      .swatch {
-        border-radius: 50%;
-        width: 14px;
-        height: 14px;
-        display: block;
-        border: 2px solid rgba(0,0,0,0);
-      }
-      .closest .swatch {
-        border: 2px solid white;
-      }
-      th {
-        padding-left: 5px;
-        padding-right: 5px;
-        text-align: left;
-      }
-      .distant td {
-        opacity: 0.8;
-      }
-
-      .distant td.swatch {
-        opacity: 1;
-      }
-
-      .ghost {
-        opacity: 0.2;
-        stroke-width: 1px;
-      }
-
-      #chartsvg line.guide-line {
-        stroke: #999;
-        stroke-width: 1.5px;
-      }
-
-    </style>
-  </template>
-  <script src="dragZoomInteraction.js"></script>
-  <script src="vz-line-chart.js"></script>
-  <script src="vz-chart-helpers.js"></script>
-  <script>
-    Polymer({
-      is: "vz-line-chart",
-      properties: {
-        /**
-         * Scale that maps series names to colors. The default colors are from
-         * d3.scale.category10() scale. Use this property to replace the default
-         * line colors with colors of your own choice.
-         * @type {Plottable.Scales.Color}
-         * @required
-         */
-        colorScale: {
-          type: Object,
-          value: function() {
-            return new Plottable.Scales.Color()
-                .range(d3.scale.category10().range());
-          }
-        },
-
-        /**
-         * Whether smoothing is enabled or not. If true, smoothed lines will be
-         * plotted in the chart while the unsmoothed lines will be ghosted in
-         * the background.
-         *
-         * The smoothing algorithm is a simple moving average, which, given a
-         * point p and a window w, replaces p with a simple average of the
-         * points in the [p - floor(w/2), p + floor(w/2)] range.  If there
-         * aren't enough points to cover the entire window to the left, the
-         * window is reduced to fit exactly the amount of elements available.
-         * This means that the smoothed line will be less in and gradually
-         * become more smooth until the desired window is reached. However when
-         * there aren't enough points on the right, the line stops being
-         * rendered at all.
-         */
-        smoothingEnabled: {
-          type: Boolean,
-          value: false
-        },
-
-        /**
-         * Weight (between 0.0 and 1.0) of the smoothing. This weight controls
-         * the window size, and a weight of 1.0 means using 50% of the entire
-         * dataset as the window, while a weight of 0.0 means using a window of
-         * 0 (and thus replacing each point with themselves).
-         *
-         * The growth between 0.0 and 1.0 is not linear though. Because
-         * changing the window from 0% to 30% of the dataset smooths the line a
-         * lot more than changing the window from 70% to 100%, an exponential
-         * function is used instead: http://i.imgur.com/bDrhEZU.png. This
-         * function increases the size of the window slowly at the beginning
-         * and gradually speeds up the growth, but 0.0 still means a window of
-         * 0 and 1.0 still means a window of the dataset's length.
-         */
-        smoothingWeight: {
-          type: Number,
-          value: 0.6
-        },
-
-        /**
-         * The way to display the X values. Allows:
-         * - "step" - Linear scale using the  "step" property of the datum.
-         * - "wall_time" - Temporal scale using the "wall_time" property of the
-         * datum.
-         * - "relative" - Temporal scale using the "relative" property of the
-         * datum if it is present or calculating from "wall_time" if it isn't.
-         */
-        xType: {
-          type: String,
-          value: 'step'
-        },
-
-        /**
-         * The scale for the y-axis. Allows:
-         * - "linear" - linear scale (Plottable.Scales.Linear)
-         * - "log" - modified-log scale (Plottable.Scales.ModifiedLog)
-         */
-        yScaleType: {
-          type: String,
-          value: 'linear'
-        },
-
-        /**
-         * Whether to ignore outlier data when computing the yScale domain.
-         */
-
-        ignoreYOutliers: {
-          type: Boolean,
-          value: false,
-        },
-
-        /**
-         * Change how the tooltip is sorted. Allows:
-         * - "default" - Sort the tooltip by input order.
-         * - "ascending" - Sort the tooltip by ascending value.
-         * - "descending" - Sort the tooltip by descending value.
-         * - "nearest" - Sort the tooltip by closest to cursor.
-         */
-        tooltipSortingMethod: {
-          type: String,
-          value: 'default'
-        },
-
-        /**
-         * Change how the tooltip is positioned. Allows:
-         * - "bottom" - Position the tooltip on the bottom of the chart.
-         * - "right" - Position the tooltip to the right of the chart.
-         */
-        tooltipPosition: {
-          type: String,
-          value: 'bottom'
-        },
-
-        _attached: Boolean,
-        _chart: Object,
-        _visibleSeriesCache: {
-          type: Array,
-          value: function() { return [] }
-        },
-        _seriesDataCache: {
-          type: Object,
-          value: function() { return {} }
-        },
-        _makeChartAsyncCallbackId: {
-          type: Number,
-          value: null
-        }
-      },
-      observers: [
-        "_makeChart(xType, yScaleType, colorScale, _attached)",
-        "_reloadFromCache(_chart)",
-        "_smoothingChanged(smoothingEnabled, smoothingWeight, _chart)",
-        "_tooltipSortingMethodChanged(tooltipSortingMethod, _chart)",
-        "_tooltipPositionChanged(tooltipPosition, _chart)",
-        "_outliersChanged(ignoreYOutliers, _chart)"
-      ],
-
-      /**
-       * Sets the series that the chart displays. Series with other names will
-       * not be displayed.
-       *
-       * @param {String[]} names Array with the names of the series to
-       * display.
-       */
-      setVisibleSeries: function(names) {
-        this._visibleSeriesCache = names;
-        if (this._chart) {
-          this._chart.setVisibleSeries(names);
-          this.redraw();
-        }
-      },
-
-      /**
-       * Sets the data of one of the series. Note that to display this series
-       * its name must be in the setVisibleSeries() array.
-       *
-       * @param {String} name Name of the series.
-       * @param {VZ.ChartHelpers.ScalarDatum[]} data Data of the series. This is
-       * an array of objects with at least the following properties:
-       * - step: (Number) - index of the datum.
-       * - wall_time: (Date) - Date object with the datum's time.
-       * - scalar: (Number) - Value of the datum.
-       */
-      setSeriesData: function(name, data) {
-        this._seriesDataCache[name] = data;
-        if (this._chart) {
-          this._chart.setSeriesData(name, data);
-        }
-      },
-
-      /**
-       * Re-renders the chart. Useful if e.g. the container size changed.
-       */
-      redraw: function() {
-        this._chart.redraw();
-      },
-      attached: function() {
-        this._attached = true;
-      },
-      detached: function() {
-        this._attached = false;
-      },
-      ready: function() {
-        this.scopeSubtree(this.$.tooltip, true);
-        this.scopeSubtree(this.$.chartsvg, true);
-      },
-      _makeChart: function(xType, yScaleType, colorScale, _attached) {
-        if (this._makeChartAsyncCallbackId !== null) {
-          this.cancelAsync(this._makeChartAsyncCallbackId);
-          this._makeChartAsyncCallbackId = null;
-        }
-
-        this._makeChartAsyncCallbackId = this.async(function() {
-          this._makeChartAsyncCallbackId = null;
-          if (!this._attached) return;
-          if (this._chart) this._chart.destroy();
-          var tooltip = d3.select(this.$.tooltip);
-          var chart = new VZ.LineChart(xType, yScaleType, colorScale, tooltip);
-          var svg = d3.select(this.$.chartsvg);
-          chart.renderTo(svg);
-          this._chart = chart;
-        }, 350);
-      },
-      _reloadFromCache: function() {
-        if(this._chart) {
-          this._chart.setVisibleSeries(this._visibleSeriesCache);
-          this._visibleSeriesCache.forEach(function(name) {
-            this._chart.setSeriesData(name, this._seriesDataCache[name] || []);
-          }.bind(this));
-        }
-      },
-      _smoothingChanged: function() {
-        if(!this._chart) {
-          return;
-        }
-        if(this.smoothingEnabled) {
-          this._chart.smoothingUpdate(this.smoothingWeight);
-        }
-        else {
-          this._chart.smoothingDisable();
-        }
-      },
-      _outliersChanged: function() {
-        if (!this._chart) {
-          return;
-        }
-        this._chart.ignoreYOutliers(this.ignoreYOutliers);
-      },
-      _tooltipSortingMethodChanged: function() {
-        if(this._chart) {
-          this._chart.setTooltipSortingMethod(this.tooltipSortingMethod);
-        }
-      },
-      _tooltipPositionChanged: function() {
-        if (this._chart) {
-          this._chart.setTooltipPosition(this.tooltipPosition);
-        }
-      }
-    });
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts b/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
deleted file mode 100644
index 4bc6a8a837..0000000000
--- a/tensorflow/tensorboard/components/vz_line_chart/vz-line-chart.ts
+++ /dev/null
@@ -1,581 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/* tslint:disable:no-namespace variable-name */
-
-module VZ {
-  export class LineChart {
-    private name2datasets: {[name: string]: Plottable.Dataset};
-    private seriesNames: string[];
-
-    private xAccessor: Plottable.Accessor<number|Date>;
-    private xScale: Plottable.QuantitativeScale<number|Date>;
-    private yScale: Plottable.QuantitativeScale<number>;
-    private gridlines: Plottable.Components.Gridlines;
-    private center: Plottable.Components.Group;
-    private xAxis: Plottable.Axes.Numeric|Plottable.Axes.Time;
-    private yAxis: Plottable.Axes.Numeric;
-    private outer: Plottable.Components.Table;
-    private colorScale: Plottable.Scales.Color;
-    private tooltip: d3.Selection<any>;
-    private dzl: Plottable.DragZoomLayer;
-
-    private linePlot: Plottable.Plots.Line<number|Date>;
-    private smoothLinePlot: Plottable.Plots.Line<number|Date>;
-    private scatterPlot: Plottable.Plots.Scatter<number|Date, Number>;
-    private nanDisplay: Plottable.Plots.Scatter<number|Date, Number>;
-    private scalarAccessor: Plottable.Accessor<number>;
-    private smoothedAccessor: Plottable.Accessor<number>;
-    private lastPointsDataset: Plottable.Dataset;
-    private datasets: Plottable.Dataset[];
-    private onDatasetChanged: (dataset: Plottable.Dataset) => void;
-    private nanDataset: Plottable.Dataset;
-    private smoothingWeight: number;
-    private smoothingEnabled: Boolean;
-    private tooltipSortingMethod: string;
-    private tooltipPosition: string;
-    private _ignoreYOutliers: boolean;
-
-    private targetSVG: d3.Selection<any>;
-
-    constructor(
-        xType: string, yScaleType: string, colorScale: Plottable.Scales.Color,
-        tooltip: d3.Selection<any>) {
-      this.seriesNames = [];
-      this.name2datasets = {};
-      this.colorScale = colorScale;
-      this.tooltip = tooltip;
-      this.datasets = [];
-      this._ignoreYOutliers = false;
-      // lastPointDataset is a dataset that contains just the last point of
-      // every dataset we're currently drawing.
-      this.lastPointsDataset = new Plottable.Dataset();
-      this.nanDataset = new Plottable.Dataset();
-      // need to do a single bind, so we can deregister the callback from
-      // old Plottable.Datasets. (Deregistration is done by identity checks.)
-      this.onDatasetChanged = this._onDatasetChanged.bind(this);
-      this.buildChart(xType, yScaleType);
-    }
-
-    private buildChart(xType: string, yScaleType: string) {
-      if (this.outer) {
-        this.outer.destroy();
-      }
-      let xComponents = VZ.ChartHelpers.getXComponents(xType);
-      this.xAccessor = xComponents.accessor;
-      this.xScale = xComponents.scale;
-      this.xAxis = xComponents.axis;
-      this.xAxis.margin(0).tickLabelPadding(3);
-      this.yScale = LineChart.getYScaleFromType(yScaleType);
-      this.yAxis = new Plottable.Axes.Numeric(this.yScale, 'left');
-      let yFormatter = VZ.ChartHelpers.multiscaleFormatter(
-          VZ.ChartHelpers.Y_AXIS_FORMATTER_PRECISION);
-      this.yAxis.margin(0).tickLabelPadding(5).formatter(yFormatter);
-      this.yAxis.usesTextWidthApproximation(true);
-
-      this.dzl = new Plottable.DragZoomLayer(
-          this.xScale, this.yScale, this.updateSpecialDatasets.bind(this));
-
-      let center = this.buildPlot(this.xAccessor, this.xScale, this.yScale);
-
-      this.gridlines =
-          new Plottable.Components.Gridlines(this.xScale, this.yScale);
-
-      let xZeroLine = new Plottable.Components.GuideLineLayer('horizontal');
-      xZeroLine.scale(this.yScale).value(0);
-      let yZeroLine = new Plottable.Components.GuideLineLayer('vertical');
-      yZeroLine.scale(this.xScale).value(0);
-
-      this.center = new Plottable.Components.Group(
-          [this.gridlines, xZeroLine, yZeroLine, center, this.dzl]);
-      this.outer =  new Plottable.Components.Table([
-                                                   [this.yAxis, this.center],
-                                                   [null, this.xAxis]
-                                                  ]);
-    }
-
-    private buildPlot(xAccessor, xScale, yScale): Plottable.Component {
-      this.scalarAccessor = (d: VZ.ChartHelpers.ScalarDatum) => d.scalar;
-      this.smoothedAccessor = (d: VZ.ChartHelpers.ScalarDatum) => d.smoothed;
-      let linePlot = new Plottable.Plots.Line<number|Date>();
-      linePlot.x(xAccessor, xScale);
-      linePlot.y(this.scalarAccessor, yScale);
-      linePlot.attr(
-          'stroke', (d: VZ.ChartHelpers.Datum, i: number,
-                     dataset: Plottable.Dataset) =>
-                        this.colorScale.scale(dataset.metadata().name));
-      this.linePlot = linePlot;
-      let group = this.setupTooltips(linePlot);
-
-      let smoothLinePlot = new Plottable.Plots.Line<number|Date>();
-      smoothLinePlot.x(xAccessor, xScale);
-      smoothLinePlot.y(this.smoothedAccessor, yScale);
-      smoothLinePlot.attr(
-          'stroke', (d: VZ.ChartHelpers.Datum, i: number,
-                     dataset: Plottable.Dataset) =>
-                        this.colorScale.scale(dataset.metadata().name));
-      this.smoothLinePlot = smoothLinePlot;
-
-      // The scatterPlot will display the last point for each dataset.
-      // This way, if there is only one datum for the series, it is still
-      // visible. We hide it when tooltips are active to keep things clean.
-      let scatterPlot = new Plottable.Plots.Scatter<number|Date, number>();
-      scatterPlot.x(xAccessor, xScale);
-      scatterPlot.y(this.scalarAccessor, yScale);
-      scatterPlot.attr('fill', (d: any) => this.colorScale.scale(d.name));
-      scatterPlot.attr('opacity', 1);
-      scatterPlot.size(VZ.ChartHelpers.TOOLTIP_CIRCLE_SIZE * 2);
-      scatterPlot.datasets([this.lastPointsDataset]);
-      this.scatterPlot = scatterPlot;
-
-      let nanDisplay = new Plottable.Plots.Scatter<number|Date, number>();
-      nanDisplay.x(xAccessor, xScale);
-      nanDisplay.y((x) => x.displayY, yScale);
-      nanDisplay.attr('fill', (d: any) => this.colorScale.scale(d.name));
-      nanDisplay.attr('opacity', 1);
-      nanDisplay.size(VZ.ChartHelpers.NAN_SYMBOL_SIZE * 2);
-      nanDisplay.datasets([this.nanDataset]);
-      nanDisplay.symbol(Plottable.SymbolFactories.triangleUp);
-      this.nanDisplay = nanDisplay;
-
-      return new Plottable.Components.Group(
-          [nanDisplay, scatterPlot, smoothLinePlot, group]);
-    }
-
-    /** Updates the chart when a dataset changes. Called every time the data of
-     * a dataset changes to update the charts.
-     */
-    private _onDatasetChanged(dataset: Plottable.Dataset) {
-      if (this.smoothingEnabled) {
-        this.resmoothDataset(dataset);
-      }
-      this.updateSpecialDatasets();
-    }
-
-    public ignoreYOutliers(ignoreYOutliers: boolean) {
-      if (ignoreYOutliers !== this._ignoreYOutliers) {
-        this._ignoreYOutliers = ignoreYOutliers;
-        this.updateSpecialDatasets();
-      }
-    }
-
-    private updateSpecialDatasets() {
-      if (this.smoothingEnabled) {
-        this.updateSpecialDatasetsWithAccessor(this.smoothedAccessor);
-      } else {
-        this.updateSpecialDatasetsWithAccessor(this.scalarAccessor);
-      }
-    }
-
-    /** Constructs special datasets. Each special dataset contains exceptional
-     * values from all of the regular datasets, e.g. last points in series, or
-     * NaN values. Those points will have a `name` and `relative` property added
-     * (since usually those are context in the surrounding dataset).
-     * The accessor will point to the correct data to access.
-     */
-    private updateSpecialDatasetsWithAccessor(accessor:
-                                                  Plottable.Accessor<number>) {
-      let lastPointsData =
-          this.datasets
-              .map((d) => {
-                let datum = null;
-                // filter out NaNs to ensure last point is a clean one
-                let nonNanData =
-                    d.data().filter((x) => !isNaN(accessor(x, -1, d)));
-                if (nonNanData.length > 0) {
-                  let idx = nonNanData.length - 1;
-                  datum = nonNanData[idx];
-                  datum.name = d.metadata().name;
-                  datum.relative =
-                      VZ.ChartHelpers.relativeAccessor(datum, -1, d);
-                }
-                return datum;
-              })
-              .filter((x) => x != null);
-      this.lastPointsDataset.data(lastPointsData);
-
-      // Take a dataset, return an array of NaN data points
-      // the NaN points will have a "displayY" property which is the
-      // y-value of a nearby point that was not NaN (0 if all points are NaN)
-      let datasetToNaNData = (d: Plottable.Dataset) => {
-        let displayY = null;
-        let data = d.data();
-        let i = 0;
-        while (i < data.length && displayY == null) {
-          if (!isNaN(accessor(data[i], -1, d))) {
-            displayY = accessor(data[i], -1, d);
-          }
-          i++;
-        }
-        if (displayY == null) {
-          displayY = 0;
-        }
-        let nanData = [];
-        for (i = 0; i < data.length; i++) {
-          if (!isNaN(accessor(data[i], -1, d))) {
-            displayY = accessor(data[i], -1, d);
-          } else {
-            data[i].name = d.metadata().name;
-            data[i].displayY = displayY;
-            data[i].relative = VZ.ChartHelpers.relativeAccessor(data[i], -1, d);
-            nanData.push(data[i]);
-          }
-        }
-        return nanData;
-      };
-      let nanData = _.flatten(this.datasets.map(datasetToNaNData));
-      this.nanDataset.data(nanData);
-
-      let datasetToValues: (d: Plottable.Dataset) => number[] = (d) => {
-        return d.data().map((x) => accessor(x, -1, d));
-      };
-      let vals = _.flatten(this.datasets.map(datasetToValues));
-      vals = vals.filter((x) => x === x && x !== Infinity && x !== -Infinity);
-      let domain = VZ.ChartHelpers.computeDomain(vals, this._ignoreYOutliers);
-      this.yScale.domain(domain);
-    }
-
-    private setupTooltips(plot: Plottable.XYPlot<number|Date, number>):
-        Plottable.Components.Group {
-      let pi = new Plottable.Interactions.Pointer();
-      pi.attachTo(plot);
-      // PointsComponent is a Plottable Component that will hold the little
-      // circles we draw over the closest data points
-      let pointsComponent = new Plottable.Component();
-      let group = new Plottable.Components.Group([plot, pointsComponent]);
-
-      let hideTooltips = () => {
-        this.tooltip.style('opacity', 0);
-        this.scatterPlot.attr('opacity', 1);
-        pointsComponent.content().selectAll('.point').remove();
-      };
-
-      let enabled = true;
-      let disableTooltips = () => {
-        enabled = false;
-        hideTooltips();
-      };
-      let enableTooltips = () => { enabled = true; };
-
-      this.dzl.interactionStart(disableTooltips);
-      this.dzl.interactionEnd(enableTooltips);
-
-      pi.onPointerMove((p: Plottable.Point) => {
-        if (!enabled) {
-          return;
-        }
-        let target: VZ.ChartHelpers.Point = {
-          x: p.x,
-          y: p.y,
-          datum: null,
-          dataset: null,
-        };
-
-
-        let bbox: SVGRect = (<any>this.gridlines.content().node()).getBBox();
-
-        // pts is the closets point to the tooltip for each dataset
-        let pts = plot.datasets()
-                      .map((dataset) => this.findClosestPoint(target, dataset))
-                      .filter(x => x != null);
-        let intersectsBBox = Plottable.Utils.DOM.intersectsBBox;
-        // We draw tooltips for points that are NaN, or are currently visible
-        let ptsForTooltips = pts.filter(
-            (p) => intersectsBBox(p.x, p.y, bbox) || isNaN(p.datum.scalar));
-        // Only draw little indicator circles for the non-NaN points
-        let ptsToCircle = ptsForTooltips.filter((p) => !isNaN(p.datum.scalar));
-
-        let ptsSelection: any =
-            pointsComponent.content().selectAll('.point').data(
-                ptsToCircle,
-                (p: VZ.ChartHelpers.Point) => p.dataset.metadata().name);
-        if (pts.length !== 0) {
-          ptsSelection.enter().append('circle').classed('point', true);
-          ptsSelection.attr('r', VZ.ChartHelpers.TOOLTIP_CIRCLE_SIZE)
-              .attr('cx', (p) => p.x)
-              .attr('cy', (p) => p.y)
-              .style('stroke', 'none')
-              .attr(
-                  'fill',
-                  (p) => this.colorScale.scale(p.dataset.metadata().name));
-          ptsSelection.exit().remove();
-          this.drawTooltips(ptsForTooltips, target);
-        } else {
-          hideTooltips();
-        }
-      });
-
-      pi.onPointerExit(hideTooltips);
-
-      return group;
-    }
-
-    private drawTooltips(
-        points: VZ.ChartHelpers.Point[], target: VZ.ChartHelpers.Point) {
-      // Formatters for value, step, and wall_time
-      this.scatterPlot.attr('opacity', 0);
-      let valueFormatter = VZ.ChartHelpers.multiscaleFormatter(
-          VZ.ChartHelpers.Y_TOOLTIP_FORMATTER_PRECISION);
-
-      let dist = (p: VZ.ChartHelpers.Point) =>
-          Math.pow(p.x - target.x, 2) + Math.pow(p.y - target.y, 2);
-      let closestDist = _.min(points.map(dist));
-
-      let valueSortMethod = this.scalarAccessor;
-      if (this.smoothingEnabled) {
-        valueSortMethod = this.smoothedAccessor;
-      }
-
-      if (this.tooltipSortingMethod === 'ascending') {
-        points =
-            _.sortBy(points, (d) => valueSortMethod(d.datum, -1, d.dataset));
-      } else if (this.tooltipSortingMethod === 'descending') {
-        points =
-            _.sortBy(points, (d) => valueSortMethod(d.datum, -1, d.dataset))
-                .reverse();
-      } else if (this.tooltipSortingMethod === 'nearest') {
-        points = _.sortBy(points, dist);
-      } else {
-        // The 'default' sorting method maintains the order of names passed to
-        // setVisibleSeries(). However we reverse that order when defining the
-        // datasets. So we must call reverse again to restore the order.
-        points = points.slice(0).reverse();
-      }
-
-      let rows = this.tooltip.select('tbody')
-                     .html('')
-                     .selectAll('tr')
-                     .data(points)
-                     .enter()
-                     .append('tr');
-      // Grey out the point if any of the following are true:
-      // - The cursor is outside of the x-extent of the dataset
-      // - The point's y value is NaN
-      rows.classed('distant', (d) => {
-        let firstPoint = d.dataset.data()[0];
-        let lastPoint = _.last(d.dataset.data());
-        let firstX =
-            this.xScale.scale(this.xAccessor(firstPoint, 0, d.dataset));
-        let lastX = this.xScale.scale(this.xAccessor(lastPoint, 0, d.dataset));
-        let s = this.smoothingEnabled ? d.datum.smoothed : d.datum.scalar;
-        return target.x < firstX || target.x > lastX || isNaN(s);
-      });
-      rows.classed('closest', (p) => dist(p) === closestDist);
-      // It is a bit hacky that we are manually applying the width to the swatch
-      // and the nowrap property to the text here. The reason is as follows:
-      // the style gets updated asynchronously by Polymer scopeSubtree observer.
-      // Which means we would get incorrect sizing information since the text
-      // would wrap by default. However, we need correct measurements so that
-      // we can stop the text from falling off the edge of the screen.
-      // therefore, we apply the size-critical styles directly.
-      rows.style('white-space', 'nowrap');
-      rows.append('td')
-          .append('span')
-          .classed('swatch', true)
-          .style(
-              'background-color',
-              (d) => this.colorScale.scale(d.dataset.metadata().name));
-      rows.append('td').text((d) => d.dataset.metadata().name);
-      if (this.smoothingEnabled) {
-        rows.append('td').text(
-            (d) => isNaN(d.datum.smoothed) ? 'NaN' :
-                                             valueFormatter(d.datum.smoothed));
-      }
-      rows.append('td').text(
-          (d) =>
-              isNaN(d.datum.scalar) ? 'NaN' : valueFormatter(d.datum.scalar));
-      rows.append('td').text(
-          (d) => VZ.ChartHelpers.stepFormatter(d.datum.step));
-      rows.append('td').text(
-          (d) => VZ.ChartHelpers.timeFormatter(d.datum.wall_time));
-      rows.append('td').text(
-          (d) => VZ.ChartHelpers.relativeFormatter(
-              VZ.ChartHelpers.relativeAccessor(d.datum, -1, d.dataset)));
-
-      // compute left position
-      let documentWidth = document.body.clientWidth;
-      let node: any = this.tooltip.node();
-      let parentRect = node.parentElement.getBoundingClientRect();
-      let nodeRect = node.getBoundingClientRect();
-      // prevent it from falling off the right side of the screen
-      let left = documentWidth - parentRect.left - nodeRect.width - 60, top = 0;
-
-      if (this.tooltipPosition === 'right') {
-        left = Math.min(parentRect.width, left);
-      } else {  // 'bottom'
-        left = Math.min(0, left);
-        top = parentRect.height + VZ.ChartHelpers.TOOLTIP_Y_PIXEL_OFFSET;
-      }
-
-      this.tooltip.style(
-          'transform', 'translate(' + left + 'px,' + top + 'px)');
-      this.tooltip.style('opacity', 1);
-    }
-
-    private findClosestPoint(
-        target: VZ.ChartHelpers.Point,
-        dataset: Plottable.Dataset): VZ.ChartHelpers.Point {
-      let points: VZ.ChartHelpers.Point[] = dataset.data().map((d, i) => {
-        let x = this.xAccessor(d, i, dataset);
-        let y = this.smoothingEnabled ? this.smoothedAccessor(d, i, dataset) :
-                                        this.scalarAccessor(d, i, dataset);
-        return {
-          x: this.xScale.scale(x),
-          y: this.yScale.scale(y),
-          datum: d,
-          dataset: dataset,
-        };
-      });
-      let idx: number =
-          _.sortedIndex(points, target, (p: VZ.ChartHelpers.Point) => p.x);
-      if (idx === points.length) {
-        return points[points.length - 1];
-      } else if (idx === 0) {
-        return points[0];
-      } else {
-        let prev = points[idx - 1];
-        let next = points[idx];
-        let prevDist = Math.abs(prev.x - target.x);
-        let nextDist = Math.abs(next.x - target.x);
-        return prevDist < nextDist ? prev : next;
-      }
-    }
-
-    private resmoothDataset(dataset: Plottable.Dataset) {
-      let data = dataset.data();
-      const smoothingWeight = this.smoothingWeight;
-      let last = data.length > 0 ? data[0].scalar : NaN;
-      data.forEach((d) => {
-        if (!_.isFinite(last)) {
-          d.smoothed = d.scalar;
-        } else {
-          // 1st-order IIR low-pass filter to attenuate the higher-
-          // frequency components of the time-series.
-          d.smoothed =
-              last * smoothingWeight + (1 - smoothingWeight) * d.scalar;
-        }
-        last = d.smoothed;
-      });
-    }
-
-    private getDataset(name: string) {
-      if (this.name2datasets[name] === undefined) {
-        this.name2datasets[name] = new Plottable.Dataset([], {name: name});
-      }
-      return this.name2datasets[name];
-    }
-
-    static getYScaleFromType(yScaleType: string):
-        Plottable.QuantitativeScale<number> {
-      if (yScaleType === 'log') {
-        return new Plottable.Scales.ModifiedLog();
-      } else if (yScaleType === 'linear') {
-        return new Plottable.Scales.Linear();
-      } else {
-        throw new Error('Unrecognized yScale type ' + yScaleType);
-      }
-    }
-
-    /**
-     * Update the selected series on the chart.
-     */
-    public setVisibleSeries(names: string[]) {
-      names = names.sort();
-      this.seriesNames = names;
-
-      names.reverse();  // draw first series on top
-      this.datasets.forEach((d) => d.offUpdate(this.onDatasetChanged));
-      this.datasets = names.map((r) => this.getDataset(r));
-      this.datasets.forEach((d) => d.onUpdate(this.onDatasetChanged));
-      this.linePlot.datasets(this.datasets);
-
-      if (this.smoothingEnabled) {
-        this.smoothLinePlot.datasets(this.datasets);
-      }
-      this.updateSpecialDatasets();
-    }
-
-    /**
-     * Set the data of a series on the chart.
-     */
-    public setSeriesData(name: string, data: VZ.ChartHelpers.ScalarDatum[]) {
-      this.getDataset(name).data(data);
-    }
-
-    public smoothingUpdate(weight: number) {
-      this.smoothingWeight = weight;
-      this.datasets.forEach((d) => this.resmoothDataset(d));
-
-      if (!this.smoothingEnabled) {
-        this.linePlot.addClass('ghost');
-        this.scatterPlot.y(this.smoothedAccessor, this.yScale);
-        this.smoothingEnabled = true;
-        this.smoothLinePlot.datasets(this.datasets);
-      }
-
-      this.updateSpecialDatasetsWithAccessor(this.smoothedAccessor);
-    }
-
-    public smoothingDisable() {
-      if (this.smoothingEnabled) {
-        this.linePlot.removeClass('ghost');
-        this.scatterPlot.y(this.scalarAccessor, this.yScale);
-        this.smoothLinePlot.datasets([]);
-        this.smoothingEnabled = false;
-        this.updateSpecialDatasetsWithAccessor(this.scalarAccessor);
-      }
-    }
-
-    public setTooltipSortingMethod(method: string) {
-      this.tooltipSortingMethod = method;
-    }
-
-    public setTooltipPosition(position: string) {
-      this.tooltipPosition = position;
-    }
-
-    public renderTo(targetSVG: d3.Selection<any>) {
-      this.targetSVG = targetSVG;
-      this.setViewBox();
-      this.outer.renderTo(targetSVG);
-    }
-
-    /** There's an issue in Chrome where the svg overflow is a bit
-     * "flickery". There is a border on the gridlines on the extreme edge of the
-     * chart, which behaves inconsistently and causes the screendiffing tests to
-     * flake. We can solve this by creating 1px effective margin for the svg by
-     * setting the viewBox on the containing svg.
-     */
-    private setViewBox() {
-      // There's an issue in Firefox where if we measure with the old viewbox
-      // set, we get horrible results.
-      this.targetSVG.attr('viewBox', null);
-
-      let parent = this.targetSVG.node().parentNode as HTMLElement;
-      let w = parent.clientWidth;
-      let h = parent.clientHeight;
-      this.targetSVG.attr({
-        'height': h,
-        'viewBox': `0 0 ${w + 1} ${h + 1}`,
-      });
-    }
-
-    public redraw() {
-      this.outer.redraw();
-      this.setViewBox();
-    }
-
-    public destroy() { this.outer.destroy(); }
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
index f6690c3d7d..948e04cd8e 100644
--- a/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_line_chart_d3v4/BUILD
@@ -70,3 +70,47 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "index.html",
+        "vz-line-chart.html",
+        ":legacy_ts",
+    ],
+    visibility = ["//learning/vis/vz_elements/catalog:__pkg__"],
+    destdir = "vz-line-chart",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_google:lib",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:legacy",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [
+        "dragZoomInteraction.ts",
+        "vz-chart-helpers.ts",
+        "vz-line-chart.ts",
+    ],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/plottable/v3:bundle",
+        "//third_party/javascript/typings/chai",
+        "//third_party/javascript/typings/d3_v4:bundle",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/mocha",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/sinon",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/vz_sorting/BUILD b/tensorflow/tensorboard/components/vz_sorting/BUILD
index 795fc5cee4..97b727eb5d 100644
--- a/tensorflow/tensorboard/components/vz_sorting/BUILD
+++ b/tensorflow/tensorboard/components/vz_sorting/BUILD
@@ -37,7 +37,6 @@ tensorboard_webcomponent_library(
         "vz-sorting.html",
         ":legacy_ts",
     ],
-    visibility = ["//visibility:public"],
     destdir = "vz-sorting",
 )
 
diff --git a/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD b/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
index 189a6a69ac..22775248d7 100644
--- a/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_sorting_d3v4/BUILD
@@ -32,3 +32,25 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "vz-sorting.html",
+        ":legacy_ts",
+    ],
+    destdir = "vz-sorting",
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = ["sorting.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
-- 
GitLab


From 7a47356047a94b75f1daf8c2254e1e673573af63 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Thu, 18 May 2017 14:42:44 -0700
Subject: [PATCH 1514/1563] Support the 1-D categorical feature with
 categorical column family

PiperOrigin-RevId: 156481273
---
 tensorflow/python/feature_column/BUILD        |   1 +
 .../python/feature_column/feature_column.py   |  46 +++++-
 .../feature_column/feature_column_test.py     | 155 ++++++++++++++++++
 3 files changed, 193 insertions(+), 9 deletions(-)

diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD
index e86e4dcab1..673111be9a 100644
--- a/tensorflow/python/feature_column/BUILD
+++ b/tensorflow/python/feature_column/BUILD
@@ -80,5 +80,6 @@ py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
         "//tensorflow/python:training",
+        "//tensorflow/python/estimator:inputs",
     ],
 )
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py
index fd051dda6b..8d7923ea61 100644
--- a/tensorflow/python/feature_column/feature_column.py
+++ b/tensorflow/python/feature_column/feature_column.py
@@ -140,6 +140,7 @@ from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import check_ops
+from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import embedding_ops
 from tensorflow.python.ops import init_ops
 from tensorflow.python.ops import lookup_ops
@@ -1443,9 +1444,7 @@ class _LazyBuilder(object):
       return self._feature_tensors[key]
 
     if key in self._features:
-      # FeatureColumn is a raw feature.
-      feature_tensor = sparse_tensor_lib.convert_to_tensor_or_sparse_tensor(
-          self._features[key])
+      feature_tensor = self._maybe_expand_dims(self._features[key])
       self._feature_tensors[key] = feature_tensor
       return feature_tensor
 
@@ -1464,6 +1463,41 @@ class _LazyBuilder(object):
     self._feature_tensors[column] = transformed
     return transformed
 
+  def _maybe_expand_dims(self, raw_feature):
+    """Converts the `raw_feature` to (sparse) tensor and maybe expand dim.
+
+    For both `Tensor` and `SparseTensor`, the rank will be expanded (to 2) if
+    the rank is 1. This supports dynamic rank also.
+
+    Args:
+      raw_feature: The raw feature from FeatureColumn.
+
+    Returns:
+      A `Tensor` or `SparseTensor`.
+    """
+    feature_tensor = sparse_tensor_lib.convert_to_tensor_or_sparse_tensor(
+        raw_feature)
+
+    rank = feature_tensor.get_shape().ndims
+    if (rank is not None) and rank != 1:
+      return feature_tensor
+
+    def expand_dims(input_tensor):
+      # Input_tensor has rank 1.
+      if isinstance(input_tensor, sparse_tensor_lib.SparseTensor):
+        return sparse_ops.sparse_reshape(
+            input_tensor, [array_ops.shape(input_tensor)[0], -1])
+      else:
+        return array_ops.expand_dims(input_tensor, -1)
+
+    if rank is None:
+      return control_flow_ops.cond(
+          math_ops.equal(1, array_ops.rank(feature_tensor)),
+          lambda: expand_dims(feature_tensor),
+          lambda: feature_tensor)
+    else:
+      return expand_dims(feature_tensor)
+
 
 # TODO(ptucker): Move to third_party/tensorflow/python/ops/sparse_ops.py
 def _shape_offsets(shape):
@@ -2365,12 +2399,6 @@ class _IndicatorColumn(_DenseColumn,
         on_value=1.0,
         off_value=0.0)
 
-    output_rank = one_hot_id_tensor.get_shape().ndims
-    if output_rank is None:
-      raise ValueError('Input rank should be known at graph building time.')
-    if output_rank <= 2:
-      return one_hot_id_tensor
-
     # Reduce to get a multi-hot per example.
     return math_ops.reduce_sum(one_hot_id_tensor, axis=[-2])
 
diff --git a/tensorflow/python/feature_column/feature_column_test.py b/tensorflow/python/feature_column/feature_column_test.py
index 4cd3ea62c4..fda6c3faf4 100644
--- a/tensorflow/python/feature_column/feature_column_test.py
+++ b/tensorflow/python/feature_column/feature_column_test.py
@@ -26,6 +26,7 @@ import numpy as np
 from tensorflow.core.example import example_pb2
 from tensorflow.core.example import feature_pb2
 from tensorflow.python.client import session
+from tensorflow.python.estimator.inputs import numpy_io
 from tensorflow.python.feature_column import feature_column_lib as fc
 from tensorflow.python.feature_column.feature_column import _CategoricalColumn
 from tensorflow.python.feature_column.feature_column import _DenseColumn
@@ -43,6 +44,8 @@ from tensorflow.python.ops import parsing_ops
 from tensorflow.python.ops import variable_scope
 from tensorflow.python.ops import variables as variables_lib
 from tensorflow.python.platform import test
+from tensorflow.python.training import coordinator
+from tensorflow.python.training import queue_runner_impl
 
 
 def _initialized_session():
@@ -1663,6 +1666,158 @@ class InputLayerTest(test.TestCase):
                 features['price2']: [[1.], [5.]],
             })
 
+  def test_with_numpy_input_fn(self):
+    embedding_values = (
+        (1., 2., 3., 4., 5.),  # id 0
+        (6., 7., 8., 9., 10.),  # id 1
+        (11., 12., 13., 14., 15.)  # id 2
+    )
+    def _initializer(shape, dtype, partition_info):
+      del shape, dtype, partition_info
+      return embedding_values
+
+    # price has 1 dimension in input_layer
+    price = fc.numeric_column('price')
+    body_style = fc.categorical_column_with_vocabulary_list(
+        'body-style', vocabulary_list=['hardtop', 'wagon', 'sedan'])
+    # one_hot_body_style has 3 dims in input_layer.
+    one_hot_body_style = fc.indicator_column(body_style)
+    # embedded_body_style has 5 dims in input_layer.
+    embedded_body_style = fc.embedding_column(body_style, dimension=5,
+                                              initializer=_initializer)
+
+    input_fn = numpy_io.numpy_input_fn(
+        x={
+            'price': np.array([11., 12., 13., 14.]),
+            'body-style': np.array(['sedan', 'hardtop', 'wagon', 'sedan']),
+        },
+        batch_size=2,
+        shuffle=False)
+    features = input_fn()
+    net = fc.input_layer(features,
+                         [price, one_hot_body_style, embedded_body_style])
+    self.assertEqual(1 + 3 + 5, net.shape[1])
+    with _initialized_session() as sess:
+      coord = coordinator.Coordinator()
+      threads = queue_runner_impl.start_queue_runners(sess, coord=coord)
+
+      # Each row is formed by concatenating `embedded_body_style`,
+      # `one_hot_body_style`, and `price` in order.
+      self.assertAllEqual(
+          [[11., 12., 13., 14., 15., 0., 0., 1., 11.],
+           [1., 2., 3., 4., 5., 1., 0., 0., 12]],
+          sess.run(net))
+
+      coord.request_stop()
+      coord.join(threads)
+
+  def test_with_1d_sparse_tensor(self):
+    embedding_values = (
+        (1., 2., 3., 4., 5.),  # id 0
+        (6., 7., 8., 9., 10.),  # id 1
+        (11., 12., 13., 14., 15.)  # id 2
+    )
+    def _initializer(shape, dtype, partition_info):
+      del shape, dtype, partition_info
+      return embedding_values
+
+    # price has 1 dimension in input_layer
+    price = fc.numeric_column('price')
+
+    # one_hot_body_style has 3 dims in input_layer.
+    body_style = fc.categorical_column_with_vocabulary_list(
+        'body-style', vocabulary_list=['hardtop', 'wagon', 'sedan'])
+    one_hot_body_style = fc.indicator_column(body_style)
+
+    # embedded_body_style has 5 dims in input_layer.
+    country = fc.categorical_column_with_vocabulary_list(
+        'country', vocabulary_list=['US', 'JP', 'CA'])
+    embedded_country = fc.embedding_column(country, dimension=5,
+                                           initializer=_initializer)
+
+    # Provides 1-dim tensor and dense tensor.
+    features = {
+        'price': constant_op.constant([11., 12.,]),
+        'body-style': sparse_tensor.SparseTensor(
+            indices=((0,), (1,)),
+            values=('sedan', 'hardtop'),
+            dense_shape=(2,)),
+        # This is dense tensor for the categorical_column.
+        'country': constant_op.constant(['CA', 'US']),
+    }
+    self.assertEqual(1, features['price'].shape.ndims)
+    self.assertEqual(1, features['body-style'].dense_shape.get_shape()[0])
+    self.assertEqual(1, features['country'].shape.ndims)
+
+    net = fc.input_layer(features,
+                         [price, one_hot_body_style, embedded_country])
+    self.assertEqual(1 + 3 + 5, net.shape[1])
+    with _initialized_session() as sess:
+
+      # Each row is formed by concatenating `embedded_body_style`,
+      # `one_hot_body_style`, and `price` in order.
+      self.assertAllEqual(
+          [[0., 0., 1., 11., 12., 13., 14., 15., 11.],
+           [1., 0., 0., 1., 2., 3., 4., 5., 12.]],
+          sess.run(net))
+
+  def test_with_1d_unknown_shape_sparse_tensor(self):
+    embedding_values = (
+        (1., 2., 3., 4., 5.),  # id 0
+        (6., 7., 8., 9., 10.),  # id 1
+        (11., 12., 13., 14., 15.)  # id 2
+    )
+    def _initializer(shape, dtype, partition_info):
+      del shape, dtype, partition_info
+      return embedding_values
+
+    # price has 1 dimension in input_layer
+    price = fc.numeric_column('price')
+
+    # one_hot_body_style has 3 dims in input_layer.
+    body_style = fc.categorical_column_with_vocabulary_list(
+        'body-style', vocabulary_list=['hardtop', 'wagon', 'sedan'])
+    one_hot_body_style = fc.indicator_column(body_style)
+
+    # embedded_body_style has 5 dims in input_layer.
+    country = fc.categorical_column_with_vocabulary_list(
+        'country', vocabulary_list=['US', 'JP', 'CA'])
+    embedded_country = fc.embedding_column(country, dimension=5,
+                                           initializer=_initializer)
+
+    # Provides 1-dim tensor and dense tensor.
+    features = {
+        'price': array_ops.placeholder(dtypes.float32),
+        'body-style': array_ops.sparse_placeholder(dtypes.string),
+        # This is dense tensor for the categorical_column.
+        'country': array_ops.placeholder(dtypes.string),
+    }
+    self.assertIsNone(features['price'].shape.ndims)
+    self.assertIsNone(features['body-style'].get_shape().ndims)
+    self.assertIsNone(features['country'].shape.ndims)
+
+    price_data = np.array([11., 12.])
+    body_style_data = sparse_tensor.SparseTensorValue(
+        indices=((0,), (1,)),
+        values=('sedan', 'hardtop'),
+        dense_shape=(2,))
+
+    # Dense categorical_column with unknown shape is not allowed.
+    with self.assertRaisesRegexp(ValueError, 'Undefined input_tensor shape.'):
+      fc.input_layer(features, [price, one_hot_body_style, embedded_country])
+
+    net = fc.input_layer(features, [price, one_hot_body_style])
+    self.assertEqual(1 + 3, net.shape[1])
+    with _initialized_session() as sess:
+
+      # Each row is formed by concatenating `embedded_body_style`,
+      # `one_hot_body_style`, and `price` in order.
+      self.assertAllEqual(
+          [[0., 0., 1., 11.], [1., 0., 0., 12.]],
+          sess.run(net, feed_dict={
+              features['price']: price_data,
+              features['body-style']: body_style_data}))
+
 
 class MakeParseExampleSpecTest(test.TestCase):
 
-- 
GitLab


From 691cc87e91a8dcaf42c3009241a23cea060f6715 Mon Sep 17 00:00:00 2001
From: Jianwei Xie <xiejw@google.com>
Date: Thu, 18 May 2017 15:35:34 -0700
Subject: [PATCH 1515/1563] Seal learn_runner.

PiperOrigin-RevId: 156488276
---
 tensorflow/contrib/learn/__init__.py          |  2 +-
 .../learn/python/learn/learn_runner_lib.py    | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tensorflow/contrib/learn/python/learn/learn_runner_lib.py

diff --git a/tensorflow/contrib/learn/__init__.py b/tensorflow/contrib/learn/__init__.py
index aec4911e29..c06343b731 100644
--- a/tensorflow/contrib/learn/__init__.py
+++ b/tensorflow/contrib/learn/__init__.py
@@ -88,7 +88,7 @@ from __future__ import print_function
 from tensorflow.contrib.learn.python.learn import *
 # pylint: enable=wildcard-import
 
-from tensorflow.contrib.learn.python.learn import learn_runner
+from tensorflow.contrib.learn.python.learn import learn_runner_lib as learn_runner
 
 from tensorflow.python.util.all_util import remove_undocumented
 
diff --git a/tensorflow/contrib/learn/python/learn/learn_runner_lib.py b/tensorflow/contrib/learn/python/learn/learn_runner_lib.py
new file mode 100644
index 0000000000..7d9b1c7716
--- /dev/null
+++ b/tensorflow/contrib/learn/python/learn/learn_runner_lib.py
@@ -0,0 +1,30 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Utilities to run and tune an Experiment.
+
+@@run
+@@tune
+"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.learn.python.learn.learn_runner import *  # pylint: disable=wildcard-import
+
+from tensorflow.python.util.all_util import remove_undocumented
+
+_allowed_symbols = []
+
+remove_undocumented(__name__, _allowed_symbols)
-- 
GitLab


From 0b52c3342785e51c95d59219b68226d3ca74aea5 Mon Sep 17 00:00:00 2001
From: Neeraj Kashyap <nkashy1@gmail.com>
Date: Thu, 18 May 2017 15:48:51 -0700
Subject: [PATCH 1516/1563] Documentation: Typo confusing
 `tf.training.Coordinator.should_stop` with
 `tf.training.Coordinator.request_stop` (#10016)

The code makes it clear, but I wanted to remove the inconsistency between the discussion and the code.
---
 tensorflow/python/training/coordinator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/training/coordinator.py b/tensorflow/python/training/coordinator.py
index d234df71c1..23e8638764 100644
--- a/tensorflow/python/training/coordinator.py
+++ b/tensorflow/python/training/coordinator.py
@@ -62,7 +62,7 @@ class Coordinator(object):
   #### Exception handling:
 
   A thread can report an exception to the coordinator as part of the
-  `should_stop()` call.  The exception will be re-raised from the
+  `request_stop()` call.  The exception will be re-raised from the
   `coord.join()` call.
 
   Thread code:
-- 
GitLab


From 293d400b6b09a5e38004062734704ac066a08d24 Mon Sep 17 00:00:00 2001
From: Justine Tunney <jart@google.com>
Date: Thu, 18 May 2017 15:57:24 -0700
Subject: [PATCH 1517/1563] Add TensorBoard back to CMake build

PiperOrigin-RevId: 156490983
---
 tensorflow/contrib/cmake/tf_python.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 793f7b22f1..baba1bbb03 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -878,6 +878,14 @@ add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
                                    ${CMAKE_CURRENT_BINARY_DIR}/tf_python/)
 
 # Copy resources for TensorBoard.
+file(DOWNLOAD http://mirror.bazel.build/tensorboard/index.html ${DOWNLOAD_LOCATION}/tensorboard/index.html
+  EXPECTED_HASH SHA256=60f185c68ff3f906000df9670bf9f46588056b197da7e7b10074411a0c048dae)
+add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E make_directory
+  ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/components/)
+add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_LOCATION}/tensorboard/index.html
+  ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/components/)
 add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/tensorboard/TAG
   ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/)
-- 
GitLab


From 26eff341579ed9679fd3218440b6ff6f71d4b423 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 16:12:38 -0700
Subject: [PATCH 1518/1563] Make ResourceVariable expose its initial_value
 tensor.

This matches the interface for regular variables.

PiperOrigin-RevId: 156492740
---
 .../python/kernel_tests/resource_variable_ops_test.py     | 8 ++++++++
 tensorflow/python/ops/resource_variable_ops.py            | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/tensorflow/python/kernel_tests/resource_variable_ops_test.py b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
index 71573fa9e9..3be4eb06d3 100644
--- a/tensorflow/python/kernel_tests/resource_variable_ops_test.py
+++ b/tensorflow/python/kernel_tests/resource_variable_ops_test.py
@@ -237,6 +237,14 @@ class ResourceVariableOpsTest(test_util.TensorFlowTestCase):
       with self.assertRaisesOpError("Resource .*/var1//.* does not exist"):
         _ = x_read.eval()
 
+  def testSetInitialValue(self):
+    with self.test_session():
+      # Initialize variable with a value different from the initial value passed
+      # in the constructor.
+      v = resource_variable_ops.ResourceVariable(2.0)
+      v.initializer.run(feed_dict={v.initial_value: 3.0})
+      self.assertEqual(3.0, v.value().eval())
+
 
 if __name__ == "__main__":
   test.main()
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 842bb48d0f..7381bc2017 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -299,6 +299,11 @@ class ResourceVariable(object):
     """The op responsible for initializing this variable."""
     return self._initialize_op
 
+  @property
+  def initial_value(self):
+    """Returns the Tensor used as the initial value for the variable."""
+    return self._initial_value
+
   @property
   def op(self):
     """The op for this variable."""
-- 
GitLab


From a14a7610c82d89bb410483b200bec06a4b383d52 Mon Sep 17 00:00:00 2001
From: Alexandre Passos <apassos@google.com>
Date: Thu, 18 May 2017 16:52:24 -0700
Subject: [PATCH 1519/1563] Make ResourceVariable inherit from Variable.

PiperOrigin-RevId: 156497141
---
 tensorflow/python/client/session_test.py             |  2 ++
 tensorflow/python/debug/lib/debug_utils_test.py      |  2 ++
 tensorflow/python/debug/lib/source_utils_test.py     |  2 ++
 tensorflow/python/debug/wrappers/framework_test.py   |  2 ++
 .../python/debug/wrappers/local_cli_wrapper_test.py  |  2 ++
 tensorflow/python/ops/resource_variable_ops.py       | 12 +++++++++++-
 tensorflow/python/ops/variables.py                   |  2 --
 .../python/training/learning_rate_decay_test.py      |  4 +++-
 tensorflow/python/training/optimizer.py              |  4 ++--
 tensorflow/python/training/saver.py                  |  7 ++-----
 tensorflow/python/training/training_ops_test.py      |  2 ++
 11 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/tensorflow/python/client/session_test.py b/tensorflow/python/client/session_test.py
index 6c964377a2..9128abf0be 100644
--- a/tensorflow/python/client/session_test.py
+++ b/tensorflow/python/client/session_test.py
@@ -47,6 +47,8 @@ from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import data_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
+# Import resource_variable_ops for the variables-to-tensor implicit conversion.
+from tensorflow.python.ops import resource_variable_ops  # pylint: disable=unused-import
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
diff --git a/tensorflow/python/debug/lib/debug_utils_test.py b/tensorflow/python/debug/lib/debug_utils_test.py
index d4978fa235..5b1875e092 100644
--- a/tensorflow/python/debug/lib/debug_utils_test.py
+++ b/tensorflow/python/debug/lib/debug_utils_test.py
@@ -25,6 +25,8 @@ from tensorflow.python.debug.lib import debug_utils
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import math_ops
+# Import resource_variable_ops for the variables-to-tensor implicit conversion.
+from tensorflow.python.ops import resource_variable_ops  # pylint: disable=unused-import
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
 
diff --git a/tensorflow/python/debug/lib/source_utils_test.py b/tensorflow/python/debug/lib/source_utils_test.py
index f6195b6a5d..4a8d4eaa99 100644
--- a/tensorflow/python/debug/lib/source_utils_test.py
+++ b/tensorflow/python/debug/lib/source_utils_test.py
@@ -34,6 +34,8 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+# Import resource_variable_ops for the variables-to-tensor implicit conversion.
+from tensorflow.python.ops import resource_variable_ops  # pylint: disable=unused-import
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
 from tensorflow.python.util import tf_inspect
diff --git a/tensorflow/python/debug/wrappers/framework_test.py b/tensorflow/python/debug/wrappers/framework_test.py
index fd0efcd925..536365b692 100644
--- a/tensorflow/python/debug/wrappers/framework_test.py
+++ b/tensorflow/python/debug/wrappers/framework_test.py
@@ -34,6 +34,8 @@ from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import math_ops
+# Import resource_variable_ops for the variables-to-tensor implicit conversion.
+from tensorflow.python.ops import resource_variable_ops  # pylint: disable=unused-import
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
 
diff --git a/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py b/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py
index 595000fdb6..f8e32eca25 100644
--- a/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py
+++ b/tensorflow/python/debug/wrappers/local_cli_wrapper_test.py
@@ -33,6 +33,8 @@ from tensorflow.python.framework import test_util
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
+# Import resource_variable_ops for the variables-to-tensor implicit conversion.
+from tensorflow.python.ops import resource_variable_ops  # pylint: disable=unused-import
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
diff --git a/tensorflow/python/ops/resource_variable_ops.py b/tensorflow/python/ops/resource_variable_ops.py
index 7381bc2017..9ac50345ea 100644
--- a/tensorflow/python/ops/resource_variable_ops.py
+++ b/tensorflow/python/ops/resource_variable_ops.py
@@ -35,7 +35,7 @@ from tensorflow.python.ops.gen_resource_variable_ops import *
 from tensorflow.python.util import compat
 
 
-class ResourceVariable(object):
+class ResourceVariable(variables.Variable):
   """Variable based on resource handles.
 
   TODO(apassos): fill this out explaining the semantics and Variable
@@ -394,6 +394,10 @@ class ResourceVariable(object):
   def _AsTensor(self):
     return self.value()
 
+  def _ref(self):
+    """Unsupported."""
+    raise NotImplementedError("ResourceVariable does not implement _ref()")
+
   @staticmethod
   def _OverloadOperator(operator):  # pylint: disable=invalid-name
     """Defer an operator overload to `ops.Tensor`.
@@ -479,7 +483,13 @@ def _dense_var_to_tensor(var, dtype=None, name=None, as_ref=False):
 
 # Register a conversion function which reads the value of the variable,
 # allowing instances of the class to be used as tensors.
+
+# Note: registering for Variable after ResourceVariable because inheritance will
+# otherwise lead to the wrong behavior.
 ops.register_tensor_conversion_function(ResourceVariable, _dense_var_to_tensor)
+ops.register_tensor_conversion_function(
+    variables.Variable,
+    variables.Variable._TensorConversionFunction)  # pylint: disable=protected-access
 
 # pylint: disable=protected-access
 ResourceVariable._OverloadAllOperators()
diff --git a/tensorflow/python/ops/variables.py b/tensorflow/python/ops/variables.py
index d5ffd9ac33..778cb3aac0 100644
--- a/tensorflow/python/ops/variables.py
+++ b/tensorflow/python/ops/variables.py
@@ -1317,8 +1317,6 @@ def report_uninitialized_variables(var_list=None,
       return array_ops.boolean_mask(variable_names_tensor, variables_mask)
 
 # pylint: disable=protected-access
-ops.register_tensor_conversion_function(Variable,
-                                        Variable._TensorConversionFunction)
 Variable._OverloadAllOperators()
 
 ops.register_tensor_conversion_function(
diff --git a/tensorflow/python/training/learning_rate_decay_test.py b/tensorflow/python/training/learning_rate_decay_test.py
index e728950422..8232882822 100644
--- a/tensorflow/python/training/learning_rate_decay_test.py
+++ b/tensorflow/python/training/learning_rate_decay_test.py
@@ -23,6 +23,8 @@ import math
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import test_util
 from tensorflow.python.ops import gen_state_ops
+# Import resource_variable_ops for the variables-to-tensor implicit conversion.
+from tensorflow.python.ops import resource_variable_ops  # pylint: disable=unused-import
 from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
@@ -40,7 +42,7 @@ class LRDecayTest(test_util.TensorFlowTestCase):
 
   def testStaircase(self):
     with self.test_session():
-      step = gen_state_ops._variable(shape=[], dtype=dtypes.int32, 
+      step = gen_state_ops._variable(shape=[], dtype=dtypes.int32,
           name="step", container="", shared_name="")
       assign_100 = state_ops.assign(step, 100)
       assign_1 = state_ops.assign(step, 1)
diff --git a/tensorflow/python/training/optimizer.py b/tensorflow/python/training/optimizer.py
index 3c5130d42a..0e10704dc8 100644
--- a/tensorflow/python/training/optimizer.py
+++ b/tensorflow/python/training/optimizer.py
@@ -148,10 +148,10 @@ class _StreamingModelPortProcessor(_OptimizableVariable):
 
 def _get_processor(v):
   """The processor of v."""
-  if isinstance(v, variables.Variable):
-    return _RefVariableProcessor(v)
   if v.op.type == "VarHandleOp":
     return _DenseResourceVariableProcessor(v)
+  if isinstance(v, variables.Variable):
+    return _RefVariableProcessor(v)
   if v.op.type == "SubmodelPort":
     return _StreamingModelPortProcessor(v)
   raise NotImplementedError("Trying to optimize unsupported type ", v)
diff --git a/tensorflow/python/training/saver.py b/tensorflow/python/training/saver.py
index e9cc76aa90..d66950f89f 100644
--- a/tensorflow/python/training/saver.py
+++ b/tensorflow/python/training/saver.py
@@ -511,9 +511,7 @@ class BaseSaverBuilder(object):
           raise ValueError("At least two variables have the same name: %s" %
                            var.name)
         names_to_saveables[var.name] = var
-      elif ((isinstance(var, variables.Variable) or
-             isinstance(var, resource_variable_ops.ResourceVariable)) and
-            var._save_slice_info):
+      elif isinstance(var, variables.Variable) and var._save_slice_info:
         name = var._save_slice_info.full_name
         if name in names_to_saveables:
           if not isinstance(names_to_saveables[name], list):
@@ -573,8 +571,7 @@ class BaseSaverBuilder(object):
         slice_name = None
         # pylint: disable=protected-access
         for variable in op:
-          if (not isinstance(variable, variables.Variable) and
-              not isinstance(variable, resource_variable_ops.ResourceVariable)):
+          if not isinstance(variable, variables.Variable):
             raise ValueError("Slices must all be Variables: %s" % variable)
           if not variable._save_slice_info:
             raise ValueError("Slices must all be slices: %s" % variable)
diff --git a/tensorflow/python/training/training_ops_test.py b/tensorflow/python/training/training_ops_test.py
index 4b8bdbc98b..9ee48d1a45 100644
--- a/tensorflow/python/training/training_ops_test.py
+++ b/tensorflow/python/training/training_ops_test.py
@@ -25,6 +25,8 @@ import numpy as np
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework.test_util import TensorFlowTestCase
+# Import resource_variable_ops for the variables-to-tensor implicit conversion.
+from tensorflow.python.ops import resource_variable_ops  # pylint: disable=unused-import
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import googletest
 from tensorflow.python.training import training_ops
-- 
GitLab


From 98418e4373563fb6513146cd825d0304157bdc79 Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Thu, 18 May 2017 16:58:01 -0700
Subject: [PATCH 1520/1563] Remove d3v3 version of all tf_graph related code.

PiperOrigin-RevId: 156497669
---
 .../components/tf_dashboard_common_d3v4/BUILD |   50 +
 .../tf-categorizer.ts                         |    2 +-
 .../tf-collapsable-pane-demo.html             |    3 -
 .../components/tf_globals_d3v4/BUILD          |   22 +
 .../tensorboard/components/tf_graph/BUILD     |   60 -
 .../components/tf_graph/demo/BUILD            |   26 -
 .../components/tf_graph/demo/data/graph.pbtxt | 4606 -----------------
 .../components/tf_graph/demo/index.html       |   92 -
 .../components/tf_graph/tf-graph-minimap.html |   88 -
 .../components/tf_graph/tf-graph-scene.html   | 1054 ----
 .../components/tf_graph/tf-graph.html         |  316 --
 .../tensorboard/components/tf_graph_app/BUILD |   59 -
 .../components/tf_graph_app/demo/BUILD        |   23 -
 .../tf_graph_app/demo/data/graph.pbtxt        |   90 -
 .../components/tf_graph_app/demo/index.html   |   34 -
 .../components/tf_graph_app/index.html        |   30 -
 .../components/tf_graph_app/tf-graph-app.html |  152 -
 .../components/tf_graph_app_d3v4/BUILD        |   29 +
 .../components/tf_graph_board/BUILD           |   51 -
 .../components/tf_graph_board/demo/BUILD      |   26 -
 .../tf_graph_board/demo/data/graph.pbtxt      | 4606 -----------------
 .../components/tf_graph_board/demo/index.html |   98 -
 .../tf_graph_board/tf-graph-board.html        |  255 -
 .../components/tf_graph_board_d3v4/BUILD      |   30 +-
 .../components/tf_graph_common/BUILD          |   75 -
 .../components/tf_graph_common/annotation.ts  |  240 -
 .../components/tf_graph_common/colors.ts      |  130 -
 .../components/tf_graph_common/common.ts      |   31 -
 .../components/tf_graph_common/contextmenu.ts |   76 -
 .../components/tf_graph_common/edge.ts        |  352 --
 .../components/tf_graph_common/externs.ts     |   85 -
 .../components/tf_graph_common/graph.ts       | 1257 -----
 .../components/tf_graph_common/hierarchy.ts   |  807 ---
 .../components/tf_graph_common/layout.ts      |  758 ---
 .../components/tf_graph_common/minimap.ts     |  328 --
 .../components/tf_graph_common/node.ts        | 1079 ----
 .../components/tf_graph_common/parser.ts      |  284 -
 .../components/tf_graph_common/proto.ts       |  143 -
 .../components/tf_graph_common/render.ts      | 1633 ------
 .../components/tf_graph_common/scene.ts       |  678 ---
 .../components/tf_graph_common/template.ts    |  305 --
 .../tf_graph_common/test/graph-test.ts        |  117 -
 .../tf_graph_common/test/hierarchy-test.ts    |   23 -
 .../tf_graph_common/test/index.html           |   34 -
 .../tf_graph_common/test/layout-test.ts       |   23 -
 .../tf_graph_common/test/parser-test.ts       |   83 -
 .../tf_graph_common/test/util-test.ts         |   56 -
 .../components/tf_graph_common/test/util.ts   |   31 -
 .../tf_graph_common/tf-graph-common.html      |   38 -
 .../components/tf_graph_common/util.ts        |  291 --
 .../components/tf_graph_common_d3v4/BUILD     |   35 +-
 .../components/tf_graph_common_d3v4/edge.ts   |    4 +-
 .../components/tf_graph_common_d3v4/layout.ts |    4 +-
 .../components/tf_graph_common_d3v4/node.ts   |    4 +-
 .../components/tf_graph_common_d3v4/scene.ts  |    6 +-
 .../components/tf_graph_controls/BUILD        |   54 -
 .../components/tf_graph_controls/demo/BUILD   |   24 -
 .../tf_graph_controls/demo/index.html         |   49 -
 .../tf_graph_controls/tf-graph-controls.html  |  829 ---
 .../components/tf_graph_controls_d3v4/BUILD   |   29 +-
 .../components/tf_graph_d3v4/BUILD            |   30 +-
 .../components/tf_graph_dashboard_d3v4/BUILD  |   32 +-
 .../components/tf_graph_info/BUILD            |   60 -
 .../components/tf_graph_info/demo/BUILD       |   26 -
 .../tf_graph_info/demo/data/graph.pbtxt       | 4606 -----------------
 .../components/tf_graph_info/demo/index.html  |   94 -
 .../tf_graph_info/tf-graph-icon.html          |  296 --
 .../tf_graph_info/tf-graph-info.html          |  354 --
 .../tf_graph_info/tf-node-info.html           |  652 ---
 .../tf_graph_info/tf-node-list-item.html      |  138 -
 .../components/tf_graph_info_d3v4/BUILD       |   32 +-
 .../components/tf_graph_loader/BUILD          |   46 -
 .../components/tf_graph_loader/demo/BUILD     |   24 -
 .../tf_graph_loader/demo/data/graph.pbtxt     | 4606 -----------------
 .../tf_graph_loader/demo/index.html           |   75 -
 .../tf_graph_loader/test/index.html           |   30 -
 .../components/tf_graph_loader/test/loader.ts |   25 -
 .../tf_graph_loader/tf-graph-loader.html      |  184 -
 .../components/tf_graph_loader_d3v4/BUILD     |   28 +-
 .../components/tf_storage_d3v4/BUILD          |   30 +
 80 files changed, 344 insertions(+), 32821 deletions(-)
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph/tf-graph.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_app/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_app/demo/data/graph.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_app/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_app/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_board/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_board/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/annotation.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/colors.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/common.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/contextmenu.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/edge.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/externs.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/graph.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/hierarchy.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/layout.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/minimap.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/node.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/parser.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/proto.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/render.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/scene.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/template.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/test/hierarchy-test.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/test/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/test/layout-test.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/test/parser-test.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/test/util-test.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/test/util.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_common/util.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_controls/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_controls/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_loader/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_loader/test/index.html
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_loader/test/loader.ts
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
index 564028ba3c..e27a84651b 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/BUILD
@@ -148,3 +148,53 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = glob(["*.html"]) + [":legacy_ts"],
+    destdir = "tf-dashboard-common",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_google_d3v4:lib",
+        "//tensorflow/tensorboard/components/tf_storage_d3v4:legacy",
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:legacy",
+        "//third_party/javascript/polymer/v1/iron-ajax:lib",
+        "//third_party/javascript/polymer/v1/iron-collapse:lib",
+        "//third_party/javascript/polymer/v1/iron-icons:lib",
+        "//third_party/javascript/polymer/v1/paper-button:lib",
+        "//third_party/javascript/polymer/v1/paper-checkbox:lib",
+        "//third_party/javascript/polymer/v1/paper-dialog:lib",
+        "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+        "//third_party/javascript/polymer/v1/paper-input:lib",
+        "//third_party/javascript/polymer/v1/paper-item:lib",
+        "//third_party/javascript/polymer/v1/paper-menu:lib",
+        "//third_party/javascript/polymer/v1/paper-slider:lib",
+        "//third_party/javascript/polymer/v1/paper-spinner:lib",
+        "//third_party/javascript/polymer/v1/paper-styles:lib",
+        "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [
+        "dashboard-behavior.ts",
+        "reload-behavior.ts",
+        "tf-categorizer.ts",
+    ],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//tensorflow/tensorboard/components/vz_sorting_d3v4:legacy_ts",
+        "//third_party/javascript/typings/d3_v4:bundle",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
index 5d33078097..7ff6a0627c 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-categorizer.ts
@@ -16,7 +16,7 @@ limitations under the License.
 import * as d3 from 'd3';  // from //third_party/javascript/typings/d3_v4
 import * as _ from 'lodash';
 
-import {compareTagNames} from '../vz-sorting/sorting';
+import {compareTagNames} from '../vz_sorting_d3v4/sorting';
 
 /**
  * This module contains methods that allow sorting tags into 'categories'.
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
index 6c8bdb92ee..efa990b11c 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-collapsable-pane-demo.html
@@ -28,7 +28,4 @@ limitations under the License.
     <h1>This is content inside the pane.</h1>
   </tf-collapsable-pane>
  </body>
- <script>
-
- </script>
 </html>
diff --git a/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD b/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
index 699cd3239b..49c2a1e57e 100644
--- a/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_globals_d3v4/BUILD
@@ -31,3 +31,25 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-globals.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-globals",
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = ["globals.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph/BUILD b/tensorflow/tensorboard/components/tf_graph/BUILD
deleted file mode 100644
index f950d1a532..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph",
-    srcs = [
-        "tf-graph.html",
-        "tf-graph-minimap.html",
-        "tf-graph-scene.html",
-    ],
-    path = "/tf-graph",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "@org_polymer",
-        "@org_polymer_iron_flex_layout",
-        "@org_polymer_iron_icons",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_dropdown_menu",
-        "@org_polymer_paper_input",
-        "@org_polymer_paper_menu",
-        "@org_polymer_paper_radio_group",
-        "@org_polymer_paper_toggle_button",
-        "@org_polymer_paper_tooltip",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph.html",
-        "tf-graph-minimap.html",
-        "tf-graph-scene.html",
-    ],
-    destdir = "tf-graph",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/BUILD b/tensorflow/tensorboard/components/tf_graph/demo/BUILD
deleted file mode 100644
index 524d0ff767..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_graph/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"] + glob(["data/**"]),
-    path = "/tf-graph/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt
deleted file mode 100644
index 30b2064534..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/demo/data/graph.pbtxt
+++ /dev/null
@@ -1,4606 +0,0 @@
-node {
-  name: "GradientDescent/learning_rate"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_3"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0.1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 100
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000d\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_grad/Shape"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_1_grad/Shape"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod_1"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape_1"
-  input: "gradients/Mean_grad/Const_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum"
-  op: "Maximum"
-  input: "gradients/Mean_grad/Prod_1"
-  input: "gradients/Mean_grad/Maximum/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape"
-  input: "gradients/Mean_grad/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/floordiv"
-  op: "FloorDiv"
-  input: "gradients/Mean_grad/Prod"
-  input: "gradients/Mean_grad/Maximum"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Cast"
-  op: "Cast"
-  input: "gradients/Mean_grad/floordiv"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "DstT"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "SrcT"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile/multiples"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Fill"
-  op: "Fill"
-  input: "gradients/Shape"
-  input: "gradients/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Fill"
-  input: "gradients/Mean_grad/Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile"
-  op: "Tile"
-  input: "gradients/Mean_grad/Reshape"
-  input: "gradients/Mean_grad/Tile/multiples"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tmultiples"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/truediv"
-  op: "RealDiv"
-  input: "gradients/Mean_grad/Tile"
-  input: "gradients/Mean_grad/Cast"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Mean_grad/truediv"
-  input: "gradients/Reshape_3_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  op: "ExpandDims"
-  input: "gradients/Reshape_3_grad/Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tdim"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/begin"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1"
-  op: "Sub"
-  input: "Rank_2"
-  input: "Sub_1/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/begin"
-  op: "Pack"
-  input: "Sub_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_1"
-  op: "Slice"
-  input: "Shape_2"
-  input: "Slice_1/begin"
-  input: "Slice_1/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat_1"
-  op: "ConcatV2"
-  input: "concat_1/values_0"
-  input: "Slice_1"
-  input: "concat_1/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub"
-  op: "Sub"
-  input: "Rank_1"
-  input: "Sub/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice/begin"
-  op: "Pack"
-  input: "Sub"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice"
-  op: "Slice"
-  input: "Shape_1"
-  input: "Slice/begin"
-  input: "Slice/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat"
-  op: "ConcatV2"
-  input: "concat/values_0"
-  input: "Slice"
-  input: "concat/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2"
-  op: "Sub"
-  input: "Rank"
-  input: "Sub_2/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/size"
-  op: "Pack"
-  input: "Sub_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_2"
-  op: "Slice"
-  input: "Shape"
-  input: "Slice_2/begin"
-  input: "Slice_2/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_biases/read"
-  op: "Identity"
-  input: "logits_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_weights/read"
-  op: "Identity"
-  input: "logits_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_biases/read"
-  op: "Identity"
-  input: "hidden_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 784
-        }
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_weights/read"
-  op: "Identity"
-  input: "hidden_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\377\377\377\377"
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/depth"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/off_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/on_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_1/random_shuffle_queue"
-  op: "RandomShuffleQueueV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "capacity"
-    value {
-      i: 20000
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "min_after_dequeue"
-    value {
-      i: 4000
-    }
-  }
-  attr {
-    key: "seed"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "seed2"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 28
-          }
-          dim {
-            size: 28
-          }
-          dim {
-            size: 1
-          }
-        }
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  op: "QueueDequeueManyV2"
-  input: "mnist_dataset_train_1/random_shuffle_queue"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "timeout_ms"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  input: "Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul"
-  op: "MatMul"
-  input: "Reshape"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add"
-  op: "Add"
-  input: "MatMul"
-  input: "hidden_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Relu"
-  op: "Relu"
-  input: "add"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add_1"
-  op: "Add"
-  input: "MatMul_1"
-  input: "logits_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_1"
-  op: "Reshape"
-  input: "add_1"
-  input: "concat"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot"
-  op: "OneHot"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
-  input: "mnist_dataset_train_2/one_hot/depth"
-  input: "mnist_dataset_train_2/one_hot/on_value"
-  input: "mnist_dataset_train_2/one_hot/off_value"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "TI"
-    value {
-      type: DT_INT64
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape_2"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/one_hot"
-  input: "concat_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "SoftmaxCrossEntropyWithLogits"
-  op: "SoftmaxCrossEntropyWithLogits"
-  input: "Reshape_1"
-  input: "Reshape_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  op: "PreventGradient"
-  input: "SoftmaxCrossEntropyWithLogits:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "message"
-    value {
-      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  op: "Mul"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  input: "gradients/Reshape_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum_1"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum"
-  input: "gradients/add_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape_1"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul_1"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Relu_grad/ReluGrad"
-  op: "ReluGrad"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency"
-  input: "Relu"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum_1"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum"
-  input: "gradients/add_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape_1"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul_1"
-  op: "MatMul"
-  input: "Reshape"
-  input: "gradients/add_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_grad/tuple/control_dependency"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 784
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_grad/MatMul"
-  input: "^gradients/MatMul_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_grad/MatMul_1"
-  input: "^gradients/MatMul_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "GradientDescent"
-  op: "NoOp"
-  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_2"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_3"
-  op: "Reshape"
-  input: "SoftmaxCrossEntropyWithLogits"
-  input: "Slice_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Mean"
-  op: "Mean"
-  input: "Reshape_3"
-  input: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "_send_Mean_0"
-  op: "_Send"
-  input: "Mean"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "client_terminated"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "recv_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device_incarnation"
-    value {
-      i: -5924635994370253548
-    }
-  }
-  attr {
-    key: "tensor_name"
-    value {
-      s: "Mean:0"
-    }
-  }
-}
-library {
-}
-versions {
-  producer: 21
-}
diff --git a/tensorflow/tensorboard/components/tf_graph/demo/index.html b/tensorflow/tensorboard/components/tf_graph/demo/index.html
deleted file mode 100644
index 52e2f0b934..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/demo/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../tf-graph.html">
-<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<title>TF Graph Demo</title>
-<style>
-  #demo-container {
-    border: 2px solid #808080;
-    width: 1000px;
-    height: 600px;
-  }
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="tf-graph-demo">
-      <template>
-        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
-        <tf-graph-loader
-            id="loader"
-            datasets="[[_datasets]]"
-            selected-dataset="[[_selectedDataset]]"
-            out-graph="{{_graph}}">
-        </tf-graph-loader>
-
-        <!-- We color ops in the graph by XLA cluster. -->
-        <tf-graph id="graph" color-by="xla_cluster"></tf-graph>
-      </template>
-      <script>
-        "use strict";
-
-        Polymer({
-          is: "tf-graph-demo",
-          properties: {
-            // We tell the graph loader to load a specific pbtxt file.
-            _datasets: {
-              type: Array,
-              value: [{
-                "name": "Graph with XLA Clusters Specified",
-                "path": "data/graph.pbtxt"
-              }],
-            },
-            _selectedDataset: {
-              type: Number,
-              value: 0,
-            },
-
-            // This property will be updated by the graph loader.
-            _graph: {
-              type: Object,
-            },
-          },
-          observers: [
-            '_graphUpdated(_graph)',
-          ],
-          _graphUpdated: function(slimGraph) {
-            const tracker = tf.graph.util.getTracker(this.$.loader);
-            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
-                tracker, 100, 'Namespace hierarchy');
-            const hierarchyOptions = {};
-            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
-                function(graphHierarchy) {
-              // We have parsed and built the graph object from a pbtxt file. Render the graph.
-              this.$.graph.set('basicGraph', slimGraph);
-              this.$.graph.set('graphHierarchy', graphHierarchy);
-            }.bind(this));
-          },
-        });
-      </script>
-    </dom-module>
-    <div id='demo-container'>
-      <tf-graph-demo></tf-graph-demo>
-    </div>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html
deleted file mode 100644
index 5fc16c0520..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-minimap.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<script src="../tf-graph-common/minimap.js"></script>
-
-<dom-module id="tf-graph-minimap">
-<template>
-<style>
-:host {
-  background-color:white;
-  transition: opacity .3s linear;
-  pointer-events: auto;
-}
-
-:host.hidden {
-  opacity: 0;
-  pointer-events: none;
-}
-
-canvas {
-  border: 1px solid #999;
-}
-
-rect {
-  fill: white;
-  stroke: #111111;
-  stroke-width: 1px;
-  fill-opacity: 0;
-  filter: url(#minimapDropShadow);
-  cursor: move;
-}
-
-svg {
-  position: absolute;
-}
-</style>
-<svg>
-  <defs>
-    <filter id="minimapDropShadow" x="-20%" y="-20%" width="150%" height="150%">
-      <feOffset result="offOut" in="SourceGraphic" dx="1" dy="1"></feOffset>
-      <feColorMatrix result="matrixOut" in="offOut" type="matrix" values="0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.5 0"></feColorMatrix>
-      <feGaussianBlur result="blurOut" in="matrixOut" stdDeviation="2"></feGaussianBlur>
-      <feBlend in="SourceGraphic" in2="blurOut" mode="normal"></feBlend>
-    </filter>
-  </defs>
-  <rect></rect>
-</svg>
-<canvas class="first"></canvas>
-<!-- Additional canvas to use as buffer to avoid flickering between updates -->
-<canvas class="second"></canvas>
-<canvas class="download"></canvas>
-</template>
-<script>
-Polymer({
-  is: 'tf-graph-minimap',
-
-  /**
-   * Initializes the minimap and returns a minimap object to notify when
-   * things update.
-   *
-   * @param svg The main svg element.
-   * @param zoomG The svg group used for panning and zooming the main svg.
-   * @param mainZoom The main zoom behavior.
-   * @param maxWandH The maximum width/height for the minimap.
-   * @param labelPadding Padding in pixels due to the main graph labels.
-   */
-  init: function(svg, zoomG, mainZoom, maxWAndH, labelPadding) {
-    return new tf.scene.Minimap(svg, zoomG, mainZoom, this, maxWAndH,
-        labelPadding);
-  }
-});
-</script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html b/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
deleted file mode 100644
index 9dc2a361e2..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph-scene.html
+++ /dev/null
@@ -1,1054 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-<link rel="import" href="tf-graph-minimap.html">
-
-<!--
-  A module that takes a render hierarchy as input and produces an SVG DOM using
-  dagre and d3.
--->
-<dom-module id="tf-graph-scene">
-<template>
-<style>
-:host {
-  display: flex;
-  width: 100%;
-  font-size: 20px;
-}
-
-::content #svg {
-  overflow: hidden;
-  flex: 1;
-  height: 100%;
-  width: 100%;
-}
-
-::content #hidden {
-  position: fixed;
-  top: 0px;
-  visibility: hidden;
-}
-
-/* --- Node and annotation-node for Metanode --- */
-
-::content .meta > .nodeshape > rect,
-::content .meta > .annotation-node > rect {
-  cursor: pointer;
-  fill: hsl(0, 0%, 70%);
-}
-
-::content .node.meta.highlighted > .nodeshape > rect,
-::content .node.meta.highlighted > .annotation-node > rect {
-  stroke-width: 2;
-}
-
-::content .annotation.meta.highlighted > .nodeshape > rect,
-::content .annotation.meta.highlighted > .annotation-node > rect {
-  stroke-width: 1;
-}
-
-::content .meta.selected > .nodeshape > rect,
-::content .meta.selected > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .node.meta.selected.expanded > .nodeshape > rect,
-::content .node.meta.selected.expanded > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 3;
-}
-
-::content .annotation.meta.selected > .nodeshape > rect,
-::content .annotation.meta.selected > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .node.meta.selected.expanded.highlighted > .nodeshape > rect,
-::content .node.meta.selected.expanded.highlighted > .annotation-node > rect {
-  stroke: red;
-  stroke-width: 4;
-}
-
-::content .faded,
-::content .faded rect,
-::content .faded ellipse,
-::content .faded path,
-::content .faded use,
-::content #rectHatch line,
-::content #ellipseHatch line {
-  color: #e0d4b3 !important;
-  fill: white;
-  stroke: #e0d4b3 !important;
-}
-
-
-::content .faded path {
-  stroke-width: 1px !important;
-}
-
-::content .faded rect {
-  fill: url(#rectHatch) !important;
-}
-
-::content .faded ellipse,
-::content .faded use {
-  fill: url(#ellipseHatch) !important;
-}
-
-::content .faded text {
-  opacity: 0;
-}
-
-/* Rules used for input-tracing. */
-::content .input-highlight > * > rect,
-::content .input-highlight > * > ellipse,
-::content .input-highlight > * > use
-{
-  fill: white;
-  stroke: #ff9800 !important;
-}
-
-/*  - Faded non-input styling */
-::content .non-input > * > rect,
-::content .non-input > * > ellipse,
-::content .non-input > * > use,
-/* For Const nodes. */
-::content .non-input > * > .constant:not([class*="input-highlight"]) >
-  .annotation-node > ellipse,
-/* For styling of annotation nodes of non-input nodes. */
-::content .non-input > g > .annotation > .annotation-node > rect {
-  stroke: #e0d4b3 !important;
-  stroke-width: inherit;
-  stroke-dasharray: inherit;
-}
-
-
-::content .non-input path {
-  visibility: hidden;
-}
-
-::content .non-input > .nodeshape > rect,
-::content .non-input > .annotation-node > rect,
-/* For styling of annotation nodes of non-input nodes. */
-::content .non-input > g > .annotation > .annotation-node > rect
-{
-  fill: url(#rectHatch) !important;
-}
-
-::content .non-input ellipse,
-::content .non-input use {
-  fill: url(#ellipseHatch) !important;
-}
-
-::content .non-input > text {
-  opacity: 0;
-}
-
-::content .non-input .annotation > .annotation-edge {
-  marker-end: url(#annotation-arrowhead-faded);
-}
-
-::content .non-input .annotation > .annotation-edge.refline {
-  marker-start: url(#ref-annotation-arrowhead-faded);
-}
-
-/* Input edges. */
-::content .input-edge-highlight > text {
-  fill: black !important;
-}
-::content .input-edge-highlight > path,
-::content .input-highlight > .in-annotations > .annotation > .annotation-edge,
-::content .input-highlight-selected > .in-annotations > .annotation >
-.annotation-edge {
-  stroke: #999 !important;
-}
-
-/* Non-input edges. */
-::content .non-input-edge-highlight,
-::content .non-input > g > .annotation > path,
-/* Annotation styles (label and edges respectively). */
-::content .non-input > g >
-.annotation:not(.input-highlight):not(.input-highlight-selected) >
-.annotation-label
-/*.annotation-edge*/
-{
-  visibility: hidden;
-}
-
-/* --- Op Node --- */
-
-::content .op > .nodeshape > ellipse,
-::content .op > .annotation-node > ellipse {
-  cursor: pointer;
-  fill: #fff;
-  stroke: #ccc;
-}
-
-::content .op.selected > .nodeshape > ellipse,
-::content .op.selected > .annotation-node > ellipse {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .op.highlighted > .nodeshape > ellipse,
-::content .op.highlighted > .annotation-node > ellipse {
-  stroke-width: 2;
-}
-
-/* --- Series Node --- */
-
-/* By default, don't show the series background <rect>. */
-::content .series > .nodeshape > rect {
-  fill: hsl(0, 0%, 70%);
-  fill-opacity: 0;
-  stroke-dasharray: 5, 5;
-  stroke-opacity: 0;
-  cursor: pointer;
-}
-
-/* Once expanded, show the series background <rect> and hide the <use>. */
-::content .series.expanded > .nodeshape > rect {
-  fill-opacity: 0.15;
-  stroke: hsl(0, 0%, 70%);
-  stroke-opacity: 1;
-}
-::content .series.expanded > .nodeshape > use {
-  visibility: hidden;
-}
-
-/**
- * TODO(jimbo): Simplify this by applying a stable class name to all <g>
- * elements that currently have either the nodeshape or annotation-node classes.
- */
-::content .series > .nodeshape > use ,
-::content .series > .annotation-node > use {
-  stroke: #ccc;
-}
-::content .series.highlighted > .nodeshape > use ,
-::content .series.highlighted > .annotation-node > use {
-  stroke-width: 2;
-}
-::content .series.selected > .nodeshape > use ,
-::content .series.selected > .annotation-node > use {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .series.selected > .nodeshape > rect {
-  stroke: red;
-  stroke-width: 2;
-}
-
-::content .annotation.series.selected > .annotation-node > use {
-  stroke: red;
-  stroke-width: 2;
-}
-
-/* --- Bridge Node --- */
-::content .bridge > .nodeshape > rect {
-  stroke: #f0f;
-  opacity: 0.2;
-  display: none;
-}
-
-/* --- Structural Elements --- */
-::content .edge > path.edgeline.structural {
-  stroke: #f0f;
-  opacity: 0.2;
-  display: none;
-}
-
-/* --- Series Nodes --- */
-
-/* Hide the rect for a series' annotation. */
-::content .series > .annotation-node > rect {
-  display: none;
-}
-
-/* --- Node label --- */
-
-
-::content .node > text.nodelabel {
-  cursor: pointer;
-  fill: #444;
-}
-
-::content .meta.expanded > text.nodelabel {
-  font-size: 9px;
-}
-
-::content .series > text.nodelabel {
-  font-size: 8px;
-}
-
-::content .op > text.nodelabel {
-  font-size: 6px;
-}
-
-::content .bridge > text.nodelabel {
-  display: none;
-}
-
-::content .node.meta.expanded > text.nodelabel{
-  cursor: normal;
-}
-
-::content .annotation.meta.highlighted > text.annotation-label {
-  fill: #50A3F7;
-}
-
-::content .annotation.meta.selected > text.annotation-label {
-  fill: #4285F4;
-}
-
-/* --- Annotation --- */
-
-/* only applied for annotations that are not summary or constant.
-(.summary, .constant gets overriden below) */
-::content .annotation > .annotation-node > * {
-  stroke-width: 0.5;
-  stroke-dasharray: 1, 1;
-}
-
-::content .annotation.summary > .annotation-node > *,
-::content .annotation.constant > .annotation-node > * {
-  stroke-width: 1;
-  stroke-dasharray: none;
-}
-
-::content .annotation > .annotation-edge {
-  fill: none;
-  stroke: #aaa;
-  stroke-width: 0.5;
-  marker-end: url(#annotation-arrowhead);
-}
-
-::content .faded .annotation > .annotation-edge {
-  marker-end: url(#annotation-arrowhead-faded);
-}
-
-::content .annotation > .annotation-edge.refline {
-  marker-start: url(#ref-annotation-arrowhead);
-}
-
-::content .faded .annotation > .annotation-edge.refline {
-  marker-start: url(#ref-annotation-arrowhead-faded);
-}
-
-::content .annotation > .annotation-control-edge {
-  stroke-dasharray: 1, 1;
-}
-
-::content #annotation-arrowhead {
-  fill: #aaa;
-}
-
-::content #annotation-arrowhead-faded {
-  fill: #e0d4b3;
-}
-
-::content #ref-annotation-arrowhead {
-  fill: #aaa;
-}
-
-::content #ref-annotation-arrowhead-faded {
-  fill: #e0d4b3;
-}
-
-::content .annotation > .annotation-label {
-  font-size: 5px;
-  cursor: pointer;
-}
-::content .annotation > .annotation-label.annotation-ellipsis {
-  cursor: default;
-}
-
-/* Hide annotations on expanded meta nodes since they're redundant. */
-::content .expanded > .in-annotations,
-::content .expanded > .out-annotations {
-  display: none;
-}
-
-/* --- Annotation: Constant --- */
-
-::content .constant > .annotation-node > ellipse {
-  cursor: pointer;
-  fill: white;
-  stroke: #848484;
-}
-
-::content .constant.selected > .annotation-node > ellipse {
-  fill: white;
-  stroke: red;
-}
-
-::content .constant.highlighted > .annotation-node > ellipse {
-  stroke-width: 1.5;
-}
-
-/* --- Annotation: Summary --- */
-
-::content .summary > .annotation-node > ellipse {
-  cursor: pointer;
-  fill: #DB4437;
-  stroke: #DB4437;
-}
-
-::content .summary.selected > .annotation-node > ellipse {
-  fill: #A52714;
-  stroke: #A52714;
-}
-
-::content .summary.highlighted > .annotation-node > ellipse {
-  stroke-width: 1.5;
-}
-
-/* --- Edge --- */
-
-::content .edge > path.edgeline {
-  fill: none;
-  stroke: #bbb;
-  stroke-linecap: round;
-  stroke-width: 0.75;
-}
-
-/* Labels showing tensor shapes on edges */
-::content .edge > text {
-  font-size: 3.5px;
-  fill: #666;
-}
-
-::content .ref-arrowhead {
-  fill: #bbb;
-}
-
-::content .edge .control-dep {
-  stroke-dasharray: 2, 2;
-}
-
-/* --- Group node expand/collapse button --- */
-
-/* Hides expand/collapse buttons when a node isn't expanded or highlighted. Using
-   incredibly small opacity so that the bounding box of the <g> parent still takes
-   this container into account even when it isn't visible */
-::content .node:not(.highlighted):not(.expanded) > .nodeshape > .buttoncontainer {
-  opacity: 0.01;
-}
-::content .node.highlighted > .nodeshape > .buttoncontainer {
-  cursor: pointer;
-}
-::content .buttoncircle {
-  fill: #E7811D;
-}
-::content .buttoncircle:hover {
-  fill: #B96717;
-}
-::content .expandbutton,
-::content .collapsebutton {
-  stroke: white;
-}
-/* Do not let the path elements in the button take pointer focus */
-::content .node > .nodeshape > .buttoncontainer > .expandbutton,
-::content .node > .nodeshape > .buttoncontainer > .collapsebutton {
-  pointer-events: none;
-}
-/* Only show the expand button when a node is collapsed and only show the
-   collapse button when a node is expanded. */
-::content .node.expanded > .nodeshape > .buttoncontainer > .expandbutton {
-  display: none;
-}
-::content .node:not(.expanded) > .nodeshape > .buttoncontainer > .collapsebutton {
-  display: none;
-}
-
-::content .health-pill-stats {
-  font-size: 4px;
-  text-anchor: middle;
-}
-
-::content .health-pill rect {
-  filter: url(#health-pill-shadow);
-  rx: 3;
-  ry: 3;
-}
-
-.titleContainer {
-  position: relative;
-  top: 20px;
-}
-
-.title {
-  position: absolute;
-}
-
-.auxTitle {
-  position: absolute;
-}
-
-#minimap {
-  position: absolute;
-  right: 20px;
-  bottom: 20px;
-}
-</style>
-<div class="titleContainer">
-  <div id="title" class="title">Main Graph</div>
-  <div id="auxTitle" class="auxTitle">Auxiliary Nodes</div>
-</div>
-<svg id="svg">
-  <defs>
-
-    <!-- Arrow heads for edge paths of different predefined sizes. -->
-    <path id="ref-arrowhead-path" d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"/>
-    <marker class="ref-arrowhead" id="ref-arrowhead-small" viewBox="0 0 10 10" markerWidth="10" markerHeight="10"
-      refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path" />
-    </marker>
-    <marker class="ref-arrowhead" id="ref-arrowhead-medium" viewBox="0 0 10 10" markerWidth="13" markerHeight="13"
-        refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path" />
-    </marker>
-    <marker class="ref-arrowhead" id="ref-arrowhead-large" viewBox="0 0 10 10" markerWidth="16" markerHeight="16"
-        refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path" />
-    </marker>
-    <marker class="ref-arrowhead" id="ref-arrowhead-xlarge" viewBox="0 0 10 10" markerWidth="20" markerHeight="20"
-        refX="8" refY="5" orient="auto" markerUnits="userSpaceOnUse">
-      <use xlink:href="#ref-arrowhead-path" />
-    </marker>
-
-    <!-- Arrow head for annotation edge paths. -->
-    <marker id="annotation-arrowhead" markerWidth="5" markerHeight="5"
-      refX="5" refY="2.5" orient="auto">
-      <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"/>
-    </marker>
-    <marker id="annotation-arrowhead-faded" markerWidth="5" markerHeight="5"
-      refX="5" refY="2.5" orient="auto">
-      <path d="M 0,0 L 5,2.5 L 0,5 L 0,0"/>
-    </marker>
-    <marker id="ref-annotation-arrowhead" markerWidth="5" markerHeight="5"
-      refX="0" refY="2.5" orient="auto">
-      <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"/>
-    </marker>
-    <marker id="ref-annotation-arrowhead-faded" markerWidth="5" markerHeight="5"
-      refX="0" refY="2.5" orient="auto">
-      <path d="M 5,0 L 0,2.5 L 5,5 L 5,0"/>
-    </marker>
-    <!-- Template for an Op node ellipse. -->
-    <ellipse id="op-node-stamp"
-        rx="7.5" ry="3" stroke="inherit" fill="inherit" />
-    <!-- Template for an Op node annotation ellipse (smaller). -->
-    <ellipse id="op-node-annotation-stamp"
-        rx="5" ry="2" stroke="inherit" fill="inherit" />
-    <!-- Vertically stacked series of Op nodes when unexpanded. -->
-    <g id="op-series-vertical-stamp">
-      <use xlink:href="#op-node-stamp" x="8" y="9" />
-      <use xlink:href="#op-node-stamp" x="8" y="6" />
-      <use xlink:href="#op-node-stamp" x="8" y="3" />
-    </g>
-    <!-- Horizontally stacked series of Op nodes when unexpanded. -->
-    <g id="op-series-horizontal-stamp">
-      <use xlink:href="#op-node-stamp" x="16" y="4" />
-      <use xlink:href="#op-node-stamp" x="12" y="4" />
-      <use xlink:href="#op-node-stamp" x="8" y="4" />
-    </g>
-    <!-- Horizontally stacked series of Op nodes for annotation. -->
-    <g id="op-series-annotation-stamp">
-      <use xlink:href="#op-node-annotation-stamp" x="9" y="2" />
-      <use xlink:href="#op-node-annotation-stamp" x="7" y="2" />
-      <use xlink:href="#op-node-annotation-stamp" x="5" y="2" />
-    </g>
-    <svg id="summary-icon" fill="#848484" height="12" viewBox="0 0 24 24" width="12">
-      <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z" />
-    </svg>
-    <!--
-      Where the linearGradient for each node is stored. Used when coloring
-      by proportions of devices.
-    -->
-    <g id="linearGradients"></g>
-
-    <!-- Hatch patterns for faded out nodes. -->
-    <pattern id="rectHatch" patternTransform="rotate(45 0 0)" width="5" height="5" patternUnits="userSpaceOnUse">
-      <line x1="0" y1="0" x2="0" y2="5" style="stroke-width: 1"/>
-    </pattern>
-    <pattern id="ellipseHatch" patternTransform="rotate(45 0 0)" width="2" height="2" patternUnits="userSpaceOnUse">
-      <line x1="0" y1="0" x2="0" y2="2" style="stroke-width: 1"/>
-    </pattern>
-
-    <!-- A shadow for health pills. -->
-    <filter id="health-pill-shadow" x="-40%" y="-40%" width="180%" height="180%">
-      <feGaussianBlur in="SourceAlpha" stdDeviation="0.8"/>
-      <feOffset dx="0" dy="0" result="offsetblur"/>
-      <feFlood flood-color="#000000"/>
-      <feComposite in2="offsetblur" operator="in"/>
-      <feMerge>
-        <feMergeNode/>
-        <feMergeNode in="SourceGraphic"/>
-      </feMerge>
-    </filter>
-  </defs>
-  <!-- Make a large rectangle that fills the svg space so that
-  zoom events get captured on safari -->
-  <rect fill="white" width="10000" height="10000"></rect>
-  <g id="root"></g>
-</svg>
-<tf-graph-minimap id="minimap"></tf-graph-minimap>
-</template>
-<script>
-Polymer({
-  is: 'tf-graph-scene',
-  properties: {
-    renderHierarchy: Object,
-    name: String,
-    colorBy: String,
-
-    // For each render hierarchy, we only fit it to the viewport once (when the scene is attached to
-    // the DOM). We do not fit the hierarchy again (unless the user clicks the reset button). For
-    // instance, if the user enters a certain view in the graph, switches to another dashboard, and
-    // returns to the graph dashboard, the user expects the previous view. These properties enable
-    // that behavior.
-
-    /** Whether the scene has fit the current render hierarchy (to the viewport) at least once. */
-    _hasRenderHierarchyBeenFitOnce: Boolean,
-    /** Whether this scene element is currently attached to a parent element. */
-    _isAttached: Boolean,
-
-    /** @type {d3_zoom} d3 zoom object */
-    _zoom: Object,
-    highlightedNode: {
-      type: String,
-      observer: '_highlightedNodeChanged'
-    },
-    selectedNode: {
-      type: String,
-      observer: '_selectedNodeChanged'
-    },
-    /** Keeps track of if the graph has been zoomed/panned since loading */
-    _zoomed: {
-      type: Boolean,
-      observer: '_onZoomChanged',
-      value: false
-    },
-    /** Keeps track of the starting coordinates of a graph zoom/pan */
-    _zoomStartCoords: {
-      type: Array,
-      value: null
-    },
-    /** Keeps track of the current coordinates of a graph zoom/pan */
-    _zoomCoords: {
-      type: Array,
-      value: null
-    },
-    /** Maximum distance of a zoom event for it to be interpreted as a click */
-    _maxZoomDistanceForClick: {
-      type: Number,
-      value: 20
-    },
-    /**
-     * @type {d3.scale.ordinal}
-     * Scale mapping from template name to a number between 0 and N-1
-     * where N is the number of different template names. Used by
-     * tf.graph.scene.node when computing node color by structure.
-     */
-    templateIndex: Function,
-    /**
-     * @type {tf.scene.Minimap}
-     * A minimap object to notify for zoom events.
-     */
-    minimap: Object,
-    /*
-     * Dictionary for easily stylizing nodes when state changes.
-     * _nodeGroupIndex[nodeName] = d3_selection of the nodeGroup
-     */
-    _nodeGroupIndex: {
-      type: Object,
-      value: function() { return {}; }
-    },
-    /*
-     * Dictionary for easily stylizing annotation nodes when state changes.
-     * _annotationGroupIndex[nodeName][hostNodeName] =
-     *   d3_selection of the annotationGroup
-     */
-    _annotationGroupIndex: {
-      type: Object,
-      value: function() { return {}; }
-    },
-    /*
-     * Dictionary for easily stylizing edges when state changes.
-     * _edgeGroupIndex[edgeName] = d3_selection of the edgeGroup
-     */
-    _edgeGroupIndex: {
-      type: Object,
-      value: function() { return {}; }
-    },
-    /**
-     * Max font size for metanode label strings.
-     */
-    maxMetanodeLabelLengthFontSize: {
-      type: Number,
-      value: 9
-    },
-    /**
-     * Min font size for metanode label strings.
-     */
-    minMetanodeLabelLengthFontSize: {
-      type: Number,
-      value: 6
-    },
-    /**
-     * Metanode label strings longer than this are given smaller fonts.
-     */
-    maxMetanodeLabelLengthLargeFont: {
-      type: Number,
-      value: 11
-    },
-    /**
-     * Metanode label strings longer than this are truncated with ellipses.
-     */
-    maxMetanodeLabelLength: {
-      type: Number,
-      value: 18
-    },
-    progress: Object,
-    // A mapping between node name to the tf.graph.scene.HealthPill to render.
-    nodeNamesToHealthPills: Object,
-    // The step of health pills to show throughout the graph.
-    healthPillStepIndex: Number,
-  },
-  observers: [
-    '_colorByChanged(colorBy)',
-    '_renderHierarchyChanged(renderHierarchy)',
-    // Animation and fitting must come after the observer for the hierarchy changing because we must
-    // first build the render hierarchy.
-    '_animateAndFit(_isAttached, renderHierarchy)',
-    '_updateHealthPills(nodeNamesToHealthPills, healthPillStepIndex)',
-  ],
-  getNode: function(nodeName) {
-    return this.renderHierarchy.getRenderNodeByName(nodeName);
-  },
-  isNodeExpanded: function(node) {
-    return node.expanded;
-  },
-  setNodeExpanded: function(renderNode) {
-    this._build(this.renderHierarchy);
-    this._updateLabels(!this._zoomed);
-  },
-  /**
-   * Resets the state of the component. Called whenever the whole graph
-   * (dataset) changes.
-   */
-  _resetState: function() {
-    // Reset the state of the component.
-    this._nodeGroupIndex = {};
-    this._annotationGroupIndex = {};
-    this._edgeGroupIndex = {};
-    this._updateLabels(false);
-    // Remove all svg elements under the 'root' svg group.
-    d3.select(this.$.svg).select('#root').selectAll('*').remove();
-    // And the defs.
-    d3.select(this.$.svg).select('defs #linearGradients')
-        .selectAll('*').remove();
-  },
-  /** Main method for building the scene */
-  _build: function(renderHierarchy) {
-    this.templateIndex = renderHierarchy.hierarchy.getTemplateIndex();
-    tf.graph.util.time('tf-graph-scene (layout):', function() {
-      // layout the scene for this meta / series node
-      tf.graph.layout.layoutScene(renderHierarchy.root, this);
-    }.bind(this));
-
-    tf.graph.util.time('tf-graph-scene (build scene):', function() {
-      tf.graph.scene.buildGroup(d3.select(this.$.root), renderHierarchy.root, this);
-      tf.graph.scene.addGraphClickListener(this.$.svg, this);
-      tf.graph.scene.node.traceInputs(renderHierarchy);
-    }.bind(this));
-    // Update the minimap again when the graph is done animating.
-    setTimeout(function() {
-      this._updateHealthPills(this.nodeNamesToHealthPills, this.healthPillStepIndex);
-      this.minimap.update();
-    }.bind(this), tf.graph.layout.PARAMS.animation.duration);
-  },
-  ready: function() {
-    this._zoom = d3.behavior.zoom()
-      .on('zoomend', function() {
-        if (this._zoomStartCoords) {
-          // Calculate the total distance dragged during the zoom event.
-          // If it is sufficiently small, then fire an event indicating
-          // that zooming has ended. Otherwise wait to fire the zoom end
-          // event, so that a mouse click registered as part of this zooming
-          // is ignored (as this mouse click was part of a zooming, and should
-          // not be used to indicate an actual click on the graph).
-          var dragDistance = Math.sqrt(
-            Math.pow(this._zoomStartCoords[0] - this._zoomCoords[0], 2) +
-            Math.pow(this._zoomStartCoords[1] - this._zoomCoords[1], 2));
-          if (dragDistance < this._maxZoomDistanceForClick) {
-            this._fireEnableClick();
-          } else {
-            setTimeout(this._fireEnableClick.bind(this), 50);
-          }
-        }
-        this._zoomStartCoords = null;
-      }.bind(this))
-      .on('zoom', function() {
-        // Store the coordinates of the zoom event
-        this._zoomCoords = d3.event.translate;
-
-        // If this is the first zoom event after a zoom-end, then
-        // store the coordinates as the start coordinates as well,
-        // and fire an event to indicate that zooming has started.
-        // This doesn't use the zoomstart event, as d3 sends this
-        // event on mouse-down, even if there has been no dragging
-        // done to translate the graph around.
-        if (!this._zoomStartCoords) {
-          this._zoomStartCoords = this._zoomCoords.slice();
-          this.fire('disable-click');
-        }
-        this._zoomed = true;
-        d3.select(this.$.root).attr('transform',
-                    'translate(' + d3.event.translate + ')' +
-                    'scale(' + d3.event.scale + ')');
-        // Notify the minimap.
-        this.minimap.zoom(d3.event.translate, d3.event.scale);
-      }.bind(this));
-    d3.select(this.$.svg).call(this._zoom)
-      .on('dblclick.zoom', null);
-    d3.select(window).on('resize', function() {
-      // Notify the minimap that the user's window was resized.
-      // The minimap will figure out the new dimensions of the main svg
-      // and will use the existing translate and scale params.
-      this.minimap.zoom();
-    }.bind(this));
-    // Initialize the minimap.
-    this.minimap = this.$.minimap.init(this.$.svg, this.$.root, this._zoom,
-        tf.graph.layout.PARAMS.minimap.size,
-        tf.graph.layout.PARAMS.subscene.meta.labelHeight);
-  },
-  attached: function() {
-    this.set('_isAttached', true);
-  },
-  detached: function() {
-    this.set('_isAttached', false);
-  },
-  _renderHierarchyChanged: function(renderHierarchy) {
-    this._hasRenderHierarchyBeenFitOnce = false;
-    this._resetState();
-    this._build(renderHierarchy);
-  },
-  _animateAndFit: function(isAttached, renderHierarchy) {
-    if (this._hasRenderHierarchyBeenFitOnce || !isAttached) {
-      // Do not animate and fit if the scene has already fitted this render hierarchy once. Or if
-      // the graph dashboard is not attached (in which case the scene lacks DOM info for fitting).
-      return;
-    }
-
-    // Fit to screen after the graph is done animating.
-    setTimeout(this.fit.bind(this), tf.graph.layout.PARAMS.animation.duration);
-  },
-  _updateLabels: function(showLabels) {
-    var mainGraphTitleElement = this.getElementsByClassName('title')[0];
-    var titleStyle = mainGraphTitleElement.style;
-    var auxTitleStyle = this.getElementsByClassName('auxTitle')[0].style;
-    var core = d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
-      tf.graph.scene.Class.Scene.CORE)[0][0];
-    // Only show labels if the graph is fully loaded.
-    if (showLabels && core && this.progress && this.progress.value === 100) {
-      var aux =
-        d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
-          tf.graph.scene.Class.Scene.INEXTRACT)[0][0] ||
-        d3.select("." + tf.graph.scene.Class.Scene.GROUP + ">." +
-          tf.graph.scene.Class.Scene.OUTEXTRACT)[0][0];
-      var coreX = core.getCTM().e;
-      var auxX = aux ? aux.getCTM().e : null;
-      titleStyle.display = 'inline';
-      titleStyle.left = coreX + 'px';
-      if (auxX !== null && auxX !== coreX) {
-        auxTitleStyle.display = 'inline';
-
-        // Make sure that the aux title is positioned rightwards enough so as to
-        // prevent overlap with the main graph title.
-        auxX = Math.max(
-            coreX + mainGraphTitleElement.getBoundingClientRect().width, auxX);
-
-        auxTitleStyle.left = auxX + 'px';
-      } else {
-        auxTitleStyle.display = 'none';
-      }
-    } else {
-      titleStyle.display='none';
-      auxTitleStyle.display = 'none';
-    }
-  },
-  /**
-    * Called whenever the user changed the 'color by' option in the
-    * UI controls.
-    */
-  _colorByChanged: function() {
-    if (this.renderHierarchy != null) {
-      // We iterate through each svg node and update its state.
-      _.each(this._nodeGroupIndex, function(nodeGroup, nodeName) {
-        this._updateNodeState(nodeName);
-      }, this);
-      // Notify also the minimap.
-      this.minimap.update();
-    }
-  },
-  fit: function() {
-    this._hasRenderHierarchyBeenFitOnce = true;
-    tf.graph.scene.fit(this.$.svg, this.$.root, this._zoom, function() {
-      this._zoomed = false;
-    }.bind(this));
-  },
-  isNodeSelected: function(n) {
-    return n === this.selectedNode;
-  },
-  isNodeHighlighted: function(n) {
-    return n === this.highlightedNode;
-  },
-  addAnnotationGroup: function(a, d, selection) {
-    var an = a.node.name;
-    this._annotationGroupIndex[an] = this._annotationGroupIndex[an] || {};
-    this._annotationGroupIndex[an][d.node.name] = selection;
-  },
-  getAnnotationGroupsIndex: function(a) {
-    return this._annotationGroupIndex[a];
-  },
-  removeAnnotationGroup: function(a, d) {
-    delete this._annotationGroupIndex[a.node.name][d.node.name];
-  },
-  addNodeGroup: function(n, selection) {
-    this._nodeGroupIndex[n] = selection;
-  },
-  getNodeGroup: function(n) {
-    return this._nodeGroupIndex[n];
-  },
-  removeNodeGroup: function(n) {
-    delete this._nodeGroupIndex[n];
-  },
-  addEdgeGroup: function(n, selection) {
-    this._edgeGroupIndex[e] = selection;
-  },
-  getEdgeGroup: function(e) {
-    return this._edgeGroupIndex[e];
-  },
-  _updateHealthPills: function(nodeNamesToHealthPills, healthPillStepIndex) {
-    tf.graph.scene.addHealthPills(
-        this.$.svg, nodeNamesToHealthPills, healthPillStepIndex);
-  },
-  /**
-   * Update node and annotation node of the given name.
-   * @param  {String} n node name
-   */
-  _updateNodeState: function(n) {
-    var node = this.getNode(n);
-    var nodeGroup = this.getNodeGroup(n);
-
-    if (nodeGroup) {
-      tf.graph.scene.node.stylize(nodeGroup, node, this);
-    }
-
-    var annotationGroupIndex = this.getAnnotationGroupsIndex(n);
-    _.each(annotationGroupIndex, function(aGroup, hostName) {
-      tf.graph.scene.node.stylize(aGroup, node, this,
-          tf.graph.scene.Class.Annotation.NODE);
-    }, this);
-  },
-
-  /**
-   * Handles new node selection. 1) Updates the selected-state of each node,
-   * 2) triggers input tracing.
-   * @param selectedNode {string} The name of the newly selected node.
-   * @param oldSelectedNode {string} The name of the previously selected node.
-   * @private
-   */
-  _selectedNodeChanged: function(selectedNode, oldSelectedNode) {
-    if (selectedNode === oldSelectedNode) {
-      return;
-    }
-
-    if (selectedNode) {
-      this._updateNodeState(selectedNode);
-    }
-    if (oldSelectedNode) {
-      this._updateNodeState(oldSelectedNode);
-    }
-
-    tf.graph.scene.node.traceInputs(this.renderHierarchy);
-
-    if (!selectedNode) {
-      return;
-    }
-
-
-    // Update the minimap to reflect the highlighted (selected) node.
-    this.minimap.update();
-    var node = this.renderHierarchy.hierarchy.node(selectedNode);
-    var nodeParents = [];
-    // Create list of all metanode parents of the selected node.
-    while (node.parentNode != null
-        && node.parentNode.name != tf.graph.ROOT_NAME) {
-      node = node.parentNode;
-      nodeParents.push(node.name);
-    }
-    // Ensure each parent metanode is built and expanded.
-    var topParentNodeToBeExpanded;
-    _.forEachRight(nodeParents, function(parentName) {
-      this.renderHierarchy.buildSubhierarchy(parentName);
-      var renderNode = this.renderHierarchy.getRenderNodeByName(parentName);
-      if (renderNode.node.isGroupNode && !renderNode.expanded) {
-        renderNode.expanded = true;
-        if (!topParentNodeToBeExpanded) {
-          topParentNodeToBeExpanded = renderNode;
-        }
-      }
-    }, this);
-    // If any expansion was needed to display this selected node, then
-    // inform the scene of the top-most expansion.
-    if (topParentNodeToBeExpanded) {
-      this.setNodeExpanded(topParentNodeToBeExpanded);
-      this._zoomed = true;
-    }
-
-    if (tf.graph.scene.panToNode(selectedNode, this.$.svg, this.$.root,
-        this._zoom)) {
-      this._zoomed = true;
-    }
-  },
-  _highlightedNodeChanged: function(highlightedNode, oldHighlightedNode) {
-    if (highlightedNode === oldHighlightedNode) {
-      return;
-    }
-
-    if (highlightedNode) {
-      this._updateNodeState(highlightedNode);
-    }
-    if (oldHighlightedNode) {
-      this._updateNodeState(oldHighlightedNode);
-    }
-  },
-  _onZoomChanged: function() {
-    this._updateLabels(!this._zoomed);
-  },
-  _fireEnableClick: function() {
-    this.fire('enable-click');
-  },
-});
-</script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph/tf-graph.html b/tensorflow/tensorboard/components/tf_graph/tf-graph.html
deleted file mode 100644
index efbf065a40..0000000000
--- a/tensorflow/tensorboard/components/tf_graph/tf-graph.html
+++ /dev/null
@@ -1,316 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
-<link rel="import" href="../iron-icons/iron-icons.html">
-<link rel="import" href="../paper-button/paper-button.html">
-<link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
-<link rel="import" href="../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="tf-graph-scene.html">
-
-<dom-module id="tf-graph">
-<template>
-<style>
-.container {
-  width: 100%;
-  height: 100%;
-  background: white;
-  box-shadow: 0 1px 5px rgba(0,0,0,0.2);
-}
-
-.vertical {
-  width:100%;
-  height:100%;
-  @apply(--layout-vertical);
-}
-
-.auto {
-  @apply(--layout-flex-auto);
-  @apply(--layout-vertical);
-}
-
-h2 {
-  text-align: center;
-}
-
-paper-button {
-  text-transform: none;
-}
-</style>
-<div class="container">
-  <div class="vertical">
-    <template is="dom-if" if="[[title]]">
-      <h2>[[title]]</h2>
-    </template>
-    <tf-graph-scene id="scene" class="auto"
-          render-hierarchy="[[renderHierarchy]]"
-          highlighted-node="[[_getVisible(highlightedNode)]]"
-          selected-node="{{selectedNode}}"
-          color-by="[[colorBy]]"
-          progress="[[progress]]"
-          node-names-to-health-pills="[[nodeNamesToHealthPills]]"
-          health-pill-step-index="{{healthPillStepIndex}}"
-    ></tf-graph-scene>
-  </div>
-</div>
-</template>
-</dom-module>
-
-<script>
-Polymer({
-
-  is: 'tf-graph',
-
-  properties: {
-    graphHierarchy: {
-      type: Object,
-      notify: true,
-      observer: '_graphChanged'
-    },
-    basicGraph: Object,
-    stats: Object,
-    devicesForStats: Object,
-    hierarchyParams: Object,
-    progress: {
-      type: Object,
-      notify: true,
-    },
-    title: String,
-    selectedNode: {
-      type: String,
-      notify: true,
-    },
-    highlightedNode: {
-      type: String,
-      notify: true
-    },
-    /** What to color the nodes by (compute time, memory, device etc.) */
-    colorBy: String,
-    colorByParams: {
-      type: Object,
-      notify: true,
-      readOnly: true, // Produces and doesn't consume.
-    },
-    renderHierarchy: {
-      type: Object,
-      readOnly: true,
-      notify: true,
-    },
-    _renderDepth: {
-      type: Number,
-      value: 1
-    },
-    _allowGraphSelect: {
-      type: Boolean,
-      value: true
-    },
-    // A mapping between node name to the tf.graph.scene.HealthPill to render.
-    nodeNamesToHealthPills: Object,
-    // The step of health pills to show throughout the graph.
-    healthPillStepIndex: Number,
-  },
-  observers: [
-    '_statsChanged(stats, devicesForStats)',
-    '_buildRenderHierarchy(graphHierarchy)'
-  ],
-  _statsChanged: function(stats, devicesForStats) {
-    if (this.graphHierarchy) {
-      if (stats && devicesForStats) {
-        tf.graph.joinStatsInfoWithGraph(this.basicGraph, stats, devicesForStats);
-        tf.graph.hierarchy.joinAndAggregateStats(this.graphHierarchy, stats);
-      }
-      // Recompute the rendering information.
-      this._buildRenderHierarchy(this.graphHierarchy);
-    }
-  },
-  _buildRenderHierarchy: function(graphHierarchy) {
-    tf.graph.util.time('new tf.graph.render.Hierarchy', function() {
-      if (graphHierarchy.root.type !== tf.graph.NodeType.META) {
-        // root must be metanode but sometimes Polymer's dom-if has not
-        // remove tf-graph element yet in <tf-node-info>
-        // and thus mistakenly pass non-metanode to this module.
-        return;
-      }
-      var renderGraph = new tf.graph.render.RenderGraphInfo(
-          graphHierarchy, !!this.stats /** displayingStats */);
-      // Producing the 'color by' parameters to be consumed
-      // by the tf-graph-controls panel. It contains information about the
-      // min and max values and their respective colors, as well as list
-      // of devices with their respective colors.
-
-      function getColorParamsFromScale(scale) {
-        return {
-          minValue: scale.domain()[0],
-          maxValue: scale.domain()[1],
-          startColor: scale.range()[0],
-          endColor: scale.range()[1]
-        };
-      }
-
-      this._setColorByParams({
-        compute_time: getColorParamsFromScale(renderGraph.computeTimeScale),
-        memory: getColorParamsFromScale(renderGraph.memoryUsageScale),
-        device: _.map(renderGraph.deviceColorMap.domain(),
-            function(deviceName) {
-          return {
-            device: deviceName,
-            color: renderGraph.deviceColorMap(deviceName)
-          };
-        }),
-        xla_cluster: _.map(renderGraph.xlaClusterColorMap.domain(),
-            function(xlaClusterName) {
-          return {
-            xla_cluster: xlaClusterName,
-            color: renderGraph.xlaClusterColorMap(xlaClusterName)
-          };
-        }),
-      });
-      this._setRenderHierarchy(renderGraph);
-      this.async(function() {
-        this.fire("rendered");
-      });
-    }.bind(this));
-  },
-  _getVisible: function(name) {
-    if (!name) {
-      return name;
-    }
-    return this.renderHierarchy.getNearestVisibleAncestor(name);
-  },
-  listeners: {
-    'graph-select': '_graphSelected',
-    'disable-click': '_disableClick',
-    'enable-click': '_enableClick',
-    // Nodes
-    'node-toggle-expand': '_nodeToggleExpand',
-    'node-select': '_nodeSelected',
-    'node-highlight': '_nodeHighlighted',
-    'node-unhighlight': '_nodeUnhighlighted',
-    'node-toggle-extract': '_nodeToggleExtract',
-    'node-toggle-seriesgroup': '_nodeToggleSeriesGroup',
-
-    // Annotations
-
-    /* Note: currently highlighting/selecting annotation node has the same
-      * behavior as highlighting/selecting actual node so we point to the same
-      * set of event listeners.  However, we might redesign this to be a bit
-      * different.
-      */
-    'annotation-select': '_nodeSelected',
-    'annotation-highlight': '_nodeHighlighted',
-    'annotation-unhighlight': '_nodeUnhighlighted',
-  },
-  _graphChanged: function() {
-    // When a new graph is loaded, fire this event so that there is no
-    // info-card being displayed for the previously-loaded graph.
-    this.fire('graph-select');
-  },
-  _graphSelected: function(event) {
-    // Graph selection is not allowed during an active zoom event, as the
-    // click seen during a zoom/pan is part of the zooming and does not
-    // indicate a user desire to click on a specific section of the graph.
-    if (this._allowGraphSelect) {
-      this.set('selectedNode', null);
-    }
-    // Reset this variable as a bug in d3 zoom behavior can cause zoomend
-    // callback not to be called if a right-click happens during a zoom event.
-    this._allowGraphSelect = true;
-  },
-  _disableClick: function(event) {
-    this._allowGraphSelect = false;
-  },
-  _enableClick: function(event) {
-    this._allowGraphSelect = true;
-  },
-  _nodeSelected: function(event) {
-    if (this._allowGraphSelect) {
-      this.set('selectedNode', event.detail.name);
-    }
-    // Reset this variable as a bug in d3 zoom behavior can cause zoomend
-    // callback not to be called if a right-click happens during a zoom event.
-    this._allowGraphSelect = true;
-  },
-  _nodeHighlighted: function(event) {
-    this.set('highlightedNode', event.detail.name);
-  },
-  _nodeUnhighlighted: function(event) {
-    this.set('highlightedNode', null);
-  },
-  _nodeToggleExpand: function(event) {
-    // Immediately select the node that is about to be expanded.
-    this._nodeSelected(event);
-
-    // Compute the sub-hierarchy scene.
-    var nodeName = event.detail.name;
-    var renderNode = this.renderHierarchy.getRenderNodeByName(nodeName);
-    // Op nodes are not expandable.
-    if (renderNode.node.type === tf.graph.NodeType.OP) {
-      return;
-    }
-    this.renderHierarchy.buildSubhierarchy(nodeName);
-    renderNode.expanded = !renderNode.expanded;
-
-    // Expand the node with some delay so that the user can immediately see
-    // the visual effect of selecting that node, before the expansion is
-    // done.
-    this.async(function() {
-      this.querySelector('#scene').setNodeExpanded(renderNode);
-    }, 75);
-  },
-  _nodeToggleExtract: function(event) {
-    // Toggle the include setting of the specified node appropriately.
-    var nodeName = event.detail.name;
-    var renderNode = this.renderHierarchy.getRenderNodeByName(nodeName);
-    if (renderNode.node.include == tf.graph.InclusionType.INCLUDE) {
-      renderNode.node.include = tf.graph.InclusionType.EXCLUDE;
-    } else if (renderNode.node.include == tf.graph.InclusionType.EXCLUDE) {
-      renderNode.node.include = tf.graph.InclusionType.INCLUDE;
-    } else {
-      renderNode.node.include =
-       this.renderHierarchy.isNodeAuxiliary(renderNode)
-          ? tf.graph.InclusionType.INCLUDE : tf.graph.InclusionType.EXCLUDE;
-    }
-
-    // Rebuild the render hierarchy.
-    this._buildRenderHierarchy(this.graphHierarchy);
-  },
-  _nodeToggleSeriesGroup: function(event) {
-    // Toggle the group setting of the specified node appropriately.
-    var nodeName = event.detail.name;
-    tf.graph.toggleNodeSeriesGroup(this.hierarchyParams.seriesMap, nodeName);
-
-    // Rebuild the render hierarchy with the updated series grouping map.
-    this.set('progress', {
-      value: 0,
-      msg: ''
-    });
-    var tracker = tf.graph.util.getTracker(this);
-    var hierarchyTracker = tf.graph.util.getSubtaskTracker(tracker, 100,
-          'Namespace hierarchy');
-    tf.graph.hierarchy.build(this.basicGraph, this.hierarchyParams, hierarchyTracker)
-    .then(function(graphHierarchy) {
-      this.set('graphHierarchy', graphHierarchy);
-      this._buildRenderHierarchy(this.graphHierarchy);
-    }.bind(this));
-  },
-  not: function(x) {
-    return !x;
-  }
-});
-</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_app/BUILD b/tensorflow/tensorboard/components/tf_graph_app/BUILD
deleted file mode 100644
index 499bd621c8..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_app/BUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_app",
-    srcs = [
-        "index.html",
-        "tf-graph-app.html",
-    ],
-    path = "/tf-graph-app",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_board",
-        "//tensorflow/tensorboard/components/tf_graph_controls",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
-        "@org_polymer",
-        "@org_polymer_iron_component_page",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "index.html",
-        "tf-graph-app.html",
-    ],
-    destdir = "tf-graph-app",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_board:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_controls:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_loader:legacy",
-        "//third_party/javascript/polymer/v1/iron-list:lib",
-        "//third_party/javascript/polymer/v1/paper-radio-group:lib",
-        "//third_party/javascript/polymer/v1/paper-tooltip:lib",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
deleted file mode 100644
index 147cb0947c..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_app/demo/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_app/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"] + glob(["data/**"]),
-    path = "/tf-graph-app/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_app",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_app/demo/data/graph.pbtxt
deleted file mode 100644
index 8b95b258df..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_app/demo/data/graph.pbtxt
+++ /dev/null
@@ -1,90 +0,0 @@
-node {
-  name: "life"
-  op: "Const"
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "universe"
-  op: "Const"
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 40
-      }
-    }
-  }
-}
-node {
-  name: "everything"
-  op: "Const"
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Add"
-  op: "Add"
-  input: "life"
-  input: "universe"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-}
-node {
-  name: "answer"
-  op: "Add"
-  input: "Add"
-  input: "everything"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-}
-versions {
-  producer: 10
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_app/demo/index.html b/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
deleted file mode 100644
index f71feea390..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_app/demo/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="import" href="../tf-graph-app.html">
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<style>
-  /** Make the graph app tall enough so the bottom legend does not overlap with the top. */
-  tf-graph-app, .container.tf-graph-app {
-    display: block;
-    height: 700px;
-  }
-</style>
-<h3>Answer to the Ultimate Question of Life, the Universe, and Everything</h3>
-<demo-snippet>
-  <template>
-    <tf-graph-app pbtxt-file-location="data/graph.pbtxt"></tf-graph-app>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_app/index.html b/tensorflow/tensorboard/components/tf_graph_app/index.html
deleted file mode 100644
index c80fbf4f63..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_app/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-  <head>
-    <title>vz-vega</title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="../webcomponentsjs/webcomponents-lite.js"></script>
-    <link rel="import" href="../iron-component-page/iron-component-page.html">
-  </head>
-  <body>
-    <iron-component-page src="tf-graph-app.html"></iron-component-page>
-  </body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html b/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
deleted file mode 100644
index 915b54a06a..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_app/tf-graph-app.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-graph-board/tf-graph-board.html">
-<link rel="import" href="../tf-graph-loader/tf-graph-loader.html">
-<link rel="import" href="../tf-graph-controls/tf-graph-controls.html">
-
-<!--
-Stand alone element of tf-graph for embedding.
-
-The pbtxt format is the stringified version of the graphdef.
-
-    <tf-graph-app pbtxt="[[pbtxt]]"></tf-graph-app>
-
-    import tensorflow as tf
-    life = tf.constant(2, name='life')
-    universe = tf.constant(40, name='universe')
-    everything = tf.constant(0, name='everything')
-    lifeuniverse = tf.add(life, universe)
-    answer = tf.add(lifeuniverse, everything, name='answer')
-    open("graph.pbtxt", "w").write(str(tf.get_default_graph().as_graph_def()))
-
-@demo demo/index.html
--->
-<dom-module id="tf-graph-app">
-<template>
-<style>
-
-:host /deep/ {
-  font-family: 'Roboto', sans-serif;
-}
-
-.main {
-  position: absolute;
-  right: 0;
-  left: 250px;
-  height: 100%;
-}
-
-.side {
-  position: absolute;
-  left: 0;
-  width: 250px;
-  height: 100%;
-  border: 1px solid black;
-  box-sizing: border-box;
-}
-
-.all {
-  position: relative;
-  width: 100%;
-  height: 100%
-}
-
-.container {
-  height: 650px;
-}
-
-</style>
-<div class="container">
-  <div class="all">
-    <div class="side">
-      <tf-graph-controls
-          color-by-params="[[colorByParams]]"
-          stats="[[stats]]"
-          color-by="{{colorBy}}"
-          render-hierarchy="[[_renderHierarchy]]"
-      ></tf-graph-controls>
-      <tf-graph-loader id="loader"
-          out-graph-hierarchy="{{graphHierarchy}}"
-          out-graph="{{graph}}"
-          out-stats="{{stats}}"
-          progress="{{_progress}}"
-      ></tf-graph-loader>
-    </div>
-    <div class="main">
-      <tf-graph-board id="graphboard"
-          graph-hierarchy="[[graphHierarchy]]"
-          graph="[[graph]]"
-          stats="[[stats]]"
-          progress="[[_progress]]"
-          color-by="[[colorBy]]"
-          color-by-params="{{colorByParams}}"
-          render-hierarchy="{{_renderHierarchy}}"
-      ></tf-graph-board>
-    </div>
-  </div>
-</div>
-</template>
-</dom-module>
-
-<script>
-(function(){
-
-Polymer({
-  is: 'tf-graph-app',
-  properties: {
-    stats: Object,
-
-    // To use tf-graph-app, specify one of these 2 properties. Provide either
-    // 1. The path to a pbtxt file to load (pbtxtFileLocation). This option nicely makes the
-    //    progress bar include the time it takes to load the file across the network. The path could
-    //    be either a relative path or an absolute URL (of a resource that supports CORS).
-    // 2. The raw contents of a pbtxt file (pbtxt).
-    // Do not set both of these 2 properties.
-    pbtxtFileLocation: {
-      type: String,
-      observer: '_updateGraph',
-    },
-    pbtxt: {
-      type: String,
-      observer: '_updateGraph',
-    },
-
-    _renderHierarchy: Object,
-    _progress: Object,
-  },
-  _updateGraph: function() {
-    if (this.pbtxtFileLocation) {
-      // Fetch a pbtxt file. The fetching will be part of the loading sequence.
-      this.$.loader.datasets = [{
-        // Just name the dataset based on the file location.
-        "name": this.pbtxtFileLocation,
-        "path": this.pbtxtFileLocation,
-      }];
-      this.$.loader.set('selectedDataset', 0);
-    } else if (this.pbtxt) {
-      // Render the provided pbtxt.
-      var blob = new Blob([this.pbtxt]);
-
-      // TODO(chizeng): Find out why we call a private method here and do away with the call.
-      this.$.loader._parseAndConstructHierarchicalGraph(null, blob);
-    }
-  },
-});
-})();
-</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
index cdddd2e032..8964634b84 100644
--- a/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_app_d3v4/BUILD
@@ -28,3 +28,32 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "index.html",
+        "tf-graph-app.html",
+    ],
+    destdir = "tf-graph-app",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_board_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_controls_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4:legacy",
+        "//third_party/javascript/polymer/v1/iron-list:lib",
+        "//third_party/javascript/polymer/v1/paper-radio-group:lib",
+        "//third_party/javascript/polymer/v1/paper-tooltip:lib",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_board/BUILD b/tensorflow/tensorboard/components/tf_graph_board/BUILD
deleted file mode 100644
index 4358e601f4..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_board/BUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_board",
-    srcs = [
-        "tf-graph-board.html",
-    ],
-    path = "/tf-graph-board",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "//tensorflow/tensorboard/components/tf_graph_info",
-        "@org_polymer",
-        "@org_polymer_paper_progress",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-board.html",
-    ],
-    destdir = "tf-graph-board",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_info:legacy",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
deleted file mode 100644
index 2d668769e6..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_board/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_board/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"] + glob(["data/**"]),
-    path = "/tf-graph-board/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_board",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt
deleted file mode 100644
index 30b2064534..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_board/demo/data/graph.pbtxt
+++ /dev/null
@@ -1,4606 +0,0 @@
-node {
-  name: "GradientDescent/learning_rate"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_3"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0.1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 100
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000d\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_grad/Shape"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_1_grad/Shape"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod_1"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape_1"
-  input: "gradients/Mean_grad/Const_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum"
-  op: "Maximum"
-  input: "gradients/Mean_grad/Prod_1"
-  input: "gradients/Mean_grad/Maximum/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape"
-  input: "gradients/Mean_grad/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/floordiv"
-  op: "FloorDiv"
-  input: "gradients/Mean_grad/Prod"
-  input: "gradients/Mean_grad/Maximum"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Cast"
-  op: "Cast"
-  input: "gradients/Mean_grad/floordiv"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "DstT"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "SrcT"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile/multiples"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Fill"
-  op: "Fill"
-  input: "gradients/Shape"
-  input: "gradients/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Fill"
-  input: "gradients/Mean_grad/Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile"
-  op: "Tile"
-  input: "gradients/Mean_grad/Reshape"
-  input: "gradients/Mean_grad/Tile/multiples"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tmultiples"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/truediv"
-  op: "RealDiv"
-  input: "gradients/Mean_grad/Tile"
-  input: "gradients/Mean_grad/Cast"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Mean_grad/truediv"
-  input: "gradients/Reshape_3_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  op: "ExpandDims"
-  input: "gradients/Reshape_3_grad/Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tdim"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/begin"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1"
-  op: "Sub"
-  input: "Rank_2"
-  input: "Sub_1/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/begin"
-  op: "Pack"
-  input: "Sub_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_1"
-  op: "Slice"
-  input: "Shape_2"
-  input: "Slice_1/begin"
-  input: "Slice_1/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat_1"
-  op: "ConcatV2"
-  input: "concat_1/values_0"
-  input: "Slice_1"
-  input: "concat_1/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub"
-  op: "Sub"
-  input: "Rank_1"
-  input: "Sub/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice/begin"
-  op: "Pack"
-  input: "Sub"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice"
-  op: "Slice"
-  input: "Shape_1"
-  input: "Slice/begin"
-  input: "Slice/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat"
-  op: "ConcatV2"
-  input: "concat/values_0"
-  input: "Slice"
-  input: "concat/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2"
-  op: "Sub"
-  input: "Rank"
-  input: "Sub_2/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/size"
-  op: "Pack"
-  input: "Sub_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_2"
-  op: "Slice"
-  input: "Shape"
-  input: "Slice_2/begin"
-  input: "Slice_2/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_biases/read"
-  op: "Identity"
-  input: "logits_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_weights/read"
-  op: "Identity"
-  input: "logits_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_biases/read"
-  op: "Identity"
-  input: "hidden_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 784
-        }
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_weights/read"
-  op: "Identity"
-  input: "hidden_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\377\377\377\377"
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/depth"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/off_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/on_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_1/random_shuffle_queue"
-  op: "RandomShuffleQueueV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "capacity"
-    value {
-      i: 20000
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "min_after_dequeue"
-    value {
-      i: 4000
-    }
-  }
-  attr {
-    key: "seed"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "seed2"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 28
-          }
-          dim {
-            size: 28
-          }
-          dim {
-            size: 1
-          }
-        }
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  op: "QueueDequeueManyV2"
-  input: "mnist_dataset_train_1/random_shuffle_queue"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "timeout_ms"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  input: "Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul"
-  op: "MatMul"
-  input: "Reshape"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add"
-  op: "Add"
-  input: "MatMul"
-  input: "hidden_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Relu"
-  op: "Relu"
-  input: "add"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add_1"
-  op: "Add"
-  input: "MatMul_1"
-  input: "logits_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_1"
-  op: "Reshape"
-  input: "add_1"
-  input: "concat"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot"
-  op: "OneHot"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
-  input: "mnist_dataset_train_2/one_hot/depth"
-  input: "mnist_dataset_train_2/one_hot/on_value"
-  input: "mnist_dataset_train_2/one_hot/off_value"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "TI"
-    value {
-      type: DT_INT64
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape_2"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/one_hot"
-  input: "concat_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "SoftmaxCrossEntropyWithLogits"
-  op: "SoftmaxCrossEntropyWithLogits"
-  input: "Reshape_1"
-  input: "Reshape_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  op: "PreventGradient"
-  input: "SoftmaxCrossEntropyWithLogits:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "message"
-    value {
-      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  op: "Mul"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  input: "gradients/Reshape_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum_1"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum"
-  input: "gradients/add_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape_1"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul_1"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Relu_grad/ReluGrad"
-  op: "ReluGrad"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency"
-  input: "Relu"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum_1"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum"
-  input: "gradients/add_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape_1"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul_1"
-  op: "MatMul"
-  input: "Reshape"
-  input: "gradients/add_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_grad/tuple/control_dependency"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 784
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_grad/MatMul"
-  input: "^gradients/MatMul_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_grad/MatMul_1"
-  input: "^gradients/MatMul_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "GradientDescent"
-  op: "NoOp"
-  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_2"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_3"
-  op: "Reshape"
-  input: "SoftmaxCrossEntropyWithLogits"
-  input: "Slice_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Mean"
-  op: "Mean"
-  input: "Reshape_3"
-  input: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "_send_Mean_0"
-  op: "_Send"
-  input: "Mean"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "client_terminated"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "recv_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device_incarnation"
-    value {
-      i: -5924635994370253548
-    }
-  }
-  attr {
-    key: "tensor_name"
-    value {
-      s: "Mean:0"
-    }
-  }
-}
-library {
-}
-versions {
-  producer: 21
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_board/demo/index.html b/tensorflow/tensorboard/components/tf_graph_board/demo/index.html
deleted file mode 100644
index 2563e1595e..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_board/demo/index.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../tf-graph-board.html">
-<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<title>TF Graph Board Demo</title>
-<style>
-  #demo-container {
-    border: 2px solid #808080;
-    width: 1000px;
-    height: 600px;
-  }
-
-  /** Make the graph take up the entire height of the demo container. */
-  tf-graph-board-demo, #board, #board > div {
-    display: block;
-    height: 100%;
-  }
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="tf-graph-board-demo">
-      <template>
-        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
-        <tf-graph-loader
-            id="loader"
-            datasets="[[_datasets]]"
-            selected-dataset="[[_selectedDataset]]"
-            out-graph="{{_graph}}">
-        </tf-graph-loader>
-
-        <!-- We color ops in the graph by XLA cluster. -->
-        <tf-graph-board id="board" color-by="xla_cluster"></tf-graph-board>
-      </template>
-      <script>
-        "use strict";
-
-        Polymer({
-          is: "tf-graph-board-demo",
-          properties: {
-            // We tell the graph loader to load a specific pbtxt file.
-            _datasets: {
-              type: Array,
-              value: [{
-                "name": "Graph with XLA Clusters Specified",
-                "path": "data/graph.pbtxt"
-              }],
-            },
-            _selectedDataset: {
-              type: Number,
-              value: 0,
-            },
-
-            // This property will be updated by the graph loader.
-            _graph: {
-              type: Object,
-            },
-          },
-          observers: [
-            '_graphUpdated(_graph)',
-          ],
-          _graphUpdated: function(slimGraph) {
-            const tracker = tf.graph.util.getTracker(this.$.loader);
-            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
-                tracker, 100, 'Namespace hierarchy');
-            const hierarchyOptions = {};
-            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
-                function(graphHierarchy) {
-              // We have parsed and built the graph object from a pbtxt file. Render the graph.
-              this.$.board.set('graph', slimGraph);
-              this.$.board.set('graphHierarchy', graphHierarchy);
-            }.bind(this));
-          },
-        });
-      </script>
-    </dom-module>
-    <div id='demo-container'>
-      <tf-graph-board-demo></tf-graph-board-demo>
-    </div>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html b/tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html
deleted file mode 100644
index 0ee694e1e6..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_board/tf-graph-board.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-graph/tf-graph.html">
-<link rel="import" href="../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="../tf-graph-info/tf-graph-info.html">
-<link rel="import" href="../paper-progress/paper-progress.html">
-
-<!--
-Element for putting tf-graph and tf-graph-info side by side.
-
-Example
-
-  <tf-graph-board graph=[[graph]]></tf-graph-board>
-
--->
-<dom-module id="tf-graph-board">
-<template>
-<style>
-::host {
-  display: block;
-}
-
-/deep/ .close {
-  position: absolute;
-  cursor: pointer;
-  left: 15px;
-  bottom: 15px;
-}
-
-.container {
-  width: 100%;
-  height: 100%;
-  opacity: 1;
-}
-
-.container.loading {
-  cursor: progress;
-  opacity: 0.1;
-}
-
-.container.loading.error {
-  cursor: auto;
-}
-
-#info {
-  position: absolute;
-  right: 5px;
-  top: 5px;
-  padding: 0px;
-  max-width: 380px;
-  min-width: 320px;
-  background-color: rgba(255,255,255,0.9);
-  @apply(--shadow-elevation-2dp);
-}
-
-#main {
-  width: 100%;
-  height: 100%;
-}
-
-#progress-bar {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  position: absolute;
-  top: 40px;
-  left: 0;
-  font-size: 13px;
-}
-
-#progress-msg {
-  width: 400px;
-  margin-bottom: 5px;
-}
-
-paper-progress {
-  width: 400px;
-  --paper-progress-height: 6px;
-  --paper-progress-active-color: #f3913e;
-}
-
-.context-menu {
-  position: absolute;
-  display: none;
-  background-color: #e2e2e2;
-  border-radius: 2px;
-  font-size: 14px;
-  min-width: 150px;
-  border: 1px solid #d4d4d4;
-}
-
-/deep/ .context-menu ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  cursor: default;
-}
-
-/deep/ .context-menu ul li {
-  padding: 4px 16px;
-}
-
-/deep/ .context-menu ul li:hover {
-  background-color: #f3913e;
-  color: white;
-}
-</style>
-<template is="dom-if" if="[[_isNotComplete(progress)]]">
-  <div id="progress-bar">
-    <div id="progress-msg">[[progress.msg]]</div>
-    <paper-progress value="[[progress.value]]"></paper-progress>
-  </div>
-</template>
-<div class$="[[_getContainerClass(progress)]]">
-  <div id="main">
-    <tf-graph id="graph"
-              graph-hierarchy="{{graphHierarchy}}"
-              basic-graph="[[graph]]"
-              hierarchy-params="[[hierarchyParams]]"
-              render-hierarchy="{{renderHierarchy}}"
-              devices-for-stats="[[devicesForStats]]"
-              stats="[[stats]]"
-              selected-node="{{_selectedNode}}"
-              highlighted-node="{{_highlightedNode}}"
-              color-by="[[colorBy]]"
-              color-by-params="{{colorByParams}}"
-              progress="{{progress}}"
-              node-names-to-health-pills="[[nodeNamesToHealthPills]]"
-              health-pill-step-index="[[healthPillStepIndex]]"
-    ></tf-graph>
-  </div>
-  <div id="info">
-    <tf-graph-info id="graph-info"
-              title="selected"
-              graph-hierarchy="[[graphHierarchy]]"
-              render-hierarchy="[[renderHierarchy]]"
-              graph="[[graph]]"
-              selected-node="{{_selectedNode}}"
-              selected-node-include="{{_selectedNodeInclude}}"
-              highlighted-node="{{_highlightedNode}}"
-              color-by="[[colorBy]]"
-              color-by-params="[[colorByParams]]"
-              debugger-data-enabled="[[debuggerDataEnabled]]"
-              are-health-pills-loading="[[areHealthPillsLoading]]"
-              node-names-to-health-pills="[[nodeNamesToHealthPills]]"
-              all-steps-mode-enabled="{{allStepsModeEnabled}}"
-              specific-health-pill-step="{{specificHealthPillStep}}"
-              health-pill-step-index="{{healthPillStepIndex}}"
-    ></tf-graph-info>
-  </div>
-  <div class="context-menu"></div>
-</div>
-</template>
-</dom-module>
-
-<script>
-Polymer({
-  is: 'tf-graph-board',
-  properties: {
-    // Public API.
-    graphHierarchy: Object,
-    graph: Object,
-    stats: Object,
-    /**
-     * @type {value: number, msg: string}
-     *
-     * A number between 0 and 100 denoting the % of progress
-     * for the progress bar and the displayed message.
-     */
-    progress: Object,
-    colorBy: String,
-    colorByParams: {
-      type: Object,
-      notify: true
-    },
-    renderHierarchy: {
-      type: Object,
-      notify: true
-    },
-    // Whether debugger data is enabled for this instance of Tensorboard.
-    debuggerDataEnabled: Boolean,
-    // Whether health pills are currently being loaded.
-    areHealthPillsLoading: Boolean,
-    // A mapping between node name to the tf.graph.scene.HealthPill to render.
-    nodeNamesToHealthPills: Object,
-    // Whether the user can request health pills for individual steps from the server. This can be
-    // slow compared the default of showing sampled health pills.
-    allStepsModeEnabled: {
-      type: Boolean,
-      notify: true,
-      value: false,
-    },
-    // Relevant if allStepsModeEnabled. The specific step for which to fetch health pills from the
-    // server for.
-    specificHealthPillStep: {
-      type: Number,
-      notify: true,
-      value: 0,
-    },
-    // The step of health pills to show throughout the graph.
-    healthPillStepIndex: Number,
-    // Private API: Data routing between child components.
-    _selectedNode: String,
-    // The enum value of the include property of the selected node.
-    _selectedNodeInclude: Number,
-    _highlightedNode: String
-  },
-  listeners: {
-    'node-toggle-extract': '_nodeToggleExtract'
-  },
-  observers: [
-    '_updateNodeInclude(_selectedNode)'
-  ],
-  /** True if the progress is not complete yet (< 100 %). */
-  _isNotComplete: function(progress) {
-    return progress.value < 100;
-  },
-  _getContainerClass: function(progress) {
-    var result = 'container';
-    if (progress.error) {
-      result += ' error';
-    }
-    if (this._isNotComplete(progress)) {
-      result += ' loading';
-    }
-    return result;
-  },
-  _updateNodeInclude: function(nodeName) {
-    var node = this.graphHierarchy.node(nodeName);
-    this.set("_selectedNodeInclude",
-      node ? node.include : tf.graph.InclusionType.UNSPECIFIED);
-  },
-  _nodeToggleExtract: function() {
-    this._updateNodeInclude(this._selectedNode);
-  }
-});
-</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD
index 7203a9333b..b4520fe3eb 100644
--- a/tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_board_d3v4/BUILD
@@ -1,8 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -26,3 +24,31 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-board.html",
+    ],
+    destdir = "tf-graph-board",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_info_d3v4:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_common/BUILD b/tensorflow/tensorboard/components/tf_graph_common/BUILD
deleted file mode 100644
index 7c0a4a44a2..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/BUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_common",
-    srcs = [
-        "tf-graph-common.html",
-        ":ts",
-    ],
-    path = "/tf-graph-common",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports:d3",
-        "//tensorflow/tensorboard/components/tf_imports:dagre",
-        "//tensorflow/tensorboard/components/tf_imports:graphlib",
-        "//tensorflow/tensorboard/components/tf_imports:lodash",
-        "@org_polymer",
-    ],
-)
-
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = glob(["*.ts"]),
-    typings = [
-        "@org_definitelytyped//:d3.d.ts",
-        "@org_definitelytyped//:lodash.d.ts",
-        "@org_definitelytyped//:polymer.d.ts",
-        "@org_definitelytyped//:webcomponents.js.d.ts",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-common.html",
-        ":legacy_ts",
-    ],
-    destdir = "tf-graph-common",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_imports_google:lib",
-        "//third_party/javascript/polymer/v1/polymer:lib",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = glob(["*.ts"]),
-    deps_mgmt = "off",
-    runtime = "nodejs",
-    deps = [
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/plottable/v1:typings",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/d3",
-        "//third_party/javascript/typings/lodash",
-        "//third_party/javascript/typings/mocha",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/sinon",
-        "//third_party/javascript/typings/webcomponents_js",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_common/annotation.ts b/tensorflow/tensorboard/components/tf_graph_common/annotation.ts
deleted file mode 100644
index ba308e6934..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/annotation.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph.scene.annotation {
-  /**
-   * Populate a given annotation container group
-   *
-   *     <g class='{in|out}-annotations'></g>
-   *
-   * with annotation group of the following structure:
-   *
-   * <g class='annotation'>
-   *   <g class='annotation-node'>
-   *   <!--
-   *   Content here determined by Scene.node.buildGroup.
-   *   -->
-   *   </g>
-   * </g>
-   *
-   * @param container selection of the container.
-   * @param annotationData node.{in|out}Annotations
-   * @param d node to build group for.
-   * @param sceneElement <tf-graph-scene> polymer element.
-   * @return selection of appended objects
-   */
-  export function buildGroup(
-      container, annotationData: render.AnnotationList,
-      d: render.RenderNodeInfo, sceneElement) {
-    // Select all children and join with data.
-    let annotationGroups =
-        container
-            .selectAll(function() {
-              // using d3's selector function
-              // See https://github.com/mbostock/d3/releases/tag/v2.0.0
-              // (It's not listed in the d3 wiki.)
-              return this.childNodes;
-            })
-            .data(annotationData.list, d => { return d.node.name; });
-
-    annotationGroups.enter()
-        .append('g')
-        .attr('data-name', a => { return a.node.name; })
-        .each(function(a) {
-          let aGroup = d3.select(this);
-
-          // Add annotation to the index in the scene
-          sceneElement.addAnnotationGroup(a, d, aGroup);
-          // Append annotation edge
-          let edgeType = Class.Annotation.EDGE;
-          let metaedge = a.renderMetaedgeInfo && a.renderMetaedgeInfo.metaedge;
-          if (metaedge && !metaedge.numRegularEdges) {
-            edgeType += ' ' + Class.Annotation.CONTROL_EDGE;
-          }
-          // If any edges are reference edges, add the reference edge class.
-          if (metaedge && metaedge.numRefEdges) {
-            edgeType += ' ' + Class.Edge.REF_LINE;
-          }
-          edge.appendEdge(aGroup, a, sceneElement, edgeType);
-
-          if (a.annotationType !== render.AnnotationType.ELLIPSIS) {
-            addAnnotationLabelFromNode(aGroup, a);
-            buildShape(aGroup, a);
-          } else {
-            addAnnotationLabel(
-                aGroup, a.node.name, a, Class.Annotation.ELLIPSIS);
-          }
-        });
-
-    annotationGroups
-        .attr(
-            'class',
-            a => {
-              return Class.Annotation.GROUP + ' ' +
-                  annotationToClassName(a.annotationType) + ' ' +
-                  node.nodeClass(a);
-            })
-        .each(function(a) {
-          let aGroup = d3.select(this);
-          update(aGroup, d, a, sceneElement);
-          if (a.annotationType !== render.AnnotationType.ELLIPSIS) {
-            addInteraction(aGroup, d, a, sceneElement);
-          }
-        });
-
-    annotationGroups.exit()
-        .each(function(a) {
-          let aGroup = d3.select(this);
-
-          // Remove annotation from the index in the scene
-          sceneElement.removeAnnotationGroup(a, d, aGroup);
-        })
-        .remove();
-    return annotationGroups;
-};
-
-/**
- * Maps an annotation enum to a class name used in css rules.
- */
-function annotationToClassName(annotationType: render.AnnotationType) {
-  return (render.AnnotationType[annotationType] || '').toLowerCase() || null;
-}
-
-function buildShape(aGroup, a: render.Annotation) {
-  if (a.annotationType === render.AnnotationType.SUMMARY) {
-    let summary = selectOrCreateChild(aGroup, 'use');
-    summary.attr({
-      'class': 'summary',
-      'xlink:href': '#summary-icon',
-      'cursor': 'pointer'
-    });
-  } else {
-    let shape = node.buildShape(aGroup, a, Class.Annotation.NODE);
-    // add title tag to get native tooltips
-    selectOrCreateChild(shape, 'title').text(a.node.name);
-  }
-}
-
-function addAnnotationLabelFromNode(aGroup, a: render.Annotation) {
-  let namePath = a.node.name.split('/');
-  let text = namePath[namePath.length - 1];
-  return addAnnotationLabel(aGroup, text, a, null);
-}
-
-function addAnnotationLabel(
-    aGroup, label: string, a: render.Annotation, additionalClassNames) {
-  let classNames = Class.Annotation.LABEL;
-  if (additionalClassNames) {
-    classNames += ' ' + additionalClassNames;
-  }
-  let txtElement = aGroup.append('text')
-                       .attr('class', classNames)
-                       .attr('dy', '.35em')
-                       .attr('text-anchor', a.isIn ? 'end' : 'start')
-                       .text(label);
-
-  return tf.graph.scene.node.enforceLabelWidth(txtElement, -1);
-}
-
-function addInteraction(selection, d: render.RenderNodeInfo,
-    annotation: render.Annotation, sceneElement) {
-  selection
-      .on('mouseover',
-          a => {
-            sceneElement.fire(
-                'annotation-highlight',
-                {name: a.node.name, hostName: d.node.name});
-          })
-      .on('mouseout',
-          a => {
-            sceneElement.fire(
-                'annotation-unhighlight',
-                {name: a.node.name, hostName: d.node.name});
-          })
-      .on('click', a => {
-        // Stop this event's propagation so that it isn't also considered a
-        // graph-select.
-        (<Event>d3.event).stopPropagation();
-        sceneElement.fire(
-            'annotation-select', {name: a.node.name, hostName: d.node.name});
-      });
-  if (annotation.annotationType !== render.AnnotationType.SUMMARY &&
-      annotation.annotationType !== render.AnnotationType.CONSTANT) {
-    selection.on(
-        'contextmenu', contextmenu.getMenu(
-                           node.getContextMenu(annotation.node, sceneElement)));
-  }
-};
-
-/**
- * Adjust annotation's position.
- *
- * @param aGroup selection of a 'g.annotation' element.
- * @param d Host node data.
- * @param a annotation node data.
- * @param sceneElement <tf-graph-scene> polymer element.
- */
-function update(aGroup, d: render.RenderNodeInfo, a: render.Annotation,
-    sceneElement) {
-  let cx = layout.computeCXPositionOfNodeShape(d);
-  // Annotations that point to embedded nodes (constants,summary)
-  // don't have a render information attached so we don't stylize these.
-  // Also we don't stylize ellipsis annotations (the string '... and X more').
-  if (a.renderNodeInfo &&
-      a.annotationType !== render.AnnotationType.ELLIPSIS) {
-    node.stylize(aGroup, a.renderNodeInfo, sceneElement,
-      Class.Annotation.NODE);
-  }
-
-  if (a.annotationType === render.AnnotationType.SUMMARY) {
-    // Update the width of the annotation to give space for the image.
-    a.width += 10;
-  }
-
-  // label position
-  aGroup.select('text.' + Class.Annotation.LABEL).transition().attr({
-    x: cx + a.dx + (a.isIn ? -1 : 1) * (a.width / 2 + a.labelOffset),
-    y: d.y + a.dy
-  });
-
-  // Some annotations (such as summary) are represented using a 12x12 image tag.
-  // Purposely omitted units (e.g. pixels) since the images are vector graphics.
-  // If there is an image, we adjust the location of the image to be vertically
-  // centered with the node and horizontally centered between the arrow and the
-  // text label.
-  aGroup.select('use.summary').transition().attr({
-    x: cx + a.dx - 3,
-    y: d.y + a.dy - 6
-  });
-
-  // Node position (only one of the shape selection will be non-empty.)
-  positionEllipse(
-      aGroup.select('.' + Class.Annotation.NODE + ' ellipse'), cx + a.dx,
-      d.y + a.dy, a.width, a.height);
-  positionRect(
-      aGroup.select('.' + Class.Annotation.NODE + ' rect'), cx + a.dx,
-      d.y + a.dy, a.width, a.height);
-  positionRect(
-      aGroup.select('.' + Class.Annotation.NODE + ' use'), cx + a.dx,
-      d.y + a.dy, a.width, a.height);
-
-  // Edge position
-  aGroup.select('path.' + Class.Annotation.EDGE).transition().attr('d', a => {
-    // map relative position to absolute position
-    let points = a.points.map(p => { return {x: p.dx + cx, y: p.dy + d.y}; });
-    return edge.interpolate(points);
-  });
-};
-
-} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common/colors.ts b/tensorflow/tensorboard/components/tf_graph_common/colors.ts
deleted file mode 100644
index 40f91f7d2d..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/colors.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module tf {
-  /**
-   * Mapping from color palette name to color palette, which contains
-   * exact colors for multiple states of a single color palette.
-   */
-  export let COLORS = [
-    {
-      'name': 'Google Blue',
-      'color': '#4184f3',
-      'active': '#3a53c5',
-      'disabled': '#cad8fc'
-    },
-    {
-      'name': 'Google Red',
-      'color': '#db4437',
-      'active': '#8f2a0c',
-      'disabled': '#e8c6c1'
-    },
-    {
-      'name': 'Google Yellow',
-      'color': '#f4b400',
-      'active': '#db9200',
-      'disabled': '#f7e8b0'
-    },
-    {
-      'name': 'Google Green',
-      'color': '#0f9d58',
-      'active': '#488046',
-      'disabled': '#c2e1cc'
-    },
-    {
-      'name': 'Purple',
-      'color': '#aa46bb',
-      'active': '#5c1398',
-      'disabled': '#d7bce6'
-    },
-    {
-      'name': 'Teal',
-      'color': '#00abc0',
-      'active': '#47828e',
-      'disabled': '#c2eaf2'
-    },
-    {
-      'name': 'Deep Orange',
-      'color': '#ff6f42',
-      'active': '#ca4a06',
-      'disabled': '#f2cbba'
-    },
-    {
-      'name': 'Lime',
-      'color': '#9d9c23',
-      'active': '#7f771d',
-      'disabled': '#f1f4c2'
-    },
-    {
-      'name': 'Indigo',
-      'color': '#5b6abf',
-      'active': '#3e47a9',
-      'disabled': '#c5c8e8'
-    },
-    {
-      'name': 'Pink',
-      'color': '#ef6191',
-      'active': '#ca1c60',
-      'disabled': '#e9b9ce'
-    },
-    {
-      'name': 'Deep Teal',
-      'color': '#00786a',
-      'active': '#2b4f43',
-      'disabled': '#bededa'
-    },
-    {
-      'name': 'Deep Pink',
-      'color': '#c1175a',
-      'active': '#75084f',
-      'disabled': '#de8cae'
-    },
-    {
-      'name': 'Gray',
-      'color': '#9E9E9E',   // 500
-      'active': '#424242',  // 800
-      'disabled': 'F5F5F5'  // 100
-    }
-  ].reduce((m, c) => {
-    m[c.name] = c;
-    return m;
-  }, {});
-
-  /**
-   * Mapping from op category to color palette name
-   * e.g.,  OP_GROUP_COLORS['state_ops'] = 'Google Blue';
-   */
-  export let OP_GROUP_COLORS = [
-    {
-      color: 'Google Red',
-      groups: [
-        'gen_legacy_ops', 'legacy_ops', 'legacy_flogs_input',
-        'legacy_image_input', 'legacy_input_example_input',
-        'legacy_sequence_input', 'legacy_seti_input_input'
-      ]
-    },
-    {color: 'Deep Orange', groups: ['constant_ops']},
-    {color: 'Indigo', groups: ['state_ops']},
-    {color: 'Purple', groups: ['nn_ops', 'nn']},
-    {color: 'Google Green', groups: ['math_ops']},
-    {color: 'Lime', groups: ['array_ops']},
-    {color: 'Teal', groups: ['control_flow_ops', 'data_flow_ops']},
-    {color: 'Pink', groups: ['summary_ops']},
-    {color: 'Deep Pink', groups: ['io_ops']}
-  ].reduce((m, c) => {
-    c.groups.forEach(function(group) { m[group] = c.color; });
-    return m;
-  }, {});
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_common/common.ts b/tensorflow/tensorboard/components/tf_graph_common/common.ts
deleted file mode 100644
index e7eac54e58..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/common.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/**
- * @fileoverview Common interfaces for the tensorflow graph visualizer.
- */
-
-module tf {
-  /**
-   * Tracks task progress. Each task being passed a progress tracker needs
-   * to call the below-defined methods to notify the caller about the gradual
-   * progress of the task.
-   */
-  export interface ProgressTracker {
-    updateProgress(incrementValue: number): void;
-    setMessage(msg: string): void;
-    reportError(msg: string, err: Error): void;
-  }
-} // close module tf
diff --git a/tensorflow/tensorboard/components/tf_graph_common/contextmenu.ts b/tensorflow/tensorboard/components/tf_graph_common/contextmenu.ts
deleted file mode 100644
index 628e9ae56f..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/contextmenu.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-module tf.graph.scene.contextmenu {
-
-/** Function that converts data to a title string. */
-export interface TitleFunction {
-  (data: any): string;
-}
-
-/** Function that takes action based on item clicked in the context menu. */
-export interface ActionFunction {
-  (elem: any, d: any, i: number): void;
-}
-
-/**
- * The interface for an item in the context menu
- */
-export interface ContextMenuItem {
-  title: TitleFunction;
-  action: ActionFunction;
-}
-
-/**
- * Returns the event listener, which can be used as an argument for the d3
- * selection.on function. Renders the context menu that is to be displayed
- * in response to the event.
- */
-export function getMenu(menu: ContextMenuItem[]) {
-  let menuSelection = d3.select('.context-menu');
-  // Close the menu when anything else is clicked.
-  d3.select('body').on(
-      'click.context', function() { menuSelection.style('display', 'none'); });
-
-  // Function called to populate the context menu.
-  return function(data, index: number): void {
-    // Position and display the menu.
-    let event = <MouseEvent>d3.event;
-    menuSelection.style({
-      'display': 'block',
-      'left': (event.layerX + 1) + 'px',
-      'top': (event.layerY + 1) + 'px'
-    });
-
-    // Stop the event from propagating further.
-    event.preventDefault();
-    event.stopPropagation();
-
-    // Add provided items to the context menu.
-    menuSelection.html('');
-    let list = menuSelection.append('ul');
-    list.selectAll('li')
-        .data(menu)
-        .enter()
-        .append('li')
-        .html(function(d) { return d.title(data); })
-        .on('click', (d, i) => {
-          d.action(this, data, index);
-          menuSelection.style('display', 'none');
-        });
-  };
-};
-
-} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common/edge.ts b/tensorflow/tensorboard/components/tf_graph_common/edge.ts
deleted file mode 100644
index 868d47dc83..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/edge.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph.scene.edge {
-
-/** Delimiter between dimensions when showing sizes of tensors. */
-const TENSOR_SHAPE_DELIM = '×';
-
-/** The minimum stroke width of an edge. */
-export const MIN_EDGE_WIDTH = 0.75;
-
-/** The maximum stroke width of an edge. */
-export const MAX_EDGE_WIDTH = 12;
-
-/** The exponent used in the power scale for edge thickness. */
-const EDGE_WIDTH_SCALE_EXPONENT = 0.3;
-
-/** The domain (min and max value) for the edge width. */
-const DOMAIN_EDGE_WIDTH_SCALE = [1, 5E6];
-
-export const EDGE_WIDTH_SCALE = d3.scale.pow()
-      .exponent(EDGE_WIDTH_SCALE_EXPONENT)
-      .domain(DOMAIN_EDGE_WIDTH_SCALE)
-      .range([MIN_EDGE_WIDTH, MAX_EDGE_WIDTH])
-      .clamp(true);
-
-let arrowheadMap =
-    d3.scale.quantize().domain([MIN_EDGE_WIDTH, MAX_EDGE_WIDTH]).range([
-      'small', 'medium', 'large', 'xlarge'
-    ]);
-
-/** Minimum stroke width to put edge labels in the middle of edges */
-const CENTER_EDGE_LABEL_MIN_STROKE_WIDTH = 2.5;
-
-export type EdgeData = {v: string, w: string, label: render.RenderMetaedgeInfo};
-
-export function getEdgeKey(edgeObj: EdgeData) {
-  return edgeObj.v + EDGE_KEY_DELIM + edgeObj.w;
-}
-
-/**
- * Select or Create a 'g.edges' group to a given sceneGroup
- * and builds a number of 'g.edge' groups inside the group.
- *
- * Structure Pattern:
- *
- * <g class='edges'>
- *   <g class='edge'>
- *     <path class='edgeline'/>
- *   </g>
- *   ...
- * </g>
- *
- *
- * @param sceneGroup container
- * @param graph
- * @param sceneElement <tf-graph-scene> polymer element.
- * @return selection of the created nodeGroups
- */
-export function buildGroup(sceneGroup,
-    graph: graphlib.Graph<render.RenderNodeInfo, render.RenderMetaedgeInfo>,
-    sceneElement) {
-  let edges: EdgeData[] = [];
-  edges = _.reduce(graph.edges(), (edges, edgeObj) => {
-    let edgeLabel = graph.edge(edgeObj);
-    edges.push({
-      v: edgeObj.v,
-      w: edgeObj.w,
-      label: edgeLabel
-    });
-    return edges;
-  }, edges);
-
-  let container =
-      scene.selectOrCreateChild(sceneGroup, 'g', Class.Edge.CONTAINER);
-
-  // Select all children and join with data.
-  // (Note that all children of g.edges are g.edge)
-  let edgeGroups = container.selectAll(function() {
-    // using d3's selector function
-    // See https://github.com/mbostock/d3/releases/tag/v2.0.0
-    // (It's not listed in the d3 wiki.)
-    return this.childNodes;
-  }).data(edges, getEdgeKey);
-
-  // Make edges a group to support rendering multiple lines for metaedge
-  edgeGroups.enter()
-      .append('g')
-      .attr('class', Class.Edge.GROUP)
-      .attr('data-edge', getEdgeKey)
-      .each(function(d: EdgeData) {
-        let edgeGroup = d3.select(this);
-        d.label.edgeGroup = edgeGroup;
-        // index node group for quick highlighting
-        sceneElement._edgeGroupIndex[getEdgeKey(d)] = edgeGroup;
-
-        // Add line during enter because we're assuming that type of line
-        // normally does not change.
-        appendEdge(edgeGroup, d, sceneElement);
-      });
-
-  edgeGroups.each(position);
-  edgeGroups.each(function(d) {
-    stylize(d3.select(this), d, sceneElement);
-  });
-
-  edgeGroups.exit()
-    .each(d => {
-      delete sceneElement._edgeGroupIndex[getEdgeKey(d)];
-    })
-    .remove();
-  return edgeGroups;
-};
-
-/**
- * Returns the label for the given base edge.
- * The label is the shape of the underlying tensor.
- */
-export function getLabelForBaseEdge(
-    baseEdge: BaseEdge, renderInfo: render.RenderGraphInfo): string {
-  let node = <OpNode>renderInfo.getNodeByName(baseEdge.v);
-  if (node.outputShapes == null || node.outputShapes.length === 0) {
-    return null;
-  }
-  let shape = node.outputShapes[baseEdge.outputTensorIndex];
-  if (shape == null) {
-    return null;
-  }
-  if (shape.length === 0) {
-    return 'scalar';
-  }
-  return shape.map(size => { return size === -1 ? '?' : size; })
-      .join(TENSOR_SHAPE_DELIM);
-}
-
-/**
- * Creates the label for the given metaedge. If the metaedge consists
- * of only 1 tensor, and it's shape is known, the label will contain that
- * shape. Otherwise, the label will say the number of tensors in the metaedge.
- */
-export function getLabelForEdge(metaedge: Metaedge,
-    renderInfo: render.RenderGraphInfo): string {
-  let isMultiEdge = metaedge.baseEdgeList.length > 1;
-  return isMultiEdge ?
-      metaedge.baseEdgeList.length + ' tensors' :
-      getLabelForBaseEdge(metaedge.baseEdgeList[0], renderInfo);
-}
-
-/**
- * Shortens the path enought such that the tip of the start/end marker will
- * point to the start/end of the path. The marker can be of arbitrary size.
- *
- * @param points Array of path control points.
- * @param marker D3 selection of the <marker> svg element.
- * @param isStart Is the marker a `start-marker`. If false, the marker is
- *     an `end-marker`.
- * @return The new array of control points.
- */
-function adjustPathPointsForMarker(points: render.Point[],
-    marker: d3.Selection<any>, isStart: boolean): render.Point[] {
-  let lineFunc = d3.svg.line<render.Point>()
-    .x(d => d.x)
-    .y(d => d.y);
-  let path =
-      d3.select(document.createElementNS('http://www.w3.org/2000/svg', 'path'))
-          .attr('d', lineFunc(points));
-  let markerWidth = +marker.attr('markerWidth');
-  let viewBox = marker.attr('viewBox').split(' ').map(Number);
-  let viewBoxWidth = viewBox[2] - viewBox[0];
-  let refX = +marker.attr('refX');
-  let pathNode = <SVGPathElement> path.node();
-  if (isStart) {
-    let fractionStickingOut = refX / viewBoxWidth;
-    let length = markerWidth * fractionStickingOut;
-    let point = pathNode.getPointAtLength(length);
-    // Figure out how many segments of the path we need to remove in order
-    // to shorten the path.
-    let segIndex = pathNode.getPathSegAtLength(length);
-    // Update the very first segment.
-    points[segIndex - 1] = {x: point.x, y: point.y};
-    // Ignore every point before segIndex - 1.
-    return points.slice(segIndex - 1);
-  } else {
-    let fractionStickingOut = 1 - refX / viewBoxWidth;
-    let length = pathNode.getTotalLength() - markerWidth * fractionStickingOut;
-    let point = pathNode.getPointAtLength(length);
-    // Figure out how many segments of the path we need to remove in order
-    // to shorten the path.
-    let segIndex = pathNode.getPathSegAtLength(length);
-    // Update the very last segment.
-    points[segIndex] = {x: point.x, y: point.y};
-    // Ignore every point after segIndex.
-    return points.slice(0, segIndex + 1);
-  }
-}
-
-/**
- * For a given d3 selection and data object, create a path to represent the
- * edge described in d.label.
- *
- * If d.label is defined, it will be a RenderMetaedgeInfo instance. It
- * will sometimes be undefined, for example for some Annotation edges for which
- * there is no underlying Metaedge in the hierarchical graph.
- */
-export function appendEdge(edgeGroup, d: EdgeData,
-    sceneElement: {renderHierarchy: render.RenderGraphInfo},
-    edgeClass?: string) {
-  let size = 1;
-  if (d.label != null && d.label.metaedge != null) {
-    // There is an underlying Metaedge.
-    size = d.label.metaedge.totalSize;
-  }
-  edgeClass = edgeClass || Class.Edge.LINE; // set default type
-
-  if (d.label && d.label.structural) {
-    edgeClass += ' ' + Class.Edge.STRUCTURAL;
-  }
-  // Give the path a unique id, which will be used to link
-  // the textPath (edge label) to this path.
-  let pathId = 'path_' + getEdgeKey(d);
-  let strokeWidth = sceneElement.renderHierarchy.edgeWidthScale(size);
-
-  let path = edgeGroup.append('path')
-                 .attr({
-                   'id': pathId,
-                   'class': edgeClass,
-                 })
-                 .style({'stroke-width': strokeWidth + 'px'});
-
-  // Check if there is a reference edge and add an arrowhead of the right size.
-  if (d.label && d.label.metaedge && d.label.metaedge.numRefEdges) {
-    let markerId = `ref-arrowhead-${arrowheadMap(strokeWidth)}`;
-    path.style('marker-start', `url(#${markerId})`);
-    d.label.startMarkerId = markerId;
-  }
-
-  if (d.label == null || d.label.metaedge == null) {
-    // There is no associated metaedge, thus no text.
-    // This happens for annotation edges.
-    return;
-  }
-  let labelForEdge = getLabelForEdge(d.label.metaedge,
-      sceneElement.renderHierarchy);
-  if (labelForEdge == null) {
-    // We have no information to show on this edge.
-    return;
-  }
-
-  // Put edge label in the middle of edge only if the edge is thick enough.
-  let baseline = strokeWidth > CENTER_EDGE_LABEL_MIN_STROKE_WIDTH ?
-      'central' :
-      'text-after-edge';
-
-  edgeGroup.append('text')
-      .append('textPath')
-      .attr({
-        'xlink:href': '#' + pathId,
-        'startOffset': '50%',
-        'text-anchor': 'middle',
-        'dominant-baseline': 'central'
-      })
-      .text(labelForEdge);
-};
-
-export let interpolate = d3.svg.line<{x: number, y: number}>()
-                             .interpolate('basis')
-                             .x((d) => { return d.x;})
-                             .y((d) => { return d.y;});
-
-/**
- * Returns a tween interpolator for the endpoint of an edge path.
- */
-function getEdgePathInterpolator(d: EdgeData, i: number, a: string) {
-  let renderMetaedgeInfo = <render.RenderMetaedgeInfo> d.label;
-  let adjoiningMetaedge = renderMetaedgeInfo.adjoiningMetaedge;
-  let points = renderMetaedgeInfo.points;
-
-  // Adjust the path so that start/end markers point to the end
-  // of the path.
-  if (d.label.startMarkerId) {
-    points = adjustPathPointsForMarker(
-        points, d3.select('#' + d.label.startMarkerId), true);
-  }
-  if (d.label.endMarkerId) {
-    points = adjustPathPointsForMarker(
-        points, d3.select('#' + d.label.endMarkerId), false);
-  }
-
-  if (!adjoiningMetaedge) {
-    return d3.interpolate(a, interpolate(points));
-  }
-
-  let renderPath = this;
-
-  // Get the adjoining path that matches the adjoining metaedge.
-  let adjoiningPath =
-    <SVGPathElement>((<HTMLElement>adjoiningMetaedge.edgeGroup.node())
-      .firstChild);
-
-  // Find the desired SVGPoint along the adjoining path, then convert those
-  // coordinates into the space of the renderPath using its Current
-  // Transformation Matrix (CTM).
-  let inbound = renderMetaedgeInfo.metaedge.inbound;
-
-  return function(t) {
-    let adjoiningPoint = adjoiningPath
-      .getPointAtLength(inbound ? adjoiningPath.getTotalLength() : 0)
-      .matrixTransform(adjoiningPath.getCTM())
-      .matrixTransform(renderPath.getCTM().inverse());
-
-    // Update the relevant point in the renderMetaedgeInfo's points list, then
-    // re-interpolate the path.
-    let index = inbound ? 0 : points.length - 1;
-    points[index].x = adjoiningPoint.x;
-    points[index].y = adjoiningPoint.y;
-    let dPath = interpolate(points);
-    return dPath;
-  };
-}
-
-function position(d) {
-  d3.select(this)
-      .select('path.' + Class.Edge.LINE)
-      .transition()
-      .attrTween('d', getEdgePathInterpolator);
-};
-
-/**
- * For a given d3 selection and data object, mark the edge as a control
- * dependency if it contains only control edges.
- *
- * d's label property will be a RenderMetaedgeInfo object.
- */
-function stylize(edgeGroup, d: EdgeData, stylize) {
-  edgeGroup.classed('faded', d.label.isFadedOut);
-  let metaedge = d.label.metaedge;
-  edgeGroup.select('path.' + Class.Edge.LINE)
-      .classed('control-dep', metaedge && !metaedge.numRegularEdges);
-};
-
-} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common/externs.ts b/tensorflow/tensorboard/components/tf_graph_common/externs.ts
deleted file mode 100644
index 7c0d168a42..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/externs.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/**
- * @fileoverview Extern declarations for tensorflow graph visualizer.
- *     This file contains compiler stubs for external dependencies whos
- *     implementations are defined at runtime.
- */
-
-declare module graphlib {
-  interface GraphOptions {
-    name?: string;
-    /**
-     * Direction for rank nodes. Can be TB, BT, LR, or RL, where T = top,
-     * B = bottom, L = left, and R = right.
-     */
-    rankdir?: string;
-    type?: string|number;
-    /** Number of pixels between each rank in the layout. */
-    ranksep?: number;
-    /** Number of pixels that separate nodes horizontally in the layout. */
-    nodesep?: number;
-    /** Number of pixels that separate edges horizontally in the layout */
-    edgesep?: number;
-  }
-
-  export interface EdgeObject {
-    v: string;
-    w: string;
-    name?: string;
-  }
-
-  export class Graph<N, E> {
-    constructor(opt?: Object);
-    setNode(name: string, value?: N): void;
-    hasNode(name: string): boolean;
-    setEdge(fromName: string, toName: string, value?: E): void;
-    hasEdge(fromName: string, toName: string): boolean;
-    edge(fromName: string, toName: string): E;
-    edge(edgeObject: EdgeObject): E;
-    removeEdge(v: string, w: string): void;
-    nodes(): string[];
-    node(name: string): N;
-    removeNode(name: string): void;
-    setGraph(graphOptions: GraphOptions): void;
-    graph(): GraphOptions;
-    nodeCount(): number;
-    neighbors(name: string): string[];
-    successors(name: string): string[];
-    predecessors(name: string): string[];
-    edges(): EdgeObject[];
-    outEdges(name: string): E[];
-    inEdges(name: string): E[];
-    /**
-     * Returns those nodes in the graph that have no in-edges.
-     * Takes O(|V|) time.
-     */
-    sources(): string[];
-    /**
-     * Remove the node with the id v in the graph or do nothing if
-     * the node is not in the graph. If the node was removed this
-     * function also removes any incident edges. Returns the graph,
-     * allowing this to be chained with other functions. Takes O(|E|) time.
-     */
-    removeNode(name: string): Graph<N, E>;
-    setParent(name: string, parentName: string): void;
-  }
-}
-
-/**
- * Declaring dagre var used for dagre layout.
- */
-declare var dagre: {layout(graph: graphlib.Graph<any, any>): void;};
diff --git a/tensorflow/tensorboard/components/tf_graph_common/graph.ts b/tensorflow/tensorboard/components/tf_graph_common/graph.ts
deleted file mode 100644
index e60ee0e0f2..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/graph.ts
+++ /dev/null
@@ -1,1257 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph {
-
-/** Delimiter used in node names to denote namespaces. */
-export const NAMESPACE_DELIM = '/';
-export const ROOT_NAME = '__root__';
-
-/** Attribute key used for storing attributes that are too large. */
-export const LARGE_ATTRS_KEY = '_too_large_attrs';
-/**
- * Maximum allowed size in bytes, before the attribute is considered large
- * and filtered out of the graph.
- */
-export const LIMIT_ATTR_SIZE = 1024;
-
-// Separator between the source and the destination name of the edge.
-export const EDGE_KEY_DELIM = '--';
-
-export enum GraphType {FULL, EMBEDDED, META, SERIES, CORE, SHADOW, BRIDGE,
-    EDGE};
-export enum NodeType {META, OP, SERIES, BRIDGE, ELLIPSIS};
-
-/** Indicates if a node is to be included in the main graph when rendered. */
-export enum InclusionType {INCLUDE, EXCLUDE, UNSPECIFIED};
-
-/** Indicates if a series is to be grouped in the graph when rendered. */
-export enum SeriesGroupingType {GROUP, UNGROUP};
-
-/** Attribute key reserved for the shapes of the output tensors. */
-const OUTPUT_SHAPES_KEY = '_output_shapes';
-
-/** Attribute key reserved for the XLA cluster that an op runs on. */
-const _XLA_CLUSTER_KEY = '_XlaCluster';
-
-/**
- * A BaseEdge is the label object (in the graphlib sense) for an edge in the
- * original, full graph produced after parsing. Subsequent graphs, like those
- * which belong to Metanodes, should not use BaseEdge objects, but instead
- * contain Metaedges (which in turn may contain any number of BaseEdges).
- */
-export interface BaseEdge extends graphlib.EdgeObject {
-  isControlDependency: boolean;
-  isReferenceEdge: boolean;
-  /** The index of the output tensor of the source node. */
-  outputTensorIndex: number;
-}
-
-/**
- * A SlimGraph is inspired by graphlib.Graph, but having only the functionality
- * that we need.
- */
-export class SlimGraph {
-  nodes: { [nodeName: string]: OpNode };
-  edges: BaseEdge[];
-
-  constructor() {
-    this.nodes = {};
-    this.edges = [];
-  }
-}
-
-export interface NormalizedInput {
-  name: string;
-  /** The index of the output tensor of the source node. */
-  outputTensorIndex: number;
-  isControlDependency: boolean;
-}
-
-export interface BuildParams {
-  enableEmbedding: boolean;
-  inEmbeddingTypes: string[];
-  outEmbeddingTypes: string[];
-  refEdges: { [inputEdge: string]: boolean };
-}
-
-/**
- * The most basic information about a node in the hierarchical graph.
- */
-export interface Node {
-  /** The name of the node, used frequently to look up nodes by name. */
-  name: string;
-  /** Which type of node this is. */
-  type: NodeType;
-  /**
-   * Whether this node is a type that may contain other nodes. Those types
-   * should extend from GroupNode.
-   *
-   * For an OpNode, isGroupNode will be false, even though it may have
-   * embeddings. These embedding Nodes will have their parentNode set to the
-   * OpNode. However, embeddings are later rendered as annotations, not as
-   * children to be made visible on expansion (like a Metanode or SeriesNode).
-   */
-  isGroupNode: boolean;
-  /**
-   * The number of nodes this node represents. For OpNodes, this will be 1, and
-   * for GroupNodes it will be a count of the total number of descendents it
-   * contains.
-   */
-  cardinality: number;
-  /**
-   * The Node which is this Node's parent. This is of type Node and not
-   * GroupNode because of embeddings, which will have a parent OpNode.
-   */
-  parentNode: Node;
-  /** Runtime execution stats for this node, if available */
-  stats: NodeStats;
-  /** If the node is to be included or excluded from the main graph when
-   *  rendered. Defaults to UNSPECIFIED, which means that the rendering
-   *  algorithm determines if it will be included or not. Then can be set to
-   *  INCLUDE or EXCLUDE manually by the user.
-   */
-  include: InclusionType;
-  /**
-   * Node attributes specify customizable visual aspects of a node and
-   * application-specific metadata associated with a node. The name
-   * 'nodeAttributes' is meant to avoid naming-conflicts with the 'attr' in
-   * subclasses of Node.
-   */
-  nodeAttributes: {[key: string]: any;};
-}
-
-export type TensorShape = number[];
-
-export interface OpNode extends Node {
-  op: string;
-  // The device on which the op ran. Null if it is unknown.
-  device: string;
-  attr: {key: string, value: any}[];
-  inputs: NormalizedInput[];
-  inEmbeddings: OpNode[];
-  outEmbeddings: OpNode[];
-  // The name of the SeriesNode that can contain this node in its series.
-  // If there is no such node, then this is null.
-  owningSeries: string;
-  /**
-   * Array of tensor shapes. Null if the number of output tensors is unknown,
-   * otherwise the length will equal the number of output tensors.
-   *
-   * Each tensor shape is an array of numbers, or null. Details:
-   * - null means unknown rank, and therefore entire shape is unknown.
-   * - [4, 2, 1] means rank-3 tensor of size 4x2x1.
-   * - [] means a scalar (rank-0 tensor).
-   * - [1] means rank-1 tensor of size 1 (not the same as scalar).
-   * - [5, -1, 3] means rank-3 tensor of shape is 5x?x3. The size
-   *       of the middle dimension is unknown (encoded as -1).
-   */
-  outputShapes: TensorShape[];
-  // The XLA Cluster on which the op ran. Null if it is unknown.
-  xlaCluster: string;
-}
-
-export interface BridgeNode extends Node {
-  /**
-   * Whether this bridge node represents edges coming into its parent node.
-   */
-  inbound: boolean;
-}
-
-/**
- * A node that is used when there are more than the maximum number of allowed
- * annotations hanging off of a node.  This node represents an ellipsis
- * annotation, indicating a number of additional annotations.
- */
-export interface EllipsisNode extends Node {
-  /**
-   * The number of nodes this ellipsis represents.
-   */
-  numMoreNodes: number;
-
-  /**
-   * Sets the number of nodes this ellipsis represents and changes the node
-   * name accordingly.
-   */
-  setNumMoreNodes(numNodes: number);
-}
-
-export interface GroupNode extends Node {
-  /**
-   * The metagraph contains nodes and metaedges between the immediate children
-   * of this group. The node label objects may be other GroupNodes (like
-   * SeriesNodes and Metanodes) or individual OpNodes. All edge label objects
-   * are Metaedges, each of which contains references to the original
-   * BaseEdge(s) from which it was created.
-   */
-  metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
-
-  /**
-   * The bridgegraph contains only edges which link immediate children of this
-   * group with nodes outside of the metagraph. As in the metagraph, all edge
-   * label objects are Metaedges which contain references to the original
-   * BaseEdge(s) that contribute to it.
-   *
-   * For a Metaedge in the bridgegraph, its external endpoint will be the same
-   * as the metagraph edge from which it came. This is most easily explained
-   * by example.
-   *
-   * Consider an original graph that contains a BaseEdge A/B/C->Z/Y/X.
-   *
-   *     +-------+    (BaseEdge)     +-------+
-   *     | A/B/C |>----------------->| Z/Y/X |
-   *     +-------+                   +-------+
-   *
-   * When we construct the Root's metagraph, it will contain nodes for A and Z,
-   * and a Metaedge A->Z. The A->Z Metaedge will contain the original BaseEdge
-   * A/B/C->Z/Y/X in its baseEdgeGraph. The Root's bridgegraph will always be
-   * empty.
-   *
-   *     +---+    (Root.metagraph edge)    +---+
-   *     | A |>--------------------------->| Z |
-   *     +---+                             +---+
-   *
-   * Now consider the Metanode A. Its metagraph will contain a Metanode for A/B
-   * and no edges. A's bridgegraph will have one Metaedge from A/B->Z, which
-   * was derived from the Root's Metaedge A->Z. That Metaedge will contain the
-   * original BaseEdge in its baseEdgeGraph.
-   *
-   *     +---------+
-   *     | A       |
-   *     |  +---+  |   (A.bridgegraph edge)    +---+
-   *     |  | B |>---------------------------->| Z |
-   *     |  +---+  |                           +---+
-   *     +---------+
-   *
-   * Finally, consider the Metanode A/B. Its metagraph will contain a Metanode
-   * for A/B/C and again no edges. A/B's bridgegraph will have one Metaedge
-   * from A/B/C->Z, which was derived from A's bridgegraph Metaedge A/B->Z.
-   * As before, the A/B/C->Z Metaedge will contain the original BaseEdge in its
-   * baseEdgeGraph.
-   *
-   *     +---------------+
-   *     | A             |
-   *     |  +---------+  |
-   *     |  | B       |  |
-   *     |  |  +---+  |  |   (A/B.bridgegraph edge)      +---+
-   *     |  |  | C |>----------------------------------->| Z |
-   *     |  |  +---+  |  |                               +---+
-   *     |  +---------+  |
-   *     +---------------+
-   *
-   * Likewise, under the Metanode Z and Z/Y, to compute the bridgegraph, we'll
-   * end up with Metaedges A->Z/Y and A->Z/Y/X respectively. So the original
-   * BaseEdge A/B/C->Z/Y/X becomes four different Metaedges in four different
-   * bridgegraphs:
-   *
-   *   + A/B->Z in GroupNode A's bridgegraph,
-   *   + A/B/C->Z in GroupNode A/B's bridgegraph,
-   *   + A->Z/Y in GroupNode Z's bridgegraph, and
-   *   + A->Z/Y/X in GroupNode Z/Y's bridgegraph.
-   *
-   * Considering any BaseEdge then, if N is the number of path segments in the
-   * source and M is the number of path segments in the destination, then the
-   * total number of bridgegraph edges you could create would be (N-1)(M-1).
-   *
-   * For this reason, it is computationally expensive to generate all the
-   * bridgegraphs for all the Metanodes, and instead they should be computed
-   * on demand as needed.
-   */
-  bridgegraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
-
-  /**
-   * Stores how many times each device name appears in its children
-   * op nodes. Used to color group nodes by devices.
-   */
-  deviceHistogram: {[device: string]: number};
-
-  /**
-   * Flag indicating whether this GroupNode's metagraph contains any edges that
-   * are not control edges. Used to quickly determine how to draw a collapsed
-   * series (vertically or horizontally).
-   */
-  hasNonControlEdges: boolean;
-}
-
-export interface Metanode extends GroupNode {
-  depth: number;
-  templateId: string;
-  opHistogram: {[op: string]: number};
-  getFirstChild(): GroupNode|OpNode;
-  getRootOp(): OpNode;
-  /** Return name of all leaves inside a metanode. */
-  leaves(): string[];
-}
-
-export interface SeriesNode extends GroupNode {
-  hasLoop: boolean;
-  prefix: string;
-  suffix: string;
-  clusterId: number;
-  ids: number[];
-  parent: string;
-}
-
-export class EllipsisNodeImpl implements EllipsisNode {
-  name: string;
-  numMoreNodes: number;
-  stats: NodeStats;
-  type: NodeType;
-  isGroupNode: boolean;
-  cardinality: number;
-  parentNode: Node;
-  include: InclusionType;
-  nodeAttributes: {[key: string]: any;};
-  /**
-   * Constructs a new ellipsis annotation node.
-   *
-   * @param numNodes The number of additional annotations this node represents.
-   */
-  constructor(numNodes: number) {
-    this.type = NodeType.ELLIPSIS;
-    this.isGroupNode = false;
-    this.cardinality = 1;
-    this.parentNode = null;
-    this.stats = null;
-    this.setNumMoreNodes(numNodes);
-    this.include = InclusionType.UNSPECIFIED;
-  }
-
-  setNumMoreNodes(numNodes: number) {
-    this.numMoreNodes = numNodes;
-    this.name = '... ' + numNodes + ' more';
-  }
-};
-
-/**
- * A label object for nodes in the full graph and leaf nodes in the render
- * graph.
- */
-export class OpNodeImpl implements OpNode {
-  name: string;
-  op: string;
-  device: string;
-  stats: NodeStats;
-  attr: {key: string, value: any}[];
-  inputs: NormalizedInput[];
-  type: NodeType;
-  isGroupNode: boolean;
-  cardinality: number;
-  inEmbeddings: OpNode[];
-  outEmbeddings: OpNode[];
-  parentNode: Node;
-  include: InclusionType;
-  owningSeries: string;
-  outputShapes: TensorShape[];
-  nodeAttributes: {[key: string]: any;};
-  xlaCluster: string;
-
-  /**
-   * Constructs a new Op node.
-   *
-   * @param rawNode The raw node.
-   */
-  constructor(rawNode: tf.graph.proto.NodeDef) {
-    this.op = rawNode.op;
-    this.name = rawNode.name;
-    this.device = rawNode.device;
-    this.attr = rawNode.attr;
-    // An array of normalized inputs that denote the incoming edges to
-    // the current node. Each input contains the normalized name of the
-    // source node, whether it has a number part and whether it is a
-    // control dependency.
-    this.inputs = normalizeInputs(rawNode.input);
-    this.outputShapes = extractOutputShapes(rawNode.attr);
-    this.xlaCluster = extractXlaCluster(rawNode.attr);
-    // additional properties
-    this.type = NodeType.OP;
-    this.isGroupNode = false;
-    this.cardinality = 1;
-    this.inEmbeddings = [];
-    this.outEmbeddings = [];
-    this.parentNode = null;
-    this.include = InclusionType.UNSPECIFIED;
-    this.owningSeries = null;
-  }
-};
-
-export function createMetanode(name: string, opt = {}): Metanode {
-  return new MetanodeImpl(name, opt);
-}
-
-/**
- * Joins the information from the stats file (memory, compute time) with the
- * graph information.
- */
-export function joinStatsInfoWithGraph(
-    graph: SlimGraph, stats: tf.graph.proto.StepStats,
-    devicesForStats?: {[device: string]: boolean}): void {
-  // Reset stats for each node.
-  _.each(graph.nodes, node => { node.stats = null; });
-
-  _.each(stats.dev_stats, devStats => {
-    // Ignore devices that are not selected.
-    if (devicesForStats && !devicesForStats[devStats.device]) {
-      return;
-    }
-    _.each(devStats.node_stats, nodeStats => {
-      // Lookup the node in the graph by its original name, e.g. A. If not
-      // found, lookup by the rewritten name A/(A) in case the name is both
-      // a namespace and a node name.
-      const nodeName = nodeStats.node_name in graph.nodes ?
-          nodeStats.node_name :
-          getStrictName(nodeStats.node_name);
-
-      // Couldn't find a matching node.
-      if (!(nodeName in graph.nodes)) {
-        return;
-      }
-
-      // Compute the total bytes used.
-      let totalBytes = 0;
-      if (nodeStats.memory) {
-        _.each(nodeStats.memory, alloc => {
-        if (alloc.total_bytes) {
-            if (alloc.total_bytes > 0) {
-              totalBytes += Number(alloc.total_bytes);
-            } else {
-              /* tslint:disable */
-              console.log(
-                  'ignoring negative memory allocation for ' + nodeName);
-              /* tslint:enable */
-            }
-          }
-        });
-      }
-      let outputSize: number[][] = null;
-      if (nodeStats.output) {
-        outputSize = _.map(nodeStats.output, output => {
-          return _.map(output.tensor_description.shape.dim,
-              dim => Number(dim.size));
-        });
-      }
-      graph.nodes[nodeName].device = devStats.device;
-      if (graph.nodes[nodeName].stats == null) {
-        graph.nodes[nodeName].stats = new NodeStats(outputSize);
-      }
-      graph.nodes[nodeName].stats.addBytesAllocation(totalBytes);
-      if (nodeStats.all_end_rel_micros) {
-        if (nodeStats.all_end_rel_micros > 0) {
-          graph.nodes[nodeName].stats.addExecutionTime(
-              nodeStats.all_start_micros,
-              nodeStats.all_start_micros + nodeStats.all_end_rel_micros);
-        } else {
-          /* tslint:disable */
-          console.log('ignoring negative runtime for ' + nodeName);
-          /* tslint:enable */
-        }
-      }
-    });
-  });
-}
-
-/**
- * Execution stats for the node.
- */
-export class NodeStats {
-  constructor(outputSize: number[][]) { this.outputSize = outputSize; }
-
-  /**
-   * Add the start and end time for a particular kernel execution of this op.
-   * Ops can have multiple kernel executions within the same session run.
-   */
-  addExecutionTime(startTime: number, endTime: number) {
-    if (this.startTime != null) {
-      this.startTime = Math.min(this.startTime, startTime);
-    } else {
-      this.startTime = startTime;
-    }
-    if (this.endTime != null) {
-      this.endTime = Math.max(this.endTime, endTime);
-    } else {
-      this.endTime = endTime;
-    }
-  }
-
-  /**
-   * Add the bytes allocated for a particular kernel execution of this op.
-   * Ops can have multiple kernel executions within the same session run.
-   */
-  addBytesAllocation(totalBytes: number) {
-    if (this.totalBytes != null) {
-      this.totalBytes = Math.max(this.totalBytes, totalBytes);
-    } else {
-      this.totalBytes = totalBytes;
-    }
-  }
-
-  /**
-   * Absolute start time for the very first kernel execution of this op.
-   */
-  startTime: number;
-  /**
-   * Absolute end time for the very last kernel execution of this op.
-   */
-  endTime: number;
-  /**
-   * Total number of bytes used for the node. Sum of all children
-   * if it is a Group node.
-   */
-  totalBytes = 0;
-
-  /**
-   * The shape of each output tensors, if there are any.
-   * Empty if it is a Group node.
-   */
-  outputSize: number[][];
-
-  /**
-   * Combines the specified stats with the current stats.
-   * Modifies the current object. This method is used to
-   * compute aggregate stats for group nodes.
-   */
-  combine(stats: NodeStats): void {
-    if (stats.totalBytes != null) {
-      this.totalBytes += stats.totalBytes;
-    }
-    if (stats.getTotalMicros() != null) {
-      this.addExecutionTime(stats.startTime, stats.endTime);
-    }
-  }
-
-  /**
-   * Total number of compute time in microseconds used for the node.
-   * Sum of all children if it is a Group node. Null if it is unknown.
-   * This method can not be scaffolded under a getter attribute because
-   * ECMAScript 5 does not support getter attributes.
-   */
-  getTotalMicros(): number {
-    if (this.startTime == null || this.endTime == null) {
-      return null;
-    }
-    return this.endTime - this.startTime;
-  }
-}
-
-export class MetanodeImpl implements Metanode {
-  name: string;
-  stats: NodeStats;
-  type: NodeType;
-  depth: number;
-  isGroupNode: boolean;
-  cardinality: number;
-  metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
-  bridgegraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
-  templateId: string;
-  opHistogram: {[op: string]: number};
-  deviceHistogram: {[op: string]: number};
-  parentNode: Node;
-  hasNonControlEdges: boolean;
-  include: InclusionType;
-  nodeAttributes: {[key: string]: any;};
-
-  /** A label object for meta-nodes in the graph hierarchy */
-  constructor(name: string, opt = {}) {
-    this.name = name;
-    this.type = NodeType.META;
-    /** number of levels under this group */
-    this.depth = 1;
-    this.isGroupNode = true;
-    /** # of leaf nodes (including embedded ones) */
-    this.cardinality = 0;
-    /** graph contains metanodes, nodes, edges
-     * and metaedges for main items within this metanode
-     */
-    this.metagraph =
-      createGraph<GroupNode|OpNode, Metaedge>(name, GraphType.META, opt);
-    /** bridgegraph must be constructed lazily-see hierarchy.getBridgegraph() */
-    this.bridgegraph = null;
-    /**
-     * A dictionary that count ops type of nodes in this metanode
-     * (op type => count).
-     */
-    this.opHistogram = {};
-    this.deviceHistogram = {};
-    /** unique id for a metanode of similar subgraph */
-    this.templateId = null;
-    /** Metanode which contains this node, if any */
-    this.parentNode = null;
-    this.hasNonControlEdges = false;
-    this.include = InclusionType.UNSPECIFIED;
-  }
-
-  getFirstChild(): GroupNode|OpNode {
-    return this.metagraph.node(this.metagraph.nodes()[0]);
-  }
-
-  /**
-   * Returns the op node associated with the metanode.
-   * For example, if the metanode is 'sgd', the associated
-   * op node is sgd/(sgd).
-   */
-  getRootOp(): OpNode {
-    let nameSplit = this.name.split('/');
-    let rootOpName = this.name + '/(' + nameSplit[nameSplit.length - 1] + ')';
-    return <OpNode>this.metagraph.node(rootOpName);
-  }
-
-  /**
-   * Return an array of the names of all the leaves (non-GroupNodes) inside
-   * this metanode. This performs a breadth-first search of the tree, so
-   * immediate child leaves will appear earlier in the output array than
-   * descendant leaves.
-   */
-  leaves(): string[] {
-    let leaves = [];
-    let queue = [<Node> this];
-    let metagraph; // Defined here due to a limitation of ES6->5 compilation.
-    while (queue.length) {
-      let node = queue.shift();
-      if (node.isGroupNode) {
-        metagraph = (<GroupNode> node).metagraph;
-        _.each(metagraph.nodes(), name => queue.push(metagraph.node(name)));
-      } else {
-        leaves.push(node.name);
-      }
-    }
-    return leaves;
-  }
-};
-
-export interface Metaedge extends graphlib.EdgeObject {
-
-  /**
-   * Stores the original BaseEdges represented by this Metaedge.
-   */
-  baseEdgeList: BaseEdge[];
-
-  /**
-   * Whether this edge represents a relationship that is inbound (or outbound)
-   * to the object which contains this information. For example, in a Metanode's
-   * bridgegraph, each edge connects an immediate child to something outside
-   * the Metanode. If the destination of the edge is inside the Metanode, then
-   * its inbound property should be true. If the destination is outside the
-   * Metanode, then its inbound property should be false.
-   *
-   * The property is optional because not all edges can be described as
-   * inbound/outbound. For example, in a Metanode's metagraph, all of the edges
-   * connect immediate children of the Metanode. None should have an inbound
-   * property, or they should be null/undefined.
-   */
-  inbound?: boolean;
-
-  /**
-   * Number of regular edges (not control dependency edges).
-   */
-  numRegularEdges: number;
-
-  /**
-   * Number of control dependency edges.
-   */
-  numControlEdges: number;
-
-  /**
-   * Number of reference edges, which is an edge to an operation
-   * that takes a reference to its input and changes its value.
-   */
-  numRefEdges: number;
-
-  /**
-   * Total size (number of units) of all the tensors flowing through this edge.
-   */
-  totalSize: number;
-
-  addBaseEdge(edge: BaseEdge, h: hierarchy.Hierarchy): void;
-}
-
-export function createMetaedge(v: string, w: string): Metaedge {
-  return new MetaedgeImpl(v, w);
-}
-
-/**
- * A label object for edges between metanodes of subgraphs in the render graph.
- */
-export class MetaedgeImpl implements Metaedge {
-  v: string;
-  w: string;
-  baseEdgeList: BaseEdge[];
-  inbound: boolean;
-  numRegularEdges: number;
-  numControlEdges: number;
-  numRefEdges: number;
-  totalSize: number;
-
-  constructor(v: string, w: string) {
-    this.v = v;
-    this.w = w;
-    this.baseEdgeList = [];
-    this.inbound = null;
-    this.numRegularEdges = 0;
-    this.numControlEdges = 0;
-    this.numRefEdges = 0;
-    this.totalSize = 0;
-  }
-
-  addBaseEdge(edge: BaseEdge, h: hierarchy.Hierarchy): void {
-    this.baseEdgeList.push(edge);
-    if (edge.isControlDependency) {
-      this.numControlEdges += 1;
-    } else {
-      this.numRegularEdges += 1;
-    }
-    if (edge.isReferenceEdge) {
-      this.numRefEdges += 1;
-    }
-    // Compute the size of the tensor flowing through this
-    // base edge.
-    this.totalSize += MetaedgeImpl.computeSizeOfEdge(edge, h);
-    h.maxMetaEdgeSize = Math.max(h.maxMetaEdgeSize, this.totalSize);
-  }
-
-  private static computeSizeOfEdge(edge: BaseEdge, h: hierarchy.Hierarchy):
-      number {
-    let opNode = <OpNode> h.node(edge.v);
-    if (opNode.outputShapes == null) {
-      // No shape information. Asssume a single number. This gives
-      // a lower bound for the total size.
-      return 1;
-    }
-    h.hasShapeInfo = true;
-    // Sum the sizes of all output tensors.
-    return _(opNode.outputShapes).map(shape => {
-      // If the shape is unknown, treat it as 1 when computing
-      // total size. This gives a lower bound for the total size.
-      if (shape == null) {
-        return 1;
-      }
-      // Multiply all shapes to get the total size of the tensor.
-      // E.g. The total size of [4, 2, 1] is 4 * 2 * 1.
-      return _(shape).reduce((accumulated, currSize) => {
-        // If this particular dimension is unknown, treat
-        // it as 1 when computing total size. This gives a lower bound
-        // for the total size.
-        if (currSize === -1) {
-          currSize = 1;
-        }
-        return accumulated * currSize;
-      }, 1);
-    }).sum();
-  }
-}
-
-export function createSeriesNode(prefix: string, suffix: string,
-    parent: string, clusterId: number, name: string): SeriesNode {
-  return new SeriesNodeImpl(prefix, suffix, parent, clusterId, name);
-}
-
-export function getSeriesNodeName(prefix: string, suffix: string,
-    parent: string, startId?: number, endId?: number): string {
-  let numRepresentation =
-      (typeof startId !== 'undefined' && typeof endId !== 'undefined') ?
-      '[' + startId + '-' + endId + ']' :
-      '#';
-  let pattern = prefix + numRepresentation + suffix;
-  return (parent ? parent + '/' : '') + pattern;
-}
-
-class SeriesNodeImpl implements SeriesNode {
-  name: string;
-  type: NodeType;
-  stats: NodeStats;
-  hasLoop: boolean;
-  prefix: string;
-  suffix: string;
-  clusterId: number;
-  ids: number[];
-  parent: string;
-  isGroupNode: boolean;
-  cardinality: number;
-  metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
-  bridgegraph: graphlib.Graph<GroupNode|OpNode, Metaedge>;
-  parentNode: Node;
-  deviceHistogram: {[op: string]: number};
-  hasNonControlEdges: boolean;
-  include: InclusionType;
-  nodeAttributes: {[key: string]: any;};
-
-  constructor(prefix: string, suffix: string, parent: string,
-      clusterId: number, name: string) {
-    this.name = name || getSeriesNodeName(prefix, suffix, parent);
-    this.type = NodeType.SERIES;
-    this.hasLoop = false;
-    this.prefix = prefix;
-    this.suffix = suffix;
-    this.clusterId = clusterId;
-    this.ids = [];
-    this.parent = parent;
-    this.isGroupNode = true;
-    this.cardinality = 0;
-    this.metagraph = createGraph<Metanode, Metaedge>(name, GraphType.SERIES);
-    // bridgegraph must be constructed lazily-see hierarchy.getBridgegraph()
-    this.bridgegraph = null;
-    this.parentNode = null;
-    this.deviceHistogram = {};
-    this.hasNonControlEdges = false;
-    this.include = InclusionType.UNSPECIFIED;
-  }
-}
-
-/**
- * Extracts the shapes of the output tensors from the attr property in the
- * node proto.
- */
-// tslint:disable-next-line:no-any
-function extractOutputShapes(attr: Array<{key: string, value: any}>):
-    TensorShape[] {
-  let result = null;
-  // We don't know anything about the output tensors.
-  if (!attr) {
-    return null;
-  }
-  for (let i = 0; i < attr.length; i++) {
-    let {key, value} = attr[i];
-    if (key === OUTPUT_SHAPES_KEY) {
-      if (!value.list.shape) {
-        // The OUTPUT_SHAPES_KEY lacks a value. We know nothing about the shape.
-        return null;
-      }
-
-      // Map all output tensors into array of numbers denoting their shape.
-      let result = value.list.shape.map(shape => {
-        if (shape.unknown_rank) {
-          // This output tensor is of unknown rank. We don't know if it is a
-          // scalar, or a tensor, or of what shape it is.
-          return null;
-        }
-        if (shape.dim == null ||
-            (shape.dim.length === 1 && shape.dim[0].size == null)) {
-          // This output tensor is a scalar.
-          return [];
-        }
-        // This output tensor has a known rank. Map each dimension size
-        // into a number.
-        return shape.dim.map(dim => {
-          // Size can be -1 if this particular dimension is unknown.
-          return dim.size;
-        });
-      });
-      // Since we already processed it, remove the entry from the attribute
-      // list (saves memory).
-      attr.splice(i, 1);
-      return result;
-    }
-  }
-  // We didn't find OUTPUT_SHAPES_KEY in attributes, so we don't know anything
-  // about the output tensors.
-  return null;
-}
-
-/**
- * Extracts the XLA Cluster that an op runs on from the attrs of the OpNode.
- * @param attr The attr property.
- * @return A string that is the name of the cluster. Or null if it could not be
- *     determined.
- */
-// tslint:disable-next-line:no-any
-function extractXlaCluster(attr: Array<{key: string, value: any}>): string|
-    null {
-  if (!attr) {
-    return null;
-  }
-
-  // Find the attribute for XLA cluster if there is one.
-  for (let i = 0; i < attr.length; i++) {
-    if (attr[i].key === _XLA_CLUSTER_KEY) {
-      return attr[i].value['s'] || null;
-    }
-  }
-  return null;
-}
-
-/**
- * Normalizes the inputs and extracts associated metadata:
- * 1) Inputs can contain a colon followed by a number at the end
- *    (e.g. inputName:1) and we remove this from the input name, and take note
- *    that the input was numbered.
- * 2) Control dependency inputs contain caret at the beginning and we
- *    remove this and annotate the edge as a control dependency.
- * @param inputs Array of unnormalized names of input nodes.
- */
-function normalizeInputs(inputs: string[]): NormalizedInput[] {
-  let normalizedInputs: NormalizedInput[] = [];
-  _.each(inputs, inputName => {
-    let start = inputName[0] === '^';
-    let colon = inputName.lastIndexOf(':');
-    let end = colon !== -1 &&
-      inputName.length - colon > 1 &&
-      !(/\D/).test(inputName.substring(colon + 1)) ?
-      colon : inputName.length;
-    let name = inputName.substring(start ? 1 : 0, end);
-    if (normalizedInputs.length === 0 ||
-      name !== normalizedInputs[normalizedInputs.length - 1].name) {
-      normalizedInputs.push({
-        name: name,
-        outputTensorIndex:
-            end === inputName.length ? 0 : Number(inputName.slice(colon + 1)),
-        isControlDependency: start
-      });
-    }
-  });
-  return normalizedInputs;
-}
-
-function addEdgeToGraph(
-    graph: SlimGraph, inputName: string, outputNode: OpNode,
-    input: NormalizedInput, params: BuildParams, index: number) {
-  // Don't allow loops in the graph.
-  if (inputName === outputNode.name) {
-    return;
-  }
-  // Check if this op type and input number corresponds to a
-  // reference edge using the refEdges dictionary in the params.
-  let isRefEdge = params.refEdges[outputNode.op + ' ' + index] === true;
-  graph.edges.push({
-    v: inputName,
-    w: outputNode.name,
-    outputTensorIndex: input.outputTensorIndex,
-    isControlDependency: input.isControlDependency,
-    isReferenceEdge: isRefEdge
-  });
-}
-
-export function build(
-    rawNodes: tf.graph.proto.NodeDef[], params: BuildParams,
-    tracker: ProgressTracker): Promise<SlimGraph|void> {
-  /**
-   * A dictionary that maps each in-embedding node name to the node
-   * object.
-   */
-  let inEmbedding: {[nodeName: string]: OpNode} = {};
-  /**
-   * A dictionary that maps each out-embedding node name to the node
-   * object.
-   */
-  let outEmbedding: {[nodeName: string]: OpNode} = {};
-  /**
-   * A dictionary that maps each node name to an array of the node's
-   * out-embedding node label objects.
-   */
-  let outEmbeddings: {[inputName: string]: OpNode[]} = {};
-  let isInEmbeddedPred = getEmbedPredicate(params.inEmbeddingTypes);
-  let isOutEmbeddedPred = getEmbedPredicate(params.outEmbeddingTypes);
-  let embeddingNodeNames: string[] = [];
-  /**
-   * A list of all the non-embedding node names which appear in the processed
-   * list of raw nodes. Here we pre-allocate enough room for all the rawNodes,
-   * even though there will some number of embeddings. The excess array length
-   * is spliced off later.
-   *
-   * Experimentation shows that around 30% of the array will go unused, and
-   * even for very large networks that amounts to less than 10k spaces.
-   */
-  let nodeNames = new Array<string>(rawNodes.length);
-
-  return tf.graph.util
-      .runAsyncTask(
-          'Normalizing names', 30,
-          () => {
-            let opNodes = new Array<OpNode>(rawNodes.length);
-            let index = 0;
-            _.each(rawNodes, rawNode => {
-              let opNode = new OpNodeImpl(rawNode);
-              if (isInEmbeddedPred(opNode)) {
-                embeddingNodeNames.push(opNode.name);
-                inEmbedding[opNode.name] = opNode;
-                return;
-              }
-
-              if (isOutEmbeddedPred(opNode)) {
-                embeddingNodeNames.push(opNode.name);
-                outEmbedding[opNode.name] = opNode;
-                _.each(opNode.inputs, input => {
-                  let inputName = input.name;
-                  outEmbeddings[inputName] = outEmbeddings[inputName] || [];
-                  outEmbeddings[inputName].push(opNode);
-                });
-                return;
-              }
-              // The node is not an embedding, so add it to the names and nodes
-              // lists.
-              opNodes[index] = opNode;
-              nodeNames[index] = opNode.name;
-              index++;
-            });
-            opNodes.splice(index);
-            nodeNames.splice(index);
-            return opNodes;
-          },
-          tracker)
-      .then((opNodes) => {
-        // Create the graph data structure from the graphlib library.
-        return tf.graph.util.runAsyncTask(
-            'Building the data structure', 70, () => {
-              let normalizedNameDict =
-                  mapStrictHierarchy(nodeNames, embeddingNodeNames);
-              let graph = new SlimGraph;
-
-              // Add the nodes to the graph.
-              _.each(opNodes, opNode => {
-                let normalizedName =
-                    normalizedNameDict[opNode.name] || opNode.name;
-                graph.nodes[normalizedName] = opNode;
-                // Check if the node has out-embeddings. If yes, add them to the
-                // node.
-                if (opNode.name in outEmbeddings) {
-                  opNode.outEmbeddings = outEmbeddings[opNode.name];
-                  // Normalize the names of the out-embeddings.
-                  _.each(opNode.outEmbeddings, node => {
-                    node.name = normalizedNameDict[node.name] || node.name;
-                  });
-                }
-                // Update the name of the node.
-                opNode.name = normalizedName;
-              });
-
-              // Visit each node's inputs to add the edges to the graph. If the
-              // input
-              // is an in-embedding, then add it to the node's in-embeddings
-              // instead.
-              _.each(opNodes, opNode => {
-                _.each(opNode.inputs, (input, i) => {
-                  let inputName = input.name;
-                  if (inputName in inEmbedding) {
-                    let inEmbedNode = inEmbedding[inputName];
-                    opNode.inEmbeddings.push(inEmbedNode);
-                    // Move the inputs of the in-embedding node into incoming
-                    // edges of
-                    // the main node. E.g. the control dependency of a constant
-                    // node
-                    // should be moved to the op node where the constant is
-                    // embedded.
-                    for (let embedInput of inEmbedNode.inputs) {
-                      addEdgeToGraph(
-                          graph, normalizedNameDict[embedInput.name] ||
-                              embedInput.name,
-                          opNode, embedInput, params, i);
-                    }
-                  } else if (inputName in outEmbedding) {
-                    // Move the inputs of the out-embedding node into inputs of
-                    // the main node where the out-embedding points to.
-                    let outEmbedNode = outEmbedding[inputName];
-                    for (let embedInput of outEmbedNode.inputs) {
-                      addEdgeToGraph(
-                          graph, normalizedNameDict[embedInput.name] ||
-                              embedInput.name,
-                          opNode, input, params, i);
-                    }
-                  } else {
-                    addEdgeToGraph(
-                        graph, normalizedNameDict[inputName] || inputName,
-                        opNode, input, params, i);
-                  }
-                });
-              });
-
-              // Normalize the names of in-embeddings.
-              _.each(inEmbedding, (node, name) => {
-                node.name = normalizedNameDict[node.name] || node.name;
-              });
-
-              return graph;
-            }, tracker);
-      });
-};
-
-/**
- * Create a new graphlib.Graph() instance with default parameters
- */
-export function createGraph<N, E>(name: string, type, opt = {}):
-    graphlib.Graph<N, E> {
-  let graph = new graphlib.Graph<N, E>(opt);
-  graph.setGraph({
-    name: name,
-    rankdir: 'BT',  // BT,TB,LR,RL
-    type: type
-  });
-  return graph;
-};
-
-/**
- * Create a predicate for checking whether a node should be embedded based on
- * the specified types.
- */
-function getEmbedPredicate(types: string[]) {
-  return function(node: OpNode) {
-    // check types
-    for (let i = 0; i < types.length; i++) {
-      let regExp = new RegExp(types[i]);
-      if (node.op.match(regExp)) { return true; }
-    }
-    return false;
-  };
-};
-
-/**
- * Returns a strict node name (name => name/(name)) to avoid conflicts
- * where the node name is also a namespace.
- */
-export function getStrictName(name: string): string {
-  let parts = name.split(NAMESPACE_DELIM);
-  return name + NAMESPACE_DELIM + '(' + parts[parts.length - 1] + ')';
-}
-
-/**
- * For each op node (embedding or non-embedding), rename it if there is a
- * non-embedding node under its namespace. For example, assume node name 'A'.
- * If there is a non-embedding node under its namespace (e.g. 'A/B'), 'A' will
- * be renamed to 'A/(A)'. Then the namespace 'A' will contain 2 nodes: '(A)'
- * and 'B'. If all the nodes under 'A' are embedding nodes (e.g. constant and
- * summary), keep 'A' as an Op node and don't create a namespace.
- *
- * @param nodeNames An array of regular (non-embedding) node names.
- * @param embeddingNodeNames An array of embedding node names.
- * @return Dictionary object mapping names that need to be renamed to
- *     new names.
- */
-function mapStrictHierarchy(nodeNames: string[],
-    embeddingNodeNames: string[]): {[oldName: string]: string} {
-  /** Dictionary that maps the old new to the new name */
-  let newNameDictionary: {[oldName: string]: string} = {};
-  /** Set used to store all namespaces. */
-  let namespaceSet: {[namespace: string]: boolean} = {};
-  // sort the nodes to make prefix check faster
-  nodeNames.sort();
-  // look for nodes with a prefix a,a/b -> a/(a),a/b
-  for (let i = 0; i < nodeNames.length - 1; ++i) {
-    let a = nodeNames[i];
-    // Get all the parent namespaces of the current node
-    // and add them in the namespace set.
-    _.each(getHierarchicalPath(a).slice(0, -1), ns => {
-      namespaceSet[ns] = true;
-    });
-    for (let j = i + 1; j < nodeNames.length; ++j) {
-      let b = nodeNames[j];
-      if (_.startsWith(b, a)) {
-        if (b.length > a.length && b.charAt(a.length) === NAMESPACE_DELIM) {
-          newNameDictionary[a] = getStrictName(a);
-          break;
-        }
-      } else {
-        break;
-      }
-    }
-  }
-  // Go through all the embedding node names and rename them in case they
-  // collide with namespaces.
-  _.each(embeddingNodeNames, embeddingName => {
-    if (embeddingName in namespaceSet) {
-      // Rename to follow strict hierarchy.
-      newNameDictionary[embeddingName] = getStrictName(embeddingName);
-    }
-  });
-  return newNameDictionary;
-};
-
-/**
- * Returns a list of the degrees of each node in the graph.
- */
-function degreeSequence(graph: graphlib.Graph<any, any>): number[] {
-  let degrees = graph.nodes().map(function(name) {
-    return graph.neighbors(name).length;
-  });
-  degrees.sort();
-  return degrees;
-};
-
-/**
- * Returns if the degree sequence of the two graphs is the same.
- */
-export function hasSimilarDegreeSequence(graph1: graphlib.Graph<any, any>,
-    graph2: graphlib.Graph<any, any>): boolean {
-  let dg1 = degreeSequence(graph1);
-  let dg2 = degreeSequence(graph2);
-
-  for (let i = 0; i < dg1.length; i++) {
-    if (dg1[i] !== dg2[i]) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * Returns the hierarchical path of the current node, based on the node's name.
- * For example, if the name is 'a/b/c', the returned path is
- * ['a', 'a/b', 'a/b/c'].
- */
-export function getHierarchicalPath(name: string,
-  seriesNames?: { [name: string]: string }): string[] {
-  let path: string[] = [];
-  let i = name.indexOf(NAMESPACE_DELIM);
-  // Push all parent portions of the path.
-  while (i >= 0) {
-    path.push(name.substring(0, i));
-    i = name.indexOf(NAMESPACE_DELIM, i + 1);
-  }
-  // If the node's path is under a series, then add the series node name to the
-  // hierarchical path as the parent of the leaf.
-  if (seriesNames) {
-    let seriesName = seriesNames[name];
-    if (seriesName) {
-      path.push(seriesName);
-    }
-  }
-  // Push the leaf of the path.
-  path.push(name);
-  return path;
-};
-
-/**
- * Returns the string for the node inclusion toggle button, dependant
- * on the provided current InclusionType.
- */
-export function getIncludeNodeButtonString(include: InclusionType) {
-  if (include === tf.graph.InclusionType.EXCLUDE) {
-    return 'Add to main graph';
-  } else {
-    return 'Remove from main graph';
-  }
-};
-
-/**
- * Returns the string for the series node grouping toggle button, dependant
- * on the provided current SeriesGroupingType.
- */
-export function getGroupSeriesNodeButtonString(group: SeriesGroupingType) {
-  if (group === tf.graph.SeriesGroupingType.GROUP) {
-    return 'Ungroup this series of nodes';
-  } else {
-    return 'Group this series of nodes';
-  }
-};
-
-/**
- * Toggle the node series grouping option in the provided map, setting it
- * to ungroup if the series is not already in the map.
- */
-export function toggleNodeSeriesGroup(
-  map: { [name: string]: tf.graph.SeriesGroupingType }, name: string) {
-  if (!(name in map) || map[name] === tf.graph.SeriesGroupingType.GROUP) {
-    map[name] = tf.graph.SeriesGroupingType.UNGROUP;
-  } else {
-    map[name] = tf.graph.SeriesGroupingType.GROUP;
-  }
-};
-
-} // close module tf.graph
diff --git a/tensorflow/tensorboard/components/tf_graph_common/hierarchy.ts b/tensorflow/tensorboard/components/tf_graph_common/hierarchy.ts
deleted file mode 100644
index 6b90c7bb0f..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/hierarchy.ts
+++ /dev/null
@@ -1,807 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/**
- * Package for the Graph Hierarchy for TensorFlow graph.
- */
-module tf.graph.hierarchy {
-
-/**
- * Class used as output for getPredecessors and getSuccessors methods
- */
-export interface Edges {
-  control: Metaedge[];
-  regular: Metaedge[];
-}
-
-export interface Hierarchy {
-  root: Metanode;
-  templates: {[templateId: string]: string[]};
-  /** List of all device names */
-  devices: string[];
-  /** List of all XLA cluster names */
-  xlaClusters: string[];
-  /** True if at least one tensor in the graph has shape information */
-  hasShapeInfo: boolean;
-  /** The maximum size across all meta edges. Used for scaling thickness. */
-  maxMetaEdgeSize: number;
-  getNodeMap(): {[nodeName: string]: GroupNode|OpNode};
-  node(name: string): GroupNode|OpNode;
-  setNode(name: string, node: GroupNode|OpNode): void;
-  getBridgegraph(nodeName: string): graphlib.Graph<GroupNode|OpNode, Metaedge>;
-  getPredecessors(nodeName: string): Edges;
-  getSuccessors(nodeName: string): Edges;
-  getTopologicalOrdering(nodeName: string): { [childName: string]: number };
-  getTemplateIndex(): (string) => number;
-}
-
-/**
- * Class for the Graph Hierarchy for TensorFlow graph.
- */
-class HierarchyImpl implements Hierarchy {
-  root: Metanode;
-  templates: {[templateId: string]: string[]};
-  private index: {[nodeName: string]: GroupNode|OpNode};
-  devices: string[];
-  xlaClusters: string[];
-  hasShapeInfo = false;
-  maxMetaEdgeSize = 1;
-  orderings: { [nodeName: string]: { [childName: string]: number } };
-
-  constructor() {
-    this.root = createMetanode(ROOT_NAME, {compound: true});
-    this.templates = null;
-    this.devices = null;
-    /**
-     * @type {Object} Dictionary object that maps node name to the node
-     * (could be op-node, metanode, or series-node)
-     */
-    this.index = {};
-    this.index[ROOT_NAME] = this.root;
-    this.orderings = {};
-  }
-
-  getNodeMap(): {[nodeName: string]: GroupNode|OpNode} {
-    return this.index;
-  }
-
-  node(name: string): GroupNode|OpNode {
-    return this.index[name];
-  }
-
-  setNode(name: string, node: GroupNode|OpNode): void {
-    this.index[name] = node;
-  }
-
-  /**
-   * Given the name of a node in this hierarchy, get its bridgegraph, creating
-   * it on the fly if necessary. If the node is not a GroupNode, then this
-   * method returns null. If the provided name does not map to a node in the
-   * hierarchy, an error will be thrown.
-   */
-  getBridgegraph(nodeName: string): graphlib.Graph<GroupNode|OpNode, Metaedge> {
-    let node = this.index[nodeName];
-    if (!node) {
-      throw Error('Could not find node in hierarchy: ' + nodeName);
-    }
-    if (!('metagraph' in node)) {
-      return null;
-    }
-    let groupNode = <GroupNode> node;
-    if (groupNode.bridgegraph) {
-      return groupNode.bridgegraph;
-    }
-    let bridgegraph = groupNode.bridgegraph =
-        createGraph<GroupNode|OpNode, Metaedge>(
-            'BRIDGEGRAPH', GraphType.BRIDGE);
-    if (!node.parentNode || !('metagraph' in node.parentNode)) {
-      return bridgegraph;
-    }
-
-    let parentNode = <GroupNode>node.parentNode;
-    let parentMetagraph = parentNode.metagraph;
-    let parentBridgegraph = this.getBridgegraph(parentNode.name);
-
-    // For each of the parent node's two Metaedge containing graphs, process
-    // each Metaedge involving this node.
-    _.each([parentMetagraph, parentBridgegraph], parentGraph => {
-      _(parentGraph.edges())
-        .filter(e => e.v === nodeName || e.w === nodeName)
-        .each(parentEdgeObj => {
-
-          let inbound = parentEdgeObj.w === nodeName;
-          let parentMetaedge = parentGraph.edge(parentEdgeObj);
-
-          // The parent's Metaedge represents some number of underlying
-          // BaseEdges from the original full graph. For each of those, we need
-          // to determine which immediate child is involved and make sure
-          // there's a Metaedge in the bridgegraph that covers it.
-          _.each(parentMetaedge.baseEdgeList, baseEdge => {
-
-            // Based on the direction, figure out which is the descendant node
-            // and which is the 'other' node (sibling of parent or ancestor).
-            let [descendantName, otherName] =
-              inbound ?
-                [baseEdge.w, parentEdgeObj.v] :
-                [baseEdge.v, parentEdgeObj.w];
-
-            // Determine the immediate child containing this descendant node.
-            let childName = this.getChildName(nodeName, descendantName);
-
-            // Look for an existing Metaedge in the bridgegraph (or create a
-            // new one) that covers the relationship between child and other.
-            let bridgeEdgeObj = <graphlib.EdgeObject> {
-              v: inbound ? otherName : childName,
-              w: inbound ? childName : otherName,
-            };
-            let bridgeMetaedge = bridgegraph.edge(bridgeEdgeObj);
-            if (!bridgeMetaedge) {
-              bridgeMetaedge = createMetaedge(bridgeEdgeObj.v, bridgeEdgeObj.w);
-              bridgeMetaedge.inbound = inbound;
-              bridgegraph.setEdge(bridgeEdgeObj.v, bridgeEdgeObj.w,
-                  bridgeMetaedge);
-            }
-
-            // Copy the BaseEdge from the parent's Metaedge into this
-            // bridgegraph Metaedge.
-            bridgeMetaedge.addBaseEdge(baseEdge, this);
-          });
-        })
-        .value(); // force lodash chain execution.
-    });
-
-    return bridgegraph;
-  }
-
-  /**
-   * Utility function for determining the name of the immediate child under a
-   * node for a given descendant path. If the descendant corresponds to no
-   * immediate child, an error is thrown.
-   */
-  getChildName(nodeName: string, descendantName: string): string {
-    // Walk up the hierarchy from the descendant to find the child.
-    let currentNode: Node = this.index[descendantName];
-    while (currentNode) {
-      if (currentNode.parentNode && currentNode.parentNode.name === nodeName) {
-        return currentNode.name;
-      }
-      currentNode = currentNode.parentNode;
-    }
-    throw Error(
-        'Could not find immediate child for descendant: ' + descendantName);
-  };
-
-  /** Given the name of a node, return its incoming metaedges. */
-  getPredecessors(nodeName: string): Edges {
-    let node = this.index[nodeName];
-    if (!node) {
-      throw Error('Could not find node with name: ' + nodeName);
-    }
-
-    let predecessors = this.getOneWayEdges(node, true);
-    // Add embedded predecessors, such as constants.
-    if (!node.isGroupNode) {
-      _.each((<OpNode>node).inEmbeddings, embeddedNode => {
-        _.each((<OpNode>node).inputs, input => {
-          if (input.name === embeddedNode.name) {
-            // Make a new metaedge holding the edge between the
-            // node and the in-embedding.
-            let metaedge = new MetaedgeImpl(embeddedNode.name, nodeName);
-            metaedge.addBaseEdge(
-                {
-                  isControlDependency: input.isControlDependency,
-                  outputTensorIndex: input.outputTensorIndex,
-                  isReferenceEdge: false,
-                  v: embeddedNode.name,
-                  w: nodeName
-                },
-                this);
-            predecessors.regular.push(metaedge);
-          }
-        });
-      });
-    }
-    return predecessors;
-  }
-
-  /**
-   * Given the name of a node, return its outgoing metaedges.
-   *
-   * This is the inverse of getPredecessors(). See that method's documentation
-   * for an in-depth example.
-   */
-  getSuccessors(nodeName: string): Edges {
-    let node = this.index[nodeName];
-    if (!node) {
-      throw Error('Could not find node with name: ' + nodeName);
-    }
-
-    let successors = this.getOneWayEdges(node, false);
-
-    // Add embedded successors, such as summaries.
-    if (!node.isGroupNode) {
-      _.each((<OpNode>node).outEmbeddings, embeddedNode => {
-        _.each(embeddedNode.inputs, input => {
-          if (input.name === nodeName) {
-            // Make a new metaedge holding the edge between the
-            // node and the out-embedding.
-            let metaedge = new MetaedgeImpl(nodeName, embeddedNode.name);
-            metaedge.addBaseEdge(
-                {
-                  isControlDependency: input.isControlDependency,
-                  outputTensorIndex: input.outputTensorIndex,
-                  isReferenceEdge: false,
-                  v: nodeName,
-                  w: embeddedNode.name
-                },
-                this);
-            successors.regular.push(metaedge);
-          }
-        });
-      });
-    }
-    return successors;
-  }
-
-  /** Helper method for getPredecessors and getSuccessors */
-  getOneWayEdges(node: GroupNode|OpNode, inEdges: boolean) {
-    let edges: Edges = {control: [], regular: []};
-    // A node with no parent cannot have any edges.
-    if (!node.parentNode || !node.parentNode.isGroupNode) {
-      return edges;
-    }
-    let parentNode = <GroupNode> node.parentNode;
-    let metagraph = parentNode.metagraph;
-    let bridgegraph = this.getBridgegraph(parentNode.name);
-    findEdgeTargetsInGraph(metagraph, node, inEdges, edges);
-    findEdgeTargetsInGraph(bridgegraph, node, inEdges, edges);
-    return edges;
-  }
-
-  /**
-   * For a given GroupNode, get or calculate an object which describes a
-   * topological ordering of child nodes within that GroupNode's metagraph.
-   *
-   * This ordering is used when rendering bridge control edges which are
-   * sometimes backwards relative to the dataflow.
-   *
-   * For example, say we have a graph with two edges A->B and A->C, and we're
-   * interested in the ordering under ROOT. In this case, any of the following
-   * would be legitimate return values:
-   *
-   *  - { 'A': 0, 'B': 1, 'C': 2 } -- most likely
-   *  - { 'A': 0, 'B': 2, 'C': 1 } -- less likely
-   *  - { 'A': 12, 'B': 100, 'C': 99 } -- unlikely, but still OK
-   *
-   * The algorithm does not guarantee that all numbers from 0-N (where N is
-   * the number of nodes) appear exactly once. Rather it guarantees that if
-   * there is a path between two nodes, the earlier one will have a lower
-   * number in the ordering hash.
-   *
-   * When generating the ordering, we ignore control Metaedges (those which
-   * represent only BaseEdges that have isControlDependency set to true).
-   *
-   * If there is no node with the specified name, an error is thrown. If the
-   * node with the specified name is not a group node, null is returned.
-   */
-  getTopologicalOrdering(nodeName: string): { [childName: string]: number } {
-    let node = this.index[nodeName];
-    if (!node) {
-      throw Error('Could not find node with name: ' + nodeName);
-    }
-    if (!node.isGroupNode) {
-      return null;
-    }
-    if (nodeName in this.orderings) {
-      return this.orderings[nodeName];
-    }
-
-    // Mapping of a child node names to lists of their successors.
-    let successors: { [childName: string]: string[] } = {};
-
-    // Set of node names which have appeared as a destination.
-    let destinations: { [childName: string]: boolean } = {};
-
-    let metagraph = (<GroupNode> node).metagraph;
-    _.each(metagraph.edges(), (e: graphlib.EdgeObject) => {
-      if (!metagraph.edge(e).numRegularEdges) {
-        return; // Skip control edges.
-      }
-
-      // Keep track of successors and destinations.
-      if (!(e.v in successors)) {
-        successors[e.v] = [];
-      }
-      successors[e.v].push(e.w);
-      destinations[e.w] = true;
-    });
-
-    // Seed the queue with true sources (those that are not destinations).
-    let queue: string[] =
-      _.difference(_.keys(successors), _.keys(destinations));
-
-    // Produce an ordering by traversing the graph breadth first.
-    let ordering = this.orderings[nodeName] = {};
-    let index = 0;
-    while (queue.length) {
-      let childName = queue.shift();
-      ordering[childName] = index++;
-      _.each(successors[childName], succName => queue.push(succName));
-      delete successors[childName]; // Prevent cycles from infinite looping.
-    }
-    return ordering;
-  }
-
-  /**
-   * Returns a d3 Ordinal function that can be used to look up the index of
-   * a node based on its template id.
-   */
-  getTemplateIndex(): (string) => number {
-    let templateNames = d3.keys(this.templates);
-    let templateIndex = d3.scale.ordinal()
-        .domain(templateNames)
-        .range(d3.range(0, templateNames.length));
-    return (templateId: string) => <number>templateIndex(templateId);
-  }
-}
-
-/**
- * Internal utility function - given a graph (should be either a metagraph or a
- * bridgegraph) and a node which is known to be in that graph, determine
- * the other ends of edges that involve that node in the direction specified
- * by whether it's inbound.
- *
- * For example if you wanted to find the predecessors of a node, you'd call
- * this method for the parent's metagraph and bridgegraph, specifying inbound
- * as true (look at the source of inbound edges to the specified node).
- *
- * Discovered target names are appended to the targets array.
- */
-function findEdgeTargetsInGraph(
-    graph: graphlib.Graph<GroupNode|OpNode, Metaedge>,
-    node: Node, inbound: boolean, targets: Edges): void {
-  let edges = inbound ? graph.inEdges(node.name) : graph.outEdges(node.name);
-  _.each(edges, e => {
-    let metaedge = graph.edge(e);
-    let targetList =
-        metaedge.numRegularEdges ? targets.regular : targets.control;
-    targetList.push(metaedge);
-  });
-}
-
-export interface HierarchyParams {
-  verifyTemplate: boolean;
-  seriesNodeMinSize: number;
-  seriesMap: { [name: string]: tf.graph.SeriesGroupingType };
-}
-
-/**
- * @param graph The raw graph.
- * @param params Parameters used when building a hierarchy.
- */
-export function build(graph: tf.graph.SlimGraph, params: HierarchyParams,
-    tracker: ProgressTracker): Promise<Hierarchy|void> {
-  let h = new HierarchyImpl();
-  let seriesNames: { [name: string]: string } = {};
-  return tf.graph.util
-      .runAsyncTask(
-          'Adding nodes', 20,
-          () => {
-            // Get all the possible device and XLA cluster names.
-            let deviceNames = {};
-            let xlaClusterNames = {};
-            _.each(graph.nodes, (node, nodeName) => {
-              if (node.device) {
-                deviceNames[node.device] = true;
-              }
-
-              if (node.xlaCluster) {
-                xlaClusterNames[node.xlaCluster] = true;
-              }
-            });
-
-            h.devices = _.keys(deviceNames);
-            h.xlaClusters = _.keys(xlaClusterNames);
-
-            addNodes(h, graph);
-          },
-          tracker)
-      .then(() => {
-        return tf.graph.util.runAsyncTask('Detect series', 20, () => {
-          if (params.seriesNodeMinSize > 0) {
-            groupSeries(
-                h.root, h, seriesNames, params.seriesNodeMinSize,
-                params.seriesMap);
-          }
-        }, tracker);
-      })
-      .then(() => {
-        return tf.graph.util.runAsyncTask('Adding edges', 30, () => {
-          addEdges(h, graph, seriesNames);
-        }, tracker);
-      })
-      .then(() => {
-        return tf.graph.util.runAsyncTask(
-            'Finding similar subgraphs', 30, () => {
-              h.templates = template.detect(h, params.verifyTemplate);
-            }, tracker);
-      })
-      .then(() => {
-        return h;
-      });
-};
-
-export function joinAndAggregateStats(
-    h: Hierarchy, stats: tf.graph.proto.StepStats) {
-  // Get all the possible device names.
-  let deviceNames = {};
-  _.each(h.root.leaves(), nodeName => {
-    let leaf = <OpNode> h.node(nodeName);
-    if (leaf.device != null) {
-      deviceNames[leaf.device] = true;
-    }
-  });
-  h.devices = _.keys(deviceNames);
-
-  // Reset stats for each group node.
-  _.each(h.getNodeMap(), (node, nodeName) => {
-    if (node.isGroupNode) {
-      node.stats = new NodeStats(null);
-      (<GroupNode>node).deviceHistogram = {};
-    }
-  });
-
-  // Bubble-up the stats and device distribution from leaves to parents.
-  _.each(h.root.leaves(), nodeName => {
-    let leaf = <OpNode> h.node(nodeName);
-    let node = <GroupNode|OpNode> leaf;
-    while (node.parentNode != null) {
-      if (leaf.device != null) {
-        let deviceHistogram = (<GroupNode>node.parentNode).deviceHistogram;
-        deviceHistogram[leaf.device] = (deviceHistogram[leaf.device] || 0) + 1;
-      }
-      if (leaf.stats != null) {
-        node.parentNode.stats.combine(leaf.stats);
-      }
-      node = <GroupNode> node.parentNode;
-    }
-  });
-}
-
-/**
- * Creates the metanodes in the hierarchical graph and assigns parent-child
- * relationship between them.
- */
-function addNodes(h: Hierarchy, graph: SlimGraph) {
-  _.each(graph.nodes, (node, nodeName) => {
-    let path = getHierarchicalPath(node.name);
-    let parent: Metanode = h.root;
-
-    parent.depth = Math.max(path.length, parent.depth);
-
-    // Create parent metanodes for each depth. For example if the node name
-    // is 'a/b/c', then create metanodes 'a' and 'a/b', where 'a/b' is a child
-    // of a.
-    for (let i = 0; i < path.length; i++) {
-      parent.depth = Math.max(parent.depth, path.length - i);
-      parent.cardinality += node.cardinality;
-      parent.opHistogram[node.op] = (parent.opHistogram[node.op] || 0) + 1;
-      if (node.device != null) {
-        parent.deviceHistogram[node.device] =
-            (parent.deviceHistogram[node.device] || 0) + 1;
-      }
-      if (i === path.length - 1) { break; }
-      let name = path[i];
-      let child = <Metanode>h.node(name);
-      if (!child) {
-        child = createMetanode(name);
-        child.parentNode = parent;
-        h.setNode(name, child);
-        parent.metagraph.setNode(name, child);
-      }
-      parent = child;
-    }
-    // Assuming node name is 'a/b/c', assign the OpNode as a child of the
-    // metanode 'a/b'.
-    h.setNode(node.name, node);
-    node.parentNode = parent;
-    parent.metagraph.setNode(node.name, node);
-
-    // Add each of the in-embeddings and out-embeddings in the hierarchy.
-    _.each(node.inEmbeddings, function(embedding) {
-      h.setNode(embedding.name, embedding);
-      embedding.parentNode = node;
-    });
-    _.each(node.outEmbeddings, function(embedding) {
-      h.setNode(embedding.name, embedding);
-      embedding.parentNode = node;
-    });
-  });
-};
-
-/**
- * For each metanode in the hierarchical graph, this method adds:
- * the edges in the metagraph. These are edges between nodes
- * that share the same parent.
- */
-function addEdges(h: Hierarchy, graph: SlimGraph,
-    seriesNames: { [name: string]: string }) {
-
-  let nodeIndex = h.getNodeMap();
-
-  // Ancestor paths for the source and destination nodes of an edge. These are
-  // reused for each edge rather than allocating new ones. It's about 10% faster
-  // than allocating new ones on each pass through the loop.
-  let sourcePath: string[] = [];
-  let destPath: string[] = [];
-
-  // Insert the ancestor path for a node into the provided array, including the
-  // node itself. Return the index of the last node inserted (always ROOT).
-  let getPath = (node: Node, path: string[]): number => {
-    let i = 0;
-    while (node) {
-      path[i++] = node.name;
-      node = node.parentNode;
-    }
-    return i - 1;
-  };
-
-  _.each(graph.edges, baseEdge => {
-
-    // Get the hierarchical paths for the source and destination of the edge.
-    let sourceAncestorIndex = getPath(graph.nodes[baseEdge.v], sourcePath);
-    let destAncestorIndex = getPath(graph.nodes[baseEdge.w], destPath);
-
-    // If the hierarchical path cannot be found for either endpoint, then we
-    // cannot create the edge. This happens for example when a node has a
-    // control dependency on a summary node, which are embedded.
-    if (sourceAncestorIndex === -1 || destAncestorIndex === -1) {
-      return;
-    }
-
-    // Find the lowest shared ancestor between source and dest by looking for
-    // the highest nodes that differ between their ancestor paths.
-    while (sourcePath[sourceAncestorIndex] === destPath[destAncestorIndex]) {
-      sourceAncestorIndex--;
-      destAncestorIndex--;
-      if (sourceAncestorIndex < 0 || destAncestorIndex < 0) {
-        // This would only occur if the two nodes were the same (a cycle in the
-        // graph), or if one endpoint was a strict ancestor of the other. The
-        // latter shouldn't happen because we rename nodes which are both
-        // metanodes and op nodes. E.g. 'A/B' becomes 'A/B/(B)'.
-        throw Error('No difference found between ancestor paths.');
-      }
-    }
-
-    let sharedAncestorNode =
-      <GroupNode>nodeIndex[sourcePath[sourceAncestorIndex + 1]];
-    let sourceAncestorName = sourcePath[sourceAncestorIndex];
-    let destAncestorName = destPath[destAncestorIndex];
-
-    // Find or create the Metaedge which should contain this BaseEdge inside
-    // the shared ancestor.
-    let metaedge =
-      sharedAncestorNode.metagraph.edge(sourceAncestorName, destAncestorName);
-    if (!metaedge) {
-      metaedge = createMetaedge(sourceAncestorName, destAncestorName);
-      sharedAncestorNode.metagraph
-        .setEdge(sourceAncestorName, destAncestorName, metaedge);
-    }
-    if (!sharedAncestorNode.hasNonControlEdges &&
-        !baseEdge.isControlDependency) {
-      sharedAncestorNode.hasNonControlEdges = true;
-    }
-    metaedge.addBaseEdge(baseEdge, h);
-  });
-};
-
-/**
- * Using the hierarchy template information, detect series in the provided
- * metanode.  For each detected series, create a new SeriesNode
- * and remove series members from the metanode's metagraph and move them to
- * the new series node's metagraph.
- *
- * @param metanode
- * @param hierarchy
- * @param seriesNames Map of node names to their series they are contained in.
- *     This should be provided empty and is populated by this method.
- * @param threshold If the series has this many nodes or more, then group them
- *     into a series.
- * @param map Map of series names to their series grouping type, if one has
- *     been set.
- * @return A dictionary from node name to series node name that contains the
- *     node.
- */
-function groupSeries(metanode: Metanode, hierarchy: Hierarchy,
-    seriesNames: { [name: string]: string }, threshold: number,
-    map: { [name: string]: tf.graph.SeriesGroupingType }) {
-  let metagraph = metanode.metagraph;
-  _.each(metagraph.nodes(), n => {
-    let child = metagraph.node(n);
-    if (child.type === tf.graph.NodeType.META) {
-      groupSeries(<Metanode>child, hierarchy, seriesNames, threshold, map);
-    }
-  });
-
-  let clusters = clusterNodes(metagraph);
-  let seriesDict = detectSeries(clusters, metagraph);
-
-  // Add each series node to the graph and add its grouped children to its own
-  // metagraph.
-  _.each(seriesDict, function(seriesNode: SeriesNode, seriesName: string) {
-    let nodeMemberNames = seriesNode.metagraph.nodes();
-    _.each(nodeMemberNames, n => {
-      let child = <OpNode>metagraph.node(n);
-      if (!child.owningSeries) {
-        child.owningSeries = seriesName;
-      }
-    });
-    // If the series contains less than the threshold number of nodes and
-    // this series has not been adding to the series map, then set this
-    // series to be shown ungrouped in the map.
-    if (nodeMemberNames.length < threshold && !(seriesNode.name in map)) {
-      map[seriesNode.name] = tf.graph.SeriesGroupingType.UNGROUP;
-    }
-    // If the series is in the map as ungrouped then do not group the series.
-    if (seriesNode.name in map
-      && map[seriesNode.name] === tf.graph.SeriesGroupingType.UNGROUP) {
-      return;
-    }
-    hierarchy.setNode(seriesName, seriesNode); // add to the index
-    metagraph.setNode(seriesName, seriesNode);
-    _.each(nodeMemberNames, n => {
-      let child = <OpNode> metagraph.node(n);
-      seriesNode.metagraph.setNode(n, child);
-      seriesNode.parentNode = child.parentNode;
-      seriesNode.cardinality++;
-      if (child.device != null) {
-        seriesNode.deviceHistogram[child.device] =
-            (seriesNode.deviceHistogram[child.device] || 0) + 1;
-      }
-      child.parentNode = seriesNode;
-      seriesNames[n] = seriesName;
-      // Remove now-grouped node from its original parent's metagraph.
-      metagraph.removeNode(n);
-    });
-  });
-};
-
-/** cluster op-nodes with similar op */
-function clusterNodes(metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>):
-    {[clusterId: string]: string[]} {
-  let result: {[clusterId: string]: string[]} = {};
-  return  _.reduce(metagraph.nodes(),
-      (clusters: {[clusterId: string]: string[]}, n: string) => {
-    let child = metagraph.node(n);
-    if (child.type === NodeType.META) {
-      // skip metanodes
-      return clusters;
-    }
-    let template = (<OpNode>child).op;
-    if (template) {
-      clusters[template] = clusters[template] || [];
-      clusters[template].push(child.name);
-    }
-    return clusters;
-  }, result);
-}
-
-/**
- * For each cluster of op-nodes based op type, try to detect groupings.
- * Infer series name using by trying to find pattern '<number>' in the node
- * name.
- *
- * @param clusters Dictionary output from clusterNodes().
- * @param metagraph
- * @return A dictionary from series name => seriesNode
- */
-function detectSeries(clusters: {[clusterId: string]: string[]},
-     metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>):
-     {[seriesName: string]: SeriesNode} {
-  let seriesDict: {[seriesName: string]: SeriesNode} = {};
-  _.each(clusters, function(members, clusterId: string) {
-    if (members.length <= 1) { return; } // isolated clusters can't make series
-
-    /** @type {Object}  A dictionary mapping seriesName to seriesInfoArray,
-     * which is an array that contains objects with name, id, prefix, suffix,
-     * and parent properties.
-     */
-    let candidatesDict: {[seriesName: string]: SeriesNode[]} = {};
-
-    // Group all nodes that have the same name, with the exception of a
-    // number at the end of the name after an underscore, which is allowed to
-    // vary.
-    _.each(members, function(name: string) {
-      let isGroup = name.charAt(name.length - 1) === '*';
-      let namepath = name.split('/');
-      let leaf = namepath[namepath.length - 1];
-      let parent = namepath.slice(0, namepath.length - 1).join('/');
-      let matches = leaf.match(/^(\D*)_(\d+)$/);
-
-      let prefix;
-      let id;
-      let suffix = '';
-      if (matches) {         // if found '<number>' in the name, assign id.
-        prefix = matches[1]; // the front non-numeric characters
-        id = matches[2]; // the digits
-      } else {  // for node without '_<number>', make them zero-th items.
-        prefix = isGroup ? leaf.substr(0, leaf.length - 1) : leaf;
-        id = 0;
-        suffix = isGroup ? '*' : '';
-      }
-      let seriesName = getSeriesNodeName(prefix, suffix, parent);
-      candidatesDict[seriesName] = candidatesDict[seriesName] || [];
-      let seriesNode = createSeriesNode(prefix, suffix, parent, +id, name);
-      candidatesDict[seriesName].push(seriesNode);
-    });
-
-    // In each group of nodes, group nodes in bunches that have monotonically
-    // increasing numbers in their names.  Each of these bunches is a series.
-    _.each(candidatesDict, function(seriesInfoArray: SeriesNode[], seriesName) {
-      if (seriesInfoArray.length < 2) {
-        return;
-      }
-      seriesInfoArray.sort(function(a, b) {
-        return (+a.clusterId) - (+b.clusterId);
-      });
-
-      // Loop through the nodes sorted by its detected series number, grouping
-      // all nodes with monotonically-increasing series numbers.
-      let seriesNodes = [seriesInfoArray[0]];
-      for (let index = 1; index < seriesInfoArray.length; index++) {
-        let nextNode = seriesInfoArray[index];
-        if (nextNode.clusterId === seriesNodes[seriesNodes.length - 1].clusterId
-            + 1) {
-          seriesNodes.push(nextNode);
-          continue;
-        }
-        addSeriesToDict(seriesNodes, seriesDict, +clusterId, metagraph);
-        seriesNodes = [nextNode];
-      }
-      addSeriesToDict(seriesNodes, seriesDict, +clusterId, metagraph);
-    });
-  });
-  return seriesDict;
-}
-
-/**
- * Add a series to the provided dictionary mapping series names to series.
- *
- * @param seriesNodes the nodes in the series. Contains
- *     name, id, prefix, suffix and parent properties of the node.
- * @param seriesDict the dictionary of series
- * @param clusterId ID of the template of the nodes of the series
- * @param metagraph
- */
-function addSeriesToDict(seriesNodes: SeriesNode[],
-    seriesDict: {[seriesName: string]: SeriesNode},
-    clusterId: number,
-    metagraph: graphlib.Graph<GroupNode|OpNode, Metaedge>) {
-  if (seriesNodes.length > 1) {
-    let curSeriesName = getSeriesNodeName(
-      seriesNodes[0].prefix, seriesNodes[0].suffix,
-      seriesNodes[0].parent, seriesNodes[0].clusterId,
-      seriesNodes[seriesNodes.length - 1].clusterId);
-    let curSeriesNode = createSeriesNode(seriesNodes[0].prefix,
-      seriesNodes[0].suffix, seriesNodes[0].parent, clusterId,
-      curSeriesName);
-    _.each(seriesNodes, function(node) {
-      curSeriesNode.ids.push(node.clusterId);
-      curSeriesNode.metagraph.setNode(node.name, metagraph.node(node.name));
-    });
-    seriesDict[curSeriesName] = curSeriesNode;
-  }
-}
-
-} // close module tf.graph.hierarchy
diff --git a/tensorflow/tensorboard/components/tf_graph_common/layout.ts b/tensorflow/tensorboard/components/tf_graph_common/layout.ts
deleted file mode 100644
index 9f4e2f406b..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/layout.ts
+++ /dev/null
@@ -1,758 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph.layout {
-
-/** Set of parameters that define the look and feel of the graph. */
-export const PARAMS = {
-  animation: {
-    /** Default duration for graph animations in ms. */
-    duration: 250
-  },
-  graph: {
-    /** Graph parameter for metanode. */
-    meta: {
-      /**
-       * Dagre's nodesep param - number of pixels that
-       * separate nodes horizontally in the layout.
-       *
-       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-       */
-      nodeSep: 5,
-      /**
-       * Dagre's ranksep param - number of pixels
-       * between each rank in the layout.
-       *
-       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-       */
-      rankSep: 25,
-      /**
-       * Dagre's edgesep param - number of pixels that separate
-       * edges horizontally in the layout.
-       */
-      edgeSep: 5,
-    },
-    /** Graph parameter for metanode. */
-    series: {
-      /**
-       * Dagre's nodesep param - number of pixels that
-       * separate nodes horizontally in the layout.
-       *
-       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-       */
-      nodeSep: 5,
-      /**
-       * Dagre's ranksep param - number of pixels
-       * between each rank in the layout.
-       *
-       * See https://github.com/cpettitt/dagre/wiki#configuring-the-layout
-       */
-      rankSep: 25,
-      /**
-       * Dagre's edgesep param - number of pixels that separate
-       * edges horizontally in the layout.
-       */
-      edgeSep: 5
-    },
-    /**
-     * Padding is used to correctly position the graph SVG inside of its parent
-     * element. The padding amounts are applied using an SVG transform of X and
-     * Y coordinates.
-     */
-    padding: {paddingTop: 40, paddingLeft: 20}
-  },
-  subscene: {
-    meta: {
-      paddingTop: 10,
-      paddingBottom: 10,
-      paddingLeft: 10,
-      paddingRight: 10,
-      /**
-       * Used to leave room for the label on top of the highest node in
-       * the core graph.
-       */
-      labelHeight: 20,
-      /** X-space between each extracted node and the core graph. */
-      extractXOffset: 15,
-      /** Y-space between each extracted node. */
-      extractYOffset: 20
-    },
-    series: {
-      paddingTop: 10,
-      paddingBottom: 10,
-      paddingLeft: 10,
-      paddingRight: 10,
-      labelHeight: 10
-    }
-  },
-  nodeSize: {
-    /** Size of meta nodes. */
-    meta: {
-      radius: 5,
-      width: 60,
-      maxLabelWidth: 52,
-      /** A scale for the node's height based on number of nodes inside */
-      height: d3.scale.linear().domain([1, 200]).range([15, 60]).clamp(true),
-      /** The radius of the circle denoting the expand button. */
-      expandButtonRadius: 3
-    },
-    /** Size of op nodes. */
-    op: {
-      width: 15,
-      height: 6,
-      radius: 3,  // for making annotation touching ellipse
-      labelOffset: -8,
-      maxLabelWidth: 30
-    },
-    /** Size of series nodes. */
-    series: {
-      expanded: {
-        // For expanded series nodes, width and height will be
-        // computed to account for the subscene.
-        radius: 10,
-        labelOffset: 0,
-      },
-      vertical: {
-        // When unexpanded, series whose underlying metagraphs contain
-        // one or more non-control edges will show as a vertical stack
-        // of ellipses.
-        width: 16,
-        height: 13,
-        labelOffset: -13,
-      },
-      horizontal: {
-        // When unexpanded, series whose underlying metagraphs contain
-        // no non-control edges will show as a horizontal stack of
-        // ellipses.
-        width: 24,
-        height: 8,
-        radius: 10,  // Forces annotations to center line.
-        labelOffset: -10,
-      },
-    },
-    /** Size of bridge nodes. */
-    bridge: {
-      // NOTE: bridge nodes will normally be invisible, but they must
-      // take up some space so that the layout step leaves room for
-      // their edges.
-      width: 20,
-      height: 20,
-      radius: 2,
-      labelOffset: 0
-    }
-  },
-  shortcutSize: {
-    /** Size of shortcuts for op nodes */
-    op: {width: 10, height: 4},
-    /** Size of shortcuts for meta nodes */
-    meta: {width: 12, height: 4, radius: 1},
-    /** Size of shortcuts for series nodes */
-    series: {
-      width: 14,
-      height: 4,
-    }
-  },
-  annotations: {
-    /** Maximum possible width of the bounding box for in annotations */
-    inboxWidth: 50,
-    /** Maximum possible width of the bounding box for out annotations */
-    outboxWidth: 50,
-    /** X-space between the shape and each annotation-node. */
-    xOffset: 10,
-    /** Y-space between each annotation-node. */
-    yOffset: 3,
-    /** X-space between each annotation-node and its label. */
-    labelOffset: 2,
-    /** Defines the max width for annotation label */
-    maxLabelWidth: 120
-  },
-  constant: {size: {width: 4, height: 4}},
-  series: {
-    /** Maximum number of repeated item for unexpanded series node. */
-    maxStackCount: 3,
-    /**
-     * Positioning offset ratio for collapsed stack
-     * of parallel series (series without edges between its members).
-     */
-    parallelStackOffsetRatio: 0.2,
-    /**
-     * Positioning offset ratio for collapsed stack
-     * of tower series (series with edges between its members).
-     */
-    towerStackOffsetRatio: 0.5
-  },
-  minimap: {
-    /** The maximum width/height the minimap can have. */
-    size: 150
-  }
-};
-
-/** Calculate layout for a scene of a group node. */
-export function layoutScene(renderNodeInfo: render.RenderGroupNodeInfo): void {
-  // Update layout, size, and annotations of its children nodes and edges.
-  if (renderNodeInfo.node.isGroupNode) {
-    layoutChildren(renderNodeInfo);
-  }
-
-  // Update position of its children nodes and edges
-  if (renderNodeInfo.node.type === NodeType.META) {
-    layoutMetanode(renderNodeInfo);
-  } else if (renderNodeInfo.node.type === NodeType.SERIES) {
-    layoutSeriesNode(renderNodeInfo);
-  }
-};
-
-/**
- * Updates the total width of an unexpanded node which includes the size of its
- * in and out annotations.
- */
-function updateTotalWidthOfNode(renderInfo: render.RenderNodeInfo): void {
-  renderInfo.inboxWidth = renderInfo.inAnnotations.list.length > 0 ?
-      PARAMS.annotations.inboxWidth : 0;
-  renderInfo.outboxWidth = renderInfo.outAnnotations.list.length > 0 ?
-      PARAMS.annotations.outboxWidth : 0;
-  // Assign the width of the core box (the main shape of the node).
-  renderInfo.coreBox.width = renderInfo.width;
-  renderInfo.coreBox.height = renderInfo.height;
-  // TODO(jimbo): Account for font width rather than using a magic number.
-  let labelLength = renderInfo.node.name.length -
-      renderInfo.node.name.lastIndexOf(NAMESPACE_DELIM) - 1;
-  let charWidth = 3; // 3 pixels per character.
-  // Compute the total width of the node.
-  renderInfo.width = Math.max(renderInfo.coreBox.width +
-      renderInfo.inboxWidth + renderInfo.outboxWidth,
-      labelLength * charWidth);
-
-}
-
-/**
- * Update layout, size, and annotations of its children nodes and edges.
- */
-function layoutChildren(renderNodeInfo: render.RenderGroupNodeInfo): void {
-  let children = renderNodeInfo.coreGraph.nodes().map(n => {
-    return renderNodeInfo.coreGraph.node(n);
-  }).concat(renderNodeInfo.isolatedInExtract,
-      renderNodeInfo.isolatedOutExtract);
-
-  _.each(children, childNodeInfo => {
-    // Set size of each child
-    switch (childNodeInfo.node.type) {
-      case NodeType.OP:
-        _.extend(childNodeInfo, PARAMS.nodeSize.op);
-        break;
-      case NodeType.BRIDGE:
-        _.extend(childNodeInfo, PARAMS.nodeSize.bridge);
-        break;
-      case NodeType.META:
-        if (!childNodeInfo.expanded) {
-          // Set fixed width and scalable height based on cardinality
-          _.extend(childNodeInfo, PARAMS.nodeSize.meta);
-          childNodeInfo.height =
-              PARAMS.nodeSize.meta.height(childNodeInfo.node.cardinality);
-        } else {
-          let childGroupNodeInfo =
-            <render.RenderGroupNodeInfo>childNodeInfo;
-          layoutScene(childGroupNodeInfo); // Recursively layout its subscene.
-        }
-        break;
-      case NodeType.SERIES:
-        if (childNodeInfo.expanded) {
-          _.extend(childNodeInfo, PARAMS.nodeSize.series.expanded);
-          let childGroupNodeInfo =
-            <render.RenderGroupNodeInfo>childNodeInfo;
-          layoutScene(childGroupNodeInfo); // Recursively layout its subscene.
-        } else {
-          let childGroupNodeInfo =
-            <render.RenderGroupNodeInfo>childNodeInfo;
-          let seriesParams =
-            childGroupNodeInfo.node.hasNonControlEdges ?
-              PARAMS.nodeSize.series.vertical :
-              PARAMS.nodeSize.series.horizontal;
-          _.extend(childNodeInfo, seriesParams);
-        }
-        break;
-      default:
-        throw Error('Unrecognized node type: ' + childNodeInfo.node.type);
-    }
-    // Compute total width of un-expanded nodes. Width of expanded nodes
-    // has already been computed.
-    if (!childNodeInfo.expanded) {
-      updateTotalWidthOfNode(childNodeInfo);
-    }
-    // Layout each child's annotations
-    layoutAnnotation(childNodeInfo);
-  });
-}
-
-/**
- * Calculate layout for a graph using dagre
- * @param graph the graph to be laid out
- * @param params layout parameters
- * @return width and height of the core graph
- */
-function dagreLayout(
-    graph: graphlib.Graph<render.RenderNodeInfo, render.RenderMetaedgeInfo>,
-    params): {height: number, width: number} {
-  _.extend(graph.graph(), {
-    nodesep: params.nodeSep,
-    ranksep: params.rankSep,
-    edgesep: params.edgeSep
-  });
-  let bridgeNodeNames = [];
-  let nonBridgeNodeNames = [];
-
-  // Split out nodes into bridge and non-bridge nodes, and calculate the total
-  // width we should use for bridge nodes.
-  _.each(graph.nodes(), nodeName => {
-    let nodeInfo = graph.node(nodeName);
-    if (nodeInfo.node.type === NodeType.BRIDGE) {
-      bridgeNodeNames.push(nodeName);
-    } else {
-      nonBridgeNodeNames.push(nodeName);
-    }
-  });
-
-  // If there are no non-bridge nodes, then the graph has zero size.
-  if (!nonBridgeNodeNames.length) {
-    return {
-      width: 0,
-      height: 0,
-    };
-  }
-  dagre.layout(graph);
-
-  // Calculate the true bounding box of the graph by iterating over nodes and
-  // edges rather than accepting dagre's word for it. In particular, we should
-  // ignore the extra-wide bridge nodes and bridge edges, and allow for
-  // annotation boxes and labels.
-  let minX = Infinity;
-  let minY = Infinity;
-  let maxX = -Infinity;
-  let maxY = -Infinity;
-  _.each(nonBridgeNodeNames, nodeName => {
-    let nodeInfo = graph.node(nodeName);
-    let w = 0.5 * nodeInfo.width;
-    let x1 = nodeInfo.x - w;
-    let x2 = nodeInfo.x + w;
-    minX = x1 < minX ? x1 : minX;
-    maxX = x2 > maxX ? x2 : maxX;
-    // TODO(jimbo): Account for the height of labels above op nodes here.
-    let h = 0.5 * nodeInfo.height;
-    let y1 = nodeInfo.y - h;
-    let y2 = nodeInfo.y + h;
-    minY = y1 < minY ? y1 : minY;
-    maxY = y2 > maxY ? y2 : maxY;
-  });
-  _.each(graph.edges(), edgeObj => {
-    let edgeInfo = graph.edge(edgeObj);
-    if (edgeInfo.structural) {
-      return; // Skip structural edges from min/max calculations.
-    }
-
-    // Since the node size passed to dagre includes the in and out
-    // annotations, the endpoints of the edge produced by dagre may not
-    // point to the actual node shape (rectangle, ellipse). We correct the
-    // end-points by finding the intersection of a line between the
-    // next-to-last (next-to-first) point and the destination (source)
-    // rectangle.
-    let sourceNode = graph.node(edgeInfo.metaedge.v);
-    let destNode = graph.node(edgeInfo.metaedge.w);
-
-    // Straight 3-points edges are special case, since they are curved after
-    // our default correction. To keep them straight, we remove the mid point
-    // and correct the first and the last point to be the center of the
-    // source and destination node respectively.
-    if (edgeInfo.points.length === 3 && isStraightLine(edgeInfo.points)) {
-      if (sourceNode != null) {
-        let cxSource = sourceNode.expanded ?
-            sourceNode.x : computeCXPositionOfNodeShape(sourceNode);
-        edgeInfo.points[0].x = cxSource;
-      }
-      if (destNode != null) {
-        let cxDest = destNode.expanded ?
-            destNode.x : computeCXPositionOfNodeShape(destNode);
-        edgeInfo.points[2].x = cxDest;
-      }
-      // Remove the middle point so the edge doesn't curve.
-      edgeInfo.points = [edgeInfo.points[0], edgeInfo.points[1]];
-    }
-    // Correct the destination endpoint of the edge.
-    let nextToLastPoint = edgeInfo.points[edgeInfo.points.length - 2];
-    // The destination node might be null if this is a bridge edge.
-    if (destNode != null) {
-      edgeInfo.points[edgeInfo.points.length - 1] =
-          intersectPointAndNode(nextToLastPoint, destNode);
-    }
-    // Correct the source endpoint of the edge.
-    let secondPoint = edgeInfo.points[1];
-    // The source might be null if this is a bridge edge.
-    if (sourceNode != null) {
-      edgeInfo.points[0] = intersectPointAndNode(secondPoint, sourceNode);
-    }
-
-    _.each(edgeInfo.points, (point: render.Point) => {
-        minX = point.x < minX ? point.x : minX;
-        maxX = point.x > maxX ? point.x : maxX;
-        minY = point.y < minY ? point.y : minY;
-        maxY = point.y > maxY ? point.y : maxY;
-      });
-  });
-
-  // Shift all nodes and edge points to account for the left-padding amount,
-  // and the invisible bridge nodes.
-  _.each(graph.nodes(), nodeName => {
-    let nodeInfo = graph.node(nodeName);
-    nodeInfo.x -= minX;
-    nodeInfo.y -= minY;
-  });
-  _.each(graph.edges(), edgeObj => {
-    _.each(graph.edge(edgeObj).points, (point: render.Point) => {
-        point.x -= minX;
-        point.y -= minY;
-      });
-  });
-
-  return {
-    width: maxX - minX,
-    height: maxY - minY
-  };
-}
-
-/** Layout a metanode. Only called for an expanded node. */
-function layoutMetanode(renderNodeInfo: render.RenderGroupNodeInfo): void {
-  // First, copy params specific to meta nodes onto this render info object.
-  let params = PARAMS.subscene.meta;
-  _.extend(renderNodeInfo, params);
-  // Invoke dagre.layout() on the core graph and record the bounding box
-  // dimensions.
-  _.extend(renderNodeInfo.coreBox,
-      dagreLayout(renderNodeInfo.coreGraph, PARAMS.graph.meta));
-
-  // Calculate the position of nodes in isolatedInExtract relative to the
-  // top-left corner of inExtractBox (the bounding box for all inExtract nodes)
-  // and calculate the size of the inExtractBox.
-  let maxInExtractWidth = _.max(renderNodeInfo.isolatedInExtract,
-      renderNode => renderNode.width).width;
-  renderNodeInfo.inExtractBox.width = maxInExtractWidth != null ?
-      maxInExtractWidth : 0;
-
-  renderNodeInfo.inExtractBox.height =
-    _.reduce(renderNodeInfo.isolatedInExtract, (height, child, i) => {
-      let yOffset = i > 0 ? params.extractYOffset : 0;
-      // use width/height here to avoid overlaps between extracts
-      child.x = 0;
-      child.y = height + yOffset + child.height / 2;
-      return height + yOffset + child.height;
-    }, 0);
-
-  // Calculate the position of nodes in isolatedOutExtract relative to the
-  // top-left corner of outExtractBox (the bounding box for all outExtract
-  // nodes) and calculate the size of the outExtractBox.
-  let maxOutExtractWidth = _.max(renderNodeInfo.isolatedOutExtract,
-      renderNode => renderNode.width).width;
-  renderNodeInfo.outExtractBox.width = maxOutExtractWidth != null ?
-      maxOutExtractWidth : 0;
-
-  renderNodeInfo.outExtractBox.height =
-    _.reduce(renderNodeInfo.isolatedOutExtract, (height, child, i) => {
-      let yOffset = i > 0 ? params.extractYOffset : 0;
-      // use width/height here to avoid overlaps between extracts
-      child.x = 0;
-      child.y = height + yOffset + child.height / 2;
-      return height + yOffset + child.height;
-    }, 0);
-
-  // Compute the total padding between the core graph, in-extract and
-  // out-extract boxes.
-  let numParts = 0;
-  if (renderNodeInfo.isolatedInExtract.length > 0) {
-    numParts++;
-  }
-  if (renderNodeInfo.isolatedOutExtract.length > 0) {
-    numParts++;
-  }
-  if (renderNodeInfo.coreGraph.nodeCount() > 0) {
-    numParts++;
-  }
-  let offset = PARAMS.subscene.meta.extractXOffset;
-  let padding = numParts <= 1 ? 0 : (numParts  <= 2 ? offset : 2 * offset);
-
-  // Add the in-extract and out-extract width to the core box width.
-  renderNodeInfo.coreBox.width += renderNodeInfo.inExtractBox.width +
-      renderNodeInfo.outExtractBox.width + padding;
-  renderNodeInfo.coreBox.height =
-    params.labelHeight +
-    Math.max(
-      renderNodeInfo.inExtractBox.height,
-      renderNodeInfo.coreBox.height,
-      renderNodeInfo.outExtractBox.height
-  );
-  // Determine the whole metanode's width (from left to right).
-  renderNodeInfo.width = renderNodeInfo.coreBox.width +
-      params.paddingLeft + params.paddingRight;
-
-  // Determine the whole metanode's height (from top to bottom).
-  renderNodeInfo.height =
-      renderNodeInfo.paddingTop +
-      renderNodeInfo.coreBox.height +
-      renderNodeInfo.paddingBottom;
-}
-
-/**
- * Calculate layout for series node's core graph. Only called for an expanded
- * series.
- */
-function layoutSeriesNode(node: render.RenderGroupNodeInfo): void {
-  let graph = node.coreGraph;
-
-  let params = PARAMS.subscene.series;
-  _.extend(node, params);
-
-  // Layout the core.
-  _.extend(node.coreBox, dagreLayout(node.coreGraph, PARAMS.graph.series));
-
-  _.each(graph.nodes(), nodeName => {
-    graph.node(nodeName).excluded = false;
-  });
-
-  // Series do not have in/outExtractBox so no need to include them here.
-  node.width = node.coreBox.width + params.paddingLeft + params.paddingRight;
-  node.height = node.coreBox.height + params.paddingTop + params.paddingBottom;
-}
-
-/**
- * Calculate layout for annotations of a given node.
- * This will modify positions of the given node and its annotations.
- *
- * @see tf.graph.render.Node and tf.graph.render.Annotation
- * for description of each property of each render node.
- *
- */
-function layoutAnnotation(renderNodeInfo: render.RenderNodeInfo): void {
-  // If the render node is an expanded metanode, then its annotations will not
-  // be visible and we should skip the annotation calculations.
-  if (renderNodeInfo.expanded) {
-    return;
-  }
-
-  let inAnnotations = renderNodeInfo.inAnnotations.list;
-  let outAnnotations = renderNodeInfo.outAnnotations.list;
-
-  // Calculate size for in-annotations
-  _.each(inAnnotations, a => sizeAnnotation(a));
-
-  // Calculate size for out-annotations
-  _.each(outAnnotations, a => sizeAnnotation(a));
-
-  let params = PARAMS.annotations;
-
-  // Calculate annotation node position (a.dx, a.dy)
-  // and total height for in-annotations
-  // After this chunk of code:
-  // inboxHeight = sum of annotation heights+ (annotation.length - 1 * yOffset)
-  let inboxHeight = _.reduce(inAnnotations,
-      (height, a, i) => {
-        let yOffset = i > 0 ? params.yOffset : 0;
-        a.dx = -(renderNodeInfo.coreBox.width + a.width) / 2 - params.xOffset;
-        a.dy = height + yOffset + a.height / 2;
-        return height + yOffset + a.height;
-      }, 0);
-
-  _.each(inAnnotations, a => {
-    a.dy -= inboxHeight / 2;
-
-    a.labelOffset = params.labelOffset;
-  });
-
-  // Calculate annotation node position (a.dx, a.dy)
-  // and total height for out-annotations
-  // After this chunk of code:
-  // outboxHeight = sum of annotation heights +
-  //                (annotation.length - 1 * yOffset)
-  let outboxHeight = _.reduce(outAnnotations,
-      (height, a, i) => {
-        let yOffset = i > 0 ? params.yOffset : 0;
-        a.dx = (renderNodeInfo.coreBox.width + a.width) / 2 + params.xOffset;
-        a.dy = height + yOffset + a.height / 2;
-        return height + yOffset + a.height;
-      }, 0);
-
-  _.each(outAnnotations, a => {
-    // adjust by (half of ) the total height
-    // so dy is relative to the host node's center.
-    a.dy -= outboxHeight / 2;
-
-    a.labelOffset = params.labelOffset;
-  });
-
-  // Creating scales for touch point between the in-annotation edges
-  // and their hosts.
-
-  let inTouchHeight =
-      Math.min(renderNodeInfo.height / 2 - renderNodeInfo.radius,
-          inboxHeight / 2);
-  inTouchHeight = inTouchHeight < 0 ? 0 : inTouchHeight;
-
-  let inY = d3.scale.linear()
-    .domain([0, inAnnotations.length - 1])
-    .range([-inTouchHeight, inTouchHeight]);
-
-  // Calculate annotation edge position
-  _.each(inAnnotations, (a, i) => {
-    a.points = [
-      // The annotation node end
-      {
-        dx: a.dx + a.width / 2,
-        dy: a.dy
-      },
-
-      // The host node end
-      {
-        dx: - renderNodeInfo.coreBox.width / 2,
-        // only use scale if there are more than one,
-        // otherwise center it vertically
-        dy: inAnnotations.length > 1 ? inY(i) : 0
-      }
-    ];
-  });
-
-  // Creating scales for touch point between the out-annotation edges
-  // and their hosts.
-  let outTouchHeight =
-      Math.min(renderNodeInfo.height / 2 - renderNodeInfo.radius,
-          outboxHeight / 2);
-  outTouchHeight = outTouchHeight < 0 ? 0 : outTouchHeight;
-  let outY = d3.scale.linear()
-    .domain([0, outAnnotations.length - 1])
-    .range([-outTouchHeight, outTouchHeight]);
-
-  _.each(outAnnotations, (a, i) => {
-    // Add point from the border of the annotation node
-    a.points = [
-      // The host node end
-      {
-        dx: renderNodeInfo.coreBox.width / 2,
-        // only use scale if there are more than one,
-        // otherwise center it vertically
-        dy: outAnnotations.length > 1 ? outY(i) : 0
-      },
-      // The annotation node end
-      {
-        dx: a.dx - a.width / 2,
-        dy: a.dy
-      }
-    ];
-  });
-
-  renderNodeInfo.height =
-      Math.max(renderNodeInfo.height, inboxHeight, outboxHeight);
-}
-
-/**
- * Set size of an annotation node.
- */
-function sizeAnnotation(a: render.Annotation): void {
-  switch (a.annotationType) {
-    case render.AnnotationType.CONSTANT:
-      _.extend(a, PARAMS.constant.size);
-      break;
-    case render.AnnotationType.SHORTCUT:
-      if (a.node.type === NodeType.OP) {
-        _.extend(a, PARAMS.shortcutSize.op);
-      } else if (a.node.type === NodeType.META) {
-        _.extend(a, PARAMS.shortcutSize.meta);
-      } else if (a.node.type === NodeType.SERIES) {
-        _.extend(a, PARAMS.shortcutSize.series);
-      } else {
-        throw Error('Invalid node type: ' + a.node.type);
-      }
-      break;
-    case render.AnnotationType.SUMMARY:
-      _.extend(a, PARAMS.constant.size);
-      break;
-  }
-}
-
-/**
- * Determines the center position of the node's shape. The position depends
- * on if the node has in and out-annotations.
- */
-export function computeCXPositionOfNodeShape(renderInfo: render.RenderNodeInfo):
-    number {
-  if (renderInfo.expanded) {
-    return renderInfo.x;
-  }
-  let dx = renderInfo.inAnnotations.list.length ? renderInfo.inboxWidth : 0;
-  return renderInfo.x - renderInfo.width / 2 + dx +
-      renderInfo.coreBox.width / 2;
-}
-
-/** Returns the angle (in degrees) between two points. */
-function angleBetweenTwoPoints(a: render.Point, b: render.Point): number {
-  let dx = b.x - a.x;
-  let dy = b.y - a.y;
-  return 180 * Math.atan(dy / dx) / Math.PI;
-}
-
-/**
- * Returns if a line going through the specified points is a straight line.
- */
-function isStraightLine(points: render.Point[]) {
-  let angle = angleBetweenTwoPoints(points[0], points[1]);
-  for (let i = 1; i < points.length - 1; i++) {
-    let newAngle = angleBetweenTwoPoints(points[i], points[i + 1]);
-    // Have a tolerance of 1 degree.
-    if (Math.abs(newAngle - angle) > 1) {
-      return false;
-    }
-    angle = newAngle;
-  }
-  return true;
-}
-
-/**
- * Returns the intersection of a line between the provided point
- * and the provided rectangle.
- */
-function intersectPointAndNode(
-    point: render.Point, node: render.RenderNodeInfo): render.Point {
-  // cx and cy are the center of the rectangle.
-  let cx = node.expanded ?
-     node.x : computeCXPositionOfNodeShape(node);
-  let cy = node.y;
-  // Calculate the slope
-  let dx = point.x - cx;
-  let dy = point.y - cy;
-  let w = node.expanded ? node.width : node.coreBox.width;
-  let h = node.expanded ? node.height : node.coreBox.height;
-  let deltaX, deltaY;
-  if (Math.abs(dy) * w / 2  > Math.abs(dx) * h / 2) {
-    // The intersection is above or below the rectangle.
-    if (dy < 0) {
-      h = -h;
-    }
-    deltaX = dy === 0 ? 0 : h / 2 * dx / dy;
-    deltaY = h / 2;
-  } else {
-    // The intersection is left or right of the rectangle.
-    if (dx < 0) {
-      w = -w;
-    }
-    deltaX = w / 2;
-    deltaY = dx === 0 ? 0 : w / 2 * dy / dx;
-  }
-  return {x: cx + deltaX, y: cy + deltaY};
-}
-
-} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common/minimap.ts b/tensorflow/tensorboard/components/tf_graph_common/minimap.ts
deleted file mode 100644
index 769984feb4..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/minimap.ts
+++ /dev/null
@@ -1,328 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.scene {
-
-/** Show minimap when the viewpoint area is less than X% of the whole area. */
-const FRAC_VIEWPOINT_AREA: number = 0.8;
-
-export class Minimap {
-  /** The minimap container. */
-  private minimap: HTMLElement;
-  /** The canvas used for drawing the mini version of the svg. */
-  private canvas: HTMLCanvasElement;
-  /** A buffer canvas used for temporary drawing to avoid flickering. */
-  private canvasBuffer: HTMLCanvasElement;
-  private download: HTMLLinkElement;
-  private downloadCanvas: HTMLCanvasElement;
-
-  /** The minimap svg used for holding the viewpoint rectangle. */
-  private minimapSvg: SVGSVGElement;
-  /** The rectangle showing the current viewpoint. */
-  private viewpoint: SVGRectElement;
-  /**
-   * The scale factor for the minimap. The factor is determined automatically
-   * so that the minimap doesn't violate the maximum width/height specified
-   * in the constructor. The minimap maintains the same aspect ratio as the
-   * original svg.
-   */
-  private scaleMinimap: number;
-  /** The main svg element. */
-  private svg: SVGSVGElement;
-  /** The svg group used for panning and zooming the main svg. */
-  private zoomG: SVGGElement;
-  /** The zoom behavior of the main svg. */
-  private mainZoom: d3.behavior.Zoom<any>;
-  /** The maximum width and height for the minimap. */
-  private maxWandH: number;
-  /** The last translation vector used in the main svg. */
-  private translate: [number, number];
-  /** The last scaling factor used in the main svg. */
-  private scaleMain: number;
-  /** The coordinates of the viewpoint rectangle. */
-  private viewpointCoord: {x: number, y: number};
-  /** The current size of the minimap */
-  private minimapSize: {width: number, height: number};
-  /** Padding (px) due to the main labels of the graph. */
-  private labelPadding: number;
-  /**
-   * Constructs a new minimap.
-   *
-   * @param svg The main svg element.
-   * @param zoomG The svg group used for panning and zooming the main svg.
-   * @param mainZoom The main zoom behavior.
-   * @param minimap The minimap container.
-   * @param maxWandH The maximum width/height for the minimap.
-   * @param labelPadding Padding in pixels due to the main graph labels.
-   */
-  constructor(svg: SVGSVGElement, zoomG: SVGGElement,
-      mainZoom: d3.behavior.Zoom<any>, minimap: HTMLElement,
-      maxWandH: number, labelPadding: number) {
-    this.svg = svg;
-    this.labelPadding = labelPadding;
-    this.zoomG = zoomG;
-    this.mainZoom = mainZoom;
-    this.maxWandH = maxWandH;
-    let $minimap = d3.select(minimap);
-    // The minimap will have 2 main components: the canvas showing the content
-    // and an svg showing a rectangle of the currently zoomed/panned viewpoint.
-    let $minimapSvg = $minimap.select('svg');
-
-    // Make the viewpoint rectangle draggable.
-    let $viewpoint = $minimapSvg.select('rect');
-    let dragmove = (d) => {
-      this.viewpointCoord.x = (<DragEvent>d3.event).x;
-      this.viewpointCoord.y = (<DragEvent>d3.event).y;
-      this.updateViewpoint();
-    };
-    this.viewpointCoord = {x: 0, y: 0};
-    let drag = d3.behavior.drag().origin(Object).on('drag', dragmove);
-    $viewpoint.datum(this.viewpointCoord).call(drag);
-
-    // Make the minimap clickable.
-    $minimapSvg.on('click', () => {
-      if ((<Event>d3.event).defaultPrevented) {
-        // This click was part of a drag event, so suppress it.
-        return;
-      }
-      // Update the coordinates of the viewpoint.
-      let width = Number($viewpoint.attr('width'));
-      let height = Number($viewpoint.attr('height'));
-      let clickCoords = d3.mouse($minimapSvg.node());
-      this.viewpointCoord.x = clickCoords[0] - width / 2;
-      this.viewpointCoord.y = clickCoords[1] - height / 2;
-      this.updateViewpoint();
-    });
-    this.viewpoint = <SVGRectElement>$viewpoint.node();
-    this.minimapSvg = <SVGSVGElement>$minimapSvg.node();
-    this.minimap = minimap;
-    this.canvas = <HTMLCanvasElement>$minimap.select('canvas.first').node();
-    this.canvasBuffer =
-        <HTMLCanvasElement>$minimap.select('canvas.second').node();
-    this.downloadCanvas =
-        <HTMLCanvasElement>$minimap.select('canvas.download').node();
-    d3.select(this.downloadCanvas).style('display', 'none');
-    this.update();
-  }
-
-  /**
-   * Updates the position and the size of the viewpoint rectangle.
-   * It also notifies the main svg about the new panned position.
-   */
-  private updateViewpoint(): void {
-    // Update the coordinates of the viewpoint rectangle.
-    d3.select(this.viewpoint)
-        .attr('x', this.viewpointCoord.x)
-        .attr('y', this.viewpointCoord.y);
-    // Update the translation vector of the main svg to reflect the
-    // new viewpoint.
-    let mainX = - this.viewpointCoord.x * this.scaleMain / this.scaleMinimap;
-    let mainY = - this.viewpointCoord.y * this.scaleMain / this.scaleMinimap;
-    let zoomEvent = this.mainZoom.translate([mainX, mainY]).event;
-    d3.select(this.zoomG).call(zoomEvent);
-  }
-
-  /**
-   * Redraws the minimap. Should be called whenever the main svg
-   * was updated (e.g. when a node was expanded).
-   */
-  update(): void {
-    let sceneSize = null;
-    try {
-      // Get the size of the entire scene.
-      sceneSize = this.zoomG.getBBox();
-      if (sceneSize.width === 0) {
-        // There is no scene anymore. We have been detached from the dom.
-        return;
-      }
-    } catch (e) {
-      // Firefox produced NS_ERROR_FAILURE if we have been
-      // detached from the dom.
-      return;
-    }
-    let $download = d3.select('#graphdownload');
-    this.download = <HTMLLinkElement>$download.node();
-    $download.on('click', d => {
-      this.download.href = this.downloadCanvas.toDataURL('image/png');
-    });
-
-    let $svg = d3.select(this.svg);
-    // Read all the style rules in the document and embed them into the svg.
-    // The svg needs to be self contained, i.e. all the style rules need to be
-    // embedded so the canvas output matches the origin.
-    let stylesText = '';
-    for (let k = 0; k < document.styleSheets.length; k++) {
-      try {
-        let cssRules = (<any>document.styleSheets[k]).cssRules ||
-          (<any>document.styleSheets[k]).rules;
-        if (cssRules == null) {
-          continue;
-        }
-        for (let i = 0; i < cssRules.length; i++) {
-          // Remove tf-* selectors from the styles.
-          stylesText +=
-              cssRules[i].cssText.replace(/ ?tf-[\w-]+ ?/g, '') + '\n';
-        }
-      } catch (e) {
-        if (e.name !== 'SecurityError') {
-          throw e;
-        }
-      }
-    }
-
-    // Temporarily add the css rules to the main svg.
-    let svgStyle = $svg.append('style');
-    svgStyle.text(stylesText);
-
-    // Temporarily remove the zoom/pan transform from the main svg since we
-    // want the minimap to show a zoomed-out and centered view.
-    let $zoomG = d3.select(this.zoomG);
-    let zoomTransform = $zoomG.attr('transform');
-    $zoomG.attr('transform', null);
-
-    // Since we add padding, account for that here.
-    sceneSize.height += this.labelPadding * 2;
-    sceneSize.width += this.labelPadding * 2;
-
-    // Temporarily assign an explicit width/height to the main svg, since
-    // it doesn't have one (uses flex-box), but we need it for the canvas
-    // to work.
-    $svg.attr({
-      width: sceneSize.width,
-      height: sceneSize.height,
-    });
-
-    // Since the content inside the svg changed (e.g. a node was expanded),
-    // the aspect ratio have also changed. Thus, we need to update the scale
-    // factor of the minimap. The scale factor is determined such that both
-    // the width and height of the minimap are <= maximum specified w/h.
-    this.scaleMinimap =
-        this.maxWandH / Math.max(sceneSize.width, sceneSize.height);
-
-    this.minimapSize = {
-      width: sceneSize.width * this.scaleMinimap,
-      height: sceneSize.height * this.scaleMinimap
-    };
-
-    // Update the size of the minimap's svg, the buffer canvas and the
-    // viewpoint rect.
-    d3.select(this.minimapSvg).attr(<any>this.minimapSize);
-    d3.select(this.canvasBuffer).attr(<any>this.minimapSize);
-
-    // Download canvas width and height are multiples of the style width and
-    // height in order to increase pixel density of the PNG for clarity.
-    d3.select(this.downloadCanvas).style(
-      <any>{ width: sceneSize.width, height: sceneSize.height });
-    d3.select(this.downloadCanvas).attr(
-      <any>{ width: sceneSize.width * 3, height: sceneSize.height * 3 });
-
-    if (this.translate != null && this.zoom != null) {
-      // Update the viewpoint rectangle shape since the aspect ratio of the
-      // map has changed.
-      requestAnimationFrame(() => this.zoom());
-    }
-
-    // Serialize the main svg to a string which will be used as the rendering
-    // content for the canvas.
-    let svgXml = (new XMLSerializer()).serializeToString(this.svg);
-
-    // Now that the svg is serialized for rendering, remove the temporarily
-    // assigned styles, explicit width and height and bring back the pan/zoom
-    // transform.
-    svgStyle.remove();
-    $svg.attr({
-      width: null,
-      height: null
-    });
-    $zoomG.attr('transform', zoomTransform);
-    let image = new Image();
-    image.onload = () => {
-      // Draw the svg content onto the buffer canvas.
-      let context = this.canvasBuffer.getContext('2d');
-      context.clearRect(0, 0, this.canvasBuffer.width,
-          this.canvasBuffer.height);
-      context.drawImage(image, 0, 0,
-        this.minimapSize.width, this.minimapSize.height);
-      requestAnimationFrame(() => {
-        // Hide the old canvas and show the new buffer canvas.
-        d3.select(this.canvasBuffer).style('display', null);
-        d3.select(this.canvas).style('display', 'none');
-        // Swap the two canvases.
-        [this.canvas, this.canvasBuffer] = [this.canvasBuffer, this.canvas];
-      });
-      let downloadContext = this.downloadCanvas.getContext('2d');
-      downloadContext.clearRect(0, 0, this.downloadCanvas.width,
-        this.downloadCanvas.height);
-      downloadContext.drawImage(image, 0, 0,
-        this.downloadCanvas.width, this.downloadCanvas.height);
-    };
-    image.onerror = () => {
-      let blob = new Blob([svgXml], {type: 'image/svg+xml;charset=utf-8'});
-      image.src = URL.createObjectURL(blob);
-    };
-    image.src =
-        'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svgXml);
-  }
-
-  /**
-   * Handles changes in zooming/panning. Should be called from the main svg
-   * to notify that a zoom/pan was performed and this minimap will update it's
-   * viewpoint rectangle.
-   *
-   * @param translate The translate vector, or none to use the last used one.
-   * @param scale The scaling factor, or none to use the last used one.
-   */
-  zoom(translate?: [number, number], scale?: number): void {
-    if (this.scaleMinimap == null) {
-      // Scene is not ready yet.
-      return;
-    }
-    // Update the new translate and scale params, only if specified.
-    this.translate = translate || this.translate;
-    this.scaleMain = scale || this.scaleMain;
-    // Update the location of the viewpoint rectangle.
-    let svgRect = this.svg.getBoundingClientRect();
-    let $viewpoint = d3.select(this.viewpoint);
-    this.viewpointCoord.x = -this.translate[0] * this.scaleMinimap /
-        this.scaleMain;
-    this.viewpointCoord.y = -this.translate[1] * this.scaleMinimap /
-        this.scaleMain;
-    let viewpointWidth = svgRect.width * this.scaleMinimap / this.scaleMain;
-    let viewpointHeight = svgRect.height * this.scaleMinimap / this.scaleMain;
-    $viewpoint.attr({
-      x: this.viewpointCoord.x,
-      y: this.viewpointCoord.y,
-      width: viewpointWidth,
-      height: viewpointHeight
-    });
-    // Show/hide the minimap depending on the viewpoint area as fraction of the
-    // whole minimap.
-    let mapWidth = this.minimapSize.width;
-    let mapHeight = this.minimapSize.height;
-    let x = this.viewpointCoord.x;
-    let y = this.viewpointCoord.y;
-    let w = Math.min(Math.max(0, x + viewpointWidth), mapWidth) -
-        Math.min(Math.max(0, x), mapWidth);
-    let h = Math.min(Math.max(0, y + viewpointHeight), mapHeight) -
-        Math.min(Math.max(0, y), mapHeight);
-    let fracIntersect = (w * h) / (mapWidth * mapHeight);
-    if (fracIntersect < FRAC_VIEWPOINT_AREA) {
-      this.minimap.classList.remove('hidden');
-    } else {
-      this.minimap.classList.add('hidden');
-    }
-  }
-}
-
-} // close module tf.scene
diff --git a/tensorflow/tensorboard/components/tf_graph_common/node.ts b/tensorflow/tensorboard/components/tf_graph_common/node.ts
deleted file mode 100644
index e319424310..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/node.ts
+++ /dev/null
@@ -1,1079 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph.scene.node {
-  import RenderNodeInfo = tf.graph.render.RenderNodeInfo;
-  /**
-   * Select or Create a 'g.nodes' group to a given sceneGroup
-   * and builds a number of 'g.node' groups inside the group.
-   *
-   * Structure Pattern:
-   *
-   * <g class='nodes'>
-   *   <g class='node'>
-   *     <g class='in-annotations'>
-   *       ...
-   *     </g>
-   *     <g class='out-annotations'>
-   *       ...
-   *     </g>
-   *     <g class='nodeshape'>
-   *      <!--
-   *      Content of the node shape should be for the node itself. For example a
-   *      Metanode would have a <rect> with rounded edges, an op would have an
-   *      <ellipse>. More complex nodes like series may contain multiple
-   *      elements which are conditionally visible based on whether the node is
-   *      expanded.
-   *      -->
-   *     </g>
-   *     <text class='label'>node name</text>
-   *     <g class='subscene'>
-   *       <!--
-   *       Content of  the subscene (only for metanode and series node).
-   *
-   *       Subscene is a svg group that contains content of the
-   *       metanode's metagraph that is recursively generated by Scene.build().
-   *
-   *       When the graph is expanded multiple times, a subscene can contain
-   *       nested subscenes inside.
-   *       -->
-   *     </g>
-   *   </g>
-   *   ...
-   * </g>
-   *
-   *
-   * @param sceneGroup selection of the container
-   * @param nodeData array of render node information to map
-   * @param sceneElement <tf-graph-scene> polymer element
-   * @return selection of the created nodeGroups
-   */
-  export function buildGroup(
-      sceneGroup, nodeData: render.RenderNodeInfo[], sceneElement) {
-    let container =
-        scene.selectOrCreateChild(sceneGroup, 'g', Class.Node.CONTAINER);
-    // Select all children and join with data.
-    // (Note that all children of g.nodes are g.node)
-    let nodeGroups =
-        container
-            .selectAll(function() {
-              // using d3's selector function
-              // See https://github.com/mbostock/d3/releases/tag/v2.0.0
-              // (It's not listed in the d3 wiki.)
-              return this.childNodes;  // this here refers to container.node()
-            })
-            .data(nodeData, (d) => {
-              // make sure that we don't have to swap shape type
-              return d.node.name + ':' + d.node.type;
-            });
-
-    // ENTER
-    nodeGroups.enter()
-        .append('g')
-        .attr('data-name', d => { return d.node.name; })
-        .each(function(d) {
-          let nodeGroup = d3.select(this);
-          // index node group for quick stylizing
-          sceneElement.addNodeGroup(d.node.name, nodeGroup);
-        });
-
-    // UPDATE
-    nodeGroups
-        .attr('class', d => { return Class.Node.GROUP + ' ' + nodeClass(d); })
-        .each(function(d) {
-          let nodeGroup = d3.select(this);
-          // Add g.in-annotations (always add -- to keep layer order
-          // consistent.)
-          let inAnnotationBox =
-              scene.selectOrCreateChild(nodeGroup, 'g', Class.Annotation.INBOX);
-          annotation.buildGroup(
-              inAnnotationBox, d.inAnnotations, d, sceneElement);
-
-          // Add g.out-annotations  (always add -- to keep layer order
-          // consistent.)
-          let outAnnotationBox = scene.selectOrCreateChild(
-              nodeGroup, 'g', Class.Annotation.OUTBOX);
-          annotation.buildGroup(
-              outAnnotationBox, d.outAnnotations, d, sceneElement);
-
-          // Build .shape first (background of the node).
-          let shape = buildShape(nodeGroup, d, Class.Node.SHAPE);
-          if (d.node.isGroupNode) {
-            addButton(shape, d, sceneElement);
-          }
-          addInteraction(shape, d, sceneElement);
-
-          // Build subscene on the top.
-          subsceneBuild(nodeGroup, <render.RenderGroupNodeInfo>d, sceneElement);
-
-          // Build label last. Should be on top of everything else.
-          let label = labelBuild(nodeGroup, d, sceneElement);
-          // Do not add interaction to metanode labels as they live inside the
-          // metanode shape which already has the same interactions.
-          addInteraction(label, d, sceneElement, d.node.type === NodeType.META);
-
-          stylize(nodeGroup, d, sceneElement);
-          position(nodeGroup, d);
-        });
-
-    // EXIT
-    nodeGroups.exit()
-        .each(function(d) {
-          // remove all indices on remove
-          sceneElement.removeNodeGroup(d.node.name);
-
-          let nodeGroup = d3.select(this);
-          if (d.inAnnotations.list.length > 0) {
-            nodeGroup.select('.' + Class.Annotation.INBOX)
-                .selectAll('.' + Class.Annotation.GROUP)
-                .each(a => { sceneElement.removeAnnotationGroup(a, d); });
-          }
-          if (d.outAnnotations.list.length > 0) {
-            nodeGroup.select('.' + Class.Annotation.OUTBOX)
-                .selectAll('.' + Class.Annotation.GROUP)
-                .each(a => { sceneElement.removeAnnotationGroup(a, d); });
-          }
-        })
-        .remove();
-    return nodeGroups;
-};
-
-/**
- * Update or remove the subscene of a render group node depending on whether it
- * is a expanded. If the node is not a group node, this method has no effect.
- *
- * @param nodeGroup selection of the container
- * @param renderNodeInfo the render information for the node.
- * @param sceneElement <tf-graph-scene> polymer element.
- * @return Selection of the subscene group, or null if node group does not have
- *        a subscene. Op nodes, bridge nodes and unexpanded group nodes will
- *        not have a subscene.
- */
-function subsceneBuild(nodeGroup,
-    renderNodeInfo: render.RenderGroupNodeInfo, sceneElement) {
-  if (renderNodeInfo.node.isGroupNode) {
-    if (renderNodeInfo.expanded) {
-      // Recursively build the subscene.
-      return scene.buildGroup(nodeGroup, renderNodeInfo, sceneElement,
-        Class.Subscene.GROUP);
-    }
-    // Clean out existing subscene if the node is not expanded.
-    scene.selectChild(nodeGroup, 'g', Class.Subscene.GROUP).remove();
-  }
-  return null;
-};
-
-/**
- * Translate the subscene of the given node group
- */
-function subscenePosition(nodeGroup, d: render.RenderNodeInfo) {
-  let x0 = d.x - d.width / 2.0 + d.paddingLeft;
-  let y0 = d.y - d.height / 2.0 + d.paddingTop;
-
-  let subscene = scene.selectChild(nodeGroup, 'g', Class.Subscene.GROUP);
-  scene.translate(subscene, x0, y0);
-};
-
-/**
- * Add an expand/collapse button to a group node
- *
- * @param selection The group node selection.
- * @param d Info about the node being rendered.
- * @param sceneElement <tf-graph-scene> polymer element.
- */
-function addButton(selection, d: render.RenderNodeInfo, sceneElement) {
-  let group =
-      scene.selectOrCreateChild(selection, 'g', Class.Node.BUTTON_CONTAINER);
-  scene.selectOrCreateChild(group, 'circle', Class.Node.BUTTON_CIRCLE);
-  scene.selectOrCreateChild(group, 'path', Class.Node.EXPAND_BUTTON)
-      .attr('d', 'M0,-2.2 V2.2 M-2.2,0 H2.2');
-  scene.selectOrCreateChild(group, 'path', Class.Node.COLLAPSE_BUTTON)
-      .attr('d', 'M-2.2,0 H2.2');
-  group.on('click', d => {
-    // Stop this event's propagation so that it isn't also considered a
-    // node-select.
-    (<Event>d3.event).stopPropagation();
-    sceneElement.fire('node-toggle-expand', {name: d.node.name});
-  });
-  scene.positionButton(group, d);
-};
-
-/**
- * Fire node-* events when the selection is interacted.
- *
- * @param disableInteraction When true, have the provided selection
- * ignore all pointer events. Used for text labels inside of metanodes, which
- * don't need interaction as their surrounding shape has interaction, and if
- * given interaction would cause conflicts with the expand/collapse button.
- */
-function addInteraction(selection, d: render.RenderNodeInfo,
-    sceneElement, disableInteraction?: boolean) {
-  if (disableInteraction) {
-    selection.attr('pointer-events', 'none');
-    return;
-  }
-
-  let contextMenuFunction = contextmenu.getMenu(
-    getContextMenu(d.node, sceneElement));
-  selection
-      .on('dblclick',
-          d => {
-            sceneElement.fire('node-toggle-expand', {name: d.node.name});
-          })
-      .on('mouseover',
-          d => {
-            // don't send mouseover over expanded group,
-            // otherwise it is causing too much glitches
-            if (sceneElement.isNodeExpanded(d)) {
-              return;
-            }
-
-            sceneElement.fire('node-highlight', {name: d.node.name});
-          })
-      .on('mouseout',
-          d => {
-            // don't send mouseover over expanded group,
-            // otherwise it is causing too much glitches
-            if (sceneElement.isNodeExpanded(d)) {
-              return;
-            }
-
-            sceneElement.fire('node-unhighlight', {name: d.node.name});
-          })
-      .on('click',
-          d => {
-            // Stop this event's propagation so that it isn't also considered
-            // a graph-select.
-            (<Event>d3.event).stopPropagation();
-            sceneElement.fire('node-select', {name: d.node.name});
-          })
-      .on('contextmenu', (d, i) => {
-        sceneElement.fire('node-select', {name: d.node.name});
-        contextMenuFunction.call(d, i);
-      });
-};
-
-/**
- * Returns the d3 context menu specification for the provided node.
- */
-export function getContextMenu(node: Node, sceneElement) {
-  let menu = [{
-    title: (d): string => {
-      return getIncludeNodeButtonString(node.include);
-    },
-    action: (elm, d, i) => {
-      sceneElement.fire('node-toggle-extract', {name: node.name});
-    }
-  }];
-  if (canBeInSeries(node)) {
-    menu.push({
-      title: d => { return getGroupSettingLabel(node); },
-      action: (elm, d, i) => {
-        sceneElement.fire(
-            'node-toggle-seriesgroup', {name: getSeriesName(node)});
-      }
-    });
-  }
-  return menu;
-}
-
-/** Returns if a node can be part of a grouped series */
-export function canBeInSeries(node: Node) {
-  return getSeriesName(node) !== null;
-}
-
-/**
- * Returns the name of the possible grouped series containing this node.
- * Returns null if the node cannot be part of a grouped series of nodes.
- */
-export function getSeriesName(node: Node) {
-  if (!node) {
-    return null;
-  }
-  if (node.type === NodeType.SERIES) {
-    return node.name;
-  }
-  if (node.type === NodeType.OP) {
-    let op = <OpNode>node;
-    return op.owningSeries;
-  }
-  return null;
-}
-
-/**
- * Returns the SeriesNode that represents the series that the provided node
- * is contained in (or itself if the provided node is itself a SeriesNode).
- * Returns null if the node is not rendered as part of a series.
- */
-function getContainingSeries(node: Node) {
-  let s: SeriesNode = null;
-  if (!node) {
-    return null;
-  } else if (node.type === NodeType.SERIES) {
-    s = <SeriesNode>node;
-  } else if (node.parentNode && node.parentNode.type === NodeType.SERIES) {
-    s = <SeriesNode>node.parentNode;
-  }
-  return s;
-}
-
-/**
- * Returns the label for a button to toggle the group setting of the provided
- * node.
- */
-export function getGroupSettingLabel(node: Node) {
-  return tf.graph.getGroupSeriesNodeButtonString(
-    getContainingSeries(node) !== null ? tf.graph.SeriesGroupingType.GROUP :
-     tf.graph.SeriesGroupingType.UNGROUP);
-}
-
-/**
- * Append svg text for label and assign data.
- * @param nodeGroup
- * @param renderNodeInfo The render node information for the label.
- * @param sceneElement <tf-graph-scene> polymer element.
- */
-function labelBuild(nodeGroup, renderNodeInfo: render.RenderNodeInfo,
-    sceneElement) {
-  let namePath = renderNodeInfo.node.name.split('/');
-  let text = namePath[namePath.length - 1];
-
-  // Truncate long labels for unexpanded Metanodes.
-  let useFontScale = renderNodeInfo.node.type === NodeType.META &&
-    !renderNodeInfo.expanded;
-
-  let label = scene.selectOrCreateChild(nodeGroup, 'text', Class.Node.LABEL);
-
-  // Make sure the label is visually on top among its siblings.
-  let labelNode = <HTMLElement> label.node();
-  labelNode.parentNode.appendChild(labelNode);
-
-  label.attr('dy', '.35em').attr('text-anchor', 'middle');
-  if (useFontScale) {
-    if (text.length > sceneElement.maxMetanodeLabelLength) {
-      text = text.substr(0, sceneElement.maxMetanodeLabelLength - 2) + '...';
-    }
-    let scale = getLabelFontScale(sceneElement);
-    label.attr('font-size', scale(text.length) + 'px');
-  }
-
-  let txtElement = <d3.Selection<any>>label.text(text);
-  enforceLabelWidth(txtElement, renderNodeInfo.node.type, renderNodeInfo);
-  return label;
-}
-/**
- * This function shortens text which would exceed the maximum pixel width of
- * a label.
- *
- * @param txtElementSelection The text element containing the label's text as d3
- * selection.
- * @param nodeType The type of the node the label belongs to. If the node is
- * an annotation, the value is -1. Label widths are defined in
- * layout.PARAMS.nodeSize.{meta|op|...}.maxLabelWidth for nodes and
- * layout.PARAMS.annotations.labelWidth for annotations.
- * @param renderNodeInfo The render information about the node, required to
- * determine whether META nodes are collapsed or expanded.
- */
-export function enforceLabelWidth(
-    txtElementSelection: d3.Selection<any>, nodeType: NodeType | number,
-    renderNodeInfo?: render.RenderNodeInfo) {
-  // Get text element itself and its on-screen width.
-  let txtNode = <SVGTextElement>txtElementSelection.node();
-  let computedTxtLength = txtNode.getComputedTextLength();
-  let labelContent = txtNode.textContent;
-
-  // Get maximum length from settings.
-  let maxLength = null;
-  switch (nodeType) {
-    case NodeType.META:
-      if (renderNodeInfo && !renderNodeInfo.expanded) {  // Only trim text if
-        // node expanded.
-        maxLength = layout.PARAMS.nodeSize.meta.maxLabelWidth;
-      }
-      break;
-
-    case NodeType.OP:
-      maxLength = layout.PARAMS.nodeSize.op.maxLabelWidth;
-      break;
-
-    case -1:
-      maxLength = layout.PARAMS.annotations.maxLabelWidth;
-      break;
-
-    default:
-      break;
-  }
-
-  // Return if no max length provided for node type, or current label length is
-  // less than or equal to the provided length limit.
-  if (maxLength === null || computedTxtLength <= maxLength) {
-    return;
-  }
-
-  // Find the index of the character which exceeds the width.
-  // getSubStringLength performs far better than getComputedTextLength, and
-  // results in a 3x speed-up on average.
-  let index = 1;
-  while (txtNode.getSubStringLength(0, index) < maxLength) {
-    index++;
-  }
-
-  // Shorten the label starting at the string length known to be one
-  // character above max pixel length.
-  // When shortened the original label's substring is concatenated with
-  // '...', baseText contains the substring not including the '...'.
-  let baseText = <string>txtNode.textContent.substr(0, index);
-  do {
-    baseText = baseText.substr(0, baseText.length - 1);
-
-    // Recompute text length.
-    txtNode.textContent = baseText + '...';
-    computedTxtLength = txtNode.getComputedTextLength();
-  } while (computedTxtLength > maxLength && baseText.length > 0);
-
-  // Add tooltip with full name and return.
-  return txtElementSelection.append('title').text(labelContent);
-}
-
-/**
- * d3 scale used for sizing font of labels, used by labelBuild,
- * initialized once by getLabelFontScale.
- */
-let fontScale = null;
-function getLabelFontScale(sceneElement) {
-  if (!fontScale) {
-    fontScale = d3.scale.linear()
-      .domain([sceneElement.maxMetanodeLabelLengthLargeFont,
-        sceneElement.maxMetanodeLabelLength])
-      .range([sceneElement.maxMetanodeLabelLengthFontSize,
-        sceneElement.minMetanodeLabelLengthFontSize]).clamp(true);
-  }
-  return fontScale;
-}
-
-/**
- * Set label position of a given node group
- */
-function labelPosition(nodeGroup, cx: number, cy: number,
-    yOffset: number) {
-  scene.selectChild(nodeGroup, 'text', Class.Node.LABEL)
-      .transition()
-      .attr('x', cx)
-      .attr('y', cy + yOffset);
-};
-
-/**
- * Select or append/insert shape for a node and assign renderNode
- * as the shape's data.
- *
- * @param nodeGroup
- * @param d Render node information.
- * @param nodeClass class for the element.
- * @return Selection of the shape.
- */
-export function buildShape(nodeGroup, d, nodeClass: string) {
-  // Create a group to house the underlying visual elements.
-  let shapeGroup = scene.selectOrCreateChild(nodeGroup, 'g', nodeClass);
-  // TODO(jimbo): DOM structure should be templated in HTML somewhere, not JS.
-  switch (d.node.type) {
-    case NodeType.OP:
-      scene.selectOrCreateChild(shapeGroup, 'ellipse', Class.Node.COLOR_TARGET);
-      break;
-    case NodeType.SERIES:
-      // Choose the correct stamp to use to represent this series.
-      let stampType = 'annotation';
-      let groupNodeInfo = <render.RenderGroupNodeInfo>d;
-      if (groupNodeInfo.coreGraph) {
-        stampType =
-            groupNodeInfo.node.hasNonControlEdges ? 'vertical' : 'horizontal';
-      }
-      let classList = [Class.Node.COLOR_TARGET];
-      if (groupNodeInfo.isFadedOut) {
-        classList.push('faded-ellipse');
-      }
-      scene.selectOrCreateChild(shapeGroup, 'use', classList)
-          .attr('xlink:href', '#op-series-' + stampType + '-stamp');
-      scene.selectOrCreateChild(shapeGroup, 'rect', Class.Node.COLOR_TARGET)
-          .attr({rx: d.radius, ry: d.radius});
-      break;
-    case NodeType.BRIDGE:
-      scene.selectOrCreateChild(shapeGroup, 'rect', Class.Node.COLOR_TARGET)
-          .attr({rx: d.radius, ry: d.radius});
-      break;
-    case NodeType.META:
-      scene.selectOrCreateChild(shapeGroup, 'rect', Class.Node.COLOR_TARGET)
-          .attr({rx: d.radius, ry: d.radius});
-      break;
-    default:
-      throw Error('Unrecognized node type: ' + d.node.type);
-  }
-  return shapeGroup;
-};
-
-export function nodeClass(d: render.RenderNodeInfo) {
-  switch (d.node.type) {
-    case NodeType.OP:
-      return Class.OPNODE;
-    case NodeType.META:
-      return Class.METANODE;
-    case NodeType.SERIES:
-      return Class.SERIESNODE;
-    case NodeType.BRIDGE:
-      return Class.BRIDGENODE;
-    case NodeType.ELLIPSIS:
-      return Class.ELLIPSISNODE;
-  };
-  throw Error('Unrecognized node type: ' + d.node.type);
-};
-
-/** Modify node and its subscene and its label's positional attributes */
-function position(nodeGroup, d: render.RenderNodeInfo) {
-  let shapeGroup = scene.selectChild(nodeGroup, 'g', Class.Node.SHAPE);
-  let cx = layout.computeCXPositionOfNodeShape(d);
-  switch (d.node.type) {
-    case NodeType.OP: {
-      // position shape
-      let shape = scene.selectChild(shapeGroup, 'ellipse');
-      scene.positionEllipse(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
-      labelPosition(nodeGroup, cx, d.y, d.labelOffset);
-      break;
-    }
-    case NodeType.META: {
-      // position shape
-      let shape = scene.selectChild(shapeGroup, 'rect');
-      if (d.expanded) {
-        scene.positionRect(shape, d.x, d.y, d.width, d.height);
-        subscenePosition(nodeGroup, d);
-        // put label on top
-        labelPosition(nodeGroup, cx, d.y,
-          - d.height / 2 + d.labelHeight / 2);
-      } else {
-        scene.positionRect(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
-        labelPosition(nodeGroup, cx, d.y, 0);
-      }
-      break;
-    }
-    case NodeType.SERIES: {
-      let shape = scene.selectChild(shapeGroup, 'use');
-      if (d.expanded) {
-        scene.positionRect(shape, d.x, d.y, d.width, d.height);
-        subscenePosition(nodeGroup, d);
-        // put label on top
-        labelPosition(nodeGroup, cx, d.y,
-          - d.height / 2 + d.labelHeight / 2);
-      } else {
-        scene.positionRect(shape, cx, d.y, d.coreBox.width, d.coreBox.height);
-        labelPosition(nodeGroup, cx, d.y, d.labelOffset);
-      }
-      break;
-    }
-    case NodeType.BRIDGE: {
-      // position shape
-      // NOTE: In reality, these will not be visible, but it helps to put them
-      // in the correct position for debugging purposes.
-      let shape = scene.selectChild(shapeGroup, 'rect');
-      scene.positionRect(shape, d.x, d.y, d.width, d.height);
-      break;
-    }
-    default: { throw Error('Unrecognized node type: ' + d.node.type); }
-  }
-};
-
-/** Enum specifying the options to color nodes by */
-export enum ColorBy {STRUCTURE, DEVICE, XLA_CLUSTER, COMPUTE_TIME, MEMORY}
-;
-
-/**
- * Returns the fill color for the node given its state and the 'color by'
- * option.
- */
-export function getFillForNode(templateIndex, colorBy,
-    renderInfo: render.RenderNodeInfo, isExpanded: boolean): string {
-  let colorParams = render.MetanodeColors;
-  switch (colorBy) {
-    case ColorBy.STRUCTURE:
-      if (renderInfo.node.type === NodeType.META) {
-        let tid = (<Metanode>renderInfo.node).templateId;
-        return tid === null ?
-          colorParams.UNKNOWN :
-          colorParams.STRUCTURE_PALETTE(templateIndex(tid), isExpanded);
-      } else if (renderInfo.node.type === NodeType.SERIES) {
-        // If expanded, we're showing the background rect, which we want to
-        // appear gray. Otherwise we're showing a stack of ellipses which we
-        // want to show white.
-        return isExpanded ? colorParams.EXPANDED_COLOR : 'white';
-      } else if (renderInfo.node.type === NodeType.BRIDGE) {
-        return renderInfo.structural ?
-            '#f0e' :
-            (<BridgeNode>renderInfo.node).inbound ? '#0ef' : '#fe0';
-      } else {
-        // Op nodes are white.
-        return 'white';
-      }
-    case ColorBy.DEVICE:
-      if (renderInfo.deviceColors == null) {
-        // Return the hue for unknown device.
-        return colorParams.UNKNOWN;
-      }
-      let id = renderInfo.node.name;
-      let escapedId = tf.graph.util.escapeQuerySelector(id);
-      let gradientDefs = d3.select('svg#svg defs #linearGradients');
-      let linearGradient = gradientDefs.select('linearGradient#' + escapedId);
-      // If the linear gradient is not there yet, create it.
-      if (linearGradient.size() === 0) {
-        linearGradient = gradientDefs.append('linearGradient').attr('id', id);
-        // Re-create the stops of the linear gradient.
-        linearGradient.selectAll('*').remove();
-        let cumulativeProportion = 0;
-        // For each device, create a stop using the proportion of that device.
-        _.each(renderInfo.deviceColors, d => {
-          let color = d.color;
-          linearGradient.append('stop')
-              .attr('offset', cumulativeProportion)
-              .attr('stop-color', color);
-          linearGradient.append('stop')
-              .attr('offset', cumulativeProportion + d.proportion)
-              .attr('stop-color', color);
-          cumulativeProportion += d.proportion;
-        });
-      }
-      return isExpanded ? colorParams.EXPANDED_COLOR : `url(#${escapedId})`;
-    case ColorBy.XLA_CLUSTER:
-      return isExpanded ? colorParams.EXPANDED_COLOR :
-                          renderInfo.xlaClusterColor || colorParams.UNKNOWN;
-    case ColorBy.COMPUTE_TIME:
-      return isExpanded ?
-        colorParams.EXPANDED_COLOR : renderInfo.computeTimeColor ||
-        colorParams.UNKNOWN;
-    case ColorBy.MEMORY:
-      return isExpanded ?
-        colorParams.EXPANDED_COLOR : renderInfo.memoryColor ||
-        colorParams.UNKNOWN;
-    default:
-      throw new Error('Unknown case to color nodes by');
-  }
-}
-
-/**
- * Modify node style by toggling class and assign attributes (only for things
- * that can't be done in css).
- */
-export function stylize(nodeGroup, renderInfo: render.RenderNodeInfo,
-    sceneElement, nodeClass?) {
-  nodeClass = nodeClass || Class.Node.SHAPE;
-  let isHighlighted = sceneElement.isNodeHighlighted(renderInfo.node.name);
-  let isSelected = sceneElement.isNodeSelected(renderInfo.node.name);
-  let isExtract = renderInfo.isInExtract || renderInfo.isOutExtract;
-  let isExpanded = renderInfo.expanded;
-  let isFadedOut = renderInfo.isFadedOut;
-  nodeGroup.classed('highlighted', isHighlighted);
-  nodeGroup.classed('selected', isSelected);
-  nodeGroup.classed('extract', isExtract);
-  nodeGroup.classed('expanded', isExpanded);
-  nodeGroup.classed('faded', isFadedOut);
-
-  // Main node always exists here and it will be reached before subscene,
-  // so d3 selection is fine here.
-  let node = nodeGroup.select('.' + nodeClass + ' .' + Class.Node.COLOR_TARGET);
-  let fillColor = getFillForNode(sceneElement.templateIndex,
-    ColorBy[sceneElement.colorBy.toUpperCase()],
-    renderInfo, isExpanded);
-  node.style('fill', fillColor);
-
-  // Choose outline to be darker version of node color if the node is a single
-  // color and is not selected.
-  node.style('stroke', isSelected ? null : getStrokeForFill(fillColor));
-};
-
-/**
- * Given a node's fill color/gradient, determine the stroke for the node.
- */
-export function getStrokeForFill(fill: string) {
-  // If node is colored by a gradient, then use a dark gray outline.
-  return fill.substring(0, 3) === 'url' ?
-      render.MetanodeColors.GRADIENT_OUTLINE :
-      d3.rgb(fill).darker().toString();
-}
-
-/**
- * Finds selected node and highlights all nodes which are providing direct
- * or indirect input to the node and all edges connecting these nodes
- * together and to the selected node.
- *
- * @param renderGraphInfo Information on the rendered state of the graph.
- */
-export function traceInputs(renderGraphInfo: tf.graph.render.RenderGraphInfo) {
-  // Reset all styling.
-  d3.selectAll('.input-highlight').classed('input-highlight', false);
-  d3.selectAll('.non-input').classed('non-input', false);
-  d3.selectAll('.input-parent').classed('input-parent', false);
-  d3.selectAll('.input-child').classed('input-child', false);
-  d3.selectAll('.input-edge-highlight').classed('input-edge-highlight', false);
-  d3.selectAll('.non-input-edge-highlight')
-      .classed('non-input-edge-highlight', false);
-  d3.selectAll('.input-highlight-selected')
-      .classed('input-highlight-selected', false);
-
-  // Extract currently selected node. Return if input tracing disabled or no
-  // node is selected.
-  let selectedNodeSelectorString = 'g.node.selected,g.op.selected';
-  let node = d3.select(selectedNodeSelectorString);
-  let currentNode = undefined;
-  if (renderGraphInfo && renderGraphInfo.traceInputs && node && node[0] &&
-      node[0][0]) {
-    currentNode = node[0][0] as Element;
-  } else {
-    return;
-  }
-  let nodeName = currentNode.getAttribute('data-name');
-  let opNodes = _getAllContainedOpNodes(nodeName, renderGraphInfo);
-  let allTracedNodes = {};
-  _.each(opNodes, function(nodeInstance) {
-    allTracedNodes =
-        traceAllInputsOfOpNode(renderGraphInfo, nodeInstance, allTracedNodes);
-  });
-
-  d3.selectAll(selectedNodeSelectorString).classed({
-    // Remove the input-highlight from the selected node.
-    'input-highlight': false,
-    // Add input-highlight-selected class to selected node, which allows
-    // treating the selected not as a special case of an input node.
-    'input-highlight-selected': true
-  });
-
-  // Highlight all parent nodes of each OpNode as input parent to allow
-  // specific highlighting.
-  let highlightedNodes = Object.keys(allTracedNodes);
-  let visibleNodes =
-      _findVisibleParentsFromOpNodes(renderGraphInfo, highlightedNodes);
-  _markParentsOfNodes(visibleNodes);
-
-  // Attach class to all non-input nodes and edges for styling.
-  d3.selectAll(
-        'g.node:not(.selected):not(.input-highlight)' +
-        ':not(.input-parent):not(.input-children)')
-      .classed('non-input', true)
-      .each(function(d: RenderNodeInfo) {
-        // Mark all nodes with the specified name as non-inputs. This
-        // results in Annotation nodes which are attached to inputs to be
-        // tagged as well.
-        let nodeName = d.node.name;
-        d3.selectAll(`[data-name="${nodeName}"]`).classed('non-input', true);
-      });
-  d3.selectAll('g.edge:not(.input-edge-highlight)')
-      .classed('non-input-edge-highlight', true);
-}
-
-/**
- * Recursively find all op nodes contained by the node identified by the
- * provided name.
- * @param nodeName The meta or op node of which the OpNode instances are
- * required.
- * @param renderGraphInfo The rendered graph information object.
- * @returns {Array} An array of OpNodeImpl instances.
- */
-export function _getAllContainedOpNodes(
-    nodeName: string, renderGraphInfo: tf.graph.render.RenderGraphInfo) {
-  let opNodes = [];
-
-  // Get current node.
-  let node = renderGraphInfo.getNodeByName(nodeName) as tf.graph.GroupNode |
-      tf.graph.OpNode;
-
-  // If node is already OpNode then return the node plus its input embeddings.
-  if (node instanceof tf.graph.OpNodeImpl) {
-    return [node].concat(node.inEmbeddings);
-  }
-
-  // Otherwise, make recursive call for each node contained by the GroupNode.
-  let childNodeNames = (node as tf.graph.GroupNode).metagraph.nodes();
-  _.each(childNodeNames, function(childNodeName) {
-    opNodes =
-        opNodes.concat(_getAllContainedOpNodes(childNodeName, renderGraphInfo));
-  });
-
-  return opNodes;
-}
-
-/**
- * When resolving inputs of a node the visible parent node of each input
- * node (i.e. the first parent which is rendered to the screen) needs to be
- * found, and since such a node may contain several input OpNodes a map
- * of the visible parent to all the input OpNodes it contains is provided by
- * opNodes.
- */
-interface VisibleParent {
-  visibleParent: Node;
-  opNodes: OpNode[];
-}
-
-export function traceAllInputsOfOpNode(
-    renderGraphInfo: tf.graph.render.RenderGraphInfo, startNode: OpNode,
-    allTracedNodes: Object) {
-  // To prevent infinite loops due to cyclical relationships and improving
-  // performance by tracing OpNode which is input to 2+ nodes only once.
-  if (allTracedNodes[startNode.name]) {
-    return allTracedNodes;
-  } else {
-    allTracedNodes[startNode.name] = true;
-  }
-  // Extract the inputs.
-  let inputs = startNode.inputs;
-  // Get visible parent.
-  let currentVisibleParent = getVisibleParent(renderGraphInfo, startNode);
-  // Mark as input node.
-  d3.select(`.node[data-name="${currentVisibleParent.name}"]`)
-      .classed('input-highlight', true);
-
-  // Find the visible parent of each input.
-  let visibleInputs = {};
-  _.each(inputs, function(nodeInstance) {
-    let resolvedNode = renderGraphInfo.getNodeByName(nodeInstance.name);
-    if (resolvedNode === undefined) {
-      // Node could not be found in rendered Hierarchy, which happens when
-      // tracing inputs of a SummaryNode.
-      return;
-    }
-    // Ensure node is resolved to OpNode if name collision with Metanode exists.
-    if (resolvedNode instanceof MetanodeImpl) {
-      let resolvedNodeName = tf.graph.getStrictName(resolvedNode.name);
-      resolvedNode = renderGraphInfo.getNodeByName(resolvedNodeName) as OpNode;
-    }
-
-    let visibleParent = getVisibleParent(renderGraphInfo, resolvedNode);
-
-    // Append OpNode to visible parent entry.
-    let visibleInputsEntry = visibleInputs[visibleParent.name];
-    if (visibleInputsEntry) {
-      visibleInputsEntry.opNodes.push(resolvedNode);
-    } else {  // Create new entry.
-      visibleInputs[visibleParent.name] = {
-        visibleParent: visibleParent,
-        opNodes: [resolvedNode]
-      } as VisibleParent;
-    }
-  });
-
-  // Find all parents of the start node.
-  let startNodeParents = {};
-  let indexedStartNodeParents = [currentVisibleParent];
-  startNodeParents[currentVisibleParent.name] = {
-    traced: false,
-    index: 0,
-    connectionEndpoints: []
-  };
-
-  let currentNode = currentVisibleParent as Node;
-  for (let index = 1; currentNode.name !== tf.graph.ROOT_NAME; index++) {
-    currentNode = currentNode.parentNode;
-    startNodeParents[currentNode.name] = {
-      traced: false,
-      index: index,
-      connectionEndpoints: []
-    };
-    indexedStartNodeParents[index] = currentNode;
-  }
-
-  // Find first mutual parent of each input node and highlight connection.
-  _.forOwn(visibleInputs, function(visibleParentInfo: VisibleParent, key) {
-    let nodeInstance = visibleParentInfo.visibleParent;
-    // Make recursive call for each input-OpNode contained by the visible
-    // parent.
-    _.each(visibleParentInfo.opNodes, function(opNode: OpNode) {
-      allTracedNodes =
-          traceAllInputsOfOpNode(renderGraphInfo, opNode, allTracedNodes);
-    });
-
-    if (nodeInstance.name !== currentVisibleParent.name) {
-      _createVisibleTrace(
-          nodeInstance, startNodeParents, indexedStartNodeParents);
-    }
-  });
-
-  return allTracedNodes;
-}
-
-/**
- * Colors the edges to connect the passed node to the start node. This is
- * done by:
- *
- * a) Finding the first (visible) common parent in the rendered
- * hierarchy.
- * NB: There are 2 types of connections:
- * 1) Direct connections between node A
- * and B, marked below as II,
- * 2) Connections from any node A to its parent, A'. Marked below as I and III.
- * For type 2 connection you need to know the inner-nested node, the
- * direct parent, and the ultimate destination of the connection.
- *
- *  A_parent      B_parent
- * +--------+    +---------+
- * |        |    |         |
- * |  +--+ I| II |III+--+  |
- * |  |A +---------->+B |  |
- * |  +--+  |    |   +--+  |
- * |        |    |         |
- * +--------+    +---------+
- *
- *
- * b) Highlighting the direct connection between the parents of A and B,
- * called A_parent and B_parent, s.t. A_parent and B_parent are children of the
- * mutual parent of A and B found in a), marked above as II.
- *
- * c) Highlighting the connection from A to A_parent and B to B_parent
- * (through all layers of parents between A and A_parent and B and B_parent,
- * respectively). Marked above as I and III.
- *
- * @param nodeInstance The instance of the node to use as destination node, B.
- * @param startNodeParents Map of startNodeParent names to information objects
- * about the parent.
- * @param indexedStartNodeParents An array of all parents of the start node.
- * This is required to find the child of the mutual parent which is a parent
- * of the start node.
- * @private
- */
-function _createVisibleTrace(
-    nodeInstance: Node, startNodeParents, indexedStartNodeParents: Node[]) {
-  let currentNode = nodeInstance;
-  let previousNode = nodeInstance;
-
-  // Ascend through parents until a mutual parent is found with the start
-  // node.
-  let destinationParentPairs = [];
-  while (!startNodeParents[currentNode.name]) {
-    if (previousNode.name !== currentNode.name) {
-      destinationParentPairs.push([previousNode, currentNode]);
-    }
-    previousNode = currentNode;
-    currentNode = currentNode.parentNode;
-  }
-
-  // Connection between nodes is drawn between the parents of each
-  // respective node, both of which share the mutual parent.
-  let startNodeIndex = startNodeParents[currentNode.name].index;
-  let startNodeName =
-      indexedStartNodeParents[Math.max(startNodeIndex - 1, 0)].name;
-
-  let startNodeTopParentName = startNodeName;
-  let targetNodeTopParentName = previousNode.name;
-
-  let endNodeName = previousNode.name;
-  d3.selectAll(`[data-edge="${endNodeName}--${startNodeName}"]`)
-      .classed('input-edge-highlight', true);
-
-  // Trace up the parents of the input.
-  _.each(destinationParentPairs, function(value) {
-    let inner = value[0];
-    let outer = value[1];
-    let edgeSelector = `[data-edge="${inner.name}--${startNodeTopParentName}` +
-        `~~${outer.name}~~OUT"]`;
-    d3.selectAll(edgeSelector).classed('input-edge-highlight', true);
-  });
-
-  // Trace up the parents of the start node.
-  for (let index = 1; index < startNodeIndex; index++) {
-    let inner = indexedStartNodeParents[index - 1];
-    let outer = indexedStartNodeParents[index];
-    let edgeSelector = `[data-edge="${targetNodeTopParentName}~~${outer.name}` +
-        `~~IN--${inner.name}"]`;
-    d3.selectAll(edgeSelector).classed('input-edge-highlight', true);
-  }
-}
-
-/**
- * Creates map { [name: string] -> Node } of all visible / rendered parents
- * of the nodes identified by the node names passed in.
- *
- * @param renderGraphInfo The information on the rendered graph.
- * @param nodeNames String array of node names.
- * @returns {[nodeName: string]: Node}
- * @private
- */
-function _findVisibleParentsFromOpNodes(renderGraphInfo, nodeNames: string[]) {
-  let visibleParents: {[nodeName: string]: Node} = {};
-  _.each(nodeNames, function(nodeName) {
-    let currentNode = renderGraphInfo.getNodeByName(nodeName);
-    let visibleParent = getVisibleParent(renderGraphInfo, currentNode);
-    visibleParents[visibleParent.name] = visibleParent;
-  });
-
-  return visibleParents;
-}
-
-/**
- * Traverse through the parents of all nodes in the list and mark each
- * encountered node as input-parent.
- * @param visibleNodes Map of input nodes, have to be visible/rendered when
- * called.
- * @private
- */
-function _markParentsOfNodes(visibleNodes: {[nodeName: string]: Node}) {
-  _.forOwn(visibleNodes, function(nodeInstance: Node) {
-    // Mark all parents of the node as input-parents.
-    let currentNode = nodeInstance;
-
-    while (currentNode.name !== tf.graph.ROOT_NAME) {
-      let renderedElement = d3.select(`.node[data-name="${currentNode.name}"]`);
-      // Only mark the element as a parent node to an input if it is not
-      // marked as input node itself.
-      if (renderedElement[0][0] &&
-          !renderedElement.classed('input-highlight') &&
-          !renderedElement.classed('selected') &&
-          // OpNode only parent if start node is embedded node, in which case
-          // the OpNode should be faded as well.
-          !renderedElement.classed('op')) {
-        renderedElement.classed('input-parent', true);
-      }
-      currentNode = currentNode.parentNode;
-    }
-  });
-}
-
-/**
- * Find the parent of the passed in op node which is expanded. This is done
- * by going through all parents until the parent's parent is expanded, thus
- * finding the first unexpanded parent which is rendered on the screen.
- * @param renderGraphInfo The graph info object used to gain access to the
- * render info of the parents.
- * @param currentNode The node whose parent is to be found.
- * @returns Node
- */
-export function getVisibleParent(
-    renderGraphInfo: tf.graph.render.RenderGraphInfo,
-    currentNode: tf.graph.Node) {
-  let found = false;
-  let currentParent = currentNode;
-
-  while (!found) {
-    // Get parent element, to extract name.
-    currentNode = currentParent;
-    currentParent = currentNode.parentNode;
-
-    if (currentParent === undefined) {
-      found = true;
-    } else {
-      let renderNode = renderGraphInfo.getRenderNodeByName(currentParent.name);
-      // Found if node is rendered on the screen (renderNode truthy), and
-      // the parent is either expanded (i.e. it is a metanode or seriesnode)
-      // or the parent is an OpNode in which case currentNode is an embedded
-      // node which has another OpNode as parent.
-      if (renderNode &&
-          (renderNode.expanded || currentParent instanceof graph.OpNodeImpl)) {
-        found = true;
-      }
-    }
-  }  // Close while loop.
-  return currentNode;
-}
-}  // Close module.
diff --git a/tensorflow/tensorboard/components/tf_graph_common/parser.ts b/tensorflow/tensorboard/components/tf_graph_common/parser.ts
deleted file mode 100644
index 04d879ef91..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/parser.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph.parser {
-
-/**
- * Parses a native js value, which can be either a string, boolean or number.
- *
- * @param value The value to be parsed.
- */
-function parseValue(value: string): string|number|boolean {
-  if (value === 'true') {
-    return true;
-  }
-  if (value === 'false') {
-    return false;
-  }
-  let firstChar = value[0];
-  if (firstChar === '"') {
-    return value.substring(1, value.length - 1);
-  }
-  let num = parseFloat(value);
-  return isNaN(num) ? value : num;
-}
-
-/**
- * Fetches a text file and returns a promise of the result.
- */
-export function fetchPbTxt(filepath: string): Promise<ArrayBuffer> {
-  return new Promise<ArrayBuffer>(function(resolve, reject) {
-    const request = new XMLHttpRequest();
-    request.open('GET', filepath);
-    request.responseType = 'arraybuffer';
-
-    request.onerror = () => reject(request.status);
-    request.onload = () => resolve(request.response);
-
-    request.send(null);
-  });
-}
-
-/**
- * Fetches the metadata file, parses it and returns a promise of the result.
- */
-export function fetchAndParseMetadata(path: string, tracker: ProgressTracker) {
-  return tf.graph.util
-      .runTask(
-          'Reading metadata pbtxt', 40,
-          () => {
-            if (path == null) {
-              return Promise.resolve(null);
-            }
-            return fetchPbTxt(path);
-          },
-          tracker)
-      .then((arrayBuffer: ArrayBuffer) => {
-        return tf.graph.util.runAsyncPromiseTask(
-            'Parsing metadata.pbtxt', 60, () => {
-              return arrayBuffer != null ? parseStatsPbTxt(arrayBuffer) :
-                                           Promise.resolve(null);
-            }, tracker);
-      });
-}
-
-/**
- * Fetches the graph file, parses it and returns a promise of the result. The
- * result will be undefined if the graph is empty.
- */
-export function fetchAndParseGraphData(path: string, pbTxtFile: Blob,
-    tracker: ProgressTracker) {
-  return tf.graph.util
-      .runTask(
-          'Reading graph pbtxt', 40,
-          () => {
-            if (pbTxtFile) {
-              return new Promise<ArrayBuffer>(function(resolve, reject) {
-                let fileReader = new FileReader();
-                fileReader.onload = () => resolve(fileReader.result);
-                fileReader.onerror = () => reject(fileReader.error);
-                fileReader.readAsArrayBuffer(pbTxtFile);
-              });
-            } else {
-              return fetchPbTxt(path);
-            }
-          },
-          tracker)
-      .then((arrayBuffer: ArrayBuffer) => {
-        return tf.graph.util.runTask('Parsing graph.pbtxt', 60, () => {
-          return parseGraphPbTxt(arrayBuffer);
-        }, tracker);
-      });
-}
-
-/**
- * Parse a file object in a streaming fashion line by line (or custom delim).
- * Can handle very large files.
- * @param input The file object as an array buffer.
- * @param callback The callback called on each line
- * @param chunkSize The size of each read chunk. (optional)
- * @param delim The delimiter used to split a line. (optional)
- * @returns A promise for when it is finished.
- */
-export function streamParse(
-    arrayBuffer: ArrayBuffer, callback: (string) => void,
-    chunkSize: number = 1000000, delim: string = '\n'): Promise<boolean> {
-  return new Promise<boolean>(function(resolve, reject) {
-    let offset = 0;
-    let bufferSize = arrayBuffer.byteLength - 1;
-    let data = '';
-
-    function readHandler(str) {
-      offset += chunkSize;
-      let parts = str.split(delim);
-      let first = data + parts[0];
-      if (parts.length === 1) {
-        data = first;
-        readChunk(offset, chunkSize);
-        return;
-      }
-      data = parts[parts.length - 1];
-      callback(first);
-      for (let i = 1; i < parts.length - 1; i++) {
-        callback(parts[i]);
-      }
-      if (offset >= bufferSize) {
-        if (data) {
-          callback(data);
-        }
-        resolve(true);
-        return;
-      }
-      readChunk(offset, chunkSize);
-    }
-
-    function readChunk(offset: number, size: number) {
-      const arrayBufferChunk = arrayBuffer.slice(offset, offset + size);
-
-      const blob = new Blob([arrayBufferChunk]);
-      const file = new FileReader();
-      file.onload = (e: any) => readHandler(e.target.result);
-      file.readAsText(blob);
-    }
-
-    readChunk(offset, chunkSize);
-  });
-}
-
-/**
- * Since proto-txt doesn't explicitly say whether an attribute is repeated
- * (an array) or not, we keep a hard-coded list of attributes that are known
- * to be repeated. This list is used in parsing time to convert repeated
- * attributes into arrays even when the attribute only shows up once in the
- * object.
- */
-const GRAPH_REPEATED_FIELDS: {[attrPath: string]: boolean} = {
-  'node': true,
-  'node.input': true,
-  'node.attr': true,
-  'node.attr.value.list.type': true,
-  'node.attr.value.shape.dim': true,
-  'node.attr.value.tensor.string_val': true,
-  'node.attr.value.tensor.tensor_shape.dim': true,
-  'node.attr.value.list.shape': true,
-  'node.attr.value.list.shape.dim': true,
-  'node.attr.value.list.s': true
-};
-
-const METADATA_REPEATED_FIELDS: {[attrPath: string]: boolean} = {
-  'step_stats.dev_stats': true,
-  'step_stats.dev_stats.node_stats': true,
-  'step_stats.dev_stats.node_stats.output': true,
-  'step_stats.dev_stats.node_stats.memory': true,
-  'step_stats.dev_stats.node_stats.output.tensor_description.shape.dim': true
-};
-
-/**
- * Parses an ArrayBuffer of a proto txt file into a raw Graph object.
- */
-export function parseGraphPbTxt(input: ArrayBuffer):
-    Promise<tf.graph.proto.NodeDef[]> {
-  return parsePbtxtFile(input, GRAPH_REPEATED_FIELDS).then(obj => obj['node']);
-}
-
-/**
- * Parses an ArrayBuffer of a proto txt file into a StepStats object.
- */
-export function parseStatsPbTxt(input: ArrayBuffer):
-    Promise<tf.graph.proto.StepStats> {
-  return parsePbtxtFile(input, METADATA_REPEATED_FIELDS)
-      .then(obj => obj['step_stats']);
-}
-
-/**
- * Parses a ArrayBuffer of a proto txt file into javascript object.
- *
- * @param input The ArrayBuffer or file object implementing slice.
- * @param repeatedFields Map (Set) of all the repeated fields, since you can't
- *   tell directly from the pbtxt if a field is repeated or not.
- * @returns The parsed object.
- */
-function parsePbtxtFile(
-    input: ArrayBuffer,
-    repeatedFields: {[attrPath: string]: boolean}): Promise<Object> {
-  let output: { [name: string]: any; } = {};
-  let stack = [];
-  let path: string[] = [];
-  let current: { [name: string]: any; } = output;
-
-  function splitNameAndValueInAttribute(line: string) {
-    let colonIndex = line.indexOf(':');
-    let name = line.substring(0, colonIndex).trim();
-    let value = parseValue(line.substring(colonIndex + 2).trim());
-    return {
-      name: name,
-      value: value
-    };
-  }
-
-  /**
-   * Adds a value, given the attribute name and the host object. If the
-   * attribute already exists, but is not an array, it will convert it to an
-   * array of values.
-   *
-   * @param obj The host object that holds the attribute.
-   * @param name The attribute name (key).
-   * @param value The attribute value.
-   * @param path A path that identifies the attribute. Used to check if
-   *     an attribute is an array or not.
-   */
-  function addAttribute(obj: Object, name: string,
-      value: Object|string|number|boolean, path: string[]): void {
-    // We treat 'node' specially since it is done so often.
-    let existingValue = obj[name];
-    if (existingValue == null) {
-      obj[name] = path.join('.') in repeatedFields ? [value] : value;
-    } else if (Array.isArray(existingValue)) {
-      existingValue.push(value);
-    } else {
-      obj[name] = [existingValue, value];
-    }
-  }
-
-  // Run through the file a line at a time.
-  return streamParse(input, function(line: string) {
-    if (!line) {
-      return;
-    }
-    line = line.trim();
-
-    switch (line[line.length - 1]) {
-      case '{':  // create new object
-        let name = line.substring(0, line.length - 2).trim();
-        let newValue: { [name: string]: any; } = {};
-        stack.push(current);
-        path.push(name);
-        addAttribute(current, name, newValue, path);
-        current = newValue;
-        break;
-      case '}':
-        current = stack.pop();
-        path.pop();
-        break;
-      default:
-        let x = splitNameAndValueInAttribute(line);
-        addAttribute(current, x.name, x.value, path.concat(x.name));
-        break;
-    }
-  }).then(function() {
-    return output;
-  });
-}
-
-} // Close module tf.graph.parser.
diff --git a/tensorflow/tensorboard/components/tf_graph_common/proto.ts b/tensorflow/tensorboard/components/tf_graph_common/proto.ts
deleted file mode 100644
index eda73e45c3..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/proto.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/**
- * @fileoverview Interfaces that parallel proto definitions in
- * third_party/tensorflow/core/framework/...
- *     graph.proto
- *     step_stats.proto
- * These should stay in sync.
- */
-module tf.graph.proto {
-  /**
-   * TensorFlow node definition as defined in the graph.proto file.
-   */
-  export interface NodeDef {
-    /** Name of the node */
-    name: string;
-    /** List of nodes that are inputs for this node. */
-    input: string[];
-    /** The name of the device where the computation will run. */
-    device: string;
-    /** The name of the operation associated with this node. */
-    op: string;
-    /** List of attributes that describe/modify the operation. */
-    attr: {key: string, value: Object}[];
-  }
-
-  /**
-   * Generic graph as defined in the graph_explorer.proto file.
-   */
-  export interface GenericGraph {
-    /** List of nodes in the graph */
-    node: GenericNode[];
-    /** List of nodes in the graph */
-    edge: GenericEdge[];
-    /** List of attributes that describe/modify the operation. */
-    attr: Array<{[key: string]: any}>;
-  }
-
-  /**
-   * GenericEdge corresponds to the Edge message in graph_explorer.proto.
-   */
-  export interface GenericEdge {
-    /** Name of the source node. */
-    source: string;
-    /** Name of the target node. */
-    target: string;
-    /** Attributes of the edge. */
-    edge_attr: Array<{[key: string]: any}>;
-  }
-
-  /**
-   * GenericNode corresponds to the Node message in graph_explorer.proto.
-   */
-  export interface GenericNode {
-    /** Name of the node */
-    name: string;
-    /** Attributes of a leaf node or leaf nodes within a metanode. */
-    node_attr: Array<{[key: string]: any}>;
-    /** Attributes of a metanode. */
-    metanode_attr: Array<{[key: string]: any}>;
-  }
-
-  /**
-   * TensorFlow stats file definition as defined in the stats proto file.
-   */
-  export interface StepStats {
-    dev_stats: {device: string, node_stats: NodeExecStats[]}[];
-  }
-
-  /**
-   * TensorFlow stats for a node as defined in the step_stats proto file.
-   */
-  export interface NodeExecStats {
-    node_name: string;
-    // The next 4 properties are currently stored as string in json
-    // and must be parsed.
-    all_start_micros: number;
-    op_start_rel_micros: number;
-    op_end_rel_micros: number;
-    all_end_rel_micros: number;
-    memory: {
-      allocator_name: string;
-      total_bytes: number;  // Stored as string in json and should be parsed.
-      peak_bytes: number;   // Stored as string in json and should be parsed.
-    }[];
-    /** Output sizes recorded for a single execution of a graph node */
-    output: NodeOutput[];
-    timeline_label: string;
-    scheduled_micros: string;
-    thread_id: string;
-  }
-
-  /**
-   * Description for the output tensor(s) of an operation in the graph as
-   * defined in the step_stats.proto file.
-   */
-  export interface NodeOutput {
-    slot: number;  // Stored as string in json and should be parsed.
-    tensor_description: {
-      /** Data type of tensor elements */
-      dtype: string;
-      /** Shape of the tensor */
-      shape: {
-        /**
-         * Dimensions of the tensor, such as [{name: 'input', size: 30},
-         * {name: 'output', size: 40}] for a 30 x 40 2D tensor.  The names
-         * are optional. The order of entries in 'dim' matters: It indicates
-         * the layout of the values in the tensor in-memory representation.
-         */
-        dim: {
-          /** Size of the tensor in that dimension */
-          size: number,  // Stored as string in json and should be parsed.
-          /** Optional name of the tensor dimension */
-          name?: string
-        }[];
-      };
-      /** Information about the size and allocator used for the data */
-      allocation_description: {
-        // The next 2 properties are stored as string in json and
-        // should be parsed.
-        /** Total number of bytes requested */
-        requested_bytes: number;
-        /** Total number of bytes allocated, if known */
-        allocated_bytes?: number;
-        /** Name of the allocator used */
-        allocator_name: string;
-      };
-    };
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_common/render.ts b/tensorflow/tensorboard/components/tf_graph_common/render.ts
deleted file mode 100644
index 6536012c8b..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/render.ts
+++ /dev/null
@@ -1,1633 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-/**
- * Package for the Render Hierarchy for TensorFlow graph.
- */
-module tf.graph.render {
-
-export type Point = {x: number, y: number};
-
-/**
- * Color parameters for op nodes.
- */
-export let OpNodeColors = {DEFAULT_FILL: 'white', DEFAULT_STROKE: '#b2b2b2'};
-
-/**
- * Color parameters for node encoding.
- * @type {Object}
- */
-export let MetanodeColors = {
-  /**
-   * Default fill and stroke to use when no other information is available.
-   */
-  DEFAULT_FILL: '#d9d9d9',
-  DEFAULT_STROKE: '#a6a6a6',
-  SATURATION: 0.6,
-  LIGHTNESS: 0.85,
-  /**
-   * Neutral color to use when the node is expanded (used when coloring by
-   * compute time, memory and device).
-   */
-  EXPANDED_COLOR: '#f0f0f0',
-  /**
-   * Standard hue values for node color palette.
-   */
-  HUES: [220, 100, 180, 40, 20, 340, 260, 300, 140, 60],
-  STRUCTURE_PALETTE(id: number, lightened?: boolean) {
-    // The code below is a flexible way to computationally create a set
-    // of colors that go well together.
-    let hues = MetanodeColors.HUES;
-    let n = hues.length;
-    let hue = hues[id % n];
-    let m = Math.sin(hue * Math.PI / 360);
-    let sat = lightened ? 30 : 90 - 60 * m;
-    let light = lightened ? 95 : 80;
-    return d3.hsl(hue, .01 * sat, .01 * light).toString();
-  },
-  DEVICE_PALETTE(index: number): string {
-    return MetanodeColors.STRUCTURE_PALETTE(index);
-  },
-  XLA_CLUSTER_PALETTE(index: number): string {
-    return MetanodeColors.STRUCTURE_PALETTE(index);
-  },
-  UNKNOWN: '#eee',
-  GRADIENT_OUTLINE: '#888'
-};
-
-/**
- * Color parameters for op nodes.
- */
-export let SeriesNodeColors = {
-  DEFAULT_FILL: 'white',
-  DEFAULT_STROKE: '#b2b2b2'
-};
-
-/**
- * Parameters that affect how the graph is rendered on the screen.
- */
-const PARAMS = {
-  /**
-   * Whether to extract high degree nodes from the core part of the graph.
-   */
-  enableExtraction: true,
-  /**
-   * The minimum number of nodes for a graph to have in order for high in and
-   * out degree nodes to be extracted in auxiliary. The aim here is to prevent
-   * nodes from being extracted from small graphs.
-   */
-  minNodeCountForExtraction: 15,
-  /**
-   * The minimum in or out degree a node must have in order to be possibly
-   * extracted.
-   */
-  minDegreeForExtraction: 5,
-  /**
-   * Maximum number of control edges a node can have before they aren't
-   * displayed.
-   */
-  maxControlDegree: 4,
-  /**
-   * Maximum in (for outbound bridge paths) or out (for inbound bridge paths)
-   * degree of a node allowed for a bridge path to be rendered to it from a
-   * subhierarchy of nodes. Having a max prevents having too many nodes emanate
-   * from a subhierarchy and crowding up.
-   */
-  maxBridgePathDegree: 4,
-  /**
-   * Types patterns for predefined out-extract nodes, which are
-   * sink-like nodes that will be extracted from the main graph.
-   */
-  outExtractTypes: [
-    'NoOp'  // NoOps are sink-like used for managing control dependencies.
-  ],
-
-  /**
-   * Types patterns for predefined in-extract nodes, which are
-   * source-like nodes that will be extracted from the main graph.
-   */
-  inExtractTypes: [],
-
-  /**
-   * When removing edges from a high degree node, remove all of its edges if
-   * detachAllEdgesForHighDegree is true.  Otherwise remove all in-edges if
-   * the node has high in-degree, or all out-edges if the node has high
-   * out-degree.
-   */
-  detachAllEdgesForHighDegree: true,
-
-  /**
-   * After extracting high in/out degree nodes and predefined
-   * source-like/sink-like, extract isolated nodes to the side
-   * if this extractIsolatedNodesWithAnnotationsOnOneSide is true.
-   */
-  extractIsolatedNodesWithAnnotationsOnOneSide: true,
-
-  /**
-   * Whether to add bridge nodes and edges to the core when building the
-   * subhierarchy of an expanded metanode. See buildSubhierarchy().
-   */
-  enableBridgegraph: true,
-
-  /**
-   * 2 colors, for the minimum and maximum value respectively, whenever we
-   * have a gradient scale.
-   */
-  minMaxColors: ['#fff5f0', '#fb6a4a'],
-
-  /**
-   * Maximum number of annotations to be displayed on a node before an
-   * ellipsis is used.
-   */
-  maxAnnotations: 5
-};
-
-/**
- * Stores the rendering information, such as x and y coordinates,
- * for each node in the graph.
- */
-export class RenderGraphInfo {
-  hierarchy: hierarchy.Hierarchy;
-  private displayingStats: boolean;
-  private index: {[nodeName: string]: RenderNodeInfo};
-  private renderedOpNames: string[];
-  private deviceColorMap: d3.scale.Ordinal<string, string>;
-  private xlaClusterColorMap: d3.scale.Ordinal<string, string>;
-  private memoryUsageScale: d3.scale.Linear<string, string>;
-  private computeTimeScale: d3.scale.Linear<string, string>;
-  /** Scale for the thickness of edges when there is no shape information. */
-  edgeWidthScale:
-      d3.scale.Linear<number, number> | d3.scale.Pow<number, number>;
-  // Since the rendering information for each node is constructed lazily,
-  // upon node's expansion by the user, we keep a map between the node's name
-  // and whether the rendering information was already constructed for that
-  // node.
-  private hasSubhierarchy: {[nodeName: string]: boolean};
-  root: RenderGroupNodeInfo;
-  traceInputs: Boolean;
-
-  constructor(hierarchy: hierarchy.Hierarchy, displayingStats: boolean) {
-    this.hierarchy = hierarchy;
-    this.displayingStats = displayingStats;
-    this.index = {};
-    this.renderedOpNames = [];
-
-    this.computeScales();
-    // Maps node name to whether the rendering hierarchy was already
-    // constructed.
-    this.hasSubhierarchy = {};
-    this.root = new RenderGroupNodeInfo(hierarchy.root);
-    this.index[hierarchy.root.name] = this.root;
-    this.renderedOpNames.push(hierarchy.root.name);
-    this.buildSubhierarchy(hierarchy.root.name);
-    this.root.expanded = true;
-    this.traceInputs = false;
-  }
-
-  computeScales() {
-    this.deviceColorMap = d3.scale.ordinal<string>()
-        .domain(this.hierarchy.devices)
-        .range(_.map(d3.range(this.hierarchy.devices.length),
-                     MetanodeColors.DEVICE_PALETTE));
-
-    this.xlaClusterColorMap =
-        d3.scale.ordinal<string>()
-            .domain(this.hierarchy.xlaClusters)
-            .range(_.map(
-                d3.range(this.hierarchy.xlaClusters.length),
-                MetanodeColors.XLA_CLUSTER_PALETTE));
-
-    let topLevelGraph = this.hierarchy.root.metagraph;
-    // Find the maximum and minimum memory usage.
-    let memoryExtent = d3.extent(topLevelGraph.nodes(),
-        (nodeName, index) => {
-      let node = topLevelGraph.node(nodeName);
-      // Some ops don't have stats at all.
-      if (node.stats != null) {
-        return node.stats.totalBytes;
-      }
-    });
-    this.memoryUsageScale = d3.scale.linear<string, string>()
-        .domain(memoryExtent)
-        .range(PARAMS.minMaxColors);
-
-    // Find also the minimum and maximum compute time.
-    let computeTimeExtent = d3.extent(topLevelGraph.nodes(),
-        (nodeName, index) => {
-      let node = topLevelGraph.node(nodeName);
-      // Some ops don't have stats at all.
-      if (node.stats != null) {
-        return node.stats.getTotalMicros();
-      }
-    });
-    this.computeTimeScale = d3.scale.linear<string, string>()
-        .domain(computeTimeExtent)
-        .range(PARAMS.minMaxColors);
-
-    this.edgeWidthScale = this.hierarchy.hasShapeInfo ?
-      scene.edge.EDGE_WIDTH_SCALE :
-      d3.scale.linear()
-        .domain([1, this.hierarchy.maxMetaEdgeSize])
-        .range([scene.edge.MIN_EDGE_WIDTH, scene.edge.MAX_EDGE_WIDTH]);
-  }
-
-  /**
-   * Get a previously created RenderNodeInfo by its node name.
-   */
-  getRenderNodeByName(nodeName: string): RenderNodeInfo {
-    return this.index[nodeName];
-  }
-
-  /**
-   * Get the underlying node in the hierarchical graph by its name.
-   */
-  getNodeByName(nodeName: string): Node {
-    return this.hierarchy.node(nodeName);
-  }
-
-  /**
-   * Get a previously created RenderNodeInfo for the specified node name,
-   * or create one if it hasn't been created yet.
-   */
-  getOrCreateRenderNodeByName(nodeName: string): RenderNodeInfo {
-    // Polymer may invoke this with null.
-    if (!nodeName) {
-      return null;
-    }
-
-    if (nodeName in this.index) {
-      return this.index[nodeName];
-    }
-
-    let node = this.hierarchy.node(nodeName);
-    // Exit early if the node does not exist in the hierarchy. This can happen
-    // when a graph is reloaded while the infocard points to a node not visible
-    // at the top-level.
-    if (!node) {
-      return null;
-    }
-    let renderInfo = node.isGroupNode ?
-        new RenderGroupNodeInfo(<GroupNode>node) :
-        new RenderNodeInfo(node);
-    this.index[nodeName] = renderInfo;
-    this.renderedOpNames.push(nodeName);
-
-    if (node.stats) {
-      renderInfo.memoryColor = this.memoryUsageScale(node.stats.totalBytes);
-      renderInfo.computeTimeColor =
-          this.computeTimeScale(node.stats.getTotalMicros());
-    }
-
-    if (!node.isGroupNode) {
-      let clusterName = (node as OpNode).xlaCluster;
-      if (clusterName) {
-        renderInfo.xlaClusterColor = this.xlaClusterColorMap(clusterName);
-      }
-    }
-
-    // We only fade nodes when we're displaying stats.
-    renderInfo.isFadedOut = this.displayingStats &&
-        !tf.graph.util.hasDisplayableNodeStats(node.stats);
-
-    if (node.isGroupNode) {
-      // Make a list of tuples (device, proportion), where proportion
-      // is the fraction of op nodes that have that device.
-      let pairs = _.pairs((<GroupNode>node).deviceHistogram);
-      if (pairs.length > 0) {
-        // Compute the total # of devices.
-        let numDevices = _.sum(pairs, _.last);
-        renderInfo.deviceColors = _.map(pairs, pair => ({
-              color: this.deviceColorMap(pair[0]),
-              // Normalize to a proportion of total # of devices.
-              proportion: pair[1] / numDevices
-            }));
-      }
-    } else {
-      let device = (<OpNode>renderInfo.node).device;
-      if (device) {
-        renderInfo.deviceColors = [{
-          color: this.deviceColorMap(device),
-          proportion: 1.0
-        }];
-      }
-    }
-
-    return this.index[nodeName];
-  }
-
-  /**
-   * Return the nearest ancestor node, including itself, that is visible
-   * in the visualization. This method is used so that we can select
-   * (highlight) a node that isn't drawn yet, by selecting (highlighting)
-   * its nearest ancestor that has been drawn.
-   */
-  getNearestVisibleAncestor(name: string): string {
-    let path = getHierarchicalPath(name);
-    for (let i = 0; i < path.length; i++) {
-      let nodeName = path[i];
-      // Op nodes have expanded set to false by default.
-      if (!this.getRenderNodeByName(nodeName).expanded) {
-        return nodeName;
-      }
-    }
-    // Fallthrough. If everything was expanded return the node.
-    return name;
-  }
-
-  // TODO(jimbo): Delete this an any code it touches (all deprecated).
-  setDepth(depth: number): void {
-    setGroupNodeDepth(this.root, +depth);
-  }
-
-  /**
-   * Returns true if the renderNode is an isolated node within its parent node.
-   */
-  isNodeAuxiliary(renderNode: RenderNodeInfo): boolean {
-    let parentNode = <RenderGroupNodeInfo>this.getRenderNodeByName(
-      renderNode.node.parentNode.name);
-    let found = _.find(parentNode.isolatedInExtract, node => {
-      return node.node.name === renderNode.node.name;
-    });
-    if (found) {
-      return true;
-    }
-    found = _.find(parentNode.isolatedOutExtract, node => {
-      return node.node.name === renderNode.node.name;
-    });
-    return !!found;
-  }
-
-  /**
-   * Returns a list of ops that have been rendered so far for this graph. More
-   * ops may later be rendered if the user expands nodes for instance. The list
-   * returned here can only stay the same size or grow on successive calls.
-   */
-  getNamesOfRenderedOps(): string[] {
-    return this.renderedOpNames;
-  }
-
-  buildSubhierarchy(nodeName: string): void {
-    // Terminate if the rendering hierarchy was already constructed
-    // for this node.
-    if (nodeName in this.hasSubhierarchy) {
-      return;
-    }
-
-    let renderNodeInfo = this.index[nodeName];
-
-    // If it is not a meta node or a series node, don't do anything.
-    if (renderNodeInfo.node.type !== NodeType.META &&
-        renderNodeInfo.node.type !== NodeType.SERIES) {
-      return;
-    }
-
-    // At this point we know the rendering information is about a group node.
-    let renderGroupNodeInfo = <RenderGroupNodeInfo> renderNodeInfo;
-    let metagraph = renderGroupNodeInfo.node.metagraph;
-    let coreGraph = renderGroupNodeInfo.coreGraph;
-
-    // Create render nodes to represent each child from the metagraph. Although
-    // these will initially be added to the coreGraph, they may later be
-    // extracted. Also, due to extraction, the coreGraph may contain disjoint
-    // groups between which there is no visible path (other than annotations).
-    _.each(metagraph.nodes(), childName => {
-
-      let childRenderInfo = this.getOrCreateRenderNodeByName(childName);
-      let childNode = childRenderInfo.node;
-
-      coreGraph.setNode(childName, childRenderInfo);
-
-      if (!childNode.isGroupNode) {
-        _.each((<OpNode>childNode).inEmbeddings, embedding => {
-          let renderMetaedgeInfo = new RenderMetaedgeInfo(null);
-          addInAnnotation(childRenderInfo, embedding, null, renderMetaedgeInfo,
-              AnnotationType.CONSTANT);
-          this.index[embedding.name] = new RenderNodeInfo(embedding);
-        });
-        _.each((<OpNode>childNode).outEmbeddings, embedding => {
-          let renderMetaedgeInfo = new RenderMetaedgeInfo(null);
-          addOutAnnotation(childRenderInfo, embedding, null, renderMetaedgeInfo,
-              AnnotationType.SUMMARY);
-          this.index[embedding.name] = new RenderNodeInfo(embedding);
-        });
-      }
-
-    });
-
-    // Add render metaedge info for edges in the metagraph.
-    _.each(metagraph.edges(), edgeObj => {
-      let metaedge = metagraph.edge(edgeObj);
-      let renderMetaedgeInfo = new RenderMetaedgeInfo(metaedge);
-      renderMetaedgeInfo.isFadedOut =
-          this.index[edgeObj.v].isFadedOut || this.index[edgeObj.w].isFadedOut;
-      coreGraph.setEdge(edgeObj.v, edgeObj.w, renderMetaedgeInfo);
-    });
-
-    if (PARAMS.enableExtraction &&
-        renderGroupNodeInfo.node.type === NodeType.META) {
-      extractHighDegrees(renderGroupNodeInfo);
-    }
-
-    // Record that we constructed the rendering hierarchy for this node, so we
-    // don't construct it another time.
-    this.hasSubhierarchy[nodeName] = true;
-
-    // Look up the parent node's render information and short circuit if none.
-    let parentNode = renderGroupNodeInfo.node.parentNode;
-    if (!parentNode) {
-      return;
-    }
-    let parentNodeInfo =
-      <RenderGroupNodeInfo> this.index[parentNode.name];
-
-    // Utility function for computing the name of a bridge node.
-    let getBridgeNodeName = (inbound, ...rest) =>
-        rest.concat([inbound ? 'IN' : 'OUT']).join('~~');
-
-    // Build out the bridgegraph.
-    let bridgegraph = this.hierarchy.getBridgegraph(nodeName);
-
-    // Look for popular nodes so we can make annotations instead of paths.
-    let otherCounts = {
-      // Counts of edges coming INTO other nodes by name (outgoing from self).
-      in: <{[nodeName: string]: number}> {},
-      // Counts of edges going OUT from other nodes by name (coming into self).
-      out: <{[nodeName: string]: number}> {},
-      // Counts of all control edges involving other nodes by name.
-      control: <{[nodeName: string]: number}> {},
-    };
-    _.each(bridgegraph.edges(), e => {
-      // An edge is inbound if its destination node is in the metagraph.
-      let inbound = !!metagraph.node(e.w);
-      let otherName = inbound ? e.v : e.w;
-      let metaedge = bridgegraph.edge(e);
-      if (!metaedge.numRegularEdges) {
-        otherCounts.control[otherName] =
-          (otherCounts.control[otherName] || 0) + 1;
-      } else if (inbound) {
-        otherCounts.out[otherName] = (otherCounts.out[otherName] || 0) + 1;
-      } else {
-        otherCounts.in[otherName] = (otherCounts.in[otherName] || 0) + 1;
-      }
-    });
-
-    // Add annotations and edges for bridgegraph relationships.
-    let hierarchyNodeMap = this.hierarchy.getNodeMap();
-    _.each(bridgegraph.edges(), bridgeEdgeObj => {
-      let bridgeMetaedge = bridgegraph.edge(bridgeEdgeObj);
-
-      // Determine whether this bridge edge is incoming by checking the
-      // metagraph for a node that matches the destination end.
-      let inbound = !!metagraph.node(bridgeEdgeObj.w);
-
-      // Based on the direction of the edge, one endpoint will be an immediate
-      // child of this renderNodeInfo, and the other endpoint will be a sibling
-      // of the parent (or an ancestor further up).
-      let [childName, otherName] =
-        inbound ?
-          [bridgeEdgeObj.w, bridgeEdgeObj.v] :
-          [bridgeEdgeObj.v, bridgeEdgeObj.w];
-
-      let childRenderInfo = this.index[childName];
-      let otherRenderInfo = this.index[otherName];
-      let otherNode =
-        otherRenderInfo ?
-          otherRenderInfo.node :
-          hierarchyNodeMap[otherName];
-
-      // Determine whether this edge is a control edge between nodes where
-      // either node is high-degree with respect to control edges. This will
-      // be a signal to show it as an annotation instead of a bridge edge.
-      let isHighDegreeControlEdge = !bridgeMetaedge.numRegularEdges &&
-        otherCounts.control[otherName] > PARAMS.maxControlDegree;
-
-      let [, childAnnotations] =
-        inbound ?
-          [renderNodeInfo.inAnnotations, childRenderInfo.inAnnotations] :
-          [renderNodeInfo.outAnnotations, childRenderInfo.outAnnotations];
-
-      // Don't render a bridge path if the other node has in or out degree above
-      // a threshold, lest bridge paths emanating out of a metagraph crowd up,
-      // as was the case for the Fatcat LSTM lstm_1 > lstm_1 metagraph.
-      let otherDegreeCount =
-          (inbound ? otherCounts.out : otherCounts.in)[otherName];
-      let isOtherHighDegree = otherDegreeCount > PARAMS.maxBridgePathDegree;
-
-      // The adjoining render metaedge info from the parent's coreGraph, if any.
-      // It will either be a Metaedge involving this node directly, if it
-      // previously came from a metagraph, or it'll be a Metaedge involving
-      // a previously created bridge node standing in for the other node.
-      let adjoiningMetaedge = null;
-
-      // We can only hope to render a bridge path if:
-      //  - bridgegraph paths are enabled,
-      //  - the other node is not too high-degree,
-      //  - the child is in the core (not extracted for being high-degree), and
-      //  - there's a path (in the traversal sense) between child and other.
-      let canDrawBridgePath = false;
-      if (PARAMS.enableBridgegraph &&
-          !isOtherHighDegree &&
-          !isHighDegreeControlEdge &&
-          childRenderInfo.isInCore()) {
-
-        // Utility function for finding an adjoining metaedge.
-        let findAdjoiningMetaedge = targetName => {
-          let adjoiningEdgeObj: graphlib.EdgeObject =
-            inbound ?
-              { v: targetName, w: nodeName } :
-              { v: nodeName, w: targetName };
-          return <RenderMetaedgeInfo>
-            parentNodeInfo.coreGraph.edge(adjoiningEdgeObj);
-        };
-
-        adjoiningMetaedge = findAdjoiningMetaedge(otherName);
-        if (!adjoiningMetaedge) {
-          adjoiningMetaedge = findAdjoiningMetaedge(
-              getBridgeNodeName(inbound, otherName, parentNode.name));
-        }
-
-        canDrawBridgePath = !!adjoiningMetaedge;
-      }
-
-      // Although dataflow edges are acyclic, control dependency edges may
-      // actually point 'backwards' in the graph. If this bridgeMetaedge is
-      // a control dependency, we need to determine whether it's backwards
-      // pointing so that we render it appropriately.
-      //
-      // For instance, say we're rendering a graph with nodes named A/B and Z/Y,
-      // and we're currently rendering the bridgegraph for A. Further, let's say
-      // that there was an original BaseEdge from A/B->Z/Y and a CONTROL EDGE
-      // from Z/Y=>A/B.
-      //
-      //     +----------------+
-      //     | A              |
-      //     |  +-----+       |         +------+
-      //     |  | B   |>----->|>------->| Z    |
-      //     |  |     |       |         |      |
-      //     |  |     |   *   |         |      |
-      //     |  |     |<=====<|<=======<|      |
-      //     |  +-----+       |         +------+
-      //     +----------------+
-      //
-      // When we render the subhierarchy for Metanode A, we'll come across a
-      // control-only Metaedge in the bridgegraph from Z=>A/B (*). The question
-      // is whether this edge is backwards.
-      //
-      // To answer that question, we follow the chain of adjoining metaedges
-      // until we reach the topmost one. In this case, that's the control-only
-      // Metaedge Z=>A in the ROOT's metagraph. We determine that this edge
-      // is backwards by looking at the topological ordering of ROOT's metagraph
-      // (which ignores control edges) and seeing that Z comes AFTER A.
-      //
-      // The property of being backwards is independent of whether the edge
-      // is inbound or outbound. In the preceding example, if we were building
-      // the subhierarchy for Z, we'd find bridge edge Z/Y=>A, walk to its
-      // topmost adjoining metaedge Z=>A and discover that it's backwards.
-      let backwards = false;
-      if (adjoiningMetaedge && !bridgeMetaedge.numRegularEdges) {
-        // Find the top-most adjoining render metaedge information, and the
-        // GroupNode whose metagraph must contain the associated metaedge.
-        let topAdjoiningMetaedge = adjoiningMetaedge;
-        let topGroupNode = parentNodeInfo.node;
-        while (topAdjoiningMetaedge.adjoiningMetaedge) {
-          topAdjoiningMetaedge = topAdjoiningMetaedge.adjoiningMetaedge;
-          topGroupNode = <GroupNode>topGroupNode.parentNode;
-        }
-
-        // Check against the topological ordering for the top node. The current
-        // bridge metaedge we're evaluating is backwards if its source comes
-        // after its destination.
-        let ordering = this.hierarchy.getTopologicalOrdering(topGroupNode.name);
-        let e = topAdjoiningMetaedge.metaedge;
-        backwards = ordering[e.v] > ordering[e.w];
-      }
-
-      // Render backwards control edges as annotations.
-      canDrawBridgePath = canDrawBridgePath && !backwards;
-
-      // If we can't make a bridge path for any reason, then we add an
-      // annotation instead.
-      if (!canDrawBridgePath) {
-        childAnnotations.push(new Annotation(
-            otherNode,
-            otherRenderInfo,
-            new RenderMetaedgeInfo(bridgeMetaedge),
-            AnnotationType.SHORTCUT,
-            inbound));
-        return;
-      }
-
-      // At this point, all conditions have been met for drawing a bridge path.
-
-      // Find or create the IN/OUT node representing otherNode.
-      let bridgeContainerName = getBridgeNodeName(inbound, nodeName);
-      let bridgeNodeName = getBridgeNodeName(inbound, otherName, nodeName);
-      let bridgeNodeRenderInfo = coreGraph.node(bridgeNodeName);
-      if (!bridgeNodeRenderInfo) {
-
-        // Find or create the directional container for the bridge node.
-        let bridgeContainerInfo = coreGraph.node(bridgeContainerName);
-        if (!bridgeContainerInfo) {
-          let bridgeContainerNode: BridgeNode = {
-            // Important node properties.
-            name: bridgeContainerName,
-            type: NodeType.BRIDGE,
-            // Unused node properties.
-            isGroupNode: false,
-            cardinality: 0,
-            parentNode: null,
-            stats: null,
-            include: InclusionType.UNSPECIFIED,
-            // BridgeNode properties.
-            inbound: inbound,
-            nodeAttributes: {},
-          };
-          bridgeContainerInfo =
-            new RenderNodeInfo(bridgeContainerNode);
-          this.index[bridgeContainerName] = bridgeContainerInfo;
-          coreGraph.setNode(bridgeContainerName, bridgeContainerInfo);
-        }
-
-        let bridgeNode: BridgeNode = {
-          // Important node properties.
-          name: bridgeNodeName,
-          type: NodeType.BRIDGE,
-          // Unimportant node properties.
-          isGroupNode: false,
-          cardinality: 1,
-          parentNode: null,
-          stats: null,
-          include: InclusionType.UNSPECIFIED,
-          // BridgeNode properties.
-          inbound: inbound,
-          nodeAttributes: {},
-        };
-        bridgeNodeRenderInfo = new RenderNodeInfo(bridgeNode);
-        this.index[bridgeNodeName] = bridgeNodeRenderInfo;
-        coreGraph.setNode(bridgeNodeName, bridgeNodeRenderInfo);
-
-        // Set bridgeNode to be a graphlib child of the container node.
-        coreGraph.setParent(bridgeNodeName, bridgeContainerName);
-        bridgeContainerInfo.node.cardinality++;
-      }
-
-      // Create and add a bridge render metaedge.
-      let bridgeRenderMetaedge =
-        new RenderMetaedgeInfo(bridgeMetaedge);
-      bridgeRenderMetaedge.adjoiningMetaedge = adjoiningMetaedge;
-      inbound ?
-        coreGraph.setEdge(bridgeNodeName, childName, bridgeRenderMetaedge) :
-        coreGraph.setEdge(childName, bridgeNodeName, bridgeRenderMetaedge);
-
-    }); // End _.each(bridgegraph.edges).
-
-    // For each bridge container (IN and/or OUT), add structural edges between
-    // terminal nodes and that container. A terminal node is one which has no
-    // non-bridge edges in the direction of the container.
-    //
-    // For example, consider a Metanode A which contains two child nodes A/B
-    // and A/C. Let's say it has one edge in the metagraph from A/B->A/C, and
-    // one edge in the bridgegraph from Z->A/C.
-    //
-    // At this point, we've added a container bridge node IN to house all
-    // incoming bridge nodes. We've also added a bridge node Z' (with parent IN)
-    // to A, and a bridge edge from Z'->C.
-    //
-    //     +----------------------+
-    //     | A          +---+     |
-    //     |    +------>| C |     |
-    //     |    |       +---+     |
-    //     |    |         ^       |
-    //     |    |         |       |
-    //     |    |    +----|----+  |
-    //     |    |    | IN |    |  |
-    //     |  +---+  |  +---+  |  |
-    //     |  | B |  |  | Z'|  |  |
-    //     |  +---+  |  +---+  |  |
-    //     |         +---------+  |
-    //     +----------------------+
-    //
-    // With no other help, dagre would lay out B and Z' on the same level,
-    // because both of them have no incoming edges. In other words, B is a
-    // terminal node in the INCOMING direction.
-    //
-    // But we want to force dagre to lay out Z' (and everything in IN) lower
-    // than all non-bridge nodes, so that there's enough room for the bridge
-    // edges after they've been adjusted to meet up with paths coming in from
-    // outside.
-    //
-    // To force Z' (and all other bridge nodes) to be lowest in the graph, we
-    // identify terminal nodes like B and give them structural edges to
-    // a new structural bridge node S which we add to IN.
-    //
-    //     +----------------------+
-    //     | A          +---+     |
-    //     |       +--->| C |     |
-    //     |       |    +---+     |
-    //     |     +---+    ^       |
-    //     |     | B |    |       |
-    //     |     +---+    |       |
-    //     |       ^      |       |
-    //     |       |      |       |
-    //     |  +----|------|----+  |
-    //     |  |IN  |      |    |  |
-    //     |  |  +---+  +---+  |  |
-    //     |  |  | S |  | Z'|  |  |
-    //     |  |  +---+  +---+  |  |
-    //     |  +----------------+  |
-    //     +----------------------+
-    //
-    // This ensures that dagre will lay out the bridge containers strictly at
-    // the ends of the graph. The structural edges will never be seen in the
-    // visualization except as a debugging aid.
-    _.each([true, false], inbound => {
-      let bridgeContainerName = getBridgeNodeName(inbound, nodeName);
-      let bridgeContainerInfo = coreGraph.node(bridgeContainerName);
-      if (!bridgeContainerInfo) {
-        return;
-      }
-      _.each(coreGraph.nodes(), childName => {
-        // Short-circuit if this child is a bridge node or it's not a terminal
-        // node in the direction we're interested in.
-        let childNodeInfo = coreGraph.node(childName);
-        if (childNodeInfo.node.type === NodeType.BRIDGE) {
-          return;
-        }
-        let isTerminal = inbound ?
-          !coreGraph.predecessors(childName).length :
-          !coreGraph.successors(childName).length;
-        if (!isTerminal) {
-          return;
-        }
-
-        // Find or create a bridge node in the container for all structural
-        // metaedges. It would have been nice to skip this step and simply
-        // set a metaedge between the terminal node and the container node, but
-        // in that case, something about the graph upsets dagre.layout()'s
-        // longestPath algorithm (was getting errors due to an undefined).
-        let structuralNodeName =
-            getBridgeNodeName(inbound, nodeName, 'STRUCTURAL_TARGET');
-        let structuralRenderInfo = coreGraph.node(structuralNodeName);
-        if (!structuralRenderInfo) {
-          let bridgeNode: BridgeNode = {
-            // Important Node properties.
-            name: structuralNodeName,
-            type: NodeType.BRIDGE,
-            // Unimportant Node properties.
-            isGroupNode: false,
-            cardinality: 1,
-            parentNode: null,
-            stats: null,
-            include: InclusionType.UNSPECIFIED,
-            // BridgeNode properties.
-            inbound: inbound,
-            nodeAttributes: {},
-          };
-          structuralRenderInfo = new RenderNodeInfo(bridgeNode);
-          structuralRenderInfo.structural = true;
-          this.index[structuralNodeName] = structuralRenderInfo;
-          coreGraph.setNode(structuralNodeName, structuralRenderInfo);
-          bridgeContainerInfo.node.cardinality++;
-          coreGraph.setParent(structuralNodeName, bridgeContainerName);
-        }
-
-        // Create the structural Metaedge and insert it.
-        let structuralMetaedgeInfo = new RenderMetaedgeInfo(null);
-        structuralMetaedgeInfo.structural = true;
-        structuralMetaedgeInfo.weight--; // Reduce weight for dagre layout.
-        inbound ?
-          coreGraph.setEdge(
-              structuralNodeName, childName, structuralMetaedgeInfo) :
-          coreGraph.setEdge(
-              childName, structuralNodeName, structuralMetaedgeInfo);
-      });
-    });
-  }
-}
-
-/**
- * A class for rendering annotation object which contains label
- * about the node embedded as annotation, type of annotation and the location
- * of both the annotation's node and edge.
- *
- * Annotation objects include embedded constants, embedded summary, and
- * edge shortcuts.
- */
-export class Annotation {
-  node: Node;
-  renderNodeInfo: RenderNodeInfo;
-  renderMetaedgeInfo: RenderMetaedgeInfo;
-  annotationType: AnnotationType;
-  /**
-   * Center position of annotation relative to the host
-   * node's center x.
-   */
-  dx: number;
-  /**
-   * Center position of annotation relative to the host
-   * node's center y.
-   */
-  dy: number;
-  width: number;
-  height: number;
-  /**
-   * The names of nodes on either side of this edge.
-   */
-  v: string;
-  w: string;
-  /**
-   * A flag whether it is an in-annotation (if true) or
-   * out-annotation  (if false).
-   */
-  isIn: boolean;
-  /** Label horizontal offset from the end of the node shape */
-  labelOffset: number;
-  /**
-   * Array of points for edges from the annotation to its host
-   * node. Each point contains the point location, relative to
-   * the host node's center.
-   */
-  points: {dx: number, dy: number}[];
-
-  /**
-   * Creates a new Annotation.
-   *
-   * @param node The underlying node this annotation points to.
-   * @param renderNodeInfo The render information for the underlying node
-   *     this annotation points to. This can be null if the annotation
-   *     denotes an embedding (constant, summary), in which case we
-   *     use the node property.
-   * @param renderMetaedgeInfo The render information for the edge associated
-   *     with the annotation.
-   * @param type The type of the annotation.
-   * @param isIn True if it is an in-annotation. False if it is an
-   *     out-annotation.
-   */
-  constructor(node: Node, renderNodeInfo: RenderNodeInfo,
-      renderMetaedgeInfo: RenderMetaedgeInfo, type: AnnotationType,
-      isIn: boolean) {
-    this.node = node;
-    this.renderNodeInfo = renderNodeInfo;
-    this.renderMetaedgeInfo = renderMetaedgeInfo;
-    this.annotationType = type;
-    // Properties specified by layout
-    this.dx = 0;
-    this.dy = 0;
-    this.width = 0;
-    this.height = 0;
-    // Properties needed for generating an ID for the edge's path element if
-    // this annotation is associated with a metaedge.
-    if (renderMetaedgeInfo && renderMetaedgeInfo.metaedge) {
-      this.v = renderMetaedgeInfo.metaedge.v;
-      this.w = renderMetaedgeInfo.metaedge.w;
-    }
-
-    this.isIn = isIn;
-    this.points = [];
-  }
-};
-
-export enum AnnotationType {SHORTCUT, CONSTANT, SUMMARY, ELLIPSIS};
-
-/**
- * Manages a list of annotations. Two will be used for each
- * RenderNodeInfo, one for in annotations and one for out annotations.
- */
-export class AnnotationList {
-  /**
-   * List of visually drawable annotations, may include an ellipses annotation
-   * if the number added exceeds the number specified by maxAnnotations.
-   */
-  list: Annotation[];
-
-  /**
-   * Set of nodes which have been added as annotations to this list, so we can
-   * prevent duplicates.
-   */
-  nodeNames: { [nodeName: string]: boolean };
-
-  constructor() {
-    this.list = [];
-    this.nodeNames = {};
-  }
-
-  /**
-   * Append an annotation to the list, or a stand-in ellipsis annotation instead
-   * if this would make it too many.
-   */
-  push(annotation: Annotation): void {
-    if (annotation.node.name in this.nodeNames) {
-      return; // Skip duplicate annotation.
-    }
-    this.nodeNames[annotation.node.name] = true;
-
-    if (this.list.length < PARAMS.maxAnnotations) {
-      this.list.push(annotation);
-      return;
-    }
-
-    let lastAnnotation = this.list[this.list.length - 1];
-    if (lastAnnotation.annotationType === AnnotationType.ELLIPSIS) {
-      let ellipsisNode = <EllipsisNode>lastAnnotation.node;
-      ellipsisNode.setNumMoreNodes(++ellipsisNode.numMoreNodes);
-      return;
-    }
-
-    let ellipsisNode = new tf.graph.EllipsisNodeImpl(1);
-    this.list.push(new Annotation(ellipsisNode,
-        new RenderNodeInfo(ellipsisNode), null,
-        AnnotationType.ELLIPSIS, annotation.isIn));
-  }
-}
-
-/**
- * Contains rendering information about a node in the hierarchical graph.
- */
-export class RenderNodeInfo {
-  /** Reference to the original underlying Node from the hierarchical graph. */
-  node: Node;
-  /** Whether the node is expanded or not. */
-  expanded: boolean;
-  /**
-   * List of rendering information about in-annotations like constants and
-   * shortcuts to high-degree nodes.
-   */
-  inAnnotations: AnnotationList;
-  /**
-   * List of rendering information about out-annotations (e.g. summary nodes)
-   */
-  outAnnotations: AnnotationList;
-
-  // --- Params specified by layout --- //
-
-  /** Center x position */
-  x: number;
-  /** Center y position */
-  y: number;
-  /**
-   * Total width of the node's shape, including in- and out-annotations. This
-   * property is used by dagre to layout the graph.
-   */
-  width: number;
-  /**
-   * Total height of the node's shape, including in- and out-annotations. This
-   * property is used by dagre to layout the graph.
-   */
-  height: number;
-  /**
-   * Size of the main box of the node, excluding in- and out-annotations. This
-   * property is used to draw the rectangle/ellipse shape denoting the node.
-   */
-  coreBox: {
-    width: number,
-    height: number,
-  };
-
-  /** Width of the bounding box for all in-annotations. */
-  inboxWidth: number;
-  /** Width of the bounding box for all out-annotations. */
-  outboxWidth: number;
-  /**
-   * Whether the node should be excluded from the scene.
-   * This is only used when there are too many items in a series so we only
-   * want to include top N ones.
-   */
-  // TODO(jimbo): Now that series rendering is non-recursive, remove this and
-  // all its uses from the code base.
-  excluded: boolean;
-
-  // --- Params used in drawing the bridge paths --- //
-
-  /**
-   * All bridge nodes are meant to be invisible, but whereas most represent a
-   * relationship from the underlying graph hierarchy, some exist solely for
-   * layout reasons. Specifically, those bridge nodes which have only structural
-   * rendering metaedges.
-   */
-  structural: boolean;
-
-  // --- Params for the size of the node box --- //
-
-  /** Label vertical offset from the center of node shape */
-  labelOffset: number;
-  /** Rectangle radius (for making rounded rectangle) */
-  radius: number;
-
-  // --- Params for expanded node --- //
-
-  /** Label height for expanded node. */
-  labelHeight: number;
-  // Paddings between inner subscene and the border of the expanded node.
-  paddingTop: number;
-  paddingLeft: number;
-  paddingRight: number;
-  paddingBottom: number;
-
-  /**
-   * Whether a node is extracted as source-like (having high out-degree or
-   * matching predefined in-extract pattern.)
-   */
-  isInExtract: boolean;
-  /**
-   * Whether a node is extracted as sink-like (having high in-degree or matching
-   * predefined out-extract pattern.)
-   */
-  isOutExtract: boolean;
-
-  /**
-   * List of (color, proportion) tuples based on the proportion of devices of
-   * its children. If this node is an op node, this list will have only one
-   * color with proportion 1.0.
-   */
-  deviceColors: Array<{color: string, proportion: number}>;
-
-  /**
-   * Color according to the XLA cluster of this node.
-   */
-  xlaClusterColor: string;
-
-  /**
-   * Color according to the memory usage of this node.
-   */
-  memoryColor: string;
-
-  /**
-   * Color according to the compute time of this node.
-   */
-  computeTimeColor: string;
-
-  /**
-   * Whether this node is faded out. Used when displaying stats.
-   */
-  isFadedOut: boolean;
-
-  constructor(node: Node) {
-    this.node = node;
-    this.expanded = false;
-    this.inAnnotations = new AnnotationList();
-    this.outAnnotations = new AnnotationList();
-    // Params specified by layout
-    this.x = 0;
-    this.y = 0;
-    this.width = 0;
-    this.height = 0;
-    this.inboxWidth = 0;
-    this.outboxWidth = 0;
-
-    this.excluded = false;
-
-    // Params for bridge paths.
-    this.structural = false;
-
-    // Params for node box.
-    this.labelOffset = 0;
-    this.radius = 0;
-
-    // Params for expanded node
-    this.labelHeight = 0;
-    this.paddingTop = 0;
-    this.paddingLeft = 0;
-    this.paddingRight = 0;
-    this.paddingBottom = 0;
-    this.isInExtract = false;
-    this.isOutExtract = false;
-    this.coreBox = {width: 0, height: 0};
-
-    // By default, we don't fade nodes out. Default to false for safety.
-    this.isFadedOut = false;
-  }
-
-  isInCore(): boolean {
-    return !this.isInExtract && !this.isOutExtract;
-  }
-}
-
-/**
- * Contains rendering information about a Metaedge from the underlying
- * hierarchical graph. It may be from either a metagraph or a bridgegraph.
- */
-export class RenderMetaedgeInfo {
-  /**
-   * Reference to the original underlying Metaedge from the hierarchical graph,
-   * if any. This will be null for the edges which connect OpNodes to their
-   * embeddings, for example.
-   */
-  metaedge: Metaedge;
-
-  /**
-   * Reference to the adjoining RenderMetaedgeInfo from the parent's
-   * coreGraph. This is used during layout to determine the point at which this
-   * edge should touch the node's bounding box. This property will be null for
-   * edges which terminate at a node on both ends (all non-bridge edges).
-   */
-  adjoiningMetaedge: RenderMetaedgeInfo;
-
-  /**
-   * Most of the time, a RenderMetaedgeInfo object represents a real
-   * edge between nodes in the underlying graph structure. But sometimes, an
-   * edge only exists for layout purposes. These structural edges are added
-   * during buildSubhierarchy() to force dagre.layout() to put bridge nodes
-   * at the ends of the flow.
-   * @see buildSubhierarchy()
-   */
-  structural: boolean;
-
-  /**
-   * Weight of the edge, used by dagre when deciding how important an edge is.
-   * Edges with higher weight are made shorter and straighter. The default
-   * dagre uses is 1.
-   */
-  weight: number;
-
-  /**
-   * X and Y coordinate pairs of the points in the path of the edge.
-   * @see tf.graph.node.subsceneAdjustPaths
-   */
-  points: Point[];
-
-  /**
-   * D3 selection of the group containing the path that displays this edge.
-   */
-  edgeGroup: d3.Selection<RenderMetaedgeInfo>;
-
-  /** Id of the <marker> used as a start-marker for the edge path. */
-  startMarkerId: string;
-
-  /** Id of the <marker> used as an end-marker for the edge path. */
-  endMarkerId: string;
-
-  /**
-   * Whether this edge is faded out. Used for fading out unused edges when
-   * displaying run statistics.
-   */
-  isFadedOut: boolean;
-
-  constructor(metaedge: Metaedge) {
-    this.metaedge = metaedge;
-    this.adjoiningMetaedge = null;
-    this.structural = false;
-    this.weight = 1;
-    this.isFadedOut = false;
-  }
-}
-
-function addInAnnotation(node: RenderNodeInfo, predecessor: Node,
-    predecessorRenderInfo: RenderNodeInfo,
-    edge: RenderMetaedgeInfo, type: AnnotationType): void {
-  let annotation = new Annotation(predecessor, predecessorRenderInfo, edge,
-      type, true);
-  node.inAnnotations.push(annotation);
-}
-
-function addOutAnnotation(node: RenderNodeInfo, successor: Node,
-    successorRenderInfo: RenderNodeInfo, edge: RenderMetaedgeInfo,
-    type: AnnotationType): void {
-  let annotation = new Annotation(successor, successorRenderInfo, edge,
-      type, false);
-  node.outAnnotations.push(annotation);
-}
-
-function setGraphDepth(graph: graphlib.Graph<RenderNodeInfo, any>,
-    depth: number) {
-  _.each(graph.nodes(), nodeName => {
-    let child = graph.node(nodeName);
-    child.expanded = depth > 1; // set all child of depth 1 to collapsed
-    if (depth > 0) {
-      switch (child.node.type) {
-        case NodeType.META:
-        case NodeType.SERIES:
-          setGroupNodeDepth(<RenderGroupNodeInfo>child, depth - 1);
-          break;
-        // Do nothing for leaf
-      }
-    }
-  });
-};
-
-export class RenderGroupNodeInfo extends RenderNodeInfo {
-  node: GroupNode;
-  /**
-   * The core graph is derived from the underlying node's metagraph, minus
-   * the extracted source-like and sink-like nodes.
-   */
-  coreGraph: graphlib.Graph<RenderNodeInfo, RenderMetaedgeInfo>;
-  /** Size of the bounding box for a metanode's isolated in-extract children. */
-  inExtractBox: {width: number, height: number};
-  /**
-   * Size of the bounding box for a metanode's isolated out-extract children.
-   */
-  outExtractBox: {width: number, height: number};
-  /** Array of isolated in-extract nodes. */
-  isolatedInExtract: RenderNodeInfo[];
-  /** Array of isolated out-extract nodes. */
-  isolatedOutExtract: RenderNodeInfo[];
-
-  constructor(groupNode: GroupNode) {
-    super(groupNode);
-    let metagraph = groupNode.metagraph;
-    let gl = metagraph.graph();
-    this.coreGraph =
-        createGraph<RenderNodeInfo, RenderMetaedgeInfo>(
-            gl.name, GraphType.CORE, { compound: true });
-    this.inExtractBox = {width: 0, height: 0};
-    this.outExtractBox = {width: 0, height: 0};
-    this.isolatedInExtract = [];
-    this.isolatedOutExtract = [];
-  }
-}
-
-function setGroupNodeDepth(renderInfo: RenderGroupNodeInfo,
-    depth: number): void {
-  if (renderInfo.coreGraph) {
-    setGraphDepth(renderInfo.coreGraph, depth);
-  }
-}
-
-/**
- * Remove an edge from the graph and add annotations to both ends of the edge.
- *
- * @param The core graph.
- * @param v Source name.
- * @param w Sink name.
- */
-function createShortcut(
-    graph: graphlib.Graph<RenderNodeInfo, RenderMetaedgeInfo>,
-    v: string, w: string) {
-  let src = graph.node(v);
-  let sink = graph.node(w);
-  let edge = graph.edge(v, w);
-
-  // If either of the nodes is explicitly included in the main graph and
-  // both nodes are in the main graph then do not create the shortcut
-  // and instead keep the real edge.
-  if ((src.node.include === InclusionType.INCLUDE ||
-       sink.node.include === InclusionType.INCLUDE) &&
-      src.node.include !== InclusionType.EXCLUDE &&
-      sink.node.include !== InclusionType.EXCLUDE) {
-    return;
-  }
-
-  // Add each annotation.
-  addOutAnnotation(src, sink.node, sink, edge, AnnotationType.SHORTCUT);
-  addInAnnotation(sink, src.node, src, edge, AnnotationType.SHORTCUT);
-
-  // Remove the edge from the core graph.
-  graph.removeEdge(v, w);
-}
-
-/**
- * Remove edges from a node, and set its isOutExtract property to true,
- * and remove the node and move it to isolatedOutExtract.
- *
- * If detachAllEdgesForHighDegree or forceDetach is true, extract all of its
- * edges. Otherwise, only extract all in-edges.
- */
-function makeOutExtract(renderNode: RenderGroupNodeInfo, n: string,
-    forceDetach?: boolean) {
-  let graph = renderNode.coreGraph;
-  let child = graph.node(n);
-  child.isOutExtract = true;
-
-  _.each(graph.predecessors(n), (p, index) => {
-    createShortcut(graph, p, n);
-  });
-
-  if (PARAMS.detachAllEdgesForHighDegree || forceDetach) {
-    _.each(graph.successors(n), (s, index) => {
-      createShortcut(graph, n, s);
-    });
-  }
-
-  // Remove the node from the core graph if it no longer has neighbors.
-  if (graph.neighbors(n).length === 0) {
-    child.node.include = InclusionType.EXCLUDE;
-    renderNode.isolatedOutExtract.push(child);
-    graph.removeNode(n);
-  }
-}
-
-/**
- * Remove edges from a node, set its isInExtract property to true,
- * and remove the node and move it to isolatedInExtract.
- *
- * If detachAllEdgesForHighDegree or forceDetach is true, extract all of its
- * edges. Otherwise, only remove all out-edges.
- */
-export function makeInExtract(renderNode: RenderGroupNodeInfo, n: string,
-    forceDetach?: boolean) {
-  let graph = renderNode.coreGraph;
-  let child = graph.node(n);
-  child.isInExtract = true;
-
-  _.each(graph.successors(n), (s, index) => {
-    createShortcut(graph, n, s);
-  });
-
-  if (PARAMS.detachAllEdgesForHighDegree || forceDetach) {
-    _.each(graph.predecessors(n), (p, index) => {
-      createShortcut(graph, p, n);
-    });
-  }
-
-  // Remove the node from the core graph if it no longer has neighbors.
-  if (graph.neighbors(n).length === 0) {
-    child.node.include = InclusionType.EXCLUDE;
-    renderNode.isolatedInExtract.push(child);
-    graph.removeNode(n);
-  }
-}
-
-/**
- * Check whether the node's type is a member of the given list of types.
- *
- * @param node Node.
- * @param types List of type to match.
- */
-function hasTypeIn(node: Node, types: string[]): boolean {
-  if (node.type === NodeType.OP) {
-    for (let i = 0; i < types.length; i++) {
-      if ((<OpNode>node).op === types[i]) { return true; }
-    }
-  } else if (node.type === NodeType.META) {
-    let rootOpNode = (<Metanode>node).getRootOp();
-    if (rootOpNode) {
-      for (let i = 0; i < types.length; i++) {
-        if (rootOpNode.op === types[i]) { return true; }
-      }
-    }
-  }
-  return false;
-}
-
-/** Move nodes that are specified to be excluded out of the core graph. */
-function extractSpecifiedNodes(renderNode: RenderGroupNodeInfo) {
-  let graph = renderNode.coreGraph;
-  _.each(graph.nodes(), n => {
-    let renderInfo = graph.node(n);
-    if (renderInfo.node.include === InclusionType.EXCLUDE) {
-      if (renderNode.coreGraph.outEdges(n).length >
-          renderNode.coreGraph.inEdges(n).length) {
-        makeOutExtract(renderNode, n, true);
-      } else {
-        makeInExtract(renderNode, n, true);
-      }
-    }
-  });
-}
-
-/** Remove edges from pre-defined out-extract patterns */
-function extractPredefinedSink(renderNode: RenderGroupNodeInfo) {
-  let graph = renderNode.coreGraph;
-  _.each(graph.nodes(), n => {
-    let renderInfo = graph.node(n);
-    if (renderInfo.node.include !== InclusionType.UNSPECIFIED) {
-      return;
-    }
-    if (hasTypeIn(renderInfo.node, PARAMS.outExtractTypes)) {
-      makeOutExtract(renderNode, n);
-    }
-  });
-}
-
-/** Remove edges from pre-defined in-extract patterns */
-function extractPredefinedSource(renderNode) {
-  let graph = renderNode.coreGraph;
-  _.each(graph.nodes(), n => {
-    let renderInfo = graph.node(n);
-    if (renderInfo.node.include !== InclusionType.UNSPECIFIED) {
-      return;
-    }
-    if (hasTypeIn(renderInfo.node, PARAMS.inExtractTypes)) {
-      makeInExtract(renderNode, n);
-    }
-  });
-}
-
-/** Extract nodes deemed to have either high in-degree or high out-degree. */
-function extractHighInOrOutDegree(renderNode: RenderGroupNodeInfo) {
-  let graph = renderNode.coreGraph;
-
-  // Create mappings from node to in and out degrees. Count the number of valid
-  // nodes along the way.
-  let nodeToInDegree = {};
-  let nodeToOutDegree = {};
-  let validNodeCount = 0;
-  _.each(graph.nodes(), currentNode => {
-    if (graph.node(currentNode).node.include !== InclusionType.UNSPECIFIED) {
-      // This node is not included in the first place.
-      return;
-    }
-
-    // Count the in and out degrees based on only regular edges, unless there
-    // are no regular edges, in which case use the number of control edges.
-    // This is done so that control edges don't affect if nodes are extracted
-    // from the core graph, unless the node is only used for control.
-    let inDegree =
-        _.reduce(graph.predecessors(currentNode), (inDegree, pred) => {
-          let metaedge = graph.edge(pred, currentNode).metaedge;
-          return inDegree + (metaedge.numRegularEdges ? 1 : 0);
-        }, 0);
-    if (inDegree === 0 && graph.predecessors(currentNode).length > 0) {
-      inDegree = graph.predecessors(currentNode).length;
-    }
-
-    let outDegree =
-        _.reduce(graph.successors(currentNode), (outDegree, succ) => {
-          let metaedge = graph.edge(currentNode, succ).metaedge;
-          return outDegree + (metaedge.numRegularEdges ? 1 : 0);
-        }, 0);
-    if (outDegree === 0 && graph.successors(currentNode).length > 0) {
-      outDegree = graph.successors(currentNode).length;
-    }
-
-    // Store the in and out degrees of this node to avoid recomputing.
-    nodeToInDegree[currentNode] = inDegree;
-    nodeToOutDegree[currentNode] = outDegree;
-    validNodeCount++;
-  });
-
-  if (validNodeCount < PARAMS.minNodeCountForExtraction) {
-    // This graph has few nodes. Do not extract any nodes.
-    return;
-  }
-
-  // We only extract if the node has a min in or out degree greater than this.
-  let minUpperBound = PARAMS.minDegreeForExtraction - 1;
-
-  // Mark for extraction nodes with in-degree > Q3 + (Q3 - Q1).
-  let q3Index = Math.round(validNodeCount * 0.75);
-  let q1Index = Math.round(validNodeCount * 0.25);
-  let sortedByInDegree = Object.keys(nodeToInDegree).sort((node0, node1) => {
-    return nodeToInDegree[node0] - nodeToInDegree[node1];
-  });
-  let inDegreeQ3 = nodeToInDegree[sortedByInDegree[q3Index]];
-  let inDegreeQ1 = nodeToInDegree[sortedByInDegree[q1Index]];
-  let inDegreeUpperBound = inDegreeQ3 + inDegreeQ3 - inDegreeQ1;
-  // Only extract if the upper bound is high enough.
-  inDegreeUpperBound = Math.max(inDegreeUpperBound, minUpperBound);
-  for (let i = validNodeCount - 1;
-       nodeToInDegree[sortedByInDegree[i]] > inDegreeUpperBound; i--) {
-    // Extract a high in-degree node.
-    makeInExtract(renderNode, sortedByInDegree[i]);
-  }
-
-  // Mark for extraction nodes with out-degree > Q3 + (Q3 - Q1) * 4.
-  let sortedByOutDegree = Object.keys(nodeToOutDegree).sort((node0, node1) => {
-    return nodeToOutDegree[node0] - nodeToOutDegree[node1];
-  });
-  let outDegreeQ3 = nodeToOutDegree[sortedByOutDegree[q3Index]];
-  let outDegreeQ1 = nodeToOutDegree[sortedByOutDegree[q1Index]];
-  // The upper bound for extracting out-degree nodes is higher than that for
-  // extracting in-degree ones (Note the "* 4") because, in practice, some
-  // graphs look worse with a smaller out-degree bound. For instance, a smaller
-  // out-degree bound removes the convolution nodes from cifar 10 train's graph.
-  let outDegreeUpperBound = outDegreeQ3 + (outDegreeQ3 - outDegreeQ1) * 4;
-  // Only extract if the upper bound is high enough.
-  outDegreeUpperBound = Math.max(outDegreeUpperBound, minUpperBound);
-  for (let i = validNodeCount - 1;
-       nodeToOutDegree[sortedByOutDegree[i]] > outDegreeUpperBound; i--) {
-    let node = graph.node(sortedByOutDegree[i]);
-    if (!node || node.isInExtract) {
-      // This node has already been extracted due to high in-degree. It might
-      // have been removed from the graph in general (during in-degree
-      // extraction) due to a lack of neighbors. Do not extract this node twice.
-      continue;
-    }
-
-    // Extract a high out-degree node that has not already been extracted.
-    makeOutExtract(renderNode, sortedByOutDegree[i]);
-  }
-}
-
-/** Remove control edges from nodes that have too many control edges */
-function removeControlEdges(renderNode: RenderGroupNodeInfo) {
-  let graph = renderNode.coreGraph;
-
-  // Collect control edges into a map by node name.
-  let map = <{[nodeName: string]: graphlib.EdgeObject[]}>{};
-  _.each(graph.edges(), e => {
-    if (!graph.edge(e).metaedge.numRegularEdges) {
-      (map[e.v] = map[e.v] || []).push(e);
-      (map[e.w] = map[e.w] || []).push(e);
-    }
-  });
-
-  // For each node with too many control edges, turn them into annotations.
-  _.each(map, (edges, nodeName) => {
-    if (edges.length > PARAMS.maxControlDegree) {
-      _.each(edges, e => createShortcut(graph, e.v, e.w));
-    }
-  });
-}
-
-/**
- * Given an integer, picks a hue that is far apart from other colors.
- * The formula for picking color that avoid collision is:
- *     hue = (color range * golden ratio * index) % color range
- */
-export function mapIndexToHue(id: number): number {
-  let GOLDEN_RATIO = 1.61803398875;
-  // Hue of 0 is reserved for the gray nodes.
-  let MIN_HUE = 1;
-  let MAX_HUE = 359;
-  let COLOR_RANGE = MAX_HUE - MIN_HUE;
-  return MIN_HUE + ((COLOR_RANGE * GOLDEN_RATIO * id) % COLOR_RANGE);
-};
-
-/**
- * Remove edges and add to annotation instead.
- *
- * For root node, consider predefined types for source and sink.
- * We do not extract predefined type from non-root so that Variables and the
- * sgd node (op type = 'NoOp') do not get extract from inside own group.
- *
- * The order of extraction is important here as swapping the order can totally
- * screw up the graph layout.
- *
- * @param {Render.Node} renderNode Node to manipulate.
- */
-function extractHighDegrees(renderNode: RenderGroupNodeInfo) {
-
-  extractSpecifiedNodes(renderNode);
-
-  if (PARAMS.outExtractTypes) {
-    extractPredefinedSink(renderNode);
-  }
-
-  // This has to come before extract high in-degree to protect the core part
-  // that takes many variables.
-  if (PARAMS.inExtractTypes) {
-    extractPredefinedSource(renderNode);
-  }
-
-  extractHighInOrOutDegree(renderNode);
-
-  if (PARAMS.maxControlDegree) {
-    removeControlEdges(renderNode);
-  }
-
-  // Extract isolated nodes, which can be
-  // (1) source-like and sink-like nodes that are not originally isolated but
-  //     become isolated after further removal.
-  // (2) isolated nodes with annotations on one-side.  These might be either
-  //     - nodes that originally have high out-degree but because we remove
-  //       high in-degree nodes first, they no longer have high in-degree when
-  //       we check.  (Detecting all high-degree before removing also leads to
-  //       another problem.)
-  //     - nodes that do not have high degree, but their neighbors are all
-  //       extracted, so it might make sense to extract them too.
-
-  let graph = renderNode.coreGraph;
-  _.each(graph.nodes(), n => {
-    let child = graph.node(n);
-    let degree = graph.neighbors(n).length;
-    if (child.node.include !== InclusionType.UNSPECIFIED) {
-      return;
-    }
-    if (degree === 0) {
-      let hasOutAnnotations = child.outAnnotations.list.length > 0;
-      let hasInAnnotations = child.inAnnotations.list.length > 0;
-
-      if (child.isInExtract) { // Is source-like.
-        // This case only happens if detachAllEdgesForHighDegree is false.
-        // (Otherwise all source-like nodes are all isolated already.)
-        renderNode.isolatedInExtract.push(child);
-        child.node.include = InclusionType.EXCLUDE;
-        graph.removeNode(n);
-      } else if (child.isOutExtract) { // Is sink-like.
-        // This case only happens if detachAllEdgesForHighDegree is false.
-        // // (Otherwise all sink-like nodes are all isolated already.)
-        renderNode.isolatedOutExtract.push(child);
-        child.node.include = InclusionType.EXCLUDE;
-        graph.removeNode(n);
-      } else if (PARAMS.extractIsolatedNodesWithAnnotationsOnOneSide) {
-        if (hasOutAnnotations && !hasInAnnotations) {
-          child.isInExtract = true; // for ones with high out-annotations
-          renderNode.isolatedInExtract.push(child);
-          child.node.include = InclusionType.EXCLUDE;
-          graph.removeNode(n);
-        } else if (hasInAnnotations && !hasOutAnnotations) {
-          child.isOutExtract = true; // for ones with high in-annotations
-          renderNode.isolatedOutExtract.push(child);
-          child.node.include = InclusionType.EXCLUDE;
-          graph.removeNode(n);
-        } else {
-          // if a low degree node has both in- & out- annotations, do nothing
-          // because it is unclear which side it should go to.
-        }
-      }
-    }
-  });
-}
-} // close module tf.graph.render
diff --git a/tensorflow/tensorboard/components/tf_graph_common/scene.ts b/tensorflow/tensorboard/components/tf_graph_common/scene.ts
deleted file mode 100644
index e84a2b747c..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/scene.ts
+++ /dev/null
@@ -1,678 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph.scene {
-  const svgNamespace = 'http://www.w3.org/2000/svg';
-
-  /** Enums element class of objects in the scene */
-  export let Class = {
-    Node: {
-      // <g> element that contains nodes.
-      CONTAINER: 'nodes',
-      // <g> element that contains detail about a node.
-      GROUP: 'node',
-      // <g> element that contains visual elements (like rect, ellipse).
-      SHAPE: 'nodeshape',
-      // <*> element(s) under SHAPE that should receive color updates.
-      COLOR_TARGET: 'nodecolortarget',
-      // <text> element showing the node's label.
-      LABEL: 'nodelabel',
-      // <g> element that contains all visuals for the expand/collapse
-      // button for expandable group nodes.
-      BUTTON_CONTAINER: 'buttoncontainer',
-      // <circle> element that surrounds expand/collapse buttons.
-      BUTTON_CIRCLE: 'buttoncircle',
-      // <path> element of the expand button.
-      EXPAND_BUTTON: 'expandbutton',
-      // <path> element of the collapse button.
-      COLLAPSE_BUTTON: 'collapsebutton'
-    },
-    Edge: {
-      CONTAINER: 'edges',
-      GROUP: 'edge',
-      LINE: 'edgeline',
-      REF_LINE: 'refline',
-      STRUCTURAL: 'structural'
-    },
-    Annotation: {
-      OUTBOX: 'out-annotations',
-      INBOX: 'in-annotations',
-      GROUP: 'annotation',
-      NODE: 'annotation-node',
-      EDGE: 'annotation-edge',
-      CONTROL_EDGE: 'annotation-control-edge',
-      LABEL: 'annotation-label',
-      ELLIPSIS: 'annotation-ellipsis'
-    },
-    Scene: {
-      GROUP: 'scene',
-      CORE: 'core',
-      INEXTRACT: 'in-extract',
-      OUTEXTRACT: 'out-extract'
-    },
-    Subscene: {GROUP: 'subscene'},
-    OPNODE: 'op',
-    METANODE: 'meta',
-    SERIESNODE: 'series',
-    BRIDGENODE: 'bridge',
-    ELLIPSISNODE: 'ellipsis'
-  };
-
-  /**
-   * A health pill encapsulates an overview of tensor element values. The value
-   * field is a list of 12 numbers that shed light on the status of the tensor.
-   * Visualized in health pills are the 3rd through 8th (inclusive) numbers of
-   * health pill values. Those 6 numbers are counts of tensor elements that fall
-   * under -Inf, negative, 0, positive, +Inf, NaN (in that order).
-   *
-   * Please keep this interface consistent with HealthPillDatum within
-   * backend.ts.
-   */
-  export interface HealthPill {
-    node_name: string;
-    output_slot: number;
-    value: number[];
-    wall_time: number;
-    step: number;
-  }
-  ;
-
-  /**
-   * Encapsulates how to render a single entry in a health pill. Each entry
-   * corresponds to a category of tensor element values.
-   */
-  export interface HealthPillEntry {
-    background_color: string;
-    label: string;
-  }
-  ;
-  export let healthPillEntries: HealthPillEntry[] = [
-    {
-      background_color: '#CC2F2C',
-      label: 'NaN',
-    },
-    {
-      background_color: '#FF8D00',
-      label: '- ∞',
-    },
-    {
-      background_color: '#EAEAEA',
-      label: '-',
-    },
-    {
-      background_color: '#A5A5A5',
-      label: '0',
-    },
-    {
-      background_color: '#262626',
-      label: '+',
-    },
-    {
-      background_color: '#003ED4',
-      label: '+ ∞',
-    },
-  ];
-
-  /**
-   * Helper method for fitting the graph in the svg view.
-   *
-   * @param svg The main svg.
-   * @param zoomG The svg group used for panning and zooming.
-   * @param d3zoom The zoom behavior.
-   * @param callback Called when the fitting is done.
-   */
-  export function fit(svg, zoomG, d3zoom, callback) {
-    let svgRect = svg.getBoundingClientRect();
-    let sceneSize = null;
-    try {
-      sceneSize = zoomG.getBBox();
-      if (sceneSize.width === 0) {
-        // There is no scene anymore. We have been detached from the dom.
-        return;
-      }
-    } catch (e) {
-      // Firefox produced NS_ERROR_FAILURE if we have been
-      // detached from the dom.
-      return;
-    }
-    let scale = 0.9 *
-        Math.min(
-            svgRect.width / sceneSize.width, svgRect.height / sceneSize.height,
-            2);
-    let params = layout.PARAMS.graph;
-    let zoomEvent =
-        d3zoom.scale(scale)
-            .on('zoomend.fitted',
-                () => {
-                  // Remove the listener for the zoomend event,
-                  // so we don't get called at the end of regular zoom events,
-                  // just those that fit the graph to screen.
-                  d3zoom.on('zoomend.fitted', null);
-                  callback();
-                })
-            .translate([params.padding.paddingLeft, params.padding.paddingTop])
-            .event;
-    d3.select(zoomG).transition().duration(500).call(zoomEvent);
-};
-
-/**
- * Helper method for panning the graph to center on the provided node,
- * if the node is currently off-screen.
- *
- * @param nodeName The node to center the graph on
- * @param svg The root SVG element for the graph
- * @param zoomG The svg group used for panning and zooming.
- * @param d3zoom The zoom behavior.
- * @return True if the graph had to be panned to display the
- *            provided node.
- */
-export function panToNode(nodeName: String, svg, zoomG, d3zoom): boolean {
-  let node = <SVGAElement>d3
-                 .select('[data-name="' + nodeName + '"].' + Class.Node.GROUP)
-                 .node();
-  if (!node) {
-    return false;
-  }
-  let translate = d3zoom.translate();
-  // Check if the selected node is off-screen in either
-  // X or Y dimension in either direction.
-  let nodeBox = node.getBBox();
-  let nodeCtm = node.getScreenCTM();
-  let pointTL = svg.createSVGPoint();
-  let pointBR = svg.createSVGPoint();
-  pointTL.x = nodeBox.x;
-  pointTL.y = nodeBox.y;
-  pointBR.x = nodeBox.x + nodeBox.width;
-  pointBR.y = nodeBox.y + nodeBox.height;
-  pointTL = pointTL.matrixTransform(nodeCtm);
-  pointBR = pointBR.matrixTransform(nodeCtm);
-  let isOutsideOfBounds = (start, end, bound) => {
-    return end < 0 || start > bound;
-  };
-  let svgRect = svg.getBoundingClientRect();
-  if (isOutsideOfBounds(pointTL.x, pointBR.x, svgRect.width) ||
-      isOutsideOfBounds(pointTL.y, pointBR.y, svgRect.height)) {
-    // Determine the amount to transform the graph in both X and Y
-    // dimensions in order to center the selected node. This takes into
-    // acount the position of the node, the size of the svg scene, the
-    // amount the scene has been scaled by through zooming, and any previous
-    // transform already performed by this logic.
-    let centerX = (pointTL.x + pointBR.x) / 2;
-    let centerY = (pointTL.y + pointBR.y) / 2;
-    let dx = ((svgRect.width / 2) - centerX);
-    let dy = ((svgRect.height / 2) - centerY);
-    let zoomEvent = d3zoom.translate([translate[0] + dx, translate[1] + dy])
-        .event;
-    d3.select(zoomG).transition().duration(500).call(zoomEvent);
-    return true;
-  }
-  return false;
-};
-
-/**
- * Given a container d3 selection, select a child svg element of a given tag
- * and class if exists or append / insert one otherwise.  If multiple children
- * matches the tag and class name, returns only the first one.
- *
- * @param container
- * @param tagName tag name.
- * @param className (optional) Class name or a list of class names.
- * @param before (optional) reference DOM node for insertion.
- * @return selection of the element
- */
-export function selectOrCreateChild(
-    container, tagName: string, className?: string | string[], before?) {
-  let child = selectChild(container, tagName, className);
-  if (!child.empty()) {
-    return child;
-  }
-  let newElement =
-      document.createElementNS('http://www.w3.org/2000/svg', tagName);
-
-  if (className instanceof Array) {
-    for (let i = 0; i < className.length; i++) {
-      newElement.classList.add(className[i]);
-    }
-  } else {
-    newElement.classList.add(className);
-  }
-
-  if (before) { // if before exists, insert
-    container.node().insertBefore(newElement, before);
-  } else { // otherwise, append
-    container.node().appendChild(newElement);
-  }
-  return d3.select(newElement)
-           // need to bind data to emulate d3_selection.append
-           .datum(container.datum());
-};
-
-/**
- * Given a container d3 selection, select a child element of a given tag and
- * class. If multiple children matches the tag and class name, returns only
- * the first one.
- *
- * @param container
- * @param tagName tag name.
- * @param className (optional) Class name or list of class names.
- * @return selection of the element, or an empty selection
- */
-export function selectChild(
-    container, tagName: string, className?: string | string[]) {
-  let children = container.node().childNodes;
-  for (let i = 0; i < children.length; i++) {
-    let child = children[i];
-    if (child.tagName === tagName) {
-      if (className instanceof Array) {
-        let hasAllClasses = true;
-        for (let j = 0; j < className.length; j++) {
-          hasAllClasses =
-              hasAllClasses && child.classList.contains(className[j]);
-        }
-        if (hasAllClasses) {
-          return d3.select(child);
-        }
-      } else if ((!className || child.classList.contains(className))) {
-        return d3.select(child);
-      }
-    }
-  }
-  return d3.select(null);
-};
-
-/**
- * Select or create a sceneGroup and build/update its nodes and edges.
- *
- * Structure Pattern:
- *
- * <g class='scene'>
- *   <g class='core'>
- *     <g class='edges'>
- *       ... stuff from tf.graph.scene.edges.build ...
- *     </g>
- *     <g class='nodes'>
- *       ... stuff from tf.graph.scene.nodes.build ...
- *     </g>
- *   </g>
- *   <g class='in-extract'>
- *     <g class='nodes'>
- *       ... stuff from tf.graph.scene.nodes.build ...
- *     </g>
- *   </g>
- *   <g class='out-extract'>
- *     <g class='nodes'>
- *       ... stuff from tf.graph.scene.nodes.build ...
- *     </g>
- *   </g>
- * </g>
- *
- * @param container D3 selection of the parent.
- * @param renderNode render node of a metanode or series node.
- * @param sceneElement <tf-graph-scene> polymer element.
- * @param sceneClass class attribute of the scene (default='scene').
- */
-export function buildGroup(container,
-    renderNode: render.RenderGroupNodeInfo,
-    sceneElement,
-    sceneClass: string) {
-  sceneClass = sceneClass || Class.Scene.GROUP;
-  let isNewSceneGroup = selectChild(container, 'g', sceneClass).empty();
-  let sceneGroup = selectOrCreateChild(container, 'g', sceneClass);
-
-  // core
-  let coreGroup = selectOrCreateChild(sceneGroup, 'g', Class.Scene.CORE);
-  let coreNodes = _.reduce(renderNode.coreGraph.nodes(), (nodes, name) => {
-                    let node = renderNode.coreGraph.node(name);
-                    if (!node.excluded) {
-                      nodes.push(node);
-                    }
-                    return nodes;
-                  }, []);
-
-  if (renderNode.node.type === NodeType.SERIES) {
-    // For series, we want the first item on top, so reverse the array so
-    // the first item in the series becomes last item in the top, and thus
-    // is rendered on the top.
-    coreNodes.reverse();
-  }
-
-  // Create the layer of edges for this scene (paths).
-  edge.buildGroup(coreGroup, renderNode.coreGraph, sceneElement);
-
-  // Create the layer of nodes for this scene (ellipses, rects etc).
-  node.buildGroup(coreGroup, coreNodes, sceneElement);
-
-  // In-extract
-  if (renderNode.isolatedInExtract.length > 0) {
-    let inExtractGroup =
-        selectOrCreateChild(sceneGroup, 'g', Class.Scene.INEXTRACT);
-    node.buildGroup(inExtractGroup, renderNode.isolatedInExtract,
-        sceneElement);
-  } else {
-    selectChild(sceneGroup, 'g', Class.Scene.INEXTRACT).remove();
-  }
-
-  // Out-extract
-  if (renderNode.isolatedOutExtract.length > 0) {
-    let outExtractGroup =
-        selectOrCreateChild(sceneGroup, 'g', Class.Scene.OUTEXTRACT);
-    node.buildGroup(outExtractGroup, renderNode.isolatedOutExtract,
-        sceneElement);
-  } else {
-    selectChild(sceneGroup, 'g', Class.Scene.OUTEXTRACT).remove();
-  }
-
-  position(sceneGroup, renderNode);
-
-  // Fade in the scene group if it didn't already exist.
-  if (isNewSceneGroup) {
-    sceneGroup.attr('opacity', 0).transition().attr('opacity', 1);
-  }
-
-  return sceneGroup;
-};
-
-/**
- * Given a scene's svg group, set  g.in-extract, g.coreGraph, g.out-extract svg
- * groups' position relative to the scene.
- *
- * @param sceneGroup
- * @param renderNode render node of a metanode or series node.
- */
-function position(sceneGroup, renderNode: render.RenderGroupNodeInfo) {
-  // Translate scenes down by the label height so that when showing graphs in
-  // expanded metanodes, the graphs are below the labels.  Do not shift them
-  // down for series nodes as series nodes don't have labels inside of their
-  // bounding boxes.
-  let yTranslate = renderNode.node.type === NodeType.SERIES ?
-    0 : layout.PARAMS.subscene.meta.labelHeight;
-
-  // core
-  translate(selectChild(sceneGroup, 'g', Class.Scene.CORE), 0, yTranslate);
-
-  // in-extract
-  let hasInExtract = renderNode.isolatedInExtract.length > 0;
-  let hasOutExtract = renderNode.isolatedOutExtract.length > 0;
-
-  if (hasInExtract) {
-    let offset = layout.PARAMS.subscene.meta.extractXOffset;
-    let inExtractX = renderNode.coreBox.width -
-      renderNode.inExtractBox.width / 2 - renderNode.outExtractBox.width -
-          (hasOutExtract ? offset : 0);
-    translate(
-        selectChild(sceneGroup, 'g', Class.Scene.INEXTRACT), inExtractX,
-        yTranslate);
-  }
-
-  // out-extract
-  if (hasOutExtract) {
-    let outExtractX = renderNode.coreBox.width -
-      renderNode.outExtractBox.width / 2;
-    translate(
-        selectChild(sceneGroup, 'g', Class.Scene.OUTEXTRACT), outExtractX,
-        yTranslate);
-  }
-};
-
-/** Adds a click listener to a group that fires a graph-select event */
-export function addGraphClickListener(graphGroup, sceneElement) {
-  d3.select(graphGroup).on('click', () => {
-    sceneElement.fire('graph-select');
-  });
-};
-
-/** Helper for adding transform: translate(x0, y0) */
-export function translate(selection, x0: number, y0: number) {
-  // If it is already placed on the screen, make it a transition.
-  if (selection.attr('transform') != null) {
-    selection = selection.transition('position');
-  }
-  selection.attr('transform', 'translate(' + x0 + ',' + y0 + ')');
-};
-
-/**
- * Helper for setting position of a svg rect
- * @param rect rect to set position of.
- * @param cx Center x.
- * @param cy Center x.
- * @param width Width to set.
- * @param height Height to set.
- */
-export function positionRect(rect, cx: number, cy: number, width: number,
-    height: number) {
-  rect.transition().attr({
-    x: cx - width / 2,
-    y: cy - height / 2,
-    width: width,
-    height: height
-  });
-};
-
-/**
- * Helper for setting position of a svg expand/collapse button
- * @param button container group
- * @param renderNode the render node of the group node to position
- *        the button on.
- */
-export function positionButton(button, renderNode: render.RenderNodeInfo) {
-  let cx = layout.computeCXPositionOfNodeShape(renderNode);
-  // Position the button in the top-right corner of the group node,
-  // with space given the draw the button inside of the corner.
-  let width = renderNode.expanded ?
-      renderNode.width : renderNode.coreBox.width;
-  let height = renderNode.expanded ?
-      renderNode.height : renderNode.coreBox.height;
-  let x = cx + width / 2 - 6;
-  let y = renderNode.y - height / 2 + 6;
-  // For unexpanded series nodes, the button has special placement due
-  // to the unique visuals of this group node.
-  if (renderNode.node.type === NodeType.SERIES && !renderNode.expanded) {
-    x += 10;
-    y -= 2;
-  }
-  let translateStr = 'translate(' + x + ',' + y + ')';
-  button.selectAll('path').transition().attr('transform', translateStr);
-  button.select('circle').transition().attr(
-      {cx: x, cy: y, r: layout.PARAMS.nodeSize.meta.expandButtonRadius});
-};
-
-/**
- * Helper for setting position of a svg ellipse
- * @param ellipse ellipse to set position of.
- * @param cx Center x.
- * @param cy Center x.
- * @param width Width to set.
- * @param height Height to set.
- */
-export function positionEllipse(ellipse, cx: number, cy: number,
-    width: number, height: number) {
-  ellipse.transition().attr({
-    cx: cx,
-    cy: cy,
-    rx: width / 2,
-    ry: height / 2
-  });
-};
-
-/**
- * @param {number} stat A stat for a health pill (such as mean or variance).
- * @param {boolean} shouldRoundOnesDigit Whether to round this number to the
- *     ones digit. Useful for say int, uint, and bool output types.
- * @return {string} A human-friendly string representation of that stat.
- */
-export function humanizeHealthPillStat(stat, shouldRoundOnesDigit) {
-  if (shouldRoundOnesDigit) {
-    return stat.toFixed(0);
-  }
-
-  if (Math.abs(stat) >= 1) {
-    return stat.toFixed(1);
-  }
-  return stat.toExponential(1);
-}
-
-/**
- * Renders a health pill for an op atop a node.
- */
-function _addHealthPill(
-    nodeGroupElement: SVGElement, healthPill: HealthPill,
-    nodeInfo: render.RenderNodeInfo) {
-  // Check if text already exists at location.
-  d3.select(nodeGroupElement.parentNode).selectAll('.health-pill').remove();
-
-  if (!nodeInfo || !healthPill) {
-    return;
-  }
-
-  let lastHealthPillData = healthPill.value;
-
-  // For now, we only visualize the 6 values that summarize counts of tensor
-  // elements of various categories: -Inf, negative, 0, positive, Inf, and NaN.
-  let lastHealthPillOverview = lastHealthPillData.slice(2, 8);
-  let totalCount = lastHealthPillData[1];
-
-  let healthPillWidth = 60;
-  let healthPillHeight = 10;
-  if (nodeInfo.node.type === tf.graph.NodeType.OP) {
-    // Use a smaller health pill for op nodes (rendered as smaller ellipses).
-    healthPillWidth /= 2;
-    healthPillHeight /= 2;
-  }
-
-  let healthPillGroup = document.createElementNS(svgNamespace, 'g');
-  healthPillGroup.classList.add('health-pill');
-
-  // Define the gradient for the health pill.
-  let healthPillDefs = document.createElementNS(svgNamespace, 'defs');
-  healthPillGroup.appendChild(healthPillDefs);
-  let healthPillGradient =
-      document.createElementNS(svgNamespace, 'linearGradient');
-  const healthPillGradientId = 'health-pill-gradient';
-  healthPillGradient.setAttribute('id', healthPillGradientId);
-  let titleOnHoverTextEntries = [];
-  let cumulativeCount = 0;
-  let previousOffset = '0%';
-  for (let i = 0; i < lastHealthPillOverview.length; i++) {
-    if (!lastHealthPillOverview[i]) {
-      // Exclude empty categories.
-      continue;
-    }
-    cumulativeCount += lastHealthPillOverview[i];
-
-    // Create a color interval using 2 stop elements.
-    let stopElement0 = document.createElementNS(svgNamespace, 'stop');
-    stopElement0.setAttribute('offset', previousOffset);
-    stopElement0.setAttribute(
-        'stop-color', healthPillEntries[i].background_color);
-    healthPillGradient.appendChild(stopElement0);
-
-    let stopElement1 = document.createElementNS(svgNamespace, 'stop');
-    let percent = (cumulativeCount * 100 / totalCount) + '%';
-    stopElement1.setAttribute('offset', percent);
-    stopElement1.setAttribute(
-        'stop-color', healthPillEntries[i].background_color);
-    healthPillGradient.appendChild(stopElement1);
-    previousOffset = percent;
-
-    // Include this number in the title that appears on hover.
-    titleOnHoverTextEntries.push(
-        healthPillEntries[i].label + ': ' + lastHealthPillOverview[i]);
-  }
-  healthPillDefs.appendChild(healthPillGradient);
-
-  // Create the rectangle for the health pill.
-  let rect = document.createElementNS(svgNamespace, 'rect');
-  rect.setAttribute('fill', 'url(#' + healthPillGradientId + ')');
-  rect.setAttribute('width', String(healthPillWidth));
-  rect.setAttribute('height', String(healthPillHeight));
-  healthPillGroup.appendChild(rect);
-
-  // Show a title with specific counts on hover.
-  let titleSvg = document.createElementNS(svgNamespace, 'title');
-  titleSvg.textContent = titleOnHoverTextEntries.join(', ');
-  healthPillGroup.appendChild(titleSvg);
-
-  // Center this health pill just right above the node for the op.
-  let healthPillX = nodeInfo.x - healthPillWidth / 2;
-  let healthPillY = nodeInfo.y - healthPillHeight - nodeInfo.height / 2 - 2;
-  if (nodeInfo.labelOffset < 0) {
-    // The label is positioned above the node. Do not occlude the label.
-    healthPillY += nodeInfo.labelOffset;
-  }
-
-  if (lastHealthPillOverview[2] || lastHealthPillOverview[3] ||
-      lastHealthPillOverview[4]) {
-    // At least 1 "non-Inf and non-NaN" value exists (a -, 0, or + value). Show
-    // stats on tensor values.
-
-    // Determine if we should display the output range as integers.
-    let shouldRoundOnesDigit = false;
-    let node = nodeInfo.node as OpNode;
-    let attributes = node.attr;
-    if (attributes && attributes.length) {
-      // Find the attribute for output type if there is one.
-      for (let i = 0; i < attributes.length; i++) {
-        if (attributes[i].key === 'T') {
-          // Note whether the output type is an integer.
-          let outputType = attributes[i].value['type'];
-          shouldRoundOnesDigit =
-              outputType && /^DT_(BOOL|INT|UINT)/.test(outputType);
-          break;
-        }
-      }
-    }
-
-    let statsSvg = document.createElementNS(svgNamespace, 'text');
-    const minString =
-        humanizeHealthPillStat(lastHealthPillData[8], shouldRoundOnesDigit);
-    const maxString =
-        humanizeHealthPillStat(lastHealthPillData[9], shouldRoundOnesDigit);
-    statsSvg.textContent = minString + ' ~ ' + maxString;
-    statsSvg.classList.add('health-pill-stats');
-    statsSvg.setAttribute('x', String(healthPillWidth / 2));
-    statsSvg.setAttribute('y', '-2');
-    healthPillGroup.appendChild(statsSvg);
-  }
-
-  healthPillGroup.setAttribute(
-      'transform', 'translate(' + healthPillX + ', ' + healthPillY + ')');
-
-  Polymer.dom(nodeGroupElement.parentNode).appendChild(healthPillGroup);
-}
-
-/**
- * Adds health pills (which visualize tensor summaries) to a graph group.
- * @param svgRoot The root SVG element of the graph to add heath pills to.
- * @param nodeNamesToHealthPills An object mapping node name to health pill.
- * @param colors A list of colors to use.
- */
-export function addHealthPills(
-    svgRoot: SVGElement, nodeNamesToHealthPills: {[key: string]: HealthPill[]},
-    healthPillStepIndex: number) {
-  if (!nodeNamesToHealthPills) {
-    // No health pill information available.
-    return;
-  }
-
-  let svgRootSelection = d3.select(svgRoot);
-  svgRootSelection.selectAll('g.nodeshape')
-      .each(function(nodeInfo: render.RenderNodeInfo) {
-        // Only show health pill data for this node if it is available.
-        let healthPills = nodeNamesToHealthPills[nodeInfo.node.name];
-        let healthPill = healthPills ? healthPills[healthPillStepIndex] : null;
-        _addHealthPill(this, healthPill, nodeInfo);
-      });
-};
-
-} // close module
diff --git a/tensorflow/tensorboard/components/tf_graph_common/template.ts b/tensorflow/tensorboard/components/tf_graph_common/template.ts
deleted file mode 100644
index 7800d46029..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/template.ts
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-module tf.graph.template {
-
-/**
- * Detect repeating patterns of subgraphs.
- * Assign templateId to each subgraph if it belongs to a template.
- * Returns clusters of similar subgraphs .
- *
- * @param graph
- * @param verifyTemplate whether to run the template verification algorithm
- * @return a dict (template id => Array of node names)
- */
-export function detect(h, verifyTemplate): {[templateId: string]: string[]} {
-  // In any particular subgraph, there are either
-  // - leaf nodes (which do not have subgraph)
-  // - metanode nodes - some of them have only one member (singular metanode)
-  //                    and some have multiple members (non-singular metanode)
-
-  // First, generate a nearest neighbor hash of metanode nodes.
-  let nnGroups = clusterSimilarSubgraphs(h);
-
-  // For each metanode, compare its subgraph (starting from shallower groups)
-  // and assign template id.
-  let templates = groupTemplateAndAssignId(nnGroups, verifyTemplate);
-
-  // Sort the templates by minimum level in the graph at which they appear,
-  // as this leads to optimal setting of the colors of each template for
-  // maximum differentiation.
-  return <{[templateId: string]: string[]}>_(templates)
-      .pairs()
-      .sortBy(function(pair: {level: number, nodes: string[]}[]) {
-        return pair[1].level;
-      })
-      .map(function(pair: {level: number, nodes: string[]}[]) {
-        return [pair[0], pair[1].nodes];
-      })
-      .object()
-      .value();
-};
-
-/**
- * @return Unique string for a metanode based on depth, |V|, |E| and
- * op type histogram.
- */
-function getSignature(metanode) {
-  // depth=<number> |V|=<number> |E|=<number>
-  let props = _.map(
-                   {
-                     'depth': metanode.depth,
-                     '|V|': metanode.metagraph.nodes().length,
-                     '|E|': metanode.metagraph.edges().length
-                   },
-                   function(v, k) { return k + '=' + v; })
-                  .join(' ');
-
-  // optype1=count1,optype2=count2
-  let ops = _.map(metanode.opHistogram, function(count, op) {
-               return op + '=' + count;
-             }).join(',');
-
-  return props + ' [ops] ' + ops;
-}
-
-/**
- * Generate a nearest neighbor hash of metanodes
- * based on depth, |V|, |E|, and opHistogram of their subgraph
- * (excluding leaf nodes and singular metanodes).
- * @param graph The graph
- * @return Array of pairs of [signature,
- *   Object with min level of the template and an Array of tf.graph.Group]
- *   sort by ascending order of minimum depth at which metanode appears.
- */
-function clusterSimilarSubgraphs(h: hierarchy.Hierarchy) {
-  /** a dict from metanode.signature() => Array of tf.graph.Groups */
-  let hashDict = _(h.getNodeMap()).reduce(
-      (hash, node: OpNode|Metanode, name) => {
-    if (node.type !== NodeType.META) {
-        return hash;
-    }
-    let levelOfMetaNode = name.split('/').length - 1;
-    let signature = getSignature(node);
-    let templateInfo = hash[signature] ||
-      {nodes: [], level: levelOfMetaNode};
-    hash[signature] = templateInfo;
-    templateInfo.nodes.push(node);
-    if (templateInfo.level > levelOfMetaNode) {
-      templateInfo.level = levelOfMetaNode;
-    }
-    return hash;
-  }, {});
-
-  return _(hashDict)
-      .pairs()
-      // filter nn metanode with only one member
-      .filter(function(pair: {level: number, nodes: string[]}) {
-        return pair[1].nodes.length > 1;
-      })
-      .sortBy(function(pair: {level: number, nodes: string[]}) {
-        // sort by depth
-        // (all members in the same nnGroup has equal depth)
-        return pair[1].nodes[0].depth;
-      })
-      .value();
-}
-
-function groupTemplateAndAssignId(nnGroups, verifyTemplate) {
-  // For each metanode, compare its subgraph (starting from shallower groups)
-  // and assign template id.
-  let result: {[templateId: string]: {level: number, nodes: string[]}} = {};
-  return _.reduce(nnGroups, function(templates, nnGroupPair) {
-    let signature = nnGroupPair[0],
-      nnGroup = nnGroupPair[1].nodes,
-      clusters = [];
-
-    nnGroup.forEach(function(metanode) {
-      // check with each existing cluster
-      for (let i = 0; i < clusters.length; i++) {
-        let similar = !verifyTemplate ||
-                      isSimilarSubgraph(
-                        clusters[i].metanode.metagraph,
-                        metanode.metagraph
-                      );
-        // if similar, just add this metanode to the cluster
-        if (similar) {
-          // get template from the first one
-          metanode.templateId = clusters[i].metanode.templateId;
-          clusters[i].members.push(metanode.name);
-          return;
-        }
-      }
-      // otherwise create a new cluster with id 'signature [count] '
-      metanode.templateId = signature + '[' + clusters.length + ']';
-      clusters.push({
-        metanode: metanode,
-        members: [metanode.name]
-      });
-    });
-
-    clusters.forEach(function(c) {
-      templates[c.metanode.templateId] = {
-        level: nnGroupPair[1].level,
-        nodes: c.members
-      };
-    });
-    return templates;
-  }, result);
-}
-
-function sortNodes(names: string[],
-    graph: graphlib.Graph<Metanode|OpNode, Metaedge>, prefix: string) {
-  return _.sortByAll(names,
-    function(name) {
-      let node = graph.node(name);
-      return (<OpNode>node).op;
-    },
-    function(name) {
-      let node = graph.node(name);
-      return (<Metanode>node).templateId;
-    },
-    function(name) {
-      return graph.neighbors(name).length;
-    },
-    function(name) {
-      return graph.predecessors(name).length;
-    },
-    function(name) {
-      return graph.successors(name).length;
-    },
-    function(name) {
-      return name.substr(prefix.length);
-    });
-}
-
-function isSimilarSubgraph(g1: graphlib.Graph<any, any>,
-    g2: graphlib.Graph<any, any>) {
-  if (!tf.graph.hasSimilarDegreeSequence(g1, g2)) {
-      return false;
-  }
-
-  // if we want to skip, just return true here.
-  // return true;
-
-  // Verify sequence by running DFS
-  let g1prefix = g1.graph().name;
-  let g2prefix = g2.graph().name;
-
-  let visited1 = {};
-  let visited2 = {};
-  let stack = [];
-
-  /**
-   * push sources or successors into the stack
-   * if the visiting pattern has been similar.
-   */
-  function stackPushIfNotDifferent(n1, n2) {
-    let sub1 = n1.substr(g1prefix.length),
-      sub2 = n2.substr(g2prefix.length);
-
-    /* tslint:disable */
-    if (visited1[sub1] ^ visited2[sub1]) {
-      console.warn(
-          'different visit pattern', '[' + g1prefix + ']', sub1,
-          '[' + g2prefix + ']', sub2);
-      return true;
-    }
-    /* tslint:enable */
-    if (!visited1[sub1]) { // implied && !visited2[sub2]
-      visited1[sub1] = visited2[sub2] = true;
-      stack.push({n1: n1, n2: n2});
-    }
-
-    return false;
-  }
-
-  // check if have same # of sources then sort and push
-  let sources1 = g1.sources();
-  let sources2 = g2.sources();
-  if (sources1.length !== sources2.length) {
-    /* tslint:disable */
-    console.log('different source length');
-    /* tslint:enable */
-    return false;
-  }
-  sources1 = sortNodes(sources1, g1, g1prefix);
-  sources2 = sortNodes(sources2, g2, g2prefix);
-
-  for (let i = 0; i < sources1.length; i++) {
-    let different = stackPushIfNotDifferent(sources1[i], sources2[i]);
-    if (different) {
-        return false;
-    }
-  }
-
-  while (stack.length > 0) {
-    let cur = stack.pop();
-
-    // check node
-    let similar = isSimilarNode(g1.node(cur.n1), g2.node(cur.n2));
-    if (!similar) {
-        return false;
-    }
-
-    // check if have same # of successors then sort and push
-    let succ1 = g1.successors(cur.n1), succ2 = g2.successors(cur.n2);
-    if (succ1.length !== succ2.length) {
-      /* tslint:disable */
-      console.log('# of successors mismatch', succ1, succ2);
-      /* tslint:enable */
-      return false;
-    }
-    succ1 = sortNodes(succ1, g1, g1prefix);
-    succ2 = sortNodes(succ2, g2, g2prefix);
-
-    for (let j = 0; j < succ1.length; j++) {
-      let different = stackPushIfNotDifferent(succ1[j], succ2[j]);
-      if (different) {
-          return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-/**
- * Returns if two nodes have identical structure.
- */
-function isSimilarNode(n1: OpNode|Metanode|SeriesNode,
-    n2: OpNode|Metanode|SeriesNode): boolean {
-  if (n1.type === NodeType.META) {
-    // compare metanode
-    let metanode1 = <Metanode> n1;
-    let metanode2 = <Metanode> n2;
-    return metanode1.templateId && metanode2.templateId &&
-        metanode1.templateId === metanode2.templateId;
-  } else if (n1.type === NodeType.OP && n2.type === NodeType.OP) {
-    // compare leaf node
-    return (<OpNode>n1).op === (<OpNode>n2).op;
-  } else if (n1.type === NodeType.SERIES && n2.type === NodeType.SERIES) {
-    // compare series node sizes and operations
-    // (only need to check one op as all op nodes are identical in series)
-    let sn1 = <SeriesNode> n1;
-    let sn2 = <SeriesNode> n2;
-    let seriesnode1Count = sn1.metagraph.nodeCount();
-    return (seriesnode1Count === sn2.metagraph.nodeCount() &&
-      (seriesnode1Count === 0 ||
-      ((<OpNode>sn1.metagraph.node(sn1.metagraph.nodes()[0])).op ===
-          (<OpNode>sn2.metagraph.node(sn2.metagraph.nodes()[0])).op)));
-  }
-  return false;
-}
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts b/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
deleted file mode 100644
index 5b546e9dd3..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/test/graph-test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-suite('graph', () => {
-  let assert = chai.assert;
-
-  test('graphlib exists', () => { assert.isTrue(graphlib != null); });
-
-  test('simple graph contruction', done => {
-    let pbtxt = tf.graph.test.util.stringToArrayBuffer(`
-      node {
-        name: "Q"
-        op: "Input"
-      }
-      node {
-        name: "W"
-        op: "Input"
-      }
-      node {
-        name: "X"
-        op: "MatMul"
-        input: "Q:2"
-        input: "W"
-      }
-      node {
-        name: "XX/YY/(YY)"
-        op: "MatMul"
-        input: "Q:2"
-        input: "W"
-      }`);
-    let statsPbtxt = tf.graph.test.util.stringToArrayBuffer(`step_stats {
-      dev_stats {
-        device: "cpu"
-        node_stats {
-          node_name: "Q"
-          all_start_micros: 10
-          all_end_rel_micros: 4
-        }
-        node_stats {
-          node_name: "Q"
-          all_start_micros: 12
-          all_end_rel_micros: 4
-        }
-        node_stats {
-          node_name: "XX/YY"
-          all_start_micros: 20
-          all_end_rel_micros: 4
-        }
-      }
-    }`);
-
-    let buildParams: tf.graph.BuildParams = {
-      enableEmbedding: true,
-      inEmbeddingTypes: ['Const'],
-      outEmbeddingTypes: ['^[a-zA-Z]+Summary$'],
-      refEdges: {}
-    };
-    let dummyTracker =
-        tf.graph.util.getTracker({set: () => { return; }, progress: 0});
-    tf.graph.parser.parseGraphPbTxt(pbtxt).then(nodes => {
-      tf.graph.build(nodes, buildParams, dummyTracker)
-          .then((slimGraph: tf.graph.SlimGraph) => {
-            assert.isTrue(slimGraph.nodes['X'] != null);
-            assert.isTrue(slimGraph.nodes['W'] != null);
-            assert.isTrue(slimGraph.nodes['Q'] != null);
-            assert.isTrue(slimGraph.nodes['XX/YY(YY)'] != null);
-
-            let firstInputOfX = slimGraph.nodes['X'].inputs[0];
-            assert.equal(firstInputOfX.name, 'Q');
-            assert.equal(firstInputOfX.outputTensorIndex, 2);
-
-            let secondInputOfX = slimGraph.nodes['X'].inputs[1];
-            assert.equal(secondInputOfX.name, 'W');
-            assert.equal(secondInputOfX.outputTensorIndex, 0);
-
-            tf.graph.parser.parseStatsPbTxt(statsPbtxt).then(stepStats => {
-              tf.graph.joinStatsInfoWithGraph(slimGraph, stepStats);
-              assert.equal(slimGraph.nodes['Q'].stats.getTotalMicros(), 6);
-              assert.equal(
-                  slimGraph.nodes['XX/YY/(YY)'].stats.getTotalMicros(), 4);
-              done();
-            });
-          });
-    });
-  });
-
-  test('health pill numbers round correctly', () => {
-    // Integers are rounded to the ones place.
-    assert.equal(tf.graph.scene.humanizeHealthPillStat(42.0, true), '42');
-
-    // Numbers with magnitude >= 1 are rounded to the tenths place.
-    assert.equal(tf.graph.scene.humanizeHealthPillStat(1, false), '1.0');
-    assert.equal(tf.graph.scene.humanizeHealthPillStat(42.42, false), '42.4');
-    assert.equal(tf.graph.scene.humanizeHealthPillStat(-42.42, false), '-42.4');
-
-    // Numbers with magnitude < 1 are written in scientific notation rounded to
-    // the tenths place.
-    assert.equal(tf.graph.scene.humanizeHealthPillStat(0, false), '0.0e+0');
-    assert.equal(tf.graph.scene.humanizeHealthPillStat(0.42, false), '4.2e-1');
-    assert.equal(
-        tf.graph.scene.humanizeHealthPillStat(-0.042, false), '-4.2e-2');
-  });
-
-  // TODO(bp): write tests.
-});
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/hierarchy-test.ts b/tensorflow/tensorboard/components/tf_graph_common/test/hierarchy-test.ts
deleted file mode 100644
index fa62ffe2c7..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/test/hierarchy-test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-suite('graph', () => {
-  let assert = chai.assert;
-
-  test('graphlib exists', () => { assert.isTrue(graphlib != null); });
-
-  // TODO(bp): write tests.
-
-});
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/index.html b/tensorflow/tensorboard/components/tf_graph_common/test/index.html
deleted file mode 100644
index 7564167129..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/test/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../tf-graph-common.html">
-</head>
-<body>
-  <script src="parser-test.js"></script>
-  <script src="graph-test.js"></script>
-  <script src="hierarchy-test.js"></script>
-  <script src="layout-test.js"></script>
-  <script src="util-test.js"></script>
-  <script src="util.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/layout-test.ts b/tensorflow/tensorboard/components/tf_graph_common/test/layout-test.ts
deleted file mode 100644
index b4884413c9..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/test/layout-test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-suite('layout', () => {
-  let assert = chai.assert;
-
-  test('dagre exists', () => { assert.isTrue(dagre != null); });
-
-  // TODO(bp): write tests.
-
-});
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/parser-test.ts b/tensorflow/tensorboard/components/tf_graph_common/test/parser-test.ts
deleted file mode 100644
index 7c73178c1c..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/test/parser-test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-suite('parser', () => {
-  let assert = chai.assert;
-
-  test('simple pbtxt', done => {
-    let pbtxt = tf.graph.test.util.stringToArrayBuffer(`node {
-       name: "Q"
-       op: "Input"
-     }
-     node {
-       name: "W"
-       op: "Input"
-     }
-     node {
-       name: "X"
-       op: "MatMul"
-       input: "Q"
-       input: "W"
-     }`);
-    tf.graph.parser.parseGraphPbTxt(pbtxt).then(nodes => {
-      assert.isTrue(nodes != null && nodes.length === 3);
-
-      assert.equal('Q', nodes[0].name);
-      assert.equal('Input', nodes[0].op);
-
-      assert.equal('W', nodes[1].name);
-      assert.equal('Input', nodes[1].op);
-
-      assert.equal('X', nodes[2].name);
-      assert.equal('MatMul', nodes[2].op);
-      assert.equal('Q', nodes[2].input[0]);
-      assert.equal('W', nodes[2].input[1]);
-
-      done();
-    });
-  });
-
-  test('stats pbtxt parsing', done => {
-    let statsPbtxt = tf.graph.test.util.stringToArrayBuffer(`step_stats {
-      dev_stats {
-        device: "cpu"
-        node_stats {
-          node_name: "Q"
-          all_start_micros: 10
-          all_end_rel_micros: 4
-        }
-        node_stats {
-          node_name: "Q"
-          all_start_micros: 12
-          all_end_rel_micros: 4
-        }
-      }
-    }`);
-    tf.graph.parser.parseStatsPbTxt(statsPbtxt).then(stepStats => {
-      assert.equal(stepStats.dev_stats.length, 1);
-      assert.equal(stepStats.dev_stats[0].device, 'cpu');
-      assert.equal(stepStats.dev_stats[0].node_stats.length, 2);
-      assert.equal(stepStats.dev_stats[0].node_stats[0].all_start_micros, 10);
-      assert.equal(stepStats.dev_stats[0].node_stats[1].node_name, 'Q');
-      assert.equal(stepStats.dev_stats[0].node_stats[1].all_end_rel_micros, 4);
-      done();
-    });
-  });
-
-  test('d3 exists', () => { assert.isTrue(d3 != null); });
-
-  // TODO(nsthorat): write tests.
-
-});
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/util-test.ts b/tensorflow/tensorboard/components/tf_graph_common/test/util-test.ts
deleted file mode 100644
index 4535d24888..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/test/util-test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-suite('util', () => {
-  let assert = chai.assert;
-
-  test('remove common prefix', () => {
-
-    // Empty array.
-    let result = tf.graph.util.removeCommonPrefix([]);
-    assert.deepEqual(result, []);
-
-    // No common prefix.
-    result = tf.graph.util.removeCommonPrefix(['a', 'b', 'c']);
-    assert.deepEqual(result, ['a', 'b', 'c']);
-
-    // One of the elements is empty string.
-    result = tf.graph.util.removeCommonPrefix(['a/b', '', 'a/c']);
-    assert.deepEqual(result, ['a/b', '', 'a/c']);
-
-    // Only one string.
-    result = tf.graph.util.removeCommonPrefix(['a/b/c']);
-    assert.deepEqual(result, ['a/b/c']);
-
-    // `q/w/` is the common prefix. Expect `q/w/` to be removed.
-    result = tf.graph.util.removeCommonPrefix(['q/w/a', 'q/w/b', 'q/w/c/f']);
-    assert.deepEqual(result, ['a', 'b', 'c/f']);
-
-    // `q/w/` is the common prefix and also an element. Expect nothing to be
-    // removed since the common prefix is also an element in the array.
-    result = tf.graph.util.removeCommonPrefix(['q/w/', 'q/w/b', 'q/w/c/f']);
-    assert.deepEqual(result, ['q/w/', 'q/w/b', 'q/w/c/f']);
-  });
-
-  test('query params', () => {
-    // Starts with question mark.
-    let queryParams = tf.graph.util.getQueryParams('?foo=1&bar=2');
-    assert.deepEqual(queryParams, {'foo': '1', 'bar': '2'});
-
-    // No question mark.
-    queryParams = tf.graph.util.getQueryParams('foo=1&bar=2');
-    assert.deepEqual(queryParams, {'foo': '1', 'bar': '2'});
-  });
-});
diff --git a/tensorflow/tensorboard/components/tf_graph_common/test/util.ts b/tensorflow/tensorboard/components/tf_graph_common/test/util.ts
deleted file mode 100644
index bc73b735ed..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/test/util.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-
-/* tslint:disable:no-namespace */
-module tf.graph.test.util {
-  /**
-   * Converts a utf-8 string to an ArrayBuffer.
-   */
-  export function stringToArrayBuffer(str): ArrayBuffer {
-    let buf = new ArrayBuffer(str.length);
-    let bufView = new Uint8Array(buf);
-    for (let i = 0, strLen = str.length; i < strLen; i++) {
-      bufView[i] = str.charCodeAt(i);
-    }
-    return buf;
-  }
-
-}  // module
diff --git a/tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html b/tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html
deleted file mode 100644
index a460072a38..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/tf-graph-common.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../tf-imports/d3.html">
-<link rel="import" href="../tf-imports/dagre.html">
-<link rel="import" href="../tf-imports/graphlib.html">
-<link rel="import" href="../tf-imports/lodash.html">
-
-<script src="colors.js"></script>
-<script src="common.js"></script>
-<script src="externs.js"></script>
-<script src="graph.js"></script>
-<script src="hierarchy.js"></script>
-<script src="layout.js"></script>
-<script src="parser.js"></script>
-<script src="proto.js"></script>
-<script src="render.js"></script>
-<script src="annotation.js"></script>
-<script src="contextmenu.js"></script>
-<script src="edge.js"></script>
-<script src="node.js"></script>
-<script src="scene.js"></script>
-<script src="template.js"></script>
-<script src="util.js"></script>
diff --git a/tensorflow/tensorboard/components/tf_graph_common/util.ts b/tensorflow/tensorboard/components/tf_graph_common/util.ts
deleted file mode 100644
index 7f4d329e79..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_common/util.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/**
- * @fileoverview Utility functions for the tensorflow graph visualizer.
- */
-
-module tf.graph.util {
-  /**
-   * Recommended delay (ms) when running an expensive task asynchronously
-   * that gives enough time for the progress bar to update its UI.
-   */
-  const ASYNC_TASK_DELAY = 20;
-
-  export function time<T>(msg: string, task: () => T) {
-    let start = Date.now();
-    let result = task();
-    /* tslint:disable */
-    console.log(msg, ':', Date.now() - start, 'ms');
-    /* tslint:enable */
-    return result;
-  }
-
-  /**
-   * Creates a tracker that sets the progress property of the
-   * provided polymer component. The provided component must have
-   * a property called 'progress' that is not read-only. The progress
-   * property is an object with a numerical 'value' property and a
-   * string 'msg' property.
-   */
-  export function getTracker(polymerComponent: any) {
-    return {
-      setMessage: function(msg) {
-        polymerComponent.set(
-            'progress', {value: polymerComponent.progress.value, msg: msg});
-      },
-      updateProgress: function(value) {
-        polymerComponent.set('progress', {
-          value: polymerComponent.progress.value + value,
-          msg: polymerComponent.progress.msg
-        });
-      },
-      reportError: function(msg: string, err) {
-        // Log the stack trace in the console.
-        console.error(err.stack);
-        // And send a user-friendly message to the UI.
-        polymerComponent.set(
-            'progress',
-            {value: polymerComponent.progress.value, msg: msg, error: true});
-      },
-    };
-  }
-
-  /**
-   * Creates a tracker for a subtask given the parent tracker, the total
-   * progress
-   * of the subtask and the subtask message. The parent task should pass a
-   * subtracker to its subtasks. The subtask reports its own progress which
-   * becames relative to the main task.
-   */
-  export function getSubtaskTracker(
-      parentTracker: ProgressTracker, impactOnTotalProgress: number,
-      subtaskMsg: string): ProgressTracker {
-    return {
-      setMessage: function(progressMsg) {
-        // The parent should show a concatenation of its message along with
-        // its subtask tracker message.
-        parentTracker.setMessage(subtaskMsg + ': ' + progressMsg);
-      },
-      updateProgress: function(incrementValue) {
-        // Update the parent progress relative to the child progress.
-        // For example, if the sub-task progresses by 30%, and the impact on the
-        // total progress is 50%, then the task progresses by 30% * 50% = 15%.
-        parentTracker.updateProgress(
-            incrementValue * impactOnTotalProgress / 100);
-      },
-      reportError: function(msg: string, err: Error) {
-        // The parent should show a concatenation of its message along with
-        // its subtask error message.
-        parentTracker.reportError(subtaskMsg + ': ' + msg, err);
-      }
-    };
-  }
-
-  /**
-   * Runs an expensive task and return the result.
-   */
-  export function runTask<T>(
-      msg: string, incProgressValue: number, task: () => T,
-      tracker: ProgressTracker): T {
-    // Update the progress message to say the current running task.
-    tracker.setMessage(msg);
-    // Run the expensive task with a delay that gives enough time for the
-    // UI to update.
-    try {
-      let result = tf.graph.util.time(msg, task);
-      // Update the progress value.
-      tracker.updateProgress(incProgressValue);
-      // Return the result to be used by other tasks.
-      return result;
-    } catch (e) {
-      // Errors that happen inside asynchronous tasks are
-      // reported to the tracker using a user-friendly message.
-      tracker.reportError('Failed ' + msg, e);
-    }
-  }
-
-  /**
-   * Runs an expensive task asynchronously and returns a promise of the result.
-   */
-  export function runAsyncTask<T>(
-      msg: string, incProgressValue: number, task: () => T,
-      tracker: ProgressTracker): Promise<T> {
-    return new Promise((resolve, reject) => {
-      // Update the progress message to say the current running task.
-      tracker.setMessage(msg);
-      // Run the expensive task with a delay that gives enough time for the
-      // UI to update.
-      setTimeout(function() {
-        try {
-          let result = tf.graph.util.time(msg, task);
-          // Update the progress value.
-          tracker.updateProgress(incProgressValue);
-          // Return the result to be used by other tasks.
-          resolve(result);
-        } catch (e) {
-          // Errors that happen inside asynchronous tasks are
-          // reported to the tracker using a user-friendly message.
-          tracker.reportError('Failed ' + msg, e);
-        }
-      }, ASYNC_TASK_DELAY);
-    });
-  }
-
-  /**
-   * Asynchronously runs an expensive task that returns a promise. Updates the
-   * tracker's progress after the promise resolves. Returns a new promise that
-   * resolves after the progress is updated.
-   */
-  export function runAsyncPromiseTask<T>(
-      msg: string, incProgressValue: number, task: () => Promise<T>,
-      tracker: ProgressTracker): Promise<T> {
-    return new Promise((resolve, reject) => {
-      let handleError = function(e) {
-        // Errors that happen inside asynchronous tasks are
-        // reported to the tracker using a user-friendly message.
-        tracker.reportError('Failed ' + msg, e);
-        reject(e);
-      };
-
-      // Update the progress message to say the current running task.
-      tracker.setMessage(msg);
-      // Run the expensive task with a delay that gives enough time for the
-      // UI to update.
-      setTimeout(function() {
-        try {
-          let start = Date.now();
-          task()
-              .then(function(value) {
-                /* tslint:disable */
-                console.log(msg, ':', Date.now() - start, 'ms');
-                // Update the progress value.
-                tracker.updateProgress(incProgressValue);
-                // Return the result to be used by other tasks.
-                resolve(value);
-              })
-              .catch(handleError);
-        } catch (e) {
-          handleError(e);
-        }
-      }, ASYNC_TASK_DELAY);
-    });
-  }
-
-  /**
-   * Returns a query selector with escaped special characters that are not
-   * allowed in a query selector.
-   */
-  export function escapeQuerySelector(querySelector: string): string {
-    return querySelector.replace(/([:.\[\],/\\\(\)])/g, '\\$1');
-  }
-
-  // For unit conversion.
-  export const MEMORY_UNITS = [
-    // Atomic unit.
-    {symbol: 'B'},
-    // numUnits specifies how many previous units this unit contains.
-    {symbol: 'KB', numUnits: 1024}, {symbol: 'MB', numUnits: 1024},
-    {symbol: 'GB', numUnits: 1024}, {symbol: 'TB', numUnits: 1024},
-    {symbol: 'PB', numUnits: 1024}
-  ];
-  export const TIME_UNITS = [
-    // Atomic unit. Finest granularity in TensorFlow stat collection.
-    {symbol: 'µs'},
-    // numUnits specifies how many previous units this unit contains.
-    {symbol: 'ms', numUnits: 1000}, {symbol: 's', numUnits: 1000},
-    {symbol: 'min', numUnits: 60}, {symbol: 'hr', numUnits: 60},
-    {symbol: 'days', numUnits: 24}
-  ];
-
-  /**
-   * Returns the human readable version of the unit.
-   * (e.g. 1.35 GB, 23 MB, 34 ms, 6.53 min etc).
-   */
-  export function convertUnitsToHumanReadable(value, units, unitIndex) {
-    unitIndex = unitIndex == null ? 0 : unitIndex;
-    if (unitIndex + 1 < units.length &&
-        value >= units[unitIndex + 1].numUnits) {
-      return tf.graph.util.convertUnitsToHumanReadable(
-          value / units[unitIndex + 1].numUnits, units, unitIndex + 1);
-    }
-    // toPrecision() has the tendency to return a number in scientific
-    // notation and (number - 0) brings it back to normal notation.
-    return (value.toPrecision(3) - 0) + ' ' + units[unitIndex].symbol;
-  }
-
-  export function hasDisplayableNodeStats(stats: NodeStats) {
-    if (stats &&
-        (stats.totalBytes > 0 || stats.getTotalMicros() > 0 ||
-         stats.outputSize)) {
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Given a list of strings, it returns a new list of strings with the longest
-   * common prefix removed. If the common prefix is one of the strings in the
-   * list, it returns the original strings.
-   */
-  export function removeCommonPrefix(strings: string[]) {
-    if (strings.length < 2) {
-      return strings;
-    }
-
-    let index = 0;
-    let largestIndex = 0;
-    // Find the shortest name across all strings.
-    let minLength = _.min(_.map(strings, str => str.length));
-    while (true) {
-      index++;
-      let prefixes = _.map(strings, str => str.substring(0, index));
-      let allTheSame = prefixes.every((prefix, i) => {
-        return (i === 0 ? true : prefix === prefixes[i - 1]);
-      });
-      if (allTheSame) {
-        if (index >= minLength) {
-          // There is a string whose whole name is a prefix to other string.
-          // In this case, we return the original list of string.
-          return strings;
-        }
-        largestIndex = index;
-      } else {
-        break;
-      }
-    }
-    return _.map(strings, str => str.substring(largestIndex));
-  }
-
-  /**
-   * Given a queryString, aka ?foo=1&bar=2, return the object representation.
-   */
-  export function getQueryParams(queryString: string) {
-    if (queryString.charAt(0) === '?') {
-      queryString = queryString.slice(1);
-    }
-
-    let queryParams = _.chain(queryString.split('&'))
-                          .map((item) => {
-                            if (item) {
-                              return item.split('=');
-                            }
-                          })
-                          .compact()
-                          .value();
-
-    return _.object(queryParams);
-  }
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD
index 9b7dcef8bc..21a5621b52 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/BUILD
@@ -1,9 +1,7 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
 load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -39,3 +37,36 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-common.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-graph-common",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_imports_google_d3v4:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = glob(["*.ts"]),
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/typings/d3_v4:bundle",
+        "//third_party/javascript/typings/lodash",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
index 45755ee8f5..3dc963cf34 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/edge.ts
@@ -29,7 +29,7 @@ const EDGE_WIDTH_SCALE_EXPONENT = 0.3;
 /** The domain (min and max value) for the edge width. */
 const DOMAIN_EDGE_WIDTH_SCALE = [1, 5E6];
 
-export const EDGE_WIDTH_SCALE = d3.scalePow()
+export const EDGE_WIDTH_SCALE: d3.ScalePower<number, number> = d3.scalePow()
       .exponent(EDGE_WIDTH_SCALE_EXPONENT)
       .domain(DOMAIN_EDGE_WIDTH_SCALE)
       .range([MIN_EDGE_WIDTH, MAX_EDGE_WIDTH])
@@ -264,7 +264,7 @@ export function appendEdge(edgeGroup, d: EdgeData,
       .text(labelForEdge);
 };
 
-export let interpolate = d3.line<{x: number, y: number}>()
+export let interpolate: d3.Line<{x: number, y: number}> = d3.line<{x: number, y: number}>()
                              .curve(d3.curveBasis)
                              .x((d) => { return d.x;})
                              .y((d) => { return d.y;});
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts
index 11f41cfdd0..1019e4f269 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/layout.ts
@@ -103,7 +103,9 @@ export const PARAMS = {
       width: 60,
       maxLabelWidth: 52,
       /** A scale for the node's height based on number of nodes inside */
-      height: d3.scaleLinear().domain([1, 200]).range([15, 60]).clamp(true),
+      // Hack - set this as an any type to avoid issues in exporting a type
+      // from an external module.
+      height: (d3 as any).scaleLinear().domain([1, 200]).range([15, 60]).clamp(true),
       /** The radius of the circle denoting the expand button. */
       expandButtonRadius: 3
     },
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
index 0e0ceca1d1..3e140a388b 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/node.ts
@@ -380,7 +380,7 @@ function labelBuild(nodeGroup, renderNodeInfo: render.RenderNodeInfo,
  */
 export function enforceLabelWidth(
     txtElementSelection: d3.Selection<any, any, any, any>, nodeType: NodeType | number,
-    renderNodeInfo?: render.RenderNodeInfo) {
+    renderNodeInfo?: render.RenderNodeInfo): any {
   // Get text element itself and its on-screen width.
   let txtNode = <SVGTextElement>txtElementSelection.node();
   let computedTxtLength = txtNode.getComputedTextLength();
@@ -475,7 +475,7 @@ function labelPosition(nodeGroup, cx: number, cy: number,
  * @param nodeClass class for the element.
  * @return Selection of the shape.
  */
-export function buildShape(nodeGroup, d, nodeClass: string) {
+export function buildShape(nodeGroup, d, nodeClass: string): d3.Selection<any, any, any, any> {
   // Create a group to house the underlying visual elements.
   let shapeGroup = scene.selectOrCreateChild(nodeGroup, 'g', nodeClass);
   // TODO(jimbo): DOM structure should be templated in HTML somewhere, not JS.
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
index 858c2fccb8..53baf14ec4 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/scene.ts
@@ -234,7 +234,7 @@ export function panToNode(nodeName: String, svg, zoomG, d3zoom): boolean {
  * @return selection of the element
  */
 export function selectOrCreateChild(
-    container, tagName: string, className?: string | string[], before?) {
+    container, tagName: string, className?: string | string[], before?): d3.Selection<any, any, any, any> {
   let child = selectChild(container, tagName, className);
   if (!child.empty()) {
     return child;
@@ -271,7 +271,7 @@ export function selectOrCreateChild(
  * @return selection of the element, or an empty selection
  */
 export function selectChild(
-    container, tagName: string, className?: string | string[]) {
+    container, tagName: string, className?: string | string[]): d3.Selection<any, any, any, any> {
   let children = container.node().childNodes;
   for (let i = 0; i < children.length; i++) {
     let child = children[i];
@@ -327,7 +327,7 @@ export function selectChild(
 export function buildGroup(container,
     renderNode: render.RenderGroupNodeInfo,
     sceneElement,
-    sceneClass: string) {
+    sceneClass: string): d3.Selection<any, any, any, any> {
   sceneClass = sceneClass || Class.Scene.GROUP;
   let isNewSceneGroup = selectChild(container, 'g', sceneClass).empty();
   let sceneGroup = selectOrCreateChild(container, 'g', sceneClass);
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/BUILD b/tensorflow/tensorboard/components/tf_graph_controls/BUILD
deleted file mode 100644
index 2e2d3b7b47..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_controls/BUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_controls",
-    srcs = [
-        "tf-graph-controls.html",
-    ],
-    path = "/tf-graph-controls",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "@org_polymer",
-        "@org_polymer_paper_button",
-        "@org_polymer_paper_dropdown_menu",
-        "@org_polymer_paper_menu",
-        "@org_polymer_paper_radio_group",
-        "@org_polymer_paper_toggle_button",
-        "@org_polymer_paper_tooltip",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-controls.html",
-    ],
-    destdir = "tf-graph-controls",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
deleted file mode 100644
index c47cb90a03..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_controls/demo/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_controls/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"],
-    path = "/tf-graph-controls/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_controls",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/demo/index.html b/tensorflow/tensorboard/components/tf_graph_controls/demo/index.html
deleted file mode 100644
index 8b12641b28..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_controls/demo/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../tf-graph-controls.html">
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<title>TF Graph Controls Demo</title>
-<style>
-  #demo-container {
-    border: 2px solid #808080;
-    width: 1000px;
-    height: 700px;
-    position: relative;
-  }
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="tf-graph-controls-demo">
-      <template>
-        <tf-graph-controls
-            id="controls"
-            color-by="structure"
-        ></tf-graph-controls>
-      </template>
-      <script>
-        Polymer({
-          is: "tf-graph-controls-demo",
-        });
-      </script>
-    </dom-module>
-    <div id="demo-container">
-      <tf-graph-controls-demo></tf-graph-controls-demo>
-    </div>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html b/tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html
deleted file mode 100644
index 10faf29bbc..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_controls/tf-graph-controls.html
+++ /dev/null
@@ -1,829 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-menu/paper-menu.html">
-<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../paper-radio-group/paper-radio-group.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-<link rel="import" href="../tf-graph-common/tf-graph-common.html">
-
-<dom-module id="tf-graph-controls">
-<template>
-<style>
-:host {
-  font-size: 12px;
-  color: gray;
-  --paper-font-subhead: {
-    font-size: 14px;
-    color: gray;
-  };
-  --paper-dropdown-menu-icon: {
-    width: 15px;
-    height: 15px;
-  };
-  --paper-dropdown-menu-button: {
-    padding: 0;
-  };
-  --paper-dropdown-menu-input: {
-    padding: 0;
-  };
-  --paper-item-min-height: 30px;
-}
-
-paper-button[raised].keyboard-focus {
-  font-weight: normal;
-}
-
-.run-dropdown {
-  --paper-input-container: {
-    padding: 9px 0 0 25px;
-  };
-}
-
-.color-dropdown {
-  --paper-input-container: {
-    padding: 9px 0 0 13px;
-  };
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-table td {
-  padding: 0;
-  margin: 0;
-}
-
-.allcontrols {
-  width: 188px;
-  padding: 0 30px;
-}
-
-.legend-holder {
-  position: absolute;
-  bottom: 0;
-  padding-bottom: 10px;
-}
-
-paper-radio-button {
-  display: block;
-  padding: 5px;
-}
-svg.icon {
-  width: 60px;
-  height: 18px;
-}
-.icon ellipse {
-  rx: 10px;
-  ry: 5px;
-  stroke: #CCC;
-  stroke-width: 1px;
-  fill: #FFFFFF;
-  cy: 10px;
-}
-.icon rect {
-  height: 14px;
-  width: 35px;
-  rx: 5px;
-  ry: 5px;
-  stroke: #CCC;
-  stroke-width: 2px;
-  fill: #D9D9D9;
-}
-.domainValues {
-  margin-bottom: 10px;
-  width: 165px;
-}
-.domainStart {
-  float: left;
-}
-.domainEnd {
-  float: right;
-}
-.colorBox {
-  width: 20px;
-}
-
-.image-icon {
-  width: 24px;
-  height: 24px;
-}
-
-.help-icon {
-  height: 15px;
-  margin: 0;
-  padding: 0;
-}
-
-.gray {
-  color: #666;
-}
-
-.title {
-  font-size: 16px;
-  margin: 8px 5px 8px 0;
-  color: black;
-}
-.title small {
-  font-weight: normal;
-}
-.deviceList, .xlaClusterList {
-  max-height: 200px;
-  overflow-y: auto;
-}
-
-#file {
-  padding: 8px 0;
-}
-
-.color-legend-row {
-  clear: both;
-  height: 20px;
-  margin-top: 5px;
-  position: relative;
-}
-
-.color-legend-row svg {
-  position: absolute;
-  top: -1px;
-  width: 40px;
-}
-
-.color-legend-row span.color-legend-value {
-  margin-left: 60px;
-}
-
-#grey-rect {
-  fill: #eee;
-  stroke: #a6a6a6;
-}
-
-#faded-rect {
-  fill: url(#rectHatch);
-  stroke: var(--tb-graph-faded);
-}
-
-.button-text {
-  text-transform: none;
-  padding: 8px 18px 0 18px;
-  font-size: 14px
-}
-
-.upload-button {
-  width: 165px;
-  height: 25px;
-  text-transform: none;
-  margin-top: 4px;
-}
-
-.iconbutton {
-  padding: 2px;
-  width: 30px;
-  height: 30px;
-  color: var(--paper-orange-500);
-}
-
-.hidden-input {
-  height: 0px;
-  width: 0px;
-  overflow:hidden;
-}
-
-.allcontrols .control-holder {
-  display: flex;
-  clear: both;
-}
-
-.allcontrols .control-holder paper-radio-group {
-  margin-top: 5px;
-}
-
-span.counter {
-  font-size: 13px;
-  color: gray;
-}
-
-.runs paper-item {
-  --paper-item: {
-    white-space: nowrap;
-  }
-}
-
-table.control-holder {
-  border: 0;
-  border-collapse: collapse;
-}
-
-table.tf-graph-controls td.input-element-table-data {
-  padding: 0 0 0 20px;
-}
-
-/** Override inline styles that suppress pointer events for disabled buttons. Otherwise, the */
-/*  tooltips do not appear. */
-#color-by-radio-group paper-radio-button {
-  pointer-events: auto !important;
-}
-</style>
-<svg width="0" height="0">
-  <defs>
-    <g id="legend-rect">
-      <rect x="1" y="1" stroke-width="2px" height="14" width="35" rx="5" ry="5"></rect>
-    </g>
-    <g id="grey-rect">
-       <use xmlns:xlink="http://www.w3.org/1999/xlink"
-            xlink:href="#legend-rect"/>
-     </g>
-     <g id="faded-rect">
-       <use xmlns:xlink="http://www.w3.org/1999/xlink"
-            xlink:href="#legend-rect"/>
-     </g>
-  </defs>
-</svg>
-<div class="allcontrols">
-  <div class="control-holder">
-    <paper-icon-button icon="aspect-ratio" class="iconbutton" on-click="fit" alt="Fit to screen">
-    </paper-icon-button>
-    <paper-button class="button-text" on-click="fit">Fit to screen
-    </paper-button>
-  </div>
-  <div class="control-holder">
-    <paper-icon-button icon="file-download" class="iconbutton" on-click="download" alt="Download PNG">
-    </paper-icon-button>
-    <paper-button class="button-text" on-click="download">Download PNG
-    </paper-button>
-    <a href="#" id="graphdownload" class="title" download="graph.png">
-    </a>
-  </div>
-  <div class="control-holder runs">
-    <div class="title">Run <span class="counter">([[datasets.length]])</span></div>
-    <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
-      <paper-menu id="select" class="dropdown-content" selected="{{selectedDataset}}">
-        <template is="dom-repeat" items="[[datasets]]">
-          <paper-item>[[item.name]]</paper-item>
-        </template>
-      </paper-menu>
-    </paper-dropdown-menu>
-  </div>
-  <template is="dom-if" if="[[showSessionRunsDropdown]]">
-    <div class="control-holder">
-      <div class="title">Session runs <span class="counter">([[_numSessionRuns(metadataTags)]])</span></div>
-      <paper-dropdown-menu no-label-float no-animations noink class="run-dropdown">
-        <paper-menu id="select" class="dropdown-content" selected="{{selectedMetadataTag}}">
-          <template is="dom-repeat" items="[[metadataTags]]">
-            <paper-item>[[item.tag]]</paper-item>
-          </template>
-          <paper-item>None</paper-item>
-        </paper-menu>
-      </paper-dropdown-menu>
-    </div>
-  </template>
-  <template is="dom-if" if="[[showUploadButton]]">
-    <div class="control-holder">
-      <div class="title">Upload</div>
-      <paper-button raised class="text-button upload-button"
-          on-click="_getFile">Choose File</paper-button>
-      <div class="hidden-input">
-        <input type="file" id="file" name="file" on-change="_updateFileInput" />
-      </div>
-    </div>
-  </template>
-  <table class="control-holder">
-    <tr>
-      <td class="title">Trace inputs</td>
-      <td class="input-element-table-data">
-        <paper-toggle-button id="trace-inputs"></paper-toggle-button>
-      </td>
-    </tr>
-    <template is="dom-if" if="[[healthPillsFeatureEnabled]]">
-      <tr>
-        <td class="title">Show health pills</td>
-        <td class="input-element-table-data">
-          <paper-toggle-button checked="{{healthPillsToggledOn}}"></paper-toggle-button>
-        </td>
-      </tr>
-    </template>
-  </table>
-  <div class="control-holder">
-    <div class="title">Color</div>
-    <paper-radio-group id="color-by-radio-group" selected="{{colorBy}}">
-      <paper-radio-button name="structure">Structure</paper-radio-button>
-
-      <paper-radio-button name="device">Device</paper-radio-button>
-
-      <paper-radio-button id="xla-cluster-radio-button"
-                          name="xla_cluster"
-                          disabled="[[!_xlaClustersProvided(renderHierarchy)]]">
-        XLA Cluster
-      </paper-radio-button>
-      <paper-tooltip for="xla-cluster-radio-button" position="right">
-        Coloring by XLA cluster is only enabled if at least 1 op specifies an XLA cluster.
-      </paper-tooltip>
-
-      <paper-radio-button id="compute-time-radio-button"
-                          name="compute_time"
-                          disabled="[[!stats]]">
-        Compute time
-      </paper-radio-button>
-      <paper-tooltip for="compute-time-radio-button" position="right">
-        Coloring by compute time is only enabled if the RunMetadata proto is passed to the
-        FileWriter when a specific session is run.
-      </paper-tooltip>
-
-      <paper-radio-button id="memory-radio-button"
-                          name="memory"
-                          disabled="[[!stats]]">
-        Memory
-      </paper-radio-button>
-      <paper-tooltip for="memory-radio-button" position="right">
-        Coloring by memory is only enabled if the RunMetadata proto is passed to the
-        FileWriter when a specific session is run.
-      </paper-tooltip>
-    </paper-radio-group>
-  </div>
-  <div>
-    <template is="dom-if" if="[[_isGradientColoring(stats, colorBy)]]">
-      <svg width="140" height="20" style="margin: 0 5px" class="color-text">
-        <defs>
-          <linearGradient id="linearGradient" x1="0%" y1="0%" x2="100%" y2="0%">
-            <stop class="start" offset="0%"
-                stop-color$="[[_currentGradientParams.startColor]]"/>
-            <stop class="end" offset="100%"
-                stop-color$="[[_currentGradientParams.endColor]]"/>
-          </linearGradient>
-        </defs>
-        <rect x="0" y="0" width="135" height="20" fill="url(#linearGradient)"
-            stroke="black" />
-      </svg>
-      <div class="domainValues color-text">
-        <div class="domainStart">[[_currentGradientParams.minValue]]</div>
-        <div class="domainEnd">[[_currentGradientParams.maxValue]]</div>
-      </div>
-      <br style="clear: both">
-      <div>Devices included in stats:</div>
-      <div class="deviceList">
-        <table>
-        <template is="dom-repeat" items="[[_getDevices(devicesForStats)]]">
-          <tr>
-            <td>
-              <input type="checkbox" value$="[[item.device]]" checked$="[[item.used]]" on-click="_deviceCheckboxClicked"/>
-            </td>
-            <td>
-              <div>
-                <span>[[item.suffix]]</span>
-                <template is="dom-if" if="[[item.ignoredMsg]]">
-                  <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-                  <paper-tooltip position="right" animation-delay="0">[[item.ignoredMsg]]</paper-tooltip>
-                </template>
-              </div>
-            </td>
-          </tr>
-        </template>
-        </table>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'structure')]]">
-      <div class="color-text">
-        <div class="color-legend-row">
-          <div style="position: absolute;">
-            colors
-          </div>
-          <span class="color-legend-value">same substructure</span>
-        </div>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                 xlink:href="#grey-rect" x="0" y="0"/>
-          </svg>
-          <span class="color-legend-value">unique substructure</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'device')]]">
-      <div class="color-text">
-        <div class="deviceList">
-          <table>
-          <template is="dom-repeat" items="[[colorByParams.device]]">
-            <tr>
-              <td style$="[[_getBackgroundColor(item.color)]]">
-                <div class="colorBox"></div>
-              </td>
-              <td>
-                <div>[[item.device]]</div>
-              </td>
-            </tr>
-          </template>
-          </table>
-        </div>
-        <br/>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                 xlink:href="#grey-rect" x="0" y="0"/>
-          </svg>
-          <span class="color-legend-value">unknown device</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_equals(colorBy, 'xla_cluster')]]">
-      <div class="color-text">
-        <div class="xlaClusterList">
-          <table>
-          <template is="dom-repeat" items="[[colorByParams.xla_cluster]]">
-            <tr>
-              <td style$="[[_getBackgroundColor(item.color)]]">
-                <div class="colorBox"></div>
-              </td>
-              <td>
-                <div>[[item.xla_cluster]]</div>
-              </td>
-            </tr>
-          </template>
-          </table>
-        </div>
-        <br/>
-        <div class="color-legend-row">
-          <svg>
-            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                 xlink:href="#grey-rect" x="0" y="0"/>
-          </svg>
-          <span class="color-legend-value">unknown XLA cluster</span>
-        </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[_statsNotNull(stats)]]">
-      <div class="color-legend-row">
-        <svg>
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                xlink:href="#faded-rect" x="0" y="0"/>
-        </svg>
-        <span class="color-legend-value">unused substructure</span>
-      </div>
-    </template>
-  </div>
-  <!--
-    Due to limited vertical space on the left sidebar, hide the legend whenever
-    we show a list of devices to include in stats.
-  -->
-  <template is="dom-if" if="[[!_isGradientColoring(stats, colorBy)]]">
-    <div class="legend-holder">
-      <table>
-        <tr>
-          <td><div class="title">Graph</div></td>
-          <td>(* = expandable)</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon">
-              <rect transform="translate(3, 1)" height="14" width="35"
-                  rx="5" ry="5"/>
-            </svg>
-          </td>
-          <td>Namespace<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" preserveAspectRatio="xMinYMid meet"
-                viewBox="0 0 10 10">
-              <use xlink:href="#op-node-stamp" fill="white" stroke="#ccc" x="9.5"
-                y="6" />
-            </svg>
-          </td>
-          <td>OpNode</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px" preserveAspectRatio="xMinYMid meet"
-                viewBox="0 0 12 12">
-              <use xlink:href="#op-series-horizontal-stamp" fill="white"
-                  stroke="#ccc" x="2" y="2"/>
-            </svg>
-          </td>
-          <td>Unconnected series<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <use xlink:href="#op-series-vertical-stamp"
-                  fill="white" stroke="#ccc" x="2" y="2"/>
-            </svg>
-          </td>
-          <td>Connected series<span class="gray">*</span></td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon">
-              <circle fill="white" stroke="#848484" cx="10" cy="10" r="5"/>
-            </svg>
-          </td>
-          <td>Constant</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="image-icon" viewBox="0 0 12 12" width="24" height="24">
-              <use x="0" y="0" class="image-icon" xlink:href="#summary-icon"/>
-            </svg>
-          </td>
-          <td>Summary</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <defs>
-                <marker id="ref-arrowhead-legend" fill="#bbb" markerWidth="10"
-                    markerHeight="10" refX="1" refY="5" orient="auto">
-                  <path d="M 10,0 L 0,5 L 10,10 C 7,7 7,3 10,0"/>
-                </marker>
-              </defs>
-              <path stroke="#bbb"
-                  d="M2 9 l 23 0" stroke-linecap="round" />
-            </svg>
-          </td>
-          <td>Dataflow edge</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <path stroke="#bbb"
-                d="M2 9 l 23 0" stroke-linecap="round" stroke-dasharray="2, 2" />
-            </svg>
-          </td>
-          <td>Control dependency edge</td>
-        </tr>
-        <tr>
-          <td>
-            <svg class="icon" height="15px"
-                preserveAspectRatio="xMinYMid meet" viewBox="0 0 15 15">
-              <path marker-start="url(#ref-arrowhead-legend)"
-                stroke="#bbb" d="M2 9 l 23 0"
-                stroke-linecap="round" />
-            </svg>
-          </td>
-          <td>Reference edge</td>
-        </tr>
-      </table>
-    </div>
-  </template>
-  </div>
-</template>
-</dom-module>
-
-<script>
-(function() { // Private scope.
-/**
- * Stats from device names that match these regexes will be excluded by default.
- * The user can still turn on a device by selecting the checkbox in the device list.
- * See b/29089982 for context.
- */
-var DEVICE_NAMES_EXCLUDE = [
-  {
-    regex: /gpu:[0-9]+$/,
-    msg: 'Excluded by default since this is a CPU thread setting up GPU kernels.'
-  }
-];
-
-Polymer({
-  is: 'tf-graph-controls',
-  properties: {
-    // Public API.
-    stats: {
-      value: null,
-      type: Object,
-      observer: '_statsChanged'
-    },
-    devicesForStats: {
-      value: null,
-      type: Object,
-      notify: true,
-      readonly: true,
-    },
-    colorBy: {
-      type: String,
-      value: 'structure',
-      notify: true,
-      readonly: true
-    },
-    colorByParams: Object,
-    datasets: {
-      type: Array,
-      observer: '_datasetsChanged'
-    },
-    renderHierarchy: {
-      type: Object,
-      notify: true,
-    },
-    metadataTags: {
-      type: Array,
-      computed: '_getMetadataTags(selectedDataset, datasets)'
-    },
-    selectedDataset: {
-      type: Number,
-      notify: true,
-      value: 0,
-      observer: '_selectedDatasetChanged'
-    },
-    selectedFile: {
-      type: Object,
-      notify: true
-    },
-    selectedMetadataTag: {
-      type: Number,
-      notify: true,
-      value: -1
-    },
-    _currentGradientParams: {
-      type: Object,
-      computed: '_getCurrentGradientParams(colorByParams, colorBy)'
-    },
-    showSessionRunsDropdown: {
-      type: Boolean,
-      value: true
-    },
-    showUploadButton: {
-      type: Boolean,
-      value: true
-    },
-    // This stores whether the feature for showing health pills is enabled in the first place.
-    healthPillsFeatureEnabled: Boolean,
-    // This stores whether to show health pills. Only relevant if healthPillsFeatureEnabled. The
-    // user can toggle this value.
-    healthPillsToggledOn: {
-      type: Boolean,
-      notify: true,
-    },
-  },
-  listeners: {
-    'trace-inputs.change': '_traceInputToggleChanged'
-  },
-  _traceInputToggleChanged: function(event) {
-    // Flip the state of the trace inputs flag.
-    this.renderHierarchy.traceInputs = event.target.active;
-    tf.graph.scene.node.traceInputs(this.renderHierarchy);
-  },
-  _xlaClustersProvided: function(renderHierarchy) {
-    return renderHierarchy &&
-        renderHierarchy.hierarchy &&
-        renderHierarchy.hierarchy.xlaClusters.length > 0;
-  },
-  _statsChanged: function(stats) {
-    if (stats == null) {
-      return;
-    }
-    var devicesForStats = {};
-    var devices = _.each(stats.dev_stats, function(d) {
-      // Avoid device names that are ignored by default.
-      var exclude = _.some(DEVICE_NAMES_EXCLUDE, function(rule) {
-        return rule.regex.test(d.device);
-      });
-      if (!exclude) {
-        devicesForStats[d.device] = true;
-      }
-    });
-    this.set('devicesForStats', devicesForStats);
-  },
-  _getDevices: function(devicesForStats) {
-    var devices = _.map(this.stats.dev_stats, function(d) {
-      return d.device;
-    });
-    // Devices names can be long so we remove the longest common prefix
-    // before showing the devices in a list.
-    var suffixes = tf.graph.util.removeCommonPrefix(devices);
-    return _.map(devices, function(device, i) {
-      var ignoredMsg = null;
-      _.each(DEVICE_NAMES_EXCLUDE, function(rule) {
-        if (rule.regex.test(device)) {
-          ignoredMsg = rule.msg;
-        }
-      });
-      return {
-        device: device,
-        suffix: suffixes[i],
-        used: devicesForStats[device],
-        ignoredMsg: ignoredMsg
-      };
-    });
-  },
-  _deviceCheckboxClicked: function(checkbox) {
-    // Update the device map.
-    var devicesForStats = _.extend({}, this.devicesForStats);
-    var device = checkbox.target.value;
-    if (checkbox.target.checked) {
-      devicesForStats[device] = true;
-    } else {
-      delete devicesForStats[device];
-    }
-    this.set('devicesForStats', devicesForStats);
-  },
-  _numSessionRuns: function(metadataTags) {
-    return metadataTags != null ? metadataTags.length : 0;
-  },
-  _getBackgroundColor: function(color) {
-    return 'background-color:' + color;
-  },
-  fit: function() {
-    document.querySelector('#scene').fit();
-  },
-  _isGradientColoring: function(stats, colorBy) {
-    return ["compute_time", "memory"].indexOf(colorBy) !== -1
-        && stats != null;
-  },
-  _equals: function(a, b) {
-    return a === b;
-  },
-  _getCurrentGradientParams: function(colorByParams, colorBy) {
-    if (!this._isGradientColoring(this.stats, colorBy)) {
-      return;
-    }
-    var params = colorByParams[colorBy];
-    var minValue = params.minValue;
-    var maxValue = params.maxValue;
-    if (colorBy === 'memory') {
-      minValue = tf.graph.util.convertUnitsToHumanReadable(
-          minValue, tf.graph.util.MEMORY_UNITS);
-      maxValue = tf.graph.util.convertUnitsToHumanReadable(
-          maxValue, tf.graph.util.MEMORY_UNITS);
-    } else if (colorBy === 'compute_time') {
-      minValue = tf.graph.util.convertUnitsToHumanReadable(
-          minValue, tf.graph.util.TIME_UNITS);
-      maxValue = tf.graph.util.convertUnitsToHumanReadable(
-          maxValue, tf.graph.util.TIME_UNITS);
-    }
-    return {
-      minValue: minValue,
-      maxValue: maxValue,
-      startColor: params.startColor,
-      endColor: params.endColor
-    };
-  },
-  download: function() {
-    this.$.graphdownload.click();
-  },
-  _updateFileInput: function(e) {
-    var file = e.target.files[0];
-    if (!file) {
-      return;
-    }
-    this._setDownloadFilename(file.name);
-    this.set('selectedFile', e);
-  },
-  _datasetsChanged: function(newDatasets, oldDatasets) {
-    if (oldDatasets != null || this.selected == null) {
-      // Select the first dataset by default.
-      this.set('selectedDataset', 0);
-      this._setDownloadFilename(this.datasets[this.selectedDataset].path);
-    }
-  },
-  _getMetadataTags: function(selectedDataset, datasets) {
-    return this.datasets[selectedDataset].runMetadata;
-  },
-  _selectedDatasetChanged: function(newDataset, oldDataset) {
-    if (this.datasets) {
-      this.set('selectedMetadataTag', -1);
-      this.set('colorBy', 'structure');
-      this.$['trace-inputs'].active = false; // Set trace input to off-state.
-      this._setDownloadFilename(this.datasets[newDataset].path);
-    }
-  },
-  _getFile: function() {
-    this.$$("#file").click();
-  },
-  _setDownloadFilename: function(graphPath) {
-    // Strip off everything before the last "/" and strip off the file
-    // extension in order to get the name of the PNG for the graph.
-    var dotIndex = graphPath.lastIndexOf('.');
-    if (dotIndex) {
-      graphPath = graphPath.substring(0, dotIndex);
-    }
-    var slashIndex = graphPath.lastIndexOf('/');
-    if (slashIndex) {
-      graphPath = graphPath.substring(slashIndex + 1);
-    }
-    this.$.graphdownload.setAttribute('download', graphPath + '.png');
-  },
-  _statsNotNull: function(stats) {
-    return stats !== null;
-  },
-});
-})(); // Closing private scope.
-</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD
index d5f9a76eb2..21e876fd07 100644
--- a/tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_controls_d3v4/BUILD
@@ -1,8 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -30,3 +28,30 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-controls.html",
+    ],
+    destdir = "tf-graph-controls",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_d3v4/BUILD
index 367baeb67b..031aa4be10 100644
--- a/tensorflow/tensorboard/components/tf_graph_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/BUILD
@@ -1,8 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -35,3 +33,31 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph.html",
+        "tf-graph-minimap.html",
+        "tf-graph-scene.html",
+    ],
+    destdir = "tf-graph",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD
index 0cee324f48..01e786d1b9 100644
--- a/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_dashboard_d3v4/BUILD
@@ -1,8 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -28,3 +26,33 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-dashboard.html",
+    ],
+    destdir = "tf-graph-dashboard",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_board_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_controls_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_loader_d3v4:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_info/BUILD b/tensorflow/tensorboard/components/tf_graph_info/BUILD
deleted file mode 100644
index eec1155769..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_info",
-    srcs = [
-        "tf-graph-icon.html",
-        "tf-graph-info.html",
-        "tf-node-info.html",
-        "tf-node-list-item.html",
-    ],
-    path = "/tf-graph-info",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_iron_list",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_item",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-icon.html",
-        "tf-graph-info.html",
-        "tf-node-info.html",
-        "tf-node-list-item.html",
-    ],
-    destdir = "tf-graph-info",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
deleted file mode 100644
index a7d59418fd..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/demo/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_info/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"] + glob(["data/**"]),
-    path = "/tf-graph-info/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "//tensorflow/tensorboard/components/tf_graph_info",
-        "//tensorflow/tensorboard/components/tf_graph_loader",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt
deleted file mode 100644
index 30b2064534..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/demo/data/graph.pbtxt
+++ /dev/null
@@ -1,4606 +0,0 @@
-node {
-  name: "GradientDescent/learning_rate"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_3"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0.1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 100
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000d\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_grad/Shape"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_1_grad/Shape"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod_1"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape_1"
-  input: "gradients/Mean_grad/Const_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum"
-  op: "Maximum"
-  input: "gradients/Mean_grad/Prod_1"
-  input: "gradients/Mean_grad/Maximum/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape"
-  input: "gradients/Mean_grad/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/floordiv"
-  op: "FloorDiv"
-  input: "gradients/Mean_grad/Prod"
-  input: "gradients/Mean_grad/Maximum"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Cast"
-  op: "Cast"
-  input: "gradients/Mean_grad/floordiv"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "DstT"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "SrcT"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile/multiples"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Fill"
-  op: "Fill"
-  input: "gradients/Shape"
-  input: "gradients/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Fill"
-  input: "gradients/Mean_grad/Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile"
-  op: "Tile"
-  input: "gradients/Mean_grad/Reshape"
-  input: "gradients/Mean_grad/Tile/multiples"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tmultiples"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/truediv"
-  op: "RealDiv"
-  input: "gradients/Mean_grad/Tile"
-  input: "gradients/Mean_grad/Cast"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Mean_grad/truediv"
-  input: "gradients/Reshape_3_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  op: "ExpandDims"
-  input: "gradients/Reshape_3_grad/Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tdim"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/begin"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1"
-  op: "Sub"
-  input: "Rank_2"
-  input: "Sub_1/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/begin"
-  op: "Pack"
-  input: "Sub_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_1"
-  op: "Slice"
-  input: "Shape_2"
-  input: "Slice_1/begin"
-  input: "Slice_1/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat_1"
-  op: "ConcatV2"
-  input: "concat_1/values_0"
-  input: "Slice_1"
-  input: "concat_1/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub"
-  op: "Sub"
-  input: "Rank_1"
-  input: "Sub/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice/begin"
-  op: "Pack"
-  input: "Sub"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice"
-  op: "Slice"
-  input: "Shape_1"
-  input: "Slice/begin"
-  input: "Slice/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat"
-  op: "ConcatV2"
-  input: "concat/values_0"
-  input: "Slice"
-  input: "concat/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2"
-  op: "Sub"
-  input: "Rank"
-  input: "Sub_2/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/size"
-  op: "Pack"
-  input: "Sub_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_2"
-  op: "Slice"
-  input: "Shape"
-  input: "Slice_2/begin"
-  input: "Slice_2/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_biases/read"
-  op: "Identity"
-  input: "logits_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_weights/read"
-  op: "Identity"
-  input: "logits_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_biases/read"
-  op: "Identity"
-  input: "hidden_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 784
-        }
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_weights/read"
-  op: "Identity"
-  input: "hidden_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\377\377\377\377"
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/depth"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/off_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/on_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_1/random_shuffle_queue"
-  op: "RandomShuffleQueueV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "capacity"
-    value {
-      i: 20000
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "min_after_dequeue"
-    value {
-      i: 4000
-    }
-  }
-  attr {
-    key: "seed"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "seed2"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 28
-          }
-          dim {
-            size: 28
-          }
-          dim {
-            size: 1
-          }
-        }
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  op: "QueueDequeueManyV2"
-  input: "mnist_dataset_train_1/random_shuffle_queue"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "timeout_ms"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  input: "Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul"
-  op: "MatMul"
-  input: "Reshape"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add"
-  op: "Add"
-  input: "MatMul"
-  input: "hidden_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Relu"
-  op: "Relu"
-  input: "add"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add_1"
-  op: "Add"
-  input: "MatMul_1"
-  input: "logits_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_1"
-  op: "Reshape"
-  input: "add_1"
-  input: "concat"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot"
-  op: "OneHot"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
-  input: "mnist_dataset_train_2/one_hot/depth"
-  input: "mnist_dataset_train_2/one_hot/on_value"
-  input: "mnist_dataset_train_2/one_hot/off_value"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "TI"
-    value {
-      type: DT_INT64
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape_2"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/one_hot"
-  input: "concat_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "SoftmaxCrossEntropyWithLogits"
-  op: "SoftmaxCrossEntropyWithLogits"
-  input: "Reshape_1"
-  input: "Reshape_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  op: "PreventGradient"
-  input: "SoftmaxCrossEntropyWithLogits:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "message"
-    value {
-      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  op: "Mul"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  input: "gradients/Reshape_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum_1"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum"
-  input: "gradients/add_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape_1"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul_1"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Relu_grad/ReluGrad"
-  op: "ReluGrad"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency"
-  input: "Relu"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum_1"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum"
-  input: "gradients/add_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape_1"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul_1"
-  op: "MatMul"
-  input: "Reshape"
-  input: "gradients/add_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_grad/tuple/control_dependency"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 784
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_grad/MatMul"
-  input: "^gradients/MatMul_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_grad/MatMul_1"
-  input: "^gradients/MatMul_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "GradientDescent"
-  op: "NoOp"
-  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_2"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_3"
-  op: "Reshape"
-  input: "SoftmaxCrossEntropyWithLogits"
-  input: "Slice_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Mean"
-  op: "Mean"
-  input: "Reshape_3"
-  input: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "_send_Mean_0"
-  op: "_Send"
-  input: "Mean"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "client_terminated"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "recv_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device_incarnation"
-    value {
-      i: -5924635994370253548
-    }
-  }
-  attr {
-    key: "tensor_name"
-    value {
-      s: "Mean:0"
-    }
-  }
-}
-library {
-}
-versions {
-  producer: 21
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_info/demo/index.html b/tensorflow/tensorboard/components/tf_graph_info/demo/index.html
deleted file mode 100644
index f7d2ef7ee5..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/demo/index.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../tf-graph-info.html">
-<link rel="import" href="../../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="../../tf-graph-loader/tf-graph-loader.html">
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<title>TF Graph Info Demo</title>
-<style>
-  #demo-container {
-    border: 2px solid #808080;
-    width: 1000px;
-    height: 600px;
-  }
-</style>
-<demo-snippet>
-  <template>
-    <dom-module id="tf-graph-info-demo">
-      <template>
-        <!-- We first use the graph loader to load and parse a pbtxt file into a graph object. -->
-        <tf-graph-loader
-            id="loader"
-            datasets="[[_datasets]]"
-            selected-dataset="[[_selectedDataset]]"
-            out-graph="{{_graph}}">
-        </tf-graph-loader>
-
-        <tf-graph-info id="info" title="selected"></tf-graph-info>
-      </template>
-      <script>
-        "use strict";
-
-        Polymer({
-          is: "tf-graph-info-demo",
-          properties: {
-            // We tell the graph loader to load a specific pbtxt file.
-            _datasets: {
-              type: Array,
-              value: [{
-                "name": "Graph with XLA Clusters Specified",
-                "path": "data/graph.pbtxt"
-              }],
-            },
-            _selectedDataset: {
-              type: Number,
-              value: 0,
-            },
-
-            // This property will be updated by the graph loader.
-            _graph: {
-              type: Object,
-            },
-          },
-          observers: [
-            '_graphUpdated(_graph)',
-          ],
-          _graphUpdated: function(slimGraph) {
-            const tracker = tf.graph.util.getTracker(this.$.loader);
-            const hierarchyTracker = tf.graph.util.getSubtaskTracker(
-                tracker, 100, 'Namespace hierarchy');
-            const hierarchyOptions = {};
-            tf.graph.hierarchy.build(slimGraph, hierarchyOptions, hierarchyTracker).then(
-                function(graphHierarchy) {
-              // We have parsed and built the graph object from a pbtxt file. Show info.
-              this.$.info.set('graph', slimGraph);
-              this.$.info.set('graphHierarchy', graphHierarchy);
-
-              // Select a node within that graph.
-              this.$.info.set('selectedNode', 'GradientDescent/learning_rate');
-            }.bind(this));
-          },
-        });
-      </script>
-    </dom-module>
-    <div id='demo-container'>
-      <tf-graph-info-demo></tf-graph-info-demo>
-    </div>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html b/tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html
deleted file mode 100644
index a3e9dc59c5..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-graph-icon.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-
-<dom-module id="tf-graph-icon">
-  <style>
-    .faded-rect {
-      fill: url(#rectHatch);
-    }
-
-    .faded-ellipse {
-      fill: url(#ellipseHatch);
-    }
-
-    .faded-rect, .faded-ellipse, .faded-series {
-      stroke:   var(--tb-graph-faded) !important;
-    }
-  </style>
-  <template>
-    <template is="dom-if" if="[[_isType(node, type, 'OP')]]">
-      <template is="dom-if" if="[[_isConst(node, const)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 10 10">
-          <circle cx="5" cy="5" r="3"
-              fill$="[[_getFill(_computedFill, 'OP')]]"
-              stroke$="[[_getStroke(_computedFill, 'OP')]]" />
-        </svg>
-      </template>
-      <template is="dom-if" if="[[_isSummary(node, summary)]]">
-        <svg width$="[[height]]" height$="[[height]]" viewBox="0 0 12 12">
-          <use x="0" y="0" xlink:href="#summary-icon" />
-        </svg>
-      </template>
-      <template is="dom-if" if="[[_isRegularOp(node, const, summary)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 8">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-              xlink:href="#op-node-stamp"
-              fill$="[[_getFill(_computedFill, 'OP')]]"
-              stroke$="[[_getStroke(_computedFill, 'OP')]]"
-              class$="{{_fadedClass(renderInfo, 'ellipse')}}"
-              x="8" y="4" />
-        </svg>
-      </template>
-    </template>
-    <template is="dom-if" if="[[_isType(node, type, 'META')]]">
-      <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 37 16">
-        <rect x="1" y="1"
-            fill$="[[_getFill(_computedFill, 'META')]]"
-            stroke$="[[_getStroke(_computedFill, 'META')]]"
-            class$="{{_fadedClass(renderInfo, 'rect')}}"
-            stroke-width="2px"
-            height="14" width="35"
-            rx="5" ry="5"/>
-      </svg>
-    </template>
-    <template is="dom-if" if="[[_isType(node, type, 'SERIES')]]">
-      <template is="dom-if" if="[[_isVertical(node, vertical)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 16 15">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-              xlink:href="#op-series-vertical-stamp"
-              fill$="[[_getFill(_computedFill, 'SERIES')]]"
-              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
-              class$="{{_fadedClass(renderInfo, 'series')}}"
-              x="0" y="2" />
-        </svg>
-      </template>
-      <template is="dom-if" if="[[!_isVertical(node, vertical)]]">
-        <svg height$="[[height]]"
-            preserveAspectRatio="xMinYMid meet" viewBox="0 0 24 10">
-          <use xmlns:xlink="http://www.w3.org/1999/xlink"
-              xlink:href="#op-series-horizontal-stamp"
-              fill$="[[_getFill(_computedFill, 'SERIES')]]"
-              stroke$="[[_getStroke(_computedFill, 'SERIES')]]"
-              class$="{{_fadedClass(renderInfo, 'series')}}"
-              x="0" y="1" />
-        </svg>
-      </template>
-    </template>
-  </template>
-
-  <script>
-    (function() {
-      Polymer({
-        is: 'tf-graph-icon',
-
-        properties: {
-          /**
-           * Node to represent with an icon. Optional, but if specified, its
-           * properties override those defined in the type, vertical, const and
-           * summary properties.
-           * @type {tf.graph.Node}
-           */
-          node: {
-            type: Object,
-            value: null
-          },
-
-          /**
-           * Render node information associated with this node. Optional. If
-           * specified, this is only used when computing the fill of the icon
-           * element.
-           * @type {tf.graph.render.RenderNodeInfo}
-           */
-          renderInfo: {
-            type: Object,
-            value: null
-          },
-
-          /**
-           * String indicating the type of coloring to use for this node, used
-           * only for determining the fill.
-           */
-          colorBy: {
-            type: Object,
-            value: "structural"
-          },
-
-          /**
-           * Function used by structural coloring algorithm to determine which
-           * color to use based on the template ID of the node. Optional.
-           */
-          templateIndex: {
-            type: Function,
-            value: null
-          },
-
-          /** Type of node to draw (ignored if node is set). */
-          type: {
-            type: String,
-            value: null
-          },
-
-          /** Direction for series (ignored for other types). */
-          vertical: {
-            type: Boolean,
-            value: false
-          },
-
-          /** Whether the op is Const (ignored for non-ops). */
-          const: {
-            type: Boolean,
-            value: false
-          },
-
-          /** Whether the op is a Summary (ignored for non-ops). */
-          summary: {
-            type: Boolean,
-            value: false
-          },
-
-          /**
-           * Fill for the icon, optional. If fill is specified and node is not
-           * specified, then this value will override the default for the
-           * element. However, if node is specified, this value will be ignored.
-           */
-          fill: {
-            type: String,
-            value: null
-          },
-
-          /** Height of the SVG element in pixels, used for scaling. */
-          height: {
-            type: Number,
-            value: 20
-          },
-
-          /** The computed fill for the node. **/
-          _computedFill: {
-            type: String,
-            computed:
-              "_getComputedFill(node, renderInfo, colorBy, templateIndex, fill)"
-          }
-
-        },
-
-        /**
-         * Get the computed fill value for the element.
-         */
-        _getComputedFill: function(inputNode, inputRenderInfo, inputColorBy,
-            inputTemplateIndex, inputFill) {
-          if (inputNode && inputRenderInfo &&
-              inputColorBy && inputTemplateIndex) {
-            var ns = tf.graph.scene.node;
-            var colorBy = ns.ColorBy[inputColorBy.toUpperCase()];
-            return ns.getFillForNode(inputTemplateIndex, colorBy,
-                inputRenderInfo, false);
-          }
-          return inputFill;
-        },
-
-        /**
-         * Get the fill value for the element, or if that's not possible, return
-         * the default fill value for the node type.
-         */
-        _getFill: function(inputComputedFill, inputNodeType) {
-          return inputComputedFill || ({
-            OP: tf.graph.render.OpNodeColors.DEFAULT_FILL,
-            META: tf.graph.render.MetanodeColors.DEFAULT_FILL,
-            SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_FILL
-          })[inputNodeType];
-        },
-
-        /**
-         * Get the stroke value for the element, or if that's not possible,
-         * return the default stroke value for the node type.
-         */
-        _getStroke: function(inputComputedFill, inputNodeType) {
-          return inputComputedFill ?
-            tf.graph.scene.node.getStrokeForFill(inputComputedFill) :
-            ({
-              OP: tf.graph.render.OpNodeColors.DEFAULT_STROKE,
-              META: tf.graph.render.MetanodeColors.DEFAULT_STROKE,
-              SERIES: tf.graph.render.SeriesNodeColors.DEFAULT_STROKE
-            })[inputNodeType];
-        },
-
-        /**
-         * Test whether the specified node's type, or the literal type string,
-         * match a particular other type.
-         */
-        _isType: function(inputNode, inputType, targetType) {
-          if (inputNode) {
-            return tf.graph.NodeType[inputNode.type] === targetType;
-          }
-          return inputType === targetType;
-        },
-
-        /**
-         * Test whether the specified node should be represented as a vertical
-         * series. Defaults to the value of the vertical property if node is
-         * not specified.
-         */
-        _isVertical: function(inputNode, inputVertical) {
-          if (inputNode) {
-            return inputNode.hasNonControlEdges;
-          }
-          return !!inputVertical;
-        },
-
-        /**
-         * Test whether the specified node is a constant. Defaults to the value
-         * of the const property if node is not specified.
-         */
-        _isConst: function(inputNode, inputConst) {
-          if (inputNode) {
-            return inputNode.op === 'Const';
-          }
-          return !!inputConst;
-        },
-
-        /**
-         * Test whether the specified node is a summary. Defaults to the value
-         * of the summary property if node is not specified.
-         */
-        _isSummary: function(inputNode, inputSummary) {
-          if (inputNode) {
-            return this._isType(inputNode, null, 'OP') &&
-                inputNode.op.substr(-7) === 'Summary';
-          }
-          return !!inputSummary;
-        },
-
-        /**
-         * Test whether the op node is a regular non-summary non-const node.
-         */
-        _isRegularOp: function(inputNode, inputConst, inputSummary) {
-          return !this._isConst(inputNode, inputConst) &&
-              !this._isSummary(inputNode, inputSummary);
-        },
-
-        _fadedClass: function(itemRenderInfo, shape) {
-          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded-' + shape : '';
-        }
-      });
-    })();
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html b/tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html
deleted file mode 100644
index b33e1e00d0..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-graph-info.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-slider/paper-slider.html">
-<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
-<link rel="import" href="../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="tf-node-info.html">
-
-<dom-module id="tf-graph-info">
-<template>
-<style>
-:host {
-  font-size: 12px;
-  margin: 0;
-  padding: 0;
-  display: block;
-}
-
-h2 {
-  padding: 0;
-  text-align: center;
-  margin: 0;
-}
-
-.health-pill-legend {
-  padding: 15px;
-}
-
-.health-pill-legend h2 {
-  text-align: left;
-}
-
-.health-pill-entry {
-  margin: 10px 10px 10px 0;
-}
-
-.health-pill-entry .color-preview {
-  width: 26px;
-  height: 26px;
-  border-radius: 3px;
-  display: inline-block;
-  margin: 0 10px 0 0;
-}
-
-.health-pill-entry .color-label, .health-pill-entry .tensor-count {
-  color: #777;
-  display: inline-block;
-  height: 26px;
-  font-size: 22px;
-  line-height: 26px;
-  vertical-align: top;
-}
-
-.health-pill-entry .tensor-count {
-  float: right;
-}
-
-#health-pill-step-slider {
-  width: 100%;
-  margin: 0 0 0 -15px;
-  /* 31 comes from adding a padding of 15px from both sides of the paper-slider, subtracting
-   * 1px so that the slider width aligns with the image (the last slider marker takes up 1px),
-   * and adding 2px to account for a border of 1px on both sides of the image. 30 - 1 + 2.
-   * Apparently, the paper-slider lacks a mixin for those padding values. */
-  width: calc(100% + 31px);
-}
-
-#health-pills-loading-spinner {
-  width: 20px;
-  height: 20px;
-  vertical-align: top;
-}
-
-#health-pill-step-number-input {
-  text-align: center;
-  vertical-align: top;
-}
-</style>
-<template is="dom-if" if="{{selectedNode}}">
-  <paper-material elevation="1" class="card">
-    <tf-node-info graph-hierarchy="[[graphHierarchy]]"
-                  render-hierarchy="[[renderHierarchy]]"
-                  flat-graph="[[graph]]"
-                  node-name="[[selectedNode]]"
-                  node-include="[[selectedNodeInclude]]"
-                  highlighted-node="{{highlightedNode}}"
-                  color-by="[[colorBy]]">
-    </tf-node-info>
-  </paper-material>
-</template>
-<template is="dom-if" if="[[_healthPillsAvailable(debuggerDataEnabled, nodeNamesToHealthPills)]]">
-  <paper-material elevation="1" class="card health-pill-legend">
-    <div class="title">
-      Enable all (not just sampled) steps. Requires slow disk read.
-    </div>
-    <paper-toggle-button id="enableAllStepsModeToggle" checked="{{allStepsModeEnabled}}">
-    </paper-toggle-button>
-    <h2>
-      Step of Health Pills:
-      <template is="dom-if" if="[[allStepsModeEnabled]]">
-        <input type="number"
-               id="health-pill-step-number-input"
-               min="0"
-               max="[[_biggestStepEverSeen]]"
-               value="{{specificHealthPillStep::input}}">
-      </template>
-      <template is="dom-if" if="[[!allStepsModeEnabled]]">
-        [[_currentStepDisplayValue]]
-      </template>
-
-      <paper-spinner-lite active
-                          hidden$=[[!areHealthPillsLoading]]
-                          id="health-pills-loading-spinner"></paper-spinner-lite>
-    </h2>
-    <template is="dom-if" if="[[allStepsModeEnabled]]">
-      <paper-slider
-            id="health-pill-step-slider"
-            immediate-value="{{specificHealthPillStep}}"
-            max="[[_biggestStepEverSeen]]"
-            snaps
-            step="1"
-            value="{{specificHealthPillStep}}"></paper-slider>
-    </template>
-    <template is="dom-if" if="[[!allStepsModeEnabled]]">
-      <template is="dom-if" if="[[_maxStepIndex]]">
-        <paper-slider
-              id="health-pill-step-slider"
-              immediate-value="{{healthPillStepIndex}}"
-              max="[[_maxStepIndex]]"
-              snaps
-              step="1"
-              value="{{healthPillStepIndex}}"></paper-slider>
-      </template>
-    </template>
-    <h2>
-      Health Pill
-      <template is="dom-if" if="[[healthPillValuesForSelectedNode]]">
-        Counts for Selected Node
-      </template>
-      <template is="dom-if" if="[[!healthPillValuesForSelectedNode]]">
-        Legend
-      </template>
-    </h2>
-    <template is="dom-repeat" items="[[healthPillEntries]]">
-      <div class="health-pill-entry">
-        <div class="color-preview" style="background:[[item.background_color]]"></div>
-        <div class="color-label">[[item.label]]</div>
-        <div class="tensor-count">
-          [[_computeTensorCountString(healthPillValuesForSelectedNode, index)]]
-        </div>
-      </div>
-    </template>
-  </paper-material>
-</template>
-</template>
-<script>
-"use strict";
-
-(function() {
-  Polymer({
-    is: 'tf-graph-info',
-
-    properties: {
-      title: String,
-      graphHierarchy: Object,
-      graph: Object,
-      renderHierarchy: Object,
-      nodeNamesToHealthPills: Object,
-      healthPillStepIndex: {
-        type: Number,
-        notify: true,
-      },
-      // Only relevant if we are in all steps mode, in which case the user may want to view health
-      // pills for a specific step.
-      specificHealthPillStep: {
-        type: Number,
-        value: 0,
-        notify: true,
-      },
-      colorBy: String,
-      // Two-ways
-      selectedNode: {
-        type: String,
-        notify: true
-      },
-      highlightedNode: {
-        type: String,
-        notify: true
-      },
-      // The enum value of the include property of the selected node.
-      selectedNodeInclude: {
-        type: Number,
-        notify: true
-      },
-      // Whether debugger data is enabled for this instance of Tensorboard.
-      debuggerDataEnabled: Boolean,
-      // Whether health pills are currently being loaded, in which case we show a spinner (and the
-      // current health pills shown might be out of date).
-      areHealthPillsLoading: Boolean,
-      healthPillEntries: {
-        type: Array,
-        value: tf.graph.scene.healthPillEntries,
-        readOnly: true,
-      },
-      healthPillValuesForSelectedNode: {
-        type: Array,
-        computed: '_computeHealthPillForNode(nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading)',
-      },
-      // When all-steps mode is enabled, the user can request health pills for any step. In this
-      // mode, Tensorboard makes a request every time the user drags the slider to a different step.
-      allStepsModeEnabled: {
-        type: Boolean,
-        notify: true,
-      },
-      // The biggest step value ever seen. Used to determine what steps of health pills to let the
-      // user fetch in all steps mode.
-      _biggestStepEverSeen: {
-        type: Number,
-        computed: '_computeBiggestStepEverSeen(nodeNamesToHealthPills)',
-      },
-      _maxStepIndex: {
-        type: Number,
-        computed: '_computeMaxStepIndex(nodeNamesToHealthPills)',
-      },
-      _currentStepDisplayValue: {
-        type: String,
-        computed: '_computeCurrentStepDisplayValue(nodeNamesToHealthPills, healthPillStepIndex, allStepsModeEnabled, specificHealthPillStep, areHealthPillsLoading)',
-      },
-    },
-    listeners: {
-      'node-list-item-click': '_nodeListItemClicked',
-      'node-list-item-mouseover': '_nodeListItemMouseover',
-      'node-list-item-mouseout': '_nodeListItemMouseout'
-    },
-    _nodeListItemClicked: function(event) {
-      this.selectedNode = event.detail.nodeName;
-    },
-    _nodeListItemMouseover: function(event) {
-      this.highlightedNode = event.detail.nodeName;
-    },
-    _nodeListItemMouseout: function() {
-      this.highlightedNode = null;
-    },
-    _healthPillsAvailable: function(debuggerDataEnabled, nodeNamesToHealthPills) {
-      // So long as there is a mapping (even if empty) from node name to health pills, show the
-      // legend and slider. We do that because, even if no health pills exist at the current step,
-      // the user may desire to change steps, and the slider must show for the user to do that.
-      return debuggerDataEnabled && nodeNamesToHealthPills;
-    },
-    _computeTensorCountString: function(healthPillValuesForSelectedNode, valueIndex) {
-      if (!healthPillValuesForSelectedNode) {
-        // No health pill data is available.
-        return '';
-      }
-
-      return healthPillValuesForSelectedNode[valueIndex].toFixed(0);
-    },
-    _computeHealthPillForNode: function(
-        nodeNamesToHealthPills, healthPillStepIndex, selectedNode, allStepsModeEnabled, areHealthPillsLoading) {
-      if (areHealthPillsLoading) {
-        // Health pills are loading. Do not render data that is out of date.
-        return null;
-      }
-
-      if (!selectedNode) {
-        // No node is selected.
-        return null;
-      }
-
-      const healthPills = nodeNamesToHealthPills[selectedNode];
-      if (!healthPills) {
-        // This node lacks a health pill.
-        return null;
-      }
-
-      // If all steps mode is enabled, we use the first health pill in the list because the JSON
-      // response from the server is a mapping between node name and a list of 1 health pill.
-      const healthPill = healthPills[allStepsModeEnabled ? 0 : healthPillStepIndex];
-      if (!healthPill) {
-        // This node lacks a health pill at the current step.
-        return null;
-      }
-
-      // The health pill count values start at 2. Each health pill contains 6 values.
-      return healthPill.value.slice(2, 8);
-    },
-    _computeCurrentStepDisplayValue: function(
-        nodeNamesToHealthPills,
-        healthPillStepIndex,
-        allStepsModeEnabled,
-        specificHealthPillStep,
-        areHealthPillsLoading) {
-      if (allStepsModeEnabled) {
-        // The user seeks health pills for specific step from the server.
-        return specificHealthPillStep.toFixed(0);
-      }
-
-      if (areHealthPillsLoading) {
-        // The current step is undefined.
-        return 0;
-      }
-
-      for (let nodeName in nodeNamesToHealthPills) {
-        // All nodes have the same number of steps stored, so only examine 1 node. We cannot
-        // directly index into the nodeNamesToHealthPills object because we do not have a key.
-        // If all steps mode is enabled, we only have 1 step to show.
-        return nodeNamesToHealthPills[nodeName][healthPillStepIndex].step.toFixed(0);
-      }
-
-      // The current step could not be computed.
-      return 0;
-    },
-    _computeBiggestStepEverSeen: function(nodeNamesToHealthPills) {
-      for (let nodeName in nodeNamesToHealthPills) {
-        // All nodes have the same number of steps stored, so only examine 1 node.
-        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
-        // of the array will be greater than 1.
-        var healthPills = nodeNamesToHealthPills[nodeName];
-        return Math.max(this._biggestStepEverSeen, healthPills[healthPills.length - 1].step);
-      }
-
-      // No steps seen so far. Default to 0.
-      return this._biggestStepEverSeen || 0;
-    },
-    _computeMaxStepIndex: function(nodeNamesToHealthPills) {
-      for (let nodeName in nodeNamesToHealthPills) {
-        // All nodes have the same number of steps stored, so only examine 1 node.
-        // The index is 1 less than the count. Tensorboard backend logic guarantees that the length
-        // of the array will be greater than 1.
-        return nodeNamesToHealthPills[nodeName].length - 1;
-      }
-
-      // Return a falsy value. The slider should be hidden.
-      return 0;
-    },
-  });
-})();
-</script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html b/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
deleted file mode 100644
index f1455acaee..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-node-info.html
+++ /dev/null
@@ -1,652 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../iron-list/iron-list.html">
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-item/paper-item.html">
-<link rel="import" href="../paper-item/paper-item-body.html">
-<link rel="import" href="../tf-graph-common/tf-graph-common.html">
-<link rel="import" href="tf-graph-icon.html">
-<link rel="import" href="tf-node-list-item.html">
-
-<dom-module id="tf-node-info">
-  <style>
-  .sub-list-group {
-    font-weight: 500;
-    font-size: 12pt;
-    padding-bottom: 8px;
-    width: 100%;
-  }
-
-  .sub-list {
-    max-height: 300px;
-    overflow-y: scroll;
-  }
-
-  .attr-left {
-    float: left;
-    width: 30%;
-    word-wrap: break-word;
-    color: #565656;
-    font-size: 11pt;
-    font-weight: 400;
-  }
-
-  .attr-right {
-    margin-left: 30%;
-    word-wrap: break-word;
-    color: #565656;
-    font-weight: 400;
-  }
-
-  .sub-list-table {
-    display: table;
-    width: 100%;
-  }
-
-  .sub-list-table-row {
-    display: table-row;
-  }
-
-  .sub-list-table-row .sub-list-table-cell:last-child {
-    text-align: right;
-  }
-
-  .sub-list-table-cell {
-    color: #565656;
-    display: table-cell;
-    font-size: 11pt;
-    font-weight: 400;
-    max-width: 200px;
-    padding: 0 4px;
-  }
-
-  paper-item {
-    padding: 0;
-    background: #e9e9e9;
-  }
-
-  paper-item-body[two-line] {
-    min-height: 0;
-    padding: 8px 12px 4px;
-  }
-
-  .expandedInfo {
-    padding: 8px 12px;
-  }
-
-  .controlDeps {
-    padding: 0 0 0 8px;
-  }
-
-  .node-name {
-    white-space: normal;
-    word-wrap: break-word;
-    font-size: 14pt;
-    font-weight: 500;
-  }
-
-  .node-icon {
-    float: right;
-  }
-
-  .subtitle {
-    font-size: 12pt;
-    color: #5e5e5e;
-  }
-
-  .controlLine {
-    font-size: 11pt;
-    font-weight: 400;
-  }
-
-  .toggle-button {
-    float: right;
-    max-height: 20px;
-    max-width: 20px;
-    padding: 0;
-  }
-
-  .control-toggle-button {
-    float: left;
-    max-height: 20px;
-    max-width: 20px;
-    padding: 0;
-  }
-
-  .toggle-include-group {
-    padding-top: 4px;
-  }
-
-  .toggle-include {
-    margin: 5px 6px;
-    text-transform: none;
-    padding: 4px 6px;
-    font-size: 10pt;
-    background-color: #fafafa;
-    color: #666;
-  }
-
-  .toggle-include:hover {
-    background-color: var(--google-yellow-100);
-  }
-
-  .non-control-list-item {
-    padding-left: 10px;
-  }
-  </style>
-  <template>
-    <paper-item>
-      <paper-item-body two-line>
-        <div>
-          <paper-icon-button
-            icon="{{_getToggleIcon(_expanded)}}"
-            on-click="_toggleExpanded"
-            class="toggle-button">
-          </paper-icon-button>
-          <div class="node-name" id="nodetitle"></div>
-        </div>
-        <div secondary>
-          <tf-graph-icon class="node-icon" node="[[_node]]"
-              render-info="[[_getRenderInfo(nodeName, renderHierarchy)]]"
-              color-by="[[colorBy]]"
-              template-index="[[_templateIndex]]"
-              ></tf-graph-icon>
-          <template is="dom-if" if="{{_node.op}}">
-            <div class="subtitle">
-              Operation:
-              <span>[[_node.op]]</span>
-            </div>
-          </template>
-          <template is="dom-if" if="{{_node.metagraph}}">
-            <div class="subtitle">
-              Subgraph:
-              <span>[[_node.cardinality]]</span> nodes
-            </div>
-          </template>
-        </div>
-      </paper-item-body>
-    </paper-item>
-    <iron-collapse opened="{{_expanded}}">
-    <template is="dom-if" if="{{_expanded}}" restamp="true">
-      <div class="expandedInfo">
-        <div class="sub-list-group attributes">
-          Attributes
-          (<span>[[_attributes.length]]</span>)
-          <iron-list class="sub-list" id ="attributesList"
-                    items="[[_attributes]]">
-            <template>
-              <div>
-                <div class="attr-left">[[item.key]]</div>
-                <div class="attr-right">[[item.value]]</div>
-              </div>
-            </template>
-          </iron-list>
-        </div>
-
-        <template is="dom-if" if="{{_device}}">
-          <div class="sub-list-group device">
-            <div class="attr-left">Device</div>
-            <div class="attr-right">[[_device]]</div>
-          </div>
-        </template>
-
-        <div class="sub-list-group predecessors">
-          Inputs
-          (<span>[[_totalPredecessors]]</span>)
-          <iron-list class="sub-list" id ="inputsList"
-                    items="[[_predecessors.regular]]">
-            <template>
-              <tf-node-list-item
-                  class="non-control-list-item"
-                  card-node="[[_node]]"
-                  item-node="[[item.node]]"
-                  edge-label="[[item.edgeLabel]]"
-                  item-render-info="[[item.renderInfo]]"
-                  name="[[item.name]]"
-                  item-type="predecessors"
-                  color-by="[[colorBy]]"
-                  template-index="[[_templateIndex]]">
-              </tf-node-list-item>
-            </template>
-          </iron-list>
-          <template is="dom-if" if="[[_predecessors.control.length]]">
-            <div class="controlDeps">
-              <div class="controlLine">
-                <paper-icon-button
-                  icon="{{_getToggleIcon(_openedControlPred)}}"
-                  on-click="_toggleControlPred"
-                  class="control-toggle-button">
-                </paper-icon-button>
-                Control dependencies
-              </div>
-              <iron-collapse opened="{{_openedControlPred}}" no-animation>
-                <template is="dom-if" if="{{_openedControlPred}}" restamp="true">
-                  <iron-list class="sub-list" items="[[_predecessors.control]]">
-                    <template>
-                      <tf-node-list-item
-                          card-node="[[_node]]"
-                          item-node="[[item.node]]"
-                          item-render-info="[[item.renderInfo]]"
-                          name="[[item.name]]"
-                          item-type="predecessors"
-                          color-by="[[colorBy]]"
-                          template-index="[[_templateIndex]]">
-                      </tf-node-list-item>
-                    </template>
-                  </iron-list>
-                </template>
-              </iron-collapse>
-            </div>
-          </template>
-        </div>
-
-        <div class="sub-list-group successors">
-          Outputs
-          (<span>[[_totalSuccessors]]</span>)
-          <iron-list class="sub-list" id ="outputsList"
-                    items="[[_successors.regular]]">
-            <template>
-              <tf-node-list-item
-                  class="non-control-list-item"
-                  card-node="[[_node]]"
-                  item-node="[[item.node]]"
-                  edge-label="[[item.edgeLabel]]"
-                  item-render-info="[[item.renderInfo]]"
-                  name="[[item.name]]"
-                  item-type="successor"
-                  color-by="[[colorBy]]"
-                  template-index="[[_templateIndex]]">
-              </tf-node-list-item>
-            </template>
-          </iron-list>
-          <template is="dom-if" if="[[_successors.control.length]]">
-            <div class="controlDeps">
-              <div class="controlLine">
-                <paper-icon-button
-                  icon="{{_getToggleIcon(_openedControlSucc)}}"
-                  on-click="_toggleControlSucc"
-                  class="control-toggle-button">
-                </paper-icon-button>
-                Control dependencies
-              </div>
-              <iron-collapse opened="{{_openedControlSucc}}" no-animation>
-                <template is="dom-if" if="{{_openedControlSucc}}" restamp="true">
-                  <iron-list class="sub-list" items="[[_successors.control]]">
-                    <template>
-                      <tf-node-list-item
-                          card-node="[[_node]]"
-                          item-node="[[item.node]]"
-                          item-render-info="[[item.renderInfo]]"
-                          name="[[item.name]]"
-                          item-type="successors"
-                          color-by="[[colorBy]]"
-                          template-index="[[_templateIndex]]">
-                      </tf-node-list-item>
-                    </template>
-                  </iron-list>
-                </template>
-              </iron-collapse>
-            </div>
-          </template>
-        </div>
-        <template is="dom-if" if="{{_hasDisplayableNodeStats}}">
-          <div class="sub-list-group node-stats">
-            Node Stats
-            <div class="sub-list-table">
-              <template is="dom-if" if="{{_nodeStats.totalBytes}}">
-                <div class="sub-list-table-row">
-                  <div class="sub-list-table-cell">Memory</div>
-                  <div class="sub-list-table-cell">[[_nodeStatsFormattedBytes]]</div>
-                </div>
-              </template>
-              <template is="dom-if" if="{{_getTotalMicros(_nodeStats)}}">
-                <div class="sub-list-table-row">
-                  <div class="sub-list-table-cell">Compute Time</div>
-                  <div class="sub-list-table-cell">[[_nodeStatsFormattedComputeTime]]</div>
-                </div>
-              </template>
-              <template is="dom-if" if="{{_nodeStats.outputSize}}">
-                <div class="sub-list-table-row">
-                  <div class="sub-list-table-cell">Tensor Output Sizes</div>
-                  <div class="sub-list-table-cell">
-                    <template is="dom-repeat" items="{{_nodeStatsFormattedOutputSizes}}">
-                      [[item]] <br/>
-                    </template>
-                  </div>
-                </div>
-              </template>
-            </div>
-          </div>
-        </template>
-        <div class="toggle-include-group">
-          <paper-button raised class="toggle-include" on-click="_toggleInclude">
-            <span>[[_auxButtonText]]</span>
-          </paper-button>
-        </div>
-        <template is="dom-if" if="{{_isInSeries(_node)}}">
-          <div class="toggle-include-group">
-            <paper-button raised class="toggle-include" on-click="_toggleGroup">
-              <span>[[_groupButtonText]]</span>
-            </paper-button>
-          </div>
-        </template>
-      </div>
-    </template>
-    </iron-collapse>
-  </template>
-
-  <script>
-    (function() {
-      Polymer({
-        is: 'tf-node-info',
-
-        properties: {
-          nodeName: String,
-          graphHierarchy: Object,
-          renderHierarchy: Object,
-          /** What to color the nodes by (compute time, memory, device etc.) */
-          colorBy: String,
-          _templateIndex: {
-            type: Function,
-            computed: '_getTemplateIndex(graphHierarchy)'
-          },
-          _node: {
-            type: Object,
-            computed: '_getNode(nodeName, graphHierarchy)',
-            observer: '_resetState'
-          },
-          _nodeStats: {
-            type: Object,
-            computed: '_getNodeStats(nodeName, graphHierarchy)',
-            observer: '_resetState'
-          },
-          _hasDisplayableNodeStats: {
-            type: Object,
-            computed: '_getHasDisplayableNodeStats(_nodeStats)',
-          },
-          _nodeStatsFormattedBytes: {
-            type: String,
-            computed: '_getNodeStatsFormattedBytes(_nodeStats)',
-          },
-          _nodeStatsFormattedComputeTime: {
-            type: String,
-            computed: '_getNodeStatsFormattedComputeTime(_nodeStats)',
-          },
-          _nodeStatsFormattedOutputSizes: {
-            type: Array,
-            computed: '_getNodeStatsFormattedOutputSizes(_nodeStats)',
-          },
-          // The enum value of the include property of the selected node.
-          nodeInclude: {
-            type: Number,
-            observer: '_nodeIncludeStateChanged'
-          },
-          _attributes: {
-            type: Array,
-            computed: '_getAttributes(_node)'
-          },
-          _device: {
-            type: String,
-            computed: '_getDevice(_node)'
-          },
-          _successors: {
-            type: Object,
-            computed: '_getSuccessors(_node, graphHierarchy)'
-          },
-          _predecessors: {
-            type: Object,
-            computed: '_getPredecessors(_node, graphHierarchy)'
-          },
-          _subnodes: {
-            type: Array,
-            computed: '_getSubnodes(_node)'
-          },
-          _expanded: {
-            type: Boolean,
-            value: true
-          },
-          _totalPredecessors: {
-            type: Number,
-            computed: '_getTotalPred(_predecessors)'
-          },
-          _totalSuccessors: {
-            type: Number,
-            computed: '_getTotalSucc(_successors)'
-          },
-          _openedControlPred: {
-            type: Boolean,
-            value: false
-          },
-          _openedControlSucc: {
-            type: Boolean,
-            value: false
-          },
-          _auxButtonText: String,
-          _groupButtonText: String
-        },
-        expandNode: function() {
-          this.fire('_node.expand', this.node);
-        },
-        _getTemplateIndex: function(graphHierarchy) {
-          return graphHierarchy.getTemplateIndex();
-        },
-        _getNode: function(nodeName, graphHierarchy) {
-          return graphHierarchy.node(nodeName);
-        },
-        _getNodeStats: function(nodeName, graphHierarchy) {
-          var node = this._getNode(nodeName, graphHierarchy);
-          if (node) {
-            return node.stats;
-          }
-          return null;
-        },
-        _getTotalMicros: function(stats) {
-          return stats.getTotalMicros();
-        },
-        _getHasDisplayableNodeStats: function(stats) {
-          return tf.graph.util.hasDisplayableNodeStats(stats);
-        },
-        _getNodeStatsFormattedBytes: function(stats) {
-          if (!stats || !stats.totalBytes) {
-            return;
-          }
-
-          return tf.graph.util.convertUnitsToHumanReadable(
-              stats.totalBytes, tf.graph.util.MEMORY_UNITS);
-        },
-        _getNodeStatsFormattedComputeTime: function(stats) {
-          if (!stats || !stats.getTotalMicros()) {
-            return;
-          }
-
-          return tf.graph.util.convertUnitsToHumanReadable(
-              stats.getTotalMicros(), tf.graph.util.TIME_UNITS);
-        },
-        _getNodeStatsFormattedOutputSizes: function(stats) {
-          if (!stats || !stats.outputSize || !stats.outputSize.length) {
-            return;
-          }
-
-          return _.map(stats.outputSize, function(shape) {
-            if (shape.length === 0) {
-              return "scalar";
-            }
-            return "[" + shape.join(", ") + "]";
-          });
-        },
-        _getPrintableHTMLNodeName: function(nodeName) {
-          // Insert an optional line break before each slash so that
-          // long node names wrap cleanly at path boundaries.
-          return (nodeName || '').replace(/\//g, '<wbr>/');
-        },
-        _getRenderInfo: function(nodeName, renderHierarchy) {
-          return this.renderHierarchy.getOrCreateRenderNodeByName(nodeName);
-        },
-        _getAttributes: function(node) {
-          this.async(this._resizeList.bind(this, "#attributesList"));
-          if (!node || !node.attr) {
-            return [];
-          }
-          var attrs = [];
-          _.each(node.attr, function(entry) {
-            // Unpack the "too large" attributes into separate attributes
-            // in the info card, with values "too large to show".
-            if (entry.key === tf.graph.LARGE_ATTRS_KEY) {
-              attrs = attrs.concat(entry.value.list.s.map(function(key) {
-                return {key: key, value: "Too large to show..."};
-              }));
-            } else {
-              attrs.push({
-                key: entry.key,
-                value: JSON.stringify(entry.value)
-              });
-            }
-          });
-          return attrs;
-        },
-        _getDevice: function(node) {
-          return node ? node.device : null;
-        },
-        _getSuccessors: function(node, hierarchy) {
-          this.async(this._resizeList.bind(this, "#inputsList"));
-          if (!node) {
-            return {regular: [], control: []}
-          }
-          return this._convertEdgeListToEdgeInfoList(
-            hierarchy.getSuccessors(node.name), false, node.isGroupNode);
-        },
-        _getPredecessors: function(node, hierarchy) {
-          this.async(this._resizeList.bind(this, "#outputsList"));
-          if (!node) {
-            return {regular: [], control: []}
-          }
-          return this._convertEdgeListToEdgeInfoList(
-            hierarchy.getPredecessors(node.name), true, node.isGroupNode);
-        },
-        _convertEdgeListToEdgeInfoList: function(list, isPredecessor, isGroupNode) {
-
-          /**
-           * Unpacks the metaedge into a list of base edge information
-           * that can be rendered.
-           */
-          var unpackMetaedge = function(metaedge) {
-            return _.map(metaedge.baseEdgeList, function(baseEdge) {
-              name = isPredecessor ? baseEdge.v : baseEdge.w;
-              return {
-                name: name,
-                node: this._getNode(name, this.graphHierarchy),
-                edgeLabel: tf.graph.scene.edge.getLabelForBaseEdge(baseEdge,
-                    this.renderHierarchy),
-                renderInfo: this._getRenderInfo(name, this.renderHierarchy)
-              };
-            }, this);
-          }.bind(this);
-
-          /**
-           * Converts a list of metaedges to a list of edge information
-           * that can be rendered.
-           */
-          var toEdgeInfoList = function(edges) {
-            var edgeInfoList = [];
-            _.each(edges, function(metaedge) {
-              var name = isPredecessor ? metaedge.v : metaedge.w;
-              // Enumerate all the base edges if the node is an OpNode, or the
-              // metaedge has only 1 edge in it.
-              if (!isGroupNode || metaedge.baseEdgeList.length == 1) {
-                edgeInfoList = edgeInfoList.concat(unpackMetaedge(metaedge));
-              } else {
-                edgeInfoList.push({
-                  name: name,
-                  node: this._getNode(name, this.graphHierarchy),
-                  edgeLabel: tf.graph.scene.edge.getLabelForEdge(metaedge,
-                      this.renderHierarchy),
-                  renderInfo: this._getRenderInfo(name, this.renderHierarchy)
-                });
-              }
-            }, this);
-            return edgeInfoList;
-          }.bind(this);
-
-          return {
-            regular: toEdgeInfoList(list.regular),
-            control: toEdgeInfoList(list.control)
-          };
-        },
-        _getSubnodes: function(node) {
-          return node && node.metagraph ? node.metagraph.nodes() : null;
-        },
-        _getTotalPred: function(predecessors) {
-          return predecessors.regular.length + predecessors.control.length;
-        },
-        _getTotalSucc: function(successors) {
-          return successors.regular.length + successors.control.length;
-        },
-        _toggleControlPred: function() {
-          this._openedControlPred = !this._openedControlPred;
-        },
-        _toggleControlSucc: function() {
-          this._openedControlSucc = !this._openedControlSucc;
-        },
-        _toggleExpanded: function() {
-          this._expanded = !this._expanded;
-        },
-        _getToggleIcon: function(expanded) {
-          return expanded ? "expand-less" : "expand-more";
-        },
-        _resetState: function() {
-          this._openedControlPred = false;
-          this._openedControlSucc = false;
-
-          this.set("_groupButtonText",
-            tf.graph.scene.node.getGroupSettingLabel(this._node));
-
-          if (this._node) {
-            Polymer.dom(this.$.nodetitle).innerHTML =
-              this._getPrintableHTMLNodeName(this._node.name);
-          }
-        },
-        _resizeList: function(selector) {
-          var list = document.querySelector(selector);
-          if (list) {
-            list.fire('iron-resize');
-          }
-        },
-        _toggleInclude: function() {
-          var graphElem = document.querySelector("#graph");
-          graphElem.fire("node-toggle-extract", { name: this.nodeName });
-          var graphBoardElem = document.querySelector("#graphboard");
-          graphBoardElem.fire("node-toggle-extract");
-        },
-        _nodeIncludeStateChanged: function(include, oldInclude) {
-          this.set("_auxButtonText",
-            tf.graph.getIncludeNodeButtonString(include));
-        },
-        _toggleGroup: function() {
-          var graphElem = document.querySelector("#graph");
-          var seriesName = tf.graph.scene.node.getSeriesName(this._node);
-          graphElem.fire("node-toggle-seriesgroup", { name: seriesName });
-        },
-        _isInSeries: function(node) {
-          return tf.graph.scene.node.canBeInSeries(node);
-        }
-      });
-    })();
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html b/tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html
deleted file mode 100644
index c15478d126..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/tf-node-list-item.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-dashboard-common/tensorboard-color.html">
-<link rel="import" href="tf-graph-icon.html">
-
-<dom-module id="tf-node-list-item">
-  <style>
-  #list-item {
-    width: 100%;
-    color: #565656;
-    font-size: 11pt;
-    font-weight: 400;
-    position: relative;
-    display: inline-block;
-  }
-
-  #list-item:hover {
-    background-color: var(--google-yellow-100);
-  }
-
-  .clickable {
-    cursor: pointer;
-  }
-
-  #list-item span {
-    margin-left: 40px;
-  }
-
-  #list-item.excluded span {
-    color: #999;
-  }
-
-  #list-item span.edge-label {
-    float: right;
-    font-size: 10px;
-    margin-left: 3px;
-    margin-right: 5px;
-  }
-
-  .node-icon {
-    position: absolute;
-    top: 1px;
-    left: 2px;
-  }
-
-  .faded span {
-    color: var(--tb-graph-faded);
-  }
-  </style>
-  <template>
-    <div id="list-item"
-         on-mouseover="_nodeListener"
-         on-mouseout="_nodeListener"
-         on-click="_nodeListener">
-      <div class$="{{_fadedClass(itemRenderInfo)}}">
-        <tf-graph-icon class="node-icon" height="12"
-            color-by="[[colorBy]]" color-by-params="[[colorByParams]]"
-            node="[[itemNode]]" render-info="[[itemRenderInfo]]"
-            template-index="[[templateIndex]]"></tf-graph-icon>
-        <span title$="[[name]]">[[name]]</span>
-        <span class="edge-label">[[edgeLabel]]</span>
-      </div>
-    </div>
-  </template>
-
-  <script>
-    (function() {
-      Polymer({
-        is: 'tf-node-list-item',
-
-        properties: {
-          /**
-           * The Node for the card itself, on which this item is being drawn.
-           * @type {tf.graph.Node}
-           */
-          cardNode: Object,
-          /**
-           * The Node for the item within the card, somehow related to cardNode.
-           * @type {tf.graph.Node}
-           */
-          itemNode: Object,
-          /** The edge label associated with this item. */
-          edgeLabel: String,
-          /**
-           * The render node information for the item node. Used by the graph
-           * icon in determining fill color.
-           */
-          itemRenderInfo: Object,
-          name: String,
-          itemType: {
-            type: String,
-            observer: '_itemTypeChanged'
-          },
-          colorBy: String,
-          colorByParams: Object,
-          templateIndex: Function
-        },
-
-        _itemTypeChanged: function() {
-          if (this.itemType !== 'subnode') {
-            this.$['list-item'].classList.add('clickable');
-          } else {
-            this.$['list-item'].classList.remove('clickable');
-          }
-        },
-
-        _nodeListener: function(event) {
-          // fire node.click/mouseover/mouseout
-          this.fire('node-list-item-' + event.type, {
-            cardNode: this.cardNode.name,
-            nodeName: this.name,
-            type: this.itemType
-          });
-        },
-
-        _fadedClass: function(itemRenderInfo) {
-          return itemRenderInfo && itemRenderInfo.isFadedOut ? 'faded' : '';
-        }
-      });
-    })();
-  </script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD
index f84726e7c7..1235a51ae0 100644
--- a/tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_info_d3v4/BUILD
@@ -1,8 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -33,3 +31,33 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-icon.html",
+        "tf-graph-info.html",
+        "tf-node-info.html",
+        "tf-node-list-item.html",
+    ],
+    destdir = "tf-graph-info",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_dashboard_common_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/BUILD b/tensorflow/tensorboard/components/tf_graph_loader/BUILD
deleted file mode 100644
index f163f12e9a..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_loader/BUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_loader",
-    srcs = [
-        "tf-graph-loader.html",
-    ],
-    path = "/tf-graph-loader",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "@org_polymer",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-loader.html",
-    ],
-    destdir = "tf-graph-loader",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD b/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
deleted file mode 100644
index b2fc04b2eb..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_loader/demo/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-
-licenses(["notice"])  # Apache 2.0
-
-# bazel run //third_party/tensorflow/tensorboard/components/tf_graph_loader/demo
-web_library(
-    name = "demo",
-    srcs = ["index.html"] + glob(["data/**"]),
-    path = "/tf-graph-loader/demo",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_graph_loader",
-        "@org_polymer_iron_demo_helpers",
-        "@org_polymer_paper_styles",
-        "@org_polymer_webcomponentsjs",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt b/tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt
deleted file mode 100644
index 30b2064534..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_loader/demo/data/graph.pbtxt
+++ /dev/null
@@ -1,4606 +0,0 @@
-node {
-  name: "GradientDescent/learning_rate"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_3"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0.1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 100
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000d\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_grad/Shape"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/BroadcastGradientArgs"
-  op: "BroadcastGradientArgs"
-  input: "gradients/add_1_grad/Shape"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-        }
-        shape {
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod_1"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape_1"
-  input: "gradients/Mean_grad/Const_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Maximum"
-  op: "Maximum"
-  input: "gradients/Mean_grad/Prod_1"
-  input: "gradients/Mean_grad/Maximum/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Prod"
-  op: "Prod"
-  input: "gradients/Mean_grad/Shape"
-  input: "gradients/Mean_grad/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/floordiv"
-  op: "FloorDiv"
-  input: "gradients/Mean_grad/Prod"
-  input: "gradients/Mean_grad/Maximum"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Cast"
-  op: "Cast"
-  input: "gradients/Mean_grad/floordiv"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "DstT"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "SrcT"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile/multiples"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Fill"
-  op: "Fill"
-  input: "gradients/Shape"
-  input: "gradients/Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Fill"
-  input: "gradients/Mean_grad/Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/Tile"
-  op: "Tile"
-  input: "gradients/Mean_grad/Reshape"
-  input: "gradients/Mean_grad/Tile/multiples"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tmultiples"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Mean_grad/truediv"
-  op: "RealDiv"
-  input: "gradients/Mean_grad/Tile"
-  input: "gradients/Mean_grad/Cast"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_3_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/Mean_grad/truediv"
-  input: "gradients/Reshape_3_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  op: "ExpandDims"
-  input: "gradients/Reshape_3_grad/Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims/dim"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tdim"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Const"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/begin"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat_1/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_2"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_1"
-  op: "Sub"
-  input: "Rank_2"
-  input: "Sub_1/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_1/begin"
-  op: "Pack"
-  input: "Sub_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_1"
-  op: "Slice"
-  input: "Shape_2"
-  input: "Slice_1/begin"
-  input: "Slice_1/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat_1"
-  op: "ConcatV2"
-  input: "concat_1/values_0"
-  input: "Slice_1"
-  input: "concat_1/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat/axis"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "concat/values_0"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: -1
-      }
-    }
-  }
-}
-node {
-  name: "Slice/size"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 1
-          }
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Sub/y"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "Shape_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank_1"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub"
-  op: "Sub"
-  input: "Rank_1"
-  input: "Sub/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice/begin"
-  op: "Pack"
-  input: "Sub"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice"
-  op: "Slice"
-  input: "Shape_1"
-  input: "Slice/begin"
-  input: "Slice/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "concat"
-  op: "ConcatV2"
-  input: "concat/values_0"
-  input: "Slice"
-  input: "concat/axis"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 2
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\n\000\000\000"
-      }
-    }
-  }
-}
-node {
-  name: "Rank"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 2
-      }
-    }
-  }
-}
-node {
-  name: "Sub_2"
-  op: "Sub"
-  input: "Rank"
-  input: "Sub_2/y"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Slice_2/size"
-  op: "Pack"
-  input: "Sub_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "N"
-    value {
-      i: 1
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: 0
-    }
-  }
-}
-node {
-  name: "Slice_2"
-  op: "Slice"
-  input: "Shape"
-  input: "Slice_2/begin"
-  input: "Slice_2/size"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "Index"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "T"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_biases/read"
-  op: "Identity"
-  input: "logits_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "logits_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-        dim {
-          size: 10
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "logits_weights/read"
-  op: "Identity"
-  input: "logits_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_biases"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_biases/read"
-  op: "Identity"
-  input: "hidden_biases"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "hidden_weights"
-  op: "VariableV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "shape"
-    value {
-      shape {
-        dim {
-          size: 784
-        }
-        dim {
-          size: 100
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "hidden_weights/read"
-  op: "Identity"
-  input: "hidden_weights"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape/shape"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 2
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-          dim {
-            size: 2
-          }
-        }
-        tensor_content: "\310\000\000\000\377\377\377\377"
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/depth"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 10
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/off_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 0
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot/on_value"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_FLOAT
-        tensor_shape {
-        }
-        float_val: 1
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  op: "Const"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "dtype"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "value"
-    value {
-      tensor {
-        dtype: DT_INT32
-        tensor_shape {
-        }
-        int_val: 200
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_1/random_shuffle_queue"
-  op: "RandomShuffleQueueV2"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "capacity"
-    value {
-      i: 20000
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "container"
-    value {
-      s: ""
-    }
-  }
-  attr {
-    key: "min_after_dequeue"
-    value {
-      i: 4000
-    }
-  }
-  attr {
-    key: "seed"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "seed2"
-    value {
-      i: 0
-    }
-  }
-  attr {
-    key: "shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 28
-          }
-          dim {
-            size: 28
-          }
-          dim {
-            size: 1
-          }
-        }
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "shared_name"
-    value {
-      s: ""
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  op: "QueueDequeueManyV2"
-  input: "mnist_dataset_train_1/random_shuffle_queue"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany/n"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "component_types"
-    value {
-      list {
-        type: DT_FLOAT
-        type: DT_INT64
-      }
-    }
-  }
-  attr {
-    key: "timeout_ms"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany"
-  input: "Reshape/shape"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: -1
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul"
-  op: "MatMul"
-  input: "Reshape"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add"
-  op: "Add"
-  input: "MatMul"
-  input: "hidden_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Relu"
-  op: "Relu"
-  input: "add"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "add_1"
-  op: "Add"
-  input: "MatMul_1"
-  input: "logits_biases/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_1"
-  op: "Reshape"
-  input: "add_1"
-  input: "concat"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "mnist_dataset_train_2/one_hot"
-  op: "OneHot"
-  input: "mnist_dataset_train_2/random_shuffle_queue_DequeueMany:1"
-  input: "mnist_dataset_train_2/one_hot/depth"
-  input: "mnist_dataset_train_2/one_hot/on_value"
-  input: "mnist_dataset_train_2/one_hot/off_value"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "TI"
-    value {
-      type: DT_INT64
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          unknown_rank: true
-        }
-      }
-    }
-  }
-  attr {
-    key: "axis"
-    value {
-      i: -1
-    }
-  }
-}
-node {
-  name: "Reshape_2"
-  op: "Reshape"
-  input: "mnist_dataset_train_2/one_hot"
-  input: "concat_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "SoftmaxCrossEntropyWithLogits"
-  op: "SoftmaxCrossEntropyWithLogits"
-  input: "Reshape_1"
-  input: "Reshape_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  op: "PreventGradient"
-  input: "SoftmaxCrossEntropyWithLogits:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "message"
-    value {
-      s: "Currently there is no way to take the second derivative of softmax_cross_entropy_with_logits due to the fused  implementation\'s interaction with tf.gradients()"
-    }
-  }
-}
-node {
-  name: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  op: "Mul"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/ExpandDims"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/PreventGradient"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Reshape_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/SoftmaxCrossEntropyWithLogits_grad/mul"
-  input: "gradients/Reshape_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum_1"
-  input: "gradients/add_1_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Sum"
-  op: "Sum"
-  input: "gradients/Reshape_1_grad/Reshape"
-  input: "gradients/add_1_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_1_grad/Sum"
-  input: "gradients/add_1_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape_1"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_1_grad/Reshape"
-  input: "^gradients/add_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_1_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul_1"
-  op: "MatMul"
-  input: "Relu"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_1_grad/tuple/control_dependency"
-  input: "logits_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul_1"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_logits_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "logits_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@logits_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-          dim {
-            size: 10
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_1_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/MatMul_1_grad/MatMul"
-  input: "^gradients/MatMul_1_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_1_grad/MatMul"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/Relu_grad/ReluGrad"
-  op: "ReluGrad"
-  input: "gradients/MatMul_1_grad/tuple/control_dependency"
-  input: "Relu"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum_1"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs:1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape_1"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum_1"
-  input: "gradients/add_grad/Shape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Sum"
-  op: "Sum"
-  input: "gradients/Relu_grad/ReluGrad"
-  input: "gradients/add_grad/BroadcastGradientArgs"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/Reshape"
-  op: "Reshape"
-  input: "gradients/add_grad/Sum"
-  input: "gradients/add_grad/Shape"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/Reshape_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape_1"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_biases"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/add_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_biases"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/add_grad/tuple/control_dependency"
-  op: "Identity"
-  input: "gradients/add_grad/Reshape"
-  input: "^gradients/add_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/add_grad/Reshape"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul_1"
-  op: "MatMul"
-  input: "Reshape"
-  input: "gradients/add_grad/tuple/control_dependency"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/MatMul"
-  op: "MatMul"
-  input: "gradients/add_grad/tuple/control_dependency"
-  input: "hidden_weights/read"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-          dim {
-            size: 784
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "transpose_a"
-    value {
-      b: false
-    }
-  }
-  attr {
-    key: "transpose_b"
-    value {
-      b: true
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/group_deps"
-  op: "NoOp"
-  input: "^gradients/MatMul_grad/MatMul"
-  input: "^gradients/MatMul_grad/MatMul_1"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "gradients/MatMul_grad/tuple/control_dependency_1"
-  op: "Identity"
-  input: "gradients/MatMul_grad/MatMul_1"
-  input: "^gradients/MatMul_grad/tuple/group_deps"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@gradients/MatMul_grad/MatMul_1"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: -1
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  op: "ApplyGradientDescent"
-  input: "hidden_weights"
-  input: "GradientDescent/learning_rate"
-  input: "gradients/MatMul_grad/tuple/control_dependency_1"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "_class"
-    value {
-      list {
-        s: "loc:@hidden_weights"
-      }
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 784
-          }
-          dim {
-            size: 100
-          }
-        }
-      }
-    }
-  }
-  attr {
-    key: "use_locking"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "GradientDescent"
-  op: "NoOp"
-  input: "^GradientDescent/update_hidden_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_hidden_biases/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_weights/ApplyGradientDescent"
-  input: "^GradientDescent/update_logits_biases/ApplyGradientDescent"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_2"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-      }
-    }
-  }
-}
-node {
-  name: "Reshape_3"
-  op: "Reshape"
-  input: "SoftmaxCrossEntropyWithLogits"
-  input: "Slice_2"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tshape"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-          dim {
-            size: 200
-          }
-        }
-      }
-    }
-  }
-}
-node {
-  name: "Mean"
-  op: "Mean"
-  input: "Reshape_3"
-  input: "Const"
-  device: "/job:localhost/replica:0/task:0/device:XLA_CPU:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "Tidx"
-    value {
-      type: DT_INT32
-    }
-  }
-  attr {
-    key: "_XlaCluster"
-    value {
-      s: "cluster_1"
-    }
-  }
-  attr {
-    key: "_output_shapes"
-    value {
-      list {
-        shape {
-        }
-      }
-    }
-  }
-  attr {
-    key: "keep_dims"
-    value {
-      b: false
-    }
-  }
-}
-node {
-  name: "_send_Mean_0"
-  op: "_Send"
-  input: "Mean"
-  device: "/job:localhost/replica:0/task:0/cpu:0"
-  attr {
-    key: "T"
-    value {
-      type: DT_FLOAT
-    }
-  }
-  attr {
-    key: "client_terminated"
-    value {
-      b: true
-    }
-  }
-  attr {
-    key: "recv_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device"
-    value {
-      s: "/job:localhost/replica:0/task:0/cpu:0"
-    }
-  }
-  attr {
-    key: "send_device_incarnation"
-    value {
-      i: -5924635994370253548
-    }
-  }
-  attr {
-    key: "tensor_name"
-    value {
-      s: "Mean:0"
-    }
-  }
-}
-library {
-}
-versions {
-  producer: 21
-}
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html b/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
deleted file mode 100644
index 2ffb2a1a59..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_loader/demo/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-<link rel="import" href="../tf-graph-loader.html">
-<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
-<title>TF Graph Loader Demo</title>
-<demo-snippet>
-  <template>
-    <dom-module id="tf-graph-loader-demo">
-      <template>
-        <tf-graph-loader
-            id="loader"
-            datasets="[[_datasets]]"
-            selected-dataset="[[_selectedDataset]]"
-            progress="{{_progress}}">
-        </tf-graph-loader>
-      </template>
-      <script>
-        "use strict";
-
-        Polymer({
-          is: "tf-graph-loader-demo",
-          properties: {
-            // We tell the graph loader to load a specific pbtxt file.
-            _datasets: {
-              type: Array,
-              value: [{
-                "name": "Graph with XLA Clusters Specified",
-                "path": "data/graph.pbtxt"
-              }],
-            },
-            _selectedDataset: {
-              type: Number,
-              value: 0,
-            },
-
-            // This property will be updated by the graph loader.
-            _progress: {
-              type: Object,
-            },
-          },
-          observers: [
-            '_progressUpdated(_progress)',
-          ],
-          _progressUpdated(progress) {
-            // console.log the progress.
-            console.log('Progress updated.', progress);
-
-            // The graph has loaded. console.log it.
-            if (progress.value == 100) {
-              console.log('graph', this.$.loader.outGraph);
-            }
-          },
-        });
-      </script>
-    </dom-module>
-    <!-- The graph loader lacks visual elements. -->
-    <tf-graph-loader-demo></tf-graph-loader-demo>
-  </template>
-</demo-snippet>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/test/index.html b/tensorflow/tensorboard/components/tf_graph_loader/test/index.html
deleted file mode 100644
index c8e2027f42..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_loader/test/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../tf-graph-loader.html">
-</head>
-<body>
-  <tf-graph-loader id="loader"></tf-graph-loader>
-  <script src="loader.js"></script>
-</body>
-</html>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/test/loader.ts b/tensorflow/tensorboard/components/tf_graph_loader/test/loader.ts
deleted file mode 100644
index fcd9f7b529..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_loader/test/loader.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the 'License');
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an 'AS IS' BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-suite('graph loader', () => {
-  let assert = chai.assert;
-
-  test('loader exists', () => {
-    assert.isTrue(document.getElementById('loader') != null);
-  });
-
-  // TODO(bp): write tests.
-
-});
diff --git a/tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html b/tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html
deleted file mode 100644
index 8d59cbd2aa..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_loader/tf-graph-loader.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-graph-common/tf-graph-common.html">
-
-<!--
-An element which provides a filter parsing for pbtxt to graph output.
--->
-<dom-module id="tf-graph-loader">
-</dom-module>
-
-<script>
-Polymer({
-
-  is: 'tf-graph-loader',
-
-  properties: {
-    /**
-     * @type {value: number, msg: string}
-     *
-     * A number between 0 and 100 denoting the % of progress
-     * for the progress bar and the displayed message.
-     */
-    progress: {
-      type: Object,
-      notify: true,
-    },
-    datasets: Array,
-    selectedDataset: Number,
-    selectedFile: {
-      type: Object,
-      observer: '_selectedFileChanged'
-    },
-    outGraphHierarchy: {
-      type: Object,
-      readOnly: true, //readonly so outsider can't change this via binding
-      notify: true
-    },
-    outGraph: {
-      type: Object,
-      readOnly: true, //readonly so outsider can't change this via binding
-      notify: true
-    },
-    outHierarchyParams: {
-      type: Object,
-      readOnly: true,
-      notify: true
-    },
-    outStats: {
-      type: Object,
-      readOnly: true, // This property produces data.
-      notify: true
-    }
-  },
-  observers: [
-    '_selectedDatasetChanged(selectedDataset, datasets)',
-    '_readAndParseMetadata(selectedMetadataTag)'
-  ],
-  _readAndParseMetadata: function(metadataIndex) {
-    if (metadataIndex == -1 || this.datasets[this.selectedDataset] == null ||
-        this.datasets[this.selectedDataset].runMetadata == null ||
-        this.datasets[this.selectedDataset].runMetadata[metadataIndex] == null) {
-      this._setOutStats(null);
-      return;
-    }
-    var path = this.datasets[this.selectedDataset].runMetadata[metadataIndex].path;
-    // Reset the progress bar to 0.
-    this.set('progress', {
-      value: 0,
-      msg: ''
-    });
-    var tracker = tf.graph.util.getTracker(this);
-    tf.graph.parser.fetchAndParseMetadata(path, tracker)
-    .then(function(stats) {
-      this._setOutStats(stats);
-    }.bind(this));
-  },
-  _parseAndConstructHierarchicalGraph: function(path, pbTxtFile) {
-    // Reset the progress bar to 0.
-    this.set('progress', {
-      value: 0,
-      msg: ''
-    });
-    var tracker = tf.graph.util.getTracker(this);
-    var hierarchyParams = {
-      verifyTemplate: true,
-      // If a set of numbered op nodes has at least this number of nodes
-      // then group them into a series node.
-      seriesNodeMinSize: 5,
-      // A map of series node names to series grouping settings, to indicate
-      // if a series is to be rendered as grouped or ungrouped.
-      // Starts out empty which allows the renderer to decide which series
-      // are initially rendered grouped and which aren't.
-      seriesMap: {},
-    };
-    this._setOutHierarchyParams(hierarchyParams);
-    var dataTracker = tf.graph.util.getSubtaskTracker(tracker, 30, 'Data');
-    tf.graph.parser.fetchAndParseGraphData(path, pbTxtFile, dataTracker)
-    .then(function(graph) {
-      if (!graph) {
-        throw 'The graph is empty. Make sure that the graph is passed to the ' +
-            'SummaryWriter after the graph is defined.';
-      }
-
-      // Build the flat graph (consists only of Op nodes).
-
-      // This is the whitelist of inputs on op types that are considered
-      // reference edges. "Assign 0" indicates that the first input to
-      // an OpNode with operation type "Assign" is a reference edge.
-      var refEdges = {};
-      refEdges["Assign 0"] = true;
-      refEdges["AssignAdd 0"] = true;
-      refEdges["AssignSub 0"] = true;
-      refEdges["assign 0"] = true;
-      refEdges["assign_add 0"] = true;
-      refEdges["assign_sub 0"] = true;
-      refEdges["count_up_to 0"] = true;
-      refEdges["ScatterAdd 0"] = true;
-      refEdges["ScatterSub 0"] = true;
-      refEdges["ScatterUpdate 0"] = true;
-      refEdges["scatter_add 0"] = true;
-      refEdges["scatter_sub 0"] = true;
-      refEdges["scatter_update 0"] = true;
-      var buildParams = {
-        enableEmbedding: true,
-        inEmbeddingTypes: ['Const'],
-        outEmbeddingTypes: ['^[a-zA-Z]+Summary$'],
-        refEdges: refEdges
-      };
-      var graphTracker = tf.graph.util.getSubtaskTracker(tracker, 20, 'Graph');
-      return tf.graph.build(graph, buildParams, graphTracker);
-    })
-    .then(function(graph) {
-      this._setOutGraph(graph);
-      var hierarchyTracker = tf.graph.util.getSubtaskTracker(tracker, 50,
-          'Namespace hierarchy');
-      return tf.graph.hierarchy.build(graph, hierarchyParams, hierarchyTracker);
-    }.bind(this))
-    .then(function(graphHierarchy) {
-      // Update the properties which notify the parent with the
-      // graph hierarchy and whether the data has live stats or not.
-      this._setOutGraphHierarchy(graphHierarchy);
-    }.bind(this))
-    .catch(function(e) {
-      // Generic error catch, for errors that happened outside
-      // asynchronous tasks.
-      tracker.reportError("Graph visualization failed: " + e, e);
-    });
-  },
-  _selectedDatasetChanged: function(datasetIndex, datasets) {
-    this._parseAndConstructHierarchicalGraph(datasets[datasetIndex].path);
-  },
-  _selectedFileChanged: function(e) {
-    if (!e) {
-      return;
-    }
-    var file = e.target.files[0];
-    if (!file) {
-      return;
-    }
-
-    // Clear out the value of the file chooser. This ensures that if the user
-    // selects the same file, we'll re-read it.
-    e.target.value = '';
-
-    this._parseAndConstructHierarchicalGraph(null, file);
-  }
-});
-</script>
diff --git a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD
index 7e01811a57..21eb4df1b4 100644
--- a/tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_graph_loader_d3v4/BUILD
@@ -1,8 +1,6 @@
 package(default_visibility = ["//tensorflow:internal"])
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
 
 licenses(["notice"])  # Apache 2.0
 
@@ -23,3 +21,29 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-graph-loader.html",
+    ],
+    destdir = "tf-graph-loader",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_graph_common_d3v4:legacy",
+    ],
+)
+
+# This is needed despite how this component lacks TypeScript files because
+# components/BUILD seeks a legacy_ts rule in this package.
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = [],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+)
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD b/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
index 7a8cde6bde..76ac394213 100644
--- a/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/BUILD
@@ -50,3 +50,33 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+################################################################################
+# MARKED FOR DELETION
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
+load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
+
+tensorboard_webcomponent_library(
+    name = "legacy",
+    srcs = [
+        "tf-storage.html",
+        ":legacy_ts",
+    ],
+    destdir = "tf-storage",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:legacy",
+        "//tensorflow/tensorboard/components/tf_imports_google_d3v4:lib",
+        "//third_party/javascript/polymer/v1/polymer:lib",
+    ],
+)
+
+tensorboard_ts_library(
+    name = "legacy_ts",
+    srcs = ["storage.ts"],
+    deps_mgmt = "off",
+    runtime = "nodejs",
+    deps = [
+        "//tensorflow/tensorboard/components/tf_globals_d3v4:legacy_ts",
+        "//third_party/javascript/typings/lodash",
+    ],
+)
-- 
GitLab


From 116e1dde1a896e986525d9feccfe88265e17f962 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 17:04:01 -0700
Subject: [PATCH 1521/1563] Don't try to fuse ops that require duplication
 unless we expect them to be fused into all users. We would rather not fuse an
 op into only some of its users, as that offers no benefit in terms of memory
 bandwidth, but forces us to keep more live values around.

PiperOrigin-RevId: 156498395
---
 .../xla/service/instruction_fusion.cc         | 33 +++++++++++++++++++
 .../xla/service/instruction_fusion_test.cc    | 19 +++++++++++
 2 files changed, 52 insertions(+)

diff --git a/tensorflow/compiler/xla/service/instruction_fusion.cc b/tensorflow/compiler/xla/service/instruction_fusion.cc
index c162945bca..5069215031 100644
--- a/tensorflow/compiler/xla/service/instruction_fusion.cc
+++ b/tensorflow/compiler/xla/service/instruction_fusion.cc
@@ -130,6 +130,33 @@ StatusOr<bool> InstructionFusion::Run(HloModule* module) {
         computation_->MakeInstructionPostOrder();
     std::vector<HloInstruction*> post_order(post_order_list.begin(),
                                             post_order_list.end());
+
+    std::set<HloInstruction*> all_consumers_fusable;
+    // Find which ops can be fused into all of their operands. We would rather
+    // not fuse an op into only some of its users, as that offers no benefit in
+    // terms of memory bandwidth, but forces us to keep more live values around.
+    for (auto* hlo : post_order) {
+      auto user_fusable_into_hlo = [this, &hlo](HloInstruction* consumer) {
+        if (!consumer->IsFusable()) {
+          return false;
+        }
+        for (int operand_number = 0;
+             operand_number < consumer->operands().size(); ++operand_number) {
+          if (consumer->operand(operand_number) == hlo) {
+            if (!ShouldFuse(consumer, operand_number)) {
+              return false;
+            }
+          }
+        }
+        return true;
+      };
+
+      if (std::all_of(hlo->users().begin(), hlo->users().end(),
+                      user_fusable_into_hlo)) {
+        all_consumers_fusable.insert(hlo);
+      }
+    }
+
     tensorflow::gtl::FlatMap<HloInstruction*, int> post_order_index;
     for (size_t i = 0; i < post_order.size(); ++i) {
       InsertOrDie(&post_order_index, post_order[i], i);
@@ -216,6 +243,12 @@ StatusOr<bool> InstructionFusion::Run(HloModule* module) {
 
       for (int64 i : sorted_operand_numbers) {
         HloInstruction* operand = instruction->mutable_operand(i);
+
+        if (FusionWouldDuplicate(*operand, *instruction) &&
+            (all_consumers_fusable.count(operand) == 0)) {
+          continue;
+        }
+
         if (operand->IsFusable() && ShouldFuse(instruction, i)) {
           HloInstruction* fusion_instruction = Fuse(operand, instruction);
 
diff --git a/tensorflow/compiler/xla/service/instruction_fusion_test.cc b/tensorflow/compiler/xla/service/instruction_fusion_test.cc
index bd1372b827..9a79e4c382 100644
--- a/tensorflow/compiler/xla/service/instruction_fusion_test.cc
+++ b/tensorflow/compiler/xla/service/instruction_fusion_test.cc
@@ -154,4 +154,23 @@ TEST_F(InstructionFusionTest, PotentialBitcastTransposeOfParameterUnfused) {
           .ValueOrDie());
 }
 
+TEST_F(InstructionFusionTest, AvoidDuplicationIfNotAllFusable) {
+  HloComputation::Builder builder(TestName());
+  auto param0 = builder.AddInstruction(HloInstruction::CreateParameter(
+      0, ShapeUtil::MakeShape(F32, {16, 16}), "0"));
+  HloInstruction* unary1 = builder.AddInstruction(HloInstruction::CreateUnary(
+      ShapeUtil::MakeShape(S32, {}), HloOpcode::kFloor, param0));
+  builder.AddInstruction(HloInstruction::CreateSend(unary1, 0));
+  HloInstruction* unary2 = builder.AddInstruction(HloInstruction::CreateUnary(
+      ShapeUtil::MakeShape(S32, {}), HloOpcode::kAbs, unary1));
+
+  auto module = MakeUnique<HloModule>(TestName());
+  auto computation = module->AddEntryComputation(builder.Build());
+  EXPECT_EQ(unary2, computation->root_instruction());
+  EXPECT_FALSE(
+      InstructionFusion(InstructionFusion::IsExpensive, /*may_duplicate=*/true)
+          .Run(module.get())
+          .ValueOrDie());
+}
+
 }  // namespace xla
-- 
GitLab


From 42e9980c2da3ad72ad00591e10fe2dbbc4dddefb Mon Sep 17 00:00:00 2001
From: Benoit Steiner <bsteiner@google.com>
Date: Thu, 18 May 2017 17:08:26 -0700
Subject: [PATCH 1522/1563] Test that grappler handles timeouts properly

PiperOrigin-RevId: 156498857
---
 .../grappler/clusters/single_machine_test.cc  | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/grappler/clusters/single_machine_test.cc b/tensorflow/core/grappler/clusters/single_machine_test.cc
index 17db48817e..27813c0e41 100644
--- a/tensorflow/core/grappler/clusters/single_machine_test.cc
+++ b/tensorflow/core/grappler/clusters/single_machine_test.cc
@@ -31,8 +31,10 @@ namespace {
 class SingleMachineTest : public ::testing::Test {
  public:
   void SetUp() override {
-    // Provision a single machine with 3 cpu cores
-    cluster_.reset(new SingleMachine(5 * 60, 3, 0));
+    // Provision a single machine with 3 cpu cores, and a short timeout of 5
+    // seconds: since there isn't much work to process a test graph that should
+    // be plenty.
+    cluster_.reset(new SingleMachine(5, 3, 0));
     TF_CHECK_OK(cluster_->Provision());
   }
 
@@ -132,6 +134,26 @@ TEST_F(SingleMachineTest, MultipleItems) {
   }
 }
 
+TEST_F(SingleMachineTest, TimeOuts) {
+  // Create a graph that will block forever: Just try to dequeue data from a
+  // queue that is never fed.
+  tensorflow::Scope root = tensorflow::Scope::NewRootScope();
+  auto q = ops::FIFOQueue(root.WithOpName("queue"), {DataType::DT_INT32});
+  auto dequeue =
+      ops::QueueDequeue(root.WithOpName("dequeue"), q, {DataType::DT_INT32});
+
+  GrapplerItem item;
+  TF_CHECK_OK(root.ToGraphDef(&item.graph));
+  item.fetch.push_back("dequeue");
+
+  TF_CHECK_OK(cluster_->Initialize(item));
+  RunMetadata metadata;
+  Status s1 = cluster_->Run(item.graph, item.feed, item.fetch, &metadata);
+  EXPECT_TRUE(errors::IsDeadlineExceeded(s1));
+  Status s2 = cluster_->Run(item.graph, item.feed, item.fetch, &metadata);
+  EXPECT_TRUE(errors::IsDeadlineExceeded(s2));
+}
+
 TEST_F(SingleMachineTest, InitializationMemory) {
   // Build a variable and its initialization graph.
   tensorflow::Scope s = tensorflow::Scope::NewRootScope();
-- 
GitLab


From 89bf99f1b94d515c9b13a6f2eac3a1bf65d9c50f Mon Sep 17 00:00:00 2001
From: Artem Belevich <tra@google.com>
Date: Thu, 18 May 2017 17:23:34 -0700
Subject: [PATCH 1523/1563] Handle R0 slice variants in CPU back-end.

PiperOrigin-RevId: 156500423
---
 .../compiler/xla/service/cpu/ir_emitter.cc    | 35 +++++++++++++++++++
 .../compiler/xla/service/cpu/ir_emitter.h     |  9 +++++
 2 files changed, 44 insertions(+)

diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
index 5deb0236bf..2d81ba7882 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.cc
@@ -1137,6 +1137,41 @@ Status IrEmitter::HandleSend(HloInstruction* send) {
   return Unimplemented("Send is not implemented on CPU. See b/33942983.");
 }
 
+Status IrEmitter::HandleSlice(HloInstruction* slice, HloInstruction* operand) {
+  if (ShapeUtil::IsScalar(slice->shape())) {
+    TF_ASSIGN_OR_RETURN(llvm::Value * target_address,
+                        EmitTargetAddressForOp(slice));
+    emitted_value_[slice] = target_address;
+    return EmitMemcpy(*operand, *slice);
+  }
+  return DefaultAction(slice);
+}
+
+Status IrEmitter::HandleDynamicSlice(HloInstruction* dynamic_slice,
+                                     HloInstruction* operand,
+                                     HloInstruction* /*start_indices*/) {
+  if (ShapeUtil::IsScalar(dynamic_slice->shape())) {
+    TF_ASSIGN_OR_RETURN(llvm::Value * target_address,
+                        EmitTargetAddressForOp(dynamic_slice));
+    emitted_value_[dynamic_slice] = target_address;
+    return EmitMemcpy(*operand, *dynamic_slice);
+  }
+  return DefaultAction(dynamic_slice);
+}
+
+Status IrEmitter::HandleDynamicUpdateSlice(HloInstruction* dynamic_update_slice,
+                                           HloInstruction* /*operand*/,
+                                           HloInstruction* update,
+                                           HloInstruction* /*start_indices*/) {
+  if (ShapeUtil::IsScalar(dynamic_update_slice->shape())) {
+    TF_ASSIGN_OR_RETURN(llvm::Value * target_address,
+                        EmitTargetAddressForOp(dynamic_update_slice));
+    emitted_value_[dynamic_update_slice] = target_address;
+    return EmitMemcpy(*update, *dynamic_update_slice);
+  }
+  return DefaultAction(dynamic_update_slice);
+}
+
 Status IrEmitter::HandleRecv(HloInstruction* recv) {
   // TODO(b/33942983): Support Send/Recv on CPU.
   return Unimplemented("Recv is not implemented on CPU. See b/33942983.");
diff --git a/tensorflow/compiler/xla/service/cpu/ir_emitter.h b/tensorflow/compiler/xla/service/cpu/ir_emitter.h
index 0540344aa3..b564b359b0 100644
--- a/tensorflow/compiler/xla/service/cpu/ir_emitter.h
+++ b/tensorflow/compiler/xla/service/cpu/ir_emitter.h
@@ -114,6 +114,15 @@ class IrEmitter : public DfsHloVisitorWithDefault {
                             HloComputation* function) override;
   Status HandleSelectAndScatter(HloInstruction* instruction) override;
   Status HandleSend(HloInstruction* send) override;
+  Status HandleSlice(HloInstruction* slice,
+                     HloInstruction* /*operand*/) override;
+  Status HandleDynamicSlice(HloInstruction* dynamic_slice,
+                            HloInstruction* /*operand*/,
+                            HloInstruction* /*start_indices*/) override;
+  Status HandleDynamicUpdateSlice(HloInstruction* dynamic_update_slice,
+                                  HloInstruction* /*operand*/,
+                                  HloInstruction* /*update*/,
+                                  HloInstruction* /*start_indices*/) override;
   Status HandleRecv(HloInstruction* recv) override;
   Status HandlePad(HloInstruction* pad) override;
   Status HandleTuple(
-- 
GitLab


From 8eb7ba18b11145f164cb0fb9b0a91a95e165687c Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Thu, 18 May 2017 17:44:51 -0700
Subject: [PATCH 1524/1563] tfdbg: add "print_source" ("ps") command to
 profiler mode

Related changes:
* Refactored part of cli/profile_analyzer_cli.py to new file lib/profiling.py.
* Improve the way in which filtering is done for file path and line number.
* Add unit test for the "lp" and "ps" commands under tf.while_loops.
* Add op type to the "lp" table. Also add the ability to sort the rows by op type.
* Let the length of the all-"-" divider scale automatically with screen with in the curses UI.

PiperOrigin-RevId: 156502357
---
 tensorflow/contrib/cmake/tf_tests.cmake       |   1 +
 tensorflow/python/debug/BUILD                 |  21 +-
 tensorflow/python/debug/cli/analyzer_cli.py   |  11 +-
 tensorflow/python/debug/cli/curses_ui.py      |   6 +-
 .../python/debug/cli/debugger_cli_common.py   |   6 +-
 .../python/debug/cli/profile_analyzer_cli.py  | 503 ++++++++++++++----
 .../debug/cli/profile_analyzer_cli_test.py    | 238 +++++++--
 tensorflow/python/debug/lib/profiling.py      | 108 ++++
 tensorflow/python/debug/lib/profiling_test.py | 100 ++++
 tensorflow/python/debug/lib/source_utils.py   |  83 ++-
 10 files changed, 922 insertions(+), 155 deletions(-)
 create mode 100644 tensorflow/python/debug/lib/profiling.py
 create mode 100644 tensorflow/python/debug/lib/profiling_test.py

diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index 6392a5e044..c8a827f29d 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -157,6 +157,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
   set(tf_test_src_py_exclude
     # Python source line inspection tests are flaky on Windows (b/36375074).
     "${tensorflow_source_dir}/tensorflow/python/debug/cli/analyzer_cli_test.py"
+    "${tensorflow_source_dir}/tensorflow/python/debug/cli/profile_analyzer_cli_test.py"
     # Windows does not have the curses library and uses readline.
     "${tensorflow_source_dir}/tensorflow/python/debug/cli/curses_ui_test.py"
     # generally not working
diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index f9c908f538..3074811733 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -63,6 +63,10 @@ py_library(
     name = "source_utils",
     srcs = ["lib/source_utils.py"],
     srcs_version = "PY2AND3",
+    deps = [
+        ":profiling",
+        "//third_party/py/numpy",
+    ],
 )
 
 py_library(
@@ -143,11 +147,16 @@ py_library(
         ":debugger_cli_common",
         ":source_utils",
         ":ui_factory",
-        "//third_party/py/numpy",
         "@six_archive//:six",
     ],
 )
 
+py_library(
+    name = "profiling",
+    srcs = ["lib/profiling.py"],
+    srcs_version = "PY2AND3",
+)
+
 py_library(
     name = "profile_analyzer_cli",
     srcs = ["cli/profile_analyzer_cli.py"],
@@ -157,8 +166,10 @@ py_library(
         ":command_parser",
         ":debug_data",
         ":debugger_cli_common",
+        ":profiling",
         ":source_utils",
         ":ui_factory",
+        "//tensorflow/python:util",
         "//third_party/py/numpy",
         "@six_archive//:six",
     ],
@@ -442,13 +453,15 @@ py_test(
 )
 
 py_test(
-    name = "curses_widgets_test",
+    name = "profiling_test",
     size = "small",
-    srcs = ["cli/curses_widgets_test.py"],
+    srcs = ["lib/profiling_test.py"],
     srcs_version = "PY2AND3",
     deps = [
-        ":curses_widgets",
+        ":profiling",
         "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:platform_test",
     ],
 )
 
diff --git a/tensorflow/python/debug/cli/analyzer_cli.py b/tensorflow/python/debug/cli/analyzer_cli.py
index 49d0ef54fe..69b6d9ffdf 100644
--- a/tensorflow/python/debug/cli/analyzer_cli.py
+++ b/tensorflow/python/debug/cli/analyzer_cli.py
@@ -27,7 +27,6 @@ import argparse
 import copy
 import re
 
-import numpy as np
 from six.moves import xrange  # pylint: disable=redefined-builtin
 
 from tensorflow.python.debug.cli import cli_shared
@@ -1019,12 +1018,8 @@ class DebugAnalyzer(object):
         do_dumped_tensors=parsed.tensors,
         min_line=parsed.line_begin)
 
-    with open(parsed.source_file_path, "rU") as f:
-      source_text = f.read()
-
-    source_lines = source_text.split("\n")
-    num_lines = len(source_lines)
-    line_num_width = int(np.ceil(np.log10(num_lines))) + 3
+    source_lines, line_num_width = source_utils.load_source(
+        parsed.source_file_path)
 
     labeled_source_lines = []
     if parsed.line_begin > 1:
@@ -1050,6 +1045,8 @@ class DebugAnalyzer(object):
         sorted_elements = sorted(source_annotation[i + parsed.line_begin])
         for k, element in enumerate(sorted_elements):
           if k >= parsed.max_elements_per_line:
+            # TODO(cais): Replace this accordion pattern with the easier-to-use
+            # INIT_SCROLL_POS_KEY.
             omitted_info_line = RL("    (... Omitted %d of %d %s ...) " % (
                 len(sorted_elements) - parsed.max_elements_per_line,
                 len(sorted_elements),
diff --git a/tensorflow/python/debug/cli/curses_ui.py b/tensorflow/python/debug/cli/curses_ui.py
index d665627a93..6a571c097e 100644
--- a/tensorflow/python/debug/cli/curses_ui.py
+++ b/tensorflow/python/debug/cli/curses_ui.py
@@ -710,7 +710,8 @@ class CursesUI(base_ui.BaseUI):
       # Empty command: take no action. Should not exit.
       return
 
-    screen_info = {"cols": self._max_x}
+    # Take into account scroll bar width.
+    screen_info = {"cols": self._max_x - 2}
     exit_token = None
     if self._command_handler_registry.is_registered(prefix):
       try:
@@ -1077,6 +1078,9 @@ class CursesUI(base_ui.BaseUI):
         self._toast("Pattern not found", color=self._ERROR_TOAST_COLOR_PAIR)
     elif is_refresh:
       self._scroll_output(_SCROLL_REFRESH)
+    elif debugger_cli_common.INIT_SCROLL_POS_KEY in output.annotations:
+      line_index = output.annotations[debugger_cli_common.INIT_SCROLL_POS_KEY]
+      self._scroll_output(_SCROLL_TO_LINE_INDEX, line_index=line_index)
     else:
       self._output_pad_row = 0
       self._scroll_output(_SCROLL_HOME)
diff --git a/tensorflow/python/debug/cli/debugger_cli_common.py b/tensorflow/python/debug/cli/debugger_cli_common.py
index 889fc6a8f6..9ad49771d1 100644
--- a/tensorflow/python/debug/cli/debugger_cli_common.py
+++ b/tensorflow/python/debug/cli/debugger_cli_common.py
@@ -32,6 +32,7 @@ HELP_INDENT = "  "
 
 EXPLICIT_USER_EXIT = "explicit_user_exit"
 REGEX_MATCH_LINES_KEY = "regex_match_lines"
+INIT_SCROLL_POS_KEY = "init_scroll_pos"
 
 MAIN_MENU_KEY = "mm:"
 
@@ -108,11 +109,12 @@ class RichLine(object):
     return len(self.text)
 
 
-def rich_text_lines_from_rich_line_list(rich_text_list):
+def rich_text_lines_from_rich_line_list(rich_text_list, annotations=None):
   """Convert a list of RichLine objects or strings to a RichTextLines object.
 
   Args:
     rich_text_list: a list of RichLine objects or strings
+    annotations: annotatoins for the resultant RichTextLines object.
 
   Returns:
     A corresponding RichTextLines object.
@@ -126,7 +128,7 @@ def rich_text_lines_from_rich_line_list(rich_text_list):
         font_attr_segs[i] = rl.font_attr_segs
     else:
       lines.append(rl)
-  return RichTextLines(lines, font_attr_segs)
+  return RichTextLines(lines, font_attr_segs, annotations=annotations)
 
 
 class RichTextLines(object):
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
index 3837717767..c08605b92b 100644
--- a/tensorflow/python/debug/cli/profile_analyzer_cli.py
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli.py
@@ -22,42 +22,27 @@ import argparse
 import os
 import re
 
+import numpy as np
+
 from tensorflow.python.debug.cli import cli_shared
 from tensorflow.python.debug.cli import command_parser
 from tensorflow.python.debug.cli import debugger_cli_common
 from tensorflow.python.debug.cli import ui_factory
+from tensorflow.python.debug.lib import profiling
 from tensorflow.python.debug.lib import source_utils
 
+RL = debugger_cli_common.RichLine
 
 SORT_OPS_BY_OP_NAME = "node"
+SORT_OPS_BY_OP_TYPE = "op_type"
 SORT_OPS_BY_OP_TIME = "op_time"
 SORT_OPS_BY_EXEC_TIME = "exec_time"
 SORT_OPS_BY_START_TIME = "start_time"
 SORT_OPS_BY_LINE = "line"
 
-
-class ProfileDatum(object):
-  """Profile data point."""
-
-  def __init__(self, node_exec_stats, file_line, op_type):
-    """Constructor.
-
-    Args:
-      node_exec_stats: `NodeExecStats` proto.
-      file_line: A `string` formatted as <file_name>:<line_number>.
-      op_type: (string) Operation type.
-    """
-    self.node_exec_stats = node_exec_stats
-    self.file_line = file_line
-    self.op_type = op_type
-    self.start_time = self.node_exec_stats.all_start_micros
-    self.op_time = (self.node_exec_stats.op_end_rel_micros -
-                    self.node_exec_stats.op_start_rel_micros)
-
-  @property
-  def exec_time(self):
-    """Measures compute function execution time plus pre- and post-processing."""
-    return self.node_exec_stats.all_end_rel_micros
+_DEVICE_NAME_FILTER_FLAG = "device_name_filter"
+_NODE_NAME_FILTER_FLAG = "node_name_filter"
+_OP_TYPE_FILTER_FLAG = "op_type_filter"
 
 
 class ProfileDataTableView(object):
@@ -84,28 +69,67 @@ class ProfileDataTableView(object):
         for datum in profile_datum_list]
 
     self._column_names = ["Node",
+                          "Op Type",
                           "Start Time (us)",
                           "Op Time (%s)" % time_unit,
                           "Exec Time (%s)" % time_unit,
                           "Filename:Lineno(function)"]
-    self._column_sort_ids = [SORT_OPS_BY_OP_NAME, SORT_OPS_BY_START_TIME,
-                             SORT_OPS_BY_OP_TIME, SORT_OPS_BY_EXEC_TIME,
-                             SORT_OPS_BY_LINE]
+    self._column_sort_ids = [SORT_OPS_BY_OP_NAME, SORT_OPS_BY_OP_TYPE,
+                             SORT_OPS_BY_START_TIME, SORT_OPS_BY_OP_TIME,
+                             SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE]
+
+  def value(self,
+            row,
+            col,
+            device_name_filter=None,
+            node_name_filter=None,
+            op_type_filter=None):
+    """Get the content of a cell of the table.
+
+    Args:
+      row: (int) row index.
+      col: (int) column index.
+      device_name_filter: Regular expression to filter by device name.
+      node_name_filter: Regular expression to filter by node name.
+      op_type_filter: Regular expression to filter by op type.
 
-  def value(self, row, col):
+    Returns:
+      A debuggre_cli_common.RichLine object representing the content of the
+      cell, potentially with a clickable MenuItem.
+
+    Raises:
+      IndexError: if row index is out of range.
+    """
+    menu_item = None
     if col == 0:
-      return self._profile_datum_list[row].node_exec_stats.node_name
+      text = self._profile_datum_list[row].node_exec_stats.node_name
     elif col == 1:
-      return self.formatted_start_time[row]
+      text = self._profile_datum_list[row].op_type
     elif col == 2:
-      return self.formatted_op_time[row]
+      text = str(self.formatted_start_time[row])
     elif col == 3:
-      return self.formatted_exec_time[row]
+      text = str(self.formatted_op_time[row])
     elif col == 4:
-      return self._profile_datum_list[row].file_line
+      text = str(self.formatted_exec_time[row])
+    elif col == 5:
+      command = "ps"
+      if device_name_filter:
+        command += " --%s %s" % (_DEVICE_NAME_FILTER_FLAG,
+                                 device_name_filter)
+      if node_name_filter:
+        command += " --%s %s" % (_NODE_NAME_FILTER_FLAG, node_name_filter)
+      if op_type_filter:
+        command += " --%s %s" % (_OP_TYPE_FILTER_FLAG, op_type_filter)
+      command += " %s --init_line %d" % (
+          self._profile_datum_list[row].file_path,
+          self._profile_datum_list[row].line_number)
+      menu_item = debugger_cli_common.MenuItem(None, command)
+      text = self._profile_datum_list[row].file_line_func
     else:
       raise IndexError("Invalid column index %d." % col)
 
+    return RL(text, font_attr=menu_item)
+
   def row_count(self):
     return len(self._profile_datum_list)
 
@@ -120,29 +144,47 @@ class ProfileDataTableView(object):
 
 
 def _list_profile_filter(
-    profile_datum, node_name_regex, file_name_regex, op_type_regex,
-    op_time_interval, exec_time_interval):
+    profile_datum,
+    node_name_regex,
+    file_path_regex,
+    op_type_regex,
+    op_time_interval,
+    exec_time_interval,
+    min_lineno=-1,
+    max_lineno=-1):
   """Filter function for list_profile command.
 
   Args:
     profile_datum: A `ProfileDatum` object.
     node_name_regex: Regular expression pattern object to filter by name.
-    file_name_regex: Regular expression pattern object to filter by file.
+    file_path_regex: Regular expression pattern object to filter by file path.
     op_type_regex: Regular expression pattern object to filter by op type.
     op_time_interval: `Interval` for filtering op time.
     exec_time_interval: `Interval` for filtering exec time.
+    min_lineno: Lower bound for 1-based line number, inclusive.
+      If <= 0, has no effect.
+    max_lineno: Upper bound for 1-based line number, exclusive.
+      If <= 0, has no effect.
+    # TODO(cais): Maybe filter by function name.
 
   Returns:
-    True if profile_datum should be included.
+    True iff profile_datum should be included.
   """
-  if not node_name_regex.match(
+  if node_name_regex and not node_name_regex.match(
       profile_datum.node_exec_stats.node_name):
     return False
-  if profile_datum.file_line is not None and not file_name_regex.match(
-      profile_datum.file_line):
+  if file_path_regex:
+    if (not profile_datum.file_path or
+        not file_path_regex.match(profile_datum.file_path)):
+      return False
+  if (min_lineno > 0 and profile_datum.line_number and
+      profile_datum.line_number < min_lineno):
     return False
-  if profile_datum.op_type is not None and not op_type_regex.match(
-      profile_datum.op_type):
+  if (max_lineno > 0 and profile_datum.line_number and
+      profile_datum.line_number >= max_lineno):
+    return False
+  if (profile_datum.op_type is not None and op_type_regex and
+      not op_type_regex.match(profile_datum.op_type)):
     return False
   if op_time_interval is not None and not op_time_interval.contains(
       profile_datum.op_time):
@@ -166,8 +208,10 @@ def _list_profile_sort_key(profile_datum, sort_by):
   """
   if sort_by == SORT_OPS_BY_OP_NAME:
     return profile_datum.node_exec_stats.node_name
+  elif sort_by == SORT_OPS_BY_OP_TYPE:
+    return profile_datum.op_type
   elif sort_by == SORT_OPS_BY_LINE:
-    return profile_datum.file_line
+    return profile_datum.file_line_func
   elif sort_by == SORT_OPS_BY_OP_TIME:
     return profile_datum.op_time
   elif sort_by == SORT_OPS_BY_EXEC_TIME:
@@ -199,34 +243,48 @@ class ProfileAnalyzer(object):
         usage=argparse.SUPPRESS)
     ap.add_argument(
         "-d",
-        "--device_name_filter",
-        dest="device_name_filter",
+        "--%s" % _DEVICE_NAME_FILTER_FLAG,
+        dest=_DEVICE_NAME_FILTER_FLAG,
         type=str,
         default="",
         help="filter device name by regex.")
     ap.add_argument(
         "-n",
-        "--node_name_filter",
-        dest="node_name_filter",
+        "--%s" % _NODE_NAME_FILTER_FLAG,
+        dest=_NODE_NAME_FILTER_FLAG,
         type=str,
         default="",
         help="filter node name by regex.")
     ap.add_argument(
         "-t",
-        "--op_type_filter",
-        dest="op_type_filter",
+        "--%s" % _OP_TYPE_FILTER_FLAG,
+        dest=_OP_TYPE_FILTER_FLAG,
         type=str,
         default="",
         help="filter op type by regex.")
     # TODO(annarev): allow file filtering at non-stack top position.
     ap.add_argument(
         "-f",
-        "--file_name_filter",
-        dest="file_name_filter",
+        "--file_path_filter",
+        dest="file_path_filter",
         type=str,
         default="",
         help="filter by file name at the top position of node's creation "
              "stack that does not belong to TensorFlow library.")
+    ap.add_argument(
+        "--min_lineno",
+        dest="min_lineno",
+        type=int,
+        default=-1,
+        help="(Inclusive) lower bound for 1-based line number in source file. "
+             "If <= 0, has no effect.")
+    ap.add_argument(
+        "--max_lineno",
+        dest="max_lineno",
+        type=int,
+        default=-1,
+        help="(Exclusive) upper bound for 1-based line number in source file. "
+             "If <= 0, has no effect.")
     ap.add_argument(
         "-e",
         "--execution_time",
@@ -252,9 +310,10 @@ class ProfileAnalyzer(object):
         dest="sort_by",
         type=str,
         default=SORT_OPS_BY_START_TIME,
-        help=("the field to sort the data by: (%s | %s | %s | %s | %s)" %
-              (SORT_OPS_BY_OP_NAME, SORT_OPS_BY_START_TIME,
-               SORT_OPS_BY_OP_TIME, SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE)))
+        help=("the field to sort the data by: (%s)" %
+              " | ".join([SORT_OPS_BY_OP_NAME, SORT_OPS_BY_OP_TYPE,
+                          SORT_OPS_BY_START_TIME, SORT_OPS_BY_OP_TIME,
+                          SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_LINE])))
     ap.add_argument(
         "-r",
         "--reverse",
@@ -270,6 +329,56 @@ class ProfileAnalyzer(object):
 
     self._arg_parsers["list_profile"] = ap
 
+    ap = argparse.ArgumentParser(
+        description="Print a Python source file wiht line-level profile "
+                    "information",
+        usage=argparse.SUPPRESS)
+    ap.add_argument(
+        "source_file_path",
+        type=str,
+        help="Path to the source_file_path")
+    ap.add_argument(
+        "--cost_type",
+        type=str,
+        choices=["exec_time", "op_time"],
+        default="exec_time",
+        help="Type of cost to display")
+    ap.add_argument(
+        "--time_unit",
+        dest="time_unit",
+        type=str,
+        default=cli_shared.TIME_UNIT_US,
+        help="Time unit (" + " | ".join(cli_shared.TIME_UNITS) + ")")
+    ap.add_argument(
+        "-d",
+        "--%s" % _DEVICE_NAME_FILTER_FLAG,
+        dest=_DEVICE_NAME_FILTER_FLAG,
+        type=str,
+        default="",
+        help="Filter device name by regex.")
+    ap.add_argument(
+        "-n",
+        "--%s" % _NODE_NAME_FILTER_FLAG,
+        dest=_NODE_NAME_FILTER_FLAG,
+        type=str,
+        default="",
+        help="Filter node name by regex.")
+    ap.add_argument(
+        "-t",
+        "--%s" % _OP_TYPE_FILTER_FLAG,
+        dest=_OP_TYPE_FILTER_FLAG,
+        type=str,
+        default="",
+        help="Filter op type by regex.")
+    ap.add_argument(
+        "--init_line",
+        dest="init_line",
+        type=int,
+        default=0,
+        help="The 1-based line number to scroll to initially.")
+
+    self._arg_parsers["print_source"] = ap
+
   def list_profile(self, args, screen_info=None):
     """Command handler for list_profile.
 
@@ -284,7 +393,9 @@ class ProfileAnalyzer(object):
     Returns:
       Output text lines as a RichTextLines object.
     """
-    del screen_info
+    screen_cols = 80
+    if screen_info and "cols" in screen_info:
+      screen_cols = screen_info["cols"]
 
     parsed = self._arg_parsers["list_profile"].parse_args(args)
     op_time_interval = (command_parser.parse_time_interval(parsed.op_time)
@@ -292,22 +403,27 @@ class ProfileAnalyzer(object):
     exec_time_interval = (
         command_parser.parse_time_interval(parsed.execution_time)
         if parsed.execution_time else None)
-    node_name_regex = re.compile(parsed.node_name_filter)
-    file_name_regex = re.compile(parsed.file_name_filter)
-    op_type_regex = re.compile(parsed.op_type_filter)
+    node_name_regex = (re.compile(parsed.node_name_filter)
+                       if parsed.node_name_filter else None)
+    file_path_regex = (re.compile(parsed.file_path_filter)
+                       if parsed.file_path_filter else None)
+    op_type_regex = (re.compile(parsed.op_type_filter)
+                     if parsed.op_type_filter else None)
 
     output = debugger_cli_common.RichTextLines([""])
-    device_name_regex = re.compile(parsed.device_name_filter)
+    device_name_regex = (re.compile(parsed.device_name_filter)
+                         if parsed.device_name_filter else None)
     data_generator = self._get_profile_data_generator()
     device_count = len(self._run_metadata.step_stats.dev_stats)
     for index in range(device_count):
       device_stats = self._run_metadata.step_stats.dev_stats[index]
-      if device_name_regex.match(device_stats.device):
+      if not device_name_regex or device_name_regex.match(device_stats.device):
         profile_data = [
             datum for datum in data_generator(device_stats)
             if _list_profile_filter(
-                datum, node_name_regex, file_name_regex, op_type_regex,
-                op_time_interval, exec_time_interval)]
+                datum, node_name_regex, file_path_regex, op_type_regex,
+                op_time_interval, exec_time_interval,
+                min_lineno=parsed.min_lineno, max_lineno=parsed.max_lineno)]
         profile_data = sorted(
             profile_data,
             key=lambda datum: _list_profile_sort_key(datum, parsed.sort_by),
@@ -315,7 +431,11 @@ class ProfileAnalyzer(object):
         output.extend(
             self._get_list_profile_lines(
                 device_stats.device, index, device_count,
-                profile_data, parsed.sort_by, parsed.reverse, parsed.time_unit))
+                profile_data, parsed.sort_by, parsed.reverse, parsed.time_unit,
+                device_name_filter=parsed.device_name_filter,
+                node_name_filter=parsed.node_name_filter,
+                op_type_filter=parsed.op_type_filter,
+                screen_cols=screen_cols))
     return output
 
   def _get_profile_data_generator(self):
@@ -324,32 +444,40 @@ class ProfileAnalyzer(object):
     Returns:
       A function that generates `ProfileDatum` objects.
     """
-    node_to_file_line = {}
+    node_to_file_path = {}
+    node_to_line_number = {}
+    node_to_func_name = {}
     node_to_op_type = {}
     for op in self._graph.get_operations():
-      file_line = ""
       for trace_entry in reversed(op.traceback):
-        filepath = trace_entry[0]
-        file_line = "%s:%d(%s)" % (
-            os.path.basename(filepath), trace_entry[1], trace_entry[2])
-        if not source_utils.guess_is_tensorflow_py_library(filepath):
+        file_path = trace_entry[0]
+        line_num = trace_entry[1]
+        func_name = trace_entry[2]
+        if not source_utils.guess_is_tensorflow_py_library(file_path):
           break
-      node_to_file_line[op.name] = file_line
+      node_to_file_path[op.name] = file_path
+      node_to_line_number[op.name] = line_num
+      node_to_func_name[op.name] = func_name
       node_to_op_type[op.name] = op.type
 
     def profile_data_generator(device_step_stats):
       for node_stats in device_step_stats.node_stats:
         if node_stats.node_name == "_SOURCE" or node_stats.node_name == "_SINK":
           continue
-        yield ProfileDatum(
+        yield profiling.ProfileDatum(
+            device_step_stats.device,
             node_stats,
-            node_to_file_line.get(node_stats.node_name, ""),
+            node_to_file_path.get(node_stats.node_name, ""),
+            node_to_line_number.get(node_stats.node_name, 0),
+            node_to_func_name.get(node_stats.node_name, ""),
             node_to_op_type.get(node_stats.node_name, ""))
     return profile_data_generator
 
   def _get_list_profile_lines(
       self, device_name, device_index, device_count,
-      profile_datum_list, sort_by, sort_reverse, time_unit):
+      profile_datum_list, sort_by, sort_reverse, time_unit,
+      device_name_filter=None, node_name_filter=None, op_type_filter=None,
+      screen_cols=80):
     """Get `RichTextLines` object for list_profile command for a given device.
 
     Args:
@@ -358,11 +486,16 @@ class ProfileAnalyzer(object):
       device_count: (int) Number of devices.
       profile_datum_list: List of `ProfileDatum` objects.
       sort_by: (string) Identifier of column to sort. Sort identifier
-          must match value of SORT_OPS_BY_OP_NAME, SORT_OPS_BY_EXEC_TIME,
-          SORT_OPS_BY_MEMORY or SORT_OPS_BY_LINE.
+          must match value of SORT_OPS_BY_OP_NAME, SORT_OPS_BY_OP_TYPE,
+          SORT_OPS_BY_EXEC_TIME, SORT_OPS_BY_MEMORY or SORT_OPS_BY_LINE.
       sort_reverse: (bool) Whether to sort in descending instead of default
           (ascending) order.
       time_unit: time unit, must be in cli_shared.TIME_UNITS.
+      device_name_filter: Regular expression to filter by device name.
+      node_name_filter: Regular expression to filter by node name.
+      op_type_filter: Regular expression to filter by op type.
+      screen_cols: (int) Number of columns available on the screen (i.e.,
+        available screen width).
 
     Returns:
       `RichTextLines` object containing a table that displays profiling
@@ -389,50 +522,57 @@ class ProfileAnalyzer(object):
     for col in range(len(column_widths)):
       for row in range(profile_data.row_count()):
         column_widths[col] = max(
-            column_widths[col], len(str(profile_data.value(row, col))))
+            column_widths[col], len(profile_data.value(
+                row,
+                col,
+                device_name_filter=device_name_filter,
+                node_name_filter=node_name_filter,
+                op_type_filter=op_type_filter)))
       column_widths[col] += 2  # add margin between columns
 
     # Add device name.
-    output = debugger_cli_common.RichTextLines(["-"*80])
+    output = [RL("-" * screen_cols)]
     device_row = "Device %d of %d: %s" % (
         device_index + 1, device_count, device_name)
-    output.extend(debugger_cli_common.RichTextLines([device_row, ""]))
+    output.append(RL(device_row))
+    output.append(RL())
 
     # Add headers.
     base_command = "list_profile"
-    attr_segs = {0: []}
-    row = ""
+    row = RL()
     for col in range(profile_data.column_count()):
       column_name = profile_data.column_names()[col]
       sort_id = profile_data.column_sort_id(col)
       command = "%s -s %s" % (base_command, sort_id)
       if sort_by == sort_id and not sort_reverse:
         command += " -r"
-      curr_row = ("{:<%d}" % column_widths[col]).format(column_name)
-      prev_len = len(row)
-      row += curr_row
-      attr_segs[0].append(
-          (prev_len, prev_len + len(column_name),
-           [debugger_cli_common.MenuItem(None, command), "bold"]))
+      head_menu_item = debugger_cli_common.MenuItem(None, command)
+      row += RL(column_name, font_attr=[head_menu_item, "bold"])
+      row += RL(" " * (column_widths[col] - len(column_name)))
 
-    output.extend(
-        debugger_cli_common.RichTextLines([row], font_attr_segs=attr_segs))
+    output.append(row)
 
     # Add data rows.
     for row in range(profile_data.row_count()):
-      row_str = ""
+      new_row = RL()
       for col in range(profile_data.column_count()):
-        row_str += ("{:<%d}" % column_widths[col]).format(
-            profile_data.value(row, col))
-      output.extend(debugger_cli_common.RichTextLines([row_str]))
+        new_cell = profile_data.value(
+            row,
+            col,
+            device_name_filter=device_name_filter,
+            node_name_filter=node_name_filter,
+            op_type_filter=op_type_filter)
+        new_row += new_cell
+        new_row += RL(" " * (column_widths[col] - len(new_cell)))
+      output.append(new_row)
 
     # Add stat totals.
     row_str = ""
     for col in range(len(device_total_row)):
       row_str += ("{:<%d}" % column_widths[col]).format(device_total_row[col])
-    output.extend(debugger_cli_common.RichTextLines(""))
-    output.extend(debugger_cli_common.RichTextLines(row_str))
-    return output
+    output.append(RL())
+    output.append(RL(row_str))
+    return debugger_cli_common.rich_text_lines_from_rich_line_list(output)
 
   def _measure_list_profile_column_widths(self, profile_data):
     """Determine the maximum column widths for each data list.
@@ -451,6 +591,176 @@ class ProfileAnalyzer(object):
             widths[col], len(str(profile_data.row_values(row)[col])) + 2)
     return widths
 
+  _LINE_COST_ATTR = cli_shared.COLOR_CYAN
+  _LINE_NUM_ATTR = cli_shared.COLOR_YELLOW
+  _NUM_NODES_HEAD = "#nodes"
+  _NUM_EXECS_SUB_HEAD = "(#execs)"
+  _LINENO_HEAD = "lineno"
+  _SOURCE_HEAD = "source"
+
+  def print_source(self, args, screen_info=None):
+    """Print a Python source file with line-level profile information.
+
+    Args:
+      args: Command-line arguments, excluding the command prefix, as a list of
+        str.
+      screen_info: Optional dict input containing screen information such as
+        cols.
+
+    Returns:
+      Output text lines as a RichTextLines object.
+    """
+    del screen_info
+
+    parsed = self._arg_parsers["print_source"].parse_args(args)
+
+    device_name_regex = (re.compile(parsed.device_name_filter)
+                         if parsed.device_name_filter else None)
+
+    profile_data = []
+    data_generator = self._get_profile_data_generator()
+    device_count = len(self._run_metadata.step_stats.dev_stats)
+    for index in range(device_count):
+      device_stats = self._run_metadata.step_stats.dev_stats[index]
+      if device_name_regex and not device_name_regex.match(device_stats.device):
+        continue
+      profile_data.extend([datum for datum in data_generator(device_stats)])
+
+    source_annotation = source_utils.annotate_source_against_profile(
+        profile_data,
+        os.path.expanduser(parsed.source_file_path),
+        node_name_filter=parsed.node_name_filter,
+        op_type_filter=parsed.op_type_filter)
+    if not source_annotation:
+      return debugger_cli_common.RichTextLines(
+          ["The source file %s does not contain any profile information for "
+           "the previous Session run under the following "
+           "filters:" % parsed.source_file_path,
+           "  --%s: %s" % (_DEVICE_NAME_FILTER_FLAG, parsed.device_name_filter),
+           "  --%s: %s" % (_NODE_NAME_FILTER_FLAG, parsed.node_name_filter),
+           "  --%s: %s" % (_OP_TYPE_FILTER_FLAG, parsed.op_type_filter)])
+
+    max_total_cost = 0
+    for line_index in source_annotation:
+      total_cost = self._get_total_cost(source_annotation[line_index],
+                                        parsed.cost_type)
+      max_total_cost = max(max_total_cost, total_cost)
+
+    source_lines, line_num_width = source_utils.load_source(
+        parsed.source_file_path)
+
+    cost_bar_max_length = 10
+    total_cost_head = parsed.cost_type
+    column_widths = {
+        "cost_bar": cost_bar_max_length + 3,
+        "total_cost": len(total_cost_head) + 3,
+        "num_nodes_execs": len(self._NUM_EXECS_SUB_HEAD) + 1,
+        "line_number": line_num_width,
+    }
+
+    head = RL(
+        " " * column_widths["cost_bar"] +
+        total_cost_head +
+        " " * (column_widths["total_cost"] - len(total_cost_head)) +
+        self._NUM_NODES_HEAD +
+        " " * (column_widths["num_nodes_execs"] - len(self._NUM_NODES_HEAD)),
+        font_attr=self._LINE_COST_ATTR)
+    head += RL(self._LINENO_HEAD, font_attr=self._LINE_NUM_ATTR)
+    sub_head = RL(
+        " " * (column_widths["cost_bar"] +
+               column_widths["total_cost"]) +
+        self._NUM_EXECS_SUB_HEAD +
+        " " * (column_widths["num_nodes_execs"] -
+               len(self._NUM_EXECS_SUB_HEAD)) +
+        " " * column_widths["line_number"],
+        font_attr=self._LINE_COST_ATTR)
+    sub_head += RL(self._SOURCE_HEAD, font_attr="bold")
+    lines = [head, sub_head]
+
+    output_annotations = {}
+    for i, line in enumerate(source_lines):
+      lineno = i + 1
+      if lineno in source_annotation:
+        annotation = source_annotation[lineno]
+        cost_bar = self._render_normalized_cost_bar(
+            self._get_total_cost(annotation, parsed.cost_type), max_total_cost,
+            cost_bar_max_length)
+        annotated_line = cost_bar
+        annotated_line += " " * (column_widths["cost_bar"] - len(cost_bar))
+
+        total_cost = RL(cli_shared.time_to_readable_str(
+            self._get_total_cost(annotation, parsed.cost_type),
+            force_time_unit=parsed.time_unit),
+                        font_attr=self._LINE_COST_ATTR)
+        total_cost += " " * (column_widths["total_cost"] - len(total_cost))
+        annotated_line += total_cost
+
+        file_path_filter = re.escape(parsed.source_file_path) + "$"
+        command = "lp --file_path_filter %s --min_lineno %d --max_lineno %d" % (
+            file_path_filter, lineno, lineno + 1)
+        if parsed.device_name_filter:
+          command += " --%s %s" % (_DEVICE_NAME_FILTER_FLAG,
+                                   parsed.device_name_filter)
+        if parsed.node_name_filter:
+          command += " --%s %s" % (_NODE_NAME_FILTER_FLAG,
+                                   parsed.node_name_filter)
+        if parsed.op_type_filter:
+          command += " --%s %s" % (_OP_TYPE_FILTER_FLAG,
+                                   parsed.op_type_filter)
+        menu_item = debugger_cli_common.MenuItem(None, command)
+        num_nodes_execs = RL("%d(%d)" % (annotation.node_count,
+                                         annotation.node_exec_count),
+                             font_attr=[self._LINE_COST_ATTR, menu_item])
+        num_nodes_execs += " " * (
+            column_widths["num_nodes_execs"] - len(num_nodes_execs))
+        annotated_line += num_nodes_execs
+      else:
+        annotated_line = RL(
+            " " * sum(column_widths[col_name] for col_name in column_widths
+                      if col_name != "line_number"))
+
+      line_num_column = RL(" L%d" % (lineno), self._LINE_NUM_ATTR)
+      line_num_column += " " * (
+          column_widths["line_number"] - len(line_num_column))
+      annotated_line += line_num_column
+      annotated_line += line
+      lines.append(annotated_line)
+
+      if parsed.init_line == lineno:
+        output_annotations[
+            debugger_cli_common.INIT_SCROLL_POS_KEY] = len(lines) - 1
+
+    return debugger_cli_common.rich_text_lines_from_rich_line_list(
+        lines, annotations=output_annotations)
+
+  def _get_total_cost(self, aggregated_profile, cost_type):
+    if cost_type == "exec_time":
+      return aggregated_profile.total_exec_time
+    elif cost_type == "op_time":
+      return aggregated_profile.total_op_time
+    else:
+      raise ValueError("Unsupported cost type: %s" % cost_type)
+
+  def _render_normalized_cost_bar(self, cost, max_cost, length):
+    """Render a text bar representing a normalized cost.
+
+    Args:
+      cost: the absolute value of the cost.
+      max_cost: the maximum cost value to normalize the absolute cost with.
+      length: (int) length of the cost bar, in number of characters, excluding
+        the brackets on the two ends.
+
+    Returns:
+      An instance of debugger_cli_common.RichTextLine.
+    """
+    num_ticks = int(np.ceil(float(cost) / max_cost * length))
+    num_ticks = num_ticks or 1  # Minimum is 1 tick.
+    output = RL("[", font_attr=self._LINE_COST_ATTR)
+    output += RL("|" * num_ticks + " " * (length - num_ticks),
+                 font_attr=["bold", self._LINE_COST_ATTR])
+    output += RL("]", font_attr=self._LINE_COST_ATTR)
+    return output
+
   def get_help(self, handler_name):
     return self._arg_parsers[handler_name].format_help()
 
@@ -480,5 +790,10 @@ def create_profiler_ui(graph,
       analyzer.list_profile,
       analyzer.get_help("list_profile"),
       prefix_aliases=["lp"])
+  cli.register_command_handler(
+      "print_source",
+      analyzer.print_source,
+      analyzer.get_help("print_source"),
+      prefix_aliases=["ps"])
 
   return cli
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
index 6880e61d3e..a709cb4107 100644
--- a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
@@ -23,16 +23,45 @@ import re
 from tensorflow.core.framework import step_stats_pb2
 from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import session
+from tensorflow.python.debug.cli import debugger_cli_common
 from tensorflow.python.debug.cli import profile_analyzer_cli
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_util
+from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import googletest
 from tensorflow.python.platform import test
+from tensorflow.python.util import tf_inspect
 
 
-class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
+def _line_number_above():
+  return tf_inspect.stack()[1][2] - 1
+
+
+def _at_least_one_line_matches(pattern, lines):
+  pattern_re = re.compile(pattern)
+  for i, line in enumerate(lines):
+    if pattern_re.search(line):
+      return True, i
+  return False, None
+
+
+def _assert_at_least_one_line_matches(pattern, lines):
+  any_match, _ = _at_least_one_line_matches(pattern, lines)
+  if not any_match:
+    raise AssertionError(
+        "%s does not match any line in %s." % (pattern, str(lines)))
+
+
+def _assert_no_lines_match(pattern, lines):
+  any_match, _ = _at_least_one_line_matches(pattern, lines)
+  if any_match:
+    raise AssertionError(
+        "%s matched at least one line in %s." % (pattern, str(lines)))
+
+
+class ProfileAnalyzerListProfileTest(test_util.TensorFlowTestCase):
 
   def testNodeInfoEmpty(self):
     graph = ops.Graph()
@@ -74,9 +103,9 @@ class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
     prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
     prof_output = prof_analyzer.list_profile([]).lines
 
-    self._assertAtLeastOneLineMatches(r"Device 1 of 1: deviceA", prof_output)
-    self._assertAtLeastOneLineMatches(r"^Add/123.*2us.*4us", prof_output)
-    self._assertAtLeastOneLineMatches(r"^Mul/456.*1us.*3us", prof_output)
+    _assert_at_least_one_line_matches(r"Device 1 of 1: deviceA", prof_output)
+    _assert_at_least_one_line_matches(r"^Add/123.*add.*2us.*4us", prof_output)
+    _assert_at_least_one_line_matches(r"^Mul/456.*mul.*1us.*3us", prof_output)
 
   def testMultipleDevices(self):
     node1 = step_stats_pb2.NodeExecStats(
@@ -104,13 +133,13 @@ class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
     prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(graph, run_metadata)
     prof_output = prof_analyzer.list_profile([]).lines
 
-    self._assertAtLeastOneLineMatches(r"Device 1 of 2: deviceA", prof_output)
-    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
+    _assert_at_least_one_line_matches(r"Device 1 of 2: deviceA", prof_output)
+    _assert_at_least_one_line_matches(r"Device 2 of 2: deviceB", prof_output)
 
     # Try filtering by device.
     prof_output = prof_analyzer.list_profile(["-d", "deviceB"]).lines
-    self._assertAtLeastOneLineMatches(r"Device 2 of 2: deviceB", prof_output)
-    self._assertNoLinesMatch(r"Device 1 of 2: deviceA", prof_output)
+    _assert_at_least_one_line_matches(r"Device 2 of 2: deviceB", prof_output)
+    _assert_no_lines_match(r"Device 1 of 2: deviceA", prof_output)
 
   def testWithSession(self):
     options = config_pb2.RunOptions()
@@ -128,14 +157,14 @@ class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
           sess.graph, run_metadata)
       prof_output = prof_analyzer.list_profile([]).lines
 
-      self._assertAtLeastOneLineMatches("Device 1 of", prof_output)
+      _assert_at_least_one_line_matches("Device 1 of", prof_output)
       expected_headers = [
           "Node", r"Start Time \(us\)", r"Op Time \(.*\)", r"Exec Time \(.*\)",
           r"Filename:Lineno\(function\)"]
-      self._assertAtLeastOneLineMatches(
+      _assert_at_least_one_line_matches(
           ".*".join(expected_headers), prof_output)
-      self._assertAtLeastOneLineMatches(r"^Add/", prof_output)
-      self._assertAtLeastOneLineMatches(r"Device Total", prof_output)
+      _assert_at_least_one_line_matches(r"^Add/", prof_output)
+      _assert_at_least_one_line_matches(r"Device Total", prof_output)
 
   def testSorting(self):
     node1 = step_stats_pb2.NodeExecStats(
@@ -224,24 +253,24 @@ class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
 
     # Filter by name
     prof_output = prof_analyzer.list_profile(["-n", "Add"]).lines
-    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
-    self._assertNoLinesMatch(r"Mul/456", prof_output)
+    _assert_at_least_one_line_matches(r"Add/123", prof_output)
+    _assert_no_lines_match(r"Mul/456", prof_output)
     # Filter by op_type
     prof_output = prof_analyzer.list_profile(["-t", "mul"]).lines
-    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
-    self._assertNoLinesMatch(r"Add/123", prof_output)
+    _assert_at_least_one_line_matches(r"Mul/456", prof_output)
+    _assert_no_lines_match(r"Add/123", prof_output)
     # Filter by file name.
-    prof_output = prof_analyzer.list_profile(["-f", "file2"]).lines
-    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
-    self._assertNoLinesMatch(r"Mul/456", prof_output)
+    prof_output = prof_analyzer.list_profile(["-f", ".*file2"]).lines
+    _assert_at_least_one_line_matches(r"Add/123", prof_output)
+    _assert_no_lines_match(r"Mul/456", prof_output)
     # Fitler by execution time.
     prof_output = prof_analyzer.list_profile(["-e", "[5, 10]"]).lines
-    self._assertAtLeastOneLineMatches(r"Mul/456", prof_output)
-    self._assertNoLinesMatch(r"Add/123", prof_output)
+    _assert_at_least_one_line_matches(r"Mul/456", prof_output)
+    _assert_no_lines_match(r"Add/123", prof_output)
     # Fitler by op time.
     prof_output = prof_analyzer.list_profile(["-o", ">=2"]).lines
-    self._assertAtLeastOneLineMatches(r"Add/123", prof_output)
-    self._assertNoLinesMatch(r"Mul/456", prof_output)
+    _assert_at_least_one_line_matches(r"Add/123", prof_output)
+    _assert_no_lines_match(r"Mul/456", prof_output)
 
   def testSpecifyingTimeUnit(self):
     node1 = step_stats_pb2.NodeExecStats(
@@ -278,26 +307,149 @@ class ProfileAnalyzerTest(test_util.TensorFlowTestCase):
 
     # Force time unit.
     prof_output = prof_analyzer.list_profile(["--time_unit", "ms"]).lines
-    self._assertAtLeastOneLineMatches(r"Add/123.*0\.002ms", prof_output)
-    self._assertAtLeastOneLineMatches(r"Mul/456.*0\.005ms", prof_output)
-    self._assertAtLeastOneLineMatches(r"Device Total.*0\.009ms", prof_output)
-
-  def _atLeastOneLineMatches(self, pattern, lines):
-    pattern_re = re.compile(pattern)
-    for line in lines:
-      if pattern_re.search(line):
-        return True
-    return False
-
-  def _assertAtLeastOneLineMatches(self, pattern, lines):
-    if not self._atLeastOneLineMatches(pattern, lines):
-      raise AssertionError(
-          "%s does not match any line in %s." % (pattern, str(lines)))
-
-  def _assertNoLinesMatch(self, pattern, lines):
-    if self._atLeastOneLineMatches(pattern, lines):
-      raise AssertionError(
-          "%s matched at least one line in %s." % (pattern, str(lines)))
+    _assert_at_least_one_line_matches(r"Add/123.*add.*0\.002ms", prof_output)
+    _assert_at_least_one_line_matches(r"Mul/456.*mul.*0\.005ms", prof_output)
+    _assert_at_least_one_line_matches(r"Device Total.*0\.009ms", prof_output)
+
+
+class ProfileAnalyzerPrintSourceTest(test_util.TensorFlowTestCase):
+
+  def setUp(self):
+    super(ProfileAnalyzerPrintSourceTest, self).setUp()
+
+    options = config_pb2.RunOptions()
+    options.trace_level = config_pb2.RunOptions.FULL_TRACE
+    run_metadata = config_pb2.RunMetadata()
+    with session.Session() as sess:
+      loop_cond = lambda x: math_ops.less(x, 10)
+      self.loop_cond_lineno = _line_number_above()
+      loop_body = lambda x: math_ops.add(x, 1)
+      self.loop_body_lineno = _line_number_above()
+      x = constant_op.constant(0, name="x")
+      self.x_lineno = _line_number_above()
+      loop = control_flow_ops.while_loop(loop_cond, loop_body, [x])
+      self.loop_lineno = _line_number_above()
+      self.assertEqual(
+          10, sess.run(loop, options=options, run_metadata=run_metadata))
+
+      self.prof_analyzer = profile_analyzer_cli.ProfileAnalyzer(
+          sess.graph, run_metadata)
+
+  def tearDown(self):
+    ops.reset_default_graph()
+    super(ProfileAnalyzerPrintSourceTest, self).tearDown()
+
+  def testPrintSourceForWhileLoop(self):
+    prof_output = self.prof_analyzer.print_source([__file__])
+
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*us .*2\(22\) .*L%d.*(\S)+" % self.loop_cond_lineno,
+        prof_output.lines)
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*us .*2\(20\) .*L%d.*(\S)+" % self.loop_body_lineno,
+        prof_output.lines)
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*us .*7\(55\) .*L%d.*(\S)+" % self.loop_lineno,
+        prof_output.lines)
+
+  def testPrintSourceOutputContainsClickableLinks(self):
+    prof_output = self.prof_analyzer.print_source([__file__])
+    any_match, line_index = _at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*us .*2\(22\) .*L%d.*(\S)+" % self.loop_cond_lineno,
+        prof_output.lines)
+    self.assertTrue(any_match)
+    any_menu_item_match = False
+    for seg in prof_output.font_attr_segs[line_index]:
+      if (isinstance(seg[2][1], debugger_cli_common.MenuItem) and
+          seg[2][1].content.startswith("lp --file_path_filter ") and
+          "--min_lineno %d" % self.loop_cond_lineno in seg[2][1].content and
+          "--max_lineno %d" % (self.loop_cond_lineno + 1) in seg[2][1].content):
+        any_menu_item_match = True
+        break
+    self.assertTrue(any_menu_item_match)
+
+  def testPrintSourceWithNonDefaultTimeUnit(self):
+    prof_output = self.prof_analyzer.print_source([
+        __file__, "--time_unit", "ms"])
+
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*ms .*2\(22\) .*L%d.*(\S)+" % self.loop_cond_lineno,
+        prof_output.lines)
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*ms .*2\(20\) .*L%d.*(\S)+" % self.loop_body_lineno,
+        prof_output.lines)
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*ms .*7\(55\) .*L%d.*(\S)+" % self.loop_lineno,
+        prof_output.lines)
+
+  def testPrintSourceWithNodeNameFilter(self):
+    prof_output = self.prof_analyzer.print_source([
+        __file__, "--node_name_filter", "x$"])
+
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*us .*1\(1\) .*L%d.*(\S)+" % self.x_lineno,
+        prof_output.lines)
+    _assert_no_lines_match(
+        r"\[(\|)+(\s)*\] .*us .*2\(22\) .*L%d.*(\S)+" % self.loop_cond_lineno,
+        prof_output.lines)
+    _assert_no_lines_match(
+        r"\[(\|)+(\s)*\] .*us .*2\(20\) .*L%d.*(\S)+" % self.loop_body_lineno,
+        prof_output.lines)
+    _assert_no_lines_match(
+        r"\[(\|)+(\s)*\] .*ms .*7\(55\) .*L%d.*(\S)+" % self.loop_lineno,
+        prof_output.lines)
+
+    # Check clickable link.
+    _, line_index = _at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*us .*1\(1\) .*L%d.*(\S)+" % self.x_lineno,
+        prof_output.lines)
+    any_menu_item_match = False
+    for seg in prof_output.font_attr_segs[line_index]:
+      if (isinstance(seg[2][1], debugger_cli_common.MenuItem) and
+          seg[2][1].content.startswith("lp --file_path_filter ") and
+          "--node_name_filter x$" in seg[2][1].content and
+          "--min_lineno %d" % self.x_lineno in seg[2][1].content and
+          "--max_lineno %d" % (self.x_lineno + 1) in seg[2][1].content):
+        any_menu_item_match = True
+        break
+    self.assertTrue(any_menu_item_match)
+
+  def testPrintSourceWithOpTypeFilter(self):
+    prof_output = self.prof_analyzer.print_source([
+        __file__, "--op_type_filter", "Less"])
+
+    _assert_at_least_one_line_matches(
+        r"\[(\|)+(\s)*\] .*us .*1\(11\) .*L%d.*(\S)+" % self.loop_cond_lineno,
+        prof_output.lines)
+    _assert_no_lines_match(
+        r"\[(\|)+(\s)*\] .*us .*2\(20\) .*L%d.*(\S)+" % self.loop_body_lineno,
+        prof_output.lines)
+    _assert_no_lines_match(
+        r"\[(\|)+(\s)*\] .*us .*7\(55\) .*L%d.*(\S)+" % self.loop_lineno,
+        prof_output.lines)
+
+  def testPrintSourceWithNonexistentDeviceGivesCorrectErrorMessage(self):
+    prof_output = self.prof_analyzer.print_source([
+        __file__, "--device_name_filter", "foo_device"])
+
+    _assert_at_least_one_line_matches(
+        r"The source file .* does not contain any profile information for the "
+        "previous Session run", prof_output.lines)
+    _assert_at_least_one_line_matches(
+        r".*--device_name_filter: foo_device", prof_output.lines)
+
+  def testPrintSourceWithUnrelatedFileShowsCorrectErrorMessage(self):
+    prof_output = self.prof_analyzer.print_source([tf_inspect.__file__])
+    _assert_at_least_one_line_matches(
+        r"The source file .* does not contain any profile information for the "
+        "previous Session run", prof_output.lines)
+
+  def testPrintSourceOutputContainsInitScrollPosAnnotation(self):
+    prof_output = self.prof_analyzer.print_source([
+        __file__, "--init_line", str(self.loop_cond_lineno)])
+    self.assertEqual(
+        self.loop_cond_lineno + 1,  # The extra line is due to the head lines.
+        prof_output.annotations[debugger_cli_common.INIT_SCROLL_POS_KEY])
 
 
 if __name__ == "__main__":
diff --git a/tensorflow/python/debug/lib/profiling.py b/tensorflow/python/debug/lib/profiling.py
new file mode 100644
index 0000000000..dd580251a6
--- /dev/null
+++ b/tensorflow/python/debug/lib/profiling.py
@@ -0,0 +1,108 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Data structures and algorithms for profiling information."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import os
+
+
+class ProfileDatum(object):
+  """Profile data point."""
+
+  def __init__(self,
+               device_name,
+               node_exec_stats,
+               file_path,
+               line_number,
+               func_name,
+               op_type):
+    """Constructor.
+
+    Args:
+      device_name: (string) name of the device.
+      node_exec_stats: `NodeExecStats` proto.
+      file_path: path to the source file involved in creating the op.
+      line_number: line number in the file involved in creating the op.
+      func_name: name of the function that the line belongs to.
+      op_type: (string) Operation type.
+    """
+    self.device_name = device_name
+    self.node_exec_stats = node_exec_stats
+    self.file_path = file_path
+    self.line_number = line_number
+    self.func_name = func_name
+    if self.file_path:
+      self.file_line_func = "%s:%d(%s)" % (
+          os.path.basename(self.file_path), self.line_number, self.func_name)
+    else:
+      self.file_line_func = ""
+    self.op_type = op_type
+    self.start_time = self.node_exec_stats.all_start_micros
+    self.op_time = (self.node_exec_stats.op_end_rel_micros -
+                    self.node_exec_stats.op_start_rel_micros)
+
+  @property
+  def exec_time(self):
+    """Op execution time plus pre- and post-processing."""
+    return self.node_exec_stats.all_end_rel_micros
+
+
+class AggregateProfile(object):
+  """Profile summary data for aggregating a number of ProfileDatum."""
+
+  def __init__(self, profile_datum):
+    """Constructor.
+
+    Args:
+      profile_datum: (`ProfileDatum`) an instance of `ProfileDatum` to
+        initialize this object with.
+    """
+
+    self.total_op_time = profile_datum.op_time
+    self.total_exec_time = profile_datum.exec_time
+    device_and_node = "%s:%s" % (profile_datum.device_name,
+                                 profile_datum.node_exec_stats.node_name)
+    self._node_to_exec_count = {device_and_node: 1}
+
+  def add(self, profile_datum):
+    """Accumulate a new instance of ProfileDatum.
+
+    Args:
+      profile_datum: (`ProfileDatum`) an instance of `ProfileDatum` to
+        accumulate to this object.
+    """
+
+    self.total_op_time += profile_datum.op_time
+    self.total_exec_time += profile_datum.exec_time
+    device_and_node = "%s:%s" % (profile_datum.device_name,
+                                 profile_datum.node_exec_stats.node_name)
+
+    device_and_node = "%s:%s" % (profile_datum.device_name,
+                                 profile_datum.node_exec_stats.node_name)
+    if device_and_node in self._node_to_exec_count:
+      self._node_to_exec_count[device_and_node] += 1
+    else:
+      self._node_to_exec_count[device_and_node] = 1
+
+  @property
+  def node_count(self):
+    return len(self._node_to_exec_count)
+
+  @property
+  def node_exec_count(self):
+    return sum(self._node_to_exec_count.values())
diff --git a/tensorflow/python/debug/lib/profiling_test.py b/tensorflow/python/debug/lib/profiling_test.py
new file mode 100644
index 0000000000..f7b120ba5d
--- /dev/null
+++ b/tensorflow/python/debug/lib/profiling_test.py
@@ -0,0 +1,100 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Unit tests for the basic data structures and algorithms for profiling."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.core.framework import step_stats_pb2
+from tensorflow.python.debug.lib import profiling
+from tensorflow.python.framework import test_util
+from tensorflow.python.platform import googletest
+
+
+class AggregateProfile(test_util.TensorFlowTestCase):
+
+  def setUp(self):
+    node_1 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        op_start_rel_micros=3,
+        op_end_rel_micros=5,
+        all_end_rel_micros=4)
+    self.profile_datum_1 = profiling.ProfileDatum(
+        "cpu:0", node_1, "/foo/bar.py", 10, "func1", "Add")
+
+    node_2 = step_stats_pb2.NodeExecStats(
+        node_name="Mul/456",
+        op_start_rel_micros=13,
+        op_end_rel_micros=16,
+        all_end_rel_micros=17)
+    self.profile_datum_2 = profiling.ProfileDatum(
+        "cpu:0", node_2, "/foo/bar.py", 11, "func1", "Mul")
+
+    node_3 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        op_start_rel_micros=103,
+        op_end_rel_micros=105,
+        all_end_rel_micros=4)
+    self.profile_datum_3 = profiling.ProfileDatum(
+        "cpu:0", node_3, "/foo/bar.py", 12, "func1", "Add")
+
+    node_4 = step_stats_pb2.NodeExecStats(
+        node_name="Add/123",
+        op_start_rel_micros=203,
+        op_end_rel_micros=205,
+        all_end_rel_micros=4)
+    self.profile_datum_4 = profiling.ProfileDatum(
+        "gpu:0", node_4, "/foo/bar.py", 13, "func1", "Add")
+
+  def testAggregateProfileConstructorWorks(self):
+    aggregate_data = profiling.AggregateProfile(self.profile_datum_1)
+
+    self.assertEqual(2, aggregate_data.total_op_time)
+    self.assertEqual(4, aggregate_data.total_exec_time)
+    self.assertEqual(1, aggregate_data.node_count)
+    self.assertEqual(1, aggregate_data.node_exec_count)
+
+  def testAddToAggregateProfileWithDifferentNodeWorks(self):
+    aggregate_data = profiling.AggregateProfile(self.profile_datum_1)
+    aggregate_data.add(self.profile_datum_2)
+
+    self.assertEqual(5, aggregate_data.total_op_time)
+    self.assertEqual(21, aggregate_data.total_exec_time)
+    self.assertEqual(2, aggregate_data.node_count)
+    self.assertEqual(2, aggregate_data.node_exec_count)
+
+  def testAddToAggregateProfileWithSameNodeWorks(self):
+    aggregate_data = profiling.AggregateProfile(self.profile_datum_1)
+    aggregate_data.add(self.profile_datum_2)
+    aggregate_data.add(self.profile_datum_3)
+
+    self.assertEqual(7, aggregate_data.total_op_time)
+    self.assertEqual(25, aggregate_data.total_exec_time)
+    self.assertEqual(2, aggregate_data.node_count)
+    self.assertEqual(3, aggregate_data.node_exec_count)
+
+  def testAddToAggregateProfileWithDifferentDeviceSameNodeWorks(self):
+    aggregate_data = profiling.AggregateProfile(self.profile_datum_1)
+    aggregate_data.add(self.profile_datum_4)
+
+    self.assertEqual(4, aggregate_data.total_op_time)
+    self.assertEqual(8, aggregate_data.total_exec_time)
+    self.assertEqual(2, aggregate_data.node_count)
+    self.assertEqual(2, aggregate_data.node_exec_count)
+
+
+if __name__ == "__main__":
+  googletest.main()
diff --git a/tensorflow/python/debug/lib/source_utils.py b/tensorflow/python/debug/lib/source_utils.py
index f610d05b83..ad4e37d22e 100644
--- a/tensorflow/python/debug/lib/source_utils.py
+++ b/tensorflow/python/debug/lib/source_utils.py
@@ -22,6 +22,11 @@ import collections
 import os
 import re
 
+import numpy as np
+
+from tensorflow.python.debug.lib import profiling
+
+
 _TENSORFLOW_BASEDIR = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.dirname(
         os.path.normpath(os.path.abspath(__file__))))))
@@ -30,6 +35,10 @@ UNCOMPILED_SOURCE_SUFFIXES = (".py")
 COMPILED_SOURCE_SUFFIXES = (".pyc", ".pyo")
 
 
+def _norm_abs_path(file_path):
+  return os.path.normpath(os.path.abspath(file_path))
+
+
 def is_extension_uncompiled_python_source(file_path):
   _, extension = os.path.splitext(file_path)
   return extension.lower() in UNCOMPILED_SOURCE_SUFFIXES
@@ -65,7 +74,7 @@ def guess_is_tensorflow_py_library(py_file_path):
       not is_extension_compiled_python_source(py_file_path)):
     raise ValueError(
         "Input file path (%s) is not a Python source file." % py_file_path)
-  py_file_path = os.path.normpath(os.path.abspath(py_file_path))
+  py_file_path = _norm_abs_path(py_file_path)
 
   return (py_file_path.startswith(_TENSORFLOW_BASEDIR) and
           not py_file_path.endswith("_test.py") and
@@ -73,6 +82,14 @@ def guess_is_tensorflow_py_library(py_file_path):
               os.path.normpath("python/debug/examples")))
 
 
+def load_source(source_file_path):
+  with open(source_file_path, "rU") as f:
+    source_text = f.read()
+  source_lines = source_text.split("\n")
+  line_num_width = int(np.ceil(np.log10(len(source_lines)))) + 3
+  return source_lines, line_num_width
+
+
 def annotate_source(dump,
                     source_file_path,
                     do_dumped_tensors=False,
@@ -109,7 +126,7 @@ def annotate_source(dump,
     raise ValueError("Cannot perform source annotation due to a lack of set "
                      "Python graph in the dump object")
 
-  source_file_path = os.path.normpath(os.path.abspath(source_file_path))
+  source_file_path = _norm_abs_path(source_file_path)
 
   line_to_op_names = {}
   for op in py_graph.get_operations():
@@ -118,7 +135,7 @@ def annotate_source(dump,
           max_line is not None and line_number >= max_line):
         continue
 
-      if os.path.normpath(os.path.abspath(file_path)) != source_file_path:
+      if _norm_abs_path(file_path) != source_file_path:
         continue
 
       if do_dumped_tensors:
@@ -195,7 +212,7 @@ def list_source_files_against_dump(dump,
       continue
 
     for file_path, line_number, _, _ in dump.node_traceback(op.name):
-      file_path = os.path.normpath(os.path.abspath(file_path))
+      file_path = _norm_abs_path(file_path)
       if (file_path in to_skip_file_paths or
           path_regex and not path_regex.match(file_path) or
           not os.path.isfile(file_path)):
@@ -238,3 +255,61 @@ def list_source_files_against_dump(dump,
         path_to_first_line[file_path]))
 
   return sorted(output, key=lambda x: x[0])
+
+
+def annotate_source_against_profile(profile_data,
+                                    source_file_path,
+                                    node_name_filter=None,
+                                    op_type_filter=None,
+                                    min_line=None,
+                                    max_line=None):
+  """Annotate a Python source file with profiling information at each line.
+
+  (The annotation doesn't change the source file itself.)
+
+  Args:
+    profile_data: (`list` of `ProfileDatum`) A list of `ProfileDatum`.
+    source_file_path: (`str`) Path to the source file being annotated.
+    node_name_filter: Regular expression to filter by node name.
+    op_type_filter: Regular expression to filter by op type.
+    min_line: (`None` or `int`) The 1-based line to start annotate the source
+      file from (inclusive).
+    max_line: (`None` or `int`) The 1-based line number to end the annotation
+      at (exclusive).
+
+  Returns:
+    A `dict` mapping 1-based line number to a the namedtuple
+      `profiling.LineOrFuncProfileSummary`.
+  """
+
+  source_file_path = _norm_abs_path(source_file_path)
+
+  node_name_regex = re.compile(node_name_filter) if node_name_filter else None
+  op_type_regex = re.compile(op_type_filter) if op_type_filter else None
+
+  line_to_profile_summary = {}
+  for profile_datum in profile_data:
+    if not profile_datum.file_path:
+      continue
+
+    if _norm_abs_path(profile_datum.file_path) != source_file_path:
+      continue
+
+    if (min_line is not None and profile_datum.line_number < min_line or
+        max_line is not None and profile_datum.line_number >= max_line):
+      continue
+
+    if (node_name_regex and
+        not node_name_regex.match(profile_datum.node_exec_stats.node_name)):
+      continue
+
+    if op_type_regex and not op_type_regex.match(profile_datum.op_type):
+      continue
+
+    if profile_datum.line_number not in line_to_profile_summary:
+      line_to_profile_summary[profile_datum.line_number] = (
+          profiling.AggregateProfile(profile_datum))
+    else:
+      line_to_profile_summary[profile_datum.line_number].add(profile_datum)
+
+  return line_to_profile_summary
-- 
GitLab


From c311af00f2d72940c75ab0fc125ba2949858b2a9 Mon Sep 17 00:00:00 2001
From: Dandelion Man? <dandelion@google.com>
Date: Thu, 18 May 2017 17:58:56 -0700
Subject: [PATCH 1525/1563] Remove d3v3 version of vz_projector.

PiperOrigin-RevId: 156503539
---
 tensorflow/BUILD                              |   1 -
 .../tensorboard/components/vz_projector/BUILD | 180 -----
 .../vz_projector/analyticsLogger.ts           |  67 --
 .../components/vz_projector/bh_tsne.ts        | 472 ------------
 .../vz_projector/data-provider-demo.ts        | 127 ---
 .../vz_projector/data-provider-proto.ts       |  88 ---
 .../vz_projector/data-provider-server.ts      | 137 ----
 .../components/vz_projector/data-provider.ts  | 429 -----------
 .../vz_projector/data-provider_test.ts        |  96 ---
 .../components/vz_projector/data.ts           | 547 -------------
 .../components/vz_projector/data_test.ts      | 104 ---
 .../components/vz_projector/external.d.ts     |  51 --
 .../components/vz_projector/heap.ts           | 146 ----
 .../components/vz_projector/knn.ts            | 235 ------
 .../components/vz_projector/label.ts          | 151 ----
 .../components/vz_projector/logging.ts        | 103 ---
 .../vz_projector/projectorEventContext.ts     |  45 --
 .../projectorScatterPlotAdapter.ts            | 711 -----------------
 .../components/vz_projector/renderContext.ts  |  53 --
 .../components/vz_projector/scatterPlot.ts    | 723 ------------------
 .../scatterPlotRectangleSelector.ts           | 107 ---
 .../scatterPlotRectangleSelector_test.ts      |  69 --
 .../vz_projector/scatterPlotVisualizer.ts     |  51 --
 .../scatterPlotVisualizer3DLabels.ts          | 367 ---------
 .../scatterPlotVisualizerCanvasLabels.ts      | 186 -----
 .../scatterPlotVisualizerPolylines.ts         | 149 ----
 .../scatterPlotVisualizerSprites.ts           | 435 -----------
 .../components/vz_projector/sptree.ts         | 175 -----
 .../components/vz_projector/sptree_test.ts    | 104 ---
 .../components/vz_projector/styles.html       | 185 -----
 .../components/vz_projector/util.ts           | 252 ------
 .../components/vz_projector/util_test.ts      |  42 -
 .../components/vz_projector/vector.ts         | 265 -------
 .../vz_projector/vz-projector-app.html        | 105 ---
 .../vz-projector-bookmark-panel.html          | 205 -----
 .../vz-projector-bookmark-panel.ts            | 283 -------
 .../vz_projector/vz-projector-colab.html      |  32 -
 .../vz_projector/vz-projector-dashboard.html  |  81 --
 .../vz_projector/vz-projector-data-panel.html | 399 ----------
 .../vz_projector/vz-projector-data-panel.ts   | 496 ------------
 .../vz_projector/vz-projector-input.html      |  64 --
 .../vz_projector/vz-projector-input.ts        | 113 ---
 .../vz-projector-inspector-panel.html         | 240 ------
 .../vz-projector-inspector-panel.ts           | 337 --------
 .../vz_projector/vz-projector-legend.html     |  76 --
 .../vz_projector/vz-projector-legend.ts       |  98 ---
 .../vz-projector-metadata-card.html           |  97 ---
 .../vz-projector-metadata-card.ts             |  88 ---
 .../vz-projector-projections-panel.html       | 314 --------
 .../vz-projector-projections-panel.ts         | 589 --------------
 .../vz-projector-projections-panel_test.ts    | 109 ---
 .../vz_projector/vz-projector-util.ts         |  34 -
 .../components/vz_projector/vz-projector.html | 343 ---------
 .../components/vz_projector/vz-projector.ts   | 570 --------------
 .../components/vz_projector_d3v4/BUILD        |  94 +++
 55 files changed, 94 insertions(+), 11526 deletions(-)
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/BUILD
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/analyticsLogger.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/bh_tsne.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/data-provider-proto.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/data-provider-server.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/data-provider.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/data-provider_test.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/data.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/data_test.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/external.d.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/heap.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/knn.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/label.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/logging.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/projectorEventContext.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/renderContext.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlot.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer3DLabels.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerPolylines.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerSprites.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/sptree.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/sptree_test.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/styles.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/util.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/util_test.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vector.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-app.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-colab.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-input.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-legend.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector-util.ts
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector.html
 delete mode 100644 tensorflow/tensorboard/components/vz_projector/vz-projector.ts

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index a2edc9f37c..3c103e08df 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -362,7 +362,6 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_heatmap_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_histogram_timeseries_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_line_chart_d3v4:all_files",
-        "//tensorflow/tensorboard/components/vz_projector:all_files",
         "//tensorflow/tensorboard/components/vz_projector_d3v4:all_files",
         "//tensorflow/tensorboard/components/vz_projector_d3v4/test:all_files",
         "//tensorflow/tensorboard/components/vz_sorting_d3v4:all_files",
diff --git a/tensorflow/tensorboard/components/vz_projector/BUILD b/tensorflow/tensorboard/components/vz_projector/BUILD
deleted file mode 100644
index 0ea94b9a22..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/BUILD
+++ /dev/null
@@ -1,180 +0,0 @@
-package(default_visibility = [":projector_group"])
-
-load(
-    "//tensorflow/tensorboard:defs.bzl",
-    "tensorboard_karma_web_test_suite",
-    "tensorboard_ts_config",
-    "tensorboard_ts_declaration",
-    "tensorboard_ts_development_sources",
-    "tensorboard_ts_library",
-    "tensorboard_webcomponent_library",
-)
-
-licenses(["notice"])  # Apache 2.0
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            "**/METADATA",
-            "**/OWNERS",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
-
-# Visibility group for all clients of projector.
-package_group(
-    name = "projector_group",
-    packages = [
-        "//apps/labs/towerbridge/...",
-        "//experimental/bigpicture/projector/...",
-        "//java/com/google/apps/labs/towerbridge/...",
-        "//learning/vis/projector/...",
-        "//tensorflow/tensorboard/...",
-    ],
-)
-
-tensorboard_ts_declaration(
-    name = "external",
-    srcs = ["external.d.ts"],
-)
-
-tensorboard_ts_library(
-    name = "ts_lib",
-    srcs = glob(
-        ["*.ts"],
-        exclude = [
-            "*.d.ts",
-            "*_test.ts",
-            "bh_tsne.ts",
-            "sptree.ts",
-        ],
-    ),
-    runtime_deps = [
-        "//third_party/javascript/d3/v3:d3",
-        "//third_party/javascript/numericjs",
-        "//third_party/javascript/threejs/r77:threejs",
-        "//third_party/javascript/threejs/r77/examples/js/controls:orbitcontrols",
-        "//third_party/javascript/weblas",
-    ],
-    deps = [
-        ":external",
-        ":tsne_ts_lib",
-        "//third_party/javascript/node_modules/typescript:es2015.promise",
-        "//third_party/javascript/typings/d3",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-        "//third_party/javascript/typings/threejs:three",
-        "//third_party/javascript/typings/webcomponents_js",
-    ],
-)
-
-tensorboard_ts_library(
-    name = "tsne_ts_lib",
-    srcs = [
-        "bh_tsne.ts",
-        "sptree.ts",
-    ],
-)
-
-_PROJECTOR_LIB_DEPS = [
-    "//third_party/javascript/polymer/v1/iron-collapse:lib",
-    "//third_party/javascript/polymer/v1/iron-icons:lib",
-    "//third_party/javascript/polymer/v1/paper-button:lib",
-    "//third_party/javascript/polymer/v1/paper-checkbox:lib",
-    "//third_party/javascript/polymer/v1/paper-dialog:lib",
-    "//third_party/javascript/polymer/v1/paper-dialog-scrollable:lib",
-    "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
-    "//third_party/javascript/polymer/v1/paper-icon-button:lib",
-    "//third_party/javascript/polymer/v1/paper-input:lib",
-    "//third_party/javascript/polymer/v1/paper-item:lib",
-    "//third_party/javascript/polymer/v1/paper-listbox:lib",
-    "//third_party/javascript/polymer/v1/paper-slider:lib",
-    "//third_party/javascript/polymer/v1/paper-spinner:lib",
-    "//third_party/javascript/polymer/v1/paper-toast:lib",
-    "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
-    "//third_party/javascript/polymer/v1/paper-tooltip:lib",
-    "//third_party/javascript/polymer/v1/polymer:lib",
-]
-
-_PROJECTOR_DESTDIR = "vz-projector"
-
-_PROJECTOR_LIB_TS_LIB_DEPS = [
-    ":ts_lib",
-    ":tsne_ts_lib",
-]
-
-# Standalone embedding projector demos should depend on this target. We
-# exclude the HTML file for the dashboard itself. Demos do not need that
-# HTML file. This was introduced because standalone demos as of today
-# have an additional Closure pass that uses a compilation configuration
-# stricter than that of TensorBoard.
-tensorboard_webcomponent_library(
-    name = "lib",
-    srcs = glob(
-        ["*.html"],
-        exclude = ["vz-projector-dashboard.html"],
-    ),
-    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
-    destdir = _PROJECTOR_DESTDIR,
-    deps = _PROJECTOR_LIB_DEPS,
-)
-
-# TensorBoard, however, should depend on this target, which includes
-# the HTML file for the dashboard.
-tensorboard_webcomponent_library(
-    name = "lib_for_tensorboard",
-    srcs = glob(["*.html"]),
-    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
-    destdir = _PROJECTOR_DESTDIR,
-    deps = _PROJECTOR_LIB_DEPS,
-)
-
-### Tests ###
-
-tensorboard_ts_library(
-    name = "ts_test",
-    testonly = 1,
-    srcs = glob(["*_test.ts"]),
-    runtime_deps = [
-        "//third_party/javascript/polymer/v1/polymer:lib_all_js",
-    ],
-    deps = [
-        ":ts_lib",
-        ":tsne_ts_lib",
-        "//third_party/javascript/typings/chai",
-        "//third_party/javascript/typings/jasmine:jasmine_without_externs",
-        "//third_party/javascript/typings/mocha",
-    ],
-)
-
-tensorboard_ts_development_sources(
-    name = "dev_sources_for_test",
-    testonly = 1,
-    runtime_deps = [
-        "//third_party/javascript/chai",
-        "//third_party/javascript/mocha",
-    ],
-    deps = [
-        ":ts_test",
-    ],
-)
-
-# To run locally, run :all_tests_local
-tensorboard_karma_web_test_suite(
-    name = "all_tests",
-    size = "medium",
-    browsers = ["//testing/web/browsers:chrome-linux"],
-    manifest = ":dev_sources_for_test",
-)
-
-# Generate a TypeScript IDE project by running this target.
-tensorboard_ts_config(
-    name = "tsconfig",
-    deps = [
-        ":ts_lib",
-        ":ts_test",
-        ":tsne_ts_lib",
-    ],
-)
diff --git a/tensorflow/tensorboard/components/vz_projector/analyticsLogger.ts b/tensorflow/tensorboard/components/vz_projector/analyticsLogger.ts
deleted file mode 100644
index aa1f86927d..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/analyticsLogger.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-import {ProjectionType} from './data';
-
-export class AnalyticsLogger {
-  private eventLogging: boolean;
-  private pageViewLogging: boolean;
-
-  /**
-   * Constructs an event logger using Google Analytics. It assumes there is a
-   * Google Analytics script added to the page elsewhere. If there is no such
-   * script, the logger acts as a no-op.
-   *
-   * @param pageViewLogging Whether to log page views.
-   * @param eventLogging Whether to log user interaction.
-   */
-  constructor(pageViewLogging: boolean, eventLogging: boolean) {
-    if (typeof ga === 'undefined' || ga == null) {
-      this.eventLogging = false;
-      this.pageViewLogging = false;
-      return;
-    }
-    this.eventLogging = eventLogging;
-    this.pageViewLogging = pageViewLogging;
-  }
-
-  logPageView(pageTitle: string) {
-    if (this.pageViewLogging) {
-      // Always send a page view.
-      ga('send', {hitType: 'pageview', page: `/v/${pageTitle}`});
-    }
-  }
-
-  logProjectionChanged(projection: ProjectionType) {
-    if (this.eventLogging) {
-      ga('send', {
-        hitType: 'event',
-        eventCategory: 'Projection',
-        eventAction: 'click',
-        eventLabel: projection
-      });
-    }
-  }
-
-  logWebGLDisabled() {
-    if (this.eventLogging) {
-      ga('send', {
-        hitType: 'event',
-        eventCategory: 'Error',
-        eventAction: 'PageLoad',
-        eventLabel: 'WebGL_disabled'
-      });
-    }
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/bh_tsne.ts b/tensorflow/tensorboard/components/vz_projector/bh_tsne.ts
deleted file mode 100644
index 9d2df65f56..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/bh_tsne.ts
+++ /dev/null
@@ -1,472 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/**
- * This is a fork of the Karpathy's TSNE.js (original license below).
- * This fork implements Barnes-Hut approximation and runs in O(NlogN)
- * time, as opposed to the Karpathy's O(N^2) version.
- *
- * @author smilkov@google.com (Daniel Smilkov)
- */
-
-/**
- * The MIT License (MIT)
- * Copyright (c) 2015 Andrej Karpathy
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-import {SPNode, SPTree} from './sptree';
-
-type AugmSPNode = SPNode&{numCells: number, yCell: number[], rCell: number};
-
-/**
- * Barnes-hut approximation level. Higher means more approximation and faster
- * results. Recommended value mentioned in the paper is 0.8.
- */
-const THETA = 0.8;
-
-const MIN_POSSIBLE_PROB = 1E-9;
-
-// Variables used for memorizing the second random number since running
-// gaussRandom() generates two random numbers at the cost of 1 atomic
-// computation. This optimization results in 2X speed-up of the generator.
-let return_v = false;
-let v_val = 0.0;
-
-/** Returns the square euclidean distance between two vectors. */
-export function dist2(a: number[], b: number[]): number {
-  if (a.length !== b.length) {
-    throw new Error('Vectors a and b must be of same length');
-  }
-
-  let result = 0;
-  for (let i = 0; i < a.length; ++i) {
-    let diff = a[i] - b[i];
-    result += diff * diff;
-  }
-  return result;
-}
-
-/** Returns the square euclidean distance between two 2D points. */
-export function dist2_2D(a: number[], b: number[]): number {
-  let dX = a[0] - b[0];
-  let dY = a[1] - b[1];
-  return dX * dX + dY * dY;
-}
-
-/** Returns the square euclidean distance between two 3D points. */
-export function dist2_3D(a: number[], b: number[]): number {
-  let dX = a[0] - b[0];
-  let dY = a[1] - b[1];
-  let dZ = a[2] - b[2];
-  return dX * dX + dY * dY + dZ * dZ;
-}
-
-function gaussRandom(rng: () => number): number {
-  if (return_v) {
-    return_v = false;
-    return v_val;
-  }
-  let u = 2 * rng() - 1;
-  let v = 2 * rng() - 1;
-  let r = u * u + v * v;
-  if (r === 0 || r > 1) {
-    return gaussRandom(rng);
-  }
-  let c = Math.sqrt(-2 * Math.log(r) / r);
-  v_val = v * c;  // cache this for next function call for efficiency
-  return_v = true;
-  return u * c;
-};
-
-// return random normal number
-function randn(rng: () => number, mu: number, std: number) {
-  return mu + gaussRandom(rng) * std;
-};
-
-// utilitity that creates contiguous vector of zeros of size n
-function zeros(n: number): Float64Array {
-  return new Float64Array(n);
-};
-
-// utility that returns a matrix filled with random numbers
-// generated by the provided generator.
-function randnMatrix(n: number, d: number, rng: () => number) {
-  let nd = n * d;
-  let x = zeros(nd);
-  for (let i = 0; i < nd; ++i) {
-    x[i] = randn(rng, 0.0, 1E-4);
-  }
-  return x;
-};
-
-// utility that returns a matrix filled with the provided value.
-function arrayofs(n: number, d: number, val: number) {
-  let x: number[][] = [];
-  for (let i = 0; i < n; ++i) {
-    x.push(d === 3 ? [val, val, val] : [val, val]);
-  }
-  return x;
-};
-
-// compute (p_{i|j} + p_{j|i})/(2n)
-function nearest2P(
-    nearest: {index: number, dist: number}[][], perplexity: number,
-    tol: number) {
-  let N = nearest.length;
-  let Htarget = Math.log(perplexity);  // target entropy of distribution
-  let P = zeros(N * N);                // temporary probability matrix
-  let K = nearest[0].length;
-  let pRow: number[] = new Array(K);  // pij[].
-
-  for (let i = 0; i < N; ++i) {
-    let neighbors = nearest[i];
-    let betaMin = -Infinity;
-    let betaMax = Infinity;
-    let beta = 1;  // initial value of precision
-    let maxTries = 50;
-
-    // perform binary search to find a suitable precision beta
-    // so that the entropy of the distribution is appropriate
-    let numTries = 0;
-    while (true) {
-      // compute entropy and kernel row with beta precision
-      let psum = 0.0;
-      for (let k = 0; k < neighbors.length; ++k) {
-        let neighbor = neighbors[k];
-        let pij = (i === neighbor.index) ? 0 : Math.exp(-neighbor.dist * beta);
-        pij = Math.max(pij, MIN_POSSIBLE_PROB);
-        pRow[k] = pij;
-        psum += pij;
-      }
-      // normalize p and compute entropy
-      let Hhere = 0.0;
-      for (let k = 0; k < pRow.length; ++k) {
-        pRow[k] /= psum;
-        let pij = pRow[k];
-        if (pij > 1E-7) {
-          Hhere -= pij * Math.log(pij);
-        };
-      }
-
-      // adjust beta based on result
-      if (Hhere > Htarget) {
-        // entropy was too high (distribution too diffuse)
-        // so we need to increase the precision for more peaky distribution
-        betaMin = beta;  // move up the bounds
-        if (betaMax === Infinity) {
-          beta = beta * 2;
-        } else {
-          beta = (beta + betaMax) / 2;
-        }
-
-      } else {
-        // converse case. make distrubtion less peaky
-        betaMax = beta;
-        if (betaMin === -Infinity) {
-          beta = beta / 2;
-        } else {
-          beta = (beta + betaMin) / 2;
-        }
-      }
-      numTries++;
-      // stopping conditions: too many tries or got a good precision
-      if (numTries >= maxTries || Math.abs(Hhere - Htarget) < tol) {
-        break;
-      }
-    }
-
-    // copy over the final prow to P at row i
-    for (let k = 0; k < pRow.length; ++k) {
-      let pij = pRow[k];
-      let j = neighbors[k].index;
-      P[i * N + j] = pij;
-    }
-  }  // end loop over examples i
-
-  // symmetrize P and normalize it to sum to 1 over all ij
-  let N2 = N * 2;
-  for (let i = 0; i < N; ++i) {
-    for (let j = i + 1; j < N; ++j) {
-      let i_j = i * N + j;
-      let j_i = j * N + i;
-      let value = (P[i_j] + P[j_i]) / N2;
-      P[i_j] = value;
-      P[j_i] = value;
-    }
-  }
-  return P;
-};
-
-// helper function
-function sign(x: number) {
-  return x > 0 ? 1 : x < 0 ? -1 : 0;
-}
-
-function computeForce_2d(
-    force: number[], mult: number, pointA: number[], pointB: number[]) {
-  force[0] += mult * (pointA[0] - pointB[0]);
-  force[1] += mult * (pointA[1] - pointB[1]);
-}
-
-function computeForce_3d(
-    force: number[], mult: number, pointA: number[], pointB: number[]) {
-  force[0] += mult * (pointA[0] - pointB[0]);
-  force[1] += mult * (pointA[1] - pointB[1]);
-  force[2] += mult * (pointA[2] - pointB[2]);
-}
-
-export interface TSNEOptions {
-  /** How many dimensions. */
-  dim: number;
-  /** Roughly how many neighbors each point influences. */
-  perplexity?: number;
-  /** Learning rate. */
-  epsilon?: number;
-  /** A random number generator. */
-  rng?: () => number;
-}
-
-export class TSNE {
-  private perplexity: number;
-  private epsilon: number;
-  /** Random generator */
-  private rng: () => number;
-  private iter = 0;
-  private Y: Float64Array;
-  private N: number;
-  private P: Float64Array;
-  private gains: number[][];
-  private ystep: number[][];
-  private nearest: {index: number, dist: number}[][];
-  private dim: number;
-  private dist2: (a: number[], b: number[]) => number;
-  private computeForce:
-      (force: number[], mult: number, pointA: number[],
-       pointB: number[]) => void;
-
-  constructor(opt: TSNEOptions) {
-    opt = opt || {dim: 2};
-    this.perplexity = opt.perplexity || 30;
-    this.epsilon = opt.epsilon || 10;
-    this.rng = opt.rng || Math.random;
-    this.dim = opt.dim;
-    if (opt.dim === 2) {
-      this.dist2 = dist2_2D;
-      this.computeForce = computeForce_2d;
-    } else if (opt.dim === 3) {
-      this.dist2 = dist2_3D;
-      this.computeForce = computeForce_3d;
-    } else {
-      throw new Error('Only 2D and 3D is supported');
-    }
-  }
-
-  // this function takes a fattened distance matrix and creates
-  // matrix P from them.
-  // D is assumed to be provided as an array of size N^2.
-  initDataDist(nearest: {index: number, dist: number}[][]) {
-    let N = nearest.length;
-    this.nearest = nearest;
-    this.P = nearest2P(nearest, this.perplexity, 1E-4);
-    this.N = N;
-    this.initSolution();  // refresh this
-  }
-
-  // (re)initializes the solution to random
-  initSolution() {
-    // generate random solution to t-SNE
-    this.Y = randnMatrix(this.N, this.dim, this.rng);  // the solution
-    this.gains = arrayofs(this.N, this.dim, 1.0);      // step gains
-    // to accelerate progress in unchanging directions
-    this.ystep = arrayofs(this.N, this.dim, 0.0);  // momentum accumulator
-    this.iter = 0;
-  }
-
-  // return pointer to current solution
-  getSolution() { return this.Y; }
-
-  // perform a single step of optimization to improve the embedding
-  step() {
-    this.iter += 1;
-    let N = this.N;
-
-    let grad = this.costGrad(this.Y);  // evaluate gradient
-
-    // perform gradient step
-    let ymean = this.dim === 3 ? [0, 0, 0] : [0, 0];
-    for (let i = 0; i < N; ++i) {
-      for (let d = 0; d < this.dim; ++d) {
-        let gid = grad[i][d];
-        let sid = this.ystep[i][d];
-        let gainid = this.gains[i][d];
-
-        // compute gain update
-        let newgain = sign(gid) === sign(sid) ? gainid * 0.8 : gainid + 0.2;
-        if (newgain < 0.01) {
-          newgain = 0.01;  // clamp
-        }
-        this.gains[i][d] = newgain;  // store for next turn
-
-        // compute momentum step direction
-        let momval = this.iter < 250 ? 0.5 : 0.8;
-        let newsid = momval * sid - this.epsilon * newgain * grad[i][d];
-        this.ystep[i][d] = newsid;  // remember the step we took
-
-        // step!
-        let i_d = i * this.dim + d;
-        this.Y[i_d] += newsid;
-        ymean[d] += this.Y[i_d];  // accumulate mean so that we
-                                  // can center later
-      }
-    }
-
-    // reproject Y to be zero mean
-    for (let i = 0; i < N; ++i) {
-      for (let d = 0; d < this.dim; ++d) {
-        this.Y[i * this.dim + d] -= ymean[d] / N;
-      }
-    }
-  }
-
-  // return cost and gradient, given an arrangement
-  costGrad(Y: Float64Array): number[][] {
-    let N = this.N;
-    let P = this.P;
-
-    // Trick that helps with local optima.
-    let alpha = this.iter < 100 ? 4 : 1;
-
-    // Make data for the SP tree.
-    let points: number[][] = new Array(N);  // (x, y)[]
-    for (let i = 0; i < N; ++i) {
-      let iTimesD = i * this.dim;
-      let row = new Array(this.dim);
-      for (let d = 0; d < this.dim; ++d) {
-        row[d] = Y[iTimesD + d];
-      }
-      points[i] = row;
-    }
-
-    // Make a tree.
-    let tree = new SPTree(points);
-    let root = tree.root as AugmSPNode;
-    // Annotate the tree.
-
-    let annotateTree =
-        (node: AugmSPNode): {numCells: number, yCell: number[]} => {
-          let numCells = 1;
-          if (node.children == null) {
-            // Update the current node and tell the parent.
-            node.numCells = numCells;
-            node.yCell = node.point;
-            return {numCells, yCell: node.yCell};
-          }
-          // node.point is a 2 or 3-dim number[], so slice() makes a copy.
-          let yCell = node.point.slice();
-          for (let i = 0; i < node.children.length; ++i) {
-            let child = node.children[i];
-            if (child == null) {
-              continue;
-            }
-            let result = annotateTree(child as AugmSPNode);
-            numCells += result.numCells;
-            for (let d = 0; d < this.dim; ++d) {
-              yCell[d] += result.yCell[d];
-            }
-          }
-          // Update the node and tell the parent.
-          node.numCells = numCells;
-          node.yCell = yCell.map(v => v / numCells);
-          return {numCells, yCell};
-        };
-
-    // Augment the tree with more info.
-    annotateTree(root);
-    tree.visit((node: AugmSPNode, low: number[], high: number[]) => {
-      node.rCell = high[0] - low[0];
-      return false;
-    });
-    // compute current Q distribution, unnormalized first
-    let grad: number[][] = [];
-    let Z = 0;
-    let forces: [number[], number[]][] = new Array(N);
-    for (let i = 0; i < N; ++i) {
-      let pointI = points[i];
-      // Compute the positive forces for the i-th node.
-      let Fpos = this.dim === 3 ? [0, 0, 0] : [0, 0];
-      let neighbors = this.nearest[i];
-      for (let k = 0; k < neighbors.length; ++k) {
-        let j = neighbors[k].index;
-        let pij = P[i * N + j];
-        let pointJ = points[j];
-        let squaredDistItoJ = this.dist2(pointI, pointJ);
-        let premult = pij / (1 + squaredDistItoJ);
-        this.computeForce(Fpos, premult, pointI, pointJ);
-      }
-      // Compute the negative forces for the i-th node.
-      let FnegZ = this.dim === 3 ? [0, 0, 0] : [0, 0];
-      tree.visit((node: AugmSPNode) => {
-        let squaredDistToCell = this.dist2(pointI, node.yCell);
-        // Squared distance from point i to cell.
-        if (node.children == null ||
-            (squaredDistToCell > 0 &&
-             node.rCell / Math.sqrt(squaredDistToCell) < THETA)) {
-          let qijZ = 1 / (1 + squaredDistToCell);
-          let dZ = node.numCells * qijZ;
-          Z += dZ;
-          dZ *= qijZ;
-          this.computeForce(FnegZ, dZ, pointI, node.yCell);
-          return true;
-        }
-        // Cell is too close to approximate.
-        let squaredDistToPoint = this.dist2(pointI, node.point);
-        let qijZ = 1 / (1 + squaredDistToPoint);
-        Z += qijZ;
-        qijZ *= qijZ;
-        this.computeForce(FnegZ, qijZ, pointI, node.point);
-        return false;
-      }, true);
-      forces[i] = [Fpos, FnegZ];
-    }
-    // Normalize the negative forces and compute the gradient.
-    const A = 4 * alpha;
-    const B = 4 / Z;
-    for (let i = 0; i < N; ++i) {
-      let [FPos, FNegZ] = forces[i];
-      let gsum = new Array(this.dim);
-      for (let d = 0; d < this.dim; ++d) {
-        gsum[d] = A * FPos[d] - B * FNegZ[d];
-      }
-      grad.push(gsum);
-    }
-    return grad;
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts b/tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts
deleted file mode 100644
index 1410a84a8e..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/data-provider-demo.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataSet, SpriteAndMetadataInfo, State} from './data';
-import {ProjectorConfig, DataProvider, EmbeddingInfo, TENSORS_MSG_ID} from './data-provider';
-import * as dataProvider from './data-provider';
-import * as logging from './logging';
-
-const BYTES_EXTENSION = '.bytes';
-
-/** Data provider that loads data from a demo folder. */
-export class DemoDataProvider implements DataProvider {
-  private projectorConfigPath: string;
-  private projectorConfig: ProjectorConfig;
-
-  constructor(projectorConfigPath: string) {
-    this.projectorConfigPath = projectorConfigPath;
-  }
-
-  private getEmbeddingInfo(tensorName: string): EmbeddingInfo {
-    let embeddings = this.projectorConfig.embeddings;
-    for (let i = 0; i < embeddings.length; i++) {
-      let embedding = embeddings[i];
-      if (embedding.tensorName === tensorName) {
-        return embedding;
-      }
-    }
-    return null;
-  }
-
-  retrieveRuns(callback: (runs: string[]) => void): void {
-    callback(['Demo']);
-  }
-
-  retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void)
-      : void {
-    const msgId = logging.setModalMessage('Fetching projector config...');
-
-    const xhr = new XMLHttpRequest();
-    xhr.open('GET', this.projectorConfigPath);
-    xhr.onerror = (err) => {
-      let errorMessage = err.message;
-      // If the error is a valid XMLHttpResponse, it's possible this is a
-      // cross-origin error.
-      if (xhr.responseText != null) {
-        errorMessage = 'Cannot fetch projector config, possibly a ' +
-            'Cross-Origin request error.';
-      }
-      logging.setErrorMessage(errorMessage, 'fetching projector config');
-    };
-    xhr.onload = () => {
-      const projectorConfig = JSON.parse(xhr.responseText) as ProjectorConfig;
-      logging.setModalMessage(null, msgId);
-      this.projectorConfig = projectorConfig;
-      callback(projectorConfig);
-    };
-    xhr.send();
-  }
-
-  retrieveTensor(run: string, tensorName: string,
-      callback: (ds: DataSet) => void) {
-    let embedding = this.getEmbeddingInfo(tensorName);
-    let url = `${embedding.tensorPath}`;
-    if (embedding.tensorPath.substr(-1 * BYTES_EXTENSION.length) ===
-        BYTES_EXTENSION) {
-      dataProvider.retrieveTensorAsBytes(
-          this, this.getEmbeddingInfo(tensorName), run, tensorName, url,
-          callback);
-    } else {
-      logging.setModalMessage('Fetching tensors...', TENSORS_MSG_ID);
-      const request = new XMLHttpRequest();
-      request.open('GET', url);
-      request.responseType = 'arraybuffer';
-
-      request.onerror = () => {
-        logging.setErrorMessage(request.responseText, 'fetching tensors');
-      };
-      request.onload = () => {
-        dataProvider.parseTensors(request.response).then(points => {
-          callback(new DataSet(points));
-        });
-      };
-      request.send();
-    }
-  }
-
-  retrieveSpriteAndMetadata(run: string, tensorName: string,
-      callback: (r: SpriteAndMetadataInfo) => void) {
-    let embedding = this.getEmbeddingInfo(tensorName);
-    let spriteImagePath = null;
-    if (embedding.sprite && embedding.sprite.imagePath) {
-      spriteImagePath = embedding.sprite.imagePath;
-    }
-    dataProvider.retrieveSpriteAndMetadataInfo(
-        embedding.metadataPath, spriteImagePath, embedding.sprite, callback);
-  }
-
-  getBookmarks(
-      run: string, tensorName: string, callback: (r: State[]) => void) {
-    let embedding = this.getEmbeddingInfo(tensorName);
-    let msgId = logging.setModalMessage('Fetching bookmarks...');
-
-    const xhr = new XMLHttpRequest();
-    xhr.open('GET', embedding.bookmarksPath);
-    xhr.onerror = (err) => {
-      logging.setErrorMessage(xhr.responseText);
-    };
-    xhr.onload = () => {
-      const bookmarks = JSON.parse(xhr.responseText) as State[];
-      logging.setModalMessage(null, msgId);
-      callback(bookmarks);
-    };
-    xhr.send();
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider-proto.ts b/tensorflow/tensorboard/components/vz_projector/data-provider-proto.ts
deleted file mode 100644
index 67124a9232..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/data-provider-proto.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataPoint, DataProto, DataSet, SpriteAndMetadataInfo, PointMetadata, State} from './data';
-import {analyzeMetadata, ProjectorConfig, DataProvider} from './data-provider';
-
-
-export class ProtoDataProvider implements DataProvider {
-  private dataProto: DataProto;
-
-  constructor(dataProto: DataProto) {
-    this.dataProto = dataProto;
-  }
-
-  retrieveRuns(callback: (runs: string[]) => void): void {
-    callback(['proto']);
-  }
-
-  retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void) {
-    callback({
-      modelCheckpointPath: 'proto',
-      embeddings: [{
-        tensorName: 'proto',
-        tensorShape: this.dataProto.shape,
-        metadataPath: 'proto'
-      }]
-    });
-  }
-
-  retrieveTensor(run: string, tensorName: string,
-      callback: (ds: DataSet) => void) {
-    callback(this.flatArrayToDataset(this.dataProto.tensor));
-  }
-
-  retrieveSpriteAndMetadata(run: string, tensorName: string,
-      callback: (r: SpriteAndMetadataInfo) => void): void {
-    let columnNames = this.dataProto.metadata.columns.map(c => c.name);
-    let n = this.dataProto.shape[0];
-    let pointsMetadata: PointMetadata[] = new Array(n);
-    this.dataProto.metadata.columns.forEach(c => {
-      let values = c.numericValues || c.stringValues;
-      for (let i = 0; i < n; i++) {
-        pointsMetadata[i] = pointsMetadata[i] || {};
-        pointsMetadata[i][c.name] = values[i];
-      }
-    });
-    callback({
-      stats: analyzeMetadata(columnNames, pointsMetadata),
-      pointsInfo: pointsMetadata
-    });
-  }
-
-  getBookmarks(run: string, tensorName: string,
-      callback: (r: State[]) => void): void {
-    return callback([]);
-  }
-
-  private flatArrayToDataset(tensor: number[]): DataSet {
-    let points: DataPoint[] = [];
-    let n = this.dataProto.shape[0];
-    let d = this.dataProto.shape[1];
-    if (n * d !== tensor.length) {
-      throw 'The shape doesn\'t match the length of the flattened array';
-    }
-    for (let i = 0; i < n; i++) {
-      let offset = i * d;
-      points.push({
-        vector: new Float32Array(tensor.slice(offset, offset + d)),
-        metadata: {},
-        projections: null,
-        index: i
-      });
-    }
-    return new DataSet(points);
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider-server.ts b/tensorflow/tensorboard/components/vz_projector/data-provider-server.ts
deleted file mode 100644
index 02720ebf6a..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/data-provider-server.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataSet, SpriteAndMetadataInfo, State} from './data';
-import * as dataProvider from './data-provider';
-import {DataProvider, EmbeddingInfo, ProjectorConfig} from './data-provider';
-import * as logging from './logging';
-
-// Limit for the number of data points we receive from the server.
-export const LIMIT_NUM_POINTS = 100000;
-
-/**
- * Data provider that loads data provided by a python server (usually backed
- * by a checkpoint file).
- */
-export class ServerDataProvider implements DataProvider {
-  private routePrefix: string;
-  private runProjectorConfigCache: {[run: string]: ProjectorConfig} = {};
-
-  constructor(routePrefix: string) {
-    this.routePrefix = routePrefix;
-  }
-
-  private getEmbeddingInfo(run: string, tensorName: string,
-      callback: (e: EmbeddingInfo) => void): void {
-    this.retrieveProjectorConfig(run, config => {
-      const embeddings = config.embeddings;
-      for (let i = 0; i < embeddings.length; i++) {
-        const embedding = embeddings[i];
-        if (embedding.tensorName === tensorName) {
-          callback(embedding);
-          return;
-        }
-      }
-      callback(null);
-    });
-  }
-
-  retrieveRuns(callback: (runs: string[]) => void): void {
-    const msgId = logging.setModalMessage('Fetching runs...');
-
-    const xhr = new XMLHttpRequest();
-    xhr.open('GET', `${this.routePrefix}/runs`);
-    xhr.onerror = (err) => {
-      logging.setErrorMessage(xhr.responseText, 'fetching runs');
-    };
-    xhr.onload = () => {
-      const runs = JSON.parse(xhr.responseText);
-      logging.setModalMessage(null, msgId);
-      callback(runs);
-    };
-    xhr.send();
-  }
-
-  retrieveProjectorConfig(run: string, callback: (d: ProjectorConfig) => void)
-      : void {
-    if (run in this.runProjectorConfigCache) {
-      callback(this.runProjectorConfigCache[run]);
-      return;
-    }
-
-    const msgId = logging.setModalMessage('Fetching projector config...');
-
-    const xhr = new XMLHttpRequest();
-    xhr.open('GET', `${this.routePrefix}/info?run=${run}`);
-    xhr.onerror = (err) => {
-      logging.setErrorMessage(xhr.responseText, 'fetching projector config');
-    };
-    xhr.onload = () => {
-      const config = JSON.parse(xhr.responseText) as ProjectorConfig;
-      logging.setModalMessage(null, msgId);
-      this.runProjectorConfigCache[run] = config;
-      callback(config);
-    };
-    xhr.send();
-  }
-
-  retrieveTensor(run: string, tensorName: string,
-      callback: (ds: DataSet) => void) {
-    this.getEmbeddingInfo(run, tensorName, embedding => {
-      dataProvider.retrieveTensorAsBytes(
-          this, embedding, run, tensorName,
-          `${this.routePrefix}/tensor?run=${run}&name=${tensorName}` +
-              `&num_rows=${LIMIT_NUM_POINTS}`,
-          callback);
-    });
-  }
-
-  retrieveSpriteAndMetadata(run: string, tensorName: string,
-      callback: (r: SpriteAndMetadataInfo) => void) {
-    this.getEmbeddingInfo(run, tensorName, embedding => {
-      let metadataPath = null;
-      if (embedding.metadataPath) {
-        metadataPath =
-            `${this.routePrefix}/metadata?` +
-            `run=${run}&name=${tensorName}&num_rows=${LIMIT_NUM_POINTS}`;
-      }
-      let spriteImagePath = null;
-      if (embedding.sprite && embedding.sprite.imagePath) {
-        spriteImagePath =
-            `${this.routePrefix}/sprite_image?run=${run}&name=${tensorName}`;
-      }
-      dataProvider.retrieveSpriteAndMetadataInfo(metadataPath, spriteImagePath,
-          embedding.sprite, callback);
-    });
-  }
-
-  getBookmarks(
-      run: string, tensorName: string, callback: (r: State[]) => void) {
-    const msgId = logging.setModalMessage('Fetching bookmarks...');
-
-    const xhr = new XMLHttpRequest();
-    xhr.open(
-        'GET', `${this.routePrefix}/bookmarks?run=${run}&name=${tensorName}`);
-    xhr.onerror = (err) => {
-      logging.setErrorMessage(xhr.responseText, 'fetching bookmarks');
-    };
-    xhr.onload = () => {
-      logging.setModalMessage(null, msgId);
-      const bookmarks = JSON.parse(xhr.responseText);
-      callback(bookmarks);
-    };
-    xhr.send();
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider.ts b/tensorflow/tensorboard/components/vz_projector/data-provider.ts
deleted file mode 100644
index c8eede798c..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/data-provider.ts
+++ /dev/null
@@ -1,429 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {ColumnStats, DataPoint, DataSet, SpriteAndMetadataInfo, PointMetadata, State} from './data';
-import * as logging from './logging';
-import {runAsyncTask} from './util';
-
-/** Maximum number of colors supported in the color map. */
-const NUM_COLORS_COLOR_MAP = 50;
-const MAX_SPRITE_IMAGE_SIZE_PX = 8192;
-
-export const METADATA_MSG_ID = 'metadata';
-export const TENSORS_MSG_ID = 'tensors';
-
-/** Matches the json format of `projector_config.proto` */
-export interface SpriteMetadata {
-  imagePath: string;
-  singleImageDim: [number, number];
-}
-
-/** Matches the json format of `projector_config.proto` */
-export interface EmbeddingInfo {
-  /** Name of the tensor. */
-  tensorName: string;
-  /** The shape of the tensor. */
-  tensorShape: [number, number];
-  /**
-   * The path to the tensors TSV file. If empty, it is assumed that the tensor
-   * is stored in the checkpoint file.
-   */
-  tensorPath?: string;
-  /** The path to the metadata file associated with the tensor. */
-  metadataPath?: string;
-  /** The path to the bookmarks file associated with the tensor. */
-  bookmarksPath?: string;
-  sprite?: SpriteMetadata;
-}
-
-/**
- * Matches the json format of `projector_config.proto`
- * This should be kept in sync with the code in vz-projector-data-panel which
- * holds a template for users to build a projector config JSON object from the
- * projector UI.
- */
-export interface ProjectorConfig {
-  embeddings: EmbeddingInfo[];
-  modelCheckpointPath?: string;
-}
-
-export type ServingMode = 'demo' | 'server' | 'proto';
-
-/** Interface between the data storage and the UI. */
-export interface DataProvider {
-  /** Returns a list of run names that have embedding config files. */
-  retrieveRuns(callback: (runs: string[]) => void): void;
-
-  /**
-   * Returns the projector configuration: number of tensors, their shapes,
-   * and their associated metadata files.
-   */
-  retrieveProjectorConfig(run: string,
-      callback: (d: ProjectorConfig) => void): void;
-
-  /** Fetches and returns the tensor with the specified name. */
-  retrieveTensor(run: string, tensorName: string,
-      callback: (ds: DataSet) => void);
-
-  /**
-   * Fetches the metadata for the specified tensor.
-   */
-  retrieveSpriteAndMetadata(run: string, tensorName: string,
-      callback: (r: SpriteAndMetadataInfo) => void): void;
-
-  getBookmarks(run: string, tensorName: string, callback: (r: State[]) => void):
-      void;
-}
-
-export function retrieveTensorAsBytes(
-    dp: DataProvider, embedding: EmbeddingInfo, run: string, tensorName: string,
-    tensorsPath: string, callback: (ds: DataSet) => void) {
-  // Get the tensor.
-  logging.setModalMessage('Fetching tensor values...', TENSORS_MSG_ID);
-  let xhr = new XMLHttpRequest();
-  xhr.open('GET', tensorsPath);
-  xhr.responseType = 'arraybuffer';
-  xhr.onprogress = (ev) => {
-    if (ev.lengthComputable) {
-      let percent = (ev.loaded * 100 / ev.total).toFixed(1);
-      logging.setModalMessage(
-          'Fetching tensor values: ' + percent + '%', TENSORS_MSG_ID);
-    }
-  };
-  xhr.onload = () => {
-    if (xhr.status !== 200) {
-      let msg = String.fromCharCode.apply(null, new Uint8Array(xhr.response));
-      logging.setErrorMessage(msg, 'fetching tensors');
-      return;
-    }
-    let data: Float32Array;
-    try {
-      data = new Float32Array(xhr.response);
-    } catch (e) {
-      logging.setErrorMessage(e, 'parsing tensor bytes');
-      return;
-    }
-
-    let dim = embedding.tensorShape[1];
-    let N = data.length / dim;
-    if (embedding.tensorShape[0] > N) {
-      logging.setWarningMessage(
-          `Showing the first ${N.toLocaleString()}` +
-          ` of ${embedding.tensorShape[0].toLocaleString()} data points`);
-    }
-    parseTensorsFromFloat32Array(data, dim).then(dataPoints => {
-      callback(new DataSet(dataPoints));
-    });
-  };
-  xhr.send();
-}
-
-export function parseRawTensors(
-    content: ArrayBuffer, callback: (ds: DataSet) => void) {
-  parseTensors(content).then(data => {
-    callback(new DataSet(data));
-  });
-}
-
-export function parseRawMetadata(
-    contents: ArrayBuffer, callback: (r: SpriteAndMetadataInfo) => void) {
-  parseMetadata(contents).then(result => callback(result));
-}
-
-/**
- * Parse an ArrayBuffer in a streaming fashion line by line (or custom delim).
- * Can handle very large files.
- *
- * @param content The array buffer.
- * @param callback The callback called on each line.
- * @param chunkSize The size of each read chunk, defaults to ~1MB. (optional)
- * @param delim The delimiter used to split a line, defaults to '\n'. (optional)
- * @returns A promise for when it is finished.
- */
-function streamParse(
-    content: ArrayBuffer, callback: (line: string) => void, chunkSize = 1000000,
-    delim = '\n'): Promise<void> {
-  return new Promise<void>((resolve, reject) => {
-    let offset = 0;
-    let bufferSize = content.byteLength - 1;
-    let data = '';
-
-    function readHandler(str) {
-      offset += chunkSize;
-      let parts = str.split(delim);
-      let first = data + parts[0];
-      if (parts.length === 1) {
-        data = first;
-        readChunk(offset, chunkSize);
-        return;
-      }
-      data = parts[parts.length - 1];
-      callback(first);
-      for (let i = 1; i < parts.length - 1; i++) {
-        callback(parts[i]);
-      }
-      if (offset >= bufferSize) {
-        if (data) {
-          callback(data);
-        }
-        resolve();
-        return;
-      }
-      readChunk(offset, chunkSize);
-    }
-
-    function readChunk(offset: number, size: number) {
-      const contentChunk = content.slice(offset, offset + size);
-
-      const blob = new Blob([contentChunk]);
-      const file = new FileReader();
-      file.onload = (e: any) => readHandler(e.target.result);
-      file.readAsText(blob);
-    }
-
-    readChunk(offset, chunkSize);
-  });
-}
-
-/** Parses a tsv text file. */
-export function parseTensors(
-    content: ArrayBuffer, valueDelim = '\t'): Promise<DataPoint[]> {
-  logging.setModalMessage('Parsing tensors...', TENSORS_MSG_ID);
-
-  return new Promise<DataPoint[]>((resolve, reject) => {
-    const data: DataPoint[] = [];
-    let numDim: number;
-
-    streamParse(content, (line: string) => {
-      line = line.trim();
-      if (line === '') {
-        return;
-      }
-      const row = line.split(valueDelim);
-      const dataPoint: DataPoint = {
-        metadata: {},
-        vector: null,
-        index: data.length,
-        projections: null,
-      };
-      // If the first label is not a number, take it as the label.
-      if (isNaN(row[0] as any) || numDim === row.length - 1) {
-        dataPoint.metadata['label'] = row[0];
-        dataPoint.vector = new Float32Array(row.slice(1).map(Number));
-      } else {
-        dataPoint.vector = new Float32Array(row.map(Number));
-      }
-      data.push(dataPoint);
-      if (numDim == null) {
-        numDim = dataPoint.vector.length;
-      }
-      if (numDim !== dataPoint.vector.length) {
-        logging.setModalMessage(
-            'Parsing failed. Vector dimensions do not match');
-        throw Error('Parsing failed');
-      }
-      if (numDim <= 1) {
-        logging.setModalMessage(
-            'Parsing failed. Found a vector with only one dimension?');
-        throw Error('Parsing failed');
-      }
-    }).then(() => {
-      logging.setModalMessage(null, TENSORS_MSG_ID);
-      resolve(data);
-    });
-  });
-}
-
-/** Parses a tsv text file. */
-export function parseTensorsFromFloat32Array(data: Float32Array,
-    dim: number): Promise<DataPoint[]> {
-  return runAsyncTask('Parsing tensors...', () => {
-    const N = data.length / dim;
-    const dataPoints: DataPoint[] = [];
-    let offset = 0;
-    for (let i = 0; i < N; ++i) {
-      dataPoints.push({
-        metadata: {},
-        vector: data.subarray(offset, offset + dim),
-        index: i,
-        projections: null,
-      });
-      offset += dim;
-    }
-    return dataPoints;
-  }, TENSORS_MSG_ID).then(dataPoints => {
-    logging.setModalMessage(null, TENSORS_MSG_ID);
-    return dataPoints;
-  });
-}
-
-export function analyzeMetadata(
-    columnNames, pointsMetadata: PointMetadata[]): ColumnStats[] {
-  const columnStats: ColumnStats[] = columnNames.map(name => {
-    return {
-      name: name,
-      isNumeric: true,
-      tooManyUniqueValues: false,
-      min: Number.POSITIVE_INFINITY,
-      max: Number.NEGATIVE_INFINITY
-    };
-  });
-
-  const mapOfValues: [{[value: string]: number}] =
-      columnNames.map(() => new Object());
-
-  pointsMetadata.forEach(metadata => {
-    columnNames.forEach((name: string, colIndex: number) => {
-      const stats = columnStats[colIndex];
-      const map = mapOfValues[colIndex];
-      const value = metadata[name];
-
-      // Skip missing values.
-      if (value == null) {
-        return;
-      }
-
-      if (!stats.tooManyUniqueValues) {
-        if (value in map) {
-          map[value]++;
-        } else {
-          map[value] = 1;
-        }
-        if (Object.keys(map).length > NUM_COLORS_COLOR_MAP) {
-          stats.tooManyUniqueValues = true;
-        }
-      }
-      if (isNaN(value as any)) {
-        stats.isNumeric = false;
-      } else {
-        metadata[name] = +value;
-        stats.min = Math.min(stats.min, +value);
-        stats.max = Math.max(stats.max, +value);
-      }
-    });
-  });
-  columnStats.forEach((stats, colIndex) => {
-    stats.uniqueEntries = Object.keys(mapOfValues[colIndex]).map(label => {
-      return {label, count: mapOfValues[colIndex][label]};
-    });
-  });
-  return columnStats;
-}
-
-export function parseMetadata(content: ArrayBuffer):
-    Promise<SpriteAndMetadataInfo> {
-  logging.setModalMessage('Parsing metadata...', METADATA_MSG_ID);
-
-  return new Promise<SpriteAndMetadataInfo>((resolve, reject) => {
-    let pointsMetadata: PointMetadata[] = [];
-    let hasHeader = false;
-    let lineNumber = 0;
-    let columnNames = ['label'];
-    streamParse(content, (line: string) => {
-      if (line.trim().length === 0) {
-        return;
-      }
-      if (lineNumber === 0) {
-        hasHeader = line.indexOf('\t') >= 0;
-
-        // If the first row doesn't contain metadata keys, we assume that the
-        // values are labels.
-        if (hasHeader) {
-          columnNames = line.split('\t');
-          lineNumber++;
-          return;
-        }
-      }
-
-      lineNumber++;
-
-      let rowValues = line.split('\t');
-      let metadata: PointMetadata = {};
-      pointsMetadata.push(metadata);
-      columnNames.forEach((name: string, colIndex: number) => {
-        let value = rowValues[colIndex];
-        // Normalize missing values.
-        value = (value === '' ? null : value);
-        metadata[name] = value;
-      });
-    }).then(() => {
-      logging.setModalMessage(null, METADATA_MSG_ID);
-      resolve({
-        stats: analyzeMetadata(columnNames, pointsMetadata),
-        pointsInfo: pointsMetadata
-      });
-    });
-  });
-}
-
-export function fetchImage(url: string): Promise<HTMLImageElement> {
-  return new Promise<HTMLImageElement>((resolve, reject) => {
-    let image = new Image();
-    image.onload = () => resolve(image);
-    image.onerror = (err) => reject(err);
-    image.crossOrigin = '';
-    image.src = url;
-  });
-}
-
-export function retrieveSpriteAndMetadataInfo(metadataPath: string,
-    spriteImagePath: string, spriteMetadata: SpriteMetadata,
-    callback: (r: SpriteAndMetadataInfo) => void) {
-  let metadataPromise: Promise<SpriteAndMetadataInfo> = Promise.resolve({});
-  if (metadataPath) {
-    metadataPromise = new Promise<SpriteAndMetadataInfo>((resolve, reject) => {
-      logging.setModalMessage('Fetching metadata...', METADATA_MSG_ID);
-
-      const request = new XMLHttpRequest();
-      request.open('GET', metadataPath);
-      request.responseType = 'arraybuffer';
-
-      request.onerror = () => {
-        logging.setErrorMessage(request.responseText, 'fetching metadata');
-        reject();
-      };
-      request.onload = () => {
-        resolve(parseMetadata(request.response));
-      };
-      request.send(null);
-    });
-  }
-  let spriteMsgId = null;
-  let spritesPromise: Promise<HTMLImageElement> = null;
-  if (spriteImagePath) {
-    spriteMsgId = logging.setModalMessage('Fetching sprite image...');
-    spritesPromise = fetchImage(spriteImagePath);
-  }
-
-  // Fetch the metadata and the image in parallel.
-  Promise.all([metadataPromise, spritesPromise]).then(values => {
-    if (spriteMsgId) {
-      logging.setModalMessage(null, spriteMsgId);
-    }
-    const [metadata, spriteImage] = values;
-
-    if (spriteImage && (spriteImage.height > MAX_SPRITE_IMAGE_SIZE_PX ||
-                        spriteImage.width > MAX_SPRITE_IMAGE_SIZE_PX)) {
-      logging.setModalMessage(
-          `Error: Sprite image of dimensions ${spriteImage.width}px x ` +
-          `${spriteImage.height}px exceeds maximum dimensions ` +
-          `${MAX_SPRITE_IMAGE_SIZE_PX}px x ${MAX_SPRITE_IMAGE_SIZE_PX}px`);
-    } else {
-      metadata.spriteImage = spriteImage;
-      metadata.spriteMetadata = spriteMetadata;
-      callback(metadata);
-    }
-  });
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/data-provider_test.ts b/tensorflow/tensorboard/components/vz_projector/data-provider_test.ts
deleted file mode 100644
index 01b89ca700..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/data-provider_test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataPoint, SpriteAndMetadataInfo} from './data';
-import * as data_provider from './data-provider';
-
-/**
- * Converts a string to an ArrayBuffer.
- */
-function stringToArrayBuffer(str: string): Promise<ArrayBuffer> {
-  return new Promise<ArrayBuffer>((resolve, reject) => {
-    let blob = new Blob([str]);
-    let file = new FileReader();
-    file.onload = (e: any) => {
-      resolve(e.target.result);
-    };
-    file.readAsArrayBuffer(blob);
-  });
-}
-
-/**
- * Converts an data array to TSV format.
- */
-function dataToTsv(data: string[][]|number[][]) {
-  let lines = [];
-  for (let i = 0; i < data.length; i++) {
-    lines.push(data[i].join('\t'));
-  }
-  return lines.join('\n');
-}
-
-describe('parse tensors', () => {
-  it('parseTensors', (doneFn) => {
-    let tensors = [[1.0, 2.0], [2.0, 3.0]];
-    stringToArrayBuffer(dataToTsv(tensors))
-        .then((tensorsArrayBuffer: ArrayBuffer) => {
-          data_provider.parseTensors(tensorsArrayBuffer)
-              .then((data: DataPoint[]) => {
-                expect(data.length).toBe(2);
-
-                expect(data[0].vector).toEqual(new Float32Array(tensors[0]));
-                expect(data[0].index).toEqual(0);
-                expect(data[0].projections).toBeNull();
-
-                expect(data[1].vector).toEqual(new Float32Array(tensors[1]));
-                expect(data[1].index).toEqual(1);
-                expect(data[1].projections).toBeNull();
-                doneFn();
-              });
-        });
-  });
-  it('parseMetadata', (doneFn) => {
-    let metadata = [['label', 'fakecol'], ['Г', '0'], ['label1', '1']];
-
-    stringToArrayBuffer(dataToTsv(metadata))
-        .then((metadataArrayBuffer: ArrayBuffer) => {
-          data_provider.parseMetadata(metadataArrayBuffer)
-              .then((spriteAndMetadataInfo: SpriteAndMetadataInfo) => {
-                expect(spriteAndMetadataInfo.stats.length).toBe(2);
-                expect(spriteAndMetadataInfo.stats[0].name)
-                    .toBe(metadata[0][0]);
-                expect(spriteAndMetadataInfo.stats[0].isNumeric).toBe(false);
-                expect(spriteAndMetadataInfo.stats[0].tooManyUniqueValues)
-                    .toBe(false);
-                expect(spriteAndMetadataInfo.stats[1].name)
-                    .toBe(metadata[0][1]);
-                expect(spriteAndMetadataInfo.stats[1].isNumeric).toBe(true);
-                expect(spriteAndMetadataInfo.stats[1].tooManyUniqueValues)
-                    .toBe(false);
-
-                expect(spriteAndMetadataInfo.pointsInfo.length).toBe(2);
-                expect(spriteAndMetadataInfo.pointsInfo[0]['label'])
-                    .toBe(metadata[1][0]);
-                expect(spriteAndMetadataInfo.pointsInfo[0]['fakecol'])
-                    .toBe(+metadata[1][1]);
-                expect(spriteAndMetadataInfo.pointsInfo[1]['label'])
-                    .toBe(metadata[2][0]);
-                expect(spriteAndMetadataInfo.pointsInfo[1]['fakecol'])
-                    .toBe(+metadata[2][1]);
-                doneFn();
-              });
-        });
-  });
-});
diff --git a/tensorflow/tensorboard/components/vz_projector/data.ts b/tensorflow/tensorboard/components/vz_projector/data.ts
deleted file mode 100644
index 4b467aef2b..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/data.ts
+++ /dev/null
@@ -1,547 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {TSNE} from './bh_tsne';
-import {SpriteMetadata} from './data-provider';
-import * as knn from './knn';
-import * as logging from './logging';
-import * as scatterPlot from './scatterPlot';
-import * as util from './util';
-import * as vector from './vector';
-
-export type DistanceFunction = (a: number[], b: number[]) => number;
-export type ProjectionComponents3D = [string, string, string];
-
-export interface PointMetadata { [key: string]: number|string; }
-
-export interface DataProto {
-  shape: [number, number];
-  tensor: number[];
-  metadata: {
-    columns: Array<
-        {name: string; stringValues: string[]; numericValues: number[];}>;
-  };
-}
-
-/** Statistics for a metadata column. */
-export interface ColumnStats {
-  name: string;
-  isNumeric: boolean;
-  tooManyUniqueValues: boolean;
-  uniqueEntries?: Array<{label: string, count: number}>;
-  min: number;
-  max: number;
-}
-
-export interface SpriteAndMetadataInfo {
-  stats?: ColumnStats[];
-  pointsInfo?: PointMetadata[];
-  spriteImage?: HTMLImageElement;
-  spriteMetadata?: SpriteMetadata;
-}
-
-/** A single collection of points which make up a sequence through space. */
-export interface Sequence {
-  /** Indices into the DataPoints array in the Data object. */
-  pointIndices: number[];
-}
-
-export interface DataPoint {
-  /** The point in the original space. */
-  vector: Float32Array;
-
-  /*
-   * Metadata for each point. Each metadata is a set of key/value pairs
-   * where the value can be a string or a number.
-   */
-  metadata: PointMetadata;
-
-  /** index of the sequence, used for highlighting on click */
-  sequenceIndex?: number;
-
-  /** index in the original data source */
-  index: number;
-
-  /** This is where the calculated projections space are cached */
-  projections: {[key: string]: number};
-}
-
-const IS_FIREFOX = navigator.userAgent.toLowerCase().indexOf('firefox') >= 0;
-/** Controls whether nearest neighbors computation is done on the GPU or CPU. */
-const KNN_GPU_ENABLED = util.hasWebGLSupport() && !IS_FIREFOX;
-
-export const TSNE_SAMPLE_SIZE = 10000;
-export const PCA_SAMPLE_SIZE = 50000;
-/** Number of dimensions to sample when doing approximate PCA. */
-export const PCA_SAMPLE_DIM = 200;
-/** Number of pca components to compute. */
-const NUM_PCA_COMPONENTS = 10;
-/**
- * Reserved metadata attributes used for sequence information
- * NOTE: Use "__seq_next__" as "__next__" is deprecated.
- */
-const SEQUENCE_METADATA_ATTRS = ['__next__', '__seq_next__'];
-
-function getSequenceNextPointIndex(pointMetadata: PointMetadata): number|null {
-  let sequenceAttr = null;
-  for (let metadataAttr of SEQUENCE_METADATA_ATTRS) {
-    if (metadataAttr in pointMetadata && pointMetadata[metadataAttr] !== '') {
-      sequenceAttr = pointMetadata[metadataAttr];
-      break;
-    }
-  }
-  if (sequenceAttr == null) {
-    return null;
-  }
-  return +sequenceAttr;
-}
-
-/**
- * Dataset contains a DataPoints array that should be treated as immutable. This
- * acts as a working subset of the original data, with cached properties
- * from computationally expensive operations. Because creating a subset
- * requires normalizing and shifting the vector space, we make a copy of the
- * data so we can still always create new subsets based on the original data.
- */
-export class DataSet {
-  points: DataPoint[];
-  sequences: Sequence[];
-
-  shuffledDataIndices: number[] = [];
-
-  /**
-   * This keeps a list of all current projections so you can easily test to see
-   * if it's been calculated already.
-   */
-  projections = d3.set();
-  nearest: knn.NearestEntry[][];
-  nearestK: number;
-  tSNEIteration: number = 0;
-  tSNEShouldStop = true;
-  dim: [number, number] = [0, 0];
-  hasTSNERun: boolean = false;
-  spriteAndMetadataInfo: SpriteAndMetadataInfo;
-  fracVariancesExplained: number[];
-
-  private tsne: TSNE;
-
-  /** Creates a new Dataset */
-  constructor(
-      points: DataPoint[], spriteAndMetadataInfo?: SpriteAndMetadataInfo) {
-    this.points = points;
-    this.shuffledDataIndices = util.shuffle(util.range(this.points.length));
-    this.sequences = this.computeSequences(points);
-    this.dim = [this.points.length, this.points[0].vector.length];
-    this.spriteAndMetadataInfo = spriteAndMetadataInfo;
-  }
-
-  private computeSequences(points: DataPoint[]) {
-    // Keep a list of indices seen so we don't compute sequences for a given
-    // point twice.
-    let indicesSeen = new Int8Array(points.length);
-    // Compute sequences.
-    let indexToSequence: {[index: number]: Sequence} = {};
-    let sequences: Sequence[] = [];
-    for (let i = 0; i < points.length; i++) {
-      if (indicesSeen[i]) {
-        continue;
-      }
-      indicesSeen[i] = 1;
-
-      // Ignore points without a sequence attribute.
-      let next = getSequenceNextPointIndex(points[i].metadata);
-      if (next == null) {
-        continue;
-      }
-      if (next in indexToSequence) {
-        let existingSequence = indexToSequence[next];
-        // Pushing at the beginning of the array.
-        existingSequence.pointIndices.unshift(i);
-        indexToSequence[i] = existingSequence;
-        continue;
-      }
-      // The current point is pointing to a new/unseen sequence.
-      let newSequence: Sequence = {pointIndices: []};
-      indexToSequence[i] = newSequence;
-      sequences.push(newSequence);
-      let currentIndex = i;
-      while (points[currentIndex]) {
-        newSequence.pointIndices.push(currentIndex);
-        let next = getSequenceNextPointIndex(points[currentIndex].metadata);
-        if (next != null) {
-          indicesSeen[next] = 1;
-          currentIndex = next;
-        } else {
-          currentIndex = -1;
-        }
-      }
-    }
-    return sequences;
-  }
-
-  projectionCanBeRendered(projection: ProjectionType): boolean {
-    if (projection !== 'tsne') {
-      return true;
-    }
-    return this.tSNEIteration > 0;
-  }
-
-  /**
-   * Returns a new subset dataset by copying out data. We make a copy because
-   * we have to modify the vectors by normalizing them.
-   *
-   * @param subset Array of indices of points that we want in the subset.
-   *
-   * @return A subset of the original dataset.
-   */
-  getSubset(subset?: number[]): DataSet {
-    const pointsSubset = ((subset != null) && (subset.length > 0)) ?
-        subset.map(i => this.points[i]) :
-        this.points;
-    let points = pointsSubset.map(dp => {
-      return {
-        metadata: dp.metadata,
-        index: dp.index,
-        vector: dp.vector.slice(),
-        projections: {} as {[key: string]: number}
-      };
-    });
-    return new DataSet(points, this.spriteAndMetadataInfo);
-  }
-
-  /**
-   * Computes the centroid, shifts all points to that centroid,
-   * then makes them all unit norm.
-   */
-  normalize() {
-    // Compute the centroid of all data points.
-    let centroid = vector.centroid(this.points, a => a.vector);
-    if (centroid == null) {
-      throw Error('centroid should not be null');
-    }
-    // Shift all points by the centroid and make them unit norm.
-    for (let id = 0; id < this.points.length; ++id) {
-      let dataPoint = this.points[id];
-      dataPoint.vector = vector.sub(dataPoint.vector, centroid);
-      vector.unit(dataPoint.vector);
-    }
-  }
-
-  /** Projects the dataset onto a given vector and caches the result. */
-  projectLinear(dir: vector.Vector, label: string) {
-    this.projections.add(label);
-    this.points.forEach(dataPoint => {
-      dataPoint.projections[label] = vector.dot(dataPoint.vector, dir);
-    });
-  }
-
-  /** Projects the dataset along the top 10 principal components. */
-  projectPCA(): Promise<void> {
-    if (this.projections.has('pca-0')) {
-      return Promise.resolve<void>(null);
-    }
-    return util.runAsyncTask('Computing PCA...', () => {
-      // Approximate pca vectors by sampling the dimensions.
-      let dim = this.points[0].vector.length;
-      let vectors = this.shuffledDataIndices.map(i => this.points[i].vector);
-      if (dim > PCA_SAMPLE_DIM) {
-        vectors = vector.projectRandom(vectors, PCA_SAMPLE_DIM);
-      }
-      let sampledVectors = vectors.slice(0, PCA_SAMPLE_SIZE);
-
-      let sigma = numeric.div(
-          numeric.dot(numeric.transpose(sampledVectors), sampledVectors),
-          sampledVectors.length);
-      let svd = numeric.svd(sigma);
-
-      let variances: number[] = svd.S;
-      let totalVariance = 0;
-      for (let i = 0; i < variances.length; ++i) {
-        totalVariance += variances[i];
-      }
-      for (let i = 0; i < variances.length; ++i) {
-        variances[i] /= totalVariance;
-      }
-      this.fracVariancesExplained = variances;
-
-      let U: number[][] = svd.U;
-      let pcaVectors = vectors.map(vector => {
-        let newV = new Float32Array(NUM_PCA_COMPONENTS);
-        for (let newDim = 0; newDim < NUM_PCA_COMPONENTS; newDim++) {
-          let dot = 0;
-          for (let oldDim = 0; oldDim < vector.length; oldDim++) {
-            dot += vector[oldDim] * U[oldDim][newDim];
-          }
-          newV[newDim] = dot;
-        }
-        return newV;
-      });
-      for (let d = 0; d < NUM_PCA_COMPONENTS; d++) {
-        let label = 'pca-' + d;
-        this.projections.add(label);
-        for (let i = 0; i < pcaVectors.length; i++) {
-          let pointIndex = this.shuffledDataIndices[i];
-          this.points[pointIndex].projections[label] = pcaVectors[i][d];
-        }
-      }
-    });
-  }
-
-  /** Runs tsne on the data. */
-  projectTSNE(
-      perplexity: number, learningRate: number, tsneDim: number,
-      stepCallback: (iter: number) => void) {
-    this.hasTSNERun = true;
-    let k = Math.floor(3 * perplexity);
-    let opt = {epsilon: learningRate, perplexity: perplexity, dim: tsneDim};
-    this.tsne = new TSNE(opt);
-    this.tSNEShouldStop = false;
-    this.tSNEIteration = 0;
-
-    let sampledIndices = this.shuffledDataIndices.slice(0, TSNE_SAMPLE_SIZE);
-    let step = () => {
-      if (this.tSNEShouldStop) {
-        stepCallback(null);
-        this.tsne = null;
-        return;
-      }
-      this.tsne.step();
-      let result = this.tsne.getSolution();
-      sampledIndices.forEach((index, i) => {
-        let dataPoint = this.points[index];
-
-        dataPoint.projections['tsne-0'] = result[i * tsneDim + 0];
-        dataPoint.projections['tsne-1'] = result[i * tsneDim + 1];
-        if (tsneDim === 3) {
-          dataPoint.projections['tsne-2'] = result[i * tsneDim + 2];
-        }
-      });
-      this.tSNEIteration++;
-      stepCallback(this.tSNEIteration);
-      requestAnimationFrame(step);
-    };
-
-    // Nearest neighbors calculations.
-    let knnComputation: Promise<knn.NearestEntry[][]>;
-
-    if (this.nearest != null && k === this.nearestK) {
-      // We found the nearest neighbors before and will reuse them.
-      knnComputation = Promise.resolve(this.nearest);
-    } else {
-      let sampledData = sampledIndices.map(i => this.points[i]);
-      this.nearestK = k;
-      knnComputation = KNN_GPU_ENABLED ?
-          knn.findKNNGPUCosine(sampledData, k, (d => d.vector)) :
-          knn.findKNN(
-              sampledData, k, (d => d.vector),
-              (a, b, limit) => vector.cosDistNorm(a, b));
-    }
-    knnComputation.then(nearest => {
-      this.nearest = nearest;
-      util.runAsyncTask('Initializing T-SNE...', () => {
-            this.tsne.initDataDist(this.nearest);
-          }).then(step);
-    });
-  }
-
-  /**
-   * Merges metadata to the dataset and returns whether it succeeded.
-   */
-  mergeMetadata(metadata: SpriteAndMetadataInfo): boolean {
-    if (metadata.pointsInfo.length !== this.points.length) {
-      let errorMessage = `Number of tensors (${this.points.length}) do not` +
-          ` match the number of lines in metadata` +
-          ` (${metadata.pointsInfo.length}).`;
-
-      if (metadata.stats.length === 1 &&
-          this.points.length + 1 === metadata.pointsInfo.length) {
-        // If there is only one column of metadata and the number of points is
-        // exactly one less than the number of metadata lines, this is due to an
-        // unnecessary header line in the metadata and we can show a meaningful
-        // error.
-        logging.setErrorMessage(
-            errorMessage + ' Single column metadata should not have a header ' +
-                'row.',
-            'merging metadata');
-        return false;
-      } else if (
-          metadata.stats.length > 1 &&
-          this.points.length - 1 === metadata.pointsInfo.length) {
-        // If there are multiple columns of metadata and the number of points is
-        // exactly one greater than the number of lines in the metadata, this
-        // means there is a missing metadata header.
-        logging.setErrorMessage(
-            errorMessage + ' Multi-column metadata should have a header ' +
-                'row with column labels.',
-            'merging metadata');
-        return false;
-      }
-
-      logging.setWarningMessage(errorMessage);
-    }
-    this.spriteAndMetadataInfo = metadata;
-    metadata.pointsInfo.slice(0, this.points.length)
-        .forEach((m, i) => this.points[i].metadata = m);
-    return true;
-  }
-
-  stopTSNE() {
-    this.tSNEShouldStop = true;
-  }
-
-  /**
-   * Finds the nearest neighbors of the query point using a
-   * user-specified distance metric.
-   */
-  findNeighbors(pointIndex: number, distFunc: DistanceFunction, numNN: number):
-      knn.NearestEntry[] {
-    // Find the nearest neighbors of a particular point.
-    let neighbors = knn.findKNNofPoint(
-        this.points, pointIndex, numNN, (d => d.vector), distFunc);
-    // TODO(smilkov): Figure out why we slice.
-    let result = neighbors.slice(0, numNN);
-    return result;
-  }
-
-  /**
-   * Search the dataset based on a metadata field.
-   */
-  query(query: string, inRegexMode: boolean, fieldName: string): number[] {
-    let predicate = util.getSearchPredicate(query, inRegexMode, fieldName);
-    let matches: number[] = [];
-    this.points.forEach((point, id) => {
-      if (predicate(point)) {
-        matches.push(id);
-      }
-    });
-    return matches;
-  }
-}
-
-export type ProjectionType = 'tsne' | 'pca' | 'custom';
-
-export class Projection {
-  constructor(
-      public projectionType: ProjectionType,
-      public projectionComponents: ProjectionComponents3D,
-      public dimensionality: number, public dataSet: DataSet) {}
-}
-
-export interface ColorOption {
-  name: string;
-  desc?: string;
-  map?: (value: string|number) => string;
-  /** List of items for the color map. Defined only for categorical map. */
-  items?: {label: string, count: number}[];
-  /** Threshold values and their colors. Defined for gradient color map. */
-  thresholds?: {value: number, color: string}[];
-  isSeparator?: boolean;
-  tooManyUniqueValues?: boolean;
-}
-
-/**
- * An interface that holds all the data for serializing the current state of
- * the world.
- */
-export class State {
-  /** A label identifying this state. */
-  label: string = '';
-
-  /** Whether this State is selected in the bookmarks pane. */
-  isSelected: boolean = false;
-
-  /** The selected projection tab. */
-  selectedProjection: ProjectionType;
-
-  /** Dimensions of the DataSet. */
-  dataSetDimensions: [number, number];
-
-  /** t-SNE parameters */
-  tSNEIteration: number = 0;
-  tSNEPerplexity: number = 0;
-  tSNELearningRate: number = 0;
-  tSNEis3d: boolean = true;
-
-  /** PCA projection component dimensions */
-  pcaComponentDimensions: number[] = [];
-
-  /** Custom projection parameters */
-  customSelectedSearchByMetadataOption: string;
-  customXLeftText: string;
-  customXLeftRegex: boolean;
-  customXRightText: string;
-  customXRightRegex: boolean;
-  customYUpText: string;
-  customYUpRegex: boolean;
-  customYDownText: string;
-  customYDownRegex: boolean;
-
-  /** The computed projections of the tensors. */
-  projections: Array<{[key: string]: number}> = [];
-
-  /** Filtered dataset indices. */
-  filteredPoints: number[];
-
-  /** The indices of selected points. */
-  selectedPoints: number[] = [];
-
-  /** Camera state (2d/3d, position, target, zoom, etc). */
-  cameraDef: scatterPlot.CameraDef;
-
-  /** Color by option. */
-  selectedColorOptionName: string;
-  forceCategoricalColoring: boolean;
-
-  /** Label by option. */
-  selectedLabelOption: string;
-}
-
-export function getProjectionComponents(
-    projection: ProjectionType,
-    components: (number|string)[]): ProjectionComponents3D {
-  if (components.length > 3) {
-    throw new RangeError('components length must be <= 3');
-  }
-  const projectionComponents: [string, string, string] = [null, null, null];
-  const prefix = (projection === 'custom') ? 'linear' : projection;
-  for (let i = 0; i < components.length; ++i) {
-    if (components[i] == null) {
-      continue;
-    }
-    projectionComponents[i] = prefix + '-' + components[i];
-  }
-  return projectionComponents;
-}
-
-export function stateGetAccessorDimensions(state: State): Array<number|string> {
-  let dimensions: Array<number|string>;
-  switch (state.selectedProjection) {
-    case 'pca':
-      dimensions = state.pcaComponentDimensions.slice();
-      break;
-    case 'tsne':
-      dimensions = [0, 1];
-      if (state.tSNEis3d) {
-        dimensions.push(2);
-      }
-      break;
-    case 'custom':
-      dimensions = ['x', 'y'];
-      break;
-    default:
-      throw new Error('Unexpected fallthrough');
-  }
-  return dimensions;
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/data_test.ts b/tensorflow/tensorboard/components/vz_projector/data_test.ts
deleted file mode 100644
index 924ae3a929..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/data_test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataPoint, DataSet, State, stateGetAccessorDimensions} from './data';
-
-/**
- * Helper method that makes a list of points given an array of
- * sequence indexes.
- *
- * @param sequences The i-th entry holds the 'next' attribute for the i-th
- * point.
- */
-function makePointsWithSequences(
-    sequences: number[], nextAttr = '__seq_next__') {
-  let points: DataPoint[] = [];
-  sequences.forEach((t, i) => {
-    let metadata: {[key: string]: any} = {};
-    metadata[nextAttr] = t >= 0 ? t : null;
-    points.push({
-      vector: new Float32Array(0),
-      metadata: metadata,
-      projections: {},
-      index: i
-    });
-  });
-  return points;
-}
-
-describe('constructor_with_sequences', () => {
-  it('Simple forward pointing sequences, __seq_next__ metadata format', () => {
-    // The input is: 0->2, 1->None, 2->3, 3->None. This should return
-    // one sequence 0->2->3.
-    const points = makePointsWithSequences([2, -1, 3, -1]);
-    let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(1);
-    expect(dataset.sequences[0].pointIndices).toEqual([0, 2, 3]);
-  });
-
-  it('Simple forward pointing sequences, __next__ metadata format', () => {
-    // The input is: 0->2, 1->None, 2->3, 3->None. This should return
-    // one sequence 0->2->3.
-    const points = makePointsWithSequences([2, -1, 3, -1], '__next__');
-    let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(1);
-    expect(dataset.sequences[0].pointIndices).toEqual([0, 2, 3]);
-  });
-
-  it('No sequences', () => {
-    let points = makePointsWithSequences([-1, -1, -1, -1]);
-    let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(0);
-  });
-
-  it('A sequence that goes backwards and forward in the array', () => {
-    // The input is: 0->2, 1->0, 2->nothing, 3->1. This should return
-    // one sequence 3->1->0->2.
-    let points = makePointsWithSequences([2, 0, -1, 1]);
-    let dataset = new DataSet(points);
-    expect(dataset.sequences.length).toEqual(1);
-    expect(dataset.sequences[0].pointIndices).toEqual([3, 1, 0, 2]);
-  });
-});
-
-describe('stateGetAccessorDimensions', () => {
-  it('returns [0, 1] for 2d t-SNE', () => {
-    const state = new State();
-    state.selectedProjection = 'tsne';
-    state.tSNEis3d = false;
-    expect(stateGetAccessorDimensions(state)).toEqual([0, 1]);
-  });
-
-  it('returns [0, 1, 2] for 3d t-SNE', () => {
-    const state = new State();
-    state.selectedProjection = 'tsne';
-    state.tSNEis3d = true;
-    expect(stateGetAccessorDimensions(state)).toEqual([0, 1, 2]);
-  });
-
-  it('returns pca component dimensions array for pca', () => {
-    const state = new State();
-    state.selectedProjection = 'pca';
-    state.pcaComponentDimensions = [13, 12, 11, 10];
-    expect(stateGetAccessorDimensions(state))
-        .toEqual(state.pcaComponentDimensions);
-  });
-
-  it('returns ["x", "y"] for custom projections', () => {
-    const state = new State();
-    state.selectedProjection = 'custom';
-    expect(stateGetAccessorDimensions(state)).toEqual(['x', 'y']);
-  });
-});
diff --git a/tensorflow/tensorboard/components/vz_projector/external.d.ts b/tensorflow/tensorboard/components/vz_projector/external.d.ts
deleted file mode 100644
index cbc1512c21..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/external.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// TODO(smilkov): Split into weblas.d.ts and numeric.d.ts and write
-// typings for numeric.
-interface Tensor {
-  new(size: [number, number], data: Float32Array);
-  transfer(): Float32Array;
-  delete(): void;
-}
-
-interface Weblas {
-  sgemm(M: number, N: number, K: number, alpha: number,
-      A: Float32Array, B: Float32Array, beta: number, C: Float32Array):
-      Float32Array;
-  pipeline: {
-     Tensor: Tensor;
-     sgemm(alpha: number, A: Tensor, B: Tensor, beta: number,
-         C: Tensor): Tensor;
-  };
-  util: {
-    transpose(M: number, N: number, data: Float32Array): Tensor;
-  };
-
-}
-
-declare let numeric: any;
-declare let weblas: Weblas;
-
-interface AnalyticsEventType {
-  hitType: string;
-  page?: string;
-  eventCategory?: string;
-  eventAction?: string;
-  eventLabel?: string;
-  eventValue?: number;
-}
-
-declare let ga: (command: string, eventObj: AnalyticsEventType) => void;
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/vz_projector/heap.ts b/tensorflow/tensorboard/components/vz_projector/heap.ts
deleted file mode 100644
index ac3144e649..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/heap.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/** Min key heap. */
-export type HeapItem<T> = {
-  key: number,
-  value: T
-};
-
-/**
- * Min-heap data structure. Provides O(1) for peek, returning the smallest key.
- */
-// TODO(jart): Rename to Heap and use Comparator.
-export class MinHeap<T> {
-  private arr: HeapItem<T>[] = [];
-
-  /** Push an element with the provided key. */
-  push(key: number, value: T): void {
-    this.arr.push({key, value});
-    this.bubbleUp(this.arr.length - 1);
-  }
-
-  /** Pop the element with the smallest key. */
-  pop(): HeapItem<T> {
-    if (this.arr.length === 0) {
-      throw new Error('pop() called on empty binary heap');
-    }
-    let item = this.arr[0];
-    let last = this.arr.length - 1;
-    this.arr[0] = this.arr[last];
-    this.arr.pop();
-    if (last > 0) {
-      this.bubbleDown(0);
-    }
-    return item;
-  };
-
-  /** Returns, but doesn't remove the element with the smallest key */
-  peek(): HeapItem<T> { return this.arr[0]; }
-
-  /**
-   * Pops the element with the smallest key and at the same time
-   * adds the newly provided element. This is faster than calling
-   * pop() and push() separately.
-   */
-  popPush(key: number, value: T): HeapItem<T> {
-    if (this.arr.length === 0) {
-      throw new Error('pop() called on empty binary heap');
-    }
-    let item = this.arr[0];
-    this.arr[0] = {key, value};
-    if (this.arr.length > 0) {
-      this.bubbleDown(0);
-    }
-    return item;
-  }
-
-  /** Returns the number of elements in the heap. */
-  size(): number { return this.arr.length; }
-
-  /** Returns all the items in the heap. */
-  items(): HeapItem<T>[] { return this.arr; }
-
-  private swap(a: number, b: number) {
-    let temp = this.arr[a];
-    this.arr[a] = this.arr[b];
-    this.arr[b] = temp;
-  }
-
-  private bubbleDown(pos: number) {
-    let left = (pos << 1) + 1;
-    let right = left + 1;
-    let largest = pos;
-    if (left < this.arr.length && this.arr[left].key < this.arr[largest].key) {
-      largest = left;
-    }
-    if (right < this.arr.length &&
-        this.arr[right].key < this.arr[largest].key) {
-      largest = right;
-    }
-    if (largest !== pos) {
-      this.swap(largest, pos);
-      this.bubbleDown(largest);
-    }
-  }
-
-  private bubbleUp(pos: number) {
-    if (pos <= 0) {
-      return;
-    }
-    let parent = ((pos - 1) >> 1);
-    if (this.arr[pos].key < this.arr[parent].key) {
-      this.swap(pos, parent);
-      this.bubbleUp(parent);
-    }
-  }
-}
-
-/** List that keeps the K elements with the smallest keys. */
-export class KMin<T> {
-  private k: number;
-  private maxHeap = new MinHeap<T>();
-
-  /** Constructs a new k-min data structure with the provided k. */
-  constructor(k: number) { this.k = k; }
-
-  /** Adds an element to the list. */
-  add(key: number, value: T) {
-    if (this.maxHeap.size() < this.k) {
-      this.maxHeap.push(-key, value);
-      return;
-    }
-    let largest = this.maxHeap.peek();
-    // If the new element is smaller, replace the largest with the new element.
-    if (key < -largest.key) {
-      this.maxHeap.popPush(-key, value);
-    }
-  }
-
-  /** Returns the k items with the smallest keys. */
-  getMinKItems(): T[] {
-    let items = this.maxHeap.items();
-    items.sort((a, b) => b.key - a.key);
-    return items.map(a => a.value);
-  }
-
-  /** Returns the size of the list. */
-  getSize(): number { return this.maxHeap.size(); }
-
-  /** Returns the largest key in the list. */
-  getLargestKey(): number {
-    return this.maxHeap.size() === 0 ? null : -this.maxHeap.peek().key;
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/knn.ts b/tensorflow/tensorboard/components/vz_projector/knn.ts
deleted file mode 100644
index 906e077b5d..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/knn.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {runAsyncTask} from './util';
-import * as logging from './logging';
-import {KMin} from './heap';
-import {Vector} from './vector';
-import * as vector from './vector';
-
-export type NearestEntry = {
-  index: number,
-  dist: number
-};
-
-/**
- * Optimal size for the height of the matrix when doing computation on the GPU
- * using WebGL. This was found experimentally.
- *
- * This also guarantees that for computing pair-wise distance for up to 10K
- * vectors, no more than 40MB will be allocated in the GPU. Without the
- * allocation limit, we can freeze the graphics of the whole OS.
- */
-const OPTIMAL_GPU_BLOCK_SIZE = 256;
-/** Id of message box used for knn gpu progress bar. */
-const KNN_GPU_MSG_ID = 'knn-gpu';
-
-/**
- * Returns the K nearest neighbors for each vector where the distance
- * computation is done on the GPU (WebGL) using cosine distance.
- *
- * @param dataPoints List of data points, where each data point holds an
- *   n-dimensional vector.
- * @param k Number of nearest neighbors to find.
- * @param accessor A method that returns the vector, given the data point.
- */
-export function findKNNGPUCosine<T>(
-    dataPoints: T[], k: number,
-    accessor: (dataPoint: T) => Float32Array): Promise<NearestEntry[][]> {
-  let N = dataPoints.length;
-  let dim = accessor(dataPoints[0]).length;
-
-  // The goal is to compute a large matrix multiplication A*A.T where A is of
-  // size NxD and A.T is its transpose. This results in a NxN matrix which
-  // could be too big to store on the GPU memory. To avoid memory overflow, we
-  // compute multiple A*partial_A.T where partial_A is of size BxD (B is much
-  // smaller than N). This results in storing only NxB size matrices on the GPU
-  // at a given time.
-
-  // A*A.T will give us NxN matrix holding the cosine distance between every
-  // pair of points, which we sort using KMin data structure to obtain the
-  // K nearest neighbors for each point.
-  let typedArray = vector.toTypedArray(dataPoints, accessor);
-  let bigMatrix = new weblas.pipeline.Tensor([N, dim], typedArray);
-  let nearest: NearestEntry[][] = new Array(N);
-  let numPieces = Math.ceil(N / OPTIMAL_GPU_BLOCK_SIZE);
-  let M = Math.floor(N / numPieces);
-  let modulo = N % numPieces;
-  let offset = 0;
-  let progress = 0;
-  let progressDiff = 1 / (2 * numPieces);
-  let piece = 0;
-
-  function step(resolve: (result: NearestEntry[][]) => void) {
-    let progressMsg =
-        'Finding nearest neighbors: ' + (progress * 100).toFixed() + '%';
-    runAsyncTask(progressMsg, () => {
-      let B = piece < modulo ? M + 1 : M;
-      let typedB = new Float32Array(B * dim);
-      for (let i = 0; i < B; ++i) {
-        let vector = accessor(dataPoints[offset + i]);
-        for (let d = 0; d < dim; ++d) {
-          typedB[i * dim + d] = vector[d];
-        }
-      }
-      let partialMatrix = new weblas.pipeline.Tensor([B, dim], typedB);
-      // Result is N x B matrix.
-      let result =
-          weblas.pipeline.sgemm(1, bigMatrix, partialMatrix, null, null);
-      let partial = result.transfer();
-      partialMatrix.delete();
-      result.delete();
-      progress += progressDiff;
-      for (let i = 0; i < B; i++) {
-        let kMin = new KMin<NearestEntry>(k);
-        let iReal = offset + i;
-        for (let j = 0; j < N; j++) {
-          if (j === iReal) {
-            continue;
-          }
-          let cosDist = 1 - partial[j * B + i];  // [j, i];
-          kMin.add(cosDist, {index: j, dist: cosDist});
-        }
-        nearest[iReal] = kMin.getMinKItems();
-      }
-      progress += progressDiff;
-      offset += B;
-      piece++;
-    }, KNN_GPU_MSG_ID).then(() => {
-      if (piece < numPieces) {
-        step(resolve);
-      } else {
-        logging.setModalMessage(null, KNN_GPU_MSG_ID);
-        bigMatrix.delete();
-        resolve(nearest);
-      }
-    }, error => {
-      // GPU failed. Reverting back to CPU.
-      logging.setModalMessage(null, KNN_GPU_MSG_ID);
-      let distFunc = (a, b, limit) => vector.cosDistNorm(a, b);
-      findKNN(dataPoints, k, accessor, distFunc).then(nearest => {
-        resolve(nearest);
-      });
-    });
-  }
-  return new Promise<NearestEntry[][]>(resolve => step(resolve));
-}
-
-/**
- * Returns the K nearest neighbors for each vector where the distance
- * computation is done on the CPU using a user-specified distance method.
- *
- * @param dataPoints List of data points, where each data point holds an
- *   n-dimensional vector.
- * @param k Number of nearest neighbors to find.
- * @param accessor A method that returns the vector, given the data point.
- * @param dist Method that takes two vectors and a limit, and computes the
- *   distance between two vectors, with the ability to stop early if the
- *   distance is above the limit.
- */
-export function findKNN<T>(
-    dataPoints: T[], k: number, accessor: (dataPoint: T) => Float32Array,
-    dist: (a: Vector, b: Vector, limit: number) =>
-        number): Promise<NearestEntry[][]> {
-  return runAsyncTask<NearestEntry[][]>('Finding nearest neighbors...', () => {
-    let N = dataPoints.length;
-    let nearest: NearestEntry[][] = new Array(N);
-    // Find the distances from node i.
-    let kMin: KMin<NearestEntry>[] = new Array(N);
-    for (let i = 0; i < N; i++) {
-      kMin[i] = new KMin<NearestEntry>(k);
-    }
-    for (let i = 0; i < N; i++) {
-      let a = accessor(dataPoints[i]);
-      let kMinA = kMin[i];
-      for (let j = i + 1; j < N; j++) {
-        let kMinB = kMin[j];
-        let limitI = kMinA.getSize() === k ?
-            kMinA.getLargestKey() || Number.MAX_VALUE :
-            Number.MAX_VALUE;
-        let limitJ = kMinB.getSize() === k ?
-            kMinB.getLargestKey() || Number.MAX_VALUE :
-            Number.MAX_VALUE;
-        let limit = Math.max(limitI, limitJ);
-        let dist2ItoJ = dist(a, accessor(dataPoints[j]), limit);
-        if (dist2ItoJ >= 0) {
-          kMinA.add(dist2ItoJ, {index: j, dist: dist2ItoJ});
-          kMinB.add(dist2ItoJ, {index: i, dist: dist2ItoJ});
-        }
-      }
-    }
-    for (let i = 0; i < N; i++) {
-      nearest[i] = kMin[i].getMinKItems();
-    }
-    return nearest;
-  });
-}
-
-/** Calculates the minimum distance between a search point and a rectangle. */
-function minDist(
-    point: [number, number], x1: number, y1: number, x2: number, y2: number) {
-  let x = point[0];
-  let y = point[1];
-  let dx1 = x - x1;
-  let dx2 = x - x2;
-  let dy1 = y - y1;
-  let dy2 = y - y2;
-
-  if (dx1 * dx2 <= 0) {    // x is between x1 and x2
-    if (dy1 * dy2 <= 0) {  // (x,y) is inside the rectangle
-      return 0;            // return 0 as point is in rect
-    }
-    return Math.min(Math.abs(dy1), Math.abs(dy2));
-  }
-  if (dy1 * dy2 <= 0) {  // y is between y1 and y2
-    // We know it is already inside the rectangle
-    return Math.min(Math.abs(dx1), Math.abs(dx2));
-  }
-  let corner: [number, number];
-  if (x > x2) {
-    // Upper-right vs lower-right.
-    corner = y > y2 ? [x2, y2] : [x2, y1];
-  } else {
-    // Upper-left vs lower-left.
-    corner = y > y2 ? [x1, y2] : [x1, y1];
-  }
-  return Math.sqrt(vector.dist22D([x, y], corner));
-}
-
-/**
- * Returns the nearest neighbors of a particular point.
- *
- * @param dataPoints List of data points.
- * @param pointIndex The index of the point we need the nearest neighbors of.
- * @param k Number of nearest neighbors to search for.
- * @param accessor Method that maps a data point => vector (array of numbers).
- * @param distance Method that takes two vectors and returns their distance.
- */
-export function findKNNofPoint<T>(
-    dataPoints: T[], pointIndex: number, k: number,
-    accessor: (dataPoint: T) => Float32Array,
-    distance: (a: Vector, b: Vector) => number) {
-  let kMin = new KMin<NearestEntry>(k);
-  let a = accessor(dataPoints[pointIndex]);
-  for (let i = 0; i < dataPoints.length; ++i) {
-    if (i === pointIndex) {
-      continue;
-    }
-    let b = accessor(dataPoints[i]);
-    let dist = distance(a, b);
-    kMin.add(dist, {index: i, dist: dist});
-  }
-  return kMin.getMinKItems();
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/label.ts b/tensorflow/tensorboard/components/vz_projector/label.ts
deleted file mode 100644
index 67987f06ea..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/label.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-export interface BoundingBox {
-  loX: number;
-  loY: number;
-  hiX: number;
-  hiY: number;
-}
-
-/**
- * Accelerates label placement by dividing the view into a uniform grid.
- * Labels only need to be tested for collision with other labels that overlap
- * the same grid cells. This is a fork of {@code amoeba.CollisionGrid}.
- */
-export class CollisionGrid {
-  private numHorizCells: number;
-  private numVertCells: number;
-  private grid: BoundingBox[][];
-  private bound: BoundingBox;
-  private cellWidth: number;
-  private cellHeight: number;
-
-  /**
-   * Constructs a new Collision grid.
-   *
-   * @param bound The bound of the grid. Labels out of bounds will be rejected.
-   * @param cellWidth Width of a cell in the grid.
-   * @param cellHeight Height of a cell in the grid.
-   */
-  constructor(bound: BoundingBox, cellWidth: number, cellHeight: number) {
-    /** The bound of the grid. Labels out of bounds will be rejected. */
-    this.bound = bound;
-
-    /** Width of a cell in the grid. */
-    this.cellWidth = cellWidth;
-
-    /** Height of a cell in the grid. */
-    this.cellHeight = cellHeight;
-
-    /** Number of grid cells along the x axis. */
-    this.numHorizCells = Math.ceil(this.boundWidth(bound) / cellWidth);
-
-    /** Number of grid cells along the y axis. */
-    this.numVertCells = Math.ceil(this.boundHeight(bound) / cellHeight);
-
-    /**
-     * The 2d grid (stored as a 1d array.) Each cell consists of an array of
-     * BoundingBoxes for objects that are in the cell.
-     */
-    this.grid = new Array(this.numHorizCells * this.numVertCells);
-  }
-
-  private boundWidth(bound: BoundingBox) { return bound.hiX - bound.loX; }
-
-  private boundHeight(bound: BoundingBox) { return bound.hiY - bound.loY; }
-
-  private boundsIntersect(a: BoundingBox, b: BoundingBox) {
-    return !(a.loX > b.hiX || a.loY > b.hiY || a.hiX < b.loX || a.hiY < b.loY);
-  }
-
-  /**
-   * Checks if a given bounding box has any conflicts in the grid and inserts it
-   * if none are found.
-   *
-   * @param bound The bound to insert.
-   * @param justTest If true, just test if it conflicts, without inserting.
-   * @return True if the bound was successfully inserted; false if it
-   *         could not be inserted due to a conflict.
-   */
-  insert(bound: BoundingBox, justTest = false): boolean {
-    // Reject if the label is out of bounds.
-    if ((bound.hiX < this.bound.loX) || (bound.loX > this.bound.hiX) ||
-        (bound.hiY < this.bound.loY) || (bound.loY > this.bound.hiY)) {
-      return false;
-    }
-
-    let minCellX = this.getCellX(bound.loX);
-    let maxCellX = this.getCellX(bound.hiX);
-    let minCellY = this.getCellY(bound.loY);
-    let maxCellY = this.getCellY(bound.hiY);
-
-    // Check all overlapped cells to verify that we can insert.
-    let baseIdx = minCellY * this.numHorizCells + minCellX;
-    let idx = baseIdx;
-    for (let j = minCellY; j <= maxCellY; j++) {
-      for (let i = minCellX; i <= maxCellX; i++) {
-        let cell = this.grid[idx++];
-        if (cell) {
-          for (let k = 0; k < cell.length; k++) {
-            if (this.boundsIntersect(bound, cell[k])) {
-              return false;
-            }
-          }
-        }
-      }
-      idx += this.numHorizCells - (maxCellX - minCellX + 1);
-    }
-
-    if (justTest) {
-      return true;
-    }
-
-    // Insert into the overlapped cells.
-    idx = baseIdx;
-    for (let j = minCellY; j <= maxCellY; j++) {
-      for (let i = minCellX; i <= maxCellX; i++) {
-        if (!this.grid[idx]) {
-          this.grid[idx] = [bound];
-        } else {
-          this.grid[idx].push(bound);
-        }
-        idx++;
-      }
-      idx += this.numHorizCells - (maxCellX - minCellX + 1);
-    }
-    return true;
-  }
-
-  /**
-   * Returns the x index of the grid cell where the given x coordinate falls.
-   *
-   * @param x the coordinate, in world space.
-   * @return the x index of the cell.
-   */
-  private getCellX(x: number) {
-    return Math.floor((x - this.bound.loX) / this.cellWidth);
-  };
-
-  /**
-   * Returns the y index of the grid cell where the given y coordinate falls.
-   *
-   * @param y the coordinate, in world space.
-   * @return the y index of the cell.
-   */
-  private getCellY(y: number) {
-    return Math.floor((y - this.bound.loY) / this.cellHeight);
-  };
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/logging.ts b/tensorflow/tensorboard/components/vz_projector/logging.ts
deleted file mode 100644
index 59f3720601..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/logging.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/** Duration in ms for showing warning messages to the user */
-const WARNING_DURATION_MS = 10000;
-
-let dom: HTMLElement = null;
-let msgId = 0;
-let numActiveMessages = 0;
-
-export function setDomContainer(domElement: HTMLElement) {
-  dom = domElement;
-}
-
-/**
- * Updates the user message with the provided id.
- *
- * @param msg The message shown to the user. If null, the message is removed.
- * @param id The id of an existing message. If no id is provided, a unique id
- *     is assigned.
- * @param title The title of the notification.
- * @param isErrorMsg If true, the message is error and the dialog will have a
- *                   close button.
- * @return The id of the message.
- */
-export function setModalMessage(
-    msg: string, id: string = null, title = null, isErrorMsg = false): string {
-  if (dom == null) {
-    console.warn('Can\'t show modal message before the dom is initialized');
-    return;
-  }
-  if (id == null) {
-    id = (msgId++).toString();
-  }
-  let dialog = dom.querySelector('#notification-dialog') as any;
-  dialog.querySelector('.close-button').style.display =
-      isErrorMsg ? null : 'none';
-  let spinner = dialog.querySelector('.progress');
-  spinner.style.display = isErrorMsg ? 'none' : null;
-  spinner.active = isErrorMsg ? null : true;
-  dialog.querySelector('#notification-title').innerHTML = title;
-  let msgsContainer = dialog.querySelector('#notify-msgs') as HTMLElement;
-  if (isErrorMsg) {
-    msgsContainer.innerHTML = '';
-  } else {
-    const errors = msgsContainer.querySelectorAll('.error');
-    for (let i = 0; i < errors.length; i++) {
-      msgsContainer.removeChild(errors[i]);
-    }
-  }
-  let divId = `notify-msg-${id}`;
-  let msgDiv = dialog.querySelector('#' + divId) as HTMLDivElement;
-  if (msgDiv == null) {
-    msgDiv = document.createElement('div');
-    msgDiv.className = 'notify-msg ' + (isErrorMsg ? 'error' : '');
-    msgDiv.id = divId;
-
-    msgsContainer.insertBefore(msgDiv, msgsContainer.firstChild);
-
-    if (!isErrorMsg) {
-      numActiveMessages++;
-    } else {
-      numActiveMessages = 0;
-    }
-  }
-  if (msg == null) {
-    numActiveMessages--;
-    if (numActiveMessages === 0) {
-      dialog.close();
-    }
-    msgDiv.remove();
-  } else {
-    msgDiv.innerText = msg;
-    dialog.open();
-  }
-  return id;
-}
-
-export function setErrorMessage(errMsg: string, task?: string) {
-  setModalMessage(errMsg, null, 'Error ' + (task != null ? task : ''), true);
-}
-
-/**
- * Shows a warning message to the user for a certain amount of time.
- */
-export function setWarningMessage(msg: string): void {
-  let toast = dom.querySelector('#toast') as any;
-  toast.text = msg;
-  toast.duration = WARNING_DURATION_MS;
-  toast.open();
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/projectorEventContext.ts b/tensorflow/tensorboard/components/vz_projector/projectorEventContext.ts
deleted file mode 100644
index 36f5c4c584..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/projectorEventContext.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DistanceFunction, Projection} from './data';
-import {NearestEntry} from './knn';
-
-export type HoverListener = (index: number) => void;
-export type SelectionChangedListener =
-    (selectedPointIndices: number[], neighborsOfFirstPoint: NearestEntry[]) =>
-        void;
-export type ProjectionChangedListener = (projection: Projection) => void;
-export type DistanceMetricChangedListener =
-    (distanceMetric: DistanceFunction) => void;
-export interface ProjectorEventContext {
-  /** Register a callback to be invoked when the mouse hovers over a point. */
-  registerHoverListener(listener: HoverListener);
-  /** Notify the hover system that a point is under the mouse. */
-  notifyHoverOverPoint(pointIndex: number);
-  /** Registers a callback to be invoked when the selection changes. */
-  registerSelectionChangedListener(listener: SelectionChangedListener);
-  /**
-   * Notify the selection system that a client has changed the selected point
-   * set.
-   */
-  notifySelectionChanged(newSelectedPointIndices: number[]);
-  /** Registers a callback to be invoked when the projection changes. */
-  registerProjectionChangedListener(listener: ProjectionChangedListener);
-  /** Notify listeners that a reprojection occurred. */
-  notifyProjectionChanged(projection: Projection);
-  registerDistanceMetricChangedListener(listener:
-                                            DistanceMetricChangedListener);
-  notifyDistanceMetricChanged(distMetric: DistanceFunction);
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts b/tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts
deleted file mode 100644
index 4f47ea99d8..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/projectorScatterPlotAdapter.ts
+++ /dev/null
@@ -1,711 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataSet, DistanceFunction, Projection, ProjectionComponents3D, State} from './data';
-import {NearestEntry} from './knn';
-import {ProjectorEventContext} from './projectorEventContext';
-import {LabelRenderParams} from './renderContext';
-import {ScatterPlot} from './scatterPlot';
-import {ScatterPlotVisualizer3DLabels} from './scatterPlotVisualizer3DLabels';
-import {ScatterPlotVisualizerCanvasLabels} from './scatterPlotVisualizerCanvasLabels';
-import {ScatterPlotVisualizerPolylines} from './scatterPlotVisualizerPolylines';
-import {ScatterPlotVisualizerSprites} from './scatterPlotVisualizerSprites';
-import * as vector from './vector';
-
-const LABEL_FONT_SIZE = 10;
-const LABEL_SCALE_DEFAULT = 1.0;
-const LABEL_SCALE_LARGE = 2;
-const LABEL_FILL_COLOR_SELECTED = 0x000000;
-const LABEL_FILL_COLOR_HOVER = 0x000000;
-const LABEL_FILL_COLOR_NEIGHBOR = 0x000000;
-const LABEL_STROKE_COLOR_SELECTED = 0xFFFFFF;
-const LABEL_STROKE_COLOR_HOVER = 0xFFFFFF;
-const LABEL_STROKE_COLOR_NEIGHBOR = 0xFFFFFF;
-
-const POINT_COLOR_UNSELECTED = 0xE3E3E3;
-const POINT_COLOR_NO_SELECTION = 0x7575D9;
-const POINT_COLOR_SELECTED = 0xFA6666;
-const POINT_COLOR_HOVER = 0x760B4F;
-
-const POINT_SCALE_DEFAULT = 1.0;
-const POINT_SCALE_SELECTED = 1.2;
-const POINT_SCALE_NEIGHBOR = 1.2;
-const POINT_SCALE_HOVER = 1.2;
-
-const LABELS_3D_COLOR_UNSELECTED = 0xFFFFFF;
-const LABELS_3D_COLOR_NO_SELECTION = 0xFFFFFF;
-
-const SPRITE_IMAGE_COLOR_UNSELECTED = 0xFFFFFF;
-const SPRITE_IMAGE_COLOR_NO_SELECTION = 0xFFFFFF;
-
-const POLYLINE_START_HUE = 60;
-const POLYLINE_END_HUE = 360;
-const POLYLINE_SATURATION = 1;
-const POLYLINE_LIGHTNESS = .3;
-
-const POLYLINE_DEFAULT_OPACITY = .2;
-const POLYLINE_DEFAULT_LINEWIDTH = 2;
-const POLYLINE_SELECTED_OPACITY = .9;
-const POLYLINE_SELECTED_LINEWIDTH = 3;
-const POLYLINE_DESELECTED_OPACITY = .05;
-
-const SCATTER_PLOT_CUBE_LENGTH = 2;
-
-/** Color scale for nearest neighbors. */
-const NN_COLOR_SCALE =
-    d3.scale.linear<string>()
-        .domain([1, 0.7, 0.4])
-        .range(['hsl(285, 80%, 40%)', 'hsl(0, 80%, 65%)', 'hsl(40, 70%, 60%)'])
-        .clamp(true);
-
-/**
- * Interprets projector events and assembes the arrays and commands necessary
- * to use the ScatterPlot to render the current projected data set.
- */
-export class ProjectorScatterPlotAdapter {
-  public scatterPlot: ScatterPlot;
-  private projection: Projection;
-  private hoverPointIndex: number;
-  private selectedPointIndices: number[];
-  private neighborsOfFirstSelectedPoint: NearestEntry[];
-  private renderLabelsIn3D: boolean = false;
-  private labelPointAccessor: string;
-  private legendPointColorer: (ds: DataSet, index: number) => string;
-  private distanceMetric: DistanceFunction;
-
-  private spriteVisualizer: ScatterPlotVisualizerSprites;
-  private labels3DVisualizer: ScatterPlotVisualizer3DLabels;
-  private canvasLabelsVisualizer: ScatterPlotVisualizerCanvasLabels;
-  private polylineVisualizer: ScatterPlotVisualizerPolylines;
-
-  constructor(
-      private scatterPlotContainer: HTMLElement,
-      projectorEventContext: ProjectorEventContext) {
-    this.scatterPlot =
-        new ScatterPlot(scatterPlotContainer, projectorEventContext);
-    projectorEventContext.registerProjectionChangedListener(projection => {
-      this.projection = projection;
-      this.updateScatterPlotWithNewProjection(projection);
-    });
-    projectorEventContext.registerSelectionChangedListener(
-        (selectedPointIndices, neighbors) => {
-          this.selectedPointIndices = selectedPointIndices;
-          this.neighborsOfFirstSelectedPoint = neighbors;
-          this.updateScatterPlotPositions();
-          this.updateScatterPlotAttributes();
-          this.scatterPlot.render();
-        });
-    projectorEventContext.registerHoverListener(hoverPointIndex => {
-      this.hoverPointIndex = hoverPointIndex;
-      this.updateScatterPlotAttributes();
-      this.scatterPlot.render();
-    });
-    projectorEventContext.registerDistanceMetricChangedListener(
-        distanceMetric => {
-          this.distanceMetric = distanceMetric;
-          this.updateScatterPlotAttributes();
-          this.scatterPlot.render();
-        });
-    this.createVisualizers(false);
-  }
-
-  notifyProjectionPositionsUpdated() {
-    this.updateScatterPlotPositions();
-    this.scatterPlot.render();
-  }
-
-  setDataSet(dataSet: DataSet) {
-    if (this.projection != null) {
-      // TODO(nicholsonc): setDataSet needs to go away, the projection is the
-      // atomic unit of update.
-      this.projection.dataSet = dataSet;
-    }
-    if (this.polylineVisualizer != null) {
-      this.polylineVisualizer.setDataSet(dataSet);
-    }
-    if (this.labels3DVisualizer != null) {
-      this.labels3DVisualizer.setLabelStrings(
-          this.generate3DLabelsArray(dataSet, this.labelPointAccessor));
-    }
-    if (this.spriteVisualizer == null) {
-      return;
-    }
-    this.spriteVisualizer.clearSpriteAtlas();
-    if ((dataSet == null) || (dataSet.spriteAndMetadataInfo == null)) {
-      return;
-    }
-    const metadata = dataSet.spriteAndMetadataInfo;
-    if ((metadata.spriteImage == null) || (metadata.spriteMetadata == null)) {
-      return;
-    }
-    const n = dataSet.points.length;
-    const spriteIndices = new Float32Array(n);
-    for (let i = 0; i < n; ++i) {
-      spriteIndices[i] = dataSet.points[i].index;
-    }
-    this.spriteVisualizer.setSpriteAtlas(
-        metadata.spriteImage, metadata.spriteMetadata.singleImageDim,
-        spriteIndices);
-  }
-
-  set3DLabelMode(renderLabelsIn3D: boolean) {
-    this.renderLabelsIn3D = renderLabelsIn3D;
-    this.createVisualizers(renderLabelsIn3D);
-    this.updateScatterPlotAttributes();
-    this.scatterPlot.render();
-  }
-
-  setLegendPointColorer(
-      legendPointColorer: (ds: DataSet, index: number) => string) {
-    this.legendPointColorer = legendPointColorer;
-  }
-
-  setLabelPointAccessor(labelPointAccessor: string) {
-    this.labelPointAccessor = labelPointAccessor;
-    if (this.labels3DVisualizer != null) {
-      const ds = (this.projection == null) ? null : this.projection.dataSet;
-      this.labels3DVisualizer.setLabelStrings(
-          this.generate3DLabelsArray(ds, labelPointAccessor));
-    }
-  }
-
-  resize() {
-    this.scatterPlot.resize();
-  }
-
-  populateBookmarkFromUI(state: State) {
-    state.cameraDef = this.scatterPlot.getCameraDef();
-  }
-
-  restoreUIFromBookmark(state: State) {
-    this.scatterPlot.setCameraParametersForNextCameraCreation(
-        state.cameraDef, false);
-  }
-
-  updateScatterPlotPositions() {
-    const ds = (this.projection == null) ? null : this.projection.dataSet;
-    const projectionComponents =
-        (this.projection == null) ? null : this.projection.projectionComponents;
-    const newPositions =
-        this.generatePointPositionArray(ds, projectionComponents);
-    this.scatterPlot.setPointPositions(newPositions);
-  }
-
-  updateScatterPlotAttributes() {
-    if (this.projection == null) {
-      return;
-    }
-    const dataSet = this.projection.dataSet;
-    const selectedSet = this.selectedPointIndices;
-    const hoverIndex = this.hoverPointIndex;
-    const neighbors = this.neighborsOfFirstSelectedPoint;
-    const pointColorer = this.legendPointColorer;
-
-    const pointColors = this.generatePointColorArray(
-        dataSet, pointColorer, this.distanceMetric, selectedSet, neighbors,
-        hoverIndex, this.renderLabelsIn3D, this.getSpriteImageMode());
-    const pointScaleFactors = this.generatePointScaleFactorArray(
-        dataSet, selectedSet, neighbors, hoverIndex);
-    const labels = this.generateVisibleLabelRenderParams(
-        dataSet, selectedSet, neighbors, hoverIndex);
-    const polylineColors =
-        this.generateLineSegmentColorMap(dataSet, pointColorer);
-    const polylineOpacities =
-        this.generateLineSegmentOpacityArray(dataSet, selectedSet);
-    const polylineWidths =
-        this.generateLineSegmentWidthArray(dataSet, selectedSet);
-
-    this.scatterPlot.setPointColors(pointColors);
-    this.scatterPlot.setPointScaleFactors(pointScaleFactors);
-    this.scatterPlot.setLabels(labels);
-    this.scatterPlot.setPolylineColors(polylineColors);
-    this.scatterPlot.setPolylineOpacities(polylineOpacities);
-    this.scatterPlot.setPolylineWidths(polylineWidths);
-  }
-
-  render() {
-    this.scatterPlot.render();
-  }
-
-  generatePointPositionArray(
-      ds: DataSet, projectionComponents: ProjectionComponents3D): Float32Array {
-    if (ds == null) {
-      return null;
-    }
-
-    const xScaler: d3.scale.Linear<number, number> = d3.scale.linear();
-    const yScaler: d3.scale.Linear<number, number> = d3.scale.linear();
-    let zScaler: d3.scale.Linear<number, number> = null;
-    {
-      // Determine max and min of each axis of our data.
-      const xExtent = d3.extent(
-          ds.points,
-          (p, i) => ds.points[i].projections[projectionComponents[0]]);
-      const yExtent = d3.extent(
-          ds.points,
-          (p, i) => ds.points[i].projections[projectionComponents[1]]);
-
-      const range =
-          [-SCATTER_PLOT_CUBE_LENGTH / 2, SCATTER_PLOT_CUBE_LENGTH / 2];
-
-      xScaler.domain(xExtent).range(range);
-      yScaler.domain(yExtent).range(range);
-
-      if (projectionComponents[2] != null) {
-        const zExtent = d3.extent(
-            ds.points,
-            (p, i) => ds.points[i].projections[projectionComponents[2]]);
-        zScaler = d3.scale.linear();
-        zScaler.domain(zExtent).range(range);
-      }
-    }
-
-    const positions = new Float32Array(ds.points.length * 3);
-    let dst = 0;
-
-    ds.points.forEach((d, i) => {
-      positions[dst++] =
-          xScaler(ds.points[i].projections[projectionComponents[0]]);
-      positions[dst++] =
-          yScaler(ds.points[i].projections[projectionComponents[1]]);
-      positions[dst++] = 0.0;
-    });
-
-    if (zScaler) {
-      dst = 2;
-      ds.points.forEach((d, i) => {
-        positions[dst] =
-            zScaler(ds.points[i].projections[projectionComponents[2]]);
-        dst += 3;
-      });
-    }
-
-    return positions;
-  }
-
-  generateVisibleLabelRenderParams(
-      ds: DataSet, selectedPointIndices: number[],
-      neighborsOfFirstPoint: NearestEntry[],
-      hoverPointIndex: number): LabelRenderParams {
-    if (ds == null) {
-      return null;
-    }
-
-    const selectedPointCount =
-        (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
-    const neighborCount =
-        (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
-    const n = selectedPointCount + neighborCount +
-        ((hoverPointIndex != null) ? 1 : 0);
-
-    const visibleLabels = new Uint32Array(n);
-    const scale = new Float32Array(n);
-    const opacityFlags = new Int8Array(n);
-    const fillColors = new Uint8Array(n * 3);
-    const strokeColors = new Uint8Array(n * 3);
-    const labelStrings: string[] = [];
-
-    scale.fill(LABEL_SCALE_DEFAULT);
-    opacityFlags.fill(1);
-
-    let dst = 0;
-
-    if (hoverPointIndex != null) {
-      labelStrings.push(
-          this.getLabelText(ds, hoverPointIndex, this.labelPointAccessor));
-      visibleLabels[dst] = hoverPointIndex;
-      scale[dst] = LABEL_SCALE_LARGE;
-      opacityFlags[dst] = 0;
-      const fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_HOVER);
-      packRgbIntoUint8Array(
-          fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
-      const strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_HOVER);
-      packRgbIntoUint8Array(
-          strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[1]);
-      ++dst;
-    }
-
-    // Selected points
-    {
-      const n = selectedPointCount;
-      const fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_SELECTED);
-      const strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_SELECTED);
-      for (let i = 0; i < n; ++i) {
-        const labelIndex = selectedPointIndices[i];
-        labelStrings.push(
-            this.getLabelText(ds, labelIndex, this.labelPointAccessor));
-        visibleLabels[dst] = labelIndex;
-        scale[dst] = LABEL_SCALE_LARGE;
-        opacityFlags[dst] = (n === 1) ? 0 : 1;
-        packRgbIntoUint8Array(
-            fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
-        packRgbIntoUint8Array(
-            strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[2]);
-        ++dst;
-      }
-    }
-
-    // Neighbors
-    {
-      const n = neighborCount;
-      const fillRgb = styleRgbFromHexColor(LABEL_FILL_COLOR_NEIGHBOR);
-      const strokeRgb = styleRgbFromHexColor(LABEL_STROKE_COLOR_NEIGHBOR);
-      for (let i = 0; i < n; ++i) {
-        const labelIndex = neighborsOfFirstPoint[i].index;
-        labelStrings.push(
-            this.getLabelText(ds, labelIndex, this.labelPointAccessor));
-        visibleLabels[dst] = labelIndex;
-        packRgbIntoUint8Array(
-            fillColors, dst, fillRgb[0], fillRgb[1], fillRgb[2]);
-        packRgbIntoUint8Array(
-            strokeColors, dst, strokeRgb[0], strokeRgb[1], strokeRgb[2]);
-        ++dst;
-      }
-    }
-
-    return new LabelRenderParams(
-        visibleLabels, labelStrings, scale, opacityFlags, LABEL_FONT_SIZE,
-        fillColors, strokeColors);
-  }
-
-  generatePointScaleFactorArray(
-      ds: DataSet, selectedPointIndices: number[],
-      neighborsOfFirstPoint: NearestEntry[],
-      hoverPointIndex: number): Float32Array {
-    if (ds == null) {
-      return new Float32Array(0);
-    }
-
-    const scale = new Float32Array(ds.points.length);
-    scale.fill(POINT_SCALE_DEFAULT);
-
-    const selectedPointCount =
-        (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
-    const neighborCount =
-        (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
-
-    // Scale up all selected points.
-    {
-      const n = selectedPointCount;
-      for (let i = 0; i < n; ++i) {
-        const p = selectedPointIndices[i];
-        scale[p] = POINT_SCALE_SELECTED;
-      }
-    }
-
-    // Scale up the neighbor points.
-    {
-      const n = neighborCount;
-      for (let i = 0; i < n; ++i) {
-        const p = neighborsOfFirstPoint[i].index;
-        scale[p] = POINT_SCALE_NEIGHBOR;
-      }
-    }
-
-    // Scale up the hover point.
-    if (hoverPointIndex != null) {
-      scale[hoverPointIndex] = POINT_SCALE_HOVER;
-    }
-
-    return scale;
-  }
-
-  generateLineSegmentColorMap(
-      ds: DataSet, legendPointColorer: (ds: DataSet, index: number) => string):
-      {[polylineIndex: number]: Float32Array} {
-    let polylineColorArrayMap: {[polylineIndex: number]: Float32Array} = {};
-    if (ds == null) {
-      return polylineColorArrayMap;
-    }
-
-    for (let i = 0; i < ds.sequences.length; i++) {
-      let sequence = ds.sequences[i];
-      let colors = new Float32Array(2 * (sequence.pointIndices.length - 1) * 3);
-      let colorIndex = 0;
-
-      if (legendPointColorer) {
-        for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
-          const c1 =
-              new THREE.Color(legendPointColorer(ds, sequence.pointIndices[j]));
-          const c2 = new THREE.Color(
-              legendPointColorer(ds, sequence.pointIndices[j + 1]));
-          colors[colorIndex++] = c1.r;
-          colors[colorIndex++] = c1.g;
-          colors[colorIndex++] = c1.b;
-          colors[colorIndex++] = c2.r;
-          colors[colorIndex++] = c2.g;
-          colors[colorIndex++] = c2.b;
-        }
-      } else {
-        for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
-          const c1 =
-              getDefaultPointInPolylineColor(j, sequence.pointIndices.length);
-          const c2 = getDefaultPointInPolylineColor(
-              j + 1, sequence.pointIndices.length);
-          colors[colorIndex++] = c1.r;
-          colors[colorIndex++] = c1.g;
-          colors[colorIndex++] = c1.b;
-          colors[colorIndex++] = c2.r;
-          colors[colorIndex++] = c2.g;
-          colors[colorIndex++] = c2.b;
-        }
-      }
-
-      polylineColorArrayMap[i] = colors;
-    }
-
-    return polylineColorArrayMap;
-  }
-
-  generateLineSegmentOpacityArray(ds: DataSet, selectedPoints: number[]):
-      Float32Array {
-    if (ds == null) {
-      return new Float32Array(0);
-    }
-    const opacities = new Float32Array(ds.sequences.length);
-    const selectedPointCount =
-        (selectedPoints == null) ? 0 : selectedPoints.length;
-    if (selectedPointCount > 0) {
-      opacities.fill(POLYLINE_DESELECTED_OPACITY);
-      const i = ds.points[selectedPoints[0]].sequenceIndex;
-      opacities[i] = POLYLINE_SELECTED_OPACITY;
-    } else {
-      opacities.fill(POLYLINE_DEFAULT_OPACITY);
-    }
-    return opacities;
-  }
-
-  generateLineSegmentWidthArray(ds: DataSet, selectedPoints: number[]):
-      Float32Array {
-    if (ds == null) {
-      return new Float32Array(0);
-    }
-    const widths = new Float32Array(ds.sequences.length);
-    widths.fill(POLYLINE_DEFAULT_LINEWIDTH);
-    const selectedPointCount =
-        (selectedPoints == null) ? 0 : selectedPoints.length;
-    if (selectedPointCount > 0) {
-      const i = ds.points[selectedPoints[0]].sequenceIndex;
-      widths[i] = POLYLINE_SELECTED_LINEWIDTH;
-    }
-    return widths;
-  }
-
-  generatePointColorArray(
-      ds: DataSet, legendPointColorer: (ds: DataSet, index: number) => string,
-      distFunc: DistanceFunction, selectedPointIndices: number[],
-      neighborsOfFirstPoint: NearestEntry[], hoverPointIndex: number,
-      label3dMode: boolean, spriteImageMode: boolean): Float32Array {
-    if (ds == null) {
-      return new Float32Array(0);
-    }
-
-    const selectedPointCount =
-        (selectedPointIndices == null) ? 0 : selectedPointIndices.length;
-    const neighborCount =
-        (neighborsOfFirstPoint == null) ? 0 : neighborsOfFirstPoint.length;
-    const colors = new Float32Array(ds.points.length * 3);
-
-    let unselectedColor = POINT_COLOR_UNSELECTED;
-    let noSelectionColor = POINT_COLOR_NO_SELECTION;
-
-    if (label3dMode) {
-      unselectedColor = LABELS_3D_COLOR_UNSELECTED;
-      noSelectionColor = LABELS_3D_COLOR_NO_SELECTION;
-    }
-
-    if (spriteImageMode) {
-      unselectedColor = SPRITE_IMAGE_COLOR_UNSELECTED;
-      noSelectionColor = SPRITE_IMAGE_COLOR_NO_SELECTION;
-    }
-
-    // Give all points the unselected color.
-    {
-      const n = ds.points.length;
-      let dst = 0;
-      if (selectedPointCount > 0) {
-        const c = new THREE.Color(unselectedColor);
-        for (let i = 0; i < n; ++i) {
-          colors[dst++] = c.r;
-          colors[dst++] = c.g;
-          colors[dst++] = c.b;
-        }
-      } else {
-        if (legendPointColorer != null) {
-          for (let i = 0; i < n; ++i) {
-            const c = new THREE.Color(legendPointColorer(ds, i));
-            colors[dst++] = c.r;
-            colors[dst++] = c.g;
-            colors[dst++] = c.b;
-          }
-        } else {
-          const c = new THREE.Color(noSelectionColor);
-          for (let i = 0; i < n; ++i) {
-            colors[dst++] = c.r;
-            colors[dst++] = c.g;
-            colors[dst++] = c.b;
-          }
-        }
-      }
-    }
-
-    // Color the selected points.
-    {
-      const n = selectedPointCount;
-      const c = new THREE.Color(POINT_COLOR_SELECTED);
-      for (let i = 0; i < n; ++i) {
-        let dst = selectedPointIndices[i] * 3;
-        colors[dst++] = c.r;
-        colors[dst++] = c.g;
-        colors[dst++] = c.b;
-      }
-    }
-
-    // Color the neighbors.
-    {
-      const n = neighborCount;
-      let minDist = n > 0 ? neighborsOfFirstPoint[0].dist : 0;
-      for (let i = 0; i < n; ++i) {
-        const c = new THREE.Color(
-            dist2color(distFunc, neighborsOfFirstPoint[i].dist, minDist));
-        let dst = neighborsOfFirstPoint[i].index * 3;
-        colors[dst++] = c.r;
-        colors[dst++] = c.g;
-        colors[dst++] = c.b;
-      }
-    }
-
-    // Color the hover point.
-    if (hoverPointIndex != null) {
-      const c = new THREE.Color(POINT_COLOR_HOVER);
-      let dst = hoverPointIndex * 3;
-      colors[dst++] = c.r;
-      colors[dst++] = c.g;
-      colors[dst++] = c.b;
-    }
-
-    return colors;
-  }
-
-  generate3DLabelsArray(ds: DataSet, accessor: string) {
-    if ((ds == null) || (accessor == null)) {
-      return null;
-    }
-    let labels: string[] = [];
-    const n = ds.points.length;
-    for (let i = 0; i < n; ++i) {
-      labels.push(this.getLabelText(ds, i, accessor));
-    }
-    return labels;
-  }
-
-  private getLabelText(ds: DataSet, i: number, accessor: string) {
-    return ds.points[i].metadata[accessor].toString();
-  }
-
-  private updateScatterPlotWithNewProjection(projection: Projection) {
-    if (projection == null) {
-      this.createVisualizers(this.renderLabelsIn3D);
-      this.scatterPlot.render();
-      return;
-    }
-    this.setDataSet(projection.dataSet);
-    this.scatterPlot.setDimensions(projection.dimensionality);
-    if (projection.dataSet.projectionCanBeRendered(projection.projectionType)) {
-      this.updateScatterPlotAttributes();
-      this.notifyProjectionPositionsUpdated();
-    }
-    this.scatterPlot.setCameraParametersForNextCameraCreation(null, false);
-  }
-
-  private createVisualizers(inLabels3DMode: boolean) {
-    const ds = (this.projection == null) ? null : this.projection.dataSet;
-    const scatterPlot = this.scatterPlot;
-    scatterPlot.removeAllVisualizers();
-    this.labels3DVisualizer = null;
-    this.canvasLabelsVisualizer = null;
-    this.spriteVisualizer = null;
-    this.polylineVisualizer = null;
-    if (inLabels3DMode) {
-      this.labels3DVisualizer = new ScatterPlotVisualizer3DLabels();
-      this.labels3DVisualizer.setLabelStrings(
-          this.generate3DLabelsArray(ds, this.labelPointAccessor));
-    } else {
-      this.spriteVisualizer = new ScatterPlotVisualizerSprites();
-      scatterPlot.addVisualizer(this.spriteVisualizer);
-      this.canvasLabelsVisualizer =
-          new ScatterPlotVisualizerCanvasLabels(this.scatterPlotContainer);
-    }
-    this.polylineVisualizer = new ScatterPlotVisualizerPolylines();
-    this.setDataSet(ds);
-    if (this.spriteVisualizer) {
-      scatterPlot.addVisualizer(this.spriteVisualizer);
-    }
-    if (this.labels3DVisualizer) {
-      scatterPlot.addVisualizer(this.labels3DVisualizer);
-    }
-    if (this.canvasLabelsVisualizer) {
-      scatterPlot.addVisualizer(this.canvasLabelsVisualizer);
-    }
-    scatterPlot.addVisualizer(this.polylineVisualizer);
-  }
-
-  private getSpriteImageMode(): boolean {
-    if (this.projection == null) {
-      return false;
-    }
-    const ds = this.projection.dataSet;
-    if ((ds == null) || (ds.spriteAndMetadataInfo == null)) {
-      return false;
-    }
-    return ds.spriteAndMetadataInfo.spriteImage != null;
-  }
-}
-
-function packRgbIntoUint8Array(
-    rgbArray: Uint8Array, labelIndex: number, r: number, g: number, b: number) {
-  rgbArray[labelIndex * 3] = r;
-  rgbArray[labelIndex * 3 + 1] = g;
-  rgbArray[labelIndex * 3 + 2] = b;
-}
-
-function styleRgbFromHexColor(hex: number): [number, number, number] {
-  const c = new THREE.Color(hex);
-  return [(c.r * 255) | 0, (c.g * 255) | 0, (c.b * 255) | 0];
-}
-
-function getDefaultPointInPolylineColor(
-    index: number, totalPoints: number): THREE.Color {
-  let hue = POLYLINE_START_HUE +
-      (POLYLINE_END_HUE - POLYLINE_START_HUE) * index / totalPoints;
-
-  let rgb = d3.hsl(hue, POLYLINE_SATURATION, POLYLINE_LIGHTNESS).rgb();
-  return new THREE.Color(rgb.r / 255, rgb.g / 255, rgb.b / 255);
-}
-
-/**
- * Normalizes the distance so it can be visually encoded with color.
- * The normalization depends on the distance metric (cosine vs euclidean).
- */
-export function normalizeDist(
-    distFunc: DistanceFunction, d: number, minDist: number): number {
-  return (distFunc === vector.dist) ? (minDist / d) : (1 - d);
-}
-
-/** Normalizes and encodes the provided distance with color. */
-export function dist2color(
-    distFunc: DistanceFunction, d: number, minDist: number): string {
-  return NN_COLOR_SCALE(normalizeDist(distFunc, d, minDist));
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/renderContext.ts b/tensorflow/tensorboard/components/vz_projector/renderContext.ts
deleted file mode 100644
index 8d5232a804..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/renderContext.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/**
- * LabelRenderParams describes the set of points that should have labels
- * rendered next to them.
- */
-export class LabelRenderParams {
-  constructor(
-      public pointIndices: Float32Array, public labelStrings: string[],
-      public scaleFactors: Float32Array, public useSceneOpacityFlags: Int8Array,
-      public defaultFontSize: number, public fillColors: Uint8Array,
-      public strokeColors: Uint8Array) {}
-}
-
-/** Details about the camera projection being used to render the scene. */
-export enum CameraType {
-  Perspective,
-  Orthographic
-}
-
-/**
- * RenderContext contains all of the state required to color and render the data
- * set. ScatterPlot passes this to every attached visualizer as part of the
- * render callback.
- * TODO(nicholsonc): This should only contain the data that's changed between
- * each frame. Data like colors / scale factors / labels should be reapplied
- * only when they change.
- */
-export class RenderContext {
-  constructor(
-      public camera: THREE.Camera, public cameraType: CameraType,
-      public cameraTarget: THREE.Vector3, public screenWidth: number,
-      public screenHeight: number, public nearestCameraSpacePointZ: number,
-      public farthestCameraSpacePointZ: number, public backgroundColor: number,
-      public pointColors: Float32Array, public pointScaleFactors: Float32Array,
-      public labels: LabelRenderParams,
-      public polylineColors: {[polylineIndex: number]: Float32Array},
-      public polylineOpacities: Float32Array,
-      public polylineWidths: Float32Array) {}
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlot.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlot.ts
deleted file mode 100644
index 283b608e83..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlot.ts
+++ /dev/null
@@ -1,723 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {ProjectorEventContext} from './projectorEventContext';
-import {CameraType, LabelRenderParams, RenderContext} from './renderContext';
-import {BoundingBox, ScatterPlotRectangleSelector} from './scatterPlotRectangleSelector';
-import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
-import * as util from './util';
-import {Point2D, Point3D} from './vector';
-
-const BACKGROUND_COLOR = 0xffffff;
-
-/**
- * The length of the cube (diameter of the circumscribing sphere) where all the
- * points live.
- */
-const CUBE_LENGTH = 2;
-const MAX_ZOOM = 5 * CUBE_LENGTH;
-const MIN_ZOOM = 0.025 * CUBE_LENGTH;
-
-// Constants relating to the camera parameters.
-const PERSP_CAMERA_FOV_VERTICAL = 70;
-const PERSP_CAMERA_NEAR_CLIP_PLANE = 0.01;
-const PERSP_CAMERA_FAR_CLIP_PLANE = 100;
-const ORTHO_CAMERA_FRUSTUM_HALF_EXTENT = 1.2;
-
-// Key presses.
-const SHIFT_KEY = 16;
-const CTRL_KEY = 17;
-
-const START_CAMERA_POS_3D = new THREE.Vector3(0.45, 0.9, 1.6);
-const START_CAMERA_TARGET_3D = new THREE.Vector3(0, 0, 0);
-const START_CAMERA_POS_2D = new THREE.Vector3(0, 0, 4);
-const START_CAMERA_TARGET_2D = new THREE.Vector3(0, 0, 0);
-
-const ORBIT_MOUSE_ROTATION_SPEED = 1;
-const ORBIT_ANIMATION_ROTATION_CYCLE_IN_SECONDS = 7;
-
-export type OnCameraMoveListener =
-    (cameraPosition: THREE.Vector3, cameraTarget: THREE.Vector3) => void;
-
-/** Supported modes of interaction. */
-export enum MouseMode {
-  AREA_SELECT,
-  CAMERA_AND_CLICK_SELECT
-}
-
-/** Defines a camera, suitable for serialization. */
-export class CameraDef {
-  orthographic: boolean = false;
-  position: Point3D;
-  target: Point3D;
-  zoom: number;
-}
-
-/**
- * Maintains a three.js instantiation and context,
- * animation state, and all other logic that's
- * independent of how a 3D scatter plot is actually rendered. Also holds an
- * array of visualizers and dispatches application events to them.
- */
-export class ScatterPlot {
-  private visualizers: ScatterPlotVisualizer[] = [];
-
-  private onCameraMoveListeners: OnCameraMoveListener[] = [];
-
-  private height: number;
-  private width: number;
-
-  private mouseMode: MouseMode;
-  private backgroundColor: number = BACKGROUND_COLOR;
-
-  private dimensionality: number = 3;
-  private renderer: THREE.WebGLRenderer;
-
-  private scene: THREE.Scene;
-  private pickingTexture: THREE.WebGLRenderTarget;
-  private light: THREE.PointLight;
-
-  private cameraDef: CameraDef = null;
-  private camera: THREE.Camera;
-  private orbitAnimationOnNextCameraCreation: boolean = false;
-  private orbitCameraControls: any;
-  private orbitAnimationId: number;
-
-  private worldSpacePointPositions: Float32Array;
-  private pointColors: Float32Array;
-  private pointScaleFactors: Float32Array;
-  private labels: LabelRenderParams;
-  private polylineColors: {[polylineIndex: number]: Float32Array};
-  private polylineOpacities: Float32Array;
-  private polylineWidths: Float32Array;
-
-  private selecting = false;
-  private nearestPoint: number;
-  private mouseIsDown = false;
-  private isDragSequence = false;
-  private rectangleSelector: ScatterPlotRectangleSelector;
-
-  constructor(
-      private container: HTMLElement,
-      private projectorEventContext: ProjectorEventContext) {
-    this.getLayoutValues();
-
-    this.scene = new THREE.Scene();
-    this.renderer = new THREE.WebGLRenderer(
-        {alpha: true, premultipliedAlpha: false, antialias: false});
-    this.renderer.setClearColor(BACKGROUND_COLOR, 1);
-    this.container.appendChild(this.renderer.domElement);
-    this.light = new THREE.PointLight(0xFFECBF, 1, 0);
-    this.scene.add(this.light);
-
-    this.setDimensions(3);
-    this.recreateCamera(this.makeDefaultCameraDef(this.dimensionality));
-    this.renderer.render(this.scene, this.camera);
-
-    this.rectangleSelector = new ScatterPlotRectangleSelector(
-        this.container,
-        (boundingBox: BoundingBox) => this.selectBoundingBox(boundingBox));
-    this.addInteractionListeners();
-  }
-
-  private addInteractionListeners() {
-    this.container.addEventListener('mousemove', this.onMouseMove.bind(this));
-    this.container.addEventListener('mousedown', this.onMouseDown.bind(this));
-    this.container.addEventListener('mouseup', this.onMouseUp.bind(this));
-    this.container.addEventListener('click', this.onClick.bind(this));
-    window.addEventListener('keydown', this.onKeyDown.bind(this), false);
-    window.addEventListener('keyup', this.onKeyUp.bind(this), false);
-  }
-
-  private addCameraControlsEventListeners(cameraControls: any) {
-    // Start is called when the user stars interacting with
-    // controls.
-    cameraControls.addEventListener('start', () => {
-      this.stopOrbitAnimation();
-      this.onCameraMoveListeners.forEach(
-          l => l(this.camera.position, cameraControls.target));
-    });
-
-    // Change is called everytime the user interacts with the controls.
-    cameraControls.addEventListener('change', () => {
-      this.render();
-    });
-
-    // End is called when the user stops interacting with the
-    // controls (e.g. on mouse up, after dragging).
-    cameraControls.addEventListener('end', () => {});
-  }
-
-  private makeOrbitControls(
-      camera: THREE.Camera, cameraDef: CameraDef, cameraIs3D: boolean) {
-    if (this.orbitCameraControls != null) {
-      this.orbitCameraControls.dispose();
-    }
-    const occ =
-        new (THREE as any).OrbitControls(camera, this.renderer.domElement);
-    occ.target0 = new THREE.Vector3(
-        cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
-    occ.position0 = new THREE.Vector3().copy(camera.position);
-    occ.zoom0 = cameraDef.zoom;
-    occ.enableRotate = cameraIs3D;
-    occ.autoRotate = false;
-    occ.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
-    if (cameraIs3D) {
-      occ.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
-      occ.mouseButtons.PAN = THREE.MOUSE.RIGHT;
-    } else {
-      occ.mouseButtons.ORBIT = null;
-      occ.mouseButtons.PAN = THREE.MOUSE.LEFT;
-    }
-    occ.reset();
-
-    this.camera = camera;
-    this.orbitCameraControls = occ;
-    this.addCameraControlsEventListeners(this.orbitCameraControls);
-  }
-
-  private makeCamera3D(cameraDef: CameraDef, w: number, h: number) {
-    let camera: THREE.PerspectiveCamera;
-    {
-      const aspectRatio = w / h;
-      camera = new THREE.PerspectiveCamera(
-          PERSP_CAMERA_FOV_VERTICAL, aspectRatio, PERSP_CAMERA_NEAR_CLIP_PLANE,
-          PERSP_CAMERA_FAR_CLIP_PLANE);
-      camera.position.set(
-          cameraDef.position[0], cameraDef.position[1], cameraDef.position[2]);
-      const at = new THREE.Vector3(
-          cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
-      camera.lookAt(at);
-      camera.zoom = cameraDef.zoom;
-      camera.updateProjectionMatrix();
-    }
-    this.camera = camera;
-    this.makeOrbitControls(camera, cameraDef, true);
-  }
-
-  private makeCamera2D(cameraDef: CameraDef, w: number, h: number) {
-    let camera: THREE.OrthographicCamera;
-    const target = new THREE.Vector3(
-        cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
-    {
-      const aspectRatio = w / h;
-      let left = -ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-      let right = ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-      let bottom = -ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-      let top = ORTHO_CAMERA_FRUSTUM_HALF_EXTENT;
-      // Scale up the larger of (w, h) to match the aspect ratio.
-      if (aspectRatio > 1) {
-        left *= aspectRatio;
-        right *= aspectRatio;
-      } else {
-        top /= aspectRatio;
-        bottom /= aspectRatio;
-      }
-      camera =
-          new THREE.OrthographicCamera(left, right, top, bottom, -1000, 1000);
-      camera.position.set(
-          cameraDef.position[0], cameraDef.position[1], cameraDef.position[2]);
-      camera.up = new THREE.Vector3(0, 1, 0);
-      camera.lookAt(target);
-      camera.zoom = cameraDef.zoom;
-      camera.updateProjectionMatrix();
-    }
-    this.camera = camera;
-    this.makeOrbitControls(camera, cameraDef, false);
-  }
-
-  private makeDefaultCameraDef(dimensionality: number): CameraDef {
-    const def = new CameraDef();
-    def.orthographic = (dimensionality === 2);
-    def.zoom = 1.0;
-    if (def.orthographic) {
-      def.position =
-          [START_CAMERA_POS_2D.x, START_CAMERA_POS_2D.y, START_CAMERA_POS_2D.z];
-      def.target = [
-        START_CAMERA_TARGET_2D.x, START_CAMERA_TARGET_2D.y,
-        START_CAMERA_TARGET_2D.z
-      ];
-    } else {
-      def.position =
-          [START_CAMERA_POS_3D.x, START_CAMERA_POS_3D.y, START_CAMERA_POS_3D.z];
-      def.target = [
-        START_CAMERA_TARGET_3D.x, START_CAMERA_TARGET_3D.y,
-        START_CAMERA_TARGET_3D.z
-      ];
-    }
-    return def;
-  }
-
-  /** Recreate the scatter plot camera from a definition structure. */
-  recreateCamera(cameraDef: CameraDef) {
-    if (cameraDef.orthographic) {
-      this.makeCamera2D(cameraDef, this.width, this.height);
-    } else {
-      this.makeCamera3D(cameraDef, this.width, this.height);
-    }
-    this.orbitCameraControls.minDistance = MIN_ZOOM;
-    this.orbitCameraControls.maxDistance = MAX_ZOOM;
-    this.orbitCameraControls.update();
-    if (this.orbitAnimationOnNextCameraCreation) {
-      this.startOrbitAnimation();
-    }
-  }
-
-  private onClick(e?: MouseEvent, notify = true) {
-    if (e && this.selecting) {
-      return;
-    }
-    // Only call event handlers if the click originated from the scatter plot.
-    if (!this.isDragSequence && notify) {
-      const selection = (this.nearestPoint != null) ? [this.nearestPoint] : [];
-      this.projectorEventContext.notifySelectionChanged(selection);
-    }
-    this.isDragSequence = false;
-    this.render();
-  }
-
-  private onMouseDown(e: MouseEvent) {
-    this.isDragSequence = false;
-    this.mouseIsDown = true;
-    if (this.selecting) {
-      this.orbitCameraControls.enabled = false;
-      this.rectangleSelector.onMouseDown(e.offsetX, e.offsetY);
-      this.setNearestPointToMouse(e);
-    } else if (
-        !e.ctrlKey && this.sceneIs3D() &&
-        this.orbitCameraControls.mouseButtons.ORBIT === THREE.MOUSE.RIGHT) {
-      // The user happened to press the ctrl key when the tab was active,
-      // unpressed the ctrl when the tab was inactive, and now he/she
-      // is back to the projector tab.
-      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
-      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.RIGHT;
-    } else if (
-        e.ctrlKey && this.sceneIs3D() &&
-        this.orbitCameraControls.mouseButtons.ORBIT === THREE.MOUSE.LEFT) {
-      // Similarly to the situation above.
-      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.RIGHT;
-      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.LEFT;
-    }
-  }
-
-  /** When we stop dragging/zooming, return to normal behavior. */
-  private onMouseUp(e: any) {
-    if (this.selecting) {
-      this.orbitCameraControls.enabled = true;
-      this.rectangleSelector.onMouseUp();
-      this.render();
-    }
-    this.mouseIsDown = false;
-  }
-
-  /**
-   * When the mouse moves, find the nearest point (if any) and send it to the
-   * hoverlisteners (usually called from embedding.ts)
-   */
-  private onMouseMove(e: MouseEvent) {
-    this.isDragSequence = this.mouseIsDown;
-    // Depending if we're selecting or just navigating, handle accordingly.
-    if (this.selecting && this.mouseIsDown) {
-      this.rectangleSelector.onMouseMove(e.offsetX, e.offsetY);
-      this.render();
-    } else if (!this.mouseIsDown) {
-      this.setNearestPointToMouse(e);
-      this.projectorEventContext.notifyHoverOverPoint(this.nearestPoint);
-    }
-  }
-
-  /** For using ctrl + left click as right click, and for circle select */
-  private onKeyDown(e: any) {
-    // If ctrl is pressed, use left click to orbit
-    if (e.keyCode === CTRL_KEY && this.sceneIs3D()) {
-      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.RIGHT;
-      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.LEFT;
-    }
-
-    // If shift is pressed, start selecting
-    if (e.keyCode === SHIFT_KEY) {
-      this.selecting = true;
-      this.container.style.cursor = 'crosshair';
-    }
-  }
-
-  /** For using ctrl + left click as right click, and for circle select */
-  private onKeyUp(e: any) {
-    if (e.keyCode === CTRL_KEY && this.sceneIs3D()) {
-      this.orbitCameraControls.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
-      this.orbitCameraControls.mouseButtons.PAN = THREE.MOUSE.RIGHT;
-    }
-
-    // If shift is released, stop selecting
-    if (e.keyCode === SHIFT_KEY) {
-      this.selecting = (this.getMouseMode() === MouseMode.AREA_SELECT);
-      if (!this.selecting) {
-        this.container.style.cursor = 'default';
-      }
-      this.render();
-    }
-  }
-
-  /**
-   * Returns a list of indices of points in a bounding box from the picking
-   * texture.
-   * @param boundingBox The bounding box to select from.
-   */
-  private getPointIndicesFromPickingTexture(boundingBox: BoundingBox):
-      number[] {
-    if (this.worldSpacePointPositions == null) {
-      return null;
-    }
-    const pointCount = this.worldSpacePointPositions.length / 3;
-    const dpr = window.devicePixelRatio || 1;
-    const x = Math.floor(boundingBox.x * dpr);
-    const y = Math.floor(boundingBox.y * dpr);
-    const width = Math.floor(boundingBox.width * dpr);
-    const height = Math.floor(boundingBox.height * dpr);
-
-    // Create buffer for reading all of the pixels from the texture.
-    let pixelBuffer = new Uint8Array(width * height * 4);
-
-    // Read the pixels from the bounding box.
-    this.renderer.readRenderTargetPixels(
-        this.pickingTexture, x, this.pickingTexture.height - y, width, height,
-        pixelBuffer);
-
-    // Keep a flat list of each point and whether they are selected or not. This
-    // approach is more efficient than using an object keyed by the index.
-    let pointIndicesSelection =
-        new Uint8Array(this.worldSpacePointPositions.length);
-    for (let i = 0; i < width * height; i++) {
-      const id = (pixelBuffer[i * 4] << 16) | (pixelBuffer[i * 4 + 1] << 8) |
-          pixelBuffer[i * 4 + 2];
-      if (id !== 0xffffff && (id < pointCount)) {
-        pointIndicesSelection[id] = 1;
-      }
-    }
-    let pointIndices: number[] = [];
-    for (let i = 0; i < pointIndicesSelection.length; i++) {
-      if (pointIndicesSelection[i] === 1) {
-        pointIndices.push(i);
-      }
-    }
-
-    return pointIndices;
-  }
-
-
-  private selectBoundingBox(boundingBox: BoundingBox) {
-    let pointIndices = this.getPointIndicesFromPickingTexture(boundingBox);
-    this.projectorEventContext.notifySelectionChanged(pointIndices);
-  }
-
-  private setNearestPointToMouse(e: MouseEvent) {
-    if (this.pickingTexture == null) {
-      this.nearestPoint = null;
-      return;
-    }
-    const boundingBox:
-        BoundingBox = {x: e.offsetX, y: e.offsetY, width: 1, height: 1};
-    const pointIndices = this.getPointIndicesFromPickingTexture(boundingBox);
-    this.nearestPoint = (pointIndices != null) ? pointIndices[0] : null;
-  }
-
-  private getLayoutValues(): Point2D {
-    this.width = this.container.offsetWidth;
-    this.height = Math.max(1, this.container.offsetHeight);
-    return [this.width, this.height];
-  }
-
-  private sceneIs3D(): boolean {
-    return this.dimensionality === 3;
-  }
-
-  private remove3dAxisFromScene(): THREE.Object3D {
-    const axes = this.scene.getObjectByName('axes');
-    if (axes != null) {
-      this.scene.remove(axes);
-    }
-    return axes;
-  }
-
-  private add3dAxis() {
-    const axes = new THREE.AxisHelper();
-    axes.name = 'axes';
-    this.scene.add(axes);
-  }
-
-  /** Set 2d vs 3d mode. */
-  setDimensions(dimensionality: number) {
-    if ((dimensionality !== 2) && (dimensionality !== 3)) {
-      throw new RangeError('dimensionality must be 2 or 3');
-    }
-    this.dimensionality = dimensionality;
-
-    const def = this.cameraDef || this.makeDefaultCameraDef(dimensionality);
-    this.recreateCamera(def);
-
-    this.remove3dAxisFromScene();
-    if (dimensionality === 3) {
-      this.add3dAxis();
-    }
-  }
-
-  /** Gets the current camera information, suitable for serialization. */
-  getCameraDef(): CameraDef {
-    const def = new CameraDef();
-    const pos = this.camera.position;
-    const tgt = this.orbitCameraControls.target;
-    def.orthographic = !this.sceneIs3D();
-    def.position = [pos.x, pos.y, pos.z];
-    def.target = [tgt.x, tgt.y, tgt.z];
-    def.zoom = (this.camera as any).zoom;
-    return def;
-  }
-
-  /** Sets parameters for the next camera recreation. */
-  setCameraParametersForNextCameraCreation(
-      def: CameraDef, orbitAnimation: boolean) {
-    this.cameraDef = def;
-    this.orbitAnimationOnNextCameraCreation = orbitAnimation;
-  }
-
-  /** Gets the current camera position. */
-  getCameraPosition(): Point3D {
-    const currPos = this.camera.position;
-    return [currPos.x, currPos.y, currPos.z];
-  }
-
-  /** Gets the current camera target. */
-  getCameraTarget(): Point3D {
-    let currTarget = this.orbitCameraControls.target;
-    return [currTarget.x, currTarget.y, currTarget.z];
-  }
-
-  /** Sets up the camera from given position and target coordinates. */
-  setCameraPositionAndTarget(position: Point3D, target: Point3D) {
-    this.stopOrbitAnimation();
-    this.camera.position.set(position[0], position[1], position[2]);
-    this.orbitCameraControls.target.set(target[0], target[1], target[2]);
-    this.orbitCameraControls.update();
-    this.render();
-  }
-
-  /** Starts orbiting the camera around its current lookat target. */
-  startOrbitAnimation() {
-    if (!this.sceneIs3D()) {
-      return;
-    }
-    if (this.orbitAnimationId != null) {
-      this.stopOrbitAnimation();
-    }
-    this.orbitCameraControls.autoRotate = true;
-    this.orbitCameraControls.rotateSpeed =
-        ORBIT_ANIMATION_ROTATION_CYCLE_IN_SECONDS;
-    this.updateOrbitAnimation();
-  }
-
-  private updateOrbitAnimation() {
-    this.orbitCameraControls.update();
-    this.orbitAnimationId =
-        requestAnimationFrame(() => this.updateOrbitAnimation());
-  }
-
-  /** Stops the orbiting animation on the camera. */
-  stopOrbitAnimation() {
-    this.orbitCameraControls.autoRotate = false;
-    this.orbitCameraControls.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
-    if (this.orbitAnimationId != null) {
-      cancelAnimationFrame(this.orbitAnimationId);
-      this.orbitAnimationId = null;
-    }
-  }
-
-  /** Adds a visualizer to the set, will start dispatching events to it */
-  addVisualizer(visualizer: ScatterPlotVisualizer) {
-    if (this.scene) {
-      visualizer.setScene(this.scene);
-    }
-    visualizer.onResize(this.width, this.height);
-    visualizer.onPointPositionsChanged(this.worldSpacePointPositions);
-    this.visualizers.push(visualizer);
-  }
-
-  /** Removes all visualizers attached to this scatter plot. */
-  removeAllVisualizers() {
-    this.visualizers.forEach(v => v.dispose());
-    this.visualizers = [];
-  }
-
-  /** Update scatter plot with a new array of packed xyz point positions. */
-  setPointPositions(worldSpacePointPositions: Float32Array) {
-    this.worldSpacePointPositions = worldSpacePointPositions;
-    this.visualizers.forEach(
-        v => v.onPointPositionsChanged(worldSpacePointPositions));
-  }
-
-  render() {
-    {
-      const lightPos = this.camera.position.clone();
-      lightPos.x += 1;
-      lightPos.y += 1;
-      this.light.position.set(lightPos.x, lightPos.y, lightPos.z);
-    }
-
-    const cameraType = (this.camera instanceof THREE.PerspectiveCamera) ?
-        CameraType.Perspective :
-        CameraType.Orthographic;
-
-    let cameraSpacePointExtents: [number, number] = [0, 0];
-    if (this.worldSpacePointPositions != null) {
-      cameraSpacePointExtents = util.getNearFarPoints(
-          this.worldSpacePointPositions, this.camera.position,
-          this.orbitCameraControls.target);
-    }
-
-    const rc = new RenderContext(
-        this.camera, cameraType, this.orbitCameraControls.target, this.width,
-        this.height, cameraSpacePointExtents[0], cameraSpacePointExtents[1],
-        this.backgroundColor, this.pointColors, this.pointScaleFactors,
-        this.labels, this.polylineColors, this.polylineOpacities,
-        this.polylineWidths);
-
-    // Render first pass to picking target. This render fills pickingTexture
-    // with colors that are actually point ids, so that sampling the texture at
-    // the mouse's current x,y coordinates will reveal the data point that the
-    // mouse is over.
-    this.visualizers.forEach(v => v.onPickingRender(rc));
-
-    {
-      const axes = this.remove3dAxisFromScene();
-      this.renderer.render(this.scene, this.camera, this.pickingTexture);
-      if (axes != null) {
-        this.scene.add(axes);
-      }
-    }
-
-    // Render second pass to color buffer, to be displayed on the canvas.
-    this.visualizers.forEach(v => v.onRender(rc));
-
-    this.renderer.render(this.scene, this.camera);
-  }
-
-  setMouseMode(mouseMode: MouseMode) {
-    this.mouseMode = mouseMode;
-    if (mouseMode === MouseMode.AREA_SELECT) {
-      this.selecting = true;
-      this.container.style.cursor = 'crosshair';
-    } else {
-      this.selecting = false;
-      this.container.style.cursor = 'default';
-    }
-  }
-
-  /** Set the colors for every data point. (RGB triplets) */
-  setPointColors(colors: Float32Array) {
-    this.pointColors = colors;
-  }
-
-  /** Set the scale factors for every data point. (scalars) */
-  setPointScaleFactors(scaleFactors: Float32Array) {
-    this.pointScaleFactors = scaleFactors;
-  }
-
-  /** Set the labels to rendered */
-  setLabels(labels: LabelRenderParams) {
-    this.labels = labels;
-  }
-
-  /** Set the colors for every data polyline. (RGB triplets) */
-  setPolylineColors(colors: {[polylineIndex: number]: Float32Array}) {
-    this.polylineColors = colors;
-  }
-
-  setPolylineOpacities(opacities: Float32Array) {
-    this.polylineOpacities = opacities;
-  }
-
-  setPolylineWidths(widths: Float32Array) {
-    this.polylineWidths = widths;
-  }
-
-  getMouseMode(): MouseMode {
-    return this.mouseMode;
-  }
-
-  resetZoom() {
-    this.recreateCamera(this.makeDefaultCameraDef(this.dimensionality));
-    this.render();
-  }
-
-  setDayNightMode(isNight: boolean) {
-    const canvases = this.container.querySelectorAll('canvas');
-    const filterValue = isNight ? 'invert(100%)' : null;
-    for (let i = 0; i < canvases.length; i++) {
-      canvases[i].style.filter = filterValue;
-    }
-  }
-
-  resize(render = true) {
-    const [oldW, oldH] = [this.width, this.height];
-    const [newW, newH] = this.getLayoutValues();
-
-    if (this.dimensionality === 3) {
-      const camera = (this.camera as THREE.PerspectiveCamera);
-      camera.aspect = newW / newH;
-      camera.updateProjectionMatrix();
-    } else {
-      const camera = (this.camera as THREE.OrthographicCamera);
-      // Scale the ortho frustum by however much the window changed.
-      const scaleW = newW / oldW;
-      const scaleH = newH / oldH;
-      const newCamHalfWidth = ((camera.right - camera.left) * scaleW) / 2;
-      const newCamHalfHeight = ((camera.top - camera.bottom) * scaleH) / 2;
-      camera.top = newCamHalfHeight;
-      camera.bottom = -newCamHalfHeight;
-      camera.left = -newCamHalfWidth;
-      camera.right = newCamHalfWidth;
-      camera.updateProjectionMatrix();
-    }
-
-    // Accouting for retina displays.
-    const dpr = window.devicePixelRatio || 1;
-    this.renderer.setPixelRatio(dpr);
-    this.renderer.setSize(newW, newH);
-
-    // the picking texture needs to be exactly the same as the render texture.
-    {
-      const renderCanvasSize = this.renderer.getSize();
-      const pixelRatio = this.renderer.getPixelRatio();
-      this.pickingTexture = new THREE.WebGLRenderTarget(
-          renderCanvasSize.width * pixelRatio,
-          renderCanvasSize.height * pixelRatio);
-      this.pickingTexture.texture.minFilter = THREE.LinearFilter;
-    }
-
-    this.visualizers.forEach(v => v.onResize(newW, newH));
-
-    if (render) {
-      this.render();
-    };
-  }
-
-  onCameraMove(listener: OnCameraMoveListener) {
-    this.onCameraMoveListeners.push(listener);
-  }
-
-  clickOnPoint(pointIndex: number) {
-    this.nearestPoint = pointIndex;
-    this.onClick(null, false);
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts
deleted file mode 100644
index a781877014..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-const FILL = '#dddddd';
-const FILL_OPACITY = .2;
-const STROKE = '#aaaaaa';
-const STROKE_WIDTH = 2;
-const STROKE_DASHARRAY = '10 5';
-
-export interface BoundingBox {
-  // The bounding box (x, y) position refers to the bottom left corner of the
-  // rect.
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-/**
- * A class that manages and renders a data selection rectangle.
- */
-export class ScatterPlotRectangleSelector {
-  private svgElement: SVGElement;
-  private rectElement: SVGRectElement;
-
-  private isMouseDown: boolean;
-  private startCoordinates: [number, number];
-  private lastBoundingBox: BoundingBox;
-
-  private selectionCallback: (boundingBox: BoundingBox) => void;
-
-  /**
-   * @param container The container HTML element that the selection SVG rect
-   *     will be a child of.
-   * @param selectionCallback The callback that accepts a bounding box to be
-   *     called when selection changes. Currently, we only call the callback on
-   *     mouseUp.
-   */
-  constructor(
-      container: HTMLElement,
-      selectionCallback: (boundingBox: BoundingBox) => void) {
-    this.svgElement = container.querySelector('#selector') as SVGElement;
-    this.rectElement =
-        document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-    this.rectElement.style.stroke = STROKE;
-    this.rectElement.style.strokeDasharray = STROKE_DASHARRAY;
-    this.rectElement.style.strokeWidth = '' + STROKE_WIDTH;
-    this.rectElement.style.fill = FILL;
-    this.rectElement.style.fillOpacity = '' + FILL_OPACITY;
-    this.svgElement.appendChild(this.rectElement);
-
-    this.selectionCallback = selectionCallback;
-    this.isMouseDown = false;
-  }
-
-  onMouseDown(offsetX: number, offsetY: number) {
-    this.isMouseDown = true;
-    this.rectElement.style.display = 'block';
-
-    this.startCoordinates = [offsetX, offsetY];
-    this.lastBoundingBox = {
-      x: this.startCoordinates[0],
-      y: this.startCoordinates[1],
-      width: 1,
-      height: 1
-    };
-  }
-
-  onMouseMove(offsetX: number, offsetY: number) {
-    if (!this.isMouseDown) {
-      return;
-    }
-
-    this.lastBoundingBox.x = Math.min(offsetX, this.startCoordinates[0]);
-    this.lastBoundingBox.y = Math.max(offsetY, this.startCoordinates[1]);
-    this.lastBoundingBox.width =
-        Math.max(offsetX, this.startCoordinates[0]) - this.lastBoundingBox.x;
-    this.lastBoundingBox.height =
-        this.lastBoundingBox.y - Math.min(offsetY, this.startCoordinates[1]);
-
-    this.rectElement.setAttribute('x', '' + this.lastBoundingBox.x);
-    this.rectElement.setAttribute(
-        'y', '' + (this.lastBoundingBox.y - this.lastBoundingBox.height));
-    this.rectElement.setAttribute('width', '' + this.lastBoundingBox.width);
-    this.rectElement.setAttribute('height', '' + this.lastBoundingBox.height);
-  }
-
-  onMouseUp() {
-    this.isMouseDown = false;
-    this.rectElement.style.display = 'none';
-    this.rectElement.setAttribute('width', '0');
-    this.rectElement.setAttribute('height', '0');
-    this.selectionCallback(this.lastBoundingBox);
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts
deleted file mode 100644
index 91cb10a97e..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotRectangleSelector_test.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {BoundingBox, ScatterPlotRectangleSelector} from './scatterPlotRectangleSelector';
-
-describe('selector callbacks make bounding box start bottom left', () => {
-  let containerElement: HTMLElement;
-  let selectionCallback: (boundingBox: BoundingBox) => void;
-  let selection: ScatterPlotRectangleSelector;
-
-  beforeEach(() => {
-    containerElement = document.createElement('div');
-    const selector = document.createElement('svg');
-    selector.id = 'selector';
-    containerElement.appendChild(selector);
-
-    selectionCallback = jasmine.createSpy('selectionCallback');
-    selection =
-        new ScatterPlotRectangleSelector(containerElement, selectionCallback);
-  });
-
-  it('Simple mouse event starting top left', () => {
-    selection.onMouseDown(0, 0);
-    selection.onMouseMove(10, 10);
-    selection.onMouseUp();
-
-    expect(selectionCallback)
-        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
-  });
-
-  it('Simple mouse event starting bottom left', () => {
-    selection.onMouseDown(0, 10);
-    selection.onMouseMove(10, 0);
-    selection.onMouseUp();
-
-    expect(selectionCallback)
-        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
-  });
-
-  it('Simple mouse event starting top right', () => {
-    selection.onMouseDown(10, 0);
-    selection.onMouseMove(0, 10);
-    selection.onMouseUp();
-
-    expect(selectionCallback)
-        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
-  });
-
-  it('Simple mouse event starting bottom right', () => {
-    selection.onMouseDown(10, 10);
-    selection.onMouseMove(0, 0);
-    selection.onMouseUp();
-
-    expect(selectionCallback)
-        .toHaveBeenCalledWith({x: 0, y: 10, width: 10, height: 10});
-  });
-});
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer.ts
deleted file mode 100644
index b0974a2053..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {RenderContext} from './renderContext';
-
-/**
- * ScatterPlotVisualizer is an interface used by ScatterPlotContainer
- * to manage and aggregate any number of concurrent visualization behaviors.
- * To add a new visualization to the 3D scatter plot, create a new class that
- * implements this interface and attach it to the ScatterPlotContainer.
- */
-export interface ScatterPlotVisualizer {
-  /** Called to initialize the visualizer with the primary scene. */
-  setScene(scene: THREE.Scene);
-  /**
-   * Called when the main scatter plot tears down the visualizer. Remove all
-   * objects from the scene, and dispose any heavy resources.
-   */
-  dispose();
-  /**
-   * Called when the positions of the scatter plot points have changed.
-   */
-  onPointPositionsChanged(newWorldSpacePointPositions: Float32Array);
-  /**
-   * Called immediately before the main scatter plot performs a picking
-   * (selection) render. Set up render state for any geometry to use picking IDs
-   * instead of visual colors.
-   */
-  onPickingRender(renderContext: RenderContext);
-  /**
-   * Called immediately before the main scatter plot performs a color (visual)
-   * render. Set up render state, lights, etc here.
-   */
-  onRender(renderContext: RenderContext);
-  /**
-   * Called when the canvas size changes.
-   */
-  onResize(newWidth: number, newHeight: number);
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer3DLabels.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer3DLabels.ts
deleted file mode 100644
index cbd9785e2f..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizer3DLabels.ts
+++ /dev/null
@@ -1,367 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {RenderContext} from './renderContext';
-import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
-import * as util from './util';
-
-const FONT_SIZE = 80;
-const ONE_OVER_FONT_SIZE = 1 / FONT_SIZE;
-const LABEL_SCALE = 2.2;  // at 1:1 texel/pixel ratio
-const LABEL_COLOR = 'black';
-const LABEL_BACKGROUND = 'white';
-const MAX_CANVAS_DIMENSION = 8192;
-const NUM_GLYPHS = 256;
-const RGB_ELEMENTS_PER_ENTRY = 3;
-const XYZ_ELEMENTS_PER_ENTRY = 3;
-const UV_ELEMENTS_PER_ENTRY = 2;
-const VERTICES_PER_GLYPH = 2 * 3;  // 2 triangles, 3 verts per triangle
-
-/**
- * Each label is made up of triangles (two per letter.) Each vertex, then, is
- * the corner of one of these triangles (and thus the corner of a letter
- * rectangle.)
- * Each has the following attributes:
- *    posObj: The (x, y) position of the vertex within the label, where the
- *            bottom center of the word is positioned at (0, 0);
- *    position: The position of the label in worldspace.
- *    vUv: The (u, v) coordinates that index into the glyphs sheet (range 0, 1.)
- *    color: The color of the label (matches the cooresponding point's color.)
- *    wordShown: Boolean. Whether or not the label is visible.
- */
-
-const VERTEX_SHADER = `
-    attribute vec2 posObj;
-    attribute vec3 color;
-    varying vec2 vUv;
-    varying vec3 vColor;
-
-    void main() {
-      vUv = uv;
-      vColor = color;
-
-      // Rotate label to face camera.
-
-      vec4 vRight = vec4(
-        modelViewMatrix[0][0], modelViewMatrix[1][0], modelViewMatrix[2][0], 0);
-
-      vec4 vUp = vec4(
-        modelViewMatrix[0][1], modelViewMatrix[1][1], modelViewMatrix[2][1], 0);
-
-      vec4 vAt = -vec4(
-        modelViewMatrix[0][2], modelViewMatrix[1][2], modelViewMatrix[2][2], 0);
-
-      mat4 pointToCamera = mat4(vRight, vUp, vAt, vec4(0, 0, 0, 1));
-
-      vec2 scaledPos = posObj * ${ONE_OVER_FONT_SIZE} * ${LABEL_SCALE};
-
-      vec4 posRotated = pointToCamera * vec4(scaledPos, 0, 1);
-      vec4 mvPosition = modelViewMatrix * (vec4(position, 0) + posRotated);
-      gl_Position = projectionMatrix * mvPosition;
-    }`;
-
-const FRAGMENT_SHADER = `
-    uniform sampler2D texture;
-    uniform bool picking;
-    varying vec2 vUv;
-    varying vec3 vColor;
-
-    void main() {
-      if (picking) {
-        gl_FragColor = vec4(vColor, 1.0);
-      } else {
-        vec4 fromTexture = texture2D(texture, vUv);
-        gl_FragColor = vec4(vColor, 1.0) * fromTexture;
-      }
-    }`;
-
-type GlyphTexture = {
-  texture: THREE.Texture; lengths: Float32Array; offsets: Float32Array;
-};
-
-/**
- * Renders the text labels as 3d geometry in the world.
- */
-export class ScatterPlotVisualizer3DLabels implements ScatterPlotVisualizer {
-  private scene: THREE.Scene;
-  private labelStrings: string[];
-  private geometry: THREE.BufferGeometry;
-  private worldSpacePointPositions: Float32Array;
-  private pickingColors: Float32Array;
-  private renderColors: Float32Array;
-  private material: THREE.ShaderMaterial;
-  private uniforms: Object;
-  private labelsMesh: THREE.Mesh;
-  private positions: THREE.BufferAttribute;
-  private totalVertexCount: number;
-  private labelVertexMap: number[][];
-  private glyphTexture: GlyphTexture;
-
-  private createGlyphTexture(): GlyphTexture {
-    let canvas = document.createElement('canvas');
-    canvas.width = MAX_CANVAS_DIMENSION;
-    canvas.height = FONT_SIZE;
-    let ctx = canvas.getContext('2d');
-    ctx.font = 'bold ' + FONT_SIZE * 0.75 + 'px roboto';
-    ctx.textBaseline = 'top';
-    ctx.fillStyle = LABEL_BACKGROUND;
-    ctx.rect(0, 0, canvas.width, canvas.height);
-    ctx.fill();
-    ctx.fillStyle = LABEL_COLOR;
-    let spaceOffset = ctx.measureText(' ').width;
-    // For each letter, store length, position at the encoded index.
-    let glyphLengths = new Float32Array(NUM_GLYPHS);
-    let glyphOffset = new Float32Array(NUM_GLYPHS);
-    let leftCoord = 0;
-    for (let i = 0; i < NUM_GLYPHS; i++) {
-      let text = ' ' + String.fromCharCode(i);
-      let textLength = ctx.measureText(text).width;
-      glyphLengths[i] = textLength - spaceOffset;
-      glyphOffset[i] = leftCoord;
-      ctx.fillText(text, leftCoord - spaceOffset, 0);
-      leftCoord += textLength;
-    }
-    const tex = util.createTexture(canvas);
-    return {texture: tex, lengths: glyphLengths, offsets: glyphOffset};
-  }
-
-  private processLabelVerts(pointCount: number) {
-    let numTotalLetters = 0;
-    this.labelVertexMap = [];
-    for (let i = 0; i < pointCount; i++) {
-      const label = this.labelStrings[i];
-      let vertsArray: number[] = [];
-      for (let j = 0; j < label.length; j++) {
-        for (let k = 0; k < VERTICES_PER_GLYPH; k++) {
-          vertsArray.push(numTotalLetters * VERTICES_PER_GLYPH + k);
-        }
-        numTotalLetters++;
-      }
-      this.labelVertexMap.push(vertsArray);
-    }
-    this.totalVertexCount = numTotalLetters * VERTICES_PER_GLYPH;
-  }
-
-  private createColorBuffers(pointCount: number) {
-    this.pickingColors =
-        new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
-    this.renderColors =
-        new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
-    for (let i = 0; i < pointCount; i++) {
-      let color = new THREE.Color(i);
-      this.labelVertexMap[i].forEach((j) => {
-        this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j] = color.r;
-        this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j + 1] = color.g;
-        this.pickingColors[RGB_ELEMENTS_PER_ENTRY * j + 2] = color.b;
-        this.renderColors[RGB_ELEMENTS_PER_ENTRY * j] = 1.0;
-        this.renderColors[RGB_ELEMENTS_PER_ENTRY * j + 1] = 1.0;
-        this.renderColors[RGB_ELEMENTS_PER_ENTRY * j + 2] = 1.0;
-      });
-    }
-  }
-
-  private createLabels() {
-    if ((this.labelStrings == null) ||
-        (this.worldSpacePointPositions == null)) {
-      return;
-    }
-    const pointCount =
-        this.worldSpacePointPositions.length / XYZ_ELEMENTS_PER_ENTRY;
-    if (pointCount !== this.labelStrings.length) {
-      return;
-    }
-    this.glyphTexture = this.createGlyphTexture();
-
-    this.uniforms = {
-      texture: {type: 't'},
-      picking: {type: 'bool'},
-    };
-
-    this.material = new THREE.ShaderMaterial({
-      uniforms: this.uniforms,
-      transparent: true,
-      vertexShader: VERTEX_SHADER,
-      fragmentShader: FRAGMENT_SHADER,
-    });
-
-    this.processLabelVerts(pointCount);
-    this.createColorBuffers(pointCount);
-
-    let positionArray =
-        new Float32Array(this.totalVertexCount * XYZ_ELEMENTS_PER_ENTRY);
-    this.positions =
-        new THREE.BufferAttribute(positionArray, XYZ_ELEMENTS_PER_ENTRY);
-
-    let posArray =
-        new Float32Array(this.totalVertexCount * XYZ_ELEMENTS_PER_ENTRY);
-    let uvArray =
-        new Float32Array(this.totalVertexCount * UV_ELEMENTS_PER_ENTRY);
-    let colorsArray =
-        new Float32Array(this.totalVertexCount * RGB_ELEMENTS_PER_ENTRY);
-    let positionObject = new THREE.BufferAttribute(posArray, 2);
-    let uv = new THREE.BufferAttribute(uvArray, UV_ELEMENTS_PER_ENTRY);
-    let colors = new THREE.BufferAttribute(colorsArray, RGB_ELEMENTS_PER_ENTRY);
-
-    this.geometry = new THREE.BufferGeometry();
-    this.geometry.addAttribute('posObj', positionObject);
-    this.geometry.addAttribute('position', this.positions);
-    this.geometry.addAttribute('uv', uv);
-    this.geometry.addAttribute('color', colors);
-
-    let lettersSoFar = 0;
-    for (let i = 0; i < pointCount; i++) {
-      const label = this.labelStrings[i];
-      let leftOffset = 0;
-      // Determine length of word in pixels.
-      for (let j = 0; j < label.length; j++) {
-        let letterCode = label.charCodeAt(j);
-        leftOffset += this.glyphTexture.lengths[letterCode];
-      }
-      leftOffset /= -2;  // centers text horizontally around the origin
-      for (let j = 0; j < label.length; j++) {
-        let letterCode = label.charCodeAt(j);
-        let letterWidth = this.glyphTexture.lengths[letterCode];
-        let scale = FONT_SIZE;
-        let right = (leftOffset + letterWidth) / scale;
-        let left = (leftOffset) / scale;
-        let top = FONT_SIZE / scale;
-
-        // First triangle
-        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 0, left, 0);
-        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 1, right, 0);
-        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 2, left, top);
-
-        // Second triangle
-        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 3, left, top);
-        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 4, right, 0);
-        positionObject.setXY(lettersSoFar * VERTICES_PER_GLYPH + 5, right, top);
-
-        // Set UVs based on letter.
-        let uLeft = (this.glyphTexture.offsets[letterCode]);
-        let uRight = (this.glyphTexture.offsets[letterCode] + letterWidth);
-        // Scale so that uvs lie between 0 and 1 on the texture.
-        uLeft /= MAX_CANVAS_DIMENSION;
-        uRight /= MAX_CANVAS_DIMENSION;
-        let vTop = 1;
-        let vBottom = 0;
-        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 0, uLeft, vTop);
-        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 1, uRight, vTop);
-        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 2, uLeft, vBottom);
-        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 3, uLeft, vBottom);
-        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 4, uRight, vTop);
-        uv.setXY(lettersSoFar * VERTICES_PER_GLYPH + 5, uRight, vBottom);
-
-        lettersSoFar++;
-        leftOffset += letterWidth;
-      }
-    }
-
-    for (let i = 0; i < pointCount; i++) {
-      const p = util.vector3FromPackedArray(this.worldSpacePointPositions, i);
-      this.labelVertexMap[i].forEach((j) => {
-        this.positions.setXYZ(j, p.x, p.y, p.z);
-      });
-    };
-
-    this.labelsMesh = new THREE.Mesh(this.geometry, this.material);
-    this.labelsMesh.frustumCulled = false;
-    this.scene.add(this.labelsMesh);
-  }
-
-  private colorLabels(pointColors: Float32Array) {
-    if (this.labelStrings == null || this.geometry == null ||
-        pointColors == null) {
-      return;
-    }
-
-    const colors = this.geometry.getAttribute('color') as THREE.BufferAttribute;
-    colors.array = this.renderColors;
-
-    const n = pointColors.length / XYZ_ELEMENTS_PER_ENTRY;
-    let src = 0;
-    for (let i = 0; i < n; ++i) {
-      const c = new THREE.Color(
-          pointColors[src], pointColors[src + 1], pointColors[src + 2]);
-      const m = this.labelVertexMap[i].length;
-      for (let j = 0; j < m; ++j) {
-        colors.setXYZ(this.labelVertexMap[i][j], c.r, c.g, c.b);
-      }
-      src += RGB_ELEMENTS_PER_ENTRY;
-    }
-    colors.needsUpdate = true;
-  }
-
-  setScene(scene: THREE.Scene) {
-    this.scene = scene;
-  }
-
-  dispose() {
-    if (this.labelsMesh) {
-      if (this.scene) {
-        this.scene.remove(this.labelsMesh);
-      }
-      this.labelsMesh = null;
-    }
-    if (this.geometry) {
-      this.geometry.dispose();
-      this.geometry = null;
-    }
-    if ((this.glyphTexture != null) && (this.glyphTexture.texture != null)) {
-      this.glyphTexture.texture.dispose();
-      this.glyphTexture.texture = null;
-    }
-  }
-
-  onPickingRender(rc: RenderContext) {
-    if (this.geometry == null) {
-      this.createLabels();
-    }
-    if (this.geometry == null) {
-      return;
-    }
-    this.material.uniforms.texture.value = this.glyphTexture.texture;
-    this.material.uniforms.picking.value = true;
-    const colors = this.geometry.getAttribute('color') as THREE.BufferAttribute;
-    colors.array = this.pickingColors;
-    colors.needsUpdate = true;
-  }
-
-  onRender(rc: RenderContext) {
-    if (this.geometry == null) {
-      this.createLabels();
-    }
-    if (this.geometry == null) {
-      return;
-    }
-    this.colorLabels(rc.pointColors);
-    this.material.uniforms.texture.value = this.glyphTexture.texture;
-    this.material.uniforms.picking.value = false;
-    const colors = this.geometry.getAttribute('color') as THREE.BufferAttribute;
-    colors.array = this.renderColors;
-    colors.needsUpdate = true;
-  }
-
-  onPointPositionsChanged(newPositions: Float32Array) {
-    this.worldSpacePointPositions = newPositions;
-    this.dispose();
-  }
-
-  setLabelStrings(labelStrings: string[]) {
-    this.labelStrings = labelStrings;
-    this.dispose();
-  }
-
-  onResize(newWidth: number, newHeight: number) {}
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts
deleted file mode 100644
index 303b59f754..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerCanvasLabels.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {BoundingBox, CollisionGrid} from './label';
-import {CameraType, RenderContext} from './renderContext';
-import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
-import * as util from './util';
-
-const MAX_LABELS_ON_SCREEN = 10000;
-const LABEL_STROKE_WIDTH = 3;
-const LABEL_FILL_WIDTH = 6;
-
-/**
- * Creates and maintains a 2d canvas on top of the GL canvas. All labels, when
- * active, are rendered to the 2d canvas as part of the visible render pass.
- */
-export class ScatterPlotVisualizerCanvasLabels implements
-    ScatterPlotVisualizer {
-  private worldSpacePointPositions: Float32Array;
-  private gc: CanvasRenderingContext2D;
-  private canvas: HTMLCanvasElement;
-  private labelsActive: boolean = true;
-
-  constructor(container: HTMLElement) {
-    this.canvas = document.createElement('canvas');
-    container.appendChild(this.canvas);
-
-    this.gc = this.canvas.getContext('2d');
-    this.canvas.style.position = 'absolute';
-    this.canvas.style.left = '0';
-    this.canvas.style.top = '0';
-    this.canvas.style.pointerEvents = 'none';
-  }
-
-  private removeAllLabels() {
-    const pixelWidth = this.canvas.width * window.devicePixelRatio;
-    const pixelHeight = this.canvas.height * window.devicePixelRatio;
-    this.gc.clearRect(0, 0, pixelWidth, pixelHeight);
-  }
-
-  /** Render all of the non-overlapping visible labels to the canvas. */
-  private makeLabels(rc: RenderContext) {
-    if ((rc.labels == null) || (rc.labels.pointIndices.length === 0)) {
-      return;
-    }
-    if (this.worldSpacePointPositions == null) {
-      return;
-    }
-
-    const lrc = rc.labels;
-    const sceneIs3D: boolean = (rc.cameraType === CameraType.Perspective);
-    const labelHeight = parseInt(this.gc.font, 10);
-    const dpr = window.devicePixelRatio;
-
-    let grid: CollisionGrid;
-    {
-      const pixw = this.canvas.width * dpr;
-      const pixh = this.canvas.height * dpr;
-      const bb: BoundingBox = {loX: 0, hiX: pixw, loY: 0, hiY: pixh};
-      grid = new CollisionGrid(bb, pixw / 25, pixh / 50);
-    }
-
-    let opacityMap =
-        d3.scale.pow()
-            .exponent(Math.E)
-            .domain([rc.farthestCameraSpacePointZ, rc.nearestCameraSpacePointZ])
-            .range([0.1, 1]);
-
-    const camPos = rc.camera.position;
-    const camToTarget = camPos.clone().sub(rc.cameraTarget);
-    let camToPoint = new THREE.Vector3();
-
-    this.gc.textBaseline = 'middle';
-    this.gc.miterLimit = 2;
-
-    // Have extra space between neighboring labels. Don't pack too tightly.
-    const labelMargin = 2;
-    // Shift the label to the right of the point circle.
-    const xShift = 4;
-
-    const n = Math.min(MAX_LABELS_ON_SCREEN, lrc.pointIndices.length);
-    for (let i = 0; i < n; ++i) {
-      let point: THREE.Vector3;
-      {
-        const pi = lrc.pointIndices[i];
-        point = util.vector3FromPackedArray(this.worldSpacePointPositions, pi);
-      }
-
-      // discard points that are behind the camera
-      camToPoint.copy(camPos).sub(point);
-      if (camToTarget.dot(camToPoint) < 0) {
-        continue;
-      }
-
-      let [x, y] = util.vector3DToScreenCoords(
-          rc.camera, rc.screenWidth, rc.screenHeight, point);
-      x += xShift;
-
-      // Computing the width of the font is expensive,
-      // so we assume width of 1 at first. Then, if the label doesn't
-      // conflict with other labels, we measure the actual width.
-      const textBoundingBox: BoundingBox = {
-        loX: x - labelMargin,
-        hiX: x + 1 + labelMargin,
-        loY: y - labelHeight / 2 - labelMargin,
-        hiY: y + labelHeight / 2 + labelMargin
-      };
-
-      if (grid.insert(textBoundingBox, true)) {
-        const text = lrc.labelStrings[i];
-        const fontSize = lrc.defaultFontSize * lrc.scaleFactors[i] * dpr;
-        this.gc.font = fontSize + 'px roboto';
-
-        // Now, check with properly computed width.
-        textBoundingBox.hiX += this.gc.measureText(text).width - 1;
-        if (grid.insert(textBoundingBox)) {
-          let opacity = 1;
-          if (sceneIs3D && (lrc.useSceneOpacityFlags[i] === 1)) {
-            opacity = opacityMap(camToPoint.length());
-          }
-          this.gc.fillStyle =
-              this.styleStringFromPackedRgba(lrc.fillColors, i, opacity);
-          this.gc.strokeStyle =
-              this.styleStringFromPackedRgba(lrc.strokeColors, i, opacity);
-          this.gc.lineWidth = LABEL_STROKE_WIDTH;
-          this.gc.strokeText(text, x, y);
-          this.gc.lineWidth = LABEL_FILL_WIDTH;
-          this.gc.fillText(text, x, y);
-        }
-      }
-    }
-  }
-
-  private styleStringFromPackedRgba(
-      packedRgbaArray: Uint8Array, colorIndex: number,
-      opacity: number): string {
-    const offset = colorIndex * 3;
-    const r = packedRgbaArray[offset];
-    const g = packedRgbaArray[offset + 1];
-    const b = packedRgbaArray[offset + 2];
-    return 'rgba(' + r + ',' + g + ',' + b + ',' + opacity + ')';
-  }
-
-  onResize(newWidth: number, newHeight: number) {
-    let dpr = window.devicePixelRatio;
-    this.canvas.width = newWidth * dpr;
-    this.canvas.height = newHeight * dpr;
-    this.canvas.style.width = newWidth + 'px';
-    this.canvas.style.height = newHeight + 'px';
-  }
-
-  dispose() {
-    this.removeAllLabels();
-    this.canvas = null;
-    this.gc = null;
-  }
-
-  onPointPositionsChanged(newPositions: Float32Array) {
-    this.worldSpacePointPositions = newPositions;
-    this.removeAllLabels();
-  }
-
-  onRender(rc: RenderContext) {
-    if (!this.labelsActive) {
-      return;
-    }
-
-    this.removeAllLabels();
-    this.makeLabels(rc);
-  }
-
-  setScene(scene: THREE.Scene) {}
-  onPickingRender(renderContext: RenderContext) {}
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerPolylines.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerPolylines.ts
deleted file mode 100644
index e6d4aeda28..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerPolylines.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataSet} from './data';
-import {RenderContext} from './renderContext';
-import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
-import * as util from './util';
-
-const RGB_NUM_ELEMENTS = 3;
-const XYZ_NUM_ELEMENTS = 3;
-
-/**
- * Renders polylines that connect multiple points in the dataset.
- */
-export class ScatterPlotVisualizerPolylines implements ScatterPlotVisualizer {
-  private dataSet: DataSet;
-  private scene: THREE.Scene;
-  private polylines: THREE.Line[];
-  private polylinePositionBuffer:
-      {[polylineIndex: number]: THREE.BufferAttribute} = {};
-  private polylineColorBuffer:
-      {[polylineIndex: number]: THREE.BufferAttribute} = {};
-
-  private updateSequenceIndicesInDataSet(ds: DataSet) {
-    for (let i = 0; i < ds.sequences.length; i++) {
-      const sequence = ds.sequences[i];
-      for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
-        ds.points[sequence.pointIndices[j]].sequenceIndex = i;
-        ds.points[sequence.pointIndices[j + 1]].sequenceIndex = i;
-      }
-    }
-  }
-
-  private createPolylines(scene: THREE.Scene) {
-    if (!this.dataSet || !this.dataSet.sequences) {
-      return;
-    }
-
-    this.updateSequenceIndicesInDataSet(this.dataSet);
-    this.polylines = [];
-
-    for (let i = 0; i < this.dataSet.sequences.length; i++) {
-      const geometry = new THREE.BufferGeometry();
-      geometry.addAttribute('position', this.polylinePositionBuffer[i]);
-      geometry.addAttribute('color', this.polylineColorBuffer[i]);
-
-      const material = new THREE.LineBasicMaterial({
-        linewidth: 1,  // unused default, overwritten by width array.
-        opacity: 1.0,  // unused default, overwritten by opacity array.
-        transparent: true,
-        vertexColors: THREE.VertexColors
-      });
-
-      const polyline = new THREE.LineSegments(geometry, material);
-      polyline.frustumCulled = false;
-      this.polylines.push(polyline);
-      scene.add(polyline);
-    }
-  }
-
-  dispose() {
-    if (this.polylines == null) {
-      return;
-    }
-    for (let i = 0; i < this.polylines.length; i++) {
-      this.scene.remove(this.polylines[i]);
-      this.polylines[i].geometry.dispose();
-    }
-    this.polylines = null;
-    this.polylinePositionBuffer = {};
-    this.polylineColorBuffer = {};
-  }
-
-  setScene(scene: THREE.Scene) {
-    this.scene = scene;
-  }
-
-  setDataSet(dataSet: DataSet) {
-    this.dataSet = dataSet;
-  }
-
-  onPointPositionsChanged(newPositions: Float32Array) {
-    if ((newPositions == null) || (this.polylines != null)) {
-      this.dispose();
-    }
-    if ((newPositions == null) || (this.dataSet == null)) {
-      return;
-    }
-    // Set up the position buffer arrays for each polyline.
-    for (let i = 0; i < this.dataSet.sequences.length; i++) {
-      let sequence = this.dataSet.sequences[i];
-      const vertexCount = 2 * (sequence.pointIndices.length - 1);
-
-      let polylines = new Float32Array(vertexCount * XYZ_NUM_ELEMENTS);
-      this.polylinePositionBuffer[i] =
-          new THREE.BufferAttribute(polylines, XYZ_NUM_ELEMENTS);
-
-      let colors = new Float32Array(vertexCount * RGB_NUM_ELEMENTS);
-      this.polylineColorBuffer[i] =
-          new THREE.BufferAttribute(colors, RGB_NUM_ELEMENTS);
-    }
-    for (let i = 0; i < this.dataSet.sequences.length; i++) {
-      const sequence = this.dataSet.sequences[i];
-      let src = 0;
-      for (let j = 0; j < sequence.pointIndices.length - 1; j++) {
-        const p1Index = sequence.pointIndices[j];
-        const p2Index = sequence.pointIndices[j + 1];
-        const p1 = util.vector3FromPackedArray(newPositions, p1Index);
-        const p2 = util.vector3FromPackedArray(newPositions, p2Index);
-        this.polylinePositionBuffer[i].setXYZ(src, p1.x, p1.y, p1.z);
-        this.polylinePositionBuffer[i].setXYZ(src + 1, p2.x, p2.y, p2.z);
-        src += 2;
-      }
-      this.polylinePositionBuffer[i].needsUpdate = true;
-    }
-
-    if (this.polylines == null) {
-      this.createPolylines(this.scene);
-    }
-  }
-
-  onRender(renderContext: RenderContext) {
-    if (this.polylines == null) {
-      return;
-    }
-    for (let i = 0; i < this.polylines.length; i++) {
-      this.polylines[i].material.opacity = renderContext.polylineOpacities[i];
-      (this.polylines[i].material as THREE.LineBasicMaterial).linewidth =
-          renderContext.polylineWidths[i];
-      this.polylineColorBuffer[i].array = renderContext.polylineColors[i];
-      this.polylineColorBuffer[i].needsUpdate = true;
-    }
-  }
-
-  onPickingRender(renderContext: RenderContext) {}
-  onResize(newWidth: number, newHeight: number) {}
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerSprites.ts b/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerSprites.ts
deleted file mode 100644
index 8adc9a9bd2..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/scatterPlotVisualizerSprites.ts
+++ /dev/null
@@ -1,435 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {CameraType, RenderContext} from './renderContext';
-import {ScatterPlotVisualizer} from './scatterPlotVisualizer';
-import * as util from './util';
-
-const NUM_POINTS_FOG_THRESHOLD = 5000;
-const MIN_POINT_SIZE = 5.0;
-const IMAGE_SIZE = 30;
-
-// Constants relating to the indices of buffer arrays.
-const RGB_NUM_ELEMENTS = 3;
-const INDEX_NUM_ELEMENTS = 1;
-const XYZ_NUM_ELEMENTS = 3;
-
-const VERTEX_SHADER = `
-  // Index of the specific vertex (passed in as bufferAttribute), and the
-  // variable that will be used to pass it to the fragment shader.
-  attribute float spriteIndex;
-  attribute vec3 color;
-  attribute float scaleFactor;
-
-  varying vec2 xyIndex;
-  varying vec3 vColor;
-
-  uniform bool sizeAttenuation;
-  uniform float pointSize;
-  uniform float spritesPerRow;
-  uniform float spritesPerColumn;
-
-  void main() {
-    // Pass index and color values to fragment shader.
-    vColor = color;
-    xyIndex = vec2(mod(spriteIndex, spritesPerRow),
-              floor(spriteIndex / spritesPerColumn));
-
-    // Transform current vertex by modelViewMatrix (model world position and
-    // camera world position matrix).
-    vec4 cameraSpacePos = modelViewMatrix * vec4(position, 1.0);
-
-    // Project vertex in camera-space to screen coordinates using the camera's
-    // projection matrix.
-    gl_Position = projectionMatrix * cameraSpacePos;
-
-    // Create size attenuation (if we're in 3D mode) by making the size of
-    // each point inversly proportional to its distance to the camera.
-    float outputPointSize = pointSize;
-    if (sizeAttenuation) {
-      outputPointSize = -pointSize / cameraSpacePos.z;
-    }
-
-    gl_PointSize =
-      max(outputPointSize * scaleFactor, ${MIN_POINT_SIZE.toFixed(1)});
-  }`;
-
-const FRAGMENT_SHADER_POINT_TEST_CHUNK = `
-  bool point_in_unit_circle(vec2 spriteCoord) {
-    vec2 centerToP = spriteCoord - vec2(0.5, 0.5);
-    return dot(centerToP, centerToP) < (0.5 * 0.5);
-  }
-
-  bool point_in_unit_equilateral_triangle(vec2 spriteCoord) {
-    vec3 v0 = vec3(0, 1, 0);
-    vec3 v1 = vec3(0.5, 0, 0);
-    vec3 v2 = vec3(1, 1, 0);
-    vec3 p = vec3(spriteCoord, 0);
-    float p_in_v0_v1 = cross(v1 - v0, p - v0).z;
-    float p_in_v1_v2 = cross(v2 - v1, p - v1).z;
-    return (p_in_v0_v1 > 0.0) && (p_in_v1_v2 > 0.0);
-  }
-
-  bool point_in_unit_square(vec2 spriteCoord) {
-    return true;
-  }
-`;
-
-const FRAGMENT_SHADER = `
-  varying vec2 xyIndex;
-  varying vec3 vColor;
-
-  uniform sampler2D texture;
-  uniform float spritesPerRow;
-  uniform float spritesPerColumn;
-  uniform bool isImage;
-
-  ${THREE.ShaderChunk['common']}
-  ${THREE.ShaderChunk['fog_pars_fragment']}
-  ${FRAGMENT_SHADER_POINT_TEST_CHUNK}
-
-  void main() {
-    if (isImage) {
-      // Coordinates of the vertex within the entire sprite image.
-      vec2 coords =
-        (gl_PointCoord + xyIndex) / vec2(spritesPerRow, spritesPerColumn);
-      gl_FragColor = vec4(vColor, 1.0) * texture2D(texture, coords);
-    } else {
-      bool inside = point_in_unit_circle(gl_PointCoord);
-      if (!inside) {
-        discard;
-      }
-      gl_FragColor = vec4(vColor, 1);
-    }
-    ${THREE.ShaderChunk['fog_fragment']}
-  }`;
-
-const FRAGMENT_SHADER_PICKING = `
-  varying vec2 xyIndex;
-  varying vec3 vColor;
-  uniform bool isImage;
-
-  ${FRAGMENT_SHADER_POINT_TEST_CHUNK}
-
-  void main() {
-    xyIndex; // Silence 'unused variable' warning.
-    if (isImage) {
-      gl_FragColor = vec4(vColor, 1);
-    } else {
-      bool inside = point_in_unit_circle(gl_PointCoord);
-      if (!inside) {
-        discard;
-      }
-      gl_FragColor = vec4(vColor, 1);
-    }
-  }`;
-
-/**
- * Uses GL point sprites to render the dataset.
- */
-export class ScatterPlotVisualizerSprites implements ScatterPlotVisualizer {
-  private scene: THREE.Scene;
-  private fog: THREE.Fog;
-  private texture: THREE.Texture = null;
-  private standinTextureForPoints: THREE.Texture;
-  private spritesPerRow: number;
-  private spritesPerColumn: number;
-  private spriteDimensions: [number, number];
-  private spriteIndexBufferAttribute: THREE.BufferAttribute;
-  private renderMaterial: THREE.ShaderMaterial;
-  private pickingMaterial: THREE.ShaderMaterial;
-
-  private points: THREE.Points;
-  private worldSpacePointPositions: Float32Array;
-  private pickingColors: Float32Array;
-  private renderColors: Float32Array;
-
-  constructor() {
-    this.standinTextureForPoints =
-        util.createTexture(document.createElement('canvas'));
-    this.renderMaterial = this.createRenderMaterial(false);
-    this.pickingMaterial = this.createPickingMaterial(false);
-  }
-
-  private createTextureFromSpriteAtlas(
-      spriteAtlas: HTMLImageElement, spriteDimensions: [number, number],
-      spriteIndices: Float32Array) {
-    this.texture = util.createTexture(spriteAtlas);
-    this.spritesPerRow = spriteAtlas.width / spriteDimensions[0];
-    this.spritesPerColumn = spriteAtlas.height / spriteDimensions[1];
-    this.spriteDimensions = spriteDimensions;
-    this.spriteIndexBufferAttribute =
-        new THREE.BufferAttribute(spriteIndices, INDEX_NUM_ELEMENTS);
-
-    if (this.points != null) {
-      (this.points.geometry as THREE.BufferGeometry)
-          .addAttribute('spriteIndex', this.spriteIndexBufferAttribute);
-    }
-  }
-
-  private createUniforms(): any {
-    return {
-      texture: {type: 't'},
-      spritesPerRow: {type: 'f'},
-      spritesPerColumn: {type: 'f'},
-      fogColor: {type: 'c'},
-      fogNear: {type: 'f'},
-      fogFar: {type: 'f'},
-      isImage: {type: 'bool'},
-      sizeAttenuation: {type: 'bool'},
-      pointSize: {type: 'f'}
-    };
-  }
-
-  private createRenderMaterial(haveImage: boolean): THREE.ShaderMaterial {
-    const uniforms = this.createUniforms();
-    return new THREE.ShaderMaterial({
-      uniforms: uniforms,
-      vertexShader: VERTEX_SHADER,
-      fragmentShader: FRAGMENT_SHADER,
-      transparent: !haveImage,
-      depthTest: haveImage,
-      depthWrite: haveImage,
-      fog: true,
-      blending: THREE.MultiplyBlending,
-    });
-  }
-
-  private createPickingMaterial(haveImage: boolean): THREE.ShaderMaterial {
-    const uniforms = this.createUniforms();
-    return new THREE.ShaderMaterial({
-      uniforms: uniforms,
-      vertexShader: VERTEX_SHADER,
-      fragmentShader: FRAGMENT_SHADER_PICKING,
-      transparent: true,
-      depthTest: true,
-      depthWrite: true,
-      fog: false,
-      blending: THREE.NormalBlending,
-    });
-  }
-
-  /**
-   * Create points, set their locations and actually instantiate the
-   * geometry.
-   */
-  private createPointSprites(scene: THREE.Scene, positions: Float32Array) {
-    const pointCount =
-        (positions != null) ? (positions.length / XYZ_NUM_ELEMENTS) : 0;
-    const geometry = this.createGeometry(pointCount);
-
-    this.fog = new THREE.Fog(0xFFFFFF);  // unused value, gets overwritten.
-
-    this.points = new THREE.Points(geometry, this.renderMaterial);
-    this.points.frustumCulled = false;
-    if (this.spriteIndexBufferAttribute != null) {
-      (this.points.geometry as THREE.BufferGeometry)
-          .addAttribute('spriteIndex', this.spriteIndexBufferAttribute);
-    }
-    scene.add(this.points);
-  }
-
-  private calculatePointSize(sceneIs3D: boolean): number {
-    if (this.texture != null) {
-      return sceneIs3D ? IMAGE_SIZE : this.spriteDimensions[0];
-    }
-    const n = (this.worldSpacePointPositions != null) ?
-        (this.worldSpacePointPositions.length / XYZ_NUM_ELEMENTS) :
-        1;
-    const SCALE = 200;
-    const LOG_BASE = 8;
-    const DIVISOR = 1.5;
-    // Scale point size inverse-logarithmically to the number of points.
-    const pointSize = SCALE / Math.log(n) / Math.log(LOG_BASE);
-    return sceneIs3D ? pointSize : (pointSize / DIVISOR);
-  }
-
-  /**
-   * Set up buffer attributes to be used for the points/images.
-   */
-  private createGeometry(pointCount: number): THREE.BufferGeometry {
-    const n = pointCount;
-
-    // Fill pickingColors with each point's unique id as its color.
-    this.pickingColors = new Float32Array(n * RGB_NUM_ELEMENTS);
-    {
-      let dst = 0;
-      for (let i = 0; i < n; i++) {
-        const c = new THREE.Color(i);
-        this.pickingColors[dst++] = c.r;
-        this.pickingColors[dst++] = c.g;
-        this.pickingColors[dst++] = c.b;
-      }
-    }
-
-    const geometry = new THREE.BufferGeometry();
-    geometry.addAttribute(
-        'position', new THREE.BufferAttribute(null, XYZ_NUM_ELEMENTS));
-    geometry.addAttribute(
-        'color', new THREE.BufferAttribute(null, RGB_NUM_ELEMENTS));
-    geometry.addAttribute(
-        'scaleFactor', new THREE.BufferAttribute(null, INDEX_NUM_ELEMENTS));
-    return geometry;
-  }
-
-  private setFogDistances(
-      sceneIs3D: boolean, nearestPointZ: number, farthestPointZ: number) {
-    if (sceneIs3D) {
-      const n = this.worldSpacePointPositions.length / XYZ_NUM_ELEMENTS;
-      this.fog.near = nearestPointZ;
-      // If there are fewer points we want less fog. We do this
-      // by making the "far" value (that is, the distance from the camera to the
-      // far edge of the fog) proportional to the number of points.
-      let multiplier =
-          2 - Math.min(n, NUM_POINTS_FOG_THRESHOLD) / NUM_POINTS_FOG_THRESHOLD;
-      this.fog.far = farthestPointZ * multiplier;
-    } else {
-      this.fog.near = Infinity;
-      this.fog.far = Infinity;
-    }
-  }
-
-  dispose() {
-    this.disposeGeometry();
-    this.disposeTextureAtlas();
-  }
-
-  private disposeGeometry() {
-    if (this.points != null) {
-      this.scene.remove(this.points);
-      this.points.geometry.dispose();
-      this.points = null;
-      this.worldSpacePointPositions = null;
-    }
-  }
-
-  private disposeTextureAtlas() {
-    if (this.texture != null) {
-      this.texture.dispose();
-    }
-    this.texture = null;
-    this.renderMaterial = null;
-    this.pickingMaterial = null;
-  }
-
-  setScene(scene: THREE.Scene) {
-    this.scene = scene;
-  }
-
-  setSpriteAtlas(
-      spriteImage: HTMLImageElement, spriteDimensions: [number, number],
-      spriteIndices: Uint8Array) {
-    this.disposeTextureAtlas();
-    this.createTextureFromSpriteAtlas(
-        spriteImage, spriteDimensions, spriteIndices);
-    this.renderMaterial = this.createRenderMaterial(true);
-    this.pickingMaterial = this.createPickingMaterial(true);
-  }
-
-  clearSpriteAtlas() {
-    this.disposeTextureAtlas();
-    this.renderMaterial = this.createRenderMaterial(false);
-    this.pickingMaterial = this.createPickingMaterial(false);
-  }
-
-  onPointPositionsChanged(newPositions: Float32Array) {
-    if ((newPositions == null) || (newPositions.length === 0)) {
-      this.dispose();
-      return;
-    }
-    if (this.points != null) {
-      if (this.worldSpacePointPositions.length !== newPositions.length) {
-        this.disposeGeometry();
-      }
-    }
-
-    this.worldSpacePointPositions = newPositions;
-
-    if (this.points == null) {
-      this.createPointSprites(this.scene, newPositions);
-    }
-
-    const positions = (this.points.geometry as THREE.BufferGeometry)
-                          .getAttribute('position') as THREE.BufferAttribute;
-    positions.array = newPositions;
-    positions.needsUpdate = true;
-  }
-
-  onPickingRender(rc: RenderContext) {
-    if (this.points == null) {
-      return;
-    }
-
-    const sceneIs3D: boolean = (rc.cameraType === CameraType.Perspective);
-
-    this.pickingMaterial.uniforms.spritesPerRow.value = this.spritesPerRow;
-    this.pickingMaterial.uniforms.spritesPerRow.value = this.spritesPerColumn;
-    this.pickingMaterial.uniforms.sizeAttenuation.value = sceneIs3D;
-    this.pickingMaterial.uniforms.pointSize.value =
-        this.calculatePointSize(sceneIs3D);
-    this.points.material = this.pickingMaterial;
-
-    let colors = (this.points.geometry as THREE.BufferGeometry)
-                     .getAttribute('color') as THREE.BufferAttribute;
-    colors.array = this.pickingColors;
-    colors.needsUpdate = true;
-
-    let scaleFactors =
-        (this.points.geometry as THREE.BufferGeometry)
-            .getAttribute('scaleFactor') as THREE.BufferAttribute;
-    scaleFactors.array = rc.pointScaleFactors;
-    scaleFactors.needsUpdate = true;
-  }
-
-  onRender(rc: RenderContext) {
-    if (!this.points) {
-      return;
-    }
-    const sceneIs3D: boolean = (rc.camera instanceof THREE.PerspectiveCamera);
-
-    this.setFogDistances(
-        sceneIs3D, rc.nearestCameraSpacePointZ, rc.farthestCameraSpacePointZ);
-
-    this.scene.fog = this.fog;
-    this.scene.fog.color = new THREE.Color(rc.backgroundColor);
-
-    this.renderMaterial.uniforms.fogColor.value = this.scene.fog.color;
-    this.renderMaterial.uniforms.fogNear.value = this.fog.near;
-    this.renderMaterial.uniforms.fogFar.value = this.fog.far;
-    this.renderMaterial.uniforms.spritesPerRow.value = this.spritesPerRow;
-    this.renderMaterial.uniforms.spritesPerColumn.value = this.spritesPerColumn;
-    this.renderMaterial.uniforms.isImage.value = (this.texture != null);
-    this.renderMaterial.uniforms.texture.value =
-        (this.texture != null) ? this.texture : this.standinTextureForPoints;
-    this.renderMaterial.uniforms.sizeAttenuation.value = sceneIs3D;
-    this.renderMaterial.uniforms.pointSize.value =
-        this.calculatePointSize(sceneIs3D);
-    this.points.material = this.renderMaterial;
-
-    let colors = (this.points.geometry as THREE.BufferGeometry)
-                     .getAttribute('color') as THREE.BufferAttribute;
-    this.renderColors = rc.pointColors;
-    colors.array = this.renderColors;
-    colors.needsUpdate = true;
-
-    let scaleFactors =
-        (this.points.geometry as THREE.BufferGeometry)
-            .getAttribute('scaleFactor') as THREE.BufferAttribute;
-    scaleFactors.array = rc.pointScaleFactors;
-    scaleFactors.needsUpdate = true;
-  }
-
-  onResize(newWidth: number, newHeight: number) {}
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/sptree.ts b/tensorflow/tensorboard/components/vz_projector/sptree.ts
deleted file mode 100644
index 991369a335..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/sptree.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-/** N-dimensional point. Usually 2D or 3D. */
-export type Point = number[];
-
-export interface BBox {
-  center: Point;
-  halfDim: number;
-}
-
-/** A node in a space-partitioning tree. */
-export interface SPNode {
-  /** The children of this node. */
-  children?: SPNode[];
-  /** The bounding box of the region this node occupies. */
-  box: BBox;
-  /** One or more points this node has. */
-  point: Point;
-}
-
-/**
- * A Space-partitioning tree (https://en.wikipedia.org/wiki/Space_partitioning)
- * that recursively divides the space into regions of equal sizes. This data
- * structure can act both as a Quad tree and an Octree when the data is 2 or
- * 3 dimensional respectively. One usage is in t-SNE in order to do Barnes-Hut
- * approximation.
- */
-export class SPTree {
-  root: SPNode;
-
-  private masks: number[];
-  private dim: number;
-
-  /**
-   * Constructs a new tree with the provided data.
-   *
-   * @param data List of n-dimensional data points.
-   * @param capacity Number of data points to store in a single node.
-   */
-  constructor(data: Point[]) {
-    if (data.length < 1) {
-      throw new Error('There should be at least 1 data point');
-    }
-    // Make a bounding box based on the extent of the data.
-    this.dim = data[0].length;
-    // Each node has 2^d children, where d is the dimension of the space.
-    // Binary masks (e.g. 000, 001, ... 111 in 3D) are used to determine in
-    // which child (e.g. quadron in 2D) the new point is going to be assigned.
-    // For more details, see the insert() method and its comments.
-    this.masks = new Array(Math.pow(2, this.dim));
-    for (let d = 0; d < this.masks.length; ++d) {
-      this.masks[d] = (1 << d);
-    }
-    let min: Point = new Array(this.dim);
-    fillArray(min, Number.POSITIVE_INFINITY);
-    let max: Point = new Array(this.dim);
-    fillArray(max, Number.NEGATIVE_INFINITY);
-
-    for (let i = 0; i < data.length; ++i) {
-      // For each dim get the min and max.
-      // E.g. For 2-D, get the x_min, x_max, y_min, y_max.
-      for (let d = 0; d < this.dim; ++d) {
-        min[d] = Math.min(min[d], data[i][d]);
-        max[d] = Math.max(max[d], data[i][d]);
-      }
-    }
-    // Create a bounding box with the center of the largest span.
-    let center: Point = new Array(this.dim);
-    let halfDim = 0;
-    for (let d = 0; d < this.dim; ++d) {
-      let span = max[d] - min[d];
-      center[d] = min[d] + span / 2;
-      halfDim = Math.max(halfDim, span / 2);
-    }
-    this.root = {box: {center: center, halfDim: halfDim}, point: data[0]};
-    for (let i = 1; i < data.length; ++i) {
-      this.insert(this.root, data[i]);
-    }
-  }
-
-  /**
-   * Visits every node in the tree. Each node can store 1 or more points,
-   * depending on the node capacity provided in the constructor.
-   *
-   * @param accessor Method that takes the currently visited node, and the
-   * low and high point of the region that this node occupies. E.g. in 2D,
-   * the low and high points will be the lower-left corner and the upper-right
-   * corner.
-   */
-  visit(
-      accessor: (node: SPNode, lowPoint: Point, highPoint: Point) => boolean,
-      noBox = false) {
-    this.visitNode(this.root, accessor, noBox);
-  }
-
-  private visitNode(
-      node: SPNode,
-      accessor: (node: SPNode, lowPoint?: Point, highPoint?: Point) => boolean,
-      noBox: boolean) {
-    let skipChildren: boolean;
-    if (noBox) {
-      skipChildren = accessor(node);
-    } else {
-      let lowPoint = new Array(this.dim);
-      let highPoint = new Array(this.dim);
-      for (let d = 0; d < this.dim; ++d) {
-        lowPoint[d] = node.box.center[d] - node.box.halfDim;
-        highPoint[d] = node.box.center[d] + node.box.halfDim;
-      }
-      skipChildren = accessor(node, lowPoint, highPoint);
-    }
-    if (!node.children || skipChildren) {
-      return;
-    }
-    for (let i = 0; i < node.children.length; ++i) {
-      let child = node.children[i];
-      if (child) {
-        this.visitNode(child, accessor, noBox);
-      }
-    }
-  }
-
-  private insert(node: SPNode, p: Point) {
-    // Subdivide and then add the point to whichever node will accept it.
-    if (node.children == null) {
-      node.children = new Array(this.masks.length);
-    }
-
-    // Decide which child will get the new point by constructing a D-bits binary
-    // signature (D=3 for 3D) where the k-th bit is 1 if the point's k-th
-    // coordinate is greater than the node's k-th coordinate, 0 otherwise.
-    // Then the binary signature in decimal system gives us the index of the
-    // child where the new point should be.
-    let index = 0;
-    for (let d = 0; d < this.dim; ++d) {
-      if (p[d] > node.box.center[d]) {
-        index |= this.masks[d];
-      }
-    }
-    if (node.children[index] == null) {
-      this.makeChild(node, index, p);
-    } else {
-      this.insert(node.children[index], p);
-    }
-  }
-
-  private makeChild(node: SPNode, index: number, p: Point): void {
-    let oldC = node.box.center;
-    let h = node.box.halfDim / 2;
-    let newC: Point = new Array(this.dim);
-    for (let d = 0; d < this.dim; ++d) {
-      newC[d] = (index & (1 << d)) ? oldC[d] + h : oldC[d] - h;
-    }
-    node.children[index] = {box: {center: newC, halfDim: h}, point: p};
-  }
-}
-
-function fillArray<T>(arr: T[], value: T): void {
-  for (let i = 0; i < arr.length; ++i) {
-    arr[i] = value;
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/sptree_test.ts b/tensorflow/tensorboard/components/vz_projector/sptree_test.ts
deleted file mode 100644
index 440680bdf1..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/sptree_test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {SPTree} from './sptree';
-
-const assert = chai.assert;
-
-it('simple 2D data', () => {
-  let data = [
-    [0, 1],
-    [1, 0],
-    [1, 1],
-    [0, 0],
-  ];
-  let tree = new SPTree(data);
-  // Check that each point is within the bound.
-  tree.visit((node, low, high) => {
-    assert.equal(low.length, 2);
-    assert.equal(high.length, 2);
-    let point = node.point;
-    assert.equal(point.length, 2);
-    // Each point should be in the node's bounding box.
-    assert.equal(
-        point[0] >= low[0] && point[0] <= high[0] && point[1] >= low[1] &&
-            point[1] <= high[1],
-        true);
-    return false;
-  });
-});
-
-it('simple 3D data', () => {
-  let data = [
-    [0, 1, 0],
-    [1, 0.4, 2],
-    [1, 1, 3],
-    [0, 0, 5],
-  ];
-  let tree = new SPTree(data);
-  // Check that each point is within the bound.
-  tree.visit((node, low, high) => {
-    assert.equal(low.length, 3);
-    assert.equal(high.length, 3);
-    let point = node.point;
-    assert.equal(point.length, 3);
-    // Each point should be in the node's bounding box.
-    assert.equal(
-        point[0] >= low[0] && point[0] <= high[0] && point[1] >= low[1] &&
-            point[1] <= high[1] && point[2] >= low[2] && point[2] <= high[2],
-        true);
-    return false;
-  });
-});
-
-it('Only visit root', () => {
-  let data = [
-    [0, 1, 0],
-    [1, 0.4, 2],
-    [1, 1, 3],
-    [0, 0, 5],
-  ];
-  let tree = new SPTree(data);
-  let numVisits = 0;
-  tree.visit((node, low, high) => {
-    numVisits++;
-    return true;
-  });
-  assert.equal(numVisits, 1);
-});
-
-it('Search in random data', () => {
-  let N = 10000;
-  let data = new Array(N);
-  for (let i = 0; i < N; i++) {
-    data[i] = [Math.random(), Math.random()];
-  }
-  let tree = new SPTree(data);
-  let numVisits = 0;
-  let query = data[Math.floor(Math.random() * N)];
-  let found = false;
-  tree.visit((node, low, high) => {
-    numVisits++;
-    if (node.point === query) {
-      found = true;
-      return true;
-    }
-    let outOfBounds = query[0] < low[0] || query[0] > high[0] ||
-        query[1] < low[1] || query[1] > high[1];
-    return outOfBounds;
-  });
-  assert.equal(found, true);
-  assert.isBelow(numVisits, N / 4);
-});
diff --git a/tensorflow/tensorboard/components/vz_projector/styles.html b/tensorflow/tensorboard/components/vz_projector/styles.html
deleted file mode 100644
index 32dc984b5d..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/styles.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<dom-module id="vz-projector-styles">
-<template>
-<style>
-:host {
-  --paper-input-container-label: {
-    font-size: 14px;
-  };
-  --paper-input-container-input: {
-    font-size: 14px;
-  };
-  /* TODO: Figure out why this doesn't work */
-  --paper-dropdown-menu-input: {
-    font-size: 14px;
-  };
-}
-
-paper-button {
-  background: #e3e3e3;
-  margin-left: 0;
-  text-transform: none;
-}
-
-paper-dropdown-menu paper-item {
-  font-size: 13px;
-}
-
-paper-tooltip {
-  max-width: 200px;
-  --paper-tooltip: {
-    font-size: 12px;
-  };
-}
-
-paper-checkbox {
-  --paper-checkbox-checked-color: #880E4F;
-}
-
-paper-toggle-button {
-  --paper-toggle-button-checked-bar-color:  #880E4F;
-  --paper-toggle-button-checked-button-color:  #880E4F;
-  --paper-toggle-button-checked-ink-color: #880E4F;
-}
-
-paper-icon-button {
-  border-radius: 50%;
-}
-
-paper-icon-button[active] {
-  color: white;
-  background-color: #880E4F;
-}
-
-.slider {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-  justify-content: space-between;
-}
-
-.slider span {
-  width: 35px;
-  text-align: right;
-}
-
-.slider label {
-  align-items: center;
-  display: flex;
-}
-
-.help-icon {
-  height: 15px;
-  left: 2px;
-  min-width: 15px;
-  min-height: 15px;
-  margin: 0;
-  padding: 0;
-  top: -2px;
-  width: 15px;
-}
-
-.ink-panel {
-  display: flex;
-  flex-direction: column;
-  font-size: 14px;
-}
-
-.ink-panel h4 {
-  border-bottom: 1px solid #ddd;
-  font-size: 14px;
-  font-weight: 500;
-  margin: 0;
-  margin-bottom: 10px;
-  padding-bottom: 5px;
-}
-
-.ink-panel-header {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-  height: 50px;
-}
-
-.ink-panel-content {
-  display: none;
-  height: 100%;
-}
-
-.ink-panel-content.active {
-  display: block;
-}
-
-.ink-panel-content h3 {
-  font-weight: 500;
-  font-size: 14px;
-  margin-top: 20px;
-  margin-bottom: 5px;
-  text-transform: uppercase;
-}
-
-.ink-panel-header h3 {
-  font-weight: 500;
-  font-size: 14px;
-  margin: 0;
-  padding: 0 24px;
-  text-transform: uppercase;
-}
-
-
-/* - Tabs */
-.ink-tab-group {
-  align-items: center;
-  box-sizing: border-box;
-  display: flex;
-  height: 100%;
-  justify-content: space-around;
-}
-
-.ink-tab-group .projection-tab {
-  color: rgba(0, 0, 0, 0.5);
-  cursor: pointer;
-  font-weight: 300;
-  line-height: 49px;
-  padding: 0 12px;
-  text-align: center;
-  text-transform: uppercase;
-}
-
-.ink-tab-group .projection-tab:hover {
-  color: black;
-}
-
-.ink-tab-group .projection-tab.active {
-  border-bottom: 2px solid black;
-  color: black;
-  font-weight: 500;
-}
-
-h4 {
-  margin: 30px 0 10px 0;
-}
-
-.dismiss-dialog-note {
-  margin-top: 25px;
-  font-size: 11px;
-  text-align: right;
-}
-</style>
-</template>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/util.ts b/tensorflow/tensorboard/components/vz_projector/util.ts
deleted file mode 100644
index bd6df68b1a..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/util.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DataPoint} from './data';
-import * as logging from './logging';
-import {Point2D} from './vector';
-
-/**
- * Delay for running expensive tasks, in milliseconds.
- * The duration was empirically found so that it leaves enough time for the
- * browser to update its UI state before starting an expensive UI-blocking task.
- */
-const TASK_DELAY_MS = 200;
-
-/** Shuffles the array in-place in O(n) time using Fisher-Yates algorithm. */
-export function shuffle<T>(array: T[]): T[] {
-  let m = array.length;
-  let t: T;
-  let i: number;
-
-  // While there remain elements to shuffle.
-  while (m) {
-    // Pick a remaining element
-    i = Math.floor(Math.random() * m--);
-    // And swap it with the current element.
-    t = array[m];
-    array[m] = array[i];
-    array[i] = t;
-  }
-  return array;
-}
-
-export function range(count: number): number[] {
-  const rangeOutput: number[] = [];
-  for (let i = 0; i < count; i++) {
-    rangeOutput.push(i);
-  }
-  return rangeOutput;
-}
-
-export function classed(
-    element: HTMLElement, className: string, enabled: boolean) {
-  const classNames = element.className.split(' ');
-  if (enabled) {
-    if (className in classNames) {
-      return;
-    } else {
-      classNames.push(className);
-    }
-  } else {
-    const index = classNames.indexOf(className);
-    if (index === -1) {
-      return;
-    }
-    classNames.splice(index, 1);
-  }
-  element.className = classNames.join(' ');
-}
-
-/** Projects a 3d point into screen space */
-export function vector3DToScreenCoords(
-    cam: THREE.Camera, w: number, h: number, v: THREE.Vector3): Point2D {
-  let dpr = window.devicePixelRatio;
-  let pv = new THREE.Vector3().copy(v).project(cam);
-
-  // The screen-space origin is at the middle of the screen, with +y up.
-  let coords: Point2D =
-      [((pv.x + 1) / 2 * w) * dpr, -((pv.y - 1) / 2 * h) * dpr];
-  return coords;
-}
-
-/** Loads 3 contiguous elements from a packed xyz array into a Vector3. */
-export function vector3FromPackedArray(
-    a: Float32Array, pointIndex: number): THREE.Vector3 {
-  const offset = pointIndex * 3;
-  return new THREE.Vector3(a[offset], a[offset + 1], a[offset + 2]);
-}
-
-/**
- * Gets the camera-space z coordinates of the nearest and farthest points.
- * Ignores points that are behind the camera.
- */
-export function getNearFarPoints(
-    worldSpacePoints: Float32Array, cameraPos: THREE.Vector3,
-    cameraTarget: THREE.Vector3): [number, number] {
-  let shortestDist: number = Infinity;
-  let furthestDist: number = 0;
-  const camToTarget = new THREE.Vector3().copy(cameraTarget).sub(cameraPos);
-  const camPlaneNormal = new THREE.Vector3().copy(camToTarget).normalize();
-  const n = worldSpacePoints.length / 3;
-  let src = 0;
-  let p = new THREE.Vector3();
-  let camToPoint = new THREE.Vector3();
-  for (let i = 0; i < n; i++) {
-    p.x = worldSpacePoints[src];
-    p.y = worldSpacePoints[src + 1];
-    p.z = worldSpacePoints[src + 2];
-    src += 3;
-
-    camToPoint.copy(p).sub(cameraPos);
-    const dist = camPlaneNormal.dot(camToPoint);
-    if (dist < 0) {
-      continue;
-    }
-    furthestDist = (dist > furthestDist) ? dist : furthestDist;
-    shortestDist = (dist < shortestDist) ? dist : shortestDist;
-  }
-  return [shortestDist, furthestDist];
-}
-
-/**
- * Generate a texture for the points/images and sets some initial params
- */
-export function createTexture(image: HTMLImageElement|
-                              HTMLCanvasElement): THREE.Texture {
-  let tex = new THREE.Texture(image);
-  tex.needsUpdate = true;
-  // Used if the texture isn't a power of 2.
-  tex.minFilter = THREE.LinearFilter;
-  tex.generateMipmaps = false;
-  tex.flipY = false;
-  return tex;
-}
-
-/**
- * Assert that the condition is satisfied; if not, log user-specified message
- * to the console.
- */
-export function assert(condition: boolean, message?: string) {
-  if (!condition) {
-    message = message || 'Assertion failed';
-    throw new Error(message);
-  }
-}
-
-export type SearchPredicate = (p: DataPoint) => boolean;
-
-export function getSearchPredicate(
-    query: string, inRegexMode: boolean, fieldName: string): SearchPredicate {
-  let predicate: SearchPredicate;
-  if (inRegexMode) {
-    let regExp = new RegExp(query, 'i');
-    predicate = p => regExp.test(p.metadata[fieldName].toString());
-  } else {
-    // Doing a case insensitive substring match.
-    query = query.toLowerCase();
-    predicate = p => {
-      let label = p.metadata[fieldName].toString().toLowerCase();
-      return label.indexOf(query) >= 0;
-    };
-  }
-  return predicate;
-}
-
-/**
- * Runs an expensive task asynchronously with some delay
- * so that it doesn't block the UI thread immediately.
- *
- * @param message The message to display to the user.
- * @param task The expensive task to run.
- * @param msgId Optional. ID of an existing message. If provided, will overwrite
- *     an existing message and won't automatically clear the message when the
- *     task is done.
- * @return The value returned by the task.
- */
-export function runAsyncTask<T>(
-    message: string, task: () => T, msgId: string = null): Promise<T> {
-  let autoClear = (msgId == null);
-  msgId = logging.setModalMessage(message, msgId);
-  return new Promise<T>((resolve, reject) => {
-    setTimeout(() => {
-      try {
-        let result = task();
-        // Clearing the old message.
-        if (autoClear) {
-          logging.setModalMessage(null, msgId);
-        }
-        resolve(result);
-      } catch (ex) {
-        reject(ex);
-      }
-      return true;
-    }, TASK_DELAY_MS);
-  });
-}
-
-
-/**
- * Parses the URL for query parameters, e.g. ?foo=1&bar=2 will return
- *   {'foo': '1', 'bar': '2'}.
- * @param url The URL to parse.
- * @return A map of queryParam key to its value.
- */
-export function getURLParams(url: string): {[key: string]: string} {
-  if (!url) {
-    return {};
-  }
-
-  let queryString = url.indexOf('?') !== -1 ? url.split('?')[1] : url;
-  if (queryString.indexOf('#')) {
-    queryString = queryString.split('#')[0];
-  }
-
-  const queryEntries = queryString.split('&');
-  let queryParams: {[key: string]: string} = {};
-  for (let i = 0; i < queryEntries.length; i++) {
-    let queryEntryComponents = queryEntries[i].split('=');
-    queryParams[queryEntryComponents[0].toLowerCase()] =
-        decodeURIComponent(queryEntryComponents[1]);
-  }
-  return queryParams;
-}
-
-/** List of substrings that auto generated tensors have in their name. */
-const SUBSTR_GEN_TENSORS = ['/Adagrad'];
-
-/** Returns true if the tensor was automatically generated by TF API calls. */
-export function tensorIsGenerated(tensorName: string): boolean {
-  for (let i = 0; i < SUBSTR_GEN_TENSORS.length; i++) {
-    if (tensorName.indexOf(SUBSTR_GEN_TENSORS[i]) >= 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-export function xor(cond1: boolean, cond2: boolean): boolean {
-  return (cond1 || cond2) && !(cond1 && cond2);
-}
-
-/** Checks to see if the browser supports webgl. */
-export function hasWebGLSupport(): boolean {
-  try {
-    let c = document.createElement('canvas');
-    let gl = c.getContext('webgl') || c.getContext('experimental-webgl');
-    return gl != null && typeof weblas !== 'undefined';
-  } catch (e) {
-    return false;
-  }
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/util_test.ts b/tensorflow/tensorboard/components/vz_projector/util_test.ts
deleted file mode 100644
index f7c0027c81..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/util_test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-import * as util from './util';
-
-describe('getURLParams', () => {
-  it('search query with valid param returns correct object', () => {
-    let urlParams = util.getURLParams('?config=http://google.com/');
-    expect(urlParams).toEqual({'config': 'http://google.com/'});
-  });
-
-  it('search query with multiple valid params returns correct object', () => {
-    let urlParams = util.getURLParams('?config=http://google.com/&foo=bar');
-    expect(urlParams).toEqual({'config': 'http://google.com/', 'foo': 'bar'});
-  });
-
-  it('search query with valid param with URL encoded characters', () => {
-    let urlParams = util.getURLParams('?config=http://google.com/%20search');
-    expect(urlParams).toEqual({'config': 'http://google.com/ search'});
-  });
-
-  it('search query with pound sign', () => {
-    let urlParams = util.getURLParams('?config=http://google.com/#foo');
-    expect(urlParams).toEqual({'config': 'http://google.com/'});
-  });
-
-  it('no search query returns empty object', () => {
-    let urlParams = util.getURLParams('');
-    expect(urlParams).toEqual({});
-  });
-});
diff --git a/tensorflow/tensorboard/components/vz_projector/vector.ts b/tensorflow/tensorboard/components/vz_projector/vector.ts
deleted file mode 100644
index 88ca24b25d..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vector.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {assert} from './util';
-
-/**
- * @fileoverview Useful vector utilities.
- */
-
-export type Vector = Float32Array | number[];
-export type Point2D = [number, number];
-export type Point3D = [number, number, number];
-
-/** Returns the dot product of two vectors. */
-export function dot(a: Vector, b: Vector): number {
-  assert(a.length === b.length, 'Vectors a and b must be of same length');
-  let result = 0;
-  for (let i = 0; i < a.length; ++i) {
-    result += a[i] * b[i];
-  }
-  return result;
-}
-
-/** Sums all the elements in the vector */
-export function sum(a: Vector): number {
-  let result = 0;
-  for (let i = 0; i < a.length; ++i) {
-    result += a[i];
-  }
-  return result;
-}
-
-/** Returns the sum of two vectors, i.e. a + b */
-export function add(a: Vector, b: Vector): Float32Array {
-  assert(a.length === b.length, 'Vectors a and b must be of same length');
-  let result = new Float32Array(a.length);
-  for (let i = 0; i < a.length; ++i) {
-    result[i] = a[i] + b[i];
-  }
-  return result;
-}
-
-/** Subtracts vector b from vector a, i.e. returns a - b */
-export function sub(a: Vector, b: Vector): Float32Array {
-  assert(a.length === b.length, 'Vectors a and b must be of same length');
-  let result = new Float32Array(a.length);
-  for (let i = 0; i < a.length; ++i) {
-    result[i] = a[i] - b[i];
-  }
-  return result;
-}
-
-/** Returns the square norm of the vector */
-export function norm2(a: Vector): number {
-  let result = 0;
-  for (let i = 0; i < a.length; ++i) {
-    result += a[i] * a[i];
-  }
-  return result;
-}
-
-/** Returns the euclidean distance between two vectors. */
-export function dist(a: Vector, b: Vector): number {
-  return Math.sqrt(dist2(a, b));
-}
-
-/** Returns the square euclidean distance between two vectors. */
-export function dist2(a: Vector, b: Vector): number {
-  assert(a.length === b.length, 'Vectors a and b must be of same length');
-  let result = 0;
-  for (let i = 0; i < a.length; ++i) {
-    let diff = a[i] - b[i];
-    result += diff * diff;
-  }
-  return result;
-}
-
-/** Returns the square euclidean distance between two 2D points. */
-export function dist2_2D(a: Vector, b: Vector): number {
-  let dX = a[0] - b[0];
-  let dY = a[1] - b[1];
-  return dX * dX + dY * dY;
-}
-
-/** Returns the square euclidean distance between two 3D points. */
-export function dist2_3D(a: Vector, b: Vector): number {
-  let dX = a[0] - b[0];
-  let dY = a[1] - b[1];
-  let dZ = a[2] - b[2];
-  return dX * dX + dY * dY + dZ * dZ;
-}
-
-/** Returns the euclidean distance between 2 3D points. */
-export function dist_3D(a: Vector, b: Vector): number {
-  return Math.sqrt(dist2_3D(a, b));
-}
-
-/**
- * Returns the square euclidean distance between two vectors, with an early
- * exit (returns -1) if the distance is >= to the provided limit.
- */
-export function dist2WithLimit(a: Vector, b: Vector, limit: number): number {
-  assert(a.length === b.length, 'Vectors a and b must be of same length');
-  let result = 0;
-  for (let i = 0; i < a.length; ++i) {
-    let diff = a[i] - b[i];
-    result += diff * diff;
-    if (result >= limit) {
-      return -1;
-    }
-  }
-  return result;
-}
-
-/** Returns the square euclidean distance between two 2D points. */
-export function dist22D(a: Point2D, b: Point2D): number {
-  let dX = a[0] - b[0];
-  let dY = a[1] - b[1];
-  return dX * dX + dY * dY;
-}
-
-/** Modifies the vector in-place to have unit norm. */
-export function unit(a: Vector): void {
-  let norm = Math.sqrt(norm2(a));
-  assert(norm >= 0, 'Norm of the vector must be > 0');
-  for (let i = 0; i < a.length; ++i) {
-    a[i] /= norm;
-  }
-}
-
-/**
- *  Projects the vectors to a lower dimension
- *
- * @param vectors Array of vectors to be projected.
- * @param newDim The resulting dimension of the vectors.
- */
-export function projectRandom(vectors: Float32Array[], newDim: number):
-    Float32Array[] {
-  let dim = vectors[0].length;
-  let N = vectors.length;
-  let newVectors: Float32Array[] = new Array(N);
-  for (let i = 0; i < N; ++i) {
-    newVectors[i] = new Float32Array(newDim);
-  }
-  // Make nDim projections.
-  for (let k = 0; k < newDim; ++k) {
-    let randomVector = rn(dim);
-    for (let i = 0; i < N; ++i) {
-      newVectors[i][k] = dot(vectors[i], randomVector);
-    }
-  }
-  return newVectors;
-}
-
-/**
- * Projects a vector onto a 2D plane specified by the two direction vectors.
- */
-export function project2d(a: Vector, dir1: Vector, dir2: Vector): Point2D {
-  return [dot(a, dir1), dot(a, dir2)];
-}
-
-/**
- * Computes the centroid of the data points. If the provided data points are not
- * vectors, an accessor function needs to be provided.
- */
-export function centroid<T>(dataPoints: T[], accessor?: (a: T) => Vector):
-    Vector {
-  if (dataPoints.length === 0) {
-    return null;
-  }
-  if (accessor == null) {
-    accessor = (a: T) => <any>a;
-  }
-  assert(dataPoints.length >= 0, '`vectors` must be of length >= 1');
-  let centroid = new Float32Array(accessor(dataPoints[0]).length);
-  for (let i = 0; i < dataPoints.length; ++i) {
-    let dataPoint = dataPoints[i];
-    let vector = accessor(dataPoint);
-    for (let j = 0; j < centroid.length; ++j) {
-      centroid[j] += vector[j];
-    }
-  }
-  for (let j = 0; j < centroid.length; ++j) {
-    centroid[j] /= dataPoints.length;
-  }
-  return centroid;
-}
-
-/**
- * Generates a vector of the specified size where each component is drawn from
- * a random (0, 1) gaussian distribution.
- */
-export function rn(size: number): Float32Array {
-  let normal = d3.random.normal();
-  let result = new Float32Array(size);
-  for (let i = 0; i < size; ++i) {
-    result[i] = normal();
-  }
-  return result;
-}
-
-/**
- * Returns the cosine distance ([0, 2]) between two vectors
- * that have been normalized to unit norm.
- */
-export function cosDistNorm(a: Vector, b: Vector): number {
-  return 1 - dot(a, b);
-}
-
-/**
- * Returns the cosine distance ([0, 2]) between two vectors.
- */
-export function cosDist(a: Vector, b: Vector): number {
-  return 1 - cosSim(a, b);
-}
-
-/** Returns the cosine similarity ([-1, 1]) between two vectors. */
-export function cosSim(a: Vector, b: Vector): number {
-  return dot(a, b) / Math.sqrt(norm2(a) * norm2(b));
-}
-
-/**
- * Converts list of vectors (matrix) into a 1-dimensional
- * typed array with row-first order.
- */
-export function toTypedArray<T>(
-    dataPoints: T[], accessor: (dataPoint: T) => Float32Array): Float32Array {
-  let N = dataPoints.length;
-  let dim = accessor(dataPoints[0]).length;
-  let result = new Float32Array(N * dim);
-  for (let i = 0; i < N; ++i) {
-    let vector = accessor(dataPoints[i]);
-    for (let d = 0; d < dim; ++d) {
-      result[i * dim + d] = vector[d];
-    }
-  }
-  return result;
-}
-
-/**
- * Transposes an RxC matrix represented as a flat typed array
- * into a CxR matrix, again represented as a flat typed array.
- */
-export function transposeTypedArray(
-    r: number, c: number, typedArray: Float32Array) {
-  let result = new Float32Array(r * c);
-  for (let i = 0; i < r; ++i) {
-    for (let j = 0; j < c; ++j) {
-      result[j * r + i] = typedArray[i * c + j];
-    }
-  }
-  return result;
-}
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-app.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-app.html
deleted file mode 100644
index 34aca77dde..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-app.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-
-<link rel="import" href="vz-projector.html">
-<link rel="import" href="styles.html">
-
-<dom-module id="vz-projector-app">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-#appbar {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 24px;
-  height: 60px;
-  color: white;
-  background: #560731;
-}
-
-#appbar .logo {
-  font-size: 18px;
-  font-weight: 300;
-}
-
-.icons {
-  display: flex;
-}
-
-.icons a {
-  color: white;
-}
-
-vz-projector {
-  height: calc(100% - 60px);
-}
-
-#container {
-  height: 100%;
-}
-</style>
-
-<div id="container">
-  <div id="appbar">
-    <div>Embedding Projector</div>
-    <div class="icons">
-      <a title="Documentation" target="_blank" href="[[documentationLink]]">
-        <paper-icon-button icon="help-outline"></paper-icon-button>
-        <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
-          Open documentation
-        </paper-tooltip>
-      </a>
-      <a title="Report bug" target="_blank" href="[[bugReportLink]]">
-        <paper-icon-button icon="bug-report"></paper-icon-button>
-        <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
-          Report a bug
-        </paper-tooltip>
-      </a>
-    </div>
-  </div>
-  <vz-projector route-prefix="[[routePrefix]]"
-      serving-mode="[[servingMode]]"
-      projector-config-json-path="[[projectorConfigJsonPath]]"
-      page-view-logging="[[pageViewLogging]]"
-      event-logging="[[eventLogging]]">
-  </vz-projector>
-</div>
-<!-- Google analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-46457317-5', 'auto');
-</script>
-</template>
-<script>
-  Polymer({
-    is: 'vz-projector-app',
-    properties: {
-      pageViewLogging: {type: Boolean, value: false},
-      eventLogging: {type: Boolean, value: false}
-    }
-  });
-</script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.html
deleted file mode 100644
index c37d8d9571..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../paper-input/paper-textarea.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<link rel="import" href="styles.html">
-
-<dom-module id="vz-projector-bookmark-panel">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-#title {
-  background-color: #fafafa;
-  color: black;
-  font-weight: 500;
-  left: 0;
-  line-height: 60px;
-  padding-left: 24px;
-  position: absolute;
-  width: 276px;
-}
-#bookmark-container {
-  background-color: #fafafa;
-}
-#icon-container {
-  line-height: 60px;
-  position: absolute;
-  right: 0;
-}
-#header {
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-  position: relative;
-}
-#panel {
-  background-color: #fafafa;
-  position: relative;
-  overflow-y: scroll;
-  top: 60px;
-  max-height: 50vh;
-}
-
-#save-container {
-  text-align: center;
-}
-
-.state-radio {
-  display: table-cell;
-  vertical-align: middle;
-  padding-top: 16px;
-}
-
-.state-label {
-  display: table-cell;
-  vertical-align: middle;
-  top: 14px;
-}
-
-.state-label-input {
-  width: 194px;
-}
-
-.state-clear {
-  display: table-cell;
-  vertical-align: middle;
-  padding-top: 20px;
-}
-#state-file {
-  display: none;
-}
-#no-bookmarks {
-  padding: 0 24px;
-}
-#action-buttons-container .add-icon-button {
-  background-color: #03a9f4;
-  color: white;
-  margin: 0 4px 4px auto;
-  right: 7px;
-  top: -4px;
-}
-.upload-download-icon-button {
-  padding: 0;
-}
-#action-buttons-container {
-  display: flex;
-  margin-left: 34px;
-  margin-top: 6px;
-}
-.ink-fab {
-  border-radius: 50%;
-  background: white;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-}
-paper-textarea {
-  --paper-input-container-input: {
-    font-size: 12px;
-  }
-  --paper-font-caption: {
-    display: none
-  }
-}
-</style>
-
-<!-- Bookmarking controls -->
-<div id="bookmark-container">
-  <div id="header">
-    <div id="title">
-      BOOKMARKS ([[savedStates.length]])
-      <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-      <paper-tooltip animation-delay="0" position="top" offset="0">
-        Open this drawer to save a set of views of the projection, including
-        selected points. A file containing the bookmarks can then be saved and
-        later loaded to view them.
-      </paper-tooltip>
-    </div>
-    <div id="icon-container">
-      <!-- Icons and event handlers are inverted because the tray expands upwards. -->
-      <paper-icon-button id="expand-more"
-          icon="expand-less"
-          on-tap="_expandMore"></paper-icon-button>
-      <paper-icon-button id="expand-less"
-          style="display: none"
-          icon="expand-more"
-          on-tap="_expandLess"></paper-icon-button>
-    </div>
-  </div>
-  <iron-collapse id="panel">
-    <!-- Saving state section -->
-    <div id="state-section">
-      <template is="dom-if" if="[[!savedStates.length]]">
-        <p id="no-bookmarks">
-            No bookmarks yet, upload a bookmarks file or add a new bookmark by clicking the "+" below.
-        </p>
-      </template>
-
-      <template is="dom-repeat" items="{{savedStates}}">
-        <div class="state-row">
-          <div class="state-radio">
-            <template is="dom-if" if="{{item.isSelected}}">
-              <paper-icon-button icon="radio-button-checked"></paper-icon-button>
-            </template>
-            <template is="dom-if" if="{{!item.isSelected}}">
-              <paper-icon-button
-                  icon="radio-button-unchecked"
-                  data-index$="{{index}}"
-                  on-tap="_radioButtonHandler"></paper-icon-button>
-            </template>
-          </div>
-          <div class="state-label">
-            <paper-textarea value="[[item.label]]"
-                class="state-label-input"
-                on-keyup="_labelChange"
-                data-index$="[[index]]"
-                autoresizing></paper-input>
-          </div>
-          <div class="state-clear">
-            <paper-icon-button
-                icon="clear"
-                data-index$="{{index}}"
-                on-tap="_clearButtonHandler"></paper-icon-button>
-          </div>
-        </div>
-      </template>
-
-      <div id="action-buttons-container">
-        <paper-icon-button
-            class="upload-download-icon-button"
-            icon="save"
-            title="Save bookmarks"
-            disabled="[[!hasStates]]"
-            on-tap="_downloadFile"></paper-icon-button>
-        <paper-icon-button
-            class="upload-download-icon-button"
-            icon="file-upload"
-            title="Load bookmarks"
-            on-tap="_uploadFile"></paper-icon-button>
-        <paper-icon-button
-            class="add-icon-button ink-fab"
-            icon="add"
-            title="Add bookmark"
-            on-tap="_addBookmark"></paper-icon-button>
-        <input type="file" id="state-file" name="state-file"/>
-      </div>
-    </div>
-  </iron-collapse>
-</div>
-
-</template>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts
deleted file mode 100644
index 53195fa47c..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-bookmark-panel.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-import {State} from './data';
-import {DataProvider, EmbeddingInfo} from './data-provider';
-import * as logging from './logging';
-import {ProjectorEventContext} from './projectorEventContext';
-import {Projector} from './vz-projector';
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-// tslint:disable-next-line
-export let BookmarkPanelPolymer = PolymerElement({
-  is: 'vz-projector-bookmark-panel',
-  properties: {
-    savedStates: Object,
-    // Keep a separate polymer property because the savedStates doesn't change
-    // when adding and removing states.
-    hasStates: {type: Boolean, value: false},
-    selectedState: Number
-  }
-});
-
-export class BookmarkPanel extends BookmarkPanelPolymer {
-  private projector: Projector;
-
-  // A list containing all of the saved states.
-  private savedStates: State[];
-  private hasStates = false;
-  private selectedState: number;
-  private ignoreNextProjectionEvent: boolean;
-
-  private expandLessButton: HTMLButtonElement;
-  private expandMoreButton: HTMLButtonElement;
-
-  ready() {
-    this.savedStates = [];
-    this.setupUploadButton();
-    this.ignoreNextProjectionEvent = false;
-    this.expandLessButton =
-        this.querySelector('#expand-less') as HTMLButtonElement;
-    this.expandMoreButton =
-        this.querySelector('#expand-more') as HTMLButtonElement;
-  }
-
-  initialize(
-      projector: Projector, projectorEventContext: ProjectorEventContext) {
-    this.projector = projector;
-    projectorEventContext.registerProjectionChangedListener(() => {
-      if (this.ignoreNextProjectionEvent) {
-        this.ignoreNextProjectionEvent = false;
-      } else {
-        this.clearStateSelection();
-      }
-    });
-  }
-
-  setSelectedTensor(
-      run: string, tensorInfo: EmbeddingInfo, dataProvider: DataProvider) {
-    // Clear any existing bookmarks.
-    this.addStates(null);
-    if (tensorInfo && tensorInfo.bookmarksPath) {
-      // Get any bookmarks that may come when the projector starts up.
-      dataProvider.getBookmarks(run, tensorInfo.tensorName, bookmarks => {
-        this.addStates(bookmarks);
-        this._expandMore();
-      });
-    } else {
-      this._expandLess();
-    }
-  }
-
-  /** Handles a click on show bookmarks tray button. */
-  _expandMore() {
-    this.$.panel.show();
-    this.expandMoreButton.style.display = 'none';
-    this.expandLessButton.style.display = '';
-  }
-
-  /** Handles a click on hide bookmarks tray button. */
-  _expandLess() {
-    this.$.panel.hide();
-    this.expandMoreButton.style.display = '';
-    this.expandLessButton.style.display = 'none';
-  }
-
-  /** Handles a click on the add bookmark button. */
-  _addBookmark() {
-    let currentState = this.projector.getCurrentState();
-    currentState.label = 'State ' + this.savedStates.length;
-    currentState.isSelected = true;
-
-    this.selectedState = this.savedStates.length;
-
-    for (let i = 0; i < this.savedStates.length; i++) {
-      this.savedStates[i].isSelected = false;
-      // We have to call notifyPath so that polymer knows this element was
-      // updated.
-      this.notifyPath('savedStates.' + i + '.isSelected', false, false);
-    }
-
-    this.push('savedStates', currentState as any);
-    this.updateHasStates();
-  }
-
-  /** Handles a click on the download bookmarks button. */
-  _downloadFile() {
-    let serializedState = this.serializeAllSavedStates();
-    let blob = new Blob([serializedState], {type: 'text/plain'});
-    let textFile = window.URL.createObjectURL(blob);
-
-    // Force a download.
-    let a = document.createElement('a');
-    document.body.appendChild(a);
-    a.style.display = 'none';
-    a.href = textFile;
-    (a as any).download = 'state';
-    a.click();
-
-    document.body.removeChild(a);
-    window.URL.revokeObjectURL(textFile);
-  }
-
-  /** Handles a click on the upload bookmarks button. */
-  _uploadFile() {
-    let fileInput = this.dom.select('#state-file');
-    (fileInput.node() as HTMLInputElement).click();
-  }
-
-  private setupUploadButton() {
-    // Show and setup the load view button.
-    const fileInput = this.querySelector('#state-file') as HTMLInputElement;
-    fileInput.onchange = () => {
-      const file: File = fileInput.files[0];
-      // Clear out the value of the file chooser. This ensures that if the user
-      // selects the same file, we'll re-read it.
-      fileInput.value = '';
-      const fileReader = new FileReader();
-      fileReader.onload = (evt) => {
-        const str: string = fileReader.result;
-        const savedStates = JSON.parse(str);
-
-        // Verify the bookmarks match.
-        if (this.savedStatesValid(savedStates)) {
-          this.addStates(savedStates);
-          this.loadSavedState(0);
-        } else {
-          logging.setWarningMessage(
-              `Unable to load bookmarks: wrong dataset, expected dataset ` +
-              `with shape (${savedStates[0].dataSetDimensions}).`);
-        }
-      };
-      fileReader.readAsText(file);
-    };
-  }
-
-  addStates(savedStates?: State[]) {
-    if (savedStates == null) {
-      this.savedStates = [];
-    } else {
-      for (let i = 0; i < savedStates.length; i++) {
-        savedStates[i].isSelected = false;
-        this.push('savedStates', savedStates[i] as any);
-      }
-    }
-    this.updateHasStates();
-  }
-
-  /** Deselects any selected state selection. */
-  clearStateSelection() {
-    for (let i = 0; i < this.savedStates.length; i++) {
-      this.setSelectionState(i, false);
-    }
-  }
-
-  /** Handles a radio button click on a saved state. */
-  _radioButtonHandler(evt: Event) {
-    const index = this.getParentDataIndex(evt);
-    this.loadSavedState(index);
-    this.setSelectionState(index, true);
-  }
-
-  loadSavedState(index: number) {
-    for (let i = 0; i < this.savedStates.length; i++) {
-      if (this.savedStates[i].isSelected) {
-        this.setSelectionState(i, false);
-      } else if (index === i) {
-        this.setSelectionState(i, true);
-        this.ignoreNextProjectionEvent = true;
-        this.projector.loadState(this.savedStates[i]);
-      }
-    }
-  }
-
-  private setSelectionState(stateIndex: number, selected: boolean) {
-    this.savedStates[stateIndex].isSelected = selected;
-    const path = 'savedStates.' + stateIndex + '.isSelected';
-    this.notifyPath(path, selected, false);
-  }
-
-  /**
-   * Crawls up the DOM to find an ancestor with a data-index attribute. This is
-   * used to match events to their bookmark index.
-   */
-  private getParentDataIndex(evt: Event) {
-    for (let i = 0; i < (evt as any).path.length; i++) {
-      let dataIndex = (evt as any).path[i].getAttribute('data-index');
-      if (dataIndex != null) {
-        return +dataIndex;
-      }
-    }
-    return -1;
-  }
-
-  /** Handles a clear button click on a bookmark. */
-  _clearButtonHandler(evt: Event) {
-    let index = this.getParentDataIndex(evt);
-    this.splice('savedStates', index, 1);
-    this.updateHasStates();
-  }
-
-  /** Handles a label change event on a bookmark. */
-  _labelChange(evt: Event) {
-    let index = this.getParentDataIndex(evt);
-    this.savedStates[index].label = (evt.target as any).value;
-  }
-
-  /**
-   * Used to determine whether to select the radio button for a given bookmark.
-   */
-  _isSelectedState(index: number) {
-    return index === this.selectedState;
-  }
-  _isNotSelectedState(index: number) {
-    return index !== this.selectedState;
-  }
-
-  /**
-   * Gets all of the saved states as a serialized string.
-   */
-  serializeAllSavedStates(): string {
-    return JSON.stringify(this.savedStates);
-  }
-
-  /**
-   * Loads all of the serialized states and shows them in the list of
-   * viewable states.
-   */
-  loadSavedStates(serializedStates: string) {
-    this.savedStates = JSON.parse(serializedStates);
-    this.updateHasStates();
-  }
-
-  /**
-   * Updates the hasState polymer property.
-   */
-  private updateHasStates() {
-    this.hasStates = (this.savedStates.length !== 0);
-  }
-
-  /** Sanity checks a State array to ensure it matches the current dataset. */
-  private savedStatesValid(states: State[]): boolean {
-    for (let i = 0; i < states.length; i++) {
-      if (states[i].dataSetDimensions[0] !== this.projector.dataSet.dim[0] ||
-          states[i].dataSetDimensions[1] !== this.projector.dataSet.dim[1]) {
-        return false;
-      }
-    }
-    return true;
-  }
-}
-document.registerElement(BookmarkPanel.prototype.is, BookmarkPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-colab.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-colab.html
deleted file mode 100644
index 2acb570b3c..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-colab.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="vz-projector.html">
-<dom-module id="vz-projector-colab">
-<template>
-<vz-projector serving-mode="proto" data-proto="[[dataProto]]"></vz-projector>
-</template>
-<script>
-Polymer({
-  is: 'vz-projector-colab',
-  properties: {
-    dataProto: Object
-  }
-});
-</script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
deleted file mode 100644
index 55c15da5ed..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-dashboard.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../tf-dashboard-common/tf-dashboard.html">
-<link rel="import" href="../tf-dashboard-common/tf-no-data-warning.html">
-<link rel="import" href="vz-projector.html">
-
-<dom-module id="vz-projector-dashboard">
-<template>
-  <tf-no-data-warning
-    data-type="projector"
-    show-warning="[[dataNotFound]]"
-  ></tf-no-data-warning>
-  <template is="dom-if" if="[[!dataNotFound]]">
-    <vz-projector
-      id="projector"
-      route-prefix="[[routePrefix]]"
-      serving-mode="server"
-      page-view-logging
-      event-logging
-    ></vz-projector>
-  </template>
-</template>
-<script>
-"use strict";
-
-(function() {
-TF.Dashboard.VzProjectorDashboard = Polymer({
-  is: 'vz-projector-dashboard',
-  factoryImpl: function(routePrefix) {
-    this.routePrefix = routePrefix;
-  },
-  properties: {
-    dataNotFound: Boolean,
-    routePrefix: String,
-    // Whether this dashboard is initialized. This dashboard should only be initialized once.
-    _initialized: Boolean,
-  },
-  behaviors: [
-    TF.Dashboard.DashboardBehavior("embeddings"),
-  ],
-  reload: function() {
-    // Do not reload the embedding projector. Reloading could take a long time.
-  },
-  attached: function() {
-    if (this._initialized) {
-      return;
-    }
-    let xhr = new XMLHttpRequest();
-    xhr.open('GET', this.routePrefix + '/runs');
-    xhr.onload = () => {
-      // Set this to true so we only initialize once.
-      this._initialized = true;
-
-      let runs = JSON.parse(xhr.responseText);
-      this.set('dataNotFound', runs.length === 0);
-    };
-    xhr.onerror = () => {
-      this.set('dataNotFound', false);
-    };
-    xhr.send();
-  },
-});
-})();
-</script>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html
deleted file mode 100644
index 607d446789..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.html
+++ /dev/null
@@ -1,399 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-button/paper-button.html">
-<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-input/paper-textarea.html">
-<link rel="import" href="../paper-item/paper-item.html">
-<link rel="import" href="../paper-listbox/paper-listbox.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../paper-dialog/paper-dialog.html">
-<link rel="import" href="../paper-dialog-scrollable/paper-dialog-scrollable.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<link rel="import" href="vz-projector-legend.html">
-<link rel="import" href="styles.html">
-
-<dom-module id="vz-projector-data-panel">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-.container {
-  padding: 10px 20px 20px 20px;
-}
-
-input[type=file] {
-  display: none;
-}
-
-.file-name {
-  margin-right: 10px;
-}
-
-.dirs {
-  color: rgba(0, 0, 0, 0.7);
-  font-size: 12px;
-}
-
-.dirs table tr {
-  vertical-align: top;
-}
-
-.dirs table tr td {
-  padding-bottom: 10px;
-}
-
-paper-item {
-  --paper-item-disabled: {
-    border-bottom: 1px solid black;
-    justify-content: center;
-    font-size: 12px;
-    line-height: normal;
-    min-height: 0px;
-  };
-}
-
-.item-details {
-  margin-left: 5px;
-  color: gray;
-  font-size: 12px;
-}
-
-paper-dropdown-menu {
-  width: 100%;
-}
-
-paper-dropdown-menu paper-item {
-  justify-content: space-between;
-}
-
-.title {
-  align-items: center;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-  color: black;
-  display: flex;
-  font-weight: 500;
-  height: 59px;
-  padding-left: 20px;
-}
-
-#normalize-data-checkbox {
-  margin: 10px 0;
-}
-
-#projector-config-template {
-  --paper-input-container-input: {
-    line-height: 13px;
-    font-family: monospace;
-    font-size: 12px;
-  };
-}
-
-#generate-share-url {
-  padding: 16px;
-  margin-left: 24px;
-}
-
-#projector-share-button-container {
-  margin: 10px 0;
-}
-
-.config-checkbox {
-  display: inline-block;
-  font-size: 11px;
-  margin-left: 10px;
-}
-
-.projector-config-options {
-  margin-top: 12px;
-}
-
-.projector-config-dialog-container {
-  padding: 24px;
-}
-
-.code {
-  background-color: #f7f7f7;
-  display: table;
-  font-family: monospace;
-  margin-top: 7px;
-  padding: 15px;
-}
-
-.delimiter {
-  color: #B71C1C;
-}
-
-.upload-step {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 6px;
-}
-
-.upload-step paper-button {
-  margin-left: 30px;
-}
-
-.step-label {
-  color: rgb(38, 180, 226);
-}
-
-.scrollable-container {
-  margin-top: 0;
-  min-width: 400px;
-}
-
-#projectorConfigDialog p {
-  margin: 8px 0 8px;
-}
-
-.data-step {
-  margin-top: 40px;
-}
-
-.data-step-contents {
-  display: table;
-  width: 100%;
-}
-
-.data-step-contents-contents {
-  display: table-cell;
-  margin-top: 6px;
-}
-
-.data-step-contents-upload {
-  display: table-cell;
-  text-align: right;
-  vertical-align: bottom;
-}
-
-#demo-data-buttons-container {
-  display: none;
-}
-
-.colorby-container {
-  margin-bottom: 10px;
-}
-</style>
-<div class="title">DATA</div>
-<div class="container">
-  <!-- List of runs -->
-  <template is="dom-if" if="[[_hasChoices(runNames)]]">
-    <paper-dropdown-menu no-animations label="[[_getNumRunsLabel(runNames)]] found">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedRun}}">
-        <template is="dom-repeat" items="[[runNames]]">
-          <paper-item value="[[item]]" label="[[item]]">
-            [[item]]
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </template>
-
-  <template is="dom-if" if="[[tensorNames]]">
-    <!-- List of tensors in checkpoint -->
-    <paper-dropdown-menu no-animations label="[[_getNumTensorsLabel(tensorNames)]] found">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedTensor}}">
-        <template is="dom-repeat" items="[[tensorNames]]">
-          <paper-item value="[[item.name]]" label="[[item.name]]">
-            [[item.name]]
-            <span class="item-details">
-              [[item.shape.0]]x[[item.shape.1]]
-            </span>
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </template>
-  <!-- Label by -->
-  <template is="dom-if" if="[[_hasChoices(labelOptions)]]">
-    <paper-dropdown-menu no-animations label="Label by">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedLabelOption}}">
-        <template is="dom-repeat" items="[[labelOptions]]">
-          <paper-item value="[[item]]" label="[[item]]">
-            [[item]]
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </template>
-
-  <!-- Color by -->
-  <div hidden$="[[!_hasChoices(colorOptions)]]" class="colorby-container">
-    <paper-dropdown-menu id="colorby" no-animations label="Color by">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedColorOptionName}}">
-        <template is="dom-repeat" items="[[colorOptions]]">
-          <paper-item class$="[[getSeparatorClass(item.isSeparator)]]" value="[[item.name]]" label="[[item.name]]" disabled="[[item.isSeparator]]">
-            [[item.name]]
-            <span class="item-details">[[item.desc]]</span>
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-    <div hidden$="[[!showForceCategoricalColorsCheckbox]]">
-      <paper-checkbox id="force-categorical-checkbox"></paper-checkbox>
-      Use categorical coloring
-      <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
-        For metadata fields that have many unique values we use a gradient color map
-        by default. This checkbox allows you to force categorical coloring by a given
-        metadata field.
-      </paper-tooltip>
-    </div>
-    <template dom-if="[[colorLegendRenderInfo]]">
-      <vz-projector-legend render-info="[[colorLegendRenderInfo]]"></vz-projector-legend>
-    </template>
-  </div>
-  <paper-checkbox id="normalize-data-checkbox" checked="{{normalizeData}}">
-    Sphereize data
-    <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-    <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
-      The data is normalized by shifting each point by the centroid and making
-      it unit norm.
-    </paper-tooltip>
-  </paper-checkbox>
-  <p id="demo-data-buttons-container">
-    <span>
-      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
-        Load data from your computer
-      </paper-tooltip>
-      <paper-button id="upload" class="ink-button" onclick="dataDialog.open()">Load data</paper-button>
-    </span>
-    <span id="publish-container">
-      <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
-        Publish your embedding visualization and data
-      </paper-tooltip>
-      <paper-button id="host-embedding" class="ink-button" onclick="projectorConfigDialog.open()">Publish</paper-button>
-    </span>
-  </p>
-  <div>
-    <paper-dialog id="dataDialog" with-backdrop>
-      <h2>Load data from your computer</h2>
-      <paper-dialog-scrollable class="scrollable-container">
-        <div class="data-step" id="upload-tensors-step-container">
-          <div class="upload-step">
-            <div>
-                <b><span class="step-label">Step 1:</span> Load a TSV file of vectors.</b>
-            </div>
-          </div>
-          <div class="data-step-contents">
-            <div class="data-step-contents-contents">
-              Example of 3 vectors with dimension 4:
-              <div class="code">
-                0.1<span class="delimiter">\t</span>0.2<span class="delimiter">\t</span>0.5<span class="delimiter">\t</span>0.9<br/>
-                0.2<span class="delimiter">\t</span>0.1<span class="delimiter">\t</span>5.0<span class="delimiter">\t</span>0.2<br/>
-                0.4<span class="delimiter">\t</span>0.1<span class="delimiter">\t</span>7.0<span class="delimiter">\t</span>0.8
-              </div>
-            </div>
-            <div class="data-step-contents-upload">
-              <paper-button id="upload-tensors" title="Choose a TSV tensor file">Choose file</paper-button>
-              <input type="file" id="file" name="file"/>
-            </div>
-          </div>
-        </div>
-        <div class="data-step">
-          <div class="upload-step">
-            <div>
-                <span class="step-label" id="upload-metadata-label"><b>Step 2</b> (optional):</span> <b>Load a TSV file of metadata.</b>
-            </div>
-          </div>
-          <div class="data-step-contents">
-            <div class="data-step-contents-contents">
-              Example of 3 data points and 2 columns.<br/>
-              <i>Note: If there is more than one column, the first row will be parsed as column labels.</i>
-              <div class="code">
-                <b>Pokémon<span class="delimiter">\t</span>Species</b><br/>
-                Wartortle<span class="delimiter">\t</span>Turtle<br/>
-                Venusaur<span class="delimiter">\t</span>Seed<br/>
-                Charmeleon<span class="delimiter">\t</span>Flame
-              </div>
-            </div>
-            <div class="data-step-contents-upload">
-              <paper-button id="upload-metadata" title="Choose a TSV metadata file" class="ink-button">Choose file</paper-button>
-              <input type="file" id="file-metadata" name="file-metadata"/>
-            </div>
-          </div>
-        </div>
-      </paper-dialog-scrollable>
-      <div class="dismiss-dialog-note">Click outside to dismiss.</div>
-    </paper-dialog>
-    <paper-dialog id="projectorConfigDialog" with-backdrop>
-      <h2>Publish your embedding visualization and data</h2>
-      <paper-dialog-scrollable class="scrollable-container">
-        <div>
-          <p>
-            If you'd like to share your visualization with the world, follow these simple steps.
-            See <a target=_blank href="https://www.tensorflow.org/get_started/embedding_viz">this tutorial</a> for more.
-          </p>
-          <h4><span class="step-label">Step 1:</span> Make data public</h4>
-          <p>
-            Host tensors, metadata, sprite image, and bookmarks TSV files <i>publicly</i> on the web.
-          </p>
-          <p>
-            One option is using a <a target=_blank href="https://gist.github.com/">github gist</a>.
-            If you choose this approach, make sure to link directly to the raw file.
-          </p>
-        </div>
-        <div>
-          <h4><span class="step-label">Step 2:</span> Projector config</h4>
-          <div class="projector-config-options">
-            <i>Optional:</i>
-            <div class="config-checkbox">
-              <paper-checkbox id="config-metadata-checkbox" checked>Metadata</paper-checkbox>
-            </div>
-            <div class="config-checkbox">
-              <paper-checkbox id="config-sprite-checkbox">Sprite</paper-checkbox>
-            </div>
-            <div class="config-checkbox">
-              <paper-checkbox id="config-bookmarks-checkbox">Bookmarks</paper-checkbox>
-            </div>
-          </div>
-        </div>
-        <paper-textarea id="projector-config-template" label="template_projector_config.json"></paper-textarea>
-        <div>
-          <h4><span class="step-label">Step 3:</span> Host projector config</h4>
-          After you have hosted the projector config JSON file you built above, paste the URL to the config below.
-        </div>
-        <paper-input id="projector-config-url" label="Path to projector config"></paper-input>
-        <paper-input id="projector-share-url" label="Your shareable URL" readonly></paper-input>
-        <div id="projector-share-button-container">
-          <a target=_blank id="projector-share-url-link">
-            <paper-button title="Test your shareable URL" class="ink-button">Test your shareable URL</paper-button>
-          </a>
-        </div>
-      </paper-dialog-scrollable>
-      <div class="dismiss-dialog-note">Click outside to dismiss.</div>
-    </paper-dialog>
-  </div>
-  <div class="dirs">
-    <table>
-      <tr>
-        <td>Checkpoint:</td>
-        <td><span id="checkpoint-file"></span></td>
-      </tr>
-      <tr>
-        <td>Metadata:</td>
-        <td><span id="metadata-file"></span></td>
-      </tr>
-    </table>
-  </div>
-</div>
-<!-- Closing global template -->
-</template>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
deleted file mode 100644
index 6856caa2f4..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-data-panel.ts
+++ /dev/null
@@ -1,496 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {ColorOption, ColumnStats, SpriteAndMetadataInfo} from './data';
-import {DataProvider, EmbeddingInfo, parseRawMetadata, parseRawTensors, ProjectorConfig} from './data-provider';
-import * as util from './util';
-import {Projector} from './vz-projector';
-import {ColorLegendRenderInfo, ColorLegendThreshold} from './vz-projector-legend';
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-export let DataPanelPolymer = PolymerElement({
-  is: 'vz-projector-data-panel',
-  properties: {
-    selectedTensor: {type: String, observer: '_selectedTensorChanged'},
-    selectedRun: {type: String, observer: '_selectedRunChanged'},
-    selectedColorOptionName: {
-      type: String,
-      notify: true,
-      observer: '_selectedColorOptionNameChanged'
-    },
-    selectedLabelOption:
-        {type: String, notify: true, observer: '_selectedLabelOptionChanged'},
-    normalizeData: Boolean,
-    showForceCategoricalColorsCheckbox: Boolean
-  }
-});
-
-export class DataPanel extends DataPanelPolymer {
-  selectedLabelOption: string;
-  selectedColorOptionName: string;
-  showForceCategoricalColorsCheckbox: boolean;
-
-  private normalizeData: boolean;
-  private labelOptions: string[];
-  private colorOptions: ColorOption[];
-  forceCategoricalColoring: boolean = false;
-
-  private selectedTensor: string;
-  private selectedRun: string;
-  private dataProvider: DataProvider;
-  private tensorNames: {name: string, shape: number[]}[];
-  private runNames: string[];
-  private projector: Projector;
-  private projectorConfig: ProjectorConfig;
-  private colorLegendRenderInfo: ColorLegendRenderInfo;
-  private spriteAndMetadata: SpriteAndMetadataInfo;
-  private metadataFile: string;
-
-  ready() {
-    this.normalizeData = true;
-  }
-
-  initialize(projector: Projector, dp: DataProvider) {
-    this.projector = projector;
-    this.dataProvider = dp;
-    this.setupUploadButtons();
-
-    // Tell the projector whenever the data normalization changes.
-    // Unknown why, but the polymer checkbox button stops working as soon as
-    // you do d3.select() on it.
-    this.querySelector('#normalize-data-checkbox')
-        .addEventListener('change', () => {
-          this.projector.setNormalizeData(this.normalizeData);
-        });
-
-    let forceCategoricalColoringCheckbox =
-        this.querySelector('#force-categorical-checkbox');
-    forceCategoricalColoringCheckbox.addEventListener('change', () => {
-      this.setForceCategoricalColoring(
-          (forceCategoricalColoringCheckbox as HTMLInputElement).checked);
-    });
-
-    // Get all the runs.
-    this.dataProvider.retrieveRuns(runs => {
-      this.runNames = runs;
-      // Choose the first run by default.
-      if (this.runNames.length > 0) {
-        this.selectedRun = runs[0];
-      }
-    });
-  }
-
-  setForceCategoricalColoring(forceCategoricalColoring: boolean) {
-    this.forceCategoricalColoring = forceCategoricalColoring;
-    (this.querySelector('#force-categorical-checkbox') as HTMLInputElement)
-        .checked = this.forceCategoricalColoring;
-
-    this.updateMetadataUI(this.spriteAndMetadata.stats, this.metadataFile);
-
-    // The selected color option name doesn't change when we switch to using
-    // categorical coloring for stats with too many unique values, so we
-    // manually call this polymer observer so that we update the UI.
-    this._selectedColorOptionNameChanged();
-  }
-
-  getSeparatorClass(isSeparator: boolean): string {
-    return isSeparator ? 'separator' : null;
-  }
-
-  metadataChanged(
-      spriteAndMetadata: SpriteAndMetadataInfo, metadataFile: string) {
-    this.spriteAndMetadata = spriteAndMetadata;
-    this.metadataFile = metadataFile;
-
-    this.updateMetadataUI(this.spriteAndMetadata.stats, this.metadataFile);
-    this.selectedColorOptionName = this.colorOptions[0].name;
-  }
-
-  private addWordBreaks(longString: string): string {
-    if (longString == null) {
-      return '';
-    }
-    return longString.replace(/([\/=-_,])/g, '$1<wbr>');
-  }
-
-  private updateMetadataUI(columnStats: ColumnStats[], metadataFile: string) {
-    const metadataFileElement =
-        this.querySelector('#metadata-file') as HTMLSpanElement;
-    metadataFileElement.innerHTML = this.addWordBreaks(metadataFile);
-    metadataFileElement.title = metadataFile;
-
-    // Label by options.
-    let labelIndex = -1;
-    this.labelOptions = columnStats.map((stats, i) => {
-      // Make the default label by the first non-numeric column.
-      if (!stats.isNumeric && labelIndex === -1) {
-        labelIndex = i;
-      }
-      return stats.name;
-    });
-    this.selectedLabelOption = this.labelOptions[Math.max(0, labelIndex)];
-
-    // Color by options.
-    const standardColorOption: ColorOption[] = [
-      {name: 'No color map'},
-      // TODO(smilkov): Implement this.
-      // {name: 'Distance of neighbors',
-      //    desc: 'How far is each point from its neighbors'}
-    ];
-    const metadataColorOption: ColorOption[] =
-        columnStats
-            .filter(stats => {
-              return !stats.tooManyUniqueValues || stats.isNumeric;
-            })
-            .map(stats => {
-              let map: (v: string|number) => string;
-              let items: {label: string, count: number}[];
-              let thresholds: ColorLegendThreshold[];
-              let isCategorical =
-                  this.forceCategoricalColoring || !stats.tooManyUniqueValues;
-              if (isCategorical) {
-                let scale = d3.scale.category20();
-                let range = scale.range();
-                // Re-order the range.
-                let newRange = range.map((color, i) => {
-                  let index = (i * 3) % range.length;
-                  return range[index];
-                });
-                items = stats.uniqueEntries;
-                scale.range(newRange).domain(items.map(x => x.label));
-                map = scale;
-              } else {
-                thresholds = [
-                  {color: '#ffffdd', value: stats.min},
-                  {color: '#1f2d86', value: stats.max}
-                ];
-                map = d3.scale.linear<string>()
-                          .domain(thresholds.map(t => t.value))
-                          .range(thresholds.map(t => t.color));
-              }
-              let desc = !isCategorical ? 'gradient' :
-                                          stats.uniqueEntries.length +
-                      ((stats.uniqueEntries.length > 20) ? ' non-unique' : '') +
-                      ' colors';
-              return {
-                name: stats.name,
-                desc: desc,
-                map: map,
-                items: items,
-                thresholds: thresholds,
-                tooManyUniqueValues: stats.tooManyUniqueValues
-              };
-            });
-
-    if (metadataColorOption.length > 0) {
-      // Add a separator line between built-in color maps
-      // and those based on metadata columns.
-      standardColorOption.push({name: 'Metadata', isSeparator: true});
-    }
-    this.colorOptions = standardColorOption.concat(metadataColorOption);
-  }
-
-  setNormalizeData(normalizeData: boolean) {
-    this.normalizeData = normalizeData;
-  }
-
-  _selectedTensorChanged() {
-    this.projector.updateDataSet(null, null, null);
-    if (this.selectedTensor == null) {
-      return;
-    }
-    this.dataProvider.retrieveTensor(
-        this.selectedRun, this.selectedTensor, ds => {
-          let metadataFile =
-              this.getEmbeddingInfoByName(this.selectedTensor).metadataPath;
-          this.dataProvider.retrieveSpriteAndMetadata(
-              this.selectedRun, this.selectedTensor, metadata => {
-                this.projector.updateDataSet(ds, metadata, metadataFile);
-              });
-        });
-    this.projector.setSelectedTensor(
-        this.selectedRun, this.getEmbeddingInfoByName(this.selectedTensor));
-  }
-
-  _selectedRunChanged() {
-    this.dataProvider.retrieveProjectorConfig(this.selectedRun, info => {
-      this.projectorConfig = info;
-      let names =
-          this.projectorConfig.embeddings.map(e => e.tensorName)
-              .filter(name => {
-                let shape = this.getEmbeddingInfoByName(name).tensorShape;
-                return shape.length === 2 && shape[0] > 1 && shape[1] > 1;
-              })
-              .sort((a, b) => {
-                let embA = this.getEmbeddingInfoByName(a);
-                let embB = this.getEmbeddingInfoByName(b);
-
-                // Prefer tensors with metadata.
-                if (util.xor(!!embA.metadataPath, !!embB.metadataPath)) {
-                  return embA.metadataPath ? -1 : 1;
-                }
-
-                // Prefer non-generated tensors.
-                let isGenA = util.tensorIsGenerated(a);
-                let isGenB = util.tensorIsGenerated(b);
-                if (util.xor(isGenA, isGenB)) {
-                  return isGenB ? -1 : 1;
-                }
-
-                // Prefer bigger tensors.
-                let sizeA = embA.tensorShape[0];
-                let sizeB = embB.tensorShape[0];
-                if (sizeA !== sizeB) {
-                  return sizeB - sizeA;
-                }
-
-                // Sort alphabetically by tensor name.
-                return a <= b ? -1 : 1;
-              });
-      this.tensorNames = names.map(name => {
-        return {name, shape: this.getEmbeddingInfoByName(name).tensorShape};
-      });
-      const wordBreakablePath =
-          this.addWordBreaks(this.projectorConfig.modelCheckpointPath);
-      const checkpointFile =
-          this.querySelector('#checkpoint-file') as HTMLSpanElement;
-      checkpointFile.innerHTML = wordBreakablePath;
-      checkpointFile.title = this.projectorConfig.modelCheckpointPath;
-
-      // If in demo mode, let the order decide which tensor to load by default.
-      const defaultTensor = this.projector.servingMode === 'demo' ?
-          this.projectorConfig.embeddings[0].tensorName :
-          names[0];
-      if (this.selectedTensor === defaultTensor) {
-        // Explicitly call the observer. Polymer won't call it if the previous
-        // string matches the current string.
-        this._selectedTensorChanged();
-      } else {
-        this.selectedTensor = defaultTensor;
-      }
-    });
-  }
-
-  _selectedLabelOptionChanged() {
-    this.projector.setSelectedLabelOption(this.selectedLabelOption);
-  }
-
-  _selectedColorOptionNameChanged() {
-    let colorOption: ColorOption;
-    for (let i = 0; i < this.colorOptions.length; i++) {
-      if (this.colorOptions[i].name === this.selectedColorOptionName) {
-        colorOption = this.colorOptions[i];
-        break;
-      }
-    }
-    if (!colorOption) {
-      return;
-    }
-
-    this.showForceCategoricalColorsCheckbox = !!colorOption.tooManyUniqueValues;
-
-    if (colorOption.map == null) {
-      this.colorLegendRenderInfo = null;
-    } else if (colorOption.items) {
-      let items = colorOption.items.map(item => {
-        return {
-          color: colorOption.map(item.label),
-          label: item.label,
-          count: item.count
-        };
-      });
-      this.colorLegendRenderInfo = {items, thresholds: null};
-    } else {
-      this.colorLegendRenderInfo = {
-        items: null,
-        thresholds: colorOption.thresholds
-      };
-    }
-    this.projector.setSelectedColorOption(colorOption);
-  }
-
-  private tensorWasReadFromFile(rawContents: ArrayBuffer, fileName: string) {
-    parseRawTensors(rawContents, ds => {
-      const checkpointFile =
-          this.querySelector('#checkpoint-file') as HTMLSpanElement;
-      checkpointFile.innerText = fileName;
-      checkpointFile.title = fileName;
-      this.projector.updateDataSet(ds);
-    });
-  }
-
-  private metadataWasReadFromFile(rawContents: ArrayBuffer, fileName: string) {
-    parseRawMetadata(rawContents, metadata => {
-      this.projector.updateDataSet(this.projector.dataSet, metadata, fileName);
-    });
-  }
-
-  private getEmbeddingInfoByName(tensorName: string): EmbeddingInfo {
-    for (let i = 0; i < this.projectorConfig.embeddings.length; i++) {
-      const e = this.projectorConfig.embeddings[i];
-      if (e.tensorName === tensorName) {
-        return e;
-      }
-    }
-  }
-
-  private setupUploadButtons() {
-    // Show and setup the upload button.
-    const fileInput = this.querySelector('#file') as HTMLInputElement;
-    fileInput.onchange = () => {
-      const file: File = fileInput.files[0];
-      // Clear out the value of the file chooser. This ensures that if the user
-      // selects the same file, we'll re-read it.
-      fileInput.value = '';
-      const fileReader = new FileReader();
-      fileReader.onload = evt => {
-        const content: ArrayBuffer = fileReader.result;
-        this.tensorWasReadFromFile(content, file.name);
-      };
-      fileReader.readAsArrayBuffer(file);
-    };
-
-    const uploadButton =
-        this.querySelector('#upload-tensors') as HTMLButtonElement;
-    uploadButton.onclick = () => {
-      fileInput.click();
-    };
-
-    // Show and setup the upload metadata button.
-    const fileMetadataInput =
-        this.querySelector('#file-metadata') as HTMLInputElement;
-    fileMetadataInput.onchange = () => {
-      const file: File = fileMetadataInput.files[0];
-      // Clear out the value of the file chooser. This ensures that if the user
-      // selects the same file, we'll re-read it.
-      fileMetadataInput.value = '';
-      const fileReader = new FileReader();
-      fileReader.onload = evt => {
-        const contents: ArrayBuffer = fileReader.result;
-        this.metadataWasReadFromFile(contents, file.name);
-      };
-      fileReader.readAsArrayBuffer(file);
-    };
-
-    const uploadMetadataButton =
-        this.querySelector('#upload-metadata') as HTMLButtonElement;
-    uploadMetadataButton.onclick = () => {
-      fileMetadataInput.click();
-    };
-
-    if (this.projector.servingMode !== 'demo') {
-      (this.$$('#publish-container') as HTMLElement).style.display = 'none';
-      (this.$$('#upload-tensors-step-container') as HTMLElement).style.display =
-          'none';
-      (this.$$('#upload-metadata-label') as HTMLElement).style.display = 'none';
-    }
-
-    (this.$$('#demo-data-buttons-container') as HTMLElement).style.display =
-        'block';
-
-    // Fill out the projector config.
-    const projectorConfigTemplate =
-        this.$$('#projector-config-template') as HTMLTextAreaElement;
-    const projectorConfigTemplateJson: ProjectorConfig = {
-      embeddings: [{
-        tensorName: 'My tensor',
-        tensorShape: [1000, 50],
-        tensorPath: 'https://raw.githubusercontent.com/.../tensors.tsv',
-        metadataPath:
-            'https://raw.githubusercontent.com/.../optional.metadata.tsv',
-      }],
-    };
-    this.setProjectorConfigTemplateJson(
-        projectorConfigTemplate, projectorConfigTemplateJson);
-
-    // Set up optional field checkboxes.
-    const spriteFieldCheckbox =
-        this.$$('#config-sprite-checkbox') as HTMLInputElement;
-    spriteFieldCheckbox.onchange = () => {
-      if ((spriteFieldCheckbox as any).checked) {
-        projectorConfigTemplateJson.embeddings[0].sprite = {
-          imagePath: 'https://github.com/.../optional.sprite.png',
-          singleImageDim: [32, 32]
-        };
-      } else {
-        delete projectorConfigTemplateJson.embeddings[0].sprite;
-      }
-      this.setProjectorConfigTemplateJson(
-          projectorConfigTemplate, projectorConfigTemplateJson);
-    };
-    const bookmarksFieldCheckbox =
-        this.$$('#config-bookmarks-checkbox') as HTMLInputElement;
-    bookmarksFieldCheckbox.onchange = () => {
-      if ((bookmarksFieldCheckbox as any).checked) {
-        projectorConfigTemplateJson.embeddings[0].bookmarksPath =
-            'https://raw.githubusercontent.com/.../bookmarks.txt';
-      } else {
-        delete projectorConfigTemplateJson.embeddings[0].bookmarksPath;
-      }
-      this.setProjectorConfigTemplateJson(
-          projectorConfigTemplate, projectorConfigTemplateJson);
-    };
-    const metadataFieldCheckbox =
-        this.$$('#config-metadata-checkbox') as HTMLInputElement;
-    metadataFieldCheckbox.onchange = () => {
-      if ((metadataFieldCheckbox as HTMLInputElement).checked) {
-        projectorConfigTemplateJson.embeddings[0].metadataPath =
-            'https://raw.githubusercontent.com/.../optional.metadata.tsv';
-      } else {
-        delete projectorConfigTemplateJson.embeddings[0].metadataPath;
-      }
-      this.setProjectorConfigTemplateJson(
-          projectorConfigTemplate, projectorConfigTemplateJson);
-    };
-
-    // Update the link and the readonly shareable URL.
-    const projectorConfigUrlInput =
-        this.$$('#projector-config-url') as HTMLInputElement;
-    const projectorConfigDemoUrlInput = this.$$('#projector-share-url');
-    const projectorConfigDemoUrlLink = this.$$('#projector-share-url-link');
-    projectorConfigUrlInput.onchange = () => {
-      let projectorDemoUrl = location.protocol + '//' + location.host +
-          location.pathname +
-          '?config=' + (projectorConfigUrlInput as HTMLInputElement).value;
-
-      (projectorConfigDemoUrlInput as HTMLInputElement).value =
-          projectorDemoUrl;
-      (projectorConfigDemoUrlLink as HTMLLinkElement).href = projectorDemoUrl;
-    };
-  }
-
-  private setProjectorConfigTemplateJson(
-      projectorConfigTemplate: HTMLTextAreaElement, config: ProjectorConfig) {
-    projectorConfigTemplate.value =
-        JSON.stringify(config, null, /** replacer */ 2 /** white space */);
-  }
-
-  _getNumTensorsLabel(): string {
-    return this.tensorNames.length === 1 ? '1 tensor' :
-                                           this.tensorNames.length + ' tensors';
-  }
-
-  _getNumRunsLabel(): string {
-    return this.runNames.length === 1 ? '1 run' :
-                                        this.runNames.length + ' runs';
-  }
-
-  _hasChoices(choices: any[]): boolean {
-    return choices.length > 1;
-  }
-}
-
-document.registerElement(DataPanel.prototype.is, DataPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-input.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-input.html
deleted file mode 100644
index e77694426e..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-input.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-button/paper-button.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<link rel="import" href="styles.html">
-
-<dom-module id="vz-projector-input">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-.info {
-  color: rgba(0, 0, 0, 0.5);
-  display: block;
-  font-size: 11px;
-}
-
-.toggle {
-  font-size: 12px;
-  height: 21px;
-  margin: 0px;
-  min-width: 0px;
-  min-height: 0px;
-  padding: 0;
-  width: 17px;
-}
-
-.toggle[active] {
-  background-color: #880E4F;
-  color: white;
-}
-</style>
-
-<paper-input label="[[label]]">
-  <div class="slash" prefix>/</div>
-  <div class="slash" suffix>/</div>
-  <div suffix>
-    <paper-button id="regex" toggles class="toggle">.*</paper-button>
-  </div>
-</paper-input>
-<paper-tooltip for="regex" position="bottom" animation-delay="0" fit-to-visible-bounds>
-  Enable/disable regex mode.
-</paper-tooltip>
-<span class="info">[[message]]</span>
-
-<!-- Closing global template -->
-</template>
-</dom-module>
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts
deleted file mode 100644
index e11346d327..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-input.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-// tslint:disable-next-line
-export let PolymerClass = PolymerElement(
-    {is: 'vz-projector-input', properties: {label: String, message: String}});
-
-export interface InputChangedListener {
-  (value: string, inRegexMode: boolean): void;
-}
-
-/** Input control with custom capabilities (e.g. regex). */
-export class ProjectorInput extends PolymerClass {
-  private textChangedListeners: InputChangedListener[];
-  private paperInput: HTMLInputElement;
-  private inRegexModeButton: HTMLButtonElement;
-  private inRegexMode: boolean;
-
-  /** Message that will be displayed at the bottom of the input control. */
-  message: string;
-
-  /** Subscribe to be called everytime the input changes. */
-  registerInputChangedListener(listener: InputChangedListener) {
-    this.textChangedListeners.push(listener);
-  }
-
-  ready() {
-    this.inRegexMode = false;
-    this.textChangedListeners = [];
-    this.paperInput = this.querySelector('paper-input') as HTMLInputElement;
-    this.inRegexModeButton =
-        this.querySelector('paper-button') as HTMLButtonElement;
-    this.paperInput.setAttribute('error-message', 'Invalid regex');
-
-    this.paperInput.addEventListener('input', () => {
-      this.onTextChanged();
-    });
-
-    this.paperInput.addEventListener('keydown', event => {
-      event.stopPropagation();
-    });
-
-    this.inRegexModeButton.addEventListener(
-        'click', () => this.onClickRegexModeButton());
-    this.updateRegexModeDisplaySlashes();
-    this.onTextChanged();
-  }
-
-  private onClickRegexModeButton() {
-    this.inRegexMode = (this.inRegexModeButton as any).active;
-    this.updateRegexModeDisplaySlashes();
-    this.onTextChanged();
-  }
-
-  private notifyInputChanged(value: string, inRegexMode: boolean) {
-    this.textChangedListeners.forEach(l => l(value, inRegexMode));
-  }
-
-  private onTextChanged() {
-    try {
-      if (this.inRegexMode) {
-        new RegExp(this.paperInput.value);
-      }
-    } catch (invalidRegexException) {
-      this.paperInput.setAttribute('invalid', 'true');
-      this.message = '';
-      this.notifyInputChanged(null, true);
-      return;
-    }
-    this.paperInput.removeAttribute('invalid');
-    this.notifyInputChanged(this.paperInput.value, this.inRegexMode);
-  }
-
-  private updateRegexModeDisplaySlashes() {
-    const slashes = this.paperInput.querySelectorAll('.slash');
-    const display = this.inRegexMode ? '' : 'none';
-
-    for (let i = 0; i < slashes.length; i++) {
-      (slashes[i] as HTMLDivElement).style.display = display;
-    }
-  }
-
-  getValue(): string {
-    return this.paperInput.value;
-  }
-
-  getInRegexMode(): boolean {
-    return this.inRegexMode;
-  }
-
-  set(value: string, inRegexMode: boolean) {
-    (this.inRegexModeButton as any).active = inRegexMode;
-    this.paperInput.value = value;
-    this.onClickRegexModeButton();
-  }
-}
-
-document.registerElement(ProjectorInput.prototype.is, ProjectorInput);
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.html
deleted file mode 100644
index 7554c322ce..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-slider/paper-slider.html">
-
-<link rel="import" href="styles.html">
-<link rel="import" href="vz-projector-input.html">
-
-<dom-module id="vz-projector-inspector-panel">
-<style include="vz-projector-styles"></style>
-<style>
-:host {
-   display: flex;
-   flex-direction: column;
-   /* Account for the bookmark pane at the bottom */
-   height: calc(100% - 55px);
-}
-
-.container {
-  display: block;
-  padding: 10px 20px 0 20px;
-}
-
-.buttons {
-  display: flex;
-  height: 60px;
-}
-
-.button {
-  margin-right: 10px;
-  border: none;
-  border-radius: 7px;
-  font-size: 13px;
-  padding: 10px;
-  background: #e3e3e3;
-}
-
-.button:last-child {
-  margin-right: 0;
-}
-
-.nn {
-  display: flex;
-  flex-direction: column;
-}
-
-.nn > * {
-  padding: 0 20px;
-}
-
-.nn-list {
-  overflow-y: auto;
-}
-
-.nn-list .neighbor {
-  font-size: 12px;
-  margin-bottom: 8px;
-}
-
-.nn-list .label-and-value {
-  display: flex;
-  justify-content: space-between;
-}
-
-.label {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.nn-list .value {
-  color: #666;
-  float: right;
-  font-weight: 300;
-  margin-left: 8px;
-}
-
-.nn-list .bar {
-  position: relative;
-  border-top: 1px solid rgba(0, 0, 0, 0.15);
-  margin: 2px 0;
-}
-
-.nn-list .bar .fill {
-  position: absolute;
-  top: -1px;
-  border-top: 1px solid white;
-}
-
-.nn-list .tick {
-  position: absolute;
-  top: 0px;
-  height: 3px;
-  border-left: 1px solid rgba(0, 0, 0, 0.15);
-}
-
-.nn-list .neighbor-link:hover {
-  cursor: pointer;
-}
-
-.search-by {
-  display: flex;
-}
-
-.search-by vz-projector-input {
-  width: 100%;
-}
-
-.search-by paper-dropdown-menu {
-  margin-left: 10px;
-  width: 100px;
-}
-
-.distance .options {
-  float: right;
-}
-
-.options a {
-  color: #727272;
-  font-size: 13px;
-  margin-left: 12px;
-  text-decoration: none;
-}
-
-.options a.selected {
-  color: #009EFE;
-}
-
-.neighbors {
-  margin-bottom: 30px;
-}
-
-.neighbors-options {
-  margin-top: 6px;
-}
-
-.neighbors-options .option-label, .distance .option-label {
-  color: #727272;
-  margin-right: 2px;
-  width: auto;
-}
-
-.num-neighbors-container {
-  display: inline-block;
-}
-
-#nn-slider {
-  margin: 0 -12px 0 10px;
-}
-
-.euclidian {
-  margin-right: 10px;
-}
-
-.matches-list {
-  padding: 0 20px;
-}
-
-.matches-list .row {
-  border-bottom: 1px solid #ddd;
-  cursor: pointer;
-  display: flex;
-  font-size: 12px;
-  margin: 5px 0;
-  padding: 4px 0;
-}
-
-.results {
-  display: flex;
-  flex-direction: column;
-}
-</style>
-<template>
-<div class="container">
-  <div class="buttons">
-    <button class="button reset-filter">Show All Data</button>
-    <button class="button set-filter">Isolate selection</button>
-    <button class="button clear-selection">Clear selection</button>
-  </div>
-  <div class="search-by">
-    <vz-projector-input id="search-box" label="Search"></vz-projector-input>
-    <paper-dropdown-menu no-animations label="by">
-      <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{selectedMetadataField}}">
-        <template is="dom-repeat" items="[[metadataFields]]">
-          <paper-item value="[[item]]" label="[[item]]">
-            [[item]]
-          </paper-item>
-        </template>
-      </paper-listbox>
-    </paper-dropdown-menu>
-  </div>
-</div>
-<div class="results">
-  <div class="nn" style="display: none">
-    <div class="neighbors">
-      <div class="neighbors-options">
-        <div class="slider num-nn">
-          <span class="option-label">neighbors</span>
-          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-          <paper-tooltip position="bottom" animation-delay="0" fit-to-visible-bounds>
-            The number of neighbors (in the original space) to show when clicking on a point.
-          </paper-tooltip>
-          <paper-slider id="nn-slider" pin min="5" max="1000" value="100"></paper-slider>
-          <span class="nn-count"></span>
-        </div>
-      </div>
-      <div class="distance">
-        <span class="option-label">distance</span>
-        <div class="options">
-          <a class="selected cosine" href="javascript:void(0);">COSINE</a>
-          <a class="euclidean" href="javascript:void(0);">EUCLIDIAN</a>
-        </div>
-      </div>
-    </div>
-    <p>Nearest points in the original space:
-    <div class="nn-list"></div>
-  </div>
-  <div class="matches-list" style="display: none">
-    <div class="list"></div>
-    <div class="limit-msg">Showing only the first 100 results...</div>
-  </div>
-</div>
-<!-- Closing global template -->
-</template>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts
deleted file mode 100644
index 3ee2c2165f..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-inspector-panel.ts
+++ /dev/null
@@ -1,337 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {DistanceFunction, SpriteAndMetadataInfo, State} from './data';
-import * as knn from './knn';
-import {ProjectorEventContext} from './projectorEventContext';
-import * as adapter from './projectorScatterPlotAdapter';
-import * as util from './util';
-import * as vector from './vector';
-import {Projector} from './vz-projector';
-import {ProjectorInput} from './vz-projector-input';
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-/** Limit the number of search results we show to the user. */
-const LIMIT_RESULTS = 100;
-
-// tslint:disable-next-line
-export let PolymerClass = PolymerElement({
-  is: 'vz-projector-inspector-panel',
-  properties: {selectedMetadataField: String, metadataFields: Array}
-});
-
-export class InspectorPanel extends PolymerClass {
-  distFunc: DistanceFunction;
-  numNN: number;
-
-  private projectorEventContext: ProjectorEventContext;
-
-  private selectedMetadataField: string;
-  private metadataFields: string[];
-  private projector: Projector;
-  private selectedPointIndices: number[];
-  private neighborsOfFirstPoint: knn.NearestEntry[];
-  private searchBox: ProjectorInput;
-
-  private resetFilterButton: HTMLButtonElement;
-  private setFilterButton: HTMLButtonElement;
-  private clearSelectionButton: HTMLButtonElement;
-  private limitMessage: HTMLDivElement;
-
-  ready() {
-    this.resetFilterButton =
-        this.querySelector('.reset-filter') as HTMLButtonElement;
-    this.setFilterButton =
-        this.querySelector('.set-filter') as HTMLButtonElement;
-    this.clearSelectionButton =
-        this.querySelector('.clear-selection') as HTMLButtonElement;
-    this.limitMessage = this.querySelector('.limit-msg') as HTMLDivElement;
-    this.searchBox = this.querySelector('#search-box') as ProjectorInput;
-    // https://www.polymer-project.org/1.0/docs/devguide/styling#scope-subtree
-    this.scopeSubtree(this, true);
-  }
-
-  initialize(
-      projector: Projector, projectorEventContext: ProjectorEventContext) {
-    this.projector = projector;
-    this.projectorEventContext = projectorEventContext;
-    this.setupUI(projector);
-    projectorEventContext.registerSelectionChangedListener(
-        (selection, neighbors) =>
-            this.updateInspectorPane(selection, neighbors));
-  }
-
-  /** Updates the nearest neighbors list in the inspector. */
-  private updateInspectorPane(
-      indices: number[], neighbors: knn.NearestEntry[]) {
-    this.neighborsOfFirstPoint = neighbors;
-    this.selectedPointIndices = indices;
-
-    this.updateFilterButtons(indices.length + neighbors.length);
-    this.updateNeighborsList(neighbors);
-    if (neighbors.length === 0) {
-      this.updateSearchResults(indices);
-    } else {
-      this.updateSearchResults([]);
-    }
-  }
-
-  private enableResetFilterButton(enabled: boolean) {
-    this.resetFilterButton.disabled = !enabled;
-  }
-
-  restoreUIFromBookmark(bookmark: State) {
-    this.enableResetFilterButton(bookmark.filteredPoints != null);
-  }
-
-  metadataChanged(spriteAndMetadata: SpriteAndMetadataInfo) {
-    let labelIndex = -1;
-    this.metadataFields = spriteAndMetadata.stats.map((stats, i) => {
-      if (!stats.isNumeric && labelIndex === -1) {
-        labelIndex = i;
-      }
-      return stats.name;
-    });
-    labelIndex = Math.max(0, labelIndex);
-    // Make the default label the first non-numeric column.
-    this.selectedMetadataField = spriteAndMetadata.stats[labelIndex].name;
-  }
-
-  datasetChanged() {
-    this.enableResetFilterButton(false);
-  }
-
-  private updateSearchResults(indices: number[]) {
-    const container = this.querySelector('.matches-list') as HTMLDivElement;
-    container.style.display = indices.length ? null : 'none';
-    const list = container.querySelector('.list') as HTMLDivElement;
-    list.innerHTML = '';
-    if (indices.length === 0) {
-      return;
-    }
-
-    this.limitMessage.style.display =
-        indices.length <= LIMIT_RESULTS ? 'none' : null;
-    indices = indices.slice(0, LIMIT_RESULTS);
-
-    for (let i = 0; i < indices.length; i++) {
-      const index = indices[i];
-
-      const row = document.createElement('div');
-      row.className = 'row';
-
-      const label = this.getLabelFromIndex(index);
-      const rowLink = document.createElement('a');
-      rowLink.className = 'label';
-      rowLink.title = label;
-      rowLink.innerText = label;
-
-      rowLink.onmouseenter = () => {
-        this.projectorEventContext.notifyHoverOverPoint(index);
-      };
-      rowLink.onmouseleave = () => {
-        this.projectorEventContext.notifyHoverOverPoint(null);
-      };
-      rowLink.onclick = () => {
-        this.projectorEventContext.notifySelectionChanged([index]);
-      };
-
-      row.appendChild(rowLink);
-      list.appendChild(row);
-    }
-  }
-
-  private getLabelFromIndex(pointIndex: number): string {
-    const point = this.projector.dataSet.points[pointIndex];
-    return point.metadata[this.selectedMetadataField].toString();
-  }
-
-  private updateNeighborsList(neighbors: knn.NearestEntry[]) {
-    const nnlist = this.querySelector('.nn-list') as HTMLDivElement;
-    nnlist.innerHTML = '';
-
-    (this.querySelector('.nn') as HTMLDivElement).style.display =
-        neighbors.length ? null : 'none';
-
-    if (neighbors.length === 0) {
-      return;
-    }
-
-    this.searchBox.message = '';
-    const minDist = neighbors.length > 0 ? neighbors[0].dist : 0;
-
-    for (let i = 0; i < neighbors.length; i++) {
-      const neighbor = neighbors[i];
-
-      const neighborElement = document.createElement('div');
-      neighborElement.className = 'neighbor';
-
-      const neighborElementLink = document.createElement('a');
-      neighborElementLink.className = 'neighbor-link';
-      neighborElementLink.title = this.getLabelFromIndex(neighbor.index);
-
-      const labelValueElement = document.createElement('div');
-      labelValueElement.className = 'label-and-value';
-
-      const labelElement = document.createElement('div');
-      labelElement.className = 'label';
-      labelElement.style.color =
-          adapter.dist2color(this.distFunc, neighbor.dist, minDist);
-      labelElement.innerText = this.getLabelFromIndex(neighbor.index);
-
-      const valueElement = document.createElement('div');
-      valueElement.className = 'value';
-      valueElement.innerText = neighbor.dist.toFixed(3);
-
-      labelValueElement.appendChild(labelElement);
-      labelValueElement.appendChild(valueElement);
-
-      const barElement = document.createElement('div');
-      barElement.className = 'bar';
-
-      const barFillElement = document.createElement('div');
-      barFillElement.className = 'fill';
-      barFillElement.style.borderTopColor =
-          adapter.dist2color(this.distFunc, neighbor.dist, minDist);
-      barFillElement.style.width =
-          adapter.normalizeDist(this.distFunc, neighbor.dist, minDist) * 100 +
-          '%';
-      barElement.appendChild(barFillElement);
-
-      for (let j = 1; j < 4; j++) {
-        const tickElement = document.createElement('div');
-        tickElement.className = 'tick';
-        tickElement.style.left = j * 100 / 4 + '%';
-        barElement.appendChild(tickElement);
-      }
-
-      neighborElementLink.appendChild(labelValueElement);
-      neighborElementLink.appendChild(barElement);
-      neighborElement.appendChild(neighborElementLink);
-      nnlist.appendChild(neighborElement);
-
-      neighborElementLink.onmouseenter = () => {
-        this.projectorEventContext.notifyHoverOverPoint(neighbor.index);
-      };
-      neighborElementLink.onmouseleave = () => {
-        this.projectorEventContext.notifyHoverOverPoint(null);
-      };
-      neighborElementLink.onclick = () => {
-        this.projectorEventContext.notifySelectionChanged([neighbor.index]);
-      };
-    }
-  }
-
-  private updateFilterButtons(numPoints: number) {
-    if (numPoints > 1) {
-      this.setFilterButton.innerText = `Isolate ${numPoints} points`;
-      this.setFilterButton.disabled = null;
-      this.clearSelectionButton.disabled = null;
-    } else {
-      this.setFilterButton.disabled = true;
-      this.clearSelectionButton.disabled = true;
-    }
-  }
-
-  private setupUI(projector: Projector) {
-    this.distFunc = vector.cosDist;
-    const eucDist =
-        this.querySelector('.distance a.euclidean') as HTMLLinkElement;
-    eucDist.onclick = () => {
-      const links = this.querySelectorAll('.distance a');
-      for (let i = 0; i < links.length; i++) {
-        util.classed(links[i] as HTMLElement, 'selected', false);
-      }
-      util.classed(eucDist as HTMLElement, 'selected', true);
-
-      this.distFunc = vector.dist;
-      this.projectorEventContext.notifyDistanceMetricChanged(this.distFunc);
-      const neighbors = projector.dataSet.findNeighbors(
-          this.selectedPointIndices[0], this.distFunc, this.numNN);
-      this.updateNeighborsList(neighbors);
-    };
-
-    const cosDist = this.querySelector('.distance a.cosine') as HTMLLinkElement;
-    cosDist.onclick = () => {
-      const links = this.querySelectorAll('.distance a');
-      for (let i = 0; i < links.length; i++) {
-        util.classed(links[i] as HTMLElement, 'selected', false);
-      }
-      util.classed(cosDist, 'selected', true);
-
-      this.distFunc = vector.cosDist;
-      this.projectorEventContext.notifyDistanceMetricChanged(this.distFunc);
-      const neighbors = projector.dataSet.findNeighbors(
-          this.selectedPointIndices[0], this.distFunc, this.numNN);
-      this.updateNeighborsList(neighbors);
-    };
-
-    // Called whenever the search text input changes.
-    const updateInput = (value: string, inRegexMode: boolean) => {
-      if (value == null || value.trim() === '') {
-        this.searchBox.message = '';
-        this.projectorEventContext.notifySelectionChanged([]);
-        return;
-      }
-      const indices = projector.dataSet.query(
-          value, inRegexMode, this.selectedMetadataField);
-      if (indices.length === 0) {
-        this.searchBox.message = '0 matches.';
-      } else {
-        this.searchBox.message = `${indices.length} matches.`;
-      }
-      this.projectorEventContext.notifySelectionChanged(indices);
-    };
-    this.searchBox.registerInputChangedListener((value, inRegexMode) => {
-      updateInput(value, inRegexMode);
-    });
-
-    // Nearest neighbors controls.
-    const numNNInput = this.$$('#nn-slider') as HTMLInputElement;
-    const updateNumNN = () => {
-      this.numNN = +numNNInput.value;
-      (this.querySelector('.num-nn .nn-count') as HTMLSpanElement).innerText =
-          '' + this.numNN;
-      if (this.selectedPointIndices != null) {
-        this.projectorEventContext.notifySelectionChanged(
-            [this.selectedPointIndices[0]]);
-      }
-    };
-    numNNInput.addEventListener('change', updateNumNN);
-    updateNumNN();
-
-    // Filtering dataset.
-    this.setFilterButton.onclick = () => {
-      const indices = this.selectedPointIndices.concat(
-          this.neighborsOfFirstPoint.map(n => n.index));
-      projector.filterDataset(indices);
-      this.enableResetFilterButton(true);
-      this.updateFilterButtons(0);
-    };
-
-    this.resetFilterButton.onclick = () => {
-      projector.resetFilterDataset();
-      this.enableResetFilterButton(false);
-    };
-
-    this.clearSelectionButton.onclick = () => {
-      projector.adjustSelectionAndHover([]);
-    };
-    this.enableResetFilterButton(false);
-  }
-}
-
-document.registerElement(InspectorPanel.prototype.is, InspectorPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.html
deleted file mode 100644
index 3fc5f4db15..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="styles.html">
-
-<dom-module id='vz-projector-legend'>
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-.item {
-  display: flex;
-  align-items: flex-start;
-  margin-bottom: 10px;
-}
-
-.shape {
-  width: 10px;
-  height: 10px;
-  margin-right: 10px;
-  margin-top: 5px;
-  border-radius: 50%;
-}
-
-.label {
-  flex-grow: 1;
-}
-
-.gradient {
-  width: 100%;
-  height: 10px;
-}
-
-.gradient-boundaries {
-  display: flex;
-  justify-content: space-between;
-}
-</style>
-
-<template is="dom-repeat" items="[[renderInfo.items]]">
-  <div class="item">
-    <div class="shape" style="background-color: [[item.color]];"></div>
-    <div class="label">[[item.label]]</div>
-    <div class="info" style="color: [[item.color]];">[[item.count]]</div>
-  </div>
-</template>
-
-<template is="dom-if" if="[[renderInfo.thresholds]]">
-  <svg class="gradient">
-    <defs>
-      <linearGradient id="gradient" x1="0%" y1="100%" x2="100%" y2="100%"></linearGradient>
-    </defs>
-    <rect height="10" style="fill: url('#gradient');"></rect>
-  </svg>
-  <div class="gradient-boundaries">
-    <div>[[renderInfo.thresholds.0.value]]</div>
-    <div>[[_getLastThreshold(renderInfo.thresholds)]]</div>
-  </div>
-</template>
-<!-- Closing global template -->
-</template>
-</dom-module>
\ No newline at end of file
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts
deleted file mode 100644
index 1c4ddf940d..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-legend.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-// tslint:disable-next-line
-export let LegendPolymer = PolymerElement({
-  is: 'vz-projector-legend',
-  properties: {renderInfo: {type: Object, observer: '_renderInfoChanged'}}
-});
-
-export interface ColorLegendRenderInfo {
-  // To be used for categorical map.
-  items: ColorLegendItem[];
-  // To be used for gradient map.
-  thresholds: ColorLegendThreshold[];
-}
-
-/** An item in the categorical color legend. */
-export interface ColorLegendItem {
-  color: string;
-  label: string;
-  count: number;
-}
-
-/** An item in the gradient color legend. */
-export interface ColorLegendThreshold {
-  color: string;
-  value: number;
-}
-
-export class Legend extends LegendPolymer {
-  renderInfo: ColorLegendRenderInfo;
-
-  _renderInfoChanged() {
-    if (this.renderInfo == null) {
-      return;
-    }
-    if (this.renderInfo.thresholds) {
-      // <linearGradient> is under dom-if so we should wait for it to be
-      // inserted in the dom tree using async().
-      this.async(() => this.setupLinearGradient());
-    }
-  }
-
-  _getLastThreshold(): number {
-    if (this.renderInfo == null || this.renderInfo.thresholds == null) {
-      return;
-    }
-    return this.renderInfo.thresholds[this.renderInfo.thresholds.length - 1]
-        .value;
-  }
-
-  private getOffset(value: number): string {
-    const min = this.renderInfo.thresholds[0].value;
-    const max =
-        this.renderInfo.thresholds[this.renderInfo.thresholds.length - 1].value;
-    return (100 * (value - min) / (max - min)).toFixed(2) + '%';
-  }
-
-  private setupLinearGradient() {
-    const linearGradient =
-        this.querySelector('#gradient') as SVGLinearGradientElement;
-
-    const width =
-        (this.querySelector('svg.gradient') as SVGElement).clientWidth;
-
-    // Set the svg <rect> to be the width of its <svg> parent.
-    (this.querySelector('svg.gradient rect') as SVGRectElement).style.width =
-        width + 'px';
-
-    // Remove all <stop> children from before.
-    linearGradient.innerHTML = '';
-
-    // Add a <stop> child in <linearGradient> for each gradient threshold.
-    this.renderInfo.thresholds.forEach(t => {
-      const stopElement =
-          document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-      stopElement.setAttribute('offset', this.getOffset(t.value));
-      stopElement.setAttribute('stop-color', t.color);
-    });
-  }
-}
-
-document.registerElement(Legend.prototype.is, Legend);
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.html
deleted file mode 100644
index ebdcd72c77..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-
-<dom-module id="vz-projector-metadata-card">
-<template>
-<style>
-#metadata-card {
-  background-color: rgba(255,255,255,0.9);
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14),
-      0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
-  width: 280px;
-}
-
-#header {
-  background: #e9e9e9;
-}
-
-#icon-container {
-  position: absolute;
-  right: 0;
-  top: 4px;
-}
-
-#metadata-label {
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 24px;
-  padding: 12px 12px 8px;
-  width: 230px;
-}
-
-#metadata-table {
-  display: table;
-  padding: 8px 12px 4px;
-}
-
-.metadata-row {
-  display: table-row;
-}
-
-.metadata-key {
-  font-weight: bold;
-}
-
-.metadata-key, .metadata-value {
-  display: table-cell;
-  font-size: 12px;
-  padding: 3px 3px;
-}
-</style>
-
-<template is="dom-if" if="[[hasMetadata]]">
-  <div id="metadata-card">
-    <div id="icon-container">
-      <paper-icon-button id="expand-more"
-          style="display: none"
-          icon="expand-more"
-          on-tap="_expandMore"></paper-icon-button>
-      <paper-icon-button id="expand-less"
-          on-tap="_expandLess"
-          icon="expand-less"></paper-icon-button>
-    </div>
-    <div id="header">
-      <div id="metadata-label">[[label]]</div>
-    </div>
-    <iron-collapse id="metadata-container" opened>
-      <div id="metadata-table">
-        <template is="dom-repeat" items="[[metadata]]">
-          <div class="metadata-row">
-            <div class="metadata-key">[[item.key]]</div>
-            <div class="metadata-value">[[item.value]]</div>
-          </div>
-        </template>
-      </div>
-    </iron-collapse>
-  </div>
-</template>
-</template>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts
deleted file mode 100644
index 939300f387..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-metadata-card.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {PointMetadata} from './data';
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-// tslint:disable-next-line
-export let MetadataCardPolymer = PolymerElement({
-  is: 'vz-projector-metadata-card',
-  properties: {
-    hasMetadata: {type: Boolean, value: false},
-    metadata: {type: Array},
-    label: String
-  }
-});
-
-export class MetadataCard extends MetadataCardPolymer {
-  hasMetadata: boolean;
-  metadata: Array<{key: string, value: string}>;
-  label: string;
-
-  private labelOption: string;
-  private pointMetadata: PointMetadata;
-
-  private expandLessButton: HTMLButtonElement;
-  private expandMoreButton: HTMLButtonElement;
-
-  ready() {
-    this.expandLessButton =
-        this.querySelector('#expand-less') as HTMLButtonElement;
-    this.expandMoreButton =
-        this.querySelector('#expand-more') as HTMLButtonElement;
-  }
-  /** Handles a click on the expand more icon. */
-  _expandMore() {
-    (this.$$('#metadata-container') as any).toggle();
-
-    this.expandMoreButton.style.display = 'none';
-    this.expandLessButton.style.display = '';
-  }
-
-  /** Handles a click on the expand less icon. */
-  _expandLess() {
-    (this.$$('#metadata-container') as any).toggle();
-    this.expandMoreButton.style.display = '';
-    this.expandLessButton.style.display = 'none';
-  }
-
-  updateMetadata(pointMetadata?: PointMetadata) {
-    this.pointMetadata = pointMetadata;
-    this.hasMetadata = (pointMetadata != null);
-
-    if (pointMetadata) {
-      let metadata = [];
-      for (let metadataKey in pointMetadata) {
-        if (!pointMetadata.hasOwnProperty(metadataKey)) {
-          continue;
-        }
-        metadata.push({key: metadataKey, value: pointMetadata[metadataKey]});
-      }
-
-      this.metadata = metadata;
-      this.label = '' + this.pointMetadata[this.labelOption];
-    }
-  }
-
-  setLabelOption(labelOption: string) {
-    this.labelOption = labelOption;
-    if (this.pointMetadata) {
-      this.label = '' + this.pointMetadata[this.labelOption];
-    }
-  }
-}
-
-document.registerElement(MetadataCard.prototype.is, MetadataCard);
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.html b/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.html
deleted file mode 100644
index cddcb2b7d0..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.html
+++ /dev/null
@@ -1,314 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
-<link rel="import" href="../paper-listbox/paper-listbox.html">
-<link rel="import" href="../paper-item/paper-item.html">
-<link rel="import" href="../paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../iron-icons/iron-icons.html">
-<link rel="import" href="../iron-icons/image-icons.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-button/paper-button.html">
-<link rel="import" href="../paper-slider/paper-slider.html">
-<link rel="import" href="styles.html">
-
-<dom-module id="vz-projector-projections-panel">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-:host {
-  transition: height 0.2s;
-}
-
-.ink-button, ::shadow .ink-button {
-  border: none;
-  border-radius: 2px;
-  font-size: 13px;
-  padding: 10px;
-  min-width: 100px;
-  flex-shrink: 0;
-  background: #e3e3e3;
-}
-
-.ink-panel-buttons {
-  margin-bottom: 10px;
-}
-
-.two-way-toggle {
-  display: flex;
-  flex-direction: row;
-}
-
-.two-way-toggle span {
-  padding-right: 7px;
-}
-
-.has-border {
-  border: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-.toggle {
-  min-width: 0px;
-  font-size: 12px;
-  width: 17px;
-  min-height: 0px;
-  height: 21px;
-  padding: 0;
-  margin: 0px;
-}
-
-.toggle[active] {
-  background-color: #880E4F;
-  color: white;
-}
-
-.two-columns {
-  display:flex;
-  justify-content: space-between;
-}
-
-.two-columns > :first-child {
-  margin-right: 15px;
-}
-
-.two-columns > div {
-  width: 50%;
-}
-
-.dropdown-item {
-  justify-content: space-between;
-  min-height: 35px;
-}
-
-#z-container {
-  display: flex;
-  align-items: center;
-  width: 50%;
-}
-
-#z-checkbox {
-  margin: 27px 0 0 5px;
-  width: 18px;
-}
-
-#z-dropdown {
-  flex-grow: 1;
-}
-
-.notice {
-  color: #880E4F;
-}
-
-.container {
-  padding: 20px;
-}
-
-.book-icon {
-  height: 20px;
-  color: rgba(0, 0, 0, 0.7);
-}
-
-.item-details {
-  color: gray;
-  font-size: 12px;
-  margin-left: 5px;
-}
-
-.pca-dropdown {
-  width: 100%;
-}
-
-.pca-dropdown paper-listbox {
-  width: 135px;
-}
-
-.dropdown-item.header {
-  border-bottom: 1px solid #aaa;
-  color: #333;
-  font-weight: bold;
-}
-
-#total-variance {
-  color: rgba(0, 0, 0, 0.7);
-}
-</style>
-<div id="main">
-  <div class="ink-panel-header">
-    <div class="ink-tab-group">
-
-      <div data-tab="tsne" id="tsne-tab" class="ink-tab projection-tab">t-SNE</div>
-      <paper-tooltip for="tsne-tab" position="bottom" animation-delay="0" fit-to-visible-bounds>
-        t-distributed stochastic neighbor embedding
-      </paper-tooltip>
-
-      <div data-tab="pca" id="pca-tab" class="ink-tab projection-tab">PCA</div>
-      <paper-tooltip for="pca-tab" position="bottom" animation-delay="0" fit-to-visible-bounds>
-        Principal component analysis
-      </paper-tooltip>
-
-      <div data-tab="custom" id="custom-tab" class="ink-tab projection-tab" title="Linear projection of two custom vectors">Custom</div>
-      <paper-tooltip for="custom-tab" position="bottom" animation-delay="0" fit-to-visible-bounds>
-        Search for two vectors upon which to project all points.
-      </paper-tooltip>
-
-    </div>
-  </div>
-  <div class="container">
-    <!-- TSNE Controls -->
-    <div data-panel="tsne" class="ink-panel-content">
-      <div class="slider">
-        <label>Dimension</label>
-        <div class="two-way-toggle">
-          <span>2D</span>
-          <paper-toggle-button id="tsne-toggle" checked="{{tSNEis3d}}">3D</paper-toggle-button>
-        </div>
-      </div>
-      <div class="slider tsne-perplexity">
-        <label>
-          Perplexity
-          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-          <paper-tooltip position="right" animation-delay="0" fit-to-visible-bounds>
-            The most appropriate perplexity value depends on the density of the
-            data. Loosely speaking, a larger / denser dataset
-            requires a larger perplexity. Typical values for perplexity range
-            between 5 and 50.
-          </paper-tooltip>
-        </label>
-        <paper-slider id="perplexity-slider" pin min="2" max="100" value="30"></paper-slider>
-        <span></span>
-      </div>
-      <div class="slider tsne-learning-rate">
-        <label>
-          Learning rate
-          <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-          <paper-tooltip position="right" animation-delay="0" fit-to-visible-bounds>
-            The ideal learning rate often depends on the size of the data,
-            with smaller datasets requiring smaller learning rates.
-          </paper-tooltip>
-        </label>
-        <paper-slider id="learning-rate-slider" snaps min="-3" max="2" step="1"
-            value="1" max-markers="6">
-        </paper-slider>
-        <span></span>
-      </div>
-      <p>
-        <button class="run-tsne ink-button" title="Re-run t-SNE">Re-run</button>
-        <button class="stop-tsne ink-button" title="Stop t-SNE">Stop</button>
-      </p>
-      <p>Iteration: <span class="run-tsne-iter">0</span></p>
-      <p id="tsne-sampling" class="notice">
-        For fast results, the data will be sampled down to [[getTsneSampleSizeText()]] points.
-      </p>
-      <p>
-        <iron-icon icon="book" class="book-icon"></iron-icon>
-        <a target="_blank" href="http://distill.pub/2016/misread-tsne/">
-          How to use t-SNE effectively.
-        </a>
-      </p>
-    </div>
-    <!-- PCA Controls -->
-    <div data-panel="pca" class="ink-panel-content">
-      <div class="two-columns">
-        <div> <!-- Left column -->
-          <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations label="X">
-            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaX}}">
-              <paper-item disabled class="dropdown-item header">
-                  <div>#</div>
-                  <div>Variance (%)</div>
-              </paper-item>
-              <template is="dom-repeat" items="[[pcaComponents]]">
-                <paper-item class="dropdown-item" value="[[item.id]]"
-                            label="Component #[[item.componentNumber]]">
-                  <div>[[item.componentNumber]]</div>
-                  <div class="item-details">[[item.percVariance]]</div>
-                </paper-item>
-              </template>
-            </paper-listbox>
-          </paper-dropdown-menu>
-          <paper-dropdown-menu class="pca-dropdown" no-animations vertical-align="bottom" label="Z" disabled="[[!hasPcaZ]]" id="z-dropdown">
-            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaZ}}">
-              <paper-item disabled class="dropdown-item header">
-                  <div>#</div>
-                  <div>Variance (%)</div>
-              </paper-item>
-              <template is="dom-repeat" items="[[pcaComponents]]">
-                <paper-item class="dropdown-item" value="[[item.id]]"
-                            label="Component #[[item.componentNumber]]">
-                  <div>[[item.componentNumber]]</div>
-                  <div class="item-details">[[item.percVariance]]</div>
-                </paper-item>
-              </template>
-            </paper-listbox>
-          </paper-dropdown-menu>
-        </div>
-        <div> <!-- Right column -->
-          <paper-dropdown-menu class="pca-dropdown" vertical-align="bottom" no-animations label="Y">
-            <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{pcaY}}">
-              <paper-item disabled class="dropdown-item header">
-                  <div>#</div>
-                  <div>Variance (%)</div>
-              </paper-item>
-              <template is="dom-repeat" items="[[pcaComponents]]">
-                <paper-item class="dropdown-item" value="[[item.id]]"
-                            label="Component #[[item.componentNumber]]">
-                  <div>[[item.componentNumber]]</div>
-                  <div class="item-details">[[item.percVariance]]</div>
-                </paper-item>
-              </template>
-            </paper-listbox>
-          </paper-dropdown-menu>
-          <paper-checkbox id="z-checkbox" checked="{{pcaIs3d}}"></paper-checkbox>
-        </div>
-      </div>
-      <p id="pca-sampling" class="notice">
-        PCA is approximate.
-        <paper-icon-button icon="help" class="help-icon"></paper-icon-button>
-      </p>
-      <div id="total-variance">Total variance</div>
-      <paper-tooltip for="pca-sampling" position="top" animation-delay="0" fit-to-visible-bounds>
-        For fast results, the data was sampled to [[getPcaSampleSizeText()]] points and randomly projected down to [[getPcaSampledDimText()]] dimensions.
-      </paper-tooltip>
-    </div>
-    <!-- Custom Controls -->
-    <div data-panel="custom" class="ink-panel-content">
-      <paper-dropdown-menu style="width: 100%" no-animations label="Search by">
-        <paper-listbox attr-for-selected="value" class="dropdown-content" selected="{{customSelectedSearchByMetadataOption}}">
-          <template is="dom-repeat" items="[[searchByMetadataOptions]]">
-            <paper-item class="dropdown-item" value="[[item]]" label="[[item]]">
-              [[item]]
-            </paper-item>
-          </template>
-        </paper-listbox>
-      </paper-dropdown-menu>
-      <div class="two-columns">
-        <vz-projector-input id="xLeft" label="Left"></vz-projector-input>
-        <vz-projector-input id="xRight" label="Right"></vz-projector-input>
-      </div>
-      <div class="two-columns">
-        <vz-projector-input id="yUp" label="Up"></vz-projector-input>
-        <vz-projector-input id="yDown" label="Down"></vz-projector-input>
-      </div>
-    </div>
-  </div>
-</div>
-</template>
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts
deleted file mode 100644
index 377c6c11ad..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel.ts
+++ /dev/null
@@ -1,589 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import * as data from './data';
-import {DataSet, Projection, ProjectionType, SpriteAndMetadataInfo, State} from './data';
-import * as util from './util';
-import * as vector from './vector';
-import {Vector} from './vector';
-import {Projector} from './vz-projector';
-import {ProjectorInput} from './vz-projector-input';
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-const NUM_PCA_COMPONENTS = 10;
-
-// tslint:disable-next-line
-export let ProjectionsPanelPolymer = PolymerElement({
-  is: 'vz-projector-projections-panel',
-  properties: {
-    pcaIs3d:
-        {type: Boolean, value: true, observer: '_pcaDimensionToggleObserver'},
-    tSNEis3d:
-        {type: Boolean, value: true, observer: '_tsneDimensionToggleObserver'},
-    // PCA projection.
-    pcaComponents: Array,
-    pcaX: {type: Number, value: 0, observer: 'showPCAIfEnabled'},
-    pcaY: {type: Number, value: 1, observer: 'showPCAIfEnabled'},
-    pcaZ: {type: Number, value: 2, observer: 'showPCAIfEnabled'},
-    // Custom projection.
-    customSelectedSearchByMetadataOption: {
-      type: String,
-      observer: '_customSelectedSearchByMetadataOptionChanged'
-    },
-  }
-});
-
-type InputControlName = 'xLeft'|'xRight'|'yUp'|'yDown';
-
-type CentroidResult = {
-  centroid?: Vector; numMatches?: number;
-};
-
-type Centroids = {
-  [key: string]: Vector; xLeft: Vector; xRight: Vector; yUp: Vector;
-  yDown: Vector;
-};
-
-/**
- * A polymer component which handles the projection tabs in the projector.
- */
-export class ProjectionsPanel extends ProjectionsPanelPolymer {
-  private projector: Projector;
-  private pcaComponents:
-      Array<{id: number, componentNumber: number, percVariance: string}>;
-  private currentProjection: ProjectionType;
-  private polymerChangesTriggerReprojection: boolean;
-  private dataSet: DataSet;
-  private originalDataSet: DataSet;
-  private dim: number;
-
-  /** T-SNE perplexity. Roughly how many neighbors each point influences. */
-  private perplexity: number;
-  /** T-SNE learning rate. */
-  private learningRate: number;
-
-  private searchByMetadataOptions: string[];
-
-  /** Centroids for custom projections. */
-  private centroidValues: any;
-  private centroids: Centroids;
-  /** The centroid across all points. */
-  private allCentroid: number[];
-
-  /** Polymer properties. */
-  // TODO(nsthorat): Move these to a separate view controller.
-  public tSNEis3d: boolean;
-  public pcaIs3d: boolean;
-  public pcaX: number;
-  public pcaY: number;
-  public pcaZ: number;
-  public customSelectedSearchByMetadataOption: string;
-
-  /** Polymer elements. */
-  private runTsneButton: HTMLButtonElement;
-  private stopTsneButton: HTMLButtonElement;
-  private perplexitySlider: HTMLInputElement;
-  private learningRateInput: HTMLInputElement;
-  private zDropdown: HTMLElement;
-  private iterationLabel: HTMLElement;
-
-  private customProjectionXLeftInput: ProjectorInput;
-  private customProjectionXRightInput: ProjectorInput;
-  private customProjectionYUpInput: ProjectorInput;
-  private customProjectionYDownInput: ProjectorInput;
-
-  initialize(projector: Projector) {
-    this.polymerChangesTriggerReprojection = true;
-    this.projector = projector;
-
-    // Set up TSNE projections.
-    this.perplexity = 30;
-    this.learningRate = 10;
-
-    // Setup Custom projections.
-    this.centroidValues = {xLeft: null, xRight: null, yUp: null, yDown: null};
-    this.clearCentroids();
-
-    this.setupUIControls();
-  }
-
-  ready() {
-    this.zDropdown = this.querySelector('#z-dropdown') as HTMLElement;
-    this.runTsneButton = this.querySelector('.run-tsne') as HTMLButtonElement;
-    this.stopTsneButton = this.querySelector('.stop-tsne') as HTMLButtonElement;
-    this.perplexitySlider =
-        this.querySelector('#perplexity-slider') as HTMLInputElement;
-    this.learningRateInput =
-        this.querySelector('#learning-rate-slider') as HTMLInputElement;
-    this.iterationLabel = this.querySelector('.run-tsne-iter') as HTMLElement;
-  }
-
-  disablePolymerChangesTriggerReprojection() {
-    this.polymerChangesTriggerReprojection = false;
-  }
-
-  enablePolymerChangesTriggerReprojection() {
-    this.polymerChangesTriggerReprojection = true;
-  }
-
-  private updateTSNEPerplexityFromSliderChange() {
-    if (this.perplexitySlider) {
-      this.perplexity = +this.perplexitySlider.value;
-    }
-    (this.querySelector('.tsne-perplexity span') as HTMLSpanElement).innerText =
-        '' + this.perplexity;
-  }
-
-  private updateTSNELearningRateFromUIChange() {
-    if (this.learningRateInput) {
-      this.learningRate = Math.pow(10, +this.learningRateInput.value);
-    }
-    (this.querySelector('.tsne-learning-rate span') as HTMLSpanElement)
-        .innerText = '' + this.learningRate;
-  }
-
-  private setupUIControls() {
-    {
-      const self = this;
-      const inkTabs = this.querySelectorAll('.ink-tab');
-      for (let i = 0; i < inkTabs.length; i++) {
-        inkTabs[i].addEventListener('click', function() {
-          let id = this.getAttribute('data-tab');
-          self.showTab(id);
-        });
-      }
-    }
-
-    this.runTsneButton.addEventListener('click', () => this.runTSNE());
-    this.stopTsneButton.addEventListener(
-        'click', () => this.dataSet.stopTSNE());
-
-    this.perplexitySlider.value = this.perplexity.toString();
-    this.perplexitySlider.addEventListener(
-        'change', () => this.updateTSNEPerplexityFromSliderChange());
-    this.updateTSNEPerplexityFromSliderChange();
-
-    this.learningRateInput.addEventListener(
-        'change', () => this.updateTSNELearningRateFromUIChange());
-    this.updateTSNELearningRateFromUIChange();
-
-    this.setupCustomProjectionInputFields();
-    // TODO: figure out why `--paper-input-container-input` css mixin didn't
-    // work.
-    const inputs =
-        this.querySelectorAll('paper-dropdown-menu paper-input input');
-    for (let i = 0; i < inputs.length; i++) {
-      (inputs[i] as HTMLElement).style.fontSize = '14px';
-    }
-  }
-
-  restoreUIFromBookmark(bookmark: State) {
-    this.disablePolymerChangesTriggerReprojection();
-
-    // PCA
-    this.pcaX = bookmark.pcaComponentDimensions[0];
-    this.pcaY = bookmark.pcaComponentDimensions[1];
-    if (bookmark.pcaComponentDimensions.length === 3) {
-      this.pcaZ = bookmark.pcaComponentDimensions[2];
-    }
-    this.pcaIs3d = (bookmark.pcaComponentDimensions.length === 3);
-
-    // t-SNE
-    if (this.perplexitySlider) {
-      this.perplexitySlider.value = bookmark.tSNEPerplexity.toString();
-    }
-    if (this.learningRateInput) {
-      this.learningRateInput.value = bookmark.tSNELearningRate.toString();
-    }
-    this.tSNEis3d = bookmark.tSNEis3d;
-
-    // custom
-    this.customSelectedSearchByMetadataOption =
-        bookmark.customSelectedSearchByMetadataOption;
-    if (this.customProjectionXLeftInput) {
-      this.customProjectionXLeftInput.set(
-          bookmark.customXLeftText, bookmark.customXLeftRegex);
-    }
-    if (this.customProjectionXRightInput) {
-      this.customProjectionXRightInput.set(
-          bookmark.customXRightText, bookmark.customXRightRegex);
-    }
-    if (this.customProjectionYUpInput) {
-      this.customProjectionYUpInput.set(
-          bookmark.customYUpText, bookmark.customYUpRegex);
-    }
-    if (this.customProjectionYDownInput) {
-      this.customProjectionYDownInput.set(
-          bookmark.customYDownText, bookmark.customYDownRegex);
-    }
-    this.computeAllCentroids();
-
-    this.setZDropdownEnabled(this.pcaIs3d);
-    this.updateTSNEPerplexityFromSliderChange();
-    this.updateTSNELearningRateFromUIChange();
-    if (this.iterationLabel) {
-      this.iterationLabel.innerText = bookmark.tSNEIteration.toString();
-    }
-    if (bookmark.selectedProjection != null) {
-      this.showTab(bookmark.selectedProjection);
-    }
-    this.enablePolymerChangesTriggerReprojection();
-  }
-
-  populateBookmarkFromUI(bookmark: State) {
-    this.disablePolymerChangesTriggerReprojection();
-
-    // PCA
-    bookmark.pcaComponentDimensions = [this.pcaX, this.pcaY];
-    if (this.pcaIs3d) {
-      bookmark.pcaComponentDimensions.push(this.pcaZ);
-    }
-
-    // t-SNE
-    if (this.perplexitySlider != null) {
-      bookmark.tSNEPerplexity = +this.perplexitySlider.value;
-    }
-    if (this.learningRateInput != null) {
-      bookmark.tSNELearningRate = +this.learningRateInput.value;
-    }
-    bookmark.tSNEis3d = this.tSNEis3d;
-
-    // custom
-    bookmark.customSelectedSearchByMetadataOption =
-        this.customSelectedSearchByMetadataOption;
-    if (this.customProjectionXLeftInput != null) {
-      bookmark.customXLeftText = this.customProjectionXLeftInput.getValue();
-      bookmark.customXLeftRegex =
-          this.customProjectionXLeftInput.getInRegexMode();
-    }
-    if (this.customProjectionXRightInput != null) {
-      bookmark.customXRightText = this.customProjectionXRightInput.getValue();
-      bookmark.customXRightRegex =
-          this.customProjectionXRightInput.getInRegexMode();
-    }
-    if (this.customProjectionYUpInput != null) {
-      bookmark.customYUpText = this.customProjectionYUpInput.getValue();
-      bookmark.customYUpRegex = this.customProjectionYUpInput.getInRegexMode();
-    }
-    if (this.customProjectionYDownInput != null) {
-      bookmark.customYDownText = this.customProjectionYDownInput.getValue();
-      bookmark.customYDownRegex =
-          this.customProjectionYDownInput.getInRegexMode();
-    }
-
-    this.enablePolymerChangesTriggerReprojection();
-  }
-
-  // This method is marked as public as it is used as the view method that
-  // abstracts DOM manipulation so we can stub it in a test.
-  // TODO(nsthorat): Move this to its own class as the glue between this class
-  // and the DOM.
-  setZDropdownEnabled(enabled: boolean) {
-    if (this.zDropdown) {
-      if (enabled) {
-        this.zDropdown.removeAttribute('disabled');
-      } else {
-        this.zDropdown.setAttribute('disabled', 'true');
-      }
-    }
-  }
-
-  dataSetUpdated(dataSet: DataSet, originalDataSet: DataSet, dim: number) {
-    this.dataSet = dataSet;
-    this.originalDataSet = originalDataSet;
-    this.dim = dim;
-    const pointCount = (dataSet == null) ? 0 : dataSet.points.length;
-    const perplexity = Math.max(5, Math.ceil(Math.sqrt(pointCount) / 4));
-    this.perplexitySlider.value = perplexity.toString();
-    this.updateTSNEPerplexityFromSliderChange();
-    this.clearCentroids();
-
-    (this.querySelector('#tsne-sampling') as HTMLElement).style.display =
-        pointCount > data.TSNE_SAMPLE_SIZE ? null : 'none';
-    const wasSampled =
-        (dataSet == null) ? false : (dataSet.dim[0] > data.PCA_SAMPLE_DIM ||
-                                     dataSet.dim[1] > data.PCA_SAMPLE_DIM);
-    (this.querySelector('#pca-sampling') as HTMLElement).style.display =
-        wasSampled ? null : 'none';
-    this.showTab('pca');
-  }
-
-  _pcaDimensionToggleObserver() {
-    this.setZDropdownEnabled(this.pcaIs3d);
-    this.beginProjection(this.currentProjection);
-  }
-
-  _tsneDimensionToggleObserver() {
-    this.beginProjection(this.currentProjection);
-  }
-
-  metadataChanged(spriteAndMetadata: SpriteAndMetadataInfo) {
-    // Project by options for custom projections.
-    let searchByMetadataIndex = -1;
-    this.searchByMetadataOptions = spriteAndMetadata.stats.map((stats, i) => {
-      // Make the default label by the first non-numeric column.
-      if (!stats.isNumeric && searchByMetadataIndex === -1) {
-        searchByMetadataIndex = i;
-      }
-      return stats.name;
-    });
-    this.customSelectedSearchByMetadataOption =
-        this.searchByMetadataOptions[Math.max(0, searchByMetadataIndex)];
-  }
-
-  public showTab(id: ProjectionType) {
-    this.currentProjection = id;
-
-    const tab =
-        this.querySelector('.ink-tab[data-tab="' + id + '"]') as HTMLElement;
-    const allTabs = this.querySelectorAll('.ink-tab');
-    for (let i = 0; i < allTabs.length; i++) {
-      util.classed(allTabs[i] as HTMLElement, 'active', false);
-    }
-
-    util.classed(tab, 'active', true);
-
-    const allTabContent = this.querySelectorAll('.ink-panel-content');
-    for (let i = 0; i < allTabContent.length; i++) {
-      util.classed(allTabContent[i] as HTMLElement, 'active', false);
-    }
-
-    util.classed(
-        this.querySelector('.ink-panel-content[data-panel="' + id + '"]') as
-            HTMLElement,
-        'active', true);
-
-    // guard for unit tests, where polymer isn't attached and $ doesn't exist.
-    if (this.$ != null) {
-      const main = this.$['main'];
-      // In order for the projections panel to animate its height, we need to
-      // set it explicitly.
-      requestAnimationFrame(() => {
-        this.style.height = main.clientHeight + 'px';
-      });
-    }
-
-    this.beginProjection(id);
-  }
-
-  private beginProjection(projection: ProjectionType) {
-    if (this.polymerChangesTriggerReprojection === false) {
-      return;
-    }
-    if (projection === 'pca') {
-      if (this.dataSet != null) {
-        this.dataSet.stopTSNE();
-      }
-      this.showPCA();
-    } else if (projection === 'tsne') {
-      this.showTSNE();
-    } else if (projection === 'custom') {
-      if (this.dataSet != null) {
-        this.dataSet.stopTSNE();
-      }
-      this.computeAllCentroids();
-      this.reprojectCustom();
-    }
-  }
-
-  private showTSNE() {
-    const dataSet = this.dataSet;
-    if (dataSet == null) {
-      return;
-    }
-    const accessors =
-        data.getProjectionComponents('tsne', [0, 1, this.tSNEis3d ? 2 : null]);
-    const dimensionality = this.tSNEis3d ? 3 : 2;
-    const projection =
-        new Projection('tsne', accessors, dimensionality, dataSet);
-    this.projector.setProjection(projection);
-
-    if (!this.dataSet.hasTSNERun) {
-      this.runTSNE();
-    } else {
-      this.projector.notifyProjectionPositionsUpdated();
-    }
-  }
-
-  private runTSNE() {
-    this.runTsneButton.disabled = true;
-    this.stopTsneButton.disabled = null;
-    this.dataSet.projectTSNE(
-        this.perplexity, this.learningRate, this.tSNEis3d ? 3 : 2,
-        (iteration: number) => {
-          if (iteration != null) {
-            this.iterationLabel.innerText = '' + iteration;
-            this.projector.notifyProjectionPositionsUpdated();
-          } else {
-            this.runTsneButton.disabled = null;
-            this.stopTsneButton.disabled = true;
-          }
-        });
-  }
-
-  // tslint:disable-next-line:no-unused-variable
-  private showPCAIfEnabled() {
-    if (this.polymerChangesTriggerReprojection) {
-      this.showPCA();
-    }
-  }
-
-  private updateTotalVarianceMessage() {
-    let variances = this.dataSet.fracVariancesExplained;
-    let totalVariance = variances[this.pcaX] + variances[this.pcaY];
-    let msg = 'Total variance described: ';
-    if (this.pcaIs3d) {
-      totalVariance += variances[this.pcaZ];
-    }
-    msg += (totalVariance * 100).toFixed(1) + '%.';
-    (this.querySelector('#total-variance') as HTMLElement).innerHTML = msg;
-  }
-
-  private showPCA() {
-    if (this.dataSet == null) {
-      return;
-    }
-    this.dataSet.projectPCA().then(() => {
-      // Polymer properties are 1-based.
-      const accessors = data.getProjectionComponents(
-          'pca', [this.pcaX, this.pcaY, this.pcaZ]);
-
-      const dimensionality = this.pcaIs3d ? 3 : 2;
-      const projection =
-          new Projection('pca', accessors, dimensionality, this.dataSet);
-      this.projector.setProjection(projection);
-      let numComponents = Math.min(NUM_PCA_COMPONENTS, this.dataSet.dim[1]);
-      this.updateTotalVarianceMessage();
-      this.pcaComponents = util.range(numComponents).map(i => {
-        let fracVariance = this.dataSet.fracVariancesExplained[i];
-        return {
-          id: i,
-          componentNumber: i + 1,
-          percVariance: (fracVariance * 100).toFixed(1)
-        };
-      });
-    });
-  }
-
-  private reprojectCustom() {
-    if (this.centroids == null || this.centroids.xLeft == null ||
-        this.centroids.xRight == null || this.centroids.yUp == null ||
-        this.centroids.yDown == null) {
-      return;
-    }
-    const xDir = vector.sub(this.centroids.xRight, this.centroids.xLeft);
-    this.dataSet.projectLinear(xDir, 'linear-x');
-
-    const yDir = vector.sub(this.centroids.yUp, this.centroids.yDown);
-    this.dataSet.projectLinear(yDir, 'linear-y');
-
-    const accessors = data.getProjectionComponents('custom', ['x', 'y']);
-    const projection = new Projection('custom', accessors, 2, this.dataSet);
-    this.projector.setProjection(projection);
-  }
-
-  clearCentroids(): void {
-    this.centroids = {xLeft: null, xRight: null, yUp: null, yDown: null};
-    this.allCentroid = null;
-  }
-
-  _customSelectedSearchByMetadataOptionChanged(newVal: string, oldVal: string) {
-    if (this.polymerChangesTriggerReprojection === false) {
-      return;
-    }
-    if (this.currentProjection === 'custom') {
-      this.computeAllCentroids();
-      this.reprojectCustom();
-    }
-  }
-
-  private setupCustomProjectionInputFields() {
-    this.customProjectionXLeftInput =
-        this.setupCustomProjectionInputField('xLeft');
-    this.customProjectionXRightInput =
-        this.setupCustomProjectionInputField('xRight');
-    this.customProjectionYUpInput = this.setupCustomProjectionInputField('yUp');
-    this.customProjectionYDownInput =
-        this.setupCustomProjectionInputField('yDown');
-  }
-
-  private computeAllCentroids() {
-    this.computeCentroid('xLeft');
-    this.computeCentroid('xRight');
-    this.computeCentroid('yUp');
-    this.computeCentroid('yDown');
-  }
-
-  private computeCentroid(name: InputControlName) {
-    const input = this.querySelector('#' + name) as ProjectorInput;
-    if (input == null) {
-      return;
-    }
-    const value = input.getValue();
-    if (value == null) {
-      return;
-    }
-    let inRegexMode = input.getInRegexMode();
-    let result = this.getCentroid(value, inRegexMode);
-    if (result.numMatches === 0) {
-      input.message = '0 matches. Using a random vector.';
-      result.centroid = vector.rn(this.dim);
-    } else {
-      input.message = `${result.numMatches} matches.`;
-    }
-    this.centroids[name] = result.centroid;
-    this.centroidValues[name] = value;
-  }
-
-  private setupCustomProjectionInputField(name: InputControlName):
-      ProjectorInput {
-    let input = this.querySelector('#' + name) as ProjectorInput;
-    input.registerInputChangedListener((input, inRegexMode) => {
-      if (this.polymerChangesTriggerReprojection) {
-        this.computeCentroid(name);
-        this.reprojectCustom();
-      }
-    });
-    return input;
-  }
-
-  private getCentroid(pattern: string, inRegexMode: boolean): CentroidResult {
-    if (pattern == null || pattern === '') {
-      return {numMatches: 0};
-    }
-    // Search by the original dataset since we often want to filter and project
-    // only the nearest neighbors of A onto B-C where B and C are not nearest
-    // neighbors of A.
-    let accessor = (i: number) => this.originalDataSet.points[i].vector;
-    let r = this.originalDataSet.query(
-        pattern, inRegexMode, this.customSelectedSearchByMetadataOption);
-    return {centroid: vector.centroid(r, accessor), numMatches: r.length};
-  }
-
-  getPcaSampledDimText() {
-    return data.PCA_SAMPLE_DIM.toLocaleString();
-  }
-
-  getPcaSampleSizeText() {
-    return data.PCA_SAMPLE_SIZE.toLocaleString();
-  }
-
-  getTsneSampleSizeText() {
-    return data.TSNE_SAMPLE_SIZE.toLocaleString();
-  }
-}
-
-document.registerElement(ProjectionsPanel.prototype.is, ProjectionsPanel);
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts
deleted file mode 100644
index fd1acf6f08..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-projections-panel_test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-import {State} from './data';
-import {ProjectionsPanel} from './vz-projector-projections-panel';
-
-const assert = chai.assert;
-
-describe('restoreUIFromBookmark', () => {
-  let projectionsPanel: ProjectionsPanel;
-  beforeEach(() => {
-    projectionsPanel = document.createElement(ProjectionsPanel.prototype.is) as
-        ProjectionsPanel;
-
-    // Set up some of the UI so the elements are found in the production code.
-    const tsnePerplexityContainer = document.createElement('div');
-    tsnePerplexityContainer.className = 'tsne-perplexity';
-    const tsnePerplexity = document.createElement('span');
-    tsnePerplexityContainer.appendChild(tsnePerplexity);
-    projectionsPanel.appendChild(tsnePerplexityContainer);
-
-    const tsneLearningRateContainer = document.createElement('div');
-    tsneLearningRateContainer.className = 'tsne-learning-rate';
-    const tsneLearningRate = document.createElement('span');
-    tsneLearningRateContainer.appendChild(tsneLearningRate);
-    projectionsPanel.appendChild(tsneLearningRateContainer);
-  });
-
-  it('sets the pcaX/Y properties when setting 2D component values', () => {
-    spyOn(projectionsPanel, 'setZDropdownEnabled');
-
-    const s = new State();
-    s.pcaComponentDimensions = [0, 1];
-    projectionsPanel.restoreUIFromBookmark(s);
-
-    assert.equal(0, projectionsPanel.pcaX);
-    assert.equal(1, projectionsPanel.pcaY);
-
-    expect(projectionsPanel.setZDropdownEnabled).toHaveBeenCalledWith(false);
-  });
-
-  it('sets the pcaX/Y properties when setting 3D component values', () => {
-    spyOn(projectionsPanel, 'setZDropdownEnabled');
-
-    const s = new State();
-    s.pcaComponentDimensions = [0, 1, 2];
-    projectionsPanel.restoreUIFromBookmark(s);
-
-    assert.equal(0, projectionsPanel.pcaX);
-    assert.equal(1, projectionsPanel.pcaY);
-    assert.equal(2, projectionsPanel.pcaZ);
-
-    expect(projectionsPanel.setZDropdownEnabled).toHaveBeenCalledWith(true);
-  });
-});
-
-describe('populateBookmarkFromUI', () => {
-  let projectionsPanel: ProjectionsPanel;
-
-  beforeEach(() => {
-    projectionsPanel = document.createElement(ProjectionsPanel.prototype.is) as
-        ProjectionsPanel;
-
-    // Set up some of the UI so the elements are found in the production code.
-    const tsnePerplexityContainer = document.createElement('div');
-    tsnePerplexityContainer.className = 'tsne-perplexity';
-    const tsnePerplexity = document.createElement('span');
-    tsnePerplexityContainer.appendChild(tsnePerplexity);
-    projectionsPanel.appendChild(tsnePerplexityContainer);
-
-    const tsneLearningRateContainer = document.createElement('div');
-    tsneLearningRateContainer.className = 'tsne-learning-rate';
-    const tsneLearningRate = document.createElement('span');
-    tsneLearningRateContainer.appendChild(tsneLearningRate);
-    projectionsPanel.appendChild(tsneLearningRateContainer);
-  });
-
-  it('gets the PCA component UI values from a 2D PCA projection', () => {
-    projectionsPanel.pcaX = 0;
-    projectionsPanel.pcaY = 1;
-    projectionsPanel.pcaIs3d = false;
-
-    const s = new State();
-    projectionsPanel.populateBookmarkFromUI(s);
-    assert.deepEqual([0, 1], s.pcaComponentDimensions);
-  });
-
-  it('gets the PCA component UI values from a 3D PCA projection', () => {
-    projectionsPanel.pcaX = 0;
-    projectionsPanel.pcaY = 1;
-    projectionsPanel.pcaZ = 2;
-    projectionsPanel.pcaIs3d = true;
-
-    const s = new State();
-    projectionsPanel.populateBookmarkFromUI(s);
-    assert.deepEqual([0, 1, 2], s.pcaComponentDimensions);
-  });
-});
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector-util.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector-util.ts
deleted file mode 100644
index 44062062a3..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector-util.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-export type Spec = {
-  is: string; properties?: {
-    [key: string]:
-        (Function |
-         {
-           type: Function, value?: any;
-           readonly?: boolean;
-           notify?: boolean;
-           observer?: string;
-         })
-  };
-  observers?: string[];
-};
-
-export function PolymerElement(spec: Spec) {
-  return Polymer.Class(spec as any) as{new (): PolymerHTMLElement};
-}
-
-export interface PolymerHTMLElement extends HTMLElement, polymer.Base {}
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector.html b/tensorflow/tensorboard/components/vz_projector/vz-projector.html
deleted file mode 100644
index d4be2f26a5..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector.html
+++ /dev/null
@@ -1,343 +0,0 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../iron-collapse/iron-collapse.html">
-<link rel="import" href="../paper-toggle-button/paper-toggle-button.html">
-<link rel="import" href="../paper-listbox/paper-listbox.html">
-<link rel="import" href="../paper-item/paper-item.html">
-<link rel="import" href="../paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../iron-icons/iron-icons.html">
-<link rel="import" href="../iron-icons/image-icons.html">
-<link rel="import" href="../paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../paper-tooltip/paper-tooltip.html">
-<link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-button/paper-button.html">
-<link rel="import" href="../paper-dialog/paper-dialog.html">
-<link rel="import" href="../paper-toast/paper-toast.html">
-<link rel="import" href="../paper-styles/typography.html">
-<link rel="import" href="../paper-spinner/paper-spinner-lite.html">
-<link rel="import" href="../paper-dialog-scrollable/paper-dialog-scrollable.html">
-
-<link rel="import" href="vz-projector-bookmark-panel.html">
-<link rel="import" href="vz-projector-data-panel.html">
-<link rel="import" href="vz-projector-inspector-panel.html">
-<link rel="import" href="vz-projector-input.html">
-<link rel="import" href="vz-projector-metadata-card.html">
-<link rel="import" href="vz-projector-projections-panel.html">
-<link rel="import" href="styles.html">
-
-<dom-module id="vz-projector">
-<template>
-<style include="vz-projector-styles"></style>
-<style>
-:host {
-  display: flex;
-  width: 100%;
-  height: 100%;
-}
-
-#container {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-
-.hidden {
-  display: none !important;
-}
-
-/* Main */
-
-#main {
-  position: relative;
-  flex-grow: 2;
-}
-
-#main .stage {
-  position: relative;
-  flex-grow: 2;
-}
-
-#scatter {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-#selector {
-  display: none;
-  height: 100%;
-  position: absolute;
-  width: 100%;
-}
-
-#left-pane {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  min-width: 312px;
-  width: 312px;
-  border-right: 1px solid rgba(0, 0, 0, 0.1);
-  background: #fafafa;
-}
-
-#right-pane {
-  border-left: 1px solid rgba(0, 0, 0, 0.1);
-  background: #fafafa;
-  display: flex;
-  height: 100%;
-  min-width: 300px;
-  width: 300px;
-}
-
-.file-name {
-  margin-right: 5px;
-}
-
-.control input[type=text]:focus {
-  outline: none;
-  border-bottom: 1px solid rgba(0, 0, 0, 1);
-}
-
-.control {
-  display: inline-block;
-  width: 45%;
-  vertical-align: top;
-  margin-right: 10px;
-  overflow-x: hidden;
-}
-
-.control.last {
-  margin-right: 0;
-}
-
-#notification-dialog {
-  width: 400px;
-  padding-bottom: 20px;
-}
-
-#notification-dialog paper-button {
-  background: none;
-  text-transform: uppercase;
-}
-
-#notification-dialog .progress {
-  --paper-spinner-color: #880E4F;
-  --paper-spinner-stroke-width: 2px;
-}
-
-#notify-msgs {
-  text-align: center;
-  display: block;
-}
-
-.notify-msg {
-  font-weight: 500;
-  margin: 0;
-  padding: 0;
-}
-
-.notify-msg.error {
-  text-align: left;
-}
-
-.brush .extent {
-  stroke: #fff;
-  fill-opacity: .125;
-  shape-rendering: crispEdges;
-}
-
-.origin text {
-  font-size: 12px;
-  font-weight: 500;
-}
-
-.origin line {
-  stroke: black;
-  stroke-opacity: 0.2;
-}
-
-/* Ink Framework */
-
-/* - Buttons */
-.ink-button, ::shadow .ink-button {
-  border: none;
-  border-radius: 2px;
-  font-size: 13px;
-  padding: 10px;
-  min-width: 100px;
-  flex-shrink: 0;
-  background: #e3e3e3;
-}
-
-.status-bar-panel {
-  display: flex;
-  align-items: center;
-}
-
-.status-bar-entry {
-  border-left: 1px solid rgba(0, 0, 0, 0.5);
-  margin-left: 5px;
-  padding-left: 5px;
-}
-
-/* - Menubar */
-
-.ink-panel-menubar {
-  align-items: center;
-  position: relative;
-  height: 60px;
-  border-bottom: solid 1px #eee;
-  padding: 0 24px;
-  display: flex;
-}
-
-.ink-panel-menubar .ink-fabs {
-  position: absolute;
-  right: 12px;
-  top: 40px;
-  z-index: 1;
-}
-
-#bookmark-panel {
-  bottom: 0;
-  position: absolute;
-  width: 300px;
-}
-#bookmark-panel-container {
-  bottom: 60px;
-  position: absolute;
-}
-
-.ink-fab {
-  margin-left: 8px;
-  border: 1px solid rgba(0, 0, 0, 0.02);
-  background: white;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-}
-
-#metadata-card {
-  position: absolute;
-  right: 5px;
-  top: 25px;
-}
-
-#help-3d-icon {
-  position: absolute;
-  top: 20px;
-  left: 20px;
-}
-
-#help3dDialog .main {
-  margin: 0;
-  padding: 20px;
-}
-
-#help3dDialog h3 {
-  margin-top: 20px;
-  margin-bottom: 5px;
-}
-
-#help3dDialog h3:first-child {
-  margin-top: 0;
-}
-
-#data-panel {
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-  overflow-y: auto;
-}
-
-#toast {
-  display: flex;
-  align-items: center;
-  --paper-toast-color: #eeff41;
-}
-</style>
-<paper-dialog id="notification-dialog" modal>
-  <h2 id="notification-title"></h2>
-  <paper-dialog-scrollable>
-    <div id="notify-msgs"></div>
-  </paper-dialog-scrollable>
-  <div style="text-align: center;"><paper-spinner-lite active class="progress"></paper-spinner-lite></div>
-  <div class="buttons">
-    <paper-button class="close-button" dialog-confirm autofocus>Close</paper-button>
-  </div>
-</paper-dialog>
-<div id="container">
-  <div id="left-pane" class="ink-panel">
-    <vz-projector-data-panel id="data-panel"></vz-projector-data-panel>
-    <vz-projector-projections-panel id="projections-panel"></vz-projector-projections-panel>
-  </div>
-  <div id="main" class="ink-panel">
-    <div class="ink-panel-menubar">
-      <paper-icon-button id="selectMode" alt="Bounding box selection" toggles icon="image:photo-size-select-small"></paper-icon-button>
-      <paper-tooltip for="selectMode" position="bottom" animation-delay="0" fit-to-visible-bounds>Bounding box selection</paper-tooltip>
-
-      <paper-icon-button id="nightDayMode" alt="Enable/disable night mode" toggles icon="image:brightness-2"></paper-icon-button>
-      <paper-tooltip for="nightDayMode" position="bottom" animation-delay="0" fit-to-visible-bounds>Enable/disable night mode</paper-tooltip>
-
-      <paper-icon-button id="labels3DMode" alt="Enable/disable 3D labels mode" toggles icon="font-download"></paper-icon-button>
-      <paper-tooltip for="labels3DMode" position="bottom" animation-delay="0" fit-to-visible-bounds>Enable/disable 3D labels mode</paper-tooltip>
-      <div class="status-bar-panel">
-        <div class="status-bar-entry">Points: <span class="numDataPoints">Loading...</span></div>
-        <div class="status-bar-entry">Dimension: <span class="dim">Loading...</span></div>
-        <div id="status-bar" class="status-bar-entry" style="display: none;"></div>
-      </div>
-      <div class="ink-fabs">
-        <paper-icon-button id="reset-zoom" class="ink-fab" alt="Reset zoom to fit all points" icon="home"></paper-icon-button>
-        <paper-tooltip for="reset-zoom" position="left" animation-delay="0">Reset zoom to fit all points</paper-tooltip>
-      </div>
-    </div>
-    <div class="stage">
-      <div id="scatter">
-        <svg id="selector"></svg>
-      </div>
-      <vz-projector-metadata-card id="metadata-card"></vz-projector-metadata-card>
-      <paper-icon-button raised onclick="help3dDialog.open()" icon="help-outline" id="help-3d-icon"></paper-icon-button>
-      <paper-tooltip animation-delay="0" for="help-3d-icon">Help with interaction controls.</paper-tooltip>
-      <paper-dialog id="help3dDialog" with-backdrop>
-        <div class="main" dialog-confirm autofocus>
-          <h3>3D controls</h3>
-            <b>Rotate</b> Mouse left click.<br/>
-            <b>Pan</b> Mouse right click.<br/>
-            <b>Zoom</b> Mouse wheel.<br/>
-            Holding <b>ctrl</b> reverses the mouse clicks.
-          <h3>2D controls</h3>
-            <b>Pan</b> Mouse left click.<br/>
-            <b>Zoom</b> Mouse wheel.
-          <div class="dismiss-dialog-note"> Click anywhere to dismiss.</div>
-        </div>
-      </paper-dialog>
-    </div>
-  </div>
-  <div id="right-pane" class="ink-panel">
-    <div class="ink-panel-content active">
-      <vz-projector-inspector-panel id="inspector-panel"></vz-projector-inspector-panel>
-    </div>
-    <div id="bookmark-panel-container">
-      <vz-projector-bookmark-panel id="bookmark-panel"></vz-projector-bookmark-panel>
-    </div>
-  </div>
-</div>
-<paper-toast id="toast" always-on-top></paper-toast>
-
-</template> <!-- global template -->
-</dom-module>
diff --git a/tensorflow/tensorboard/components/vz_projector/vz-projector.ts b/tensorflow/tensorboard/components/vz_projector/vz-projector.ts
deleted file mode 100644
index bf98a4d478..0000000000
--- a/tensorflow/tensorboard/components/vz_projector/vz-projector.ts
+++ /dev/null
@@ -1,570 +0,0 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-import {AnalyticsLogger} from './analyticsLogger';
-import * as data from './data';
-import {ColorOption, ColumnStats, DataPoint, DataProto, DataSet, DistanceFunction, PointMetadata, Projection, SpriteAndMetadataInfo, State, stateGetAccessorDimensions} from './data';
-import {DataProvider, EmbeddingInfo, ServingMode} from './data-provider';
-import {DemoDataProvider} from './data-provider-demo';
-import {ProtoDataProvider} from './data-provider-proto';
-import {ServerDataProvider} from './data-provider-server';
-import * as knn from './knn';
-import * as logging from './logging';
-import {DistanceMetricChangedListener, HoverListener, ProjectionChangedListener, ProjectorEventContext, SelectionChangedListener} from './projectorEventContext';
-import {ProjectorScatterPlotAdapter} from './projectorScatterPlotAdapter';
-import {MouseMode} from './scatterPlot';
-import * as util from './util';
-import {BookmarkPanel} from './vz-projector-bookmark-panel';
-import {DataPanel} from './vz-projector-data-panel';
-import {InspectorPanel} from './vz-projector-inspector-panel';
-import {MetadataCard} from './vz-projector-metadata-card';
-import {ProjectionsPanel} from './vz-projector-projections-panel';
-// tslint:disable-next-line:no-unused-variable
-import {PolymerElement, PolymerHTMLElement} from './vz-projector-util';
-
-/**
- * The minimum number of dimensions the data should have to automatically
- * decide to normalize the data.
- */
-const THRESHOLD_DIM_NORMALIZE = 50;
-const POINT_COLOR_MISSING = 'black';
-
-export let ProjectorPolymer = PolymerElement({
-  is: 'vz-projector',
-  properties: {
-    routePrefix: String,
-    dataProto: {type: String, observer: '_dataProtoChanged'},
-    servingMode: String,
-    projectorConfigJsonPath: String,
-    pageViewLogging: Boolean,
-    eventLogging: Boolean
-  }
-});
-
-const INDEX_METADATA_FIELD = '__index__';
-
-export class Projector extends ProjectorPolymer implements
-    ProjectorEventContext {
-  // The working subset of the data source's original data set.
-  dataSet: DataSet;
-  servingMode: ServingMode;
-  // The path to the projector config JSON file for demo mode.
-  projectorConfigJsonPath: string;
-
-  private selectionChangedListeners: SelectionChangedListener[];
-  private hoverListeners: HoverListener[];
-  private projectionChangedListeners: ProjectionChangedListener[];
-  private distanceMetricChangedListeners: DistanceMetricChangedListener[];
-
-  private originalDataSet: DataSet;
-  private dataSetBeforeFilter: DataSet;
-  private projectorScatterPlotAdapter: ProjectorScatterPlotAdapter;
-  private dim: number;
-
-  private dataSetFilterIndices: number[];
-  private selectedPointIndices: number[];
-  private neighborsOfFirstPoint: knn.NearestEntry[];
-  private hoverPointIndex: number;
-
-  private dataProvider: DataProvider;
-  private inspectorPanel: InspectorPanel;
-
-  private selectedColorOption: ColorOption;
-  private selectedLabelOption: string;
-  private routePrefix: string;
-  private normalizeData: boolean;
-  private projection: Projection;
-
-  /** Polymer component panels */
-  private dataPanel: DataPanel;
-  private bookmarkPanel: BookmarkPanel;
-  private projectionsPanel: ProjectionsPanel;
-  private metadataCard: MetadataCard;
-
-  private statusBar: HTMLDivElement;
-  private analyticsLogger: AnalyticsLogger;
-  private eventLogging: boolean;
-  private pageViewLogging: boolean;
-
-  ready() {
-    logging.setDomContainer(this);
-
-    this.analyticsLogger =
-        new AnalyticsLogger(this.pageViewLogging, this.eventLogging);
-    this.analyticsLogger.logPageView('embeddings');
-
-    if (!util.hasWebGLSupport()) {
-      this.analyticsLogger.logWebGLDisabled();
-      logging.setErrorMessage(
-          'Your browser or device does not have WebGL enabled. Please enable ' +
-          'hardware acceleration, or use a browser that supports WebGL.');
-      return;
-    }
-
-    this.selectionChangedListeners = [];
-    this.hoverListeners = [];
-    this.projectionChangedListeners = [];
-    this.distanceMetricChangedListeners = [];
-    this.selectedPointIndices = [];
-    this.neighborsOfFirstPoint = [];
-
-    this.dataPanel = this.$['data-panel'] as DataPanel;
-    this.inspectorPanel = this.$['inspector-panel'] as InspectorPanel;
-    this.inspectorPanel.initialize(this, this as ProjectorEventContext);
-    this.projectionsPanel = this.$['projections-panel'] as ProjectionsPanel;
-    this.projectionsPanel.initialize(this);
-    this.bookmarkPanel = this.$['bookmark-panel'] as BookmarkPanel;
-    this.bookmarkPanel.initialize(this, this as ProjectorEventContext);
-    this.metadataCard = this.$['metadata-card'] as MetadataCard;
-    this.statusBar = this.querySelector('#status-bar') as HTMLDivElement;
-    this.scopeSubtree(this.$$('#notification-dialog'), true);
-    this.setupUIControls();
-    this.initializeDataProvider();
-  }
-
-  setSelectedLabelOption(labelOption: string) {
-    this.selectedLabelOption = labelOption;
-    this.metadataCard.setLabelOption(this.selectedLabelOption);
-    this.projectorScatterPlotAdapter.setLabelPointAccessor(labelOption);
-    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-    this.projectorScatterPlotAdapter.render();
-  }
-
-  setSelectedColorOption(colorOption: ColorOption) {
-    this.selectedColorOption = colorOption;
-    this.projectorScatterPlotAdapter.setLegendPointColorer(
-        this.getLegendPointColorer(colorOption));
-    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-    this.projectorScatterPlotAdapter.render();
-  }
-
-  setNormalizeData(normalizeData: boolean) {
-    this.normalizeData = normalizeData;
-    this.setCurrentDataSet(this.originalDataSet.getSubset());
-  }
-
-  updateDataSet(
-      ds: DataSet, spriteAndMetadata?: SpriteAndMetadataInfo,
-      metadataFile?: string) {
-    this.dataSetFilterIndices = null;
-    this.originalDataSet = ds;
-    if (ds != null) {
-      this.normalizeData =
-          this.originalDataSet.dim[1] >= THRESHOLD_DIM_NORMALIZE;
-      spriteAndMetadata = spriteAndMetadata || {};
-      if (spriteAndMetadata.pointsInfo == null) {
-        let [pointsInfo, stats] = this.makeDefaultPointsInfoAndStats(ds.points);
-        spriteAndMetadata.pointsInfo = pointsInfo;
-        spriteAndMetadata.stats = stats;
-      }
-      let metadataMergeSucceeded = ds.mergeMetadata(spriteAndMetadata);
-      if (!metadataMergeSucceeded) {
-        return;
-      }
-    }
-    if (this.projectorScatterPlotAdapter != null) {
-      if (ds == null) {
-        this.projectorScatterPlotAdapter.setLabelPointAccessor(null);
-        this.setProjection(null);
-      } else {
-        this.projectorScatterPlotAdapter.updateScatterPlotPositions();
-        this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-        this.projectorScatterPlotAdapter.resize();
-        this.projectorScatterPlotAdapter.render();
-      }
-    }
-    if (ds != null) {
-      this.dataPanel.setNormalizeData(this.normalizeData);
-      this.setCurrentDataSet(ds.getSubset());
-      this.projectorScatterPlotAdapter.setLabelPointAccessor(
-          this.selectedLabelOption);
-      this.inspectorPanel.datasetChanged();
-
-      this.inspectorPanel.metadataChanged(spriteAndMetadata);
-      this.projectionsPanel.metadataChanged(spriteAndMetadata);
-      this.dataPanel.metadataChanged(spriteAndMetadata, metadataFile);
-      // Set the container to a fixed height, otherwise in Colab the
-      // height can grow indefinitely.
-      const container = this.querySelector('#container') as HTMLDivElement;
-      container.style.height = container.clientHeight + 'px';
-    } else {
-      this.setCurrentDataSet(null);
-    }
-  }
-
-  setSelectedTensor(run: string, tensorInfo: EmbeddingInfo) {
-    this.bookmarkPanel.setSelectedTensor(run, tensorInfo, this.dataProvider);
-  }
-
-  /**
-   * Registers a listener to be called any time the selected point set changes.
-   */
-  registerSelectionChangedListener(listener: SelectionChangedListener) {
-    this.selectionChangedListeners.push(listener);
-  }
-
-  filterDataset(pointIndices: number[]) {
-    const selectionSize = this.selectedPointIndices.length;
-    if (this.dataSetBeforeFilter == null) {
-      this.dataSetBeforeFilter = this.dataSet;
-    }
-    this.setCurrentDataSet(this.dataSet.getSubset(pointIndices));
-    this.dataSetFilterIndices = pointIndices;
-    this.projectorScatterPlotAdapter.updateScatterPlotPositions();
-    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-    this.adjustSelectionAndHover(util.range(selectionSize));
-  }
-
-  resetFilterDataset() {
-    const originalPointIndices = this.selectedPointIndices.map(
-        filteredIndex => this.dataSet.points[filteredIndex].index);
-    this.setCurrentDataSet(this.dataSetBeforeFilter);
-    if (this.projection != null) {
-      this.projection.dataSet = this.dataSetBeforeFilter;
-    }
-    this.dataSetBeforeFilter = null;
-    this.projectorScatterPlotAdapter.updateScatterPlotPositions();
-    this.projectorScatterPlotAdapter.updateScatterPlotAttributes();
-    this.dataSetFilterIndices = [];
-    this.adjustSelectionAndHover(originalPointIndices);
-  }
-
-  /**
-   * Used by clients to indicate that a selection has occurred.
-   */
-  notifySelectionChanged(newSelectedPointIndices: number[]) {
-    this.selectedPointIndices = newSelectedPointIndices;
-    let neighbors: knn.NearestEntry[] = [];
-
-    if (newSelectedPointIndices.length === 1) {
-      neighbors = this.dataSet.findNeighbors(
-          newSelectedPointIndices[0], this.inspectorPanel.distFunc,
-          this.inspectorPanel.numNN);
-      this.metadataCard.updateMetadata(
-          this.dataSet.points[newSelectedPointIndices[0]].metadata);
-    } else {
-      this.metadataCard.updateMetadata(null);
-    }
-
-    this.selectionChangedListeners.forEach(
-        l => l(this.selectedPointIndices, neighbors));
-  }
-
-  /**
-   * Registers a listener to be called any time the mouse hovers over a point.
-   */
-  registerHoverListener(listener: HoverListener) {
-    this.hoverListeners.push(listener);
-  }
-
-  /**
-   * Used by clients to indicate that a hover is occurring.
-   */
-  notifyHoverOverPoint(pointIndex: number) {
-    this.hoverListeners.forEach(l => l(pointIndex));
-  }
-
-  registerProjectionChangedListener(listener: ProjectionChangedListener) {
-    this.projectionChangedListeners.push(listener);
-  }
-
-  notifyProjectionChanged(projection: Projection) {
-    this.projectionChangedListeners.forEach(l => l(projection));
-  }
-
-  registerDistanceMetricChangedListener(l: DistanceMetricChangedListener) {
-    this.distanceMetricChangedListeners.push(l);
-  }
-
-  notifyDistanceMetricChanged(distMetric: DistanceFunction) {
-    this.distanceMetricChangedListeners.forEach(l => l(distMetric));
-  }
-
-  _dataProtoChanged(dataProtoString: string) {
-    let dataProto =
-        dataProtoString ? JSON.parse(dataProtoString) as DataProto : null;
-    this.initializeDataProvider(dataProto);
-  }
-
-  private makeDefaultPointsInfoAndStats(points: DataPoint[]):
-      [PointMetadata[], ColumnStats[]] {
-    let pointsInfo: PointMetadata[] = [];
-    points.forEach(p => {
-      let pointInfo: PointMetadata = {};
-      pointInfo[INDEX_METADATA_FIELD] = p.index;
-      pointsInfo.push(pointInfo);
-    });
-    let stats: ColumnStats[] = [{
-      name: INDEX_METADATA_FIELD,
-      isNumeric: false,
-      tooManyUniqueValues: true,
-      min: 0,
-      max: pointsInfo.length - 1
-    }];
-    return [pointsInfo, stats];
-  }
-
-  private initializeDataProvider(dataProto?: DataProto) {
-    if (this.servingMode === 'demo') {
-      let projectorConfigUrl: string;
-
-      // Only in demo mode do we allow the config being passed via URL.
-      let urlParams = util.getURLParams(window.location.search);
-      if ('config' in urlParams) {
-        projectorConfigUrl = urlParams['config'];
-      } else {
-        projectorConfigUrl = this.projectorConfigJsonPath;
-      }
-      this.dataProvider = new DemoDataProvider(projectorConfigUrl);
-    } else if (this.servingMode === 'server') {
-      if (!this.routePrefix) {
-        throw 'route-prefix is a required parameter';
-      }
-      this.dataProvider = new ServerDataProvider(this.routePrefix);
-    } else if (this.servingMode === 'proto' && dataProto != null) {
-      this.dataProvider = new ProtoDataProvider(dataProto);
-    }
-
-    this.dataPanel.initialize(this, this.dataProvider);
-  }
-
-  private getLegendPointColorer(colorOption: ColorOption):
-      (ds: DataSet, index: number) => string {
-    if ((colorOption == null) || (colorOption.map == null)) {
-      return null;
-    }
-    const colorer = (ds: DataSet, i: number) => {
-      let value = ds.points[i].metadata[this.selectedColorOption.name];
-      if (value == null) {
-        return POINT_COLOR_MISSING;
-      }
-      return colorOption.map(value);
-    };
-    return colorer;
-  }
-
-  private get3DLabelModeButton(): any {
-    return this.querySelector('#labels3DMode');
-  }
-
-  private get3DLabelMode(): boolean {
-    const label3DModeButton = this.get3DLabelModeButton();
-    return (label3DModeButton as any).active;
-  }
-
-  adjustSelectionAndHover(selectedPointIndices: number[], hoverIndex?: number) {
-    this.notifySelectionChanged(selectedPointIndices);
-    this.notifyHoverOverPoint(hoverIndex);
-    this.setMouseMode(MouseMode.CAMERA_AND_CLICK_SELECT);
-  }
-
-  private setMouseMode(mouseMode: MouseMode) {
-    let selectModeButton = this.querySelector('#selectMode');
-    (selectModeButton as any).active = (mouseMode === MouseMode.AREA_SELECT);
-    this.projectorScatterPlotAdapter.scatterPlot.setMouseMode(mouseMode);
-  }
-
-  private setCurrentDataSet(ds: DataSet) {
-    this.adjustSelectionAndHover([]);
-    if (this.dataSet != null) {
-      this.dataSet.stopTSNE();
-    }
-    if ((ds != null) && this.normalizeData) {
-      ds.normalize();
-    }
-    this.dim = (ds == null) ? 0 : ds.dim[1];
-    (this.querySelector('span.numDataPoints') as HTMLSpanElement).innerText =
-        (ds == null) ? '0' : '' + ds.dim[0];
-    (this.querySelector('span.dim') as HTMLSpanElement).innerText =
-        (ds == null) ? '0' : '' + ds.dim[1];
-
-    this.dataSet = ds;
-
-    this.projectionsPanel.dataSetUpdated(
-        this.dataSet, this.originalDataSet, this.dim);
-
-    this.projectorScatterPlotAdapter.setDataSet(this.dataSet);
-    this.projectorScatterPlotAdapter.scatterPlot
-        .setCameraParametersForNextCameraCreation(null, true);
-  }
-
-  private setupUIControls() {
-    // View controls
-    this.querySelector('#reset-zoom').addEventListener('click', () => {
-      this.projectorScatterPlotAdapter.scatterPlot.resetZoom();
-      this.projectorScatterPlotAdapter.scatterPlot.startOrbitAnimation();
-    });
-
-    let selectModeButton = this.querySelector('#selectMode');
-    selectModeButton.addEventListener('click', (event) => {
-      this.setMouseMode(
-          (selectModeButton as any).active ? MouseMode.AREA_SELECT :
-                                             MouseMode.CAMERA_AND_CLICK_SELECT);
-    });
-    let nightModeButton = this.querySelector('#nightDayMode');
-    nightModeButton.addEventListener('click', () => {
-      this.projectorScatterPlotAdapter.scatterPlot.setDayNightMode(
-          (nightModeButton as any).active);
-    });
-
-    const labels3DModeButton = this.get3DLabelModeButton();
-    labels3DModeButton.addEventListener('click', () => {
-      this.projectorScatterPlotAdapter.set3DLabelMode(this.get3DLabelMode());
-    });
-
-    window.addEventListener('resize', () => {
-      const container = this.querySelector('#container') as HTMLDivElement;
-      const parentHeight = (container.parentNode as HTMLElement).clientHeight;
-      container.style.height = parentHeight + 'px';
-      this.projectorScatterPlotAdapter.resize();
-    });
-
-    {
-      this.projectorScatterPlotAdapter = new ProjectorScatterPlotAdapter(
-          this.getScatterContainer(), this as ProjectorEventContext);
-      this.projectorScatterPlotAdapter.setLabelPointAccessor(
-          this.selectedLabelOption);
-    }
-
-    this.projectorScatterPlotAdapter.scatterPlot.onCameraMove(
-        (cameraPosition: THREE.Vector3, cameraTarget: THREE.Vector3) =>
-            this.bookmarkPanel.clearStateSelection());
-
-    this.registerHoverListener(
-        (hoverIndex: number) => this.onHover(hoverIndex));
-
-    this.registerSelectionChangedListener(
-        (selectedPointIndices: number[],
-         neighborsOfFirstPoint: knn.NearestEntry[]) =>
-            this.onSelectionChanged(
-                selectedPointIndices, neighborsOfFirstPoint));
-  }
-
-  private onHover(hoverIndex: number) {
-    this.hoverPointIndex = hoverIndex;
-    let hoverText = null;
-    if (hoverIndex != null) {
-      const point = this.dataSet.points[hoverIndex];
-      if (point.metadata[this.selectedLabelOption]) {
-        hoverText = point.metadata[this.selectedLabelOption].toString();
-      }
-    }
-    if (this.selectedPointIndices.length === 0) {
-      this.statusBar.style.display = hoverText ? null : 'none';
-      this.statusBar.innerText = hoverText;
-    }
-  }
-
-  private getScatterContainer(): HTMLDivElement {
-    return this.querySelector('#scatter') as HTMLDivElement;
-  }
-
-  private onSelectionChanged(
-      selectedPointIndices: number[],
-      neighborsOfFirstPoint: knn.NearestEntry[]) {
-    this.selectedPointIndices = selectedPointIndices;
-    this.neighborsOfFirstPoint = neighborsOfFirstPoint;
-    let totalNumPoints =
-        this.selectedPointIndices.length + neighborsOfFirstPoint.length;
-    this.statusBar.innerText = `Selected ${totalNumPoints} points`;
-    this.statusBar.style.display = totalNumPoints > 0 ? null : 'none';
-  }
-
-  setProjection(projection: Projection) {
-    this.projection = projection;
-    if (projection != null) {
-      this.analyticsLogger.logProjectionChanged(projection.projectionType);
-    }
-    this.notifyProjectionChanged(projection);
-  }
-
-  notifyProjectionPositionsUpdated() {
-    this.projectorScatterPlotAdapter.notifyProjectionPositionsUpdated();
-  }
-
-  /**
-   * Gets the current view of the embedding and saves it as a State object.
-   */
-  getCurrentState(): State {
-    const state = new State();
-
-    // Save the individual datapoint projections.
-    state.projections = [];
-    for (let i = 0; i < this.dataSet.points.length; i++) {
-      const point = this.dataSet.points[i];
-      const projections: {[key: string]: number} = {};
-      const keys = Object.keys(point.projections);
-      for (let j = 0; j < keys.length; ++j) {
-        projections[keys[j]] = point.projections[keys[j]];
-      }
-      state.projections.push(projections);
-    }
-    state.selectedProjection = this.projection.projectionType;
-    state.dataSetDimensions = this.dataSet.dim;
-    state.tSNEIteration = this.dataSet.tSNEIteration;
-    state.selectedPoints = this.selectedPointIndices;
-    state.filteredPoints = this.dataSetFilterIndices;
-    this.projectorScatterPlotAdapter.populateBookmarkFromUI(state);
-    state.selectedColorOptionName = this.dataPanel.selectedColorOptionName;
-    state.forceCategoricalColoring = this.dataPanel.forceCategoricalColoring;
-    state.selectedLabelOption = this.selectedLabelOption;
-    this.projectionsPanel.populateBookmarkFromUI(state);
-    return state;
-  }
-
-  /** Loads a State object into the world. */
-  loadState(state: State) {
-    this.setProjection(null);
-    {
-      this.projectionsPanel.disablePolymerChangesTriggerReprojection();
-      if (this.dataSetBeforeFilter != null) {
-        this.resetFilterDataset();
-      }
-      if (state.filteredPoints != null) {
-        this.filterDataset(state.filteredPoints);
-      }
-      this.projectionsPanel.enablePolymerChangesTriggerReprojection();
-    }
-    for (let i = 0; i < state.projections.length; i++) {
-      const point = this.dataSet.points[i];
-      const projection = state.projections[i];
-      const keys = Object.keys(projection);
-      for (let j = 0; j < keys.length; ++j) {
-        point.projections[keys[j]] = projection[keys[j]];
-      }
-    }
-    this.dataSet.hasTSNERun = (state.selectedProjection === 'tsne');
-    this.dataSet.tSNEIteration = state.tSNEIteration;
-    this.projectionsPanel.restoreUIFromBookmark(state);
-    this.inspectorPanel.restoreUIFromBookmark(state);
-    this.dataPanel.selectedColorOptionName = state.selectedColorOptionName;
-    this.dataPanel.setForceCategoricalColoring(
-        !!state.forceCategoricalColoring);
-    this.selectedLabelOption = state.selectedLabelOption;
-    this.projectorScatterPlotAdapter.restoreUIFromBookmark(state);
-    {
-      const dimensions = stateGetAccessorDimensions(state);
-      const components =
-          data.getProjectionComponents(state.selectedProjection, dimensions);
-      const projection = new Projection(
-          state.selectedProjection, components, dimensions.length,
-          this.dataSet);
-      this.setProjection(projection);
-    }
-    this.notifySelectionChanged(state.selectedPoints);
-  }
-}
-
-document.registerElement(Projector.prototype.is, Projector);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
index b388999a53..a1848d9544 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/BUILD
@@ -352,3 +352,97 @@ filegroup(
     srcs = glob(["**"]),
     tags = ["notsan"],
 )
+
+#### Legacy for other consumers
+load(
+    "//tensorflow/tensorboard:defs.bzl",
+    "tensorboard_webcomponent_library",
+    "tensorboard_ts_library",
+    "tensorboard_ts_declaration",
+)
+
+# Standalone embedding projector demos should depend on this target. We
+# exclude the HTML file for the dashboard itself. Demos do not need that
+# HTML file. This was introduced because standalone demos as of today
+# have an additional Closure pass that uses a compilation configuration
+# stricter than that of TensorBoard.
+
+_PROJECTOR_LIB_TS_LIB_DEPS = [
+    ":ts_lib",
+    ":tsne_ts_lib",
+]
+
+_PROJECTOR_DESTDIR = "vz-projector"
+
+_PROJECTOR_LIB_DEPS = [
+    "//third_party/javascript/polymer/v1/iron-collapse:lib",
+    "//third_party/javascript/polymer/v1/iron-icons:lib",
+    "//third_party/javascript/polymer/v1/paper-button:lib",
+    "//third_party/javascript/polymer/v1/paper-checkbox:lib",
+    "//third_party/javascript/polymer/v1/paper-dialog:lib",
+    "//third_party/javascript/polymer/v1/paper-dialog-scrollable:lib",
+    "//third_party/javascript/polymer/v1/paper-dropdown-menu:lib",
+    "//third_party/javascript/polymer/v1/paper-icon-button:lib",
+    "//third_party/javascript/polymer/v1/paper-input:lib",
+    "//third_party/javascript/polymer/v1/paper-item:lib",
+    "//third_party/javascript/polymer/v1/paper-listbox:lib",
+    "//third_party/javascript/polymer/v1/paper-slider:lib",
+    "//third_party/javascript/polymer/v1/paper-spinner:lib",
+    "//third_party/javascript/polymer/v1/paper-toast:lib",
+    "//third_party/javascript/polymer/v1/paper-toggle-button:lib",
+    "//third_party/javascript/polymer/v1/paper-tooltip:lib",
+    "//third_party/javascript/polymer/v1/polymer:lib",
+]
+
+tensorboard_ts_library(
+    name = "tsne_ts_lib",
+    srcs = [
+        "bh_tsne.ts",
+        "sptree.ts",
+    ],
+)
+
+tensorboard_ts_declaration(
+    name = "external",
+    srcs = ["external.d.ts"],
+)
+
+tensorboard_ts_library(
+    name = "ts_lib",
+    srcs = glob(
+        ["*.ts"],
+        exclude = [
+            "*.d.ts",
+            "*_test.ts",
+            "bh_tsne.ts",
+            "sptree.ts",
+        ],
+    ),
+    runtime_deps = [
+        "//third_party/javascript/d3/v4:d3",
+        "//third_party/javascript/numericjs",
+        "//third_party/javascript/threejs/r77:threejs",
+        "//third_party/javascript/threejs/r77/examples/js/controls:orbitcontrols",
+        "//third_party/javascript/weblas",
+    ],
+    deps = [
+        ":external",
+        ":tsne_ts_lib",
+        "//third_party/javascript/node_modules/typescript:es2015.promise",
+        "//third_party/javascript/typings/d3_v4:bundle",
+        "//third_party/javascript/typings/polymer:polymer_without_externs",
+        "//third_party/javascript/typings/threejs:three",
+        "//third_party/javascript/typings/webcomponents_js",
+    ],
+)
+
+tensorboard_webcomponent_library(
+    name = "lib",
+    srcs = glob(
+        ["*.html"],
+        exclude = ["vz-projector-dashboard.html"],
+    ),
+    ts_lib_deps = _PROJECTOR_LIB_TS_LIB_DEPS,
+    destdir = _PROJECTOR_DESTDIR,
+    deps = _PROJECTOR_LIB_DEPS,
+)
-- 
GitLab


From 53cb26d05a5c2080d8022124178b1cc43a30ffe5 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 18:02:32 -0700
Subject: [PATCH 1526/1563] Merge changes from github. END_PUBLIC

---
Commit c2b8927f2 authored by Dandelion Man?<dandelion@google.com>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
Fix another d3v4 regression in the graph visualizer.

PiperOrigin-RevId: 156343038

---
Commit 170f0b350 authored by Peter Hawkins<phawkins@google.com>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
[TF:XLA] Add XLA implementation of ResourceStridedSliceAssign.

PiperOrigin-RevId: 156341053

---
Commit 1390dd68f authored by Vijay Vasudevan<vrv@google.com>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
When Op Type is not registered, log the hostname of the machine that
it is running on in the error message, since the message could be routed
back during a failure on a remote binary, and it is hard to tell which
machine it came from.

Ideally, we'd somehow log the name of the binary running instead, but
we don't have a function to get that right now.

PiperOrigin-RevId: 156337679

---
Commit 9ca8a151b authored by A. Unique TensorFlower<gardener@tensorflow.org>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
Internal change.

PiperOrigin-RevId: 156335942

---
Commit 40255434c authored by Martin Wicke<wicke@google.com>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
Deprecate contrib/learn/dataframe. To be removed June 15.

PiperOrigin-RevId: 156333930

---
Commit 7f71b7fbe authored by A. Unique TensorFlower<gardener@tensorflow.org>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
BEGIN_PUBLIC
Automated g4 rollback of changelist 156123287

PiperOrigin-RevId: 156503903
---
 tensorflow/c/generate-pc.sh                   |  63 +++++++
 tensorflow/cc/framework/gradients_test.cc     |   2 +-
 tensorflow/cc/saved_model/loader.cc           |   2 +-
 tensorflow/compiler/aot/codegen.cc            |   2 +-
 tensorflow/compiler/aot/codegen_test_h.golden |   2 +-
 tensorflow/compiler/aot/runtime.cc            |  10 +-
 tensorflow/compiler/tests/BUILD               |  13 ++
 tensorflow/compiler/tests/slice_ops_test.py   | 132 ++++++++++++++
 tensorflow/compiler/tf2xla/BUILD              |   1 +
 .../kernels/gather_op_kernel_float_int32.cc   |   4 +-
 .../kernels/gather_op_kernel_float_int64.cc   |   4 +-
 .../index_ops_kernel_argmax_float_1d.cc       |   4 +-
 .../index_ops_kernel_argmax_float_2d.cc       |   4 +-
 .../tf2xla/kernels/strided_slice_op.cc        |  35 +++-
 tensorflow/compiler/tf2xla/xla_helpers.cc     |   8 +-
 .../tf2xla/xla_local_runtime_context.h        |   2 +-
 tensorflow/compiler/xla/BUILD                 |   5 +-
 tensorflow/compiler/xla/literal_util.cc       |  65 ++++++-
 tensorflow/compiler/xla/literal_util.h        | 168 +++++++----------
 tensorflow/compiler/xla/literal_util_test.cc  |  71 ++++++++
 tensorflow/compiler/xla/primitive_util.cc     |   5 +
 tensorflow/compiler/xla/primitive_util.h      |   6 +
 .../compiler/xla/service/cpu/cpu_runtime.cc   |   1 -
 .../xla/service/cpu/runtime_matmul.cc         |   2 +-
 .../cpu/runtime_single_threaded_matmul.cc     |   2 +-
 .../xla/service/gpu/elemental_ir_emitter.cc   |   2 +-
 .../compiler/xla/service/gpu/ir_emitter.cc    |   2 +-
 .../gpu/llvm_gpu_backend/gpu_backend_lib.cc   |   2 +-
 .../xla/service/gpu/while_transformer.cc      |   2 +-
 .../compiler/xla/service/layout_assignment.cc |   4 +-
 .../compiler/xla/tests/custom_call_test.cc    |  10 +-
 .../compiler/xla/tests/deallocation_test.cc   |   2 +-
 .../compiler/xla/tests/literal_test_util.cc   |   2 +-
 tensorflow/compiler/xla/tests/reduce_test.cc  |   2 +-
 tensorflow/compiler/xla/types.h               |   3 +
 tensorflow/compiler/xla/xla_data.proto        |   1 +
 .../weighted_quantiles_summary_test.cc        |   2 +-
 tensorflow/contrib/cmake/CMakeLists.txt       |   7 +-
 .../contrib/cmake/external/googletest.cmake   |   2 +-
 tensorflow/contrib/cmake/external/grpc.cmake  |   6 +-
 .../contrib/cmake/external/jsoncpp.cmake      |   2 +-
 tensorflow/contrib/cmake/external/png.cmake   |   4 +-
 .../contrib/cmake/external/protobuf.cmake     |   6 +-
 tensorflow/contrib/cmake/external/zlib.cmake  |   3 +-
 tensorflow/contrib/cmake/tf_python.cmake      |   4 +-
 tensorflow/contrib/cmake/tf_tests.cmake       |   1 +
 tensorflow/contrib/factorization/BUILD        |   1 +
 .../contrib/ffmpeg/default/ffmpeg_lib.cc      |   3 +-
 .../keras/api/keras/callbacks/__init__.py     |   1 +
 .../learn/estimators/dynamic_rnn_estimator.py |   4 +-
 .../python/learn/estimators/estimator.py      |  11 +-
 tensorflow/contrib/makefile/tf_op_files.txt   |   1 +
 tensorflow/contrib/opt/BUILD                  |  18 ++
 tensorflow/contrib/opt/__init__.py            |  12 +-
 .../drop_stale_gradient_optimizer_test.py     |   4 +-
 .../opt/python/training/nadam_optimizer.py    |  93 ++++++++++
 .../python/training/nadam_optimizer_test.py   | 159 ++++++++++++++++
 .../rnn/python/ops/core_rnn_cell_impl.py      |  39 +++-
 .../seq2seq/python/ops/beam_search_decoder.py |  12 +-
 tensorflow/contrib/verbs/rdma.cc              |  13 +-
 .../contrib/verbs/rdma_rendezvous_mgr.cc      |  17 +-
 .../contrib/verbs/rdma_rendezvous_mgr.h       |   7 +-
 tensorflow/contrib/verbs/verbs_server_lib.cc  |  14 +-
 tensorflow/core/BUILD                         |   2 +
 .../core/common_runtime/gpu/gpu_util.cc       |   4 +-
 tensorflow/core/distributed_runtime/README.md |   4 +-
 .../distributed_runtime/message_wrappers.cc   |   2 +
 .../costs/measuring_cost_estimator.cc         |   2 +-
 .../core/grappler/costs/robust_stats.cc       |   2 +-
 tensorflow/core/kernels/BUILD                 |  10 +
 .../core/kernels/basic_ops_benchmark_test.cc  |   2 +-
 tensorflow/core/kernels/decode_bmp_op.cc      | 143 +++++++++++++++
 tensorflow/core/kernels/deep_conv2d.cc        |   2 +-
 tensorflow/core/kernels/depthwise_conv_op.cc  |   2 +
 tensorflow/core/kernels/fft_ops.cc            | 125 +++++++++++--
 .../kernels/hexagon/graph_transfer_utils.cc   |   6 +-
 .../core/kernels/non_max_suppression_op.cc    | 138 +++++++++-----
 .../kernels/non_max_suppression_op_test.cc    | 163 +++++++++++++++++
 .../remote_fused_graph_execute_op_test.cc     |   4 +-
 tensorflow/core/kernels/training_ops.cc       |  28 ++-
 tensorflow/core/kernels/training_ops.h        |   2 +-
 .../core/kernels/training_ops_gpu.cu.cc       |  26 ++-
 tensorflow/core/lib/bmp/testdata/lena.bmp     | Bin 0 -> 4194 bytes
 .../core/lib/gtl/inlined_vector_test.cc       |   2 +-
 tensorflow/core/ops/image_ops.cc              |  67 ++++++-
 tensorflow/core/ops/sdca_ops.cc               |   2 +-
 tensorflow/core/ops/training_ops.cc           |  12 +-
 .../platform/cloud/google_auth_provider.cc    |   2 +-
 tensorflow/core/public/version.h              |   3 +-
 tensorflow/docs_src/extend/adding_an_op.md    |   4 +-
 tensorflow/docs_src/performance/benchmarks.md |   4 +-
 .../performance/performance_models.md         |  14 +-
 tensorflow/docs_src/tutorials/word2vec.md     |  14 +-
 tensorflow/examples/android/README.md         |   6 +-
 tensorflow/examples/label_image/BUILD         |  32 +++-
 tensorflow/examples/label_image/main.cc       |  10 +-
 .../src/main/java/org/tensorflow/Graph.java   |   2 +-
 .../java/org/tensorflow/OperationBuilder.java |  25 +++
 .../src/main/native/operation_builder_jni.cc  |  14 ++
 .../src/main/native/operation_builder_jni.h   |   8 +
 .../org/tensorflow/OperationBuilderTest.java  |  27 +++
 tensorflow/python/estimator/estimator.py      |  18 +-
 tensorflow/python/estimator/estimator_test.py |  12 ++
 tensorflow/python/framework/tensor_shape.py   |   3 +
 tensorflow/python/framework/tensor_util.py    |   8 +-
 tensorflow/python/kernel_tests/BUILD          |  13 ++
 .../python/kernel_tests/decode_bmp_op_test.py | 116 ++++++++++++
 .../kernel_tests/decode_image_op_test.py      |  11 ++
 .../python/kernel_tests/fft_ops_test.py       | 172 +++++++++---------
 tensorflow/python/ops/array_grad.py           |   8 +-
 tensorflow/python/ops/image_ops.py            |   1 +
 tensorflow/python/ops/image_ops_impl.py       |  48 +++--
 tensorflow/python/ops/nn_ops.py               |   3 +-
 tensorflow/python/ops/sparse_ops.py           |   2 +-
 tensorflow/python/training/momentum.py        |   7 +-
 .../tools/api/golden/tensorflow.image.pbtxt   |   4 +
 tensorflow/tools/docker/Dockerfile.devel      |  14 +-
 tensorflow/tools/docker/Dockerfile.devel-gpu  |  14 +-
 tensorflow/tools/graph_transforms/README.md   |   7 +-
 .../graph_transforms/summarize_graph_main.cc  |   1 -
 .../proto_text/gen_proto_text_functions.cc    |   1 +
 .../tools/quantization/quantize_graph_test.py |   4 +-
 third_party/grpc.BUILD                        |   2 -
 123 files changed, 1973 insertions(+), 502 deletions(-)
 create mode 100755 tensorflow/c/generate-pc.sh
 create mode 100644 tensorflow/compiler/tests/slice_ops_test.py
 create mode 100644 tensorflow/contrib/opt/python/training/nadam_optimizer.py
 create mode 100644 tensorflow/contrib/opt/python/training/nadam_optimizer_test.py
 create mode 100644 tensorflow/core/kernels/decode_bmp_op.cc
 create mode 100644 tensorflow/core/lib/bmp/testdata/lena.bmp
 create mode 100644 tensorflow/python/kernel_tests/decode_bmp_op_test.py

diff --git a/tensorflow/c/generate-pc.sh b/tensorflow/c/generate-pc.sh
new file mode 100755
index 0000000000..40b3a60be9
--- /dev/null
+++ b/tensorflow/c/generate-pc.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+TF_PREFIX='/usr/local'
+
+usage() {
+    echo "Usage: $0 OPTIONS"
+    echo -e "-p, --prefix\tset installation prefix (default: /usr/local)"
+    echo -e "-v, --version\tset TensorFlow version"
+    echo -e "-h, --help\tdisplay this message"
+}
+
+# read the options
+ARGS=`getopt -o p:v:h --long prefix:,version:,help -n $0 -- "$@"`
+eval set -- "$ARGS"
+
+# extract options and their arguments into variables.
+while true ; do
+    case "$1" in
+        -h|--help) usage ; exit ;;
+        -p|--prefix)
+            case "$2" in
+                "") shift 2 ;;
+                *) TF_PREFIX=$2 ; shift 2 ;;
+            esac ;;
+        -v|--version)
+            case "$2" in
+                "") shift 2 ;;
+                *) TF_VERSION=$2 ; shift 2 ;;
+            esac ;;
+        --) shift ; echo "Try '$0 --help' for more information."; exit 1 ;;
+        *) echo "Internal error! Try '$0 --help' for more information." ; exit 1 ;;
+    esac
+done
+
+echo "Generating pkgconfig file for TensorFlow $TF_VERSION in $TF_PREFIX"
+
+cat << EOF > tensorflow.pc
+prefix=${TF_PREFIX}
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: TensorFlow
+Version: ${TF_VERSION}
+Description: Library for computation using data flow graphs for scalable machine learning
+Requires:
+Libs: -L\${libdir} -ltensorflow
+Cflags: -I\${includedir}
+EOF
diff --git a/tensorflow/cc/framework/gradients_test.cc b/tensorflow/cc/framework/gradients_test.cc
index 7783bdce3a..6a24982581 100644
--- a/tensorflow/cc/framework/gradients_test.cc
+++ b/tensorflow/cc/framework/gradients_test.cc
@@ -260,7 +260,7 @@ TEST_F(GradientsTest, StackUnstack_StopBackprop) {
 }
 
 TEST_F(GradientsTest, DependentGradOutputs) {
-  // Tests that dependant gradients (in this case the gradients w.r.t to the
+  // Tests that dependent gradients (in this case the gradients w.r.t to the
   // output and one input of MatMul) are computed properly.
 
   // Create two chained MatMul ops.
diff --git a/tensorflow/cc/saved_model/loader.cc b/tensorflow/cc/saved_model/loader.cc
index b144bfc33e..908aa01a34 100644
--- a/tensorflow/cc/saved_model/loader.cc
+++ b/tensorflow/cc/saved_model/loader.cc
@@ -36,7 +36,7 @@ auto* load_attempt_count = monitoring::Counter<2>::New(
     "status");
 auto* load_latency = monitoring::Counter<1>::New(
     "/tensorflow/cc/saved_model/load_latency",
-    "Latency in microseconds for SavedModels that were succesfully loaded.",
+    "Latency in microseconds for SavedModels that were successfully loaded.",
     "model_path");
 constexpr char kLoadAttemptFail[] = "fail";
 constexpr char kLoadAttemptSuccess[] = "success";
diff --git a/tensorflow/compiler/aot/codegen.cc b/tensorflow/compiler/aot/codegen.cc
index a53e82d34b..bbdb342a62 100644
--- a/tensorflow/compiler/aot/codegen.cc
+++ b/tensorflow/compiler/aot/codegen.cc
@@ -365,7 +365,7 @@ Status GenerateHeader(const HeaderOpts& opts, const Config& config,
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
-namespace Eigen { class ThreadPoolDevice; }
+namespace Eigen { struct ThreadPoolDevice; }
 
 // (Implementation detail) Entry point to the function in the object file.
 extern "C" void {{ENTRY}}(
diff --git a/tensorflow/compiler/aot/codegen_test_h.golden b/tensorflow/compiler/aot/codegen_test_h.golden
index 46d7c03006..01963c6df4 100644
--- a/tensorflow/compiler/aot/codegen_test_h.golden
+++ b/tensorflow/compiler/aot/codegen_test_h.golden
@@ -15,7 +15,7 @@
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
-namespace Eigen { class ThreadPoolDevice; }
+namespace Eigen { struct ThreadPoolDevice; }
 
 // (Implementation detail) Entry point to the function in the object file.
 extern "C" void entry_point(
diff --git a/tensorflow/compiler/aot/runtime.cc b/tensorflow/compiler/aot/runtime.cc
index 208de5498d..5772776666 100644
--- a/tensorflow/compiler/aot/runtime.cc
+++ b/tensorflow/compiler/aot/runtime.cc
@@ -31,6 +31,8 @@ namespace {
 inline void* aligned_malloc(size_t size, int minimum_alignment) {
 #if defined(__ANDROID__) || defined(OS_ANDROID) || defined(OS_CYGWIN)
   return memalign(minimum_alignment, size);
+#elif defined(COMPILER_MSVC)
+  return _aligned_malloc(size, minimum_alignment);
 #else  // !__ANDROID__ && !OS_ANDROID && !OS_CYGWIN
   void* ptr = nullptr;
   // posix_memalign requires that the requested alignment be at least
@@ -45,7 +47,13 @@ inline void* aligned_malloc(size_t size, int minimum_alignment) {
 #endif
 }
 
-inline void aligned_free(void* aligned_memory) { free(aligned_memory); }
+inline void aligned_free(void* aligned_memory) {
+#if defined(COMPILER_MSVC)
+  _aligned_free(aligned_memory);
+#else
+  free(aligned_memory);
+#endif
+}
 
 size_t align_to(size_t n, size_t align) {
   return (((n - 1) / align) + 1) * align;
diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD
index 4fd68a94a5..19f7ff8354 100644
--- a/tensorflow/compiler/tests/BUILD
+++ b/tensorflow/compiler/tests/BUILD
@@ -170,6 +170,19 @@ tf_xla_py_test(
     ],
 )
 
+tf_xla_py_test(
+    name = "slice_ops_test",
+    size = "small",
+    srcs = ["slice_ops_test.py"],
+    deps = [
+        ":xla_test",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:data_flow_ops",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
 tf_xla_py_test(
     name = "function_test",
     size = "small",
diff --git a/tensorflow/compiler/tests/slice_ops_test.py b/tensorflow/compiler/tests/slice_ops_test.py
new file mode 100644
index 0000000000..de91b7b425
--- /dev/null
+++ b/tensorflow/compiler/tests/slice_ops_test.py
@@ -0,0 +1,132 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for slicing."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.compiler.tests.xla_test import XLATestCase
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.platform import googletest
+
+
+class SliceTest(XLATestCase):
+
+  def test1D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[10])
+        with self.test_scope():
+          o = array_ops.slice(i, [2], [4])
+        params = {
+            i: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([2, 3, 4, 5], result)
+
+  def test3D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[3, 3, 10])
+        with self.test_scope():
+          o = array_ops.slice(i, [1, 2, 2], [1, 1, 4])
+        params = {
+            i: [[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9], [9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+                 [5, 3, 1, 7, 9, 2, 4, 6, 8, 0]],
+                [[5, 5, 5, 5, 5, 5, 5, 5, 5, 5], [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+                 [8, 7, 6, 5, 4, 3, 2, 1, 8, 7]],
+                [[7, 5, 7, 5, 7, 5, 7, 5, 7, 5], [1, 2, 1, 2, 1, 2, 1, 2, 1, 2],
+                 [9, 8, 7, 9, 8, 7, 9, 8, 7, 9]]]
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([[[6, 5, 4, 3]]], result)
+
+
+class StridedSliceTest(XLATestCase):
+
+  def test1D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [2], [6], [2])
+        params = {
+            i: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([2, 4], result)
+
+  def test1DNegtiveStride(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [6], [2], [-2])
+        params = {
+            i: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([6, 4], result)
+
+  def test3D(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[3, 3, 10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [0, 2, 2], [2, 3, 6], [1, 1, 2])
+        params = {
+            i: [[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9], [9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+                 [5, 3, 1, 7, 9, 2, 4, 6, 8, 0]],
+                [[5, 5, 5, 5, 5, 5, 5, 5, 5, 5], [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+                 [8, 7, 6, 5, 4, 3, 2, 1, 8, 7]],
+                [[7, 5, 7, 5, 7, 5, 7, 5, 7, 5], [1, 2, 1, 2, 1, 2, 1, 2, 1, 2],
+                 [9, 8, 7, 9, 8, 7, 9, 8, 7, 9]]]
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([[[1, 9]], [[6, 4]]], result)
+
+  def test3DNegativeStride(self):
+    for dtype in self.numeric_types:
+      with self.test_session():
+        i = array_ops.placeholder(dtype, shape=[3, 4, 10])
+        with self.test_scope():
+          o = array_ops.strided_slice(i, [2, 2, 6], [0, 0, 2], [-1, -1, -2])
+        params = {
+            i: [[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9], [9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+                 [5, 3, 1, 7, 9, 2, 4, 6, 8, 0], [4, 5, 2, 4, 3, 7, 6, 8, 9,
+                                                  4]],
+                [[5, 5, 5, 5, 5, 5, 5, 5, 5, 5], [4, 3, 4, 5, 7, 6, 5, 3, 4, 5],
+                 [8, 7, 6, 5, 4, 3, 2, 1, 8, 7], [7, 1, 7, 1, 8, 1, 8, 1, 3,
+                                                  1]],
+                [[7, 5, 7, 5, 7, 5, 7, 5, 7, 5], [1, 2, 1, 2, 1, 2, 1, 2, 1, 2],
+                 [9, 8, 7, 9, 8, 7, 9, 8, 7, 9], [9, 9, 5, 5, 6, 6, 3, 3, 6,
+                                                  6]]]
+        }
+        result = o.eval(feed_dict=params)
+
+        self.assertAllEqual([[[9, 8], [1, 1]], [[2, 4], [5, 7]]], result)
+
+
+if __name__ == "__main__":
+  googletest.main()
diff --git a/tensorflow/compiler/tf2xla/BUILD b/tensorflow/compiler/tf2xla/BUILD
index 7a18c1e375..12537b9765 100644
--- a/tensorflow/compiler/tf2xla/BUILD
+++ b/tensorflow/compiler/tf2xla/BUILD
@@ -45,6 +45,7 @@ cc_library(
         "//tensorflow/compiler/xla:literal_util",
         "//tensorflow/compiler/xla:shape_util",
         "//tensorflow/compiler/xla:statusor",
+        "//tensorflow/compiler/xla:types",
         "//tensorflow/compiler/xla:xla_data_proto",
         "//tensorflow/compiler/xla/client:client_library",
         "//tensorflow/compiler/xla/client:computation",
diff --git a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc
index eff23bd77d..691a0b972d 100644
--- a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc
+++ b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int32.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/kernels/gather_functor.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 
 namespace tensorflow {
 
@@ -63,7 +64,6 @@ EIGEN_STRONG_INLINE void gather_float_int32_xla_impl(float* out, void** data) {
 
 // Implements gather on CPU. This is called by an XLA custom call, set up by
 // gather_op.cc.
-extern "C" void __attribute__((visibility("default")))
-gather_float_int32_xla_impl(float* out, void** data) {
+extern "C" void TF_EXPORT gather_float_int32_xla_impl(float* out, void** data) {
   tensorflow::gather_float_int32_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc
index ae31f6f200..3dff6e2737 100644
--- a/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc
+++ b/tensorflow/compiler/tf2xla/kernels/gather_op_kernel_float_int64.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/kernels/gather_functor.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 
 namespace tensorflow {
 
@@ -63,7 +64,6 @@ EIGEN_STRONG_INLINE void gather_float_int64_xla_impl(float* out, void** data) {
 
 // Implements gather on CPU. This is called by an XLA custom call, set up by
 // gather_op.cc.
-extern "C" void __attribute__((visibility("default")))
-gather_float_int64_xla_impl(float* out, void** data) {
+extern "C" void TF_EXPORT gather_float_int64_xla_impl(float* out, void** data) {
   tensorflow::gather_float_int64_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc
index 0033a949a3..afbd64ca50 100644
--- a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc
+++ b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_1d.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -43,7 +44,6 @@ EIGEN_STRONG_INLINE void argmax_float_1d_xla_impl(void* out, void** data) {
 
 // Implements argmax on CPU. This is called by an XLA custom call, set up by
 // index_ops.cc.
-extern "C" void __attribute__((visibility("default")))
-argmax_float_1d_xla_impl(void* out, void** data) {
+extern "C" void TF_EXPORT argmax_float_1d_xla_impl(void* out, void** data) {
   tensorflow::argmax_float_1d_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc
index be8ad2317c..841ff2f4df 100644
--- a/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc
+++ b/tensorflow/compiler/tf2xla/kernels/index_ops_kernel_argmax_float_2d.cc
@@ -18,6 +18,7 @@ limitations under the License.
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
@@ -45,7 +46,6 @@ EIGEN_STRONG_INLINE void argmax_float_2d_xla_impl(void* out, void** data) {
 
 // Implements argmax on CPU. This is called by an XLA custom call, set up by
 // index_ops.cc.
-extern "C" void __attribute__((visibility("default")))
-argmax_float_2d_xla_impl(void* out, void** data) {
+extern "C" void TF_EXPORT argmax_float_2d_xla_impl(void* out, void** data) {
   tensorflow::argmax_float_2d_xla_impl(out, data);
 }
diff --git a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
index 211412d463..a6cac62ca4 100644
--- a/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
+++ b/tensorflow/compiler/tf2xla/kernels/strided_slice_op.cc
@@ -77,11 +77,9 @@ class StridedSliceOp : public XlaOpKernel {
 
     gtl::InlinedVector<int64, 4> dimensions_to_reverse;
     gtl::InlinedVector<int64, 4> slice_begin, slice_end;
+    bool simple_strides = true;
     for (int i = 0; i < begin.size(); ++i) {
-      // TODO(phawkins): implement strides != 1 when b/30878775 is fixed.
-      OP_REQUIRES(
-          ctx, strides[i] == 1 || strides[i] == -1,
-          errors::Unimplemented("Strides != 1 or -1 are not yet implemented"));
+      simple_strides &= (std::abs(strides[i]) == 1);
       if (strides[i] > 0) {
         slice_begin.push_back(begin[i]);
         slice_end.push_back(end[i]);
@@ -99,6 +97,35 @@ class StridedSliceOp : public XlaOpKernel {
       slice = ctx->builder()->Rev(slice, dimensions_to_reverse);
     }
 
+    // If at least one of the strides is > 1 (or < -1) then use Slice
+    // to pull out each of the strided slices, and Concat to put them
+    // together again.
+    if (!simple_strides) {
+      // Re-adjust the begin and end now that the periphery has been
+      // sliced away.
+      for (int d = 0; d < strides.size(); ++d) {
+        slice_end[d] -= slice_begin[d];
+        slice_begin[d] = 0;
+      }
+
+      for (int d = 0; d < strides.size(); ++d) {
+        int64 stride = std::abs(strides[d]);
+        if (stride > 1) {
+          std::vector<xla::ComputationDataHandle> to_concat;
+          int64 end = slice_end[d];
+          for (int64 i = 0; i < end; i += stride) {
+            slice_begin[d] = i;
+            slice_end[d] = i + 1;
+            to_concat.push_back(
+                ctx->builder()->Slice(slice, slice_begin, slice_end));
+          }
+          slice = ctx->builder()->ConcatInDim(to_concat, d);
+          slice_begin[d] = 0;
+          slice_end[d] = to_concat.size();
+        }
+      }
+    }
+
     slice = ctx->builder()->Reshape(slice, final_shape.dim_sizes());
     ctx->SetOutput(0, slice);
   }
diff --git a/tensorflow/compiler/tf2xla/xla_helpers.cc b/tensorflow/compiler/tf2xla/xla_helpers.cc
index 10d8b67bbd..f060f8f2f1 100644
--- a/tensorflow/compiler/tf2xla/xla_helpers.cc
+++ b/tensorflow/compiler/tf2xla/xla_helpers.cc
@@ -20,6 +20,7 @@ limitations under the License.
 #include "tensorflow/compiler/tf2xla/type_util.h"
 #include "tensorflow/compiler/tf2xla/xla_context.h"
 #include "tensorflow/compiler/xla/client/computation_builder.h"
+#include "tensorflow/compiler/xla/types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
 
@@ -89,7 +90,9 @@ xla::ComputationDataHandle XlaHelpers::IntegerLiteral(
     case xla::U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case xla::F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      literal =
+          *xla::LiteralUtil::CreateR0<xla::half>(static_cast<xla::half>(value));
+      break;
     case xla::TUPLE:
       LOG(FATAL) << "tuple element type is not integral";
     case xla::OPAQUE:
@@ -107,6 +110,9 @@ xla::ComputationDataHandle XlaHelpers::FloatLiteral(xla::ComputationBuilder* b,
   xla::PrimitiveType type;
   TF_CHECK_OK(DataTypeToPrimitiveType(data_type, &type));
   switch (type) {
+    case xla::F16:
+      return b->ConstantR0<xla::half>(static_cast<xla::half>(value));
+      break;
     case xla::F32:
       return b->ConstantR0<float>(static_cast<float>(value));
       break;
diff --git a/tensorflow/compiler/tf2xla/xla_local_runtime_context.h b/tensorflow/compiler/tf2xla/xla_local_runtime_context.h
index cd773d64ed..dca420d6ee 100644
--- a/tensorflow/compiler/tf2xla/xla_local_runtime_context.h
+++ b/tensorflow/compiler/tf2xla/xla_local_runtime_context.h
@@ -23,7 +23,7 @@ limitations under the License.
 // actually used.  E.g. some ahead-of-time compiled computations don't need a
 // thread pool.
 namespace Eigen {
-class ThreadPoolDevice;
+struct ThreadPoolDevice;
 }
 
 namespace tensorflow {
diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD
index de09d4b23f..96685919e9 100644
--- a/tensorflow/compiler/xla/BUILD
+++ b/tensorflow/compiler/xla/BUILD
@@ -59,7 +59,10 @@ cc_library(
     name = "types",
     hdrs = ["types.h"],
     visibility = [":friends"],
-    deps = ["//tensorflow/core:lib"],
+    deps = [
+        "//tensorflow/core:lib",
+        "//third_party/eigen3",
+    ],
 )
 
 cc_library(
diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index e3bc856fc0..ec4012a703 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -148,6 +148,9 @@ template <typename T>
     case S64:
       return CopyRange<int64>(src_literal, src_base, dest_literal, dest_base,
                               copy_size);
+    case F16:
+      return CopyRange<half>(src_literal, src_base, dest_literal, dest_base,
+                             copy_size);
     case F32:
       return CopyRange<float>(src_literal, src_base, dest_literal, dest_base,
                               copy_size);
@@ -178,6 +181,8 @@ template <typename T>
       return *LiteralUtil::CreateR0<int32>(0);
     case S64:
       return *LiteralUtil::CreateR0<int64>(0);
+    case F16:
+      return *LiteralUtil::CreateR0<half>(static_cast<half>(0.0f));
     case F32:
       return *LiteralUtil::CreateR0<float>(0);
     case F64:
@@ -187,8 +192,6 @@ template <typename T>
     case S16:
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
-    case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
     case TUPLE:
       LOG(FATAL) << "tuple element type cannot take on value of 0";
     case OPAQUE:
@@ -222,7 +225,7 @@ template <typename T>
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      return *LiteralUtil::CreateR0<half>(static_cast<half>(1.0f));
     case TUPLE:
       LOG(FATAL) << "tuple element type cannot take on value of 1";
     case OPAQUE:
@@ -258,7 +261,8 @@ template <typename T>
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      return *LiteralUtil::CreateR0<half>(
+          static_cast<half>(-std::numeric_limits<float>::infinity()));
     case TUPLE:
       LOG(FATAL) << "tuple element type has no minimum value";
     case OPAQUE:
@@ -294,7 +298,8 @@ template <typename T>
     case U16:
       LOG(FATAL) << "u16/s16 literals not yet implemented";
     case F16:
-      LOG(FATAL) << "f16 literals not yet implemented";
+      return *LiteralUtil::CreateR0<half>(
+          static_cast<half>(std::numeric_limits<float>::infinity()));
     case TUPLE:
       LOG(FATAL) << "tuple element type has no maximum value";
     case OPAQUE:
@@ -498,6 +503,8 @@ template <typename T>
       return tensorflow::strings::StrCat(Get<float>(literal, multi_index));
     case F64:
       return tensorflow::strings::StrCat(Get<double>(literal, multi_index));
+    case F16:
+      return tensorflow::strings::StrCat(Get<half>(literal, multi_index));
     default:
       return tensorflow::strings::StrCat(
           "[", PrimitiveType_Name(literal.shape().element_type()), "]");
@@ -652,6 +659,8 @@ template <typename T>
       return reinterpret_cast<const void*>(literal.f32s().data());
     case F64:
       return reinterpret_cast<const void*>(literal.f64s().data());
+    case F16:
+      return reinterpret_cast<const void*>(literal.f16s().data());
     default:
       LOG(FATAL) << "primitive type not supported in literals: "
                  << PrimitiveType_Name(literal.shape().element_type());
@@ -692,6 +701,9 @@ template <typename T>
     case F64:
       Resize<double>(num_elements, 0, literal);
       break;
+    case F16:
+      Resize<half>(num_elements, static_cast<half>(0.0f), literal);
+      break;
     default:
       LOG(FATAL) << "primitive type not supported in literals: "
                  << PrimitiveType_Name(literal->shape().element_type());
@@ -728,6 +740,9 @@ template <typename T>
     case F64:
       actual = literal.f64s_size();
       break;
+    case F16:
+      actual = literal.f16s().size() / sizeof(half);
+      break;
     default:
       return tensorflow::errors::Unimplemented(
           "unhandled element type for literal validation: " +
@@ -818,6 +833,8 @@ bool EqualElements(const Literal& literal1, const Literal& literal2,
         return EqualElements<float>(literal1, literal2, 0, &multi_index);
       case F64:
         return EqualElements<double>(literal1, literal2, 0, &multi_index);
+      case F16:
+        return EqualElements<half>(literal1, literal2, 0, &multi_index);
       default:
         LOG(FATAL) << "Unimplemented: LiteralUtil::Equal for type "
                    << PrimitiveType_Name(literal1.shape().element_type());
@@ -916,6 +933,18 @@ LiteralUtil::GetMutableArraySlice(Literal* literal) {
                                                     values->size());
 }
 
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<half>
+LiteralUtil::GetMutableArraySlice<half>(Literal* literal) {
+  // C++11 standard, basic_string 21.4.1.5, values should be stored
+  // contiguously. From C++17 a mutable data() member will be provided.
+  // TODO - there is an endianess problem here. fix it, or wait for uint16
+  //        support in protobuf
+  auto values = literal->mutable_f16s();
+  return tensorflow::gtl::MutableArraySlice<half>(
+      reinterpret_cast<half*>(&(*values)[0]), values->size() / sizeof(half));
+}
+
 template <>
 /* static */ tensorflow::gtl::ArraySlice<bool> LiteralUtil::GetArraySlice<bool>(
     const Literal& literal) {
@@ -976,6 +1005,15 @@ LiteralUtil::GetArraySlice<double>(const Literal& literal) {
   return literal.f64s();
 }
 
+template <>
+/* static */ tensorflow::gtl::ArraySlice<half> LiteralUtil::GetArraySlice<half>(
+    const Literal& literal) {
+  CHECK_EQ(literal.shape().element_type(), F16);
+  return tensorflow::gtl::ArraySlice<half>(
+      reinterpret_cast<const half*>(literal.f16s().data()),
+      literal.f16s().size() / sizeof(half));
+}
+
 template <typename NativeT>
 static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
   for (int64 i = 0; i < ShapeUtil::ElementsIn(literal.shape()); ++i) {
@@ -1015,6 +1053,8 @@ static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
       return AllElementsEqualValue<float>(literal, value);
     case F64:
       return AllElementsEqualValue<double>(literal, value);
+    case F16:
+      return AllElementsEqualValue<half>(literal, static_cast<half>(value));
     case PRED:
       if (value == 0) {
         return AllElementsEqualValue<bool>(literal, false);
@@ -1034,6 +1074,8 @@ static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
       return AllElementsEqualValue<float>(literal, value);
     case F64:
       return AllElementsEqualValue<double>(literal, value);
+    case F16:
+      return AllElementsEqualValue<half>(literal, static_cast<half>(value));
     default:
       return false;
   }
@@ -1058,6 +1100,8 @@ static bool AllElementsEqualValue(const Literal& literal, NativeT value) {
       return Get<float>(literal, indices) == 0.0f;
     case F64:
       return Get<double>(literal, indices) == 0.0;
+    case F16:
+      return Get<half>(literal, indices) == static_cast<half>(0.0f);
     case PRED:
       return Get<bool>(literal, indices) == false;
     default:
@@ -1128,4 +1172,15 @@ template <>
   literal->mutable_f64s()->Resize(num_elements, value);
 }
 
+template <>
+/* static */ void LiteralUtil::Resize<half>(int64 num_elements, half value,
+                                            Literal* literal) {
+  CHECK_EQ(ShapeUtil::ElementsIn(literal->shape()), num_elements);
+  literal->mutable_f16s()->resize(num_elements * sizeof(half));
+  auto data = GetMutableArraySlice<half>(literal);
+  for (int i = 0; i < num_elements; i++) {
+    data[i] = value;
+  }
+}
+
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index 0ea7186040..a05dc968ee 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -505,6 +505,10 @@ template <>
 /* static */ tensorflow::gtl::ArraySlice<double>
 LiteralUtil::GetArraySlice<double>(const Literal& literal);
 
+template <>
+/* static */ tensorflow::gtl::ArraySlice<half> LiteralUtil::GetArraySlice<half>(
+    const Literal& literal);
+
 template <>
 /* static */ tensorflow::gtl::MutableArraySlice<bool>
 LiteralUtil::GetMutableArraySlice(Literal* literal);
@@ -541,6 +545,50 @@ template <>
 /* static */ tensorflow::gtl::MutableArraySlice<double>
 LiteralUtil::GetMutableArraySlice(Literal* literal);
 
+template <>
+/* static */ tensorflow::gtl::MutableArraySlice<half>
+LiteralUtil::GetMutableArraySlice(Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<bool>(int64 num_elements, bool value,
+                                            Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int8>(int64 num_elements, int8 value,
+                                            Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int32>(int64 num_elements, int32 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint32>(int64 num_elements, uint32 value,
+                                              Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<int64>(int64 num_elements, int64 value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<uint64>(int64 num_elements, uint64 value,
+                                              Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<float>(int64 num_elements, float value,
+                                             Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<double>(int64 num_elements, double value,
+                                              Literal* literal);
+
+template <>
+/* static */ void LiteralUtil::Resize<half>(int64 num_elements, half value,
+                                            Literal* literal);
+
 template <typename NativeT>
 /* static */ std::unique_ptr<Literal> LiteralUtil::CreateR0(NativeT value) {
   auto literal = MakeUnique<Literal>();
@@ -770,6 +818,14 @@ template <>
   return literal.u8s()[linear_index];
 }
 
+template <>
+/* static */ inline half LiteralUtil::Get<half>(
+    const Literal& literal, tensorflow::gtl::ArraySlice<int64> multi_index) {
+  CHECK(literal.shape().element_type() == F16);
+  int64 linear_index = LinearIndex(literal, multi_index);
+  return GetArraySlice<half>(literal)[linear_index];
+}
+
 template <typename NativeT>
 /* static */ void LiteralUtil::Set(
     Literal* literal, tensorflow::gtl::ArraySlice<int64> multi_index,
@@ -834,76 +890,12 @@ template <typename NativeT>
   } while (IndexUtil::BumpIndices(literal.shape(), &indices));
 }
 
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<bool>(bool value,
-                                                       Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<bool>(), {});
-  literal->mutable_preds()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<uint8>(uint8 value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<uint8>(), {});
-  literal->mutable_u8s()->push_back(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<int8>(int8 value,
-                                                       Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<int8>(), {});
-  literal->mutable_u8s()->push_back(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<uint32>(uint32 value,
-                                                         Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<uint32>(), {});
-  literal->mutable_u32s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<int32>(int32 value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<int32>(), {});
-  literal->mutable_s32s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<uint64>(uint64 value,
-                                                         Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<uint64>(), {});
-  literal->mutable_u64s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<int64>(int64 value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<int64>(), {});
-  literal->mutable_s64s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<float>(float value,
-                                                        Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<float>(), {});
-  literal->mutable_f32s()->Add(value);
-}
-
-template <>
-/* static */ inline void LiteralUtil::PopulateR0<double>(double value,
-                                                         Literal* literal) {
-  *literal->mutable_shape() =
-      ShapeUtil::MakeShape(primitive_util::NativeToPrimitiveType<double>(), {});
-  literal->mutable_f64s()->Add(value);
+template <typename NativeT>
+/* static */ inline void LiteralUtil::PopulateR0(NativeT value,
+                                                 Literal* literal) {
+  *literal->mutable_shape() = ShapeUtil::MakeShape(
+      primitive_util::NativeToPrimitiveType<NativeT>(), {});
+  Resize<NativeT>(1, value, literal);
 }
 
 template <typename NativeT>
@@ -1116,42 +1108,6 @@ template <typename NativeSrcT, typename NativeDestT>
   return result_literal;
 }
 
-template <>
-/* static */ void LiteralUtil::Resize<bool>(int64 num_elements, bool value,
-                                            Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<int8>(int64 num_elements, int8 value,
-                                            Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<uint8>(int64 num_elements, uint8 value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<int32>(int64 num_elements, int32 value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<uint32>(int64 num_elements, uint32 value,
-                                              Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<int64>(int64 num_elements, int64 value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<uint64>(int64 num_elements, uint64 value,
-                                              Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<float>(int64 num_elements, float value,
-                                             Literal* literal);
-
-template <>
-/* static */ void LiteralUtil::Resize<double>(int64 num_elements, double value,
-                                              Literal* literal);
-
 template <typename NativeT>
 /* static */ std::unique_ptr<Literal>
 LiteralUtil::CreateFullWithMonotonicDim0MajorLayout(
diff --git a/tensorflow/compiler/xla/literal_util_test.cc b/tensorflow/compiler/xla/literal_util_test.cc
index 7acb9933da..9a09822174 100644
--- a/tensorflow/compiler/xla/literal_util_test.cc
+++ b/tensorflow/compiler/xla/literal_util_test.cc
@@ -105,6 +105,9 @@ TEST_F(LiteralUtilTest, LiteralScalarToString) {
 
   auto f32_lit = LiteralUtil::CreateR0<float>(3.14f);
   ASSERT_EQ("3.14", LiteralUtil::ToString(*f32_lit));
+
+  auto f16_lit = LiteralUtil::CreateR0<half>(static_cast<half>(0.5f));
+  ASSERT_EQ("0.5", LiteralUtil::ToString(*f16_lit));
 }
 
 TEST_F(LiteralUtilTest, LiteralVectorToString) {
@@ -373,6 +376,15 @@ TEST_F(LiteralUtilTest, IsAll) {
   EXPECT_FALSE(
       LiteralUtil::IsAll(*LiteralUtil::CreateR2<uint64>({{9, 8}, {8, 8}}), 8));
 
+  half h8(8.0f);
+  half h9(9.0f);
+  EXPECT_TRUE(
+      LiteralUtil::IsAll(*LiteralUtil::CreateR2<half>({{h8}, {h8}}), 8));
+  EXPECT_FALSE(
+      LiteralUtil::IsAll(*LiteralUtil::CreateR2<half>({{h8}, {h9}}), 8));
+  EXPECT_FALSE(
+      LiteralUtil::IsAll(*LiteralUtil::CreateR2<half>({{h9}, {h8}}), 8));
+
   auto uint64_max = std::numeric_limits<uint64>::max();
   EXPECT_FALSE(LiteralUtil::IsAll(
       *LiteralUtil::CreateR2<uint64>(
@@ -659,6 +671,30 @@ TEST_F(LiteralUtilTest, PopulateWithValueR2U64) {
   EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
 }
 
+TEST_F(LiteralUtilTest, PopulateWithValueR0F16) {
+  Literal output;
+  half h(0.25f);
+  LiteralUtil::PopulateWithValue<half>(h, {}, &output);
+  auto expected = LiteralUtil::CreateR0<half>(h);
+  EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
+}
+
+TEST_F(LiteralUtilTest, PopulateWithValueR1F16) {
+  Literal output;
+  half h(0.5f);
+  LiteralUtil::PopulateWithValue<half>(h, {3}, &output);
+  auto expected = LiteralUtil::CreateR1<half>({h, h, h});
+  EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
+}
+
+TEST_F(LiteralUtilTest, PopulateWithValueR2F16) {
+  Literal output;
+  half h(2.0f);
+  LiteralUtil::PopulateWithValue<half>(h, {2, 2}, &output);
+  auto expected = LiteralUtil::CreateR2<half>({{h, h}, {h, h}});
+  EXPECT_TRUE(LiteralUtil::Equal(output, *expected));
+}
+
 TEST_F(LiteralUtilTest, ReplicateR2U32) {
   auto input = LiteralUtil::CreateR2<uint32>(
       {{1, 2, 3, 4}, {5, 6, 7, 8}, {9, 10, 11, 12}});
@@ -730,6 +766,41 @@ TEST_F(LiteralUtilTest, CopyScalars) {
   EXPECT_EQ(LiteralUtil::Get<uint32>(*vect, {4}), 17);
 }
 
+TEST_F(LiteralUtilTest, F16) {
+  // Verify that the internal data views are consistent and that they
+  // are in little endian format
+  // TODO - modify if we make the data format machine endianess dependent
+  auto m1 = LiteralUtil::CreateFromShape(ShapeUtil::MakeShape(F16, {2, 2}));
+  Literal* l1 = m1.get();
+  const char* d1 = (const char*)LiteralUtil::InternalData(*l1);
+  EXPECT_EQ(d1[0], 0);
+  EXPECT_EQ(d1[1], 0);
+  EXPECT_EQ(d1[2], 0);
+  EXPECT_EQ(d1[3], 0);
+  EXPECT_EQ(d1[4], 0);
+  EXPECT_EQ(d1[5], 0);
+  EXPECT_EQ(d1[6], 0);
+  EXPECT_EQ(d1[7], 0);
+  EXPECT_EQ(LiteralUtil::InternalData(*l1),
+            LiteralUtil::MutableInternalData(l1));
+
+  half h1(1.0f);
+  half h2(2.0f);
+  auto m2 = LiteralUtil::CreateR2<half>({{h1, h2}, {h2, h1}});
+  Literal* l2 = m2.get();
+  const char* d2 = (const char*)LiteralUtil::InternalData(*l2);
+  EXPECT_EQ(d2[0], 0);
+  EXPECT_EQ(d2[1], 0x3C);
+  EXPECT_EQ(d2[2], 0);
+  EXPECT_EQ(d2[3], 0x40);
+  EXPECT_EQ(d2[4], 0);
+  EXPECT_EQ(d2[5], 0x40);
+  EXPECT_EQ(d2[6], 0);
+  EXPECT_EQ(d2[7], 0x3C);
+  EXPECT_EQ(LiteralUtil::InternalData(*l2),
+            LiteralUtil::MutableInternalData(l2));
+}
+
 TEST_F(LiteralUtilTest, Populate) {
   struct PopulateData {
     std::vector<int64> dimensions;
diff --git a/tensorflow/compiler/xla/primitive_util.cc b/tensorflow/compiler/xla/primitive_util.cc
index e3909ae8e9..e4e37177a2 100644
--- a/tensorflow/compiler/xla/primitive_util.cc
+++ b/tensorflow/compiler/xla/primitive_util.cc
@@ -78,6 +78,11 @@ PrimitiveType NativeToPrimitiveType<double>() {
   return F64;
 }
 
+template <>
+PrimitiveType NativeToPrimitiveType<half>() {
+  return F16;
+}
+
 bool IsFloatingPointType(PrimitiveType type) {
   return type == F16 || type == F32 || type == F64;
 }
diff --git a/tensorflow/compiler/xla/primitive_util.h b/tensorflow/compiler/xla/primitive_util.h
index 78f0ee6f59..162a11c7d2 100644
--- a/tensorflow/compiler/xla/primitive_util.h
+++ b/tensorflow/compiler/xla/primitive_util.h
@@ -75,6 +75,8 @@ template <>
 PrimitiveType NativeToPrimitiveType<float>();
 template <>
 PrimitiveType NativeToPrimitiveType<double>();
+template <>
+PrimitiveType NativeToPrimitiveType<half>();
 
 bool IsFloatingPointType(PrimitiveType type);
 
@@ -150,6 +152,10 @@ template <>
 struct PrimitiveTypeToNative<F64> {
   using type = double;
 };
+template <>
+struct PrimitiveTypeToNative<F16> {
+  using type = half;
+};
 
 }  // namespace primitive_util
 }  // namespace xla
diff --git a/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc b/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc
index 8e06f0520e..253de20f25 100644
--- a/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc
+++ b/tensorflow/compiler/xla/service/cpu/cpu_runtime.cc
@@ -15,7 +15,6 @@ limitations under the License.
 
 #include "tensorflow/compiler/xla/service/cpu/cpu_runtime.h"
 
-#include <sched.h>
 #include <functional>
 
 #include "tensorflow/core/platform/logging.h"
diff --git a/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc b/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc
index 677080a862..ee772f5c39 100644
--- a/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc
+++ b/tensorflow/compiler/xla/service/cpu/runtime_matmul.cc
@@ -54,7 +54,7 @@ void MatMul(const void* run_options_ptr, T* out, T* lhs, T* rhs, int64 m,
   int lhs_contract_dim = transpose_lhs ? 0 : 1;
   int rhs_contract_dim = transpose_rhs ? 1 : 0;
   const Eigen::array<DimPair, 1> dims(
-      DimPair(lhs_contract_dim, rhs_contract_dim));
+      {DimPair(lhs_contract_dim, rhs_contract_dim)});
 
   // Matrix multiply is a special case of the "contract" operation where
   // the contraction is performed along dimension 1 of the lhs and dimension
diff --git a/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc b/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc
index 384a978873..6f1c97a233 100644
--- a/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc
+++ b/tensorflow/compiler/xla/service/cpu/runtime_single_threaded_matmul.cc
@@ -48,7 +48,7 @@ void MatMul(const void* run_options_ptr, T* out, T* lhs, T* rhs, int64 m,
   int lhs_contract_dim = transpose_lhs ? 0 : 1;
   int rhs_contract_dim = transpose_rhs ? 1 : 0;
   const Eigen::array<DimPair, 1> dims(
-      DimPair(lhs_contract_dim, rhs_contract_dim));
+      {DimPair(lhs_contract_dim, rhs_contract_dim)});
 
   // Matrix multiply is a special case of the "contract" operation where
   // the contraction is performed along dimension 1 of the lhs and dimension
diff --git a/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc b/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc
index 1667ab3679..e57eb0bdee 100644
--- a/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/gpu/elemental_ir_emitter.cc
@@ -113,7 +113,7 @@ StatusOr<llvm::Value*> GpuElementalIrEmitter::EmitMathCall(
     tensorflow::gtl::ArraySlice<llvm::Value*> operands,
     tensorflow::gtl::ArraySlice<PrimitiveType> input_types,
     PrimitiveType output_type) const {
-  // Binary math functions tranform are of type [T] -> T.
+  // Binary math functions transform are of type [T] -> T.
   for (PrimitiveType input_type : input_types) {
     if (output_type != input_type) {
       return Unimplemented("Input type ≠ output type: %s ≠ %s",
diff --git a/tensorflow/compiler/xla/service/gpu/ir_emitter.cc b/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
index e60978df0a..36619a8454 100644
--- a/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
+++ b/tensorflow/compiler/xla/service/gpu/ir_emitter.cc
@@ -399,7 +399,7 @@ Status IrEmitter::HandleDot(HloInstruction* dot,
   llvm::Type* accum_type = target_array.GetElementLlvmType();
   llvm::Value* accum_address = llvm_ir::EmitAllocaAtFunctionEntry(
       accum_type,       // The pointee type of the alloca instruction.
-      "accum_address",  // The name of the alloca instuction.
+      "accum_address",  // The name of the alloca instruction.
       &ir_builder_);
 
   // Initialize the accumulator in the preheader to zero.
diff --git a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
index 485216837d..383729185d 100644
--- a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
+++ b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
@@ -396,7 +396,7 @@ StatusOr<string> CompileModuleToPtx(llvm::Module* module,
 
   // The LLVM IR verifier performs sanity checking on the IR. This helps
   // discover problems and report them in a meaningful manner, rather than let
-  // later passes report obscure assertions becasue of unfulfilled invariants.
+  // later passes report obscure assertions because of unfulfilled invariants.
   module_passes.add(llvm::createVerifierPass());
 
   // Create the function-level pass manager. It needs data layout information
diff --git a/tensorflow/compiler/xla/service/gpu/while_transformer.cc b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
index 46a5d303b7..61bc6f6055 100644
--- a/tensorflow/compiler/xla/service/gpu/while_transformer.cc
+++ b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
@@ -168,7 +168,7 @@ class MatcherBase {
   virtual ~MatcherBase() {}
 
   // Attempts to match each ExprTree in 'expr_trees_'.
-  // Returns OK on the first succesful match, error status otherwise.
+  // Returns OK on the first successful match, error status otherwise.
   virtual tensorflow::Status Run() {
     Status status;
     for (const ExprTree& expr_tree : expr_trees_) {
diff --git a/tensorflow/compiler/xla/service/layout_assignment.cc b/tensorflow/compiler/xla/service/layout_assignment.cc
index 810eed72f9..a8366ae794 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.cc
+++ b/tensorflow/compiler/xla/service/layout_assignment.cc
@@ -1081,7 +1081,7 @@ StatusOr<Layout> InferArrayLayout(
                                   *first_buffer_layout)) {
       // The points-to set is ambiguous for this index and the different source
       // buffers have different layouts. This case is possible in valid XLA
-      // computations because we do not propagate BufferLayoutConstaints to all
+      // computations because we do not propagate BufferLayoutConstraints to all
       // LogicalBuffers which may alias the constrained LogicalBuffer at some
       // point in the computation.
       return FailedPrecondition(
@@ -1294,7 +1294,7 @@ Status LayoutAssignment::RunOnComputation(
   TF_ASSIGN_OR_RETURN(auto points_to_analysis,
                       TuplePointsToAnalysis::Run(computation->parent()));
 
-  // Construct LayoutConstaints with all layout constraints of the computation.
+  // Construct LayoutConstraints with all layout constraints of the computation.
   LayoutConstraints constraints(*points_to_analysis, computation);
 
   // Add constraints required for correctness on all backends (eg, entry
diff --git a/tensorflow/compiler/xla/tests/custom_call_test.cc b/tensorflow/compiler/xla/tests/custom_call_test.cc
index dc54c9defe..f31b703b00 100644
--- a/tensorflow/compiler/xla/tests/custom_call_test.cc
+++ b/tensorflow/compiler/xla/tests/custom_call_test.cc
@@ -29,23 +29,21 @@ limitations under the License.
 #include "tensorflow/compiler/xla/tests/test_macros.h"
 #include "tensorflow/compiler/xla/xla_data.pb.h"
 #include "tensorflow/core/platform/dynamic_annotations.h"
+#include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/test.h"
 
-extern "C" void __attribute__((visibility("default")))
-R0F32Add2(float* out, float** in) {
+extern "C" void TF_EXPORT R0F32Add2(float* out, float** in) {
   TF_ANNOTATE_MEMORY_IS_INITIALIZED(in, sizeof(float*));
   *out = **in + 2.0f;
 }
 
-extern "C" void __attribute__((visibility("default")))
-R2F32ReduceSum(float* out, float** in) {
+extern "C" void TF_EXPORT R2F32ReduceSum(float* out, float** in) {
   TF_ANNOTATE_MEMORY_IS_INITIALIZED(in, sizeof(float) * 4);
   float* array = in[0];
   *out = array[0] + array[1] + array[2] + array[3];
 }
 
-extern "C" void __attribute__((visibility("default")))
-Add1ToValues(float* out, float** in) {
+extern "C" void TF_EXPORT Add1ToValues(float* out, float** in) {
   TF_ANNOTATE_MEMORY_IS_INITIALIZED(in, sizeof(float) * 4);
   float* array = in[0];
   out[0] = array[0] + 1;
diff --git a/tensorflow/compiler/xla/tests/deallocation_test.cc b/tensorflow/compiler/xla/tests/deallocation_test.cc
index 94f34f753b..cc3c4a2a5e 100644
--- a/tensorflow/compiler/xla/tests/deallocation_test.cc
+++ b/tensorflow/compiler/xla/tests/deallocation_test.cc
@@ -52,7 +52,7 @@ TEST_F(DeallocationTest, DeallocateScalar) {
   builder.ConstantR0<float>(42.0);
   auto global_data = ExecuteAndCheckTransfer(&builder, {});
 
-  // A result can be transfered an arbitrary number of times.  Add an extra
+  // A result can be transferred an arbitrary number of times.  Add an extra
   // transfer here so we're not just testing that a second call to Transfer
   // fails.
   ASSERT_IS_OK(client_->Transfer(*global_data).status());
diff --git a/tensorflow/compiler/xla/tests/literal_test_util.cc b/tensorflow/compiler/xla/tests/literal_test_util.cc
index ef81db6fd6..23453db57b 100644
--- a/tensorflow/compiler/xla/tests/literal_test_util.cc
+++ b/tensorflow/compiler/xla/tests/literal_test_util.cc
@@ -314,7 +314,7 @@ class NearComparator {
 
  private:
   // EXPECTs that the two given scalar values are within the error bound. Keeps
-  // track of how many mismatches have occured to keep the size of the output
+  // track of how many mismatches have occurred to keep the size of the output
   // manageable.
   template <typename NativeT>
   bool ExpectValuesNear(NativeT expected, NativeT actual) {
diff --git a/tensorflow/compiler/xla/tests/reduce_test.cc b/tensorflow/compiler/xla/tests/reduce_test.cc
index d00a317534..feb2b465fc 100644
--- a/tensorflow/compiler/xla/tests/reduce_test.cc
+++ b/tensorflow/compiler/xla/tests/reduce_test.cc
@@ -61,7 +61,7 @@ namespace {
 class ReduceTest : public ClientLibraryTestBase {
  protected:
   ReduceTest() {
-    // Implementation note: layed out z >> y >> x by default.
+    // Implementation note: laid out z >> y >> x by default.
     // clang-format off
     literal_2d_ = LiteralUtil::CreateR2<float>({
       // x0   x1   x2
diff --git a/tensorflow/compiler/xla/types.h b/tensorflow/compiler/xla/types.h
index 8258031a2c..4935648f98 100644
--- a/tensorflow/compiler/xla/types.h
+++ b/tensorflow/compiler/xla/types.h
@@ -16,6 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_COMPILER_XLA_TYPES_H_
 #define TENSORFLOW_COMPILER_XLA_TYPES_H_
 
+#include "third_party/eigen3/Eigen/Core"
 #include "tensorflow/core/platform/types.h"
 
 namespace xla {
@@ -32,6 +33,8 @@ using ::tensorflow::uint16;
 using ::tensorflow::uint32;
 using ::tensorflow::uint64;
 
+using ::Eigen::half;
+
 }  // namespace xla
 
 #endif  // TENSORFLOW_COMPILER_XLA_TYPES_H_
diff --git a/tensorflow/compiler/xla/xla_data.proto b/tensorflow/compiler/xla/xla_data.proto
index e5b94fcefe..1239816c50 100644
--- a/tensorflow/compiler/xla/xla_data.proto
+++ b/tensorflow/compiler/xla/xla_data.proto
@@ -286,6 +286,7 @@ message Literal {
   repeated float f32s = 8;
   repeated double f64s = 9;
   repeated Literal tuple_literals = 10;
+  bytes f16s = 11;  // Note: the F16s are encoded in little endian byte order
 }
 
 message WindowDimension {
diff --git a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
index 0bdfb40664..8de154483e 100644
--- a/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
+++ b/tensorflow/contrib/boosted_trees/lib/quantiles/weighted_quantiles_summary_test.cc
@@ -75,7 +75,7 @@ TEST_F(WeightedQuantilesSummaryTest, BuildFromBuffer) {
   Summary summary;
   summary.BuildFromBufferEntries(buffer1_->GenerateEntryList());
 
-  // We expect no approximation error because no compress operation occured.
+  // We expect no approximation error because no compress operation occurred.
   EXPECT_EQ(summary.ApproximationError(), 0);
 
   // Check first and last elements in the summary.
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 62afa9481b..bade45e96a 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -61,15 +61,18 @@ add_definitions(-DEIGEN_AVOID_STL_ARRAY)
 if(WIN32)
   add_definitions(-DNOMINMAX -D_WIN32_WINNT=0x0A00 -DLANG_CXX11 -DCOMPILER_MSVC)
   add_definitions(-DWIN32 -DOS_WIN -D_MBCS -DWIN64 -DWIN32_LEAN_AND_MEAN -DNOGDI -DPLATFORM_WINDOWS)
-  add_definitions(-DTENSORFLOW_USE_EIGEN_THREADPOOL -DEIGEN_HAS_C99_MATH -D_ITERATOR_DEBUG_LEVEL=0)
+  add_definitions(-DTENSORFLOW_USE_EIGEN_THREADPOOL -DEIGEN_HAS_C99_MATH)
   add_definitions(-DTF_COMPILE_LIBRARY)
-  add_definitions(-DNDEBUG /O2)  # Equivalent of -c opt in Bazel.
   add_definitions(/bigobj /nologo /EHsc /GF /FC /MP /Gm-)
   # Suppress warnings to reduce build log size.
   add_definitions(/wd4267 /wd4244 /wd4800 /wd4503 /wd4554 /wd4996 /wd4348 /wd4018)
   add_definitions(/wd4099 /wd4146 /wd4267 /wd4305 /wd4307)
   add_definitions(/wd4715 /wd4722 /wd4723 /wd4838 /wd4309 /wd4334)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_ITERATOR_DEBUG_LEVEL=0")
+  set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /D_ITERATOR_DEBUG_LEVEL=0")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /D_ITERATOR_DEBUG_LEVEL=0")
 endif()
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
diff --git a/tensorflow/contrib/cmake/external/googletest.cmake b/tensorflow/contrib/cmake/external/googletest.cmake
index c370f46d2a..d09bb02890 100644
--- a/tensorflow/contrib/cmake/external/googletest.cmake
+++ b/tensorflow/contrib/cmake/external/googletest.cmake
@@ -21,7 +21,7 @@ set(googletest_TAG ec44c6c1675c25b9827aacd08c02433cccde7780)
 
 if(WIN32)
   set(googletest_STATIC_LIBRARIES
-      ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/${CMAKE_BUILD_TYPE}/gtest.lib)
+      ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/$(Configuration)/gtest.lib)
 else()
   set(googletest_STATIC_LIBRARIES
       ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/${CMAKE_BUILD_TYPE}/gtest.a)
diff --git a/tensorflow/contrib/cmake/external/grpc.cmake b/tensorflow/contrib/cmake/external/grpc.cmake
index 46ea519f09..d7201680ce 100644
--- a/tensorflow/contrib/cmake/external/grpc.cmake
+++ b/tensorflow/contrib/cmake/external/grpc.cmake
@@ -21,9 +21,9 @@ set(GRPC_TAG 3bc78cd0b5bd784a235c01612d634b1ec5f8fb97)
 
 if(WIN32)
   set(grpc_STATIC_LIBRARIES
-      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/${CMAKE_BUILD_TYPE}/grpc++_unsecure.lib
-      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/${CMAKE_BUILD_TYPE}/grpc_unsecure.lib
-      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/${CMAKE_BUILD_TYPE}/gpr.lib)
+      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/$(Configuration)/grpc++_unsecure.lib
+      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/$(Configuration)/grpc_unsecure.lib
+      ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/$(Configuration)/gpr.lib)
 else()
   set(grpc_STATIC_LIBRARIES
       ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/libgrpc++_unsecure.a
diff --git a/tensorflow/contrib/cmake/external/jsoncpp.cmake b/tensorflow/contrib/cmake/external/jsoncpp.cmake
index 1ef49681a6..5127d7e8f7 100644
--- a/tensorflow/contrib/cmake/external/jsoncpp.cmake
+++ b/tensorflow/contrib/cmake/external/jsoncpp.cmake
@@ -23,7 +23,7 @@ set(jsoncpp_LIBRARIES ${jsoncpp_BUILD}/obj/so/libjsoncpp.so)
 set(jsoncpp_INCLUDES ${jsoncpp_BUILD})
 
 if(WIN32)
-  set(jsoncpp_STATIC_LIBRARIES ${jsoncpp_BUILD}/${CMAKE_BUILD_TYPE}/jsoncpp.lib)
+  set(jsoncpp_STATIC_LIBRARIES ${jsoncpp_BUILD}/$(Configuration)/jsoncpp.lib)
 else()
   set(jsoncpp_STATIC_LIBRARIES ${jsoncpp_BUILD}/libjsoncpp.a)
 endif()
diff --git a/tensorflow/contrib/cmake/external/png.cmake b/tensorflow/contrib/cmake/external/png.cmake
index 05e9688d1f..2b2bd47d1c 100644
--- a/tensorflow/contrib/cmake/external/png.cmake
+++ b/tensorflow/contrib/cmake/external/png.cmake
@@ -21,7 +21,9 @@ set(png_BUILD ${CMAKE_BINARY_DIR}/png/src/png)
 set(png_INSTALL ${CMAKE_BINARY_DIR}/png/install)
 
 if(WIN32)
-  set(png_STATIC_LIBRARIES ${CMAKE_BINARY_DIR}/png/install/lib/libpng12_static.lib)
+  set(png_STATIC_LIBRARIES 
+    debug ${CMAKE_BINARY_DIR}/png/install/lib/libpng12_staticd.lib
+    optimized ${CMAKE_BINARY_DIR}/png/install/lib/libpng12_static.lib)
 else()
   set(png_STATIC_LIBRARIES ${CMAKE_BINARY_DIR}/png/install/lib/libpng12.a)
 endif()
diff --git a/tensorflow/contrib/cmake/external/protobuf.cmake b/tensorflow/contrib/cmake/external/protobuf.cmake
index 6cd9c11750..d600d8c3c0 100644
--- a/tensorflow/contrib/cmake/external/protobuf.cmake
+++ b/tensorflow/contrib/cmake/external/protobuf.cmake
@@ -19,8 +19,10 @@ set(PROTOBUF_URL https://github.com/mrry/protobuf.git)  # Includes MSVC fix.
 set(PROTOBUF_TAG 1d2c7b6c7376f396c8c7dd9b6afd2d4f83f3cb05)
 
 if(WIN32)
-  set(protobuf_STATIC_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/${CMAKE_BUILD_TYPE}/libprotobuf.lib)
-  set(PROTOBUF_PROTOC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/${CMAKE_BUILD_TYPE}/protoc.exe)
+  set(protobuf_STATIC_LIBRARIES 
+    debug ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/$(Configuration)/libprotobufd.lib
+    optimized ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/$(Configuration)/libprotobuf.lib)
+  set(PROTOBUF_PROTOC_EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/$(Configuration)/protoc.exe)
   set(PROTOBUF_ADDITIONAL_CMAKE_OPTIONS	-Dprotobuf_MSVC_STATIC_RUNTIME:BOOL=OFF -A x64)
 else()
   set(protobuf_STATIC_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/libprotobuf.a)
diff --git a/tensorflow/contrib/cmake/external/zlib.cmake b/tensorflow/contrib/cmake/external/zlib.cmake
index 8cfde90438..c8af611e1e 100644
--- a/tensorflow/contrib/cmake/external/zlib.cmake
+++ b/tensorflow/contrib/cmake/external/zlib.cmake
@@ -22,7 +22,8 @@ set(ZLIB_TAG 50893291621658f355bc5b4d450a8d06a563053d)
 
 if(WIN32)
   set(zlib_STATIC_LIBRARIES
-      ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/zlibstatic.lib)
+      debug ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/zlibstaticd.lib
+      optimized ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/zlibstatic.lib)
 else()
   set(zlib_STATIC_LIBRARIES
       ${CMAKE_CURRENT_BINARY_DIR}/zlib/install/lib/libz.a)
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index baba1bbb03..7789edf809 100755
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -861,9 +861,9 @@ add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
                                    ${CMAKE_CURRENT_BINARY_DIR}/tf_python/)
 if(WIN32)
   add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pywrap_tensorflow_internal.dll
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$(Configuration)/pywrap_tensorflow_internal.dll
                                      ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/python/_pywrap_tensorflow_internal.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pywrap_tensorflow_internal.lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$(Configuration)/pywrap_tensorflow_internal.lib
                                      ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/python/)
 else()
   add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
diff --git a/tensorflow/contrib/cmake/tf_tests.cmake b/tensorflow/contrib/cmake/tf_tests.cmake
index c8a827f29d..4abf3b0a64 100644
--- a/tensorflow/contrib/cmake/tf_tests.cmake
+++ b/tensorflow/contrib/cmake/tf_tests.cmake
@@ -208,6 +208,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
       "${tensorflow_source_dir}/tensorflow/tensorboard/lib/python/http_util_test.py"
       # Broken tensorboard test due to cmake issues.
       "${tensorflow_source_dir}/tensorflow/tensorboard/plugins/debugger/plugin_test.py"
+      "${tensorflow_source_dir}/tensorflow/contrib/data/python/kernel_tests/dataset_constructor_op_test.py"
       # tensor_forest tests (also note that we exclude the hybrid tests for now)
       "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/python/kernel_tests/count_extremely_random_stats_op_test.py"  # Results in wrong order.
       "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/python/kernel_tests/sample_inputs_op_test.py"  # Results in wrong order.
diff --git a/tensorflow/contrib/factorization/BUILD b/tensorflow/contrib/factorization/BUILD
index 8dc78da6ba..60e7c8f160 100644
--- a/tensorflow/contrib/factorization/BUILD
+++ b/tensorflow/contrib/factorization/BUILD
@@ -138,6 +138,7 @@ tf_py_test(
         "//tensorflow/python:platform_test",
     ],
     tags = [
+        "no_pip",  # b/38283730
         "notsan",  # Flaky: b/30756419
     ],
 )
diff --git a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
index e520139e65..a4dd3a642f 100644
--- a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
+++ b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc
@@ -70,8 +70,7 @@ bool IsBinaryInstalled(const string& binary_name) {
     const string binary_path = io::JoinPath(dir, binary_name);
     char absolute_path[PATH_MAX + 1];
     if (::realpath(binary_path.c_str(), absolute_path) == NULL) {
-      LOG(ERROR) << "Invalid binary path: " << binary_path;
-      return false;
+      continue;
     }
     struct stat statinfo;
     int result = ::stat(absolute_path, &statinfo);
diff --git a/tensorflow/contrib/keras/api/keras/callbacks/__init__.py b/tensorflow/contrib/keras/api/keras/callbacks/__init__.py
index 2f579f2d28..36db34f592 100644
--- a/tensorflow/contrib/keras/api/keras/callbacks/__init__.py
+++ b/tensorflow/contrib/keras/api/keras/callbacks/__init__.py
@@ -29,6 +29,7 @@ from tensorflow.contrib.keras.python.keras.callbacks import ModelCheckpoint
 from tensorflow.contrib.keras.python.keras.callbacks import ProgbarLogger
 from tensorflow.contrib.keras.python.keras.callbacks import ReduceLROnPlateau
 from tensorflow.contrib.keras.python.keras.callbacks import RemoteMonitor
+from tensorflow.contrib.keras.python.keras.callbacks import TensorBoard
 
 del absolute_import
 del division
diff --git a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
index fc092fccd7..1724d7599d 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/dynamic_rnn_estimator.py
@@ -597,8 +597,8 @@ class DynamicRnnEstimator(estimator.Estimator):
         `ProblemType.CLASSIFICATION` or `ProblemType.LINEAR_REGRESSION`.
       prediction_type: whether the `Estimator` should return a value for each
         step in the sequence, or just a single value for the final time step.
-        Must be one of `ProblemType.SINGLE_VALUE` or
-        `ProblemType.MULTIPLE_VALUE`.
+        Must be one of `PredictionType.SINGLE_VALUE` or
+        `PredictionType.MULTIPLE_VALUE`.
       sequence_feature_columns: An iterable containing all the feature columns
         describing sequence features. All items in the iterable should be
         instances of classes derived from `FeatureColumn`.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 1af31b933b..d7ba2209ad 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -331,14 +331,21 @@ def _write_dict_to_summary(output_dir,
   for key in dictionary:
     if dictionary[key] is None:
       continue
+    if key == 'global_step':
+      continue
     value = summary_proto.value.add()
     value.tag = key
     if (isinstance(dictionary[key], np.float32) or
         isinstance(dictionary[key], float)):
       value.simple_value = float(dictionary[key])
+    elif (isinstance(dictionary[key], np.int64) or
+          isinstance(dictionary[key], np.int32) or
+          isinstance(dictionary[key], int)):
+      value.simple_value = int(dictionary[key])
     else:
-      logging.warn('Skipping summary for %s, must be a float or np.float32.',
-                   key)
+      logging.warn(
+          'Skipping summary for %s, must be a float, np.float32, np.int64, np.int32 or int.',
+          key)
   summary_writer.add_summary(summary_proto, current_global_step)
   summary_writer.flush()
 
diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index 2143f3b925..b9cd91e519 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -110,6 +110,7 @@ tensorflow/core/kernels/fake_quant_ops.cc
 tensorflow/core/kernels/example_parsing_ops.cc
 tensorflow/core/kernels/dynamic_stitch_op.cc
 tensorflow/core/kernels/dynamic_partition_op.cc
+tensorflow/core/kernels/decode_bmp_op.cc
 tensorflow/core/kernels/depthtospace_op.cc
 tensorflow/core/kernels/spacetodepth_op.cc
 tensorflow/core/kernels/dense_update_ops.cc
diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index 2a8714644c..a7e910975f 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -18,6 +18,7 @@ py_library(
         "python/training/external_optimizer.py",
         "python/training/lazy_adam_optimizer.py",
         "python/training/moving_average_optimizer.py",
+        "python/training/nadam_optimizer.py",
         "python/training/variable_clipping_optimizer.py",
     ],
     srcs_version = "PY2AND3",
@@ -106,6 +107,23 @@ py_test(
     ],
 )
 
+py_test(
+    name = "nadam_optimizer_test",
+    srcs = ["python/training/nadam_optimizer_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":opt_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:variables",
+        "//third_party/py/numpy",
+    ],
+)
+
 tf_py_test(
     name = "drop_stale_gradient_optimizer_test",
     srcs = ["python/training/drop_stale_gradient_optimizer_test.py"],
diff --git a/tensorflow/contrib/opt/__init__.py b/tensorflow/contrib/opt/__init__.py
index 6cd68f29a7..656a548cfd 100644
--- a/tensorflow/contrib/opt/__init__.py
+++ b/tensorflow/contrib/opt/__init__.py
@@ -23,16 +23,16 @@ from tensorflow.contrib.opt.python.training.drop_stale_gradient_optimizer import
 from tensorflow.contrib.opt.python.training.external_optimizer import *
 from tensorflow.contrib.opt.python.training.lazy_adam_optimizer import *
 from tensorflow.contrib.opt.python.training.moving_average_optimizer import *
+from tensorflow.contrib.opt.python.training.nadam_optimizer import *
 from tensorflow.contrib.opt.python.training.variable_clipping_optimizer import *
 # pylint: enable=wildcard-import
 
 from tensorflow.python.util.all_util import remove_undocumented
 
-_allowed_symbols = ['DropStaleGradientOptimizer',
-                    'ExternalOptimizerInterface',
-                    'LazyAdamOptimizer',
-                    'MovingAverageOptimizer',
-                    'ScipyOptimizerInterface',
-                    'VariableClippingOptimizer']
+_allowed_symbols = [
+    'DropStaleGradientOptimizer', 'ExternalOptimizerInterface',
+    'LazyAdamOptimizer', 'NadamOptimizer', 'MovingAverageOptimizer',
+    'ScipyOptimizerInterface', 'VariableClippingOptimizer'
+]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
index 4f0bc0ce2f..53232082e1 100644
--- a/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
+++ b/tensorflow/contrib/opt/python/training/drop_stale_gradient_optimizer_test.py
@@ -184,7 +184,7 @@ class DropStaleGradientOptimizerTest(test.TestCase):
     thread_0.join()
     thread_1.join()
 
-    # With 2 workers and max staleness set to 0, only cheif worker will update
+    # With 2 workers and max staleness set to 0, only chief worker will update
     # var_0 and var_1.
     self.assertAllEqual(1, sessions[0].run(global_step))
     self.assertAllEqual(1.0, sessions[0].run(stale_counter))
@@ -250,7 +250,7 @@ class DropStaleGradientOptimizerTest(test.TestCase):
     thread_1.join()
     thread_2.join()
 
-    # With 3 workers and max staleness set to 0, only cheif worker will update
+    # With 3 workers and max staleness set to 0, only chief worker will update
     # var_0 and var_1.
     self.assertAllEqual(1, sessions[0].run(global_step))
     self.assertAllEqual(2.0, sessions[0].run(stale_counter))
diff --git a/tensorflow/contrib/opt/python/training/nadam_optimizer.py b/tensorflow/contrib/opt/python/training/nadam_optimizer.py
new file mode 100644
index 0000000000..a4421ecfe6
--- /dev/null
+++ b/tensorflow/contrib/opt/python/training/nadam_optimizer.py
@@ -0,0 +1,93 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Nadam for TensorFlow."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import control_flow_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import state_ops
+from tensorflow.python.training import adam
+from tensorflow.python.training import training_ops
+
+
+class NadamOptimizer(adam.AdamOptimizer):
+  """Optimizer that implements the Nadam algorithm.
+
+  See [Dozat, T., 2015](http://cs229.stanford.edu/proj2015/054_report.pdf).
+  """
+
+  def _apply_dense(self, grad, var):
+    m = self.get_slot(var, "m")
+    v = self.get_slot(var, "v")
+    return training_ops.apply_adam(
+        var,
+        m,
+        v,
+        math_ops.cast(self._beta1_power, var.dtype.base_dtype),
+        math_ops.cast(self._beta2_power, var.dtype.base_dtype),
+        math_ops.cast(self._lr_t, var.dtype.base_dtype),
+        math_ops.cast(self._beta1_t, var.dtype.base_dtype),
+        math_ops.cast(self._beta2_t, var.dtype.base_dtype),
+        math_ops.cast(self._epsilon_t, var.dtype.base_dtype),
+        grad,
+        use_locking=self._use_locking,
+        use_nesterov=True).op
+
+  def _resource_apply_dense(self, grad, var):
+    m = self.get_slot(var, "m")
+    v = self.get_slot(var, "v")
+    return training_ops.resource_apply_adam(
+        var.handle,
+        m.handle,
+        v.handle,
+        math_ops.cast(self._beta1_power, grad.dtype.base_dtype),
+        math_ops.cast(self._beta2_power, grad.dtype.base_dtype),
+        math_ops.cast(self._lr_t, grad.dtype.base_dtype),
+        math_ops.cast(self._beta1_t, grad.dtype.base_dtype),
+        math_ops.cast(self._beta2_t, grad.dtype.base_dtype),
+        math_ops.cast(self._epsilon_t, grad.dtype.base_dtype),
+        grad,
+        use_locking=self._use_locking,
+        use_nesterov=True)
+
+  def _apply_sparse_shared(self, grad, var, indices, scatter_add):
+    beta1_power = math_ops.cast(self._beta1_power, var.dtype.base_dtype)
+    beta2_power = math_ops.cast(self._beta2_power, var.dtype.base_dtype)
+    lr_t = math_ops.cast(self._lr_t, var.dtype.base_dtype)
+    beta1_t = math_ops.cast(self._beta1_t, var.dtype.base_dtype)
+    beta2_t = math_ops.cast(self._beta2_t, var.dtype.base_dtype)
+    epsilon_t = math_ops.cast(self._epsilon_t, var.dtype.base_dtype)
+    lr = (lr_t * math_ops.sqrt(1 - beta2_power) / (1 - beta1_power))
+    # m_t = beta1 * m + (1 - beta1) * g_t
+    m = self.get_slot(var, "m")
+    m_scaled_g_values = grad * (1 - beta1_t)
+    m_t = state_ops.assign(m, m * beta1_t, use_locking=self._use_locking)
+    with ops.control_dependencies([m_t]):
+      m_t = scatter_add(m, indices, m_scaled_g_values)
+      # m_bar = (1 - beta1) * g_t + beta1 * m_t
+      m_bar = m_scaled_g_values + beta1_t * m_t
+    # v_t = beta2 * v + (1 - beta2) * (g_t * g_t)
+    v = self.get_slot(var, "v")
+    v_scaled_g_values = (grad * grad) * (1 - beta2_t)
+    v_t = state_ops.assign(v, v * beta2_t, use_locking=self._use_locking)
+    with ops.control_dependencies([v_t]):
+      v_t = scatter_add(v, indices, v_scaled_g_values)
+    v_sqrt = math_ops.sqrt(v_t)
+    var_update = state_ops.assign_sub(
+        var, lr * m_bar / (v_sqrt + epsilon_t), use_locking=self._use_locking)
+    return control_flow_ops.group(*[var_update, m_bar, v_t])
diff --git a/tensorflow/contrib/opt/python/training/nadam_optimizer_test.py b/tensorflow/contrib/opt/python/training/nadam_optimizer_test.py
new file mode 100644
index 0000000000..b0a257d264
--- /dev/null
+++ b/tensorflow/contrib/opt/python/training/nadam_optimizer_test.py
@@ -0,0 +1,159 @@
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for Nadam."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import numpy as np
+
+from tensorflow.contrib.opt.python.training import nadam_optimizer
+from tensorflow.python.client import session
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import resource_variable_ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+
+
+def nadam_update_numpy(param,
+                       g_t,
+                       t,
+                       m,
+                       v,
+                       alpha=0.001,
+                       beta1=0.9,
+                       beta2=0.999,
+                       epsilon=1e-8):
+  alpha_t = alpha * np.sqrt(1 - beta2**t) / (1 - beta1**t)
+
+  m_t = beta1 * m + (1 - beta1) * g_t
+  v_t = beta2 * v + (1 - beta2) * g_t * g_t
+
+  m_bar = (1 - beta1) * g_t + beta1 * m_t
+
+  param_t = param - alpha_t * m_bar / (np.sqrt(v_t) + epsilon)
+  return param_t, m_t, v_t
+
+
+class NadamOptimizerTest(test.TestCase):
+
+  def doTestSparse(self, use_resource=False):
+    for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+      with self.test_session():
+        # Initialize variables for numpy implementation.
+        m0, v0, m1, v1 = 0.0, 0.0, 0.0, 0.0
+        var0_np = np.array([1.0, 2.0], dtype=dtype.as_numpy_dtype)
+        grads0_np = np.array([0.1, 0.1], dtype=dtype.as_numpy_dtype)
+        var1_np = np.array([3.0, 4.0], dtype=dtype.as_numpy_dtype)
+        grads1_np = np.array([0.01, 0.01], dtype=dtype.as_numpy_dtype)
+
+        if use_resource:
+          var0 = resource_variable_ops.ResourceVariable(var0_np)
+          var1 = resource_variable_ops.ResourceVariable(var1_np)
+        else:
+          var0 = variables.Variable(var0_np)
+          var1 = variables.Variable(var1_np)
+        grads0_np_indices = np.array([0, 1], dtype=np.int32)
+        grads0 = ops.IndexedSlices(
+            constant_op.constant(grads0_np),
+            constant_op.constant(grads0_np_indices), constant_op.constant([2]))
+        grads1_np_indices = np.array([0, 1], dtype=np.int32)
+        grads1 = ops.IndexedSlices(
+            constant_op.constant(grads1_np),
+            constant_op.constant(grads1_np_indices), constant_op.constant([2]))
+        opt = nadam_optimizer.NadamOptimizer()
+        update = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        variables.global_variables_initializer().run()
+
+        # Fetch params to validate initial values
+        self.assertAllClose([1.0, 2.0], var0.eval())
+        self.assertAllClose([3.0, 4.0], var1.eval())
+
+        beta1_power, beta2_power = opt._get_beta_accumulators()
+
+        # Run 3 steps of Nadam
+        for t in range(1, 4):
+          self.assertAllCloseAccordingToType(0.9**t, beta1_power.eval())
+          self.assertAllCloseAccordingToType(0.999**t, beta2_power.eval())
+          update.run()
+
+          var0_np, m0, v0 = nadam_update_numpy(var0_np, grads0_np, t, m0, v0)
+          var1_np, m1, v1 = nadam_update_numpy(var1_np, grads1_np, t, m1, v1)
+
+          # Validate updated params
+          self.assertAllCloseAccordingToType(var0_np, var0.eval())
+          self.assertAllCloseAccordingToType(var1_np, var1.eval())
+
+  def testSparse(self):
+    self.doTestSparse(use_resource=False)
+
+  def testResourceSparse(self):
+    self.doTestSparse(use_resource=True)
+
+  def doTestBasic(self, use_resource=False):
+    for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+      with self.test_session():
+        # Initialize variables for numpy implementation.
+        m0, v0, m1, v1 = 0.0, 0.0, 0.0, 0.0
+        var0_np = np.array([1.0, 2.0], dtype=dtype.as_numpy_dtype)
+        grads0_np = np.array([0.1, 0.1], dtype=dtype.as_numpy_dtype)
+        var1_np = np.array([3.0, 4.0], dtype=dtype.as_numpy_dtype)
+        grads1_np = np.array([0.01, 0.01], dtype=dtype.as_numpy_dtype)
+
+        if use_resource:
+          var0 = resource_variable_ops.ResourceVariable(var0_np)
+          var1 = resource_variable_ops.ResourceVariable(var1_np)
+        else:
+          var0 = variables.Variable(var0_np)
+          var1 = variables.Variable(var1_np)
+        grads0 = constant_op.constant(grads0_np)
+        grads1 = constant_op.constant(grads1_np)
+        opt = nadam_optimizer.NadamOptimizer()
+        update = opt.apply_gradients(zip([grads0, grads1], [var0, var1]))
+        variables.global_variables_initializer().run()
+
+        # Fetch params to validate initial values
+        self.assertAllClose([1.0, 2.0], var0.eval())
+        self.assertAllClose([3.0, 4.0], var1.eval())
+
+        beta1_power, beta2_power = opt._get_beta_accumulators()
+
+        # Run 3 steps of Nadam
+        for t in range(1, 4):
+          self.assertAllCloseAccordingToType(0.9**t, beta1_power.eval())
+          self.assertAllCloseAccordingToType(0.999**t, beta2_power.eval())
+          update.run()
+
+          var0_np, m0, v0 = nadam_update_numpy(var0_np, grads0_np, t, m0, v0)
+          var1_np, m1, v1 = nadam_update_numpy(var1_np, grads1_np, t, m1, v1)
+
+          # Validate updated params
+          self.assertAllCloseAccordingToType(var0_np, var0.eval())
+          self.assertAllCloseAccordingToType(var1_np, var1.eval())
+
+  def testBasic(self):
+    self.doTestBasic(use_resource=False)
+
+  def testResourceBasic(self):
+    self.doTestBasic(use_resource=True)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
index db1f939e33..e0616e0678 100644
--- a/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
+++ b/tensorflow/contrib/rnn/python/ops/core_rnn_cell_impl.py
@@ -88,12 +88,20 @@ class BasicRNNCell(RNNCell):
 class GRUCell(RNNCell):
   """Gated Recurrent Unit cell (cf. http://arxiv.org/abs/1406.1078)."""
 
-  def __init__(self, num_units, input_size=None, activation=tanh, reuse=None):
+  def __init__(self,
+               num_units,
+               input_size=None,
+               activation=tanh,
+               reuse=None,
+               kernel_initializer=None,
+               bias_initializer=None):
     super(GRUCell, self).__init__(_reuse=reuse)
     if input_size is not None:
       logging.warn("%s: The input_size parameter is deprecated.", self)
     self._num_units = num_units
     self._activation = activation
+    self._kernel_initializer = kernel_initializer
+    self._bias_initializer = bias_initializer
 
   @property
   def state_size(self):
@@ -107,10 +115,18 @@ class GRUCell(RNNCell):
     """Gated recurrent unit (GRU) with nunits cells."""
     with vs.variable_scope("gates"):  # Reset gate and update gate.
       # We start with bias of 1.0 to not reset and not update.
-      value = sigmoid(_linear([inputs, state], 2 * self._num_units, True, 1.0))
+      bias_ones = self._bias_initializer
+      if self._bias_initializer is None:
+        dtype = [a.dtype for a in [inputs, state]][0]
+        bias_ones = init_ops.constant_initializer(1.0, dtype=dtype)
+      value = sigmoid(
+          _linear([inputs, state], 2 * self._num_units, True, bias_ones,
+                  self._kernel_initializer))
       r, u = array_ops.split(value=value, num_or_size_splits=2, axis=1)
     with vs.variable_scope("candidate"):
-      c = self._activation(_linear([inputs, r * state], self._num_units, True))
+      c = self._activation(
+          _linear([inputs, r * state], self._num_units, True,
+                  self._bias_initializer, self._kernel_initializer))
     new_h = u * state + (1 - u) * c
     return new_h, new_h
 
@@ -968,14 +984,19 @@ class _SlimRNNCell(RNNCell):
     return output, state
 
 
-def _linear(args, output_size, bias, bias_start=0.0):
+def _linear(args,
+            output_size,
+            bias,
+            bias_initializer=None,
+            kernel_initializer=None):
   """Linear map: sum_i(args[i] * W[i]), where W[i] is a variable.
 
   Args:
     args: a 2D Tensor or a list of 2D, batch x n, Tensors.
     output_size: int, second dimension of W[i].
     bias: boolean, whether to add a bias term or not.
-    bias_start: starting value to initialize the bias; 0 by default.
+    bias_initializer: starting value to initialize the bias; None by default.
+    kernel_initializer: starting value to initialize the weight; None by default.
 
   Returns:
     A 2D Tensor with shape [batch x output_size] equal to
@@ -1007,7 +1028,9 @@ def _linear(args, output_size, bias, bias_start=0.0):
   scope = vs.get_variable_scope()
   with vs.variable_scope(scope) as outer_scope:
     weights = vs.get_variable(
-        _WEIGHTS_VARIABLE_NAME, [total_arg_size, output_size], dtype=dtype)
+        _WEIGHTS_VARIABLE_NAME, [total_arg_size, output_size],
+        dtype=dtype,
+        initializer=kernel_initializer)
     if len(args) == 1:
       res = math_ops.matmul(args[0], weights)
     else:
@@ -1016,8 +1039,10 @@ def _linear(args, output_size, bias, bias_start=0.0):
       return res
     with vs.variable_scope(outer_scope) as inner_scope:
       inner_scope.set_partitioner(None)
+      if bias_initializer is None:
+        bias_initializer = init_ops.constant_initializer(0.0, dtype=dtype)
       biases = vs.get_variable(
           _BIAS_VARIABLE_NAME, [output_size],
           dtype=dtype,
-          initializer=init_ops.constant_initializer(bias_start, dtype=dtype))
+          initializer=bias_initializer)
     return nn_ops.bias_add(res, biases)
diff --git a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
index eb494bda4b..1e8455d89e 100644
--- a/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
+++ b/tensorflow/contrib/seq2seq/python/ops/beam_search_decoder.py
@@ -497,13 +497,20 @@ def _beam_search_step(time, logits, beam_state, batch_size, beam_width,
 
   time = ops.convert_to_tensor(time, name="time")
   # During the first time step we only consider the initial beam
+  scores_shape = array_ops.shape(scores)
   scores_flat = control_flow_ops.cond(
       time > 0,
       lambda: array_ops.reshape(scores, [batch_size, -1]),
       lambda: scores[:, 0])
+  num_available_beam = control_flow_ops.cond(
+      time > 0, lambda: math_ops.reduce_prod(scores_shape[1:]),
+      lambda: math_ops.reduce_prod(scores_shape[2:]))
 
   # Pick the next beams according to the specified successors function
-  next_beam_scores, word_indices = nn_ops.top_k(scores_flat, k=beam_width)
+  next_beam_size = math_ops.minimum(
+      ops.convert_to_tensor(beam_width, dtype=dtypes.int32, name="beam_width"),
+      num_available_beam)
+  next_beam_scores, word_indices = nn_ops.top_k(scores_flat, k=next_beam_size)
   next_beam_scores.set_shape([static_batch_size, beam_width])
   word_indices.set_shape([static_batch_size, beam_width])
 
@@ -561,7 +568,8 @@ def _get_scores(log_probs, sequence_lengths, length_penalty_weight):
   """Calculates scores for beam search hypotheses.
 
   Args:
-    log_probs: The log probabilities with shape [batch_size, beam_width].
+    log_probs: The log probabilities with shape
+      `[batch_size, beam_width, vocab_size]`.
     sequence_lengths: The array of sequence lengths.
     length_penalty_weight: Float weight to penalize length. Disabled with 0.0.
 
diff --git a/tensorflow/contrib/verbs/rdma.cc b/tensorflow/contrib/verbs/rdma.cc
index 05df05de35..bc687be0ab 100644
--- a/tensorflow/contrib/verbs/rdma.cc
+++ b/tensorflow/contrib/verbs/rdma.cc
@@ -476,7 +476,11 @@ void RdmaChannel::Connect(const RdmaAddress& remoteAddr) {
     struct ibv_qp_attr attr;
     memset(&attr, 0, sizeof(ibv_qp_attr));
     attr.qp_state = IBV_QPS_RTR;
-    attr.path_mtu = IBV_MTU_4096;
+    struct ibv_port_attr port_attr;
+    CHECK(!ibv_query_port(adapter_->context_, (uint8_t)1, &port_attr))
+        << "Query port failed";
+    // This assumes both QP's ports are configured with the same MTU
+    attr.path_mtu = port_attr.active_mtu;
     attr.dest_qp_num = remoteAddr.qpn;
     attr.rq_psn = remoteAddr.psn;
     attr.max_dest_rd_atomic = 1;
@@ -778,11 +782,8 @@ void RdmaTensorBuffer::SendNextItem() {
         EnqueueItem(key_with_step_id);
       }
     };
-    // Use default session (legacy_session_)
-    // TODO use WorkerSessionForSession
-    // need to pass in session handle
-    channel_->adapter_->worker_env_->session_mgr->LegacySession()
-        ->rendezvous_mgr->RecvLocalAsync(step_id, parsed, cb);
+    channel_->adapter_->worker_env_->rendezvous_mgr->RecvLocalAsync(step_id,
+                                                                    parsed, cb);
   }
 }
 
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
index 8cbdfaa943..5871400f26 100644
--- a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
@@ -29,10 +29,8 @@ namespace tensorflow {
 
 class RdmaRemoteRendezvous : public BaseRemoteRendezvous {
  public:
-  RdmaRemoteRendezvous(const WorkerEnv* env, const string& worker_name,
-                       int64 step_id, RdmaMgr* rdma_mgr)
-      : BaseRemoteRendezvous(env, worker_name, step_id, true),
-        rdma_mgr_(rdma_mgr) {}
+  RdmaRemoteRendezvous(const WorkerEnv* env, int64 step_id, RdmaMgr* rdma_mgr)
+      : BaseRemoteRendezvous(env, step_id, true), rdma_mgr_(rdma_mgr) {}
 
  protected:
   void RecvFromRemoteAsync(const Rendezvous::ParsedKey& parsed,
@@ -133,15 +131,12 @@ void RdmaRemoteRendezvous::RecvFromRemoteAsync(
   rb->SendNextItem();
 }
 
-RdmaRendezvousMgr::RdmaRendezvousMgr(const WorkerEnv* env,
-                                     const string& worker_name,
-                                     WorkerCacheInterface* worker_cache)
-    : BaseRendezvousMgr(env, worker_name) {}
+RdmaRendezvousMgr::RdmaRendezvousMgr(const WorkerEnv* env)
+    : BaseRendezvousMgr(env) {}
 
 BaseRemoteRendezvous* RdmaRendezvousMgr::Create(int64 step_id,
-                                                const WorkerEnv* worker_env,
-                                                const string& worker_name) {
-  return new RdmaRemoteRendezvous(worker_env, worker_name, step_id, rdma_mgr_);
+                                                const WorkerEnv* worker_env) {
+  return new RdmaRemoteRendezvous(worker_env, step_id, rdma_mgr_);
 }
 
 }  // end namespace tensorflow
diff --git a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
index 57cd4bf5e4..2dedd6c48f 100644
--- a/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
+++ b/tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
@@ -45,13 +45,12 @@ namespace tensorflow {
 // RendezvousMgr must have keys generated by Rendezvous::CreateKey.
 class RdmaRendezvousMgr : public BaseRendezvousMgr {
  public:
-  explicit RdmaRendezvousMgr(const WorkerEnv* env, const string& worker_name,
-                             WorkerCacheInterface* worker_cache);
+  explicit RdmaRendezvousMgr(const WorkerEnv* env);
   void SetRdmaMgr(RdmaMgr* rdma_mgr) { rdma_mgr_ = rdma_mgr; }
 
  protected:
-  BaseRemoteRendezvous* Create(int64 step_id, const WorkerEnv* worker_env,
-                               const string& worker_name) override;
+  BaseRemoteRendezvous* Create(int64 step_id,
+                               const WorkerEnv* worker_env) override;
 
  private:
   RdmaMgr* rdma_mgr_;
diff --git a/tensorflow/contrib/verbs/verbs_server_lib.cc b/tensorflow/contrib/verbs/verbs_server_lib.cc
index b061c81d2d..c359724935 100644
--- a/tensorflow/contrib/verbs/verbs_server_lib.cc
+++ b/tensorflow/contrib/verbs/verbs_server_lib.cc
@@ -27,10 +27,8 @@ namespace tensorflow {
 
 namespace {
 // static utility function
-RendezvousMgrInterface* NewRdmaRendezvousMgr(
-    const WorkerEnv* env, const string& worker_name,
-    WorkerCacheInterface* worker_cache) {
-  return new RdmaRendezvousMgr(env, worker_name, worker_cache);
+RendezvousMgrInterface* NewRdmaRendezvousMgr(const WorkerEnv* env) {
+  return new RdmaRendezvousMgr(env);
 }
 
 }  // namespace
@@ -56,7 +54,7 @@ Status VerbsServer::ChannelCacheFactory(const ServerDef& server_def,
   TF_RETURN_IF_ERROR(ParseChannelSpec(server_def, &channel_spec));
 
   *channel_cache =
-      NewGrpcChannelCache(channel_spec, GetChannelCreationFunction(server_def));
+      NewGrpcChannelCache(channel_spec, GetChannelCreationFunction());
 
   const string host_port = (*channel_cache)->TranslateTask(name_prefix);
   int requested_port;
@@ -86,11 +84,7 @@ Status VerbsServer::Init(ServiceInitFunction service_func,
     rdma_mgr_ = new RdmaMgr(worker_env(), channel_cache_);
     // set rdma_mgr for verbs_service and rdma_rendezvous_mgr
     verbs_service_->SetRdmaMgr(rdma_mgr_);
-    // hardcoded to default session (legacy_session_)
-    // TODO: use WorkerSessionForSession
-    // need to pass in session handle
-    dynamic_cast<RdmaRendezvousMgr*>(
-        worker_env()->session_mgr->LegacySession()->rendezvous_mgr.get())
+    dynamic_cast<RdmaRendezvousMgr*>(worker_env()->rendezvous_mgr)
         ->SetRdmaMgr(rdma_mgr_);
   }
   return s;
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 803b529181..ed3eeb4b21 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -2878,6 +2878,8 @@ filegroup(
         "lib/gif/testdata/scan.gif",
         # GIF data with optimization
         "lib/gif/testdata/optimized.gif",
+        # BMP data
+        "lib/bmp/testdata/lena.bmp",
     ],
     visibility = ["//visibility:public"],
 )
diff --git a/tensorflow/core/common_runtime/gpu/gpu_util.cc b/tensorflow/core/common_runtime/gpu/gpu_util.cc
index 522db80d7f..71f82ec9a1 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_util.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_util.cc
@@ -227,7 +227,7 @@ void GPUUtil::DeviceToDeviceCopy(DeviceContext* send_dev_context,
     }
     // Since we want to use the memory from recv_stream in the
     // send_device_to_device_stream, add a dependency to make sure the memory is
-    // truely free.
+    // truly free.
     // TODO(zhengxq): remove this dependency when we switch to a better way
     // to make sure the memory is free.
     send_device_to_device_stream->ThenWaitFor(recv_stream);
@@ -322,7 +322,7 @@ void GPUUtil::CopyCPUTensorToGPU(const Tensor* cpu_tensor,
     done(errors::Internal("No send gpu copy-out-stream is available."));
     return;
   }
-  // Wait for the recv-stream to make sure the buffer is truely available.
+  // Wait for the recv-stream to make sure the buffer is truly available.
   recv_host_to_device_stream->ThenWaitFor(recv_stream);
 
   const int64 total_bytes = cpu_tensor->TotalBytes();
diff --git a/tensorflow/core/distributed_runtime/README.md b/tensorflow/core/distributed_runtime/README.md
index ab1771e294..d22cd2a45b 100644
--- a/tensorflow/core/distributed_runtime/README.md
+++ b/tensorflow/core/distributed_runtime/README.md
@@ -5,6 +5,4 @@ distributed TensorFlow runtime, using [gRPC](http://grpc.io) for inter-process
 communication.
 
 To learn how to use the distributed runtime to create a TensorFlow cluster,
-see the "Distributed TensorFlow" How To, which is available [in this
-repository](../../g3doc/how_tos/distributed/index.md), and will be available
-on the TensorFlow website after the next version is released.
+see the [Distributed TensorFlow](https://www.tensorflow.org/deploy/distributed) How-To.
diff --git a/tensorflow/core/distributed_runtime/message_wrappers.cc b/tensorflow/core/distributed_runtime/message_wrappers.cc
index b077975ea5..f3bab589a1 100644
--- a/tensorflow/core/distributed_runtime/message_wrappers.cc
+++ b/tensorflow/core/distributed_runtime/message_wrappers.cc
@@ -516,6 +516,7 @@ CostGraphDef* InMemoryRunGraphResponse::mutable_cost_graph() {
 
 RunGraphResponse* InMemoryRunGraphResponse::get_proto() {
   LOG(FATAL) << "Cannot get a mutable protobuf for an InMemoryRunGraphResponse";
+  return NULL;
 }
 
 size_t OwnedProtoRunGraphResponse::num_recvs() const {
@@ -634,6 +635,7 @@ RunMetadata* InMemoryRunStepResponse::mutable_metadata() { return &metadata_; }
 
 RunStepResponse* InMemoryRunStepResponse::get_proto() {
   LOG(FATAL) << "Cannot get a mutable protobuf for an InMemoryRunStepResponse";
+  return NULL;
 }
 
 size_t OwnedProtoRunStepResponse::num_tensors() const {
diff --git a/tensorflow/core/grappler/costs/measuring_cost_estimator.cc b/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
index 6179dc05c1..9262883b2a 100644
--- a/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
+++ b/tensorflow/core/grappler/costs/measuring_cost_estimator.cc
@@ -73,7 +73,7 @@ Status MeasuringCostEstimator::PredictCosts(const GraphDef& optimized_graph,
       return;
     }
     if (!local_status.ok()) {
-      // Discard the data if the run wasn't sucessful.
+      // Discard the data if the run wasn't successful.
       barrier.DecrementCount();
       return;
     }
diff --git a/tensorflow/core/grappler/costs/robust_stats.cc b/tensorflow/core/grappler/costs/robust_stats.cc
index dba6efae0f..9866bc8688 100644
--- a/tensorflow/core/grappler/costs/robust_stats.cc
+++ b/tensorflow/core/grappler/costs/robust_stats.cc
@@ -47,7 +47,7 @@ static double Median(std::vector<double> &&values) {
   // nth_element.
   const auto lower_middle = std::max_element(values.begin(), middle);
   // Preventing overflow. We know that '*lower_middle <= *middle'.
-  // If both are on oposite sides of zero, the sum won't overflow, otherwise
+  // If both are on opposite sides of zero, the sum won't overflow, otherwise
   // the difference won't overflow.
   if (*lower_middle <= 0 && *middle >= 0) {
     return (*lower_middle + *middle) / 2;
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 590d334edc..fd6d5ffa56 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -1625,6 +1625,7 @@ cc_library(
         ":attention_ops",
         ":colorspace_op",
         ":crop_and_resize_op",
+        ":decode_bmp_op",
         ":decode_image_op",
         ":draw_bounding_box_op",
         ":encode_jpeg_op",
@@ -1689,6 +1690,12 @@ tf_kernel_library(
     deps = IMAGE_DEPS,
 )
 
+tf_kernel_library(
+    name = "decode_bmp_op",
+    prefix = "decode_bmp_op",
+    deps = IMAGE_DEPS,
+)
+
 tf_kernel_library(
     name = "decode_image_op",
     prefix = "decode_image_op",
@@ -4166,6 +4173,7 @@ filegroup(
     srcs = [
         "batchtospace_op.cc",
         "ctc_decoder_ops.cc",
+        "decode_bmp_op.cc",
         "depthtospace_op.cc",
         "dynamic_stitch_op.cc",
         "in_topk_op.cc",
@@ -4295,6 +4303,8 @@ filegroup(
             "decode_image_op.*",
             "encode_png_op.*",
             "encode_jpeg_op.*",
+            "decode_jpeg_op.*",
+            "decode_gif_op.*",
             "identity_reader_op.*",
             "remote_fused_graph_execute_op.*",
             "remote_fused_graph_rewriter_transform.*",
diff --git a/tensorflow/core/kernels/basic_ops_benchmark_test.cc b/tensorflow/core/kernels/basic_ops_benchmark_test.cc
index 54532318ce..5726062938 100644
--- a/tensorflow/core/kernels/basic_ops_benchmark_test.cc
+++ b/tensorflow/core/kernels/basic_ops_benchmark_test.cc
@@ -22,7 +22,7 @@ limitations under the License.
 
 namespace tensorflow {
 
-// We focus on the single thread performance of runing ops.
+// We focus on the single thread performance of running ops.
 static SessionOptions InitOptions() {
   SessionOptions opts;
   opts.config.set_intra_op_parallelism_threads(1);
diff --git a/tensorflow/core/kernels/decode_bmp_op.cc b/tensorflow/core/kernels/decode_bmp_op.cc
new file mode 100644
index 0000000000..086369a9f1
--- /dev/null
+++ b/tensorflow/core/kernels/decode_bmp_op.cc
@@ -0,0 +1,143 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+// See docs in ../ops/image_ops.cc
+
+#include <memory>
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/framework/types.pb.h"
+#include "tensorflow/core/kernels/bounds_check.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/logging.h"
+
+namespace tensorflow {
+
+// Decode the contents of a BMP file
+class DecodeBmpOp : public OpKernel {
+ public:
+  explicit DecodeBmpOp(OpKernelConstruction* context) : OpKernel(context) {
+    OP_REQUIRES_OK(context, context->GetAttr("channels", &channels_));
+    OP_REQUIRES(
+        context, channels_ == 0 || channels_ == 3 || channels_ == 4,
+        errors::InvalidArgument("channels must be 0, 3 or 4, got ", channels_));
+  }
+
+  void Compute(OpKernelContext* context) override {
+    const Tensor& contents = context->input(0);
+    OP_REQUIRES(context, TensorShapeUtils::IsScalar(contents.shape()),
+                errors::InvalidArgument("contents must be scalar, got shape ",
+                                        contents.shape().DebugString()));
+
+    // Start decoding image to get shape details
+    const StringPiece input = contents.scalar<string>()();
+
+    const uint8* img_bytes = reinterpret_cast<const uint8*>(input.data());
+    const int32 header_size = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 10)));
+    const int32 width = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 18)));
+    const int32 height = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 22)));
+    const int32 bpp = internal::SubtleMustCopy(
+        *(reinterpret_cast<const int32*>(img_bytes + 28)));
+
+    if (channels_) {
+      OP_REQUIRES(context, (channels_ == bpp / 8),
+                  errors::InvalidArgument(
+                      "channels attribute ", channels_,
+                      " does not match bits per pixel from file ", bpp / 8));
+    } else {
+      channels_ = bpp / 8;
+    }
+
+    // Current implementation only supports 3 or 4 channel
+    // bitmaps.
+    OP_REQUIRES(context, (channels_ == 3 || channels_ == 4),
+                errors::InvalidArgument(
+                    "Number of channels must be 3 or 4, was ", channels_));
+
+    // if height is negative, data layout is top down
+    // otherwise, it's bottom up
+    bool top_down = (height < 0);
+
+    // Decode image, allocating tensor once the image size is known
+    Tensor* output = nullptr;
+    OP_REQUIRES_OK(
+        context, context->allocate_output(
+                     0, TensorShape({abs(height), width, channels_}), &output));
+
+    const uint8* bmp_pixels = &img_bytes[header_size];
+
+    Decode(bmp_pixels, output->flat<uint8>().data(), width, abs(height),
+           channels_, top_down);
+  }
+
+  uint8* Decode(const uint8* input, uint8* const output, const int width,
+                const int height, const int channles, bool top_down);
+
+ private:
+  int channels_;
+};
+REGISTER_KERNEL_BUILDER(Name("DecodeBmp").Device(DEVICE_CPU), DecodeBmpOp);
+
+uint8* DecodeBmpOp::Decode(const uint8* input, uint8* const output,
+                           const int width, const int height,
+                           const int channels, bool top_down) {
+  // there may be padding bytes when the width is not a multiple of 4 bytes
+  // 8 * channels == bits per pixel
+  int row_size = (8 * channels * width + 31) / 32 * 4;
+
+  for (int i = 0; i < height; i++) {
+    int src_pos;
+    int dst_pos;
+
+    for (int j = 0; j < width; j++) {
+      if (!top_down) {
+        src_pos = ((height - 1 - i) * row_size) + j * channels;
+      } else {
+        src_pos = i * row_size + j * channels;
+      }
+
+      dst_pos = (i * width + j) * channels;
+
+      switch (channels) {
+        case 3:
+          // BGR -> RGB
+          output[dst_pos] = input[src_pos + 2];
+          output[dst_pos + 1] = input[src_pos + 1];
+          output[dst_pos + 2] = input[src_pos];
+          break;
+        case 4:
+          // BGRA -> RGBA
+          output[dst_pos] = input[src_pos + 2];
+          output[dst_pos + 1] = input[src_pos + 1];
+          output[dst_pos + 2] = input[src_pos];
+          output[dst_pos + 3] = input[src_pos + 3];
+          break;
+        default:
+          LOG(FATAL) << "Unexpected number of channels: " << channels;
+          break;
+      }
+    }
+  }
+
+  return output;
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/deep_conv2d.cc b/tensorflow/core/kernels/deep_conv2d.cc
index 9e6d8e42a4..a481401479 100644
--- a/tensorflow/core/kernels/deep_conv2d.cc
+++ b/tensorflow/core/kernels/deep_conv2d.cc
@@ -1069,7 +1069,7 @@ struct DeepConv2D<CPUDevice, T> {
       // Allocate temporary buffer 'buffer2', which is first used for
       // transformed input tiles, then re-used for transformed output tiles.
       // Calculate required buffer size for 'buffer2' as max required buffer
-      // between input and output tranform buffer sizes.
+      // between input and output transform buffer sizes.
       const int64 buffer2_tile_transform_size =
           tile_spatial_size * num_tiles * in_depth;
       const int64 buffer2_out_transform_size =
diff --git a/tensorflow/core/kernels/depthwise_conv_op.cc b/tensorflow/core/kernels/depthwise_conv_op.cc
index 26d45f79d8..2e7213f956 100644
--- a/tensorflow/core/kernels/depthwise_conv_op.cc
+++ b/tensorflow/core/kernels/depthwise_conv_op.cc
@@ -441,7 +441,9 @@ class DepthwiseConv2dNativeOp : public BinaryOp<T> {
       DepthwiseConv2dNativeOp<CPUDevice, T>);
 
 TF_CALL_float(REGISTER_CPU_KERNEL);
+#if defined(PLATFORM_WINDOWS) && !defined(_DEBUG)
 TF_CALL_double(REGISTER_CPU_KERNEL);
+#endif
 
 #if GOOGLE_CUDA
 REGISTER_KERNEL_BUILDER(
diff --git a/tensorflow/core/kernels/fft_ops.cc b/tensorflow/core/kernels/fft_ops.cc
index c4cfd514c3..21e6c69464 100644
--- a/tensorflow/core/kernels/fft_ops.cc
+++ b/tensorflow/core/kernels/fft_ops.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 #define EIGEN_USE_THREADS
 
-// See docs in ../ops/fft_ops.cc.
+// See docs in ../ops/spectral_ops.cc.
 
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op.h"
@@ -29,22 +29,13 @@ limitations under the License.
 
 #if GOOGLE_CUDA
 #include "tensorflow/core/platform/stream_executor.h"
+#endif
 
 namespace tensorflow {
 
-namespace {
-// TODO(vrv/zhifengc): Refactor AsDeviceMemory() into GPUUtil.
-template <typename T>
-perftools::gputools::DeviceMemory<T> AsDeviceMemory(const T* cuda_memory) {
-  perftools::gputools::DeviceMemoryBase wrapped(const_cast<T*>(cuda_memory));
-  perftools::gputools::DeviceMemory<T> typed(wrapped);
-  return typed;
-}
-}  // end namespace
-
-class FFTGPUBase : public OpKernel {
+class FFTBase : public OpKernel {
  public:
-  explicit FFTGPUBase(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+  explicit FFTBase(OpKernelConstruction* ctx) : OpKernel(ctx) {}
 
   void Compute(OpKernelContext* ctx) override {
     const Tensor& in = ctx->input(0);
@@ -97,9 +88,110 @@ class FFTGPUBase : public OpKernel {
   virtual bool IsForward() const = 0;
   virtual bool IsReal() const = 0;
 
- private:
+  // The function that actually computes the FFT.
+  virtual void DoFFT(OpKernelContext* ctx, const Tensor& in, uint64* fft_shape,
+                     Tensor* out) = 0;
+};
+
+typedef Eigen::ThreadPoolDevice CPUDevice;
+
+template <bool Forward, bool _Real, int FFTRank>
+class FFTCPU : public FFTBase {
+ public:
+  using FFTBase::FFTBase;
+
+ protected:
+  int Rank() const override { return FFTRank; }
+  bool IsForward() const override { return Forward; }
+  bool IsReal() const override { return _Real; }
+
   void DoFFT(OpKernelContext* ctx, const Tensor& in, uint64* fft_shape,
-             Tensor* out) {
+             Tensor* out) override {
+    // Create the axes (which are always trailing).
+    auto axes = Eigen::ArrayXi::LinSpaced(FFTRank, 1, FFTRank);
+    auto device = ctx->eigen_device<CPUDevice>();
+
+    if (!IsReal()) {
+      auto input = ((Tensor)in).flat_inner_dims<complex64, FFTRank + 1>();
+      // Compute the FFT using eigen.
+      auto output = out->flat_inner_dims<complex64, FFTRank + 1>();
+      output.device(device) = input.template fft < Eigen::BothParts,
+      Forward ? Eigen::FFT_FORWARD : Eigen::FFT_REVERSE > (axes);
+    } else {
+      if (IsForward()) {
+        auto input = ((Tensor)in).flat_inner_dims<float, FFTRank + 1>();
+        auto output = out->flat_inner_dims<complex64, FFTRank + 1>();
+        Eigen::DSizes<Eigen::DenseIndex, FFTRank + 1> startIndices;
+
+        // Compute the full FFT using a temporary tensor.
+        Tensor temp;
+        OP_REQUIRES_OK(ctx, ctx->allocate_temp(DataTypeToEnum<complex64>::v(),
+                                               in.shape(), &temp));
+        auto full_fft = temp.flat_inner_dims<complex64, FFTRank + 1>();
+        full_fft.device(device) =
+            input.template fft<Eigen::BothParts, Eigen::FFT_FORWARD>(axes);
+
+        // Slice away the negative frequency components.
+        output.device(device) =
+            full_fft.slice(startIndices, output.dimensions());
+      } else {
+        // TODO: reconstruct the full fft and take the inverse.
+        ctx->CtxFailureWithWarning(
+            errors::Unimplemented("IRFFT is not implemented as a CPU kernel"));
+      }
+    }
+  }
+};
+
+// Use labels to distinguish between internal and open source versions
+// of these kernels.
+#ifdef PLATFORM_GOOGLE
+#define FFT_LABEL "eigen"
+#else
+#define FFT_LABEL ""
+#endif
+
+REGISTER_KERNEL_BUILDER(Name("FFT").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<true, false, 1>);
+REGISTER_KERNEL_BUILDER(Name("IFFT").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<false, false, 1>);
+REGISTER_KERNEL_BUILDER(Name("FFT2D").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<true, false, 2>);
+REGISTER_KERNEL_BUILDER(Name("IFFT2D").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<false, false, 2>);
+REGISTER_KERNEL_BUILDER(Name("FFT3D").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<true, false, 3>);
+REGISTER_KERNEL_BUILDER(Name("IFFT3D").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<false, false, 3>);
+
+REGISTER_KERNEL_BUILDER(Name("RFFT").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<true, true, 1>);
+REGISTER_KERNEL_BUILDER(Name("RFFT2D").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<true, true, 2>);
+REGISTER_KERNEL_BUILDER(Name("RFFT3D").Device(DEVICE_CPU).Label(FFT_LABEL),
+                        FFTCPU<true, true, 3>);
+
+#undef FFT_LABEL
+
+#if GOOGLE_CUDA
+
+namespace {
+// TODO(vrv/zhifengc): Refactor AsDeviceMemory() into GPUUtil.
+template <typename T>
+perftools::gputools::DeviceMemory<T> AsDeviceMemory(const T* cuda_memory) {
+  perftools::gputools::DeviceMemoryBase wrapped(const_cast<T*>(cuda_memory));
+  perftools::gputools::DeviceMemory<T> typed(wrapped);
+  return typed;
+}
+}  // end namespace
+
+class FFTGPUBase : public FFTBase {
+ public:
+  using FFTBase::FFTBase;
+
+ protected:
+  void DoFFT(OpKernelContext* ctx, const Tensor& in, uint64* fft_shape,
+             Tensor* out) override {
     auto* stream = ctx->op_device_context()->stream();
     OP_REQUIRES(ctx, stream, errors::Internal("No GPU stream available."));
 
@@ -238,7 +330,6 @@ REGISTER_KERNEL_BUILDER(Name("BatchFFT3D").Device(DEVICE_GPU),
                         FFTGPU<true, false, 3>);
 REGISTER_KERNEL_BUILDER(Name("BatchIFFT3D").Device(DEVICE_GPU),
                         FFTGPU<false, false, 3>);
+#endif  // GOOGLE_CUDA
 
 }  // end namespace tensorflow
-
-#endif  // GOOGLE_CUDA
diff --git a/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc b/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc
index aff78837a3..b672db2016 100644
--- a/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc
+++ b/tensorflow/core/kernels/hexagon/graph_transfer_utils.cc
@@ -114,13 +114,13 @@ GraphTransferUtils::BuildRemoteFusedGraphExecuteInfo(
   for (const std::pair<string, Tensor>& input_node_info : inputs) {
     const Scope& scope = root.WithOpName(input_node_info.first);
     Node* ret;
-    const auto unique_name = scope.GetUniqueNameForOp("PlaceholderV2");
-    auto builder = NodeBuilder(unique_name, "PlaceholderV2")
+    const auto unique_name = scope.GetUniqueNameForOp("Placeholder");
+    auto builder = NodeBuilder(unique_name, "Placeholder")
                        .Attr("dtype", input_node_info.second.dtype())
                        .Attr("shape", input_node_info.second.shape());
     scope.UpdateBuilder(&builder);
     scope.UpdateStatus(builder.Finalize(scope.graph(), &ret));
-    CHECK(scope.ok());
+    TF_CHECK_OK(scope.status());
     output_list.emplace_back(Output(ret, 0));
     input_types.push_back(input_node_info.second.dtype());
   }
diff --git a/tensorflow/core/kernels/non_max_suppression_op.cc b/tensorflow/core/kernels/non_max_suppression_op.cc
index 4d4851c70c..9ffe71e031 100644
--- a/tensorflow/core/kernels/non_max_suppression_op.cc
+++ b/tensorflow/core/kernels/non_max_suppression_op.cc
@@ -33,6 +33,7 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.h"
 
 namespace tensorflow {
+namespace {
 
 typedef Eigen::ThreadPoolDevice CPUDevice;
 
@@ -89,6 +90,59 @@ static inline float ComputeIOU(typename TTypes<float, 2>::ConstTensor boxes,
   return intersection_area / (area_i + area_j - intersection_area);
 }
 
+void DoNonMaxSuppressionOp(OpKernelContext* context, const Tensor& boxes,
+                           const Tensor& scores, const Tensor& max_output_size,
+                           const float iou_threshold) {
+  OP_REQUIRES(context, iou_threshold >= 0 && iou_threshold <= 1,
+              errors::InvalidArgument("iou_threshold must be in [0, 1]"));
+
+  int num_boxes = 0;
+  ParseAndCheckBoxSizes(context, boxes, scores, &num_boxes);
+  if (!context->status().ok()) {
+    return;
+  }
+
+  const int output_size = std::min(max_output_size.scalar<int>()(), num_boxes);
+  typename TTypes<float, 2>::ConstTensor boxes_data = boxes.tensor<float, 2>();
+
+  std::vector<float> scores_data(num_boxes);
+  std::copy_n(scores.flat<float>().data(), num_boxes, scores_data.begin());
+  std::vector<int> sorted_indices;
+  DecreasingArgSort(scores_data, &sorted_indices);
+
+  std::vector<bool> active(num_boxes, true);
+  std::vector<int> selected;
+  int num_active = active.size();
+  for (int i = 0; i < num_boxes; ++i) {
+    if (num_active == 0 || selected.size() >= output_size) break;
+    if (active[i]) {
+      selected.push_back(sorted_indices[i]);
+    } else {
+      continue;
+    }
+    for (int j = i + 1; j < num_boxes; ++j) {
+      if (active[j]) {
+        float iou =
+            ComputeIOU(boxes_data, sorted_indices[i], sorted_indices[j]);
+        if (iou > iou_threshold) {
+          active[j] = false;
+          num_active--;
+        }
+      }
+    }
+  }
+
+  // Allocate output tensor
+  Tensor* output = nullptr;
+  TensorShape output_shape({static_cast<int>(selected.size())});
+  OP_REQUIRES_OK(context, context->allocate_output(0, output_shape, &output));
+  typename TTypes<int, 1>::Tensor selected_indices_data =
+      output->tensor<int, 1>();
+  std::copy_n(selected.begin(), selected.size(), selected_indices_data.data());
+}
+
+}  // namespace
+
 template <typename Device>
 class NonMaxSuppressionOp : public OpKernel {
  public:
@@ -98,9 +152,6 @@ class NonMaxSuppressionOp : public OpKernel {
   }
 
   void Compute(OpKernelContext* context) override {
-    OP_REQUIRES(context, iou_threshold_ >= 0 && iou_threshold_ <= 1,
-                errors::InvalidArgument("iou_threshold must be in [0, 1]"));
-
     // boxes: [num_boxes, 4]
     const Tensor& boxes = context->input(0);
     // scores: [num_boxes]
@@ -112,59 +163,48 @@ class NonMaxSuppressionOp : public OpKernel {
         errors::InvalidArgument("max_output_size must be 0-D, got shape ",
                                 max_output_size.shape().DebugString()));
 
-    int num_boxes = 0;
-    ParseAndCheckBoxSizes(context, boxes, scores, &num_boxes);
-    if (!context->status().ok()) {
-      return;
-    }
-
-    const int output_size =
-        std::min(max_output_size.scalar<int>()(), num_boxes);
-    typename TTypes<float, 2>::ConstTensor boxes_data =
-        boxes.tensor<float, 2>();
-
-    std::vector<float> scores_data(num_boxes);
-    std::copy_n(scores.flat<float>().data(), num_boxes, scores_data.begin());
-    std::vector<int> sorted_indices;
-    DecreasingArgSort(scores_data, &sorted_indices);
-
-    std::vector<bool> active(num_boxes, true);
-    std::vector<int> selected;
-    int num_active = active.size();
-    for (int i = 0; i < num_boxes; ++i) {
-      if (num_active == 0 || selected.size() >= output_size) break;
-      if (active[i]) {
-        selected.push_back(sorted_indices[i]);
-      } else {
-        continue;
-      }
-      for (int j = i + 1; j < num_boxes; ++j) {
-        if (active[j]) {
-          float iou =
-              ComputeIOU(boxes_data, sorted_indices[i], sorted_indices[j]);
-          if (iou > iou_threshold_) {
-            active[j] = false;
-            num_active--;
-          }
-        }
-      }
-    }
-
-    // Allocate output tensor
-    Tensor* output = nullptr;
-    TensorShape output_shape({static_cast<int>(selected.size())});
-    OP_REQUIRES_OK(context, context->allocate_output(0, output_shape, &output));
-    typename TTypes<int, 1>::Tensor selected_indices_data =
-        output->tensor<int, 1>();
-    std::copy_n(selected.begin(), selected.size(),
-                selected_indices_data.data());
+    DoNonMaxSuppressionOp(context, boxes, scores, max_output_size,
+                          iou_threshold_);
   }
 
  private:
   float iou_threshold_;
 };
 
+template <typename Device>
+class NonMaxSuppressionV2Op : public OpKernel {
+ public:
+  explicit NonMaxSuppressionV2Op(OpKernelConstruction* context)
+      : OpKernel(context) {}
+
+  void Compute(OpKernelContext* context) override {
+    // boxes: [num_boxes, 4]
+    const Tensor& boxes = context->input(0);
+    // scores: [num_boxes]
+    const Tensor& scores = context->input(1);
+    // max_output_size: scalar
+    const Tensor& max_output_size = context->input(2);
+    OP_REQUIRES(
+        context, TensorShapeUtils::IsScalar(max_output_size.shape()),
+        errors::InvalidArgument("max_output_size must be 0-D, got shape ",
+                                max_output_size.shape().DebugString()));
+    // iou_threshold: scalar
+    const Tensor& iou_threshold = context->input(3);
+    OP_REQUIRES(context, TensorShapeUtils::IsScalar(iou_threshold.shape()),
+                errors::InvalidArgument("iou_threshold must be 0-D, got shape ",
+                                        iou_threshold.shape().DebugString()));
+
+    const float iou_threshold_val = iou_threshold.scalar<float>()();
+
+    DoNonMaxSuppressionOp(context, boxes, scores, max_output_size,
+                          iou_threshold_val);
+  }
+};
+
 REGISTER_KERNEL_BUILDER(Name("NonMaxSuppression").Device(DEVICE_CPU),
                         NonMaxSuppressionOp<CPUDevice>);
 
+REGISTER_KERNEL_BUILDER(Name("NonMaxSuppressionV2").Device(DEVICE_CPU),
+                        NonMaxSuppressionV2Op<CPUDevice>);
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/non_max_suppression_op_test.cc b/tensorflow/core/kernels/non_max_suppression_op_test.cc
index 72e368db77..a72c220cbf 100644
--- a/tensorflow/core/kernels/non_max_suppression_op_test.cc
+++ b/tensorflow/core/kernels/non_max_suppression_op_test.cc
@@ -173,4 +173,167 @@ TEST_F(NonMaxSuppressionOpTest, TestEmptyInput) {
   test::ExpectTensorEqual<int>(expected, *GetOutput(0));
 }
 
+//
+// NonMaxSuppressionV2Op Tests
+//
+
+class NonMaxSuppressionV2OpTest : public OpsTestBase {
+ protected:
+  void MakeOp() {
+    TF_EXPECT_OK(NodeDefBuilder("non_max_suppression_op", "NonMaxSuppressionV2")
+                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(DT_FLOAT))
+                     .Input(FakeInput(DT_INT32))
+                     .Input(FakeInput(DT_FLOAT))
+                     .Finalize(node_def()));
+    TF_EXPECT_OK(InitOp());
+  }
+};
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromThreeClusters) {
+  MakeOp();
+  AddInputFromArray<float>(
+      TensorShape({6, 4}),
+      {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+       0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,   1, 101});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
+  test::FillValues<int>(&expected, {3, 0, 5});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest,
+       TestSelectFromThreeClustersFlippedCoordinates) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({6, 4}),
+                           {1, 1,  0, 0,  0, 0.1f,  1, 1.1f,  0, .9f, 1, -0.1f,
+                            0, 10, 1, 11, 1, 10.1f, 0, 11.1f, 1, 101, 0, 100});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
+  test::FillValues<int>(&expected, {3, 0, 5});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectAtMostTwoBoxesFromThreeClusters) {
+  MakeOp();
+  AddInputFromArray<float>(
+      TensorShape({6, 4}),
+      {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+       0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,   1, 101});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {2});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({2}));
+  test::FillValues<int>(&expected, {3, 0});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest,
+       TestSelectAtMostThirtyBoxesFromThreeClusters) {
+  MakeOp();
+  AddInputFromArray<float>(
+      TensorShape({6, 4}),
+      {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+       0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,   1, 101});
+  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
+  AddInputFromArray<int>(TensorShape({}), {30});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
+  test::FillValues<int>(&expected, {3, 0, 5});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectSingleBox) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
+  AddInputFromArray<float>(TensorShape({1}), {.9f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({1}));
+  test::FillValues<int>(&expected, {0});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromTenIdenticalBoxes) {
+  MakeOp();
+
+  int num_boxes = 10;
+  std::vector<float> corners(num_boxes * 4);
+  std::vector<float> scores(num_boxes);
+  for (int i = 0; i < num_boxes; ++i) {
+    corners[i * 4 + 0] = 0;
+    corners[i * 4 + 1] = 0;
+    corners[i * 4 + 2] = 1;
+    corners[i * 4 + 3] = 1;
+    scores[i] = .9;
+  }
+  AddInputFromArray<float>(TensorShape({num_boxes, 4}), corners);
+  AddInputFromArray<float>(TensorShape({num_boxes}), scores);
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({1}));
+  test::FillValues<int>(&expected, {0});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestInconsistentBoxAndScoreShapes) {
+  MakeOp();
+  AddInputFromArray<float>(
+      TensorShape({6, 4}),
+      {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
+       0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,   1, 101});
+  AddInputFromArray<float>(TensorShape({5}), {.9f, .75f, .6f, .95f, .5f});
+  AddInputFromArray<int>(TensorShape({}), {30});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  Status s = RunOpKernel();
+
+  ASSERT_FALSE(s.ok());
+  EXPECT_TRUE(
+      StringPiece(s.ToString()).contains("scores has incompatible shape"))
+      << s;
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestInvalidIOUThreshold) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
+  AddInputFromArray<float>(TensorShape({1}), {.9f});
+  AddInputFromArray<int>(TensorShape({}), {3});
+  AddInputFromArray<float>(TensorShape({}), {1.2f});
+  Status s = RunOpKernel();
+
+  ASSERT_FALSE(s.ok());
+  EXPECT_TRUE(
+      StringPiece(s.ToString()).contains("iou_threshold must be in [0, 1]"))
+      << s;
+}
+
+TEST_F(NonMaxSuppressionV2OpTest, TestEmptyInput) {
+  MakeOp();
+  AddInputFromArray<float>(TensorShape({0, 4}), {});
+  AddInputFromArray<float>(TensorShape({0}), {});
+  AddInputFromArray<int>(TensorShape({}), {30});
+  AddInputFromArray<float>(TensorShape({}), {.5f});
+  TF_ASSERT_OK(RunOpKernel());
+
+  Tensor expected(allocator(), DT_INT32, TensorShape({0}));
+  test::FillValues<int>(&expected, {});
+  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
+}
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc b/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
index 112168b195..655de2f98f 100644
--- a/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
+++ b/tensorflow/core/kernels/remote_fused_graph_execute_op_test.cc
@@ -89,8 +89,8 @@ static Output BuildPlaceHolderOp(const string& name, const DataType dt,
                                  const TensorShape& tensor_shape, Scope* root) {
   const Scope& scope = root->WithOpName(name);
   Node* ret;
-  const string unique_name = scope.GetUniqueNameForOp("PlaceholderV2");
-  NodeBuilder builder = NodeBuilder(unique_name, "PlaceholderV2")
+  const string unique_name = scope.GetUniqueNameForOp("Placeholder");
+  NodeBuilder builder = NodeBuilder(unique_name, "Placeholder")
                             .Attr("dtype", dt)
                             .Attr("shape", tensor_shape);
   scope.UpdateBuilder(&builder);
diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index 3b2fa29693..d331a8debf 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -245,12 +245,22 @@ struct ApplyAdamNonCuda {
                   typename TTypes<T>::ConstScalar beta1,
                   typename TTypes<T>::ConstScalar beta2,
                   typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad) {
+                  typename TTypes<T>::ConstFlat grad, bool use_nesterov) {
     const T alpha = lr() * Eigen::numext::sqrt(T(1) - beta2_power()) /
                     (T(1) - beta1_power());
+    // beta1 == μ
+    // beta2 == ν
+    // v     == n
+    // var   == θ
+
     m.device(d) += (grad - m) * (T(1) - beta1());
     v.device(d) += (grad.square() - v) * (T(1) - beta2());
-    var.device(d) -= (m * alpha) / (v.sqrt() + epsilon());
+    if (use_nesterov) {
+      var.device(d) -= ((grad * (T(1) - beta1()) + beta1() * m) * alpha) /
+                       (v.sqrt() + epsilon());
+    } else {
+      var.device(d) -= (m * alpha) / (v.sqrt() + epsilon());
+    }
   }
 };
 
@@ -2248,6 +2258,7 @@ class ApplyAdamOp : public OpKernel {
  public:
   explicit ApplyAdamOp(OpKernelConstruction* ctx) : OpKernel(ctx) {
     OP_REQUIRES_OK(ctx, ctx->GetAttr("use_locking", &use_exclusive_lock_));
+    OP_REQUIRES_OK(ctx, ctx->GetAttr("use_nesterov", &use_nesterov_));
   }
 
   void Compute(OpKernelContext* ctx) override {
@@ -2318,17 +2329,18 @@ class ApplyAdamOp : public OpKernel {
                                 grad.shape().DebugString()));
 
     const Device& device = ctx->template eigen_device<Device>();
-    functor::ApplyAdam<Device, T>()(device, var.flat<T>(), m.flat<T>(),
-                                    v.flat<T>(), beta1_power.scalar<T>(),
-                                    beta2_power.scalar<T>(), lr.scalar<T>(),
-                                    beta1.scalar<T>(), beta2.scalar<T>(),
-                                    epsilon.scalar<T>(), grad.flat<T>());
+    functor::ApplyAdam<Device, T>()(
+        device, var.flat<T>(), m.flat<T>(), v.flat<T>(),
+        beta1_power.scalar<T>(), beta2_power.scalar<T>(), lr.scalar<T>(),
+        beta1.scalar<T>(), beta2.scalar<T>(), epsilon.scalar<T>(),
+        grad.flat<T>(), use_nesterov_);
 
     MaybeForwardRefInputToRefOutput(ctx, 0, 0);
   }
 
  private:
   bool use_exclusive_lock_;
+  bool use_nesterov_;
 };
 
 using CPUDevice = Eigen::ThreadPoolDevice;
@@ -2372,7 +2384,7 @@ namespace functor {
       typename TTypes<T>::ConstScalar beta1,                  \
       typename TTypes<T>::ConstScalar beta2,                  \
       typename TTypes<T>::ConstScalar epsilon,                \
-      typename TTypes<T>::ConstFlat grad);                    \
+      typename TTypes<T>::ConstFlat grad, bool use_nesterov); \
   extern template struct ApplyAdam<GPUDevice, T>;
 DECLARE_GPU_SPEC(Eigen::half);
 DECLARE_GPU_SPEC(float);
diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index c96468b270..11c9faa4ec 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -123,7 +123,7 @@ struct ApplyAdam {
                   typename TTypes<T>::ConstScalar beta1,
                   typename TTypes<T>::ConstScalar beta2,
                   typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad);
+                  typename TTypes<T>::ConstFlat grad, bool use_nesterov);
 };
 
 template <typename Device, typename T>
diff --git a/tensorflow/core/kernels/training_ops_gpu.cu.cc b/tensorflow/core/kernels/training_ops_gpu.cu.cc
index f6acdf2422..3678b96e98 100644
--- a/tensorflow/core/kernels/training_ops_gpu.cu.cc
+++ b/tensorflow/core/kernels/training_ops_gpu.cu.cc
@@ -109,7 +109,7 @@ struct ApplyAdam<GPUDevice, T> {
                   typename TTypes<T>::ConstScalar beta1,
                   typename TTypes<T>::ConstScalar beta2,
                   typename TTypes<T>::ConstScalar epsilon,
-                  typename TTypes<T>::ConstFlat grad) {
+                  typename TTypes<T>::ConstFlat grad, bool use_nesterov) {
     Eigen::array<typename TTypes<T>::Tensor::Index, 1> bcast;
     bcast[0] = grad.dimension(0);
     Eigen::Sizes<1> single;
@@ -122,11 +122,25 @@ struct ApplyAdam<GPUDevice, T> {
         v +
         (beta2.constant(one) - beta2).reshape(single).broadcast(bcast) *
             (grad.square() - v);
-    var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
-                      (beta1_power.constant(one) - beta1_power))
-                         .reshape(single)
-                         .broadcast(bcast) *
-                     m / (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
+
+    if (use_nesterov) {
+      var.device(d) -=
+          (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
+           (beta1_power.constant(one) - beta1_power))
+              .reshape(single)
+              .broadcast(bcast) *
+          (m * beta1.reshape(single).broadcast(bcast) +
+           (beta1.constant(one) - beta1).reshape(single).broadcast(bcast) *
+               grad) /
+          (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
+    } else {
+      var.device(d) -= (lr * (beta2_power.constant(one) - beta2_power).sqrt() /
+                        (beta1_power.constant(one) - beta1_power))
+                           .reshape(single)
+                           .broadcast(bcast) *
+                       m /
+                       (epsilon.reshape(single).broadcast(bcast) + v.sqrt());
+    }
   }
 };
 
diff --git a/tensorflow/core/lib/bmp/testdata/lena.bmp b/tensorflow/core/lib/bmp/testdata/lena.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..8c4882de4a78355fbfe9d5750627116645bc8503
GIT binary patch
literal 4194
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

literal 0
HcmV?d00001

diff --git a/tensorflow/core/lib/gtl/inlined_vector_test.cc b/tensorflow/core/lib/gtl/inlined_vector_test.cc
index b957fedc4a..6e3c083f58 100644
--- a/tensorflow/core/lib/gtl/inlined_vector_test.cc
+++ b/tensorflow/core/lib/gtl/inlined_vector_test.cc
@@ -816,7 +816,7 @@ static void BM_StdVectorFillString(int iters, int len) {
   }
   testing::ItemsProcessed(int64{iters} * len);
   // The purpose of the benchmark is to verify that inlined vector is
-  // efficient when moving is more efficent than copying. To do so, we
+  // efficient when moving is more efficient than copying. To do so, we
   // use strings that are larger than the small string optimization.
   CHECK(!StringRepresentedInline(strings[0]));
 }
diff --git a/tensorflow/core/ops/image_ops.cc b/tensorflow/core/ops/image_ops.cc
index cfcf2d1ff9..f2a8d8718d 100644
--- a/tensorflow/core/ops/image_ops.cc
+++ b/tensorflow/core/ops/image_ops.cc
@@ -563,6 +563,28 @@ compression: Compression level.
 contents: 0-D. PNG-encoded image.
 )doc");
 
+// --------------------------------------------------------------------------
+REGISTER_OP("DecodeBmp")
+    .Input("contents: string")
+    .Output("image: uint8")
+    .Attr("channels: int = 0")
+    .SetShapeFn(DecodeImageShapeFn)
+    .Doc(R"doc(
+Decode the first frame of a BMP-encoded image to a uint8 tensor.
+
+The attr `channels` indicates the desired number of color channels for the
+decoded image.
+
+Accepted values are:
+
+*   0: Use the number of channels in the BMP-encoded image.
+*   3: output an RGB image.
+*   4: output an RGBA image.
+
+contents: 0-D.  The BMP-encoded image.
+image: 3-D with shape `[height, width, channels]`. RGB order
+)doc");
+
 // --------------------------------------------------------------------------
 REGISTER_OP("DecodeGif")
     .Input("contents: string")
@@ -992,16 +1014,13 @@ is agnostic to where the origin is in the coordinate system.  Note that this
 algorithm is invariant to orthogonal transformations and translations
 of the coordinate system; thus translating or reflections of the coordinate
 system result in the same boxes being selected by the algorithm.
-
 The output of this operation is a set of integers indexing into the input
 collection of bounding boxes representing the selected boxes.  The bounding
 box coordinates corresponding to the selected indices can then be obtained
 using the `tf.gather operation`.  For example:
-
   selected_indices = tf.image.non_max_suppression(
       boxes, scores, max_output_size, iou_threshold)
   selected_boxes = tf.gather(boxes, selected_indices)
-
 boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
 scores: A 1-D float tensor of shape `[num_boxes]` representing a single
   score corresponding to each box (each row of boxes).
@@ -1013,4 +1032,46 @@ selected_indices: A 1-D integer tensor of shape `[M]` representing the selected
   indices from the boxes tensor, where `M <= max_output_size`.
 )doc");
 
+REGISTER_OP("NonMaxSuppressionV2")
+    .Input("boxes: float")
+    .Input("scores: float")
+    .Input("max_output_size: int32")
+    .Input("iou_threshold: float")
+    .Output("selected_indices: int32")
+    .SetShapeFn([](InferenceContext* c) {
+      c->set_output(0, c->Vector(c->UnknownDim()));
+      return Status::OK();
+    })
+    .Doc(R"doc(
+Greedily selects a subset of bounding boxes in descending order of score,
+pruning away boxes that have high intersection-over-union (IOU) overlap
+with previously selected boxes.  Bounding boxes are supplied as
+[y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any
+diagonal pair of box corners and the coordinates can be provided as normalized
+(i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm
+is agnostic to where the origin is in the coordinate system.  Note that this
+algorithm is invariant to orthogonal transformations and translations
+of the coordinate system; thus translating or reflections of the coordinate
+system result in the same boxes being selected by the algorithm.
+
+The output of this operation is a set of integers indexing into the input
+collection of bounding boxes representing the selected boxes.  The bounding
+box coordinates corresponding to the selected indices can then be obtained
+using the `tf.gather operation`.  For example:
+
+  selected_indices = tf.image.non_max_suppression_v2(
+      boxes, scores, max_output_size, iou_threshold)
+  selected_boxes = tf.gather(boxes, selected_indices)
+
+boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
+scores: A 1-D float tensor of shape `[num_boxes]` representing a single
+  score corresponding to each box (each row of boxes).
+max_output_size: A scalar integer tensor representing the maximum number of
+  boxes to be selected by non max suppression.
+iou_threshold: A 0-D float tensor representing the threshold for deciding whether
+  boxes overlap too much with respect to IOU.
+selected_indices: A 1-D integer tensor of shape `[M]` representing the selected
+  indices from the boxes tensor, where `M <= max_output_size`.
+)doc");
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/sdca_ops.cc b/tensorflow/core/ops/sdca_ops.cc
index b9a37119b7..dea75a1af8 100644
--- a/tensorflow/core/ops/sdca_ops.cc
+++ b/tensorflow/core/ops/sdca_ops.cc
@@ -105,7 +105,7 @@ example_weights: a vector which contains the weight associated with each
 example_labels: a vector which contains the label/target associated with each
   example.
 sparse_indices: a list of vectors where each value is the indices which has
-  corresponding weights in sparse_weights. This field maybe ommitted for the
+  corresponding weights in sparse_weights. This field maybe omitted for the
   dense approach.
 sparse_weights: a list of vectors where each value is the weight associated with
   a sparse feature group.
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 2027bf4603..6f7a007f2c 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -1004,7 +1004,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1043,7 +1043,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1075,7 +1075,7 @@ momentum: Momentum. Must be a scalar.
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1112,7 +1112,7 @@ momentum: Momentum. Must be a scalar.
 use_locking: If `True`, updating of the var and accum tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
-use_nesterov: If `True`, the tensor passed to compute grad will be 
+use_nesterov: If `True`, the tensor passed to compute grad will be
 var - lr * momentum * accum, so in the end, the var you get is actually
 var - lr * momentum * accum.
 )doc");
@@ -1150,6 +1150,7 @@ REGISTER_OP("ApplyAdam")
     .Output("out: Ref(T)")
     .Attr("T: numbertype")
     .Attr("use_locking: bool = false")
+    .Attr("use_nesterov: bool = false")
     .SetShapeFn([](InferenceContext* c) {
       return ApplyAdamShapeFn(c, false /* sparse */);
     })
@@ -1175,6 +1176,7 @@ out: Same as "var".
 use_locking: If `True`, updating of the var, m, and v tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
+use_nesterov: If `True`, uses the nesterov update.
 )doc");
 
 REGISTER_OP("ResourceApplyAdam")
@@ -1190,6 +1192,7 @@ REGISTER_OP("ResourceApplyAdam")
     .Input("grad: T")
     .Attr("T: numbertype")
     .Attr("use_locking: bool = false")
+    .Attr("use_nesterov: bool = false")
     .SetShapeFn([](InferenceContext* c) {
       return ApplyAdamShapeFn(c, false /* sparse */);
     })
@@ -1214,6 +1217,7 @@ grad: The gradient.
 use_locking: If `True`, updating of the var, m, and v tensors will be protected
   by a lock; otherwise the behavior is undefined, but may exhibit less
   contention.
+use_nesterov: If `True`, uses the nesterov update.
 )doc");
 
 static Status ApplyRMSPropShapeFn(InferenceContext* c, bool sparse) {
diff --git a/tensorflow/core/platform/cloud/google_auth_provider.cc b/tensorflow/core/platform/cloud/google_auth_provider.cc
index 6f29d4597f..f70b431b65 100644
--- a/tensorflow/core/platform/cloud/google_auth_provider.cc
+++ b/tensorflow/core/platform/cloud/google_auth_provider.cc
@@ -67,7 +67,7 @@ constexpr char kGceTokenUrl[] =
 // The authentication token scope to request.
 constexpr char kOAuthScope[] = "https://www.googleapis.com/auth/cloud-platform";
 
-// The default intial delay between retries with exponential backoff.
+// The default initial delay between retries with exponential backoff.
 constexpr int kInitialRetryDelayUsec = 500000;  // 0.5 sec
 
 /// Returns whether the given path points to a readable file.
diff --git a/tensorflow/core/public/version.h b/tensorflow/core/public/version.h
index df33cf38c9..566d9aa908 100644
--- a/tensorflow/core/public/version.h
+++ b/tensorflow/core/public/version.h
@@ -87,10 +87,11 @@ limitations under the License.
 // 22. Placeholder now can specify and enforce scalar and partial
 //     shapes, particularly when restoring a graph from GraphDef
 //     produced at version 22 or later.  (04/10/2016)
+// 23. Remove NonMaxSuppression in favor of NonMaxSuppressionV2.
 
 #define TF_GRAPH_DEF_VERSION_MIN_PRODUCER 0
 #define TF_GRAPH_DEF_VERSION_MIN_CONSUMER 0
-#define TF_GRAPH_DEF_VERSION 22
+#define TF_GRAPH_DEF_VERSION 23
 
 // Checkpoint compatibility versions (the versions field in SavedSliceMeta).
 //
diff --git a/tensorflow/docs_src/extend/adding_an_op.md b/tensorflow/docs_src/extend/adding_an_op.md
index 3586794418..a8c28e98c9 100644
--- a/tensorflow/docs_src/extend/adding_an_op.md
+++ b/tensorflow/docs_src/extend/adding_an_op.md
@@ -317,7 +317,7 @@ or `clang` available on your system. The binary PIP package installs the header
 files and the library that you need to compile your op in locations that are
 system specific. However, the TensorFlow python library provides the
 `get_include` function to get the header directory.
-Here is the output of this function on a Ubuntu machine.
+Here is the output of this function on an Ubuntu machine.
 
 ```bash
 $ python
@@ -1215,6 +1215,8 @@ you'll need to specify the path explicitly in the second (g++) command above.
 For example, add `-L /usr/local/cuda-8.0/lib64/` if your CUDA is installed in
 `/usr/local/cuda-8.0`.
 
+>   Note in some linux settings, additional options to `nvcc` compiling step are needed. Add `-D_MWAITXINTRIN_H_INCLUDED` to the `nvcc` command line to avoid errors from `mwaitxintrin.h`.
+
 ### Implement the gradient in Python {#implement-gradient}
 
 Given a graph of ops, TensorFlow uses automatic differentiation
diff --git a/tensorflow/docs_src/performance/benchmarks.md b/tensorflow/docs_src/performance/benchmarks.md
index 6bbc98ac0d..47ab028e20 100644
--- a/tensorflow/docs_src/performance/benchmarks.md
+++ b/tensorflow/docs_src/performance/benchmarks.md
@@ -4,7 +4,7 @@
 
 A selection of image classification models were tested across multiple platforms
 to create a point of reference for the TensorFlow community. The
-[Methodology](#methodology) section details how the test were executed and has
+[Methodology](#methodology) section details how the tests were executed and has
 links to the scripts used.
 
 ## Results for image classification models
@@ -355,7 +355,7 @@ ResNet-50   | distributed_replicated | n/a                    | True
 ResNet-152  | distributed_replicated | n/a                    | True
 
 To simplify server setup, EC2 instances (p2.8xlarge) running worker servers also
-ran parameter servers. Equal numbers of parameter servers and work servers were
+ran parameter servers. Equal numbers of parameter servers and worker servers were
 used with the following exceptions:
 
 *   InceptionV3: 8 instances / 6 parameter servers
diff --git a/tensorflow/docs_src/performance/performance_models.md b/tensorflow/docs_src/performance/performance_models.md
index d48e008a3a..d48431eaa0 100644
--- a/tensorflow/docs_src/performance/performance_models.md
+++ b/tensorflow/docs_src/performance/performance_models.md
@@ -62,12 +62,12 @@ and executed in parallel. The image preprocessing ops include operations such as
 image decoding, distortion, and resizing.
 
 Once the images are through preprocessing, they are concatenated together into 8
-batch size 32 tensors. Rather than use @{tf.concat} for this purpose, which is
-implemented as a single op that waits for all the inputs to be ready before
-concatenating them together, @{tf.parallel_stack} is used. @{tf.parallel_stack}
-allocates an uninitialized tensor as an output, and each input tensor is written
-to its designated portion of the output tensor as soon as the input is
-available.
+tensors each with a batch-size of 32. Rather than using @{tf.concat} for this
+purpose, which is implemented as a single op that waits for all the inputs to be
+ready before concatenating them together, @{tf.parallel_stack} is used.
+@{tf.parallel_stack} allocates an uninitialized tensor as an output, and each
+input tensor is written to its designated portion of the output tensor as soon
+as the input is available.
 
 When all the input tensors are finished, the output tensor is passed along in
 the graph. This effectively hides all the memory latency with the long tail of
@@ -142,7 +142,7 @@ On GPU, NCHW is faster. But on CPU, NHWC is sometimes faster.
 
 Building a model to support both data formats keeps the model flexible and
 capable of operating optimally regardless of platform. Most TensorFlow
-operations used by a CNN support both NHWC and NCHW data format. The benchmark
+operations used by a CNN support both NHWC and NCHW data formats. The benchmark
 script was written to support both NCHW and NHWC. NCHW should always be used
 when training with GPUs. NHWC is sometimes faster on CPU. A flexible model can
 be trained on GPUs using NCHW with inference done on CPU using NHWC with the
diff --git a/tensorflow/docs_src/tutorials/word2vec.md b/tensorflow/docs_src/tutorials/word2vec.md
index 348e069ed6..dfb21334f8 100644
--- a/tensorflow/docs_src/tutorials/word2vec.md
+++ b/tensorflow/docs_src/tutorials/word2vec.md
@@ -23,7 +23,7 @@ straight in, feel free to look at the minimalistic implementation in
 This basic example contains the code needed to download some data, train on it a
 bit and visualize the result. Once you get comfortable with reading and running
 the basic version, you can graduate to
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py)
+[models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py)
 which is a more serious implementation that showcases some more advanced
 TensorFlow principles about how to efficiently use threads to move data into a
 text model, how to checkpoint during training, etc.
@@ -108,7 +108,7 @@ $$
 
 where \\(\text{score}(w_t, h)\\) computes the compatibility of word \\(w_t\\)
 with the context \\(h\\) (a dot product is commonly used). We train this model
-by maximizing its [log-likelihood](https://en.wikipedia.org/wiki/Likelihood_function) 
+by maximizing its [log-likelihood](https://en.wikipedia.org/wiki/Likelihood_function)
 on the training set, i.e. by maximizing
 
 $$
@@ -130,7 +130,7 @@ context \\(h\\), *at every training step*.
 
 On the other hand, for feature learning in word2vec we do not need a full
 probabilistic model. The CBOW and skip-gram models are instead trained using a
-binary classification objective ([logistic regression](https://en.wikipedia.org/wiki/Logistic_regression)) 
+binary classification objective ([logistic regression](https://en.wikipedia.org/wiki/Logistic_regression))
 to discriminate the real target words \\(w_t\\) from \\(k\\) imaginary (noise) words \\(\tilde w\\), in the
 same context. We illustrate this below for a CBOW model. For skip-gram the
 direction is simply inverted.
@@ -341,7 +341,7 @@ t-SNE.
 Et voila! As expected, words that are similar end up clustering nearby each
 other. For a more heavyweight implementation of word2vec that showcases more of
 the advanced features of TensorFlow, see the implementation in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
+[models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
 
 ## Evaluating Embeddings: Analogical Reasoning
 
@@ -357,7 +357,7 @@ Download the dataset for this task from
 
 To see how we do this evaluation, have a look at the `build_eval_graph()` and
 `eval()` functions in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
+[models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
 
 The choice of hyperparameters can strongly influence the accuracy on this task.
 To achieve state-of-the-art performance on this task requires training over a
@@ -385,13 +385,13 @@ your model is seriously bottlenecked on input data, you may want to implement a
 custom data reader for your problem, as described in
 @{$new_data_formats$New Data Formats}.  For the case of Skip-Gram
 modeling, we've actually already done this for you as an example in
-[tensorflow_models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
+[models/tutorials/embedding/word2vec.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec.py).
 
 If your model is no longer I/O bound but you want still more performance, you
 can take things further by writing your own TensorFlow Ops, as described in
 @{$adding_an_op$Adding a New Op}.  Again we've provided an
 example of this for the Skip-Gram case
-[tensorflow_models/tutorials/embedding/word2vec_optimized.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec_optimized.py).
+[models/tutorials/embedding/word2vec_optimized.py](https://github.com/tensorflow/models/tree/master/tutorials/embedding/word2vec_optimized.py).
 Feel free to benchmark these against each other to measure performance
 improvements at each stage.
 
diff --git a/tensorflow/examples/android/README.md b/tensorflow/examples/android/README.md
index 60ba702c10..270f654ed7 100644
--- a/tensorflow/examples/android/README.md
+++ b/tensorflow/examples/android/README.md
@@ -28,9 +28,9 @@ on API >= 14 devices.
         using Deep Neural Networks](https://arxiv.org/abs/1312.2249) to
         localize and track people in the camera preview in real-time.
 3. [TF Stylize](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/android/src/org/tensorflow/demo/StylizeActivity.java):
-        Uses a model based on [A Learned Representation For Artistic Style]
-        (https://arxiv.org/abs/1610.07629) to restyle the camera preview image
-        to that of a number of different artists.
+        Uses a model based on [A Learned Representation For Artistic
+        Style](https://arxiv.org/abs/1610.07629) to restyle the camera preview 
+        image to that of a number of different artists.
 
 <img src="sample_images/classify1.jpg" width="30%"><img src="sample_images/stylize1.jpg" width="30%"><img src="sample_images/detect1.jpg" width="30%">
 
diff --git a/tensorflow/examples/label_image/BUILD b/tensorflow/examples/label_image/BUILD
index 021372fa7b..d677e58ac3 100644
--- a/tensorflow/examples/label_image/BUILD
+++ b/tensorflow/examples/label_image/BUILD
@@ -12,12 +12,32 @@ cc_binary(
     srcs = [
         "main.cc",
     ],
-    linkopts = ["-lm"],
-    deps = [
-        "//tensorflow/cc:cc_ops",
-        "//tensorflow/core:framework_internal",
-        "//tensorflow/core:tensorflow",
-    ],
+    linkopts = select({
+        "//tensorflow:android": [
+            "-pie",
+            "-landroid",
+            "-ljnigraphics",
+            "-llog",
+            "-lm",
+            "-z defs",
+            "-s",
+            "-Wl,--exclude-libs,ALL",
+        ],
+        "//conditions:default": ["-lm"],
+    }),
+    deps = select({
+        "//tensorflow:android": [
+            # cc:cc_ops is used to include image ops (for label_image)
+            # Jpg, gif, and png related code won't be included
+            "//tensorflow/cc:cc_ops",
+            "//tensorflow/core:android_tensorflow_lib",
+        ],
+        "//conditions:default": [
+            "//tensorflow/cc:cc_ops",
+            "//tensorflow/core:framework_internal",
+            "//tensorflow/core:tensorflow",
+        ],
+    }),
 )
 
 filegroup(
diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
index 3351109f45..90454bd7ac 100644
--- a/tensorflow/examples/label_image/main.cc
+++ b/tensorflow/examples/label_image/main.cc
@@ -30,6 +30,9 @@ limitations under the License.
 // the top of the main() function.
 //
 // The googlenet_graph.pb file included by default is created from Inception.
+//
+// Note that, for GIF inputs, to reuse existing code, only single-frame ones
+// are supported.
 
 #include <fstream>
 #include <utility>
@@ -103,7 +106,12 @@ Status ReadTensorFromImageFile(const string& file_name, const int input_height,
     image_reader = DecodePng(root.WithOpName("png_reader"), file_reader,
                              DecodePng::Channels(wanted_channels));
   } else if (tensorflow::StringPiece(file_name).ends_with(".gif")) {
-    image_reader = DecodeGif(root.WithOpName("gif_reader"), file_reader);
+    // gif decoder returns 4-D tensor, remove the first dim
+    image_reader =
+        Squeeze(root.WithOpName("squeeze_first_dim"),
+                DecodeGif(root.WithOpName("gif_reader"), file_reader));
+  } else if (tensorflow::StringPiece(file_name).ends_with(".bmp")) {
+    image_reader = DecodeBmp(root.WithOpName("bmp_reader"), file_reader);
   } else {
     // Assume if it's neither a PNG nor a GIF then it must be a JPEG.
     image_reader = DecodeJpeg(root.WithOpName("jpeg_reader"), file_reader,
diff --git a/tensorflow/java/src/main/java/org/tensorflow/Graph.java b/tensorflow/java/src/main/java/org/tensorflow/Graph.java
index 42d7f48464..c08fa9b145 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/Graph.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/Graph.java
@@ -20,7 +20,7 @@ package org.tensorflow;
  *
  * <p>Instances of a Graph are thread-safe.
  *
- * <p><b>WARNING:</b> Resources consumed by the Graph object msut be explicitly freed by invoking
+ * <p><b>WARNING:</b> Resources consumed by the Graph object must be explicitly freed by invoking
  * the {@link #close()} method then the Graph object is no longer needed.
  */
 public final class Graph implements AutoCloseable {
diff --git a/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java b/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java
index cd59cf504a..38ffa2a8e1 100644
--- a/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java
+++ b/tensorflow/java/src/main/java/org/tensorflow/OperationBuilder.java
@@ -73,6 +73,29 @@ public final class OperationBuilder {
     return this;
   }
 
+  /**
+   * Ensure that the operation does not execute before the control operation does.
+   *
+   * <p>A control input is an Operation that must be executed before running the operation currently
+   * being built.
+   *
+   * <p>For example, an Assert operation may be added as a control input for this operation. The
+   * Assert now behaves as a pre-condition that will always verify itself before running the
+   * operation.
+   *
+   * @param control operation that must be executed before running this operation.
+   * @return the OperationBuilder instance for chaining.
+   */
+  public OperationBuilder addControlInput(Operation control) {
+    Graph.Reference r = graph.ref();
+    try {
+      addControlInput(unsafeNativeHandle, control.getUnsafeNativeHandle());
+    } finally {
+      r.close();
+    }
+    return this;
+  }
+
   public OperationBuilder addInputList(Output[] inputs) {
     Graph.Reference r = graph.ref();
     try {
@@ -244,6 +267,8 @@ public final class OperationBuilder {
 
   private static native void addInputList(long handle, long[] opHandles, int[] indices);
 
+  private static native void addControlInput(long handle, long opHandle);
+
   private static native void setDevice(long handle, String device);
 
   // The names of all the setAttr* family functions below correspond to the C library types, not the
diff --git a/tensorflow/java/src/main/native/operation_builder_jni.cc b/tensorflow/java/src/main/native/operation_builder_jni.cc
index 5724c54f91..4c54eecd9b 100644
--- a/tensorflow/java/src/main/native/operation_builder_jni.cc
+++ b/tensorflow/java/src/main/native/operation_builder_jni.cc
@@ -115,6 +115,20 @@ JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addInputList(
   TF_AddInputList(d, o.get(), n);
 }
 
+JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addControlInput(
+    JNIEnv* env, jclass clazz, jlong handle, jlong op_handle) {
+  if (op_handle == 0) {
+    throwException(env, kIllegalStateException,
+                   "control input is not valid, "
+                   "perhaps the Graph containing it has been closed()?");
+    return;
+  }
+  TF_Operation* control = reinterpret_cast<TF_Operation*>(op_handle);
+  TF_OperationDescription* d = requireHandle(env, handle);
+  if (d == nullptr) return;
+  TF_AddControlInput(d, control);
+}
+
 JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_setDevice(
     JNIEnv* env, jclass clazz, jlong handle, jstring device) {
   TF_OperationDescription* d = requireHandle(env, handle);
diff --git a/tensorflow/java/src/main/native/operation_builder_jni.h b/tensorflow/java/src/main/native/operation_builder_jni.h
index ae953c0fd6..9b64c32820 100644
--- a/tensorflow/java/src/main/native/operation_builder_jni.h
+++ b/tensorflow/java/src/main/native/operation_builder_jni.h
@@ -55,6 +55,14 @@ JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addInput(
 JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addInputList(
     JNIEnv *, jclass, jlong, jlongArray, jintArray);
 
+/*
+ * Class:     org_tensorflow_OperationBuilder
+ * Method:    addControlInput
+ * Signature: (JJ)V
+ */
+JNIEXPORT void JNICALL Java_org_tensorflow_OperationBuilder_addControlInput(
+    JNIEnv *, jclass, jlong, jlong);
+
 /*
  * Class:     org_tensorflow_OperationBuilder
  * Method:    setDevice
diff --git a/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java b/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
index 9dc400a3d3..b3bc3aaef9 100644
--- a/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
+++ b/tensorflow/java/src/test/java/org/tensorflow/OperationBuilderTest.java
@@ -149,6 +149,33 @@ public class OperationBuilderTest {
     }
   }
 
+  @Test
+  public void addControlInput() {
+    try (Graph g = new Graph();
+        Session s = new Session(g);
+        Tensor yes = Tensor.create(true);
+        Tensor no = Tensor.create(false)) {
+      Output placeholder = TestUtil.placeholder(g, "boolean", DataType.BOOL);
+      Operation check =
+          g.opBuilder("Assert", "assert")
+              .addInput(placeholder)
+              .addInputList(new Output[] {placeholder})
+              .build();
+      Operation noop = g.opBuilder("NoOp", "noop").addControlInput(check).build();
+
+      // No problems when the Assert check succeeds
+      s.runner().feed(placeholder, yes).addTarget(noop).run();
+
+      // Exception thrown by the execution of the Assert node
+      try {
+        s.runner().feed(placeholder, no).addTarget(noop).run();
+        fail("Did not run control operation.");
+      } catch (IllegalArgumentException e) {
+        // expected
+      }
+    }
+  }
+
   private static boolean hasNode(Graph g, String name) {
     return g.operation(name) != null;
   }
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index c97efc127a..33ffe3d81e 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -739,7 +739,7 @@ def _model_fn_args(fn):
 
 def _verify_model_fn_args(model_fn, params):
   """Verifies model fn arguments."""
-  args = _model_fn_args(model_fn)
+  args = set(_model_fn_args(model_fn))
   if 'features' not in args:
     raise ValueError('model_fn (%s) must include features argument.' % model_fn)
   if 'labels' not in args:
@@ -752,7 +752,10 @@ def _verify_model_fn_args(model_fn, params):
     logging.warning('Estimator\'s model_fn (%s) includes params '
                     'argument, but params are not passed to Estimator.',
                     model_fn)
-  non_valid_args = list(set(args) - _VALID_MODEL_FN_ARGS)
+  if tf_inspect.ismethod(model_fn):
+    if 'self' in args:
+      args.remove('self')
+  non_valid_args = list(args - _VALID_MODEL_FN_ARGS)
   if non_valid_args:
     raise ValueError('model_fn (%s) has following not expected args: %s' %
                      (model_fn, non_valid_args))
@@ -814,13 +817,20 @@ def _write_dict_to_summary(output_dir,
   for key in dictionary:
     if dictionary[key] is None:
       continue
+    if key == 'global_step':
+      continue
     value = summary_proto.value.add()
     value.tag = key
     if (isinstance(dictionary[key], np.float32) or
         isinstance(dictionary[key], float)):
       value.simple_value = float(dictionary[key])
+    elif (isinstance(dictionary[key], np.int64) or
+          isinstance(dictionary[key], np.int32) or
+          isinstance(dictionary[key], int)):
+      value.simple_value = int(dictionary[key])
     else:
-      logging.warn('Skipping summary for %s, must be a float or np.float32.',
-                   key)
+      logging.warn(
+          'Skipping summary for %s, must be a float, np.float32, np.int64, np.int32 or int.',
+          key)
   summary_writer.add_summary(summary_proto, current_global_step)
   summary_writer.flush()
diff --git a/tensorflow/python/estimator/estimator_test.py b/tensorflow/python/estimator/estimator_test.py
index 5c8c3a2626..b25c3ba93a 100644
--- a/tensorflow/python/estimator/estimator_test.py
+++ b/tensorflow/python/estimator/estimator_test.py
@@ -256,6 +256,18 @@ class EstimatorConstructorTest(test.TestCase):
         features, labels, 'something')
     estimator.Estimator(model_fn=new_model_fn)
 
+  def test_if_model_fn_is_a_member_function_of_a_class(self):
+
+    class ModelFnClass(object):
+
+      def __init__(self):
+        estimator.Estimator(model_fn=self.model_fn)
+
+      def model_fn(self, features, labels, mode):
+        _, _, _ = features, labels, mode
+
+    ModelFnClass()
+
 
 def dummy_input_fn():
   return ({'x': constant_op.constant([[1], [1]])},
diff --git a/tensorflow/python/framework/tensor_shape.py b/tensorflow/python/framework/tensor_shape.py
index 73c810711f..d72700ea2c 100644
--- a/tensorflow/python/framework/tensor_shape.py
+++ b/tensorflow/python/framework/tensor_shape.py
@@ -66,6 +66,9 @@ class Dimension(object):
   def __int__(self):
     return self._value
 
+  def __long__(self):
+    return self._value
+
   def __index__(self):
     # Allow use in Python 3 range
     return self._value
diff --git a/tensorflow/python/framework/tensor_util.py b/tensorflow/python/framework/tensor_util.py
index 1e445591b1..1081110001 100644
--- a/tensorflow/python/framework/tensor_util.py
+++ b/tensorflow/python/framework/tensor_util.py
@@ -368,7 +368,9 @@ def make_tensor_proto(values, dtype=None, shape=None, verify_shape=False):
       np_dt = dtype.as_numpy_dtype
     else:
       np_dt = None
-    if np.prod(shape) == 0:
+    # If shape is None, numpy.prod returns None when dtype is not set, but raises
+    # exception when dtype is set to np.int64
+    if shape is not None and np.prod(shape, dtype=np.int64) == 0:
       nparray = np.empty(shape, dtype=np_dt)
     else:
       _AssertCompatible(values, dtype)
@@ -414,7 +416,7 @@ def make_tensor_proto(values, dtype=None, shape=None, verify_shape=False):
     shape_size = nparray.size
   else:
     shape = [int(dim) for dim in shape]
-    shape_size = np.prod(shape)
+    shape_size = np.prod(shape, dtype=np.int64)
     is_same_size = shape_size == nparray.size
 
     if verify_shape:
@@ -491,7 +493,7 @@ def MakeNdarray(tensor):
 
   """
   shape = [d.size for d in tensor.tensor_shape.dim]
-  num_elements = np.prod(shape)
+  num_elements = np.prod(shape, dtype=np.int64)
   tensor_dtype = dtypes.as_dtype(tensor.dtype)
   dtype = tensor_dtype.as_numpy_dtype
 
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 349787d135..b83937ab26 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -214,6 +214,19 @@ tf_py_test(
     ],
 )
 
+tf_py_test(
+    name = "decode_bmp_op_test",
+    size = "small",
+    srcs = ["decode_bmp_op_test.py"],
+    additional_deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:image_ops",
+        "//tensorflow/python:nn_grad",
+    ],
+)
+
 tf_py_test(
     name = "decode_image_op_test",
     size = "small",
diff --git a/tensorflow/python/kernel_tests/decode_bmp_op_test.py b/tensorflow/python/kernel_tests/decode_bmp_op_test.py
new file mode 100644
index 0000000000..e7a8ac3af6
--- /dev/null
+++ b/tensorflow/python/kernel_tests/decode_bmp_op_test.py
@@ -0,0 +1,116 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for DecodeBmpOp."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import image_ops
+from tensorflow.python.platform import test
+
+
+class DecodeBmpOpTest(test.TestCase):
+
+  def testex1(self):
+    img_bytes = [[[0, 0, 255], [0, 255, 0]], [[255, 0, 0], [255, 255, 255]]]
+    # Encoded BMP bytes from Wikipedia
+    encoded_bytes = [
+        0x42,
+        0x40,
+        0x46,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0x36,
+        0,
+        0,
+        0,
+        0x28,
+        0,
+        0,
+        0,
+        0x2,
+        0,
+        0,
+        0,
+        0x2,
+        0,
+        0,
+        0,
+        0x1,
+        0,
+        0x18,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0x10,
+        0,
+        0,
+        0,
+        0x13,
+        0xb,
+        0,
+        0,
+        0x13,
+        0xb,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0,
+        0,
+        0xff,
+        0,
+        0,
+        0,
+        0xff,
+        0,
+        0,
+        0,
+    ]
+
+    byte_string = bytes(bytearray(encoded_bytes))
+    img_in = constant_op.constant(byte_string, dtype=dtypes.string)
+    decode = array_ops.squeeze(image_ops.decode_bmp(img_in))
+
+    with self.test_session():
+      decoded = decode.eval()
+      self.assertAllEqual(decoded, img_bytes)
+
+
+if __name__ == "__main__":
+  test.main()
diff --git a/tensorflow/python/kernel_tests/decode_image_op_test.py b/tensorflow/python/kernel_tests/decode_image_op_test.py
index b457b5cc86..58280432d6 100644
--- a/tensorflow/python/kernel_tests/decode_image_op_test.py
+++ b/tensorflow/python/kernel_tests/decode_image_op_test.py
@@ -33,6 +33,17 @@ prefix_path = "tensorflow/core/lib"
 
 class DecodeImageOpTest(test.TestCase):
 
+  def testBmp(self):
+    # Read a real bmp and verify shape
+    path = os.path.join(prefix_path, "bmp", "testdata", "lena.bmp")
+    with self.test_session(use_gpu=True) as sess:
+      bmp0 = io_ops.read_file(path)
+      image0 = image_ops.decode_image(bmp0)
+      image1 = image_ops.decode_bmp(bmp0)
+      bmp0, image0, image1 = sess.run([bmp0, image0, image1])
+      self.assertEqual(len(bmp0), 4194)
+      self.assertAllEqual(image0, image1)
+
   def testGif(self):
     # Read some real GIFs
     path = os.path.join(prefix_path, "gif", "testdata", "scan.gif")
diff --git a/tensorflow/python/kernel_tests/fft_ops_test.py b/tensorflow/python/kernel_tests/fft_ops_test.py
index f669964948..84928bd2e1 100644
--- a/tensorflow/python/kernel_tests/fft_ops_test.py
+++ b/tensorflow/python/kernel_tests/fft_ops_test.py
@@ -39,30 +39,26 @@ class BaseFFTOpsTest(test.TestCase):
     self._CompareBackward(x, rank, fft_length, use_placeholder)
 
   def _CompareForward(self, x, rank, fft_length=None, use_placeholder=False):
-    if test.is_gpu_available(cuda_only=True):
-      x_np = self._npFFT(x, rank, fft_length)
-      if use_placeholder:
-        x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
-        x_tf = self._tfFFT(x_ph, rank, fft_length, use_gpu=True,
-                           feed_dict={x_ph: x})
-      else:
-        x_tf = self._tfFFT(x, rank, fft_length, use_gpu=True)
+    x_np = self._npFFT(x, rank, fft_length)
+    if use_placeholder:
+      x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
+      x_tf = self._tfFFT(
+          x_ph, rank, fft_length, use_gpu=True, feed_dict={x_ph: x})
+    else:
+      x_tf = self._tfFFT(x, rank, fft_length, use_gpu=True)
 
-      # GPU/Forward
-      self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
+    self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
 
   def _CompareBackward(self, x, rank, fft_length=None, use_placeholder=False):
-    if test.is_gpu_available(cuda_only=True):
-      x_np = self._npIFFT(x, rank, fft_length)
-      if use_placeholder:
-        x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
-        x_tf = self._tfIFFT(x_ph, rank, fft_length, use_gpu=True,
-                            feed_dict={x_ph: x})
-      else:
-        x_tf = self._tfIFFT(x, rank, fft_length, use_gpu=True)
+    x_np = self._npIFFT(x, rank, fft_length)
+    if use_placeholder:
+      x_ph = array_ops.placeholder(dtype=dtypes.as_dtype(x.dtype))
+      x_tf = self._tfIFFT(
+          x_ph, rank, fft_length, use_gpu=True, feed_dict={x_ph: x})
+    else:
+      x_tf = self._tfIFFT(x, rank, fft_length, use_gpu=True)
 
-      # GPU/Backward
-      self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
+    self.assertAllClose(x_np, x_tf, rtol=1e-4, atol=1e-4)
 
   def _checkGradComplex(self, func, x, y, result_is_complex=True,
                         use_gpu=False):
@@ -151,12 +147,11 @@ class FFTOpsTest(BaseFFTOpsTest):
       raise ValueError("invalid rank")
 
   def testEmpty(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 3):
-          x = np.zeros((0,) * dims).astype(np.complex64)
-          self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
-          self.assertEqual(x.shape, self._tfIFFT(x, rank).shape)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 3):
+        x = np.zeros((0,) * dims).astype(np.complex64)
+        self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
+        self.assertEqual(x.shape, self._tfIFFT(x, rank).shape)
 
   def testBasic(self):
     for rank in VALID_FFT_RANKS:
@@ -184,41 +179,41 @@ class FFTOpsTest(BaseFFTOpsTest):
         self._Compare(gen((4,) * dims), rank)
 
   def testError(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(0, rank):
-          x = np.zeros((1,) * dims).astype(np.complex64)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfFFT(x, rank)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfIFFT(x, rank)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(0, rank):
+        x = np.zeros((1,) * dims).astype(np.complex64)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfFFT(x, rank)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfIFFT(x, rank)
 
   def testGrad_Simple(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 2):
-          re = np.ones(shape=(4,) * dims, dtype=np.float32) / 10.0
-          im = np.zeros(shape=(4,) * dims, dtype=np.float32)
-          self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
-          self._checkGradComplex(
-              self._tfIFFTForRank(rank), re, im, use_gpu=True)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 2):
+        re = np.ones(shape=(4,) * dims, dtype=np.float32) / 10.0
+        im = np.zeros(shape=(4,) * dims, dtype=np.float32)
+        self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
+        self._checkGradComplex(self._tfIFFTForRank(rank), re, im, use_gpu=True)
 
   def testGrad_Random(self):
-    if test.is_gpu_available(cuda_only=True):
-      np.random.seed(54321)
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 2):
-          re = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
-          im = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
-          self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
-          self._checkGradComplex(
-              self._tfIFFTForRank(rank), re, im, use_gpu=True)
+    np.random.seed(54321)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 2):
+        re = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
+        im = np.random.rand(*((3,) * dims)).astype(np.float32) * 2 - 1
+        self._checkGradComplex(self._tfFFTForRank(rank), re, im, use_gpu=True)
+        self._checkGradComplex(self._tfIFFTForRank(rank), re, im, use_gpu=True)
 
 
 class RFFTOpsTest(BaseFFTOpsTest):
 
+  def _CompareBackward(self, x, rank, fft_length=None, use_placeholder=False):
+    if test.is_gpu_available(cuda_only=True):
+      super(RFFTOpsTest, self)._CompareBackward(x, rank, fft_length,
+                                                use_placeholder)
+
   def _tfFFT(self, x, rank, fft_length=None, use_gpu=False, feed_dict=None):
     with self.test_session(use_gpu=use_gpu):
       return self._tfFFTForRank(rank)(x, fft_length).eval(feed_dict=feed_dict)
@@ -268,12 +263,12 @@ class RFFTOpsTest(BaseFFTOpsTest):
       raise ValueError("invalid rank")
 
   def testEmpty(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(rank, rank + 3):
-          x = np.zeros((0,) * dims).astype(np.float32)
-          self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
-          x = np.zeros((0,) * dims).astype(np.complex64)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(rank, rank + 3):
+        x = np.zeros((0,) * dims).astype(np.float32)
+        self.assertEqual(x.shape, self._tfFFT(x, rank).shape)
+        x = np.zeros((0,) * dims).astype(np.complex64)
+        if test.is_gpu_available(cuda_only=True):
           self.assertEqual(x.shape, self._tfIFFT(x, rank).shape)
 
   def testBasic(self):
@@ -327,36 +322,35 @@ class RFFTOpsTest(BaseFFTOpsTest):
           self._CompareBackward(gen_complex(complex_dims), rank, (size,) * rank)
 
   def testError(self):
-    if test.is_gpu_available(cuda_only=True):
-      for rank in VALID_FFT_RANKS:
-        for dims in xrange(0, rank):
-          x = np.zeros((1,) * dims).astype(np.complex64)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfFFT(x, rank)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Shape must be .*rank {}.*".format(rank)):
-            self._tfIFFT(x, rank)
-        for dims in xrange(rank, rank + 2):
-          x = np.zeros((1,) * rank)
-
-          # Test non-rank-1 fft_length produces an error.
-          fft_length = np.zeros((1, 1)).astype(np.int32)
-          with self.assertRaisesWithPredicateMatch(ValueError,
-                                                   "Shape must be .*rank 1"):
-            self._tfFFT(x, rank, fft_length)
-          with self.assertRaisesWithPredicateMatch(ValueError,
-                                                   "Shape must be .*rank 1"):
-            self._tfIFFT(x, rank, fft_length)
-
-          # Test wrong fft_length length.
-          fft_length = np.zeros((rank + 1,)).astype(np.int32)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
-            self._tfFFT(x, rank, fft_length)
-          with self.assertRaisesWithPredicateMatch(
-              ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
-            self._tfIFFT(x, rank, fft_length)
+    for rank in VALID_FFT_RANKS:
+      for dims in xrange(0, rank):
+        x = np.zeros((1,) * dims).astype(np.complex64)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfFFT(x, rank)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Shape must be .*rank {}.*".format(rank)):
+          self._tfIFFT(x, rank)
+      for dims in xrange(rank, rank + 2):
+        x = np.zeros((1,) * rank)
+
+        # Test non-rank-1 fft_length produces an error.
+        fft_length = np.zeros((1, 1)).astype(np.int32)
+        with self.assertRaisesWithPredicateMatch(ValueError,
+                                                 "Shape must be .*rank 1"):
+          self._tfFFT(x, rank, fft_length)
+        with self.assertRaisesWithPredicateMatch(ValueError,
+                                                 "Shape must be .*rank 1"):
+          self._tfIFFT(x, rank, fft_length)
+
+        # Test wrong fft_length length.
+        fft_length = np.zeros((rank + 1,)).astype(np.int32)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
+          self._tfFFT(x, rank, fft_length)
+        with self.assertRaisesWithPredicateMatch(
+            ValueError, "Dimension must be .*but is {}.*".format(rank + 1)):
+          self._tfIFFT(x, rank, fft_length)
 
   def testGrad_Simple(self):
     if test.is_gpu_available(cuda_only=True):
diff --git a/tensorflow/python/ops/array_grad.py b/tensorflow/python/ops/array_grad.py
index 8594d811e8..5c6d309e6c 100644
--- a/tensorflow/python/ops/array_grad.py
+++ b/tensorflow/python/ops/array_grad.py
@@ -354,9 +354,15 @@ def _PreventGradientGrad(op, _):
 def _GatherGrad(op, grad):
   """Gradient for Gather op."""
   # params can be large, so colocate the shape calculation with it.
+  #
+  # params can be very large for sparse model, array_ops.shape raises
+  # exception on the Windows platform when any dimension is larger than
+  # int32. params_shape is not used in optimizer apply_sparse gradients,
+  # so it's fine to convert it back to int32 regardless of truncation.
   params = op.inputs[0]
   with ops.colocate_with(params):
-    params_shape = array_ops.shape(params)
+    params_shape = array_ops.shape(params, out_type=ops.dtypes.int64)
+    params_shape = math_ops.to_int32(params_shape)
 
   # Build appropriately shaped IndexedSlices
   indices = op.inputs[1]
diff --git a/tensorflow/python/ops/image_ops.py b/tensorflow/python/ops/image_ops.py
index c29ae26f04..75c67dcb3c 100644
--- a/tensorflow/python/ops/image_ops.py
+++ b/tensorflow/python/ops/image_ops.py
@@ -18,6 +18,7 @@
 
 See the @{$python/image} guide.
 
+@@decode_bmp
 @@decode_gif
 @@decode_jpeg
 @@encode_jpeg
diff --git a/tensorflow/python/ops/image_ops_impl.py b/tensorflow/python/ops/image_ops_impl.py
index 3e140ce047..b16c1863dd 100644
--- a/tensorflow/python/ops/image_ops_impl.py
+++ b/tensorflow/python/ops/image_ops_impl.py
@@ -1312,16 +1312,18 @@ def adjust_saturation(image, saturation_factor, name=None):
 
 
 def decode_image(contents, channels=None, name=None):
-  """Convenience function for `decode_gif`, `decode_jpeg`, and `decode_png`.
+  """Convenience function for `decode_bmp`, `decode_gif`, `decode_jpeg`,
+  and `decode_png`.
 
-  Detects whether an image is a GIF, JPEG, or PNG, and performs the appropriate
-  operation to convert the input bytes `string` into a `Tensor` of type `uint8`.
+  Detects whether an image is a BMP, GIF, JPEG, or PNG, and performs the
+  appropriate operation to convert the input bytes `string` into a `Tensor` of
+  type `uint8`.
 
   Note: `decode_gif` returns a 4-D array `[num_frames, height, width, 3]`, as
-  opposed to `decode_jpeg` and `decode_png`, which return 3-D arrays
-  `[height, width, num_channels]`. Make sure to take this into account when
-  constructing your graph if you are intermixing GIF files with JPEG and/or PNG
-  files.
+  opposed to `decode_bmp`, `decode_jpeg` and `decode_png`, which return 3-D
+  arrays `[height, width, num_channels]`. Make sure to take this into account
+  when constructing your graph if you are intermixing GIF files with BMP, JPEG,
+  and/or PNG files.
 
   Args:
     contents: 0-D `string`. The encoded image bytes.
@@ -1331,8 +1333,8 @@ def decode_image(contents, channels=None, name=None):
 
   Returns:
     `Tensor` with type `uint8` with shape `[height, width, num_channels]` for
-      JPEG and PNG images and shape `[num_frames, height, width, 3]` for GIF
-      images.
+      BMP, JPEG, and PNG images and shape `[num_frames, height, width, 3]` for
+      GIF images.
 
   Raises:
     ValueError: On incorrect number of channels.
@@ -1342,12 +1344,21 @@ def decode_image(contents, channels=None, name=None):
       raise ValueError('channels must be in (None, 0, 1, 3, 4)')
     substr = string_ops.substr(contents, 0, 3)
 
-    def _gif():
+    def _bmp():
       """Decodes a GIF image."""
-      # Create assert op to check that bytes are GIF decodable
-      is_gif = math_ops.equal(substr, b'\x47\x49\x46', name='is_gif')
-      decode_msg = 'Unable to decode bytes as JPEG, PNG, or GIF'
-      assert_decode = control_flow_ops.Assert(is_gif, [decode_msg])
+      signature = string_ops.substr(contents, 0, 2)
+      # Create assert op to check that bytes are BMP decodable
+      is_bmp = math_ops.equal(signature, 'BM', name='is_bmp')
+      decode_msg = 'Unable to decode bytes as JPEG, PNG, GIF, or BMP'
+      assert_decode = control_flow_ops.Assert(is_bmp, [decode_msg])
+      bmp_channels = 0 if channels is None else channels
+      good_channels = math_ops.not_equal(bmp_channels, 1, name='check_channels')
+      channels_msg = 'Channels must be in (None, 0, 3) when decoding BMP images'
+      assert_channels = control_flow_ops.Assert(good_channels, [channels_msg])
+      with ops.control_dependencies([assert_decode, assert_channels]):
+        return gen_image_ops.decode_bmp(contents)
+
+    def _gif():
       # Create assert to make sure that channels is not set to 1
       # Already checked above that channels is in (None, 0, 1, 3)
 
@@ -1358,9 +1369,14 @@ def decode_image(contents, channels=None, name=None):
       )
       channels_msg = 'Channels must be in (None, 0, 3) when decoding GIF images'
       assert_channels = control_flow_ops.Assert(good_channels, [channels_msg])
-      with ops.control_dependencies([assert_decode, assert_channels]):
+      with ops.control_dependencies([assert_channels]):
         return gen_image_ops.decode_gif(contents)
 
+    def check_gif():
+      # Create assert op to check that bytes are GIF decodable
+      is_gif = math_ops.equal(substr, b'\x47\x49\x46', name='is_gif')
+      return control_flow_ops.cond(is_gif, _gif, _bmp, name='cond_gif')
+
     def _png():
       """Decodes a PNG image."""
       return gen_image_ops.decode_png(contents, channels)
@@ -1368,7 +1384,7 @@ def decode_image(contents, channels=None, name=None):
     def check_png():
       """Checks if an image is PNG."""
       is_png = math_ops.equal(substr, b'\211PN', name='is_png')
-      return control_flow_ops.cond(is_png, _png, _gif, name='cond_png')
+      return control_flow_ops.cond(is_png, _png, check_gif, name='cond_png')
 
     def _jpeg():
       """Decodes a jpeg image."""
diff --git a/tensorflow/python/ops/nn_ops.py b/tensorflow/python/ops/nn_ops.py
index c06c07ccd8..e4eaeff67a 100644
--- a/tensorflow/python/ops/nn_ops.py
+++ b/tensorflow/python/ops/nn_ops.py
@@ -1324,7 +1324,7 @@ def crelu(features, name=None):
   Concatenates a ReLU which selects only the positive part of the activation
   with a ReLU which selects only the *negative* part of the activation.
   Note that as a result this non-linearity doubles the depth of the activations.
-  Source: https://arxiv.org/abs/1603.05201
+  Source: [Understanding and Improving Convolutional Neural Networks via Concatenated Rectified Linear Units. W. Shang, et al.](https://arxiv.org/abs/1603.05201) 
 
   Args:
     features: A `Tensor` with type `float`, `double`, `int32`, `int64`, `uint8`,
@@ -1342,6 +1342,7 @@ def crelu(features, name=None):
 
 def relu6(features, name=None):
   """Computes Rectified Linear 6: `min(max(features, 0), 6)`.
+  Source: [Convolutional Deep Belief Networks on CIFAR-10. A. Krizhevsky](http://www.cs.utoronto.ca/~kriz/conv-cifar10-aug2010.pdf)
 
   Args:
     features: A `Tensor` with type `float`, `double`, `int32`, `int64`, `uint8`,
diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 7543c3c111..3c1ab3248b 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -1764,7 +1764,7 @@ def sparse_transpose(sp_input, perm=None, name=None):
   Raises:
     TypeError: If `sp_input` is not a `SparseTensor`.
   """
-  with ops.op_scope([sp_input], name, "SparseTranspose") as name:
+  with ops.name_scope(name, "SparseTranspose", [sp_input]) as name:
     if perm is None:
       rank = array_ops.rank(sp_input)
       perm = (rank - 1) - math_ops.range(0, rank, 1)
diff --git a/tensorflow/python/training/momentum.py b/tensorflow/python/training/momentum.py
index e42f3b639c..ffd7c12c42 100644
--- a/tensorflow/python/training/momentum.py
+++ b/tensorflow/python/training/momentum.py
@@ -28,8 +28,11 @@ class MomentumOptimizer(optimizer.Optimizer):
   """Optimizer that implements the Momentum algorithm.
 
   Computes (if `use_nesterov = False`):
-    accumulation = momentum * accumulation + gradient
-    variable -= learning_rate * accumulation
+  
+  ```
+  accumulation = momentum * accumulation + gradient
+  variable -= learning_rate * accumulation
+  ```
 
   Note that in the dense version of this algorithm, `accumulation` is updated
   and applied regardless of a gradient's value, whereas the sparse version (when
diff --git a/tensorflow/tools/api/golden/tensorflow.image.pbtxt b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
index 6002f36bac..8f7790f299 100644
--- a/tensorflow/tools/api/golden/tensorflow.image.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.image.pbtxt
@@ -40,6 +40,10 @@ tf_module {
     name: "crop_to_bounding_box"
     argspec: "args=[\'image\', \'offset_height\', \'offset_width\', \'target_height\', \'target_width\'], varargs=None, keywords=None, defaults=None"
   }
+  member_method {
+    name: "decode_bmp"
+    argspec: "args=[\'contents\', \'channels\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
+  }
   member_method {
     name: "decode_gif"
     argspec: "args=[\'contents\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
diff --git a/tensorflow/tools/docker/Dockerfile.devel b/tensorflow/tools/docker/Dockerfile.devel
index a0e0f88d9d..c801ceff93 100644
--- a/tensorflow/tools/docker/Dockerfile.devel
+++ b/tensorflow/tools/docker/Dockerfile.devel
@@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         unzip \
         zip \
         zlib1g-dev \
+        openjdk-8-jdk \
+        openjdk-8-jre-headless \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -46,18 +48,6 @@ COPY run_jupyter.sh /
 
 # Set up Bazel.
 
-# We need to add a custom PPA to pick up JDK8, since trusty doesn't
-# have an openjdk8 backport.  openjdk-r is maintained by a reliable contributor:
-# Matthias Klose (https://launchpad.net/~doko).  It will do until
-# we either update the base image beyond 14.04 or openjdk-8 is
-# finally backported to trusty; see e.g.
-#   https://bugs.launchpad.net/trusty-backports/+bug/1368094
-RUN add-apt-repository -y ppa:openjdk-r/ppa && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-8-jre-headless && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
 # Running bazel inside a `docker build` command causes trouble, cf:
 #   https://github.com/bazelbuild/bazel/issues/134
 # The easiest solution is to set up a bazelrc file forcing --batch.
diff --git a/tensorflow/tools/docker/Dockerfile.devel-gpu b/tensorflow/tools/docker/Dockerfile.devel-gpu
index 743c05ef88..24350c507e 100644
--- a/tensorflow/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow/tools/docker/Dockerfile.devel-gpu
@@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         unzip \
         zip \
         zlib1g-dev \
+        openjdk-8-jdk \
+        openjdk-8-jre-headless \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -46,18 +48,6 @@ COPY run_jupyter.sh /
 
 # Set up Bazel.
 
-# We need to add a custom PPA to pick up JDK8, since trusty doesn't
-# have an openjdk8 backport.  openjdk-r is maintained by a reliable contributor:
-# Matthias Klose (https://launchpad.net/~doko).  It will do until
-# we either update the base image beyond 14.04 or openjdk-8 is
-# finally backported to trusty; see e.g.
-#   https://bugs.launchpad.net/trusty-backports/+bug/1368094
-RUN add-apt-repository -y ppa:openjdk-r/ppa && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-8-jre-headless && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
 # Running bazel inside a `docker build` command causes trouble, cf:
 #   https://github.com/bazelbuild/bazel/issues/134
 # The easiest solution is to set up a bazelrc file forcing --batch.
diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index 9bb438fa71..7e8c51efe6 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -215,7 +215,7 @@ bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
 --out_graph=optimized_inception_graph.pb \
 --inputs='Mul' \
 --outputs='softmax' \
---transforms='\
+--transforms='
   strip_unused_nodes(type=float, shape="1,299,299,3")
   fold_constants(ignore_errors=true)
   fold_batch_norms
@@ -431,12 +431,11 @@ graph:
 ```bash
 bazel build tensorflow/tools/graph_transforms:transform_graph
 bazel-bin/tensorflow/tools/graph_transforms/transform_graph \
---logtostderr \
 --in_graph=/tmp/quantized_inception.pb \
 --out_graph=/tmp/logged_quantized_inception.pb \
 --inputs=Mul \
 --outputs=softmax \
---transforms='\
+--transforms='
 insert_logging(op=RequantizationRange, show_name=true, message="__requant_min_max:")\
 '
 ```
@@ -450,12 +449,10 @@ log:
 bazel build tensorflow/examples/label_image:label_image
 bazel-bin/tensorflow/examples/label_image/label_image \
 --image=${HOME}/Downloads/grace_hopper.jpg \
---logtostderr \
 --input_layer=Mul \
 --output_layer=softmax \
 --graph=/tmp/logged_quantized_inception.pb \
 --labels=${HOME}/Downloads/imagenet_comp_graph_label_strings.txt \
---logtostderr \
 2>/tmp/min_max_log_small.txt
 ```
 
diff --git a/tensorflow/tools/graph_transforms/summarize_graph_main.cc b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
index ca42159538..e492578045 100644
--- a/tensorflow/tools/graph_transforms/summarize_graph_main.cc
+++ b/tensorflow/tools/graph_transforms/summarize_graph_main.cc
@@ -94,7 +94,6 @@ void PrintBenchmarkUsage(const std::vector<const NodeDef*>& placeholders,
   std::cout << "bazel run tensorflow/tools/benchmark:benchmark_model --";
   std::cout << " --graph=" << graph_path;
   std::cout << " --show_flops";
-  std::cout << " --logtostderr";
   std::cout << " --input_layer=" << input_layer_value;
   std::cout << " --input_layer_type=" << input_layer_type_value;
   std::cout << " --input_layer_shape=" << input_layer_shape_value;
diff --git a/tensorflow/tools/proto_text/gen_proto_text_functions.cc b/tensorflow/tools/proto_text/gen_proto_text_functions.cc
index 17ab542a59..ecb29a65a0 100644
--- a/tensorflow/tools/proto_text/gen_proto_text_functions.cc
+++ b/tensorflow/tools/proto_text/gen_proto_text_functions.cc
@@ -130,6 +130,7 @@ int MainImpl(int argc, char** argv) {
 
       const string path = output_root + "/" + proto_path_no_suffix + suffix;
       FILE* f = fopen(path.c_str(), "w");
+      if (f == nullptr) return -1;
       if (fwrite(data.c_str(), 1, data.size(), f) != data.size()) {
         return -1;
       }
diff --git a/tensorflow/tools/quantization/quantize_graph_test.py b/tensorflow/tools/quantization/quantize_graph_test.py
index 3b458dc6aa..df71840b64 100644
--- a/tensorflow/tools/quantization/quantize_graph_test.py
+++ b/tensorflow/tools/quantization/quantize_graph_test.py
@@ -688,7 +688,7 @@ class QuantizeGraphTest(test.TestCase):
 
   def test_quantized_input_range_bias_add(self):
     input_shape = [1, 1, 2, 6]
-    input_n = quantize_graph.create_node("PlaceholderV2", "input", [])
+    input_n = quantize_graph.create_node("Placeholder", "input", [])
     quantize_graph.set_attr_dtype(input_n, "dtype", dtypes.float32)
     quantize_graph.set_attr_shape(input_n, "shape", input_shape)
     offset_n = quantize_graph.create_constant_node(
@@ -713,7 +713,7 @@ class QuantizeGraphTest(test.TestCase):
     shapes = [[3, 2], [2, 4]]
     inputs = []
     for i, shape in enumerate(shapes):
-      node = quantize_graph.create_node("PlaceholderV2", "input_%s" % i, [])
+      node = quantize_graph.create_node("Placeholder", "input_%s" % i, [])
       quantize_graph.set_attr_dtype(node, "dtype", dtypes.float32)
       quantize_graph.set_attr_shape(node, "shape", shape)
       inputs.append(node)
diff --git a/third_party/grpc.BUILD b/third_party/grpc.BUILD
index 1699f6a854..b79259618f 100644
--- a/third_party/grpc.BUILD
+++ b/third_party/grpc.BUILD
@@ -177,8 +177,6 @@ cc_library(
         "include",
     ],
     linkopts = ["-lpthread"],
-    deps = [
-    ],
 )
 
 cc_library(
-- 
GitLab


From 4412ae442725a761b3e107d8058429f4e61c7a16 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 18:19:14 -0700
Subject: [PATCH 1527/1563] Update ops-related pbtxt files.

PiperOrigin-RevId: 156505330
---
 .../core/ops/compat/ops_history.v1.pbtxt      | 208 ++++++++++++++++++
 tensorflow/core/ops/ops.pbtxt                 |  72 +++++-
 2 files changed, 278 insertions(+), 2 deletions(-)

diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
index c3857d2599..49a364e5ef 100644
--- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt
@@ -847,6 +847,93 @@ op {
     }
   }
 }
+op {
+  name: "ApplyAdam"
+  input_arg {
+    name: "var"
+    type_attr: "T"
+    is_ref: true
+  }
+  input_arg {
+    name: "m"
+    type_attr: "T"
+    is_ref: true
+  }
+  input_arg {
+    name: "v"
+    type_attr: "T"
+    is_ref: true
+  }
+  input_arg {
+    name: "beta1_power"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "beta2_power"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "lr"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "beta1"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "beta2"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "epsilon"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  output_arg {
+    name: "out"
+    type_attr: "T"
+    is_ref: true
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "use_locking"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "use_nesterov"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+}
 op {
   name: "ApplyCenteredRMSProp"
   input_arg {
@@ -5601,6 +5688,24 @@ op {
     type: DT_STRING
   }
 }
+op {
+  name: "DecodeBmp"
+  input_arg {
+    name: "contents"
+    type: DT_STRING
+  }
+  output_arg {
+    name: "image"
+    type: DT_UINT8
+  }
+  attr {
+    name: "channels"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+}
 op {
   name: "DecodeCSV"
   input_arg {
@@ -13117,6 +13222,29 @@ op {
     }
   }
 }
+op {
+  name: "NonMaxSuppressionV2"
+  input_arg {
+    name: "boxes"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "scores"
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "max_output_size"
+    type: DT_INT32
+  }
+  input_arg {
+    name: "iou_threshold"
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "selected_indices"
+    type: DT_INT32
+  }
+}
 op {
   name: "NotEqual"
   input_arg {
@@ -17843,6 +17971,86 @@ op {
   }
   is_stateful: true
 }
+op {
+  name: "ResourceApplyAdam"
+  input_arg {
+    name: "var"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "m"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "v"
+    type: DT_RESOURCE
+  }
+  input_arg {
+    name: "beta1_power"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "beta2_power"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "lr"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "beta1"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "beta2"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "epsilon"
+    type_attr: "T"
+  }
+  input_arg {
+    name: "grad"
+    type_attr: "T"
+  }
+  attr {
+    name: "T"
+    type: "type"
+    allowed_values {
+      list {
+        type: DT_FLOAT
+        type: DT_DOUBLE
+        type: DT_INT64
+        type: DT_INT32
+        type: DT_UINT8
+        type: DT_UINT16
+        type: DT_INT16
+        type: DT_INT8
+        type: DT_COMPLEX64
+        type: DT_COMPLEX128
+        type: DT_QINT8
+        type: DT_QUINT8
+        type: DT_QINT32
+        type: DT_HALF
+      }
+    }
+  }
+  attr {
+    name: "use_locking"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  attr {
+    name: "use_nesterov"
+    type: "bool"
+    default_value {
+      b: false
+    }
+  }
+  is_stateful: true
+}
 op {
   name: "ResourceApplyCenteredRMSProp"
   input_arg {
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index 1aa3c99430..d3ee4d74fc 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -924,6 +924,14 @@ op {
     }
     description: "If `True`, updating of the var, m, and v tensors will be protected\nby a lock; otherwise the behavior is undefined, but may exhibit less\ncontention."
   }
+  attr {
+    name: "use_nesterov"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "If `True`, uses the nesterov update."
+  }
   summary: "Update \'*var\' according to the Adam algorithm."
   description: "lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)\nm_t <- beta1 * m_{t-1} + (1 - beta1) * g_t\nv_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t\nvariable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)"
 }
@@ -5511,6 +5519,28 @@ op {
   summary: "Decode web-safe base64-encoded strings."
   description: "Input may or may not have padding at the end. See EncodeBase64 for padding.\nWeb-safe means that input must use - and _ instead of + and /."
 }
+op {
+  name: "DecodeBmp"
+  input_arg {
+    name: "contents"
+    description: "0-D.  The BMP-encoded image."
+    type: DT_STRING
+  }
+  output_arg {
+    name: "image"
+    description: "3-D with shape `[height, width, channels]`. RGB order"
+    type: DT_UINT8
+  }
+  attr {
+    name: "channels"
+    type: "int"
+    default_value {
+      i: 0
+    }
+  }
+  summary: "Decode the first frame of a BMP-encoded image to a uint8 tensor."
+  description: "The attr `channels` indicates the desired number of color channels for the\ndecoded image.\n\nAccepted values are:\n\n*   0: Use the number of channels in the BMP-encoded image.\n*   3: output an RGB image.\n*   4: output an RGBA image."
+}
 op {
   name: "DecodeCSV"
   input_arg {
@@ -12914,7 +12944,37 @@ op {
     description: "A float representing the threshold for deciding whether boxes\noverlap too much with respect to IOU."
   }
   summary: "Greedily selects a subset of bounding boxes in descending order of score,"
-  description: "pruning away boxes that have high intersection-over-union (IOU) overlap\nwith previously selected boxes.  Bounding boxes are supplied as\n[y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any\ndiagonal pair of box corners and the coordinates can be provided as normalized\n(i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm\nis agnostic to where the origin is in the coordinate system.  Note that this\nalgorithm is invariant to orthogonal transformations and translations\nof the coordinate system; thus translating or reflections of the coordinate\nsystem result in the same boxes being selected by the algorithm.\n\nThe output of this operation is a set of integers indexing into the input\ncollection of bounding boxes representing the selected boxes.  The bounding\nbox coordinates corresponding to the selected indices can then be obtained\nusing the `tf.gather operation`.  For example:\n\n  selected_indices = tf.image.non_max_suppression(\n      boxes, scores, max_output_size, iou_threshold)\n  selected_boxes = tf.gather(boxes, selected_indices)"
+  description: "pruning away boxes that have high intersection-over-union (IOU) overlap\nwith previously selected boxes.  Bounding boxes are supplied as\n[y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any\ndiagonal pair of box corners and the coordinates can be provided as normalized\n(i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm\nis agnostic to where the origin is in the coordinate system.  Note that this\nalgorithm is invariant to orthogonal transformations and translations\nof the coordinate system; thus translating or reflections of the coordinate\nsystem result in the same boxes being selected by the algorithm.\nThe output of this operation is a set of integers indexing into the input\ncollection of bounding boxes representing the selected boxes.  The bounding\nbox coordinates corresponding to the selected indices can then be obtained\nusing the `tf.gather operation`.  For example:\n  selected_indices = tf.image.non_max_suppression(\n      boxes, scores, max_output_size, iou_threshold)\n  selected_boxes = tf.gather(boxes, selected_indices)"
+}
+op {
+  name: "NonMaxSuppressionV2"
+  input_arg {
+    name: "boxes"
+    description: "A 2-D float tensor of shape `[num_boxes, 4]`."
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "scores"
+    description: "A 1-D float tensor of shape `[num_boxes]` representing a single\nscore corresponding to each box (each row of boxes)."
+    type: DT_FLOAT
+  }
+  input_arg {
+    name: "max_output_size"
+    description: "A scalar integer tensor representing the maximum number of\nboxes to be selected by non max suppression."
+    type: DT_INT32
+  }
+  input_arg {
+    name: "iou_threshold"
+    description: "A 0-D float tensor representing the threshold for deciding whether\nboxes overlap too much with respect to IOU."
+    type: DT_FLOAT
+  }
+  output_arg {
+    name: "selected_indices"
+    description: "A 1-D integer tensor of shape `[M]` representing the selected\nindices from the boxes tensor, where `M <= max_output_size`."
+    type: DT_INT32
+  }
+  summary: "Greedily selects a subset of bounding boxes in descending order of score,"
+  description: "pruning away boxes that have high intersection-over-union (IOU) overlap\nwith previously selected boxes.  Bounding boxes are supplied as\n[y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any\ndiagonal pair of box corners and the coordinates can be provided as normalized\n(i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm\nis agnostic to where the origin is in the coordinate system.  Note that this\nalgorithm is invariant to orthogonal transformations and translations\nof the coordinate system; thus translating or reflections of the coordinate\nsystem result in the same boxes being selected by the algorithm.\n\nThe output of this operation is a set of integers indexing into the input\ncollection of bounding boxes representing the selected boxes.  The bounding\nbox coordinates corresponding to the selected indices can then be obtained\nusing the `tf.gather operation`.  For example:\n\n  selected_indices = tf.image.non_max_suppression_v2(\n      boxes, scores, max_output_size, iou_threshold)\n  selected_boxes = tf.gather(boxes, selected_indices)"
 }
 op {
   name: "NotEqual"
@@ -18182,6 +18242,14 @@ op {
     }
     description: "If `True`, updating of the var, m, and v tensors will be protected\nby a lock; otherwise the behavior is undefined, but may exhibit less\ncontention."
   }
+  attr {
+    name: "use_nesterov"
+    type: "bool"
+    default_value {
+      b: false
+    }
+    description: "If `True`, uses the nesterov update."
+  }
   summary: "Update \'*var\' according to the Adam algorithm."
   description: "lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)\nm_t <- beta1 * m_{t-1} + (1 - beta1) * g_t\nv_t <- beta2 * v_{t-1} + (1 - beta2) * g_t * g_t\nvariable <- variable - lr_t * m_t / (sqrt(v_t) + epsilon)"
   is_stateful: true
@@ -20673,7 +20741,7 @@ op {
   }
   input_arg {
     name: "sparse_indices"
-    description: "a list of vectors where each value is the indices which has\ncorresponding weights in sparse_weights. This field maybe ommitted for the\ndense approach."
+    description: "a list of vectors where each value is the indices which has\ncorresponding weights in sparse_weights. This field maybe omitted for the\ndense approach."
     type: DT_INT64
     number_attr: "num_sparse_features"
   }
-- 
GitLab


From 37a34b4ecd16ce7f1d783530102b5e6ec1cd2317 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 18:24:25 -0700
Subject: [PATCH 1528/1563] Go: Update generated wrapper functions for
 TensorFlow ops.

PiperOrigin-RevId: 156505704
---
 tensorflow/go/op/wrappers.go | 257 ++++++++++++++++++++++++-----------
 1 file changed, 178 insertions(+), 79 deletions(-)

diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 625ad269f9..4af1386306 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -1661,82 +1661,6 @@ func ShapeN(scope *Scope, input []tf.Output, optional ...ShapeNAttr) (output []t
 	return output
 }
 
-// Reshapes a tensor.
-//
-// Given `tensor`, this operation returns a tensor that has the same values
-// as `tensor` with shape `shape`.
-//
-// If one component of `shape` is the special value -1, the size of that dimension
-// is computed so that the total size remains constant.  In particular, a `shape`
-// of `[-1]` flattens into 1-D.  At most one component of `shape` can be -1.
-//
-// If `shape` is 1-D or higher, then the operation returns a tensor with shape
-// `shape` filled with the values of `tensor`. In this case, the number of elements
-// implied by `shape` must be the same as the number of elements in `tensor`.
-//
-// For example:
-//
-// ```
-// # tensor 't' is [1, 2, 3, 4, 5, 6, 7, 8, 9]
-// # tensor 't' has shape [9]
-// reshape(t, [3, 3]) ==> [[1, 2, 3],
-//                         [4, 5, 6],
-//                         [7, 8, 9]]
-//
-// # tensor 't' is [[[1, 1], [2, 2]],
-// #                [[3, 3], [4, 4]]]
-// # tensor 't' has shape [2, 2, 2]
-// reshape(t, [2, 4]) ==> [[1, 1, 2, 2],
-//                         [3, 3, 4, 4]]
-//
-// # tensor 't' is [[[1, 1, 1],
-// #                 [2, 2, 2]],
-// #                [[3, 3, 3],
-// #                 [4, 4, 4]],
-// #                [[5, 5, 5],
-// #                 [6, 6, 6]]]
-// # tensor 't' has shape [3, 2, 3]
-// # pass '[-1]' to flatten 't'
-// reshape(t, [-1]) ==> [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6]
-//
-// # -1 can also be used to infer the shape
-//
-// # -1 is inferred to be 9:
-// reshape(t, [2, -1]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],
-//                          [4, 4, 4, 5, 5, 5, 6, 6, 6]]
-// # -1 is inferred to be 2:
-// reshape(t, [-1, 9]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],
-//                          [4, 4, 4, 5, 5, 5, 6, 6, 6]]
-// # -1 is inferred to be 3:
-// reshape(t, [ 2, -1, 3]) ==> [[[1, 1, 1],
-//                               [2, 2, 2],
-//                               [3, 3, 3]],
-//                              [[4, 4, 4],
-//                               [5, 5, 5],
-//                               [6, 6, 6]]]
-//
-// # tensor 't' is [7]
-// # shape `[]` reshapes to a scalar
-// reshape(t, []) ==> 7
-// ```
-//
-// Arguments:
-//
-//	shape: Defines the shape of the output tensor.
-func Reshape(scope *Scope, tensor tf.Output, shape tf.Output) (output tf.Output) {
-	if scope.Err() != nil {
-		return
-	}
-	opspec := tf.OpSpec{
-		Type: "Reshape",
-		Input: []tf.Input{
-			tensor, shape,
-		},
-	}
-	op := scope.AddOperation(opspec)
-	return op.Output(0)
-}
-
 // Checks a tensor for NaN and Inf values.
 //
 // When run, reports an `InvalidArgument` error if `tensor` has any values
@@ -5202,6 +5126,128 @@ func SparseTensorSliceDataset(scope *Scope, indices tf.Output, values tf.Output,
 	return op.Output(0)
 }
 
+// Reshapes a tensor.
+//
+// Given `tensor`, this operation returns a tensor that has the same values
+// as `tensor` with shape `shape`.
+//
+// If one component of `shape` is the special value -1, the size of that dimension
+// is computed so that the total size remains constant.  In particular, a `shape`
+// of `[-1]` flattens into 1-D.  At most one component of `shape` can be -1.
+//
+// If `shape` is 1-D or higher, then the operation returns a tensor with shape
+// `shape` filled with the values of `tensor`. In this case, the number of elements
+// implied by `shape` must be the same as the number of elements in `tensor`.
+//
+// For example:
+//
+// ```
+// # tensor 't' is [1, 2, 3, 4, 5, 6, 7, 8, 9]
+// # tensor 't' has shape [9]
+// reshape(t, [3, 3]) ==> [[1, 2, 3],
+//                         [4, 5, 6],
+//                         [7, 8, 9]]
+//
+// # tensor 't' is [[[1, 1], [2, 2]],
+// #                [[3, 3], [4, 4]]]
+// # tensor 't' has shape [2, 2, 2]
+// reshape(t, [2, 4]) ==> [[1, 1, 2, 2],
+//                         [3, 3, 4, 4]]
+//
+// # tensor 't' is [[[1, 1, 1],
+// #                 [2, 2, 2]],
+// #                [[3, 3, 3],
+// #                 [4, 4, 4]],
+// #                [[5, 5, 5],
+// #                 [6, 6, 6]]]
+// # tensor 't' has shape [3, 2, 3]
+// # pass '[-1]' to flatten 't'
+// reshape(t, [-1]) ==> [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6]
+//
+// # -1 can also be used to infer the shape
+//
+// # -1 is inferred to be 9:
+// reshape(t, [2, -1]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],
+//                          [4, 4, 4, 5, 5, 5, 6, 6, 6]]
+// # -1 is inferred to be 2:
+// reshape(t, [-1, 9]) ==> [[1, 1, 1, 2, 2, 2, 3, 3, 3],
+//                          [4, 4, 4, 5, 5, 5, 6, 6, 6]]
+// # -1 is inferred to be 3:
+// reshape(t, [ 2, -1, 3]) ==> [[[1, 1, 1],
+//                               [2, 2, 2],
+//                               [3, 3, 3]],
+//                              [[4, 4, 4],
+//                               [5, 5, 5],
+//                               [6, 6, 6]]]
+//
+// # tensor 't' is [7]
+// # shape `[]` reshapes to a scalar
+// reshape(t, []) ==> 7
+// ```
+//
+// Arguments:
+//
+//	shape: Defines the shape of the output tensor.
+func Reshape(scope *Scope, tensor tf.Output, shape tf.Output) (output tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "Reshape",
+		Input: []tf.Input{
+			tensor, shape,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
+// Greedily selects a subset of bounding boxes in descending order of score,
+//
+// pruning away boxes that have high intersection-over-union (IOU) overlap
+// with previously selected boxes.  Bounding boxes are supplied as
+// [y1, x1, y2, x2], where (y1, x1) and (y2, x2) are the coordinates of any
+// diagonal pair of box corners and the coordinates can be provided as normalized
+// (i.e., lying in the interval [0, 1]) or absolute.  Note that this algorithm
+// is agnostic to where the origin is in the coordinate system.  Note that this
+// algorithm is invariant to orthogonal transformations and translations
+// of the coordinate system; thus translating or reflections of the coordinate
+// system result in the same boxes being selected by the algorithm.
+//
+// The output of this operation is a set of integers indexing into the input
+// collection of bounding boxes representing the selected boxes.  The bounding
+// box coordinates corresponding to the selected indices can then be obtained
+// using the `tf.gather operation`.  For example:
+//
+//   selected_indices = tf.image.non_max_suppression_v2(
+//       boxes, scores, max_output_size, iou_threshold)
+//   selected_boxes = tf.gather(boxes, selected_indices)
+//
+// Arguments:
+//	boxes: A 2-D float tensor of shape `[num_boxes, 4]`.
+//	scores: A 1-D float tensor of shape `[num_boxes]` representing a single
+// score corresponding to each box (each row of boxes).
+//	max_output_size: A scalar integer tensor representing the maximum number of
+// boxes to be selected by non max suppression.
+//	iou_threshold: A 0-D float tensor representing the threshold for deciding whether
+// boxes overlap too much with respect to IOU.
+//
+// Returns A 1-D integer tensor of shape `[M]` representing the selected
+// indices from the boxes tensor, where `M <= max_output_size`.
+func NonMaxSuppressionV2(scope *Scope, boxes tf.Output, scores tf.Output, max_output_size tf.Output, iou_threshold tf.Output) (selected_indices tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	opspec := tf.OpSpec{
+		Type: "NonMaxSuppressionV2",
+		Input: []tf.Input{
+			boxes, scores, max_output_size, iou_threshold,
+		},
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // CropAndResizeGradBoxesAttr is an optional argument to CropAndResizeGradBoxes.
 type CropAndResizeGradBoxesAttr func(optionalAttr)
 
@@ -9051,7 +9097,7 @@ func SdcaOptimizerAdaptative(value bool) SdcaOptimizerAttr {
 //	example_labels: a vector which contains the label/target associated with each
 // example.
 //	sparse_indices: a list of vectors where each value is the indices which has
-// corresponding weights in sparse_weights. This field maybe ommitted for the
+// corresponding weights in sparse_weights. This field maybe omitted for the
 // dense approach.
 //	sparse_weights: a list of vectors where each value is the weight associated with
 // a sparse feature group.
@@ -9605,6 +9651,51 @@ func AddSparseToTensorsMap(scope *Scope, sparse_indices tf.Output, sparse_values
 	return op.Output(0)
 }
 
+// DecodeBmpAttr is an optional argument to DecodeBmp.
+type DecodeBmpAttr func(optionalAttr)
+
+// DecodeBmpChannels sets the optional channels attribute to value.
+// If not specified, defaults to 0
+func DecodeBmpChannels(value int64) DecodeBmpAttr {
+	return func(m optionalAttr) {
+		m["channels"] = value
+	}
+}
+
+// Decode the first frame of a BMP-encoded image to a uint8 tensor.
+//
+// The attr `channels` indicates the desired number of color channels for the
+// decoded image.
+//
+// Accepted values are:
+//
+// *   0: Use the number of channels in the BMP-encoded image.
+// *   3: output an RGB image.
+// *   4: output an RGBA image.
+//
+// Arguments:
+//	contents: 0-D.  The BMP-encoded image.
+//
+// Returns 3-D with shape `[height, width, channels]`. RGB order
+func DecodeBmp(scope *Scope, contents tf.Output, optional ...DecodeBmpAttr) (image tf.Output) {
+	if scope.Err() != nil {
+		return
+	}
+	attrs := map[string]interface{}{}
+	for _, a := range optional {
+		a(attrs)
+	}
+	opspec := tf.OpSpec{
+		Type: "DecodeBmp",
+		Input: []tf.Input{
+			contents,
+		},
+		Attrs: attrs,
+	}
+	op := scope.AddOperation(opspec)
+	return op.Output(0)
+}
+
 // Computes softmax activations.
 //
 // For each batch `i` and class `j` we have
@@ -11838,6 +11929,16 @@ func ResourceApplyAdamUseLocking(value bool) ResourceApplyAdamAttr {
 	}
 }
 
+// ResourceApplyAdamUseNesterov sets the optional use_nesterov attribute to value.
+//
+// value: If `True`, uses the nesterov update.
+// If not specified, defaults to false
+func ResourceApplyAdamUseNesterov(value bool) ResourceApplyAdamAttr {
+	return func(m optionalAttr) {
+		m["use_nesterov"] = value
+	}
+}
+
 // Update '*var' according to the Adam algorithm.
 //
 // lr_t <- learning_rate * sqrt(1 - beta2^t) / (1 - beta1^t)
@@ -14198,12 +14299,10 @@ func NonMaxSuppressionIouThreshold(value float32) NonMaxSuppressionAttr {
 // algorithm is invariant to orthogonal transformations and translations
 // of the coordinate system; thus translating or reflections of the coordinate
 // system result in the same boxes being selected by the algorithm.
-//
 // The output of this operation is a set of integers indexing into the input
 // collection of bounding boxes representing the selected boxes.  The bounding
 // box coordinates corresponding to the selected indices can then be obtained
 // using the `tf.gather operation`.  For example:
-//
 //   selected_indices = tf.image.non_max_suppression(
 //       boxes, scores, max_output_size, iou_threshold)
 //   selected_boxes = tf.gather(boxes, selected_indices)
-- 
GitLab


From 1318e59cc38f6fa225ba5826aae437c3b055b198 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 18:32:16 -0700
Subject: [PATCH 1529/1563] Add `indicators_to_sparse_ids`.

PiperOrigin-RevId: 156506209
---
 .../contrib/layers/python/ops/sparse_ops.py   | 108 +++++++++++++--
 .../layers/python/ops/sparse_ops_test.py      | 125 +++++++++++++++++-
 2 files changed, 224 insertions(+), 9 deletions(-)

diff --git a/tensorflow/contrib/layers/python/ops/sparse_ops.py b/tensorflow/contrib/layers/python/ops/sparse_ops.py
index 02a635a46a..114f312d27 100644
--- a/tensorflow/contrib/layers/python/ops/sparse_ops.py
+++ b/tensorflow/contrib/layers/python/ops/sparse_ops.py
@@ -38,14 +38,24 @@ def _multiplier_helper(shape):
   return multipliers
 
 
+def _ignore_value(dtype):
+  if dtype == dtypes.string:
+    # Exception due to TF strings are converted to numpy objects by default.
+    return ""
+  # NOTE: `as_numpy_dtype` is a property, so with the parentheses this is
+  # constructing a new numpy object of the given type, which yields the
+  # default value for that type.
+  return dtype.as_numpy_dtype()
+
+
 def dense_to_sparse_tensor(dense_tensor, ignore_value=None):
-  """Converts a dense Tensor to a SparseTensor, dropping ignore_value cells.
+  """Converts dense `Tensor` to `SparseTensor`, dropping `ignore_value` cells.
 
   Args:
-    dense_tensor: A `Tensor`.
+    dense_tensor: A `Tensor`. This must have a statically defined rank.
     ignore_value: Entries in `dense_tensor` equal to this value will be
       absent from the return `SparseTensor`. If `None`, default value of
-      dense_tensor's dtype will be used (e.g. '' for `str`, 0 for `int`).
+      `dense_tensor` dtype will be used (e.g. '' for `str`, 0 for `int`).
 
   Returns:
     A `SparseTensor` with the same shape as `dense_tensor`.
@@ -59,11 +69,7 @@ def dense_to_sparse_tensor(dense_tensor, ignore_value=None):
       # TODO(b/32318825): Implement dense_to_sparse_tensor for undefined rank.
       raise ValueError("dense_tensor.get_shape() should be defined, got None.")
     if ignore_value is None:
-      if dense_t.dtype == dtypes.string:
-        # Exception due to TF strings are converted to numpy objects by default.
-        ignore_value = ""
-      else:
-        ignore_value = dense_t.dtype.as_numpy_dtype()
+      ignore_value = _ignore_value(dense_t.dtype)
     dense_shape = math_ops.cast(array_ops.shape(dense_t), dtypes.int64)
     indices = array_ops.where(
         math_ops.not_equal(dense_t, math_ops.cast(ignore_value, dense_t.dtype)))
@@ -84,6 +90,92 @@ def dense_to_sparse_tensor(dense_tensor, ignore_value=None):
     return sparse_tensor.SparseTensor(indices, values, dense_shape)
 
 
+# TODO(ptucker): Support integer dtype arg, and cast values back to that.
+def indicators_to_sparse_ids(indicators, ignore_value=None, dtype=dtypes.int64):
+  """Convert a dense indicator tensor to sparse IDs.
+
+  This is commonly used for converting a dense classification label to sparse.
+  In the following example, we have an input of shape (2, 2, num_classes),
+  where num_classes=4.
+
+  indicators = [
+    [[0, 0, 1, 0], [0, 0, 0, 0]],
+    [[1, 0, 1, 1], [0, 0, 1, 0]],
+  ]
+  indicator_to_sparse_ids(indicators) => [
+    [[2], []],
+    [[0, 2, 3], [2]],
+  ]
+
+  Args:
+    indicators: Dense `Tensor` of shape `(d0, ..., dn, num_classes)`. This must
+      have a statically defined rank. `ignore_value` values are ignored. For
+      other values (typically, ones), the index along the last dimension is
+      returned.
+    ignore_value: Entries in `indicators` equal to this value will be
+      absent from the returned `SparseTensor`. If `None`, default value of
+      `indicators` dtype will be used (e.g. '' for `str`, 0 for `int`).
+    dtype: Type of result, must be integer type.
+
+  Returns:
+    `tf.int64` `SparseTensor` of shape `(d0, ..., dn, max_num_labels)`,
+      where `max_num_labels` is the maximum number of non-zero values in any
+      row (in the example above, row (1, 1) has 3 non-zero values, so the result
+      shape is (2, 2, 3)). The values of this `SparseTensor` are in the range
+      `[0, num_classes)` and correspond to the index of non-empty values along
+      the last dimension of `indicators`.
+
+  Raises:
+    ValueError: if `dtype` is not integer.
+  """
+  if not dtype.is_integer:
+    raise ValueError("Invalid dtype {} not integer.".format(dtype))
+  with ops.name_scope(
+      None, "indicators_to_sparse_ids", (indicators, ignore_value)):
+    # Convert indicators to binary ones and zeros. We use int64 since
+    # SparseTensor requires int64 indices.
+    indicators = ops.convert_to_tensor(indicators, name="indicators")
+    if ignore_value is None:
+      ignore_value = _ignore_value(indicators.dtype)
+    missing_indicators = math_ops.equal(
+        indicators, ignore_value, name="missing")
+    zeros_like_indicators = array_ops.zeros_like(
+        indicators, dtype=dtypes.int64, name="zeros")
+    binary_indicators = array_ops.where(
+        missing_indicators, zeros_like_indicators,
+        array_ops.ones_like(indicators, dtype=dtypes.int64, name="ones"),
+        name="binary_indicators")
+
+    # Use cumsum along the last dimension to generate per-row indexes.
+    # Note that these are 1-based (since 0 indicates missing values), so they're
+    # off-by-1 from the actual indices. We'll subtract 1 below. Since they're
+    # off-by-one, the max value is the size of last dimension (i.e.,
+    # last_index + 1).
+    row_index_indicators = array_ops.where(
+        missing_indicators, zeros_like_indicators,
+        math_ops.cumsum(binary_indicators, axis=-1), "row_index_indicators")
+    result_last_dim = array_ops.reshape(
+        math_ops.reduce_max(row_index_indicators), shape=(1,),
+        name="result_last_dim")
+
+    # Convert to a SparseTensor. The values of this SparseTensor are the last
+    # indices of our result, and the last indices of this SparseTensor (i.e.,
+    # the class IDs indicated by `indicators`) are the values of our result, so
+    # we use unstack/stack to swap them.
+    sparse_row_index_indicators = dense_to_sparse_tensor(
+        row_index_indicators, ignore_value=0)
+    index_columns = array_ops.unstack(
+        sparse_row_index_indicators.indices, axis=1)
+    return sparse_tensor.SparseTensor(
+        indices=array_ops.stack(
+            index_columns[0:-1] + [sparse_row_index_indicators.values - 1],
+            axis=1, name="indices"),
+        values=math_ops.cast(index_columns[-1], dtype=dtype, name="values"),
+        dense_shape=array_ops.concat(
+            (sparse_row_index_indicators.dense_shape[0:-1], result_last_dim),
+            axis=0, name="dense_shape"))
+
+
 def sparse_row_envelope(sparse_input, row_axis=0, col_axis=1, name=None):
   """Returns the length of each 'row' in a `SparseTensor`.
 
diff --git a/tensorflow/contrib/layers/python/ops/sparse_ops_test.py b/tensorflow/contrib/layers/python/ops/sparse_ops_test.py
index 76c4ea599d..9a9582dcad 100644
--- a/tensorflow/contrib/layers/python/ops/sparse_ops_test.py
+++ b/tensorflow/contrib/layers/python/ops/sparse_ops_test.py
@@ -27,7 +27,19 @@ from tensorflow.python.ops import array_ops
 from tensorflow.python.platform import test
 
 
-class SparseOpsTest(test.TestCase):
+def _assert_sparse_tensor_value(test_case, expected, actual):
+  test_case.assertEqual(np.int64, np.array(actual.indices).dtype)
+  test_case.assertAllEqual(expected.indices, actual.indices)
+
+  test_case.assertEqual(
+      np.array(expected.values).dtype, np.array(actual.values).dtype)
+  test_case.assertAllEqual(expected.values, actual.values)
+
+  test_case.assertEqual(np.int64, np.array(actual.dense_shape).dtype)
+  test_case.assertAllEqual(expected.dense_shape, actual.dense_shape)
+
+
+class DenseToSparseTensorTest(test.TestCase):
 
   def test_dense_to_sparse_tensor_1d(self):
     with self.test_session() as sess:
@@ -134,6 +146,9 @@ class SparseOpsTest(test.TestCase):
         tensor = array_ops.placeholder(dtype=dtypes.int32)
         sparse_ops.dense_to_sparse_tensor(tensor)
 
+
+class SparseRowEnvelopeTest(test.TestCase):
+
   def test_sparse_row_envelope(self):
     expected_sparse_row_envelope = [1, 0, 3]
     with self.test_session() as sess:
@@ -183,5 +198,113 @@ class SparseOpsTest(test.TestCase):
                           sparse_row_envelope)
 
 
+class IndicatorToSparseIdsTest(test.TestCase):
+
+  def test_indicators_to_sparse_ids_1d(self):
+    indicators = (0, 0, 1, 0)
+    sparse_ids = sparse_ops.indicators_to_sparse_ids(indicators)
+    with self.test_session():
+      _assert_sparse_tensor_value(self, sparse_tensor.SparseTensorValue(
+          indices=((0,),),
+          values=(2,),
+          dense_shape=(1,),
+      ), sparse_ids.eval())
+
+  def test_indicators_to_sparse_ids_2d(self):
+    indicators = (
+        (0, 0, 1, 0),
+        (1, 0, 0, 1),
+    )
+    sparse_ids = sparse_ops.indicators_to_sparse_ids(indicators)
+    with self.test_session():
+      _assert_sparse_tensor_value(self, sparse_tensor.SparseTensorValue(
+          indices=((0, 0), (1, 0), (1, 1)),
+          values=(2, 0, 3),
+          dense_shape=(2, 2),
+      ), sparse_ids.eval())
+
+  def test_indicators_to_sparse_ids_3d(self):
+    indicators = (
+        ((0, 0, 1, 0, 0), (0, 0, 0, 0, 0)),
+        ((1, 0, 0, 1, 0), (0, 0, 1, 0, 0)),
+        ((0, 0, 0, 0, 0), (0, 0, 0, 0, 0)),
+        ((1, 0, 0, 1, 1), (0, 0, 1, 0, 0)),
+    )
+    sparse_ids = sparse_ops.indicators_to_sparse_ids(indicators)
+    with self.test_session():
+      _assert_sparse_tensor_value(self, sparse_tensor.SparseTensorValue(
+          indices=(
+              (0, 0, 0),
+              (1, 0, 0), (1, 0, 1), (1, 1, 0),
+              (3, 0, 0), (3, 0, 1), (3, 0, 2), (3, 1, 0)
+          ), values=(
+              2,
+              0, 3, 2,
+              0, 3, 4, 2
+          ), dense_shape=(4, 2, 3),
+      ), sparse_ids.eval())
+
+  def test_indicators_to_sparse_ids_ignore_value(self):
+    indicators = (
+        ((-1, -1, 10, -1), (-1, -1, -1, -1)),
+        ((11, -1, -1, 12), (-1, -1, 13, -1)),
+    )
+    sparse_ids = sparse_ops.indicators_to_sparse_ids(
+        indicators, ignore_value=-1)
+    with self.test_session():
+      _assert_sparse_tensor_value(self, sparse_tensor.SparseTensorValue(
+          indices=((0, 0, 0), (1, 0, 0), (1, 0, 1), (1, 1, 0)),
+          values=(2, 0, 3, 2),
+          dense_shape=(2, 2, 2),
+      ), sparse_ids.eval())
+
+  def test_string_indicators_to_sparse_ids(self):
+    indicators = (
+        (('', '', 'A', ''), ('', '', '', '')),
+        (('B', '', '', 'C'), ('', '', 'D', '')),
+    )
+    sparse_ids = sparse_ops.indicators_to_sparse_ids(indicators)
+    with self.test_session():
+      _assert_sparse_tensor_value(self, sparse_tensor.SparseTensorValue(
+          indices=((0, 0, 0), (1, 0, 0), (1, 0, 1), (1, 1, 0)),
+          values=(2, 0, 3, 2),
+          dense_shape=(2, 2, 2),
+      ), sparse_ids.eval())
+
+  def test_string_indicators_to_sparse_ids_ignore_value(self):
+    indicators = (
+        (('x', 'x', 'A', 'x'), ('x', 'x', 'x', 'x')),
+        (('B', 'x', 'x', 'C'), ('x', 'x', 'D', 'x')),
+    )
+    sparse_ids = sparse_ops.indicators_to_sparse_ids(
+        indicators, ignore_value='x')
+    with self.test_session():
+      _assert_sparse_tensor_value(self, sparse_tensor.SparseTensorValue(
+          indices=((0, 0, 0), (1, 0, 0), (1, 0, 1), (1, 1, 0)),
+          values=(2, 0, 3, 2),
+          dense_shape=(2, 2, 2),
+      ), sparse_ids.eval())
+
+  def test_indicators_to_sparse_ids_unknown_dims(self):
+    indicators_values = (
+        ((0, 0, 1, 0), (0, 0, 0, 0)),
+        ((1, 0, 0, 1), (0, 0, 1, 0)),
+    )
+    indicators = array_ops.placeholder(
+        dtype=dtypes.int32, shape=(None, None, None))
+    sparse_ids = sparse_ops.indicators_to_sparse_ids(indicators)
+    with self.test_session():
+      _assert_sparse_tensor_value(self, sparse_tensor.SparseTensorValue(
+          indices=((0, 0, 0), (1, 0, 0), (1, 0, 1), (1, 1, 0)),
+          values=(2, 0, 3, 2),
+          dense_shape=(2, 2, 2),
+      ), sparse_ids.eval(feed_dict={indicators: indicators_values}))
+
+  def test_indicators_to_sparse_ids_unknown_rank(self):
+    indicators = array_ops.placeholder(dtype=dtypes.int32)
+    with self.assertRaisesRegexp(ValueError, r'shape.*should be defined'):
+      sparse_ops.indicators_to_sparse_ids(indicators)
+
+
 if __name__ == '__main__':
   test.main()
-- 
GitLab


From c7bf181553b9bb1652b09d31591371f8446da117 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 18 May 2017 19:03:05 -0700
Subject: [PATCH 1530/1563] Upgraded LIBXSMM to 1.8.1.

PiperOrigin-RevId: 156508163
---
 tensorflow/workspace.bzl  |  8 ++++----
 third_party/libxsmm.BUILD | 22 ++++++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index f41dffefec..3f8619af08 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -161,11 +161,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
   native.new_http_archive(
       name = "libxsmm_archive",
       urls = [
-          "http://mirror.bazel.build/github.com/hfp/libxsmm/archive/1.8.tar.gz",
-          "https://github.com/hfp/libxsmm/archive/1.8.tar.gz",
+          "http://mirror.bazel.build/github.com/hfp/libxsmm/archive/1.8.1.tar.gz",
+          "https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz",
       ],
-      sha256 = "0330201afb5525d0950ec861fec9dd75eb40a03845ebe03d2c635cf8bfc14fea",
-      strip_prefix = "libxsmm-1.8",
+      sha256 = "2ade869c3f42f23b5263c7d594aa3c7e5e61ac6a3afcaf5d6e42899d2a7986ce",
+      strip_prefix = "libxsmm-1.8.1",
       build_file = str(Label("//third_party:libxsmm.BUILD")),
   )
 
diff --git a/third_party/libxsmm.BUILD b/third_party/libxsmm.BUILD
index 53a814b4b8..f9f1ea1085 100644
--- a/third_party/libxsmm.BUILD
+++ b/third_party/libxsmm.BUILD
@@ -11,18 +11,19 @@ exports_files(["LICENSE"])
 libxsmm_interface_arguments = "0 1"
 
 # Arguments to ./scripts/libxsmm_config.py, see that file for detailed description.
-#  ilp64: 0 (no)
-#  big: 1 (yes)
-#  offload: 0 (no)
+#  ilp64: no
+#  big: no
+#  offload: no
 #  alignment [b]
-#  prefetch: -1 (auto)
-#  threshold: 0 (auto)
+#  prefetch: 1 (auto)
+#  threshold: fallback to BLAS if n*m*k above this
 #  synchronize: yes
-#  jit: 1 (yes)
-#  flags: 0 (none)
+#  jit: yes
+#  flags
 #  alpha = 1
 #  beta = 1
-libxsmm_config_arguments = "0 1 0 64 -1 0 1 1 0 1 1"
+#  gemm = 2
+libxsmm_config_arguments = "0 0 0 64 1 0 1 1 0 1 1 2"
 
 # Arguments to ./scripts/libxsmm_dispatch.py, see that file for detailed description.
 #  (dummy argument)
@@ -66,6 +67,8 @@ cc_library(
         "src/libxsmm_dnn_convolution_winograd_weight_update.c",
         "src/libxsmm_dnn_handle.c",
         "src/libxsmm_dump.c",
+        "src/libxsmm_ext_gemm.c",
+        "src/libxsmm_ext_trans.c",
         "src/libxsmm_fsspmdm.c",
         "src/libxsmm_gemm.c",
         "src/libxsmm_main.c",
@@ -92,6 +95,9 @@ cc_library(
         "include/libxsmm_sync.h",
         "include/libxsmm_timer.h",
         "include/libxsmm_typedefs.h",
+        # Source files #included internally:
+        "src/libxsmm_gemm_diff.c",
+        "src/libxsmm_hash.c",
         # Generated:
         "include/libxsmm.h",
         "include/libxsmm_config.h",
-- 
GitLab


From 21185383dfe0047522740045d063f126fb3aa74f Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 19 May 2017 01:15:34 -0700
Subject: [PATCH 1531/1563] Small cleanup in shape_util.cc

In a previous changelist I forgot to remove the three lines to convert from repeated
field to vector that I used before I found the AsInt64Slice() method.
Also, don't use ShapeUtil:: for static method calls that are called from other
ShapeUtil static methods.

PiperOrigin-RevId: 156527698
---
 tensorflow/compiler/xla/shape_util.cc | 63 +++++++++++----------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/tensorflow/compiler/xla/shape_util.cc b/tensorflow/compiler/xla/shape_util.cc
index 2b32b78f0b..ccc1dc63e7 100644
--- a/tensorflow/compiler/xla/shape_util.cc
+++ b/tensorflow/compiler/xla/shape_util.cc
@@ -202,7 +202,7 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
 }
 
 /* static */ void ShapeUtil::AppendMajorDimension(int bound, Shape* shape) {
-  shape->mutable_layout()->add_minor_to_major(ShapeUtil::Rank(*shape));
+  shape->mutable_layout()->add_minor_to_major(Rank(*shape));
   shape->add_dimensions(bound);
   TF_DCHECK_OK(ValidateShape(*shape));
 }
@@ -295,7 +295,7 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
 
   std::vector<Shape> new_elements(tuple.tuple_shapes().begin() + start,
                                   tuple.tuple_shapes().begin() + limit);
-  return ShapeUtil::MakeTupleShape(new_elements);
+  return MakeTupleShape(new_elements);
 }
 
 /* static */ bool ShapeUtil::IsOpaque(const Shape& shape) {
@@ -309,7 +309,7 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
   if (shape.element_type() != element_type) {
     return false;
   }
-  if (shape.dimensions_size() != ShapeUtil::Rank(shape)) {
+  if (shape.dimensions_size() != Rank(shape)) {
     return false;
   }
   int64 i = 0;
@@ -323,7 +323,7 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
 }
 
 /* static */ int64 ShapeUtil::ElementsIn(const Shape& shape) {
-  CHECK_EQ(shape.dimensions_size(), ShapeUtil::Rank(shape));
+  CHECK_EQ(shape.dimensions_size(), Rank(shape));
   return std::accumulate<decltype(shape.dimensions().begin()), int64>(
       shape.dimensions().begin(), shape.dimensions().end(), 1LL,
       std::multiplies<int64>());
@@ -334,7 +334,7 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
 }
 
 /* static */ bool ShapeUtil::IsScalarF32(const Shape& shape) {
-  return shape.element_type() == F32 && ShapeUtil::Rank(shape) == 0;
+  return shape.element_type() == F32 && Rank(shape) == 0;
 }
 
 /* static */ string ShapeUtil::HumanString(const Shape& shape) {
@@ -432,13 +432,12 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
     }
     Shape result;
     if (layout_string.empty()) {
-      result = ShapeUtil::MakeShape(primitive_type, dimensions);
+      result = MakeShape(primitive_type, dimensions);
     } else {
       TF_ASSIGN_OR_RETURN(std::vector<int64> min2maj,
                           comma_list_to_int64s(layout_string));
       TF_RET_CHECK(dimensions.size() == min2maj.size());
-      result =
-          ShapeUtil::MakeShapeWithLayout(primitive_type, dimensions, min2maj);
+      result = MakeShapeWithLayout(primitive_type, dimensions, min2maj);
     }
     TF_DCHECK_OK(ValidateShape(result));
     return result;
@@ -468,7 +467,7 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
 /* static */ int64 ShapeUtil::GetDimensionNumber(const Shape& shape,
                                                  int64 dimension_number) {
   if (dimension_number < 0) {
-    dimension_number += ShapeUtil::Rank(shape);
+    dimension_number += Rank(shape);
   }
   CHECK_GE(dimension_number, 0);
   return dimension_number;
@@ -520,7 +519,7 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
   }
   int64 allocated_element_count;
   if (shape.layout().padded_dimensions_size() > 0) {
-    CHECK_EQ(ShapeUtil::Rank(shape), shape.layout().padded_dimensions_size());
+    CHECK_EQ(Rank(shape), shape.layout().padded_dimensions_size());
     allocated_element_count = 1;
     for (int64 dimension_size : shape.layout().padded_dimensions()) {
       allocated_element_count *= dimension_size;
@@ -536,9 +535,9 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
     const Shape& shape) {
   if (shape.element_type() == TUPLE) {
     // Tuple shape.
-    if (ShapeUtil::Rank(shape) != 0) {
+    if (Rank(shape) != 0) {
       return InvalidArgument("tuples must be rank-0; got rank %lld",
-                             ShapeUtil::Rank(shape));
+                             Rank(shape));
     }
     if (shape.dimensions_size() != 0) {
       return InvalidArgument("tuples must not have dimensions specified");
@@ -558,13 +557,13 @@ bool CompareShapes(const Shape& lhs, const Shape& rhs, bool compare_layouts) {
     return InvalidArgument("shape has invalid element type: %s",
                            shape.ShortDebugString().c_str());
   }
-  if (ShapeUtil::Rank(shape) != shape.dimensions_size()) {
+  if (Rank(shape) != shape.dimensions_size()) {
     return InvalidArgument(
         "shape's rank is mismatched with dimension count; rank=%lld "
         "dimensions_size=%d",
-        ShapeUtil::Rank(shape), shape.dimensions_size());
+        Rank(shape), shape.dimensions_size());
   }
-  for (int64 i = 0; i < ShapeUtil::Rank(shape); ++i) {
+  for (int64 i = 0; i < Rank(shape); ++i) {
     int64 dimension = shape.dimensions(i);
     if (dimension < 0) {
       return InvalidArgument(
@@ -793,8 +792,7 @@ ShapeUtil::InsertedOrDeleted1SizedDimensions(const Shape& shape_pre,
     auto unmodified_dim_pair =
         i < unmodified_dims.size()
             ? unmodified_dims[i]
-            : std::make_pair(ShapeUtil::Rank(shape_pre),
-                             ShapeUtil::Rank(shape_post));
+            : std::make_pair(Rank(shape_pre), Rank(shape_post));
     if (!check_modified_dims(prior_unmodified_dim_pair, unmodified_dim_pair)) {
       return nil;
     }
@@ -869,9 +867,8 @@ ShapeUtil::DimensionsUnmodifiedByReshape(const Shape& input_shape,
     return false;
   }
 
-  CHECK_EQ(ShapeUtil::ElementsIn(input_shape),
-           ShapeUtil::ElementsIn(output_shape));
-  if (ShapeUtil::ElementsIn(input_shape) == 0) {
+  CHECK_EQ(ElementsIn(input_shape), ElementsIn(output_shape));
+  if (ElementsIn(input_shape) == 0) {
     return true;
   }
 
@@ -985,21 +982,17 @@ ShapeUtil::DimensionsUnmodifiedByReshape(const Shape& input_shape,
     // as input_shape/output_shape and the dimension-0-major layout. These two
     // shapes are used for conversion between logical linear indices and
     // multi-dimensional indices.
-    Shape input_shape_dim0_major =
-        ShapeUtil::MakeShapeWithMonotonicDim0MajorLayout(
-            input_shape.element_type(), AsInt64Slice(input_shape.dimensions()));
-    Shape output_shape_dim0_major =
-        ShapeUtil::MakeShapeWithMonotonicDim0MajorLayout(
-            output_shape.element_type(),
-            AsInt64Slice(output_shape.dimensions()));
-
-    for (int64 input_dim = 0; input_dim < ShapeUtil::Rank(input_shape);
-         ++input_dim) {
+    Shape input_shape_dim0_major = MakeShapeWithMonotonicDim0MajorLayout(
+        input_shape.element_type(), AsInt64Slice(input_shape.dimensions()));
+    Shape output_shape_dim0_major = MakeShapeWithMonotonicDim0MajorLayout(
+        output_shape.element_type(), AsInt64Slice(output_shape.dimensions()));
+
+    for (int64 input_dim = 0; input_dim < Rank(input_shape); ++input_dim) {
       if (input_shape.dimensions(input_dim) <= 1) {
         continue;
       }
 
-      std::vector<int64> input_unit_index(ShapeUtil::Rank(input_shape), 0);
+      std::vector<int64> input_unit_index(Rank(input_shape), 0);
       input_unit_index[input_dim] = 1;
       int64 logical_linear_index =
           IndexUtil::MultidimensionalIndexToLinearIndex(input_shape_dim0_major,
@@ -1025,8 +1018,8 @@ ShapeUtil::DimensionsUnmodifiedByReshape(const Shape& input_shape,
 
 /* static */ tensorflow::gtl::optional<Shape> ShapeUtil::AlignLayouts(
     const Shape& input_shape, const Shape& output_shape) {
-  int64 input_rank = ShapeUtil::Rank(input_shape);
-  int64 output_rank = ShapeUtil::Rank(output_shape);
+  int64 input_rank = Rank(input_shape);
+  int64 output_rank = Rank(output_shape);
 
   // First, calculate an alignment of the dimensions. A consecutive sequence of
   // input dimensions and output dimensions belong to the same alignment part if
@@ -1150,10 +1143,6 @@ ShapeUtil::DimensionsUnmodifiedByReshape(const Shape& input_shape,
     }
   }
   CHECK_EQ(output_layout.size(), output_rank);
-  std::vector<int64> dimension_sizes;
-  for (int64 i = 0; i < output_rank; ++i) {
-    dimension_sizes.push_back(output_shape.dimensions(i));
-  }
   Shape output_shape_with_layout = MakeShapeWithLayout(
       output_shape.element_type(), AsInt64Slice(output_shape.dimensions()),
       output_layout);
-- 
GitLab


From 92d13e7c8c88a092645d5b471ea9deffde147077 Mon Sep 17 00:00:00 2001
From: Suharsh Sivakumar <suharshs@google.com>
Date: Fri, 19 May 2017 01:41:18 -0700
Subject: [PATCH 1532/1563] Refactor partial run state handling into
 partial_run_mgr.

PiperOrigin-RevId: 156529141
---
 tensorflow/core/distributed_runtime/BUILD     |  23 +++
 .../distributed_runtime/partial_run_mgr.cc    |  96 +++++++++++
 .../distributed_runtime/partial_run_mgr.h     |  87 ++++++++++
 .../partial_run_mgr_test.cc                   | 151 ++++++++++++++++++
 tensorflow/core/distributed_runtime/worker.cc | 101 +-----------
 tensorflow/core/distributed_runtime/worker.h  |  37 +----
 6 files changed, 366 insertions(+), 129 deletions(-)
 create mode 100644 tensorflow/core/distributed_runtime/partial_run_mgr.cc
 create mode 100644 tensorflow/core/distributed_runtime/partial_run_mgr.h
 create mode 100644 tensorflow/core/distributed_runtime/partial_run_mgr_test.cc

diff --git a/tensorflow/core/distributed_runtime/BUILD b/tensorflow/core/distributed_runtime/BUILD
index d2a828f39f..e8aabf72dc 100644
--- a/tensorflow/core/distributed_runtime/BUILD
+++ b/tensorflow/core/distributed_runtime/BUILD
@@ -44,6 +44,28 @@ package(default_visibility = [
     "//tensorflow:internal",
 ])
 
+cc_library(
+    name = "partial_run_mgr",
+    srcs = ["partial_run_mgr.cc"],
+    hdrs = ["partial_run_mgr.h"],
+    deps = [
+        ":worker_interface",
+        "//tensorflow/core:framework",
+    ],
+)
+
+cc_test(
+    name = "partial_run_mgr_test",
+    size = "small",
+    srcs = ["partial_run_mgr_test.cc"],
+    deps = [
+        ":partial_run_mgr",
+        "//tensorflow/core:lib",
+        "//tensorflow/core:test",
+        "//tensorflow/core:test_main",
+    ],
+)
+
 cc_library(
     name = "message_wrappers",
     srcs = ["message_wrappers.cc"],
@@ -141,6 +163,7 @@ cc_library(
     ],
     deps = [
         ":graph_mgr",
+        ":partial_run_mgr",
         ":rendezvous_mgr_interface",
         ":session_mgr",
         ":worker_interface",
diff --git a/tensorflow/core/distributed_runtime/partial_run_mgr.cc b/tensorflow/core/distributed_runtime/partial_run_mgr.cc
new file mode 100644
index 0000000000..c0dbabf9a2
--- /dev/null
+++ b/tensorflow/core/distributed_runtime/partial_run_mgr.cc
@@ -0,0 +1,96 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/distributed_runtime/partial_run_mgr.h"
+
+namespace tensorflow {
+
+namespace {
+// TODO(suharshs): Move this to a common location to allow other part of the
+// repo to use it.
+template <typename T, typename... Args>
+std::unique_ptr<T> MakeUnique(Args&&... args) {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+}  // namespace
+
+bool PartialRunMgr::FindOrCreate(int step_id,
+                                 CancellationManager** cancellation_manager) {
+  mutex_lock l(mu_);
+  auto it = step_id_to_partial_run_.find(step_id);
+  if (it != step_id_to_partial_run_.end()) {
+    *cancellation_manager = it->second->cancellation_manager.get();
+    return false;
+  }
+
+  std::unique_ptr<PartialRunState> partial_run = MakeUnique<PartialRunState>();
+  partial_run->cancellation_manager = MakeUnique<CancellationManager>();
+  *cancellation_manager = partial_run->cancellation_manager.get();
+  step_id_to_partial_run_[step_id] = std::move(partial_run);
+  return true;
+}
+
+void PartialRunMgr::ExecutorDone(int step_id, const Status& executor_status) {
+  StatusCallback done;
+  Status callback_status;
+  {
+    mutex_lock l(mu_);
+    auto run_it = step_id_to_partial_run_.find(step_id);
+    if (run_it == step_id_to_partial_run_.end()) {
+      return;
+    }
+    // If we found the partial_run, we call the final callback, if it
+    // exists.
+    // It is guaranteed that run_it->second->final_callback is left empty
+    // after the std::move call.
+    done = std::move(run_it->second->final_callback);
+    if (!executor_status.ok()) {
+      run_it->second->final_status = executor_status;
+    }
+    callback_status = run_it->second->final_status;
+    run_it->second->executor_done = true;
+  }
+  if (done != nullptr) {
+    done(callback_status);
+    mutex_lock l(mu_);
+    step_id_to_partial_run_.erase(step_id);
+  }
+}
+
+void PartialRunMgr::PartialRunDone(int step_id, StatusCallback done,
+                                   const Status& status) {
+  Status callback_status;
+  {
+    mutex_lock l(mu_);
+    auto run_it = step_id_to_partial_run_.find(step_id);
+    if (run_it == step_id_to_partial_run_.end()) {
+      return;
+    }
+    run_it->second->final_status.Update(status);
+    if (!run_it->second->executor_done) {
+      // If we found the partial_run, we set the final callback to call only
+      // when the executor is completely done.
+      run_it->second->final_callback = std::move(done);
+      return;
+    }
+    callback_status = run_it->second->final_status;
+  }
+  // Otherwise we call the callback immediately.
+  done(callback_status);
+  mutex_lock l(mu_);
+  step_id_to_partial_run_.erase(step_id);
+}
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/partial_run_mgr.h b/tensorflow/core/distributed_runtime/partial_run_mgr.h
new file mode 100644
index 0000000000..af56e723a9
--- /dev/null
+++ b/tensorflow/core/distributed_runtime/partial_run_mgr.h
@@ -0,0 +1,87 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_PARTIAL_RUN_MGR_H_
+#define THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_PARTIAL_RUN_MGR_H_
+
+#include <unordered_map>
+
+#include "tensorflow/core/distributed_runtime/worker_interface.h"
+#include "tensorflow/core/framework/cancellation.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/platform/mutex.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+// PartialRunMgr keeps track of pending partial run requests, and ensures that
+// the partial run is only marked complete when the corresponding executor is
+// run to completion.
+//
+// In tensorflow workers, the executor runs operations asynchronously until
+// specified fetches (operations that return tensors) or targets (operations
+// that don't return tensors) are reached. A PartialRun has two components: a
+// setup which specifies all desired fetches and targets, and run calls that
+// specify fetch values (from the setup calls) to retrieve.
+// On the last partial run call, it is possible to satisfy the
+// required fetches before the executor has completed running the graph to all
+// the desired targets.
+// PartialRunMgr is used to ensure that we don't complete and return the final
+// partial run call to the user until both the partial run and executor have
+// completed.
+//
+// PartialRunMgr is thread-safe.
+class PartialRunMgr {
+ public:
+  // Find or create the CancellationManager associated with step_id.
+  // The PartialRunMgr owns the cancellation_manager.
+  // Returns true if a new CancellationManager was created
+  // (i.e this is a new partial run).
+  bool FindOrCreate(int step_id, CancellationManager** cancellation_manager);
+
+  // Calls the final callback if the PartialRunRequest has already completed.
+  // Otherwise stores the executor_status to be propagated when the
+  // PartialRunRequest completes (PartialRunDone has been called).
+  void ExecutorDone(int step_id, const Status& executor_status);
+
+  // Calls done if the executor has already completed (ExecutorDone has been
+  // called). Otherwise, stores the status and done callback, calling them when
+  // ExecutorDone is called. The callback will either be called by the calling
+  // thread of either PartialRunDone or ExecutorDone.
+  // If executor_status in ExecutorDone is not OK, it takes precedence over
+  // status and is passed to the done callback.
+  void PartialRunDone(int step_id, StatusCallback done, const Status& status);
+
+ private:
+  // PartialRunState stores state associated with a pending partial run request.
+  // This is protected by the mutex in PartialRunMgr.
+  struct PartialRunState {
+    std::unique_ptr<CancellationManager> cancellation_manager;
+
+    bool executor_done = false;
+    StatusCallback final_callback = nullptr;
+    Status final_status;
+  };
+
+  mutex mu_;
+
+  std::unordered_map<int, std::unique_ptr<PartialRunState>>
+      step_id_to_partial_run_ GUARDED_BY(mu_);
+};
+
+}  // namespace tensorflow
+
+#endif  // THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_PARTIAL_RUN_MGR_H_
diff --git a/tensorflow/core/distributed_runtime/partial_run_mgr_test.cc b/tensorflow/core/distributed_runtime/partial_run_mgr_test.cc
new file mode 100644
index 0000000000..5f7c0cb3ca
--- /dev/null
+++ b/tensorflow/core/distributed_runtime/partial_run_mgr_test.cc
@@ -0,0 +1,151 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include "tensorflow/core/distributed_runtime/partial_run_mgr.h"
+
+#include "tensorflow/core/lib/core/notification.h"
+#include "tensorflow/core/platform/test.h"
+
+namespace tensorflow {
+namespace {
+
+TEST(PartialRunMgrFindOrCreate, Create) {
+  // Basic test of PartialRunMgr CancellationManager creation.
+  PartialRunMgr partial_run_mgr;
+  int step_id = 1;
+  CancellationManager* cancellation_manager;
+  partial_run_mgr.FindOrCreate(step_id, &cancellation_manager);
+  EXPECT_TRUE(cancellation_manager != nullptr);
+}
+
+TEST(PartialRunMgrFindOrCreate, Find) {
+  // Basic test of PartialRunMgr CancellationManager find.
+  PartialRunMgr partial_run_mgr;
+  int step_id = 1;
+  CancellationManager* cancellation_manager;
+  partial_run_mgr.FindOrCreate(step_id, &cancellation_manager);
+  // Looking for the same step should return the same cancellation_manager.
+  CancellationManager* found_cancellation_manager;
+  partial_run_mgr.FindOrCreate(step_id, &found_cancellation_manager);
+  EXPECT_EQ(cancellation_manager, found_cancellation_manager);
+}
+
+TEST(PartialRunMgrFindOrCreate, NewCreate) {
+  // Test that PartialRunMgr creates a new CancellationManager for new steps.
+  PartialRunMgr partial_run_mgr;
+  int step_id = 1;
+  CancellationManager* cancellation_manager;
+  partial_run_mgr.FindOrCreate(step_id, &cancellation_manager);
+  // FindOrCreate on a new step should return a new cancellation_manager.
+  int new_step_id = 2;
+  CancellationManager* new_cancellation_manager;
+  partial_run_mgr.FindOrCreate(new_step_id, &new_cancellation_manager);
+  EXPECT_NE(cancellation_manager, new_cancellation_manager);
+}
+
+TEST(PartialRunMgr, PartialRunRemoved) {
+  // Test that PartialRunMgr ensures that the PartialRun is deleted after
+  // ExecutorDone and PartialRunDone are called.
+  PartialRunMgr partial_run_mgr;
+  int step_id = 1;
+  CancellationManager* cancellation_manager;
+  partial_run_mgr.FindOrCreate(step_id, &cancellation_manager);
+
+  int called = 0;
+  partial_run_mgr.PartialRunDone(
+      step_id, [&called](Status status) { called++; }, Status::OK());
+  partial_run_mgr.ExecutorDone(step_id, Status::OK());
+
+  // Calling ExecutorDone and PartialRunDone on the step_id should still only
+  // result in the callback being called once.
+  // This proves that the original PartialRun has been removed.
+  partial_run_mgr.PartialRunDone(
+      step_id, [&called](Status status) { called++; }, Status::OK());
+  partial_run_mgr.ExecutorDone(step_id, Status::OK());
+  EXPECT_EQ(1, called);
+}
+
+struct StatusTestParam {
+  Status executor_status;
+  Status partial_run_status;
+  Status expected_status;
+};
+
+class StatusPropagationTest : public ::testing::TestWithParam<StatusTestParam> {
+ protected:
+  PartialRunMgr partial_run_mgr_;
+
+  // State to help keep track of when the callback is called.
+  Notification invoked_;
+  Status status_;
+
+  void set_status(const Status& status) {
+    status_ = status;
+    invoked_.Notify();
+  }
+
+  // Blocks until status is set.
+  Status status() {
+    invoked_.WaitForNotification();
+    return status_;
+  }
+};
+
+TEST_P(StatusPropagationTest, ExecutorDoneFirst) {
+  // Tests error propagation when ExecutorDone is called first.
+  StatusTestParam param = GetParam();
+  int step_id = 1;
+
+  CancellationManager* cancellation_manager;
+  partial_run_mgr_.FindOrCreate(step_id, &cancellation_manager);
+
+  partial_run_mgr_.ExecutorDone(step_id, param.executor_status);
+  partial_run_mgr_.PartialRunDone(step_id,
+                                  [this](Status status) { set_status(status); },
+                                  param.partial_run_status);
+
+  EXPECT_EQ(status(), param.expected_status);
+}
+
+TEST_P(StatusPropagationTest, PartialRunDoneFirst) {
+  // Tests error propagation when PartialRunDone is called first.
+  StatusTestParam param = GetParam();
+  int step_id = 1;
+
+  CancellationManager* cancellation_manager;
+  partial_run_mgr_.FindOrCreate(step_id, &cancellation_manager);
+
+  partial_run_mgr_.PartialRunDone(step_id,
+                                  [this](Status status) { set_status(status); },
+                                  param.partial_run_status);
+  partial_run_mgr_.ExecutorDone(step_id, param.executor_status);
+
+  EXPECT_EQ(status(), param.expected_status);
+}
+
+// Instantiate tests for all error orderings, for both call orders of
+// ExecutorDone and PartialRunDone.
+Status ExecutorError() { return errors::Internal("executor error"); }
+Status PartialRunError() { return errors::Internal("partial run error"); }
+INSTANTIATE_TEST_CASE_P(
+    PartialRunMgr, StatusPropagationTest,
+    ::testing::Values(
+        StatusTestParam{Status::OK(), Status::OK(), Status::OK()},
+        StatusTestParam{ExecutorError(), Status::OK(), ExecutorError()},
+        StatusTestParam{Status::OK(), PartialRunError(), PartialRunError()},
+        StatusTestParam{ExecutorError(), PartialRunError(), ExecutorError()}));
+
+}  // namespace
+}  // namespace tensorflow
diff --git a/tensorflow/core/distributed_runtime/worker.cc b/tensorflow/core/distributed_runtime/worker.cc
index 07bb17981d..32ea0cfaa4 100644
--- a/tensorflow/core/distributed_runtime/worker.cc
+++ b/tensorflow/core/distributed_runtime/worker.cc
@@ -69,72 +69,6 @@ void Worker::DeregisterGraphAsync(const DeregisterGraphRequest* request,
   done(s);
 }
 
-Worker::PartialRunState* Worker::FindPartialRun(const string& graph_handle,
-                                                int step_id) {
-  const std::pair<string, int> k(graph_handle, step_id);
-  Worker::PartialRunState* prun_state = nullptr;
-  mutex_lock l(mu_);
-  auto it = partial_runs_.find(k);
-  if (it != partial_runs_.end()) {
-    prun_state = it->second.get();
-  }
-  return prun_state;
-}
-
-void Worker::InsertPartialRunLocked(const string& graph_handle, int step_id,
-                                    Worker::PartialRunState* partial_run_state)
-    EXCLUSIVE_LOCKS_REQUIRED(mu_) {
-  const std::pair<string, int> k(graph_handle, step_id);
-  partial_runs_.emplace(std::make_pair(
-      k, std::unique_ptr<Worker::PartialRunState>(partial_run_state)));
-}
-
-void Worker::RemovePartialRun(const string& graph_handle, int step_id) {
-  const std::pair<string, int> k(graph_handle, step_id);
-  mutex_lock l(mu_);
-  partial_runs_.erase(partial_runs_.find(k));
-}
-
-void Worker::MaybeCallFinalCallback(const string& graph_handle, int step_id,
-                                    const Status& executor_status) {
-  const std::pair<string, int> k(graph_handle, step_id);
-  StatusCallback done;
-  Status s;
-  {
-    mutex_lock l(mu_);
-    auto it = partial_runs_.find(k);
-    if (it != partial_runs_.end()) {
-      // If we found the partial_run, we call the final callback, if it
-      // exists.
-      std::swap(done, it->second->final_callback);
-      s = it->second->final_status;
-      it->second->executor_done = true;
-    }
-  }
-  if (done != nullptr) {
-    s.Update(executor_status);
-    done(s);
-  }
-}
-
-void Worker::SetOrCallFinalCallback(const string& graph_handle, int step_id,
-                                    StatusCallback done, const Status& s) {
-  const std::pair<string, int> k(graph_handle, step_id);
-  {
-    mutex_lock l(mu_);
-    auto it = partial_runs_.find(k);
-    if (!it->second->executor_done) {
-      // If we found the partial_run, we set the final callback to call only
-      // when the executor is completely done.
-      it->second->final_callback = std::move(done);
-      it->second->final_status = s;
-      return;
-    }
-  }
-  // Otherwise we call the callback immediately.
-  done(s);
-}
-
 void Worker::AbortStep(int64 step_id) {
   Rendezvous* rendez = env_->rendezvous_mgr->Find(step_id);
   SchedNonBlockingClosureAfter(1000000, [rendez, step_id]() {
@@ -275,18 +209,8 @@ void Worker::DoPartialRunGraph(CallOptions* opts,
     return;
   }
 
-  PartialRunState* partial_run_state = FindPartialRun(graph_handle, step_id);
-
   CancellationManager* cm = nullptr;
-  // If this is a new partial run call we need to create a new cancellation
-  // manager.
-  // Otherwise we use the cancellation manager stored in the found partial
-  // run state.
-  if (partial_run_state == nullptr) {
-    cm = new CancellationManager;
-  } else {
-    cm = partial_run_state->cancellation_manager;
-  }
+  bool is_new_partial_run = partial_run_mgr_.FindOrCreate(step_id, &cm);
 
   // Before we start doing anything, we set the RPC cancellation.
   opts->SetCancelCallback([this, cm, step_id]() {
@@ -296,13 +220,10 @@ void Worker::DoPartialRunGraph(CallOptions* opts,
 
   // If this is a new partial run request, the request will need to start the
   // executors.
-  if (partial_run_state == nullptr) {
+  if (is_new_partial_run) {
     CancellationToken token;
     {
       mutex_lock l(mu_);
-      // Insert the new partial run into the partial_runs_ map.
-      partial_run_state = new PartialRunState(cm);
-      InsertPartialRunLocked(graph_handle, step_id, partial_run_state);
       token = cancellation_manager_->get_cancellation_token();
       cancellation_manager_->RegisterCallback(token,
                                               [cm]() { cm->StartCancel(); });
@@ -310,13 +231,12 @@ void Worker::DoPartialRunGraph(CallOptions* opts,
     session->graph_mgr->ExecuteAsync(
         graph_handle, step_id, session, request->exec_opts(),
         nullptr /* collector */, nullptr /* cost_graph */, cm, in,
-        [this, token, graph_handle, step_id, cm](Status s) {
+        [this, token, step_id, cm](Status s) {
           {
             mutex_lock l(mu_);
             cancellation_manager_->DeregisterCallback(token);
           }
-          MaybeCallFinalCallback(graph_handle, step_id, s);
-          delete cm;
+          partial_run_mgr_.ExecutorDone(step_id, s);
         });
   } else {
     // Send the partial run's new inputs.
@@ -328,8 +248,7 @@ void Worker::DoPartialRunGraph(CallOptions* opts,
   }
 
   session->graph_mgr->RecvOutputsAsync(
-      step_id, out,
-      [this, out, request, response, graph_handle, step_id, finish](Status s) {
+      step_id, out, [this, out, request, response, step_id, finish](Status s) {
         if (s.ok()) {
           // Construct and return the resp.
           for (const auto& p : *out) {
@@ -339,15 +258,7 @@ void Worker::DoPartialRunGraph(CallOptions* opts,
           }
         }
         if (request->is_last_partial_run()) {
-          SetOrCallFinalCallback(
-              graph_handle, step_id,
-              [this, graph_handle, step_id, finish](const Status& s) {
-                finish(s);
-                // We must wait to remove the partial_run_state until both the
-                // executor and the RecvAsync are complete.
-                RemovePartialRun(graph_handle, step_id);
-              },
-              s);
+          partial_run_mgr_.PartialRunDone(step_id, std::move(finish), s);
         } else {
           finish(s);
         }
diff --git a/tensorflow/core/distributed_runtime/worker.h b/tensorflow/core/distributed_runtime/worker.h
index 290fc6de95..07300338c3 100644
--- a/tensorflow/core/distributed_runtime/worker.h
+++ b/tensorflow/core/distributed_runtime/worker.h
@@ -19,6 +19,7 @@ limitations under the License.
 #include <unordered_map>
 
 #include "tensorflow/core/distributed_runtime/graph_mgr.h"
+#include "tensorflow/core/distributed_runtime/partial_run_mgr.h"
 #include "tensorflow/core/distributed_runtime/session_mgr.h"
 #include "tensorflow/core/distributed_runtime/worker_interface.h"
 
@@ -93,43 +94,11 @@ class Worker : public WorkerInterface {
   void AbortStep(int64);
 
  private:
+  PartialRunMgr partial_run_mgr_;
+
   mutex mu_;
   CancellationManager* cancellation_manager_ GUARDED_BY(mu_);
 
-  struct PartialRunState {
-    CancellationManager* cancellation_manager;
-
-    bool executor_done = false;
-    StatusCallback final_callback = nullptr;
-    Status final_status;
-
-    explicit PartialRunState(CancellationManager* cm)
-        : cancellation_manager(cm) {}
-  };
-  struct PairHash {
-    std::size_t operator()(std::pair<string, int> const& p) const {
-      return Hash64Combine(std::hash<string>()(p.first),
-                           std::hash<int>()(p.second));
-    }
-  };
-  std::unordered_map<std::pair<string, int>, std::unique_ptr<PartialRunState>,
-                     PairHash>
-      partial_runs_ GUARDED_BY(mu_);
-
-  PartialRunState* FindPartialRun(const string& graph_handle, int step_id);
-
-  void InsertPartialRunLocked(const string& graph_handle, int step_id,
-                              PartialRunState* partial_run_state)
-      EXCLUSIVE_LOCKS_REQUIRED(mu_);
-
-  void RemovePartialRun(const string& graph_handle, int step_id);
-
-  void MaybeCallFinalCallback(const string& graph_handle, int step_id,
-                              const Status& executor_status);
-
-  void SetOrCallFinalCallback(const string& graph_handle, int step_id,
-                              StatusCallback done, const Status& s);
-
   Status PrepareRunGraph(RunGraphRequestWrapper* req,
                          GraphMgr::NamedTensors* in,
                          GraphMgr::NamedTensors* out);
-- 
GitLab


From 40f739d16eb408d507cfb0ce1202ed28c32357a2 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 19 May 2017 06:29:41 -0700
Subject: [PATCH 1533/1563] Factor out some useful sparse-input handling binary
 search code in TensorForest.

PiperOrigin-RevId: 156545141
---
 .../tensor_forest/kernels/sample_inputs_op.cc | 62 +------------------
 .../tensor_forest/kernels/tree_utils.h        | 60 ++++++++++++++++++
 2 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc b/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc
index e5594f8987..41f99b0902 100644
--- a/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc
+++ b/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc
@@ -64,64 +64,6 @@ class SampleInputs : public OpKernel {
     input_spec_.ParseFromString(serialized_proto);
   }
 
-  // Returns the number of sparse values for example input_index.
-  // Also returns the index where those features start in sparse_input_start
-  // if any were found.
-  int32 GetNumSparseFeatures(const Tensor& sparse_input_indices,
-                             int32 input_index, int64* sparse_input_start) {
-    // Binary search for input_index.
-    // TODO(gilberth): Consider using std::lower_bound, std::upper_bound
-    // for a simpler but possibly slower solution, or searching for
-    // input_start and input_end simultaneously.
-    const auto indices = sparse_input_indices.matrix<int64>();
-    const int64 num_total = sparse_input_indices.shape().dim_size(0);
-    int64 index;
-    int64 low = 0;
-    int64 high = num_total;
-
-    while (true) {
-      if (low == high) {
-        return 0;
-      }
-      index = low + (high - low) / 2;
-      const int64 feature_index = indices(index, 0);
-      if (feature_index == input_index) {
-        // found it.
-        break;
-      } else if (feature_index < input_index) {
-        // Correct for the implicit floor in the index assignment.
-        if (low == index) {
-          return 0;
-        }
-        low = index;
-      } else {
-        high = index;
-      }
-    }
-
-    // Scan for the start and end of the input_index range.
-    int64 input_start = index;
-    int64 val = indices(input_start, 0);
-    while (val == input_index) {
-      --input_start;
-      if (input_start < 0) {
-        break;
-      }
-      val = indices(input_start, 0);
-    }
-    *sparse_input_start = input_start + 1;
-    int32 input_end = index;
-    val = indices(input_end, 0);
-    while (val == input_index) {
-      ++input_end;
-      if (input_end >= num_total) {
-        break;
-      }
-      val = indices(input_end, 0);
-    }
-    return input_end - input_start - 1;
-  }
-
   // increment_input implements a "++" operation for the situation when
   // you want to do something n times on an underlying iterator.
   // In an ideal world, this would be a built-in iterator adaptor.
@@ -333,8 +275,8 @@ class SampleInputs : public OpKernel {
           int64 sparse_input_start;
           int32 num_total_features = input_spec_.dense_features_size();
           if (sparse_input) {
-            num_total_features += GetNumSparseFeatures(
-                sparse_input_indices, *it, &sparse_input_start);
+            num_total_features += tensorforest::GetNumSparseFeatures(
+                sparse_input_indices.matrix<int64>(), *it, &sparse_input_start);
           }
           if (num_total_features == 0) {
             LOG(WARNING) << "num total features is zero.";
diff --git a/tensorflow/contrib/tensor_forest/kernels/tree_utils.h b/tensorflow/contrib/tensor_forest/kernels/tree_utils.h
index 8c4117c189..c75f36fdee 100644
--- a/tensorflow/contrib/tensor_forest/kernels/tree_utils.h
+++ b/tensorflow/contrib/tensor_forest/kernels/tree_utils.h
@@ -197,6 +197,66 @@ float FindSparseValue(
   return 0.0;
 }
 
+// Returns the number of sparse values for example input_index.
+// Also returns the index where those features start in sparse_input_start
+// if any were found.
+// Assumes that the first column in indices is ordered.
+template <typename T1>
+int32 GetNumSparseFeatures(const T1& indices, int32 input_index,
+                           int64* sparse_input_start) {
+  // Binary search for input_index.
+  // TODO(gilberth): Consider using std::lower_bound, std::upper_bound
+  // for a simpler but possibly slower solution, or searching for
+  // input_start and input_end simultaneously.
+  const int64 num_total = indices.dimension(0);
+  int64 index;
+  int64 low = 0;
+  int64 high = num_total;
+  *sparse_input_start = -1;  // Easy error checking.
+
+  while (true) {
+    if (low == high) {
+      return 0;
+    }
+    index = low + (high - low) / 2;
+    const int64 feature_index = indices(index, 0);
+    if (feature_index == input_index) {
+      // found it.
+      break;
+    } else if (feature_index < input_index) {
+      // Correct for the implicit floor in the index assignment.
+      if (low == index) {
+        return 0;
+      }
+      low = index;
+    } else {
+      high = index;
+    }
+  }
+
+  // Scan for the start and end of the input_index range.
+  int64 input_start = index;
+  int64 val = indices(input_start, 0);
+  while (val == input_index) {
+    --input_start;
+    if (input_start < 0) {
+      break;
+    }
+    val = indices(input_start, 0);
+  }
+  *sparse_input_start = input_start + 1;
+  int32 input_end = index;
+  val = indices(input_end, 0);
+  while (val == input_index) {
+    ++input_end;
+    if (input_end >= num_total) {
+      break;
+    }
+    val = indices(input_end, 0);
+  }
+  return input_end - input_start - 1;
+}
+
 // Returns left/right decision between the input value and the threshold bias.
 // For floating point types, the decision is value > bias, but for
 // categorical data, it is value != bias.
-- 
GitLab


From 8759fdc2b058d59e2b31933fe97a5915a4caecb1 Mon Sep 17 00:00:00 2001
From: Changming Sun <chasun@microsoft.com>
Date: Fri, 19 May 2017 10:11:18 -0500
Subject: [PATCH 1534/1563] Fix comments for dataset ops (#10030)

---
 tensorflow/core/kernels/batch_dataset_op.cc                 | 2 +-
 tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc | 2 +-
 tensorflow/core/kernels/filter_dataset_op.cc                | 2 +-
 tensorflow/core/kernels/flat_map_dataset_op.cc              | 2 +-
 tensorflow/core/kernels/group_by_window_dataset_op.cc       | 2 +-
 tensorflow/core/kernels/iterator_ops.cc                     | 2 +-
 tensorflow/core/kernels/map_dataset_op.cc                   | 2 +-
 tensorflow/core/kernels/padded_batch_dataset_op.cc          | 2 +-
 tensorflow/core/kernels/parallel_map_dataset_op.cc          | 2 +-
 tensorflow/core/kernels/range_dataset_op.cc                 | 2 +-
 tensorflow/core/kernels/reader_dataset_ops.cc               | 2 +-
 tensorflow/core/kernels/repeat_dataset_op.cc                | 2 +-
 tensorflow/core/kernels/shuffle_dataset_op.cc               | 2 +-
 tensorflow/core/kernels/skip_dataset_op.cc                  | 2 +-
 tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc   | 2 +-
 tensorflow/core/kernels/take_dataset_op.cc                  | 2 +-
 tensorflow/core/kernels/tensor_dataset_op.cc                | 2 +-
 tensorflow/core/kernels/tensor_slice_dataset_op.cc          | 2 +-
 tensorflow/core/kernels/zip_dataset_op.cc                   | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tensorflow/core/kernels/batch_dataset_op.cc b/tensorflow/core/kernels/batch_dataset_op.cc
index 443859a95c..c8289eff2a 100644
--- a/tensorflow/core/kernels/batch_dataset_op.cc
+++ b/tensorflow/core/kernels/batch_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class BatchDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc b/tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc
index b93a3b2970..2c36093355 100644
--- a/tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc
+++ b/tensorflow/core/kernels/dense_to_sparse_batch_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class DenseToSparseBatchDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/filter_dataset_op.cc b/tensorflow/core/kernels/filter_dataset_op.cc
index 7b2c0de97d..62ad921062 100644
--- a/tensorflow/core/kernels/filter_dataset_op.cc
+++ b/tensorflow/core/kernels/filter_dataset_op.cc
@@ -25,7 +25,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class FilterDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/flat_map_dataset_op.cc b/tensorflow/core/kernels/flat_map_dataset_op.cc
index 5b22a922b2..68a6cf1960 100644
--- a/tensorflow/core/kernels/flat_map_dataset_op.cc
+++ b/tensorflow/core/kernels/flat_map_dataset_op.cc
@@ -25,7 +25,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class FlatMapDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/group_by_window_dataset_op.cc b/tensorflow/core/kernels/group_by_window_dataset_op.cc
index cb8d566044..a58c15a097 100644
--- a/tensorflow/core/kernels/group_by_window_dataset_op.cc
+++ b/tensorflow/core/kernels/group_by_window_dataset_op.cc
@@ -27,7 +27,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 class GroupByWindowDatasetOp : public OpKernel {
  public:
diff --git a/tensorflow/core/kernels/iterator_ops.cc b/tensorflow/core/kernels/iterator_ops.cc
index 68d1d29225..880c6a7e82 100644
--- a/tensorflow/core/kernels/iterator_ops.cc
+++ b/tensorflow/core/kernels/iterator_ops.cc
@@ -24,7 +24,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following ops.
 
 Status VerifyTypesMatch(const DataTypeVector& expected,
diff --git a/tensorflow/core/kernels/map_dataset_op.cc b/tensorflow/core/kernels/map_dataset_op.cc
index a4d38bbc08..08308d8557 100644
--- a/tensorflow/core/kernels/map_dataset_op.cc
+++ b/tensorflow/core/kernels/map_dataset_op.cc
@@ -25,7 +25,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class MapDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/padded_batch_dataset_op.cc b/tensorflow/core/kernels/padded_batch_dataset_op.cc
index af2cfc09f0..df78e1f064 100644
--- a/tensorflow/core/kernels/padded_batch_dataset_op.cc
+++ b/tensorflow/core/kernels/padded_batch_dataset_op.cc
@@ -23,7 +23,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 // The following five functions are copied from padding_fifo_queue.cc.
diff --git a/tensorflow/core/kernels/parallel_map_dataset_op.cc b/tensorflow/core/kernels/parallel_map_dataset_op.cc
index 0be7835ba5..93ed644d72 100644
--- a/tensorflow/core/kernels/parallel_map_dataset_op.cc
+++ b/tensorflow/core/kernels/parallel_map_dataset_op.cc
@@ -26,7 +26,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class ParallelMapDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/range_dataset_op.cc b/tensorflow/core/kernels/range_dataset_op.cc
index 8cfd3a0a8f..c181f6e804 100644
--- a/tensorflow/core/kernels/range_dataset_op.cc
+++ b/tensorflow/core/kernels/range_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class RangeDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/reader_dataset_ops.cc b/tensorflow/core/kernels/reader_dataset_ops.cc
index e0e90d0cce..e7f65c39cb 100644
--- a/tensorflow/core/kernels/reader_dataset_ops.cc
+++ b/tensorflow/core/kernels/reader_dataset_ops.cc
@@ -23,7 +23,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following ops.
 
 class TextLineDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/repeat_dataset_op.cc b/tensorflow/core/kernels/repeat_dataset_op.cc
index 9bf4039fb7..8fc59e1779 100644
--- a/tensorflow/core/kernels/repeat_dataset_op.cc
+++ b/tensorflow/core/kernels/repeat_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class RepeatDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/shuffle_dataset_op.cc b/tensorflow/core/kernels/shuffle_dataset_op.cc
index c7f5cee3af..a48357fa93 100644
--- a/tensorflow/core/kernels/shuffle_dataset_op.cc
+++ b/tensorflow/core/kernels/shuffle_dataset_op.cc
@@ -24,7 +24,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class ShuffleDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/skip_dataset_op.cc b/tensorflow/core/kernels/skip_dataset_op.cc
index 06c9d8c6ec..1cff90a05e 100644
--- a/tensorflow/core/kernels/skip_dataset_op.cc
+++ b/tensorflow/core/kernels/skip_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class SkipDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc b/tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc
index e456afa854..70837f8ba8 100644
--- a/tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc
+++ b/tensorflow/core/kernels/sparse_tensor_slice_dataset_op.cc
@@ -25,7 +25,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 template <typename T>
diff --git a/tensorflow/core/kernels/take_dataset_op.cc b/tensorflow/core/kernels/take_dataset_op.cc
index 7e2eb6ae49..e27a36bc9b 100644
--- a/tensorflow/core/kernels/take_dataset_op.cc
+++ b/tensorflow/core/kernels/take_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class TakeDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/tensor_dataset_op.cc b/tensorflow/core/kernels/tensor_dataset_op.cc
index ee0e00ee59..6b6fcb1978 100644
--- a/tensorflow/core/kernels/tensor_dataset_op.cc
+++ b/tensorflow/core/kernels/tensor_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class TensorDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/tensor_slice_dataset_op.cc b/tensorflow/core/kernels/tensor_slice_dataset_op.cc
index 982ea44659..fc70d2ecc5 100644
--- a/tensorflow/core/kernels/tensor_slice_dataset_op.cc
+++ b/tensorflow/core/kernels/tensor_slice_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class TensorSliceDatasetOp : public OpKernel {
diff --git a/tensorflow/core/kernels/zip_dataset_op.cc b/tensorflow/core/kernels/zip_dataset_op.cc
index 79f48cc820..e7fc9bc6b1 100644
--- a/tensorflow/core/kernels/zip_dataset_op.cc
+++ b/tensorflow/core/kernels/zip_dataset_op.cc
@@ -21,7 +21,7 @@ namespace tensorflow {
 
 namespace {
 
-// See documentation in ../ops/iterator_ops.cc for a high-level
+// See documentation in ../ops/dataset_ops.cc for a high-level
 // description of the following op.
 
 class ZipDatasetOp : public OpKernel {
-- 
GitLab


From 2661ebb7b97fd229b390477af0dde76407934344 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 19 May 2017 08:13:09 -0700
Subject: [PATCH 1535/1563] Minor docstring formatting fix.

PiperOrigin-RevId: 156552579
---
 tensorflow/python/util/compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/util/compat.py b/tensorflow/python/util/compat.py
index 6fd7c4ab28..07382d93df 100644
--- a/tensorflow/python/util/compat.py
+++ b/tensorflow/python/util/compat.py
@@ -69,7 +69,7 @@ def as_text(bytes_or_text, encoding='utf-8'):
   """Returns the given argument as a unicode string.
 
   Args:
-    bytes_or_text: A `bytes`, `str, or `unicode` object.
+    bytes_or_text: A `bytes`, `str`, or `unicode` object.
     encoding: A string indicating the charset for decoding unicode.
 
   Returns:
-- 
GitLab


From b07abe09fec37414fcb19f89365181305a89887a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 19 May 2017 08:54:46 -0700
Subject: [PATCH 1536/1563] Add a GPU implementation for the TopK op.

PiperOrigin-RevId: 156556243
---
 tensorflow/core/kernels/BUILD                 |   1 +
 tensorflow/core/kernels/topk_op.cc            |  92 +++-
 tensorflow/core/kernels/topk_op.h             |  42 ++
 tensorflow/core/kernels/topk_op_gpu.cu.cc     | 414 ++++++++++++++++++
 tensorflow/python/kernel_tests/BUILD          |   2 +-
 .../python/kernel_tests/topk_op_test.py       |  43 +-
 6 files changed, 567 insertions(+), 27 deletions(-)
 create mode 100644 tensorflow/core/kernels/topk_op.h
 create mode 100644 tensorflow/core/kernels/topk_op_gpu.cu.cc

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index fd6d5ffa56..99403a08d1 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4089,6 +4089,7 @@ filegroup(
         "tensor_array.h",
         "tile_ops_cpu_impl.h",
         "tile_ops_impl.h",
+        "topk_op.h",
         "training_op_helpers.h",
         "training_ops.h",
         "transpose_functor.h",
diff --git a/tensorflow/core/kernels/topk_op.cc b/tensorflow/core/kernels/topk_op.cc
index 00c2e6072c..62f84e8a44 100644
--- a/tensorflow/core/kernels/topk_op.cc
+++ b/tensorflow/core/kernels/topk_op.cc
@@ -17,17 +17,22 @@ limitations under the License.
 
 #define EIGEN_USE_THREADS
 
+#include "tensorflow/core/kernels/topk_op.h"
 #include <vector>
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/lib/gtl/top_n.h"
 
 namespace tensorflow {
 
-template <typename T>
+typedef Eigen::ThreadPoolDevice CPUDevice;
+typedef Eigen::GpuDevice GPUDevice;
+
+template <typename Device, typename T>
 class TopK : public OpKernel {
  public:
   explicit TopK(OpKernelConstruction* context) : OpKernel(context) {
@@ -59,8 +64,8 @@ class TopK : public OpKernel {
 
     const auto& input = input_in.flat_inner_dims<T>();
 
-    const auto num_rows = input.dimension(0);  // generally batch_size
-    const auto num_cols = input.dimension(1);
+    const int64 num_rows = input.dimension(0);  // generally batch_size
+    const int64 num_cols = input.dimension(1);
 
     TensorShape output_shape = input_in.shape();
     output_shape.set_dim(input_in.dims() - 1, k);
@@ -76,6 +81,24 @@ class TopK : public OpKernel {
 
     auto values = values_out->flat_inner_dims<T>();
     auto indices = indices_out->flat_inner_dims<int32>();
+    functor::TopKFunctor<Device, T>::Compute(
+        context, sorted_, k, input, num_rows, num_cols, &values, &indices);
+  }
+
+ private:
+  int k_;
+  bool sorted_;
+};
+
+namespace functor {
+
+template <typename T>
+struct TopKFunctor<CPUDevice, T> {
+  static EIGEN_ALWAYS_INLINE void Compute(
+      OpKernelContext* context, bool sorted, int k,
+      const typename TTypes<T, 2>::ConstTensor& input, const int64 num_rows,
+      const int64 num_cols, typename TTypes<T, 2>::Tensor* values,
+      typename TTypes<int, 2>::Tensor* indices) {
     gtl::TopN<std::pair<T, int32>> filter(k);
     for (int r = 0; r < num_rows; r++) {
       for (int32 c = 0; c < num_cols; ++c) {
@@ -85,40 +108,75 @@ class TopK : public OpKernel {
       }
 
       int32 i = 0;
-      if (sorted_ && k > 1) {
+      if (sorted && k > 1) {
         std::unique_ptr<std::vector<std::pair<T, int32>>> top_k(
             filter.Extract());
         for (auto top_k_it = top_k->begin(); top_k_it != top_k->end();
              ++top_k_it, ++i) {
-          values(r, i) = top_k_it->first;
-          indices(r, i) = -top_k_it->second;
+          (*values)(r, i) = top_k_it->first;
+          (*indices)(r, i) = -top_k_it->second;
         }
       } else {
         for (auto top_k_it = filter.unsorted_begin();
              top_k_it != filter.unsorted_end(); ++top_k_it, ++i) {
-          values(r, i) = top_k_it->first;
-          indices(r, i) = -top_k_it->second;
+          (*values)(r, i) = top_k_it->first;
+          (*indices)(r, i) = -top_k_it->second;
         }
       }
       filter.Reset();
     }
   }
-
- private:
-  int k_;
-  bool sorted_;
 };
 
-#define REGISTER_KERNELS_NAME(name, type) \
-  REGISTER_KERNEL_BUILDER(                \
-      Name(#name).Device(DEVICE_CPU).TypeConstraint<type>("T"), TopK<type>)
+}  // namespace functor
+
+#define REGISTER_KERNELS_NAME(name, type)                       \
+  REGISTER_KERNEL_BUILDER(                                      \
+      Name(#name).Device(DEVICE_CPU).TypeConstraint<type>("T"), \
+      TopK<CPUDevice, type>)
 
 #define REGISTER_KERNELS(type)       \
   REGISTER_KERNELS_NAME(TopK, type); \
   REGISTER_KERNELS_NAME(TopKV2, type)
 
 TF_CALL_REAL_NUMBER_TYPES(REGISTER_KERNELS);
-#undef REGISTER_KERNELS_TO_NAME
+#undef REGISTER_KERNELS_NAME
 #undef REGISTER_KERNELS
 
-}  // namespace tensorflow
+#ifdef GOOGLE_CUDA
+
+namespace functor {
+#define DECLARE_GPU_SPEC(T)                                                  \
+  template <>                                                                \
+  void TopKFunctor<GPUDevice, T>::Compute(                                   \
+      OpKernelContext* context, bool sorted, int k,                          \
+      const typename TTypes<T, 2>::ConstTensor& input, const int64 num_rows, \
+      const int64 num_cols, typename TTypes<T, 2>::Tensor* values,           \
+      typename TTypes<int, 2>::Tensor* indices);                             \
+  extern template struct functor::TopKFunctor<GPUDevice, T>;
+
+TF_CALL_GPU_NUMBER_TYPES_NO_HALF(DECLARE_GPU_SPEC);
+TF_CALL_INTEGRAL_TYPES(DECLARE_GPU_SPEC);
+
+#undef DECLARE_GPU_SPEC
+
+}  // namespace functor
+
+#define REGISTER_KERNELS(type)                                   \
+  REGISTER_KERNEL_BUILDER(                                       \
+      Name("TopK").Device(DEVICE_GPU).TypeConstraint<type>("T"), \
+      TopK<GPUDevice, type>)                                     \
+  REGISTER_KERNEL_BUILDER(Name("TopKV2")                         \
+                              .Device(DEVICE_GPU)                \
+                              .TypeConstraint<type>("T")         \
+                              .HostMemory("k"),                  \
+                          TopK<GPUDevice, type>)
+
+TF_CALL_GPU_NUMBER_TYPES_NO_HALF(REGISTER_KERNELS);
+TF_CALL_INTEGRAL_TYPES(REGISTER_KERNELS);
+
+#undef REGISTER_KERNELS
+
+#endif  // end GOOGLE_CUDA
+
+}  // end namespace tensorflow
diff --git a/tensorflow/core/kernels/topk_op.h b/tensorflow/core/kernels/topk_op.h
new file mode 100644
index 0000000000..799c3e8345
--- /dev/null
+++ b/tensorflow/core/kernels/topk_op.h
@@ -0,0 +1,42 @@
+/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#ifndef TENSORFLOW_TOPK_OP_H_
+#define TENSORFLOW_TOPK_OP_H_
+
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/tensor_types.h"
+#include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/lib/core/errors.h"
+
+namespace tensorflow {
+
+namespace functor {
+
+template <typename Device, typename T>
+struct TopKFunctor {
+  static void Compute(OpKernelContext* context, bool sorted, int k,
+                      const typename TTypes<T, 2>::ConstTensor& input,
+                      const int64 num_rows, const int64 num_cols,
+                      typename TTypes<T, 2>::Tensor* values,
+                      typename TTypes<int, 2>::Tensor* indices);
+};
+
+}  // end namespace functor
+
+}  // end namespace tensorflow
+
+#endif  // TENSORFLOW_TOPK_OP_H_
diff --git a/tensorflow/core/kernels/topk_op_gpu.cu.cc b/tensorflow/core/kernels/topk_op_gpu.cu.cc
new file mode 100644
index 0000000000..7bacc2defa
--- /dev/null
+++ b/tensorflow/core/kernels/topk_op_gpu.cu.cc
@@ -0,0 +1,414 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#if GOOGLE_CUDA
+
+#define EIGEN_USE_GPU
+
+#include <cmath>
+#include <vector>
+#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/register_types.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/kernels/topk_op.h"
+#include "tensorflow/core/lib/gtl/top_n.h"
+#include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/types.h"
+
+namespace tensorflow {
+
+typedef Eigen::GpuDevice GPUDevice;
+
+namespace impl {
+
+enum class HeapType { kMinHeap, kMaxHeap };
+enum class PreferIndices { kLower, kHigher };
+
+template <typename T>
+struct Entry {
+  int index;
+  T value;
+
+  // Test-only.
+  static bool greater(const Entry<T>& a, const Entry<T>& b) {
+    if (a.value == b.value) {
+      return a.index < b.index;
+    }
+    return a.value > b.value;
+  }
+};
+
+template <typename T>
+struct LinearData {
+  typedef impl::Entry<T> Entry;
+
+  __device__ Entry& operator[](std::size_t index) const { return data[index]; }
+
+  __device__ int get_index(int i) const { return data[i].index; }
+  __device__ T get_value(int i) const { return data[i].value; }
+
+  Entry* const data;
+};
+
+template <typename T>
+struct IndirectLinearData {
+  typedef impl::Entry<T> Entry;
+
+  __device__ Entry& operator[](std::size_t index) const { return data[index]; }
+
+  __device__ int get_index(int i) const {
+    return backing_data[data[i].index].index;
+  }
+  __device__ T get_value(int i) const { return data[i].value; }
+
+  Entry* const data;
+  Entry* const backing_data;
+};
+
+#if GOOGLE_CUDA
+template <typename T>
+struct StridedData {
+  typedef impl::Entry<T> Entry;
+
+  __device__ Entry& operator[](std::size_t index) const {
+    return data[index * blockDim.x + threadIdx.x];
+  }
+
+  __device__ int get_index(int i) const { return (*this)[i].index; }
+  __device__ T get_value(int i) const { return (*this)[i].value; }
+
+  Entry* const data;
+};
+#endif
+
+// A heap of Entry<T> that can either work as a min-heap or as a max-heap.
+template <HeapType heapType, PreferIndices preferIndices,
+          template <typename> class Data, typename T>
+struct IndexedHeap {
+  typedef typename Data<T>::Entry Entry;
+  const Data<T> data;
+
+  __device__ bool is_above(int left, int right) {
+    T left_value = data.get_value(left);
+    T right_value = data.get_value(right);
+    if (left_value == right_value) {
+      if (preferIndices == PreferIndices::kLower) {
+        return data.get_index(left) < data.get_index(right);
+      } else {
+        return data.get_index(left) > data.get_index(right);
+      }
+    }
+    if (heapType == HeapType::kMinHeap) {
+      return left_value < right_value;
+    } else {
+      return left_value > right_value;
+    }
+  }
+
+  __device__ void assign(int i, const Entry& entry) { data[i] = entry; }
+
+  __device__ void push_up(int i) {
+    int child = i;
+    int parent;
+    for (; child > 0; child = parent) {
+      parent = (child - 1) / 2;
+      if (!is_above(child, parent)) {
+        // Heap property satisfied.
+        break;
+      }
+      swap(child, parent);
+    }
+  }
+
+  __device__ void swap(int a, int b) {
+    auto tmp = data[b];
+    data[b] = data[a];
+    data[a] = tmp;
+  }
+
+  __device__ void push_root_down(int k) { push_down(0, k); }
+
+  // MAX-HEAPIFY in Cormen
+  __device__ void push_down(int node, int k) {
+    while (true) {
+      const int left = 2 * node + 1;
+      const int right = left + 1;
+      int smallest = node;
+      if (left < k && is_above(left, smallest)) {
+        smallest = left;
+      }
+      if (right < k && is_above(right, smallest)) {
+        smallest = right;
+      }
+      if (smallest == node) {
+        break;
+      }
+      swap(smallest, node);
+      node = smallest;
+    }
+  }
+
+  // BUILD-MAX-HEAPIFY in Cormen
+  __device__ void build(int k) {
+    for (int node = (k - 1) / 2; node >= 0; node--) {
+      push_down(node, k);
+    }
+  }
+
+  // HEAP-EXTRACT-MAX in Cormen
+  __device__ void remove_root(int k) {
+    data[0] = data[k - 1];
+    push_root_down(k - 1);
+  }
+
+  // in-place HEAPSORT in Cormen
+  // This method destroys the heap property.
+  __device__ void sort(int k) {
+    for (int slot = k - 1; slot > 0; slot--) {
+      // This is like remove_root but we insert the element at the end.
+      swap(slot, 0);
+      // Heap is now an element smaller.
+      push_root_down(/*k=*/slot);
+    }
+  }
+
+  __device__ void replace_root(const Entry& entry, int k) {
+    data[0] = entry;
+    push_root_down(k);
+  }
+
+  __device__ const Entry& root() { return data[0]; }
+};
+
+template <HeapType heapType, PreferIndices preferIndices,
+          template <typename> class Data, typename T>
+__device__ IndexedHeap<heapType, preferIndices, Data, T> make_indexed_heap(
+    typename Data<T>::Entry* data) {
+  return IndexedHeap<heapType, preferIndices, Data, T>{Data<T>{data}};
+}
+
+// heapTopK walks over [input, input+length) with `step_size` stride starting at
+// `start_index`.
+// It builds a top-`k` heap that is stored in `heap_entries` using `Accessor` to
+// access elements in `heap_entries`. If sorted=true, the elements will be
+// sorted at the end.
+template <typename T, template <typename> class Data = LinearData>
+__device__ void heapTopK(const T* __restrict__ input, int length, int k,
+                         Entry<T>* __restrict__ heap_entries,
+                         bool sorted = false, int start_index = 0,
+                         int step_size = 1) {
+  assert(k <= length);
+
+  auto heap =
+      make_indexed_heap<HeapType::kMinHeap, PreferIndices::kHigher, Data, T>(
+          heap_entries);
+
+  int heap_end_index = start_index + k * step_size;
+  if (heap_end_index > length) {
+    heap_end_index = length;
+  }
+  // Initialize the min-heap.
+  for (int index = start_index, slot = 0; index < heap_end_index;
+       index += step_size, slot++) {
+    heap.assign(slot, {index, input[index]});
+  }
+
+  heap.build(k);
+
+  // Now iterate over the remaining items.
+  // If an item is smaller than the min element, it is not amongst the top k.
+  // Otherwise, replace the min element with it and push upwards.
+  for (int index = heap_end_index; index < length; index += step_size) {
+    // We prefer elements with lower indices. This is given here.
+    // Later elements automatically have higher indices, so can be discarded.
+    if (input[index] > heap.root().value) {
+      // This element should replace the min.
+      heap.replace_root({index, input[index]}, k);
+    }
+  }
+
+  // Sort if wanted.
+  if (sorted) {
+    heap.sort(k);
+  }
+}
+
+// mergeShards performs a top-k merge on `num_shards` many sorted streams that
+// are sorted and stored in `entries` in a strided way:
+// |s_1 1st|s_2 1st|...s_{num_shards} 1st|s_1 2nd|s_2 2nd|...
+// The overall top k elements are written to `top_k_values` and their indices
+// to top_k_indices.
+// `top_k_heap` is used as temporary storage for the merge heap.
+template <typename T>
+__device__ void mergeShards(int num_shards, int k,
+                            Entry<T>* __restrict__ entries,
+                            Entry<T>* __restrict__ top_k_heap, T* top_k_values,
+                            int* top_k_indices) {
+  // If k < num_shards, we can use a min-heap with k elements to get the top k
+  // of the sorted blocks.
+  // If k > num_shards, we can initialize a min-heap with the top element from
+  // each sorted block.
+  const int heap_size = k < num_shards ? k : num_shards;
+
+  // Min-heap part.
+  {
+    auto min_heap = IndexedHeap<HeapType::kMinHeap, PreferIndices::kHigher,
+                                IndirectLinearData, T>{
+        IndirectLinearData<T>{top_k_heap, entries}};
+    // Initialize the heap as a min-heap.
+    for (int slot = 0; slot < heap_size; slot++) {
+      min_heap.assign(slot, {slot, entries[slot].value});
+    }
+    min_heap.build(heap_size);
+
+    // Now perform top k with the remaining shards (if num_shards > heap_size).
+    for (int shard = heap_size; shard < num_shards; shard++) {
+      const auto entry = entries[shard];
+      const auto root = min_heap.root();
+      if (entry.value < root.value) {
+        continue;
+      }
+      if (entry.value == root.value &&
+          entry.index > entries[root.index].index) {
+        continue;
+      }
+      // This element should replace the min.
+      min_heap.replace_root({shard, entry.value}, heap_size);
+    }
+  }
+
+  // Max-part.
+  {
+    // Turn the min-heap into a max-heap in-place.
+    auto max_heap = IndexedHeap<HeapType::kMaxHeap, PreferIndices::kLower,
+                                IndirectLinearData, T>{
+        IndirectLinearData<T>{top_k_heap, entries}};
+    // Heapify into a max heap.
+    max_heap.build(heap_size);
+
+    // Now extract the minimum k-1 times.
+    // k is treated specially.
+    const int last_k = k - 1;
+    for (int rank = 0; rank < last_k; rank++) {
+      const Entry<T>& max_element = max_heap.root();
+      top_k_values[rank] = max_element.value;
+      int shard_index = max_element.index;
+      top_k_indices[rank] = entries[shard_index].index;
+      int next_shard_index = shard_index + num_shards;
+      // For rank < k-1, each top k heap still contains at least 1 element,
+      // so we can draw a replacement.
+      max_heap.replace_root({next_shard_index, entries[next_shard_index].value},
+                            heap_size);
+    }
+
+    // rank == last_k.
+    const Entry<T>& max_element = max_heap.root();
+    top_k_values[last_k] = max_element.value;
+    int shard_index = max_element.index;
+    top_k_indices[last_k] = entries[shard_index].index;
+  }
+}
+
+extern __shared__ char shared_memory[];
+
+template <typename T>
+__global__ void TopKKernel(const T* input, int length, int k, bool sorted,
+                           T* output, int* indices) {
+  const int batch_index = blockIdx.x;
+  const T* batch_input = input + batch_index * length;
+
+  const int thread_index = threadIdx.x;
+  const int thread_count = blockDim.x;
+
+  Entry<T>* shared_entries = (Entry<T>*)shared_memory;
+
+  heapTopK<T, StridedData>(batch_input, length, k, shared_entries, true,
+                           thread_index, thread_count);
+
+  __syncthreads();
+  if (thread_index == 0) {
+    const int offset = batch_index * k;
+    auto batch_output = output + offset;
+    auto batch_indices = indices + offset;
+    Entry<T>* top_k_heap = shared_entries + thread_count * k;
+
+    mergeShards(thread_count, k, shared_entries, top_k_heap, batch_output,
+                batch_indices);
+  }
+}
+
+template <typename T>
+void LaunchTopKKernel(void* stream, int num_shards, const T* input,
+                      int batch_size, int length, int k, bool sorted, T* output,
+                      int* indices) {
+  // As many shards as possible.
+  if (num_shards <= 0) {
+    constexpr auto shared_memory_size = 48 << 10;  // 48 KB
+    const auto heap_size = k * (sizeof(int) + sizeof(T));
+    // shared_memory_size = (num_shards + 1) * heap_size <=>
+    num_shards = shared_memory_size / heap_size - 1;
+    if (num_shards <= 0) {
+      num_shards = 1;
+    }
+    auto shard_size = length / num_shards;
+    auto min_shard_size = 2 * k;
+    if (shard_size < min_shard_size) {
+      num_shards = length / min_shard_size;
+    }
+    if (num_shards <= 0) {
+      num_shards = 1;
+    } else if (num_shards > 1024) {
+      num_shards = 1024;
+    }
+  }
+  // We are limited by the amount of shared memory we have per block.
+  auto shared_memory_size = (num_shards + 1) * k * sizeof(Entry<T>);
+
+  TopKKernel<<<batch_size, num_shards, shared_memory_size,
+               (cudaStream_t)stream>>>(input, length, k, sorted, output,
+                                       indices);
+}
+
+}  // end namespace impl
+
+namespace functor {
+
+template <typename T>
+struct TopKFunctor<GPUDevice, T> {
+  static EIGEN_ALWAYS_INLINE void Compute(
+      OpKernelContext* context, bool sorted, int k,
+      const typename TTypes<T, 2>::ConstTensor& input, const int64 num_rows,
+      const int64 num_cols, typename TTypes<T, 2>::Tensor* values,
+      typename TTypes<int, 2>::Tensor* indices) {
+    auto stream = context->eigen_gpu_device().stream();
+    impl::LaunchTopKKernel(stream, 0, input.data(), num_rows, num_cols, k,
+                           sorted, values->data(), indices->data());
+  }
+};
+
+}  // end namespace functor
+
+#define INSTANTIATE_TEMPLATE(type) \
+  template struct functor::TopKFunctor<GPUDevice, type>;
+
+TF_CALL_GPU_NUMBER_TYPES_NO_HALF(INSTANTIATE_TEMPLATE);
+TF_CALL_INTEGRAL_TYPES(INSTANTIATE_TEMPLATE);
+#undef INSTANTIATE_TEMPLATE
+
+}  // namespace tensorflow
+
+#endif  // GOOGLE_CUDA
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index b83937ab26..57325d124b 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -830,7 +830,7 @@ tf_py_test(
     ],
 )
 
-tf_py_test(
+cuda_py_test(
     name = "topk_op_test",
     size = "small",
     srcs = ["topk_op_test.py"],
diff --git a/tensorflow/python/kernel_tests/topk_op_test.py b/tensorflow/python/kernel_tests/topk_op_test.py
index 9d89e250f5..b61995373f 100644
--- a/tensorflow/python/kernel_tests/topk_op_test.py
+++ b/tensorflow/python/kernel_tests/topk_op_test.py
@@ -37,16 +37,41 @@ class TopKTest(test.TestCase):
                     expected_values,
                     expected_indices,
                     sorted=True):
-    np_values = np.array(expected_values)
-    np_indices = np.array(expected_indices)
-    with self.test_session():
+    np_expected_values = np.array(expected_values)
+    np_expected_indices = np.array(expected_indices)
+    with self.test_session(use_gpu=True):
       values_op, indices_op = nn_ops.top_k(inputs, k, sorted=sorted)
       values = values_op.eval()
       indices = indices_op.eval()
-      self.assertAllClose(np_values, values)
-      self.assertAllEqual(np_indices, indices)
-      self.assertShapeEqual(np_values, values_op)
-      self.assertShapeEqual(np_indices, indices_op)
+
+      self.assertShapeEqual(np_expected_values, values_op)
+      self.assertShapeEqual(np_expected_indices, indices_op)
+
+      if sorted:
+        self.assertAllClose(np_expected_values, values)
+        self.assertAllEqual(np_expected_indices, indices)
+      else:
+        np_inputs = np.array(inputs)
+
+        # Check that the indices are valid.
+        for result_index, src_index in np.ndenumerate(indices):
+          value = values[result_index]
+          expected_value = np_inputs[result_index[0], src_index]
+          np.testing.utils.assert_almost_equal(value, expected_value)
+
+        # Check that if two elements are equal, the lower-index element appears
+        # first.
+        shape = values.shape
+        for batch_index in range(shape[0]):
+          for index in range(shape[1] - 1):
+            if np.isclose(values[batch_index, index],
+                          values[batch_index, index + 1]):
+              self.assertLess(indices[batch_index, index],
+                              indices[batch_index, index + 1])
+
+        # Now check the results, ignoring order.
+        self.assertAllEqual(np.sort(np_expected_indices), np.sort(indices))
+        self.assertAllClose(np.sort(np_expected_values), np.sort(values))
 
   def testTop1(self):
     inputs = [[0.1, 0.3, 0.2, 0.4], [0.1, 0.3, 0.3, 0.2]]
@@ -79,7 +104,7 @@ class TopKTest(test.TestCase):
 
   def testKNegative(self):
     inputs = [[0.1, 0.2], [0.3, 0.4]]
-    with self.test_session():
+    with self.test_session(use_gpu=True):
       k = array_ops.placeholder(dtypes.int32)
       values, _ = nn_ops.top_k(inputs, k)
       with self.assertRaisesOpError("Need k >= 0, got -7"):
@@ -92,7 +117,7 @@ class TopKTest(test.TestCase):
       nn_ops.top_k(inputs, 4)
 
   def testTopKGradients(self):
-    with self.test_session() as sess:
+    with self.test_session(use_gpu=True) as sess:
       inputs = array_ops.placeholder(dtypes.int32, shape=[2, 5])
       values, _ = nn_ops.top_k(inputs, 3)
       grad = sess.run(
-- 
GitLab


From 8bbec0bc01ffad39d3006a1696fc22a775154d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Csomor?=
 <laszlocsomor@users.noreply.github.com>
Date: Fri, 19 May 2017 12:20:17 -0400
Subject: [PATCH 1537/1563] Bazel CI / TensorFlow: fix more errors (#9762)

* Bazel CI / TensorFlow: fix more errors

In this commit:

1. Keep just the first character of the python
version checker script's output. This is a simple
way to strip \n and \r and we only need the major
version anyway. The string is later used in
writing the .bazelrc file where these characters
would cause problems.

2. Export environment variables in
run_configure_for_cpu_build, use their default
values

3. Allow a user-defined value for BAZEL_SH

4. Fix python_configure.bzl:

4.a. Fix the symlink creation on Windows: create a
single junction pointing to the src_dir. This is a
trick to get around the problem that on Windows we
can't create symlinks. By creating this symlink
and declaring the same outputs as on Linux/Darwin,
we make it look like that the genrule successfully
produced these files. This only works in a
single-machine execution environment.

4.b. Get rid of the "select" in
@local_config_python//:numpy_include and
python_include. The results of `find` and `dir`
only make sense on Linux/Darwin and Windows
respectively, so there's no point in generating
the non-Windows genrule on Windows and the
Windows-specific one on non-Windows, because all
the paths would be wrong. So instead of that,
generate just the genrule corresponding to the
platform.

4.c. Write the genrule.cmd's commands to scripts
and execute those instead. This avoids the
difficulties with escaping backslashes and quotes.
Backslashes are necessary on Windows because paths
with forward slashes aren't generally accepted,
e.g. "cmd.exe /c foo/bar" doesn't work because
Windows believes foo is an executable and /bar is
its switch:

    c:\tempdir>type bar.cmd
    @echo this is bar.cmd, %%1=(%1)

    c:\tempdir>cmd.exe /c bar/baz
    this is bar.cmd, %1=(/baz)

5. simplify the "is_windows" function in
./configure

Fixes https://github.com/bazelbuild/bazel/issues/2892

* Fix bad cc_library.includes from prev. commit

* bazel_test_lib.sh: add envvars to CPU build config

* Fix junction creation in python_configure.bzl

Bazel deletes the output files from a previous
build before running an action, and if the
junction pointing to the source directory is
present then Bazel would delete the source files,
believing they are in the output directory.

Thanks to @meteorcloudy on
https://github.com/tensorflow/tensorflow/pull/9762
---
 configure                                     |  10 +-
 .../ci_build/windows/bazel/bazel_test_lib.sh  |   9 ++
 .../ci_build/windows/bazel/common_env.sh      |   2 +-
 third_party/py/BUILD.tpl                      |  36 +-----
 third_party/py/python_configure.bzl           | 107 +++++++++---------
 5 files changed, 72 insertions(+), 92 deletions(-)

diff --git a/configure b/configure
index d751563b58..23603a969d 100755
--- a/configure
+++ b/configure
@@ -28,11 +28,7 @@ function is_macos() {
 
 function is_windows() {
   # On windows, the shell script is actually running in msys
-  if [[ "${PLATFORM}" =~ msys_nt*|mingw*|cygwin*|uwin* ]]; then
-    true
-  else
-    false
-  fi
+  [[ "${PLATFORM}" =~ msys_nt*|mingw*|cygwin*|uwin* ]]
 }
 
 function sed_in_place() {
@@ -133,8 +129,8 @@ function setup_python {
     exit 1
   fi
 
-  local python_major_version=$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; import sys; print(sys.version_info[0]);')
-  if [ "$python_major_version" == "" ]; then
+  local python_major_version=$("${PYTHON_BIN_PATH}" -c 'from __future__ import print_function; import sys; print(sys.version_info[0]);' | head -c1)
+  if [ -z "$python_major_version" ]; then
     echo -e "\n\nERROR: Problem getting python version.  Is $PYTHON_BIN_PATH the correct python binary?"
     exit 1
   fi
diff --git a/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh b/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
index f76c1add24..65d05d8d7d 100644
--- a/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
+++ b/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
@@ -178,6 +178,10 @@ function run_configure_for_cpu_build {
   if [ -z "$TF_NEED_MKL" ]; then
     export TF_NEED_MKL=0
   fi
+  export TF_NEED_VERBS=0
+  export TF_NEED_GCP=0
+  export TF_NEED_HDFS=0
+  export TF_NEED_OPENCL=0
   echo "" | ./configure
 }
 
@@ -197,6 +201,11 @@ function run_configure_for_gpu_build {
   if [ -z "$CC_OPT_FLAGS" ]; then
     export CC_OPT_FLAGS="-march=native"
   fi
+  export TF_NEED_VERBS=0
+  export TF_NEED_MKL=0
+  export TF_NEED_GCP=0
+  export TF_NEED_HDFS=0
+  export TF_NEED_OPENCL=0
   echo "" | ./configure
 }
 
diff --git a/tensorflow/tools/ci_build/windows/bazel/common_env.sh b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
index e4e3861710..47274d8c72 100644
--- a/tensorflow/tools/ci_build/windows/bazel/common_env.sh
+++ b/tensorflow/tools/ci_build/windows/bazel/common_env.sh
@@ -30,7 +30,7 @@ export TMPDIR="C:/tmp"
 mkdir -p "$TMPDIR"
 
 # Set bash path
-export BAZEL_SH="C:/tools/msys64/usr/bin/bash"
+export BAZEL_SH=${BAZEL_SH:-"C:/tools/msys64/usr/bin/bash"}
 
 # Set Python path for ./configure
 export PYTHON_BIN_PATH="C:/Program Files/Anaconda3/python"
diff --git a/third_party/py/BUILD.tpl b/third_party/py/BUILD.tpl
index 157834df4b..1ee9c071ad 100644
--- a/third_party/py/BUILD.tpl
+++ b/third_party/py/BUILD.tpl
@@ -4,42 +4,14 @@ package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "python_headers",
-    hdrs = select({
-        "windows" : [
-            "python_include_windows",
-        ],
-        "//conditions:default" : [
-            "python_include",
-        ],
-    }),
-    includes = select({
-        "windows" : [
-            "python_include_windows",
-        ],
-        "//conditions:default" : [
-            "python_include",
-        ],
-    }),
+    hdrs = [":python_include"],
+    includes = ["python_include"],
 )
 
 cc_library(
     name = "numpy_headers",
-    hdrs = select({
-        "windows" : [
-            "numpy_include_windows",
-        ],
-        "//conditions:default" : [
-            "numpy_include",
-        ],
-    }),
-    includes = select({
-        "windows" : [
-            "numpy_include_windows",
-        ],
-        "//conditions:default" : [
-            "numpy_include",
-        ],
-    }),
+    hdrs = [":numpy_include"],
+    includes = ["numpy_include"],
 )
 
 config_setting(
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index b2d0e250e7..5f5380c40c 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -86,67 +86,70 @@ def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name):
   """returns a genrule to symlink all files in a directory."""
   # Get the list of files under this directory
   find_result = None
+  if src_dir[-1] == "/":
+    src_dir = src_dir[:-1]
+  if dest_dir[-1] == "/":
+    dest_dir = dest_dir[:-1]
   if _is_windows(repository_ctx):
+    src_dir = src_dir.replace("/", "\\")
     find_result = _execute(
-        repository_ctx,
-        ["cmd.exe", "/c", "dir", src_dir.replace("/", "\\"), "/b", "/s",
-         "/a-d"],
+        repository_ctx, ["cmd.exe", "/c", "dir", src_dir, "/b", "/s", "/a-d"],
         empty_stdout_fine=True)
-    # src_files will be used to compute BUILD rules, where path must use
-    # forward slashes.
+    # src_files will be used in genrule.outs where the paths must
+    # use forward slashes.
     src_files = find_result.stdout.replace("\\", "/").splitlines()
-    # Create a list with the src_dir stripped to use for outputs.
-    fwdslashes_src_dir = src_dir.replace("\\", "/")
-    dest_files = [e.replace(fwdslashes_src_dir, "") for e in src_files]
   else:
     find_result = _execute(
         repository_ctx, ["find", src_dir, "-follow", "-type", "f"],
         empty_stdout_fine=True)
-    # Create a list with the src_dir stripped to use for outputs.
-    dest_files = find_result.stdout.replace(src_dir, '').splitlines()
     src_files = find_result.stdout.splitlines()
-  command = []
-  command_windows = []
-  outs = []
-  outs_windows = []
-  for i in range(len(dest_files)):
-    if dest_files[i] != "":
-      command.append('ln -s ' + src_files[i] + ' $(@D)/' +
-                     dest_dir + dest_files[i])
-      # ln -sf is actually implemented as copying in msys since creating
-      # symbolic links is privileged on Windows. But copying is too slow, so
-      # invoke mklink to create junctions on Windows.
-      command_windows.append('mklink /J ' + src_files[i] + ' $(@D)/' +
-                             dest_dir + dest_files[i])
-      outs.append('      "' + dest_dir + dest_files[i] + '",')
-      outs_windows.append('      "' + dest_dir + '_windows' +
-                          dest_files[i] + '",')
-  genrule = _genrule(src_dir, genrule_name, ' && '.join(command),
-                     '\n'.join(outs))
-  genrule_windows = _genrule(src_dir, genrule_name + '_windows',
-                             "cmd /c \"" + ' && '.join(command_windows) + "\"",
-                             '\n'.join(outs_windows))
-  return genrule + '\n' + genrule_windows
-
-
-def _genrule(src_dir, genrule_name, command, outs):
-  """Returns a string with a genrule.
-
-  Genrule executes the given command and produces the given outputs.
-  """
-  return (
-      'genrule(\n' +
-      '    name = "' +
-      genrule_name + '",\n' +
-      '    outs = [\n' +
-      outs +
-      '    ],\n' +
-      '    cmd = """\n' +
-      command +
-      '    """,\n' +
-      '    visibility = ["//visibility:private"],' +
-      ')\n'
-  )
+
+  dest_files = [e[len(src_dir) + 1:] for e in src_files]
+  outs = ['      "%s/%s",' % (dest_dir, e) for e in dest_files]
+  cmd_script = None
+
+  if _is_windows(repository_ctx):
+    dest_dir = dest_dir.replace("/", "\\")
+    # Copy the source directory to the output directory.
+    # Creating a junction pointing to the source directory and declaring the
+    # outputs like we do on Linux, then expecting that Bazel would pick up these
+    # outputs via the junction is ill-concieved, because Bazel deletes the
+    # output files from previous build prior to executing the action, meaning it
+    # would delete the actual files via the old junction.
+    cmd_script = "%s-cmd.cmd" % genrule_name
+    repository_ctx.file(
+        cmd_script,
+        executable = True,
+        content = "\n".join([
+            '@rem Auto-generated by //third_party/py/python_configure.bzl',
+            '@rem -------------------------------------------------------',
+            '@set DEST_DIR=%%1\\%s\\' % dest_dir,
+            '@rmdir /s /q %DEST_DIR%',
+            '@xcopy /s /e /q /y "%s" "%%DEST_DIR%%"' % src_dir]))
+    cmd = "cmd.exe /c \\\"$$(echo $(location %s) $(@D) | sed 's,/,\\\\\\\\,g')\\\"" % cmd_script
+  else:
+    cmd_script = "%s-cmd.sh" % genrule_name
+    repository_ctx.file(
+        cmd_script,
+        executable = True,
+        content = "\n".join(
+            ['#!/bin/bash',
+             '# Auto-generated by //third_party/py/python_configure.bzl',
+             'DEST_DIR="$1/%s"' % dest_dir] +
+            ['ln -s "%s" "${DEST_DIR}/%s"' % (src_files[i], dest_files[i])
+             for i in range(len(src_files))]))
+    cmd = "$(location %s) $(@D)" % cmd_script
+
+  return "\n".join([
+      'genrule(',
+      '    name = "%s",' % genrule_name,
+      '    outs = [',
+      ] + outs + [
+      '    ],',
+      '    cmd = "%s",' % cmd,
+      '    visibility = ["//visibility:private"],',
+      '    tools = ["%s"],' % cmd_script,
+      ')'])
 
 
 def _get_python_lib(repository_ctx, python_bin):
-- 
GitLab


From 4729ccf20b2fe6cdf74f28b830217119742e6977 Mon Sep 17 00:00:00 2001
From: Rasmus Larsen <rmlarsen@google.com>
Date: Fri, 19 May 2017 10:57:34 -0700
Subject: [PATCH 1538/1563] Remove deleted file.

---
 .../components/tf_graph_info/BUILD            | 64 -------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 tensorflow/tensorboard/components/tf_graph_info/BUILD

diff --git a/tensorflow/tensorboard/components/tf_graph_info/BUILD b/tensorflow/tensorboard/components/tf_graph_info/BUILD
deleted file mode 100644
index cf40db7965..0000000000
--- a/tensorflow/tensorboard/components/tf_graph_info/BUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-package(default_visibility = ["//tensorflow:internal"])
-
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
-licenses(["notice"])  # Apache 2.0
-
-web_library(
-    name = "tf_graph_info",
-    srcs = [
-        "tf-graph-icon.html",
-        "tf-graph-info.html",
-        "tf-node-info.html",
-        "tf-node-list-item.html",
-    ],
-    path = "/tf-graph-info",
-    suppress = [
-        "strictDependencies",
-        "superfluousSuppress",
-    ],
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common",
-        "//tensorflow/tensorboard/components/tf_graph_common",
-        "@org_polymer",
-        "@org_polymer_iron_collapse",
-        "@org_polymer_iron_list",
-        "@org_polymer_paper_icon_button",
-        "@org_polymer_paper_item",
-        "@org_polymer_paper_slider",
-        "@org_polymer_paper_spinner",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-tensorboard_webcomponent_library(
-    name = "legacy",
-    srcs = [
-        "tf-graph-icon.html",
-        "tf-graph-info.html",
-        "tf-node-info.html",
-        "tf-node-list-item.html",
-    ],
-    destdir = "tf-graph-info",
-    deps = [
-        "//tensorflow/tensorboard/components/tf_dashboard_common:legacy",
-        "//tensorflow/tensorboard/components/tf_graph_common:legacy",
-    ],
-)
-
-# This is needed despite how this component lacks TypeScript files because
-# components/BUILD seeks a legacy_ts rule in this package.
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [],
-)
-- 
GitLab


From b6d7be1cc2f6d03a519ad1bce615b71d6fa7eed4 Mon Sep 17 00:00:00 2001
From: Rasmus Larsen <rmlarsen@google.com>
Date: Fri, 19 May 2017 11:42:05 -0700
Subject: [PATCH 1539/1563] Remove duplicate method definition in
 tensor_shape.py

---
 tensorflow/python/framework/tensor_shape.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/framework/tensor_shape.py b/tensorflow/python/framework/tensor_shape.py
index d63c1d875f..3aedbfef0d 100644
--- a/tensorflow/python/framework/tensor_shape.py
+++ b/tensorflow/python/framework/tensor_shape.py
@@ -65,10 +65,9 @@ class Dimension(object):
 
   def __int__(self):
     return self._value
-  
-  def __long__(self):
-    return self._value
 
+  # This is needed for Windows.
+  # See https://github.com/tensorflow/tensorflow/pull/9780
   def __long__(self):
     return self._value
 
-- 
GitLab


From 6947f65a374ebf29e74bb71e36fd82760056d82c Mon Sep 17 00:00:00 2001
From: Kevin Carbone <kmcarbone16@gmail.com>
Date: Fri, 19 May 2017 11:53:24 -0700
Subject: [PATCH 1540/1563] #8263-Update recurrent.md (#9746)

* Update recurrent.md

Attempts to add some clarity to tutorial.
Adds example to aid in understanding.

* Update recurrent.md

Adds more clarity.

* Update recurrent.md

* Update recurrent.md

* Wraps text.

* Update recurrent.md
---
 tensorflow/docs_src/tutorials/recurrent.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/tutorials/recurrent.md b/tensorflow/docs_src/tutorials/recurrent.md
index 12d6285147..708a9620dd 100644
--- a/tensorflow/docs_src/tutorials/recurrent.md
+++ b/tensorflow/docs_src/tutorials/recurrent.md
@@ -51,11 +51,28 @@ The core of the model consists of an LSTM cell that processes one word at a
 time and computes probabilities of the possible values for the next word in the
 sentence. The memory state of the network is initialized with a vector of zeros
 and gets updated after reading each word. For computational reasons, we will
-process data in mini-batches of size `batch_size`.
+process data in mini-batches of size `batch_size`.  In this example, it is important 
+to note that `current_batch_of_words` does not correspond to a "sentence" of words.  
+Every word in a batch should correspond to time t.  Tensorflow will automatically sum 
+the gradients of each batch for you.
+
+For example:
+```
+ t=0  t=1    t=2  t=3     t=4
+[The, brown, fox, is,     quick]
+[The, red,   fox, jumped, high]
+
+words_in_dataset[0] = [The, The]
+words_in_dataset[1] = [fox, fox]
+words_in_dataset[2] = [is, jumped]
+words_in_dataset[3] = [quick, high]
+num_batches = 4, batch_size = 2, time_steps = 5
+```
 
 The basic pseudocode is as follows:
 
 ```python
+words_in_dataset = tf.placeholder(tf.float32, [num_batches, batch_size, num_features])
 lstm = tf.contrib.rnn.BasicLSTMCell(lstm_size)
 # Initial state of the LSTM memory.
 state = tf.zeros([batch_size, lstm.state_size])
-- 
GitLab


From f12c741fabfd45a079a5842044d7e500fb74268b Mon Sep 17 00:00:00 2001
From: "freedom\" Koan-Sin Tan" <koansin.tan@gmail.com>
Date: Sat, 20 May 2017 02:56:23 +0800
Subject: [PATCH 1541/1563] Replace use of tensorflow::ops::ReadFile (#10034)

Use tensorflow::Env instead of tensorflow::ops::ReadFile so that
we can avoid including whole_file_read_ops for Android.
---
 tensorflow/core/kernels/BUILD           |  1 -
 tensorflow/examples/label_image/main.cc | 42 +++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index a3ffd2dda3..4faebf7eae 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -4235,7 +4235,6 @@ filegroup(
         "transpose_op.cc",
         "warn_about_ints.cc",
         "where_op.cc",
-        "whole_file_read_ops.cc",
         "xent_op.cc",
         ":android_extended_ops_headers",
     ],
diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
index 3744d5a52b..f22e56c714 100644
--- a/tensorflow/examples/label_image/main.cc
+++ b/tensorflow/examples/label_image/main.cc
@@ -50,6 +50,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/threadpool.h"
 #include "tensorflow/core/lib/io/path.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
+#include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/init_main.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/types.h"
@@ -86,6 +87,29 @@ Status ReadLabelsFile(const string& file_name, std::vector<string>* result,
   return Status::OK();
 }
 
+static Status ReadEntireFile(tensorflow::Env* env, const string& filename,
+                             Tensor* output) {
+
+  tensorflow::uint64 file_size = 0;
+  TF_RETURN_IF_ERROR(env->GetFileSize(filename, &file_size));
+
+  string contents;
+  contents.resize(file_size);
+
+  std::unique_ptr<tensorflow::RandomAccessFile> file;
+  TF_RETURN_IF_ERROR(env->NewRandomAccessFile(filename, &file));
+
+  tensorflow::StringPiece data;
+  TF_RETURN_IF_ERROR(file->Read(0, file_size, &data, &(contents)[0]));
+  if (data.size() != file_size) {
+    return tensorflow::errors::DataLoss("Truncated read of '", filename,
+                                        "' expected ", file_size, " got ",
+                                        data.size());
+  }
+  output->scalar<string>()() = data.ToString();
+  return Status::OK();
+}
+
 // Given an image file name, read in the data, try to decode it as an image,
 // resize it to the requested size, and then scale the values as desired.
 Status ReadTensorFromImageFile(const string& file_name, const int input_height,
@@ -97,8 +121,20 @@ Status ReadTensorFromImageFile(const string& file_name, const int input_height,
 
   string input_name = "file_reader";
   string output_name = "normalized";
-  auto file_reader =
-      tensorflow::ops::ReadFile(root.WithOpName(input_name), file_name);
+
+  // read file_name into a tensor named input
+  Tensor input(tensorflow::DT_STRING, tensorflow::TensorShape());
+  TF_RETURN_IF_ERROR(ReadEntireFile(tensorflow::Env::Default(), file_name,
+                                    &input));
+
+  // use a placeholder to read input data
+  auto file_reader = Placeholder(root.WithOpName("input"),
+                                 tensorflow::DataType::DT_STRING);
+
+  std::vector<std::pair<string, tensorflow::Tensor>> inputs = {
+    {"input", input},
+  };
+
   // Now try to figure out what kind of file it is and decode it.
   const int wanted_channels = 3;
   tensorflow::Output image_reader;
@@ -141,7 +177,7 @@ Status ReadTensorFromImageFile(const string& file_name, const int input_height,
   std::unique_ptr<tensorflow::Session> session(
       tensorflow::NewSession(tensorflow::SessionOptions()));
   TF_RETURN_IF_ERROR(session->Create(graph));
-  TF_RETURN_IF_ERROR(session->Run({}, {output_name}, {}, out_tensors));
+  TF_RETURN_IF_ERROR(session->Run({inputs}, {output_name}, {}, out_tensors));
   return Status::OK();
 }
 
-- 
GitLab


From 83f01b3cff97a5a6901d3cdf2e45b03dc4d3632e Mon Sep 17 00:00:00 2001
From: Rasmus Larsen <rmlarsen@google.com>
Date: Fri, 19 May 2017 11:59:25 -0700
Subject: [PATCH 1542/1563] Fix another merge error.

---
 tensorflow/compiler/xla/literal_util.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tensorflow/compiler/xla/literal_util.cc b/tensorflow/compiler/xla/literal_util.cc
index 67b6412934..ec4012a703 100644
--- a/tensorflow/compiler/xla/literal_util.cc
+++ b/tensorflow/compiler/xla/literal_util.cc
@@ -700,8 +700,6 @@ template <typename T>
       break;
     case F64:
       Resize<double>(num_elements, 0, literal);
-    case F16:
-      Resize<half>(num_elements, static_cast<half>(0.0f), literal);
       break;
     case F16:
       Resize<half>(num_elements, static_cast<half>(0.0f), literal);
-- 
GitLab


From 8f8c2e06244efcf779f442a3e7adc635ed690227 Mon Sep 17 00:00:00 2001
From: Rasmus Larsen <rmlarsen@google.com>
Date: Fri, 19 May 2017 12:29:55 -0700
Subject: [PATCH 1543/1563] More merge errors.

---
 .../kernels/non_max_suppression_op_test.cc    | 159 +-----------------
 1 file changed, 1 insertion(+), 158 deletions(-)

diff --git a/tensorflow/core/kernels/non_max_suppression_op_test.cc b/tensorflow/core/kernels/non_max_suppression_op_test.cc
index db9d2383c6..55672ec83f 100644
--- a/tensorflow/core/kernels/non_max_suppression_op_test.cc
+++ b/tensorflow/core/kernels/non_max_suppression_op_test.cc
@@ -141,7 +141,7 @@ TEST_F(NonMaxSuppressionOpTest, TestInconsistentBoxAndScoreShapes) {
   AddInputFromArray<float>(TensorShape({5}), {.9f, .75f, .6f, .95f, .5f});
   AddInputFromArray<int>(TensorShape({}), {30});
   Status s = RunOpKernel();
-  
+
   ASSERT_FALSE(s.ok());
   EXPECT_TRUE(
               StringPiece(s.ToString()).contains("scores has incompatible shape"))
@@ -172,163 +172,6 @@ TEST_F(NonMaxSuppressionOpTest, TestEmptyInput) {
   test::FillValues<int>(&expected, {});
   test::ExpectTensorEqual<int>(expected, *GetOutput(0));
 }
-    
-//
-// NonMaxSuppressionV2Op Tests
-//
-
-class NonMaxSuppressionV2OpTest : public OpsTestBase {
- protected:
-  void MakeOp() {
-    TF_EXPECT_OK(NodeDefBuilder("non_max_suppression_op", "NonMaxSuppressionV2")
-                     .Input(FakeInput(DT_FLOAT))
-                     .Input(FakeInput(DT_FLOAT))
-                     .Input(FakeInput(DT_INT32))
-                     .Input(FakeInput(DT_FLOAT))
-                     .Finalize(node_def()));
-    TF_EXPECT_OK(InitOp());
-  }
-};
-
-TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromThreeClusters) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({6, 4}),
-                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
-                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
-  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
-  AddInputFromArray<int>(TensorShape({}), {3});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
-  test::FillValues<int>(&expected, {3, 0, 5});
-  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromThreeClustersFlippedCoordinates) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({6, 4}),
-                           {1, 1,  0, 0,  0, 0.1f,  1, 1.1f,  0, .9f,  1, -0.1f,
-                            0, 10, 1, 11, 1, 10.1f, 0, 11.1f, 1, 101, 0, 100});
-  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
-  AddInputFromArray<int>(TensorShape({}), {3});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
-  test::FillValues<int>(&expected, {3, 0, 5});
-  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestSelectAtMostTwoBoxesFromThreeClusters) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({6, 4}),
-                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
-                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
-  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
-  AddInputFromArray<int>(TensorShape({}), {2});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor expected(allocator(), DT_INT32, TensorShape({2}));
-  test::FillValues<int>(&expected, {3, 0});
-  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestSelectAtMostThirtyBoxesFromThreeClusters) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({6, 4}),
-                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
-                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
-  AddInputFromArray<float>(TensorShape({6}), {.9f, .75f, .6f, .95f, .5f, .3f});
-  AddInputFromArray<int>(TensorShape({}), {30});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor expected(allocator(), DT_INT32, TensorShape({3}));
-  test::FillValues<int>(&expected, {3, 0, 5});
-  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestSelectSingleBox) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
-  AddInputFromArray<float>(TensorShape({1}), {.9f});
-  AddInputFromArray<int>(TensorShape({}), {3});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor expected(allocator(), DT_INT32, TensorShape({1}));
-  test::FillValues<int>(&expected, {0});
-  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestSelectFromTenIdenticalBoxes) {
-  MakeOp();
-
-  int num_boxes = 10;
-  std::vector<float> corners(num_boxes * 4);
-  std::vector<float> scores(num_boxes);
-  for (int i = 0; i < num_boxes; ++i) {
-    corners[i * 4 + 0] = 0;
-    corners[i * 4 + 1] = 0;
-    corners[i * 4 + 2] = 1;
-    corners[i * 4 + 3] = 1;
-    scores[i] = .9;
-  }
-  AddInputFromArray<float>(TensorShape({num_boxes, 4}), corners);
-  AddInputFromArray<float>(TensorShape({num_boxes}), scores);
-  AddInputFromArray<int>(TensorShape({}), {3});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor expected(allocator(), DT_INT32, TensorShape({1}));
-  test::FillValues<int>(&expected, {0});
-  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestInconsistentBoxAndScoreShapes) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({6, 4}),
-                           {0, 0,  1, 1,  0, 0.1f,  1, 1.1f,  0, -0.1f, 1, 0.9f,
-                            0, 10, 1, 11, 0, 10.1f, 1, 11.1f, 0, 100,  1, 101});
-  AddInputFromArray<float>(TensorShape({5}), {.9f, .75f, .6f, .95f, .5f});
-  AddInputFromArray<int>(TensorShape({}), {30});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  Status s = RunOpKernel();
-
-  ASSERT_FALSE(s.ok());
-  EXPECT_TRUE(
-      StringPiece(s.ToString()).contains("scores has incompatible shape"))
-      << s;
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestInvalidIOUThreshold) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({1, 4}), {0, 0, 1, 1});
-  AddInputFromArray<float>(TensorShape({1}), {.9f});
-  AddInputFromArray<int>(TensorShape({}), {3});
-  AddInputFromArray<float>(TensorShape({}), {1.2f});
-  Status s = RunOpKernel();
-
-  ASSERT_FALSE(s.ok());
-  EXPECT_TRUE(
-      StringPiece(s.ToString()).contains("iou_threshold must be in [0, 1]"))
-      << s;
-}
-
-TEST_F(NonMaxSuppressionV2OpTest, TestEmptyInput) {
-  MakeOp();
-  AddInputFromArray<float>(TensorShape({0, 4}), {});
-  AddInputFromArray<float>(TensorShape({0}), {});
-  AddInputFromArray<int>(TensorShape({}), {30});
-  AddInputFromArray<float>(TensorShape({}), {.5f});
-  TF_ASSERT_OK(RunOpKernel());
-
-  Tensor expected(allocator(), DT_INT32, TensorShape({0}));
-  test::FillValues<int>(&expected, {});
-  test::ExpectTensorEqual<int>(expected, *GetOutput(0));
-}
 
 //
 // NonMaxSuppressionV2Op Tests
-- 
GitLab


From e47e3b98261fb5a13f653411f58c6c63d0cfab57 Mon Sep 17 00:00:00 2001
From: peeyush18 <peeyush.pathak18@gmail.com>
Date: Sat, 20 May 2017 02:25:16 +0530
Subject: [PATCH 1544/1563] Update 1_notmnist.ipynb (#10022)

---
 tensorflow/examples/udacity/1_notmnist.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/examples/udacity/1_notmnist.ipynb b/tensorflow/examples/udacity/1_notmnist.ipynb
index 521cbf3000..5b2966c006 100644
--- a/tensorflow/examples/udacity/1_notmnist.ipynb
+++ b/tensorflow/examples/udacity/1_notmnist.ipynb
@@ -109,7 +109,7 @@
         "outputId": "0d0f85df-155f-4a89-8e7e-ee32df36ec8d"
       },
       "source": [
-        "url = 'http://commondatastorage.googleapis.com/books1000/'\n",
+        "url = 'https://commondatastorage.googleapis.com/books1000/'\n",
         "last_percent_reported = None\n",
         "data_root = '.' # Change me to store data elsewhere\n",
         "\n",
-- 
GitLab


From 64135c5547a606c58af4bca01883be2167e43d12 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 19 May 2017 14:50:36 -0700
Subject: [PATCH 1545/1563] Update delay_compensated_gradient_descent.py

---
 .../opt/python/training/delay_compensated_gradient_descent.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
index ada3f14473..9f843568d8 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
@@ -1,4 +1,4 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
-- 
GitLab


From d254036c950a31747f9797b370f400021301aad5 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 19 May 2017 14:53:33 -0700
Subject: [PATCH 1546/1563] Reverse changes to optimizer.py

---
 tensorflow/python/training/optimizer.py | 41 ++++---------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/tensorflow/python/training/optimizer.py b/tensorflow/python/training/optimizer.py
index 1e4e039129..0e10704dc8 100644
--- a/tensorflow/python/training/optimizer.py
+++ b/tensorflow/python/training/optimizer.py
@@ -101,14 +101,6 @@ class _RefVariableProcessor(_OptimizableVariable):
       # pylint: disable=protected-access
       return optimizer._apply_sparse_duplicate_indices(g, self._v)
 
-  def update_op_asynchronous(self, optimizer, g, index):
-    if isinstance(g, ops.Tensor):
-      return optimizer._apply_dense(g, self._v, index)
-    else:
-      assert isinstance(g, ops.IndexedSlices), ("Gradient ", g, " is neither a "
-                                                "tensor nor IndexedSlices.")
-      # pylint: disable=protected-access
-      return optimizer._apply_sparse_duplicate_indices(g, self._v, index)
 
 class _DenseReadResourceVariableProcessor(_OptimizableVariable):
   """Processor for dense ResourceVariables."""
@@ -123,9 +115,6 @@ class _DenseReadResourceVariableProcessor(_OptimizableVariable):
     # pylint: disable=protected-access
     return optimizer._resource_apply_dense(g, self._v.op.inputs[0])
 
-  def update_op_asynchronous(self, optimizer, g, index):
-    # pylint: disable=protected-access
-    return optimizer._resource_apply_dense(g, self._v.op.inputs[0], index)
 
 class _DenseResourceVariableProcessor(_OptimizableVariable):
   """Processor for dense ResourceVariables."""
@@ -143,12 +132,6 @@ class _DenseResourceVariableProcessor(_OptimizableVariable):
           g.values, self._v, g.indices)
     return optimizer._resource_apply_dense(g, self._v)
 
-  def update_op_asynchronous(self, optimizer, g, index):
-    # pylint: disable=protected-access
-    if isinstance(g, ops.IndexedSlices):
-      return optimizer._resource_apply_sparse_duplicate_indices(
-          g.values, self._v, g.indices, index)
-    return optimizer._resource_apply_dense(g, self._v, index)
 
 class _StreamingModelPortProcessor(_OptimizableVariable):
   """Processor for streaming ModelPorts."""
@@ -165,10 +148,10 @@ class _StreamingModelPortProcessor(_OptimizableVariable):
 
 def _get_processor(v):
   """The processor of v."""
-  if isinstance(v, variables.Variable):
-    return _RefVariableProcessor(v)
   if v.op.type == "VarHandleOp":
     return _DenseResourceVariableProcessor(v)
+  if isinstance(v, variables.Variable):
+    return _RefVariableProcessor(v)
   if v.op.type == "SubmodelPort":
     return _StreamingModelPortProcessor(v)
   raise NotImplementedError("Trying to optimize unsupported type ", v)
@@ -294,7 +277,7 @@ class Optimizer(object):
   def minimize(self, loss, global_step=None, var_list=None,
                gate_gradients=GATE_OP, aggregation_method=None,
                colocate_gradients_with_ops=False, name=None,
-               grad_loss=None, worker_index=None):
+               grad_loss=None):
     """Add operations to minimize `loss` by updating `var_list`.
 
     This method simply combines calls `compute_gradients()` and
@@ -317,8 +300,6 @@ class Optimizer(object):
         the corresponding op.
       name: Optional name for the returned operation.
       grad_loss: Optional. A `Tensor` holding the gradient computed for `loss`.
-      worker_index: Optional. A value to indicate the instance of worker
-        minimizing if computing asynchronously.
 
     Returns:
       An Operation that updates the variables in `var_list`.  If `global_step`
@@ -341,7 +322,7 @@ class Optimizer(object):
           ([str(v) for _, v in grads_and_vars], loss))
 
     return self.apply_gradients(grads_and_vars, global_step=global_step,
-                                name=name, worker_index=worker_index)
+                                name=name)
 
   def compute_gradients(self, loss, var_list=None,
                         gate_gradients=GATE_OP,
@@ -411,11 +392,7 @@ class Optimizer(object):
          if g is not None and v.dtype != dtypes.resource])
     return grads_and_vars
 
-  def apply_gradients(self,
-                      grads_and_vars,
-                      global_step=None,
-                      name=None,
-                      worker_index=None):
+  def apply_gradients(self, grads_and_vars, global_step=None, name=None):
     """Apply gradients to variables.
 
     This is the second part of `minimize()`. It returns an `Operation` that
@@ -428,8 +405,6 @@ class Optimizer(object):
         variables have been updated.
       name: Optional name for the returned operation.  Default to the
         name passed to the `Optimizer` constructor.
-      worker_index: Optional value to indicate the instance of worker
-        minimizing if computing asynchronously.
 
     Returns:
       An `Operation` that applies the specified gradients. If `global_step`
@@ -478,11 +453,7 @@ class Optimizer(object):
         # We colocate all ops created in _apply_dense or _apply_sparse
         # on the same device as the variable.
         with ops.name_scope("update_" + var.op.name), ops.colocate_with(var):
-          if worker_index is None:
-            update_ops.append(processor.update_op(self, grad))
-          else:
-            update_ops.append(processor.update_op_asynchronous(self, grad,
-                worker_index))
+          update_ops.append(processor.update_op(self, grad))
       if global_step is None:
         apply_updates = self._finish(update_ops, name)
       else:
-- 
GitLab


From bd9a6b4617b4ec45d9dca987a3769b84a8db9047 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 19 May 2017 14:57:15 -0700
Subject: [PATCH 1547/1563] change var_bak to shadow

---
 .../delay_compensated_gradient_descent.py      |  6 +++---
 tensorflow/core/kernels/training_ops.cc        | 18 +++++++++---------
 tensorflow/core/kernels/training_ops.h         |  2 +-
 tensorflow/core/ops/training_ops.cc            |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
index ada3f14473..b7a7292ecd 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
@@ -233,18 +233,18 @@ class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
         for index in range(self._num_workers):
             for v in var_list:
                 var2 = array_ops.identity(v.initialized_value())
-                self._get_or_make_slot(v, var2, "var_bak_{0}".format(index),
+                self._get_or_make_slot(v, var2, "shadow_{0}".format(index),
                                        self._name)
 
     def _apply_dense(self, grad, var, worker_index=0):
         # Get previous value of the variable from the slot
-        var_bak = self.get_slot(var, "var_bak_{0}".format(worker_index))
+        shadow = self.get_slot(var, "shadow_{0}".format(worker_index))
         return training_ops.apply_delay_compensated_gradient_descent(
             var,
             math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
             grad,
             math_ops.cast(self._lambda_tensor, var.dtype.base_dtype),
-            var_bak,
+            shadow,
             use_locking=self._use_locking).op
 
     def _prepare(self):
diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index cc5529e7cd..4bda4898ca 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -65,9 +65,9 @@ struct ApplyDelayCompensatedGradientDescent<CPUDevice, T> {
                   typename TTypes<T>::ConstScalar lr,
                   typename TTypes<T>::ConstFlat grad,
                   typename TTypes<T>::ConstScalar variance,
-                  typename TTypes<T>::Flat var_bak) {
-    var.device(d) -= lr() * (grad + variance() * grad * (var - var_bak));
-    var_bak.device(d) = var;
+                  typename TTypes<T>::Flat shadow) {
+    var.device(d) -= lr() * (grad + variance() * grad * (var - shadow));
+    shadow.device(d) = var;
   }
 };
 
@@ -432,18 +432,18 @@ class ApplyDelayCompensatedGradientDescentOp : public OpKernel {
     OP_REQUIRES(ctx, IsLegacyScalar(lambda.shape()),
                 errors::InvalidArgument("lambda is not a scalar: ",
                                         lambda.shape().DebugString()));
-    Tensor var_bak;
-    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 4, use_exclusive_lock_, &var_bak));
+    Tensor shadow;
+    OP_REQUIRES_OK(ctx, GetInputTensorFromVariable(ctx, 4, use_exclusive_lock_, &shadow));
     OP_REQUIRES(
-        ctx, var_bak.shape().IsSameSize(var.shape()),
-        errors::InvalidArgument("var_bak and var do not have the same shape",
-                                var_bak.shape().DebugString(), " ",
+        ctx, shadow.shape().IsSameSize(var.shape()),
+        errors::InvalidArgument("shadow and var do not have the same shape",
+                                shadow.shape().DebugString(), " ",
                                 var.shape().DebugString()));
 
     const Device& device = ctx->template eigen_device<Device>();
     functor::ApplyDelayCompensatedGradientDescent<Device, T>()(
         device, var.flat<T>(), alpha.scalar<T>(), delta.flat<T>(),
-         lambda.scalar<T>(), var_bak.flat<T>()
+         lambda.scalar<T>(), shadow.flat<T>()
     );
 
     MaybeForwardRefInputToRefOutput(ctx, 0, 0);
diff --git a/tensorflow/core/kernels/training_ops.h b/tensorflow/core/kernels/training_ops.h
index 0346016849..4e7dd6916a 100644
--- a/tensorflow/core/kernels/training_ops.h
+++ b/tensorflow/core/kernels/training_ops.h
@@ -40,7 +40,7 @@ struct ApplyDelayCompensatedGradientDescent {
                   typename TTypes<T>::ConstScalar alpha,
                   typename TTypes<T>::ConstFlat delta,
                   typename TTypes<T>::ConstScalar lambda,
-                  typename TTypes<T>::Flat var_bak);
+                  typename TTypes<T>::Flat shadow);
 };
 
 template <typename Device, typename T>
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index ff7b4e8ec8..bf9b09ee80 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -107,20 +107,20 @@ REGISTER_OP("ApplyDelayCompensatedGradientDescent")
     .Input("alpha: T")
     .Input("delta: T")
     .Input("lambda: T")
-    .Input("var_bak: Ref(T)")
+    .Input("shadow: Ref(T)")
     .Output("out: Ref(T)")
     .Attr("T: numbertype")
     .Attr("use_locking: bool = false")
     .SetShapeFn(ApplyGradientDescentShapeFn)
     .Doc(R"doc(
-var -= alpha * (delta + lambda * delta * (var - var_bak))
-Update '*var_bak' by changing it to the new value of 'var'
+var -= alpha * (delta + lambda * delta * (var - shadow))
+Update '*shadow' by changing it to the new value of 'var'
 
 var: Should be from a Variable().
 alpha: Scaling factor. Must be a scalar.
 delta: The change.
 lambda: The variance paramter.
-var_bak: Same as "var".
+shadow: Same as "var".
 out: Same as "var".
 use_locking: If `True`, the subtraction will be protected by a lock;
   otherwise the behavior is undefined, but may exhibit less contention.
-- 
GitLab


From 47bcf2919f6a90ca24b0cc25728d5c154dd9c912 Mon Sep 17 00:00:00 2001
From: My name is <raviqqe@gmail.com>
Date: Sat, 20 May 2017 06:04:58 +0800
Subject: [PATCH 1548/1563] s/training_op/train_op/ (#10028)

---
 tensorflow/contrib/learn/python/learn/estimators/model_fn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
index c56741a4d1..8a327ab01f 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/model_fn.py
@@ -132,7 +132,7 @@ class ModelFnOps(
     # Validate train_op.
     if train_op is None:
       if mode == ModeKeys.TRAIN:
-        raise ValueError('Missing training_op.')
+        raise ValueError('Missing train_op.')
     elif not isinstance(train_op, ops.Operation):
       # TODO(ptucker): Should this be allowed? Consider raising error.
       train_op = ops.convert_to_tensor(train_op).op
-- 
GitLab


From 1705b099df0fd7c2ea4abf83cfee896febeb8309 Mon Sep 17 00:00:00 2001
From: Simon Perkins <simon.perkins@gmail.com>
Date: Sat, 20 May 2017 00:06:37 +0200
Subject: [PATCH 1549/1563] Map Staging Area (#9686)

* Map Staging Area Operator

* Add map staging operators to the BUILD

* Don't be too clever about notifying waiting thread

* Add Staging Area Size op

* Use predicate form of condition_variable.wait

* Add a Staging Area clear op

* Add Peek op and capacity to the Staging Area

* map_stage_op.cpp -> map_stage_op.cc

* size should be int32

* Small improvements to staging test case

* Create BaseStagingArea

Containing common functionality to StagingArea and BaseStagingArea

* Add MapStagingArea test cases

* Add an ordering test

* Rename get() to peek()

* Combine pop(key) and popitem() into get(key=None)

* Block on peek methods

Wait for the requested element to be inserted into the staging area.

* Use constructor initializer lists

* Arrange class typedefs, members and methods

Also make previously public helper methods like HasBoundedCapacity() and
IsFull() private.

* Better docs for StagingArea.clear()

* SYCL_DEVICE MapStage => OrderedMapStage

* Initializer list fix

* device('/gpu:0') => test.gpu_device_name()

* Copyright year to 2017

* Reverse keys before random shuffle

* Python docstring updates

* Fix stage op docs

* Order RecordInput correctly

* Updated MapStage op docs

* Capture index by value instead of reference

Its just an int.

* Add support for Staging Area memory limit

Mostly useful for constraining the amount of memory used for Staging
Areas placed on the GPU.

* Use key Tensor as key rather than int64

* Pass dtypes to StagingMap

* CamelCase types

* Support barrier operation on the MapStagingArea

- It is now possible to insert incomplete elements.
- Key std::map and std::unordered_map on scalar Tensor int64
  (avoids unnecessary allocations)

* Remove shuffling to make test deterministic

* Use size_t for indices and positive quantities

* Fix lint errors

- autopep8 data_flow_ops.py indentation to 2 spaces.
- Alphabetically order data_flow lib dependencies in BUILD

* extra capacity() should be memory_limit()

* Run buildifier

* Fix OrderedMapIncompleteSize kernel name

* Fix device name in colocation test

Device name is "" if no GPU is present.

* Fix subtle size_t to int conversion bug

* Add #include <numeric> for windows builds

* Add #include <numeric> in stage_op.cc too
---
 tensorflow/core/kernels/BUILD                 |  10 +
 tensorflow/core/kernels/map_stage_op.cc       | 816 ++++++++++++++++++
 tensorflow/core/kernels/stage_op.cc           | 273 +++++-
 tensorflow/core/ops/data_flow_ops.cc          | 280 ++++++
 tensorflow/python/kernel_tests/BUILD          |  14 +
 .../python/kernel_tests/map_stage_op_test.py  | 383 ++++++++
 .../python/kernel_tests/stage_op_test.py      | 166 +++-
 tensorflow/python/ops/data_flow_ops.py        | 676 ++++++++++++---
 8 files changed, 2488 insertions(+), 130 deletions(-)
 create mode 100644 tensorflow/core/kernels/map_stage_op.cc
 create mode 100644 tensorflow/python/kernel_tests/map_stage_op_test.py

diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index 4e2df417cf..1365634bbf 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -288,6 +288,15 @@ tf_kernel_library(
     ],
 )
 
+tf_kernel_library(
+    name = "map_stage_op",
+    srcs = ["map_stage_op.cc"],
+    deps = [
+        "//tensorflow/core:framework",
+        "//tensorflow/core:lib",
+    ],
+)
+
 cc_library(
     name = "queue_base",
     srcs = ["queue_base.cc"],
@@ -1315,6 +1324,7 @@ cc_library(
         ":fifo_queue_op",
         ":lookup_table_init_op",
         ":lookup_table_op",
+        ":map_stage_op",
         ":padding_fifo_queue_op",
         ":priority_queue_op",
         ":queue_ops",
diff --git a/tensorflow/core/kernels/map_stage_op.cc b/tensorflow/core/kernels/map_stage_op.cc
new file mode 100644
index 0000000000..6ec7cce59c
--- /dev/null
+++ b/tensorflow/core/kernels/map_stage_op.cc
@@ -0,0 +1,816 @@
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================*/
+
+#include <map>
+#include <numeric>
+#include <unordered_map>
+#include <vector>
+
+#include "tensorflow/core/framework/op_kernel.h"
+#include "tensorflow/core/framework/resource_mgr.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
+#include "tensorflow/core/lib/gtl/optional.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/platform/env.h"
+#include "tensorflow/core/platform/mutex.h"
+
+namespace tensorflow {
+
+namespace {
+
+// Partial Ordering Comparator for Tensor keys containing scalar int64's
+struct KeyTensorLess {
+  bool operator()(const Tensor & lhs, const Tensor & rhs) const {
+    return std::less<int64>{}(lhs.scalar<int64>()(),
+                              rhs.scalar<int64>()());
+  }
+};
+
+// Key Equality operator for Tensor keys containing scalar int64's
+struct KeyTensorEqual {
+  bool operator()(const Tensor & lhs, const Tensor & rhs) const {
+    return std::equal_to<int64>{}(lhs.scalar<int64>()(),
+                                  rhs.scalar<int64>()());
+  }
+};
+
+// Hash for Tensor keys containing scalar int64's
+struct KeyTensorHash {
+  std::size_t operator()(const Tensor & key) const {
+    return std::hash<int64>{}(key.scalar<int64>()());
+  }
+};
+
+
+// General Template Definition
+template <bool Ordered, typename Data>
+struct MapTraits {};
+
+// Partially specialise for ordered
+template <typename Data>
+struct MapTraits<true, Data>
+{
+  typedef Tensor KeyType;
+  typedef Data DataType;
+  typedef std::map<KeyType, Data, KeyTensorLess> MapType;
+};
+
+// Partially specialise for unordered
+template <typename Data>
+struct MapTraits<false, Data>
+{
+  typedef Tensor KeyType;
+  typedef Data DataType;
+  typedef std::unordered_map<KeyType, Data,
+                            KeyTensorHash, KeyTensorEqual> MapType;
+};
+
+// Wrapper around map/unordered_map
+template <bool Ordered>
+class StagingMap : public ResourceBase
+{
+public:
+  // Public typedefs
+  typedef std::vector<Tensor> Tuple;
+  typedef gtl::optional<Tensor> OptionalTensor;
+  typedef std::vector<OptionalTensor> IncompleteTuple;
+
+  typedef MapTraits<Ordered, Tuple> MapTraits_;
+  typedef typename MapTraits_::MapType MapType;
+  typedef typename MapTraits_::KeyType KeyType;
+
+  typedef MapTraits<false, IncompleteTuple> IncompleteTraits;
+  typedef typename IncompleteTraits::MapType IncompleteType;
+
+private:
+  // Private variables
+  DataTypeVector dtypes_ GUARDED_BY(mu_);
+  std::size_t capacity_ GUARDED_BY(mu_);
+  std::size_t memory_limit_ GUARDED_BY(mu_);
+  std::size_t current_bytes_ GUARDED_BY(mu_);
+  mutex mu_;
+  condition_variable not_empty_;
+  condition_variable full_;
+  IncompleteType incomplete_ GUARDED_BY(mu_);
+  MapType map_ GUARDED_BY(mu_);
+
+private:
+  // private methods
+
+  // If map is configured for bounded capacity, notify
+  // waiting inserters that space is now available
+  void notify_inserters_if_bounded(mutex_lock & l)
+  {
+    if(has_capacity() || has_memory_limit())
+    {
+      l.unlock();
+      full_.notify_one();
+    }
+  }
+
+  // Notify any removers waiting to extract values
+  // that data is now available
+  void notify_removers(mutex_lock & l)
+  {
+      l.unlock();
+      not_empty_.notify_one();
+  }
+
+  inline bool has_capacity()
+    { return capacity_ > 0; }
+
+  inline bool has_memory_limit()
+    { return memory_limit_ > 0; }
+
+  inline bool would_exceed_memory_limit(std::size_t bytes)
+    { return bytes + current_bytes_ > memory_limit_; }
+
+  inline bool is_capacity_full()
+    { return map_.size() >= capacity_; }
+
+  // Get number of bytes in the tuple
+  inline std::size_t get_tuple_bytes(const Tuple & tuple)
+  {
+    return std::accumulate(tuple.begin(), tuple.end(), 0,
+      [](const std::size_t & lhs, const Tensor & rhs) {
+        return lhs + rhs.TotalBytes();
+    });
+  }
+
+  // Check that the index is within bounds
+  inline Status check_index(const Tensor & key, std::size_t index)
+  {
+    if(index >= dtypes_.size())
+    {
+      return Status(errors::InvalidArgument("Index '",
+        index, "' for key '", key.scalar<int64>()(),
+        "' was out of bounds '", dtypes_.size(), "'."));
+    }
+
+    return Status::OK();
+  }
+
+
+  // Check that the optional value at the specified index
+  // is uninitialized
+  inline Status check_index_uninitialized(const Tensor & key,
+                                  std::size_t index,
+                                  const IncompleteTuple & tuple)
+  {
+    if(tuple[index].has_value())
+    {
+      return Status(errors::InvalidArgument("The tensor for index '",
+        index, "' for key '", key.scalar<int64>()(),
+        "' was already initialized '", dtypes_.size(), "'."));
+    }
+
+    return Status::OK();
+  }
+
+  // Check that the indices are strictly ordered
+  inline Status check_index_ordering(const Tensor & indices)
+  {
+    auto findices = indices.flat<int>();
+
+    for(std::size_t i = 0; i < findices.dimension(0)-1; ++i)
+    {
+      if(findices(i) < findices(i+1))
+        { continue; }
+
+      return Status(errors::InvalidArgument("Indices are not "
+                                          "strictly ordered"));
+    }
+
+    return Status::OK();
+  }
+
+  // Check bytes are within memory limits memory limits
+  inline Status check_memory_limit(std::size_t bytes)
+  {
+    if(has_memory_limit() && bytes > memory_limit_) {
+      return Status(errors::ResourceExhausted("Attempted to insert "
+        "tensors with combined size of '", bytes, "' bytes into "
+        "Staging Area with a memory limit of '", memory_limit_, "'."));
+    }
+
+    return Status::OK();
+  }
+
+  // Insert incomplete data into the Barrier
+  Status put_incomplete(const KeyType & key,
+                        const Tensor & indices,
+                        Tuple *  tuple,
+                        mutex_lock &l)
+  {
+    auto findices = indices.flat<int>();
+
+    // Search for the key in our incomplete set
+    auto it = incomplete_.find(key);
+
+    // Check that the tuple fits within the memory limit
+    std::size_t tuple_bytes = get_tuple_bytes(*tuple);
+    TF_RETURN_IF_ERROR(check_memory_limit(tuple_bytes));
+
+    if(has_memory_limit())
+    {
+      full_.wait(l, [tuple_bytes, this]() {
+        // Stop waiting if we don't exceed the memory limit
+        return !would_exceed_memory_limit(tuple_bytes);
+      });
+    }
+
+    // This key isn't present in the incomplete set
+    // Create IncompleteTuple and insert
+    if(it == incomplete_.end())
+    {
+      IncompleteTuple empty(dtypes_.size());
+
+      // Initialise empty tuple with given dta
+      for(std::size_t i = 0; i < findices.dimension(0); ++i)
+      {
+        std::size_t index = findices(i);
+        TF_RETURN_IF_ERROR(check_index(key, index));
+
+        // Assign tuple at this index
+        empty[index] = std::move((*tuple)[i]);
+      }
+
+      // Insert into incomplete map
+      incomplete_.insert({key, std::move(empty)});
+
+      // Increment size
+      current_bytes_ += tuple_bytes;
+    }
+    // Found an entry in the incomplete index
+    // Update with given data and insert complete entries
+    // into the main map
+    else
+    {
+      // Reference existing incomplete tuple
+      IncompleteTuple & present = it->second;
+
+      // Assign given data
+      for(std::size_t i = 0; i < findices.dimension(0); ++i)
+      {
+        std::size_t index = findices(i);
+        TF_RETURN_IF_ERROR(check_index(key, index));
+        TF_RETURN_IF_ERROR(check_index_uninitialized(key,
+                                                    index, present));
+
+        // Assign tuple at this index
+        present[index] = std::move((*tuple)[i]);
+      }
+
+      // Increment size
+      current_bytes_ += tuple_bytes;
+
+      // Do we have values at all tuple elements?
+      bool complete = std::all_of(present.begin(), present.end(),
+        [](const OptionalTensor & v) { return v.has_value(); });
+
+      // If so, put the tuple in the actual map
+      if(complete)
+      {
+        // Create a tuple for insertion
+        Tuple new_tuple;
+
+        for(const auto & v: present)
+          { new_tuple.push_back(v.value()); }
+
+        // Remove from incomplete
+        incomplete_.erase(it);
+
+        TF_RETURN_IF_ERROR(put_complete(key, &new_tuple, l));
+      }
+    }
+
+    return Status::OK();
+  }
+
+  // Does the insertion into the actual staging area
+  Status put_complete(const KeyType & key, Tuple * tuple,
+                    mutex_lock & l)
+  {
+    // Insert key and tuples into the map
+    map_.insert({key, std::move(*tuple)});
+
+    notify_removers(l);
+
+    return Status::OK();
+  }
+
+public:
+  // public methods
+  explicit StagingMap(const DataTypeVector & dtypes,
+          std::size_t capacity, std::size_t memory_limit) :
+      dtypes_(dtypes),
+      capacity_(capacity),
+      memory_limit_(memory_limit),
+      current_bytes_(0) {}
+
+  Status put(KeyType* key, const Tensor * indices,
+              Tuple* tuple)
+  {
+    mutex_lock l(mu_);
+
+    // Sanity check the indices
+    TF_RETURN_IF_ERROR(check_index_ordering(*indices));
+
+    // Handle incomplete inserts
+    if(indices->NumElements() != dtypes_.size())
+    {
+      return put_incomplete(*key, *indices, tuple, l);
+    }
+
+    std::size_t tuple_bytes = get_tuple_bytes(*tuple);
+    // Check that tuple_bytes fits within the memory limit
+    TF_RETURN_IF_ERROR(check_memory_limit(tuple_bytes));
+
+    // If map capacity is bounded wait until map is not full
+    if(has_capacity() || has_memory_limit()) {
+      full_.wait(l, [tuple_bytes, this]() {
+        // If there's a memory limit, check if there's space for insertion
+        bool memory_limit_valid = has_memory_limit() ?
+              !would_exceed_memory_limit(tuple_bytes) : true;
+        // If we're configured for capacity check if there's space for insertion
+        bool capacity_valid = has_capacity() ? !is_capacity_full() : true;
+
+        // Stop waiting upon success for both conditions
+        return memory_limit_valid && capacity_valid;
+      });
+    }
+
+    // Do the put operation
+    TF_RETURN_IF_ERROR(put_complete(*key, tuple, l));
+
+    // Update the current size
+    current_bytes_ += tuple_bytes;
+
+    return Status::OK();
+  }
+
+  Status get(const KeyType* key, Tuple* tuple)
+  {
+    mutex_lock l(mu_);
+
+    typename MapType::const_iterator it;
+
+    // Wait until the element with the requested key is present
+    not_empty_.wait(l, [&, this]() {
+      it = map_.find(*key);
+      return it != map_.end();
+    });
+
+    // Copy tensors into the tuple
+    for(const auto & tensor : it->second)
+      { tuple->push_back(tensor); }
+
+    // Update bytes in the Staging Area
+    current_bytes_ -= get_tuple_bytes(*tuple);
+
+    return Status::OK();
+  }
+
+  Status pop(const KeyType* key, Tuple* tuple)
+  {
+    mutex_lock l(mu_);
+
+    typename MapType::iterator it;
+
+    // Wait until the element with the requested key is present
+    not_empty_.wait(l, [&, this]() {
+      it = map_.find(*key);
+      return it != this->map_.end();
+    });
+
+    // Move from the entry as its erased anyway
+    *tuple = std::move(it->second);
+
+    // Remove
+    map_.erase(it);
+
+    // Update bytes in the Staging Area
+    current_bytes_ -= get_tuple_bytes(*tuple);
+
+    notify_inserters_if_bounded(l);
+
+    return Status::OK();
+  }
+
+  Status popitem(KeyType* key, Tuple* tuple)
+  {
+    mutex_lock l(mu_);
+
+    // Wait until map is not empty
+    not_empty_.wait(l, [this]() { return !this->map_.empty(); });
+
+    // Move from the first element and erase it
+    *tuple = std::move(map_.begin()->second);
+    *key = map_.begin()->first;
+    map_.erase(map_.begin());
+
+    // Update bytes in the Staging Area
+    current_bytes_ -= get_tuple_bytes(*tuple);
+
+    notify_inserters_if_bounded(l);
+
+    return Status::OK();
+  }
+
+  Status clear()
+  {
+    mutex_lock l(mu_);
+    map_.clear();
+    incomplete_.clear();
+    current_bytes_ = 0;
+
+    notify_inserters_if_bounded(l);
+
+    return Status::OK();
+  }
+
+  size_t incomplete_size()
+  {
+    mutex_lock l(mu_);
+    return incomplete_.size();
+  }
+
+  size_t size()
+  {
+    // Lock the map and return the size
+    mutex_lock l(mu_);
+    return map_.size();
+  }
+
+  string DebugString()
+  {
+    return "StagingMap";
+  }
+};
+
+template <bool Ordered>
+Status GetStagingMap(OpKernelContext* ctx,
+                    const NodeDef& ndef,
+                    StagingMap<Ordered>** map)
+{
+  auto rm = ctx->resource_manager();
+  ContainerInfo cinfo;
+
+  // Lambda for creating the Staging Area
+  auto create_fn = [&ndef](StagingMap<Ordered>** ret) -> Status
+  {
+    DataTypeVector dtypes;
+    int64 capacity;
+    int64 memory_limit;
+    TF_RETURN_IF_ERROR(GetNodeAttr(ndef, "dtypes", &dtypes));
+    TF_RETURN_IF_ERROR(GetNodeAttr(ndef, "capacity", &capacity));
+    TF_RETURN_IF_ERROR(GetNodeAttr(ndef, "memory_limit", &memory_limit));
+    *ret = new StagingMap<Ordered>(dtypes, capacity, memory_limit);
+    return Status::OK();
+  };
+
+  TF_RETURN_IF_ERROR(cinfo.Init(rm, ndef, true /* use name() */));
+  TF_RETURN_IF_ERROR(rm->LookupOrCreate<StagingMap<Ordered>>(
+                        cinfo.container(), cinfo.name(),
+                        map, create_fn));
+  return Status::OK();
+}
+
+template <bool Ordered>
+class MapStageOp : public OpKernel
+{
+ public:
+  explicit MapStageOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override {
+    StagingMap<Ordered>* map = nullptr;
+    OP_REQUIRES_OK(ctx, GetStagingMap(ctx, def(), &map));
+    core::ScopedUnref scope(map);
+    typename StagingMap<Ordered>::Tuple tuple;
+
+    const Tensor * key_tensor;
+    const Tensor * indices_tensor;
+    OpInputList values_tensor;
+
+    OP_REQUIRES_OK(ctx, ctx->input("key", &key_tensor));
+    OP_REQUIRES_OK(ctx, ctx->input("indices", &indices_tensor));
+    OP_REQUIRES_OK(ctx, ctx->input_list("values", &values_tensor));
+
+    // Create copy for insertion into Staging Area
+    Tensor key(*key_tensor);
+
+    // Create the tuple to store
+    for (std::size_t i = 0; i < values_tensor.size(); ++i) {
+      tuple.push_back(values_tensor[i]);
+    }
+
+    // Store the tuple in the map
+    OP_REQUIRES_OK(ctx, map->put(&key, indices_tensor, &tuple));
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapStage").Device(DEVICE_CPU),
+                      MapStageOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapStage").Device(DEVICE_CPU),
+                      MapStageOp<true>);
+
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("MapStage")
+                      .HostMemory("key")
+                      .HostMemory("indices")
+                      .Device(DEVICE_GPU), MapStageOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapStage")
+                      .HostMemory("key")
+                      .HostMemory("indices")
+                      .Device(DEVICE_GPU), MapStageOp<true>);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("MapStage").HostMemory("key")
+                      .Device(DEVICE_SYCL), MapStageOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapStage").HostMemory("key")
+                      .Device(DEVICE_SYCL), MapStageOp<true>);
+
+#endif // TENSORFLOW_USE_SYCL
+
+template <bool Ordered>
+class MapUnstageOp : public OpKernel
+{
+ public:
+  explicit MapUnstageOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  // Using this op in such a way that it blocks forever
+  // is an error.  As such cancellation is not handled.
+  void Compute(OpKernelContext* ctx) override {
+    StagingMap<Ordered>* map = nullptr;
+    OP_REQUIRES_OK(ctx, GetStagingMap(ctx, def(), &map));
+    core::ScopedUnref scope(map);
+    typename StagingMap<Ordered>::Tuple tuple;
+
+    const Tensor * key_tensor;
+    OpInputList values_tensor;
+
+    OP_REQUIRES_OK(ctx, ctx->input("key", &key_tensor));
+    OP_REQUIRES_OK(ctx, map->pop(key_tensor, &tuple));
+
+    OP_REQUIRES(
+        ctx, tuple.size() == (size_t)ctx->num_outputs(),
+        errors::InvalidArgument("Mismatch stage/unstage: ", tuple.size(),
+                                " vs. ", ctx->num_outputs()));
+    for (size_t i = 0; i < tuple.size(); ++i) {
+      ctx->set_output(i, tuple[i]);
+    }
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapUnstage").Device(DEVICE_CPU),
+                            MapUnstageOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapUnstage").Device(DEVICE_CPU),
+                            MapUnstageOp<true>);
+
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("MapUnstage").HostMemory("key")
+                            .Device(DEVICE_GPU), MapUnstageOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapUnstage").HostMemory("key")
+                            .Device(DEVICE_GPU), MapUnstageOp<true>);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("MapUnstage").HostMemory("key")
+                            .Device(DEVICE_SYCL), MapUnstageOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapUnstage").HostMemory("key")
+                            .Device(DEVICE_SYCL), MapUnstageOp<true>);
+#endif // TENSORFLOW_USE_SYCL
+
+template <bool Ordered>
+class MapPeekOp : public OpKernel
+{
+ public:
+  explicit MapPeekOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  // Using this op in such a way that it blocks forever
+  // is an error.  As such cancellation is not handled.
+  void Compute(OpKernelContext* ctx) override {
+    StagingMap<Ordered>* map = nullptr;
+    OP_REQUIRES_OK(ctx, GetStagingMap(ctx, def(), &map));
+    core::ScopedUnref scope(map);
+    typename StagingMap<Ordered>::Tuple tuple;
+
+    const Tensor * key_tensor;
+    OpInputList values_tensor;
+
+    OP_REQUIRES_OK(ctx, ctx->input("key", &key_tensor));
+    OP_REQUIRES_OK(ctx, map->get(key_tensor, &tuple));
+
+    OP_REQUIRES(
+        ctx, tuple.size() == (size_t)ctx->num_outputs(),
+        errors::InvalidArgument("Mismatch stage/unstage: ", tuple.size(),
+                                " vs. ", ctx->num_outputs()));
+    for (size_t i = 0; i < tuple.size(); ++i) {
+      ctx->set_output(i, tuple[i]);
+    }
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapPeek").Device(DEVICE_CPU),
+                      MapPeekOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapPeek").Device(DEVICE_CPU),
+                      MapPeekOp<true>);
+
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("MapPeek").HostMemory("key")
+                      .Device(DEVICE_GPU), MapPeekOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapPeek").HostMemory("key")
+                      .Device(DEVICE_GPU), MapPeekOp<true>);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("MapPeek").HostMemory("key")
+                      .Device(DEVICE_SYCL), MapPeekOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapPeek").HostMemory("key")
+                      .Device(DEVICE_SYCL), MapPeekOp<true>);
+#endif // TENSORFLOW_USE_SYCL
+
+
+
+template <bool Ordered>
+class MapUnstageNoKeyOp : public OpKernel
+{
+ public:
+  explicit MapUnstageNoKeyOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  // Using this op in such a way that it blocks forever
+  // is an error.  As such cancellation is not handled.
+  void Compute(OpKernelContext* ctx) override {
+    StagingMap<Ordered>* map = nullptr;
+    OP_REQUIRES_OK(ctx, GetStagingMap(ctx, def(), &map));
+    core::ScopedUnref scope(map);
+
+    // Pop a random (key, value) off the map
+    typename StagingMap<Ordered>::KeyType key;
+    typename StagingMap<Ordered>::Tuple tuple;
+
+    OP_REQUIRES_OK(ctx, map->popitem(&key, &tuple));
+
+    // Allocate a key tensor and assign the key as the first output
+    ctx->set_output(0, key);
+
+    // Set the rest of the outputs to the tuple Tensors
+    OP_REQUIRES(ctx,
+      tuple.size() == (size_t)ctx->num_outputs()-1,
+      errors::InvalidArgument("Mismatch stage/unstage: ", tuple.size(),
+                              " vs. ", ctx->num_outputs()-1));
+    for (size_t i = 0; i < tuple.size(); ++i)
+    {
+      ctx->set_output(i+1, tuple[i]);
+    }
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapUnstageNoKey").Device(DEVICE_CPU),
+                      MapUnstageNoKeyOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapUnstageNoKey").Device(DEVICE_CPU),
+                      MapUnstageNoKeyOp<true>);
+
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("MapUnstageNoKey").HostMemory("key")
+                      .Device(DEVICE_GPU), MapUnstageNoKeyOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapUnstageNoKey").HostMemory("key")
+                      .Device(DEVICE_GPU), MapUnstageNoKeyOp<true>);
+
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("MapUnstageNoKey").HostMemory("key")
+                      .Device(DEVICE_SYCL), MapUnstageNoKeyOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapUnstageNoKey").HostMemory("key")
+                      .Device(DEVICE_SYCL), MapUnstageNoKeyOp<true>);
+#endif // TENSORFLOW_USE_SYCL
+
+
+template <bool Ordered>
+class MapSizeOp : public OpKernel
+{
+ public:
+  explicit MapSizeOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override
+  {
+    StagingMap<Ordered>* map = nullptr;
+    OP_REQUIRES_OK(ctx, GetStagingMap(ctx, def(), &map));
+    core::ScopedUnref scope(map);
+
+    // Allocate size output tensor
+    Tensor * size = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}),
+                                                     &size));
+
+    // Set it to the actual size
+    size->scalar<int32>().setConstant(map->size());
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapSize").Device(DEVICE_CPU),
+                        MapSizeOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapSize").Device(DEVICE_CPU),
+                        MapSizeOp<true>);
+
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("MapSize").Device(DEVICE_GPU)
+                        .HostMemory("size"), MapSizeOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapSize").Device(DEVICE_GPU)
+                        .HostMemory("size"), MapSizeOp<true>);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("MapSize").Device(DEVICE_SYCL)
+                        .HostMemory("size"), MapSizeOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapSize").Device(DEVICE_SYCL)
+                        .HostMemory("size"), MapSizeOp<true>);
+#endif // TENSORFLOW_USE_SYCL
+
+template <bool Ordered>
+class MapIncompleteSizeOp : public OpKernel
+{
+ public:
+  explicit MapIncompleteSizeOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override
+  {
+    StagingMap<Ordered>* map = nullptr;
+    OP_REQUIRES_OK(ctx, GetStagingMap(ctx, def(), &map));
+    core::ScopedUnref scope(map);
+
+    // Allocate size output tensor
+    Tensor * size = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}),
+                                                     &size));
+
+    // Set it to the actual size
+    size->scalar<int32>().setConstant(map->incomplete_size());
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapIncompleteSize").Device(DEVICE_CPU),
+                        MapIncompleteSizeOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapIncompleteSize").Device(DEVICE_CPU),
+                        MapIncompleteSizeOp<true>);
+
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("MapIncompleteSize").Device(DEVICE_GPU)
+                        .HostMemory("size"), MapIncompleteSizeOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapIncompleteSize").Device(DEVICE_GPU)
+                        .HostMemory("size"), MapIncompleteSizeOp<true>);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("MapIncompleteSize").Device(DEVICE_SYCL)
+                        .HostMemory("size"), MapIncompleteSizeOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapIncompleteSize").Device(DEVICE_SYCL)
+                        .HostMemory("size"), MapIncompleteSizeOp<true>);
+#endif // TENSORFLOW_USE_SYCL
+
+template <bool Ordered>
+class MapClearOp : public OpKernel
+{
+ public:
+  explicit MapClearOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  void Compute(OpKernelContext* ctx) override
+  {
+    StagingMap<Ordered>* map = nullptr;
+    OP_REQUIRES_OK(ctx, GetStagingMap(ctx, def(), &map));
+    core::ScopedUnref scope(map);
+
+    OP_REQUIRES_OK(ctx, map->clear());
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("MapClear").Device(DEVICE_CPU),
+                        MapClearOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapClear").Device(DEVICE_CPU),
+                        MapClearOp<true>);
+
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("MapClear").Device(DEVICE_GPU),
+                        MapClearOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapClear").Device(DEVICE_GPU),
+                        MapClearOp<true>);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("MapClear").Device(DEVICE_SYCL),
+                        MapClearOp<false>);
+REGISTER_KERNEL_BUILDER(Name("OrderedMapClear").Device(DEVICE_SYCL),
+                        MapClearOp<true>);
+#endif // TENSORFLOW_USE_SYCL
+
+}  // namespace
+
+}  // namespace tensorflow
diff --git a/tensorflow/core/kernels/stage_op.cc b/tensorflow/core/kernels/stage_op.cc
index 161ba89212..45168112cc 100644
--- a/tensorflow/core/kernels/stage_op.cc
+++ b/tensorflow/core/kernels/stage_op.cc
@@ -1,4 +1,4 @@
-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@ limitations under the License.
 ==============================================================================*/
 
 #include <deque>
+#include <numeric>
 #include <vector>
 
 #include "tensorflow/core/framework/op_kernel.h"
@@ -30,26 +31,153 @@ namespace {
 
 class Buffer : public ResourceBase {
  public:
-  explicit Buffer() {}
-
+  // public types
   typedef std::vector<Tensor> Tuple;
 
+ private:
+  // private variables
+  std::size_t capacity_;
+  std::size_t memory_limit_;
+  std::size_t current_bytes_;
+  mutex mu_;
+  condition_variable non_empty_cond_var_;
+  condition_variable full_cond_var_;
+  std::deque<Tuple> buf_ GUARDED_BY(mu_);
+
+
+ private:
+  // private methods
+
+  // If the buffer is configured for bounded capacity, notify
+  // waiting inserters that space is now available
+  void notify_inserters_if_bounded(mutex_lock & l)
+  {
+    if(IsBounded())
+    {
+      l.unlock();
+      full_cond_var_.notify_one();
+    }
+  }
+
+  // Are there a limit number of elements or a memory limit
+  // configued on this buffer?
+  bool IsBounded() {
+    return capacity_ > 0 || memory_limit_ > 0;
+  }
+
+  bool IsCapacityFull() {
+    return buf_.size() >= capacity_;
+  }
+
+  bool WouldExceedMemoryLimit(std::size_t bytes) {
+    return bytes + current_bytes_ > memory_limit_;
+  }
+
+  std::size_t GetTupleBytes(const Tuple & tuple)
+  {
+    return std::accumulate(tuple.begin(), tuple.end(), 0,
+      [](const std::size_t & lhs, const Tensor & rhs) {
+        return lhs + rhs.TotalBytes();
+    });
+  }
+
+ public:
+  // public methods
+  explicit Buffer(std::size_t capacity, std::size_t memory_limit) :
+      capacity_(capacity),
+      memory_limit_(memory_limit),
+      current_bytes_(0) {}
+
   // the Buffer takes ownership of the Tuple
-  void Put(Tuple* tuple) {
+  Status Put(Tuple* tuple) {
     mutex_lock l(mu_);
+
+    std::size_t tuple_bytes = GetTupleBytes(*tuple);
+
+    // Sanity check so that we don't block for ever below
+    if(memory_limit_ > 0 && tuple_bytes > memory_limit_) {
+      return Status(errors::ResourceExhausted("Attempted to insert "
+        "tensors with combined size of '", tuple_bytes, "' bytes into "
+        "Staging Area with a memory limit of '", memory_limit_, "'."));
+    }
+
+
+    // If buffer capacity is bounded wait until elements have been removed
+    if(IsBounded()) {
+      full_cond_var_.wait(l, [tuple_bytes, this]() {
+        // If there's a memory limit, check if there's space for insertion
+        bool memory_limit_valid = memory_limit_ > 0 ?
+            !WouldExceedMemoryLimit(tuple_bytes) : true;
+        // If we're configured for capacity check if there's space for insertion
+        bool capacity_valid = capacity_ > 0 ? !IsCapacityFull() : true;
+
+        // Stop waiting upon success for both conditions
+        return capacity_valid && memory_limit_valid;
+      });
+    }
+
+    // Update bytes in the Staging Area
+    current_bytes_ += tuple_bytes;
+
+    // Store tuple
     buf_.push_back(std::move(*tuple));
-    non_empty_cond_var_.notify_one();  // maybe possible to optimize by reducing
-                                       // how often this signal is sent
+
+    l.unlock();
+    // maybe possible to optimize by reducing
+    // how often this signal is sent
+    non_empty_cond_var_.notify_one();
+
+    return Status::OK();
   }
 
+  // Get tuple at front of the buffer
   void Get(Tuple* tuple) {  // TODO(zhifengc): Support cancellation.
     mutex_lock l(mu_);
-    while (buf_.empty()) {
-      non_empty_cond_var_.wait(l);
-    }
 
+    // Wait for data if the buffer is empty
+    non_empty_cond_var_.wait(l, [this]() {
+      return !buf_.empty();
+    });
+
+    // Move data into the output tuple
     *tuple = std::move(buf_.front());
     buf_.pop_front();
+
+    // Update bytes in the Staging Area
+    current_bytes_ -= GetTupleBytes(*tuple);
+
+    notify_inserters_if_bounded(l);
+  }
+
+  // Return tuple at index
+  Status Peek(std::size_t index, Tuple* tuple) {
+    mutex_lock l(mu_);
+
+    // Wait if the requested index is not available
+    non_empty_cond_var_.wait(l, [index, this]() {
+      return index < this->buf_.size();
+    });
+
+    // Place tensors in the output tuple
+    for(const auto & tensor: buf_[index]) {
+      tuple->push_back(tensor);
+    }
+
+    return Status::OK();
+  }
+
+  // Buffer size
+  size_t Size() {
+    mutex_lock l(mu_);
+    return buf_.size();
+  }
+
+  void Clear() {
+    mutex_lock l(mu_);
+    buf_.clear();
+    current_bytes_ = 0;
+
+    notify_inserters_if_bounded(l);
   }
 
   string DebugString() {
@@ -57,23 +185,27 @@ class Buffer : public ResourceBase {
     return strings::StrCat("Staging size: ", buf_.size());
   }
 
- private:
-  mutex mu_;
-  condition_variable non_empty_cond_var_;
-  std::deque<Tuple> buf_ GUARDED_BY(mu_);
 };
 
-Status CreateBuffer(Buffer** ret) {
-  *ret = new Buffer;
-  return Status::OK();
-}
-
 Status GetBuffer(OpKernelContext* ctx, const NodeDef& ndef, Buffer** buf) {
   auto rm = ctx->resource_manager();
   ContainerInfo cinfo;
+
+  // Lambda for creating the Staging Area
+  auto create_fn = [&ndef](Buffer** ret) -> Status
+  {
+    int64 capacity;
+    int64 memory_limit;
+    TF_RETURN_IF_ERROR(GetNodeAttr(ndef, "capacity", &capacity));
+    TF_RETURN_IF_ERROR(GetNodeAttr(ndef, "memory_limit", &memory_limit));
+    *ret = new Buffer(capacity, memory_limit);
+    return Status::OK();
+  };
+
+
   TF_RETURN_IF_ERROR(cinfo.Init(rm, ndef, true /* use name() */));
   TF_RETURN_IF_ERROR(rm->LookupOrCreate<Buffer>(cinfo.container(), cinfo.name(),
-                                                buf, CreateBuffer));
+                                                buf, create_fn));
   return Status::OK();
 }
 
@@ -88,10 +220,10 @@ class StageOp : public OpKernel {
     OP_REQUIRES_OK(ctx, GetBuffer(ctx, def(), &buf));
     core::ScopedUnref scope(buf);
     Buffer::Tuple tuple;
-    for (int i = 0; i < ctx->num_inputs(); ++i) {
+    for (std::size_t i = 0; i < ctx->num_inputs(); ++i) {
       tuple.push_back(ctx->input(i));
     }
-    buf->Put(&tuple);
+    OP_REQUIRES_OK(ctx, buf->Put(&tuple));
   }
 };
 
@@ -114,11 +246,13 @@ class UnstageOp : public OpKernel {
     OP_REQUIRES_OK(ctx, GetBuffer(ctx, def(), &buf));
     core::ScopedUnref scope(buf);
     Buffer::Tuple tuple;
+
     buf->Get(&tuple);
-    OP_REQUIRES(
-        ctx, tuple.size() == (size_t)ctx->num_outputs(),
+
+    OP_REQUIRES(ctx, tuple.size() == (size_t)ctx->num_outputs(),
         errors::InvalidArgument("Mismatch stage/unstage: ", tuple.size(),
                                 " vs. ", ctx->num_outputs()));
+
     for (size_t i = 0; i < tuple.size(); ++i) {
       ctx->set_output(i, tuple[i]);
     }
@@ -133,4 +267,97 @@ REGISTER_KERNEL_BUILDER(Name("Unstage").Device(DEVICE_GPU), UnstageOp);
 REGISTER_KERNEL_BUILDER(Name("Unstage").Device(DEVICE_SYCL), UnstageOp);
 #endif // TENSORFLOW_USE_SYCL
 
+class StagePeekOp : public OpKernel {
+ public:
+  explicit StagePeekOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  // Using this op in such a way that it blocks forever
+  // is an error.  As such cancellation is not handled.
+  void Compute(OpKernelContext* ctx) override {
+    Buffer* buf = nullptr;
+    OP_REQUIRES_OK(ctx, GetBuffer(ctx, def(), &buf));
+    core::ScopedUnref scope(buf);
+    Buffer::Tuple tuple;
+
+    std::size_t index = ctx->input(0).scalar<int>()();
+
+    OP_REQUIRES_OK(ctx, buf->Peek(index, &tuple));
+
+    OP_REQUIRES(ctx, tuple.size() == (size_t)ctx->num_outputs(),
+        errors::InvalidArgument("Mismatch stage/unstage: ", tuple.size(),
+                                " vs. ", ctx->num_outputs()));
+
+    for (size_t i = 0; i < tuple.size(); ++i) {
+      ctx->set_output(i, tuple[i]);
+    }
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("StagePeek").Device(DEVICE_CPU),
+                                              StagePeekOp);
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("StagePeek").HostMemory("index").
+                            Device(DEVICE_GPU), StagePeekOp);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("StagePeek").HostMemory("index")
+                          .Device(DEVICE_SYCL), StagePeekOp);
+#endif // TENSORFLOW_USE_SYCL
+
+
+class StageSizeOp : public OpKernel {
+ public:
+  explicit StageSizeOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  // Using this op in such a way that it blocks forever
+  // is an error.  As such cancellation is not handled.
+  void Compute(OpKernelContext* ctx) override {
+    Buffer* buf = nullptr;
+    OP_REQUIRES_OK(ctx, GetBuffer(ctx, def(), &buf));
+    core::ScopedUnref scope(buf);
+
+    // Allocate size output tensor
+    Tensor * size = nullptr;
+    OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape({}),
+                                                     &size));
+
+    // Set it to the actual size
+    size->scalar<int32>().setConstant(buf->Size());
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("StageSize").Device(DEVICE_CPU), StageSizeOp);
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("StageSize").HostMemory("size")
+                        .Device(DEVICE_GPU), StageSizeOp);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("StageSize").HostMemory("size")
+                        .Device(DEVICE_SYCL), StageSizeOp);
+#endif // TENSORFLOW_USE_SYCL
+
+class StageClearOp : public OpKernel {
+ public:
+  explicit StageClearOp(OpKernelConstruction* ctx) : OpKernel(ctx) {}
+
+  // Using this op in such a way that it blocks forever
+  // is an error.  As such cancellation is not handled.
+  void Compute(OpKernelContext* ctx) override {
+    Buffer* buf = nullptr;
+    OP_REQUIRES_OK(ctx, GetBuffer(ctx, def(), &buf));
+    core::ScopedUnref scope(buf);
+
+    buf->Clear();
+  }
+};
+
+REGISTER_KERNEL_BUILDER(Name("StageClear").Device(DEVICE_CPU), StageClearOp);
+#if GOOGLE_CUDA
+REGISTER_KERNEL_BUILDER(Name("StageClear").Device(DEVICE_GPU), StageClearOp);
+#endif
+#ifdef TENSORFLOW_USE_SYCL
+REGISTER_KERNEL_BUILDER(Name("StageClear").Device(DEVICE_SYCL), StageClearOp);
+#endif // TENSORFLOW_USE_SYCL
+
+
 }  // namespace tensorflow
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index c80ff983cf..2be804acbf 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -1967,6 +1967,8 @@ handle: The handle for a tensor stored in the session state.
 
 REGISTER_OP("Stage")
     .Input("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
     .Attr("dtypes: list(type)")
     .Attr("container: string = ''")
     .Attr("shared_name: string = ''")
@@ -1979,6 +1981,11 @@ The basic functionality of this Op is similar to a queue with many
 fewer capabilities and options.  This Op is optimized for performance.
 
 values: a list of tensors
+dtypes A list of data types that inserted values should adhere to.
+capacity: Maximum number of elements in the Staging Area. If > 0, inserts
+  on the container will block when the capacity is reached.
+memory_limit: The maximum number of bytes allowed for Tensors in the Staging Area.
+  If > 0, inserts will block until sufficient space is available.
 container: If non-empty, this queue is placed in the given container. Otherwise,
   a default container is used.
 shared_name: It is necessary to match this name to the matching Unstage Op.
@@ -1986,6 +1993,8 @@ shared_name: It is necessary to match this name to the matching Unstage Op.
 
 REGISTER_OP("Unstage")
     .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
     .Attr("dtypes: list(type)")
     .Attr("container: string = ''")
     .Attr("shared_name: string = ''")
@@ -1998,6 +2007,277 @@ The basic funtionality is similar to dequeue with many fewer
 capabilities and options.  This Op is optimized for performance.
 )doc");
 
+REGISTER_OP("StagePeek")
+    .Input("index: int32")
+    .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op peeks at the values at the specified index.  If the
+underlying container does not contain sufficient elements
+this op will block until it does.   This Op is optimized for
+performance.
+    )doc");
+
+
+REGISTER_OP("StageSize")
+    .Output("size: int32")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(shape_inference::ScalarShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op returns the number of elements in the underlying container.
+    )doc");
+
+REGISTER_OP("StageClear")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op removes all elements in the underlying container.
+    )doc");
+
+// UnorderedMap
+REGISTER_OP("MapStage")
+    .Input("key: int64")
+    .Input("indices: int32")
+    .Input("values: fake_dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("fake_dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::NoOutputs)
+    .SetIsStateful()
+    .Doc(R"doc(
+Stage (key, values) in the underlying container which behaves like a hashtable.
+
+key: int64
+values: a list of tensors
+dtypes A list of data types that inserted values should adhere to.
+capacity: Maximum number of elements in the Staging Area. If > 0, inserts
+  on the container will block when the capacity is reached.
+container: If non-empty, this queue is placed in the given container. Otherwise,
+  a default container is used.
+shared_name: It is necessary to match this name to the matching Unstage Op.
+)doc");
+
+REGISTER_OP("MapPeek")
+    .Input("key: int64")
+    .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op peeks at the values at the specified key.  If the
+underlying container does not contain this key
+this op will block until it does.
+    )doc");
+
+REGISTER_OP("MapUnstage")
+    .Input("key: int64")
+    .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op removes and returns the values associated with the key
+from the underlying container.   If the underlying container
+does not contain this key, the op will block until it does.
+    )doc");
+
+REGISTER_OP("MapUnstageNoKey")
+    .Output("key: int64")
+    .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op removes and returns a random (key, value)
+from the underlying container.   If the underlying container
+does not contain elements, the op will block until it does.
+      )doc");
+
+REGISTER_OP("MapSize")
+    .Output("size: int32")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::ScalarShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op returns the number of elements in the underlying container.
+    )doc");
+
+REGISTER_OP("MapIncompleteSize")
+    .Output("size: int32")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::ScalarShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op returns the number of incomplete elements in the underlying container.
+    )doc");
+
+
+REGISTER_OP("MapClear")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::NoOutputs)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op removes all elements in the underlying container.
+    )doc");
+
+
+// OrderedMap
+REGISTER_OP("OrderedMapStage")
+    .Input("key: int64")
+    .Input("indices: int32")
+    .Input("values: fake_dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("fake_dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::NoOutputs)
+    .SetIsStateful()
+    .Doc(R"doc(
+Stage (key, values) in the underlying container which behaves like a ordered
+associative container.   Elements are ordered by key.
+
+key: int64
+values: a list of tensors
+dtypes A list of data types that inserted values should adhere to.
+capacity: Maximum number of elements in the Staging Area. If > 0, inserts
+  on the container will block when the capacity is reached.
+container: If non-empty, this queue is placed in the given container. Otherwise,
+  a default container is used.
+shared_name: It is necessary to match this name to the matching Unstage Op.
+)doc");
+
+REGISTER_OP("OrderedMapPeek")
+    .Input("key: int64")
+    .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op peeks at the values at the specified key.  If the
+underlying container does not contain this key
+this op will block until it does.   This Op is optimized for
+performance.
+    )doc");
+
+REGISTER_OP("OrderedMapUnstage")
+    .Input("key: int64")
+    .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op removes and returns the values associated with the key
+from the underlying container.   If the underlying container
+does not contain this key, the op will block until it does.
+    )doc");
+
+REGISTER_OP("OrderedMapUnstageNoKey")
+    .Output("key: int64")
+    .Output("values: dtypes")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::UnknownShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op removes and returns the (key, value) element with the smallest
+key from the underlying container.   If the underlying container
+does not contain elements, the op will block until it does.
+      )doc");
+
+REGISTER_OP("OrderedMapSize")
+    .Output("size: int32")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::ScalarShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op returns the number of elements in the underlying container.
+    )doc");
+
+REGISTER_OP("OrderedMapIncompleteSize")
+    .Output("size: int32")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::ScalarShape)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op returns the number of incomplete elements in the underlying container.
+    )doc");
+
+REGISTER_OP("OrderedMapClear")
+    .Attr("capacity: int >= 0 = 0")
+    .Attr("memory_limit: int >= 0 = 0")
+    .Attr("dtypes: list(type)")
+    .Attr("container: string = ''")
+    .Attr("shared_name: string = ''")
+    .SetShapeFn(tensorflow::shape_inference::NoOutputs)
+    .SetIsStateful()
+    .Doc(R"doc(
+Op removes all elements in the underlying container.
+    )doc");
+
 REGISTER_OP("RecordInput")
     .Output("records: string")
     .Attr("file_pattern: string")
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 57325d124b..88754015a6 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -2339,6 +2339,20 @@ cuda_py_test(
     ],
 )
 
+cuda_py_test(
+    name = "map_stage_op_test",
+    size = "small",
+    srcs = ["map_stage_op_test.py"],
+    additional_deps = [
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:util",
+        "//tensorflow/python:data_flow_ops",
+    ],
+)
+
 cuda_py_test(
     name = "concat_op_test",
     size = "medium",
diff --git a/tensorflow/python/kernel_tests/map_stage_op_test.py b/tensorflow/python/kernel_tests/map_stage_op_test.py
new file mode 100644
index 0000000000..718d8aebd8
--- /dev/null
+++ b/tensorflow/python/kernel_tests/map_stage_op_test.py
@@ -0,0 +1,383 @@
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import ops
+from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import data_flow_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.platform import test
+
+
+class MapStageTest(test.TestCase):
+
+  def testSimple(self):
+    with self.test_session(use_gpu=True) as sess:
+      with ops.device('/cpu:0'):
+        x = array_ops.placeholder(dtypes.float32)
+        pi = array_ops.placeholder(dtypes.int64)
+        gi = array_ops.placeholder(dtypes.int64)
+        v = 2. * (array_ops.zeros([128, 128]) + x)
+      with ops.device(test.gpu_device_name()):
+        stager = data_flow_ops.MapStagingArea([dtypes.float32])
+        stage = stager.put(pi, [v], [0])
+        k, y = stager.get(gi)
+        y = math_ops.reduce_max(math_ops.matmul(y, y))
+      sess.run(stage, feed_dict={x: -1, pi: 0})
+      for i in range(10):
+        _, yval = sess.run([stage, y], feed_dict={x: i, pi: i+1, gi:i})
+        self.assertAllClose(4 * (i - 1) * (i - 1) * 128, yval, rtol=1e-4)
+
+  def testMultiple(self):
+    with self.test_session(use_gpu=True) as sess:
+      with ops.device('/cpu:0'):
+        x = array_ops.placeholder(dtypes.float32)
+        pi = array_ops.placeholder(dtypes.int64)
+        gi = array_ops.placeholder(dtypes.int64)
+        v = 2. * (array_ops.zeros([128, 128]) + x)
+      with ops.device(test.gpu_device_name()):
+        stager = data_flow_ops.MapStagingArea([dtypes.float32, dtypes.float32])
+        stage = stager.put(pi, [x, v], [0, 1])
+        k, (z, y) = stager.get(gi)
+        y = math_ops.reduce_max(z * math_ops.matmul(y, y))
+      sess.run(stage, feed_dict={x: -1, pi: 0})
+      for i in range(10):
+        _, yval = sess.run([stage, y], feed_dict={x: i, pi: i+1, gi:i})
+        self.assertAllClose(
+            4 * (i - 1) * (i - 1) * (i - 1) * 128, yval, rtol=1e-4)
+
+  def testDictionary(self):
+    with self.test_session(use_gpu=True) as sess:
+      with ops.device('/cpu:0'):
+        x = array_ops.placeholder(dtypes.float32)
+        pi = array_ops.placeholder(dtypes.int64)
+        gi = array_ops.placeholder(dtypes.int64)
+        v = 2. * (array_ops.zeros([128, 128]) + x)
+      with ops.device(test.gpu_device_name()):
+        stager = data_flow_ops.MapStagingArea(
+            [dtypes.float32, dtypes.float32],
+            shapes=[[], [128, 128]],
+            names=['x', 'v'])
+        stage = stager.put(pi,{'x': x, 'v': v})
+        key, ret = stager.get(gi)
+        z = ret['x']
+        y = ret['v']
+        y = math_ops.reduce_max(z * math_ops.matmul(y, y))
+      sess.run(stage, feed_dict={x: -1, pi: 0})
+      for i in range(10):
+        _, yval = sess.run([stage, y], feed_dict={x: i, pi: i+1, gi:i})
+        self.assertAllClose(
+            4 * (i - 1) * (i - 1) * (i - 1) * 128, yval, rtol=1e-4)
+
+  def testColocation(self):
+    gpu_dev = test.gpu_device_name()
+
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.float32)
+      v = 2. * (array_ops.zeros([128, 128]) + x)
+    with ops.device(gpu_dev):
+      stager = data_flow_ops.MapStagingArea([dtypes.float32])
+      y = stager.put(1, [v], [0])
+      self.assertEqual(y.device, '/device:GPU:0' if gpu_dev
+                                                 else gpu_dev)
+    with ops.device('/cpu:0'):
+      _, x = stager.get(1)
+      y = stager.peek(1)
+      _, z = stager.get()
+      self.assertEqual(x.device, '/device:CPU:0')
+      self.assertEqual(y.device, '/device:CPU:0')
+      self.assertEqual(z.device, '/device:CPU:0')
+
+  def testPeek(self):
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.int32, name='x')
+      pi = array_ops.placeholder(dtypes.int64)
+      gi = array_ops.placeholder(dtypes.int64)
+      p = array_ops.placeholder(dtypes.int32, name='p')
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.MapStagingArea([dtypes.int32, ], shapes=[[]])
+      stage = stager.put(pi,[x], [0])
+      peek = stager.peek(gi)
+      size = stager.size()
+
+    n = 10
+
+    with self.test_session(use_gpu=True) as sess:
+      for i in range(n):
+        sess.run(stage, feed_dict={x:i, pi:i})
+
+      for i in range(n):
+        self.assertTrue(sess.run(peek, feed_dict={gi: i}) == i)
+
+      self.assertTrue(sess.run(size) == 10)
+
+  def testSizeAndClear(self):
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.float32, name='x')
+      pi = array_ops.placeholder(dtypes.int64)
+      gi = array_ops.placeholder(dtypes.int64)
+      v = 2. * (array_ops.zeros([128, 128]) + x)
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.MapStagingArea(
+          [dtypes.float32, dtypes.float32],
+          shapes=[[], [128, 128]],
+          names=['x', 'v'])
+      stage = stager.put(pi,{'x': x, 'v': v})
+      size = stager.size()
+      clear = stager.clear()
+
+    with self.test_session(use_gpu=True) as sess:
+      sess.run(stage, feed_dict={x: -1, pi: 3})
+      self.assertEqual(sess.run(size), 1)
+      sess.run(stage, feed_dict={x: -1, pi: 1})
+      self.assertEqual(sess.run(size), 2)
+      sess.run(clear)
+      self.assertEqual(sess.run(size), 0)
+
+
+  def testCapacity(self):
+    capacity = 3
+
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.int32, name='x')
+      pi = array_ops.placeholder(dtypes.int64, name='pi')
+      gi = array_ops.placeholder(dtypes.int64, name='gi')
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.MapStagingArea([dtypes.int32, ],
+        capacity=capacity, shapes=[[]])
+
+      stage = stager.put(pi, [x], [0])
+      get = stager.get()
+      size = stager.size()
+
+    from six.moves import queue as Queue
+    import threading
+
+    queue = Queue.Queue()
+    n = 5
+    missed = 0
+
+    with self.test_session(use_gpu=True) as sess:
+      # Stage data in a separate thread which will block
+      # when it hits the staging area's capacity and thus
+      # not fill the queue with n tokens
+      def thread_run():
+        for i in range(n):
+          sess.run(stage, feed_dict={x: i, pi: i})
+          queue.put(0)
+
+      t = threading.Thread(target=thread_run)
+      t.start()
+
+      # Get tokens from the queue, making notes of when we timeout
+      for i in range(n):
+        try:
+          queue.get(timeout=0.05)
+        except Queue.Empty:
+          missed += 1
+
+      # We timed out n - capacity times waiting for queue puts
+      self.assertTrue(missed == n - capacity)
+
+      # Clear the staging area out a bit
+      for i in range(n - capacity):
+        sess.run(get)
+
+      # This should now succeed
+      t.join()
+
+      self.assertTrue(sess.run(size) == capacity)
+
+      # Clear out the staging area completely
+      for i in range(capacity):
+        sess.run(get)
+
+  def testMemoryLimit(self):
+    memory_limit = 512*1024  # 512K
+    chunk = 200*1024 # 256K
+    capacity = memory_limit // chunk
+
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.uint8, name='x')
+      pi = array_ops.placeholder(dtypes.int64, name='pi')
+      gi = array_ops.placeholder(dtypes.int64, name='gi')
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.MapStagingArea([dtypes.uint8],
+        memory_limit=memory_limit, shapes=[[]])
+      stage = stager.put(pi, [x], [0])
+      get = stager.get()
+      size = stager.size()
+
+    from six.moves import queue as Queue
+    import threading
+    import numpy as np
+
+    queue = Queue.Queue()
+    n = 5
+    missed = 0
+
+    with self.test_session(use_gpu=True) as sess:
+      # Stage data in a separate thread which will block
+      # when it hits the staging area's capacity and thus
+      # not fill the queue with n tokens
+      def thread_run():
+        for i in range(n):
+          sess.run(stage, feed_dict={x: np.full(chunk, i, dtype=np.uint8),
+                                    pi: i})
+          queue.put(0)
+
+      t = threading.Thread(target=thread_run)
+      t.start()
+
+      # Get tokens from the queue, making notes of when we timeout
+      for i in range(n):
+        try:
+          queue.get(timeout=0.05)
+        except Queue.Empty:
+          missed += 1
+
+      # We timed out n - capacity times waiting for queue puts
+      self.assertTrue(missed == n - capacity)
+
+      # Clear the staging area out a bit
+      for i in range(n - capacity):
+        sess.run(get)
+
+      # This should now succeed
+      t.join()
+
+      self.assertTrue(sess.run(size) == capacity)
+
+      # Clear out the staging area completely
+      for i in range(capacity):
+        sess.run(get)
+
+  def testOrdering(self):
+    import six
+    import random
+
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.int32, name='x')
+      pi = array_ops.placeholder(dtypes.int64, name='pi')
+      gi = array_ops.placeholder(dtypes.int64, name='gi')
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.MapStagingArea([dtypes.int32, ],
+        shapes=[[]], ordered=True)
+      stage = stager.put(pi, [x], [0])
+      get = stager.get()
+      size = stager.size()
+
+    n = 10
+
+    with self.test_session(use_gpu=True) as sess:
+      # Keys n-1..0
+      keys = list(reversed(six.moves.range(n)))
+
+      for i in keys:
+        sess.run(stage, feed_dict={pi: i, x: i})
+
+      self.assertTrue(sess.run(size) == n)
+
+      # Check that key, values come out in ascending order
+      for i, k in enumerate(reversed(keys)):
+        get_key, values = sess.run(get)
+        self.assertTrue(i == k == get_key == values)
+
+      self.assertTrue(sess.run(size) == 0)
+
+  def testBarrier(self):
+    with self.test_session(use_gpu=True) as sess:
+      with ops.device('/cpu:0'):
+        x = array_ops.placeholder(dtypes.float32)
+        f = array_ops.placeholder(dtypes.float32)
+        v = array_ops.placeholder(dtypes.float32)
+        pi = array_ops.placeholder(dtypes.int64)
+        gi = array_ops.placeholder(dtypes.int64)
+      with ops.device(test.gpu_device_name()):
+        # Test barrier with dictionary
+        stager = data_flow_ops.MapStagingArea(
+            [dtypes.float32, dtypes.float32, dtypes.float32],
+            names=['x', 'v', 'f'])
+        stage_xf = stager.put(pi,{'x': x, 'f': f})
+        stage_v = stager.put(pi, {'v': v})
+        key, ret = stager.get(gi)
+        size = stager.size()
+        isize = stager.incomplete_size()
+
+        # 0 complete and incomplete entries
+        self.assertTrue(sess.run([size, isize]) == [0, 0])
+        # Stage key 0, x and f tuple entries
+        sess.run(stage_xf, feed_dict={pi: 0, x: 1, f: 2})
+        self.assertTrue(sess.run([size, isize]) == [0, 1])
+        # Stage key 1, x and f tuple entries
+        sess.run(stage_xf, feed_dict={pi: 1, x: 1, f: 2})
+        self.assertTrue(sess.run([size, isize]) == [0, 2])
+
+        # Now complete key 0 with tuple entry v
+        sess.run(stage_v, feed_dict={pi: 0, v: 1})
+        # 1 complete and 1 incomplete entry
+        self.assertTrue(sess.run([size, isize]) == [1, 1])
+        # We can now obtain tuple associated with key 0
+        self.assertTrue(sess.run([key, ret], feed_dict={gi:0})
+                                == [0, { 'x':1, 'f':2, 'v':1}])
+
+        # 0 complete and 1 incomplete entry
+        self.assertTrue(sess.run([size, isize]) == [0, 1])
+        # Now complete key 1 with tuple entry v
+        sess.run(stage_v, feed_dict={pi: 1, v: 3})
+        # We can now obtain tuple associated with key 1
+        self.assertTrue(sess.run([key, ret], feed_dict={gi:1})
+                                == [1, { 'x':1, 'f':2, 'v':3}])
+
+        # Test again with index inserts
+        stager = data_flow_ops.MapStagingArea(
+            [dtypes.float32, dtypes.float32, dtypes.float32])
+        stage_xf = stager.put(pi, [x, f], [0, 2])
+        stage_v = stager.put(pi, [v], [1])
+        key, ret = stager.get(gi)
+        size = stager.size()
+        isize = stager.incomplete_size()
+
+        # 0 complete and incomplete entries
+        self.assertTrue(sess.run([size, isize]) == [0, 0])
+        # Stage key 0, x and f tuple entries
+        sess.run(stage_xf, feed_dict={pi: 0, x: 1, f: 2})
+        self.assertTrue(sess.run([size, isize]) == [0, 1])
+        # Stage key 1, x and f tuple entries
+        sess.run(stage_xf, feed_dict={pi: 1, x: 1, f: 2})
+        self.assertTrue(sess.run([size, isize]) == [0, 2])
+
+        # Now complete key 0 with tuple entry v
+        sess.run(stage_v, feed_dict={pi: 0, v: 1})
+        # 1 complete and 1 incomplete entry
+        self.assertTrue(sess.run([size, isize]) == [1, 1])
+        # We can now obtain tuple associated with key 0
+        self.assertTrue(sess.run([key, ret], feed_dict={gi:0})
+                                == [0, [1, 1, 2]])
+
+        # 0 complete and 1 incomplete entry
+        self.assertTrue(sess.run([size, isize]) == [0, 1])
+        # Now complete key 1 with tuple entry v
+        sess.run(stage_v, feed_dict={pi: 1, v: 3})
+        # We can now obtain tuple associated with key 1
+        self.assertTrue(sess.run([key, ret], feed_dict={gi:1})
+                                == [1, [1,3, 2]])
+
+
+if __name__ == '__main__':
+  test.main()
diff --git a/tensorflow/python/kernel_tests/stage_op_test.py b/tensorflow/python/kernel_tests/stage_op_test.py
index 81eee48d2e..645ac2f130 100644
--- a/tensorflow/python/kernel_tests/stage_op_test.py
+++ b/tensorflow/python/kernel_tests/stage_op_test.py
@@ -1,4 +1,4 @@
-# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class StageTest(test.TestCase):
       with ops.device('/cpu:0'):
         x = array_ops.placeholder(dtypes.float32)
         v = 2. * (array_ops.zeros([128, 128]) + x)
-      with ops.device('/gpu:0'):
+      with ops.device(test.gpu_device_name()):
         stager = data_flow_ops.StagingArea([dtypes.float32])
         stage = stager.put([v])
         y = stager.get()
@@ -78,18 +78,174 @@ class StageTest(test.TestCase):
         self.assertAllClose(
             4 * (i - 1) * (i - 1) * (i - 1) * 128, yval, rtol=1e-4)
 
-  def testColocation1(self):
+  def testColocation(self):
+    gpu_dev = test.gpu_device_name()
+
     with ops.device('/cpu:0'):
       x = array_ops.placeholder(dtypes.float32)
       v = 2. * (array_ops.zeros([128, 128]) + x)
-    with ops.device('/gpu:0'):
+    with ops.device(gpu_dev):
       stager = data_flow_ops.StagingArea([dtypes.float32])
       y = stager.put([v])
-      self.assertEqual(y.device, '/device:GPU:0')
+      self.assertEqual(y.device, '/device:GPU:0' if gpu_dev
+                                                 else gpu_dev)
     with ops.device('/cpu:0'):
       x = stager.get()
       self.assertEqual(x.device, '/device:CPU:0')
 
+  def testPeek(self):
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.int32, name='x')
+      p = array_ops.placeholder(dtypes.int32, name='p')
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.StagingArea([dtypes.int32, ], shapes=[[]])
+      stage = stager.put([x])
+      peek = stager.peek(p)
+      ret = stager.get()
+
+    with self.test_session(use_gpu=True) as sess:
+      for i in range(10):
+        sess.run(stage, feed_dict={x:i})
+
+      for i in range(10):
+        self.assertTrue(sess.run(peek, feed_dict={p:i}) == i)
+
+  def testSizeAndClear(self):
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.float32, name='x')
+      v = 2. * (array_ops.zeros([128, 128]) + x)
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.StagingArea(
+          [dtypes.float32, dtypes.float32],
+          shapes=[[], [128, 128]],
+          names=['x', 'v'])
+      stage = stager.put({'x': x, 'v': v})
+      ret = stager.get()
+      size = stager.size()
+      clear = stager.clear()
+
+    with self.test_session(use_gpu=True) as sess:
+      sess.run(stage, feed_dict={x: -1})
+      self.assertEqual(sess.run(size), 1)
+      sess.run(stage, feed_dict={x: -1})
+      self.assertEqual(sess.run(size), 2)
+      sess.run(clear)
+      self.assertEqual(sess.run(size), 0)
+
+  def testCapacity(self):
+    capacity = 3
+
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.int32, name='x')
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.StagingArea([dtypes.int32, ],
+        capacity=capacity, shapes=[[]])
+      stage = stager.put([x])
+      ret = stager.get()
+      size = stager.size()
+
+    from six.moves import queue as Queue
+    import threading
+
+    queue = Queue.Queue()
+    n = 5
+    missed = 0
+
+    with self.test_session(use_gpu=True) as sess:
+      # Stage data in a separate thread which will block
+      # when it hits the staging area's capacity and thus
+      # not fill the queue with n tokens
+      def thread_run():
+        for i in range(n):
+          sess.run(stage, feed_dict={x: i})
+          queue.put(0)
+
+      t = threading.Thread(target=thread_run)
+      t.start()
+
+      # Get tokens from the queue, making notes of when we timeout
+      for i in range(n):
+        try:
+          queue.get(timeout=0.05)
+        except Queue.Empty:
+          missed += 1
+
+      # We timed out n - capacity times waiting for queue puts
+      self.assertTrue(missed == n - capacity)
+
+      # Clear the staging area out a bit
+      for i in range(n - capacity):
+        self.assertTrue(sess.run(ret) == i)
+
+      # Thread should be able to join now
+      t.join()
+
+      self.assertTrue(sess.run(size) == capacity)
+
+      # Clear the staging area completely
+      for i in range(capacity):
+        self.assertTrue(sess.run(ret) == i+(n-capacity))
+
+      self.assertTrue(sess.run(size) == 0)
+
+  def testMemoryLimit(self):
+    memory_limit = 512*1024  # 512K
+    chunk = 200*1024 # 256K
+    capacity = memory_limit // chunk
+
+    with ops.device('/cpu:0'):
+      x = array_ops.placeholder(dtypes.uint8, name='x')
+    with ops.device(test.gpu_device_name()):
+      stager = data_flow_ops.StagingArea([dtypes.uint8, ],
+        memory_limit=memory_limit, shapes=[[]])
+      stage = stager.put([x])
+      ret = stager.get()
+      size = stager.size()
+
+    from six.moves import queue as Queue
+    import threading
+    import numpy as np
+
+    queue = Queue.Queue()
+    n = 5
+    missed = 0
+
+    with self.test_session(use_gpu=True) as sess:
+      # Stage data in a separate thread which will block
+      # when it hits the staging area's capacity and thus
+      # not fill the queue with n tokens
+      def thread_run():
+        for i in range(n):
+          sess.run(stage, feed_dict={x: np.full(chunk, i, dtype=np.uint8)})
+          queue.put(0)
+
+      t = threading.Thread(target=thread_run)
+      t.start()
+
+      # Get tokens from the queue, making notes of when we timeout
+      for i in range(n):
+        try:
+          queue.get(timeout=0.05)
+        except Queue.Empty:
+          missed += 1
+
+      # We timed out n - capacity times waiting for queue puts
+      self.assertTrue(missed == n - capacity)
+
+      # Clear the staging area out a bit
+      for i in range(n - capacity):
+        self.assertTrue(sess.run(ret)[0] == i)
+
+      # Thread should be able to join now
+      t.join()
+
+      self.assertTrue(sess.run(size) == capacity)
+
+      # Clear the staging area completely
+      for i in range(capacity):
+        self.assertTrue(sess.run(ret)[0] == i+(n-capacity))
+
+      self.assertTrue(sess.run(size) == 0)
 
 if __name__ == '__main__':
   test.main()
diff --git a/tensorflow/python/ops/data_flow_ops.py b/tensorflow/python/ops/data_flow_ops.py
index 9a208613ad..eb9d0ba7e3 100644
--- a/tensorflow/python/ops/data_flow_ops.py
+++ b/tensorflow/python/ops/data_flow_ops.py
@@ -1,4 +1,4 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -1344,72 +1344,30 @@ class SparseConditionalAccumulator(ConditionalAccumulatorBase):
         dense_shape=return_val.shape)
 
 
-class StagingArea(object):
-  """Class for staging inputs. No ordering guarantees.
-
-  A `StagingArea` is a TensorFlow data structure that stores tensors across
-  multiple steps, and exposes operations that can put and get tensors.
-
-  Each `StagingArea` element is a tuple of one or more tensors, where each
-  tuple component has a static dtype, and may have a static shape.
-
-  The capacity of a `StagingArea` is unbounded and supports multiple
-  concurrent producers and consumers; and provides exactly-once delivery.
-
-  Each element of a `StagingArea` is a fixed-length tuple of tensors whose
-  dtypes are described by `dtypes`, and whose shapes are optionally described
-  by the `shapes` argument.
-
-  If the `shapes` argument is specified, each component of a staging area
-  element must have the respective fixed shape. If it is
-  unspecified, different elements may have different shapes,
-  """
-
+class BaseStagingArea(object):
+  """Base class for Staging Areas."""
   _identifier = 0
   _lock = threading.Lock()
 
-  def __init__(self, dtypes, shapes=None, names=None, shared_name=None):
-    """Constructs a staging area object.
-
-    The two optional lists, `shapes` and `names`, must be of the same length
-    as `dtypes` if provided.  The values at a given index `i` indicate the
-    shape and name to use for the corresponding queue component in `dtypes`.
-
-    The device scope at the time of object creation determines where the
-    storage for the `StagingArea` will reside.  Calls to `put` will incur a copy
-    to this memory space, if necessary.  Tensors returned by `get` will be
-    placed according to the device scope when `get` is called.
-
-    Args:
-      dtypes:  A list of types.  The length of dtypes must equal the number
-        of tensors in each element.
-      shapes: (Optional.) Constraints on the shapes of tensors in an element.
-        A list of shape tuples or None. This list is the same length
-        as dtypes.  If the shape of any tensors in the element are constrained,
-        all must be; shapes can be None if the shapes should not be constrained.
-      names: (Optional.) If provided, the `get()` and
-        `put()` methods will use dictionaries with these names as keys.
-        Must be None or a list or tuple of the same length as `dtypes`.
-      shared_name: (Optional.) A name to be used for the shared object. By
-        passing the same name to two different python objects they will share
-        the underlying staging area. Must be a string.
-
-    Raises:
-      ValueError: If one of the arguments is invalid.
-    """
+  def __init__(self, dtypes, shapes=None, names=None, shared_name=None,
+                  capacity=0, memory_limit=0):
     if shared_name is None:
-      self._name = ops.get_default_graph().unique_name("StagingArea")
+      self._name = (ops.get_default_graph()
+                       .unique_name(self.__class__.__name__))
     elif isinstance(shared_name, six.string_types):
       self._name = shared_name
     else:
       raise ValueError("shared_name must be a string")
+
     self._dtypes = dtypes
+
     if shapes is not None:
       if len(shapes) != len(dtypes):
         raise ValueError("StagingArea shapes must be the same length as dtypes")
       self._shapes = [tensor_shape.TensorShape(s) for s in shapes]
     else:
       self._shapes = [tensor_shape.unknown_shape() for _ in self._dtypes]
+
     if names is not None:
       if len(names) != len(dtypes):
         raise ValueError("StagingArea names must be the same length as dtypes")
@@ -1417,6 +1375,9 @@ class StagingArea(object):
     else:
       self._names = None
 
+    self._capacity = capacity
+    self._memory_limit = memory_limit
+
     # all get and put ops must colocate with this op
     with ops.name_scope("%s_root" % self._name):
       self._coloc_op = control_flow_ops.no_op()
@@ -1441,52 +1402,140 @@ class StagingArea(object):
     """The list of names for each component of a staging area element."""
     return self._names
 
-  def _check_put_dtypes(self, vals):
+  @property
+  def capacity(self):
+    """The maximum number of elements of this staging area."""
+    return self._capacity
+
+  @property
+  def memory_limit(self):
+    """The maximum number of bytes of this staging area."""
+    return self._memory_limit
+
+  def _check_put_dtypes(self, vals, indices=None):
     """Validate and convert `vals` to a list of `Tensor`s.
 
     The `vals` argument can be a Tensor, a list or tuple of tensors, or a
     dictionary with tensor values.
 
+    If `vals` is a list, then the appropriate indices associated with the
+    values must be provided.
+
     If it is a dictionary, the staging area must have been constructed with a
     `names` attribute and the dictionary keys must match the staging area names.
+    `indices` will be inferred from the dictionary keys.
     If the staging area was constructed with a `names` attribute, `vals` must
     be a dictionary.
 
+    Checks that the dtype and shape of each value matches that
+    of the staging area.
+
     Args:
       vals: A tensor, a list or tuple of tensors, or a dictionary..
 
     Returns:
-      A list of `Tensor` objects.
+      A (tensors, indices) tuple where `tensors` is a list of `Tensor` objects
+      and `indices` is a list of indices associed with the tensors.
 
     Raises:
-      ValueError: If `vals` is invalid.
+      ValueError: If `vals` or `indices` is invalid.
     """
     if isinstance(vals, dict):
       if not self._names:
         raise ValueError(
             "Staging areas must have names to enqueue a dictionary")
-      if sorted(self._names) != sorted(vals.keys()):
+      if not set(vals.keys()).issubset(self._names):
         raise ValueError("Keys in dictionary to put do not match names "
                          "of staging area. Dictionary: (%s), Queue: (%s)" %
                          (sorted(vals.keys()), sorted(self._names)))
       # The order of values in `self._names` indicates the order in which the
       # tensors in the dictionary `vals` must be listed.
-      vals = [vals[k] for k in self._names]
+      vals, indices, n = zip(*[(vals[k], i, k) for i, k in enumerate(self._names)
+                                                  if k in vals])
     else:
       if self._names:
         raise ValueError("You must enqueue a dictionary in a staging area "
                          "with names")
+
+      if indices is None:
+        raise ValueError("Indices must be supplied when inserting a list "
+                        "of tensors")
+
+      if len(indices) != len(vals):
+        raise ValueError("Number of indices '%s' doesn't match "
+                         "number of values '%s'")
+
       if not isinstance(vals, (list, tuple)):
         vals = [vals]
+        indices = [0]
+
+    # Sanity check number of values
+    if not len(vals) <= len(self._dtypes):
+      raise ValueError("Unexpected number of inputs '%s' vs '%s'" % (
+                          len(values), len(self._dtypes)))
 
     tensors = []
-    for i, (val, dtype) in enumerate(zip(vals, self._dtypes)):
-      tensors.append(
-          ops.convert_to_tensor(
-              val, dtype=dtype, name="component_%d" % i))
+
+    for val, i in zip(vals, indices):
+      dtype, shape = self._dtypes[i], self._shapes[i]
+      # Check dtype
+      if not val.dtype == dtype:
+        raise ValueError("Datatypes do not match. '%s' != '%s'" %(
+                        str(val.dtype), str(dtype)))
+
+      # Check shape
+      val.get_shape().assert_is_compatible_with(shape)
+
+      tensors.append(ops.convert_to_tensor(val, dtype=dtype,
+                                          name="component_%d" % i))
+
+    return tensors, indices
+
+  def _create_device_transfers(self, tensors):
+    """Encode inter-device transfers if the current device
+    is not the same as the Staging Area's device
+    """
+
+    if not isinstance(tensors, (tuple, list)):
+      tensors = [tensors]
+
+    curr_device_scope = control_flow_ops.no_op().device
+
+    if curr_device_scope != self._coloc_op.device:
+      tensors = [array_ops.identity(t) for t in tensors]
 
     return tensors
 
+  def _get_return_value(self, tensors):
+    """Return the value to return from a get op.
+
+    If the staging area has names, return a dictionary with the
+    names as keys.  Otherwise return either a single tensor
+    or a list of tensors depending on the length of `tensors`.
+
+    Args:
+      tensors: List of tensors from the get op.
+
+    Returns:
+      A single tensor, a list of tensors, or a dictionary
+      of tensors.
+    """
+
+    tensors = self._create_device_transfers(tensors)
+
+    # Sets shape
+    for output, shape in zip(tensors, self._shapes):
+      output.set_shape(shape)
+
+    if self._names:
+      # The returned values in `tensors` are in the same order as
+      # the names in `self._names`.
+      return {n: tensors[i] for i, n in enumerate(self._names)}
+    elif len(tensors) == 1:
+      return tensors[0]
+    else:
+      return tensors
+
   def _scope_vals(self, vals):
     """Return a list of values to pass to `name_scope()`.
 
@@ -1503,9 +1552,86 @@ class StagingArea(object):
     else:
       return [vals]
 
+class StagingArea(BaseStagingArea):
+  """Class for staging inputs. No ordering guarantees.
+
+  A `StagingArea` is a TensorFlow data structure that stores tensors across
+  multiple steps, and exposes operations that can put and get tensors.
+
+  Each `StagingArea` element is a tuple of one or more tensors, where each
+  tuple component has a static dtype, and may have a static shape.
+
+  The capacity of a `StagingArea` may be bounded or unbounded.
+  It supports multiple concurrent producers and consumers; and
+  provides exactly-once delivery.
+
+  Each element of a `StagingArea` is a fixed-length tuple of tensors whose
+  dtypes are described by `dtypes`, and whose shapes are optionally described
+  by the `shapes` argument.
+
+  If the `shapes` argument is specified, each component of a staging area
+  element must have the respective fixed shape. If it is
+  unspecified, different elements may have different shapes,
+
+  It can be configured with a capacity in which case
+  put(values) will block until space becomes available.
+
+  Similarly, it can be configured with a memory limit which
+  will block put(values) until space is available.
+  This is mostly useful for limiting the number of tensors on
+  devices such as GPUs.
+
+  All get() and peek() commands block if the the requested data
+  is not present in the Staging Area.
+
+  """
+
+  def __init__(self, dtypes, shapes=None, names=None, shared_name=None,
+                  capacity=0, memory_limit=0):
+    """Constructs a staging area object.
+
+    The two optional lists, `shapes` and `names`, must be of the same length
+    as `dtypes` if provided.  The values at a given index `i` indicate the
+    shape and name to use for the corresponding queue component in `dtypes`.
+
+    The device scope at the time of object creation determines where the
+    storage for the `StagingArea` will reside.  Calls to `put` will incur a copy
+    to this memory space, if necessary.  Tensors returned by `get` will be
+    placed according to the device scope when `get` is called.
+
+    Args:
+      dtypes:  A list of types.  The length of dtypes must equal the number
+        of tensors in each element.
+      capacity: (Optional.) Maximum number of elements.
+        An integer. If zero, the Staging Area is unbounded
+      memory_limit: (Optional.) Maximum number of bytes of all tensors
+        in the Staging Area.
+        An integer. If zero, the Staging Area is unbounded
+      shapes: (Optional.) Constraints on the shapes of tensors in an element.
+        A list of shape tuples or None. This list is the same length
+        as dtypes.  If the shape of any tensors in the element are constrained,
+        all must be; shapes can be None if the shapes should not be constrained.
+      names: (Optional.) If provided, the `get()` and
+        `put()` methods will use dictionaries with these names as keys.
+        Must be None or a list or tuple of the same length as `dtypes`.
+      shared_name: (Optional.) A name to be used for the shared object. By
+        passing the same name to two different python objects they will share
+        the underlying staging area. Must be a string.
+
+    Raises:
+      ValueError: If one of the arguments is invalid.
+    """
+
+    super(StagingArea, self).__init__(dtypes, shapes,
+                                          names, shared_name,
+                                          capacity, memory_limit)
+
   def put(self, values, name=None):
     """Create an op that places a value into the staging area.
 
+    This operation will block if the `StagingArea` has reached
+    its capacity.
+
     Args:
       values: Tensor (or a tuple of Tensors) to place into the staging area.
       name: A name for the operation (optional).
@@ -1518,46 +1644,23 @@ class StagingArea(object):
     """
     with ops.name_scope(name, "%s_put" % self._name,
                         self._scope_vals(values)) as scope:
-      vals = self._check_put_dtypes(values)
-      if len(values) != len(self._dtypes):
-        raise ValueError("Unexpected number of inputs " + str(len(values)) +
-                         "vs " + str(len(self._dtypes)))
-      for val, dtype in zip(vals, self._dtypes):
-        if val.dtype != dtype:
-          raise ValueError("Datatypes do not match. " + str(val.dtype) + " != "
-                           + str(dtype))
 
-      for val, shape in zip(vals, self._shapes):
-        val.get_shape().assert_is_compatible_with(shape)
+      # Hard-code indices for this staging area
+      indices = range(len(values)) if isinstance(values, (list, tuple)) else None
+      vals, _ = self._check_put_dtypes(values, indices)
 
       with ops.colocate_with(self._coloc_op):
         op = gen_data_flow_ops.stage(values=vals, shared_name=self._name,
-                                     name=scope)
+                                     name=scope, capacity=self._capacity,
+                                     memory_limit=self._memory_limit)
 
       return op
 
-  def _get_return_value(self, tensors):
-    """Return the value to return from a get op.
-
-    If the staging area has names, return a dictionary with the
-    names as keys.  Otherwise return either a single tensor
-    or a list of tensors depending on the length of `tensors`.
-
-    Args:
-      tensors: List of tensors from the get op.
+  def __internal_get(self, get_fn, name):
+    with ops.colocate_with(self._coloc_op):
+      ret = get_fn()
 
-    Returns:
-      A single tensor, a list of tensors, or a dictionary
-      of tensors.
-    """
-    if self._names:
-      # The returned values in `tensors` are in the same order as
-      # the names in `self._names`.
-      return {n: tensors[i] for i, n in enumerate(self._names)}
-    elif len(tensors) == 1:
-      return tensors[0]
-    else:
-      return tensors
+    return self._get_return_value(ret)
 
   def get(self, name=None):
     """Gets one element from this staging area.
@@ -1584,19 +1687,388 @@ class StagingArea(object):
     if name is None:
       name = "%s_get" % self._name
 
+    fn = lambda: gen_data_flow_ops.unstage(dtypes=self._dtypes,
+                    shared_name=self._name, name=name,
+                    capacity=self._capacity,
+                    memory_limit=self._memory_limit)
+
+    return self.__internal_get(fn, name)
+
+  def peek(self, index, name=None):
+    """Peeks at an element in the staging area.
+
+    If the staging area is too small to contain the element at
+    the specified index, it will block until enough elements
+    are inserted to complete the operation.
+
+    The placement of the returned tensor will be determined by
+    the current device scope when this function is called.
+
+    Args:
+      index: The index of the tensor within the staging area
+              to look up.
+      name: A name for the operation (optional).
+
+    Returns:
+      The tuple of tensors that was gotten.
+    """
+    if name is None:
+      name = "%s_peek" % self._name
+
+    fn = lambda: gen_data_flow_ops.stage_peek(index,
+                    dtypes=self._dtypes, shared_name=self._name,
+                    name=name, capacity=self._capacity,
+                    memory_limit=self._memory_limit)
+
+    return self.__internal_get(fn, name)
+
+  def size(self, name=None):
+    """Returns the number of elements in the staging area.
+
+    Args:
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if name is None:
+      name = "%s_size" % self._name
+
+    return gen_data_flow_ops.stage_size(name=name, shared_name=self._name,
+                        dtypes=self._dtypes, capacity=self._capacity,
+                        memory_limit=self._memory_limit)
+
+  def clear(self, name=None):
+    """Clears the staging area.
+
+    Args:
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if name is None:
+      name = "%s_clear" % self._name
+
+    return gen_data_flow_ops.stage_clear(name=name, shared_name=self._name,
+                        dtypes=self._dtypes, capacity=self._capacity,
+                        memory_limit=self._memory_limit)
+
+class MapStagingArea(BaseStagingArea):
+  """
+  A `MapStagingArea` is a TensorFlow data structure that stores tensors across
+  multiple steps, and exposes operations that can put and get tensors.
+
+  Each `MapStagingArea` element is a (key, value) pair.
+  Only int64 keys are supported, other types should be
+  hashed to produce a key.
+  Values are a tuple of one or more tensors.
+  Each tuple component has a static dtype,
+  and may have a static shape.
+
+  The capacity of a `MapStagingArea` may be bounded or unbounded.
+  It supports multiple concurrent producers and consumers; and
+  provides exactly-once delivery.
+
+  Each value tuple of a `MapStagingArea` is a fixed-length tuple of tensors whose
+  dtypes are described by `dtypes`, and whose shapes are optionally described
+  by the `shapes` argument.
+
+  If the `shapes` argument is specified, each component of a staging area
+  element must have the respective fixed shape. If it is
+  unspecified, different elements may have different shapes,
+
+  It behaves like an associative container with support for:
+
+   - put(key, values)
+   - peek(key)         like dict.get(key)
+   - get(key)          like dict.pop(key)
+   - get(key=None)     like dict.popitem()
+   - size()
+   - clear()
+
+  If ordered a tree structure ordered by key will be used and
+  get(key=None) will remove (key, value) pairs in increasing key order.
+  Otherwise a hashtable
+
+  It can be configured with a capacity in which case
+  put(key, values) will block until space becomes available.
+
+  Similarly, it can be configured with a memory limit which
+  will block put(key, values) until space is available.
+  This is mostly useful for limiting the number of tensors on
+  devices such as GPUs.
+
+  All get() and peek() commands block if the requested
+  (key, value) pair is not present in the staging area.
+
+  Incomplete puts are supported and will be placed in an incomplete
+  hash until such time as all values associated with the key have
+  been inserted. Once completed, this (key, value) pair will be
+  inserted into the main data structure. Data in the incomplete set
+  counts towards the memory limit, but not towards capacity limit.
+  """
+
+  def __init__(self, dtypes, shapes=None, names=None, shared_name=None,
+                      ordered=False, capacity=0, memory_limit=0):
+    """
+    Args:
+      dtypes:  A list of types.  The length of dtypes must equal the number
+        of tensors in each element.
+      capacity: (Optional.) Maximum number of elements.
+        An integer. If zero, the Staging Area is unbounded
+      memory_limit: (Optional.) Maximum number of bytes of all tensors
+        in the Staging Area (excluding keys).
+        An integer. If zero, the Staging Area is unbounded
+      ordered: (Optional.) If True the underlying data structure
+        is a tree ordered on key. Otherwise assume a hashtable.
+      shapes: (Optional.) Constraints on the shapes of tensors in an element.
+        A list of shape tuples or None. This list is the same length
+        as dtypes.  If the shape of any tensors in the element are constrained,
+        all must be; shapes can be None if the shapes should not be constrained.
+      names: (Optional.) If provided, the `get()` and
+        `put()` methods will use dictionaries with these names as keys.
+        Must be None or a list or tuple of the same length as `dtypes`.
+      shared_name: (Optional.) A name to be used for the shared object. By
+        passing the same name to two different python objects they will share
+        the underlying staging area. Must be a string.
+
+    Raises:
+      ValueError: If one of the arguments is invalid.
+
+    """
+
+    super(MapStagingArea, self).__init__(dtypes, shapes,
+                                      names, shared_name,
+                                      capacity, memory_limit)
+
+    # Defer to different methods depending if the map is ordered
+    self._ordered = ordered
+
+    if ordered:
+      self._put_fn = gen_data_flow_ops.ordered_map_stage
+      self._pop_fn = gen_data_flow_ops.ordered_map_unstage
+      self._popitem_fn = gen_data_flow_ops.ordered_map_unstage_no_key
+      self._peek_fn = gen_data_flow_ops.ordered_map_peek
+      self._size_fn = gen_data_flow_ops.ordered_map_size
+      self._incomplete_size_fn = gen_data_flow_ops.ordered_map_incomplete_size
+      self._clear_fn = gen_data_flow_ops.ordered_map_clear
+    else:
+      self._put_fn = gen_data_flow_ops.map_stage
+      self._pop_fn = gen_data_flow_ops.map_unstage
+      self._popitem_fn = gen_data_flow_ops.map_unstage_no_key
+      self._peek_fn = gen_data_flow_ops.map_peek
+      self._size_fn = gen_data_flow_ops.map_size
+      self._incomplete_size_fn = gen_data_flow_ops.map_incomplete_size
+      self._clear_fn = gen_data_flow_ops.map_clear
+
+  def put(self, key, vals, indices=None, name=None):
+    """
+    Create an op that stores the (key, vals) pair in the staging area.
+
+    Incomplete puts are possible, preferably using a dictionary for vals
+    as the appropriate dtypes and shapes can be inferred from the value names
+    dictionary key values. If vals is a list or tuple, indices must
+    also be specified so that the op knows at which element position
+    to perform the insert.
+
+    This operation will block if the capacity or memory limit of this
+    container is reached.
+
+    Args:
+        key: Key associated with the data
+        vals: Tensor (or a dict/tuple of Tensors) to place
+                into the staging area.
+        indices: (Optional) if vals is a tuple/list, this is required.
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+
+    Raises:
+        ValueError: If the number or type of inputs don't match the staging area.
+    """
+
+    with ops.name_scope(name, "%s_put" % self._name,
+                        self._scope_vals(vals)) as scope:
+
+      vals, indices = self._check_put_dtypes(vals, indices)
+
+      with ops.colocate_with(self._coloc_op):
+        op = self._put_fn(key, indices, vals, dtypes=self._dtypes,
+                             shared_name=self._name, name=scope,
+                             capacity=self._capacity,
+                             memory_limit=self._memory_limit)
+    return op
+
+  def peek(self, key, name=None):
+    """
+    Peeks at staging area data associated with the key.
+
+    If the key is not in the staging area, it will block
+    until the associated (key, value) is inserted.
+
+    Args:
+        key: Key associated with the required data
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+
+    if name is None:
+      name = "%s_pop" % self._name
+
     with ops.colocate_with(self._coloc_op):
-      ret = gen_data_flow_ops.unstage(dtypes=self._dtypes,
-                                      shared_name=self._name, name=name)
+      result = self._peek_fn(key, shared_name=self._name,
+                      dtypes=self._dtypes,
+                      name=name,
+                      capacity=self._capacity,
+                      memory_limit=self._memory_limit)
 
-    curr_device_scope = control_flow_ops.no_op().device
-    if curr_device_scope != self._coloc_op.device:
-      for i in range(len(ret)):
-        ret[i] = array_ops.identity(ret[i])
+    return self._get_return_value(result)
 
-    for output, shape in zip(ret, self._shapes):
-      output.set_shape(shape)
+  def get(self, key=None, name=None):
+    """
+    If the key is provided, the associated (key, value)
+    is returned from the staging area. If the key is not
+    in the staging area, this method will block until
+    the associated (key, value) is inserted.
 
-    return self._get_return_value(ret)
+    If no key is provided and the staging area is ordered,
+    the (key, value) with the smallest key will be returned.
+    Otherwise, a random (key, value) will be returned.
+
+    If the staging area is empty when this operation executes,
+    it will block until there is an element to dequeue.
+
+    Args:
+        key: Key associated with the required data (Optional)
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if key is None:
+      return self._popitem(name)
+    else:
+      return self._pop(key, name)
+
+
+  def _pop(self, key, name=None):
+    """
+    Remove and return the associated (key, value)
+    is returned from the staging area. If the key is not
+    in the staging area, this method will block until
+    the associated (key, value) is inserted.
+
+    Args:
+        key: Key associated with the required data
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if name is None:
+      name = "%s_get" % self._name
+
+    with ops.colocate_with(self._coloc_op):
+      result = self._pop_fn(key, shared_name=self._name,
+                      dtypes=self._dtypes,
+                      name=name,
+                      capacity=self._capacity,
+                      memory_limit=self._memory_limit)
+
+    return key, self._get_return_value(result)
+
+  def _popitem(self, name=None):
+    """
+    If the staging area is ordered,
+    the (key, value) with the smallest key will be returned.
+    Otherwise, a random (key, value) will be returned.
+
+    If the staging area is empty when this operation executes,
+    it will block until there is an element to dequeue.
+
+    Args:
+        key: Key associated with the required data
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if name is None:
+      name = "%s_get_nokey" % self._name
+
+    with ops.colocate_with(self._coloc_op):
+      key, result = self._popitem_fn(shared_name=self._name,
+                              dtypes=self._dtypes,
+                              name=name,
+                              capacity=self._capacity,
+                              memory_limit=self._memory_limit)
+
+    # Separate keys and results out from
+    # underlying namedtuple
+    key = self._create_device_transfers(key)[0]
+    result = self._get_return_value(result)
+
+    return key, result
+
+  def size(self, name=None):
+    """
+    Returns the number of elements in the staging area.
+
+    Args:
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if name is None:
+      name = "%s_size" % self._name
+
+    return self._size_fn(shared_name=self._name,
+                        name=name, dtypes=self._dtypes,
+                        capacity=self._capacity,
+                        memory_limit=self._memory_limit)
+
+  def incomplete_size(self, name=None):
+    """
+    Returns the number of incomplete elements in the staging area.
+
+    Args:
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if name is None:
+      name = "%s_incomplete_size" % self._name
+
+    return self._incomplete_size_fn(shared_name=self._name,
+                        name=name, dtypes=self._dtypes,
+                        capacity=self._capacity,
+                        memory_limit=self._memory_limit)
+
+
+
+  def clear(self, name=None):
+    """
+    Clears the staging area.
+
+    Args:
+        name: A name for the operation (optional)
+
+    Returns:
+        The created op
+    """
+    if name is None:
+      name = "%s_clear" % self._name
+
+    return self._clear_fn(shared_name=self._name,
+                        name=name, dtypes=self._dtypes,
+                        capacity=self._capacity,
+                        memory_limit=self._memory_limit)
 
 
 class RecordInput(object):
-- 
GitLab


From fabd225532ee068d1f9ffbdc4a8795e7de99ad24 Mon Sep 17 00:00:00 2001
From: Jianfei Wang <me@thinxer.com>
Date: Sat, 20 May 2017 06:07:09 +0800
Subject: [PATCH 1550/1563] Fix some doc format for CropAndResize (#10025)

---
 tensorflow/core/ops/image_ops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/ops/image_ops.cc b/tensorflow/core/ops/image_ops.cc
index 7522e05177..3edae6f927 100644
--- a/tensorflow/core/ops/image_ops.cc
+++ b/tensorflow/core/ops/image_ops.cc
@@ -900,7 +900,7 @@ boxes: A 2-D tensor of shape `[num_boxes, 4]`. The `i`-th row of the tensor
   in normalized coordinates `[y1, x1, y2, x2]`. A normalized coordinate value of
   `y` is mapped to the image coordinate at `y * (image_height - 1)`, so as the
   `[0, 1]` interval of normalized image height is mapped to
-  `[0, image_height - 1] in image height coordinates. We do allow y1 > y2, in
+  `[0, image_height - 1]` in image height coordinates. We do allow `y1` > `y2`, in
   which case the sampled crop is an up-down flipped version of the original
   image. The width dimension is treated similarly. Normalized coordinates
   outside the `[0, 1]` range are allowed, in which case we use
-- 
GitLab


From f2a46993e39abbf8bfa2db1d40d8983908d6a6bc Mon Sep 17 00:00:00 2001
From: Changming Sun <chasun@microsoft.com>
Date: Fri, 19 May 2017 17:12:12 -0500
Subject: [PATCH 1551/1563] Make ResourceHandle private to tensorflow library
 (#9994)

tensorflow::ResourceHandle is a protobuf object. The official protobuf document suggests:

"If your project is itself a DLL intended for use by third-party software, we recommend
that you do NOT expose protocol buffer objects in your library's public interface, and
that you statically link protocol buffers into your library"

Without this change, it is not able to implement a ResourceOpKernel in DLL on Windows.
---
 tensorflow/core/framework/resource_mgr.cc     | 28 ++++++++++++++++
 tensorflow/core/framework/resource_mgr.h      | 32 +++++++------------
 .../core/framework/resource_op_kernel.h       |  8 ++---
 3 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/tensorflow/core/framework/resource_mgr.cc b/tensorflow/core/framework/resource_mgr.cc
index ab7dd0c547..55860d9227 100644
--- a/tensorflow/core/framework/resource_mgr.cc
+++ b/tensorflow/core/framework/resource_mgr.cc
@@ -24,6 +24,34 @@ limitations under the License.
 #include "tensorflow/core/platform/demangle.h"
 
 namespace tensorflow {
+ResourceHandle MakeResourceHandle(OpKernelContext* ctx, const string& container,
+                                  const string& name,
+                                  const TypeIndex& type_index) {
+  ResourceHandle result;
+  result.set_device(ctx->device()->attributes().name());
+  string actual_container;
+  if (!container.empty()) {
+    actual_container = container;
+  } else {
+    actual_container = ctx->resource_manager()->default_container();
+  }
+  result.set_container(actual_container);
+  result.set_name(name);
+  result.set_hash_code(type_index.hash_code());
+  result.set_maybe_type_name(type_index.name());
+  return result;
+}
+
+Status MakeResourceHandleToOutput(OpKernelContext* context, int output_index,
+                                  const string& container, const string& name,
+                                  const TypeIndex& type_index) {
+  Tensor* handle;
+  TF_RETURN_IF_ERROR(
+      context->allocate_output(output_index, TensorShape({}), &handle));
+  handle->scalar<ResourceHandle>()() =
+      MakeResourceHandle(context, container, name, type_index);
+  return Status::OK();
+}
 
 namespace internal {
 
diff --git a/tensorflow/core/framework/resource_mgr.h b/tensorflow/core/framework/resource_mgr.h
index 26a5766569..0e1a5a82d3 100644
--- a/tensorflow/core/framework/resource_mgr.h
+++ b/tensorflow/core/framework/resource_mgr.h
@@ -202,9 +202,20 @@ class ResourceMgr {
 
 // Makes a resource handle with the specified type for a given container /
 // name.
+ResourceHandle MakeResourceHandle(OpKernelContext* ctx, const string& container,
+                                  const string& name,
+                                  const TypeIndex& type_index);
+
 template <typename T>
 ResourceHandle MakeResourceHandle(OpKernelContext* ctx, const string& container,
-                                  const string& name);
+                                  const string& name) {
+  return MakeResourceHandle(ctx, container, name, MakeTypeIndex<T>());
+}
+
+Status MakeResourceHandleToOutput(OpKernelContext* context, int output_index,
+                                  const string& container, const string& name,
+                                  const TypeIndex& type_index);
+
 template <typename T>
 ResourceHandle MakePerStepResourceHandle(OpKernelContext* ctx,
                                          const string& name);
@@ -423,25 +434,6 @@ Status GetResourceFromContext(OpKernelContext* ctx, const string& input_name,
   return ctx->resource_manager()->Lookup(container, shared_name, resource);
 }
 
-template <typename T>
-ResourceHandle MakeResourceHandle(OpKernelContext* ctx, const string& container,
-                                  const string& name) {
-  ResourceHandle result;
-  result.set_device(ctx->device()->attributes().name());
-  string actual_container;
-  if (!container.empty()) {
-    actual_container = container;
-  } else {
-    actual_container = ctx->resource_manager()->default_container();
-  }
-  result.set_container(actual_container);
-  result.set_name(name);
-  auto type_index = MakeTypeIndex<T>();
-  result.set_hash_code(type_index.hash_code());
-  result.set_maybe_type_name(type_index.name());
-  return result;
-}
-
 template <typename T>
 ResourceHandle MakePerStepResourceHandle(OpKernelContext* ctx,
                                          const string& name) {
diff --git a/tensorflow/core/framework/resource_op_kernel.h b/tensorflow/core/framework/resource_op_kernel.h
index de65657a9e..813ec6eed5 100644
--- a/tensorflow/core/framework/resource_op_kernel.h
+++ b/tensorflow/core/framework/resource_op_kernel.h
@@ -95,11 +95,9 @@ class ResourceOpKernel : public OpKernel {
       resource_ = resource;
     }
     if (context->expected_output_dtype(0) == DT_RESOURCE) {
-      Tensor* handle;
-      OP_REQUIRES_OK(context,
-                     context->allocate_output(0, TensorShape({}), &handle));
-      handle->scalar<ResourceHandle>()() =
-          MakeResourceHandle<T>(context, cinfo_.container(), cinfo_.name());
+      OP_REQUIRES_OK(context, MakeResourceHandleToOutput(
+                                  context, 0, cinfo_.container(), cinfo_.name(),
+                                  MakeTypeIndex<T>()));
     } else {
       context->set_output_ref(0, &mu_, handle_.AccessTensor(context));
     }
-- 
GitLab


From a4305aa1cf5ad54ff336f23110cca10ae984caeb Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Fri, 19 May 2017 15:45:49 -0700
Subject: [PATCH 1552/1563] Change interface to resource

---
 .../delay_compensated_gradient_descent.py     | 429 +++++++++---------
 ...delay_compensated_gradient_descent_test.py | 192 ++++----
 tensorflow/core/kernels/training_ops.cc       |   4 +-
 tensorflow/core/ops/training_ops.cc           |   4 +-
 4 files changed, 316 insertions(+), 313 deletions(-)

diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
index 53c4cee6ae..a359586467 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
@@ -28,227 +28,230 @@ from tensorflow.python.training import training_ops
 
 
 class _RefVariableAsynchronousProcessor(optimizer._RefVariableProcessor):
-    """Processor for Variable."""
-    def update_op_asynchronous(self, optimizer, g, index):
-        if isinstance(g, ops.Tensor):
-            return optimizer._apply_dense(g, self._v, index)
-        else:
-            assert isinstance(g, ops.IndexedSlices), ("Gradient ", g, " is neither a "
-                                                      "tensor nor IndexedSlices.")
-            # pylint: disable=protected-access
-            return optimizer._apply_sparse_duplicate_indices(g, self._v, index)
+  """Processor for Variable."""
+  def update_op_asynchronous(self, optimizer, g, index):
+    if isinstance(g, ops.Tensor):
+      return optimizer._apply_dense(g, self._v, index)
+    else:
+      assert isinstance(g, ops.IndexedSlices), ("Gradient ", g, " is neither a "
+                                                "tensor nor IndexedSlices.")
+      # pylint: disable=protected-access
+      return optimizer._apply_sparse_duplicate_indices(g, self._v, index)
+
 
 class _DenseResourceVariableAsynchronousProcessor(optimizer._DenseResourceVariableProcessor):
-    """Processor for dense ResourceVariables."""
-    def update_op_asynchronous(self, optimizer, g, index):
-        # pylint: disable=protected-access
-        if isinstance(g, ops.IndexedSlices):
-            return optimizer._resource_apply_sparse_duplicate_indices(
-                g.values, self._v, g.indices, index)
-        return optimizer._resource_apply_dense(g, self._v, index)
+  """Processor for dense ResourceVariables."""
+  def update_op_asynchronous(self, optimizer, g, index):
+    # pylint: disable=protected-access
+    if isinstance(g, ops.IndexedSlices):
+      return optimizer._resource_apply_sparse_duplicate_indices(
+        g.values, self._v, g.indices, index)
+    return optimizer._resource_apply_dense(g, self._v, index)
+
 
 def _get_processor(v):
-    """The processor of v."""
-    if isinstance(v, variables.Variable):
-        return _RefVariableAsynchronousProcessor(v)
-    if v.op.type == "VarHandleOp":
-        return _DenseResourceVariableAsynchronousProcessor(v)
-    raise NotImplementedError("Trying to optimize unsupported type ", v)
+  """The processor of v."""
+  if isinstance(v, variables.Variable):
+    return _RefVariableAsynchronousProcessor(v)
+  if v.op.type == "VarHandleOp":
+    return _DenseResourceVariableAsynchronousProcessor(v)
+  raise NotImplementedError("Trying to optimize unsupported type ", v)
+
 
 class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
-    """Optimizer that implements the gradient descent algorithm with delay
-    compensation.
+  """Optimizer that implements the gradient descent algorithm with delay
+  compensation.
+
+  See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
+  ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
+  """
+
+  def __init__(self, learning_rate, variance_parameter, num_workers=1,
+               use_locking=False, name="DelayCompensatedGradientDescent"):
+    """Construct a new gradient descent optimizer with delay compensation.
+
+    Args:
+      learning_rate: A Tensor or a floating point value.  The learning
+        rate to use.
+      variance_parameter: A Tensor or a floating point value. The lambda
+        value to use.
+      num_workers: A value to indicate number of workers computing gradients
+        asynchronously.
+      use_locking: If True use locks for update operations.
+      name: Optional name prefix for the operations created when applying
+        gradients. Defaults to "DelayCompensatedGradientDescent".
+      """
+    if num_workers <= 0:
+      raise ValueError("num_workers must be positive: %s" % num_workers)
+    super(DelayCompensatedGradientDescentOptimizer, self).__init__(
+          use_locking, name)
+    self._learning_rate = learning_rate
+    self._lambda = variance_parameter
+    self._num_workers = num_workers
 
-    See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
-    ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
+  def minimize(self, loss, global_step=None, var_list=None,
+               gate_gradients=optimizer.Optimizer.GATE_OP, aggregation_method=None,
+               colocate_gradients_with_ops=False, name=None,
+               grad_loss=None, worker_index=None):
+    """Add operations to minimize `loss` by updating `var_list`.
+
+    This method simply combines calls `compute_gradients()` and
+    `apply_gradients()`. If you want to process the gradient before applying
+    them call `compute_gradients()` and `apply_gradients()` explicitly instead
+    of using this function.
+
+    Args:
+      loss: A `Tensor` containing the value to minimize.
+      global_step: Optional `Variable` to increment by one after the
+        variables have been updated.
+      var_list: Optional list or tuple of `Variable` objects to update to
+        minimize `loss`.  Defaults to the list of variables collected in
+        the graph under the key `GraphKeys.TRAINABLE_VARIABLES`.
+      gate_gradients: How to gate the computation of gradients.  Can be
+        `GATE_NONE`, `GATE_OP`, or  `GATE_GRAPH`.
+      aggregation_method: Specifies the method used to combine gradient terms.
+        Valid values are defined in the class `AggregationMethod`.
+      colocate_gradients_with_ops: If True, try colocating gradients with
+        the corresponding op.
+      name: Optional name for the returned operation.
+      grad_loss: Optional. A `Tensor` holding the gradient computed for `loss`.
+      worker_index: Optional. A value to indicate the instance of worker
+        minimizing if computing asynchronously.
+
+    Returns:
+      An Operation that updates the variables in `var_list`.  If `global_step`
+      was not `None`, that operation also increments `global_step`.
+
+    Raises:
+      ValueError: If some of the variables are not `Variable` objects.
     """
+    if (worker_index < 0 and worker_index is not None) or worker_index >= self._num_workers:
+      raise ValueError("worker index must be in the range [0, num_workers): %s" %
+                        worker_index)
+    grads_and_vars = self.compute_gradients(
+        loss, var_list=var_list, gate_gradients=gate_gradients,
+        aggregation_method=aggregation_method,
+        colocate_gradients_with_ops=colocate_gradients_with_ops,
+        grad_loss=grad_loss)
+
+    vars_with_grad = [v for g, v in grads_and_vars if g is not None]
+    if not vars_with_grad:
+        raise ValueError(
+            "No gradients provided for any variable, check your graph for ops"
+            " that do not support gradients, between variables %s and loss %s." %
+            ([str(v) for _, v in grads_and_vars], loss))
 
-    def __init__(self, learning_rate, variance_parameter, num_workers=1,
-                 use_locking=False, name="DelayCompensatedGradientDescent"):
-        """Construct a new gradient descent optimizer with delay compensation.
-
-        Args:
-          learning_rate: A Tensor or a floating point value.  The learning
-            rate to use.
-          variance_parameter: A Tensor or a floating point value. The lambda
-            value to use.
-          num_workers: A value to indicate number of workers computing gradients
-            asynchronously.
-          use_locking: If True use locks for update operations.
-          name: Optional name prefix for the operations created when applying
-            gradients. Defaults to "DelayCompensatedGradientDescent".
-        """
-        if num_workers <= 0:
-            raise ValueError("num_workers must be positive: %s" % num_workers)
-        super(DelayCompensatedGradientDescentOptimizer, self).__init__(
-            use_locking, name)
-        self._learning_rate = learning_rate
-        self._lambda = variance_parameter
-        self._num_workers = num_workers
-
-    def minimize(self, loss, global_step=None, var_list=None,
-                 gate_gradients=optimizer.Optimizer.GATE_OP, aggregation_method=None,
-                 colocate_gradients_with_ops=False, name=None,
-                 grad_loss=None, worker_index=None):
-        """Add operations to minimize `loss` by updating `var_list`.
-
-        This method simply combines calls `compute_gradients()` and
-        `apply_gradients()`. If you want to process the gradient before applying
-        them call `compute_gradients()` and `apply_gradients()` explicitly instead
-        of using this function.
-
-        Args:
-          loss: A `Tensor` containing the value to minimize.
-          global_step: Optional `Variable` to increment by one after the
-            variables have been updated.
-          var_list: Optional list or tuple of `Variable` objects to update to
-            minimize `loss`.  Defaults to the list of variables collected in
-            the graph under the key `GraphKeys.TRAINABLE_VARIABLES`.
-          gate_gradients: How to gate the computation of gradients.  Can be
-            `GATE_NONE`, `GATE_OP`, or  `GATE_GRAPH`.
-          aggregation_method: Specifies the method used to combine gradient terms.
-            Valid values are defined in the class `AggregationMethod`.
-          colocate_gradients_with_ops: If True, try colocating gradients with
-            the corresponding op.
-          name: Optional name for the returned operation.
-          grad_loss: Optional. A `Tensor` holding the gradient computed for `loss`.
-          worker_index: Optional. A value to indicate the instance of worker
-            minimizing if computing asynchronously.
-
-        Returns:
-          An Operation that updates the variables in `var_list`.  If `global_step`
-          was not `None`, that operation also increments `global_step`.
-
-        Raises:
-          ValueError: If some of the variables are not `Variable` objects.
-        """
-        if (worker_index < 0 and worker_index is not None) or worker_index >= self._num_workers:
-            raise ValueError("worker index must be in the range [0, num_workers): %s" %
-                             worker_index)
-        grads_and_vars = self.compute_gradients(
-            loss, var_list=var_list, gate_gradients=gate_gradients,
-            aggregation_method=aggregation_method,
-            colocate_gradients_with_ops=colocate_gradients_with_ops,
-            grad_loss=grad_loss)
-
-        vars_with_grad = [v for g, v in grads_and_vars if g is not None]
-        if not vars_with_grad:
-            raise ValueError(
-                "No gradients provided for any variable, check your graph for ops"
-                " that do not support gradients, between variables %s and loss %s." %
-                ([str(v) for _, v in grads_and_vars], loss))
-
-        return self.apply_gradients(grads_and_vars, global_step=global_step,
+    return self.apply_gradients(grads_and_vars, global_step=global_step,
                                     name=name, worker_index=worker_index)
 
-    def apply_gradients(self,
-                        grads_and_vars,
-                        global_step=None,
-                        name=None,
-                        worker_index=None):
-        """Apply gradients to variables.
-
-        This is the second part of `minimize()`. It returns an `Operation` that
-        applies gradients.
-
-        Args:
-          grads_and_vars: List of (gradient, variable) pairs as returned by
-            `compute_gradients()`.
-          global_step: Optional `Variable` to increment by one after the
-            variables have been updated.
-          name: Optional name for the returned operation.  Default to the
-            name passed to the `Optimizer` constructor.
-          worker_index: Optional value to indicate the instance of worker
-            minimizing if computing asynchronously.
-
-        Returns:
-          An `Operation` that applies the specified gradients. If `global_step`
-          was not None, that operation also increments `global_step`.
-
-        Raises:
-          TypeError: If `grads_and_vars` is malformed.
-          ValueError: If none of the variables have gradients.
-        """
-        # This is a default implementation of apply_gradients() that can be shared
-        # by most optimizers.  It relies on the subclass implementing the following
-        # methods: _create_slots(), _prepare(), _apply_dense(), and _apply_sparse().
-
-        grads_and_vars = tuple(grads_and_vars)  # Make sure repeat iteration works.
-        if not grads_and_vars:
-            raise ValueError("No variables provided.")
-        converted_grads_and_vars = []
-        for g, v in grads_and_vars:
-            if g is not None:
-                try:
-                    # Convert the grad to Tensor or IndexedSlices if necessary.
-                    g = ops.convert_to_tensor_or_indexed_slices(g)
-                except TypeError:
-                    raise TypeError(
-                        "Gradient must be convertible to a Tensor"
-                        " or IndexedSlices, or None: %s" % g)
-                if not isinstance(g, (ops.Tensor, ops.IndexedSlices)):
-                    raise TypeError(
-                        "Gradient must be a Tensor, IndexedSlices, or None: %s" % g)
-            p = _get_processor(v)
-            converted_grads_and_vars.append((g, v, p))
-
-        converted_grads_and_vars = tuple(converted_grads_and_vars)
-        var_list = [v for g, v, _ in converted_grads_and_vars if g is not None]
-        if not var_list:
-            raise ValueError("No gradients provided for any variable: %s." %
-                             ([str(v) for _, _, v in converted_grads_and_vars],))
-        with ops.control_dependencies(None):
-            self._create_slots([optimizer._get_variable_for(v) for v in var_list])
-        update_ops = []
-        with ops.name_scope(name, self._name) as name:
-            self._prepare()
-            for grad, var, processor in converted_grads_and_vars:
-                if grad is None:
-                    continue
-                # We colocate all ops created in _apply_dense or _apply_sparse
-                # on the same device as the variable.
-                with ops.name_scope("update_" + var.op.name), ops.colocate_with(var):
-                    if worker_index is None:
-                        update_ops.append(processor.update_op(self, grad))
-                    else:
-                        update_ops.append(processor.update_op_asynchronous(self, grad,
-                                                                           worker_index))
-            if global_step is None:
-                apply_updates = self._finish(update_ops, name)
-            else:
-                with ops.control_dependencies([self._finish(update_ops, "update")]):
-                    with ops.colocate_with(global_step):
-                        apply_updates = state_ops.assign_add(global_step, 1, name=name).op
-
-            train_op = ops.get_collection_ref(ops.GraphKeys.TRAIN_OP)
-            if apply_updates not in train_op:
-                train_op.append(apply_updates)
-
-            return apply_updates
-
-    def _create_slots(self, var_list):
-        """Initialize slots for all the vars of each worker to store
-            the previous values of it
-        """
-        for index in range(self._num_workers):
-            for v in var_list:
-                var2 = array_ops.identity(v.initialized_value())
-                self._get_or_make_slot(v, var2, "shadow_{0}".format(index),
-                                       self._name)
-
-    def _apply_dense(self, grad, var, worker_index=0):
-        # Get previous value of the variable from the slot
-        shadow = self.get_slot(var, "shadow_{0}".format(worker_index))
-        return training_ops.apply_delay_compensated_gradient_descent(
-            var,
-            math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
-            grad,
-            math_ops.cast(self._lambda_tensor, var.dtype.base_dtype),
-            shadow,
-            use_locking=self._use_locking).op
-
-    def _prepare(self):
-        self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
-                                                           name="learning_rate")
-        self._lambda_tensor = ops.convert_to_tensor(self._lambda,
-                                                    name="lambda")
+  def apply_gradients(self,
+                      grads_and_vars,
+                      global_step=None,
+                      name=None,
+                      worker_index=None):
+    """Apply gradients to variables.
+
+    This is the second part of `minimize()`. It returns an `Operation` that
+    applies gradients.
+
+    Args:
+      grads_and_vars: List of (gradient, variable) pairs as returned by
+        `compute_gradients()`.
+      global_step: Optional `Variable` to increment by one after the
+        variables have been updated.
+      name: Optional name for the returned operation.  Default to the
+        name passed to the `Optimizer` constructor.
+      worker_index: Optional value to indicate the instance of worker
+        minimizing if computing asynchronously.
+
+    Returns:
+      An `Operation` that applies the specified gradients. If `global_step`
+      was not None, that operation also increments `global_step`.
+
+    Raises:
+      TypeError: If `grads_and_vars` is malformed.
+      ValueError: If none of the variables have gradients.
+    """
+    # This is a default implementation of apply_gradients() that can be shared
+    # by most optimizers.  It relies on the subclass implementing the following
+    # methods: _create_slots(), _prepare(), _apply_dense(), and _apply_sparse().
+
+    grads_and_vars = tuple(grads_and_vars)  # Make sure repeat iteration works.
+    if not grads_and_vars:
+      raise ValueError("No variables provided.")
+    converted_grads_and_vars = []
+    for g, v in grads_and_vars:
+      if g is not None:
+        try:
+          # Convert the grad to Tensor or IndexedSlices if necessary.
+          g = ops.convert_to_tensor_or_indexed_slices(g)
+        except TypeError:
+          raise TypeError(
+              "Gradient must be convertible to a Tensor"
+              " or IndexedSlices, or None: %s" % g)
+        if not isinstance(g, (ops.Tensor, ops.IndexedSlices)):
+          raise TypeError(
+              "Gradient must be a Tensor, IndexedSlices, or None: %s" % g)
+      p = _get_processor(v)
+      converted_grads_and_vars.append((g, v, p))
+
+    converted_grads_and_vars = tuple(converted_grads_and_vars)
+    var_list = [v for g, v, _ in converted_grads_and_vars if g is not None]
+    if not var_list:
+      raise ValueError("No gradients provided for any variable: %s." %
+                       ([str(v) for _, _, v in converted_grads_and_vars],))
+    with ops.control_dependencies(None):
+      self._create_slots([optimizer._get_variable_for(v) for v in var_list])
+    update_ops = []
+    with ops.name_scope(name, self._name) as name:
+      self._prepare()
+      for grad, var, processor in converted_grads_and_vars:
+        if grad is None:
+          continue
+        # We colocate all ops created in _apply_dense or _apply_sparse
+        # on the same device as the variable.
+        with ops.name_scope("update_" + var.op.name), ops.colocate_with(var):
+          if worker_index is None:
+            update_ops.append(processor.update_op(self, grad))
+          else:
+            update_ops.append(processor.update_op_asynchronous(self, grad,
+                                                               worker_index))
+      if global_step is None:
+        apply_updates = self._finish(update_ops, name)
+      else:
+        with ops.control_dependencies([self._finish(update_ops, "update")]):
+          with ops.colocate_with(global_step):
+            apply_updates = state_ops.assign_add(global_step, 1, name=name).op
+
+      train_op = ops.get_collection_ref(ops.GraphKeys.TRAIN_OP)
+      if apply_updates not in train_op:
+        train_op.append(apply_updates)
+
+      return apply_updates
+
+  def _create_slots(self, var_list):
+    """Initialize slots for all the vars of each worker to store
+        the previous values of it
+    """
+    for index in range(self._num_workers):
+      for v in var_list:
+        var2 = array_ops.identity(v.initialized_value())
+        self._get_or_make_slot(v, var2, "shadow_{0}".format(index),
+                               self._name)
+
+  def _apply_dense(self, grad, var, worker_index=0):
+    # Get previous value of the variable from the slot
+    shadow = self.get_slot(var, "shadow_{0}".format(worker_index))
+    return training_ops.apply_delay_compensated_gradient_descent(
+        var,
+        math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
+        grad,
+        math_ops.cast(self._lambda_tensor, var.dtype.base_dtype),
+        shadow,
+        use_locking=self._use_locking).op
+
+  def _prepare(self):
+    self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
+                                                       name="learning_rate")
+    self._lambda_tensor = ops.convert_to_tensor(self._lambda,
+                                                name="lambda")
diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
index 03051d0efb..ce5a0ad2e8 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
@@ -25,106 +25,104 @@ from tensorflow.python.platform import test
 from tensorflow.contrib.opt.python.training import delay_compensated_gradient_descent
 
 class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
+  def testBasic(self):
+    for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+      with self.test_session():
+        var0 = variables.Variable([1.0, 2.0], dtype=dtype)
+        var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+        grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
+        grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
+        optimizer = (delay_compensated_gradient_descent.
+                     DelayCompensatedGradientDescentOptimizer)(
+                         learning_rate=3.0,
+                         variance_parameter=2.0,
+                         num_workers=1)
+        sgd_op = optimizer.apply_gradients(
+            zip([grads0, grads1], [var0, var1]), worker_index=0)
+        variables.global_variables_initializer().run()
+        # Fetch params to validate initial values
+        self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
+        self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
+        # Run 1 step of sgd
+        sgd_op.run()
+        # Validate updated params
+        self.assertAllCloseAccordingToType(
+            [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
+        self.assertAllCloseAccordingToType(
+            [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
 
-    def testBasic(self):
-        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
-            with self.test_session():
-                var0 = variables.Variable([1.0, 2.0], dtype=dtype)
-                var1 = variables.Variable([3.0, 4.0], dtype=dtype)
-                grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
-                grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
-                optimizer = (delay_compensated_gradient_descent.
-                             DelayCompensatedGradientDescentOptimizer)(
-                                 learning_rate=3.0,
-                                 variance_parameter=2.0,
-                                 num_workers=1)
-                sgd_op = optimizer.apply_gradients(
-                    zip([grads0, grads1], [var0, var1]), worker_index=0)
-                variables.global_variables_initializer().run()
-                # Fetch params to validate initial values
-                self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
-                self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
-                # Run 1 step of sgd
-                sgd_op.run()
-                # Validate updated params
-                self.assertAllCloseAccordingToType(
-                    [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
-                self.assertAllCloseAccordingToType(
-                    [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
-
-    def testTensorLearningRate(self):
-        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
-            with self.test_session():
-                var0 = variables.Variable([1.0, 2.0], dtype=dtype)
-                var1 = variables.Variable([3.0, 4.0], dtype=dtype)
-                grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
-                grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
-                lrate = constant_op.constant(3.0)
-                optimizer = (delay_compensated_gradient_descent.
-                             DelayCompensatedGradientDescentOptimizer)(
-                                 learning_rate=3.0,
-                                 variance_parameter=2.0,
-                                 num_workers=1)
-                sgd_op = optimizer.apply_gradients(
-                    zip([grads0, grads1], [var0, var1]),
-                    worker_index=0)
-                variables.global_variables_initializer().run()
-                # Fetch params to validate initial values
-                self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
-                self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
-                # Run 1 step of sgd
-                sgd_op.run()
-                # Validate updated params
-                self.assertAllCloseAccordingToType(
-                    [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
-                self.assertAllCloseAccordingToType(
-                    [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
+  def testTensorLearningRate(self):
+    for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+      with self.test_session():
+        var0 = variables.Variable([1.0, 2.0], dtype=dtype)
+        var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+        grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
+        grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
+        lrate = constant_op.constant(3.0)
+        optimizer = (delay_compensated_gradient_descent.
+                     DelayCompensatedGradientDescentOptimizer)(
+                         learning_rate=3.0,
+                         variance_parameter=2.0,
+                         num_workers=1)
+        sgd_op = optimizer.apply_gradients(
+            zip([grads0, grads1], [var0, var1]), worker_index=0)
+        variables.global_variables_initializer().run()
+        # Fetch params to validate initial values
+        self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
+        self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
+        # Run 1 step of sgd
+        sgd_op.run()
+        # Validate updated params
+        self.assertAllCloseAccordingToType(
+            [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
+        self.assertAllCloseAccordingToType(
+            [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
 
     def testGradWrtRef(self):
-        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
-            with self.test_session():
-                optimizer = (delay_compensated_gradient_descent.
-                             DelayCompensatedGradientDescentOptimizer)(
-                                 learning_rate=3.0,
-                                 variance_parameter=2.0,
-                                 num_workers=1)
-                values = [1.0, 3.0]
-                vars_ = [variables.Variable([v], dtype=dtype) for v in values]
-                grads_and_vars = optimizer.compute_gradients(
-                    vars_[0] + vars_[1], vars_)
-                variables.global_variables_initializer().run()
-                for grad, _ in grads_and_vars:
-                    self.assertAllCloseAccordingToType([1.0], grad.eval())
+      for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+        with self.test_session():
+          optimizer = (delay_compensated_gradient_descent.
+                       DelayCompensatedGradientDescentOptimizer)(
+                           learning_rate=3.0,
+                           variance_parameter=2.0,
+                           num_workers=1)
+          values = [1.0, 3.0]
+          vars_ = [variables.Variable([v], dtype=dtype) for v in values]
+          grads_and_vars = optimizer.compute_gradients(
+              vars_[0] + vars_[1], vars_)
+          variables.global_variables_initializer().run()
+          for grad, _ in grads_and_vars:
+            self.assertAllCloseAccordingToType([1.0], grad.eval())
 
-    def testWithGlobalStep(self):
-        for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
-            with self.test_session():
-                global_step = variables.Variable(0, trainable=False)
-                var0 = variables.Variable([1.0, 2.0], dtype=dtype)
-                var1 = variables.Variable([3.0, 4.0], dtype=dtype)
-                grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
-                grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
-                optimizer = (delay_compensated_gradient_descent.
-                             DelayCompensatedGradientDescentOptimizer)(
-                                 learning_rate=3.0,
-                                 variance_parameter=2.0,
-                                 num_workers=1)
-                sgd_op = optimizer.apply_gradients(
-                    zip([grads0, grads1], [var0, var1]),
-                    global_step=global_step,
-                    worker_index=0)
-                variables.global_variables_initializer().run()
-                # Fetch params to validate initial values
-                self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
-                self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
-                # Run 1 step of sgd
-                sgd_op.run()
-                # Validate updated params and global_step
-                self.assertAllCloseAccordingToType(
-                    [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
-                self.assertAllCloseAccordingToType(
-                    [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
-                self.assertAllCloseAccordingToType(1, global_step.eval())
+  def testWithGlobalStep(self):
+    for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
+      with self.test_session():
+        global_step = variables.Variable(0, trainable=False)
+        var0 = variables.Variable([1.0, 2.0], dtype=dtype)
+        var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+        grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
+        grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
+        optimizer = (delay_compensated_gradient_descent.
+                     DelayCompensatedGradientDescentOptimizer)(
+                         learning_rate=3.0,
+                         variance_parameter=2.0,
+                         num_workers=1)
+        sgd_op = optimizer.apply_gradients(
+            zip([grads0, grads1], [var0, var1]),
+            global_step=global_step,
+            worker_index=0)
+        variables.global_variables_initializer().run()
+        # Fetch params to validate initial values
+        self.assertAllCloseAccordingToType([1.0, 2.0], var0.eval())
+        self.assertAllCloseAccordingToType([3.0, 4.0], var1.eval())
+        # Run 1 step of sgd
+        sgd_op.run()
+        # Validate updated params and global_step
+        self.assertAllCloseAccordingToType(
+            [1.0 - 3.0 * 0.1, 2.0 - 3.0 * 0.1], var0.eval())
+        self.assertAllCloseAccordingToType(
+            [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
+        self.assertAllCloseAccordingToType(1, global_step.eval())
 
 if __name__ == "__main__":
-    test.main()
+  test.main()
diff --git a/tensorflow/core/kernels/training_ops.cc b/tensorflow/core/kernels/training_ops.cc
index 4bda4898ca..f8a10c7306 100644
--- a/tensorflow/core/kernels/training_ops.cc
+++ b/tensorflow/core/kernels/training_ops.cc
@@ -443,7 +443,7 @@ class ApplyDelayCompensatedGradientDescentOp : public OpKernel {
     const Device& device = ctx->template eigen_device<Device>();
     functor::ApplyDelayCompensatedGradientDescent<Device, T>()(
         device, var.flat<T>(), alpha.scalar<T>(), delta.flat<T>(),
-         lambda.scalar<T>(), shadow.flat<T>()
+        lambda.scalar<T>(), shadow.flat<T>()
     );
 
     MaybeForwardRefInputToRefOutput(ctx, 0, 0);
@@ -457,6 +457,8 @@ class ApplyDelayCompensatedGradientDescentOp : public OpKernel {
   REGISTER_KERNEL_BUILDER(                                     \
       Name("ApplyDelayCompensatedGradientDescent")             \
           .Device(DEVICE_##D)                                  \
+          .HostMemory("var")                                   \
+          .HostMemory("shadow")                                \
           .TypeConstraint<T>("T"),                             \
       ApplyDelayCompensatedGradientDescentOp<D##Device, T>);
 #define REGISTER_CPU_KERNELS(T) REGISTER_KERNELS(CPU, T);
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index bf9b09ee80..0e4479750c 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -103,11 +103,11 @@ use_locking: If `True`, the subtraction will be protected by a lock;
 )doc");
 
 REGISTER_OP("ApplyDelayCompensatedGradientDescent")
-    .Input("var: Ref(T)")
+    .Input("var: resource")
     .Input("alpha: T")
     .Input("delta: T")
     .Input("lambda: T")
-    .Input("shadow: Ref(T)")
+    .Input("shadow: resource")
     .Output("out: Ref(T)")
     .Attr("T: numbertype")
     .Attr("use_locking: bool = false")
-- 
GitLab


From 2803742817755846f847ac506bbe20b4d4a14195 Mon Sep 17 00:00:00 2001
From: 4F2E4A2E <4F2E4A2E@users.noreply.github.com>
Date: Sat, 20 May 2017 01:04:16 +0200
Subject: [PATCH 1553/1563] Fixing 404-URL (#10052)

---
 tensorflow/docs_src/extend/tool_developers/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/docs_src/extend/tool_developers/index.md b/tensorflow/docs_src/extend/tool_developers/index.md
index 3705b310ed..06fc5e70dd 100644
--- a/tensorflow/docs_src/extend/tool_developers/index.md
+++ b/tensorflow/docs_src/extend/tool_developers/index.md
@@ -63,7 +63,7 @@ There are actually two different formats that a ProtoBuf can be saved in.
 TextFormat is a human-readable form, which makes it nice for debugging and
 editing, but can get large when there's numerical data like weights stored in
 it. You can see a small example of that in
-[graph_run_run2.pbtxt](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/components/tf_tensorboard/test/data/graph_run_run2.pbtxt).
+[graph_run_run2.pbtxt](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tensorboard/demo/data/graph_run_run2.pbtxt).
 
 Binary format files are a lot smaller than their text equivalents, even though
 they're not as readable for us. In this script, we ask the user to supply a
-- 
GitLab


From 1f6ed06221949c5a9037f2d81f30208d23f3afc6 Mon Sep 17 00:00:00 2001
From: Andreas Solleder <asol@num42.de>
Date: Sat, 20 May 2017 06:26:40 +0200
Subject: [PATCH 1554/1563] fix: typos using misspell

fix: typos

This PR is part of a campaign to fix a lot of typos on github!
You can see the progress on https://github.com/fixTypos/fix_typos/

https://github.com/client9/misspell
---
 configure                                            |  4 ++--
 tensorflow/compiler/xla/array4d.h                    |  2 +-
 tensorflow/compiler/xla/client/local_client.h        |  2 +-
 tensorflow/compiler/xla/literal_util.h               |  2 +-
 .../compiler/xla/service/buffer_liveness_test.cc     |  4 ++--
 tensorflow/compiler/xla/service/copy_insertion.cc    |  4 ++--
 .../compiler/xla/service/copy_insertion_test.cc      |  2 +-
 .../compiler/xla/service/gpu/convolution_thunk.cc    |  2 +-
 .../service/gpu/llvm_gpu_backend/gpu_backend_lib.cc  |  4 ++--
 .../compiler/xla/service/gpu/partition_assignment.h  |  2 +-
 .../compiler/xla/service/gpu/while_transformer.cc    |  2 +-
 .../compiler/xla/service/hlo_constant_folding.h      |  2 +-
 tensorflow/compiler/xla/service/hlo_cost_analysis.h  |  2 +-
 tensorflow/compiler/xla/service/hlo_evaluator.h      |  2 +-
 tensorflow/compiler/xla/service/hlo_ordering.cc      |  2 +-
 tensorflow/compiler/xla/service/layout_assignment.h  |  2 +-
 tensorflow/compiler/xla/service/llvm_ir/llvm_util.h  |  2 +-
 tensorflow/compiler/xla/tests/hlo_test_base.h        |  2 +-
 tensorflow/compiler/xla/tests/prng_test.cc           |  2 +-
 .../contrib/bayesflow/python/ops/monte_carlo_impl.py |  2 +-
 .../boosted_trees/lib/testutil/random_tree_gen.h     |  2 +-
 .../contrib/cloud/kernels/bigquery_reader_ops.cc     |  2 +-
 .../cloud/python/ops/bigquery_reader_ops_test.py     |  2 +-
 .../contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py    |  2 +-
 tensorflow/contrib/data/python/framework/function.py |  2 +-
 .../python/kernel_tests/vector_student_t_test.py     |  2 +-
 .../contrib/distributions/python/ops/binomial.py     |  2 +-
 tensorflow/contrib/graph_editor/util.py              |  2 +-
 tensorflow/contrib/hooks/README.md                   |  2 +-
 tensorflow/contrib/image/ops/image_ops.cc            |  2 +-
 tensorflow/contrib/image/python/ops/image_ops.py     |  2 +-
 .../keras/python/keras/applications/resnet50.py      |  4 ++--
 tensorflow/contrib/keras/python/keras/backend.py     |  6 +++---
 .../contrib/keras/python/keras/engine/topology.py    |  4 ++--
 .../keras/python/keras/wrappers/scikit_learn.py      |  2 +-
 .../python/mappers/random_fourier_features_test.py   |  2 +-
 tensorflow/contrib/labeled_tensor/python/ops/core.py |  2 +-
 .../layers/python/layers/target_column_test.py       |  2 +-
 .../python/learn/dataframe/tensorflow_dataframe.py   |  2 +-
 .../learn/python/learn/estimators/estimator.py       | 12 ++++++------
 .../contrib/learn/python/learn/estimators/head.py    |  6 +++---
 .../learn/python/learn/estimators/rnn_common.py      |  2 +-
 .../learn/python/learn/estimators/run_config.py      |  2 +-
 tensorflow/contrib/learn/python/learn/experiment.py  |  4 ++--
 .../contrib/learn/python/learn/learn_runner.py       |  2 +-
 .../contrib/learn/python/learn/ops/seq2seq_ops.py    |  2 +-
 .../learn/preprocessing/categorical_vocabulary.py    |  4 ++--
 tensorflow/contrib/learn/python/learn/trainable.py   |  2 +-
 .../contrib/learn/python/learn/utils/export.py       |  2 +-
 .../python/learn/utils/saved_model_export_utils.py   |  2 +-
 .../learn/utils/saved_model_export_utils_test.py     |  2 +-
 .../python/kernel_tests/seq2seq_test.py              |  2 +-
 .../python/kernel_tests/memory_stats_ops_test.py     |  2 +-
 .../contrib/metrics/python/ops/metric_ops_test.py    |  2 +-
 tensorflow/contrib/rnn/python/ops/rnn_cell.py        |  6 +++---
 .../contrib/seq2seq/python/ops/attention_wrapper.py  |  2 +-
 tensorflow/contrib/slim/README.md                    |  2 +-
 .../slim/python/slim/data/dataset_data_provider.py   |  2 +-
 .../tensorboard/plugins/projector/__init__.py        |  2 +-
 .../plugins/projector/projector_api_test.py          |  2 +-
 .../contrib/training/python/training/evaluation.py   |  2 +-
 .../contrib/training/python/training/hparam.py       |  2 +-
 .../python/training/sequence_queueing_state_saver.py |  4 ++--
 tensorflow/core/common_runtime/constant_folding.cc   |  2 +-
 tensorflow/core/common_runtime/executor.h            |  4 ++--
 tensorflow/core/common_runtime/session_factory.h     |  2 +-
 .../common_runtime/simple_graph_execution_state.cc   |  2 +-
 tensorflow/core/common_runtime/simple_placer.cc      |  2 +-
 tensorflow/core/debug/debug_service.proto            |  2 +-
 tensorflow/core/distributed_runtime/graph_mgr.h      | 10 +++++-----
 tensorflow/core/distributed_runtime/master.cc        |  2 +-
 tensorflow/core/distributed_runtime/rpc/grpc_call.h  |  4 ++--
 .../distributed_runtime/rpc/grpc_master_service.cc   |  2 +-
 .../distributed_runtime/rpc/grpc_session_test.cc     |  2 +-
 .../core/distributed_runtime/worker_cache_logger.cc  |  2 +-
 tensorflow/core/framework/cancellation.h             |  2 +-
 tensorflow/core/framework/function_test.cc           |  4 ++--
 tensorflow/core/graph/graph_constructor.h            |  2 +-
 .../core/grappler/costs/analytical_cost_estimator.h  |  2 +-
 tensorflow/core/grappler/costs/cost_estimator.h      |  2 +-
 .../core/grappler/costs/measuring_cost_estimator.h   |  2 +-
 .../core/grappler/costs/op_level_cost_estimator.h    |  2 +-
 tensorflow/core/grappler/optimizers/model_pruner.cc  |  2 +-
 tensorflow/core/grappler/optimizers/model_pruner.h   |  2 +-
 tensorflow/core/grappler/utils.h                     |  2 +-
 tensorflow/core/kernels/cast_op.h                    |  4 ++--
 tensorflow/core/kernels/conv_ops_fused.cc            |  2 +-
 tensorflow/core/kernels/cuda_solvers.h               |  2 +-
 tensorflow/core/kernels/deep_conv2d.cc               |  2 +-
 tensorflow/core/kernels/deep_conv2d.h                |  2 +-
 tensorflow/core/kernels/hinge-loss.h                 |  2 +-
 tensorflow/core/kernels/image_resizer_state.h        |  2 +-
 tensorflow/core/kernels/map_stage_op.cc              |  2 +-
 tensorflow/core/kernels/meta_support.h               |  2 +-
 tensorflow/core/kernels/mkl_conv_grad_input_ops.cc   |  2 +-
 tensorflow/core/kernels/padded_batch_dataset_op.cc   |  2 +-
 tensorflow/core/kernels/quantization_utils.h         |  2 +-
 tensorflow/core/kernels/smooth-hinge-loss.h          |  2 +-
 tensorflow/core/kernels/sparse_tensor_dense_add_op.h |  2 +-
 tensorflow/core/lib/gtl/optional.h                   |  4 ++--
 tensorflow/core/lib/jpeg/jpeg_mem.cc                 |  2 +-
 tensorflow/core/ops/data_flow_ops.cc                 |  6 +++---
 tensorflow/core/ops/ops.pbtxt                        |  6 +++---
 tensorflow/core/platform/posix/subprocess.cc         |  2 +-
 tensorflow/core/protobuf/master.proto                |  2 +-
 tensorflow/core/public/session.h                     |  2 +-
 tensorflow/core/util/ctc/ctc_loss_calculator.h       |  2 +-
 tensorflow/core/util/example_proto_fast_parsing.h    |  4 ++--
 tensorflow/core/util/tensor_bundle/tensor_bundle.h   |  2 +-
 tensorflow/docs_src/performance/xla/index.md         |  4 ++--
 .../docs_src/programmers_guide/reading_data.md       |  2 +-
 .../docs_src/programmers_guide/version_semantics.md  |  2 +-
 .../android/jni/object_tracking/image_utils.h        |  2 +-
 tensorflow/examples/udacity/1_notmnist.ipynb         |  4 ++--
 tensorflow/go/op/wrappers.go                         |  2 +-
 .../src/test/java/org/tensorflow/TensorFlowTest.java |  2 +-
 tensorflow/python/debug/cli/analyzer_cli.py          |  2 +-
 tensorflow/python/debug/cli/debugger_cli_common.py   |  2 +-
 tensorflow/python/debug/cli/profile_analyzer_cli.py  |  2 +-
 tensorflow/python/debug/lib/debug_utils.py           |  4 ++--
 tensorflow/python/debug/wrappers/dumping_wrapper.py  |  2 +-
 tensorflow/python/debug/wrappers/framework.py        |  2 +-
 tensorflow/python/estimator/estimator.py             |  2 +-
 tensorflow/python/framework/function.py              |  2 +-
 tensorflow/python/kernel_tests/barrier_ops_test.py   |  4 ++--
 tensorflow/python/kernel_tests/conv_ops_3d_test.py   |  2 +-
 .../kernel_tests/distributions/categorical_test.py   |  2 +-
 tensorflow/python/kernel_tests/metrics_test.py       |  2 +-
 tensorflow/python/kernel_tests/substr_op_test.py     |  2 +-
 .../python/kernel_tests/variable_scope_test.py       |  4 ++--
 tensorflow/python/ops/ctc_ops.py                     |  2 +-
 tensorflow/python/ops/data_flow_ops.py               |  4 ++--
 .../ops/distributions/transformed_distribution.py    |  4 ++--
 tensorflow/python/ops/image_ops_test.py              |  4 ++--
 tensorflow/python/ops/math_ops.py                    |  2 +-
 tensorflow/python/ops/math_ops_test.py               |  4 ++--
 tensorflow/python/ops/sparse_ops.py                  |  2 +-
 tensorflow/python/ops/special_math_ops.py            |  2 +-
 tensorflow/python/ops/variable_scope.py              |  2 +-
 tensorflow/python/tools/import_pb_to_tensorboard.py  |  2 +-
 tensorflow/python/training/evaluation.py             |  2 +-
 tensorflow/python/util/lazy_loader.py                |  2 +-
 tensorflow/stream_executor/cuda/cuda_diagnostics.h   |  2 +-
 tensorflow/stream_executor/cuda/cuda_driver.h        |  2 +-
 tensorflow/stream_executor/cuda/cuda_event.h         |  2 +-
 tensorflow/stream_executor/cuda/cuda_gpu_executor.cc |  2 +-
 tensorflow/stream_executor/plugin.h                  |  2 +-
 tensorflow/stream_executor/stream_executor_pimpl.h   |  6 +++---
 .../components/tf_backend_d3v4/behavior.ts           |  2 +-
 .../tf_dashboard_common/tf-chart-scaffold.html       |  2 +-
 .../tf_dashboard_common_d3v4/tf-chart-scaffold.html  |  2 +-
 .../components/tf_graph_common_d3v4/util.ts          |  2 +-
 .../components/tf_graph_d3v4/tf-graph-scene.html     |  2 +-
 .../tensorboard/components/tf_storage/storage.ts     |  6 +++---
 .../components/tf_storage_d3v4/storage.ts            |  6 +++---
 .../components/vz_data_summary/vz-data-summary.ts    |  2 +-
 .../components/vz_heatmap/vz-heatmap.html            |  4 ++--
 .../components/vz_heatmap_d3v4/vz-heatmap.html       |  4 ++--
 .../scatterPlotVisualizer3DLabels.ts                 |  2 +-
 .../vz-projector-inspector-panel.html                |  2 +-
 tensorflow/tensorboard/scripts/generate_testdata.py  |  2 +-
 .../tools/ci_build/windows/bazel/bazel_test_lib.sh   |  2 +-
 .../tools/dist_test/python/census_widendeep.py       |  2 +-
 .../tools/docker/parameterized_docker_build.sh       |  2 +-
 tensorflow/tools/docs/py_guide_parser.py             |  2 +-
 tensorflow/tools/gcs_test/python/gcs_smoke.py        |  2 +-
 tensorflow/tools/graph_transforms/README.md          |  2 +-
 tensorflow/tools/graph_transforms/transform_utils.h  |  2 +-
 third_party/gpus/cuda_configure.bzl                  |  2 +-
 third_party/hadoop/hdfs.h                            |  4 ++--
 third_party/py/python_configure.bzl                  |  2 +-
 third_party/sycl/sycl/LICENSE.text                   |  4 ++--
 172 files changed, 225 insertions(+), 225 deletions(-)

diff --git a/configure b/configure
index 23603a969d..e455893ffc 100755
--- a/configure
+++ b/configure
@@ -230,7 +230,7 @@ if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
     if [ -z "$MKL_INSTALL_PATH" ]; then
       MKL_INSTALL_PATH=$default_mkl_path
     fi
-    # Result returned from "read" will be used unexpanded. That make "~" unuseable.
+    # Result returned from "read" will be used unexpanded. That make "~" unusable.
     # Going through one more level of expansion to handle that.
     MKL_INSTALL_PATH=`${PYTHON_BIN_PATH} -c "import os; print(os.path.realpath(os.path.expanduser('${MKL_INSTALL_PATH}')))"`
   fi
@@ -565,7 +565,7 @@ while true; do
     if [ -z "$CUDNN_INSTALL_PATH" ]; then
       CUDNN_INSTALL_PATH=$default_cudnn_path
     fi
-    # Result returned from "read" will be used unexpanded. That make "~" unuseable.
+    # Result returned from "read" will be used unexpanded. That make "~" unusable.
     # Going through one more level of expansion to handle that.
     CUDNN_INSTALL_PATH=`"${PYTHON_BIN_PATH}" -c "import os; print(os.path.realpath(os.path.expanduser('${CUDNN_INSTALL_PATH}')))"`
   fi
diff --git a/tensorflow/compiler/xla/array4d.h b/tensorflow/compiler/xla/array4d.h
index 1c6ba1f519..56b638d978 100644
--- a/tensorflow/compiler/xla/array4d.h
+++ b/tensorflow/compiler/xla/array4d.h
@@ -65,7 +65,7 @@ class Array4D {
     Fill(T());
   }
 
-  // Creates a 4D array, initalized to value.
+  // Creates a 4D array, initialized to value.
   Array4D(int64 planes, int64 depth, int64 height, int64 width, T value)
       : Array4D(planes, depth, height, width) {
     Fill(value);
diff --git a/tensorflow/compiler/xla/client/local_client.h b/tensorflow/compiler/xla/client/local_client.h
index 49ffed4dde..c903cd2711 100644
--- a/tensorflow/compiler/xla/client/local_client.h
+++ b/tensorflow/compiler/xla/client/local_client.h
@@ -56,7 +56,7 @@ class ExecutableBuildOptions {
 
   // If set, this specifies the layout of the result of the computation. If not
   // set, the service will chose the layout of the result. A Shape is used to
-  // store the layout to accomodate tuple result shapes. A value of nullptr
+  // store the layout to accommodate tuple result shapes. A value of nullptr
   // indicates the option has not been set.
   ExecutableBuildOptions& set_result_layout(const Shape& shape_with_layout);
   const Shape* result_layout() const;
diff --git a/tensorflow/compiler/xla/literal_util.h b/tensorflow/compiler/xla/literal_util.h
index a05dc968ee..8e06f35b33 100644
--- a/tensorflow/compiler/xla/literal_util.h
+++ b/tensorflow/compiler/xla/literal_util.h
@@ -128,7 +128,7 @@ class LiteralUtil {
 
   // Creates a new value that has the equivalent value as literal, but conforms
   // to new_layout; e.g. a literal matrix that was in {0, 1} minor-to-major
-  // dimension layout can be re-layed-out as {1, 0} minor-to-major dimension
+  // dimension layout can be re-laid-out as {1, 0} minor-to-major dimension
   // layout and the value in the cell at any given logical index (i0, i1) will
   // be the same.
   //
diff --git a/tensorflow/compiler/xla/service/buffer_liveness_test.cc b/tensorflow/compiler/xla/service/buffer_liveness_test.cc
index c2184cc680..bee9a351f5 100644
--- a/tensorflow/compiler/xla/service/buffer_liveness_test.cc
+++ b/tensorflow/compiler/xla/service/buffer_liveness_test.cc
@@ -628,7 +628,7 @@ class FusedDynamicUpdateSliceLivenessTest : public BufferLivenessTest {
         BufferLiveness::Run(module.get(),
                             MakeUnique<DependencyHloOrdering>(module.get()))
             .ConsumeValueOrDie();
-    // Return whether or not buffers interfernce is detected between
+    // Return whether or not buffers interference is detected between
     // 'tuple_param0' and 'tuple_root' at shape index '{1}'.
     return TupleElementsMayInterfere(*liveness, tuple_param0, tuple_root, {1});
   }
@@ -740,7 +740,7 @@ class DynamicUpdateSliceLivenessTest : public BufferLivenessTest {
         BufferLiveness::Run(module.get(),
                             MakeUnique<DependencyHloOrdering>(module.get()))
             .ConsumeValueOrDie();
-    // Return whether or not buffers interfernce is detected between
+    // Return whether or not buffers interference is detected between
     // 'tuple_param0' and 'tuple_root' at shape index '{1}'.
     return TupleElementsMayInterfere(*liveness, tuple_param0, tuple_root, {1});
   }
diff --git a/tensorflow/compiler/xla/service/copy_insertion.cc b/tensorflow/compiler/xla/service/copy_insertion.cc
index 907b0307d4..3a1a9fe870 100644
--- a/tensorflow/compiler/xla/service/copy_insertion.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion.cc
@@ -141,7 +141,7 @@ class InstructionCopier {
   Status RecordAmbiguousOrNonDistinctIndices(
       const TuplePointsToAnalysis& points_to_analysis);
 
-  // Records instruction buffer indices which have interferring live ranges
+  // Records instruction buffer indices which have interfering live ranges
   // with 'other_instruction' buffers at same index.
   Status RecordIndicesWhichInterfereWithOtherInstruction(
       const BufferLiveness& liveness, const HloInstruction* other_instruction,
@@ -431,7 +431,7 @@ HloInstruction* InstructionCopier::Copy() {
   return copy;
 }
 
-// The 'read_only_indices' are initalized based on points-to analysis on the
+// The 'read_only_indices' are initialized based on points-to analysis on the
 // while body corresponding to 'while_hlo'. If the init buffer corresponding to
 // a read-only index aliases with an entry parameter (or constant), it cannot be
 // considered read-only, and must be copied. This is necessary because some
diff --git a/tensorflow/compiler/xla/service/copy_insertion_test.cc b/tensorflow/compiler/xla/service/copy_insertion_test.cc
index 4a14fc5397..661f682e38 100644
--- a/tensorflow/compiler/xla/service/copy_insertion_test.cc
+++ b/tensorflow/compiler/xla/service/copy_insertion_test.cc
@@ -972,7 +972,7 @@ TEST_F(WhileCopyInsertionTest, InitPointsToNonDistinct) {
                                   op::Copy(old_init->operand(1)->operand(0)))));
 }
 
-// Tests while init instruction buffer which interfers with while result buffer.
+// Tests while init instruction buffer which interferes with while result buffer.
 //
 //     init_data = Broadcast(...)
 //     add_unrelated = Add(init_data) // takes a reference to cause interference
diff --git a/tensorflow/compiler/xla/service/gpu/convolution_thunk.cc b/tensorflow/compiler/xla/service/gpu/convolution_thunk.cc
index f6b7fe1e8e..94acf5a359 100644
--- a/tensorflow/compiler/xla/service/gpu/convolution_thunk.cc
+++ b/tensorflow/compiler/xla/service/gpu/convolution_thunk.cc
@@ -125,7 +125,7 @@ tensorflow::Status ConvolutionThunk::ExecuteOnStream(
   CHECK_LE(num_dimensions, 3);
   // cuDNN does not support 1D convolutions. We therefore express 1D
   // convolutions as 2D convolutions where the first spatial dimension is 1.
-  // This matches the behaviour of TF (see definition of conv1d in
+  // This matches the behavior of TF (see definition of conv1d in
   // tensorflow/python/ops/nn_ops.py).
   const int effective_num_dimensions = std::max(2, num_dimensions);
 
diff --git a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
index 383729185d..4f34cb77b0 100644
--- a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
+++ b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
@@ -405,9 +405,9 @@ StatusOr<string> CompileModuleToPtx(llvm::Module* module,
 
   AddOptimizationPasses(flags->opt_level, /*size_level=*/0,
                         target_machine.get(), &module_passes, &function_passes);
-  // Loop unrolling exposes more opportunites for SROA. Therefore, we run SROA
+  // Loop unrolling exposes more opportunities for SROA. Therefore, we run SROA
   // again after the standard optimization passes [http://b/13329423].
-  // TODO(jingyue): SROA may further expose more optimization opportunites, such
+  // TODO(jingyue): SROA may further expose more optimization opportunities, such
   // as more precise alias analysis and more function inlining (SROA may change
   // the inlining cost of a function). For now, running SROA already emits good
   // enough code for the evaluated benchmarks. We may want to run more
diff --git a/tensorflow/compiler/xla/service/gpu/partition_assignment.h b/tensorflow/compiler/xla/service/gpu/partition_assignment.h
index 8ac4c59966..8f7fce884a 100644
--- a/tensorflow/compiler/xla/service/gpu/partition_assignment.h
+++ b/tensorflow/compiler/xla/service/gpu/partition_assignment.h
@@ -33,7 +33,7 @@ namespace gpu {
 enum class PartitionStrategy {
   // Optimized for latency by allowing maximum number of registers per thread.
   kLatency,
-  // Optimized for throughtput. This may limit registers per thread and cause
+  // Optimized for throughput. This may limit registers per thread and cause
   // longer latency.
   kThroughput
 };
diff --git a/tensorflow/compiler/xla/service/gpu/while_transformer.cc b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
index 61bc6f6055..61a9e7e9e1 100644
--- a/tensorflow/compiler/xla/service/gpu/while_transformer.cc
+++ b/tensorflow/compiler/xla/service/gpu/while_transformer.cc
@@ -37,7 +37,7 @@ namespace {
 // patterns to match.
 //
 // Each ExprTree node is comprised of an HloOpcode, and a set of operands (each
-// of type ExprTree). Operands can be added by specifing the index and HloOpcode
+// of type ExprTree). Operands can be added by specifying the index and HloOpcode
 // of the operand.
 //
 // For example, the following computation:
diff --git a/tensorflow/compiler/xla/service/hlo_constant_folding.h b/tensorflow/compiler/xla/service/hlo_constant_folding.h
index f45eccf825..331480bd02 100644
--- a/tensorflow/compiler/xla/service/hlo_constant_folding.h
+++ b/tensorflow/compiler/xla/service/hlo_constant_folding.h
@@ -21,7 +21,7 @@ limitations under the License.
 
 namespace xla {
 
-// A pass which performs constant folding in order to avoid unecessary
+// A pass which performs constant folding in order to avoid unnecessary
 // computation on constants.
 class HloConstantFolding : public HloPassInterface {
  public:
diff --git a/tensorflow/compiler/xla/service/hlo_cost_analysis.h b/tensorflow/compiler/xla/service/hlo_cost_analysis.h
index 7d22548234..b2c40f75ca 100644
--- a/tensorflow/compiler/xla/service/hlo_cost_analysis.h
+++ b/tensorflow/compiler/xla/service/hlo_cost_analysis.h
@@ -133,7 +133,7 @@ class HloCostAnalysis : public DfsHloVisitor {
   int64 bytes_accessed() const { return bytes_accessed_; }
 
  private:
-  // An FMA counts as two floating point operations in these analyses.
+  // An FMA counts as two floating point operations in these analyzes.
   static constexpr int64 kFmaFlops = 2;
 
   // Utility function to handle all element-wise operations.
diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.h b/tensorflow/compiler/xla/service/hlo_evaluator.h
index 50cb32eb85..040fd3d73c 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.h
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.h
@@ -104,7 +104,7 @@ class HloEvaluator : public DfsHloVisitorWithDefault {
                            std::hash<int>>
       typed_visitors_;
 
-  // Tracks the HLO instruciton and its evaluated literal result.
+  // Tracks the HLO instruction and its evaluated literal result.
   // TODO(b/35950897): have better memory management here to free instructions
   // that are no longer a parent for any other subsequent instruction in
   // post-orderring.
diff --git a/tensorflow/compiler/xla/service/hlo_ordering.cc b/tensorflow/compiler/xla/service/hlo_ordering.cc
index 725ce17d66..d1ef8cb691 100644
--- a/tensorflow/compiler/xla/service/hlo_ordering.cc
+++ b/tensorflow/compiler/xla/service/hlo_ordering.cc
@@ -343,7 +343,7 @@ class ListScheduler {
     return freed_bytes;
   }
 
-  // Construct the scheduling priority of the given instruciton.
+  // Construct the scheduling priority of the given instruction.
   Priority GetPriority(const HloInstruction* instruction) {
     return {BytesFreedIfScheduled(instruction), instruction->user_count()};
   }
diff --git a/tensorflow/compiler/xla/service/layout_assignment.h b/tensorflow/compiler/xla/service/layout_assignment.h
index ae53702a28..689e4510ed 100644
--- a/tensorflow/compiler/xla/service/layout_assignment.h
+++ b/tensorflow/compiler/xla/service/layout_assignment.h
@@ -273,7 +273,7 @@ class LayoutAssignment : public HloPassInterface {
     return Status::OK();
   }
 
-  // This method can be overriden to mark instructions as requiring the operands
+  // This method can be overridden to mark instructions as requiring the operands
   // to have the same layout as the result, for performance or correctness. This
   // will propagate constraints through the instruction from the result into the
   // operands.
diff --git a/tensorflow/compiler/xla/service/llvm_ir/llvm_util.h b/tensorflow/compiler/xla/service/llvm_ir/llvm_util.h
index 28488ca999..964b359bb0 100644
--- a/tensorflow/compiler/xla/service/llvm_ir/llvm_util.h
+++ b/tensorflow/compiler/xla/service/llvm_ir/llvm_util.h
@@ -130,7 +130,7 @@ llvm::AllocaInst* EmitAllocaAtFunctionEntryWithCount(
     llvm::Type* type, llvm::Value* element_count, tensorflow::StringPiece name,
     llvm::IRBuilder<>* ir_builder, int alignment = 0);
 
-// Creates a basic block with the same context and funtion as for the
+// Creates a basic block with the same context and function as for the
 // builder. Inserts at the end of the function if insert_before is
 // null.
 llvm::BasicBlock* CreateBasicBlock(llvm::BasicBlock* insert_before,
diff --git a/tensorflow/compiler/xla/tests/hlo_test_base.h b/tensorflow/compiler/xla/tests/hlo_test_base.h
index 91fc9b87cd..d94602ffda 100644
--- a/tensorflow/compiler/xla/tests/hlo_test_base.h
+++ b/tensorflow/compiler/xla/tests/hlo_test_base.h
@@ -65,7 +65,7 @@ class HloTestBase : public ::testing::Test {
   perftools::gputools::DeviceMemoryBase TransferToDevice(
       const Literal& literal);
 
-  // Transfers the array refered to by the given handle from the device and
+  // Transfers the array referred to by the given handle from the device and
   // returns as a Literal.
   std::unique_ptr<Literal> TransferFromDevice(
       const Shape& shape, perftools::gputools::DeviceMemoryBase device_base);
diff --git a/tensorflow/compiler/xla/tests/prng_test.cc b/tensorflow/compiler/xla/tests/prng_test.cc
index 5a6aa467e5..a0f98fcfef 100644
--- a/tensorflow/compiler/xla/tests/prng_test.cc
+++ b/tensorflow/compiler/xla/tests/prng_test.cc
@@ -194,7 +194,7 @@ XLA_TEST_F(PrngTest, MapUsingRng) {
   }
 }
 
-// This tests demonstrates the global seeding behaviour.
+// This tests demonstrates the global seeding behavior.
 // * If a seed is passed in via Execute (ExecuteAndTransfer) then the output is
 //   fixed (i.e., there is a single output for a given seed);
 // * If no seed is passed in then the output of every call can be different;
diff --git a/tensorflow/contrib/bayesflow/python/ops/monte_carlo_impl.py b/tensorflow/contrib/bayesflow/python/ops/monte_carlo_impl.py
index 55e0e6d57b..3590f940ac 100644
--- a/tensorflow/contrib/bayesflow/python/ops/monte_carlo_impl.py
+++ b/tensorflow/contrib/bayesflow/python/ops/monte_carlo_impl.py
@@ -177,7 +177,7 @@ def _logspace_mean(log_values):
       `Log[Mean[values]]`.
   """
   # center = Max[Log[values]],  with stop-gradient
-  # The center hopefully keep the exponentiated term small.  It is cancelled
+  # The center hopefully keep the exponentiated term small.  It is canceled
   # from the final result, so putting stop gradient on it will not change the
   # final result.  We put stop gradient on to eliminate unnecessary computation.
   center = array_ops.stop_gradient(_sample_max(log_values))
diff --git a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h
index dc584bbd3c..5e12429ba7 100644
--- a/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h
+++ b/tensorflow/contrib/boosted_trees/lib/testutil/random_tree_gen.h
@@ -42,7 +42,7 @@ class RandomTreeGen {
   boosted_trees::trees::DecisionTreeConfig Generate(
       const boosted_trees::trees::DecisionTreeConfig& tree);
 
-  // Requried: depth >= 1; tree_count >= 1.
+  // Required: depth >= 1; tree_count >= 1.
   boosted_trees::trees::DecisionTreeEnsembleConfig GenerateEnsemble(
       int dept, int tree_count);
 
diff --git a/tensorflow/contrib/cloud/kernels/bigquery_reader_ops.cc b/tensorflow/contrib/cloud/kernels/bigquery_reader_ops.cc
index 02a759eefd..093000559b 100644
--- a/tensorflow/contrib/cloud/kernels/bigquery_reader_ops.cc
+++ b/tensorflow/contrib/cloud/kernels/bigquery_reader_ops.cc
@@ -46,7 +46,7 @@ Status GetTableAttrs(OpKernelConstruction* context, string* project_id,
 
 }  // namespace
 
-// Note that overriden methods with names ending in "Locked" are called by
+// Note that overridden methods with names ending in "Locked" are called by
 // ReaderBase while a mutex is held.
 // See comments for ReaderBase.
 class BigQueryReader : public ReaderBase {
diff --git a/tensorflow/contrib/cloud/python/ops/bigquery_reader_ops_test.py b/tensorflow/contrib/cloud/python/ops/bigquery_reader_ops_test.py
index 9acdb4b102..493b3c6f1b 100644
--- a/tensorflow/contrib/cloud/python/ops/bigquery_reader_ops_test.py
+++ b/tensorflow/contrib/cloud/python/ops/bigquery_reader_ops_test.py
@@ -46,7 +46,7 @@ _TABLE = "test-table"
 # The values for rows are generated such that some columns have null values. The
 # general formula here is:
 #   - The int64 column is present in every row.
-#   - The string column is only avaiable in even rows.
+#   - The string column is only available in even rows.
 #   - The float column is only available in every third row.
 _ROWS = [[0, "s_0", 0.1], [1, None, None], [2, "s_2", None], [3, None, 3.1],
          [4, "s_4", None], [5, None, None], [6, "s_6", 6.1], [7, None, None],
diff --git a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
index 4f70b275e8..cc0c7b0829 100644
--- a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
+++ b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py
@@ -141,7 +141,7 @@ _cudnn_rnn_common_doc_string = """
     * Once a while, the user saves the parameter buffer into model checkpoints
         with Saver.save().
     * When restoring, the user creates a RNNParamsSaveable object and uses
-      Saver.restore() to restore the paramter buffer from the canonical format
+      Saver.restore() to restore the parameter buffer from the canonical format
       to a user-defined format, as well as to restore other savable objects
       in the checkpoint file.
 """
diff --git a/tensorflow/contrib/data/python/framework/function.py b/tensorflow/contrib/data/python/framework/function.py
index a446c935ab..6aa44a736a 100644
--- a/tensorflow/contrib/data/python/framework/function.py
+++ b/tensorflow/contrib/data/python/framework/function.py
@@ -39,7 +39,7 @@ class _ExperimentalFuncGraph(function._FuncGraph):
   _ExperimentalFuncGraph overrides ops.Graph's create_op() so that we can keep
   track of every inputs into every op created inside the function.  If
   any input is from other graphs, we keep track of it in self.capture
-  and substitue the input with a place holder.
+  and substitute the input with a place holder.
 
   Each captured input's corresponding place holder is converted into a
   function argument and the caller passes in the captured tensor.
diff --git a/tensorflow/contrib/distributions/python/kernel_tests/vector_student_t_test.py b/tensorflow/contrib/distributions/python/kernel_tests/vector_student_t_test.py
index 9d0ffd6376..b8a3a262ce 100644
--- a/tensorflow/contrib/distributions/python/kernel_tests/vector_student_t_test.py
+++ b/tensorflow/contrib/distributions/python/kernel_tests/vector_student_t_test.py
@@ -38,7 +38,7 @@ class _FakeVectorStudentT(object):
 
   Other `Vector*` implementations need only test new code. That we don't need
   to test every Vector* distribution is good because there aren't SciPy
-  analogues and reimplementing everything in NumPy sort of defeats the point of
+  analogs and reimplementing everything in NumPy sort of defeats the point of
   having the `TransformedDistribution + Affine` API.
   """
 
diff --git a/tensorflow/contrib/distributions/python/ops/binomial.py b/tensorflow/contrib/distributions/python/ops/binomial.py
index ecf6a61156..9304a56491 100644
--- a/tensorflow/contrib/distributions/python/ops/binomial.py
+++ b/tensorflow/contrib/distributions/python/ops/binomial.py
@@ -269,7 +269,7 @@ class Binomial(distribution.Distribution):
             message="total_count must be non-negative."),
         distribution_util.assert_integer_form(
             total_count,
-            message="total_count cannot contain fractional componentes."),
+            message="total_count cannot contain fractional components."),
     ], total_count)
 
   def _maybe_assert_valid_sample(self, counts, check_integer=True):
diff --git a/tensorflow/contrib/graph_editor/util.py b/tensorflow/contrib/graph_editor/util.py
index ec32beda5a..959905e982 100644
--- a/tensorflow/contrib/graph_editor/util.py
+++ b/tensorflow/contrib/graph_editor/util.py
@@ -130,7 +130,7 @@ def transform_tree(tree, fn, iterable_type=tuple):
     tree: iterable or not. If iterable, its elements (child) can also be
       iterable or not.
     fn: function to apply to each leaves.
-    iterable_type: type use to construct the resulting tree for unknwon
+    iterable_type: type use to construct the resulting tree for unknown
       iterable, typically `list` or `tuple`.
   Returns:
     A tree whose leaves has been transformed by `fn`.
diff --git a/tensorflow/contrib/hooks/README.md b/tensorflow/contrib/hooks/README.md
index c7f88bb111..84dd6ac879 100644
--- a/tensorflow/contrib/hooks/README.md
+++ b/tensorflow/contrib/hooks/README.md
@@ -5,7 +5,7 @@ of `SessionRunHook` and are to be used with helpers like `MonitoredSession`
 and `learn.Estimator` that wrap `tensorflow.Session`.
 
 The hooks are called between invocations of `Session.run()` to perform custom
-behaviour.
+behavior.
 
 For example the `ProfilerHook` periodically collects `RunMetadata` after
 `Session.run()` and saves profiling information that can be viewed in a
diff --git a/tensorflow/contrib/image/ops/image_ops.cc b/tensorflow/contrib/image/ops/image_ops.cc
index 6b24eaf2a5..740854930c 100644
--- a/tensorflow/contrib/image/ops/image_ops.cc
+++ b/tensorflow/contrib/image/ops/image_ops.cc
@@ -77,7 +77,7 @@ REGISTER_OP("BipartiteMatch")
     .Doc(R"doc(
 Find bipartite matching based on a given distance matrix.
 
-A greedy bi-partite matching alogrithm is used to obtain the matching with the
+A greedy bi-partite matching algorithm is used to obtain the matching with the
 (greedy) minimum distance.
 
 distance_mat: A 2-D float tensor of shape `[num_rows, num_columns]`. It is a
diff --git a/tensorflow/contrib/image/python/ops/image_ops.py b/tensorflow/contrib/image/python/ops/image_ops.py
index da374f8cef..b396dcea21 100644
--- a/tensorflow/contrib/image/python/ops/image_ops.py
+++ b/tensorflow/contrib/image/python/ops/image_ops.py
@@ -266,7 +266,7 @@ def bipartite_match(
     top_k=-1):
   """Find bipartite matching based on a given distance matrix.
 
-  A greedy bi-partite matching alogrithm is used to obtain the matching with
+  A greedy bi-partite matching algorithm is used to obtain the matching with
   the (greedy) minimum distance.
 
   Args:
diff --git a/tensorflow/contrib/keras/python/keras/applications/resnet50.py b/tensorflow/contrib/keras/python/keras/applications/resnet50.py
index 12f7ca424e..640cc9a386 100644
--- a/tensorflow/contrib/keras/python/keras/applications/resnet50.py
+++ b/tensorflow/contrib/keras/python/keras/applications/resnet50.py
@@ -59,7 +59,7 @@ def identity_block(input_tensor, kernel_size, filters, stage, block):
 
   Arguments:
       input_tensor: input tensor
-      kernel_size: defualt 3, the kernel size of middle conv layer at main path
+      kernel_size: default 3, the kernel size of middle conv layer at main path
       filters: list of integers, the filterss of 3 conv layer at main path
       stage: integer, current stage label, used for generating layer names
       block: 'a','b'..., current block label, used for generating layer names
@@ -98,7 +98,7 @@ def conv_block(input_tensor, kernel_size, filters, stage, block, strides=(2,
 
   Arguments:
       input_tensor: input tensor
-      kernel_size: defualt 3, the kernel size of middle conv layer at main path
+      kernel_size: default 3, the kernel size of middle conv layer at main path
       filters: list of integers, the filterss of 3 conv layer at main path
       stage: integer, current stage label, used for generating layer names
       block: 'a','b'..., current block label, used for generating layer names
diff --git a/tensorflow/contrib/keras/python/keras/backend.py b/tensorflow/contrib/keras/python/keras/backend.py
index 905ef13e14..8bc3327552 100644
--- a/tensorflow/contrib/keras/python/keras/backend.py
+++ b/tensorflow/contrib/keras/python/keras/backend.py
@@ -91,7 +91,7 @@ _IMAGE_DATA_FORMAT = 'channels_last'
 def backend():
   """Publicly accessible method for determining the current backend.
 
-  Only exists for API compatibily with multi-backend Keras.
+  Only exists for API compatibility with multi-backend Keras.
 
   Returns:
       The string "tensorflow".
@@ -2617,7 +2617,7 @@ def in_train_phase(x, alt, training=None):
           (tensor or callable that returns a tensor).
       training: Optional scalar tensor
           (or Python boolean, or Python integer)
-          specifing the learning phase.
+          specifying the learning phase.
 
   Returns:
       Either `x` or `alt` based on the `training` flag.
@@ -2660,7 +2660,7 @@ def in_test_phase(x, alt, training=None):
           (tensor or callable that returns a tensor).
       training: Optional scalar tensor
           (or Python boolean, or Python integer)
-          specifing the learning phase.
+          specifying the learning phase.
 
   Returns:
       Either `x` or `alt` based on `K.learning_phase`.
diff --git a/tensorflow/contrib/keras/python/keras/engine/topology.py b/tensorflow/contrib/keras/python/keras/engine/topology.py
index 8bc0c412b5..6f45bf7433 100644
--- a/tensorflow/contrib/keras/python/keras/engine/topology.py
+++ b/tensorflow/contrib/keras/python/keras/engine/topology.py
@@ -1546,7 +1546,7 @@ class Container(Layer):
     """Retrieve the model's updates.
 
     Will only include updates that are either
-    inconditional, or conditional on inputs to this model
+    unconditional, or conditional on inputs to this model
     (e.g. will not include updates that depend on tensors
     that aren't inputs to this model).
 
@@ -1573,7 +1573,7 @@ class Container(Layer):
     """Retrieve the model's losses.
 
     Will only include losses that are either
-    inconditional, or conditional on inputs to this model
+    unconditional, or conditional on inputs to this model
     (e.g. will not include losses that depend on tensors
     that aren't inputs to this model).
 
diff --git a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
index 9f8cea375b..0d04fc120f 100644
--- a/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
+++ b/tensorflow/contrib/keras/python/keras/wrappers/scikit_learn.py
@@ -109,7 +109,7 @@ class BaseWrapper(object):
     """Gets parameters for this estimator.
 
     Arguments:
-        **params: ignored (exists for API compatiblity).
+        **params: ignored (exists for API compatibility).
 
     Returns:
         Dictionary of parameter names mapped to their values.
diff --git a/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features_test.py b/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features_test.py
index 200d00b663..6f4a264485 100644
--- a/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features_test.py
+++ b/tensorflow/contrib/kernel_methods/python/mappers/random_fourier_features_test.py
@@ -85,7 +85,7 @@ class RandomFourierFeatureMapperTest(TensorFlowTestCase):
       mapped_x = rffm.map(x)
       mapped_x_copy = rffm.map(x)
       # Two different evaluations of tensors output by map on the same input
-      # are identical because the same paramaters are used for the mappings.
+      # are identical because the same parameters are used for the mappings.
       self.assertAllClose(mapped_x.eval(), mapped_x_copy.eval(), atol=0.001)
 
   def testTwoMapperObjects(self):
diff --git a/tensorflow/contrib/labeled_tensor/python/ops/core.py b/tensorflow/contrib/labeled_tensor/python/ops/core.py
index e6aded92ca..d886a17c49 100644
--- a/tensorflow/contrib/labeled_tensor/python/ops/core.py
+++ b/tensorflow/contrib/labeled_tensor/python/ops/core.py
@@ -618,7 +618,7 @@ def identity(labeled_tensor, name=None):
 def slice_function(labeled_tensor, selection, name=None):
   """Slice out a subset of the tensor.
 
-  This is an analogue of tf.slice.
+  This is an analog of tf.slice.
   For example:
   >>> tensor = tf.reshape(tf.range(0, 6), [3, 2])
   >>> labeled_tensor = lt.LabeledTensor(tensor, ['a', ('b', ['foo', 'bar'])])
diff --git a/tensorflow/contrib/layers/python/layers/target_column_test.py b/tensorflow/contrib/layers/python/layers/target_column_test.py
index 1baa663151..d5d03fb1eb 100644
--- a/tensorflow/contrib/layers/python/layers/target_column_test.py
+++ b/tensorflow/contrib/layers/python/layers/target_column_test.py
@@ -28,7 +28,7 @@ from tensorflow.python.platform import test
 
 class RegressionTargetColumnTest(test.TestCase):
 
-  # TODO(zakaria): test multilabel regresssion.
+  # TODO(zakaria): test multilabel regression.
   def testRegression(self):
     target_column = target_column_lib.regression_target()
     with ops.Graph().as_default(), session.Session() as sess:
diff --git a/tensorflow/contrib/learn/python/learn/dataframe/tensorflow_dataframe.py b/tensorflow/contrib/learn/python/learn/dataframe/tensorflow_dataframe.py
index b17a4b8d05..f316c5c980 100644
--- a/tensorflow/contrib/learn/python/learn/dataframe/tensorflow_dataframe.py
+++ b/tensorflow/contrib/learn/python/learn/dataframe/tensorflow_dataframe.py
@@ -97,7 +97,7 @@ class TensorFlowDataFrame(df.DataFrame):
       graph: the `Graph` in which the `DataFrame` should be built.
       session: the `Session` in which to run the columns of the `DataFrame`.
       start_queues: if true, queues will be started before running and halted
-        after producting `n` batches.
+        after producing `n` batches.
       initialize_variables: if true, variables will be initialized.
       **kwargs: Additional keyword arguments e.g. `num_epochs`.
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index d7ba2209ad..ddd3d087e7 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -89,7 +89,7 @@ SCIKIT_DECOUPLE_INSTRUCTIONS = (
 
 
 def _verify_input_args(x, y, input_fn, feed_fn, batch_size):
-  """Verifies validity of co-existance of input arguments."""
+  """Verifies validity of co-existence of input arguments."""
   if input_fn is None:
     if x is None:
       raise ValueError('Either x or input_fn must be provided.')
@@ -358,7 +358,7 @@ class BaseEstimator(
   """
   __metaclass__ = abc.ABCMeta
 
-  # Note that for Google users, this is overriden with
+  # Note that for Google users, this is overridden with
   # learn_runner.EstimatorConfig.
   # TODO(wicke): Remove this once launcher takes over config functionality
   _Config = run_config.RunConfig  # pylint: disable=invalid-name
@@ -703,7 +703,7 @@ class BaseEstimator(
   def _get_eval_ops(self, features, labels, metrics):
     """Method that builds model graph and returns evaluation ops.
 
-    Expected to be overriden by sub-classes that require custom support.
+    Expected to be overridden by sub-classes that require custom support.
 
     Args:
       features: `Tensor` or `dict` of `Tensor` objects.
@@ -1149,7 +1149,7 @@ class Estimator(BaseEstimator):
   def _get_train_ops(self, features, labels):
     """Method that builds model graph and returns trainer ops.
 
-    Expected to be overriden by sub-classes that require custom support.
+    Expected to be overridden by sub-classes that require custom support.
     This implementation uses `model_fn` passed as parameter to constructor to
     build model.
 
@@ -1165,7 +1165,7 @@ class Estimator(BaseEstimator):
   def _get_eval_ops(self, features, labels, metrics):
     """Method that builds model graph and returns evaluation ops.
 
-    Expected to be overriden by sub-classes that require custom support.
+    Expected to be overridden by sub-classes that require custom support.
     This implementation uses `model_fn` passed as parameter to constructor to
     build model.
 
@@ -1204,7 +1204,7 @@ class Estimator(BaseEstimator):
   def _get_predict_ops(self, features):
     """Method that builds model graph and returns prediction ops.
 
-    Expected to be overriden by sub-classes that require custom support.
+    Expected to be overridden by sub-classes that require custom support.
     This implementation uses `model_fn` passed as parameter to constructor to
     build model.
 
diff --git a/tensorflow/contrib/learn/python/learn/estimators/head.py b/tensorflow/contrib/learn/python/learn/estimators/head.py
index e4ef6996d8..d270d89c12 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/head.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/head.py
@@ -620,7 +620,7 @@ def _create_model_fn_ops(features,
     weight_tensor = _weight_tensor(features, weight_column_name)
     loss, weighted_average_loss = loss_fn(labels, logits, weight_tensor)
     # Uses the deprecated API to set the tag explicitly.
-    # Without it, trianing and eval losses will show up in different graphs.
+    # Without it, training and eval losses will show up in different graphs.
     logging_ops.scalar_summary(
         _summary_key(head_name, mkey.LOSS), weighted_average_loss)
 
@@ -1141,7 +1141,7 @@ def _to_labels_tensor(labels, label_name):
   """Returns label as a tensor.
 
   Args:
-    labels: Label `Tensor` or `SparseTensor` or a dict containig labels.
+    labels: Label `Tensor` or `SparseTensor` or a dict containing labels.
     label_name: Label name if labels is a dict.
 
   Returns:
@@ -1575,7 +1575,7 @@ class _MultiHead(Head):
     Args:
       all_model_fn_ops: list of ModelFnOps for the individual heads.
       train_op_fn: Function to create train op. See `create_model_fn_ops`
-          documentaion for more details.
+          documentation for more details.
 
     Returns:
       ModelFnOps that merges all heads for TRAIN.
diff --git a/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py b/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py
index 6bb2b8b2aa..0f09b111bd 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/rnn_common.py
@@ -119,7 +119,7 @@ def apply_dropout(cells, dropout_keep_probabilities, random_seed=None):
   """
   if len(dropout_keep_probabilities) != len(cells) + 1:
     raise ValueError(
-        'The number of dropout probabilites must be one greater than the '
+        'The number of dropout probabilities must be one greater than the '
         'number of cells. Got {} cells and {} dropout probabilities.'.format(
             len(cells), len(dropout_keep_probabilities)))
   wrapped_cells = [
diff --git a/tensorflow/contrib/learn/python/learn/estimators/run_config.py b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
index 7af1c541c6..3aaee5862d 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/run_config.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/run_config.py
@@ -309,7 +309,7 @@ class RunConfig(ClusterConfig, core_run_config.RunConfig):
     Args:
       whitelist: A list of the string names of the properties uid should not
         include. If `None`, defaults to `_DEFAULT_UID_WHITE_LIST`, which
-        includes most properites user allowes to change.
+        includes most properties user allowes to change.
 
     Returns:
       A uid string.
diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py
index d82bc321e7..c60ecac5df 100644
--- a/tensorflow/contrib/learn/python/learn/experiment.py
+++ b/tensorflow/contrib/learn/python/learn/experiment.py
@@ -53,7 +53,7 @@ class Experiment(object):
   """
 
   # TODO(ispir): remove delay_workers_by_global_step and make global step based
-  # waiting as only behaviour.
+  # waiting as only behavior.
   @deprecated_args(
       "2016-10-23",
       "local_eval_frequency is deprecated as local_run will be renamed to "
@@ -550,7 +550,7 @@ class Experiment(object):
     eval_result = None
 
     # Set the default value for train_steps_per_iteration, which will be
-    # overriden by other settings.
+    # overridden by other settings.
     train_steps_per_iteration = 1000
     if self._train_steps_per_iteration is not None:
       train_steps_per_iteration = self._train_steps_per_iteration
diff --git a/tensorflow/contrib/learn/python/learn/learn_runner.py b/tensorflow/contrib/learn/python/learn/learn_runner.py
index a3398a87e1..943c555314 100644
--- a/tensorflow/contrib/learn/python/learn/learn_runner.py
+++ b/tensorflow/contrib/learn/python/learn/learn_runner.py
@@ -155,7 +155,7 @@ def run(experiment_fn, output_dir=None, schedule=None, run_config=None,
       to create the `Estimator` (passed as `model_dir` to its constructor). It
       must return an `Experiment`. For this case, `run_config` and `hparams`
       must be None.
-      2) It accpets two arguments `run_config` and `hparams`, which should be
+      2) It accepts two arguments `run_config` and `hparams`, which should be
       used to create the `Estimator` (`run_config` passed as `config` to its
       constructor; `hparams` used as the hyper-paremeters of the model).
       It must return an `Experiment`. For this case, `output_dir` must be None.
diff --git a/tensorflow/contrib/learn/python/learn/ops/seq2seq_ops.py b/tensorflow/contrib/learn/python/learn/ops/seq2seq_ops.py
index 0faba7cee5..45727faab4 100644
--- a/tensorflow/contrib/learn/python/learn/ops/seq2seq_ops.py
+++ b/tensorflow/contrib/learn/python/learn/ops/seq2seq_ops.py
@@ -140,7 +140,7 @@ def rnn_seq2seq(encoder_inputs,
     scope: Scope to use, if None new will be produced.
 
   Returns:
-    List of tensors for outputs and states for trianing and sampling sub-graphs.
+    List of tensors for outputs and states for training and sampling sub-graphs.
   """
   with vs.variable_scope(scope or "rnn_seq2seq"):
     _, last_enc_state = rnn.static_rnn(
diff --git a/tensorflow/contrib/learn/python/learn/preprocessing/categorical_vocabulary.py b/tensorflow/contrib/learn/python/learn/preprocessing/categorical_vocabulary.py
index 9d4fed9998..5709955c49 100644
--- a/tensorflow/contrib/learn/python/learn/preprocessing/categorical_vocabulary.py
+++ b/tensorflow/contrib/learn/python/learn/preprocessing/categorical_vocabulary.py
@@ -128,9 +128,9 @@ class CategoricalVocabulary(object):
       Class name.
 
     Raises:
-      ValueError: if this vocabulary wasn't initalized with support_reverse.
+      ValueError: if this vocabulary wasn't initialized with support_reverse.
     """
     if not self._support_reverse:
-      raise ValueError("This vocabulary wasn't initalized with "
+      raise ValueError("This vocabulary wasn't initialized with "
                        "support_reverse to support reverse() function.")
     return self._reverse_mapping[class_id]
diff --git a/tensorflow/contrib/learn/python/learn/trainable.py b/tensorflow/contrib/learn/python/learn/trainable.py
index 2d1d460425..972fec026f 100644
--- a/tensorflow/contrib/learn/python/learn/trainable.py
+++ b/tensorflow/contrib/learn/python/learn/trainable.py
@@ -49,7 +49,7 @@ class Trainable(object):
       steps: Number of steps for which to train model. If `None`, train forever.
         'steps' works incrementally. If you call two times fit(steps=10) then
         training occurs in total 20 steps. If you don't want to have incremental
-        behaviour please set `max_steps` instead. If set, `max_steps` must be
+        behavior please set `max_steps` instead. If set, `max_steps` must be
         `None`.
       batch_size: minibatch size to use on the input, defaults to first
         dimension of `x`. Must be `None` if `input_fn` is provided.
diff --git a/tensorflow/contrib/learn/python/learn/utils/export.py b/tensorflow/contrib/learn/python/learn/utils/export.py
index 36a1f5f60c..6af2287761 100644
--- a/tensorflow/contrib/learn/python/learn/utils/export.py
+++ b/tensorflow/contrib/learn/python/learn/utils/export.py
@@ -89,7 +89,7 @@ def _export_graph(graph, saver, checkpoint_path, export_dir,
 def generic_signature_fn(examples, unused_features, predictions):
   """Creates generic signature from given examples and predictions.
 
-  This is needed for backward compatibility with default behaviour of
+  This is needed for backward compatibility with default behavior of
   export_estimator.
 
   Args:
diff --git a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py
index fa314e69c7..3f0f309253 100644
--- a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py
+++ b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py
@@ -309,7 +309,7 @@ def get_most_recent_export(export_dir_base):
                      directories.
 
   Returns:
-    A gc.Path, whith is just a namedtuple of (path, export_version).
+    A gc.Path, with is just a namedtuple of (path, export_version).
   """
   select_filter = gc.largest_export_versions(1)
   results = select_filter(gc.get_paths(export_dir_base,
diff --git a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py
index 157744bed1..a15eadd018 100644
--- a/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py
+++ b/tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py
@@ -109,7 +109,7 @@ class SavedModelExportUtilsTest(test.TestCase):
     self.assertEqual(actual_signature_def, expected_signature_def)
 
   def test_build_standardized_signature_def_classification2(self):
-    """Tests multiple output tensors that include classes and probabilites."""
+    """Tests multiple output tensors that include classes and probabilities."""
     input_tensors = {
         "input-1":
             array_ops.placeholder(
diff --git a/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py b/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py
index 2898935a47..824a964869 100644
--- a/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py
+++ b/tensorflow/contrib/legacy_seq2seq/python/kernel_tests/seq2seq_test.py
@@ -837,7 +837,7 @@ class Seq2SeqTest(test.TestCase):
   #     with variable_scope.variable_scope("new"):
   #       _, losses2 = SampleGRUSeq2Seq
   #           inp, out, weights, per_example_loss=True)
-  #       # First loss is scalar, the second one is a 1-dimensinal tensor.
+  #       # First loss is scalar, the second one is a 1-dimensional tensor.
   #       self.assertEqual([], losses1[0].get_shape().as_list())
   #       self.assertEqual([None], losses2[0].get_shape().as_list())
 
diff --git a/tensorflow/contrib/memory_stats/python/kernel_tests/memory_stats_ops_test.py b/tensorflow/contrib/memory_stats/python/kernel_tests/memory_stats_ops_test.py
index 0f3a5f1313..ec25c032f0 100644
--- a/tensorflow/contrib/memory_stats/python/kernel_tests/memory_stats_ops_test.py
+++ b/tensorflow/contrib/memory_stats/python/kernel_tests/memory_stats_ops_test.py
@@ -49,7 +49,7 @@ class MemoryStatsOpsTest(test_util.TensorFlowTestCase):
   # The memory for matrix "a" can be reused for matrix "d". Therefore, this
   # computation needs space for only three matrix plus some small overhead.
   def testChainOfMatmul(self):
-    # MaxBytesInUse is registerd on GPU only. See kernels/memory_stats_ops.cc.
+    # MaxBytesInUse is registered on GPU only. See kernels/memory_stats_ops.cc.
     if not test.is_gpu_available():
       return
 
diff --git a/tensorflow/contrib/metrics/python/ops/metric_ops_test.py b/tensorflow/contrib/metrics/python/ops/metric_ops_test.py
index f42e974e23..f97f03e30e 100644
--- a/tensorflow/contrib/metrics/python/ops/metric_ops_test.py
+++ b/tensorflow/contrib/metrics/python/ops/metric_ops_test.py
@@ -1507,7 +1507,7 @@ class StreamingAUCTest(test.TestCase):
       self.assertAlmostEqual(1, auc.eval(), 6)
 
   def np_auc(self, predictions, labels, weights):
-    """Computes the AUC explicitely using Numpy.
+    """Computes the AUC explicitly using Numpy.
 
     Args:
       predictions: an ndarray with shape [N].
diff --git a/tensorflow/contrib/rnn/python/ops/rnn_cell.py b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
index 0898e78837..566c84443d 100644
--- a/tensorflow/contrib/rnn/python/ops/rnn_cell.py
+++ b/tensorflow/contrib/rnn/python/ops/rnn_cell.py
@@ -466,7 +466,7 @@ class GridLSTMCell(core_rnn_cell.RNNCell):
         state is clipped by this value prior to the cell output activation.
       initializer: (optional) The initializer to use for the weight and
         projection matrices, default None.
-      num_unit_shards: (optional) int, defualt 1, How to split the weight
+      num_unit_shards: (optional) int, default 1, How to split the weight
         matrix. If > 1,the weight matrix is stored across num_unit_shards.
       forget_bias: (optional) float, default 1.0, The initial bias of the
         forget gates, used to reduce the scale of forgetting at the beginning
@@ -1809,12 +1809,12 @@ class PhasedLSTMCell(core_rnn_cell.RNNCell):
           period during which the gates are open.
       trainable_ratio_on: bool, weather ratio_on is trainable.
       period_init_min: float or scalar float Tensor. With value > 0.
-          Minimum value of the initalized period.
+          Minimum value of the initialized period.
           The period values are initialized by drawing from the distribution:
           e^U(log(period_init_min), log(period_init_max))
           Where U(.,.) is the uniform distribution.
       period_init_max: float or scalar float Tensor.
-          With value > period_init_min. Maximum value of the initalized period.
+          With value > period_init_min. Maximum value of the initialized period.
       reuse: (optional) Python boolean describing whether to reuse variables
         in an existing scope. If not `True`, and the existing scope already has
         the given variables, an error is raised.
diff --git a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
index fd76882d84..33ee19605d 100644
--- a/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
+++ b/tensorflow/contrib/seq2seq/python/ops/attention_wrapper.py
@@ -474,7 +474,7 @@ class AttentionWrapperState(
 
     Returns:
       A new `AttentionWrapperState` whose properties are the same as
-      this one, except any overriden properties as provided in `kwargs`.
+      this one, except any overridden properties as provided in `kwargs`.
     """
     return super(AttentionWrapperState, self)._replace(**kwargs)
 
diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md
index 61148c0b26..d37c632be7 100644
--- a/tensorflow/contrib/slim/README.md
+++ b/tensorflow/contrib/slim/README.md
@@ -352,7 +352,7 @@ we can both ensure that each layer uses the same values and simplify the code:
 ```
 
 As the example illustrates, the use of arg_scope makes the code cleaner,
-simpler and easier to maintain. Notice that while argument values are specifed
+simpler and easier to maintain. Notice that while argument values are specified
 in the arg_scope, they can be overwritten locally. In particular, while
 the padding argument has been set to 'SAME', the second convolution overrides
 it with the value of 'VALID'.
diff --git a/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py b/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py
index 3a78c0471d..82c6b5a619 100644
--- a/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py
+++ b/tensorflow/contrib/slim/python/slim/data/dataset_data_provider.py
@@ -33,7 +33,7 @@ To read data using multiple readers simultaneous with shuffling:
       shuffle=True)
   images, labels = pascal_voc_data_provider.get(['images', 'labels'])
 
-Equivalently, one may request different fields of the same sample seperately:
+Equivalently, one may request different fields of the same sample separately:
 
   [images] = pascal_voc_data_provider.get(['images'])
   [labels] = pascal_voc_data_provider.get(['labels'])
diff --git a/tensorflow/contrib/tensorboard/plugins/projector/__init__.py b/tensorflow/contrib/tensorboard/plugins/projector/__init__.py
index 635c569d73..0c630de7f5 100644
--- a/tensorflow/contrib/tensorboard/plugins/projector/__init__.py
+++ b/tensorflow/contrib/tensorboard/plugins/projector/__init__.py
@@ -40,7 +40,7 @@ def visualize_embeddings(summary_writer, config):
   """Stores a config file used by the embedding projector.
 
   Args:
-    summary_writer: The summary writer used for writting events.
+    summary_writer: The summary writer used for writing events.
     config: `tf.contrib.tensorboard.plugins.projector.ProjectorConfig`
       proto that holds the configuration for the projector such as paths to
       checkpoint files and metadata files for the embeddings. If
diff --git a/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py b/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py
index 91ea6bc753..5f86f57a1c 100644
--- a/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py
+++ b/tensorflow/contrib/tensorboard/plugins/projector/projector_api_test.py
@@ -46,7 +46,7 @@ class ProjectorApiTest(test.TestCase):
     writer = writer_lib.FileWriter(temp_dir)
     projector.visualize_embeddings(writer, config)
 
-    # Read the configuratin from disk and make sure it matches the original.
+    # Read the configurations from disk and make sure it matches the original.
     with gfile.GFile(os.path.join(temp_dir, 'projector_config.pbtxt')) as f:
       config2 = projector_config_pb2.ProjectorConfig()
       text_format.Parse(f.read(), config2)
diff --git a/tensorflow/contrib/training/python/training/evaluation.py b/tensorflow/contrib/training/python/training/evaluation.py
index bc0c60c85c..24b733dd29 100644
--- a/tensorflow/contrib/training/python/training/evaluation.py
+++ b/tensorflow/contrib/training/python/training/evaluation.py
@@ -370,7 +370,7 @@ def evaluate_repeatedly(checkpoint_dir,
 
   One may also consider using a `tf.contrib.training.SummaryAtEndHook` to record
   summaries after the `eval_ops` have run. If `eval_ops` is `None`, the
-  summaries run immedietly after the model checkpoint has been restored.
+  summaries run immediately after the model checkpoint has been restored.
 
   Note that `evaluate_once` creates a local variable used to track the number of
   evaluations run via `tf.contrib.training.get_or_create_eval_step`.
diff --git a/tensorflow/contrib/training/python/training/hparam.py b/tensorflow/contrib/training/python/training/hparam.py
index 2e08593699..c19a36eabc 100644
--- a/tensorflow/contrib/training/python/training/hparam.py
+++ b/tensorflow/contrib/training/python/training/hparam.py
@@ -422,7 +422,7 @@ class HParams(object):
     elif issubclass(param_type, float):
       typename = 'float'
     else:
-      raise ValueError('Unsupported paramter type: %s' % str(param_type))
+      raise ValueError('Unsupported parameter type: %s' % str(param_type))
 
     suffix = 'list' if is_list else 'value'
     return '_'.join([typename, suffix])
diff --git a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
index 2c7c30911c..9312070e52 100644
--- a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
+++ b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
@@ -344,7 +344,7 @@ def _prepare_sequence_inputs(inputs, states):
   key = _check_rank(inputs.key, 0)
 
   if length.dtype != dtypes.int32:
-    raise TypeError("length dtype must be int32, but recieved: %s" %
+    raise TypeError("length dtype must be int32, but received: %s" %
                     length.dtype)
   if key.dtype != dtypes.string:
     raise TypeError("key dtype must be string, but received: %s" % key.dtype)
@@ -1673,7 +1673,7 @@ def _move_sparse_tensor_out_context(input_context, input_sequences, num_unroll):
     shape = array_ops.concat(
         [array_ops.expand_dims(value_length, 0), sp_tensor.dense_shape], 0)
 
-    # Construct new indices by mutliplying old ones and prepending [0, n).
+    # Construct new indices by multiplying old ones and prepending [0, n).
     # First multiply indices n times along a newly created 0-dimension.
     multiplied_indices = array_ops.tile(
         array_ops.expand_dims(sp_tensor.indices, 0),
diff --git a/tensorflow/core/common_runtime/constant_folding.cc b/tensorflow/core/common_runtime/constant_folding.cc
index 8fa61d098e..914683d9fa 100644
--- a/tensorflow/core/common_runtime/constant_folding.cc
+++ b/tensorflow/core/common_runtime/constant_folding.cc
@@ -83,7 +83,7 @@ bool IsConstantFoldable(const Node* n,
 }
 
 // Returns the constant foldable nodes in `nodes` in topological order.
-// Populates `constant_control_deps` with the non-constant control depedencies
+// Populates `constant_control_deps` with the non-constant control dependencies
 // of each constant node.
 void FindConstantFoldableNodes(
     const Graph* graph, ConstantFoldingOptions opts, std::vector<Node*>* nodes,
diff --git a/tensorflow/core/common_runtime/executor.h b/tensorflow/core/common_runtime/executor.h
index 93b58906dd..e09dc4e346 100644
--- a/tensorflow/core/common_runtime/executor.h
+++ b/tensorflow/core/common_runtime/executor.h
@@ -74,8 +74,8 @@ class Executor {
   //
   // RunAsync() uses "cancellation_manager", if not nullptr, to
   // register callbacks that should be called if the graph computation
-  // is cancelled. Note that the callbacks merely unblock any
-  // long-running computation, and a cancelled step will terminate by
+  // is canceled. Note that the callbacks merely unblock any
+  // long-running computation, and a canceled step will terminate by
   // returning/calling the DoneCallback as usual.
   //
   // RunAsync() dispatches closures to "runner". Typically, "runner"
diff --git a/tensorflow/core/common_runtime/session_factory.h b/tensorflow/core/common_runtime/session_factory.h
index 2a1632e035..df3198a70d 100644
--- a/tensorflow/core/common_runtime/session_factory.h
+++ b/tensorflow/core/common_runtime/session_factory.h
@@ -47,7 +47,7 @@ class SessionFactory {
   // Old sessions may continue to have side-effects on resources not in
   // containers listed in "containers", and thus may affect future
   // sessions' results in ways that are hard to predict.  Thus, if well-defined
-  // behaviour is desired, is it recommended that all containers be listed in
+  // behavior is desired, is it recommended that all containers be listed in
   // "containers".
   //
   // If the "containers" vector is empty, the default container is assumed.
diff --git a/tensorflow/core/common_runtime/simple_graph_execution_state.cc b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
index 3806f9f47f..b291a6f994 100644
--- a/tensorflow/core/common_runtime/simple_graph_execution_state.cc
+++ b/tensorflow/core/common_runtime/simple_graph_execution_state.cc
@@ -243,7 +243,7 @@ Status SimpleGraphExecutionState::InitBaseGraph(
       session_options_->config.graph_options().rewrite_options();
 
   if (grappler::MetaOptimizerEnabled(rewrite_options)) {
-    // Adding this functionalty in steps. The first step is to make sure
+    // Adding this functionality in steps. The first step is to make sure
     // we don't break dependencies. The second step will be to turn the
     // functionality on by default.
     grappler::GrapplerItem item;
diff --git a/tensorflow/core/common_runtime/simple_placer.cc b/tensorflow/core/common_runtime/simple_placer.cc
index ae225e8b35..73f49706b4 100644
--- a/tensorflow/core/common_runtime/simple_placer.cc
+++ b/tensorflow/core/common_runtime/simple_placer.cc
@@ -660,7 +660,7 @@ Status SimplePlacer::Run() {
       if (!edge->IsControlEdge() &&
           (IsRefType(node->input_type(edge->dst_input())) ||
            node->input_type(edge->dst_input()) == DT_RESOURCE)) {
-        // If both the source node and this node have paritally
+        // If both the source node and this node have partially
         // specified a device, then 'node's device should be
         // cleared: the reference edge forces 'node' to be on the
         // same device as the source node.
diff --git a/tensorflow/core/debug/debug_service.proto b/tensorflow/core/debug/debug_service.proto
index 1adba5d653..63d6668292 100644
--- a/tensorflow/core/debug/debug_service.proto
+++ b/tensorflow/core/debug/debug_service.proto
@@ -20,7 +20,7 @@ package tensorflow;
 import "tensorflow/core/util/event.proto";
 
 // Reply message from EventListener to the client, i.e., to the source of the
-// Event protocal buffers, e.g., debug ops inserted by a debugged runtime to a
+// Event protocol buffers, e.g., debug ops inserted by a debugged runtime to a
 // TensorFlow graph being executed.
 message EventReply {
   message DebugOpStateChange {
diff --git a/tensorflow/core/distributed_runtime/graph_mgr.h b/tensorflow/core/distributed_runtime/graph_mgr.h
index 50391f47e4..4ee3711d02 100644
--- a/tensorflow/core/distributed_runtime/graph_mgr.h
+++ b/tensorflow/core/distributed_runtime/graph_mgr.h
@@ -108,9 +108,9 @@ class GraphMgr {
   };
 
   struct Item : public core::RefCounted {
-    // TOOD(zhifengc): Keeps a copy of the original graph if the need arises.
-    // TOOD(zhifengc): Stats, updated by multiple runs potentially.
-    // TOOD(zhifengc): Dup-detection. Ensure step_id only run once.
+    // TODO(zhifengc): Keeps a copy of the original graph if the need arises.
+    // TODO(zhifengc): Stats, updated by multiple runs potentially.
+    // TODO(zhifengc): Dup-detection. Ensure step_id only run once.
     ~Item() override;
 
     // Session handle.
@@ -126,7 +126,7 @@ class GraphMgr {
     // has a root executor which may call into the runtime library.
     std::vector<ExecutionUnit> units;
 
-    // Used to deresgister a cost model when cost model is requried in graph
+    // Used to deresgister a cost model when cost model is required in graph
     // manager.
     GraphMgr* graph_mgr;
   };
@@ -157,7 +157,7 @@ class GraphMgr {
                               CancellationManager* cancellation_manager,
                               StatusCallback done);
 
-  // Don't attempt to process cost models unless explicitely requested for at
+  // Don't attempt to process cost models unless explicitly requested for at
   // least one of the items.
   bool skip_cost_models_ = true;
 
diff --git a/tensorflow/core/distributed_runtime/master.cc b/tensorflow/core/distributed_runtime/master.cc
index e860c99d95..81d938bd4f 100644
--- a/tensorflow/core/distributed_runtime/master.cc
+++ b/tensorflow/core/distributed_runtime/master.cc
@@ -25,7 +25,7 @@ limitations under the License.
 // A Master discovers remote devices on-demand and keeps track of
 // statistics of those remote devices.
 //
-// Each session analyses the graph, places nodes across available
+// Each session analyzes the graph, places nodes across available
 // devices, and ultimately drives the graph computation by initiating
 // RunGraph on the workers.
 
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_call.h b/tensorflow/core/distributed_runtime/rpc/grpc_call.h
index 3b45e7e8a7..e85b8ccbd3 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_call.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_call.h
@@ -89,7 +89,7 @@ class UntypedCall : public core::RefCounted {
   virtual void RequestReceived(Service* service, bool ok) = 0;
 
   // This method will be called either (i) when the server is notified
-  // that the request has been cancelled, or (ii) when the request completes
+  // that the request has been canceled, or (ii) when the request completes
   // normally. The implementation should distinguish these cases by querying
   // the `grpc::ServerContext` associated with the request.
   virtual void RequestCancelled(Service* service, bool ok) = 0;
@@ -175,7 +175,7 @@ class Call : public UntypedCall<Service> {
   }
 
   // Registers `callback` as the function that should be called if and when this
-  // call is cancelled by the client.
+  // call is canceled by the client.
   void SetCancelCallback(std::function<void()> callback) {
     mutex_lock l(mu_);
     cancel_callback_ = std::move(callback);
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc b/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc
index f0d311b853..fae1c5227b 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_master_service.cc
@@ -25,7 +25,7 @@ limitations under the License.
 // A GrpcMasterService discovers remote devices in the background and
 // keeps track of statistics of those remote devices.
 //
-// Each session analyses the graph, places nodes across available
+// Each session analyzes the graph, places nodes across available
 // devices, and ultimately drives the graph computation by initiating
 // RunGraph on workers.
 #include "tensorflow/core/distributed_runtime/rpc/grpc_master_service.h"
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc b/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc
index 368468093e..eeb3e02966 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_session_test.cc
@@ -517,7 +517,7 @@ TEST(GrpcSessionTest, Error) {
     //
     // Subgraph for "b" sleeps at the node "b_delay". When the sleep
     // finishes, the subgraph "b" will continue execution till it
-    // notices that it is cancelled. Meanwhile, subgraph's executor
+    // notices that it is canceled. Meanwhile, subgraph's executor
     // and its related state (registered ops) should still be alive.
     auto b = test::graph::Constant(&g, Tensor());
     b->set_assigned_device_name(dev_b);
diff --git a/tensorflow/core/distributed_runtime/worker_cache_logger.cc b/tensorflow/core/distributed_runtime/worker_cache_logger.cc
index 6d68c82fd1..9e16ffa957 100644
--- a/tensorflow/core/distributed_runtime/worker_cache_logger.cc
+++ b/tensorflow/core/distributed_runtime/worker_cache_logger.cc
@@ -35,7 +35,7 @@ void WorkerCacheLogger::SetLogging(bool v) {
     ++want_logging_count_;
   } else {
     --want_logging_count_;
-    // If RPCs get cancelled, it may be possible for the count
+    // If RPCs get canceled, it may be possible for the count
     // to go negative.  This should not be a fatal error, since
     // logging is non-critical.
     if (want_logging_count_ < 0) want_logging_count_ = 0;
diff --git a/tensorflow/core/framework/cancellation.h b/tensorflow/core/framework/cancellation.h
index 4cc3f92353..651c054fe8 100644
--- a/tensorflow/core/framework/cancellation.h
+++ b/tensorflow/core/framework/cancellation.h
@@ -36,7 +36,7 @@ namespace tensorflow {
 // CancellationManager::get_cancellation_token.
 typedef int64 CancellationToken;
 
-// A callback that is invoked when a step is cancelled.
+// A callback that is invoked when a step is canceled.
 //
 // NOTE(mrry): See caveats about CancelCallback implementations in the
 // comment for CancellationManager::RegisterCallback.
diff --git a/tensorflow/core/framework/function_test.cc b/tensorflow/core/framework/function_test.cc
index c83ecf4e5e..f3ad935c78 100644
--- a/tensorflow/core/framework/function_test.cc
+++ b/tensorflow/core/framework/function_test.cc
@@ -163,7 +163,7 @@ REGISTER_OP("HasDefaultType")
 
 // This verifies that a function using an op before a type attr (with
 // a default) is added, still works.  This is important for backwards
-// compatibilty.
+// compatibility.
 TEST(TFunc, MissingTypeAttr) {
   auto fdef = FDH::Create(
       // Name
@@ -1021,7 +1021,7 @@ TEST(FunctionLibraryDefinitionTest, AddLibrary) {
   EXPECT_EQ(s.error_message(),
             "Gradient for function 'XTimesTwo' already exists.");
 
-  // No conflicing functions or gradients OK
+  // No conflicting functions or gradients OK
   proto.Clear();
   *proto.add_function() = test::function::XTimesFour();
   grad.set_function_name(test::function::XTimes16().signature().name());
diff --git a/tensorflow/core/graph/graph_constructor.h b/tensorflow/core/graph/graph_constructor.h
index 9b80f211fc..54d38cac65 100644
--- a/tensorflow/core/graph/graph_constructor.h
+++ b/tensorflow/core/graph/graph_constructor.h
@@ -51,7 +51,7 @@ extern Status ConvertGraphDefToGraph(const GraphConstructorOptions& opts,
 // On error, returns non-OK and leaves *g unmodified.
 //
 // "shape_refiner" can be null. It should be non-null if the caller
-// intends to add additonal nodes to the graph after the import. This
+// intends to add additional nodes to the graph after the import. This
 // allows the caller to validate shapes of those nodes (since
 // ShapeRefiner::AddNode must be called in topological order).
 //
diff --git a/tensorflow/core/grappler/costs/analytical_cost_estimator.h b/tensorflow/core/grappler/costs/analytical_cost_estimator.h
index 03e7faa4ff..f267fac73f 100644
--- a/tensorflow/core/grappler/costs/analytical_cost_estimator.h
+++ b/tensorflow/core/grappler/costs/analytical_cost_estimator.h
@@ -40,7 +40,7 @@ class AnalyticalCostEstimator : public CostEstimator {
   explicit AnalyticalCostEstimator(Cluster* cluster, bool use_static_shapes);
   ~AnalyticalCostEstimator() override {}
 
-  // Initalizes the estimator for the specified grappler item.
+  // Initializes the estimator for the specified grappler item.
   // This implementation always returns OK.
   Status Initialize(const GrapplerItem& item) override;
 
diff --git a/tensorflow/core/grappler/costs/cost_estimator.h b/tensorflow/core/grappler/costs/cost_estimator.h
index b3fb3522a3..786840384a 100644
--- a/tensorflow/core/grappler/costs/cost_estimator.h
+++ b/tensorflow/core/grappler/costs/cost_estimator.h
@@ -130,7 +130,7 @@ class CostEstimator {
  public:
   virtual ~CostEstimator() {}
 
-  // Initalizes the estimator for the specified grappler item.
+  // Initializes the estimator for the specified grappler item.
   // The estimator shouldn't be used if this function returns any status other
   // that OK.
   virtual Status Initialize(const GrapplerItem& item) = 0;
diff --git a/tensorflow/core/grappler/costs/measuring_cost_estimator.h b/tensorflow/core/grappler/costs/measuring_cost_estimator.h
index a84853f6c7..1b3edb4c27 100644
--- a/tensorflow/core/grappler/costs/measuring_cost_estimator.h
+++ b/tensorflow/core/grappler/costs/measuring_cost_estimator.h
@@ -50,7 +50,7 @@ class MeasuringCostEstimator : public CostEstimator {
                                   int measurement_threads);
   ~MeasuringCostEstimator() override {}
 
-  // Initalizes the estimator for the specified grappler item.
+  // Initializes the estimator for the specified grappler item.
   // This implementation always returns OK.
   Status Initialize(const GrapplerItem& item) override;
 
diff --git a/tensorflow/core/grappler/costs/op_level_cost_estimator.h b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
index 266b633922..ea7d3d3f69 100644
--- a/tensorflow/core/grappler/costs/op_level_cost_estimator.h
+++ b/tensorflow/core/grappler/costs/op_level_cost_estimator.h
@@ -36,7 +36,7 @@ class OpLevelCostEstimator {
 
  protected:
   // Returns an estimate of device performance (in billions of operations
-  // executed per second) and memory bandwith (in GigaBytes/second) for the
+  // executed per second) and memory bandwidth (in GigaBytes/second) for the
   // specified device.
   virtual std::pair<double, double> GetDeviceInfo(
       const DeviceProperties& device) const;
diff --git a/tensorflow/core/grappler/optimizers/model_pruner.cc b/tensorflow/core/grappler/optimizers/model_pruner.cc
index 4707266572..efa2163836 100644
--- a/tensorflow/core/grappler/optimizers/model_pruner.cc
+++ b/tensorflow/core/grappler/optimizers/model_pruner.cc
@@ -46,7 +46,7 @@ Status ModelPruner::Optimize(Cluster* cluster, const GrapplerItem& item,
     if (nodes_to_preserve.find(node.name()) != nodes_to_preserve.end()) {
       continue;
     }
-    // Don't remove nodes that are explicitely placed.
+    // Don't remove nodes that are explicitly placed.
     if (!node.device().empty()) {
       continue;
     }
diff --git a/tensorflow/core/grappler/optimizers/model_pruner.h b/tensorflow/core/grappler/optimizers/model_pruner.h
index 3956d33961..3d76aebef4 100644
--- a/tensorflow/core/grappler/optimizers/model_pruner.h
+++ b/tensorflow/core/grappler/optimizers/model_pruner.h
@@ -22,7 +22,7 @@ namespace tensorflow {
 namespace grappler {
 
 // Prune a model to make it more efficient:
-// * Remove unecessary operations.
+// * Remove unnecessary operations.
 // * Optimize gradient computations.
 class ModelPruner : public GraphOptimizer {
  public:
diff --git a/tensorflow/core/grappler/utils.h b/tensorflow/core/grappler/utils.h
index 17b980c5b8..0fb531ef1b 100644
--- a/tensorflow/core/grappler/utils.h
+++ b/tensorflow/core/grappler/utils.h
@@ -34,7 +34,7 @@ class NodeMap {
   NodeDef* GetNode(const string& name);
   std::set<NodeDef*> GetOutputs(const string& node_name);
   // This method doesn't record the outputs of the added node; the outputs need
-  // to be explictly added by the AddOutput method.
+  // to be explicitly added by the AddOutput method.
   void AddNode(const string& name, NodeDef* node);
   void AddOutput(const string& node, const string& output);
   void UpdateOutput(const string& node, const string& old_output,
diff --git a/tensorflow/core/kernels/cast_op.h b/tensorflow/core/kernels/cast_op.h
index 0def600ac0..5c24f164a4 100644
--- a/tensorflow/core/kernels/cast_op.h
+++ b/tensorflow/core/kernels/cast_op.h
@@ -50,7 +50,7 @@ template <typename From, typename To>
 struct scalar_cast_op<std::complex<From>, To> {
   EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE To
   operator()(const std::complex<From>& a) const {
-    // Replicate numpy behaviour of returning just the real part
+    // Replicate numpy behavior of returning just the real part
     return static_cast<To>(a.real());
   }
 };
@@ -59,7 +59,7 @@ template <typename From, typename To>
 struct scalar_cast_op<From, std::complex<To>> {
   EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE std::complex<To> operator()(
       const From& a) const {
-    // Replicate numpy behaviour of setting the imaginary part to 0
+    // Replicate numpy behavior of setting the imaginary part to 0
     return std::complex<To>(static_cast<To>(a), To(0));
   }
 };
diff --git a/tensorflow/core/kernels/conv_ops_fused.cc b/tensorflow/core/kernels/conv_ops_fused.cc
index f7348f1077..291ebf2298 100644
--- a/tensorflow/core/kernels/conv_ops_fused.cc
+++ b/tensorflow/core/kernels/conv_ops_fused.cc
@@ -713,7 +713,7 @@ class FusedResizeConv2DUsingGemmOp : public OpKernel {
       const int32 before =
           paddings_matrix(d, 0);  // Pad before existing elements.
       const int32 after =
-          paddings_matrix(d, 1);  // Pad after exisitng elements.
+          paddings_matrix(d, 1);  // Pad after existing elements.
       OP_REQUIRES(context, before >= 0 && after >= 0,
                   errors::InvalidArgument("paddings must be non-negative: ",
                                           before, " ", after));
diff --git a/tensorflow/core/kernels/cuda_solvers.h b/tensorflow/core/kernels/cuda_solvers.h
index 70ccbb90cc..5d1c807e66 100644
--- a/tensorflow/core/kernels/cuda_solvers.h
+++ b/tensorflow/core/kernels/cuda_solvers.h
@@ -116,7 +116,7 @@ class CudaSolver {
   // Launches a memcpy of solver status data specified by dev_lapack_info from
   // device to the host, and asynchronously invokes the given callback when the
   // copy is complete. The first Status argument to the callback will be
-  // Status::OK if all lapack infos retrived are zero, otherwise an error status
+  // Status::OK if all lapack infos retrieved are zero, otherwise an error status
   // is given. The second argument contains a host-side copy of the entire set
   // of infos retrieved, and can be used for generating detailed error messages.
   Status CopyLapackInfoToHostAsync(
diff --git a/tensorflow/core/kernels/deep_conv2d.cc b/tensorflow/core/kernels/deep_conv2d.cc
index a481401479..8e9b8a7e2e 100644
--- a/tensorflow/core/kernels/deep_conv2d.cc
+++ b/tensorflow/core/kernels/deep_conv2d.cc
@@ -26,7 +26,7 @@ limitations under the License.
 
 namespace tensorflow {
 
-// DeepConv2D is a Conv2D implementation specialzied for deep convolutions (i.e
+// DeepConv2D is a Conv2D implementation specialized for deep convolutions (i.e
 // large 'in_depth' and 'out_depth' product. See cost models below for details).
 //
 // DeepConv2D is implemented by computing the following equation:
diff --git a/tensorflow/core/kernels/deep_conv2d.h b/tensorflow/core/kernels/deep_conv2d.h
index a9de20e7ae..c3f6f66dc9 100644
--- a/tensorflow/core/kernels/deep_conv2d.h
+++ b/tensorflow/core/kernels/deep_conv2d.h
@@ -22,7 +22,7 @@ namespace tensorflow {
 
 class OpKernelContext;
 
-// DeepConv2D is a Conv2D implementation specialzied for deep (i.e. large
+// DeepConv2D is a Conv2D implementation specialized for deep (i.e. large
 // in_depth * out_depth product) convolutions (see deep_conv2d.cc for details).
 
 // DeepConv2DTransform is an interface for implementing transforms for
diff --git a/tensorflow/core/kernels/hinge-loss.h b/tensorflow/core/kernels/hinge-loss.h
index 36b02fcc5d..789a7ce7a3 100644
--- a/tensorflow/core/kernels/hinge-loss.h
+++ b/tensorflow/core/kernels/hinge-loss.h
@@ -44,7 +44,7 @@ class HingeLossUpdater : public DualLossUpdater {
                             const double current_dual, const double wx,
                             const double weighted_example_norm) const final {
     // Intutitvely there are 3 cases:
-    // a. new optimal value of the dual variable falls withing the admissible
+    // a. new optimal value of the dual variable falls within the admissible
     // range [0, 1]. In this case we set new dual to this value.
     // b. new optimal value is < 0. Then, because of convexity, the optimal
     // valid value for new dual = 0
diff --git a/tensorflow/core/kernels/image_resizer_state.h b/tensorflow/core/kernels/image_resizer_state.h
index 9ef44a5782..f088315ff5 100644
--- a/tensorflow/core/kernels/image_resizer_state.h
+++ b/tensorflow/core/kernels/image_resizer_state.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-// This is a helper struct to package up the input and ouput
+// This is a helper struct to package up the input and output
 // parameters of an image resizer (the height, widths, etc.).  To
 // reduce code duplication and ensure consistency across the different
 // resizers, it performs the input validation.
diff --git a/tensorflow/core/kernels/map_stage_op.cc b/tensorflow/core/kernels/map_stage_op.cc
index 6ec7cce59c..f69298e952 100644
--- a/tensorflow/core/kernels/map_stage_op.cc
+++ b/tensorflow/core/kernels/map_stage_op.cc
@@ -238,7 +238,7 @@ private:
     {
       IncompleteTuple empty(dtypes_.size());
 
-      // Initialise empty tuple with given dta
+      // Initialize empty tuple with given dta
       for(std::size_t i = 0; i < findices.dimension(0); ++i)
       {
         std::size_t index = findices(i);
diff --git a/tensorflow/core/kernels/meta_support.h b/tensorflow/core/kernels/meta_support.h
index 0d87baf034..53aece78e8 100644
--- a/tensorflow/core/kernels/meta_support.h
+++ b/tensorflow/core/kernels/meta_support.h
@@ -64,7 +64,7 @@ bool IsSupportedAndEnabled();
 //     sum((a_data[i, l] + offset_a) * (b_data[l, j] + offset_b)) : l in [0, k)
 //
 // If transpose_a is false the lhs operand has row major layout, otherwise
-// column major. Similarily transpose_b describes the layout of the rhs operand.
+// column major. Similarly transpose_b describes the layout of the rhs operand.
 // lda, ldb, and ldc are the strides of the lhs operand, rhs operand and the
 // result arrays.
 void QuantizedGemm(OpKernelContext* context, bool transpose_a, bool transpose_b,
diff --git a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
index c97f1dd7b7..23827ceea5 100644
--- a/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
@@ -295,7 +295,7 @@ class MklConv2DCustomBackpropInputOp : public OpKernel {
         dnnDelete_F32(mkl_convert_filter);
       } else {
         // If we do not need any layout conversion for filter, then
-        // we direclty assign input filter to resources[].
+        // we directly assign input filter to resources[].
         conv_res[dnnResourceFilter] =
             static_cast<void*>(const_cast<T*>(filter.flat<T>().data()));
       }
diff --git a/tensorflow/core/kernels/padded_batch_dataset_op.cc b/tensorflow/core/kernels/padded_batch_dataset_op.cc
index df78e1f064..b0c000dd25 100644
--- a/tensorflow/core/kernels/padded_batch_dataset_op.cc
+++ b/tensorflow/core/kernels/padded_batch_dataset_op.cc
@@ -306,7 +306,7 @@ class PaddedBatchDatasetOp : public OpKernel {
             const TensorShape& element_shape =
                 batch_elements[i][component_index].shape();
             // TODO(mrry): Perform this check in the shape function if
-            // enough static information is avaiable to do so.
+            // enough static information is available to do so.
             if (element_shape.dims() != padded_shape.dims()) {
               return errors::InvalidArgument(
                   "All elements in a batch must have the same rank as the "
diff --git a/tensorflow/core/kernels/quantization_utils.h b/tensorflow/core/kernels/quantization_utils.h
index be67dfd112..dae40c4678 100644
--- a/tensorflow/core/kernels/quantization_utils.h
+++ b/tensorflow/core/kernels/quantization_utils.h
@@ -80,7 +80,7 @@ float QuantizedToFloat(T input, float range_min, float range_max) {
       static_cast<int64>(Eigen::NumTraits<T>::lowest());
   const double offset_input = static_cast<double>(input) - lowest_quantized;
   // For compatibility with DEQUANTIZE_WITH_EIGEN, we should convert
-  // range_scale to a float, otherwise range_min_rounded might be slighly
+  // range_scale to a float, otherwise range_min_rounded might be slightly
   // different.
   const double range_min_rounded =
       round(range_min / static_cast<float>(range_scale)) *
diff --git a/tensorflow/core/kernels/smooth-hinge-loss.h b/tensorflow/core/kernels/smooth-hinge-loss.h
index 45da0fb117..5074ad0795 100644
--- a/tensorflow/core/kernels/smooth-hinge-loss.h
+++ b/tensorflow/core/kernels/smooth-hinge-loss.h
@@ -35,7 +35,7 @@ class SmoothHingeLossUpdater : public DualLossUpdater {
                             const double current_dual, const double wx,
                             const double weighted_example_norm) const final {
     // Intutitvely there are 3 cases:
-    // a. new optimal value of the dual variable falls withing the admissible
+    // a. new optimal value of the dual variable falls within the admissible
     // range [0, 1]. In this case we set new dual to this value.
     // b. new optimal value is < 0. Then, because of convexity, the optimal
     // valid value for new dual = 0
diff --git a/tensorflow/core/kernels/sparse_tensor_dense_add_op.h b/tensorflow/core/kernels/sparse_tensor_dense_add_op.h
index b06dcf143e..353cf0e519 100644
--- a/tensorflow/core/kernels/sparse_tensor_dense_add_op.h
+++ b/tensorflow/core/kernels/sparse_tensor_dense_add_op.h
@@ -24,7 +24,7 @@ limitations under the License.
 namespace tensorflow {
 namespace functor {
 
-// TOOD(zongheng): this should be a general functor that powers SparseAdd and
+// TODO(zongheng): this should be a general functor that powers SparseAdd and
 // ScatterNd ops.  It should be moved to its own head file, once the other ops
 // are implemented.
 template <typename Device, typename T, typename Index, int NDIMS,
diff --git a/tensorflow/core/lib/gtl/optional.h b/tensorflow/core/lib/gtl/optional.h
index f80b5c113d..8ba4b09143 100644
--- a/tensorflow/core/lib/gtl/optional.h
+++ b/tensorflow/core/lib/gtl/optional.h
@@ -541,7 +541,7 @@ class optional : private internal_optional::optional_data<T>,
   // opt.emplace(arg1,arg2,arg3);  (Constructs Foo(arg1,arg2,arg3))
   //
   // If the optional is non-empty, and the `args` refer to subobjects of the
-  // current object, then behaviour is undefined.  This is because the current
+  // current object, then behavior is undefined.  This is because the current
   // object will be destructed before the new object is constructed with `args`.
   //
   template <typename... Args,
@@ -586,7 +586,7 @@ class optional : private internal_optional::optional_data<T>,
 
   // [optional.observe], observers
   // You may use `*opt`, and `opt->m`, to access the underlying T value and T's
-  // member `m`, respectively.  If the optional is empty, behaviour is
+  // member `m`, respectively.  If the optional is empty, behavior is
   // undefined.
   constexpr const T* operator->() const { return this->pointer(); }
   T* operator->() {
diff --git a/tensorflow/core/lib/jpeg/jpeg_mem.cc b/tensorflow/core/lib/jpeg/jpeg_mem.cc
index e27904ea12..5dce3673fc 100644
--- a/tensorflow/core/lib/jpeg/jpeg_mem.cc
+++ b/tensorflow/core/lib/jpeg/jpeg_mem.cc
@@ -45,7 +45,7 @@ enum JPEGErrors {
   JPEGERRORS_BAD_PARAM
 };
 
-// Prevent bad compiler behaviour in ASAN mode by wrapping most of the
+// Prevent bad compiler behavior in ASAN mode by wrapping most of the
 // arguments in a struct struct.
 class FewerArgsForCompiler {
  public:
diff --git a/tensorflow/core/ops/data_flow_ops.cc b/tensorflow/core/ops/data_flow_ops.cc
index 2be804acbf..282778e495 100644
--- a/tensorflow/core/ops/data_flow_ops.cc
+++ b/tensorflow/core/ops/data_flow_ops.cc
@@ -827,7 +827,7 @@ operations that would block will fail immediately.
 
 handle: The handle to a queue.
 cancel_pending_enqueues: If true, all pending enqueue requests that are
-  blocked on the given queue will be cancelled.
+  blocked on the given queue will be canceled.
 )doc");
 
 REGISTER_OP("QueueCloseV2")
@@ -845,7 +845,7 @@ operations that would block will fail immediately.
 
 handle: The handle to a queue.
 cancel_pending_enqueues: If true, all pending enqueue requests that are
-  blocked on the given queue will be cancelled.
+  blocked on the given queue will be canceled.
 )doc");
 
 REGISTER_OP("QueueSize")
@@ -1879,7 +1879,7 @@ Subsequent TakeMany operations that would block will fail immediately.
 
 handle: The handle to a barrier.
 cancel_pending_enqueues: If true, all pending enqueue requests that are
-  blocked on the barrier's queue will be cancelled. InsertMany will fail, even
+  blocked on the barrier's queue will be canceled. InsertMany will fail, even
   if no new key is introduced.
 )doc");
 
diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt
index d3ee4d74fc..c7a30d5ae2 100644
--- a/tensorflow/core/ops/ops.pbtxt
+++ b/tensorflow/core/ops/ops.pbtxt
@@ -2380,7 +2380,7 @@ op {
     default_value {
       b: false
     }
-    description: "If true, all pending enqueue requests that are\nblocked on the barrier\'s queue will be cancelled. InsertMany will fail, even\nif no new key is introduced."
+    description: "If true, all pending enqueue requests that are\nblocked on the barrier\'s queue will be canceled. InsertMany will fail, even\nif no new key is introduced."
   }
   summary: "Closes the given barrier."
   description: "This operation signals that no more new elements will be inserted in the\ngiven barrier. Subsequent InsertMany that try to introduce a new key will fail.\nSubsequent InsertMany operations that just add missing components to already\nexisting elements will continue to succeed. Subsequent TakeMany operations will\ncontinue to succeed if sufficient completed elements remain in the barrier.\nSubsequent TakeMany operations that would block will fail immediately."
@@ -15613,7 +15613,7 @@ op {
     default_value {
       b: false
     }
-    description: "If true, all pending enqueue requests that are\nblocked on the given queue will be cancelled."
+    description: "If true, all pending enqueue requests that are\nblocked on the given queue will be canceled."
   }
   summary: "Closes the given queue."
   description: "This operation signals that no more elements will be enqueued in the\ngiven queue. Subsequent Enqueue(Many) operations will fail.\nSubsequent Dequeue(Many) operations will continue to succeed if\nsufficient elements remain in the queue. Subsequent Dequeue(Many)\noperations that would block will fail immediately."
@@ -15631,7 +15631,7 @@ op {
     default_value {
       b: false
     }
-    description: "If true, all pending enqueue requests that are\nblocked on the given queue will be cancelled."
+    description: "If true, all pending enqueue requests that are\nblocked on the given queue will be canceled."
   }
   summary: "Closes the given queue."
   description: "This operation signals that no more elements will be enqueued in the\ngiven queue. Subsequent Enqueue(Many) operations will fail.\nSubsequent Dequeue(Many) operations will continue to succeed if\nsufficient elements remain in the queue. Subsequent Dequeue(Many)\noperations that would block will fail immediately."
diff --git a/tensorflow/core/platform/posix/subprocess.cc b/tensorflow/core/platform/posix/subprocess.cc
index fc511fdf72..cefc66831a 100644
--- a/tensorflow/core/platform/posix/subprocess.cc
+++ b/tensorflow/core/platform/posix/subprocess.cc
@@ -28,7 +28,7 @@ limitations under the License.
 // A danger of calling fork() (as opposed to clone() or vfork()) is that if
 // many people have used pthread_atfork() to acquire locks, fork() can deadlock,
 // because it's unlikely that the locking order will be correct in a large
-// programme where different layers are unaware of one another and using
+// program where different layers are unaware of one another and using
 // pthread_atfork() independently.
 //
 // The danger of not calling fork() is that if libc managed to use
diff --git a/tensorflow/core/protobuf/master.proto b/tensorflow/core/protobuf/master.proto
index e607b1c42a..0a825bbb92 100644
--- a/tensorflow/core/protobuf/master.proto
+++ b/tensorflow/core/protobuf/master.proto
@@ -202,7 +202,7 @@ message CloseSessionResponse {
 // Old sessions may continue to have side-effects on resources not in
 // containers listed in "containers", and thus may affect future
 // sessions' results in ways that are hard to predict.  Thus, if well-defined
-// behaviour is desired, is it recommended that all containers be listed in
+// behavior is desired, is it recommended that all containers be listed in
 // "containers".  Similarly, if a device_filter is specified, results may be
 // hard to predict.
 message ResetRequest {
diff --git a/tensorflow/core/public/session.h b/tensorflow/core/public/session.h
index eaa076ffb9..4792b32a52 100644
--- a/tensorflow/core/public/session.h
+++ b/tensorflow/core/public/session.h
@@ -199,7 +199,7 @@ Status NewSession(const SessionOptions& options, Session** out_session);
 /// Old sessions may continue to have side-effects on resources not in
 /// containers listed in "containers", and thus may affect future
 /// sessions' results in ways that are hard to predict.  Thus, if well-defined
-/// behaviour is desired, it is recommended that all containers be listed in
+/// behavior is desired, it is recommended that all containers be listed in
 /// "containers".
 ///
 /// `containers` is a vector of string representation of resource container
diff --git a/tensorflow/core/util/ctc/ctc_loss_calculator.h b/tensorflow/core/util/ctc/ctc_loss_calculator.h
index 567bad38c3..f181ab93e7 100644
--- a/tensorflow/core/util/ctc/ctc_loss_calculator.h
+++ b/tensorflow/core/util/ctc/ctc_loss_calculator.h
@@ -48,7 +48,7 @@ class CTCLossCalculator {
   // these examples.
   //
   // Reference materials:
-  //  GravesTh: Alex Graves, "Supervised Sequence Labelling with Recurrent
+  //  GravesTh: Alex Graves, "Supervised Sequence Labeling with Recurrent
   //    Neural Networks" (PhD Thesis), Technische Universit¨at M¨unchen.
  public:
   typedef std::vector<std::vector<int>> LabelSequences;
diff --git a/tensorflow/core/util/example_proto_fast_parsing.h b/tensorflow/core/util/example_proto_fast_parsing.h
index 5f8b4af5fe..20536cee16 100644
--- a/tensorflow/core/util/example_proto_fast_parsing.h
+++ b/tensorflow/core/util/example_proto_fast_parsing.h
@@ -45,7 +45,7 @@ struct FastParseExampleConfig {
     DataType dtype;
     // These 2 fields correspond exactly to dense_shapes and dense_defaults in
     // ParseExample op.
-    // Documentation is avaliable in: tensorflow/core/ops/parsing_ops.cc
+    // Documentation is available in: tensorflow/core/ops/parsing_ops.cc
     PartialTensorShape shape;
     Tensor default_value;
     bool variable_length;
@@ -62,7 +62,7 @@ struct FastParseExampleConfig {
 };
 
 // This is exactly the output of TF's ParseExample Op.
-// Documentation is avaliable in: tensorflow/core/ops/parsing_ops.cc
+// Documentation is available in: tensorflow/core/ops/parsing_ops.cc
 struct Result {
   std::vector<Tensor> sparse_indices;
   std::vector<Tensor> sparse_values;
diff --git a/tensorflow/core/util/tensor_bundle/tensor_bundle.h b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
index b0bddf7e42..2c40388250 100644
--- a/tensorflow/core/util/tensor_bundle/tensor_bundle.h
+++ b/tensorflow/core/util/tensor_bundle/tensor_bundle.h
@@ -31,7 +31,7 @@ limitations under the License.
 // (tensorflow::table::Table).  Each key is a name of a tensor and its value is
 // a serialized BundleEntryProto.  Each BundleEntryProto describes the metadata
 // of a tensor: which of the "data" files contains the content of a tensor, the
-// offset into that file, checksum, some auxilary data, etc.
+// offset into that file, checksum, some auxiliary data, etc.
 //
 // A tensor bundle can be accessed randomly using a BundleReader.  Usage:
 //
diff --git a/tensorflow/docs_src/performance/xla/index.md b/tensorflow/docs_src/performance/xla/index.md
index d2c1843327..19045b45d9 100644
--- a/tensorflow/docs_src/performance/xla/index.md
+++ b/tensorflow/docs_src/performance/xla/index.md
@@ -65,13 +65,13 @@ The following diagram shows the compilation process in XLA:
   <img src="https://www.tensorflow.org/images/how-does-xla-work.png">
 </div>
 
-XLA comes with several optimizations and analyses that are target-independent,
+XLA comes with several optimizations and analyzes that are target-independent,
 such as [CSE](https://en.wikipedia.org/wiki/Common_subexpression_elimination),
 target-independent operation fusion, and buffer analysis for allocating runtime
 memory for the computation.
 
 After the target-independent step, XLA sends the HLO computation to a backend.
-The backend can perform further HLO-level analyses and optimizations, this time
+The backend can perform further HLO-level analyzes and optimizations, this time
 with target specific information and needs in mind. For example, the XLA GPU
 backend may perform operation fusion beneficial specifically for the GPU
 programming model and determine how to partition the computation into streams.
diff --git a/tensorflow/docs_src/programmers_guide/reading_data.md b/tensorflow/docs_src/programmers_guide/reading_data.md
index 088724337e..3c31d3a1a7 100644
--- a/tensorflow/docs_src/programmers_guide/reading_data.md
+++ b/tensorflow/docs_src/programmers_guide/reading_data.md
@@ -332,7 +332,7 @@ limit has been reached and no more examples are available.
 
 The last ingredient is the
 @{tf.train.Coordinator}. This is responsible
-for letting all the threads know if anything has signalled a shut down. Most
+for letting all the threads know if anything has signaled a shut down. Most
 commonly this would be because an exception was raised, for example one of the
 threads got an error when running some operation (or an ordinary Python
 exception).
diff --git a/tensorflow/docs_src/programmers_guide/version_semantics.md b/tensorflow/docs_src/programmers_guide/version_semantics.md
index 47fc582387..cee3b105de 100644
--- a/tensorflow/docs_src/programmers_guide/version_semantics.md
+++ b/tensorflow/docs_src/programmers_guide/version_semantics.md
@@ -118,7 +118,7 @@ Many users of TensorFlow will be saving graphs and trained models to disk for
 later evaluation or more training, often changing versions of TensorFlow in the
 process.  First, following semver, any graph or checkpoint written out with one
 version of TensorFlow can be loaded and evaluated with a later version of
-TensorFlow with the same major release.  However, we will endeavour to preserve
+TensorFlow with the same major release.  However, we will endeavor to preserve
 backwards compatibility even across major releases when possible, so that the
 serialized files are usable over long periods of time.
 
diff --git a/tensorflow/examples/android/jni/object_tracking/image_utils.h b/tensorflow/examples/android/jni/object_tracking/image_utils.h
index 2d712e77f9..ac9ffd90f8 100644
--- a/tensorflow/examples/android/jni/object_tracking/image_utils.h
+++ b/tensorflow/examples/android/jni/object_tracking/image_utils.h
@@ -67,7 +67,7 @@ inline static void MarkImage(const int x, const int y, const int radius,
     // reduce the number of iterations required as compared to starting from
     // either 0 and counting up or radius and counting down.
     for (int d_x = radius - d_y; d_x <= radius; ++d_x) {
-      // The first time this critera is met, we know the width of the circle at
+      // The first time this criteria is met, we know the width of the circle at
       // this row (without using sqrt).
       if (squared_y_dist + Square(d_x) >= squared_radius) {
         const int min_x = MAX(x - d_x, 0);
diff --git a/tensorflow/examples/udacity/1_notmnist.ipynb b/tensorflow/examples/udacity/1_notmnist.ipynb
index 5b2966c006..39674e1aa4 100644
--- a/tensorflow/examples/udacity/1_notmnist.ipynb
+++ b/tensorflow/examples/udacity/1_notmnist.ipynb
@@ -70,7 +70,7 @@
         "colab_type": "text"
       },
       "source": [
-        "First, we'll download the dataset to our local machine. The data consists of characters rendered in a variety of fonts on a 28x28 image. The labels are limited to 'A' through 'J' (10 classes). The training set has about 500k and the testset 19000 labelled examples. Given these sizes, it should be possible to train models quickly on any machine."
+        "First, we'll download the dataset to our local machine. The data consists of characters rendered in a variety of fonts on a 28x28 image. The labels are limited to 'A' through 'J' (10 classes). The training set has about 500k and the testset 19000 labeled examples. Given these sizes, it should be possible to train models quickly on any machine."
       ]
     },
     {
@@ -168,7 +168,7 @@
       },
       "source": [
         "Extract the dataset from the compressed .tar.gz file.\n",
-        "This should give you a set of directories, labelled A through J."
+        "This should give you a set of directories, labeled A through J."
       ]
     },
     {
diff --git a/tensorflow/go/op/wrappers.go b/tensorflow/go/op/wrappers.go
index 4af1386306..f508b63b13 100644
--- a/tensorflow/go/op/wrappers.go
+++ b/tensorflow/go/op/wrappers.go
@@ -4813,7 +4813,7 @@ type QueueCloseV2Attr func(optionalAttr)
 // QueueCloseV2CancelPendingEnqueues sets the optional cancel_pending_enqueues attribute to value.
 //
 // value: If true, all pending enqueue requests that are
-// blocked on the given queue will be cancelled.
+// blocked on the given queue will be canceled.
 // If not specified, defaults to false
 func QueueCloseV2CancelPendingEnqueues(value bool) QueueCloseV2Attr {
 	return func(m optionalAttr) {
diff --git a/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java b/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java
index 27e2215f62..a31ea900d1 100644
--- a/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java
+++ b/tensorflow/java/src/test/java/org/tensorflow/TensorFlowTest.java
@@ -33,7 +33,7 @@ public class TensorFlowTest {
   public void registeredOpList() {
     // Would be nice to actually parse the output as a tensorflow.OpList protocol buffer message,
     // but as of May 2017, bazel support for generating Java code from protocol buffer definitions
-    // was not sorted out. Revisit? Till then, at least excercise the code.
+    // was not sorted out. Revisit? Till then, at least exercise the code.
     assertTrue(TensorFlow.registeredOpList().length > 0);
   }
 }
diff --git a/tensorflow/python/debug/cli/analyzer_cli.py b/tensorflow/python/debug/cli/analyzer_cli.py
index 69b6d9ffdf..da27f4cebe 100644
--- a/tensorflow/python/debug/cli/analyzer_cli.py
+++ b/tensorflow/python/debug/cli/analyzer_cli.py
@@ -368,7 +368,7 @@ class DebugAnalyzer(object):
   def add_tensor_filter(self, filter_name, filter_callable):
     """Add a tensor filter.
 
-    A tensor filter is a named callable of the siganture:
+    A tensor filter is a named callable of the signature:
       filter_callable(dump_datum, tensor),
 
     wherein dump_datum is an instance of debug_data.DebugTensorDatum carrying
diff --git a/tensorflow/python/debug/cli/debugger_cli_common.py b/tensorflow/python/debug/cli/debugger_cli_common.py
index 9ad49771d1..12e79ab07a 100644
--- a/tensorflow/python/debug/cli/debugger_cli_common.py
+++ b/tensorflow/python/debug/cli/debugger_cli_common.py
@@ -840,7 +840,7 @@ class TabCompletionRegistry(object):
 
     Args:
       context_words: A list of context words belonging to the context being
-        registerd. It is a list of str, instead of a single string, to support
+        registered. It is a list of str, instead of a single string, to support
         synonym words triggering the same tab-completion context, e.g.,
         both "drink" and the short-hand "dr" can trigger the same context.
       comp_items: A list of completion items, as a list of str.
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli.py b/tensorflow/python/debug/cli/profile_analyzer_cli.py
index c08605b92b..3304194b1c 100644
--- a/tensorflow/python/debug/cli/profile_analyzer_cli.py
+++ b/tensorflow/python/debug/cli/profile_analyzer_cli.py
@@ -330,7 +330,7 @@ class ProfileAnalyzer(object):
     self._arg_parsers["list_profile"] = ap
 
     ap = argparse.ArgumentParser(
-        description="Print a Python source file wiht line-level profile "
+        description="Print a Python source file with line-level profile "
                     "information",
         usage=argparse.SUPPRESS)
     ap.add_argument(
diff --git a/tensorflow/python/debug/lib/debug_utils.py b/tensorflow/python/debug/lib/debug_utils.py
index 9013cb096d..f1e972940b 100644
--- a/tensorflow/python/debug/lib/debug_utils.py
+++ b/tensorflow/python/debug/lib/debug_utils.py
@@ -121,7 +121,7 @@ def watch_graph(run_options,
       are set, the two filtering operations will occur in a logical `AND`
       relation. In other words, a node will be included if and only if it
       hits both whitelists.
-    tensor_dtype_regex_whitelist: Regular-experssion whitelist for Tensor
+    tensor_dtype_regex_whitelist: Regular-expression whitelist for Tensor
       data type, e.g., `"^int.*"`.
       This whitelist operates in logical `AND` relations to the two whitelists
       above.
@@ -210,7 +210,7 @@ def watch_graph_with_blacklists(run_options,
       relation. In other words, a node will be excluded if it hits either of
       the two blacklists; a node will be included if and only if it hits
       neither of the blacklists.
-    tensor_dtype_regex_blacklist: Regular-experssion blacklist for Tensor
+    tensor_dtype_regex_blacklist: Regular-expression blacklist for Tensor
       data type, e.g., `"^int.*"`.
       This blacklist operates in logical `OR` relations to the two whitelists
       above.
diff --git a/tensorflow/python/debug/wrappers/dumping_wrapper.py b/tensorflow/python/debug/wrappers/dumping_wrapper.py
index 0d9b3cfa7e..63229a8539 100644
--- a/tensorflow/python/debug/wrappers/dumping_wrapper.py
+++ b/tensorflow/python/debug/wrappers/dumping_wrapper.py
@@ -86,7 +86,7 @@ class DumpingDebugWrapperSession(framework.NonInteractiveDebugWrapperSession):
     """Implementation of abstrat method in superclass.
 
     See doc of `NonInteractiveDebugWrapperSession.prepare_run_debug_urls()`
-    for details. This implentation creates a run-specific subdirectory under
+    for details. This implementation creates a run-specific subdirectory under
     self._session_root and stores information regarding run `fetches` and
     `feed_dict.keys()` in the subdirectory.
 
diff --git a/tensorflow/python/debug/wrappers/framework.py b/tensorflow/python/debug/wrappers/framework.py
index ea642adbd1..2c239038e4 100644
--- a/tensorflow/python/debug/wrappers/framework.py
+++ b/tensorflow/python/debug/wrappers/framework.py
@@ -666,7 +666,7 @@ class WatchOptions(object):
         are set, the two filtering operations will occur in a logical `AND`
         relation. In other words, a node will be included if and only if it
         hits both whitelists.
-      tensor_dtype_regex_whitelist: Regular-experssion whitelist for Tensor
+      tensor_dtype_regex_whitelist: Regular-expression whitelist for Tensor
         data type, e.g., `"^int.*"`.
         This whitelist operates in logical `AND` relations to the two whitelists
         above.
diff --git a/tensorflow/python/estimator/estimator.py b/tensorflow/python/estimator/estimator.py
index 33ffe3d81e..230f103c5d 100644
--- a/tensorflow/python/estimator/estimator.py
+++ b/tensorflow/python/estimator/estimator.py
@@ -200,7 +200,7 @@ class Estimator(object):
         error. 'steps' works incrementally. If you call two times
         train(steps=10) then training occurs in total 20 steps. If `OutOfRange`
         or `StopIteration` error occurs in the middle, training stops before 20
-        steps. If you don't want to have incremental behaviour please set
+        steps. If you don't want to have incremental behavior please set
         `max_steps` instead. If set, `max_steps` must be `None`.
       max_steps: Number of total steps for which to train model. If `None`,
         train forever or train until input_fn generates the `OutOfRange` or
diff --git a/tensorflow/python/framework/function.py b/tensorflow/python/framework/function.py
index ac8aee2c83..08faa3a6d2 100644
--- a/tensorflow/python/framework/function.py
+++ b/tensorflow/python/framework/function.py
@@ -281,7 +281,7 @@ class _FuncGraph(ops.Graph):
   _FuncGraph overrides ops.Graph's create_op() so that we can keep
   track of every inputs into every op created inside the function.  If
   any input is from other graphs, we keep track of it in self.capture
-  and substitue the input with a place holder.
+  and substitute the input with a place holder.
 
   Each captured input's corresponding place holder is converted into a
   function argument and the caller passes in the captured tensor.
diff --git a/tensorflow/python/kernel_tests/barrier_ops_test.py b/tensorflow/python/kernel_tests/barrier_ops_test.py
index e90543a44b..7f49c63957 100644
--- a/tensorflow/python/kernel_tests/barrier_ops_test.py
+++ b/tensorflow/python/kernel_tests/barrier_ops_test.py
@@ -402,7 +402,7 @@ class BarrierTest(test.TestCase):
       with self.assertRaisesOpError("is closed"):
         fail_insert_op.run()
 
-      # This op should succeed because the barrier has not cancelled
+      # This op should succeed because the barrier has not canceled
       # pending enqueues
       insert_1_op.run()
       self.assertEquals(size_t.eval(), [3])
@@ -461,7 +461,7 @@ class BarrierTest(test.TestCase):
       with self.assertRaisesOpError("is closed"):
         fail_insert_op.run()
 
-      # This op should fail because the queue is cancelled.
+      # This op should fail because the queue is canceled.
       with self.assertRaisesOpError("is closed"):
         insert_2_op.run()
 
diff --git a/tensorflow/python/kernel_tests/conv_ops_3d_test.py b/tensorflow/python/kernel_tests/conv_ops_3d_test.py
index 04c43ef5fa..14622ab467 100644
--- a/tensorflow/python/kernel_tests/conv_ops_3d_test.py
+++ b/tensorflow/python/kernel_tests/conv_ops_3d_test.py
@@ -330,7 +330,7 @@ class Conv3DTest(test.TestCase):
 
     if test.is_gpu_available() and use_gpu:
       data_type = dtypes.float32
-      # TOOD(mjanusz): Modify gradient_checker to also provide max relative
+      # TODO(mjanusz): Modify gradient_checker to also provide max relative
       # error and synchronize the tolerance levels between the tests for forward
       # and backward computations.
       if test.is_gpu_available():
diff --git a/tensorflow/python/kernel_tests/distributions/categorical_test.py b/tensorflow/python/kernel_tests/distributions/categorical_test.py
index 396de45cad..33db933e82 100644
--- a/tensorflow/python/kernel_tests/distributions/categorical_test.py
+++ b/tensorflow/python/kernel_tests/distributions/categorical_test.py
@@ -127,7 +127,7 @@ class CategoricalTest(test.TestCase):
       self.assertAllClose(dist.prob(0).eval(), 0.2)
 
   def testCDFWithDynamicEventShape(self):
-    """Test that dynamically-sized events with unkown shape work."""
+    """Test that dynamically-sized events with unknown shape work."""
     batch_size = 2
     histograms = array_ops.placeholder(dtype=dtypes.float32,
                                        shape=(batch_size, None))
diff --git a/tensorflow/python/kernel_tests/metrics_test.py b/tensorflow/python/kernel_tests/metrics_test.py
index cd5bee362d..543039bdd3 100644
--- a/tensorflow/python/kernel_tests/metrics_test.py
+++ b/tensorflow/python/kernel_tests/metrics_test.py
@@ -1169,7 +1169,7 @@ class AUCTest(test.TestCase):
       self.assertAlmostEqual(1, auc.eval(), 6)
 
   def np_auc(self, predictions, labels, weights):
-    """Computes the AUC explicitely using Numpy.
+    """Computes the AUC explicitly using Numpy.
 
     Args:
       predictions: an ndarray with shape [N].
diff --git a/tensorflow/python/kernel_tests/substr_op_test.py b/tensorflow/python/kernel_tests/substr_op_test.py
index 0c0710fed4..854394b0dd 100644
--- a/tensorflow/python/kernel_tests/substr_op_test.py
+++ b/tensorflow/python/kernel_tests/substr_op_test.py
@@ -183,7 +183,7 @@ class SubstrOpTest(test.TestCase):
 
     position = np.array([[1, 2, 3], [1, 2, 3], [1, 2, 3]], dtype)
     length = np.array([[2, 3, 4]], dtype)
-    # Should fail: postion/length have different dimensionality
+    # Should fail: position/length have different dimensionality
     with self.assertRaises(ValueError):
       substr_op = string_ops.substr(test_string, position, length)
 
diff --git a/tensorflow/python/kernel_tests/variable_scope_test.py b/tensorflow/python/kernel_tests/variable_scope_test.py
index 245dcc96db..7108131d53 100644
--- a/tensorflow/python/kernel_tests/variable_scope_test.py
+++ b/tensorflow/python/kernel_tests/variable_scope_test.py
@@ -115,7 +115,7 @@ class VariableScopeTest(test.TestCase):
           dtypes.int64, dtypes.bool
       ]
 
-      # Use different varibale_name to distinguish various dtypes
+      # Use different variable_name to distinguish various dtypes
       for (i, dtype) in enumerate(types):
         x = variable_scope.get_variable(
             name="x%d" % i, shape=(3, 4), dtype=dtype)
@@ -807,7 +807,7 @@ class VariableScopeWithPartitioningTest(test.TestCase):
           dtypes.int64, dtypes.bool
       ]
 
-      # Use different varibale_name to distinguish various dtypes
+      # Use different variable_name to distinguish various dtypes
       for (i, dtype) in enumerate(types):
         x = variable_scope.get_variable(
             name="x%d" % i,
diff --git a/tensorflow/python/ops/ctc_ops.py b/tensorflow/python/ops/ctc_ops.py
index 4ea4d9ed2d..477c0d1cb4 100644
--- a/tensorflow/python/ops/ctc_ops.py
+++ b/tensorflow/python/ops/ctc_ops.py
@@ -37,7 +37,7 @@ def ctc_loss(labels, inputs, sequence_length,
   This op implements the CTC loss as presented in the article:
 
   [A. Graves, S. Fernandez, F. Gomez, J. Schmidhuber.
-  Connectionist Temporal Classification: Labelling Unsegmented Sequence Data
+  Connectionist Temporal Classification: Labeling Unsegmented Sequence Data
   with Recurrent Neural Networks. ICML 2006, Pittsburgh, USA, pp. 369-376.](http://www.cs.toronto.edu/~graves/icml_2006.pdf)
 
   Input requirements:
diff --git a/tensorflow/python/ops/data_flow_ops.py b/tensorflow/python/ops/data_flow_ops.py
index eb9d0ba7e3..00f339c393 100644
--- a/tensorflow/python/ops/data_flow_ops.py
+++ b/tensorflow/python/ops/data_flow_ops.py
@@ -516,7 +516,7 @@ class QueueBase(object):
     that would block will fail immediately.
 
     If `cancel_pending_enqueues` is `True`, all pending requests will also
-    be cancelled.
+    be canceled.
 
     Args:
       cancel_pending_enqueues: (Optional.) A boolean, defaulting to
@@ -988,7 +988,7 @@ class Barrier(object):
     TakeMany operations that would block will fail immediately.
 
     If `cancel_pending_enqueues` is `True`, all pending requests to the
-    underlying queue will also be cancelled, and completing of already
+    underlying queue will also be canceled, and completing of already
     started values is also not acceptable anymore.
 
     Args:
diff --git a/tensorflow/python/ops/distributions/transformed_distribution.py b/tensorflow/python/ops/distributions/transformed_distribution.py
index 09b26a9fb7..1be3819569 100644
--- a/tensorflow/python/ops/distributions/transformed_distribution.py
+++ b/tensorflow/python/ops/distributions/transformed_distribution.py
@@ -339,7 +339,7 @@ class TransformedDistribution(distribution_lib.Distribution):
             self.distribution.event_shape_tensor()))
 
   def _event_shape(self):
-    # If there's a chance that the event_shape has been overriden, we return
+    # If there's a chance that the event_shape has been overridden, we return
     # what we statically know about the `event_shape_override`. This works
     # because: `_is_maybe_event_override` means `static_override` is `None` or a
     # non-empty list, i.e., we don't statically know the `event_shape` or we do.
@@ -360,7 +360,7 @@ class TransformedDistribution(distribution_lib.Distribution):
         self.distribution.batch_shape_tensor())
 
   def _batch_shape(self):
-    # If there's a chance that the batch_shape has been overriden, we return
+    # If there's a chance that the batch_shape has been overridden, we return
     # what we statically know about the `batch_shape_override`. This works
     # because: `_is_maybe_batch_override` means `static_override` is `None` or a
     # non-empty list, i.e., we don't statically know the `batch_shape` or we do.
diff --git a/tensorflow/python/ops/image_ops_test.py b/tensorflow/python/ops/image_ops_test.py
index 492dbe6d13..5588d18ef1 100644
--- a/tensorflow/python/ops/image_ops_test.py
+++ b/tensorflow/python/ops/image_ops_test.py
@@ -1449,7 +1449,7 @@ class PadToBoundingBoxTest(test_util.TensorFlowTestCase):
           use_tensor_inputs_options=[False])
 
       # The orignal error message does not contain back slashes. However, they
-      # are added by either the assert op or the runtime. If this behaviour
+      # are added by either the assert op or the runtime. If this behavior
       # changes in the future, the match string will also needs to be changed.
       self._assertRaises(
           x,
@@ -2281,7 +2281,7 @@ class ResizeImageWithCropOrPadTest(test_util.TensorFlowTestCase):
           use_tensor_inputs_options=[False])
 
       # The orignal error message does not contain back slashes. However, they
-      # are added by either the assert op or the runtime. If this behaviour
+      # are added by either the assert op or the runtime. If this behavior
       # changes in the future, the match string will also needs to be changed.
       self._assertRaises(
           x,
diff --git a/tensorflow/python/ops/math_ops.py b/tensorflow/python/ops/math_ops.py
index 1555d19395..9e98921025 100644
--- a/tensorflow/python/ops/math_ops.py
+++ b/tensorflow/python/ops/math_ops.py
@@ -386,7 +386,7 @@ def sign(x, name=None):
     A `Tensor` or `SparseTensor`, respectively. Has the same type as `x`.
 
   @compatibility(numpy)
-  Equivalent to numpy.sign except for the behaviour for input values of NaN.
+  Equivalent to numpy.sign except for the behavior for input values of NaN.
   @end_compatibility
   """
   with ops.name_scope(name, "Sign", [x]) as name:
diff --git a/tensorflow/python/ops/math_ops_test.py b/tensorflow/python/ops/math_ops_test.py
index 120827d18b..617d2305bd 100644
--- a/tensorflow/python/ops/math_ops_test.py
+++ b/tensorflow/python/ops/math_ops_test.py
@@ -413,9 +413,9 @@ class DivAndModTest(test_util.TensorFlowTestCase):
       tf_divs = array_ops.constant(divs)
       tf2_result = (tf_nums // tf_divs * tf_divs + tf_nums % tf_divs).eval()
       np_result = (nums // divs) * divs + (nums % divs)
-      # consistentcy with numpy
+      # Consistent with numpy
       self.assertAllEqual(tf_result, np_result)
-      # consistentcy with two forms of divide
+      # Consistent with two forms of divide
       self.assertAllEqual(tf_result, tf2_result)
       # consistency for truncation form
       tf3_result = (math_ops.truncatediv(nums, divs) * divs +
diff --git a/tensorflow/python/ops/sparse_ops.py b/tensorflow/python/ops/sparse_ops.py
index 3c1ab3248b..ee08ef534b 100644
--- a/tensorflow/python/ops/sparse_ops.py
+++ b/tensorflow/python/ops/sparse_ops.py
@@ -1460,7 +1460,7 @@ def sparse_tensor_dense_matmul(sp_a,
   `sp_a.dense_shape` takes on large values.
 
   Below is a rough speed comparison between `sparse_tensor_dense_matmul`,
-  labelled 'sparse', and `matmul`(a_is_sparse=True), labelled 'dense'.  For
+  labeled 'sparse', and `matmul`(a_is_sparse=True), labeled 'dense'.  For
   purposes of the comparison, the time spent converting from a `SparseTensor` to
   a dense `Tensor` is not included, so it is overly conservative with respect to
   the time ratio.
diff --git a/tensorflow/python/ops/special_math_ops.py b/tensorflow/python/ops/special_math_ops.py
index 851fba0beb..b561203bb4 100644
--- a/tensorflow/python/ops/special_math_ops.py
+++ b/tensorflow/python/ops/special_math_ops.py
@@ -424,7 +424,7 @@ def _exponential_space_einsum(equation, *inputs):
   missing_idx = set(idx_out).difference(idx_all)
   if missing_idx:
     raise ValueError(
-        'Unknown ouput axes: %s' % missing_idx
+        'Unknown output axes: %s' % missing_idx
     )
 
   axis_order = {}
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index a29ddfa9f2..aceffd373a 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -282,7 +282,7 @@ class _VariableStore(object):
 
     # If a *_ref type is passed in an error would be triggered further down the
     # stack. We prevent this using base_dtype to get a non-ref version of the
-    # type, before doing anything else. When _ref types are removed in favour of
+    # type, before doing anything else. When _ref types are removed in favor of
     # resources, this line can be removed.
     try:
       dtype = dtype.base_dtype
diff --git a/tensorflow/python/tools/import_pb_to_tensorboard.py b/tensorflow/python/tools/import_pb_to_tensorboard.py
index caeb04a24b..2bb055e978 100644
--- a/tensorflow/python/tools/import_pb_to_tensorboard.py
+++ b/tensorflow/python/tools/import_pb_to_tensorboard.py
@@ -31,7 +31,7 @@ def import_to_tensorboard(model_dir, log_dir):
 
   Args:
     model_dir: The location of the protobuf (`pb`) model to visualize
-    log_dir: The location for the Tensorboard log to begin visualisation from.
+    log_dir: The location for the Tensorboard log to begin visualization from.
 
   Usage:
     Call this function with your model location and desired log directory.
diff --git a/tensorflow/python/training/evaluation.py b/tensorflow/python/training/evaluation.py
index 7c46591d07..bbaa3931c2 100644
--- a/tensorflow/python/training/evaluation.py
+++ b/tensorflow/python/training/evaluation.py
@@ -113,7 +113,7 @@ def _evaluate_once(checkpoint_path,
 
   One may also consider using a `tf.contrib.training.SummaryAtEndHook` to record
   summaries after the `eval_ops` have run. If `eval_ops` is `None`, the
-  summaries run immedietly after the model checkpoint has been restored.
+  summaries run immediately after the model checkpoint has been restored.
 
   Note that `evaluate_once` creates a local variable used to track the number of
   evaluations run via `tf.contrib.training.get_or_create_eval_step`.
diff --git a/tensorflow/python/util/lazy_loader.py b/tensorflow/python/util/lazy_loader.py
index 34308ff931..6d2622b1c0 100644
--- a/tensorflow/python/util/lazy_loader.py
+++ b/tensorflow/python/util/lazy_loader.py
@@ -24,7 +24,7 @@ import types
 
 
 class LazyLoader(types.ModuleType):
-  """Lazily import a module, mainly to avoid pulling in large dependancies.
+  """Lazily import a module, mainly to avoid pulling in large dependencies.
 
   `contrib`, and `ffmpeg` are examples of modules that are large and not always
   needed, and this allows them to only be loaded when they are used.
diff --git a/tensorflow/stream_executor/cuda/cuda_diagnostics.h b/tensorflow/stream_executor/cuda/cuda_diagnostics.h
index 5cce6b9365..aa68321acc 100644
--- a/tensorflow/stream_executor/cuda/cuda_diagnostics.h
+++ b/tensorflow/stream_executor/cuda/cuda_diagnostics.h
@@ -75,7 +75,7 @@ class Diagnostician {
 
   // Given the DSO version number and the driver version file contents, extracts
   // the driver version and compares, warning the user in the case of
-  // incompatability.
+  // incompatibility.
   //
   // This is solely used for more informative log messages when the user is
   // running on a machine that happens to have a libcuda/kernel driver mismatch.
diff --git a/tensorflow/stream_executor/cuda/cuda_driver.h b/tensorflow/stream_executor/cuda/cuda_driver.h
index c5d7d8b32f..68494aba65 100644
--- a/tensorflow/stream_executor/cuda/cuda_driver.h
+++ b/tensorflow/stream_executor/cuda/cuda_driver.h
@@ -77,7 +77,7 @@ class CUDADriver {
 
   // Destroys a CUDA stream associated with the given context.
   // stream is owned by the caller, must not be null, and *stream is set to null
-  // if the stream is successfuly destroyed.
+  // if the stream is successfully destroyed.
   // http://docs.nvidia.com/cuda/cuda-driver-api/group__CUDA__STREAM.html#group__CUDA__STREAM_1g244c8833de4596bcd31a06cdf21ee758
   static void DestroyStream(CudaContext* context, CUstream *stream);
 
diff --git a/tensorflow/stream_executor/cuda/cuda_event.h b/tensorflow/stream_executor/cuda/cuda_event.h
index 46f0232b1d..56667e65d3 100644
--- a/tensorflow/stream_executor/cuda/cuda_event.h
+++ b/tensorflow/stream_executor/cuda/cuda_event.h
@@ -46,7 +46,7 @@ class CUDAEvent : public internal::EventInterface {
   // Polls the CUDA platform for the event's current status.
   Event::Status PollForStatus();
 
-  // The underyling CUDA event element.
+  // The underlying CUDA event element.
   const CUevent& cuda_event();
 
  private:
diff --git a/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc b/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
index c1e72bb565..43c707730a 100644
--- a/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
+++ b/tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
@@ -847,7 +847,7 @@ void *CUDAExecutor::CudaContextHack() { return context_; }
 
 CudaContext* CUDAExecutor::cuda_context() { return context_; }
 
-// Attemps to read the NUMA node corresponding to the GPU device's PCI bus out
+// Attempts to read the NUMA node corresponding to the GPU device's PCI bus out
 // of SysFS. Returns -1 if it cannot.
 //
 // For anything more complicated/prod-focused than this, you'll likely want to
diff --git a/tensorflow/stream_executor/plugin.h b/tensorflow/stream_executor/plugin.h
index b1db8b7cb8..0b88b86e2b 100644
--- a/tensorflow/stream_executor/plugin.h
+++ b/tensorflow/stream_executor/plugin.h
@@ -49,7 +49,7 @@ enum class PluginKind {
 //
 // A PluginConfig may be passed to the StreamExecutor constructor - the plugins
 // described therein will be used to provide BLAS, DNN, FFT, and RNG
-// functionality. Platform-approprate defaults will be used for any un-set
+// functionality. Platform-appropriate defaults will be used for any un-set
 // libraries. If a platform does not support a specified plugin (ex. cuBLAS on
 // an OpenCL executor), then an error will be logged and no plugin operations
 // will succeed.
diff --git a/tensorflow/stream_executor/stream_executor_pimpl.h b/tensorflow/stream_executor/stream_executor_pimpl.h
index 5c52afa794..780d12c8dc 100644
--- a/tensorflow/stream_executor/stream_executor_pimpl.h
+++ b/tensorflow/stream_executor/stream_executor_pimpl.h
@@ -205,7 +205,7 @@ class StreamExecutor {
   // This should be done before deallocating the region with delete[]/free/etc.
   bool HostMemoryUnregister(void *location) SE_MUST_USE_RESULT;
 
-  // Synchronizes all activity occuring in the StreamExecutor's context (most
+  // Synchronizes all activity occurring in the StreamExecutor's context (most
   // likely a whole device).
   bool SynchronizeAllActivity() SE_MUST_USE_RESULT;
 
@@ -238,7 +238,7 @@ class StreamExecutor {
                                     DeviceMemoryBase *gpu_dst);
 
   // Alternative interface for memcpying from host to device that takes an
-  // array slice. Checks that the destination size can accomodate the host
+  // array slice. Checks that the destination size can accommodate the host
   // slice size.
   template <class T>
   port::Status SynchronousMemcpyH2D(port::ArraySlice<T> host_src,
@@ -253,7 +253,7 @@ class StreamExecutor {
                                     void *host_dst);
 
   // Alternative interface for memcpying from device to host that takes an
-  // array slice. Checks that the destination size can accomodate the host
+  // array slice. Checks that the destination size can accommodate the host
   // slice size.
   template <typename T>
   port::Status SynchronousMemcpyD2H(const DeviceMemory<T> &gpu_src,
diff --git a/tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts b/tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts
index ab8a64b7b1..dc47df2a5c 100644
--- a/tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts
+++ b/tensorflow/tensorboard/components/tf_backend_d3v4/behavior.ts
@@ -86,7 +86,7 @@ export const BackendBehavior = {
    * Backend reload, which gets metadata on available runs, tags, etc from
    *   the backend.
    * Frontend reload, which loads new data for each chart or visual display.
-   * Backend reload logic is provided by this behaivor. The frontend reload
+   * Backend reload logic is provided by this behavior. The frontend reload
    *   logic should be provided elsewhere, since it is component-specific.
    * To keep things simple and consistent, we do the backend reload first,
    *   and the frontend reload afterwards.
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html b/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html
index 83b141cb98..b9d0a8c39e 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/tf-chart-scaffold.html
@@ -34,7 +34,7 @@ chart() - Returns the underlying chart element.
 reload() - Reloads the data and sends it to the underlying chart.
 
 This element should have a compatible chart plugin element as it's content. The
-plugin is requred to implement two functions:
+plugin is required to implement two functions:
 - setVisibleSeries(names: string[]): a function that receives an array of series
     names as the first parameter, responsible for changing the series currently
     being displayed to only the series in this array.
diff --git a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
index 9cacb7f5c8..a39fb9462b 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
+++ b/tensorflow/tensorboard/components/tf_dashboard_common_d3v4/tf-chart-scaffold.html
@@ -32,7 +32,7 @@ chart() - Returns the underlying chart element.
 reload() - Reloads the data and sends it to the underlying chart.
 
 This element should have a compatible chart plugin element as it's content. The
-plugin is requred to implement two functions:
+plugin is required to implement two functions:
 - setVisibleSeries(names: string[]): a function that receives an array of series
     names as the first parameter, responsible for changing the series currently
     being displayed to only the series in this array.
diff --git a/tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts b/tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts
index 7f4d329e79..d0be1d6ba5 100644
--- a/tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts
+++ b/tensorflow/tensorboard/components/tf_graph_common_d3v4/util.ts
@@ -68,7 +68,7 @@ module tf.graph.util {
    * progress
    * of the subtask and the subtask message. The parent task should pass a
    * subtracker to its subtasks. The subtask reports its own progress which
-   * becames relative to the main task.
+   * becomes relative to the main task.
    */
   export function getSubtaskTracker(
       parentTracker: ProgressTracker, impactOnTotalProgress: number,
diff --git a/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
index 10a65f54d5..35705713b9 100644
--- a/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
+++ b/tensorflow/tensorboard/components/tf_graph_d3v4/tf-graph-scene.html
@@ -322,7 +322,7 @@ limitations under the License.
 /* --- Annotation --- */
 
 /* only applied for annotations that are not summary or constant.
-(.summary, .constant gets overriden below) */
+(.summary, .constant gets overridden below) */
 ::content .annotation > .annotation-node > * {
   stroke-width: 0.5;
   stroke-dasharray: 1, 1;
diff --git a/tensorflow/tensorboard/components/tf_storage/storage.ts b/tensorflow/tensorboard/components/tf_storage/storage.ts
index 5516ae7ded..e8d5fa672f 100644
--- a/tensorflow/tensorboard/components/tf_storage/storage.ts
+++ b/tensorflow/tensorboard/components/tf_storage/storage.ts
@@ -22,7 +22,7 @@ limitations under the License.
  * which TensorBoard uses after like localhost:8000/#events&runPrefix=train*
  * to store state in the URI.
  *
- * It also allows saving the values to localStorage for long-term persistance.
+ * It also allows saving the values to localStorage for long-term persistence.
  */
 module TF.URIStorage {
   type StringDict = {[key: string]: string};
@@ -36,7 +36,7 @@ module TF.URIStorage {
   /**
    * The name of the property for users to set on a Polymer component
    * in order for its stored properties to be stored in the URI unambiguously.
-   * (No need to set this if you want mutliple instances of the component to
+   * (No need to set this if you want multiple instances of the component to
    * share URI state)
    *
    * Example:
@@ -257,7 +257,7 @@ module TF.URIStorage {
    * Convert dictionary of strings into a URI Component.
    * All key value entries get added as key value pairs in the component,
    * with the exception of a key with the TAB value, which if present
-   * gets prepended to the URI Component string for backwards comptability
+   * gets prepended to the URI Component string for backwards compatibility
    * reasons.
    */
   function _dictToComponent(items: StringDict): string {
diff --git a/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts b/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
index 19a27b9cbd..1b39efc03a 100644
--- a/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
+++ b/tensorflow/tensorboard/components/tf_storage_d3v4/storage.ts
@@ -25,7 +25,7 @@ import * as _ from 'lodash';
  * which TensorBoard uses after like localhost:8000/#events&runPrefix=train*
  * to store state in the URI.
  *
- * It also allows saving the values to localStorage for long-term persistance.
+ * It also allows saving the values to localStorage for long-term persistence.
  */
 type StringDict = {[key: string]: string};
 
@@ -38,7 +38,7 @@ export let TAB = '__tab__';
 /**
  * The name of the property for users to set on a Polymer component
  * in order for its stored properties to be stored in the URI unambiguously.
- * (No need to set this if you want mutliple instances of the component to
+ * (No need to set this if you want multiple instances of the component to
  * share URI state)
  *
  * Example:
@@ -258,7 +258,7 @@ function _writeComponent(component: string) {
  * Convert dictionary of strings into a URI Component.
  * All key value entries get added as key value pairs in the component,
  * with the exception of a key with the TAB value, which if present
- * gets prepended to the URI Component string for backwards comptability
+ * gets prepended to the URI Component string for backwards compatibility
  * reasons.
  */
 function _dictToComponent(items: StringDict): string {
diff --git a/tensorflow/tensorboard/components/vz_data_summary/vz-data-summary.ts b/tensorflow/tensorboard/components/vz_data_summary/vz-data-summary.ts
index 9a4e80c8a9..27faf35f6b 100644
--- a/tensorflow/tensorboard/components/vz_data_summary/vz-data-summary.ts
+++ b/tensorflow/tensorboard/components/vz_data_summary/vz-data-summary.ts
@@ -118,7 +118,7 @@ function createRect(
   // Set dimensions.
   rect.setAttribute('width', sliceWidth.toString());
   rect.setAttribute('height', height.toString());
-  // Set colour.
+  // Set color.
   rect.setAttribute('fill', color);
 
   return rect;
diff --git a/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html b/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html
index 4a00542276..09fa857929 100644
--- a/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html
+++ b/tensorflow/tensorboard/components/vz_heatmap/vz-heatmap.html
@@ -20,7 +20,7 @@ limitations under the License.
 
 <!--
 `vz-heatmap` A simple heatmap to visualize 2D data using predefined or user
-defined colour scheme, with a dependency on d3.js. The heatmap automatically
+defined color scheme, with a dependency on d3.js. The heatmap automatically
 fits itself to the width of the container it is placed in.
 
 @element vz-heatmap
@@ -287,7 +287,7 @@ fits itself to the width of the container it is placed in.
             this._generatedColorScale.domain(this.values);
           }
 
-          // If values reset, and data field contains valid data, set colour scale
+          // If values reset, and data field contains valid data, set color scale
           // to use the data extent as domain.
         } else if (this._currentDataValid) {
           this._generatedColorScale.domain(this._dataExtent);
diff --git a/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html b/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html
index 8a3503468f..089692576f 100644
--- a/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html
+++ b/tensorflow/tensorboard/components/vz_heatmap_d3v4/vz-heatmap.html
@@ -21,7 +21,7 @@ limitations under the License.
 
 <!--
 `vz-heatmap` A simple heatmap to visualize 2D data using predefined or user
-defined colour scheme, with a dependency on d3.js. The heatmap automatically
+defined color scheme, with a dependency on d3.js. The heatmap automatically
 fits itself to the width of the container it is placed in.
 
 @element vz-heatmap
@@ -288,7 +288,7 @@ fits itself to the width of the container it is placed in.
             this._generatedColorScale.domain(this.values);
           }
 
-          // If values reset, and data field contains valid data, set colour scale
+          // If values reset, and data field contains valid data, set color scale
           // to use the data extent as domain.
         } else if (this._currentDataValid) {
           this._generatedColorScale.domain(this._dataExtent);
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts
index cbd9785e2f..7820af0d48 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/scatterPlotVisualizer3DLabels.ts
@@ -38,7 +38,7 @@ const VERTICES_PER_GLYPH = 2 * 3;  // 2 triangles, 3 verts per triangle
  *            bottom center of the word is positioned at (0, 0);
  *    position: The position of the label in worldspace.
  *    vUv: The (u, v) coordinates that index into the glyphs sheet (range 0, 1.)
- *    color: The color of the label (matches the cooresponding point's color.)
+ *    color: The color of the label (matches the corresponding point's color.)
  *    wordShown: Boolean. Whether or not the label is visible.
  */
 
diff --git a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html
index 7554c322ce..f5087a9996 100644
--- a/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html
+++ b/tensorflow/tensorboard/components/vz_projector_d3v4/vz-projector-inspector-panel.html
@@ -223,7 +223,7 @@ limitations under the License.
         <span class="option-label">distance</span>
         <div class="options">
           <a class="selected cosine" href="javascript:void(0);">COSINE</a>
-          <a class="euclidean" href="javascript:void(0);">EUCLIDIAN</a>
+          <a class="euclidean" href="javascript:void(0);">EUCLIDEAN</a>
         </div>
       </div>
     </div>
diff --git a/tensorflow/tensorboard/scripts/generate_testdata.py b/tensorflow/tensorboard/scripts/generate_testdata.py
index 64cc9ff2dd..e8fb9cd6d4 100644
--- a/tensorflow/tensorboard/scripts/generate_testdata.py
+++ b/tensorflow/tensorboard/scripts/generate_testdata.py
@@ -38,7 +38,7 @@ from tensorflow.python.platform import app
 from tensorflow.python.platform import flags
 from tensorflow.python.summary.writer import writer as writer_lib
 
-tf.flags.DEFINE_string("target", None, """The directoy where serialized data
+tf.flags.DEFINE_string("target", None, """The directory where serialized data
 will be written""")
 
 flags.DEFINE_boolean("overwrite", False, """Whether to remove and overwrite
diff --git a/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh b/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
index 65d05d8d7d..21b6fa2bb9 100644
--- a/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
+++ b/tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
@@ -97,7 +97,7 @@ exclude_cpu_cc_tests="${failing_cpu_cc_tests} + ${broken_cpu_cc_tests}"
 exclude_gpu_cc_tests="${extra_failing_gpu_cc_tests} + ${exclude_cpu_cc_tests}"
 
 # Python tests
-# The first argument is the name of the python test direcotry
+# The first argument is the name of the python test directory
 function get_failing_cpu_py_tests() {
     echo "
     //$1/tensorflow/python:basic_session_run_hooks_test + \
diff --git a/tensorflow/tools/dist_test/python/census_widendeep.py b/tensorflow/tools/dist_test/python/census_widendeep.py
index db56a687f6..3a55781496 100644
--- a/tensorflow/tools/dist_test/python/census_widendeep.py
+++ b/tensorflow/tools/dist_test/python/census_widendeep.py
@@ -133,7 +133,7 @@ class CensusDataSource(object):
       columns: Columns to retrieve from the data files (A list of strings)
       label_column: Name of the label column
       categorical_columns: Names of the categorical columns (A list of strings)
-      continuous_columns: Names of the continuous columsn (A list of strings)
+      continuous_columns: Names of the continuous columns (A list of strings)
     """
 
     # Retrieve data from disk (if available) or download from the web.
diff --git a/tensorflow/tools/docker/parameterized_docker_build.sh b/tensorflow/tools/docker/parameterized_docker_build.sh
index 886266caaf..f88af68cde 100755
--- a/tensorflow/tools/docker/parameterized_docker_build.sh
+++ b/tensorflow/tools/docker/parameterized_docker_build.sh
@@ -64,7 +64,7 @@
 #
 #   TF_DOCKER_BUILD_OPTIONS
 #     (Optional)
-#     Specifices the desired build options. Defaults to OPT.
+#     Specifies the desired build options. Defaults to OPT.
 
 # Script directory
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/tensorflow/tools/docs/py_guide_parser.py b/tensorflow/tools/docs/py_guide_parser.py
index 245643cb32..216353ecee 100644
--- a/tensorflow/tools/docs/py_guide_parser.py
+++ b/tensorflow/tools/docs/py_guide_parser.py
@@ -35,7 +35,7 @@ class PyGuideParser(object):
   """Simple parsing of a guide .md file.
 
   Descendants can override the process_*() functions (called by process())
-  to either record infromation from the guide, or call replace_line()
+  to either record information from the guide, or call replace_line()
   to affect the return value of process().
   """
 
diff --git a/tensorflow/tools/gcs_test/python/gcs_smoke.py b/tensorflow/tools/gcs_test/python/gcs_smoke.py
index 615e142c47..51933a52a6 100644
--- a/tensorflow/tools/gcs_test/python/gcs_smoke.py
+++ b/tensorflow/tools/gcs_test/python/gcs_smoke.py
@@ -36,7 +36,7 @@ flags.DEFINE_integer("num_examples", 10, "Number of examples to generate")
 FLAGS = flags.FLAGS
 
 def create_examples(num_examples, input_mean):
-  """Create ExampleProto's containg data."""
+  """Create ExampleProto's containing data."""
   ids = np.arange(num_examples).reshape([num_examples, 1])
   inputs = np.random.randn(num_examples, 1) + input_mean
   target = inputs - input_mean
diff --git a/tensorflow/tools/graph_transforms/README.md b/tensorflow/tools/graph_transforms/README.md
index 7e8c51efe6..53f7f1685f 100644
--- a/tensorflow/tools/graph_transforms/README.md
+++ b/tensorflow/tools/graph_transforms/README.md
@@ -998,7 +998,7 @@ There are a few things to know about the `ReplaceMatchingOpTypes` function:
     important nodes are listed in the `output_nodes` argument that's passed into
     each replacement function call. You can disable this checking by setting
     `allow_inconsistencies` to true in the options, but otherwise any
-    replacements that break the graph constraints will be cancelled. If you do
+    replacements that break the graph constraints will be canceled. If you do
     allow inconsistencies, it's your transform's responsibility to fix them up
     before you return your final result. Functions like `RenameNodeInputs` can
     be useful if you are doing wholesale node renaming for example.
diff --git a/tensorflow/tools/graph_transforms/transform_utils.h b/tensorflow/tools/graph_transforms/transform_utils.h
index 54808efa9f..95cb21d64c 100644
--- a/tensorflow/tools/graph_transforms/transform_utils.h
+++ b/tensorflow/tools/graph_transforms/transform_utils.h
@@ -106,7 +106,7 @@ void FilterGraphDef(const GraphDef& input_graph_def,
                     std::function<bool(const NodeDef&)> selector,
                     GraphDef* output_graph_def);
 
-// Creates a copy of the input graph, with all occurences of the attributes with
+// Creates a copy of the input graph, with all occurrences of the attributes with
 // the names in the argument removed from the node defs.
 void RemoveAttributes(const GraphDef& input_graph_def,
                       const std::vector<string>& attributes,
diff --git a/third_party/gpus/cuda_configure.bzl b/third_party/gpus/cuda_configure.bzl
index c6deae05b8..12d324e9a1 100644
--- a/third_party/gpus/cuda_configure.bzl
+++ b/third_party/gpus/cuda_configure.bzl
@@ -5,7 +5,7 @@
 
   * `TF_NEED_CUDA`: Whether to enable building with CUDA.
   * `GCC_HOST_COMPILER_PATH`: The GCC host compiler path
-  * `TF_CUDA_CLANG`: Wheter to use clang as a cuda compiler.
+  * `TF_CUDA_CLANG`: Whether to use clang as a cuda compiler.
   * `CLANG_CUDA_COMPILER_PATH`: The clang compiler path that will be used for
     both host and device code compilation if TF_CUDA_CLANG is 1.
   * `CUDA_TOOLKIT_PATH`: The path to the CUDA toolkit. Default is
diff --git a/third_party/hadoop/hdfs.h b/third_party/hadoop/hdfs.h
index 560d8bba0e..a664f3b50c 100644
--- a/third_party/hadoop/hdfs.h
+++ b/third_party/hadoop/hdfs.h
@@ -171,7 +171,7 @@ void hdfsFileFreeReadStatistics(struct hdfsReadStatistics *stats);
  * Connect to the hdfs.
  * @param nn   The NameNode.  See hdfsBuilderSetNameNode for details.
  * @param port The port on which the server is listening.
- * @param user the user name (this is hadoop domain user). Or NULL is equivelant
+ * @param user the user name (this is hadoop domain user). Or NULL is equivalent
  * to hhdfsConnect(host, port)
  * @return Returns a handle to the filesystem or NULL on error.
  * @deprecated Use hdfsBuilderConnect instead.
@@ -397,7 +397,7 @@ hdfsFile hdfsOpenFile(hdfsFS fs, const char *path, int flags, int bufferSize,
                       short replication, tSize blocksize);
 
 /**
- * hdfsTruncateFile - Truncate a hdfs file to given lenght.
+ * hdfsTruncateFile - Truncate a hdfs file to given length.
  * @param fs The configured filesystem handle.
  * @param path The full path to the file.
  * @param newlength The size the file is to be truncated to
diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl
index 5f5380c40c..64ca6ee02f 100644
--- a/third_party/py/python_configure.bzl
+++ b/third_party/py/python_configure.bzl
@@ -113,7 +113,7 @@ def _symlink_genrule_for_dir(repository_ctx, src_dir, dest_dir, genrule_name):
     # Copy the source directory to the output directory.
     # Creating a junction pointing to the source directory and declaring the
     # outputs like we do on Linux, then expecting that Bazel would pick up these
-    # outputs via the junction is ill-concieved, because Bazel deletes the
+    # outputs via the junction is ill-conceived, because Bazel deletes the
     # output files from previous build prior to executing the action, meaning it
     # would delete the actual files via the old junction.
     cmd_script = "%s-cmd.cmd" % genrule_name
diff --git a/third_party/sycl/sycl/LICENSE.text b/third_party/sycl/sycl/LICENSE.text
index 0c2955c4d7..8d3f050b39 100644
--- a/third_party/sycl/sycl/LICENSE.text
+++ b/third_party/sycl/sycl/LICENSE.text
@@ -67,7 +67,7 @@ you; so please press the "CANCEL" button to cancel your download.
         ComputeCpp within its marketing materials, without the
         express prior written permission of Codeplay.
  4. Support. Codeplay does not provide any guarantees of support for
-    the Software to the user. Codeplay will use reasonable endeavours
+    the Software to the user. Codeplay will use reasonable endeavors
     to respond to users' support requests, for the most recent
     release only, via the community support website at https://
     computecpp.codeplay.com.
@@ -78,7 +78,7 @@ you; so please press the "CANCEL" button to cancel your download.
     copyrights, trade secrets and other proprietary rights in the
     Software, including the rights to make and license the use of all
     copies. To the extent that any patents owned by Codeplay or its
-    licensors relate to any component of the Software, the licence
+    licensors relate to any component of the Software, the license
     granted to the user in accordance with this Agreement allows for
     the lawful use of such patents but only for the purposes of this
     Agreement and not further or otherwise. Therefore, the user may
-- 
GitLab


From 42104f3102a16f4157f4b2ad011737d919b55754 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Sat, 20 May 2017 01:49:29 -0700
Subject: [PATCH 1555/1563] Change type to resource

---
 .../delay_compensated_gradient_descent.py     | 20 +++++++++----------
 ...delay_compensated_gradient_descent_test.py | 17 ++++++++--------
 tensorflow/core/ops/training_ops.cc           |  2 --
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
index a359586467..3bc7b8aef0 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
@@ -136,13 +136,13 @@ class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
 
     vars_with_grad = [v for g, v in grads_and_vars if g is not None]
     if not vars_with_grad:
-        raise ValueError(
-            "No gradients provided for any variable, check your graph for ops"
-            " that do not support gradients, between variables %s and loss %s." %
-            ([str(v) for _, v in grads_and_vars], loss))
+      raise ValueError(
+          "No gradients provided for any variable, check your graph for ops"
+          " that do not support gradients, between variables %s and loss %s." %
+          ([str(v) for _, v in grads_and_vars], loss))
 
     return self.apply_gradients(grads_and_vars, global_step=global_step,
-                                    name=name, worker_index=worker_index)
+                                name=name, worker_index=worker_index)
 
   def apply_gradients(self,
                       grads_and_vars,
@@ -243,12 +243,12 @@ class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
     # Get previous value of the variable from the slot
     shadow = self.get_slot(var, "shadow_{0}".format(worker_index))
     return training_ops.apply_delay_compensated_gradient_descent(
-        var,
-        math_ops.cast(self._learning_rate_tensor, var.dtype.base_dtype),
+        var.handle,
+        math_ops.cast(self._learning_rate_tensor, grad.dtype.base_dtype),
         grad,
-        math_ops.cast(self._lambda_tensor, var.dtype.base_dtype),
-        shadow,
-        use_locking=self._use_locking).op
+        math_ops.cast(self._lambda_tensor, grad.dtype.base_dtype),
+        shadow.handle,
+        use_locking=self._use_locking)
 
   def _prepare(self):
     self._learning_rate_tensor = ops.convert_to_tensor(self._learning_rate,
diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
index ce5a0ad2e8..aec93973ba 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
@@ -1,4 +1,4 @@
-# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,16 +20,17 @@ from __future__ import print_function
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
+from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
-from tensorflow.contrib.opt.python.training import delay_compensated_gradient_descent
+import delay_compensated_gradient_descent
 
 class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
   def testBasic(self):
     for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
       with self.test_session():
-        var0 = variables.Variable([1.0, 2.0], dtype=dtype)
-        var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+        var0 = resource_variable_ops.ResourceVariable([1.0, 2.0], dtype=dtype)
+        var1 = resource_variable_ops.ResourceVariable([3.0, 4.0], dtype=dtype)
         grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
         grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
         optimizer = (delay_compensated_gradient_descent.
@@ -54,8 +55,8 @@ class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
   def testTensorLearningRate(self):
     for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
       with self.test_session():
-        var0 = variables.Variable([1.0, 2.0], dtype=dtype)
-        var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+        var0 = resource_variable_ops.ResourceVariable([1.0, 2.0], dtype=dtype)
+        var1 = resource_variable_ops.ResourceVariable([3.0, 4.0], dtype=dtype)
         grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
         grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
         lrate = constant_op.constant(3.0)
@@ -98,8 +99,8 @@ class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
     for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
       with self.test_session():
         global_step = variables.Variable(0, trainable=False)
-        var0 = variables.Variable([1.0, 2.0], dtype=dtype)
-        var1 = variables.Variable([3.0, 4.0], dtype=dtype)
+        var0 = resource_variable_ops.ResourceVariable([1.0, 2.0], dtype=dtype)
+        var1 = resource_variable_ops.ResourceVariable([3.0, 4.0], dtype=dtype)
         grads0 = constant_op.constant([0.1, 0.1], dtype=dtype)
         grads1 = constant_op.constant([0.01, 0.01], dtype=dtype)
         optimizer = (delay_compensated_gradient_descent.
diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 0e4479750c..49ad4ae43c 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -108,7 +108,6 @@ REGISTER_OP("ApplyDelayCompensatedGradientDescent")
     .Input("delta: T")
     .Input("lambda: T")
     .Input("shadow: resource")
-    .Output("out: Ref(T)")
     .Attr("T: numbertype")
     .Attr("use_locking: bool = false")
     .SetShapeFn(ApplyGradientDescentShapeFn)
@@ -121,7 +120,6 @@ alpha: Scaling factor. Must be a scalar.
 delta: The change.
 lambda: The variance paramter.
 shadow: Same as "var".
-out: Same as "var".
 use_locking: If `True`, the subtraction will be protected by a lock;
   otherwise the behavior is undefined, but may exhibit less contention.
 )doc");
-- 
GitLab


From b954249117cb313829bd53c64c73bade96daf519 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Sat, 20 May 2017 01:54:57 -0700
Subject: [PATCH 1556/1563] Update BUILD file and import lines

---
 tensorflow/contrib/opt/BUILD                                    | 1 +
 .../python/training/delay_compensated_gradient_descent_test.py  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tensorflow/contrib/opt/BUILD b/tensorflow/contrib/opt/BUILD
index edc9c0ef33..1b3351713d 100644
--- a/tensorflow/contrib/opt/BUILD
+++ b/tensorflow/contrib/opt/BUILD
@@ -50,6 +50,7 @@ py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:random_ops",
+        "//tensorflow/python:resource_variable_ops",
         "//tensorflow/python:variables",
         "//third_party/py/numpy",
     ],
diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
index aec93973ba..60e347ae0d 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
@@ -23,7 +23,7 @@ from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import resource_variable_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
-import delay_compensated_gradient_descent
+from tensorflow.contrib.opt.python.training import delay_compensated_gradient_descent
 
 class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
   def testBasic(self):
-- 
GitLab


From 1c14abee5468e31a29a07adf63770c9f0e5ec264 Mon Sep 17 00:00:00 2001
From: Ali Siddiqui <alinsiddiqui@gmail.com>
Date: Sat, 20 May 2017 03:03:56 -0700
Subject: [PATCH 1557/1563] Change method to resource

---
 .../python/training/delay_compensated_gradient_descent.py   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
index 3bc7b8aef0..a9c7e9eeed 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
@@ -51,10 +51,10 @@ class _DenseResourceVariableAsynchronousProcessor(optimizer._DenseResourceVariab
 
 def _get_processor(v):
   """The processor of v."""
-  if isinstance(v, variables.Variable):
-    return _RefVariableAsynchronousProcessor(v)
   if v.op.type == "VarHandleOp":
     return _DenseResourceVariableAsynchronousProcessor(v)
+  if isinstance(v, variables.Variable):
+    return _RefVariableAsynchronousProcessor(v)
   raise NotImplementedError("Trying to optimize unsupported type ", v)
 
 
@@ -239,7 +239,7 @@ class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
         self._get_or_make_slot(v, var2, "shadow_{0}".format(index),
                                self._name)
 
-  def _apply_dense(self, grad, var, worker_index=0):
+  def _resource_apply_dense(self, grad, var, worker_index=0):
     # Get previous value of the variable from the slot
     shadow = self.get_slot(var, "shadow_{0}".format(worker_index))
     return training_ops.apply_delay_compensated_gradient_descent(
-- 
GitLab


From 1b1326b0b224f8285e9ba02d09667d1ae0f02e49 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Sat, 20 May 2017 18:55:37 -0700
Subject: [PATCH 1558/1563] Small lint and doc fix,

---
 .../python/training/delay_compensated_gradient_descent.py  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
index a9c7e9eeed..5a5e67ef68 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent.py
@@ -19,9 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.python.framework import ops
-from tensorflow.python.ops import state_ops
-from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import array_ops
+from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import state_ops
 from tensorflow.python.ops import variables
 from tensorflow.python.training import optimizer
 from tensorflow.python.training import training_ops
@@ -59,8 +59,7 @@ def _get_processor(v):
 
 
 class DelayCompensatedGradientDescentOptimizer(optimizer.Optimizer):
-  """Optimizer that implements the gradient descent algorithm with delay
-  compensation.
+  """Optimizer that implements gradient descent with delay compensation.
 
   See [Zheng, Shuxin, et al., 2016](https://arxiv.org/abs/1609.08326)
   ([pdf](https://arxiv.org/pdf/1609.08326.pdf)).
-- 
GitLab


From 1634d86cb11502d6089ce2570fd25a82f6496320 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Sat, 20 May 2017 18:57:05 -0700
Subject: [PATCH 1559/1563] Small lint fixes in test file.

---
 .../python/training/delay_compensated_gradient_descent_test.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
index 60e347ae0d..1dbd8416a0 100644
--- a/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
+++ b/tensorflow/contrib/opt/python/training/delay_compensated_gradient_descent_test.py
@@ -25,7 +25,9 @@ from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 from tensorflow.contrib.opt.python.training import delay_compensated_gradient_descent
 
+
 class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
+
   def testBasic(self):
     for dtype in [dtypes.half, dtypes.float32, dtypes.float64]:
       with self.test_session():
@@ -125,5 +127,6 @@ class DelayCompensatedGradientDescentOptimizerTest(test.TestCase):
             [3.0 - 3.0 * 0.01, 4.0 - 3.0 * 0.01], var1.eval())
         self.assertAllCloseAccordingToType(1, global_step.eval())
 
+
 if __name__ == "__main__":
   test.main()
-- 
GitLab


From bee23d372307ec23f95acc65b262b79cfa060d28 Mon Sep 17 00:00:00 2001
From: Vijay Vasudevan <vrv@google.com>
Date: Sat, 20 May 2017 19:00:45 -0700
Subject: [PATCH 1560/1563] typo fix

---
 tensorflow/core/ops/training_ops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/core/ops/training_ops.cc b/tensorflow/core/ops/training_ops.cc
index 49ad4ae43c..a786fed856 100644
--- a/tensorflow/core/ops/training_ops.cc
+++ b/tensorflow/core/ops/training_ops.cc
@@ -118,7 +118,7 @@ Update '*shadow' by changing it to the new value of 'var'
 var: Should be from a Variable().
 alpha: Scaling factor. Must be a scalar.
 delta: The change.
-lambda: The variance paramter.
+lambda: The variance parameter.
 shadow: Same as "var".
 use_locking: If `True`, the subtraction will be protected by a lock;
   otherwise the behavior is undefined, but may exhibit less contention.
-- 
GitLab


From e777e9b914982c403b16deba3650e2ac45b6b8e1 Mon Sep 17 00:00:00 2001
From: Steffen Eberbach <steffen.eberbach@student.kit.edu>
Date: Sun, 21 May 2017 17:29:07 +0200
Subject: [PATCH 1561/1563] Fix classification dataset example in readme

---
 tensorflow/contrib/data/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/contrib/data/README.md b/tensorflow/contrib/data/README.md
index 15c1c76e51..b4d14fdc39 100644
--- a/tensorflow/contrib/data/README.md
+++ b/tensorflow/contrib/data/README.md
@@ -456,12 +456,12 @@ batched into a fixed size.
 # to a fixed shape.
 def _parse_function(filename, label):
   image_string = tf.read_file(filename)
-  image_decoded = tf.image.decode_image(filename)
+  image_decoded = tf.image.decode_image(image_string)
   image_resized = tf.image.resize_images(image_decoded, [28, 28])
   return image_resized, label
 
-filenames = ["/var/data/image1.jpg", "/var/data/image2.jpg", ...]
-labels = [0, 37, 29, 1, ...]
+filenames = tf.constant(["/var/data/image1.jpg", "/var/data/image2.jpg", ...])
+labels = tf.constant([0, 37, 29, 1, ...])
 
 dataset = tf.contrib.data.Dataset.from_tensor_slices((filenames, labels))
 dataset = dataset.map(_parse_function)
-- 
GitLab


From 1a24999f8d0dda2aabaf0a540b17681b18f599f6 Mon Sep 17 00:00:00 2001
From: zhengjiajin <393926893@qq.com>
Date: Mon, 22 May 2017 21:01:56 +0800
Subject: [PATCH 1562/1563] fix some annotation

---
 tensorflow/python/framework/file_system_test.py   | 2 +-
 tensorflow/python/framework/random_seed_test.py   | 2 +-
 tensorflow/python/framework/sparse_tensor_test.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tensorflow/python/framework/file_system_test.py b/tensorflow/python/framework/file_system_test.py
index 26b2a5b9b9..5eb59141a2 100644
--- a/tensorflow/python/framework/file_system_test.py
+++ b/tensorflow/python/framework/file_system_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # =============================================================================
-"""Tests for functions."""
+"""Tests for file_system."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/framework/random_seed_test.py b/tensorflow/python/framework/random_seed_test.py
index d64500fbc9..c1d2b05b0b 100644
--- a/tensorflow/python/framework/random_seed_test.py
+++ b/tensorflow/python/framework/random_seed_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for tensorflow.python.framework.ops."""
+"""Tests for tensorflow.python.framework.random_seed."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/python/framework/sparse_tensor_test.py b/tensorflow/python/framework/sparse_tensor_test.py
index 19a2b187b9..e709eaeda1 100644
--- a/tensorflow/python/framework/sparse_tensor_test.py
+++ b/tensorflow/python/framework/sparse_tensor_test.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-"""Tests for tensorflow.python.framework.ops."""
+"""Tests for tensorflow.python.framework.sparse_tensor."""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-- 
GitLab


From 177aca758d3ca3a5587bd70813c832bd90bfacc6 Mon Sep 17 00:00:00 2001
From: zhengjiajin <393926893@qq.com>
Date: Mon, 22 May 2017 21:27:18 +0800
Subject: [PATCH 1563/1563] fix typo in stepper_test function name

---
 tensorflow/python/debug/lib/stepper_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow/python/debug/lib/stepper_test.py b/tensorflow/python/debug/lib/stepper_test.py
index 825c559312..78e7b3b5eb 100644
--- a/tensorflow/python/debug/lib/stepper_test.py
+++ b/tensorflow/python/debug/lib/stepper_test.py
@@ -591,7 +591,7 @@ class StepperAssignAddTest(test_util.TensorFlowTestCase):
     with NodeStepper(self.sess, [self.q, self.v_add]) as stepper:
       self.assertIsNone(stepper.last_updated())
 
-  def testContToUpdateInvalidatesDumpedIntermedates(self):
+  def testContToUpdateInvalidatesDumpedIntermediates(self):
     with NodeStepper(self.sess, [self.q, self.v_add]) as stepper:
       self.assertAllClose(400.0, stepper.cont("q:0"))
       self.assertItemsEqual(["v/read:0", "p:0"],
-- 
GitLab